commit 8552ac617c9e51b9cbe847ca05dfc292d76f58fd
Author: Karl <Karl@67975925-1194-0748-b3d5-c16f83f1a3a1>
Date:   Wed Mar 9 01:31:56 2005 +0000

    Import from old repository
    
    git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@1 67975925-1194-0748-b3d5-c16f83f1a3a1

diff --git a/main/1024_textscheme.txt b/main/1024_textscheme.txt
new file mode 100644
index 00000000..b762d6d3
--- /dev/null
+++ b/main/1024_textscheme.txt
@@ -0,0 +1,96 @@
+//1024x768 text scheme file
+
+// Pie menu for marines
+SchemeName = "PieMenuScheme"
+FontName = "Arial"
+FontSize = 16
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+// Minimap, radar
+SchemeName = "HierarchyScheme"
+FontName = "Helvetica"
+FontSize = 10
+FgColor = "255 170 0 255"
+BgColor = "40 40 40 128"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 0"
+
+// Particle editing 
+SchemeName = "PSEScheme"
+FontName = "Arial"
+FontSize = 34
+FgColor = "240 179 17 255"
+BgColor = "50 50 50 141"
+
+// Overwatch
+SchemeName = "OverwatchScheme"
+FontName = "Arial"
+FontSize = 34
+FgColor = "240 179 17 255"
+BgColor = "50 50 50 141"
+
+// Action buttons in lower right
+SchemeName = "ActionButtonScheme"
+FontName = "Arial"
+FontSize = 21
+FgColor = "172 244 255 255"
+BgColor = "0 0 0 0"
+
+// Upper left resources, reinforcements
+SchemeName = "CommanderStatusScheme"
+FontName = "Arial"
+FontSize = 21
+FgColor = "172 244 255 255"
+BgColor = "0 0 0 0"
+
+// Upper left resources, reinforcements
+SchemeName = "MarineStatusScheme"
+FontName = "Arial"
+FontSize = 21
+FgColor = "0 153 255 255"
+BgColor = "0 0 0 0"
+
+// Scoreboard title
+SchemeName = "Scoreboard Title Text"
+FontName = "Arial"
+FontSize = 21
+FgColor = "243 252 10 255"
+BgColor = "0 0 0 0"
+
+// Scoreboard text (ignores color, uses hard-coded team color instead)
+SchemeName = "Scoreboard Small Text"
+FontName = "Arial"
+FontSize = 16
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+// Tiny text (used for number of players)
+SchemeName = "Scoreboard Tiny Text"
+FontName = "Arial"
+FontSize = 10
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+
+
+// Research area, pop-up text for action buttons
+//SchemeName = "MiddleHelpScheme"
+//FontName = "Helvetica"
+//FontSize = 14
+//FgColor = "172 244 255 255"
+//BgColor = "0 0 0 0"
+
+// Make the logout button obvious
+//SchemeName = "LogoutButtonScheme"
+//FontName = "Arial"
+//FontSize = 34
+//FgColor = "255 255 255 255"
+//BgColor = "0 0 0 0"
+
diff --git a/main/1152_textscheme.txt b/main/1152_textscheme.txt
new file mode 100644
index 00000000..aacb6f76
--- /dev/null
+++ b/main/1152_textscheme.txt
@@ -0,0 +1,100 @@
+//1152x864 text scheme file
+
+// Pie menu for marines
+SchemeName = "PieMenuScheme"
+FontName = "Arial"
+FontSize = 16
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+// Minimap, radar
+SchemeName = "HierarchyScheme"
+FontName = "Helvetica"
+FontSize = 10
+FgColor = "255 170 0 255"
+BgColor = "40 40 40 128"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 0"
+
+// Particle editing 
+SchemeName = "PSEScheme"
+FontName = "Arial"
+FontSize = 34
+FgColor = "240 179 17 255"
+BgColor = "50 50 50 141"
+
+// Overwatch
+SchemeName = "OverwatchScheme"
+FontName = "Arial"
+FontSize = 34
+FgColor = "240 179 17 255"
+BgColor = "50 50 50 141"
+
+// Action buttons in lower right
+SchemeName = "ActionButtonScheme"
+FontName = "Arial"
+FontSize = 21
+FgColor = "172 244 255 255"
+BgColor = "0 0 0 0"
+
+// Upper left resources, reinforcements
+SchemeName = "CommanderStatusScheme"
+FontName = "Arial"
+FontSize = 21
+FgColor = "172 244 255 255"
+BgColor = "0 0 0 0"
+
+// Upper left resources, reinforcements
+SchemeName = "MarineStatusScheme"
+FontName = "Arial"
+FontSize = 21
+FgColor = "0 153 255 255"
+BgColor = "0 0 0 0"
+
+// Scoreboard title
+SchemeName = "Scoreboard Title Text"
+FontName = "Arial"
+FontSize = 21
+FgColor = "243 252 10 255"
+BgColor = "0 0 0 0"
+
+// Scoreboard text (ignores color, uses hard-coded team color instead)
+SchemeName = "Scoreboard Small Text"
+FontName = "Arial"
+FontSize = 16
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+// Tiny text (used for number of players)
+SchemeName = "Scoreboard Tiny Text"
+FontName = "Arial"
+FontSize = 10
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+
+
+// Research area, pop-up text for action buttons
+//SchemeName = "MiddleHelpScheme"
+//FontName = "Helvetica"
+//FontSize = 14
+//FgColor = "172 244 255 255"
+//BgColor = "0 0 0 0"
+
+// Make the logout button obvious
+//SchemeName = "LogoutButtonScheme"
+//FontName = "Arial"
+//FontSize = 34
+//FgColor = "255 255 255 255"
+//BgColor = "0 0 0 0"
+
+
+
+
+
diff --git a/main/1280_textscheme.txt b/main/1280_textscheme.txt
new file mode 100644
index 00000000..68f0614f
--- /dev/null
+++ b/main/1280_textscheme.txt
@@ -0,0 +1,95 @@
+//1280x960 text scheme file
+
+// Pie menu for marines
+SchemeName = "PieMenuScheme"
+FontName = "Arial"
+FontSize = 16
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+// Minimap, radar
+SchemeName = "HierarchyScheme"
+FontName = "Helvetica"
+FontSize = 10
+FgColor = "255 170 0 255"
+BgColor = "40 40 40 128"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 0"
+
+// Particle editing 
+SchemeName = "PSEScheme"
+FontName = "Arial"
+FontSize = 34
+FgColor = "240 179 17 255"
+BgColor = "50 50 50 141"
+
+// Overwatch
+SchemeName = "OverwatchScheme"
+FontName = "Arial"
+FontSize = 34
+FgColor = "240 179 17 255"
+BgColor = "50 50 50 141"
+
+// Action buttons in lower right
+SchemeName = "ActionButtonScheme"
+FontName = "Arial"
+FontSize = 21
+FgColor = "172 244 255 255"
+BgColor = "0 0 0 0"
+
+// Upper left resources, reinforcements
+SchemeName = "CommanderStatusScheme"
+FontName = "Arial"
+FontSize = 21
+FgColor = "172 244 255 255"
+BgColor = "0 0 0 0"
+
+SchemeName = "MarineStatusScheme"
+FontName = "Arial"
+FontSize = 21
+FgColor = "0 153 255 255"
+BgColor = "0 0 0 0"
+
+// Scoreboard title
+SchemeName = "Scoreboard Title Text"
+FontName = "Arial"
+FontSize = 21
+FgColor = "243 252 10 255"
+BgColor = "0 0 0 0"
+
+// Scoreboard text (ignores color, uses hard-coded team color instead)
+SchemeName = "Scoreboard Small Text"
+FontName = "Arial"
+FontSize = 16
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+// Tiny text (used for number of players)
+SchemeName = "Scoreboard Tiny Text"
+FontName = "Arial"
+FontSize = 10
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+
+
+// Research area, pop-up text for action buttons
+//SchemeName = "MiddleHelpScheme"
+//FontName = "Helvetica"
+//FontSize = 14
+//FgColor = "172 244 255 255"
+//BgColor = "0 0 0 0"
+
+// Make the logout button obvious
+//SchemeName = "LogoutButtonScheme"
+//FontName = "Arial"
+//FontSize = 34
+//FgColor = "255 255 255 255"
+//BgColor = "0 0 0 0"
+
diff --git a/main/1600_textscheme.txt b/main/1600_textscheme.txt
new file mode 100644
index 00000000..d5c92f65
--- /dev/null
+++ b/main/1600_textscheme.txt
@@ -0,0 +1,95 @@
+//1600x1200 text scheme file
+
+// Pie menu for marines
+SchemeName = "PieMenuScheme"
+FontName = "Arial"
+FontSize = 16
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+// Minimap, radar
+SchemeName = "HierarchyScheme"
+FontName = "Helvetica"
+FontSize = 10
+FgColor = "255 170 0 255"
+BgColor = "40 40 40 128"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 0"
+
+// Particle editing 
+SchemeName = "PSEScheme"
+FontName = "Arial"
+FontSize = 34
+FgColor = "240 179 17 255"
+BgColor = "50 50 50 141"
+
+// Overwatch
+SchemeName = "OverwatchScheme"
+FontName = "Arial"
+FontSize = 34
+FgColor = "240 179 17 255"
+BgColor = "50 50 50 141"
+
+// Action buttons in lower right
+SchemeName = "ActionButtonScheme"
+FontName = "Arial"
+FontSize = 21
+FgColor = "172 244 255 255"
+BgColor = "0 0 0 0"
+
+// Upper left resources, reinforcements
+SchemeName = "CommanderStatusScheme"
+FontName = "Arial"
+FontSize = 21
+FgColor = "172 244 255 255"
+BgColor = "0 0 0 0"
+
+SchemeName = "MarineStatusScheme"
+FontName = "Arial"
+FontSize = 21
+FgColor = "0 153 255 255"
+BgColor = "0 0 0 0"
+
+// Scoreboard title
+SchemeName = "Scoreboard Title Text"
+FontName = "Arial"
+FontSize = 21
+FgColor = "243 252 10 255"
+BgColor = "0 0 0 0"
+
+// Scoreboard text (ignores color, uses hard-coded team color instead)
+SchemeName = "Scoreboard Small Text"
+FontName = "Arial"
+FontSize = 16
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+// Tiny text (used for number of players)
+SchemeName = "Scoreboard Tiny Text"
+FontName = "Arial"
+FontSize = 10
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+
+
+// Research area, pop-up text for action buttons
+//SchemeName = "MiddleHelpScheme"
+//FontName = "Helvetica"
+//FontSize = 14
+//FgColor = "172 244 255 255"
+//BgColor = "0 0 0 0"
+
+// Make the logout button obvious
+//SchemeName = "LogoutButtonScheme"
+//FontName = "Arial"
+//FontSize = 34
+//FgColor = "255 255 255 255"
+//BgColor = "0 0 0 0"
+
diff --git a/main/320_textscheme.txt b/main/320_textscheme.txt
new file mode 100644
index 00000000..8733d6c1
--- /dev/null
+++ b/main/320_textscheme.txt
@@ -0,0 +1,93 @@
+// 320x240 text scheme file
+
+// DEFAULT BUTTON TEXT
+SchemeName = "PieMenuScheme"
+FontName = "Helvetica"
+FontSize = 10
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+// Minimap, radar
+SchemeName = "HierarchyScheme"
+FontName = "Helvetica"
+FontSize = 5
+FgColor = "255 170 0 255"
+BgColor = "40 40 40 128"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 0"
+
+
+// Particle editing 
+SchemeName = "PSEScheme"
+FontName = "Arial"
+FontSize = 10
+FgColor = "240 179 17 255"
+BgColor = "50 50 50 141"
+
+// Overwatch
+SchemeName = "OverwatchScheme"
+FontName = "Arial"
+FontSize = 10
+FgColor = "240 179 17 255"
+BgColor = "50 50 50 141"
+
+// Action buttons in lower right
+SchemeName = "ActionButtonScheme"
+FontName = "Arial Bold"
+FontSize = 7
+FgColor = "172 244 255 255"
+BgColor = "0 0 0 0"
+
+// Upper left resources, reinforcements
+SchemeName = "CommanderStatusScheme"
+FontName = "Arial Bold"
+FontSize = 7
+FgColor = "172 244 255 255"
+BgColor = "0 0 0 0"
+
+SchemeName = "MarineStatusScheme"
+FontName = "Arial Bold"
+FontSize = 7
+FgColor = "0 153 255 255"
+BgColor = "0 0 0 0"
+
+// Scoreboard title
+SchemeName = "Scoreboard Title Text"
+FontName = "Arial Bold"
+FontSize = 7
+FgColor = "243 252 10 255"
+BgColor = "0 0 0 0"
+
+// Scoreboard text (ignores color, uses hard-coded team color instead)
+SchemeName = "Scoreboard Small Text"
+FontName = "Arial"
+FontSize = 7
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+// Tiny text (used for number of players)
+SchemeName = "Scoreboard Tiny Text"
+FontName = "Arial"
+FontSize = 10
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+// Research area, pop-up text for action buttons
+//SchemeName = "MiddleHelpScheme"
+//FontName = "Helvetica"
+//FontSize = 14
+//FgColor = "172 244 255 255"
+//BgColor = "0 0 0 0"
+
+// Make the logout button obvious
+//SchemeName = "LogoutButtonScheme"
+//FontName = "Arial"
+//FontSize = 34
+//FgColor = "255 255 255 255"
+//BgColor = "0 0 0 0"
diff --git a/main/400_textscheme.txt b/main/400_textscheme.txt
new file mode 100644
index 00000000..b5829e09
--- /dev/null
+++ b/main/400_textscheme.txt
@@ -0,0 +1,93 @@
+// 400x300 text scheme file
+
+// DEFAULT BUTTON TEXT
+SchemeName = "PieMenuScheme"
+FontName = "Helvetica"
+FontSize = 15
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+// Minimap, radar
+SchemeName = "HierarchyScheme"
+FontName = "Helvetica"
+FontSize = 5
+FgColor = "255 170 0 255"
+BgColor = "40 40 40 128"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 0"
+
+
+// Particle editing 
+SchemeName = "PSEScheme"
+FontName = "Arial"
+FontSize = 10
+FgColor = "240 179 17 255"
+BgColor = "50 50 50 141"
+
+// Overwatch
+SchemeName = "OverwatchScheme"
+FontName = "Arial"
+FontSize = 10
+FgColor = "240 179 17 255"
+BgColor = "50 50 50 141"
+
+// Action buttons in lower right
+SchemeName = "ActionButtonScheme"
+FontName = "Arial Bold"
+FontSize = 7
+FgColor = "172 244 255 255"
+BgColor = "0 0 0 0"
+
+// Upper left resources, reinforcements
+SchemeName = "CommanderStatusScheme"
+FontName = "Arial Bold"
+FontSize = 7
+FgColor = "172 244 255 255"
+BgColor = "0 0 0 0"
+
+SchemeName = "MarineStatusScheme"
+FontName = "Arial Bold"
+FontSize = 7
+FgColor = "0 153 255 255"
+BgColor = "0 0 0 0"
+
+// Scoreboard title
+SchemeName = "Scoreboard Title Text"
+FontName = "Arial Bold"
+FontSize = 7
+FgColor = "243 252 10 255"
+BgColor = "0 0 0 0"
+
+// Scoreboard text (ignores color, uses hard-coded team color instead)
+SchemeName = "Scoreboard Small Text"
+FontName = "Arial"
+FontSize = 7
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+// Tiny text (used for number of players)
+SchemeName = "Scoreboard Tiny Text"
+FontName = "Arial"
+FontSize = 10
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+// Research area, pop-up text for action buttons
+//SchemeName = "MiddleHelpScheme"
+//FontName = "Helvetica"
+//FontSize = 14
+//FgColor = "172 244 255 255"
+//BgColor = "0 0 0 0"
+
+// Make the logout button obvious
+//SchemeName = "LogoutButtonScheme"
+//FontName = "Arial"
+//FontSize = 34
+//FgColor = "255 255 255 255"
+//BgColor = "0 0 0 0"
diff --git a/main/512_textscheme.txt b/main/512_textscheme.txt
new file mode 100644
index 00000000..5cccbca2
--- /dev/null
+++ b/main/512_textscheme.txt
@@ -0,0 +1,95 @@
+// 512x384 text scheme file
+
+// Pie menu for marines
+SchemeName = "PieMenuScheme"
+FontName = "Arial"
+FontSize = 8
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+// Minimap, radar
+SchemeName = "HierarchyScheme"
+FontName = "Helvetica"
+FontSize = 8
+FgColor = "255 170 0 255"
+BgColor = "40 40 40 128"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 0"
+
+// Particle editing 
+SchemeName = "PSEScheme"
+FontName = "Arial"
+FontSize = 14
+FgColor = "240 179 17 255"
+BgColor = "50 50 50 141"
+
+// Overwatch
+SchemeName = "OverwatchScheme"
+FontName = "Arial"
+FontSize = 20
+FgColor = "240 179 17 255"
+BgColor = "50 50 50 141"
+
+// Action buttons in lower right
+SchemeName = "ActionButtonScheme"
+FontName = "Arial"
+FontSize = 10
+FgColor = "172 244 255 255"
+BgColor = "0 0 0 0"
+
+// Upper left resources, reinforcements
+SchemeName = "CommanderStatusScheme"
+FontName = "Arial"
+FontSize = 10
+FgColor = "172 244 255 255"
+BgColor = "0 0 0 0"
+
+SchemeName = "MarineStatusScheme"
+FontName = "Arial"
+FontSize = 10
+FgColor = "0 153 255 255"
+BgColor = "0 0 0 0"
+
+// Scoreboard title
+SchemeName = "Scoreboard Title Text"
+FontName = "Arial"
+FontSize = 8
+FgColor = "243 252 10 255"
+BgColor = "0 0 0 0"
+
+// Scoreboard text (ignores color, uses hard-coded team color instead)
+SchemeName = "Scoreboard Small Text"
+FontName = "Arial"
+FontSize = 6
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+// Tiny text (used for number of players)
+SchemeName = "Scoreboard Tiny Text"
+FontName = "Arial"
+FontSize = 6
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+
+
+// Research area, pop-up text for action buttons
+//SchemeName = "MiddleHelpScheme"
+//FontName = "Helvetica"
+//FontSize = 14
+//FgColor = "172 244 255 255"
+//BgColor = "0 0 0 0"
+
+// Make the logout button obvious
+//SchemeName = "LogoutButtonScheme"
+//FontName = "Arial"
+//FontSize = 34
+//FgColor = "255 255 255 255"
+//BgColor = "0 0 0 0"
+
diff --git a/main/640_textscheme.txt b/main/640_textscheme.txt
new file mode 100644
index 00000000..1c0fd296
--- /dev/null
+++ b/main/640_textscheme.txt
@@ -0,0 +1,96 @@
+// 640x480 text scheme file
+
+// Pie menu for marines
+SchemeName = "PieMenuScheme"
+FontName = "Arial"
+FontSize = 4
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+// Minimap, radar
+SchemeName = "HierarchyScheme"
+FontName = "Helvetica"
+FontSize = 8
+FgColor = "255 170 0 255"
+BgColor = "40 40 40 128"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 0"
+
+// Particle editing 
+SchemeName = "PSEScheme"
+FontName = "Arial"
+FontSize = 14
+FgColor = "240 179 17 255"
+BgColor = "50 50 50 141"
+
+// Overwatch
+SchemeName = "OverwatchScheme"
+FontName = "Arial"
+FontSize = 20
+FgColor = "240 179 17 255"
+BgColor = "50 50 50 141"
+
+// Action buttons in lower right
+SchemeName = "ActionButtonScheme"
+FontName = "Arial"
+FontSize = 10
+FgColor = "172 244 255 255"
+BgColor = "0 0 0 0"
+
+// Upper left resources, reinforcements
+SchemeName = "CommanderStatusScheme"
+FontName = "Arial"
+FontSize = 10
+FgColor = "172 244 255 255"
+BgColor = "0 0 0 0"
+
+// Upper left resources, reinforcements
+SchemeName = "MarineStatusScheme"
+FontName = "Arial"
+FontSize = 10
+FgColor = "0 153 255 255"
+BgColor = "0 0 0 0"
+
+// Scoreboard title
+SchemeName = "Scoreboard Title Text"
+FontName = "Arial"
+FontSize = 10
+FgColor = "243 252 10 255"
+BgColor = "0 0 0 0"
+
+// Scoreboard text (ignores color, uses hard-coded team color instead)
+SchemeName = "Scoreboard Small Text"
+FontName = "Arial"
+FontSize = 6
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+// Tiny text (used for number of players)
+SchemeName = "Scoreboard Tiny Text"
+FontName = "Arial"
+FontSize = 6
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+
+
+// Research area, pop-up text for action buttons
+//SchemeName = "MiddleHelpScheme"
+//FontName = "Helvetica"
+//FontSize = 14
+//FgColor = "172 244 255 255"
+//BgColor = "0 0 0 0"
+
+// Make the logout button obvious
+//SchemeName = "LogoutButtonScheme"
+//FontName = "Arial"
+//FontSize = 34
+//FgColor = "255 255 255 255"
+//BgColor = "0 0 0 0"
+
diff --git a/main/800_textscheme.txt b/main/800_textscheme.txt
new file mode 100644
index 00000000..6450c9c4
--- /dev/null
+++ b/main/800_textscheme.txt
@@ -0,0 +1,95 @@
+// 800x600 text scheme file
+
+// Pie menu for marines
+SchemeName = "PieMenuScheme"
+FontName = "Arial"
+FontSize = 12
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+// Minimap, radar
+SchemeName = "HierarchyScheme"
+FontName = "Helvetica"
+FontSize = 10
+FgColor = "255 170 0 255"
+BgColor = "40 40 40 128"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 0"
+
+// Particle editing 
+SchemeName = "PSEScheme"
+FontName = "Arial"
+FontSize = 28
+FgColor = "240 179 17 255"
+BgColor = "50 50 50 141"
+
+// Overwatch
+SchemeName = "OverwatchScheme"
+FontName = "Arial"
+FontSize = 28
+FgColor = "240 179 17 255"
+BgColor = "50 50 50 141"
+
+// Action buttons in lower right
+SchemeName = "ActionButtonScheme"
+FontName = "Arial"
+FontSize = 18
+FgColor = "172 244 255 255"
+BgColor = "0 0 0 0"
+
+// Upper left resources, reinforcements
+SchemeName = "CommanderStatusScheme"
+FontName = "Arial"
+FontSize = 18
+FgColor = "172 244 255 255"
+BgColor = "0 0 0 0"
+
+SchemeName = "MarineStatusScheme"
+FontName = "Arial"
+FontSize = 18
+FgColor = "0 153 255 255"
+BgColor = "0 0 0 0"
+
+// Scoreboard title
+SchemeName = "Scoreboard Title Text"
+FontName = "Arial"
+FontSize = 18
+FgColor = "243 252 10 255"
+BgColor = "0 0 0 0"
+
+// Scoreboard text (ignores color, uses hard-coded team color instead)
+SchemeName = "Scoreboard Small Text"
+FontName = "Arial"
+FontSize = 14
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+// Tiny text (used for number of players)
+SchemeName = "Scoreboard Tiny Text"
+FontName = "Arial"
+FontSize = 8
+FgColor = "255 170 0 255"
+BgColor = "0 0 0 141"
+FgColorArmed = "255 255 255 255"
+BgColorArmed = "255 170 0 67"
+
+
+
+// Research area, pop-up text for action buttons
+//SchemeName = "MiddleHelpScheme"
+//FontName = "Helvetica"
+//FontSize = 14
+//FgColor = "172 244 255 255"
+//BgColor = "0 0 0 0"
+
+// Make the logout button obvious
+//SchemeName = "LogoutButtonScheme"
+//FontName = "Arial"
+//FontSize = 34
+//FgColor = "255 255 255 255"
+//BgColor = "0 0 0 0"
+
diff --git a/main/Balance.txt b/main/Balance.txt
new file mode 100644
index 00000000..52bb5ed4
--- /dev/null
+++ b/main/Balance.txt
@@ -0,0 +1,459 @@
+// Automatically generated file. Last created 02/07/05, 23:08:45.
+
+// Integer data
+#define kAcidRocketDamage 25
+#define kAcidRocketRadius 165
+#define kActiveNodesMessageUpdateTime 0
+#define kAdvArmoryHealth 4000
+#define kAlienCelerityBonus 25
+#define kAlienChamberMaxPlayers 3
+#define kAlienFlashlightRange 200
+#define kAlienResourceTowerBuildTime 20
+#define kAlienResourceTowerCost 15
+#define kAlienResourceTowerHealth 2500
+#define kAlienResourceTowerSoundDelayTime 60
+#define kAlienRespawnPlayerModifier 6
+#define kAlienRespawnTime 7
+#define kAmmoCost 1
+#define kArmorDropRange 300
+#define kArmorOneResearchCost 20
+#define kArmorOneResearchTime 60
+#define kArmorThreeResearchCost 40
+#define kArmorThreeResearchTime 120
+#define kArmorTwoResearchCost 30
+#define kArmorTwoResearchTime 90
+#define kArmoryBuildDistance 300
+#define kArmoryBuildTime 15
+#define kArmoryCost 10
+#define kArmoryHealth 2400
+#define kArmoryUpgradeCost 30
+#define kArmoryUpgradeTime 180
+#define kArmsLabBuildTime 19
+#define kArmsLabCost 25
+#define kArmsLabHealth 2200
+#define kBalanceAverageTeamSize 6
+#define kBalanceFuncResourceTime 15
+#define kBalanceHiveDistance 2500
+#define kBalanceNodeDistance 1200
+#define kBalanceNumGorges 1
+#define kBasePlayerSpeed 150
+#define kBileBombDamage 200
+#define kBileBombRadius 200
+#define kBite2Damage 60
+#define kBiteDamage 75
+#define kBiteRange 60
+#define kBuildingVisibilityRadius 1000
+#define kCatalystCost 3
+#define kCatalystDuration 8
+#define kCatalystResearchCost 20
+#define kCatalystResearchTime 40
+#define kChargeDamage 320
+#define kClawsDamage 90
+#define kCombatBaseExperience 100
+#define kCombatBaseRespawnTime 5
+#define kCombatExperienceBaseAward 60
+#define kCombatExperienceCrowdAward 10
+#define kCombatExperienceLevelAward 10
+#define kCombatFriendlyNearbyRange 500
+#define kCombatLevelHealthIncrease 0
+#define kCombatLevelSpeedIncrease 10
+#define kCombatLevelupArmorIncreasePercent 0
+#define kCombatLevelupHealthIncreasePercent 0
+#define kCombatMaxPlayersPerWave 5
+#define kCombatObjectiveExperienceScalar 600
+#define kCombatRespawnScalar 9
+#define kCombatSpawnClips 2
+#define kCombatThresholdRespawnTime 3
+#define kCombatThresholdTeamSize 8
+#define kCombatTimeLimit 300
+#define kCombatWeaponStayTime 0
+#define kCommandStationBuildDistance 400
+#define kCommandStationBuildTime 15
+#define kCommandStationCost 20
+#define kCommandStationHealth 10000
+#define kCommandStationReuseTime 5
+#define kCommanderPlayerSpeed 4000
+#define kCustomIconColorLength 3
+#define kCustomIconNameLength 5
+#define kDebugAnimations 1
+#define kDebugServerCaching 1
+#define kDebugShowEntityLog 1
+#define kDefenseChamberBuildTime 20
+#define kDefenseChamberCost 10
+#define kDefenseChamberHealth 1200
+#define kDefenseChamberThinkInterval 2
+#define kDefensiveChamberHealRange 400
+#define kDefensiveChamberRegenAmount 10
+#define kDevourDamage 3
+#define kDevourRange 100
+#define kDistressBeaconCost 15
+#define kDistressBeaconRange 600
+#define kDistressBeaconTime 3
+#define kDivineWindDamage 200
+#define kDivineWindRadius 500
+#define kElectricalDamage 20
+#define kElectricalMaxTargets 2
+#define kElectricalRange 200
+#define kElectricalUpgradeResearchCost 30
+#define kElectricalUpgradeResearchTime 30
+#define kEnsnareTime 2
+#define kEvolutionCost 0
+#define kEvolutionGestateTime 2
+#define kFadeArmorUpgrade 100
+#define kFadeBaseArmor 150
+#define kFadeBaseSpeed 240
+#define kFadeCost 50
+#define kFadeGestateTime 23
+#define kFadeHealth 300
+#define kFootstepFadeScalar 1300
+#define kFootstepGorgeScalar 500
+#define kFootstepHeavyScalar 1020
+#define kFootstepLerkScalar 1000
+#define kFootstepMarineScalar 800
+#define kFootstepOnosScalar 1200
+#define kFootstepSkulkScalar 800
+#define kFuncResourceInjectionAmount 1
+#define kFuncResourceInjectionTime 4
+#define kGGMaxAmmo 30
+#define kGGMaxClip 4
+#define kGameDownloadSize 150
+#define kGameHDSpaceNeeded 300
+#define kGameVersionMajor 3
+#define kGameVersionMinor 0
+#define kGestateBaseArmor 150
+#define kGestateHealth 200
+#define kGorgeArmorUpgrade 50
+#define kGorgeBaseArmor 50
+#define kGorgeBaseSpeed 170
+#define kGorgeCost 10
+#define kGorgeGestateTime 17
+#define kGorgeHealth 150
+#define kGrenDetonateTime 2
+#define kGrenadeDamage 125
+#define kGrenadeForce 800
+#define kGrenadeLauncherCost 15
+#define kGrenadeRadius 350
+#define kGrenadesResearchCost 20
+#define kGrenadesResearchTime 45
+#define kHGDamage 20
+#define kHGMaxAmmo 30
+#define kHGMaxClip 10
+#define kHMGCost 15
+#define kHMGDamage 20
+#define kHMGMaxAmmo 250
+#define kHMGMaxClip 125
+#define kHandGrenadeDamage 100
+#define kHandGrenadeMaxAmmo 1
+#define kHealingSprayBuildableScalar 5
+#define kHealingSprayDamage 13
+#define kHealingSprayPlayerPercent 4
+#define kHealthCost 2
+#define kHealthResearchCost 15
+#define kHealthResearchTime 20
+#define kHeavyArmorAbsorbPercent 95
+#define kHeavyArmorCost 15
+#define kHeavyArmorResearchCost 40
+#define kHeavyArmorResearchTime 100
+#define kHiveBuildTime 180
+#define kHiveCost 40
+#define kHiveHealRadius 500
+#define kHiveHealth 7000
+#define kHiveRegenerationAmount 2
+#define kInfantryPortalBuildTime 10
+#define kInfantryPortalCost 20
+#define kInfantryPortalHealth 2500
+#define kJetpackCost 15
+#define kJetpacksResearchCost 35
+#define kJetpacksResearchTime 50
+#define kKNDamage 30
+#define kKillRewardMax 3
+#define kKillRewardMin 1
+#define kLeapDamage 80
+#define kLerkArmorUpgrade 30
+#define kLerkBaseArmor 30
+#define kLerkBaseSpeed 175
+#define kLerkCost 30
+#define kLerkGestateTime 20
+#define kLerkHealth 125
+#define kMGDamage 10
+#define kMGMaxAmmo 250
+#define kMGMaxClip 50
+#define kMarineArmorUpgrade 60
+#define kMarineBaseArmor 25
+#define kMarineBaseHeavyArmor 200
+#define kMarineHealth 100
+#define kMarineHeavyArmorUpgrade 90
+#define kMarineRespawnTime 10
+#define kMarineSpawnClips 2
+#define kMaxEnsnareTime 5
+#define kMaxMarineEntitiesAllowedInRadius 50
+#define kMaxTeamStrands 30
+#define kMetabolizeHealAmount 20
+#define kMetabolizeResourceCost 0
+#define kMineCost 10
+#define kMineDamage 125
+#define kMineHealth 20
+#define kMineMaxAmmo 4
+#define kMineMaxAmmoCombat 1
+#define kMineRadius 300
+#define kMotionTrackingResearchCost 35
+#define kMotionTrackingResearchTime 100
+#define kMovementChamberBuildTime 12
+#define kMovementChamberCost 10
+#define kMovementChamberEnergyRange 500
+#define kMovementChamberHealth 1000
+#define kMovementChamberThinkInterval 2
+#define kNumInitialAlienPoints 25
+#define kNumInitialMarinePoints 100
+#define kNumSameAlienStructuresAllowedInRadius 8
+#define kNumWebsAllowedInRadius 8
+#define kObservatoryBuildTime 15
+#define kObservatoryCost 20
+#define kObservatoryHealth 1700
+#define kObservatoryXYDetectionRadius 900
+#define kOffenseChamberBuildTime 11
+#define kOffenseChamberCost 10
+#define kOffenseChamberDamage 20
+#define kOffenseChamberHealth 1000
+#define kOnosArmorUpgrade 350
+#define kOnosBaseArmor 600
+#define kOnosBaseSpeed 240
+#define kOnosCost 75
+#define kOnosGestateTime 38
+#define kOnosHealth 700
+#define kOrganicStructureHealRate 5
+#define kParasiteDamage 10
+#define kPhaseGateBuildTime 12
+#define kPhaseGateCost 15
+#define kPhaseGateHealth 3000
+#define kPhaseTechResearchCost 15
+#define kPhaseTechResearchTime 45
+#define kPheromonesBaseDistance 500
+#define kPheromonesLevelDistance 200
+#define kPointsPerHealth 50
+#define kPrimalScreamRange 500
+#define kPrototypeLabBuildTime 20
+#define kPrototypeLabCost 40
+#define kPrototypeLabHealth 4000
+#define kRecycleTime 20
+#define kResourceTowerActivateTime 2
+#define kResourceTowerBuildDistanceTolerance 250
+#define kResourceTowerBuildTime 15
+#define kResourceTowerCost 15
+#define kResourceTowerHealth 6000
+#define kSGBulletsPerShot 10
+#define kSGDamage 17
+#define kSGMaxAmmo 40
+#define kSGMaxClip 8
+#define kScanDuration 10
+#define kScanEnergyCost 20
+#define kScanRadius 800
+#define kScentOfFearRadiusPerLevel 600
+#define kScoringAlienUpgradeChamberValue 2
+#define kScoringCCValue 5
+#define kScoringHiveValue 8
+#define kScoringKillPlayer 1
+#define kScoringKillPlayerFade 4
+#define kScoringKillPlayerGorge 2
+#define kScoringKillPlayerHA 4
+#define kScoringKillPlayerJetpack 3
+#define kScoringKillPlayerLerk 3
+#define kScoringKillPlayerOnos 5
+#define kScoringMarineBuildableValue 2
+#define kScoringResourceTowerValue 3
+#define kScoringSiegeValue 3
+#define kScoringTurretValue 2
+#define kSensoryChamberBuildTime 14
+#define kSensoryChamberCost 10
+#define kSensoryChamberHealth 800
+#define kSensoryChamberRange 750
+#define kSentryBuildTime 7
+#define kSentryCost 10
+#define kSentryDamage 10
+#define kSentryHealth 1300
+#define kShotgunCost 10
+#define kSiegeBuildTime 10
+#define kSiegeCost 15
+#define kSiegeDamage 330
+#define kSiegeHealth 2000
+#define kSiegeROF 4
+#define kSiegeTurretRange 1100
+#define kSkulkArmorUpgrade 20
+#define kSkulkBaseArmor 10
+#define kSkulkBaseSpeed 290
+#define kSkulkCost 0
+#define kSkulkGestateTime 7
+#define kSkulkHealth 70
+#define kSpikeDamage 16
+#define kSpitGDamage 30
+#define kSporeCloudRadius 225
+#define kSporeCloudTime 6
+#define kSporeDamage 7
+#define kStompRadius 250
+#define kSwipeDamage 80
+#define kTurretFactoryBuildDistance 400
+#define kTurretFactoryBuildTime 13
+#define kTurretFactoryCost 10
+#define kTurretFactoryHealth 3000
+#define kTurretFactoryUpgradeCost 15
+#define kTurretFactoryUpgradeTime 15
+#define kTurretRange 800
+#define kUmbraCloudDuration 3
+#define kUmbraCloudRadius 225
+#define kUmbraEffectiveness 1
+#define kUnencumberedPlayerSpeed 220
+#define kWeaponStayTime 30
+#define kWeaponsOneResearchCost 20
+#define kWeaponsOneResearchTime 60
+#define kWeaponsThreeResearchCost 40
+#define kWeaponsThreeResearchTime 120
+#define kWeaponsTwoResearchCost 30
+#define kWeaponsTwoResearchTime 90
+#define kWelderCost 5
+#define kWelderDamage 4
+#define kWelderRange 90
+#define kWelderRepairRate 60
+
+// Float data (up to three decimal places)
+#define kAcidRocketEnergyCost 0.10
+#define kAcidRocketForceScalar 0.05
+#define kAcidRocketROF 1.00
+#define kAdrenalineEnergyPercentPerLevel 0.33
+#define kAirspeedMultiplier 3.00
+#define kAlertExpireTime 20.00
+#define kAlienArmorLevelOne 0.20
+#define kAlienArmorLevelThree 0.60
+#define kAlienArmorLevelTwo 0.40
+#define kAlienEnergyRate 0.08
+#define kAlienInnateRegenerationPercentage 0.02
+#define kAlienRegenerationPercentage 0.03
+#define kAlienRegenerationTime 2.00
+#define kAlienRespawnTimeModifier 0.30
+#define kArmorAbsorptionBase 0.30
+#define kArmorAbsorptionPerExtraHive 0.10
+#define kArmorValueBase 0.50
+#define kArmorValueNonAlien 2.00
+#define kArmorValuePerHive 0.50
+#define kAudioAlertInterval 6.00
+#define kBileBombEnergyCost 0.22
+#define kBileBombROF 1.50
+#define kBite2EnergyCost 0.05
+#define kBite2ROF 0.64
+#define kBiteEnergyCost 0.05
+#define kBiteROF 0.80
+#define kBlinkEnergyCost 0.04
+#define kBlinkROF 0.05
+#define kCarapaceSlowFactor 0.00
+#define kCatalystDamagePercent 0.25
+#define kCatalystROFFactor 0.25
+#define kCatalystSpeedIncrease 0.25
+#define kChargeEnergyCost 0.07
+#define kChargingEnergyScalar 2.80
+#define kClawsEnergyCost 0.07
+#define kClawsROF 0.90
+#define kCloakTime 6.00
+#define kCombatAdditiveRespawnTime 2.00
+#define kCombatDistressBeaconDeadPercentage 0.70
+#define kCombatExperienceAlienGrowthRate 0.00
+#define kCombatHealExperienceScalar 0.33
+#define kCombatIronManExperienceScalar 3.00
+#define kCombatLevelExperienceModifier 0.50
+#define kCombatModeGestationTimeScalar 0.40
+#define kCombatModeTimeScalar 0.20
+#define kCombatResupplyAmmoPercentage 0.40
+#define kCombatResupplyHealthPercentage 1.00
+#define kCombatSpawnPercentage 0.25
+#define kCombatThinkInterval 3.00
+#define kDebugPVSCoherencyTime 1.00
+#define kDevourEnergyCost 0.20
+#define kDevourROF 2.00
+#define kDigestingSpeedFactor 0.90
+#define kDivineWindEnergyCost 0.70
+#define kDivineWindROF 2.00
+#define kDrawAmount 1.00
+#define kDrawMaxInterval 5.00
+#define kDrawMinInterval 2.00
+#define kElectricalEnergyLoss 0.33
+#define kEnsnareMaximumSpeedFactor 0.60
+#define kEnsnareMinimumSpeedFactor 0.10
+#define kExplodeMaxVerticalSpeed 200
+#define kExplodeMaxHorisontalSpeed 400
+#define kFocusDamageUpgradePercentPerLevel 0.33
+#define kFocusROFPercentSlowdownPerLevel 0.50
+#define kGGROF 1.20
+#define kGrenadeLauncherBaseReloadTime 1.10
+#define kGrenadeLauncherEndReloadTime 1.10
+#define kGrenadeLauncherGrenadeReloadTime 1.10
+#define kHGROF 0.20
+#define kHMGROF 0.10
+#define kHandGrenadePrimeTime 1.00
+#define kHealingSprayEnergyCost 0.15
+#define kHealingSprayROF 1.60
+#define kHeavySpeedMultiplier 0.95
+#define kHiveRegenerationPercentage 0.15
+#define kJetpackSpeedMultiplier 0.95
+#define kJoinTeamCooldown 3.00
+#define kKNROF 0.65
+#define kLeapEnergyCost 0.25
+#define kLerkBaseAscendSpeedMax 600.00
+#define kMGROF 0.10
+#define kMarineArmorLevelOne 0.20
+#define kMarineArmorLevelThree 0.60
+#define kMarineArmorLevelTwo 0.40
+#define kMetabolizeDamageEnergyFactor 0.50
+#define kMetabolizeEnergyAmount 0.35
+#define kMetabolizeEnergyCost 0.25
+#define kMetabolizeROF 2.90
+#define kMetabolizeSpeedFactor 1.00
+#define kMinMarineBuildDistance 60.00
+#define kMinMarinePlayerBuildDistance 16.50
+#define kMovementChamberEnergyAmount 0.25
+#define kOrderIconDrawSize 30.00
+#define kParasiteEnergyCost 0.30
+#define kParasiteROF 0.50
+#define kPhaseGateDelay 2.00
+#define kPhaseGateDepartureInterval 0.80
+#define kPrimalScreamDamageModifier 0.30
+#define kPrimalScreamDuration 4.00
+#define kPrimalScreamEnergyCost 0.45
+#define kPrimalScreamEnergyFactor 0.60
+#define kPrimalScreamROF 5.00
+#define kPrimalScreamROFFactor 0.30
+#define kRecycleResourcePercentage 0.50
+#define kRecloakTime 3.0f
+#define kRedemptionChance 0.45
+#define kRedemptionThreshold 0.40
+#define kReinforcementMinimumWaitLevelScalar 0.20
+#define kReinforcementMinimumWaitScalar 0.50
+#define kResupplyTime 0.90
+#define kSGROF 1.30
+#define kShotgunDamageRange 500.00
+#define kSilenceLevel1Volume 0.50
+#define kSilenceLevel2Volume 0.15
+#define kSilenceLevel3Volume 0.00
+#define kSpikeEnergyCost 0.03
+#define kSpikeROF 0.40
+#define kSpitEnergyCost 0.12
+#define kSpitROF 0.80
+#define kSporeCloudThinkInterval 0.50
+#define kSporeROF 2.00
+#define kSporesEnergyCost 0.35
+#define kStompEnergyCost 0.30
+#define kStompROF 1.50
+#define kStompTime 1.00
+#define kSwipeEnergyCost 0.06
+#define kSwipeROF 0.95
+#define kTouchDamageInterval 0.05
+#define kTurretBaseRateOfFire 0.70
+#define kTurretTrackingRate 1.60
+#define kUmbraEnergyCost 0.30
+#define kUmbraROF 1.00
+#define kUncloakTime 0.50
+#define kWeaponDamageLevelOne 0.10
+#define kWeaponDamageLevelThree 0.30
+#define kWeaponDamageLevelTwo 0.20
+#define kWebEnergyCost 0.18
+#define kWebSpinnerROF 0.50
+#define kWelderBuildingModifier 1.00
+#define kWelderPlayerModifier 0.50
+#define kWelderROF 0.40
diff --git a/main/ResetGamma.exe b/main/ResetGamma.exe
new file mode 100644
index 00000000..ad867b4d
Binary files /dev/null and b/main/ResetGamma.exe differ
diff --git a/main/SteamifyTitles.pl b/main/SteamifyTitles.pl
new file mode 100644
index 00000000..131c9855
--- /dev/null
+++ b/main/SteamifyTitles.pl
@@ -0,0 +1,167 @@
+#
+# Updates titles.txt to Steam format.  Written by Charlie Cleveland.
+#
+local ($kVersion, $inputFilename, $modName, $languageName, $numTranslationsFound, $outputFilename, %translationData);
+
+#
+# Constants
+#
+$kVersion = "v1.0";
+$inputFilename = "";
+$modName = "";
+$languageName = "";
+$numTranslationsFound = 0;
+$outputFilename = "";
+
+sub Main;
+Main();
+
+sub Main
+{
+	print "\nRunning SteamifyTitles $kVersion by Charlie Cleveland (flayra\@overmind.org)\n\n";
+
+	# Read mod name, input filename and language name
+	$numArgs = $#ARGV + 1;
+
+	if($numArgs < 3)
+	{
+		print "Usage: <input titles.txt> <mod name> <language name> <optional \"y\" if you want to convert input titles.txt>";
+		print "Run from within your mod directory.\n"
+	}
+	else
+	{
+		# Parse arguments
+		$inputFilename = $ARGV[0];
+		$modName = $ARGV[1];
+		$languageName = $ARGV[2];
+		$convertTitles = 0;
+		
+		if($numArgs > 3)
+		{
+			if($ARGV[3] == "y")
+			{
+				$convertTitles = 1;
+			}
+		}
+
+		#print "\nReading $inputFilename, for mod $modName, in language $languageName...\n";
+
+		# Read in file name specified on command line
+		print "Reading old titles from $inputFilename.\n";
+		open(INFILE, $inputFilename) or die "Couldn't open $inputFilename for reading.\n";
+
+		# Read all data into one string
+		local $/;
+		my $theData = <INFILE>;
+		#print $theData;
+
+		#while( $theData =~ m/ (\w+) \s* \{(.*?)\} /sgx) 
+		while( $theData =~ m/ (\w+) \s* \{(.*?)\} /sgx) 
+		{
+			my $theKey = $1;
+			my $theUntrimmedValue = $2;
+			if($theUntrimmedValue =~ s/(.*?)\n+/ /g)
+			{
+				my $theTrimmedData = $1;
+
+				# Skip comments?
+				#if(index($theKey, "//") != -1)
+				#{
+				#	print "Skipping line: \"$theKey\" = \"$theTrimmedData\"\n";
+				#}
+				#else
+				#{
+					#print "Found pair: \"$theKey\" = \"$theTrimmedData\"\n";
+							
+					$translationData{$theKey} = $theTrimmedData;
+					$numTranslationsFound++;
+				#}
+			}
+		}
+
+		close(INFILE);
+
+		print "Found $numTranslationsFound translations.\n";
+
+		if($numTranslationsFound > 0)
+		{
+			# Open file for writing as resource/modname_language.txt
+			$outputFilename = lc("resource/$modName") . "_" . lc($languageName) . ".txt";
+			print "Writing $outputFilename.\n";
+
+			open(OUTFILE, ">$outputFilename") or die "Couldn't open file $outputFilename for writing.\n";
+			
+			my $kLineDelimiter = "\n";
+			my $kLineSpaceDelimiter = " \n";
+			my $kPairSeparator = "\t\t\t";
+
+			# Write "lang" tag
+			print OUTFILE "\"lang\"$kLineSpaceDelimiter";
+
+			my $caseProperLanguage = lc($languageName);
+			$caseProperLanguage = ucfirst($caseProperLanguage);
+
+			# Write "Language" tag
+			print OUTFILE "{$kLineSpaceDelimiter";
+			print OUTFILE "\"Language\"$kPairSeparator\"$caseProperLanguage\"$kLineSpaceDelimiter";
+
+			# Write "Tokens" tag
+			print OUTFILE "\"Tokens\"$kLineSpaceDelimiter\{$kLineSpaceDelimiter";
+
+			# For each translation pair
+			my $key;
+			my $value;
+
+			# sort( keys( %hash ))
+			#while(($key, $value) = each %translationData)
+			foreach my $key ( sort(keys(%translationData)))
+			{
+				my $value = $translationData{$key};
+				
+				# Substitute any " for ', or HL stops reading the translation file
+				$value =~ s/\"/\'/g;
+
+				if(length($value) == 0)
+				{
+					print (" Skipping empty entry for \"$key\"\n");
+				}
+				else
+				{
+					my $theOutputString = "\"$key\"$kPairSeparator\"$value\"$kLineDelimiter";
+					#print $theOutputString;
+					print OUTFILE $theOutputString;
+				}
+			}
+
+			# Write ending braces
+			print OUTFILE "}$kLineSpaceDelimiter";
+			print OUTFILE "}$kLineSpaceDelimiter";
+			print OUTFILE "$kLineDelimiter$kLineDelimiter$kLineDelimiter";
+
+			# close output file
+			#print("Closing $outputFilename...");
+
+			close(OUTFILE);
+
+			# if we're writing new titles.txt
+			if($convertTitles == 1)
+			{
+				my $newTitlesName = "titles.txt";
+				print("Writing $newTitlesName in VGUI2 format...");
+				open(TITLESFILE, ">$newTitlesName") or die "Couldn't open $newTitlesName for writing.\n";
+
+				foreach my $key ( sort(keys(%translationData)))
+				{
+					print TITLESFILE "$key\n";
+					print TITLESFILE "\{\n\#$key\n\}\n\n";
+				}
+				print "done.\n";
+
+				close(TITLESFILE);
+			}
+
+			print "Done.  Don't forget to save \"$outputFilename\" as Unicode using Notepad before using.\n";
+		}
+	}
+}
+
diff --git a/main/assets-client-source.txt b/main/assets-client-source.txt
new file mode 100644
index 00000000..ef399da4
--- /dev/null
+++ b/main/assets-client-source.txt
@@ -0,0 +1,15 @@
+; HL client code
+source/external/vgui/include/*.*
+source/external/vgui/lib/win32_vc6/*.*
+
+; Misc client code
+source/utils/vgui/include/*.*
+source/utils/vgui/lib/win32_vc6/*.*
+
+; NS client code
+source/cl_dll/*.*
+source/cl_dll/hl/*.*
+source/fmod/inc/*.*
+source/fmod/lib/*.*
+source/ui/*.*
+
diff --git a/main/assets-common.txt b/main/assets-common.txt
new file mode 100644
index 00000000..cb9d5c0d
--- /dev/null
+++ b/main/assets-common.txt
@@ -0,0 +1,242 @@
+; Note: Its probably best to keep the server-side pretty much identicle as the client.
+
+; Code
+cl_dlls/client.dll
+dlls/ns.dll
+dlls/ns_i386.so  ; This is not needed or desired on the client, but this new system doesn't easily allow its removal
+
+; Events
+events/*.*
+
+; GFX
+gfx/*.*
+
+; Manual 
+;manual/*.html
+;manual/css/*.css
+;manual/images/design/*.gif
+;manual/images/design/red/*.gif
+;manual/images/evolutions/*.gif
+;manual/images/images/*.gif
+;manual/images/images/*.jpg
+;manual/images/tech/*.gif
+;manual/images/tech_10/*.gif
+;manual/images/titles/*.gif
+
+; Media
+media/*.*
+music/*.*
+
+
+; Models
+models/player/*.*
+models/acidrocket.mdl
+models/b_*.mdl
+models/ba_*.mdl
+models/bilebomb.mdl
+models/grenade.mdl
+models/hive.mdl
+models/hivet.mdl
+models/null.mdl
+models/p_*.mdl
+models/parasite.mdl
+models/player.mdl
+models/pshell.mdl		; Still needed?
+models/shell.mdl		; Causing strange errors with mp_consistency, so include it for safety
+models/shotshell.mdl
+models/stomp.mdl
+models/spike.mdl
+models/v_*.mdl
+models/w_*.mdl
+models/holo*.mdl		; Utility models from Merks, that he thought others would want to use
+models/agibs.mdl
+models/hgibs.mdl
+
+; Sound
+sound/hud/*.wav
+sound/UI/*.wav
+sound/materials.txt
+sound/ambience/*.mp3
+sound/ambience/*.wav
+sound/buttons/button*.wav
+sound/common/wpn_*.wav
+;sound/debris/*.wav
+sound/doors/*.wav
+sound/fans/*.wav
+sound/items/*.wav
+sound/misc/*.wav
+sound/plats/*.wav
+sound/player/*.wav
+sound/turret/*.wav
+sound/vox/asay*.wav
+sound/vox/sack*.wav
+sound/vox/sreq*.wav
+sound/vox/ssay*.wav
+sound/weapons/*.wav
+
+; Sprites
+sprites/hud.txt
+sprites/weapon_*.txt
+sprites/320*.spr
+sprites/640*.spr
+sprites/acidsplash.spr
+sprites/aliennode.spr
+sprites/bacteria.spr
+sprites/bilebomb.spr
+sprites/bigspit.spr
+sprites/blank.spr
+sprites/blink.spr
+sprites/blink2.spr
+sprites/blip*.spr
+sprites/blueball.spr
+sprites/blueball2.spr
+sprites/bluespark.spr
+sprites/bubble.spr
+sprites/bubble2.spr
+sprites/buildcircle.spr
+sprites/camera.spr
+sprites/chamberdeath.spr
+sprites/commandbutton.spr
+sprites/commandstatus.spr
+sprites/flare1.spr
+sprites/flare2.spr
+sprites/flare3.spr
+sprites/flare6.spr
+sprites/green.spr
+sprites/hack.spr
+sprites/haze.spr
+sprites/hivehealth.spr
+sprites/lightsmoke.spr
+sprites/muzzleflash1.spr
+sprites/muzzleflash2.spr
+sprites/muzzleflash3.spr
+sprites/nsteleport.spr
+sprites/pheromone.spr
+sprites/raindrop.spr
+sprites/raindrop2.spr
+sprites/reticle.spr
+sprites/spikehit.spr
+sprites/spithit.spr
+sprites/spore.spr
+sprites/spore2.spr
+sprites/steam1.spr
+sprites/stomp.spr
+sprites/tile.spr
+sprites/tinyspit.spr
+sprites/turretsmoke.spr
+sprites/umbra.spr
+sprites/umbra2.spr
+sprites/upgrades.spr
+sprites/voiceicon.spr
+sprites/wallpuff.spr
+sprites/webprojectile.spr
+sprites/webstrand.spr
+sprites/welddrip.spr
+sprites/weldsmoke.spr
+sprites/white.spr
+sprites/xhair*.spr
+sprites/xspark1.spr
+sprites/xspark4.spr
+sprites/techtree/tech*.spr
+sprites/640experience.spr
+sprites/320experience.spr
+sprites/alert.spr
+sprites/aliencursor.spr
+sprites/b-build.spr
+sprites/b-health.spr
+sprites/ba-build.spr
+sprites/ba-health.spr
+sprites/cursors.spr
+sprites/digesting.spr
+sprites/dustlight.spr
+sprites/comm-blip.spr
+sprites/fov.spr
+sprites/hiveinfo.spr
+sprites/helpicons.spr
+sprites/hera_fog.spr
+sprites/hudorder.spr
+;sprites/iflag*.spr
+sprites/iplayer*.spr
+sprites/itech.spr
+sprites/logout.spr
+sprites/mainhud.spr
+sprites/marinenode.spr
+sprites/membrane.spr
+sprites/ns.spr
+;sprites/overwatch-aim.spr
+;sprites/overwatch-center.spr
+;sprites/overwatch-target.spr
+sprites/scan.spr
+sprites/selectall.spr
+sprites/small640alienconnector.spr
+sprites/structurescursor.spr
+sprites/topdownbg.spr
+sprites/topdownbottom.spr
+sprites/topdowntop.spr
+
+; New font rendering
+sprites/font_aria*.*
+
+; Avoid verbose Steam problems
+sprites/ch_sniper.spr
+
+; Resources 
+resource/*.tga
+resource/*.res
+resource/*.txt
+resource/background/*.tga
+;resource/sound/UI/*.wav
+
+; Misc.
+1024_textscheme.txt
+1152_textscheme.txt
+1280_textscheme.txt
+1600_textscheme.txt
+320_textscheme.txt
+400_textscheme.txt
+512_textscheme.txt
+640_textscheme.txt
+800_textscheme.txt
+Balance.txt
+cached.wad
+config.cfg
+custom.hpk
+decals.wad
+delta.lst
+english_titles.txt
+fmod.dll
+french_titles.txt
+gamma_tune.exe
+german_titles.txt
+gfx.wad
+hallwall_1.wad
+liblist.gam
+listenserver.cfg
+mapcycle.txt
+motd.txt
+ns-hltv.bat
+ns-hltv.cfg
+ns-hltv.tga
+ns.fgd
+ns.ico
+ns.ps
+ns.qrk
+ns.wad
+ns2.wad
+nshulls.txt
+readme.txt
+ResetGamma.exe
+server.cfg
+settings.scr
+skill.cfg
+spanish_titles.txt
+spraypaint.wad
+tempdecal.wad
+titles.txt
+turkish_titles.txt
+ui.txt
+user.scr
+userconfig.cfg
+voice_ban.dt
+v_wad.wad
+wall_lab.wad
\ No newline at end of file
diff --git a/main/assets-ignore-source.txt b/main/assets-ignore-source.txt
new file mode 100644
index 00000000..74f20568
--- /dev/null
+++ b/main/assets-ignore-source.txt
@@ -0,0 +1,7 @@
+*.idb
+*.pcb
+*.pch
+*.pdb
+*.obj
+*.plg
+source/doc/*.*
diff --git a/main/assets-maps.txt b/main/assets-maps.txt
new file mode 100644
index 00000000..389532af
--- /dev/null
+++ b/main/assets-maps.txt
@@ -0,0 +1,160 @@
+;
+;Classic Maps
+;
+
+
+; ns_altair
+maps/ns_altair.*
+sprites/minimaps/ns_altair.spr
+
+; ns_ayumi
+ns_ayumi.wad
+maps/ns_ayumi.*
+sound/ns_ayumi/*.*
+sprites/minimaps/ns_ayumi.spr
+sprites/ns_ayumi/*.spr
+
+
+; ns_bast
+ns_bast.wad
+maps/ns_bast.*
+models/ns_bast/*.mdl
+sprites/minimaps/ns_bast.spr
+sprites/ns_bast/*.spr
+
+
+; ns_caged
+maps/ns_caged.*
+sound/ns_caged/*.wav
+sprites/minimaps/ns_caged.spr
+
+
+; ns_eclipse
+ns_eclipse.wad
+maps/ns_eclipse.*
+sprites/minimaps/ns_eclipse.spr
+
+; ns_eon
+ns_eon.wad
+maps/ns_eon.*
+sprites/minimaps/ns_eon.spr
+
+
+; ns_hera
+ns_hera.wad
+maps/ns_hera.*
+models/ns_hera/*.mdl
+models/chair1.mdl
+sprites/minimaps/ns_hera.spr
+sprites/hera_fog.spr
+
+
+; ns_lost
+ns_lost.wad
+maps/ns_lost.*
+sound/ns_lost/*.mp3
+sprites/minimaps/ns_lost.spr
+
+
+; ns_metal
+ns_metal.wad
+maps/ns_metal.*
+;models/ns_metal/*.mdl
+sprites/minimaps/ns_metal.spr
+sprites/ns_metal/*.spr
+
+
+; ns_nancy
+ns_nancy.wad
+maps/ns_nancy.*
+models/ns_nancy/*.mdl
+sound/ns_nancy/*.wav
+sprites/minimaps/ns_nancy.spr
+
+
+; ns_nothing
+ns_nothing.wad
+maps/ns_nothing.*
+models/ns_nothing/*.mdl
+sprites/minimaps/ns_nothing.spr
+sprites/ns_nothing/*.spr
+
+
+; ns_origin
+maps/ns_origin.*
+models/ns_origin/*.mdl
+sound/ns_origin/*.wav
+sprites/minimaps/ns_origin.spr
+
+
+; ns_tanith
+ns_tanith.wad
+maps/ns_tanith.*
+models/ns_tanith/*.mdl
+sprites/minimaps/ns_tanith.spr
+sprites/ns_tanith/*.spr
+
+
+; ns_veil
+maps/ns_veil.*
+sprites/minimaps/ns_veil.spr
+
+
+; 
+; Combat Maps
+;
+
+
+; co_angst
+maps/co_angst.*
+sprites/minimaps/co_angst.spr
+
+
+; co_core
+maps/co_core.*
+sprites/minimaps/co_core.spr
+
+
+; co_daimos
+maps/co_daimos.*
+sprites/minimaps/co_daimos.spr
+sound/co_daimos/*.wav
+models/co_daimos/*.mdl
+
+; co_faceoff
+maps/co_faceoff.*
+sprites/minimaps/co_faceoff.spr
+
+; co_niveus
+co_niveus.wad
+maps/co_niveus.*
+sound/co_niveus/*.wav
+models/co_niveus/*.mdl
+sprites/co_niveus/*.spr
+gfx/env/arcn*.tga
+
+
+; co_pulse
+maps/co_pulse.*
+sprites/minimaps/co_pulse.spr
+
+;co_kestrel
+co_kestrel.wad
+maps/co_kestrel.*
+sound/co_kestrel/*.wav
+models/co_kestrel/*.mdl
+sprites/minimaps/co_kestrel.spr
+
+; co_sava
+maps/co_sava.*
+sound/co_sava/*.wav
+models/co_sava/*.mdl
+
+; co_ulysses
+maps/co_ulysses.*
+sound/co_ulysses/*.wav
+sprites/minimaps/co_ulysses.spr
+sprites/co_ulysses/*.spr
+
+
+
diff --git a/main/assets-server-source.txt b/main/assets-server-source.txt
new file mode 100644
index 00000000..e8451af3
--- /dev/null
+++ b/main/assets-server-source.txt
@@ -0,0 +1,67 @@
+; List of files to zip
+
+; CURL
+source/curl/*.*
+;source/curl/docs/*.*
+;source/curl/docs/examples/*.*
+;source/curl/docs/libcurl/*.*
+source/curl/include/*.*
+source/curl/lib/*.*
+source/curl/packages/*.*
+source/curl/packages/Linux/*.*
+source/curl/packages/Linux/RPM/*.*
+source/curl/packages/Win32/*.*
+source/curl/packages/Win32/cygwin/*.*
+;source/curl/src/*.*
+;source/curl/tests/*.*
+;source/curl/tests/data/*.*
+;curl/tests/libtest/*.*
+;source/curl/tests/server/*.*
+
+; HL server code
+source/dlls/*.h
+source/dlls/*.cpp
+source/dlls/*.def
+source/dlls/*.dsp
+
+; NS server code
+source/linux/Makefile
+source/linux/build-curl.sh
+source/textrep/*.*
+
+; stlport
+source/stlport/*.
+source/stlport/etc/*.
+source/stlport/etc/*.*
+source/stlport/src/*.*
+source/stlport/stlport/*.
+source/stlport/stlport/*.*
+source/stlport/stlport/stl/*.*
+source/stlport/stlport/stl/wrappers/*.*
+source/stlport/stlport/config/*.*
+source/stlport/stlport/using/*.
+source/stlport/stlport/using/h/*.*
+
+; TODO: UPP
+;source/upp/common/*.h
+;source/upp/*.h
+;source/upp/common/DataObjects/*.*
+;source/upp/common/MultiThreading/*.*
+;source/upp/common/*.*
+;source/upp/common/*.*
+;source/upp/common/*.*
+
+; HPB_bot server
+source/HPB_bot/dlls/*.cfg
+source/HPB_bot/dlls/*.dsp
+source/HPB_bot/dlls/*.h
+source/HPB_bot/dlls/*.cpp
+source/HPB_bot/dlls/*.dsw
+source/HPB_bot/dlls/makefile*
+source/HPB_bot/dlls/*.dat
+source/HPB_bot/engine/*.h
+source/HPB_bot/exports/*.c
+source/HPB_bot/exports/*.dsp
+
+; Install .sh
+*.sh
\ No newline at end of file
diff --git a/main/assets-shared-source.txt b/main/assets-shared-source.txt
new file mode 100644
index 00000000..fb95c418
--- /dev/null
+++ b/main/assets-shared-source.txt
@@ -0,0 +1,35 @@
+; HL shared code
+source/common/*.*
+source/dlls/wpn_shared/*.*
+source/engine/*.h
+source/game_shared/*.h
+source/game_shared/*.cpp
+source/pm_shared/*.h
+source/pm_shared/*.cpp
+		   
+; NS shared code
+Balance.txt
+source/build.h
+source/localassert.h
+source/StratHL.dsw
+source/types.h
+source/lua/*.dsp
+source/lua/etc/*.c
+source/lua/include/*.h
+source/lua/src/*.h
+source/lua/src/*.c
+source/lua/src/lib/*.c
+source/lua/src/lua/*.c
+source/mod/*.h
+source/mod/*.cpp
+source/particles/*.cpp
+source/particles/*.h
+source/particles/*.dsp
+source/util/*.*
+source/utils/common/*.h
+source/utils/common/*.c
+source/utils/sprgen/*.h
+source/utils/sprgen/*.c
+source/utils/sprgen/*.dsp
+source/utils/sprgen/*.dsw
+
diff --git a/main/backupserversrc.bat b/main/backupserversrc.bat
new file mode 100644
index 00000000..f2b5d900
--- /dev/null
+++ b/main/backupserversrc.bat
@@ -0,0 +1,3 @@
+@echo off (subdirs, prompt for password <-s>, date)
+c:\"program files"\Winzip\wzzip.exe -P -s -r -ex NS-server-src.zip @assets-shared-source.txt @assets-server-source.txt -x@assets-ignore-source.txt
+
diff --git a/main/backupsrc.bat b/main/backupsrc.bat
new file mode 100644
index 00000000..e5fb760f
--- /dev/null
+++ b/main/backupsrc.bat
@@ -0,0 +1,4 @@
+@echo off (subdirs, prompt for password <-s>, date)
+REM c:\"program files"\Winzip\wzzip.exe -p -r -s -ex NS-src.zip @SourceAssets.txt
+c:\"program files"\Winzip\wzzip.exe -P -r -s -ex NS-full-src.zip @assets-client-source.txt @assets-shared-source.txt @assets-server-source.txt -x@assets-ignore-source.txt
+
diff --git a/main/build-linux.sh b/main/build-linux.sh
new file mode 100644
index 00000000..54dd0340
--- /dev/null
+++ b/main/build-linux.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+export CC=gcc-2.95
+export CPP=cpp-2.95
+export CXX=g++-2.95
+rm -R source -f
+mkdir source
+cd source
+unzip -a ../NS-server-src.zip
+cd source/curl
+dos2unix *
+chmod u+rwx *
+./configure --build=i386-linux
+make clean
+make
+cd ../linux
+make
diff --git a/main/builddiff.bat b/main/builddiff.bat
new file mode 100644
index 00000000..7db23162
--- /dev/null
+++ b/main/builddiff.bat
@@ -0,0 +1,2 @@
+@echo off (subdirs, prompt for password <-s>, date)
+c:\"Program Files"\Winzip\wzzip.exe -P -r -ex -t100105 NS-diff.zip @assets-common.txt @assets-maps.txt
diff --git a/main/buildfull.bat b/main/buildfull.bat
new file mode 100644
index 00000000..1966a0a9
--- /dev/null
+++ b/main/buildfull.bat
@@ -0,0 +1,2 @@
+@echo off (subdirs, prompt for password <-s>, date)
+c:\"program files"\Winzip\wzzip.exe -P -r -ex NS-full.zip @assets-common.txt @assets-maps.txt
\ No newline at end of file
diff --git a/main/buildfullserver.bat b/main/buildfullserver.bat
new file mode 100644
index 00000000..e9bfb4e5
--- /dev/null
+++ b/main/buildfullserver.bat
@@ -0,0 +1,3 @@
+@echo off (subdirs, prompt for password <-s>, date)
+c:\"program files"\Winzip\wzzip.exe -P -r -ex NS-full-server.zip @assets-server.txt @assets-ns_agora.txt @assets-ns_ayumi.txt @assets-ns_caged.txt @assets-ns_eclipse.txt @assets-ns_hera.txt @assets-ns_lost.txt @assets-ns_metal.txt @assets-ns_mineshaft.txt @assets-ns_nancy.txt @assets-ns_nothing.txt @assets-ns_origin.txt @assets-ns_tanith.txt @assets-ns_veil.txt @assets-combat.txt
+move NS-full-server.zip c:\download
diff --git a/main/cached.wad b/main/cached.wad
new file mode 100644
index 00000000..a1c3c323
Binary files /dev/null and b/main/cached.wad differ
diff --git a/main/cl_dlls/client.dll b/main/cl_dlls/client.dll
new file mode 100644
index 00000000..a5a23aa5
Binary files /dev/null and b/main/cl_dlls/client.dll differ
diff --git a/main/co_ether.wad b/main/co_ether.wad
new file mode 100644
index 00000000..8982be8d
Binary files /dev/null and b/main/co_ether.wad differ
diff --git a/main/co_kestrel.wad b/main/co_kestrel.wad
new file mode 100644
index 00000000..b497117a
Binary files /dev/null and b/main/co_kestrel.wad differ
diff --git a/main/config.cfg b/main/config.cfg
new file mode 100644
index 00000000..becac51b
--- /dev/null
+++ b/main/config.cfg
@@ -0,0 +1,178 @@
+// This file is overwritten whenever you change your user settings in the game.
+// Add custom configurations to the file "userconfig.cfg".
+
+unbindall
+bind "TAB" "+showscores"
+bind "ENTER" "messagemode"
+bind "ESCAPE" "cancelselect"
+bind "SPACE" "+jump"
+bind "'" "+moveup"
+bind "+" "sizeup"
+bind "," "impulse 123"
+bind "-" "sizedown"
+bind "." "impulse 124"
+bind "/" "impulse 125"
+bind "0" "slot10"
+bind "1" "slot1"
+bind "2" "slot2"
+bind "3" "slot3"
+bind "4" "slot4"
+bind "5" "slot5"
+bind "6" "slot6"
+bind "7" "slot7"
+bind "8" "slot8"
+bind "9" "slot9"
+bind ";" "+mlook"
+bind "=" "sizeup"
+bind "[" "invprev"
+bind "]" "invnext"
+bind "`" "toggleconsole"
+bind "a" "+moveleft"
+bind "c" "+showmap"
+bind "d" "+moveright"
+bind "e" "+use"
+bind "f" "impulse 100"
+bind "g" "impulse 3"
+bind "l" "impulse 105"
+bind "q" "lastinv"
+bind "r" "+reload"
+bind "s" "+back"
+bind "t" "impulse 201"
+bind "u" "messagemode2"
+bind "v" "impulse 9"
+bind "w" "+forward"
+bind "x" "impulse 81"
+bind "y" "messagemode"
+bind "z" "impulse 80"
+bind "~" "toggleconsole"
+bind "UPARROW" "+forward"
+bind "DOWNARROW" "+back"
+bind "LEFTARROW" "+left"
+bind "RIGHTARROW" "+right"
+bind "ALT" "+voicerecord"
+bind "CTRL" "+duck"
+bind "SHIFT" "+speed"
+bind "F1" "jointeamone"
+bind "F2" "jointeamtwo"
+bind "F3" "autoassign"
+bind "F4" "readyroom"
+bind "F5" "snapshot"
+bind "F6" "save quick"
+bind "F7" "load quick"
+bind "F10" "quit prompt"
+bind "INS" "+klook"
+bind "PGDN" "+lookdown"
+bind "PGUP" "+lookup"
+bind "END" "centerview"
+bind "MWHEELDOWN" "invnext"
+bind "MWHEELUP" "invprev"
+bind "MOUSE1" "+attack"
+bind "MOUSE2" "+popupmenu"
+bind "MOUSE3" "+popupmenu"
+bind "MOUSE4" "lastinv"
+bind "PAUSE" "pause"
+_snd_mixahead "0.1"
+ati_npatch "1.0"
+ati_subdiv "2.0"
+bgmvolume "1.000000"
+bottomcolor "144.889999"
+brightness "1.000000"
+cl_allowdownload "1"
+cl_allowupload "1"
+cl_autohelp "1.0"
+cl_buildmessages "1"
+cl_centerentityid "0.0"
+cl_cmdbackup "2"
+cl_cmdrate "30"
+cl_cmhotkeys "qwerasdfzxcv"
+cl_dlmax "128"
+cl_download_ingame "1"
+cl_dynamiclights "1"
+cl_forcedefaultfov "0"
+cl_highdetail "1"
+cl_himodels "0"
+cl_idealpitchscale "0.8"
+cl_lc "1"
+cl_logocolor "#Valve_Orange"
+cl_logofile "lambda"
+cl_lw "1"
+cl_musicdelay "90"
+cl_musicdirectory ""
+cl_musicenabled "1.0"
+cl_musicvolume "155"
+cl_particleinfo "0"
+cl_quickselecttime ".15"
+cl_timeout "60"
+cl_updaterate "20"
+cl_vsmoothing "0.05"
+con_color "255 180 30"
+console "1.000000"
+crosshair "1.000000"
+fps_max "72.0"
+fps_modem "0.0"
+gamma "2.500000"
+gl_dither "1"
+gl_flipmatrix "0"
+gl_fog "1"
+gl_monolights "0"
+gl_overbright "0"
+gl_polyoffset "0.1"
+hisound "1"
+hpk_maxsize "4"
+hud_capturemouse "1"
+hud_centerid "0"
+hud_classautokill "1"
+hud_draw "1"
+hud_fastswitch "0"
+hud_takesshots "0"
+joystick "0"
+lookspring "0.000000"
+lookstrafe "0.000000"
+m_filter "0"
+m_forward "1"
+m_pitch "0.022000"
+m_side "0.8"
+m_yaw "0.022"
+model "barney"
+MP3FadeTime "2.0"
+MP3Volume "0.8"
+mp_decals "300"
+name "NSPlayer"
+net_graph "0"
+net_graphpos "1"
+net_scale "5"
+r_bmodelhighfrac "5.0"
+r_detailtextures "0"
+s_a3d "0.0"
+s_automax_distance "30.0"
+s_automin_distance "2.0"
+s_bloat "2.0"
+s_distance "60"
+s_doppler "0.0"
+s_eax "0.0"
+s_leafnum "0"
+s_max_distance "1000.0"
+s_min_distance "8.0"
+s_numpolys "200"
+s_polykeep "1000000000"
+s_polysize "10000000"
+s_refdelay "4"
+s_refgain "0.4"
+s_rolloff "1.0"
+s_verbwet "0.25"
+sensitivity "4.960000"
+skin ""
+suitvolume "0.250000"
+sv_aim "0"
+sv_voiceenable "1"
+team ""
+topcolor "151.169998"
+viewsize "120.000000"
+voice_enable "1"
+voice_forcemicrecord "1"
+voice_modenable "1"
+voice_scale "1"
+volume "0.800000"
++mlook
++jlook
+exec userconfig.cfg
diff --git a/main/custom.hpk b/main/custom.hpk
new file mode 100644
index 00000000..32f72e8f
Binary files /dev/null and b/main/custom.hpk differ
diff --git a/main/decals.wad b/main/decals.wad
new file mode 100644
index 00000000..477dbe53
Binary files /dev/null and b/main/decals.wad differ
diff --git a/main/delta.lst b/main/delta.lst
new file mode 100644
index 00000000..583637de
--- /dev/null
+++ b/main/delta.lst
@@ -0,0 +1,268 @@
+// structure name
+// none == no conditional encode routine
+// gamedll routine_name : before transmitting data, invoke the named function from the game .dll to reset fields as needed
+// clientdll routine_name : same as above, except the routine is called via the client.dll
+
+clientdata_t none                    
+{
+	DEFINE_DELTA( flTimeStepSound, DT_INTEGER, 10, 1.0 ),
+	DEFINE_DELTA( origin[0], DT_SIGNED | DT_FLOAT, 21, 128.0 ),
+	DEFINE_DELTA( origin[1], DT_SIGNED | DT_FLOAT, 21, 128.0 ),
+	DEFINE_DELTA( velocity[0], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( velocity[1], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+
+	DEFINE_DELTA( m_flNextAttack, DT_FLOAT | DT_SIGNED, 22, 1000.0 ),
+
+	DEFINE_DELTA( origin[2], DT_SIGNED | DT_FLOAT, 21, 128.0 ),
+	DEFINE_DELTA( velocity[2], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+
+	DEFINE_DELTA( ammo_nails, DT_SIGNED | DT_INTEGER, 10, 1.0 ),
+	DEFINE_DELTA( ammo_shells, DT_SIGNED | DT_INTEGER, 10, 1.0 ),
+	DEFINE_DELTA( ammo_cells, DT_SIGNED | DT_INTEGER, 10, 1.0 ),
+	DEFINE_DELTA( ammo_rockets, DT_SIGNED | DT_INTEGER, 10, 1.0 ),
+
+	DEFINE_DELTA( m_iId, DT_INTEGER, 8, 1.0 ),
+
+	DEFINE_DELTA( punchangle[2], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( flags, DT_INTEGER, 32, 1.0 ), // Cut to 3 bits?
+	DEFINE_DELTA( weaponanim, DT_INTEGER, 8, 1.0 ),
+	DEFINE_DELTA( health, DT_SIGNED | DT_FLOAT, 12, 1.0 ), // Cut # of bits?
+	DEFINE_DELTA( maxspeed, DT_FLOAT, 16, 10.0 ),
+	DEFINE_DELTA( flDuckTime, DT_INTEGER, 10, 1.0 ),
+	DEFINE_DELTA( view_ofs[2], DT_SIGNED | DT_FLOAT, 10, 4.0 ),
+	DEFINE_DELTA( punchangle[0], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( punchangle[1], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( viewmodel, DT_INTEGER, 10, 1.0 ),
+	DEFINE_DELTA( weapons, DT_INTEGER, 32, 1.0 ),
+
+	DEFINE_DELTA( pushmsec, DT_INTEGER, 11, 1.0 ),
+	DEFINE_DELTA( deadflag, DT_INTEGER, 3, 1.0 ),
+	DEFINE_DELTA( fov, DT_FLOAT, 8, 1.0 ),
+	DEFINE_DELTA( physinfo, DT_STRING, 1, 1.0 ),
+	DEFINE_DELTA( bInDuck, DT_INTEGER, 1, 1.0 ),
+	DEFINE_DELTA( flSwimTime, DT_INTEGER, 10, 1.0 ),
+	DEFINE_DELTA( waterjumptime, DT_INTEGER, 15, 1.0 ),
+	DEFINE_DELTA( waterlevel, DT_INTEGER, 2, 1.0 ),
+	DEFINE_DELTA( iuser1, DT_INTEGER, 3, 1.0 ),				// Non-zero if I'm a spectator (1,2,3 different spec modes)
+	DEFINE_DELTA( iuser2, DT_INTEGER, 5, 1.0 ),				// Holds the ent num of the target I'm spectating
+	DEFINE_DELTA( iuser3, DT_INTEGER, 6, 1.0 ),				// NS custom code
+	DEFINE_DELTA( iuser4, DT_INTEGER, 32, 1.0 ),			// NS custom parameter (needs 32 for AvHSpecialSound)
+	DEFINE_DELTA( fuser1, DT_FLOAT, 32, 1.0 ),				// Use 32-bits because two values fit in here sometimes
+	DEFINE_DELTA( fuser2, DT_FLOAT, 32, 1.0 ),				// Not sure if we need all 32, go back and optimize later if desired
+	DEFINE_DELTA( fuser3, DT_FLOAT, 32, 1.0 ),				// Not sure if we need all 32, go back and optimize later if desired
+	DEFINE_DELTA( vuser1[0], DT_ANGLE, 8, 1.0 ),
+	DEFINE_DELTA( vuser1[1], DT_ANGLE, 8, 1.0 ),
+	DEFINE_DELTA( vuser1[2], DT_ANGLE, 8, 1.0 ),
+	DEFINE_DELTA( vuser4[2], DT_FLOAT, 32, 1.0 )			// Extended player info
+}
+
+entity_state_t gamedll Entity_Encode
+{
+	DEFINE_DELTA( animtime, DT_TIMEWINDOW_8, 8, 1.0 ),
+	DEFINE_DELTA( frame, DT_FLOAT, 8, 1.0 ),
+	DEFINE_DELTA( origin[0], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( angles[0], DT_ANGLE, 16, 1.0 ),
+	DEFINE_DELTA( angles[1], DT_ANGLE, 16, 1.0 ),
+	DEFINE_DELTA( origin[1], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( origin[2], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( sequence, DT_INTEGER, 8, 1.0 ),
+	DEFINE_DELTA( modelindex, DT_INTEGER, 10, 1.0 ),
+	DEFINE_DELTA( movetype, DT_INTEGER, 4, 1.0 ),
+	DEFINE_DELTA( solid, DT_SHORT, 3, 1.0 ),
+	DEFINE_DELTA( mins[0], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( mins[1], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( mins[2], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( maxs[0], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( maxs[1], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( maxs[2], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+
+	DEFINE_DELTA( endpos[0], DT_SIGNED | DT_FLOAT, 13, 1.0 ),
+	DEFINE_DELTA( endpos[1], DT_SIGNED | DT_FLOAT, 13, 1.0 ),
+	DEFINE_DELTA( endpos[2], DT_SIGNED | DT_FLOAT, 13, 1.0 ),
+	DEFINE_DELTA( startpos[0], DT_SIGNED | DT_FLOAT, 13, 1.0 ),
+	DEFINE_DELTA( startpos[1], DT_SIGNED | DT_FLOAT, 13, 1.0 ),
+	DEFINE_DELTA( startpos[2], DT_SIGNED | DT_FLOAT, 13, 1.0 ),
+	//DEFINE_DELTA( impacttime, DT_TIMEWINDOW_BIG, 13, 100.0 ),
+	DEFINE_DELTA( starttime, DT_TIMEWINDOW_BIG, 13, 100.0 ),
+	DEFINE_DELTA( team, DT_INTEGER, 2, 1.0 ),
+	
+	DEFINE_DELTA( weaponmodel, DT_INTEGER, 10, 1.0 ),
+	DEFINE_DELTA( owner, DT_INTEGER, 5, 1.0 ),
+	DEFINE_DELTA( effects, DT_INTEGER, 8, 1.0 ),
+	DEFINE_DELTA( eflags, DT_INTEGER, 1, 1.0 ),
+	DEFINE_DELTA( angles[2], DT_ANGLE, 16, 1.0 ),
+	DEFINE_DELTA( colormap, DT_INTEGER, 16, 1.0 ),
+	DEFINE_DELTA( framerate, DT_SIGNED | DT_FLOAT, 8, 16.0 ),
+	DEFINE_DELTA( skin, DT_SHORT | DT_SIGNED, 9, 1.0 ),
+	DEFINE_DELTA( controller[0], DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( controller[1], DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( controller[2], DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( controller[3], DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( blending[0], DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( blending[1], DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( body, DT_INTEGER, 8, 1.0 ),
+	DEFINE_DELTA( rendermode, DT_INTEGER, 8, 1.0 ),
+	DEFINE_DELTA( renderamt, DT_INTEGER, 8, 1.0 ),
+	DEFINE_DELTA( renderfx, DT_INTEGER, 8, 1.0 ),
+	DEFINE_DELTA( scale, DT_FLOAT, 16, 256.0 ),
+	DEFINE_DELTA( rendercolor.r, DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( rendercolor.g, DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( rendercolor.b, DT_BYTE, 8, 1.0 ),
+	//DEFINE_DELTA( aiment, DT_INTEGER, 11, 1.0 ),
+	DEFINE_DELTA( basevelocity[0], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( basevelocity[1], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( basevelocity[2], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+
+	// Playerclass signifies it's a decalable glass item when referring to an object
+
+	DEFINE_DELTA( playerclass, DT_INTEGER, 1, 1.0 ),
+
+	//DEFINE_DELTA( iuser2, DT_INTEGER, 32, 1.0 ),				// NS custom code (used for entity ids for research)
+	DEFINE_DELTA( iuser3, DT_INTEGER, 6, 1.0 ),				// NS custom code
+	DEFINE_DELTA( iuser4, DT_INTEGER, 32, 1.0 ),			// NS custom parameter (needs 32 for AvHSpecialSound)
+	DEFINE_DELTA( fuser1, DT_FLOAT, 32, 1.0 )				// Use 32-bits because two values fit in here sometimes
+	DEFINE_DELTA( fuser2, DT_FLOAT, 16, 1.0 )				// Not sure if we need all 32, go back and optimize later if desired
+	//DEFINE_DELTA( fuser3, DT_FLOAT, 32, 1.0 )				// Not sure if we need all 32, go back and optimize later if desired
+}
+
+entity_state_player_t gamedll Player_Encode
+{
+	DEFINE_DELTA( animtime, DT_TIMEWINDOW_8, 8, 1.0 ),
+	DEFINE_DELTA( frame, DT_FLOAT, 8, 1.0 ),
+	DEFINE_DELTA( origin[0], DT_SIGNED | DT_FLOAT, 18, 32.0 ),
+	DEFINE_DELTA( angles[0], DT_ANGLE, 16, 1.0 ),
+	DEFINE_DELTA( angles[1], DT_ANGLE, 16, 1.0 ),
+	DEFINE_DELTA( origin[1], DT_SIGNED | DT_FLOAT, 18, 32.0 ),
+	DEFINE_DELTA( origin[2], DT_SIGNED | DT_FLOAT, 18, 32.0 ),
+	DEFINE_DELTA( gaitsequence, DT_INTEGER, 8, 1.0 ),
+	DEFINE_DELTA( sequence, DT_INTEGER, 8, 1.0 ),
+	DEFINE_DELTA( modelindex, DT_INTEGER, 10, 1.0 ),
+	DEFINE_DELTA( movetype, DT_INTEGER, 4, 1.0 ),
+	DEFINE_DELTA( solid, DT_SHORT, 3, 1.0 ),
+	DEFINE_DELTA( mins[0], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( mins[1], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( mins[2], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( maxs[0], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( maxs[1], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( maxs[2], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( weaponmodel, DT_INTEGER, 10, 1.0 ),
+	DEFINE_DELTA( team, DT_INTEGER, 4, 1.0 )
+	DEFINE_DELTA( playerclass, DT_INTEGER, 4, 1.0 )
+	DEFINE_DELTA( owner, DT_INTEGER, 5, 1.0 ),
+	DEFINE_DELTA( effects, DT_INTEGER, 8, 1.0 ),
+	DEFINE_DELTA( angles[2], DT_ANGLE, 16, 1.0 ),
+//	DEFINE_DELTA( colormap, DT_INTEGER, 16, 1.0 ),
+	DEFINE_DELTA( framerate, DT_SIGNED | DT_FLOAT, 8, 16.0 ),
+	DEFINE_DELTA( skin, DT_SHORT | DT_SIGNED, 9, 1.0 ),
+	DEFINE_DELTA( controller[0], DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( controller[1], DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( controller[2], DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( controller[3], DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( blending[0], DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( blending[1], DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( body, DT_INTEGER, 8, 1.0 ),
+	DEFINE_DELTA( rendermode, DT_INTEGER, 8, 1.0 ),
+	DEFINE_DELTA( renderamt, DT_INTEGER, 8, 1.0 ),
+	DEFINE_DELTA( renderfx, DT_INTEGER, 8, 1.0 ),
+	DEFINE_DELTA( scale, DT_FLOAT, 16, 256.0 ),
+	DEFINE_DELTA( rendercolor.r, DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( rendercolor.g, DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( rendercolor.b, DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( friction, DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( usehull, DT_INTEGER, 1, 1.0 ),
+	DEFINE_DELTA( gravity, DT_SIGNED | DT_FLOAT, 16, 32.0 ),
+//	DEFINE_DELTA( aiment, DT_INTEGER, 11, 1.0 ),
+	DEFINE_DELTA( basevelocity[0], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( basevelocity[1], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( basevelocity[2], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( spectator, DT_INTEGER, 1, 1.0 ),
+	DEFINE_DELTA( iuser3, DT_INTEGER, 6, 1.0 ),						// Need player info for AvHCommanderModeHandler::LookupClassNameForEntity
+	DEFINE_DELTA( iuser4, DT_INTEGER, 32, 1.0 ),					// NS custom parameter (needs 32 for AvHSpecialSound)
+	DEFINE_DELTA( fuser2, DT_FLOAT, 12, 1.0 ),						// For player health (energy is predicted so this isn't needed for it)
+	DEFINE_DELTA( vuser1[0], DT_ANGLE, 8, 1.0 ),
+	DEFINE_DELTA( vuser1[1], DT_ANGLE, 8, 1.0 ),
+	DEFINE_DELTA( vuser1[2], DT_ANGLE, 8, 1.0 ),
+	DEFINE_DELTA( vuser4[2], DT_FLOAT, 32, 1.0 )					// Extended player info
+}
+
+custom_entity_state_t gamedll Custom_Encode
+{
+	DEFINE_DELTA( rendermode, DT_INTEGER, 8, 1.0 ),
+	DEFINE_DELTA( origin[0], DT_SIGNED | DT_FLOAT, 17, 8.0 ),
+	DEFINE_DELTA( origin[1], DT_SIGNED | DT_FLOAT, 17, 8.0 ),
+	DEFINE_DELTA( origin[2], DT_SIGNED | DT_FLOAT, 17, 8.0 ),
+	DEFINE_DELTA( angles[0], DT_SIGNED | DT_FLOAT, 17, 8.0 ),
+	DEFINE_DELTA( angles[1], DT_SIGNED | DT_FLOAT, 17, 8.0 ),
+	DEFINE_DELTA( angles[2], DT_SIGNED | DT_FLOAT, 17, 8.0 ),
+	DEFINE_DELTA( sequence, DT_INTEGER, 16, 1.0 ),
+	DEFINE_DELTA( skin, DT_INTEGER, 16, 1.0 ),
+	DEFINE_DELTA( modelindex, DT_INTEGER, 16, 1.0 ),
+	DEFINE_DELTA_POST( scale, DT_FLOAT, 8, 1.0, 0.1 ),
+	DEFINE_DELTA( body, DT_INTEGER, 8, 1.0 ),
+	DEFINE_DELTA( rendercolor.r, DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( rendercolor.g, DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( rendercolor.b, DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( renderfx, DT_INTEGER, 8, 1.0 ),
+	DEFINE_DELTA( renderamt, DT_INTEGER, 8, 1.0 ),
+	DEFINE_DELTA( frame, DT_FLOAT, 8, 1.0 ),
+	DEFINE_DELTA_POST( animtime, DT_FLOAT, 8, 1.0, 0.1 )
+}
+
+usercmd_t none
+{
+	DEFINE_DELTA( lerp_msec, DT_SHORT, 9, 1.0 ),
+	DEFINE_DELTA( msec, DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( viewangles[1], DT_ANGLE, 16, 1.0 ),
+	DEFINE_DELTA( viewangles[0], DT_ANGLE, 16, 1.0 ),
+	DEFINE_DELTA( buttons, DT_SHORT, 16, 1.0 ),
+	DEFINE_DELTA( forwardmove, DT_SIGNED | DT_FLOAT, 12, 1.0 ),
+	DEFINE_DELTA( lightlevel, DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( sidemove, DT_SIGNED | DT_FLOAT, 12, 1.0 ),
+	DEFINE_DELTA( upmove, DT_SIGNED | DT_FLOAT, 12, 1.0 ),
+	DEFINE_DELTA( impulse, DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( weaponselect, DT_BYTE, 8, 1.0 ),
+	DEFINE_DELTA( viewangles[2], DT_ANGLE, 16, 1.0 ),
+	DEFINE_DELTA( impact_index, DT_INTEGER, 6, 1.0 ),
+	DEFINE_DELTA( impact_position[0], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( impact_position[1], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( impact_position[2], DT_SIGNED | DT_FLOAT, 16, 8.0 )
+}
+
+weapon_data_t none
+{
+	DEFINE_DELTA( m_flTimeWeaponIdle, DT_FLOAT | DT_SIGNED, 22, 1000.0 ),
+	DEFINE_DELTA( m_flNextPrimaryAttack, DT_FLOAT | DT_SIGNED, 22, 1000.0 ),
+	DEFINE_DELTA( m_flNextReload, DT_FLOAT | DT_SIGNED, 22, 1000.0 ),
+//	DEFINE_DELTA( m_fNextAimBonus, DT_FLOAT | DT_SIGNED, 22, 1000.0 ),
+	DEFINE_DELTA( m_flNextSecondaryAttack, DT_FLOAT | DT_SIGNED, 22, 1000.0 ),
+	DEFINE_DELTA( m_iClip, DT_SIGNED | DT_INTEGER, 10, 1.0 ),
+//  DEFINE_DELTA( m_flPumpTime, DT_FLOAT | DT_SIGNED, 22, 1000.0 ),
+//  DEFINE_DELTA( m_fInSpecialReload, DT_INTEGER, 2, 1.0 ),
+	DEFINE_DELTA( m_fReloadTime, DT_FLOAT, 16, 100.0 ),
+	DEFINE_DELTA( m_fInReload, DT_INTEGER, 1, 1.0 ),
+//  DEFINE_DELTA( m_fAimedDamage, DT_FLOAT, 6, 0.1 ),
+//  DEFINE_DELTA( m_fInZoom, DT_INTEGER, 1, 1.0 ),
+//  DEFINE_DELTA( m_iWeaponState, DT_INTEGER, 2, 1.0 ),
+	DEFINE_DELTA( m_iId, DT_INTEGER, 8, 1.0 ),
+	DEFINE_DELTA( iuser3, DT_INTEGER, 3, 1.0 ),
+	DEFINE_DELTA( fuser2, DT_SIGNED | DT_FLOAT, 22, 128.0  ),
+	DEFINE_DELTA( fuser3, DT_SIGNED | DT_FLOAT, 22, 128.0  )
+}
+
+event_t none
+{
+	DEFINE_DELTA( entindex, DT_INTEGER, 10, 1.0 ),
+	DEFINE_DELTA( bparam1, DT_INTEGER, 1, 1.0 ),
+	DEFINE_DELTA( bparam2, DT_INTEGER, 1, 1.0 ),
+	DEFINE_DELTA( origin[0], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( origin[1], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( origin[2], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( fparam1, DT_FLOAT | DT_SIGNED, 20, 100.0 ),
+	DEFINE_DELTA( fparam2, DT_FLOAT | DT_SIGNED, 20, 100.0 ),
+	DEFINE_DELTA( iparam1, DT_INTEGER | DT_SIGNED, 16, 1.0 ),
+	DEFINE_DELTA( iparam2, DT_INTEGER | DT_SIGNED, 16, 1.0 ),
+	DEFINE_DELTA( angles[0], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( angles[1], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( angles[2], DT_SIGNED | DT_FLOAT, 16, 8.0 ),
+	DEFINE_DELTA( ducking, DT_INTEGER, 1, 1.0 )
+}
diff --git a/main/dev.cfg b/main/dev.cfg
new file mode 100644
index 00000000..1bdce382
--- /dev/null
+++ b/main/dev.cfg
@@ -0,0 +1,44 @@
+// Cheat codes
+//name "Flayra"
+sv_cheats 1
+bigdig
+lowcost
+mp_tournamentmode 1
+mp_drawinvisibleentities 1
+//highdamage
+bind "l" "selectall"
+bind "h" "sv_restart;wait;wait;wait;numents"
+bind "j" "numents"
+bind "F1" "jointeamone"
+bind "F2" "jointeamtwo"
+bind "F3" "addbot"
+bind "F9" "givepoints"
+bind "F10" "spawnhive"
+bind "F11" "killhive"
+bind "q" "switch"
+
+// Camera controls
+bind "MOUSE3" "camtoggle"
+bind b +cammousemove
+cam_idealpitch 20
+cam_idealdist 140
+cam_idealyaw 0
+
+// Offense chamber
+bind "t" "impulse 91"
+
+// Gorge, Lerk, Fade, Onos
+bind "z" "impulse 114"
+bind "x" "impulse 115"
+bind "c" "impulse 116"
+bind "v" "impulse 117"
+
+// Fast Pistol fire (from: http://web1.server126.notraffic.de/forum/showthread/t-13792.html)
+//hud_fastswitch 1 
+//
+//alias +fp_fire "weapon_pistol; +attack; wait; -attack; wait; weapon_pistol; +attack; wait; -attack; wait; weapon_pistol; +attack; wait; -attack; wait; weapon_pistol; +attack; wait; -attack; wait; weapon_pistol; +attack; wait; -attack; wait; " 
+//alias -fp_fire "-attack" 
+//alias fp_fireon "bind mouse1 +fp_fire; developer 1; echo Fast Pistol Fire *ON*; developer 0; alias fp_fire fp_fireoff" 
+//alias fp_fireoff "bind mouse1 +attack; developer 1; echo Fast Pistol Fire *OFF*; developer 0; alias fp_fire fp_fireonn" 
+//alias fp_fire "fp_fireon" 
+//bind "x" "fp_fire"
\ No newline at end of file
diff --git a/main/dlls/HPB_bot.dll b/main/dlls/HPB_bot.dll
new file mode 100644
index 00000000..0b235599
Binary files /dev/null and b/main/dlls/HPB_bot.dll differ
diff --git a/main/dlls/ns.dll b/main/dlls/ns.dll
new file mode 100644
index 00000000..cf007b6d
Binary files /dev/null and b/main/dlls/ns.dll differ
diff --git a/main/dlls/ns.pdb b/main/dlls/ns.pdb
new file mode 100644
index 00000000..2f651a0a
Binary files /dev/null and b/main/dlls/ns.pdb differ
diff --git a/main/dlls/ns_i386.so b/main/dlls/ns_i386.so
new file mode 100644
index 00000000..8768530a
Binary files /dev/null and b/main/dlls/ns_i386.so differ
diff --git a/main/dlls/private.dll b/main/dlls/private.dll
new file mode 100644
index 00000000..b5ce0236
Binary files /dev/null and b/main/dlls/private.dll differ
diff --git a/main/dlls/qa_i386.so b/main/dlls/qa_i386.so
new file mode 100644
index 00000000..786d03f1
Binary files /dev/null and b/main/dlls/qa_i386.so differ
diff --git a/main/download.html b/main/download.html
new file mode 100644
index 00000000..54a565ba
Binary files /dev/null and b/main/download.html differ
diff --git a/main/english_titles.txt b/main/english_titles.txt
new file mode 100644
index 00000000..0012ac2e
--- /dev/null
+++ b/main/english_titles.txt
@@ -0,0 +1,4574 @@
+//TITLES FOR NATURAL SELECTION
+//DO NOT ALTER THIS FILE
+// Position command $position x y 
+// x & y are from 0 to 1 to be screen resolution independent
+// -1 means center in each dimension
+// Effect command $effect <effect number>
+// effect 0 is fade in/fade out
+// effect 1 is flickery credits
+// effect 2 is write out (training room)
+// Text color r g b command $color
+// fadein time fadeout time / hold time
+// $fadein (message fade in time - per character in effect 2)
+// $fadeout (message fade out time)
+// $holdtime (stay on the screen for this long)
+
+Created_By
+{
+Natural Selection is created and maintained by Unknown Worlds Entertainment.  Visit www.unknownworlds.com for more information.
+}
+
+NS_Site
+{
+Check the front page of www.natural-selection.org for late-breaking news
+}
+
+Team_AutoAssign
+{
+AUTO ASSIGN
+}
+
+Menu_Spectate
+{
+SPECTATE
+}
+
+UndefinedTeam
+{
+Ready Room
+}
+
+Menu_LeaveGame
+{
+Exit game
+}
+
+Menu_Marine1Team
+{
+Join marines
+}
+
+Menu_Alien1Team
+{
+Join aliens
+}
+
+Marine1Team
+{
+Frontiersmen
+}
+
+Alien1Team
+{
+Kharaa
+}
+
+Marine2Team
+{
+Frontiersmen
+}
+
+Alien2Team
+{
+Kharaa
+}
+
+AutoTeam
+{
+Auto-assigned
+}
+
+Muted
+{
+Muted
+}
+
+Unmuted
+{
+Unmuted
+}
+
+No_longer_hear_that_player
+{
+no longer hear that player
+}
+
+LineComplete
+{
+Fully upgraded.
+}
+
+YouAreNowA
+{
+You are now a
+}
+
+Exclamation
+{
+!
+}
+
+ChooseAnUpgrade
+{
+Choose an upgrade by opening your pop-up menu (right-click by default)!
+}
+
+Rank_Marine_1
+{
+Level 1: Private
+}
+
+Rank_Marine_2
+{
+Level 2: Private First Class
+}
+
+Rank_Marine_3
+{
+Level 3: Corporal
+}
+
+Rank_Marine_4
+{
+Level 4: Sergeant
+}
+
+Rank_Marine_5
+{
+Level 5: Lieutenant
+}
+
+Rank_Marine_6
+{
+Level 6: Captain
+}
+
+Rank_Marine_7
+{
+Level 7: Commander
+}
+
+Rank_Marine_8
+{
+Level 8: Major
+}
+
+Rank_Marine_9
+{
+Level 9: Field Marshal
+}
+
+Rank_Marine_10
+{
+Level 10: General
+}
+
+Rank_Alien_1
+{
+Level 1: Hatchling
+}
+
+Rank_Alien_2
+{
+Level 2: Xenoform
+}
+
+Rank_Alien_3
+{
+Level 3: Minion
+}
+
+Rank_Alien_4
+{
+Level 4: Ambusher
+}
+
+Rank_Alien_5
+{
+Level 5: Attacker
+}
+
+Rank_Alien_6
+{
+Level 6: Rampager
+}
+
+Rank_Alien_7
+{
+Level 7: Slaughterer
+}
+
+Rank_Alien_8
+{
+Level 8: Eliminator
+}
+
+Rank_Alien_9
+{
+Level 9: Nightmare
+}
+
+Rank_Alien_10
+{
+Level 10: Behemoth
+}
+
+// SDK 2.0 Spectator Menu
+Spec_Map
+{
+Map
+}
+
+Spec_Mode1
+{
+Locked Chase-Camera
+}
+
+Spec_Mode2
+{
+Free Chase-Camera
+}
+
+Spec_Mode3
+{
+Free look
+}
+
+Spec_Mode4
+{
+First Person
+}
+
+Spec_Mode5
+{
+Free Map Overview
+}
+
+Spec_Mode6
+{
+Chase Map Overview
+}
+
+Spec_NoTarget
+{
+No valid targets. Cannot switch to Chase-Camera Mode.
+}
+
+Spec_Help
+{
+Press F4 for Ready Room     Use LEFT and RIGHT keys, JUMP and FIRE to change view.
+}
+
+Spec_Slow_Motion
+{
+Slow Motion
+}
+
+Spec_Replay
+{
+Instant Replay
+}
+
+Spec_Help2
+{
+Your text messages and voice can only be seen by other Spectators
+}
+
+Spec_Only_Help
+{
+}
+
+Directed
+{
+Directed
+}
+
+SpectatorsNotAllowed
+{
+This server does not currently allow spectators.
+}
+
+ObsInEyePrefix
+{
+Viewing through eyes of
+}
+
+SpectatorTeam
+{
+Spectators
+}
+
+Spectators
+{
+Spectators
+}
+
+TEAM
+{
+Team
+}
+
+TEAMS
+{
+Teams
+}
+
+PLAYER
+{
+Player
+}
+
+Player_plural
+{
+Players
+}
+
+PLAYERS
+{
+Players
+}
+
+SCORES
+{
+Player information
+}
+
+SCORE
+{
+Score
+}
+
+KILLS
+{
+Kills
+}
+
+DEATHS
+{
+Deaths
+}
+
+LATENCY
+{
+Latency
+}
+
+VOICE
+{
+Voice
+}
+
+Unassigned
+{
+Unassigned
+}
+
+Menu_OK
+{
+OK
+}
+
+Points
+{
+points
+}
+
+Cost
+{
+Cost
+}
+
+NoSpectating
+{
+Spectating isn't allowed on this server.
+}
+
+// Main game messages
+ReadyRoomMessage
+{
+You are in the Ready Room.  Walk through an entrance to join a team or observe the game.
+}
+
+ReinforcementMessage
+{
+You are waiting in line to spawn back in.
+}
+
+ReinforcingMessage
+{
+You are now spawning back in...
+}
+
+ObserverMessage
+{
+You are an observer. You won't be able to join this game but you can join the next game.
+}
+
+CantSwitchTeamsInTournyMode
+{
+You can't switch teams during tournament mode.
+}
+
+CantSwitchTeamsAfterGameStart
+{
+You can't switch teams once the game has started.
+}
+
+TooManyPlayersOnTeam
+{
+There are too many players on this team already.
+}
+
+CantJoinAfterSpectating
+{
+You cannot join the game in progress once you've been a spectator.
+}
+
+CanOnlyJoinTeamYouveReinforced
+{
+You have already seen the other team, you can only join that team until next round.
+}
+
+YouCanJoinSoon
+{
+You will join this team soon.
+}
+
+AlreadyOnTeam
+{
+You are already on a team.  Go back to the ready room first to switch teams.
+}
+
+SoldierMessage
+{
+You are now a soldier.  Try to follow orders from your commander, and do your best to keep the enemy from killing your teammates and destroying your structures.
+}
+
+ObjectivesVsAliens
+{
+You are fighting aliens!  Aliens respawn at hives, so to win the game, you must kill all the alien hives and then kill the aliens.
+}
+
+ObjectivesVsMarines
+{
+You are fighting marines!  Marines respawn at infantry portals, so to win the game, you must kill all their infantry portals, then kill all the marines.
+}
+
+Handicap
+{
+damage
+}
+
+CommanderMessage
+{
+Left-click or marquee-select players and right-click a location, structure or player to give them an order.  The menu in the lower right lets you build structures and equip your soldiers.
+}
+
+Commander
+{
+Comm
+}
+
+NoCommander
+{
+No commander
+}
+
+GestationMessage
+{
+You are now gestating into a new alien lifeform.  Get ready to hatch...
+}
+
+CocoonMessage
+{
+You have been cocooned!  
+}
+
+YouAreReinforcements
+{
+You were called in as reinforcements!
+}
+
+//////////////
+// Pie menu //
+//////////////
+MenuMarineRoot
+{
+Start
+}
+
+//MenuMarineRoot
+//{
+//!marinenode
+//}
+
+
+MenuComms
+{
+Comms
+}
+
+MenuTalk
+{
+Talk
+}
+
+MenuAttacked
+{
+"Attacked!"
+}
+
+MenuCheer
+{
+Cheer
+}
+
+MenuCoverMe
+{
+"Cover me!"
+}
+
+MenuRetreat
+{
+"Retreat!"
+}
+
+MenuInPosition
+{
+"In position"
+}
+
+MenuEnemySpotted
+{
+"Enemy here"
+}
+
+MenuMoveOut
+{
+"Move out"
+}
+
+MenuAllClear
+{
+"All clear"
+}
+
+MenuYell
+{
+Yell
+}
+
+MenuSay
+{
+Say
+}
+
+MenuRogerThat
+{
+"Roger that"
+}
+
+MenuHello
+{
+"Hello"
+}
+
+MenuNeedHelp
+{
+"Need help"
+}
+
+MenuNeedHealth
+{
+"Need health"
+}
+
+MenuNeedAmmo
+{
+"Need ammo"
+}
+
+MenuFollowMe
+{
+"Follow me"
+}
+
+MenuCovering
+{
+"Covering"
+}
+
+MenuOrders
+{
+Orders
+}
+
+MenuNeedOrder
+{
+"Need order"
+}
+
+MenuAck
+{
+"Acknowledged"
+}
+
+MenuAdmin
+{
+Admin
+}
+
+Menu_ReadyRoom
+{
+Ready room
+}
+
+MenuVoteCommanderDown
+{
+Eject commander
+}
+
+MenuArea
+{
+Area
+}
+
+MenuMoveTo
+{
+Move to
+}
+
+MenuGuard
+{
+Guard
+}
+
+MenuTarget
+{
+Target
+}
+
+MenuDeploy
+{
+Deploy
+}
+
+MenuIncoming
+{
+Incoming
+}
+
+MenuProceed
+{
+Proceed
+}
+
+MenuFireTarget
+{
+Fire target
+}
+
+MenuTaunt
+{
+Taunt
+}
+
+MenuTakeCover
+{
+Take cover
+}
+
+MenuReady
+{
+Ready
+}
+
+MenuDefendObj
+{
+Defend
+}
+
+MenuCeaseFire
+{
+Cease fire
+}
+
+MenuTeam
+{
+Team
+}
+
+MenuBuilding
+{
+Build
+}
+
+MenuAttackObj
+{
+Attack
+}
+
+MenuTaunt
+{
+Taunt
+}
+
+MenuHealth
+{
+"Health"
+}
+
+MenuCameraTower
+{
+Camera
+}
+
+MenuTurret
+{
+Turret
+}
+
+MenuSiegeTurret
+{
+Siege
+}
+
+MenuBlazeOfGlory
+{
+Blaze
+}
+
+MenuProtect
+{
+Protect
+}
+
+MenuReinforce
+{
+Reinforce
+}
+
+MenuArmorUpgrade
+{
+Heavy
+}
+
+MenuRepair
+{
+Repair
+}
+
+MenuPowerups
+{
+Stim
+}
+
+MenuAdrenaline
+{
+Adrenaline
+}
+
+MenuDefMatrix
+{
+Def matrix
+}
+
+MenuPhaseGate
+{
+Phase gate
+}
+
+MenuSelf
+{
+Me
+}
+
+MenuBuy
+{
+Buy
+}
+
+MenuHeavy
+{
+Heavy
+}
+
+MenuShotgun
+{
+Shotgun
+}
+
+MenuHMG
+{
+HMG
+}
+
+MenuGL
+{
+Grenade launcher
+}
+
+MenuFlamer
+{
+Flamer
+}
+
+MenuNuke
+{
+Nuke
+}
+
+MenuWeapon
+{
+Weapon
+}
+
+MenuEquipment
+{
+Equipment
+}
+
+MenuSupport
+{
+Support
+}
+
+MenuIntel
+{
+Intel
+}
+
+MenuCommander
+{
+Commander
+}
+
+MenuResupply
+{
+Resupply
+}
+
+MenuCatalyst
+{
+Catalyst
+}
+
+MenuScan
+{
+Scan area
+}
+
+MenuUse
+{
+Use
+}
+
+MenuNextWeapon
+{
+Next weapon
+}
+
+MenuJetpacks
+{
+Jet-packs
+}
+
+MenuReloadWeapon
+{
+Reload
+}
+
+MenuDropWeapon
+{
+Drop
+}
+
+MenuLight
+{
+Light
+}
+
+MenuEquip
+{
+Equip
+}
+
+MenuGrenade
+{
+Grenade
+}
+
+MenuMotionTracking
+{
+Motion-tracking
+}
+
+MenuDistressBeacon
+{
+Distress beacon
+}
+
+MenuUpgradeWeapon
+{
+Weapon
+}
+
+MenuUpgradeDamage1
+{
+Damage level 1
+}
+
+MenuUpgradeDamage2
+{
+Damage level 2
+}
+
+MenuUpgradeDamage3
+{
+Damage level 3
+}
+
+MenuUpgradeArmor1
+{
+Armor level 1
+}
+
+MenuUpgradeArmor2
+{
+Armor level 2
+}
+
+MenuUpgradeArmor3
+{
+Armor level 3
+}
+
+MenuAmmo
+{
+Ammo
+}
+
+MenuMines
+{
+Mines
+}
+
+MenuWelder
+{
+Welder
+}
+
+MenuGrenades
+{
+Grenades
+}
+
+MenuUpgradeMG
+{
+Upgrade
+}
+
+MenuUnlockHiveTwo
+{
+Unlock next ability
+}
+
+MenuUnlockHiveThree
+{
+Unlock next ability
+}
+
+////////////////////
+// Armor upgrades // 
+////////////////////
+
+MenuArmorFull
+{
+Armor full
+}
+
+MenuHeavyArmor
+{
+Heavy armor
+}
+
+MenuBuyArmorMotionTrack
+{
+Tracker
+}
+
+MenuJetpack
+{
+Jetpack
+}
+
+MenuBuyArmorLifeSupport
+{
+Sustain
+}
+
+// Rank
+MenuRank
+{
+Rank
+}
+
+MenuPromote
+{
+Promote
+}
+
+MenuDemote
+{
+Demote
+}
+
+//////////////////////////////////////////////////
+// Don't localize these, they are sprite names: //
+//  (sprites/640(or 320)name.spr)               //
+//////////////////////////////////////////////////
+MenuAlienRoot
+{
+Start
+}
+
+MenuAlienSmallMorph
+{
+Lifeform
+}
+
+MenuAlienMorphLevel1
+{
+Skulk
+}
+
+MenuAlienMorphLevel2
+{
+Gorge
+}
+
+MenuAlienBigMorph
+{
+Advanced
+}
+
+MenuAlienMorphLevel3
+{
+Lerk
+}
+
+MenuAlienMorphLevel4
+{
+Fade
+}
+
+MenuAlienMorphLevel5
+{
+Onos
+}
+
+MenuAlienUpgrade
+{
+Evolve upgrade
+}
+
+MenuAlienComm
+{
+Voice
+}
+
+MenuAlienBuild
+{
+Build
+}
+
+MenuAlienAdvBuild
+{
+Advanced
+}
+
+MenuAlienBuildUpgrades
+{
+Upgrades
+}
+
+
+MenuAlienCommSayingsWest
+{
+Yells
+}
+
+MenuAlienCommSayingOne
+{
+Chuckle
+}
+
+MenuAlienCommSayingTwo
+{
+Need healing
+}
+
+MenuAlienCommSayingThree
+{
+Need backup
+}
+
+MenuAlienCommSayingsEast
+{
+Sayings
+}
+
+MenuAlienCommSayingFour
+{
+Incoming
+}
+
+MenuAlienCommSayingFive
+{
+Attack
+}
+
+MenuAlienCommSayingSix
+{
+I'm building here
+}
+
+MenuAlienUpgradeDefOne
+{
+Carapace
+}
+
+MenuAlienUpgradeDefTwo
+{
+Regeneration
+}
+
+MenuAlienUpgradeDefThree
+{
+Redemption
+}
+
+MenuAlienUpgradeSenOne
+{
+Cloaking
+}
+
+MenuAlienUpgradeSenTwo
+{
+Focus
+}
+
+MenuAlienUpgradeSenThree
+{
+Scent of Fear
+}
+
+MenuAlienUpgradeMoveOne
+{
+Celerity
+}
+
+MenuAlienUpgradeMoveTwo
+{
+Adrenaline
+}
+
+MenuAlienUpgradeMoveThree
+{
+Silence
+}
+
+MenuAlienDefenseChamber
+{
+Defense chamber
+}
+
+MenuAlienSensoryChamber
+{
+Sensory chamber
+}
+
+MenuAlienMovementChamber
+{
+Movement chamber
+}
+
+MenuAlienDefenseUpgrades
+{
+Defensive
+}
+
+MenuAlienSensoryUpgrades
+{
+Sensory
+}
+
+MenuAlienMovementUpgrades
+{
+Movement
+}
+
+MenuAlienOffensiveChamber
+{
+Offense chamber
+}
+
+MenuAlienResourceTower
+{
+Resource tower
+}
+
+MenuAlienHive
+{
+Hive
+}
+
+
+
+// Armor received messages
+$position -1 0.2
+$effect 0
+$fadein 0.5
+$fadeout 0.5
+$holdtime 5.0
+
+ReceiveHeavyArmor
+{
+Your armor has been upgraded to heavy armor.  You are now more protected against enemies.
+}
+
+ReceiveMotionTrackArmor
+{
+You now have a motion-tracker built into your armor.
+}
+
+ReceiveJetpackArmor
+{
+You now have a jet-pack armor upgrade.  Press and hold your jump key to use it.
+}
+
+ReceiveLifeSupportArmor
+{
+You now have a LifeSupport (TM) system.  When you get near death, you will be protected until help arrives.
+}
+
+
+
+$position -1 0.35
+$holdtime 3.0
+
+GameStarting
+{
+The game is about to start...
+}
+
+$holdtime 2.0
+GameBegun
+{
+The game has begun.
+}
+
+// Overwatch enabled
+//OverwatchActive
+//{
+//Overwatch active
+//}
+
+// Overwatch range string, expecting a float for range
+OverwatchRange
+{
+Target range: %f
+}
+
+// Points awarded
+$position -1 0.25
+$effect 0
+$holdtime 4
+
+MarineAward
+{
+Your team just killed an enemy!
+}
+
+MarineAwardToLeader
+{
+Your squad just received points for killing an enemy!
+}
+
+// Points awarded
+$position -1 0.15
+$effect 0
+$holdtime 3
+MarineAwardToCommander
+{
+Your team earned points for killing an enemy!
+}
+
+// Points awarded
+$position -1 0.25
+$effect 0
+$holdtime 4
+AlienAward
+{
+You just got resources for killing an enemy!
+}
+
+Defect
+{
+Leave squad
+}
+
+WeaponCantBeDropped
+{
+This weapon can't be dropped.
+}
+
+DefectMessageToLeader
+{
+A player has defected from your squad.
+}
+
+SquadIndicator
+{
+You're in Squad %d
+}
+
+InvalidOrderGiven
+{
+Invalid order
+}
+
+$position -1 0.65
+$effect 0
+$holdtime .5
+$fadein .2
+$fadeout .2
+GameWontStart
+{
+The game won't start until both sides have players.
+}
+
+// Translation note: don't translate "ready"
+GameWontStartUntilReady
+{
+Game won't start until both teams type "ready".
+}
+
+EvolvingMessage
+{
+Evolving...
+}
+
+VoteCast
+{
+Your vote has been cast.
+}
+
+VoteStarted
+{
+A vote to eject the commander has started.  If the commander is being disruptive, use your pop-up menu to vote against him.
+}
+
+VoteIllegal
+{
+A vote is illegal at this time.
+}
+
+AlreadyVoted
+{
+You can only vote once per game.
+}
+
+VoteFailed
+{
+The vote to eject the commander has failed.
+}
+
+VoteCancelled
+{
+The vote to eject the commander has been cancelled.
+}
+
+VoteSucceeded
+{
+The commander has been voted off the command console.
+}
+
+BannedFromCommand
+{
+You have been temporarily banned from commanding on this server.  Many servers will let you command again in a few hours.
+}
+
+MustGestateUp
+{
+You can only change to to higher lifeforms.
+}
+
+MustGestateOnGround
+{
+You must stand on flat ground to gestate.
+}
+
+NotWhileDigesting
+{
+You can't gestate while digesting a player.
+}
+
+NoReadyRoomWhileDigested
+{
+You can't go to the ready room while being digested.
+}
+
+NeedMoreRoomToGestate
+{
+You need more room to gestate.
+}
+
+NeedOneHiveToGestate
+{
+Your team needs a hive to gestate into this lifeform.
+}
+
+NeedTwoHivesToGestate
+{
+Your team needs two hives to gestate into this lifeform.
+}
+
+NeedThreeHivesToGestate
+{
+Your team needs three hives to gestate into this lifeform.
+}
+
+NeedOneHiveForStructure
+{
+Your team needs a hive to build this structure.
+}
+
+NeedTwoHivesForStructure
+{
+Your team needs two hives to build this structure.
+}
+
+NeedThreeHivesForStructure
+{
+Your team needs three hives to build this structure.
+}
+
+NeedsAnotherHiveForStructure
+{
+Your team needs another hive to build this structure.
+}
+
+MustBeBuilder
+{
+You must be a Gorge to build this structure.
+}
+
+UpgradeNotAvailable
+{
+This upgrade isn't available at this time.
+}
+
+TooManyStructuresOfThisTypeNearby
+{
+There are too many structures of this type nearby.
+}
+
+TooManyStructuresInArea
+{
+There are too many structures in this area.
+}
+
+$holdtime 2.0
+TooManyWebs
+{
+Your team has reached the maximum number of webs allowed.
+}
+
+TooManyWebsNearby
+{
+There are too many webs in this area.
+}
+
+TeamOneWon
+{
+Team one won the game!
+}
+
+TeamTwoWon
+{
+Team two won the game!
+}
+
+GameDraw
+{
+Draw game!
+}
+
+RankBeforeGameStart
+{
+You can only change ranks before the game starts.
+}
+
+DefectAfterGameStart
+{
+You can only defect after the game starts.
+}
+
+// Tech tree
+MarineResourcePrefix
+{
+Team resources: 
+}
+
+AlienResourcePrefix
+{
+Resources
+}
+
+CarryResourcePrefix
+{
+Carrying %d resources
+}
+
+Resources
+{
+Resources: 
+}
+
+
+NumericalEventResources
+{
+resources
+}
+
+NumericalEventHealth
+{
+health
+}
+
+NumericalEventResourcesDonated
+{
+Resources donated
+}
+
+NumericalEventAmmo
+{
+Ammo received
+}
+
+
+
+
+AlienEnergyDescription
+{
+Energy
+}
+
+ResourcesDepleted
+{
+Resources depleted
+}
+
+Reinforcements
+{
+Reinforcements
+}
+
+
+WeaponCategory
+{
+Weapons
+}
+
+ArmorCategory
+{
+Armor
+}
+
+BuildCategory
+{
+Build
+}
+
+RadioCategory
+{
+Radio
+}
+
+TechNodeLabel_0
+{
+None
+}
+
+TechNodeHelp_0
+{
+<none>
+}
+
+TechNodeHelp_1
+{
+Switch to your next weapon.
+}
+
+TechNodeHelp_2
+{
+Reloads your current weapon.
+}
+
+TechNodeHelp_3
+{
+Drop your current weapon, to get more speed, or to give to someone else to use.
+}
+
+TechNodeHelp_5
+{
+Leave game and go back to the ready room.  This will let you switch teams, observe the game, or take a break.
+}
+
+TechNodeHelp_6
+{
+If the commander is deliberately trying to ruin the game, select this to vote the commander out of the command console.  If enough votes are received, he will be ejected for the rest of the game.
+}
+
+
+TechNodeLabel_10
+{
+Attacked
+}
+
+TechNodeLabel_11
+{
+Attack
+}
+
+TechNodeLabel_12
+{
+Destroy
+}
+
+TechNodeLabel_13
+{
+Confirmed
+}
+
+TechNodeLabel_14
+{
+Focus team
+}
+
+TechNodeLabel_15
+{
+Powerful
+}
+
+
+TechNodeHelp_7
+{
+"chuckle"
+}
+
+TechNodeHelp_8
+{
+"Need healing"
+}
+
+TechNodeHelp_9
+{
+"Need backup"
+}
+
+TechNodeHelp_10
+{
+"Incoming"
+}
+
+TechNodeHelp_11
+{
+"ATTACK"
+}
+
+TechNodeHelp_12
+{
+"I'm building here"
+}
+
+
+TechNodeLabel_20
+{
+Armor #1
+}
+
+TechNodeLabel_21
+{
+Armor #2
+}
+
+TechNodeLabel_22
+{
+Armor #3
+}
+
+TechNodeLabel_23
+{
+Weapons #1
+}
+
+TechNodeLabel_24
+{
+Weapons #2
+}
+
+TechNodeLabel_25
+{
+Weapons #3
+}
+
+TechNodeHelp_20
+{
+Level 1 player armor
+}
+
+TechNodeHelp_21
+{
+Level 2 player armor
+}
+
+TechNodeHelp_22
+{
+Level 3 player armor
+}
+
+
+TechNodeHelp_23
+{
+Weapons, mines, turrets do +10%% damage
+}
+
+TechNodeHelp_24
+{
+Weapons, mines, turrets do +20%% damage
+}
+
+TechNodeHelp_25
+{
+Weapons, mines, turrets do +30%% damage
+}
+
+TechNodeLabel_26
+{
+Advanced turret factory
+}
+
+TechNodeHelp_26
+{
+Upgrade to advanced turret factory
+}
+
+TechNodeLabel_47
+{
+Catalysts
+}
+
+TechNodeHelp_47
+{
+Catalyst research
+}
+
+TechNodeLabel_28
+{
+Jet-packs
+}
+
+TechNodeHelp_28
+{
+Allows jet-pack modules
+}
+
+TechNodeLabel_29
+{
+Heavy armor
+}
+
+TechNodeHelp_29
+{
+Allows heavy armor
+}
+
+TechNodeLabel_30
+{
+Distress beacon
+}
+
+TechNodeHelp_30
+{
+Respawns all dead marines at the marine start.
+}
+
+TechNodeLabel_31
+{
+Resupply health and ammo
+}
+
+TechNodeLabel_31
+{
+Deployable health tech
+}
+
+TechNodeHelp_31
+{
+Allows commander to deploy health packs
+}
+
+TechNodeLabel_32
+{
+Cancel
+}
+
+TechNodeHelp_32
+{
+Cancel research
+}
+
+TechNodeLabel_33
+{
+Motion-tracking
+}
+
+TechNodeHelp_33
+{
+All moving enemies become visible.
+}
+
+TechNodeLabel_34
+{
+Phase tech
+}
+
+TechNodeHelp_34
+{
+Allows scanning and phase gate construction
+}
+
+TechNodeLabel_35
+{
+Upgrade tower
+}
+
+TechNodeHelp_35
+{
+Improve speed of resource collection
+}
+
+TechNodeLabel_36
+{
+Electrical defense
+}
+
+TechNodeHelp_36
+{
+Shocks enemies that get too close
+}
+
+TechNodeLabel_37
+{
+Grenades
+}
+
+TechNodeHelp_37
+{
+Gives all soldiers one grenade on spawn
+}
+
+TechNodeLabel_38
+{
+Heavy armor
+}
+
+TechNodeHelp_38
+{
+Gives heavy armor to soldier.
+}
+
+TechNodeLabel_39
+{
+Jet-pack
+}
+
+TechNodeHelp_39
+{
+Gives jet-pack ability to soldier.
+}
+
+TechNodeLabel_40
+{
+Infantry portal
+}
+
+TechNodeHelp_40
+{
+Spawns players
+}
+
+TechNodeLabel_41
+{
+Resource tower
+}
+
+TechNodeHelp_41
+{
+Gives resources
+}
+
+
+
+TechNodeLabel_43
+{
+Turret factory
+}
+
+TechNodeHelp_43
+{
+Allows turrets
+}
+
+TechNodeLabel_45
+{
+Arms lab
+}
+
+TechNodeHelp_45
+{
+Weapon and armor upgrades.
+}
+
+TechNodeLabel_46
+{
+Prototype lab
+}
+
+TechNodeHelp_46
+{
+Experimental technology
+}
+
+TechNodeLabel_48
+{
+Armory
+}
+
+TechNodeHelp_48
+{
+Access to new weapons.
+}
+
+TechNodeLabel_49
+{
+Advanced armory
+}
+
+TechNodeHelp_49
+{
+Upgrade to advanced armory
+}
+
+
+TechNodeLabel_50
+{
+Nuke plant
+}
+
+TechNodeHelp_50
+{
+Allows nuke construction.
+}
+
+TechNodeLabel_51
+{
+Observatory
+}
+
+TechNodeHelp_51
+{
+Reconnaisance technology
+}
+
+TechNodeLabel_52
+{
+Health nanotech
+}
+
+TechNodeHelp_52
+{
+Allows commander to deploy health packs in the field
+}
+
+TechNodeLabel_53
+{
+Scanner Sweep
+}
+
+TechNodeHelp_53
+{
+Gives temporary sight into an area and reveals cloaked players.
+}
+
+TechNodeLabel_55
+{
+Phase gate
+}
+
+TechNodeHelp_55
+{
+Lightspeed travel
+}
+
+TechNodeLabel_56
+{
+Turret
+}
+
+TechNodeHelp_56
+{
+Build a sentry turret.
+}
+
+TechNodeLabel_57
+{
+Siege turret
+}
+
+TechNodeHelp_57
+{
+High-powered blast turret, fires sonically through walls.
+}
+
+TechNodeLabel_58
+{
+Command console
+}
+
+TechNodeHelp_58
+{
+An auxillary command console.
+}
+
+
+
+TechNodeLabel_59
+{
+Health
+}
+
+TechNodeHelp_59
+{
+Gives marine 50 health.
+}
+
+TechNodeLabel_60
+{
+Ammo
+}
+
+TechNodeHelp_60
+{
+One clip for any weapon.
+}
+
+TechNodeLabel_27
+{
+Catalyst pack
+}
+
+TechNodeHelp_27
+{
+Wounds marine to give +25%% speed and +25%% rate of fire for 8 seconds
+}
+
+
+
+TechNodeLabel_61
+{
+Mines
+}
+
+TechNodeHelp_61
+{
+Five mines/claymores
+}
+
+TechNodeLabel_62
+{
+Welder
+}
+
+TechNodeHelp_62
+{
+Repairs buildings and armor, affects weldables, burns webs.
+}
+
+TechNodeLabel_63
+{
+Med kit
+}
+
+TechNodeLabel_64
+{
+Shotgun
+}
+
+TechNodeHelp_64
+{
+For close encounters
+}
+
+TechNodeLabel_65
+{
+HMG
+}
+
+TechNodeHelp_65
+{
+High-powered assault rifle.
+}
+
+TechNodeLabel_66
+{
+Grenade launcher
+}
+
+TechNodeHelp_66
+{
+Grenade launcher 
+}
+
+TechNodeLabel_67
+{
+Nuke
+}
+
+TechNodeHelp_67
+{
+Droppable baby nuke.
+}
+
+TechNodeLabel_69
+{
+Recycle
+}
+
+TechNodeHelp_69
+{
+Destroy this structure, get some resources back.
+}
+
+TechNodeHelp_80
+{
+Ask your commander for orders.  The commander will be notified that you are looking for something to do, and will give you an order.
+}
+
+TechNodeHelp_81
+{
+Tell your commander that you are acknowledging his orders.  Follow the instructions for your current waypoint to carry out your orders.  When completed, the waypoint will go away automatically.
+}
+
+
+
+TechNodeLabel_85
+{
+Build
+}
+
+TechNodeHelp_85
+{
+Basic build menu
+}
+
+TechNodeLabel_86
+{
+Advanced
+}
+
+TechNodeHelp_86
+{
+Advanced build menu
+}
+
+TechNodeLabel_87
+{
+Assist
+}
+
+TechNodeHelp_87
+{
+Open assist menu
+}
+
+TechNodeLabel_88
+{
+Equip
+}
+
+TechNodeHelp_88
+{
+Open equipment menu
+}
+
+TechNodeHelp_90
+{
+Create resource tower: Collects resources for your team.  It can only be built at a resource nozzle with resources (indicated by a white "fountain").
+}
+
+TechNodeHelp_91
+{
+Create offensive chamber: organic turret that attacks enemy players and structures.  Damage: 20
+}
+
+TechNodeHelp_92
+{
+Create defensive chamber: gives defensive upgrades, heals players and structures.
+}
+
+TechNodeHelp_93
+{
+Create sensory chamber: gives sensory upgrades. and cloaks nearby players and structures.  Blocks motion-tracking within range.
+}
+
+TechNodeHelp_94
+{
+Create movement chamber: gives movement upgrades, automatically gives energy to nearby teammates.
+}
+
+// This is used to unlock an ability in Combat mode
+TechNodeLabel_95
+{
+Unlock ability
+}
+
+TechNodeHelp_95
+{
+Create hive: Allows access to higher lifeforms and abilities (must be built at a hive location).
+}
+
+TechNodeLabel_101
+{
+Carapace
+}
+
+TechNodeHelp_101
+{
+Increases amount of armor.  Each level of carapace absorbs roughly 16% more damage.
+}
+
+TechNodeLabel_102
+{
+Regeneration
+}
+
+TechNodeHelp_102
+{
+You automatically heal all damage over time.  Higher levels will heal you faster.
+}
+
+TechNodeLabel_103
+{
+Redemption
+}
+
+TechNodeHelp_103
+{
+The hive will automatically try to save you when you're near death, pulling you back to the hive to heal.
+}
+
+TechNodeHelp_104
+{
+Sharpness - Your melee damage is increased by half.
+}
+
+TechNodeHelp_105
+{
+Piercing - Your ranged damage is increased by half.
+}
+
+TechNodeHelp_106
+{
+Penetration - Shots go through walls and targets (not implemented).
+}
+
+TechNodeLabel_107
+{
+Celerity
+}
+
+TechNodeHelp_107
+{
+Permanently boosts max speed.
+}
+
+TechNodeLabel_108
+{
+Adrenaline
+}
+
+TechNodeHelp_108
+{
+Get energy back faster.  Each level of adrenaline increases your base energy recovery rate by 33%.
+}
+
+TechNodeLabel_109
+{
+Silence
+}
+
+TechNodeHelp_109
+{
+Each level of silence makes your footsteps and movement sounds quieter.
+}
+
+TechNodeLabel_110
+{
+Cloaking
+}
+
+TechNodeHelp_110
+{
+Standing still for a bit makes you nearly invisible.  Higher levels of cloaking make you cloak faster.  Observatories and scanner sweeps will uncloak you.
+}
+
+TechNodeLabel_111
+{
+Focus
+}
+
+TechNodeHelp_111
+{
+Focus decreases the rate of fire and increases damage on your slot one weapon.
+}
+
+TechNodeLabel_112
+{
+Scent of Fear
+}
+
+TechNodeHelp_112
+{
+Your hive sight will show you when your enemies are weakened.
+}
+
+TechNodeLabel_113
+{
+Skulk
+}
+
+TechNodeHelp_113
+{
+Gestate to Skulk.  This is a fast, small alien that is best suited for one on one combat, harassment and guerilla tactics.  Can climb walls (disable with the "duck" key).
+}
+
+TechNodeLabel_114
+{
+Gorge
+}
+
+TechNodeHelp_114
+{
+Gestate to Gorge.  Creates and grows resource towers, hives, upgrade chambers and turrets.  Weak in combat, can also heal friends and friendly structures.
+}
+
+TechNodeLabel_115
+{
+Lerk
+}
+
+TechNodeHelp_115
+{
+Gestate to Lerk.  Provides versatile combat support.  Has long-range spike shooting, choking area-effect spores and protective "umbra" ability.  Fly by tapping the jump key.  Glide by holding the jump key while in the air.
+}
+
+TechNodeLabel_116
+{
+Fade
+}
+
+TechNodeHelp_116
+{
+Gestate to Fade.  A powerfully built fighter, with swiping attacks, an acid rocket attack, and teleportation.
+}
+
+TechNodeLabel_117
+{
+Onos
+}
+
+TechNodeHelp_117
+{
+Gestate to Onos.  A behemoth that can stomp to stun his enemies, charge through enemies and devour them.  This alien is capable of taking on many marines at once.
+}
+
+TechNodeLabel_118
+{
+Unlock #2 ability
+}
+
+TechNodeLabel_126
+{
+Unlock #3 ability
+}
+
+TechNodeLabel_31
+{
+Level 4 needed
+}
+
+TechNodeLabel_54
+{
+Level 7 needed
+}
+
+ClassDead
+{
+Dead
+}
+
+ClassDigesting
+{
+Digesting
+}
+
+ClassCommander
+{
+Commander
+}
+
+ClassHeavyMarine
+{
+Heavy
+}
+
+ClassReinforcing
+{
+Reinforcing
+}
+
+ClassLevel1
+{
+Skulk
+}
+
+ClassLevel2
+{
+Gorge
+}
+
+ClassLevel3
+{
+Lerk
+}
+
+ClassLevel4
+{
+Fade
+}
+
+ClassLevel5
+{
+Onos
+}
+
+ClassGestating
+{
+Gestating
+}
+
+Building
+{
+Building: 
+}
+
+
+Researching
+{
+Researching: 
+}
+
+Energy
+{
+Energy: 
+}
+
+
+Prerequisite
+{
+Requires: 
+}
+
+Cost
+{
+Cost:
+}
+
+NotFullyBuilt
+{
+Not fully built
+}
+
+Recycling
+{
+Recycling...
+}
+
+ReinforcementsText
+{
+Reinforcements: 
+}
+
+LogoutText
+{
+LOGOUT
+}
+
+BlipStatus_0
+{
+enemy
+}
+
+BlipStatus_1
+{
+weak enemy
+}
+
+BlipStatus_2
+{
+
+}
+
+BlipStatus_3
+{
+is under attack
+}
+
+BlipStatus_5
+{
+is Gorge
+}
+
+BlipStatus_6
+{
+
+}
+
+BlipStatus_7
+{
+
+}
+
+BlipStatus_8
+{
+Location
+}
+
+Friend
+{
+Friend
+}
+
+Enemy
+{
+Enemy
+}
+
+User3Name_1
+{
+soldier
+}
+
+User3Name_2
+{
+commander
+}
+
+User3Name_3
+{
+skulk
+}
+
+User3Name_4
+{
+gorge
+}
+
+User3Name_5
+{
+lerk
+}
+
+User3Name_6
+{
+fade
+}
+
+User3Name_7
+{
+onos
+}
+
+User3Name_8
+{
+embryo
+}
+
+User3Name_15
+{
+equipment
+}
+
+User3Name_17
+{
+Hive
+}
+
+User3Desc_17
+{
+Aliens spawn here, grants access to higher alien lifeforms and upgrades.
+}
+
+User3FriendlyDesc_17
+{
+You spawn here.  It will heal you when you are close by.  Provides "hive sight", which communicates friends, enemies and alerts to your team.  Protect your hives at all costs.
+}
+
+User3Name_22
+{
+Resource nozzle
+}
+
+User3Desc_22
+{
+Gives resources when a resource tower is built upon it.  These resources are infinite.
+}
+
+User3CommanderDesc_22
+{
+Gives resources when a resource tower is built upon it.  These resources are infinite.
+}
+
+User3Name_23
+{
+command console
+}
+
+User3Desc_23
+{
+Used by the marine commander to create structures and research new technologies.
+}
+
+User3FriendlyDesc_23
+{
+Used by the marine commander to create structures and research new technologies.  Your commander is displayed at the top-middle of your screen.  If your team doesn't have a commander, you can become one by "using" the command console.
+}
+
+User3CommanderDesc_23
+{
+Select the command console to see the range in which you can build infantry portals.  If the command console is destroyed, you will be ejected back to the ground, and unable to command.  Protect it at all costs.
+}
+
+
+User3Name_24
+{
+turret factory
+}
+
+User3Desc_24
+{
+Allows sentry turrets to be built within range.  Turrets need the factory to continue functioning.  The commander can select the turret factory to see this range.
+}
+
+User3Name_25
+{
+armory
+}
+
+User3Desc_25
+{
+Gives ammo and allows construction of shotguns, mines and welders within range.
+}
+
+User3CommanderDesc_25
+{
+Gives free ammo and health to friendly soldiers.  Allows construction of shotguns, mines and welders within range.  Select the armory to see this range.
+}
+
+User3FriendlyDesc_25
+{
+"Use" the armory to get free ammo for your current weapon, and to get healed.  Also allows construction of shotguns and mines within range.
+}
+
+
+User3Name_26
+{
+advanced armory
+}
+
+User3Desc_26
+{
+Gives ammo and allows construction of heavy machine guns and grenade launchers within range.
+}
+
+User3CommanderDesc_26
+{
+Gives free ammo and health to friendly soldiers.  Allows construction of heavy machine guns and grenade launchers within range.  Select the advanced armory to see this range.
+}
+
+User3FriendlyDesc_26
+{
+"Use" the advanced armory to get free ammo for your current weapon, and to get healed.  Also allows construction of heavy machine guns and grenade launchers within range.
+}
+
+
+User3Name_27
+{
+arms lab
+}
+
+User3Desc_27
+{
+Allows access to armor and ammunition upgrades.
+}
+
+User3Name_28
+{
+prototype lab
+}
+
+User3Desc_28
+{
+Allows access to heavy armor and jetpacks.
+}
+
+User3Name_29
+{
+observatory
+}
+
+User3Desc_29
+{
+Sights nearby "blips" and uncloaks all enemies within range. Gives access to Scanner Sweep, Motion Sensor upgrade and Distress Beacon.
+}
+
+User3Name_30
+{
+chemlab
+}
+
+User3Name_31
+{
+medlab
+}
+
+User3Name_33
+{
+sentry turret
+}
+
+User3Desc_33
+{
+Automatically shoots at enemies in range.
+}
+
+User3FriendlyName_33
+{
+Automatically shoots at your enemies.  Weak against upgraded and higher-lifeform aliens.  Must be built within range of a turret factory.  Damage: 10
+}
+
+User3CommanderName_33
+{
+Automatically shoots at enemies and enemy structures.  Weak against upgraded and higher-lifeform aliens.  Must be built within range of a turret factory, but a turret factory isn't needed to continue working.  Select the turret to see its range.  Won't shoot cloaked players.  Good against low level aliens.  Damage: 10
+}
+
+
+User3Name_34
+{
+siege cannon
+}
+
+User3Desc_34
+{
+Automated Siege Cannon (ASC).  Sonic weapon that attacks structures, even through walls, but doesn't attack players.
+}
+
+User3FriendlyDesc_34
+{
+Automated Siege Cannon (ASC).  Sonic weapon that attacks structures, even through walls.  Doesn't attack players.  Range: 400  Damage: 165 (double vs. structures) 
+}
+
+User3CommanderDesc_34
+{
+Automated Siege Cannon (ASC).  Sonic weapon that attacks structures, even through walls.  Doesn't attack players.  It can't attack targets that are too close.  Select the ASC to see its minimum and maximum range (it can hit anything in the green).  Range: 400  Damage: 165 (double vs. structures)
+}
+
+User3Name_35
+{
+resource tower
+}
+
+User3Desc_35
+{
+Collects resources for your team at regular intervals.
+}
+
+User3Name_37
+{
+infantry portal
+}
+
+User3FriendlyDesc_37
+{
+Spawns marines in from their home.  Destroying the infantry portal means marines can't respawn from it.
+}	  
+
+User3FriendlyDesc_37
+{
+Spawns marines in from home.  Without an infantry portal, your team won't be able to respawn, so keep it safe.
+}	  
+
+User3CommanderDesc_37
+{
+Spawns marines in from home.  Without an infantry portal, the marines can't respawn.
+}
+
+User3Name_38
+{
+nuke
+}
+
+User3Desc_38
+{
+Nuke is arming, and must be destroyed before it finishes!  Once armed, nuke detonates, doing massive damage to nearby players and structures.
+}
+
+User3FriendlyDesc_38
+{
+Nuke is arming, protect it while it finishes.  Once armed, nuke detonates, doing massive damage to nearby players and structures.
+}
+
+User3CommanderDesc_38
+{
+Nuke is arming, protect it while it finishes.  Once armed, nuke detonates, doing massive damage to nearby players and structures.
+}
+
+User3Name_39
+{
+Heavy armor
+}
+
+User3Desc_39
+{
+Pick up to gain heavy armor.  Can't be used with jet-pack.  Provides protection from spores.
+}
+
+User3Name_40
+{
+Jet-pack
+}
+
+User3Desc_40
+{
+Pick up jet-pack module to gain jet-packing ability.  Can't be used with heavy armor.
+}
+
+User3Name_41
+{
+Phase gate
+}
+
+User3Desc_41
+{
+Allows light-speed travel to other phase gates.  Step onto the gate to teleport to another gate.
+}
+
+User3CommanderDesc_41
+{
+Allows light-speed travel to other phase gates.  Multiple gates are needed to function properly.
+}
+
+User3Name_42
+{
+Defense chamber
+}
+
+User3Desc_42
+{
+Slowly heals nearby friendly players and structures.  Provides one level of defensive upgrades (Carapace, Regeneration and Redemption).
+}
+
+User3Name_43
+{
+Movement chamber
+}
+
+User3Desc_43
+{
+Aliens can use them to teleport to the farthest hive.  Provides one level of movement upgrades (Celerity, Adrenaline and Silence).  Destroying these chambers will remove alien upgrades.
+}
+
+User3FriendlyDesc_43
+{
+Walk to chamber and press your "use" button to teleport to a hive under attack.  Provides one level of movement upgrades (Celerity, Adrenaline and Silence).
+}
+
+
+User3Name_44
+{
+Offense chamber
+}
+
+User3Desc_44
+{
+Organic turret that automatically attacks enemy players and structures.	 Damage: 20
+}
+
+User3Name_45
+{
+Sensory chamber
+}
+
+User3Desc_45
+{
+Detects enemies in range, parasites those that touch it, and provides sensory upgrades (Cloaking, Focus, Scent of Fear).
+}
+
+
+User3Name_46
+{
+Resource tower
+}
+
+User3Desc_46
+{
+Collects resources for the enemy.
+}
+
+User3FriendlyDesc_46
+{
+Collects resources for your team and never runs out.
+}
+
+User3Name_47
+{
+Heavy armor module
+}
+
+User3Desc_47
+{
+Outfits soldier with heavy armor.
+}
+
+User3FriendlyDesc_47
+{
+Outfits soldier with heavy armor.
+}
+
+User3Name_48
+{
+Jet-pack module
+}
+
+User3Desc_48
+{
+Outfits soldier with jet-pack.
+}
+
+User3FriendlyDesc_48
+{
+Outfits soldier with jet-pack.
+}
+
+User3Name_49
+{
+Advanced turret factory
+}
+
+User3Desc_49
+{
+Allows construction of sentry turrets and siege turrets.
+}
+
+User3FriendlyDesc_49
+{
+Allows construction of sentry turrets and siege turrets.
+}
+
+User3Name_57
+{
+Mine
+}
+
+User3Desc_57
+{
+Detonates on contact
+}
+
+User3FriendlyDesc_57
+{
+Detonates on contact
+}
+
+Weapon1Help
+{
+Gore - Get close to your enemy and attack. Damage: %d (double vs. structures)
+}
+
+Weapon2Help
+{
+Spit - Light ranged weapon to keep your enemies at bay.  Damage: %d
+}
+
+Weapon3Help
+{
+Spores - Shoots a cloud of choking spores, that slowly damage enemy players in range.  Damage: %d per second
+}
+
+Weapon4Help
+{
+Spikes - Long-range instant-hit weapon.  Damage: %d
+}
+
+Weapon5Help
+{
+Bite - Deadly close-combat attack.  Get close to your enemies and attack.  Damage: %d
+}
+
+Weapon6Help
+{
+Bite - Deadly close-combat attack.  Get close to your enemies and attack.  Damage: %d
+}
+
+Weapon7Help
+{
+Swipe - Deadly close-combat attack.  Get close to your enemies and attack.  Good against players and structures.  Damage: %d
+}
+
+Weapon8Help
+{
+Webs - Shoot globules near each other and a web will be created between them.  Webs slow enemies and prevent them from using their weapons for a time.  Webs can be destroyed with the welder.
+}
+
+Weapon9Help
+{
+Metabolize - Heals damage at the cost of energy.
+}
+
+Weapon10Help
+{
+Parasite - Infects target with a parasite, making him show up on hive sight at all times.  The parasite cannot be removed.  Damage: %d
+}
+
+Weapon11Help
+{
+Blink - Allows near-instant teleportation.  Point in the direction to travel, and hold the button.
+}
+
+Weapon12Help
+{
+Xenocide - Explosive suicide.  Shortly after activating, you blow up, doing heavy damage to everything nearby.  Damage: %d
+}
+
+Weapon13Help
+{
+Knife - Weapon of efficiency and desperation.  Damage: %d
+}
+
+Weapon14Help
+{
+Pistol - High-accuracy, and packs a punch, but small clip size.  Damage: %d
+}
+
+Weapon15Help
+{
+Machine gun - Good accuracy, high rate of fire, medium clip.  Rate of fire: 10 bullets per second.  Damage: %d
+}
+
+Weapon16Help
+{
+Shotgun - For fast moving targets and for delivering lots of damage quickly to close targets.  10 pellets per shot.  Damage: %d per pellet
+}
+
+Weapon17Help
+{
+Heavy machine gun (HMG) - Heavy weaponry for larger targets and enemies.  While quite inaccurate, it's massive clip size and rate of fire make it indispensable.  Damage: %d per bullet (half vs. structures)
+}
+
+Weapon18Help
+{
+Welder - Weld open or closed specially designated "weldable" areas of the map.  It can also repair structures, soldier armor, and can cut through webs.  Damage: %d
+}
+
+Weapon19Help
+{
+Mines - Use for defense, or protect your flank on an assault.  Deploying on vertical surfaces extends a laser tripwire, placing on the ground turns them into land mines.  Damage: %d
+}
+
+Weapon20Help
+{
+Grenade launcher - Grenades detonate after 4 seconds, or on contact, and do splash damage.  Damage: %d (double vs. structures) 
+}
+
+Weapon21Help
+{
+Leap - Jump forward quickly, slashing at everything in your way.  Useful for movement, and also in combat.  Damage: %d
+}
+
+Weapon22Help
+{
+Charge - Trample forth in a rage, hurting everything you touch.  The charge drains energy and stops when you run out of energy.  Damage: incredible
+}
+
+Weapon23Help
+{
+Umbra - Emits a bacterial mist that slows enemy bullets that enter it.  Any friendly player or structure inside umbra rarely gets hits by bullets, but is still susceptible to explosive damage and non-bullet attacks.  Lasts %d seconds.
+}
+
+Weapon24Help
+{
+Primal scream - All teammates within range during scream gain energy back faster, move faster and do more damage.  Listen for their screams of defiance.
+}
+
+Weapon25Help
+{
+Bile bomb - Organic artillery only hurts structures.  Damage: %d (area damage)
+}
+
+Weapon26Help
+{
+Acid rocket - Slow moving projectile that does splash damage.  Damage: %d
+}
+
+Weapon27Help
+{
+Healing spray - Bacterial spray that heals friendly players and structures and hurts enemies in range.  Damage: %d (area effect)
+}
+
+Weapon28Help
+{
+Hand grenade - Grenades detonate after 4 seconds and do splash damage.  Damage: %d (double vs. structures) 
+} 
+
+Weapon29Help
+{
+Stomp - Stuns all enemy players it touches for %d seconds.
+}
+
+Weapon30Help
+{
+Devour - Eat a nearby enemy.  Player is slowly digested, taking %d damage per second.  Onos gets this this damage back as health.  If Onos is killed before digestion completes, the enemy is freed.
+}
+
+
+
+CommandStationOtherTeam
+{
+This command console belongs to the other team.
+}
+
+CommandStationInUse
+{
+Your team already has a commander, the command console can't be used.
+}
+
+WeaponPreventingCommandStation
+{
+Your weapon is preventing use of the command console.
+}
+
+CommandStationDestroyed
+{
+This command console is destroyed and can no longer be used!
+}
+
+CommandStationWaitTime
+{
+You must wait longer before entering the command console again.
+}
+
+
+// Particle editing commands
+NoParticleSystem
+{
+That particle system couldn't be found.
+}
+
+EditingParticleSystem
+{
+Found particle system, use F7 to edit
+}
+
+
+// Marine help text
+
+// Armor received messages
+HelpTextCSAttractMode
+{
+Point at this command console and press your "use" key to activate command mode.
+}
+
+HelpTextArmoryResupply
+{
+"Use" the armory to get free ammo for your current weapon, or to receive a free health pack.
+}
+
+HelpTextAttackNearbyStation
+{
+This is the enemy's command console, attack it!
+}
+
+HelpTextBuildTurret
+{
+Point at the base of this turret and hold your "use" key to build it.
+}
+
+HelpTextBuildTower
+{
+Point at the base of this resource tower and hold your "use" key to build it.
+}
+
+HelpTextExplainTower
+{
+This active resource tower periodically gives your team resources.
+}
+
+HelpTextAttackHive
+{
+Gather your teammates and go find an alien hive to destroy!
+}
+
+HelpTextOtherHiveBlocked
+{
+The hive is blocked by a player or structure.  Clear the area nearby and try again.
+}
+
+HelpTextOtherHiveBuilding
+{
+Only one hive can be built at a time.  Wait until the other hive is built before starting this one.
+}
+
+HelpTextEmptyHiveNotNearby
+{
+Hives can only be built at hive locations (look for infestation and a translucent hive indicator).
+}
+
+HelpTextAttackNearbyHive
+{
+There is an enemy hive nearby, go kill it to stop the alien menace!
+}
+
+HelpTextFriendlyMovementChamber
+{
+Press your "use" key on this movement chamber to teleport to a hive under attack.  It also gives you energy when nearby.
+}
+
+HelpTextAttackMovementChamber
+{
+This is an enemy movement chamber, it allows them to teleport to their hive and gives them energy.
+}
+
+HelpTextFriendlyOffensiveChamber
+{
+This is an offense chamber, it will shoot at your enemies.
+}
+
+HelpTextAttackOffensiveChamber
+{
+This is an enemy offense chamber, watch out!
+}
+
+HelpTextFriendlyDefensiveChamber
+{
+This defensive chamber will regenerate players and structures nearby.  It makes a sloshing sound when it heals.
+}
+
+HelpTextAttackDefensiveChamber
+{
+This is an enemy defensive chamber, it heals enemy players and structures.
+}
+
+HelpTextFriendlySensoryChamber
+{
+This is a sensory chamber, it cloaks nearby players and structures.
+}
+
+HelpTextAttackSensoryChamber
+{
+This is an enemy sensory chamber.
+}
+
+HelpTextOpenWeldable
+{
+This area can be opened with a welder.
+}
+
+HelpTextCloseWeldable
+{
+This area can be welded shut with a welder.
+}
+
+HelpTextPhaseGate
+{
+Enter the phase gate to teleport.
+}
+
+HelpTextAlienPopupMenu
+{
+Use your "pop-up menu" to build structures, evolve upgrades, and switch teams (right mouse button).
+}
+
+HelpTextMarinePopupMenu
+{
+Use your "pop-up menu" to access voice commands, ask for orders, leave the team, and more  (right mouse button).
+}
+
+HelpTextOrder
+{
+You have been given an order by the commander.  The blue circle on your screen describes the location and type of your order.  Use your pop-up menu to ask for orders or acknowledge them.
+}
+
+HelpTextCommanderUseable
+{
+As commander, you can "use" any buttons or switches by left-clicking them.
+}
+
+HelpTextMarineCommandMenu
+{
+Press your "pop-up menu" key to communicate with your team (default is right mouse button).
+}
+
+HelpTextResourceDropoff
+{
+You earned resource points for your team!
+}
+
+HelpTextJetpacks
+{
+Your commander has researched jet-packs for your team.  Hold your jump key to use.
+}
+
+HelpTextAlienCommandMenu
+{
+Press your "pop-up menu" key to change lifeforms and evolve upgrades (default is right mouse button).
+}
+
+HelpTextAttackTower
+{
+This resource tower earns resources for the enemy...destroy it!
+}
+
+HelpTextAlienWeapons
+{
+Use the mousewheel or the number keys to switch abilities.  A red icon means that ability is disabled until you get more hives.
+}
+
+HelpTextAlienResources
+{
+The blue bar on the left is your resources.  You get resources from your team's resource towers.  Resources can be spent using the pop-up menu.
+}
+
+HelpTextAlienEnergy
+{
+The yellow bar on the right is your energy.  Abilities cost energy to use.
+}
+
+HelpTextAlienPendingUpgrades
+{
+The small blinking icon(s) on the right side of your screen means you can now evolve new traits!  Open the pop-up menu and make a choice of one of the upgrades.
+}
+
+HelpTextAlienBuildStructure
+{
+As a builder alien, you can create structures for your team using your pop-up menu.
+}
+
+HelpTextAlienBuildStructure
+{
+There is an unbuilt alien structure nearby.  Alien structures build slowly on their own, but as a builder, you can speed it up.  Point at the base of the structure and hold your "use" key.
+}
+
+HelpTextAlienHiveSight
+{
+The animated icons on your screen indicate your team's "hive sight".  Green icons are your team's gorges, yellow-reddish icons show hive locations and red icons show structures or friends under attack.
+}
+
+HelpTextAlienVisionMode
+{
+The locations of all aliens and their structures are always known to the hive mind.  It can show you all lifeforms on your team when you press your "flashlight" key.
+}
+
+HelpTextAlienCommunication
+{
+You can communicate with your team via hive sight by using your pop-up menu.  If you see enemies coming towards one of your hives, open your pop-up menu, move down, right, up, then release.  Your teammates will see "incoming" on hive sight.
+}
+
+HelpTextAlienUnderAttack
+{
+One of your teammates or structures is under attack.  Spin your view around and look for the hive sight alert.
+}
+
+HelpTextBuilder
+{
+You are now a Gorge.  Stay out of combat and use your pop-up menu to build different structures.
+}
+
+HelpTextWeb
+{
+Fire web strands at walls and floors to create webs between them.  Enemies that touch webs are slowed and can't use their weapons temporarily.
+}
+
+HelpTextWallwalking
+{
+You can hold your duck key to walk up walls and ceilings.
+}
+
+HelpTextBite
+{
+Get close to your enemies and press your attack key to bite them.
+}
+
+HelpTextFlight
+{
+Try tapping your jump key to fly.  You can also hold your jump key while in the air to glide.
+}
+
+HelpTextSpores
+{
+Press your attack button to launch a spore cloud that hurts players inside it.
+}
+
+HelpTextAlienResource
+{
+Find a resource node and build one of these on top of it to capture resources for your team.
+}
+
+HelpTextPopupMenu
+{
+Hold your right mouse button (secondary attack) to show the pop-up menu.
+}
+
+HelpTextBuyUpgrade
+{
+Aliens can evolve new traits by displaying the pop-up menu.  Try it: hold your pop-up menu button (right mouse button by default), and move the mouse right.
+}
+
+HelpTextBuyLifeform
+{
+Aliens can morph into new lifeforms.  Try it: hold your pop-up menu button (right mouse button by default), move your mouse down, then right, then release.
+}
+
+HelpTextCommanderGiveOrders
+{
+Right-click on the ground or a structure to give an order.
+}
+
+HelpTextCommanderSelectPlayers
+{
+Left-click on players or drag a box around them to select them.
+}
+
+HelpTextCommanderLogout
+{
+You can leave commander mode by clicking the red "logout" button in the upper-right corner of your screen.
+}
+
+// This message isn't in yet
+HelpTextCommanderBuild
+{
+This structure has not been fully built.  Select a player then right-click this structure to give him an order to build it.
+}
+
+HelpTextCommanderUse
+{
+Doors, lifts and other moving structures can be "hacked" by the commander.  Left-click to hack this structure.
+}
+
+HelpTextCommanderAttack
+{
+This target can be attacked!  Right-click to give an attack order.
+}
+
+HelpTextCommanderWeld
+{
+This target can be welded.  Buy a welder for a teammate, then right-click here to give a welding order.
+}
+
+HelpTextCommanderGet
+{
+Right-click here to give an order to pick this up.
+}
+
+HelpTextCommanderUnderAttack
+{
+You are under attack!  Press your "jump" key to go to the alert.
+}
+
+HelpTextCommanderResearchComplete
+{
+Your research is complete.  Press your "jump" key to go to the site of the research.
+}
+
+HelpTextCommanderUpgradeComplete
+{
+Your upgrade is complete.  Press your "jump" key to go to the upgraded structure.
+}
+
+JetpackEnergyHUDText
+{
+Jet-pack energy
+}
+
+HelpTextDisableHelp
+{
+You can turn off this help text by unchecking the "show hints" checkbox your multiplayer customization menu (cl_autohelp 0).
+}
+
+Paralyzed
+{
+Paralyzed
+}
+
+Stunned
+{
+Stunned
+}
+
+Digested
+{
+Being digested...
+}
+
+DigestingPlayer
+{
+Digesting %s...
+}
+
+Parasited
+{
+Parasited
+}
+
+PrimalScreamed
+{
+Primal scream
+}
+
+Catalysted
+{
+Catalyst
+}
+
+Umbraed
+{
+In umbra
+}
+
+Webbed
+{
+Webbed
+}
+
+// Order descriptions
+Order2
+{
+Move to waypoint
+}
+
+Order3
+{
+Attack target
+}			 
+
+Order4
+{
+Build %s
+}
+
+Order5
+{
+Guard %s
+}
+
+Order6
+{
+Use welder at waypoint
+}
+
+Order7
+{
+Get %s
+}
+
+Order9
+{
+Hold your position
+}
+
+Range
+{
+%d meters
+}
+
+// Timelimit for tourny mode
+GameTime
+{
+Game time
+}
+
+Elapsed
+{
+elapsed
+}
+
+TimeLimit
+{
+Time limit
+}
+
+Remaining
+{
+left
+}
+
+// HLTV 
+Spec_duck
+{
+Press DUCK for Spectator Menu
+}
+
+SPECT_OPTIONS
+{
+Options
+}
+
+CAM_OPTIONS
+{
+Camera Options
+}
+
+SpecMode5Text
+{
+}
+
+OBS_MAP_FREE
+{
+Map free camera
+}
+
+OBS_MAP_CHASE
+{
+Map chase camera
+}
+
+OBS_CHASE_FREE
+{
+Free chase camera
+}
+
+OBS_CHASE_LOCKED
+{
+Locked chase camera
+}
+
+OBS_IN_EYE
+{
+In-eye camera
+}
+
+OBS_ROAMING
+{
+Free look camera
+}
+
+// Official map locations
+testlocation1
+{
+The translated refinery
+}
+
+/////////////
+// ns_bast //
+/////////////
+bastlocation_dockingbay
+{
+Marine Start - Docking Bay 1
+}
+
+bastlocation_mainjunction
+{
+Main Aft Junction
+}
+
+bastlocation_cargolock
+{
+Heavy Lock Door
+}
+
+bastlocation_atmosphericprocessing
+{
+Atmospheric Processing
+}
+
+bastlocation_furnace
+{
+Steam Generation
+}
+
+bastlocation_watertreatment
+{
+Water Treatment
+}
+
+// NOTE: The hyphen in hive location names is important.  Everything before the hyphen is trimmed off when displaying
+// location names for aliens (the hive icons in the upper right of their HUD).  Make sure to follow the convention:
+// Hive Location - name
+bastlocation_feedwatercontrol
+{
+Hive Location - Feedwater Control
+}
+
+bastlocation_trammaintenance
+{
+Tram Maintenance
+}
+
+bastlocation_tramtunnel
+{
+Tram Tunnel
+}
+
+bastlocation_lowerjunction
+{
+Lower Junction
+}
+
+bastlocation_Refinery
+{
+Hive Location - Refinery
+}
+
+bastlocation_emshaft
+{
+EM Drill Shaft
+}
+
+bastlocation_engineroom
+{
+Hive Location - Engine Room
+}
+
+bastlocation_dockinghydraulics
+{
+Docking Hydraulics
+}
+
+bastlocation_maintenancejunction
+{
+Maintenance Junction
+}
+
+bastlocation_ncorridor
+{
+"N" Corridor
+}
+
+bastlocation_observationbridge
+{
+Observation Bridge
+}
+
+bastlocation_starboardairlock
+{
+Starboard Airlock
+}
+
+bastlocation_portairlock
+{
+Port Airlock
+}
+
+bastlocation_maintenanceaccess
+{
+Maintenance Access Duct
+}
+
+bastlocation_pressureequalization
+{
+Pressure Equalization Conduit
+}
+
+bastlocation_starboardcorridor
+{
+Aft Starboard Corridor
+}
+
+bastlocation_filtration
+{
+Feedwater Filtration Access
+}
+
+bastlocation_ventilation
+{
+Ventilation Conduit
+}
+
+bastlocation_databank
+{
+Databank Access
+}
+
+bastlocation_enginecorridor
+{
+Engine Corridor
+}
+
+/////////////
+// ns_hera //
+/////////////
+heralocation_archive
+{
+Hive Location - Archiving
+}
+ 
+heralocation_processingcorea
+{
+Data Core Alpha
+}
+ 
+heralocation_reception
+{
+Hera Entrance and Reception
+}
+ 
+heralocation_holoroom
+{
+Central Monitoring - 'Holoroom'
+}
+ 
+heralocation_storage
+{
+General Cargo Storage
+}
+ 
+heralocation_hanger
+{
+Marine Start - Loading bay
+}
+ 
+heralocation_docking
+{
+Marine Start - Landing Pad
+}
+ 
+heralocation_processing
+{
+Processing
+}
+ 
+heralocation_processingcoreb
+{
+Hive Location - Data Core Delta
+}
+ 
+heralocation_ventilation
+{
+Hive Location - Ventilation 3-C
+}
+ 
+heralocation_maintenence
+{
+Maintenance
+}
+ 
+heralocation_fogcorridor
+{
+Maintenance Corridor
+}
+ 
+heralocation_tube
+{
+Hera Entrance Walkway
+}
+
+// Nothing titles
+nothinglocation_rr
+{
+Space Station Nothing - Sub Sector 77
+}
+
+nothinglocation_ms
+{
+Marine Start - S77 Vestibule
+}
+
+nothinglocation_dock
+{
+Docking Wing 01
+}
+
+nothinglocation_thres1
+{
+The Threshold
+}
+
+nothinglocation_thres2
+{
+The Threshold
+}
+
+nothinglocation_junc1
+{
+The Junction
+}
+
+nothinglocation_junc2
+{
+The Junction
+}
+
+nothinglocation_vent
+{
+Ventilation Chamber
+}
+
+nothinglocation_comm
+{
+Communications Hub 063
+}
+
+nothinglocation_things
+{
+Room With Things
+}
+
+nothinglocation_cargo
+{
+Hive Location - Cargo Bay Foyer
+}
+
+nothinglocation_pipe
+{
+Pipe Room
+}
+
+nothinglocation_paint1
+{
+Painted Corridor
+}
+
+nothinglocation_paint2
+{
+Painted Corridor
+}
+
+nothinglocation_paint3
+{
+Painted Corridor
+}
+
+nothinglocation_quada
+{
+Quad Lift Area
+}
+
+nothinglocation_quad
+{
+Quad Lift
+}
+
+nothinglocation_chamb
+{
+Foreboding Antechamber
+}
+
+nothinglocation_sas1
+{
+Silo Access South
+}
+
+nothinglocation_sas2
+{
+Silo Access South
+}
+
+nothinglocation_silo
+{
+Hive Location - PowerSilo
+}
+
+nothinglocation_san1
+{
+Silo Access North
+}
+
+nothinglocation_san2
+{
+Silo Access North
+}
+
+nothinglocation_mias1
+{
+Miasma Walkway
+}
+
+nothinglocation_mias2
+{
+Miasma Walkway
+}
+
+nothinglocation_mias3
+{
+Miasma Walkway
+}
+
+nothinglocation_gen
+{
+Generator Room
+}
+
+nothinglocation_elev1
+{
+Elevator Shaft 01
+}
+
+nothinglocation_elev2
+{
+Elevator Shaft 02
+}
+
+nothinglocation_eek
+{
+Intimidation
+}
+
+nothinglocation_kismet
+{
+Ominous Kismet
+}
+
+nothinglocation_vae
+{
+Viaduct Access East
+}
+
+nothinglocation_vaw
+{
+Viaduct Access West
+}
+
+nothinglocation_viaduct
+{
+Hive Location - The Great Viaduct
+}
+
+// TANITH info_location data START
+tanith_westenter
+{
+Western Entrance
+}
+
+tanith_marinebase
+{
+Marine Start - Uplink Command
+}
+
+tanith_outsidebase
+{
+Exterior Access Paths
+}
+
+tanith_north
+{
+Northern Corridor
+}
+
+tanith_sat
+{
+External Satellite Relay
+}
+
+tanith_satcomm
+{
+Hive Location - Satellite Communications
+}
+
+tanith_transport
+{
+Chemical Transport Room
+}
+
+tanith_cpu
+{
+Computer Control
+}
+
+tanith_acid
+{
+Acidic Solution Processing
+}
+
+tanith_reactor
+{
+Reactor Room
+}
+
+tanith_enter
+{
+Eastern Entrance
+}
+
+tanith_centerenter
+{
+Central Entrance
+}
+
+tanith_east
+{
+East Access Tunnels
+}
+
+tanith_research
+{
+Research Labs
+}
+
+tanith_rr
+{
+Tanith Ready Room
+}
+tanith_waste
+{
+Hive Location - Waste Handling
+}
+
+tanith_central
+{
+Central Access Tunnels
+}
+
+tanith_storageenter
+{
+Storage Entrance
+}
+
+tanith_cargo
+{
+Cargo Storage
+}
+
+tanith_fusion
+{
+Hive Location - Fusion Reactor
+}
+
+tanith_west
+{
+West Access Corridor
+}
+// TANITH info_location data END 
+
+
+// NANCY info_location data START
+nancy_cargo
+{
+Cargo Hold 2
+}
+
+nancy_aux
+{
+Auxillary Command
+}
+
+nancy_engine
+{
+Port Engine Room
+}
+
+nancy_crawl
+{
+Sub-tunnel
+}
+
+nancy_maint
+{
+Maintenance Shaft
+}
+
+nancy_shaft
+{
+Maintenance Shaft
+}
+
+nancy_mother
+{
+Noname
+}
+
+nancy_lockers
+{
+Crew Lockers
+}
+
+nancy_mess
+{
+Mess Hall
+}
+
+nancy_airlock
+{
+Airlock Exchange
+}
+
+nancy_port
+{
+Port Airlock
+}
+
+nancy_bridge
+{
+Bridge
+}
+
+nancy_cockpit
+{
+Cockpit
+}
+
+nancy_star
+{
+Starboard Airlock
+}
+
+nancy_gen
+{
+Auxiliary Generators
+}
+
+nancy_motherinter
+{
+Mother Interface
+}
+
+nancy_subspace
+{
+Subspace Array Interface
+}
+
+nancy_crew
+{
+Crew Quarters
+}
+// NANCY info_location data END
+
+// CAGED info_location data START
+caged_marine
+{
+Marine Spawn - Main Hold
+}
+
+caged_upsewer
+{
+Upper Sewer
+}
+
+caged_dsewer
+{
+Lower Sewer
+}
+
+caged_hive1
+{
+Hive Location - Sewer
+}
+
+caged_hive2
+{
+Hive Location - Ventilation System
+}
+
+caged_hive3
+{
+Hive Location - Generator
+}
+
+caged_pure
+{
+Purification Station 01
+}
+
+caged_central
+{
+Central Processing
+}
+
+caged_vaccess
+{
+Ventilation Access
+}
+
+caged_work
+{
+Stability Monitoring
+}
+
+caged_auxgen
+{
+Auxiliary Generator
+}
+
+caged_service
+{
+Shipping Tunnels
+}
+
+caged_area2
+{
+Upper Shipping Access
+}
+// CAGED info_location data END
+
+// Eclipse info_location... info. (BEGIN)
+eclipse_dock
+{
+Docking Control
+}
+
+eclipse_marinespawn
+{
+Marine Spawn - Cargo Transfer
+}
+
+eclipse_station
+{
+Station Access
+}
+
+eclipse_stationeast
+{
+Station Access East
+}
+
+eclipse_stationalpha
+{
+Station Access Alpha
+}
+
+eclipse_stationwest
+{
+Station Access West
+}
+
+eclipse_triad
+{
+Triad Generator Array
+}
+
+eclipse_triadb
+{
+Triad Access B
+}
+
+eclipse_access1c
+{
+Access Corridor 1C
+}
+
+eclipse_access1b
+{
+Access Corridor 1B
+}
+
+eclipse_access1a
+{
+Primary Access Corridor 1A
+}
+
+eclipse_horseshoe
+{
+The Horseshoe
+}
+
+eclipse_tjunct
+{
+T-Junction
+}
+
+eclipse_keyhole
+{
+The Keyhole
+}
+
+eclipse_maint
+{
+Hive - Maintenance Access
+}
+
+eclipse_south
+{
+South Loop
+}
+
+eclipse_core
+{
+Hive - Computer Core
+}
+
+eclipse_northcore
+{
+North Core Access
+}
+
+eclipse_westcore
+{
+West Core Access
+}
+
+eclipse_subjunct
+{
+Power Sub-Junction 3
+}
+
+eclipse_access1d
+{
+Access Corridor 1D
+}
+
+eclipse_commandnorth
+{
+Command Access North
+}
+
+eclipse_command
+{
+Hive - Eclipse Command
+}
+
+eclipse_genmon
+{
+Primary Generator Monitors
+}
+
+eclipse_commandsouth
+{
+Command Access South
+}
+
+eclipse_access1a
+{
+Access Corridor 1A
+}
+// Eclipse info_location... info. (END)
+
+
+// Veil info_location (START)
+
+veil_marine
+{
+Marine Spawn - Mobile Command Interface
+}
+
+veil_lifteast
+{
+Lift 5 East
+}
+
+veil_swhive
+{
+Hive - Sub-Sector 5B Access
+}
+
+veil_south
+{
+Hive - Cargo Transfer South
+}
+
+veil_southeast
+{
+Hive - The Pipeline
+}
+
+veil_overlook
+{
+The Overlook
+}
+
+veil_topography
+{
+Topographical Analysis
+}
+
+veil_nano
+{
+NanoGrid Status
+}
+
+veil_dome
+{
+The Dome
+}
+
+veil_y
+{
+Y Junction
+}
+
+veil_skylight
+{
+West Skylights
+}
+
+veil_satellite
+{
+Satellite Feed
+}
+
+veil_pod1
+{
+Monitoring Pod 1
+}
+
+veil_pod2
+{
+Monitoring Pod 2
+}
+
+veil_waypointing
+{
+System Waypointing
+}
+
+veil_nanoeast
+{
+NanoGrid Access East
+}
+
+veil_nanowest
+{
+NanoGrid Access West
+}
+
+veil_c12
+{
+Emergency Nozzle C-12
+}
+
+veil_junctionwest
+{
+West Junction
+}
+
+veil_junctioneast
+{
+East Junction
+}
+
+veil_power
+{ 
+Power Core Status 
+}
+
+// Veil info_location (END)
diff --git a/main/events/Ability.sc b/main/events/Ability.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/AcidRocket.sc b/main/events/AcidRocket.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/AlienSightOff.sc b/main/events/AlienSightOff.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/AlienSightOn.sc b/main/events/AlienSightOn.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/BileBomb.sc b/main/events/BileBomb.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/Bite.sc b/main/events/Bite.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/Bite2.sc b/main/events/Bite2.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/BlinkGun.sc b/main/events/BlinkGun.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/BlinkSuccess.sc b/main/events/BlinkSuccess.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/Build.sc b/main/events/Build.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/Charge.sc b/main/events/Charge.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/Claws.sc b/main/events/Claws.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/CommandPoints.sc b/main/events/CommandPoints.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/Devour.sc b/main/events/Devour.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/DistressBeacon.sc b/main/events/DistressBeacon.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/DivineWind.sc b/main/events/DivineWind.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/Empty.sc b/main/events/Empty.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/EndCloak.sc b/main/events/EndCloak.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/Grenade.sc b/main/events/Grenade.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/GrenadeGun.sc b/main/events/GrenadeGun.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/HealingSpray.sc b/main/events/HealingSpray.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/HeavyMachineGun.sc b/main/events/HeavyMachineGun.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/HiveHit.sc b/main/events/HiveHit.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/InvalidAction.sc b/main/events/InvalidAction.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/Jetpack.sc b/main/events/Jetpack.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/Knife.sc b/main/events/Knife.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/Leap.sc b/main/events/Leap.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/LevelUp.sc b/main/events/LevelUp.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/MachineGun.sc b/main/events/MachineGun.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/Metabolize.sc b/main/events/Metabolize.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/MetabolizeSuccess.sc b/main/events/MetabolizeSuccess.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/NumericalInfo.sc b/main/events/NumericalInfo.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/OffenseChamber.sc b/main/events/OffenseChamber.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/ParasiteGun.sc b/main/events/ParasiteGun.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/Particle.sc b/main/events/Particle.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/PhaseIn.sc b/main/events/PhaseIn.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/Pistol.sc b/main/events/Pistol.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/PrimalScream.sc b/main/events/PrimalScream.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/Regeneration.sc b/main/events/Regeneration.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/ShootSpores.sc b/main/events/ShootSpores.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/SiegeHit.sc b/main/events/SiegeHit.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/SiegeViewHit.sc b/main/events/SiegeViewHit.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/SonicGun.sc b/main/events/SonicGun.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/SpikeGun.sc b/main/events/SpikeGun.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/SpinWeb.sc b/main/events/SpinWeb.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/SpitGun.sc b/main/events/SpitGun.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/SporeCloud.sc b/main/events/SporeCloud.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/StartCloak.sc b/main/events/StartCloak.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/Stomp.sc b/main/events/Stomp.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/StopScream.sc b/main/events/StopScream.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/Swipe.sc b/main/events/Swipe.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/Teleport.sc b/main/events/Teleport.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/UmbraCloud.sc b/main/events/UmbraCloud.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/UmbraGun.sc b/main/events/UmbraGun.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/WeaponAnimation.sc b/main/events/WeaponAnimation.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/Welder.sc b/main/events/Welder.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/WelderConst.sc b/main/events/WelderConst.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/WelderEnd.sc b/main/events/WelderEnd.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/events/WelderStart.sc b/main/events/WelderStart.sc
new file mode 100644
index 00000000..e69de29b
diff --git a/main/fmod.dll b/main/fmod.dll
new file mode 100644
index 00000000..043b7406
Binary files /dev/null and b/main/fmod.dll differ
diff --git a/main/french_titles.txt b/main/french_titles.txt
new file mode 100644
index 00000000..765439ec
--- /dev/null
+++ b/main/french_titles.txt
@@ -0,0 +1,4327 @@
+//TITLES FOR NATURAL SELECTION
+//
+//French translation by Emmanual 'Darwin' Marseille
+//
+//DO NOT ALTER THIS FILE
+// Position command $position x y 
+// x & y are from 0 to 1 to be screen resolution independent
+// -1 means center in each dimension
+// Effect command $effect <effect number>
+// effect 0 is fade in/fade out
+// effect 1 is flickery credits
+// effect 2 is write out (training room)
+// Text color r g b command $color
+// fadein time fadeout time / hold time
+// $fadein (message fade in time - per character in effect 2)
+// $fadeout (message fade out time)
+// $holdtime (stay on the screen for this long)
+
+////////////////////
+// Green teletype //
+////////////////////
+$position 0.15 0.15
+$effect 2
+$color 0 200 0
+$color2 0 255 0
+$fadein 0.04
+$fxtime 0.25
+$holdtime 6.0
+$fadeout 0.5
+
+Team_AutoAssign
+{
+Assignation automatique
+}
+
+Menu_Spectate
+{
+Spectateur
+}
+
+UndefinedTeam
+{
+Ready Room
+}
+
+Menu_LeaveGame
+{
+Quitter le jeu
+}
+
+Menu_ReadyRoom
+{
+Ready room
+}
+
+Menu_Marine1Team
+{
+Joindre les marines
+}
+
+Menu_Alien1Team
+{
+Joindre les aliens
+}
+
+Marine1Team
+{
+Frontiersmen
+}
+
+Alien1Team
+{
+Kharaa
+}
+
+Marine2Team
+{
+Frontiersmen
+}
+
+Alien2Team
+{
+Kharaa
+}
+
+AutoTeam
+{
+Assignation automatique
+}
+
+Muted
+{
+Muet.
+}
+
+Unmuted
+{
+Non muet.
+}
+
+No_longer_hear_that_player
+{
+Vous n'entendrez plus ce joueur.
+}
+
+// SDK 2.0 Spectator Menu
+Spec_Map
+{
+Carte
+}
+
+Spec_Mode1
+{
+Camera de poursuite fixe.
+}
+
+Spec_Mode2
+{
+Camera de poursuite libre.
+}
+
+Spec_Mode3
+{
+Camera libre.
+}
+
+Spec_Mode4
+{
+Vue premiere personne.
+}
+
+Spec_Mode5
+{
+Apercu libre.
+}
+
+Spec_Mode6
+{
+Apercu poursuite.
+}
+
+Spec_NoTarget
+{
+Pas de joueur disponible. Impossible de passer en camera de poursuite.
+}
+
+Spec_Help
+{
+Appuyez sur F4 pour retourner dans la "ready room".  Utilisez les touches GAUCHE, DROITE, SAUT et TIRER pour changer de vue.
+}
+
+Spec_Help_Text
+{
+Utilisez les touches suivantes pour changer de style de vue :
+
+ TIRER ou DROITE - Poursuivre le joueur suivant
+ MENU POPUP ou GAUCHE - Poursuivre le joueur precedent
+ SAUT - Changer de mode de vue
+ UTILISER - Changer le mode de la fenetre incruste
+
+ S'ACCROUPIR - Ouvrir le menu spectateur
+
+En mode vue d'ensemble de la carte, deplacez-vous avec :
+
+ DEPLACEMENT GAUCHE - Bouger a gauche
+ DEPLACEMENT DROITE - Bouger a droite
+ AVANT - Zoom avant
+ ARRIERE - Zoom arriere
+ SOURIS - Tourner autour de la carte ou du joueur
+}
+
+Spec_Slow_Motion
+{
+Ralenti
+}
+
+Spec_Replay
+{
+Reprise
+}
+
+Spec_Help2
+{
+Vos messages et votre voix ne peuvent etre vus et entendus que par les autres spectateurs.
+}
+
+Spec_Only_Help
+{
+}
+
+Directed
+{
+Directed
+}
+
+SpectatorsNotAllowed
+{
+Ce serveur n'autorise pas de spectateurs pour le moment.
+}
+
+ObsInEyePrefix
+{
+Mode premiere personne depuis 
+}
+
+SpectatorTeam
+{
+Spectateurs
+}
+
+Spectators
+{
+Spectateurs
+}
+
+TEAM
+{
+Equipe
+}
+
+TEAMS
+{
+Equipes
+}
+
+PLAYER
+{
+Joueur
+}
+
+Player_plural
+{
+Joueurs
+}
+
+PLAYERS
+{
+Joueurs
+}
+
+SCORES
+{
+Informations sur le joueur
+}
+
+SCORE
+{
+Score
+}
+
+DEATHS
+{
+Morts
+}
+
+LATENCY
+{
+Latence
+}
+
+VOICE
+{
+Voix
+}
+
+Unassigned
+{
+Non-assigne
+}
+
+Menu_OK
+{
+OK
+}
+
+Points
+{
+points
+}
+
+Cost
+{
+Cout
+}
+
+NoSpectating
+{
+Les spectateurs ne sont pas autorises sur ce serveur.
+}
+
+// Main game messages
+ReadyRoomMessage
+{
+Vous etes dans la "ready room".  Passez par une des entrees pour rejoindre une equipe ou pour observer la partie en cours.
+}
+
+ReinforcementMessage
+{
+Vous attendez votre tour pour arriver en renfort.
+}
+
+ReinforcingMessage
+{
+Vous allez arriver en renfort, preparez-vous...
+}
+
+ObserverMessage
+{
+Vous etes un spectateur. Vous ne pouvez plus rejoindre la partie en cours, mais vous le pourrez a la prochaine.
+}
+
+CantSwitchTeamsInTournyMode
+{
+Vous ne pouvez pas changer d'equipe durant le mode tournoi.
+}
+
+CantSwitchTeamsAfterGameStart
+{
+Vous ne pouvez pas changer d'equipe une fois que la partie a commence.
+}
+
+TooManyPlayersOnTeam
+{
+Il y a deja trop de joueurs dans cette equipe.
+}
+
+CantJoinAfterSpectating
+{
+Vous ne pouvez pas rejoindre la partie en cours une fois que vous avez ete spectateur.
+}
+
+CanOnlyJoinTeamYouveReinforced
+{
+Vous avez deja vu l'autre equipe, vous ne pouvez pas rejoindre celle-ci avant la prochaine partie.
+}
+
+YouCanJoinSoon
+{
+Vous allez bientot rejoindre cette equipe.
+}
+
+AlreadyOnTeam
+{
+Vous etes deja dans une equipe.  Retournez d'abord dans la "ready room" pour changer d'equipe.
+}
+
+SoldierMessage
+{
+Vous etes maintenant un soldat.  Essayez de suivre les ordres de votre "commander", et faites de votre mieux pour empecher l'ennemi de tuer vos coequipiers et de detruire vos structures.
+}
+
+ObjectivesVsAliens
+{
+Vous affrontez les aliens !  Vous devez detruire leurs "hives" via lesquels  les renforts arrivent et ensuite tous les tuer.
+}
+
+ObjectivesVsMarines
+{
+Vous affrontez les marines !  Vous devez detruire leurs "infantry portals" via lesquels les renforts arrivent et ensuite tous les tuer.
+}
+
+Handicap
+{
+Handicap
+}
+
+CommanderMessage
+{
+Selectionnez un ou plusieurs joueurs en cliquant dessus ou en faisant une zone de selection avec votre souris, cliquez ensuite sur le bouton droit a un endroit, une structure ou un joueur pour leur donner un ordre.  Le menu en bas a droite vous permet de construire des structures et d'equiper vos soldats.
+}
+
+Commander
+{
+Comm 
+}
+
+NoCommander
+{
+Pas de "commander". 
+}
+
+GestationMessage
+{
+Vous etes maintenant en train d'evoluer en une nouvelle forme d'alien.  Preparez-vous a eclore...
+}
+
+CocoonMessage
+{
+Vous avez ete mis dans un cocon !
+}
+
+YouAreReinforcements
+{
+Vous avez ete appelle en renfort !
+}
+
+//////////////
+// Pie menu //
+//////////////
+MenuMarineRoot
+{
+Depart
+}
+
+//MenuMarineRoot
+//{
+//!marinenode
+//}
+
+
+MenuComms
+{
+Communication
+}
+
+MenuTalk
+{
+Parler
+}
+
+MenuAttacked
+{
+"Je suis attaque !"
+}
+
+MenuCheer
+{
+Acclamations
+}
+
+MenuCoverMe
+{
+"Couvrez-moi !"
+}
+
+MenuRetreat
+{
+"Retraite !"
+}
+
+MenuInPosition
+{
+"En position"
+}
+
+MenuEnemySpotted
+{
+"Ennemi ici"
+}
+
+MenuMoveOut
+{
+"On degage"
+}
+
+MenuAllClear
+{
+"Zone securisee"
+}
+
+MenuYell
+{
+Crier
+}
+
+MenuSay
+{
+Dire
+}
+
+MenuRogerThat
+{
+"Bien compris"
+}
+
+MenuHello
+{
+"Salut"
+}
+
+MenuNeedHelp
+{
+"Besoin d'aide"
+}
+
+MenuNeedHealth
+{
+"Besoin de soins"
+}
+
+MenuNeedAmmo
+{
+"Besoin de munitions"
+}
+
+MenuFollowMe
+{
+"Suivez-moi"
+}
+
+MenuCovering
+{
+"Je couvre"
+}
+
+MenuOrders
+{
+Ordres
+}
+
+MenuNeedOrder
+{
+"Besoin d'ordre"
+}
+
+MenuAck
+{
+"Bien compris"
+}
+
+MenuAdmin
+{
+Admin
+}
+
+MenuReadyRoom
+{
+"Ready room"
+}
+
+MenuVoteCommanderDown
+{
+Ejecter le comm.
+}
+
+MenuArea
+{
+Zone
+}
+
+MenuMoveTo
+{
+Aller a
+}
+
+MenuGuard
+{
+Garder
+}
+
+MenuTarget
+{
+Cibler
+}
+
+MenuDeploy
+{
+Deployer
+}
+
+MenuIncoming
+{
+En approche
+}
+
+MenuProceed
+{
+Continuer
+}
+
+MenuFireTarget
+{
+Tirer sur la cible
+}
+
+MenuTaunt
+{
+Raillerie
+}
+
+MenuTakeCover
+{
+Se mettre a couvert
+}
+
+MenuReady
+{
+Pret
+}
+
+MenuDefendObj
+{
+Defendre
+}
+
+MenuCeaseFire
+{
+Cesser le feu
+}
+
+MenuTeam
+{
+Equipe
+}
+
+MenuBuilding
+{
+Construire
+}
+
+MenuAttackObj
+{
+Attaquer
+}
+
+MenuTaunt
+{
+Raillerie
+}
+
+MenuHealth
+{
+"Soins"
+}
+
+MenuCameraTower
+{
+Camera
+}
+
+MenuTurret
+{
+Tourelle
+}
+
+MenuSiegeTurret
+{
+Siege
+}
+
+MenuBlazeOfGlory
+{
+Blaze
+}
+
+MenuProtect
+{
+Proteger
+}
+
+MenuReinforce
+{
+Renfort
+}
+
+MenuArmorUpgrade
+{
+Heavy
+}
+
+MenuRepair
+{
+Reparer
+}
+
+MenuPowerups
+{
+Stim
+}
+
+MenuAdrenaline
+{
+Adrenaline
+}
+
+MenuDefMatrix
+{
+Def matrix
+}
+
+MenuPhaseGate
+{
+Phase gate
+}
+
+MenuSelf
+{
+Moi
+}
+
+MenuBuy
+{
+Acheter
+}
+
+MenuHeavy
+{
+Heavy
+}
+
+MenuShotgun
+{
+Shotgun
+}
+
+MenuHeavyMG
+{
+Heavy MG
+}
+
+MenuLauncher
+{
+Launcher
+}
+
+MenuFlamer
+{
+Flamer
+}
+
+MenuNuke
+{
+Nuke
+}
+
+MenuWeapon
+{
+Arme
+}
+
+MenuEquipment
+{
+Equipement
+}
+
+MenuUse
+{
+Utiliser
+}
+
+MenuNextWeapon
+{
+Arme suivante
+}
+
+MenuJetpacks
+{
+Jetpacks
+}
+
+MenuReloadWeapon
+{
+Recharger
+}
+
+MenuDropWeapon
+{
+Jeter
+}
+
+MenuLight
+{
+Torche
+}
+
+MenuAmmo
+{
+Munitions
+}
+
+MenuMines
+{
+Mines
+}
+
+MenuGrenades
+{
+Grenades
+}
+
+MenuUpgradeMG
+{
+Amelioration
+}
+
+////////////////////
+// Armor upgrades //
+////////////////////
+
+MenuArmorFull
+{
+Armor full
+}
+
+MenuBuyArmorHeavy
+{
+Heavy armor
+}
+
+MenuBuyArmorMotionTrack
+{
+Tracker
+}
+
+MenuBuyArmorJetpack
+{
+Jetpacks
+}
+
+MenuBuyArmorLifeSupport
+{
+Sustain
+}
+
+// Rank
+MenuRank
+{
+Rank
+}
+
+MenuPromote
+{
+Promote
+}
+
+MenuDemote
+{
+Demote
+}
+
+//////////////////////////////////////////////////
+// Don't localize these, they are sprite names: //
+//  (sprites/640(or 320)name.spr)               //
+//////////////////////////////////////////////////
+MenuAlienRoot
+{
+Depart
+}
+
+MenuAlienSmallMorph
+{
+Creatures
+}
+
+MenuAlienMorphLevel1
+{
+Skulk
+}
+
+MenuAlienMorphLevel2
+{
+Gorge
+}
+
+MenuAlienBigMorph
+{
+Avancees
+}
+
+MenuAlienMorphLevel3
+{
+Lerk
+}
+
+MenuAlienMorphLevel4
+{
+Fade
+}
+
+MenuAlienMorphLevel5
+{
+Onos
+}
+
+MenuAlienUpgrade
+{
+Ameliorations
+}
+
+MenuAlienComm
+{
+Autres
+}
+
+MenuAlienBuild
+{
+Constructions
+}
+
+MenuAlienAdvBuild
+{
+Avancees
+}
+
+MenuAlienBuildUpgrades
+{
+Ameliorations
+}
+
+
+MenuAlienCommSayingsWest
+{
+Cris
+}
+
+MenuAlienCommSayingOne
+{
+Ricanement
+}
+
+MenuAlienCommSayingTwo
+{
+Besoin de soins
+}
+
+MenuAlienCommSayingThree
+{
+Besoin d'aide
+}
+
+MenuAlienCommSayingsEast
+{
+Dire
+}
+
+MenuAlienCommSayingFour
+{
+Ils arrivent
+}
+
+MenuAlienCommSayingFive
+{
+A l'attaque
+}
+
+MenuAlienCommSayingSix
+{
+Je construis ici
+}
+
+// Temp artwork, change
+MenuAlienReadyRoom
+{
+"Ready room"
+}
+
+MenuAlienUpgradeDefOne
+{
+"Carapace"
+}
+
+MenuAlienUpgradeDefTwo
+{
+"Regeneration"
+}
+
+MenuAlienUpgradeDefThree
+{
+"Redemption"
+}
+
+MenuAlienUpgradeSenOne
+{
+"Cloaking"
+}
+
+MenuAlienUpgradeSenTwo
+{
+"Pheromones"
+}
+
+MenuAlienUpgradeSenThree
+{
+"Scent of Fear"
+}
+
+MenuAlienUpgradeMoveOne
+{
+"Celerity"
+}
+
+MenuAlienUpgradeMoveTwo
+{
+"Adrenaline"
+}
+
+MenuAlienUpgradeMoveThree
+{
+"Silence"
+}
+
+MenuAlienDefenseChamber
+{
+"Defense chamber"
+}
+
+MenuAlienSensoryChamber
+{
+"Sensory chamber"
+}
+
+MenuAlienMovementChamber
+{
+"Movement chamber"
+}
+
+MenuAlienDefenseUpgrades
+{
+Defensives
+}
+
+MenuAlienSensoryUpgrades
+{
+Sensorielles
+}
+
+MenuAlienMovementUpgrades
+{
+De mouvement
+}
+
+MenuAlienOffensiveChamber
+{
+"Offense chamber"
+}
+
+MenuAlienResourceTower
+{
+"Resource tower"
+}
+
+MenuAlienHive
+{
+"Hive"
+}
+
+
+
+// Armor received messages
+$position -1 0.2
+$effect 0
+$fadein 0.5
+$fadeout 0.5
+$holdtime 5.0
+
+ReceiveHeavyArmor
+{
+Votre armure a ete amelioree en "heavy armor" (armure lourde).  Vous etes maintenant mieux protege contre les ennemis.
+}
+
+ReceiveMotionTrackArmor
+{
+Vous avez maintenant le "motion-tracking" (detecteur de mouvements) integre a votre armure.
+}
+
+ReceiveJetpackArmor
+{
+Vous avez maintenant une armure avec "jetpack".  Pressez et maintenez votre touche de saut pour l'utiliser.
+}
+
+ReceiveLifeSupportArmor
+{
+Vous avez recu un systeme "LifeSupport" (TM). Lorsque vous serez sur le point de mourir, vous serez protege jusqu'a ce que de l'aide arrive.
+}
+
+
+
+$position -1 0.35
+$holdtime 3.0
+
+GameStarting
+{
+La partie est sur le point de commencer...
+}
+
+$holdtime 2.0
+GameBegun
+{
+La partie a commence.
+}
+
+// Overwatch enabled
+//OverwatchActive
+//{
+//Overwatch active
+//}
+
+// Overwatch range string, expecting a float for range
+OverwatchRange
+{
+Distance de la cible : %f.
+}
+
+// Points awarded
+$position -1 0.25
+$effect 0
+$holdtime 4
+
+MarineAward
+{
+Votre equipe vient juste de tuer un ennemi !
+}
+
+MarineAwardToLeader
+{
+Votre escouade vient de recevoir des points pour avoir tuer un ennemi !
+}
+
+// Points awarded
+$position -1 0.15
+$effect 0
+$holdtime 3
+MarineAwardToCommander
+{
+Votre equipe a gagne des points pour avoir tuer un ennemi !
+}
+
+// Points awarded
+$position -1 0.25
+$effect 0
+$holdtime 4
+AlienAward
+{
+Vous venez de gagner des ressources pour avoir tuer un ennemi !
+}
+
+Defect
+{
+Quitter l'escouade
+}
+
+WeaponCantBeDropped
+{
+Cette arme ne peut pas etre jetee.
+}
+
+DefectMessageToLeader
+{
+Un joueur vient de quitter votre escouade.
+}
+
+SquadIndicator
+{
+Vous etes dans l'escouade %d.
+}
+
+InvalidOrderGiven
+{
+Ordre invalide
+}
+
+$position -1 0.65
+$effect 0
+$holdtime .5
+$fadein .2
+$fadeout .2
+GameWontStart
+{
+La partie ne commencera pas tant que les deux equipes n'ont pas de joueurs.
+}
+
+// Translation note: don't translate "ready"
+GameWontStartUntilReady
+{
+La partie ne commencera pas avant que chaque equipe ecrive "ready".
+}
+
+$position -1 0.75
+$effect 0
+$holdtime .7
+$fadein .2
+$fadeout .2
+ReceivingLevelData
+{
+Receiving level data...
+}
+
+$position -1 0.85
+ReceivingLevelData1
+{
++---
+}
+
+ReceivingLevelData2
+{
+++--
+}
+
+ReceivingLevelData3
+{
++++-
+}
+
+ReceivingLevelData4
+{
+++++
+}
+
+$position -1 0.65
+$effect 0
+$holdtime .5
+$fadein .2
+$fadeout .2
+$position -1 0.9
+EvolvingMessage
+{
+Evolution...
+}
+
+VoteCast
+{
+Votre vote a ete emis.
+}
+
+VoteStarted
+{
+Un vote pour ejecter le "commander" a demarre.  S'il est incompetent, utilisez votre "menu popup" pour voter contre lui.
+}
+
+VoteIllegal
+{
+Un vote est illegal en ce moment.
+}
+
+AlreadyVoted
+{
+Vous ne pouvez voter qu'une seule fois par partie.
+}
+
+VoteFailed
+{
+Le vote pour ejecter le "commander" a echoue.
+}
+
+VoteCancelled
+{
+Le vote pour ejecter le "commander" a ete annule.
+}
+
+VoteSucceeded
+{
+Le "commander" a ete ejecte de la "command console".
+}
+
+BannedFromCommand
+{
+Vous avez ete temporairement interdit de commandemment sur ce serveur.  Vous pouvez commander sur d'autres serveurs ou attendre quelques heures avant de pouvoir recommencer sur celui-ci.
+}
+
+MustGestateUp
+{
+Vous ne pouvez seulement changer que pour des formes de vie plus evoluees.
+}
+
+MustGestateOnGround
+{
+Vous devez etre sur un sol plat pour evoluer.
+}
+
+NotWhileDigesting
+{
+Vous ne pouvez pas evoluer pendant que vous digerez un joueur.
+}
+
+NoReadyRoomWhileDigested
+{
+Vous ne pouvez pas aller dans la "ready room" pendant que vous etes digere.
+}
+
+NeedMoreRoomToGestate
+{
+Vous avez besoin de plus de place pour evoluer.
+}
+
+NeedOneHiveToGestate
+{
+Votre equipe a besoin d'un "hive" pour evoluer dans cette forme de vie.
+}
+
+NeedTwoHivesToGestate
+{
+Votre equipe a besoin de deux "hives" pour evoluer dans cette forme de vie.
+}
+
+NeedThreeHivesToGestate
+{
+Votre equipe a besoin de trois "hives" pour evoluer dans cette forme de vie.
+}
+
+NeedOneHiveForStructure
+{
+Votre equipe a besoin d'un "hive" pour construire cette structure.
+}
+
+NeedTwoHivesForStructure
+{
+Votre equipe a besoin de deux "hives" pour construire cette structure.
+}
+
+NeedThreeHivesForStructure
+{
+Votre equipe a besoin de trois "hives" pour construire cette structure.
+}
+
+NeedsAnotherHiveForStructure
+{
+Votre equipe a besoin d'un autre "hive" pour construire cette structure.
+}
+
+MustBeBuilder
+{
+Vous devez etre un Gorge pour construire cette structure.
+}
+
+UpgradeNotAvailable
+{
+Cette amelioration n'est pas disponible pour le moment.
+}
+
+TooManyStructuresOfThisTypeNearby
+{
+Il y a trop de structures de ce type a proximite.
+}
+
+TooManyStructuresInArea
+{
+Il y a trop de structures dans cette zone.
+}
+
+$holdtime 2.0
+TooManyWebs
+{
+Votre equipe a atteint le nombre maximum de "webs" autorises.
+}
+
+TooManyWebsNearby
+{
+Il y a trop de "webs" dans cette zone.
+}
+
+$position -1 0.35
+$effect 0
+$holdtime 5.0
+TeamOneWon
+{
+L'equipe un a remporte la victoire !
+}
+
+TeamTwoWon
+{
+L'equipe deux a remporte la victoire !
+}
+
+GameDraw
+{
+Match nul !
+}
+
+RankBeforeGameStart
+{
+Vous ne pouvez changer de rangs seulement avant que la partie debute.
+}
+
+DefectAfterGameStart
+{
+Vous ne pouvez desertez seulement qu'apres le debut de la partie.
+}
+
+// Tech tree
+MarineResourcePrefix
+{
+Ressources : 
+}
+
+AlienResourcePrefix
+{
+Ressources
+}
+
+CarryResourcePrefix
+{
+Transporte %d ressources
+}
+
+Resources
+{
+Ressources : 
+}
+
+
+NumericalEventResources
+{
+ressources
+}
+
+NumericalEventHealth
+{
+de sante
+}
+
+NumericalEventResourcesDonated
+{
+Ressources donnees
+}
+
+NumericalEventAmmo
+{
+Munitions recues
+}
+
+
+
+
+AlienEnergyDescription
+{
+Energie
+}
+
+ResourcesDepleted
+{
+Ressources epuisees
+}
+
+Reinforcements
+{
+Renforts
+}
+
+
+WeaponCategory
+{
+Armes
+}
+
+ArmorCategory
+{
+Armures
+}
+
+BuildCategory
+{
+Construire
+}
+
+RadioCategory
+{
+Radio
+}
+
+TechNodeLabel_0
+{
+None
+}
+
+TechNodeHelp_0
+{
+<none>
+}
+
+TechNodeHelp_1
+{
+Bascule a votre arme suivante.
+}
+
+TechNodeHelp_2
+{
+Recharge votre arme actuelle.
+}
+
+TechNodeHelp_3
+{
+Jette votre arme courante, pour gagner de la vitesse ou pour la donner a quelqu'un d'autre.
+}
+
+TechNodeHelp_5
+{
+Quitter la partie et retourner dans la "ready room".  Ceci vous permet de changer d'equipe, d'observer la partie, ou de faire une pause.
+}
+
+TechNodeHelp_6
+{
+Si le "commander" est deliberement en train de ruiner la partie, selectionnez ceci pour voter son ejection de la "command console".  Si suffisamment de votes sont recus, il sera ejecte pour le reste de la partie.
+}
+
+
+TechNodeLabel_10
+{
+Attaque(e)
+}
+
+TechNodeLabel_11
+{
+Attaquer
+}
+
+TechNodeLabel_12
+{
+Detruire
+}
+
+TechNodeLabel_13
+{
+Confirme
+}
+
+TechNodeLabel_14
+{
+Focus team
+}
+
+TechNodeLabel_15
+{
+Powerful
+}
+
+
+TechNodeHelp_7
+{
+"Ricanement"
+}
+
+TechNodeHelp_8
+{
+"Besoin de soins"
+}
+
+TechNodeHelp_9
+{
+"Besoin d'aide"
+}
+
+TechNodeHelp_10
+{
+"Ils arrivent"
+}
+
+TechNodeHelp_11
+{
+"A l'attaque"
+}
+
+TechNodeHelp_12
+{
+"Je construis ici"
+}
+
+
+TechNodeLabel_20
+{
+Armures #1.
+}
+
+TechNodeLabel_21
+{
+Armures #2.
+}
+
+TechNodeLabel_22
+{
+Armures #3.
+}
+
+TechNodeLabel_23
+{
+Armes #1.
+}
+
+TechNodeLabel_24
+{
+Armes #2.
+}
+
+TechNodeLabel_25
+{
+Armes #3.
+}
+
+TechNodeHelp_20
+{
+Les armures des joueurs sont ameliorees au niveau un.
+}
+
+TechNodeHelp_21
+{
+Les armures des joueurs sont ameliorees au niveau deux.
+}
+
+TechNodeHelp_22
+{
+Les armures des joueurs sont ameliorees au niveau trois.
+}
+
+
+TechNodeHelp_23
+{
+Les armes, les mines et les tourelles font +10%% de degats.
+}
+
+TechNodeHelp_24
+{
+Les armes, les mines et les tourelles font +20%% de degats.
+}
+
+TechNodeHelp_25
+{
+Les armes, les mines et les tourelles font +30%% de degats.
+}
+
+TechNodeLabel_26
+{
+"Advanced turret factory"
+}
+
+TechNodeHelp_26
+{
+Ameliorer en "advanced turret factory"
+}
+
+TechNodeLabel_28
+{
+"Jetpacks"
+}
+
+TechNodeHelp_28
+{
+Permet de creer des "jetpacks"
+}
+
+TechNodeLabel_29
+{
+"Heavy armor"
+}
+
+TechNodeHelp_29
+{
+Permet de cree des "heavy armors"
+}
+
+TechNodeLabel_30
+{
+"Distress beacon"
+}
+
+TechNodeHelp_30
+{
+Appelle tous les renforts disponibles (tous les joueurs morts) au "marine start".
+}
+
+TechNodeLabel_31
+{
+"Deployable medpacks tech"
+}
+
+TechNodeHelp_31
+{
+Permet au "commander" de parachuter des "medpacks".
+}
+
+TechNodeLabel_32
+{
+Annuler
+}
+
+TechNodeHelp_32
+{
+Annuler la recherche.
+}
+
+TechNodeLabel_33
+{
+"Motion-tracking"
+}
+
+TechNodeHelp_33
+{
+Detecte et indique tous les ennemis en mouvement.
+}
+
+TechNodeLabel_34
+{
+"Phase tech"
+}
+
+TechNodeHelp_34
+{
+Permet l'utilisation de "scanner sweeps" et du "distress beacon" ainsi que la recherche du "motion-tracking" et de la technologie des "phase gates".
+}
+
+TechNodeLabel_35
+{
+Ameliorer la structure.
+}
+
+TechNodeHelp_35
+{
+Ameliore la vitesse de collecte des ressources. 
+}
+
+TechNodeLabel_36
+{
+Defense electrique.
+}
+
+TechNodeHelp_36
+{
+Blesse les ennemis qui s'approchent trop de la structure.
+}
+
+TechNodeLabel_38
+{
+"Heavy armor"
+}
+
+TechNodeHelp_38
+{
+Permet de donner des "heavy armor" aux soldats.
+}
+
+TechNodeLabel_39
+{
+"Jetpack"
+}
+
+TechNodeHelp_39
+{
+Permet de donner des "jetpacks" aux soldats.
+}
+
+TechNodeLabel_40
+{
+"Infantry portal"
+}
+
+TechNodeHelp_40
+{
+Amene les renforts (les joueurs morts) un par un.
+}
+
+TechNodeLabel_41
+{
+"Resource tower"
+}
+
+TechNodeHelp_41
+{
+Collecte des ressources.
+}
+
+
+
+TechNodeLabel_43
+{
+"Turret factory"
+}
+
+TechNodeHelp_43
+{
+Permet la construction de tourelles et l'electrification de certaines structures.
+}
+
+TechNodeLabel_45
+{
+"Arms lab"
+}
+
+TechNodeHelp_45
+{
+Permet d'ameliorer les armes et les armures.
+}
+
+TechNodeLabel_46
+{
+"Prototype lab"
+}
+
+TechNodeHelp_46
+{
+Permet de developper des technologies experimentales ("heavy armor" et "jetpack").
+}
+
+TechNodeLabel_48
+{
+"Armory"
+}
+
+TechNodeHelp_48
+{
+Permet de creer d'autres armes.
+}
+
+TechNodeLabel_49
+{
+"Advanced armory"
+}
+
+TechNodeHelp_49
+{
+Amelioration en "advanced armory".
+}
+
+
+TechNodeLabel_50
+{
+"Nuke plant"
+}
+
+TechNodeHelp_50
+{
+Permet la construction de bombes nucleaires.
+}
+
+TechNodeLabel_51
+{
+"Observatory"
+}
+
+TechNodeHelp_51
+{
+Permet le developpement des technologies de reconnaissance ("motion-tracking" et "phase gates") et l'utilisation de "scanner sweeps" et du "distress beacon".
+}
+
+TechNodeLabel_52
+{
+"Medpacks nanotech"
+}
+
+TechNodeHelp_52
+{
+Permet au "commander" de parachuter des "medpacks" sur le champ de bataille.
+}
+
+TechNodeLabel_53
+{
+"Scanner Sweep"
+}
+
+TechNodeHelp_53
+{
+Devoile temporairement la zone et les ennemis s'y trouvant, meme ceux camoufles ("cloaked").
+}
+
+TechNodeLabel_55
+{
+"Phase gate"
+}
+
+TechNodeHelp_55
+{
+Permet de voyager instantanement entre ces differentes structures (il en faut au minimum deux).
+}
+
+TechNodeLabel_56
+{
+"Sentry turret"
+}
+
+TechNodeHelp_56
+{
+Tourelle de defense automatique.
+}
+
+TechNodeLabel_57
+{
+"Siege canon"
+}
+
+TechNodeHelp_57
+{
+Tourelle de grande puissance de feu, tire par onde a travers les murs.
+}
+
+TechNodeLabel_58
+{
+"Command console"
+}
+
+TechNodeHelp_58
+{
+Un poste de commande auxilliaire.
+}
+
+
+
+TechNodeLabel_59
+{
+"Medpack"
+}
+
+TechNodeHelp_59
+{
+Redonne 50 points de sante au marine.
+}
+
+TechNodeLabel_60
+{
+"Ammo"
+}
+
+TechNodeHelp_60
+{
+Un chargeur, valable pour n'importe quelle arme.
+}
+
+
+
+TechNodeLabel_61
+{
+"Mines"
+}
+
+TechNodeHelp_61
+{
+Cinq mines.
+}
+
+TechNodeLabel_62
+{
+"Welder"
+}
+
+TechNodeHelp_62
+{
+Repare batiments et armures, affecte les emplacements "weldables" et brule les "webs".
+}
+
+TechNodeLabel_63
+{
+"Medpack"
+}
+
+TechNodeLabel_64
+{
+"Shotgun"
+}
+
+TechNodeHelp_64
+{
+Pour les combats rapproches.
+}
+
+TechNodeLabel_65
+{
+"HMG"
+}
+
+TechNodeHelp_65
+{
+Fusil d'assaut a haute puissance de feu.
+}
+
+TechNodeLabel_66
+{
+"Grenade launcher"
+}
+
+TechNodeHelp_66
+{
+Lance-grenades.
+}
+
+TechNodeLabel_67
+{
+"Nuke"
+}
+
+TechNodeHelp_67
+{
+Bombe nucleaire miniature.
+}
+
+TechNodeLabel_69
+{
+Recycler
+}
+
+TechNodeHelp_69
+{
+Detruisez cette structure afin d'en recuperer quelques ressources.
+}
+
+TechNodeHelp_80
+{
+Demande des ordres a votre "commander".  Il sera notifie que vous etes en train de demander quelque chose a faire, et vous donnera un ordre.
+}
+
+TechNodeHelp_81
+{
+Dit a votre "commander" que vous avez bien recu ses ordres.  Suivez les instructions du "waypoint" pour effectuer votre tache.  Une fois completee, le "waypoint" disparaitra automatiquement.
+}
+
+
+
+TechNodeLabel_85
+{
+Constructions
+}
+
+TechNodeHelp_85
+{
+Menu de constructions de base.
+}
+
+TechNodeLabel_86
+{
+Constructions avancees
+}
+
+TechNodeHelp_86
+{
+Menu de constructions avancees.
+}
+
+TechNodeLabel_87
+{
+Assistance
+}
+
+TechNodeHelp_87
+{
+Ouvrir le menu d'assistance.
+}
+
+TechNodeLabel_88
+{
+Equipement
+}
+
+TechNodeHelp_88
+{
+Ouvrir le menu d'equipement.
+}
+
+TechNodeHelp_90
+{
+Creer une "resource tower" : collecte des ressources pour votre equipe.  Elle ne peut etre construite que sur un puit de ressources (indique par de la fumee blanche qui s'en echappe).
+}
+
+TechNodeHelp_91
+{
+Creer une "offensive chamber" : une tourelle organique qui attaque les joueurs et structures ennemis en vue.  Degats : 20
+}
+
+TechNodeHelp_92
+{
+Creer une "defensive chamber" : permet des ameliorations de defense, soigne les joueurs et les strucures a proximite.
+}
+
+TechNodeHelp_93
+{
+Creer une "sensory chamber" : permet des ameliorations sensorielles, camoufle ("cloak") les joueurs et les structures a proximite.  Bloque le "motion-tracking" (detecteur de mouvements) dans son rayon.
+}
+
+TechNodeHelp_94
+{
+Creer une "movement chamber" : permet des ameliorations de mouvement et les joueurs a proximite recuperent plus vite leur energie.
+}
+
+TechNodeHelp_95
+{
+Creer un "hive" : permet de construire d'autres structures d'ameliorations et developpe de nouvelles competences pour toutes les creatures (doit etre construit a un endroit specifique - "hive location").
+}
+
+TechNodeHelp_101
+{
+Augmente la protection des armures.  Chaque niveau de carapace absorbe environ 16 % de degats supplementaires.
+}
+
+TechNodeHelp_102
+{
+Vous vous soignez automatiquement petit a petit.  Les plus haut niveaux vous soigneront plus rapidement.
+}
+
+TechNodeHelp_103
+{
+Le "hive" va automatiquement essayer de vous sauver lorsque vous serez sur le point de mourir en vous ramenant a un "hive" pour vous soigner.
+}
+
+TechNodeHelp_104
+{
+"Sharpness" - Vos degats en melee sont augmentes de moitie.
+}
+
+TechNodeHelp_105
+{
+"Piercing" - Vos degats en bataille a distance sont augmentes de moitie.
+}
+
+TechNodeHelp_106
+{
+"Penetration" - Vous pouvez tirer a travers les murs et les cibles (non implemente).
+}
+
+TechNodeHelp_107
+{
+Ameliore votre vitesse maximale de facon permanente.
+}
+
+TechNodeHelp_108
+{
+Vous permet de recuperer votre energie plus rapidement.  Chaque niveau de "adrenaline" augmente votre vitesse de recuperation d'energie de 33 %.
+}
+
+TechNodeHelp_109
+{
+Chaque niveau de "silence" rend vos bruits de pas et vos mouvements plus silencieux.
+}
+
+TechNodeHelp_110
+{
+Restez sans bouger et vous serez quasi invisible.  De plus hauts niveaux de "cloaking" vous camoufleront plus vite.  Les "observatories" et les "scanner sweeps" vous rendront visibles.
+}
+
+TechNodeHelp_111
+{
+Laisse une trainee visible derriere les ennemis a proximite.  De plus hauts niveaux augmentent le rayon d'action.
+}
+
+TechNodeHelp_112
+{
+Vous verrez vos ennemis qui se trouvent dans un certain rayon autour de vous en rouge sur votre "hive sight".
+}
+
+TechNodeHelp_113
+{
+Evolution en Skulk.  C'est un petit alien rapide ideal pour les duels, pour harceler les ennemis et elaborer des tactiques de guerilla.  Il peut grimper sur les murs (desactivez-le en appuyant sur la touche "s'accroupir").
+}
+
+TechNodeHelp_114
+{
+Evolution en Gorge.  Cree et construit les "resources towers", les "hives", les diverses "chambres" d'ameliorations et les "offense chambers".  Faible pour les combats, il peut aussi soigner les structures et les joueurs allies.
+}
+
+TechNodeHelp_115
+{
+Evolution en Lerk.  Fournit un support varie au combat.  Il peut tirer des "spikes" de loin, envelopper des zones de "spores" ou d'un nuage de protection ("umbra").  Volez en appuyant sur la touche saut.  Planez en laissant pressee la touche saut en vol.
+}
+
+TechNodeHelp_116
+{
+Evolution en Fade.  Un puissant combattant de bonne carrure, capable de "swipe" (giffler), de lancer des "acid rockets" et de se teleporter.
+}
+
+TechNodeHelp_117
+{
+Evolution en Onos.  Un monstre qui peut "stomp" (frapper le sol) pour etourdir ("stun") ses ennemis, charger ("charge") a travers et les devorer ("devour").  Cet alien est capable d'affronter plusieurs marines a la fois.
+}
+
+
+ClassDead
+{
+Mort
+}
+
+ClassDigesting
+{
+Digestion...
+}
+
+ClassCommander
+{
+Commander 
+}
+
+ClassHeavyMarine
+{
+"Heavy"
+}
+
+ClassReinforcing
+{
+Renfort...
+}
+
+ClassLevel1
+{
+Skulk
+}
+
+ClassLevel2
+{
+Gorge
+}
+
+ClassLevel3
+{
+Lerk
+}
+
+ClassLevel4
+{
+Fade
+}
+
+ClassLevel5
+{
+Onos
+}
+
+ClassGestating
+{
+Evolution...
+}
+
+Building
+{
+Construction : 
+}
+
+
+Researching
+{
+En recherche : 
+}
+
+Energy
+{
+Energie : 
+}
+
+
+Prerequisite
+{
+Requiert : 
+}
+
+Cost
+{
+Cout :
+}
+
+NotFullyBuilt
+{
+Pas entierement construit.
+}
+
+Recycling
+{
+Recyclage...
+}
+
+ReinforcementsText
+{
+Renforts :
+}
+
+LogoutText
+{
+Deconnexion 
+}
+
+BlipStatus_0
+{
+ennemi
+}
+
+BlipStatus_1
+{
+ennemi affaibli
+}
+
+BlipStatus_2
+{
+
+}
+
+BlipStatus_3
+{
+est attaque(e).
+}
+
+BlipStatus_5
+{
+est un gorge.
+}
+
+BlipStatus_6
+{
+
+}
+
+BlipStatus_7
+{
+
+}
+
+BlipStatus_8
+{
+
+}
+
+Friend
+{
+Ami
+}
+
+Enemy
+{
+Ennemi
+}
+
+User3Name_1
+{
+soldat
+}
+
+User3Name_2
+{
+commander
+}
+
+User3Name_3
+{
+skulk
+}
+
+User3Name_4
+{
+gorge
+}
+
+User3Name_5
+{
+lerk
+}
+
+User3Name_6
+{
+fade
+}
+
+User3Name_7
+{
+onos
+}
+
+User3Name_8
+{
+embryon
+}
+
+User3Name_15
+{
+equipement
+}
+
+User3Name_17
+{
+Hive
+}
+
+User3Desc_17
+{
+Les aliens naissent ici, permet egalement la construction d'autres structures et ameliorations.
+}
+
+User3FriendlyDesc_17
+{
+Vous naissez ici.  Il vous soignera lorsque vous en serez proche.  Fournit le "hive sight", qui vous informe sur vos allies, vos ennemis et alerte votre equipe.  Protegez vos "hives" a tout prix.
+}
+
+User3Name_22
+{
+Puit de ressources
+}
+
+User3Desc_22
+{
+Fournit des ressources lorsqu'une "ressource tower" est construite dessus.  Ces ressources sont infinies.
+}
+
+User3CommanderDesc_22
+{
+Fournit des ressources lorsqu'une "ressource tower" est construite dessus.  Ces ressources sont infinies.
+}
+
+User3Name_23
+{
+"Command console"
+}
+
+User3Desc_23
+{
+Utilisee par le "commander" marine pour creer des structures et faire la recherche de nouvelles technologies.
+}
+
+User3FriendlyDesc_23
+{
+Utilisee par le "commander" marine pour creer des structures et faire la recherche de nouvelles technologies.  Le nom de votre "commander" est affiche en haut au milieu de votre ecran.  Si votre equipe n'a pas de "commander", vous pouvez le devenir en "utilisant" la "command console".
+}
+
+User3CommanderDesc_23
+{
+Selectionnez la "command console" pour voir le rayon dans lequel vous pouvez construire des "infantry portals".  Si la "command console" est detruite, vous en serez ejecte et il ne sera plus possible d'avoir un "commander".  Protegez-la a tout prix.
+}
+
+
+User3Name_24
+{
+"Turret factory"
+}
+
+User3Desc_24
+{
+Permet de construire des "sentry turrets" dans son rayon d'action. Celles-ci ont besoin d'une "turret factory" pour continuer a fonctionner.  Le "commander" peut selectionner cette derniere pour voir son rayon d'action.
+}
+
+User3Name_25
+{
+"Armory"
+}
+
+User3Desc_25
+{
+Fournit des munitions et permet la construction de "shotguns", de "mines" et de "welders" dans son rayon.
+}
+
+User3CommanderDesc_25
+{
+Fournit des munitions gratuitement aux soldats allies.  Permet la construction de "shotguns", de "mines" et de "welders" dans son rayon.  Selectionnez l'"armory" pour voir son rayon.
+}
+
+User3FriendlyDesc_25
+{
+"Utilisez" l'"armory" pour obtenir gratuitement des munitions pour votre arme courante.  Permet aussi la construction de "welders", de "shotguns" et de "mines" dans son rayon.
+}
+
+
+User3Name_26
+{
+"Advanced armory"
+}
+
+User3Desc_26
+{
+Fournit des munitions et permet la construction de "heavy machine guns" et de "grenade launchers" dans son rayon.
+}
+
+User3CommanderDesc_26
+{
+Fournit gratuitement des munitions aux soldats allies.  Permet la construction de "heavy machine guns" et de "grenade launchers" dans son rayon.  Selectionnez l'"advanced armory" pour voir son rayon.
+}
+
+User3FriendlyDesc_26
+{
+"Utilisez" cette "advanced armory" pour obtenir gratuitement des munitions pour votre arme courante.  Permet aussi la construction de "heavy machine guns" et de "grenade launchers" dans son rayon.
+}
+
+
+User3Name_27
+{
+"Arms lab"
+}
+
+User3Desc_27
+{
+Permet d'ameliorer les armures et les munitions.
+}
+
+User3Name_28
+{
+"Prototype lab"
+}
+
+User3Desc_28
+{
+Permet de developper les "jetpacks" et les "heavy armors".
+}
+
+User3Name_29
+{
+"Observatory"
+}
+
+User3Desc_29
+{
+Affiche des "blips" sur les structures et les creatures ennemies a proximite et les empeche de se camoufler.  Permet de faire des "scanner sweeps", d'utiliser le "distress beacon", de rechercher le "motion-tracking" et de developper la technologie des "phase gates".
+}
+
+User3Name_30
+{
+"Chemlab"
+}
+
+User3Name_31
+{
+"Medlab"
+}
+
+User3Name_33
+{
+"Sentry turret"
+}
+
+User3Desc_33
+{
+Tire automatiquement sur les ennemis visibles.
+}
+
+User3FriendlyName_33
+{
+Tire automatiquement sur vos ennemis.  Faible contre les formes de vies aliens les plus evoluees.  Doit etre construite dans le rayon d'une "turret factory".  Degats : 10
+}
+
+User3CommanderName_33
+{
+Tire automatiquement sur les creatures et les structures ennemies.  Faible contre les formes de vies aliens les plus evoluees.  Doit etre construite dans le rayon d'une "turret factory".  Selectionnez une "sentry turret" pour voir son rayon d'action.  Ne tire pas sur les ennemis camoufles.  Utile contre les aliens peu evolues.  Degats : 10
+}
+
+
+User3Name_34
+{
+"Siege canon"
+}
+
+User3Desc_34
+{
+"Automated Siege Canon" (ASC).  Arme qui attaque les structures, meme a travers les murs, mais ne vise pas les creatures.
+}
+
+User3FriendlyDesc_34
+{
+"Automated Siege Canon" (ASC).  Arme qui attaque les structures, meme a travers les murs, mais ne vise pas les creatures.  Rayon : 400  Degats : 165 (le double contre les structures).
+}
+
+User3CommanderDesc_34
+{
+"Automated Siege Canon" (ASC).  Arme qui attaque les structures, meme a travers les murs, mais ne vise pas les creatures. Selectionnez le "ASC" pour voir son rayon d'action.  Degats : 165 (le double contre les structures).
+}
+
+User3Name_35
+{
+"Resource tower"
+}
+
+User3Desc_35
+{
+Collecte des ressources pour votre equipe a intervalles reguliers.
+}
+
+User3Name_37
+{
+"Infantry portal"
+}
+
+User3FriendlyDesc_37
+{
+Amene les marines en renforts.  Detruire l'"infantry portal" signifie que les marines ne peuvent plus avoir de renforts.
+}	  
+
+User3FriendlyDesc_37
+{
+Amene les marines en renforts.  Sans un "infantry portal", votre equipe ne pourra plus avoir de renforts, protegez-le donc.
+}	  
+
+User3CommanderDesc_37
+{
+Amene les marines en renforts.  Sans un "infantry portal", les marines ne peuvent plus avoir de renforts.
+}
+
+User3Name_38
+{
+"Nuke"
+}
+
+User3Desc_38
+{
+Nuke is arming, and must be destroyed before it finishes!  Once armed, nuke detonates, doing massive damage to nearby players and structures.
+}
+
+User3FriendlyDesc_38
+{
+Nuke is arming, protect it while it finishes.  Once armed, nuke detonates, doing massive damage to nearby players and structures.
+}
+
+User3CommanderDesc_38
+{
+Nuke is arming, protect it while it finishes.  Once armed, nuke detonates, doing massive damage to nearby players and structures.
+}
+
+User3Name_39
+{
+"Heavy armor"
+}
+
+User3Desc_39
+{
+Ramassez ceci pour avoir une "heavy armor".  Ne peut pas etre utilise avec un "jetpack".  Protege des "spores".
+}
+
+User3Name_40
+{
+"Jetpack"
+}
+
+User3Desc_40
+{
+Ramassez le module "jetpack" pour pouvoir voler.  Ne peut pas etre utilise avec une "heavy armor".
+}
+
+User3Name_41
+{
+"Phase gate"
+}
+
+User3Desc_41
+{
+Permet de voyager a la vitesse de la lumiere entre les differentes "phase gates".  "Utilisez"-les pour passer d'une "phase gate" a l'autre.
+}
+
+User3CommanderDesc_41
+{
+Permet de voyager a la vitesse de la lumiere entre les differentes "phase gates".  Plusieurs sont necessaires pour fonctionner correctement.
+}
+
+User3Name_42
+{
+"Defense chamber"
+}
+
+User3Desc_42
+{
+Soigne lentement les joueurs et les structures allies.  Fournit des ameliorations de defense ("carapace", "regeneration" ou "redemption").
+}
+
+User3Name_43
+{
+"Movement chamber"
+}
+
+User3Desc_43
+{
+Les aliens peuvent les utiliser pour se teleporter au "hive" le plus eloigne.  Fournit des ameliorations de mouvement ("celerity", "adrenaline" ou "silence").  Detruire ces structures va retirer les ameliorations aliens.
+}
+
+User3FriendlyDesc_43
+{
+Avancez pres de la structure et appuyez sur votre touche "utiliser" pour vous teleporter a un "hive" attaque.  Fournit des ameliorations de mouvement ("celerity", "adrenaline" ou "silence").
+}
+
+
+User3Name_44
+{
+"Offense chamber"
+}
+
+User3Desc_44
+{
+Tourelle organique qui attaque automatiquement les joueurs et les structures ennemis.  Degats : 20
+}
+
+User3Name_45
+{
+"Sensory chamber"
+}
+
+User3Desc_45
+{
+Detecte les ennemis dans son rayon, camoufle les joueurs et les structures allies a proximite et fournit des ameliorations sensorielles ("cloaking", "pheromones" ou "scent of fear").
+}
+
+
+User3Name_46
+{
+"Resource tower"
+}
+
+User3Desc_46
+{
+Collecte des ressources pour vos ennemis.
+}
+
+User3FriendlyDesc_46
+{
+Collecte des ressources pour votre equipe ; ne s'epuise jamais.
+}
+
+User3Name_47
+{
+Module d'"heavy armor"
+}
+
+User3Desc_47
+{
+Donne une "heavy armor" au soldat.
+}
+
+User3FriendlyDesc_47
+{
+Donne une "heavy armor" au soldat.
+}
+
+User3Name_48
+{
+Module de "jetpack"
+}
+
+User3Desc_48
+{
+Donne un "jetpack" au soldat.
+}
+
+User3FriendlyDesc_48
+{
+Donne un "jetpack" au soldat.
+}
+
+User3Name_49
+{
+"Advanced turret factory"
+}
+
+User3Desc_49
+{
+Permet la construction de "sentry turrets" et de "siege canons".
+}
+
+User3FriendlyDesc_49
+{
+Permet la construction de "sentry turrets" et de "siege canons".
+}
+
+User3Name_57
+{
+"Mine"
+}
+
+User3Desc_57
+{
+Explose au contact d'un ennemi.
+}
+
+User3FriendlyDesc_57
+{
+Explose au contact d'un ennemi.
+}
+
+Weapon1Help
+{
+"Gore" - Approchez de votre ennemi et attaquez. Degats : %d (le double contre les structures).
+}
+
+Weapon2Help
+{
+"Spit" - Arme legere de longue portee pour garder vos ennemis a distance.  Degats : %d
+}
+
+Weapon3Help
+{
+"Spores" - Projette un nuage de spores qui s'etend, causant lentement des degats aux joueurs a proximite (excepte aux "Heavy Armor").  Degats : %d par seconde.
+}
+
+Weapon4Help
+{
+"Spikes" - Arme de longue distance qui frappe instantanement.  Degats : %d
+}
+
+Weapon5Help
+{
+"Bite" - Attaque mortelle au corps a corps.  Approchez tout pres de vos ennemis et attaquez.  Degats : %d
+}
+
+Weapon6Help
+{
+"Bite" - Attaque mortelle au corps a corps.  Approchez tout pres de vos ennemis et attaquez.  Degats : %d
+}
+
+Weapon7Help
+{
+"Swipe" - Attaque mortelle au corps a corps.  Approchez tout pres de vos ennemis et attaquez.  Efficace contre les joueurs et les structures.  Degats : %d
+}
+
+Weapon8Help
+{
+"Webs" - Tirez des globules l'une pres de l'autre et une "web" va se creer entre les deux.  Les "webs" ralentissent les ennemis et les empechent d'utiliser leurs armes pendant un moment.  Les "webs" peuvent etre detruites avec un "welder".
+}
+
+Weapon9Help
+{
+"Metabolize" - Vous soigne en utilisant de l'energie.
+}
+
+Weapon10Help
+{
+"Parasite" - Infecte la cible avec un parasite, la devoilant en permanence sur le "hive sight".  Le parasite ne peut pas etre enleve.  Degats : %d
+}
+
+Weapon11Help
+{
+"Blink" - Permet de se teleporter rapidemment.  Pointez dans la direction a suivre et maintenez le bouton enfonce.
+}
+
+Weapon12Help
+{
+"Xenocide" - Suicide explosif.  Un court instant apres l'activation, vous explosez, causant de lourds degats a tout ce qui etait a proximite.  Degats : %d
+}
+
+Weapon13Help
+{
+"Knife" - Arme de destruction ou de desespoir. Degats : %d
+}
+
+Weapon14Help
+{
+"Pistol" - Arme de haute precision qui cause de gros degats mais avec de petits chargeurs.  Degats : %d
+}
+
+Weapon15Help
+{
+"Light Machine gun" - Bonne precision, haute cadence de tir, chargeur moyen.  Degats : %d
+}
+
+Weapon16Help
+{
+"Shotgun" - Pour les cibles qui se deplacent rapidement et pour causer beaucoup de degats en un seul coup a un ennemi tres proche.  10 fragments par tir.  Degats : %d par fragment
+}
+
+Weapon17Help
+{
+"Heavy machine gun" (HMG) - Armement lourd pour les cibles et les ennemis plus gros.  Bien qu'assez peu precis, les chargeurs sont enormes et sa cadence de tir le rend indispensable.  Degats : %d par balle (la moitie contre les structures)
+}
+
+Weapon18Help
+{
+"Welder" - Permet d'utiliser les zones "weldables" sur les cartes.  Il peut aussi reparer les structures, l'armure des soldats et peut detruire les "webs".  Degats : %d
+}
+
+Weapon19Help
+{
+"Mines" - Utilisez-les comme defense, ou pour proteger vos flans lors d'un assaut.  Elles se declenchent au contact.  Degats : %d
+}
+
+Weapon20Help
+{
+"Grenade launcher" - Les grenades explosent apres 4 secondes (directement si elles touchent une structure ou une creature ennemie) et causent des degats aux alentours.  Degats : %d (le double contre les structures)
+}
+
+Weapon21Help
+{
+"Leap" - Sautez en avant rapidement, frappant tout ce qui se trouve sur votre chemin.  Utile pour se deplacer mais aussi pour combattre.  Degats : %d
+}
+
+Weapon22Help
+{
+"Charge" - Foncez rageusement droit devant vous, en blessant tout ce que vous touchez.  La "charge" utilise de l'energie et s'arrete lorsque vous n'en avez plus.  Degats : incroyables
+}
+
+Weapon23Help
+{
+"Umbra" - Projetez un nuage bacterien qui ralenti les balles ennemies qui le penetre.  Tous les joueurs ou structures allies qui se trouvent dans le nuage sont rarement touches par les balles, mais il est toujours possible d'y subir des degats d'explosifs d'autres armes qui ne tirent pas de balles.  Dure %d secondes.
+}
+
+Weapon24Help
+{
+"Primal scream" - Tous les coequipiers dans les environs regagnent leur energie plus rapidement, se deplacent plus vite et causent plus de degats.  Ecoutez-les crier a leur tour en defi.
+}
+
+Weapon25Help
+{
+"Bile bomb" - Une artillerie organique efficace contre les structures.  Degats : %d (degats zonaux, contre les structures uniquement)
+}
+
+Weapon26Help
+{
+"Acid rocket" - Projectile lent qui cause des degats en eclaboussant.  Degats : %d
+}
+
+Weapon27Help
+{
+"Healing spray" - "Spray" bacterien qui soigne les joueurs et les structures alliees et blesse les ennemis a proximite.  Degats : %d (effet zonal)
+}
+
+Weapon28Help
+{
+"Babbler" - Cree un "babbler", une version plus failbe du Skulk. Les "babblers" vont rechercher eux-memes les ennemis, mais ne vive qu'un court moment.  Degats : 20 ("bite"), 40 ("xenocide").
+} 
+
+Weapon29Help
+{
+"Stomp" - Etourdit ("stun") tous les joueurs ennemis touches pendant %d secondes.
+}
+
+Weapon30Help
+{
+"Devour" - Mange un ennemi proche.  Le joueur est lentement digere, prenant %d points de degats par seconde.  L'Onos lui prend ses points de sante pour se regenerer.  Si l'Onos est tue avant que la digestion ne soit complete, l'ennemi est libere.
+}
+
+CommandStationOtherTeam
+{
+Cette "command console" appartient a l'autre equipe.
+}
+
+CommandStationInUse
+{
+Votre equipe a deja un "commander", la "command console" ne peut pas etre utilisee.
+}
+
+WeaponPreventingCommandStation
+{
+Votre arme vous empeche d'utiliser la "command console".
+}
+
+CommandStationDestroyed
+{
+Cette "command console" est detruite et ne peut plus etre utilisee !
+}
+
+CommandStationWaitTime
+{
+Vous devez attendre plus longtemps avant de pouvoir de nouveau entrer dans la "command console".
+}
+
+
+// Particle editing commands
+$position -1 0.7
+NoParticleSystem
+{
+That particle system couldn't be found.
+}
+
+EditingParticleSystem
+{
+Found particle system, use F7 to edit
+}
+
+
+// Marine help text
+
+// Armor received messages
+$position -1 0.45
+$effect 0
+$fadein 0.5
+$fadeout 0.5
+$holdtime 5.0
+
+HelpTextCSAttractMode
+{
+Pointez cette "command console" et appuyez sur votre touche "utiliser" pour activer le mode "commander".
+}
+
+HelpTextArmoryResupply
+{
+"Utilisez l'"armory" pour obtenir gratuitement des munitions pour votre arme courante.
+}
+
+HelpTextAttackNearbyStation
+{
+C'est la "command console" de l'ennemi, attaquez-la !
+}
+
+HelpTextBuildTurret
+{
+Pointez la base de cette "sentry turret" et appuyez sur votre touche "utiliser" pour la construire.
+}
+
+HelpTextBuildTower
+{
+Pointez la base de cette "resource tower" et appuyez sur votre touche "utiliser" pour la construire.
+}
+
+HelpTextExplainTower
+{
+Cette "resource tower" active donne periodiquement des ressources a votre equipe.
+}
+
+HelpTextAttackHive
+{
+Rassemblez vos coequipiers et trouvez un "hive" alien a detruire !
+}
+
+HelpTextOtherHiveBuilding
+{
+Un seul "hive" ne peut etre construit en meme temps.  Attendez que l'autre soit termine avant de commencer celui-ci.
+}
+
+HelpTextEmptyHiveNotNearby
+{
+Les "hives" ne peuvent etre construits qu'a des emplacements specifiques ("hive locations" - cherchez une zone infestee et un "hive" translucide).
+}
+
+HelpTextAttackNearbyHive
+{
+Il y a un "hive" ennemi a proximite, allez le tuer pour arreter la menace alien !
+}
+
+HelpTextFriendlyMovementChamber
+{
+Appuyez sur votre touche "utiliser" sur cette "movement chamber" pour vous teleporter a un "hive" attaque.  Elle vous redonne egalement de l'energie plus rapidement lorsque vous etes tout pres.
+}
+
+HelpTextAttackMovementChamber
+{
+C'est une "movement chamber" ennemie, elle leur permet de se teleporter a leur "hive" et leur donne de l'energie.
+}
+
+HelpTextFriendlyOffensiveChamber
+{
+C'est une "offense chamber", elle tire automatiquement sur les ennemis qui s'en approchent.
+}
+
+HelpTextAttackOffensiveChamber
+{
+C'est une "offense chamber" ennemie, faites attention !
+}
+
+HelpTextFriendlyDefensiveChamber
+{
+Cette "defense chamber" regenere les joueurs et les structures a proximite.  Elle fait un bruit de clapotement lorsqu'elle soigne.
+}
+
+HelpTextAttackDefensiveChamber
+{
+C'est une "defense chamber" ennemie, elle soigne les joueurs et les structures ennemis.
+}
+
+HelpTextFriendlySensoryChamber
+{
+C'est une "sensory chamber", elle camoufle les joueurs et les structures ennemis a proximite.
+}
+
+HelpTextAttackSensoryChamber
+{
+C'est une "sensory chamber" ennemie.
+}
+
+HelpTextOpenWeldable
+{
+Cette zone peut etre ouverte avec un "welder".
+}
+
+HelpTextCloseWeldable
+{
+Cette zone peut etre fermee avec un "welder".
+}
+
+HelpTextPhaseGate
+{
+"Utilisez" la "phase gate" pour vous teleporter.
+}
+
+HelpTextAlienPopupMenu
+{
+Utilisez votre "menu popup" (le bouton droit de la souris par defaut) pour construire des structures, subir des ameliorations, quitter l'equipe, etc.
+}
+
+HelpTextMarinePopupMenu
+{
+Utilisez votre "menu popup" (le bouton droit de la souris par defaut) pour utiliser des commandes vocales, demander des ordres, quitter l'equipe, etc.
+}
+
+HelpTextOrder
+{
+Le "commander" vous a donne un ordre.  Le cercle bleu sur l'ecran decrit l'endroit et le type d'ordre.  Utilisez votre "menu popup" pour demander d'autres ordres ou pour lui en signifier la bonne reception.
+}
+
+HelpTextCommanderUseable
+{
+En tant que "commander", vous pouvez "utiliser" tous les boutons ou les interrupteurs en cliquant avec le bouton gauche dessus.
+}
+
+HelpTextMarineCommandMenu
+{
+Appuyez sur la touche "menu popup" pour communiquer avec votre equipe (par defaut il s'agit du bouton droit de la souris).
+}
+
+HelpTextResourceDropoff
+{
+Vous avez gagne des points de ressources pour votre equipe !
+}
+
+HelpTextJetpacks
+{
+Votre "commander" a recherche les "jetpacks" pour votre equipe.  Si vous en avez recu un, appuyez sur votre touche "saut" pour l'utiliser.
+}
+
+HelpTextAlienCommandMenu
+{
+Appuyez sur votre touche "menu popup" pour changer de forme de vie et vous ameliorer (la touche par defaut est le bouton droit de la souris).
+}
+
+HelpTextAttackTower
+{
+Cette "resource tower" collecte des ressources pour l'ennemi... detruisez-la !
+}
+
+HelpTextAlienWeapons
+{
+Utilisez la molette de la souris ou les touches numeriques pour basculer entre vos differentes competences.  Une icone rouge indique que la competence est desactivee jusqu'a ce que vous ayez plus de "hives".
+}
+
+HelpTextAlienResources
+{
+La barre bleue sur la gauche indique vos ressources.  Vous les obtenez via les "resources towers" de votre equipe.  Les ressources peuvent etre depensees en utilisant le "menu popup".
+}
+
+HelpTextAlienEnergy
+{
+La barre jaune sur la droite indique votre energie.  Les competences coutent de l'energie lorsqu'elles sont utilisees.
+}
+
+HelpTextAlienPendingUpgrades
+{
+La ou les petite(s) icone(s) qui clignote(nt) sur le cote droit de votre ecran signifient que vous pouvez maintenant ameliorer un ou des aspect(s) de votre creature !  Ouvrez le "menu popup" et faites un choix parmi une des ameliorations disponibles.
+}
+
+HelpTextAlienBuildStructure
+{
+En tant que constructeur alien, vous pouvez creer des structures pour votre equipe en utilisant le "menu popup".
+}
+
+HelpTextAlienBuildStructure
+{
+Il y a une structure alien non-construite a proximite.  Les structures aliens se construisent elles-memes lentement, mais en tant que constructeur, vous pouvez accelerer sa construction.  Pointez a la base de la structure et appuyez sur la touche "utiliser".
+}
+
+HelpTextAlienHiveSight
+{
+Les cercles lumineux sur votre ecran indiquent le "hive sight" de votre equipe.  Les differents points de couleurs sur votre ecran representent vos "hives", vos coequipiers, vos structures attaquees ou encore vos ennemis parasites, habituez-vous a les reperer correctement.
+}
+
+HelpTextAlienVisionMode
+{
+L'emplacement de tous les aliens et de leurs structures est connu en permanence par le "hive mind".  Il peut vous permettre de reperer plus facilement toutes les formes de vies de votre equipe lorsque vous appuyez sur la touche "flashlight".
+}
+
+HelpTextAlienCommunication
+{
+Vous pouvez ricaner en utilisant votre "menu popup". Ouvrez-le, allez vers le haut, a droite et ensuite relachez.
+}
+
+HelpTextAlienUnderAttack
+{
+Un de vos coequipiers ou une de vos structures est attaque.  Regardez autour de vous et chercher l'alerte du "hive sight".
+}
+
+HelpTextBuilder
+{
+Vous etes maintenant un gorge.  Restez en dehors des combats et utilisez votre "menu popup" pour construire les differentes structures.
+}
+
+HelpTextWeb
+{
+Tirez des "webs" sur les murs et les planchers pour creer des fils entre elles.  Les ennemis qui touchent les "webs" sont ralentis et ne peuvent pas utiliser leurs armes pendant un moment.
+}
+
+HelpTextWallwalking
+{
+Le Skulk grimpe automatiquement sur les murs et les plafonds, pour desactiver cette fonctionnalite, appuyez sur votre touche "s'accroupir".
+}
+
+HelpTextBite
+{
+Approchez-vous tout pres de vos ennemis et appuyez sur la touche "attaquer" pour les mordre.
+}
+
+HelpTextFlight
+{
+Donner des petits coups sur votre touche "saut" pour voler.  Vous pouvez aussi la garder enfoncee lorsque vous etes en l'air pour planer.
+}
+
+HelpTextSpores
+{
+Appuyez sur votre bouton "attaquer" pour lancer un nuage de spores qui blessera les ennemis qui seront dedans. Les "Heavy Armor" sont immunises contre les spores.
+}
+
+HelpTextAlienResource
+{
+Trouvez un puit de ressources et construisez une "resource tower" dessus pour qu'elle fournisse des ressources a votre equipe.
+}
+
+HelpTextPopupMenu
+{
+Appuyez sur le bouton droit de la souris (attaque secondaire) pour afficher le "menu popup".
+}
+
+HelpTextBuyUpgrade
+{
+Les aliens peuvent ameliorer certaines de leurs caracteristiques en utilisant le "menu popup".  Essayez-le : appuyez sur le bouton de votre "menu popup" (le bouton droit de la souris par defaut) et deplacez la souris vers la droite.
+}
+
+HelpTextBuyLifeform
+{
+Les aliens peuvent evoluer en de nouvelles formes de vie.  Essayez-le : appuyez sur le bouton de votre "menu popup" (le bouton droit de la souris par defaut) et deplacez la souris vers le bas.
+}
+
+HelpTextCommanderGiveOrders
+{
+Cliquez avec le bouton droit de la souris sur le sol ou sur une structure pour donner un ordre.
+}
+
+HelpTextCommanderSelectPlayers
+{
+Cliquez avec le bouton gauche sur des joueurs ou faites un rectangle autour d'eux pour les selectionner.
+}
+
+HelpTextCommanderLogout
+{
+Vous pouvez quitter le mode "commander" en cliquant sur le bouton rouge "Deconnexion" dans le coin superieur droit de votre ecran.
+}
+
+// This message isn't in yet
+HelpTextCommanderBuild
+{
+Cette structure n'a pas ete entierement construite.  Selectionnez un joueur et cliquez ensuite avec le bouton droit de la souris sur cette structure pour lui donner l'ordre de la construire.
+}
+
+HelpTextCommanderUse
+{
+Les portes, les ascenseurs et d'autres elements de la cartes peuvent etres "hackees" par le "commander".  Cliquez avec le bouton gauche de la souris sur l'element pour le "hacker".
+}
+
+HelpTextCommanderAttack
+{
+Cette cible peut etre attaquee !  Cliquez avec le bouton droit de la souris dessus pour en donner l'ordre.
+}
+
+HelpTextCommanderWeld
+{
+Il est possible d'utiliser le "welder" sur cette cible.  Achetez un "welder" pour l'un de vos coequipiers, ensuite cliquez avec le bouton droit dessus pour lui donner l'ordre de l'utiliser sur la cible.
+}
+
+HelpTextCommanderGet
+{
+Cliquez avec le bouton droit de la souris ici pour donner l'ordre de ramasser ce qui s'y trouve.
+}
+
+HelpTextCommanderUnderAttack
+{
+Vous etes attaques !  Appuyez sur votre touche "saut" pour aller a l'alerte.
+}
+
+HelpTextCommanderResearchComplete
+{
+Votre recherche est terminee.  Appuyez sur votre touche "saut" pour vous rendre a l'endroit de la recherche.
+}
+
+HelpTextCommanderUpgradeComplete
+{
+Votre amelioration est terminee.  Appuyez sur votre touche "saut" pour vous rendre au batiment ameliore.
+}
+
+JetpackEnergyHUDText
+{
+Energie du "jetpack"
+}
+
+HelpTextDisableHelp
+{
+Vous pouvez desactiver ces bulles d'aides en decochant la case "show hints" dans le menu "customization" dans "multiplayer" (cl_autohelp 0).
+}
+
+Paralyzed
+{
+Paralysie
+}
+
+Stunned
+{
+Etourdissement
+}
+
+Digested
+{
+Digestion...
+}
+
+DigestingPlayer
+{
+Digestion de %s...
+}
+
+Parasited
+{
+Parasite
+}
+
+PrimalScreamed
+{
+"Primal scream"
+}
+
+Umbraed
+{
+"Umbra"
+}
+
+Webbed
+{
+"Web"
+}
+
+// Order descriptions
+Order2
+{
+Venir ici
+}
+
+Order3
+{
+Attaquer la cible
+}			 
+
+Order4
+{
+Construire %s
+}
+
+Order5
+{
+Garder %s
+}
+
+Order6
+{
+Utiliser le "welder" ici
+}
+
+Order7
+{
+Prendre %s
+}
+
+Order9
+{
+Tenir la position
+}
+
+Range
+{
+%d metres
+}
+
+// Timelimit for tourny mode
+GameTime
+{
+Duree de la partie
+}
+
+Elapsed
+{
+ecoule
+}
+
+TimeLimit
+{
+Limite de temps
+}
+
+Remaining
+{
+restant
+}
+
+// HLTV 
+Spec_duck
+{
+Appuyez sur "s'accroupir" pour le menu.
+}
+
+SPECT_OPTIONS
+{
+Options
+}
+
+CAM_OPTIONS
+{
+Options de la camera
+}
+
+SpecMode5Text
+{
+}
+
+OBS_MAP_FREE
+{
+Apercu libre
+}
+
+OBS_MAP_CHASE
+{
+Apercu poursuite
+}
+
+OBS_CHASE_FREE
+{
+Camera de poursuite libre
+}
+
+OBS_CHASE_LOCKED
+{
+Camera de poursuite fixe
+}
+
+OBS_IN_EYE
+{
+Vue premiere personne
+}
+
+OBS_ROAMING
+{
+Camera libre
+}
+
+// Official map locations
+testlocation1
+{
+The translated refinery
+}
+
+/////////////
+// ns_bast //
+/////////////
+bastlocation_dockingbay
+{
+Marine Start - Docking Bay 1
+}
+
+bastlocation_mainjunction
+{
+Main Aft Junction
+}
+
+bastlocation_cargolock
+{
+Heavy Lock Door
+}
+
+bastlocation_atmosphericprocessing
+{
+Atmospheric Processing
+}
+
+bastlocation_furnace
+{
+Steam Generation
+}
+
+bastlocation_watertreatment
+{
+Water Treatment
+}
+
+// NOTE: The hyphen in hive location names is important.  Everything before the hyphen is trimmed off when displaying
+// location names for aliens (the hive icons in the upper right of their HUD).  Make sure to follow the convention:
+// Hive Location - name
+bastlocation_feedwatercontrol
+{
+Hive Location - Feedwater Control
+}
+
+bastlocation_trammaintenance
+{
+Tram Maintenance
+}
+
+bastlocation_tramtunnel
+{
+Tram Tunnel
+}
+
+bastlocation_lowerjunction
+{
+Lower Junction
+}
+
+bastlocation_Refinery
+{
+Hive Location - Refinery
+}
+
+bastlocation_emshaft
+{
+EM Drill Shaft
+}
+
+bastlocation_engineroom
+{
+Hive Location - Engine Room
+}
+
+bastlocation_dockinghydraulics
+{
+Docking Hydraulics
+}
+
+bastlocation_maintenancejunction
+{
+Maintenance Junction
+}
+
+bastlocation_ncorridor
+{
+"N" Corridor
+}
+
+bastlocation_observationbridge
+{
+Observation Bridge
+}
+
+bastlocation_starboardairlock
+{
+Starboard Airlock
+}
+
+bastlocation_portairlock
+{
+Port Airlock
+}
+
+bastlocation_maintenanceaccess
+{
+Maintenance Access Duct
+}
+
+bastlocation_pressureequalization
+{
+Pressure Equalization Conduit
+}
+
+bastlocation_starboardcorridor
+{
+Aft Starboard Corridor
+}
+
+bastlocation_filtration
+{
+Feedwater Filtration Access
+}
+
+bastlocation_ventilation
+{
+Ventilation Conduit
+}
+
+bastlocation_databank
+{
+Databank Access
+}
+
+bastlocation_enginecorridor
+{
+Engine Corridor
+}
+
+/////////////
+// ns_hera //
+/////////////
+heralocation_archive
+{
+Hive Location - Archiving
+}
+ 
+heralocation_processingcorea
+{
+Data Core Alpha
+}
+ 
+heralocation_reception
+{
+Hera Entrance and Reception
+}
+ 
+heralocation_holoroom
+{
+Central Monitoring - 'Holoroom'
+}
+ 
+heralocation_storage
+{
+General Cargo Storage
+}
+ 
+heralocation_hanger
+{
+Marine Start - Loading bay
+}
+ 
+heralocation_docking
+{
+Marine Start - Landing Pad
+}
+ 
+heralocation_processing
+{
+Processing
+}
+ 
+heralocation_processingcoreb
+{
+Hive Location - Data Core Delta
+}
+ 
+heralocation_ventilation
+{
+Hive Location - Ventilation 3-C
+}
+ 
+heralocation_maintenence
+{
+Maintenance
+}
+ 
+heralocation_fogcorridor
+{
+Maintenance Corridor
+}
+ 
+heralocation_tube
+{
+Hera Entrance Walkway
+}
+
+// Nothing titles
+nothinglocation_rr
+{
+Space Station Nothing - Sub Sector 77
+}
+
+nothinglocation_ms
+{
+Marine Start - S77 Vestibule
+}
+
+nothinglocation_dock
+{
+Docking Wing 01
+}
+
+nothinglocation_thres1
+{
+The Threshold
+}
+
+nothinglocation_thres2
+{
+The Threshold
+}
+
+nothinglocation_junc1
+{
+The Junction
+}
+
+nothinglocation_junc2
+{
+The Junction
+}
+
+nothinglocation_vent
+{
+Ventilation Chamber
+}
+
+nothinglocation_comm
+{
+Communications Hub 063
+}
+
+nothinglocation_things
+{
+Room With Things
+}
+
+nothinglocation_cargo
+{
+Hive Location - Cargo Bay Foyer
+}
+
+nothinglocation_pipe
+{
+Pipe Room
+}
+
+nothinglocation_paint1
+{
+Painted Corridor
+}
+
+nothinglocation_paint2
+{
+Painted Corridor
+}
+
+nothinglocation_paint3
+{
+Painted Corridor
+}
+
+nothinglocation_quada
+{
+Quad Lift Area
+}
+
+nothinglocation_quad
+{
+Quad Lift
+}
+
+nothinglocation_chamb
+{
+Foreboding Antechamber
+}
+
+nothinglocation_sas1
+{
+Silo Access South
+}
+
+nothinglocation_sas2
+{
+Silo Access South
+}
+
+nothinglocation_silo
+{
+Hive Location - PowerSilo
+}
+
+nothinglocation_san1
+{
+Silo Access North
+}
+
+nothinglocation_san2
+{
+Silo Access North
+}
+
+nothinglocation_mias1
+{
+Miasma Walkway
+}
+
+nothinglocation_mias2
+{
+Miasma Walkway
+}
+
+nothinglocation_mias3
+{
+Miasma Walkway
+}
+
+nothinglocation_gen
+{
+Generator Room
+}
+
+nothinglocation_elev1
+{
+Elevator Shaft 01
+}
+
+nothinglocation_elev2
+{
+Elevator Shaft 02
+}
+
+nothinglocation_eek
+{
+Intimidation
+}
+
+nothinglocation_kismet
+{
+Ominous Kismet
+}
+
+nothinglocation_vae
+{
+Viaduct Access East
+}
+
+nothinglocation_vaw
+{
+Viaduct Access West
+}
+
+nothinglocation_viaduct
+{
+Hive Location - The Great Viaduct
+}
+
+// TANITH info_location data START
+tanith_westenter
+{
+Western Entrance
+}
+
+tanith_marinebase
+{
+Marine Start - Uplink Command
+}
+
+tanith_outsidebase
+{
+Exterior Access Paths
+}
+
+tanith_north
+{
+Northern Corridor
+}
+
+tanith_sat
+{
+External Satellite Relay
+}
+
+tanith_satcomm
+{
+Hive Location - Satellite Communications
+}
+
+tanith_transport
+{
+Chemical Transport Room
+}
+
+tanith_cpu
+{
+Computer Control
+}
+
+tanith_acid
+{
+Acidic Solution Processing
+}
+
+tanith_reactor
+{
+Reactor Room
+}
+
+tanith_enter
+{
+Eastern Entrance
+}
+
+tanith_centerenter
+{
+Central Entrance
+}
+
+tanith_east
+{
+East Access Tunnels
+}
+
+tanith_research
+{
+Research Labs
+}
+
+tanith_rr
+{
+Tanith Ready Room
+}
+tanith_waste
+{
+Hive Location - Waste Handling
+}
+
+tanith_central
+{
+Central Access Tunnels
+}
+
+tanith_storageenter
+{
+Storage Entrance
+}
+
+tanith_cargo
+{
+Cargo Storage
+}
+
+tanith_fusion
+{
+Hive Location - Fusion Reactor
+}
+
+tanith_west
+{
+West Access Corridor
+}
+// TANITH info_location data END 
+
+
+// NANCY info_location data START
+nancy_cargo
+{
+Cargo Hold 2
+}
+
+nancy_aux
+{
+Auxillary Command
+}
+
+nancy_engine
+{
+Port Engine Room
+}
+
+nancy_crawl
+{
+Sub-tunnel
+}
+
+nancy_maint
+{
+Maintenance Shaft
+}
+
+nancy_shaft
+{
+Maintenance Shaft
+}
+
+nancy_mother
+{
+Noname
+}
+
+nancy_lockers
+{
+Crew Lockers
+}
+
+nancy_mess
+{
+Mess Hall
+}
+
+nancy_airlock
+{
+Airlock Exchange
+}
+
+nancy_port
+{
+Port Airlock
+}
+
+nancy_bridge
+{
+Bridge
+}
+
+nancy_cockpit
+{
+Cockpit
+}
+
+nancy_star
+{
+Starboard Airlock
+}
+
+nancy_gen
+{
+Auxiliary Generators
+}
+
+nancy_motherinter
+{
+Mother Interface
+}
+
+nancy_subspace
+{
+Subspace Array Interface
+}
+
+nancy_crew
+{
+Crew Quarters
+}
+// NANCY info_location data END
+
+// CAGED info_location data START
+caged_marine
+{
+Marine Spawn - Main Hold
+}
+
+caged_upsewer
+{
+Upper Sewer
+}
+
+caged_dsewer
+{
+Lower Sewer
+}
+
+caged_hive1
+{
+Hive Location - Sewer
+}
+
+caged_hive2
+{
+Hive Location - Ventilation System
+}
+
+caged_hive3
+{
+Hive Location - Generator
+}
+
+caged_pure
+{
+Purification Station 01
+}
+
+caged_central
+{
+Central Processing
+}
+
+caged_vaccess
+{
+Ventilation Access
+}
+
+caged_work
+{
+Stability Monitoring
+}
+
+caged_auxgen
+{
+Auxiliary Generator
+}
+
+caged_service
+{
+Shipping Tunnels
+}
+
+caged_area2
+{
+Upper Shipping Access
+}
+// CAGED info_location data END
+
+// Eclipse info_location... info. (BEGIN)
+eclipse_dock
+{
+Docking Control
+}
+
+eclipse_marinespawn
+{
+Marine Spawn - Cargo Transfer
+}
+
+eclipse_station
+{
+Station Access
+}
+
+eclipse_stationeast
+{
+Station Access East
+}
+
+eclipse_stationalpha
+{
+Station Access Alpha
+}
+
+eclipse_stationwest
+{
+Station Access West
+}
+
+eclipse_triad
+{
+Triad Generator Array
+}
+
+eclipse_triadb
+{
+Triad Access B
+}
+
+eclipse_access1c
+{
+Access Corridor 1C
+}
+
+eclipse_access1b
+{
+Access Corridor 1B
+}
+
+eclipse_access1a
+{
+Primary Access Corridor 1A
+}
+
+eclipse_horseshoe
+{
+The Horseshoe
+}
+
+eclipse_tjunct
+{
+T-Junction
+}
+
+eclipse_keyhole
+{
+The Keyhole
+}
+
+eclipse_maint
+{
+Hive - Maintenance Access
+}
+
+eclipse_south
+{
+South Loop
+}
+
+eclipse_core
+{
+Hive - Computer Core
+}
+
+eclipse_northcore
+{
+North Core Access
+}
+
+eclipse_westcore
+{
+West Core Access
+}
+
+eclipse_subjunct
+{
+Power Sub-Junction 3
+}
+
+eclipse_access1d
+{
+Access Corridor 1D
+}
+
+eclipse_commandnorth
+{
+Command Access North
+}
+
+eclipse_command
+{
+Hive - Eclipse Command
+}
+
+eclipse_genmon
+{
+Primary Generator Monitors
+}
+
+eclipse_commandsouth
+{
+Command Access South
+}
+
+eclipse_access1a
+{
+Access Corridor 1A
+}
+// Eclipse info_location... info. (END)
+
+
+// Veil info_location (START)
+
+veil_marine
+{
+Marine Spawn - Mobile Command Interface
+}
+
+veil_lifteast
+{
+Lift 5 East
+}
+
+veil_swhive
+{
+Hive - Sub-Sector 5B Access
+}
+
+veil_south
+{
+Hive - Cargo Transfer South
+}
+
+veil_southeast
+{
+Hive - The Pipeline
+}
+
+veil_overlook
+{
+The Overlook
+}
+
+veil_topography
+{
+Topographical Analysis
+}
+
+veil_nano
+{
+NanoGrid Status
+}
+
+veil_dome
+{
+The Dome
+}
+
+veil_y
+{
+Y Junction
+}
+
+veil_skylight
+{
+West Skylights
+}
+
+veil_satellite
+{
+Satellite Feed
+}
+
+veil_pod1
+{
+Monitoring Pod 1
+}
+
+veil_pod2
+{
+Monitoring Pod 2
+}
+
+veil_waypointing
+{
+System Waypointing
+}
+
+veil_nanoeast
+{
+NanoGrid Access East
+}
+
+veil_nanowest
+{
+NanoGrid Access West
+}
+
+veil_c12
+{
+Emergency Nozzle C-12
+}
+
+veil_junctionwest
+{
+West Junction
+}
+
+veil_junctioneast
+{
+East Junction
+}
+
+veil_power
+{
+Power Core Status
+}
+
+// Veil info_location (END)
+
+
+
+// Tutorial text
+$position 0.15 0.15
+$effect 2
+$color 0 200 0
+$color2 0 255 0
+$fadein 0.04
+$fxtime 0.1
+$holdtime 6.0
+$fadeout 0.5
+
+TutWelcome
+{
+Welcome to Natural Selection Training.
+
+Here you will learn the basic rules of the game.
+
+Walk through a door to choose your training.
+If you are a new to first-person shooters, marine
+training is recommended.
+}
+
+TutWelcomeMarineTraining
+{
+You've chosen Marine training.  Here you will 
+learn what it takes to be a Frontiersman and how 
+to fight the alien race.
+}
+
+TutWelcomeAlienTraining
+{
+You've chosen Alien training.  Here you will 
+learn how to spread your influence throughout 
+the galaxy, and obliterate the human oppressors.
+}
diff --git a/main/gamma_tune.exe b/main/gamma_tune.exe
new file mode 100644
index 00000000..35b5afb2
Binary files /dev/null and b/main/gamma_tune.exe differ
diff --git a/main/german_titles.txt b/main/german_titles.txt
new file mode 100644
index 00000000..4f8908b2
--- /dev/null
+++ b/main/german_titles.txt
@@ -0,0 +1,4338 @@
+//TITLES FOR NATURAL SELECTION
+//DO NOT ALTER THIS FILE
+//
+//German translation by MZ.Mars, Ramses, and Nemesis Zero
+//
+// Position command $position x y
+// x & y are from 0 to 1 to be screen resolution independent
+// -1 means center in each dimension
+// Effect command $effect <effect number>
+// effect 0 is fade in/fade out
+// effect 1 is flickery credits
+// effect 2 is write out (training room)
+// Text color r g b command $color
+// fadein time fadeout time / hold time
+// $fadein (message fade in time - per character in effect 2)
+// $fadeout (message fade out time)
+// $holdtime (stay on the screen for this long)
+
+////////////////////
+// Green teletype //
+////////////////////
+$position 0.15 0.15
+$effect 2
+$color 0 200 0
+$color2 0 255 0
+$fadein 0.04
+$fxtime 0.25
+$holdtime 6.0
+$fadeout 0.5
+
+Team_AutoAssign
+{
+Automatisch Zuteilen
+}
+
+Menu_Spectate
+{
+Zuschauen
+}
+
+UndefinedTeam
+{
+Ready Room
+}
+
+Menu_LeaveGame
+{
+Spiel verlassen.
+}
+
+Menu_ReadyRoom
+{
+Ready Room
+}
+
+Menu_Marine1Team
+{
+Marines
+}
+
+Menu_Alien1Team
+{
+Aliens
+}
+
+Marine1Team
+{
+Frontiersmen
+}
+
+Alien1Team
+{
+Kharaa
+}
+
+Marine2Team
+{
+Frontiersmen
+}
+
+Alien2Team
+{
+Kharaa
+}
+
+AutoTeam
+{
+Automatisch zugeteilt.
+}
+
+Muted
+{
+Muted
+}
+
+Unmuted
+{
+Unmuted
+}
+
+No_longer_hear_that_player
+{
+Dieser Spieler ist stummgeschaltet.
+}
+
+// SDK 2.0 Spectator Menu
+Spec_Map
+{
+Map
+}
+
+Spec_Mode1
+{
+Festgestellte Verfolgerkamera.
+}
+
+Spec_Mode2
+{
+Freie Verfolgerkamera.
+}
+
+Spec_Mode3
+{
+Freie Kamera.
+}
+
+Spec_Mode4
+{
+First Person
+}
+
+Spec_Mode5
+{
+Free Map Overview
+}
+
+Spec_Mode6
+{
+Chase Map Overview
+}
+
+Spec_NoTarget
+{
+Keine gueltigen Ziele. Wechsel in Verfolgerkamera nicht moeglich.
+}
+
+Spec_Help
+{
+Druecke F4, um in den Ready Room zu gelangen. Benutze LINKS und RECHTS, SPRINGEN und FEUER, um durch die Perspektiven zu wechseln.
+}
+
+Spec_Help_Text
+{
+Use the following keys to change view styles:
+
+ FIRE1 or RIGHT - Chase next player
+ POPUP-MENU or LEFT - Chase previous player
+ JUMP - Change view modes
+ USE - Change inset window mode
+ 
+ DUCK  - Enable spectator menu
+  
+In Overview Map Mode move around with:
+
+ MOVELEFT - move left
+ MOVERIGHT - move right
+ FORWARD - zoom in
+ BACK - zoom out
+ MOUSE - rotate around map/target
+}
+
+Spec_Slow_Motion
+{
+Slow Motion
+}
+
+Spec_Replay
+{
+Instant Replay
+}
+
+Spec_Help2
+{
+Ihre Text-Nachrichten werden nur von anderen Zuschauern gesehen.
+}
+
+Spec_Only_Help
+{
+}
+
+Directed
+{
+Directed
+}
+
+SpectatorsNotAllowed
+{
+Dieser Server erlaubt momentan keine Zuschauer.
+}
+
+ObsInEyePrefix
+{
+Viewing through eyes of
+}
+
+SpectatorTeam
+{
+Zuschauer
+}
+
+Spectators
+{
+Zuschauer
+}
+
+TEAM
+{
+Team
+}
+
+TEAMS
+{
+Teams
+}
+
+PLAYER
+{
+Spieler
+}
+
+Player_plural
+{
+Spieler
+}
+
+PLAYERS
+{
+Spieler
+}
+
+SCORES
+{
+Scores
+}
+
+SCORE
+{
+Score
+}
+
+DEATHS
+{
+Deaths
+}
+
+LATENCY
+{
+Ping 
+}
+
+VOICE
+{
+Stimme
+}
+
+Unassigned
+{
+Nicht zugewiesen.
+}
+
+Menu_OK
+{
+OK
+}
+
+Points
+{
+Punkte
+}
+
+Cost
+{
+Kosten
+}
+
+NoSpectating
+{
+Zuschauer sind auf diesem Server nicht erlaubt.
+}
+
+// Main game messages
+ReadyRoomMessage
+{
+Dies ist der 'Ready Room'. Mittels der Portale kann man einem Team beitreten oder das Spiel beobachten.
+}
+
+ReinforcementMessage
+{
+Respawn in Kuerze...
+}
+
+ReinforcingMessage
+{
+Respawn...
+}
+
+ObserverMessage
+{
+Zuschauer koennen einem laufenden Spiel nicht beitreten.
+}
+
+CantSwitchTeamsInTournyMode
+{
+Im Tournament-Modus ist der Teamwechsel waehrend eines laufenden Spiels verboten.
+}
+
+CantSwitchTeamsAfterGameStart
+{
+Nach Spielbeginn ist der Teamwechsel verboten.
+}
+
+TooManyPlayersOnTeam
+{
+In diesem Team sind schon zu viele Spieler.
+}
+
+CantJoinAfterSpectating
+{
+Zuschauer koennen einem laufenden Spiel nicht beitreten.
+}
+
+CanOnlyJoinTeamYouveReinforced
+{
+Nachdem man das andere Team gesehen hat, kann man bis zur naechsten Runde die Teams nicht wechseln.
+}
+
+YouCanJoinSoon
+{
+Teambeitritt in Kuerze...
+}
+
+AlreadyOnTeam
+{
+Teamwechsel ist nur vom Ready Room aus moeglich.
+}
+
+SoldierMessage
+{
+Sie sind ein Soldat. Versuchen Sie, den Befehlen des Commanders zu folgen und beschuetzen Sie Ihre Teamkameraden und Gebaeude vor dem Feind, koste es, was es wolle.
+}
+
+ObjectivesVsAliens
+{
+Sie bekaempfen die Aliens. Aliens werden bei den Hives geboren. Um das Spiel zu gewinnen, muessen Sie alle Hives und Aliens ausschalten.
+}
+
+ObjectivesVsMarines
+{
+Du bekaempfst die Marines! Die Marines werden durch Infanterieportale heruebertransportiert. Um das Spiel zu gewinnen, muessen alle Infanterieportale und Marines vernichtet werden.
+}
+
+Handicap
+{
+Handicap
+}
+
+CommanderMessage
+{
+Klicken Sie links oder ziehen Sie den Cursor bei gedrueckter linker Maustaste, um Spieler auszuwaehlen. Mit einem Rechtsklick auf einen Ort, eine Struktur, oder einen Spieler lassen sich Anweisungen vergeben. Klicken Sie auf die Minimap (links unten), um schnell zu anderen Teilen des Levels zu springen. Mit dem menu rechts unten koennen Sie Strukturen bauen und Ihre Soldaten ausruesten.
+}
+
+Commander
+{
+Commander
+}
+
+NoCommander
+{
+Kein Commander
+}
+
+GestationMessage
+{
+Du entwickelst Dich nun in eine andere Lebensform. Sei bereit zu schluepfen ...
+}
+
+CocoonMessage
+{
+You have been cocooned!
+}
+
+YouAreReinforcements
+{
+Sie wurden zur Verstaerkung gerufen!
+}
+
+//////////////
+// Pie menu //
+//////////////
+MenuMarineRoot
+{
+Start
+}
+
+//MenuMarineRoot
+//{
+//!marinenode
+//}
+
+
+MenuComms
+{
+Funk
+}
+
+MenuTalk
+{
+Reden
+}
+
+MenuAttacked
+{
+"Werde angegriffen!"
+}
+
+MenuCheer
+{
+Jubel
+}
+
+MenuCoverMe
+{
+"Deckt mich!"
+}
+
+MenuRetreat
+{
+"Rueckzug!"
+}
+
+MenuInPosition
+{
+"In Position!"
+}
+
+MenuEnemySpotted
+{
+"Feindkontakt."
+}
+
+MenuMoveOut
+{
+"Ausruecken!"
+}
+
+MenuAllClear
+{
+"Gebiet gesichert!"
+}
+
+MenuYell
+{
+Rufen
+}
+
+MenuSay
+{
+Sagen
+}
+
+MenuRogerThat
+{
+"Alles Klar!"
+}
+
+MenuHello
+{
+"Hallo"
+}
+
+MenuNeedHelp
+{
+"Hilfe!"
+}
+
+MenuNeedHealth
+{
+"Brauche Med-Pack"
+}
+
+MenuNeedAmmo
+{
+"Brauche Munition"
+}
+
+MenuFollowMe
+{
+"Folgt mir."
+}
+
+MenuCovering
+{
+"Decke..."
+}
+
+MenuOrders
+{
+Befehle
+}
+
+MenuNeedOrder
+{
+"Brauche Anweisungen."
+}
+
+MenuAck
+{
+"Bestaetigt."
+}
+
+MenuAdmin
+{
+Admin
+}
+
+MenuReadyRoom
+{
+Ready Room
+}
+
+MenuVoteCommanderDown
+{
+Commander abwaehlen.
+}
+
+MenuArea
+{
+Gebiet
+}
+
+MenuMoveTo
+{
+Gehe zu...
+}
+
+MenuGuard
+{
+Bewache
+}
+
+MenuTarget
+{
+Ziel
+}
+
+MenuDeploy
+{
+Einsetzen
+}
+
+MenuIncoming
+{
+Sie kommen.
+}
+
+MenuProceed
+{
+Ruecke vor.
+}
+
+MenuFireTarget
+{
+Feuer auf Ziel.
+}
+
+MenuTaunt
+{
+Spott
+}
+
+MenuTakeCover
+{
+Geh' in Deckung.
+}
+
+MenuReady
+{
+Bereit
+}
+
+MenuDefendObj
+{
+Verteidige
+}
+
+MenuCeaseFire
+{
+Feuer einstellen!
+}
+
+MenuTeam
+{
+Team
+}
+
+MenuBuilding
+{
+Bauen
+}
+
+MenuAttackObj
+{
+Angriff
+}
+
+MenuTaunt
+{
+Spott
+}
+
+MenuHealth
+{
+"Health"
+}
+
+MenuCameraTower
+{
+Kamera
+}
+
+MenuTurret
+{
+Turret
+}
+
+MenuSiegeTurret
+{
+Siege Turret
+}
+
+MenuBlazeOfGlory
+{
+Blaze
+}
+
+MenuProtect
+{
+Beschuetzen
+}
+
+MenuReinforce
+{
+Verstaerkung
+}
+
+MenuArmorUpgrade
+{
+Heavy
+}
+
+MenuRepair
+{
+Reparatur
+}
+
+MenuPowerups
+{
+Stim
+}
+
+MenuAdrenaline
+{
+Adrenalin
+}
+
+MenuDefMatrix
+{
+Def matrix
+}
+
+MenuPhaseGate
+{
+Phase Gate
+}
+
+MenuSelf
+{
+Ich
+}
+
+MenuBuy
+{
+Kaufen
+}
+
+MenuHeavy
+{
+Heavy
+}
+
+MenuShotgun
+{
+Shotgun
+}
+
+MenuHeavyMG
+{
+Heavy MG
+}
+
+MenuLauncher
+{
+Launcher
+}
+
+MenuFlamer
+{
+Flamer
+}
+
+MenuNuke
+{
+Nuke
+}
+
+MenuWeapon
+{
+Waffen
+}
+
+MenuEquipment
+{
+Equipment
+}
+
+MenuUse
+{
+Benutzen
+}
+
+MenuNextWeapon
+{
+Naechste Waffe
+}
+
+MenuJetpacks
+{
+Jet-Packs
+}
+
+MenuReloadWeapon
+{
+Nachladen
+}
+
+MenuDropWeapon
+{
+Fallen lassen
+}
+
+MenuLight
+{
+Licht
+}
+
+MenuAmmo
+{
+Munition
+}
+
+MenuMines
+{
+Minen
+}
+
+MenuGrenades
+{
+Granaten
+}
+
+MenuUpgradeMG
+{
+Upgrade
+}
+
+////////////////////
+// Armor upgrades //
+////////////////////
+
+MenuArmorFull
+{
+Volle Armor
+}
+
+MenuBuyArmorHeavy
+{
+Heavy Armor
+}
+
+MenuBuyArmorMotionTrack
+{
+Motion Tracking
+}
+
+MenuBuyArmorJetpack
+{
+Jet-Packs
+}
+
+MenuBuyArmorLifeSupport
+{
+Sustain
+}
+
+// Rank
+MenuRank
+{
+Rang
+}
+
+MenuPromote
+{
+Befoerdern
+}
+
+MenuDemote
+{
+Degradieren
+}
+
+//////////////////////////////////////////////////
+// Don't localize these, they are sprite names: //
+//  (sprites/640(or 320)name.spr)               //
+//////////////////////////////////////////////////
+MenuAlienRoot
+{
+Start
+}
+
+MenuAlienSmallMorph
+{
+Lebensformen
+}
+
+MenuAlienMorphLevel1
+{
+Skulk
+}
+
+MenuAlienMorphLevel2
+{
+Gorge
+}
+
+MenuAlienBigMorph
+{
+Erweitert
+}
+
+MenuAlienMorphLevel3
+{
+Lerk
+}
+
+MenuAlienMorphLevel4
+{
+Fade
+}
+
+MenuAlienMorphLevel5
+{
+Onos
+}
+
+MenuAlienUpgrade
+{
+Upgrades
+}
+
+MenuAlienComm
+{
+Kommunikation
+}
+
+MenuAlienBuild
+{
+Bauen
+}
+
+MenuAlienAdvBuild
+{
+Erweitert
+}
+
+MenuAlienBuildUpgrades
+{
+Upgrades
+}
+
+
+MenuAlienCommSayingsWest
+{
+Rufen
+}
+
+MenuAlienCommSayingOne
+{
+Kichern
+}
+
+MenuAlienCommSayingTwo
+{
+Brauche Heilung.
+}
+
+MenuAlienCommSayingThree
+{
+Hilfe!
+}
+
+MenuAlienCommSayingsEast
+{
+Sagen
+}
+
+MenuAlienCommSayingFour
+{
+Eindringling!
+}
+
+MenuAlienCommSayingFive
+{
+Angriff!
+}
+
+MenuAlienCommSayingSix
+{
+Ich baue hier.
+}
+
+// Temp artwork, change
+MenuAlienReadyRoom
+{
+Ready Room
+}
+
+MenuAlienUpgradeDefOne
+{
+Carapace
+}
+
+MenuAlienUpgradeDefTwo
+{
+Regenaration
+}
+
+MenuAlienUpgradeDefThree
+{
+Redemption
+}
+
+MenuAlienUpgradeSenOne
+{
+Cloaking
+}
+
+MenuAlienUpgradeSenTwo
+{
+Pheromones
+}
+
+MenuAlienUpgradeSenThree
+{
+Scent of Fear
+}
+
+MenuAlienUpgradeMoveOne
+{
+Celerity
+}
+
+MenuAlienUpgradeMoveTwo
+{
+Adrenaline
+}
+
+MenuAlienUpgradeMoveThree
+{
+Silence
+}
+
+MenuAlienDefenseChamber
+{
+Defense Chamber
+}
+
+MenuAlienSensoryChamber
+{
+Sensory Chamber
+}
+
+MenuAlienMovementChamber
+{
+Movement Chamber
+}
+
+MenuAlienDefenseUpgrades
+{
+Defensive
+}
+
+MenuAlienSensoryUpgrades
+{
+Sensory
+}
+
+MenuAlienMovementUpgrades
+{
+Movement
+}
+
+MenuAlienOffensiveChamber
+{
+Offensive Chamber
+}
+
+MenuAlienResourceTower
+{
+Resource Tower
+}
+
+MenuAlienHive
+{
+Hive
+}
+
+//*//
+// Armor received messages
+$position -1 0.2
+$effect 0
+$fadein 0.5
+$fadeout 0.5
+$holdtime 5.0
+
+ReceiveHeavyArmor
+{
+Ihre Ausruestung wurde zur 'Heavy Armor' verbessert. Sie sind nun besser gepanzert.
+}
+
+ReceiveMotionTrackArmor
+{
+Ihnen wurde nun einen Motion-Tracker in die Ruestung integriert.
+}
+
+ReceiveJetpackArmor
+{
+Sie besitzen nun einen Jet-Pack. Druecken und halten Sie die SPRUNG-Taste, um ihn zu aktivieren.
+}
+
+ReceiveLifeSupportArmor
+{
+Du hast nun ein LifeSupport (TM) System. Wenn du kurz vor dem Tode bist, wirst du geschuetzt sein bis Hilfe eintrifft.
+}
+
+
+
+$position -1 0.35
+$holdtime 3.0
+
+GameStarting
+{
+Das Spiel beginnt in Kuerze...
+}
+
+$holdtime 2.0
+GameBegun
+{
+Das Spiel hat begonnen.
+}
+
+// Overwatch enabled
+//OverwatchActive
+//{
+//Overwatch active
+//}
+
+// Overwatch range string, expecting a float for range
+OverwatchRange
+{
+Target range: %f
+}
+
+// Points awarded
+$position -1 0.25
+$effect 0
+$holdtime 4
+
+MarineAward
+{
+Ihr Team eliminierte einen Gegner!
+}
+
+MarineAwardToLeader
+{
+Ihr Squad erhielt Punkte fuer die Eliminierung eines Gegners!
+}
+
+// Points awarded
+$position -1 0.15
+$effect 0
+$holdtime 3
+MarineAwardToCommander
+{
+Ihr Team verdiente sich Punkte durch die Beseitigung eines Gegners!
+}
+
+// Points awarded
+$position -1 0.25
+$effect 0
+$holdtime 4
+AlienAward
+{
+Der Tod dieses Gegners brachte Dir Resourcen ein!
+}
+
+Defect
+{
+Squad verlassen
+}
+
+WeaponCantBeDropped
+{
+Diese Waffe kann nicht abgelegt werden.
+}
+
+SquadIndicator
+{
+Sie sind in Squad %d
+}
+
+DefectMessageToLeader
+{
+Ein Spieler hat Ihren Squad verlassen.
+}
+
+InvalidOrderGiven
+{
+Ungueltiger Befehl.
+}
+
+$position -1 0.65
+$effect 0
+$holdtime .5
+$fadein .2
+$fadeout .2
+GameWontStart
+{
+Das Spiel beginnt erst, wenn beide Teams Spieler haben.
+}
+
+// Translation note: don't translate "ready"
+GameWontStartUntilReady
+{
+Das spiel wird nicht beginnen, bevor beide Teams "ready" eingeben.
+}
+
+$position -1 0.75
+$effect 0
+$holdtime .7
+$fadein .2
+$fadeout .2
+ReceivingLevelData
+{
+Empfange Level-Daten...
+}
+
+$position -1 0.85
+ReceivingLevelData1
+{
++---
+}
+
+ReceivingLevelData2
+{
+++--
+}
+
+ReceivingLevelData3
+{
++++-
+}
+
+ReceivingLevelData4
+{
+++++
+}
+
+$position -1 0.65
+$effect 0
+$holdtime .5
+$fadein .2
+$fadeout .2
+$position -1 0.9
+EvolvingMessage
+{
+Entwicklungsphase...
+}
+
+VoteCast
+{
+Ihre Stimme wurde gezaehlt.
+}
+
+VoteStarted
+{
+Eine Abstimmung zur Abloesung des Commanders wurde gestartet. Wenn der Commander den Spielverlauf stoert, koennen Sie mithilfe des Pop-Up menus fuer seine Entlassung stimmen.
+}
+
+VoteIllegal
+{
+Zu diesem Zeitpunkt ist eine Abstimmung unzulaessig.
+}
+
+
+AlreadyVoted
+{
+Sie koennen nur einmal pro Runde abstimmen.
+}
+
+VoteFailed
+{
+Die Abstimmung gegen den Commander war nicht erfolgreich.
+}
+
+VoteCancelled
+{
+Die Abstimmung wurde abgebrochen.
+}
+
+VoteSucceeded
+{
+Der Commander wurde abgewaehlt.
+}
+
+BannedFromCommand
+{
+Ihnen ist vorruebergehend das Kommandieren auf diesem Server verboten worden. Viele Server heben ein solches Verbot nach einigen Stunden auf.
+}
+
+MustGestateUp
+{
+Du kannst dich nur in hoehere Lebensformen entwickeln.
+}
+
+MustGestateOnGround
+{
+Du musst auf flachem Boden stehen, um die Entwicklung einzuleiten.
+}
+
+NotWhileDigesting
+{
+Du kannst waehrend der Verdauung eines Gegners keine Entwicklung in eine andere Lebensform einleiten.
+}
+
+NoReadyRoomWhileDigested
+{
+Du kannst nicht in den Ready Room, solange Du einen Marine verdaust.
+}
+
+NeedMoreRoomToGestate
+{
+Du brauchst mehr Platz fuer die Entwicklung.
+}
+
+NeedOneHiveToGestate
+{
+Dein Team benoetigt einen Hive, um diese Lebensform zu entwickeln.
+}
+
+NeedTwoHivesToGestate
+{
+Dein Team benoetigt zwei Hives, um diese Lebensform zu entwickeln.
+}
+
+NeedThreeHivesToGestate
+{
+Dein Team benoetigt drei Hives, um diese Lebensform zu entwickeln.
+}
+
+NeedOneHiveForStructure
+{
+Dein Team benoetigt einen Hive, um diese Struktur zu errichten.
+}
+
+NeedTwoHivesForStructure
+{
+Dein Team benoetigt zwei Hives, um diese Struktur zu errichten.
+}
+
+NeedThreeHivesForStructure
+{
+Dein Team benoetigt drei Hives, um diese Struktur zu errichten.
+}
+
+NeedsAnotherHiveForStructure
+{
+Dein Team braucht einen weiteren Hive, um diese Struktur zu errichten.
+}
+
+MustBeBuilder
+{
+Du must ein Gorge sein, um diese Struktur zu errichten.
+}
+
+UpgradeNotAvailable
+{
+Dieses Upgrade ist momentan nicht verfuegbar.
+}
+
+TooManyStructuresOfThisTypeNearby
+{
+Es sind zu viele Strukturen dieses Typs in der Naehe.
+}
+
+TooManyStructuresInArea
+{
+Es sind zu viele Strukturen in der Naehe.
+}
+
+$holdtime 2.0
+TooManyWebs
+{
+Dein Team hat die maximal zulaessige Anzahl an Webs erreicht.
+}
+
+TooManyWebsNearby
+{
+Es sind zuviele Webs in diesem Bereich.
+}
+
+$position -1 0.35
+$effect 0
+$holdtime 5.0
+TeamOneWon
+{
+Team Eins hat gewonnen!
+}
+
+TeamTwoWon
+{
+Team Zwei hat gewonnen!
+}
+
+GameDraw
+{
+Unendschieden!
+}
+
+RankBeforeGameStart
+{
+Du kannst nur vor dem Start des Spiels den Rang aendern.
+}
+
+DefectAfterGameStart
+{
+Du kannst erst nach Spielbeginn ueberlaufen.
+}
+
+// Tech tree
+MarineResourcePrefix
+{
+Team-Resourcen:
+}
+
+AlienResourcePrefix
+{
+Resourcen:
+}
+
+CarryResourcePrefix
+{
+Traegt %d Resourcen.
+}
+
+Resources
+{
+Resourcen:
+}
+
+
+NumericalEventResources
+{
+Resourcen
+}
+
+NumericalEventHealth
+{
+Health
+}
+
+NumericalEventResourcesDonated
+{
+Resourcen gespendet
+}
+
+NumericalEventAmmo
+{
+Ammo erhalten
+}
+
+
+
+
+AlienEnergyDescription
+{
+Energie
+}
+
+ResourcesDepleted
+{
+Resourcen erschoepft.
+}
+
+Reinforcements
+{
+Verstaerkung
+}
+
+
+WeaponCategory
+{
+Waffen
+}
+
+ArmorCategory
+{
+Armor
+}
+
+BuildCategory
+{
+Bauen
+}
+
+RadioCategory
+{
+Funk
+}
+
+TechNodeLabel_0
+{
+keine
+}
+
+TechNodeHelp_0
+{
+<none>
+}
+
+TechNodeHelp_1
+{
+Wechselt zur naechsten Waffe.
+}
+
+TechNodeHelp_2
+{
+Laedt die aktive Waffe nach.
+}
+
+TechNodeHelp_3
+{
+Laesst Ihre aktive Waffe fallen, um schneller zu werden, oder um sie jemand Anderem zu geben.
+}
+
+TechNodeHelp_5
+{
+Verlaesst das Spiel und bringt Sie zurueck zum Ready Room.  Dort koennen Sie das Team wechseln, Zuschauer werden, oder einfach nur eine Pause einlegen.
+}
+
+TechNodeHelp_6
+{
+Falls der Commander mit Absicht versucht, das Spiel zu ruinieren, koennen Sie Ihn mit dieser Abstimmung von seinem Posten verbannen. Wenn genug Stimmen zusammenkommen, wird er fuer den Rest des Spieles suspendiert.
+}
+
+
+TechNodeLabel_10
+{
+Angegriffen
+}
+
+TechNodeLabel_11
+{
+Attacke
+}
+
+TechNodeLabel_12
+{
+Zerstoeren
+}
+
+TechNodeLabel_13
+{
+Bestaetigt
+}
+
+TechNodeLabel_14
+{
+Focus Team
+}
+
+TechNodeLabel_15
+{
+maechtig
+}
+
+
+TechNodeHelp_7
+{
+"Kichern"
+}
+
+TechNodeHelp_8
+{
+"Brauche Heilung."
+}
+
+TechNodeHelp_9
+{
+"Brauche Hilfe."
+}
+
+TechNodeHelp_10
+{
+"Eindringling."
+}
+
+TechNodeHelp_11
+{
+"ANGRIFF"
+}
+
+TechNodeHelp_12
+{
+"Ich baue hier."
+}
+
+
+
+TechNodeLabel_20
+{
+Armor #1
+}
+
+TechNodeLabel_21
+{
+Armor  #2
+}
+
+TechNodeLabel_22
+{
+Armor  #3
+}
+
+TechNodeLabel_23
+{
+Waffen #1
+}
+
+TechNodeLabel_24
+{
+Waffen #2
+}
+
+TechNodeLabel_25
+{
+Waffen #3
+}
+
+TechNodeHelp_20
+{
+Stufe 1 - Armorverbesserung.
+}
+
+TechNodeHelp_21
+{
+Stufe 2 - Armorverbesserung.
+}
+
+TechNodeHelp_22
+{
+Stufe 3 - Armorverbesserung.
+}
+
+
+TechNodeHelp_23
+{
+Waffen, Minen, Turrets fuegen +10% Schaden zu.
+}
+
+TechNodeHelp_24
+{
+Waffen, Minen, Turrets fuegen +20% Schaden zu.
+}
+
+TechNodeHelp_25
+{
+Waffen, Minen, Turrets fuegen +30% Schaden zu.
+}
+
+TechNodeLabel_26
+{
+Advanced Turret Factory.
+}
+
+TechNodeHelp_26
+{
+Upgrade zur Advanced Turret Factory.
+}
+
+TechNodeLabel_28
+{
+Jet-Packs
+}
+
+TechNodeHelp_28
+{
+Ermoeglicht Jet-Pack Module.
+}
+
+TechNodeLabel_29
+{
+Heavy Armor
+}
+
+TechNodeHelp_29
+{
+Ermoeglicht Heavy Armor.
+}
+
+TechNodeLabel_30
+{
+Distress Beacon
+}
+
+TechNodeHelp_30
+{
+Laesst alle toten Marines am Startpunkt  wiedererscheinen.
+}
+
+TechNodeLabel_31
+{
+Feldmedizinische Technologie.
+}
+
+TechNodeHelp_31
+{
+Ermoeglicht es dem Commander, Healthpacks auszugeben.
+}
+
+TechNodeLabel_32
+{
+Abbrechen.
+}
+
+TechNodeHelp_32
+{
+Forschung abbrechen.
+}
+
+TechNodeLabel_33
+{
+Motion-Tracking
+}
+
+TechNodeHelp_33
+{
+Alle sich bewegenden Feinde werden sichtbar.
+}
+
+TechNodeLabel_34
+{
+Phase Tech
+}
+
+TechNodeHelp_34
+{
+Ermoeglicht Scans und die Errichtung von Phasegates.
+}
+
+TechNodeLabel_35
+{
+Upgrade Tower
+}
+
+TechNodeHelp_35
+{
+Verbessert Resourcen-Foerderungsrate
+}
+
+TechNodeLabel_36
+{
+Electrical defense
+}
+
+TechNodeHelp_36
+{
+Schockt nahe Gegner.
+}
+
+TechNodeLabel_38
+{
+Heavy Armor
+}
+
+TechNodeHelp_38
+{
+Gibt Heavy Armor an die Soldaten aus.
+}
+
+TechNodeLabel_39
+{
+Jet-Pack
+}
+
+TechNodeHelp_39
+{
+Gibt einem Soldaten einen Jet-Pack.
+}
+
+TechNodeLabel_40
+{
+Infanterie-Portal
+}
+
+TechNodeHelp_40
+{
+Startportal der Soldaten
+}
+
+TechNodeLabel_41
+{
+Resource Tower
+}
+
+TechNodeHelp_41
+{
+Foerdert Resourcen.
+}
+
+
+
+TechNodeLabel_43
+{
+Turret Factory
+}
+
+TechNodeHelp_43
+{
+Ermoeglicht Geschuetztuerme (Turrets).
+}
+
+TechNodeLabel_45
+{
+Arms Lab
+}
+
+TechNodeHelp_45
+{
+Entwickelt Waffen und Ruestungserweiterungen.
+}
+
+TechNodeLabel_46
+{
+Prototype Lab
+}
+
+TechNodeHelp_46
+{
+Experimentelle Technologien
+}
+
+TechNodeLabel_48
+{
+Armory
+}
+
+TechNodeHelp_48
+{
+Zugriff auf neue Waffensysteme.
+}
+
+TechNodeLabel_49
+{
+Advanced Armory
+}
+
+TechNodeHelp_49
+{
+Upgrade zur Advanced Armory
+}
+
+
+TechNodeLabel_50
+{
+Nuke Anlage
+}
+
+TechNodeHelp_50
+{
+Ermoeglicht Nuke Konstruktion.
+}
+
+TechNodeLabel_51
+{
+Observatorium
+}
+
+TechNodeHelp_51
+{
+Aufklaerungs-Technologien
+}
+
+TechNodeLabel_52
+{
+Health nanotech
+}
+
+TechNodeHelp_52
+{
+Ermoeglicht es dem Commander, Healthpacks auszugeben.
+}
+
+TechNodeLabel_53
+{
+Scanner Sweep
+}
+
+TechNodeHelp_53
+{
+Erlaubt kurzzeitigen Einblick in ein Gebiet und enthuellt getarnte Gegner.
+}
+
+TechNodeLabel_55
+{
+Phase Gate
+}
+
+TechNodeHelp_55
+{
+Lichtschneller Transporter.
+}
+
+TechNodeLabel_56
+{
+Turret
+}
+
+TechNodeHelp_56
+{
+Errichtet ein Turret.
+}
+
+TechNodeLabel_57
+{
+Siege Turret
+}
+
+TechNodeHelp_57
+{
+Hochleistungs-Schallwellen-Geschuetz mit enormer Druckwelle.
+Kann durch Waende schiessen.
+}
+
+TechNodeLabel_58
+{
+Command Console
+}
+
+TechNodeHelp_58
+{
+Eine Aushilfsconsole.
+}
+
+
+
+TechNodeLabel_59
+{
+Health
+}
+
+TechNodeHelp_59
+{
+Gibt einem Marine 50 Gesundheitspunkte.
+}
+
+TechNodeLabel_60
+{
+Ammo
+}
+
+TechNodeHelp_60
+{
+Ein Magazin fuer jede  beliebige  Waffe.
+}
+
+
+
+TechNodeLabel_61
+{
+Minen
+}
+
+TechNodeHelp_61
+{
+Fuenf Minen
+}
+
+TechNodeLabel_62
+{
+Welder (Schweissbrenner)
+}
+
+TechNodeHelp_62
+{
+Repariert Strukturen und Armor, beeinflusst schweissbare Stellen und verbrennt Netze.
+}
+
+TechNodeLabel_63
+{
+Med Kit
+}
+
+TechNodeLabel_64
+{
+Shotgun
+}
+
+TechNodeHelp_64
+{
+Fuer den Nahkampf
+}
+
+TechNodeLabel_65
+{
+HMG
+}
+
+TechNodeHelp_65
+{
+Hochleistungs-Sturmgewehr.
+}
+
+TechNodeLabel_66
+{
+Grenade Launcher
+}
+
+TechNodeHelp_66
+{
+Grenade Launcher
+}
+
+TechNodeLabel_67
+{
+Nuke
+}
+
+TechNodeHelp_67
+{
+Ablegbare Mini-Atombombe
+}
+
+TechNodeLabel_69
+{
+Recyceln
+}
+
+TechNodeHelp_69
+{
+Zerstoert diese Struktur und erstattet etwas von den Resourcen zurueck.
+}
+
+TechNodeHelp_80
+{
+Bittet Ihren Commander um Anweisungen. Der Commander wird benachrichtigt, dass Sie etwas unternehmen wollen und kann Ihnen Befehle erteilen.
+}
+
+TechNodeHelp_81
+{
+Teilt Ihrem Commander mit, dass Sie seine Anweisungen verstanden haben. Bewegen Sie sich nun zu Ihrem momentanen Waypoint, um Ihre Befehle auszufuehren. Wenn der Auftrag ausgefuehrt wurde, wird der Waypoint verschwinden.
+}
+
+
+
+TechNodeLabel_85
+{
+Bauen
+}
+
+TechNodeHelp_85
+{
+Grundlegendes Aufbaumenu.
+}
+
+TechNodeLabel_86
+{
+Erweitert
+}
+
+TechNodeHelp_86
+{
+Fortgeschrittenes Aufbaumenu.
+}
+
+TechNodeLabel_87
+{
+Beistand
+}
+
+TechNodeHelp_87
+{
+Unterstuetzungsmenu
+}
+
+TechNodeLabel_88
+{
+Ausruesten
+}
+
+TechNodeHelp_89
+{
+Zurueck zum Hauptmenu (ESC)
+}
+
+TechNodeHelp_90
+{
+Erstellt einen Resource Tower: Er sammelt Resourcen. Kann nur auf einer 'Resource Node' (erkennbar an dem weissen Ausstoss) plaziert werden.
+}
+
+TechNodeHelp_91
+{
+Erstellt eine Offense Chamber: Organisches Geschuetz, das feindliche Spieler und Gebaeude angreift. Schaden: 20
+}
+
+TechNodeHelp_92
+{
+Erstellt eine Defense Chamber: Ermoeglicht Defensiv-Upgrades, heilt Spieler und Strukturen.
+}
+
+TechNodeHelp_93
+{
+Erstellt eine Sensory Chamber: Ermoeglicht dem Team Sensor-Upgrades, tarnt befreundete Einheiten und Strukturen im Umkreis. Blockiert Motion-Tracking
+}
+
+//Hinweis an die Uebersetzer: Hier bin ich aktueller als Flayras Version. Lasst's bitte so.
+TechNodeHelp_94
+{
+Erstellt eine Movement Chamber: Ermoeglicht Bewegungs-Updates, teleportiert Aliens zum entferntesten oder zu einem gerade angegriffenen Hive. Regeneriert die Energie naher Aliens.
+}
+
+TechNodeHelp_95
+{
+Erstellt einen Hive: Ermoeglicht hoehere Lebensformen und Faehigkeiten. Kann nur in einer 'Hive Location' erstellt werden.
+}
+
+//Und zum Zweiten...
+TechNodeHelp_101
+{
+Verbessert deine Panzerung. Jeder Level absorbiert 20% mehr Schaden.
+}
+
+TechNodeHelp_102
+{
+Du heilst Dich Stueck fuer Stueck selbst . Hoehere Level beschleunigen Deine Heilung.
+}
+
+TechNodeHelp_103
+{
+Der Hive wird versuchen, dich vor dem Tode zu retten, indem du zur Heilung zu ihm zurueckteleportiert wirst.
+}
+
+TechNodeHelp_104
+{
+Schaerfe - Dein Nahkampfwaffenschaden ist um die Haelfte gesteigert.
+}
+
+TechNodeHelp_105
+{
+Piercing - Dein Fernwaffenschaden ist um die Haelfte gesteigert.
+}
+
+TechNodeHelp_106
+{
+Penetration - Schiesst durch Waende und Ziele (nicht funktionsfaehig)
+}
+
+TechNodeHelp_107
+{
+Erhoeht Deine Maximalgeschwindigkeit dauerhaft.
+}
+
+TechNodeHelp_108
+{
+Regeneriert deine Energie schneller.  Jeder Level erhoeht die Regenerationsrate um 33%.
+}
+
+TechNodeHelp_109
+{
+Jeder Level daempft deinen Geraeusch-Pegel, bis du schliesslich lautlos bist.
+}
+
+TechNodeHelp_110
+{
+Ruhiges Stillstehn macht Dich fast unsichtbar. Jeder Level verkuerzt die Zeit vor Einsetzen der Tarnung.
+}
+
+TechNodeHelp_111
+{
+Feindliche Spieler hinterlassen eine sichtbare Spur. Hoehere Levels verbessern die Reichweite.
+}
+
+TechNodeHelp_112
+{
+Deine Hive Sight zeigt Dir alle Feinde in einem bestimmten Umkreis an.
+}
+
+TechNodeHelp_113
+{
+Entwicklung zum Skulk.  Dies ist eine schnelle, kleine Kreatur, die sich am besten fuer Guerilla-Taktiken eignet.  Kann an Waenden und Decken laufen (mit 'DUCKEN' deaktivierbar).
+}
+
+TechNodeHelp_114
+{
+Entwicklung zum Gorge. Erschafft und entwickelt Resource Towers, Hives, Upgrade – und Offensive Chambers. Schwach in der Schlacht, kann aber befreundete Spieler und Strukturen heilen
+}
+
+TechNodeHelp_115
+{
+Entwicklung zum Lerk. Ermoeglicht vielseitige Kampfunterstuetzung. Er besitzt fernkampffaehige Spikes, sich ausbreitende Spore- und schuetzende Umbra-Wolken. Durch Druck auf die "Sprung"-Taste kannst Du fliegen.  Halte die "Sprung"-Taste gedrueckt, um zu gleiten.
+}
+
+TechNodeHelp_116
+{
+Entwicklung zum Fade. Ein maechtiger Kaempfer mit gewaltigen Klauen, 'Acid Rocket' Angriff und Teleportation.
+}
+
+TechNodeHelp_117
+{
+Entwicklung zum Onos. Gigantisches Alien, das seine Gegner durch Stampfen laehmen, durch feindliche Reihen stuermen, und Gegner verschlingen kann. Dieses Alien kann es mit mehreren Gegnern geleichzeitig aufnehmen.
+}
+
+
+ClassDead
+{
+Dead
+}
+
+ClassDigesting
+{
+Verdaut
+}
+
+ClassCommander
+{
+Commander
+}
+
+ClassHeavyMarine
+{
+Heavy
+}
+
+ClassReinforcing
+{
+Rein
+}
+
+ClassLevel1
+{
+Skulk
+}
+
+ClassLevel2
+{
+Gorge
+}
+
+ClassLevel3
+{
+Lerk
+}
+
+ClassLevel4
+{
+Fade
+}
+
+ClassLevel5
+{
+Onos
+}
+
+ClassGestating
+{
+Gestating
+}
+
+
+Building
+{
+Im Bau:
+}
+
+
+Researching
+{
+In der Entwicklung:
+}
+
+Energy
+{
+Energie: 
+}
+
+Prerequisite
+{
+Benoetigt:
+}
+
+Cost
+{
+Kosten:
+}
+
+NotFullyBuilt
+{
+Nicht vollstaendig gebaut
+}
+
+Recycling
+{
+Wird recycelt...
+}
+
+ReinforcementsText
+{
+Verstaerkungen:
+}
+
+LogoutText
+{
+LOG OUT
+}
+
+BlipStatus_0
+{
+Feind
+}
+
+BlipStatus_1
+{
+Geschwaechter Feind.
+}
+
+BlipStatus_2
+{
+ 
+}
+
+BlipStatus_3
+{
+Wird angegriffen.
+}
+
+BlipStatus_5
+{
+ist ein Gorge.
+}
+
+BlipStatus_6
+{
+ 
+}
+
+BlipStatus_7
+{
+
+}
+
+BlipStatus_8
+{
+
+}
+
+Friend
+{
+Freund
+}
+
+Enemy
+{
+Feind
+}
+
+User3Name_1
+{
+Soldat
+}
+
+User3Name_2
+{
+Commander
+}
+
+User3Name_3
+{
+Skulk
+}
+
+User3Name_4
+{
+Gorge
+}
+
+User3Name_5
+{
+Lerk
+}
+
+User3Name_6
+{
+Fade
+}
+
+User3Name_7
+{
+Onos
+}
+
+User3Name_8
+{
+Embryo
+}
+
+User3Name_15
+{
+Ausruestung
+}
+
+User3Name_17
+{
+Hive
+}
+
+User3Desc_17
+{
+Aliens werden hier geboren, ermoeglicht den Zugang zu hoeheren Lebensformen und Upgrades.
+}
+
+User3FriendlyDesc_17
+{
+Du startest hier. Der Hive wird Dich heilen, wenn Du in der Naehe bist. Er eroeffnet Dir die "Hive Sight", welche Freunde, Feinde und Warnhinweise anzeigt. Verteidige die Hives um jeden Preis.
+}
+
+User3Name_22
+{
+Resource Nozzle
+}
+
+User3Desc_22
+{
+Foerdert Resourcen, wenn ein Resource Tower auf ihr gebaut ist. Diese Resourcen sind unerschoepflich.
+}
+
+User3CommanderDesc_22
+{
+Foerdert Resourcen, wenn ein Resource Tower auf ihr gebaut ist. Diese Resourcen sind unerschoepflich.
+}
+
+User3Name_23
+{
+Command Console
+}
+
+User3Desc_23
+{
+Wird vom Commander der Marines benutzt, um Strukturen zu errichten und neue Technologien zu erforschen.
+}
+
+User3FriendlyDesc_23
+{
+Wird vom Commander der Marines benutzt, um Strukturen zu errichten und neue Technologien zu erforschen. Ihr Commander wird in der oberen Mitte des Bildschirms angezeigt. Hat Ihr Team keinen Commander, so koennen Sie diese Rolle uebernehmen, indem Sie sich zur Command Console begeben und die BENUTZEN-Taste druecken.
+}
+
+User3CommanderDesc_23
+{
+Waehlen Sie die Command Console aus, um zu sehen, wo Sie Infanterie-Portale errichten koennen. Ist die Command Console zerstoert, koennen Sie nicht mehr auf das Commander-Interface zugreifen. Beschuetzen Sie daher die Command Console um jeden Preis.
+}
+
+User3Name_24
+{
+Turret Factory
+}
+
+User3Desc_24
+{
+Ermoeglicht die Errichtung von Sentry Turrets in Reichweite. Turrets brauchen eine intakte Turret Factory, um weiterhin zu funktionieren. Waehlen Sie die Turret Factory an, um ihre Reichweite zu sehen.
+}
+
+User3Name_25
+{
+Armory
+}
+
+User3Desc_25
+{
+Spendet Munition und ermoeglicht die Ausgabe von  Shotguns, Minen und Weldern innerhalb ihrer Reichweite.
+}
+
+User3CommanderDesc_25
+{
+Spendet Munition und ermoeglicht die Konstruktion von Shotguns, Minen und Weldern innerhalb ihrer Reichweite. Waehlen Sie die Armory aus, um sich deren Reichweite anzeigen zu lassen.
+}
+
+User3FriendlyDesc_25
+{
+"Benutzen" Sie die Armory, um kostenlose Munition fuer Ihre aktive Waffe zu erhalten. Ermoeglicht ausserdem die Ausgabe von Shotguns, Minen und Weldern in ihrer Umgebung.
+}
+
+
+User3Name_26
+{
+Advanced Armory
+}
+
+User3Desc_26
+{
+Spendet Munition und erlaubt die Ausgabe von Heavy Machine Guns und Grenade Launchers in ihrem Umkreis.
+}
+
+User3CommanderDesc_26
+{
+Spendet Munition an befreundete Soldaten. Erlaubt die Ausgabe von Heavy Machine Guns und Grenade Launchers in ihrem Umkreis. Waehlen Sie die 'Advanced Armory' aus, um sich ihre Reichweite anzeigen zu lassen
+}
+
+User3FriendlyDesc_26
+{
+"Benutzen" Sie die Advanced Armory um kostenlose Munition fuer Ihre aktive Waffe zu erhalten.  Ermoeglicht ausserdem die Ausgabe von Heavy Machine Guns und Grenade Launchers in ihrer Umgebung.
+}
+
+User3Name_27
+{
+Arms Lab
+}
+
+User3Desc_27
+{
+Ermoeglicht Zugriff auf Armor- und Waffen-Upgrades.
+}
+
+User3Name_28
+{
+Prototype Lab
+}
+
+User3Desc_28
+{
+Ermoeglicht die Entwicklung von Jet-Packs und Heavy Armor.
+}
+
+User3Name_29
+{
+Observatorium
+}
+
+User3Desc_29
+{
+Beobachtet die naehere Umgebung und enttarnt Feinde in seiner Reichweite. Ermoeglicht den Zugang zum Scanner Sweep, Motion-Tracking und das Absetzen eines Notsignals ('Distress Beacon').
+}
+
+User3Name_30
+{
+Chemlab
+}
+
+User3Name_31
+{
+Medlab
+}
+
+User3Desc_32
+{
+Ermoeglicht die Konstruktion von Baby Nuke Atombomben die durch den Commander gelegt werden koennen und automatisch, falls sie nicht zerstoert werden, nach ein paar Sekunden explodieren.
+}
+
+User3Name_33
+{
+Sentry Turret
+}
+
+User3Desc_33
+{
+Feuert automatisch auf in der Naehe befindliche Feinde.
+}
+
+User3FriendlyName_33
+{
+Feuert automatisch auf feindliche Lebensformen und Gebaeude. Schwach gegen hoeher entwickelte oder aufgeruestete Aliens.  Muss in Reichweite einer Turret Factory stehen, um zu funktionieren.  Schaden: 10
+}
+
+User3CommanderName_33
+{
+Feuert automatisch auf feindliche Lebensformen und Gebaeude. Schwach gegen hoeher entwickelte oder aufgeruestete Aliens.  Muss in Reichweite einer Turret Factory stehen, um zu funktionieren. Waehlen Sie das Turret aus, um seine Reichweite  zu sehen. Kann keine getarnten Feinde erfassen. Wirkungsvoll gegen niedrigstufige Aliens.  Schaden: 23
+}
+
+User3Name_34
+{
+Siege Cannon
+}
+
+User3Desc_34
+{
+Automatische Siege Cannon (ASC).  Schall-Waffe fuer den Einsatz gegen Gebaeude, die selbst durch massive Waende schiessen kann, allerdings keine Spieler direkt verletzt. Kann nur gesichtete Ziele angreifen. 
+Reichweite: 400  Schaden: 165 (Doppelt bei Gebaeuden)
+}
+
+User3FriendlyDesc_34
+{
+Automatische Siege Cannon (ASC).  Schall-Waffe fuer den Einsatz gegen Gebaeude, die selbst durch massive Waende schiessen kann, allerdings keine Spieler direkt verletzt. Kann nur gesichtete Ziele angreifen.
+Reichweite: 400  Schaden: 165 (verdoppelt gegen Gebaeude)
+}
+
+User3CommanderDesc_34
+{
+Automatische Siege Cannon (ASC).  Schall-Waffe fuer den Einsatz gegen Gebaeude, die selbst durch massive Waende schiessen kann, allerdings keine Spieler direkt verletzt. Waehlen Sie das ASC aus, um seine Reichweite zu sehen (es kann alles im gruenen Bereich erfassen, soweit ein Marine oder Scanner Sweep es sichtbar machen).
+Reichweite: 400  Schaden: 165 (verdoppelt gegen Gebaeude)
+}
+
+
+User3Name_35
+{
+Resource Tower
+}
+
+User3Desc_35
+{
+Foerdert in regelmaessigen Abstaenden Resourcen.
+}
+
+User3Name_37
+{
+Infanterie-Portal
+}
+
+User3FriendlyDesc_37
+{
+Bringt Soldaten an die Front. Ohne das Infanterie-Portal koennen keine TSA-Soldaten wiedererscheinen, also bewachen Sie es, so gut es geht.
+} 
+
+User3FriendlyDesc_37
+{
+Bringt Soldaten an die Front. Ohne das Infanterie-Portal koennen keine TSA-Soldaten wiedererscheinen, also bewachen Sie es, so gut es geht.
+}	  
+
+User3CommanderDesc_37
+{
+Bringt Soldaten an die Front.  Ohne das Infanterie-Portal koennen keine TSA-Soldaten wiedererscheinen.
+}
+
+User3Name_38
+{
+Nuke
+}
+
+User3Desc_38
+{
+Nuke (Atombombe) macht sich scharf und muss bevor sie zuendet zerstoert werden! Einmal scharf explodiert die Nuke (Atombombe) mit massiven Schaden  fuer Spieler und Strukturen in ihrer Naehe.
+}
+
+User3FriendlyDesc_38
+{
+Nuke (Atombombe) macht sich scharf, verdeidigen Sie sie bis zum Abschluss. Ein mal scharf explodiert die Nuke (Atombombe) mit massivem Schaden  fuer Spieler und Strukturen in ihrer Naehe.
+}
+
+User3CommanderDesc_38
+{
+Nuke (Atombombe) macht sich scharf, verdeidigen Sie sie bis zum Abschluss. Ein mal scharf explodiert die Nuke (Atombombe) mit massivem Schaden  fuer Spieler und Strukturen in ihrer Naehe.
+}
+
+User3Name_39
+{
+Heavy Armor
+}
+
+User3Desc_39
+{
+Aufnehmen, um Heavy Armor zu erhalten. Kann nicht zusammen mit dem Jet-Pack benutzt werden. Schuetzt vor Sporen.
+}
+
+User3Name_40
+{
+Jet-Pack
+}
+
+User3Desc_40
+{
+Aufnehmen, um den Jet-Pack nutzen zu koennen. Kann nicht mit der Heavy Armor kombiniert werden.
+}
+
+User3Name_41
+{
+Phase Gate
+}
+
+User3Desc_41
+{
+Ermoeglicht die Teleportation zu anderen Phase Gates. Treten Sie auf ein Phasegate und druecken Sie 'BENUTZEN', um sich zu teleportieren. Phase Gates koennen von allen Spielern benutzt werden.
+}
+
+User3CommanderDesc_41
+{
+Ermoeglicht Lichtgeschwindigkeitteleportation zu anderen Phase Gates.  Es werden mehrere Phase Gates benoetigt um einen Effekt zu erzielen.  Phase Gates koennen von allen Spielern benutzt werden.
+}
+
+User3Name_42
+{
+Defense Chamber
+}
+
+User3Desc_42
+{
+Heilt langsam befreundete Spieler und Strukturen in ihrer Naehe. Eroeffnet einen Level von Defensiv-Upgrades (Carapace, Regeneration und Redemption).
+}
+
+User3Name_43
+{
+Movement Chamber
+}
+
+User3Desc_43
+{
+Aliens koennen sich hiermit zum am weitesten entfernten oder einem gerade angegriffenen Hive teleportieren.  Erlaubt ein Level von Bewegungs-Upgrades(Celerity, Adrenaline und Silence).  Wird eine Chamber vernichtet, geht auch das entsprechende Upgrade verloren.
+}
+
+User3FriendlyDesc_43
+{
+Gehe zur Chamber und druecke die "BENUTZEN"-Taste, um Dich zu einem Hive zu teleportieren. Eroeffnet einen Level an Movement Upgrades (Celerity, Adrenaline und Silence).
+}
+
+
+User3Name_44
+{
+Offense Chamber
+}
+
+User3Desc_44
+{
+Organisches Geschuetz, feuert automatisch auf feindliche Spieler und Strukturen.
+}
+
+User3Name_45
+{
+Sensory Chamber
+}
+
+User3Desc_45
+{
+Tarnt nahe Aliens. Erlaubt ein Level von Sensory-Upgrades (Cloaking, Pheromones und Scent Of Fear).
+}
+
+
+User3Name_46
+{
+Resource Tower
+}
+
+User3Desc_46
+{
+Foerdert Resourcen fuer den Feind.
+}
+
+User3FriendlyDesc_46
+{
+Foerdert Resourcen fuer Dein Team.
+}
+
+User3Name_47
+{
+Heavy Armor Modul (schwere Ruestung)
+}
+
+User3Desc_47
+{
+Stattet einen Soldaten mit Heavy Armor aus.
+}
+
+User3FriendlyDesc_47
+{
+Stattet einen Soldaten mit Heavy Armor aus.
+}
+
+User3Name_48
+{
+Jet-Pack Modul
+}
+
+User3Desc_48
+{
+Stattet einen Soldaten mit einem Jet-Pack aus.
+}
+
+User3FriendlyDesc_48
+{
+Stattet einen Soldaten mit einem Jet-Pack aus.
+}
+
+User3Name_49
+{
+Advanced Turret Factory
+}
+
+User3Desc_49
+{
+Ermoeglicht die Errichtung von Sentry Turrets und Siege Cannons.
+}
+
+User3FriendlyDesc_49
+{
+Ermoeglicht die Errichtung von Sentry Turrets und Siege Cannons.
+}
+
+User3Name_57
+{
+Mine
+}
+
+User3Desc_57
+{
+Detoniert bei Kontakt.
+}
+
+User3FriendlyDesc_57
+{
+Detonieren bei Kontakt mit dem Feind.
+}
+
+Weapon1Help
+{
+Gore - Gehe nah an Deinen Feind heran und greife an. Schaden: %d Punkte (verdoppelt gegen Strukturen)
+}
+
+Weapon2Help
+{
+Spit - Leichte Fernkampfwaffe, um den Feind auf Distanz zu halten.  Schaden: %d Punkte
+}
+
+Weapon3Help
+{
+Sporen - verschiesst eine Wolke giftiger Sporen, die allen Feinden im Einflussgebiet langsam schadet.
+Schaden: %d Punkte pro Sekunde
+}
+
+Weapon4Help
+{
+Spikes - Praezise Fernkampfwaffe fuer grosse Distanz.  Schaden: %d Punkte
+}
+
+Weapon5Help
+{
+Bite - Toedliche Nahkampfwaffe. Gehe nahe an den Feind heran und beisse zu. Schaden: %d Punkte
+}
+
+Weapon6Help
+{
+Bite - Toedliche Nahkampfwaffe. Gehe nahe an den Feind  heran  und beisse zu. Schaden: %d Punkte
+}
+
+Weapon7Help
+{
+Swipe - Toedlicher Nahkampf-Angriff. Effektiv gegen Spieler und Gebaeude. Schaden: %d Punkte
+}
+
+Weapon8Help
+{
+Webs - Schiesse Troepfchen an zwei gegenueberliegende Waende, und ein Web wird zwischen ihnen erscheinen.  Webs bremsen Gegner und macht sie kurzzeitig kampfunfaehig. Webs koennen mit Weldern verbrannt werden.
+}
+
+Weapon9Help
+{
+Metabolize - Erlaubt die Regeneration von Energie und Schaeden.
+}
+
+Weapon10Help
+{
+Parasit - Infiziert das Ziel mit einem Parasiten und macht es in der Hive Sicht fuer alle Zeit sichtbar. Der Parasit kann nicht entfernt werden. Schaden: %d Punkte
+}
+
+Weapon11Help
+{
+Blink - Quasi-Teleportation.
+}
+
+Weapon12Help
+{
+Xenocide - Explosiver Selbstmordangriff.  Kurz nach der Aktivierung wirst Du detonieren und in deiner Umgebung grosse Verwuestung anrichten.  Schaden: %d Punkte (verdoppelt gegen Strukturen)
+}
+
+Weapon13Help
+{
+Messer - Waffe der Sparsamen und der Verzweifelten. Schaden : %d Punkte
+}
+
+Weapon14Help
+{
+Pistole - Durchschlagkraeftige und auesserst genaue Waffe, aber mit kleinem Magazin. Schaden: %d Punkte
+}
+
+Weapon15Help
+{
+LMG - Praezise Waffe mit hoher Feuerrate und mittelgrossem Magazin. Feuerrate: 10 Kugeln pro Sekunde. Schaden: %d Punkte
+}
+
+Weapon16Help
+{
+Shotgun - Fuer schnelle Ziele und maximalen Schaden auf kurze Distanz. Feuerrate: 10 Pellets pro Schuss. Schaden pro Pellet: %d Punkte
+}
+
+Weapon17Help
+{
+Heavy Machine Gun (HMG) - Schweres Maschienengewehr fuer grosse Ziele und zur Verteidigung. Ihre Ungenauigkeit wird durch hohe Feuerrate und grosse Magazinkapazitaet mehr als wett gemacht. Schaden: %d Punkte pro Kugel (halbiert gegen Strukturen).
+}
+
+Weapon18Help
+{
+Welder - Weniger eine Waffe als ein Werkzeug. Schweisst bestimmte Punkte im Level auf oder zu.  Der Welder kann ausserdem zum Reparieren von Gebaeuden und Armor und zum Verbrennen von Webs benutzt werden.  Schaden: %d Punkte
+}
+
+Weapon19Help
+{
+Minen - Geeignet zur Verteidigung. Explodieren bei Feindannaeherung. Schaden: %d Punkte
+}
+
+Weapon20Help
+{
+Grenade Launcher - Eine wahre Massenvernichtungswaffe. Granaten detonieren nach 4 Sekunden und haben einen grossen Wirkungsradius.  Schaden: %d Punkte (verdoppelt gegen Strukturen)
+}
+
+Weapon21Help
+{
+Leap - Schneller Sprung vorwaerts, verletzt alles in Deinem Weg. Hilfreich zur Fortbewegung und im Kampf. Schaden: %d Punkte
+}
+
+Weapon22Help
+{
+Charge – Laesst Dich wild nach vorne stuermen und alles in Deiner Bahn und beschaedigen. Der Angriff verbraucht nach und nach Energie und endet, sobald Du keine Energie mehr besitzt.  Schaden: Unglaublich.
+}
+
+Weapon23Help
+{
+Umbra - Sondert einen Bakterien-Nebel ab, der feindliche Geschosse abbremst. Jede verbuendete Struktur oder Spieler in der Umbra wird sehr selten getroffen, allerdings wirkt sich dies nicht auf Explosiv-Schaden und Nicht-Projektil-Geschosse aus. Dauer: %d Sekunden.
+}
+
+Weapon24Help
+{
+Primal Scream - Alle Teamkollegen in Reichweite bekommen schneller Energie zurueck, koennen sich schneller bewegen, und richten mehr Schaden an. Hoer Ihre Antwort!
+}
+
+Weapon25Help
+{
+Bile Bomb - Organische Artillerie, die feindliche Gebaeude in sehr grossem Radius beschaedigt. Schaden: %d Punkte (ausschlieslich Gebaeude)
+}
+
+Weapon26Help
+{
+Acid Rocket - Langsam fliegendes Geschoss, das bei Aufprall in eine Saeurewolke zerplatzt. Schaden: %d Punkte
+}
+
+Weapon27Help
+{
+Healing Spray - Bakterielles Spray, das befreundete Spieler und Strukturen heilt und Feinde schaedigt.  Hat geringe Reichweite, kann jedoch durch Strukturen und Waende hindurch wirken. Schaden: %d Punkte
+}
+
+Weapon28Help
+{
+Babbler - Erschafft einen "Babbler", eine schwache Ausfuehrung des Skulks.  Babbler suchen sich ihre Ziele selber, haben jedoch eine sehr gringe Lebensdauer.  Schaden: 20 (Bite), 40 (Xenocide)
+} 
+
+Weapon29Help
+{
+Stomp - Betaeubt Gegner fuer %d Sekunden
+}
+
+Weapon30Help
+{
+Devour - Verschlingt einen nahen Feind, der dann langsam verdaut wird und %d Punkte Schaden pro Sekunde nimmt. Der Onos heilt um diese Anzahl an Punkten. Sollte er vor der vollstaendigen Verdauung des Opfers selbst sterben, kommt dieses stark geschwaecht wieder zum Vorschein.
+}
+
+CommandStationOtherTeam
+{
+Diese Command Console gehoert dem anderen Team.
+}
+
+CommandStationInUse
+{
+Ihr Team hat schon einen Commander, die Command Console kann nicht benutzt werden.
+}
+
+WeaponPreventingCommandStation
+{
+Ihre Waffe verhindert das Benutzen der Command Console.
+}
+
+CommandStationDestroyed
+{
+Diese Commando Console ist zerstoert und kann nicht mehr benutzt werden.
+}
+
+CommandStationWaitTime
+{
+Sie muessen noch etwas warten, bevor Sie die Command Console wieder benutzen koennen.
+}
+
+
+// Particle editing commands
+$position -1 0.7
+NoParticleSystem
+{
+Dieses Partikel-System konnte nicht gefunden werden.
+}
+
+EditingParticleSystem
+{
+Partikel-System wurde gefunden, druecke F7 um es zu bearbeiten
+}
+
+
+// Marine help text
+
+// Armor received messages
+$position -1 0.45
+$effect 0
+$fadein 0.5
+$fadeout 0.5
+$holdtime 5.0
+
+HelpTextCSAttractMode
+{
+Zielen Sie auf die Command Console und druecken Sie Ihre "Benutzen"-Taste, um den Command Mode zu aktivieren.
+}
+
+HelpTextArmoryResupply
+{
+"Benutzen" Sie die Armory, um kostenlose Munition fuer Ihre aktive Waffe zu erhalten.
+}
+
+HelpTextAttackNearbyStation
+{
+Das ist die Commando Console des Feindes, attackieren Sie die Console.
+}
+
+HelpTextBuildTurret
+{
+Zielen Sie auf das Turret und halten Sie Ihre "Benutzen"-Taste gedrueckt, um es zu bauen.
+}
+
+HelpTextBuildTower
+{
+Zielen Sie auf den Resource Tower und halten Sie Ihre "Benutzen"-Taste gedrueckt, um ihn zu bauen.
+}
+
+HelpTextExplainTower
+{
+Dieser aktive 'Resource-Tower' bringt Ihrem Team regelmaessig Resourcen ein.
+}
+
+HelpTextAttackHive
+{
+Sammeln Sie sich mit ihren Teamkammeraden. Finden Sie den Hive und zerstoeren ihn!
+}
+
+HelpTextOtherHiveBuilding
+{
+Nur ein Hive kann auf einmal gebaut werden. Warte etwas.
+}
+
+HelpTextEmptyHiveNotNearby
+{
+Du kannst einen Hive nur an einer freien Hive-Location errichten (suche nach infiziertem Gebiet und einem durchsichtigen Indikator).
+}
+
+HelpTextAttackNearbyHive
+{
+Es ist ein Hive in der Naehe! Zerstoeren Sie ihn, um die Aliens zu stoppen!
+}
+
+HelpTextFriendlyMovementChamber
+{
+Gehe zur Chamber und druecke die "Benutzen"-Taste, um Dich zu einem angegriffenen Hive zu teleportieren! Zusaetzlich regeneriert sie Deine Energie.
+}
+
+HelpTextAttackMovementChamber
+{
+Dies ist eine feindliche Movement Chamber. Sie erlaubt es dem Gegner, sich zu dessen Hive zu teleportieren. Zusaetzlich regeneriert sie seine Energie.
+}
+
+HelpTextFriendlyOffensiveChamber
+{
+Das ist eine Offense Chamber, sie schiesst auf Feinde.
+}
+
+HelpTextAttackOffensiveChamber
+{
+Vorsicht, dies ist eine feindliche Offense Chamber!
+}
+
+HelpTextFriendlyDefensiveChamber
+{
+Diese Defense Chamber regeneriert nahe Spieler und Strukturen.  Dabei stoesst sie jedoch deutlich hoerbare "schluckende" Geraeusche aus...
+}
+
+HelpTextAttackDefensiveChamber
+{
+Dies ist eine feindliche Defensive Chamber. Sie kann gegnerische Spieler und Strukturen heilen.
+}
+
+HelpTextFriendlySensoryChamber
+{
+Dies ist eine Sensory Chamber, sie verbirgt nahe Aliens.
+}
+
+HelpTextAttackSensoryChamber
+{
+Dies ist eine feindliche Sensory Chamber.
+}
+
+HelpTextOpenWeldable
+{
+Dieser Bereich kann mit einem Welder geoeffnet werden.
+}
+
+HelpTextCloseWeldable
+{
+Dieser Bereich kann mit einem Welder geschlossen werden.
+}
+
+HelpTextPhaseGate
+{
+Betreten Sie das Phase Gate und druechen Sie 'BENUTZEN', um den Teleport einzuleiten.
+}
+
+HelpTextAlienPopupMenu
+{
+Benutze Dein "pop-up menu" um Strukturen zu errichten, Upgrades zu entwickeln, und die Teams zu wechseln. (rechte Maustaste).
+}
+
+HelpTextMarinePopupMenu
+{
+Benutzen Sie Ihr "Pop-Up menu" um zu funken, nach Befehlen zu fragen, Teams zu wechseln und fuer vieles mehr (rechte Maustaste).
+}
+
+HelpTextOrder
+{
+Der Commander hat Ihnen einen Befehl erteilt.  Der blaue Kreis auf Ihrem Display zeigt Ihnen Ort und Typ des Befehls.  Benutzen Sie ihr "Pop-Up menu" um Befehle zu erfragen oder zu bestaetigen.
+}
+
+HelpTextCommanderUseable
+{
+Als Commander koennen Sie jeden Schalter durck Linksklick der Maus "Benutzen".
+}
+
+HelpTextMarineCommandMenu
+{
+Druecken Sie Ihre "Pop-Up menu"-Taste um mit Ihrem Team zu kommunizieren (standardmaessig Rechte Maustaste).
+}
+
+HelpTextResourceDropoff
+{
+Sie haben Resouren fuer ihr Team bekommen.
+}
+
+HelpTextJetpacks
+{
+Ihr Commander hat die Jet-Pack Technologie erforscht. Halten Sie Ihre "Sprung"-Taste gedrueckt, um es zu aktivieren.
+}
+
+HelpTextAlienCommandMenu
+{
+Benutze Dein "Pop-Up Menu", um Dich in andere Lebensformen zu entwickeln, und Upgrades zu erhalten (standardmaessig Rechte Maustaste).
+}
+
+HelpTextAttackTower
+{
+Dieser Resource Tower sammelt Resourcen fuer den Feind! Zerstoere ihn!
+}
+
+HelpTextAlienWeapons
+{
+Benutze das Mausrad oder die Zifferntasten, um zwischen den einzelnen Faehigkeiten zu wechseln. Ein rotes Symbol bedeutet, dass die Faehigkeit erst mit mehr Hives freigeschalten wird.
+}
+
+HelpTextAlienResources
+{
+Der blaue Balken link zeigt Deine Resourcen. Du erhaelst Resourcen von den Resource Towers deines Teams.
+}
+
+HelpTextAlienEnergy
+{
+Der gelbe Balken rechts zeigt Deine Energie. Der Einsatz von Faehigkeiten kostet Dich Energie.
+}
+
+HelpTextAlienPendingUpgrades
+{
+Die kleinen blinkenden Symbole am rechten Bildschirmrand zeigen Dir an, dass Du nun neue Eigenschaften entwickeln kannst!  Oeffne das "Pop-Up Menu", um eines dieser Upgrades auszuwaehlen.
+}
+
+HelpTextAlienBuildStructure
+{
+Als ein Arbeiter-Alien kannst Du mithilfe deines "Pop-Up menus" Strukturen erschaffen.
+}
+
+HelpTextAlienBuildStructure
+{
+Eine unfertige Struktur ist in der Naehe. Alien-Strukturen entwickeln sich langsam von alleine, aber als Gorge kannst Du diesen Prozess beschleunigen. Ziele auf die Struktur und halte Deine "Benutzen"-Taste gedrueckt, um sie zu bauen.
+}
+
+HelpTextAlienHiveSight
+{
+Die gluehenden Icons repraesentieren die sog. "hive sight" Deines Teams, die alle befreundeten Einheiten und Strukturen, sowie Gegner mit Parasitenbefall anzeigt.
+}
+
+HelpTextAlienVisionMode
+{
+}
+
+HelpTextAlienCommunication
+{
+Ueber die "Hive Sight" bist Du staendig mit Deinem Team in Kontakt. So werden alle Verbuendeten sofort erfahren, wenn einer von ihnen angegriffen wird - sein Icon wird rot blinken. Achte auf solche Meldungen, und komm' den Anderen zur Hilfe!
+}
+
+HelpTextAlienUnderAttack
+{
+Einer deiner Teamkollegen oder eine Struktur wird angegriffen. Dreh' Dich umher und such nach der Warnmeldung in der Hive Sight.
+}
+
+HelpTextBuilder
+{
+Du bist nun ein Gorge. Meide den Kampf und benutze dein "Pop-Up menu", um unterschiedliche Strukturen zu erschaffen.
+}
+
+HelpTextWeb
+{
+Schiesse Troepfchen an zwei gegenueberliegende Waende, und ein Web wird zwischen ihnen erscheinen.  Webs bremsen Gegner und machen sie kurzzeitig kampfunfaehig.
+}
+
+HelpTextWallwalking
+{
+Du kannst deine "Ducken"-Taste gedrueckt halten, um von Waenden oder Decken abzuspringen.
+}
+
+HelpTextBite
+{
+Gehe nah an den Feind heran und druecke Deine "Feuer" Taste um, ihn zu beissen.
+}
+
+HelpTextFlight
+{
+Versuche durch wiederholtes Druecken der "Springen"-Taste zu fliegen. Du kannst die "Springen"-Taste gedrueckt halten, um zu gleiten.
+}
+
+HelpTextSpores
+{
+Druecke Deine "Feuer"-Taste, um eine Spore-Cloud auszustossen, die Feinde verletzt.
+}
+
+HelpTextAlienResource
+{
+Finde eine Resource Node und baue einen Resource Tower auf ihr, um Resourcen fuer dein Team zu sammeln.
+}
+
+HelpTextPopupMenu
+{
+Die rechte Maustaste (Altern. Feuer) aktiviert das 'Pop-Up Menu'.
+}
+
+HelpTextBuyUpgrade
+{
+Aliens koennen ueber das "Pop-Up menu" neue Faehigkeiten entwickeln.  Versuche es: Halte deine "Pop-Up menu"-Taste (rechte Maustaste) und bewege den Cursor nach rechts.
+}
+
+HelpTextBuyLifeform
+{
+Aliens koennen sich zu neuen Lebensformen weiterentwickeln.  Versuche es: Halte deine "Pop-Up menu"-Taste (rechte Maustaste) , bewege den Curser herunter und dann nach rechts.
+}
+
+HelpTextCommanderGiveOrders
+{
+Rechts-Klicken Sie auf den Boden oder eine Struktur, um einen Befehl erteilen.
+}
+
+HelpTextCommanderSelectPlayers
+{
+Links-Klicken auf einen Spieler oder ziehen Sie ein Rahmen auf, um ihn anzuwaehlen.
+}
+
+HelpTextCommanderLogout
+{
+Sie koennen den Commander-Modus verlassen, indem Sie auf den roten "Log-Out" Button klicken.
+}
+
+// This message isn't in yet
+HelpTextCommanderBuild
+{
+Dieses Gebaeude ist nicht fertig gebaut. Waehlen Sie einen Spieler aus und klicken Sie mit der rechten Maustaste auf das Gebaeude, um einen Baubefehl zu erteilen.
+}
+
+HelpTextCommanderUse
+{
+Tueren, Fahrstuehle und andere Geraete koennen vom Commander "gehackt" werden.  Klicken Sie links, um sie zu aktivieren.
+}
+
+HelpTextCommanderAttack
+{
+Dieses Ziel kann angegriffen werden! Recht-klicken Sie, um den Angriffsbefehl zu erteilen.
+}
+
+HelpTextCommanderWeld
+{
+Dieses Ziel kann gewelded werden. Kaufen Sie einem Spieler einen Welder und klicken Sie mit der Rechten Maustaste, um ihm einen Weld-Befehl zu erteilen.
+}
+
+HelpTextCommanderGet
+{
+Rechts-Klicken Sie hier, um einen Befehl zum Aufnehmen zu erteilen.
+}
+
+HelpTextCommanderUnderAttack
+{
+Sie werden angegriffen!  Druecken Sie ihre "Sprung"-Taste, um zum Alarm zu gehen.
+}
+
+HelpTextCommanderResearchComplete
+{
+Ihre Forschung ist abgeschlossen. Druecken Sie ihre "SPRINGEN" Taste, um zu dem Platz der Forschung zu gelangen.
+}
+
+HelpTextCommanderUpgradeComplete
+{
+Ihr Upgrade ist fertiggestellt. Druecken Sie ihre "SPRINGEN" Taste, um zu der Upgradeten Struktur zu gelangen.
+}
+
+JetpackEnergyHUDText
+{
+Jet-Pack Energie
+}
+
+HelpTextDisableHelp
+{
+Sie koennen diese Tips abschalten, indem Sie in ihrem "multiplayer customization menu " die Option "show hints" abschalten (cl_autohelp 0).
+}
+
+Paralyzed
+{
+Paralysiert
+}
+
+Stunned
+{
+Gelaehmt
+}
+
+Digested
+{
+Wird verdaut...
+}
+
+DigestingPlayer
+{
+Verdaut %s...
+}
+
+Parasited
+{
+Parasit entdeckt
+}
+
+PrimalScreamed
+{
+Primal Scream
+}
+
+Umbraed
+{
+Im Umbra
+}
+
+Webbed
+{
+Verfangen
+}
+
+// Order descriptions
+Order2
+{
+Gehen Sie zum Wegpunkt.
+}
+
+Order3
+{
+Greifen Sie das Ziel an.
+}
+
+Order4
+{
+Bauen Sie %s
+}
+
+Order5
+{
+Bewachen Sie %s
+}
+
+Order6
+{
+Benutze Welder beim Wegpunkt.
+}
+
+Order7
+{
+%s aufnehmen.
+}
+
+Order9
+{
+Halten Sie Ihre Position
+}
+
+Range
+{
+%d Meter
+}
+
+// Timelimit for tourny mode
+GameTime
+{
+Spielzeit
+}
+
+Elapsed
+{
+vergangen
+}
+
+TimeLimit
+{
+Limit
+}
+
+Remaining
+{
+verbleibend
+}
+
+// HLTV 
+Spec_duck
+{
+Press DUCK for Spectator Menu
+}
+
+SPECT_OPTIONS
+{
+Options
+}
+
+CAM_OPTIONS
+{
+Camera Options
+}
+
+SpecMode5Text
+{
+}
+
+OBS_MAP_FREE
+{
+Map free camera
+}
+
+OBS_MAP_CHASE
+{
+Map chase camera
+}
+
+OBS_CHASE_FREE
+{
+Free chase camera
+}
+
+OBS_CHASE_LOCKED
+{
+Locked chase camera
+}
+
+OBS_IN_EYE
+{
+In-eye camera
+}
+
+OBS_ROAMING
+{
+Free look camera
+}
+
+// Official map locations
+testlocation1
+{
+The translated refinery
+}
+
+/////////////
+// ns_bast //
+/////////////
+bastlocation_dockingbay
+{
+Marine Start - Docking Bay 1
+}
+
+bastlocation_mainjunction
+{
+Main Aft Junction
+}
+
+bastlocation_cargolock
+{
+Heavy Lock Door
+}
+
+bastlocation_atmosphericprocessing
+{
+Atmospheric Processing
+}
+
+bastlocation_furnace
+{
+Steam Generation
+}
+
+bastlocation_watertreatment
+{
+Water Treatment
+}
+
+// NOTE: The hyphen in hive location names is important.  Everything before the hyphen is trimmed off when displaying
+// location names for aliens (the hive icons in the upper right of their HUD).  Make sure to follow the convention:
+// Hive Location - name
+bastlocation_feedwatercontrol
+{
+Hive Location - Feedwater Control
+}
+
+bastlocation_trammaintenance
+{
+Tram Maintenance
+}
+
+bastlocation_tramtunnel
+{
+Tram Tunnel
+}
+
+bastlocation_lowerjunction
+{
+Lower Junction
+}
+
+bastlocation_Refinery
+{
+Hive Location - Refinery
+}
+
+bastlocation_emshaft
+{
+EM Drill Shaft
+}
+
+bastlocation_engineroom
+{
+Hive Location - Engine Room
+}
+
+bastlocation_dockinghydraulics
+{
+Docking Hydraulics
+}
+
+bastlocation_maintenancejunction
+{
+Maintenance Junction
+}
+
+bastlocation_ncorridor
+{
+"N" Corridor
+}
+
+bastlocation_observationbridge
+{
+Observation Bridge
+}
+
+bastlocation_starboardairlock
+{
+Starboard Airlock
+}
+
+bastlocation_portairlock
+{
+Port Airlock
+}
+
+bastlocation_maintenanceaccess
+{
+Maintenance Access Duct
+}
+
+bastlocation_pressureequalization
+{
+Pressure Equalization Conduit
+}
+
+bastlocation_starboardcorridor
+{
+Aft Starboard Corridor
+}
+
+bastlocation_filtration
+{
+Feedwater Filtration Access
+}
+
+bastlocation_ventilation
+{
+Ventilation Conduit
+}
+
+bastlocation_databank
+{
+Databank Access
+}
+
+bastlocation_enginecorridor
+{
+Engine Corridor
+}
+
+/////////////
+// ns_hera //
+/////////////
+heralocation_archive
+{
+Hive Location - Archiving
+}
+
+heralocation_processingcorea
+{
+Data Core Alpha
+}
+
+heralocation_reception
+{
+Hera Entrance and Reception
+}
+
+heralocation_holoroom
+{
+Central Monitoring - 'Holoroom'
+}
+
+heralocation_storage
+{
+General Cargo Storage
+}
+
+heralocation_hanger
+{
+Marine Start - Loading bay
+}
+
+heralocation_docking
+{
+Marine Start - Landing Pad
+}
+
+heralocation_processing
+{
+Processing
+}
+
+heralocation_processingcoreb
+{
+Hive Location - Data Core Delta
+}
+
+heralocation_ventilation
+{
+Hive Location - Ventilation 3-C
+}
+
+heralocation_maintenence
+{
+Maintenance
+}
+
+heralocation_fogcorridor
+{
+Maintenance Corridor
+}
+
+heralocation_tube
+{
+Hera Entrance Walkway
+}
+
+// Nothing titles
+nothinglocation_rr
+{
+Space Station Nothing - Sub Sector 77
+}
+
+nothinglocation_ms
+{
+Marine Start - S77 Vestibule
+}
+
+nothinglocation_dock
+{
+Docking Wing 01
+}
+
+nothinglocation_thres1
+{
+The Threshold
+}
+
+nothinglocation_thres2
+{
+The Threshold
+}
+
+nothinglocation_junc1
+{
+The Junction
+}
+
+nothinglocation_junc2
+{
+The Junction
+}
+
+nothinglocation_vent
+{
+Ventilation Chamber
+}
+
+nothinglocation_comm
+{
+Communications Hub 063
+}
+
+nothinglocation_things
+{
+Room With Things
+}
+
+nothinglocation_cargo
+{
+Hive Location - Cargo Bay Foyer
+}
+
+nothinglocation_pipe
+{
+Pipe Room
+}
+
+nothinglocation_paint1
+{
+Painted Corridor
+}
+
+nothinglocation_paint2
+{
+Painted Corridor
+}
+
+nothinglocation_paint3
+{
+Painted Corridor
+}
+
+nothinglocation_quada
+{
+Quad Lift Area
+}
+
+nothinglocation_quad
+{
+Quad Lift
+}
+
+nothinglocation_chamb
+{
+Foreboding Antechamber
+}
+
+nothinglocation_sas1
+{
+Silo Access South
+}
+
+nothinglocation_sas2
+{
+Silo Access South
+}
+
+nothinglocation_silo
+{
+Hive Location - PowerSilo
+}
+
+nothinglocation_san1
+{
+Silo Access North
+}
+
+nothinglocation_san2
+{
+Silo Access North
+}
+
+nothinglocation_mias1
+{
+Miasma Walkway
+}
+
+nothinglocation_mias2
+{
+Miasma Walkway
+}
+
+nothinglocation_mias3
+{
+Miasma Walkway
+}
+
+nothinglocation_gen
+{
+Generator Room
+}
+
+nothinglocation_elev1
+{
+Elevator Shaft 01
+}
+
+nothinglocation_elev2
+{
+Elevator Shaft 02
+}
+
+nothinglocation_eek
+{
+Intimidation
+}
+
+nothinglocation_kismet
+{
+Ominous Kismet
+}
+
+nothinglocation_vae
+{
+Viaduct Access East
+}
+
+nothinglocation_vaw
+{
+Viaduct Access West
+}
+
+nothinglocation_viaduct
+{
+Hive Location - The Great Viaduct
+}
+
+// TANITH info_location data START
+tanith_westenter
+{
+Western Entrance
+}
+
+tanith_marinebase
+{
+Marine Start - Uplink Command
+}
+
+tanith_outsidebase
+{
+Exterior Access Paths
+}
+
+tanith_north
+{
+Northern Corridor
+}
+
+tanith_sat
+{
+External Satellite Relay
+}
+
+tanith_satcomm
+{
+Hive Location - Satellite Communications
+}
+
+tanith_transport
+{
+Chemical Transport Room
+}
+
+tanith_cpu
+{
+Computer Control
+}
+
+tanith_acid
+{
+Acidic Solution Processing
+}
+
+tanith_reactor
+{
+Reactor Room
+}
+
+tanith_enter
+{
+Eastern Entrance
+}
+
+tanith_centerenter
+{
+Central Entrance
+}
+
+tanith_east
+{
+East Access Tunnels
+}
+
+tanith_research
+{
+Research Labs
+}
+
+tanith_rr
+{
+Tanith Ready Room
+}
+tanith_waste
+{
+Hive Location - Waste Handling
+}
+
+tanith_central
+{
+Central Access Tunnels
+}
+
+tanith_storageenter
+{
+Storage Entrance
+}
+
+tanith_cargo
+{
+Cargo Storage
+}
+
+tanith_fusion
+{
+Hive Location - Fusion Reactor
+}
+
+tanith_west
+{
+West Access Corridor
+}
+// TANITH info_location data END
+
+
+// NANCY info_location data START
+nancy_cargo
+{
+Cargo Hold 2
+}
+
+nancy_aux
+{
+Auxillary Command
+}
+
+nancy_engine
+{
+Port Engine Room
+}
+
+nancy_crawl
+{
+Sub-tunnel
+}
+
+nancy_maint
+{
+Maintenance Shaft
+}
+
+nancy_shaft
+{
+Maintenance Shaft
+}
+
+nancy_mother
+{
+Mother
+}
+
+nancy_lockers
+{
+Crew Lockers
+}
+
+nancy_mess
+{
+Mess Hall
+}
+
+nancy_airlock
+{
+Airlock Exchange
+}
+
+nancy_port
+{
+Port Airlock
+}
+
+nancy_bridge
+{
+Bridge
+}
+
+nancy_cockpit
+{
+Cockpit
+}
+
+nancy_star
+{
+Starboard Airlock
+}
+
+nancy_gen
+{
+Auxiliary Generators
+}
+
+nancy_motherinter
+{
+Mother Interface
+}
+
+nancy_subspace
+{
+Subspace Array Interface
+}
+
+nancy_crew
+{
+Crew Quarters
+}
+// NANCY info_location data END
+
+// CAGED info_location data START
+caged_marine
+{
+Marine Spawn - Main Hold
+}
+
+caged_upsewer
+{
+Upper Sewer
+}
+
+caged_dsewer
+{
+Lower Sewer
+}
+
+caged_hive1
+{
+Hive Location - Sewer
+}
+
+caged_hive2
+{
+Hive Location - Ventilation System
+}
+
+caged_hive3
+{
+Hive Location - Generator
+}
+
+caged_pure
+{
+Purification Station 01
+}
+
+caged_central
+{
+Central Processing
+}
+
+caged_vaccess
+{
+Ventilation Access
+}
+
+caged_work
+{
+Stability Monitoring
+}
+
+caged_auxgen
+{
+Auxiliary Generator
+}
+
+caged_service
+{
+Shipping Tunnels
+}
+
+caged_area2
+{
+Upper Shipping Access
+}
+// CAGED info_location data END
+
+// Eclipse info_location... info. (BEGIN)
+eclipse_dock
+{
+Docking Control
+}
+
+eclipse_marinespawn
+{
+Marine Spawn - Cargo Transfer
+}
+
+eclipse_station
+{
+Station Access
+}
+
+eclipse_stationeast
+{
+Station Access East
+}
+
+eclipse_stationalpha
+{
+Station Access Alpha
+}
+
+eclipse_stationwest
+{
+Station Access West
+}
+
+eclipse_triad
+{
+Triad Generator Array
+}
+
+eclipse_triadb
+{
+Triad Access B
+}
+
+eclipse_access1c
+{
+Access Corridor 1C
+}
+
+eclipse_access1b
+{
+Access Corridor 1B
+}
+
+eclipse_access1a
+{
+Primary Access Corridor 1A
+}
+
+eclipse_horseshoe
+{
+The Horseshoe
+}
+
+eclipse_tjunct
+{
+T-Junction
+}
+
+eclipse_keyhole
+{
+The Keyhole
+}
+
+eclipse_maint
+{
+Hive - Maintenance Access
+}
+
+eclipse_south
+{
+South Loop
+}
+
+eclipse_core
+{
+Hive - Computer Core
+}
+
+eclipse_northcore
+{
+North Core Access
+}
+
+eclipse_westcore
+{
+West Core Access
+}
+
+eclipse_subjunct
+{
+Power Sub-Junction 3
+}
+
+eclipse_access1d
+{
+Access Corridor 1D
+}
+
+eclipse_commandnorth
+{
+Command Access North
+}
+
+eclipse_command
+{
+Hive - Eclipse Command
+}
+
+eclipse_genmon
+{
+Primary Generator Monitors
+}
+
+eclipse_commandsouth
+{
+Command Access South
+}
+
+eclipse_access1a
+{
+Access Corridor 1A
+}
+// Eclipse info_location... info. (END)
+
+
+// Veil info_location (START)
+
+veil_marine
+{
+Marine Spawn - Mobile Command Interface
+}
+
+veil_lifteast
+{
+Lift 5 East
+}
+
+veil_swhive
+{
+Hive - Sub-Sector 5B Access
+}
+
+veil_south
+{
+Hive - Cargo Transfer South
+}
+
+veil_southeast
+{
+Hive - The Pipeline
+}
+
+veil_overlook
+{
+The Overlook
+}
+
+veil_topography
+{
+Topographical Analysis
+}
+
+veil_nano
+{
+NanoGrid Status
+}
+
+veil_dome
+{
+The Dome
+}
+
+veil_y
+{
+Y Junction
+}
+
+veil_skylight
+{
+West Skylights
+}
+
+veil_satellite
+{
+Satellite Feed
+}
+
+veil_pod1
+{
+Monitoring Pod 1
+}
+
+veil_pod2
+{
+Monitoring Pod 2
+}
+
+veil_waypointing
+{
+System Waypointing
+}
+
+veil_nanoeast
+{
+NanoGrid Access East
+}
+
+veil_nanowest
+{
+NanoGrid Access West
+}
+
+veil_c12
+{
+Emergency Nozzle C-12
+}
+
+veil_junctionwest
+{
+West Junction
+}
+
+veil_junctioneast
+{
+East Junction
+}
+
+veil_power
+{
+Power Core Status
+}
+
+// Veil info_location (END)
+
+
+
+// Tutorial text
+$position 0.15 0.15
+$effect 2
+$color 0 200 0
+$color2 0 255 0
+$fadein 0.04
+$fxtime 0.1
+$holdtime 6.0
+$fadeout 0.5
+
+TutWelcome
+{
+Welcome to Natural Selection Training.
+
+Here you will learn the basic rules of the game.
+
+Walk through a door to choose your training.
+If you are a new to first-person shooters, marine
+training is recommended.
+}
+
+TutWelcomeMarineTraining
+{
+You've chosen Marine training.  Here you will 
+learn what it takes to be a Frontiersman and how 
+to fight the alien race.
+}
+
+TutWelcomeAlienTraining
+{
+You've chosen Alien training.  Here you will 
+learn how to spread your influence throughout 
+the galaxy, and obliterate the human oppressors.
+}
+
diff --git a/main/gfx.wad b/main/gfx.wad
new file mode 100644
index 00000000..8a8c09ec
Binary files /dev/null and b/main/gfx.wad differ
diff --git a/main/gfx/env/Nebular_bk.tga b/main/gfx/env/Nebular_bk.tga
new file mode 100644
index 00000000..7f0f26fb
Binary files /dev/null and b/main/gfx/env/Nebular_bk.tga differ
diff --git a/main/gfx/env/Nebular_dn.tga b/main/gfx/env/Nebular_dn.tga
new file mode 100644
index 00000000..9964a103
Binary files /dev/null and b/main/gfx/env/Nebular_dn.tga differ
diff --git a/main/gfx/env/Nebular_ft.tga b/main/gfx/env/Nebular_ft.tga
new file mode 100644
index 00000000..9964a103
Binary files /dev/null and b/main/gfx/env/Nebular_ft.tga differ
diff --git a/main/gfx/env/Nebular_lf.tga b/main/gfx/env/Nebular_lf.tga
new file mode 100644
index 00000000..9964a103
Binary files /dev/null and b/main/gfx/env/Nebular_lf.tga differ
diff --git a/main/gfx/env/Nebular_rt.tga b/main/gfx/env/Nebular_rt.tga
new file mode 100644
index 00000000..383da160
Binary files /dev/null and b/main/gfx/env/Nebular_rt.tga differ
diff --git a/main/gfx/env/Nebular_up.tga b/main/gfx/env/Nebular_up.tga
new file mode 100644
index 00000000..ac2b2ba8
Binary files /dev/null and b/main/gfx/env/Nebular_up.tga differ
diff --git a/main/gfx/env/altairbk.tga b/main/gfx/env/altairbk.tga
new file mode 100644
index 00000000..81e6cfcb
Binary files /dev/null and b/main/gfx/env/altairbk.tga differ
diff --git a/main/gfx/env/altairdn.tga b/main/gfx/env/altairdn.tga
new file mode 100644
index 00000000..b42b869b
Binary files /dev/null and b/main/gfx/env/altairdn.tga differ
diff --git a/main/gfx/env/altairft.tga b/main/gfx/env/altairft.tga
new file mode 100644
index 00000000..d90d7ef0
Binary files /dev/null and b/main/gfx/env/altairft.tga differ
diff --git a/main/gfx/env/altairlf.tga b/main/gfx/env/altairlf.tga
new file mode 100644
index 00000000..a4a1a32c
Binary files /dev/null and b/main/gfx/env/altairlf.tga differ
diff --git a/main/gfx/env/altairrt.tga b/main/gfx/env/altairrt.tga
new file mode 100644
index 00000000..c2a24721
Binary files /dev/null and b/main/gfx/env/altairrt.tga differ
diff --git a/main/gfx/env/altairup.tga b/main/gfx/env/altairup.tga
new file mode 100644
index 00000000..ac413c68
Binary files /dev/null and b/main/gfx/env/altairup.tga differ
diff --git a/main/gfx/env/arcnbk.tga b/main/gfx/env/arcnbk.tga
new file mode 100644
index 00000000..3ca86d48
Binary files /dev/null and b/main/gfx/env/arcnbk.tga differ
diff --git a/main/gfx/env/arcndn.tga b/main/gfx/env/arcndn.tga
new file mode 100644
index 00000000..372b0a98
Binary files /dev/null and b/main/gfx/env/arcndn.tga differ
diff --git a/main/gfx/env/arcnft.tga b/main/gfx/env/arcnft.tga
new file mode 100644
index 00000000..5c31c603
Binary files /dev/null and b/main/gfx/env/arcnft.tga differ
diff --git a/main/gfx/env/arcnlf.tga b/main/gfx/env/arcnlf.tga
new file mode 100644
index 00000000..f5e3d54a
Binary files /dev/null and b/main/gfx/env/arcnlf.tga differ
diff --git a/main/gfx/env/arcnrt.tga b/main/gfx/env/arcnrt.tga
new file mode 100644
index 00000000..1e1a0f8d
Binary files /dev/null and b/main/gfx/env/arcnrt.tga differ
diff --git a/main/gfx/env/arcnup.tga b/main/gfx/env/arcnup.tga
new file mode 100644
index 00000000..0c5bdb64
Binary files /dev/null and b/main/gfx/env/arcnup.tga differ
diff --git a/main/gfx/env/ayumibk.tga b/main/gfx/env/ayumibk.tga
new file mode 100644
index 00000000..a85bc673
Binary files /dev/null and b/main/gfx/env/ayumibk.tga differ
diff --git a/main/gfx/env/ayumidn.tga b/main/gfx/env/ayumidn.tga
new file mode 100644
index 00000000..d4513b9a
Binary files /dev/null and b/main/gfx/env/ayumidn.tga differ
diff --git a/main/gfx/env/ayumift.tga b/main/gfx/env/ayumift.tga
new file mode 100644
index 00000000..c3a2e268
Binary files /dev/null and b/main/gfx/env/ayumift.tga differ
diff --git a/main/gfx/env/ayumilf.tga b/main/gfx/env/ayumilf.tga
new file mode 100644
index 00000000..e88ae349
Binary files /dev/null and b/main/gfx/env/ayumilf.tga differ
diff --git a/main/gfx/env/ayumirt.tga b/main/gfx/env/ayumirt.tga
new file mode 100644
index 00000000..28d72629
Binary files /dev/null and b/main/gfx/env/ayumirt.tga differ
diff --git a/main/gfx/env/ayumiup.tga b/main/gfx/env/ayumiup.tga
new file mode 100644
index 00000000..f062555a
Binary files /dev/null and b/main/gfx/env/ayumiup.tga differ
diff --git a/main/gfx/env/daimos_1BK.tga b/main/gfx/env/daimos_1BK.tga
new file mode 100644
index 00000000..a45c0a19
Binary files /dev/null and b/main/gfx/env/daimos_1BK.tga differ
diff --git a/main/gfx/env/daimos_1DN.tga b/main/gfx/env/daimos_1DN.tga
new file mode 100644
index 00000000..16f4c9c3
Binary files /dev/null and b/main/gfx/env/daimos_1DN.tga differ
diff --git a/main/gfx/env/daimos_1FT.tga b/main/gfx/env/daimos_1FT.tga
new file mode 100644
index 00000000..5d8ee4cb
Binary files /dev/null and b/main/gfx/env/daimos_1FT.tga differ
diff --git a/main/gfx/env/daimos_1LF.tga b/main/gfx/env/daimos_1LF.tga
new file mode 100644
index 00000000..32513d67
Binary files /dev/null and b/main/gfx/env/daimos_1LF.tga differ
diff --git a/main/gfx/env/daimos_1RT.tga b/main/gfx/env/daimos_1RT.tga
new file mode 100644
index 00000000..2c341f1c
Binary files /dev/null and b/main/gfx/env/daimos_1RT.tga differ
diff --git a/main/gfx/env/daimos_1UP.tga b/main/gfx/env/daimos_1UP.tga
new file mode 100644
index 00000000..fc98e3a7
Binary files /dev/null and b/main/gfx/env/daimos_1UP.tga differ
diff --git a/main/gfx/env/eclipse_bk.tga b/main/gfx/env/eclipse_bk.tga
new file mode 100644
index 00000000..7bb42673
Binary files /dev/null and b/main/gfx/env/eclipse_bk.tga differ
diff --git a/main/gfx/env/eclipse_dn.tga b/main/gfx/env/eclipse_dn.tga
new file mode 100644
index 00000000..91d89a75
Binary files /dev/null and b/main/gfx/env/eclipse_dn.tga differ
diff --git a/main/gfx/env/eclipse_ft.tga b/main/gfx/env/eclipse_ft.tga
new file mode 100644
index 00000000..e29515d7
Binary files /dev/null and b/main/gfx/env/eclipse_ft.tga differ
diff --git a/main/gfx/env/eclipse_lf.tga b/main/gfx/env/eclipse_lf.tga
new file mode 100644
index 00000000..4ee62993
Binary files /dev/null and b/main/gfx/env/eclipse_lf.tga differ
diff --git a/main/gfx/env/eclipse_rt.tga b/main/gfx/env/eclipse_rt.tga
new file mode 100644
index 00000000..ecc0b47c
Binary files /dev/null and b/main/gfx/env/eclipse_rt.tga differ
diff --git a/main/gfx/env/eclipse_up.tga b/main/gfx/env/eclipse_up.tga
new file mode 100644
index 00000000..baf69891
Binary files /dev/null and b/main/gfx/env/eclipse_up.tga differ
diff --git a/main/gfx/env/gammu_bk.tga b/main/gfx/env/gammu_bk.tga
new file mode 100644
index 00000000..8434703c
Binary files /dev/null and b/main/gfx/env/gammu_bk.tga differ
diff --git a/main/gfx/env/gammu_dn.tga b/main/gfx/env/gammu_dn.tga
new file mode 100644
index 00000000..2659dfa2
Binary files /dev/null and b/main/gfx/env/gammu_dn.tga differ
diff --git a/main/gfx/env/gammu_ft.tga b/main/gfx/env/gammu_ft.tga
new file mode 100644
index 00000000..6ba6f204
Binary files /dev/null and b/main/gfx/env/gammu_ft.tga differ
diff --git a/main/gfx/env/gammu_lf.tga b/main/gfx/env/gammu_lf.tga
new file mode 100644
index 00000000..f6568489
Binary files /dev/null and b/main/gfx/env/gammu_lf.tga differ
diff --git a/main/gfx/env/gammu_rt.tga b/main/gfx/env/gammu_rt.tga
new file mode 100644
index 00000000..7fa473be
Binary files /dev/null and b/main/gfx/env/gammu_rt.tga differ
diff --git a/main/gfx/env/gammu_up.tga b/main/gfx/env/gammu_up.tga
new file mode 100644
index 00000000..79b1ae25
Binary files /dev/null and b/main/gfx/env/gammu_up.tga differ
diff --git a/main/gfx/env/lost_bk.tga b/main/gfx/env/lost_bk.tga
new file mode 100644
index 00000000..d6ece5eb
Binary files /dev/null and b/main/gfx/env/lost_bk.tga differ
diff --git a/main/gfx/env/lost_dn.tga b/main/gfx/env/lost_dn.tga
new file mode 100644
index 00000000..da0836f5
Binary files /dev/null and b/main/gfx/env/lost_dn.tga differ
diff --git a/main/gfx/env/lost_ft.tga b/main/gfx/env/lost_ft.tga
new file mode 100644
index 00000000..cd3b43d7
Binary files /dev/null and b/main/gfx/env/lost_ft.tga differ
diff --git a/main/gfx/env/lost_lf.tga b/main/gfx/env/lost_lf.tga
new file mode 100644
index 00000000..cd000816
Binary files /dev/null and b/main/gfx/env/lost_lf.tga differ
diff --git a/main/gfx/env/lost_rt.tga b/main/gfx/env/lost_rt.tga
new file mode 100644
index 00000000..ec706b97
Binary files /dev/null and b/main/gfx/env/lost_rt.tga differ
diff --git a/main/gfx/env/lost_up.tga b/main/gfx/env/lost_up.tga
new file mode 100644
index 00000000..43081538
Binary files /dev/null and b/main/gfx/env/lost_up.tga differ
diff --git a/main/gfx/env/malrav3sky256_bk.tga b/main/gfx/env/malrav3sky256_bk.tga
new file mode 100644
index 00000000..f4c09771
Binary files /dev/null and b/main/gfx/env/malrav3sky256_bk.tga differ
diff --git a/main/gfx/env/malrav3sky256_dn.tga b/main/gfx/env/malrav3sky256_dn.tga
new file mode 100644
index 00000000..af774d10
Binary files /dev/null and b/main/gfx/env/malrav3sky256_dn.tga differ
diff --git a/main/gfx/env/malrav3sky256_ft.tga b/main/gfx/env/malrav3sky256_ft.tga
new file mode 100644
index 00000000..f376f09b
Binary files /dev/null and b/main/gfx/env/malrav3sky256_ft.tga differ
diff --git a/main/gfx/env/malrav3sky256_lf.tga b/main/gfx/env/malrav3sky256_lf.tga
new file mode 100644
index 00000000..d055348f
Binary files /dev/null and b/main/gfx/env/malrav3sky256_lf.tga differ
diff --git a/main/gfx/env/malrav3sky256_rt.tga b/main/gfx/env/malrav3sky256_rt.tga
new file mode 100644
index 00000000..6ac07093
Binary files /dev/null and b/main/gfx/env/malrav3sky256_rt.tga differ
diff --git a/main/gfx/env/malrav3sky256_up.tga b/main/gfx/env/malrav3sky256_up.tga
new file mode 100644
index 00000000..b76bb407
Binary files /dev/null and b/main/gfx/env/malrav3sky256_up.tga differ
diff --git a/main/gfx/env/mars2bk.tga b/main/gfx/env/mars2bk.tga
new file mode 100644
index 00000000..fcd7bab3
Binary files /dev/null and b/main/gfx/env/mars2bk.tga differ
diff --git a/main/gfx/env/mars2dn.tga b/main/gfx/env/mars2dn.tga
new file mode 100644
index 00000000..0e0eb05a
Binary files /dev/null and b/main/gfx/env/mars2dn.tga differ
diff --git a/main/gfx/env/mars2ft.tga b/main/gfx/env/mars2ft.tga
new file mode 100644
index 00000000..f22292e0
Binary files /dev/null and b/main/gfx/env/mars2ft.tga differ
diff --git a/main/gfx/env/mars2lf.tga b/main/gfx/env/mars2lf.tga
new file mode 100644
index 00000000..59f43355
Binary files /dev/null and b/main/gfx/env/mars2lf.tga differ
diff --git a/main/gfx/env/mars2rt.tga b/main/gfx/env/mars2rt.tga
new file mode 100644
index 00000000..b181d3d9
Binary files /dev/null and b/main/gfx/env/mars2rt.tga differ
diff --git a/main/gfx/env/mars2up.tga b/main/gfx/env/mars2up.tga
new file mode 100644
index 00000000..9c197f4d
Binary files /dev/null and b/main/gfx/env/mars2up.tga differ
diff --git a/main/gfx/env/mars_envbk.tga b/main/gfx/env/mars_envbk.tga
new file mode 100644
index 00000000..b4ce3bda
Binary files /dev/null and b/main/gfx/env/mars_envbk.tga differ
diff --git a/main/gfx/env/mars_envdn.tga b/main/gfx/env/mars_envdn.tga
new file mode 100644
index 00000000..2c190a3f
Binary files /dev/null and b/main/gfx/env/mars_envdn.tga differ
diff --git a/main/gfx/env/mars_envft.tga b/main/gfx/env/mars_envft.tga
new file mode 100644
index 00000000..63007687
Binary files /dev/null and b/main/gfx/env/mars_envft.tga differ
diff --git a/main/gfx/env/mars_envlf.tga b/main/gfx/env/mars_envlf.tga
new file mode 100644
index 00000000..4ee82323
Binary files /dev/null and b/main/gfx/env/mars_envlf.tga differ
diff --git a/main/gfx/env/mars_envrt.tga b/main/gfx/env/mars_envrt.tga
new file mode 100644
index 00000000..a8980ffc
Binary files /dev/null and b/main/gfx/env/mars_envrt.tga differ
diff --git a/main/gfx/env/mars_envup.tga b/main/gfx/env/mars_envup.tga
new file mode 100644
index 00000000..f5128f99
Binary files /dev/null and b/main/gfx/env/mars_envup.tga differ
diff --git a/main/gfx/env/marsbk.tga b/main/gfx/env/marsbk.tga
new file mode 100644
index 00000000..02fc06eb
Binary files /dev/null and b/main/gfx/env/marsbk.tga differ
diff --git a/main/gfx/env/marsdn.tga b/main/gfx/env/marsdn.tga
new file mode 100644
index 00000000..b9d498d7
Binary files /dev/null and b/main/gfx/env/marsdn.tga differ
diff --git a/main/gfx/env/marsft.tga b/main/gfx/env/marsft.tga
new file mode 100644
index 00000000..4c5f3dd2
Binary files /dev/null and b/main/gfx/env/marsft.tga differ
diff --git a/main/gfx/env/marslf.tga b/main/gfx/env/marslf.tga
new file mode 100644
index 00000000..1d33ce26
Binary files /dev/null and b/main/gfx/env/marslf.tga differ
diff --git a/main/gfx/env/marsrt.tga b/main/gfx/env/marsrt.tga
new file mode 100644
index 00000000..829048c5
Binary files /dev/null and b/main/gfx/env/marsrt.tga differ
diff --git a/main/gfx/env/marsup.tga b/main/gfx/env/marsup.tga
new file mode 100644
index 00000000..e27a76b9
Binary files /dev/null and b/main/gfx/env/marsup.tga differ
diff --git a/main/gfx/env/metal_bk.tga b/main/gfx/env/metal_bk.tga
new file mode 100644
index 00000000..1d90880a
Binary files /dev/null and b/main/gfx/env/metal_bk.tga differ
diff --git a/main/gfx/env/metal_dn.tga b/main/gfx/env/metal_dn.tga
new file mode 100644
index 00000000..d4513b9a
Binary files /dev/null and b/main/gfx/env/metal_dn.tga differ
diff --git a/main/gfx/env/metal_ft.tga b/main/gfx/env/metal_ft.tga
new file mode 100644
index 00000000..ac6cf451
Binary files /dev/null and b/main/gfx/env/metal_ft.tga differ
diff --git a/main/gfx/env/metal_lf.tga b/main/gfx/env/metal_lf.tga
new file mode 100644
index 00000000..62c06d6a
Binary files /dev/null and b/main/gfx/env/metal_lf.tga differ
diff --git a/main/gfx/env/metal_rt.tga b/main/gfx/env/metal_rt.tga
new file mode 100644
index 00000000..46f085cf
Binary files /dev/null and b/main/gfx/env/metal_rt.tga differ
diff --git a/main/gfx/env/metal_up.tga b/main/gfx/env/metal_up.tga
new file mode 100644
index 00000000..b5110cf9
Binary files /dev/null and b/main/gfx/env/metal_up.tga differ
diff --git a/main/gfx/env/mora_bk.tga b/main/gfx/env/mora_bk.tga
new file mode 100644
index 00000000..c574a013
Binary files /dev/null and b/main/gfx/env/mora_bk.tga differ
diff --git a/main/gfx/env/mora_dn.tga b/main/gfx/env/mora_dn.tga
new file mode 100644
index 00000000..7df81fa2
Binary files /dev/null and b/main/gfx/env/mora_dn.tga differ
diff --git a/main/gfx/env/mora_ft.tga b/main/gfx/env/mora_ft.tga
new file mode 100644
index 00000000..62f4ec6d
Binary files /dev/null and b/main/gfx/env/mora_ft.tga differ
diff --git a/main/gfx/env/mora_lf.tga b/main/gfx/env/mora_lf.tga
new file mode 100644
index 00000000..0f5bab04
Binary files /dev/null and b/main/gfx/env/mora_lf.tga differ
diff --git a/main/gfx/env/mora_rt.tga b/main/gfx/env/mora_rt.tga
new file mode 100644
index 00000000..6f7a05ff
Binary files /dev/null and b/main/gfx/env/mora_rt.tga differ
diff --git a/main/gfx/env/mora_up.tga b/main/gfx/env/mora_up.tga
new file mode 100644
index 00000000..a9aedab5
Binary files /dev/null and b/main/gfx/env/mora_up.tga differ
diff --git a/main/gfx/env/td2bk.tga b/main/gfx/env/td2bk.tga
new file mode 100644
index 00000000..75e2b355
Binary files /dev/null and b/main/gfx/env/td2bk.tga differ
diff --git a/main/gfx/env/td2dn.tga b/main/gfx/env/td2dn.tga
new file mode 100644
index 00000000..494a3d51
Binary files /dev/null and b/main/gfx/env/td2dn.tga differ
diff --git a/main/gfx/env/td2ft.tga b/main/gfx/env/td2ft.tga
new file mode 100644
index 00000000..a4128e19
Binary files /dev/null and b/main/gfx/env/td2ft.tga differ
diff --git a/main/gfx/env/td2lf.tga b/main/gfx/env/td2lf.tga
new file mode 100644
index 00000000..5cae2217
Binary files /dev/null and b/main/gfx/env/td2lf.tga differ
diff --git a/main/gfx/env/td2rt.tga b/main/gfx/env/td2rt.tga
new file mode 100644
index 00000000..dc42f20f
Binary files /dev/null and b/main/gfx/env/td2rt.tga differ
diff --git a/main/gfx/env/td2up.tga b/main/gfx/env/td2up.tga
new file mode 100644
index 00000000..65c595c5
Binary files /dev/null and b/main/gfx/env/td2up.tga differ
diff --git a/main/gfx/env/veil_bk.tga b/main/gfx/env/veil_bk.tga
new file mode 100644
index 00000000..7bde9d90
Binary files /dev/null and b/main/gfx/env/veil_bk.tga differ
diff --git a/main/gfx/env/veil_dn.tga b/main/gfx/env/veil_dn.tga
new file mode 100644
index 00000000..3f603366
Binary files /dev/null and b/main/gfx/env/veil_dn.tga differ
diff --git a/main/gfx/env/veil_ft.tga b/main/gfx/env/veil_ft.tga
new file mode 100644
index 00000000..7e7e2e50
Binary files /dev/null and b/main/gfx/env/veil_ft.tga differ
diff --git a/main/gfx/env/veil_lf.tga b/main/gfx/env/veil_lf.tga
new file mode 100644
index 00000000..01ef159d
Binary files /dev/null and b/main/gfx/env/veil_lf.tga differ
diff --git a/main/gfx/env/veil_rt.tga b/main/gfx/env/veil_rt.tga
new file mode 100644
index 00000000..182f7e82
Binary files /dev/null and b/main/gfx/env/veil_rt.tga differ
diff --git a/main/gfx/env/veil_up.tga b/main/gfx/env/veil_up.tga
new file mode 100644
index 00000000..c421c3cc
Binary files /dev/null and b/main/gfx/env/veil_up.tga differ
diff --git a/main/gfx/shell/Colors.lst b/main/gfx/shell/Colors.lst
new file mode 100644
index 00000000..22c01cfd
--- /dev/null
+++ b/main/gfx/shell/Colors.lst
@@ -0,0 +1,9 @@
+HELP_COLOR 243 199 79
+PROMPT_BG_COLOR		56 56 56
+PROMPT_TEXT_COLOR	184 125 55
+PROMPT_TITLE_COLOR	184 125 55
+INPUT_TEXT_COLOR	184 125 55
+INPUT_BG_COLOR		56 56 56
+REFRESH_TITLE_COLOR 184 125 55
+REFRESH_TEXT_COLOR  184 125 55
+REFRESH_BG_COLOR	56 56 56
diff --git a/main/gfx/shell/Logo.bmp b/main/gfx/shell/Logo.bmp
new file mode 100644
index 00000000..9b0d6179
Binary files /dev/null and b/main/gfx/shell/Logo.bmp differ
diff --git a/main/gfx/shell/btns_main.bmp b/main/gfx/shell/btns_main.bmp
new file mode 100644
index 00000000..9a5059a8
Binary files /dev/null and b/main/gfx/shell/btns_main.bmp differ
diff --git a/main/gfx/shell/cb_checked.bmp b/main/gfx/shell/cb_checked.bmp
new file mode 100644
index 00000000..7243151e
Binary files /dev/null and b/main/gfx/shell/cb_checked.bmp differ
diff --git a/main/gfx/shell/cb_disabled.bmp b/main/gfx/shell/cb_disabled.bmp
new file mode 100644
index 00000000..940c0129
Binary files /dev/null and b/main/gfx/shell/cb_disabled.bmp differ
diff --git a/main/gfx/shell/cb_down.bmp b/main/gfx/shell/cb_down.bmp
new file mode 100644
index 00000000..056bd45c
Binary files /dev/null and b/main/gfx/shell/cb_down.bmp differ
diff --git a/main/gfx/shell/cb_empty.bmp b/main/gfx/shell/cb_empty.bmp
new file mode 100644
index 00000000..c6d00b88
Binary files /dev/null and b/main/gfx/shell/cb_empty.bmp differ
diff --git a/main/gfx/shell/cb_over.bmp b/main/gfx/shell/cb_over.bmp
new file mode 100644
index 00000000..1469609f
Binary files /dev/null and b/main/gfx/shell/cb_over.bmp differ
diff --git a/main/gfx/shell/cls_d.bmp b/main/gfx/shell/cls_d.bmp
new file mode 100644
index 00000000..d664d9d9
Binary files /dev/null and b/main/gfx/shell/cls_d.bmp differ
diff --git a/main/gfx/shell/cls_f.bmp b/main/gfx/shell/cls_f.bmp
new file mode 100644
index 00000000..54f30c47
Binary files /dev/null and b/main/gfx/shell/cls_f.bmp differ
diff --git a/main/gfx/shell/cls_n.bmp b/main/gfx/shell/cls_n.bmp
new file mode 100644
index 00000000..7243151e
Binary files /dev/null and b/main/gfx/shell/cls_n.bmp differ
diff --git a/main/gfx/shell/dedicate.bmp b/main/gfx/shell/dedicate.bmp
new file mode 100644
index 00000000..114eb181
Binary files /dev/null and b/main/gfx/shell/dedicate.bmp differ
diff --git a/main/gfx/shell/divider.bmp b/main/gfx/shell/divider.bmp
new file mode 100644
index 00000000..340271b3
Binary files /dev/null and b/main/gfx/shell/divider.bmp differ
diff --git a/main/gfx/shell/dnarrowd.bmp b/main/gfx/shell/dnarrowd.bmp
new file mode 100644
index 00000000..e8262f38
Binary files /dev/null and b/main/gfx/shell/dnarrowd.bmp differ
diff --git a/main/gfx/shell/dnarrowf.bmp b/main/gfx/shell/dnarrowf.bmp
new file mode 100644
index 00000000..6cf4d357
Binary files /dev/null and b/main/gfx/shell/dnarrowf.bmp differ
diff --git a/main/gfx/shell/dnarrowp.bmp b/main/gfx/shell/dnarrowp.bmp
new file mode 100644
index 00000000..85b2fd60
Binary files /dev/null and b/main/gfx/shell/dnarrowp.bmp differ
diff --git a/main/gfx/shell/down.bmp b/main/gfx/shell/down.bmp
new file mode 100644
index 00000000..fa4079fa
Binary files /dev/null and b/main/gfx/shell/down.bmp differ
diff --git a/main/gfx/shell/favorite.bmp b/main/gfx/shell/favorite.bmp
new file mode 100644
index 00000000..9772d4f8
Binary files /dev/null and b/main/gfx/shell/favorite.bmp differ
diff --git a/main/gfx/shell/gamma.bmp b/main/gfx/shell/gamma.bmp
new file mode 100644
index 00000000..0623f837
Binary files /dev/null and b/main/gfx/shell/gamma.bmp differ
diff --git a/main/gfx/shell/head_advanced.BMP b/main/gfx/shell/head_advanced.BMP
new file mode 100644
index 00000000..28cf1380
Binary files /dev/null and b/main/gfx/shell/head_advanced.BMP differ
diff --git a/main/gfx/shell/head_advoptions.bmp b/main/gfx/shell/head_advoptions.bmp
new file mode 100644
index 00000000..116cd4fa
Binary files /dev/null and b/main/gfx/shell/head_advoptions.bmp differ
diff --git a/main/gfx/shell/head_audio.BMP b/main/gfx/shell/head_audio.BMP
new file mode 100644
index 00000000..07ca0fcd
Binary files /dev/null and b/main/gfx/shell/head_audio.BMP differ
diff --git a/main/gfx/shell/head_config.BMP b/main/gfx/shell/head_config.BMP
new file mode 100644
index 00000000..ac6e6153
Binary files /dev/null and b/main/gfx/shell/head_config.BMP differ
diff --git a/main/gfx/shell/head_controls.BMP b/main/gfx/shell/head_controls.BMP
new file mode 100644
index 00000000..5c1cb981
Binary files /dev/null and b/main/gfx/shell/head_controls.BMP differ
diff --git a/main/gfx/shell/head_creategame.bmp b/main/gfx/shell/head_creategame.bmp
new file mode 100644
index 00000000..bfd6115e
Binary files /dev/null and b/main/gfx/shell/head_creategame.bmp differ
diff --git a/main/gfx/shell/head_createroom.bmp b/main/gfx/shell/head_createroom.bmp
new file mode 100644
index 00000000..721e378c
Binary files /dev/null and b/main/gfx/shell/head_createroom.bmp differ
diff --git a/main/gfx/shell/head_custom.bmp b/main/gfx/shell/head_custom.bmp
new file mode 100644
index 00000000..8c9201fd
Binary files /dev/null and b/main/gfx/shell/head_custom.bmp differ
diff --git a/main/gfx/shell/head_customize.BMP b/main/gfx/shell/head_customize.BMP
new file mode 100644
index 00000000..12ea570c
Binary files /dev/null and b/main/gfx/shell/head_customize.BMP differ
diff --git a/main/gfx/shell/head_filter.BMP b/main/gfx/shell/head_filter.BMP
new file mode 100644
index 00000000..69e94794
Binary files /dev/null and b/main/gfx/shell/head_filter.BMP differ
diff --git a/main/gfx/shell/head_gameopts.BMP b/main/gfx/shell/head_gameopts.BMP
new file mode 100644
index 00000000..dfa7bf17
Binary files /dev/null and b/main/gfx/shell/head_gameopts.BMP differ
diff --git a/main/gfx/shell/head_gore.bmp b/main/gfx/shell/head_gore.bmp
new file mode 100644
index 00000000..356b0d63
Binary files /dev/null and b/main/gfx/shell/head_gore.bmp differ
diff --git a/main/gfx/shell/head_inetgames.BMP b/main/gfx/shell/head_inetgames.BMP
new file mode 100644
index 00000000..6adfa745
Binary files /dev/null and b/main/gfx/shell/head_inetgames.BMP differ
diff --git a/main/gfx/shell/head_keyboard.BMP b/main/gfx/shell/head_keyboard.BMP
new file mode 100644
index 00000000..59ea93f1
Binary files /dev/null and b/main/gfx/shell/head_keyboard.BMP differ
diff --git a/main/gfx/shell/head_lan.BMP b/main/gfx/shell/head_lan.BMP
new file mode 100644
index 00000000..65826c9f
Binary files /dev/null and b/main/gfx/shell/head_lan.BMP differ
diff --git a/main/gfx/shell/head_load.bmp b/main/gfx/shell/head_load.bmp
new file mode 100644
index 00000000..b098c96c
Binary files /dev/null and b/main/gfx/shell/head_load.bmp differ
diff --git a/main/gfx/shell/head_multi.bmp b/main/gfx/shell/head_multi.bmp
new file mode 100644
index 00000000..4e2e88cb
Binary files /dev/null and b/main/gfx/shell/head_multi.bmp differ
diff --git a/main/gfx/shell/head_newgame.bmp b/main/gfx/shell/head_newgame.bmp
new file mode 100644
index 00000000..1eb6d60a
Binary files /dev/null and b/main/gfx/shell/head_newgame.bmp differ
diff --git a/main/gfx/shell/head_readme.BMP b/main/gfx/shell/head_readme.BMP
new file mode 100644
index 00000000..370dea7a
Binary files /dev/null and b/main/gfx/shell/head_readme.BMP differ
diff --git a/main/gfx/shell/head_room.BMP b/main/gfx/shell/head_room.BMP
new file mode 100644
index 00000000..fb295d65
Binary files /dev/null and b/main/gfx/shell/head_room.BMP differ
diff --git a/main/gfx/shell/head_rooms.BMP b/main/gfx/shell/head_rooms.BMP
new file mode 100644
index 00000000..fb788529
Binary files /dev/null and b/main/gfx/shell/head_rooms.BMP differ
diff --git a/main/gfx/shell/head_save.bmp b/main/gfx/shell/head_save.bmp
new file mode 100644
index 00000000..bb5553fd
Binary files /dev/null and b/main/gfx/shell/head_save.bmp differ
diff --git a/main/gfx/shell/head_saveload.bmp b/main/gfx/shell/head_saveload.bmp
new file mode 100644
index 00000000..f454fb7a
Binary files /dev/null and b/main/gfx/shell/head_saveload.bmp differ
diff --git a/main/gfx/shell/head_single.BMP b/main/gfx/shell/head_single.BMP
new file mode 100644
index 00000000..18384728
Binary files /dev/null and b/main/gfx/shell/head_single.BMP differ
diff --git a/main/gfx/shell/head_video.BMP b/main/gfx/shell/head_video.BMP
new file mode 100644
index 00000000..6e1736a3
Binary files /dev/null and b/main/gfx/shell/head_video.BMP differ
diff --git a/main/gfx/shell/head_vidmodes.BMP b/main/gfx/shell/head_vidmodes.BMP
new file mode 100644
index 00000000..7faa440e
Binary files /dev/null and b/main/gfx/shell/head_vidmodes.BMP differ
diff --git a/main/gfx/shell/head_vidoptions.bmp b/main/gfx/shell/head_vidoptions.bmp
new file mode 100644
index 00000000..53920ef8
Binary files /dev/null and b/main/gfx/shell/head_vidoptions.bmp differ
diff --git a/main/gfx/shell/kb_act.lst b/main/gfx/shell/kb_act.lst
new file mode 100644
index 00000000..bf5d0c3e
--- /dev/null
+++ b/main/gfx/shell/kb_act.lst
@@ -0,0 +1,94 @@
+"blank"				"=========================="
+"blank"				" Movement"
+"blank"				"=========================="
+"+forward"				"Move forward"
+"+back"					"Move backward"
+"+moveleft"				"Move left (strafe)"
+"+moveright"			"Move right (strafe)"
+"+left"					"Turn left (optional)"
+"+right"				"Turn right (optional)"
+"+jump"					"Jump"
+"+duck"					"Duck"
+"+speed"				"Walk"
+"+moveup"				"Swim up"
+"+movedown"				"Swim down"
+"+lookup"				"Look up"
+"+lookdown"				"Look down"
+"centerview"			"Look straight ahead"
+"+strafe"				"Strafe modifier"
+"+mlook"				"Mouse look modifier"
+"+klook"				"Keyboard look modifier"
+"blank"				"=========================="
+"blank"				" Weapons and items"
+"blank"				"=========================="
+"+attack"				"Attack (important)"
+"+use"					"Use/build"
+"+reload"				"Reload weapon"
+"impulse 100"			"Flashlight"
+"+showmap"				"Show map"
+"+showscores"			"Display multiplayer scores"
+"slot1"					"Weapon category 1"
+"slot2"					"Weapon category 2"
+"slot3" 				"Weapon category 3"
+"slot4"					"Weapon category 4"
+"slot5"					"Weapon category 5"
+"invprev"				"Previous weapon"
+"impulse 1"				"Next weapon"
+"impulse 3"				"Drop weapon"
+"lastinv"				"Last used weapon"
+"blank"				"=========================="
+"blank"				" Communication"
+"blank"				"=========================="
+"+popupmenu"			"Pop-up menu (important)"
+"+voicerecord"			"Use voice communication"
+"impulse 9"				"Taunt"
+"messagemode"			"Chat message"
+"messagemode2"			"Team message"
+"blank"				"=========================="
+"blank"				" Marine hotkeys"
+"blank"				"=========================="
+"impulse 80"			"Request orders"
+"impulse 81"			"Acknowledge orders"
+"impulse 10"			"Need health"
+"impulse 11"			"Need ammo"
+"blank"				"=========================="
+"blank"				" Commander hotkeys"
+"blank"				"=========================="
+"impulse 105"			"Select all soldiers"
+"impulse 123"			"Go to order request"
+"impulse 124"			"Go to ammo request"
+"impulse 125"			"Go to health request"
+"blank"				"=========================="
+"blank"				" Alien hotkeys"
+"blank"				"=========================="
+"impulse 90"			"Build resource tower"
+"impulse 91"			"Build offensive chamber"
+"impulse 92"			"Build defense chamber"
+"impulse 93"			"Build sensory chamber"
+"impulse 94"			"Build movement chamber"
+"impulse 95"			"Build hive"
+"impulse 113"			"Morph to Skulk"
+"impulse 114"			"Morph to Gorge"
+"impulse 115"			"Morph to Lerk"
+"impulse 116"			"Morph to Fade"
+"impulse 117"			"Morph to Onos"
+"impulse 101"			"Evolve Carapace"
+"impulse 102"			"Evolve Regeneration"
+"impulse 103"			"Evolve Redemption"
+"impulse 107"			"Evolve Celerity"
+"impulse 108"			"Evolve Adrenaline"
+"impulse 109"			"Evolve Silence"
+"impulse 110"			"Evolve Cloaking"
+"impulse 111"			"Evolve Pheromones"
+"impulse 112"			"Evolve Scent of Fear"
+"blank"				"=========================="
+"blank"				" Miscellaneous"
+"blank"				"=========================="
+"jointeamone"			"Join Marines"
+"jointeamtwo"			"Join Aliens"
+"autoassign"			"Auto Assign"
+"readyroom"				"Readyroom"
+"impulse 201"			"Spray logo"
+"snapshot"				"Take screen shot"
+"pause"					"Pause game"
+"quit"					"Quit game"
\ No newline at end of file
diff --git a/main/gfx/shell/kb_def.lst b/main/gfx/shell/kb_def.lst
new file mode 100644
index 00000000..404dbb52
--- /dev/null
+++ b/main/gfx/shell/kb_def.lst
@@ -0,0 +1,63 @@
+"w"				"+forward"
+"UPARROW"		"+scrollup"
+"DOWNARROW"		"+scrolldown"
+"s"				"+back"
+"LEFTARROW"		"+scrollleft"
+"RIGHTARROW"	"+scrollright"
+"a"				"+moveleft"
+"d"				"+moveright"
+"SPACE"			"+jump"
+"CTRL"			"+duck"
+"TAB"			"+showscores"
+"e"				"+use"
+"'"				"+moveup"
+"PGUP"			"+lookup"
+"PGDN"			"+lookdown"
+"END"			"centerview"
+"INS"			"+klook"
+";"				"+mlook"
+"c"				"+showmap"
+"r"				"+reload"
+"SHIFT"			"+speed"
+"MOUSE1"		"+attack"
+"MOUSE2"		"+popupmenu"
+"MOUSE3"		"+popupmenu"
+"f"				"impulse 100"
+"g"				"impulse 3"
+","				"impulse 123"
+"."				"impulse 124"
+"/"				"impulse 125"
+"z"				"impulse 80"
+"x"				"impulse 81"
+"v"				"impulse 9"
+"l"				"impulse 105"
+"1"				"slot1"
+"2"				"slot2"
+"3"				"slot3"
+"4"				"slot4"
+"5"				"slot5"
+"MWHEELUP"		"invprev"
+"["				"invprev"
+"MWHEELDOWN"	"invnext"
+"]"				"invnext"
+"F10"			"quit prompt"
+"PAUSE"			"pause"
+"ESCAPE"		"escape"
+"`"				"console 1.0; toggleconsole"
+"~"				"console 1.0; toggleconsole"
+"+"				"sizeup"
+"="				"sizeup"
+"-"				"sizedown"
+"t"				"impulse 201"
+"ENTER"			"messagemode"
+"y"				"messagemode2"
+"ALT"			"+voicerecord"
+"F1"			"jointeamone"
+"F2"			"jointeamtwo"
+"F3"			"addbot"
+"F4"			"readyroom"
+"F5"			"snapshot"
+"F7"			"editps"
+
+
+
diff --git a/main/gfx/shell/kb_keys.lst b/main/gfx/shell/kb_keys.lst
new file mode 100644
index 00000000..0efd7b84
--- /dev/null
+++ b/main/gfx/shell/kb_keys.lst
@@ -0,0 +1,256 @@
+0	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+1	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+2	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+3	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+4	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+5	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+6	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+7	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+8	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+9	"TAB" "TAB" DEFAULTCOLOR
+10	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+11	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+12	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+13	"ENTER" "ENTER" DEFAULTCOLOR
+14	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+15	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+16	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+17	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+18	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+19	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+20	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+21	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+22	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+23	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+24	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+25	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+26	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+27	"ESCAPE" "ESCAPE" DEFAULTCOLOR
+28	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+29	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+30	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+31	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+32	"SPACE" "SPACE" DEFAULTCOLOR
+33	"!" "!" DEFAULTCOLOR
+34	""" """ DEFAULTCOLOR
+35	"#" "#" DEFAULTCOLOR
+36	"$" "$" DEFAULTCOLOR
+37	"BACKSPACE" "BACKSPACE" DEFAULTCOLOR
+38	"&" "&" DEFAULTCOLOR
+39	"'" "'" DEFAULTCOLOR
+40	"(" "(" DEFAULTCOLOR
+41	")" ")" DEFAULTCOLOR
+42	"*" "*" DEFAULTCOLOR
+43	"+" "+" DEFAULTCOLOR
+44	"," "," DEFAULTCOLOR
+45	"-" "-" DEFAULTCOLOR
+46	"." "." DEFAULTCOLOR
+47	"/" "/" DEFAULTCOLOR
+48	"0" "0" DEFAULTCOLOR
+49	"1" "1" DEFAULTCOLOR
+50	"2" "2" DEFAULTCOLOR
+51	"3" "3" DEFAULTCOLOR
+52	"4" "4" DEFAULTCOLOR
+53	"5" "5" DEFAULTCOLOR
+54	"6" "6" DEFAULTCOLOR
+55	"7" "7" DEFAULTCOLOR
+56	"8" "8" DEFAULTCOLOR
+57	"9" "9" DEFAULTCOLOR
+58	":" ":" DEFAULTCOLOR
+59	";" ";" DEFAULTCOLOR
+60	"<" "<" DEFAULTCOLOR
+61	"=" "=" DEFAULTCOLOR
+62	">" ">" DEFAULTCOLOR
+63	"?" "?" DEFAULTCOLOR
+64	"@" "@" DEFAULTCOLOR
+65	"A" "A" DEFAULTCOLOR
+66	"B" "B" DEFAULTCOLOR
+67	"C" "C" DEFAULTCOLOR
+68	"D" "D" DEFAULTCOLOR
+69	"E" "E" DEFAULTCOLOR
+70	"F" "F" DEFAULTCOLOR
+71	"G" "G" DEFAULTCOLOR
+72	"H" "H" DEFAULTCOLOR
+73	"I" "I" DEFAULTCOLOR
+74	"J" "J" DEFAULTCOLOR
+75	"K" "K" DEFAULTCOLOR
+76	"L" "L" DEFAULTCOLOR
+77	"M" "M" DEFAULTCOLOR
+78	"N" "N" DEFAULTCOLOR
+79	"O" "O" DEFAULTCOLOR
+80	"P" "P" DEFAULTCOLOR
+81	"Q" "Q" DEFAULTCOLOR
+82	"R" "R" DEFAULTCOLOR
+83	"S" "S" DEFAULTCOLOR
+84	"T" "T" DEFAULTCOLOR
+85	"U" "U" DEFAULTCOLOR
+86	"V" "V" DEFAULTCOLOR
+87	"W" "W" DEFAULTCOLOR
+88	"X" "X" DEFAULTCOLOR
+89	"Y" "Y" DEFAULTCOLOR
+90	"Z" "Z" DEFAULTCOLOR
+91	"[" "[" DEFAULTCOLOR
+92	"\" "\" DEFAULTCOLOR
+93	"]" "]" DEFAULTCOLOR
+94	"^" "^" DEFAULTCOLOR
+95	"_" "_" DEFAULTCOLOR
+96	"`" "`" DEFAULTCOLOR
+97	"a" "a" DEFAULTCOLOR
+98	"b" "b" DEFAULTCOLOR
+99	"c" "c" DEFAULTCOLOR
+100	"d" "d" DEFAULTCOLOR
+101	"e" "e" DEFAULTCOLOR
+102	"f" "f" DEFAULTCOLOR
+103	"g" "g" DEFAULTCOLOR
+104	"h" "h" DEFAULTCOLOR
+105	"i" "i" DEFAULTCOLOR
+106	"j" "j" DEFAULTCOLOR
+107	"k" "k" DEFAULTCOLOR
+108	"l" "l" DEFAULTCOLOR
+109	"m" "m" DEFAULTCOLOR
+110	"n" "n" DEFAULTCOLOR
+111	"o" "o" DEFAULTCOLOR
+112	"p" "p" DEFAULTCOLOR
+113	"q" "q" DEFAULTCOLOR
+114	"r" "r" DEFAULTCOLOR
+115	"s" "s" DEFAULTCOLOR
+116	"t" "t" DEFAULTCOLOR
+117	"u" "u" DEFAULTCOLOR
+118	"v" "v" DEFAULTCOLOR
+119	"w" "w" DEFAULTCOLOR
+120	"x" "x" DEFAULTCOLOR
+121	"y" "y" DEFAULTCOLOR
+122	"z" "z" DEFAULTCOLOR
+123	"{" "{" DEFAULTCOLOR
+124	"|" "|" DEFAULTCOLOR
+125	"}" "}" DEFAULTCOLOR
+126	"~" "~" DEFAULTCOLOR
+127	"BACKSPACE" "BACKSPACE" DEFAULTCOLOR
+128	"UPARROW" "UPARROW" DEFAULTCOLOR
+129	"DOWNARROW" "DOWNARROW" DEFAULTCOLOR
+130	"LEFTARROW" "LEFTARROW" DEFAULTCOLOR
+131	"RIGHTARROW" "RIGHTARROW" DEFAULTCOLOR
+132	"ALT" "ALT" DEFAULTCOLOR
+133	"CTRL" "CTRL" DEFAULTCOLOR
+134	"SHIFT" "SHIFT" DEFAULTCOLOR
+135	"F1" "F1" DEFAULTCOLOR
+136	"F2" "F2" DEFAULTCOLOR
+137	"F3" "F3" DEFAULTCOLOR
+138	"F4" "F4" DEFAULTCOLOR
+139	"F5" "F5" DEFAULTCOLOR
+140	"F6" "F6" DEFAULTCOLOR
+141	"F7" "F7" DEFAULTCOLOR
+142	"F8" "F8" DEFAULTCOLOR
+143	"F9" "F9" DEFAULTCOLOR
+144	"F10" "F10" DEFAULTCOLOR
+145	"F11" "F11" DEFAULTCOLOR
+146	"F12" "F12" DEFAULTCOLOR
+147	"INS" "INS" DEFAULTCOLOR
+148	"DEL" "DEL" DEFAULTCOLOR
+149	"PGDN" "PGDN" DEFAULTCOLOR
+150	"PGUP" "PGUP" DEFAULTCOLOR
+151	"HOME" "HOME" DEFAULTCOLOR
+152	"END" "END" DEFAULTCOLOR
+153	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+154	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+155	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+156	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+157	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+158	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+159	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+160	"KP_HOME" "KP_HOME" DEFAULTCOLOR
+161	"KP_UPARROW" "KP_UPARROW" DEFAULTCOLOR
+162	"KP_PGUP" "KP_PGUP" DEFAULTCOLOR
+163	"KP_LEFTARROW" "KP_LEFTARROW" DEFAULTCOLOR
+164	"KP_5" "KP_5" DEFAULTCOLOR
+165	"KP_RIGHTARROW" "KP_RIGHTARROW" DEFAULTCOLOR
+166	"KP_END" "KP_END" DEFAULTCOLOR
+167	"KP_DOWNARROW" "KP_DOWNARROW" DEFAULTCOLOR
+168	"KP_PGDN" "KP_PGDN" DEFAULTCOLOR
+169	"KP_ENTER" "KP_ENTER" DEFAULTCOLOR
+170	"KP_INS" "KP_INS" DEFAULTCOLOR
+171	"KP_DEL" "KP_DEL" DEFAULTCOLOR
+172	"KP_SLASH" "KP_SLASH" DEFAULTCOLOR
+173	"KP_MINUS" "KP_MINUS" DEFAULTCOLOR
+174	"KP_PLUS" "KP_PLUS" DEFAULTCOLOR
+175	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+176	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+177	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+178	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+179	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+180	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+181	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+182	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+183	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+184	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+185	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+186	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+187	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+188	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+189	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+190	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+191	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+192	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+193	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+194	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+195	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+196	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+197	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+198	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+199	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+200	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+201	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+202	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+203	"JOY1" "JOY1" COLOR 255 0 0
+204	"JOY2" "JOY2" COLOR 255 0 0
+205	"JOY3" "JOY3" COLOR 255 0 0 
+206	"JOY4" "JOY4" COLOR 255 0 0
+207	"AUX1" "AUX1" DEFAULTCOLOR
+208	"AUX2" "AUX2" DEFAULTCOLOR
+209	"AUX3" "AUX3" DEFAULTCOLOR
+210	"AUX4" "AUX4" DEFAULTCOLOR
+211	"AUX5" "AUX5" DEFAULTCOLOR
+212	"AUX6" "AUX6" DEFAULTCOLOR
+213	"AUX7" "AUX7" DEFAULTCOLOR
+214	"AUX8" "AUX8" DEFAULTCOLOR
+215	"AUX9" "AUX9" DEFAULTCOLOR
+216	"AUX10" "AUX10" DEFAULTCOLOR
+217	"AUX11" "AUX11" DEFAULTCOLOR
+218	"AUX12" "AUX12" DEFAULTCOLOR
+219	"AUX13" "AUX13" DEFAULTCOLOR
+220	"AUX14" "AUX14" DEFAULTCOLOR
+221	"AUX15" "AUX15" DEFAULTCOLOR
+222	"AUX16" "AUX16" DEFAULTCOLOR
+223	"AUX17" "AUX17" DEFAULTCOLOR
+224	"AUX18" "AUX18" DEFAULTCOLOR
+225	"AUX19" "AUX19" DEFAULTCOLOR
+226	"AUX20" "AUX20" DEFAULTCOLOR
+227	"AUX21" "AUX21" DEFAULTCOLOR
+228	"AUX22" "AUX22" DEFAULTCOLOR
+229	"AUX23" "AUX23" DEFAULTCOLOR
+230	"AUX24" "AUX24" DEFAULTCOLOR
+231	"AUX25" "AUX25" DEFAULTCOLOR
+232	"AUX26" "AUX26" DEFAULTCOLOR
+233	"AUX27" "AUX27" DEFAULTCOLOR
+234	"AUX28" "AUX28" DEFAULTCOLOR
+235	"AUX29" "AUX29" DEFAULTCOLOR
+236	"AUX30" "AUX30" DEFAULTCOLOR
+237	"AUX31" "AUX31" DEFAULTCOLOR
+238	"AUX32" "AUX32" DEFAULTCOLOR
+239	"MWHEELDOWN" "MWHEELDOWN" DEFAULTCOLOR
+240	"MWHEELUP" "MWHEELUP" DEFAULTCOLOR
+241	"MOUSE1" "MOUSE1" COLOR 0 255 255
+242	"MOUSE2" "MOUSE2" COLOR 0 255 255
+243	"MOUSE3" "MOUSE3" COLOR 0 255 255
+244	"MOUSE4" "MOUSE4" COLOR 0 255 255
+245	"MOUSE5" "MOUSE5" COLOR 0 255 255
+246	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+247	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+248	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+249	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+250	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+251	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+252	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+253	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+254	"<UNKNOWN KEYNUM>" "<UNKNOWN KEYNUM>" DEFAULTCOLOR
+255	"PAUSE" "PAUSE" DEFAULTCOLOR
diff --git a/main/gfx/shell/larrowdefault.bmp b/main/gfx/shell/larrowdefault.bmp
new file mode 100644
index 00000000..3c4a66fb
Binary files /dev/null and b/main/gfx/shell/larrowdefault.bmp differ
diff --git a/main/gfx/shell/larrowflyover.bmp b/main/gfx/shell/larrowflyover.bmp
new file mode 100644
index 00000000..7a3863d9
Binary files /dev/null and b/main/gfx/shell/larrowflyover.bmp differ
diff --git a/main/gfx/shell/larrowpressed.bmp b/main/gfx/shell/larrowpressed.bmp
new file mode 100644
index 00000000..0e94f1e3
Binary files /dev/null and b/main/gfx/shell/larrowpressed.bmp differ
diff --git a/main/gfx/shell/linux.bmp b/main/gfx/shell/linux.bmp
new file mode 100644
index 00000000..249985bc
Binary files /dev/null and b/main/gfx/shell/linux.bmp differ
diff --git a/main/gfx/shell/listen.bmp b/main/gfx/shell/listen.bmp
new file mode 100644
index 00000000..48cf1886
Binary files /dev/null and b/main/gfx/shell/listen.bmp differ
diff --git a/main/gfx/shell/lock.bmp b/main/gfx/shell/lock.bmp
new file mode 100644
index 00000000..c1e6e707
Binary files /dev/null and b/main/gfx/shell/lock.bmp differ
diff --git a/main/gfx/shell/min_d.bmp b/main/gfx/shell/min_d.bmp
new file mode 100644
index 00000000..a36ba7d3
Binary files /dev/null and b/main/gfx/shell/min_d.bmp differ
diff --git a/main/gfx/shell/min_f.bmp b/main/gfx/shell/min_f.bmp
new file mode 100644
index 00000000..4b8e527b
Binary files /dev/null and b/main/gfx/shell/min_f.bmp differ
diff --git a/main/gfx/shell/min_n.bmp b/main/gfx/shell/min_n.bmp
new file mode 100644
index 00000000..dbd0b1d1
Binary files /dev/null and b/main/gfx/shell/min_n.bmp differ
diff --git a/main/gfx/shell/nonfav.bmp b/main/gfx/shell/nonfav.bmp
new file mode 100644
index 00000000..d17ae53d
Binary files /dev/null and b/main/gfx/shell/nonfav.bmp differ
diff --git a/main/gfx/shell/pcg.bmp b/main/gfx/shell/pcg.bmp
new file mode 100644
index 00000000..08f582ed
Binary files /dev/null and b/main/gfx/shell/pcg.bmp differ
diff --git a/main/gfx/shell/rarrowdefault.bmp b/main/gfx/shell/rarrowdefault.bmp
new file mode 100644
index 00000000..2dee3462
Binary files /dev/null and b/main/gfx/shell/rarrowdefault.bmp differ
diff --git a/main/gfx/shell/rarrowflyover.bmp b/main/gfx/shell/rarrowflyover.bmp
new file mode 100644
index 00000000..59e99b4b
Binary files /dev/null and b/main/gfx/shell/rarrowflyover.bmp differ
diff --git a/main/gfx/shell/rarrowpressed.bmp b/main/gfx/shell/rarrowpressed.bmp
new file mode 100644
index 00000000..553c8d2d
Binary files /dev/null and b/main/gfx/shell/rarrowpressed.bmp differ
diff --git a/main/gfx/shell/scrn.bmp b/main/gfx/shell/scrn.bmp
new file mode 100644
index 00000000..d6bedf49
Binary files /dev/null and b/main/gfx/shell/scrn.bmp differ
diff --git a/main/gfx/shell/slider.bmp b/main/gfx/shell/slider.bmp
new file mode 100644
index 00000000..bad05a55
Binary files /dev/null and b/main/gfx/shell/slider.bmp differ
diff --git a/main/gfx/shell/sm_dnarf.bmp b/main/gfx/shell/sm_dnarf.bmp
new file mode 100644
index 00000000..43f39226
Binary files /dev/null and b/main/gfx/shell/sm_dnarf.bmp differ
diff --git a/main/gfx/shell/sm_dnarw.bmp b/main/gfx/shell/sm_dnarw.bmp
new file mode 100644
index 00000000..f3a2b90d
Binary files /dev/null and b/main/gfx/shell/sm_dnarw.bmp differ
diff --git a/main/gfx/shell/splash.bmp b/main/gfx/shell/splash.bmp
new file mode 100644
index 00000000..97ca032e
Binary files /dev/null and b/main/gfx/shell/splash.bmp differ
diff --git a/main/gfx/shell/splash8bit.bmp b/main/gfx/shell/splash8bit.bmp
new file mode 100644
index 00000000..fa7881c8
Binary files /dev/null and b/main/gfx/shell/splash8bit.bmp differ
diff --git a/main/gfx/shell/strings.lst b/main/gfx/shell/strings.lst
new file mode 100644
index 00000000..98a41602
--- /dev/null
+++ b/main/gfx/shell/strings.lst
@@ -0,0 +1,35 @@
+// String patches
+
+// #define IDS_MAIN_PREVIEWSHELP           400
+// #define IDS_MAIN_CUSTOMHELP             530
+// #define IDS_MAIN_RETURNHELP             188
+// #define IDS_MAIN_NEWGAMEHELP            189
+// #define IDS_MAIN_TRAININGHELP           190
+// #define IDS_MAIN_LOADHELP               191
+// #define IDS_MAIN_LOADSAVEHELP           192
+// #define IDS_MAIN_CONFIGUREHELP          193
+// #define IDS_MAIN_READMEHELP             194
+// #define IDS_MAIN_ORDERHELP              195
+// #define IDS_MAIN_QUITHELP               196
+// #define IDS_MAIN_QUICKHELP              197
+// #define IDS_MAIN_MULTIPLAYERHELP        198
+// #define IDS_MAIN_QUITPROMPTINGAME       235
+// #define IDS_MAIN_QUITPROMPT             236
+
+402 "www.natural-selection.org"
+400 "Find out more about Natural Selection."
+530 "Play a different game."
+188 "Resume your current game."
+189 " "
+190 "Training.  For best results, do this before playing online."
+191 " "
+192 " "
+193 "Edit your Configuration."
+194 "View the release notes."
+196 "Quit."
+198 "Multiplayer.  Begin your journey."
+235 "Are you sure you want to quit?"
+236 "Leaving? The hive mind awaits..."
+234 "Training? At a time like this?"
+338 "Could not validate Natural Selection"
+340 "Please insert your Half-life CD"
diff --git a/main/gfx/shell/thumb.bmp b/main/gfx/shell/thumb.bmp
new file mode 100644
index 00000000..0940a614
Binary files /dev/null and b/main/gfx/shell/thumb.bmp differ
diff --git a/main/gfx/shell/unlock.bmp b/main/gfx/shell/unlock.bmp
new file mode 100644
index 00000000..7c23ca09
Binary files /dev/null and b/main/gfx/shell/unlock.bmp differ
diff --git a/main/gfx/shell/up.bmp b/main/gfx/shell/up.bmp
new file mode 100644
index 00000000..e9c44011
Binary files /dev/null and b/main/gfx/shell/up.bmp differ
diff --git a/main/gfx/shell/uparrowd.bmp b/main/gfx/shell/uparrowd.bmp
new file mode 100644
index 00000000..3bbec01a
Binary files /dev/null and b/main/gfx/shell/uparrowd.bmp differ
diff --git a/main/gfx/shell/uparrowf.bmp b/main/gfx/shell/uparrowf.bmp
new file mode 100644
index 00000000..9653ef62
Binary files /dev/null and b/main/gfx/shell/uparrowf.bmp differ
diff --git a/main/gfx/shell/uparrowp.bmp b/main/gfx/shell/uparrowp.bmp
new file mode 100644
index 00000000..06793e2a
Binary files /dev/null and b/main/gfx/shell/uparrowp.bmp differ
diff --git a/main/gfx/shell/windows.bmp b/main/gfx/shell/windows.bmp
new file mode 100644
index 00000000..9fb6cfa8
Binary files /dev/null and b/main/gfx/shell/windows.bmp differ
diff --git a/main/gfx/shell/won_logo.bmp b/main/gfx/shell/won_logo.bmp
new file mode 100644
index 00000000..4eeb0f6a
Binary files /dev/null and b/main/gfx/shell/won_logo.bmp differ
diff --git a/main/gfx/vgui/320_arrow.tga b/main/gfx/vgui/320_arrow.tga
new file mode 100644
index 00000000..5975ae93
Binary files /dev/null and b/main/gfx/vgui/320_arrow.tga differ
diff --git a/main/gfx/vgui/640_arrow.tga b/main/gfx/vgui/640_arrow.tga
new file mode 100644
index 00000000..2a19d527
Binary files /dev/null and b/main/gfx/vgui/640_arrow.tga differ
diff --git a/main/gfx/vgui/640_checkset.tga b/main/gfx/vgui/640_checkset.tga
new file mode 100644
index 00000000..f8df2b7e
Binary files /dev/null and b/main/gfx/vgui/640_checkset.tga differ
diff --git a/main/gfx/vgui/640_checkunset.tga b/main/gfx/vgui/640_checkunset.tga
new file mode 100644
index 00000000..87b380ff
Binary files /dev/null and b/main/gfx/vgui/640_checkunset.tga differ
diff --git a/main/gfx/vgui/640_nsaag.tga b/main/gfx/vgui/640_nsaag.tga
new file mode 100644
index 00000000..420ccf4f
Binary files /dev/null and b/main/gfx/vgui/640_nsaag.tga differ
diff --git a/main/gfx/vgui/640_nsab.tga b/main/gfx/vgui/640_nsab.tga
new file mode 100644
index 00000000..082c7b74
Binary files /dev/null and b/main/gfx/vgui/640_nsab.tga differ
diff --git a/main/gfx/vgui/640_nsap.tga b/main/gfx/vgui/640_nsap.tga
new file mode 100644
index 00000000..e9d10703
Binary files /dev/null and b/main/gfx/vgui/640_nsap.tga differ
diff --git a/main/gfx/vgui/640_nsar.tga b/main/gfx/vgui/640_nsar.tga
new file mode 100644
index 00000000..ba5593f4
Binary files /dev/null and b/main/gfx/vgui/640_nsar.tga differ
diff --git a/main/gfx/vgui/640_nsaw.tga b/main/gfx/vgui/640_nsaw.tga
new file mode 100644
index 00000000..302f5679
Binary files /dev/null and b/main/gfx/vgui/640_nsaw.tga differ
diff --git a/main/gfx/vgui/640_scoreboardbad.tga b/main/gfx/vgui/640_scoreboardbad.tga
new file mode 100644
index 00000000..767e4f4b
Binary files /dev/null and b/main/gfx/vgui/640_scoreboardbad.tga differ
diff --git a/main/gfx/vgui/640_scoreboardcd.tga b/main/gfx/vgui/640_scoreboardcd.tga
new file mode 100644
index 00000000..0c2e3999
Binary files /dev/null and b/main/gfx/vgui/640_scoreboardcd.tga differ
diff --git a/main/gfx/vgui/640_scoreboardcontrib.tga b/main/gfx/vgui/640_scoreboardcontrib.tga
new file mode 100644
index 00000000..0e4c77a1
Binary files /dev/null and b/main/gfx/vgui/640_scoreboardcontrib.tga differ
diff --git a/main/gfx/vgui/640_scoreboarddev.tga b/main/gfx/vgui/640_scoreboarddev.tga
new file mode 100644
index 00000000..eb1cbcde
Binary files /dev/null and b/main/gfx/vgui/640_scoreboarddev.tga differ
diff --git a/main/gfx/vgui/640_scoreboardguide.tga b/main/gfx/vgui/640_scoreboardguide.tga
new file mode 100644
index 00000000..112759be
Binary files /dev/null and b/main/gfx/vgui/640_scoreboardguide.tga differ
diff --git a/main/gfx/vgui/640_scoreboardpt.tga b/main/gfx/vgui/640_scoreboardpt.tga
new file mode 100644
index 00000000..b85a5d05
Binary files /dev/null and b/main/gfx/vgui/640_scoreboardpt.tga differ
diff --git a/main/gfx/vgui/640_scoreboardserverop.tga b/main/gfx/vgui/640_scoreboardserverop.tga
new file mode 100644
index 00000000..2ea5c880
Binary files /dev/null and b/main/gfx/vgui/640_scoreboardserverop.tga differ
diff --git a/main/gfx/vgui/640_scoreboardtracker.tga b/main/gfx/vgui/640_scoreboardtracker.tga
new file mode 100644
index 00000000..3e543179
Binary files /dev/null and b/main/gfx/vgui/640_scoreboardtracker.tga differ
diff --git a/main/gfx/vgui/640_scoreboardunresolved.tga b/main/gfx/vgui/640_scoreboardunresolved.tga
new file mode 100644
index 00000000..a82f0eca
Binary files /dev/null and b/main/gfx/vgui/640_scoreboardunresolved.tga differ
diff --git a/main/gfx/vgui/640_scoreboardveteran.tga b/main/gfx/vgui/640_scoreboardveteran.tga
new file mode 100644
index 00000000..d2665e2d
Binary files /dev/null and b/main/gfx/vgui/640_scoreboardveteran.tga differ
diff --git a/main/gfx/vgui/fonts/1024_ActionButtonScheme.tga b/main/gfx/vgui/fonts/1024_ActionButtonScheme.tga
new file mode 100644
index 00000000..b94738d6
Binary files /dev/null and b/main/gfx/vgui/fonts/1024_ActionButtonScheme.tga differ
diff --git a/main/gfx/vgui/fonts/1024_CommanderStatusScheme.tga b/main/gfx/vgui/fonts/1024_CommanderStatusScheme.tga
new file mode 100644
index 00000000..ff9a070b
Binary files /dev/null and b/main/gfx/vgui/fonts/1024_CommanderStatusScheme.tga differ
diff --git a/main/gfx/vgui/fonts/1024_HierarchyScheme.tga b/main/gfx/vgui/fonts/1024_HierarchyScheme.tga
new file mode 100644
index 00000000..b94738d6
Binary files /dev/null and b/main/gfx/vgui/fonts/1024_HierarchyScheme.tga differ
diff --git a/main/gfx/vgui/fonts/1024_PSEScheme.tga b/main/gfx/vgui/fonts/1024_PSEScheme.tga
new file mode 100644
index 00000000..b94738d6
Binary files /dev/null and b/main/gfx/vgui/fonts/1024_PSEScheme.tga differ
diff --git a/main/gfx/vgui/fonts/1024_PieMenuScheme.tga b/main/gfx/vgui/fonts/1024_PieMenuScheme.tga
new file mode 100644
index 00000000..b94738d6
Binary files /dev/null and b/main/gfx/vgui/fonts/1024_PieMenuScheme.tga differ
diff --git a/main/gfx/vgui/fonts/1024_Scoreboard Tiny Text.tga b/main/gfx/vgui/fonts/1024_Scoreboard Tiny Text.tga
new file mode 100644
index 00000000..b94738d6
Binary files /dev/null and b/main/gfx/vgui/fonts/1024_Scoreboard Tiny Text.tga differ
diff --git a/main/gfx/vgui/fonts/1152_ActionButtonScheme.tga b/main/gfx/vgui/fonts/1152_ActionButtonScheme.tga
new file mode 100644
index 00000000..25019619
Binary files /dev/null and b/main/gfx/vgui/fonts/1152_ActionButtonScheme.tga differ
diff --git a/main/gfx/vgui/fonts/1152_CommanderStatusScheme.tga b/main/gfx/vgui/fonts/1152_CommanderStatusScheme.tga
new file mode 100644
index 00000000..98bbf62f
Binary files /dev/null and b/main/gfx/vgui/fonts/1152_CommanderStatusScheme.tga differ
diff --git a/main/gfx/vgui/fonts/1152_HierarchyScheme.tga b/main/gfx/vgui/fonts/1152_HierarchyScheme.tga
new file mode 100644
index 00000000..25019619
Binary files /dev/null and b/main/gfx/vgui/fonts/1152_HierarchyScheme.tga differ
diff --git a/main/gfx/vgui/fonts/1152_PSEScheme.tga b/main/gfx/vgui/fonts/1152_PSEScheme.tga
new file mode 100644
index 00000000..25019619
Binary files /dev/null and b/main/gfx/vgui/fonts/1152_PSEScheme.tga differ
diff --git a/main/gfx/vgui/fonts/1152_PieMenuScheme.tga b/main/gfx/vgui/fonts/1152_PieMenuScheme.tga
new file mode 100644
index 00000000..25019619
Binary files /dev/null and b/main/gfx/vgui/fonts/1152_PieMenuScheme.tga differ
diff --git a/main/gfx/vgui/fonts/1152_Scoreboard Tiny Text.tga b/main/gfx/vgui/fonts/1152_Scoreboard Tiny Text.tga
new file mode 100644
index 00000000..25019619
Binary files /dev/null and b/main/gfx/vgui/fonts/1152_Scoreboard Tiny Text.tga differ
diff --git a/main/gfx/vgui/fonts/1280_ActionButtonScheme.tga b/main/gfx/vgui/fonts/1280_ActionButtonScheme.tga
new file mode 100644
index 00000000..a4638d83
Binary files /dev/null and b/main/gfx/vgui/fonts/1280_ActionButtonScheme.tga differ
diff --git a/main/gfx/vgui/fonts/1280_CommanderStatusScheme.tga b/main/gfx/vgui/fonts/1280_CommanderStatusScheme.tga
new file mode 100644
index 00000000..ced13178
Binary files /dev/null and b/main/gfx/vgui/fonts/1280_CommanderStatusScheme.tga differ
diff --git a/main/gfx/vgui/fonts/1280_HierarchyScheme.tga b/main/gfx/vgui/fonts/1280_HierarchyScheme.tga
new file mode 100644
index 00000000..a4638d83
Binary files /dev/null and b/main/gfx/vgui/fonts/1280_HierarchyScheme.tga differ
diff --git a/main/gfx/vgui/fonts/1280_PSEScheme.tga b/main/gfx/vgui/fonts/1280_PSEScheme.tga
new file mode 100644
index 00000000..a4638d83
Binary files /dev/null and b/main/gfx/vgui/fonts/1280_PSEScheme.tga differ
diff --git a/main/gfx/vgui/fonts/1280_PieMenuScheme.tga b/main/gfx/vgui/fonts/1280_PieMenuScheme.tga
new file mode 100644
index 00000000..a4638d83
Binary files /dev/null and b/main/gfx/vgui/fonts/1280_PieMenuScheme.tga differ
diff --git a/main/gfx/vgui/fonts/1280_Scoreboard Tiny Text.tga b/main/gfx/vgui/fonts/1280_Scoreboard Tiny Text.tga
new file mode 100644
index 00000000..a4638d83
Binary files /dev/null and b/main/gfx/vgui/fonts/1280_Scoreboard Tiny Text.tga differ
diff --git a/main/gfx/vgui/fonts/1600_ActionButtonScheme.tga b/main/gfx/vgui/fonts/1600_ActionButtonScheme.tga
new file mode 100644
index 00000000..a4638d83
Binary files /dev/null and b/main/gfx/vgui/fonts/1600_ActionButtonScheme.tga differ
diff --git a/main/gfx/vgui/fonts/1600_CommanderStatusScheme.tga b/main/gfx/vgui/fonts/1600_CommanderStatusScheme.tga
new file mode 100644
index 00000000..4ab6f2ae
Binary files /dev/null and b/main/gfx/vgui/fonts/1600_CommanderStatusScheme.tga differ
diff --git a/main/gfx/vgui/fonts/1600_HierarchyScheme.tga b/main/gfx/vgui/fonts/1600_HierarchyScheme.tga
new file mode 100644
index 00000000..a4638d83
Binary files /dev/null and b/main/gfx/vgui/fonts/1600_HierarchyScheme.tga differ
diff --git a/main/gfx/vgui/fonts/1600_PSEScheme.tga b/main/gfx/vgui/fonts/1600_PSEScheme.tga
new file mode 100644
index 00000000..a4638d83
Binary files /dev/null and b/main/gfx/vgui/fonts/1600_PSEScheme.tga differ
diff --git a/main/gfx/vgui/fonts/1600_PieMenuScheme.tga b/main/gfx/vgui/fonts/1600_PieMenuScheme.tga
new file mode 100644
index 00000000..a4638d83
Binary files /dev/null and b/main/gfx/vgui/fonts/1600_PieMenuScheme.tga differ
diff --git a/main/gfx/vgui/fonts/1600_Scoreboard Tiny Text.tga b/main/gfx/vgui/fonts/1600_Scoreboard Tiny Text.tga
new file mode 100644
index 00000000..a4638d83
Binary files /dev/null and b/main/gfx/vgui/fonts/1600_Scoreboard Tiny Text.tga differ
diff --git a/main/gfx/vgui/fonts/320_ActionButtonScheme.tga b/main/gfx/vgui/fonts/320_ActionButtonScheme.tga
new file mode 100644
index 00000000..7571b73a
Binary files /dev/null and b/main/gfx/vgui/fonts/320_ActionButtonScheme.tga differ
diff --git a/main/gfx/vgui/fonts/320_CommanderStatusScheme.tga b/main/gfx/vgui/fonts/320_CommanderStatusScheme.tga
new file mode 100644
index 00000000..dbab826b
Binary files /dev/null and b/main/gfx/vgui/fonts/320_CommanderStatusScheme.tga differ
diff --git a/main/gfx/vgui/fonts/320_HierarchyScheme.tga b/main/gfx/vgui/fonts/320_HierarchyScheme.tga
new file mode 100644
index 00000000..7600ffd8
Binary files /dev/null and b/main/gfx/vgui/fonts/320_HierarchyScheme.tga differ
diff --git a/main/gfx/vgui/fonts/320_PSEScheme.tga b/main/gfx/vgui/fonts/320_PSEScheme.tga
new file mode 100644
index 00000000..7600ffd8
Binary files /dev/null and b/main/gfx/vgui/fonts/320_PSEScheme.tga differ
diff --git a/main/gfx/vgui/fonts/320_PieMenuScheme.tga b/main/gfx/vgui/fonts/320_PieMenuScheme.tga
new file mode 100644
index 00000000..7600ffd8
Binary files /dev/null and b/main/gfx/vgui/fonts/320_PieMenuScheme.tga differ
diff --git a/main/gfx/vgui/fonts/320_Scoreboard Tiny Text.tga b/main/gfx/vgui/fonts/320_Scoreboard Tiny Text.tga
new file mode 100644
index 00000000..7600ffd8
Binary files /dev/null and b/main/gfx/vgui/fonts/320_Scoreboard Tiny Text.tga differ
diff --git a/main/gfx/vgui/fonts/400_ActionButtonScheme.tga b/main/gfx/vgui/fonts/400_ActionButtonScheme.tga
new file mode 100644
index 00000000..75de7d84
Binary files /dev/null and b/main/gfx/vgui/fonts/400_ActionButtonScheme.tga differ
diff --git a/main/gfx/vgui/fonts/400_CommanderStatusScheme.tga b/main/gfx/vgui/fonts/400_CommanderStatusScheme.tga
new file mode 100644
index 00000000..26c06c33
Binary files /dev/null and b/main/gfx/vgui/fonts/400_CommanderStatusScheme.tga differ
diff --git a/main/gfx/vgui/fonts/400_HierarchyScheme.tga b/main/gfx/vgui/fonts/400_HierarchyScheme.tga
new file mode 100644
index 00000000..75de7d84
Binary files /dev/null and b/main/gfx/vgui/fonts/400_HierarchyScheme.tga differ
diff --git a/main/gfx/vgui/fonts/400_PSEScheme.tga b/main/gfx/vgui/fonts/400_PSEScheme.tga
new file mode 100644
index 00000000..75de7d84
Binary files /dev/null and b/main/gfx/vgui/fonts/400_PSEScheme.tga differ
diff --git a/main/gfx/vgui/fonts/400_PieMenuScheme.tga b/main/gfx/vgui/fonts/400_PieMenuScheme.tga
new file mode 100644
index 00000000..75de7d84
Binary files /dev/null and b/main/gfx/vgui/fonts/400_PieMenuScheme.tga differ
diff --git a/main/gfx/vgui/fonts/400_Scoreboard Tiny Text.tga b/main/gfx/vgui/fonts/400_Scoreboard Tiny Text.tga
new file mode 100644
index 00000000..75de7d84
Binary files /dev/null and b/main/gfx/vgui/fonts/400_Scoreboard Tiny Text.tga differ
diff --git a/main/gfx/vgui/fonts/512_ActionButtonScheme.tga b/main/gfx/vgui/fonts/512_ActionButtonScheme.tga
new file mode 100644
index 00000000..75de7d84
Binary files /dev/null and b/main/gfx/vgui/fonts/512_ActionButtonScheme.tga differ
diff --git a/main/gfx/vgui/fonts/512_CommanderStatusScheme.tga b/main/gfx/vgui/fonts/512_CommanderStatusScheme.tga
new file mode 100644
index 00000000..5842e5ac
Binary files /dev/null and b/main/gfx/vgui/fonts/512_CommanderStatusScheme.tga differ
diff --git a/main/gfx/vgui/fonts/512_HierarchyScheme.tga b/main/gfx/vgui/fonts/512_HierarchyScheme.tga
new file mode 100644
index 00000000..75de7d84
Binary files /dev/null and b/main/gfx/vgui/fonts/512_HierarchyScheme.tga differ
diff --git a/main/gfx/vgui/fonts/512_PSEScheme.tga b/main/gfx/vgui/fonts/512_PSEScheme.tga
new file mode 100644
index 00000000..75de7d84
Binary files /dev/null and b/main/gfx/vgui/fonts/512_PSEScheme.tga differ
diff --git a/main/gfx/vgui/fonts/512_PieMenuScheme.tga b/main/gfx/vgui/fonts/512_PieMenuScheme.tga
new file mode 100644
index 00000000..75de7d84
Binary files /dev/null and b/main/gfx/vgui/fonts/512_PieMenuScheme.tga differ
diff --git a/main/gfx/vgui/fonts/512_Scoreboard Tiny Text.tga b/main/gfx/vgui/fonts/512_Scoreboard Tiny Text.tga
new file mode 100644
index 00000000..75de7d84
Binary files /dev/null and b/main/gfx/vgui/fonts/512_Scoreboard Tiny Text.tga differ
diff --git a/main/gfx/vgui/fonts/640_ActionButtonScheme.tga b/main/gfx/vgui/fonts/640_ActionButtonScheme.tga
new file mode 100644
index 00000000..2f72eb73
Binary files /dev/null and b/main/gfx/vgui/fonts/640_ActionButtonScheme.tga differ
diff --git a/main/gfx/vgui/fonts/640_CommanderStatusScheme.tga b/main/gfx/vgui/fonts/640_CommanderStatusScheme.tga
new file mode 100644
index 00000000..a4638d83
Binary files /dev/null and b/main/gfx/vgui/fonts/640_CommanderStatusScheme.tga differ
diff --git a/main/gfx/vgui/fonts/640_HierarchyScheme.tga b/main/gfx/vgui/fonts/640_HierarchyScheme.tga
new file mode 100644
index 00000000..2f72eb73
Binary files /dev/null and b/main/gfx/vgui/fonts/640_HierarchyScheme.tga differ
diff --git a/main/gfx/vgui/fonts/640_PSEScheme.tga b/main/gfx/vgui/fonts/640_PSEScheme.tga
new file mode 100644
index 00000000..2f72eb73
Binary files /dev/null and b/main/gfx/vgui/fonts/640_PSEScheme.tga differ
diff --git a/main/gfx/vgui/fonts/640_PieMenuScheme.tga b/main/gfx/vgui/fonts/640_PieMenuScheme.tga
new file mode 100644
index 00000000..2f72eb73
Binary files /dev/null and b/main/gfx/vgui/fonts/640_PieMenuScheme.tga differ
diff --git a/main/gfx/vgui/fonts/640_Scoreboard Tiny Text.tga b/main/gfx/vgui/fonts/640_Scoreboard Tiny Text.tga
new file mode 100644
index 00000000..2f72eb73
Binary files /dev/null and b/main/gfx/vgui/fonts/640_Scoreboard Tiny Text.tga differ
diff --git a/main/gfx/vgui/fonts/800_ActionButtonScheme.tga b/main/gfx/vgui/fonts/800_ActionButtonScheme.tga
new file mode 100644
index 00000000..dbab826b
Binary files /dev/null and b/main/gfx/vgui/fonts/800_ActionButtonScheme.tga differ
diff --git a/main/gfx/vgui/fonts/800_CommanderStatusScheme.tga b/main/gfx/vgui/fonts/800_CommanderStatusScheme.tga
new file mode 100644
index 00000000..95d69757
Binary files /dev/null and b/main/gfx/vgui/fonts/800_CommanderStatusScheme.tga differ
diff --git a/main/gfx/vgui/fonts/800_HierarchyScheme.tga b/main/gfx/vgui/fonts/800_HierarchyScheme.tga
new file mode 100644
index 00000000..dbab826b
Binary files /dev/null and b/main/gfx/vgui/fonts/800_HierarchyScheme.tga differ
diff --git a/main/gfx/vgui/fonts/800_PSEScheme.tga b/main/gfx/vgui/fonts/800_PSEScheme.tga
new file mode 100644
index 00000000..dbab826b
Binary files /dev/null and b/main/gfx/vgui/fonts/800_PSEScheme.tga differ
diff --git a/main/gfx/vgui/fonts/800_PieMenuScheme.tga b/main/gfx/vgui/fonts/800_PieMenuScheme.tga
new file mode 100644
index 00000000..dbab826b
Binary files /dev/null and b/main/gfx/vgui/fonts/800_PieMenuScheme.tga differ
diff --git a/main/gfx/vgui/fonts/800_Scoreboard Tiny Text.tga b/main/gfx/vgui/fonts/800_Scoreboard Tiny Text.tga
new file mode 100644
index 00000000..dbab826b
Binary files /dev/null and b/main/gfx/vgui/fonts/800_Scoreboard Tiny Text.tga differ
diff --git a/main/gfx/vgui/icntlk_pl.tga b/main/gfx/vgui/icntlk_pl.tga
new file mode 100644
index 00000000..3774ce3a
Binary files /dev/null and b/main/gfx/vgui/icntlk_pl.tga differ
diff --git a/main/gfx/vgui/icntlk_sv.tga b/main/gfx/vgui/icntlk_sv.tga
new file mode 100644
index 00000000..7a6fded0
Binary files /dev/null and b/main/gfx/vgui/icntlk_sv.tga differ
diff --git a/main/gfx/vgui/ns-logo.tga b/main/gfx/vgui/ns-logo.tga
new file mode 100644
index 00000000..02a226eb
Binary files /dev/null and b/main/gfx/vgui/ns-logo.tga differ
diff --git a/main/hallwall_1.wad b/main/hallwall_1.wad
new file mode 100644
index 00000000..83b2a671
Binary files /dev/null and b/main/hallwall_1.wad differ
diff --git a/main/liblist.gam b/main/liblist.gam
new file mode 100644
index 00000000..1552f43a
--- /dev/null
+++ b/main/liblist.gam
@@ -0,0 +1,27 @@
+////////////////////////////
+// Natural Selection      //
+//   by Charlie Cleveland //
+////////////////////////////
+game "Natural Selection"
+url_info "www.natural-selection.org"
+url_dl "http://www.natural-selection.org/"
+version "v3.0"
+size "165000000"
+svonly "0"
+secure "0"
+cldll "cl_dlls\client.dll"
+hlversion "1110"
+// How to allow training but disable "New game"?
+type "multiplayer_only"
+// Don't show models in browser
+nomodels "1"
+nohimodel "1"
+// Only show NS-compliant maps
+mpentity "info_mapinfo"
+// Using HPB_bot support for now
+gamedll "dlls\ns.dll"
+gamedll_linux "dlls/ns_i386.so"
+// Training map
+//trainmap "ns_training"
+
+
diff --git a/main/listenserver.cfg b/main/listenserver.cfg
new file mode 100644
index 00000000..e3c3e62b
--- /dev/null
+++ b/main/listenserver.cfg
@@ -0,0 +1,85 @@
+// Use this file to configure your LISTEN server. 
+// This config file is executed everytime the server changes levels (disable by removing mapchangecfgfile at end)
+//
+// Please visit the server ops forum on www.natural-selection.org, or check out the manual if you have any questions about any of these settings.
+//
+// If you run a listen server and choose to modify this file, note that assigning values to the following variables within 
+// this file will stomp the choices you make in the Launcher server configuration "Advanced Options" screen:
+//
+
+////////////////////////////////////////////////////
+// Common between listenserver.cfg and server.cfg //
+////////////////////////////////////////////////////
+
+// Default server name. Change to "Bob's Server", etc.
+hostname "Natural Selection v3.0"
+
+// Must specify sv_region, or it won't show up in Steam server browser
+// 0: US East coast
+// 1: US West coast
+// 2: South America
+// 3: Europe
+// 4: Asia
+// 5: Australia
+// 6: Middle East
+// 7: Africa
+sv_region 0
+
+// general gameplay
+mp_autoconcede 4
+mp_limitteams 1
+mp_combattime 15
+
+// block abusive console scripts (wait, special, etc.)?
+mp_blockscripts 0
+
+// Set to -1 to disallow voting (looks in mapcycle.txt for entries)
+mp_mapvoteratio .6
+
+// Enable HLTV proxies to connect
+sv_proxies 1
+
+// maximum client movement speed (needed for commander mode)
+sv_maxspeed 4000
+sv_allowdownload 1
+mp_consistency 0
+
+// Commander voting
+mp_votedowntime 180
+mp_votecasttime 2
+mp_votepercentneeded .4
+mp_minvotesneeded 3
+
+// More obscure settings
+mp_countdowntime .2
+mp_latejointime 1.5
+mp_logdetail 0
+mp_falldamage 1
+mp_killdelay 3
+mp_flashlight 1
+mp_footsteps 1
+
+// disable autoaim and mad gibs
+sv_aim 0
+violence_hgibs 0
+violence_agibs 0
+
+// player bounding boxes (collisions, not clipping)
+sv_clienttrace 3.5
+
+///////////////////////////////
+// Dedicated server specific //
+///////////////////////////////
+sv_lan 0
+
+// disable clients' ability to pause the server
+pausable 0
+
+// List server op WON or Steam ids here, delimited by semi-colons (eg, "STEAM_0:1:12345;STEAM_0:0:56736"), to display server op icon next to these players on this server.
+mp_serverops ""
+
+// Allows display of special authentication icons next to people's names (including developers, Constellation members, etc.)
+mp_uplink 0
+
+// Needed so this file is executed on map change, like pre-NS v2.1
+mapchangecfgfile listenserver.cfg
diff --git a/main/logos/remapped.bmp b/main/logos/remapped.bmp
new file mode 100644
index 00000000..886d3a6a
Binary files /dev/null and b/main/logos/remapped.bmp differ
diff --git a/main/manual/Quick_Start_Guide.html b/main/manual/Quick_Start_Guide.html
new file mode 100644
index 00000000..6436a110
--- /dev/null
+++ b/main/manual/Quick_Start_Guide.html
@@ -0,0 +1,16 @@
+
+
+<!-- frames -->
+<frameset  cols="220,*" border="0" frameborder="0">
+    <frame name="ns_menu" src="http://www.natural-selection.org/check.html" marginwidth="0" marginheight="0" scrolling="no" frameborder="0" noresize>
+    <frameset  cols="565,*">
+        <frameset  rows="93,*">
+            <frame name="ns_toppanel" src="http://www.natural-selection.org/ns_top.html" marginwidth="0" marginheight="0" scrolling="no" frameborder="0" noresize>
+            <frame name="ns_content" src="Quick_Start_Guide_Noframes.html" marginwidth="0" marginheight="0" scrolling="auto" frameborder="0" noresize>
+        </frameset>
+        <frame name="ns_blank" src="http://www.natural-selection.org/blank.html" marginwidth="0" marginheight="0" scrolling="no" frameborder="0">
+    </frameset>
+</frameset>
+
+
+
diff --git a/main/manual/Quick_Start_Guide_Noframes.html b/main/manual/Quick_Start_Guide_Noframes.html
new file mode 100644
index 00000000..177fe144
--- /dev/null
+++ b/main/manual/Quick_Start_Guide_Noframes.html
@@ -0,0 +1,646 @@
+<html>
+<head>
+<title>Natural Selection v2.1 Manual</title>
+</head>
+<style>
+/* NS SITE CSS */
+BODY  { background: black; scrollbar-base-color: #333333  }
+P { margin-left: 1cm }
+a {
+	font-size: 8pt;
+	font-family: verdana, arial;
+	font-style: normal;
+	text-decoration: underline;
+	font-weight: bold;
+	color: #cccccc;
+	text-decoration: underline
+}
+b {font-size: 8pt; font-family: verdana, arial; font-style: normal; font-weight: bold; color: #cccccc; text-decoration: none}
+.header {font-size: 8pt; font-family: verdana, arial; font-style: normal; font-weight: normal; color: #999999}
+.headerNews {font-size: 8pt; font-family: verdana, arial; font-style: normal; font-weight: bold; color: #cc0000}
+.headerBold { font-weight: bold; color: #cccccc}
+.headerBold2 { font-size: 10pt; font-weight: bold; color: #cccccc}
+.newsText { font-size: 8pt; margin-left: 1cm; font-family: verdana, arial; color: #999999}
+.sectionBold { font-weight: bold; font-size: 12pt; color: #ffffff}
+.sectionBoldRed { font-weight: bold; font-size: 12pt; color: #CC0000}
+.headerGiant { font-size: 20pt; font-weight: bold; color: #ffffff}
+.headerItalics { font-size: 14pt; font-style: italic; font-weight: normal; color: #ffffff}
+.newsDate {font-size: 8pt; font-family: verdana, arial; color: #666666}
+.pageText { font-size: 8pt; font-family: verdana, arial; color: #999999}
+.pageItalics {font-size: 8pt; font-family: verdana, arial; font-style: italic; color: #ffffff}
+.fineprint  {font-size: 7pt; font-family: verdana, arial; color: #999999}
+.highlight { font-style:italic }
+.charlie { color:#FFFFFF;background-color:#006600 }
+.todo { color:#FFFFFF;background-color:#000066 }
+#content { position:absolute;top:30px;left:0px;width:520 }
+#menu { position:absolute;top:0px;left:0px;width:200 }
+#ss { position:absolute;top:0px;left:0px}
+/* MY CUSTOM CSS ADDITIONS FOR THIS PAGE */
+.label { font-weight:bold; color:#bbbbbb }
+h1 { font-size:10pt; font-weight:bold; color: #dddddd; margin:10px; margin-left:0.5cm; letter-spacing:6px }
+h1 .sub_h1 { font-size:8pt; font-weight:normal; letter-spacing:normal }
+h2 { font-size:9pt; font-weight:bold; color: #bbbbbb; margin:10px; margin-left:1cm }
+img { margin:10px }
+p { margin-right:10px;margin-top:0px }
+body { font-size:8pt; font-family:verdana,arial,sans-serif; color: #999999 }
+table { margin-left:1cm }
+th { text-align:left;font-size:7pt;letter-spacing:6px;color:#cc3333;padding-top:15px }
+td { font-size:8pt;padding:3px;padding-right:10px }
+td img { margin:5px }
+td p { margin-left:0px }
+.weaponstats { margin:0px;padding:0px;margin:0px;width:100% }
+.weaponstats td { margin:0px;padding:0px;margin:0px;width:50% }
+</style>
+<body>
+<div class="pageText">
+<div class="sectionBold" style="float:left">Natural Selection v2.1 Manual</div> <div style="text-align:right;margin-top:4px;margin-right:10px">Last Updated November 4th, 2003<br>Stats Updated ??? ??, ????</div>
+<h1 style="margin-top:15px">OVERVIEW</h1>
+<img src="quick_start_files/hive_icon.gif" style="float:right"><p>Natural Selection is a multiplayer-only Half-Life mod. In it, players join one of two very different teams:</p>
+<p><span class="label">The Frontiersmen</span> - elite marines using advanced technology and weaponry to take back human ships and bases. Victory requires intense teamwork, and excellent tactics.</p>
+<p><span class="label">The Kharaa</span> - ferocious alien creatures with amazing evolutionary and biological abilities, who hunt and destroy any and all intruders to their new territory. Victory requires skillful adaptation, and deadly combat proficiency.</li></ul>
+<h1>GETTING STARTED</h1>
+<p><span class="charlie">[Charlie writes about tech requirements, downloading]</span></p>
+<h1>GOALS <span class="sub_h1">(VICTORY)</span></h1>
+<p>To win, the Frontiersman must destroy all of the Kharaa and their ability to respawn. Kharaa respawn from hives. Each map has three potential hive locations. The Frontiersmen must destroy any active hives, and then hunt down any remaining Kharaa. When the last hive is destroyed, the Kharaa begin to die - though as long as there is one Kharaa out there with enough resources to build a new hive, the battle isn't over. When the last alien dies, the game ends.</p>
+<p>The Kharaa must destroy all Frontiersmen and their ability to respawn.  Marines respawn from infantry portals. Infantry portals can be built near any command console, in any quantity desired (though they cost resources -- typical numbers range from two to six). With the infantry portals destroyed, the aliens must prevent new ones from being built. There are two ways to accomplish this: by killing every Frontiersman, or by destroying all command consoles. As long as there is one marine, and one command console, the Frontiersmen have a chance to turn things around. When the last marine dies, the game ends.</p>
+<h1>STARTING CONDITIONS</h1>
+<p>The Frontiersmen begin the game at the Marine Base. This is the same location on each map. They start play with one resource collector and one command console. Note: until an infantry portal is built, marines won't be able to respawn. Starting weaponry for a Frontiersman is an LMG (light machine gun), pistol, and knife.</p>
+<p>The Kharaa begin the game at their first hive, which is randomly selected from one of three fixed locations on each map. They start play with one active hive and one resource collector. Each Kharaa begins as a Skulk (for more information on the five species of Kharaa, see the Alien Species section).</p>
+<h1>THE POP-UP MENU</h1>
+<p>The pop-up menu is a quick and intuitive way to access commands for both teams. Knowing your way around the pop-up menu will save you time … and might just save your skin.</p>
+<p>For the marines, it's used primarily for communication - asking for orders, urgent equipment requests, or reporting combat conditions. The advantage to using the pop-up menu for these tasks (as opposed to typed or voice communication) is that your requests pop up on the Commander's display, at your location. The pop-up menu can also be used for actions, like selecting and dropping weapons.</p>
+<p>The Kharaa also use their pop-up menu to communicate with teammates; but it's also how you spend resources to build, evolve new abilities, and change species (see the Kharaa sections below for more info).</p>
+<h1>RESOURCES</h1>
+<p>Frontiersmen need resources so their commander can give them goodies like sentry turrets, grenade launchers, jetpacks, and armor upgrades. Kharaa need resources so they can create new hives, evolve abilities like cloaking, and scent of fear, and change into new species of Kharaa like the thundering Onos, or the winged Lerk. Both teams use resources when they build anything, or improve their capabilities. This makes securing resources the key to victory in all but the quickest of games.</p>
+<p>The marines and aliens distribute resources in slightly different ways, and use them very differently. There are two methods of acquiring resources:</p>
+<table style="margin-bottom:20px">
+	<tr>
+		<th>SOURCE</th>
+		<th nowrap="nowrap">MARINE REWARD&nbsp;&nbsp;</th>
+		<th nowrap="nowrap">ALIEN REWARD</th>
+	</tr>
+	<tr style="vertical-align:top">
+		<td nowrap="nowrap">Killing an enemy player</td>
+		<td>1-3 random resources<br>to team</td>
+		<td>1-3 random resources<br>to killer</td>
+	</tr>
+	<tr style="vertical-align:top">
+		<td>Resource tower</td>
+		<td>1 resource per <nsvalue=kFuncResourceInjectionTime>4</nsvalue> seconds<br>to team</td>
+		<td>1 resource per <nsvalue=kFuncResourceInjectionTime>4</nsvalue> seconds<br>split evenly among team-members</td>
+	</tr>
+</table>
+<h1>THE COMMANDER <span class="sub_h1">(AND FOLLOWING ORDERS)</span></h1>
+<p>At the heart of the marine deployment is the Commander. From inside his command chair he has a bird's eye view of the action - choosing what technology to research, deciding where to build, equipping and healing your team, and guiding the marines to victory. A team without a commander, or that doesn't work very closely with one, is almost always toast.</p>
+<p>The Commander is in charge of spending the team resources. This means you'll be asking him for things fairly often (like health packs), but keep in mind: he can't give you something your team can't afford, or you haven't researched yet. And he's usually doing ten things at once - so while getting a  shotgun might seem vital to you, it might not be as important as dropping health packs for the squad fighting for their lives in an enemy hive.</p>
+<p>The Frontiersmen are at their best working together to carry out the Commander's orders. Following orders doesn't just lead to victory - it usually puts you where the action is, in the spots where the game is won or lost.</p>
+<p>Any marine can become commander by stepping into the Command Console. There can only be one Commander at a time.</p>
+<h1>MARINE WEAPONS & EQUIPMENT</h1>
+<p>Your Commander can equip you with new weapons and gear by researching the appropriate tech (which costs resource points) and then dropping the new weapon for you (which also costs).  Here's a list of the available weapons and gear:</p>
+<table>
+	<tr>
+		<th colspan="2">MARINE WEAPONS - SLOT 1</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/lmg.gif"></td>
+		<td><span class="label">LIGHT MACHINE GUN ::</span> Default weapon. Fair damage and range. Versatile and effective, more so in groups.  Marines spawn with <nsvalue=kMarineSpawnClips>2</nsvalue> clips of ammunition.
+		<table class="weaponstats">
+			<tr>
+				<td><span class="label">Damage:</span> <nsvalue=kMGDamage>10</nsvalue> units/shot</td>
+				<td><span class="label">Rate of fire:</span> <nsinverse=kMGROF>10</nsinverse> shots/sec</td>
+			</tr>
+			<tr>
+				<td><span class="label">Clip size:</span> <nsvalue=kMGMaxClip>50</nsvalue> bullets</td>
+				<td><span class="label">Max storage:</span> <nsvalue=kMGMaxAmmo>250</nsvalue> bullets</td>
+			</tr>
+			<tr>
+				<td><span class="label">Cost:</span> N/A</td>
+				<td><span class="label">Requires:</span> N/A</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/shotgun.gif"></td>
+		<td><span class="label">SHOTGUN ::</span> Deadly at close range. Fires <nsvalue=kSGBulletsPerShot>10</nsvalue> pellets per shot.
+		<table class="weaponstats">
+			<tr>
+				<td><span class="label">Damage:</span> <nsvalue=kSGDamage>17</nsvalue> units/pellet</td>
+				<td><span class="label">Rate of fire:</span> <nsinverse=kSGROF>130</nsinverse> shots/sec</td>
+			</tr>
+			<tr>
+				<td><span class="label">Clip size:</span> <nsvalue=kSGMaxClip>8</nsvalue> shots</td>
+				<td><span class="label">Max storage:</span> <nsvalue=kSGMaxAmmo>40</nsvalue> shots</td>
+			</tr>
+			<tr>
+				<td><span class="label">Cost:</span> <nsvalue=kShotgunCost>10</nsvalue> resources</td>
+				<td><span class="label">Requires:</span> Armory</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/hmg.gif"></td>
+		<td><span class="label">HEAVY MACHINE GUN ::</span> Not as accurate as the Machine Gun, but twice the punch and a bigger clip.
+		<table class="weaponstats">
+			<tr>
+				<td><span class="label">Damage:</span> <nsvalue=kHMGDamage>20</nsvalue> units/shot</td>
+				<td><span class="label">Rate of fire:</span> <nsinverse=kHMGROF>11</nsinverse> shots/sec</td>
+			</tr>
+			<tr>
+				<td><span class="label">Clip size:</span> <nsvalue=kHMGMaxClip>125</nsvalue> shots</td>
+				<td><span class="label">Max storage:</span> <nsvalue=kHMGMaxAmmo>250</nsvalue> shots</td>
+			</tr>
+			<tr>
+				<td><span class="label">Cost:</span> <nsvalue=kHMGCost>15</nsvalue> resources</td>
+				<td><span class="label">Requires:</span> Advanced Armory</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/grenade_launcher.gif"></td>
+		<td><span class="label">GRENADE LAUNCHER ::</span> Used for groups of enemies or structures. Grenades explode on contact with an enemy or after <nsvalue=kGrenDetonateTime>4</nsvalue> seconds 
+		with a radius of <nsvalue=kGrenadeRadius>350</nsvalue> units</span>.
+		<table class="weaponstats">
+			<tr>
+				<td><span class="label">Damage:</span> <nsvalue=kGrenadeDamage>125</nsvalue> units/shot</td>
+				<td><span class="label">Rate of fire:</span> <nsinverse=kGGROF>120</nsinverse> shots/sec</td>
+			</tr>
+			<tr>
+				<td><span class="label">Clip size:</span> <nsvalue=kGGMaxClip>4</nsvalue> shots</td>
+				<td><span class="label">Max storage:</span> <nsvalue=kGGMaxAmmo>30</nsvalue> shots</td>
+			</tr>
+			<tr>
+				<td><span class="label">Cost:</span> <nsvalue=kGrenadeLauncherCost>20</nsvalue> resources</td>
+				<td><span class="label">Requires:</span> Advanced Armory</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<th colspan="2">MARINE WEAPONS - SLOT 2</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/pistol.gif" style="text-align:center"></td>
+		<td><span class="label">PISTOL ::</span> Default secondary weapon. Good accuracy and power, small clip. Marines spawn with <nsvalue=kMarineSpawnClips>2</nsvalue> clips of ammunition.
+		<table class="weaponstats">
+			<tr>
+				<td><span class="label">Damage:</span> <nsvalue=kHGDamage>20</nsvalue> units/shot</td>
+				<td><span class="label">Rate of fire:</span> <nsinverse=kHGROF>20</nsinverse> shots/sec</td>
+			</tr>
+			<tr>
+				<td><span class="label">Clip size:</span> <nsvalue=kHGMaxClip>10</nsvalue> shots</td>
+				<td><span class="label">Max storage:</span> <nsvalue=kHGMaxAmmo>30</nsvalue> shots</td>
+			</tr>
+			<tr>
+				<td><span class="label">Cost:</span> N/A</td>
+				<td><span class="label">Requires:</span> N/A</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<th colspan="2">MARINE WEAPONS - SLOT 3</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/knife.gif"></td>
+		<td><span class="label">KNIFE ::</span> Last ditch weapon when marines run out of ammo or want to conserve it.
+		<table class="weaponstats">
+			<tr>
+				<td><span class="label">Damage:</span> <nsvalue=kKNDamage>30</nsvalue> units/sec</td>
+				<td><span class="label">Rate of fire:</span> <nsinverse=kKNROF>65</nsinverse> slashes/sec</td>
+			</tr>
+			<tr>
+				<td><span class="label">Clip size:</span> N/A</td>
+				<td><span class="label">Max storage:</span> N/A</td>
+			</tr>
+			<tr>
+				<td><span class="label">Cost:</span> N/A</td>
+				<td><span class="label">Requires:</span> N/A</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<th colspan="2">MARINE WEAPONS - SLOT 4</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/welder.gif" style="text-align:center"></td>
+		<td><span class="label">WELDER ::</span> Used to repair structures and armor, and to change map features.
+		<table class="weaponstats">
+			<tr>
+				<td><span class="label">Damage:</span> <nsvalue=kWelderDamage>4</nsvalue> units/sec</td>
+				<td><span class="label">Repair rate:</span> <nsvalue=kWelderRepairRate>50</nsvalue> units/sec</td>
+			</tr>
+			<tr>
+				<td><span class="label">Clip size:</span> unlimited</td>
+				<td><span class="label">Max storage:</span> N/A</td>
+			</tr>
+			<tr>
+				<td><span class="label">Cost:</span> <nsvalue=kWelderCost>5</nsvalue> resources</td>
+				<td><span class="label">Requires:</span> Armory</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/mine.gif" style="text-align:center"></td>
+		<td><span class="label">MINES ::</span> Trip mine/land mine used for defense.  Mines explode on contact with an enemy or after absorbing <nsvalue=kMineHealth>30</nsvalue> 
+		<nsvalue=kMineDamage>125</nsvalue></span> damage with a radius 
+		of <nsvalue=kMineRadius>300</nsvalue>.
+		<table class="weaponstats">
+			<tr>
+				<td><span class="label">Damage:</span> <nsvalue=kMineDamage>125</nsvalue></td>
+				<td><span class="label">Rate of fire:</span> N/A</td>
+			</tr>
+			<tr>
+				<td><span class="label">Clip size:</span> N/A</td>
+				<td><span class="label">Max storage:</span> <nsvalue=kMineMaxAmmo>5</nsvalue> mines</td>
+			</tr>
+			<tr>
+				<td><span class="label">Cost:</span> <nsvalue=kMineCost>10</nsvalue> 
+				resources for <nsvalue=kMineMaxAmmo>5</nsvalue></td>
+				<td><span class="label">Requires:</span> Armory</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+</table>
+<table>
+	<tr>
+		<th colspan="2">MARINE ARMOR AND EQUIPMENT</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/heavy.gif"></td><td style="width:100%"><p><span class="label">HEAVY ARMOR ::</span> Raises the armor of a marine from <nsvalue=kMarineBaseArmor>25</nsvalue> to 
+		<nsvalue=kMarineBaseHeavyArmor>200</nsvalue>.  The armor's extra bulk slows the marine slightly, causing him to move at 
+		<nspercent=kHeavySpeedMultiplier>95</nspercent>% of normal speed.  Armor upgrades from the arms lab are cumulative with the effect of the Heavy Armor suit.<br>
+		<span class="label">Cost:</span> <nsvalue=kHeavyArmorCost>15</nsvalue> resources per suit.</p></td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/jetpack.gif"></td><td><span class="label">JETPACK ::</span> Allows marines to deploy quickly, harass, and to stay out of harm's way of ground-based lifeforms.  Can't be worn with Heavy Armor. <br><span class="label">Cost:</span> <nsvalue=kJetpackCost>15</nsvalue> resources per pack.</td>
+	</tr>
+	<tr>
+		<td style="text-align:center"><img src="quick_start_files/health.gif"></td><td><span class="label">HEALTH PACK ::</span> Adds up to <nsvalue=kPointsPerHealth>50</nsvalue> health to a wounded marine; won't cause the marine's health to exceed the 
+		starting value of <nsvalue=kMarineHealth>100</nsvalue>.<br>
+		<span class="label">Cost:</span> <nsvalue=kHealthCost>2</nsvalue> resources per pack.</td>
+	</tr>
+	<tr>
+		<td style="text-align:center"><img src="quick_start_files/ammo.gif"></td><td><span class="label">AMMO PACK ::</span> Adds one clip worth of ammunition to the marine's inventory.  Automatically transforms itself into the appropriate ammunition type for the currently selected weapon.  Only picked up if the marine can hold more and the weapon requires ammunition for use.<br><span class="label">Cost:</span> <nsvalue=kAmmoCost>1</nsvalue> resource per pack.</td>
+	</tr>
+</table>
+<h1>MARINE TECHNOLOGY & UPGRADES</h1>
+<p>The Commander can also research upgrades that effect all marines:</p>
+<table>
+	<tr>
+		<th colspan="2">ARMS LAB UPGRADES</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_e_animated.gif"></td><td><span class="label">DAMAGE UPGRADES ::</span> Three levels of upgrade that provide <nspercent=kWeaponDamageLevelOne>10</nspercent>%/
+		<nspercent=kWeaponDamageLevelOne>10</nspercent>%/
+		<nspercent=kWeaponDamageLevelOne>10</nspercent>% increase to all marines, mines, sentries, seige cannons, etc.
+		<br><span class="label">Cost:</span> <nsvalue=kWeaponsOneResearchCost>20</nsvalue>/
+		<nsvalue=kWeaponsTwoResearchCost>30</nsvalue>/
+		<nsvalue=kWeaponsThreeResearchCost>40</nsvalue> resources
+		<br><span class="label">Research time:</span> <nsvalue=kWeaponsOneResearchTime>60</nsvalue>/
+		<nsvalue=kWeaponsTwoResearchTime>90</nsvalue>/
+		<nsvalue=kWeaponsThreeResearchTime>120</nsvalue> seconds</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_f_animated.gif"></td><td><span class="label">ARMOR UPGRADES ::</span> Three levels of upgrade that give a <nspercent=kMarineArmorLevelOne>20</nspercent>%/
+		<nspercent=kMarineArmorLevelTwo>40</nspercent>%/
+		<nspercent=kMarineArmorLevelThree>60</nspercent>% boost to the maximum armor of all marines.
+		<br><span class="label">Cost:</span> <nsvalue=kArmorOneResearchCost>20</nsvalue>/
+		<nsvalue=kArmorTwoResearchCost>30</nsvalue>/
+		<nsvalue=kArmorThreeResearchCost>40</nsvalue> resources
+		<br><span class="label">Research time:</span> <nsvalue=kArmorOneResearchTime>60</nsvalue>/
+		<nsvalue=kArmorTwoResearchTime>90</nsvalue>/
+		<nsvalue=kArmorThreeResearchTime>120</nsvalue> seconds</td>
+	</tr>
+	<tr>
+		<th colspan="2">TECH LAB UPGRADES</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_b.gif"></td><td><span class="label">JETPACK TECH ::</span> This technology allows marines to be equipped with jetpacks.  Once researched, jetpacks can be constructed within <nsvalue=kArmorDropRange>300</nsvalue> units of any prototype lab.
+		<br><span class="label">Cost:</span> <nsvalue=kJetpacksResearchCost>35</nsvalue> resources
+		<br><span class="label">Research time:</span> <nsvalue=kJetpacksResearchTime>50</nsvalue> seconds</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_c.gif"></td><td><span class="label">HEAVY TECH ::</span> This technology is required before heavy armor can be purchased.  Once complete, heavy armor can be constructed within <nsvalue=kArmorDropRange>300</nsvalue> units</span> of any prototype lab.
+		<br><span class="label">Cost:</span> <nsvalue=kHeavyArmorResearchCost>40</nsvalue> resources
+		<br><span class="label">Research time:</span> <nsvalue=kHeavyArmorResearchTime>100</nsvalue> seconds</td>
+	</tr>
+	<tr>
+		<th colspan="2">OBSERVATORY UPGRADES</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_a.gif"></td><td><span class="label">MOTION TRACKING ::</span> When this powerful upgrade is purchased, the commander and all marines see "blips" on their HUD where a moving enemy is detected, even through walls.  Aliens can counter this effect by staying close to sensory chambers.
+		<br><span class="label">Cost:</span> <nsvalue=kMotionTrackingResearchCost>35</nsvalue> resources
+		<br><span class="label">Research time:</span> <nsvalue=kMotionTrackingResearchTime>100</nsvalue> seconds</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_i.gif"></td><td><span class="label">DISTRESS BEACON ::</span> The distress beacon sends an SOS signal to the orbiting dropship.  When the signal is completed, the dropship reinforces the marine team (all dead marines respawn immediately).  This is a last ditch safety measure that can be used from a functioning observatory.
+		<br><span class="label">Cost:</span> <nsvalue=kDistressBeaconCost>15</nsvalue> resources
+		<br><span class="label">Time to activate:</span> <nsvalue=kDistressBeaconTime>3</nsvalue> seconds</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_j.gif"></td><td><span class="label">PHASE TECH ::</span> Phase tech is a specialized nanite technology needed for construction of phase gates.
+		<br><span class="label">Cost:</span> <nsvalue=kPhaseTechResearchCost>15</nsvalue> resources
+		<br><span class="label">Research time:</span> <nsvalue=kPhaseTechResearchTime>45</nsvalue> seconds</td>
+	</tr>
+	<tr>
+		<th colspan="2">ARMORY UPGRADES</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_k.gif"></td><td><span class="label">ADVANCED ARMORY ::</span> The armory must be upgraded to an advanced armory before heavy weapons can be purchased.  When complete, heavy machine guns and grenade launchers can be dropped within <nsvalue=kArmoryBuildDistance>300</nsvalue> units of the armory.
+		<br><span class="label">Cost:</span> <nsvalue=kArmoryUpgradeCost>30</nsvalue> resources
+		<br><span class="label">Research time:</span> <nsvalue=kArmoryUpgradeTime>180</nsvalue> seconds</td>
+	</tr>
+	<tr>
+		<th colspan="2">TURRET FACTORY UPGRADES</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_h.gif"></td><td><span class="label">SIEGE UPGRADE ::</span> Turret factories can be upgraded for siege capabilities.  Once this upgrade completes, Automated Siege Cannons can be built within <nsvalue=kTurretFactoryBuildDistance>400</nsvalue> units of the upgraded factory, allowing massive firepower versus enemy structures.
+		<br><span class="label">Cost:</span> <nsvalue=kTurretFactoryUpgradeCost>15</nsvalue> resources
+		<br><span class="label">Research time:</span> <nsvalue=kTurretFactoryUpgradeTime>15</nsvalue> seconds</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_g.gif"></td><td><span class="label">ELECTRICAL DEFENSE ::</span> Turret factories and resource nodes can be "electrified", providing automatic defense against smaller enemies.  Up to <nsvalue=kElectricalMaxTargets>2</nsvalue> targets within a 
+		<nsvalue=kElectricalRange>120</nsvalue> unit range will be shocked at once.
+		<table class="weaponstats" style="margin-bottom:0px">
+			<tr>
+				<td><span class="label">Damage:</span> <nsvalue=kElectricalDamage>25</nsvalue></td>
+				<td><span class="label">Rate of fire:</span> 1 shock/sec</td>
+			</tr>
+			<tr>
+				<td><span class="label">Cost:</span> <nsvalue=kArmoryUpgradeCost>30</nsvalue> resources</td>
+				<td><span class="label">Research time:</span> <nsvalue=kArmoryUpgradeTime>180</nsvalue> seconds</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+</table>
+
+<h1>MARINE STRUCTURES</h1>
+<p>Researching new weapons and upgrades requires the building of structures. Structures also serve many other purposes, from defense to allowing travel across the map. Your Commander will place structures, but until you and your teammates build them, they will not be active. To build, get within touching distance and hold down your "use" key.</p>
+<table>
+	<tr>
+		<th colspan=2>BASIC MARINE STRUCTURES</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/command_console.gif"></td><td><span class="label">COMMAND CONSOLE ::</span> Allows one marine to connect to the command network and take the role of Commander.  The marine team always starts with a single command console.
+		<br><span class="label">Cost:</span> <nsvalue=kCommandStationCost>20</nsvalue> resources
+		<br><span class="label">Build time:</span> <nsvalue=kCommandStationBuildTime>15</nsvalue> seconds
+		<br><span class="label">Health:</span> <nsvalue=kCommandStationHealth>10000</nsvalue> health</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/res_tower.gif"></td><td><span class="label">RESOURCE TOWER ::</span> Allows the commander to tap a ship or base's raw nano-supplies, by constructing collection machines over resource nozzles.  Adds <nsvalue=kFuncResourceInjectionAmount>1</nsvalue> resource every 
+		<nsvalue=kFuncResourceInjectionTime>4</nsvalue> seconds.
+		<br><span class="label">Cost:</span> <nsvalue=kResourceTowerCost>15</nsvalue> resources
+		<br><span class="label">Build time:</span> <nsvalue=kResourceTowerBuildTime>15</nsvalue> seconds
+		<br><span class="label">Health:</span> <nsvalue=kResourceTowerHealth>6000</nsvalue> health</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/inf_portal.gif"></td><td><span class="label">INFANTRY PORTAL ::</span> Allows marines to respawn after killed.  Infantry portals are the most crucial structure to defend, second only to the command console. Must be placed within <nsvalue=kCommandStationBuildDistance>400</nsvalue> units</span> of a command console.
+		<br><span class="label">Cost:</span> <nsvalue=kInfantryPortalCost>20</nsvalue> resources
+		<br><span class="label">Build time:</span> <nsvalue=kInfantryPortalBuildTime>10</nsvalue> seconds
+		<br><span class="label">Health:</span> <nsvalue=kInfantryPortalHealth>2500</nsvalue> health</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/armory.gif"></td><td><span class="label">ARMORY ::</span> Dispenses "free" ammo for a marine's active weapon, and allows weapon construction within <nsvalue=kArmoryBuildDistance>300</nsvalue> units.  Can be upgraded to an advanced armory for heavier weapons.
+		<br><span class="label">Cost:</span> <nsvalue=kArmoryCost>10</nsvalue> resources
+		<br><span class="label">Build time:</span> <nsvalue=kArmoryBuildTime>15</nsvalue> seconds
+		<br><span class="label">Health:</span> <nsvalue=kArmoryHealth>2400</nsvalue> health</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/observatory.gif"></td><td><span class="label">OBSERVATORY ::</span> Reveals nearby enemies (even when cloaked), allows scanner sweeps, distress beacons, and research of motion tracking. <nsvalue=kFuncResourceInjectionTime>4</nsvalue> seconds.  Scanner sweeps allow the commander to see cloaked aliens and 
+		structures in a <nsvalue=kScanRadius>800</nsvalue> unit radius for a duration 
+		of <nsvalue=kScanDuration>10</nsvalue> seconds.
+		<br><span class="label">Cost:</span> <nsvalue=kObservatoryCost>20</nsvalue> resources
+		<br><span class="label">Build time:</span> <nsvalue=kObservatoryBuildTime>15</nsvalue> seconds
+		<br><span class="label">Health:</span> <nsvalue=kObservatoryHealth>1700</nsvalue> health</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/phase_gate.gif"></td><td><span class="label">PHASE GATE ::</span> Allows marines to teleport between to distant areas on the map.
+		<br><span class="label">Cost:</span> <nsvalue=kPhaseGateCost>15</nsvalue> resources
+		<br><span class="label">Build time:</span> <nsvalue=kPhaseGateBuildTime>12</nsvalue> seconds
+		<br><span class="label">Health:</span> <nsvalue=kPhaseGateHealth>3000</nsvalue> health</td>
+	</tr>
+	<tr>
+		<th colspan=2>RESEARCH STRUCTURES</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/arms_lab.gif"></td><td><span class="label">ARMS LAB ::</span> Taps local resources to allow three levels of weapons and armor upgrades.
+		<br><span class="label">Cost:</span> <nsvalue=kArmsLabCost>25</nsvalue> resources
+		<br><span class="label">Build time:</span> <nsvalue=kArmsLabBuildTime>19</nsvalue> seconds
+		<br><span class="label">Health:</span> <nsvalue=kArmsLabHealth>2200</nsvalue> health</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/proto_lab.gif"></td><td><span class="label">PROTOTYPE LAB ::</span> Needed for jetpacks and heavy armor.
+		<br><span class="label">Cost:</span> <nsvalue=kPrototypeLabCost>40</nsvalue> resources
+		<br><span class="label">Build time:</span> <nsvalue=kPrototypeLabBuildTime>20</nsvalue> seconds
+		<br><span class="label">Health:</span> <nsvalue=kPrototypeLabHealth>4000</nsvalue> health</td>
+	</tr>
+	<tr>
+		<th colspan=2>DEFENSIVE STRUCTURES</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/turret_factory.gif"></td><td><span class="label">TURRET FACTORY ::</span> Allows sentry turrets (automated gun emplacements) to be built for base and perimeter defense.  Turrets must be placed within <nsvalue=kTurretFactoryBuildDistance>400</nsvalue> units of a factory.  Can be electrified to provide further protection.
+		<br><span class="label">Cost:</span> <nsvalue=kTurretFactoryCost>10</nsvalue> resources
+		<br><span class="label">Build time:</span> <nsvalue=kTurretFactoryBuildTime>13</nsvalue> seconds
+		<br><span class="label">Health:</span> <nsvalue=kTurretFactoryHealth>3000</nsvalue> health</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/sentry.gif"></td><td><span class="label">SENTRY TURRET ::</span> Automatically acquires targets and fires at enemy players and structures.  Needs a functioning turret factory nearby to continue working.
+		<table class="weaponstats" style="margin-bottom:0px">
+			<tr>
+				<td><span class="label">Damage:</span> <nsvalue=kSentryDamage>10</nsvalue> health/shot</td>
+				<td><span class="label">Rate of fire:</span> <nsinverse=kTurretBaseRateOfFire>666</nsinverse> shots/sec</td>
+			</tr>
+			<tr>
+				<td><span class="label">Cost:</span> <nsvalue=kSentryCost>10</nsvalue> resources</td>
+				<td><span class="label">Build time:</span> <nsvalue=kSentryBuildTime>7</nsvalue> seconds</td>
+			</tr>
+			<tr>
+				<td><span class="label">Health:</span> <nsvalue=kSentryHealth>1300</nsvalue> health</td>
+				<td></td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/siege.gif"></td><td><span class="label">AUTOMATED SIEGE CANNON ::</span> Stationary siege weapon that does tremendous damage to enemy structures (including hives). Can fire through walls but requires a marine spotter or scanner sweep to locate targets outside its field of view.
+		<table class="weaponstats" style="margin-bottom:0px">
+			<tr>
+				<td><span class="label">Damage:</span> <nsvalue=kSiegeDamage>165</nsvalue> health/shot</td>
+				<td><span class="label">Rate of fire:</span> <nsinverse=kSiegeROF>666</nsinverse> shots/sec</td>
+			</tr>
+			<tr>
+				<td><span class="label">Cost:</span> <nsvalue=kSiegeCost>15</nsvalue> resources</td>
+				<td><span class="label">Build time:</span> <nsvalue=kSiegeBuildTime>10</nsvalue> seconds</td>
+			</tr>
+			<tr>
+				<td><span class="label">Health:</span> <nsvalue=kSiegeHealth>2000</nsvalue> health</td>
+				<td></td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+</table>
+<h1>KHARAA BIOLOGY</h1>
+<div class="todo" style="float:right">[pic of hive, (active and inactive?)]</div><p>The Kharaa do not have a Commander - they have the Hive, and Gorges. Gorges are a species of Kharaa that can build chambers, and start new hives. Hives respawn dead aliens, and heal any aliens standing nearby. With every new active hive, all Kharaa species become more powerful, and gain access to new evolutionary abilities. Choosing your species and evolutions allows you to adapt and try different strategies over the course of a game.</p>
+
+<h1>KHARAA SPECIES</h1>
+<p>There are five species of Kharaa. All players spawn as Skulks. In order to evolve to different species, you'll need to spend resource points. If you have enough resources, you can change species as often as you like.</p> 
+<p>When you change species you'll cocoon into an egg, and a meter will show the remaining gestation time till you emerge as a different species. While gestating, you are helpless.</p>
+<p>Each species lends itself to different roles in combat - all of them important. If you die and respawn, you lose your evolutions and revert to a Skulk - which makes the more powerful species more costly to lose.</p>
+<table>
+	<tr>
+		<th colspan="2">KHARAA SPECIES</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/skulk.gif"></td><td><span class="label">SKULK ::</span> All-purpose combat and scouting class that can walk up walls and ceilings.
+		<table class="weaponstats">
+			<tr>
+				<td><span class="label">Cost:</span> <nsvalue=kSkulkCost>2</nsvalue> resources</td>
+				<td><span class="label">Gestation Time:</span> <nsvalue=kSkulkGestateTime>7</nsvalue> seconds</td>
+			</tr>
+			<tr>
+				<td><span class="label">Health:</span> <nsvalue=kSkulkHealth>70</nsvalue> health</td>
+				<td><span class="label">Armor:</span> <nsvalue=kSkulkBaseArmor>20</nsvalue> armor</td>
+			</tr>
+			<tr>
+				<td><span class="label">Speed:</span> <nsvalue=kSkulkBaseSpeed>290</nsvalue> units/sec</td>
+				<td></td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/gorge.gif"></td><td><span class="label">GORGE ::</span> Builder and "medic" class.  Determines team strategy by choosing which structures to build and when.
+		<table class="weaponstats">
+			<tr>
+				<td><span class="label">Cost:</span> <nsvalue=kGorgeCost>10</nsvalue> resources</td>
+				<td><span class="label">Gestation Time:</span> <nsvalue=kGorgeGestateTime>17</nsvalue> seconds</td>
+			</tr>
+			<tr>
+				<td><span class="label">Health:</span> <nsvalue=kGorgeHealth>150</nsvalue> health</td>
+				<td><span class="label">Armor:</span> <nsvalue=kGorgeBaseArmor>40</nsvalue> armor</td>
+			</tr>
+			<tr>
+				<td><span class="label">Speed:</span> <nsvalue=kGorgeBaseSpeed>170</nsvalue> units/sec</td>
+				<td></td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/lerk.gif"></td><td><span class="label">LERK ::</span> Flying support class.  Not much of a fighter himself, but can heavily boost effectiveness of teammates.  Good for hive defense, and abilities serve as "spells" he can use to attack or defend players or areas.
+		<table class="weaponstats">
+			<tr>
+				<td><span class="label">Cost:</span> <nsvalue=kLerkCost>30</nsvalue> resources</td>
+				<td><span class="label">Gestation Time:</span> <nsvalue=kLerkGestateTime>28</nsvalue> seconds</td>
+			</tr>
+			<tr>
+				<td><span class="label">Health:</span> <nsvalue=kLerkHealth>125</nsvalue> health</td>
+				<td><span class="label">Armor:</span> <nsvalue=kLerkBaseArmor>30</nsvalue> armor</td>
+			</tr>
+			<tr>
+				<td><span class="label">Speed:</span> <nsvalue=kLerkBaseSpeed>250</nsvalue> units/sec</td>
+				<td></td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/fade.gif"></td><td><span class="label">FADE ::</span> Finesse attacking class.</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/onos.gif"></td><td><span class="label">ONOS ::</span> Lets player lead the charge and do tremendous damage to groups of players.</td>
+	</tr>
+</table>
+<h2>Kharaa Chambers</h2>
+
+Every active hive allows for one kind of chamber to be built (with the exception of offensive chambers and resource chambers, which can always be built). 
+
+<span class="todo">[Def Chamber - w/healing affect, and each one built allows another level of defensive evolutions, max 3]
+[Movement Chamber - w/adrenaline and transport affect, and each one built allows another level of movement evolutions, max 3]
+[Sensory Chamber - w/cloaking and hive site affect, and each one built allows another level of sensory evolutions, max 3]
+[Offensive Chamber - attacks like turret. No evolutionary impact.]
+[Resource Chamber - gathers res. No evolutionary impact.]</span>
+
+<h2>Kharaa Evolutions (Upgrades)</h2>
+
+There are three categories of evolution: Defensive, Movement, and Sensory. To get all three, your team will need three active hives. You can only choose one evolution from each category. If you die and respawn, you can choose again. Evolving a new ability also requires gestation time, though far less than changing species. 
+
+<span class="todo">[list evolutions]</span>
+
+Example of evolutions and chambers: at the start of the game, the Kharaa decide to go with Movement as their first type of evolution. A Gorge builds a movement chamber, and the movement icon flashes on each player's screen. For two resource points, the players can now use their pop-up menus to choose celerity, adrenaline, or redeem. Whichever they choose, it will only be at level 1 until someone builds another chamber. Movement chambers can now be built anywhere, for offensive or defensive purposes. When a second hive goes up, the team will then have to choose whether to go for Defense or Sensory chambers.
+
+
+<h2>Hive sight</h2>
+
+Where the marines have a Commander and upgrades like motion tracking, the Kharaa have hive sight. When you first play a Kharaa, turn slowly in a 360º circle. You'll see ghostly circles appear. Some will be your fellow Kharaa, on the other side of the wall, or the other side of the map. Others may be hives. You'll be able to see them move, and the rings will get larger or smaller with distance. This is your hive sight. You can also use hive sight to scout the enemy. Anything that one Kharaa sees, all see. 
+
+Hive sight icons:
+
+<span class="todo">[list of hive sight icons]</span>
+
+<h2>Waypoints</h2>
+
+The Frontiersmen Commander uses waypoints to gather troops together, help them get around the map, and send lone marines or groups of them to important objectives. When you are given a waypoint, you'll hear a voice say "Move to your waypoint, soldier!" If you turn in a circle, you'll see the waypoint on your screen, looking like this:
+
+<span class="todo">[pic of waypoint with random distance/room/order]</span>
+
+A waypoint gives you its distance in kilometers from your current position, the name of the location on the map (unless it doesn't have one) and any orders associated with the waypoint (build/defend/etc). The distance will go down as you approach, and the waypoint icon will grow larger.
+
+If you're lost, or your Commander asks you to go somewhere you're unfamiliar with, ask for a waypoint.
+
+
+<h2>Ammo and Health (Frontiersmen)</h2>
+
+Frontiersmen can get ammo two ways - if the team has an armory, it will provide unlimited, free ammo. Just stand next to it and hit the use key. The commander can also drop ammo packs, but this costs resources. 
+
+Frontiersmen can only be healed by health packs (which also cost resources), and only the commander can provide them. The only way to repair armor (and structures) is with a welder.
+
+<h2>Ammo and Health (Kharaa)</h2>
+
+Since the Kharaa's weapons are biological, they don't have to worry about ammo. They do have to watch their energy bar, however - when it's depleted they won't be able to attack. The adrenaline evolution, or standing next to a movement chamber increase how quickly energy renews. 
+
+Kharaa are healed by standing next to a hive or defense chamber, or if a Gorge gives them a hit of healing spray. Finally, the defensive evolution regeneration allows an alien to heal itself. Healing restores health first, then armor.
+
+<h2>Controls (ala CS manual, <span class="charlie">Charlie</span>)</h2>
+ 
+<span class="todo">[list of controls]</span>
+
+<h2>Special pop-up commands</h2>
+
+-	Eject commander
+-	Morphing
+-	Ready room
+-	Etc.
+
+<h2>Minimap for both sides</h2>
+
+<span class="todo">[ ]</span>
+
+<h2>Commander interface (<span class="charlie">Charlie</span>)</h2>
+-	Screenshot showing different symbols on UI
+-	How to create squads/hotgroups
+-	How use the keyboard shortcuts
+
+<h2>Game options screen (<span class="charlie">Charlie</span>)</h2>
+-	No screenshots needed, but description for each command
+
+<h2>Console commands (includes multiplayer server options)</h2>
+
+<span class="todo">[ ]</span>
+
+<h2>Hints</h2>
+-	Marine and commander philosophy
+-	Explain how aliens should deal with electrification
+
+<h2>Version history (<span class="charlie">Charlie</span>)</h2>
+ 
+
+</div></body></html>
\ No newline at end of file
diff --git a/main/manual/Quick_Start_Guide_Tables.html b/main/manual/Quick_Start_Guide_Tables.html
new file mode 100644
index 00000000..e93663ba
--- /dev/null
+++ b/main/manual/Quick_Start_Guide_Tables.html
@@ -0,0 +1,1099 @@
+<html><head><title>Natural Selection v2.1 Manual</title>
+
+<style>
+/* NS SITE CSS */
+BODY  { background: black; scrollbar-base-color: #333333  }
+P { margin-left: 1cm }
+a {
+	font-size: 8pt;
+	font-family: verdana, arial;
+	font-style: normal;
+	text-decoration: underline;
+	font-weight: bold;
+	color: #cccccc;
+	text-decoration: underline
+}
+b {font-size: 8pt; font-family: verdana, arial; font-style: normal; font-weight: bold; color: #cccccc; text-decoration: none}
+.header {font-size: 8pt; font-family: verdana, arial; font-style: normal; font-weight: normal; color: #999999}
+.headerNews {font-size: 8pt; font-family: verdana, arial; font-style: normal; font-weight: bold; color: #cc0000}
+.headerBold { font-weight: bold; color: #cccccc}
+.headerBold2 { font-size: 10pt; font-weight: bold; color: #cccccc}
+.newsText { font-size: 8pt; margin-left: 1cm; font-family: verdana, arial; color: #999999}
+.sectionBold { font-weight: bold; font-size: 12pt; color: #ffffff}
+.sectionBoldRed { font-weight: bold; font-size: 12pt; color: #CC0000}
+.headerGiant { font-size: 20pt; font-weight: bold; color: #ffffff}
+.headerItalics { font-size: 14pt; font-style: italic; font-weight: normal; color: #ffffff}
+.newsDate {font-size: 8pt; font-family: verdana, arial; color: #666666}
+.pageText { font-size: 8pt; font-family: verdana, arial; color: #999999}
+.pageItalics {font-size: 8pt; font-family: verdana, arial; font-style: italic; color: #ffffff}
+.fineprint  {font-size: 7pt; font-family: verdana, arial; color: #999999}
+.highlight { font-style:italic }
+.charlie { color:#FFFFFF;background-color:#006600 }
+.todo { color:#FFFFFF;background-color:#000066 }
+#content { position:absolute;top:30px;left:0px;width:520 }
+#menu { position:absolute;top:0px;left:0px;width:200 }
+#ss { position:absolute;top:0px;left:0px}
+/* MY CUSTOM CSS ADDITIONS FOR THIS PAGE */
+.label { font-weight:bold; color:#bbbbbb }
+h1 { font-size:10pt; font-weight:bold; color: #dddddd; margin:10px; margin-left:0cm; letter-spacing:6px }
+h1 .sub_h1 { font-size:8pt; font-weight:normal; letter-spacing:normal }
+h2 { font-size:9pt; font-weight:bold; color: #bbbbbb; margin:10px; margin-left:0.5cm }
+img { margin:10px }
+p { margin-right:10px;margin-top:0px }
+body { font-size:8pt; font-family:verdana,arial,sans-serif; color: #999999 }
+table { margin-left:0.5cm }
+th { text-align:left;font-size:7pt;letter-spacing:6px;color:#cc3333;padding-top:15px }
+td { font-size:8pt;padding:3px;padding-right:10px }
+td img { margin:5px }
+td p { margin-left:0px }
+.stattable { margin:0px;padding:0px;margin:0px;width:100% }
+.stattable td { margin:0px;padding:0px;margin:0px;width:50% }
+</style></head>
+
+<body>
+<div class="pageText">
+<hr>
+Sample of the date tag: <ns:date format="%B %d, %Y">November 21, 2003</ns:date><br>
+Sample #2 of the date tag: <ns:date format="%m/%d/%y">11/21/03</ns:date>
+<hr>
+<table>
+	<tr>
+		<th colspan="4">THE NATURAL SELECTION SCORING SYSTEM</th>
+	</tr>
+	<tr>
+		<td class="label">MARINE ACTION</td>
+		<td class="label">REWARD</td>
+		<td class="label">ALIEN ACTION</td>
+		<td class="label">REWARD</td>
+	</tr>
+	<tr>
+		<td>Killing Skulk</td>
+		<td style="text-align:center"><ns:value name="kScoringKillPlayer">1</ns:value></td>
+		<td>Killing Marine</td>
+		<td style="text-align:center"><ns:value name="kScoringKillPlayer">1</ns:value></td>
+	</tr>
+	<tr>
+		<td>Killing Gorge</td>
+		<td style="text-align:center"><ns:value name="kScoringKillPlayerGorge">2</ns:value></td>
+		<td>Killing Jetpack Marine</td>
+		<td style="text-align:center"><ns:value name="kScoringKillPlayerJetpack">3</ns:value></td>
+	</tr>
+	<tr>
+		<td>Killing Lerk</td>
+		<td style="text-align:center"><ns:value name="kScoringKillPlayerLerk">3</ns:value></td>
+		<td>Killing Heavy Armor Marine</td>
+		<td style="text-align:center"><ns:value name="kScoringKillPlayerHA">4</ns:value></td>
+	</tr>
+	<tr>
+		<td>Killing Fade</td>
+		<td style="text-align:center"><ns:value name="kScoringKillPlayerFade">4</ns:value></td>
+		<td>Killing Sentry Turret</td>
+		<td style="text-align:center"><ns:value name="kScoringTurretValue">2</ns:value></td>
+	</tr>
+	<tr>
+		<td>Killing Onos</td>
+		<td style="text-align:center"><ns:value name="kScoringKillPlayerOnos">5</ns:value></td>
+		<td>Killing Automated Siege Cannon</td>
+		<td style="text-align:center"><ns:value name="kScoringSiegeValue">3</ns:value></td>
+	</tr>
+	<tr>
+		<td>Building Command Chair</td>
+		<td style="text-align:center"><ns:value name="kScoringCCValue">5</ns:value></td>
+		<td>Building Hive</td>
+		<td style="text-align:center"><ns:value name="kScoringHiveValue">5</ns:value></td>
+	</tr>
+	<tr>
+		<td>Building Resource Tower</td>
+		<td style="text-align:center"><ns:value name="kScoringResourceTowerValue">3</ns:value></td>
+		<td>Building Alien Resource Tower</td>
+		<td style="text-align:center"><ns:value name="kScoringResourceTowerValue">3</ns:value></td>
+	</tr>
+	<tr>
+		<td>Building Other Marine Structure</td>
+		<td style="text-align:center"><ns:value name="kScoringMarineBuildableValue">2</ns:value></td>
+		<td>Building Other Alien Structure</td>
+		<td style="text-align:center"><ns:value name="kScoringAlienUpgradeChamberValue">2</ns:value></td>
+	</tr>
+</table>
+<hr>
+<table>
+	<tr>
+		<th colspan="4">THE NATURAL SELECTION RESOURCE SYSTEM</th>
+	</tr>
+	<tr>
+		<td class="label">GAME ACTION</td>
+		<td nowrap="nowrap" class="label">MARINE REWARD</td>
+		<td nowrap="nowrap" class="label">ALIEN REWARD</td>
+	</tr>
+	<tr style="vertical-align: top;">
+		<td nowrap="nowrap">Killing an enemy player</td>
+		<td><ns:value name="kKillRewardMin">1</ns:value>-<ns:value name="kKillRewardMax">3</ns:value> random resources to your team</td>
+		<td><ns:value name="kKillRewardMin">1</ns:value>-<ns:value name="kKillRewardMax">3</ns:value> random resources to you</td>
+	</tr>
+	<tr style="vertical-align: top;">
+		<td>Resource tower</td>
+		<td><ns:value name="kFuncResourceInjectionAmount">1</ns:value> resource per <ns:value name="kFuncResourceInjectionTime">4</ns:value> seconds to your team</td>
+		<td><ns:value name="kFuncResourceInjectionAmount">1</ns:value> resource per <ns:value name="kFuncResourceInjectionTime">4</ns:value> seconds split evenly among all players on your team</td>
+	</tr>
+</table>
+<hr>
+<table>
+	<tr>
+		<th colspan="2">MARINE WEAPONS - SLOT 1</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/lmg.gif"></td>
+		<td><span class="label">LIGHT MACHINE GUN ::</span> Default weapon. Fair damage and range. Versatile and effective, more so in groups.  Marines spawn with <ns:value name="kMarineSpawnClips">2</ns:value> clips of ammunition.
+		<table class="stattable">
+			<tr>
+				<td><span class="label">Damage:</span> <ns:value name="kMGDamage">10</ns:value> hp/shot</td>
+				<td><span class="label">Rate of fire:</span> <ns:inverse name="kMGROF">10.00</ns:inverse> shots/sec</td>
+			</tr>
+			<tr>
+				<td><span class="label">Clip size:</span> <ns:value name="kMGMaxClip">50</ns:value> bullets</td>
+				<td><span class="label">Max storage:</span> <ns:value name="kMGMaxAmmo">250</ns:value> bullets</td>
+			</tr>
+			<tr>
+				<td><span class="label">Cost:</span> N/A</td>
+				<td><span class="label">Requires:</span> N/A</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/shotgun.gif"></td>
+		<td><span class="label">SHOTGUN ::</span> Deadly at close range. Fires <ns:value name="kSGBulletsPerShot">10</ns:value> pellets per shot.
+		<table class="stattable">
+			<tr>
+				<td><span class="label">Damage:</span> <ns:value name="kSGDamage">17</ns:value> hp/pellet</td>
+				<td><span class="label">Rate of fire:</span> <ns:inverse name="kSGROF">0.77</ns:inverse> shots/sec</td>
+			</tr>
+			<tr>
+				<td><span class="label">Clip size:</span> <ns:value name="kSGMaxClip">8</ns:value> shots</td>
+				<td><span class="label">Max storage:</span> <ns:value name="kSGMaxAmmo">40</ns:value> shots</td>
+			</tr>
+			<tr>
+				<td><span class="label">Cost:</span> <ns:value name="kShotgunCost">10</ns:value> resources</td>
+				<td><span class="label">Requires:</span> Armory</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/hmg.gif"></td>
+		<td><span class="label">HEAVY MACHINE GUN ::</span> Not as accurate as the Machine Gun, but twice the punch and a bigger clip.
+		<table class="stattable">
+			<tr>
+				<td><span class="label">Damage:</span> <ns:value name="kHMGDamage">20</ns:value> hp/shot</td>
+				<td><span class="label">Rate of fire:</span> <ns:inverse name="kHMGROF">9.09</ns:inverse> shots/sec</td>
+			</tr>
+			<tr>
+				<td><span class="label">Clip size:</span> <ns:value name="kHMGMaxClip">125</ns:value> bullets</td>
+				<td><span class="label">Max storage:</span> <ns:value name="kHMGMaxAmmo">250</ns:value> bullets</td>
+			</tr>
+			<tr>
+				<td><span class="label">Cost:</span> <ns:value name="kHMGCost">15</ns:value> resources</td>
+				<td><span class="label">Requires:</span> Advanced Armory</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/grenade_launcher.gif"></td>
+		<td><span class="label">GRENADE LAUNCHER ::</span> Used for groups of enemies or structures. Grenades explode on contact with an enemy or after <ns:value name="kGrenDetonateTime">4</ns:value> seconds with a radius of <ns:value name="kGrenadeRadius">350</ns:value> units.
+		<table class="stattable">
+			<tr>
+				<td><span class="label">Damage:</span> <ns:value name="kGrenadeDamage">125</ns:value> hp/shot</td>
+				<td><span class="label">Rate of fire:</span> <ns:inverse name="kGGROF">0.83</ns:inverse> shots/sec</td>
+			</tr>
+			<tr>
+				<td><span class="label">Clip size:</span> <ns:value name="kGGMaxClip">4</ns:value> shots</td>
+				<td><span class="label">Max storage:</span> <ns:value name="kGGMaxAmmo">30</ns:value> shots</td>
+			</tr>
+			<tr>
+				<td><span class="label">Cost:</span> <ns:value name="kGrenadeLauncherCost">20</ns:value> resources</td>
+				<td><span class="label">Requires:</span> Advanced Armory</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<th colspan="2">MARINE WEAPONS - SLOT 2</th>
+	</tr>
+	<tr>
+		<td><img style="text-align: center;" src="quick_start_files/pistol.gif"></td>
+		<td><span class="label">PISTOL ::</span> Default secondary weapon. Good accuracy and power, small clip. Marines spawn with <ns:value name="kMarineSpawnClips">2</ns:value> clips of ammunition.
+		<table class="stattable">
+			<tr>
+				<td><span class="label">Damage:</span> <ns:value name="kHGDamage">20</ns:value> hp/shot</td>
+				<td><span class="label">Rate of fire:</span> <ns:inverse name="kHGROF">5.00</ns:inverse> shots/sec</td>
+			</tr>
+			<tr>
+				<td><span class="label">Clip size:</span> <ns:value name="kHGMaxClip">10</ns:value> shots</td>
+				<td><span class="label">Max storage:</span> <ns:value name="kHGMaxAmmo">30</ns:value> shots</td>
+			</tr>
+			<tr>
+				<td><span class="label">Cost:</span> N/A</td>
+				<td><span class="label">Requires:</span> N/A</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<th colspan="2">MARINE WEAPONS - SLOT 3</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/knife.gif"></td>
+		<td><span class="label">KNIFE ::</span> Last ditch weapon when marines run out of ammo or want to conserve it.
+		<table class="stattable">
+			<tr>
+				<td><span class="label">Damage:</span> <ns:value name="kKNDamage">30</ns:value> hp/slash</td>
+				<td><span class="label">Rate of fire:</span> <ns:inverse name="kKNROF">1.54</ns:inverse> slashes/sec</td>
+			</tr>
+			<tr>
+				<td><span class="label">Clip size:</span> N/A</td>
+				<td><span class="label">Max storage:</span> N/A</td>
+			</tr>
+			<tr>
+				<td><span class="label">Cost:</span> N/A</td>
+				<td><span class="label">Requires:</span> N/A</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<th colspan="2">MARINE WEAPONS - SLOT 4</th>
+	</tr>
+	<tr>
+		<td><img style="text-align: center;" src="quick_start_files/welder.gif"></td>
+		<td><span class="label">WELDER ::</span> Used to repair structures and armor, and to weld certain map features open or closed. Weldable objects are marked by special icons on the marine HUD. 
+		<table class="stattable">
+			<tr>
+				<td><span class="label">Damage:</span> <ns:value name="kWelderDamage">4</ns:value> hp/sec</td>
+				<td><span class="label">Repair rate:</span> <ns:value name="kWelderRepairRate">50</ns:value> hp/sec</td>
+			</tr>
+			<tr>
+				<td><span class="label">Clip size:</span> unlimited</td>
+				<td><span class="label">Max storage:</span> N/A</td>
+			</tr>
+			<tr>
+				<td><span class="label">Cost:</span> <ns:value name="kWelderCost">5</ns:value> resources</td>
+				<td><span class="label">Requires:</span> Armory</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td><img style="text-align: center;" src="quick_start_files/mine.gif"></td>
+		<td><span class="label">MINES ::</span> Trip mine/land mine used for defense.  Mines explode on contact with an enemy or after absorbing <ns:value name="kMineHealth">30</ns:value> hp of damage with a radius of <ns:value name="kMineRadius">300</ns:value> units.
+		<table class="stattable">
+			<tr>
+				<td><span class="label">Damage:</span> <ns:value name="kMineDamage">125</ns:value> hp</td>
+				<td><span class="label">Rate of fire:</span> N/A</td>
+			</tr>
+			<tr>
+				<td><span class="label">Clip size:</span> N/A</td>
+				<td><span class="label">Max storage:</span> <ns:value name="kMineMaxAmmo">5</ns:value> mines</td>
+			</tr>
+			<tr>
+				<td><span class="label">Cost:</span> <ns:value name="kMineCost">10</ns:value> resources for <ns:value name="kMineMaxAmmo">5</ns:value></td>
+				<td><span class="label">Requires:</span> Armory</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+</table>
+<hr>
+<table>
+	<tr>
+		<th colspan="2">MARINE ARMOR AND EQUIPMENT</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/heavy.gif"></td>
+		<td style="width: 100%;"><p><span class="label">HEAVY ARMOR ::</span> Raises the armor of a marine to <ns:value name="kMarineBaseHeavyArmor">200</ns:value> hp.  The armor's extra bulk slows the marine slightly, causing him to move at <ns:percent name="kHeavySpeedMultiplier">95%</ns:percent> of normal speed.  Armor upgrades from the arms lab are cumulative with the effect of the Heavy Armor suit.<br>
+		<span class="label">Cost:</span> <ns:value name="kHeavyArmorCost">15</ns:value> resources<br>
+		<span class="label">Duration:</span> for the marine's lifetime</p></td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/jetpack.gif"></td>
+		<td><span class="label">JETPACK ::</span> Allows sustained flight, until the energy meter hits zero. Must land to recharge. Handy for avoiding fangs and claws. Can't be worn with Heavy Armor.<br>
+		<span class="label">Cost:</span> <ns:value name="kJetpackCost">15</ns:value> resources<br>
+		<span class="label">Duration:</span> for the marine's lifetime</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/catalyst.gif"></td>
+		<td><span class="label">CATALYST PACK ::</span> Boosts the metabolism of a marine, hurting him in the process.  The marine gains a <ns:percent name="kCatalystSpeedIncrease">25%</ns:percent> bonus to speed and fires his weapons <ns:percent name="kCatalystSpeedIncrease">25%</ns:percent> faster, but loses <ns:percent name="kCatalystDamagePercent">25%</ns:percent> of his total health. A marine can't die from using a cat pack.<br>
+		<span class="label">Cost:</span> <ns:value name="kCatalystCost">4</ns:value> resources<br>
+		<span class="label">Duration:</span> <ns:value name="kCatalystDuration">8</ns:value> seconds</td>
+	</tr>
+</table>
+<hr>
+<table>
+	<tr>
+		<th colspan="2">ARMS LAB UPGRADES</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_e_animated.gif"></td>
+		<td><span class="label">DAMAGE UPGRADES ::</span> Three levels of upgrade that provide <ns:percent name="kWeaponDamageLevelOne">10%</ns:percent>, <ns:percent name="kWeaponDamageLevelTwo">20%</ns:percent>, and <ns:percent name="kWeaponDamageLevelThree">30%</ns:percent> increases to the standard damage of all marine weapons, mines, turrets, and siege cannons.<br>
+		<span class="label">Cost:</span> <ns:value name="kWeaponsOneResearchCost">20</ns:value>/<ns:value name="kWeaponsTwoResearchCost">30</ns:value>/<ns:value name="kWeaponsThreeResearchCost">40</ns:value> resources<br>
+		<span class="label">Research time:</span> <ns:value name="kWeaponsOneResearchTime">60</ns:value>/<ns:value name="kWeaponsTwoResearchTime">90</ns:value>/<ns:value name="kWeaponsThreeResearchTime">120</ns:value> seconds</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_f_animated.gif"></td>
+		<td><span class="label">ARMOR UPGRADES ::</span> Three levels of upgrade that give a <ns:percent name="kMarineArmorLevelOne">20%</ns:percent>, <ns:percent name="kMarineArmorLevelTwo">40%</ns:percent>, and <ns:percent name="kMarineArmorLevelThree">60%</ns:percent> boost to the maximum armor of all marines.<br>
+		<span class="label">Cost:</span> <ns:value name="kArmorOneResearchCost">20</ns:value>/<ns:value name="kArmorTwoResearchCost">30</ns:value>/<ns:value name="kArmorThreeResearchCost">40</ns:value> resources<br>
+		<span class="label">Research time:</span> <ns:value name="kArmorOneResearchTime">60</ns:value>/<ns:value name="kArmorTwoResearchTime">90</ns:value>/<ns:value name="kArmorThreeResearchTime">120</ns:value> seconds</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_l.gif"></td>
+		<td><span class="label">CATALYSTS ::</span> This technology allows the commander to drop catalyst packs anywhere on the map.<br>
+		<span class="label">Cost:</span> <ns:value name="kCatalystResearchCost">20</ns:value> resources<br>
+		<span class="label">Research time:</span> <ns:value name="kCatalystResearchTime">40</ns:value> seconds</td>
+	<tr>
+		<th colspan="2">TECH LAB UPGRADES</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_b.gif"></td><td><span class="label">JETPACK TECH ::</span> Once researched, this technology allows jetpacks to be constructed within <ns:value name="kArmorDropRange">300</ns:value> units of any prototype lab.<br>
+		<span class="label">Cost:</span> <ns:value name="kJetpacksResearchCost">35</ns:value> resources<br>
+		<span class="label">Research time:</span> <ns:value name="kJetpacksResearchTime">50</ns:value> seconds</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_c.gif"></td><td><span class="label">HEAVY TECH ::</span> This technology is required before heavy armor can be purchased.  Once complete, heavy armor can be constructed within <ns:value name="kArmorDropRange">300</ns:value> units of any prototype lab.<br>
+		<span class="label">Cost:</span> <ns:value name="kHeavyArmorResearchCost">40</ns:value> resources<br>
+		<span class="label">Research time:</span> <ns:value name="kHeavyArmorResearchTime">100</ns:value> seconds</td>
+	</tr>
+	<tr>
+		<th colspan="2">OBSERVATORY UPGRADES</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_a.gif"></td><td><span class="label">MOTION TRACKING ::</span> This upgrade reveals all enemy movement, anywhere on the battlefield, as "blips" automatically displayed on the marine HUD. The Kharaa can counter this effect by standing still, or staying close to sensory chambers.<br>
+		<span class="label">Cost:</span> <ns:value name="kMotionTrackingResearchCost">35</ns:value> resources<br>
+		<span class="label">Research time:</span> <ns:value name="kMotionTrackingResearchTime">100</ns:value> seconds</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_i.gif"></td><td><span class="label">DISTRESS BEACON ::</span> The distress beacon is the commander's last ditch SOS call for reinforcements. All marines waiting to respawn appear in the marine base, even if there are no infantry portals left.<br>
+		<span class="label">Cost:</span> <ns:value name="kDistressBeaconCost">15</ns:value> resources<br>
+		<span class="label">Time to activate:</span> <ns:value name="kDistressBeaconTime">3</ns:value> seconds</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_j.gif"></td><td><span class="label">PHASE TECH ::</span> Phase tech is a specialized nanite technology needed for the construction of phase gates (see Marine Structures).<br>
+		<span class="label">Cost:</span> <ns:value name="kPhaseTechResearchCost">15</ns:value> resources<br>
+		<span class="label">Research time:</span> <ns:value name="kPhaseTechResearchTime">45</ns:value> seconds</td>
+	</tr>
+	<tr>
+		<th colspan="2">ARMORY UPGRADES</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_k.gif"></td><td><span class="label">ADVANCED ARMORY ::</span> The armory must be upgraded to an advanced armory before heavy weapons can be purchased. When complete, heavy machine guns and grenade launchers can be dropped within <ns:value name="kArmoryBuildDistance">300</ns:value> units of the armory.<br>
+		<span class="label">Cost:</span> <ns:value name="kArmoryUpgradeCost">30</ns:value> resources<br>
+		<span class="label">Research time:</span> <ns:value name="kArmoryUpgradeTime">180</ns:value> seconds</td>
+	</tr>
+	<tr>
+		<th colspan="2">TURRET FACTORY UPGRADES</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_h.gif"></td><td><span class="label">SIEGE UPGRADE ::</span> Turret factories must be be upgraded, before siege cannons can be built. Once this upgrade completes, Siege Cannons can be built within <ns:value name="kTurretFactoryBuildDistance">400</ns:value> units of the structure.<br>
+		<span class="label">Cost:</span> <ns:value name="kTurretFactoryUpgradeCost">15</ns:value> resources<br>
+		<span class="label">Research time:</span> <ns:value name="kTurretFactoryUpgradeTime">15</ns:value> seconds</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_g.gif"></td><td><span class="label">ELECTRICAL DEFENSE ::</span> An electric field that protects turret factories and resource nodes by shocking up to <ns:value name="kElectricalMaxTargets">2</ns:value> enemies at once within a <ns:value name="kElectricalRange">200</ns:value> unit range.
+		<table style="margin-bottom: 0px;" class="stattable">
+			<tr>
+				<td><span class="label">Damage:</span> <ns:value name="kElectricalDamage">25</ns:value> hp</td>
+				<td><span class="label">Rate of fire:</span> 1.00 shock/sec</td>
+			</tr>
+			<tr>
+				<td><span class="label">Cost:</span> <ns:value name="kArmoryUpgradeCost">30</ns:value> resources</td>
+				<td><span class="label">Research time:</span> <ns:value name="kArmoryUpgradeTime">180</ns:value> seconds</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+</table>
+<hr>
+<table>
+	<tr>
+		<th colspan="2">BASIC MARINE STRUCTURES</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/command_console.gif"></td>
+		<td><span class="label">COMMAND CONSOLE ::</span> Allows one marine to connect to the command network and take the role of Commander. The marine team always starts with a single command console.<br>
+		<span class="label">Cost:</span> <ns:value name="kCommandStationCost">20</ns:value> resources<br>
+		<span class="label">Build time:</span> <ns:value name="kCommandStationBuildTime">15</ns:value> seconds<br>
+		<span class="label">Health:</span> <ns:value name="kCommandStationHealth">10000</ns:value> hp</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/res_tower.gif"></td>
+		<td><span class="label">RESOURCE TOWER ::</span> Allows the commander to tap a ship or base's raw nano-supplies. Can only be constructed over resource nozzles. Each tower adds <ns:value name="kFuncResourceInjectionAmount">1</ns:value> resource every <ns:value name="kFuncResourceInjectionTime">4</ns:value> seconds.<br>
+		<span class="label">Cost:</span> <ns:value name="kResourceTowerCost">15</ns:value> resources<br>
+		<span class="label">Build time:</span> <ns:value name="kResourceTowerBuildTime">15</ns:value> seconds<br>
+		<span class="label">Health:</span> <ns:value name="kResourceTowerHealth">6000</ns:value> hp</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/inf_portal.gif"></td>
+		<td><span class="label">INFANTRY PORTAL ::</span> Allows marines to respawn after being killed. Infantry portals are the most crucial structure to defend, second only to the command console. Must be placed within <ns:value name="kCommandStationBuildDistance">400</ns:value> units of a command console. Note: the marines do <u>not</u> start play with any infantry portals.<br>
+		<span class="label">Cost:</span> <ns:value name="kInfantryPortalCost">20</ns:value> resources<br>
+		<span class="label">Build time:</span> <ns:value name="kInfantryPortalBuildTime">10</ns:value> seconds<br>
+		<span class="label">Health:</span> <ns:value name="kInfantryPortalHealth">2500</ns:value> hp</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/armory.gif"></td>
+		<td><span class="label">ARMORY ::</span> Dispenses "free" ammo for a marine's active weapon, and allows weapon construction within <ns:value name="kArmoryBuildDistance">300</ns:value> units.  Can be upgraded to an advanced armory for heavier weapons.<br>
+		<span class="label">Cost:</span> <ns:value name="kArmoryCost">10</ns:value> resources<br>
+		<span class="label">Build time:</span> <ns:value name="kArmoryBuildTime">15</ns:value> seconds<br>
+		<span class="label">Health:</span> <ns:value name="kArmoryHealth">2400</ns:value> hp</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/observatory.gif"></td>
+		<td><span class="label">OBSERVATORY ::</span> Reveals nearby enemies (even when cloaked), allows scanner sweeps, distress beacons, and research of motion tracking. Scanner sweeps allow the commander to see cloaked aliens and structures in a <ns:value name="kScanRadius">800</ns:value> unit radius from the origin of the sweep, for a duration of <ns:value name="kScanDuration">10</ns:value> seconds.<br>
+		<span class="label">Cost:</span> <ns:value name="kObservatoryCost">20</ns:value> resources<br>
+		<span class="label">Build time:</span> <ns:value name="kObservatoryBuildTime">15</ns:value> seconds<br>
+		<span class="label">Health:</span> <ns:value name="kObservatoryHealth">1700</ns:value> hp</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/phase_gate.gif"></td>
+		<td><span class="label">PHASE GATE ::</span> Allows marines to teleport instantly between any two portals. For more than two portals, the destination is randomly determined. To use a portal, stand next to it and press your "use" key ( <span class="todo">[  ]</span> default setting).<br>
+		<span class="label">Cost:</span> <ns:value name="kPhaseGateCost">15</ns:value> resources<br>
+		<span class="label">Build time:</span> <ns:value name="kPhaseGateBuildTime">12</ns:value> seconds<br>
+		<span class="label">Health:</span> <ns:value name="kPhaseGateHealth">3000</ns:value> hp</td>
+	</tr>
+	<tr>
+		<th colspan="2">RESEARCH STRUCTURES</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/arms_lab.gif"></td><td><span class="label">ARMS LAB ::</span> Taps local resources to allow three levels of weapons and armor upgrades.<br>
+		<span class="label">Cost:</span> <ns:value name="kArmsLabCost">25</ns:value> resources<br>
+		<span class="label">Build time:</span> <ns:value name="kArmsLabBuildTime">19</ns:value> seconds<br>
+		<span class="label">Health:</span> <ns:value name="kArmsLabHealth">2200</ns:value> hp</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/proto_lab.gif"></td><td><span class="label">PROTOTYPE LAB ::</span> Allows the research of advanced, cuttinge edge technology - presently jetpacks and heavy armor.<br>
+		<span class="label">Cost:</span> <ns:value name="kPrototypeLabCost">40</ns:value> resources<br>
+		<span class="label">Build time:</span> <ns:value name="kPrototypeLabBuildTime">20</ns:value> seconds<br>
+		<span class="label">Health:</span> <ns:value name="kPrototypeLabHealth">4000</ns:value> hp</td>
+	</tr>
+	<tr>
+		<th colspan="2">DEFENSIVE STRUCTURES</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/turret_factory.gif"></td><td><span class="label">TURRET FACTORY ::</span> Allows sentry turrets (automated gun emplacements) to be built for base and perimeter defense. Turrets must be placed within <ns:value name="kTurretFactoryBuildDistance">400</ns:value> units of a factory. The Electrical Defense upgrade protects turret factories.<br>
+		<span class="label">Cost:</span> <ns:value name="kTurretFactoryCost">10</ns:value> resources<br>
+		<span class="label">Build time:</span> <ns:value name="kTurretFactoryBuildTime">13</ns:value> seconds<br>
+		<span class="label">Health:</span> <ns:value name="kTurretFactoryHealth">3000</ns:value> hp</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/sentry.gif"></td><td><span class="label">SENTRY TURRET ::</span> Automatically acquires the nearest enemy target (players or structures) and fires. If its turret factory is destroyed, it ceases to function. The Electrical Defense upgrade protects turrets.<br>
+		<table style="margin-bottom: 0px;" class="stattable">
+			<tr>
+				<td><span class="label">Damage:</span> <ns:value name="kSentryDamage">10</ns:value> hp/shot</td>
+				<td><span class="label">Rate of fire:</span> <ns:inverse name="kTurretBaseRateOfFire">1.43</ns:inverse> shots/sec</td>
+			</tr>
+			<tr>
+				<td><span class="label">Cost:</span> <ns:value name="kSentryCost">10</ns:value> resources</td>
+				<td><span class="label">Build time:</span> <ns:value name="kSentryBuildTime">7</ns:value> seconds</td>
+			</tr>
+			<tr>
+				<td><span class="label">Health:</span> <ns:value name="kSentryHealth">1300</ns:value> hp</td>
+				<td></td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/siege.gif"></td><td><span class="label">AUTOMATED SIEGE CANNON ::</span> Automatically acquires the nearest enemy structure it can "see" (but not players) and focuses a devestating blast at its location. The siege cannon can fire through walls or obstacles up to the limit of its range, but only if the target is "painted" by a marine spotter (who just has to look at it) or a commander's scanner sweep (see the Observatory entry). Enemies caught standing next to a blast also take damage.  Alien chambers are hurt for double the damage listed.<br>
+		<table style="margin-bottom: 0px;" class="stattable">
+			<tr>
+				<td><span class="label">Damage:</span> <ns:value name="kSiegeDamage">165</ns:value> hp/shot</td>
+				<td><span class="label">Rate of fire:</span> <ns:inverse name="kSiegeROF">0.25</ns:inverse> shots/sec</td>
+			</tr>
+			<tr>
+				<td><span class="label">Cost:</span> <ns:value name="kSiegeCost">15</ns:value> resources</td>
+				<td><span class="label">Build time:</span> <ns:value name="kSiegeBuildTime">10</ns:value> seconds</td>
+			</tr>
+			<tr>
+				<td><span class="label">Health:</span> <ns:value name="kSiegeHealth">2000</ns:value> hp</td>
+				<td></td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+</table>
+<hr>
+<table>
+	<tr>
+		<th colspan="2">ALIEN SPECIES</th>
+	</tr>
+	<tr>
+		<td style="padding-bottom:0px"><img src="quick_start_files/skulk.gif"></td><td><span class="label">SKULK ::</span> All-purpose combat and scouting class that can walk up walls and ceilings.
+		<table class="stattable" style="margin-bottom:0px">
+			<tr>
+				<td><span class="label">Cost:</span> <ns:value name="kSkulkCost">2</ns:value> resources</td>
+				<td><span class="label">Gestation Time:</span> <ns:value name="kSkulkGestateTime">7</ns:value> seconds</td>
+			</tr>
+			<tr>
+				<td><span class="label">Health:</span> <ns:value name="kSkulkHealth">70</ns:value> hp</td>
+				<td><span class="label">Armor:</span> <ns:value name="kSkulkBaseArmor">20</ns:value> hp</td>
+			</tr>
+			<tr>
+				<td><span class="label">Speed:</span> <ns:value name="kSkulkBaseSpeed">290</ns:value> units/sec</td>
+				<td></td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td colspan="2">
+		<table style="margin:0px;margin-left:0.75cm">
+			<tr>
+				<td><img src="quick_start_files/attack_bite.gif"></td>
+				<td>Using its powerful jaws, the skulk can cause major damage point blank range<br>
+				<table class="stattable" style="margin-bottom:0px">
+					<tr>
+						<td><span class="label">Damage:</span> <ns:value name="kBiteDamage">75</ns:value> hp/bite</td>
+						<td><span class="label">Rate of Fire:</span> ?? bites/sec</td>
+					</tr>
+					<tr>
+						<td><span class="label">Energy Cost:</span> ?? units</td>
+						<td><span class="label">Requires:</span> N/A</td>
+					</tr>
+				</table>
+				</td>
+			</tr>
+			</tr>
+			<tr>
+				<td><img src="quick_start_files/attack_parasite.gif"></td>
+				<td>A live tracking device that shows marine player and building positions on hive sight once the skulk spits it on a target<br>
+				<table class="stattable" style="margin-bottom:0px">
+					<tr>
+						<td><span class="label">Damage:</span> <ns:value name="kParasiteDamage">10</ns:value> hp/shot</td>
+						<td><span class="label">Rate of Fire:</span> ?? shots/sec</td>
+					</tr>
+					<tr>
+						<td><span class="label">Energy Cost:</span> ?? units</td>
+						<td><span class="label">Requires:</span> 1 Hive</td>
+					</tr>
+				</table>
+				</td>
+			</tr>
+			<tr>
+				<td><img src="quick_start_files/attack_leap.gif"></td>
+				<td>The skulk can jump large distances quickly to close on its prey<br>
+				<table class="stattable" style="margin-bottom:0px">
+					<tr>
+						<td><span class="label">Damage:</span> <ns:value name="kLeapDamage">80</ns:value> hp/hit</td>
+						<td><span class="label">Rate of Fire:</span> N/A</td>
+					</tr>
+					<tr>
+						<td><span class="label">Energy Cost:</span> ?? units</td>
+						<td><span class="label">Requires:</span> 2 Hives</td>
+					</tr>
+				</table>
+				</td>
+			</tr>
+			<tr>
+				<td><img src="quick_start_files/attack_xenocide.gif"></td>
+				<td>An explosion of flesh and bone, killing the skulk and blasting everything within a radius of ?? units<br>
+				<table class="stattable" style="margin-bottom:0px">
+					<tr>
+						<td><span class="label">Damage:</span> ?? hp</td>
+						<td><span class="label">Rate of Fire:</span> N/A</td>
+					</tr>
+					<tr>
+						<td><span class="label">Energy Cost:</span> ?? units</td>
+						<td><span class="label">Requires:</span> 3 Hives</td>
+					</tr>
+				</table>
+				</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/gorge.gif"></td><td><span class="label">GORGE ::</span> Builder and "medic" class.  Determines team strategy by choosing which structures to build and when.
+		<table class="stattable">
+			<tr>
+				<td><span class="label">Cost:</span> <ns:value name="kGorgeCost">10</ns:value> resources</td>
+				<td><span class="label">Gestation Time:</span> <ns:value name="kGorgeGestateTime">17</ns:value> seconds</td>
+			</tr>
+			<tr>
+				<td><span class="label">Health:</span> <ns:value name="kGorgeHealth">150</ns:value> hp</td>
+				<td><span class="label">Armor:</span> <ns:value name="kGorgeBaseArmor">40</ns:value> hp</td>
+			</tr>
+			<tr>
+				<td><span class="label">Speed:</span> <ns:value name="kGorgeBaseSpeed">170</ns:value> units/sec</td>
+				<td></td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td colspan="2">
+		<table style="margin:0px;margin-left:0.75cm">
+			<tr>
+				<td><img src="quick_start_files/attack_spit.gif"></td>
+				<td>Goo projectiles that can harass an enemy<br>
+				<table class="stattable" style="margin-bottom:0px">
+					<tr>
+						<td><span class="label">Damage:</span> <ns:value name="kSpitGDamage">25</ns:value> hp/shot</td>
+						<td><span class="label">Rate of Fire:</span> ?? shots/sec</td>
+					</tr>
+					<tr>
+						<td><span class="label">Energy Cost:</span> ?? units</td>
+						<td><span class="label">Requires:</span> N/A</td>
+					</tr>
+				</table>
+				</td>
+			</tr>
+			</tr>
+			<tr>
+				<td><img src="quick_start_files/attack_health_spray.gif"></td>
+				<td>A mist that heals alien players and structures while hurting marines and their equipment<br>
+				<table class="stattable" style="margin-bottom:0px">
+					<tr>
+						<td><span class="label">Damage:</span> <ns:value name="kHealingSprayDamage">16</ns:value> hp/shot</td>
+						<td><span class="label">Rate of Fire:</span> ?? shots/sec</td>
+					</tr>
+					<tr>
+						<td><span class="label">Energy Cost:</span> ?? units</td>
+						<td><span class="label">Requires:</span> 1 Hive</td>
+					</tr>
+				</table>
+				</td>
+			</tr>
+			<tr>
+				<td><img src="quick_start_files/attack_bile_bomb.gif"></td>
+				<td>Acid artillery that explodes in a <ns:value name="kBileBombRadius">200</ns:value> unit radius and does double damage against marine structures<br>
+				<table class="stattable" style="margin-bottom:0px">
+					<tr>
+						<td><span class="label">Damage:</span> <ns:value name="kBileBombDamage">200</ns:value> hp/hit</td>
+						<td><span class="label">Rate of Fire:</span> ?? shots/sec</td>
+					</tr>
+					<tr>
+						<td><span class="label">Energy Cost:</span> ?? units</td>
+						<td><span class="label">Requires:</span> 2 Hives</td>
+					</tr>
+				</table>
+				</td>
+			</tr>
+			<tr>
+				<td><img src="quick_start_files/attack_web.gif"></td>
+				<td>Strung between walls, these strands cause marine equipment to fail and enemy movement to slow to a crawl for ?? seconds<br>
+				<table class="stattable" style="margin-bottom:0px">
+					<tr>
+						<td><span class="label">Damage:</span> N/A</td>
+						<td><span class="label">Rate of Fire:</span> ??</td>
+					</tr>
+					<tr>
+						<td><span class="label">Energy Cost:</span> ?? units</td>
+						<td><span class="label">Requires:</span> 3 Hives</td>
+					</tr>
+				</table>
+				</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/lerk.gif"></td><td><span class="label">LERK ::</span> Flying support class. Not much of a fighter himself, but can heavily boost effectiveness of teammates. Good for hive defense, and abilities serve as "spells" he can use to attack or defend players or areas.
+		<table class="stattable">
+			<tr>
+				<td><span class="label">Cost:</span> <ns:value name="kLerkCost">30</ns:value> resources</td>
+				<td><span class="label">Gestation Time:</span> <ns:value name="kLerkGestateTime">28</ns:value> seconds</td>
+			</tr>
+			<tr>
+				<td><span class="label">Health:</span> <ns:value name="kLerkHealth">125</ns:value> hp</td>
+				<td><span class="label">Armor:</span> <ns:value name="kLerkBaseArmor">30</ns:value> hp</td>
+			</tr>
+			<tr>
+				<td><span class="label">Speed:</span> <ns:value name="kLerkBaseSpeed">200</ns:value> units/sec</td>
+				<td></td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td colspan="2">
+		<table style="margin:0px;margin-left:0.75cm">
+			<tr>
+				<td><img src="quick_start_files/attack_lerk_bite.gif"></td>
+				<td>Using its powerful jaws, the lerk can cause major damage point blank range<br>
+				<table class="stattable" style="margin-bottom:0px">
+					<tr>
+						<td><span class="label">Damage:</span> <ns:value name="kBite2Damage">60</ns:value> hp/bite</td>
+						<td><span class="label">Rate of Fire:</span> ?? bites/sec</td>
+					</tr>
+					<tr>
+						<td><span class="label">Energy Cost:</span> ?? units</td>
+						<td><span class="label">Requires:</span> N/A</td>
+					</tr>
+				</table>
+				</td>
+			</tr>
+			</tr>
+			<tr>
+				<td><img src="quick_start_files/attack_spores.gif"></td>
+				<td>A choking gas cloud with a ?? second duration that damages normal and jetpack marines in a ?? unit radius<br>
+				<table class="stattable" style="margin-bottom:0px">
+					<tr>
+						<td><span class="label">Damage:</span> <ns:value name="kSporeDamage">7</ns:value> hp/?? seconds</td>
+						<td><span class="label">Rate of Fire:</span> ?? shots/sec</td>
+					</tr>
+					<tr>
+						<td><span class="label">Energy Cost:</span> ?? units</td>
+						<td><span class="label">Requires:</span> 1 Hive</td>
+					</tr>
+				</table>
+				</td>
+			</tr>
+			<tr>
+				<td><img src="quick_start_files/attack_umbra.gif"></td>
+				<td>A cloud that blocks marine bullets, stopping ??% of the incoming shots from hurting aliens in a ?? unit radius for <ns:value name="kUmbraCloudDuration">3</ns:value> seconds<br>
+				<table class="stattable" style="margin-bottom:0px">
+					<tr>
+						<td><span class="label">Damage:</span> <ns:value name="kLeapDamage">80</ns:value> hp/hit</td>
+						<td><span class="label">Rate of Fire:</span> N/A</td>
+					</tr>
+					<tr>
+						<td><span class="label">Energy Cost:</span> ?? units</td>
+						<td><span class="label">Requires:</span> 2 Hives</td>
+					</tr>
+				</table>
+				</td>
+			</tr>
+			<tr>
+				<td><span class="todo">lerk version of primal scream image</span></td>
+				<td>A loud scream that drives the aliens around it into a frenzy, increasing their attack speed by <ns:percent name="kPrimalScreamDamageModifier">30%</ns:percent>, their attack damage by <ns:percent name="kPrimalScreamDamageModifier">30%</ns:percent>, and their available energy by <ns:percent name="kPrimalScreamEnergyFactor">60%</ns:percent> for <ns:value name="kPrimalScreamDuration">??</ns:percent> seconds<br>
+				<table class="stattable" style="margin-bottom:0px">
+					<tr>
+						<td><span class="label">Damage:</span> N/A</td>
+						<td><span class="label">Rate of Fire:</span> ??</td>
+					</tr>
+					<tr>
+						<td><span class="label">Energy Cost:</span> ?? units</td>
+						<td><span class="label">Requires:</span> 3 Hives</td>
+					</tr>
+				</table>
+				</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/fade.gif"></td><td><span class="label">FADE ::</span> Finesse attacking class.<br>
+		<table class="stattable">
+			<tr>
+				<td><span class="label">Cost:</span> <ns:value name="kFadeCost">60</ns:value> resources</td>
+				<td><span class="label">Gestation Time:</span> <ns:value name="kFadeGestateTime">23</ns:value> seconds</td>
+			</tr>
+			<tr>
+				<td><span class="label">Health:</span> <ns:value name="kFadeHealth">250</ns:value> hp</td>
+				<td><span class="label">Armor:</span> <ns:value name="kFadeBaseArmor">100</ns:value> hp</td>
+			</tr>
+			<tr>
+				<td><span class="label">Speed:</span> <ns:value name="kFadeBaseSpeed">240</ns:value> units/sec</td>
+				<td></td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td colspan="2">
+		<table style="margin:0px;margin-left:0.75cm">
+			<tr>
+				<td><img src="quick_start_files/attack_slash.gif"></td>
+				<td>SLASH<br>
+				<table class="stattable" style="margin-bottom:0px">
+					<tr>
+						<td><span class="label">Damage:</span> <ns:value name="kClawsDamage">90</ns:value> hp/bite</td>
+						<td><span class="label">Rate of Fire:</span> ?? bites/sec</td>
+					</tr>
+					<tr>
+						<td><span class="label">Energy Cost:</span> ?? units</td>
+						<td><span class="label">Requires:</span> N/A</td>
+					</tr>
+				</table>
+				</td>
+			</tr>
+			</tr>
+			<tr>
+				<td><img src="quick_start_files/attack_blink.gif"></td>
+				<td>BLINK<br>
+				<table class="stattable" style="margin-bottom:0px">
+					<tr>
+						<td><span class="label">Damage:</span> N/A</td>
+						<td><span class="label">Rate of Fire:</span> ?? blinks/sec</td>
+					</tr>
+					<tr>
+						<td><span class="label">Energy Cost:</span> ?? units</td>
+						<td><span class="label">Requires:</span> 1 Hive</td>
+					</tr>
+				</table>
+				</td>
+			</tr>
+			<tr>
+				<td><img src="quick_start_files/attack_metabolize.gif"></td>
+				<td>The fade speeds up its metabolism, healing itself for <ns:value name="kMetabolizeHealAmount">??<ns:value> hp<br>
+				<table class="stattable" style="margin-bottom:0px">
+					<tr>
+						<td><span class="label">Damage:</span> N/A </td>
+						<td><span class="label">Rate of Fire:</span> ??</td>
+					</tr>
+					<tr>
+						<td><span class="label">Energy Cost:</span> ?? units</td>
+						<td><span class="label">Requires:</span> 2 Hives</td>
+					</tr>
+				</table>
+				</td>
+			</tr>
+			<tr>
+				<td><img src="quick_start_files/attack_acid_rocket.gif"></td>
+				<td>ACID ROCKET (mention splash radius)<br>
+				<table class="stattable" style="margin-bottom:0px">
+					<tr>
+						<td><span class="label">Damage:</span> ?? hp</td>
+						<td><span class="label">Rate of Fire:</span> N/A</td>
+					</tr>
+					<tr>
+						<td><span class="label">Energy Cost:</span> ?? units</td>
+						<td><span class="label">Requires:</span> 3 Hives</td>
+					</tr>
+				</table>
+				</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/onos.gif"></td><td><span class="label">ONOS ::</span> Lets player lead the charge and do tremendous damage to groups of players.<br>
+		<table class="stattable">
+			<tr>
+				<td><span class="label">Cost:</span> <ns:value name="kOnosCost">100</ns:value> resources</td>
+				<td><span class="label">Gestation Time:</span> <ns:value name="kOnosGestateTime">38</ns:value> seconds</td>
+			</tr>
+			<tr>
+				<td><span class="label">Health:</span> <ns:value name="kOnosHealth">500</ns:value> hp</td>
+				<td><span class="label">Armor:</span> <ns:value name="kOnosBaseArmor">400</ns:value> hp</td>
+			</tr>
+			<tr>
+				<td><span class="label">Speed:</span> <ns:value name="kOnosBaseSpeed">225</ns:value> units/sec</td>
+				<td></td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td colspan="2">
+		<table style="margin:0px;margin-left:0.75cm">
+			<tr>
+				<td><img src="quick_start_files/attack_gore.gif"></td>
+				<td>GORE<br>
+				<table class="stattable" style="margin-bottom:0px">
+					<tr>
+						<td><span class="label">Damage:</span> <ns:value name="kBiteDamage">75</ns:value> hp/bite</td>
+						<td><span class="label">Rate of Fire:</span> ?? bites/sec</td>
+					</tr>
+					<tr>
+						<td><span class="label">Energy Cost:</span> ?? units</td>
+						<td><span class="label">Requires:</span> N/A</td>
+					</tr>
+				</table>
+				</td>
+			</tr>
+			</tr>
+			<tr>
+				<td><img src="quick_start_files/attack_devour.gif"></td>
+				<td>The Onos swallows a marine whole, removing them from the fight while they are slowly digested<br>
+				<table class="stattable" style="margin-bottom:0px">
+					<tr>
+						<td><span class="label">Damage:</span> <ns:value name="kDevourDamage">3</ns:value> hp/shot</td>
+						<td><span class="label">Rate of Fire:</span> ?? shots/sec</td>
+					</tr>
+					<tr>
+						<td><span class="label">Energy Cost:</span> ?? units</td>
+						<td><span class="label">Requires:</span> 1 Hive</td>
+					</tr>
+				</table>
+				</td>
+			</tr>
+			<tr>
+				<td><img src="quick_start_files/attack_stomp.gif"></td>
+				<td>By pounding the floor, the Onos can stun marines in a <ns:value name="kStompRadius">??<ns:value> unit radius for <ns:value name="kStompTime">2.00</ns:value> seconds<br>
+				<table class="stattable" style="margin-bottom:0px">
+					<tr>
+						<td><span class="label">Damage:</span> N/At</td>
+						<td><span class="label">Rate of Fire:</span> N/A</td>
+					</tr>
+					<tr>
+						<td><span class="label">Energy Cost:</span> ?? units</td>
+						<td><span class="label">Requires:</span> 2 Hives</td>
+					</tr>
+				</table>
+				</td>
+			</tr>
+			<tr>
+				<td><img src="quick_start_files/attack_charge.gif"></td>
+				<td>CHARGE<br>
+				<table class="stattable" style="margin-bottom:0px">
+					<tr>
+						<td><span class="label">Damage:</span> <ns:value name="kChargeDamage">320</ns:value> hp</td>
+						<td><span class="label">Rate of Fire:</span> ??</td>
+					</tr>
+					<tr>
+						<td><span class="label">Energy Cost:</span> ?? units</td>
+						<td><span class="label">Requires:</span> 3 Hives</td>
+					</tr>
+				</table>
+				</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+</table>
+<hr>
+<table>
+	<tr>
+		<th colspan="2">ALIEN CHAMBERS</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/hive.gif"></td><td><span class="label">HIVE ::</span> Aliens need a hive to spawn. Each hive unlocks a new ability for each alien. Any alien standing within <ns:value name="kHiveHealRadius">500</ns:value> units of a hive is automatically healed for <ns:value name="kHivePlayerRegenerationAmount">20</ns:value> hp per second.<br>
+		<table style="margin-bottom: 0px;" class="stattable">
+			<tr>
+				<td><span class="label">Cost:</span> <ns:value name="kHiveCost">40</ns:value> resources</td>
+				<td><span class="label">Build time:</span> <ns:value name="kHiveBuildTime">180</ns:value> seconds</td>
+			</tr>
+			<tr>
+				<td><span class="label">Health:</span> <ns:value name="kHiveHealth">7000</ns:value> hp</td>
+				<td><span class="label">Regen Rate:</span> <ns:value name="kHiveRegenerationAmount">2</ns:value> hp/second</td>
+			</tr>
+		</table>
+	</td></tr>
+	<tr>
+		<td><img src="quick_start_files/res_chamber.gif"></td><td><span class="label">RESOURCE TOWER ::</span> Gathers <ns:value name="kFuncResourceInjectionAmount">1</ns:value> resource every <ns:value name="kFuncResourceInjectionTime">4</ns:value> seconds, splitting it evenly among team members.<br>
+		<table style="margin-bottom: 0px;" class="stattable">
+			<tr>
+				<td><span class="label">Cost:</span> <ns:value name="kAlienResourceTowerCost">15</ns:value> resources</td>
+				<td><span class="label">Build time:</span> <ns:value name="kAlienResourceTowerBuildTime">20</ns:value> seconds</td>
+			</tr>
+			<tr>
+				<td><span class="label">Health:</span> <ns:value name="kAlienResourceTowerHealth">2500</ns:value> hp</td>
+				<td><span class="label">Regen Rate:</span> <ns:value name="kOrganicStructureHealRate">5</ns:value> hp/second</td>
+			</tr>
+		</table>
+	</td></tr>
+	<tr>
+		<td><img src="quick_start_files/def_chamber.gif"></td><td><span class="label">DEFENSE CHAMBER ::</span> Provides defensive upgrades and heals up to three chambers or aliens within <span class="todo">??</span> units for <span class="todo">10</span> hp per second.<br>
+		<table style="margin-bottom: 0px;" class="stattable">
+			<tr>
+				<td><span class="label">Cost:</span> <ns:value name="kDefenseChamberCost">10</ns:value> resources</td>
+				<td><span class="label">Build time:</span> <ns:value name="kDefenseChamberBuildTime">20</ns:value> seconds</td>
+			</tr>
+			<tr>
+				<td><span class="label">Health:</span> <ns:value name="kDefenseChamberHealth">1200</ns:value> hp</td>
+				<td><span class="label">Regen Rate:</span> <ns:value name="kOrganicStructureHealRate">5</ns:value> hp/second</td>
+			</tr>
+		</table>
+	</td></tr>
+	<tr>
+		<td><img src="quick_start_files/mov_chamber.gif"></td><td><span class="label">MOVEMENT CHAMBER ::</span> Provides movement upgrades and energizes aliens within <ns:value name="kMovementChamberEnergyRange">400</ns:value> units for <ns:percent name="kMovementChamberEnergyAmount">10%</ns:percent> of their total energy every <span class="todo">2</span> seconds.<br>
+		<table style="margin-bottom: 0px;" class="stattable">
+			<tr>
+				<td><span class="label">Cost:</span> <ns:value name="kMovementChamberCost">10</ns:value> resources</td>
+				<td><span class="label">Build time:</span> <ns:value name="kMovementChamberBuildTime">12</ns:value> seconds</td>
+			</tr>
+			<tr>
+				<td><span class="label">Health:</span> <ns:value name="kMovementChamberHealth">1000</ns:value> hp</td>
+				<td><span class="label">Regen Rate:</span> <ns:value name="kOrganicStructureHealRate">5</ns:value> hp/second</td>
+			</tr>
+		</table>
+	</td></tr>
+	<tr>
+		<td><img src="quick_start_files/sens_chamber.gif"></td><td><span class="label">SENSORY CHAMBER ::</span> Provides sensory upgrades, and cloaks aliens and chambers within <ns:value name="kSensoryChamberRange">750</ns:value> units.<br>
+		<table style="margin-bottom: 0px;" class="stattable">
+			<tr>
+				<td><span class="label">Cost:</span> <ns:value name="kSensoryChamberCost">10</ns:value> resources</td>
+				<td><span class="label">Build time:</span> <ns:value name="kSensoryChamberBuildTime">14</ns:value> seconds</td>
+			</tr>
+			<tr>
+				<td><span class="label">Health:</span> <ns:value name="kSensoryChamberHealth">800</ns:value> hp</td>
+				<td><span class="label">Regen Rate:</span> <ns:value name="kOrganicStructureHealRate">5</ns:value> hp/second</td>
+			</tr>
+		</table>
+	</td></tr>
+	<tr>
+		<td><img src="quick_start_files/off_chamber.gif"></td><td><span class="label">OFFENSE CHAMBER ::</span> Attacks enemy players and structures when built.<br>
+		<table style="margin-bottom: 0px;" class="stattable">
+			<tr>
+				<td><span class="label">Cost:</span> <ns:value name="kOffenseChamberCost">10</ns:value> resources</td>
+				<td><span class="label">Build time:</span> <ns:value name="kOffenseChamberBuildTime">11</ns:value> seconds</td>
+			</tr>
+			<tr>
+				<td><span class="label">Health:</span> <ns:value name="kOffenseChamberHealth">1000</ns:value> hp</td>
+				<td><span class="label">Regen Rate:</span> <ns:value name="kOrganicStructureHealRate">5</ns:value> hp/second</td>
+			</tr>
+			<tr>
+				<td><span class="label">Damage:</span> <ns:value name="kOffenseChamberDamage">20</ns:value> hp/shot</td>
+				<td><span class="label">Rate of fire:</span> <span class="todo">??</span> shots/second</td>
+			</tr>
+		</table>
+	</td></tr>
+</table>
+<hr>
+<table>
+	<tr>
+		<th colspan="2">DEFENSIVE EVOLUTIONS</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_0.gif"></td><td><span class="label">CARAPACE ::</span> Toughens alien hides, adding the armor amounts shown<br>
+			<table style="margin-bottom: 0px;" class="stattable">
+				<tr>
+					<td><span class="label">Skulk Armor Bonus:</span> <ns:value name="kSkulkArmorUpgrade">20</ns:value> hp/level</td>
+				</tr>
+				<tr>
+					<td><span class="label">Gorge Armor Bonus:</span> <ns:value name="kGorgeArmorUpgrade">50</ns:value> hp/level</td>
+				</tr>
+				<tr>
+					<td><span class="label">Lerk Armor Bonus:</span> <ns:value name="kLerkArmorUpgrade">30</ns:value> hp/level</td>
+				</tr>
+				<tr>
+					<td><span class="label">Fade Armor Bonus:</span> <ns:value name="kFadeArmorUpgrade">100</ns:value> hp/level</td>
+				</tr>
+				<tr>
+					<td><span class="label">Onos Armor Bonus:</span> <ns:value name="kOnosArmorUpgrade">150</ns:value> hp/level</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_2.gif"></td><td><span class="label">REDEMPTION ::</span> Adds a <span class="todo">??%</span> per level chance that an alien under <span class="todo">??%</span> percent health will teleport to the hive farthest when hurt to avoid death.</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_1.gif"></td><td><span class="label">REGENERATION ::</span> Allows aliens that have been hurt to regain <ns:percent name="kAlienRegenerationPercentage">3%</ns:percent> of their health per level every <span class="todo">??</span> seconds.</td>
+	</tr>
+	<tr>
+		<th colspan="2">MOVEMENT EVOLUTIONS</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_7.gif"></td><td><span class="label">ADRENALINE ::</span> Boosts the rate at which the alien regains energy.  The boost is <span class="todo">8%</span> at level one, <span class="todo">12%</span> at level one, and <span class="todo">16%</span> at level three.</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_6.gif"></td><td><span class="label">CELERITY ::</span> Causes the alien to move <ns:value name="kAlienCelerityBonus">25</ns:value> units/second faster per level.</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_8.gif"></td><td><span class="label">SILENCE ::</span> Reduces the volume of alien player sounds with each upgrade.  The relative volume of alien sounds drops to <ns:percent name="kSilenceLevel1Volume">50%</ns:percent> at level one, <ns:percent name="kSilenceLevel2Volume">15%</ns:percent> at level two, and <ns:percent name="kSilenceLevel3Volume">0%</ns:percent> at level three.</td>
+	</tr>
+	<tr>
+		<th colspan="2">SENSORY EVOLUTIONS</th>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_9.gif"></td><td><span class="label">CLOAKING ::</span> Reduces the opacity of players when they haven't moved in <ns:value name="kCloakTime">??<ns:value> seconds, making them harder to see.  The relative visiblity of alien player models drops to <span class="todo">??%</span> at level one, <span class="todo">??%</span> at level two, and <span class="todo">??%</span> at level three.</td>
+	</tr>
+	<tr>
+		<td><span class="todo">focus icon</span></td><td><span class="label">FOCUS ::</span> Slows down slot 1 alien attacks while making them more powerful.  Damage is increased by <ns:value name="kFocusDamageUpgradePercentPerLevel">0.33</ns:value>% and rate of fire is reduced by <ns:value name="kFocusROFPercentSlowdownPerLevel">0.50</ns:value> for each level.</td>
+	</tr>
+	<tr>
+		<td><img src="quick_start_files/upgrade_icon_11.gif"></td><td><span class="label">SCENT OF FEAR ::</span> Allows the alien to detect any injured marines on hive sight.  The distance increases with each level: <span class="todo">??</span> units at level one, <span class="todo">??</span> units at level one, and <span class="todo">??</span> units at level three.</td>
+	</tr>
+</table>
+<hr>
+</div></body></html>
\ No newline at end of file
diff --git a/main/manual/Quick_Start_Guide_Tables_Framed.html b/main/manual/Quick_Start_Guide_Tables_Framed.html
new file mode 100644
index 00000000..edee8e35
--- /dev/null
+++ b/main/manual/Quick_Start_Guide_Tables_Framed.html
@@ -0,0 +1,16 @@
+
+
+<!-- frames -->
+<frameset  cols="220,*" border="0" frameborder="0">
+    <frame name="ns_menu" src="blank.html" marginwidth="0" marginheight="0" scrolling="no" frameborder="0" noresize>
+    <frameset  cols="565,*">
+        <frameset  rows="93,*">
+            <frame name="ns_toppanel" src="blank.html" marginwidth="0" marginheight="0" scrolling="no" frameborder="0" noresize>
+            <frame name="ns_content" src="Quick_Start_Guide_Tables.html" marginwidth="0" marginheight="0" scrolling="auto" frameborder="0" noresize>
+        </frameset>
+        <frame name="ns_blank" src="blank.html" marginwidth="0" marginheight="0" scrolling="no" frameborder="0">
+    </frameset>
+</frameset>
+
+
+
diff --git a/main/manual/UpdateManual.pl b/main/manual/UpdateManual.pl
new file mode 100644
index 00000000..92cdc00d
--- /dev/null
+++ b/main/manual/UpdateManual.pl
@@ -0,0 +1,188 @@
+#
+# Updates the NS manual using Balance.txt
+#
+local ($kVersion, $kFileSpecifier, $kBalanceFileName, $kTempFileName,%BalanceVars,@BalanceUpdateTime);
+
+#
+# Changelog
+#
+# v1.1 - Karl Patrick
+#
+# tag parser / content replacer
+# - changed tag structure to be SGML compliant and use an ns namespace for ease of validation, e.g. <ns:value name="kParameterName">value</ns:value>
+# - widened definition of content between nsvalue tags to include all characters except '<' so non-word characters can become placeholders
+# - added global processing switch for the tag substitution operators (they now replace multiple matches in a line)
+# - changed nsinverse tag to print inverse value with 2 decimal places
+# - changed nspercent tag to print percentile after the numeric value and never use a decimal place
+# - added fourth tag type, nsdate, which inserts the timestamp of the Balance.txt file in whatever format the tag specifies
+# - TODO: use m// operator to match ns namespace tags and formally parse tag attributes
+# - TODO: parse entire file at once to lose dependancy on line breaks
+# file handling
+# - added optional command line statements to manually specify the balance file name [arg0] and files to parse [all other args]
+#	- default behavior remains unchanged if no args are supplied
+#	- the current directory is scanned for files to update if only one argument is given
+# - moved filtering of file names to default array construction; any explicitly named file will now be processed
+# - replaced native system calls for file handling with perl function calls
+# - added early termination of program on balance.txt file read failure
+# - added automatic deletion of temp file if no replacements were made to the original
+# - TODO: drop use of temp file in favor of local string storage, use rename-to-.bak and update paradigm for files
+# misc
+# - removed previously commented out debug print statements
+# - replaced some of the globals with subroutine arguments / locals
+# - changed output format to be easier to scan for large numbers of files
+#
+# v1.0 Original Version - Charlie Cleveland
+#
+
+#
+# Constants
+#
+$kVersion = "v1.2";
+$kFileSpecifier = ".php";
+$kBalanceFileName = "c:\\Web\\ns\\Balance.txt";
+$kTempFileName = "UpdateManual.temp";
+
+local $blankLine = "....................................................................";
+
+sub Main;
+Main();
+
+# Subroutine that checks file out of Perforce, does a search and replace on all values, then reverts the file if unchanged
+sub ProcessFileName
+{	
+	# Read subroutine args
+	my $theFileName = shift(@_);
+
+	use POSIX qw(strftime);
+
+	# Read in whole file
+	my $printString = sprintf("READING  \"$theFileName\"");
+	if(!open(FILE2, $theFileName))
+	{
+		printf("%s%s[FAILURE]\n",$printString,substr($blankLine,length($printString)));
+		return 0;
+	}
+
+	printf("%s%s[SUCCESS]\n",$printString,substr($blankLine,length($printString)));
+
+	# Open tempoarary file for writing
+	if(!open(FILE3, '>', $kTempFileName))
+	{
+		$printString = sprintf("WRITING  \"$theFileName\"");
+		printf("%s%s[FAILURE]\n",$printString,substr($blankLine,length($printString)));
+		return 0;
+	}
+
+	# Check for a match
+	my $theNumReplacements = 0;
+
+	while(<FILE2>)
+	{
+		local $theCurrentLine = $_;
+
+		if($theCurrentLine =~ s/(<ns:value name=\"([^\"]+)\">)[^<]*(<\/ns:value>)/$1 . $BalanceVars{$2} . $3/ge)
+		{ $theNumReplacements++; }
+
+		# This can't be in an else clause any more because both types may appear on the same line
+		if($theCurrentLine =~ s/(<ns:percent name=\"([^\"]+)\">)[^<]*(<\/ns:percent>)/$1 . sprintf("%.0f%%",$BalanceVars{$2}*100) . $3/ge)
+		{ $theNumReplacements++; }
+
+		if($theCurrentLine =~ s/(<ns:inverse name=\"([^\"]+)\">)[^<]*(<\/ns:inverse>)/$1 . sprintf("%.2f",1\/$BalanceVars{$2}) . $3/ge)
+		{ $theNumReplacements++; }
+
+		if($theCurrentLine =~ s/(<ns:date format=\"([^\"]+)\">)[^<]*(<\/ns:date>)/$1 . strftime($2,@BalanceUpdateTime) . $3/ge)
+		{ $theNumReplacements++; }
+
+		print FILE3 $theCurrentLine;
+	}
+
+	close FILE2;
+	close FILE3;
+
+	if($theNumReplacements > 0) # Update if a match was present
+	{
+		$printString = sprintf("UPDATING \"$theFileName\"");
+		
+		if(unlink($theFileName) && rename($kTempFileName,$theFileName))
+		{ 
+			printf("%s%s[SUCCESS]\n",$printString,substr($blankLine,length($printString)));
+			return 1;
+		}
+		else
+		{ 
+			printf("%s%s[FAILURE]\n",$printString,substr($blankLine,length($printString)));
+			return 0;
+		}
+	}
+	else
+	{
+		unlink($kTempFileName);
+		return 1;
+	}
+}
+
+sub ReadBalanceVariables
+{
+	# Read Balance file
+	my $printString = sprintf("PARSING  \"$kBalanceFileName\"");
+	open(FILE, $kBalanceFileName);
+
+	@BalanceUpdateTime = localtime((stat(FILE))[9]);
+	my $theSuccess = 0;
+
+	# Print contents of Balance.txt
+	while(<FILE>)
+	{
+		my $theCurrentBalanceLine = $_;
+		if($theCurrentBalanceLine =~ /#define/)
+		{
+			my @theCurrentTokens;
+			@theCurrentTokens = split();
+
+			if($#theCurrentTokens == 2)
+			{
+				my $tokenOne = $theCurrentTokens[1];
+				my $tokenTwo = $theCurrentTokens[2];
+
+				$BalanceVars{$tokenOne} = $tokenTwo;
+
+				$theSuccess = 1;
+			}
+		}
+	}
+
+	close(FILE); 
+
+	printf("%s%s[%s]\n",$printString,substr($blankLine,length($printString)),$theSuccess ? "SUCCESS" : "FAILURE");
+	return $theSuccess;
+}
+
+sub Main
+{
+	print "\nRunning Natural Selection Manual Updater $kVersion\n\n";
+
+	if($#ARGV >= 0) # First arg is the Balance document name
+	{
+		$kBalanceFileName = $ARGV[0];
+		shift(@ARGV); # Drop first argument
+	}
+
+	# Read in the contents of Balance.txt to use for replacement
+	if(ReadBalanceVariables() == 0)	
+	{ return; } # Return on failure
+
+	if($#ARGV >= 0) # Remaining args are files to parse
+	{ @theHTMLFiles = @ARGV }
+	else
+	{
+		# Search through all the files in the working directory
+		opendir(DIR, ".");
+		local @AllFiles = readdir(DIR);
+		@theHTMLFiles = grep(/$kFileSpecifier/i,@AllFiles);
+		closedir(DIR);
+	}
+
+	# Process each file
+	foreach (@theHTMLFiles)
+	{ ProcessFileName($_); }
+}
\ No newline at end of file
diff --git a/main/manual/alien.html b/main/manual/alien.html
new file mode 100644
index 00000000..e4686cf5
--- /dev/null
+++ b/main/manual/alien.html
@@ -0,0 +1,194 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_resources_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif','images/images/alien_victory_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600">Kharaa 
+            Data</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p>The Kharaa will work together to defend their 
+                                hives, or attack a large force or well defended 
+                                base. Otherwise, it's each Kharaa for itself, 
+                                gestating, evolving, and behaving according to 
+                                their own objectives. Hit-and-run, ambush, and 
+                                blitz tactics are common &#150; but just as often, 
+                                a Kharaa will bulk up and go toe-to-toe with any 
+                                foe it can find. But for the unifying presence 
+                                of the <a href="alien_bacterium.html">bacterium</a> 
+                                and <a href="alien_hivesight.html">hive sight</a>, 
+                                they would be little more than aggressive (and 
+                                cunning) animals.</p>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p>The <a href="frontiersmen.html">marine section</a> 
+                                is organized by squad tasks, goals and equipment. 
+                                These are the integral pieces of any military 
+                                operation. The Kharaa section is organized by 
+                                the progression of their growth. This reflects 
+                                the crucial difference between the TSA and the 
+                                Kharaa. Where we are deliberately responding to 
+                                a threat, as near as we can tell they are simply 
+                                reproducing, and instinctually overcoming obstacles 
+                                (us) by drawing on more and more sophisticated 
+                                responses (hives, species, and evolutions).</p>
+                              </td>
+                              </tr>
+                            </table>
+                          
+                        
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td>
+                              <table border="0" cellspacing="0" cellpadding="8" width="100%">
+                                <tr valign="middle" align="center"> 
+                                  <td> 
+                                    <a href="alien_bacterium.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('alien_bacterium','','images/images/alien_bacterium_s.gif',1)">Bacterium<br>
+                                      <img name="alien_bacterium" border="0" src="images/images/alien_bacterium.gif" width="64" height="64"></a><img src="images/images/transparent.gif" width="2" height="70">
+                                    </td>
+                                  <td><a href="alien_hive.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('alien_hive','','images/images/alien_hive_s.gif',1)">Hive<br><img name="alien_hive" border="0" src="images/images/alien_hive.gif" width="64" height="64"></a><img src="images/images/transparent.gif" width="2" height="70"></td>
+                                  <td><a href="alien_resources.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('alien_resources','','images/images/alien_resources_s.gif',1)">Resources<br><img name="alien_resources" border="0" src="images/images/alien_resources.gif" width="64" height="64"></a><img src="images/images/transparent.gif" width="2" height="70"></td>
+                                </tr>
+                                <tr valign="middle" align="center"> 
+                                  <td><a href="alien_chambers.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('alien_chambers','','images/images/alien_chambers_s.gif',1)">Chambers<br><img name="alien_chambers" border="0" src="images/images/alien_chambers.gif" width="64" height="64"></a><img src="images/images/transparent.gif" width="2" height="70"></td>
+                                  <td><a href="alien_species.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('alien_species','','images/images/alien_species_s.gif',1)">Species<br><img name="alien_species" border="0" src="images/images/alien_species.gif" width="64" height="64"></a><img src="images/images/transparent.gif" width="2" height="70"></td>
+                                  <td><a href="alien_victory.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('alien_victory','','images/images/alien_victory_s.gif',1)">Victory<br><img name="alien_victory" border="0" src="images/images/alien_victory.gif" width="64" height="64"></a><img src="images/images/transparent.gif" width="2" height="70"></td>
+                                </tr>
+                              </table>
+                              
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_abilities.html b/main/manual/alien_abilities.html
new file mode 100644
index 00000000..e19a2496
--- /dev/null
+++ b/main/manual/alien_abilities.html
@@ -0,0 +1,183 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <span class="sectiontext"><font color="#FF6600"><a href="alien_hive.html" class="sectionlink">The 
+            Hive</a></font></span>: Advanced Abilities</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_advabilities.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> New hives do more than allow 
+                                new species, they advance and evolve the abilities 
+                                of all species, and allow for new <a href="alien_chambers.html">chambers</a> 
+                                to be constructed.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p> <img src="images/images/10red_data.gif" width="13" height="10"> 
+                                There are two ways the hive advances species abilities.<br>
+                                <br>
+                                1. Each hive allows Gorge's to build another kind 
+                                of chamber, making new evolutionary upgrades available 
+                                to the Kharaa, regardless of species. See the 
+                                <a href="alien_evolutions.html">evolutions</a> 
+                                section for more information. <br>
+                                <br>
+                                2. New hives evolve each species into a more advanced 
+                                form. We believe that, for example, the first 
+                                <a href="alien_skulk.html">Skulks</a> to spawn 
+                                are primitive, early specimens; but with each 
+                                new hive, the Skulks becomes more advanced, and 
+                                evolved, versions of themselves. This is true 
+                                of all Kharaa species, and is reflected in the 
+                                new abilities that become available with each 
+                                hive. These abilities are unique to each species 
+                                &#150; and each new ability is more powerful than 
+                                the last. To see descriptions of these abilities, 
+                                see the <a href="alien_species.html">species descriptions</a>. 
+                              </p>
+                              <p>These advancements suggest that the hives act 
+                                as evolutionary databases, containing a record 
+                                of the long long history of the Kharaa. The bacteria's 
+                                response to new situations is to spend resources 
+                                and make a whole new array of instincts and responses 
+                                available. </p>
+                            </td>
+                          </tr>
+                        </table>
+                          
+                        
+                        
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_abilitiesandattacks.html b/main/manual/alien_abilitiesandattacks.html
new file mode 100644
index 00000000..caad7103
--- /dev/null
+++ b/main/manual/alien_abilitiesandattacks.html
@@ -0,0 +1,167 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a>: 
+            Abilities and Attacks</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_abilities.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                        <tr>
+                          <td>
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p> <img src="images/images/10red_data.gif" width="13" height="10"> 
+                                A testament to the very process of evolution, 
+                                Kharaa abilities are a match for the most advanced 
+                                human equipment and weaponry, and all without 
+                                any apparent understanding, or even the idea of, 
+                                &quot;technology&quot;.</p>
+                              <p>All species are spawned with certain basic, inherent 
+                                attacks and abilities (listed as &quot;inherent&quot; 
+                                and &quot;primary&quot;). Just as multiple hives 
+                                are needed for more advanced species, the more 
+                                powerful attacks and abilities also require multiple 
+                                hives (see the <a href="alien_hive.html">Hives</a> 
+                                section for more data). Hives act as active databases, 
+                                providing ongoing access to the necessary genetic 
+                                information for each ability. Example: <a href="alien_lerk.html">Lerks</a> 
+                                did not evolve the <a href="alien_lerk_hive.html">umbra</a> 
+                                ability until well into their history &#150; and so 
+                                cannot evolve it again until a third hive provides 
+                                the genetic record of this complex (and remarkable) 
+                                ability. Losing a hive removes any abilities it 
+                                granted. If all hives are lost, the Kharaa lose 
+                                access to even their one-hive abilities.</p>
+                            </td>
+                          </tr>
+                        </table>
+                          
+                        
+                        
+                        
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_bacterium.html b/main/manual/alien_bacterium.html
new file mode 100644
index 00000000..4d134c65
--- /dev/null
+++ b/main/manual/alien_bacterium.html
@@ -0,0 +1,184 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a>: The Bacterium</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_bacterium.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> The building block of the Kharaa, 
+                                and the key to ever unraveling their mystery and 
+                                inner-workings, is the bacteria-like life form 
+                                that first appears on a ship or base. <i>How</i> 
+                                it appears is one question we would desperately 
+                                like to answer. </p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+<table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p> <img src="images/images/10red_data.gif" width="13" height="10"> 
+                                As near as we can tell, trace amounts of the bacteria 
+                                begin to collect in areas containing water or 
+                                heat sources. The bacteria reproduce, slowly forming 
+                                a mat, visible to the naked eye. It also seems 
+                                to direct airborne streams down the hallways and 
+                                passageways, and anywhere it finds another source 
+                                of energy (water or heat) it forms another mat, 
+                                from which it sends out more streams, etcetera. 
+                                It is safe to assume that every square inch of 
+                                a facility is rapidly infiltrated with at least 
+                                trace amounts of bacteria, anchored at source 
+                                points that become potential <a href="alien_hive.html">hive</a> 
+                                locations (so far, we have never seen more than 
+                                three). All of these bacteria are in contact with 
+                                one another, sharing data on their environment, 
+                                and triggering responses to stimuli (like energy 
+                                sources, or danger). They form a network, called 
+                                the Bacterium.<br>
+                              </p>
+                              </td>
+                              </tr>
+                            </table>
+                          
+                        
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b><img src="images/tech_10/bactgridlock.gif" width="15" height="15"> 
+                                <a href="alien_gridlock.html">Bacterial Gridlock</a></b></p>
+                            </td>
+                          </tr>
+                        </table>
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_chambers.html b/main/manual/alien_chambers.html
new file mode 100644
index 00000000..a91d871a
--- /dev/null
+++ b/main/manual/alien_chambers.html
@@ -0,0 +1,195 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a>: Chambers</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_chambers.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> The <a href="alien_gorge.html">Gorge</a> 
+                                creates these chambers to serve many purposes. 
+                                Some enable new <a href="alien_evolutions.html">evolutions</a>, 
+                                while others serve tactical, defensive, or resource 
+                                gathering purposes. Each hive allows for one kind 
+                                of evolution chamber. Resource chambers and 
+                                offensive chambers have no hive requirements.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p> <img src="images/images/10red_data.gif" width="13" height="10"> 
+                                Each of these chambers serve a purpose in the 
+                                field, but defensive, movement, and sensory chambers 
+                                play another important role. They act as supplements 
+                                to the knowledge contained in hives, allowing 
+                                the Kharaa to specialize themselves even further 
+                                with entirely new abilities. Each hive can support 
+                                one kind of upgrade chamber &#150; though which type 
+                                of chamber is chosen first, second, and third 
+                                has varied from battle to battle. See the <a href="alien_evolutions.html">evolutions</a> 
+                                section for descriptions of these powerful biological 
+                                upgrades.</p>
+                              </td>
+                          </tr>
+                        </table>
+                          
+                        
+                        
+                        
+                        <table width="628" border="1" cellspacing="0" cellpadding="0" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td>
+                              <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                                <tr> 
+                                  <td width="50%"> <img src="images/tech_10/movement.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_m.html">Movement</a> 
+                                  </td>
+                                  <td width="50%"><img src="images/tech_10/sensory.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_s.html">Sensory</a></td>
+                                </tr>
+                                <tr> 
+                                  <td width="50%"><img src="images/tech_10/defence.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_d.html">Defensive</a></td>
+                                  <td width="50%"><img src="images/tech_10/offense.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_o.html">Offensive</a></td>
+                                </tr>
+                                <tr>
+                                  <td width="50%"><img src="images/tech_10/resource.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_r.html">Resource Chambers</a></td>
+                                  <td width="50%">&nbsp;</td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_chambers_d.html b/main/manual/alien_chambers_d.html
new file mode 100644
index 00000000..ab7e054b
--- /dev/null
+++ b/main/manual/alien_chambers_d.html
@@ -0,0 +1,187 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_chambers.html" class="sectionlink">Chambers</a>: 
+            Defensive Chamber</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_chamber_d.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p>Allows <a href="alien_evolutions_d.html">defensive 
+                                evolutions</a>.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td valign="top"> 
+                              <p><b>Function:</b> these growths heal any alien 
+                                or other chamber nearby (much like <a href="alien_gorge_primary.html">healing 
+                                spray</a> or <a href="alien_hive.html">hives</a>). 
+                                We have seen them deployed at forward positions 
+                                to assist group attacks. Multiple defense chambers 
+                                heal faster, though after three, this cumulative 
+                                effect appears to plateau.</p>
+                            </td>
+                            <td width="200"><img src="images/images/chamber_d.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                          
+                        
+                        
+                        
+                        <table width="628" border="1" cellspacing="0" cellpadding="0" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                                <tr> 
+                                  <td width="50%"> <img src="images/tech_10/movement.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_m.html">Movement</a> 
+                                  </td>
+                                  <td width="50%"><img src="images/tech_10/sensory.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_s.html">Sensory</a></td>
+                                </tr>
+                                <tr> 
+                                  <td width="50%"><img src="images/tech_10/defence.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_d.html">Defensive</a></td>
+                                  <td width="50%"><img src="images/tech_10/offense.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_o.html">Offensive</a></td>
+                                </tr>
+                                <tr> 
+                                  <td width="50%"><img src="images/tech_10/resource.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_r.html">Resource Chambers</a></td>
+                                  <td width="50%">&nbsp;</td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_chambers_m.html b/main/manual/alien_chambers_m.html
new file mode 100644
index 00000000..e39bef22
--- /dev/null
+++ b/main/manual/alien_chambers_m.html
@@ -0,0 +1,186 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_chambers.html" class="sectionlink">Chambers</a>: 
+            Movement Chamber</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_chamber_m.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p>Allows <a href="alien_evolutions_m.html">movement 
+                                evolutions</a>.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td valign="top"> 
+                              <p><b>Function:</b> these growths appear to transport 
+                                aliens to the active hive farthest from the chamber's 
+                                location. We understand this around as well as 
+                                the <a href="alien_evolutions_redemption.html">redemption</a> 
+                                or <a href="alien_fade_hive.html">blink</a> phenomena 
+                                &#150; which is to say, more data is required.</p>
+                            </td>
+                            <td width="200"><img src="images/images/chamber_m.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                          
+                        
+                        
+                        
+                        <table width="628" border="1" cellspacing="0" cellpadding="0" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                                <tr> 
+                                  <td width="50%"> <img src="images/tech_10/movement.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_m.html">Movement</a> 
+                                  </td>
+                                  <td width="50%"><img src="images/tech_10/sensory.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_s.html">Sensory</a></td>
+                                </tr>
+                                <tr> 
+                                  <td width="50%"><img src="images/tech_10/defence.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_d.html">Defensive</a></td>
+                                  <td width="50%"><img src="images/tech_10/offense.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_o.html">Offensive</a></td>
+                                </tr>
+                                <tr> 
+                                  <td width="50%"><img src="images/tech_10/resource.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_r.html">Resource Chambers</a></td>
+                                  <td width="50%">&nbsp;</td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_chambers_o.html b/main/manual/alien_chambers_o.html
new file mode 100644
index 00000000..5bb26d0d
--- /dev/null
+++ b/main/manual/alien_chambers_o.html
@@ -0,0 +1,185 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_chambers.html" class="sectionlink">Chambers</a>: 
+            Offensive Chamber</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_chamber_o.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p>No evolutionary significance.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td valign="top"> 
+                              <p><b>Function:</b> offense chambers are the Kharaa 
+                                equivalent of turrets. Any creature entering their 
+                                area that is not hooked into the bacterium (i.e., 
+                                an alien) is attacked with projectiles similar 
+                                in strength and speed to the Gorge's <a href="alien_gorge_inherent.html">spit</a> 
+                                attack.</p>
+                            </td>
+                            <td width="200"><img src="images/images/chamber_o.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                          
+                        
+                        
+                        
+                        <table width="628" border="1" cellspacing="0" cellpadding="0" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                                <tr> 
+                                  <td width="50%"> <img src="images/tech_10/movement.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_m.html">Movement</a> 
+                                  </td>
+                                  <td width="50%"><img src="images/tech_10/sensory.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_s.html">Sensory</a></td>
+                                </tr>
+                                <tr> 
+                                  <td width="50%"><img src="images/tech_10/defence.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_d.html">Defensive</a></td>
+                                  <td width="50%"><img src="images/tech_10/offense.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_o.html">Offensive</a></td>
+                                </tr>
+                                <tr> 
+                                  <td width="50%"><img src="images/tech_10/resource.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_r.html">Resource Chambers</a></td>
+                                  <td width="50%">&nbsp;</td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_chambers_r.html b/main/manual/alien_chambers_r.html
new file mode 100644
index 00000000..423792e8
--- /dev/null
+++ b/main/manual/alien_chambers_r.html
@@ -0,0 +1,183 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_chambers.html" class="sectionlink">Chambers</a>: 
+            Resource Chambers</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_rescollectors.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p>No evolutionary significance.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td valign="top"> 
+                              <p><b>Function:</b> The Kharaa equivalent of a <a href="structures_restower.html">resource 
+                                tower</a>, resource chambers harvest stores of 
+                                raw nano-sludge for the alien's use. See <a href="alien_resources.html">resources</a> 
+                                for more information.</p>
+                            </td>
+                            <td width="200"><img src="images/images/resourcecollector.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                          
+                        
+                        
+                        
+                        <table width="628" border="1" cellspacing="0" cellpadding="0" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                                <tr> 
+                                  <td width="50%"> <img src="images/tech_10/movement.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_m.html">Movement</a> 
+                                  </td>
+                                  <td width="50%"><img src="images/tech_10/sensory.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_s.html">Sensory</a></td>
+                                </tr>
+                                <tr> 
+                                  <td width="50%"><img src="images/tech_10/defence.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_d.html">Defensive</a></td>
+                                  <td width="50%"><img src="images/tech_10/offense.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_o.html">Offensive</a></td>
+                                </tr>
+                                <tr> 
+                                  <td width="50%"><img src="images/tech_10/resource.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_r.html">Resource Chambers</a></td>
+                                  <td width="50%">&nbsp;</td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_chambers_s.html b/main/manual/alien_chambers_s.html
new file mode 100644
index 00000000..7e0b6f00
--- /dev/null
+++ b/main/manual/alien_chambers_s.html
@@ -0,0 +1,188 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_chambers.html" class="sectionlink">Chambers</a>: 
+            Sensory Chamber</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_chamber_s.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p>Allows <a href="alien_evolutions_s.html">sensory 
+                                evolutions</a>.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td valign="top"> 
+                              <p><b>Function:</b> any hostiles a sensory chamber 
+                                can &quot;see&quot; are added to the Hive Sight. 
+                                Placed strategically they have turned many marine 
+                                surprise assaults into costly ambushes. Sensory 
+                                Chambers also &quot;stain&quot; any hostile that 
+                                touches them, adding them permanently to <a href="alien_hivesight.html">hive 
+                                sight</a> (just as the <a href="alien_skulk_primary.html">parasite</a> 
+                                ability does).</p>
+                              </td>
+                            <td width="200"><img src="images/images/chamber_s.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                          
+                        
+                        
+                        
+                        <table width="628" border="1" cellspacing="0" cellpadding="0" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                                <tr> 
+                                  <td width="50%"> <img src="images/tech_10/movement.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_m.html">Movement</a> 
+                                  </td>
+                                  <td width="50%"><img src="images/tech_10/sensory.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_s.html">Sensory</a></td>
+                                </tr>
+                                <tr> 
+                                  <td width="50%"><img src="images/tech_10/defence.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_d.html">Defensive</a></td>
+                                  <td width="50%"><img src="images/tech_10/offense.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_o.html">Offensive</a></td>
+                                </tr>
+                                <tr> 
+                                  <td width="50%"><img src="images/tech_10/resource.gif" width="15" height="15"> 
+                                    <a href="alien_chambers_r.html">Resource Chambers</a></td>
+                                  <td width="50%">&nbsp;</td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_changingspecies.html b/main/manual/alien_changingspecies.html
new file mode 100644
index 00000000..afe3b6eb
--- /dev/null
+++ b/main/manual/alien_changingspecies.html
@@ -0,0 +1,170 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a>: 
+            Changing Species</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_changingspecies.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                        <tr>
+                          <td>
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p> <img src="images/images/10red_data.gif" width="13" height="10"> 
+                                Ever resource conscious, the bacterium always 
+                                first creates <a href="alien_skulk.html">Skulks</a> 
+                                &#150; they seem to provide the best results for the 
+                                least investment. After aliens spawn as Skulks, 
+                                they can change their form into the other four 
+                                species described here. A gestation sac forms 
+                                around them, and resources and information are 
+                                drawn from the bacterium. The alien that emerges 
+                                appears to have the same knowledge and <a href="alien_evolutions.html">evolutions</a> 
+                                as it did in its previous form. An alien must 
+                                have access to enough <a href="alien_resources.html">resources</a> 
+                                to gestate into each species. Some complex forms 
+                                also require two or more <a href="alien_hive.html">hives</a> 
+                                to be active.</p>
+                              <p>The higher cost of more complex species leads 
+                                to fascinating variation in tactics. Losing one 
+                                <a href="alien_onos.html">Onos</a> costs the aliens 
+                                as much as a dozen (evolved) <a href="alien_skulk.html">Skulks</a>. 
+                                Because they basically &quot;cost&quot; nothing, 
+                                Skulks seem to be more reckless and willing to 
+                                die to destroy their target than their more powerful, 
+                                and more expensive, brothers. On the other hand, 
+                                a single Onos can destroy an entire squad and 
+                                base.</p>
+                            </td>
+                          </tr>
+                        </table>
+                          
+                        
+                        
+                        
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_evolutions.html b/main/manual/alien_evolutions.html
new file mode 100644
index 00000000..b8cda9b7
--- /dev/null
+++ b/main/manual/alien_evolutions.html
@@ -0,0 +1,223 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a>: 
+            Evolutions</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_evolutions.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> the Kharaa can travel up their 
+                                own family tree, changing their &quot;race&quot;, 
+                                and evolving extraordinary abilities. Evolutions 
+                                are broken down into three categories &#150; <a href="alien_evolutions_d.html">Defensive</a>, 
+                                <a href="alien_evolutions_m.html">Movement</a>, 
+                                and <a href="alien_evolutions_s.html">Sensory</a>. 
+                              </p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+<table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p> <img src="images/images/10red_data.gif" width="13" height="10"> 
+                                When it was first noticed that the aliens seemed 
+                                to be modifying themselves over the course of 
+                                a prolonged engagement &#150; growing more resistant 
+                                to gunfire, or becoming utterly silent &#150; it was 
+                                assumed that they were reacting to our actions, 
+                                and developing immunities much like a virus does. 
+                                The truth is more complex.</p>
+                              <p>Just as a marine structure contains coded information 
+                                that allows a ship or base's nanotech to perform 
+                                new, military grade, functions, so do the aliens 
+                                begin with base-level resources, and construct 
+                                structures to increase their combat abilities. 
+                                The difference is, a Kharaa defensive tower (for 
+                                instance) is less like a computer, and more like 
+                                a time capsule. It contains information similar 
+                                to a Hive's, but more specific &#150; this information 
+                                describes variations of creatures from the Kharaa's 
+                                history: a genetic family tree. When a Kharaa 
+                                gains a new ability, it is evolving from its base 
+                                form, down some specialized branch of that tree: 
+                                growing more sophisticated, and without fail, 
+                                deadlier. This fast-forward evolution allows for 
+                                dozens of variations of alien: each supposedly 
+                                suited to some environment, lost in the Kharaa's 
+                                past. Similar to Earth species that may have arctic, 
+                                desert and jungle variants, that while all the 
+                                same kind of animal, have evolved into unique 
+                                sub-species. </p>
+                              <p>Multiple chambers appear to also offer more and 
+                                more information, improving the effectiveness 
+                                of each evolution. Once more than three chambers 
+                                are active, this improvement plateaus.</p>
+                              <p>Since the Kharaa have probably never seen man-made 
+                                environments like ours, and since humans don't 
+                                always attack the same way twice, they don't choose 
+                                just one variation. They tend to evolve a wide 
+                                range of species types &#150; ranging from brawlers, 
+                                with increased speed and armor, to assassins, 
+                                with silent movement and enhanced senses.</p>
+                            </td>
+                              </tr>
+                            </table>
+                          
+                        
+                        <table width="628" border="1" cellspacing="0" cellpadding="0" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td>
+                              <table width="628" border="0" cellspacing="5" cellpadding="0" align="center">
+                                <tr> 
+                                  <td width="33%"> 
+                                    <p align="center"><b><a href="alien_evolutions_d.html">Defensive<br>
+                                      <br>
+                                      <img src="images/evolutions/d.gif" width="64" height="64" border="0"></a></b></p>
+                                  </td>
+                                  <td width="33%"> 
+                                    <div align="center"><b><a href="alien_evolutions_s.html">Sensory<br>
+                                      <br>
+                                      <img src="images/evolutions/s.gif" width="64" height="64" border="0"></a></b></div>
+                                  </td>
+                                  <td width="33%"> 
+                                    <div align="center"><b><a href="alien_evolutions_m.html">Movement<br>
+                                      <br>
+                                      <img src="images/evolutions/m.gif" width="64" height="64" border="0"></a></b></div>
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_evolutions_adrenaline.html b/main/manual/alien_evolutions_adrenaline.html
new file mode 100644
index 00000000..76b8b691
--- /dev/null
+++ b/main/manual/alien_evolutions_adrenaline.html
@@ -0,0 +1,204 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_evolutions.html" class="sectionlink">Evolutions</a> 
+            :: <a href="alien_evolutions_m.html" class="sectionlink">Movement</a>: 
+            Adrenaline</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_adren.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> alien becomes tireless; its energy 
+                                renews rapidly.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+<table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><b>Observation:</b> &quot;The 'army' of aliens 
+                                that pinned down a squad of marines with a never-ending 
+                                hail of spikes, turned out to be one extremely 
+                                annoying Lerk.&quot; Or: &quot;the normally hyper 
+                                Skulks started literally bouncing off the walls, 
+                                like a birthday party of three-year-olds who found 
+                                Mommy's amphetamines.&quot; </p>
+                              <p><b>Thesis</b>: The aliens rely on their own physiology 
+                                for their abilities and weapons. Every spike they 
+                                fire, or extreme physical act they commit, drains 
+                                them. The adrenaline evolution is probably an 
+                                internal overhaul &#150; an upgrade of all internal 
+                                organs and systems, in favor of stronger and more 
+                                efficient ones. The resulting body can recover 
+                                very quickly from exertion, and will not tire 
+                                as fast. As with other abilities, these modifications 
+                                prohibit other evolutionary choices &#150; namely, 
+                                <a href="alien_evolutions_celerity.html">celerity</a> 
+                                and <a href="alien_evolutions_silence.html">silence</a>.</p>
+                              <table width="290" border="1" cellspacing="0" cellpadding="2" bordercolor="#CC0000">
+                                <tr> 
+                                  <td colspan="2" bgcolor="#450A0A" class="sectiontext" height="18">&nbsp;&nbsp;&nbsp;&nbsp;Adrenaline 
+                                    (% of energy per second)</td>
+                                </tr>
+                                <tr> 
+                                  <td width="96"> 
+                                    <p>Level 1</p>
+                                  </td>
+                                  <td width="180"> 
+                                    <p align="center"><font color="#FF6600">8%</font></p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td width="96"> 
+                                    <p>Level 2</p>
+                                  </td>
+                                  <td width="180"> 
+                                    <p align="center"><font color="#FF6600">12%</font></p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td width="96"> 
+                                    <p>Level 3</p>
+                                  </td>
+                                  <td width="180"> 
+                                    <p align="center"><font color="#FF6600">16%</font></p>
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                              </tr>
+                            </table>
+                          
+                        
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_evolutions_advhivesight.html b/main/manual/alien_evolutions_advhivesight.html
new file mode 100644
index 00000000..72cbefde
--- /dev/null
+++ b/main/manual/alien_evolutions_advhivesight.html
@@ -0,0 +1,178 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_evolutions.html" class="sectionlink">Evolutions</a> 
+            :: <a href="alien_evolutions_s.html" class="sectionlink">Sensory</a>: 
+            Adv. Hivesight</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_advhivesight.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> aliens seem to &quot;notice&quot; 
+                                the enemy with great precision &#150; are rarely surprised, 
+                                and can pick out hiding or concealed foes much 
+                                more often.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+<table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><b>Observation:</b> &quot;I am not a noisy person. 
+                                I grew up doing black-op assassinations, and now 
+                                as an adult I am a goddam Frontiersman. So explain 
+                                to me how that [expletive] knew I was there.&quot; 
+                              </p>
+                              <p><b>Thesis:</b> until we know how alien &quot;hivesight&quot; 
+                                actually works, the aliens themselves will remain 
+                                a mystery. If our current knowledge (all of it 
+                                unproven and untested) is correct, these aliens 
+                                have the equivalent of a larger radar dish &#150; 
+                                they can detect minute and distant disturbances 
+                                in the bacterial network. Because these aliens 
+                                have never been observed using the &quot;Cloaking&quot; 
+                                or &quot;Scent of Fear&quot; evolutions, it probably 
+                                involves their outermost skin layer. Perhaps microscopic 
+                                ridges form, increasing the alien's surface area, 
+                                and improving its &quot;reception&quot;. In any 
+                                event, these creatures can pick out the threat 
+                                alert from the bacterial information stream with 
+                                extreme accuracy. At its highest level, this evolution 
+                                seems to make enemies near impossible to miss.</p>
+                              </td>
+                              </tr>
+                            </table>
+                          
+                        
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_evolutions_carapace.html b/main/manual/alien_evolutions_carapace.html
new file mode 100644
index 00000000..ed6bf2cd
--- /dev/null
+++ b/main/manual/alien_evolutions_carapace.html
@@ -0,0 +1,385 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_evolutions.html" class="sectionlink">Evolutions</a> 
+            :: <a href="alien_evolutions_d.html" class="sectionlink">Defensive</a>: 
+            Carapace</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_carapace.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> alien grows armor, can resist 
+                                damage.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+<table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><b>Observation:</b> &quot;A creature that only 
+                                took one clip to kill at the beginning of a battle 
+                                shrugs off four clips of light machine gun fire 
+                                and leaves a squad of marines looking like they've 
+                                been fed through a wood-chipper.&quot; </p>
+                              <p><b>Thesis:</b> Current thinking is that anywhere 
+                                from three inches to half a foot of force-distributing 
+                                micro-honeycombed cartilage forms beneath the 
+                                skin. This means that gunfire does do damage &#150; 
+                                just much less than normal. This cartilage takes 
+                                up internal space that would otherwise be used 
+                                by the &quot;Regeneration&quot; or &quot;Redemption&quot; 
+                                evolution.</p>
+                              <p>Alien carapace, much like marine <a href="front_armor.html">armor</a>, 
+                                absorbs a certain percentage of damage. The rest 
+                                is taken off the alien's health. Different species 
+                                of alien have different amounts of armor. The 
+                                following is a chart of carapace upgrades for 
+                                each species:<br>
+                              </p>
+                              <table width="100%" border="1" cellspacing="0" cellpadding="2" bordercolor="#CC0000">
+                                <tr> 
+                                  <td colspan="11" bgcolor="#450A0A" class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Carapace</td>
+                                </tr>
+                                <tr> 
+                                  <td width="80"> 
+                                    <p><b><font color="#0B7BEE"></font></b></p>
+                                  </td>
+                                  <td colspan="2" class="sectiontext"> 
+                                    <p align="center">Skulk</p>
+                                  </td>
+                                  <td colspan="2" class="sectiontext"> 
+                                    <p align="center">Gorge</p>
+                                  </td>
+                                  <td colspan="2" class="sectiontext"> 
+                                    <p align="center">Lerk</p>
+                                  </td>
+                                  <td colspan="2" class="sectiontext"> 
+                                    <p align="center">Fade</p>
+                                  </td>
+                                  <td colspan="2" class="sectiontext"> 
+                                    <p align="center">Onos</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td width="80"> 
+                                    <p><font color="#CC0000"></font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#CC0000">points 
+                                      </font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#CC0000">dmg 
+                                      %</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#CC0000">points 
+                                      </font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#CC0000">dmg 
+                                      %</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#CC0000">points 
+                                      </font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#CC0000">dmg 
+                                      %</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#CC0000">points 
+                                      </font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#CC0000">dmg 
+                                      %</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#CC0000">points 
+                                      </font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#CC0000">dmg 
+                                      %</font></p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td width="80"> 
+                                    <p>Start</p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">10</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">30</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">50</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">30</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">50</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">30</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">90</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">30</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">150</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">30</font></p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td width="80"> 
+                                    <p>Level 1</p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">30</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">40</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">75</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">40</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">75</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">40</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">125</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">40</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">200</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">40</font></p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td width="80"> 
+                                    <p>Level 2</p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">30</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">50</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">75</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">50</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">75</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">50</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">125</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">50</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">200</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">50</font></p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td width="80"> 
+                                    <p>Level 3</p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">30</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">60</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">75</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">60</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">75</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">60</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">125</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">60</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">200</font></p>
+                                  </td>
+                                  <td width="0"> 
+                                    <p align="center"><font color="#FF6600">60</font></p>
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                              </tr>
+                            </table>
+                          
+                        
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_evolutions_celerity.html b/main/manual/alien_evolutions_celerity.html
new file mode 100644
index 00000000..8f959fc6
--- /dev/null
+++ b/main/manual/alien_evolutions_celerity.html
@@ -0,0 +1,202 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_evolutions.html" class="sectionlink">Evolutions</a> 
+            :: <a href="alien_evolutions_m.html" class="sectionlink">Movement</a>: 
+            Celerity</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_celerity.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> movement rate increases.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+<table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><b>Observation:</b> &quot;You'd think this would 
+                                be scarier on the small critters &#150; and don't get 
+                                me wrong, a Lerk with celerity is like trying 
+                                to whack a hummingbird with a baseball bat. But 
+                                it's a little scarier when one of those three-ton 
+                                freaks is pounding along behind you, and it's 
+                                comin' on like a freight train. I've never been 
+                                so happy to see a ventilation shaft in my whole 
+                                life.&quot;</p>
+                              <p><b>Thesis:</b> the tensile strength of all muscles 
+                                and tendons in the &quot;running&quot; group is 
+                                increased, cores of flexible and strong material 
+                                form in the bones. This is probably a relatively 
+                                simple change, but the results are dramatic. At 
+                                their peak, our simulations cannot even speculate 
+                                how they can maintain such speeds &#150; the stress 
+                                and impact alone should shatter their bones and 
+                                snap their muscles, no matter how strong.</p>
+                              <table width="248" border="1" cellspacing="0" cellpadding="2" bordercolor="#CC0000">
+                                <tr> 
+                                  <td colspan="2" bgcolor="#450A0A" class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;Celerity 
+                                    (% speed increase)</td>
+                                </tr>
+                                <tr> 
+                                  <td width="80"> 
+                                    <p>Level 1</p>
+                                  </td>
+                                  <td width="222"> 
+                                    <p align="center"><font color="#FF6600">~10%</font></p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td width="80"> 
+                                    <p>Level 2</p>
+                                  </td>
+                                  <td width="222"> 
+                                    <p align="center"><font color="#FF6600">~20%</font></p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td width="80"> 
+                                    <p>Level 3</p>
+                                  </td>
+                                  <td width="222"> 
+                                    <p align="center"><font color="#FF6600">~30%</font></p>
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                              </tr>
+                            </table>
+                          
+                        
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_evolutions_cloaking.html b/main/manual/alien_evolutions_cloaking.html
new file mode 100644
index 00000000..c8415ad3
--- /dev/null
+++ b/main/manual/alien_evolutions_cloaking.html
@@ -0,0 +1,212 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_evolutions.html" class="sectionlink">Evolutions</a> 
+            :: <a href="alien_evolutions_s.html" class="sectionlink">Sensory</a>: 
+            Cloaking</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_cloaking.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> when stationary, alien blends 
+                                into background.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+<table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><b>Observation:</b> &quot;We hate this. Hate 
+                                it hate it hate it. It's bad enough that they 
+                                hide in shadows and run on walls &#150; when they can 
+                                sit out in plain sight in a well lit room and 
+                                just wait for you to walk by so they can jump 
+                                on you from behind &#133; scares the sweat outta 
+                                ya. You hear stories about someone getting on 
+                                an elevator alone, closing the door, hitting the 
+                                button, and just as it starts to move they hear 
+                                this god-awful chuckle ...&quot;</p>
+                              <p><b>Thesis:</b> the outermost epidermal layer 
+                                becomes a crude computer screen, using skin pores 
+                                as pixels, and secreting pigment for color. When 
+                                the alien stops moving, it probably &quot;plugs 
+                                in&quot; to the local bacterial network, and &quot;downloads&quot; 
+                                the correct background image. As this evolution 
+                                becomes more efficient, the &quot;pixel&quot; 
+                                count increases. Kharaa are naturally resistant 
+                                to most forms of detection &#150; for instance, their 
+                                body temperature tends to match the room's. With 
+                                the cloaking evolution, their ability to disappear 
+                                is total. This upgrade works only when stationary 
+                                &#150; once the alien moves, or attacks, the link is 
+                                broken, and their skin reverts.<br>
+                              </p>
+                              <table width="219" border="1" cellspacing="0" cellpadding="2" bordercolor="#CC0000">
+                                <tr> 
+                                  <td colspan="2" bgcolor="#450A0A" class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;Cloaking</td>
+                                </tr>
+                                <tr> 
+                                  <td width="80"> 
+                                    <p>Level 1</p>
+                                  </td>
+                                  <td width="125"> 
+                                    <p align="center"><font color="#FF6600">blurred 
+                                      camouflage</font></p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td width="80"> 
+                                    <p>Level 2</p>
+                                  </td>
+                                  <td width="125"> 
+                                    <p align="center"><font color="#FF6600">faint 
+                                      outline</font></p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td width="80"> 
+                                    <p>Level 3</p>
+                                  </td>
+                                  <td width="125"> 
+                                    <p align="center"><font color="#FF6600">totally 
+                                      invisible</font></p>
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                              </tr>
+                            </table>
+                          
+                        
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_evolutions_d.html b/main/manual/alien_evolutions_d.html
new file mode 100644
index 00000000..f30f6c6f
--- /dev/null
+++ b/main/manual/alien_evolutions_d.html
@@ -0,0 +1,176 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_evolutions.html" class="sectionlink">Evolutions</a>: 
+            Defense</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_chamber_d.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                        <tr>
+                          <td>
+<table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p>These enhancements are subcutaneous, involving 
+                                neither the skin, nor internal organs. They provide 
+                                various defensive advantages, and like many evolved 
+                                abilities, are mutually exclusive. At least, as 
+                                far as we have seen, no alien has ever combined 
+                                two of them together. </p>
+                              </td>
+                              </tr>
+                            </table>
+                          
+                        
+                        
+                        <table width="628" border="1" cellspacing="0" cellpadding="0" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <table width="628" border="0" cellspacing="0" cellpadding="5" align="center">
+                                <tr> 
+                                  <td width="33%"> 
+                                    <p align="center"><a href="alien_evolutions_carapace.html">Carapace<br>
+                                      <br>
+                                      <img src="images/evolutions/carapace.gif" width="64" height="64" border="0"></a></p>
+                                  </td>
+                                  <td width="33%"> 
+                                    <div align="center"><a href="alien_evolutions_regeneration.html">Regeneration<br>
+                                      <br>
+                                      <img src="images/evolutions/regeneration.gif" width="64" height="64" border="0"></a></div>
+                                  </td>
+                                  <td width="33%"> 
+                                    <div align="center"><a href="alien_evolutions_redemption.html">Redemption<br>
+                                      <br>
+                                      <img src="images/evolutions/redemption.gif" width="64" height="64" border="0"></a></div>
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_evolutions_m.html b/main/manual/alien_evolutions_m.html
new file mode 100644
index 00000000..dbe3afa0
--- /dev/null
+++ b/main/manual/alien_evolutions_m.html
@@ -0,0 +1,175 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_evolutions.html" class="sectionlink">Evolutions</a>: 
+            Movement</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_chamber_m.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                        <tr>
+                          <td>
+<table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p>These evolutions improve the musculature and 
+                                viscera of the Kharaa, drastically increasing 
+                                the alien's efficiency. Being mutually exclusive, 
+                                they also encourage very different combat behavior. 
+                              </p>
+                              </td>
+                              </tr>
+                            </table>
+                          
+                        
+                        
+                        <table width="628" border="1" cellspacing="0" cellpadding="0" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <table width="628" border="0" cellspacing="0" cellpadding="5" align="center">
+                                <tr> 
+                                  <td width="33%"> 
+                                    <p align="center"><a href="alien_evolutions_adrenaline.html">Adrenaline<br>
+                                      <br>
+                                      <img src="images/evolutions/adrenaline.gif" width="64" height="64" border="0"></a></p>
+                                  </td>
+                                  <td width="33%"> 
+                                    <div align="center"><a href="alien_evolutions_celerity.html">Celerity<br>
+                                      <br>
+                                      <img src="images/evolutions/celerity.gif" width="64" height="64" border="0"></a></div>
+                                  </td>
+                                  <td width="33%"> 
+                                    <div align="center"><a href="alien_evolutions_silence.html">Silence<br>
+                                      <br>
+                                      <img src="images/evolutions/silence.gif" width="64" height="64" border="0"></a></div>
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_evolutions_redemption.html b/main/manual/alien_evolutions_redemption.html
new file mode 100644
index 00000000..fa5f652e
--- /dev/null
+++ b/main/manual/alien_evolutions_redemption.html
@@ -0,0 +1,189 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_evolutions.html" class="sectionlink">Evolutions</a> 
+            :: <a href="alien_evolutions_d.html" class="sectionlink">Defensive</a>: 
+            Redemption</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_redemption.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> when near death, alien disappears, 
+                                reappearing at a hive.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+<table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><b>Observation:</b> &quot;There's this one ballsy 
+                                Skulk, makes a run on the base. We all stop what 
+                                we're doing and lay down suppressing fire. It's 
+                                in mid-air, comin' right at me (I notice it's 
+                                missing half of a tooth, that's how close it gets) 
+                                &#150; when it just disappears. Gone. We all look 
+                                at each other like 'Okaaaay &#133;' and get back 
+                                to work. A minute later, a Skulk makes a run on 
+                                the base from another direction, starts chewin' 
+                                on our resource tower. We just cover the area 
+                                with a blanket of bullets and it disappears. So 
+                                sure. Whatever. The third time I recognize the 
+                                sucker. It zips up the wall and drops right on 
+                                top of me. I get to look right up its throat. 
+                                It's the same Skulk. I'd swear to God.&quot;</p>
+                              <p>Thesis: This, paired with the &quot;<a href="alien_fade_hive.html">blink</a>&quot; 
+                                ability, may be the most scientifically troubling 
+                                of alien evolutions. The two must be related, 
+                                but it is unclear how &#150; and any &quot;experiment&quot; 
+                                that might &quot;test&quot; these abilities is, 
+                                at this juncture, impractical. The best idea so 
+                                far is that a new body is created back at the 
+                                hive, and the alien's unique information (memories, 
+                                etc.) is somehow transferred to it. This information 
+                                is probably stored in some transmission-ready 
+                                bacterial form, that is released when the creature 
+                                sustains too much damage &#150; much like a mushroom 
+                                shooting off its spores when it is stepped on.</p>
+                              <p>The redemption ability does not appear to be 
+                                one hundred percent certain. As an alien drops 
+                                below a certain health limit, there seems to be 
+                                an increasing chance that it will be redeemed. 
+                                With each increased level of this evolution, the 
+                                chance of redemption improves.</p>
+                              </td>
+                              </tr>
+                            </table>
+                          
+                        
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_evolutions_regeneration.html b/main/manual/alien_evolutions_regeneration.html
new file mode 100644
index 00000000..2dd1fcbc
--- /dev/null
+++ b/main/manual/alien_evolutions_regeneration.html
@@ -0,0 +1,215 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_evolutions.html" class="sectionlink">Evolutions</a> 
+            :: <a href="alien_evolutions_d.html" class="sectionlink">Defensive</a>: 
+            Regeneration</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_regen.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> alien rebuilds its body, constantly 
+                                healing damage</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+<table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><b>Observation:</b> &quot;We pumped four grenades 
+                                up onto the catwalk &#150; no direct hits, but the 
+                                Fade was slammed over the railing. The thing was 
+                                on fire, for chrissakes. It goes down behind the 
+                                generator, into a big pile of spent fuel canisters. 
+                                Made a hell of a racket. We figure &#150; grenade blast, 
+                                on fire, fell a couple of stories onto cast-metal 
+                                tubes &#133; let's kick back, get some medkits, 
+                                and set up a forward base. A minute later, we 
+                                hear a canister roll across the floor. We all 
+                                stand up like, 'Nah &#133; couldn't be &#133;'. 
+                                Next thing we know we're dodging acid and screaming 
+                                for ammo.&quot; </p>
+                              <p><b>Thesis</b>: the Kharaa can harvest our resources, 
+                                and use them to build various organic structures. 
+                                It looks like some aliens evolve the ability to 
+                                re-build themselves, probably creating an organ 
+                                that teaches the local bacteria to regard it as 
+                                a structure that requires construction. So it 
+                                is not actually healing itself, but literally 
+                                being built anew (the Gorge's <a href="alien_gorge_primary.html">healing 
+                                spray</a> likely operates on the same principle). 
+                                Absorbing raw material from the surrounding bacteria 
+                                requires subdermal conduits that interfere with 
+                                carapace evolution, and as near as we can tell, 
+                                the redemption evolution as well.</p>
+                              <p>The following chart shows how many points per 
+                                second are regained by an alien with the regeneration 
+                                evolution: <br>
+                              </p>
+                              <table width="286" border="1" cellspacing="0" cellpadding="2" bordercolor="#CC0000">
+                                <tr> 
+                                  <td colspan="2" bgcolor="#450A0A" class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;Regeneration 
+                                    (points every 2 seconds)</td>
+                                </tr>
+                                <tr> 
+                                  <td width="82"> 
+                                    <p>Level 1</p>
+                                  </td>
+                                  <td width="190"> 
+                                    <p align="center">1pt</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td width="82"> 
+                                    <p>Level 2</p>
+                                  </td>
+                                  <td width="190"> 
+                                    <p align="center">2pts</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td width="82"> 
+                                    <p>Level 3</p>
+                                  </td>
+                                  <td width="190"> 
+                                    <p align="center">3pts</p>
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                              </tr>
+                            </table>
+                          
+                        
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_evolutions_s.html b/main/manual/alien_evolutions_s.html
new file mode 100644
index 00000000..69ab4984
--- /dev/null
+++ b/main/manual/alien_evolutions_s.html
@@ -0,0 +1,178 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_evolutions.html" class="sectionlink">Evolutions</a>: 
+            Sensory </font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_chamber_s.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                        <tr>
+                          <td>
+<table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p>Evolutionary advances to the skin are common 
+                                among Earth creatures &#150; but trust the Kharaa to 
+                                take them to an entirely new dimension. These 
+                                upgrades improve the alien's connection to the 
+                                bacterium, allowing it to receive new information, 
+                                which is put to various impressive uses.</p>
+                              </td>
+                              </tr>
+                            </table>
+                          
+                        
+                        
+                        <table width="628" border="1" cellspacing="0" cellpadding="0" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <table width="628" border="0" cellspacing="0" cellpadding="5" align="center">
+                                <tr> 
+                                  <td width="33%"> 
+                                    <p align="center"><a href="alien_evolutions_cloaking.html">Cloaking<br>
+                                      <br>
+                                      <img src="images/evolutions/cloaking.gif" width="64" height="64" border="0"></a></p>
+                                  </td>
+                                  <td width="33%"> 
+                                    <div align="center"><a href="alien_evolutions_advhivesight.html">Adv. 
+                                      Hivesight<br>
+                                      <br>
+                                      </a><a href="alien_evolutions_cloaking.html"><img src="images/images/transparent.gif" width="2" height="2" border="0"></a><a href="alien_evolutions_advhivesight.html"><img src="images/evolutions/advhivesight.gif" width="64" height="64" border="0"></a></div>
+                                  </td>
+                                  <td width="33%"> 
+                                    <div align="center"><a href="alien_evolutions_scentoffear.html">Scent 
+                                      of Fear<br>
+                                      <br>
+                                      </a><a href="alien_evolutions_scentoffear.html"><img src="images/evolutions/scentoffear.gif" width="64" height="64" border="0"></a></div>
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_evolutions_scentoffear.html b/main/manual/alien_evolutions_scentoffear.html
new file mode 100644
index 00000000..ca2eb08c
--- /dev/null
+++ b/main/manual/alien_evolutions_scentoffear.html
@@ -0,0 +1,220 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_evolutions.html" class="sectionlink">Evolutions</a> 
+            :: <a href="alien_evolutions_s.html" class="sectionlink">Sensory</a>: 
+            Scent Of Fear</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_scentof.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> injured marines can be found 
+                                anywhere, as if they had been <a href="alien_skulk_primary.html">parasited</a>.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+<table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><b>Observation:</b> &quot;You wouldn't know it 
+                                to look at us, but after the archive collapse 
+                                we were hurting, especially Nem. We just needed 
+                                to get back to the elevator and wait for some 
+                                resources to trickle in, but they kept the pressure 
+                                on, every step of the way. We put Nem in the middle, 
+                                they attacked the middle; we put him in back, 
+                                they attacked the back. It only took a few spikes 
+                                to finish him off: a Lerk shattered a window and 
+                                nailed him before we could cover. Hit-and-run 
+                                bastards. Then they started stalkin' Hanover. 
+                                I'm telling you: they knew who was hurtin', and 
+                                they were picking us off, one at a time.&quot;</p>
+                              <p><b>Thesis:</b> the most efficient ambush targets 
+                                the weakest prey. Or: the best way to attack many 
+                                foes is to reduce their number as quickly as possible. 
+                                Injured humans release microscopic triggers when 
+                                injured or harmed &#150; these aliens must be alert 
+                                to these emissions, evolving skin receptors that 
+                                can &quot;taste&quot; the air and pinpoint injured 
+                                foes. TSA armor should suppress tell-tales like 
+                                these &#150; the aliens must be amazingly sensitive. 
+                                Or perhaps the ever-present bacterial network 
+                                is responsible. This evolution is probably susceptible 
+                                to all kinds of tricks, or evasions &#150; but our 
+                                experiments with &quot;scent bombs&quot; proved 
+                                disastrous. As is the case with all aspects of 
+                                the Kharaa, we need more data &#133; but what 
+                                is an acceptable number of deaths for each bit 
+                                of information? For now, we must be satisfied 
+                                with observation, and observation only.<br>
+                              </p>
+                              <table width="419" border="1" cellspacing="0" cellpadding="2" bordercolor="#CC0000">
+                                <tr> 
+                                  <td colspan="2" bgcolor="#450A0A" class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;Scent 
+                                    of Fear</td>
+                                </tr>
+                                <tr> 
+                                  <td width="82"> 
+                                    <p>Level 1</p>
+                                  </td>
+                                  <td width="266"> 
+                                    <p align="center">Able to pinpoint injured 
+                                      marines within 17m </p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td width="82"> 
+                                    <p>Level 2</p>
+                                  </td>
+                                  <td width="266"> 
+                                    <p align="center">Able to pinpoint injured 
+                                      marines within 34m </p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td width="82"> 
+                                    <p>Level 3</p>
+                                  </td>
+                                  <td width="266"> 
+                                    <p align="center">Able to pinpoint injured 
+                                      marines within 51m </p>
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                              </tr>
+                            </table>
+                          
+                        
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_evolutions_silence.html b/main/manual/alien_evolutions_silence.html
new file mode 100644
index 00000000..a11dbe41
--- /dev/null
+++ b/main/manual/alien_evolutions_silence.html
@@ -0,0 +1,205 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_evolutions.html" class="sectionlink">Evolutions</a> 
+            :: <a href="alien_evolutions_m.html" class="sectionlink">Movement</a>: 
+            Silence</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_silence.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> alien movement and attacks make 
+                                no noise.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+<table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><b>Observation:</b> &quot;You almost never see 
+                                this in combat, and thank Jeezus for that. You'll 
+                                be standing with your squad, watching all the 
+                                entry points, when someone'll get hit. And you 
+                                won't know from where. Then someone else will 
+                                get hit, so you'll all dive for cover. You'll 
+                                be sitting there in dead silence, listening to 
+                                each other's breathin', when you see the bugger 
+                                glide down behind your squadmate, quiet as a hologram. 
+                                Before you can yell out, it's slammed him against 
+                                the wall and ripped him up.&quot;</p>
+                              <p><b>Thesis:</b> an alien that can hunt and attack 
+                                without being noticed is deadlier, and requires 
+                                less energy. This is the &quot;stealth&quot; model 
+                                &#150; probably requires shock-absorbent cartilage 
+                                between all joints, lubricating fluids in weaponry, 
+                                and a corresponding change in behavior. Humans 
+                                can be very quiet if they move correctly &#150; these 
+                                aliens suddenly learn similar techniques. <br>
+                              </p>
+                              <table width="336" border="1" cellspacing="0" cellpadding="2" bordercolor="#CC0000">
+                                <tr> 
+                                  <td colspan="2" bgcolor="#450A0A" class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;Silence 
+                                    (% noise of movement and attacks)</td>
+                                </tr>
+                                <tr> 
+                                  <td width="80"> 
+                                    <p>Level 1</p>
+                                  </td>
+                                  <td width="189"> 
+                                    <p align="center">66%</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td width="80"> 
+                                    <p>Level 2</p>
+                                  </td>
+                                  <td width="189"> 
+                                    <p align="center">33%</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td width="80"> 
+                                    <p>Level 3</p>
+                                  </td>
+                                  <td width="189"> 
+                                    <p align="center">0%</p>
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                              </tr>
+                            </table>
+                          
+                        
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_fade.html b/main/manual/alien_fade.html
new file mode 100644
index 00000000..ba18d169
--- /dev/null
+++ b/main/manual/alien_fade.html
@@ -0,0 +1,227 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a>: 
+            Fade</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    
+                  <table width="100" border="0" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td><img src="images/titles/alien_fade.gif" width="628" height="25" hspace="25"></td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top" bgcolor="#330000"> 
+                            <td colspan="2"> 
+                              <p><b>Summary</b>: These are the shock troops of 
+                                the Kharaa: versatile, tough, and highly specialized 
+                                to combat. Disturbingly humanoid, Fades mix excellent 
+                                ranged attacks with powerful melee damage &#150; 
+                                which when combined with the seemingly supernatural 
+                                <a href="alien_fade_hive.html">blink</a> ability, 
+                                make them powerful all-around brutes, whose cunning 
+                                cannot be underestimated.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_fade_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p><img src="images/images/10red_health.gif" width="10" height="10"> 
+                                <span class="sectiontext">Health:</span> <span class="sectiontext"><font color="#FF6600">200</font>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><img src="images/images/10red_armor.gif" width="10" height="10"><span class="sectiontext"> 
+                                Armor:</span> <span class="sectiontext"><font color="#FF6600">90 
+                                pts. armor (30% damage absorbed)</font></span></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext">Abilities: <img src="images/images/10red_o.gif" width="7" height="9"> 
+                                = zero hives <img src="images/images/10red_h.gif" width="7" height="9">=one 
+                                hive <img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9">=two 
+                                hives <img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9">=three 
+                                hives <img src="images/images/10red_s.gif" width="7" height="9">=damage 
+                                vs. structures</p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td width="10%" height="23"><img src="images/images/10red_o.gif" width="7" height="9"></td>
+                                  <td height="23" colspan="2"> 
+                                    <p><a href="alien_fade_inherent.html"><font color="#FFFFFF">Swipe</font></a></p>
+                                  </td>
+                                  <td width="58%" height="23"> 
+                                    <p>80</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar2.gif" width="100%" height="1" vspace="2"></td>
+                                </tr>
+                                <tr> 
+                                  <td width="10%"><img src="images/images/10red_h.gif" width="7" height="9"></td>
+                                  <td colspan="2"> 
+                                    <p><a href="alien_fade_primary.html"><font color="#FFFFFF">Acid Rocket</font></a></p>
+                                  </td>
+                                  <td width="58%"> 
+                                    <p>50, lesser splash damage</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar2.gif" width="100%" height="1" vspace="2"></td>
+                                </tr>
+                                <tr> 
+                                  <td width="10%"><img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9"></td>
+                                  <td colspan="2"> 
+                                    <p><a href="alien_fade_hive.html"><font color="#FFFFFF">Blink</font></a></p>
+                                  </td>
+                                  <td width="58%"> 
+                                    <p>&quot;teleportation&quot;</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar2.gif" width="100%" height="1" vspace="2"></td>
+                                </tr>
+                                <tr> 
+                                  <td width="10%"><img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9"></td>
+                                  <td colspan="2"> 
+                                    <p><a href="alien_fade_hive.html"><font color="#FFFFFF">Bilebomb</font></a></p>
+                                  </td>
+                                  <td width="58%"> 
+                                    <p>80/160<span class="sectiontext">(<img src="images/images/10red_s.gif" width="7" height="9">)</span>, 
+                                      radius 500</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar.gif" width="100%" height="1" vspace="3"></td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"> 
+                                    <p><br>
+                                      <b>Observation</b>:<br>
+                                      <a href="alien_fade_observation.html"><i>&quot;If 
+                                      you want to know what it's like inside a 
+                                      bilebomb, here it is:&quot;</i></a> </p>
+                                  </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                              </p>
+                            </td>
+                            <td><img src="images/images/fade.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+                    
+                </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_fade_hive.html b/main/manual/alien_fade_hive.html
new file mode 100644
index 00000000..be435572
--- /dev/null
+++ b/main/manual/alien_fade_hive.html
@@ -0,0 +1,221 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_fade.html" class="sectionlink">Fade</a>: Hive-Learned 
+            Abilities </font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_fade.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: These are the shock troops of 
+                                the Kharaa: versatile, tough, and highly specialized 
+                                to combat. Disturbingly humanoid, Fades mix excellent 
+                                ranged attacks with powerful melee damage &#150; 
+                                which when combined with the seemingly supernatural 
+                                <a href="alien_fade_hive.html">blink</a> ability, 
+                                make them powerful all-around brutes, whose cunning 
+                                cannot be underestimated.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_fade_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                        <br>
+                        <img src="images/titles/alien_hivelearned.gif" width="628" height="25" hspace="25">
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_fade.html">Fade</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p><b>Two/Three Hive Abilities<br>
+                                      </b><br>
+                                      <b>Two Hives</b>: <span class="sectiontext">Blink</span><br>
+                                      <br>
+                                      The so called &quot;blink&quot; ability 
+                                      is one of the more contentious topics for 
+                                      scientists studying the Kharaa. One side 
+                                      believes that it is our observations that 
+                                      are incorrect, that there is an optical 
+                                      illusion of some sort at work, making Fades 
+                                      appear to teleport, apparently through solid 
+                                      matter. They believe that, at the most, 
+                                      entirely new bodies are created at the destination 
+                                      &#150; a kind of variant of the <a href="alien_evolutions_redemption.html">redemption</a> 
+                                      evolution. The other side believes that 
+                                      there is a phenomena similar to Frontiersmen 
+                                      <a href="structures_phasegate.html">phase 
+                                      gate technology</a> at work &#133; some 
+                                      organic, highly evolved ability that exploits 
+                                      the loophole in physics called the Kensky/Libovah 
+                                      effect. There are significant weak points 
+                                      in both arguments. But this phenomena undoubtedly 
+                                      exists: footage exists of Fades disappearing 
+                                      from one side of a wall, and appearing on 
+                                      the other, or instantly covering the space 
+                                      between them and their target.</p>
+                                    <p> <br>
+                                      <b>Three Hives</b>: <span class="sectiontext">Bile 
+                                      Bomb</span><br>
+                                      <br>
+                                      As if its other abilities weren't enough, 
+                                      with three hives the Fade becomes a mobile 
+                                      mortar, launching packets of super-virulent 
+                                      dissembling bacteria from its shoulder gun, 
+                                      that explode with concussive force upon 
+                                      impact and spread in a voracious ring. This 
+                                      attack is especially effective at softening, 
+                                      even obliterating, heavy defenses &#150; 
+                                      and its curved, or arcing flight allows 
+                                      the Fade to destroy <a href="structures.html">structures</a> 
+                                      from a safe location. </p>
+                            </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a></p>
+                            </td>
+                            <td><img src="images/images/fade.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_fade_inherent.html b/main/manual/alien_fade_inherent.html
new file mode 100644
index 00000000..9d40d7f7
--- /dev/null
+++ b/main/manual/alien_fade_inherent.html
@@ -0,0 +1,204 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_fade.html" class="sectionlink">Fade</a>: Inherent 
+            Abilities </font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_fade.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: These are the shock troops of 
+                                the Kharaa: versatile, tough, and highly specialized 
+                                to combat. Disturbingly humanoid, Fades mix excellent 
+                                ranged attacks with powerful melee damage &#150; which 
+                                when combined with the seemingly supernatural 
+                                <a href="alien_fade_hive.html">blink</a> ability, 
+                                make them powerful all-around brutes, whose cunning 
+                                cannot be underestimated. </p>
+                            </td>
+                          </tr>
+                        </table>
+                        <br>
+                        <img src="images/titles/alien_inherentabilities.gif" width="628" height="25" hspace="25"> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_fade.html">Fade</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p><b>Zero Hive (inherent) Abilities</b><br>
+                                      <span class="sectiontext">Strong</span>, 
+                                      <span class="sectiontext">Swipe</span></p>
+                                    <p><b>Strong</b>: Though not an &quot;ability&quot; 
+                                      like <a href="alien_skulk_inherent.html">wall 
+                                      crawling</a> or <a href="alien_lerk_inherent.html">flight</a>, 
+                                      the Fade has more health and armor than 
+                                      any species short of the <a href="alien_onos.html">Onos</a>. 
+                                      Its primary attacks are also more powerful 
+                                      than those of the <a href="alien_lerk.html">Lerk</a>, 
+                                      <a href="alien_gorge.html">Gorge</a> or 
+                                      <a href="alien_skulk.html">Skulk</a>. Heavy 
+                                      weaponry, or heavy backup, are recommended 
+                                      before engaging.</p>
+                                    <p><b>Swipe</b>: a similar evolution to the 
+                                      <a href="alien_skulk.html">Skulk</a>'s bladed 
+                                      feet, the Fade's arms end in long, deadly 
+                                      sharp blades. TSA scientists speculate that, 
+                                      left to their own devices, Fades might have 
+                                      eventually evolved some sort of opposable 
+                                      thumbs. Instead, the bacterium pushed them 
+                                      to develop these sword-like claws, that 
+                                      their ape-like arms swing in armor and metal 
+                                      shredding arcs. </p>
+                              </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a></p>
+                            </td>
+                            <td><img src="images/images/fade.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_fade_name.html b/main/manual/alien_fade_name.html
new file mode 100644
index 00000000..749a0ff5
--- /dev/null
+++ b/main/manual/alien_fade_name.html
@@ -0,0 +1,195 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="58"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a><a href="alien.html" class="sectionlink"></a> 
+            :: <a href="alien_fade.html" class="sectionlink">Fade</a>: Name</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_fade.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: These are the shock troops of 
+                                the Kharaa: versatile, tough, and highly specialized 
+                                to combat. Disturbingly humanoid, Fades mix excellent 
+                                ranged attacks with powerful melee damage &#150; 
+                                which when combined with the seemingly supernatural 
+                                <a href="alien_fade_hive.html">blink</a> ability, 
+                                make them powerful all-around brutes, whose cunning 
+                                cannot be underestimated.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_fade_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td>
+<div align="center"><br>
+                          <img src="images/titles/alien_name.gif" width="628" height="25"> 
+                        </div>
+                        <div align="center"></div>
+                        <div align="center"></div>
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_fade.html">Fade</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p>The Kharaa are so sneaky, it took some 
+                                      time for Frontiersmen to realize the <a href="alien_fade_hive.html">blink</a> 
+                                      ability existed at all. Fades seemed to 
+                                      appear and disappear with no rhyme or reason, 
+                                      penetrating seemingly air-tight defensive 
+                                      perimeters, or vanishing from a heavy fire 
+                                      fight without a trace. Marines soon reported 
+                                      these creatures &quot;fading&quot; away 
+                                      right before their eyes. Though we now understand 
+                                      there is a hive ability responsible for 
+                                      this phenomena, we are no closer to truly 
+                                      understanding how it functions.</p>
+                                    </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a></p>
+                            </td>
+                            <td><img src="images/images/fade.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_fade_observation.html b/main/manual/alien_fade_observation.html
new file mode 100644
index 00000000..7af8576a
--- /dev/null
+++ b/main/manual/alien_fade_observation.html
@@ -0,0 +1,246 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_fade.html" class="sectionlink">Fade</a>: Observation</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_fade.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: These are the shock troops of 
+                                the Kharaa: versatile, tough, and highly specialized 
+                                to combat. Disturbingly humanoid, Fades mix excellent 
+                                ranged attacks with powerful melee damage &#150; 
+                                which when combined with the seemingly supernatural 
+                                <a href="alien_fade_hive.html">blink</a> ability, 
+                                make them powerful all-around brutes, whose cunning 
+                                cannot be underestimated.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_fade_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                        <br>
+                        <img src="images/titles/alien_observation.gif" width="628" height="25" hspace="25"> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_fade.html">Fade</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p><i>&quot;If you want to know what it's 
+                                      like inside a bilebomb, here it is: the 
+                                      thump of its decompression feels like a 
+                                      kick to your guts, right to your bones and 
+                                      innards, and the clumps of stuff that settle 
+                                      over you just look evil, like they were 
+                                      made to kill you &#133; which is pretty 
+                                      much true. Other details would include the 
+                                      warning whine of my heavy armor's gauge 
+                                      as it dived from two hundred towards one, 
+                                      and the leg of the forward turret crumpling 
+                                      so it toppled onto its side, still twitching 
+                                      as it pathetically tried to acquire a target. 
+                                      The other turret whined uselessly on its 
+                                      perch behind me, atop the turret factory.<br>
+                                      <br>
+                                      I got my feet under me and stood up, pointing 
+                                      my shotgun at the top of the ladder, inching 
+                                      forward for a shot down into the vault. 
+                                      The theory was that anything that wanted 
+                                      me was going to have to get past the turrets 
+                                      and come up the ladder, where my shotgun 
+                                      would either end it fast, or knock them 
+                                      back down. No one seemed to plan on the 
+                                      Kharaa getting three hives up, and a brute 
+                                      of a Fade deciding to lob its little death 
+                                      cocktails up at me. The vault had only one 
+                                      entrance, making it a good place to defend, 
+                                      but a bad place to be trapped. My perch 
+                                      was on a shelf along the back of the room 
+                                      that had had some furniture and a couple 
+                                      of terminals. We cleared them away and set 
+                                      up a small base.<br>
+                                      <br>
+                                      The Mercantile League took its valuables 
+                                      seriously. The vault was filled with smooth 
+                                      self-pressurized containers, each a safe 
+                                      in its own right. The gridlock had scrambled 
+                                      a few, popping them open, but most were 
+                                      intact, looking like oversized coffins against 
+                                      the cream-colored floor below. There was 
+                                      no sign of the Fade. Then a whisper of light 
+                                      and movement behind me, and the Fade was 
+                                      right there. Even in my heavy armor it towered 
+                                      over me. It slashed with one arm &#150; 
+                                      a clang, and the last turret's feet tore 
+                                      free. The second blade followed a split 
+                                      second later, ripping it down and smashing 
+                                      it into the wall. <br>
+                                      <br>
+                                      I hit it from ten feet away with my shotgun 
+                                      &#150; I know I hurt it, bits of its wiry 
+                                      skin blew back away from it like dust. It 
+                                      whipped around to face me and the organic 
+                                      gun on its right shoulder unpuckered its 
+                                      lips. I jumped. I could hear acid rockets 
+                                      firing overhead. My armor took more damage 
+                                      from the twenty foot drop, but I figured 
+                                      it was the better alternative. I stayed 
+                                      crouched, pointing my shotgun at the top 
+                                      of the ladder.<br>
+                                      <br>
+                                      I heard the base being destroyed. The dish 
+                                      from our observatory rolled off the edge 
+                                      and cracked on the ground like a dinner 
+                                      plate, not ten feet from me. So much for 
+                                      our second base. I got the hell out of there 
+                                      while I could.&quot;</i></p>
+                                    </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                              </p>
+                            </td>
+                            <td><img src="images/images/fade.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_fade_primary.html b/main/manual/alien_fade_primary.html
new file mode 100644
index 00000000..66068413
--- /dev/null
+++ b/main/manual/alien_fade_primary.html
@@ -0,0 +1,177 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_fade.html" class="sectionlink">Fade</a>: Primary 
+            Attacks </font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    
+                  <table width="100" border="0" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td><img src="images/titles/alien_fade.gif" width="628" height="25" hspace="25"></td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: These are the shock troops of 
+                                the Kharaa: versatile, tough, and highly specialized 
+                                to combat. Disturbingly humanoid, Fades mix excellent 
+                                ranged attacks with powerful melee damage &#150; 
+                                which when combined with the seemingly supernatural 
+                                <a href="alien_fade_hive.html">blink</a> ability, 
+                                make them powerful all-around brutes, whose cunning 
+                                cannot be underestimated.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_fade_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                        <br>
+                        <img src="images/titles/alien_primaryattacks.gif" width="628" height="25" hspace="25"> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_fade.html">Fade</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p><b>One Hive (primary) Abilities</b><br>
+                                      <span class="sectiontext">Acid Rocket</span></p>
+                                    <p> speculation is that the gun-like growths 
+                                      on Fade's shoulders are actually symbiotic 
+                                      organisms, that the Fades joined forces 
+                                      with long ago. These growths distill stomach 
+                                      acid into a more powerful form, which is 
+                                      launched in loose spheres that splash open 
+                                      on impact. The damage and splash of this 
+                                      attack make it a highly feared and very 
+                                      dangerous weapon.</p>
+                                  </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a></p>
+                            </td>
+                            <td><img src="images/images/fade.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_gorge.html b/main/manual/alien_gorge.html
new file mode 100644
index 00000000..63ca75cc
--- /dev/null
+++ b/main/manual/alien_gorge.html
@@ -0,0 +1,267 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a>: 
+            Gorge</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    
+                  <table width="100" border="0" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td><img src="images/titles/alien_gorge.gif" width="628" height="25" hspace="25"></td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top" bgcolor="#330000"> 
+                            <td colspan="2"> 
+                              <p><b>Summary</b>: Belligerent and obese, Gorges 
+                                serve as a kind of mobile hive and support unit. 
+                                Their most important role is triggering <a href="alien_newhives.html">new 
+                                hives</a> and creating <a href="alien_chambers.html">chambers</a> 
+                                from lumps of raw matter<br>
+                                they &#133; un-digest. Without them the aliens 
+                                cannot keep pace with <a href="front_commander.html">marine 
+                                research</a> and <a href="front_upgrades.html">upgrades</a>. 
+                                To this end, they receive resources much faster 
+                                than other species, and can tap a larger amount. 
+                                They can also spray <a href="alien_gorge_primary.html">healing</a> 
+                                bacteria from their mouths, restoring chambers 
+                                and other aliens to full effectiveness. Though 
+                                their role is not as aggressive as the other species, 
+                                they consistently find ways to cause mischief 
+                                and support attacks on enemy positions. And with 
+                                their <a href="alien_gorge_inherent.html">spit</a>, 
+                                <a href="alien_gorge_hive.html">web</a> and <a href="alien_gorge_hive.html">babbler</a> 
+                                abilities, underestimating them in combat is a 
+                                dangerous mistake.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_gorge_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p><img src="images/images/10red_health.gif" width="10" height="10"> 
+                                <span class="sectiontext">Health:</span> <span class="sectiontext"><font color="#FF6600">100</font>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><img src="images/images/10red_armor.gif" width="10" height="10"><span class="sectiontext"> 
+                                Armor:</span> <span class="sectiontext"><font color="#FF6600">50 
+                                pts. armor (30% damage absorbed)</font></span></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext">Abilities: <img src="images/images/10red_o.gif" width="7" height="9"> 
+                                = zero hives <img src="images/images/10red_h.gif" width="7" height="9">=one 
+                                hive <img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9">=two 
+                                hives <img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9">=three 
+                                hives <img src="images/images/10red_s.gif" width="7" height="9">=damage 
+                                vs. structures</p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td width="10%" height="23"> 
+                                    <p><img src="images/images/10red_o.gif" width="7" height="9"></p>
+                                  </td>
+                                  <td height="23" colspan="2"> 
+                                    <p><a href="alien_gorge_inherent.html"><font color="#FFFFFF">Spit</font></a></p>
+                                  </td>
+                                  <td width="52%" height="23"> 
+                                    <p>22, low rate of fire</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar2.gif" width="100%" height="1" vspace="2"></td>
+                                </tr>
+                                <tr> 
+                                  <td width="10%"><img src="images/images/10red_o.gif" width="7" height="9"></td>
+                                  <td colspan="2"> 
+                                    <p><a href="alien_gorge_inherent.html"><font color="#FFFFFF">Build</font></a></p>
+                                  </td>
+                                  <td width="52%"> 
+                                    <p>can create chambers</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar2.gif" width="100%" height="1" vspace="2"></td>
+                                </tr>
+                                <tr> 
+                                  <td width="10%"><img src="images/images/10red_o.gif" width="7" height="9"></td>
+                                  <td colspan="2"> 
+                                    <p> <a href="alien_gorge_inherent.html"><font color="#FFFFFF">New 
+                                      Hive</font></a></p>
+                                  </td>
+                                  <td width="52%"> 
+                                    <p>can initiate new hives</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar2.gif" width="100%" height="1" vspace="2"></td>
+                                </tr>
+                                <tr> 
+                                  <td width="10%"><img src="images/images/10red_h.gif" width="7" height="9"></td>
+                                  <td colspan="2"> 
+                                    <p><a href="alien_gorge_primary.html"><font color="#FFFFFF">Healing 
+                                      Spray</font></a></p>
+                                  </td>
+                                  <td width="52%"> 
+                                    <p>can heal chambers and aliens</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar2.gif" width="100%" height="1" vspace="2"></td>
+                                </tr>
+                                <tr> 
+                                  <td width="10%"><img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9"></td>
+                                  <td colspan="2">
+                                    <p><a href="alien_gorge_hive.html"><font color="#FFFFFF">Web</font></a></p>
+                                  </td>
+                                  <td width="52%"> 
+                                    <p>immobilizes</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar2.gif" width="100%" height="1" vspace="2"></td>
+                                </tr>
+                                <tr> 
+                                  <td width="10%"><img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9"></td>
+                                  <td colspan="2"> 
+                                    <p><a href="alien_gorge_hive.html"><font color="#FFFFFF">Babblers</font></a></p>
+                                  </td>
+                                  <td width="52%"> 
+                                    <p>creates pseudo-skulks</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar.gif" width="100%" height="1" vspace="3"></td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"> 
+                                    <p><br>
+                                      <b>Observation</b>:<br>
+                                      <i><a href="alien_gorge_observation.html">&quot;[Deej: 
+                                      Andre, crawl over here. Stay down!]&quot;</a></i></p>
+                                  </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a><br>
+                              </p>
+                            </td>
+                            <td><img src="images/images/gorge.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+                    
+                </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_gorge_hive.html b/main/manual/alien_gorge_hive.html
new file mode 100644
index 00000000..3a0e1a8c
--- /dev/null
+++ b/main/manual/alien_gorge_hive.html
@@ -0,0 +1,222 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_gorge.html" class="sectionlink">Gorge</a>: Hive-Learned 
+            Abilities</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_gorge.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: Belligerent and obese, Gorges 
+                                serve as a kind of mobile hive and support unit. 
+                                Their most important role is triggering <a href="alien_newhives.html">new 
+                                hives</a> and creating <a href="alien_chambers.html">chambers</a> 
+                                from lumps of raw matter<br>
+                                they &#133; un-digest. Without them the aliens 
+                                cannot keep pace with <a href="front_commander.html">marine 
+                                research</a> and <a href="front_upgrades.html">upgrades</a>. 
+                                To this end, they receive resources much faster 
+                                than other species, and can tap a larger amount. 
+                                They can also spray <a href="alien_gorge_primary.html">healing</a> 
+                                bacteria from their mouths, restoring chambers 
+                                and other aliens to full effectiveness. Though 
+                                their role is not as aggressive as the other species, 
+                                they consistently find ways to cause mischief 
+                                and support attacks on enemy positions. And with 
+                                their <a href="alien_gorge_inherent.html">spit</a>, 
+                                <a href="alien_gorge_hive.html">web</a> and <a href="alien_gorge_hive.html">babbler</a> 
+                                abilities, underestimating them in combat is a 
+                                dangerous mistake.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_gorge_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td>
+<div align="center"><br>
+                        </div>
+                        <div align="center"><img src="images/titles/alien_hivelearned.gif" width="628" height="25"></div>
+                        <div align="center"></div>
+                        <div align="center"></div>
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_gorge.html">Gorge</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p><b>Two/Three Hive Abilities</b><br>
+                                      <br>
+                                      <b>Two Hives</b>: <span class="sectiontext">Webs</span></p>
+                                    <p>Gorges often protect sensitive areas with 
+                                      sticky strands of a fibrous, mucous-like 
+                                      substance. When tripped, a web strand immediately 
+                                      unanchors from both ends, and contracts 
+                                      around its victim. After a few moments of 
+                                      struggle a marine can break free &#150; 
+                                      but until he does he will be moving much 
+                                      slower, and <i>won't be able to use his 
+                                      weapons, jump, or use jet packs</i>. Webs 
+                                      are highly susceptible to heat: welders 
+                                      can burn them away without activating them. 
+                                      Multiple webs have cumulative effects.</p>
+                                    <p><b>Three Hives</b>: <span class="sectiontext">Babblers</span><br>
+                                      <br>
+                                      with this most advanced ability, the Gorge 
+                                      becomes a kind of hive itself. It can spontaneously 
+                                      create primitive, fully autonomous Skulks, 
+                                      that attack any enemies nearby. These Skulks 
+                                      are not as powerful or clever as hive spawned 
+                                      ones, and are also unstable. If not destroyed 
+                                      in combat, they self-destruct after 15 seconds, 
+                                      doing damage to any enemies nearby (a lesser 
+                                      version of <a href="alien_skulk_hive.html">xenocide</a>).</p>
+                              </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a></p>
+                            </td>
+                            <td><img src="images/images/gorge.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_gorge_inherent.html b/main/manual/alien_gorge_inherent.html
new file mode 100644
index 00000000..8539080e
--- /dev/null
+++ b/main/manual/alien_gorge_inherent.html
@@ -0,0 +1,232 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_gorge.html" class="sectionlink">Gorge</a>: Inherent 
+            Abilities</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_gorge.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: Belligerent and obese, Gorges 
+                                serve as a kind of mobile hive and support unit. 
+                                Their most important role is triggering <a href="alien_newhives.html">new 
+                                hives</a> and creating <a href="alien_chambers.html">chambers</a> 
+                                from lumps of raw matter<br>
+                                they &#133; un-digest. Without them the aliens 
+                                cannot keep pace with <a href="front_commander.html">marine 
+                                research</a> and <a href="front_upgrades.html">upgrades</a>. 
+                                To this end, they receive resources much faster 
+                                than other species, and can tap a larger amount. 
+                                They can also spray <a href="alien_gorge_primary.html">healing</a> 
+                                bacteria from their mouths, restoring chambers 
+                                and other aliens to full effectiveness. Though 
+                                their role is not as aggressive as the other species, 
+                                they consistently find ways to cause mischief 
+                                and support attacks on enemy positions. And with 
+                                their <a href="alien_gorge_inherent.html">spit</a>, 
+                                <a href="alien_gorge_hive.html">web</a> and <a href="alien_gorge_hive.html">babbler</a> 
+                                abilities, underestimating them in combat is a 
+                                dangerous mistake.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_gorge_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <div align="center"><br>
+                          <img src="images/titles/alien_inherentabilities.gif" width="628" height="25"> 
+                        </div>
+                        <div align="center"></div>
+                        <div align="center"></div>
+                        <div align="center"></div>
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_gorge.html">Gorge</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p><b>Zero Hive (inherent) Abilities</b><br>
+                                      <span class="sectiontext">Spit, Building, 
+                                      New Hive</span></p>
+                                    <p><b>Spit</b>: corrosive wads of pulpy matter, 
+                                      hucked impressive distances by their powerful 
+                                      stomach muscles. Not the most powerful alien 
+                                      weapon, but powerful enough to kill. </p>
+                                    <p><b>Building</b>: the Gorge is the only 
+                                      Kharaa that can create alien <a href="alien_chambers.html">chambers</a>. 
+                                      This gives them a primary role in triggering 
+                                      alien <a href="alien_evolutions.html">evolutions</a>. 
+                                      These growths can also serve defensive, 
+                                      offensive, and sensory purposes. See the 
+                                      <a href="alien_chambers.html">chambers</a> 
+                                      section for more detail. Gorges seem to 
+                                      need to accrue resource &quot;points&quot; 
+                                      much as a <a href="front_resources.html">commander</a> 
+                                      does, to build new chambers. </p>
+                                    <p><b>New Hive</b>: As the <a href="alien_bacterium.html">bacterium</a> 
+                                      spreads, it identifies potential <a href="alien_hive.html">hive</a> 
+                                      locations &#150; these are usually the dampest 
+                                      or warmest areas, though sometimes a location 
+                                      is chosen for other instinctual reasons 
+                                      not yet apparent to us. A visible bacterial 
+                                      mat will spread throughout these areas, 
+                                      in preparation for future growth. A Gorge 
+                                      can trigger the growth of a second, then 
+                                      third hive (we have never observed more 
+                                      than three &#150; perhaps the ship or base 
+                                      environments are not large or resource rich 
+                                      enough to support them). Activating a new 
+                                      hive is a significant expenditure of resources, 
+                                      and the principle motivation of the Kharaa 
+                                      to create and defend <a href="alien_chambers_r.html">resource 
+                                      chambers</a>. </p>
+                            </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a></p>
+                            </td>
+                            <td><img src="images/images/gorge.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_gorge_name.html b/main/manual/alien_gorge_name.html
new file mode 100644
index 00000000..c4bde53a
--- /dev/null
+++ b/main/manual/alien_gorge_name.html
@@ -0,0 +1,206 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_gorge.html" class="sectionlink">Gorge</a>: Name</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_gorge.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: Belligerent and obese, Gorges 
+                                serve as a kind of mobile hive and support unit. 
+                                Their most important role is triggering <a href="alien_newhives.html">new 
+                                hives</a> and creating <a href="alien_chambers.html">chambers</a> 
+                                from lumps of raw matter<br>
+                                they &#133; un-digest. Without them the aliens 
+                                cannot keep pace with <a href="front_commander.html">marine 
+                                research</a> and <a href="front_upgrades.html">upgrades</a>. 
+                                To this end, they receive resources much faster 
+                                than other species, and can tap a larger amount. 
+                                They can also spray <a href="alien_gorge_primary.html">healing</a> 
+                                bacteria from their mouths, restoring chambers 
+                                and other aliens to full effectiveness. Though 
+                                their role is not as aggressive as the other species, 
+                                they consistently find ways to cause mischief 
+                                and support attacks on enemy positions. And with 
+                                their <a href="alien_gorge_inherent.html">spit</a>, 
+                                <a href="alien_gorge_hive.html">web</a> and <a href="alien_gorge_hive.html">babbler</a> 
+                                abilities, underestimating them in combat is a 
+                                dangerous mistake.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_gorge_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <div align="center"><br>
+                        </div>
+                        <div align="center"><img src="images/titles/alien_name.gif" width="628" height="25"> 
+                        </div>
+                        <div align="center"></div>
+                        <div align="center"></div>
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_gorge.html">Gorge</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p>Though we now know that the Gorge consumes 
+                                      more resources than any other species, the 
+                                      name has less to do with their consumption, 
+                                      and more with their portly body type, and 
+                                      that they always seem to be slurping away 
+                                      at a <a href="alien_chambers.html">chamber</a>, 
+                                      <a href="alien_gorge_inherent.html">spitting</a> 
+                                      a wad of acid, or just in general doing 
+                                      things with their mouths that are disturbing 
+                                      to watch. </p>
+                                  </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a></p>
+                            </td>
+                            <td><img src="images/images/gorge.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_gorge_observation.html b/main/manual/alien_gorge_observation.html
new file mode 100644
index 00000000..a7864dc6
--- /dev/null
+++ b/main/manual/alien_gorge_observation.html
@@ -0,0 +1,294 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_gorge.html" class="sectionlink">Gorge</a>: Observation</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_gorge.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: Belligerent and obese, Gorges 
+                                serve as a kind of mobile hive and support unit. 
+                                Their most important role is triggering <a href="alien_newhives.html">new 
+                                hives</a> and creating <a href="alien_chambers.html">chambers</a> 
+                                from lumps of raw matter<br>
+                                they &#133; un-digest. Without them the aliens 
+                                cannot keep pace with <a href="front_commander.html">marine 
+                                research</a> and <a href="front_upgrades.html">upgrades</a>. 
+                                To this end, they receive resources much faster 
+                                than other species, and can tap a larger amount. 
+                                They can also spray <a href="alien_gorge_primary.html">healing</a> 
+                                bacteria from their mouths, restoring chambers 
+                                and other aliens to full effectiveness. Though 
+                                their role is not as aggressive as the other species, 
+                                they consistently find ways to cause mischief 
+                                and support attacks on enemy positions. And with 
+                                their <a href="alien_gorge_inherent.html">spit</a>, 
+                                <a href="alien_gorge_hive.html">web</a> and <a href="alien_gorge_hive.html">babbler</a> 
+                                abilities, underestimating them in combat is a 
+                                dangerous mistake.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_gorge_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td>
+<div align="center"><br>
+                        </div>
+                        <div align="center"><img src="images/titles/alien_observation.gif" width="628" height="25"></div>
+                        <div align="center"></div>
+                        <div align="center"></div>
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_gorge.html">Gorge</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p><i>&quot;[Deej: Andre, crawl over here. 
+                                      Stay down!]<br>
+                                      <br>
+                                      [Andre: on my way.]<br>
+                                      <br>
+                                      I dropped down between the stainless steel 
+                                      laboratory tables, and ran, hunched over, 
+                                      to Deej's forward position. At the doorway 
+                                      to the room he was in I paused, and slowly 
+                                      poked my head around. It was the observation 
+                                      area for the testing room beyond &#150; 
+                                      designed to protect the viewers from whatever 
+                                      dangerous (and probably illegal) experiments 
+                                      the Mercantile League was conducting. The 
+                                      viewing window ran the entire length of 
+                                      the wall. The airlock into the test room 
+                                      was not registering on my HUD &#150; it 
+                                      must have gone into lock-down mode after 
+                                      the gridlock kicked in.<br>
+                                      <br>
+                                      Deej was crouched beneath the window, motioning 
+                                      me over. I got onto my stomach and scooted 
+                                      across the floor. When I got alongside, 
+                                      he pointed at his eye, then at the window. 
+                                      I nodded, and slowly lifted my head to get 
+                                      a view.<br>
+                                      <br>
+                                      The experiment room had a resource node 
+                                      in it. A Gorge was building on top of it 
+                                      &#150; or more accurately, was ejecting 
+                                      from its mouth a thick mass of purplish-orange 
+                                      organic goop, that its mucous-dripping oral 
+                                      organ was working feverishly to shape, mold, 
+                                      and coat with enzymes. <br>
+                                      <br>
+                                      [Deej: Can we please please kill that thing?]	
+                                      <br>
+                                      <br>
+                                      I smirked at the text on my HUD, and pulled 
+                                      my HMG off my back. He gripped his shotgun. 
+                                      We both stood up. The Gorge was facing sideways, 
+                                      too occupied to notice us. I glanced at 
+                                      Deej, he nodded, and we both opened fire. 
+                                      <br>
+                                      <br>
+                                      The glass buckled into a mass of pockmarks 
+                                      and fissures, but amazingly, held. Deej 
+                                      cursed and shouldered his shotgun, pulling 
+                                      a trip mine from his belt. I shoved the 
+                                      barrel of my heavy into a pock mark and 
+                                      the tip just poked through. I held the stock 
+                                      up above my head to angle it down into the 
+                                      room, and let loose another half a clip 
+                                      as the Gorge ran for the back airlock to 
+                                      the experiment room. This one was working 
+                                      &#150; it began to cycle open. Deej slapped 
+                                      the trip mine onto the bottom sill of the 
+                                      window so only two of its legs were gripping. 
+                                      &quot;Back off!&quot; he yelled, and we 
+                                      ran back into the lab room. Mines self-detonate 
+                                      if placed &quot;incorrectly&quot;. It beeped 
+                                      a few times in warning. We expected shards 
+                                      to come with the explosion &#150; but there 
+                                      was only the mine's concussion, and then 
+                                      a ripping sound. <br>
+                                      <br>
+                                      We ran back to find the window peeled up 
+                                      from the sill into a strange curved white 
+                                      form, like a frozen curtain. The back door 
+                                      had cycled open, the Gorge must have just 
+                                      gone through. I covered Deej as he slipped 
+                                      through the gap, then pushed my heavy through 
+                                      and followed. The HMG is a bitch to run 
+                                      with &#150; I shouted for Deej to hold up, 
+                                      but he was already through the lock, shoving 
+                                      another shell into his gun as he ran. As 
+                                      I was approaching the corridor beyond, I 
+                                      heard a &quot;schlitch&quot; &#150; the 
+                                      telltale sound of a web constricting &#150; 
+                                      and the rapid wet sound of alien weapons. 
+                                      I came around the corner to find Deej covered 
+                                      in glistening strands, frantically shuffling 
+                                      backwards as three offensive chambers and 
+                                      the Gorge nailed him over and over. From 
+                                      behind I heard the glug-glug of at least 
+                                      one defensive chamber healing everything 
+                                      nearby. I stood in front of Deej and unloaded 
+                                      onto everything in sight. The Gorge dropped 
+                                      behind the chambers, I took a few hits, 
+                                      and Deej and I fell back around the corner. 
+                                      His armor was around as thin as cardboard, 
+                                      and he wasn't doing much better. Meanwhile 
+                                      I heard more movement. Great, reinforcements. 
+                                      We'd never take them with the mini-base 
+                                      they had going. I shoved him back through 
+                                      the airlock and sent a command-request for 
+                                      medkits, while the doors began to close. 
+                                      I took out my frustrations on the resource 
+                                      chamber.&quot; </i></p>
+                                    </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a></p>
+                            </td>
+                            <td><img src="images/images/gorge.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_gorge_primary.html b/main/manual/alien_gorge_primary.html
new file mode 100644
index 00000000..719d0323
--- /dev/null
+++ b/main/manual/alien_gorge_primary.html
@@ -0,0 +1,212 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_gorge.html" class="sectionlink">Gorge</a>: Primary 
+            Attacks </font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_gorge.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: Belligerent and obese, Gorges 
+                                serve as a kind of mobile hive and support unit. 
+                                Their most important role is triggering <a href="alien_newhives.html">new 
+                                hives</a> and creating <a href="alien_chambers.html">chambers</a> 
+                                from lumps of raw matter<br>
+                                they &#133; un-digest. Without them the aliens 
+                                cannot keep pace with <a href="front_commander.html">marine 
+                                research</a> and <a href="front_upgrades.html">upgrades</a>. 
+                                To this end, they receive resources much faster 
+                                than other species, and can tap a larger amount. 
+                                They can also spray <a href="alien_gorge_primary.html">healing</a> 
+                                bacteria from their mouths, restoring chambers 
+                                and other aliens to full effectiveness. Though 
+                                their role is not as aggressive as the other species, 
+                                they consistently find ways to cause mischief 
+                                and support attacks on enemy positions. And with 
+                                their <a href="alien_gorge_inherent.html">spit</a>, 
+                                <a href="alien_gorge_hive.html">web</a> and <a href="alien_gorge_hive.html">babbler</a> 
+                                abilities, underestimating them in combat is a 
+                                dangerous mistake.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_gorge_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <div align="center"><br>
+                          <img src="images/titles/alien_primaryattacks.gif" width="628" height="25"> 
+                          <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                            <tr valign="top"> 
+                              <td colspan="2"> 
+                                <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                  <a href="alien_gorge.html">Gorge</a></p>
+                              </td>
+                            </tr>
+                            <tr valign="top"> 
+                              <td> 
+                                <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                  <tr> 
+                                    <td height="23"> 
+                                      <p><b>One Hive (primary) Abilities</b><br>
+                                        <span class="sectiontext">Healing Spray<br>
+                                        <br>
+                                        </span>The Kharaa equivalent of medical 
+                                        nanites, this appears to be a stream of 
+                                        the same bacteria used when <a href="alien_gorge_inherent.html">building</a>. 
+                                        In fact, this spray can heal <a href="alien_chambers.html">chambers</a>. 
+                                        When directed at a fellow alien, it also 
+                                        rebuilds that alien much like the <a href="alien_evolutions_regeneration.html">regeneration</a> 
+                                        evolution. Gorges often hide around the 
+                                        corner during a conflict, constantly healing 
+                                        fellow Kharaa, allowing them to sustain 
+                                        massive amounts of damage (this makes 
+                                        Gorges primary targets for marines in 
+                                        any sustained firefight). This spray causes 
+                                        some damage to marines, though marine 
+                                        <a href="structures.html">structures</a> 
+                                        are immune. </p>
+                                      </td>
+                                  </tr>
+                                </table>
+                                <br>
+                                <p><br>
+                                  <br>
+                                  <br>
+                                  <br>
+                                  <br>
+                                  <br>
+                                  <a href="alien_skulk_observation.html"><br>
+                                  </a></p>
+                              </td>
+                              <td><img src="images/images/gorge.gif" width="200" height="200"></td>
+                            </tr>
+                          </table>
+                        </div>
+                        </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_gridlock.html b/main/manual/alien_gridlock.html
new file mode 100644
index 00000000..bd065396
--- /dev/null
+++ b/main/manual/alien_gridlock.html
@@ -0,0 +1,194 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <span class="sectiontext"><font color="#FF6600"><a href="alien_bacterium.html" class="sectionlink">The 
+            Bacterium</a></font></span>: Bacterial Gridlock</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_gridlock.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> the bacteria and nanotech attack 
+                                each other, constantly struggling for control 
+                                and interfering with each other's functions.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+<table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p> <img src="images/images/10red_data.gif" width="13" height="10"> 
+                                While no ship or base would expect to be infiltrated 
+                                by a hostile microscopic xenoform, in the age 
+                                of <a href="front_nanotech.html">nanotech</a> 
+                                people are very paranoid about dangerous microscopic 
+                                threats &#150; biological or mechanical dangers designed 
+                                by enemies, or their own technology, run amok. 
+                                The bacteria slips under this screen at first 
+                                because it is utterly unlike any human organic 
+                                compound &#150; but once it reaches high enough concentration 
+                                alarms are triggered and anti-contamination countermeasures 
+                                kick in. The countermeasures attempt to contain 
+                                and sterilize the bacteria, and the bacteria responds 
+                                by trying to corrode and destroy all nanotech.</p>
+                              <p>By the time marines arrive, this battle is well 
+                                underway, with both sides gridlocked, interfering 
+                                with each other. See <a href="front_nanogridlock.html">nano-gridlock</a> 
+                                to learn how this effects marine functions. </p>
+                              <p>The most important consequence of this gridlock 
+                                is it prevents the bacteria from attempting to 
+                                infect or attack humans. It is our belief that 
+                                it views us (humans) as existing for the same 
+                                reason its own <a href="alien_species.html">species</a> 
+                                do &#150; host lifeforms created by a different 
+                                bacterial lifeform to fight for control of an 
+                                area's <a href="alien_resources.html">resources</a>. 
+                                If it can't win the microscopic battle, it starves 
+                                the competitor to death, and outgrows it by destroying 
+                                its hosts - stopping the competition from reproducing 
+                                or controlling resources. This implies a past 
+                                filled with conflict, and explains why it is so 
+                                ready, and able, to deal with humans in an aggressive 
+                                and deadly fashion.</p>
+                              <p>There are more practical effects of the gridlock. 
+                                It also prevents the bacteria from instantly sensing 
+                                and transmitting the location of every marine 
+                                and marine structure onto Kharaa <a href="alien_hivesight.html">hive 
+                                sight</a>. Unless a Kharaa can see you, or you've 
+                                been <a href="alien_skulk_primary.html">parasited</a>, 
+                                they should not know where you are.</p>
+                            </td>
+                              </tr>
+                            </table>
+                          
+                        
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_healing.html b/main/manual/alien_healing.html
new file mode 100644
index 00000000..7e9680a9
--- /dev/null
+++ b/main/manual/alien_healing.html
@@ -0,0 +1,155 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <span class="sectiontext"><font color="#FF6600"><a href="alien_hive.html" class="sectionlink">The 
+            Hive</a></font></span>: Healing</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_healing.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                        <tr>
+                          <td>
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p> <img src="images/images/10red_data.gif" width="13" height="10"> 
+                                Hives pump out a steady stream of healing bacteria 
+                                (see <a href="alien_gorge_primary.html">healing 
+                                spray</a>, <a href="alien_evolutions_regeneration.html">regeneration</a> 
+                                and <a href="alien_chambers_d.html">defensive 
+                                chambers</a> for corollaries). Nearby aliens can 
+                                rapidly heal damage, and return to the fray. There 
+                                is speculation that this process long ago replaced 
+                                the Kharaa's natural need for food. It is not 
+                                surprising they defend their hives so desperately. 
+                              </p>
+                              </td>
+                          </tr>
+                        </table>
+                          
+                        
+                        
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_hive.html b/main/manual/alien_hive.html
new file mode 100644
index 00000000..db6b3cfc
--- /dev/null
+++ b/main/manual/alien_hive.html
@@ -0,0 +1,190 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a>: The Hive</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_hive.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                        <tr>
+                          <td>
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p> <img src="images/images/10red_data.gif" width="13" height="10"> 
+                                <a href="front_nanogridlock.html">Nano-gridlock</a>, 
+                                and the presence of larger lifeforms (humans) 
+                                seem to trigger the next stage of alien growth: 
+                                the Hive. There does not seem to be any malice 
+                                involved &#150; the bacteria just reacts naturally 
+                                and aggressively to any competition. The hive 
+                                contains all the information and abilities necessary 
+                                to set off a cascade of events that rapidly leads 
+                                to full scale conflict.</p>
+                              <p>Hives are large organic structures, that affix 
+                                to the walls and ceiling in locations selected 
+                                by the <a href="alien_bacterium.html">bacterium</a> 
+                                (potential hive locations are usually marked by 
+                                mats of visible bacteria, sometimes completely 
+                                covering every surface and even stretching out 
+                                across nearby rooms and corridors). Once the first 
+                                is active, the Kharaa can grow <a href="alien_newhives.html">new 
+                                hives</a>. After observing images brought back 
+                                from the field, TSA scientists speculate that 
+                                hives are actually creatures that have been evolved 
+                                into this form over an incredibly long time, to 
+                                serve the bacteria's ends. </p>
+                              <p>Though not actually &quot;hives&quot; in the 
+                                technical sense of the word, they do serve vital 
+                                roles to the creatures they spawn, and these creatures 
+                                cannot exist without them. Hives serve four crucial 
+                                functions:</p>
+                            </td>
+                            <td><img src="images/images/hive.gif" width="200" height="218"></td>
+                          </tr>
+                        </table>
+                          
+                        
+                        
+                        
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><img src="images/tech_10/hive.gif" width="15" height="15"> 
+                                <a href="alien_spawning.html">spawning the five 
+                                species of Kharaa (and reinforcing after death)</a><br>
+                                <img src="images/tech_10/hiveabilities.gif" width="15" height="15"> 
+                                <a href="alien_abilities.html">advancing the abilities 
+                                of Kharaa</a><br>
+                                <img src="images/tech_10/heal.gif" width="15" height="15"> 
+                                <a href="alien_healing.html">healing (feeding) 
+                                Kharaa</a><br>
+                                <img src="images/tech_10/hivesightlink.gif" width="15" height="15"> 
+                                <a href="alien_hivesight.html">linking Kharaa 
+                                into the hivesight</a></p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_hivesight.html b/main/manual/alien_hivesight.html
new file mode 100644
index 00000000..0b7ef44e
--- /dev/null
+++ b/main/manual/alien_hivesight.html
@@ -0,0 +1,185 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <span class="sectiontext"><font color="#FF6600"><a href="alien_hive.html" class="sectionlink">The 
+            Hive</a></font></span>: Hive Sight</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_hivesight.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> alien species share information 
+                                with one another &#150; pinpointing the location of 
+                                enemies and each other, and also receiving alerts 
+                                directly from the <a href="alien_bacterium.html">bacterium</a>.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p> <img src="images/images/10red_data.gif" width="13" height="10"> 
+                                It is clear that the Kharaa are linked to one 
+                                another. When a hive is attacked, nearby aliens 
+                                rush to the defense. When one alien engages marines, 
+                                others often choose to assist. And yet, the Kharaa 
+                                do not act as one &#150; they are fiercely individual. 
+                                This, and other evidence, has lead Frontiersmen 
+                                scientists to speculate that instead of a &quot;hive 
+                                mind&quot;, the aliens have &quot;hive sight&quot;. 
+                                <br>
+                                <br>
+                                There is documentary evidence that the aliens 
+                                seem to be responding to visual cues instead of 
+                                some kind of telepathy. For instance, when an 
+                                enemy is on the other side of a wall, they swivel 
+                                their heads as if they can see them. When a hive 
+                                is attacked, they look around wildly until they 
+                                find the direction of the threatened area, then 
+                                run in that direction. Speculation is that the 
+                                aliens have a kind of interface with the <a href="alien_bacterium.html">bacterium</a>, 
+                                that uses their senses to convey information. 
+                                Probably through audible cues, and their own organic 
+                                version of a <a href="alien_hivesight.html">HUD</a> 
+                                (Heads Up Display).<br>
+                                <br>
+                                If all hives are destroyed, hive sight will slowly 
+                                fade away over a period of around twenty hours 
+                                - not quickly enough to impact battles with Frontiersmen, 
+                                which are usually resolved much faster than that. 
+                              </p>
+                              </td>
+                          </tr>
+                        </table>
+                          
+                        
+                        
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_lerk.html b/main/manual/alien_lerk.html
new file mode 100644
index 00000000..0eddd27d
--- /dev/null
+++ b/main/manual/alien_lerk.html
@@ -0,0 +1,241 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a>: 
+            Lerk</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    
+                  <table width="100" border="0" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td><img src="images/titles/alien_lerk.gif" width="628" height="25" hspace="25"></td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top" bgcolor="#330000"> 
+                            <td colspan="2"> 
+                              <p><b>Summary</b>: Wiry fast and fierce, Lerks excel 
+                                at attacking from a distance, but also have a 
+                                vicious bite. They are small and light - making 
+                                them difficult targets, but less resistant to 
+                                damage. If Skulks are hit and run artists, then 
+                                Lerks are guerrilla fighters without peer, using 
+                                their speed, mobility, and range to harass marine 
+                                squads with impunity.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_lerk_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p><img src="images/images/10red_health.gif" width="10" height="10"> 
+                                <span class="sectiontext">Health:</span> <span class="sectiontext"><font color="#FF6600">60</font>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><img src="images/images/10red_armor.gif" width="10" height="10"><span class="sectiontext"> 
+                                Armor:</span> <span class="sectiontext"><font color="#FF6600">50 
+                                pts. armor (30% damage absorbed) </font></span></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext">Abilities: <img src="images/images/10red_o.gif" width="7" height="9"> 
+                                = zero hives <img src="images/images/10red_h.gif" width="7" height="9">=one 
+                                hive <img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9">=two 
+                                hives <img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9">=three 
+                                hives <img src="images/images/10red_s.gif" width="7" height="9">=damage 
+                                vs. structures</p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="409" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td width="10%" height="23"><img src="images/images/10red_o.gif" width="7" height="9"></td>
+                                  <td height="23" colspan="2"> 
+                                    <p><a href="alien_lerk_inherent.html"><font color="#FFFFFF">Flight</font></a></p>
+                                  </td>
+                                  <td width="52%" height="23"> 
+                                    <p>costs energy</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar2.gif" width="100%" height="1" vspace="2"></td>
+                                </tr>
+                                <tr> 
+                                  <td width="10%"><img src="images/images/10red_o.gif" width="7" height="9"></td>
+                                  <td colspan="2"> 
+                                    <p><a href="alien_lerk_inherent.html"><font color="#FFFFFF">Bite</font></a></p>
+                                  </td>
+                                  <td width="52%"> 
+                                    <p>50</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar2.gif" width="100%" height="1" vspace="2"></td>
+                                </tr>
+                                <tr> 
+                                  <td width="10%"><img src="images/images/10red_h.gif" width="7" height="9"></td>
+                                  <td colspan="2"> 
+                                    <p><a href="alien_lerk_primary.html"><font color="#FFFFFF">Spikes</font></a></p>
+                                  </td>
+                                  <td width="52%"> 
+                                    <p>16</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar2.gif" width="100%" height="1" vspace="2"></td>
+                                </tr>
+                                <tr> 
+                                  <td width="10%"><img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9"></td>
+                                  <td colspan="2"> 
+                                    <p><a href="alien_lerk_hive.html"><font color="#FFFFFF">Umbra</font></a></p>
+                                  </td>
+                                  <td width="52%"> 
+                                    <p>defensive cloud</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar2.gif" width="100%" height="1" vspace="2"></td>
+                                </tr>
+                                <tr> 
+                                  <td width="10%"><img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9"></td>
+                                  <td colspan="2"> 
+                                    <p><a href="alien_lerk_hive.html"><font color="#FFFFFF">Spore 
+                                      Cloud</font></a></p>
+                                  </td>
+                                  <td width="52%"> 
+                                    <p>36, radius 250</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar.gif" width="100%" height="1" vspace="3"></td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"> 
+                                    <p><br>
+                                      <b>Observation:</b><br>
+                                      <i><a href="alien_lerk_observation.html">&quot;We're 
+                                      hacking through dead wiring like we're on 
+                                      a freakin' safari &#133;&quot;</a></i> </p>
+                                  </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a><br>
+                              </p>
+                            </td>
+                            <td><img src="images/images/lerk.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+                    
+                </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_lerk_hive.html b/main/manual/alien_lerk_hive.html
new file mode 100644
index 00000000..90952617
--- /dev/null
+++ b/main/manual/alien_lerk_hive.html
@@ -0,0 +1,235 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_lerk.html" class="sectionlink">Lerk</a>: Hive-Learned 
+            Abilities </font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_lerk.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: Wiry fast and fierce, Lerks excel 
+                                at attacking from a distance, but also have a 
+                                vicious bite. They are small and light - making 
+                                them difficult targets, but less resistant to 
+                                damage. If Skulks are hit and run artists, then 
+                                Lerks are guerrilla fighters without peer, using 
+                                their speed, mobility, and range to harass marine 
+                                squads with impunity.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_lerk_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <div align="center"><br>
+                          <img src="images/titles/alien_hivelearned.gif" width="628" height="25"> 
+                        </div>
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_lerk.html">Lerk</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p><b>Two/Three Hive Abilities</b><br>
+                                      <br>
+                                      <b>Two Hives</b>: <span class="sectiontext">Umbra</span><br>
+                                      <br>
+                                      A variation on the sporecloud, this remarkable 
+                                      ability is used for defense, not attack. 
+                                      The umbra is an orange cloud that lasts 
+                                      for ten seconds, and protects all friendly 
+                                      creatures and chambers inside it. The particles 
+                                      in the cloud seem to have disruptive kinetic 
+                                      properties. Incoming bullets and shrapnel 
+                                      are robbed of momentum, and are likely to 
+                                      bounce harmlessly off their target. A small 
+                                      percentage of projectiles in any given attack 
+                                      will slip through unaffected. <a href="weapons_knife.html">Knives</a> 
+                                      and <a href="weapons_grenadelauncher.html">grenades</a> 
+                                      are also not affected: the mass of the marine 
+                                      is behind a knife slash, and a grenade's 
+                                      blast particles are so small and fast they 
+                                      slip through. However, <a href="weapons_lmg.html">LMG</a>'s, 
+                                      <a href="weapons_shotgun.html">shotguns</a>, 
+                                      <a href="weapons_hmg.html">HMG</a>'s and 
+                                      <a href="weapons_pistol.html">pistols</a> 
+                                      all do a fraction of their normal damage. 
+                                      Alien weapons, puzzlingly enough, can pass 
+                                      out of the cloud normally. Besides personal 
+                                      defense, Lerks often use umbra to protect 
+                                      <a href="alien_chambers.html">chambers</a>, 
+                                      <a href="alien_hive.html">hives</a> and 
+                                      other aliens during coordinated actions.</p>
+                                    <p>We would very much like to learn the composition 
+                                      of this cloud &#150; various experiments 
+                                      have been proposed by TSA scientific personnel, 
+                                      all quickly rejected by field commanders.<br>
+                                    </p>
+                                    <p><b>Three Hives</b>: <span class="sectiontext">Sporecloud</span><br>
+                                      <br>
+                                      This insidious attack appears to come from 
+                                      nowhere, filling a volume of around 12 cubit 
+                                      feet with a corrosive cloud of spores. These 
+                                      spores appear to rot any foreign organic 
+                                      matter &#150; thankfully, marine structures 
+                                      and turrets are unaffected. </p>
+                                    <p>Our best theory is that the Lerk fills 
+                                      its lung guns and fires a burst of transparent, 
+                                      utterly silent, bullet-shaped bubbles that 
+                                      impact the target area and react violently 
+                                      with the air. Lerks can fill a large area 
+                                      with these attacks, often while remaining 
+                                      hidden on some shadowed perch, or dodging 
+                                      wildly through the air. None but the heaviest 
+                                      armored marines can afford to stand within 
+                                      a sporecloud for more than a few seconds.</p>
+                            </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a></p>
+                            </td>
+                            <td><img src="images/images/lerk.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_lerk_inherent.html b/main/manual/alien_lerk_inherent.html
new file mode 100644
index 00000000..cd00bc5f
--- /dev/null
+++ b/main/manual/alien_lerk_inherent.html
@@ -0,0 +1,200 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_lerk.html" class="sectionlink">Lerk</a>: Inherent 
+            Abilities </font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_lerk.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: Wiry fast and fierce, Lerks excel 
+                                at attacking from a distance, but also have a 
+                                vicious bite. They are small and light - making 
+                                them difficult targets, but less resistant to 
+                                damage. If Skulks are hit and run artists, then 
+                                Lerks are guerrilla fighters without peer, using 
+                                their speed, mobility, and range to harass marine 
+                                squads with impunity.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_lerk_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <div align="center"><br>
+                          <img src="images/titles/alien_inherentabilities.gif" width="628" height="25"> 
+                        </div>
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_lerk.html">Lerk</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p><b>Zero Hive (inherent) Abilities</b><br>
+                                      <span class="sectiontext">Flight</span>, 
+                                      <span class="sectiontext">Bite </span> </p>
+                                    <p><b>Flight</b>: Wings have evolved around 
+                                      forty different times on Earth, so it would 
+                                      be surprising if the Kharaa had not evolved 
+                                      them as well. The Lerk can lift and propel 
+                                      itself suddenly and rapidly, but seems to 
+                                      tire quickly so often glides instead, or 
+                                      saves flight for combat situations. </p>
+                                    <p><b>Bite</b>: Where Skulks uses their jaw 
+                                      muscles, the Lerk relies on its powerful 
+                                      neck to thrust its razor teeth into its 
+                                      target. This was probably evolved to consume 
+                                      food in a vulture-like fashion, and to deliver 
+                                      death blows when falling on prey from above. 
+                                      It punctures TSA nano-plate with disturbing 
+                                      ease.</p>
+                              </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a></p>
+                            </td>
+                            <td><img src="images/images/lerk.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_lerk_name.html b/main/manual/alien_lerk_name.html
new file mode 100644
index 00000000..32f53c44
--- /dev/null
+++ b/main/manual/alien_lerk_name.html
@@ -0,0 +1,196 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="58"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a><a href="alien.html" class="sectionlink"></a> 
+            :: <a href="alien_lerk.html" class="sectionlink">Lerk</a>: Name</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_lerk.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: Wiry fast and fierce, Lerks excel 
+                                at attacking from a distance, but also have a 
+                                vicious bite. They are small and light - making 
+                                them difficult targets, but less resistant to 
+                                damage. If Skulks are hit and run artists, then 
+                                Lerks are guerrilla fighters without peer, using 
+                                their speed, mobility, and range to harass marine 
+                                squads with impunity.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_lerk_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td>
+<div align="center"><br>
+                          <img src="images/titles/alien_name.gif" width="628" height="25"> 
+                        </div>
+                        <div align="center"></div>
+                        <div align="center"></div>
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_lerk.html">Lerk</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p>Lerks' relatively low health means that 
+                                      they avoid making a target of themselves, 
+                                      often hiding in a niche somewhere and attacking 
+                                      marine bases with their <a href="alien_lerk_primary.html">spikes</a> 
+                                      or <a href="alien_lerk_hive.html">sporeclouds</a>. 
+                                      They often wait, lurking on some shadowed 
+                                      perch, until a target presents itself. The 
+                                      strange spelling of their name can be attributed 
+                                      to the unique and colorful vocabulary of 
+                                      one Commander Ty Sumnish, who brought back 
+                                      from the field a treasure trove of data 
+                                      on the Lerk very early on in the Kharaa/human 
+                                      conflict. </p>
+                                    </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a></p>
+                            </td>
+                            <td><img src="images/images/lerk.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_lerk_observation.html b/main/manual/alien_lerk_observation.html
new file mode 100644
index 00000000..9d65b377
--- /dev/null
+++ b/main/manual/alien_lerk_observation.html
@@ -0,0 +1,220 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_lerk.html" class="sectionlink">Lerk</a>: Observation</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_lerk.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: Wiry fast and fierce, Lerks excel 
+                                at attacking from a distance, but also have a 
+                                vicious bite. They are small and light - making 
+                                them difficult targets, but less resistant to 
+                                damage. If Skulks are hit and run artists, then 
+                                Lerks are guerrilla fighters without peer, using 
+                                their speed, mobility, and range to harass marine 
+                                squads with impunity.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_lerk_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <div align="center"><br>
+                          <img src="images/titles/alien_observation.gif" width="628" height="25"> 
+                        </div>
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_lerk.html">Lerk</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p><i>&quot;We're hacking through dead wiring 
+                                      like we're on a freakin' safari, trying 
+                                      to get at a node that's supposedly on the 
+                                      other side. After half an hour taking turns 
+                                      with our knives we break through into the 
+                                      Archive, crystal memory stacks big as redwoods, 
+                                      silent and dark, waiting for the Mercantile 
+                                      League to return and continue filling them 
+                                      with delinquent loans, pending legal suits, 
+                                      and every pack of peanuts they've shipped 
+                                      across all creation. <br>
+                                      <br>
+                                      We're standing there, wondering if we shouldn't 
+                                      accidentally discharge a few clips, when 
+                                      a spore cloud fills up the tunnel behind 
+                                      us, and spikes start hailing from the shadowy 
+                                      catwalks high above. We try to find cover, 
+                                      but there isn't any &#150; we consider climbing 
+                                      the ladders up, but being stuck on a ladder 
+                                      with a Lerk around is suicide. Instead we 
+                                      start unloading our lmg's into the air, 
+                                      hitting metal and memory stack more than 
+                                      anything, flakes of falling crystal glittering 
+                                      in the flash of our muzzles. The spikes 
+                                      become more sporadic. Deej takes out his 
+                                      welder and starts cutting into a maintenance 
+                                      crawlspace; a sporecloud bursts around him 
+                                      and he leaps back, cursing. Another cloud 
+                                      sends Nem and Lestah diving from the far 
+                                      wall. So I say 'f-this', and switch my pistol 
+                                      for my grenade launcher. Someone says, 'what 
+                                      are you-' then poom poom poom, I launch 
+                                      three way up into the darkness. My squadmates 
+                                      stare at me like I'm insane. 'What,' I say, 
+                                      'you want to die slowly?' One grenade clatters 
+                                      onto a catwalk, the other two just hang 
+                                      in the air, and then the whole place comes 
+                                      down around our ears.&quot;</i></p>
+                                    </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a></p>
+                            </td>
+                            <td><img src="images/images/lerk.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_lerk_primary.html b/main/manual/alien_lerk_primary.html
new file mode 100644
index 00000000..5917a86b
--- /dev/null
+++ b/main/manual/alien_lerk_primary.html
@@ -0,0 +1,201 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_lerk.html" class="sectionlink">Lerk</a>: Primary 
+            Attacks </font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_lerk.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: Wiry fast and fierce, Lerks excel 
+                                at attacking from a distance, but also have a 
+                                vicious bite. They are small and light - making 
+                                them difficult targets, but less resistant to 
+                                damage. If Skulks are hit and run artists, then 
+                                Lerks are guerrilla fighters without peer, using 
+                                their speed, mobility, and range to harass marine 
+                                squads with impunity.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_lerk_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <div align="center"><br>
+                          <img src="images/titles/alien_primaryattacks.gif" width="628" height="25"> 
+                        </div>
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_lerk.html">Lerk</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p><b>One Hive (primary) Abilities</b><br>
+                                      <span class="sectiontext">Spikes</span></p>
+                                    <p>The spike attack is easily the equivalent 
+                                      of a conventional firearm. It allows the 
+                                      Lerk to attack from a distance, and is quiet 
+                                      and fast enough that it can take a moment 
+                                      to pin down where the attack is coming from. 
+                                      From our data, exo-biologists believe the 
+                                      Lerk has evolved separate lung tubes with 
+                                      thousands of tiny air sacs at their ends. 
+                                      Lengths of expendable, rapidly regenerating 
+                                      cartilage growing backwards off its jaw 
+                                      are parsed into pointed spikes around the 
+                                      size of a fist by two sets of reversed teeth. 
+                                      These spikes drop into the lung tubes, which 
+                                      seal and then expel them. By alternating 
+                                      tubes, the Lerk can launch these spikes 
+                                      at machine gun speed.</p>
+                            </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a></p>
+                            </td>
+                            <td><img src="images/images/lerk.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_newhives.html b/main/manual/alien_newhives.html
new file mode 100644
index 00000000..a3e6987c
--- /dev/null
+++ b/main/manual/alien_newhives.html
@@ -0,0 +1,160 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <span class="sectiontext"><font color="#FF6600"><a href="alien_hive.html" class="sectionlink">The 
+            Hive</a></font></span>: New Hives</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_newhives.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                        <tr>
+                          <td>
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p> <img src="images/images/10red_data.gif" width="13" height="10"> 
+                                Once the first hive is online, it and the bacteria 
+                                seem to become a silent partners, drawing and 
+                                distributing resources, linking the aliens together, 
+                                but otherwise leaving all decisions up to the 
+                                individual creatures as to how and when to attack 
+                                the enemy. Creating new hives is one of these 
+                                decisions.</p>
+                              <p>Any creature can gestate into the builder class, 
+                                the Gorge, and if enough resources are available, 
+                                trigger the growth of a new hive. See the <a href="alien_gorge_inherent.html">Gorge 
+                                description</a> for more information on this ability. 
+                                The Frontiersmen seem to be seen as a large enough 
+                                threat that new hives are built as fast as possible. 
+                                When three hives are activated, the full might 
+                                and power of the Kharaa is revealed.</p>
+                            </td>
+                          </tr>
+                        </table>
+                          
+                        
+                        
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_onos.html b/main/manual/alien_onos.html
new file mode 100644
index 00000000..d57ea891
--- /dev/null
+++ b/main/manual/alien_onos.html
@@ -0,0 +1,227 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a>: 
+            Onos</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    
+                  <table width="100" border="0" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td><img src="images/titles/alien_onos.gif" width="628" height="25" hspace="25"></td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top" bgcolor="#330000"> 
+                            <td colspan="2"> 
+                              <p><b>Summary</b>: The dreadnaughts of the Kharaa, 
+                                the Onos are tanks &#150; highly armored and very 
+                                powerful. They are so large they cannot use crawlspaces 
+                                and many of the narrow passages found on human 
+                                ships and bases. This does not limit their effectiveness 
+                                very much &#150; the Onos is the highest level 
+                                response to any threat, requiring large amounts 
+                                of resources to gestate, but paying off with truly 
+                                awe-inspiring strength.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_onos_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p><img src="images/images/10red_health.gif" width="10" height="10"> 
+                                <span class="sectiontext">Health:</span> <span class="sectiontext"><font color="#FF6600">500</font>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><img src="images/images/10red_armor.gif" width="10" height="10"><span class="sectiontext"> 
+                                Armor:</span> <span class="sectiontext"><font color="#FF6600">150 
+                                pts. armor (30% damage absorbed) </font></span></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext">Abilities: <img src="images/images/10red_o.gif" width="7" height="9"> 
+                                = zero hives <img src="images/images/10red_h.gif" width="7" height="9">=one 
+                                hive <img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9">=two 
+                                hives <img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9">=three 
+                                hives <img src="images/images/10red_s.gif" width="7" height="9">=damage 
+                                vs. structures</p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td width="10%" height="23"><img src="images/images/10red_o.gif" width="7" height="9"></td>
+                                  <td height="23" colspan="2"> 
+                                    <p><a href="alien_onos_inherent.html"><font color="#FFFFFF">Gore</font></a></p>
+                                  </td>
+                                  <td width="52%" height="23"> 
+                                    <p>120</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar2.gif" width="100%" height="1" vspace="2"></td>
+                                </tr>
+                                <tr> 
+                                  <td width="10%"><img src="images/images/10red_h.gif" width="7" height="9"></td>
+                                  <td colspan="2"> 
+                                    <p><a href="alien_onos_primary.html"><font color="#FFFFFF">Paralyze</font></a></p>
+                                  </td>
+                                  <td width="52%"> 
+                                    <p>Immobilizes for 6 seconds</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar2.gif" width="100%" height="1" vspace="2"></td>
+                                </tr>
+                                <tr> 
+                                  <td width="10%"><img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9"></td>
+                                  <td colspan="2"> 
+                                    <p><a href="alien_onos_hive.html"><font color="#FFFFFF">Charge</font></a></p>
+                                  </td>
+                                  <td width="52%"> 
+                                    <p>number of &quot;touches&quot; x 10</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar2.gif" width="100%" height="1" vspace="2"></td>
+                                </tr>
+                                <tr> 
+                                  <td width="10%"><img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9"></td>
+                                  <td colspan="2"> 
+                                    <p><a href="alien_onos_hive.html"><font color="#FFFFFF">Primal Scream</font></a></p>
+                                  </td>
+                                  <td width="52%"> 
+                                    <p>adrenaline rush (area effect)</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar.gif" width="100%" height="1" vspace="3"></td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"> 
+                                    <p><br>
+                                      <b>Observation</b>:<br>
+                                      <a href="alien_onos_observation.html"><i>&quot;The 
+                                      grillwork - 'round 20' by 20' of 6&quot; 
+                                      metal bars - blew off &#133;&quot;</i></a></p>
+                                  </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                              </p>
+                            </td>
+                            <td><img src="images/images/onos.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+                    
+                </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_onos_hive.html b/main/manual/alien_onos_hive.html
new file mode 100644
index 00000000..e08f9f63
--- /dev/null
+++ b/main/manual/alien_onos_hive.html
@@ -0,0 +1,206 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_onos.html" class="sectionlink">Onos</a>: Hive-Learned 
+            Abilities </font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_onos.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: The dreadnaughts of the Kharaa, 
+                                the Onos are tanks &#150; highly armored and very 
+                                powerful. They are so large they cannot use crawlspaces 
+                                and many of the narrow passages found on human 
+                                ships and bases. This does not limit their effectiveness 
+                                very much &#150; the Onos is the highest level 
+                                response to any threat, requiring large amounts 
+                                of resources to gestate, but paying off with truly 
+                                awe-inspiring strength.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_onos_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                        <br>
+                        <img src="images/titles/alien_hivelearned.gif" width="628" height="25" hspace="25"> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_onos.html">Onos</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p><b>Two/Three Hive Abilities</b><br>
+                                      <br>
+                                      <b>Two Hives</b>: <span class="sectiontext">Charge</span><br>
+                                      <br>
+                                      It's not difficult, from their appearance, 
+                                      to imagine the Onos would have bull-like 
+                                      charging behavior. Once again the Kharaa 
+                                      exceeds the imagination &#150; the Onos 
+                                      accelerates its bulk shockingly fast, slamming 
+                                      through anything in its path. The effect 
+                                      is devastating &#150; a human doesn't even 
+                                      slow it down, and it hits metal or machinery 
+                                      like a detonation. It cannot maintain this 
+                                      speed for long, and seems to only be able 
+                                      to charge in a straight line. </p>
+                                    <p><b>Three Hives</b>: <span class="sectiontext">Primal 
+                                      Scream</span><br>
+                                      <br>
+                                      As the pinnacles of Kharaa strength and 
+                                      power, the Onos must have always been rallying 
+                                      points in battle. The so called &quot;primal 
+                                      scream&quot; is a bellowing roar that triggers 
+                                      a battle fervor in any nearby alien &#150; 
+                                      and in the Onos itself. Adrenaline courses 
+                                      through their bodies &#150; similar to the 
+                                      <a href="alien_evolutions_adrenaline.html">evolution</a>, 
+                                      but affecting the entire alien's physiology 
+                                      in a much more extreme fashion. They are 
+                                      faster, deadlier, and can ignore more damage.</p>
+                            </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a></p>
+                            </td>
+                            <td><img src="images/images/onos.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_onos_inherent.html b/main/manual/alien_onos_inherent.html
new file mode 100644
index 00000000..1b2e9140
--- /dev/null
+++ b/main/manual/alien_onos_inherent.html
@@ -0,0 +1,190 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_onos.html" class="sectionlink">Onos</a>: Inherent 
+            Abilities </font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    
+                  <table width="100" border="0" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td><img src="images/titles/alien_onos.gif" width="628" height="25" hspace="25"></td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: The dreadnaughts of the Kharaa, 
+                                the Onos are tanks &#150; highly armored and very 
+                                powerful. They are so large they cannot use crawlspaces 
+                                and many of the narrow passages found on human 
+                                ships and bases. This does not limit their effectiveness 
+                                very much &#150; the Onos is the highest level 
+                                response to any threat, requiring large amounts 
+                                of resources to gestate, but paying off with truly 
+                                awe-inspiring strength.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_onos_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                        <br>
+                        <img src="images/titles/alien_inherentabilities.gif" width="628" height="25" hspace="25"> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_onos.html">Onos</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p><b>Zero Hives (inherent) Abilities</b><br>
+                                      <span class="sectiontext">Strength</span>, 
+                                      <span class="sectiontext">Gore</span></p>
+                                    <p><b>Strength</b>: Like the <a href="alien_fade.html">Fade</a>, 
+                                      the Onos' natural strength and armor are 
+                                      the core of its deadliness. It is the most 
+                                      powerful species of the Kharaa. It can soak 
+                                      up incredible amounts of damage, and single-handedly 
+                                      destroy all but the best outfitted bases 
+                                      or squads. </p>
+                                    <p><b>Gore</b>: The Onos' primary melee attack. 
+                                      Its long tusks, backed by its considerable 
+                                      bulk, tear through metal, flesh, and armor 
+                                      with ease.</p>
+                                  </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a></p>
+                            </td>
+                            <td><img src="images/images/onos.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_onos_name.html b/main/manual/alien_onos_name.html
new file mode 100644
index 00000000..6e6f67a2
--- /dev/null
+++ b/main/manual/alien_onos_name.html
@@ -0,0 +1,208 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="58"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a><a href="alien.html" class="sectionlink"></a> 
+            :: <a href="alien_onos.html" class="sectionlink">Onos</a>: Name</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_onos.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: The dreadnaughts of the Kharaa, 
+                                the Onos are tanks &#150; highly armored and very 
+                                powerful. They are so large they cannot use crawlspaces 
+                                and many of the narrow passages found on human 
+                                ships and bases. This does not limit their effectiveness 
+                                very much &#150; the Onos is the highest level 
+                                response to any threat, requiring large amounts 
+                                of resources to gestate, but paying off with truly 
+                                awe-inspiring strength.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_onos_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td>
+<div align="center"><br>
+                          <img src="images/titles/alien_name.gif" width="628" height="25"> 
+                        </div>
+                        <div align="center"></div>
+                        <div align="center"></div>
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_onos.html">Onos</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p>Though it can seem like a joke (and one 
+                                      in poor taste, considering the devastation 
+                                      this species has caused), the name &quot;Onos&quot; 
+                                      does actually come from the phrase &quot;Oh 
+                                      no.&quot; Early on in the conflict with 
+                                      the Kharaa, a Frontiersmen squad was fighting 
+                                      to regain control of a solar array in the 
+                                      Eleme system. Sporadic audio contact had 
+                                      been maintained with the squad by an experimental 
+                                      broadcasting spike, driven through the station's 
+                                      hull. In the besieged marine base, heavy 
+                                      turret placement and reinforcements had 
+                                      allowed them to hold off wave after wave 
+                                      of attack. Time stamp 65.05.43: Through 
+                                      the sound of gunfire and grenades, the screech 
+                                      of leaping Skulks and swoosh of acid rockets, 
+                                      a faint roar is heard. The alien weapons 
+                                      fall conspicuously silent. The turrets stop. 
+                                      The roar is heard again, much closer, much 
+                                      louder. Then four marine's, almost in unison 
+                                      &#133; &quot;Oh no&quot;. All hell breaks 
+                                      loose, contact is lost. These &quot;Oh no's&quot; 
+                                      mark the first contact with this species. 
+                                    </p>
+                                    </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a></p>
+                            </td>
+                            <td><img src="images/images/onos.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_onos_observation.html b/main/manual/alien_onos_observation.html
new file mode 100644
index 00000000..b3899e5a
--- /dev/null
+++ b/main/manual/alien_onos_observation.html
@@ -0,0 +1,242 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_onos.html" class="sectionlink">Onos</a>: Observation</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_onos.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: The dreadnaughts of the Kharaa, 
+                                the Onos are tanks &#150; highly armored and very 
+                                powerful. They are so large they cannot use crawlspaces 
+                                and many of the narrow passages found on human 
+                                ships and bases. This does not limit their effectiveness 
+                                very much &#150; the Onos is the highest level 
+                                response to any threat, requiring large amounts 
+                                of resources to gestate, but paying off with truly 
+                                awe-inspiring strength.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_onos_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                        <br>
+                        <img src="images/titles/alien_observation.gif" width="628" height="25" hspace="25"> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_onos.html">Onos</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p><i>&quot;The grillwork &#150; 'round 20' 
+                                      by 20' of 6&quot; metal bars &#150; blew 
+                                      off its welds and slid, still upright, digging 
+                                      grooves into the silo's floor with an ungodly 
+                                      squeal and hail of sparks. It tripped on 
+                                      our arms factory and fell diagonally against 
+                                      the curved wall opposite, forming a kind 
+                                      of lean-to over our base. I had hit my jet 
+                                      pack at the first noise, and was hovering 
+                                      thirty feet above the scene. I angled onto 
+                                      a catwalk. Sollis and Deej had dived to 
+                                      the floor (no small feat in heavy armor), 
+                                      narrowly avoiding the metal. They now stood 
+                                      up, firing their HMG's down the hallway. 
+                                      The Onos ran straight at them, bullets pocking 
+                                      into its head plate, falling flattened to 
+                                      the floor. I unloaded a clip from my LMG 
+                                      into its back. They couldn't dodge in that 
+                                      armor &#150; the Onos suddenly doubled its 
+                                      speed, and they went sprawling, Deej taking 
+                                      the blow to his shoulders, smashing onto 
+                                      his back and going down under its hooves, 
+                                      Sollis getting a tusk to the midriff, throwing 
+                                      him in an amazing cartwheel that terminated 
+                                      halfway up the grillwork in a jumble of 
+                                      bent armor and broken limbs. I reloaded 
+                                      and emptied another clip into its back. 
+                                      Sollis slid, inert, down the grillwork to 
+                                      the Ono's feet. Deej's armor was literally 
+                                      flat in places, inches thick, like he was 
+                                      made out of clay. The Onos walked over to 
+                                      our infantry portal and rent it in two with 
+                                      its tusks. I reloaded and emptied another 
+                                      clip into its back. It walked over to our 
+                                      armory and butted it with its head, bending 
+                                      its top, screens shattering and smoke trailing 
+                                      up. I reloaded and emptied another clip 
+                                      into its back. The Onos walked around to 
+                                      the left of the grillwork and seemed to 
+                                      consider it. It crouched down, crawling 
+                                      awkwardly under the diagonal opening, then 
+                                      suddenly stood, sending the grate toppling 
+                                      back against the other wall. It looked down 
+                                      on our command console. Our commander, Roswell, 
+                                      came in over the comm line: &quot;Andre 
+                                      &#150; I dropped another CC in the Steam 
+                                      Ramp. Maybe they won't notice it. Get there 
+                                      and get a portal up, stat.&quot; </i></p>
+                                    <p><i>The waypoint came up on my HUD. Steam 
+                                      Ramp. 60 meters away. The Onos started to 
+                                      slam against the CC. I counted to three 
+                                      and slipped from the catwalk, bursting my 
+                                      jets just feet above the silo floor to break 
+                                      my fall. I leaped again, skimming through 
+                                      the bent teeth sticking from the archway 
+                                      where the grill had been. I heard a moment 
+                                      of gunfire as Roswell was ejected from the 
+                                      CC just before it was destroyed. Then I 
+                                      was off into the red glow of the tunnels, 
+                                      with two clips of ammo and a horde of beasts 
+                                      between me and one small chance at turning 
+                                      this around.&quot;</i></p>
+                            </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a></p>
+                            </td>
+                            <td><img src="images/images/onos.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_onos_primary.html b/main/manual/alien_onos_primary.html
new file mode 100644
index 00000000..af6c681e
--- /dev/null
+++ b/main/manual/alien_onos_primary.html
@@ -0,0 +1,207 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a> 
+            :: <a href="alien_onos.html" class="sectionlink">Onos</a>: Primary 
+            Attacks </font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_onos.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: The dreadnaughts of the Kharaa, 
+                                the Onos are tanks &#150; highly armored and very 
+                                powerful. They are so large they cannot use crawlspaces 
+                                and many of the narrow passages found on human 
+                                ships and bases. This does not limit their effectiveness 
+                                very much &#150; the Onos is the highest level 
+                                response to any threat, requiring large amounts 
+                                of resources to gestate, but paying off with truly 
+                                awe-inspiring strength.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_onos_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                        <br>
+                        <img src="images/titles/alien_primaryattacks.gif" width="628" height="25" hspace="25"> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_onos.html">Onos</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p><b>One Hive (primary) Abilities</b><br>
+                                      <span class="sectiontext">Paralyze<br>
+                                      </span><br>
+                                      The Onos' chief disadvantage is its ponderousness. 
+                                      Even with <a href="alien_evolutions_celerity.html">celerity</a>, 
+                                      it has a difficult time chasing down nimble 
+                                      prey. The paralyze ability compensates for 
+                                      this, allowing it to freeze its prey in 
+                                      their tracks. The long tentacles tucked 
+                                      back along its head spring to life, waving 
+                                      about. They can whip barbs with sufficient 
+                                      force to pierce armor, releasing a toxin 
+                                      that looks for concentrations of muscle 
+                                      and clumps around them in a scabrous mess, 
+                                      effectively paralyzing the victim. Human 
+                                      musculature is similar enough to trigger 
+                                      this effect. The toxin targets the largest 
+                                      muscle groups first &#150; the victim usually 
+                                      has enough fine motor control to pivot, 
+                                      and pull the trigger on their weapon. But 
+                                      they are stuck in place. Frontiersmen nano-screen 
+                                      and bio-conditioning go to work immediately, 
+                                      and can remove the blockage in 6 seconds. 
+                                      If the marine is under direct attack by 
+                                      this species, it is unlikely they will survive 
+                                      that long.</p>
+                                  </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a></p>
+                            </td>
+                            <td><img src="images/images/onos.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_resources.html b/main/manual/alien_resources.html
new file mode 100644
index 00000000..2dda06b0
--- /dev/null
+++ b/main/manual/alien_resources.html
@@ -0,0 +1,174 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a>: Resources</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_resources.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                        <tr>
+                          <td>
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p> <img src="images/images/10red_data.gif" width="13" height="10"> 
+                                The bacterium seems capable of tapping a wide 
+                                variety of energy sources. Heat and water are 
+                                diverse enough, but it also finds the rich sludge 
+                                used for nano-construction highly desirable. Fortunately 
+                                the same safe guards that prevent marines from 
+                                automatically accessing these stores thwart the 
+                                Kharaa too. Unfortunately, the aliens seem quite 
+                                prepared for this sort of obstacle. <a href="alien_gorge.html">Gorges</a> 
+                                can build <a href="alien_chambers_r.html">resource 
+                                chambers</a> atop resource nodes, that draw the 
+                                sludge up and digest it. These chambers appear 
+                                to have once been a species, much like the hive. 
+                                What these resource chambers could have been used 
+                                for before the Kharaa encountered us is a perplexing 
+                                mystery. But they convert the sludge into a usable 
+                                form, just as our resource towers do. </p>
+                              <p>As a result, marines and Kharaa end up fighting 
+                                for the same resources. Defending these resources 
+                                is vital to the Kharaa, second only to protecting 
+                                their <a href="alien_hive.html">hives</a>.<br>
+                              </p>
+                            </td>
+                          </tr>
+                        </table>
+                          
+                        
+                        
+                        
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b><img src="images/tech_10/resource.gif" width="15" height="15"> 
+                                <a href="alien_resourceuse.html">Resource Use</a></b></p>
+                            </td>
+                          </tr>
+                        </table>
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_resourceuse.html b/main/manual/alien_resourceuse.html
new file mode 100644
index 00000000..d116139e
--- /dev/null
+++ b/main/manual/alien_resourceuse.html
@@ -0,0 +1,156 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_resources.html" class="sectionlink">Resources</a>: 
+            Resource Use</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_resourceuse.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                        <tr>
+                          
+                      <td>
+<table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p> <img src="images/images/10red_data.gif" width="13" height="10"> 
+                                Aliens, unlike marines, divide resources between 
+                                themselves, and use them for their own ends. There 
+                                is no oversight, or selective rationing among 
+                                individuals. The only exception to this are <a href="alien_gorge.html">Gorges</a>. 
+                                In their role creating <a href="alien_chambers.html">chambers</a> 
+                                and <a href="alien_newhives.html">new hives</a>, 
+                                Gorges spend large amounts of resources, far in 
+                                excess of other species, and so seem to draw resources 
+                                faster, and have access to more. Otherwise, resources 
+                                not used by the aliens remain in reserve &#150; stored 
+                                mainly in hives, with the surplus spread throughout 
+                                the bacterium &#150; refilling each alien's supply. 
+                              </p>
+                              </td>
+                          </tr>
+                        </table>
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_skulk.html b/main/manual/alien_skulk.html
new file mode 100644
index 00000000..44944ed7
--- /dev/null
+++ b/main/manual/alien_skulk.html
@@ -0,0 +1,245 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a>: 
+            Skulk</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    
+                  <table width="100" border="0" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td><img src="images/titles/alien_skulk.gif" width="628" height="25" hspace="25"></td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top" bgcolor="#330000"> 
+                            <td colspan="2"> 
+                              <p><b>Summary</b>: The most common species encountered. 
+                                They are capable of blurring speed and leaps of 
+                                near limitless height. The Skulk is a light, wiry 
+                                creature around the size of a very large dog. 
+                                Lacking any projectile attacks, it specializes 
+                                in melee. It moves on all fours &#150; each leg 
+                                terminates in a long, sharp, bladed bone. It can 
+                                attack with these, and its powerful jaws. If it 
+                                cannot be stopped before reaching its target, 
+                                its target is in serious trouble.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_skulk_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p><img src="images/images/10red_health.gif" width="10" height="10"> 
+                                <span class="sectiontext">Health:</span> <span class="sectiontext"><font color="#FF6600">70</font>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><img src="images/images/10red_armor.gif" width="10" height="10"><span class="sectiontext"> 
+                                Armor:</span> <span class="sectiontext"><font color="#FF6600">10 
+                                pts. armor (30% damage absorbed) </font></span></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext">Abilities: <img src="images/images/10red_o.gif" width="7" height="9"> 
+                                = zero hives <img src="images/images/10red_h.gif" width="7" height="9">=one 
+                                hive <img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9">=two 
+                                hives <img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9">=three 
+                                hives <img src="images/images/10red_s.gif" width="7" height="9">=damage 
+                                vs. structures</p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td width="10%" height="23"><img src="images/images/10red_o.gif" width="7" height="9"></td>
+                                  <td height="23" colspan="2" class="sectionlink"> 
+                                    <p><b> <a href="alien_skulk_inherent.html"><font color="#FFFFFF">Wall 
+                                      Running</font></a></b></p>
+                                  </td>
+                                  <td width="58%" height="23"> 
+                                    <p>can move on any surface</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar2.gif" width="100%" height="1" vspace="2"></td>
+                                </tr>
+                                <tr> 
+                                  <td width="10%"><img src="images/images/10red_o.gif" width="7" height="9"></td>
+                                  <td colspan="2" class="sectionlink"> 
+                                    <p><b><a href="alien_skulk_inherent.html"><font color="#FFFFFF">Bite</font></a></b></p>
+                                  </td>
+                                  <td width="58%"> 
+                                    <p>75 damage</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar2.gif" width="100%" height="1" vspace="2"></td>
+                                </tr>
+                                <tr> 
+                                  <td width="10%"><img src="images/images/10red_h.gif" width="7" height="9"></td>
+                                  <td colspan="2" class="sectionlink"> 
+                                    <p><b> <a href="alien_skulk_primary.html"><font color="#FFFFFF">Parasite</font></a></b></p>
+                                  </td>
+                                  <td width="58%"> 
+                                    <p>&quot;stains&quot; target</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar2.gif" width="100%" height="1" vspace="2"></td>
+                                </tr>
+                                <tr> 
+                                  <td width="10%"><img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9"></td>
+                                  <td colspan="2" class="sectionlink"> 
+                                    <p><b><a href="alien_skulk_hive.html"><font color="#FFFFFF">Leap</font></a></b></p>
+                                  </td>
+                                  <td width="58%"> 
+                                    <p># of &quot;touches&quot; on target x 4</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar2.gif" width="100%" height="1" vspace="2"></td>
+                                </tr>
+                                <tr> 
+                                  <td width="10%"><img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9"><img src="images/images/10red_h.gif" width="7" height="9"></td>
+                                  <td colspan="2" class="sectionlink"> 
+                                    <p><b> <a href="alien_skulk_hive.html"><font color="#FFFFFF">Xenocide 
+                                      </font></a></b></p>
+                                  </td>
+                                  <td width="58%"> 
+                                    <p>400/800<span class="sectiontext">(<img src="images/images/10red_s.gif" width="7" height="9">)</span>, 
+                                      reduces outwards</p>
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"><img src="images/images/10red_bar.gif" width="100%" height="1" vspace="3"></td>
+                                </tr>
+                                <tr> 
+                                  <td colspan="4"> 
+                                    <p><br>
+                                      <b>Observation</b>:<br>
+                                      <a href="alien_skulk_observation.html"><i>&quot;I 
+                                      don't know if I blinked, or there's some 
+                                      vent we missed&#133;&quot; </i></a></p>
+                                  </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a><br>
+                              </p>
+                            </td>
+                            <td><img src="images/images/skulk.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+                    
+                </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_skulk_hive.html b/main/manual/alien_skulk_hive.html
new file mode 100644
index 00000000..aa80c9cd
--- /dev/null
+++ b/main/manual/alien_skulk_hive.html
@@ -0,0 +1,211 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="58"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a><a href="alien.html" class="sectionlink"></a> 
+            :: <a href="alien_skulk.html" class="sectionlink">Skulk</a>: Hive-Learned 
+            Abilities</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_skulk.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: The most common species encountered. 
+                                They are capable of blurring speed and leaps of 
+                                near limitless height. The Skulk is a light, wiry 
+                                creature around the size of a very large dog. 
+                                Lacking any projectile attacks, it specializes 
+                                in melee. It moves on all fours &#150; each leg 
+                                terminates in a long, sharp, bladed bone. It can 
+                                attack with these, and its powerful jaws. If it 
+                                cannot be stopped before reaching its target, 
+                                its target is in serious trouble.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_skulk_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td>
+<div align="center"><br>
+                          <img src="images/titles/alien_hivelearned.gif" width="628" height="25"> 
+                        </div>
+                        <div align="center"></div>
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_skulk.html">Skulk</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p><b>Two/Three Hive Abilities</b><br>
+                                      <br>
+                                      <b>Two Hives</b>: <span class="sectiontext">Leap</span></p>
+                                    <p> a visually stunning sight &#150; the leaping 
+                                      ability that a Skulk evolves when two hives 
+                                      are operational allows it to run away with 
+                                      breathtaking speed &#133; or attack just 
+                                      as quickly. Closing large distances and 
+                                      attacking in one maneuver, it becomes difficult 
+                                      to hit, and impossible to run from. The 
+                                      full range of these leaps have not been 
+                                      measured &#150; our ships and bases aren't 
+                                      big enough. </p>
+                                    <p><b>Three Hives</b>: <span class="sectiontext">Xenocide</span></p>
+                                    <p> the final, deadliest attack of the Skulk. 
+                                      And we mean <i>final</i>. Chemical glands 
+                                      crack open and mix in the center of the 
+                                      Skulk's body, foaming and expanding so rapidly 
+                                      that its body explodes. Though the force 
+                                      of the explosion is itself enough to kill 
+                                      even a heavily armored marine, the Skulk's 
+                                      bones are also specially evolved to splinter 
+                                      into tiny shards. A well placed, well timed 
+                                      xenocide can obliterate an entire squad. 
+                                      The concussive force of the blast makes 
+                                      it twice as effective against marine structures.</p>
+                            </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a></p>
+                            </td>
+                            <td><img src="images/images/skulk.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_skulk_inherent.html b/main/manual/alien_skulk_inherent.html
new file mode 100644
index 00000000..7fb4d7c9
--- /dev/null
+++ b/main/manual/alien_skulk_inherent.html
@@ -0,0 +1,207 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a><a href="alien.html" class="sectionlink"></a> 
+            :: <a href="alien_skulk.html" class="sectionlink">Skulk</a>: Inherent Abilities</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_skulk.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: The most common species encountered. 
+                                They are capable of blurring speed and leaps of 
+                                near limitless height. The Skulk is a light, wiry 
+                                creature around the size of a very large dog. 
+                                Lacking any projectile attacks, it specializes 
+                                in melee. It moves on all fours &#150; each leg 
+                                terminates in a long, sharp, bladed bone. It can 
+                                attack with these, and its powerful jaws. If it 
+                                cannot be stopped before reaching its target, 
+                                its target is in serious trouble.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_skulk_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td>
+<div align="center"><br>
+                          <img src="images/titles/alien_inherentabilities.gif" width="628" height="25"> 
+                        </div>
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_skulk.html">Skulk</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p><b>Zero Hive (inherent) Abilities</b><br>
+                                      <span class="sectiontext">Wall Running, 
+                                      Bite<br>
+                                      </span><br>
+                                      <b>Wall Running</b>: equally at ease on 
+                                      the ceiling as the floor, speculation is 
+                                      that the bladed feet of these Kharaa have 
+                                      retractable microscopic spines that shoot 
+                                      out when a spike's tip pierces a surface, 
+                                      and retract when the foot is lifted. This 
+                                      ability gives them access to vents and passage 
+                                      ways that, all too often, serve as shortcuts 
+                                      and safe-passage all over a ship or base. 
+                                      This also encourages ambush behavior. A 
+                                      Kharaa can be hiding on absolutely any surface. 
+                                      Never trust an empty room. </p>
+                                    <p><b>Bite</b>: there is no Earth animal that 
+                                      bites like the Skulk. Super-tensile muscles 
+                                      are relaxed and swung open, and then tightened 
+                                      with incredible speed, raking its jagged 
+                                      teeth together. It is not trying to eat 
+                                      its enemies; it is trying to savage them, 
+                                      causing as much bleeding and damage as possible.</p>
+                                  </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a><br>
+                              </p>
+                            </td>
+                            <td><img src="images/images/skulk.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_skulk_name.html b/main/manual/alien_skulk_name.html
new file mode 100644
index 00000000..ac76f527
--- /dev/null
+++ b/main/manual/alien_skulk_name.html
@@ -0,0 +1,195 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="58"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a><a href="alien.html" class="sectionlink"></a> 
+            :: <a href="alien_skulk.html" class="sectionlink">Skulk</a>: Name</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_skulk.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: The most common species encountered. 
+                                They are capable of blurring speed and leaps of 
+                                near limitless height. The Skulk is a light, wiry 
+                                creature around the size of a very large dog. 
+                                Lacking any projectile attacks, it specializes 
+                                in melee. It moves on all fours &#150; each leg 
+                                terminates in a long, sharp, bladed bone. It can 
+                                attack with these, and its powerful jaws. If it 
+                                cannot be stopped before reaching its target, 
+                                its target is in serious trouble.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_skulk_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td>
+<div align="center"><br>
+                          <img src="images/titles/alien_name.gif" width="628" height="25"> 
+                        </div>
+                        <div align="center"></div>
+                        <div align="center"></div>
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_skulk.html">Skulk</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p>The Skulk cannot attack most targets directly, 
+                                      at least not without <a href="alien_evolutions.html">evolving</a> 
+                                      new abilities. It tends to remain at the 
+                                      edges of marine activity, looking for opportunities 
+                                      or ambushes. It only keeps a low profile 
+                                      so it can get close to its target - then 
+                                      mayhem ensues. Commanders were constantly 
+                                      reporting something &quot;skulking&quot; 
+                                      at the edges of sensor range, or through 
+                                      the shadows, and the name stuck.</p>
+                                    </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a></p>
+                            </td>
+                            <td><img src="images/images/skulk.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_skulk_observation.html b/main/manual/alien_skulk_observation.html
new file mode 100644
index 00000000..24364bb6
--- /dev/null
+++ b/main/manual/alien_skulk_observation.html
@@ -0,0 +1,216 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="58"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a><a href="alien.html" class="sectionlink"></a> 
+            :: <a href="alien_skulk.html" class="sectionlink">Skulk</a>: Observation</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_skulk.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: The most common species encountered. 
+                                They are capable of blurring speed and leaps of 
+                                near limitless height. The Skulk is a light, wiry 
+                                creature around the size of a very large dog. 
+                                Lacking any projectile attacks, it specializes 
+                                in melee. It moves on all fours &#150; each leg 
+                                terminates in a long, sharp, bladed bone. It can 
+                                attack with these, and its powerful jaws. If it 
+                                cannot be stopped before reaching its target, 
+                                its target is in serious trouble.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_skulk_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td>
+<div align="center"><br>
+                          <img src="images/titles/alien_observation.gif" width="628" height="25"> 
+                        </div>
+                        <div align="center"></div>
+                        <div align="center"></div>
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_skulk.html">Skulk</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p><i>&quot;I don't know if I blinked, or 
+                                      there's some vent we missed, but suddenly 
+                                      a Skulk was sitting on the counter of the 
+                                      executive lunch room &#150; like we had 
+                                      caught it scrounging for a late-night snack 
+                                      in the kitchen, but the six of us looked 
+                                      tastier. It dodged our lmg's up the wall, 
+                                      bullets splintering black chrome and ugly 
+                                      artwork, zipped to the ceiling then dropped 
+                                      straight onto Zachary. They went down in 
+                                      a tumble of claws teeth and plush chairs, 
+                                      his gun still firing, moldy food packs and 
+                                      Styrofoam cups scattering everywhere. We 
+                                      kept firing, bullets sparking off the tables 
+                                      and metal chair legs, knowing FriendlyFire 
+                                      would stop us from hitting Zach. A large 
+                                      bloody piece of nano-armor popped lazily 
+                                      up into the air, and Zachary's gun went 
+                                      silent. We took our fingers off the triggers, 
+                                      popped new clips in, and started circling 
+                                      for a good angle to hit the monster, when 
+                                      there was this faint hissing sound and suddenly 
+                                      an explosion, bits of bone and Skulk whizzing 
+                                      by my ears, and a whole table flipped sideways 
+                                      and racing towards me &#150; a black shiny 
+                                      circle getting bigger and bigger then 'wham!', 
+                                      and I'm out. Good news was the same table 
+                                      blocked most of the shrapnel. But the rest 
+                                      of the squad &#133; medical nanites wouldn't 
+                                      have the faintest idea what to do with that 
+                                      mess.&quot; </i></p>
+                                    </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a></p>
+                            </td>
+                            <td><img src="images/images/skulk.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_skulk_primary.html b/main/manual/alien_skulk_primary.html
new file mode 100644
index 00000000..d1509152
--- /dev/null
+++ b/main/manual/alien_skulk_primary.html
@@ -0,0 +1,199 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a><a href="alien.html" class="sectionlink"></a> 
+            :: <a href="alien_skulk.html" class="sectionlink">Skulk</a>: Primary 
+            Attacks </font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_skulk.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary</b>: The most common species encountered. 
+                                They are capable of blurring speed and leaps of 
+                                near limitless height. The Skulk is a light, wiry 
+                                creature around the size of a very large dog. 
+                                Lacking any projectile attacks, it specializes 
+                                in melee. It moves on all fours &#150; each leg 
+                                terminates in a long, sharp, bladed bone. It can 
+                                attack with these, and its powerful jaws. If it 
+                                cannot be stopped before reaching its target, 
+                                its target is in serious trouble.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<a href="alien_skulk_name.html">Name</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td>
+<div align="center"><br>
+                          <img src="images/titles/alien_primaryattacks.gif" width="628" height="25"> 
+                        </div>
+                        <table width="628" border="1" cellspacing="0" cellpadding="3" align="center" bordercolor="#CC0000">
+                          <tr valign="top"> 
+                            <td colspan="2"> 
+                              <p class="sectiontext"><a href="alien_skulk.html"><img src="images/tech_10/alien_back.gif" width="15" height="15" border="0"></a> 
+                                <a href="alien_skulk.html">Skulk</a></p>
+                            </td>
+                          </tr>
+                          <tr valign="top"> 
+                            <td> 
+                              <table width="406" border="0" cellspacing="0" cellpadding="0" align="left">
+                                <tr> 
+                                  <td height="23"> 
+                                    <p><b>One Hive (primary) Abilities</b><br>
+                                      <span class="sectiontext">Parasite<br>
+                                      <br>
+                                      </span>By ejecting tiny darts from its nasal 
+                                      cavities, the Skulk can &quot;tag&quot; 
+                                      an enemy. The darts release a stain of bacteria, 
+                                      that connects to the bacterium. The target 
+                                      is now permanently visible to <a href="alien_hivesight.html">Hive 
+                                      Sight</a> &#150; every alien always knows 
+                                      where it is. Not a pleasant sensation, and 
+                                      not good for survival odds. The darts do 
+                                      tiny damage when they strike &#150; and 
+                                      a warning message will appear on the marine's 
+                                      HUD. </p>
+                                    </td>
+                                </tr>
+                              </table>
+                              <br>
+                              <p><br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <br>
+                                <a href="alien_skulk_observation.html"><br>
+                                </a><br>
+                              </p>
+                            </td>
+                            <td><img src="images/images/skulk.gif" width="200" height="200"></td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_spawning.html b/main/manual/alien_spawning.html
new file mode 100644
index 00000000..092cc799
--- /dev/null
+++ b/main/manual/alien_spawning.html
@@ -0,0 +1,189 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <span class="sectiontext"><font color="#FF6600"><a href="alien_hive.html" class="sectionlink">The 
+            Hive</a></font></span>: Spawning Species</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_spawning.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> To destroy the human presence, 
+                                the bacterium employs lifeforms of its own. These 
+                                are the creatures that slaughter the crew of the 
+                                ship or base, and the same creatures that are 
+                                waiting for the Frontiersmen when they arrive 
+                                to take the ship or base back. Kharaa species 
+                                have natural weaponry and cunning that make them 
+                                a match for the best equipped and most highly 
+                                trained forces we can deploy. To read about these 
+                                species, click <a href="alien_species.html">here</a>. 
+                                Hives continue to spawn over the course of a conflict, 
+                                replacing lost aliens. Destroying all hives is 
+                                the only way to defeat the Kharaa.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p> <img src="images/images/10red_data.gif" width="13" height="10"> 
+                                The hives seem to act as living libraries &#150; they 
+                                contain information the bacteria uses to respond 
+                                to threats to its control of an area. The first 
+                                hive provides basic information &#150; how to create 
+                                <a href="alien_skulk.html">Skulks</a>, <a href="alien_gorge.html">Gorges</a> 
+                                and <a href="alien_lerk.html">Lerks</a>. If the 
+                                enemy presence is strong, a second hive, and even 
+                                a third provide more and more information, allowing 
+                                more complex species &#150; the <a href="alien_fade.html">Fade</a> 
+                                and <a href="alien_onos.html">Onos</a>. The Kharaa 
+                                will tend to conserve resources by upgrading their 
+                                response one step at a time, until the threat 
+                                is destroyed. </p>
+                              <p>Hives do more than contain this information, 
+                                they act as the birthing zone for Skulks. It is 
+                                unlikely Skulks have always birthed this way &#150; 
+                                it seems to be an example of highly specialized 
+                                evolution. As the first step of response, Skulks 
+                                are the most basic, resource-effective answer 
+                                to the human presence. As more resources are made 
+                                available, each Skulk can choose to gestate into 
+                                a more complex species. The same individual Kharaa 
+                                may gestate up through all five <a href="alien_species.html">species</a> 
+                                over the course of a conflict.</p>
+                            </td>
+                          </tr>
+                        </table>
+                          
+                        
+                        
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_species.html b/main/manual/alien_species.html
new file mode 100644
index 00000000..368cff72
--- /dev/null
+++ b/main/manual/alien_species.html
@@ -0,0 +1,224 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a>: Species</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_species.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                        <tr>
+                          <td>
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p> <img src="images/images/10red_data.gif" width="13" height="10"> 
+                                There may be individual Earth creatures that approach 
+                                the Kharaa in terms of physical prowess, in a 
+                                particular fashion: a bull elephant and an Onos 
+                                engaged in a tug of war, a gazelle and a Skulk 
+                                in a 100 meter sprint &#150; but on the whole, the 
+                                Kharaa set physical benchmarks in excess of anything 
+                                we have observed in nature thus far. From the 
+                                crucible of their brutal evolutionary period have 
+                                emerged creatures with truly awesome capabilities.</p>
+                              </td>
+                          </tr>
+                        </table>
+                          
+                        
+                        
+                        
+                        <br>
+                        <table width="628" border="1" cellspacing="0" cellpadding="0" bgcolor="#330000" align="center" bordercolor="#CC0000">
+                          <tr> 
+                            <td> 
+                              <table width="628" border="0" cellspacing="2" cellpadding="0" align="center" height="30">
+                                <tr valign="middle" align="center"> 
+                                  <td width="170"> 
+                                    <p><img src="images/tech_10/changingspecies.gif" width="15" height="15"> 
+                                      <a href="alien_changingspecies.html">Changing 
+                                      Species</a></p>
+                                  </td>
+                                  <td colspan="2"> 
+                                    <p align="center"><img src="images/tech_10/alienattacks.gif" width="15" height="15"> 
+                                      <a href="alien_abilitiesandattacks.html">Abilities 
+                                      and Attacks</a></p>
+                                  </td>
+                                  <td width="208"> 
+                                    <p align="center"><img src="images/tech_10/sterkmanred.gif" width="15" height="15"> 
+                                      <a href="alien_sterkman.html">The Sterkman 
+                                      Point System</a></p>
+                                    </td>
+                                </tr>
+                              </table>
+                              <img src="images/images/blip_red.gif" width="100%" height="2"> 
+                              <table width="100%" border="0" cellspacing="5" cellpadding="0" height="107">
+                                <tr valign="middle"> 
+                                  <td height="114"> 
+                                    <div align="center">
+                                      <p><a href="alien_skulk.html">Skulk<br>
+                                        <br>
+                                        <img src="images/images/level1.gif" width="64" height="64" border="0"></a></p>
+                                    </div>
+                                  </td>
+                                  <td height="114"> 
+                                    <div align="center">
+                                      <p><a href="alien_gorge.html">Gorge<br>
+                                        <br>
+                                        <img src="images/images/level2.gif" width="64" height="64" border="0"></a></p>
+                                    </div>
+                                  </td>
+                                  <td height="114"> 
+                                    <div align="center">
+                                      <p><a href="alien_lerk.html">Lerk<br>
+                                        <br>
+                                        <img src="images/images/level3.gif" width="64" height="64" border="0"></a></p>
+                                    </div>
+                                  </td>
+                                  <td height="114"> 
+                                    <div align="center">
+                                      <p><a href="alien_fade.html">Fade<br>
+                                        <br>
+                                        <img src="images/images/level4.gif" width="64" height="64" border="0"></a></p>
+                                    </div>
+                                  </td>
+                                  <td height="114"> 
+                                    <div align="center">
+                                      <p><a href="alien_onos.html">Onos<br>
+                                        <br>
+                                        <img src="images/images/level5.gif" width="64" height="64" border="0"></a></p>
+                                    </div>
+                                  </td>
+                                </tr>
+                              </table>
+                              <div align="center"><br>
+                                <a href="alien_evolutions.html">Evolutions<br>
+                                <br>
+                                <img src="images/images/speciesupgrades.gif" width="64" height="64" border="0" vspace="2"></a><br>
+                                &nbsp; </div>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_sterkman.html b/main/manual/alien_sterkman.html
new file mode 100644
index 00000000..21a66f33
--- /dev/null
+++ b/main/manual/alien_sterkman.html
@@ -0,0 +1,149 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/alien_bacterium_s.gif','images/images/alien_hive_s.gif','images/images/alien_chambers_s.gif','images/images/alien_species_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html" class="sectionlink">Kharaa 
+            Data</a> :: <a href="alien_species.html" class="sectionlink">Species</a>: 
+            Sterkman Point System</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_sterkman.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                        <tr>
+                          <td>
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p> <img src="images/images/10red_data.gif" width="13" height="10"> 
+                                Species health, armor, and attack stats, are determined 
+                                using the <a href="front_sterkman.html">Sterkman 
+                                Point System</a>.</p>
+                              </td>
+                          </tr>
+                        </table>
+                          
+                        
+                        
+                        
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/alien_victory.html b/main/manual/alien_victory.html
new file mode 100644
index 00000000..704939f3
--- /dev/null
+++ b/main/manual/alien_victory.html
@@ -0,0 +1,148 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+<link rel="stylesheet" href="css/alien.css" type="text/css">
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/red/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/red/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/red/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600"><a href="alien.html">Kharaa 
+            Data</a>: Victory</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/red/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/red/surround_w.gif"><img src="images/design/red/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/red/background.gif" valign="top"> 
+            <p><img src="images/design/red/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/alien_victory.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p> <img src="images/images/10red_data.gif" width="13" height="10"> 
+                                If every Frontiersman is dead, and there is no 
+                                apparatus operational to phase in reinforcements, 
+                                then the Kharaa have won.</p>
+                              </td>
+                              </tr>
+                            </table>
+                          
+                        
+                        <p align="center"><img src="images/images/victory_aliens.gif" width="386" height="244"></p>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/red/surround_e.gif"><img src="images/design/red/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/red/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/css/alien.css b/main/manual/css/alien.css
new file mode 100644
index 00000000..a5017110
--- /dev/null
+++ b/main/manual/css/alien.css
@@ -0,0 +1,12 @@
+.sectionlink {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-style: normal; font-weight: bold; color: #CC0000; text-decoration: underline}
+p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; color: #FFFFFF; line-height: normal}
+h1 {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-weight: bold; color: #CC0000}
+.subsectionlink { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-style: normal; font-weight: normal; color: #FFFFFF; text-decoration: underline }
+.sectionlinkon { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-style: normal; font-weight: bold; color: #FFFFFF; text-decoration: underline }
+a:link { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; font-style: normal; font-weight: normal; color: #CC0000; text-decoration: underline }
+a:active { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; font-style: normal; font-weight: normal; color: #FF6600; text-decoration: underline }
+a:visited { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; font-style: normal; font-weight: normal; color: #CC0000; text-decoration: underline }
+a:hover { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; font-style: normal; font-weight: normal; color: #FFFFFF; text-decoration: underline }
+.sectiontext { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-style: normal; font-weight: bold; color: #CC0000}
+body { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; line-height: normal }
+.unnamed1 {  border: #CC0000; border-style: solid; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px; border-left-width: 1px}
diff --git a/main/manual/css/marine.css b/main/manual/css/marine.css
new file mode 100644
index 00000000..ecd0f580
--- /dev/null
+++ b/main/manual/css/marine.css
@@ -0,0 +1,11 @@
+.sectionlink {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-style: normal; font-weight: bold; color: #0099FF; text-decoration: underline}
+p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; color: #FFFFFF; line-height: normal}
+h1 {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-weight: bold; color: #FFFFFF}
+.subsectionlink { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-style: normal; font-weight: normal; color: #FFFFFF; text-decoration: underline }
+.sectionlinkon { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-style: normal; font-weight: bold; color: #FFFFFF; text-decoration: underline }
+a:link { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; font-style: normal; font-weight: normal; color: #0099FF; text-decoration: underline }
+a:active { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; font-style: normal; font-weight: normal; color: #FF6600; text-decoration: underline }
+a:visited { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; font-style: normal; font-weight: normal; color: #0099FF; text-decoration: underline }
+a:hover { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; font-style: normal; font-weight: normal; color: #FFFFFF; text-decoration: underline }
+.sectiontext { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-style: normal; font-weight: bold; color: #0099FF}
+body { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; line-height: normal }
diff --git a/main/manual/front_armor.html b/main/manual/front_armor.html
new file mode 100644
index 00000000..ae38f6f3
--- /dev/null
+++ b/main/manual/front_armor.html
@@ -0,0 +1,165 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext"> :: Technical: <font color="#FF6600">Armor</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_armor.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                Standard issue Frontiersmen nano-armor consists 
+                                of a breastplate, helmet, and arm and leg sheaths. 
+                                It is made from a plastic/ceramic hybrid of tremendous 
+                                strength and resiliency. Beneath its outer layer 
+                                are millions of egg-shaped nodules designed to 
+                                first resist impact, and then shatter, releasing 
+                                the kinetic energy of the blow to their neighbors 
+                                and so distributing the force as quickly and widely 
+                                as possible. If breached, the armor reseals its 
+                                outer skin. It then distributes its remaining 
+                                mass equally, creating new nano-eggs, thinning 
+                                their number and thickness to compensate. So while 
+                                the armor doesn't technically heal itself, no 
+                                part of it is ever weaker than any other, and 
+                                it maintains integrity up to its last armor point 
+                                &#150; though by that stage it has become paper thin.</p>
+                              <p>Heavy armor works on the same principle, but 
+                                has so many layers of defensive nano that very 
+                                little damage makes it through. For more information 
+                                on heavy armor, click <a href="weapons_ha.html">here</a>.</p>
+                              <p> <a href="weapons_welders.html">Welders</a> can 
+                                repair any armor, pumping new nanos directly into 
+                                its structure.</p>
+                            </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_building.html b/main/manual/front_building.html
new file mode 100644
index 00000000..de298291
--- /dev/null
+++ b/main/manual/front_building.html
@@ -0,0 +1,179 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_marine.html">Marine</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Building</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_building.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> The <a href="front_commander.html">commander</a> 
+                                selects and places all <a href="structures.html">structures</a>, 
+                                but before they are activated, they must be &quot;built&quot; 
+                                by Frontiersmen. Marines will see a nano-ghost 
+                                of the structure. By standing next to it and activating 
+                                their &quot;use&quot; function, they can complete 
+                                its construction. The <a href="alien_hivesight.html">build 
+                                indicator</a> will show the structure's progress 
+                                on the marine's HUD. The indicator for unbuilt 
+                                structures is outlined in yellow, complete structures 
+                                are outlined in green. When a structure is complete, 
+                                it will visibly deploy. Structures allow new weapons, 
+                                upgrades, and equipment.</p>
+                              </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                This is an unfortunate limitation of the <a href="front_commander.html">command 
+                                network</a> &#150; as non-military systems pressed 
+                                into combat use, many of the pre-existing safeguards 
+                                regarding civilian nanotech use remain in place. 
+                                Traditionally, onsite construction crews would 
+                                have to be present when a new structure is created 
+                                &#150; activating the construction nanos, and monitoring 
+                                the progress of the build closely, looking for 
+                                any nano-leakage, instability, or defect. The 
+                                best Frontiersmen software can do to get around 
+                                this is to convince the network that marines are 
+                                authorized maintenance personnel, serving the 
+                                same function. A useful by-product of this work-around 
+                                is that the Frontiersmen welder becomes an authorized 
+                                maintenance tool. See the <a href="weapons_welders.html">welder</a> 
+                                entry for more information. </p>
+                              </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_choosingcommander.html b/main/manual/front_choosingcommander.html
new file mode 100644
index 00000000..15a77ffd
--- /dev/null
+++ b/main/manual/front_choosingcommander.html
@@ -0,0 +1,203 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_commander.html">Commander</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Choosing a Commander</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_choosing.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> Any marine may become commander. 
+                                Frontiersmen deploy according to the <i>Hirshelm 
+                                Doctrine of Tactical Flexibility</i>.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p> <img src="images/images/10_data.gif" width="13" height="10"> 
+                                When arriving at the starting base, any marine 
+                                may choose to enter the command console, and plug 
+                                into the network. The Frontiersmen adhere to the 
+                                <i>Hirshelm Doctrine of Tactical Flexibility</i>, 
+                                which advocates that while a command structure 
+                                is necessary off the battlefield (to avoid the 
+                                endless debates of boardrooms and parliaments), 
+                                it is better for squads to evolve a hierarchy 
+                                organically &#150; favoring those best suited 
+                                or prepared for each situation over pre-selected 
+                                officers. It is specially designed to allow rapid 
+                                training and deployment of troops &#150; the standard 
+                                is 100 hours simulator training, and 100 hours 
+                                classroom time before being promoted to the field. 
+                                This also allows impromptu squads of all sizes 
+                                to form and head into combat with little preparation, 
+                                while decreasing the severity of losing an officer. 
+                                With the Frontiersmen, mobility and flexibility 
+                                is the order of the day.</p>
+                              <p>What this means is that, usually, the individual 
+                                with the best odds of leading the team to victory 
+                                in each situation will take control. To quote 
+                                Sergeant Haverhill, principle instructor at TSA 
+                                Headquarters, &quot;A Frontiersman must not surrender 
+                                to ego, greed, or power-lust. Remember who the 
+                                bad guys are. The reason the TSA has been kickin' 
+                                ass for the last decade, is we don't having pissing 
+                                contests when lives are at stake. We get the job 
+                                done, with <i>extreme</i> effectiveness. <i>Then</i> 
+                                we kick back and brag.&quot; </p>
+                              <p>If no one steps forward to fill the command role, 
+                                someone will usually volunteer for the sake of 
+                                the group. Those with the desire to learn <a href="front_commandstrats.html">command 
+                                tactics</a> can only do so much in training &#150; 
+                                sooner or later they will have to just jump in 
+                                and begin gaining experience. </p>
+                              <p>What this also means is that you don't <i>have</i> 
+                                to listen to your commander. But the numbers from 
+                                the field tell the story: your odds of survival 
+                                on your own are minimal-to-none, and a team that 
+                                isn't working closely with a commander is, in 
+                                every recorded instance, doomed.</p>
+                              </td>
+                              </tr>
+                            </table>
+                          
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td><img src="images/tech_10/arrow.gif" width="15" height="15"> 
+                              <a href="front_votingoutcomm.html">Voting out a 
+                              Commander</a> </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_comduties.html b/main/manual/front_comduties.html
new file mode 100644
index 00000000..b0b99315
--- /dev/null
+++ b/main/manual/front_comduties.html
@@ -0,0 +1,203 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/commander_s.gif','images/images/droppables_s.gif','images/images/structures_s.gif','images/images/upgrades_s.gif','images/images/resources_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data </a></span> <span class="sectiontext">::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span><span class="sectiontext">: <font color="#FF6600">Command 
+            Duties</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_commandduties.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> The commander performs vital 
+                                tasks &#150; providing his team with equipment and 
+                                weapons, and upgrading the network to create more 
+                                advanced and powerful equipment and weapons.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                The best way to understand the command interface 
+                                and tasks is by diving right in. A tutorial will 
+                                be online soon, allowing marines to explore the 
+                                command interface in a non-combat environment. 
+                                The following sections provide an overview:</p>
+                              <table width="616" border="0" cellspacing="0" cellpadding="0" align="center">
+                                <tr> 
+                                  <td valign="top"> 
+                                    <table width="100%" border="0" cellspacing="10" cellpadding="0" height="205">
+                                      <tr align="center" valign="bottom"> 
+                                        <td width="28%" height="69">
+                                          <p><a href="front_comhud.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('commander','','images/images/commander_s.gif',1)">The 
+                                            Command HUD<br>
+                                            <br>
+                                            <img name="commander" border="0" src="images/images/commander.gif" width="64" height="64"></a> 
+                                          </p>
+                                        </td>
+                                        <td height="69" colspan="2"> 
+                                          <p> <a href="items_main.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('droppables','','images/images/droppables_s.gif',1)">Dropping 
+                                            Equipment<br>
+                                            <br>
+                                            <img name="droppables" border="0" src="images/images/droppables.gif" width="64" height="64"></a> 
+                                          </p>
+                                          </td>
+                                        <td width="30%" height="69"><a href="structures.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('structures','','images/images/structures_s.gif',1)">Structures<br>
+                                          <br>
+                                          <img name="structures" border="0" src="images/images/structures.gif" width="64" height="64"></a> 
+                                        </td>
+                                      </tr>
+                                      <tr align="center" valign="bottom"> 
+                                        <td colspan="2" height="108"> 
+                                          <p> <a href="front_resources.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('resources','','images/images/resources_s.gif',1)">Resources<br>
+                                            <br>
+                                            <img name="resources" border="0" src="images/images/resources.gif" width="64" height="64"></a> 
+                                          </p>
+                                          </td>
+                                        <td colspan="2" height="108"> 
+                                          <p><a href="front_upgrades.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('upgrades','','images/images/upgrades_s.gif',1)">Upgrades<br>
+                                            <br>
+                                            <img name="upgrades" border="0" src="images/images/upgrades.gif" width="64" height="64"></a></p>
+                                          </td>
+                                      </tr>
+                                    </table>
+                                  </td>
+                                  <td valign="top">&nbsp; </td>
+                                </tr>
+                              </table>
+                              
+                            </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_comhud.html b/main/manual/front_comhud.html
new file mode 100644
index 00000000..6469246c
--- /dev/null
+++ b/main/manual/front_comhud.html
@@ -0,0 +1,175 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span><span class="sectiontext"> 
+            ::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span><span class="sectiontext"> <span class="sectiontext">::</span> 
+            <span class="sectionlink"><a href="front_comduties.html"> Command 
+            Duties</a></span>: <font color="#FF6600">Command HUD</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_commandhud.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <p>The interface that the commander uses to watch 
+                                over his squad is called the command HUD (heads 
+                                up display). When plugged into a <a href="structures_cc.html">Command 
+                                Console</a>, the HUD replaces the commander's 
+                                field of vision, and basic controls allow him 
+                                to manipulate and control the display. </p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td>
+                              <p>The three most important components of the HUD 
+                                are the <a href="front_comhud_minimap.html">mini-map</a>, 
+                                the <a href="front_comhud_menu.html">menu</a>, 
+                                and the <a href="front_comhud_view.html">view</a>.</p>
+                              </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> 
+                          <table width="628" border="1" cellspacing="0" cellpadding="0" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                            <tr> 
+                              <td> 
+                                <p><img src="images/images/commanderhud.jpg" width="622" height="467" usemap="#Map" border="0" href="front_comhud_view.html"></p>
+                              </td>
+                            </tr>
+                          </table>
+                        </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+<map name="Map"> 
+  <area shape="rect" coords="469,321,658,475" href="front_comhud_menu.html" alt="Menu" title="Menu">
+  <area shape="rect" coords="-23,-320,619,322" href="front_comhud_view.html" alt="View" title="View">
+  <area shape="rect" coords="-17,322,208,465" href="front_comhud_minimap.html" alt="Minimap" title="Minimap">
+</map>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_comhud_menu.html b/main/manual/front_comhud_menu.html
new file mode 100644
index 00000000..a42c8279
--- /dev/null
+++ b/main/manual/front_comhud_menu.html
@@ -0,0 +1,171 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span><span class="sectiontext"> 
+            ::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span><span class="sectiontext"> <span class="sectiontext">::</span> 
+            <span class="sectionlink"><a href="front_comduties.html"> Command 
+            Duties</a></span> <span class="sectiontext"><span class="sectiontext">::</span> 
+            <span class="sectionlink"><a href="front_comhud.html"> Command HUD</a></span></span>: 
+            <font color="#FF6600">Menu</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table width="100" border="0" cellspacing="0" cellpadding="0">
+              <tr> 
+                <td><img src="images/titles/front_commandhud.gif" width="628" height="25" hspace="25"></td>
+              </tr>
+              <tr> 
+                <td> 
+                  <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                    <tr> 
+                      <td> 
+                        <p>The interface that the commander uses to watch over 
+                          his squad is called the command HUD (heads up display). 
+                          When plugged into a <a href="structures_cc.html">Command 
+                          Console</a>, the HUD replaces the commander's field 
+                          of vision, and basic controls allow him to manipulate 
+                          and control the display. </p>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+              <tr> 
+                <td> 
+                  <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                    <tr> 
+                      <td> 
+                        <p>The three most important components of the HUD are 
+                          the <a href="front_comhud_minimap.html">mini-map</a>, 
+                          the <a href="front_comhud_menu.html">menu</a>, and the 
+                          <a href="front_comhud_view.html">view</a>.</p>
+                      </td>
+                    </tr>
+                  </table>
+                  <table width="100" border="0" cellspacing="0" cellpadding="0" align="center">
+                    <tr> 
+                      <td> 
+                        <div align="center"><img src="images/design/info_bar.gif" width="612" height="15" hspace="12" vspace="6"></div>
+                      </td>
+                    </tr>
+                  </table>
+                  <table width="616" border="0" cellspacing="0" cellpadding="0" align="center">
+                    <tr> 
+                      <td valign="top"> 
+                        <table width="616" border="0" cellspacing="0" cellpadding="0" align="center">
+                          <tr> 
+                            <td valign="top"> 
+                              <p><b>Menu</b><br>
+                                On the lower right, the command menu contains 
+                                icons for all marine structures and equipment. 
+                                Clicking on an icon selects it, and placing it 
+                                on the <a href="front_comhud_view.html">view</a> 
+                                tells the nano-network to create it at that location. 
+                                If structure is selected on the <a href="front_comhud_view.html">view</a>, 
+                                any upgrades it makes available are displayed 
+                                on the menu.</p>
+                              <p align="center"><img src="images/images/commenu.gif" width="187" height="184"></p>
+                              </td>
+                          </tr>
+                        </table>
+                        
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+            <blockquote>&nbsp;</blockquote>
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_comhud_minimap.html b/main/manual/front_comhud_minimap.html
new file mode 100644
index 00000000..2a75a7c9
--- /dev/null
+++ b/main/manual/front_comhud_minimap.html
@@ -0,0 +1,215 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span><span class="sectiontext"> 
+            ::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span><span class="sectiontext"> <span class="sectiontext">::</span> 
+            <span class="sectionlink"><a href="front_comduties.html"> Command 
+            Duties</a></span> <span class="sectiontext"><span class="sectiontext">::</span> 
+            <span class="sectionlink"><a href="front_comhud.html"> Command HUD</a></span></span>: 
+            <font color="#FF6600">Mini-map</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+              <tr> 
+                <td align="center" valign="top"> 
+                  <table width="100" border="0" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td><img src="images/titles/front_commandhud.gif" width="628" height="25" hspace="25"></td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <p>The interface that the commander uses to watch 
+                                over his squad is called the command HUD (heads 
+                                up display). When plugged into a <a href="structures_cc.html">Command 
+                                Console</a>, the HUD replaces the commander's 
+                                field of vision, and basic controls allow him 
+                                to manipulate and control the display. </p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p>The three most important components of the HUD 
+                                are the <a href="front_comhud_minimap.html">mini-map</a>, 
+                                the <a href="front_comhud_menu.html">menu</a>, 
+                                and the <a href="front_comhud_view.html">view</a>.</p>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="100" border="0" cellspacing="0" cellpadding="0" align="center">
+                          <tr> 
+                            <td> 
+                              <div align="center"><img src="images/design/info_bar.gif" width="612" height="15" hspace="12" vspace="6"></div>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="616" border="0" cellspacing="0" cellpadding="0" align="center">
+                          <tr> 
+                            <td valign="top"> 
+                              <p><b>Mini-map</b><br>
+                                A map of the entire ship or base, this is a quick 
+                                way to jump the display (view) to another area 
+                                (just click on the map to jump). Marines appear 
+                                on this map as green, structures blue, and aliens, 
+                                when visible, as red (see <a href="front_nanogridlock.html">nano-gridlock</a>). 
+                                Requests for ammo, structures under attack, and 
+                                other alerts appear on the minimap. The minimap 
+                                is invaluable for quickly identifying and responding 
+                                to urgent events all over the battlefield.</p>
+                              <table border="0" cellspacing="0" cellpadding="0" align="left" width="519">
+                                <tr> 
+                                  <td width="360"> 
+                                    <table border="0" cellspacing="4" cellpadding="4" width="100%">
+                                      <tr> 
+                                        <td> 
+                                          <div align="right"> 
+                                            <p>Marines <img src="images/images/blip_green.gif" width="4" height="5"></p>
+                                          </div>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td> 
+                                          <div align="right"> 
+                                            <p>Structures <img src="images/images/blip_blue.gif" width="4" height="5"></p>
+                                          </div>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td> 
+                                          <div align="right"> 
+                                            <p>Aliens <img src="images/images/blip_red.gif" width="4" height="5"></p>
+                                          </div>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td> 
+                                          <div align="right"> 
+                                            <p>Resource Nodes <img src="images/images/blip_white.gif" width="4" height="5"></p>
+                                          </div>
+                                        </td>
+                                      </tr>
+                                    </table>
+                                  </td>
+                                  <td height="183"><img src="images/images/minimap.gif" width="274" height="195"> 
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+                  <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                    <tr> 
+                      <td align="center" valign="top"> 
+                        <div align="center"> </div>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_comhud_view.html b/main/manual/front_comhud_view.html
new file mode 100644
index 00000000..d7d795c1
--- /dev/null
+++ b/main/manual/front_comhud_view.html
@@ -0,0 +1,268 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span><span class="sectiontext"> 
+            ::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span><span class="sectiontext"> <span class="sectiontext">::</span> 
+            <span class="sectionlink"><a href="front_comduties.html"> Command 
+            Duties</a></span> <span class="sectiontext"><span class="sectiontext">::</span> 
+            <span class="sectionlink"><a href="front_comhud.html"> Command HUD</a></span></span>: 
+            <font color="#FF6600">View</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            
+              
+            <table width="100" border="0" cellspacing="0" cellpadding="0">
+              <tr> 
+                <td><img src="images/titles/front_commandhud.gif" width="628" height="25" hspace="25"></td>
+              </tr>
+              <tr> 
+                <td> 
+                  <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                    <tr> 
+                      <td> 
+                        <p>The interface that the commander uses to watch over 
+                          his squad is called the command HUD (heads up display). 
+                          When plugged into a <a href="structures_cc.html">Command 
+                          Console</a>, the HUD replaces the commander's field 
+                          of vision, and basic controls allow him to manipulate 
+                          and control the display. </p>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+              <tr> 
+                <td> 
+                  <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                    <tr> 
+                      <td> 
+                        <p>The three most important components of the HUD are 
+                          the <a href="front_comhud_minimap.html">mini-map</a>, 
+                          the <a href="front_comhud_menu.html">menu</a>, and the 
+                          <a href="front_comhud_view.html">view</a>.</p>
+                      </td>
+                    </tr>
+                  </table>
+                  <table width="100" border="0" cellspacing="0" cellpadding="0" align="center">
+                    <tr> 
+                      <td> 
+                        <div align="center"><img src="images/design/info_bar.gif" width="612" height="15" hspace="12" vspace="6"></div>
+                      </td>
+                    </tr>
+                  </table>
+                  <table width="616" border="0" cellspacing="0" cellpadding="0" align="center">
+                    <tr> 
+                      <td valign="top"> 
+                        <p><b>View</b><br>
+                          The commander's view of the battlefield, and his principle 
+                          means of interacting with his squad. This display incorporates 
+                          a wide variety of functions, the most important of which 
+                          are listed below:</p>
+                        <table width="100%" border="0" cellspacing="4" cellpadding="0">
+                          <tr> 
+                            <td>
+                              <blockquote>
+                                <p><span class="sectiontext">Watching Over Marines</span> 
+                                  &#150; monitoring their status and progress, dropping 
+                                  equipment as necessary.</p>
+                              </blockquote>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="100%" border="0" cellspacing="4" cellpadding="0">
+                          <tr> 
+                            <td> 
+                              <p><span class="sectiontext">Sighting Aliens</span> 
+                                &#150; any <a href="alien_evolutions_cloaking.html">uncloaked</a> 
+                                aliens near a marine are clearly visible to the 
+                                commander, even if the marine is unaware of them.</p>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="100%" border="0" cellspacing="4" cellpadding="0">
+                          <tr> 
+                            <td> 
+                              <blockquote> 
+                                <p><span class="sectiontext">Giving Orders</span> 
+                                  &#150; by selecting a marine or group of marines, 
+                                  and then designating a map location, the commander 
+                                  causes a waypoint to appear on the marines' 
+                                  HUD. These can be used to navigate and group 
+                                  marines, direct them to a <a href="front_building.html">build</a> 
+                                  a <a href="structures.html">structure</a>, or 
+                                  alert them to each other's location.</p>
+                              </blockquote>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="100%" border="0" cellspacing="4" cellpadding="0">
+                          <tr> 
+                            <td> 
+                              <p><span class="sectiontext">Selecting Structures</span> 
+                                &#150; select structures to see what <a href="front_upgrades.html">upgrades</a> 
+                                they make available, or to recycle them for <a href="front_resources.html">resources</a>.</p>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="100%" border="0" cellspacing="4" cellpadding="0">
+                          <tr> 
+                            <td> 
+                              <blockquote>
+                                <p><span class="sectiontext">Dropping Equipment 
+                                  and Placing Structures</span> &#150; use the view 
+                                  to place <a href="items_main.html">equipment</a> 
+                                  and <a href="structures.html">structures</a>. 
+                                  When a structure or piece of equipment is available 
+                                  (see the <a href="techtree.html">tech tree</a>), 
+                                  it can be selected on the <a href="front_comhud_menu.html">menu</a>, 
+                                  and its icon will appear as a three dimensional 
+                                  &quot;ghost&quot; on the view. If the location 
+                                  is invalid (over rough, occupied, or <a href="front_nanogridlock.html">gridlock</a>-restricted 
+                                  space) the icon will change color to red. If 
+                                  the location is valid, it will be colored green, 
+                                  and can be successfully placed. <a href="items_main.html">Equipment</a> 
+                                  can then be picked up by any marine. <a href="structures.html">Structures</a> 
+                                  will have to be <a href="front_building.html">built</a> 
+                                  by one or more marines, before they become active. 
+                                  Most structures must be built in range of others 
+                                  (for instance, <a href="weapons_turrets.html">turrets</a> 
+                                  must be built within range of a <a href="structures_tfact.html">turret 
+                                  factory</a>), and all weapons must be placed 
+                                  in range of an <a href="structures_armory.html">armory</a> 
+                                  or <a href="structures_advarmory.html">advanced 
+                                  armory</a>. Valid ranges will be drawn in fields 
+                                  of green. See the appropriate listing for more 
+                                  information. </p>
+                              </blockquote>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="100%" border="0" cellspacing="4" cellpadding="0">
+                          <tr> 
+                            <td> 
+                              <p><span class="sectiontext">Environment Controls</span> 
+                                &#150; any item that can be operated by a button or 
+                                lever (i.e. doors, lifts, airlocks), can also 
+                                be operated by the commander. </p>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="100%" border="0" cellspacing="4" cellpadding="0">
+                          <tr> 
+                            <td> 
+                              <blockquote>
+                                <p><span class="sectiontext">Scans</span> &#150; 
+                                  select the <a href="structures_observatory.html">observatory</a>, 
+                                  choose the scanner icon from the <a href="front_comhud_menu.html">menu</a>, 
+                                  and move the view to the area of the map you 
+                                  wish to scan. Any alien <a href="alien_chambers.html">chambers</a>, 
+                                  <a href="alien_hive.html">hives</a> or <a href="alien_species.html">lifeforms</a> 
+                                  (cloaked or not) will be briefly revealed. Useful 
+                                  to find the location of hives, or to plan an 
+                                  assault.</p>
+                              </blockquote>
+                            </td>
+                          </tr>
+                        </table>
+                        
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+            
+          </td>
+          <td background="images/design/surround_e.gif" valign="top"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_commander.html b/main/manual/front_commander.html
new file mode 100644
index 00000000..1819e25a
--- /dev/null
+++ b/main/manual/front_commander.html
@@ -0,0 +1,217 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext">: <font color="#FF6600">Commander</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_commander.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> By plugging in to a ship or base's 
+                                command network, the commander oversees marine 
+                                activities and provides them with <a href="items_main.html">equipment</a>, 
+                                defenses, and <a href="front_upgrades.html">upgrades</a>.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p> <img src="images/images/10_data.gif" width="13" height="10"> 
+                                Since you will be fighting the Kharaa on home 
+                                territory (our own ships and bases), you have 
+                                many advantages. Some of these are obvious &#150; like 
+                                having maps of the battleground. But even more 
+                                important, is the existing command network in 
+                                each ship. </p>
+                              <p>The command network is a layer of multi-purpose 
+                                nanos that spreads, root-like, just above all 
+                                ceilings and overhangs. Micro-arrays of lenses, 
+                                tiny packets of construction nanos, and hundreds 
+                                of other nano-devices all tied into millions of 
+                                relays and computing nodules &#150; cohering into a 
+                                pervasive, responsive system intimately connected 
+                                to every aspect of its ship's or base's existence. 
+                                This network also holds the marine's <a href="front_resources.html">resources</a>, 
+                                distributed throughout its veins.<br>
+                              </p>
+                              <p> To take advantage of the network, every ship 
+                                or base has a command interface, which, before 
+                                the Kharaa, was used by top administrative or 
+                                authority figures to manage and govern their domain. 
+                                These interfaces replaced vast numbers of support 
+                                staff with one person, who could instantly turn 
+                                their attention anywhere within the ship or base, 
+                                and guide the crew through their duties. Used 
+                                for tasks as varied as maintenance or surveillance, 
+                                the command interface also allowed its user to 
+                                operate some elements of the physical environment, 
+                                like doors and lights; and, crucially, granted 
+                                clearance for nano-construction. </p>
+                              <p> Put to use by a Frontiersman Commander (using 
+                                a <a href="structures_cc.html">command console</a>), 
+                                the network becomes the heart of any military 
+                                campaign. Gaining control of the command network 
+                                is the first and most vital task for a squad. 
+                                This is easily accomplished. Since we are returning 
+                                these ships and bases to the previous owners, 
+                                they gladly provide us with the encryption keys 
+                                to access their systems. Before a squad even deploys, 
+                                they are already online. For a description of 
+                                the command interface, click <a href="front_comhud.html">here</a>.</p>
+                              </td>
+                              </tr>
+                            </table>
+                          
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td height="39"> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr align="left" valign="top"> 
+                                  <td width="32%"><img src="images/tech_10/nanogridlock.gif" width="15" height="15"> 
+                                    <a href="front_nanogridlock.html">Nano-Gridlock 
+                                    </a><br>
+                                    <img src="images/tech_10/tactics.gif" width="15" height="15"> 
+                                    <a href="front_commandstrats.html">Command 
+                                    Strategies and Tactics</a> </td>
+                                  <td width="34%"><img src="images/tech_10/query.gif" width="15" height="15"> 
+                                    <a href="front_choosingcommander.html"> Choosing 
+                                    a Commander</a><br>
+                                    <a href="images/tech_10/scan.gif"><img src="images/tech_10/list.gif" width="15" height="15" border="0"></a> 
+                                    <a href="front_comduties.html">Command Duties</a> 
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_commandstrats.html b/main/manual/front_commandstrats.html
new file mode 100644
index 00000000..f5df62c5
--- /dev/null
+++ b/main/manual/front_commandstrats.html
@@ -0,0 +1,161 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data </a></span> <span class="sectiontext">::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span><span class="sectiontext">: <font color="#FF6600">Command 
+            Strategies and Tactics</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_commandstrats.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                Because the commander must spend resource points 
+                                to acquire new items, this is often called &quot;purchasing&quot;. 
+                                Commanding is very much like trying to run a business 
+                                on a limited budget.</p>
+                              <p>Even the smallest decisions facing a commander 
+                                can be vital. Buy one set of heavy armor, or another 
+                                siege turret? Hold off on the heavier weapons, 
+                                or cash in your reserves and go for broke? The 
+                                larger decisions are even tougher: build a second 
+                                base and dig in, or assault the enemy hive? Research 
+                                defensive or offensive upgrades? Split your forces, 
+                                or group them for a concerted attack? </p>
+                              <p>Unfortunately, there are no tried and true methods, 
+                                and never any easy answers. We are counting on 
+                                <i>you</i> to help us crack the Kharaa's deployment, 
+                                and start building a database of command expertise. 
+                              </p>
+                            </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_communicating.html b/main/manual/front_communicating.html
new file mode 100644
index 00000000..397b00f8
--- /dev/null
+++ b/main/manual/front_communicating.html
@@ -0,0 +1,169 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectionlink"><a href="frontiersmen.html"></a></span><span class="sectiontext"> 
+            :: </span><span class="sectionlink"><a href="front_marine.html">Marine</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Communicating</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_communicating.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p> Your commander will be communicating with you 
+                                using text, voice, and <a href="alien_hivesight.html">waypoints</a>. 
+                                Understand though that even an experienced commander 
+                                can be hard pressed to keep up with the individual 
+                                demands of his squad while still managing the 
+                                big picture. Getting more health, more ammo, or 
+                                a new weapon may seem like life or death to you, 
+                                but there will be many times your commander has 
+                                more important things on his mind &#150; like 
+                                another battle happening on the far side of the 
+                                map, with its own soldiers, with their own needs. 
+                                A commander may be managing three battles and 
+                                construction of a forward base all at the same 
+                                time. He can see the big picture. You can't.</p>
+                              <p>There is a certain kind of shell shock that can 
+                                afflict commanders in combat &#150; especially sprawling 
+                                conflicts with multiple objectives. Commander 
+                                shell-shock is a sure-fire squad killer. Ironically, 
+                                the squad is often responsible for this condition. 
+                                Repeated requests for health and ammo, irate demands, 
+                                or even critical comments can fill the command 
+                                console with a clamor of voices and lights. Tempers 
+                                fray, and poor decisions are made. Not getting 
+                                a medkit may put your life in danger, but yelling 
+                                at your commander moves your entire squad closer 
+                                to defeat. </p>
+                            </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_equipment.html b/main/manual/front_equipment.html
new file mode 100644
index 00000000..384b69f9
--- /dev/null
+++ b/main/manual/front_equipment.html
@@ -0,0 +1,217 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectionlink"><a href="frontiersmen.html"></a></span><span class="sectiontext"> 
+            :: </span><span class="sectionlink"><a href="front_marine.html">Marine</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Equipment and Provisions</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_equipment.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> A Frontiersman relies upon his 
+                                <a href="front_commander.html">commander</a>, 
+                                or <a href="structures.html">structures</a> his 
+                                commander has the squad <a href="front_building.html">build</a>, 
+                                for all equipment and provisions. <a href="front_communicating.html">Communication</a> 
+                                between commander and squad is critical. </p>
+                              </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p> <img src="images/images/10_data.gif" width="13" height="10">The 
+                                following are primary marine needs, and how to 
+                                address them.</p>
+                              <blockquote> 
+                                <p><font color="#0B7BEE"><img src="images/tech_10/healthpack.gif" width="15" height="15"> 
+                                  <b>Health:</b></font> watch your <a href="alien_hivesight.html">HUD</a> 
+                                  to monitor your health. Health can only be restored 
+                                  by <a href="items_medkit.html">Medkits</a>, 
+                                  dropped by the commander. Maximum health is 
+                                  100 points.</p>
+                              </blockquote>
+                              <p><font color="#0B7BEE"><img src="images/tech_10/armor2.gif" width="15" height="15"> 
+                                <b>Armor:</b></font> marines begin with 50 points 
+                                of armor. Defensive nano-arrays absorb 30% of 
+                                damage, the rest of which effects your health. 
+                                <a href="front_upgrades_armor.html">Upgrades</a> 
+                                to armor, and the equipment <a href="weapons_ha.html">heavy 
+                                armor</a>, can dramatically improve this protection. 
+                                Armor can only be repaired by a <a href="weapons_welders.html">welder</a>.<br>
+                              </p>
+                              <blockquote> 
+                                <p><font color="#0B7BEE"><img src="images/tech_10/ammopack.gif" width="15" height="15"> 
+                                  <b>Ammo:</b></font> watch your <a href="alien_hivesight.html">HUD</a> 
+                                  to monitor ammo. Ammo can be gotten automatically 
+                                  from an <a href="structures_armory.html">armory</a>, 
+                                  or dropped as <a href="items_ammo.html">ammo 
+                                  packs</a> by the commander (critical when away 
+                                  from base). While an armory upgrading to an 
+                                  <a href="structures_advarmory.html">advanced 
+                                  armory</a>, it will be unable to supply ammo.</p>
+                              </blockquote>
+                              <p><font color="#0B7BEE"><img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                <b>Weapons:</b></font> all new weapons (besides 
+                                starting equipment) must be purchased and <a href="items_main.html">dropped</a> 
+                                by the commander. A marine can carry one primary 
+                                weapon (LMG, shotgun, HMG or grenade launcher), 
+                                a pistol, and knife. He can also carry a welder 
+                                or mines (which replace the pistol), if these 
+                                items are made available. See the <a href="weapons_main.html">weaponry</a> 
+                                section for more information. <br>
+                              </p>
+                              <blockquote> 
+                                <p><font color="#0B7BEE"><img src="images/tech_10/weapon2.gif" width="15" height="15"> 
+                                  <b>Upgrades:</b></font> upgrades to armor and 
+                                  weapon strength, plus the motion tracking ability, 
+                                  can be researched by the commander. See the 
+                                  <a href="front_upgrades.html">upgrades</a> section 
+                                  for more information. </p>
+                              </blockquote>
+                              <p><font color="#0B7BEE"><img src="images/tech_10/heavya.gif" width="15" height="15"> 
+                                <b>Advanced Equipment:</b></font> <a href="weapons_jetpack.html">jet 
+                                packs</a> and <a href="weapons_ha.html">heavy 
+                                armor</a> can be researched by the commander, 
+                                and then purchased for each marine.<br>
+                              </p>
+                              <blockquote> 
+                                <p><font color="#0B7BEE"><img src="images/tech_10/turret.gif" width="15" height="15"> 
+                                  <b>Support Artillery:</b></font> the commander 
+                                  can create <a href="weapons_turrets.html">turrets</a> 
+                                  and <a href="weapons_siege.html">siege turrets</a> 
+                                  to defend a base, or support a forward position. 
+                                  These defenses must be built by marines.</p>
+                              </blockquote> </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_friendlyfire.html b/main/manual/front_friendlyfire.html
new file mode 100644
index 00000000..c5395ab0
--- /dev/null
+++ b/main/manual/front_friendlyfire.html
@@ -0,0 +1,162 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_marine.html">Marine</a></span><span class="sectiontext"> 
+            :: </span><span class="sectionlink"><a href="weapons_main.html">Weaponry</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Friendly Fire</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_friendlyfire.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><i><u>A note on &quot;Friendly Fire&quot;</u></i>: 
+                                the phenomena of &quot;friendly fire&quot; (weapons 
+                                damaging one's own teammates) has been circumvented 
+                                in the 22nd century, by the use of nano-triggers 
+                                and nano-weaponry. Currently the term &quot;FriendlyFire&quot; 
+                                refers to this system. Shrapnel, bullets, and 
+                                blast particles are split-second destabilized 
+                                before striking any Frontiersmen, fragmenting 
+                                harmlessly against their armor. In rare cases 
+                                <a href="front_nanogridlock.html">nano-gridlock</a> 
+                                has been known to interfere with this protection 
+                                for the duration of a battle. Another strange 
+                                gap in the FriendlyFire system: a fired weapon 
+                                still injures the person who activated it. This 
+                                is only a danger with <a href="weapons_grenadelauncher.html">grenades</a> 
+                                and <a href="weapons_mines.html">mines</a> &#133; 
+                                but is very important to note.</p>
+                              </td>
+                              </tr>
+                            </table>
+                          
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_marine.html b/main/manual/front_marine.html
new file mode 100644
index 00000000..cbac3fa0
--- /dev/null
+++ b/main/manual/front_marine.html
@@ -0,0 +1,205 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext">: <font color="#FF6600">The 
+            Marine </font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_marine.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <p>Though the commander's duties are complex and 
+                                vital, they exist only to support his squad. The 
+                                squad are the ones fighting and dying to accomplish 
+                                the mission. By working closely together, the 
+                                commander and squad can achieve victory, even 
+                                against seemingly overwhelming odds.</p>
+                              </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p> <img src="images/images/10_data.gif" width="13" height="10"> 
+                                Frontiersmen must pass rigorous physical and psychological 
+                                exams before they can even enter training. The 
+                                training process, though in many respects similar 
+                                to militaries all over the galaxies and all throughout 
+                                history, is unique in its emphasis on small squads, 
+                                tactical flexibility, and the unprecedented nature 
+                                of the enemy Frontiersmen train to confront. Frontiersmen 
+                                are trained to enter a new environment in squads 
+                                of 5 to 15 individuals, with very little equipment 
+                                or support, and achieve definitive victory against 
+                                a virulent and hostile xenoform foe. See The <a href="front_choosingcommander.html">Hirshelm 
+                                Doctrine of Tactical Flexibility</a> for more 
+                                information on Frontiersmen deployment philosophy.</p>
+                              </td>
+                              </tr>
+                            </table>
+                          
+                        <table width="628" border="1" cellspacing="0" cellpadding="0" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <table width="628" border="0" cellspacing="10" align="center">
+                                <tr valign="middle" align="left"> 
+                                  <td width="208"> 
+                                    <p align="center"><img src="images/tech_10/equipment.gif" width="15" height="15"> 
+                                      <a href="front_equipment.html">Equipment 
+                                      and Provisions</a></p>
+                                  </td>
+                                  <td width="218" colspan="2"> 
+                                    <p align="center"><img src="images/tech_10/communicating.gif" width="15" height="15"> 
+                                      <a href="front_communicating.html">Communicating</a></p>
+                                  </td>
+                                  <td width="156"> 
+                                    <p align="center"><img src="images/tech_10/armory.gif" width="15" height="15"> 
+                                      <a href="front_building.html">Building</a></p>
+                                  </td>
+                                </tr>
+                                <tr valign="middle" align="left"> 
+                                  <td colspan="2"> 
+                                    <p align="center"><img src="images/tech_10/weapons.gif"> 
+                                      <a href="weapons_main.html">Weapons</a></p>
+                                    </td>
+                                  <td colspan="2"> 
+                                    <p align="center"><img src="images/tech_10/weapon3.gif" width="15" height="15"> 
+                                      <a href="front_marineupgrades.html">Upgrades</a></p>
+                                  </td>
+                                </tr>
+                              </table>
+                              
+                            </td>
+                          </tr>
+                        </table>
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_marineupgrades.html b/main/manual/front_marineupgrades.html
new file mode 100644
index 00000000..827af32b
--- /dev/null
+++ b/main/manual/front_marineupgrades.html
@@ -0,0 +1,145 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_marine.html">Marine</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Upgrades</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_upgrades.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <p>The commander can research upgrades to marine 
+                                armor, weapons, and unique modifications like 
+                                motion tracking. For full descriptions, see the 
+                                <a href="front_upgrades.html">upgrade</a> section.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_nanogridlock.html b/main/manual/front_nanogridlock.html
new file mode 100644
index 00000000..578d43a9
--- /dev/null
+++ b/main/manual/front_nanogridlock.html
@@ -0,0 +1,191 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_commander.html">Commander</a></span><span class="sectiontext">: 
+            </span><span class="sectiontext"><font color="#FF6600">Nano-Gridlock</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_gridlock.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> The Kharaa's bacterial network 
+                                attacks the marine <a href="front_commander.html">nano-network</a> 
+                                &#150; interfering with command functions.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                As you will see in the <a href="alien_bacterium.html">Bacterium</a> 
+                                and <a href="alien_gridlock.html">Bacterial Gridlock</a> 
+                                sections, the Kharaa have a kind of network of 
+                                their own &#150; that is constantly struggling with 
+                                ours on a microscopic level. Though they have 
+                                no commander or leader, they can clearly receive 
+                                and send information, coordinate their efforts 
+                                to respond to threats, and organize assaults. 
+                              </p>
+                              <p>The nano-battle between the bacterium and our 
+                                nanotech creates what has been termed &quot;nano-gridlock&quot;. 
+                                It greatly reduces the effectiveness of the commander, 
+                                in the following ways: </p>
+                              <p><b class="sectiontext">Blindness</b><br>
+                                The commander cannot see the Kharaa, or their 
+                                hives or chambers, unless marines are nearby. 
+                                Every Frontiersman has a defensive nano-grid, 
+                                originally used to protect them against enemy 
+                                biological and nanotech attacks. These screens 
+                                clear away some of the gridlock from the local 
+                                command network, allowing commanders to see enemy 
+                                threats before troops on the ground can. Listen 
+                                to your commander &#150; it can save your life. See 
+                                also <a href="front_upgrades_motiontracking.html">motion 
+                                tracking</a> and <a href="items_scanner.html">sensor 
+                                sweep</a> for other methods of detecting the alien 
+                                presence.</p>
+                              <p><b class="sectiontext">Build limits</b><br>
+                                The bacterium interferes with construction, making 
+                                it difficult to create structures, or drop weapons. 
+                                Bases provide &quot;clean&quot; zones, and some 
+                                Frontiersmen towers &#150; like the turret factory 
+                                for instance, have boosted nano-signatures that 
+                                resist meddling. Once built, many structures allow 
+                                other structures and equipment to be created nearby. 
+                                Ammo and medkits can be dropped anywhere &#150; 
+                                due to their simple design and some clever TSA 
+                                hacking.</p>
+                            </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_nanotech.html b/main/manual/front_nanotech.html
new file mode 100644
index 00000000..f50420df
--- /dev/null
+++ b/main/manual/front_nanotech.html
@@ -0,0 +1,218 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext">: <font color="#FF6600">Nanotech</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_nano.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                The cornerstone of scientific advancement and 
+                                technology in the last century has been nanotech: 
+                                the use of molecular machines to manipulate the 
+                                very atoms of matter. This technology has allowed 
+                                humanity to construct objects that are lighter, 
+                                stronger, and more perfectly assembled than ever 
+                                before &#150; one molecule at a time. It also means 
+                                that if we have the &quot;blueprints&quot; of 
+                                any device, we can construct it perfectly, over 
+                                and over. </p>
+                              <p>There are two types of nanotech (also called 
+                                &quot;nanites&quot;) currently in use &#150; replicating, 
+                                and fixed. Fixed nanotech are molecular machines 
+                                that perform one function only, running off an 
+                                internal energy supply, and expiring when their 
+                                work is done. An example would be the medical 
+                                nanos in medkits. They enter the body, locate 
+                                damage, and repair it. Once their energy is used 
+                                up, they &quot;die&quot;, entering the bloodstream 
+                                to be filtered out naturally. Each medkit can 
+                                only repair so much damage (and good thing &#150; 
+                                medical nanites with no energy limit might continue 
+                                to &quot;repair&quot; even after the damage was 
+                                fixed). Replicating nanotech, on the other hand, 
+                                draw energy from their environment (usually a 
+                                single type of matter) and some even have the 
+                                ability to reproduce, creating new versions of 
+                                themselves that can in turn replicate, ad infinitum. 
+                                An example would be the biotech patrolling every 
+                                Frontiersman's body, looking for foreign biotech 
+                                or nanotech attack. These machines convert iron 
+                                in the blood into the minimal charge needed to 
+                                continue functioning. Replicating nanotech is 
+                                extremely dangerous and nearly non-existent today. 
+                                The dangers of a machine that never stops, or 
+                                can reproduce itself into infinity, are too great. 
+                                Early mistakes destroyed entire planets, and created 
+                                &quot;hot zones&quot; that will be off limits 
+                                for many generations. The destructive potential 
+                                of this technology dwarfs anything man has encountered 
+                                or imagined.</p>
+                              <p>For this reason, there are strict limits on the 
+                                use of nanotech in civilian or industrial applications. 
+                                These limits are relaxed slightly on ships, where 
+                                accidents can be contained, or in military situations, 
+                                where it seems any advantage will be exploited 
+                                sooner or later, no matter the risk.</p>
+                              <p>Most ships or bases have carefully contained 
+                                stores of &quot;raw&quot; nano-sludge, a mineral 
+                                rich slop that can serve as the base material 
+                                for any desired object. Nanotech assemblers are 
+                                designed to accept this sludge, and this sludge 
+                                only, as their fuel, and the building blocks for 
+                                nano-construction. This helps limit the dangers 
+                                of nanotech, and also allows the Trans-Govs to 
+                                police its use (by controlling the nano-sludge 
+                                supply). There are few greater crimes than the 
+                                unsanctioned development or use of nanotech.</p>
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr>
+                                  <td width="95%"> 
+                                    <p>Stores of nano-sludge on ships or bases 
+                                      are called Resource Nodes. They are only 
+                                      accessed under supervised conditions, requiring 
+                                      the oversight of a ship's captain. Frontiersmen 
+                                      can tap them using <a href="structures_restower.html">Resource 
+                                      Towers</a>. See <a href="items_main.html">Resources 
+                                      and Equipment</a> for more information. 
+                                    </p>
+                                  </td>
+                                  <td width="5%"><img src="images/images/resourcenode.gif" width="128" height="64"></td>
+                                </tr>
+                              </table>
+                              
+                            </td>
+                              </tr>
+                            </table>
+                          
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_phasetech.html b/main/manual/front_phasetech.html
new file mode 100644
index 00000000..42486764
--- /dev/null
+++ b/main/manual/front_phasetech.html
@@ -0,0 +1,195 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext"> :: Technical: <font color="#FF6600">Phase 
+            Technology</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_phasetech.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                When a marine steps into a phase gate, he becomes 
+                                the anchor for a subject field. A tunnel is then 
+                                carved through dimensional space, guided by the 
+                                observatory, till it finds another phase gate. 
+                                This tunnel is called the &quot;potentiality stream&quot;. 
+                                To put it simply, it makes it more and more likely 
+                                that the subject will actually be in the new location, 
+                                until it becomes so <i>likely</i> the probability 
+                                fulfills itself, and the subject <i>is</i>.</p>
+                              <p><a href="items_distress.html">Distress beacons</a> 
+                                make use of temporary, basically disposable phase 
+                                gates, generated out of the nano-construction 
+                                abilities of a ship or base's <a href="front_commander.html">command 
+                                network</a>. Subject fields are created just long 
+                                enough to send all waiting reinforcements, with 
+                                the <a href="structures_observatory.html">observatory</a> 
+                                pinpointing the location. Some day, technology 
+                                like this may allow for point-specific personal 
+                                phase gate travel to any location within a command 
+                                network. </p>
+                              <p>Phase travel requires energy commiserate with 
+                                the amount of mass being sent and the distance 
+                                it is to cover: first to generate the subject 
+                                field, and then to create the potentiality stream, 
+                                which must be tamed if the destination end is 
+                                to remain fixed. The observatory's job is to bombard 
+                                the stream with spatial information, allowing 
+                                it to latch on to the destination field. Without 
+                                a fixed destination point generating its own subject 
+                                field, the potentiality stream is too difficult 
+                                to control, and will wave about blindly. It will 
+                                as likely smear the marine over a few miles one 
+                                sliver at a time, or deposit them in solid matter 
+                                (which splits the stream &#150; not a pretty sight), 
+                                as transport them to a safe location. Even then, 
+                                on a small bit of pressurized metal surrounded 
+                                by an unforgiving vacuum, &quot;safe&quot; is 
+                                a relative term. </p>
+                              <p>This is basically the same principle employed 
+                                by the huge, galaxy bridging gates that anchor 
+                                trans-system civilization &#150; except they deal in 
+                                thousands of light-years instead of a couple square 
+                                miles. As one expect, the size of the gates, and 
+                                the energy drain, is commensurately larger. Getting 
+                                such huge streams to hold still is a massive feat. 
+                                Human civilization went bankrupt trying to build 
+                                and operate these gates, while competing and fighting 
+                                with one another. <a href="general_tsa.html">The 
+                                Charter</a> has paved the way for economic and 
+                                military stability, and the TSA is dedicated to 
+                                preserving it.<br>
+                              </p>
+                            </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_resources.html b/main/manual/front_resources.html
new file mode 100644
index 00000000..96300e27
--- /dev/null
+++ b/main/manual/front_resources.html
@@ -0,0 +1,173 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersman 
+            Data</a></span> <span class="sectiontext">::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span> <span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_comduties.html">Command 
+            Duties</a></span><span class="sectiontext">: <font color="#FF6600">Resources</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_resources.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p>Frontiersmen and Kharaa are drawing from the 
+                                same resources. Controlling resources (as discussed 
+                                in the next section) is critical. The only way 
+                                to do this is to <a href="structures_restower.html">capture 
+                                resource nodes</a>, and prevent the Kharaa from 
+                                using them. Each resource node connects to a supply 
+                                of raw nano sludge. This sludge is converted into 
+                                resource points, that can then be spent by the 
+                                commander to create every <a href="weapons_main.html">weapon</a>, 
+                                <a href="structures.html">structure</a>, and <a href="items_main.html">provision</a> 
+                                the squad will need, and to purchase all <a href="front_upgrades.html">upgrades 
+                                and research</a>. </p>
+                              <p>Without any towers, resources will trickle slowly 
+                                in through the command network. With every active 
+                                resource tower, this trickles increases. Keeping 
+                                pace with alien growth requires controlling as 
+                                many, or more, resource nodes as they do. Next 
+                                to structures like the <a href="structures_cc.html">command 
+                                console</a> and <a href="structures_infportal.html">infantry 
+                                portal</a>, they are the most vital structures 
+                                to defend.<br>
+                              </p>
+                              </td>
+                              </tr>
+                            </table>
+                          
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td><img src="images/tech_10/healthpack.gif" width="15" height="15"> 
+                              <a href="front_resourcesandequip.html">Resources 
+                              and Equipment</a></td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"></div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_resourcesandequip.html b/main/manual/front_resourcesandequip.html
new file mode 100644
index 00000000..05c5ab7c
--- /dev/null
+++ b/main/manual/front_resourcesandequip.html
@@ -0,0 +1,189 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span> 
+            <span class="sectiontext">::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            ...</a></span> <span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_comduties.html">Command 
+            Duties</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_resources.html">Resources</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Resources and Equipment</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_resourcesandequip.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          <td> 
+                            <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                              <tr> 
+                                
+                            <td> 
+                              <p><b>Summary:</b> the basic equipment for a Frontiersman 
+                                is nano-plate armor, an <a href="weapons_lmg.html">LMG</a> 
+                                and <a href="weapons_pistol.html">pistol</a> (with 
+                                ammo), a <a href="weapons_knife.html">knife</a>, 
+                                and one <a href="structures_cc.html">command console</a> 
+                                and <a href="structures_restower.html">resource 
+                                tower</a> for the squad. Any further equipment 
+                                or upgrades must be purchased, by tapping local 
+                                resources. Resources at any given moment will 
+                                be limited, and depending on the number of resource 
+                                towers, may grow very slowly; so <a href="front_commandstrats.html">command 
+                                strategy</a> should determine what is and isn't 
+                                purchased. </p>
+                              </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p>Details on how to research and purchase new equipment 
+                                can be found in the <a href="structures.html">structure</a>, 
+                                <a href="items_main.html">equipment</a> and <a href="front_upgrades.html">upgrade</a> 
+                                sections. </p>
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                The Frontiersmen are fighting many small to mid-scale 
+                                battles at any given moment. Provisioning all 
+                                of these far flung conflicts would exceed their 
+                                budget, and be a logistical nightmare. The TSA 
+                                can't afford to give <a href="weapons_jetpack.html">jet 
+                                packs</a> to marines crawling through sewers, 
+                                or <a href="weapons_ha.html">heavy armor</a> to 
+                                a squad that needs to move fast and light over 
+                                long distances.<br>
+                                <br>
+                                Ever adaptable, Frontiersmen squads have learned 
+                                to tap into local resources, using a ship or base's 
+                                store of <a href="front_nanotech.html">nano-sludge</a> 
+                                to enhance the command network and outfit marines 
+                                with <a href="weapons_main.html">weapons</a> and 
+                                <a href="front_upgrades.html">upgrades</a>. Not 
+                                only does this allow each squad's commander to 
+                                choose the optimal strategy for each situation, 
+                                it uses the Trans-Govs own resources to pay for 
+                                operations &#150; vastly extending the TSA's budget.</p>
+                              </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_sterkman.html b/main/manual/front_sterkman.html
new file mode 100644
index 00000000..8c00a56e
--- /dev/null
+++ b/main/manual/front_sterkman.html
@@ -0,0 +1,171 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext"> :: Technical: <font color="#FF6600">The 
+            Sterkman Point System</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_sterkman.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                In order to discuss abstracts such as health or 
+                                damage, the TSA and Frontiersmen use Louise Sterkman's 
+                                Tactical Point System. Originally created for 
+                                virtual games and training simulators, the system 
+                                is a mathematical calculation that attempts to 
+                                build a useful reference point for how much damage 
+                                is done to a target, and how much health a marine 
+                                (or in the new system, an alien) possesses relative 
+                                to these weapons. The system assumes each marine 
+                                has 100 'points' of health (given Frontiersmen 
+                                health conditioning, there is little variation 
+                                between marines), and 50 points of armor. All 
+                                weapon stats and alien abilities are calculated 
+                                from this baseline. This can lead to some seemingly 
+                                gruesome statistics, like determining the strength 
+                                of a Skulk's <a href="alien_skulk_inherent.html">bite</a>, 
+                                based on the average number of attacks it takes 
+                                to inflict fatal damage on a marine in field armor. 
+                                This number has been determined, after accumulating 
+                                first-hand data, by the following calculation:<br>
+                                <br>
+                                Average (successful) attacks required = 2.<br>
+                                An un-upgraded marine has 50pts of armor, which 
+                                absorbs 30% of damage.<br>
+                                So, the Skulk is doing at least 71 points of damage 
+                                per attack (30% of 71= 50.4). <br>
+                                Further refinements have led us to assume the 
+                                bite attack is closer to 75 points.</p>
+                              </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_upgrades.html b/main/manual/front_upgrades.html
new file mode 100644
index 00000000..e9949f9a
--- /dev/null
+++ b/main/manual/front_upgrades.html
@@ -0,0 +1,161 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span> <span class="sectiontext">::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span> <span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_comduties.html">Command 
+            Duties</a></span><span class="sectiontext">: <font color="#FF6600">Upgrades</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_upgrades.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          <td> 
+                            <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                              <tr> 
+                                
+                            <td> 
+                              <p><b>Summary:</b> upgrades affect all marines, 
+                                providing permanent improvements to their weapons, 
+                                armor, and sensors. Each upgrade requires a <a href="structures.html">structure</a> 
+                                before it can be researched (see the <a href="techtree.html">tech 
+                                tree</a>).</p>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                There are currently three available upgrades -- 
+                                <a href="front_upgrades_weapon.html">Weapon</a>, 
+                                <a href="front_upgrades_armor.html">Armor</a> 
+                                and <a href="front_upgrades_motiontracking.html">Motion 
+                                Tracking</a>. </p>
+                              </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_upgrades_armor.html b/main/manual/front_upgrades_armor.html
new file mode 100644
index 00000000..b6f3638c
--- /dev/null
+++ b/main/manual/front_upgrades_armor.html
@@ -0,0 +1,304 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span> 
+            <span class="sectiontext">::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_comduties.html">Command 
+            Duties</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_upgrades.html">Upgrades</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Armor Upgrades </font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_upgrades.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> upgrades affect all marines, 
+                                providing permanent improvements to their weapons, 
+                                armor, and sensors. Each upgrade requires a <a href="structures.html">structure</a> 
+                                before it can be researched (see the <a href="techtree.html">tech 
+                                tree</a>).</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                There are currently three available upgrades -- 
+                                <a href="front_upgrades_weapon.html">Weapon</a>, 
+                                <a href="front_upgrades_armor.html">Armor</a> 
+                                and <a href="front_upgrades_motiontracking.html">Motion 
+                                Tracking</a>. </p>
+                              </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+              <tr> 
+                <td align="center" valign="top"> 
+                  <div align="center"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                      <tr> 
+                        <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                      </tr>
+                    </table>
+                    <table width="616" border="0" cellspacing="0" cellpadding="0" align="center">
+                      <tr> 
+                        <td valign="top"> 
+                          <p><b>Armor Upgrades</b><br>
+                            <font color="#0B7BEE">Required structure: <a href="structures_armslab.html">Arms 
+                            Lab</a></font><br>
+                            <img src="images/images/10_data.gif" width="13" height="10">: 
+                            Frontiersmen standard issue nano-armor provides 50 
+                            points of protection, and absorbs 30% of incoming 
+                            damage. For more information on armor, click <a href="front_armor.html">here</a>. 
+                            By researching armor upgrades at the <a href="structures_armslab.html">arms 
+                            lab</a>, the commander can armor boost this protection. 
+                            The following chart shows how each level of upgrade 
+                            improves the hit points and damage absorption for 
+                            regular armor, or <a href="weapons_ha.html">heavy 
+                            armor</a>.</p>
+                          <p>Once researched, these modifications are made automatically 
+                            for all marines.<br>
+                          </p>
+                          <table width="100%" border="1" cellspacing="0" cellpadding="2" bordercolor="#0B7BEE">
+                            <tr bgcolor="#000033"> 
+                              <td colspan="5"><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Weapon 
+                                Upgrades </b></td>
+                            </tr>
+                            <tr> 
+                              <td width="18%"> 
+                                <p><b><font color="#0B7BEE"></font></b></p>
+                              </td>
+                              <td width="21%"> 
+                                <p><b><img src="images/images/10_armor.gif" width="10" height="10"> 
+                                        Armor Pts. Points</b></p>
+                              </td>
+                              <td width="19%"> 
+                                <p><b><img src="images/images/10_percent.gif" width="10" height="10"> 
+                                  % dmg</b></p>
+                              </td>
+                              <td width="22%"> 
+                                <p><b><img src="images/images/10_harmor.gif" width="10" height="10"> 
+                                  HA Points</b></p>
+                              </td>
+                              <td width="20%"> 
+                                <p><b><img src="images/images/10_percent.gif" width="10" height="10"> 
+                                  HA % dmg</b></p>
+                              </td>
+                            </tr>
+                            <tr> 
+                              <td width="18%"> 
+                                <p>No upgrades</p>
+                              </td>
+                              <td width="21%"> 
+                                <p>50</p>
+                              </td>
+                              <td width="19%"> 
+                                <p>30%</p>
+                              </td>
+                              <td width="22%"> 
+                                <p><font color="#0B7BEE">200</font></p>
+                              </td>
+                              <td width="20%"> 
+                                <p><font color="#0B7BEE"><nsvalue=kHeavyArmorAbsorbPercent>95</nsvalue>%</font></p>
+                              </td>
+                            </tr>
+                            <tr> 
+                              <td width="18%"> 
+                                <p>Level 1</p>
+                              </td>
+                              <td width="21%"> 
+                                <p>70</p>
+                              </td>
+                              <td width="19%"> 
+                                <p>40%</p>
+                              </td>
+                              <td width="22%"> 
+                                <p><font color="#0B7BEE">230</font></p>
+                              </td>
+                              <td width="20%"> 
+                                <p><font color="#0B7BEE">95%</font></p>
+                              </td>
+                            </tr>
+                            <tr> 
+                              <td width="18%"> 
+                                <p>Level 2</p>
+                              </td>
+                              <td width="21%"> 
+                                <p>90</p>
+                              </td>
+                              <td width="19%"> 
+                                <p>50%</p>
+                              </td>
+                              <td width="22%"> 
+                                <p><font color="#0B7BEE">260</font></p>
+                              </td>
+                              <td width="20%"> 
+                                <p><font color="#0B7BEE">95%</font></p>
+                              </td>
+                            </tr>
+                            <tr> 
+                              <td width="18%"> 
+                                <p>Level 3</p>
+                              </td>
+                              <td width="21%"> 
+                                <p>110</p>
+                              </td>
+                              <td width="19%"> 
+                                <p>60%</p>
+                              </td>
+                              <td width="22%"> 
+                                <p><font color="#0B7BEE">290</font></p>
+                              </td>
+                              <td width="20%"> 
+                                <p><font color="#0B7BEE">95%</font></p>
+                              </td>
+                            </tr>
+                          </table>
+                        </td>
+                        <td valign="middle"> 
+                          <table border="0" cellspacing="5" cellpadding="5">
+                            <tr> 
+                              <td> 
+                                <p><img src="images/tech/armor1.gif" width="64" height="64"><br>
+                                  <img src="images/tech/armor2.gif" width="64" height="64"><br>
+                                  <img src="images/tech/armor3.gif" width="64" height="64"></p>
+                              </td>
+                            </tr>
+                          </table>
+                        </td>
+                      </tr>
+                    </table>
+                  </div>
+                </td>
+              </tr>
+            </table>
+            <div align="center"></div>
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_upgrades_motiontracking.html b/main/manual/front_upgrades_motiontracking.html
new file mode 100644
index 00000000..07fa0686
--- /dev/null
+++ b/main/manual/front_upgrades_motiontracking.html
@@ -0,0 +1,216 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span> 
+            <span class="sectiontext">::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_comduties.html">Command 
+            Duties</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_upgrades.html">Upgrades</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Motion Tracking</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_upgrades.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> upgrades affect all marines, 
+                                providing permanent improvements to their weapons, 
+                                armor, and sensors. Each upgrade requires a <a href="structures.html">structure</a> 
+                                before it can be researched (see the <a href="techtree.html">tech 
+                                tree</a>).</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                There are currently three available upgrades -- 
+                                <a href="front_upgrades_weapon.html">Weapon</a>, 
+                                <a href="front_upgrades_armor.html">Armor</a> 
+                                and <a href="front_upgrades_motiontracking.html">Motion 
+                                Tracking</a>. </p>
+                              </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                </td>
+                </tr>
+              </table>
+              
+            
+
+            
+            <div align="center"> 
+              <table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
+                <tr>
+                  <td> 
+                    <div align="center"> </div>
+                  </td>
+                </tr>
+				
+              </table>
+              <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <div align="center"> 
+                      <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                        </tr>
+                      </table>
+                      <table width="616" border="0" cellspacing="0" cellpadding="0" align="center">
+                        <tr> 
+                          <td valign="top"> 
+                            <p><b>Motion Tracking</b><br>
+                              <font color="#0B7BEE">Required structure: <a href="structures_observatory.html">Observatory</a></font><br>
+                              <br>
+                              <img src="images/images/10_data.gif" width="13" height="10">: 
+                              If the commander spends the resources to boost its 
+                              detection field, the <a href="structures_observatory.html">observatory</a> 
+                              is capable of detecting all movement in a very large 
+                              radius &#150; which tends to cover the whole of 
+                              a ship or base, with plenty to spare. Marine movements 
+                              are already known, so anything else is painted as 
+                              a hostile. Kharaa locations are shown both on the 
+                              <a href="front_comhud.html">command HUD</a> and 
+                              the <a href="alien_hivesight.html">marine HUD</a>, 
+                              appearing as rings that grow larger or smaller depending 
+                              on how close they are. Knowing the location of the 
+                              aliens lets the marines breath easier &#133; but 
+                              doesn't take the place of constant alertness. If 
+                              the Kharaa stops moving, they cannot be tracked. 
+                              And when they do move, they move fast. If you're 
+                              not looking in their direction, you won't know they're 
+                              coming. Keep your guard up at all times, and listen 
+                              to your commander. </p>
+                          </td>
+                          <td valign="middle"> 
+                            <table border="0" cellspacing="5" cellpadding="5">
+                              <tr> 
+                                <td> 
+                                  <p><img src="images/tech/motiont.gif" width="64" height="64"><br>
+                                    <br>
+                                    <img src="images/images/motionsensor.gif" width="64" height="64"></p>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    </div>
+                  </td>
+                </tr>
+              </table>
+            </div>
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_upgrades_weapon.html b/main/manual/front_upgrades_weapon.html
new file mode 100644
index 00000000..880a9bc8
--- /dev/null
+++ b/main/manual/front_upgrades_weapon.html
@@ -0,0 +1,239 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span> 
+            <span class="sectiontext">::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            ...</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_comduties.html">Command 
+            Duties</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_upgrades.html">Upgrades</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Weapon Upgrades </font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top" align="center"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_upgrades.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> upgrades affect all marines, 
+                                providing permanent improvements to their weapons, 
+                                armor, and sensors. Each upgrade requires a <a href="structures.html">structure</a> 
+                                before it can be researched (see the <a href="techtree.html">tech 
+                                tree</a>).</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                There are currently three available upgrades -- 
+                                <a href="front_upgrades_weapon.html">Weapon</a>, 
+                                <a href="front_upgrades_armor.html">Armor</a> 
+                                and <a href="front_upgrades_motiontracking.html">Motion 
+                                Tracking</a>. </p>
+                              </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            <div align="center">
+<table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <div align="center"> 
+                      <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                        </tr>
+                      </table>
+                      <table width="616" border="0" cellspacing="0" cellpadding="0" align="center">
+                        <tr> 
+                          <td valign="top"> 
+                            <p><b>Weapon Upgrades</b><br>
+                              <font color="#0B7BEE">Required structure: <a href="structures_armslab.html">Arms 
+                              Lab</a></font><br>
+                              <img src="images/images/10_data.gif" width="13" height="10">: 
+                              by researching weapon upgrades at the arms lab, 
+                              the commander can improve the damage of <i>all</i> 
+                              <a href="weapons_main.html">marine weapons</a>. 
+                              The specific modifications for each weapon are different, 
+                              but usually involve refitting them to accept hardened 
+                              or explosive rounds. </p>
+                            <p>Once researched, these modifications are made automatically 
+                              for all marines.</p>
+                            <table width="100%" border="0" cellspacing="0" cellpadding="2" align="center">
+                              <tr bgcolor="#000033"> 
+                                <td colspan="2" height="23"> 
+                                  <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Weapon 
+                                    Upgrades </b></p>
+                                </td>
+                                <td width="37%" height="23">&nbsp;</td>
+                              </tr>
+                              <tr> 
+                                <td width="32%"> 
+                                  <p>Level 1</p>
+                                </td>
+                                <td colspan="2"> 
+                                  <p>all weapons + <b>10%</b></p>
+                                </td>
+                              </tr>
+                              <tr> 
+                                <td width="32%"> 
+                                  <p>Level 2</p>
+                                </td>
+                                <td colspan="2"> 
+                                  <p>all weapons + <b>20%</b></p>
+                                </td>
+                              </tr>
+                              <tr> 
+                                <td width="32%"> 
+                                  <p>Level 3</p>
+                                </td>
+                                <td colspan="2"> 
+                                  <p>all weapons + <b>30%</b></p>
+                                </td>
+                              </tr>
+                            </table>
+                            
+                          </td>
+                          <td valign="top"> 
+                            <table border="0" cellspacing="5" cellpadding="5">
+                              <tr> 
+                                <td> 
+                                  <p><img src="images/tech/weapon1.gif" width="64" height="64"><br>
+                                    <img src="images/tech/weapon2.gif" width="64" height="64"><br>
+                                    <img src="images/tech/weapon3.gif" width="64" height="64"></p>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    </div>
+                  </td>
+                </tr>
+              </table>
+            </div>
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_victory.html b/main/manual/front_victory.html
new file mode 100644
index 00000000..75c053f4
--- /dev/null
+++ b/main/manual/front_victory.html
@@ -0,0 +1,151 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext">: <font color="#FF6600">Victory</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_victory.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="629" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p>As long as a single <a href="alien_hive.html">hive</a> 
+                                is active, the aliens will continue to spawn. 
+                                If all existing hives are destroyed, there is 
+                                still a possibility the surviving Kharaa will 
+                                have enough resources to establish a <a href="alien_newhives.html">new 
+                                one</a>. Therefore, victory is only assured when 
+                                every hive has been destroyed and every alien 
+                                accounted for.</p>
+                              </td>
+                              </tr>
+                            </table>
+                          
+                        <p>&nbsp;</p><div align="center"><img src="images/images/victory_pose.gif" width="250" height="221"></div>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_votingoutcomm.html b/main/manual/front_votingoutcomm.html
new file mode 100644
index 00000000..05487c80
--- /dev/null
+++ b/main/manual/front_votingoutcomm.html
@@ -0,0 +1,167 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span><span class="sectiontext"> 
+            :: </span><span class="sectionlink"><a href="front_commander.html">Commander</a></span><span class="sectiontext"> 
+            :: </span><span class="sectionlink"><a href="front_choosingcommander.html">Choosing 
+            a Commander</a></span><span class="sectiontext">: <font color="#FF6600">Voting 
+            Out a Commander</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_votingoutcom.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> In rare cases of Commander misconduct, 
+                                the squad can &quot;vote&quot; the commander out. 
+                                Inexperience does not qualify as misconduct.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p> <img src="images/images/10_data.gif" width="13" height="10"> 
+                                In very rare cases, Commanders have been known 
+                                to allow the stress of the job, or their own egos 
+                                and psychological problems, to interfere with 
+                                their squad's mission. An inexperienced Commander 
+                                should be given the benefit of the doubt &#150; 
+                                everyone makes mistakes. On the other hand, an 
+                                insane or hostile commander can be removed from 
+                                his seat. This requires a majority vote from all 
+                                combat operatives. Once voted out, a commander 
+                                will be unable to resume command duties for the 
+                                remainder of the battle, and any other battles 
+                                in the same campaign.</p>
+                              </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/front_wepsterkman.html b/main/manual/front_wepsterkman.html
new file mode 100644
index 00000000..52917ee0
--- /dev/null
+++ b/main/manual/front_wepsterkman.html
@@ -0,0 +1,147 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span><span class="sectiontext"> 
+            :: </span><span class="sectionlink"><a href="front_marine.html">Marine</a></span><span class="sectiontext"> 
+            :: </span><span class="sectionlink"><a href="weapons_main.html">Weaponry</a></span><span class="sectiontext">: 
+            <font color="#FF6600">The Sterkman Point System</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_sterkman.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p>All weapon stats are determined using the <a href="front_sterkman.html">Sterkman 
+                                Point System</a>.</p>
+                              </td>
+                              </tr>
+                            </table>
+                          
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/frontiersmen.html b/main/manual/frontiersmen.html
new file mode 100644
index 00000000..62b9f9a6
--- /dev/null
+++ b/main/manual/frontiersmen.html
@@ -0,0 +1,195 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif','images/images/nanotech_s.gif','images/images/commander_s.gif','images/images/marine_s.gif','images/images/victory_s.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><font color="#FF6600">Frontiersmen 
+            Data</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top" align="center"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          <td> 
+                            <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                              <tr> 
+                                
+                            <td> 
+                              <p><b>Frontiersmen squads, like most human groups, 
+                                are at their best when working together under 
+                                the direction of a skilled individual. Frontiersmen 
+                                work towards objectives, not personal reward. 
+                                While physically tough, most of their effectiveness 
+                                comes from weapons, armor, and equipment. One 
+                                marine is at a disadvantage against one alien. 
+                                But a Frontiersman is rarely alone. </b></p>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                        <tr>
+                          
+                      <td>&nbsp; </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            <div align="center">
+<table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <div align="center"> 
+                      <table width="616" border="0" cellspacing="0" cellpadding="0" align="center">
+                        <tr> 
+                          <td valign="top">
+<table width="100%" border="0" cellspacing="10" cellpadding="0">
+                              <tr align="center" valign="middle"> 
+                                <td width="50%"> 
+                                  <p><span class="sectionlink"><a href="front_nanotech.html">Nanotech</a></span><br>
+                                    <img src="images/images/transparent.gif" width="2" height="73" border="0"> 
+                                    <a href="front_nanotech.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('nanotech','','images/images/nanotech_s.gif',1)"><img name="nanotech" border="0" src="images/images/nanotech.gif" width="64" height="64"></a> 
+                                  </p>
+                                  </td>
+                                <td><span class="sectionlink"><a href="front_commander.html">Commander</a></span><br>
+                                  <img src="images/images/transparent.gif" width="2" height="73" border="0"> 
+                                  <a href="front_commander.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('commander','','images/images/commander_s.gif',1)"><img name="commander" border="0" src="images/images/commander.gif" width="64" height="64"></a> 
+                                </td>
+                              </tr>
+                              <tr align="center" valign="middle"> 
+                                <td width="50%">
+                                  <p>&nbsp;</p>
+                                  <p><span class="sectionlink"><a href="front_marine.html">Marines</a></span><br>
+                                    <img src="images/images/transparent.gif" width="2" height="73" border="0"> 
+                                    <a href="front_marine.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('marine','','images/images/marine_s.gif',1)"><img name="marine" border="0" src="images/images/marine.gif" width="64" height="64"></a> 
+                                  </p>
+                                </td>
+                                <td>
+                                  <p>&nbsp;</p>
+                                  <p><span class="sectionlink"><a href="front_victory.html">Victory</a></span><br>
+                                    <img src="images/images/transparent.gif" width="2" height="73" border="0"> 
+                                    <a href="front_victory.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('victory','','images/images/victory_s.gif',1)"><img name="victory" border="0" src="images/images/victory.gif" width="64" height="64"></a> 
+                                  </p>
+                                </td>
+                              </tr>
+                            </table>
+                            
+                          </td>
+                          <td valign="top">&nbsp; </td>
+                        </tr>
+                      </table>
+                    </div>
+                  </td>
+                </tr>
+              </table>
+            </div>
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/general.html b/main/manual/general.html
new file mode 100644
index 00000000..37365bc9
--- /dev/null
+++ b/main/manual/general.html
@@ -0,0 +1,199 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600">General 
+            Data </font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top">
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="476">
+              <tr> 
+                  
+                <td align="center" valign="top"> 
+                  <p>&nbsp;</p>
+                  <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                    <tr> 
+                      <td align="center" valign="top"> 
+                        <table width="100" border="0" cellspacing="0" cellpadding="0">
+                          <tr> 
+                            <td><img src="images/titles/general.gif" width="628" height="25" hspace="25"></td>
+                          </tr>
+                          <tr> 
+                            <td> 
+                              <table width="628" border="1" cellspacing="0" cellpadding="0" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                                <tr> 
+                                  <td> 
+                                    <table border="0" cellspacing="0" cellpadding="3" align="center" width="100%">
+                                      <tr> 
+                                        <td> 
+                                          <p><a href="general_tsa.html">What is 
+                                            the TSA?</a></p>
+                                        </td>
+                                        <td> 
+                                          <div align="center"><a href="general_front.html">What 
+                                            are the Frontiersmen?</a></div>
+                                        </td>
+                                        <td> 
+                                          <div align="right"><a href="general_aliens.html">What 
+                                            are the Kharaa?</a></div>
+                                        </td>
+                                      </tr>
+                                    </table>
+                                    
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                          <tr> 
+                            <td align="center" valign="top"> 
+                              <div align="center"> </div>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+                  <div align="center"> 
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="347">
+                      <tr> 
+                        <td align="center" valign="bottom"> 
+                          <div align="center"> 
+                            <table width="100" border="0" cellspacing="0" cellpadding="0">
+                              <tr> 
+                                <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                              </tr>
+                            </table>
+                            <table width="616" border="0" cellspacing="0" cellpadding="0" align="center">
+                              <tr> 
+                                <td valign="top"> 
+                                  <p><b>Reading Material<br>
+                                    </b>For more detailed information on topics 
+                                    related to the history of the TSA and Frontiersmen, 
+                                    we recommend the Techtrope article &quot;Gather 
+                                    Frontiersmen!&quot; <a href="http://www.natural-selection.org/world_marine_start.html"><br>
+                                    Click here to read</a>.<br>
+                                    For further insight into the war, and the 
+                                    Kharaa, your best bet is the eyewitness accounts 
+                                    and journals of the soldiers who have fought 
+                                    them. <a href="http://www.natural-selection.org/cgi-bin/ikonboard/ikonboard.cgi?s=3db0d16a1ad0ffff;act=ST;f=1;t=3406"><br>
+                                    Click here to read</a>.<br>
+                                  </p>
+                                  </td>
+                                <td valign="top"> 
+                                  <table border="0" cellspacing="5" cellpadding="5">
+                                    <tr> 
+                                      <td> 
+                                        <p><img src="images/images/reading.gif" width="64" height="64"><br>
+                                        </p>
+                                      </td>
+                                    </tr>
+                                  </table>
+                                </td>
+                              </tr>
+                            </table>
+                          </div>
+                        </td>
+                      </tr>
+                    </table>
+                  </div>
+          </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/general_aliens.html b/main/manual/general_aliens.html
new file mode 100644
index 00000000..c43b1917
--- /dev/null
+++ b/main/manual/general_aliens.html
@@ -0,0 +1,238 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="general.html">General 
+            Data</a></span><span class="sectiontext">: <font color="#FF6600">What 
+            are the Kharaa?</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top">
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="476">
+              <tr> 
+                  
+                <td align="center" valign="top"> 
+                  <p>&nbsp;</p>
+                  <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                    <tr> 
+                      <td align="center" valign="top"> 
+                        <table width="100" border="0" cellspacing="0" cellpadding="0">
+                          <tr> 
+                            <td><img src="images/titles/general_aliens.gif" width="628" height="25" hspace="25"></td>
+                          </tr>
+                          <tr> 
+                            <td> 
+                              <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                                <tr> 
+                                  <td> 
+                                    <p>This question still plagues the scientific 
+                                      community. The Kharaa began appearing on 
+                                      ships and bases throughout the Ariadne Arm 
+                                      a decade ago, slaughtering everyone on board. 
+                                      In almost every case the ship then wandered 
+                                      off course, and either destroyed itself 
+                                      by slipping into some gravity well (usually 
+                                      a planet or sun), or was tracked down and 
+                                      destroyed by the owners of the craft. Life 
+                                      support on bases and ships usually fails 
+                                      soon after the Kharaa take over, so even 
+                                      without military response, they don't last 
+                                      very long. But without more detailed knowledge 
+                                      about them, we will never learn how to prevent 
+                                      them from appearing on our ships in the 
+                                      first place. Every successful team returns 
+                                      with valuable information. And our fragile 
+                                      economy cannot afford to loose all those 
+                                      ships and bases. There is also the danger 
+                                      that a fallen ship will automatically dock 
+                                      at a major city-base, or land on an Earth-compatible 
+                                      planet. Lord help us if this happens &#150; 
+                                      we have seen what they do with the limited 
+                                      resources on ships &#133; and can only imagine 
+                                      an entire planet of Kharaa. Thankfully, 
+                                      the Ariadne Arm is a frontier sector, and 
+                                      there are few large habitations. So far, 
+                                      there have been no incidents involving more 
+                                      than a crew of civilians. </p>
+                                    <p>The terminology for the aliens is still 
+                                      being developed. At the moment, we refer 
+                                      to the aliens, and their whole system of 
+                                      bacteria, lifeforms and growths, as the 
+                                      &quot;Kharaa&quot;; and the pre hive-stage 
+                                      presence as the &quot;bacterium&quot;. The 
+                                      first TSA encounter with the aliens occurred 
+                                      aboard the Mongol's Sanjii mining facility. 
+                                      The tattered voice comm logs they extracted 
+                                      from the command network had one word that 
+                                      stood out, used again and again &#150; &quot;Kharaa!&quot; 
+                                      &quot;Kharaa!&quot; Later, it was understood 
+                                      that this means &quot;Watch out!&quot; in 
+                                      Mongolian. By then, it had stuck.</p>
+                                    <p>The relatively obscure field of exo-biology 
+                                      has flourished since the beginning of the 
+                                      conflict, attracting many of the best and 
+                                      brightest from biology, chemistry and even 
+                                      paleontology and sociology. And while we 
+                                      have made huge strides (as you will read 
+                                      in the pages to follow), we are a long way 
+                                      off from a true understanding of these prolific 
+                                      and dangerous creatures. The information 
+                                      in this manual is that small amount we are 
+                                      confident enough in to tell you as you head 
+                                      in to combat. </p>
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="21">
+                          <tr> 
+                            <td align="center" valign="top"> 
+                              <div align="center"> </div>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+                  <div align="center"> 
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="74">
+                      <tr> 
+                        <td align="center" valign="bottom"> 
+                          <div align="center"> 
+                            <table width="100" border="0" cellspacing="0" cellpadding="0">
+                              <tr> 
+                                <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                              </tr>
+                            </table>
+                            <table width="616" border="0" cellspacing="0" cellpadding="0" align="center">
+                              <tr> 
+                                <td valign="top"> 
+                                  <p><b>Reading Material<br>
+                                    </b>For more detailed information on topics 
+                                    related to the history of the TSA and Frontiersmen, 
+                                    we recommend the Techtrope article &quot;Gather 
+                                    Frontiersmen!&quot; <a href="http://www.natural-selection.org/world_marine_start.html"><br>
+                                    Click here to read</a>.<br>
+                                    For further insight into the war, and the 
+                                    Kharaa, your best bet is the eyewitness accounts 
+                                    and journals of the soldiers who have fought 
+                                    them. <a href="http://www.natural-selection.org/cgi-bin/ikonboard/ikonboard.cgi?s=3db0d16a1ad0ffff;act=ST;f=1;t=3406"><br>
+                                    Click here to read</a>.<br>
+                                  </p>
+                                  </td>
+                                <td valign="top"> 
+                                  <table border="0" cellspacing="5" cellpadding="5">
+                                    <tr> 
+                                      <td> 
+                                        <p><img src="images/images/reading.gif" width="64" height="64"><br>
+                                        </p>
+                                      </td>
+                                    </tr>
+                                  </table>
+                                </td>
+                              </tr>
+                            </table>
+                          </div>
+                        </td>
+                      </tr>
+                    </table>
+                  </div>
+          </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/general_front.html b/main/manual/general_front.html
new file mode 100644
index 00000000..ce1da1b5
--- /dev/null
+++ b/main/manual/general_front.html
@@ -0,0 +1,213 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="general.html">General 
+            Data</a></span><span class="sectiontext">: <font color="#FF6600">What are the Frontiersmen?</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top">
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="476">
+              <tr> 
+                  
+                <td align="center" valign="top"> 
+                  <p>&nbsp;</p>
+                  <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                    <tr> 
+                      <td align="center" valign="top"> 
+                        <table width="100" border="0" cellspacing="0" cellpadding="0">
+                          <tr> 
+                            <td><img src="images/titles/general_front.gif" width="628" height="25" hspace="25"></td>
+                          </tr>
+                          <tr> 
+                            <td> 
+                              <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                                <tr> 
+                                  <td> 
+                                    <p>With the failure of corporate and government 
+                                      forces to contain the spread of the Kharaa, 
+                                      the opinion (among those in power) was humanity 
+                                      should just quarantine the entire Ariadne 
+                                      Arm (the string of solar systems where the 
+                                      Kharaa were encountered). The TSA found 
+                                      this intolerable, both for the people trapped 
+                                      in the Arm, and for the future of human 
+                                      expansion (the economic blow of losing all 
+                                      those ships and bases could threaten the 
+                                      tenuous peace of the Charter). The TSA volunteered 
+                                      to mount a response to the Kharaa &#150; effectively 
+                                      creating a new army, with a new mandate. 
+                                      The resolution passed, and the new force 
+                                      was called the Frontiersmen: &quot;standing 
+                                      on the edge of the unknown, between all 
+                                      of humanity and whatever would threaten 
+                                      it.&quot; The Frontiersmen have clearance 
+                                      to travel anywhere, and board any craft. 
+                                      They have rapid-response outposts scattered 
+                                      throughout the Ariadne Arm, with teams of 
+                                      marines ready to deploy. The Frontiersmen 
+                                      initiative is a huge opportunity for the 
+                                      TSA. It's also a risk: if the Frontiersmen 
+                                      fail, on such a public and historic stage, 
+                                      the Ariadne Arm will be signed off as a 
+                                      loss and the trans-govs may have the excuse 
+                                      they've been looking for to &quot;re-organize&quot; 
+                                      TSA leadership &#150; replacing the Admiral and 
+                                      her staff with corporate lackeys. If that 
+                                      happens, dark days are sure to follow.</p>
+                                    </td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="21">
+                          <tr> 
+                            <td align="center" valign="top"> 
+                              <div align="center"> </div>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+                  <div align="center"> 
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="74">
+                      <tr> 
+                        <td align="center" valign="bottom"> 
+                          <div align="center"> 
+                            <table width="100" border="0" cellspacing="0" cellpadding="0">
+                              <tr> 
+                                <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                              </tr>
+                            </table>
+                            <table width="616" border="0" cellspacing="0" cellpadding="0" align="center">
+                              <tr> 
+                                <td valign="top"> 
+                                  <p><b>Reading Material<br>
+                                    </b>For more detailed information on topics 
+                                    related to the history of the TSA and Frontiersmen, 
+                                    we recommend the Techtrope article &quot;Gather 
+                                    Frontiersmen!&quot; <a href="http://www.natural-selection.org/world_marine_start.html"><br>
+                                    Click here to read</a>.<br>
+                                    For further insight into the war, and the 
+                                    Kharaa, your best bet is the eyewitness accounts 
+                                    and journals of the soldiers who have fought 
+                                    them. <a href="http://www.natural-selection.org/cgi-bin/ikonboard/ikonboard.cgi?s=3db0d16a1ad0ffff;act=ST;f=1;t=3406"><br>
+                                    Click here to read</a>.<br>
+                                  </p>
+                                  </td>
+                                <td valign="top"> 
+                                  <table border="0" cellspacing="5" cellpadding="5">
+                                    <tr> 
+                                      <td> 
+                                        <p><img src="images/images/reading.gif" width="64" height="64"><br>
+                                        </p>
+                                      </td>
+                                    </tr>
+                                  </table>
+                                </td>
+                              </tr>
+                            </table>
+                          </div>
+                        </td>
+                      </tr>
+                    </table>
+                  </div>
+          </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/general_tsa.html b/main/manual/general_tsa.html
new file mode 100644
index 00000000..17362119
--- /dev/null
+++ b/main/manual/general_tsa.html
@@ -0,0 +1,219 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="general.html">General 
+            Data</a></span><span class="sectiontext">: <font color="#FF6600">What 
+            is the TSA?</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top">
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="476">
+              <tr> 
+                  
+                <td align="center" valign="top"> 
+                  <p>&nbsp;</p>
+                  <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                    <tr> 
+                      <td align="center" valign="top"> 
+                        <table width="100" border="0" cellspacing="0" cellpadding="0">
+                          <tr> 
+                            <td><img src="images/titles/general_tsa.gif" width="628" height="25" hspace="25"></td>
+                          </tr>
+                          <tr> 
+                            <td> 
+                              <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                                <tr> 
+                                  <td> 
+                                    <p>The Trans-System Authority is an independent 
+                                      body funded by 37 trans-gov powers (governments 
+                                      or super-corporations that own and operate 
+                                      phase gates between solar systems), and 
+                                      given jurisdiction over trans-system affairs: 
+                                      as defined by a document called The Charter. 
+                                      The Charter is a comprehensive document, 
+                                      covering disarmament, fair trade agreements 
+                                      (most importantly, sharing phase gates), 
+                                      and certain basic civil rights that had 
+                                      become blurred (or tossed aside) during 
+                                      the dark times of the Expansion.</p>
+                                    <p>To enforce The Charter, the Trans-Govs 
+                                      chose Admiral Rathine Studaber, former head 
+                                      of the revived British Secret Service, and 
+                                      gave her a budget for a small military force 
+                                      &#150; which proved hard pressed to stop those 
+                                      same greedy and quarrelsome powers from 
+                                      violating almost every agreement they had 
+                                      made: often concerning their own citizens 
+                                      (termed &quot;population abuse&quot;). It 
+                                      was not very long before the TSA had to 
+                                      resort to military police actions. Its surprising 
+                                      success against the vastly more powerful 
+                                      and far better equipped Trans-Govs earned 
+                                      it the secret hatred of the same powers 
+                                      that created it. They have long been angling 
+                                      to curtail the TSA's powers, slash its funding, 
+                                      or even dissolve it entirely and replace 
+                                      it with something they can control. So far, 
+                                      their distrust of each other, and intense 
+                                      media scrutiny, has kept the TSA alive. 
+                                      The TSA sees itself as the only sane player 
+                                      in trans-system politics, and has become 
+                                      an unappreciated (and often vilified) champion 
+                                      of human rights.</p>
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                          <tr> 
+                            <td align="center" valign="top"> 
+                              <div align="center"> </div>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+                  <div align="center"> 
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="74">
+                      <tr> 
+                        <td align="center" valign="bottom"> 
+                          <div align="center"> 
+                            <table width="100" border="0" cellspacing="0" cellpadding="0">
+                              <tr> 
+                                <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                              </tr>
+                            </table>
+                            <table width="616" border="0" cellspacing="0" cellpadding="0" align="center">
+                              <tr> 
+                                <td valign="top"> 
+                                  <p><b>Reading Material<br>
+                                    </b>For more detailed information on topics 
+                                    related to the history of the TSA and Frontiersmen, 
+                                    we recommend the Techtrope article &quot;Gather 
+                                    Frontiersmen!&quot; <a href="http://www.natural-selection.org/world_marine_start.html"><br>
+                                    Click here to read</a>.<br>
+                                    For further insight into the war, and the 
+                                    Kharaa, your best bet is the eyewitness accounts 
+                                    and journals of the soldiers who have fought 
+                                    them. <a href="http://www.natural-selection.org/cgi-bin/ikonboard/ikonboard.cgi?s=3db0d16a1ad0ffff;act=ST;f=1;t=3406"><br>
+                                    Click here to read</a>.<br>
+                                  </p>
+                                  </td>
+                                <td valign="top"> 
+                                  <table border="0" cellspacing="5" cellpadding="5">
+                                    <tr> 
+                                      <td> 
+                                        <p><img src="images/images/reading.gif" width="64" height="64"><br>
+                                        </p>
+                                      </td>
+                                    </tr>
+                                  </table>
+                                </td>
+                              </tr>
+                            </table>
+                          </div>
+                        </td>
+                      </tr>
+                    </table>
+                  </div>
+          </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/images/design/background.gif b/main/manual/images/design/background.gif
new file mode 100644
index 00000000..db9cdce9
Binary files /dev/null and b/main/manual/images/design/background.gif differ
diff --git a/main/manual/images/design/background_n.gif b/main/manual/images/design/background_n.gif
new file mode 100644
index 00000000..a394a078
Binary files /dev/null and b/main/manual/images/design/background_n.gif differ
diff --git a/main/manual/images/design/buttons_alien_off.gif b/main/manual/images/design/buttons_alien_off.gif
new file mode 100644
index 00000000..363cf645
Binary files /dev/null and b/main/manual/images/design/buttons_alien_off.gif differ
diff --git a/main/manual/images/design/buttons_alien_on.gif b/main/manual/images/design/buttons_alien_on.gif
new file mode 100644
index 00000000..0a558708
Binary files /dev/null and b/main/manual/images/design/buttons_alien_on.gif differ
diff --git a/main/manual/images/design/buttons_front_off.gif b/main/manual/images/design/buttons_front_off.gif
new file mode 100644
index 00000000..72d852d7
Binary files /dev/null and b/main/manual/images/design/buttons_front_off.gif differ
diff --git a/main/manual/images/design/buttons_front_on.gif b/main/manual/images/design/buttons_front_on.gif
new file mode 100644
index 00000000..c4d0de4d
Binary files /dev/null and b/main/manual/images/design/buttons_front_on.gif differ
diff --git a/main/manual/images/design/buttons_gen_off.gif b/main/manual/images/design/buttons_gen_off.gif
new file mode 100644
index 00000000..fea76523
Binary files /dev/null and b/main/manual/images/design/buttons_gen_off.gif differ
diff --git a/main/manual/images/design/buttons_gen_on.gif b/main/manual/images/design/buttons_gen_on.gif
new file mode 100644
index 00000000..82c81b0e
Binary files /dev/null and b/main/manual/images/design/buttons_gen_on.gif differ
diff --git a/main/manual/images/design/buttons_nav_off.gif b/main/manual/images/design/buttons_nav_off.gif
new file mode 100644
index 00000000..05eec143
Binary files /dev/null and b/main/manual/images/design/buttons_nav_off.gif differ
diff --git a/main/manual/images/design/buttons_nav_on.gif b/main/manual/images/design/buttons_nav_on.gif
new file mode 100644
index 00000000..130caa0a
Binary files /dev/null and b/main/manual/images/design/buttons_nav_on.gif differ
diff --git a/main/manual/images/design/divider.gif b/main/manual/images/design/divider.gif
new file mode 100644
index 00000000..9e29de95
Binary files /dev/null and b/main/manual/images/design/divider.gif differ
diff --git a/main/manual/images/design/info_bar.gif b/main/manual/images/design/info_bar.gif
new file mode 100644
index 00000000..532b250d
Binary files /dev/null and b/main/manual/images/design/info_bar.gif differ
diff --git a/main/manual/images/design/link.gif b/main/manual/images/design/link.gif
new file mode 100644
index 00000000..fb20da2f
Binary files /dev/null and b/main/manual/images/design/link.gif differ
diff --git a/main/manual/images/design/page_background.gif b/main/manual/images/design/page_background.gif
new file mode 100644
index 00000000..c9d5f6c3
Binary files /dev/null and b/main/manual/images/design/page_background.gif differ
diff --git a/main/manual/images/design/red/background.gif b/main/manual/images/design/red/background.gif
new file mode 100644
index 00000000..033cce58
Binary files /dev/null and b/main/manual/images/design/red/background.gif differ
diff --git a/main/manual/images/design/red/background_n.gif b/main/manual/images/design/red/background_n.gif
new file mode 100644
index 00000000..2c89e466
Binary files /dev/null and b/main/manual/images/design/red/background_n.gif differ
diff --git a/main/manual/images/design/red/surround_e.gif b/main/manual/images/design/red/surround_e.gif
new file mode 100644
index 00000000..655699f1
Binary files /dev/null and b/main/manual/images/design/red/surround_e.gif differ
diff --git a/main/manual/images/design/red/surround_s.gif b/main/manual/images/design/red/surround_s.gif
new file mode 100644
index 00000000..77dbe5d6
Binary files /dev/null and b/main/manual/images/design/red/surround_s.gif differ
diff --git a/main/manual/images/design/red/surround_title_animated.gif b/main/manual/images/design/red/surround_title_animated.gif
new file mode 100644
index 00000000..9704c084
Binary files /dev/null and b/main/manual/images/design/red/surround_title_animated.gif differ
diff --git a/main/manual/images/design/red/surround_title_c.gif b/main/manual/images/design/red/surround_title_c.gif
new file mode 100644
index 00000000..433a9d34
Binary files /dev/null and b/main/manual/images/design/red/surround_title_c.gif differ
diff --git a/main/manual/images/design/red/surround_title_s.gif b/main/manual/images/design/red/surround_title_s.gif
new file mode 100644
index 00000000..582b8c29
Binary files /dev/null and b/main/manual/images/design/red/surround_title_s.gif differ
diff --git a/main/manual/images/design/red/surround_title_w.gif b/main/manual/images/design/red/surround_title_w.gif
new file mode 100644
index 00000000..45c91ea2
Binary files /dev/null and b/main/manual/images/design/red/surround_title_w.gif differ
diff --git a/main/manual/images/design/red/surround_w.gif b/main/manual/images/design/red/surround_w.gif
new file mode 100644
index 00000000..8e8c6186
Binary files /dev/null and b/main/manual/images/design/red/surround_w.gif differ
diff --git a/main/manual/images/design/spacer.gif b/main/manual/images/design/spacer.gif
new file mode 100644
index 00000000..46a2cf08
Binary files /dev/null and b/main/manual/images/design/spacer.gif differ
diff --git a/main/manual/images/design/surround_e.gif b/main/manual/images/design/surround_e.gif
new file mode 100644
index 00000000..0467b465
Binary files /dev/null and b/main/manual/images/design/surround_e.gif differ
diff --git a/main/manual/images/design/surround_n.gif b/main/manual/images/design/surround_n.gif
new file mode 100644
index 00000000..1437e1fd
Binary files /dev/null and b/main/manual/images/design/surround_n.gif differ
diff --git a/main/manual/images/design/surround_ne1.gif b/main/manual/images/design/surround_ne1.gif
new file mode 100644
index 00000000..0ba37fbc
Binary files /dev/null and b/main/manual/images/design/surround_ne1.gif differ
diff --git a/main/manual/images/design/surround_power.gif b/main/manual/images/design/surround_power.gif
new file mode 100644
index 00000000..757805cf
Binary files /dev/null and b/main/manual/images/design/surround_power.gif differ
diff --git a/main/manual/images/design/surround_power_anim.gif b/main/manual/images/design/surround_power_anim.gif
new file mode 100644
index 00000000..2cdc6e53
Binary files /dev/null and b/main/manual/images/design/surround_power_anim.gif differ
diff --git a/main/manual/images/design/surround_s.gif b/main/manual/images/design/surround_s.gif
new file mode 100644
index 00000000..ffb0f8d2
Binary files /dev/null and b/main/manual/images/design/surround_s.gif differ
diff --git a/main/manual/images/design/surround_title_animated.gif b/main/manual/images/design/surround_title_animated.gif
new file mode 100644
index 00000000..5f9b8722
Binary files /dev/null and b/main/manual/images/design/surround_title_animated.gif differ
diff --git a/main/manual/images/design/surround_title_c.gif b/main/manual/images/design/surround_title_c.gif
new file mode 100644
index 00000000..be9d8a84
Binary files /dev/null and b/main/manual/images/design/surround_title_c.gif differ
diff --git a/main/manual/images/design/surround_title_e.gif b/main/manual/images/design/surround_title_e.gif
new file mode 100644
index 00000000..dcbcbf95
Binary files /dev/null and b/main/manual/images/design/surround_title_e.gif differ
diff --git a/main/manual/images/design/surround_title_initial.gif b/main/manual/images/design/surround_title_initial.gif
new file mode 100644
index 00000000..bee960ea
Binary files /dev/null and b/main/manual/images/design/surround_title_initial.gif differ
diff --git a/main/manual/images/design/surround_title_s.gif b/main/manual/images/design/surround_title_s.gif
new file mode 100644
index 00000000..f3076359
Binary files /dev/null and b/main/manual/images/design/surround_title_s.gif differ
diff --git a/main/manual/images/design/surround_title_w.gif b/main/manual/images/design/surround_title_w.gif
new file mode 100644
index 00000000..e43b72e9
Binary files /dev/null and b/main/manual/images/design/surround_title_w.gif differ
diff --git a/main/manual/images/design/surround_w.gif b/main/manual/images/design/surround_w.gif
new file mode 100644
index 00000000..d65f2b57
Binary files /dev/null and b/main/manual/images/design/surround_w.gif differ
diff --git a/main/manual/images/evolutions/adrenaline.gif b/main/manual/images/evolutions/adrenaline.gif
new file mode 100644
index 00000000..8d42b6be
Binary files /dev/null and b/main/manual/images/evolutions/adrenaline.gif differ
diff --git a/main/manual/images/evolutions/advhivesight.gif b/main/manual/images/evolutions/advhivesight.gif
new file mode 100644
index 00000000..2859f51f
Binary files /dev/null and b/main/manual/images/evolutions/advhivesight.gif differ
diff --git a/main/manual/images/evolutions/carapace.gif b/main/manual/images/evolutions/carapace.gif
new file mode 100644
index 00000000..034a8b7e
Binary files /dev/null and b/main/manual/images/evolutions/carapace.gif differ
diff --git a/main/manual/images/evolutions/celerity.gif b/main/manual/images/evolutions/celerity.gif
new file mode 100644
index 00000000..60d77f96
Binary files /dev/null and b/main/manual/images/evolutions/celerity.gif differ
diff --git a/main/manual/images/evolutions/cloaking.gif b/main/manual/images/evolutions/cloaking.gif
new file mode 100644
index 00000000..0f5a8481
Binary files /dev/null and b/main/manual/images/evolutions/cloaking.gif differ
diff --git a/main/manual/images/evolutions/d.gif b/main/manual/images/evolutions/d.gif
new file mode 100644
index 00000000..0b769179
Binary files /dev/null and b/main/manual/images/evolutions/d.gif differ
diff --git a/main/manual/images/evolutions/m.gif b/main/manual/images/evolutions/m.gif
new file mode 100644
index 00000000..9bc3d057
Binary files /dev/null and b/main/manual/images/evolutions/m.gif differ
diff --git a/main/manual/images/evolutions/redemption.gif b/main/manual/images/evolutions/redemption.gif
new file mode 100644
index 00000000..4bb86727
Binary files /dev/null and b/main/manual/images/evolutions/redemption.gif differ
diff --git a/main/manual/images/evolutions/regeneration.gif b/main/manual/images/evolutions/regeneration.gif
new file mode 100644
index 00000000..99582bea
Binary files /dev/null and b/main/manual/images/evolutions/regeneration.gif differ
diff --git a/main/manual/images/evolutions/s.gif b/main/manual/images/evolutions/s.gif
new file mode 100644
index 00000000..0a544641
Binary files /dev/null and b/main/manual/images/evolutions/s.gif differ
diff --git a/main/manual/images/evolutions/scentoffear.gif b/main/manual/images/evolutions/scentoffear.gif
new file mode 100644
index 00000000..2850449a
Binary files /dev/null and b/main/manual/images/evolutions/scentoffear.gif differ
diff --git a/main/manual/images/evolutions/silence.gif b/main/manual/images/evolutions/silence.gif
new file mode 100644
index 00000000..7cfa6c2d
Binary files /dev/null and b/main/manual/images/evolutions/silence.gif differ
diff --git a/main/manual/images/images/10_armor.gif b/main/manual/images/images/10_armor.gif
new file mode 100644
index 00000000..3f70cbcc
Binary files /dev/null and b/main/manual/images/images/10_armor.gif differ
diff --git a/main/manual/images/images/10_clip.gif b/main/manual/images/images/10_clip.gif
new file mode 100644
index 00000000..b19df5a2
Binary files /dev/null and b/main/manual/images/images/10_clip.gif differ
diff --git a/main/manual/images/images/10_cost.gif b/main/manual/images/images/10_cost.gif
new file mode 100644
index 00000000..086feee4
Binary files /dev/null and b/main/manual/images/images/10_cost.gif differ
diff --git a/main/manual/images/images/10_damage.gif b/main/manual/images/images/10_damage.gif
new file mode 100644
index 00000000..e224c6e4
Binary files /dev/null and b/main/manual/images/images/10_damage.gif differ
diff --git a/main/manual/images/images/10_data.gif b/main/manual/images/images/10_data.gif
new file mode 100644
index 00000000..58b52728
Binary files /dev/null and b/main/manual/images/images/10_data.gif differ
diff --git a/main/manual/images/images/10_datasmall.gif b/main/manual/images/images/10_datasmall.gif
new file mode 100644
index 00000000..b2f97c4a
Binary files /dev/null and b/main/manual/images/images/10_datasmall.gif differ
diff --git a/main/manual/images/images/10_harmor.gif b/main/manual/images/images/10_harmor.gif
new file mode 100644
index 00000000..7cd03a30
Binary files /dev/null and b/main/manual/images/images/10_harmor.gif differ
diff --git a/main/manual/images/images/10_hud.gif b/main/manual/images/images/10_hud.gif
new file mode 100644
index 00000000..d7b42dbd
Binary files /dev/null and b/main/manual/images/images/10_hud.gif differ
diff --git a/main/manual/images/images/10_newequip.gif b/main/manual/images/images/10_newequip.gif
new file mode 100644
index 00000000..545d4c63
Binary files /dev/null and b/main/manual/images/images/10_newequip.gif differ
diff --git a/main/manual/images/images/10_newstruct.gif b/main/manual/images/images/10_newstruct.gif
new file mode 100644
index 00000000..de5ad2e3
Binary files /dev/null and b/main/manual/images/images/10_newstruct.gif differ
diff --git a/main/manual/images/images/10_note.gif b/main/manual/images/images/10_note.gif
new file mode 100644
index 00000000..90f0e996
Binary files /dev/null and b/main/manual/images/images/10_note.gif differ
diff --git a/main/manual/images/images/10_percent.gif b/main/manual/images/images/10_percent.gif
new file mode 100644
index 00000000..99359a4f
Binary files /dev/null and b/main/manual/images/images/10_percent.gif differ
diff --git a/main/manual/images/images/10_range.gif b/main/manual/images/images/10_range.gif
new file mode 100644
index 00000000..621a92d8
Binary files /dev/null and b/main/manual/images/images/10_range.gif differ
diff --git a/main/manual/images/images/10_time.gif b/main/manual/images/images/10_time.gif
new file mode 100644
index 00000000..373563de
Binary files /dev/null and b/main/manual/images/images/10_time.gif differ
diff --git a/main/manual/images/images/10red_0.gif b/main/manual/images/images/10red_0.gif
new file mode 100644
index 00000000..cea372ee
Binary files /dev/null and b/main/manual/images/images/10red_0.gif differ
diff --git a/main/manual/images/images/10red_1.gif b/main/manual/images/images/10red_1.gif
new file mode 100644
index 00000000..de66abdc
Binary files /dev/null and b/main/manual/images/images/10red_1.gif differ
diff --git a/main/manual/images/images/10red_2.gif b/main/manual/images/images/10red_2.gif
new file mode 100644
index 00000000..2de1fcae
Binary files /dev/null and b/main/manual/images/images/10red_2.gif differ
diff --git a/main/manual/images/images/10red_3.gif b/main/manual/images/images/10red_3.gif
new file mode 100644
index 00000000..4522e6ff
Binary files /dev/null and b/main/manual/images/images/10red_3.gif differ
diff --git a/main/manual/images/images/10red_4.gif b/main/manual/images/images/10red_4.gif
new file mode 100644
index 00000000..6023296b
Binary files /dev/null and b/main/manual/images/images/10red_4.gif differ
diff --git a/main/manual/images/images/10red_armor.gif b/main/manual/images/images/10red_armor.gif
new file mode 100644
index 00000000..de11af62
Binary files /dev/null and b/main/manual/images/images/10red_armor.gif differ
diff --git a/main/manual/images/images/10red_bar.gif b/main/manual/images/images/10red_bar.gif
new file mode 100644
index 00000000..0f7fc173
Binary files /dev/null and b/main/manual/images/images/10red_bar.gif differ
diff --git a/main/manual/images/images/10red_bar2.gif b/main/manual/images/images/10red_bar2.gif
new file mode 100644
index 00000000..e36c1527
Binary files /dev/null and b/main/manual/images/images/10red_bar2.gif differ
diff --git a/main/manual/images/images/10red_c.gif b/main/manual/images/images/10red_c.gif
new file mode 100644
index 00000000..be7a388e
Binary files /dev/null and b/main/manual/images/images/10red_c.gif differ
diff --git a/main/manual/images/images/10red_data.gif b/main/manual/images/images/10red_data.gif
new file mode 100644
index 00000000..2337abb7
Binary files /dev/null and b/main/manual/images/images/10red_data.gif differ
diff --git a/main/manual/images/images/10red_h.gif b/main/manual/images/images/10red_h.gif
new file mode 100644
index 00000000..7ac8bda2
Binary files /dev/null and b/main/manual/images/images/10red_h.gif differ
diff --git a/main/manual/images/images/10red_health.gif b/main/manual/images/images/10red_health.gif
new file mode 100644
index 00000000..a8463d82
Binary files /dev/null and b/main/manual/images/images/10red_health.gif differ
diff --git a/main/manual/images/images/10red_hud.gif b/main/manual/images/images/10red_hud.gif
new file mode 100644
index 00000000..c04e4af8
Binary files /dev/null and b/main/manual/images/images/10red_hud.gif differ
diff --git a/main/manual/images/images/10red_null.gif b/main/manual/images/images/10red_null.gif
new file mode 100644
index 00000000..34e921c5
Binary files /dev/null and b/main/manual/images/images/10red_null.gif differ
diff --git a/main/manual/images/images/10red_o.gif b/main/manual/images/images/10red_o.gif
new file mode 100644
index 00000000..2827aed3
Binary files /dev/null and b/main/manual/images/images/10red_o.gif differ
diff --git a/main/manual/images/images/10red_range.gif b/main/manual/images/images/10red_range.gif
new file mode 100644
index 00000000..c30363d9
Binary files /dev/null and b/main/manual/images/images/10red_range.gif differ
diff --git a/main/manual/images/images/10red_s.gif b/main/manual/images/images/10red_s.gif
new file mode 100644
index 00000000..c93f0165
Binary files /dev/null and b/main/manual/images/images/10red_s.gif differ
diff --git a/main/manual/images/images/advanced armory.gif b/main/manual/images/images/advanced armory.gif
new file mode 100644
index 00000000..96a19cdd
Binary files /dev/null and b/main/manual/images/images/advanced armory.gif differ
diff --git a/main/manual/images/images/alien_bacterium.gif b/main/manual/images/images/alien_bacterium.gif
new file mode 100644
index 00000000..86910074
Binary files /dev/null and b/main/manual/images/images/alien_bacterium.gif differ
diff --git a/main/manual/images/images/alien_bacterium_s.gif b/main/manual/images/images/alien_bacterium_s.gif
new file mode 100644
index 00000000..b9684e08
Binary files /dev/null and b/main/manual/images/images/alien_bacterium_s.gif differ
diff --git a/main/manual/images/images/alien_chambers.gif b/main/manual/images/images/alien_chambers.gif
new file mode 100644
index 00000000..e6c5c0f4
Binary files /dev/null and b/main/manual/images/images/alien_chambers.gif differ
diff --git a/main/manual/images/images/alien_chambers_s.gif b/main/manual/images/images/alien_chambers_s.gif
new file mode 100644
index 00000000..22445196
Binary files /dev/null and b/main/manual/images/images/alien_chambers_s.gif differ
diff --git a/main/manual/images/images/alien_hive.gif b/main/manual/images/images/alien_hive.gif
new file mode 100644
index 00000000..106f728d
Binary files /dev/null and b/main/manual/images/images/alien_hive.gif differ
diff --git a/main/manual/images/images/alien_hive_s.gif b/main/manual/images/images/alien_hive_s.gif
new file mode 100644
index 00000000..45c86199
Binary files /dev/null and b/main/manual/images/images/alien_hive_s.gif differ
diff --git a/main/manual/images/images/alien_resources.gif b/main/manual/images/images/alien_resources.gif
new file mode 100644
index 00000000..77aa8edc
Binary files /dev/null and b/main/manual/images/images/alien_resources.gif differ
diff --git a/main/manual/images/images/alien_resources_s.gif b/main/manual/images/images/alien_resources_s.gif
new file mode 100644
index 00000000..70a37d88
Binary files /dev/null and b/main/manual/images/images/alien_resources_s.gif differ
diff --git a/main/manual/images/images/alien_species.gif b/main/manual/images/images/alien_species.gif
new file mode 100644
index 00000000..c0afe9a6
Binary files /dev/null and b/main/manual/images/images/alien_species.gif differ
diff --git a/main/manual/images/images/alien_species_s.gif b/main/manual/images/images/alien_species_s.gif
new file mode 100644
index 00000000..5713ab61
Binary files /dev/null and b/main/manual/images/images/alien_species_s.gif differ
diff --git a/main/manual/images/images/alien_victory.gif b/main/manual/images/images/alien_victory.gif
new file mode 100644
index 00000000..21aada58
Binary files /dev/null and b/main/manual/images/images/alien_victory.gif differ
diff --git a/main/manual/images/images/alien_victory_s.gif b/main/manual/images/images/alien_victory_s.gif
new file mode 100644
index 00000000..5fc3fd5b
Binary files /dev/null and b/main/manual/images/images/alien_victory_s.gif differ
diff --git a/main/manual/images/images/armory.gif b/main/manual/images/images/armory.gif
new file mode 100644
index 00000000..ae71f40f
Binary files /dev/null and b/main/manual/images/images/armory.gif differ
diff --git a/main/manual/images/images/blip_blue.gif b/main/manual/images/images/blip_blue.gif
new file mode 100644
index 00000000..72c9bddf
Binary files /dev/null and b/main/manual/images/images/blip_blue.gif differ
diff --git a/main/manual/images/images/blip_green.gif b/main/manual/images/images/blip_green.gif
new file mode 100644
index 00000000..b03bb20a
Binary files /dev/null and b/main/manual/images/images/blip_green.gif differ
diff --git a/main/manual/images/images/blip_red.gif b/main/manual/images/images/blip_red.gif
new file mode 100644
index 00000000..126005dd
Binary files /dev/null and b/main/manual/images/images/blip_red.gif differ
diff --git a/main/manual/images/images/blip_white.gif b/main/manual/images/images/blip_white.gif
new file mode 100644
index 00000000..310b6208
Binary files /dev/null and b/main/manual/images/images/blip_white.gif differ
diff --git a/main/manual/images/images/chamber_d.gif b/main/manual/images/images/chamber_d.gif
new file mode 100644
index 00000000..59ae6ba3
Binary files /dev/null and b/main/manual/images/images/chamber_d.gif differ
diff --git a/main/manual/images/images/chamber_m.gif b/main/manual/images/images/chamber_m.gif
new file mode 100644
index 00000000..aeb205a3
Binary files /dev/null and b/main/manual/images/images/chamber_m.gif differ
diff --git a/main/manual/images/images/chamber_o.gif b/main/manual/images/images/chamber_o.gif
new file mode 100644
index 00000000..c3b0459d
Binary files /dev/null and b/main/manual/images/images/chamber_o.gif differ
diff --git a/main/manual/images/images/chamber_s.gif b/main/manual/images/images/chamber_s.gif
new file mode 100644
index 00000000..3a42bea8
Binary files /dev/null and b/main/manual/images/images/chamber_s.gif differ
diff --git a/main/manual/images/images/command console.gif b/main/manual/images/images/command console.gif
new file mode 100644
index 00000000..85e36fe2
Binary files /dev/null and b/main/manual/images/images/command console.gif differ
diff --git a/main/manual/images/images/commander.gif b/main/manual/images/images/commander.gif
new file mode 100644
index 00000000..b6bf82c6
Binary files /dev/null and b/main/manual/images/images/commander.gif differ
diff --git a/main/manual/images/images/commander_s.gif b/main/manual/images/images/commander_s.gif
new file mode 100644
index 00000000..554495f6
Binary files /dev/null and b/main/manual/images/images/commander_s.gif differ
diff --git a/main/manual/images/images/commanderhud.jpg b/main/manual/images/images/commanderhud.jpg
new file mode 100644
index 00000000..ed5b3ba6
Binary files /dev/null and b/main/manual/images/images/commanderhud.jpg differ
diff --git a/main/manual/images/images/commenu.gif b/main/manual/images/images/commenu.gif
new file mode 100644
index 00000000..d4c61da9
Binary files /dev/null and b/main/manual/images/images/commenu.gif differ
diff --git a/main/manual/images/images/droppables.gif b/main/manual/images/images/droppables.gif
new file mode 100644
index 00000000..91841208
Binary files /dev/null and b/main/manual/images/images/droppables.gif differ
diff --git a/main/manual/images/images/droppables_s.gif b/main/manual/images/images/droppables_s.gif
new file mode 100644
index 00000000..aa6c56f2
Binary files /dev/null and b/main/manual/images/images/droppables_s.gif differ
diff --git a/main/manual/images/images/fade.gif b/main/manual/images/images/fade.gif
new file mode 100644
index 00000000..95ba0a40
Binary files /dev/null and b/main/manual/images/images/fade.gif differ
diff --git a/main/manual/images/images/gl.gif b/main/manual/images/images/gl.gif
new file mode 100644
index 00000000..9e615663
Binary files /dev/null and b/main/manual/images/images/gl.gif differ
diff --git a/main/manual/images/images/gorge.gif b/main/manual/images/images/gorge.gif
new file mode 100644
index 00000000..c81ee06a
Binary files /dev/null and b/main/manual/images/images/gorge.gif differ
diff --git a/main/manual/images/images/ha.gif b/main/manual/images/images/ha.gif
new file mode 100644
index 00000000..633b13dd
Binary files /dev/null and b/main/manual/images/images/ha.gif differ
diff --git a/main/manual/images/images/hive.gif b/main/manual/images/images/hive.gif
new file mode 100644
index 00000000..5f509698
Binary files /dev/null and b/main/manual/images/images/hive.gif differ
diff --git a/main/manual/images/images/hmg.gif b/main/manual/images/images/hmg.gif
new file mode 100644
index 00000000..e8ead8c7
Binary files /dev/null and b/main/manual/images/images/hmg.gif differ
diff --git a/main/manual/images/images/hud_ammo.gif b/main/manual/images/images/hud_ammo.gif
new file mode 100644
index 00000000..a84d8957
Binary files /dev/null and b/main/manual/images/images/hud_ammo.gif differ
diff --git a/main/manual/images/images/hud_armor.gif b/main/manual/images/images/hud_armor.gif
new file mode 100644
index 00000000..c0cb8c9c
Binary files /dev/null and b/main/manual/images/images/hud_armor.gif differ
diff --git a/main/manual/images/images/hud_health.gif b/main/manual/images/images/hud_health.gif
new file mode 100644
index 00000000..64e45571
Binary files /dev/null and b/main/manual/images/images/hud_health.gif differ
diff --git a/main/manual/images/images/inf portal.gif b/main/manual/images/images/inf portal.gif
new file mode 100644
index 00000000..80ee7b44
Binary files /dev/null and b/main/manual/images/images/inf portal.gif differ
diff --git a/main/manual/images/images/jetpack.gif b/main/manual/images/images/jetpack.gif
new file mode 100644
index 00000000..cb22022c
Binary files /dev/null and b/main/manual/images/images/jetpack.gif differ
diff --git a/main/manual/images/images/knife.gif b/main/manual/images/images/knife.gif
new file mode 100644
index 00000000..c626d3cd
Binary files /dev/null and b/main/manual/images/images/knife.gif differ
diff --git a/main/manual/images/images/lerk.gif b/main/manual/images/images/lerk.gif
new file mode 100644
index 00000000..32a54185
Binary files /dev/null and b/main/manual/images/images/lerk.gif differ
diff --git a/main/manual/images/images/level1.gif b/main/manual/images/images/level1.gif
new file mode 100644
index 00000000..afd631b3
Binary files /dev/null and b/main/manual/images/images/level1.gif differ
diff --git a/main/manual/images/images/level2.gif b/main/manual/images/images/level2.gif
new file mode 100644
index 00000000..dcc8f704
Binary files /dev/null and b/main/manual/images/images/level2.gif differ
diff --git a/main/manual/images/images/level3.gif b/main/manual/images/images/level3.gif
new file mode 100644
index 00000000..b0b6f434
Binary files /dev/null and b/main/manual/images/images/level3.gif differ
diff --git a/main/manual/images/images/level4.gif b/main/manual/images/images/level4.gif
new file mode 100644
index 00000000..ed3460f7
Binary files /dev/null and b/main/manual/images/images/level4.gif differ
diff --git a/main/manual/images/images/level5.gif b/main/manual/images/images/level5.gif
new file mode 100644
index 00000000..fe5a4d7c
Binary files /dev/null and b/main/manual/images/images/level5.gif differ
diff --git a/main/manual/images/images/lmg.gif b/main/manual/images/images/lmg.gif
new file mode 100644
index 00000000..7a4988dd
Binary files /dev/null and b/main/manual/images/images/lmg.gif differ
diff --git a/main/manual/images/images/marine.gif b/main/manual/images/images/marine.gif
new file mode 100644
index 00000000..c8373b51
Binary files /dev/null and b/main/manual/images/images/marine.gif differ
diff --git a/main/manual/images/images/marine_s.gif b/main/manual/images/images/marine_s.gif
new file mode 100644
index 00000000..12f12ea4
Binary files /dev/null and b/main/manual/images/images/marine_s.gif differ
diff --git a/main/manual/images/images/mine.gif b/main/manual/images/images/mine.gif
new file mode 100644
index 00000000..180b8818
Binary files /dev/null and b/main/manual/images/images/mine.gif differ
diff --git a/main/manual/images/images/minimap.gif b/main/manual/images/images/minimap.gif
new file mode 100644
index 00000000..29433bdb
Binary files /dev/null and b/main/manual/images/images/minimap.gif differ
diff --git a/main/manual/images/images/motionsensor.gif b/main/manual/images/images/motionsensor.gif
new file mode 100644
index 00000000..7acca77c
Binary files /dev/null and b/main/manual/images/images/motionsensor.gif differ
diff --git a/main/manual/images/images/nanotech.gif b/main/manual/images/images/nanotech.gif
new file mode 100644
index 00000000..dcde6466
Binary files /dev/null and b/main/manual/images/images/nanotech.gif differ
diff --git a/main/manual/images/images/nanotech_s.gif b/main/manual/images/images/nanotech_s.gif
new file mode 100644
index 00000000..bdbfed9f
Binary files /dev/null and b/main/manual/images/images/nanotech_s.gif differ
diff --git a/main/manual/images/images/observatory.gif b/main/manual/images/images/observatory.gif
new file mode 100644
index 00000000..60f88402
Binary files /dev/null and b/main/manual/images/images/observatory.gif differ
diff --git a/main/manual/images/images/onos.gif b/main/manual/images/images/onos.gif
new file mode 100644
index 00000000..56694677
Binary files /dev/null and b/main/manual/images/images/onos.gif differ
diff --git a/main/manual/images/images/phase gate.gif b/main/manual/images/images/phase gate.gif
new file mode 100644
index 00000000..c344abda
Binary files /dev/null and b/main/manual/images/images/phase gate.gif differ
diff --git a/main/manual/images/images/pics_cc.gif b/main/manual/images/images/pics_cc.gif
new file mode 100644
index 00000000..3dfb5fb8
Binary files /dev/null and b/main/manual/images/images/pics_cc.gif differ
diff --git a/main/manual/images/images/pistol.gif b/main/manual/images/images/pistol.gif
new file mode 100644
index 00000000..70df0cfb
Binary files /dev/null and b/main/manual/images/images/pistol.gif differ
diff --git a/main/manual/images/images/prototype lab.gif b/main/manual/images/images/prototype lab.gif
new file mode 100644
index 00000000..7588d598
Binary files /dev/null and b/main/manual/images/images/prototype lab.gif differ
diff --git a/main/manual/images/images/reading.gif b/main/manual/images/images/reading.gif
new file mode 100644
index 00000000..64fc2434
Binary files /dev/null and b/main/manual/images/images/reading.gif differ
diff --git a/main/manual/images/images/resource tower.gif b/main/manual/images/images/resource tower.gif
new file mode 100644
index 00000000..83767693
Binary files /dev/null and b/main/manual/images/images/resource tower.gif differ
diff --git a/main/manual/images/images/resourcecollector.gif b/main/manual/images/images/resourcecollector.gif
new file mode 100644
index 00000000..fea88043
Binary files /dev/null and b/main/manual/images/images/resourcecollector.gif differ
diff --git a/main/manual/images/images/resourcenode.gif b/main/manual/images/images/resourcenode.gif
new file mode 100644
index 00000000..a62dbbcb
Binary files /dev/null and b/main/manual/images/images/resourcenode.gif differ
diff --git a/main/manual/images/images/resources.gif b/main/manual/images/images/resources.gif
new file mode 100644
index 00000000..8547f991
Binary files /dev/null and b/main/manual/images/images/resources.gif differ
diff --git a/main/manual/images/images/resources_s.gif b/main/manual/images/images/resources_s.gif
new file mode 100644
index 00000000..bed6d8c1
Binary files /dev/null and b/main/manual/images/images/resources_s.gif differ
diff --git a/main/manual/images/images/sentry gun.gif b/main/manual/images/images/sentry gun.gif
new file mode 100644
index 00000000..cb0cb184
Binary files /dev/null and b/main/manual/images/images/sentry gun.gif differ
diff --git a/main/manual/images/images/shotgun.gif b/main/manual/images/images/shotgun.gif
new file mode 100644
index 00000000..45ed1cf3
Binary files /dev/null and b/main/manual/images/images/shotgun.gif differ
diff --git a/main/manual/images/images/siege turret.gif b/main/manual/images/images/siege turret.gif
new file mode 100644
index 00000000..44ed36c2
Binary files /dev/null and b/main/manual/images/images/siege turret.gif differ
diff --git a/main/manual/images/images/siege.gif b/main/manual/images/images/siege.gif
new file mode 100644
index 00000000..1f4da226
Binary files /dev/null and b/main/manual/images/images/siege.gif differ
diff --git a/main/manual/images/images/skulk.gif b/main/manual/images/images/skulk.gif
new file mode 100644
index 00000000..083452fc
Binary files /dev/null and b/main/manual/images/images/skulk.gif differ
diff --git a/main/manual/images/images/speciesupgrades.gif b/main/manual/images/images/speciesupgrades.gif
new file mode 100644
index 00000000..06064325
Binary files /dev/null and b/main/manual/images/images/speciesupgrades.gif differ
diff --git a/main/manual/images/images/splitter.gif b/main/manual/images/images/splitter.gif
new file mode 100644
index 00000000..75b35825
Binary files /dev/null and b/main/manual/images/images/splitter.gif differ
diff --git a/main/manual/images/images/structures.gif b/main/manual/images/images/structures.gif
new file mode 100644
index 00000000..265ad5c4
Binary files /dev/null and b/main/manual/images/images/structures.gif differ
diff --git a/main/manual/images/images/structures_s.gif b/main/manual/images/images/structures_s.gif
new file mode 100644
index 00000000..3ca35b97
Binary files /dev/null and b/main/manual/images/images/structures_s.gif differ
diff --git a/main/manual/images/images/techtree.gif b/main/manual/images/images/techtree.gif
new file mode 100644
index 00000000..3a8b5e9a
Binary files /dev/null and b/main/manual/images/images/techtree.gif differ
diff --git a/main/manual/images/images/transparent.gif b/main/manual/images/images/transparent.gif
new file mode 100644
index 00000000..f4a2493a
Binary files /dev/null and b/main/manual/images/images/transparent.gif differ
diff --git a/main/manual/images/images/tsa_motto.gif b/main/manual/images/images/tsa_motto.gif
new file mode 100644
index 00000000..b21de5b1
Binary files /dev/null and b/main/manual/images/images/tsa_motto.gif differ
diff --git a/main/manual/images/images/tsalogo.gif b/main/manual/images/images/tsalogo.gif
new file mode 100644
index 00000000..1ae89004
Binary files /dev/null and b/main/manual/images/images/tsalogo.gif differ
diff --git a/main/manual/images/images/turret factory.gif b/main/manual/images/images/turret factory.gif
new file mode 100644
index 00000000..7d0f49f7
Binary files /dev/null and b/main/manual/images/images/turret factory.gif differ
diff --git a/main/manual/images/images/turret.gif b/main/manual/images/images/turret.gif
new file mode 100644
index 00000000..e192020a
Binary files /dev/null and b/main/manual/images/images/turret.gif differ
diff --git a/main/manual/images/images/upgrades.gif b/main/manual/images/images/upgrades.gif
new file mode 100644
index 00000000..739e0f59
Binary files /dev/null and b/main/manual/images/images/upgrades.gif differ
diff --git a/main/manual/images/images/upgrades_s.gif b/main/manual/images/images/upgrades_s.gif
new file mode 100644
index 00000000..3012edb8
Binary files /dev/null and b/main/manual/images/images/upgrades_s.gif differ
diff --git a/main/manual/images/images/victory.gif b/main/manual/images/images/victory.gif
new file mode 100644
index 00000000..9d4827a9
Binary files /dev/null and b/main/manual/images/images/victory.gif differ
diff --git a/main/manual/images/images/victory_aliens.gif b/main/manual/images/images/victory_aliens.gif
new file mode 100644
index 00000000..c9d967bb
Binary files /dev/null and b/main/manual/images/images/victory_aliens.gif differ
diff --git a/main/manual/images/images/victory_pose.gif b/main/manual/images/images/victory_pose.gif
new file mode 100644
index 00000000..0798a569
Binary files /dev/null and b/main/manual/images/images/victory_pose.gif differ
diff --git a/main/manual/images/images/victory_s.gif b/main/manual/images/images/victory_s.gif
new file mode 100644
index 00000000..11d3799b
Binary files /dev/null and b/main/manual/images/images/victory_s.gif differ
diff --git a/main/manual/images/images/weapons lab.gif b/main/manual/images/images/weapons lab.gif
new file mode 100644
index 00000000..6ef9db09
Binary files /dev/null and b/main/manual/images/images/weapons lab.gif differ
diff --git a/main/manual/images/images/welder.gif b/main/manual/images/images/welder.gif
new file mode 100644
index 00000000..841eee98
Binary files /dev/null and b/main/manual/images/images/welder.gif differ
diff --git a/main/manual/images/tech/ammopack.gif b/main/manual/images/tech/ammopack.gif
new file mode 100644
index 00000000..273f22d6
Binary files /dev/null and b/main/manual/images/tech/ammopack.gif differ
diff --git a/main/manual/images/tech/armor1.gif b/main/manual/images/tech/armor1.gif
new file mode 100644
index 00000000..879ad0a7
Binary files /dev/null and b/main/manual/images/tech/armor1.gif differ
diff --git a/main/manual/images/tech/armor1s.gif b/main/manual/images/tech/armor1s.gif
new file mode 100644
index 00000000..df53eb07
Binary files /dev/null and b/main/manual/images/tech/armor1s.gif differ
diff --git a/main/manual/images/tech/armor2.gif b/main/manual/images/tech/armor2.gif
new file mode 100644
index 00000000..eacc586f
Binary files /dev/null and b/main/manual/images/tech/armor2.gif differ
diff --git a/main/manual/images/tech/armor3.gif b/main/manual/images/tech/armor3.gif
new file mode 100644
index 00000000..9568b0a1
Binary files /dev/null and b/main/manual/images/tech/armor3.gif differ
diff --git a/main/manual/images/tech/armory.gif b/main/manual/images/tech/armory.gif
new file mode 100644
index 00000000..acae0999
Binary files /dev/null and b/main/manual/images/tech/armory.gif differ
diff --git a/main/manual/images/tech/armory_adv.gif b/main/manual/images/tech/armory_adv.gif
new file mode 100644
index 00000000..d279e8e8
Binary files /dev/null and b/main/manual/images/tech/armory_adv.gif differ
diff --git a/main/manual/images/tech/armslab.gif b/main/manual/images/tech/armslab.gif
new file mode 100644
index 00000000..758c4843
Binary files /dev/null and b/main/manual/images/tech/armslab.gif differ
diff --git a/main/manual/images/tech/asc.gif b/main/manual/images/tech/asc.gif
new file mode 100644
index 00000000..f4a9d064
Binary files /dev/null and b/main/manual/images/tech/asc.gif differ
diff --git a/main/manual/images/tech/comcenter.gif b/main/manual/images/tech/comcenter.gif
new file mode 100644
index 00000000..273610a5
Binary files /dev/null and b/main/manual/images/tech/comcenter.gif differ
diff --git a/main/manual/images/tech/exoskel.gif b/main/manual/images/tech/exoskel.gif
new file mode 100644
index 00000000..588f9210
Binary files /dev/null and b/main/manual/images/tech/exoskel.gif differ
diff --git a/main/manual/images/tech/grenadel.gif b/main/manual/images/tech/grenadel.gif
new file mode 100644
index 00000000..d8cb98e7
Binary files /dev/null and b/main/manual/images/tech/grenadel.gif differ
diff --git a/main/manual/images/tech/healthpack.gif b/main/manual/images/tech/healthpack.gif
new file mode 100644
index 00000000..e9d1a4f1
Binary files /dev/null and b/main/manual/images/tech/healthpack.gif differ
diff --git a/main/manual/images/tech/heavya.gif b/main/manual/images/tech/heavya.gif
new file mode 100644
index 00000000..7176eba3
Binary files /dev/null and b/main/manual/images/tech/heavya.gif differ
diff --git a/main/manual/images/tech/hmg.gif b/main/manual/images/tech/hmg.gif
new file mode 100644
index 00000000..20e735df
Binary files /dev/null and b/main/manual/images/tech/hmg.gif differ
diff --git a/main/manual/images/tech/inf_portal.gif b/main/manual/images/tech/inf_portal.gif
new file mode 100644
index 00000000..43d43e4f
Binary files /dev/null and b/main/manual/images/tech/inf_portal.gif differ
diff --git a/main/manual/images/tech/jetpacks.gif b/main/manual/images/tech/jetpacks.gif
new file mode 100644
index 00000000..6cf75b4b
Binary files /dev/null and b/main/manual/images/tech/jetpacks.gif differ
diff --git a/main/manual/images/tech/jetpacks2.gif b/main/manual/images/tech/jetpacks2.gif
new file mode 100644
index 00000000..ee50ccaf
Binary files /dev/null and b/main/manual/images/tech/jetpacks2.gif differ
diff --git a/main/manual/images/tech/knife.gif b/main/manual/images/tech/knife.gif
new file mode 100644
index 00000000..926c239e
Binary files /dev/null and b/main/manual/images/tech/knife.gif differ
diff --git a/main/manual/images/tech/lightspeed.gif b/main/manual/images/tech/lightspeed.gif
new file mode 100644
index 00000000..ab825f31
Binary files /dev/null and b/main/manual/images/tech/lightspeed.gif differ
diff --git a/main/manual/images/tech/lmg.gif b/main/manual/images/tech/lmg.gif
new file mode 100644
index 00000000..59abefa7
Binary files /dev/null and b/main/manual/images/tech/lmg.gif differ
diff --git a/main/manual/images/tech/mines.gif b/main/manual/images/tech/mines.gif
new file mode 100644
index 00000000..bc6f38f5
Binary files /dev/null and b/main/manual/images/tech/mines.gif differ
diff --git a/main/manual/images/tech/motiont.gif b/main/manual/images/tech/motiont.gif
new file mode 100644
index 00000000..96c890c9
Binary files /dev/null and b/main/manual/images/tech/motiont.gif differ
diff --git a/main/manual/images/tech/observ.gif b/main/manual/images/tech/observ.gif
new file mode 100644
index 00000000..c062426f
Binary files /dev/null and b/main/manual/images/tech/observ.gif differ
diff --git a/main/manual/images/tech/phase.gif b/main/manual/images/tech/phase.gif
new file mode 100644
index 00000000..8b0d99b9
Binary files /dev/null and b/main/manual/images/tech/phase.gif differ
diff --git a/main/manual/images/tech/pistol.gif b/main/manual/images/tech/pistol.gif
new file mode 100644
index 00000000..7d7a578f
Binary files /dev/null and b/main/manual/images/tech/pistol.gif differ
diff --git a/main/manual/images/tech/protolab.gif b/main/manual/images/tech/protolab.gif
new file mode 100644
index 00000000..38fa284e
Binary files /dev/null and b/main/manual/images/tech/protolab.gif differ
diff --git a/main/manual/images/tech/recycle.gif b/main/manual/images/tech/recycle.gif
new file mode 100644
index 00000000..36e4e9d2
Binary files /dev/null and b/main/manual/images/tech/recycle.gif differ
diff --git a/main/manual/images/tech/restower.gif b/main/manual/images/tech/restower.gif
new file mode 100644
index 00000000..bd6fe1fa
Binary files /dev/null and b/main/manual/images/tech/restower.gif differ
diff --git a/main/manual/images/tech/scan.gif b/main/manual/images/tech/scan.gif
new file mode 100644
index 00000000..9a95065c
Binary files /dev/null and b/main/manual/images/tech/scan.gif differ
diff --git a/main/manual/images/tech/shotgun.gif b/main/manual/images/tech/shotgun.gif
new file mode 100644
index 00000000..f85c5102
Binary files /dev/null and b/main/manual/images/tech/shotgun.gif differ
diff --git a/main/manual/images/tech/siege.gif b/main/manual/images/tech/siege.gif
new file mode 100644
index 00000000..90b122ba
Binary files /dev/null and b/main/manual/images/tech/siege.gif differ
diff --git a/main/manual/images/tech/tfact.gif b/main/manual/images/tech/tfact.gif
new file mode 100644
index 00000000..cf0d3793
Binary files /dev/null and b/main/manual/images/tech/tfact.gif differ
diff --git a/main/manual/images/tech/turret.gif b/main/manual/images/tech/turret.gif
new file mode 100644
index 00000000..1c90dbf5
Binary files /dev/null and b/main/manual/images/tech/turret.gif differ
diff --git a/main/manual/images/tech/weapon1.gif b/main/manual/images/tech/weapon1.gif
new file mode 100644
index 00000000..ff0888c9
Binary files /dev/null and b/main/manual/images/tech/weapon1.gif differ
diff --git a/main/manual/images/tech/weapon2.gif b/main/manual/images/tech/weapon2.gif
new file mode 100644
index 00000000..062db385
Binary files /dev/null and b/main/manual/images/tech/weapon2.gif differ
diff --git a/main/manual/images/tech/weapon3.gif b/main/manual/images/tech/weapon3.gif
new file mode 100644
index 00000000..9646fad6
Binary files /dev/null and b/main/manual/images/tech/weapon3.gif differ
diff --git a/main/manual/images/tech/welder.gif b/main/manual/images/tech/welder.gif
new file mode 100644
index 00000000..b9e64944
Binary files /dev/null and b/main/manual/images/tech/welder.gif differ
diff --git a/main/manual/images/tech_10/abilities1.gif b/main/manual/images/tech_10/abilities1.gif
new file mode 100644
index 00000000..2f52e229
Binary files /dev/null and b/main/manual/images/tech_10/abilities1.gif differ
diff --git a/main/manual/images/tech_10/abilities2.gif b/main/manual/images/tech_10/abilities2.gif
new file mode 100644
index 00000000..24ed0fac
Binary files /dev/null and b/main/manual/images/tech_10/abilities2.gif differ
diff --git a/main/manual/images/tech_10/abilities3.gif b/main/manual/images/tech_10/abilities3.gif
new file mode 100644
index 00000000..eb71793b
Binary files /dev/null and b/main/manual/images/tech_10/abilities3.gif differ
diff --git a/main/manual/images/tech_10/alien_back.gif b/main/manual/images/tech_10/alien_back.gif
new file mode 100644
index 00000000..232b3a7a
Binary files /dev/null and b/main/manual/images/tech_10/alien_back.gif differ
diff --git a/main/manual/images/tech_10/alienattacks.gif b/main/manual/images/tech_10/alienattacks.gif
new file mode 100644
index 00000000..cbac5b3f
Binary files /dev/null and b/main/manual/images/tech_10/alienattacks.gif differ
diff --git a/main/manual/images/tech_10/ammopack.gif b/main/manual/images/tech_10/ammopack.gif
new file mode 100644
index 00000000..8cd48355
Binary files /dev/null and b/main/manual/images/tech_10/ammopack.gif differ
diff --git a/main/manual/images/tech_10/armor1.gif b/main/manual/images/tech_10/armor1.gif
new file mode 100644
index 00000000..2405dcaa
Binary files /dev/null and b/main/manual/images/tech_10/armor1.gif differ
diff --git a/main/manual/images/tech_10/armor1s.gif b/main/manual/images/tech_10/armor1s.gif
new file mode 100644
index 00000000..25c040fa
Binary files /dev/null and b/main/manual/images/tech_10/armor1s.gif differ
diff --git a/main/manual/images/tech_10/armor2.gif b/main/manual/images/tech_10/armor2.gif
new file mode 100644
index 00000000..592881a4
Binary files /dev/null and b/main/manual/images/tech_10/armor2.gif differ
diff --git a/main/manual/images/tech_10/armor3.gif b/main/manual/images/tech_10/armor3.gif
new file mode 100644
index 00000000..e8bf1af2
Binary files /dev/null and b/main/manual/images/tech_10/armor3.gif differ
diff --git a/main/manual/images/tech_10/armory.gif b/main/manual/images/tech_10/armory.gif
new file mode 100644
index 00000000..4de0aad2
Binary files /dev/null and b/main/manual/images/tech_10/armory.gif differ
diff --git a/main/manual/images/tech_10/armory_adv.gif b/main/manual/images/tech_10/armory_adv.gif
new file mode 100644
index 00000000..89b4b1b6
Binary files /dev/null and b/main/manual/images/tech_10/armory_adv.gif differ
diff --git a/main/manual/images/tech_10/armslab.gif b/main/manual/images/tech_10/armslab.gif
new file mode 100644
index 00000000..494d090e
Binary files /dev/null and b/main/manual/images/tech_10/armslab.gif differ
diff --git a/main/manual/images/tech_10/arrow.gif b/main/manual/images/tech_10/arrow.gif
new file mode 100644
index 00000000..5d9f8278
Binary files /dev/null and b/main/manual/images/tech_10/arrow.gif differ
diff --git a/main/manual/images/tech_10/asc.gif b/main/manual/images/tech_10/asc.gif
new file mode 100644
index 00000000..24180961
Binary files /dev/null and b/main/manual/images/tech_10/asc.gif differ
diff --git a/main/manual/images/tech_10/bactgridlock.gif b/main/manual/images/tech_10/bactgridlock.gif
new file mode 100644
index 00000000..eb5664e3
Binary files /dev/null and b/main/manual/images/tech_10/bactgridlock.gif differ
diff --git a/main/manual/images/tech_10/changingspecies.gif b/main/manual/images/tech_10/changingspecies.gif
new file mode 100644
index 00000000..a2aad797
Binary files /dev/null and b/main/manual/images/tech_10/changingspecies.gif differ
diff --git a/main/manual/images/tech_10/comcenter.gif b/main/manual/images/tech_10/comcenter.gif
new file mode 100644
index 00000000..817e69a5
Binary files /dev/null and b/main/manual/images/tech_10/comcenter.gif differ
diff --git a/main/manual/images/tech_10/communicating.gif b/main/manual/images/tech_10/communicating.gif
new file mode 100644
index 00000000..1a7d7ca8
Binary files /dev/null and b/main/manual/images/tech_10/communicating.gif differ
diff --git a/main/manual/images/tech_10/defence.gif b/main/manual/images/tech_10/defence.gif
new file mode 100644
index 00000000..0508fc88
Binary files /dev/null and b/main/manual/images/tech_10/defence.gif differ
diff --git a/main/manual/images/tech_10/equipment.gif b/main/manual/images/tech_10/equipment.gif
new file mode 100644
index 00000000..e91b31d2
Binary files /dev/null and b/main/manual/images/tech_10/equipment.gif differ
diff --git a/main/manual/images/tech_10/evolutions.gif b/main/manual/images/tech_10/evolutions.gif
new file mode 100644
index 00000000..c32f014b
Binary files /dev/null and b/main/manual/images/tech_10/evolutions.gif differ
diff --git a/main/manual/images/tech_10/exoskel.gif b/main/manual/images/tech_10/exoskel.gif
new file mode 100644
index 00000000..b3783c02
Binary files /dev/null and b/main/manual/images/tech_10/exoskel.gif differ
diff --git a/main/manual/images/tech_10/friendlyfire.gif b/main/manual/images/tech_10/friendlyfire.gif
new file mode 100644
index 00000000..98f5cbe1
Binary files /dev/null and b/main/manual/images/tech_10/friendlyfire.gif differ
diff --git a/main/manual/images/tech_10/grenadel.gif b/main/manual/images/tech_10/grenadel.gif
new file mode 100644
index 00000000..606fcce6
Binary files /dev/null and b/main/manual/images/tech_10/grenadel.gif differ
diff --git a/main/manual/images/tech_10/heal.gif b/main/manual/images/tech_10/heal.gif
new file mode 100644
index 00000000..6fa06b2f
Binary files /dev/null and b/main/manual/images/tech_10/heal.gif differ
diff --git a/main/manual/images/tech_10/healthpack.gif b/main/manual/images/tech_10/healthpack.gif
new file mode 100644
index 00000000..e873178a
Binary files /dev/null and b/main/manual/images/tech_10/healthpack.gif differ
diff --git a/main/manual/images/tech_10/heavya.gif b/main/manual/images/tech_10/heavya.gif
new file mode 100644
index 00000000..351e3bcd
Binary files /dev/null and b/main/manual/images/tech_10/heavya.gif differ
diff --git a/main/manual/images/tech_10/hive.gif b/main/manual/images/tech_10/hive.gif
new file mode 100644
index 00000000..cbe96e05
Binary files /dev/null and b/main/manual/images/tech_10/hive.gif differ
diff --git a/main/manual/images/tech_10/hiveabilities.gif b/main/manual/images/tech_10/hiveabilities.gif
new file mode 100644
index 00000000..65825b9b
Binary files /dev/null and b/main/manual/images/tech_10/hiveabilities.gif differ
diff --git a/main/manual/images/tech_10/hivesightlink.gif b/main/manual/images/tech_10/hivesightlink.gif
new file mode 100644
index 00000000..046f4db0
Binary files /dev/null and b/main/manual/images/tech_10/hivesightlink.gif differ
diff --git a/main/manual/images/tech_10/hmg.gif b/main/manual/images/tech_10/hmg.gif
new file mode 100644
index 00000000..de606dfe
Binary files /dev/null and b/main/manual/images/tech_10/hmg.gif differ
diff --git a/main/manual/images/tech_10/hud.gif b/main/manual/images/tech_10/hud.gif
new file mode 100644
index 00000000..3289b3cf
Binary files /dev/null and b/main/manual/images/tech_10/hud.gif differ
diff --git a/main/manual/images/tech_10/inf_portal.gif b/main/manual/images/tech_10/inf_portal.gif
new file mode 100644
index 00000000..3465c5ee
Binary files /dev/null and b/main/manual/images/tech_10/inf_portal.gif differ
diff --git a/main/manual/images/tech_10/jetpacks.gif b/main/manual/images/tech_10/jetpacks.gif
new file mode 100644
index 00000000..0a63316f
Binary files /dev/null and b/main/manual/images/tech_10/jetpacks.gif differ
diff --git a/main/manual/images/tech_10/jetpacks2.gif b/main/manual/images/tech_10/jetpacks2.gif
new file mode 100644
index 00000000..25f1df27
Binary files /dev/null and b/main/manual/images/tech_10/jetpacks2.gif differ
diff --git a/main/manual/images/tech_10/knife.gif b/main/manual/images/tech_10/knife.gif
new file mode 100644
index 00000000..af8187ca
Binary files /dev/null and b/main/manual/images/tech_10/knife.gif differ
diff --git a/main/manual/images/tech_10/lightspeed.gif b/main/manual/images/tech_10/lightspeed.gif
new file mode 100644
index 00000000..19090ba0
Binary files /dev/null and b/main/manual/images/tech_10/lightspeed.gif differ
diff --git a/main/manual/images/tech_10/list.gif b/main/manual/images/tech_10/list.gif
new file mode 100644
index 00000000..8f708a8d
Binary files /dev/null and b/main/manual/images/tech_10/list.gif differ
diff --git a/main/manual/images/tech_10/lmg.gif b/main/manual/images/tech_10/lmg.gif
new file mode 100644
index 00000000..681d727a
Binary files /dev/null and b/main/manual/images/tech_10/lmg.gif differ
diff --git a/main/manual/images/tech_10/mines.gif b/main/manual/images/tech_10/mines.gif
new file mode 100644
index 00000000..1c14e14f
Binary files /dev/null and b/main/manual/images/tech_10/mines.gif differ
diff --git a/main/manual/images/tech_10/motiont.gif b/main/manual/images/tech_10/motiont.gif
new file mode 100644
index 00000000..c268c71c
Binary files /dev/null and b/main/manual/images/tech_10/motiont.gif differ
diff --git a/main/manual/images/tech_10/movement.gif b/main/manual/images/tech_10/movement.gif
new file mode 100644
index 00000000..8089d549
Binary files /dev/null and b/main/manual/images/tech_10/movement.gif differ
diff --git a/main/manual/images/tech_10/nanogridlock.gif b/main/manual/images/tech_10/nanogridlock.gif
new file mode 100644
index 00000000..c638474e
Binary files /dev/null and b/main/manual/images/tech_10/nanogridlock.gif differ
diff --git a/main/manual/images/tech_10/observ.gif b/main/manual/images/tech_10/observ.gif
new file mode 100644
index 00000000..f0be086f
Binary files /dev/null and b/main/manual/images/tech_10/observ.gif differ
diff --git a/main/manual/images/tech_10/observation.gif b/main/manual/images/tech_10/observation.gif
new file mode 100644
index 00000000..b001c6e2
Binary files /dev/null and b/main/manual/images/tech_10/observation.gif differ
diff --git a/main/manual/images/tech_10/offense.gif b/main/manual/images/tech_10/offense.gif
new file mode 100644
index 00000000..df560a2f
Binary files /dev/null and b/main/manual/images/tech_10/offense.gif differ
diff --git a/main/manual/images/tech_10/phase.gif b/main/manual/images/tech_10/phase.gif
new file mode 100644
index 00000000..c4f1fc9e
Binary files /dev/null and b/main/manual/images/tech_10/phase.gif differ
diff --git a/main/manual/images/tech_10/pistol.gif b/main/manual/images/tech_10/pistol.gif
new file mode 100644
index 00000000..433e8b48
Binary files /dev/null and b/main/manual/images/tech_10/pistol.gif differ
diff --git a/main/manual/images/tech_10/protolab.gif b/main/manual/images/tech_10/protolab.gif
new file mode 100644
index 00000000..41114a81
Binary files /dev/null and b/main/manual/images/tech_10/protolab.gif differ
diff --git a/main/manual/images/tech_10/query.gif b/main/manual/images/tech_10/query.gif
new file mode 100644
index 00000000..bafd6cfe
Binary files /dev/null and b/main/manual/images/tech_10/query.gif differ
diff --git a/main/manual/images/tech_10/reclamarray.gif b/main/manual/images/tech_10/reclamarray.gif
new file mode 100644
index 00000000..1a6dedd4
Binary files /dev/null and b/main/manual/images/tech_10/reclamarray.gif differ
diff --git a/main/manual/images/tech_10/recycle.gif b/main/manual/images/tech_10/recycle.gif
new file mode 100644
index 00000000..31bbd602
Binary files /dev/null and b/main/manual/images/tech_10/recycle.gif differ
diff --git a/main/manual/images/tech_10/resource.gif b/main/manual/images/tech_10/resource.gif
new file mode 100644
index 00000000..dd727054
Binary files /dev/null and b/main/manual/images/tech_10/resource.gif differ
diff --git a/main/manual/images/tech_10/restower.gif b/main/manual/images/tech_10/restower.gif
new file mode 100644
index 00000000..ca317f18
Binary files /dev/null and b/main/manual/images/tech_10/restower.gif differ
diff --git a/main/manual/images/tech_10/scan.gif b/main/manual/images/tech_10/scan.gif
new file mode 100644
index 00000000..8fc70221
Binary files /dev/null and b/main/manual/images/tech_10/scan.gif differ
diff --git a/main/manual/images/tech_10/sensory.gif b/main/manual/images/tech_10/sensory.gif
new file mode 100644
index 00000000..de264d00
Binary files /dev/null and b/main/manual/images/tech_10/sensory.gif differ
diff --git a/main/manual/images/tech_10/shotgun.gif b/main/manual/images/tech_10/shotgun.gif
new file mode 100644
index 00000000..4c1eed94
Binary files /dev/null and b/main/manual/images/tech_10/shotgun.gif differ
diff --git a/main/manual/images/tech_10/siege.gif b/main/manual/images/tech_10/siege.gif
new file mode 100644
index 00000000..bcbca92c
Binary files /dev/null and b/main/manual/images/tech_10/siege.gif differ
diff --git a/main/manual/images/tech_10/sterkman.gif b/main/manual/images/tech_10/sterkman.gif
new file mode 100644
index 00000000..506c55ae
Binary files /dev/null and b/main/manual/images/tech_10/sterkman.gif differ
diff --git a/main/manual/images/tech_10/sterkmanred.gif b/main/manual/images/tech_10/sterkmanred.gif
new file mode 100644
index 00000000..6f7ee151
Binary files /dev/null and b/main/manual/images/tech_10/sterkmanred.gif differ
diff --git a/main/manual/images/tech_10/tactics.gif b/main/manual/images/tech_10/tactics.gif
new file mode 100644
index 00000000..822a6578
Binary files /dev/null and b/main/manual/images/tech_10/tactics.gif differ
diff --git a/main/manual/images/tech_10/tfact.gif b/main/manual/images/tech_10/tfact.gif
new file mode 100644
index 00000000..fe956e99
Binary files /dev/null and b/main/manual/images/tech_10/tfact.gif differ
diff --git a/main/manual/images/tech_10/turret.gif b/main/manual/images/tech_10/turret.gif
new file mode 100644
index 00000000..bab3e5cf
Binary files /dev/null and b/main/manual/images/tech_10/turret.gif differ
diff --git a/main/manual/images/tech_10/weapon1.gif b/main/manual/images/tech_10/weapon1.gif
new file mode 100644
index 00000000..49655740
Binary files /dev/null and b/main/manual/images/tech_10/weapon1.gif differ
diff --git a/main/manual/images/tech_10/weapon2.gif b/main/manual/images/tech_10/weapon2.gif
new file mode 100644
index 00000000..8c926f97
Binary files /dev/null and b/main/manual/images/tech_10/weapon2.gif differ
diff --git a/main/manual/images/tech_10/weapon3.gif b/main/manual/images/tech_10/weapon3.gif
new file mode 100644
index 00000000..245b89c4
Binary files /dev/null and b/main/manual/images/tech_10/weapon3.gif differ
diff --git a/main/manual/images/tech_10/weapons.gif b/main/manual/images/tech_10/weapons.gif
new file mode 100644
index 00000000..3b34f896
Binary files /dev/null and b/main/manual/images/tech_10/weapons.gif differ
diff --git a/main/manual/images/tech_10/welder.gif b/main/manual/images/tech_10/welder.gif
new file mode 100644
index 00000000..f7877279
Binary files /dev/null and b/main/manual/images/tech_10/welder.gif differ
diff --git a/main/manual/images/titles/alien.gif b/main/manual/images/titles/alien.gif
new file mode 100644
index 00000000..287e634a
Binary files /dev/null and b/main/manual/images/titles/alien.gif differ
diff --git a/main/manual/images/titles/alien_abilities.gif b/main/manual/images/titles/alien_abilities.gif
new file mode 100644
index 00000000..3097593c
Binary files /dev/null and b/main/manual/images/titles/alien_abilities.gif differ
diff --git a/main/manual/images/titles/alien_adren.gif b/main/manual/images/titles/alien_adren.gif
new file mode 100644
index 00000000..749731cb
Binary files /dev/null and b/main/manual/images/titles/alien_adren.gif differ
diff --git a/main/manual/images/titles/alien_advabilities.gif b/main/manual/images/titles/alien_advabilities.gif
new file mode 100644
index 00000000..575d653e
Binary files /dev/null and b/main/manual/images/titles/alien_advabilities.gif differ
diff --git a/main/manual/images/titles/alien_advhivesight.gif b/main/manual/images/titles/alien_advhivesight.gif
new file mode 100644
index 00000000..5688dc15
Binary files /dev/null and b/main/manual/images/titles/alien_advhivesight.gif differ
diff --git a/main/manual/images/titles/alien_bacterium.gif b/main/manual/images/titles/alien_bacterium.gif
new file mode 100644
index 00000000..5b764012
Binary files /dev/null and b/main/manual/images/titles/alien_bacterium.gif differ
diff --git a/main/manual/images/titles/alien_carapace.gif b/main/manual/images/titles/alien_carapace.gif
new file mode 100644
index 00000000..f9880b01
Binary files /dev/null and b/main/manual/images/titles/alien_carapace.gif differ
diff --git a/main/manual/images/titles/alien_celerity.gif b/main/manual/images/titles/alien_celerity.gif
new file mode 100644
index 00000000..ad030ce2
Binary files /dev/null and b/main/manual/images/titles/alien_celerity.gif differ
diff --git a/main/manual/images/titles/alien_chamber_d.gif b/main/manual/images/titles/alien_chamber_d.gif
new file mode 100644
index 00000000..58236107
Binary files /dev/null and b/main/manual/images/titles/alien_chamber_d.gif differ
diff --git a/main/manual/images/titles/alien_chamber_m.gif b/main/manual/images/titles/alien_chamber_m.gif
new file mode 100644
index 00000000..abd55448
Binary files /dev/null and b/main/manual/images/titles/alien_chamber_m.gif differ
diff --git a/main/manual/images/titles/alien_chamber_o.gif b/main/manual/images/titles/alien_chamber_o.gif
new file mode 100644
index 00000000..eb505612
Binary files /dev/null and b/main/manual/images/titles/alien_chamber_o.gif differ
diff --git a/main/manual/images/titles/alien_chamber_s.gif b/main/manual/images/titles/alien_chamber_s.gif
new file mode 100644
index 00000000..d71b5cc4
Binary files /dev/null and b/main/manual/images/titles/alien_chamber_s.gif differ
diff --git a/main/manual/images/titles/alien_chambers.gif b/main/manual/images/titles/alien_chambers.gif
new file mode 100644
index 00000000..e963f10f
Binary files /dev/null and b/main/manual/images/titles/alien_chambers.gif differ
diff --git a/main/manual/images/titles/alien_changingspecies.gif b/main/manual/images/titles/alien_changingspecies.gif
new file mode 100644
index 00000000..0b88e031
Binary files /dev/null and b/main/manual/images/titles/alien_changingspecies.gif differ
diff --git a/main/manual/images/titles/alien_cloaking.gif b/main/manual/images/titles/alien_cloaking.gif
new file mode 100644
index 00000000..fb46373d
Binary files /dev/null and b/main/manual/images/titles/alien_cloaking.gif differ
diff --git a/main/manual/images/titles/alien_defensive.gif b/main/manual/images/titles/alien_defensive.gif
new file mode 100644
index 00000000..5fae4fd1
Binary files /dev/null and b/main/manual/images/titles/alien_defensive.gif differ
diff --git a/main/manual/images/titles/alien_evolutions.gif b/main/manual/images/titles/alien_evolutions.gif
new file mode 100644
index 00000000..fed04bf3
Binary files /dev/null and b/main/manual/images/titles/alien_evolutions.gif differ
diff --git a/main/manual/images/titles/alien_fade.gif b/main/manual/images/titles/alien_fade.gif
new file mode 100644
index 00000000..3b1e5f1d
Binary files /dev/null and b/main/manual/images/titles/alien_fade.gif differ
diff --git a/main/manual/images/titles/alien_gorge.gif b/main/manual/images/titles/alien_gorge.gif
new file mode 100644
index 00000000..d647f957
Binary files /dev/null and b/main/manual/images/titles/alien_gorge.gif differ
diff --git a/main/manual/images/titles/alien_gridlock.gif b/main/manual/images/titles/alien_gridlock.gif
new file mode 100644
index 00000000..fd7c3750
Binary files /dev/null and b/main/manual/images/titles/alien_gridlock.gif differ
diff --git a/main/manual/images/titles/alien_healing.gif b/main/manual/images/titles/alien_healing.gif
new file mode 100644
index 00000000..ff9f9283
Binary files /dev/null and b/main/manual/images/titles/alien_healing.gif differ
diff --git a/main/manual/images/titles/alien_hive.gif b/main/manual/images/titles/alien_hive.gif
new file mode 100644
index 00000000..1b6430a0
Binary files /dev/null and b/main/manual/images/titles/alien_hive.gif differ
diff --git a/main/manual/images/titles/alien_hivelearned.gif b/main/manual/images/titles/alien_hivelearned.gif
new file mode 100644
index 00000000..ad6156c2
Binary files /dev/null and b/main/manual/images/titles/alien_hivelearned.gif differ
diff --git a/main/manual/images/titles/alien_hivesight.gif b/main/manual/images/titles/alien_hivesight.gif
new file mode 100644
index 00000000..1a75ee0b
Binary files /dev/null and b/main/manual/images/titles/alien_hivesight.gif differ
diff --git a/main/manual/images/titles/alien_inherentabilities.gif b/main/manual/images/titles/alien_inherentabilities.gif
new file mode 100644
index 00000000..f299001e
Binary files /dev/null and b/main/manual/images/titles/alien_inherentabilities.gif differ
diff --git a/main/manual/images/titles/alien_lerk.gif b/main/manual/images/titles/alien_lerk.gif
new file mode 100644
index 00000000..50ee0f61
Binary files /dev/null and b/main/manual/images/titles/alien_lerk.gif differ
diff --git a/main/manual/images/titles/alien_movement.gif b/main/manual/images/titles/alien_movement.gif
new file mode 100644
index 00000000..fda58f04
Binary files /dev/null and b/main/manual/images/titles/alien_movement.gif differ
diff --git a/main/manual/images/titles/alien_name.gif b/main/manual/images/titles/alien_name.gif
new file mode 100644
index 00000000..62122772
Binary files /dev/null and b/main/manual/images/titles/alien_name.gif differ
diff --git a/main/manual/images/titles/alien_newabilities.gif b/main/manual/images/titles/alien_newabilities.gif
new file mode 100644
index 00000000..c2fe2af8
Binary files /dev/null and b/main/manual/images/titles/alien_newabilities.gif differ
diff --git a/main/manual/images/titles/alien_newhives.gif b/main/manual/images/titles/alien_newhives.gif
new file mode 100644
index 00000000..50739d57
Binary files /dev/null and b/main/manual/images/titles/alien_newhives.gif differ
diff --git a/main/manual/images/titles/alien_observation.gif b/main/manual/images/titles/alien_observation.gif
new file mode 100644
index 00000000..844d6d9a
Binary files /dev/null and b/main/manual/images/titles/alien_observation.gif differ
diff --git a/main/manual/images/titles/alien_onos.gif b/main/manual/images/titles/alien_onos.gif
new file mode 100644
index 00000000..6056ac78
Binary files /dev/null and b/main/manual/images/titles/alien_onos.gif differ
diff --git a/main/manual/images/titles/alien_primaryattacks.gif b/main/manual/images/titles/alien_primaryattacks.gif
new file mode 100644
index 00000000..eabafc3e
Binary files /dev/null and b/main/manual/images/titles/alien_primaryattacks.gif differ
diff --git a/main/manual/images/titles/alien_redemption.gif b/main/manual/images/titles/alien_redemption.gif
new file mode 100644
index 00000000..03e12bfe
Binary files /dev/null and b/main/manual/images/titles/alien_redemption.gif differ
diff --git a/main/manual/images/titles/alien_regen.gif b/main/manual/images/titles/alien_regen.gif
new file mode 100644
index 00000000..66996118
Binary files /dev/null and b/main/manual/images/titles/alien_regen.gif differ
diff --git a/main/manual/images/titles/alien_rescollectors.gif b/main/manual/images/titles/alien_rescollectors.gif
new file mode 100644
index 00000000..94a24dce
Binary files /dev/null and b/main/manual/images/titles/alien_rescollectors.gif differ
diff --git a/main/manual/images/titles/alien_resources.gif b/main/manual/images/titles/alien_resources.gif
new file mode 100644
index 00000000..5946bb7f
Binary files /dev/null and b/main/manual/images/titles/alien_resources.gif differ
diff --git a/main/manual/images/titles/alien_resourceuse.gif b/main/manual/images/titles/alien_resourceuse.gif
new file mode 100644
index 00000000..706508a1
Binary files /dev/null and b/main/manual/images/titles/alien_resourceuse.gif differ
diff --git a/main/manual/images/titles/alien_scentof.gif b/main/manual/images/titles/alien_scentof.gif
new file mode 100644
index 00000000..5119d9a0
Binary files /dev/null and b/main/manual/images/titles/alien_scentof.gif differ
diff --git a/main/manual/images/titles/alien_sensory.gif b/main/manual/images/titles/alien_sensory.gif
new file mode 100644
index 00000000..d8ac805a
Binary files /dev/null and b/main/manual/images/titles/alien_sensory.gif differ
diff --git a/main/manual/images/titles/alien_silence.gif b/main/manual/images/titles/alien_silence.gif
new file mode 100644
index 00000000..3a4f0dbb
Binary files /dev/null and b/main/manual/images/titles/alien_silence.gif differ
diff --git a/main/manual/images/titles/alien_skulk.gif b/main/manual/images/titles/alien_skulk.gif
new file mode 100644
index 00000000..29b9b32e
Binary files /dev/null and b/main/manual/images/titles/alien_skulk.gif differ
diff --git a/main/manual/images/titles/alien_spawning.gif b/main/manual/images/titles/alien_spawning.gif
new file mode 100644
index 00000000..abd13fbc
Binary files /dev/null and b/main/manual/images/titles/alien_spawning.gif differ
diff --git a/main/manual/images/titles/alien_species.gif b/main/manual/images/titles/alien_species.gif
new file mode 100644
index 00000000..386c128c
Binary files /dev/null and b/main/manual/images/titles/alien_species.gif differ
diff --git a/main/manual/images/titles/alien_sterkman.gif b/main/manual/images/titles/alien_sterkman.gif
new file mode 100644
index 00000000..6dba7d81
Binary files /dev/null and b/main/manual/images/titles/alien_sterkman.gif differ
diff --git a/main/manual/images/titles/alien_victory.gif b/main/manual/images/titles/alien_victory.gif
new file mode 100644
index 00000000..30c79cc4
Binary files /dev/null and b/main/manual/images/titles/alien_victory.gif differ
diff --git a/main/manual/images/titles/front.gif b/main/manual/images/titles/front.gif
new file mode 100644
index 00000000..a882c7a1
Binary files /dev/null and b/main/manual/images/titles/front.gif differ
diff --git a/main/manual/images/titles/front_armor.gif b/main/manual/images/titles/front_armor.gif
new file mode 100644
index 00000000..0b5526c1
Binary files /dev/null and b/main/manual/images/titles/front_armor.gif differ
diff --git a/main/manual/images/titles/front_building.gif b/main/manual/images/titles/front_building.gif
new file mode 100644
index 00000000..bf05e9e6
Binary files /dev/null and b/main/manual/images/titles/front_building.gif differ
diff --git a/main/manual/images/titles/front_choosing.gif b/main/manual/images/titles/front_choosing.gif
new file mode 100644
index 00000000..2c6c3a49
Binary files /dev/null and b/main/manual/images/titles/front_choosing.gif differ
diff --git a/main/manual/images/titles/front_commandduties.gif b/main/manual/images/titles/front_commandduties.gif
new file mode 100644
index 00000000..16a5d8be
Binary files /dev/null and b/main/manual/images/titles/front_commandduties.gif differ
diff --git a/main/manual/images/titles/front_commander.gif b/main/manual/images/titles/front_commander.gif
new file mode 100644
index 00000000..972ca0b2
Binary files /dev/null and b/main/manual/images/titles/front_commander.gif differ
diff --git a/main/manual/images/titles/front_commandhud.gif b/main/manual/images/titles/front_commandhud.gif
new file mode 100644
index 00000000..1228f19d
Binary files /dev/null and b/main/manual/images/titles/front_commandhud.gif differ
diff --git a/main/manual/images/titles/front_commandstrats.gif b/main/manual/images/titles/front_commandstrats.gif
new file mode 100644
index 00000000..64dac6e9
Binary files /dev/null and b/main/manual/images/titles/front_commandstrats.gif differ
diff --git a/main/manual/images/titles/front_communicating.gif b/main/manual/images/titles/front_communicating.gif
new file mode 100644
index 00000000..3f28813c
Binary files /dev/null and b/main/manual/images/titles/front_communicating.gif differ
diff --git a/main/manual/images/titles/front_droppingequip.gif b/main/manual/images/titles/front_droppingequip.gif
new file mode 100644
index 00000000..3231e367
Binary files /dev/null and b/main/manual/images/titles/front_droppingequip.gif differ
diff --git a/main/manual/images/titles/front_equipment.gif b/main/manual/images/titles/front_equipment.gif
new file mode 100644
index 00000000..aab0a9d3
Binary files /dev/null and b/main/manual/images/titles/front_equipment.gif differ
diff --git a/main/manual/images/titles/front_friendlyfire.gif b/main/manual/images/titles/front_friendlyfire.gif
new file mode 100644
index 00000000..05b01406
Binary files /dev/null and b/main/manual/images/titles/front_friendlyfire.gif differ
diff --git a/main/manual/images/titles/front_gridlock.gif b/main/manual/images/titles/front_gridlock.gif
new file mode 100644
index 00000000..3bdecddd
Binary files /dev/null and b/main/manual/images/titles/front_gridlock.gif differ
diff --git a/main/manual/images/titles/front_marine.gif b/main/manual/images/titles/front_marine.gif
new file mode 100644
index 00000000..a743639d
Binary files /dev/null and b/main/manual/images/titles/front_marine.gif differ
diff --git a/main/manual/images/titles/front_marinehud.gif b/main/manual/images/titles/front_marinehud.gif
new file mode 100644
index 00000000..6b6eb158
Binary files /dev/null and b/main/manual/images/titles/front_marinehud.gif differ
diff --git a/main/manual/images/titles/front_nano.gif b/main/manual/images/titles/front_nano.gif
new file mode 100644
index 00000000..2e35ddfd
Binary files /dev/null and b/main/manual/images/titles/front_nano.gif differ
diff --git a/main/manual/images/titles/front_phasetech.gif b/main/manual/images/titles/front_phasetech.gif
new file mode 100644
index 00000000..6189523c
Binary files /dev/null and b/main/manual/images/titles/front_phasetech.gif differ
diff --git a/main/manual/images/titles/front_reclamarray.gif b/main/manual/images/titles/front_reclamarray.gif
new file mode 100644
index 00000000..580e45d2
Binary files /dev/null and b/main/manual/images/titles/front_reclamarray.gif differ
diff --git a/main/manual/images/titles/front_research.gif b/main/manual/images/titles/front_research.gif
new file mode 100644
index 00000000..165c0578
Binary files /dev/null and b/main/manual/images/titles/front_research.gif differ
diff --git a/main/manual/images/titles/front_resources.gif b/main/manual/images/titles/front_resources.gif
new file mode 100644
index 00000000..6bf67e41
Binary files /dev/null and b/main/manual/images/titles/front_resources.gif differ
diff --git a/main/manual/images/titles/front_resourcesandequip.gif b/main/manual/images/titles/front_resourcesandequip.gif
new file mode 100644
index 00000000..e6964821
Binary files /dev/null and b/main/manual/images/titles/front_resourcesandequip.gif differ
diff --git a/main/manual/images/titles/front_sterkman.gif b/main/manual/images/titles/front_sterkman.gif
new file mode 100644
index 00000000..0218572e
Binary files /dev/null and b/main/manual/images/titles/front_sterkman.gif differ
diff --git a/main/manual/images/titles/front_structures.gif b/main/manual/images/titles/front_structures.gif
new file mode 100644
index 00000000..d8853cc6
Binary files /dev/null and b/main/manual/images/titles/front_structures.gif differ
diff --git a/main/manual/images/titles/front_upgrades.gif b/main/manual/images/titles/front_upgrades.gif
new file mode 100644
index 00000000..a0de655c
Binary files /dev/null and b/main/manual/images/titles/front_upgrades.gif differ
diff --git a/main/manual/images/titles/front_victory.gif b/main/manual/images/titles/front_victory.gif
new file mode 100644
index 00000000..e311dfcc
Binary files /dev/null and b/main/manual/images/titles/front_victory.gif differ
diff --git a/main/manual/images/titles/front_votingoutcom.gif b/main/manual/images/titles/front_votingoutcom.gif
new file mode 100644
index 00000000..e9d7bcd6
Binary files /dev/null and b/main/manual/images/titles/front_votingoutcom.gif differ
diff --git a/main/manual/images/titles/front_weaponry.gif b/main/manual/images/titles/front_weaponry.gif
new file mode 100644
index 00000000..355c8407
Binary files /dev/null and b/main/manual/images/titles/front_weaponry.gif differ
diff --git a/main/manual/images/titles/general.gif b/main/manual/images/titles/general.gif
new file mode 100644
index 00000000..670b0000
Binary files /dev/null and b/main/manual/images/titles/general.gif differ
diff --git a/main/manual/images/titles/general_aliens.gif b/main/manual/images/titles/general_aliens.gif
new file mode 100644
index 00000000..b2442e22
Binary files /dev/null and b/main/manual/images/titles/general_aliens.gif differ
diff --git a/main/manual/images/titles/general_front.gif b/main/manual/images/titles/general_front.gif
new file mode 100644
index 00000000..bae56d5a
Binary files /dev/null and b/main/manual/images/titles/general_front.gif differ
diff --git a/main/manual/images/titles/general_tsa.gif b/main/manual/images/titles/general_tsa.gif
new file mode 100644
index 00000000..5e3a01cc
Binary files /dev/null and b/main/manual/images/titles/general_tsa.gif differ
diff --git a/main/manual/images/titles/introduction.gif b/main/manual/images/titles/introduction.gif
new file mode 100644
index 00000000..51945b21
Binary files /dev/null and b/main/manual/images/titles/introduction.gif differ
diff --git a/main/manual/images/titles/weapons_gl.gif b/main/manual/images/titles/weapons_gl.gif
new file mode 100644
index 00000000..895f582f
Binary files /dev/null and b/main/manual/images/titles/weapons_gl.gif differ
diff --git a/main/manual/images/titles/weapons_handgun.gif b/main/manual/images/titles/weapons_handgun.gif
new file mode 100644
index 00000000..6694afaf
Binary files /dev/null and b/main/manual/images/titles/weapons_handgun.gif differ
diff --git a/main/manual/images/titles/weapons_heavya.gif b/main/manual/images/titles/weapons_heavya.gif
new file mode 100644
index 00000000..9d718e54
Binary files /dev/null and b/main/manual/images/titles/weapons_heavya.gif differ
diff --git a/main/manual/images/titles/weapons_hmg.gif b/main/manual/images/titles/weapons_hmg.gif
new file mode 100644
index 00000000..9a12bf82
Binary files /dev/null and b/main/manual/images/titles/weapons_hmg.gif differ
diff --git a/main/manual/images/titles/weapons_jetpacks.gif b/main/manual/images/titles/weapons_jetpacks.gif
new file mode 100644
index 00000000..477c116c
Binary files /dev/null and b/main/manual/images/titles/weapons_jetpacks.gif differ
diff --git a/main/manual/images/titles/weapons_knife.gif b/main/manual/images/titles/weapons_knife.gif
new file mode 100644
index 00000000..9e48020a
Binary files /dev/null and b/main/manual/images/titles/weapons_knife.gif differ
diff --git a/main/manual/images/titles/weapons_lmg.gif b/main/manual/images/titles/weapons_lmg.gif
new file mode 100644
index 00000000..2ebfa2c6
Binary files /dev/null and b/main/manual/images/titles/weapons_lmg.gif differ
diff --git a/main/manual/images/titles/weapons_shotgun.gif b/main/manual/images/titles/weapons_shotgun.gif
new file mode 100644
index 00000000..2e832a1a
Binary files /dev/null and b/main/manual/images/titles/weapons_shotgun.gif differ
diff --git a/main/manual/images/titles/weapons_siege.gif b/main/manual/images/titles/weapons_siege.gif
new file mode 100644
index 00000000..9f2e1681
Binary files /dev/null and b/main/manual/images/titles/weapons_siege.gif differ
diff --git a/main/manual/images/titles/weapons_tripmines.gif b/main/manual/images/titles/weapons_tripmines.gif
new file mode 100644
index 00000000..e73c50c8
Binary files /dev/null and b/main/manual/images/titles/weapons_tripmines.gif differ
diff --git a/main/manual/images/titles/weapons_turrets.gif b/main/manual/images/titles/weapons_turrets.gif
new file mode 100644
index 00000000..9bab941d
Binary files /dev/null and b/main/manual/images/titles/weapons_turrets.gif differ
diff --git a/main/manual/images/titles/weapons_welders.gif b/main/manual/images/titles/weapons_welders.gif
new file mode 100644
index 00000000..8f1583ca
Binary files /dev/null and b/main/manual/images/titles/weapons_welders.gif differ
diff --git a/main/manual/index.html b/main/manual/index.html
new file mode 100644
index 00000000..89d71f98
--- /dev/null
+++ b/main/manual/index.html
@@ -0,0 +1,200 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power_anim.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_initial.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600">Introduction</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/introduction.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td width="200"> 
+                              <p><img src="images/images/tsalogo.gif" width="193" height="222"><br>
+                                <br>
+                                <img src="images/images/tsa_motto.gif" width="200" height="36"></p>
+                            </td>
+                            <td> 
+                              <p><b>Greetings Frontiersman! </b>If you're reading 
+                                this, you've just received your field uniform 
+                                and posting to a TSA training facility. Congratulations! 
+                                You have had the courage to take a stand and head 
+                                into great danger, at what is possibly the most 
+                                crucial point in human history. You are not just 
+                                the elite of all the militaries of all the governments 
+                                and corporations that exist; you are a rare soul, 
+                                who has risen above centuries of prejudice and 
+                                violence to find your destiny on the front lines 
+                                of freedom and honor, putting duty to mankind 
+                                ahead of all else.</p>
+                              <p>This document is an overview of Frontiersmen 
+                                deployment, weaponry and equipment, and a corresponding 
+                                examination of the alien's deployment and armaments. 
+                                Every recruit is given a copy &#150; but not every 
+                                recruit reads it. Familiarize yourself, and you'll 
+                                be ahead of the curve. </p>
+                              </td>
+                          </tr>
+                          <tr> 
+                            <td colspan="2"> 
+                              <p>This information is considered Yellow Classified 
+                                &#150; it's probably not a secret to anyone with a 
+                                spy network, but some bits of this knowledge might 
+                                still be unknown &#150; and you can bet the general 
+                                public is mostly clueless. So &#150; don't discuss 
+                                it outside of TSA walls. Better yet, clear <u>all</u> 
+                                TSA related correspondence with the media office.<br>
+                              </p>
+                              <table width="628" border="1" cellspacing="0" cellpadding="0" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                                <tr> 
+                                  <td> 
+                                    <table border="0" cellspacing="0" cellpadding="3" align="center" width="100%">
+                                      <tr> 
+                                        <td width="25%"> 
+                                          <p align="center"><a href="general.html">General 
+                                            Data </a></p>
+                                        </td>
+                                        <td width="25%"> 
+                                          <div align="center"><a href="frontiersmen.html">Frontiersmen 
+                                            Data</a></div>
+                                        </td>
+                                        <td width="25%"> 
+                                          <div align="center"><a href="alien.html">Kharaa 
+                                            Data</a></div>
+                                        </td>
+                                        <td width="25%"> 
+                                          <div align="center"><a href="notes.html">Manual 
+                                            Notes</a></div>
+                                        </td>
+                                      </tr>
+                                    </table>
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"></div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/introduction.html b/main/manual/introduction.html
new file mode 100644
index 00000000..89d71f98
--- /dev/null
+++ b/main/manual/introduction.html
@@ -0,0 +1,200 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power_anim.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_initial.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600">Introduction</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/introduction.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td width="200"> 
+                              <p><img src="images/images/tsalogo.gif" width="193" height="222"><br>
+                                <br>
+                                <img src="images/images/tsa_motto.gif" width="200" height="36"></p>
+                            </td>
+                            <td> 
+                              <p><b>Greetings Frontiersman! </b>If you're reading 
+                                this, you've just received your field uniform 
+                                and posting to a TSA training facility. Congratulations! 
+                                You have had the courage to take a stand and head 
+                                into great danger, at what is possibly the most 
+                                crucial point in human history. You are not just 
+                                the elite of all the militaries of all the governments 
+                                and corporations that exist; you are a rare soul, 
+                                who has risen above centuries of prejudice and 
+                                violence to find your destiny on the front lines 
+                                of freedom and honor, putting duty to mankind 
+                                ahead of all else.</p>
+                              <p>This document is an overview of Frontiersmen 
+                                deployment, weaponry and equipment, and a corresponding 
+                                examination of the alien's deployment and armaments. 
+                                Every recruit is given a copy &#150; but not every 
+                                recruit reads it. Familiarize yourself, and you'll 
+                                be ahead of the curve. </p>
+                              </td>
+                          </tr>
+                          <tr> 
+                            <td colspan="2"> 
+                              <p>This information is considered Yellow Classified 
+                                &#150; it's probably not a secret to anyone with a 
+                                spy network, but some bits of this knowledge might 
+                                still be unknown &#150; and you can bet the general 
+                                public is mostly clueless. So &#150; don't discuss 
+                                it outside of TSA walls. Better yet, clear <u>all</u> 
+                                TSA related correspondence with the media office.<br>
+                              </p>
+                              <table width="628" border="1" cellspacing="0" cellpadding="0" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                                <tr> 
+                                  <td> 
+                                    <table border="0" cellspacing="0" cellpadding="3" align="center" width="100%">
+                                      <tr> 
+                                        <td width="25%"> 
+                                          <p align="center"><a href="general.html">General 
+                                            Data </a></p>
+                                        </td>
+                                        <td width="25%"> 
+                                          <div align="center"><a href="frontiersmen.html">Frontiersmen 
+                                            Data</a></div>
+                                        </td>
+                                        <td width="25%"> 
+                                          <div align="center"><a href="alien.html">Kharaa 
+                                            Data</a></div>
+                                        </td>
+                                        <td width="25%"> 
+                                          <div align="center"><a href="notes.html">Manual 
+                                            Notes</a></div>
+                                        </td>
+                                      </tr>
+                                    </table>
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"></div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/items_ammo.html b/main/manual/items_ammo.html
new file mode 100644
index 00000000..354aa698
--- /dev/null
+++ b/main/manual/items_ammo.html
@@ -0,0 +1,202 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span><span class="sectiontext"> 
+            ::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span><span class="sectiontext"> <span class="sectiontext">::</span> 
+            <span class="sectionlink"><a href="front_comduties.html"> Command 
+            Duties</a></span><span class="sectiontext"> <span class="sectiontext">::</span> 
+            <span class="sectionlink"><a href="items_main.html"> Equipment</a></span></span>: 
+            <font color="#FF6600">Ammo</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+              <tr> 
+                <td align="center" valign="top"> 
+                  <table width="100" border="0" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td>
+                        <div align="center"><img src="images/titles/front_equipment.gif" width="628" height="25" hspace="25"></div>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> The commander can create weapons, 
+                                ammo packs and health packs. Weapons can only 
+                                be placed within range of the appropriate <a href="structures.html">structure</a>. 
+                                Jet packs and heavy armor are also dropped.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p><img src="images/images/10_hud.gif" width="11" height="10"> 
+                                Select the desired equipment from the equipment 
+                                <a href="front_comhud_menu.html">menu</a>, and 
+                                place the icon over an approved location (see 
+                                equipment descriptions).</p>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td height="39"> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td width="32%"><img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="items_weapons.html"> Weapons</a><br>
+                                    <a href="images/tech_10/heavya.gif"><img src="images/tech_10/jetpacks2.gif" width="15" height="15" border="0"></a> 
+                                    <a href="items_jetpacksha.html">Jet packs 
+                                    and Heavy Armor</a><br>
+                                    <img src="images/tech_10/scan.gif" width="15" height="15"> 
+                                    <a href="items_scanner.html">Scanner Sweeps</a><br>
+                                  </td>
+                                  <td width="34%"><img src="images/tech_10/ammopack.gif" width="15" height="15"> 
+                                    <a href="items_ammo.html">Ammo</a><br>
+                                    <img src="images/tech_10/healthpack.gif" width="15" height="15"> 
+                                    <a href="items_medkit.html">Medkits</a><br>
+                                    <img src="images/tech_10/lightspeed.gif" width="15" height="15"> 
+                                    <a href="items_distress.html">Distress Beacon</a> 
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="100" border="0" cellspacing="0" cellpadding="0">
+                          <tr> 
+                            <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                          </tr>
+                        </table>
+                        <table width="616" border="0" cellspacing="0" cellpadding="0" align="center">
+                          <tr> 
+                            <td valign="top"> 
+                              <p><b>Ammo </b><br>
+                                Ammo packs are mini nano-generators, primed to 
+                                become one of the five ammo types. Ammo can be 
+                                dropped anywhere. When picked up, they interface 
+                                with marine armor, and stabilize as ammo for whichever 
+                                gun type the marine is using. Ammo can also be 
+                                obtained from the <a href="structures_armory.html">armory</a>.</p>
+                              </td>
+                            <td valign="middle"> <img src="images/tech/ammopack.gif" width="64" height="64"> 
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+                  <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                    <tr> 
+                      <td align="center" valign="top"> 
+                        <div align="center"> </div>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+            <blockquote>
+<blockquote>&nbsp;</blockquote>
+            </blockquote>
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/items_distress.html b/main/manual/items_distress.html
new file mode 100644
index 00000000..e04a9b4a
--- /dev/null
+++ b/main/manual/items_distress.html
@@ -0,0 +1,209 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span><span class="sectiontext"> 
+            ::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            ...</a></span><span class="sectiontext"> <span class="sectiontext">::</span> 
+            <span class="sectionlink"><a href="front_comduties.html"> Command 
+            Duties</a></span><span class="sectiontext"> <span class="sectiontext">::</span> 
+            <span class="sectionlink"><a href="items_main.html"> Equipment</a></span></span>: 
+            <font color="#FF6600">Distress Beacon</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+              <tr> 
+                <td align="center" valign="top"> 
+                  <table width="100" border="0" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td>
+                        <div align="center"><img src="images/titles/front_equipment.gif" width="628" height="25" hspace="25"></div>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> The commander can create weapons, 
+                                ammo packs and health packs. Weapons can only 
+                                be placed within range of the appropriate <a href="structures.html">structure</a>. 
+                                Jet packs and heavy armor are also dropped.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p><img src="images/images/10_hud.gif" width="11" height="10"> 
+                                Select the desired equipment from the equipment 
+                                <a href="front_comhud_menu.html">menu</a>, and 
+                                place the icon over an approved location (see 
+                                equipment descriptions).</p>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td height="39"> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td width="32%"><img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="items_weapons.html"> Weapons</a><br>
+                                    <a href="images/tech_10/heavya.gif"><img src="images/tech_10/jetpacks2.gif" width="15" height="15" border="0"></a> 
+                                    <a href="items_jetpacksha.html">Jet packs 
+                                    and Heavy Armor</a><br>
+                                    <img src="images/tech_10/scan.gif" width="15" height="15"> 
+                                    <a href="items_scanner.html">Scanner Sweeps</a><br>
+                                  </td>
+                                  <td width="34%"><img src="images/tech_10/ammopack.gif" width="15" height="15"> 
+                                    <a href="items_ammo.html">Ammo</a><br>
+                                    <img src="images/tech_10/healthpack.gif" width="15" height="15"> 
+                                    <a href="items_medkit.html">Medkits</a><br>
+                                    <img src="images/tech_10/lightspeed.gif" width="15" height="15"> 
+                                    <a href="items_distress.html">Distress Beacon</a> 
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="100" border="0" cellspacing="0" cellpadding="0">
+                          <tr> 
+                            <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                          </tr>
+                        </table>
+                        <table width="616" border="0" cellspacing="0" cellpadding="0" align="center">
+                          <tr> 
+                            <td valign="top"> 
+                              <p><b>Distress Beacon</b><br>
+                                The <a href="structures_observatory.html">observatory</a> 
+                                punches through the nano-gridlock, sending an 
+                                emergency signal to the neighboring dropship. 
+                                The dropship immediately sends reinforcements, 
+                                homing in on the signal's location, and spending 
+                                large amounts of energy to create temporary &quot;subject 
+                                fields&quot; out of the construction nanos in 
+                                the ceiling-based command network. The squad immediately 
+                                returns to full deployment. The reinforcements 
+                                get there every time, but it is incredibly stressful 
+                                and dangerous for the dropship's engines (not 
+                                to mention the dropship's commander). See <a href="front_phasetech.html">phase 
+                                technology</a> for more information on phase travel.</p>
+                              </td>
+                            <td valign="middle"> <img src="images/tech/lightspeed.gif" width="64" height="64"><br>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+                  <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                    <tr> 
+                      <td align="center" valign="top"> 
+                        <div align="center"> </div>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+            <blockquote>
+<blockquote>&nbsp;</blockquote>
+            </blockquote>
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/items_jetpacksha.html b/main/manual/items_jetpacksha.html
new file mode 100644
index 00000000..8dd4d593
--- /dev/null
+++ b/main/manual/items_jetpacksha.html
@@ -0,0 +1,207 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span><span class="sectiontext"> 
+            ::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            ...</a></span><span class="sectiontext"> <span class="sectiontext">::</span> 
+            <span class="sectionlink"><a href="front_comduties.html"> Command 
+            Duties</a></span><span class="sectiontext"> <span class="sectiontext">::</span> 
+            <span class="sectionlink"><a href="items_main.html"> Equipment</a></span></span>: 
+            <font color="#FF6600">Jetpacks and Heavy Armor</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+              <tr> 
+                <td align="center" valign="top"> 
+                  <table width="100" border="0" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td>
+                        <div align="center"><img src="images/titles/front_equipment.gif" width="628" height="25" hspace="25"></div>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> The commander can create weapons, 
+                                ammo packs and health packs. Weapons can only 
+                                be placed within range of the appropriate <a href="structures.html">structure</a>. 
+                                Jet packs and heavy armor are also dropped.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p><img src="images/images/10_hud.gif" width="11" height="10"> 
+                                Select the desired equipment from the equipment 
+                                <a href="front_comhud_menu.html">menu</a>, and 
+                                place the icon over an approved location (see 
+                                equipment descriptions).</p>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td height="39"> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td width="32%"><img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="items_weapons.html"> Weapons</a><br>
+                                    <a href="images/tech_10/heavya.gif"><img src="images/tech_10/jetpacks2.gif" width="15" height="15" border="0"></a> 
+                                    <a href="items_jetpacksha.html">Jet packs 
+                                    and Heavy Armor</a><br>
+                                    <img src="images/tech_10/scan.gif" width="15" height="15"> 
+                                    <a href="items_scanner.html">Scanner Sweeps</a><br>
+                                  </td>
+                                  <td width="34%"><img src="images/tech_10/ammopack.gif" width="15" height="15"> 
+                                    <a href="items_ammo.html">Ammo</a><br>
+                                    <img src="images/tech_10/healthpack.gif" width="15" height="15"> 
+                                    <a href="items_medkit.html">Medkits</a><br>
+                                    <img src="images/tech_10/lightspeed.gif" width="15" height="15"> 
+                                    <a href="items_distress.html">Distress Beacon</a> 
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="100" border="0" cellspacing="0" cellpadding="0">
+                          <tr> 
+                            <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                          </tr>
+                        </table>
+                        <table width="616" border="0" cellspacing="0" cellpadding="0" align="center">
+                          <tr> 
+                            <td valign="top"> 
+                              <p><b>Jet packs and Heavy armor</b><br>
+                                <a href="weapons_jetpack.html">Jet packs</a> and 
+                                <a href="weapons_ha.html">heavy armor</a> work 
+                                like <a href="front_upgrades.html">upgrades</a> 
+                                (providing enhanced abilities for marines) but 
+                                must be purchased and dropped individually for 
+                                each marine, like weapons. For this reason they 
+                                are listed and explained in the <a href="weapons_main.html">weaponry</a> 
+                                section. This equipment can only be dropped with 
+                                range of a <a href="structures_protolab.html">prototype 
+                                lab</a>.</p>
+                              </td>
+                            <td valign="middle"> <img src="images/tech/jetpacks2.gif" width="64" height="64"><br>
+                              <img src="images/tech/heavya.gif" width="64" height="64" vspace="2"> 
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+                  <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                    <tr> 
+                      <td align="center" valign="top"> 
+                        <div align="center"> </div>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+            <blockquote>
+<blockquote>&nbsp;</blockquote>
+            </blockquote>
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/items_main.html b/main/manual/items_main.html
new file mode 100644
index 00000000..d6527698
--- /dev/null
+++ b/main/manual/items_main.html
@@ -0,0 +1,192 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span><span class="sectiontext"> 
+            ::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span><span class="sectiontext"> <span class="sectiontext">::</span> 
+            <span class="sectionlink"><a href="front_comduties.html"> Command 
+            Duties</a></span>: <font color="#FF6600">Equipment</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+              <tr> 
+                <td align="center" valign="top"> 
+                  <table width="100" border="0" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td><img src="images/titles/front_equipment.gif" width="628" height="25" hspace="25"></td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> The commander can create weapons, 
+                                ammo packs and medkits. Weapons can only be placed 
+                                within range of an <a href="structures_armory.html">armory</a> 
+                                (or <a href="structures_advarmory.html">advanced 
+                                armory</a>). Jet packs and heavy armor may only 
+                                be deployed with range of a <a href="structures_protolab.html">prototype 
+                                lab</a>. Scanner sweeps and distress beacons are 
+                                also, in a way, equipment, and so are listed here.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p><img src="images/images/10_hud.gif" width="11" height="10"> 
+                                Select the desired equipment from the equipment 
+                                <a href="front_comhud_menu.html">menu</a>, and 
+                                place the icon over an approved location (see 
+                                equipment descriptions).<br>
+                                <br>
+                                <img src="images/images/10_data.gif" width="13" height="10"> 
+                                A commander can induce the local network to produce 
+                                an accepted blueprint from its ceiling nodules. 
+                                In other words, the commander can drop weapons, 
+                                ammo, and medkits from the ceiling, spending resources 
+                                to create them. Scanner sweeps and distress beacons 
+                                also involve material manipulation of the command 
+                                network's ceiling construction nanos, and so are 
+                                listed here. </p>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td height="39"> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td width="32%"><img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="items_weapons.html"> Weapons</a><br>
+                                    <a href="images/tech_10/heavya.gif"><img src="images/tech_10/jetpacks2.gif" width="15" height="15" border="0"></a> 
+                                    <a href="items_jetpacksha.html">Jet packs 
+                                    and Heavy Armor</a><br>
+                                    <img src="images/tech_10/scan.gif" width="15" height="15"> 
+                                    <a href="items_scanner.html">Scanner Sweeps</a><br>
+                                    </td>
+                                  <td width="34%"><img src="images/tech_10/ammopack.gif" width="15" height="15"> 
+                                    <a href="items_ammo.html">Ammo</a><br>
+                                    <img src="images/tech_10/healthpack.gif" width="15" height="15"> 
+                                    <a href="items_medkit.html">Medkits</a><br>
+                                    <img src="images/tech_10/lightspeed.gif" width="15" height="15"> 
+                                    <a href="items_distress.html">Distress Beacon</a> 
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+                  <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                    <tr> 
+                      <td align="center" valign="top"> 
+                        <div align="center"> </div>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+            <blockquote>
+              <blockquote>&nbsp;</blockquote>
+            </blockquote>
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/items_medkit.html b/main/manual/items_medkit.html
new file mode 100644
index 00000000..74201e2d
--- /dev/null
+++ b/main/manual/items_medkit.html
@@ -0,0 +1,205 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span><span class="sectiontext"> 
+            ::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span><span class="sectiontext"> <span class="sectiontext">::</span> 
+            <span class="sectionlink"><a href="front_comduties.html"> Command 
+            Duties</a></span><span class="sectiontext"> <span class="sectiontext">::</span> 
+            <span class="sectionlink"><a href="items_main.html"> Equipment</a></span></span>: 
+            <font color="#FF6600">Medkits</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+              <tr> 
+                <td align="center" valign="top"> 
+                  <table width="100" border="0" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td>
+                        <div align="center"><img src="images/titles/front_equipment.gif" width="628" height="25" hspace="25"></div>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td>
+<table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> The commander can create weapons, 
+                                ammo packs and health packs. Weapons can only 
+                                be placed within range of the appropriate <a href="structures.html">structure</a>. 
+                                Jet packs and heavy armor are also dropped.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td>
+<table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p><img src="images/images/10_hud.gif" width="11" height="10"> 
+                                Select the desired equipment from the equipment 
+                                <a href="front_comhud_menu.html">menu</a>, and 
+                                place the icon over an approved location (see 
+                                equipment descriptions).</p>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td height="39"> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td width="32%"><img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="items_weapons.html"> Weapons</a><br>
+                                    <a href="images/tech_10/heavya.gif"><img src="images/tech_10/jetpacks2.gif" width="15" height="15" border="0"></a> 
+                                    <a href="items_jetpacksha.html">Jet packs 
+                                    and Heavy Armor</a><br>
+                                    <img src="images/tech_10/scan.gif" width="15" height="15"> 
+                                    <a href="items_scanner.html">Scanner Sweeps</a><br>
+                                  </td>
+                                  <td width="34%"><img src="images/tech_10/ammopack.gif" width="15" height="15"> 
+                                    <a href="items_ammo.html">Ammo</a><br>
+                                    <img src="images/tech_10/healthpack.gif" width="15" height="15"> 
+                                    <a href="items_medkit.html">Medkits</a><br>
+                                    <img src="images/tech_10/lightspeed.gif" width="15" height="15"> 
+                                    <a href="items_distress.html">Distress Beacon</a> 
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="100" border="0" cellspacing="0" cellpadding="0">
+                          <tr> 
+                            <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                          </tr>
+                        </table>
+                        <table width="616" border="0" cellspacing="0" cellpadding="0" align="center">
+                          <tr> 
+                            <td valign="top"> 
+                              <p><b>Health Packs</b><br>
+                                Often referred to as &quot;health packs,&quot; 
+                                medkits interface with a Frontiersman's armor, 
+                                releasing targeted bursts of medical nanites directly 
+                                to damaged areas. Medkits can be dropped anywhere. 
+                                Medical nanites have not been approved for civil 
+                                use, and have been shown to have severe long-term 
+                                side effects. Frontiersmen philosophy is that 
+                                <i>death</i> is a long-term side effect. Other 
+                                risks are just part of the job.</p>
+                              </td>
+                            <td valign="middle"> <img src="images/tech/healthpack.gif" width="64" height="64"> 
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+                  <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                    <tr> 
+                      <td align="center" valign="top"> 
+                        <div align="center"> </div>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+            <blockquote>
+<blockquote>&nbsp;</blockquote>
+            </blockquote>
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/items_scanner.html b/main/manual/items_scanner.html
new file mode 100644
index 00000000..f2ab49c8
--- /dev/null
+++ b/main/manual/items_scanner.html
@@ -0,0 +1,206 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span><span class="sectiontext"> 
+            ::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            ...</a></span><span class="sectiontext"> <span class="sectiontext">::</span> 
+            <span class="sectionlink"><a href="front_comduties.html"> Command 
+            Duties</a></span><span class="sectiontext"> <span class="sectiontext">::</span> 
+            <span class="sectionlink"><a href="items_main.html"> Equipment</a></span></span>: 
+            <font color="#FF6600">Scanner Sweeps</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+              <tr> 
+                <td align="center" valign="top"> 
+                  <table width="100" border="0" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td>
+                        <div align="center"><img src="images/titles/front_equipment.gif" width="628" height="25" hspace="25"></div>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> The commander can create weapons, 
+                                ammo packs and health packs. Weapons can only 
+                                be placed within range of the appropriate <a href="structures.html">structure</a>. 
+                                Jet packs and heavy armor are also dropped.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p><img src="images/images/10_hud.gif" width="11" height="10"> 
+                                Select the desired equipment from the equipment 
+                                <a href="front_comhud_menu.html">menu</a>, and 
+                                place the icon over an approved location (see 
+                                equipment descriptions).</p>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td height="39"> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td width="32%"><img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="items_weapons.html"> Weapons</a><br>
+                                    <a href="images/tech_10/heavya.gif"><img src="images/tech_10/jetpacks2.gif" width="15" height="15" border="0"></a> 
+                                    <a href="items_jetpacksha.html">Jet packs 
+                                    and Heavy Armor</a><br>
+                                    <img src="images/tech_10/scan.gif" width="15" height="15"> 
+                                    <a href="items_scanner.html">Scanner Sweeps</a><br>
+                                  </td>
+                                  <td width="34%"><img src="images/tech_10/ammopack.gif" width="15" height="15"> 
+                                    <a href="items_ammo.html">Ammo</a><br>
+                                    <img src="images/tech_10/healthpack.gif" width="15" height="15"> 
+                                    <a href="items_medkit.html">Medkits</a><br>
+                                    <img src="images/tech_10/lightspeed.gif" width="15" height="15"> 
+                                    <a href="items_distress.html">Distress Beacon</a> 
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="100" border="0" cellspacing="0" cellpadding="0">
+                          <tr> 
+                            <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                          </tr>
+                        </table>
+                        <table width="616" border="0" cellspacing="0" cellpadding="0" align="center">
+                          <tr> 
+                            <td valign="top"> 
+                              <p><b>Scanner Sweeps</b><br>
+                                By linking the <a href="structures_observatory.html">observatory</a> 
+                                to the <a href="front_commander.html">command 
+                                network</a> and dropping a packet of microscopic 
+                                nano-sensors, a surging field of energy can be 
+                                created at any location of the commander's choosing. 
+                                This field lasts for a brief time, and reveals 
+                                all Kharaa lifeforms and structures, including 
+                                <a href="alien_evolutions_cloaking.html">cloaked</a> 
+                                aliens. It is especially useful for planning assaults, 
+                                or finding the location of active <a href="alien_hive.html">hives</a>.</p>
+                              </td>
+                            <td valign="middle"> <img src="images/tech/scan.gif" width="64" height="64"><br>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+                  <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                    <tr> 
+                      <td align="center" valign="top"> 
+                        <div align="center"> </div>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+            <blockquote>
+<blockquote>&nbsp;</blockquote>
+            </blockquote>
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/items_weapons.html b/main/manual/items_weapons.html
new file mode 100644
index 00000000..c15b40f7
--- /dev/null
+++ b/main/manual/items_weapons.html
@@ -0,0 +1,209 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span><span class="sectiontext"> 
+            ::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span><span class="sectiontext"> <span class="sectiontext">::</span> 
+            <span class="sectionlink"><a href="front_comduties.html"> Command 
+            Duties</a></span><span class="sectiontext"> <span class="sectiontext">::</span> 
+            <span class="sectionlink"><a href="items_main.html"> Equipment</a></span></span>: 
+            <font color="#FF6600">Weapons</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+              <tr> 
+                <td align="center" valign="top"> 
+                  <table width="100" border="0" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td>
+                        <div align="center"><img src="images/titles/front_equipment.gif" width="628" height="25" hspace="25"></div>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <p><b>Summary:</b> The commander can create weapons, 
+                                ammo packs and health packs. Weapons can only 
+                                be placed within range of the appropriate <a href="structures.html">structure</a>. 
+                                Jet packs and heavy armor are also dropped.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p><img src="images/images/10_hud.gif" width="11" height="10"> 
+                                Select the desired equipment from the equipment 
+                                <a href="front_comhud_menu.html">menu</a>, and 
+                                place the icon over an approved location (see 
+                                equipment descriptions).</p>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td height="39"> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td width="32%"><img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="items_weapons.html"> Weapons</a><br>
+                                    <a href="images/tech_10/heavya.gif"><img src="images/tech_10/jetpacks2.gif" width="15" height="15" border="0"></a> 
+                                    <a href="items_jetpacksha.html">Jet packs 
+                                    and Heavy Armor</a><br>
+                                    <img src="images/tech_10/scan.gif" width="15" height="15"> 
+                                    <a href="items_scanner.html">Scanner Sweeps</a><br>
+                                  </td>
+                                  <td width="34%"><img src="images/tech_10/ammopack.gif" width="15" height="15"> 
+                                    <a href="items_ammo.html">Ammo</a><br>
+                                    <img src="images/tech_10/healthpack.gif" width="15" height="15"> 
+                                    <a href="items_medkit.html">Medkits</a><br>
+                                    <img src="images/tech_10/lightspeed.gif" width="15" height="15"> 
+                                    <a href="items_distress.html">Distress Beacon</a> 
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="100" border="0" cellspacing="0" cellpadding="0">
+                          <tr> 
+                            <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                          </tr>
+                        </table>
+                        <table width="616" border="0" cellspacing="0" cellpadding="0" align="center">
+                          <tr> 
+                            <td valign="top"> 
+                              <p><b>Weapons</b><br>
+                                See the <a href="weapons_main.html">weaponry</a> 
+                                section for descriptions. Weapons can only be 
+                                dropped within range (appearing as a green field 
+                                on the command HUD) of an <a href="structures_armory.html">armory</a> 
+                                or <a href="structures_advarmory.html">advanced 
+                                armory</a>. Note that while basic weapons can 
+                                be deployed near any armory, advanced weapons 
+                                can only be deployed near advanced armories. If 
+                                a marine discards a weapon, and it remains on 
+                                the ground for more than a few moments (roughly 
+                                30 seconds), the command network activates its 
+                                recycling protocol and disassembles it. <br>
+                              </p>
+                              </td>
+                            <td valign="middle"> <img src="images/tech/hmg.gif" width="64" height="64"> 
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+                  <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                    <tr> 
+                      <td align="center" valign="top"> 
+                        <div align="center"> </div>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+            <blockquote>
+<blockquote>&nbsp;</blockquote>
+            </blockquote>
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/notes.html b/main/manual/notes.html
new file mode 100644
index 00000000..0e36184d
--- /dev/null
+++ b/main/manual/notes.html
@@ -0,0 +1,160 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power_anim.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_initial.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectiontext"><font color="#FF6600">Manual 
+            Notes</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p class="sectiontext">The following TSA personnel 
+                                are responsible for the creation of this manual:</p>
+                              <p><span class="sectiontext">Jeff Paris</span> &#150; 
+                                Writer, Content Developer <br>
+                                <span class="sectiontext">Mark James</span> &#150; 
+                                Design Concept, Layout, Art<br>
+                                <span class="sectiontext">Daniel Johnson</span> 
+                                &#150; Tech Tree Contributed<br>
+                                <span class="sectiontext">Gareth Eckley</span> 
+                                &#150; invaluable Editing, Proofing, and Critique<br>
+                                <span class="sectiontext">Charlie Cleveland</span> 
+                                &#150; Executive Oversight, Field Expert, and Boss. 
+                              </p>
+                              <p>Any errors or omissions are solely the responsibility 
+                                of Jeff Paris. </p>
+                              <p>No part of this manual or design (including all 
+                                art and content) may be used for any publishing 
+                                or professional use without express consent of 
+                                the authors. </p>
+                              <p>Copyright 2002, Charles G. Cleveland</p>
+                            </td>
+                          </tr>
+                        </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"></div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/quick_start_files/ammo.gif b/main/manual/quick_start_files/ammo.gif
new file mode 100644
index 00000000..cd59e28e
Binary files /dev/null and b/main/manual/quick_start_files/ammo.gif differ
diff --git a/main/manual/quick_start_files/armory.gif b/main/manual/quick_start_files/armory.gif
new file mode 100644
index 00000000..b2a6e0c5
Binary files /dev/null and b/main/manual/quick_start_files/armory.gif differ
diff --git a/main/manual/quick_start_files/arms_lab.gif b/main/manual/quick_start_files/arms_lab.gif
new file mode 100644
index 00000000..c0d15b18
Binary files /dev/null and b/main/manual/quick_start_files/arms_lab.gif differ
diff --git a/main/manual/quick_start_files/comm_icon.gif b/main/manual/quick_start_files/comm_icon.gif
new file mode 100644
index 00000000..55c9d471
Binary files /dev/null and b/main/manual/quick_start_files/comm_icon.gif differ
diff --git a/main/manual/quick_start_files/command_console.gif b/main/manual/quick_start_files/command_console.gif
new file mode 100644
index 00000000..12046dc1
Binary files /dev/null and b/main/manual/quick_start_files/command_console.gif differ
diff --git a/main/manual/quick_start_files/fade.gif b/main/manual/quick_start_files/fade.gif
new file mode 100644
index 00000000..e2b15956
Binary files /dev/null and b/main/manual/quick_start_files/fade.gif differ
diff --git a/main/manual/quick_start_files/gorge.gif b/main/manual/quick_start_files/gorge.gif
new file mode 100644
index 00000000..b090e3ef
Binary files /dev/null and b/main/manual/quick_start_files/gorge.gif differ
diff --git a/main/manual/quick_start_files/grenade_launcher.gif b/main/manual/quick_start_files/grenade_launcher.gif
new file mode 100644
index 00000000..51f11f88
Binary files /dev/null and b/main/manual/quick_start_files/grenade_launcher.gif differ
diff --git a/main/manual/quick_start_files/health.gif b/main/manual/quick_start_files/health.gif
new file mode 100644
index 00000000..02e3d503
Binary files /dev/null and b/main/manual/quick_start_files/health.gif differ
diff --git a/main/manual/quick_start_files/heavy.gif b/main/manual/quick_start_files/heavy.gif
new file mode 100644
index 00000000..50052b8c
Binary files /dev/null and b/main/manual/quick_start_files/heavy.gif differ
diff --git a/main/manual/quick_start_files/hive_icon.gif b/main/manual/quick_start_files/hive_icon.gif
new file mode 100644
index 00000000..c8c31373
Binary files /dev/null and b/main/manual/quick_start_files/hive_icon.gif differ
diff --git a/main/manual/quick_start_files/hmg.gif b/main/manual/quick_start_files/hmg.gif
new file mode 100644
index 00000000..5d94bbf1
Binary files /dev/null and b/main/manual/quick_start_files/hmg.gif differ
diff --git a/main/manual/quick_start_files/inf_portal.gif b/main/manual/quick_start_files/inf_portal.gif
new file mode 100644
index 00000000..c31a3b1a
Binary files /dev/null and b/main/manual/quick_start_files/inf_portal.gif differ
diff --git a/main/manual/quick_start_files/jetpack.gif b/main/manual/quick_start_files/jetpack.gif
new file mode 100644
index 00000000..9cda8174
Binary files /dev/null and b/main/manual/quick_start_files/jetpack.gif differ
diff --git a/main/manual/quick_start_files/join_aliens_sign.gif b/main/manual/quick_start_files/join_aliens_sign.gif
new file mode 100644
index 00000000..e4e1154a
Binary files /dev/null and b/main/manual/quick_start_files/join_aliens_sign.gif differ
diff --git a/main/manual/quick_start_files/join_marines_sign.gif b/main/manual/quick_start_files/join_marines_sign.gif
new file mode 100644
index 00000000..bbdfcf1e
Binary files /dev/null and b/main/manual/quick_start_files/join_marines_sign.gif differ
diff --git a/main/manual/quick_start_files/knife.gif b/main/manual/quick_start_files/knife.gif
new file mode 100644
index 00000000..1bbf03a9
Binary files /dev/null and b/main/manual/quick_start_files/knife.gif differ
diff --git a/main/manual/quick_start_files/lerk.gif b/main/manual/quick_start_files/lerk.gif
new file mode 100644
index 00000000..e62cb903
Binary files /dev/null and b/main/manual/quick_start_files/lerk.gif differ
diff --git a/main/manual/quick_start_files/lmg.gif b/main/manual/quick_start_files/lmg.gif
new file mode 100644
index 00000000..fcd48dd4
Binary files /dev/null and b/main/manual/quick_start_files/lmg.gif differ
diff --git a/main/manual/quick_start_files/mine.gif b/main/manual/quick_start_files/mine.gif
new file mode 100644
index 00000000..49f7cade
Binary files /dev/null and b/main/manual/quick_start_files/mine.gif differ
diff --git a/main/manual/quick_start_files/observatory.gif b/main/manual/quick_start_files/observatory.gif
new file mode 100644
index 00000000..3492c12a
Binary files /dev/null and b/main/manual/quick_start_files/observatory.gif differ
diff --git a/main/manual/quick_start_files/onos.gif b/main/manual/quick_start_files/onos.gif
new file mode 100644
index 00000000..0fa35adc
Binary files /dev/null and b/main/manual/quick_start_files/onos.gif differ
diff --git a/main/manual/quick_start_files/phase_gate.gif b/main/manual/quick_start_files/phase_gate.gif
new file mode 100644
index 00000000..5e8a035f
Binary files /dev/null and b/main/manual/quick_start_files/phase_gate.gif differ
diff --git a/main/manual/quick_start_files/pistol.gif b/main/manual/quick_start_files/pistol.gif
new file mode 100644
index 00000000..30dc08b7
Binary files /dev/null and b/main/manual/quick_start_files/pistol.gif differ
diff --git a/main/manual/quick_start_files/placeholder.gif b/main/manual/quick_start_files/placeholder.gif
new file mode 100644
index 00000000..29c4276d
Binary files /dev/null and b/main/manual/quick_start_files/placeholder.gif differ
diff --git a/main/manual/quick_start_files/proto_lab.gif b/main/manual/quick_start_files/proto_lab.gif
new file mode 100644
index 00000000..b3603318
Binary files /dev/null and b/main/manual/quick_start_files/proto_lab.gif differ
diff --git a/main/manual/quick_start_files/res_tower.gif b/main/manual/quick_start_files/res_tower.gif
new file mode 100644
index 00000000..84b98751
Binary files /dev/null and b/main/manual/quick_start_files/res_tower.gif differ
diff --git a/main/manual/quick_start_files/sentry.gif b/main/manual/quick_start_files/sentry.gif
new file mode 100644
index 00000000..8c3709de
Binary files /dev/null and b/main/manual/quick_start_files/sentry.gif differ
diff --git a/main/manual/quick_start_files/shotgun.gif b/main/manual/quick_start_files/shotgun.gif
new file mode 100644
index 00000000..7a1ac66c
Binary files /dev/null and b/main/manual/quick_start_files/shotgun.gif differ
diff --git a/main/manual/quick_start_files/siege.gif b/main/manual/quick_start_files/siege.gif
new file mode 100644
index 00000000..27cbe66e
Binary files /dev/null and b/main/manual/quick_start_files/siege.gif differ
diff --git a/main/manual/quick_start_files/skulk.gif b/main/manual/quick_start_files/skulk.gif
new file mode 100644
index 00000000..6855f828
Binary files /dev/null and b/main/manual/quick_start_files/skulk.gif differ
diff --git a/main/manual/quick_start_files/turret_factory.gif b/main/manual/quick_start_files/turret_factory.gif
new file mode 100644
index 00000000..fff1f98b
Binary files /dev/null and b/main/manual/quick_start_files/turret_factory.gif differ
diff --git a/main/manual/quick_start_files/upgrade_icon_0.gif b/main/manual/quick_start_files/upgrade_icon_0.gif
new file mode 100644
index 00000000..0d3850bc
Binary files /dev/null and b/main/manual/quick_start_files/upgrade_icon_0.gif differ
diff --git a/main/manual/quick_start_files/upgrade_icon_1.gif b/main/manual/quick_start_files/upgrade_icon_1.gif
new file mode 100644
index 00000000..17c5ee64
Binary files /dev/null and b/main/manual/quick_start_files/upgrade_icon_1.gif differ
diff --git a/main/manual/quick_start_files/upgrade_icon_10.gif b/main/manual/quick_start_files/upgrade_icon_10.gif
new file mode 100644
index 00000000..be47dcfd
Binary files /dev/null and b/main/manual/quick_start_files/upgrade_icon_10.gif differ
diff --git a/main/manual/quick_start_files/upgrade_icon_11.gif b/main/manual/quick_start_files/upgrade_icon_11.gif
new file mode 100644
index 00000000..d716b1cd
Binary files /dev/null and b/main/manual/quick_start_files/upgrade_icon_11.gif differ
diff --git a/main/manual/quick_start_files/upgrade_icon_2.gif b/main/manual/quick_start_files/upgrade_icon_2.gif
new file mode 100644
index 00000000..400d78b1
Binary files /dev/null and b/main/manual/quick_start_files/upgrade_icon_2.gif differ
diff --git a/main/manual/quick_start_files/upgrade_icon_6.gif b/main/manual/quick_start_files/upgrade_icon_6.gif
new file mode 100644
index 00000000..1478049f
Binary files /dev/null and b/main/manual/quick_start_files/upgrade_icon_6.gif differ
diff --git a/main/manual/quick_start_files/upgrade_icon_7.gif b/main/manual/quick_start_files/upgrade_icon_7.gif
new file mode 100644
index 00000000..f3664494
Binary files /dev/null and b/main/manual/quick_start_files/upgrade_icon_7.gif differ
diff --git a/main/manual/quick_start_files/upgrade_icon_8.gif b/main/manual/quick_start_files/upgrade_icon_8.gif
new file mode 100644
index 00000000..abd89e36
Binary files /dev/null and b/main/manual/quick_start_files/upgrade_icon_8.gif differ
diff --git a/main/manual/quick_start_files/upgrade_icon_9.gif b/main/manual/quick_start_files/upgrade_icon_9.gif
new file mode 100644
index 00000000..e00a4cf4
Binary files /dev/null and b/main/manual/quick_start_files/upgrade_icon_9.gif differ
diff --git a/main/manual/quick_start_files/upgrade_icon_a.gif b/main/manual/quick_start_files/upgrade_icon_a.gif
new file mode 100644
index 00000000..ee99d38e
Binary files /dev/null and b/main/manual/quick_start_files/upgrade_icon_a.gif differ
diff --git a/main/manual/quick_start_files/upgrade_icon_b.gif b/main/manual/quick_start_files/upgrade_icon_b.gif
new file mode 100644
index 00000000..c3af2543
Binary files /dev/null and b/main/manual/quick_start_files/upgrade_icon_b.gif differ
diff --git a/main/manual/quick_start_files/upgrade_icon_c.gif b/main/manual/quick_start_files/upgrade_icon_c.gif
new file mode 100644
index 00000000..400a2c6d
Binary files /dev/null and b/main/manual/quick_start_files/upgrade_icon_c.gif differ
diff --git a/main/manual/quick_start_files/upgrade_icon_d.gif b/main/manual/quick_start_files/upgrade_icon_d.gif
new file mode 100644
index 00000000..3e5cea9b
Binary files /dev/null and b/main/manual/quick_start_files/upgrade_icon_d.gif differ
diff --git a/main/manual/quick_start_files/upgrade_icon_e_animated.gif b/main/manual/quick_start_files/upgrade_icon_e_animated.gif
new file mode 100644
index 00000000..62191cee
Binary files /dev/null and b/main/manual/quick_start_files/upgrade_icon_e_animated.gif differ
diff --git a/main/manual/quick_start_files/upgrade_icon_f_animated.gif b/main/manual/quick_start_files/upgrade_icon_f_animated.gif
new file mode 100644
index 00000000..2a50dbcf
Binary files /dev/null and b/main/manual/quick_start_files/upgrade_icon_f_animated.gif differ
diff --git a/main/manual/quick_start_files/upgrade_icon_g.gif b/main/manual/quick_start_files/upgrade_icon_g.gif
new file mode 100644
index 00000000..4190f510
Binary files /dev/null and b/main/manual/quick_start_files/upgrade_icon_g.gif differ
diff --git a/main/manual/quick_start_files/upgrade_icon_h.gif b/main/manual/quick_start_files/upgrade_icon_h.gif
new file mode 100644
index 00000000..963e81a8
Binary files /dev/null and b/main/manual/quick_start_files/upgrade_icon_h.gif differ
diff --git a/main/manual/quick_start_files/upgrade_icon_i.gif b/main/manual/quick_start_files/upgrade_icon_i.gif
new file mode 100644
index 00000000..3aec080e
Binary files /dev/null and b/main/manual/quick_start_files/upgrade_icon_i.gif differ
diff --git a/main/manual/quick_start_files/upgrade_icon_j.gif b/main/manual/quick_start_files/upgrade_icon_j.gif
new file mode 100644
index 00000000..816216c1
Binary files /dev/null and b/main/manual/quick_start_files/upgrade_icon_j.gif differ
diff --git a/main/manual/quick_start_files/upgrade_icon_k.gif b/main/manual/quick_start_files/upgrade_icon_k.gif
new file mode 100644
index 00000000..e0257bc3
Binary files /dev/null and b/main/manual/quick_start_files/upgrade_icon_k.gif differ
diff --git a/main/manual/quick_start_files/welder.gif b/main/manual/quick_start_files/welder.gif
new file mode 100644
index 00000000..3cae4750
Binary files /dev/null and b/main/manual/quick_start_files/welder.gif differ
diff --git a/main/manual/structures.html b/main/manual/structures.html
new file mode 100644
index 00000000..ff083559
--- /dev/null
+++ b/main/manual/structures.html
@@ -0,0 +1,245 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span> <span class="sectiontext">::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span> <span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_comduties.html">Command 
+            Duties</a></span><span class="sectiontext">: <font color="#FF6600">Structures</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          <td><img src="images/titles/front_structures.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          <td> 
+                            <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                              <tr> 
+                                <td> 
+                                  
+                              <p><b>Summary:</b> all equipment, resources, and 
+                                most marine activities, depend upon structures, 
+                                selected and placed by the commander. Placed structures 
+                                must be <a href="front_building.html">built</a> 
+                                by marines.</p>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                Most <a href="front_commander.html">command networks</a> 
+                                were never intended for military use. In order 
+                                to &quot;teach&quot; these networks to create 
+                                new equipment &#150; like <a href="items_weapons.html">guns</a>, 
+                                <a href="structures_turrets.html">turrets</a>, 
+                                or <a href="front_upgrades.html">upgrades</a> 
+                                to existing equipment &#150; the commander must first 
+                                build the following structures. These structures 
+                                work together, allowing more and more powerful 
+                                upgrades, weapons, and abilities. To get an overall 
+                                picture, see the <a href="techtree.html">tech 
+                                tree</a>.</p>
+                              <p>The following list describes each structure's 
+                                function, the equipment it makes available, and 
+                                what new structures can be built once it is on 
+                                online. If it allows equipment or other structures 
+                                to be created within a certain range, these too 
+                                are noted.</p>
+                              </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> 
+                          <table width="616" border="0" cellspacing="0" cellpadding="0">
+                            <tr> 
+                              <td>&nbsp; </td>
+                            </tr>
+                          </table>
+                             
+                          <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                            <tr> 
+                              <td> 
+                                <table width="100%" border="0" cellspacing="5" cellpadding="0">
+                                  <tr valign="middle" align="center"> 
+                                    <td width="32%" height="77"><a href="structures_cc.html"> 
+                                      Command Console<br>
+                                      <img src="images/tech/comcenter.gif" width="64" height="64" vspace="3" border="0"></a></td>
+                                    <td width="34%" height="77"><a href="structures_tfact.html">Turret 
+                                      Factory<br>
+                                      Factory<br>
+                                      <img src="images/tech/tfact.gif" width="64" height="64" vspace="2" border="0"> 
+                                      </a><br>
+                                    </td>
+                                    <td width="34%" height="77"><a href="structures_observatory.html">Observatory<br>
+                                      <img src="images/tech/observ.gif" width="64" height="64" vspace="2" border="0"> 
+                                      </a> </td>
+                                  </tr>
+                                  <tr valign="middle" align="center"> 
+                                    <td width="32%" height="77"><a href="structures_infportal.html">Infantry 
+                                      Portal<br>
+                                      <img src="images/tech/inf_portal.gif" width="64" height="64" vspace="2" border="0"> 
+                                      </a> </td>
+                                    <td width="34%" height="77"><a href="structures_advtfact.html">Adv. 
+                                      Turret Factory<br>
+                                      <img src="images/tech/asc.gif" width="64" height="64" vspace="2" border="0"> 
+                                      </a><br>
+                                    </td>
+                                    <td width="34%" height="77"><a href="structures_phasegate.html">Phase 
+                                      Gates<br>
+                                      <img src="images/tech/phase.gif" width="64" height="64" vspace="2" border="0"> 
+                                      </a> </td>
+                                  </tr>
+                                  <tr valign="middle" align="center"> 
+                                    <td width="32%" height="77"><a href="structures_armory.html">Armory<br>
+                                      <img src="images/tech/armory.gif" width="64" height="64" vspace="2" border="0"> 
+                                      </a> </td>
+                                    <td width="34%" height="77"><a href="structures_armslab.html">Arms 
+                                      Lab<br>
+                                      <img src="images/tech/armslab.gif" width="64" height="64" vspace="2" border="0"> 
+                                      </a> </td>
+                                    <td width="34%" height="77"><a href="structures_turrets.html">Turrets 
+                                      and Siege Turrets<br>
+                                      <img src="images/tech/turret.gif" width="64" height="64" vspace="2" border="0"> 
+                                      </a> </td>
+                                  </tr>
+                                  <tr valign="middle" align="center"> 
+                                    <td width="32%" height="77"><a href="structures_advarmory.html">Advanced 
+                                      Armory<br>
+                                      <img src="images/tech/armory_adv.gif" width="64" height="64" vspace="2" border="0"> 
+                                      </a> </td>
+                                    <td width="34%" height="77"><a href="structures_protolab.html">Prototype 
+                                      Lab<br>
+                                      <img src="images/tech/protolab.gif" width="64" height="64" vspace="2" border="0"> 
+                                      </a> </td>
+                                    <td width="34%" height="77"><a href="structures_restower.html">Resource 
+                                      Tower<br>
+                                      <img src="images/tech/restower.gif" width="64" height="64" vspace="2" border="0"> 
+                                      </a> </td>
+                                  </tr>
+                                </table>
+                              </td>
+                            </tr>
+                          </table>
+                        </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/structures_advarmory.html b/main/manual/structures_advarmory.html
new file mode 100644
index 00000000..c0d7e7f7
--- /dev/null
+++ b/main/manual/structures_advarmory.html
@@ -0,0 +1,231 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span> 
+            <span class="sectiontext">::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span> <span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_comduties.html">Command 
+            Duties</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="structures.html">Structures</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Adv Armory</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          <td><img src="images/titles/front_structures.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          <td> 
+                            <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                              <tr> 
+                                <td> 
+                                  <p><b>Summary:</b> all equipment, resources, 
+                                    and most marine activities, depend upon structures, 
+                                    selected and placed by the commander. Placed 
+                                    structures must be built by marines.</p>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                To get an overall picture, see the <a href="techtree.html">tech 
+                                tree</a>.</p>
+                              </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center">
+<table width="100" border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                              <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                            </tr>
+                          </table>
+                          <table width="616" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  
+                              <td valign="top"> 
+                                <p><b>Advanced Armory</b><br>
+                                  <br>
+                                  <b>Function:</b> not a new structure, but instead 
+                                  a researched upgrade to the existing <a href="structures_armory.html">armory</a>.<br>
+                                  <br>
+                                  <b><font color="#0B7BEE"><img src="images/images/10_newequip.gif" width="10" height="10"> 
+                                  New Equipment:</font></b> commander can purchase 
+                                  <a href="weapons_hmg.html">heavy machine guns</a>, 
+                                  and in conjunction with an <a href="structures_armslab.html">arms 
+                                  lab</a>, purchase <a href="weapons_grenadelauncher.html">grenade 
+                                  launchers</a>. Note: while upgrading to an advanced 
+                                  armory, the armory will not be able to dispense 
+                                  ammo to marines.<br>
+                                </p>
+                                <table width="406" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                  <tr bgcolor="#000033"> 
+                                    <td colspan="3" height="23"> 
+                                      <p><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="sectiontext">Advanced 
+                                        Armory </span></b></p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><b><img src="images/images/10_cost.gif" width="10" height="10"> 
+                                        </b>Cost:</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>35 rps</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><b><img src="images/images/10_time.gif" width="10" height="10"> 
+                                        </b>Build time</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>120</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><b><img src="images/images/10_armor.gif" width="10" height="10"> 
+                                        </b>Armor Pts.</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>2400 </p>
+                                    </td>
+                                  </tr>
+                                </table>
+                                
+                              </td>
+                                  
+                              <td valign="top">
+                                <table border="0" cellspacing="5" cellpadding="5">
+                                  <tr>
+                                    <td> 
+                                      <p><img src="images/images/advanced%20armory.gif" width="200" height="200"></p>
+                                      </td>
+                                  </tr>
+                                </table>
+                                
+                              </td>
+                                </tr>
+                              </table>
+                             
+                        </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/structures_advtfact.html b/main/manual/structures_advtfact.html
new file mode 100644
index 00000000..2814df0c
--- /dev/null
+++ b/main/manual/structures_advtfact.html
@@ -0,0 +1,236 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span> 
+            <span class="sectiontext">::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            ...</a></span> <span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_comduties.html">Command 
+            Duties</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="structures.html">Structures</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Adv. Turret Factory</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          <td><img src="images/titles/front_structures.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          <td> 
+                            <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                              <tr> 
+                                <td> 
+                                  <p><b>Summary:</b> all equipment, resources, 
+                                    and most marine activities, depend upon structures, 
+                                    selected and placed by the commander. Placed 
+                                    structures must be built by marines.</p>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                To get an overall picture, see the <a href="techtree.html">tech 
+                                tree</a>.</p>
+                              </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center">
+<table width="100" border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                              <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                            </tr>
+                          </table>
+                          <table width="616" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  
+                              <td valign="top"> 
+                                <p><b>Advanced Turret Factory</b><br>
+                                  <br>
+                                  <b>Function:</b> not a new structure, but instead 
+                                  a research upgrade to the <a href="structures_tfact.html">Turret 
+                                  Factory</a>.<br>
+                                  <br>
+                                  <img src="images/images/10_data.gif" width="13" height="10">: 
+                                  <font color="#0B7BEE">extremely powerful offensive 
+                                  artillery, siege turrets are a common tactical 
+                                  response to alien <a href="alien_hive.html">hives</a> 
+                                  and <a href="alien_chambers.html">chambers</a>. 
+                                  See the <a href="weapons_siege.html">siege turret</a> 
+                                  entry in the <a href="weapons_main.html">weaponry</a> 
+                                  section for more information.</font><br>
+                                  <br>
+                                  <font color="#0B7BEE"><b><img src="images/images/10_newequip.gif" width="10" height="10"> 
+                                  New Equipment:</b> </font>commander can purchase 
+                                  <a href="weapons_siege.html">siege turrets</a>.<br>
+                                </p>
+                                <table width="406" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                  <tr bgcolor="#000033"> 
+                                    <td colspan="3" height="23"> 
+                                      <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Advanced 
+                                        Turret Factory</b></p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_cost.gif" width="10" height="10"> 
+                                        Cost:</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>25 rps</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_time.gif" width="10" height="10"> 
+                                        Build time</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>30</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_armor.gif" width="10" height="10"> 
+                                        Armor Pts. </p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>3000</p>
+                                      </td>
+                                  </tr>
+                                </table>
+                                
+                              </td>
+                                  
+                              <td valign="top">
+                                <table border="0" cellspacing="5" cellpadding="5">
+                                  <tr>
+                                    <td>
+                                      <p><img src="images/images/turret%20factory.gif" width="200" height="200"></p>
+                                      </td>
+                                  </tr>
+                                </table>
+                                
+                              </td>
+                                </tr>
+                              </table>
+                             
+                        </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/structures_armory.html b/main/manual/structures_armory.html
new file mode 100644
index 00000000..d3c8aaad
--- /dev/null
+++ b/main/manual/structures_armory.html
@@ -0,0 +1,248 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span> 
+            <span class="sectiontext">::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span> <span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_comduties.html">Command 
+            Duties</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="structures.html">Structures</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Armory</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          <td><img src="images/titles/front_structures.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          <td> 
+                            <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                              <tr> 
+                                <td> 
+                                  <p><b>Summary:</b> all equipment, resources, 
+                                    and most marine activities, depend upon structures, 
+                                    selected and placed by the commander. Placed 
+                                    structures must be built by marines.</p>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                To get an overall picture, see the <a href="techtree.html">tech 
+                                tree</a>.</p>
+                              </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center">
+<table width="100" border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                              <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                            </tr>
+                          </table>
+                          <table width="616" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  
+                              <td valign="top"> 
+                                <p><b>Armory</b><br>
+                                  <br>
+                                  <b>Function:</b> dispenses &quot;free&quot; 
+                                  ammo for a marine's active weapon.<br>
+                                </p>
+                                <p><img src="images/images/10_data.gif" width="13" height="10">: 
+                                  <font color="#0B7BEE">operates in a similar 
+                                  fashion to <a href="items_ammo.html">ammo-packs</a>, 
+                                  supplying any marine that &quot;uses&quot; it 
+                                  with ammunition for their active weapon. The 
+                                  armory also teaches the command network a few 
+                                  new tricks &#150; namely how to create <a href="weapons_shotgun.html">shotguns</a>, 
+                                  <a href="weapons_welders.html">welders</a> and 
+                                  <a href="weapons_mines.html">mines</a> within 
+                                  a small radius.</font><font color="#0B7BEE"><br>
+                                  </font><br>
+                                  <b><font color="#0B7BEE"><img src="images/images/10_newequip.gif" width="10" height="10"> 
+                                  New Equipment:</font></b><font color="#0B7BEE"> 
+                                  </font>commander can now purchase <a href="weapons_shotgun.html">shotguns</a>, 
+                                  <a href="weapons_welders.html">welders</a> and 
+                                  <a href="weapons_mines.html">mines</a>. <br>
+                                  <b><font color="#0B7BEE"><img src="images/images/10_newstruct.gif" width="10" height="10"> 
+                                  </font></b><font color="#0B7BEE"><b>New Structures:</b> 
+                                  </font><a href="structures_advarmory.html">Advanced 
+                                  Armory</a>. Note: while upgrading to an advanced 
+                                  armory, the armory will not be able to dispense 
+                                  ammo to marines. <font color="#0B7BEE"><br>
+                                  <b><img src="images/images/10_range.gif" width="10" height="10"> 
+                                  Range:</b></font> weapons must be dropped within 
+                                  range.<br>
+                                </p>
+                                <table width="406" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                  <tr bgcolor="#000033"> 
+                                    <td colspan="3" height="23"> 
+                                      <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Armory 
+                                        </b></p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_cost.gif" width="10" height="10"> 
+                                        Cost:</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>25 rps</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_time.gif" width="10" height="10"> 
+                                        Build time</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>30</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_armor.gif" width="10" height="10"> 
+                                        Armor Pts. </p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>2400</p>
+                                    </td>
+                                  </tr>
+                                </table>
+                                
+                                </td>
+                                  
+                              <td valign="top">
+                                <table border="0" cellspacing="5" cellpadding="5">
+                                  <tr>
+                                    <td>
+                                      <p><img src="images/images/armory.gif" width="200" height="200"></p>
+                                      </td>
+                                  </tr>
+                                </table>
+                                
+                              </td>
+                                </tr>
+                              </table>
+                             
+                        </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/structures_armslab.html b/main/manual/structures_armslab.html
new file mode 100644
index 00000000..f12a104f
--- /dev/null
+++ b/main/manual/structures_armslab.html
@@ -0,0 +1,242 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span> 
+            <span class="sectiontext">::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span> <span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_comduties.html">Command 
+            Duties</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="structures.html">Structures</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Arms Lab</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          <td><img src="images/titles/front_structures.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          <td> 
+                            <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                              <tr> 
+                                <td> 
+                                  <p><b>Summary:</b> all equipment, resources, 
+                                    and most marine activities, depend upon structures, 
+                                    selected and placed by the commander. Placed 
+                                    structures must be built by marines.</p>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                To get an overall picture, see the <a href="techtree.html">tech 
+                                tree</a>.</p>
+                              </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center">
+<table width="100" border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                              <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                            </tr>
+                          </table>
+                          <table width="616" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  
+                              <td valign="top"> 
+                                <p><b>Arms lab<br>
+                                  <br>
+                                  </b><b>Function:</b> taps local resources to 
+                                  allow three levels of weapons and armor <a href="front_upgrades.html">upgrades</a>.<i></i><font color="#0B7BEE"><i><br>
+                                  <br>
+                                  </i></font><img src="images/images/10_data.gif" width="13" height="10">:<font color="#0B7BEE"> 
+                                  The commander may choose to research three levels 
+                                  of armor <a href="front_upgrades_armor.html">upgrades</a>, 
+                                  and three levels of weaponry <a href="front_upgrades_weapon.html">upgrades</a>. 
+                                  Each level researched increases the strength 
+                                  of marine armor, or firepower. The astute observer 
+                                  will note that this structure was modified from 
+                                  an obsolete armory design, hence the word &quot;ammo&quot; 
+                                  still appearing on its casing.<br>
+                                  </font><br>
+                                  <b><font color="#0B7BEE"><img src="images/images/10_newequip.gif" width="10" height="10"> 
+                                  New Equipment:</font></b><font color="#0B7BEE"> 
+                                  </font>commander can purchase <a href="weapons_grenadelauncher.html">grenade 
+                                  launchers</a>, in conjunction with an <a href="structures_advarmory.html">advanced 
+                                  armory</a>.<br>
+                                  <b><font color="#0B7BEE"><img src="images/images/10_newstruct.gif" width="10" height="10"> 
+                                  </font></b><font color="#0B7BEE"><b>New Structures:</b> 
+                                  </font><a href="structures_protolab.html">Prototype 
+                                  Lab</a>.<br>
+                                </p>
+                                <table width="406" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                  <tr bgcolor="#000033"> 
+                                    <td colspan="3" height="23"> 
+                                      <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Arms 
+                                        Lab </b></p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_cost.gif" width="10" height="10"> 
+                                        Cost:</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p> 50 rps</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_time.gif" width="10" height="10"> 
+                                        Build time</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>40</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_armor.gif" width="10" height="10"> 
+                                        Armor Pts. </p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>2200</p>
+                                    </td>
+                                  </tr>
+                                </table>
+                                
+                              </td>
+                                  
+                              <td valign="top">
+                                <table border="0" cellspacing="5" cellpadding="5">
+                                  <tr>
+                                    <td> 
+                                      <p><img src="images/images/weapons%20lab.gif" width="200" height="200"></p>
+                                      </td>
+                                  </tr>
+                                </table>
+                                
+                              </td>
+                                </tr>
+                              </table>
+                             
+                        </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/structures_cc.html b/main/manual/structures_cc.html
new file mode 100644
index 00000000..8c4e14f0
--- /dev/null
+++ b/main/manual/structures_cc.html
@@ -0,0 +1,247 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span> 
+            <span class="sectiontext">::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            ...</a></span> <span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_comduties.html">Command 
+            Duties</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="structures.html">Structures</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Command Console</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          <td><img src="images/titles/front_structures.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          <td> 
+                            <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                              <tr> 
+                                <td> 
+                                  <p><b>Summary:</b> all equipment, resources, 
+                                    and most marine activities, depend upon structures, 
+                                    selected and placed by the commander. Placed 
+                                    structures must be built by marines.</p>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                To get an overall picture, see the <a href="techtree.html">tech 
+                                tree</a>.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center">
+<table width="100" border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                              <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                            </tr>
+                          </table>
+                          <table width="616" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  
+                              <td valign="top"> 
+                                <p><b>Command Console</b><br>
+                                  <br>
+                                  <b>Function:</b> <i>allows one marine to connect 
+                                  to the command network and take the role of 
+                                  <a href="front_commander.html">commander</a>.</i><br>
+                                  <br>
+                                  <img src="images/images/10_data.gif" width="13" height="10"> 
+                                  <font color="#0B7BEE">Frontiersmen insertion 
+                                  points are usually as far away as possible from 
+                                  possible <a href="alien_hive.html">hive</a> 
+                                  locations. A command console (often just called 
+                                  the &quot;CC&quot;) is brought on board and 
+                                  rapidly deployed, flushing the network with 
+                                  military-grade nanos, and placing it completely 
+                                  under the commander's control. New command consoles 
+                                  may be built by the commander (though only one 
+                                  may be used at a time). This is the most vital 
+                                  structure to defend. A team without a commander 
+                                  has very poor survival odds.</font><br>
+                                  <br>
+                                  <b><font color="#0B7BEE"><img src="images/images/10_newequip.gif" width="10" height="10"> 
+                                  New Equipment:</font></b> all equipment requires 
+                                  a functional command console.<br>
+                                  <b><font color="#0B7BEE"><img src="images/images/10_newstruct.gif" width="10" height="10"> 
+                                  New Structures:</font></b> all structures require 
+                                  a functional command console.<br>
+                                  <font color="#0B7BEE"><b><img src="images/images/10_range.gif" width="10" height="10"> 
+                                  Range:</b></font> <a href="structures_infportal.html">infantry 
+                                  portals</a> must be placed within range of a 
+                                  command console.<br>
+                                </p>
+                                <table width="406" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                  <tr bgcolor="#000033"> 
+                                    <td colspan="3" height="23"> 
+                                      <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Command 
+                                        Console </b></p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_cost.gif" width="10" height="10"> 
+                                        Cost:</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>30 rps</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_time.gif" width="10" height="10"> 
+                                        Build time</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>35</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_armor.gif" width="10" height="10"> 
+                                        Armor Pts. </p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>10000</p>
+                                    </td>
+                                  </tr>
+                                </table>
+                                
+                              </td>
+                                  
+                              <td valign="top">
+                                <table border="0" cellspacing="5" cellpadding="5">
+                                  <tr>
+                                    <td> 
+                                      <p><img src="images/images/command%20console.gif" width="200" height="200"></p>
+                                      </td>
+                                  </tr>
+                                </table>
+                                
+                              </td>
+                                </tr>
+                              </table>
+                             
+                        </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/structures_infportal.html b/main/manual/structures_infportal.html
new file mode 100644
index 00000000..a005433f
--- /dev/null
+++ b/main/manual/structures_infportal.html
@@ -0,0 +1,241 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span> 
+            <span class="sectiontext">::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span> <span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_comduties.html">Command 
+            Duties</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="structures.html">Structures</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Infantry Portal</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          <td><img src="images/titles/front_structures.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          <td> 
+                            <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                              <tr> 
+                                <td> 
+                                  <p><b>Summary:</b> all equipment, resources, 
+                                    and most marine activities, depend upon structures, 
+                                    selected and placed by the commander. Placed 
+                                    structures must be built by marines.</p>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                To get an overall picture, see the <a href="techtree.html">tech 
+                                tree</a>.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center">
+<table width="100" border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                              <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                            </tr>
+                          </table>
+                          <table width="616" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  
+                              <td valign="top"> 
+                                <p><b>Infantry Portal</b><br>
+                                  <br>
+                                  <b>Function:</b> phases in reinforcements from 
+                                  the dropship. Without an infantry portal, the 
+                                  aliens' advantage will grow with every marine 
+                                  lost. Infantry portals are the most crucial 
+                                  structure to defend, second only to the <a href="structures_cc.html">command 
+                                  console</a>.<br>
+                                  <br>
+                                  <img src="images/images/10_data.gif" width="13" height="10">: 
+                                  <font color="#0B7BEE">dropships do not remain 
+                                  docked with the battlefield, for fear of contamination. 
+                                  The phase gate on a dropship is large enough 
+                                  to rapidly send multiple marines across a modest 
+                                  distance, as long as there are infantry portals 
+                                  at the other end. The more portals, the faster 
+                                  reinforcements arrive. See <a href="front_phasetech.html">phase 
+                                  technology</a> for more info. </font><br>
+                                  <br>
+                                  <b><font color="#0B7BEE"><img src="images/images/10_newstruct.gif" width="10" height="10"> 
+                                  </font></b><font color="#0B7BEE"><b>New Structures:</b></font> 
+                                  <a href="structures_armslab.html">Arms Lab</a>, 
+                                  <a href="structures_tfact.html">Turret Factory</a>, 
+                                  <a href="structures_armory.html">Armory</a><br>
+                                </p>
+                                <table width="406" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                  <tr bgcolor="#000033"> 
+                                    <td colspan="3" height="23"> 
+                                      <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Infantry 
+                                        Portal </b></p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_cost.gif" width="10" height="10"> 
+                                        Cost:</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>15 rps</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_time.gif" width="10" height="10"> 
+                                        Build time</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>22</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_armor.gif" width="10" height="10"> 
+                                        Armor Pts. </p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>2000</p>
+                                    </td>
+                                  </tr>
+                                </table>
+                                
+                              </td>
+                                  
+                              <td valign="top">
+                                <table border="0" cellspacing="5" cellpadding="5">
+                                  <tr>
+                                    <td>
+                                      <p><img src="images/images/inf%20portal.gif" width="200" height="200"></p>
+                                      </td>
+                                  </tr>
+                                </table>
+                                
+                              </td>
+                                </tr>
+                              </table>
+                             
+                        </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/structures_observatory.html b/main/manual/structures_observatory.html
new file mode 100644
index 00000000..97499a19
--- /dev/null
+++ b/main/manual/structures_observatory.html
@@ -0,0 +1,252 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span> 
+            <span class="sectiontext">::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span> <span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_comduties.html">Command 
+            Duties</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="structures.html">Structures</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Observatory</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          <td><img src="images/titles/front_structures.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          <td> 
+                            <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                              <tr> 
+                                <td> 
+                                  <p><b>Summary:</b> all equipment, resources, 
+                                    and most marine activities, depend upon structures, 
+                                    selected and placed by the commander. Placed 
+                                    structures must be built by marines.</p>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                To get an overall picture, see the <a href="techtree.html">tech 
+                                tree</a>.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center">
+<table width="100" border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                              <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                            </tr>
+                          </table>
+                          <table width="616" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  
+                              <td> 
+                                <p><b>Observatory</b><br>
+                                  <br>
+                                  <b>Function:</b> reveals nearby enemies (even 
+                                  when <a href="alien_evolutions_cloaking.html">cloaked</a>), 
+                                  allows <a href="items_scanner.html">scanner 
+                                  sweeps</a>, <a href="items_distress.html">distress 
+                                  beacons</a>, and research of <a href="front_upgrades_motiontracking.html">motion 
+                                  tracking</a>.<i><br>
+                                  </i><font color="#0B7BEE"><i><br>
+                                  </i></font><img src="images/images/10_data.gif" width="13" height="10">: 
+                                  <font color="#0B7BEE">Responding to the command 
+                                  blindness caused by <a href="front_nanogridlock.html">nano-gridlock</a>, 
+                                  the TSA science corps developed the observatory. 
+                                  Adapted from sensor and surveillance components 
+                                  used by the TSA fleet to detect minute gravitational 
+                                  disturbances (like incoming missiles, other 
+                                  ships in &quot;silent running&quot;, or even 
+                                  movement inside bases or space-facilities), 
+                                  when the observatory deploys its dish, it can 
+                                  detect any movement within its range. By researching 
+                                  sophisticated software and uplink components, 
+                                  the observatory can be linked directly into 
+                                  the command network, allowing enhanced functions 
+                                  like motion tracking and scanner sweeps. The 
+                                  observatory also provides the crucial spatial 
+                                  link between <a href="structures_phasegate.html">phase 
+                                  gates</a>, ensuring that all matter entering 
+                                  the potentiality stream finds its way to a waiting 
+                                  gate. Finally, it can punch through <a href="front_nanogridlock.html">nano-gridlock</a> 
+                                  and fire off a distress beacon to the dropship, 
+                                  requesting reinforcements.</font><br>
+                                  <br>
+                                  <b><font color="#0B7BEE"><img src="images/images/10_newstruct.gif" width="10" height="10"> 
+                                  </font></b><font color="#0B7BEE"><b>New Structures:</b> 
+                                  </font><a href="structures_phasegate.html">Phase 
+                                  gates</a>.<br>
+                                </p>
+                                <table width="406" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                  <tr bgcolor="#000033"> 
+                                    <td colspan="3" height="23"> 
+                                      <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Observatory</b></p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_cost.gif" width="10" height="10"> 
+                                        Cost:</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>25 rps</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_time.gif" width="10" height="10"> 
+                                        Build time</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>30</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_armor.gif" width="10" height="10"> 
+                                        Armor Pts. </p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>1000</p>
+                                    </td>
+                                  </tr>
+                                </table>
+                                
+                              </td>
+                                  
+                              <td valign="top">
+                                <table border="0" cellspacing="5" cellpadding="5">
+                                  <tr>
+                                    <td>
+                                      <p><img src="images/images/observatory.gif" width="200" height="200"></p>
+                                      </td>
+                                  </tr>
+                                </table>
+                                
+                              </td>
+                                </tr>
+                              </table>
+                             
+                        </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/structures_phasegate.html b/main/manual/structures_phasegate.html
new file mode 100644
index 00000000..a711b19e
--- /dev/null
+++ b/main/manual/structures_phasegate.html
@@ -0,0 +1,247 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span> 
+            <span class="sectiontext">::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span> <span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_comduties.html">Command 
+            Duties</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="structures.html">Structures</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Phase Gates</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          <td><img src="images/titles/front_structures.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          <td> 
+                            <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                              <tr> 
+                                <td> 
+                                  <p><b>Summary:</b> all equipment, resources, 
+                                    and most marine activities, depend upon structures, 
+                                    selected and placed by the commander. Placed 
+                                    structures must be built by marines.</p>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                To get an overall picture, see the <a href="techtree.html">tech 
+                                tree</a>.</p>
+                              </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center">
+<table width="100" border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                              <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                            </tr>
+                          </table>
+                          <table width="616" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  
+                              <td valign="top"> 
+                                <p><b>Phase Gates</b><br>
+                                  <br>
+                                  <b>Function:</b> instantaneous travel from one 
+                                  map location to another &#150; very effective for 
+                                  staging assaults, or linking bases, especially 
+                                  on the more sprawling battlefields. At this 
+                                  time, if more than two gates are active, a marine 
+                                  cannot choose which gate is his destination 
+                                  (so may have to try more than once to get to 
+                                  the desired gate). Gates have no way (as of 
+                                  this manual's writing) of determining friend 
+                                  from foe &#150; so be aware that a curious Kharaa 
+                                  may step through one, right into your base. 
+                                  <br>
+                                  <br>
+                                  <img src="images/images/10_data.gif" width="13" height="10"> 
+                                  <font color="#0B7BEE">U</font><font color="#0B7BEE">ntil 
+                                  now, personal phase gates have been too expensive 
+                                  and unstable for general use. The TSA stunned 
+                                  the Trans-Govs by revealing they had a working 
+                                  prototype &#150; a carefully timed information leak, 
+                                  that had much to do with their winning the Frontiersmen 
+                                  charter. Since then, it has since seen vigorous 
+                                  field testing. There are still some kinks to 
+                                  work out &#150; noted above. But they have become 
+                                  cheap and reliable enough to enter general use. 
+                                  Once in place, they make it much easier for 
+                                  Frontiersmen to control an area and muster troops. 
+                                  For more information on phase technology, click 
+                                  <a href="front_phasetech.html">here</a>.</font></p>
+                                <table width="406" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                  <tr bgcolor="#000033"> 
+                                    <td colspan="3" height="23"> 
+                                      <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Phase 
+                                        Gates </b></p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_cost.gif" width="10" height="10"> 
+                                        Cost:</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>20 rps</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_time.gif" width="10" height="10"> 
+                                        Build time</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>30</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_armor.gif" width="10" height="10"> 
+                                        Armor Pts. </p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>3500</p>
+                                    </td>
+                                  </tr>
+                                </table>
+                                
+                              </td>
+                                  
+                              <td valign="top">
+                                <table border="0" cellspacing="5" cellpadding="5">
+                                  <tr>
+                                    <td>
+                                      <p><img src="images/images/phase%20gate.gif" width="200" height="200"></p>
+                                      </td>
+                                  </tr>
+                                </table>
+                                
+                              </td>
+                                </tr>
+                              </table>
+                             
+                        </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/structures_protolab.html b/main/manual/structures_protolab.html
new file mode 100644
index 00000000..f5235e2c
--- /dev/null
+++ b/main/manual/structures_protolab.html
@@ -0,0 +1,249 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span> 
+            <span class="sectiontext">::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span> <span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_comduties.html">Command 
+            Duties</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="structures.html">Structures</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Prototype Lab</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          <td><img src="images/titles/front_structures.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          <td> 
+                            <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                              <tr> 
+                                <td> 
+                                  <p><b>Summary:</b> all equipment, resources, 
+                                    and most marine activities, depend upon structures, 
+                                    selected and placed by the commander. Placed 
+                                    structures must be built by marines.</p>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                Most <a href="front_commander.html">command networks</a> 
+                                were never intended for military use. In order 
+                                to &quot;teach&quot; these networks to create 
+                                new equipment &#150; like <a href="items_weapons.html">guns</a>, 
+                                <a href="structures_turrets.html">turrets</a>, 
+                                or <a href="front_upgrades.html">upgrades</a> 
+                                to existing equipment &#150; the commander must first 
+                                build the following structures. These structures 
+                                work together, allowing more and more powerful 
+                                upgrades, weapons, and abilities. To get an overall 
+                                picture, see the <a href="techtree.html">tech 
+                                tree</a>.</p>
+                              <p> </p>
+                            </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center">
+<table width="100" border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                              <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                            </tr>
+                          </table>
+                          <table width="616" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  
+                              <td valign="top"> 
+                                <p><b>Prototype Lab</b><br>
+                                  <br>
+                                  <b>Function:</b> allows the research and purchase 
+                                  of advanced, experimental equipment.<font color="#0B7BEE"><i><br>
+                                  <br>
+                                  </i></font><img src="images/images/10_data.gif" width="13" height="10">: 
+                                  <font color="#0B7BEE">Equipment that is cleared 
+                                  for field testing is programmed into the prototype 
+                                  lab. As of this manual, prototype equipment 
+                                  consists of heavy armor and jet pack technology. 
+                                  This equipment is powerful, and cutting edge. 
+                                  Whether its cost is justified is a matter of 
+                                  debate, and left to <a href="front_commandstrats.html">command 
+                                  strategy</a>.<br>
+                                  </font><br>
+                                  <b><font color="#0B7BEE"><img src="images/images/10_newequip.gif" width="10" height="10"> 
+                                  New Equipment:</font></b><font color="#0B7BEE"> 
+                                  </font>commander can purchase and drop <a href="weapons_ha.html">heavy 
+                                  armor</a> and <a href="weapons_jetpack.html">jet 
+                                  packs</a>.</p>
+                                <table width="406" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                  <tr bgcolor="#000033"> 
+                                    <td colspan="3" height="23"> 
+                                      <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Prototype 
+                                        Lab </b></p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_cost.gif" width="10" height="10"> 
+                                        Cost:</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>45 rps</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_time.gif" width="10" height="10"> 
+                                        Build time</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>50</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_armor.gif" width="10" height="10"> 
+                                        Armor Pts. </p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>2000</p>
+                                    </td>
+                                  </tr>
+                                </table>
+                                
+                              </td>
+                                  
+                              <td valign="top">
+                                <table border="0" cellspacing="5" cellpadding="5">
+                                  <tr>
+                                    <td>
+                                      <p><img src="images/images/prototype%20lab.gif" width="200" height="200"></p>
+                                      </td>
+                                  </tr>
+                                </table>
+                                
+                              </td>
+                                </tr>
+                              </table>
+                             
+                        </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/structures_restower.html b/main/manual/structures_restower.html
new file mode 100644
index 00000000..48dc378f
--- /dev/null
+++ b/main/manual/structures_restower.html
@@ -0,0 +1,234 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span> 
+            <span class="sectiontext">::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span> <span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_comduties.html">Command 
+            Duties</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="structures.html">Structures</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Resource Tower</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          <td><img src="images/titles/front_structures.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          <td> 
+                            <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                              <tr> 
+                                <td> 
+                                  <p><b>Summary:</b> all equipment, resources, 
+                                    and most marine activities, depend upon structures, 
+                                    selected and placed by the commander. Placed 
+                                    structures must be built by marines.</p>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                To get an overall picture, see the <a href="techtree.html">tech 
+                                tree</a>.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center">
+<table width="100" border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                              <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                            </tr>
+                          </table>
+                          <table width="616" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  
+                              <td valign="top"> 
+                                <p><b>Resource Tower</b><br>
+                                  <br>
+                                  <b>Function:</b> allows the commander to tap 
+                                  a ship or base's raw nano-supplies, by constructing 
+                                  collection machines over resource nozzles. See 
+                                  <a href="front_resources.html">Resources</a> 
+                                  and <a href="front_nanotech.html">Nanotech</a> 
+                                  for more information<i>.<br>
+                                  </i><br>
+                                  <font color="#0B7BEE"><img src="images/images/10_data.gif" width="13" height="10"> 
+                                  Reserves of nano-sludge (see <a href="front_nanotech.html">nanotech</a>) 
+                                  are stored throughout ships and bases, intended 
+                                  mainly for use in emergencies or for large repairs. 
+                                  Resource towers put these reserves to work for 
+                                  the marines, slowly converting them into a ready-to-use 
+                                  form, and storing them in the network. Active 
+                                  resource nozzles are marked by white nano-telltales, 
+                                  rising like steam into the air.</font></p>
+                                <table width="406" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                  <tr bgcolor="#000033"> 
+                                    <td colspan="3" height="23"> 
+                                      <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Resource 
+                                        Tower </b></p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_cost.gif" width="10" height="10"> 
+                                        Cost:</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>22 rps</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_time.gif" width="10" height="10"> 
+                                        Build time</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>50</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_armor.gif" width="10" height="10"> 
+                                        Armor Pts. </p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>5000</p>
+                                    </td>
+                                  </tr>
+                                </table>
+                                
+                              </td>
+                                  
+                              <td valign="top">
+                                <table border="0" cellspacing="5" cellpadding="5">
+                                  <tr>
+                                    <td>
+                                      <p><img src="images/images/resource%20tower.gif" width="200" height="200"></p>
+                                      </td>
+                                  </tr>
+                                </table>
+                                
+                              </td>
+                                </tr>
+                              </table>
+                             
+                        </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/structures_tfact.html b/main/manual/structures_tfact.html
new file mode 100644
index 00000000..fb55e300
--- /dev/null
+++ b/main/manual/structures_tfact.html
@@ -0,0 +1,230 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span> 
+            <span class="sectiontext">::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span> <span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_comduties.html">Command 
+            Duties</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="structures.html">Structures</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Turret Factory</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          <td><img src="images/titles/front_structures.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          <td> 
+                            <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                              <tr> 
+                                <td> 
+                                  <p><b>Summary:</b> all equipment, resources, 
+                                    and most marine activities, depend upon structures, 
+                                    selected and placed by the commander. Placed 
+                                    structures must be built by marines.</p>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                To get an overall picture, see the <a href="techtree.html">tech 
+                                tree</a>.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center">
+<table width="100" border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                              <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                            </tr>
+                          </table>
+                          <table width="616" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  
+                              <td valign="top"> 
+                                <p><b>Turret Factory<br>
+                                  <br>
+                                  Function:</b> allows <a href="weapons_turrets.html">turrets</a> 
+                                  to be built within range.<br>
+                                  <br>
+                                  <font color="#0B7BEE"><b><img src="images/images/10_newequip.gif" width="10" height="10"> 
+                                  New Equipment:</b> </font>Commander can now 
+                                  purchase turrets &#150; automated gun emplacements 
+                                  used for base and perimeter defense (see <a href="weapons_turrets.html">turrets</a> 
+                                  for more info.).<br>
+                                  <b><font color="#0B7BEE"><img src="images/images/10_newstruct.gif" width="10" height="10"> 
+                                  New Structures: </font></b><a href="structures_armslab.html">arms 
+                                  lab</a>, <a href="structures_advtfact.html">advanced 
+                                  turret factory</a></p>
+                                <table width="406" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                  <tr bgcolor="#000033"> 
+                                    <td colspan="3" height="23"> 
+                                      <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Turret 
+                                        Factory </b></p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_cost.gif" width="10" height="10"> 
+                                        Cost:</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>25 rps</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_time.gif" width="10" height="10"> 
+                                        Build time</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>40</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_armor.gif" width="10" height="10"> 
+                                        Armor Pts. </p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>3000</p>
+                                    </td>
+                                  </tr>
+                                </table>
+                                
+                              </td>
+                                  
+                              <td valign="top">
+                                <table border="0" cellspacing="5" cellpadding="5">
+                                  <tr>
+                                    <td> 
+                                      <p><img src="images/images/turret%20factory.gif" width="200" height="200"></p>
+                                      </td>
+                                  </tr>
+                                </table>
+                                
+                              </td>
+                                </tr>
+                              </table>
+                             
+                        </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/structures_turrets.html b/main/manual/structures_turrets.html
new file mode 100644
index 00000000..16486e28
--- /dev/null
+++ b/main/manual/structures_turrets.html
@@ -0,0 +1,259 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">...</a></span> 
+            <span class="sectiontext">::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span> <span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_comduties.html">Command 
+            Duties</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="structures.html">Structures</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Turrets</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          <td><img src="images/titles/front_structures.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          <td> 
+                            <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                              <tr> 
+                                <td> 
+                                  <p><b>Summary:</b> all equipment, resources, 
+                                    and most marine activities, depend upon structures, 
+                                    selected and placed by the commander. Placed 
+                                    structures must be built by marines.</p>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <p><img src="images/images/10_data.gif" width="13" height="10"> 
+                                To get an overall picture, see the <a href="techtree.html">tech 
+                                tree</a>.</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center">
+<table width="100" border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                              <td><img src="images/design/info_bar.gif" width="666" height="15" hspace="12" vspace="6"></td>
+                            </tr>
+                          </table>
+                          <table width="616" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                              <td valign="top"> 
+                                <p><br>
+                                  <b>Turrets and Siege Turrets</b><br>
+                                  <br>
+                                  Though constructed like structures, <a href="weapons_turrets.html">turrets</a> 
+                                  and <a href="weapons_siege.html">siege turrets</a> 
+                                  are weapons, and so listed in the <a href="weapons_main.html">weaponry</a> 
+                                  section.<br>
+                                </p>
+                                <table width="385" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                  <tr bgcolor="#000033"> 
+                                    <td colspan="3" height="23"> 
+                                      <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sentry 
+                                        Turret</b></p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_cost.gif" width="10" height="10"> 
+                                        Cost </p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>16 rps</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_time.gif" width="10" height="10"> 
+                                        Build time</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>30</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_armor.gif" width="10" height="10"> 
+                                        Armor Pts. </p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>1000</p>
+                                    </td>
+                                  </tr>
+                                </table>
+                                
+                                <br>
+                                <table width="385" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                  <tr bgcolor="#000033"> 
+                                    <td colspan="3" height="23"> 
+                                      <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Siege 
+                                        Turret</b></p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_cost.gif" width="10" height="10"> 
+                                        Cost </p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>25 rps</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_time.gif" width="10" height="10"> 
+                                        Build time</p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>50</p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td width="32%"> 
+                                      <p><img src="images/images/10_armor.gif" width="10" height="10"> 
+                                        Armor Pts. </p>
+                                    </td>
+                                    <td colspan="2"> 
+                                      <p>2000</p>
+                                    </td>
+                                  </tr>
+                                </table>
+                              </td>
+                                  
+                              <td valign="top">
+                                <table border="0" cellspacing="5" cellpadding="5">
+                                  <tr>
+                                    <td> 
+                                      <p><img src="images/images/turret.gif" width="200" height="200"></p>
+                                      </td>
+                                  </tr>
+                                </table>
+                                
+                              </td>
+                                </tr>
+                              </table>
+                             
+                        </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/techtree.html b/main/manual/techtree.html
new file mode 100644
index 00000000..fd2cd230
--- /dev/null
+++ b/main/manual/techtree.html
@@ -0,0 +1,156 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span> <span class="sectiontext">::</span> <span class="sectionlink"><a href="front_commander.html"> 
+            Commander</a></span> <span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_comduties.html">Command 
+            Duties</a></span><span class="sectiontext">: <font color="#FF6600">Tech 
+            Tree </font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                
+              <tr> 
+                <td align="center" valign="top"> 
+                  <table width="100" border="0" cellspacing="0" cellpadding="0" align="center">
+                    <tr> 
+                      <td><img src="images/images/techtree.gif" width="628" height="628" hspace="30" usemap="#techtree" border="0" href="structures_observatory.html"> 
+                      </td>
+                    </tr>
+                  </table>
+                  <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                    <tr> 
+                      <td align="center" valign="top"> 
+                        <div align="center"> </div>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+<map name="techtree"> 
+  <area shape="rect" coords="263,488,289,514" href="front_upgrades_motiontracking.html" target="_self" alt="Motion Tracking" title="Motion Tracking"> 
+  <area shape="rect" coords="263,514,289,540" href="items_distress.html" target="_self" alt="Distress Beacon" title="Distress Beacon">
+  <area shape="rect" coords="174,515,201,541" href="front_upgrades_weapon.html" target="_self" alt="Upgrades" title="Upgrades">
+  <area shape="rect" coords="432,514,459,542" href="weapons_mines.html" target="_self" alt="Tripmines" title="Tripmines">
+  <area shape="rect" coords="432,489,459,517" href="weapons_shotgun.html" target="_self" alt="Shotgun" title="Shotgun">
+  <area shape="rect" coords="214,551,241,578" href="weapons_jetpack.html" target="_self" alt="Droppable Items" title="Droppable Items">
+  <area shape="rect" coords="521,577,548,604" href="weapons_grenadelauncher.html" target="_self" alt="GL" title="GL">
+  <area shape="rect" coords="521,552,548,579" href="weapons_hmg.html" target="_self" alt="Heavy machine Gun" title="Heavy machine Gun">
+  <area shape="rect" coords="432,463,459,491" href="weapons_welders.html" target="_self" alt="Welder" title="Welder">
+  <area shape="rect" coords="365,552,391,578" href="items_ammo.html" target="_self" alt="Droppable Items" title="Droppable Items">
+  <area shape="rect" coords="261,463,289,488" href="items_scanner.html" target="_self" alt="Scanner Sweep" title="Scanner Sweep">
+  <area shape="rect" coords="323,62,378,116" href="structures_cc.html" target="_self" alt="Command Console" title="Command Console">
+  <area shape="rect" coords="447,60,501,116" href="structures_restower.html" target="_self" alt="Resource Tower" title="Resource Tower">
+  <area shape="rect" coords="323,164,379,215" href="structures_infportal.html" target="_self" alt="Infantry Portal" title="Infantry Portal">
+  <area shape="rect" coords="447,200,500,253" href="structures_armory.html" target="_self" alt="Armory" title="Armory">
+  <area shape="rect" coords="322,280,378,334" href="structures_observatory.html" target="_self" alt="Observatory" title="Observatory">
+  <area shape="rect" coords="446,281,500,334" href="structures_advarmory.html" target="_self" alt="Adv. Armory" title="Adv. Armory">
+  <area shape="rect" coords="199,201,255,255" href="structures_tfact.html" target="_self">
+  <area shape="rect" coords="200,301,255,352" href="structures_armslab.html" target="_self" alt="Arms Lab" title="Arms Lab">
+  <area shape="rect" coords="97,201,152,253" href="weapons_turrets.html" target="_self" alt="Sentry Turret" title="Sentry Turret">
+  <area shape="rect" coords="201,400,254,451" href="structures_protolab.html" target="_self" alt="Prototype Lab" title="Prototype Lab">
+  <area shape="rect" coords="99,380,154,432" href="weapons_siege.html" target="_self" alt="Siege Upgrade" title="Siege Upgrade">
+  <area shape="rect" coords="134,305,135,326" href="#">
+  <area shape="rect" coords="325,399,378,449" href="structures_phasegate.html" target="_self" alt="Phase Gate" title="Phase Gate">
+  <area shape="rect" coords="174,489,201,515" href="front_upgrades_armor.html" target="_self" alt="Upgrades" title="Upgrades">
+  <area shape="rect" coords="214,577,241,604" href="weapons_ha.html" target="_self" alt="Droppable Items" title="Droppable Items">
+  <area shape="rect" coords="365,578,393,604" href="items_medkit.html">
+</map>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/weapons_grenadelauncher.html b/main/manual/weapons_grenadelauncher.html
new file mode 100644
index 00000000..d6df1ddd
--- /dev/null
+++ b/main/manual/weapons_grenadelauncher.html
@@ -0,0 +1,252 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_marine.html">Marine</a></span><span class="sectiontext"> 
+            :: </span><span class="sectionlink"><a href="weapons_main.html">Weaponry</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Grenade Launcher</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/weapons_gl.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td width="32%" height="77"><img src="images/tech_10/knife.gif" width="15" height="15"> 
+                                    <a href="weapons_knife.html"> Knife</a><br>
+                                    <img src="images/tech_10/shotgun.gif" width="15" height="15"> 
+                                    <a href="weapons_shotgun.html">Shotgun</a><br>
+                                    <img src="images/tech_10/mines.gif" width="15" height="15"> 
+                                    <a href="weapons_mines.html">Trip Mine</a><br>
+                                    <img src="images/tech_10/jetpacks2.gif" width="15" height="15"> 
+                                    <a href="weapons_jetpack.html">Jet Pack</a></td>
+                                  <td width="34%" height="77"><img src="images/tech_10/pistol.gif" width="15" height="15"> 
+                                    <a href="weapons_pistol.html">Pistol</a><br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="weapons_hmg.html">Heavy Machine Gun</a><br>
+                                    <img src="images/tech_10/welder.gif" width="15" height="15"> 
+                                    <a href="weapons_welders.html">Welder</a><br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="weapons_ha.html">Heavy Armor</a></td>
+                                  <td width="34%" height="77"><img src="images/tech_10/lmg.gif" width="15" height="15"> 
+                                    <a href="weapons_lmg.html">Light Machine Gun</a><br>
+                                    <img src="images/tech_10/grenadel.gif" width="15" height="15"> 
+                                    Grenade Launcher<br>
+                                    <img src="images/tech_10/turret.gif" width="15" height="15"> 
+                                    <a href="weapons_turrets.html">Turret</a><br>
+                                    <img src="images/tech_10/siege.gif" width="15" height="15"> 
+                                    <a href="weapons_siege.html">Siege Turret</a></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="628" border="0" cellspacing="0" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td height="77"> 
+                                    <p><b>Desc.: </b><font color="#0B7BEE">compressed 
+                                      air system launches concussive grenades, 
+                                      with a timer delay. </font><br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Use:</font></b> 
+                                      mainly a support weapon, especially effective 
+                                      against stationary targets, but also has 
+                                      been put to devious use in cramped quarters 
+                                      &#150; around corners and into vents. With its 
+                                      4 second time delay, the grenade will often 
+                                      bounce, and even come to rest, before exploding. 
+                                      <br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Data:</font></b> 
+                                      Frontiersmen have a love/hate relationship 
+                                      with the &quot;Arc&quot; grenade launcher. 
+                                      It has been put to spectacular use in heavy 
+                                      conflicts, especially when assaulting Kharaa 
+                                      hive rooms. The pneumatic delivery system 
+                                      is relatively basic &#150; it's the grenades 
+                                      that are high tech. They can detect the 
+                                      heat and bacterial signature of a Kharaa 
+                                      lifeform (including chambers and hives), 
+                                      and will explode instead of bouncing off. 
+                                      Otherwise, they explode after 4 seconds. 
+                                      Though the blast particles are large enough 
+                                      to incorporate TSA <a href="front_friendlyfire.html">FriendlyFire</a> 
+                                      technology, the firer is still vulnerable 
+                                      to these blasts &#150; so the Arc is best placed 
+                                      in experienced hands.<br>
+                                    </p>
+                                    <table width="406" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                      <tr bgcolor="#000033"> 
+                                        <td colspan="3" height="23"> 
+                                          <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Arc 
+                                            (GL)</b></p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_damage.gif" width="10" height="10"> 
+                                            Damage</p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>200 at blast point, reduces outwards</p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_clip.gif" width="10" height="10"> 
+                                            Clip</p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>6</p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_note.gif" width="10" height="10"> 
+                                            Note </p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>4 second delay, damages firer</p>
+                                        </td>
+                                      </tr>
+                                    </table>
+                                  </td>
+                                  <td width="34%" height="77"><img src="images/images/gl.gif" width="200" height="200"></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/weapons_ha.html b/main/manual/weapons_ha.html
new file mode 100644
index 00000000..e34c83dc
--- /dev/null
+++ b/main/manual/weapons_ha.html
@@ -0,0 +1,248 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_marine.html">Marine</a></span><span class="sectiontext"> 
+            :: </span><span class="sectionlink"><a href="weapons_main.html">Weaponry</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Heavy Armor</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/weapons_heavya.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td width="32%" height="77"><img src="images/tech_10/knife.gif" width="15" height="15"> 
+                                    <a href="weapons_knife.html"> Knife</a><br>
+                                    <img src="images/tech_10/shotgun.gif" width="15" height="15"> 
+                                    <a href="weapons_shotgun.html">Shotgun</a><br>
+                                    <img src="images/tech_10/mines.gif" width="15" height="15"> 
+                                    <a href="weapons_mines.html">Trip Mine</a><br>
+                                    <img src="images/tech_10/jetpacks2.gif" width="15" height="15"> 
+                                    <a href="weapons_jetpack.html">Jet Pack</a></td>
+                                  <td width="34%" height="77"><img src="images/tech_10/pistol.gif" width="15" height="15"> 
+                                    <a href="weapons_pistol.html">Pistol</a><br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="weapons_hmg.html">Heavy Machine Gun</a><br>
+                                    <img src="images/tech_10/welder.gif" width="15" height="15"> 
+                                    <a href="weapons_welders.html">Welder</a><br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    Heavy Armor</td>
+                                  <td width="34%" height="77"><img src="images/tech_10/lmg.gif" width="15" height="15"> 
+                                    <a href="weapons_lmg.html">Light Machine Gun</a><br>
+                                    <img src="images/tech_10/grenadel.gif" width="15" height="15"> 
+                                    <a href="weapons_grenadelauncher.html">Grenade 
+                                    Launcher</a><br>
+                                    <img src="images/tech_10/turret.gif" width="15" height="15"> 
+                                    <a href="weapons_turrets.html">Turret</a><br>
+                                    <img src="images/tech_10/siege.gif" width="15" height="15"> 
+                                    <a href="weapons_siege.html">Siege Turret</a></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="628" border="0" cellspacing="0" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td height="77"> 
+                                    <p><b>Desc.: </b> <font color="#0B7BEE">heavy 
+                                      armor absorbs 95% of damage, until it is 
+                                      destroyed.</font><br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Use:</font> </b>the 
+                                      trade-off for increased protection is much 
+                                      slower speed. Heavy armor wearers must work 
+                                      strategically with their more vulnerable 
+                                      (and more nimble) squadmates. Heavy armor 
+                                      can be repaired with a <a href="weapons_welders.html">welder</a>.<br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Data:</font></b> 
+                                      the development of heavy armor has transformed 
+                                      23rd century warfare, as militaries race 
+                                      to perfect and field test this new technology. 
+                                      A cutting edge, head-to-toe defensive system, 
+                                      this protective shell can absorb tremendous 
+                                      amounts of damage. Beneath the plasticene 
+                                      nano-armor shielding, thousands of independent 
+                                      layers of defensive nanos spread and share 
+                                      kinetic energy, using some of an impact's 
+                                      own force to repair damage. Corrosives don't 
+                                      have much effect either. Combining <a href="front_upgrades_armor.html">armor 
+                                      upgrades</a> and heavy armor, a single skilled 
+                                      marine becomes a juggernaut (albeit, a very 
+                                      slow one). <a href="weapons_jetpack.html">Jet 
+                                      packs</a> cannot attach to this bulky, full 
+                                      body armor (and would find its weight difficult 
+                                      to lift if they could).</p>
+                                    <table width="406" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                      <tr> 
+                                        <td colspan="4" height="23" bgcolor="#000033"> 
+                                          <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Heavy 
+                                            Armor </b></p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="28%"> 
+                                          <p>&nbsp;</p>
+                                        </td>
+                                        <td colspan="2" class="sectiontext"> 
+                                          <p align="center" class="sectiontext">Armor 
+                                            Points</p>
+                                        </td>
+                                        <td width="39%" class="sectiontext"> 
+                                          <p align="center" class="sectiontext">% 
+                                            Damage absorbed</p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="28%"> 
+                                          <p class="sectiontext">Heavy Armor (un-<a href="front_upgrades_armor.html">upgraded</a>)</p>
+                                        </td>
+                                        <td colspan="2" valign="middle" align="center"> 
+                                          <p align="center">200</p>
+                                        </td>
+                                        <td valign="middle" align="center"> 
+                                          <p align="center">95%</p>
+                                        </td>
+                                      </tr>
+                                    </table>
+                                  </td>
+                                  <td width="34%" height="77"><img src="images/images/ha.gif" width="200" height="200"></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/weapons_hmg.html b/main/manual/weapons_hmg.html
new file mode 100644
index 00000000..1b72e1b0
--- /dev/null
+++ b/main/manual/weapons_hmg.html
@@ -0,0 +1,245 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_marine.html">Marine</a></span><span class="sectiontext"> 
+            :: </span><span class="sectionlink"><a href="weapons_main.html">Weaponry</a></span><span class="sectiontext">: 
+            <font color="#FF6600">HMG</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/weapons_hmg.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td width="32%" height="77"><img src="images/tech_10/knife.gif" width="15" height="15"> 
+                                    <a href="weapons_knife.html"> Knife</a><br>
+                                    <img src="images/tech_10/shotgun.gif" width="15" height="15"> 
+                                    <a href="weapons_shotgun.html">Shotgun</a><br>
+                                    <img src="images/tech_10/mines.gif" width="15" height="15"> 
+                                    <a href="weapons_mines.html">Trip Mine</a><br>
+                                    <img src="images/tech_10/jetpacks2.gif" width="15" height="15"> 
+                                    <a href="weapons_jetpack.html">Jet Pack</a></td>
+                                  <td width="34%" height="77"><img src="images/tech_10/pistol.gif" width="15" height="15"> 
+                                    <a href="weapons_pistol.html">Pistol</a><br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    Heavy Machine Gun<br>
+                                    <img src="images/tech_10/welder.gif" width="15" height="15"> 
+                                    <a href="weapons_welders.html">Welder</a><br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="weapons_ha.html">Heavy Armor</a></td>
+                                  <td width="34%" height="77"><img src="images/tech_10/lmg.gif" width="15" height="15"> 
+                                    <a href="weapons_lmg.html">Light Machine Gun</a><br>
+                                    <img src="images/tech_10/grenadel.gif" width="15" height="15"> 
+                                    <a href="weapons_grenadelauncher.html">Grenade 
+                                    Launcher</a><br>
+                                    <img src="images/tech_10/turret.gif" width="15" height="15"> 
+                                    <a href="weapons_turrets.html">Turret</a><br>
+                                    <img src="images/tech_10/siege.gif" width="15" height="15"> 
+                                    <a href="weapons_siege.html">Siege Turret</a></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="628" border="0" cellspacing="0" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td height="77"> 
+                                    <p><b>Desc.: </b><font color="#0B7BEE"> double 
+                                      barrels, double rate of fire with less recoil. 
+                                      Heavy. Loud. Large clip.</font><br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Use:</font></b> 
+                                      The best choice when going toe-to-toe with 
+                                      the larger aliens &#150; and it shreds smaller 
+                                      aliens quite nicely too. It's heavy though, 
+                                      and difficult to move with (marines carrying 
+                                      one move much slower). It also has a complicated 
+                                      reload procedure &#150; the ammo cartridge 
+                                      is too large to be discarded and replaced 
+                                      quickly. Reload strategically.<br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Data:</font></b> 
+                                      reminiscent of Eastern European late 21st 
+                                      century designs, this gun is usually just 
+                                      called &quot;Heavy,&quot; as in: &quot;He 
+                                      aint heavy, he's my HMG.&quot; Also referred 
+                                      to as &quot;pom-poms,&quot; after the opposing 
+                                      recoil action of its double barrels. The 
+                                      Heavy was originally designed in TSA labs 
+                                      for field use against <a href="weapons_ha.html">heavy 
+                                      armor</a>, or robotic opponents. This is 
+                                      the most powerful one-man weapon fielded 
+                                      by the TSA, and possibly by any existing 
+                                      military. It has proven the only reliable 
+                                      response to larger alien species like the 
+                                      <a href="alien_fade.html">Fade</a> or <a href="alien_onos.html">Onos</a>. 
+                                      <br>
+                                    </p>
+                                    <table width="406" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                      <tr bgcolor="#000033"> 
+                                        <td colspan="3" height="23"> 
+                                          <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Heavy 
+                                            (HMG)</b></p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_damage.gif" width="10" height="10"> 
+                                            Damage</p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>20</p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_clip.gif" width="10" height="10"> 
+                                            Clip</p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>150</p>
+                                        </td>
+                                      </tr>
+                                    </table>
+                                    
+                                  </td>
+                                  <td width="34%" height="77"><img src="images/images/hmg.gif" width="200" height="200"></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/weapons_jetpack.html b/main/manual/weapons_jetpack.html
new file mode 100644
index 00000000..1e159ea4
--- /dev/null
+++ b/main/manual/weapons_jetpack.html
@@ -0,0 +1,212 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_marine.html">Marine</a></span><span class="sectiontext"> 
+            :: </span><span class="sectionlink"><a href="weapons_main.html">Weaponry</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Jet Pack</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/weapons_jetpacks.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td width="32%" height="77"><img src="images/tech_10/knife.gif" width="15" height="15"> 
+                                    <a href="weapons_knife.html"> Knife</a><br>
+                                    <img src="images/tech_10/shotgun.gif" width="15" height="15"> 
+                                    <a href="weapons_shotgun.html">Shotgun</a><br>
+                                    <img src="images/tech_10/mines.gif" width="15" height="15"> 
+                                    <a href="weapons_mines.html">Trip Mine</a><br>
+                                    <img src="images/tech_10/jetpacks2.gif" width="15" height="15"> 
+                                    Jet Pack</td>
+                                  <td width="34%" height="77"><img src="images/tech_10/pistol.gif" width="15" height="15"> 
+                                    <a href="weapons_pistol.html">Pistol</a><br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="weapons_hmg.html">Heavy Machine Gun</a><br>
+                                    <img src="images/tech_10/welder.gif" width="15" height="15"> 
+                                    <a href="weapons_welders.html">Welder</a><br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="weapons_ha.html">Heavy Armor</a></td>
+                                  <td width="34%" height="77"><img src="images/tech_10/lmg.gif" width="15" height="15"> 
+                                    <a href="weapons_lmg.html">Light Machine Gun</a><br>
+                                    <img src="images/tech_10/grenadel.gif" width="15" height="15"> 
+                                    <a href="weapons_grenadelauncher.html">Grenade 
+                                    Launcher</a><br>
+                                    <img src="images/tech_10/turret.gif" width="15" height="15"> 
+                                    <a href="weapons_turrets.html">Turret</a><br>
+                                    <img src="images/tech_10/siege.gif" width="15" height="15"> 
+                                    <a href="weapons_siege.html">Siege Turret</a></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="628" border="0" cellspacing="0" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td height="77"> 
+                                    <p><b>Desc.: </b><font color="#0B7BEE">back 
+                                      mounted maneuvering jets, <a href="items_main.html">dropped</a> 
+                                      by the <a href="front_commander.html">commander</a>.</font><br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Use:</font> </b>high 
+                                      mobility &#150; the marine can ride the column 
+                                      of propulsion for rapid movement in any 
+                                      direction.<br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Data:</font></b> 
+                                      Jet Packs are still being refined, but so 
+                                      far have proven very valuable for evading 
+                                      enemy attacks, or rapid travel through otherwise 
+                                      inaccessible areas of the battlefield (ceiling 
+                                      vents, etc.). The power source is a rechargeable 
+                                      chemical catalyst battery, that spins the 
+                                      ram jets and creates two columns of super-heated 
+                                      air. The battery can recharge with the tiniest 
+                                      jolt from the command network &#150; a fast 
+                                      process, but the marine must land to initiate 
+                                      it. Watch the jetpack energy meter on your 
+                                      HUD to know when to recharge. Running out 
+                                      of energy high above the ground is ill-advised. 
+                                    </p>
+                                    
+                                  </td>
+                                  <td width="34%" height="77"><img src="images/images/jetpack.gif" width="200" height="200"></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/weapons_knife.html b/main/manual/weapons_knife.html
new file mode 100644
index 00000000..6ca78e0f
--- /dev/null
+++ b/main/manual/weapons_knife.html
@@ -0,0 +1,224 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_marine.html">Marine</a></span><span class="sectiontext"> 
+            :: </span><span class="sectionlink"><a href="weapons_main.html">Weaponry</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Knife</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/weapons_knife.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td width="32%" height="77"><img src="images/tech_10/knife.gif" width="15" height="15"> 
+                                    Knife<br>
+                                    <img src="images/tech_10/shotgun.gif" width="15" height="15"> 
+                                    <a href="weapons_shotgun.html">Shotgun</a><br>
+                                    <img src="images/tech_10/mines.gif" width="15" height="15"> 
+                                    <a href="weapons_mines.html">Trip Mine</a><br>
+                                    <img src="images/tech_10/jetpacks2.gif" width="15" height="15"> 
+                                    <a href="weapons_jetpack.html">Jet Pack</a></td>
+                                  <td width="34%" height="77"><img src="images/tech_10/pistol.gif" width="15" height="15"> 
+                                    <a href="weapons_pistol.html">Pistol</a><br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="weapons_hmg.html">Heavy Machine Gun</a><br>
+                                    <img src="images/tech_10/welder.gif" width="15" height="15"> 
+                                    <a href="weapons_welders.html">Welder</a><br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="weapons_ha.html">Heavy Armor</a></td>
+                                  <td width="34%" height="77"><img src="images/tech_10/lmg.gif" width="15" height="15"> 
+                                    <a href="weapons_lmg.html">Light Machine Gun</a><br>
+                                    <img src="images/tech_10/grenadel.gif" width="15" height="15"> 
+                                    <a href="weapons_grenadelauncher.html">Grenade 
+                                    Launcher</a><br>
+                                    <img src="images/tech_10/turret.gif" width="15" height="15"> 
+                                    <a href="weapons_turrets.html">Turret</a><br>
+                                    <img src="images/tech_10/siege.gif" width="15" height="15"> 
+                                    <a href="weapons_siege.html">Siege Turret</a></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="628" border="0" cellspacing="0" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td height="77"> 
+                                    <p><b>Desc.: </b><font color="#0B7BEE"> Hyper-alloys 
+                                      nano-crafted to a perfect edge &#150; slightly 
+                                      flexible, and nearly unbreakable.</font><br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Use:</font></b> 
+                                      Last resort weapon. Conserves ammo against 
+                                      defenseless targets, like <a href="alien_chambers.html">chambers</a>.<br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Data:</font></b> 
+                                      Knives have been around for a very long 
+                                      time. Few weapons have been field tested 
+                                      as often, or as vigorously. Your standard 
+                                      issue blade is the most effective size, 
+                                      shape, and grip we believe exists for the 
+                                      wide variety of in-field tasks a Frontiersman 
+                                      may face &#150; including, when necessary, combat. 
+                                      However, against the Kharaa, this is a very 
+                                      last resort. Better to retreat than engage 
+                                      the Kharaa in melee.<br>
+                                    </p>
+                                    <table width="406" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                      <tr bgcolor="#000033"> 
+                                        <td colspan="3" height="23"> 
+                                          <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Knife</b></p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_damage.gif" width="10" height="10"> 
+                                            Damage</p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>30</p>
+                                        </td>
+                                      </tr>
+                                    </table>
+                                    
+                                    </td>
+                                  <td width="34%" height="77"><img src="images/images/knife.gif" width="200" height="200"></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/weapons_lmg.html b/main/manual/weapons_lmg.html
new file mode 100644
index 00000000..27305ea2
--- /dev/null
+++ b/main/manual/weapons_lmg.html
@@ -0,0 +1,236 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_marine.html">Marine</a></span><span class="sectiontext"> 
+            :: </span><span class="sectionlink"><a href="weapons_main.html">Weaponry</a></span><span class="sectiontext">: 
+            <font color="#FF6600">LMG</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/weapons_lmg.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td width="32%" height="77"><img src="images/tech_10/knife.gif" width="15" height="15"> 
+                                    <a href="weapons_knife.html"> Knife</a><br>
+                                    <img src="images/tech_10/shotgun.gif" width="15" height="15"> 
+                                    <a href="weapons_shotgun.html">Shotgun</a><br>
+                                    <img src="images/tech_10/mines.gif" width="15" height="15"> 
+                                    <a href="weapons_mines.html">Trip Mine</a><br>
+                                    <img src="images/tech_10/jetpacks2.gif" width="15" height="15"> 
+                                    <a href="weapons_jetpack.html">Jet Pack</a></td>
+                                  <td width="34%" height="77"><img src="images/tech_10/pistol.gif" width="15" height="15"> 
+                                    <a href="weapons_pistol.html">Pistol</a><br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="weapons_hmg.html">Heavy Machine Gun</a><br>
+                                    <img src="images/tech_10/welder.gif" width="15" height="15"> 
+                                    <a href="weapons_welders.html">Welder</a><br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="weapons_ha.html">Heavy Armor</a></td>
+                                  <td width="34%" height="77"><img src="images/tech_10/lmg.gif" width="15" height="15"> 
+                                    Light Machine Gun<br>
+                                    <img src="images/tech_10/grenadel.gif" width="15" height="15"> 
+                                    <a href="weapons_grenadelauncher.html">Grenade 
+                                    Launcher</a><br>
+                                    <img src="images/tech_10/turret.gif" width="15" height="15"> 
+                                    <a href="weapons_turrets.html">Turret</a><br>
+                                    <img src="images/tech_10/siege.gif" width="15" height="15"> 
+                                    <a href="weapons_siege.html">Siege Turret</a></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="628" border="0" cellspacing="0" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td height="77"> 
+                                    <p><b>Desc.: </b><font color="#0B7BEE">Full 
+                                      automatic, lightweight, given to all Frontiersmen.</font><br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Use:</font></b> 
+                                      Default, starting weapon. Fair damage and 
+                                      range. Versatile and effective, more so 
+                                      in groups. <br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Data:</font></b> 
+                                      This utterly reliable weapon is standard 
+                                      issue for all Frontiersmen. Based on a Czech-Consortium 
+                                      design, and modified with United Trans-States 
+                                      parts, the CZU's high rate of fire and near 
+                                      non-existent recoil represent the peak of 
+                                      light-weight, multi-use weapons. Against 
+                                      standard human opponents, the CZU shreds 
+                                      armor and delivers extreme suppression capabilities. 
+                                      Against the Kharaa, it allows rapid response 
+                                      for a squad, especially against fast moving 
+                                      targets &#150; but should not be used as a solo-mission 
+                                      weapon against heavier targets. At long 
+                                      range, its slight spread reduces accuracy.</p>
+                                    <table width="406" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                      <tr bgcolor="#000033"> 
+                                        <td colspan="3" height="23"> 
+                                          <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CZU 
+                                            (LMG)</b></p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_damage.gif" width="10" height="10"> 
+                                            Damage</p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>10</p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_clip.gif" width="10" height="10"> 
+                                            Clip</p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>50</p>
+                                        </td>
+                                      </tr>
+                                    </table>
+                                    
+                                  </td>
+                                  <td width="34%" height="77"><img src="images/images/lmg.gif" width="200" height="200"></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/weapons_main.html b/main/manual/weapons_main.html
new file mode 100644
index 00000000..33220d9a
--- /dev/null
+++ b/main/manual/weapons_main.html
@@ -0,0 +1,244 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_marine.html">Marine</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Weaponry</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/front_weaponry.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr>
+                          <td>
+                            
+                        <table width="628" border="0" cellspacing="5" cellpadding="5" align="center">
+                          <tr> 
+                                
+                            <td> 
+                              <p>Default armament for a Frontiersman is an <a href="weapons_lmg.html">LMG</a>, 
+                                <a href="weapons_pistol.html">pistol</a> and <a href="weapons_knife.html">knife</a>. 
+                                New weapons must be researched and <a href="items_main.html">dropped</a> 
+                                by the <a href="front_commander.html">commander</a>. 
+                                The following are descriptions of marine armament. 
+                                <b>Descriptions</b> give an overview of the weapon. 
+                                <b>Use</b> gives an idea of how it is deployed. 
+                                And <b>Data </b>provides background and other 
+                                secondary details. </p>
+                              </td>
+                              </tr>
+                            </table>
+                          
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="5" cellpadding="0">
+                                <tr align="center"> 
+                                  <td width="25%" height="19"> 
+                                    <p align="center"><img src="images/tech_10/friendlyfire.gif" width="15" height="15"> 
+                                      <a href="front_friendlyfire.html">Friendly 
+                                      Fire</a></p>
+                                  </td>
+                                  <td width="25%" height="19"> 
+                                    <p align="center"><img src="images/tech_10/sterkman.gif" width="15" height="15"> 
+                                      <a href="front_wepsterkman.html">The Sterkman 
+                                      Point System</a></p>
+                                  </td>
+                                </tr>
+                              </table>
+                              <table width="100%" border="0" cellspacing="0" cellpadding="4">
+                                <tr align="center" bgcolor="#0066FF"> 
+                                  <td width="25%" height="19"> 
+                                    <p><b>Primary</b></p>
+                                  </td>
+                                  <td width="25%" height="19"> 
+                                    <p><b>Secondary</b></p>
+                                  </td>
+                                  <td width="25%" height="19"> 
+                                    <p><b>Knife</b></p>
+                                  </td>
+                                  <td width="25%" height="19"> 
+                                    <p><b>Other</b></p>
+                                  </td>
+                                </tr>
+                                <tr align="center"> 
+                                  <td width="25%" height="77"><a href="weapons_knife.html"> 
+                                    </a><a href="weapons_lmg.html">Light Machine 
+                                    Gun<br>
+                                    <img src="images/tech/lmg.gif" width="64" height="64" vspace="2" border="0"> 
+                                    </a><a href="weapons_knife.html"><br>
+                                    </a> </td>
+                                  <td width="25%" height="77"><a href="weapons_pistol.html">Pistol<br>
+                                    <img src="images/tech/pistol.gif" width="64" height="64" border="0" vspace="2"></a> 
+                                  </td>
+                                  <td width="25%" height="77"><a href="weapons_knife.html">Knife<br>
+                                    <img src="images/tech/knife.gif" width="64" height="64" border="0" vspace="2"> 
+                                    </a></td>
+                                  <td width="25%" height="77"><a href="weapons_jetpack.html">Jet 
+                                    Pack<br>
+                                    <img src="images/tech/jetpacks2.gif" width="64" height="64" vspace="2" border="0"> 
+                                    </a></td>
+                                </tr>
+                                <tr align="center"> 
+                                  <td width="25%" height="77"><a href="weapons_shotgun.html">Shotgun<br>
+                                    <img src="images/tech/shotgun.gif" width="64" height="64" vspace="2" border="0"></a></td>
+                                  <td width="25%" height="77"><a href="weapons_welders.html">Welder<br>
+                                    <img src="images/tech/welder.gif" width="64" height="64" border="0" vspace="2"> 
+                                    </a></td>
+                                  <td width="25%" height="77">&nbsp;</td>
+                                  <td width="25%" height="77"><a href="weapons_turrets.html">Turret<br>
+                                    <img src="images/tech/turret.gif" width="64" height="64" border="0" vspace="2"> 
+                                    </a></td>
+                                </tr>
+                                <tr align="center"> 
+                                  <td width="25%" height="77"><a href="weapons_hmg.html">Heavy 
+                                    Machine Gun<br>
+                                    <img src="images/tech/hmg.gif" width="64" height="64" vspace="2" border="0"> 
+                                    </a></td>
+                                  <td width="25%" height="77"><a href="weapons_mines.html">Trip 
+                                    Mine<br>
+                                    <img src="images/tech/mines.gif" width="64" height="64" vspace="2" border="0"> 
+                                    </a></td>
+                                  <td width="25%" height="77">&nbsp;</td>
+                                  <td width="25%" height="77"><a href="weapons_ha.html">Heavy 
+                                    Armor<br>
+                                    <img src="images/tech/heavya.gif" width="64" height="64" vspace="2" border="0"> 
+                                    </a></td>
+                                </tr>
+                                <tr align="center"> 
+                                  <td width="25%" height="77"><a href="weapons_grenadelauncher.html">Grenade 
+                                    Launcher<br>
+                                    <img src="images/tech/grenadel.gif" width="64" height="64" vspace="2" border="0"> 
+                                    </a></td>
+                                  <td width="25%" height="77">&nbsp;</td>
+                                  <td width="25%" height="77">&nbsp;</td>
+                                  <td width="25%" height="77"><a href="weapons_siege.html">Siege 
+                                    Turret<br>
+                                    <img src="images/tech/siege.gif" width="64" height="64" vspace="2" border="0"> 
+                                    </a></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/weapons_mines.html b/main/manual/weapons_mines.html
new file mode 100644
index 00000000..e97cb9b9
--- /dev/null
+++ b/main/manual/weapons_mines.html
@@ -0,0 +1,258 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_marine.html">Marine</a></span><span class="sectiontext"> 
+            :: </span><span class="sectionlink"><a href="weapons_main.html">Weaponry</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Trip Mine</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/weapons_tripmines.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td width="32%" height="77"><img src="images/tech_10/knife.gif" width="15" height="15"> 
+                                    <a href="weapons_knife.html"> Knife</a><br>
+                                    <img src="images/tech_10/shotgun.gif" width="15" height="15"> 
+                                    <a href="weapons_shotgun.html">Shotgun</a><br>
+                                    <img src="images/tech_10/mines.gif" width="15" height="15"> 
+                                    Trip Mine<br>
+                                    <img src="images/tech_10/jetpacks2.gif" width="15" height="15"> 
+                                    <a href="weapons_jetpack.html">Jet Pack</a></td>
+                                  <td width="34%" height="77"><img src="images/tech_10/pistol.gif" width="15" height="15"> 
+                                    <a href="weapons_pistol.html">Pistol</a><br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="weapons_hmg.html">Heavy Machine Gun</a><br>
+                                    <img src="images/tech_10/welder.gif" width="15" height="15"> 
+                                    <a href="weapons_welders.html">Welder</a><br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="weapons_ha.html">Heavy Armor</a></td>
+                                  <td width="34%" height="77"><img src="images/tech_10/lmg.gif" width="15" height="15"> 
+                                    <a href="weapons_lmg.html">Light Machine Gun</a><br>
+                                    <img src="images/tech_10/grenadel.gif" width="15" height="15"> 
+                                    <a href="weapons_grenadelauncher.html">Grenade 
+                                    Launcher</a><br>
+                                    <img src="images/tech_10/turret.gif" width="15" height="15"> 
+                                    <a href="weapons_turrets.html">Turret</a><br>
+                                    <img src="images/tech_10/siege.gif" width="15" height="15"> 
+                                    <a href="weapons_siege.html">Siege Turret</a></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="628" border="0" cellspacing="0" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td height="77"> 
+                                    <p><b>Desc.: </b><font color="#0B7BEE"> multi-purpose 
+                                      mines, can be placed on vertical surfaces 
+                                      (laser-tripped) or on the ground (contact-tripped)</font><br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Use:</font></b> 
+                                      defensive and rear-guard uses, plus booby-traps 
+                                      in high-use areas. Effective mine placement 
+                                      can seal off a corridor against all but 
+                                      the strongest Kharaa. Smaller aliens have 
+                                      a way of slipping past these, squeezing 
+                                      along the ceiling or walls &#150; so place them 
+                                      strategically. Explosions can injure marines, 
+                                      so standing next to an alien who trips a 
+                                      mine is dangerous.<br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Data:</font></b> 
+                                      usually just called &quot;trips&quot;, mines 
+                                      are used to supplement defenses, or deter 
+                                      alien prowlers. If placed on a vertical 
+                                      surface, the mine attaches with its magnetic 
+                                      gripping legs, and shoots a laser beam directly 
+                                      from its center. When this laser is tripped, 
+                                      the mine explodes. Aliens seem to quickly 
+                                      learn the purpose of these lasers, and will 
+                                      attempt to avoid them. More stealthy, but 
+                                      less of a deterrent, trips can also be placed 
+                                      on the ground, where they will affix and 
+                                      arm themselves. This landmine variant will 
+                                      beep when touched by a friendly marine. 
+                                      An improperly placed mine (only half gripping 
+                                      a surface, no room for laser to deploy, 
+                                      etc.) may explode moments after release, 
+                                      injuring nearby marines. A mine tripped 
+                                      by a hostile can also injure nearby marines 
+                                      with its blast. </p>
+                                    <table width="406" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                      <tr bgcolor="#000033"> 
+                                        <td colspan="3" height="23"> 
+                                          <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Trip 
+                                            Mines</b></p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_damage.gif" width="10" height="10"> 
+                                            Damage</p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>100 at epicenter, reduces outwards</p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_clip.gif" width="10" height="10"> 
+                                            Clip</p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>dropped in packs of 5</p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_note.gif" width="10" height="10"> 
+                                            Note </p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>also damages friendlies </p>
+                                        </td>
+                                      </tr>
+                                    </table>
+                                    
+                                  </td>
+                                  <td width="34%" height="77"><img src="images/images/mine.gif" width="200" height="200"></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/weapons_pistol.html b/main/manual/weapons_pistol.html
new file mode 100644
index 00000000..61bf952d
--- /dev/null
+++ b/main/manual/weapons_pistol.html
@@ -0,0 +1,238 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_marine.html">Marine</a></span><span class="sectiontext"> 
+            :: </span><span class="sectionlink"><a href="weapons_main.html">Weaponry</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Pistol</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/weapons_handgun.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td width="32%" height="77"><img src="images/tech_10/knife.gif" width="15" height="15"> 
+                                    <a href="weapons_knife.html"> Knife</a><br>
+                                    <img src="images/tech_10/shotgun.gif" width="15" height="15"> 
+                                    <a href="weapons_shotgun.html">Shotgun</a><br>
+                                    <img src="images/tech_10/mines.gif" width="15" height="15"> 
+                                    <a href="weapons_mines.html">Trip Mine</a><br>
+                                    <img src="images/tech_10/jetpacks2.gif" width="15" height="15"> 
+                                    <a href="weapons_jetpack.html">Jet Pack</a></td>
+                                  <td width="34%" height="77"><img src="images/tech_10/pistol.gif" width="15" height="15"> 
+                                    Pistol<br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="weapons_hmg.html">Heavy Machine Gun</a><br>
+                                    <img src="images/tech_10/welder.gif" width="15" height="15"> 
+                                    <a href="weapons_welders.html">Welder</a><br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="weapons_ha.html">Heavy Armor</a></td>
+                                  <td width="34%" height="77"><img src="images/tech_10/lmg.gif" width="15" height="15"> 
+                                    <a href="weapons_lmg.html">Light Machine Gun</a><br>
+                                    <img src="images/tech_10/grenadel.gif" width="15" height="15"> 
+                                    <a href="weapons_grenadelauncher.html">Grenade 
+                                    Launcher</a><br>
+                                    <img src="images/tech_10/turret.gif" width="15" height="15"> 
+                                    <a href="weapons_turrets.html">Turret</a><br>
+                                    <img src="images/tech_10/siege.gif" width="15" height="15"> 
+                                    <a href="weapons_siege.html">Siege Turret</a></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="628" border="0" cellspacing="0" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td height="77"> 
+                                    <p><b>Desc.: </b><font color="#0B7BEE"> military-grade 
+                                      handgun, state-of-the-art chambering system. 
+                                      Given to all Frontiersmen.</font><br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Use:</font></b> 
+                                      Secondary weapon. Burst or precision shots.<br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Data:</font></b> 
+                                      Designed for police work in the China Territories, 
+                                      and quickly adopted by security and police 
+                                      forces far and wide, the Cx10 combat pistol 
+                                      provides impressive killing power in a tiny 
+                                      package. This is more than a last resort 
+                                      weapon &#150; the clever Frontiersman will make 
+                                      use of its perfect accuracy and impressive 
+                                      range. Its looping kinetic reload means 
+                                      that it takes the recoil energy from each 
+                                      shot and uses it to reload and recharge 
+                                      &#150; so there is barely any kick, and it fires 
+                                      as fast as you can pull the trigger. While 
+                                      not recommended as a primary use weapon 
+                                      against the Kharaa, the Cx10 is well suited 
+                                      to many combat situations. <br>
+                                    </p>
+                                    <table width="406" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                      <tr bgcolor="#000033"> 
+                                        <td colspan="3" height="23"> 
+                                          <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Cx10 
+                                            (pistol)</b></p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_damage.gif" width="10" height="10"> 
+                                            Damage</p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>20</p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_clip.gif" width="10" height="10"> 
+                                            Clip</p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>10</p>
+                                        </td>
+                                      </tr>
+                                    </table>
+                                    
+                                    </td>
+                                  <td width="34%" height="77"><img src="images/images/pistol.gif" width="200" height="200"></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/weapons_shotgun.html b/main/manual/weapons_shotgun.html
new file mode 100644
index 00000000..067dbad0
--- /dev/null
+++ b/main/manual/weapons_shotgun.html
@@ -0,0 +1,233 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_marine.html">Marine</a></span><span class="sectiontext"> 
+            :: </span><span class="sectionlink"><a href="weapons_main.html">Weaponry</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Shotgun</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/weapons_shotgun.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td width="32%" height="77"><img src="images/tech_10/knife.gif" width="15" height="15"> 
+                                    <a href="weapons_knife.html"> Knife</a><br>
+                                    <img src="images/tech_10/shotgun.gif" width="15" height="15"> 
+                                    Shotgun<br>
+                                    <img src="images/tech_10/mines.gif" width="15" height="15"> 
+                                    <a href="weapons_mines.html">Trip Mine</a><br>
+                                    <img src="images/tech_10/jetpacks2.gif" width="15" height="15"> 
+                                    <a href="weapons_jetpack.html">Jet Pack</a></td>
+                                  <td width="34%" height="77"><img src="images/tech_10/pistol.gif" width="15" height="15"> 
+                                    <a href="weapons_pistol.html">Pistol</a><br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="weapons_hmg.html">Heavy Machine Gun</a><br>
+                                    <img src="images/tech_10/welder.gif" width="15" height="15"> 
+                                    <a href="weapons_welders.html">Welder</a><br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="weapons_ha.html">Heavy Armor</a></td>
+                                  <td width="34%" height="77"><img src="images/tech_10/lmg.gif" width="15" height="15"> 
+                                    <a href="weapons_lmg.html">Light Machine Gun</a><br>
+                                    <img src="images/tech_10/grenadel.gif" width="15" height="15"> 
+                                    <a href="weapons_grenadelauncher.html">Grenade 
+                                    Launcher</a><br>
+                                    <img src="images/tech_10/turret.gif" width="15" height="15"> 
+                                    <a href="weapons_turrets.html">Turret</a><br>
+                                    <img src="images/tech_10/siege.gif" width="15" height="15"> 
+                                    <a href="weapons_siege.html">Siege Turret</a></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="628" border="0" cellspacing="0" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td height="77"> 
+                                    <p><b>Desc.: </b><font color="#0B7BEE"> single 
+                                      barreled, pump action, shell-type ammo. 
+                                      </font><br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Use:</font></b> 
+                                      Big damage, short range. Cone of fire helps 
+                                      take down fast opponents.<br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Data:</font></b> 
+                                      The TSA &quot;Serieux&quot; model shotgun 
+                                      shoots a cone of accelerated metal fragments. 
+                                      Up close, it has proven very effective against 
+                                      the Kharaa. The Serieux was designed by 
+                                      French covert ops for insurgency missions 
+                                      as a powerful, easy to use and manufacture 
+                                      weapon for rebel and guerrilla groups. Its 
+                                      relatively basic design makes it a cost-effective 
+                                      upgrade early on in an engagement.</p>
+                                    <table width="406" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                      <tr bgcolor="#000033"> 
+                                        <td colspan="3" height="23"> 
+                                          <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Serieux 
+                                            (shotgun)</b></p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_damage.gif" width="10" height="10"> 
+                                            Damage</p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>16 per fragment. 10 fragments per 
+                                            shot.</p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_clip.gif" width="10" height="10"> 
+                                            Clip</p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>10</p>
+                                        </td>
+                                      </tr>
+                                    </table>
+                                    
+                                    </td>
+                                  <td width="34%" height="77"><img src="images/images/shotgun.gif" width="200" height="200"></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/weapons_siege.html b/main/manual/weapons_siege.html
new file mode 100644
index 00000000..3ffdd9e9
--- /dev/null
+++ b/main/manual/weapons_siege.html
@@ -0,0 +1,279 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_marine.html">Marine</a></span><span class="sectiontext"> 
+            :: </span><span class="sectionlink"><a href="weapons_main.html">Weaponry</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Siege Turrets</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/weapons_siege.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td width="32%" height="77"><img src="images/tech_10/knife.gif" width="15" height="15"> 
+                                    <a href="weapons_knife.html"> Knife</a><br>
+                                    <img src="images/tech_10/shotgun.gif" width="15" height="15"> 
+                                    <a href="weapons_shotgun.html">Shotgun</a><br>
+                                    <img src="images/tech_10/mines.gif" width="15" height="15"> 
+                                    <a href="weapons_mines.html">Trip Mine</a><br>
+                                    <img src="images/tech_10/jetpacks2.gif" width="15" height="15"> 
+                                    <a href="weapons_jetpack.html">Jet Pack</a></td>
+                                  <td width="34%" height="77"><img src="images/tech_10/pistol.gif" width="15" height="15"> 
+                                    <a href="weapons_pistol.html">Pistol</a><br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="weapons_hmg.html">Heavy Machine Gun</a><br>
+                                    <img src="images/tech_10/welder.gif" width="15" height="15"> 
+                                    <a href="weapons_welders.html">Welder</a><br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="weapons_ha.html">Heavy Armor</a></td>
+                                  <td width="34%" height="77"><img src="images/tech_10/lmg.gif" width="15" height="15"> 
+                                    <a href="weapons_lmg.html">Light Machine Gun</a><br>
+                                    <img src="images/tech_10/grenadel.gif" width="15" height="15"> 
+                                    <a href="weapons_grenadelauncher.html">Grenade 
+                                    Launcher</a><br>
+                                    <img src="images/tech_10/turret.gif" width="15" height="15"> 
+                                    <a href="weapons_turrets.html">Turret</a><br>
+                                    <img src="images/tech_10/siege.gif" width="15" height="15"> 
+                                    Siege Turret</td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="628" border="0" cellspacing="0" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td height="77"> 
+                                    <p><b>Desc.: </b><font color="#0B7BEE"> heavy 
+                                      artillery, that ignores walls and barriers, 
+                                      doing massive damage to any alien growth 
+                                      (hives or chambers) in range. Does splash 
+                                      damage to any alien or chamber next to the 
+                                      blast.</font><br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Use:</font></b> 
+                                      most commonly used to destroy hives from 
+                                      a safe location. Once it starts firing, 
+                                      be prepared for an extreme alien response.<br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Data:</font></b> 
+                                      developed for use against enemy defensive 
+                                      emplacements, and made to operate independent 
+                                      from a nano-network or even human control, 
+                                      one siege turret can completely halt alien 
+                                      development (if placed strategically, and 
+                                      defended). Siege turrets generate their 
+                                      own gravitational field effect, which can 
+                                      register all objects with more than a few 
+                                      pounds of mass within its radius. The shape-signatures 
+                                      of the objects are matched against its database, 
+                                      and any hostile patterns are eliminated. 
+                                      Alien structures have been successfully 
+                                      added to this database. The turret manipulates 
+                                      its gravitational field to induce a catastrophic 
+                                      effect &#150; much like a sonic boom &#150; 
+                                      that ignores intervening barriers and walls. 
+                                      The splash damage from this effect makes 
+                                      the siege especially effective against clusters 
+                                      of alien chambers. Since aliens themselves 
+                                      don't hold the same shape very long (i.e. 
+                                      they tend to move &#133; a <i>lot</i>) they, 
+                                      and other mobile targets, don't register. 
+                                      But if an alien is standing next to a chamber 
+                                      or hive when a siege turret starts its bombardment, 
+                                      the incidental damage alone is often enough 
+                                      to kill them.</p>
+                                    <table width="406" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                      <tr bgcolor="#000033"> 
+                                        <td colspan="3" height="23"> 
+                                          <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Siege 
+                                            Turret</b></p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_damage.gif" width="10" height="10"> 
+                                            Damage</p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>700, 350 incidental damage.</p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_range.gif" width="10" height="10"> 
+                                            Range</p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>1250</p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_time.gif" width="10" height="10"> 
+                                            Rate of Fire</p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>once every 5 seconds</p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_armor.gif" width="10" height="10"> 
+                                            Armor Pts. </p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>2000</p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_note.gif" width="10" height="10"> 
+                                            Note </p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>special attack (see description)</p>
+                                        </td>
+                                      </tr>
+                                    </table>
+                                  </td>
+                                  <td width="34%" height="77"><img src="images/images/siege.gif" width="200" height="200"></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/weapons_turrets.html b/main/manual/weapons_turrets.html
new file mode 100644
index 00000000..c0e6f420
--- /dev/null
+++ b/main/manual/weapons_turrets.html
@@ -0,0 +1,274 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_marine.html">Marine</a></span><span class="sectiontext"> 
+            :: </span><span class="sectionlink"><a href="weapons_main.html">Weaponry</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Turrets</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/weapons_turrets.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td width="32%" height="77"><img src="images/tech_10/knife.gif" width="15" height="15"> 
+                                    <a href="weapons_knife.html"> Knife</a><br>
+                                    <img src="images/tech_10/shotgun.gif" width="15" height="15"> 
+                                    <a href="weapons_shotgun.html">Shotgun</a><br>
+                                    <img src="images/tech_10/mines.gif" width="15" height="15"> 
+                                    <a href="weapons_mines.html">Trip Mine</a><br>
+                                    <img src="images/tech_10/jetpacks2.gif" width="15" height="15"> 
+                                    <a href="weapons_jetpack.html">Jet Pack</a></td>
+                                  <td width="34%" height="77"><img src="images/tech_10/pistol.gif" width="15" height="15"> 
+                                    <a href="weapons_pistol.html">Pistol</a><br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="weapons_hmg.html">Heavy Machine Gun</a><br>
+                                    <img src="images/tech_10/welder.gif" width="15" height="15"> 
+                                    <a href="weapons_welders.html">Welder</a><br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="weapons_ha.html">Heavy Armor</a></td>
+                                  <td width="34%" height="77"><img src="images/tech_10/lmg.gif" width="15" height="15"> 
+                                    <a href="weapons_lmg.html">Light Machine Gun</a><br>
+                                    <img src="images/tech_10/grenadel.gif" width="15" height="15"> 
+                                    <a href="weapons_grenadelauncher.html">Grenade 
+                                    Launcher</a><br>
+                                    <img src="images/tech_10/turret.gif" width="15" height="15"> 
+                                    Turret<br>
+                                    <img src="images/tech_10/siege.gif" width="15" height="15"> 
+                                    <a href="weapons_siege.html">Siege Turret</a></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="628" border="0" cellspacing="0" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td height="77"> 
+                                    <p><b>Desc.: </b><font color="#0B7BEE"> automated 
+                                      anti-personnel emplacements, turrets are 
+                                      equivalent in damage to a machine gun, but 
+                                      can fire on full automatic indefinitely, 
+                                      and never run out of ammo.</font><br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Use:</font></b> 
+                                      turrets are used to defend an area. More 
+                                      than one is usually required to successfully 
+                                      hold off a determined Kharaa. Turret placement 
+                                      is crucial, and there are many theories 
+                                      on how to best cover an area. Turrets target 
+                                      line-of-sight in 360 degrees, but have limited 
+                                      vertical acquisition (they can't aim up 
+                                      or down more than around 30&deg; - a 60&deg; 
+                                      total vertical). Fast moving targets are 
+                                      also difficult for them to acquire.<br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Data:</font></b> 
+                                      turrets are designed as deploy-and-forget 
+                                      (automated) anti-personnel weapons. They 
+                                      perform regular optical sweeps of their 
+                                      environment (around two a second), and fire 
+                                      on any object that can't be accounted for 
+                                      by the <a href="front_commander.html">command 
+                                      network</a> (chambers or hives) or <a href="front_friendlyfire.html">FriendlyFire</a> 
+                                      (alien species). Without an observatory 
+                                      present, cloaked aliens can also evade them 
+                                      (although aliens cannot move and remain 
+                                      <a href="alien_evolutions_cloaking.html">cloaked</a>). 
+                                      If attacked by multiple targets, turrets 
+                                      will always acquire the closest hostile.<br>
+                                    </p>
+                                    <table width="406" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                      <tr bgcolor="#000033"> 
+                                        <td colspan="3" height="23"> 
+                                          <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sentry 
+                                            Turret</b></p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_damage.gif" width="10" height="10"> 
+                                            Damage</p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>27</p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_range.gif" width="10" height="10"> 
+                                            Range</p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>800</p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_time.gif" width="10" height="10"> 
+                                            Rate of Fire</p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>1-2x a second</p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_armor.gif" width="10" height="10"> 
+                                            Armor Pts. </p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>1000</p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_note.gif" width="10" height="10"> 
+                                            Note </p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>automated defense</p>
+                                        </td>
+                                      </tr>
+                                    </table>
+                                    
+                                  </td>
+                                  <td width="34%" height="77"><img src="images/images/turret.gif" width="200" height="200"></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/manual/weapons_welders.html b/main/manual/weapons_welders.html
new file mode 100644
index 00000000..729de0e8
--- /dev/null
+++ b/main/manual/weapons_welders.html
@@ -0,0 +1,255 @@
+<HTML>
+<HEAD>
+<TITLE>Natural Selection Manual</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="css/marine.css" type="text/css">
+<script language="JavaScript">
+<!--
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && document.getElementById) x=document.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</HEAD>
+<BODY BGCOLOR=#000000 leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/design/buttons_nav_on.gif','images/design/buttons_gen_on.gif','images/design/buttons_front_on.gif','images/design/buttons_alien_on.gif')" background="images/design/page_background.gif" text="#FFFFFF" link="#0099FF">
+<table border=0 cellpadding=0 cellspacing=0 width="704" height="512" align="center">
+  <tr> 
+    <td> <img src="images/design/spacer.gif" width=40 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=33 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=24 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=375 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=82 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=175 height=1></td>
+    <td> <img src="images/design/spacer.gif" width=39 height=1></td>
+  </tr>
+  <tr> 
+    <td colspan=2> <img src="images/design/surround_ne1.gif" width=73 height=34></td>
+    <td> <img src="images/design/surround_power.gif" width=24 height=34></td>
+    <td colspan=4> <img src="images/design/surround_n.gif" width=671 height=34></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top"><img src="images/design/surround_title_w.gif" width="40" height="103"></td>
+    <td colspan=3 height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td height="57"><img src="images/design/surround_title_animated.gif" width="432" height="57"></td>
+        </tr>
+        <tr> 
+          <td valign="top" background="images/design/surround_title_s.gif"><span class="sectionlink"><a href="frontiersmen.html">Frontiersmen 
+            Data</a></span><span class="sectiontext"> :: </span><span class="sectionlink"><a href="front_marine.html">Marine</a></span><span class="sectiontext"> 
+            :: </span><span class="sectionlink"><a href="weapons_main.html">Weaponry</a></span><span class="sectiontext">: 
+            <font color="#FF6600">Welders</font></span></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_c.gif" width="82" height="103"></td>
+    <td height="103" valign="top"> 
+      <table border="0" cellspacing="0" cellpadding="0" height="103">
+        <tr> 
+          <td><a href="introduction.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_nav','','images/design/buttons_nav_on.gif',1)"><img name="button_nav" border="0" src="images/design/buttons_nav_off.gif" width="175" height="25"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="general.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_general','','images/design/buttons_gen_on.gif',1)"><img name="button_general" border="0" src="images/design/buttons_gen_off.gif" width="175" height="23"></a></td>
+        </tr>
+        <tr> 
+          <td><a href="frontiersmen.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_tsa','','images/design/buttons_front_on.gif',1)"><img name="button_tsa" border="0" src="images/design/buttons_front_off.gif" width="175" height="28"></a></td>
+        </tr>
+        <tr> 
+          <td height="2"><a href="alien.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('button_alien','','images/design/buttons_alien_on.gif',1)"><img name="button_alien" border="0" src="images/design/buttons_alien_off.gif" width="175" height="27"></a></td>
+        </tr>
+      </table>
+    </td>
+    <td height="103" valign="top"><img src="images/design/surround_title_e.gif" width="39" height="103"></td>
+  </tr>
+  <tr> 
+    <td height="103" valign="top" colspan="7">
+<table width="768" border="0" cellspacing="0" cellpadding="0" height="424" align="left">
+        <tr> 
+          <td background="images/design/surround_w.gif"><img src="images/design/surround_w.gif" width="40" height="482"></td>
+          <td width="472" background="images/design/background.gif" valign="top"> 
+            <p><img src="images/design/background_n.gif" width="689" height="16"></p>
+            <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" height="63">
+                <tr> 
+                  <td align="center" valign="top"> 
+                    <table width="100" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          
+                      <td><img src="images/titles/weapons_welders.gif" width="628" height="25" hspace="25"></td>
+                        </tr>
+                        <tr> 
+                          
+                      <td>&nbsp;</td>
+                        </tr>
+                        <tr>
+                          
+                      <td> 
+                        <table width="628" border="1" cellspacing="0" cellpadding="5" bgcolor="#000033" align="center" bordercolor="#0B7BEE">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td width="32%" height="77"><img src="images/tech_10/knife.gif" width="15" height="15"> 
+                                    <a href="weapons_knife.html"> Knife</a><br>
+                                    <img src="images/tech_10/shotgun.gif" width="15" height="15"> 
+                                    <a href="weapons_shotgun.html">Shotgun</a><br>
+                                    <img src="images/tech_10/mines.gif" width="15" height="15"> 
+                                    <a href="weapons_mines.html">Trip Mine</a><br>
+                                    <img src="images/tech_10/jetpacks2.gif" width="15" height="15"> 
+                                    <a href="weapons_jetpack.html">Jet Pack</a></td>
+                                  <td width="34%" height="77"><img src="images/tech_10/pistol.gif" width="15" height="15"> 
+                                    <a href="weapons_pistol.html">Pistol</a><br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="weapons_hmg.html">Heavy Machine Gun</a><br>
+                                    <img src="images/tech_10/welder.gif" width="15" height="15"> 
+                                    Welder<br>
+                                    <img src="images/tech_10/hmg.gif" width="15" height="15"> 
+                                    <a href="weapons_ha.html">Heavy Armor</a></td>
+                                  <td width="34%" height="77"><img src="images/tech_10/lmg.gif" width="15" height="15"> 
+                                    <a href="weapons_lmg.html">Light Machine Gun</a><br>
+                                    <img src="images/tech_10/grenadel.gif" width="15" height="15"> 
+                                    <a href="weapons_grenadelauncher.html">Grenade 
+                                    Launcher</a><br>
+                                    <img src="images/tech_10/turret.gif" width="15" height="15"> 
+                                    <a href="weapons_turrets.html">Turret</a><br>
+                                    <img src="images/tech_10/siege.gif" width="15" height="15"> 
+                                    <a href="weapons_siege.html">Siege Turret</a></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="628" border="0" cellspacing="0" cellpadding="5" align="center">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr> 
+                                  <td height="77"> 
+                                    <p><b>Desc.: </b><font color="#0B7BEE">portable 
+                                      welder, plastic/ceramic construction, closes 
+                                      when not in use.<br>
+                                      </font><br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Use:</font> </b>can 
+                                      open or seal weldable areas, repair <a href="structures.html">structures</a>, 
+                                      and repair <a href="front_armor.html">regular</a> 
+                                      or <a href="weapons_ha.html">heavy armor</a>. 
+                                      Also destroys <a href="alien_gorge_hive.html">webs</a>. 
+                                      Replaces the <a href="weapons_pistol.html">pistol</a>.<br>
+                                      <br>
+                                      <img src="images/images/splitter.gif" width="100%" height="1"><br>
+                                      <b><font color="#0B7BEE">Data:</font></b> 
+                                      taken almost directly from industrial designs, 
+                                      the N-Welder is half &quot;traditional&quot; 
+                                      welder (self-combusting nanites create a 
+                                      metal melting hot point), and half nano-tool 
+                                      (sending a stream of construction nanites 
+                                      into the softened metal). It is designed 
+                                      to repair structures in the field, saving 
+                                      resources and strengthening defenses between 
+                                      attacks. It is also the only way to repair 
+                                      damaged armor, so is especially useful in 
+                                      squads using <a href="weapons_ha.html">heavy 
+                                      armor</a>. The N-Welder can safely destroy 
+                                      <a href="alien_gorge_hive.html">webs</a>, 
+                                      without triggering them. As an <a href="front_building.html">authorized 
+                                      maintenance tool</a> it has one final, incredibly 
+                                      useful function &#150; it can seal or unseal 
+                                      certain doors and vents, or open or close 
+                                      control panels that may allow all manner 
+                                      of actions. Weldable objects are marked 
+                                      by special icons on the marine HUD.<br>
+                                    </p>
+                                    <table width="406" border="1" cellspacing="0" cellpadding="2" align="center" bordercolor="#0B7BEE">
+                                      <tr bgcolor="#000033"> 
+                                        <td colspan="3" height="23"> 
+                                          <p><b class="sectiontext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;N-Welder</b></p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_damage.gif" width="10" height="10"> 
+                                            Damage</p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>heals armor and structures</p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_clip.gif" width="10" height="10"> 
+                                            Clip</p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>n/a</p>
+                                        </td>
+                                      </tr>
+                                      <tr> 
+                                        <td width="32%"> 
+                                          <p><img src="images/images/10_note.gif" width="10" height="10"> 
+                                            Note </p>
+                                        </td>
+                                        <td colspan="2"> 
+                                          <p>can weld certain areas</p>
+                                        </td>
+                                      </tr>
+                                    </table>
+                                    
+                                  </td>
+                                  <td width="34%" height="77"><img src="images/images/welder.gif" width="200" height="200"></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                        
+                      </td>
+                        </tr>
+                      </table>
+                    <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                        <tr> 
+                          <td align="center" valign="top"> 
+                            
+                        <div align="center"> </div>
+                          </td>
+                        </tr>
+                      </table>
+                    
+                  </td>
+                </tr>
+              </table>
+              
+            
+
+            
+          </td>
+          <td background="images/design/surround_e.gif"><img src="images/design/surround_e.gif" width="37" height="482"></td>
+        </tr>
+        <tr> 
+          <td colspan="3" height="2"><img src="images/design/surround_s.gif" width="768" height="81"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/main/mapcycle.txt b/main/mapcycle.txt
new file mode 100644
index 00000000..6fa9db40
--- /dev/null
+++ b/main/mapcycle.txt
@@ -0,0 +1,47 @@
+// Old default instructions:
+//
+// Instructions for using mapcycle.txt
+// No, you can't change maxplayers on the server, but you can skip maps that don't fit the current # of players
+// If no suitable match is found anywhere in your mapcycle file, then the server just moves to the next map in the file anyway.
+// Minplayers or maxplayers set to 0 mean don't restrict based on that parameter.  You don't have to include minplayers or maxplayers if you
+// are not making a restriction.  They default to 0 if missing.
+// You can list a file twice in the rotation now
+// You can issue a command ( rather than setting key value pairs ) at the server console by bracketing it with a blank
+// key value: e.g., \mycommand\\
+// minplayers and maxplayers are special tokens and are parsed and removed before the commands are executed
+// Commands are executed just after the changelevel command occurs.
+// Be sure to remove conflicting settings from any server.cfg or listenserver.cfg files you use since those values will stomp
+// on the ones you set here
+// The double quotes are necessary
+// BTW, the old format will still work
+//
+// NS instructions:
+//
+// Other notes: 
+// - Combat and NS maps are mixed to both types for variety.  
+// - Use minplayers of 0 for popular combat maps, so an empty server is ready for small numbers of players to join.
+// - Reduced maxplayers on bast and hera for CPU reasons
+// 
+ns_eon "\minplayers\16\maxplayers\32\"
+ns_metal "\minplayers\16\maxplayers\32\"
+ns_caged "\minplayers\16\maxplayers\32\"
+co_sava "\minplayers\6\maxplayers\20\"
+co_angst "\minplayers\4\maxplayers\20\"
+ns_hera "\minplayers\16\maxplayers\24\"
+ns_lost "\minplayers\16\maxplayers\32\"
+ns_nothing "\minplayers\16\maxplayers\32\"
+co_niveus "\minplayers\4\maxplayers\20\"
+co_faceoff "\minplayers\0\maxplayers\18\"
+co_daimos "\minplayers\8\maxplayers\20\"
+ns_bast "\minplayers\14\maxplayers\28\"
+ns_origin "\minplayers\16\maxplayers\32\"
+co_kestrel "\minplayers\8\maxplayers\20\"
+ns_tanith "\minplayers\16\maxplayers\32\"
+ns_nancy "\minplayers\14\maxplayers\32\"
+ns_veil "\minplayers\16\maxplayers\32\"
+co_core "\minplayers\0\maxplayers\20\"
+co_ulysses "\minplayers\4\maxplayers\20\"
+ns_eclipse "\minplayers\14\maxplayers\32\"
+co_pulse "\minplayers\0\maxplayers\20\"
+ns_ayumi "\minplayers\16\maxplayers\32\"
+ns_altair "\minplayers\16\maxplayers\32\"
\ No newline at end of file
diff --git a/main/maps/co_angst.bsp b/main/maps/co_angst.bsp
new file mode 100644
index 00000000..00e8ad82
Binary files /dev/null and b/main/maps/co_angst.bsp differ
diff --git a/main/maps/co_angst.txt b/main/maps/co_angst.txt
new file mode 100644
index 00000000..6a2be7af
--- /dev/null
+++ b/main/maps/co_angst.txt
@@ -0,0 +1,58 @@
+=====================================================================
+   Half-Life Map Spec Sheet
+=====================================================================
+------General Information--------------------------------------------
+
+Status          :       Final
+
+Title		:	Angst
+Filename	:	co_angst
+Author		:	ChromeAngel
+Home page	:	http://www.chromeangel.co.uk/
+Description	:	The crew of the froniersman strikeship "Angst" have been revived from suspended animation when the on-board computer notices something is wrong in the drive section
+Previous Maps	:	NS_Next, NS_11th_Hr, NS_Gammu, NS_Thief, NS_AM
+
+------Credits and Thanks---------------------------------------------
+Natural Selection team and all the folks on the NS forums.  HTTP://WWW.Natural-Selection.org
+and Justin Fisher for his nebula skybox
+
+------Play Information-----------------------------------------------
+
+Deathmatch	: 	No
+Single Player	:	No
+Natural Selection :	YES!
+Map Description	: 	Small combat style map acrross 2 floors, lots of connectivity by ladders, doors and vents
+How Many Players:	16 
+
+------Map Information------------------------------------------------
+
+New Models	:	No
+New Textures	:	Yes
+New Sounds	:	No
+
+------Construction---------------------------------------------------
+
+Base		:	From scratch
+Editor(s) used  :       Worldcraft 3.4 and the Valve Hammer
+Compile Machine :       Pentium 4 3.0Ghz, 1 GB RAM
+Compile time	:	~ 5 mins
+
+------Map Instructions-----------------------------------------------
+
+Unzip the files in this archive to your NS directory.
+The zip file should extract to the correct directories otherwise place the following files
+in your half-life/NS/Maps directory, "co_angst.bsp","co_angst.res" and "co_angst.txt".
+Place the minimap "co_angst6.spr" in your half-life/NS/sprites/minimaps directory.
+Place all the files starting "Nebular_" and "readme-jf-nebula_sky.txt" in your gfx/env directory.
+
+------Additional Info------------------------------------------------
+
+This template is available at The radium Half-Life Map Center...
+http://www.planethalflife.com/radium
+
+Natural Selection maps are available from NS World
+http://nsworld.ns-central.co.uk/Main.php
+
+------Copyright-Permissions------------------------------------------
+
+Authors MAY NOT use this level as a base to build additional levels. 
diff --git a/main/maps/co_core.bsp b/main/maps/co_core.bsp
new file mode 100644
index 00000000..02bad765
Binary files /dev/null and b/main/maps/co_core.bsp differ
diff --git a/main/maps/co_daimos.bsp b/main/maps/co_daimos.bsp
new file mode 100644
index 00000000..75955fd3
Binary files /dev/null and b/main/maps/co_daimos.bsp differ
diff --git a/main/maps/co_daimos.txt b/main/maps/co_daimos.txt
new file mode 100644
index 00000000..15568c8c
--- /dev/null
+++ b/main/maps/co_daimos.txt
@@ -0,0 +1,82 @@
+TITLE           : Daimos
+LEVEL FILENAME  : co_daimos.bsp
+AUTHOR          : Oliver "Hypergrip" Richter
+DATE            : 22.02.2005
+CONTACT EMAIL   : hypergrip@gmx.de
+HOMEPAGE URL    : www.hypergrip.de
+---------------------------------------------------------------------
+REQUIRED FILES  : /maps/co_daimos.bsp
+		  /maps/co_daimos.txt (The thing you're reading now)
+		  /models/co_daimos/skulk_pose.mdl
+		  /models/co_daimos/soldier_salute.mdl
+  		  /sound/co_daimos/vocal04.wav
+		  /sound/co_daimos/unworthy.wav
+		  /sound/co_daimos/rr_choir.wav
+		  /gfx/env/daimos_1UP.tga
+		  /gfx/env/daimos_1DN.tga
+		  /gfx/env/daimos_1RT.tga
+		  /gfx/env/daimos_1LF.tga
+		  /gfx/env/daimos_1FT.tga
+		  /gfx/env/daimos_1BK.tga
+
+		  Textures were compiled into the map, so you do not 
+		  need any .WAD files besides those that come with NS
+		  anyway.
+
+---------------------------------------------------------------------
+BACKSTORY       : Daimos is an abandoned outpost that has been bought
+		  by the TSA and slightly modified for use as
+		  training ground.
+		  Small groups of Marines are phased in and fight
+		  Aliens (only god and myself know, where the TSA
+		  gets the Aliens for this training) in a life-like 
+		  enviroment.
+		  The average rate of survivors is at 26,53%.
+		  
+---------------------------------------------------------------------
+EDITOR(S) USED  : Mjoellnir
+
+---------------------------------------------------------------------
+COMPILER(S) USED: ZHLT (XP-Cageys build p15)
+
+---------------------------------------------------------------------
+COMPILE HARDWARE: 1,3GHz, 256MB RAM
+
+COMPILE TIME    : too long... need better hardware
+---------------------------------------------------------------------
+ACKNOWLEDGEMENTS: Missy for providing this nice vocal.
+		  Thanks to PS_Mouse for creating the infested versions
+		  of some textures for me.
+		  The creator of v_wad and the environment map
+		  daimos uses.
+		  Greetings go out to Xeno Kamikaze Corps (www.x-k-c.de)
+		  and Vis Maior (Stonehenge / Albion) as well as
+
+
+===========================
+Changelog:
+===========================
+
+== co_daimos (NS 3.0 final)
+
+o Recreated the whole damn thing from scratch
+
+
+===========================
+FAQ
+===========================
+
+Q: What does "Daimos" mean?
+A: Daimos is a character from the greek mythology. Son of Ares, the god of war, and brother to Phobos (phobos = "fear"). the meaning of Daimos is "panic". 
+
+Q: What is the optimal player count for co_daimos?
+A: The map has been scaled down a bit because it was oversized, anyway I recommend at least 4vs4.
+
+Q: Are there any secrets or eastereggs in co_daimos?
+A: There was a secret room on the "old" Daimos, that has not made it's way into the new version. But maybe there is something new somewhere... 
+
+Q: How long do you work on this map?
+A: I don't count hours.. but it's been quite a lot.
+
+Q: Hyper, you suck!
+A: That is not a question.
\ No newline at end of file
diff --git a/main/maps/co_ether.bsp b/main/maps/co_ether.bsp
new file mode 100644
index 00000000..423f590e
Binary files /dev/null and b/main/maps/co_ether.bsp differ
diff --git a/main/maps/co_faceoff.bsp b/main/maps/co_faceoff.bsp
new file mode 100644
index 00000000..52d0e432
Binary files /dev/null and b/main/maps/co_faceoff.bsp differ
diff --git a/main/maps/co_kestrel.bsp b/main/maps/co_kestrel.bsp
new file mode 100644
index 00000000..cd30a768
Binary files /dev/null and b/main/maps/co_kestrel.bsp differ
diff --git a/main/maps/co_niveus.bsp b/main/maps/co_niveus.bsp
new file mode 100644
index 00000000..02d0ce0b
Binary files /dev/null and b/main/maps/co_niveus.bsp differ
diff --git a/main/maps/co_niveus.res b/main/maps/co_niveus.res
new file mode 100644
index 00000000..5c96db71
--- /dev/null
+++ b/main/maps/co_niveus.res
@@ -0,0 +1,18 @@
+maps/co_niveus.txt
+gfx/env/arcnbk.tga
+gfx/env/arcndn.tga
+gfx/env/arcnft.tga
+gfx/env/arcnlf.tga
+gfx/env/arcnrt.tga
+gfx/env/arcnup.tga
+models/co_niveus/helix.mdl
+models/co_niveus/plant_pod2.mdl
+sound/co_niveus/steamjet1.wav
+sound/co_niveus/steamburst1.wav
+sound/co_niveus/bastwind2.wav
+sound/co_niveus/bg.wav
+sound/co_niveus/hum.wav
+sprites/co_niveus/hera_fog.spr
+sprites/co_niveus/welddrip.spr
+sprites/co_niveus/xsmoke1.spr
+sprites/co_niveus/raindrop.spr
\ No newline at end of file
diff --git a/main/maps/co_niveus.txt b/main/maps/co_niveus.txt
new file mode 100644
index 00000000..d835144e
--- /dev/null
+++ b/main/maps/co_niveus.txt
@@ -0,0 +1,41 @@
+==========
+CO_NIVEUS
+==========
+
+STANDARD INFORMATION
+--------------------
+- Title: 		Niveus
+- Filename: 		co_niveus.bsp
+- First Release:	June 2004
+- LAtest Release:	November 2004
+- Author: 		Craig Bryson aka Drath
+- Email Address:        cbryson@gmail.com    	
+
+
+MAP INFORMATION
+---------------
+Game:			Natural Selection (http://www.natural-selection.org)
+Status:			RC5
+Entities:		200
+Editor:			Valve Hammer Editor
+Compiler(s) used:	ZHLT p13
+Compile Hardware:	P4 2.4Ghz, 512 MB RAM
+Compile Time:		1-2 hours
+
+
+CREDITS
+-----------------------------
+- plant model by Psycho-Kinetic Hyper-Geek, animated by Ollj.
+- helix model by Aegis, animated by Drath
+- Sky Map "Arctic Night" by Crinity (taken from http://www.planethalflife.com/crinity).
+- Textures used from eclipse, ayumi and tanith. Much <3 to the creators of these textures
+
+SPECIAL THANKS
+--------------
+- To WHC for their server for playtesting
+- To Ausns for file hosting, and use of their server for playtesting
+- Mendasp for help with env_sprites and .fgds
+- Lethy for help with .res files
+- Aegis for some secret texture work
+- [SuB] and Martigen for supr_pimpage
+- To all of stf and cbf
\ No newline at end of file
diff --git a/main/maps/co_pulse.bsp b/main/maps/co_pulse.bsp
new file mode 100644
index 00000000..02df2359
Binary files /dev/null and b/main/maps/co_pulse.bsp differ
diff --git a/main/maps/co_sava.bsp b/main/maps/co_sava.bsp
new file mode 100644
index 00000000..81c3ebc4
Binary files /dev/null and b/main/maps/co_sava.bsp differ
diff --git a/main/maps/co_sava.txt b/main/maps/co_sava.txt
new file mode 100644
index 00000000..90f0dae7
--- /dev/null
+++ b/main/maps/co_sava.txt
@@ -0,0 +1,18 @@
+co_sava by Mendasp
+------------------
+
+Map information:
+----------------
+NS 3.0 version
+
+Credits:
+--------
+The custom sounds used are from Marr's Ambience Pack
+Nanotech texture by spacer
+Scrolling smoke texture by Elcle
+Water tank model by CoolCookieCooks
+
+Thanks to:
+----------
+Lordy
+tankefugl
\ No newline at end of file
diff --git a/main/maps/co_ulysses.bsp b/main/maps/co_ulysses.bsp
new file mode 100644
index 00000000..628d1ea5
Binary files /dev/null and b/main/maps/co_ulysses.bsp differ
diff --git a/main/maps/co_ulysses.txt b/main/maps/co_ulysses.txt
new file mode 100644
index 00000000..c8950961
--- /dev/null
+++ b/main/maps/co_ulysses.txt
@@ -0,0 +1,12 @@
+co_ulysses_b6
+
+10/01/2004
+__________
+
+
+Changes:
+
+:: Added drips and steam FX all over the map.
+:: Added sounds and ambient.
+
+Jordi Carazo :: bLuEMaN
diff --git a/main/maps/ns_agora.bsp b/main/maps/ns_agora.bsp
new file mode 100644
index 00000000..d4469e54
Binary files /dev/null and b/main/maps/ns_agora.bsp differ
diff --git a/main/maps/ns_agora.txt b/main/maps/ns_agora.txt
new file mode 100644
index 00000000..e56ded6b
--- /dev/null
+++ b/main/maps/ns_agora.txt
@@ -0,0 +1,61 @@
+--Ns_Agora--
+
+By KawaK
+Contact:  Johnsmith2711@hotmail.com
+
+
+--------------------------CREDITS----------------------------------
+
+
+Textures:
+
+_ V.wad by FAM ( fam@box7.co.uk , http://www.evolutionarily.org )
+
+_ Some textures are created/modified by me
+
+_ And the officials wads
+
+
+
+Special Thanks to:
+
+ Flayra and the dev team (to have made this awesome game!) , the playtesters, and the NS Mapping's community for their very useful feedback.
+
+ Drunken.Monkey for his very appreciated help with the Rad's settings.
+
+ XP-Cagey for his marvelous tools which allowed me to add more details in the map (a lot more!).
+
+ Ian and oOTOo for being the first beta-testers.
+
+ WolfWings for his help with a strange compilation's error (now I know what is the -chop for ;) ).
+
+
+
+Additional Thanks to the following people for their suggestions (about the info_location's names and the layout), criticisms and encouragements:
+
+_Dullgarian
+_Burster
+_Stakhanov
+_le_gardien_prime
+_tueurdechat
+_Epsylon.
+_Mighty-Squirrel
+_Roly
+_Dark 4rchangel
+_Pot-Au-Feu
+_Bonebreaker
+_achronax | Akro-Jesus
+_malou
+_FlyFlown
+_Naxo
+_Klems the Jedi
+_Epaulard
+_Samcai
+_CZ-Cdt`H`Sobel
+_Bcastaldi
+_huhuh
+_katarn
+_M@teo21 (webmaster of a French mapping site: http://www.siteduzero.com )
+
+
+And Thanks to all the people who said something about the map..
\ No newline at end of file
diff --git a/main/maps/ns_altair.bsp b/main/maps/ns_altair.bsp
new file mode 100644
index 00000000..36d7e6a5
Binary files /dev/null and b/main/maps/ns_altair.bsp differ
diff --git a/main/maps/ns_altair.txt b/main/maps/ns_altair.txt
new file mode 100644
index 00000000..1011fda4
--- /dev/null
+++ b/main/maps/ns_altair.txt
@@ -0,0 +1,105 @@
+=====================================================================
+   Natural-Selection Map Spec Sheet
+=====================================================================
+------General Information--------------------------------------------
+
+Title		:	Altair Underwater Mining Facility
+Filename	:	ns_altair.bsp
+Author		:	Paul "KungFuDiscoMonkey" Traylor
+EMail		:	kungfudiscomonkey@gmail.com
+URL		:	http://kungfudiscomonkey.net
+Date		:	February 21, 2005
+
+------Play Information-----------------------------------------------
+
+NS:Classic
+How Many Players:	32
+
+------Map Information------------------------------------------------
+
+New Textures	:	Yes (ns_altair.wad embedded in BSP) 
+				Some Textures taken from Poke646 by Marc Schröder
+				Button Textures, damaged door, and new monitors by
+ 				Samejima
+New Sounds	:	No
+New Skybox      :       Yes 	based on deepsea1
+				by Darc
+				http://telefragged.com/soup/
+New Models      :       Not yet
+New Prefabs     :       Yes	Tube Container by KungFuSquirrel
+
+------Construction---------------------------------------------------
+
+Base		:	From scratch
+Editor(s) used	:	Valve Hammer Editor 3.5
+                        Adobe Photoshop Elements 2.0
+			Wally
+Compile Machine	:	3 Ghz P4, 1 gb RAM
+Compile time	:	~1 hour
+
+------Changelog------------------------------------------------------
+v1-6 OLD Versions
+    
+v7 (11/8/04)
+    Version number incrimented by request to reflect the massive number of improvemts since the b5 version of the map
+    Added vent from Omega to Zeta with two exits into Phi
+    Added vent from Muck Pump to Parts Room RT
+    Rspeed optimizations
+    Adjustments to Surface Umbilical to reduce LOS
+    Adjustments to MS top entrance
+    New monitor textures by Samejima
+    Covered up pit in Omega
+    More details
+    New minimap built for new changes to rooms
+
+v7b (1/29/05)
+    Removed Diving tanks and connected Nanite Regulation and Settling tanks
+    Rerouted path from Settling tanks into Communications
+    Moved weldable to Muck Pump
+    Optimized Sub Bay
+    Moved node from outside Parts room into parts room
+
+v7c (2/10/05)
+    Moved Parts Room RT to Sigma Test Site
+    Added new info_locations to help navigation and direction
+    Split up Life Support info_location
+    Split up Sub Bay info_location
+    Removed weldable door
+    Reopened path between Sub Bay and Parts Room
+    Moved some alien spawns into Life Support instead of being a bit outside the hive room
+
+v7d (2/14/05)
+    Played with HLRAD compile settings a bit
+    Added a few new lights to sewer
+    Misc detail to parts room and Station Monitoring
+    Small tweek to fix minimap glitch till I have time to do a full sprite again
+    Added new vent weldables
+
+v7e (2/21/05)
+    Reopened route from Settling Tanks to Consistancy
+    Combined Station Monitoring and Sub Refueling node into one node at SM-Power.
+    Moved Settling Tank node back to Nanite Regulation
+    Added small ledge in sub bay to help get around pool
+    Fixed custom minimap.
+
+    
+------Additional Info------------------------------------------------
+
+Any feedback or suggestions, please send them to kungfudiscomonkey@gmail.com
+
+------Copyright-Permissions------------------------------------------
+
+I give NO permission whatsoever to decompile this map or use the textures in any other mapping project. Also, please no using ripent or similar to modify the map, if you want something changed, email me about it and if i consider it to be valid i'll sort it.
+
+------And Finally----------------------------------------------------
+
+Thanks to the NS Dev team for making this great mod that has kept me from doing as much homework as I should.
+
+Thanks to the NS Playtester team for helping me with good feedback and taking time to disuss with me the changes and updates to help make the map that much better.
+
+Thanks Plaguebearer for taking my mediocre layout and turning it into something awsome. Without his help you wouldn't be playing this map.
+
+Thanks to TyrNemesis^ for helping me walk around the map and pointing out balance issues and node placement issues and generally helping to make Altair even better. Half the reason you are reading this file is because this guy helped make Altair what it is.
+
+------Dedication-----------------------------------------------------
+Altair is dedicated to my friends from Wake Christian Academy, Cary Alliance Church, and Grace Community Church who will never realize how much their lives have impacted mine and made me a better person because of it.
\ No newline at end of file
diff --git a/main/maps/ns_ayumi.bsp b/main/maps/ns_ayumi.bsp
new file mode 100644
index 00000000..d103b84d
Binary files /dev/null and b/main/maps/ns_ayumi.bsp differ
diff --git a/main/maps/ns_ayumi.txt b/main/maps/ns_ayumi.txt
new file mode 100644
index 00000000..9f061357
--- /dev/null
+++ b/main/maps/ns_ayumi.txt
@@ -0,0 +1,33 @@
+"ns_ayumi"
+Pär Fredriksson aka Drunken.Monkey aka Toad
+par_fredriksson@hotmail.com
+
+----------------------
+
+Textures:
+Cory "Squeal Like a Pig" Strader
+Blazeeer
+Fam
+Moultano
+Me :)
+
+Sky:
+Chalupamonk
+----------------------
+Thanks to:
+
+NS Dev. Team
+- Guess why! :P
+
+MaDMaXX and Immacolata
+- You guys came with lots of great feedback on the map. Even though it gave me many hours of more work to do, it was still worth it. Thanks guys!
+
+Olmy
+-For helping me with compiling the map.
+
+All the cool people in #nsmapping @ Gamesurge
+- MrBen, Mendasp, quazilin, Zazi, Insane, bLuEMaN, Marcos and everyone else, for your endless inspiration and support during my late nights with Hammer. :P
+
+
+
+/Pär - Drunken.Monkey
\ No newline at end of file
diff --git a/main/maps/ns_bast.bsp b/main/maps/ns_bast.bsp
new file mode 100644
index 00000000..b18f5f92
Binary files /dev/null and b/main/maps/ns_bast.bsp differ
diff --git a/main/maps/ns_bast.txt b/main/maps/ns_bast.txt
new file mode 100644
index 00000000..838a79f2
--- /dev/null
+++ b/main/maps/ns_bast.txt
@@ -0,0 +1,15 @@
+Original author: Relic25
+
+Remake team:
+------------
+Mendasp (project lead and current the maintainer of the map)
+MrBen
+quazilin
+Drunken Monkey
+Insane
+Marcos
+
+Thanks to:
+------------
+Mr. Headcrab - Reactor display texture
+NS Playtesters - Tons of feedback!
\ No newline at end of file
diff --git a/main/maps/ns_caged.bsp b/main/maps/ns_caged.bsp
new file mode 100644
index 00000000..f14c5647
Binary files /dev/null and b/main/maps/ns_caged.bsp differ
diff --git a/main/maps/ns_caged.txt b/main/maps/ns_caged.txt
new file mode 100644
index 00000000..b9b5c718
--- /dev/null
+++ b/main/maps/ns_caged.txt
@@ -0,0 +1,79 @@
+TITLE                   : Caged	
+FILENAME                : ns_caged.bsp
+AUTHOR                  : Nelson 'manah' Ferryman
+DATE                    : 18/10/2002
+EMAIL ADDRESS           : manah@planethalflife.com
+HOMEPAGE URL            : http://www.planethalflife.com/manah/
+
+BACKSTORY:
+
+The small shuttlecraft cut through the bleakness of space like a bird against a vast desert plain, the only life that reveals itself, a beacon to anything lurking, watching, waiting.  Inside the craft the passengers waited, some ruefully, some nervously, some expectantly and all eager to reach there destination. 
+
+"So here we go, on our way to the new frontier," Managerial Director Stevens leant back in his seat, slid both his hands through his hair and brought them to rest at the nape of his neck and sighed, happy in the knowledge that one of his dreams was about to be realised.
+
+"Your still hung up on that whole pioneer ideal, Cowboys and Indians, the Wild West!" a scathing, laugh broke from Ruchechnik, he hunched forward holding his stomach as if to further degrade Stevens fascination.  Stevens just shrugged it off, coming from anyone else it would have hurt, no, angered him but he'd grow used to the half-Russian Quantum Physicists bitter humour years ago.  "Your vicious, you know that don't you?"  Stevens remarked with a mixture of fake scorn and facetiousness he tried to disguise.  Ruchechnik smiled briefly, reached into a compartment under his seat and produced two mugs and a slender metallic flask.  He poured out generous amounts of steaming transparent liquid and handed one to Stevens.  They both sat silently, drinking and listening to the sounds of the other passengers.
+
+There were ten of them altogether, Stevens and Ruchechnik, Engineers Powell and Blackwell, two large corporate types, Archer and Winans, two security officers, the pilot and a nameless drunk Ruchechnik believed was a spy the company had sent along just to keep an eye on proceedings.  Stevens put down his mug and began to speak " You know its always fascinated me, I don't know why but," he paused, brought the mug back up to his lips then continued "I mean you've got to admit it does have a certain allure, a certain ..." Stevens glanced over at Ruchechnik, he'd tilted his head slightly to the side and raised one eyebrow, his eyes glazed over.  Stevens sighed again and changed his focus to an imaginary place in the middle distant between himself and the ceiling and in doing so missed a sly smile cross Ruchechniks face, he was playing with him, just like when they were younger.  That look was Ruchechnik's standard response to a topic he didn't even consider worthy of his consideration or attention, to the uninitiated it could be as unpleasant as his barbed tongue.  But Stevens had a suborn side, he was determined to get at least some of his argument across, "Okay then," his voice was unsure as he tried to establish a coherent line of thought "what about being the first in a new land, getting to explore, discover and ..." 
+
+"And pillage, steal, kill," Ruchechnik interrupted sharply, leaving a small pause between each word to increase there poignancy.
+
+"Yes, okay, so its not all perfect and things would be handled differently in this day and age but just think, with our space travel, there are so many chances to repeat that experience and this is mine, my chance to explore, discover and,"
+
+"and pillage, steal, kill" grins Ruchechnik
+
+"Knock that off "
+
+"Sorry,"
+
+"Yeah, yeah whatever.  But anyway, here we are on our way to oversee the construction of the first mining facility in the whole of the Sado Island asteroid field, collecting the equivalent of gold.  I just feel like a ... err,"
+
+"Pioneer?"
+
+"Yeah.  Yeah.  We're out here setting this thing up.  Then it'll become a fully operational mining community, bleeding edge technology, tens of thousands of people living, working, prospering all because we had this opportunity."  Stevens's voice drifted off and an inexplicable happiness contorted his face and radiated from him. Ruchechnik looked at the liquid sloshing around in his mug and smiled, Stevens wasn't normally like this, so gullible, unsure. Ruchechnik put it down to nerves and stress, Stevens was having some family difficulties and he'd never been this far offworld before, it must be quite an experience for him.  Stevens had drifted off to sleep, Ruchechnik got up and walked to a window, he stood silently for a few minutes, staring at the passing dust clouds and distant stars and listening to the noise of everything around him.
+
+Powell and Blackwell were discussing the possible strategies for continuation of the project and the kind of state they hoped it would be in, Archer was drowning under a seemingly infinite sea of papers and files that he'd pulled out of a considerably small brief case.  Winans and the mysterious drunk were mysteriously missing, Ruchechnik sniggered as various implausible conspiracy theories shot through his mind.  He wandered over to the table Powel and Blackwell were sat around and pulled up a chair, they began to talk him through some over their opposing ideas with increasing enthusiasm, Ruchechnik decided to change the subject rather than be drawn into an argument, "Do either of you two know the history of this place?"
+
+"Well yes, I know there were some ... complications with the original construction," Powell began,
+
+"Complications!" Ruchechnik laughed again and Blackwell grinned, sharing the joke.  Blackwell straightened her glasses and face then began, "What have they told you?  It was an absolute disaster, over 400 people lost their lives, millions of dollars worth of equipment wasted, years of work and over what?  A company skimping on its human rights policies, that can of thing was abhorrent a 100 years ago, now its totally unacceptable!"  Blackwell's voice was confident to such a degree she almost sounded arrogant or perhaps, Ruchechnik pondered, she only took that tone to Powell, it was quite clear she didn't like him. Ruchechnik wandered away again as Powell began to try and defend himself.
+
+Stevens was awake, he beckoned for Ruchechnik to sit again, opposite him, Ruchechnik sat.  Stevens rolled his eyes over toward Powell and Blackwell then back and said, in a hushed voice "What do you think of all the history and stories?"
+
+Ruchechnik cupped his chin in his left hand and stroked his stubble, "I'm not sure, I know what officially happened and I've heard all the unofficial tales, the riots, the suicides, the disappearances, but," his attention shifted to Winans who'd just emerged out of the cockpit.  Winans started toward Archer but stopped as he saw the flustered state he was in, he frowned at Blackwell then headed toward Stevens and Ruchechnik.  He took a seat and turned to Stevens, "What are they arguing about?"
+
+"Who knows, but I know one thing, by time we make the return journey these arguments will have developed in lovers tiffs or we'll be one member short,"  The three of them laughed slightly then Stevens continued "There arguing about the history of the Sado Island site, about the failure of the original construction project."  Winans looked at Powel, who was now standing and pointing one ominous finger at Blackwell then back to Stevens, his face a total blank. Ruchechnik was performing his 'look' again, "You don't know?!", Winans placed one hand over his mouth and shook his head slightly then said "I know the first attempt failed, I know the details of the project and what it was trying to achieve and I know theirs a hell of a lot of profit to be made.  I'm a businessman this is a business venture, all that I want to know is the business side of things,"
+
+Ruchechnik took a deep breath "I think you really ought to do more research before becoming a potential investor," he sighed then nodded at Stevens, as if to ask him to take over.  Stevens wiped his brow with the cuff of his shirt then started "The area of space we are heading for was originally thought to be void, useless, no planets, no stars, no resources, no anything.  It was left alone for 50 or so years until a tiny Japanese express courier craft ran into some unforeseen objects when on course straight across this sector.  A massively dense asteroid field was discovered, quite how it was missed before was uncertain, conspiracy theories floating around say perhaps it was first discovered years ago but particular powers decided to keep it hidden or harvest the resources for there own ends.  Anyway the Japanese corporation claimed the field and named it the Sado Island asteroid belt, after a real 'lost' Japanese island that appears in Japanese mythology and folklore, if I'm not mistaken.  The reasoning isn't important," he paused, reached into the storage compartment under his own seat and retrieved a large bottle of water, he poured himself some then offered the bottle to Winans.  Stevens continued "so the Japanese sent out several teams to set-up a facility out here but all failed, there are talks of technical difficulties, of the asteroids in the field being exceptionally tough and volatile, of mercenaries, space pirates, you name it.  Eventually the Japanese gave up for undisclosed reasons and offered the area up for international use, so long as a suitable percentage made its way to their wallets.
+  
+This is where we come in, well almost.  Our company signed an agreement with the Japanese for sole mining privilege of this area, provided a multi-billion dollar settlement fee and a promised percentage of all harvested resources.  So five years ago the first expeditions were sent out to chart and document the entire field and decided on the most efficient place for setting up a mining colony.  Several craft vanished but of the ones that returned the data presented showed a density of chemical and mineral resources that far exceeded original ideas, the plans for a mining colony were quickly altered from the standard into the single largest, most ambitious offworld colony ever planned.  An entire construction company was purchased to be the fleet who would build this thing.  It began slowly at first with more rumours and inexplicable events of technical difficulties, the asteroids being tough and volatile, mercenaries, space pirates, the same stuff.  
+Then it all begins to get hazy.  Something happened, quite what is uncertain, theirs never been a single official standing on it or an outside investigation of any kind.  The generally excepted story is that the company, in efforts to cut down costs of this already inconceivably expensive endeavour, had been taking on cheap, illegal workers and using convicts from a nearby prison colony as unpaid labour.  Eventually tension flared up and riots broke out, over lack of safety measures, over the supposed frequent disappearances, perhaps over the convict labours, no-one knows.  
+What we do know how ever is that the company's private security force was brought in, lots of damage was done, lots of people died, the project was officially abandoned." Stevens leant back in seat and poured himself some more water. Ruchechnik took over "Unofficially however the project was just put on the backburner.  The site was evacuated but a cleanup team and a considerable portion of the security force were left behind to protect and prepare the site for continuation once the trouble had died down, been easily forgotten like all the other terrible events we hear of daily." Ruchechnik paused, perhaps for dramatic effect, perhaps because he wanted to see the look in Winans eyes, perhaps because he's an idiot, Stevens though to himself. Ruchechnik stretched his arms then continued "Months, Years passed without major incident, the security force gradually departed until just a single cleanup team remained.  And that brings us up to date, we're here, on our way to the Sado Island site to assess the viability of an immediate restart to the project." Ruchechnik turned to Winans, didn't say anything but just stared, expectantly, waiting for Winans to speak.  He remained silent for the best part of 5 minutes then said, "Okay, so people died, it was tragic, sure, but was I involved?  Should I feel guilt or even remorse for actions that didn't slightly concern me?  Like I said I'm a businessman and all I'm interested in is the opportunities this project can open for me, for all of us."
+Ruchechnik laughed "And you say I'm vicious!" he got up and walked off towards the most distant window at the back of the hold, disappearing behind an assortment of crates, boxes and supplies.  Winans too had wandered off toward Archer leaving Stevens alone, he shrugged, leant his head back even further and shut his eyes.
+
+Several hours later Stevens awoke to a thumping headache, whatever Ruchechnik was drinking it didn't agree with him, it had a potent and vile aftertaste even after all that water and all this time.  Stevens muttered "Must be narcotics, chemicals, he moved past alcohol years ago," Steven's grinned then noticed no one was around him.  He stood up, carefully at first just in case his legs were a little unsteady, and listened, he heard murmuring and the shuffling of bodies close by, toward the front of the hold, adjacent to the cockpit.  He cautiously began to work his way rough the network of stacked boxes and towards the sounds, he turned one more corner and found the rest of the team.  They were packed, tightly into a small space between the first row of crates and the main loading door window, puzzled Stevens drew attention to his presence by clearing his throat. Ruchechnik stepped out from the small huddled crowd and beckoned with his hand for Stevens to take his place.  Bemused and also intrigued Stevens stepped forward to see what they were looking at.  
+
+What he saw astounded him.  He'd expected the framework of the mining colony project, all that was left after the incidents, to be massive as he'd been to an offworld construction before and was awe-struck by the sheer size of it.  It paled into insignificance when compared to what he now saw.  Seventeen or so 'U' shaped structures stretched off before them all joined at the centre of the curve by what seemed like an immense vertebral column, in fact now he though of it that's what the structure reminded him off.  The ribcage and vertebrae of some long dead creature, a creature that's size, presence and incredible mass could intimidate the vastness of space itself.  A feeling swept over Stevens, almost indescribable, he guessed this is what people meant when they discussed that moment in everyone's life when they realise there total insignificant in comparison to the universe around them.  Only Stevens experienced it at an intensity that made his knees weak, made his stomach retch and gave him the foul taste and sting of acidic bile in the back of his mouth, he was amazed, speechless, frightened and distressed.  He struggled in his mind to comprehend what the colony would look like when finished, he struggled to find a word to encompass the magnitude of what he imaged, something so much more than a colony.
+
+The next hour or so passed like a dream where time is tangible you taste, sometimes touch and always feel it but your perception of its passing leaves you disoriented.  Stevens's mind was going round and round, he imaged the feeling of what the first people to see the Pyramids must have felt and he questioned whether he could actually realise his dream or whether truly discovering something new was far beyond him.
+
+The construction site also overwhelmed Ruchechnik, he'd known about it for years, seen images before but he wasn't prepared for it.  He didn't show how much it concerned, excited and disgusted him, all he said was "Nice," whilst in his head he questioned the stability, constitution and motives of a race that could build such a monstrosity all for the purely material gain of 'precious' natural resources.  Ruchechnik needed a distraction, he got up from his seat and headed towards the cockpit to enquire how long before they docked with the only remaining vessel of the cleanup team, he wanted to shower, shave and rest his mind.  Ruchechnik wondered if the sight of the colony structure had affected the pilot, he asked.  "Not really," was the slightly unexpected and underwhelming reply that greeted him, the pilot continued "I've been coming out here every few months since the cleanup project started, doing resupply runs, y'know its like anything, you get used to it after a while." Ruchechnik couldn't imagine getting used to that sight.  "I'm coming around for a docking approach now," the pilot announced after a good ten minutes of silence, "Don't you need to contact the crew of the vessel first?" Ruchechnik wondered.  "I have, but got no response," the pilot said then continued quickly before Ruchechnik began to worry "But it doesn't matter, all the systems need to dock are online, it'll be fine.  Chances are the crew are either asleep or experiencing some generator difficulties, this has happened plenty of times," 
+
+Ruchechnik thought back to a conversation several days earlier with Blackwell, he'd asked what kind of craft had been left alone out here to clean up the mess over 3 years.  She'd answered with "The 02883, a industrial variant of a standard Corral class construction vessel." Ruchechnik didn't recognise that class, "I'm not surprised," Blackwell continued "Its not a commercial vessel, if your not in the construction industry it really has no relevance,".  Ruchechnik opened his mouth and Blackwell pre-empted his question "It's generally used for storage or as additional workspace or inexpensive additional housing for workers or whatever the situation calls for, it's a very flexible design." He beckoned for her to continue, glad he chose not to ask Powell and endure the monotonous drone of his voice. "It's based around a central hub from that theirs a network of tunnels and rooms that make vessels basically circular upper decks.  In the central area is the dock, access to the mainframe and standard facilities for the crew: quarters, kitchens, bathroom, briefing room, lounge area, it's quite comfortable." She spoke the last three words in a way that made it sound like she'd spent a decent amount of time on one of these vessels.  She paused, ran her fingers through her hair and sighed "Unless, of course, you have to spend your time on the lower decks ..." The remainder of the conversation blurred out of Ruchechniks mind, until he came to the reason he'd remembered in the first place, the generator.  "The generators are horribly unstable and require frequent periods inactivity for cooling down, they do however have an excellent fuel to power output ratio,"
+
+Ruchechnik was brought back to the real world by the pilot pointing and saying "Here we are," The ship wasn't exactly what Ruchechnik had been expecting, given Blackwell's description.  It was almost circular on the upper decks, the bottom was a smaller series of circular decks and several cylindrical tubes extending vertically down to bank of solar panels and various satellites.  The remarkable thing however was the upper potion of the craft, extending horizontally from it at equal intervals were six long support beams and hundreds of smaller beams protruding at all angles.  Large facilities where quite literally hung from the larger beams and secured with a network of girders, starting at the bottom of each facility and working there way back up to the support beam. Ruchechnik could see how the name 'cages' Blackwell had used for these precisely and precariously hung facilities came about. From the angle they were at now the nonchalantly named 02883 seemed like a large, space faring, twelve legged insect with a fat round body as its centre.  The pilot announced over the intercom system that docking was about to commence and if people could please take a seat and fasten their security measures so he won't lose his insurance 'no incident' bonus.
+
+The docking procedure went smoothly, the two security guards emerged from the back room and opened the interior door as Ruchechnik and the pilot came down from the cockpit.  The pilot turned and pointed at one of the windows on the side of the shuttle opposite the 02883, "Take a good long look as it's the last time you'll see them for the next two weeks," he then turned to punch a security code into a keypad, the door hummed slightly then opened slowly, the pilot and security guards stepped off first and left the others staring blankly at the stars.
+
+
+
+Several weeks later a partially audible message was recovered from a distress beacon:
+ 
+"Ship overrun, crew dead" static interference cuts out the message "half the craft locked down" static again "can't get us here but oxygen is limited" heavy breathing followed by a period of violent coughing, then sounds, distant unfamiliar sounds and then silence.  The message continues for several minutes, distant arguments can just be heard.  Someone wants to leave, someone else wants to stop them, someone gets shot, a door is slammed, some else's voice can be heard chanting, the words can't be made out.  Again a long period of silence followed by noises, this time screams, human screams and then silence.  Uncontrollable crying fades in and out between layers of static, the tearing of metal and heavy breathing. A single gunshot. The message ends.
+
+The beacon is handed over to the Frontiersmen, a squad is dispatched.
+
+
+THANKS TO:
+The entire NS clan (all developers, mappers, community members) - For letting me get involved in such an excellent project and for all the help/comment & citiscms/inspiration.
+
+Captain McJesus - for saving my arse on the compiling front. Or rather blackmailing. *cough*You'll never get that cake*cough*
\ No newline at end of file
diff --git a/main/maps/ns_delta.bsp b/main/maps/ns_delta.bsp
new file mode 100644
index 00000000..0aeeef33
Binary files /dev/null and b/main/maps/ns_delta.bsp differ
diff --git a/main/maps/ns_delta.txt b/main/maps/ns_delta.txt
new file mode 100644
index 00000000..da3dcd8f
--- /dev/null
+++ b/main/maps/ns_delta.txt
@@ -0,0 +1,13 @@
+delta-9
+2/13/02
+tommyd
+email: tjd159@psu.edu
+
+aknowledgements:
+Fam for the join team backgrounds
+ken20banks for lighting inspiration
+TNoF for the missile launcher model
+Chalupamonk for the sky
+Cory Strader/Relic25 for the NS texture set
+additional textures taken from public domain sources
+
diff --git a/main/maps/ns_eclipse.bsp b/main/maps/ns_eclipse.bsp
new file mode 100644
index 00000000..9eb6955e
Binary files /dev/null and b/main/maps/ns_eclipse.bsp differ
diff --git a/main/maps/ns_eon.bsp b/main/maps/ns_eon.bsp
new file mode 100644
index 00000000..9642b4f1
Binary files /dev/null and b/main/maps/ns_eon.bsp differ
diff --git a/main/maps/ns_eon.txt b/main/maps/ns_eon.txt
new file mode 100644
index 00000000..bfe64636
--- /dev/null
+++ b/main/maps/ns_eon.txt
@@ -0,0 +1,55 @@
+ns_eon version 7
+
+Released (22/2/05)
+
+-Made some minor aesthetic improvements.
+
+v6a changelog (20/2/05)
+
+-Removed Maintenance Corridors' node.
+-Moved Engine Walkway node to other side (closer to the hive).
+
+v6 changelog (19/2/05):
+
+-Moved Living Area node into Engine Walkway.
+-Reduced gaps at sides of corridors connecting to Core hive.
+-Removed the ms vent.
+-Changed layout on east side of Bridge hive.
+-Changed a Bridge vent slightly as a result of Bridge changes.
+-Slightly widened turn on N-turn to add more space.
+-Removed Repair Bay lift and replaced with ramp/ladder combination.
+-Removed Vent leading from Sleeping Area to Repair Bay.
+-Slightly shortened the corridors leading out of Marine Start to Repair Bay and N-turn (brought the ms in a bit closer).
+
+v5 changelog (07/2/05):
+
+-Lowered Marine Start roof considerably, and added a cc alcove.
+-Small aesthetic changes to N-Turn.
+-Centre console in Core Monitoring to reduce line of sight.
+-Vents rearranged in Core Monitoring to help aliens and a new vent added.
+-Vent in Core Power moved as part of the vent rearrangement.
+-New space added to Engineering Hive to increase space for spawn points and add more cover, 
+ and just make it cooler.
+-Other minor adjustments to Engineering Hive.
+-Removed vent doors from Bridge Hive, while blocking line of sight to hive created by their removal.
+-Increased usefulness of bridge vents (one exits from the cieling, the other is higher),
+ and removed stickiness on one vent exit.
+-Decreased Bridge Hive vent weld time from 60 seconds to 20 seconds.
+-Increased lift speed from 70 to 90.
+-Fixed onos stuck issue at Core Monitoring.
+
+v4 changelog (26/1/05): 
+
+-Major visual revamp for The Hub.  Also, more open and more marine friendly (pits are smaller).
+-New weldable vent at Bridge hive.
+-Sped up the elevator a bit.
+-Uncluttered 2 corridors by moving vent exits.
+-New exit point for the vent near sleeping area.
+-No longer possible to build in the marine start vent.
+-More space above and below Engineering and Bridge hive.
+-Some areas uncluttered (less things sticking out of walls in a few places).
+-Life support corridor floor and ceiling are now smooth.
+-Slightly changed layout in Core Monitoring to reduce line of sight problems.
+-Fixed a stuck issue in bridge (you would get stuck on light fixtures).
+-Nearly every vent that could not accomodate two skulks side by side now can.
+-Included a txt file. :)
\ No newline at end of file
diff --git a/main/maps/ns_hera.bsp b/main/maps/ns_hera.bsp
new file mode 100644
index 00000000..2bb67190
Binary files /dev/null and b/main/maps/ns_hera.bsp differ
diff --git a/main/maps/ns_hera.txt b/main/maps/ns_hera.txt
new file mode 100644
index 00000000..ea1416ba
--- /dev/null
+++ b/main/maps/ns_hera.txt
@@ -0,0 +1,14 @@
+ns_hera version 3.0 by Jon A Chapman aka 'Merkaba'
+
+=========
+BACKSTORY
+=========
+
+The communications colony on planet Hera (named so for its similarity with Earth's neighbour, Mars, but on a much grander scale) was among the first of the targets set by the TSA for salvaging from the then mysterious Kharaa intruders. Due to its ideal transmitting position on the outskirts of the Ariadne Arm, this colony was decided crucial to the TSA’s attack against the Kharaa. Therefore, they had to first eradicate it of all Kharaa presence before moving in. The colony consists of many various stations, all connecting to two central structures via high-speed transport tubes. All the workers and their families live in Rhea, the larger of the two complexes. Cronus is the name of the other, and is the control centre of the communications outpost. The only other man-made structures of note on Hera are the fields of electricity harnesses, set up in calculated positions on Hera’s surface and designed to capture the energy from the raging electrical storms thus powering the colony.
+
+
+=======
+MISSION
+=======
+
+This particular mission takes place in station 16-B, one of the few operational complexes with a landing site. The mission as instructed by the TSA is to secure all accessible areas of the station, eradicating all Kharaa, and then to use it as a temporary base camp while the transit tubes are used to access and clear the other stations. All alien findings are to be reported back to the TSA council using the station’s communications capabilities as soon as possible.
\ No newline at end of file
diff --git a/main/maps/ns_lost.bsp b/main/maps/ns_lost.bsp
new file mode 100644
index 00000000..28cf027a
Binary files /dev/null and b/main/maps/ns_lost.bsp differ
diff --git a/main/maps/ns_lost.txt b/main/maps/ns_lost.txt
new file mode 100644
index 00000000..50255a5a
--- /dev/null
+++ b/main/maps/ns_lost.txt
@@ -0,0 +1,64 @@
+ns_lost
+Greedo386
+mrolek@gmail.com
+http://www.martinrolek.com
+
+
+v2.0 changelog
+
+o New marine start
+o Removed closet weld node
+o Moved node from Los Paranoias to Beta Deck Access
+o Altered Emergency Access Corridor weld setup
+o Added 5 weldable vent covers
+o Added ladder to Coolant Exchange
+o Made window into Equilbrium siege room breakable
+
+
+
+
+-----------------------------------
+
+
+Well, this is it.  Nearly a year's worth of work on this level, and it's all come to this.  It's been a wild ride, but it's been worth it.
+
+Thanks to the following:
+-HanzGruber for the alienhive.mp3 soundfile that I've used in my hive rooms.
+-The EC groupies who helped me playtest this, because without you, I wouldn't have had nearly as long of a hall as I do now.
+-Relic, Merk, and Ken - You showed me how great a level can look, and I can only hope one day to be able to make mine look as good as yours.
+-Flayra, Cory, and the rest of the NS dev team - You've given me the best game I've ever played and asked nothing in return.
+-All you lamers out there - Without you, I'd never have had as much fun as I did this past year.  !b *!*@* ;Þ
+-And lastly, I'd like to thank all the people who end up playing this map, and enjoying it.  If that's even one person out there, all this work will be worth it.
+
+
+Some random, uninteresting to most people statstics follow below:
+
+Compiled on a 2.4 GHz P4, 512MB RAM machine.
+
+150 textures from 5 wads - Texture usage is at 3.16 mb (of 4.00 mb MAX)
+
+HLCSG -chart -estimate -wadconfig NS -hullfile nshulls.txt ns_lost.map
+HLBSP -chart -estimate ns_lost.map
+HLVIS -chart -estimate -full ns_lost.bsp
+HLRAD -chart -estimate -bounce 1 -dscale 1 -smooth 80 -sparse -extra -chop 32 -noskyfix -lights lost.rad ns_lost.bsp
+
+Object names  Objects/Maxobjs  Memory / Maxmem  Fullness
+------------  ---------------  ---------------  --------
+models            116/400         7424/25600    (29.0%)
+planes          14198/32767     283960/655340   (43.3%)
+vertexes        17217/65535     206604/786420   (26.3%)
+nodes            6490/32767     155760/786408   (19.8%)
+texinfos         3535/32767     141400/1310680  (10.8%)
+faces           12268/65535     245360/1310700  (18.7%)
+clipnodes       19093/32767     152744/262136   (58.3%)
+leaves           3488/8192       97664/229376   (42.6%)
+marksurfaces    15663/65535      31326/131070   (23.9%)
+surfedges       58380/512000    233520/2048000  (11.4%)
+edges           29996/256000    119984/1024000  (11.7%)
+texdata          [variable]     144812/4194304  ( 3.5%)
+lightdata        [variable]    1711746/4194304  (40.8%)
+visdata          [variable]      84409/2097152  ( 4.0%)
+entdata          [variable]      48050/524288   ( 9.2%)
+152 textures referenced
+=== Total BSP file data space used: 3664763 bytes ===
+13900.22 seconds elapsed [3h 51m 40s]
\ No newline at end of file
diff --git a/main/maps/ns_metal.bsp b/main/maps/ns_metal.bsp
new file mode 100644
index 00000000..c38f8a59
Binary files /dev/null and b/main/maps/ns_metal.bsp differ
diff --git a/main/maps/ns_metal.txt b/main/maps/ns_metal.txt
new file mode 100644
index 00000000..6394a5b9
--- /dev/null
+++ b/main/maps/ns_metal.txt
@@ -0,0 +1,140 @@
+Metal 27-8-2004
+===============================================
+
+Natural Selection map : Metal (ns_metal.bsp)
+Level Design : Juha "quazilin" Lipsonen (quazilin@hotmail.com)
+
+New environment sky "metal_"
+New sprite.
+
+-------------------------------------------------------
+
+Stuff:
+
+Bug reports/Suggestions are welcome to quazilin@hotmail.com
+
+Machine      : 500/700mhz 192mb ram
+Build time   : Eight months + playtesting/updating
+Compile time : ~2hours?
+
+While mapping I listened great oldskool musik tunes - www.kohina.com !
+Have fun and enjoy the map! 
+
+Greetings  :
+
+Dracka
+RedDog NS Clan - #reddog @ quakenet
+Flayra
+Zazi
+Mendasp
+Insane
+blueman
+manah
+Nay
+Yamazaki
+Hypergrip
+Ekaj
+|DL|JazzX
+Marcos
+Mr.Ben
+Drunken.Monkey
++all you nubs and ns fans out there!
+
+
+
+Changelog :
+
+-------------------------
+
++ update-12
+ 
+* Bug Fixes.
+* New Res SA-hive
+
+-------------------------
+
++ update-11
+
+* More infestation/Tweaks
+* Optimized surface access
+* Fixed 3 build exploits
+
+-------------------------
+
++ update-10
+
+* New "Supply way"
+* Smaller "Storage D"
+* New res
+* More infestation/Tweaks
+* Added steam bursts.
+
+-------------------------
+
++ update-9
+
+* Tweaks
+* Crash bug fix
+
+-------------------------
+
++ update-8
+
+* Tweaks
+* More vents
+* Removed double node
+
+-------------------------
+
++ update-7
+
+* Lowered Storage D ceiling
+* Small bug fixes
+
+-------------------------
+
++ update-6
+
+* Small layout change
+* Tweaks
+
+-------------------------
+
++ update-5
+
+* One res added
+* Lowered ceiling
+* Weldable door changed a bit
+
+-------------------------
+
++ update-4
+
+* One res node removed
+* Res node location changed
+* Little tweaks
+* Cooling hive easier to heal
+
+-------------------------
+
++ update-3
+
+* Res node location changes
+* Cargo -> Storage D
+* More details.
+
+-------------------------
+
++ update-2
+
+* Removed 2 res nodes 
+* More particle effects
+* More ambience sounds
+* Bug fixes 
+ -Ladder bug (thanks Ekaj)
+* More vents/hiding places 
+
+-------------------------
+
+
+
diff --git a/main/maps/ns_mineshaft.bsp b/main/maps/ns_mineshaft.bsp
new file mode 100644
index 00000000..ad8151cb
Binary files /dev/null and b/main/maps/ns_mineshaft.bsp differ
diff --git a/main/maps/ns_mineshaft.txt b/main/maps/ns_mineshaft.txt
new file mode 100644
index 00000000..4a5c8454
--- /dev/null
+++ b/main/maps/ns_mineshaft.txt
@@ -0,0 +1,92 @@
+map: ns_mineshaft
+Author: Ekaj
+Contact: PM me on the www.natural-selection.org forums
+
+Thanks to, in no particular order...
+Flayra
+SquealLikeAPig
+FilthyPanda (he made the custom rock textures)
+Ken20Banks
+Yamazaki
+Mazy
+Chalupamonk
+Monsieur Evil
+Grendel
+DOOManiac
+Tommyd
+KungFuSquirrel
+Relic25
+Merkaba
+Coil
+SpaceApe
+Ferret
+Professional Victim
+Badmofo
+Fam
+Nemisis Zero
+Plaguebearer
+Silver Fox
+BoZmAn20
+Comprox
+Blueman
+Manah
+Khaim
+Internecine
+BitchSLAP
+Cyanide
+Storm
+Greedo
+Who? Me?
+Ion Storm (Deus Ex=best game ever)
+Valve Software
+Craig Mullins (a very good artist, www.goodbrush.com)
+Feng Zhu (more great art, www.artbyfeng.com)
+The NS play testers/vets and dev team members
+
+-chart:
+
+Object names  Objects/Maxobjs  Memory / Maxmem  Fullness
+------------  ---------------  ---------------  --------
+models            163/400        10432/25600    (40.8%)
+planes          30394/32767     607880/655340   (92.8%)
+vertexes        23512/65535     282144/786420   (35.9%)
+nodes           11285/32767     270840/786408   (34.4%)
+texinfos        11698/32767     467920/1310680  (35.7%)
+faces           17615/65535     352300/1310700  (26.9%)
+clipnodes       31921/32767     255368/262136   (97.4%)
+leaves           5939/8192      166292/229376   (72.5%)
+marksurfaces    23212/65535      46424/131070   (35.4%)
+surfedges       79207/512000    316828/2048000  (15.5%)
+edges           41687/256000    166748/1024000  (16.3%)
+texdata          [variable]    1468396/4194304  (35.0%)
+lightdata        [variable]    1659465/4194304  (39.6%)
+visdata          [variable]     187400/2097152  ( 8.9%)
+entdata          [variable]      28442/524288   ( 5.4%)
+52 textures referenced
+=== Total BSP file data space used: 6286879 bytes ===
+
+Map Information:
+Solids: 5031
+Faces: 30828
+PointEntities: 115
+SolidEntities: 162
+Unique Textures: 52
+.rmf size: 12,469 kb
+
+Textures:
+=== Texture usage is at 1.40 mb (of 4.00 mb MAX) ===
+
+Compile times and command lines:
+CSG: -chart -hullfile C:\games\hl\ns\nshulls.txt 
+=== 123.64 seconds elapsed [2m 3s] ===
+
+BSP:
+=== 93.48 seconds elapsed [1m 33s] ===
+
+VIS: -full
+=== 746.98 seconds elapsed [12m 26s] ===
+
+RAD: -chart -bounce 1 -extra -gamma 0.9 -smooth 80 -sparse 
+=== 3431.46 seconds elapsed [57m 11s] ===
+
+My computer is a P4 2.4 with a 512 stick of DDR RAM.
\ No newline at end of file
diff --git a/main/maps/ns_nancy.bsp b/main/maps/ns_nancy.bsp
new file mode 100644
index 00000000..e8b3ec44
Binary files /dev/null and b/main/maps/ns_nancy.bsp differ
diff --git a/main/maps/ns_nothing.bsp b/main/maps/ns_nothing.bsp
new file mode 100644
index 00000000..bfd8f473
Binary files /dev/null and b/main/maps/ns_nothing.bsp differ
diff --git a/main/maps/ns_nothing.txt b/main/maps/ns_nothing.txt
new file mode 100644
index 00000000..9bce6326
--- /dev/null
+++ b/main/maps/ns_nothing.txt
@@ -0,0 +1,178 @@
+ns_nothing - "Space Station Nothing - Sub Sector 77"
+===================================================
+Natural Selection 2.0
+
+==
+v2.0 Modifications by Andrew Weldon
+Original Level by Ken Banks
+
+==
+X - Deleted Communications Hub nozzle (KB)
+X - Reduced volume in Power Silo (KB)
+X - moved Cargo Bay Foyer vent into an alcove without LOS to the hive (AW)
+X - Deleted Docking wing 01 nozzle (AW)
+X - Made 1.1 info_location tweaks (AW)
+X - Extended dead-end Viaduct vents to enter each side of Viaduct (AW)
+X - Tweaked power silo geometry, hive location, and spawn points (AW)
+X - Adjusted Red Room vents to exit closer to the ceiling for added protection (AW)
+X - Entity count optimizations (AW)
+X - Lighting adjustments (AW)
+
+==
+Special thanks to:
+Ken "ken20banks" Banks
+The Natural Selection team
+XP-Cagey
+Cadaver
+
+==
+July 2003
+
+ORIGINAL README FOLLOWS:
+=======================
+
+ns_nothing readme
+Last Updated: 10/04/02
+-------------------------------------------------------
+
+Level Name: Space Station Nothing - Sub Sector 77
+Level File Name: ns_nothing.bsp
+Additional Files: (See "Other Required Files")
+Level Completed: July, 2002
+-------------------------------------------------------
+
+Level Designer: Ken Banks
+Contact: ken20banks@yahoo.com
+Website: http://tald.readyroom.org
+-------------------------------------------------------
+
+Other Required Files:
+
+|ns|
+(|maps|, |models|, |sprites|, ns_nothing.wad)
+
+	|maps|
+	(ns_nothing.bsp, ns_nothing.txt)
+
+	|models|
+	(|ns_nothing|
+
+		|ns_nothing|
+		(ssn_powersilo.mdl, ssn_viaduct.mdl)
+
+	|sprites|
+	(|minimaps|, |ns_nothing|)
+
+		|minimaps|
+		(ns_nothing.spr)
+
+		|ns_nothing|
+		(glow03.spr, redflare2.spr)
+-------------------------------------------------------
+
+About the Level:
+
+Game: Natural Selection
+Type: Standard Marines vs. Aliens
+Recommended Players: At least 16
+Maximum Players: 32
+
+Description:
+
+Space Station Nothing
+Research and Containment Facility
+Sub Sector 77
+
+An immense facility, the players are located on level -77, near an auxiliary docking bay. Primary use of the sector is purely for maintenance, but it has proven useful for those last minute shipments while the station's main shipping and loading docks were full. A back door of sorts. 
+
+After the workers of the facility discovered that Sector 77 had received a freak shipment of... aliens... the entire level was closed off and quarantined for a week until TSA troops could be brought in. Ship still attached, the aliens began to infest what they could. Three hives began to develop: Two within the station itself, another on board the ship. 
+
+Enter, the Frontiersmen. 
+-------------------------------------------------------
+
+Special Thanks:
+
+Ned "MonsieurEvil" Pyle - I really owe you big time. From the website hosting and lifesaver SHODAN compiles, to the encouraging words and support you provided during the various "rough times", I really don't have the words to express my appreciation. At times it felt as though you were even more devoted to the level than I was. I'll never forget the several times you scrambled through dozens of emails and forum posts to help solve the showstopper compile errors and map bugs. If I were to dedicate this level to someone as a sign of respect and gratitude, it would definitely have to be you. Thanks, man.
+
+Charlie "Flayra" Cleveland - Your game is amazing. Truly revolutionary. I still can't get over the groundbreaking innovation. It comes as no surprise to me that its creator is one of the smartest and most dedicated people I've met. Thank you so much for allowing me to become involved with the game, and for getting involved with this level yourself. Your feedback on the map was extremely helpful. I have learned so much from you... both directly, and from the experiences of working on this. Thanks for putting up with my uncondensed ramblings too. ;)
+
+"Ekaj" - Your dedication to the level was made obvious by your flurry of comments, suggestions, and concerns. I don't know where the level would be right now if you hadn't returned my faith in the map by doing your rmf revisions that critical night. Thanks for the seemingly never-ending supply of suggestions and solutions to problems.
+
+Andrew "KungFuSquirrel" Weldon - Your comments, support, and suggestions were more than encouraging. Thanks for being there as a fellow level designer to discuss various aspects of the level with, and more importantly: as a great friend.
+
+Jon "Merkaba" Chapman - Your motivating words and insightful suggestions really helped me pull through at the end. I'm delighted that you enjoy the level, and you know that the feeling is mutual regarding your own creation.
+
+Russell "DOOManiac" Weed - While I unfortunately wasn't able to implement/fix all of them, your numerous suggestions and bug reports were invaluable. Thanks for devoting your time and energy to this.
+
+"Fam" - You're an incredible artist, which clearly shows in the fabulous sign textures/models you created for the level. Thanks again for doing this.
+
+Cory "Squeal Like A Pig" Strader - I regret never really getting involved with you in regard to the level's development, because it would undoubtedly have been better as a result. I whole-heartedly appreciate your devotion to defining and creating the visual appearance of the game. Your work is truly inspirational.
+
+Additional Thanks to the following people/companies for comments, suggestions, criticism, support, and/or for inspiration:
+
+Adam Foster
+Behrooz
+Blackdog
+blueman
+Bozman20
+Bungie
+chalupamonk
+ChromeAngel
+coil
+Comprox
+Craig Mullins
+Cyanide
+DevilDog
+Digital Extremes
+Epic Games
+ferret
+Feng Zhu
+Freemantle
+Greedo386
+Grendel
+HanzGruber
+humbaba
+H'BNayr
+Id Software
+Insane
+Ion Storm
+Jedisar
+Kassinger
+Killtoy
+Looking Glass Studios
+manah
+Mantis
+Merl
+Moleculor
+MotherGoose
+Mouse
+Mutant
+narby
+Nemesis Zero
+Plaugebearer
+QUAD
+Ramses
+Randy Reddig
+Relic25
+RhoadsToNowhere
+rob6264
+SentrySteve
+Sgt. Bilko
+shoven
+Silver Fox ( Dude, I can jump! Honest! )
+tommyd
+Valve Software
+Yamazaki
+
+A big thanks goes out to all of the NS Playtesters, and anyone else who, in any way, commented on the level.
+-------------------------------------------------------
+
+Additional Information:
+
+I was going to assemble a long, detailed rambling here describing how difficult - yet at the same time, enjoyable - making Space Station Nothing was for me. Though now, as I write this several months after completing the level, my passion for it has been somewhat subdued. I truly feel that by completing the level, I was able to leap over a substantial hurdle that had once been holding me back. I had never before been able to maintain the focus required to complete a project of this scale. The sense of accomplishment I felt after completing a playable build was overwhelming. While that gratification still lingers somewhere in the back of my mind, it's more of a dull tingle now, rather than the incredible burning in my chest that I experienced during the first days the map was released to the playtesters. The horrible stress and moody days that accompanied the numerous roadblocks I encountered during the development cycle also seem like more of a faint memory now than anything else. I was once very eager to share these experiences with everyone - both the good and the bad. I would have done anything for the satisfaction of knowing that at least one person really truly knew the pain and joy I went through. That desire has all but faded away now. Rather than feeling the need to burst out and share every single detail with any - and every - person who is willing to listen, I'm quite satisfied simply looking back at the work that was done and smiling.
+-------------------------------------------------------
+
+Contact: ken20banks@yahoo.com
+-------------------------------------------------------
+
+Reality is dead.
\ No newline at end of file
diff --git a/main/maps/ns_origin.bsp b/main/maps/ns_origin.bsp
new file mode 100644
index 00000000..3acf0786
Binary files /dev/null and b/main/maps/ns_origin.bsp differ
diff --git a/main/maps/ns_origin.txt b/main/maps/ns_origin.txt
new file mode 100644
index 00000000..2ebcda08
--- /dev/null
+++ b/main/maps/ns_origin.txt
@@ -0,0 +1,29 @@
+Map name:	Origin of Species
+BSP name:	ns_origin
+Author:		Cadaver (cadaver@planethalflife.com)
+
+Credits:	Biodome plant models by Psycho-Kinetic Hyper-Geek, animated by Ollj.
+		Thanks to XP-Cagey for the plane optimising tool which allowed the extra detail in this 					map.
+		Holo-Fade and Holo-Lerk models by UKChaos.
+		Additional textures: third nipple of fury, Fam, Cadaver.
+		Sky map by Raven (taken from The Wadfather site: http://www.planethalflife.com/wadfather).
+		Thanks to theiggsta and clan EC for help in playtesting.
+		New Furnace sound by MaDMaXX
+		Thanks to MaDMaXX, Khaim, Immacolata, grepdashv, BoZmAn20, Grendel and Flayra for their valuable feedback which 		helped me improve the map. Thanks also to anyone else who proffered feedback, and sorry for forgetting you!
+
+
+Backstory:	Although the origin of the Kharaa is shrouded in mystery, one of the very first human colonies to succumb to the alien scourge was a mining facility on a moon known as Freya IV. Perhaps the miners dug a little too deep, and released the Kharaa from their ancient sleep; none shall ever know, for those unlucky miners never lived to tell their tales. This lonely outpost became enshrined in TSA literature as "Colony Zero", the epidemiological epi-centre of the alien plague which soon ensued, as a result of bacterial contagion caused by the rash evacuation of the miners without due quarantine controls.
+
+Within weeks, six other planets and moons in the same quadrant as Freya IV became contaminated by the Kharaa; facing the serious possibility of uncontrollable bacterial spread, the TSA unwillingly placed a cordon sanitaire around the affected planets. No-one in, no-one out. The inhabitants of these accursed colonies were condemned to infested tombs.
+
+One year on, unmanned probes, sent in by the TSA to monitor the situation, found something extremely strange - with the human "threat" vanquished, the Kharaa had apparently disappeared - no trace of them, other than organic infestation remains, could be found. Tentatively sending in a human scouting party, the TSA soon realised that the Kharaa were not gone, merely dormant; in the presence of humans, the Kharaa once again awoke. Reporting "chuckling creatures, skulking in the shadows", the scouting party beat a hasty retreat.
+
+For the next 50 years, Freya IV was a strict no-go area. in the intervening time, however, the TSA had not been idle. Having identified the Bacterium as the basis for the Kharaa life-form, the TSA developed a bio-chemical weapon to combat it, dubbed "Nano-Penicillin". This weapon worked on the principle of destroying the Bacterium, and hence the Kharaa. In a symbolic act, Freya IV was chosen as the first infestation site to be cleansed with Nano-Penicillin, blanket-dropped upon the site by aerial probes. The mission was a success - the TSA's monitoring equipment could detect no signs of Bacterium.
+
+As part of the TSA's ongoing Kharaa research, Freya IV became manned once more, as part of efforts to unravel the secrets of the Kharaa by investigating the source. A new science annex was constructed to study the Kharaa and Bacterium under laboratory conditions, safe in the knowledge that Nano-Penicillin could always be used in emergency situations.
+
+Things did not go according to plan, however...
+
+A hive, specially cultivated in the biodome, began giving birth to immense numbers of the gargantuan Onos Kharaa, whose angry roars echoed about the entire station. En masse, they began charging at the containment doors, denting it, buckling it, straining it to its limits. Panicking, the scientists manning the biodome released Nano-Penicillin into the biodome...to no effect. The Bacterium had evolved once more, and had become resistant. At last, the containment doors gave way, and the corridors of the complex on Freya IV seethed with angry Kharaa...
+
+Once more, Freya IV was over-run. The TSA vowed never again to be so foolhardy and reckless as to believe they could confine and contain the Kharaa on human terms. Nevertheless, the scientists on Freya IV made unprecedented headway in Kharaa research, but this research stood to be lost if it could not be retrieved from Freya IV. One last foray was needed - one last journey to the origin of species, this time with a clear objective: search and destroy.
\ No newline at end of file
diff --git a/main/maps/ns_tanith.bsp b/main/maps/ns_tanith.bsp
new file mode 100644
index 00000000..3f4d3dd4
Binary files /dev/null and b/main/maps/ns_tanith.bsp differ
diff --git a/main/maps/ns_tanith.txt b/main/maps/ns_tanith.txt
new file mode 100644
index 00000000..a2f9ffae
--- /dev/null
+++ b/main/maps/ns_tanith.txt
@@ -0,0 +1,26 @@
+tanith v1.1 beta
+2/13/02
+tommyd
+email: tjd159@psu.edu
+
+missing:
+-outside satellite part
+-several models, including 'reactor' model for the reactor room
+-models showing directions
+-a few welds
+-readyroom (ns_ass style!)
+
+changes:
+-smaller by 10%, aimed for faster matches
+-75% reduction in entities, should run very fast
+-texturing overhaul
+-total revamp of MS - no more problems with issuing commands in MS
+-added world models, more to come
+-moved fusion hive
+-new reactor room and surrounding halls
+-fixed aliens-falling-thru-grates
+-HLTV support
+
+aknowledgements:
+Fam (textures)
+shaderlab textures (these are temporary - will be replaced)
diff --git a/main/maps/ns_veil.bsp b/main/maps/ns_veil.bsp
new file mode 100644
index 00000000..359dfddd
Binary files /dev/null and b/main/maps/ns_veil.bsp differ
diff --git a/main/maps/ns_veil.txt b/main/maps/ns_veil.txt
new file mode 100644
index 00000000..a9784f7f
--- /dev/null
+++ b/main/maps/ns_veil.txt
@@ -0,0 +1,10 @@
+ns_veil - "Veil"
+=====================
+Natural Selection 3.0
+
+Level by Andrew "KungFuSquirrel" Weldon
+http://www.kungfusquirrel.net/
+http://www.hl-nightwatch.net/
+
+==
+April 2004
\ No newline at end of file
diff --git a/main/media/gamestartup.mp3 b/main/media/gamestartup.mp3
new file mode 100644
index 00000000..c406a5c4
Binary files /dev/null and b/main/media/gamestartup.mp3 differ
diff --git a/main/media/launch_deny1.wav b/main/media/launch_deny1.wav
new file mode 100644
index 00000000..5de7b0f0
Binary files /dev/null and b/main/media/launch_deny1.wav differ
diff --git a/main/media/launch_deny2.wav b/main/media/launch_deny2.wav
new file mode 100644
index 00000000..842fa69b
Binary files /dev/null and b/main/media/launch_deny2.wav differ
diff --git a/main/media/launch_dnmenu1.wav b/main/media/launch_dnmenu1.wav
new file mode 100644
index 00000000..2b721051
Binary files /dev/null and b/main/media/launch_dnmenu1.wav differ
diff --git a/main/media/launch_glow1.wav b/main/media/launch_glow1.wav
new file mode 100644
index 00000000..7583339e
Binary files /dev/null and b/main/media/launch_glow1.wav differ
diff --git a/main/media/launch_select1.wav b/main/media/launch_select1.wav
new file mode 100644
index 00000000..0bbb86bd
Binary files /dev/null and b/main/media/launch_select1.wav differ
diff --git a/main/media/launch_select2.wav b/main/media/launch_select2.wav
new file mode 100644
index 00000000..e71197e7
Binary files /dev/null and b/main/media/launch_select2.wav differ
diff --git a/main/media/launch_upmenu1.wav b/main/media/launch_upmenu1.wav
new file mode 100644
index 00000000..70be2a06
Binary files /dev/null and b/main/media/launch_upmenu1.wav differ
diff --git a/main/media/logo.avi b/main/media/logo.avi
new file mode 100644
index 00000000..ed8b65b8
Binary files /dev/null and b/main/media/logo.avi differ
diff --git a/main/media/startupvids.txt b/main/media/startupvids.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/main/media/trailer.avi b/main/media/trailer.avi
new file mode 100644
index 00000000..5a03373e
Binary files /dev/null and b/main/media/trailer.avi differ
diff --git a/main/media/uwe.avi b/main/media/uwe.avi
new file mode 100644
index 00000000..99696884
Binary files /dev/null and b/main/media/uwe.avi differ
diff --git a/main/models/acidrocket.mdl b/main/models/acidrocket.mdl
new file mode 100644
index 00000000..2e8990ef
Binary files /dev/null and b/main/models/acidrocket.mdl differ
diff --git a/main/models/agibs.mdl b/main/models/agibs.mdl
new file mode 100644
index 00000000..30c68708
Binary files /dev/null and b/main/models/agibs.mdl differ
diff --git a/main/models/b_armory.mdl b/main/models/b_armory.mdl
new file mode 100644
index 00000000..453fbf59
Binary files /dev/null and b/main/models/b_armory.mdl differ
diff --git a/main/models/b_armoryT.mdl b/main/models/b_armoryT.mdl
new file mode 100644
index 00000000..7db62069
Binary files /dev/null and b/main/models/b_armoryT.mdl differ
diff --git a/main/models/b_armslab.mdl b/main/models/b_armslab.mdl
new file mode 100644
index 00000000..8b6eaa9d
Binary files /dev/null and b/main/models/b_armslab.mdl differ
diff --git a/main/models/b_armslabT.mdl b/main/models/b_armslabT.mdl
new file mode 100644
index 00000000..8b6a9686
Binary files /dev/null and b/main/models/b_armslabT.mdl differ
diff --git a/main/models/b_chemlab.mdl b/main/models/b_chemlab.mdl
new file mode 100644
index 00000000..a7e5cb36
Binary files /dev/null and b/main/models/b_chemlab.mdl differ
diff --git a/main/models/b_chemlabt.mdl b/main/models/b_chemlabt.mdl
new file mode 100644
index 00000000..cf72955f
Binary files /dev/null and b/main/models/b_chemlabt.mdl differ
diff --git a/main/models/b_commandstation.mdl b/main/models/b_commandstation.mdl
new file mode 100644
index 00000000..e9cdfcc7
Binary files /dev/null and b/main/models/b_commandstation.mdl differ
diff --git a/main/models/b_commandstationt.mdl b/main/models/b_commandstationt.mdl
new file mode 100644
index 00000000..b7e401fd
Binary files /dev/null and b/main/models/b_commandstationt.mdl differ
diff --git a/main/models/b_infportal.mdl b/main/models/b_infportal.mdl
new file mode 100644
index 00000000..3477d17d
Binary files /dev/null and b/main/models/b_infportal.mdl differ
diff --git a/main/models/b_infportalt.mdl b/main/models/b_infportalt.mdl
new file mode 100644
index 00000000..b8da0884
Binary files /dev/null and b/main/models/b_infportalt.mdl differ
diff --git a/main/models/b_medlab.mdl b/main/models/b_medlab.mdl
new file mode 100644
index 00000000..3048dce3
Binary files /dev/null and b/main/models/b_medlab.mdl differ
diff --git a/main/models/b_observatory.mdl b/main/models/b_observatory.mdl
new file mode 100644
index 00000000..4a448742
Binary files /dev/null and b/main/models/b_observatory.mdl differ
diff --git a/main/models/b_observatoryt.mdl b/main/models/b_observatoryt.mdl
new file mode 100644
index 00000000..3e5c2108
Binary files /dev/null and b/main/models/b_observatoryt.mdl differ
diff --git a/main/models/b_phasegate.mdl b/main/models/b_phasegate.mdl
new file mode 100644
index 00000000..a4b49886
Binary files /dev/null and b/main/models/b_phasegate.mdl differ
diff --git a/main/models/b_prototypelab.mdl b/main/models/b_prototypelab.mdl
new file mode 100644
index 00000000..08461257
Binary files /dev/null and b/main/models/b_prototypelab.mdl differ
diff --git a/main/models/b_prototypelabT.mdl b/main/models/b_prototypelabT.mdl
new file mode 100644
index 00000000..cdc8ca62
Binary files /dev/null and b/main/models/b_prototypelabT.mdl differ
diff --git a/main/models/b_resource_nozzle.mdl b/main/models/b_resource_nozzle.mdl
new file mode 100644
index 00000000..c6b6541d
Binary files /dev/null and b/main/models/b_resource_nozzle.mdl differ
diff --git a/main/models/b_resource_nozzlet.mdl b/main/models/b_resource_nozzlet.mdl
new file mode 100644
index 00000000..cf6f5186
Binary files /dev/null and b/main/models/b_resource_nozzlet.mdl differ
diff --git a/main/models/b_resourcetower.mdl b/main/models/b_resourcetower.mdl
new file mode 100644
index 00000000..eb09ec4d
Binary files /dev/null and b/main/models/b_resourcetower.mdl differ
diff --git a/main/models/b_resourcetowert.mdl b/main/models/b_resourcetowert.mdl
new file mode 100644
index 00000000..a6e8e4c4
Binary files /dev/null and b/main/models/b_resourcetowert.mdl differ
diff --git a/main/models/b_scan.mdl b/main/models/b_scan.mdl
new file mode 100644
index 00000000..4c962732
Binary files /dev/null and b/main/models/b_scan.mdl differ
diff --git a/main/models/b_sentry.mdl b/main/models/b_sentry.mdl
new file mode 100644
index 00000000..89bda1b1
Binary files /dev/null and b/main/models/b_sentry.mdl differ
diff --git a/main/models/b_sentryt.mdl b/main/models/b_sentryt.mdl
new file mode 100644
index 00000000..51bed175
Binary files /dev/null and b/main/models/b_sentryt.mdl differ
diff --git a/main/models/b_siege.mdl b/main/models/b_siege.mdl
new file mode 100644
index 00000000..b82bff3b
Binary files /dev/null and b/main/models/b_siege.mdl differ
diff --git a/main/models/b_sieget.mdl b/main/models/b_sieget.mdl
new file mode 100644
index 00000000..c0538bae
Binary files /dev/null and b/main/models/b_sieget.mdl differ
diff --git a/main/models/b_turretfactory.mdl b/main/models/b_turretfactory.mdl
new file mode 100644
index 00000000..0685baca
Binary files /dev/null and b/main/models/b_turretfactory.mdl differ
diff --git a/main/models/b_turretfactoryt.mdl b/main/models/b_turretfactoryt.mdl
new file mode 100644
index 00000000..cf72955f
Binary files /dev/null and b/main/models/b_turretfactoryt.mdl differ
diff --git a/main/models/ba_chamber.mdl b/main/models/ba_chamber.mdl
new file mode 100644
index 00000000..3fff0bb6
Binary files /dev/null and b/main/models/ba_chamber.mdl differ
diff --git a/main/models/ba_chambert.mdl b/main/models/ba_chambert.mdl
new file mode 100644
index 00000000..7fa54e79
Binary files /dev/null and b/main/models/ba_chambert.mdl differ
diff --git a/main/models/ba_defense.mdl b/main/models/ba_defense.mdl
new file mode 100644
index 00000000..b5385f96
Binary files /dev/null and b/main/models/ba_defense.mdl differ
diff --git a/main/models/ba_defenset.mdl b/main/models/ba_defenset.mdl
new file mode 100644
index 00000000..a1df9a41
Binary files /dev/null and b/main/models/ba_defenset.mdl differ
diff --git a/main/models/ba_movement.mdl b/main/models/ba_movement.mdl
new file mode 100644
index 00000000..3655e086
Binary files /dev/null and b/main/models/ba_movement.mdl differ
diff --git a/main/models/ba_movementt.mdl b/main/models/ba_movementt.mdl
new file mode 100644
index 00000000..751e89cc
Binary files /dev/null and b/main/models/ba_movementt.mdl differ
diff --git a/main/models/ba_offense.mdl b/main/models/ba_offense.mdl
new file mode 100644
index 00000000..4364bb43
Binary files /dev/null and b/main/models/ba_offense.mdl differ
diff --git a/main/models/ba_offenset.mdl b/main/models/ba_offenset.mdl
new file mode 100644
index 00000000..b323ce61
Binary files /dev/null and b/main/models/ba_offenset.mdl differ
diff --git a/main/models/ba_resource.mdl b/main/models/ba_resource.mdl
new file mode 100644
index 00000000..3fff0bb6
Binary files /dev/null and b/main/models/ba_resource.mdl differ
diff --git a/main/models/ba_resourcet.mdl b/main/models/ba_resourcet.mdl
new file mode 100644
index 00000000..7fa54e79
Binary files /dev/null and b/main/models/ba_resourcet.mdl differ
diff --git a/main/models/ba_sensory.mdl b/main/models/ba_sensory.mdl
new file mode 100644
index 00000000..77662c78
Binary files /dev/null and b/main/models/ba_sensory.mdl differ
diff --git a/main/models/ba_sensoryt.mdl b/main/models/ba_sensoryt.mdl
new file mode 100644
index 00000000..b6a6cd2a
Binary files /dev/null and b/main/models/ba_sensoryt.mdl differ
diff --git a/main/models/bilebomb.mdl b/main/models/bilebomb.mdl
new file mode 100644
index 00000000..a37ab917
Binary files /dev/null and b/main/models/bilebomb.mdl differ
diff --git a/main/models/chair1.mdl b/main/models/chair1.mdl
new file mode 100644
index 00000000..26afbb6e
Binary files /dev/null and b/main/models/chair1.mdl differ
diff --git a/main/models/co_daimos/skulk_pose.mdl b/main/models/co_daimos/skulk_pose.mdl
new file mode 100644
index 00000000..9535fed3
Binary files /dev/null and b/main/models/co_daimos/skulk_pose.mdl differ
diff --git a/main/models/co_daimos/soldier_salute.mdl b/main/models/co_daimos/soldier_salute.mdl
new file mode 100644
index 00000000..d8ab060a
Binary files /dev/null and b/main/models/co_daimos/soldier_salute.mdl differ
diff --git a/main/models/co_ether/plant1.mdl b/main/models/co_ether/plant1.mdl
new file mode 100644
index 00000000..365bc075
Binary files /dev/null and b/main/models/co_ether/plant1.mdl differ
diff --git a/main/models/co_ether/uplant1.mdl b/main/models/co_ether/uplant1.mdl
new file mode 100644
index 00000000..25c08f74
Binary files /dev/null and b/main/models/co_ether/uplant1.mdl differ
diff --git a/main/models/co_ether/uplant1t.mdl b/main/models/co_ether/uplant1t.mdl
new file mode 100644
index 00000000..aacae5da
Binary files /dev/null and b/main/models/co_ether/uplant1t.mdl differ
diff --git a/main/models/co_kestrel/sign_comm.mdl b/main/models/co_kestrel/sign_comm.mdl
new file mode 100644
index 00000000..9e78bb37
Binary files /dev/null and b/main/models/co_kestrel/sign_comm.mdl differ
diff --git a/main/models/co_kestrel/sign_fusion.mdl b/main/models/co_kestrel/sign_fusion.mdl
new file mode 100644
index 00000000..b5701a0a
Binary files /dev/null and b/main/models/co_kestrel/sign_fusion.mdl differ
diff --git a/main/models/co_kestrel/sign_hangar3.mdl b/main/models/co_kestrel/sign_hangar3.mdl
new file mode 100644
index 00000000..c11fe9c8
Binary files /dev/null and b/main/models/co_kestrel/sign_hangar3.mdl differ
diff --git a/main/models/co_kestrel/sign_hangar7.mdl b/main/models/co_kestrel/sign_hangar7.mdl
new file mode 100644
index 00000000..77692d21
Binary files /dev/null and b/main/models/co_kestrel/sign_hangar7.mdl differ
diff --git a/main/models/co_kestrel/sign_power.mdl b/main/models/co_kestrel/sign_power.mdl
new file mode 100644
index 00000000..2c4b11be
Binary files /dev/null and b/main/models/co_kestrel/sign_power.mdl differ
diff --git a/main/models/co_kestrel/sign_subhangar5.mdl b/main/models/co_kestrel/sign_subhangar5.mdl
new file mode 100644
index 00000000..0faad70e
Binary files /dev/null and b/main/models/co_kestrel/sign_subhangar5.mdl differ
diff --git a/main/models/co_niveus/helix.mdl b/main/models/co_niveus/helix.mdl
new file mode 100644
index 00000000..b8716596
Binary files /dev/null and b/main/models/co_niveus/helix.mdl differ
diff --git a/main/models/co_niveus/plant_pod2.mdl b/main/models/co_niveus/plant_pod2.mdl
new file mode 100644
index 00000000..80b12c8f
Binary files /dev/null and b/main/models/co_niveus/plant_pod2.mdl differ
diff --git a/main/models/co_sava/watertank.mdl b/main/models/co_sava/watertank.mdl
new file mode 100644
index 00000000..6fdf27ab
Binary files /dev/null and b/main/models/co_sava/watertank.mdl differ
diff --git a/main/models/co_sava/watertank2.mdl b/main/models/co_sava/watertank2.mdl
new file mode 100644
index 00000000..d2c94acd
Binary files /dev/null and b/main/models/co_sava/watertank2.mdl differ
diff --git a/main/models/grenade.mdl b/main/models/grenade.mdl
new file mode 100644
index 00000000..06ee08b2
Binary files /dev/null and b/main/models/grenade.mdl differ
diff --git a/main/models/hgibs.mdl b/main/models/hgibs.mdl
new file mode 100644
index 00000000..c9535b5d
Binary files /dev/null and b/main/models/hgibs.mdl differ
diff --git a/main/models/hive.mdl b/main/models/hive.mdl
new file mode 100644
index 00000000..3155e2fc
Binary files /dev/null and b/main/models/hive.mdl differ
diff --git a/main/models/hivet.mdl b/main/models/hivet.mdl
new file mode 100644
index 00000000..471da510
Binary files /dev/null and b/main/models/hivet.mdl differ
diff --git a/main/models/holo_base.mdl b/main/models/holo_base.mdl
new file mode 100644
index 00000000..458aa307
Binary files /dev/null and b/main/models/holo_base.mdl differ
diff --git a/main/models/holo_light.mdl b/main/models/holo_light.mdl
new file mode 100644
index 00000000..fff9ebdf
Binary files /dev/null and b/main/models/holo_light.mdl differ
diff --git a/main/models/ns_bast/bast.mdl b/main/models/ns_bast/bast.mdl
new file mode 100644
index 00000000..99b0ae97
Binary files /dev/null and b/main/models/ns_bast/bast.mdl differ
diff --git a/main/models/ns_bast/bastsign1.mdl b/main/models/ns_bast/bastsign1.mdl
new file mode 100644
index 00000000..ba44ab62
Binary files /dev/null and b/main/models/ns_bast/bastsign1.mdl differ
diff --git a/main/models/ns_bast/bastsign10.mdl b/main/models/ns_bast/bastsign10.mdl
new file mode 100644
index 00000000..7a3d84d0
Binary files /dev/null and b/main/models/ns_bast/bastsign10.mdl differ
diff --git a/main/models/ns_bast/bastsign2.mdl b/main/models/ns_bast/bastsign2.mdl
new file mode 100644
index 00000000..33ee6ba3
Binary files /dev/null and b/main/models/ns_bast/bastsign2.mdl differ
diff --git a/main/models/ns_bast/bastsign3.mdl b/main/models/ns_bast/bastsign3.mdl
new file mode 100644
index 00000000..aabb2f32
Binary files /dev/null and b/main/models/ns_bast/bastsign3.mdl differ
diff --git a/main/models/ns_bast/bastsign4.mdl b/main/models/ns_bast/bastsign4.mdl
new file mode 100644
index 00000000..032587eb
Binary files /dev/null and b/main/models/ns_bast/bastsign4.mdl differ
diff --git a/main/models/ns_bast/bastsign5.mdl b/main/models/ns_bast/bastsign5.mdl
new file mode 100644
index 00000000..20c9192b
Binary files /dev/null and b/main/models/ns_bast/bastsign5.mdl differ
diff --git a/main/models/ns_bast/bastsign6.mdl b/main/models/ns_bast/bastsign6.mdl
new file mode 100644
index 00000000..7e492d6e
Binary files /dev/null and b/main/models/ns_bast/bastsign6.mdl differ
diff --git a/main/models/ns_bast/bastsign7.mdl b/main/models/ns_bast/bastsign7.mdl
new file mode 100644
index 00000000..680dc8e6
Binary files /dev/null and b/main/models/ns_bast/bastsign7.mdl differ
diff --git a/main/models/ns_bast/bastsign8.mdl b/main/models/ns_bast/bastsign8.mdl
new file mode 100644
index 00000000..546a6f6e
Binary files /dev/null and b/main/models/ns_bast/bastsign8.mdl differ
diff --git a/main/models/ns_bast/bastsign9.mdl b/main/models/ns_bast/bastsign9.mdl
new file mode 100644
index 00000000..7e49ef81
Binary files /dev/null and b/main/models/ns_bast/bastsign9.mdl differ
diff --git a/main/models/ns_bast/command1.mdl b/main/models/ns_bast/command1.mdl
new file mode 100644
index 00000000..82b92bec
Binary files /dev/null and b/main/models/ns_bast/command1.mdl differ
diff --git a/main/models/ns_bast/noentry.mdl b/main/models/ns_bast/noentry.mdl
new file mode 100644
index 00000000..2d396b1a
Binary files /dev/null and b/main/models/ns_bast/noentry.mdl differ
diff --git a/main/models/ns_bast/tripod1.mdl b/main/models/ns_bast/tripod1.mdl
new file mode 100644
index 00000000..ecedf1fd
Binary files /dev/null and b/main/models/ns_bast/tripod1.mdl differ
diff --git a/main/models/ns_bast/warn.mdl b/main/models/ns_bast/warn.mdl
new file mode 100644
index 00000000..6d39d495
Binary files /dev/null and b/main/models/ns_bast/warn.mdl differ
diff --git a/main/models/ns_hera/hera_logo.mdl b/main/models/ns_hera/hera_logo.mdl
new file mode 100644
index 00000000..a15dcbb1
Binary files /dev/null and b/main/models/ns_hera/hera_logo.mdl differ
diff --git a/main/models/ns_hera/holo_hera.mdl b/main/models/ns_hera/holo_hera.mdl
new file mode 100644
index 00000000..22c32e45
Binary files /dev/null and b/main/models/ns_hera/holo_hera.mdl differ
diff --git a/main/models/ns_nancy/raveroom.mdl b/main/models/ns_nancy/raveroom.mdl
new file mode 100644
index 00000000..78584218
Binary files /dev/null and b/main/models/ns_nancy/raveroom.mdl differ
diff --git a/main/models/ns_nothing/ssn_powersilo.mdl b/main/models/ns_nothing/ssn_powersilo.mdl
new file mode 100644
index 00000000..07436810
Binary files /dev/null and b/main/models/ns_nothing/ssn_powersilo.mdl differ
diff --git a/main/models/ns_nothing/ssn_viaduct.mdl b/main/models/ns_nothing/ssn_viaduct.mdl
new file mode 100644
index 00000000..eaa51990
Binary files /dev/null and b/main/models/ns_nothing/ssn_viaduct.mdl differ
diff --git a/main/models/ns_origin/holo_fade.mdl b/main/models/ns_origin/holo_fade.mdl
new file mode 100644
index 00000000..4484fcf5
Binary files /dev/null and b/main/models/ns_origin/holo_fade.mdl differ
diff --git a/main/models/ns_origin/holo_lerk.mdl b/main/models/ns_origin/holo_lerk.mdl
new file mode 100644
index 00000000..fa78a5ec
Binary files /dev/null and b/main/models/ns_origin/holo_lerk.mdl differ
diff --git a/main/models/ns_origin/plant_pod2.mdl b/main/models/ns_origin/plant_pod2.mdl
new file mode 100644
index 00000000..80b12c8f
Binary files /dev/null and b/main/models/ns_origin/plant_pod2.mdl differ
diff --git a/main/models/ns_origin/plant_shroomtree2.mdl b/main/models/ns_origin/plant_shroomtree2.mdl
new file mode 100644
index 00000000..86389373
Binary files /dev/null and b/main/models/ns_origin/plant_shroomtree2.mdl differ
diff --git a/main/models/ns_tanith/1wall3.mdl b/main/models/ns_tanith/1wall3.mdl
new file mode 100644
index 00000000..9a857057
Binary files /dev/null and b/main/models/ns_tanith/1wall3.mdl differ
diff --git a/main/models/ns_tanith/1wall4.mdl b/main/models/ns_tanith/1wall4.mdl
new file mode 100644
index 00000000..ecad4b10
Binary files /dev/null and b/main/models/ns_tanith/1wall4.mdl differ
diff --git a/main/models/ns_tanith/1wall5.mdl b/main/models/ns_tanith/1wall5.mdl
new file mode 100644
index 00000000..32e3a81b
Binary files /dev/null and b/main/models/ns_tanith/1wall5.mdl differ
diff --git a/main/models/ns_tanith/1wall6.mdl b/main/models/ns_tanith/1wall6.mdl
new file mode 100644
index 00000000..f96a73f0
Binary files /dev/null and b/main/models/ns_tanith/1wall6.mdl differ
diff --git a/main/models/ns_tanith/czg_screen96.mdl b/main/models/ns_tanith/czg_screen96.mdl
new file mode 100644
index 00000000..c1763dc5
Binary files /dev/null and b/main/models/ns_tanith/czg_screen96.mdl differ
diff --git a/main/models/ns_tanith/tansign.mdl b/main/models/ns_tanith/tansign.mdl
new file mode 100644
index 00000000..a02eef6e
Binary files /dev/null and b/main/models/ns_tanith/tansign.mdl differ
diff --git a/main/models/null.mdl b/main/models/null.mdl
new file mode 100644
index 00000000..5bad6548
Binary files /dev/null and b/main/models/null.mdl differ
diff --git a/main/models/p_gg.mdl b/main/models/p_gg.mdl
new file mode 100644
index 00000000..764c4bbb
Binary files /dev/null and b/main/models/p_gg.mdl differ
diff --git a/main/models/p_gr.mdl b/main/models/p_gr.mdl
new file mode 100644
index 00000000..6077e154
Binary files /dev/null and b/main/models/p_gr.mdl differ
diff --git a/main/models/p_hg.mdl b/main/models/p_hg.mdl
new file mode 100644
index 00000000..b41a47c0
Binary files /dev/null and b/main/models/p_hg.mdl differ
diff --git a/main/models/p_hmg.mdl b/main/models/p_hmg.mdl
new file mode 100644
index 00000000..e34b0b90
Binary files /dev/null and b/main/models/p_hmg.mdl differ
diff --git a/main/models/p_kn.mdl b/main/models/p_kn.mdl
new file mode 100644
index 00000000..556f7836
Binary files /dev/null and b/main/models/p_kn.mdl differ
diff --git a/main/models/p_mg.mdl b/main/models/p_mg.mdl
new file mode 100644
index 00000000..1019c241
Binary files /dev/null and b/main/models/p_mg.mdl differ
diff --git a/main/models/p_mine.mdl b/main/models/p_mine.mdl
new file mode 100644
index 00000000..69a4ba74
Binary files /dev/null and b/main/models/p_mine.mdl differ
diff --git a/main/models/p_pistol.mdl b/main/models/p_pistol.mdl
new file mode 100644
index 00000000..38407542
Binary files /dev/null and b/main/models/p_pistol.mdl differ
diff --git a/main/models/p_sg.mdl b/main/models/p_sg.mdl
new file mode 100644
index 00000000..29016001
Binary files /dev/null and b/main/models/p_sg.mdl differ
diff --git a/main/models/p_shotgun.mdl b/main/models/p_shotgun.mdl
new file mode 100644
index 00000000..2551e5c5
Binary files /dev/null and b/main/models/p_shotgun.mdl differ
diff --git a/main/models/p_tripmine.mdl b/main/models/p_tripmine.mdl
new file mode 100644
index 00000000..309eb4ad
Binary files /dev/null and b/main/models/p_tripmine.mdl differ
diff --git a/main/models/p_welder.mdl b/main/models/p_welder.mdl
new file mode 100644
index 00000000..20c8e8c9
Binary files /dev/null and b/main/models/p_welder.mdl differ
diff --git a/main/models/parasite.mdl b/main/models/parasite.mdl
new file mode 100644
index 00000000..79ee0e69
Binary files /dev/null and b/main/models/parasite.mdl differ
diff --git a/main/models/player.mdl b/main/models/player.mdl
new file mode 100644
index 00000000..010ef4ff
Binary files /dev/null and b/main/models/player.mdl differ
diff --git a/main/models/player/alien1/alien1.mdl b/main/models/player/alien1/alien1.mdl
new file mode 100644
index 00000000..988965ad
Binary files /dev/null and b/main/models/player/alien1/alien1.mdl differ
diff --git a/main/models/player/alien2/alien2.mdl b/main/models/player/alien2/alien2.mdl
new file mode 100644
index 00000000..e534f2c7
Binary files /dev/null and b/main/models/player/alien2/alien2.mdl differ
diff --git a/main/models/player/alien3/alien3.mdl b/main/models/player/alien3/alien3.mdl
new file mode 100644
index 00000000..63d6aef2
Binary files /dev/null and b/main/models/player/alien3/alien3.mdl differ
diff --git a/main/models/player/alien4/alien4.mdl b/main/models/player/alien4/alien4.mdl
new file mode 100644
index 00000000..4d0e75c7
Binary files /dev/null and b/main/models/player/alien4/alien4.mdl differ
diff --git a/main/models/player/alien5/alien5.mdl b/main/models/player/alien5/alien5.mdl
new file mode 100644
index 00000000..c1adc956
Binary files /dev/null and b/main/models/player/alien5/alien5.mdl differ
diff --git a/main/models/player/commander/commander.mdl b/main/models/player/commander/commander.mdl
new file mode 100644
index 00000000..010ef4ff
Binary files /dev/null and b/main/models/player/commander/commander.mdl differ
diff --git a/main/models/player/gestate/gestate.mdl b/main/models/player/gestate/gestate.mdl
new file mode 100644
index 00000000..294628ed
Binary files /dev/null and b/main/models/player/gestate/gestate.mdl differ
diff --git a/main/models/player/gestate/gestatet.mdl b/main/models/player/gestate/gestatet.mdl
new file mode 100644
index 00000000..24bcca7f
Binary files /dev/null and b/main/models/player/gestate/gestatet.mdl differ
diff --git a/main/models/player/heavy/heavy.mdl b/main/models/player/heavy/heavy.mdl
new file mode 100644
index 00000000..5d2506ea
Binary files /dev/null and b/main/models/player/heavy/heavy.mdl differ
diff --git a/main/models/player/remapped.bmp b/main/models/player/remapped.bmp
new file mode 100644
index 00000000..72fd3d5b
Binary files /dev/null and b/main/models/player/remapped.bmp differ
diff --git a/main/models/player/soldier/soldier.mdl b/main/models/player/soldier/soldier.mdl
new file mode 100644
index 00000000..b0e626b8
Binary files /dev/null and b/main/models/player/soldier/soldier.mdl differ
diff --git a/main/models/pshell.mdl b/main/models/pshell.mdl
new file mode 100644
index 00000000..69a93966
Binary files /dev/null and b/main/models/pshell.mdl differ
diff --git a/main/models/shell.mdl b/main/models/shell.mdl
new file mode 100644
index 00000000..6c8428c3
Binary files /dev/null and b/main/models/shell.mdl differ
diff --git a/main/models/shotshell.mdl b/main/models/shotshell.mdl
new file mode 100644
index 00000000..681ab3db
Binary files /dev/null and b/main/models/shotshell.mdl differ
diff --git a/main/models/spike.mdl b/main/models/spike.mdl
new file mode 100644
index 00000000..a70dbeab
Binary files /dev/null and b/main/models/spike.mdl differ
diff --git a/main/models/stomp.mdl b/main/models/stomp.mdl
new file mode 100644
index 00000000..d6bd3fef
Binary files /dev/null and b/main/models/stomp.mdl differ
diff --git a/main/models/v_gg.mdl b/main/models/v_gg.mdl
new file mode 100644
index 00000000..a0dcea61
Binary files /dev/null and b/main/models/v_gg.mdl differ
diff --git a/main/models/v_gg_hv.mdl b/main/models/v_gg_hv.mdl
new file mode 100644
index 00000000..35911937
Binary files /dev/null and b/main/models/v_gg_hv.mdl differ
diff --git a/main/models/v_gr.mdl b/main/models/v_gr.mdl
new file mode 100644
index 00000000..02a7c7e0
Binary files /dev/null and b/main/models/v_gr.mdl differ
diff --git a/main/models/v_gr_hv.mdl b/main/models/v_gr_hv.mdl
new file mode 100644
index 00000000..8f27ba83
Binary files /dev/null and b/main/models/v_gr_hv.mdl differ
diff --git a/main/models/v_hg.mdl b/main/models/v_hg.mdl
new file mode 100644
index 00000000..49f9c2d9
Binary files /dev/null and b/main/models/v_hg.mdl differ
diff --git a/main/models/v_hg_hv.mdl b/main/models/v_hg_hv.mdl
new file mode 100644
index 00000000..11194af5
Binary files /dev/null and b/main/models/v_hg_hv.mdl differ
diff --git a/main/models/v_hmg.mdl b/main/models/v_hmg.mdl
new file mode 100644
index 00000000..71e59949
Binary files /dev/null and b/main/models/v_hmg.mdl differ
diff --git a/main/models/v_hmg_hv.mdl b/main/models/v_hmg_hv.mdl
new file mode 100644
index 00000000..95c81a36
Binary files /dev/null and b/main/models/v_hmg_hv.mdl differ
diff --git a/main/models/v_kn.mdl b/main/models/v_kn.mdl
new file mode 100644
index 00000000..0894d485
Binary files /dev/null and b/main/models/v_kn.mdl differ
diff --git a/main/models/v_kn_hv.mdl b/main/models/v_kn_hv.mdl
new file mode 100644
index 00000000..534c24b9
Binary files /dev/null and b/main/models/v_kn_hv.mdl differ
diff --git a/main/models/v_lvl1.mdl b/main/models/v_lvl1.mdl
new file mode 100644
index 00000000..0fa192d8
Binary files /dev/null and b/main/models/v_lvl1.mdl differ
diff --git a/main/models/v_lvl2.mdl b/main/models/v_lvl2.mdl
new file mode 100644
index 00000000..235ff9c7
Binary files /dev/null and b/main/models/v_lvl2.mdl differ
diff --git a/main/models/v_lvl3.mdl b/main/models/v_lvl3.mdl
new file mode 100644
index 00000000..978463b6
Binary files /dev/null and b/main/models/v_lvl3.mdl differ
diff --git a/main/models/v_lvl4.mdl b/main/models/v_lvl4.mdl
new file mode 100644
index 00000000..27a67ca8
Binary files /dev/null and b/main/models/v_lvl4.mdl differ
diff --git a/main/models/v_lvl5.mdl b/main/models/v_lvl5.mdl
new file mode 100644
index 00000000..0b6064f6
Binary files /dev/null and b/main/models/v_lvl5.mdl differ
diff --git a/main/models/v_mg.mdl b/main/models/v_mg.mdl
new file mode 100644
index 00000000..589e9eca
Binary files /dev/null and b/main/models/v_mg.mdl differ
diff --git a/main/models/v_mg_hv.mdl b/main/models/v_mg_hv.mdl
new file mode 100644
index 00000000..0016331e
Binary files /dev/null and b/main/models/v_mg_hv.mdl differ
diff --git a/main/models/v_mine.mdl b/main/models/v_mine.mdl
new file mode 100644
index 00000000..2c3803fe
Binary files /dev/null and b/main/models/v_mine.mdl differ
diff --git a/main/models/v_mine_hv.mdl b/main/models/v_mine_hv.mdl
new file mode 100644
index 00000000..0658a435
Binary files /dev/null and b/main/models/v_mine_hv.mdl differ
diff --git a/main/models/v_sg.mdl b/main/models/v_sg.mdl
new file mode 100644
index 00000000..00402640
Binary files /dev/null and b/main/models/v_sg.mdl differ
diff --git a/main/models/v_sg_hv.mdl b/main/models/v_sg_hv.mdl
new file mode 100644
index 00000000..640c1d0e
Binary files /dev/null and b/main/models/v_sg_hv.mdl differ
diff --git a/main/models/v_welder.mdl b/main/models/v_welder.mdl
new file mode 100644
index 00000000..3bb35617
Binary files /dev/null and b/main/models/v_welder.mdl differ
diff --git a/main/models/v_welder_hv.mdl b/main/models/v_welder_hv.mdl
new file mode 100644
index 00000000..22f1e059
Binary files /dev/null and b/main/models/v_welder_hv.mdl differ
diff --git a/main/models/w_ammo.mdl b/main/models/w_ammo.mdl
new file mode 100644
index 00000000..7601c68c
Binary files /dev/null and b/main/models/w_ammo.mdl differ
diff --git a/main/models/w_ammopack.mdl b/main/models/w_ammopack.mdl
new file mode 100644
index 00000000..736c7b0b
Binary files /dev/null and b/main/models/w_ammopack.mdl differ
diff --git a/main/models/w_ammot.mdl b/main/models/w_ammot.mdl
new file mode 100644
index 00000000..b244eb27
Binary files /dev/null and b/main/models/w_ammot.mdl differ
diff --git a/main/models/w_catalyst.mdl b/main/models/w_catalyst.mdl
new file mode 100644
index 00000000..bdb3bbc6
Binary files /dev/null and b/main/models/w_catalyst.mdl differ
diff --git a/main/models/w_gg.mdl b/main/models/w_gg.mdl
new file mode 100644
index 00000000..1dd4a477
Binary files /dev/null and b/main/models/w_gg.mdl differ
diff --git a/main/models/w_gr.mdl b/main/models/w_gr.mdl
new file mode 100644
index 00000000..67b46e47
Binary files /dev/null and b/main/models/w_gr.mdl differ
diff --git a/main/models/w_grT.mdl b/main/models/w_grT.mdl
new file mode 100644
index 00000000..78b151bb
Binary files /dev/null and b/main/models/w_grT.mdl differ
diff --git a/main/models/w_gren.mdl b/main/models/w_gren.mdl
new file mode 100644
index 00000000..cc458e9b
Binary files /dev/null and b/main/models/w_gren.mdl differ
diff --git a/main/models/w_grenade.mdl b/main/models/w_grenade.mdl
new file mode 100644
index 00000000..b6b85945
Binary files /dev/null and b/main/models/w_grenade.mdl differ
diff --git a/main/models/w_health.mdl b/main/models/w_health.mdl
new file mode 100644
index 00000000..960b675c
Binary files /dev/null and b/main/models/w_health.mdl differ
diff --git a/main/models/w_healtht.mdl b/main/models/w_healtht.mdl
new file mode 100644
index 00000000..8cf4e2d9
Binary files /dev/null and b/main/models/w_healtht.mdl differ
diff --git a/main/models/w_heavy.mdl b/main/models/w_heavy.mdl
new file mode 100644
index 00000000..443dbd8b
Binary files /dev/null and b/main/models/w_heavy.mdl differ
diff --git a/main/models/w_hg.mdl b/main/models/w_hg.mdl
new file mode 100644
index 00000000..4bb3a45f
Binary files /dev/null and b/main/models/w_hg.mdl differ
diff --git a/main/models/w_hgt.mdl b/main/models/w_hgt.mdl
new file mode 100644
index 00000000..df67c8bc
Binary files /dev/null and b/main/models/w_hgt.mdl differ
diff --git a/main/models/w_hmg.mdl b/main/models/w_hmg.mdl
new file mode 100644
index 00000000..bf1f872c
Binary files /dev/null and b/main/models/w_hmg.mdl differ
diff --git a/main/models/w_hmgT.mdl b/main/models/w_hmgT.mdl
new file mode 100644
index 00000000..492a4d87
Binary files /dev/null and b/main/models/w_hmgT.mdl differ
diff --git a/main/models/w_jetpack.mdl b/main/models/w_jetpack.mdl
new file mode 100644
index 00000000..c3e20705
Binary files /dev/null and b/main/models/w_jetpack.mdl differ
diff --git a/main/models/w_kn.mdl b/main/models/w_kn.mdl
new file mode 100644
index 00000000..e50b5c49
Binary files /dev/null and b/main/models/w_kn.mdl differ
diff --git a/main/models/w_knT.mdl b/main/models/w_knT.mdl
new file mode 100644
index 00000000..67cd8bcc
Binary files /dev/null and b/main/models/w_knT.mdl differ
diff --git a/main/models/w_mg.mdl b/main/models/w_mg.mdl
new file mode 100644
index 00000000..ee76edc8
Binary files /dev/null and b/main/models/w_mg.mdl differ
diff --git a/main/models/w_mgt.mdl b/main/models/w_mgt.mdl
new file mode 100644
index 00000000..c29d24df
Binary files /dev/null and b/main/models/w_mgt.mdl differ
diff --git a/main/models/w_mine.mdl b/main/models/w_mine.mdl
new file mode 100644
index 00000000..32d238a9
Binary files /dev/null and b/main/models/w_mine.mdl differ
diff --git a/main/models/w_mine2.mdl b/main/models/w_mine2.mdl
new file mode 100644
index 00000000..30285323
Binary files /dev/null and b/main/models/w_mine2.mdl differ
diff --git a/main/models/w_none.mdl b/main/models/w_none.mdl
new file mode 100644
index 00000000..ca9d4f22
Binary files /dev/null and b/main/models/w_none.mdl differ
diff --git a/main/models/w_sg.mdl b/main/models/w_sg.mdl
new file mode 100644
index 00000000..458961d5
Binary files /dev/null and b/main/models/w_sg.mdl differ
diff --git a/main/models/w_sgt.mdl b/main/models/w_sgt.mdl
new file mode 100644
index 00000000..017a26d0
Binary files /dev/null and b/main/models/w_sgt.mdl differ
diff --git a/main/models/w_welder.mdl b/main/models/w_welder.mdl
new file mode 100644
index 00000000..688171ce
Binary files /dev/null and b/main/models/w_welder.mdl differ
diff --git a/main/models/w_welderT.mdl b/main/models/w_welderT.mdl
new file mode 100644
index 00000000..5348b605
Binary files /dev/null and b/main/models/w_welderT.mdl differ
diff --git a/main/motd.txt b/main/motd.txt
new file mode 100644
index 00000000..05885f00
--- /dev/null
+++ b/main/motd.txt
@@ -0,0 +1 @@
+Welcome to Natural Selection...enjoy yourself!
diff --git a/main/music/ns_ambient1.mp3 b/main/music/ns_ambient1.mp3
new file mode 100644
index 00000000..f26e4b54
Binary files /dev/null and b/main/music/ns_ambient1.mp3 differ
diff --git a/main/music/ns_ambient2.mp3 b/main/music/ns_ambient2.mp3
new file mode 100644
index 00000000..193766ad
Binary files /dev/null and b/main/music/ns_ambient2.mp3 differ
diff --git a/main/music/ns_ambient3.mp3 b/main/music/ns_ambient3.mp3
new file mode 100644
index 00000000..7dfa5578
Binary files /dev/null and b/main/music/ns_ambient3.mp3 differ
diff --git a/main/music/ns_ambient4.mp3 b/main/music/ns_ambient4.mp3
new file mode 100644
index 00000000..73375c77
Binary files /dev/null and b/main/music/ns_ambient4.mp3 differ
diff --git a/main/music/ns_ambient5.mp3 b/main/music/ns_ambient5.mp3
new file mode 100644
index 00000000..63d3bf56
Binary files /dev/null and b/main/music/ns_ambient5.mp3 differ
diff --git a/main/music/ns_titlescreen.mp3 b/main/music/ns_titlescreen.mp3
new file mode 100644
index 00000000..c406a5c4
Binary files /dev/null and b/main/music/ns_titlescreen.mp3 differ
diff --git a/main/ns-hltv.bat b/main/ns-hltv.bat
new file mode 100644
index 00000000..9c66acb2
--- /dev/null
+++ b/main/ns-hltv.bat
@@ -0,0 +1,5 @@
+REM Make sure you've installed and ran the "dedicated server" package to get hltv.exe
+cd ../../"dedicated server"
+REM hltv.exe +exec ns\ns-hltv.cfg +maxclients 256 +autorecord 1 +connect IPADDRESS:27020
+hltv.exe +exec nsp\ns-hltv.cfg +maxclients 256 +autorecord 1 +connect 192.168.0.4:27016
+cd ../half-life/nsp
\ No newline at end of file
diff --git a/main/ns-hltv.cfg b/main/ns-hltv.cfg
new file mode 100644
index 00000000..3c7718f4
--- /dev/null
+++ b/main/ns-hltv.cfg
@@ -0,0 +1,46 @@
+// =============================
+// Base Config for NS-HLTV v1.0
+// =============================
+delay 			60.0		// delays game for 60 seconds
+multicast 		0		// multicast disabled
+rate			10000		// amount of data proxy gets from match server
+maxclientrate		8000		// maximum client data from HLTV proxy
+updaterate		20		// get 20 updates per second from server
+logfile			1		// log events in proxy.log
+chatmode		1		// local chatting on
+name			"NS-HLTV"	// HLTV Host Name
+// =======================================
+// Careful when modifying lines above this
+// =======================================
+
+// http://www.slipgate.de/hltv/hltv_FAQ_admins.html for more information
+
+// Turns off reporting to WON database
+nomaster		1
+
+//serverpassword		<password>	// server password (that HLTV will be connecting to)
+
+// set offline info text clients will see as reject reason if HLTV isn't broadcasting yet
+offlinetext "Sorry, the game isn't broadcasting yet."
+
+// disallow joingame for HLTV spectators 
+allowjoingame		0
+
+// banner
+bannerfile			ns-hltv.tga
+
+// incoming voice data is blocked
+blockvoice 1
+
+// passwords
+//adminpassword		<password>  // proxy's admin password for rcon, commentator etc. (like server rcon)
+//proxypassword		<password>	// protects proxy against unwanted relay proxies
+//spectatorpassword	<password>	// If your HLTV will have spectators, you'll need to provide them with this password.
+
+// show message for 5 seconds each 120 seconds in center of X axis (-1) and
+// above help text bar (0.85). Color given as hexadecimal RGBA .
+localmsg "NS-HLTV Broadcast" 90 5 -1 0.825 FFA000FF
+
+// these commands will be executed on connecting spectator client and may be used
+// to adjust settings for HLTV (for example voice parameters)
+signoncommands "voice_scale 2; voice_overdrive 16; volume 0.5; echo Voice adjusted for NS-HLTV"
\ No newline at end of file
diff --git a/main/ns-hltv.tga b/main/ns-hltv.tga
new file mode 100644
index 00000000..38fdad95
Binary files /dev/null and b/main/ns-hltv.tga differ
diff --git a/main/ns.fgd b/main/ns.fgd
new file mode 100644
index 00000000..4ea0a2aa
--- /dev/null
+++ b/main/ns.fgd
@@ -0,0 +1,2382 @@
+//
+// Natural Selection game definition file (.fgd) 
+// Version 2.1
+// for Valve Hammer Editor 3.5 and above, and Half-Life 1.1.1.0 and above
+// last update: 7/29/03, Andrew Weldon (aweldon@planethalflife.com)
+//
+
+
+//
+// NS20 - NS FGD v. 2.1
+//	- Adjusted FGD information to be current to 2.1 version number.
+//
+// NS11 - NS FGD v. 1.1
+//	- Added Valve Hammer Editor 3.5 model rendering support for
+//	  cycler, cycler_weapon, info_player_start, team_hive,
+//	  team_command, and func_resource.
+//	- Added "Angles" base class to fgd and relevant entities.
+//	- Removed unnecessary Half-Life single player entities.
+//	- Removed standard Half-Life turret and mortar-related entities.
+//	- Added support for MHLT Custom Build 1.7 of ZHLT 2.5.3 For further
+//	  information on these features, refer to your MHLT 1.7 documentation.
+//	- Added support for XP-Cagey's tool modifications. *This should
+//	  also allow for theoretical MHLT 1.8 support* For further
+//	  information on these features, please refer to your zhlt17p8 documentation.
+//	- Added original ZHLT-specific keyvalues to applicable entities.
+//	- Removed old Half-Life fgd changelogs (Changes are viewable in
+//	  standard Half-Life .fgd and mostly irrelevant to NS-specific
+//	  work). Can be re-added at a later date if deemed necessary.
+//	- Removed env_fog for compatibility reasons.
+//	- Uncommented "Momentary open time" and "Momentary close time" in
+//	  trigger_precence [sic].
+//
+//	NOTE ON ADDITION OF ZHLT LIGHTFLAGS:
+//	The ZHLT lightflags can be added to any brush entity. In most cases,
+//	this should not include movable/toggleable geometry, but there
+//	are some applications where this is necessary. As such, I've gone ahead
+//	and added them to all visible brush entities despite some that seem
+//	almost counter-intuitive. This is only for the sake of people who do
+//	find uses for the flags on these entities. Smart and careful use of
+//	these flags will give the best results.
+//
+//	NOTE ON ADDITION OF TOGGLEABLE TEXTURE LIGHTING:
+//	The ability to toggle textured lights has only been added on non-moving
+//	brushes, with the exception of the func_button. Use of this feature on a
+//	moving brush is not recommended, but if you find it necessary to do so,
+//	simply refer to instructions.html in your MHLT directory for information
+//	on how to set up the functionality yourself. This is a safeguard against
+//	inexperienced users attempting to implement textured lighting on a moving brush.
+
+//
+// worldspawn
+//
+
+@SolidClass = worldspawn : "World entity"
+[
+	message(string) : "Map Description / Title"
+	skyname(string) : "environment map (cl_skyname)"
+	sounds(integer) : "CD track to play" : 1
+	light(integer) : "Default light level"
+	WaveHeight(string) : "Default Wave Height"
+	MaxRange(string) : "Max viewable distance" : "4096"
+	chaptertitle(string) : "Chapter Title Message"
+	startdark(choices) : "Level Fade In" : 0 =
+	[	
+		0 : "No"
+		1 : "Yes"
+	]
+	gametitle(choices) : "Display game title" : 0 = 
+	[	
+		0 : "No"
+		1 : "Yes"
+	]
+	newunit(choices) : "New Level Unit" : 0 = 
+	[
+		0 : "No, keep current"
+		1 : "Yes, clear previous levels"
+	]
+	mapteams(string) : "Map Team List"
+	defaultteam(choices) : "Default Team" : 0 = 
+	[
+		0 : "Fewest Players"
+		1 : "First Team"
+	]
+]
+
+//
+// BaseClasses
+//
+
+@BaseClass = Appearflags
+[
+	spawnflags(Flags) =
+	[
+		2048 : "Not in Deathmatch" : 0
+	]
+]
+
+@BaseClass size(0 0 0, 32 32 32) color(80 0 200) base(Appearflags) = Ammo []
+
+@BaseClass = Targetname 
+[ 
+	targetname(target_source) : "Name"
+]
+@BaseClass = Target 
+[ 
+	target(target_destination) : "Target" 
+]
+@BaseClass size(-16 -16 0, 16 16 32) color(0 0 200) base(Targetname, Appearflags) = Weapon []
+@BaseClass = Global 
+[ 
+	globalname(string) : "Global Entity Name" 
+]
+
+@BaseClass base(Target) = Targetx 
+[
+	delay(string) : "Delay before trigger" : "0"
+	killtarget(target_destination) : "KillTarget"
+]
+
+@BaseClass = RenderFxChoices
+[
+	renderfx(choices) :"Render FX" : 0 =
+	[
+		0: "Normal"
+		1: "Slow Pulse"
+		2: "Fast Pulse"
+		3: "Slow Wide Pulse"
+		4: "Fast Wide Pulse"
+		9: "Slow Strobe"
+		10: "Fast Strobe"
+		11: "Faster Strobe"
+		12: "Slow Flicker"
+		13: "Fast Flicker"
+		5: "Slow Fade Away"
+		6: "Fast Fade Away"
+		7: "Slow Become Solid"
+		8: "Fast Become Solid"
+		14: "Constant Glow"
+		15: "Distort"
+		16: "Hologram (Distort + fade)"
+	]
+]
+
+@BaseClass base(RenderFxChoices) = RenderFields 
+[
+	rendermode(choices) : "Render Mode" : 0 =
+	[
+		0: "Normal"
+		1: "Color"
+		2: "Texture"
+		3: "Glow"
+		4: "Solid"
+		5: "Additive"
+	]
+	renderamt(integer) : "FX Amount (1 - 255)"
+	rendercolor(color255) : "FX Color (R G B)" : "0 0 0"
+]
+
+@BaseClass base(Appearflags) size(-16 -16 -36, 16 16 36) color(0 255 0) = PlayerClass []
+
+@BaseClass base(Target, Targetname, RenderFields) color(0 200 200) = Monster 
+[
+	TriggerTarget(String) : "TriggerTarget"
+      TriggerCondition(Choices) : "Trigger Condition" : 0 =
+	[
+		0 : "No Trigger"
+		1 : "See Player, Mad at Player"
+		2 : "Take Damage"
+		3 : "50% Health Remaining"
+		4 : "Death"
+		7 : "Hear World"
+		8 : "Hear Player"
+		9 : "Hear Combat"
+		10: "See Player Unconditional"
+		11: "See Player, Not In Combat"
+	]
+	spawnflags(Flags) = 
+	[
+		1 : "WaitTillSeen" 	: 0
+		2 : "Gag"		: 0
+		4 : "MonsterClip"	: 0
+		16: "Prisoner"		: 0
+		128: "WaitForScript" 	: 0
+		256: "Pre-Disaster" 	: 0
+		512: "Fade Corpse"	: 0
+	]
+]
+
+@BaseClass = TalkMonster
+[
+	UseSentence(String) : "Use Sentence"
+	UnUseSentence(String) : "Un-Use Sentence"
+]
+
+@BaseClass size(-16 -16 -16, 16 16 16) = gibshooterbase
+[
+	targetname (target_source) : "Name"
+
+	// how many pieces to create
+	m_iGibs(integer) : "Number of Gibs" : 3
+	
+	// delay (in seconds) between shots. If 0, all gibs shoot at once.
+	delay(string) : "Delay between shots" : "0"
+
+	// how fast the gibs are fired
+	m_flVelocity(integer) : "Gib Velocity" : 200
+
+	// Course variance
+	m_flVariance(string) : "Course Variance" : "0.15"
+
+	// Time in seconds for gibs to live +/- 5%
+	m_flGibLife(string) : "Gib Life" : "4"
+
+	spawnflags(Flags) = 
+	[
+		1 : "Repeatable" 	: 0
+	]
+]
+
+@BaseClass = Light 
+[
+	_light(color255) : "Brightness" : "255 255 128 200"
+      style(Choices) : "Appearance" : 0 =
+	[
+		0 : "Normal"
+		10: "Fluorescent flicker"
+		2 : "Slow, strong pulse"
+		11: "Slow pulse, noblack"
+		5 : "Gentle pulse"
+		1 : "Flicker A"
+		6 : "Flicker B"
+		3 : "Candle A"
+		7 : "Candle B"
+		8 : "Candle C"
+		4 : "Fast strobe"
+		9 : "Slow strobe"
+	]
+	pattern(string) : "Custom Appearance"
+	_fade(integer) : "Fade (ZHLT)"
+	_falloff(integer) : "Falloff 1-2 (ZHLT)"
+]
+
+@BaseClass base(Targetname,Global) = Breakable
+[
+	target(target_destination) : "Target on break"
+	health(integer) : "Strength" : 1
+	material(choices) :"Material type" : 0 =
+	[
+		0: "Glass"
+		1: "Wood"
+		2: "Metal"
+		3: "Flesh"
+		4: "Cinder Block"  
+		5: "Ceiling Tile"
+		6: "Computer"
+		7: "Unbreakable Glass"
+		8: "Rocks"
+	]
+	explosion(choices) : "Gibs Direction" : 0 =
+	[
+		0: "Random"
+		1: "Relative to Attack"
+	]
+	delay(string) : "Delay before fire" : "0"
+	gibmodel(studio) : "Gib Model" : ""
+	spawnobject(choices) : "Spawn On Break" : 0 =
+	[
+		0: "Nothing"
+		1: "Battery"
+		2: "Healthkit"
+		3: "9mm Handgun"
+		4: "9mm Clip"
+		5: "Machine Gun"
+		6: "Machine Gun Clip"
+		7: "Machine Gun Grenades"
+		8: "Shotgun"
+		9: "Shotgun Shells"
+		10: "Crossbow"
+		11: "Crossbow Bolts"
+		12: "357"
+		13: "357 clip"
+		14: "RPG"
+		15: "RPG Clip"
+		16: "Gauss clip"
+		17: "Hand grenade"
+		18: "Tripmine"
+		19: "Satchel Charge"
+		20: "Snark"
+		21: "Hornet Gun"
+	]
+	explodemagnitude(integer) : "Explode Magnitude (0=none)" : 0
+]
+
+@BaseClass base(Appearflags, Targetname, RenderFields, Global) = Door
+[
+	killtarget(target_destination) : "KillTarget"
+	speed(integer) : "Speed" : 100
+	master(string) : "Master" 
+	movesnd(choices) : "Move Sound" : 0 = 
+	[
+		0: "No Sound"
+		1: "Servo (Sliding)"
+		2: "Pneumatic (Sliding)"
+		3: "Pneumatic (Rolling)"
+		4: "Vacuum"
+		5: "Power Hydraulic"
+		6: "Large Rollers"
+		7: "Track Door"
+		8: "Snappy Metal Door"
+		9: "Squeaky 1"
+		10: "Squeaky 2"
+	]
+	stopsnd(choices) : "Stop Sound" : 0 = 
+	[
+		0: "No Sound"
+		1: "Clang with brake"
+		2: "Clang reverb"
+		3: "Ratchet Stop"
+		4: "Chunk"
+		5: "Light airbrake"
+		6: "Metal Slide Stop"
+		7: "Metal Lock Stop"
+		8: "Snappy Metal Stop"
+	]
+	wait(integer) : "delay before close, -1 stay open " : 4
+	lip(integer) : "Lip"
+	dmg(integer) : "Damage inflicted when blocked" : 0
+	message(string) : "Message if triggered"
+	target(target_destination) : "Target"
+	delay(integer) : "Delay before fire" 
+	netname(string) : "Fire on Close"
+	health(integer) : "Health (shoot open)" : 0
+	spawnflags(flags) =
+	[
+		1 : "Starts Open" : 0
+		4 : "Don't link" : 0
+		8: "Passable" : 0
+	    	32: "Toggle" : 0
+		256:"Use Only" : 0
+		512: "Monsters Can't" : 0
+
+		// These flags were going to go in, but are currently implemented.
+		// You can make a door invisible on the ground by using a func_seethrough and setting player alpha to 0
+		//1024: "Fade for commander" : 0
+		//2048: "Invisible from ground" : 0
+	]
+	// NOTE: must be duplicated in BUTTON
+	locked_sound(choices) : "Locked Sound" : 0 = 
+	[
+		0: "None"
+		2: "Access Denied"
+		8: "Small zap"
+		10: "Buzz"
+		11: "Buzz Off"
+		12: "Latch Locked"
+	]
+	unlocked_sound(choices) : "Unlocked Sound" : 0 = 
+	[
+		0: "None"
+		1: "Big zap & Warmup"
+		3: "Access Granted"
+		4: "Quick Combolock"
+		5: "Power Deadbolt 1"
+		6: "Power Deadbolt 2"
+		7: "Plunger"
+		8: "Small zap"
+		9: "Keycard Sound"
+		10: "Buzz"
+		13: "Latch Unlocked"
+	]
+	locked_sentence(choices) : "Locked Sentence" : 0 = 
+	[
+		0: "None"
+		1: "Gen. Access Denied"
+		2: "Security Lockout"
+		3: "Blast Door"
+		4: "Fire Door"
+		5: "Chemical Door"
+		6: "Radiation Door"
+		7: "Gen. Containment"
+		8: "Maintenance Door"
+		9: "Broken Shut Door"
+	]
+	unlocked_sentence(choices) : "Unlocked Sentence" : 0 = 
+	[
+		0: "None"
+		1: "Gen. Access Granted"
+		2: "Security Disengaged"
+		3: "Blast Door"
+		4: "Fire Door"
+		5: "Chemical Door"
+		6: "Radiation Door"
+		7: "Gen. Containment"
+		8: "Maintenance area"
+	]	
+	_minlight(string) : "Minimum light level"
+]
+
+@BaseClass base(Targetname, Target, RenderFields, Global) = BaseTank
+[
+	spawnflags(flags) =
+	[
+		1 : "Active" : 0
+		16: "Only Direct" : 0
+		32: "Controllable" : 0
+	]
+
+	// Mainly for use with 1009 team settings (game_team_master)
+	master(string) : "(Team) Master" 
+
+	yawrate(string) : "Yaw rate" : "30"
+	yawrange(string) : "Yaw range" : "180"
+	yawtolerance(string) : "Yaw tolerance" : "15"
+	pitchrate(string) : "Pitch rate" : "0"
+	pitchrange(string) : "Pitch range" : "0"
+	pitchtolerance(string) : "Pitch tolerance" : "5"
+	barrel(string) : "Barrel Length" : "0"
+	barrely(string) : "Barrel Horizontal" : "0"
+	barrelz(string) : "Barrel Vertical" : "0"
+	spritesmoke(string) : "Smoke Sprite" : ""
+	spriteflash(string) : "Flash Sprite" : ""
+	spritescale(string) : "Sprite scale" : "1"
+	rotatesound(sound) : "Rotate Sound" : ""
+	firerate(string) : "Rate of Fire" : "1"
+	bullet_damage(string) : "Damage Per Bullet" : "0"
+	persistence(string) : "Firing persistence" : "1"
+	firespread(choices) : "Bullet accuracy" : 0 =
+	[
+		0: "Perfect Shot"
+		1: "Small cone"
+		2: "Medium cone"
+		3: "Large cone"
+		4: "Extra-large cone"
+	]
+	minRange(string) : "Minmum target range" : "0"
+	maxRange(string) : "Maximum target range" : "0"
+	_minlight(string) : "Minimum light level"
+]
+
+@BaseClass = PlatSounds 
+[
+	movesnd(choices) : "Move Sound" : 0 = 
+	[
+		0: "No Sound"
+		1: "big elev 1"
+		2: "big elev 2"
+		3: "tech elev 1"
+		4: "tech elev 2"
+		5: "tech elev 3"
+		6: "freight elev 1"
+		7: "freight elev 2"
+		8: "heavy elev"
+		9: "rack elev"
+		10: "rail elev"
+		11: "squeek elev"
+		12: "odd elev 1"
+		13: "odd elev 2"
+	]
+	stopsnd(choices) : "Stop Sound" : 0 = 
+	[
+		0: "No Sound"
+		1: "big elev stop1"
+		2: "big elev stop2"
+		3: "freight elev stop"
+		4: "heavy elev stop"
+		5: "rack stop"
+		6: "rail stop"
+		7: "squeek stop"
+		8: "quick stop"
+	]
+	volume(string) : "Sound Volume 0.0 - 1.0" : "0.85"
+]
+
+@BaseClass base(Targetname, RenderFields, Global, PlatSounds) = Trackchange
+[
+	height(integer) : "Travel altitude" : 0
+	spawnflags(flags) =
+	[
+		1: "Auto Activate train" : 0
+		2: "Relink track" : 0
+		8: "Start at Bottom" : 0
+		16: "Rotate Only" : 0
+		64: "X Axis" : 0
+		128: "Y Axis" : 0
+	]
+	rotation(integer) : "Spin amount" : 0
+	train(target_destination) : "Train to switch"
+	toptrack(target_destination) : "Top track"
+	bottomtrack(target_destination) : "Bottom track"
+	speed(integer) : "Move/Rotate speed" : 0
+]
+
+@BaseClass base(Target, Targetname) = Trigger
+[
+	killtarget(target_destination) : "Kill target"
+	netname(target_destination) : "Target Path"
+	master(string) : "Master" 
+	sounds(choices) : "Sound style" : 0 =
+	[
+		0 : "No Sound"
+	]
+	delay(string) : "Delay before trigger" : "0"
+	message(string) : "Message (set sound too!)"
+	spawnflags(flags) = 
+	[
+		1: "Monsters" : 0
+		2: "No Clients" : 0
+		4: "Pushables": 0
+	]
+]
+
+@BaseClass = Angles [
+	angles(string) : "Pitch Yaw Roll (Y Z X)" : "0 0 0" 
+]
+
+@BaseClass = ZHLTLightFlags [
+	zhlt_lightflags(choices) :"Light Flags (Zhlt 2.2+)" : 0 = [
+		0: "Normal"
+		1: "Embedded Fix"
+		2: "Opaque (Blocks Light)"
+		3: "Opaque + Embedded Fix"
+	]
+	light_origin(string) : "Light Origin (Zhlt 2.2+)"
+	zhlt_customshadow(string) : "Custom Shadow (MHLT)" : "0.0 0.0 0.0"
+]
+
+//
+// Entities
+//
+
+@PointClass iconsprite("sprites/speaker.spr") base(Targetname) = ambient_generic : "Universal Ambient"
+[
+	message(sound) : "WAV Name"
+	health(integer) : "Volume (10 = loudest)" : 10
+	preset(choices) :"Dynamic Presets" : 0 =
+	[
+		0: "None"
+		1: "Huge Machine"
+		2: "Big Machine"
+		3: "Machine"
+		4: "Slow Fade in"  
+		5: "Fade in"
+		6: "Quick Fade in"
+		7: "Slow Pulse"
+		8: "Pulse"
+		9: "Quick pulse"
+		10: "Slow Oscillator"
+		11: "Oscillator"
+		12: "Quick Oscillator"
+		13: "Grunge pitch"
+		14: "Very low pitch"
+		15: "Low pitch"
+		16: "High pitch"
+		17: "Very high pitch"
+		18: "Screaming pitch"
+		19: "Oscillate spinup/down"
+		20: "Pulse spinup/down"
+		21: "Random pitch"
+		22: "Random pitch fast"
+		23: "Incremental Spinup"
+		24: "Alien"
+		25: "Bizzare"
+		26: "Planet X"
+		27: "Haunted"
+	]
+	volstart(integer) : "Start Volume" : 0
+	fadein(integer) : "Fade in time (0-100)" : 0
+	fadeout(integer) : "Fade out time (0-100)" : 0
+	pitch(integer) : "Pitch (> 100 = higher)" : 100
+	pitchstart(integer) : "Start Pitch" : 100
+	spinup(integer) : "Spin up time (0-100)" : 0
+	spindown(integer) : "Spin down time (0-100)" : 0
+	lfotype(integer) : "LFO type 0)off 1)sqr 2)tri 3)rnd" : 0
+	lforate(integer) : "LFO rate (0-1000)" : 0
+	lfomodpitch(integer) : "LFO mod pitch (0-100)" : 0
+	lfomodvol(integer) : "LFO mod vol (0-100)" : 0
+	cspinup(integer) : "Incremental spinup count" : 0
+	spawnflags(flags) =
+	[
+		1: "Play Everywhere" : 0
+		2: "Small Radius" : 0
+		4: "Medium Radius" : 1
+		8: "Large Radius" : 0
+		16:"Start Silent":0
+		32:"Is NOT Looped":0
+	]
+]
+
+@SolidClass base(Target) = button_target : "Target Button"
+[
+	spawnflags(flags) =
+	[
+		1: "Use Activates" : 1
+		2: "Start On" : 0
+	]
+	master(string) : "Master" 
+	renderfx(choices) :"Render FX" : 0 =
+	[
+		0: "Normal"
+		1: "Slow Pulse"
+		2: "Fast Pulse"
+		3: "Slow Wide Pulse"
+		4: "Fast Wide Pulse"
+		9: "Slow Strobe"
+		10: "Fast Strobe"
+		11: "Faster Strobe"
+		12: "Slow Flicker"
+		13: "Fast Flicker"
+		5: "Slow Fade Away"
+		6: "Fast Fade Away"
+		7: "Slow Become Solid"
+		8: "Fast Become Solid"
+		14: "Constant Glow"
+		15: "Distort"
+		16: "Hologram (Distort + fade)"
+	]
+	rendermode(choices) : "Render Mode" : 0 =
+	[
+		0: "Normal"
+		1: "Color"
+		2: "Texture"
+		3: "Glow"
+		4: "Solid"
+		5: "Additive"
+	]
+	renderamt(integer) : "FX Amount (1 - 255)"
+	rendercolor(color255) : "FX Color (R G B)" : "0 0 0"
+]
+
+
+//
+// cyclers
+//
+
+@PointClass base(Targetname, Angles) size(-16 -16 0, 16 16 72) studio() = cycler : "Monster Cycler" 
+[
+	model(studio) : "Model"
+	renderfx(choices) :"Render FX" : 0 =
+	[
+		0: "Normal"
+		1: "Slow Pulse"
+		2: "Fast Pulse"
+		3: "Slow Wide Pulse"
+		4: "Fast Wide Pulse"
+		9: "Slow Strobe"
+		10: "Fast Strobe"
+		11: "Faster Strobe"
+		12: "Slow Flicker"
+		13: "Fast Flicker"
+		5: "Slow Fade Away"
+		6: "Fast Fade Away"
+		7: "Slow Become Solid"
+		8: "Fast Become Solid"
+		14: "Constant Glow"
+		15: "Distort"
+		16: "Hologram (Distort + fade)"
+	]
+	rendermode(choices) : "Render Mode" : 0 =
+	[
+		0: "Normal"
+		1: "Color"
+		2: "Texture"
+		3: "Glow"
+		4: "Solid"
+		5: "Additive"
+	]
+	renderamt(integer) : "FX Amount (1 - 255)"
+	rendercolor(color255) : "FX Color (R G B)" : "0 0 0"
+]
+
+@PointClass base(Targetname, Angles) sprite() = cycler_sprite : "Sprite Cycler" 
+[
+	model(sprite) : "Sprite"
+	framerate(integer) : "Frames per second" : 10
+	renderfx(choices) :"Render FX" : 0 =
+	[
+		0: "Normal"
+		1: "Slow Pulse"
+		2: "Fast Pulse"
+		3: "Slow Wide Pulse"
+		4: "Fast Wide Pulse"
+		9: "Slow Strobe"
+		10: "Fast Strobe"
+		11: "Faster Strobe"
+		12: "Slow Flicker"
+		13: "Fast Flicker"
+		5: "Slow Fade Away"
+		6: "Fast Fade Away"
+		7: "Slow Become Solid"
+		8: "Fast Become Solid"
+		14: "Constant Glow"
+		15: "Distort"
+		16: "Hologram (Distort + fade)"
+	]
+	rendermode(choices) : "Render Mode" : 0 =
+	[
+		0: "Normal"
+		1: "Color"
+		2: "Texture"
+		3: "Glow"
+		4: "Solid"
+		5: "Additive"
+	]
+	renderamt(integer) : "FX Amount (1 - 255)"
+	rendercolor(color255) : "FX Color (R G B)" : "0 0 0"
+]
+
+@PointClass base(Monster, Angles) size(-16 -16 -16, 16 16 16) studio() = cycler_weapon : "Weapon Cycler" 
+[
+	model(studio) : "model"
+]
+
+//
+// Environmental effects
+//
+
+@BaseClass = BeamStartEnd 
+[
+	LightningStart(target_destination) : "Start Entity" 
+	LightningEnd(target_destination) : "Ending Entity" 
+]
+@PointClass base(Targetname, BeamStartEnd, RenderFxChoices) size(-16 -16 -16, 16 16 16) = env_beam : "Energy Beam Effect"
+[
+	renderamt(integer) : "Brightness (1 - 255)" : 100
+	rendercolor(color255) : "Beam Color (R G B)" : "0 0 0"
+	Radius(integer) : "Radius" : 256
+	life(string) : "Life (seconds 0 = infinite)" : "1"
+	BoltWidth(integer) : "Width of beam (pixels*0.1 0-255)" : 20
+	NoiseAmplitude(integer) : "Amount of noise (0-255)" : 0
+	texture(sprite) : "Sprite Name" : "sprites/laserbeam.spr"
+	TextureScroll(integer) : "Texture Scroll Rate (0-100)" : 35
+	framerate(integer) : "Frames per 10 seconds" : 0
+	framestart(integer) : "Starting Frame" : 0
+	StrikeTime(string) : "Strike again time (secs)" : "1"
+	damage(string) : "Damage / second" : "0"
+	spawnflags(flags) = 
+	[
+		1 : "Start On" : 0
+		2 : "Toggle" : 0
+		4 : "Random Strike" : 0
+		8 : "Ring" : 0
+		16: "StartSparks" : 0
+		32: "EndSparks" : 0
+		64: "Decal End" : 0
+		128: "Shade Start" : 0
+		256: "Shade End" : 0
+	]
+]
+
+@SolidClass base(Targetname) = env_bubbles : "Bubble Volume" 
+[
+	density(integer) : "Bubble density" : 2
+	frequency(integer) : "Bubble frequency" : 2
+	current(integer) : "Speed of Current" : 0
+	spawnflags(Flags) = 
+	[
+		1 : "Start Off" 	: 0
+	]
+]
+
+@PointClass base(Targetname) size(-16 -16 -16, 16 16 16) = env_explosion : "Explosion" 
+[
+	iMagnitude(Integer) : "Magnitude" : 100
+	spawnflags(flags) =
+	[
+		1: "No Damage" : 0
+		2: "Repeatable" : 0
+		4: "No Fireball" : 0
+		8: "No Smoke" : 0
+		16: "No Decal" : 0
+		32: "No Sparks" : 0
+	]
+]
+
+@PointClass base(Targetname) color(255 255 128) = env_global : "Global State"
+[
+	globalstate(string) : "Global State to Set"
+	triggermode(choices) : "Trigger Mode" : 0 =
+	[
+		0 : "Off"
+		1 : "On"
+		2 : "Dead"
+		3 : "Toggle"
+	]
+	initialstate(choices) : "Initial State" : 0 =
+	[
+		0 : "Off"
+		1 : "On"
+		2 : "Dead"
+	]
+	spawnflags(flags) =
+	[
+		1 : "Set Initial State" : 0
+	]
+]
+
+@PointClass sprite() base(Targetname, RenderFields) size(-4 -4 -4, 4 4 4) color(30 100 0) = env_glow : "Light Glow/Haze" 
+[
+	model(sprite) : "Sprite Name" : "sprites/glow01.spr"
+	scale(integer) : "Scale" : 1
+]
+
+@PointClass base(Targetname) = env_fade : "Screen Fade" 
+[
+	spawnflags(flags) =
+	[
+		1: "Fade From" : 0
+		2: "Modulate" : 0
+		4: "Activator Only" : 0
+	]
+	duration(string) : "Duration (seconds)" : "2"
+	holdtime(string) : "Hold Fade (seconds)" : "0"
+	renderamt(integer) : "Fade Alpha" : 255
+	rendercolor(color255) : "Fade Color (R G B)" : "0 0 0"
+]
+
+@PointClass base(Targetname, RenderFxChoices) size(-16 -16 -16, 16 16 16) = env_laser : "Laser Beam Effect"
+[
+	LaserTarget(target_destination) : "Target of Laser" 
+	renderamt(integer) : "Brightness (1 - 255)" : 100
+	rendercolor(color255) : "Beam Color (R G B)" : "0 0 0"
+	width(integer) : "Width of beam (pixels*0.1 0-255)" : 20
+	NoiseAmplitude(integer) : "Amount of noise (0-255)" : 0
+	texture(sprite) : "Sprite Name" : "sprites/laserbeam.spr"
+	EndSprite(sprite) : "End Sprite" : ""
+	TextureScroll(integer) : "Texture Scroll Rate (0-100)" : 35
+	framestart(integer) : "Starting Frame" : 0
+	damage(string) : "Damage / second" : "100"
+	spawnflags(flags) = 
+	[
+		1 : "Start On" : 0
+		16: "StartSparks" : 0
+		32: "EndSparks" : 0
+		64: "Decal End" : 0
+	]
+]
+
+@PointClass base(Targetname, Target) = env_message : "HUD Text Message" 
+[
+	message(string) : "Message Name"
+	spawnflags(flags) =
+	[
+		1: "Play Once" : 0
+		2: "All Clients" : 0
+	]
+	messagesound(sound) : "Sound Effect"
+	messagevolume(string) : "Volume 0-10" : "10"
+	messageattenuation(Choices) : "Sound Radius" : 0 =
+	[
+		0 : "Small Radius"
+		1 : "Medium Radius"
+		2 : "Large  Radius"
+		3 : "Play Everywhere"
+	]
+]
+
+@PointClass base(Targetname, Target, RenderFields) size(-16 -16 -16, 16 16 16) color(100 100 0) = env_render : "Render Controls"
+[
+	spawnflags(flags) =
+	[
+		1: "No Renderfx" : 0
+		2: "No Renderamt" : 0
+		4: "No Rendermode" : 0
+		8: "No Rendercolor" : 0
+	]
+]
+
+@PointClass base(Targetname) = env_shake : "Screen Shake" 
+[
+	spawnflags(flags) =
+	[
+		1: "GlobalShake" : 0
+	]
+	amplitude(string) : "Amplitude 0-16" : "4"
+	radius(string) : "Effect radius" : "500"
+	duration(string) : "Duration (seconds)" : "1"
+	frequency(string) : "0.1 = jerk, 255.0 = rumble" : "2.5"
+]
+
+@PointClass base(gibshooterbase, RenderFields) size(-16 -16 -16, 16 16 16) = env_shooter : "Model Shooter"
+[
+	shootmodel(studio) : "Model or Sprite name" : ""
+	shootsounds(choices) :"Material Sound" : -1 =
+	[
+		-1: "None"
+		0: "Glass"
+		1: "Wood"
+		2: "Metal"
+		3: "Flesh"
+		4: "Concrete"  
+	]
+	scale(string) : "Gib Sprite Scale" : ""
+	skin(integer) : "Gib Skin" : 0
+]
+
+@PointClass iconsprite("sprites/speaker.spr") = env_sound : "DSP Sound" 
+[
+	radius(integer) : "Radius" : 128
+	roomtype(Choices) : "Room Type" : 0 =
+	[
+		0 : "Normal (off)"
+		1 : "Generic"
+		
+		2 : "Metal Small"
+		3 : "Metal Medium"
+		4 : "Metal Large"
+	
+		5 : "Tunnel Small"
+		6 : "Tunnel Medium"
+		7 : "Tunnel Large"
+	
+		8 : "Chamber Small"
+		9 : "Chamber Medium"
+		10: "Chamber Large"
+
+		11: "Bright Small"
+		12: "Bright Medium"
+		13: "Bright Large"
+
+		14: "Water 1"
+		15: "Water 2"
+		16: "Water 3"
+
+		17: "Concrete Small"
+		18: "Concrete Medium"
+		19: "Concrete Large"
+
+		20: "Big 1"
+		21: "Big 2"
+		22: "Big 3"
+
+		23: "Cavern Small"
+		24: "Cavern Medium"
+		25: "Cavern Large"
+
+		26: "Weirdo 1"
+		27: "Weirdo 2"
+		28: "Weirdo 3"
+	]
+]
+
+@PointClass base(Targetname) size(-16 -16 -16, 16 16 16) = env_spark : "Spark" 
+[
+	MaxDelay(string) : "Max Delay" : "0"
+	spawnflags(flags) =
+	[
+		32: "Toggle" : 0
+		64: "Start ON" : 0
+	]
+]
+
+@PointClass sprite() base(Targetname, RenderFields) size(-4 -4 -4, 4 4 4) = env_sprite : "Sprite Effect" 
+[
+	framerate(string) : "Framerate" : "10.0"
+	model(sprite) : "Sprite Name" : "sprites/glow01.spr"
+	scale(string) : "Scale" : ""
+	spawnflags(flags) =
+	[
+		1: "Start on" : 0
+		2: "Play Once" : 0
+	]
+]
+
+//
+// Solid Entities
+//
+
+@SolidClass base(Breakable, RenderFields, ZHLTLightFlags) = func_breakable : "Breakable Object" 
+[
+	spawnflags(flags) =
+	[
+		1 : "Only Trigger" : 0
+		2 : "Touch"	   : 0
+		4 : "Pressure"     : 0
+		256: "Instant Crowbar" : 1
+	]
+	_minlight(string) : "Minimum light level"
+]
+
+@SolidClass base(Global,Targetname, Target, RenderFields, ZHLTLightFlags, Angles) = func_button : "Button" 
+[
+	speed(integer) : "Speed" : 5
+	health(integer) : "Health (shootable if > 0)"
+	lip(integer) : "Lip"
+	master(string) : "Master" 
+	sounds(choices) : "Sounds" : 0 = 
+	[
+		0: "None"
+		1: "Big zap & Warmup"
+		2: "Access Denied"
+		3: "Access Granted"
+		4: "Quick Combolock"
+		5: "Power Deadbolt 1"
+		6: "Power Deadbolt 2"
+		7: "Plunger"
+		8: "Small zap"
+		9: "Keycard Sound"
+		10: "Buzz"
+		11: "Buzz Off"
+		14: "Lightswitch"
+	]
+	wait(integer) : "delay before reset (-1 stay)" : 3
+	delay(string) : "Delay before trigger" : "0"
+	spawnflags(flags) =
+	[
+		1: "Don't move" : 0
+		32: "Toggle" : 0
+		64: "Sparks" : 0
+		256:"Touch Activates": 0
+	]
+	locked_sound(choices) : "Locked Sound" : 0 = 
+	[
+		0: "None"
+		2: "Access Denied"
+		8: "Small zap"
+		10: "Buzz"
+		11: "Buzz Off"
+		12: "Latch Locked"
+	]
+	unlocked_sound(choices) : "Unlocked Sound" : 0 = 
+	[
+		0: "None"
+		1: "Big zap & Warmup"
+		3: "Access Granted"
+		4: "Quick Combolock"
+		5: "Power Deadbolt 1"
+		6: "Power Deadbolt 2"
+		7: "Plunger"
+		8: "Small zap"
+		9: "Keycard Sound"
+		10: "Buzz"
+		13: "Latch Unlocked"
+		14: "Lightswitch"
+	]
+	locked_sentence(choices) : "Locked Sentence" : 0 = 
+	[
+		0: "None"
+		1: "Gen. Access Denied"
+		2: "Security Lockout"
+		3: "Blast Door"
+		4: "Fire Door"
+		5: "Chemical Door"
+		6: "Radiation Door"
+		7: "Gen. Containment"
+		8: "Maintenance Door"
+		9: "Broken Shut Door"
+	]
+	unlocked_sentence(choices) : "Unlocked Sentence" : 0 = 
+	[
+		0: "None"
+		1: "Gen. Access Granted"
+		2: "Security Disengaged"
+		3: "Blast Door"
+		4: "Fire Door"
+		5: "Chemical Door"
+		6: "Radiation Door"
+		7: "Gen. Containment"
+		8: "Maintenance area"
+	]
+	_minlight(string) : "Minimum light level"
+	style(choices) : "Texlight style" : 0 =
+	[
+		0 : "Normal"
+		-3: "Grouped"
+		10: "Fluorescent flicker"
+		2 : "Slow, strong pulse"
+		11: "Slow pulse, noblack"
+		5 : "Gentle pulse"
+		1 : "Flicker A"
+		6 : "Flicker B"
+		3 : "Candle A"
+		7 : "Candle B"
+		8 : "Candle C"
+		4 : "Fast strobe"
+		9 : "Slow strobe"
+		12: "Underwater"
+	]
+] 
+
+@SolidClass base(Global,RenderFields, Targetname, ZHLTLightFlags) = func_conveyor : "Conveyor Belt" 
+[
+	spawnflags(flags) =
+	[
+		1 : "No Push" : 0
+		2 : "Not Solid" : 0
+	]
+	speed(string) : "Conveyor Speed" : "100"
+	_minlight(string) : "Minimum light level"
+]
+
+@SolidClass base(Door, ZHLTLightFlags, Angles) = func_door : "Basic door" []
+
+@SolidClass base(Door, ZHLTLightFlags) = func_door_rotating : "Rotating door" 
+[
+	spawnflags(flags) =
+	[
+		2 : "Reverse Dir" : 0
+		16: "One-way" : 0
+		64: "X Axis" : 0
+		128: "Y Axis" : 0
+	]
+	distance(integer) : "Distance (deg)" : 90
+	angles(string) : "Pitch Yaw Roll (Y Z X)" : "0 0 0"
+]
+
+@SolidClass base(Appearflags, RenderFields) = func_friction : "Surface with a change in friction" 
+[
+	modifier(integer) : "Percentage of standard (0 - 100)" : 15
+]
+
+@SolidClass base(Targetname, RenderFields, Global, ZHLTLightFlags) = func_guntarget : "Moving platform" 
+[
+	speed(integer) : "Speed (units per second)" : 100
+	target(target_source) : "First stop target"
+	message(target_source) : "Fire on damage"
+	health(integer) : "Damage to Take" : 0
+	_minlight(string) : "Minimum light level"
+]
+
+@SolidClass base(Targetname, RenderFields, ZHLTLightFlags) = func_illusionary : "Fake Wall/Light" 
+[
+	//commanderAlpha(string) : "Alpha for commander (0-255)" : "0"
+	//playerAlpha(string) : "Alpha for players (0-255)" : "255"
+
+	skin(choices) : "Contents" : -1 =
+	[
+		-1: "Empty"
+		-7: "Volumetric Light"
+	]
+	_minlight(string) : "Minimum light level"
+
+	spawnflags(flags) =
+	[
+		1: "Invis from top down" : 0
+		2: "Invis from ground" : 0
+	]
+	style(choices) : "Texlight style" : 0 =
+	[
+		0 : "Normal"
+		-3: "Grouped"
+		10: "Fluorescent flicker"
+		2 : "Slow, strong pulse"
+		11: "Slow pulse, noblack"
+		5 : "Gentle pulse"
+		1 : "Flicker A"
+		6 : "Flicker B"
+		3 : "Candle A"
+		7 : "Candle B"
+		8 : "Candle C"
+		4 : "Fast strobe"
+		9 : "Slow strobe"
+		12: "Underwater"
+	]
+]
+
+@SolidClass base(Targetname) = func_ladder : "Ladder" []
+
+@SolidClass base(Targetname) = func_mortar_field : "Mortar Field" 
+[
+	m_flSpread(integer) : "Spread Radius" : 64
+	m_iCount(integer) : "Repeat Count" : 1
+	m_fControl(Choices) : "Targeting" : 0 =
+	[
+		0 : "Random"
+		1 : "Activator"
+		2 : "Table"
+	]
+	m_iszXController(target_destination) : "X Controller"
+	m_iszYController(target_destination) : "Y Controller"
+]
+
+@SolidClass base(Global,Appearflags, Targetname, RenderFields, ZHLTLightFlags) = func_pendulum : "Swings back and forth" 
+[
+	speed(integer) : "Speed" : 100
+	distance(integer) : "Distance (deg)" : 90
+	damp(integer) : "Damping (0-1000)" : 0
+	dmg(integer) : "Damage inflicted when blocked" : 0
+	spawnflags(flags) =
+	[
+		1: "Start ON" : 0
+		8: "Passable" : 0
+		16: "Auto-return" : 0
+		64: "X Axis" : 0
+		128: "Y Axis" : 0
+	]
+
+	_minlight(integer) : "_minlight"
+	angles(string) : "Pitch Yaw Roll (Y Z X)" : "0 0 0"
+]
+
+@SolidClass base(Targetname,Global,RenderFields, PlatSounds, ZHLTLightFlags, Angles) = func_plat : "Elevator" 
+[
+	spawnflags(Flags) =
+	[
+		1: "Toggle" : 0
+	]
+	height(integer) : "Travel altitude (can be negative)" : 0
+	speed(integer) : "Speed" : 50
+	_minlight(string) : "Minimum light level"
+]	
+
+@SolidClass base(Targetname, Global, RenderFields, PlatSounds, ZHLTLightFlags) = func_platrot : "Moving Rotating platform" 
+[
+	spawnflags(Flags) =
+	[
+		1: "Toggle" : 1
+		64: "X Axis" : 0
+		128: "Y Axis" : 0
+	]
+	speed(integer) : "Speed of rotation" : 50
+	height(integer) : "Travel altitude (can be negative)" : 0
+	rotation(integer) : "Spin amount" : 0
+	angles(string) : "Pitch Yaw Roll (Y Z X)" : "0 0 0"
+	_minlight(string) : "Minimum light level"
+]
+
+@SolidClass base(Breakable, RenderFields, ZHLTLightFlags) = func_pushable : "Pushable object"
+[
+	size(choices) : "Hull Size" : 0 =
+	[
+		0: "Point size"
+		1: "Player size"
+		2: "Big Size"
+		3: "Player duck"
+	]
+	spawnflags(flags) =
+	[
+		128: "Breakable" : 0
+	]
+	friction(integer) : "Friction (0-400)" : 50
+	buoyancy(integer) : "Buoyancy" : 20
+	_minlight(string) : "Minimum light level"
+]
+
+@SolidClass base(Targetname, Global, RenderFields, ZHLTLightFlags) = func_rot_button : "RotatingButton" 
+[
+	target(target_destination) : "Targetted object"
+	// changetarget will change the button's target's TARGET field to the button's changetarget.
+	changetarget(target_destination) : "ChangeTarget Name"
+	master(string) : "Master" 
+	speed(integer) : "Speed" : 50
+	health(integer) : "Health (shootable if > 0)"
+	sounds(choices) : "Sounds" : 21 = 
+	[
+		21: "Squeaky"
+		22: "Squeaky Pneumatic"
+		23: "Ratchet Groan"
+		24: "Clean Ratchet"
+		25: "Gas Clunk"
+	]
+	wait(choices) : "Delay before reset" : 3 =
+	[
+		-1: "Stays pressed"
+	]
+	delay(string) : "Delay before trigger" : "0"
+	distance(integer) : "Distance (deg)" : 90
+	spawnflags(flags) =
+	[
+		1 : "Not solid" : 0
+		2 : "Reverse Dir" : 0
+		32: "Toggle" : 0
+		64: "X Axis" : 0
+		128: "Y Axis" : 0
+		256:"Touch Activates": 0
+	]
+	_minlight(integer) : "_minlight"
+	angles(string) : "Pitch Yaw Roll (Y Z X)" : "0 0 0"
+]
+
+@SolidClass base(Targetname, Global, RenderFields, ZHLTLightFlags) = func_rotating : "Rotating Object"
+[
+	speed(integer)	: "Rotation Speed" : 0
+	volume(integer) : "Volume (10 = loudest)" : 10
+	fanfriction(integer) : "Friction (0 - 100%)" : 20
+	sounds(choices) : "Fan Sounds" : 0 =
+	[
+		0 : "No Sound" 
+		1 : "Fast Whine"
+		2 : "Slow Rush"
+		3 : "Medium Rickety"
+		4 : "Fast Beating"
+		5 : "Slow Smooth"
+	]
+	message(sound) : "WAV Name"
+	spawnflags(flags) =
+	[
+		1 : "Start ON" 		: 0
+		2 : "Reverse Direction" : 0
+		4 : "X Axis" 		: 0
+		8 : "Y Axis" 		: 0
+		16: "Acc/Dcc"		: 0
+		32: "Fan Pain"		: 0
+		64: "Not Solid"		: 0
+		128: "Small Radius" : 0
+		256: "Medium Radius" : 0
+		512: "Large Radius" : 1	
+	]
+	_minlight(integer) : "_minlight"
+	angles(string) : "Pitch Yaw Roll (Y Z X)" : "0 0 0"
+	spawnorigin(string) : "X Y Z - Move here after lighting" : "0 0 0"
+	dmg(integer) : "Damage inflicted when blocked" : 0
+]
+
+@SolidClass base(BaseTank, ZHLTLightFlags) = func_tank : "Brush Gun Turret" 
+[
+	bullet(choices) : "Bullets" : 0 = 
+	[
+		0: "None"
+		1: "9mm"
+		2: "MP5"
+		3: "12mm"
+	]
+]
+
+@SolidClass base(ZHLTLightFlags) = func_tankcontrols : "Tank controls"
+[
+	target(target_destination) : "Tank entity name"
+]
+
+@SolidClass base(BaseTank, ZHLTLightFlags) = func_tanklaser : "Brush Laser Turret" 
+[
+	laserentity(target_source) : "env_laser Entity"
+]
+
+@SolidClass base(BaseTank, ZHLTLightFlags) = func_tankrocket : "Brush Rocket Turret" []
+
+
+@SolidClass base(BaseTank, ZHLTLightFlags) = func_tankmortar : "Brush Mortar Turret" 
+[
+	iMagnitude(Integer) : "Explosion Magnitude" : 100
+]
+
+@SolidClass base(Trackchange) = func_trackautochange : "Automatic track changing platform"
+[
+	_minlight(string) : "Minimum light level"
+]
+
+@SolidClass base(Trackchange) = func_trackchange : "Train track changing platform"
+[
+	_minlight(string) : "Minimum light level"
+]
+
+@SolidClass base(Targetname, Global, RenderFields, ZHLTLightFlags) = func_tracktrain : "Track Train" 
+[
+	spawnflags(flags) =
+	[
+		1 : "No Pitch (X-rot)" : 0
+		2 : "No User Control" : 0
+		8 : "Passable" : 0
+	]
+	target(target_destination) : "First stop target"
+	sounds(choices) : "Sound" : 0 =
+	[
+		0: "None"
+		1: "Rail 1"
+		2: "Rail 2"
+		3: "Rail 3"
+		4: "Rail 4"
+		5: "Rail 6"
+		6: "Rail 7"
+	]
+	wheels(integer) : "Distance between the wheels" : 50
+	height(integer) : "Height above track" : 4
+	startspeed(integer) : "Initial speed" : 0
+	speed(integer) : "Speed (units per second)" : 64
+	dmg(integer) : "Damage on crush" : 0	
+	volume(integer) : "Volume (10 = loudest)" : 10
+	bank(string) : "Bank angle on turns" : "0"
+	_minlight(string) : "Minimum light level"
+]
+
+@SolidClass = func_traincontrols : "Train Controls"
+[
+	target(target_destination) : "Train Name"
+]
+
+@SolidClass base(Targetname, Global, RenderFields, ZHLTLightFlags, Angles) = func_train : "Moving platform" 
+[
+	target(target_source) : "First stop target"
+	movesnd(choices) : "Move Sound" : 0 = 
+	[
+		0: "No Sound"
+		1: "big elev 1"
+		2: "big elev 2"
+		3: "tech elev 1"
+		4: "tech elev 2"
+		5: "tech elev 3"
+		6: "freight elev 1"
+		7: "freight elev 2"
+		8: "heavy elev"
+		9: "rack elev"
+		10: "rail elev"
+		11: "squeek elev"
+		12: "odd elev 1"
+		13: "odd elev 2"
+	]
+	stopsnd(choices) : "Stop Sound" : 0 = 
+	[
+		0: "No Sound"
+		1: "big elev stop1"
+		2: "big elev stop2"
+		3: "freight elev stop"
+		4: "heavy elev stop"
+		5: "rack stop"
+		6: "rail stop"
+		7: "squeek stop"
+		8: "quick stop"
+	]
+	speed(integer) : "Speed (units per second)" : 64
+	dmg(integer) : "Damage on crush" : 0
+	skin(integer) : "Contents" : 0
+	volume(string) : "Sound Volume 0.0 - 1.0" : "0.85"
+	spawnflags(flags) =
+	[
+		8 : "Not solid" : 0
+	]
+	_minlight(string) : "Minimum light level"
+]
+
+@SolidClass base(Targetname, Appearflags, RenderFields, Global, ZHLTLightFlags) = func_wall : "Wall" 
+[
+	_minlight(string) : "Minimum light level"
+	style(choices) : "Texlight style" : 0 =
+	[
+		0 : "Normal"
+		-3: "Grouped"
+		10: "Fluorescent flicker"
+		2 : "Slow, strong pulse"
+		11: "Slow pulse, noblack"
+		5 : "Gentle pulse"
+		1 : "Flicker A"
+		6 : "Flicker B"
+		3 : "Candle A"
+		7 : "Candle B"
+		8 : "Candle C"
+		4 : "Fast strobe"
+		9 : "Slow strobe"
+		12: "Underwater"
+	]
+]
+
+@SolidClass base(func_wall, ZHLTLightFlags) = func_wall_toggle : "Toggleable geometry" 
+[
+	spawnflags(flags) =
+	[
+		1 : "Starts Invisible" : 0
+	]
+]
+
+@SolidClass base(Door, Angles) = func_water : "Liquid" 
+[
+	spawnflags(flags) =
+	[
+		1 : "Starts Open" : 0
+		256:"Use Only" : 0
+	]
+	skin(choices) : "Contents" : -3 =
+	[
+		-3: "Water"
+		-4: "Slime"
+		-5: "Lava"
+	]
+	WaveHeight(string) : "Wave Height" : "3.2"
+]
+
+//
+// game entities (requires Half-Life 1.0.0.9)
+//
+
+@PointClass base(Targetname, Targetx) = game_counter : "Fires when it hits limit"
+[
+	spawnflags(flags) =
+	[
+		1: "Remove On fire" : 0
+		2: "Reset On fire" : 1
+	]
+	master(string) : "Master"
+	frags(integer) : "Initial Value" : 0
+	health(integer) : "Limit Value" : 10
+]
+
+@PointClass base(Targetname, Target) = game_counter_set : "Sets a game_counter"
+[
+	spawnflags(flags) =
+	[
+		1: "Remove On fire" : 0
+	]
+	master(string) : "Master"
+	frags(integer) : "New Value" : 10
+]
+
+@PointClass base(Targetname) = game_end : "End this multiplayer game" 
+[
+	master(string) : "Master" 
+]
+
+@PointClass base(Targetname) = game_player_equip : "Initial player equipment"
+[
+	spawnflags(flags) =
+	[
+		1: "Use Only" : 0
+	]
+	master(string) : "Team Master"
+]
+
+@PointClass base(Targetname) = game_player_hurt : "Hurts player who fires"
+[
+	dmg(string) : "Damage To Apply" : "999"
+	spawnflags(flags) =
+	[
+		1: "Remove On fire" : 0
+	]
+	master(string) : "Master" 
+]
+
+@PointClass base(Targetname) = game_player_team : "Allows player to change teams"
+[
+	spawnflags(flags) =
+	[
+		1 : "Remove On fire" : 0
+		2 : "Kill Player" : 0
+		4 : "Gib Player" : 0
+	]
+	target(string) : "game_team_master to use" 
+	master(string) : "Master"
+]
+
+@PointClass base(Targetname) = game_score : "Award/Deduct Points" 
+[
+	spawnflags(flags) =
+	[
+		1: "Allow Negative" : 0
+		2: "Team Points" : 0
+	]
+
+	points(integer) : "Points to add (+/-)" : 1
+	master(string) : "Master" 
+]
+
+@PointClass base(Targetname, Targetx) = game_team_master : "Team based master/relay"
+[
+	spawnflags(flags) =
+	[
+		1: "Remove On fire" : 0
+	]
+	triggerstate(choices) : "Trigger State" : 0 = 
+	[
+		0: "Off"
+		1: "On"
+		2: "Toggle"
+	]
+	teamindex(integer) : "Team Index (-1 = no team)" : -1
+	master(string) : "Master" 
+]
+
+@PointClass base(Targetname, Targetx) = game_team_set : "Sets team of team_master"
+[
+	spawnflags(flags) =
+	[
+		1: "Remove On fire" : 0
+	]
+	master(string) : "Master" 
+]
+
+@PointClass base(Targetname, Target) = game_text : "HUD Text Message" 
+[
+	spawnflags(flags) =
+	[
+		1: "All Players" : 0
+	]
+
+	message(string) : "Message Text"
+	x(string) : "X (0 - 1.0 = left to right) (-1 centers)" : "-1"
+	y(string) : "Y (0 - 1.0 = top to bottom) (-1 centers)" : "-1"
+	effect(Choices) : "Text Effect" : 0 =
+	[
+		0 : "Fade In/Out"
+		1 : "Credits"
+		2 : "Scan Out"
+	]
+	color(color255) : "Color1" : "100 100 100"
+	color2(color255) : "Color2" : "240 110 0"
+	fadein(string) : "Fade in Time (or character scan time)" : "1.5"
+	fadeout(string) : "Fade Out Time" : "0.5"
+	holdtime(string) : "Hold Time" : "1.2"
+	fxtime(string) : "Scan time (scan effect only)" : "0.25"
+	channel(choices) : "Text Channel" : 1 =
+	[
+		1 : "Channel 1"
+		2 : "Channel 2"
+		3 : "Channel 3" 
+		4 : "Channel 4"
+	]
+	master(string) : "Master" 
+]
+
+@SolidClass base(Targetname) = game_zone_player : "Player Zone brush"
+[
+	intarget(target_destination) : "Target for IN players"
+	outtarget(target_destination) : "Target for OUT players"
+	incount(target_destination) : "Counter for IN players"
+	outcount(target_destination) : "Counter for OUT players"
+	// master(string) : "Master" 
+]
+
+@PointClass base(gibshooterbase) = gibshooter : "Gib Shooter" []
+
+//
+// info entities
+//
+
+@PointClass decal() base(Targetname, Appearflags) = infodecal : "Decal"
+[
+	texture(decal)
+]
+
+@PointClass base(Targetname) size(-24 -24 0, 24 24 16) color(20 190 60) = info_bigmomma : "Big Mamma Node" 
+[
+	spawnflags(Flags) =
+	[
+		1 : "Run To Node" : 0
+		2 : "Wait Indefinitely" : 0
+	]
+	target(target_destination) : "Next node"
+	radius(string) : "Radius" : "0"
+	reachdelay(string) : "Wait after approach" : "0"
+	killtarget(target_destination) : "KillTarget"
+	reachtarget(target_destination) : "Fire on approach"
+	reachsequence(string) : "Sequence on approach" : ""
+	health(string) : "Health on approach" : ""
+	presequence(string) : "Sequence before approach" : ""
+]
+
+@PointClass base(Targetname) = info_null : "info_null (spotlight target)" []
+
+@PointClass base(PlayerClass, Angles) size(-32 -32 -54, 32 32 54) studio("models/player/soldier/soldier.mdl") = info_player_start : "Ready room start" []
+
+@PointClass base(Targetname) size(-4 -4 -4, 4 4 4) color(200 100 50) = info_target : "Beam Target" []
+@PointClass size(-8 -8 0, 8 8 16) base(PlayerClass, Targetname) = info_teleport_destination : "Teleport destination" []
+
+//
+// lights
+//
+
+@PointClass iconsprite("sprites/lightbulb.spr") base(Target, Targetname, Light) = light : "Invisible lightsource"
+[
+	spawnflags(Flags) = [ 1 : "Initially dark" : 0 ]
+]
+
+@PointClass iconsprite("sprites/lightbulb.spr") base(Targetname, Target, Angles) = light_spot : "Spotlight" 
+[
+	_cone(integer) : "Inner (bright) angle" : 30
+	_cone2(integer) : "Outer (fading) angle" : 45
+	pitch(integer) : "Pitch" : -90
+	_light(color255) : "Brightness" : "255 255 128 200"
+	_sky(Choices) : "Is Sky" : 0 = 
+	[ 
+		0 : "No"
+		1 : "Yes"
+	]
+	spawnflags(Flags) = [ 1 : "Initially dark" : 0 ]
+      style(Choices) : "Appearance" : 0 =
+	[
+		0 : "Normal"
+		10: "Fluorescent flicker"
+		2 : "Slow, strong pulse"
+		11: "Slow pulse, noblack"
+		5 : "Gentle pulse"
+		1 : "Flicker A"
+		6 : "Flicker B"
+		3 : "Candle A"
+		7 : "Candle B"
+		8 : "Candle C"
+		4 : "Fast strobe"
+		9 : "Slow strobe"
+	]
+	pattern(string) : "Custom Appearance"
+]
+
+@PointClass base(Angles) iconsprite("sprites/lightbulb.spr") = light_environment : "Environment" 
+[
+	pitch(integer) : "Pitch" : 0
+	_light(color255) : "Brightness" : "255 255 128 200"
+	_fade(integer) : "Fade (ZHLT)"
+	_falloff(integer) : "Falloff 1-2 (ZHLT)"
+	_diffuse_light(color255) : "Diffuse Light (Leave Blank for None)" : ""
+]
+
+@SolidClass base(Door) = momentary_door : "Momentary/Continuous door" 
+[
+	spawnflags(flags) =
+	[
+		1 : "Starts Open" : 0
+	]
+]
+
+@SolidClass base(RenderFields, Targetname) = momentary_rot_button : "Direct wheel control" 
+[
+	target(target_destination) : "Targetted object"
+	speed(integer) : "Speed" : 50
+	master(string) : "Master" 
+	sounds(choices) : "Sounds" : 0 = 
+	[
+		0: "None"
+		1: "Big zap & Warmup"
+		2: "Access Denied"
+		3: "Access Granted"
+		4: "Quick Combolock"
+		5: "Power Deadbolt 1"
+		6: "Power Deadbolt 2"
+		7: "Plunger"
+		8: "Small zap"
+		9: "Keycard Sound"
+		21: "Squeaky"
+		22: "Squeaky Pneumatic"
+		23: "Ratchet Groan"
+		24: "Clean Ratchet"
+		25: "Gas Clunk"
+	]
+	distance(integer) : "Distance (deg)" : 90
+	returnspeed(integer) : "Auto-return speed" : 0
+	spawnflags(flags) =
+	[
+		1: "Door Hack" : 0
+		2: "Not useable" : 0
+		16: "Auto Return" : 0
+		64: "X Axis" : 0
+		128: "Y Axis" : 0
+	]
+	_minlight(integer) : "_minlight"
+	angles(string) : "Pitch Yaw Roll (Y Z X)" : "0 0 0"
+]
+
+@PointClass base(Targetname) color(255 128 0) = multi_manager : "MultiTarget Manager" 
+[
+	spawnflags(Flags) = 
+	[
+		1 : "multithreaded" : 0
+	]
+]
+
+@PointClass base(Targetname, Target) color(128 255 128) = multisource : "Multisource"
+[
+	globalstate(string) : "Global State Master"
+]
+
+@PointClass base(Targetname) size(16 16 16) color(247 181 82) = path_corner : "Moving platform stop"
+[
+	spawnflags(Flags) =
+	[
+		1: "Wait for retrigger" : 0
+		2: "Teleport" : 0
+		4: "Fire once" : 0
+	]
+	target(target_destination) : "Next stop target"
+	message(target_destination) : "Fire On Pass"
+	wait(integer) : "Wait here (secs)" : 0
+	speed(integer) : "New Train Speed" : 0
+	yaw_speed(integer) : "New Train rot. Speed" : 0
+	angles(string) : "X Y Z angles" 
+]
+
+@PointClass base(Targetname) size(16 16 16) = path_track : "Train Track Path"
+[
+	spawnflags(Flags) =
+	[
+		1: "Disabled" : 0
+		2: "Fire once" : 0
+		4: "Branch Reverse" : 0
+		8: "Disable train" : 0
+	]
+	target(target_destination) : "Next stop target"
+	message(target_destination) : "Fire On Pass"
+	altpath(target_destination) : "Branch Path"
+	netname(target_destination) : "Fire on dead end"
+	speed(integer) : "New Train Speed" : 0
+]
+
+//
+// Triggers
+//
+
+@PointClass base(Targetx) = trigger_auto : "AutoTrigger"
+[
+	spawnflags(Flags) =
+	[
+		1 : "Remove On fire" : 1
+	]
+	globalstate(string) : "Global State to Read"
+	triggerstate(choices) : "Trigger State" : 0 = 
+	[
+		0 : "Off"
+		1 : "On"
+		2 : "Toggle"
+	]
+]
+
+@PointClass base(Targetx, Targetname) = trigger_camera : "Trigger Camera" 
+[
+	wait(integer) : "Hold time" : 10
+	moveto(string) : "Path Corner"
+	spawnflags(flags) =
+	[
+		1: "Start At Player" : 1
+		2: "Follow Player" : 1
+		4: "Freeze Player" : 0
+	]
+	speed(string) : "Initial Speed" : "0"
+	acceleration(string) : "Acceleration units/sec^2" : "500"
+	deceleration(string) : "Stop Deceleration units/sec^2" : "500"
+]
+
+@PointClass base(Targetx, Targetname) = trigger_changetarget : "Trigger Change Target"
+[
+	m_iszNewTarget(string) : "New Target"
+]
+
+@SolidClass base(Trigger, Targetname) = trigger_counter : "Trigger counter" 
+[
+	spawnflags(flags) = 
+	[ 
+		1 : "No Message" : 0 
+	]
+	master(string) : "Master" 
+	count(integer) : "Count before activation" : 2
+]
+
+@SolidClass base(Targetname) = trigger_endsection : "EndSection Trigger"
+[
+	section(string) : "Section"
+	spawnflags(flags) =
+	[
+		1: "USE Only" : 0
+	]
+]
+
+@SolidClass base(Trigger) = trigger_gravity : "Trigger Gravity"
+[
+	gravity(integer) : "Gravity (0-1)" : 1
+]
+
+@SolidClass base(Targetname,Target) = trigger_hurt : "Trigger player hurt" 
+[
+	spawnflags(flags) = 
+	[ 
+		1: "Target Once" : 0 
+		2: "Start Off" : 0
+		8: "No clients" : 0
+		16:"FireClientOnly" : 0
+		32:"TouchClientOnly" : 0
+	]
+	master(string) : "Master" 
+	dmg(integer) : "Damage" : 10
+	delay(string) : "Delay before trigger" : "0"
+	damagetype(choices) : "Damage Type" : 0 =
+	[
+		0 : "GENERIC"
+		1 : "CRUSH"
+		2 : "BULLET"
+		4 : "SLASH"
+		8 : "BURN"
+		16 : "FREEZE"
+		32 : "FALL"
+		64 : "BLAST"
+		128 : "CLUB"
+		256 : "SHOCK"
+		512 : "SONIC"
+		1024 : "ENERGYBEAM"
+		16384: "DROWN"
+		32768 : "PARALYSE"
+		65536 : "NERVEGAS"
+		131072 : "POISON"
+		262144 : "RADIATION"
+		524288 : "DROWNRECOVER"
+		1048576 : "CHEMICAL"
+		2097152 : "SLOWBURN"
+		4194304 : "SLOWFREEZE"
+	]
+]
+
+@SolidClass base(Trigger) = trigger_multiple : "Trigger: Activate multiple" 
+[
+	wait(integer) : "Delay before reset" : 10
+]
+
+@SolidClass base(Trigger) = trigger_once : "Trigger: Activate once" []
+
+@SolidClass base(Trigger) = trigger_push : "Trigger player push"
+[
+	spawnflags(flags) = 
+	[ 
+		1: "Once Only" : 0 
+		2: "Start Off" : 0
+	]
+	speed(integer) : "Speed of push" : 40
+]
+
+@PointClass base(Targetname, Targetx) = trigger_relay : "Trigger Relay"
+[
+	spawnflags(flags) =
+	[
+		1: "Remove On fire" : 0
+	]
+	triggerstate(choices) : "Trigger State" : 0 = 
+	[
+		0: "Off"
+		1: "On"
+		2: "Toggle"
+	]
+]
+
+@SolidClass base(Trigger) = trigger_teleport : "Trigger teleport" []
+
+@SolidClass base(Targetname) = trigger_transition : "Trigger: Select Transition Area" []
+
+//  ZHLT 2.5.3 Merl's Custom Build 1.7 Custom Entity Support
+
+@PointClass size(-8 -8 0, 8 8 32) = info_compile_parameters : "Compile Options" 
+[ 
+    hlcsg(choices) : "HLCSG" : 1 =
+    [
+        1 : "Normal"
+        2 : "Onlyents"
+        0 : "Off"
+    ]
+    hlbsp(choices) : "HLBSP" : 1 =
+    [
+        0 : "Off" 
+        1 : "Normal"
+        2 : "Leakonly"
+    ]
+    hlvis(choices) : "HLVIS" : 2 = 
+    [ 
+        0 : "Off"
+        1 : "Fast"
+        2 : "Normal" 
+        3 : "Full"
+    ]
+    hlrad(choices) : "HLRAD" : 1 =
+    [
+        0 : "Off"
+        1 : "Normal"
+        2 : "Extra"
+    ]
+    texdata(string) : "Texture Data Memory (in KB)" : "4096" 
+    estimate(choices) : "Estimate Compile Times?" : 0 = 
+    [ 
+        0: "Yes" 
+        1: "No" 
+    ] 
+    bounce(integer) : "Number of radiosity bounces" : 0 
+    ambient(string) : "Ambient world light (0.0 to 1.0, R G B)" : "0 0 0" 
+    smooth(integer) : "Smoothing threshold (in degrees)" : 0 
+    dscale(integer) : "Direct Lighting Scale" : 1 
+    chop(integer) : "Chop Size" : 64 
+    texchop(integer) : "Texture Light Chop Size" : 32 
+    hullfile(string) : "Custom Hullfile" 
+    priority(choices) : "Priority Level" : 0 =
+    [
+        0 : "Normal"
+        1 : "High"
+        -1 : "Low"
+    ]
+    wadautodetect(choices) : "Wad Auto Detect" : 0 =
+    [
+        0 : "Off"
+        1 : "On"
+    ]
+    wadconfig(string) : "Custom Wad Configuration" : ""
+    verbose(choices) : "Verbose compile messages" : 0 =
+    [
+        0 : "Off"
+        1 : "On"
+    ]
+    noclipeconomy(choices) : "Strip Uneeded Clipnodes?" : 1 = 
+    [
+        1 : "Yes"
+        0 : "No"
+    ]
+    nocliphull(choices) : "Generate clipping hulls" : 0 =
+    [
+        0 : "Yes"
+        1 : "No"
+    ]
+    noskyclip(choices) : "No Sky Clip" : 0 =
+    [
+        1 : "On"
+        0 : "Off"
+    ]
+    sparse(choices) : "Vismatrix Method" : 2 =
+    [
+        0 : "No Vismatrix"
+        1 : "Sparse Vismatrix"
+        2 : "Normal"
+    ]
+    circus(choices) : "Circus RAD lighting" : 0 =
+    [
+        0 : "Off"
+        1 : "On"
+    ]
+]
+
+@PointClass color(255 128 0) = info_texlights : "Texture Light Config" []
+
+
+
+//////////////////////////////////////
+// Final Natural Selection entities //
+//////////////////////////////////////
+@BaseClass size(-8 -8 -8, 8 8 8) = ParticleSystem
+[
+]
+
+//@PointClass base(ParticleSystem, Targetname) = env_particles : "Particle system"
+//[
+//	// This is the name to use from the appropriate .ps
+//	particleSystemName(string) : "Name (from .ps)" : "TheEffect"
+//
+//	// Misc. particle flags	
+//	spawnFlags(flags) =
+//	[
+//		1 : "start on" : 1
+//	]
+//]
+
+@PointClass base(ParticleSystem, Targetname) = env_particles_custom : "Custom particle system"
+[
+	// Use this source if possible
+	pGenSource(string) : "Generation entity" : ""
+
+	// Generation shape
+	pGenShape(choices) : "Generation shape" : 0 =
+	[
+		0: "Point"
+		4: "Box"
+		5: "Sphere"
+		8: "Blob"
+	]
+
+	// Generation parms
+	pGenShapeParams(string) : "Generation shape parms" : ""
+
+	// Particle generation rate
+	pGenRate(integer) : "Generation rate (parts/second)" : 50
+
+	// Particle sprite
+    pSprite(sprite) : "Particle sprite" : ""
+
+	// Num sprite frames
+	pSpriteNumFrames(integer) : "Animation frames in sprite"	: 1
+	
+	// Max number of particles
+	pNumParticles(integer) : "Maximum particles" : 50
+
+	// Particle size
+    pSize(string) : "Particle size" : "1.0"
+
+	// Particle system lifetime
+	pSystemLifetime(string) : "System lifetime (-1 infinite)" : "-1"
+
+	// Particle lifetime
+	pLifetime(string) : "Particle lifetime (-1 infinite)" : "-1"
+
+	// Starting velocity shape
+	pVelShape(choices) : "Starting velocity shape" : 2 =
+	[
+		1: "Point"
+		2: "Box"
+		3: "Sphere"
+		4: "Blob"
+	]
+
+	// Starting velocity
+	pVelParams(string) : "Starting velocity params" : "0,0,0,0,0,0,0,0"
+
+	// Scaling
+	pScale(string) : "Scale particle over lifetime" : "1.0"
+
+	// Max alpha
+	pMaxAlpha(string) : "Particle max alpha" : "1.0"
+
+	// Particle render mode
+	pRenderMode(choices) : "Render mode" : 5 =
+	[
+		0 : "Normal"
+		1 : "Trans color -> (c*a+dest*(1-a))"
+		2 : "Trans texture -> (src*a+dest*(1-a))"
+		3 : "Glow -> (normal?)"
+		4 : "Trans alpha -> (src*srca+dest*(1-srca))"
+		5 : "Additive -> (src*a+dest)"
+	]
+
+	// Particle system to generate on collision
+	pPSToGen(string) : "Generate system on collision" : ""
+
+	// Animation speed
+	pAnimationSpeed(string) : "Animation speed" : "1"
+
+	// TODO: add fields for entities to collide with
+	//collideEntityOne(string) : "Collide entity #1" : ""
+	//collideEntityTwo(string) : "Collide entity #2" : ""
+
+	// Misc. particle flags	
+	spawnFlags(flags) =
+	[
+		1 : "start on" : 1
+		2 : "particle density" : 0
+		4 : "fade in" : 0
+		8 : "fade out" : 1
+		16 : "use world grav" : 0
+		32 : "tri, not quads" : 0
+		//64 : "minimize edges" : 1
+		128 : "constrain pitch" : 0
+		256 : "collide" : 0
+		512 : "high-detail only" : 1
+		1024 : "face up" : 0
+	]
+]
+
+@PointClass size(-16 -16 -16, 16 16 16) = env_gamma : "Desired map gamma"
+[
+	desiredgamma(string) : "Gamma ramp" : "2"
+]
+
+@SolidClass base(Targetname, RenderFields) = func_weldable : "Weldable"
+[
+	weldableHealth(string) : "Health (-1 infinite)" : "-1"
+
+	weldableTime(string) : "Seconds to weld" : "20"
+
+	material(choices) :"Explosion material" : 0 =
+	[
+		0: "Glass"
+		1: "Wood"
+		2: "Metal"
+		3: "Flesh"
+		4: "Cinder Block"  
+		5: "Ceiling Tile"
+		6: "Computer"
+		7: "Unbreakable Glass"
+		8: "Rocks"
+	]
+
+	//targetOnFinish(string) : "Target to trigger on finish" : ""
+
+	targetOnFinish(target_destination) : "Target to trigger on finish" : ""
+
+	targetOnBreak(target_destination) : "Target on break"
+
+	targetOnUse(target_destination) : "Target on use (toggle only)"
+
+	spawnFlags(flags) = 
+	[
+		1 : "start enabled" : 1
+		2 : "weld opens, not closes" : 0
+	]
+]
+
+@SolidClass base(Targetname, ZHLTLightFlags) = func_seethrough : "SeeThrough"
+[
+	commanderAlpha(string) : "Alpha for commander (0-255)" : "0"
+	playerAlpha(string) : "Alpha for players (0-255)" : "255"
+	style(choices) : "Texlight style" : 0 =
+	[
+		0 : "Normal"
+		-3: "Grouped"
+		10: "Fluorescent flicker"
+		2 : "Slow, strong pulse"
+		11: "Slow pulse, noblack"
+		5 : "Gentle pulse"
+		1 : "Flicker A"
+		6 : "Flicker B"
+		3 : "Candle A"
+		7 : "Candle B"
+		8 : "Candle C"
+		4 : "Fast strobe"
+		9 : "Slow strobe"
+		12: "Underwater"
+	]
+]
+
+@SolidClass base(Door, ZHLTLightFlags, Angles) = func_seethroughdoor : "SeeThrough (door)"
+[
+	commanderAlpha(string) : "Alpha for commander (0-255)" : "0"
+	playerAlpha(string) : "Alpha for players (0-255)" : "255"
+]
+
+@PointClass size(-24 -24 -4, 24 24 4) base(Targetname, Angles) studio() = func_resource
+[
+	model(studio) : "Model" : "models/b_resource_nozzle.mdl"
+	resourcepoints(integer) : "Num resources" : 200
+	targetOnBuild(target_destination) : "Target on build"
+	targetOnDestroy(target_destination) : "Target on destroy"
+]
+
+//@SolidClass base(Targetname) = func_viewheight : "Commander view height"
+//[
+//]
+
+//@SolidClass base(Targetname) = func_waypoint : "Floor to use for orders"
+//[
+//]
+
+@SolidClass base(Targetname) = func_nobuild : "Blocks orders and building"
+[
+]
+
+@BaseClass size(-16 -16 -36, 16 16 36) color(0 255 0) = TeamChoice
+[
+	teamchoice(choices) : "Team" : 1 =
+	[	
+		1 : "Team one"
+		2 : "Team two"
+	]
+]
+
+@PointClass base(info_player_start, TeamChoice) color(0 0 128) studio() = info_team_start : "Marine/Alien start" []
+
+@SolidClass base(Targetname) = info_spectate : "Activate spectator mode" []
+
+@SolidClass base(TeamChoice) = info_join_team : "A player touches this to join team one (marine default)" []
+
+@SolidClass base(Targetname) = info_join_autoassign : "A player touches this to be auto-assigned a team" []
+
+@SolidClass base(Targetname) = info_leave_game : "A player touches this go back to the ready room, remembering that he was on this team" []
+
+@PointClass base(Targetname) size(-16 -16 -16, 16 16 16) = target_mp3audio : "Plays a sound"
+[
+	soundname(string) : "Sound (sound/file.mp3)" : ""
+	soundvolume(integer) : "Volume (0-255)" : 255
+	fadedistance(integer) : "Fade distance (inaudible here)" : 1000
+
+	spawnflags(Flags) = 
+	[
+		1 : "Don't fade volume" : 0
+		2 : "Looping" : 0
+		4 : "Start on" : 0
+	]
+]
+
+@PointClass base(Targetname) size(-16 -16 -16, 16 16 16) = info_mapinfo : "Playable map size, for commander mini-map and scrolling"
+[
+	viewheight(integer) : "View height (for commander)" : 0
+	minviewheight(integer) : "Min map Z (black background)" : -1000
+	minx(integer) : "Minimum X" : -4000
+	miny(integer) : "Minimum Y" : -4000
+	maxx(integer) : "Maximum X" : 4000
+	maxy(integer) : "Maximum Y" : 4000
+	culldistance(integer) : "Top down XY cull distance" : 1024
+
+	spawnflags(Flags) = 
+	[
+		1 : "No background" : 0
+	]
+]
+
+@PointClass base(Targetname) size(-16 -16 -16, 16 16 16) = info_gameplay : "Changes game balance"
+[
+	teamone(choices) : "Team one type" : 1 =
+	[	
+		1 : "Human"
+		2 : "Alien"
+	]
+
+	teamtwo(choices) : "Team two type" : 2 =
+	[	
+		1 : "Human"
+		2 : "Alien"
+	]
+]
+
+@PointClass base(Targetname) = trigger_random
+[
+	minfiretime(string) : "shortest fire time" : 0
+	maxfiretime(string) : "longest fire time" : 1
+	wait(integer) : "delay before reset (-1 stay)" : 3
+	balancedtarget(string) : "target for tournament play" : ""
+
+	spawnflags(Flags) = 
+	[
+		1 : "Start on"			: 0
+		2 : "Toggle"			: 0
+		4: "Remove On fire"		: 0
+	]
+]
+
+@SolidClass base(Targetname) = trigger_presence
+[
+	master(string) : "Master" : ""
+	targetenter(string) : "Activation target" : ""
+	targetleave(string) : "Deactivation target" : ""
+	momentarytarget(string) : "momentary_door to target"
+	momentaryopentime(string) : "seconds to open over (small = fast)" : "1.0"
+	momentaryclosetime(string) : "seconds to close over (small = fast)" : "1.0"
+	timebeforeleave(string) : "time before leave fires" : ".5"
+
+	spawnflags(Flags) = 
+	[
+		1 : "No clients"		: 0
+		2 : "No monsters"		: 0
+		4 : "No pushables"		: 0
+		8 : "Team 1 only"		: 0
+		16 : "Team 2 only"		: 0
+	]
+]
+
+@PointClass base(Targetname) = trigger_script
+[
+	scriptname(string) : "Script name" : ""
+	spawnflags(Flags) = 
+	[
+		1 : "Start on"			: 0
+	]
+]
+
+@SolidClass = info_location
+[
+	locationname(string) : "Location name" : ""
+]
+
+// NS base classes
+@BaseClass = SpawnDeathTarget
+[
+	targetonspawn(string) : "Target on spawn" : ""
+	targetondeath(string) : "Target on death" : ""
+]
+
+@BaseClass size(-16 -16 0, 16 16 42) color(0 0 200) base(TeamChoice, Angles) = BasePlayerEquipment
+[
+	lifetime(integer) : "Lifetime (0 for infinite, -1 for NS default)" : 0
+]
+
+// Structures
+@BaseClass base(TeamChoice, Angles, SpawnDeathTarget) = BaseBuildable
+[
+	spawnflags(Flags) =
+	[
+		1 : "Starts built" : 1
+	]
+]
+
+@PointClass base(BaseBuildable) size(-16 -16 0, 16 16 70) studio("models/b_commandstation.mdl") = team_command : "Command station" []
+@PointClass base(BaseBuildable) size(-16 -16 0, 16 16 15) studio("models/b_infportal.mdl") = team_infportal : "Infantry portal" []
+@PointClass base(BaseBuildable) size(-16 -16 0, 16 16 15) studio("models/b_phasegate.mdl") = phasegate : "Phase gate" []
+@PointClass base(BaseBuildable) size(-16 -16 0, 16 16 67) studio("models/b_resourcetower.mdl") = resourcetower : "Marine resource tower" []
+@PointClass base(BaseBuildable) size(-16 -16 0, 16 16 62) studio("models/b_turretfactory.mdl") = team_turretfactory : "Turret factory" []
+@PointClass base(BaseBuildable) size(-16 -16 0, 16 16 62) studio("models/b_armory.mdl") = team_armory : "Armory" []
+@PointClass base(BaseBuildable) size(-16 -16 0, 16 16 67) studio("models/b_armslab.mdl") = team_armslab : "Arms lab" []
+@PointClass base(BaseBuildable) size(-16 -16 0, 16 16 68) studio("models/b_prototypelab.mdl") = team_prototypelab : "Prototype lab" []
+@PointClass base(BaseBuildable) size(-16 -16 0, 16 16 81) studio("models/b_observatory.mdl") = team_observatory : "Observatory" []
+@PointClass base(BaseBuildable) size(-16 -16 0, 16 16 42) studio("models/b_sentry.mdl") = turret : "Sentry turret" []
+@PointClass base(BaseBuildable) size(-16 -16 0, 16 16 62) studio("models/b_siege.mdl") = siegeturret : "Automated Siege Cannon (ASC)" []
+@PointClass base(BaseBuildable) size(-16 -16 0, 16 16 67) studio("models/ba_resource.mdl") = alienresourcetower : "Alien resource tower" []
+@PointClass base(BaseBuildable) size(-16 -16 0, 16 16 44) studio("models/ba_offense.mdl") = offensechamber : "Offense chamber" []
+@PointClass base(BaseBuildable) size(-16 -16 0, 16 16 44) studio("models/ba_defense.mdl") = defensechamber : "Defense chamber" []
+@PointClass base(BaseBuildable) size(-16 -16 0, 16 16 44) studio("models/ba_sensory.mdl") = sensorychamber : "Sensory chamber" []
+@PointClass base(BaseBuildable) size(-16 -16 0, 16 16 44) studio("models/ba_movement.mdl") = movementchamber : "Movement chamber" []
+@PointClass base(BaseBuildable) size(-80 -80 -145, 80 80 50) studio("models/hive.mdl") = team_hive : "Hive"
+[
+	maxspawndistance(integer) : "Spawn distance" : 2000
+]
+// TODO: Advanced armory
+// TODO: Advanced turret factory
+
+// Marine weapons
+@PointClass base(BasePlayerEquipment) studio("models/w_mg.mdl") = weapon_machinegun : "Machine gun" []
+@PointClass base(BasePlayerEquipment) studio("models/w_hg.mdl") = weapon_pistol : "Pistol" []
+@PointClass base(BasePlayerEquipment) studio("models/w_hmg.mdl") = weapon_heavymachinegun : "Heavy machine gun" []
+@PointClass base(BasePlayerEquipment) studio("models/w_gg.mdl") = weapon_grenadegun : "Grenade launcher" []
+@PointClass base(BasePlayerEquipment) studio("models/w_sg.mdl") = weapon_shotgun : "Shotgun" []
+@PointClass base(BasePlayerEquipment) studio("models/w_welder.mdl") = weapon_welder : "Welder" []
+@PointClass base(BasePlayerEquipment) studio("models/w_mine2.mdl") = weapon_mine : "Pack of mines" []
+
+// Equipment
+@PointClass base(BasePlayerEquipment) studio("models/w_health.mdl") = item_health : "Health pack" []
+//@PointClass base(BasePlayerEquipment) studio("models/w_ammo.mdl") = item_genericammo : "Ammo" []
+@PointClass base(BasePlayerEquipment) studio("models/w_jetpack.mdl") = item_jetpack : "Jetpack" []
+@PointClass base(BasePlayerEquipment) studio("models/w_heavy.mdl") = item_heavyarmor : "Heavy armor" []
+//@PointClass base(BasePlayerEquipment) studio("models/w_mine.mdl") = item_mine : "Deployed mine" []
+
+
+
diff --git a/main/ns.ico b/main/ns.ico
new file mode 100644
index 00000000..0c71a76a
Binary files /dev/null and b/main/ns.ico differ
diff --git a/main/ns.ps b/main/ns.ps
new file mode 100644
index 00000000..8cbb1313
--- /dev/null
+++ b/main/ns.ps
@@ -0,0 +1,2020 @@
+' avh particle systems
+
+start pSystemName ShotgunSmoke
+	' Max number of particles
+	pNumParticles = 1
+
+	' size
+	pSize = 20
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 1
+
+	' num frames in sprite
+	pSpriteNumFrames = 10
+
+	' Particle base color
+	pBaseColor = 1 1 1
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = 3
+	
+	' Particle sprite
+	pSprite = sprites/lightsmoke.spr
+
+	' particle max alpha
+	pMaxAlpha = .6
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (fade in, fade out)
+	pSpawnFlags = 12
+
+	' system lifetime
+	pSystemLifetime = .1
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = -2,-2,0,2,2,10,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+	' particle lifetime
+	pLifetime = 1.0
+
+	' Gen rate
+	pGenRate = 40
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Point
+
+	' Gen params
+	pGenShapeParams = 0,0,0,0,0,0,0,0
+end
+
+start pSystemName WelderLightSmoke
+	' Max number of particles
+	pNumParticles = 1
+
+	' size
+	pSize = 8
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 1
+
+	' num frames in sprite
+	pSpriteNumFrames = 11
+
+	' Particle base color
+	pBaseColor = .2 .2 .2
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+   pScale = 3
+	
+	' Particle sprite
+	pSprite = sprites/weldsmoke.spr
+
+	' system lifetime
+	pSystemLifetime = .1
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = -5,-5,5,5,5,40,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+	' particle max alpha
+	particleMaxAlpha = .2
+
+	' particle lifetime
+	pLifetime = .5
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (start on, fade in, fade out, triangles)
+	pSpawnFlags = 8
+
+	' Gen rate
+	pGenRate = 40
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Box
+
+	' Gen params
+	pGenShapeParams = -2,-2,-2,2,2,2,0,0
+end
+
+start pSystemName WelderHeavySmoke
+	' Max number of particles
+	pNumParticles = 1
+
+	' size
+	pSize = 8
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 1
+
+	' num frames in sprite
+	pSpriteNumFrames = 16
+
+	' Particle base color
+	pBaseColor = 1 1 1
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = .8
+	
+	' Particle sprite
+	pSprite = sprites/steam1.spr
+
+	' system lifetime
+	pSystemLifetime = .1
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = -8,-8,5,8,8,40,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+	' particle max alpha
+	particleMaxAlpha = .2
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (start on, fade in, fade out, triangles)
+	pSpawnFlags = 8
+
+	' particle lifetime
+	pLifetime = .8
+
+	' Gen rate
+	pGenRate = 40
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Point
+
+	' Gen params
+	pGenShapeParams = 0,0,0,0,0,0,0,0
+end
+
+
+' This plasma just stays still to give that hot blue magma look
+start pSystemName WelderBluePlasma
+	' Max number of particles
+	pNumParticles = 1
+
+	' size
+	pSize = 8
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 1
+
+	' num frames in sprite
+	pSpriteNumFrames = 11
+
+	' Particle base color
+	pBaseColor = 1 1 1
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = .5
+	
+	' Particle sprite
+	pSprite = sprites/xspark1.spr
+
+	' system lifetime
+	pSystemLifetime = .5
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = 0,0,0,0,0,0,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (start on, fade in, fade out, triangles)
+	pSpawnFlags = 8
+
+	' particle lifetime
+	pLifetime = 1
+
+	' Gen rate
+	pGenRate = 40
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Box
+
+	' Gen params
+	pGenShapeParams = -2,-2,-2,2,2,2,0,0
+end
+
+start pSystemName WelderBluePlasmaDrops
+	' Max number of particles
+	pNumParticles = 4
+
+	' size
+	pSize = 6
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 1
+
+	' num frames in sprite
+	pSpriteNumFrames = 1
+
+	' Particle base color
+	pBaseColor = 1 1 1
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = .5
+	
+	' Particle sprite
+	pSprite = sprites/welddrip.spr
+
+	' system lifetime
+	pSystemLifetime = .5
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = -20,-20,0,20,20,-10,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (start on, fade in, fade out, triangles)
+	pSpawnFlags = 24
+
+	' particle lifetime
+	pLifetime = 1
+
+	' Gen rate
+	pGenRate = 40
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Point
+
+	' Gen params
+	pGenShapeParams = 0,0,0,0,0,0,0,0
+end
+
+start pSystemName HeavyMGSmoke
+	' Max number of particles
+	pNumParticles = 1
+
+	' size
+	pSize = 20
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 1
+
+	' num frames in sprite
+	pSpriteNumFrames = 10
+
+	' Particle base color
+	pBaseColor = .5 .5 .5
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = 1
+	
+	' Particle sprite
+	pSprite = sprites/lightsmoke.spr
+
+	' particle max alpha
+	particleMaxAlpha = .4
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (fade in, fade out)
+	pSpawnFlags = 12
+
+	' system lifetime
+	pSystemLifetime = .1
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = -2,-2,0,2,2,3,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+	' particle lifetime
+	pLifetime = .5
+
+	' Gen rate
+	pGenRate = 40
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Point
+
+	' Gen params
+	pGenShapeParams = 0,0,0,0,0,0,0,0
+end
+
+start pSystemName TeleportEffect
+	' Max number of particles
+	pNumParticles = 60
+
+	' size
+	pSize = 14
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 1
+
+	' num frames in sprite
+	pSpriteNumFrames = 1
+
+	' Particle base color
+	pBaseColor = 1 1 1
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = .25
+	
+	' Particle sprite
+	pSprite = sprites/nsteleport.spr
+
+	' system lifetime
+	pSystemLifetime = .5
+
+	' starting velocity
+    pVelShape = Box
+	
+	' starting velocity parms
+    pVelParams = 0,0,150,0,0,-150,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	'128: "constrain pitch"
+	' flags (start on, fade in, fade out, triangles)
+    pSpawnFlags = 8
+
+	' particle lifetime
+	pLifetime = 1
+
+	' Gen rate
+	pGenRate = 800
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Box
+
+	' Gen params
+    pGenShapeParams = -20,-20,-10,20,20,45,0,0
+end
+
+start pSystemName CommandHack
+
+	' Max number of particles
+	pNumParticles = 30
+
+	' size
+	pSize = 15
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 1
+
+	' num frames in sprite
+	pSpriteNumFrames = 1
+
+	' Particle base color
+	pBaseColor = 1 1 1
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = .03
+	
+	' Particle sprite
+	pSprite = sprites/blueball.spr
+
+	' system lifetime
+	pSystemLifetime = .5
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = -10,-10,-10,0,10,10,10,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (start on, fade in, fade out, triangles)
+	pSpawnFlags = 8
+
+	' particle lifetime
+	pLifetime = 2
+
+	' Gen rate
+	pGenRate = 800
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Box
+
+	' Gen params
+	pGenShapeParams = -12,-12,-25,12,12,25,0,0
+end
+
+start pSystemName PhaseInEffect2
+	' Max number of particles
+	pNumParticles = 30
+
+	' size
+	pSize = 10
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 1
+
+	' num frames in sprite
+	pSpriteNumFrames = 11
+
+	' Particle base color
+	pBaseColor = 1 1 1
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = 1
+	
+	' Particle sprite
+	pSprite = sprites/xspark4.spr
+
+	' system lifetime
+	pSystemLifetime = .5
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = -15,-15,0,15,15,20,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (start on, fade in, fade out, triangles)
+	pSpawnFlags = 8
+
+	' particle lifetime
+	pLifetime = 1.2
+
+	' Gen rate
+	pGenRate = 800
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Box
+
+	' Gen params
+	pGenShapeParams = -15,-15,-25,15,15,25,0,0
+end
+
+start pSystemName SpitHit
+	' Max number of particles
+	pNumParticles = 12
+
+	' size
+	pSize = 5
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 3
+
+	' num frames in sprite
+	pSpriteNumFrames = 3
+
+	' Particle base color
+	pBaseColor = 1 1 1
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = .3
+	
+	' Particle sprite
+	pSprite = sprites/bigspit.spr
+
+	' system lifetime
+	pSystemLifetime = .3
+
+	' starting velocity
+	pVelShape = Point
+	
+	' starting velocity parms
+	pVelParams = 0,0,50,0,0,0,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 2
+
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (start on, fade in, fade out, triangles)
+	pSpawnFlags = 24
+
+	' particle lifetime
+	pLifetime = .8
+
+	' Gen rate
+	pGenRate = 200
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Box
+
+	' Gen params
+	pGenShapeParams = -20,-5,-5,5,20,16,0,0
+end
+
+
+start pSystemName SpitShoot
+	' Max number of particles
+	pNumParticles = 10
+
+	' size
+	pSize = 2
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 3
+
+	' num frames in sprite
+	pSpriteNumFrames = 3
+
+	' Particle base color
+	pBaseColor = 1 1 1
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = 2
+	
+	' Particle sprite
+	pSprite = sprites/bigspit.spr
+
+	' system lifetime
+	pSystemLifetime = .3
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = -10,-10,0,10,10,0,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 2
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (start on, fade in, fade out, triangles)
+	pSpawnFlags = 24
+
+	' particle lifetime
+	pLifetime = .8
+
+	' Gen rate
+	pGenRate = 200
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Point
+
+	' Gen params
+	pGenShapeParams = 0,0,0,0,0,0,0,0
+end
+
+start pSystemName SpikeHit
+	' Max number of particles
+	'pNumParticles = 8
+	pNumParticles = 4
+
+	' size
+	pSize = 16
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 1
+
+	' num frames in sprite
+	pSpriteNumFrames = 11
+
+	' Particle base color
+	pBaseColor = 1 1 1
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = 2.5
+	
+	' Particle sprite
+	'pSprite = sprites/spithit.spr
+	pSprite = sprites/spikehit.spr
+
+	' system lifetime
+	pSystemLifetime = .3
+
+	' starting velocity
+	pVelShape = Point
+	
+	' starting velocity parms
+	pVelParams = 0,0,0,0,0,0,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+	' particle max alpha
+	particleMaxAlpha = .2
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (start on, fade in, fade out, triangles)
+	'pSpawnFlags = 24
+	pSpawnFlags = 8
+
+	' particle lifetime
+	pLifetime = .4
+
+	' Gen rate
+	pGenRate = 200
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Box
+
+	' Gen params
+	pGenShapeParams = -10,-10,-15,10,10,10,0,0
+end
+
+start pSystemName SporeShoot
+	' Max number of particles
+	pNumParticles = 10
+
+	' size
+	pSize = 2
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 3
+
+	' num frames in sprite
+	pSpriteNumFrames = 9
+
+	' Particle base color
+	pBaseColor = 1 1 1
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = 2
+	
+	' Particle sprite
+	pSprite = sprites/spore.spr
+
+	' system lifetime
+	pSystemLifetime = .3
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = -10,-10,0,10,10,0,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (start on, fade in, fade out, triangles)
+	pSpawnFlags = 24
+
+	' particle lifetime
+	pLifetime = .8
+
+	' Gen rate
+	pGenRate = 200
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Point
+
+	' Gen params
+	pGenShapeParams = 0,0,0,0,0,0,0,0
+end
+
+start pSystemName SporeCloud
+	' Max number of particles
+	pNumParticles = 20
+
+	' size
+	pSize = 45
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 6
+
+	' num frames in sprite
+	pSpriteNumFrames = 17
+
+	' Particle base color
+	pBaseColor = 1 1 1
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = 3
+	
+	' Particle sprite
+	pSprite = sprites/spore.spr
+
+	' system lifetime
+	pSystemLifetime = 1.0
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = -5,-5,-5,5,5,5,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (start on, fade in, fade out, triangles)
+	pSpawnFlags = 8
+
+	' particle lifetime
+	pLifetime = 8
+
+	' Gen rate
+	pGenRate = 30
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Box
+
+	' Gen params
+	pGenShapeParams = -125,-125,-125,125,125,125,0,0
+end
+
+
+start pSystemName MeleeDamage
+	' Max number of particles
+	pNumParticles = 8
+
+	' size
+	pSize = 3
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 1
+
+	' num frames in sprite
+	pSpriteNumFrames = 1
+
+	' Particle base color
+	pBaseColor = 1 1 1
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = 1
+	
+	' Particle sprite
+	pSprite = sprites/meleehit.spr
+
+	' system lifetime
+	pSystemLifetime = .5
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = -50,-50,-50,50,50,60,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (start on, fade in, fade out, triangles)
+	pSpawnFlags = 24
+
+	' particle lifetime
+	pLifetime = .4
+
+	' Gen rate
+	pGenRate = 40
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Point
+
+	' Gen params
+	pGenShapeParams = 0,0,0,0,0,0,0,0
+end
+
+start pSystemName PhaseGateIdle
+	' Max number of particles
+	pNumParticles = 40
+
+	' size
+	pSize = 20
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 2
+
+	' num frames in sprite
+	pSpriteNumFrames = 20
+
+	' Particle base color
+	pBaseColor = 1 1 1
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = .2
+	
+	' Particle sprite
+	pSprite = sprites/flare6.spr
+
+	' system lifetime
+	pSystemLifetime = 1.0
+
+	' starting velocity
+	pVelShape = box
+	
+	' starting velocity parms
+	pVelParams = 0,0,0,0,0,20,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+	' particle max alpha
+	particleMaxAlpha = 1
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (start on, fade in, fade out, triangles)
+	pSpawnFlags = 12
+
+	' particle lifetime
+	pLifetime = 2
+
+	' Gen rate
+	pGenRate = 20
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Box
+
+	' Gen params
+	pGenShapeParams = -20,-20,-20,20,20,40,0,0
+end
+
+start pSystemName ResourceEmission
+	' Max number of particles
+	pNumParticles = 100
+
+	' size
+	pSize = 6
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 1
+
+	' num frames in sprite
+	pSpriteNumFrames = 1
+
+	' Particle base color
+	pBaseColor = 1 1 1
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = 5.0
+	
+	' Particle sprite
+	pSprite = sprites/flare3.spr
+
+	' system lifetime
+	pSystemLifetime = -1
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = -5,-5,20,5,5,80,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+	' particle max alpha
+	particleMaxAlpha = .4
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (start on, fade in, fade out)
+	pSpawnFlags = 9
+
+	' particle lifetime
+	pLifetime = 1.5
+
+	' Gen rate
+	pGenRate = 20
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Point
+
+	' Gen params
+	pGenShapeParams = 0,0,0,0,0,0,0,0
+end
+
+start pSystemName UmbraCloud
+	' Max number of particles
+	pNumParticles = 20
+
+	' size
+	pSize = 40
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 6
+
+	' num frames in sprite
+	pSpriteNumFrames = 17
+
+	' Particle base color
+	pBaseColor = 1 1 1
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = 3
+	
+	' Particle sprite
+	pSprite = sprites/umbra.spr
+
+	' system lifetime
+	pSystemLifetime = 1.0
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = -5,-5,-5,5,5,5,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (start on, fade in, fade out, triangles)
+	pSpawnFlags = 8
+
+	' particle lifetime (same as umbra cloud duration)
+	pLifetime = 3
+
+	' Gen rate
+	pGenRate = 50
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Box
+
+	' Gen params
+	pGenShapeParams = -100,-100,-100,100,100,100,0,0
+end
+
+start pSystemName AcidHit
+    ' Max number of particles
+    pNumParticles = 50
+
+    ' size
+    pSize = 25
+
+    ' number of times to loop through an animated texture
+    pAnimationSpeed = 1
+
+    ' num frames in sprite
+    pSpriteNumFrames = 12
+
+    ' Particle base color
+    pBaseColor = 1 1 1
+
+    ' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = 3
+   
+    ' Particle sprite
+    pSprite = sprites/acidsplash.spr
+
+    ' system lifetime
+    pSystemLifetime = .3
+
+    ' starting velocity
+    pVelShape = Box
+   
+    ' starting velocity parms
+    pVelParams = 200,200,250,-200,-200,-20,0,0
+
+    ' render mode
+    ' 0 = kRenderNormal
+    ' 1 = kRenderTransColor,        // c*a+dest*(1-a)
+    ' 2 = kRenderTransTexture,    // src*a+dest*(1-a)
+    ' 3 = kRenderGlow,            // src*a+dest -- No Z buffer checks
+    ' 4 = kRenderTransAlpha,        // src*srca+dest*(1-srca)
+    ' 5 = kRenderTransAdd,        // src*a+dest
+    pRenderMode = 5
+
+    '1 : "start on"
+    '2 : "particle density"
+    '4 : "fade in"
+    '8 : "fade out"
+    '16 : "use world gravity"
+    '32 : "tri, not quads"
+    '64 : "minimize edges"
+    ' flags (start on, fade in, fade out, triangles)
+    'pSpawnFlags = 24
+    pSpawnFlags = 24
+
+    ' particle lifetime
+    pLifetime = .8
+
+    ' Gen rate
+    pGenRate = 600
+
+    ' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+    pGenShape = Box
+
+    ' Gen params
+    pGenShapeParams = -8,-8,-8,8,8,8,0,0
+end
+
+start pSystemName BacteriaSpray
+    ' Max number of particles
+    pNumParticles = 6
+
+    ' size
+    pSize = 20
+
+    ' number of times to loop through an animated texture
+    pAnimationSpeed = 1
+
+    ' num frames in sprite
+    pSpriteNumFrames = 6
+
+    ' Particle base color
+    pBaseColor = 1 1 1
+
+    ' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = 4
+   
+    ' Particle sprite
+    pSprite = sprites/bacteria.spr
+
+    ' system lifetime
+    pSystemLifetime = 1
+
+    ' starting velocity
+    pVelShape = Box
+   
+    ' starting velocity parms
+    pVelParams = 0,0,0,0,0,0,0,0
+
+    ' render mode
+    ' 0 = kRenderNormal
+    ' 1 = kRenderTransColor,        // c*a+dest*(1-a)
+    ' 2 = kRenderTransTexture,    // src*a+dest*(1-a)
+    ' 3 = kRenderGlow,            // src*a+dest -- No Z buffer checks
+    ' 4 = kRenderTransAlpha,        // src*srca+dest*(1-srca)
+    ' 5 = kRenderTransAdd,        // src*a+dest
+    pRenderMode = 5
+
+    '1 : "start on"
+    '2 : "particle density"
+    '4 : "fade in"
+    '8 : "fade out"
+    '16 : "use world gravity"
+    '32 : "tri, not quads"
+    '64 : "minimize edges"
+    ' flags (start on, fade in, fade out, triangles)
+    'pSpawnFlags = 24
+    pSpawnFlags = 12
+
+    ' particle lifetime
+    pLifetime = .8
+
+    ' Gen rate
+    pGenRate = 4
+
+    ' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+    pGenShape = Box
+
+    ' Gen params
+    pGenShapeParams = -30,-30,-20,30,30,20,0,0
+end
+
+start pSystemName Xenocide
+    ' Max number of particles
+    pNumParticles = 50
+
+    ' size
+    pSize = 15
+
+    ' number of times to loop through an animated texture
+    pAnimationSpeed = 1
+
+    ' num frames in sprite
+    pSpriteNumFrames = 25
+
+    ' Particle base color
+    pBaseColor = 1 1 1
+
+    ' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = 5
+   
+    ' Particle sprite
+    pSprite = sprites/eexplo.spr
+
+    ' system lifetime
+    pSystemLifetime = .3
+
+    ' starting velocity
+    pVelShape = Box
+   
+    ' starting velocity parms
+    pVelParams = 240,240,30,-240,-240,-20,0,0
+
+    ' render mode
+    ' 0 = kRenderNormal
+    ' 1 = kRenderTransColor,        // c*a+dest*(1-a)
+    ' 2 = kRenderTransTexture,    // src*a+dest*(1-a)
+    ' 3 = kRenderGlow,            // src*a+dest -- No Z buffer checks
+    ' 4 = kRenderTransAlpha,        // src*srca+dest*(1-srca)
+    ' 5 = kRenderTransAdd,        // src*a+dest
+    pRenderMode = 5
+
+    '1 : "start on"
+    '2 : "particle density"
+    '4 : "fade in"
+    '8 : "fade out"
+    '16 : "use world gravity"
+    '32 : "tri, not quads"
+    '64 : "minimize edges"
+    ' flags (start on, fade in, fade out, triangles)
+    'pSpawnFlags = 24
+    pSpawnFlags = 8
+
+    ' particle lifetime
+    pLifetime = .7
+
+    ' Gen rate
+    pGenRate = 800
+
+    ' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+    pGenShape = Box
+
+    ' Gen params
+    pGenShapeParams = -12,-12,-8,12,12,8,0,0
+end
+
+start pSystemName BileBomb
+	' Max number of particles
+	pNumParticles = 50
+
+	' size
+	pSize = 15
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 2
+
+	' num frames in sprite
+	pSpriteNumFrames = 10
+
+	' Particle base color
+	pBaseColor = 1 1 1
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = 8
+	
+	' Particle sprite
+	pSprite = sprites/bilebomb.spr
+
+	' system lifetime
+	pSystemLifetime = 0.5
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = -200,-200,150,200,200,400,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (start on, fade in, fade out, triangles)
+	pSpawnFlags = 24
+
+	' particle lifetime
+	pLifetime = 1.2
+
+	' Gen rate
+	pGenRate = 800
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Box
+
+	' Gen params
+	pGenShapeParams = -8,-8,-8,8,8,8,0,0
+end
+
+start pSystemName PhaseInEffect
+	' Max number of particles
+	pNumParticles = 40
+
+	' size
+	pSize = 35
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 1
+
+	' num frames in sprite
+	pSpriteNumFrames = 1
+
+	' Particle base color
+	pBaseColor = 1 1 1
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = .2
+	
+	' Particle sprite
+	pSprite = sprites/hack.spr
+
+	' system lifetime
+	pSystemLifetime = 1.2
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = -40,-40,-40,40,40,40,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (start on, fade in, fade out, triangles)
+	'pSpawnFlags = 24
+	pSpawnFlags = 12
+
+	' particle lifetime
+	pLifetime = 1.2
+
+	' Gen rate
+	pGenRate = 20
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Box
+
+	' Gen params
+	pGenShapeParams = -10,-10,-10,10,10,10,0,0
+end
+
+start pSystemName ScanEffect
+	' Max number of particles
+	pNumParticles = 10
+
+	' size
+	pSize = 10
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 1
+
+	' num frames in sprite
+	pSpriteNumFrames = 1
+
+	' Particle base color
+	pBaseColor = 1 1 1
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = 100
+	
+	' Particle sprite
+	pSprite = sprites/scan.spr
+
+	' system lifetime
+	pSystemLifetime = 10
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = 0,0,0,0,0,0,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	'128: "constrain pitch"
+	'512: "high-detail only"
+	'1024: "face up"
+	' flags (start on, fade in, fade out, triangles)
+	pSpawnFlags = 1032
+
+	' particle lifetime
+	pLifetime = 1.5
+
+	' Gen rate
+	pGenRate = 1
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Box
+
+	' Gen params
+	pGenShapeParams = 0,0,20,0,0,20,0,0
+end
+
+start pSystemName JetpackEffect
+	' Max number of particles
+	pNumParticles = 4
+
+	' size
+	pSize = 12
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 1
+
+	' num frames in sprite
+	pSpriteNumFrames = 15
+
+	' Particle base color
+	pBaseColor = .2 .2 .2
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = .5
+	
+	' Particle sprite
+	pSprite = sprites/blink2.spr
+
+	' system lifetime
+	pSystemLifetime = .5
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = 0,0,-20,0,0,-30,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+	' particle max alpha
+	particleMaxAlpha = .1
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (start on, fade in, fade out, triangles)
+	pSpawnFlags = 8
+
+	' particle lifetime
+	pLifetime = 2
+
+	' Gen rate
+	pGenRate = 1
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Box
+
+	' Gen params
+	pGenShapeParams = 0,0,0,0,0,0,0,0
+end
+
+start pSystemName SmokePuffs
+	' Max number of particles
+	pNumParticles = 5
+
+	' size
+	pSize = 7
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 1
+
+	' num frames in sprite
+	pSpriteNumFrames = 10
+
+	' Particle base color
+	pBaseColor = .2 .2 .2
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+	pScale = 4
+	
+	' Particle sprite
+	pSprite = sprites/turretsmoke.spr
+
+	' system lifetime
+	pSystemLifetime = .5
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = -1,-1,2,1,1,20,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+	' particle max alpha
+	particleMaxAlpha = .1
+
+	' particle lifetime
+	pLifetime = 1.5
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	'512: "high-detail only"
+	' flags (start on, fade in, fade out, triangles)
+	pSpawnFlags = 520
+
+	' Gen rate
+	pGenRate = 2
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Box
+
+	' Gen params
+	pGenShapeParams = -4,-4,-2,4,4,2,0,0
+end
+
+start pSystemName ChamberDeath
+	' Max number of particles
+	pNumParticles = 25
+
+	' size
+	pSize = 15
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 2
+
+	' num frames in sprite
+	pSpriteNumFrames = 10
+
+	' Particle base color
+	pBaseColor = 1 1 1
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = 4
+	
+	' Particle sprite
+	pSprite = sprites/chamberdeath.spr
+
+	' system lifetime
+	pSystemLifetime = 0.5
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = -100,-100,75,100,100,400,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (start on, fade in, fade out, triangles)
+	pSpawnFlags = 24
+
+	' particle lifetime
+	pLifetime = .6
+
+	' Gen rate
+	pGenRate = 800
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Box
+
+	' Gen params
+	pGenShapeParams = -8,-8,-8,8,8,8,0,0
+end
+
+start pSystemName HiveDeath
+	' Max number of particles
+	pNumParticles = 50
+
+	' size
+	pSize = 15
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 2
+
+	' num frames in sprite
+	pSpriteNumFrames = 10
+
+	' Particle base color
+	pBaseColor = 1 1 1
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = 4
+	
+	' Particle sprite
+	pSprite = sprites/chamberdeath.spr
+
+	' system lifetime
+	pSystemLifetime = 0.8
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = -100,-100,75,100,100,400,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (start on, fade in, fade out, triangles)
+	pSpawnFlags = 24
+
+	' particle lifetime
+	pLifetime = 1.2
+
+	' Gen rate
+	pGenRate = 800
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Box
+
+	' Gen params
+	pGenShapeParams = -64,-64,-64,64,64,64,0,0
+end
+
+start pSystemName StompEffect
+	' Max number of particles
+	pNumParticles = 2
+
+	' size
+	pSize = 10
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 1
+
+	' num frames in sprite
+	pSpriteNumFrames = 1
+
+	' Particle base color
+	pBaseColor = 1 1 1
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = 20
+	
+	' Particle sprite
+	pSprite = sprites/stomp.spr
+
+	' system lifetime
+	pSystemLifetime = .2
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = 0,0,0,0,0,0,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	'128: "constrain pitch"
+	'512: "high-detail only"
+	'1024: "face up"
+	' flags (start on, fade in, fade out, triangles)
+	pSpawnFlags = 1032
+
+	' particle lifetime
+	pLifetime = .5
+
+	' Gen rate
+	pGenRate = 50
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Box
+
+	' Gen params (this is offset a bit because stomp originates at Onos center)
+	pGenShapeParams = 0,0,0,0,0,0,0,0
+end
+
+start pSystemName PheromoneEffect
+	' Max number of particles
+	pNumParticles = 1
+
+	' size
+	pSize = 30
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 1
+
+	' num frames in sprite
+	pSpriteNumFrames = 1
+
+	' Particle base color
+	pBaseColor = .2 .2 .2
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+    pScale = .8
+	
+	' Particle sprite
+	pSprite = sprites/pheromone.spr
+
+	' system lifetime
+	pSystemLifetime = .1
+
+	' starting velocity
+	pVelShape = Point
+	
+	' starting velocity parms
+	pVelParams = 0,0,0,0,0,0,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+	' particle max alpha
+	particleMaxAlpha = .1
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	' flags (start on, fade in, fade out, triangles)
+	pSpawnFlags = 8
+
+	' particle lifetime
+	pLifetime = 10
+
+	' Gen rate
+	pGenRate = 10
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Box
+
+	' Gen params
+	pGenShapeParams = 0,0,0,0,0,0,0,0
+end
+
+start pSystemName StompSmoke
+	' Max number of particles
+	pNumParticles = 1
+
+	' size
+	pSize = 20
+
+	' number of times to loop through an animated texture
+	pAnimationSpeed = 1
+
+	' num frames in sprite
+	pSpriteNumFrames = 10
+
+	' Particle base color
+	pBaseColor = .2 .2 .2
+
+	' Scale by the lifetime, so it will eventually be pScale*pSize right before it dies
+	pScale = 4
+	
+	' Particle sprite
+	pSprite = sprites/lightsmoke.spr
+
+	' system lifetime
+	pSystemLifetime = .1
+
+	' starting velocity
+	pVelShape = Box
+	
+	' starting velocity parms
+	pVelParams = 0,0,5,0,0,10,0,0
+
+	' render mode
+	' 0 = kRenderNormal
+	' 1 = kRenderTransColor,		// c*a+dest*(1-a)
+	' 2 = kRenderTransTexture,	// src*a+dest*(1-a)
+	' 3 = kRenderGlow,			// src*a+dest -- No Z buffer checks
+	' 4 = kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	' 5 = kRenderTransAdd,		// src*a+dest
+	pRenderMode = 5
+
+	' particle max alpha
+	particleMaxAlpha = .1
+
+	' particle lifetime
+	pLifetime = .7
+
+	'1 : "start on"
+	'2 : "particle density"
+	'4 : "fade in"
+	'8 : "fade out"
+	'16 : "use world gravity"
+	'32 : "tri, not quads"
+	'64 : "minimize edges"
+	'128: "constrain pitch"
+	'512: "high-detail only"
+	'1024: "face up"
+	' fade out, high detail
+	pSpawnFlags = 520
+
+	' Gen rate
+	pGenRate = 40
+
+	' Gen shape (one of: Point, Line, Triangle, Plane, Box, Cylinder, Cone, Blob, Disc, Rectangle, None)
+	pGenShape = Box
+
+	' Gen params
+	pGenShapeParams = -40,-40,0,40,40,10,0,0
+end
+
+
+
diff --git a/main/ns.qrk b/main/ns.qrk
new file mode 100644
index 00000000..9e37c49e
Binary files /dev/null and b/main/ns.qrk differ
diff --git a/main/ns.wad b/main/ns.wad
new file mode 100644
index 00000000..9988a762
Binary files /dev/null and b/main/ns.wad differ
diff --git a/main/ns2.wad b/main/ns2.wad
new file mode 100644
index 00000000..d6df62eb
Binary files /dev/null and b/main/ns2.wad differ
diff --git a/main/ns_ayumi.wad b/main/ns_ayumi.wad
new file mode 100644
index 00000000..eac63cd5
Binary files /dev/null and b/main/ns_ayumi.wad differ
diff --git a/main/ns_bast.wad b/main/ns_bast.wad
new file mode 100644
index 00000000..4151c5d9
Binary files /dev/null and b/main/ns_bast.wad differ
diff --git a/main/ns_context.qrk b/main/ns_context.qrk
new file mode 100644
index 00000000..6ab09787
Binary files /dev/null and b/main/ns_context.qrk differ
diff --git a/main/ns_delta.wad b/main/ns_delta.wad
new file mode 100644
index 00000000..0b632508
Binary files /dev/null and b/main/ns_delta.wad differ
diff --git a/main/ns_eclipse.wad b/main/ns_eclipse.wad
new file mode 100644
index 00000000..56481e48
Binary files /dev/null and b/main/ns_eclipse.wad differ
diff --git a/main/ns_eon.wad b/main/ns_eon.wad
new file mode 100644
index 00000000..7efd2491
Binary files /dev/null and b/main/ns_eon.wad differ
diff --git a/main/ns_eon_b6.wad b/main/ns_eon_b6.wad
new file mode 100644
index 00000000..84ca9605
Binary files /dev/null and b/main/ns_eon_b6.wad differ
diff --git a/main/ns_hera.wad b/main/ns_hera.wad
new file mode 100644
index 00000000..fa4301d9
Binary files /dev/null and b/main/ns_hera.wad differ
diff --git a/main/ns_lost.wad b/main/ns_lost.wad
new file mode 100644
index 00000000..f2497624
Binary files /dev/null and b/main/ns_lost.wad differ
diff --git a/main/ns_metal.wad b/main/ns_metal.wad
new file mode 100644
index 00000000..9e441668
Binary files /dev/null and b/main/ns_metal.wad differ
diff --git a/main/ns_nancy.wad b/main/ns_nancy.wad
new file mode 100644
index 00000000..70fbcc23
Binary files /dev/null and b/main/ns_nancy.wad differ
diff --git a/main/ns_nothing.wad b/main/ns_nothing.wad
new file mode 100644
index 00000000..938f119a
Binary files /dev/null and b/main/ns_nothing.wad differ
diff --git a/main/ns_tanith.wad b/main/ns_tanith.wad
new file mode 100644
index 00000000..98e4ff74
Binary files /dev/null and b/main/ns_tanith.wad differ
diff --git a/main/nshulls.txt b/main/nshulls.txt
new file mode 100644
index 00000000..b13e2465
--- /dev/null
+++ b/main/nshulls.txt
@@ -0,0 +1,3 @@
+32 32 72
+64 64 108
+32 32 36
diff --git a/main/readme.txt b/main/readme.txt
new file mode 100644
index 00000000..404956f0
--- /dev/null
+++ b/main/readme.txt
@@ -0,0 +1,181 @@
+--------------------------------------------------------------------------
+- Natural Selection - http://www.natural-selection.org - v2.0 - 07/30/03 - 
+--------------------------------------------------------------------------
+
+The NS Team
+-----------
+
+Charles "Flayra" Cleveland
+flayra@overmind.org
+Project leader, programming, game design
+
+Cory "Squeal Like A Pig" Strader
+cory.strader@verizon.net
+Lead artist	- World concept, level textures, player textures, structure design and textures
+
+Josh McHugh
+vze2chp9@verizon.net
+Artist - Alien player models, shotgun model, marine equipment models
+
+Mike Wislocki
+mike@squarewaveinteractive.com
+Artist - Flash, marine weapons
+
+Kevin "Relic25" Roberts
+relic25@ec.rr.com
+Level designer, 2D art, particle effects, ns_bast
+
+Jon "Merkaba" Chapman
+merkaba@onthebog.net
+Level designer, level tech R&D, 2D art, ns_hera
+
+Ned "MonsieurEvil" Pyle
+monsieurevil@natural-selection.org
+Public relations, network engineer, system maintainence, general, Jack of All Trades
+
+Jeff Paris
+jparis@ngenre.com
+Writer, world-builder, manual
+
+Alex "Mojo" Boylan
+mojo@planethalflife.com
+Animator - building animations, alien animations
+
+Phil "Def One" Mayfield
+alien_51@hotmail.com
+Animator - Most player animations, all view model animations, trailer CG
+
+Joe "joev" Vaughan
+joev@jarhedz.com
+Site admin, database programmer, DBA, linux helper 
+
+Max McGuire
+mmcguire@ironlore.com
+Additional programming
+
+
+Other credits
+-------------
+Jeremy Soule
+jeremy@jeremysoule.com
+Music
+
+Andrew King
+andrew@squarewaveinteractive.com
+Flash
+
+Adam Otcasek
+adam@squarewaveinteractive.com
+Website design
+
+Guy "smedic" Rabiller
+grabiller@3dvf.net
+Alien player animations
+
+Scott "Superfly" Haraldsen
+haraldsen@earthlink.net
+Sound effects (game and trailer)
+
+Dave "MaDMaXX" Monks
+Dave@MaDMaXX.Demon.co.uk
+Additional sound effects
+
+Oliver "Hypergrip" Richter
+Hypergrip@gmx.de
+Additional ambient music
+
+Max Mcgill 
+maxtoo@earthlink.net
+Marine voice acting
+
+Lani Minella
+lani@audiogodz.com
+Alien, Hive and Commander voice acting
+
+Hugo "[Dr]Hugo" Silvério
+drhugo@uol.com.br
+Player animations
+
+Nelson "manah" Ferryman
+manah@planethalflife.com
+Mapper - ns_caged
+
+Andrew "KungFuSquirrel" Weldon
+aweldon@planethalflife.com
+Mapper - ns_eclipse, ns_veil, extra work on ns_nothing
+
+Galen "DevilDog" Surlak-Ramsey
+devildog@planetavp.com
+Mapper - ns_nancy (RIP)
+
+Ken "Ken20Banks" Banks
+ken20banks@yahoo.com
+Mapper - ns_nothing
+
+Tom "tommyd" Dilazaro
+tjd159@psu.edu
+Mapper - ns_tanith
+
+Mike "Cadaver" Rosser
+mike@cadaveruk.fsnet.co.uk
+Mapper - ns_origin
+
+Marty "Greedo386" Rolek
+mrolek@ucla.edu
+Mapper - ns_lost
+
+Jake "Ekaj" Griffith
+ekaj_niop@hotmail.com
+Mapper - ns_mineshaft
+
+Mark "Fam" James
+fam@readyroom.org
+Manual layout
+
+Daniel "Coil" Johnson
+danj@Princeton.EDU
+Slideshow, miscellaneous other stuff
+
+Gareth "Grendel" Eckley
+games_design@hotmail.com
+Playtest lead
+
+
+Natural Selection uses technology from:
+---------------------------------------
+VALVe software (HL engine)
+FMOD (music playback)
+http://www.cs.unc.edu/~davemc/Particle (particle engine)
+Sound Ideas - The General 6000 (source sound library)
+
+
+Special thanks to:
+------------------
+Coffee
+Mom & Dad
+VALVe software
+Chris and Elaine Kakambouras
+Dave McAllister
+Bitchslap, and Clan F.o.R.
+Iron Lore Entertainment
+Adrenaline Zone (www.adrenzone.com)
+Gamespy and PlanetHalflife
+Josh Buck
+Steve Ashley
+Jason Childress
+Russell "Doomaniac" Weed
+Nick "Crinity" Coombe
+Nemesis Zero
+Maria "Mara" Cruzado
+The NS IRC operators (Commando, eBnar, Insane, Necrotic, pielemius, Scythe, shoven, BoZman20, chalupamonk, Cyanide, DOOManiac, Kenichi, KungFuSquirrel, Mouse, Us3r)
+The NS Forum Admins and Moderators (Coil, Comprox, Nemesis Zero, SpyderMonkey, Fam, Greedo386, humbaba, Marik Steele, rob6264, Talesin)
+Stainless Steel Studios
+Thai Hut
+Beran Peters
+The NS playtesters, veterans, and beta server ops (we couldn't have done it without you!)
+
+Natural Selection and all content is Copyright (C) 2003 Charles G. Cleveland
+"Natural Selection" is a trademark owned by Charles G. Cleveland
+
+
+Natural Selection is dedicated to Siobhan Colhoun, RIP
\ No newline at end of file
diff --git a/main/resource/ClientScheme.res b/main/resource/ClientScheme.res
new file mode 100644
index 00000000..a3d13fd1
--- /dev/null
+++ b/main/resource/ClientScheme.res
@@ -0,0 +1,1137 @@
+//
+// TRACKER SCHEME RESOURCE FILE
+//
+// sections:
+//		colors			- all the colors used by the scheme
+//		basesettings	- contains settings for app to use to draw controls
+//		fonts			- list of all the fonts used by app
+//		borders			- description of all the borders
+//
+// notes:
+// 		hit ctrl-alt-shift-R in the app to reload this file
+//
+Scheme
+{
+	//Name - currently overriden in code
+	//{
+	//	"Name"	"ClientScheme"
+	//}
+
+	//////////////////////// COLORS ///////////////////////////
+	Colors
+	{
+		// base colors
+		"BaseText"			"255 176 0 255"	// used in text windows, lists
+		"BrightBaseText"	"255 176 0 255"	// brightest text
+		"SelectedText"		"255 176 0 255"	// selected text
+		"DimBaseText"		"255 176 0 255"	// dim base text
+		"LabelDimText"		"255 176 0 164"	// used for info text
+		"ControlText"		"255 176 0 255"	// used in all text controls
+	//	"BrightControlText"	"255 176 0 255"	// use for selected controls
+		"BrightControlText"	"255 255 255 255"	// use for selected controls
+		"DisabledText1"		"80 48 0 255"	// disabled text
+		"DisabledText2"		"0 0 0 0"		// overlay color for disabled text (to give that inset look)
+		"DimListText"		"188 112 0 255"	// offline friends, unsubscribed games, etc.
+
+		// background colors
+		"ControlBG"			"0 0 0 0"		// background color of controls
+		"ControlDarkBG"		"0 0 0 128"		// darker background color; used for background of scrollbars
+		"WindowBG"			"0 0 0 200"		// background color of text edit panes (chat, text entries, etc.)
+		"SelectionBG"		"192 28 0 140"	// background color of any selected text or menu item
+		"SelectionBG2"		"70 12 0 0"		// selection background in window w/o focus
+		"ListBG"			"0 0 0 128"		// background of scoreboard
+		"ViewportBG"		"55 43 29 140"
+
+		// titlebar colors
+		"TitleText"			"255 174 0 255"
+		"TitleDimText"		"255 174 0 255"
+		"TitleBG"			"255 255 0 0"
+		"TitleDimBG"		"255 255 0 0"
+		
+		// slider tick colors
+		"SliderTickColor"		"127 140 127 255"
+		"SliderTrackColor"	"31 31 31 255"
+
+		// border colors
+		"BorderBright"		"64 52 36 255"	// the lit side of a control
+		"BorderDark"		"64 52 36 255"	// the dark/unlit side of a control
+		"BorderSelection"	"188 112 0 0"	// the additional border color for displaying the default/selected button
+
+		"team0"			"255 179 0 255"
+		"team1"			"76 102 76 255"
+		"team2"			"255 64 64 255"
+		"team3"			"255 179 0 255"
+		"team4"			"255 179 0 255"
+
+		"HintColor"		"255 255 255 160"
+		"HintBackgroundColor"	"0 0 0 128"
+
+		//new class menu colours
+		"ClassMenuLight"	"175 127 1 255"
+		"ClassMenuDark"		"64 52 36 255"
+		"white"				"255 255 255 255"
+		"red"				"255 0 0 255"
+		"nothing"			"0 0 0 0"
+
+		"MapDescriptionText"	"255 255 255 255" // the text used in the map description window
+	}
+
+	///////////////////// BASE SETTINGS ////////////////////////
+	// default settings for all panels
+	// controls use these to determine their settings
+	BaseSettings
+	{
+		"FgColor"			"ControlText"
+		"BgColor"			"ControlBG"
+		"LabelBgColor"		"ControlBG"
+		"SubPanelBgColor"	"ControlBG"
+
+		"DisabledFgColor1"		"DisabledText1" 
+		"DisabledFgColor2"		"DisabledText2"			// set this to the BgColor if you don't want it to draw
+
+		"TitleBarFgColor"			"TitleText"
+		"TitleBarDisabledFgColor"	"TitleDimText"
+		"TitleBarBgColor"			"TitleBG"
+		"TitleBarDisabledBgColor"	"TitleDimBG"
+
+		"TitleBarIcon"				"resource/icon_steam"
+		"TitleBarDisabledIcon"		"resource/icon_steam_disabled"
+
+		"TitleButtonFgColor"			"BorderBright"
+		"TitleButtonBgColor"			"ControlBG"
+		"TitleButtonDisabledFgColor"	"TitleDimText"
+		"TitleButtonDisabledBgColor"	"TitleDimBG"
+
+		"TextCursorColor"			"BaseText"			// color of the blinking text cursor in text entries
+		"URLTextColor"				"BrightBaseText"	// color that URL's show up in chat window
+
+		Menu
+		{
+			"FgColor"			"DimBaseText"
+			"BgColor"			"ControlBG"
+			"ArmedFgColor"		"BrightBaseText"
+			"ArmedBgColor"		"SelectionBG"
+			"DividerColor"		"BorderDark"
+			"TextInset"			"6"
+		}
+
+		MenuButton	  // the little arrow on the side of boxes that triggers drop down menus
+		{
+			"ButtonArrowColor"	"DimBaseText"		// color of arrows
+		   	"ButtonBgColor"		"WindowBG"			// bg color of button. same as background color of text edit panes 
+			"ArmedArrowColor"	"BrightBaseText"	// color of arrow when mouse is over button
+			"ArmedBgColor"		"DimBaseText"		// bg color of button when mouse is over button
+		}
+
+		Slider
+		{
+			"SliderFgColor"		"ControlBG"			// handle with which the slider is grabbed
+			"SliderBgColor"		"ControlDarkBG"		// area behind handle
+		}
+
+		ScrollBarSlider
+		{
+			"BgColor"					"ControlBG"		// this isn't really used
+			"ScrollBarSliderFgColor"	"ControlBG"		// handle with which the slider is grabbed
+			"ScrollBarSliderBgColor"	"ControlDarkBG"	// area behind handle
+			"ButtonFgColor"				"DimBaseText"	// color of arrows
+		}
+
+
+		// text edit windows
+		"WindowFgColor"				"BaseText"		// off-white
+		"WindowBgColor"				"WindowBG"		// redundant. can we get rid of WindowBgColor and just use WindowBG?
+		"WindowDisabledFgColor"		"DimBaseText"
+		"WindowDisabledBgColor"		"ListBG"		// background of chat conversation
+		"SelectionFgColor"			"SelectedText"	// fg color of selected text
+		"SelectionBgColor"			"SelectionBG"
+		"ListSelectionFgColor"		"SelectedText"
+		"ListBgColor"				"ListBG"		// background of server browser control, etc
+		"BuddyListBgColor"			"ListBG"		// background of buddy list pane
+		
+		// App-specific stuff
+		"ChatBgColor"				"WindowBG"
+
+		// status selection
+		"StatusSelectFgColor"		"BrightBaseText"
+		"StatusSelectFgColor2"		"BrightControlText"	// this is the color of the friends status
+
+		// checkboxes
+		"CheckButtonBorder1"   		"BorderDark"		// the left checkbutton border
+		"CheckButtonBorder2"   		"BorderBright"		// the right checkbutton border
+		"CheckButtonCheck"			"BrightControlText"	// color of the check itself
+		"CheckBgColor"				"ListBG"
+
+		// buttons (default fg/bg colors are used if these are not set)
+		"ButtonArmedFgColor"		"BrightControlText"
+		"ButtonArmedBgColor"		"ClassMenuLight"
+		"ButtonDepressedFgColor"	"BrightControlText"
+		"ButtonDepressedBgColor"	"ClassMenuLight"
+
+		"ButtonFgColor"				"BrightControlText"
+		"ButtonBgColor"				"ClassMenuDark"
+	
+		// buddy buttons
+		BuddyButton
+		{
+			"FgColor1"				"ControlText"
+			"FgColor2"				"DimListText"
+			"ArmedFgColor1"			"BrightBaseText"
+			"ArmedFgColor2"			"BrightBaseText"
+			"ArmedBgColor"			"SelectionBG"
+		}
+
+		Chat
+		{
+			"TextColor"				"BrightControlText"
+			"SelfTextColor"			"BaseText"
+			"SeperatorTextColor"	"DimBaseText"
+		}
+
+		"SectionTextColor"		"BrightControlText"	// text color for IN-GAME, ONLINE, OFFLINE sections of buddy list
+		"SectionDividerColor"	"BorderDark"		// color of line that runs under section name in buddy list
+	}
+
+	//
+	//////////////////////// FONTS /////////////////////////////
+	//
+	// describes all the fonts
+	Fonts
+	{
+		// fonts are used in order that they are listed
+		// fonts listed later in the order will only be used if they fulfill a range not already filled
+		// if a font fails to load then the subsequent fonts will replace
+		"Default"
+		{
+			"1"
+			{
+				"name"		"Times New Roman"
+				"tall"		"15"
+				"weight"	"400"
+				"range"		"0x0000 0x017F" //	Basic Latin, Latin-1 Supplement, Latin Extended-A
+				"antialias"		"1"
+			}
+			"2"
+			{
+				"name"		"Courier New"
+				"tall"		"15"
+				"weight"	"400"
+				"range"		"0x0000 0xFFFF"	//	all
+				"antialias"		"1"
+			}
+		}
+		"DefaultUnderline"
+		{
+			"1"
+			{
+				"name"		"Tahoma"
+				"tall"		"12"
+				"weight"	"500"
+				"underline" "1"
+				"range"		"0x0000 0x017F" //	Basic Latin, Latin-1 Supplement, Latin Extended-A
+			}
+			"2"
+			{
+				"name"		"Tahoma"
+				"tall"		"12"
+				"weight"	"500"
+				"underline" "1"
+				"range"		"0x0000 0xFFFF"	//	all
+			}
+		}
+		"DefaultSmall"
+		{
+			"1"
+			{
+				"name"		"Times New Roman"
+				"tall"		"13"
+				"weight"	"800"
+				"range"		"0x0000 0x017F" //	Basic Latin, Latin-1 Supplement, Latin Extended-A
+			}
+			"2"
+			{
+				"name"		"Courier New"
+				"tall"		"13"
+				"weight"	"800"
+				"range"		"0x0000 0xFFFF"	//	all
+			}
+		}
+		"DefaultVerySmall"
+		{
+			"1"
+			{
+				"name"		"Courier New"
+				"tall"		"11"
+				"weight"	"0"
+				"range"		"0x0000 0x017F" //	Basic Latin, Latin-1 Supplement, Latin Extended-A
+				"antialiased"	"1"
+			}
+			"2"
+			{
+				"name"		"Courier"
+				"tall"		"11"
+				"weight"	"0"
+				"range"		"0x0000 0xFFFF"	//	all
+				"antialiased"	"1"
+			}
+		}
+
+		// this is the symbol font
+		"Marlett"
+		{
+			"1"
+			{
+				"name"		"Marlett"
+				"tall"		"14"
+				"weight"	"0"
+				"symbol"	"1"
+				"range"		"0x0000 0x007F"	//	Basic Latin
+			}
+		}
+
+		"ClassMenuTitleFont"
+		{
+			"1"
+			{
+				"name"		"Times New Roman"
+				"tall"		"20"
+				"weight"	"500"		//bold 0 - 1000
+				"range"		"0x0000 0x007F" //  all
+				"antialias"	"1"
+			}
+			"2"
+			{
+				"name"		"Times New Roman"
+				"tall"		"20"
+				"weight"	"500"		
+				"range"		"0x0000 0xFFFF" //  all
+				"antialias"	"1"
+			}
+		}
+
+		"ClassMenuBoldFont"
+		{
+			"1"
+			{
+				"name"		"Times New Roman"
+				"tall"		"11"
+				"weight"	"800"		//bold 0 - 1000
+				"range"		"0x0000 0x007F" //  all
+				"antialias"	"1"
+			}
+			"2"
+			{
+				"name"		"Times New Roman"
+				"tall"		"11"
+				"weight"	"800"		
+				"range"		"0x0000 0xFFFF" //  all
+				"antialias"	"1"
+			}
+		}
+
+		"ClassMenuBodyFont"
+		{
+			"1"
+			{
+				"name"		"Times New Roman"
+				"tall"		"13"
+				"weight"	"500"		//bold 0 - 1000
+				"range"		"0x0000 0x007F" //  all
+				"antialias"	"1"
+			}
+			"2"
+			{
+				"name"		"Times New Roman"
+				"tall"		"13"
+				"weight"	"500"		
+				"range"		"0x0000 0xFFFF" //  all
+				"antialias"	"1"
+			}
+		}
+	}
+
+	//
+	//////////////////// BORDERS //////////////////////////////
+	//
+	// describes all the border types
+	Borders
+	{
+		BaseBorder
+		{
+			"inset" "0 0 1 1"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "1 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 0"
+				}
+			}
+		}
+		
+		TitleButtonBorder
+		{
+			"inset" "0 0 1 1"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "1 0"
+				}
+			}
+
+			Top
+			{
+				"4"
+				{
+					"color" "BorderBright"
+					"offset" "0 0"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+		}
+
+		TitleButtonDisabledBorder
+		{
+			"inset" "0 0 1 1"
+			Left
+			{
+				"1"
+				{
+					"color" "BgColor"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BgColor"
+					"offset" "1 0"
+				}
+			}
+			Top
+			{
+				"1"
+				{
+					"color" "BgColor"
+					"offset" "0 0"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "BgColor"
+					"offset" "0 0"
+				}
+			}
+		}
+
+		TitleButtonDepressedBorder
+		{
+			"inset" "1 1 1 1"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "1 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 0"
+				}
+			}
+		}
+
+		ScrollBarButtonBorder
+		{
+			"inset" "1 0 0 0"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "1 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 0"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+		}
+
+		ScrollBarButtonDepressedBorder
+		{
+			"inset" "2 2 0 0"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "1 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 0"
+				}
+			}
+		}
+		
+		ButtonDepressedBorder
+		{
+			"inset" "0 0 1 1"
+			Left
+			{
+				"1"
+				{
+					"color" "nothing"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "nothing"
+					"offset" "0 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "nothing"
+					"offset" "0 1"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "nothing"
+					"offset" "0 0"
+				}
+			}
+		}
+
+		ButtonKeyFocusBorder
+		{
+			"inset" "0 0 1 1"
+			Left
+			{
+				"1"
+				{
+					"color" "nothing"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "nothing"
+					"offset" "0 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "nothing"
+					"offset" "0 1"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "nothing"
+					"offset" "0 0"
+				}
+			}
+		}
+
+		ButtonBorder
+		{
+			"inset" "0 0 1 1"
+			Left
+			{
+				"1"
+				{
+					"color" "nothing"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "nothing"
+					"offset" "0 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "nothing"
+					"offset" "0 1"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "nothing"
+					"offset" "0 0"
+				}
+			}
+		}
+
+		FrameBorder
+		{
+			"inset" "0 0 1 1"
+			Left
+			{
+				"1"
+				{
+					"color" "ControlBG"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "ControlBG"
+					"offset" "0 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "ControlBG"
+					"offset" "0 1"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "ControlBG"
+					"offset" "0 0"
+				}
+			}
+		}
+
+		HintBorder
+		{
+			"inset" "0 0 1 1"
+			Left
+			{
+				"1"
+				{
+					"color" "HintColor"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "HintColor"
+					"offset" "0 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "HintColor"
+					"offset" "0 1"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "HintColor"
+					"offset" "0 0"
+				}
+			}
+		}
+
+
+		TabBorder
+		{
+			"inset" "0 0 1 1"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "1 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 0"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 0"
+				}
+			}
+		}
+
+		TabActiveBorder
+		{
+			"inset" "0 0 1 0"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 0"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "1 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 0"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "ControlBG"
+					"offset" "6 2"
+				}
+			}
+		}
+
+
+		ToolTipBorder
+		{
+			"inset" "0 0 1 0"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "1 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+		}
+
+		// this is the border used for default buttons (the button that gets pressed when you hit enter)
+		ButtonKeyFocusBorder
+		{
+			"inset" "0 0 1 1"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderSelection"
+					"offset" "0 0"
+				}
+				"2"
+				{
+					"color" "BorderBright"
+					"offset" "0 1"
+				}
+			}
+			Top
+			{
+				"1"
+				{
+					"color" "BorderSelection"
+					"offset" "0 0"
+				}
+				"2"
+				{
+					"color" "BorderBright"
+					"offset" "1 0"
+				}
+			}
+			Right
+			{
+				"1"
+				{
+					"color" "BorderSelection"
+					"offset" "0 0"
+				}
+				"2"
+				{
+					"color" "BorderDark"
+					"offset" "1 0"
+				}
+			}
+			Bottom
+			{
+				"1"
+				{
+					"color" "BorderSelection"
+					"offset" "0 0"
+				}
+				"2"
+				{
+					"color" "BorderDark"
+					"offset" "1 1"
+				}
+			}
+		}
+
+		ButtonDepressedBorder
+		{
+			"inset" "2 1 1 1"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "1 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 0"
+				}
+			}
+		}
+
+		ComboBoxBorder
+		{
+			"inset" "0 0 1 1"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "1 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 0"
+				}
+			}
+		}
+
+		MenuBorder
+		{
+			"inset" "1 1 1 1"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "1 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 0"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+		}
+		BrowserBorder
+		{
+			"inset" "0 0 0 1"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 0"
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/resource/GameMenu.res b/main/resource/GameMenu.res
new file mode 100644
index 00000000..3bc43eb2
--- /dev/null
+++ b/main/resource/GameMenu.res
@@ -0,0 +1,83 @@
+"GameMenu"
+{
+	"1"
+	{
+		"label" "#GameUI_GameMenu_ResumeGame"
+		"command" "ResumeGame"
+		"OnlyInGame" "1"
+	}
+	"2"
+	{
+		"label" "#Menu_ReadyRoom"
+		"command" "engine readyroom"
+		"OnlyInGame" "1"
+	}
+	"3"
+	{
+		"label" "#GameUI_GameMenu_Disconnect"
+		"command" "Disconnect"
+		"OnlyInGame" "1"
+	}
+//	"4"
+//	{
+//		"label" "#GameUI_GameMenu_NewGame"
+//		"command" "OpenNewGameDialog"
+//		"notmulti" "1"
+//	}
+//	"5"
+//	{
+//		"label" "#GameUI_GameMenu_LoadGame"
+//		"command" "OpenLoadGameDialog"
+//		"notmulti" "1"
+//	}
+	"6"
+	{
+		"label" "#GameUI_GameMenu_SaveGame"
+		"command" "OpenSaveGameDialog"
+		"notmulti" "1"
+		"OnlyInGame" "1"
+	}
+	"7"
+	{
+		"label" ""
+		"command" ""
+		"notmulti" "1"
+	}
+	"8"
+	{
+		"label" "#GameUI_GameMenu_FindServers"
+		"command" "OpenServerBrowser"
+	}
+	"9"
+	{
+		"label" "#GameUI_GameMenu_CreateServer"
+		"command" "OpenCreateMultiplayerGameDialog"
+	}
+//	"10"
+//	{
+//		"name" "LoadDemo"
+//		"label" "#GameUI_GameMenu_PlayDemo"
+//		"command" "OpenLoadDemoDialog"
+//	}
+	"11"
+	{
+		"label" ""
+		"command" ""
+	}
+	"12"
+	{
+		"label" "#GameUI_GameMenu_ChangeGame"
+		"command" "OpenChangeGameDialog"
+		"notsteam" "1"
+	}
+	"13"
+	{
+		"label" "#GameUI_GameMenu_Options"
+		"command" "OpenOptionsDialog"
+	}
+	"14"
+	{
+		"label" "#GameUI_GameMenu_Quit"
+		"command" "Quit"
+	}
+}
\ No newline at end of file
diff --git a/main/resource/TrackerScheme.res b/main/resource/TrackerScheme.res
new file mode 100644
index 00000000..81073305
--- /dev/null
+++ b/main/resource/TrackerScheme.res
@@ -0,0 +1,833 @@
+//
+// TRACKER SCHEME RESOURCE FILE
+//
+// sections:
+//		colors			- all the colors used by the scheme
+//		basesettings	- contains settings for app to use to draw controls
+//		fonts			- list of all the fonts used by app
+//		borders			- description of all the borders
+//
+// notes:
+// 		hit ctrl-alt-shift-R in the app to reload this file
+//
+Scheme
+{
+	//////////////////////// COLORS ///////////////////////////
+	Colors
+	{
+		// base colors
+		"BaseText"			"255 170 0 220"	// used in text windows, lists
+		"BrightBaseText"	"255 170 0 255"	// brightest text
+		"SelectedText"		"255 170 0 255"	// selected text
+		"DimBaseText"		"255 170 0 200"	// dim base text
+		"LabelDimText"		"255 170 0 200"	// used for info text
+		"ControlText"		"255 170 0 200"	// used in all text controls
+		"BrightControlText"	"255 170 0 220"	// use for selected controls
+		"DisabledText1"		"236 236 236 155"	// disabled text
+		"DisabledText2"		"148 148 148 155"	// overlay color for disabled text (to give that inset look)
+		"DimListText"		"112 112 112 255"	// offline friends, unsubscribed games, etc.
+
+		// background colors
+		"ControlBG"			"0 0 0 128"				// background color of controls
+		"ControlDarkBG"		"0 0 0 200"		// darker background color; used for background of scrollbars
+		"WindowBG"			"0 0 0 150"		// background color of text edit panes (chat, text entries, etc.)
+		"SelectionBG"		"224 156 48 160"	// background color of any selected text or menu item
+		"SelectionBG2"		"164 164 164 255"		// selection background in window w/o focus
+		"ListBG"			"0 0 0 200"		// background of server browser, buddy list, etc.
+
+		// titlebar colors
+		"TitleText"			"255 255 255 255"
+		"TitleDimText"		"125 125 125 255"
+		"TitleBG"			"206 206 206 0"
+		"TitleDimBG"		"206 206 206 0"
+		
+		// slider tick colors
+		"SliderTickColor"		"206 206 206 255"
+		"SliderTrackColor"	"56 56 56 255"
+
+		// border colors
+		"BorderBright"		"236 236 236 255"	// the lit side of a control
+		"BorderDark"		"112 112 112 255"		// the dark/unlit side of a control
+		"BorderSelection"		"0 0 0 255"			// the additional border color for displaying the default/selected button
+
+		// from kTeamColors in AvHSharedUtil.cpp
+		"team0"			"255 255 255 255"
+		"team1"			"125 165 210 255"
+		"team2"			"255 170 0 255"
+		"team3"			"145 215 140 255"
+		"team4"			"200 90 70 255"
+	}
+
+	///////////////////// BASE SETTINGS ////////////////////////
+	// default settings for all panels
+	// controls use these to determine their settings
+	BaseSettings
+	{
+		"FgColor"			"ControlText"
+		"BgColor"			"ControlBG"
+		"LabelBgColor"		"ControlBG"
+		"SubPanelBgColor"	"ControlBG"
+
+		"DisabledFgColor1"		"DisabledText1" 
+		"DisabledFgColor2"		"DisabledText2"			// set this to the BgColor if you don't want it to draw
+
+		"TitleBarFgColor"			"TitleText"
+		"TitleBarDisabledFgColor"	"TitleDimText"
+		"TitleBarBgColor"			"TitleBG"
+		"TitleBarDisabledBgColor"	"TitleDimBG"
+
+		"TitleBarIcon"			"resource/icon_steam"
+		"TitleBarDisabledIcon"		"resource/icon_steam_disabled"
+
+		"TitleButtonFgColor"		"TitleText"
+		"TitleButtonBgColor"		"ControlBG"
+		"TitleButtonDisabledFgColor"	"TitleDimText"
+		"TitleButtonDisabledBgColor"	"TitleDimBG"
+
+		"TextCursorColor"			"BaseText"			// color of the blinking text cursor in text entries
+		"URLTextColor"			"BrightBaseText"	// color that URL's show up in chat window
+
+		Menu
+		{
+			"FgColor"			"DimBaseText"
+			"BgColor"			"ControlBG"
+			"ArmedFgColor"		"BrightBaseText"
+			"ArmedBgColor"		"SelectionBG"
+			"DividerColor"		"BorderDark"
+
+			"TextInset"			"6"
+		}
+
+		MenuButton	  // the little arrow on the side of boxes that triggers drop down menus
+		{
+			"ButtonArrowColor"	"DimBaseText"		// color of arrows
+		   	"ButtonBgColor"		"WindowBG"			// bg color of button. same as background color of text edit panes 
+			"ArmedArrowColor"		"BorderBright"	// color of arrow when mouse is over button
+			"ArmedBgColor"		"DimBaseText"		// bg color of button when mouse is over button
+		}
+
+		Slider
+		{
+			"SliderFgColor"		"ControlBG"			// handle with which the slider is grabbed
+			"SliderBgColor"		"ControlDarkBG"		// area behind handle
+		}
+
+		ScrollBarSlider
+		{
+			"BgColor"					"ControlBG"		// this isn't really used
+			"ScrollBarSliderFgColor"	"ControlBG"		// handle with which the slider is grabbed
+			"ScrollBarSliderBgColor"	"ControlDarkBG"	// area behind handle
+			"ButtonFgColor"				"DimBaseText"	// color of arrows
+		}
+
+
+		// text edit windows
+		"WindowFgColor"				"BaseText"		// off-white
+		"WindowBgColor"				"WindowBG"		// redundant. can we get rid of WindowBgColor and just use WindowBG?
+		"WindowDisabledFgColor"		"DimBaseText"
+		"WindowDisabledBgColor"		"ListBG"		// background of chat conversation
+		"SelectionFgColor"			"SelectedText"	// fg color of selected text
+		"SelectionBgColor"			"SelectionBG"
+		"ListSelectionFgColor"		"SelectedText"
+		"ListBgColor"				"ListBG"		// background of server browser control, etc
+		"BuddyListBgColor"			"ListBG"		// background of buddy list pane
+		
+		// App-specific stuff
+		"ChatBgColor"				"WindowBG"
+
+		// status selection
+		"StatusSelectFgColor"		"BrightBaseText"
+		"StatusSelectFgColor2"		"BrightControlText"	// this is the color of the friends status
+
+		// checkboxes
+		"CheckButtonBorder1"   		"BorderDark"		// the left checkbutton border
+		"CheckButtonBorder2"   		"BorderBright"		// the right checkbutton border
+		"CheckButtonCheck"			"BrightControlText"	// color of the check itself
+		"CheckBgColor"				"ListBG"
+
+		// buttons (default fg/bg colors are used if these are not set)
+//		"ButtonArmedFgColor"
+//		"ButtonArmedBgColor"
+//		"ButtonDepressedFgColor"	"BrightControlText"
+//		"ButtonDepressedBgColor"
+
+		// buddy buttons
+		BuddyButton
+		{
+			"FgColor1"				"ControlText"
+			"FgColor2"				"DimListText"
+			"ArmedFgColor1"			"BrightBaseText"
+			"ArmedFgColor2"			"BrightBaseText"
+			"ArmedBgColor"			"SelectionBG"
+		}
+
+		Chat
+		{
+			"TextColor"				"BrightControlText"
+			"SelfTextColor"			"BaseText"
+			"SeperatorTextColor"	"DimBaseText"
+		}
+
+		InGameDesktop
+		{
+			"MenuColor"			"200 200 200 255"
+			"ArmedMenuColor"	"255 255 255 255"
+			"DepressedMenuColor" "192 186 80 255"
+			"WidescreenBarColor" "0 0 0 0"
+			"MenuItemVisibilityRate" "0.03"  // time it takes for one menu item to appear
+			"MenuItemHeight"	"28"
+			"GameMenuInset"		"32"
+		}
+
+		"SectionTextColor"		"BrightControlText"	// text color for IN-GAME, ONLINE, OFFLINE sections of buddy list
+		"SectionDividerColor"	"BorderDark"		// color of line that runs under section name in buddy list
+	}
+
+	//
+	//////////////////////// FONTS /////////////////////////////
+	//
+	// describes all the fonts
+	Fonts
+	{
+		// fonts are used in order that they are listed
+		// fonts listed later in the order will only be used if they fulfill a range not already filled
+		// if a font fails to load then the subsequent fonts will replace
+		"Default"
+		{
+			"1"
+			{
+				"name"		"Tahoma"
+				"tall"		"16"
+				"weight"	"0"
+			}
+		}
+		"DefaultUnderline"
+		{
+			"1"
+			{
+				"name"		"Tahoma"
+				"tall"		"16"
+				"weight"	"0"
+				"underline" "1"
+			}
+		}
+		"DefaultSmall"
+		{
+			"1"
+			{
+				"name"		"Tahoma"
+				"tall"		"13"
+				"weight"	"0"
+			}
+		}
+		"DefaultVerySmall"
+		{
+			"1"
+			{
+				"name"		"Tahoma"
+				"tall"		"12"
+				"weight"	"0"
+			}
+		}
+		"MenuLarge"
+		{
+			"1"
+			{
+				"name"		"Verdana"
+				"tall"		"18"
+				"weight"	"1000"
+				"antialias" "1"
+			}
+			"2"
+			{
+				"name"		"Arial"
+				"tall"		"18"
+				"weight"	"800"
+				"antialias" "1"
+			}
+		}
+
+		// this is the symbol font
+		"Marlett"
+		{
+			"1"
+			{
+				"name"		"Marlett"
+				"tall"		"14"
+				"weight"	"0"
+				"symbol"	"1"
+			}
+		}
+		
+		"EngineFont"
+		{
+			"1"
+			{
+				"name"		"Verdana Bold"
+				"tall"		"12"
+				"weight"	"0"
+				"yres"	"480 599"
+				"dropshadow"	"1"
+			}
+			"2"
+			{
+				"name"		"Verdana Bold"
+				"tall"		"13"
+				"weight"	"0"
+				"yres"	"600 767"
+				"dropshadow"	"1"
+			}
+			"3"
+			{
+				"name"		"Verdana Bold"
+				"tall"		"14"
+				"weight"	"0"
+				"yres"	"768 1023"
+				"dropshadow"	"1"
+			}
+			"4"
+			{
+				"name"		"Verdana Bold"
+				"tall"		"20"
+				"weight"	"0"
+				"yres"	"1024 1199"
+				"dropshadow"	"1"
+			}
+			"5"
+			{
+				"name"		"Verdana Bold"
+				"tall"		"24"
+				"weight"	"0"
+				"yres"	"1200 6000"
+				"dropshadow"	"1"
+			}
+			"6"
+			{
+				"name"		"Verdana"
+				"tall"		"12"
+				"weight"		"600"
+				"dropshadow"	"1"
+			}
+			"7"
+			{
+				"name"		"Arial"
+				"tall"		"11"
+				"weight"		"800"
+				"dropshadow"	"1"
+			}
+		}	
+
+		"CreditsFont"
+		{
+			"1"
+			{
+				"name"		"Trebuchet MS"
+				"tall"		"18"
+				"weight"	"600"
+				"antialias"	"1"
+			}
+			"2"
+			{
+				"name"		"Arial"
+				"tall"		"18"
+				"weight"		"600"
+				"dropshadow"	"1"
+			}
+		}
+
+		"Legacy_CreditsFont" // Added to accomodate 3rd party server plugins, etc. This version should not scale.
+		{
+			"1"
+			{
+				"name"		"Trebuchet MS"
+				"tall"		"20"
+				"weight"	"700"
+				"antialias"	"1"
+				"yres"	"1 10000"
+			}
+			"2"
+			{
+				"name"		"Arial"
+				"tall"		"20"
+				"weight"		"600"
+				"dropshadow"	"1"
+			}
+		}
+	}
+
+	//
+	//////////////////// BORDERS //////////////////////////////
+	//
+	// describes all the border types
+	Borders
+	{
+		// references to other borders
+		BaseBorder		"InsetBorder"
+		ComboBoxBorder	"InsetBorder"
+		BrowserBorder	"InsetBorder"
+		ButtonBorder	"RaisedBorder"
+		FrameBorder		"RaisedBorder"
+		TabBorder		"RaisedBorder"
+		MenuBorder		"RaisedBorder"
+		
+		// standard borders
+		InsetBorder
+		{
+			"inset" "0 0 1 1"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "1 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 0"
+				}
+			}
+		}
+
+		RaisedBorder
+		{
+			"inset" "0 0 1 1"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 1"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+		}
+
+		// special border types
+		TitleButtonBorder
+		{
+			"inset" "0 0 1 1"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "1 0"
+				}
+			}
+
+			Top
+			{
+				"4"
+				{
+					"color" "BorderBright"
+					"offset" "0 0"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+		}
+
+		TitleButtonDisabledBorder
+		{
+			"inset" "0 0 1 1"
+			Left
+			{
+				"1"
+				{
+					"color" "BgColor"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BgColor"
+					"offset" "1 0"
+				}
+			}
+			Top
+			{
+				"1"
+				{
+					"color" "BgColor"
+					"offset" "0 0"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "BgColor"
+					"offset" "0 0"
+				}
+			}
+		}
+
+		TitleButtonDepressedBorder
+		{
+			"inset" "1 1 1 1"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "1 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 0"
+				}
+			}
+		}
+
+		ScrollBarButtonBorder
+		{
+			"inset" "1 0 0 0"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "1 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 0"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+		}
+
+		ScrollBarButtonDepressedBorder
+		{
+			"inset" "2 2 0 0"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "1 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 0"
+				}
+			}
+		}
+		
+		TabActiveBorder
+		{
+			"inset" "0 0 1 0"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 0"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "1 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 0"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "ControlBG"
+					"offset" "6 2"
+				}
+			}
+		}
+
+
+		ToolTipBorder
+		{
+			"inset" "0 0 1 0"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "1 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+		}
+
+		// this is the border used for default buttons (the button that gets pressed when you hit enter)
+		ButtonKeyFocusBorder
+		{
+			"inset" "0 0 1 1"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderSelection"
+					"offset" "0 0"
+				}
+				"2"
+				{
+					"color" "BorderBright"
+					"offset" "0 1"
+				}
+			}
+			Top
+			{
+				"1"
+				{
+					"color" "BorderSelection"
+					"offset" "0 0"
+				}
+				"2"
+				{
+					"color" "BorderBright"
+					"offset" "1 0"
+				}
+			}
+			Right
+			{
+				"1"
+				{
+					"color" "BorderSelection"
+					"offset" "0 0"
+				}
+				"2"
+				{
+					"color" "BorderDark"
+					"offset" "1 0"
+				}
+			}
+			Bottom
+			{
+				"1"
+				{
+					"color" "BorderSelection"
+					"offset" "0 0"
+				}
+				"2"
+				{
+					"color" "BorderDark"
+					"offset" "1 1"
+				}
+			}
+		}
+
+		ButtonDepressedBorder
+		{
+			"inset" "2 1 1 1"
+			Left
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 1"
+				}
+			}
+
+			Right
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "1 0"
+				}
+			}
+
+			Top
+			{
+				"1"
+				{
+					"color" "BorderDark"
+					"offset" "0 0"
+				}
+			}
+
+			Bottom
+			{
+				"1"
+				{
+					"color" "BorderBright"
+					"offset" "0 0"
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/resource/background/800_1_a_loading.tga b/main/resource/background/800_1_a_loading.tga
new file mode 100644
index 00000000..8a1841bc
Binary files /dev/null and b/main/resource/background/800_1_a_loading.tga differ
diff --git a/main/resource/background/800_1_b_loading.tga b/main/resource/background/800_1_b_loading.tga
new file mode 100644
index 00000000..02a8b5a1
Binary files /dev/null and b/main/resource/background/800_1_b_loading.tga differ
diff --git a/main/resource/background/800_1_c_loading.tga b/main/resource/background/800_1_c_loading.tga
new file mode 100644
index 00000000..49965abf
Binary files /dev/null and b/main/resource/background/800_1_c_loading.tga differ
diff --git a/main/resource/background/800_1_d_loading.tga b/main/resource/background/800_1_d_loading.tga
new file mode 100644
index 00000000..2ed1b203
Binary files /dev/null and b/main/resource/background/800_1_d_loading.tga differ
diff --git a/main/resource/background/800_2_a_loading.tga b/main/resource/background/800_2_a_loading.tga
new file mode 100644
index 00000000..159e7050
Binary files /dev/null and b/main/resource/background/800_2_a_loading.tga differ
diff --git a/main/resource/background/800_2_b_loading.tga b/main/resource/background/800_2_b_loading.tga
new file mode 100644
index 00000000..17f55872
Binary files /dev/null and b/main/resource/background/800_2_b_loading.tga differ
diff --git a/main/resource/background/800_2_c_loading.tga b/main/resource/background/800_2_c_loading.tga
new file mode 100644
index 00000000..679b8ecb
Binary files /dev/null and b/main/resource/background/800_2_c_loading.tga differ
diff --git a/main/resource/background/800_2_d_loading.tga b/main/resource/background/800_2_d_loading.tga
new file mode 100644
index 00000000..5cfebaef
Binary files /dev/null and b/main/resource/background/800_2_d_loading.tga differ
diff --git a/main/resource/background/800_3_a_loading.tga b/main/resource/background/800_3_a_loading.tga
new file mode 100644
index 00000000..79b78d1d
Binary files /dev/null and b/main/resource/background/800_3_a_loading.tga differ
diff --git a/main/resource/background/800_3_b_loading.tga b/main/resource/background/800_3_b_loading.tga
new file mode 100644
index 00000000..4ac55798
Binary files /dev/null and b/main/resource/background/800_3_b_loading.tga differ
diff --git a/main/resource/background/800_3_c_loading.tga b/main/resource/background/800_3_c_loading.tga
new file mode 100644
index 00000000..a1b16960
Binary files /dev/null and b/main/resource/background/800_3_c_loading.tga differ
diff --git a/main/resource/background/800_3_d_loading.tga b/main/resource/background/800_3_d_loading.tga
new file mode 100644
index 00000000..d58012e7
Binary files /dev/null and b/main/resource/background/800_3_d_loading.tga differ
diff --git a/main/resource/game_menu.tga b/main/resource/game_menu.tga
new file mode 100644
index 00000000..a079cf2a
Binary files /dev/null and b/main/resource/game_menu.tga differ
diff --git a/main/resource/game_menu_mouseover.tga b/main/resource/game_menu_mouseover.tga
new file mode 100644
index 00000000..6c66ecdd
Binary files /dev/null and b/main/resource/game_menu_mouseover.tga differ
diff --git a/main/resource/ns_english.txt b/main/resource/ns_english.txt
new file mode 100644
index 00000000..31887a0e
Binary files /dev/null and b/main/resource/ns_english.txt differ
diff --git a/main/resource/ns_french.txt b/main/resource/ns_french.txt
new file mode 100644
index 00000000..8da627fa
Binary files /dev/null and b/main/resource/ns_french.txt differ
diff --git a/main/resource/ns_german.txt b/main/resource/ns_german.txt
new file mode 100644
index 00000000..0017d394
Binary files /dev/null and b/main/resource/ns_german.txt differ
diff --git a/main/resource/ns_spanish.txt b/main/resource/ns_spanish.txt
new file mode 100644
index 00000000..aafc304f
Binary files /dev/null and b/main/resource/ns_spanish.txt differ
diff --git a/main/resource/ns_turkish.txt b/main/resource/ns_turkish.txt
new file mode 100644
index 00000000..cd990f13
Binary files /dev/null and b/main/resource/ns_turkish.txt differ
diff --git a/main/server.cfg b/main/server.cfg
new file mode 100644
index 00000000..79e50d18
--- /dev/null
+++ b/main/server.cfg
@@ -0,0 +1,97 @@
+// Use this file to configure your DEDICATED server. 
+// This config file is executed everytime the server changes levels (disable by removing mapchangecfgfile at end)
+//
+// Please visit the server ops forum on www.natural-selection.org, or check out the manual if you have any questions about any of these settings.
+//
+
+////////////////////////////////////////////////////
+// Common between listenserver.cfg and server.cfg //
+////////////////////////////////////////////////////
+
+// Default server name. Change to "Bob's Server", etc.
+hostname "Natural Selection v3.0"
+
+// Must specify sv_region, or it won't show up in Steam server browser
+// 0: US East coast
+// 1: US West coast
+// 2: South America
+// 3: Europe
+// 4: Asia
+// 5: Australia
+// 6: Middle East
+// 7: Africa
+sv_region 0
+
+// general gameplay
+mp_autoconcede 4
+mp_limitteams 1
+mp_combattime 15
+
+// block abusive console scripts (wait, special, etc.)?
+mp_blockscripts 0
+
+// Set to -1 to disallow voting (looks in mapcycle.txt for entries)
+mp_mapvoteratio .6
+
+// Enable HLTV proxies to connect
+sv_proxies 1
+
+// maximum client movement speed (needed for commander mode)
+sv_maxspeed 4000
+sv_allowdownload 1
+mp_consistency 0
+
+// Commander voting
+mp_votedowntime 180
+mp_votecasttime 2
+mp_votepercentneeded .4
+mp_minvotesneeded 3
+
+// More obscure settings
+mp_countdowntime .2
+mp_latejointime 1.5
+mp_logdetail 0
+mp_falldamage 1
+mp_killdelay 3
+mp_flashlight 1
+mp_footsteps 1
+
+// disable autoaim and mad gibs
+sv_aim 0
+violence_hgibs 0
+violence_agibs 0
+
+// player bounding boxes (collisions, not clipping)
+sv_clienttrace 3.5
+
+/////////////////////////////////////////
+// Server options (in listenserver UI) //
+/////////////////////////////////////////
+mp_tournamentmode 0
+mp_friendlyfire 0
+sv_cheats 0
+mp_drawdamage 0
+
+// Handicap one side (0-100)
+mp_team1damagepercent 100
+mp_team2damagepercent 100
+
+// 60 minute timelimit (never ends match in progress)
+mp_timelimit 60
+
+///////////////////////////////
+// Dedicated server specific //
+///////////////////////////////
+sv_lan 0
+
+// disable clients' ability to pause the server
+pausable 0
+
+// List server op WON or Steam ids here, delimited by semi-colons (eg, "STEAM_0:1:12345;STEAM_0:0:56736"), to display server op icon next to these players on this server.
+mp_serverops ""
+
+// Allows display of special authentication icons next to people's names (including developers, Constellation members, etc.)
+mp_uplink 1
+
+// Needed so this file is executed on map change, like pre-NS v2.1
+mapchangecfgfile server.cfg
diff --git a/main/settings.scr b/main/settings.scr
new file mode 100644
index 00000000..385de080
--- /dev/null
+++ b/main/settings.scr
@@ -0,0 +1,161 @@
+// NOTE:  THIS FILE IS AUTOMATICALLY REGENERATED, 
+//DO NOT EDIT THIS HEADER, YOUR COMMENTS WILL BE LOST IF YOU DO
+// Multiplayer options script
+//
+// Format:
+//  Version [float]
+//  Options description followed by 
+//  Options defaults
+//
+// Option description syntax:
+//
+//  "cvar" { "Prompt" { type [ type info ] } { default } }
+//
+//  type = 
+//   BOOL   (a yes/no toggle)
+//   STRING
+//   NUMBER
+//   LIST
+//
+// type info:
+// BOOL                 no type info
+// NUMBER       min max range, use -1 -1 for no limits
+// STRING       no type info
+// LIST          delimited list of options value pairs
+//
+//
+// default depends on type
+// BOOL is "0" or "1"
+// NUMBER is "value"
+// STRING is "value"
+// LIST is "index", where index "0" is the first element of the list
+
+
+// Half-Life Server Configuration Layout Script (stores last settings chosen, too)
+// File generated:  Thu Mar 03 11:29:18 PM
+//
+//
+// Cvar	-	Setting
+
+VERSION 1.0
+
+DESCRIPTION SERVER_OPTIONS
+{
+	"sv_lan"
+	{
+		"LAN Game"
+		{ BOOL }
+		{ "0" }
+	}
+
+	"hostname"
+	{
+		"#Valve_Hostname"
+		{ STRING }
+		{ "Natural Selection 3.0 Server" }
+	}
+
+	"maxplayers"
+	{
+		"#Valve_Max_Players"
+		{ NUMBER 2.000000 32.000000 }
+		{ "2.000000" }
+	}
+
+	"sv_password"
+	{
+		"#Valve_Server_Password"
+		{ STRING }
+		{ "" }
+	}
+
+	"sv_region"
+	{
+		"Server Location (Steam)"
+		{
+			LIST
+			"255: World" "255"
+			"0: US East coast" "0"
+			"1: US West coast" "1"
+			"2: South America" "2"
+			"3: Europe" "3"
+			"4: Asia" "4"
+			"5: Australia" "5"
+			"6: Middle East" "6"
+			"7: Africa" "7"
+		}
+		{ "255.000000" }
+	}
+
+	"sv_sendvelocity"
+	{
+		"Low ping server physics"
+		{ BOOL }
+		{ "1" }
+	}
+
+	"mp_tournamentmode"
+	{
+		"Server mode"
+		{
+			LIST
+			"Casual" "0"
+			"Tournament" "1"
+		}
+		{ "0.000000" }
+	}
+
+	"mp_friendlyfire"
+	{
+		"Friendly fire"
+		{
+			LIST
+			"Disabled" "0"
+			"Enabled" "1"
+		}
+		{ "0.000000" }
+	}
+
+	"sv_cheats"
+	{
+		"Enable cheats"
+		{ BOOL }
+		{ "1" }
+	}
+
+	"mp_drawdamage"
+	{
+		"Draw numeric damage"
+		{ BOOL }
+		{ "0" }
+	}
+
+	"mp_team1damagepercent"
+	{
+		"Marine damage percent"
+		{ NUMBER 0.000000 100.000000 }
+		{ "100.000000" }
+	}
+
+	"mp_team2damagepercent"
+	{
+		"Alien damage percent"
+		{ NUMBER 0.000000 100.000000 }
+		{ "100.000000" }
+	}
+
+	"mp_timelimit"
+	{
+		"Time limit (minutes)"
+		{ NUMBER 0.000000 -1.000000 }
+		{ "30.000000" }
+	}
+
+	"mp_votemapratio"
+	{
+		"Votemap ratio"
+		{ NUMBER -1.000000 1.000000 }
+		{ "0.510000" }
+	}
+
+}
diff --git a/main/skill.cfg b/main/skill.cfg
new file mode 100644
index 00000000..c64fffb8
--- /dev/null
+++ b/main/skill.cfg
@@ -0,0 +1,393 @@
+// DON'T MESS WITH THIS.
+
+// MONSTERS
+
+// Alien Grunt
+sk_agrunt_health1	"60"
+sk_agrunt_health2	"90"
+sk_agrunt_health3	"120"
+
+sk_agrunt_dmg_punch1	"10"
+sk_agrunt_dmg_punch2	"20"
+sk_agrunt_dmg_punch3	"20"
+
+
+// Apache 
+sk_apache_health1	"150"
+sk_apache_health2	"250"
+sk_apache_health3	"400"
+
+
+// Barney
+sk_barney_health1	"35"
+sk_barney_health2	"35"
+sk_barney_health3	"35"
+
+
+// Bullsquid
+sk_bullsquid_health1	"40"
+sk_bullsquid_health2	"40"
+sk_bullsquid_health3	"120"
+
+sk_bullsquid_dmg_bite1	"15"
+sk_bullsquid_dmg_bite2	"25"
+sk_bullsquid_dmg_bite3	"25"
+
+sk_bullsquid_dmg_whip1	"25"
+sk_bullsquid_dmg_whip2	"35"
+sk_bullsquid_dmg_whip3	"35"
+
+sk_bullsquid_dmg_spit1	"10"
+sk_bullsquid_dmg_spit2	"10"
+sk_bullsquid_dmg_spit3	"15"
+
+// Big momma
+sk_bigmomma_health_factor1 	"1.0"
+sk_bigmomma_health_factor2 	"1.5"
+sk_bigmomma_health_factor3 	"2"
+
+sk_bigmomma_dmg_slash1 	"50"
+sk_bigmomma_dmg_slash2 	"60"
+sk_bigmomma_dmg_slash3 	"70"
+
+sk_bigmomma_dmg_blast1 	"100"
+sk_bigmomma_dmg_blast2 	"120"
+sk_bigmomma_dmg_blast3 	"160"
+
+sk_bigmomma_radius_blast1 "250"
+sk_bigmomma_radius_blast2 "250"
+sk_bigmomma_radius_blast3 "275"
+
+// Gargantua
+sk_gargantua_health1	"800"
+sk_gargantua_health2	"800"
+sk_gargantua_health3	"1000"
+
+sk_gargantua_dmg_slash1	"10"
+sk_gargantua_dmg_slash2	"30"
+sk_gargantua_dmg_slash3	"30"
+
+sk_gargantua_dmg_fire1	"3"
+sk_gargantua_dmg_fire2	"5"
+sk_gargantua_dmg_fire3	"5"
+
+sk_gargantua_dmg_stomp1	"50"
+sk_gargantua_dmg_stomp2	"100"
+sk_gargantua_dmg_stomp3	"100"
+
+
+// Hassassin
+sk_hassassin_health1	"30"
+sk_hassassin_health2	"50"
+sk_hassassin_health3	"50"
+
+
+// Headcrab
+sk_headcrab_health1	"10"
+sk_headcrab_health2	"10"
+sk_headcrab_health3	"20"
+
+sk_headcrab_dmg_bite1	"5"
+sk_headcrab_dmg_bite2	"10"
+sk_headcrab_dmg_bite3	"10"
+
+
+// Hgrunt 
+sk_hgrunt_health1		"50"
+sk_hgrunt_health2		"50"
+sk_hgrunt_health3		"80"
+
+sk_hgrunt_kick1		"5"
+sk_hgrunt_kick2		"10"
+sk_hgrunt_kick3		"10"
+
+sk_hgrunt_pellets1	"3"
+sk_hgrunt_pellets2	"5"
+sk_hgrunt_pellets3	"6"
+
+sk_hgrunt_gspeed1	"400"
+sk_hgrunt_gspeed2	"600"
+sk_hgrunt_gspeed3	"800"
+
+// Houndeye
+sk_houndeye_health1	"20"
+sk_houndeye_health2	"20"
+sk_houndeye_health3	"30"
+
+sk_houndeye_dmg_blast1	"10"
+sk_houndeye_dmg_blast2	"15"
+sk_houndeye_dmg_blast3	"15"
+
+
+// ISlave
+sk_islave_health1		"30"
+sk_islave_health2		"30"
+sk_islave_health3		"60"
+
+sk_islave_dmg_claw1	"8"
+sk_islave_dmg_claw2	"10"
+sk_islave_dmg_claw3	"10"
+
+sk_islave_dmg_clawrake1	"25"
+sk_islave_dmg_clawrake2	"25"
+sk_islave_dmg_clawrake3	"25"
+
+sk_islave_dmg_zap1	"10"
+sk_islave_dmg_zap2	"10"
+sk_islave_dmg_zap3	"15"
+
+
+// Icthyosaur
+sk_ichthyosaur_health1	"200"
+sk_ichthyosaur_health2	"200"
+sk_ichthyosaur_health3	"400"
+
+sk_ichthyosaur_shake1 "20"
+sk_ichthyosaur_shake2 "35"
+sk_ichthyosaur_shake3 "50"
+
+
+// Leech
+sk_leech_health1	"2"
+sk_leech_health2	"2"
+sk_leech_health3	"2"
+
+sk_leech_dmg_bite1	"2"
+sk_leech_dmg_bite2	"2"
+sk_leech_dmg_bite3	"2"
+
+
+// Controller
+sk_controller_health1	"60"
+sk_controller_health2	"60"
+sk_controller_health3	"100"
+
+sk_controller_dmgzap1	"15"
+sk_controller_dmgzap2	"25"
+sk_controller_dmgzap3	"35"
+
+sk_controller_speedball1	"650"
+sk_controller_speedball2	"800"
+sk_controller_speedball3	"1000"
+
+sk_controller_dmgball1	"3"
+sk_controller_dmgball2	"4"
+sk_controller_dmgball3	"5"
+
+// Nihilanth
+sk_nihilanth_health1	"800"
+sk_nihilanth_health2	"800"
+sk_nihilanth_health3	"1000"
+
+sk_nihilanth_zap1	"30"
+sk_nihilanth_zap2	"30"
+sk_nihilanth_zap3	"50"
+
+// Scientist
+sk_scientist_health1	"20"
+sk_scientist_health2	"20"
+sk_scientist_health3	"20"
+
+
+// Snark
+sk_snark_health1	"2"
+sk_snark_health2	"2"
+sk_snark_health3	"2"
+
+sk_snark_dmg_bite1	"10"
+sk_snark_dmg_bite2	"10"
+sk_snark_dmg_bite3	"10"
+
+sk_snark_dmg_pop1		"5"
+sk_snark_dmg_pop2		"5"
+sk_snark_dmg_pop3		"5"
+
+
+// Zombie
+sk_zombie_health1	"50"
+sk_zombie_health2	"50"
+sk_zombie_health3	"100"
+
+sk_zombie_dmg_one_slash1	"10"
+sk_zombie_dmg_one_slash2	"20"
+sk_zombie_dmg_one_slash3	"20"
+
+sk_zombie_dmg_both_slash1	"25"
+sk_zombie_dmg_both_slash2	"40"
+sk_zombie_dmg_both_slash3	"40"
+
+
+//Turret
+sk_turret_health1	"50"
+sk_turret_health2	"50"
+sk_turret_health3	"60"
+
+
+// MiniTurret
+sk_miniturret_health1	"40"
+sk_miniturret_health2	"40"
+sk_miniturret_health3	"50"
+
+
+// Sentry Turret
+sk_sentry_health1	"40"
+sk_sentry_health2	"40"
+sk_sentry_health3	"50"
+
+
+// PLAYER WEAPONS
+
+// Crowbar whack
+sk_plr_crowbar1		"10"
+sk_plr_crowbar2		"10"
+sk_plr_crowbar3		"10"
+
+// 9mmhandgun Round
+sk_plr_9mm_bullet1	"8"
+sk_plr_9mm_bullet2	"8"
+sk_plr_9mm_bullet3	"8"
+
+// 357 Round
+sk_plr_357_bullet1	"40"
+sk_plr_357_bullet2	"40"
+sk_plr_357_bullet3	"40"
+
+// 9mmAR Round
+sk_plr_9mmAR_bullet1	"5"
+sk_plr_9mmAR_bullet2	"5"
+sk_plr_9mmAR_bullet3	"5"
+
+// M203 grenade
+sk_plr_9mmAR_grenade1	"100"
+sk_plr_9mmAR_grenade2	"100"
+sk_plr_9mmAR_grenade3	"100"
+
+// Shotgun buckshot
+sk_plr_buckshot1	"5"
+sk_plr_buckshot2	"5"
+sk_plr_buckshot3	"5"
+
+// Crossbow
+sk_plr_xbow_bolt_client1	"10"
+sk_plr_xbow_bolt_client2	"10"
+sk_plr_xbow_bolt_client3	"10"
+
+sk_plr_xbow_bolt_monster1	"50"
+sk_plr_xbow_bolt_monster2	"50"
+sk_plr_xbow_bolt_monster3	"50"
+
+// RPG
+sk_plr_rpg1		"100"
+sk_plr_rpg2		"100"
+sk_plr_rpg3		"100"
+
+// Gauss Gun
+sk_plr_gauss1		"20"
+sk_plr_gauss2		"20"
+sk_plr_gauss3		"20"
+
+// Egon Gun
+sk_plr_egon_narrow1	"6"
+sk_plr_egon_narrow2	"6"
+sk_plr_egon_narrow3	"6"
+
+sk_plr_egon_wide1		"14"
+sk_plr_egon_wide2		"14"
+sk_plr_egon_wide3		"14"
+
+// Hand Grendade
+sk_plr_hand_grenade1	"100"
+sk_plr_hand_grenade2	"100"
+sk_plr_hand_grenade3	"100"
+
+// Satchel Charge
+sk_plr_satchel1		"150"
+sk_plr_satchel2		"150"
+sk_plr_satchel3		"150"
+
+// Tripmine
+sk_plr_tripmine1	"150"
+sk_plr_tripmine2	"150"
+sk_plr_tripmine3	"150"
+
+// MONSTER WEAPONS
+sk_12mm_bullet1		"8"
+sk_12mm_bullet2		"10"
+sk_12mm_bullet3		"10"
+
+sk_9mmAR_bullet1		"3"
+sk_9mmAR_bullet2		"4"
+sk_9mmAR_bullet3		"5"
+
+sk_9mm_bullet1		"5"
+sk_9mm_bullet2		"5"
+sk_9mm_bullet3		"8"
+
+// HORNET
+sk_hornet_dmg1		"4"
+sk_hornet_dmg2		"5"
+sk_hornet_dmg3		"8"
+
+// HEALTH/SUIT CHARGE DISTRIBUTION
+sk_suitcharger1		"75"
+sk_suitcharger2		"50"
+sk_suitcharger3		"35"
+
+sk_battery1			"15"
+sk_battery2			"15"
+sk_battery3			"10"
+
+sk_healthcharger1		"50"
+sk_healthcharger2		"40"
+sk_healthcharger3		"25"
+
+sk_healthkit1		"15"
+sk_healthkit2		"15"
+sk_healthkit3		"10"
+
+sk_scientist_heal1	"25"
+sk_scientist_heal2	"25"
+sk_scientist_heal3	"25"
+
+// monster damage adjusters
+sk_monster_head1	"3"
+sk_monster_head2	"3"
+sk_monster_head3	"3"
+
+sk_monster_chest1	"1"
+sk_monster_chest2	"1"
+sk_monster_chest3	"1"
+
+sk_monster_stomach1	"1"
+sk_monster_stomach2	"1"
+sk_monster_stomach3	"1"
+
+sk_monster_arm1		"1"
+sk_monster_arm2		"1"
+sk_monster_arm3		"1"
+
+sk_monster_leg1		"1"
+sk_monster_leg2		"1"
+sk_monster_leg3		"1"
+
+// player damage adjusters
+sk_player_head1		"3"
+sk_player_head2		"3"
+sk_player_head3		"3"
+
+sk_player_chest1	"1"
+sk_player_chest2	"1"
+sk_player_chest3	"1"
+
+sk_player_stomach1	"1"
+sk_player_stomach2	"1"
+sk_player_stomach3	"1"
+
+sk_player_arm1		"1"
+sk_player_arm2		"1"
+sk_player_arm3		"1"
+
+sk_player_leg1		"1"
+sk_player_leg2		"1"
+sk_player_leg3		"1"
+
diff --git a/main/sound/ambience/alarmloop.wav b/main/sound/ambience/alarmloop.wav
new file mode 100644
index 00000000..568ce998
Binary files /dev/null and b/main/sound/ambience/alarmloop.wav differ
diff --git a/main/sound/ambience/ambient02.mp3 b/main/sound/ambience/ambient02.mp3
new file mode 100644
index 00000000..0e52aa24
Binary files /dev/null and b/main/sound/ambience/ambient02.mp3 differ
diff --git a/main/sound/ambience/ambient04.mp3 b/main/sound/ambience/ambient04.mp3
new file mode 100644
index 00000000..d5537711
Binary files /dev/null and b/main/sound/ambience/ambient04.mp3 differ
diff --git a/main/sound/ambience/ambient05.mp3 b/main/sound/ambience/ambient05.mp3
new file mode 100644
index 00000000..b1d3d7df
Binary files /dev/null and b/main/sound/ambience/ambient05.mp3 differ
diff --git a/main/sound/ambience/ambient06.mp3 b/main/sound/ambience/ambient06.mp3
new file mode 100644
index 00000000..2bc37a21
Binary files /dev/null and b/main/sound/ambience/ambient06.mp3 differ
diff --git a/main/sound/ambience/ambient07.mp3 b/main/sound/ambience/ambient07.mp3
new file mode 100644
index 00000000..64bb88ae
Binary files /dev/null and b/main/sound/ambience/ambient07.mp3 differ
diff --git a/main/sound/ambience/ambient08.mp3 b/main/sound/ambience/ambient08.mp3
new file mode 100644
index 00000000..156c9da4
Binary files /dev/null and b/main/sound/ambience/ambient08.mp3 differ
diff --git a/main/sound/ambience/ambient09.mp3 b/main/sound/ambience/ambient09.mp3
new file mode 100644
index 00000000..9e2d3f7f
Binary files /dev/null and b/main/sound/ambience/ambient09.mp3 differ
diff --git a/main/sound/ambience/ambient10.mp3 b/main/sound/ambience/ambient10.mp3
new file mode 100644
index 00000000..b9ba445c
Binary files /dev/null and b/main/sound/ambience/ambient10.mp3 differ
diff --git a/main/sound/ambience/ambient11.mp3 b/main/sound/ambience/ambient11.mp3
new file mode 100644
index 00000000..c325c66e
Binary files /dev/null and b/main/sound/ambience/ambient11.mp3 differ
diff --git a/main/sound/ambience/ambient12.mp3 b/main/sound/ambience/ambient12.mp3
new file mode 100644
index 00000000..a868e82b
Binary files /dev/null and b/main/sound/ambience/ambient12.mp3 differ
diff --git a/main/sound/ambience/ambient13.mp3 b/main/sound/ambience/ambient13.mp3
new file mode 100644
index 00000000..ed4a4e6e
Binary files /dev/null and b/main/sound/ambience/ambient13.mp3 differ
diff --git a/main/sound/ambience/ambient14.mp3 b/main/sound/ambience/ambient14.mp3
new file mode 100644
index 00000000..5a2bb634
Binary files /dev/null and b/main/sound/ambience/ambient14.mp3 differ
diff --git a/main/sound/ambience/atmospheric.mp3 b/main/sound/ambience/atmospheric.mp3
new file mode 100644
index 00000000..533f1366
Binary files /dev/null and b/main/sound/ambience/atmospheric.mp3 differ
diff --git a/main/sound/ambience/b1.mp3 b/main/sound/ambience/b1.mp3
new file mode 100644
index 00000000..53ebd9c7
Binary files /dev/null and b/main/sound/ambience/b1.mp3 differ
diff --git a/main/sound/ambience/b2.mp3 b/main/sound/ambience/b2.mp3
new file mode 100644
index 00000000..53c33cd1
Binary files /dev/null and b/main/sound/ambience/b2.mp3 differ
diff --git a/main/sound/ambience/b3.wav b/main/sound/ambience/b3.wav
new file mode 100644
index 00000000..0ddf9d6d
Binary files /dev/null and b/main/sound/ambience/b3.wav differ
diff --git a/main/sound/ambience/b4.wav b/main/sound/ambience/b4.wav
new file mode 100644
index 00000000..a6549e11
Binary files /dev/null and b/main/sound/ambience/b4.wav differ
diff --git a/main/sound/ambience/b5.wav b/main/sound/ambience/b5.wav
new file mode 100644
index 00000000..0634bca2
Binary files /dev/null and b/main/sound/ambience/b5.wav differ
diff --git a/main/sound/ambience/b6.mp3 b/main/sound/ambience/b6.mp3
new file mode 100644
index 00000000..25fa1ec2
Binary files /dev/null and b/main/sound/ambience/b6.mp3 differ
diff --git a/main/sound/ambience/b9.mp3 b/main/sound/ambience/b9.mp3
new file mode 100644
index 00000000..533f1366
Binary files /dev/null and b/main/sound/ambience/b9.mp3 differ
diff --git a/main/sound/ambience/bastturbine.wav b/main/sound/ambience/bastturbine.wav
new file mode 100644
index 00000000..3d953422
Binary files /dev/null and b/main/sound/ambience/bastturbine.wav differ
diff --git a/main/sound/ambience/bastwind2.wav b/main/sound/ambience/bastwind2.wav
new file mode 100644
index 00000000..f95d40a4
Binary files /dev/null and b/main/sound/ambience/bastwind2.wav differ
diff --git a/main/sound/ambience/bb.wav b/main/sound/ambience/bb.wav
new file mode 100644
index 00000000..294fbd0c
Binary files /dev/null and b/main/sound/ambience/bb.wav differ
diff --git a/main/sound/ambience/bc.wav b/main/sound/ambience/bc.wav
new file mode 100644
index 00000000..0a425f6b
Binary files /dev/null and b/main/sound/ambience/bc.wav differ
diff --git a/main/sound/ambience/bd.wav b/main/sound/ambience/bd.wav
new file mode 100644
index 00000000..8c0ee6c1
Binary files /dev/null and b/main/sound/ambience/bd.wav differ
diff --git a/main/sound/ambience/be.wav b/main/sound/ambience/be.wav
new file mode 100644
index 00000000..a467cb42
Binary files /dev/null and b/main/sound/ambience/be.wav differ
diff --git a/main/sound/ambience/bf.wav b/main/sound/ambience/bf.wav
new file mode 100644
index 00000000..0eede568
Binary files /dev/null and b/main/sound/ambience/bf.wav differ
diff --git a/main/sound/ambience/bg.wav b/main/sound/ambience/bg.wav
new file mode 100644
index 00000000..57b4125d
Binary files /dev/null and b/main/sound/ambience/bg.wav differ
diff --git a/main/sound/ambience/bighum.mp3 b/main/sound/ambience/bighum.mp3
new file mode 100644
index 00000000..e3af8748
Binary files /dev/null and b/main/sound/ambience/bighum.mp3 differ
diff --git a/main/sound/ambience/controlroom.mp3 b/main/sound/ambience/controlroom.mp3
new file mode 100644
index 00000000..d53118b2
Binary files /dev/null and b/main/sound/ambience/controlroom.mp3 differ
diff --git a/main/sound/ambience/distantmoan1.mp3 b/main/sound/ambience/distantmoan1.mp3
new file mode 100644
index 00000000..4e926346
Binary files /dev/null and b/main/sound/ambience/distantmoan1.mp3 differ
diff --git a/main/sound/ambience/distantmoan2.mp3 b/main/sound/ambience/distantmoan2.mp3
new file mode 100644
index 00000000..bf5e027e
Binary files /dev/null and b/main/sound/ambience/distantmoan2.mp3 differ
diff --git a/main/sound/ambience/distantmortar3.wav b/main/sound/ambience/distantmortar3.wav
new file mode 100644
index 00000000..e77fe6d1
Binary files /dev/null and b/main/sound/ambience/distantmortar3.wav differ
diff --git a/main/sound/ambience/doorclose2.wav b/main/sound/ambience/doorclose2.wav
new file mode 100644
index 00000000..13d5088b
Binary files /dev/null and b/main/sound/ambience/doorclose2.wav differ
diff --git a/main/sound/ambience/echodrops.mp3 b/main/sound/ambience/echodrops.mp3
new file mode 100644
index 00000000..8fec59dd
Binary files /dev/null and b/main/sound/ambience/echodrops.mp3 differ
diff --git a/main/sound/ambience/emdrill.wav b/main/sound/ambience/emdrill.wav
new file mode 100644
index 00000000..62e61c4c
Binary files /dev/null and b/main/sound/ambience/emdrill.wav differ
diff --git a/main/sound/ambience/emptyhowl.mp3 b/main/sound/ambience/emptyhowl.mp3
new file mode 100644
index 00000000..64046a2c
Binary files /dev/null and b/main/sound/ambience/emptyhowl.mp3 differ
diff --git a/main/sound/ambience/eng.wav b/main/sound/ambience/eng.wav
new file mode 100644
index 00000000..af198954
Binary files /dev/null and b/main/sound/ambience/eng.wav differ
diff --git a/main/sound/ambience/engagelev.wav b/main/sound/ambience/engagelev.wav
new file mode 100644
index 00000000..0cdebd20
Binary files /dev/null and b/main/sound/ambience/engagelev.wav differ
diff --git a/main/sound/ambience/enginethrob.mp3 b/main/sound/ambience/enginethrob.mp3
new file mode 100644
index 00000000..d1d772fc
Binary files /dev/null and b/main/sound/ambience/enginethrob.mp3 differ
diff --git a/main/sound/ambience/forcefield1.mp3 b/main/sound/ambience/forcefield1.mp3
new file mode 100644
index 00000000..25fa1ec2
Binary files /dev/null and b/main/sound/ambience/forcefield1.mp3 differ
diff --git a/main/sound/ambience/forcefield2.mp3 b/main/sound/ambience/forcefield2.mp3
new file mode 100644
index 00000000..2eed02ee
Binary files /dev/null and b/main/sound/ambience/forcefield2.mp3 differ
diff --git a/main/sound/ambience/hatch2.mp3 b/main/sound/ambience/hatch2.mp3
new file mode 100644
index 00000000..1bb8868d
Binary files /dev/null and b/main/sound/ambience/hatch2.mp3 differ
diff --git a/main/sound/ambience/hiveamb.mp3 b/main/sound/ambience/hiveamb.mp3
new file mode 100644
index 00000000..eab585c5
Binary files /dev/null and b/main/sound/ambience/hiveamb.mp3 differ
diff --git a/main/sound/ambience/hotspark.wav b/main/sound/ambience/hotspark.wav
new file mode 100644
index 00000000..adf4039a
Binary files /dev/null and b/main/sound/ambience/hotspark.wav differ
diff --git a/main/sound/ambience/howl1.mp3 b/main/sound/ambience/howl1.mp3
new file mode 100644
index 00000000..52e591b9
Binary files /dev/null and b/main/sound/ambience/howl1.mp3 differ
diff --git a/main/sound/ambience/howl2.mp3 b/main/sound/ambience/howl2.mp3
new file mode 100644
index 00000000..5d0b047d
Binary files /dev/null and b/main/sound/ambience/howl2.mp3 differ
diff --git a/main/sound/ambience/hum.wav b/main/sound/ambience/hum.wav
new file mode 100644
index 00000000..92538158
Binary files /dev/null and b/main/sound/ambience/hum.wav differ
diff --git a/main/sound/ambience/hvyvibrate.mp3 b/main/sound/ambience/hvyvibrate.mp3
new file mode 100644
index 00000000..b4606e89
Binary files /dev/null and b/main/sound/ambience/hvyvibrate.mp3 differ
diff --git a/main/sound/ambience/klaxon.wav b/main/sound/ambience/klaxon.wav
new file mode 100644
index 00000000..6dd19319
Binary files /dev/null and b/main/sound/ambience/klaxon.wav differ
diff --git a/main/sound/ambience/klaxon2.wav b/main/sound/ambience/klaxon2.wav
new file mode 100644
index 00000000..7c455ebf
Binary files /dev/null and b/main/sound/ambience/klaxon2.wav differ
diff --git a/main/sound/ambience/klaxon3.wav b/main/sound/ambience/klaxon3.wav
new file mode 100644
index 00000000..86849ee6
Binary files /dev/null and b/main/sound/ambience/klaxon3.wav differ
diff --git a/main/sound/ambience/klaxon4.wav b/main/sound/ambience/klaxon4.wav
new file mode 100644
index 00000000..cfd5e9cb
Binary files /dev/null and b/main/sound/ambience/klaxon4.wav differ
diff --git a/main/sound/ambience/lapwater.mp3 b/main/sound/ambience/lapwater.mp3
new file mode 100644
index 00000000..c507f5fe
Binary files /dev/null and b/main/sound/ambience/lapwater.mp3 differ
diff --git a/main/sound/ambience/leverthrow.wav b/main/sound/ambience/leverthrow.wav
new file mode 100644
index 00000000..48382949
Binary files /dev/null and b/main/sound/ambience/leverthrow.wav differ
diff --git a/main/sound/ambience/lkburner1.wav b/main/sound/ambience/lkburner1.wav
new file mode 100644
index 00000000..fad42b2d
Binary files /dev/null and b/main/sound/ambience/lkburner1.wav differ
diff --git a/main/sound/ambience/lkburner2.wav b/main/sound/ambience/lkburner2.wav
new file mode 100644
index 00000000..49575dd5
Binary files /dev/null and b/main/sound/ambience/lkburner2.wav differ
diff --git a/main/sound/ambience/lkburner3.wav b/main/sound/ambience/lkburner3.wav
new file mode 100644
index 00000000..a60b422d
Binary files /dev/null and b/main/sound/ambience/lkburner3.wav differ
diff --git a/main/sound/ambience/lobeep1.wav b/main/sound/ambience/lobeep1.wav
new file mode 100644
index 00000000..29180e13
Binary files /dev/null and b/main/sound/ambience/lobeep1.wav differ
diff --git a/main/sound/ambience/lockdoor.mp3 b/main/sound/ambience/lockdoor.mp3
new file mode 100644
index 00000000..e4d1f7a3
Binary files /dev/null and b/main/sound/ambience/lockdoor.mp3 differ
diff --git a/main/sound/ambience/lowhit1.mp3 b/main/sound/ambience/lowhit1.mp3
new file mode 100644
index 00000000..770de5fa
Binary files /dev/null and b/main/sound/ambience/lowhit1.mp3 differ
diff --git a/main/sound/ambience/lowhit2.mp3 b/main/sound/ambience/lowhit2.mp3
new file mode 100644
index 00000000..d7990117
Binary files /dev/null and b/main/sound/ambience/lowhit2.mp3 differ
diff --git a/main/sound/ambience/lowsteam.wav b/main/sound/ambience/lowsteam.wav
new file mode 100644
index 00000000..8f21b5e0
Binary files /dev/null and b/main/sound/ambience/lowsteam.wav differ
diff --git a/main/sound/ambience/metalnoise.mp3 b/main/sound/ambience/metalnoise.mp3
new file mode 100644
index 00000000..b2ffa718
Binary files /dev/null and b/main/sound/ambience/metalnoise.mp3 differ
diff --git a/main/sound/ambience/metalstress.wav b/main/sound/ambience/metalstress.wav
new file mode 100644
index 00000000..1b37dc1e
Binary files /dev/null and b/main/sound/ambience/metalstress.wav differ
diff --git a/main/sound/ambience/ominous.mp3 b/main/sound/ambience/ominous.mp3
new file mode 100644
index 00000000..167db563
Binary files /dev/null and b/main/sound/ambience/ominous.mp3 differ
diff --git a/main/sound/ambience/pings.mp3 b/main/sound/ambience/pings.mp3
new file mode 100644
index 00000000..0e741bfc
Binary files /dev/null and b/main/sound/ambience/pings.mp3 differ
diff --git a/main/sound/ambience/processing.wav b/main/sound/ambience/processing.wav
new file mode 100644
index 00000000..fb79cdfe
Binary files /dev/null and b/main/sound/ambience/processing.wav differ
diff --git a/main/sound/ambience/pulsingwhine.wav b/main/sound/ambience/pulsingwhine.wav
new file mode 100644
index 00000000..6bcab76d
Binary files /dev/null and b/main/sound/ambience/pulsingwhine.wav differ
diff --git a/main/sound/ambience/rain.wav b/main/sound/ambience/rain.wav
new file mode 100644
index 00000000..372cb430
Binary files /dev/null and b/main/sound/ambience/rain.wav differ
diff --git a/main/sound/ambience/rain2.wav b/main/sound/ambience/rain2.wav
new file mode 100644
index 00000000..864ca2df
Binary files /dev/null and b/main/sound/ambience/rain2.wav differ
diff --git a/main/sound/ambience/rocket_groan4.wav b/main/sound/ambience/rocket_groan4.wav
new file mode 100644
index 00000000..43f5b51d
Binary files /dev/null and b/main/sound/ambience/rocket_groan4.wav differ
diff --git a/main/sound/ambience/rumblewhine.wav b/main/sound/ambience/rumblewhine.wav
new file mode 100644
index 00000000..461c994b
Binary files /dev/null and b/main/sound/ambience/rumblewhine.wav differ
diff --git a/main/sound/ambience/rustydoor.mp3 b/main/sound/ambience/rustydoor.mp3
new file mode 100644
index 00000000..f3d63e33
Binary files /dev/null and b/main/sound/ambience/rustydoor.mp3 differ
diff --git a/main/sound/ambience/scaryambience.mp3 b/main/sound/ambience/scaryambience.mp3
new file mode 100644
index 00000000..922fbd8b
Binary files /dev/null and b/main/sound/ambience/scaryambience.mp3 differ
diff --git a/main/sound/ambience/shaft.wav b/main/sound/ambience/shaft.wav
new file mode 100644
index 00000000..3743b305
Binary files /dev/null and b/main/sound/ambience/shaft.wav differ
diff --git a/main/sound/ambience/steamburst1.wav b/main/sound/ambience/steamburst1.wav
new file mode 100644
index 00000000..b2a0522b
Binary files /dev/null and b/main/sound/ambience/steamburst1.wav differ
diff --git a/main/sound/ambience/steamburst2.mp3 b/main/sound/ambience/steamburst2.mp3
new file mode 100644
index 00000000..522ca678
Binary files /dev/null and b/main/sound/ambience/steamburst2.mp3 differ
diff --git a/main/sound/ambience/steamburst2.wav b/main/sound/ambience/steamburst2.wav
new file mode 100644
index 00000000..fac8a25c
Binary files /dev/null and b/main/sound/ambience/steamburst2.wav differ
diff --git a/main/sound/ambience/steamburst4.wav b/main/sound/ambience/steamburst4.wav
new file mode 100644
index 00000000..8da2d963
Binary files /dev/null and b/main/sound/ambience/steamburst4.wav differ
diff --git a/main/sound/ambience/steamjet1.wav b/main/sound/ambience/steamjet1.wav
new file mode 100644
index 00000000..f5f9fa11
Binary files /dev/null and b/main/sound/ambience/steamjet1.wav differ
diff --git a/main/sound/ambience/thunder1.wav b/main/sound/ambience/thunder1.wav
new file mode 100644
index 00000000..b93f1afd
Binary files /dev/null and b/main/sound/ambience/thunder1.wav differ
diff --git a/main/sound/ambience/thunder2.wav b/main/sound/ambience/thunder2.wav
new file mode 100644
index 00000000..a38a0c3b
Binary files /dev/null and b/main/sound/ambience/thunder2.wav differ
diff --git a/main/sound/ambience/thunder_clap.wav b/main/sound/ambience/thunder_clap.wav
new file mode 100644
index 00000000..eca59fd7
Binary files /dev/null and b/main/sound/ambience/thunder_clap.wav differ
diff --git a/main/sound/ambience/thunder_st_1.wav b/main/sound/ambience/thunder_st_1.wav
new file mode 100644
index 00000000..18656f97
Binary files /dev/null and b/main/sound/ambience/thunder_st_1.wav differ
diff --git a/main/sound/ambience/turbine.wav b/main/sound/ambience/turbine.wav
new file mode 100644
index 00000000..1bda6b8d
Binary files /dev/null and b/main/sound/ambience/turbine.wav differ
diff --git a/main/sound/ambience/waterfall1.wav b/main/sound/ambience/waterfall1.wav
new file mode 100644
index 00000000..398f0042
Binary files /dev/null and b/main/sound/ambience/waterfall1.wav differ
diff --git a/main/sound/ambience/wind2.wav b/main/sound/ambience/wind2.wav
new file mode 100644
index 00000000..059b0070
Binary files /dev/null and b/main/sound/ambience/wind2.wav differ
diff --git a/main/sound/ambience/wind3.wav b/main/sound/ambience/wind3.wav
new file mode 100644
index 00000000..f67b1507
Binary files /dev/null and b/main/sound/ambience/wind3.wav differ
diff --git a/main/sound/buttons/button1.wav b/main/sound/buttons/button1.wav
new file mode 100644
index 00000000..01dfcefc
Binary files /dev/null and b/main/sound/buttons/button1.wav differ
diff --git a/main/sound/buttons/button10.wav b/main/sound/buttons/button10.wav
new file mode 100644
index 00000000..66371bfe
Binary files /dev/null and b/main/sound/buttons/button10.wav differ
diff --git a/main/sound/buttons/button2.wav b/main/sound/buttons/button2.wav
new file mode 100644
index 00000000..4cb222dd
Binary files /dev/null and b/main/sound/buttons/button2.wav differ
diff --git a/main/sound/buttons/button3.wav b/main/sound/buttons/button3.wav
new file mode 100644
index 00000000..8c9fd0f2
Binary files /dev/null and b/main/sound/buttons/button3.wav differ
diff --git a/main/sound/buttons/button4.wav b/main/sound/buttons/button4.wav
new file mode 100644
index 00000000..1f796b0a
Binary files /dev/null and b/main/sound/buttons/button4.wav differ
diff --git a/main/sound/buttons/button5.wav b/main/sound/buttons/button5.wav
new file mode 100644
index 00000000..5980ed58
Binary files /dev/null and b/main/sound/buttons/button5.wav differ
diff --git a/main/sound/buttons/button6.wav b/main/sound/buttons/button6.wav
new file mode 100644
index 00000000..4cf8ae0c
Binary files /dev/null and b/main/sound/buttons/button6.wav differ
diff --git a/main/sound/buttons/button7.wav b/main/sound/buttons/button7.wav
new file mode 100644
index 00000000..01eaffee
Binary files /dev/null and b/main/sound/buttons/button7.wav differ
diff --git a/main/sound/buttons/button9.wav b/main/sound/buttons/button9.wav
new file mode 100644
index 00000000..9216ae1a
Binary files /dev/null and b/main/sound/buttons/button9.wav differ
diff --git a/main/sound/co_daimos/rrsec.wav b/main/sound/co_daimos/rrsec.wav
new file mode 100644
index 00000000..09a7f09e
Binary files /dev/null and b/main/sound/co_daimos/rrsec.wav differ
diff --git a/main/sound/co_daimos/vocal01.wav b/main/sound/co_daimos/vocal01.wav
new file mode 100644
index 00000000..07c26fcd
Binary files /dev/null and b/main/sound/co_daimos/vocal01.wav differ
diff --git a/main/sound/co_daimos/vocal02.wav b/main/sound/co_daimos/vocal02.wav
new file mode 100644
index 00000000..77a03021
Binary files /dev/null and b/main/sound/co_daimos/vocal02.wav differ
diff --git a/main/sound/co_daimos/vocal03.wav b/main/sound/co_daimos/vocal03.wav
new file mode 100644
index 00000000..bdb2723a
Binary files /dev/null and b/main/sound/co_daimos/vocal03.wav differ
diff --git a/main/sound/co_daimos/vocal04.wav b/main/sound/co_daimos/vocal04.wav
new file mode 100644
index 00000000..0fdf7786
Binary files /dev/null and b/main/sound/co_daimos/vocal04.wav differ
diff --git a/main/sound/co_kestrel/catticked.wav b/main/sound/co_kestrel/catticked.wav
new file mode 100644
index 00000000..00939b37
Binary files /dev/null and b/main/sound/co_kestrel/catticked.wav differ
diff --git a/main/sound/co_niveus/bastwind2.wav b/main/sound/co_niveus/bastwind2.wav
new file mode 100644
index 00000000..f95d40a4
Binary files /dev/null and b/main/sound/co_niveus/bastwind2.wav differ
diff --git a/main/sound/co_niveus/bg.wav b/main/sound/co_niveus/bg.wav
new file mode 100644
index 00000000..57b4125d
Binary files /dev/null and b/main/sound/co_niveus/bg.wav differ
diff --git a/main/sound/co_niveus/emdrill.wav b/main/sound/co_niveus/emdrill.wav
new file mode 100644
index 00000000..62e61c4c
Binary files /dev/null and b/main/sound/co_niveus/emdrill.wav differ
diff --git a/main/sound/co_niveus/hum.wav b/main/sound/co_niveus/hum.wav
new file mode 100644
index 00000000..92538158
Binary files /dev/null and b/main/sound/co_niveus/hum.wav differ
diff --git a/main/sound/co_niveus/steamburst1.wav b/main/sound/co_niveus/steamburst1.wav
new file mode 100644
index 00000000..b2a0522b
Binary files /dev/null and b/main/sound/co_niveus/steamburst1.wav differ
diff --git a/main/sound/co_niveus/steamjet1.wav b/main/sound/co_niveus/steamjet1.wav
new file mode 100644
index 00000000..f5f9fa11
Binary files /dev/null and b/main/sound/co_niveus/steamjet1.wav differ
diff --git a/main/sound/co_sava/fan2.wav b/main/sound/co_sava/fan2.wav
new file mode 100644
index 00000000..e7a8d7b2
Binary files /dev/null and b/main/sound/co_sava/fan2.wav differ
diff --git a/main/sound/co_sava/pulsingwhine.wav b/main/sound/co_sava/pulsingwhine.wav
new file mode 100644
index 00000000..4cf69df2
Binary files /dev/null and b/main/sound/co_sava/pulsingwhine.wav differ
diff --git a/main/sound/co_sava/steamburst1.wav b/main/sound/co_sava/steamburst1.wav
new file mode 100644
index 00000000..dfed4e64
Binary files /dev/null and b/main/sound/co_sava/steamburst1.wav differ
diff --git a/main/sound/co_ulysses/raindos.wav b/main/sound/co_ulysses/raindos.wav
new file mode 100644
index 00000000..8352c50b
Binary files /dev/null and b/main/sound/co_ulysses/raindos.wav differ
diff --git a/main/sound/co_ulysses/raindos2.wav b/main/sound/co_ulysses/raindos2.wav
new file mode 100644
index 00000000..8c8a5885
Binary files /dev/null and b/main/sound/co_ulysses/raindos2.wav differ
diff --git a/main/sound/common/wpn_denyselect-a.wav b/main/sound/common/wpn_denyselect-a.wav
new file mode 100644
index 00000000..51d2829f
Binary files /dev/null and b/main/sound/common/wpn_denyselect-a.wav differ
diff --git a/main/sound/common/wpn_denyselect.wav b/main/sound/common/wpn_denyselect.wav
new file mode 100644
index 00000000..3279a514
Binary files /dev/null and b/main/sound/common/wpn_denyselect.wav differ
diff --git a/main/sound/common/wpn_hudoff-a.wav b/main/sound/common/wpn_hudoff-a.wav
new file mode 100644
index 00000000..5f6fea05
Binary files /dev/null and b/main/sound/common/wpn_hudoff-a.wav differ
diff --git a/main/sound/common/wpn_hudoff.wav b/main/sound/common/wpn_hudoff.wav
new file mode 100644
index 00000000..4955ceb4
Binary files /dev/null and b/main/sound/common/wpn_hudoff.wav differ
diff --git a/main/sound/common/wpn_hudon-a.wav b/main/sound/common/wpn_hudon-a.wav
new file mode 100644
index 00000000..67e4769b
Binary files /dev/null and b/main/sound/common/wpn_hudon-a.wav differ
diff --git a/main/sound/common/wpn_hudon.wav b/main/sound/common/wpn_hudon.wav
new file mode 100644
index 00000000..128fe19c
Binary files /dev/null and b/main/sound/common/wpn_hudon.wav differ
diff --git a/main/sound/common/wpn_moveselect-a.wav b/main/sound/common/wpn_moveselect-a.wav
new file mode 100644
index 00000000..aa08160b
Binary files /dev/null and b/main/sound/common/wpn_moveselect-a.wav differ
diff --git a/main/sound/common/wpn_moveselect.wav b/main/sound/common/wpn_moveselect.wav
new file mode 100644
index 00000000..8e45250f
Binary files /dev/null and b/main/sound/common/wpn_moveselect.wav differ
diff --git a/main/sound/common/wpn_select-a.wav b/main/sound/common/wpn_select-a.wav
new file mode 100644
index 00000000..a6247233
Binary files /dev/null and b/main/sound/common/wpn_select-a.wav differ
diff --git a/main/sound/common/wpn_select.wav b/main/sound/common/wpn_select.wav
new file mode 100644
index 00000000..456c4030
Binary files /dev/null and b/main/sound/common/wpn_select.wav differ
diff --git a/main/sound/doors/doormove1.wav b/main/sound/doors/doormove1.wav
new file mode 100644
index 00000000..70e426b0
Binary files /dev/null and b/main/sound/doors/doormove1.wav differ
diff --git a/main/sound/doors/doormove2.wav b/main/sound/doors/doormove2.wav
new file mode 100644
index 00000000..fa40cfa0
Binary files /dev/null and b/main/sound/doors/doormove2.wav differ
diff --git a/main/sound/doors/doormove3.wav b/main/sound/doors/doormove3.wav
new file mode 100644
index 00000000..999072cb
Binary files /dev/null and b/main/sound/doors/doormove3.wav differ
diff --git a/main/sound/doors/doormove4.wav b/main/sound/doors/doormove4.wav
new file mode 100644
index 00000000..b473a57c
Binary files /dev/null and b/main/sound/doors/doormove4.wav differ
diff --git a/main/sound/doors/doormove5.wav b/main/sound/doors/doormove5.wav
new file mode 100644
index 00000000..e70c8837
Binary files /dev/null and b/main/sound/doors/doormove5.wav differ
diff --git a/main/sound/doors/doormove6.wav b/main/sound/doors/doormove6.wav
new file mode 100644
index 00000000..a2f9e091
Binary files /dev/null and b/main/sound/doors/doormove6.wav differ
diff --git a/main/sound/doors/doormove7.wav b/main/sound/doors/doormove7.wav
new file mode 100644
index 00000000..f8e24bf4
Binary files /dev/null and b/main/sound/doors/doormove7.wav differ
diff --git a/main/sound/doors/doormove8.wav b/main/sound/doors/doormove8.wav
new file mode 100644
index 00000000..a6932602
Binary files /dev/null and b/main/sound/doors/doormove8.wav differ
diff --git a/main/sound/doors/doorstop1.wav b/main/sound/doors/doorstop1.wav
new file mode 100644
index 00000000..11343df6
Binary files /dev/null and b/main/sound/doors/doorstop1.wav differ
diff --git a/main/sound/doors/doorstop2.wav b/main/sound/doors/doorstop2.wav
new file mode 100644
index 00000000..6ec27716
Binary files /dev/null and b/main/sound/doors/doorstop2.wav differ
diff --git a/main/sound/doors/doorstop3.wav b/main/sound/doors/doorstop3.wav
new file mode 100644
index 00000000..b2a0522b
Binary files /dev/null and b/main/sound/doors/doorstop3.wav differ
diff --git a/main/sound/doors/doorstop4.wav b/main/sound/doors/doorstop4.wav
new file mode 100644
index 00000000..44ac78dd
Binary files /dev/null and b/main/sound/doors/doorstop4.wav differ
diff --git a/main/sound/fans/fan2.wav b/main/sound/fans/fan2.wav
new file mode 100644
index 00000000..e20f3bf8
Binary files /dev/null and b/main/sound/fans/fan2.wav differ
diff --git a/main/sound/hud/alien_enemyapproaches1.wav b/main/sound/hud/alien_enemyapproaches1.wav
new file mode 100644
index 00000000..7220f286
Binary files /dev/null and b/main/sound/hud/alien_enemyapproaches1.wav differ
diff --git a/main/sound/hud/alien_enemyapproaches2.wav b/main/sound/hud/alien_enemyapproaches2.wav
new file mode 100644
index 00000000..840a3c1f
Binary files /dev/null and b/main/sound/hud/alien_enemyapproaches2.wav differ
diff --git a/main/sound/hud/alien_gamestart1.wav b/main/sound/hud/alien_gamestart1.wav
new file mode 100644
index 00000000..e48f0dad
Binary files /dev/null and b/main/sound/hud/alien_gamestart1.wav differ
diff --git a/main/sound/hud/alien_gamestart2.wav b/main/sound/hud/alien_gamestart2.wav
new file mode 100644
index 00000000..0eda27cb
Binary files /dev/null and b/main/sound/hud/alien_gamestart2.wav differ
diff --git a/main/sound/hud/alien_hiveattack.wav b/main/sound/hud/alien_hiveattack.wav
new file mode 100644
index 00000000..81937822
Binary files /dev/null and b/main/sound/hud/alien_hiveattack.wav differ
diff --git a/main/sound/hud/alien_hivecomplete1.wav b/main/sound/hud/alien_hivecomplete1.wav
new file mode 100644
index 00000000..b90edcdc
Binary files /dev/null and b/main/sound/hud/alien_hivecomplete1.wav differ
diff --git a/main/sound/hud/alien_hivecomplete2.wav b/main/sound/hud/alien_hivecomplete2.wav
new file mode 100644
index 00000000..454fa980
Binary files /dev/null and b/main/sound/hud/alien_hivecomplete2.wav differ
diff --git a/main/sound/hud/alien_hivedying1.wav b/main/sound/hud/alien_hivedying1.wav
new file mode 100644
index 00000000..a70b5eb2
Binary files /dev/null and b/main/sound/hud/alien_hivedying1.wav differ
diff --git a/main/sound/hud/alien_hivedying2.wav b/main/sound/hud/alien_hivedying2.wav
new file mode 100644
index 00000000..95d57459
Binary files /dev/null and b/main/sound/hud/alien_hivedying2.wav differ
diff --git a/main/sound/hud/alien_lifeformattack1.wav b/main/sound/hud/alien_lifeformattack1.wav
new file mode 100644
index 00000000..2a808008
Binary files /dev/null and b/main/sound/hud/alien_lifeformattack1.wav differ
diff --git a/main/sound/hud/alien_lifeformattack2.wav b/main/sound/hud/alien_lifeformattack2.wav
new file mode 100644
index 00000000..96011994
Binary files /dev/null and b/main/sound/hud/alien_lifeformattack2.wav differ
diff --git a/main/sound/hud/alien_lowresources.wav b/main/sound/hud/alien_lowresources.wav
new file mode 100644
index 00000000..cccef648
Binary files /dev/null and b/main/sound/hud/alien_lowresources.wav differ
diff --git a/main/sound/hud/alien_mess.wav b/main/sound/hud/alien_mess.wav
new file mode 100644
index 00000000..1e698d55
Binary files /dev/null and b/main/sound/hud/alien_mess.wav differ
diff --git a/main/sound/hud/alien_more1.wav b/main/sound/hud/alien_more1.wav
new file mode 100644
index 00000000..b0939157
Binary files /dev/null and b/main/sound/hud/alien_more1.wav differ
diff --git a/main/sound/hud/alien_more2.wav b/main/sound/hud/alien_more2.wav
new file mode 100644
index 00000000..6a7a6a7f
Binary files /dev/null and b/main/sound/hud/alien_more2.wav differ
diff --git a/main/sound/hud/alien_myhive.wav b/main/sound/hud/alien_myhive.wav
new file mode 100644
index 00000000..a1023390
Binary files /dev/null and b/main/sound/hud/alien_myhive.wav differ
diff --git a/main/sound/hud/alien_needbetter.wav b/main/sound/hud/alien_needbetter.wav
new file mode 100644
index 00000000..743d7576
Binary files /dev/null and b/main/sound/hud/alien_needbetter.wav differ
diff --git a/main/sound/hud/alien_needbuilders1.wav b/main/sound/hud/alien_needbuilders1.wav
new file mode 100644
index 00000000..d5b4fa9f
Binary files /dev/null and b/main/sound/hud/alien_needbuilders1.wav differ
diff --git a/main/sound/hud/alien_needbuilders2.wav b/main/sound/hud/alien_needbuilders2.wav
new file mode 100644
index 00000000..ab7c8a09
Binary files /dev/null and b/main/sound/hud/alien_needbuilders2.wav differ
diff --git a/main/sound/hud/alien_newtrait1.wav b/main/sound/hud/alien_newtrait1.wav
new file mode 100644
index 00000000..c3603c49
Binary files /dev/null and b/main/sound/hud/alien_newtrait1.wav differ
diff --git a/main/sound/hud/alien_newtrait2.wav b/main/sound/hud/alien_newtrait2.wav
new file mode 100644
index 00000000..5d901a1c
Binary files /dev/null and b/main/sound/hud/alien_newtrait2.wav differ
diff --git a/main/sound/hud/alien_now.wav b/main/sound/hud/alien_now.wav
new file mode 100644
index 00000000..23afcf34
Binary files /dev/null and b/main/sound/hud/alien_now.wav differ
diff --git a/main/sound/hud/alien_points_received.wav b/main/sound/hud/alien_points_received.wav
new file mode 100644
index 00000000..96ded4e0
Binary files /dev/null and b/main/sound/hud/alien_points_received.wav differ
diff --git a/main/sound/hud/alien_resourceattack1.wav b/main/sound/hud/alien_resourceattack1.wav
new file mode 100644
index 00000000..20e34dd5
Binary files /dev/null and b/main/sound/hud/alien_resourceattack1.wav differ
diff --git a/main/sound/hud/alien_resourceattack2.wav b/main/sound/hud/alien_resourceattack2.wav
new file mode 100644
index 00000000..5879fedf
Binary files /dev/null and b/main/sound/hud/alien_resourceattack2.wav differ
diff --git a/main/sound/hud/alien_seedead.wav b/main/sound/hud/alien_seedead.wav
new file mode 100644
index 00000000..7cf7e482
Binary files /dev/null and b/main/sound/hud/alien_seedead.wav differ
diff --git a/main/sound/hud/alien_structureattack1.wav b/main/sound/hud/alien_structureattack1.wav
new file mode 100644
index 00000000..467bd577
Binary files /dev/null and b/main/sound/hud/alien_structureattack1.wav differ
diff --git a/main/sound/hud/alien_structureattack2.wav b/main/sound/hud/alien_structureattack2.wav
new file mode 100644
index 00000000..0bef8af5
Binary files /dev/null and b/main/sound/hud/alien_structureattack2.wav differ
diff --git a/main/sound/hud/alien_upgrade_lost.wav b/main/sound/hud/alien_upgrade_lost.wav
new file mode 100644
index 00000000..ea8b1865
Binary files /dev/null and b/main/sound/hud/alien_upgrade_lost.wav differ
diff --git a/main/sound/hud/countdown.wav b/main/sound/hud/countdown.wav
new file mode 100644
index 00000000..0bbb86bd
Binary files /dev/null and b/main/sound/hud/countdown.wav differ
diff --git a/main/sound/hud/m-squad1.wav b/main/sound/hud/m-squad1.wav
new file mode 100644
index 00000000..74b79393
Binary files /dev/null and b/main/sound/hud/m-squad1.wav differ
diff --git a/main/sound/hud/m-squad2.wav b/main/sound/hud/m-squad2.wav
new file mode 100644
index 00000000..368898ef
Binary files /dev/null and b/main/sound/hud/m-squad2.wav differ
diff --git a/main/sound/hud/m-squad3.wav b/main/sound/hud/m-squad3.wav
new file mode 100644
index 00000000..cf922fbe
Binary files /dev/null and b/main/sound/hud/m-squad3.wav differ
diff --git a/main/sound/hud/m-squad4.wav b/main/sound/hud/m-squad4.wav
new file mode 100644
index 00000000..654d155a
Binary files /dev/null and b/main/sound/hud/m-squad4.wav differ
diff --git a/main/sound/hud/m-squad5.wav b/main/sound/hud/m-squad5.wav
new file mode 100644
index 00000000..d449858e
Binary files /dev/null and b/main/sound/hud/m-squad5.wav differ
diff --git a/main/sound/hud/marine_armoryupgrading.wav b/main/sound/hud/marine_armoryupgrading.wav
new file mode 100644
index 00000000..973fa6c5
Binary files /dev/null and b/main/sound/hud/marine_armoryupgrading.wav differ
diff --git a/main/sound/hud/marine_baseattack1.wav b/main/sound/hud/marine_baseattack1.wav
new file mode 100644
index 00000000..ed9cd62c
Binary files /dev/null and b/main/sound/hud/marine_baseattack1.wav differ
diff --git a/main/sound/hud/marine_baseattack2.wav b/main/sound/hud/marine_baseattack2.wav
new file mode 100644
index 00000000..f315de1c
Binary files /dev/null and b/main/sound/hud/marine_baseattack2.wav differ
diff --git a/main/sound/hud/marine_cconline1.wav b/main/sound/hud/marine_cconline1.wav
new file mode 100644
index 00000000..d73fa5ee
Binary files /dev/null and b/main/sound/hud/marine_cconline1.wav differ
diff --git a/main/sound/hud/marine_cconline2.wav b/main/sound/hud/marine_cconline2.wav
new file mode 100644
index 00000000..831bab42
Binary files /dev/null and b/main/sound/hud/marine_cconline2.wav differ
diff --git a/main/sound/hud/marine_ccunderattack1.wav b/main/sound/hud/marine_ccunderattack1.wav
new file mode 100644
index 00000000..bbb0a648
Binary files /dev/null and b/main/sound/hud/marine_ccunderattack1.wav differ
diff --git a/main/sound/hud/marine_ccunderattack2.wav b/main/sound/hud/marine_ccunderattack2.wav
new file mode 100644
index 00000000..47acf9cc
Binary files /dev/null and b/main/sound/hud/marine_ccunderattack2.wav differ
diff --git a/main/sound/hud/marine_commander_ejected.wav b/main/sound/hud/marine_commander_ejected.wav
new file mode 100644
index 00000000..ad1ec8a8
Binary files /dev/null and b/main/sound/hud/marine_commander_ejected.wav differ
diff --git a/main/sound/hud/marine_commanderidle1.wav b/main/sound/hud/marine_commanderidle1.wav
new file mode 100644
index 00000000..81dcf4f8
Binary files /dev/null and b/main/sound/hud/marine_commanderidle1.wav differ
diff --git a/main/sound/hud/marine_commanderidle2.wav b/main/sound/hud/marine_commanderidle2.wav
new file mode 100644
index 00000000..1034676d
Binary files /dev/null and b/main/sound/hud/marine_commanderidle2.wav differ
diff --git a/main/sound/hud/marine_gamestart1.wav b/main/sound/hud/marine_gamestart1.wav
new file mode 100644
index 00000000..1783a82a
Binary files /dev/null and b/main/sound/hud/marine_gamestart1.wav differ
diff --git a/main/sound/hud/marine_gamestart2.wav b/main/sound/hud/marine_gamestart2.wav
new file mode 100644
index 00000000..05e8ce26
Binary files /dev/null and b/main/sound/hud/marine_gamestart2.wav differ
diff --git a/main/sound/hud/marine_giveorders.wav b/main/sound/hud/marine_giveorders.wav
new file mode 100644
index 00000000..d009cd3e
Binary files /dev/null and b/main/sound/hud/marine_giveorders.wav differ
diff --git a/main/sound/hud/marine_gotoalert.wav b/main/sound/hud/marine_gotoalert.wav
new file mode 100644
index 00000000..8eff19b7
Binary files /dev/null and b/main/sound/hud/marine_gotoalert.wav differ
diff --git a/main/sound/hud/marine_lowresources.wav b/main/sound/hud/marine_lowresources.wav
new file mode 100644
index 00000000..492b4a40
Binary files /dev/null and b/main/sound/hud/marine_lowresources.wav differ
diff --git a/main/sound/hud/marine_more.wav b/main/sound/hud/marine_more.wav
new file mode 100644
index 00000000..fd7333fe
Binary files /dev/null and b/main/sound/hud/marine_more.wav differ
diff --git a/main/sound/hud/marine_needportal1.wav b/main/sound/hud/marine_needportal1.wav
new file mode 100644
index 00000000..e5237266
Binary files /dev/null and b/main/sound/hud/marine_needportal1.wav differ
diff --git a/main/sound/hud/marine_needportal2.wav b/main/sound/hud/marine_needportal2.wav
new file mode 100644
index 00000000..d3acf461
Binary files /dev/null and b/main/sound/hud/marine_needportal2.wav differ
diff --git a/main/sound/hud/marine_needsammo1.wav b/main/sound/hud/marine_needsammo1.wav
new file mode 100644
index 00000000..bf3245f2
Binary files /dev/null and b/main/sound/hud/marine_needsammo1.wav differ
diff --git a/main/sound/hud/marine_needsammo2.wav b/main/sound/hud/marine_needsammo2.wav
new file mode 100644
index 00000000..a0df1364
Binary files /dev/null and b/main/sound/hud/marine_needsammo2.wav differ
diff --git a/main/sound/hud/marine_needshealth1.wav b/main/sound/hud/marine_needshealth1.wav
new file mode 100644
index 00000000..80b18914
Binary files /dev/null and b/main/sound/hud/marine_needshealth1.wav differ
diff --git a/main/sound/hud/marine_needshealth2.wav b/main/sound/hud/marine_needshealth2.wav
new file mode 100644
index 00000000..be6c6b2f
Binary files /dev/null and b/main/sound/hud/marine_needshealth2.wav differ
diff --git a/main/sound/hud/marine_needsorder1.wav b/main/sound/hud/marine_needsorder1.wav
new file mode 100644
index 00000000..7c406bfd
Binary files /dev/null and b/main/sound/hud/marine_needsorder1.wav differ
diff --git a/main/sound/hud/marine_needsorder2.wav b/main/sound/hud/marine_needsorder2.wav
new file mode 100644
index 00000000..acf376b0
Binary files /dev/null and b/main/sound/hud/marine_needsorder2.wav differ
diff --git a/main/sound/hud/marine_order_attack.wav b/main/sound/hud/marine_order_attack.wav
new file mode 100644
index 00000000..afef2423
Binary files /dev/null and b/main/sound/hud/marine_order_attack.wav differ
diff --git a/main/sound/hud/marine_order_build.wav b/main/sound/hud/marine_order_build.wav
new file mode 100644
index 00000000..9bb765df
Binary files /dev/null and b/main/sound/hud/marine_order_build.wav differ
diff --git a/main/sound/hud/marine_order_complete1.wav b/main/sound/hud/marine_order_complete1.wav
new file mode 100644
index 00000000..3c9cf507
Binary files /dev/null and b/main/sound/hud/marine_order_complete1.wav differ
diff --git a/main/sound/hud/marine_order_complete2.wav b/main/sound/hud/marine_order_complete2.wav
new file mode 100644
index 00000000..dd046f98
Binary files /dev/null and b/main/sound/hud/marine_order_complete2.wav differ
diff --git a/main/sound/hud/marine_order_complete3.wav b/main/sound/hud/marine_order_complete3.wav
new file mode 100644
index 00000000..0fec9bb1
Binary files /dev/null and b/main/sound/hud/marine_order_complete3.wav differ
diff --git a/main/sound/hud/marine_order_complete4.wav b/main/sound/hud/marine_order_complete4.wav
new file mode 100644
index 00000000..64c90113
Binary files /dev/null and b/main/sound/hud/marine_order_complete4.wav differ
diff --git a/main/sound/hud/marine_order_complete5.wav b/main/sound/hud/marine_order_complete5.wav
new file mode 100644
index 00000000..25fa85f0
Binary files /dev/null and b/main/sound/hud/marine_order_complete5.wav differ
diff --git a/main/sound/hud/marine_order_complete6.wav b/main/sound/hud/marine_order_complete6.wav
new file mode 100644
index 00000000..5de02887
Binary files /dev/null and b/main/sound/hud/marine_order_complete6.wav differ
diff --git a/main/sound/hud/marine_order_get.wav b/main/sound/hud/marine_order_get.wav
new file mode 100644
index 00000000..3378b3f8
Binary files /dev/null and b/main/sound/hud/marine_order_get.wav differ
diff --git a/main/sound/hud/marine_order_guard.wav b/main/sound/hud/marine_order_guard.wav
new file mode 100644
index 00000000..dedadeb4
Binary files /dev/null and b/main/sound/hud/marine_order_guard.wav differ
diff --git a/main/sound/hud/marine_order_move1.wav b/main/sound/hud/marine_order_move1.wav
new file mode 100644
index 00000000..0efffb26
Binary files /dev/null and b/main/sound/hud/marine_order_move1.wav differ
diff --git a/main/sound/hud/marine_order_move2.wav b/main/sound/hud/marine_order_move2.wav
new file mode 100644
index 00000000..5ad0ec68
Binary files /dev/null and b/main/sound/hud/marine_order_move2.wav differ
diff --git a/main/sound/hud/marine_order_move3.wav b/main/sound/hud/marine_order_move3.wav
new file mode 100644
index 00000000..0efffb26
Binary files /dev/null and b/main/sound/hud/marine_order_move3.wav differ
diff --git a/main/sound/hud/marine_order_move4.wav b/main/sound/hud/marine_order_move4.wav
new file mode 100644
index 00000000..0cb95e19
Binary files /dev/null and b/main/sound/hud/marine_order_move4.wav differ
diff --git a/main/sound/hud/marine_order_weld.wav b/main/sound/hud/marine_order_weld.wav
new file mode 100644
index 00000000..98f90800
Binary files /dev/null and b/main/sound/hud/marine_order_weld.wav differ
diff --git a/main/sound/hud/marine_points_received.wav b/main/sound/hud/marine_points_received.wav
new file mode 100644
index 00000000..567a1882
Binary files /dev/null and b/main/sound/hud/marine_points_received.wav differ
diff --git a/main/sound/hud/marine_research_complete.wav b/main/sound/hud/marine_research_complete.wav
new file mode 100644
index 00000000..9bda0028
Binary files /dev/null and b/main/sound/hud/marine_research_complete.wav differ
diff --git a/main/sound/hud/marine_sentryfiring1.wav b/main/sound/hud/marine_sentryfiring1.wav
new file mode 100644
index 00000000..446200dd
Binary files /dev/null and b/main/sound/hud/marine_sentryfiring1.wav differ
diff --git a/main/sound/hud/marine_sentryfiring2.wav b/main/sound/hud/marine_sentryfiring2.wav
new file mode 100644
index 00000000..18c362b3
Binary files /dev/null and b/main/sound/hud/marine_sentryfiring2.wav differ
diff --git a/main/sound/hud/marine_sentrytakingdamage1.wav b/main/sound/hud/marine_sentrytakingdamage1.wav
new file mode 100644
index 00000000..84bb5a5d
Binary files /dev/null and b/main/sound/hud/marine_sentrytakingdamage1.wav differ
diff --git a/main/sound/hud/marine_sentrytakingdamage2.wav b/main/sound/hud/marine_sentrytakingdamage2.wav
new file mode 100644
index 00000000..3bda182c
Binary files /dev/null and b/main/sound/hud/marine_sentrytakingdamage2.wav differ
diff --git a/main/sound/hud/marine_soldierlost1.wav b/main/sound/hud/marine_soldierlost1.wav
new file mode 100644
index 00000000..7e1ce880
Binary files /dev/null and b/main/sound/hud/marine_soldierlost1.wav differ
diff --git a/main/sound/hud/marine_soldierlost2.wav b/main/sound/hud/marine_soldierlost2.wav
new file mode 100644
index 00000000..d7c6f529
Binary files /dev/null and b/main/sound/hud/marine_soldierlost2.wav differ
diff --git a/main/sound/hud/marine_soldierunderattack.wav b/main/sound/hud/marine_soldierunderattack.wav
new file mode 100644
index 00000000..eef890a7
Binary files /dev/null and b/main/sound/hud/marine_soldierunderattack.wav differ
diff --git a/main/sound/hud/marine_upgradecomplete.wav b/main/sound/hud/marine_upgradecomplete.wav
new file mode 100644
index 00000000..0b40faf7
Binary files /dev/null and b/main/sound/hud/marine_upgradecomplete.wav differ
diff --git a/main/sound/hud/place_building.wav b/main/sound/hud/place_building.wav
new file mode 100644
index 00000000..09483f84
Binary files /dev/null and b/main/sound/hud/place_building.wav differ
diff --git a/main/sound/hud/points_spent.wav b/main/sound/hud/points_spent.wav
new file mode 100644
index 00000000..10065398
Binary files /dev/null and b/main/sound/hud/points_spent.wav differ
diff --git a/main/sound/hud/select-a.wav b/main/sound/hud/select-a.wav
new file mode 100644
index 00000000..94fe8359
Binary files /dev/null and b/main/sound/hud/select-a.wav differ
diff --git a/main/sound/hud/select.wav b/main/sound/hud/select.wav
new file mode 100644
index 00000000..5de7b0f0
Binary files /dev/null and b/main/sound/hud/select.wav differ
diff --git a/main/sound/hud/select_node_backward-a.wav b/main/sound/hud/select_node_backward-a.wav
new file mode 100644
index 00000000..2beac2af
Binary files /dev/null and b/main/sound/hud/select_node_backward-a.wav differ
diff --git a/main/sound/hud/select_node_backward.wav b/main/sound/hud/select_node_backward.wav
new file mode 100644
index 00000000..e27bbc25
Binary files /dev/null and b/main/sound/hud/select_node_backward.wav differ
diff --git a/main/sound/hud/select_node_forward-a.wav b/main/sound/hud/select_node_forward-a.wav
new file mode 100644
index 00000000..94fe8359
Binary files /dev/null and b/main/sound/hud/select_node_forward-a.wav differ
diff --git a/main/sound/hud/select_node_forward.wav b/main/sound/hud/select_node_forward.wav
new file mode 100644
index 00000000..77ef2a70
Binary files /dev/null and b/main/sound/hud/select_node_forward.wav differ
diff --git a/main/sound/hud/squad1.wav b/main/sound/hud/squad1.wav
new file mode 100644
index 00000000..48161ba9
Binary files /dev/null and b/main/sound/hud/squad1.wav differ
diff --git a/main/sound/hud/squad2.wav b/main/sound/hud/squad2.wav
new file mode 100644
index 00000000..e23871bc
Binary files /dev/null and b/main/sound/hud/squad2.wav differ
diff --git a/main/sound/hud/squad3.wav b/main/sound/hud/squad3.wav
new file mode 100644
index 00000000..f3e15920
Binary files /dev/null and b/main/sound/hud/squad3.wav differ
diff --git a/main/sound/hud/squad4.wav b/main/sound/hud/squad4.wav
new file mode 100644
index 00000000..cf526b2e
Binary files /dev/null and b/main/sound/hud/squad4.wav differ
diff --git a/main/sound/hud/squad5.wav b/main/sound/hud/squad5.wav
new file mode 100644
index 00000000..e8158bde
Binary files /dev/null and b/main/sound/hud/squad5.wav differ
diff --git a/main/sound/hud/tooltip.wav b/main/sound/hud/tooltip.wav
new file mode 100644
index 00000000..05362783
Binary files /dev/null and b/main/sound/hud/tooltip.wav differ
diff --git a/main/sound/hud/you_lose.wav b/main/sound/hud/you_lose.wav
new file mode 100644
index 00000000..38bf5d57
Binary files /dev/null and b/main/sound/hud/you_lose.wav differ
diff --git a/main/sound/hud/you_win.wav b/main/sound/hud/you_win.wav
new file mode 100644
index 00000000..306bae1b
Binary files /dev/null and b/main/sound/hud/you_win.wav differ
diff --git a/main/sound/items/9mmclip1.wav b/main/sound/items/9mmclip1.wav
new file mode 100644
index 00000000..ed6cf9b4
Binary files /dev/null and b/main/sound/items/9mmclip1.wav differ
diff --git a/main/sound/items/9mmclip2.wav b/main/sound/items/9mmclip2.wav
new file mode 100644
index 00000000..aeb5579d
Binary files /dev/null and b/main/sound/items/9mmclip2.wav differ
diff --git a/main/sound/items/catalyst.wav b/main/sound/items/catalyst.wav
new file mode 100644
index 00000000..a7a30586
Binary files /dev/null and b/main/sound/items/catalyst.wav differ
diff --git a/main/sound/items/flashlight1.wav b/main/sound/items/flashlight1.wav
new file mode 100644
index 00000000..d48811b8
Binary files /dev/null and b/main/sound/items/flashlight1.wav differ
diff --git a/main/sound/items/gunpickup2-a.wav b/main/sound/items/gunpickup2-a.wav
new file mode 100644
index 00000000..2beac2af
Binary files /dev/null and b/main/sound/items/gunpickup2-a.wav differ
diff --git a/main/sound/items/gunpickup2.wav b/main/sound/items/gunpickup2.wav
new file mode 100644
index 00000000..fde4d069
Binary files /dev/null and b/main/sound/items/gunpickup2.wav differ
diff --git a/main/sound/items/health.wav b/main/sound/items/health.wav
new file mode 100644
index 00000000..5a516215
Binary files /dev/null and b/main/sound/items/health.wav differ
diff --git a/main/sound/items/pickup_heavy.wav b/main/sound/items/pickup_heavy.wav
new file mode 100644
index 00000000..1f9de140
Binary files /dev/null and b/main/sound/items/pickup_heavy.wav differ
diff --git a/main/sound/items/pickup_jetpack.wav b/main/sound/items/pickup_jetpack.wav
new file mode 100644
index 00000000..0de4c107
Binary files /dev/null and b/main/sound/items/pickup_jetpack.wav differ
diff --git a/main/sound/items/weapondrop1.wav b/main/sound/items/weapondrop1.wav
new file mode 100644
index 00000000..9d6bff65
Binary files /dev/null and b/main/sound/items/weapondrop1.wav differ
diff --git a/main/sound/materials.txt b/main/sound/materials.txt
new file mode 100644
index 00000000..1d92395c
--- /dev/null
+++ b/main/sound/materials.txt
@@ -0,0 +1,584 @@
+//-----------------------------------------------------------
+//            Counter-Strike
+//-----------------------------------------------------------
+// In this file you can modify the sound the textures give
+// when the player walks on them
+//
+// Location: X:\halflife\valve\sound\materials.txt
+//
+// NOTE: only the first 12 characters of the texture name are used
+// NOTE: a maximum of 512 textures may be tagged in this file
+//
+//  'M' metal
+//  'V' ventillation
+//  'D' dirt
+//  'S' slosh liquid 
+//  'T' tile
+//  'G' grate (Concrete is the default)
+//  'W' wood
+//  'P' computer
+//  'Y' glass
+//  'N' snow
+
+// NS textures
+
+M plainmet
+M plainmet-big
+M platform
+M platfrom-a
+M r25_beam
+M r25_detail
+M r25_fan
+M r25_junction
+M r25_monitorbox
+M r25_piston
+M r25_silowall2
+M r25_strut2
+M r25_trainwheel2
+M rustypipe
+M shaftlights
+M shaftlights2
+M shaftlights3
+M teckfloor01
+M teckfloor01-big
+M teckwall05
+M teckwall05-big
+M teckwall07
+M teckwall07-big
+M teckwall08
+M teckwall09
+M teckwall10
+M teckwall13
+M teckwall13-big
+M teckwall14
+M teckwall14-big
+M teckwall15
+M teckwall15-big
+M teckwall16
+M teckwall16-big
+M teckwall17
+M teckwall17-big
+M teckwall18
+M teckwall18-big
+M teckwall19
+M teckwall19-big
+M teckwall20
+M tecwall1
+M tecwall1-big
+M tecwall2
+M tecwall2-big
+M trim
+M trim_black
+M trim_black2
+M trim_bolts
+M trim_bump
+M trim_dark
+M trim_grey
+M trim_labwall1
+M trim_labwall2
+M trim_ridges
+M wall
+M wall_1
+M wall_1-big
+M wall_2
+M wall_2-big
+M wall_3
+M wall_3-big
+M wall_1
+M wall_black1
+M wall_black2
+M wall_black3
+M wall_blckstrp1
+M wall_blckstrp2
+M wall_compthin
+M wall_green4
+M wall_lab1
+M wall_lab2
+M wall_lab3
+M wall_lab4
+M wall_panels
+M wall_shaft
+M wall_tech1
+M wall_tech2
+M wall_tech3
+M wall_tech4
+M wall_techdoor
+M wall1
+M wall1-b
+M wall1-big
+M wall2-b
+M wall2-big
+M wall-big
+M wallteck12
+M wallteck12-big
+M wetwall1
+M wetwall1-big
+M wetwall2
+M wetwall2-big
+M wetwall3
+M wetwall3-big
+V pipe
+V pipes_1
+V pipes_weird
+V pipes1
+V pipes1-big
+V pipes2
+V pipes2-big
+V pipes3
+V pipes3-big
+V r25_tank2
+V r25_tank3
+V r25_yellow1
+D r25_asphalt3
+S scroll_smelt
+G r25_grate2
+G r25_ladder
+G r25_nonslip2
+G r25_pipewall3
+G r25_platform1
+G r25_yellow2
+G r6_light2
+G step
+G step_bump
+G step_ridged
+G step_ridged2
+G teckfloor04
+G teckwall04
+G teckwall04-b
+G teckwall04-big
+G teckwall06
+G teckwall06-big
+G vent
+G vent2
+P panel1
+P panel2
+P panel3
+P panel4
+P panel4b
+P r25_cabinet2
+P r25_cabinet4
+P r25_controls2
+P r25_instwal1
+P r25_keypad
+P r25_mech2
+P r25_monitor2
+P screen_alien1
+P screen_lab1
+P teck01
+P teck02
+P teck03
+P teck04
+P wall_bluestrip
+P wall_circuits
+Y window1
+Y window02
+Y window03
+Y window01
+Y r25_light3
+Y subway_lights
+Y r6_light1
+Y r6_light3
+
+// First map
+M {HALL_FLOOR 
+M HALL_FLOOR 
+M {CATWALK_RAIL
+M {CATWALK
+M CATWALK
+M CATWALK_RAIL
+Y PLATFORM
+T PIPES4
+M {GRATE
+M {GRATE2
+
+//-----------------------------------------------------------
+// Valve's Textures
+//-----------------------------------------------------------
+V DUCT_FLR01
+V DUCT_FLR01A
+V DUCT_FLR02A
+V DUCT_VNT
+V DUCT_VNT2
+V DUCT_WALL01
+V DUCT_WALL02
+V DUCT_WALL03
+V DUCT_WALL04
+V SILO2_COR
+D OUT_GRVL1
+D OUT_GRVL2
+D OUT_GRVL2B
+D OUT_GRVL3
+D OUT_MUD1
+D OUT_SND1
+D OUT_SND2
+D OUT_SND2B
+D OUT_SND2C
+D OUT_WLK
+D OUT_GRSS1
+D OUT_DIRT1
+D OUT_DIRT2
+D GENERIC48
+D GENERIC49
+D GENERIC51
+D GENERIC52
+D GENERIC93
+D OUT_PAVE2
+D OUT_SNBAG
+D OUT_SNBAG2
+D OUT_SNBAGB
+D OUT_SNBAGC
+D OUT_TNT2
+D OUT_TNT1
+D OUT_TNT1B
+D OUT_TNT1C
+D OUT_TNT3
+D OUT_TNT3B
+D OUT_NET1
+D OUT_NET1B
+D FROSTSEWFLR
+G GENERIC109
+G GENERIC015C
+G GENERIC015D
+G GENERIC015E
+G GENERIC015F
+G GENERIC015G
+G GENERIC015H
+G GENERIC015I
+G GENERIC015
+G GENERIC015A
+G GENERIC015B
+G BABTECH_FLR02
+G CRETE2_FLR03
+G CRETE2_FLR03A
+G CRETE2_FLR03B
+G CRETE2_FLR03C
+G ELEV1_FLR
+G ELEV2_FLR
+G ELEV_FLR
+G GRATE1
+G GRATE2
+G GRATE2A
+G GRATE3A
+G GRID1
+G GRID2
+G TNNL_FLR12
+G TNNL_FLR12A
+G TNNL_FLR1A
+G LAB1_STAIR2A
+G FROSTFLOOR
+G GRATE4A
+G GRATE3B
+G GRATESTEP1
+G GRATESTEP2
+G GRATESTEP3
+G GRID1
+G GRID2
+G GENERIC015V
+M C1A1_FLR1
+M BABFL
+M C2A3TURBINE1
+M C2A3TURBINE2
+M C2A3TURBINE3
+M C2A3TURBINE4
+M SILO2_P2
+M SILO2_P2B
+M SILO2_P3
+M SILO2_P4
+M SILO2_PAN2
+M SILO2_W1
+M SILO2_W1A
+M SILO2_WALL1
+M SILO2_W2
+M BABTECH_C5
+M LAB3_FLR2A
+M LAB3_FLR2B
+M FIFTIES_CMP3
+M LAB1_STAIR2B
+M OUT_QUNST11
+M FREEZER_FLR1
+M GENERIC015N
+M GENERIC015P
+M GENERIC015R
+M GENERIC0150
+M GENERIC015S
+M GENERIC015T
+M GENERIC015U
+M GENERIC015V
+M GENERIC015V2
+M C1A4_DOME3
+S GENERIC_114
+S WATERBLUE
+S WATERGREEN
+S TOXICGRN
+S FLUID1A
+S FLUID1B
+S FLUID2
+S FLUID3
+S FLUID4
+S WATERSILO
+S WATERSILO2
+S WATERF
+S FLUID1A
+T FIFT_BLOODFLR
+T FIFT_BLOODFLRA
+T FIFTIES_F01
+T FIFTIES_F02
+T FIFTIES_F03
+T FIFTIES_F03B
+T FIFTIES_FLR01
+T FIFTIES_FLR02
+T FIFTIES_FLR02B
+T FIFTIES_FLR02C
+T FIFTIES_FLR03
+T FIFTIES_FLR03B
+T FIFTIES_FLR5
+T LAB1_BLUXFLR1
+T LAB1_BLUXFLR1B
+T LAB1_BLUX1
+T LAB1_BLUX1B
+T LAB1_C4003
+T LAB1_C4A001
+T LAB1_C4B002
+T LAB1_C4D2
+T LAB1_CAB2
+T LAB1_FLOOR2A
+T LAB1_FLOOR2B
+T LAB1_FLOOR3
+T LAB1_FLOOR4
+T LAB1_FLOOR5
+T LAB1_FLOOR6
+T LAB1_FLOOR10
+T LAB1_FLR3
+T LAB1_FLR4
+T LAB1_FLR4B
+T LAB1_FLR4C
+T LAB1_FLR4D
+T LAB1_FLR5B
+T LAB1_FLR5C
+T LAB1_FLR5D
+T LAB1_FLR5D
+T LAB1_FLR6B
+T LAB1_FLR6C
+T LAB1_FLR6D
+T LAB1_W8FLR1
+T LAB1_W8FLR1B
+T LAB1_W8FLR1C
+T LAB1_W8FLR1D
+T C2A4_FLR6
+T C1A2_FLR1
+T C1A2_FLR2
+T C1A0_LABFLRB
+T C1A0_LABFLRC
+T C1A0_LABFLRD
+T C1A0_LABFLRE
+T C1A0_LABFLR
+W CRATE01
+W CRATE02
+W CRATE02B
+W CRATE03
+W CRATE04
+W CRATE05
+W CRATE06
+W CRATE07
+W CRATE08
+W CRATE08B
+W CRATE09
+W CRATE09B
+W CRATE09C
+W CRATE19
+W CRATE20
+W CRATE21
+W CRATE22
+W CRATE23
+W CRATE25
+W FIFTIES_DR6
+W FIFTIES_DR6A
+W FIFTIES_CCH1
+W FIFTIES_CCH2
+W FIFTIES_CCH3
+W FIFTIES_CCH4
+W FIFTIES_DR1K
+W FIFTIES_DR2
+W FIFTIES_DR7
+W FIFTIES_DR8
+W FIFTIES_DR9
+W FIFTIES_DSK1
+W OUT_SLAT01
+W OUT_WD
+W OUT_CAC1
+W OUT_CAC2
+W OUT_CAC2
+W BCRATE02
+W BCRATE03
+W BCRATE04
+W BCRATE05
+W BCRATE06
+W BCRATE07
+W BCRATE08
+W BCRATE12
+W BCRATE14
+W BCRATE15
+W BCRATE16
+W BCRATE17
+W BCRATE18
+W BCRATE25
+W BCRATE26
+W CRATE10
+W CRATE11
+W CRATE12
+W CRATE13
+W CRATE24
+W CRATE27
+P C3A1_NRC2
+P C1A1_GAD1
+P C1A1_GAD2
+P C1A1_GAD3
+P C1A1_GAD4
+P C1A1_GAD4A
+P C1A1_GGT8
+P C1A4_PAN1A
+P C1A4_PAN1B
+P C1A4_SWTCH1
+P C2A2_SATORB
+P C2A4_CMP1
+P C2A4_GAD2
+P C3A2A_W1D
+P C3A2A_W1E
+P C3A2A_W2D
+P C3A2A_W2E
+P DRKMTL_SCRN2
+P DRKMTL_SCRN3
+P DRKMTL_SCRN4
+P DRKMTLT_WALL
+P FIFTIES_GGT8
+P FIFTIES_MON1
+P FIFTIES_MON1B
+P FIFTIES_MON2
+P FIFTIES_MON2B
+P FIFTIES_MON3
+P FIFTIES_MON3B
+P FIFTIES_MON4
+P FIFTIES_PAN2
+P GENERIC105
+P GENERIC106
+P GENERIC107
+P GENERIC114
+P GENERIC87A
+P GENERIC88A
+P GENERIC89A
+P GENERIC113
+P LAB1_CMPM1
+P LAB1_CMPM2
+P LAB1_CMPM3
+P LAB1_CMPM4
+P LAB1_CMPM5
+P LAB1_CMPM6
+P LAB1_CMPM7
+P LAB1_CMPM8
+P LAB1_COMP1
+P LAB1_COMP2
+P LAB1_COMP3
+P LAB1_COMP2A
+P LAB1_COMP10A
+P LAB1_COMP10B
+P LAB1_COMP10C
+P LAB1_COMP10D
+P LAB1_COMP10E
+P LAB1_COMP7
+P LAB1_COMP8
+P LAB1_COMP9A
+P LAB1_COMP9A2
+P LAB1_COMP9B
+P LAB1_COMP9C
+P LAB1_COMP9D
+P LAB1_GAD2
+P LAB1_GAD3
+P LAB1_GAD4
+P LAB1_RADSCRN2
+P LAB4_GAD3
+P LAB4_GAD4
+P LAB4_SWTCH
+P LAB_COMPM4
+P RECHARGEA
+P TNNL_GAD1
+P TNNL_GAD2
+P TNNL_GAD4
+P C2A4C2C
+P C2A4W1B
+P LAB1_CMP
+P LAB1_CMP1
+P LAB1_CMP2
+P LAB1_COMP3
+P LAB1_COMP3A
+P LAB1_COMP3B
+P LAB1_COMP3C
+P LAB1_COMP3D
+P LAB1_COMP4
+P LAB1_COMP5
+P LAB1_COMP7
+P LAB1_COMP8
+P LAB1_SW1
+P LAB_CRT1
+P LAB_CRT10A
+P LAB_CRT10B
+P LAB_CRT10C
+P LAB_CRT10D
+P LAB_CRT2
+P LAB_CRT3
+P LAB_CRT4
+P LAB_CRT5
+P LAB_CRT6
+P LAB_CRT7
+P LAB_CRT8
+P LAB_CRT9C
+P CRETESTCH01A
+P DRKMTLLGT1
+P FIFTS_LGHT01
+P FIFTS_LGHT3
+P FIFTS_LGHT4
+P FIFTIES_LGT2
+P FIFTS_LGHT5
+P GYMLIGHT
+P LIGHT1
+P LIGHT2A
+P LIGHT3A
+P LIGHT3B
+P LIGHT3C
+P LIGHT3D
+P LIGHT3E
+P LIGHT3F
+P LIGHT4A
+P LIGHT5A
+P LIGHT5B
+P LIGHT5C
+P LIGHT5D
+P LIGHT5E
+P LIGHT5F
+P LIGHT6A
+P METALSTCH2
+P TNNL_LGT1
+P TNNL_LGT2
+P TNNL_LGT3
+P TNNL_LGT4
+P LAB1_GAD2
+P ELEV1_DWN
+P SPOTBLUE
+P SPOTGREEN
+P SPOTRED
+P SPOTYELLOW
+P LAB1_GAD3
+P LAB1_GAD3B
+P ELEV2_PAN
+P ELEV1_PAN
+P C2A4X_C3
+P C2A4X_C1
+P MEDKIT
+Y GLASS_BRIGHT
+Y GLASS_DARK
+Y GLASS_MED
+Y GLASSBLUE1
+Y GLASSBLUE2
+Y GLASSGREEEN
+Y GLASSGREEEN
+
+
diff --git a/main/sound/misc/a-build1.wav b/main/sound/misc/a-build1.wav
new file mode 100644
index 00000000..6040e8d9
Binary files /dev/null and b/main/sound/misc/a-build1.wav differ
diff --git a/main/sound/misc/a-build2.wav b/main/sound/misc/a-build2.wav
new file mode 100644
index 00000000..b13fd08a
Binary files /dev/null and b/main/sound/misc/a-build2.wav differ
diff --git a/main/sound/misc/a-levelup.wav b/main/sound/misc/a-levelup.wav
new file mode 100644
index 00000000..6430706a
Binary files /dev/null and b/main/sound/misc/a-levelup.wav differ
diff --git a/main/sound/misc/a_resource_idle1.wav b/main/sound/misc/a_resource_idle1.wav
new file mode 100644
index 00000000..6503dc6d
Binary files /dev/null and b/main/sound/misc/a_resource_idle1.wav differ
diff --git a/main/sound/misc/a_resource_idle2.wav b/main/sound/misc/a_resource_idle2.wav
new file mode 100644
index 00000000..516f5255
Binary files /dev/null and b/main/sound/misc/a_resource_idle2.wav differ
diff --git a/main/sound/misc/alien_chamber_deploy.wav b/main/sound/misc/alien_chamber_deploy.wav
new file mode 100644
index 00000000..dbe92494
Binary files /dev/null and b/main/sound/misc/alien_chamber_deploy.wav differ
diff --git a/main/sound/misc/alien_chamber_die.wav b/main/sound/misc/alien_chamber_die.wav
new file mode 100644
index 00000000..2126be53
Binary files /dev/null and b/main/sound/misc/alien_chamber_die.wav differ
diff --git a/main/sound/misc/aliensightoff.wav b/main/sound/misc/aliensightoff.wav
new file mode 100644
index 00000000..9a8c60cd
Binary files /dev/null and b/main/sound/misc/aliensightoff.wav differ
diff --git a/main/sound/misc/aliensighton.wav b/main/sound/misc/aliensighton.wav
new file mode 100644
index 00000000..535fac9a
Binary files /dev/null and b/main/sound/misc/aliensighton.wav differ
diff --git a/main/sound/misc/b_marine_deploy.wav b/main/sound/misc/b_marine_deploy.wav
new file mode 100644
index 00000000..891768ef
Binary files /dev/null and b/main/sound/misc/b_marine_deploy.wav differ
diff --git a/main/sound/misc/b_marine_killed.wav b/main/sound/misc/b_marine_killed.wav
new file mode 100644
index 00000000..99cbc8a4
Binary files /dev/null and b/main/sound/misc/b_marine_killed.wav differ
diff --git a/main/sound/misc/b_recycle.wav b/main/sound/misc/b_recycle.wav
new file mode 100644
index 00000000..47a85972
Binary files /dev/null and b/main/sound/misc/b_recycle.wav differ
diff --git a/main/sound/misc/build1.wav b/main/sound/misc/build1.wav
new file mode 100644
index 00000000..e986d5f6
Binary files /dev/null and b/main/sound/misc/build1.wav differ
diff --git a/main/sound/misc/build2.wav b/main/sound/misc/build2.wav
new file mode 100644
index 00000000..a759d3f9
Binary files /dev/null and b/main/sound/misc/build2.wav differ
diff --git a/main/sound/misc/build3.wav b/main/sound/misc/build3.wav
new file mode 100644
index 00000000..17b2ac06
Binary files /dev/null and b/main/sound/misc/build3.wav differ
diff --git a/main/sound/misc/build4.wav b/main/sound/misc/build4.wav
new file mode 100644
index 00000000..8f33cec8
Binary files /dev/null and b/main/sound/misc/build4.wav differ
diff --git a/main/sound/misc/build5.wav b/main/sound/misc/build5.wav
new file mode 100644
index 00000000..86796ec8
Binary files /dev/null and b/main/sound/misc/build5.wav differ
diff --git a/main/sound/misc/commstat-die.wav b/main/sound/misc/commstat-die.wav
new file mode 100644
index 00000000..54f0812c
Binary files /dev/null and b/main/sound/misc/commstat-die.wav differ
diff --git a/main/sound/misc/commstat-end.wav b/main/sound/misc/commstat-end.wav
new file mode 100644
index 00000000..f8e62fe9
Binary files /dev/null and b/main/sound/misc/commstat-end.wav differ
diff --git a/main/sound/misc/commstat-start.wav b/main/sound/misc/commstat-start.wav
new file mode 100644
index 00000000..b58c752b
Binary files /dev/null and b/main/sound/misc/commstat-start.wav differ
diff --git a/main/sound/misc/connect.wav b/main/sound/misc/connect.wav
new file mode 100644
index 00000000..444c0d49
Binary files /dev/null and b/main/sound/misc/connect.wav differ
diff --git a/main/sound/misc/distressbeacon.wav b/main/sound/misc/distressbeacon.wav
new file mode 100644
index 00000000..21fb0683
Binary files /dev/null and b/main/sound/misc/distressbeacon.wav differ
diff --git a/main/sound/misc/egg_die.wav b/main/sound/misc/egg_die.wav
new file mode 100644
index 00000000..fa6b7a3b
Binary files /dev/null and b/main/sound/misc/egg_die.wav differ
diff --git a/main/sound/misc/egg_idle.wav b/main/sound/misc/egg_idle.wav
new file mode 100644
index 00000000..d8104cb9
Binary files /dev/null and b/main/sound/misc/egg_idle.wav differ
diff --git a/main/sound/misc/elecspark1.wav b/main/sound/misc/elecspark1.wav
new file mode 100644
index 00000000..bfc3c9ac
Binary files /dev/null and b/main/sound/misc/elecspark1.wav differ
diff --git a/main/sound/misc/elecspark2.wav b/main/sound/misc/elecspark2.wav
new file mode 100644
index 00000000..2fe96eba
Binary files /dev/null and b/main/sound/misc/elecspark2.wav differ
diff --git a/main/sound/misc/elecspark3.wav b/main/sound/misc/elecspark3.wav
new file mode 100644
index 00000000..b107fcce
Binary files /dev/null and b/main/sound/misc/elecspark3.wav differ
diff --git a/main/sound/misc/endcloak.wav b/main/sound/misc/endcloak.wav
new file mode 100644
index 00000000..13cbd554
Binary files /dev/null and b/main/sound/misc/endcloak.wav differ
diff --git a/main/sound/misc/energy.wav b/main/sound/misc/energy.wav
new file mode 100644
index 00000000..0752bbba
Binary files /dev/null and b/main/sound/misc/energy.wav differ
diff --git a/main/sound/misc/gestate.wav b/main/sound/misc/gestate.wav
new file mode 100644
index 00000000..c496541a
Binary files /dev/null and b/main/sound/misc/gestate.wav differ
diff --git a/main/sound/misc/hit.wav b/main/sound/misc/hit.wav
new file mode 100644
index 00000000..13ec1029
Binary files /dev/null and b/main/sound/misc/hit.wav differ
diff --git a/main/sound/misc/hive_ambient.wav b/main/sound/misc/hive_ambient.wav
new file mode 100644
index 00000000..a6642149
Binary files /dev/null and b/main/sound/misc/hive_ambient.wav differ
diff --git a/main/sound/misc/hive_death.wav b/main/sound/misc/hive_death.wav
new file mode 100644
index 00000000..8655e417
Binary files /dev/null and b/main/sound/misc/hive_death.wav differ
diff --git a/main/sound/misc/hive_spawn.wav b/main/sound/misc/hive_spawn.wav
new file mode 100644
index 00000000..9fa84784
Binary files /dev/null and b/main/sound/misc/hive_spawn.wav differ
diff --git a/main/sound/misc/hive_wound1.wav b/main/sound/misc/hive_wound1.wav
new file mode 100644
index 00000000..5c04b315
Binary files /dev/null and b/main/sound/misc/hive_wound1.wav differ
diff --git a/main/sound/misc/hive_wound2.wav b/main/sound/misc/hive_wound2.wav
new file mode 100644
index 00000000..a36bb01e
Binary files /dev/null and b/main/sound/misc/hive_wound2.wav differ
diff --git a/main/sound/misc/hive_wound3.wav b/main/sound/misc/hive_wound3.wav
new file mode 100644
index 00000000..4d5fa198
Binary files /dev/null and b/main/sound/misc/hive_wound3.wav differ
diff --git a/main/sound/misc/hive_wound4.wav b/main/sound/misc/hive_wound4.wav
new file mode 100644
index 00000000..647f900a
Binary files /dev/null and b/main/sound/misc/hive_wound4.wav differ
diff --git a/main/sound/misc/hive_wound5.wav b/main/sound/misc/hive_wound5.wav
new file mode 100644
index 00000000..51f7555f
Binary files /dev/null and b/main/sound/misc/hive_wound5.wav differ
diff --git a/main/sound/misc/invalid.wav b/main/sound/misc/invalid.wav
new file mode 100644
index 00000000..01eaffee
Binary files /dev/null and b/main/sound/misc/invalid.wav differ
diff --git a/main/sound/misc/jetpack.wav b/main/sound/misc/jetpack.wav
new file mode 100644
index 00000000..817b8ef1
Binary files /dev/null and b/main/sound/misc/jetpack.wav differ
diff --git a/main/sound/misc/levelup.wav b/main/sound/misc/levelup.wav
new file mode 100644
index 00000000..102ccbeb
Binary files /dev/null and b/main/sound/misc/levelup.wav differ
diff --git a/main/sound/misc/phasegate.wav b/main/sound/misc/phasegate.wav
new file mode 100644
index 00000000..31626b29
Binary files /dev/null and b/main/sound/misc/phasegate.wav differ
diff --git a/main/sound/misc/phasein.wav b/main/sound/misc/phasein.wav
new file mode 100644
index 00000000..780adadb
Binary files /dev/null and b/main/sound/misc/phasein.wav differ
diff --git a/main/sound/misc/regeneration.wav b/main/sound/misc/regeneration.wav
new file mode 100644
index 00000000..b54af13c
Binary files /dev/null and b/main/sound/misc/regeneration.wav differ
diff --git a/main/sound/misc/res_deploy.wav b/main/sound/misc/res_deploy.wav
new file mode 100644
index 00000000..92bd63d9
Binary files /dev/null and b/main/sound/misc/res_deploy.wav differ
diff --git a/main/sound/misc/resource_idle1.wav b/main/sound/misc/resource_idle1.wav
new file mode 100644
index 00000000..87245947
Binary files /dev/null and b/main/sound/misc/resource_idle1.wav differ
diff --git a/main/sound/misc/resource_idle2.wav b/main/sound/misc/resource_idle2.wav
new file mode 100644
index 00000000..60a85d9a
Binary files /dev/null and b/main/sound/misc/resource_idle2.wav differ
diff --git a/main/sound/misc/resource_idle3.wav b/main/sound/misc/resource_idle3.wav
new file mode 100644
index 00000000..c7e32b43
Binary files /dev/null and b/main/sound/misc/resource_idle3.wav differ
diff --git a/main/sound/misc/resupply.wav b/main/sound/misc/resupply.wav
new file mode 100644
index 00000000..e91ea38c
Binary files /dev/null and b/main/sound/misc/resupply.wav differ
diff --git a/main/sound/misc/scan.wav b/main/sound/misc/scan.wav
new file mode 100644
index 00000000..4892a0d8
Binary files /dev/null and b/main/sound/misc/scan.wav differ
diff --git a/main/sound/misc/startcloak.wav b/main/sound/misc/startcloak.wav
new file mode 100644
index 00000000..b102ca45
Binary files /dev/null and b/main/sound/misc/startcloak.wav differ
diff --git a/main/sound/misc/talk.wav b/main/sound/misc/talk.wav
new file mode 100644
index 00000000..2eb68620
Binary files /dev/null and b/main/sound/misc/talk.wav differ
diff --git a/main/sound/misc/transport.wav b/main/sound/misc/transport.wav
new file mode 100644
index 00000000..a894f2ed
Binary files /dev/null and b/main/sound/misc/transport.wav differ
diff --git a/main/sound/misc/transport2.wav b/main/sound/misc/transport2.wav
new file mode 100644
index 00000000..e72e5c0e
Binary files /dev/null and b/main/sound/misc/transport2.wav differ
diff --git a/main/sound/misc/web_break.wav b/main/sound/misc/web_break.wav
new file mode 100644
index 00000000..7c5d2938
Binary files /dev/null and b/main/sound/misc/web_break.wav differ
diff --git a/main/sound/ns_agora/comploop.wav b/main/sound/ns_agora/comploop.wav
new file mode 100644
index 00000000..7b106b90
Binary files /dev/null and b/main/sound/ns_agora/comploop.wav differ
diff --git a/main/sound/ns_agora/drips.wav b/main/sound/ns_agora/drips.wav
new file mode 100644
index 00000000..f7e12c95
Binary files /dev/null and b/main/sound/ns_agora/drips.wav differ
diff --git a/main/sound/ns_agora/fan2.wav b/main/sound/ns_agora/fan2.wav
new file mode 100644
index 00000000..77cf6f3e
Binary files /dev/null and b/main/sound/ns_agora/fan2.wav differ
diff --git a/main/sound/ns_agora/man_breather.wav b/main/sound/ns_agora/man_breather.wav
new file mode 100644
index 00000000..9a963070
Binary files /dev/null and b/main/sound/ns_agora/man_breather.wav differ
diff --git a/main/sound/ns_agora/man_computalk2.wav b/main/sound/ns_agora/man_computalk2.wav
new file mode 100644
index 00000000..92d96823
Binary files /dev/null and b/main/sound/ns_agora/man_computalk2.wav differ
diff --git a/main/sound/ns_agora/processing.wav b/main/sound/ns_agora/processing.wav
new file mode 100644
index 00000000..fb79cdfe
Binary files /dev/null and b/main/sound/ns_agora/processing.wav differ
diff --git a/main/sound/ns_agora/pumper.wav b/main/sound/ns_agora/pumper.wav
new file mode 100644
index 00000000..98050b03
Binary files /dev/null and b/main/sound/ns_agora/pumper.wav differ
diff --git a/main/sound/ns_agora/railclack1.wav b/main/sound/ns_agora/railclack1.wav
new file mode 100644
index 00000000..a6b221c9
Binary files /dev/null and b/main/sound/ns_agora/railclack1.wav differ
diff --git a/main/sound/ns_agora/railclack3.wav b/main/sound/ns_agora/railclack3.wav
new file mode 100644
index 00000000..57d65ea8
Binary files /dev/null and b/main/sound/ns_agora/railclack3.wav differ
diff --git a/main/sound/ns_ayumi/ayumi_rr.mp3 b/main/sound/ns_ayumi/ayumi_rr.mp3
new file mode 100644
index 00000000..917ff846
Binary files /dev/null and b/main/sound/ns_ayumi/ayumi_rr.mp3 differ
diff --git a/main/sound/ns_bast/bast-rr.wav b/main/sound/ns_bast/bast-rr.wav
new file mode 100644
index 00000000..645e532e
Binary files /dev/null and b/main/sound/ns_bast/bast-rr.wav differ
diff --git a/main/sound/ns_caged/drips.wav b/main/sound/ns_caged/drips.wav
new file mode 100644
index 00000000..f7e12c95
Binary files /dev/null and b/main/sound/ns_caged/drips.wav differ
diff --git a/main/sound/ns_caged/man_breather.wav b/main/sound/ns_caged/man_breather.wav
new file mode 100644
index 00000000..9a963070
Binary files /dev/null and b/main/sound/ns_caged/man_breather.wav differ
diff --git a/main/sound/ns_caged/man_computalk2.wav b/main/sound/ns_caged/man_computalk2.wav
new file mode 100644
index 00000000..92d96823
Binary files /dev/null and b/main/sound/ns_caged/man_computalk2.wav differ
diff --git a/main/sound/ns_caged/man_labdrone1.wav b/main/sound/ns_caged/man_labdrone1.wav
new file mode 100644
index 00000000..7ec2685d
Binary files /dev/null and b/main/sound/ns_caged/man_labdrone1.wav differ
diff --git a/main/sound/ns_lost/alienhive.mp3 b/main/sound/ns_lost/alienhive.mp3
new file mode 100644
index 00000000..69653213
Binary files /dev/null and b/main/sound/ns_lost/alienhive.mp3 differ
diff --git a/main/sound/ns_nancy/nancy-rr.wav b/main/sound/ns_nancy/nancy-rr.wav
new file mode 100644
index 00000000..645e532e
Binary files /dev/null and b/main/sound/ns_nancy/nancy-rr.wav differ
diff --git a/main/sound/ns_origin/fan2.wav b/main/sound/ns_origin/fan2.wav
new file mode 100644
index 00000000..77cf6f3e
Binary files /dev/null and b/main/sound/ns_origin/fan2.wav differ
diff --git a/main/sound/ns_origin/fan4.wav b/main/sound/ns_origin/fan4.wav
new file mode 100644
index 00000000..2e298e7e
Binary files /dev/null and b/main/sound/ns_origin/fan4.wav differ
diff --git a/main/sound/ns_origin/hotspark.wav b/main/sound/ns_origin/hotspark.wav
new file mode 100644
index 00000000..4fdedd11
Binary files /dev/null and b/main/sound/ns_origin/hotspark.wav differ
diff --git a/main/sound/ns_origin/hvyvibrate.wav b/main/sound/ns_origin/hvyvibrate.wav
new file mode 100644
index 00000000..725c74bb
Binary files /dev/null and b/main/sound/ns_origin/hvyvibrate.wav differ
diff --git a/main/sound/ns_origin/pings.wav b/main/sound/ns_origin/pings.wav
new file mode 100644
index 00000000..a4f27568
Binary files /dev/null and b/main/sound/ns_origin/pings.wav differ
diff --git a/main/sound/ns_origin/pumper.wav b/main/sound/ns_origin/pumper.wav
new file mode 100644
index 00000000..98050b03
Binary files /dev/null and b/main/sound/ns_origin/pumper.wav differ
diff --git a/main/sound/ns_origin/rain.wav b/main/sound/ns_origin/rain.wav
new file mode 100644
index 00000000..52409500
Binary files /dev/null and b/main/sound/ns_origin/rain.wav differ
diff --git a/main/sound/plats/bigstop2.wav b/main/sound/plats/bigstop2.wav
new file mode 100644
index 00000000..1cfe5b38
Binary files /dev/null and b/main/sound/plats/bigstop2.wav differ
diff --git a/main/sound/plats/rackmove1.wav b/main/sound/plats/rackmove1.wav
new file mode 100644
index 00000000..5bc814a5
Binary files /dev/null and b/main/sound/plats/rackmove1.wav differ
diff --git a/main/sound/player/digesting.wav b/main/sound/player/digesting.wav
new file mode 100644
index 00000000..4e32f4f6
Binary files /dev/null and b/main/sound/player/digesting.wav differ
diff --git a/main/sound/player/jointeam.wav b/main/sound/player/jointeam.wav
new file mode 100644
index 00000000..73091bf4
Binary files /dev/null and b/main/sound/player/jointeam.wav differ
diff --git a/main/sound/player/pl_fallpain3-1.wav b/main/sound/player/pl_fallpain3-1.wav
new file mode 100644
index 00000000..b7d664b4
Binary files /dev/null and b/main/sound/player/pl_fallpain3-1.wav differ
diff --git a/main/sound/player/pl_fallpain3-2.wav b/main/sound/player/pl_fallpain3-2.wav
new file mode 100644
index 00000000..7d6c8fc4
Binary files /dev/null and b/main/sound/player/pl_fallpain3-2.wav differ
diff --git a/main/sound/player/pl_fallpain3-3.wav b/main/sound/player/pl_fallpain3-3.wav
new file mode 100644
index 00000000..d6dce381
Binary files /dev/null and b/main/sound/player/pl_fallpain3-3.wav differ
diff --git a/main/sound/player/pl_fallpain3-4.wav b/main/sound/player/pl_fallpain3-4.wav
new file mode 100644
index 00000000..9a4e0767
Binary files /dev/null and b/main/sound/player/pl_fallpain3-4.wav differ
diff --git a/main/sound/player/pl_fallpain3-5.wav b/main/sound/player/pl_fallpain3-5.wav
new file mode 100644
index 00000000..3bfbc47f
Binary files /dev/null and b/main/sound/player/pl_fallpain3-5.wav differ
diff --git a/main/sound/player/pl_fallpain3-6.wav b/main/sound/player/pl_fallpain3-6.wav
new file mode 100644
index 00000000..1c6c7b8c
Binary files /dev/null and b/main/sound/player/pl_fallpain3-6.wav differ
diff --git a/main/sound/player/pl_fallpain3-7.wav b/main/sound/player/pl_fallpain3-7.wav
new file mode 100644
index 00000000..80928784
Binary files /dev/null and b/main/sound/player/pl_fallpain3-7.wav differ
diff --git a/main/sound/player/pl_fallpain3-8.wav b/main/sound/player/pl_fallpain3-8.wav
new file mode 100644
index 00000000..5f95bc5f
Binary files /dev/null and b/main/sound/player/pl_fallpain3-8.wav differ
diff --git a/main/sound/player/pl_fallpain3-a.wav b/main/sound/player/pl_fallpain3-a.wav
new file mode 100644
index 00000000..6f0fc022
Binary files /dev/null and b/main/sound/player/pl_fallpain3-a.wav differ
diff --git a/main/sound/player/pl_fallpain3.wav b/main/sound/player/pl_fallpain3.wav
new file mode 100644
index 00000000..b7d664b4
Binary files /dev/null and b/main/sound/player/pl_fallpain3.wav differ
diff --git a/main/sound/player/pl_ladder1.wav b/main/sound/player/pl_ladder1.wav
new file mode 100644
index 00000000..a6c6b1d9
Binary files /dev/null and b/main/sound/player/pl_ladder1.wav differ
diff --git a/main/sound/player/pl_ladder2.wav b/main/sound/player/pl_ladder2.wav
new file mode 100644
index 00000000..377ea5d6
Binary files /dev/null and b/main/sound/player/pl_ladder2.wav differ
diff --git a/main/sound/player/pl_ladder3.wav b/main/sound/player/pl_ladder3.wav
new file mode 100644
index 00000000..d1c5103a
Binary files /dev/null and b/main/sound/player/pl_ladder3.wav differ
diff --git a/main/sound/player/pl_ladder4.wav b/main/sound/player/pl_ladder4.wav
new file mode 100644
index 00000000..10be48b7
Binary files /dev/null and b/main/sound/player/pl_ladder4.wav differ
diff --git a/main/sound/player/pl_metal1.wav b/main/sound/player/pl_metal1.wav
new file mode 100644
index 00000000..55a6521a
Binary files /dev/null and b/main/sound/player/pl_metal1.wav differ
diff --git a/main/sound/player/pl_metal2.wav b/main/sound/player/pl_metal2.wav
new file mode 100644
index 00000000..ec4875fa
Binary files /dev/null and b/main/sound/player/pl_metal2.wav differ
diff --git a/main/sound/player/pl_metal3.wav b/main/sound/player/pl_metal3.wav
new file mode 100644
index 00000000..c24a43ac
Binary files /dev/null and b/main/sound/player/pl_metal3.wav differ
diff --git a/main/sound/player/pl_metal4.wav b/main/sound/player/pl_metal4.wav
new file mode 100644
index 00000000..cbf8cae0
Binary files /dev/null and b/main/sound/player/pl_metal4.wav differ
diff --git a/main/sound/player/pl_step1-a.wav b/main/sound/player/pl_step1-a.wav
new file mode 100644
index 00000000..1eb0138f
Binary files /dev/null and b/main/sound/player/pl_step1-a.wav differ
diff --git a/main/sound/player/pl_step1-a1.wav b/main/sound/player/pl_step1-a1.wav
new file mode 100644
index 00000000..ce8a42b8
Binary files /dev/null and b/main/sound/player/pl_step1-a1.wav differ
diff --git a/main/sound/player/pl_step1-a5.wav b/main/sound/player/pl_step1-a5.wav
new file mode 100644
index 00000000..77e162b5
Binary files /dev/null and b/main/sound/player/pl_step1-a5.wav differ
diff --git a/main/sound/player/pl_step1-h.wav b/main/sound/player/pl_step1-h.wav
new file mode 100644
index 00000000..dcc07f74
Binary files /dev/null and b/main/sound/player/pl_step1-h.wav differ
diff --git a/main/sound/player/pl_step1.wav b/main/sound/player/pl_step1.wav
new file mode 100644
index 00000000..d818e17d
Binary files /dev/null and b/main/sound/player/pl_step1.wav differ
diff --git a/main/sound/player/pl_step2-a.wav b/main/sound/player/pl_step2-a.wav
new file mode 100644
index 00000000..a5787d68
Binary files /dev/null and b/main/sound/player/pl_step2-a.wav differ
diff --git a/main/sound/player/pl_step2-a1.wav b/main/sound/player/pl_step2-a1.wav
new file mode 100644
index 00000000..fd862cd4
Binary files /dev/null and b/main/sound/player/pl_step2-a1.wav differ
diff --git a/main/sound/player/pl_step2-a5.wav b/main/sound/player/pl_step2-a5.wav
new file mode 100644
index 00000000..6fe7a936
Binary files /dev/null and b/main/sound/player/pl_step2-a5.wav differ
diff --git a/main/sound/player/pl_step2-h.wav b/main/sound/player/pl_step2-h.wav
new file mode 100644
index 00000000..5dba1fa7
Binary files /dev/null and b/main/sound/player/pl_step2-h.wav differ
diff --git a/main/sound/player/pl_step2.wav b/main/sound/player/pl_step2.wav
new file mode 100644
index 00000000..fee82b3b
Binary files /dev/null and b/main/sound/player/pl_step2.wav differ
diff --git a/main/sound/player/pl_step3-a.wav b/main/sound/player/pl_step3-a.wav
new file mode 100644
index 00000000..d5379ce8
Binary files /dev/null and b/main/sound/player/pl_step3-a.wav differ
diff --git a/main/sound/player/pl_step3-a1.wav b/main/sound/player/pl_step3-a1.wav
new file mode 100644
index 00000000..0a6ff907
Binary files /dev/null and b/main/sound/player/pl_step3-a1.wav differ
diff --git a/main/sound/player/pl_step3-a5.wav b/main/sound/player/pl_step3-a5.wav
new file mode 100644
index 00000000..b31ba794
Binary files /dev/null and b/main/sound/player/pl_step3-a5.wav differ
diff --git a/main/sound/player/pl_step3-h.wav b/main/sound/player/pl_step3-h.wav
new file mode 100644
index 00000000..5b1a46e5
Binary files /dev/null and b/main/sound/player/pl_step3-h.wav differ
diff --git a/main/sound/player/pl_step3.wav b/main/sound/player/pl_step3.wav
new file mode 100644
index 00000000..dd843b8b
Binary files /dev/null and b/main/sound/player/pl_step3.wav differ
diff --git a/main/sound/player/pl_step4-a.wav b/main/sound/player/pl_step4-a.wav
new file mode 100644
index 00000000..ff69af7c
Binary files /dev/null and b/main/sound/player/pl_step4-a.wav differ
diff --git a/main/sound/player/pl_step4-a1.wav b/main/sound/player/pl_step4-a1.wav
new file mode 100644
index 00000000..8b35710d
Binary files /dev/null and b/main/sound/player/pl_step4-a1.wav differ
diff --git a/main/sound/player/pl_step4-a5.wav b/main/sound/player/pl_step4-a5.wav
new file mode 100644
index 00000000..1d4238c4
Binary files /dev/null and b/main/sound/player/pl_step4-a5.wav differ
diff --git a/main/sound/player/pl_step4-h.wav b/main/sound/player/pl_step4-h.wav
new file mode 100644
index 00000000..32a4f1c1
Binary files /dev/null and b/main/sound/player/pl_step4-h.wav differ
diff --git a/main/sound/player/pl_step4.wav b/main/sound/player/pl_step4.wav
new file mode 100644
index 00000000..fa82c443
Binary files /dev/null and b/main/sound/player/pl_step4.wav differ
diff --git a/main/sound/player/primalscreaming.wav b/main/sound/player/primalscreaming.wav
new file mode 100644
index 00000000..338c0a2e
Binary files /dev/null and b/main/sound/player/primalscreaming.wav differ
diff --git a/main/sound/player/role1_die1.wav b/main/sound/player/role1_die1.wav
new file mode 100644
index 00000000..55497d00
Binary files /dev/null and b/main/sound/player/role1_die1.wav differ
diff --git a/main/sound/player/role1_die2.wav b/main/sound/player/role1_die2.wav
new file mode 100644
index 00000000..30647ac7
Binary files /dev/null and b/main/sound/player/role1_die2.wav differ
diff --git a/main/sound/player/role1_wound1.wav b/main/sound/player/role1_wound1.wav
new file mode 100644
index 00000000..164a93f4
Binary files /dev/null and b/main/sound/player/role1_wound1.wav differ
diff --git a/main/sound/player/role1_wound2.wav b/main/sound/player/role1_wound2.wav
new file mode 100644
index 00000000..1f73c2bf
Binary files /dev/null and b/main/sound/player/role1_wound2.wav differ
diff --git a/main/sound/player/role1_wound3.wav b/main/sound/player/role1_wound3.wav
new file mode 100644
index 00000000..c542eab5
Binary files /dev/null and b/main/sound/player/role1_wound3.wav differ
diff --git a/main/sound/player/role3_die1.wav b/main/sound/player/role3_die1.wav
new file mode 100644
index 00000000..6075fd28
Binary files /dev/null and b/main/sound/player/role3_die1.wav differ
diff --git a/main/sound/player/role3_idle1.wav b/main/sound/player/role3_idle1.wav
new file mode 100644
index 00000000..810d6290
Binary files /dev/null and b/main/sound/player/role3_idle1.wav differ
diff --git a/main/sound/player/role3_move1.wav b/main/sound/player/role3_move1.wav
new file mode 100644
index 00000000..cc14ea8c
Binary files /dev/null and b/main/sound/player/role3_move1.wav differ
diff --git a/main/sound/player/role3_pain1.wav b/main/sound/player/role3_pain1.wav
new file mode 100644
index 00000000..a520fb98
Binary files /dev/null and b/main/sound/player/role3_pain1.wav differ
diff --git a/main/sound/player/role3_spawn1.wav b/main/sound/player/role3_spawn1.wav
new file mode 100644
index 00000000..a4ef1942
Binary files /dev/null and b/main/sound/player/role3_spawn1.wav differ
diff --git a/main/sound/player/role3_spawn2.wav b/main/sound/player/role3_spawn2.wav
new file mode 100644
index 00000000..ae1e0686
Binary files /dev/null and b/main/sound/player/role3_spawn2.wav differ
diff --git a/main/sound/player/role3_wound1.wav b/main/sound/player/role3_wound1.wav
new file mode 100644
index 00000000..2d96497c
Binary files /dev/null and b/main/sound/player/role3_wound1.wav differ
diff --git a/main/sound/player/role4_die1.wav b/main/sound/player/role4_die1.wav
new file mode 100644
index 00000000..17416be9
Binary files /dev/null and b/main/sound/player/role4_die1.wav differ
diff --git a/main/sound/player/role4_idle1.wav b/main/sound/player/role4_idle1.wav
new file mode 100644
index 00000000..a0085aad
Binary files /dev/null and b/main/sound/player/role4_idle1.wav differ
diff --git a/main/sound/player/role4_move1.wav b/main/sound/player/role4_move1.wav
new file mode 100644
index 00000000..1c5e7867
Binary files /dev/null and b/main/sound/player/role4_move1.wav differ
diff --git a/main/sound/player/role4_pain1.wav b/main/sound/player/role4_pain1.wav
new file mode 100644
index 00000000..24cd7a9b
Binary files /dev/null and b/main/sound/player/role4_pain1.wav differ
diff --git a/main/sound/player/role4_spawn1.wav b/main/sound/player/role4_spawn1.wav
new file mode 100644
index 00000000..115d4a81
Binary files /dev/null and b/main/sound/player/role4_spawn1.wav differ
diff --git a/main/sound/player/role4_wound1.wav b/main/sound/player/role4_wound1.wav
new file mode 100644
index 00000000..5586dee6
Binary files /dev/null and b/main/sound/player/role4_wound1.wav differ
diff --git a/main/sound/player/role4_wound2.wav b/main/sound/player/role4_wound2.wav
new file mode 100644
index 00000000..d6e1ffa1
Binary files /dev/null and b/main/sound/player/role4_wound2.wav differ
diff --git a/main/sound/player/role5_die1.wav b/main/sound/player/role5_die1.wav
new file mode 100644
index 00000000..25e74269
Binary files /dev/null and b/main/sound/player/role5_die1.wav differ
diff --git a/main/sound/player/role5_idle1.wav b/main/sound/player/role5_idle1.wav
new file mode 100644
index 00000000..c65ebec9
Binary files /dev/null and b/main/sound/player/role5_idle1.wav differ
diff --git a/main/sound/player/role5_idle2.wav b/main/sound/player/role5_idle2.wav
new file mode 100644
index 00000000..c85fb42b
Binary files /dev/null and b/main/sound/player/role5_idle2.wav differ
diff --git a/main/sound/player/role5_move1.wav b/main/sound/player/role5_move1.wav
new file mode 100644
index 00000000..c4254854
Binary files /dev/null and b/main/sound/player/role5_move1.wav differ
diff --git a/main/sound/player/role5_move2.wav b/main/sound/player/role5_move2.wav
new file mode 100644
index 00000000..1ff6c97f
Binary files /dev/null and b/main/sound/player/role5_move2.wav differ
diff --git a/main/sound/player/role5_pain1.wav b/main/sound/player/role5_pain1.wav
new file mode 100644
index 00000000..84bf8380
Binary files /dev/null and b/main/sound/player/role5_pain1.wav differ
diff --git a/main/sound/player/role5_pain2.wav b/main/sound/player/role5_pain2.wav
new file mode 100644
index 00000000..296d2574
Binary files /dev/null and b/main/sound/player/role5_pain2.wav differ
diff --git a/main/sound/player/role5_spawn1.wav b/main/sound/player/role5_spawn1.wav
new file mode 100644
index 00000000..778307bb
Binary files /dev/null and b/main/sound/player/role5_spawn1.wav differ
diff --git a/main/sound/player/role5_wound1.wav b/main/sound/player/role5_wound1.wav
new file mode 100644
index 00000000..1a23f138
Binary files /dev/null and b/main/sound/player/role5_wound1.wav differ
diff --git a/main/sound/player/role6_die1.wav b/main/sound/player/role6_die1.wav
new file mode 100644
index 00000000..dde9b07b
Binary files /dev/null and b/main/sound/player/role6_die1.wav differ
diff --git a/main/sound/player/role6_idle1.wav b/main/sound/player/role6_idle1.wav
new file mode 100644
index 00000000..848d7b2b
Binary files /dev/null and b/main/sound/player/role6_idle1.wav differ
diff --git a/main/sound/player/role6_move1.wav b/main/sound/player/role6_move1.wav
new file mode 100644
index 00000000..db29437d
Binary files /dev/null and b/main/sound/player/role6_move1.wav differ
diff --git a/main/sound/player/role6_move2.wav b/main/sound/player/role6_move2.wav
new file mode 100644
index 00000000..b4c37ea8
Binary files /dev/null and b/main/sound/player/role6_move2.wav differ
diff --git a/main/sound/player/role6_pain1.wav b/main/sound/player/role6_pain1.wav
new file mode 100644
index 00000000..c48c4302
Binary files /dev/null and b/main/sound/player/role6_pain1.wav differ
diff --git a/main/sound/player/role6_spawn1.wav b/main/sound/player/role6_spawn1.wav
new file mode 100644
index 00000000..ba3f9344
Binary files /dev/null and b/main/sound/player/role6_spawn1.wav differ
diff --git a/main/sound/player/role6_wound1.wav b/main/sound/player/role6_wound1.wav
new file mode 100644
index 00000000..60a278f9
Binary files /dev/null and b/main/sound/player/role6_wound1.wav differ
diff --git a/main/sound/player/role7_die1.wav b/main/sound/player/role7_die1.wav
new file mode 100644
index 00000000..9dd45724
Binary files /dev/null and b/main/sound/player/role7_die1.wav differ
diff --git a/main/sound/player/role7_die2.wav b/main/sound/player/role7_die2.wav
new file mode 100644
index 00000000..0252e526
Binary files /dev/null and b/main/sound/player/role7_die2.wav differ
diff --git a/main/sound/player/role7_idle1.wav b/main/sound/player/role7_idle1.wav
new file mode 100644
index 00000000..9908dd9a
Binary files /dev/null and b/main/sound/player/role7_idle1.wav differ
diff --git a/main/sound/player/role7_move1.wav b/main/sound/player/role7_move1.wav
new file mode 100644
index 00000000..ab412075
Binary files /dev/null and b/main/sound/player/role7_move1.wav differ
diff --git a/main/sound/player/role7_move2.wav b/main/sound/player/role7_move2.wav
new file mode 100644
index 00000000..59cb4cda
Binary files /dev/null and b/main/sound/player/role7_move2.wav differ
diff --git a/main/sound/player/role7_pain1.wav b/main/sound/player/role7_pain1.wav
new file mode 100644
index 00000000..da602dd2
Binary files /dev/null and b/main/sound/player/role7_pain1.wav differ
diff --git a/main/sound/player/role7_spawn1.wav b/main/sound/player/role7_spawn1.wav
new file mode 100644
index 00000000..429961cf
Binary files /dev/null and b/main/sound/player/role7_spawn1.wav differ
diff --git a/main/sound/player/role7_wound1.wav b/main/sound/player/role7_wound1.wav
new file mode 100644
index 00000000..1cdd77ee
Binary files /dev/null and b/main/sound/player/role7_wound1.wav differ
diff --git a/main/sound/player/wingflap1.wav b/main/sound/player/wingflap1.wav
new file mode 100644
index 00000000..adc16b48
Binary files /dev/null and b/main/sound/player/wingflap1.wav differ
diff --git a/main/sound/player/wingflap2.wav b/main/sound/player/wingflap2.wav
new file mode 100644
index 00000000..d4a257e7
Binary files /dev/null and b/main/sound/player/wingflap2.wav differ
diff --git a/main/sound/player/wingflap3.wav b/main/sound/player/wingflap3.wav
new file mode 100644
index 00000000..3154beb7
Binary files /dev/null and b/main/sound/player/wingflap3.wav differ
diff --git a/main/sound/turret/aturret-1.wav b/main/sound/turret/aturret-1.wav
new file mode 100644
index 00000000..fce5f10a
Binary files /dev/null and b/main/sound/turret/aturret-1.wav differ
diff --git a/main/sound/turret/siege_deploy.wav b/main/sound/turret/siege_deploy.wav
new file mode 100644
index 00000000..87464de0
Binary files /dev/null and b/main/sound/turret/siege_deploy.wav differ
diff --git a/main/sound/turret/siege_ping.wav b/main/sound/turret/siege_ping.wav
new file mode 100644
index 00000000..92a0ed99
Binary files /dev/null and b/main/sound/turret/siege_ping.wav differ
diff --git a/main/sound/turret/siegehit1.wav b/main/sound/turret/siegehit1.wav
new file mode 100644
index 00000000..03702576
Binary files /dev/null and b/main/sound/turret/siegehit1.wav differ
diff --git a/main/sound/turret/siegehit2.wav b/main/sound/turret/siegehit2.wav
new file mode 100644
index 00000000..582881da
Binary files /dev/null and b/main/sound/turret/siegehit2.wav differ
diff --git a/main/sound/turret/st_fire1.wav b/main/sound/turret/st_fire1.wav
new file mode 100644
index 00000000..d9a62671
Binary files /dev/null and b/main/sound/turret/st_fire1.wav differ
diff --git a/main/sound/turret/tu_ping.wav b/main/sound/turret/tu_ping.wav
new file mode 100644
index 00000000..52d294b4
Binary files /dev/null and b/main/sound/turret/tu_ping.wav differ
diff --git a/main/sound/turret/turret-1.wav b/main/sound/turret/turret-1.wav
new file mode 100644
index 00000000..d0c9db06
Binary files /dev/null and b/main/sound/turret/turret-1.wav differ
diff --git a/main/sound/turret/turret-2.wav b/main/sound/turret/turret-2.wav
new file mode 100644
index 00000000..4f3c0b5b
Binary files /dev/null and b/main/sound/turret/turret-2.wav differ
diff --git a/main/sound/turret/turret-3.wav b/main/sound/turret/turret-3.wav
new file mode 100644
index 00000000..df08e847
Binary files /dev/null and b/main/sound/turret/turret-3.wav differ
diff --git a/main/sound/turret/turret-4.wav b/main/sound/turret/turret-4.wav
new file mode 100644
index 00000000..2cc4d728
Binary files /dev/null and b/main/sound/turret/turret-4.wav differ
diff --git a/main/sound/turret/turret_deploy.wav b/main/sound/turret/turret_deploy.wav
new file mode 100644
index 00000000..fca77419
Binary files /dev/null and b/main/sound/turret/turret_deploy.wav differ
diff --git a/main/sound/turret/turret_ping.wav b/main/sound/turret/turret_ping.wav
new file mode 100644
index 00000000..35a6a68b
Binary files /dev/null and b/main/sound/turret/turret_ping.wav differ
diff --git a/main/sound/ui/buttonclickrelease.wav b/main/sound/ui/buttonclickrelease.wav
new file mode 100644
index 00000000..9b9b53b4
Binary files /dev/null and b/main/sound/ui/buttonclickrelease.wav differ
diff --git a/main/sound/ui/buttonrollover.wav b/main/sound/ui/buttonrollover.wav
new file mode 100644
index 00000000..6611d3ef
Binary files /dev/null and b/main/sound/ui/buttonrollover.wav differ
diff --git a/main/sound/vox/asay11.wav b/main/sound/vox/asay11.wav
new file mode 100644
index 00000000..f65530da
Binary files /dev/null and b/main/sound/vox/asay11.wav differ
diff --git a/main/sound/vox/asay21.wav b/main/sound/vox/asay21.wav
new file mode 100644
index 00000000..ab5ef7f7
Binary files /dev/null and b/main/sound/vox/asay21.wav differ
diff --git a/main/sound/vox/asay31.wav b/main/sound/vox/asay31.wav
new file mode 100644
index 00000000..7b61604b
Binary files /dev/null and b/main/sound/vox/asay31.wav differ
diff --git a/main/sound/vox/asay41.wav b/main/sound/vox/asay41.wav
new file mode 100644
index 00000000..7412bedf
Binary files /dev/null and b/main/sound/vox/asay41.wav differ
diff --git a/main/sound/vox/asay51.wav b/main/sound/vox/asay51.wav
new file mode 100644
index 00000000..2f490e6e
Binary files /dev/null and b/main/sound/vox/asay51.wav differ
diff --git a/main/sound/vox/asay61.wav b/main/sound/vox/asay61.wav
new file mode 100644
index 00000000..551edf74
Binary files /dev/null and b/main/sound/vox/asay61.wav differ
diff --git a/main/sound/vox/sack1.wav b/main/sound/vox/sack1.wav
new file mode 100644
index 00000000..6eec2d98
Binary files /dev/null and b/main/sound/vox/sack1.wav differ
diff --git a/main/sound/vox/sack2.wav b/main/sound/vox/sack2.wav
new file mode 100644
index 00000000..ca0c84d4
Binary files /dev/null and b/main/sound/vox/sack2.wav differ
diff --git a/main/sound/vox/sack3.wav b/main/sound/vox/sack3.wav
new file mode 100644
index 00000000..9aca5a7a
Binary files /dev/null and b/main/sound/vox/sack3.wav differ
diff --git a/main/sound/vox/sack4.wav b/main/sound/vox/sack4.wav
new file mode 100644
index 00000000..93bed312
Binary files /dev/null and b/main/sound/vox/sack4.wav differ
diff --git a/main/sound/vox/sreq1.wav b/main/sound/vox/sreq1.wav
new file mode 100644
index 00000000..a1a363cc
Binary files /dev/null and b/main/sound/vox/sreq1.wav differ
diff --git a/main/sound/vox/sreq2.wav b/main/sound/vox/sreq2.wav
new file mode 100644
index 00000000..d7e3a9a8
Binary files /dev/null and b/main/sound/vox/sreq2.wav differ
diff --git a/main/sound/vox/sreq3.wav b/main/sound/vox/sreq3.wav
new file mode 100644
index 00000000..f9ce6e80
Binary files /dev/null and b/main/sound/vox/sreq3.wav differ
diff --git a/main/sound/vox/sreq4.wav b/main/sound/vox/sreq4.wav
new file mode 100644
index 00000000..71c80eef
Binary files /dev/null and b/main/sound/vox/sreq4.wav differ
diff --git a/main/sound/vox/ssay11.wav b/main/sound/vox/ssay11.wav
new file mode 100644
index 00000000..e5afa037
Binary files /dev/null and b/main/sound/vox/ssay11.wav differ
diff --git a/main/sound/vox/ssay12.wav b/main/sound/vox/ssay12.wav
new file mode 100644
index 00000000..e19cea69
Binary files /dev/null and b/main/sound/vox/ssay12.wav differ
diff --git a/main/sound/vox/ssay21.wav b/main/sound/vox/ssay21.wav
new file mode 100644
index 00000000..6262619c
Binary files /dev/null and b/main/sound/vox/ssay21.wav differ
diff --git a/main/sound/vox/ssay22.wav b/main/sound/vox/ssay22.wav
new file mode 100644
index 00000000..af252591
Binary files /dev/null and b/main/sound/vox/ssay22.wav differ
diff --git a/main/sound/vox/ssay23.wav b/main/sound/vox/ssay23.wav
new file mode 100644
index 00000000..0bc80532
Binary files /dev/null and b/main/sound/vox/ssay23.wav differ
diff --git a/main/sound/vox/ssay31.wav b/main/sound/vox/ssay31.wav
new file mode 100644
index 00000000..d53a79a1
Binary files /dev/null and b/main/sound/vox/ssay31.wav differ
diff --git a/main/sound/vox/ssay32.wav b/main/sound/vox/ssay32.wav
new file mode 100644
index 00000000..8f5f353b
Binary files /dev/null and b/main/sound/vox/ssay32.wav differ
diff --git a/main/sound/vox/ssay33.wav b/main/sound/vox/ssay33.wav
new file mode 100644
index 00000000..189f28b6
Binary files /dev/null and b/main/sound/vox/ssay33.wav differ
diff --git a/main/sound/vox/ssay34.wav b/main/sound/vox/ssay34.wav
new file mode 100644
index 00000000..28d288e7
Binary files /dev/null and b/main/sound/vox/ssay34.wav differ
diff --git a/main/sound/vox/ssay41.wav b/main/sound/vox/ssay41.wav
new file mode 100644
index 00000000..4628bca9
Binary files /dev/null and b/main/sound/vox/ssay41.wav differ
diff --git a/main/sound/vox/ssay42.wav b/main/sound/vox/ssay42.wav
new file mode 100644
index 00000000..f6cecb23
Binary files /dev/null and b/main/sound/vox/ssay42.wav differ
diff --git a/main/sound/vox/ssay51.wav b/main/sound/vox/ssay51.wav
new file mode 100644
index 00000000..7a588866
Binary files /dev/null and b/main/sound/vox/ssay51.wav differ
diff --git a/main/sound/vox/ssay52.wav b/main/sound/vox/ssay52.wav
new file mode 100644
index 00000000..d86ccc52
Binary files /dev/null and b/main/sound/vox/ssay52.wav differ
diff --git a/main/sound/vox/ssay53.wav b/main/sound/vox/ssay53.wav
new file mode 100644
index 00000000..2e364b38
Binary files /dev/null and b/main/sound/vox/ssay53.wav differ
diff --git a/main/sound/vox/ssay61.wav b/main/sound/vox/ssay61.wav
new file mode 100644
index 00000000..6b7598f5
Binary files /dev/null and b/main/sound/vox/ssay61.wav differ
diff --git a/main/sound/vox/ssay62.wav b/main/sound/vox/ssay62.wav
new file mode 100644
index 00000000..a1b26ebe
Binary files /dev/null and b/main/sound/vox/ssay62.wav differ
diff --git a/main/sound/vox/ssay71.wav b/main/sound/vox/ssay71.wav
new file mode 100644
index 00000000..12d6b5d4
Binary files /dev/null and b/main/sound/vox/ssay71.wav differ
diff --git a/main/sound/vox/ssay72.wav b/main/sound/vox/ssay72.wav
new file mode 100644
index 00000000..5c7d771a
Binary files /dev/null and b/main/sound/vox/ssay72.wav differ
diff --git a/main/sound/vox/ssay73.wav b/main/sound/vox/ssay73.wav
new file mode 100644
index 00000000..eff03e26
Binary files /dev/null and b/main/sound/vox/ssay73.wav differ
diff --git a/main/sound/vox/ssay81.wav b/main/sound/vox/ssay81.wav
new file mode 100644
index 00000000..99035833
Binary files /dev/null and b/main/sound/vox/ssay81.wav differ
diff --git a/main/sound/vox/ssay82.wav b/main/sound/vox/ssay82.wav
new file mode 100644
index 00000000..05e8ce26
Binary files /dev/null and b/main/sound/vox/ssay82.wav differ
diff --git a/main/sound/vox/ssay83.wav b/main/sound/vox/ssay83.wav
new file mode 100644
index 00000000..d6afa88a
Binary files /dev/null and b/main/sound/vox/ssay83.wav differ
diff --git a/main/sound/vox/ssay91.wav b/main/sound/vox/ssay91.wav
new file mode 100644
index 00000000..b9b4976b
Binary files /dev/null and b/main/sound/vox/ssay91.wav differ
diff --git a/main/sound/vox/ssay92.wav b/main/sound/vox/ssay92.wav
new file mode 100644
index 00000000..694ea5c2
Binary files /dev/null and b/main/sound/vox/ssay92.wav differ
diff --git a/main/sound/weapons/357_cock1.wav b/main/sound/weapons/357_cock1.wav
new file mode 100644
index 00000000..2203dfde
Binary files /dev/null and b/main/sound/weapons/357_cock1.wav differ
diff --git a/main/sound/weapons/a_ric1.wav b/main/sound/weapons/a_ric1.wav
new file mode 100644
index 00000000..3562e497
Binary files /dev/null and b/main/sound/weapons/a_ric1.wav differ
diff --git a/main/sound/weapons/a_ric2.wav b/main/sound/weapons/a_ric2.wav
new file mode 100644
index 00000000..023cbf9a
Binary files /dev/null and b/main/sound/weapons/a_ric2.wav differ
diff --git a/main/sound/weapons/a_ric3.wav b/main/sound/weapons/a_ric3.wav
new file mode 100644
index 00000000..84bbfd68
Binary files /dev/null and b/main/sound/weapons/a_ric3.wav differ
diff --git a/main/sound/weapons/acidrocketfire.wav b/main/sound/weapons/acidrocketfire.wav
new file mode 100644
index 00000000..14c7d162
Binary files /dev/null and b/main/sound/weapons/acidrocketfire.wav differ
diff --git a/main/sound/weapons/acidrockethit.wav b/main/sound/weapons/acidrockethit.wav
new file mode 100644
index 00000000..ecc013a1
Binary files /dev/null and b/main/sound/weapons/acidrockethit.wav differ
diff --git a/main/sound/weapons/alien_spray.wav b/main/sound/weapons/alien_spray.wav
new file mode 100644
index 00000000..20f811a7
Binary files /dev/null and b/main/sound/weapons/alien_spray.wav differ
diff --git a/main/sound/weapons/bilebombfire.wav b/main/sound/weapons/bilebombfire.wav
new file mode 100644
index 00000000..880f0570
Binary files /dev/null and b/main/sound/weapons/bilebombfire.wav differ
diff --git a/main/sound/weapons/bilebombhit.wav b/main/sound/weapons/bilebombhit.wav
new file mode 100644
index 00000000..7d10dfae
Binary files /dev/null and b/main/sound/weapons/bilebombhit.wav differ
diff --git a/main/sound/weapons/bite.wav b/main/sound/weapons/bite.wav
new file mode 100644
index 00000000..25127f31
Binary files /dev/null and b/main/sound/weapons/bite.wav differ
diff --git a/main/sound/weapons/bite2.wav b/main/sound/weapons/bite2.wav
new file mode 100644
index 00000000..4ff1ea42
Binary files /dev/null and b/main/sound/weapons/bite2.wav differ
diff --git a/main/sound/weapons/bitehit1.wav b/main/sound/weapons/bitehit1.wav
new file mode 100644
index 00000000..c75e168c
Binary files /dev/null and b/main/sound/weapons/bitehit1.wav differ
diff --git a/main/sound/weapons/bitehit2.wav b/main/sound/weapons/bitehit2.wav
new file mode 100644
index 00000000..75090981
Binary files /dev/null and b/main/sound/weapons/bitehit2.wav differ
diff --git a/main/sound/weapons/bitehit3.wav b/main/sound/weapons/bitehit3.wav
new file mode 100644
index 00000000..c8bbfa1d
Binary files /dev/null and b/main/sound/weapons/bitehit3.wav differ
diff --git a/main/sound/weapons/bitekill.wav b/main/sound/weapons/bitekill.wav
new file mode 100644
index 00000000..07c48b5c
Binary files /dev/null and b/main/sound/weapons/bitekill.wav differ
diff --git a/main/sound/weapons/blinkeffect.wav b/main/sound/weapons/blinkeffect.wav
new file mode 100644
index 00000000..55803344
Binary files /dev/null and b/main/sound/weapons/blinkeffect.wav differ
diff --git a/main/sound/weapons/blinkfire.wav b/main/sound/weapons/blinkfire.wav
new file mode 100644
index 00000000..b22ef476
Binary files /dev/null and b/main/sound/weapons/blinkfire.wav differ
diff --git a/main/sound/weapons/blinkfire2.wav b/main/sound/weapons/blinkfire2.wav
new file mode 100644
index 00000000..f87acd65
Binary files /dev/null and b/main/sound/weapons/blinkfire2.wav differ
diff --git a/main/sound/weapons/blinksuccess.wav b/main/sound/weapons/blinksuccess.wav
new file mode 100644
index 00000000..072ad752
Binary files /dev/null and b/main/sound/weapons/blinksuccess.wav differ
diff --git a/main/sound/weapons/bullet_hit1.wav b/main/sound/weapons/bullet_hit1.wav
new file mode 100644
index 00000000..715ffb08
Binary files /dev/null and b/main/sound/weapons/bullet_hit1.wav differ
diff --git a/main/sound/weapons/bullet_hit2.wav b/main/sound/weapons/bullet_hit2.wav
new file mode 100644
index 00000000..80970e6a
Binary files /dev/null and b/main/sound/weapons/bullet_hit2.wav differ
diff --git a/main/sound/weapons/charge1.wav b/main/sound/weapons/charge1.wav
new file mode 100644
index 00000000..9f4bf14d
Binary files /dev/null and b/main/sound/weapons/charge1.wav differ
diff --git a/main/sound/weapons/chargekill.wav b/main/sound/weapons/chargekill.wav
new file mode 100644
index 00000000..e98195e8
Binary files /dev/null and b/main/sound/weapons/chargekill.wav differ
diff --git a/main/sound/weapons/claws1.wav b/main/sound/weapons/claws1.wav
new file mode 100644
index 00000000..45898a2a
Binary files /dev/null and b/main/sound/weapons/claws1.wav differ
diff --git a/main/sound/weapons/claws2.wav b/main/sound/weapons/claws2.wav
new file mode 100644
index 00000000..4fe16a44
Binary files /dev/null and b/main/sound/weapons/claws2.wav differ
diff --git a/main/sound/weapons/claws3.wav b/main/sound/weapons/claws3.wav
new file mode 100644
index 00000000..0ab2c264
Binary files /dev/null and b/main/sound/weapons/claws3.wav differ
diff --git a/main/sound/weapons/clawshit1.wav b/main/sound/weapons/clawshit1.wav
new file mode 100644
index 00000000..3819bbbc
Binary files /dev/null and b/main/sound/weapons/clawshit1.wav differ
diff --git a/main/sound/weapons/clawshit2.wav b/main/sound/weapons/clawshit2.wav
new file mode 100644
index 00000000..71b99a9c
Binary files /dev/null and b/main/sound/weapons/clawshit2.wav differ
diff --git a/main/sound/weapons/clawskill.wav b/main/sound/weapons/clawskill.wav
new file mode 100644
index 00000000..8e85c06b
Binary files /dev/null and b/main/sound/weapons/clawskill.wav differ
diff --git a/main/sound/weapons/devour.wav b/main/sound/weapons/devour.wav
new file mode 100644
index 00000000..68d501cb
Binary files /dev/null and b/main/sound/weapons/devour.wav differ
diff --git a/main/sound/weapons/devourcancel.wav b/main/sound/weapons/devourcancel.wav
new file mode 100644
index 00000000..2f4a4762
Binary files /dev/null and b/main/sound/weapons/devourcancel.wav differ
diff --git a/main/sound/weapons/devourcomplete.wav b/main/sound/weapons/devourcomplete.wav
new file mode 100644
index 00000000..5eeb67dc
Binary files /dev/null and b/main/sound/weapons/devourcomplete.wav differ
diff --git a/main/sound/weapons/devourswallow.wav b/main/sound/weapons/devourswallow.wav
new file mode 100644
index 00000000..e60036f8
Binary files /dev/null and b/main/sound/weapons/devourswallow.wav differ
diff --git a/main/sound/weapons/divinewindexplode.wav b/main/sound/weapons/divinewindexplode.wav
new file mode 100644
index 00000000..9bbc54a4
Binary files /dev/null and b/main/sound/weapons/divinewindexplode.wav differ
diff --git a/main/sound/weapons/divinewindfire.wav b/main/sound/weapons/divinewindfire.wav
new file mode 100644
index 00000000..dd7e1be2
Binary files /dev/null and b/main/sound/weapons/divinewindfire.wav differ
diff --git a/main/sound/weapons/explode1.wav b/main/sound/weapons/explode1.wav
new file mode 100644
index 00000000..85c2e298
Binary files /dev/null and b/main/sound/weapons/explode1.wav differ
diff --git a/main/sound/weapons/explode2.wav b/main/sound/weapons/explode2.wav
new file mode 100644
index 00000000..de897966
Binary files /dev/null and b/main/sound/weapons/explode2.wav differ
diff --git a/main/sound/weapons/explode3.wav b/main/sound/weapons/explode3.wav
new file mode 100644
index 00000000..09670990
Binary files /dev/null and b/main/sound/weapons/explode3.wav differ
diff --git a/main/sound/weapons/explode4.wav b/main/sound/weapons/explode4.wav
new file mode 100644
index 00000000..85b4d988
Binary files /dev/null and b/main/sound/weapons/explode4.wav differ
diff --git a/main/sound/weapons/explode5.wav b/main/sound/weapons/explode5.wav
new file mode 100644
index 00000000..533af121
Binary files /dev/null and b/main/sound/weapons/explode5.wav differ
diff --git a/main/sound/weapons/g-deploy.wav b/main/sound/weapons/g-deploy.wav
new file mode 100644
index 00000000..1d7a5506
Binary files /dev/null and b/main/sound/weapons/g-deploy.wav differ
diff --git a/main/sound/weapons/g_reload.wav b/main/sound/weapons/g_reload.wav
new file mode 100644
index 00000000..d80b5b1a
Binary files /dev/null and b/main/sound/weapons/g_reload.wav differ
diff --git a/main/sound/weapons/gg-1.wav b/main/sound/weapons/gg-1.wav
new file mode 100644
index 00000000..c1892424
Binary files /dev/null and b/main/sound/weapons/gg-1.wav differ
diff --git a/main/sound/weapons/gg-deploy.wav b/main/sound/weapons/gg-deploy.wav
new file mode 100644
index 00000000..62b8f27e
Binary files /dev/null and b/main/sound/weapons/gg-deploy.wav differ
diff --git a/main/sound/weapons/gg_draw.wav b/main/sound/weapons/gg_draw.wav
new file mode 100644
index 00000000..dc650277
Binary files /dev/null and b/main/sound/weapons/gg_draw.wav differ
diff --git a/main/sound/weapons/gg_insert.wav b/main/sound/weapons/gg_insert.wav
new file mode 100644
index 00000000..fdd66f60
Binary files /dev/null and b/main/sound/weapons/gg_insert.wav differ
diff --git a/main/sound/weapons/gg_reload_end.wav b/main/sound/weapons/gg_reload_end.wav
new file mode 100644
index 00000000..403778ee
Binary files /dev/null and b/main/sound/weapons/gg_reload_end.wav differ
diff --git a/main/sound/weapons/gg_reload_start.wav b/main/sound/weapons/gg_reload_start.wav
new file mode 100644
index 00000000..073bdaba
Binary files /dev/null and b/main/sound/weapons/gg_reload_start.wav differ
diff --git a/main/sound/weapons/gg_rotate.wav b/main/sound/weapons/gg_rotate.wav
new file mode 100644
index 00000000..66578e40
Binary files /dev/null and b/main/sound/weapons/gg_rotate.wav differ
diff --git a/main/sound/weapons/gl_clipin.wav b/main/sound/weapons/gl_clipin.wav
new file mode 100644
index 00000000..e1d0a2d0
Binary files /dev/null and b/main/sound/weapons/gl_clipin.wav differ
diff --git a/main/sound/weapons/gl_clipout.wav b/main/sound/weapons/gl_clipout.wav
new file mode 100644
index 00000000..3b9b60c2
Binary files /dev/null and b/main/sound/weapons/gl_clipout.wav differ
diff --git a/main/sound/weapons/gl_draw.wav b/main/sound/weapons/gl_draw.wav
new file mode 100644
index 00000000..4c35e19c
Binary files /dev/null and b/main/sound/weapons/gl_draw.wav differ
diff --git a/main/sound/weapons/grenade_draw.wav b/main/sound/weapons/grenade_draw.wav
new file mode 100644
index 00000000..61a329e7
Binary files /dev/null and b/main/sound/weapons/grenade_draw.wav differ
diff --git a/main/sound/weapons/grenade_explode.wav b/main/sound/weapons/grenade_explode.wav
new file mode 100644
index 00000000..c29cbe26
Binary files /dev/null and b/main/sound/weapons/grenade_explode.wav differ
diff --git a/main/sound/weapons/grenade_hit.wav b/main/sound/weapons/grenade_hit.wav
new file mode 100644
index 00000000..84c4c493
Binary files /dev/null and b/main/sound/weapons/grenade_hit.wav differ
diff --git a/main/sound/weapons/grenade_hit1.wav b/main/sound/weapons/grenade_hit1.wav
new file mode 100644
index 00000000..e17fdaf0
Binary files /dev/null and b/main/sound/weapons/grenade_hit1.wav differ
diff --git a/main/sound/weapons/grenade_hit2.wav b/main/sound/weapons/grenade_hit2.wav
new file mode 100644
index 00000000..e49d40d4
Binary files /dev/null and b/main/sound/weapons/grenade_hit2.wav differ
diff --git a/main/sound/weapons/grenade_hit3.wav b/main/sound/weapons/grenade_hit3.wav
new file mode 100644
index 00000000..c787b045
Binary files /dev/null and b/main/sound/weapons/grenade_hit3.wav differ
diff --git a/main/sound/weapons/grenade_prime.wav b/main/sound/weapons/grenade_prime.wav
new file mode 100644
index 00000000..f09ee410
Binary files /dev/null and b/main/sound/weapons/grenade_prime.wav differ
diff --git a/main/sound/weapons/grenade_throw.wav b/main/sound/weapons/grenade_throw.wav
new file mode 100644
index 00000000..638b63cd
Binary files /dev/null and b/main/sound/weapons/grenade_throw.wav differ
diff --git a/main/sound/weapons/hg-1.wav b/main/sound/weapons/hg-1.wav
new file mode 100644
index 00000000..e014d948
Binary files /dev/null and b/main/sound/weapons/hg-1.wav differ
diff --git a/main/sound/weapons/hg-deploy.wav b/main/sound/weapons/hg-deploy.wav
new file mode 100644
index 00000000..5a3641ee
Binary files /dev/null and b/main/sound/weapons/hg-deploy.wav differ
diff --git a/main/sound/weapons/hmg-1.wav b/main/sound/weapons/hmg-1.wav
new file mode 100644
index 00000000..99e7a380
Binary files /dev/null and b/main/sound/weapons/hmg-1.wav differ
diff --git a/main/sound/weapons/hmg-deploy.wav b/main/sound/weapons/hmg-deploy.wav
new file mode 100644
index 00000000..fbeb4b2d
Binary files /dev/null and b/main/sound/weapons/hmg-deploy.wav differ
diff --git a/main/sound/weapons/hmg_clipin.wav b/main/sound/weapons/hmg_clipin.wav
new file mode 100644
index 00000000..b91b4093
Binary files /dev/null and b/main/sound/weapons/hmg_clipin.wav differ
diff --git a/main/sound/weapons/hmg_clipout.wav b/main/sound/weapons/hmg_clipout.wav
new file mode 100644
index 00000000..6215da75
Binary files /dev/null and b/main/sound/weapons/hmg_clipout.wav differ
diff --git a/main/sound/weapons/hmg_draw.wav b/main/sound/weapons/hmg_draw.wav
new file mode 100644
index 00000000..a35e6bba
Binary files /dev/null and b/main/sound/weapons/hmg_draw.wav differ
diff --git a/main/sound/weapons/kn-1.wav b/main/sound/weapons/kn-1.wav
new file mode 100644
index 00000000..abcb1479
Binary files /dev/null and b/main/sound/weapons/kn-1.wav differ
diff --git a/main/sound/weapons/kn-2.wav b/main/sound/weapons/kn-2.wav
new file mode 100644
index 00000000..c330ff53
Binary files /dev/null and b/main/sound/weapons/kn-2.wav differ
diff --git a/main/sound/weapons/kn-deploy.wav b/main/sound/weapons/kn-deploy.wav
new file mode 100644
index 00000000..5674943b
Binary files /dev/null and b/main/sound/weapons/kn-deploy.wav differ
diff --git a/main/sound/weapons/kn-hit-1.wav b/main/sound/weapons/kn-hit-1.wav
new file mode 100644
index 00000000..0d257916
Binary files /dev/null and b/main/sound/weapons/kn-hit-1.wav differ
diff --git a/main/sound/weapons/kn-hit-2.wav b/main/sound/weapons/kn-hit-2.wav
new file mode 100644
index 00000000..53ed4aed
Binary files /dev/null and b/main/sound/weapons/kn-hit-2.wav differ
diff --git a/main/sound/weapons/kn-hit-wall.wav b/main/sound/weapons/kn-hit-wall.wav
new file mode 100644
index 00000000..edb46970
Binary files /dev/null and b/main/sound/weapons/kn-hit-wall.wav differ
diff --git a/main/sound/weapons/leap1.wav b/main/sound/weapons/leap1.wav
new file mode 100644
index 00000000..f93d5eb4
Binary files /dev/null and b/main/sound/weapons/leap1.wav differ
diff --git a/main/sound/weapons/leaphit1.wav b/main/sound/weapons/leaphit1.wav
new file mode 100644
index 00000000..9eb48943
Binary files /dev/null and b/main/sound/weapons/leaphit1.wav differ
diff --git a/main/sound/weapons/leapkill.wav b/main/sound/weapons/leapkill.wav
new file mode 100644
index 00000000..ceb235ca
Binary files /dev/null and b/main/sound/weapons/leapkill.wav differ
diff --git a/main/sound/weapons/lmg_clipin.wav b/main/sound/weapons/lmg_clipin.wav
new file mode 100644
index 00000000..88cb2e73
Binary files /dev/null and b/main/sound/weapons/lmg_clipin.wav differ
diff --git a/main/sound/weapons/lmg_clipout.wav b/main/sound/weapons/lmg_clipout.wav
new file mode 100644
index 00000000..d34ba1f0
Binary files /dev/null and b/main/sound/weapons/lmg_clipout.wav differ
diff --git a/main/sound/weapons/lmg_draw.wav b/main/sound/weapons/lmg_draw.wav
new file mode 100644
index 00000000..df954b5a
Binary files /dev/null and b/main/sound/weapons/lmg_draw.wav differ
diff --git a/main/sound/weapons/metabolize1.wav b/main/sound/weapons/metabolize1.wav
new file mode 100644
index 00000000..b940f755
Binary files /dev/null and b/main/sound/weapons/metabolize1.wav differ
diff --git a/main/sound/weapons/metabolize2.wav b/main/sound/weapons/metabolize2.wav
new file mode 100644
index 00000000..b940f755
Binary files /dev/null and b/main/sound/weapons/metabolize2.wav differ
diff --git a/main/sound/weapons/metabolize3.wav b/main/sound/weapons/metabolize3.wav
new file mode 100644
index 00000000..b940f755
Binary files /dev/null and b/main/sound/weapons/metabolize3.wav differ
diff --git a/main/sound/weapons/metabolize_fire.wav b/main/sound/weapons/metabolize_fire.wav
new file mode 100644
index 00000000..d74299db
Binary files /dev/null and b/main/sound/weapons/metabolize_fire.wav differ
diff --git a/main/sound/weapons/metabolize_success.wav b/main/sound/weapons/metabolize_success.wav
new file mode 100644
index 00000000..29ea7c02
Binary files /dev/null and b/main/sound/weapons/metabolize_success.wav differ
diff --git a/main/sound/weapons/mg-1.wav b/main/sound/weapons/mg-1.wav
new file mode 100644
index 00000000..657453fe
Binary files /dev/null and b/main/sound/weapons/mg-1.wav differ
diff --git a/main/sound/weapons/mg-deploy.wav b/main/sound/weapons/mg-deploy.wav
new file mode 100644
index 00000000..9ebd80ad
Binary files /dev/null and b/main/sound/weapons/mg-deploy.wav differ
diff --git a/main/sound/weapons/mine_activate.wav b/main/sound/weapons/mine_activate.wav
new file mode 100644
index 00000000..e5dc9ff9
Binary files /dev/null and b/main/sound/weapons/mine_activate.wav differ
diff --git a/main/sound/weapons/mine_charge.wav b/main/sound/weapons/mine_charge.wav
new file mode 100644
index 00000000..51b4b279
Binary files /dev/null and b/main/sound/weapons/mine_charge.wav differ
diff --git a/main/sound/weapons/mine_deploy.wav b/main/sound/weapons/mine_deploy.wav
new file mode 100644
index 00000000..bf3f158f
Binary files /dev/null and b/main/sound/weapons/mine_deploy.wav differ
diff --git a/main/sound/weapons/mine_draw.wav b/main/sound/weapons/mine_draw.wav
new file mode 100644
index 00000000..4a2b2e7e
Binary files /dev/null and b/main/sound/weapons/mine_draw.wav differ
diff --git a/main/sound/weapons/mine_step.wav b/main/sound/weapons/mine_step.wav
new file mode 100644
index 00000000..343b06b9
Binary files /dev/null and b/main/sound/weapons/mine_step.wav differ
diff --git a/main/sound/weapons/parasitefire.wav b/main/sound/weapons/parasitefire.wav
new file mode 100644
index 00000000..2a83aa35
Binary files /dev/null and b/main/sound/weapons/parasitefire.wav differ
diff --git a/main/sound/weapons/parasitehit.wav b/main/sound/weapons/parasitehit.wav
new file mode 100644
index 00000000..8087deef
Binary files /dev/null and b/main/sound/weapons/parasitehit.wav differ
diff --git a/main/sound/weapons/pistol_clipin.wav b/main/sound/weapons/pistol_clipin.wav
new file mode 100644
index 00000000..25bdbc74
Binary files /dev/null and b/main/sound/weapons/pistol_clipin.wav differ
diff --git a/main/sound/weapons/pistol_clipout.wav b/main/sound/weapons/pistol_clipout.wav
new file mode 100644
index 00000000..c4f7b011
Binary files /dev/null and b/main/sound/weapons/pistol_clipout.wav differ
diff --git a/main/sound/weapons/pistol_draw.wav b/main/sound/weapons/pistol_draw.wav
new file mode 100644
index 00000000..e8503ecc
Binary files /dev/null and b/main/sound/weapons/pistol_draw.wav differ
diff --git a/main/sound/weapons/pistol_slide_release.wav b/main/sound/weapons/pistol_slide_release.wav
new file mode 100644
index 00000000..403ecc58
Binary files /dev/null and b/main/sound/weapons/pistol_slide_release.wav differ
diff --git a/main/sound/weapons/primalscream.wav b/main/sound/weapons/primalscream.wav
new file mode 100644
index 00000000..1af9c758
Binary files /dev/null and b/main/sound/weapons/primalscream.wav differ
diff --git a/main/sound/weapons/ric1.wav b/main/sound/weapons/ric1.wav
new file mode 100644
index 00000000..07605d4e
Binary files /dev/null and b/main/sound/weapons/ric1.wav differ
diff --git a/main/sound/weapons/ric2.wav b/main/sound/weapons/ric2.wav
new file mode 100644
index 00000000..7565586a
Binary files /dev/null and b/main/sound/weapons/ric2.wav differ
diff --git a/main/sound/weapons/ric3.wav b/main/sound/weapons/ric3.wav
new file mode 100644
index 00000000..bdb2c47b
Binary files /dev/null and b/main/sound/weapons/ric3.wav differ
diff --git a/main/sound/weapons/ric4.wav b/main/sound/weapons/ric4.wav
new file mode 100644
index 00000000..eb7cafd4
Binary files /dev/null and b/main/sound/weapons/ric4.wav differ
diff --git a/main/sound/weapons/ric5.wav b/main/sound/weapons/ric5.wav
new file mode 100644
index 00000000..4e6c33c5
Binary files /dev/null and b/main/sound/weapons/ric5.wav differ
diff --git a/main/sound/weapons/ric_conc-1.wav b/main/sound/weapons/ric_conc-1.wav
new file mode 100644
index 00000000..d2e9a69f
Binary files /dev/null and b/main/sound/weapons/ric_conc-1.wav differ
diff --git a/main/sound/weapons/ric_conc-2.wav b/main/sound/weapons/ric_conc-2.wav
new file mode 100644
index 00000000..83826a9b
Binary files /dev/null and b/main/sound/weapons/ric_conc-2.wav differ
diff --git a/main/sound/weapons/ric_metal-1.wav b/main/sound/weapons/ric_metal-1.wav
new file mode 100644
index 00000000..fa454f3c
Binary files /dev/null and b/main/sound/weapons/ric_metal-1.wav differ
diff --git a/main/sound/weapons/ric_metal-2.wav b/main/sound/weapons/ric_metal-2.wav
new file mode 100644
index 00000000..356404d5
Binary files /dev/null and b/main/sound/weapons/ric_metal-2.wav differ
diff --git a/main/sound/weapons/sg-1.wav b/main/sound/weapons/sg-1.wav
new file mode 100644
index 00000000..f18c9c30
Binary files /dev/null and b/main/sound/weapons/sg-1.wav differ
diff --git a/main/sound/weapons/sg-cock.wav b/main/sound/weapons/sg-cock.wav
new file mode 100644
index 00000000..7577c88a
Binary files /dev/null and b/main/sound/weapons/sg-cock.wav differ
diff --git a/main/sound/weapons/sg-deploy.wav b/main/sound/weapons/sg-deploy.wav
new file mode 100644
index 00000000..950329e0
Binary files /dev/null and b/main/sound/weapons/sg-deploy.wav differ
diff --git a/main/sound/weapons/shotgun_draw.wav b/main/sound/weapons/shotgun_draw.wav
new file mode 100644
index 00000000..b03a3f28
Binary files /dev/null and b/main/sound/weapons/shotgun_draw.wav differ
diff --git a/main/sound/weapons/shotgun_pump.wav b/main/sound/weapons/shotgun_pump.wav
new file mode 100644
index 00000000..80a201e2
Binary files /dev/null and b/main/sound/weapons/shotgun_pump.wav differ
diff --git a/main/sound/weapons/shotgun_reload.wav b/main/sound/weapons/shotgun_reload.wav
new file mode 100644
index 00000000..a4b220e6
Binary files /dev/null and b/main/sound/weapons/shotgun_reload.wav differ
diff --git a/main/sound/weapons/shotgun_stock_release.wav b/main/sound/weapons/shotgun_stock_release.wav
new file mode 100644
index 00000000..d0e3c202
Binary files /dev/null and b/main/sound/weapons/shotgun_stock_release.wav differ
diff --git a/main/sound/weapons/spikefire.wav b/main/sound/weapons/spikefire.wav
new file mode 100644
index 00000000..a17b4670
Binary files /dev/null and b/main/sound/weapons/spikefire.wav differ
diff --git a/main/sound/weapons/spit-1.wav b/main/sound/weapons/spit-1.wav
new file mode 100644
index 00000000..f27288df
Binary files /dev/null and b/main/sound/weapons/spit-1.wav differ
diff --git a/main/sound/weapons/spit-2.wav b/main/sound/weapons/spit-2.wav
new file mode 100644
index 00000000..7cf6c7e5
Binary files /dev/null and b/main/sound/weapons/spit-2.wav differ
diff --git a/main/sound/weapons/spithit1.wav b/main/sound/weapons/spithit1.wav
new file mode 100644
index 00000000..8a7a5ac2
Binary files /dev/null and b/main/sound/weapons/spithit1.wav differ
diff --git a/main/sound/weapons/spithit2.wav b/main/sound/weapons/spithit2.wav
new file mode 100644
index 00000000..6e1eed27
Binary files /dev/null and b/main/sound/weapons/spithit2.wav differ
diff --git a/main/sound/weapons/sporecloud.wav b/main/sound/weapons/sporecloud.wav
new file mode 100644
index 00000000..6f3b02a0
Binary files /dev/null and b/main/sound/weapons/sporecloud.wav differ
diff --git a/main/sound/weapons/sporefire.wav b/main/sound/weapons/sporefire.wav
new file mode 100644
index 00000000..a628032c
Binary files /dev/null and b/main/sound/weapons/sporefire.wav differ
diff --git a/main/sound/weapons/stomp.wav b/main/sound/weapons/stomp.wav
new file mode 100644
index 00000000..fe5813c9
Binary files /dev/null and b/main/sound/weapons/stomp.wav differ
diff --git a/main/sound/weapons/swipe1.wav b/main/sound/weapons/swipe1.wav
new file mode 100644
index 00000000..4af771cc
Binary files /dev/null and b/main/sound/weapons/swipe1.wav differ
diff --git a/main/sound/weapons/swipe2.wav b/main/sound/weapons/swipe2.wav
new file mode 100644
index 00000000..699f6ae8
Binary files /dev/null and b/main/sound/weapons/swipe2.wav differ
diff --git a/main/sound/weapons/swipe3.wav b/main/sound/weapons/swipe3.wav
new file mode 100644
index 00000000..99a01485
Binary files /dev/null and b/main/sound/weapons/swipe3.wav differ
diff --git a/main/sound/weapons/swipe4.wav b/main/sound/weapons/swipe4.wav
new file mode 100644
index 00000000..8ece7269
Binary files /dev/null and b/main/sound/weapons/swipe4.wav differ
diff --git a/main/sound/weapons/swipehit1.wav b/main/sound/weapons/swipehit1.wav
new file mode 100644
index 00000000..a13fcab5
Binary files /dev/null and b/main/sound/weapons/swipehit1.wav differ
diff --git a/main/sound/weapons/swipehit2.wav b/main/sound/weapons/swipehit2.wav
new file mode 100644
index 00000000..f0317e44
Binary files /dev/null and b/main/sound/weapons/swipehit2.wav differ
diff --git a/main/sound/weapons/swipekill.wav b/main/sound/weapons/swipekill.wav
new file mode 100644
index 00000000..627a51a2
Binary files /dev/null and b/main/sound/weapons/swipekill.wav differ
diff --git a/main/sound/weapons/umbrablocked.wav b/main/sound/weapons/umbrablocked.wav
new file mode 100644
index 00000000..395b8e26
Binary files /dev/null and b/main/sound/weapons/umbrablocked.wav differ
diff --git a/main/sound/weapons/umbrafire.wav b/main/sound/weapons/umbrafire.wav
new file mode 100644
index 00000000..267f2377
Binary files /dev/null and b/main/sound/weapons/umbrafire.wav differ
diff --git a/main/sound/weapons/webspin1.wav b/main/sound/weapons/webspin1.wav
new file mode 100644
index 00000000..a43e9665
Binary files /dev/null and b/main/sound/weapons/webspin1.wav differ
diff --git a/main/sound/weapons/webspin2.wav b/main/sound/weapons/webspin2.wav
new file mode 100644
index 00000000..32e15d7e
Binary files /dev/null and b/main/sound/weapons/webspin2.wav differ
diff --git a/main/sound/weapons/welderhit.wav b/main/sound/weapons/welderhit.wav
new file mode 100644
index 00000000..a62e4720
Binary files /dev/null and b/main/sound/weapons/welderhit.wav differ
diff --git a/main/sound/weapons/welderidle.wav b/main/sound/weapons/welderidle.wav
new file mode 100644
index 00000000..164ef1fe
Binary files /dev/null and b/main/sound/weapons/welderidle.wav differ
diff --git a/main/sound/weapons/welderstop.wav b/main/sound/weapons/welderstop.wav
new file mode 100644
index 00000000..951e09c4
Binary files /dev/null and b/main/sound/weapons/welderstop.wav differ
diff --git a/main/source/HPB_bot/dlls/HPB_bot.def b/main/source/HPB_bot/dlls/HPB_bot.def
new file mode 100644
index 00000000..e3e89fda
--- /dev/null
+++ b/main/source/HPB_bot/dlls/HPB_bot.def
@@ -0,0 +1,5 @@
+LIBRARY HPB_bot
+EXPORTS
+	GiveFnptrsToDll			@1
+SECTIONS
+	.data READ WRITE
diff --git a/main/source/HPB_bot/dlls/HPB_bot.vcproj b/main/source/HPB_bot/dlls/HPB_bot.vcproj
new file mode 100644
index 00000000..d67014e2
--- /dev/null
+++ b/main/source/HPB_bot/dlls/HPB_bot.vcproj
@@ -0,0 +1,393 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="HPB_bot"
+	RootNamespace="HPB_bot"
+	SccProjectName=""
+	SccAuxPath=""
+	SccLocalPath=""
+	SccProvider="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)..\dlls/"
+			IntermediateDirectory="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="$(SolutionDir);$(SolutionDir)\dlls;$(SolutionDir)\pm_shared;$(SolutionDir)\common"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;VALVE_DLL;AVH_SERVER;$(NoInherit)"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Release/HPB_bot.pch"
+				AssemblerListingLocation="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ObjectFile="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ProgramDataBaseFileName="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="3"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib ws2_32.lib util.lib"
+				OutputFile="$(SolutionDir)\..\dlls\HPB_bot.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="$(SolutionDir)\lib\$(ConfigurationName)"
+				ModuleDefinitionFile=".\HPB_bot.def"
+				ProgramDatabaseFile=""
+				GenerateMapFile="FALSE"
+				MapFileName=""
+				SubSystem="2"
+				ImportLibrary="$(SolutionDir)\temp\$(ProjectName)\$(ConfigurationName)/HPB_bot.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/HPB_bot.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)..\dlls/"
+			IntermediateDirectory="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				OptimizeForProcessor="1"
+				AdditionalIncludeDirectories="$(SolutionDir);$(SolutionDir)\dlls;$(SolutionDir)\pm_shared;$(SolutionDir)\common"
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;VALVE_DLL;DEBUG;AVH_SERVER;$(NoInherit)"
+				RuntimeLibrary="1"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Debug/HPB_bot.pch"
+				AssemblerListingLocation="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ObjectFile="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ProgramDataBaseFileName="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="odbc32.lib odbccp32.lib winmm.lib ws2_32.lib"
+				OutputFile="$(SolutionDir)..\dlls\HPB_bot.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="$(SolutionDir)lib\$(ConfigurationName)"
+				IgnoreDefaultLibraryNames="libcmt.lib"
+				ModuleDefinitionFile=".\HPB_bot.def"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(SolutionDir)..\dlls/HPB_bot.pdb"
+				SubSystem="2"
+				ImportLibrary="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/HPB_bot.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/HPB_bot.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\engine"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90">
+			<File
+				RelativePath="bot.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="bot_client.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="bot_combat.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="bot_navigate.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="bot_start.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="dll.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="engine.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="h_export.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="linkfunc.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="util.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="waypoint.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;fi;fd">
+			<File
+				RelativePath="bot.h">
+			</File>
+			<File
+				RelativePath="bot_func.h">
+			</File>
+			<File
+				RelativePath="cdll_dll.h">
+			</File>
+			<File
+				RelativePath="enginecallback.h">
+			</File>
+			<File
+				RelativePath="extdll.h">
+			</File>
+			<File
+				RelativePath="vector.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe">
+		</Filter>
+		<Filter
+			Name="mod"
+			Filter="">
+			<File
+				RelativePath="..\..\mod\AvHConstants.cpp">
+			</File>
+			<File
+				RelativePath="..\..\mod\AvHConstants.h">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/main/source/HPB_bot/dlls/bot.cpp b/main/source/HPB_bot/dlls/bot.cpp
new file mode 100644
index 00000000..cc341a06
--- /dev/null
+++ b/main/source/HPB_bot/dlls/bot.cpp
@@ -0,0 +1,2087 @@
+//
+// HPB bot - botman's High Ping Bastard bot
+//
+// (http://planethalflife.com/botman/)
+//
+// bot.cpp
+//
+
+//#include "windows.h"
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+
+#include "bot.h"
+#include "bot_func.h"
+#include "waypoint.h"
+#include "bot_weapons.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "mod/AvHMessage.h"
+#include "mod/AvHCommandConstants.h"
+#include "mod/AvHMessage.h"
+#include "mod/AvHPlayer.h"
+
+#ifndef __linux__
+extern HINSTANCE h_Library;
+#else
+extern void *h_Library;
+#endif
+
+
+extern int mod_id;
+extern WAYPOINT waypoints[MAX_WAYPOINTS];
+extern int num_waypoints;  // number of waypoints currently in use
+extern int default_bot_skill;
+extern edict_t *pent_info_ctfdetect;
+
+extern int max_team_players[4];
+extern int team_class_limits[4];
+extern int max_teams;
+extern char bot_whine[MAX_BOT_WHINE][81];
+extern int whine_count;
+
+extern int flf_bug_fix;
+
+static FILE *fp;
+
+
+#define PLAYER_SEARCH_RADIUS     40.0
+#define FLF_PLAYER_SEARCH_RADIUS 60.0
+
+
+bot_t bots[32];   // max of 32 bots in a game
+bool b_observer_mode = FALSE;
+bool b_botdontshoot = FALSE;
+
+extern int recent_bot_whine[5];
+
+int number_names = 0;
+
+#define MAX_BOT_NAMES 100
+
+#define VALVE_MAX_SKINS    10
+#define GEARBOX_MAX_SKINS  20
+
+// indicate which models are currently used for random model allocation
+bool valve_skin_used[VALVE_MAX_SKINS] = {
+   FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE};
+
+bool gearbox_skin_used[GEARBOX_MAX_SKINS] = {
+   FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE,
+   FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE};
+
+// store the names of the models...
+char *valve_bot_skins[VALVE_MAX_SKINS] = {
+   "barney", "gina", "gman", "gordon", "helmet",
+   "hgrunt", "recon", "robo", "scientist", "zombie"};
+
+char *gearbox_bot_skins[GEARBOX_MAX_SKINS] = {
+   "barney", "beret", "cl_suit", "drill", "fassn", "gina", "gman",
+   "gordon", "grunt", "helmet", "hgrunt", "massn", "otis", "recon",
+   "recruit", "robo", "scientist", "shepard", "tower", "zombie"};
+
+// store the player names for each of the models...
+char *valve_bot_names[VALVE_MAX_SKINS] = {
+   "Barney", "Gina", "G-Man", "Gordon", "Helmet",
+   "H-Grunt", "Recon", "Robo", "Scientist", "Zombie"};
+
+char *gearbox_bot_names[GEARBOX_MAX_SKINS] = {
+   "Barney", "Beret", "Cl_suit", "Drill", "Fassn", "Gina", "G-Man",
+   "Gordon", "Grunt", "Helmet", "H-Grunt", "Massn", "Otis", "Recon",
+   "Recruit", "Robo", "Scientist", "Shepard", "Tower", "Zombie"};
+
+char bot_names[MAX_BOT_NAMES][BOT_NAME_LEN+1];
+
+// how often (out of 1000 times) the bot will pause, based on bot skill
+float pause_frequency[5] = {4, 7, 10, 15, 20};
+
+float pause_time[5][2] = {
+   {0.2, 0.5}, {0.5, 1.0}, {0.7, 1.3}, {1.0, 1.7}, {1.2, 2.0}};
+
+
+inline edict_t *CREATE_FAKE_CLIENT( const char *netname )
+{
+   return (*g_engfuncs.pfnCreateFakeClient)( netname );
+}
+
+inline char *GET_INFOBUFFER( edict_t *e )
+{
+   return (*g_engfuncs.pfnGetInfoKeyBuffer)( e );
+}
+
+inline char *GET_INFO_KEY_VALUE( char *infobuffer, char *key )
+{
+   return (g_engfuncs.pfnInfoKeyValue( infobuffer, key ));
+}
+
+inline void SET_CLIENT_KEY_VALUE( int clientIndex, char *infobuffer,
+                                  char *key, char *value )
+{
+   (*g_engfuncs.pfnSetClientKeyValue)( clientIndex, infobuffer, key, value );
+}
+
+
+// this is the LINK_ENTITY_TO_CLASS function that creates a player (bot)
+void player( entvars_t *pev )
+{
+   static LINK_ENTITY_FUNC otherClassName = NULL;
+   if (otherClassName == NULL)
+      otherClassName = (LINK_ENTITY_FUNC)GetProcAddress(h_Library, "player");
+   if (otherClassName != NULL)
+   {
+      (*otherClassName)(pev);
+   }
+}
+
+void BotProcessVoiceCommands(bot_t* pBot)
+{
+	if((pBot->mTimeOfNextOrderRequest != -1) && (gpGlobals->time > pBot->mTimeOfNextOrderRequest))
+	{
+		if(pBot->pEdict->v.impulse == 0)
+		{
+			pBot->pEdict->v.impulse = ORDER_REQUEST;
+			pBot->mTimeOfNextOrderRequest = -1;
+		}
+	}
+	if((pBot->mTimeOfNextAmmoRequest != -1) && (gpGlobals->time > pBot->mTimeOfNextAmmoRequest))
+	{
+		if(pBot->pEdict->v.impulse == 0)
+		{
+			pBot->pEdict->v.impulse = SAYING_5;
+			pBot->mTimeOfNextAmmoRequest = -1;
+		}
+	}
+	if((pBot->mTimeOfNextRandomSaying != -1) && (gpGlobals->time > pBot->mTimeOfNextRandomSaying))
+	{
+		if(pBot->pEdict->v.impulse == 0)
+		{
+			pBot->pEdict->v.impulse = SAYING_1 + g_engfuncs.pfnRandomLong(0, 5);
+			pBot->mTimeOfNextRandomSaying = -1;
+		}
+	}
+	if((pBot->mTimeOfNextTaunt != -1) && (gpGlobals->time > pBot->mTimeOfNextTaunt))
+	{
+		if(pBot->pEdict->v.impulse == 0)
+		{
+			pBot->pEdict->v.impulse = SAYING_3;
+			pBot->mTimeOfNextTaunt = -1;
+		}
+	}
+	if((pBot->mTimeOfNextAcknowledge != -1) && (gpGlobals->time > pBot->mTimeOfNextAcknowledge))
+	{
+		if(pBot->pEdict->v.impulse == 0)
+		{
+			pBot->pEdict->v.impulse = ORDER_ACK;
+			pBot->mTimeOfNextAcknowledge = -1;
+		}
+	}
+}
+
+void BotSpawnInit( bot_t *pBot )
+{
+   pBot->v_prev_origin = Vector(9999.0, 9999.0, 9999.0);
+   pBot->prev_time = gpGlobals->time;
+
+   pBot->waypoint_origin = Vector(0, 0, 0);
+   pBot->f_waypoint_time = 0.0;
+   pBot->curr_waypoint_index = -1;
+   pBot->prev_waypoint_index[0] = -1;
+   pBot->prev_waypoint_index[1] = -1;
+   pBot->prev_waypoint_index[2] = -1;
+   pBot->prev_waypoint_index[3] = -1;
+   pBot->prev_waypoint_index[4] = -1;
+
+   pBot->f_random_waypoint_time = gpGlobals->time;
+   pBot->waypoint_goal = -1;
+   pBot->f_waypoint_goal_time = 0.0;
+   pBot->waypoint_near_flag = FALSE;
+   pBot->waypoint_flag_origin = Vector(0, 0, 0);
+   pBot->prev_waypoint_distance = 0.0;
+
+   pBot->msecnum = 0;
+   pBot->msecdel = 0.0;
+   pBot->msecval = 0.0;
+
+   pBot->bot_health = 0;
+   pBot->bot_armor = 0;
+   pBot->bot_weapons = 0;
+   pBot->blinded_time = 0.0;
+
+   // Init AvH variables
+   pBot->mBotPlayMode = PLAYMODE_READYROOM;
+
+   pBot->mOrderState = 0;
+   pBot->mOrderNumPlayers = -1;
+   pBot->mOrderType = ORDERTYPE_UNDEFINED;
+   pBot->mOrderTargetType = ORDERTARGETTYPE_UNDEFINED;
+   pBot->mOrderLocation[0] = pBot->mOrderLocation[1] = pBot->mOrderLocation[2] = 0.0f;
+   pBot->mOrderTargetIndex = -1;
+   pBot->mOrderCompleted = false;
+
+   pBot->mTimeOfNextAcknowledge = -1;
+   pBot->mTimeOfNextAmmoRequest = -1;
+   pBot->mTimeOfNextOrderRequest = -1;
+   pBot->mTimeOfNextTaunt = -1;
+   pBot->mTimeOfNextRandomSaying = -1;
+   
+   pBot->mGestateUser3 = AVH_USER3_NONE;
+   pBot->mResources = 0;
+   // end AvH variable init
+   
+   pBot->f_max_speed = CVAR_GET_FLOAT("sv_maxspeed");
+
+   pBot->prev_speed = 0.0;  // fake "paused" since bot is NOT stuck
+
+   pBot->f_find_item = 0.0;
+
+   pBot->ladder_dir = LADDER_UNKNOWN;
+   pBot->f_start_use_ladder_time = 0.0;
+   pBot->f_end_use_ladder_time = 0.0;
+   pBot->waypoint_top_of_ladder = FALSE;
+
+   pBot->f_wall_check_time = 0.0;
+   pBot->f_wall_on_right = 0.0;
+   pBot->f_wall_on_left = 0.0;
+   pBot->f_dont_avoid_wall_time = 0.0;
+   pBot->f_look_for_waypoint_time = 0.0;
+   pBot->f_jump_time = 0.0;
+   pBot->f_dont_check_stuck = 0.0;
+
+   // pick a wander direction (50% of the time to the left, 50% to the right)
+   if (RANDOM_LONG(1, 100) <= 50)
+      pBot->wander_dir = WANDER_LEFT;
+   else
+      pBot->wander_dir = WANDER_RIGHT;
+
+   pBot->f_exit_water_time = 0.0;
+
+   pBot->pBotEnemy = NULL;
+   pBot->f_bot_see_enemy_time = gpGlobals->time;
+   pBot->f_bot_find_enemy_time = gpGlobals->time;
+   pBot->pBotUser = NULL;
+   pBot->f_bot_use_time = 0.0;
+   pBot->b_bot_say_killed = FALSE;
+   pBot->f_bot_say_killed = 0.0;
+   pBot->f_sniper_aim_time = 0.0;
+
+   pBot->f_shoot_time = gpGlobals->time;
+   pBot->f_primary_charging = -1.0;
+   pBot->f_secondary_charging = -1.0;
+   pBot->charging_weapon_id = 0;
+
+   pBot->f_pause_time = 0.0;
+   pBot->f_sound_update_time = 0.0;
+   pBot->bot_has_flag = FALSE;
+
+   pBot->b_see_tripmine = FALSE;
+   pBot->b_shoot_tripmine = FALSE;
+   pBot->v_tripmine = Vector(0,0,0);
+
+   pBot->b_use_health_station = FALSE;
+   pBot->f_use_health_time = 0.0;
+   pBot->b_use_HEV_station = FALSE;
+   pBot->f_use_HEV_time = 0.0;
+
+   pBot->b_use_button = FALSE;
+   pBot->f_use_button_time = 0;
+   pBot->b_lift_moving = FALSE;
+
+   pBot->b_use_capture = FALSE;
+   pBot->f_use_capture_time = 0.0;
+   pBot->pCaptureEdict = NULL;
+
+   memset(&(pBot->current_weapon), 0, sizeof(pBot->current_weapon));
+   memset(&(pBot->m_rgAmmo), 0, sizeof(pBot->m_rgAmmo));
+}
+
+
+void BotNameInit( void )
+{
+   FILE *bot_name_fp;
+   char bot_name_filename[256];
+   int str_index;
+   char name_buffer[80];
+   int length, index;
+
+   UTIL_BuildFileName(bot_name_filename, "bot_names.txt", NULL);
+
+   bot_name_fp = fopen(bot_name_filename, "r");
+
+   if (bot_name_fp != NULL)
+   {
+      while ((number_names < MAX_BOT_NAMES) &&
+             (fgets(name_buffer, 80, bot_name_fp) != NULL))
+      {
+         length = strlen(name_buffer);
+
+         if (name_buffer[length-1] == '\n')
+         {
+            name_buffer[length-1] = 0;  // remove '\n'
+            length--;
+         }
+
+         str_index = 0;
+         while (str_index < length)
+         {
+            if ((name_buffer[str_index] < ' ') || (name_buffer[str_index] > '~') ||
+                (name_buffer[str_index] == '"'))
+            for (index=str_index; index < length; index++)
+               name_buffer[index] = name_buffer[index+1];
+
+            str_index++;
+         }
+
+         if (name_buffer[0] != 0)
+         {
+            strncpy(bot_names[number_names], name_buffer, BOT_NAME_LEN);
+
+            number_names++;
+         }
+      }
+
+      fclose(bot_name_fp);
+   }
+}
+
+
+void BotPickName( char *name_buffer )
+{
+   int name_index, index;
+   bool used;
+   edict_t *pPlayer;
+   int attempts = 0;
+
+   // see if a name exists from a kicked bot (if so, reuse it)
+   for (index=0; index < 32; index++)
+   {
+      if ((bots[index].is_used == FALSE) && (bots[index].name[0]))
+      {
+         strcpy(name_buffer, bots[index].name);
+
+         return;
+      }   
+   }
+
+   name_index = RANDOM_LONG(1, number_names) - 1;  // zero based
+
+   // check make sure this name isn't used
+   used = TRUE;
+
+   while (used)
+   {
+      used = FALSE;
+
+      for (index = 1; index <= gpGlobals->maxClients; index++)
+      {
+         pPlayer = INDEXENT(index);
+
+         if (pPlayer && !pPlayer->free)
+         {
+            if (strcmp(bot_names[name_index], STRING(pPlayer->v.netname)) == 0)
+            {
+               used = TRUE;
+               break;
+            }
+         }
+      }
+
+      if (used)
+      {
+         name_index++;
+
+         if (name_index == number_names)
+            name_index = 0;
+
+         attempts++;
+
+         if (attempts == number_names)
+            used = FALSE;  // break out of loop even if already used
+      }
+   }
+
+   strcpy(name_buffer, bot_names[name_index]);
+}
+
+
+void BotCreate( edict_t *pPlayer, const char *arg1, const char *arg2,
+                const char *arg3, const char *arg4)
+{
+   edict_t *BotEnt;
+   bot_t *pBot;
+   char c_skin[BOT_SKIN_LEN+1];
+   char c_name[BOT_NAME_LEN+1];
+   int skill;
+   int index;
+   int i, j, length;
+   bool found = FALSE;
+
+
+   if ((mod_id == VALVE_DLL) ||
+       ((mod_id == GEARBOX_DLL) && (pent_info_ctfdetect == NULL)))
+   {
+      int  max_skin_index;
+
+      if (mod_id == VALVE_DLL)
+         max_skin_index = VALVE_MAX_SKINS;
+      else  // must be GEARBOX_DLL
+         max_skin_index = GEARBOX_MAX_SKINS;
+
+      if ((arg1 == NULL) || (*arg1 == 0))
+      {
+         bool *pSkinUsed;
+
+         // pick a random skin
+         if (mod_id == VALVE_DLL)
+         {
+            index = RANDOM_LONG(0, VALVE_MAX_SKINS-1);
+            pSkinUsed = &valve_skin_used[0];
+         }
+         else  // must be GEARBOX_DLL
+         {
+            index = RANDOM_LONG(0, GEARBOX_MAX_SKINS-1);
+            pSkinUsed = &gearbox_skin_used[0];
+         }
+
+         // check if this skin has already been used...
+         while (pSkinUsed[index] == TRUE)
+         {
+            index++;
+
+            if (index == max_skin_index)
+               index = 0;
+         }
+
+         pSkinUsed[index] = TRUE;
+
+         // check if all skins are now used...
+         for (i = 0; i < max_skin_index; i++)
+         {
+            if (pSkinUsed[i] == FALSE)
+               break;
+         }
+
+         // if all skins are used, reset used to FALSE for next selection
+         if (i == max_skin_index)
+         {
+            for (i = 0; i < max_skin_index; i++)
+               pSkinUsed[i] = FALSE;
+         }
+
+         if (mod_id == VALVE_DLL)
+            strcpy( c_skin, valve_bot_skins[index] );
+         else // must be GEARBOX_DLL
+            strcpy( c_skin, gearbox_bot_skins[index] );
+      }
+      else
+      {
+         strncpy( c_skin, arg1, BOT_SKIN_LEN-1 );
+         c_skin[BOT_SKIN_LEN] = 0;  // make sure c_skin is null terminated
+      }
+
+      for (i = 0; c_skin[i] != 0; i++)
+         c_skin[i] = tolower( c_skin[i] );  // convert to all lowercase
+
+      index = 0;
+
+      while ((!found) && (index < max_skin_index))
+      {
+         if (mod_id == VALVE_DLL)
+         {
+            if (strcmp(c_skin, valve_bot_skins[index]) == 0)
+               found = TRUE;
+            else
+               index++;
+         }
+         else // must be GEARBOX_DLL
+         {
+            if (strcmp(c_skin, gearbox_bot_skins[index]) == 0)
+               found = TRUE;
+            else
+               index++;
+         }
+      }
+
+      if (found == TRUE)
+      {
+         if ((arg2 != NULL) && (*arg2 != 0))
+         {
+            strncpy( c_name, arg2, BOT_SKIN_LEN-1 );
+            c_name[BOT_SKIN_LEN] = 0;  // make sure c_name is null terminated
+         }
+         else
+         {
+            if (number_names > 0)
+               BotPickName( c_name );
+            else if (mod_id == VALVE_DLL)
+               strcpy( c_name, valve_bot_names[index] );
+            else // must be GEARBOX_DLL
+               strcpy( c_name, gearbox_bot_names[index] );
+         }
+      }
+      else
+      {
+         char dir_name[32];
+         char filename[128];
+
+         struct stat stat_str;
+
+         GET_GAME_DIR(dir_name);
+
+#ifndef __linux__
+         sprintf(filename, "%s\\models\\player\\%s", dir_name, c_skin);
+#else
+         sprintf(filename, "%s/models/player/%s", dir_name, c_skin);
+#endif
+
+         if (stat(filename, &stat_str) != 0)
+         {
+#ifndef __linux__
+            sprintf(filename, "valve\\models\\player\\%s", c_skin);
+#else
+            sprintf(filename, "valve/models/player/%s", c_skin);
+#endif
+            if (stat(filename, &stat_str) != 0)
+            {
+               char err_msg[80];
+
+               sprintf( err_msg, "model \"%s\" is unknown.\n", c_skin );
+               if (pPlayer)
+                  ClientPrint(pPlayer, HUD_PRINTNOTIFY, err_msg );
+               if (IS_DEDICATED_SERVER())
+                  printf(err_msg);
+
+               if (pPlayer)
+                  ClientPrint(pPlayer, HUD_PRINTNOTIFY,
+                     "use barney, gina, gman, gordon, helmet, hgrunt,\n");
+               if (IS_DEDICATED_SERVER())
+                  printf("use barney, gina, gman, gordon, helmet, hgrunt,\n");
+               if (pPlayer)
+                  ClientPrint(pPlayer, HUD_PRINTNOTIFY,
+                     "    recon, robo, scientist, or zombie\n");
+               if (IS_DEDICATED_SERVER())
+                  printf("    recon, robo, scientist, or zombie\n");
+               return;
+            }
+         }
+
+         if ((arg2 != NULL) && (*arg2 != 0))
+         {
+            strncpy( c_name, arg2, BOT_NAME_LEN-1 );
+            c_name[BOT_NAME_LEN] = 0;  // make sure c_name is null terminated
+         }
+         else
+         {
+            if (number_names > 0)
+               BotPickName( c_name );
+            else
+            {
+               // copy the name of the model to the bot's name...
+               strncpy( c_name, arg1, BOT_NAME_LEN-1 );
+               c_name[BOT_NAME_LEN] = 0;  // make sure c_skin is null terminated
+            }
+         }
+      }
+
+      skill = 0;
+
+      if ((arg3 != NULL) && (*arg3 != 0))
+         skill = atoi(arg3);
+         
+      if ((skill < 1) || (skill > 5))
+         skill = default_bot_skill;
+   }
+   else
+   {
+      if ((arg3 != NULL) && (*arg3 != 0))
+      {
+         strncpy( c_name, arg3, BOT_NAME_LEN-1 );
+         c_name[BOT_NAME_LEN] = 0;  // make sure c_name is null terminated
+      }
+      else
+      {
+         if (number_names > 0)
+            BotPickName( c_name );
+         else
+            strcpy(c_name, "Bot");
+      }
+
+      skill = 0;
+
+      if ((arg4 != NULL) && (*arg4 != 0))
+         skill = atoi(arg4);
+         
+      if ((skill < 1) || (skill > 5))
+         skill = default_bot_skill;
+   }
+
+   length = strlen(c_name);
+
+   // remove any illegal characters from name...
+   for (i = 0; i < length; i++)
+   {
+      if ((c_name[i] <= ' ') || (c_name[i] > '~') ||
+          (c_name[i] == '"'))
+      {
+         for (j = i; j < length; j++)  // shuffle chars left (and null)
+            c_name[j] = c_name[j+1];
+         length--;
+      }               
+   }
+
+   BotEnt = CREATE_FAKE_CLIENT( c_name );
+
+   if (FNullEnt( BotEnt ))
+   {
+      if (pPlayer)
+         ClientPrint( pPlayer, HUD_PRINTNOTIFY, "Max. Players reached.  Can't create bot!\n");
+   }
+   else
+   {
+      char ptr[128];  // allocate space for message from ClientConnect
+      char *infobuffer;
+      int clientIndex;
+      int index;
+
+      if (IS_DEDICATED_SERVER())
+         printf("Creating bot...\n");
+      else if (pPlayer)
+         ClientPrint( pPlayer, HUD_PRINTNOTIFY, "Creating bot...\n");
+
+      index = 0;
+      while ((bots[index].is_used) && (index < 32))
+         index++;
+
+      if (index == 32)
+      {
+         ClientPrint( pPlayer, HUD_PRINTNOTIFY, "Can't create bot!\n");
+         return;
+      }
+
+      // create the player entity by calling MOD's player function
+      // (from LINK_ENTITY_TO_CLASS for player object)
+
+      player( VARS(BotEnt) );
+
+      infobuffer = GET_INFOBUFFER( BotEnt );
+      clientIndex = ENTINDEX( BotEnt );
+
+
+      if ((mod_id == VALVE_DLL) || (mod_id == GEARBOX_DLL))
+         SET_CLIENT_KEY_VALUE( clientIndex, infobuffer, "model", c_skin );
+      else // other mods
+         SET_CLIENT_KEY_VALUE( clientIndex, infobuffer, "model", "gina" );
+
+      if (mod_id == CSTRIKE_DLL)
+      {
+         SET_CLIENT_KEY_VALUE( clientIndex, infobuffer, "rate", "3500.000000");
+         SET_CLIENT_KEY_VALUE( clientIndex, infobuffer, "cl_updaterate", "20");
+         SET_CLIENT_KEY_VALUE( clientIndex, infobuffer, "cl_lw", "1");
+         SET_CLIENT_KEY_VALUE( clientIndex, infobuffer, "cl_lc", "1");
+         SET_CLIENT_KEY_VALUE( clientIndex, infobuffer, "tracker", "0");
+         SET_CLIENT_KEY_VALUE( clientIndex, infobuffer, "cl_dlmax", "128");
+         SET_CLIENT_KEY_VALUE( clientIndex, infobuffer, "lefthand", "1");
+         SET_CLIENT_KEY_VALUE( clientIndex, infobuffer, "friends", "0");
+         SET_CLIENT_KEY_VALUE( clientIndex, infobuffer, "dm", "0");
+         SET_CLIENT_KEY_VALUE( clientIndex, infobuffer, "ah", "1");
+      }
+
+      ClientConnect( BotEnt, c_name, "127.0.0.1", ptr );
+
+      // Pieter van Dijk - use instead of DispatchSpawn() - Hip Hip Hurray!
+      ClientPutInServer( BotEnt );
+
+      BotEnt->v.flags |= FL_FAKECLIENT;
+
+      // initialize all the variables for this bot...
+
+      pBot = &bots[index];
+
+      pBot->is_used = TRUE;
+      pBot->respawn_state = RESPAWN_IDLE;
+      pBot->create_time = gpGlobals->time;
+      pBot->name[0] = 0;  // name not set by server yet
+      pBot->bot_money = 0;
+
+      strcpy(pBot->skin, c_skin);
+
+      pBot->pEdict = BotEnt;
+
+      pBot->not_started = 1;  // hasn't joined game yet
+
+      if (mod_id == TFC_DLL)
+         pBot->start_action = MSG_TFC_IDLE;
+      else if (mod_id == CSTRIKE_DLL)
+         pBot->start_action = MSG_CS_IDLE;
+      else if ((mod_id == GEARBOX_DLL) && (pent_info_ctfdetect != NULL))
+         pBot->start_action = MSG_OPFOR_IDLE;
+      else if (mod_id == FRONTLINE_DLL)
+         pBot->start_action = MSG_FLF_IDLE;
+      else if (mod_id == AVH_DLL)
+		  pBot->start_action = MSG_AVH_IDLE;
+      else
+         pBot->start_action = 0;  // not needed for non-team MODs
+
+
+      BotSpawnInit(pBot);
+
+      pBot->need_to_initialize = FALSE;  // don't need to initialize yet
+
+      BotEnt->v.idealpitch = BotEnt->v.v_angle.x;
+      BotEnt->v.ideal_yaw = BotEnt->v.v_angle.y;
+      BotEnt->v.pitch_speed = BOT_PITCH_SPEED;
+      BotEnt->v.yaw_speed = BOT_YAW_SPEED;
+
+      pBot->warmup = 0;  // for Front Line Force
+      pBot->idle_angle = 0.0;
+      pBot->idle_angle_time = 0.0;
+      pBot->round_end = 0;
+      pBot->defender = 0;
+
+      pBot->bot_skill = skill - 1;  // 0 based for array indexes
+
+      pBot->bot_team = -1;
+      pBot->bot_class = -1;
+
+      if ((mod_id == TFC_DLL) || (mod_id == CSTRIKE_DLL) ||
+          ((mod_id == GEARBOX_DLL) && (pent_info_ctfdetect != NULL)) ||
+          (mod_id == FRONTLINE_DLL))
+      {
+         if ((arg1 != NULL) && (arg1[0] != 0))
+         {
+            pBot->bot_team = atoi(arg1);
+
+            if ((arg2 != NULL) && (arg2[0] != 0))
+            {
+               pBot->bot_class = atoi(arg2);
+            }
+         }
+      }
+   }
+}
+
+
+int BotInFieldOfView(bot_t *pBot, Vector dest)
+{
+   // find angles from source to destination...
+   Vector entity_angles = UTIL_VecToAngles( dest );
+
+   // make yaw angle 0 to 360 degrees if negative...
+   if (entity_angles.y < 0)
+      entity_angles.y += 360;
+
+   // get bot's current view angle...
+   float view_angle = pBot->pEdict->v.v_angle.y;
+
+   // make view angle 0 to 360 degrees if negative...
+   if (view_angle < 0)
+      view_angle += 360;
+
+   // return the absolute value of angle to destination entity
+   // zero degrees means straight ahead,  45 degrees to the left or
+   // 45 degrees to the right is the limit of the normal view angle
+
+   // rsm - START angle bug fix
+   int angle = abs((int)view_angle - (int)entity_angles.y);
+
+   if (angle > 180)
+      angle = 360 - angle;
+
+   return angle;
+   // rsm - END
+}
+
+
+bool BotEntityIsVisible( bot_t *pBot, Vector dest )
+{
+   TraceResult tr;
+
+   // trace a line from bot's eyes to destination...
+   UTIL_TraceLine( pBot->pEdict->v.origin + pBot->pEdict->v.view_ofs,
+                   dest, ignore_monsters,
+                   pBot->pEdict->v.pContainingEntity, &tr );
+
+   // check if line of sight to object is not blocked (i.e. visible)
+   if (tr.flFraction >= 1.0)
+      return TRUE;
+   else
+      return FALSE;
+}
+
+
+void BotFindItem( bot_t *pBot )
+{
+   edict_t *pent = NULL;
+   edict_t *pPickupEntity = NULL;
+   Vector pickup_origin;
+   Vector entity_origin;
+   float radius = 500;
+   bool can_pickup;
+   float min_distance;
+   char item_name[40];
+   TraceResult tr;
+   Vector vecStart;
+   Vector vecEnd;
+   int angle_to_entity;
+   edict_t *pEdict = pBot->pEdict;
+
+   pBot->pBotPickupItem = NULL;
+
+   // use a MUCH smaller search radius when waypoints are available
+   if ((num_waypoints > 0) && (pBot->curr_waypoint_index != -1))
+      radius = 100.0;
+   else
+      radius = 500.0;
+
+   min_distance = radius + 1.0;
+
+   while ((pent = UTIL_FindEntityInSphere( pent, pEdict->v.origin, radius )) != NULL)
+   {
+      can_pickup = FALSE;  // assume can't use it until known otherwise
+
+      strcpy(item_name, STRING(pent->v.classname));
+
+      // see if this is a "func_" type of entity (func_button, etc.)...
+      if (strncmp("func_", item_name, 5) == 0)
+      {
+         // BModels have 0,0,0 for origin so must use VecBModelOrigin...
+         entity_origin = VecBModelOrigin(pent);
+
+         vecStart = pEdict->v.origin + pEdict->v.view_ofs;
+         vecEnd = entity_origin;
+
+         angle_to_entity = BotInFieldOfView( pBot, vecEnd - vecStart );
+
+         // check if entity is outside field of view (+/- 45 degrees)
+         if (angle_to_entity > 45)
+            continue;  // skip this item if bot can't "see" it
+
+         // check if entity is a ladder (ladders are a special case)
+         // DON'T search for ladders if there are waypoints in this level...
+         if ((strcmp("func_ladder", item_name) == 0) && (num_waypoints == 0))
+         {
+            // force ladder origin to same z coordinate as bot since
+            // the VecBModelOrigin is the center of the ladder.  For
+            // LONG ladders, the center MAY be hundreds of units above
+            // the bot.  Fake an origin at the same level as the bot...
+
+            entity_origin.z = pEdict->v.origin.z;
+            vecEnd = entity_origin;
+
+            // trace a line from bot's eyes to func_ladder entity...
+            UTIL_TraceLine( vecStart, vecEnd, dont_ignore_monsters,
+                            pEdict->v.pContainingEntity, &tr);
+
+            // check if traced all the way up to the entity (didn't hit wall)
+            if (tr.flFraction >= 1.0)
+            {
+               // find distance to item for later use...
+               float distance = (vecEnd - vecStart).Length( );
+
+               // use the ladder about 100% of the time, if haven't
+               // used a ladder in at least 5 seconds...
+               if ((RANDOM_LONG(1, 100) <= 100) &&
+                   ((pBot->f_end_use_ladder_time + 5.0) < gpGlobals->time))
+               {
+                  // if close to ladder...
+                  if (distance < 100)
+                  {
+                     // don't avoid walls for a while
+                     pBot->f_dont_avoid_wall_time = gpGlobals->time + 5.0;
+                  }
+
+                  can_pickup = TRUE;
+               }
+            }
+         }
+         else
+         {
+            // trace a line from bot's eyes to func_ entity...
+            UTIL_TraceLine( vecStart, vecEnd, dont_ignore_monsters,
+                            pEdict->v.pContainingEntity, &tr);
+
+            // check if traced all the way up to the entity (didn't hit wall)
+            if (strcmp(item_name, STRING(tr.pHit->v.classname)) == 0)
+            {
+               // find distance to item for later use...
+               float distance = (vecEnd - vecStart).Length( );
+
+               // check if entity is wall mounted health charger...
+               if (strcmp("func_healthcharger", item_name) == 0)
+               {
+                  // check if the bot can use this item and
+                  // check if the recharger is ready to use (has power left)...
+                  if ((pEdict->v.health < 100) && (pent->v.frame == 0))
+                  {
+                     // check if flag not set...
+                     if (!pBot->b_use_health_station)
+                     {
+                        // check if close enough and facing it directly...
+                        if ((distance < PLAYER_SEARCH_RADIUS) &&
+                            (angle_to_entity <= 10))
+                        {
+                           pBot->b_use_health_station = TRUE;
+                           pBot->f_use_health_time = gpGlobals->time;
+                        }
+
+                        // if close to health station...
+                        if (distance < 100)
+                        {
+                           // don't avoid walls for a while
+                           pBot->f_dont_avoid_wall_time = gpGlobals->time + 5.0;
+                        }
+
+                        can_pickup = TRUE;
+                     }
+                  }
+                  else
+                  {
+                     // don't need or can't use this item...
+                     pBot->b_use_health_station = FALSE;
+                  }
+               }
+
+               // check if entity is wall mounted HEV charger...
+               else if (strcmp("func_recharge", item_name) == 0)
+               {
+                  // check if the bot can use this item and
+                  // check if the recharger is ready to use (has power left)...
+                  if ((pEdict->v.armorvalue < VALVE_MAX_NORMAL_BATTERY) &&
+                      (pent->v.frame == 0))
+                  {
+                     // check if flag not set and facing it...
+                     if (!pBot->b_use_HEV_station)
+                     {
+                        // check if close enough and facing it directly...
+                        if ((distance < PLAYER_SEARCH_RADIUS) &&
+                            (angle_to_entity <= 10))
+                        {
+                           pBot->b_use_HEV_station = TRUE;
+                           pBot->f_use_HEV_time = gpGlobals->time;
+                        }
+
+                        // if close to HEV recharger...
+                        if (distance < 100)
+                        {
+                           // don't avoid walls for a while
+                           pBot->f_dont_avoid_wall_time = gpGlobals->time + 5.0;
+                        }
+
+                        can_pickup = TRUE;
+                     }
+                  }
+                  else
+                  {
+                     // don't need or can't use this item...
+                     pBot->b_use_HEV_station = FALSE;
+                  }
+               }
+
+               // check if entity is a button...
+               else if (strcmp("func_button", item_name) == 0)
+               {
+                  // use the button about 100% of the time, if haven't
+                  // used a button in at least 5 seconds...
+                  if ((RANDOM_LONG(1, 100) <= 100) &&
+                      ((pBot->f_use_button_time + 5) < gpGlobals->time))
+                  {
+                     // check if flag not set and facing it...
+                     if (!pBot->b_use_button)
+                     {
+                        // check if close enough and facing it directly...
+                        if ((distance < PLAYER_SEARCH_RADIUS) &&
+                            (angle_to_entity <= 10))
+                        {
+                           pBot->b_use_button = TRUE;
+                           pBot->b_lift_moving = FALSE;
+                           pBot->f_use_button_time = gpGlobals->time;
+                        }
+
+                        // if close to button...
+                        if (distance < 100)
+                        {
+                           // don't avoid walls for a while
+                           pBot->f_dont_avoid_wall_time = gpGlobals->time + 5.0;
+                        }
+
+                        can_pickup = TRUE;
+                     }
+                  }
+                  else
+                  {
+                     // don't need or can't use this item...
+                     pBot->b_use_button = FALSE;
+                  }
+               }
+            }
+         }
+      }
+      else  // everything else...
+      {
+         entity_origin = pent->v.origin;
+
+         vecStart = pEdict->v.origin + pEdict->v.view_ofs;
+         vecEnd = entity_origin;
+
+         // find angles from bot origin to entity...
+         angle_to_entity = BotInFieldOfView( pBot, vecEnd - vecStart );
+
+         // check if entity is outside field of view (+/- 45 degrees)
+         if (angle_to_entity > 45)
+            continue;  // skip this item if bot can't "see" it
+
+         // check if line of sight to object is not blocked (i.e. visible)
+         if (BotEntityIsVisible( pBot, vecEnd ))
+         {
+            // check if entity is a weapon...
+            if (strncmp("weapon_", item_name, 7) == 0)
+            {
+               if (pent->v.effects & EF_NODRAW)
+               {
+                  // someone owns this weapon or it hasn't respawned yet
+                  continue;
+               }
+
+               can_pickup = TRUE;
+            }
+
+            // check if entity is ammo...
+            else if (strncmp("ammo_", item_name, 5) == 0)
+            {
+               // check if the item is not visible (i.e. has not respawned)
+               if (pent->v.effects & EF_NODRAW)
+                  continue;
+
+               can_pickup = TRUE;
+            }
+
+            // check if entity is a battery...
+            else if (strcmp("item_battery", item_name) == 0)
+            {
+               // check if the item is not visible (i.e. has not respawned)
+               if (pent->v.effects & EF_NODRAW)
+                  continue;
+
+               // check if the bot can use this item...
+               if (pEdict->v.armorvalue < VALVE_MAX_NORMAL_BATTERY)
+               {
+                  can_pickup = TRUE;
+               }
+            }
+
+            // check if entity is a healthkit...
+            else if (strcmp("item_healthkit", item_name) == 0)
+            {
+               // check if the item is not visible (i.e. has not respawned)
+               if (pent->v.effects & EF_NODRAW)
+                  continue;
+
+               // check if the bot can use this item...
+               if (pEdict->v.health < 100)
+               {
+                  can_pickup = TRUE;
+               }
+            }
+
+            // check if entity is a packed up weapons box...
+            else if (strcmp("weaponbox", item_name) == 0)
+            {
+               can_pickup = TRUE;
+            }
+
+            // check if entity is the spot from RPG laser
+            else if (strcmp("laser_spot", item_name) == 0)
+            {
+            }
+
+            // check if entity is an armed tripmine
+            //else if (strcmp("monster_tripmine", item_name) == 0)
+			else if (strcmp(kwsDeployedMine, item_name) == 0)
+            {
+               float distance = (pent->v.origin - pEdict->v.origin).Length( );
+
+               if (pBot->b_see_tripmine)
+               {
+                  // see if this tripmine is closer to bot...
+                  if (distance < (pBot->v_tripmine - pEdict->v.origin).Length())
+                  {
+                     pBot->v_tripmine = pent->v.origin;
+                     pBot->b_shoot_tripmine = FALSE;
+
+                     // see if bot is far enough to shoot the tripmine...
+                     if (distance >= 375)
+                     {
+                        pBot->b_shoot_tripmine = TRUE;
+                     }
+                  }
+               }
+               else
+               {
+                  pBot->b_see_tripmine = TRUE;
+                  pBot->v_tripmine = pent->v.origin;
+                  pBot->b_shoot_tripmine = FALSE;
+
+                  // see if bot is far enough to shoot the tripmine...
+                  if (distance >= 375)  // 375 is damage radius
+                  {
+                     pBot->b_shoot_tripmine = TRUE;
+                  }
+               }
+            }
+
+            // check if entity is an armed satchel charge
+            else if (strcmp("monster_satchel", item_name) == 0)
+            {
+            }
+
+            // check if entity is a snark (squeak grenade)
+            else if (strcmp("monster_snark", item_name) == 0)
+            {
+            }
+
+            else if ((mod_id == FRONTLINE_DLL) && (!pBot->defender) &&
+                     (strcmp("capture_point", item_name) == 0))
+            {
+               int team = UTIL_GetTeam(pEdict);  // skin and team must match
+
+               if (flf_bug_fix)
+                  team = 1 - team;  // BACKWARDS bug!
+
+               // check if flag not set and point not captured...
+               if ((!pBot->b_use_capture) && (pent->v.skin == team))
+               {
+                  float distance = (pent->v.origin - pEdict->v.origin).Length( );
+
+                  // check if close enough and facing it directly...
+                  if ((distance < FLF_PLAYER_SEARCH_RADIUS) &&
+                      (angle_to_entity <= 20))
+                  {
+                     pBot->b_use_capture = TRUE;
+                     pBot->f_use_capture_time = gpGlobals->time + 8.0;
+                     pBot->pCaptureEdict = pent;
+                  }
+
+                  // if close to capture point...
+                  if (distance < 160)
+                  {
+                     // don't avoid walls for a while
+                     pBot->f_dont_avoid_wall_time = gpGlobals->time + 5.0;
+                  }
+
+                  can_pickup = TRUE;
+               }
+            }
+
+         }  // end if object is visible
+      }  // end else not "func_" entity
+
+      if (can_pickup) // if the bot found something it can pickup...
+      {
+         float distance = (entity_origin - pEdict->v.origin).Length( );
+
+         // see if it's the closest item so far...
+         if (distance < min_distance)
+         {
+            min_distance = distance;        // update the minimum distance
+            pPickupEntity = pent;        // remember this entity
+            pickup_origin = entity_origin;  // remember location of entity
+         }
+      }
+   }  // end while loop
+
+   if (pPickupEntity != NULL)
+   {
+      // let's head off toward that item...
+      Vector v_item = pickup_origin - pEdict->v.origin;
+
+      Vector bot_angles = UTIL_VecToAngles( v_item );
+
+      pEdict->v.ideal_yaw = bot_angles.y;
+
+      BotFixIdealYaw(pEdict);
+
+      pBot->pBotPickupItem = pPickupEntity;  // save the item bot is trying to get
+   }
+}
+
+
+void BotThink( bot_t *pBot )
+{
+   int index = 0;
+   Vector v_diff;             // vector from previous to current location
+   float pitch_degrees;
+   float yaw_degrees;
+   float moved_distance;      // length of v_diff vector (distance bot moved)
+   TraceResult tr;
+   bool found_waypoint;
+   bool is_idle;
+
+   edict_t *pEdict = pBot->pEdict;
+
+
+   pEdict->v.flags |= FL_FAKECLIENT;
+
+   if (pBot->name[0] == 0)  // name filled in yet?
+      strcpy(pBot->name, STRING(pBot->pEdict->v.netname));
+
+
+// TheFatal - START from Advanced Bot Framework (Thanks Rich!)
+
+   // adjust the millisecond delay based on the frame rate interval...
+   if (pBot->msecdel <= gpGlobals->time)
+   {
+      pBot->msecdel = gpGlobals->time + 0.5;
+      if (pBot->msecnum > 0)
+         pBot->msecval = 450.0/pBot->msecnum;
+      pBot->msecnum = 0;
+   }
+   else
+      pBot->msecnum++;
+
+   if (pBot->msecval < 1)    // don't allow msec to be less than 1...
+      pBot->msecval = 1;
+
+   if (pBot->msecval > 100)  // ...or greater than 100
+      pBot->msecval = 100;
+
+// TheFatal - END
+
+
+   pEdict->v.button = 0;
+   pBot->f_move_speed = 0.0;
+
+   if(pBot->mBotPlayMode == PLAYMODE_READYROOM)
+   {
+	   // Look at desired team and head to nearest start entity
+	   AvHClassType theClassType = AVH_CLASS_TYPE_UNDEFINED;
+
+	   FakeClientCommand(pEdict, kcAutoAssign, NULL, NULL);
+
+	   // bot has now joined the game (doesn't need to be started)
+	   pBot->not_started = 0;
+   }
+
+   // if the bot hasn't selected stuff to start the game yet, go do that...
+   if (pBot->not_started)
+   {
+      BotStartGame( pBot );
+
+	  // Do this to test server performance
+	  //return;
+	  
+      g_engfuncs.pfnRunPlayerMove( pEdict, pEdict->v.v_angle, 0.0,
+                                   0, 0, pEdict->v.button, 0, pBot->msecval);
+
+      //return;
+   }
+   
+   if((pBot->mOrderType != ORDERTYPE_UNDEFINED) && (!pBot->mOrderCompleted))
+   {
+	   // Every once in a while mention our order
+	   if(RANDOM_LONG(0, 200) == 0)
+	   {
+		   char theMessage[256];
+		   sprintf(theMessage, "Order type: %d, target type: %d\n", pBot->mOrderType, pBot->mOrderTargetType);
+		   //UTIL_HostSay(pBot->pEdict, 0, theMessage);
+	   }
+   }
+   else
+   {
+	   // Occasionally ask for orders when not doing anything else
+	   if(RANDOM_LONG(0, 1800) == 0)
+	   {
+		   if(pBot->mTimeOfNextOrderRequest == -1)
+		   {
+			   pBot->mTimeOfNextOrderRequest = gpGlobals->time;
+		   }
+	   }
+   }
+
+   if(RANDOM_LONG(0, 1000))
+   {
+	   pBot->mTimeOfNextRandomSaying = gpGlobals->time;
+   }
+
+   // If we're out of ammo, occasionally ask for more
+   // Get current weapon
+   int theWeaponID = pBot->current_weapon.iId;
+   if(theWeaponID > 0)
+   {
+	   if((pBot->current_weapon.iAmmo1 != -1) && (pBot->current_weapon.iClip <= 10))
+	   {
+		   if(RANDOM_LONG(0, 40))
+		   {
+			   if(pBot->mTimeOfNextAmmoRequest == -1)
+			   {
+				   pBot->mTimeOfNextAmmoRequest = gpGlobals->time;
+			   }
+		   }
+	   }
+   }
+   
+
+   if ((pBot->b_bot_say_killed) && (pBot->f_bot_say_killed < gpGlobals->time))
+   {
+      int whine_index = 0;
+      bool used;
+      int i, recent_count;
+      char msg[120];
+
+      pBot->b_bot_say_killed = FALSE;
+            
+      recent_count = 0;
+
+      while (recent_count < 5)
+      {
+         whine_index = RANDOM_LONG(0, whine_count-1);
+
+         used = FALSE;
+
+         for (i=0; i < 5; i++)
+         {
+            if (recent_bot_whine[i] == whine_index)
+               used = TRUE;
+         }
+
+         if (used)
+            recent_count++;
+         else
+            break;
+      }
+
+      for (i=4; i > 0; i--)
+         recent_bot_whine[i] = recent_bot_whine[i-1];
+
+      recent_bot_whine[0] = whine_index;
+
+      if (strstr(bot_whine[whine_index], "%s") != NULL)  // is "%s" in whine text?
+         sprintf(msg, bot_whine[whine_index], STRING(pBot->killer_edict->v.netname));
+      else
+         sprintf(msg, bot_whine[whine_index]);
+
+      UTIL_HostSay(pEdict, 0, msg);
+   }
+
+   // if the bot is dead, randomly press fire to respawn...
+   if ((pEdict->v.health < 1) || (pEdict->v.deadflag != DEAD_NO))
+   {
+      if (pBot->need_to_initialize)
+      {
+         BotSpawnInit(pBot);
+
+         // did another player kill this bot AND bot whine messages loaded AND
+         // has the bot been alive for at least 15 seconds AND
+         if ((pBot->killer_edict != NULL) && (whine_count > 0) &&
+             ((pBot->f_bot_spawn_time + 15.0) <= gpGlobals->time))
+         {
+            if ((RANDOM_LONG(1,100) <= 10))
+            {
+               pBot->b_bot_say_killed = TRUE;
+               pBot->f_bot_say_killed = gpGlobals->time + 10.0 + RANDOM_FLOAT(0.0, 5.0);
+            }
+         }
+
+         pBot->need_to_initialize = FALSE;
+      }
+
+      if (RANDOM_LONG(1, 100) > 50)
+         pEdict->v.button = IN_ATTACK;
+
+      g_engfuncs.pfnRunPlayerMove( pEdict, pEdict->v.v_angle, pBot->f_move_speed,
+                                   0, 0, pEdict->v.button, 0, pBot->msecval);
+
+      return;
+   }
+
+   // set this for the next time the bot dies so it will initialize stuff
+   if (pBot->need_to_initialize == FALSE)
+   {
+      pBot->need_to_initialize = TRUE;
+      pBot->f_bot_spawn_time = gpGlobals->time;
+   }
+
+   is_idle = FALSE;
+
+   if ((mod_id == FRONTLINE_DLL) && (pBot->round_end))
+   {
+      if (pBot->warmup)  // has warmup started (i.e. start of round?)
+      {
+         pBot->round_end = 0;
+
+         BotSpawnInit(pBot);
+      }
+
+      is_idle = TRUE;
+
+      flf_bug_fix = 0;  // BACKWARDS bug off now!
+   }
+
+   if ((mod_id == FRONTLINE_DLL) && (pBot->warmup) && (!pBot->defender))
+   {
+      if (pBot->curr_waypoint_index == -1)
+      {
+         // find the nearest visible waypoint
+         int i = WaypointFindNearest(pEdict, REACHABLE_RANGE, pBot->defender);
+
+         if (i != -1)
+         {
+            Vector v_direction = waypoints[i].origin - pEdict->v.origin;
+
+            Vector bot_angles = UTIL_VecToAngles( v_direction );
+
+            pBot->idle_angle = bot_angles.y;
+         }
+         else
+            pBot->idle_angle = pEdict->v.v_angle.y;
+      }
+
+      is_idle = TRUE;
+   }
+
+   if (pBot->blinded_time > gpGlobals->time)
+   {
+      is_idle = TRUE;  // don't do anything while blinded
+   }
+
+   if(CVAR_GET_FLOAT("freezebots") > 0)
+   {
+        return; // Don't move.  
+   }
+   
+   if (is_idle)
+   {
+      if (pBot->idle_angle_time <= gpGlobals->time)
+      {
+         pBot->idle_angle_time = gpGlobals->time + RANDOM_FLOAT(0.5, 2.0);
+
+         pEdict->v.ideal_yaw = pBot->idle_angle + RANDOM_FLOAT(0.0, 40.0) - 20.0;
+
+         BotFixIdealYaw(pEdict);
+      }
+
+      // turn towards ideal_yaw by yaw_speed degrees (slower than normal)
+      BotChangeYaw( pBot, pEdict->v.yaw_speed / 2 );
+
+      g_engfuncs.pfnRunPlayerMove( pEdict, pEdict->v.v_angle, pBot->f_move_speed,
+                                   0, 0, pEdict->v.button, 0, pBot->msecval);
+
+      return;
+   }
+   else
+   {
+      pBot->idle_angle = pEdict->v.v_angle.y;
+   }
+
+   // check if time to check for player sounds (if don't already have enemy)
+   if ((pBot->f_sound_update_time <= gpGlobals->time) &&
+       (pBot->pBotEnemy == NULL))
+   {
+      int ind;
+      edict_t *pPlayer;
+
+      pBot->f_sound_update_time = gpGlobals->time + 1.0;
+
+      for (ind = 1; ind <= gpGlobals->maxClients; ind++)
+      {
+         pPlayer = INDEXENT(ind);
+
+         // is this player slot is valid and it's not this bot...
+         if ((pPlayer) && (!pPlayer->free) && (pPlayer != pEdict))
+         {
+            // if observer mode enabled, don't listen to this player...
+            if ((b_observer_mode) && !(pPlayer->v.flags & FL_FAKECLIENT))
+               continue;
+
+            if (IsAlive(pPlayer) &&
+                (FBitSet(pPlayer->v.flags, FL_CLIENT) ||
+                 FBitSet(pPlayer->v.flags, FL_FAKECLIENT)))
+            {
+               // check for sounds being made by other players...
+               if (UpdateSounds(pEdict, pPlayer))
+               {
+                  // don't check for sounds for another 30 seconds
+                  pBot->f_sound_update_time = gpGlobals->time + 30.0;
+               }
+            }
+         }
+      }
+   }
+
+   pBot->f_move_speed = pBot->f_max_speed;  // set to max speed
+
+   if (pBot->prev_time <= gpGlobals->time)
+   {
+      // see how far bot has moved since the previous position...
+      v_diff = pBot->v_prev_origin - pEdict->v.origin;
+      moved_distance = v_diff.Length();
+
+      // save current position as previous
+      pBot->v_prev_origin = pEdict->v.origin;
+      pBot->prev_time = gpGlobals->time + 0.2;
+   }
+   else
+   {
+      moved_distance = 2.0;
+   }
+
+   // if the bot is under water, adjust pitch by pitch_speed degrees
+   if ((pEdict->v.waterlevel == 2) ||
+       (pEdict->v.waterlevel == 3))
+   {
+      // turn towards ideal_pitch by pitch_speed degrees
+      pitch_degrees = BotChangePitch( pBot, pEdict->v.pitch_speed );
+   }
+   else
+      pitch_degrees = 0.0;
+
+   // turn towards ideal_yaw by yaw_speed degrees
+   yaw_degrees = BotChangeYaw( pBot, pEdict->v.yaw_speed );
+
+   if ((pitch_degrees >= pEdict->v.pitch_speed) ||
+       (yaw_degrees >= pEdict->v.yaw_speed))
+   {
+      pBot->f_move_speed = 0.0;  // don't move while turning a lot
+   }
+   else if ((pitch_degrees >= 10) || 
+            (yaw_degrees >= 10))  // turning more than 10 degrees?
+   {
+      pBot->f_move_speed = pBot->f_move_speed / 4;  // slow down while turning
+   }
+   else  // else handle movement related actions...
+   {
+      if (b_botdontshoot == 0)
+      {
+         if ((mod_id == TFC_DLL) && (pBot->bot_has_flag == TRUE))
+         {
+            // is it time to check whether bot should look for enemies yet?
+            if (pBot->f_bot_find_enemy_time <= gpGlobals->time)
+            {
+               pBot->f_bot_find_enemy_time = gpGlobals->time + 5.0;
+
+               if (RANDOM_LONG(1, 100) <= 40)
+                  pBot->pBotEnemy = BotFindEnemy( pBot );
+            }
+         }
+         else
+         {
+			 // Now that bots scan every entity in the world, do this less often
+			 if(RANDOM_LONG(1, 100) <= 20)
+			 {
+				 pBot->pBotEnemy = BotFindEnemy( pBot );
+			 }
+         }
+      }
+      else
+         pBot->pBotEnemy = NULL;  // clear enemy pointer (no ememy for you!)
+
+      if (pBot->pBotEnemy != NULL)  // does an enemy exist?
+      {
+         BotShootAtEnemy( pBot );  // shoot at the enemy
+
+         pBot->f_pause_time = 0;  // dont't pause if enemy exists
+      }
+
+      else if (pBot->f_pause_time > gpGlobals->time)  // is bot "paused"?
+      {
+         // you could make the bot look left then right, or look up
+         // and down, to make it appear that the bot is hunting for
+         // something (don't do anything right now)
+      }
+
+      // is bot being "used" and can still follow "user"?
+      else if ((pBot->pBotUser != NULL) && BotFollowUser( pBot ))
+      {
+         // do nothing here!
+         ;
+      }
+
+      else
+      {
+         // no enemy, let's just wander around...
+
+         if ((pEdict->v.waterlevel != 2) &&  // is bot NOT under water?
+             (pEdict->v.waterlevel != 3))
+         {
+            // reset pitch to 0 (level horizontally)
+            pEdict->v.idealpitch = 0;
+            pEdict->v.v_angle.x = 0;
+         }
+
+         pEdict->v.v_angle.z = 0;  // reset roll to 0 (straight up and down)
+
+         pEdict->v.angles.x = 0;
+         pEdict->v.angles.y = pEdict->v.v_angle.y;
+         pEdict->v.angles.z = 0;
+
+         // check if bot should look for items now or not...
+         if (pBot->f_find_item < gpGlobals->time)
+         {
+            BotFindItem( pBot );  // see if there are any visible items
+         }
+
+         // check if bot sees a tripmine...
+         if (pBot->b_see_tripmine)
+         {
+            // check if bot can shoot the tripmine...
+            if ((pBot->b_shoot_tripmine) && BotShootTripmine( pBot ))
+            {
+               // shot at tripmine, may or may not have hit it, clear
+               // flags anyway, next BotFindItem will see it again if
+               // it is still there...
+
+               pBot->b_shoot_tripmine = FALSE;
+               pBot->b_see_tripmine = FALSE;
+
+               // pause for a while to allow tripmine to explode...
+               pBot->f_pause_time = gpGlobals->time + 0.5;
+            }
+            else  // run away!!!
+            {
+               Vector tripmine_angles;
+
+               tripmine_angles = UTIL_VecToAngles( pBot->v_tripmine - pEdict->v.origin );
+
+               // face away from the tripmine
+               pEdict->v.ideal_yaw += 180;  // rotate 180 degrees
+
+               BotFixIdealYaw(pEdict);
+
+               pBot->b_see_tripmine = FALSE;
+
+               pBot->f_move_speed = 0;  // don't run while turning
+            }
+         }
+
+         // check if should use wall mounted health station...
+         else if (pBot->b_use_health_station)
+         {
+            if ((pBot->f_use_health_time + 10.0) > gpGlobals->time)
+            {
+               pBot->f_move_speed = 0;  // don't move while using health station
+
+               pEdict->v.button = IN_USE;
+            }
+            else
+            {
+               // bot is stuck trying to "use" a health station...
+
+               pBot->b_use_health_station = FALSE;
+
+               // don't look for items for a while since the bot
+               // could be stuck trying to get to an item
+               pBot->f_find_item = gpGlobals->time + 0.5;
+            }
+         }
+
+         // check if should use wall mounted HEV station...
+         else if (pBot->b_use_HEV_station)
+         {
+            if ((pBot->f_use_HEV_time + 10.0) > gpGlobals->time)
+            {
+               pBot->f_move_speed = 0;  // don't move while using HEV station
+
+               pEdict->v.button = IN_USE;
+            }
+            else
+            {
+               // bot is stuck trying to "use" a HEV station...
+
+               pBot->b_use_HEV_station = FALSE;
+
+               // don't look for items for a while since the bot
+               // could be stuck trying to get to an item
+               pBot->f_find_item = gpGlobals->time + 0.5;
+            }
+         }
+
+         // check if should capture a point by using it...
+         else if (pBot->b_use_capture)
+         {
+            int team = UTIL_GetTeam(pEdict);  // skin and team must match
+
+            if (flf_bug_fix)
+               team = 1 - team;  // BACKWARDS bug fix!
+
+            // still capturing and hasn't captured yet...
+            if ((pBot->f_use_capture_time > gpGlobals->time) &&
+                (pBot->pCaptureEdict->v.skin == team))
+            {
+               pBot->f_move_speed = 0;  // don't move while capturing
+
+               pEdict->v.button = IN_USE;
+            }
+            else
+            {
+               // bot is stuck trying to "use" a capture point...
+
+               pBot->b_use_capture = FALSE;
+
+               // don't look for items for a while since the bot
+               // could be stuck trying to get to an item
+               pBot->f_find_item = gpGlobals->time + 0.5;
+            }
+         }
+
+         else if (pBot->b_use_button)
+         {
+            pBot->f_move_speed = 0;  // don't move while using elevator
+
+            BotUseLift( pBot, moved_distance );
+         }
+
+         else
+         {
+            if (pEdict->v.waterlevel == 3)  // check if the bot is underwater...
+            {
+               BotUnderWater( pBot );
+            }
+
+            found_waypoint = FALSE;
+
+            // if the bot is not trying to get to something AND
+            // it is time to look for a waypoint AND
+            // there are waypoints in this level...
+
+            if ((pBot->pBotPickupItem == NULL) &&
+                (pBot->f_look_for_waypoint_time <= gpGlobals->time) &&
+                (num_waypoints != 0))
+            {
+               found_waypoint = BotHeadTowardWaypoint(pBot);
+            }
+
+            // check if the bot is on a ladder...
+            if (pEdict->v.movetype == MOVETYPE_FLY)
+            {
+               // check if bot JUST got on the ladder...
+               if ((pBot->f_end_use_ladder_time + 1.0) < gpGlobals->time)
+                  pBot->f_start_use_ladder_time = gpGlobals->time;
+
+               // go handle the ladder movement
+               BotOnLadder( pBot, moved_distance );
+
+               pBot->f_dont_avoid_wall_time = gpGlobals->time + 2.0;
+               pBot->f_end_use_ladder_time = gpGlobals->time;
+            }
+            else
+            {
+               // check if the bot JUST got off the ladder...
+               if ((pBot->f_end_use_ladder_time + 1.0) > gpGlobals->time)
+               {
+                  pBot->ladder_dir = LADDER_UNKNOWN;
+               }
+            }
+
+            // if the bot isn't headed toward a waypoint...
+            if (found_waypoint == FALSE)
+            {
+               TraceResult tr;
+
+               // check if we should be avoiding walls
+               if (pBot->f_dont_avoid_wall_time <= gpGlobals->time)
+               {
+                  // let's just randomly wander around
+                  if (BotStuckInCorner( pBot ))
+                  {
+                     pEdict->v.ideal_yaw += 180;  // turn 180 degrees
+            
+                     BotFixIdealYaw(pEdict);
+            
+                     pBot->f_move_speed = 0;  // don't move while turning
+                     pBot->f_dont_avoid_wall_time = gpGlobals->time + 1.0;
+            
+                     moved_distance = 2.0;  // dont use bot stuck code
+                  }
+                  else
+                  {
+                     // check if there is a wall on the left...
+                     if (!BotCheckWallOnLeft( pBot ))
+                     {
+                        // if there was a wall on the left over 1/2 a second ago then
+                        // 20% of the time randomly turn between 45 and 60 degrees
+            
+                        if ((pBot->f_wall_on_left != 0) &&
+                            (pBot->f_wall_on_left <= gpGlobals->time - 0.5) &&
+                            (RANDOM_LONG(1, 100) <= 20))
+                        {
+                           pEdict->v.ideal_yaw += RANDOM_LONG(45, 60);
+            
+                           BotFixIdealYaw(pEdict);
+            
+                           pBot->f_move_speed = 0;  // don't move while turning
+                           pBot->f_dont_avoid_wall_time = gpGlobals->time + 1.0;
+                        }
+            
+                        pBot->f_wall_on_left = 0;  // reset wall detect time
+                     }
+                     else if (!BotCheckWallOnRight( pBot ))
+                     {
+                        // if there was a wall on the right over 1/2 a second ago then
+                        // 20% of the time randomly turn between 45 and 60 degrees
+            
+                        if ((pBot->f_wall_on_right != 0) &&
+                            (pBot->f_wall_on_right <= gpGlobals->time - 0.5) &&
+                            (RANDOM_LONG(1, 100) <= 20))
+                        {
+                           pEdict->v.ideal_yaw -= RANDOM_LONG(45, 60);
+            
+                           BotFixIdealYaw(pEdict);
+            
+                           pBot->f_move_speed = 0;  // don't move while turning
+                           pBot->f_dont_avoid_wall_time = gpGlobals->time + 1.0;
+                        }
+            
+                        pBot->f_wall_on_right = 0;  // reset wall detect time
+                     }
+                  }
+               }
+            
+               // check if bot is about to hit a wall.  TraceResult gets returned
+               if ((pBot->f_dont_avoid_wall_time <= gpGlobals->time) &&
+                   BotCantMoveForward( pBot, &tr ))
+               {
+                  // ADD LATER
+                  // need to check if bot can jump up or duck under here...
+                  // ADD LATER
+            
+                  BotTurnAtWall( pBot, &tr );
+               }
+            }
+
+            // check if bot is on a ladder and has been on a ladder for
+            // more than 5 seconds...
+            if ((pEdict->v.movetype == MOVETYPE_FLY) &&
+                (pBot->f_start_use_ladder_time > 0.0) &&
+                ((pBot->f_start_use_ladder_time + 5.0) <= gpGlobals->time))
+            {
+               // bot is stuck on a ladder...
+
+               BotRandomTurn(pBot);
+
+               // don't look for items for 2 seconds
+               pBot->f_find_item = gpGlobals->time + 2.0;
+
+               pBot->f_start_use_ladder_time = 0.0;  // reset start ladder time
+            }
+            
+            // check if the bot hasn't moved much since the last location
+            // (and NOT on a ladder since ladder stuck handled elsewhere)
+            // (don't check for stuck if f_dont_check_stuck in the future)
+            if ((moved_distance <= 1.0) && (pBot->prev_speed >= 1.0) &&
+                (pEdict->v.movetype != MOVETYPE_FLY) &&
+                (pBot->f_dont_check_stuck < gpGlobals->time))
+            {
+               // the bot must be stuck!
+
+               pBot->f_dont_avoid_wall_time = gpGlobals->time + 1.0;
+               pBot->f_look_for_waypoint_time = gpGlobals->time + 1.0;
+            
+               if (BotCanJumpUp( pBot ))  // can the bot jump onto something?
+               {
+                  if ((pBot->f_jump_time + 2.0) <= gpGlobals->time)
+                  {
+                     pBot->f_jump_time = gpGlobals->time;
+                     pEdict->v.button |= IN_JUMP;  // jump up and move forward
+                  }
+                  else
+                  {
+                     // bot already tried jumping less than two seconds ago, just turn
+                     BotRandomTurn(pBot);
+                  }
+               }
+               else if (BotCanDuckUnder( pBot ))  // can the bot duck under something?
+               {
+                  pEdict->v.button |= IN_DUCK;  // duck down and move forward
+               }
+               else
+               {
+                  BotRandomTurn(pBot);
+
+                  // is the bot trying to get to an item?...
+                  if (pBot->pBotPickupItem != NULL)
+                  {
+                     // don't look for items for a while since the bot
+                     // could be stuck trying to get to an item
+                     pBot->f_find_item = gpGlobals->time + 0.5;
+                  }
+               }
+            }
+
+            // should the bot pause for a while here?
+            // (don't pause on ladders or while being "used"...
+            if ((RANDOM_LONG(1, 1000) <= pause_frequency[pBot->bot_skill]) &&
+                (pEdict->v.movetype != MOVETYPE_FLY) &&
+                (pBot->pBotUser == NULL))
+            {
+               // set the time that the bot will stop "pausing"
+               pBot->f_pause_time = gpGlobals->time +
+                  RANDOM_FLOAT(pause_time[pBot->bot_skill][0],
+                               pause_time[pBot->bot_skill][1]);
+            }
+         }
+      }
+	}
+
+   // Potentially morph up if we're an alien
+   AvHUser3 theUser3 = (AvHUser3)(pBot->pEdict->v.iuser3);
+   if((pBot->pBotEnemy == NULL) && (theUser3 >= AVH_USER3_ALIEN_PLAYER1) && (theUser3 <= AVH_USER3_ALIEN_PLAYER4))
+   {
+	   int theMaxUpgrade = (int)(AVH_USER3_ALIEN_PLAYER5 - theUser3);
+	   //const UpgradeCostListType& theUpgradeCosts = GetGameRules()->GetUpgradeCosts();
+
+	   if(RANDOM_LONG(0, 400) == 0)
+	   {
+		   // Pick a random upgrade
+		   AvHUser3 theMinUpgrade = (AvHUser3)(theUser3 + 1);
+		   int theMaxUpgrade = AVH_USER3_ALIEN_PLAYER5;
+		   AvHUser3 theUpgradeUser3 = (AvHUser3)(RANDOM_LONG((int)theMinUpgrade, (int)theMaxUpgrade));
+		   int thePointCost = 0;
+		   AvHMessageID theMessage = MESSAGE_NULL;
+		   switch(theUpgradeUser3)
+		   {
+		   case AVH_USER3_ALIEN_PLAYER2:
+			   thePointCost = 15;
+			   theMessage = ALIEN_LIFEFORM_TWO;
+			   break;
+		   case AVH_USER3_ALIEN_PLAYER3:
+			   thePointCost = 30;
+			   theMessage = ALIEN_LIFEFORM_THREE;
+			   break;
+		   case AVH_USER3_ALIEN_PLAYER4:
+			   thePointCost = 50;
+			   theMessage = ALIEN_LIFEFORM_FOUR;
+			   break;
+		   case AVH_USER3_ALIEN_PLAYER5:
+			   thePointCost = 75;
+			   theMessage = ALIEN_LIFEFORM_FIVE;
+			   break;
+		   }
+
+		   //thePointCost = GetGameRules()->GetPointCostForMessageID(theMessage);
+
+		   //if(pBot->mResources >= thePointCost) 
+		   //{
+			   pBot->pEdict->v.impulse = theMessage;
+		   //}
+	   }
+
+	   if(RANDOM_LONG(0, 75) == 0)
+	   {
+		   // Pick a random upgrade to try to "buy"
+		   AvHMessageID theUpgrade = (AvHMessageID)(ALIEN_EVOLUTION_ONE + RANDOM_LONG(0, kNumAlienUpgrades-1));
+		   pBot->pEdict->v.impulse = theUpgrade;
+	   }
+   }
+
+	// TODO: Help build a nearby team structure
+	if(pBot->pBotEnemy == NULL && (theUser3 == AVH_USER3_MARINE_PLAYER))
+	{
+	}
+
+   if (pBot->curr_waypoint_index != -1)  // does the bot have a waypoint?
+   {
+      // check if the next waypoint is a door waypoint...
+      if (waypoints[pBot->curr_waypoint_index].flags & W_FL_DOOR)
+      {
+         pBot->f_move_speed = pBot->f_max_speed / 3;  // slow down for doors
+      }
+
+      // check if the next waypoint is a ladder waypoint...
+      if (waypoints[pBot->curr_waypoint_index].flags & W_FL_LADDER)
+      {
+         // check if the waypoint is at the top of a ladder AND
+         // the bot isn't currenly on a ladder...
+         if ((pBot->waypoint_top_of_ladder) &&
+             (pEdict->v.movetype != MOVETYPE_FLY))
+         {
+            // is the bot on "ground" above the ladder?
+            if (pEdict->v.flags & FL_ONGROUND)
+            {
+               float waypoint_distance = (pEdict->v.origin - pBot->waypoint_origin).Length();
+
+               if (waypoint_distance <= 20.0)  // if VERY close...
+                  pBot->f_move_speed = 20.0;  // go VERY slow
+               else if (waypoint_distance <= 100.0)  // if fairly close...
+                  pBot->f_move_speed = 50.0;  // go fairly slow
+
+               pBot->ladder_dir = LADDER_DOWN;
+               pBot->f_dont_check_stuck = gpGlobals->time + 1.0;
+            }
+            else  // bot must be in mid-air, go BACKWARDS to touch ladder...
+            {
+               pBot->f_move_speed = -pBot->f_max_speed;
+            }
+         }
+         else
+         {
+            // don't avoid walls for a while
+            pBot->f_dont_avoid_wall_time = gpGlobals->time + 5.0;
+
+            pBot->waypoint_top_of_ladder = FALSE;
+         }
+      }
+
+      // check if the next waypoint is a crouch waypoint...
+      if (waypoints[pBot->curr_waypoint_index].flags & W_FL_CROUCH)
+         pEdict->v.button |= IN_DUCK;  // duck down while moving forward
+
+      // check if the waypoint is a sniper waypoint AND
+      // bot isn't currently aiming at an ememy...
+      if ((waypoints[pBot->curr_waypoint_index].flags & W_FL_SNIPER) &&
+          (pBot->pBotEnemy == NULL))
+      {
+         if ((mod_id != TFC_DLL) ||
+             ((mod_id == TFC_DLL) && (pEdict->v.playerclass == TFC_CLASS_SNIPER)))
+         {
+            // check if it's time to adjust aim yet...
+            if (pBot->f_sniper_aim_time <= gpGlobals->time)
+            {
+               int aim_index;
+
+               aim_index = WaypointFindNearestAiming(waypoints[pBot->curr_waypoint_index].origin);
+
+               if (aim_index != -1)
+               {
+                  Vector v_aim = waypoints[aim_index].origin - waypoints[pBot->curr_waypoint_index].origin;
+
+                  Vector aim_angles = UTIL_VecToAngles( v_aim );
+
+                  aim_angles.y += RANDOM_LONG(0, 30) - 15;
+
+                  pEdict->v.ideal_yaw = aim_angles.y;
+
+                  BotFixIdealYaw(pEdict);
+               }
+
+               // don't adjust aim again until after a few seconds...
+               pBot->f_sniper_aim_time = gpGlobals->time + RANDOM_FLOAT(3.0, 5.0);
+            }
+         }
+      }
+   }
+
+   // Process voice commands
+   BotProcessVoiceCommands(pBot);
+   
+   if (pBot->f_pause_time > gpGlobals->time)  // is the bot "paused"?
+      pBot->f_move_speed = 0;  // don't move while pausing
+
+   // make the body face the same way the bot is looking
+   pEdict->v.angles.y = pEdict->v.v_angle.y;
+
+   // save the previous speed (for checking if stuck)
+   pBot->prev_speed = pBot->f_move_speed;
+
+   //CBaseEntity* theEntity = CBaseEntity::Instance(pEdict);
+   //CBasePlayer* thePlayer = (CBasePlayer*)(theEntity);
+   //thePlayer->PreThink();
+   
+   g_engfuncs.pfnRunPlayerMove( pEdict, pEdict->v.v_angle, pBot->f_move_speed,
+                                0, 0, pEdict->v.button, 0, pBot->msecval);
+
+   //thePlayer->PostThink();
+   
+   return;
+}
+
diff --git a/main/source/HPB_bot/dlls/bot.h b/main/source/HPB_bot/dlls/bot.h
new file mode 100644
index 00000000..8687d3ab
--- /dev/null
+++ b/main/source/HPB_bot/dlls/bot.h
@@ -0,0 +1,309 @@
+//
+// HPB_bot - botman's High Ping Bastard bot
+//
+// (http://planethalflife.com/botman/)
+//
+// bot.h
+//
+
+#ifndef BOT_H
+#define BOT_H
+
+// stuff for Win32 vs. Linux builds
+
+#ifndef __linux__
+
+typedef int (FAR *GETENTITYAPI)(DLL_FUNCTIONS *, int);
+typedef int (FAR *GETNEWDLLFUNCTIONS)(NEW_DLL_FUNCTIONS *, int *);
+typedef void (DLLEXPORT *GIVEFNPTRSTODLL)(enginefuncs_t *, globalvars_t *);
+typedef void (FAR *LINK_ENTITY_FUNC)(entvars_t *);
+
+#else
+
+#include <dlfcn.h>
+#define GetProcAddress dlsym
+
+typedef int BOOL;
+
+typedef int (*GETENTITYAPI)(DLL_FUNCTIONS *, int);
+typedef int (*GETNEWDLLFUNCTIONS)(NEW_DLL_FUNCTIONS *, int *);
+typedef void (*GIVEFNPTRSTODLL)(enginefuncs_t *, globalvars_t *);
+typedef void (*LINK_ENTITY_FUNC)(entvars_t *);
+
+#endif
+
+
+
+// define constants used to identify the MOD we are playing...
+
+#define VALVE_DLL      1
+#define TFC_DLL        2
+#define CSTRIKE_DLL    3
+#define GEARBOX_DLL    4
+#define FRONTLINE_DLL  5
+#define AVH_DLL		   6
+
+
+// define some function prototypes...
+BOOL ClientConnect( edict_t *pEntity, const char *pszName,
+                    const char *pszAddress, char szRejectReason[ 128 ] );
+void ClientPutInServer( edict_t *pEntity );
+void ClientCommand( edict_t *pEntity );
+
+void FakeClientCommand(edict_t *pBot, char *arg1, char *arg2, char *arg3);
+
+
+const char *Cmd_Args( void );
+const char *Cmd_Argv( int argc );
+int Cmd_Argc( void );
+
+
+#define LADDER_UNKNOWN  0
+#define LADDER_UP       1
+#define LADDER_DOWN     2
+
+#define WANDER_LEFT  1
+#define WANDER_RIGHT 2
+
+#define BOT_PITCH_SPEED 20
+#define BOT_YAW_SPEED 20
+
+#define RESPAWN_IDLE             1
+#define RESPAWN_NEED_TO_RESPAWN  2
+#define RESPAWN_IS_RESPAWNING    3
+
+// game start messages for TFC...
+#define MSG_TFC_IDLE          1
+#define MSG_TFC_TEAM_SELECT   2
+#define MSG_TFC_CLASS_SELECT  3
+
+// game start messages for CS...
+#define MSG_CS_IDLE         1
+#define MSG_CS_TEAM_SELECT  2
+#define MSG_CS_CT_SELECT    3
+#define MSG_CS_T_SELECT     4
+
+// game start messages for OpFor...
+#define MSG_OPFOR_IDLE          1
+#define MSG_OPFOR_TEAM_SELECT   2
+#define MSG_OPFOR_CLASS_SELECT  3
+
+// game start messages for FrontLineForce...
+#define MSG_FLF_IDLE            1
+#define MSG_FLF_TEAM_SELECT     2
+#define MSG_FLF_CLASS_SELECT    3
+#define MSG_FLF_PISTOL_SELECT   4
+#define MSG_FLF_WEAPON_SELECT   5
+#define MSG_FLF_RIFLE_SELECT    6
+#define MSG_FLF_SHOTGUN_SELECT  7
+#define MSG_FLF_SUBMACHINE_SELECT   8
+#define MSG_FLF_HEAVYWEAPONS_SELECT 9
+
+// game start messages for Aliens vs. Humans...
+#define MSG_AVH_IDLE            1
+
+#define TFC_CLASS_CIVILIAN  0
+#define TFC_CLASS_SCOUT     1
+#define TFC_CLASS_SNIPER    2
+#define TFC_CLASS_SOLDIER   3
+#define TFC_CLASS_DEMOMAN   4
+#define TFC_CLASS_MEDIC     5
+#define TFC_CLASS_HWGUY     6
+#define TFC_CLASS_PYRO      7
+#define TFC_CLASS_SPY       8
+#define TFC_CLASS_ENGINEER  9
+
+
+#define BOT_SKIN_LEN 32
+#define BOT_NAME_LEN 32
+
+#define MAX_BOT_WHINE 100
+
+#include "mod/AvHConstants.h"
+#include "mod/AvHSpecials.h"
+
+typedef struct
+{
+   int  iId;     // weapon ID
+   int  iClip;   // amount of ammo in the clip
+   int  iAmmo1;  // amount of ammo in primary reserve
+   int  iAmmo2;  // amount of ammo in secondary reserve
+} bot_current_weapon_t;
+
+
+typedef struct
+{
+   bool is_used;
+   int respawn_state;
+   edict_t *pEdict;
+   bool need_to_initialize;
+   char name[BOT_NAME_LEN+1];
+   char skin[BOT_SKIN_LEN+1];
+   int bot_skill;
+   int not_started;
+   int start_action;
+   float kick_time;
+   float create_time;
+
+// TheFatal - START
+   int msecnum;
+   float msecdel;
+   float msecval;
+// TheFatal - END
+
+   // things from pev in CBasePlayer...
+   int bot_team;
+   int bot_class;
+   int bot_health;
+   int bot_armor;
+   int bot_weapons;      // bit map of weapons the bot is carrying
+   int bot_money;        // for Counter-Strike
+   int primary_weapon;   // for Front Line Force
+   int secondary_weapon; // for Front Line Force
+   int defender;         // for Front Line Force
+   int warmup;           // for Front Line Force
+   float idle_angle;
+   float idle_angle_time;  // for Front Line Force
+   int round_end;        // round has ended (in round based games)
+   float blinded_time;
+
+   // For AvH
+   AvHPlayMode mBotPlayMode;
+
+   int mOrderState;
+   int mOrderNumPlayers;
+   AvHOrderType	mOrderType;
+   AvHOrderTargetType mOrderTargetType;
+   float mOrderLocation[3];
+   int mOrderTargetIndex;
+   bool mOrderCompleted;
+
+   float mTimeOfNextTaunt;
+   float mTimeOfNextAmmoRequest;
+   float mTimeOfNextOrderRequest;
+   float mTimeOfNextAcknowledge;
+   float mTimeOfNextRandomSaying;
+
+   AvHUser3 mGestateUser3;
+   int mResources;
+   // end for AvH
+   
+   float f_max_speed;
+   float prev_speed;
+   float prev_time;
+   Vector v_prev_origin;
+
+   float f_find_item;
+   edict_t *pBotPickupItem;
+
+   int ladder_dir;
+   float f_start_use_ladder_time;
+   float f_end_use_ladder_time;
+   bool  waypoint_top_of_ladder;
+
+   float f_wall_check_time;
+   float f_wall_on_right;
+   float f_wall_on_left;
+   float f_dont_avoid_wall_time;
+   float f_look_for_waypoint_time;
+   float f_jump_time;
+   float f_dont_check_stuck;
+
+   int wander_dir;
+   float f_exit_water_time;
+
+   Vector waypoint_origin;
+   float f_waypoint_time;
+   int curr_waypoint_index;
+   int prev_waypoint_index[5];
+   float f_random_waypoint_time;
+   int waypoint_goal;
+   float f_waypoint_goal_time;
+   bool waypoint_near_flag;
+   Vector waypoint_flag_origin;
+   float prev_waypoint_distance;
+
+   edict_t *pBotEnemy;
+   float f_bot_see_enemy_time;
+   float f_bot_find_enemy_time;
+   edict_t *pBotUser;
+   float f_bot_use_time;
+   float f_bot_spawn_time;
+   edict_t *killer_edict;
+   bool  b_bot_say_killed;
+   float f_bot_say_killed;
+   float f_sniper_aim_time;
+   
+
+   float f_shoot_time;
+   float f_primary_charging;
+   float f_secondary_charging;
+   int   charging_weapon_id;
+   float f_move_speed;
+   float f_pause_time;
+   float f_sound_update_time;
+   bool  bot_has_flag;
+
+   bool  b_see_tripmine;
+   bool  b_shoot_tripmine;
+   Vector v_tripmine;
+
+   bool  b_use_health_station;
+   float f_use_health_time;
+   bool  b_use_HEV_station;
+   float f_use_HEV_time;
+
+   bool  b_use_button;
+   float f_use_button_time;
+   bool  b_lift_moving;
+
+   bool  b_use_capture;
+   float f_use_capture_time;
+   edict_t *pCaptureEdict;
+
+   bot_current_weapon_t current_weapon;  // one current weapon for each bot
+   int m_rgAmmo[MAX_AMMO_SLOTS];  // total ammo amounts (1 array for each bot)
+
+} bot_t;
+
+
+//#define MAX_TEAMS 32
+//#define MAX_TEAMNAME_LENGTH 16
+#include "game_shared/teamconst.h"
+
+
+#define MAX_FLAGS  5
+
+typedef struct {
+   bool mdl_match;
+   int  team_no;
+   edict_t *edict;
+} FLAG_S;
+
+
+// new UTIL.CPP functions...
+edict_t *UTIL_FindEntityInSphere( edict_t *pentStart, const Vector &vecCenter, float flRadius );
+edict_t *UTIL_FindEntityByString( edict_t *pentStart, const char *szKeyword, const char *szValue );
+edict_t *UTIL_FindEntityByClassname( edict_t *pentStart, const char *szName );
+edict_t *UTIL_FindEntityByTargetname( edict_t *pentStart, const char *szName );
+void ClientPrint( edict_t *pEdict, int msg_dest, const char *msg_name);
+void UTIL_SayText( const char *pText, edict_t *pEdict );
+void UTIL_HostSay( edict_t *pEntity, int teamonly, char *message );
+int UTIL_GetTeam(edict_t *pEntity);
+int UTIL_GetClass(edict_t *pEntity);
+int UTIL_GetBotIndex(edict_t *pEdict);
+bot_t *UTIL_GetBotPointer(edict_t *pEdict);
+bool IsAlive(edict_t *pEdict);
+bool FInViewCone(Vector *pOrigin, edict_t *pEdict);
+bool FVisible( const Vector &vecOrigin, edict_t *pEdict );
+Vector Center(edict_t *pEdict);
+Vector GetGunPosition(edict_t *pEdict);
+void UTIL_SelectItem(edict_t *pEdict, char *item_name);
+Vector VecBModelOrigin(edict_t *pEdict);
+bool UpdateSounds(edict_t *pEdict, edict_t *pPlayer);
+void UTIL_ShowMenu( edict_t *pEdict, int slots, int displaytime, bool needmore, char *pText );
+void UTIL_BuildFileName(char *filename, char *arg1, char *arg2);
+
+
+#endif // BOT_H
+
diff --git a/main/source/HPB_bot/dlls/bot_client.cpp b/main/source/HPB_bot/dlls/bot_client.cpp
new file mode 100644
index 00000000..d51b1e92
--- /dev/null
+++ b/main/source/HPB_bot/dlls/bot_client.cpp
@@ -0,0 +1,960 @@
+//
+// HPB bot - botman's High Ping Bastard bot
+//
+// (http://planethalflife.com/botman/)
+//
+// bot_client.cpp
+//
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+
+#include "bot.h"
+#include "bot_func.h"
+#include "bot_client.h"
+#include "bot_weapons.h"
+
+// types of damage to ignore...
+#define IGNORE_DAMAGE (DMG_CRUSH | DMG_FREEZE | DMG_FALL | DMG_SHOCK | \
+                       DMG_DROWN | DMG_NERVEGAS | DMG_RADIATION | \
+                       DMG_DROWNRECOVER | DMG_ACID | DMG_SLOWBURN | \
+                       DMG_SLOWFREEZE | 0xFF000000)
+
+extern int mod_id;
+extern bot_t bots[32];
+
+bot_weapon_t weapon_defs[MAX_WEAPONS]; // array of weapon definitions
+
+
+// This message is sent when the TFC VGUI menu is displayed.
+void BotClient_TFC_VGUI(void *p, int bot_index)
+{
+   if ((*(int *)p) == 2)  // is it a team select menu?
+
+      bots[bot_index].start_action = MSG_TFC_TEAM_SELECT;
+
+   else if ((*(int *)p) == 3)  // is is a class selection menu?
+
+      bots[bot_index].start_action = MSG_TFC_CLASS_SELECT;
+}
+
+
+// This message is sent when the Counter-Strike VGUI menu is displayed.
+void BotClient_CS_VGUI(void *p, int bot_index)
+{
+   if ((*(int *)p) == 2)  // is it a team select menu?
+
+      bots[bot_index].start_action = MSG_CS_TEAM_SELECT;
+
+   else if ((*(int *)p) == 26)  // is is a terrorist model select menu?
+
+      bots[bot_index].start_action = MSG_CS_T_SELECT;
+
+   else if ((*(int *)p) == 27)  // is is a counter-terrorist model select menu?
+
+      bots[bot_index].start_action = MSG_CS_CT_SELECT;
+}
+
+
+// This message is sent when a menu is being displayed in Counter-Strike.
+void BotClient_CS_ShowMenu(void *p, int bot_index)
+{
+   static int state = 0;   // current state machine state
+
+   if (state < 3)
+   {
+      state++;  // ignore first 3 fields of message
+      return;
+   }
+
+   if (strcmp((char *)p, "#Team_Select") == 0)  // team select menu?
+   {
+      bots[bot_index].start_action = MSG_CS_TEAM_SELECT;
+   }
+   else if (strcmp((char *)p, "#Terrorist_Select") == 0)  // T model select?
+   {
+      bots[bot_index].start_action = MSG_CS_T_SELECT;
+   }
+   else if (strcmp((char *)p, "#CT_Select") == 0)  // CT model select menu?
+   {
+      bots[bot_index].start_action = MSG_CS_CT_SELECT;
+   }
+
+   state = 0;  // reset state machine
+}
+
+
+// This message is sent when the TFC VGUI menu is displayed.
+void BotClient_Gearbox_VGUI(void *p, int bot_index)
+{
+   if ((*(int *)p) == 2)  // is it a team select menu?
+
+      bots[bot_index].start_action = MSG_OPFOR_TEAM_SELECT;
+
+   else if ((*(int *)p) == 3)  // is is a class selection menu?
+
+      bots[bot_index].start_action = MSG_OPFOR_CLASS_SELECT;
+}
+
+
+// This message is sent when the FrontLineForce VGUI menu is displayed.
+void BotClient_FLF_VGUI(void *p, int bot_index)
+{
+   if ((*(int *)p) == 2)  // is it a team select menu?
+      bots[bot_index].start_action = MSG_FLF_TEAM_SELECT;
+   else if ((*(int *)p) == 3)  // is it a class selection menu?
+      bots[bot_index].start_action = MSG_FLF_CLASS_SELECT;
+   else if ((*(int *)p) == 70)  // is it a weapon selection menu?
+      bots[bot_index].start_action = MSG_FLF_WEAPON_SELECT;
+   else if ((*(int *)p) == 72)  // is it a submachine gun selection menu?
+      bots[bot_index].start_action = MSG_FLF_SUBMACHINE_SELECT;
+   else if ((*(int *)p) == 73)  // is it a shotgun selection menu?
+      bots[bot_index].start_action = MSG_FLF_SHOTGUN_SELECT;
+   else if ((*(int *)p) == 75)  // is it a rifle selection menu?
+      bots[bot_index].start_action = MSG_FLF_RIFLE_SELECT;
+   else if ((*(int *)p) == 76)  // is it a pistol selection menu?
+      bots[bot_index].start_action = MSG_FLF_PISTOL_SELECT;
+   else if ((*(int *)p) == 78)  // is it a heavyweapons selection menu?
+      bots[bot_index].start_action = MSG_FLF_HEAVYWEAPONS_SELECT;
+}
+
+
+// This message is sent when a client joins the game.  All of the weapons
+// are sent with the weapon ID and information about what ammo is used.
+void BotClient_Valve_WeaponList(void *p, int bot_index)
+{
+   static int state = 0;   // current state machine state
+   static bot_weapon_t bot_weapon;
+
+   if (state == 0)
+   {
+      state++;
+      strcpy(bot_weapon.szClassname, (char *)p);
+   }
+   else if (state == 1)
+   {
+      state++;
+      bot_weapon.iAmmo1 = *(int *)p;  // ammo index 1
+   }
+   else if (state == 2)
+   {
+      state++;
+      bot_weapon.iAmmo1Max = *(int *)p;  // max ammo1
+   }
+   else if (state == 3)
+   {
+      state++;
+      bot_weapon.iAmmo2 = *(int *)p;  // ammo index 2
+   }
+   else if (state == 4)
+   {
+      state++;
+      bot_weapon.iAmmo2Max = *(int *)p;  // max ammo2
+   }
+   else if (state == 5)
+   {
+      state++;
+      bot_weapon.iSlot = *(int *)p;  // slot for this weapon
+   }
+   else if (state == 6)
+   {
+      state++;
+      bot_weapon.iPosition = *(int *)p;  // position in slot
+   }
+   else if (state == 7)
+   {
+      state++;
+      bot_weapon.iId = *(int *)p;  // weapon ID
+   }
+   else if (state == 8)
+   {
+      state = 0;
+
+      bot_weapon.iFlags = *(int *)p;  // flags for weapon (WTF???)
+
+      // store away this weapon with it's ammo information...
+      weapon_defs[bot_weapon.iId] = bot_weapon;
+   }
+}
+
+void BotClient_TFC_WeaponList(void *p, int bot_index)
+{
+   // this is just like the Valve Weapon List message
+   BotClient_Valve_WeaponList(p, bot_index);
+}
+
+void BotClient_CS_WeaponList(void *p, int bot_index)
+{
+   // this is just like the Valve Weapon List message
+   BotClient_Valve_WeaponList(p, bot_index);
+}
+
+void BotClient_Gearbox_WeaponList(void *p, int bot_index)
+{
+   // this is just like the Valve Weapon List message
+   BotClient_Valve_WeaponList(p, bot_index);
+}
+
+void BotClient_FLF_WeaponList(void *p, int bot_index)
+{
+   // this is just like the Valve Weapon List message
+   BotClient_Valve_WeaponList(p, bot_index);
+}
+
+
+// This message is sent when a weapon is selected (either by the bot chosing
+// a weapon or by the server auto assigning the bot a weapon).
+void BotClient_Valve_CurrentWeapon(void *p, int bot_index)
+{
+   static int state = 0;   // current state machine state
+   static int iState;
+   static int iId;
+   static int iClip;
+
+   if (state == 0)
+   {
+      state++;
+      iState = *(int *)p;  // state of the current weapon
+   }
+   else if (state == 1)
+   {
+      state++;
+      iId = *(int *)p;  // weapon ID of current weapon
+   }
+   else if (state == 2)
+   {
+      state = 0;
+
+      iClip = *(int *)p;  // ammo currently in the clip for this weapon
+
+      if (iId <= 31)
+      {
+         bots[bot_index].bot_weapons |= (1<<iId);  // set this weapon bit
+
+         if (iState == 1)
+         {
+            bots[bot_index].current_weapon.iId = iId;
+            bots[bot_index].current_weapon.iClip = iClip;
+
+            // update the ammo counts for this weapon...
+            bots[bot_index].current_weapon.iAmmo1 =
+               bots[bot_index].m_rgAmmo[weapon_defs[iId].iAmmo1];
+            bots[bot_index].current_weapon.iAmmo2 =
+               bots[bot_index].m_rgAmmo[weapon_defs[iId].iAmmo2];
+         }
+      }
+   }
+}
+
+void BotClient_TFC_CurrentWeapon(void *p, int bot_index)
+{
+   // this is just like the Valve Current Weapon message
+   BotClient_Valve_CurrentWeapon(p, bot_index);
+}
+
+void BotClient_CS_CurrentWeapon(void *p, int bot_index)
+{
+   // this is just like the Valve Current Weapon message
+   BotClient_Valve_CurrentWeapon(p, bot_index);
+}
+
+void BotClient_Gearbox_CurrentWeapon(void *p, int bot_index)
+{
+   // this is just like the Valve Current Weapon message
+   BotClient_Valve_CurrentWeapon(p, bot_index);
+}
+
+void BotClient_FLF_CurrentWeapon(void *p, int bot_index)
+{
+   // this is just like the Valve Current Weapon message
+   BotClient_Valve_CurrentWeapon(p, bot_index);
+}
+
+
+// This message is sent whenever ammo ammounts are adjusted (up or down).
+void BotClient_Valve_AmmoX(void *p, int bot_index)
+{
+   static int state = 0;   // current state machine state
+   static int index;
+   static int ammount;
+   int ammo_index;
+
+   if (state == 0)
+   {
+      state++;
+      index = *(int *)p;  // ammo index (for type of ammo)
+   }
+   else if (state == 1)
+   {
+      state = 0;
+
+      ammount = *(int *)p;  // the ammount of ammo currently available
+
+      bots[bot_index].m_rgAmmo[index] = ammount;  // store it away
+
+      ammo_index = bots[bot_index].current_weapon.iId;
+
+      // update the ammo counts for this weapon...
+      bots[bot_index].current_weapon.iAmmo1 =
+         bots[bot_index].m_rgAmmo[weapon_defs[ammo_index].iAmmo1];
+      bots[bot_index].current_weapon.iAmmo2 =
+         bots[bot_index].m_rgAmmo[weapon_defs[ammo_index].iAmmo2];
+   }
+}
+
+void BotClient_TFC_AmmoX(void *p, int bot_index)
+{
+   // this is just like the Valve AmmoX message
+   BotClient_Valve_AmmoX(p, bot_index);
+}
+
+void BotClient_CS_AmmoX(void *p, int bot_index)
+{
+   // this is just like the Valve AmmoX message
+   BotClient_Valve_AmmoX(p, bot_index);
+}
+
+void BotClient_Gearbox_AmmoX(void *p, int bot_index)
+{
+   // this is just like the Valve AmmoX message
+   BotClient_Valve_AmmoX(p, bot_index);
+}
+
+void BotClient_FLF_AmmoX(void *p, int bot_index)
+{
+   // this is just like the Valve AmmoX message
+   BotClient_Valve_AmmoX(p, bot_index);
+}
+
+
+// This message is sent when the bot picks up some ammo (AmmoX messages are
+// also sent so this message is probably not really necessary except it
+// allows the HUD to draw pictures of ammo that have been picked up.  The
+// bots don't really need pictures since they don't have any eyes anyway.
+void BotClient_Valve_AmmoPickup(void *p, int bot_index)
+{
+   static int state = 0;   // current state machine state
+   static int index;
+   static int ammount;
+   int ammo_index;
+
+   if (state == 0)
+   {
+      state++;
+      index = *(int *)p;
+   }
+   else if (state == 1)
+   {
+      state = 0;
+
+      ammount = *(int *)p;
+
+      bots[bot_index].m_rgAmmo[index] = ammount;
+
+      ammo_index = bots[bot_index].current_weapon.iId;
+
+      // update the ammo counts for this weapon...
+      bots[bot_index].current_weapon.iAmmo1 =
+         bots[bot_index].m_rgAmmo[weapon_defs[ammo_index].iAmmo1];
+      bots[bot_index].current_weapon.iAmmo2 =
+         bots[bot_index].m_rgAmmo[weapon_defs[ammo_index].iAmmo2];
+   }
+}
+
+void BotClient_TFC_AmmoPickup(void *p, int bot_index)
+{
+   // this is just like the Valve Ammo Pickup message
+   BotClient_Valve_AmmoPickup(p, bot_index);
+}
+
+void BotClient_CS_AmmoPickup(void *p, int bot_index)
+{
+   // this is just like the Valve Ammo Pickup message
+   BotClient_Valve_AmmoPickup(p, bot_index);
+}
+
+void BotClient_Gearbox_AmmoPickup(void *p, int bot_index)
+{
+   // this is just like the Valve Ammo Pickup message
+   BotClient_Valve_AmmoPickup(p, bot_index);
+}
+
+void BotClient_FLF_AmmoPickup(void *p, int bot_index)
+{
+   // this is just like the Valve Ammo Pickup message
+   BotClient_Valve_AmmoPickup(p, bot_index);
+}
+
+
+// This message gets sent when the bot picks up a weapon.
+void BotClient_Valve_WeaponPickup(void *p, int bot_index)
+{
+   int index;
+
+   index = *(int *)p;
+
+   // set this weapon bit to indicate that we are carrying this weapon
+   bots[bot_index].bot_weapons |= (1<<index);
+}
+
+void BotClient_TFC_WeaponPickup(void *p, int bot_index)
+{
+   // this is just like the Valve Weapon Pickup message
+   BotClient_Valve_WeaponPickup(p, bot_index);
+}
+
+void BotClient_CS_WeaponPickup(void *p, int bot_index)
+{
+   // this is just like the Valve Weapon Pickup message
+   BotClient_Valve_WeaponPickup(p, bot_index);
+}
+
+void BotClient_Gearbox_WeaponPickup(void *p, int bot_index)
+{
+   // this is just like the Valve Weapon Pickup message
+   BotClient_Valve_WeaponPickup(p, bot_index);
+}
+
+void BotClient_FLF_WeaponPickup(void *p, int bot_index)
+{
+   // this is just like the Valve Weapon Pickup message
+   BotClient_Valve_WeaponPickup(p, bot_index);
+}
+
+
+// This message gets sent when the bot picks up an item (like a battery
+// or a healthkit)
+void BotClient_Valve_ItemPickup(void *p, int bot_index)
+{
+}
+
+void BotClient_TFC_ItemPickup(void *p, int bot_index)
+{
+   // this is just like the Valve Item Pickup message
+   BotClient_Valve_ItemPickup(p, bot_index);
+}
+
+void BotClient_CS_ItemPickup(void *p, int bot_index)
+{
+   // this is just like the Valve Item Pickup message
+   BotClient_Valve_ItemPickup(p, bot_index);
+}
+
+void BotClient_Gearbox_ItemPickup(void *p, int bot_index)
+{
+   // this is just like the Valve Item Pickup message
+   BotClient_Valve_ItemPickup(p, bot_index);
+}
+
+void BotClient_FLF_ItemPickup(void *p, int bot_index)
+{
+   // this is just like the Valve Item Pickup message
+   BotClient_Valve_ItemPickup(p, bot_index);
+}
+
+
+// This message gets sent when the bots health changes.
+void BotClient_Valve_Health(void *p, int bot_index)
+{
+   bots[bot_index].bot_health = *(int *)p;  // health ammount
+}
+
+void BotClient_TFC_Health(void *p, int bot_index)
+{
+   // this is just like the Valve Health message
+   BotClient_Valve_Health(p, bot_index);
+}
+
+void BotClient_CS_Health(void *p, int bot_index)
+{
+   // this is just like the Valve Health message
+   BotClient_Valve_Health(p, bot_index);
+}
+
+void BotClient_Gearbox_Health(void *p, int bot_index)
+{
+   // this is just like the Valve Health message
+   BotClient_Valve_Health(p, bot_index);
+}
+
+void BotClient_FLF_Health(void *p, int bot_index)
+{
+   // this is just like the Valve Health message
+   BotClient_Valve_Health(p, bot_index);
+}
+
+
+// This message gets sent when the bots armor changes.
+void BotClient_Valve_Battery(void *p, int bot_index)
+{
+   bots[bot_index].bot_armor = *(int *)p;  // armor ammount
+}
+
+void BotClient_TFC_Battery(void *p, int bot_index)
+{
+   // this is just like the Valve Battery message
+   BotClient_Valve_Battery(p, bot_index);
+}
+
+void BotClient_CS_Battery(void *p, int bot_index)
+{
+   // this is just like the Valve Battery message
+   BotClient_Valve_Battery(p, bot_index);
+}
+
+void BotClient_Gearbox_Battery(void *p, int bot_index)
+{
+   // this is just like the Valve Battery message
+   BotClient_Valve_Battery(p, bot_index);
+}
+
+void BotClient_FLF_Battery(void *p, int bot_index)
+{
+   // this is just like the Valve Battery message
+   BotClient_Valve_Battery(p, bot_index);
+}
+
+
+// This message gets sent when the bots are getting damaged.
+void BotClient_Valve_Damage(void *p, int bot_index)
+{
+   static int state = 0;   // current state machine state
+   static int damage_armor;
+   static int damage_taken;
+   static int damage_bits;  // type of damage being done
+   static Vector damage_origin;
+
+   if (state == 0)
+   {
+      state++;
+      damage_armor = *(int *)p;
+   }
+   else if (state == 1)
+   {
+      state++;
+      damage_taken = *(int *)p;
+   }
+   else if (state == 2)
+   {
+      state++;
+      damage_bits = *(int *)p;
+   }
+   else if (state == 3)
+   {
+      state++;
+      damage_origin.x = *(float *)p;
+   }
+   else if (state == 4)
+   {
+      state++;
+      damage_origin.y = *(float *)p;
+   }
+   else if (state == 5)
+   {
+      state = 0;
+
+      damage_origin.z = *(float *)p;
+
+      if ((damage_armor > 0) || (damage_taken > 0))
+      {
+         // ignore certain types of damage...
+         if (damage_bits & IGNORE_DAMAGE)
+            return;
+
+         // if the bot doesn't have an enemy and someone is shooting at it then
+         // turn in the attacker's direction...
+         if (bots[bot_index].pBotEnemy == NULL)
+         {
+            // face the attacker...
+            Vector v_enemy = damage_origin - bots[bot_index].pEdict->v.origin;
+            Vector bot_angles = UTIL_VecToAngles( v_enemy );
+
+            bots[bot_index].pEdict->v.ideal_yaw = bot_angles.y;
+
+            BotFixIdealYaw(bots[bot_index].pEdict);
+
+            // stop using health or HEV stations...
+            bots[bot_index].b_use_health_station = FALSE;
+            bots[bot_index].b_use_HEV_station = FALSE;
+            bots[bot_index].b_use_capture = FALSE;
+         }
+      }
+   }
+}
+
+void BotClient_TFC_Damage(void *p, int bot_index)
+{
+   // this is just like the Valve Battery message
+   BotClient_Valve_Damage(p, bot_index);
+}
+
+void BotClient_CS_Damage(void *p, int bot_index)
+{
+   // this is just like the Valve Battery message
+	BotClient_Valve_Damage(p, bot_index);
+}
+
+void BotClient_Gearbox_Damage(void *p, int bot_index)
+{
+	// this is just like the Valve Battery message
+	BotClient_Valve_Damage(p, bot_index);
+}
+
+void BotClient_FLF_Damage(void *p, int bot_index)
+{
+	// this is just like the Valve Battery message
+	BotClient_Valve_Damage(p, bot_index);
+}
+
+
+// This message gets sent when the bots money ammount changes (for CS)
+void BotClient_CS_Money(void *p, int bot_index)
+{
+	static int state = 0;   // current state machine state
+	
+	if (state == 0)
+	{
+		state++;
+		
+		bots[bot_index].bot_money = *(int *)p;  // amount of money
+	}
+	else
+	{
+		state = 0;  // ingore this field
+	}
+}
+
+// This message gets sent when the bots get killed
+void BotClient_Valve_DeathMsg(void *p, int bot_index)
+{
+   static int state = 0;   // current state machine state
+   static int killer_index;
+   static int victim_index;
+   static edict_t *victim_edict;
+   static int index;
+
+   if (state == 0)
+   {
+      state++;
+      killer_index = *(int *)p;  // ENTINDEX() of killer
+   }
+   else if (state == 1)
+   {
+      state++;
+      victim_index = *(int *)p;  // ENTINDEX() of victim
+   }
+   else if (state == 2)
+   {
+      state = 0;
+
+      victim_edict = INDEXENT(victim_index);
+
+      index = UTIL_GetBotIndex(victim_edict);
+
+      // is this message about a bot being killed?
+      if (index != -1)
+      {
+         if ((killer_index == 0) || (killer_index == victim_index))
+         {
+            // bot killed by world (worldspawn) or bot killed self...
+            bots[index].killer_edict = NULL;
+         }
+         else
+         {
+            // store edict of player that killed this bot...
+            bots[index].killer_edict = INDEXENT(killer_index);
+         }
+      }
+   }
+}
+
+void BotClient_TFC_DeathMsg(void *p, int bot_index)
+{
+   // this is just like the Valve DeathMsg message
+   BotClient_Valve_DeathMsg(p, bot_index);
+}
+
+void BotClient_CS_DeathMsg(void *p, int bot_index)
+{
+   // this is just like the Valve DeathMsg message
+   BotClient_Valve_DeathMsg(p, bot_index);
+}
+
+void BotClient_Gearbox_DeathMsg(void *p, int bot_index)
+{
+   // this is just like the Valve DeathMsg message
+   BotClient_Valve_DeathMsg(p, bot_index);
+}
+
+void BotClient_FLF_DeathMsg(void *p, int bot_index)
+{
+   // this is just like the Valve DeathMsg message
+   BotClient_Valve_DeathMsg(p, bot_index);
+}
+
+
+// This message gets sent when a text message is displayed
+void BotClient_FLF_TextMsg(void *p, int bot_index)
+{
+   static int state = 0;   // current state machine state
+   static int msg_dest = 0;
+
+   if (state == 0)
+   {
+      state++;
+      msg_dest = *(int *)p;  // HUD_PRINTCENTER, etc.
+   }
+   else if (state == 1)
+   {
+      state = 0;
+
+      if (strcmp((char *)p, "You are Attacking\n") == 0)  // attacker msg
+      {
+         bots[bot_index].defender = 0;  // attacker
+      }
+      else if (strcmp((char *)p, "You are Defending\n") == 0)  // defender msg
+      {
+         bots[bot_index].defender = 1;  // defender
+      }
+   }
+}
+
+
+// This message gets sent when the WarmUpTime is enabled/disabled
+void BotClient_FLF_WarmUp(void *p, int bot_index)
+{
+   bots[bot_index].warmup = *(int *)p;
+}
+
+
+// This message gets sent to ALL when the WarmUpTime is enabled/disabled
+void BotClient_FLF_WarmUpAll(void *p, int bot_index)
+{
+   for (int i=0; i < 32; i++)
+   {
+      if (bots[i].is_used)  // count the number of bots in use
+         bots[i].warmup = *(int *)p;
+   }
+}
+
+
+// This message gets sent when the round is over
+void BotClient_FLF_WinMessage(void *p, int bot_index)
+{
+   for (int i=0; i < 32; i++)
+   {
+      if (bots[i].is_used)  // count the number of bots in use
+         bots[i].round_end = 1;
+   }
+}
+
+
+// This message gets sent when a temp entity is created
+void BotClient_FLF_TempEntity(void *p, int bot_index)
+{
+   static int state = 0;   // current state machine state
+   static int te_type;     // TE_ message type
+
+   if (p == NULL)  // end of message?
+   {
+      state = 0;
+      return;
+   }
+
+   if (state == 0)
+   {
+      state++;
+      te_type = *(int *)p;
+
+      return;
+   }
+
+   if (te_type == TE_TEXTMESSAGE)
+   {
+      if (state == 16)
+      {
+         if (strncmp((char *)p, "Capturing ", 10) == 0)
+         {
+            // if bot is currently capturing, keep timer alive...
+            if (bots[bot_index].b_use_capture)
+               bots[bot_index].f_use_capture_time = gpGlobals->time + 2.0;
+         }
+      }
+
+      state++;
+   }
+}
+
+
+void BotClient_Valve_ScreenFade(void *p, int bot_index)
+{
+   static int state = 0;   // current state machine state
+   static int duration;
+   static int hold_time;
+   static int fade_flags;
+   int length;
+
+   if (state == 0)
+   {
+      state++;
+      duration = *(int *)p;
+   }
+   else if (state == 1)
+   {
+      state++;
+      hold_time = *(int *)p;
+   }
+   else if (state == 2)
+   {
+      state++;
+      fade_flags = *(int *)p;
+   }
+   else if (state == 6)
+   {
+      state = 0;
+
+      length = (duration + hold_time) / 4096;
+      bots[bot_index].blinded_time = gpGlobals->time + length - 2.0;
+   }
+   else
+   {
+      state++;
+   }
+}
+
+void BotClient_TFC_ScreenFade(void *p, int bot_index)
+{
+   // this is just like the Valve ScreenFade message
+   BotClient_Valve_ScreenFade(p, bot_index);
+}
+
+void BotClient_CS_ScreenFade(void *p, int bot_index)
+{
+   // this is just like the Valve ScreenFade message
+   BotClient_Valve_ScreenFade(p, bot_index);
+}
+
+void BotClient_Gearbox_ScreenFade(void *p, int bot_index)
+{
+   // this is just like the Valve ScreenFade message
+   BotClient_Valve_ScreenFade(p, bot_index);
+}
+
+void BotClient_FLF_ScreenFade(void *p, int bot_index)
+{
+   // this is just like the Valve ScreenFade message
+   BotClient_Valve_ScreenFade(p, bot_index);
+}
+
+// AvH client functions
+void BotClient_AVH_SetOrder(void *p, int bot_index)
+{
+	bot_t* theCurrentBot = &bots[bot_index];
+
+	if(theCurrentBot->mOrderNumPlayers == -1)
+	{
+		if (theCurrentBot->mOrderState == 0)
+		{
+			// Read num players
+			theCurrentBot->mOrderState++;
+			theCurrentBot->mOrderNumPlayers = *(byte *)p;
+		}
+	}
+	else
+	{
+		if(theCurrentBot->mOrderState <= theCurrentBot->mOrderNumPlayers)
+		{
+			// Skip by players
+			theCurrentBot->mOrderState++;
+		}
+		else
+		{
+			int theRealState = theCurrentBot->mOrderState - theCurrentBot->mOrderNumPlayers - 1;
+			if(theRealState == 0)
+			{
+				// read order
+				theCurrentBot->mOrderState++;
+				theCurrentBot->mOrderType = *((AvHOrderType *)p);
+			}
+			else if(theRealState == 1)
+			{
+				// read order target type
+				theCurrentBot->mOrderState++;
+				theCurrentBot->mOrderTargetType = *((AvHOrderTargetType *)p);
+			}
+			else 
+			{
+				if((theCurrentBot->mOrderTargetType == ORDERTARGETTYPE_LOCATION) && ((theRealState >= 2) && (theRealState <= 4)))
+				{
+					theCurrentBot->mOrderLocation[theRealState-2] = *((float*)p);
+					theCurrentBot->mOrderState++;
+				}
+				else if((theCurrentBot->mOrderTargetType == ORDERTARGETTYPE_TARGET) && (theRealState == 2))
+				{
+					theCurrentBot->mOrderTargetIndex = *((int*)p);
+					theCurrentBot->mOrderState++;
+				}
+				else if(	((theCurrentBot->mOrderTargetType == ORDERTARGETTYPE_LOCATION) && (theRealState == 5)) ||
+							((theCurrentBot->mOrderTargetType == ORDERTARGETTYPE_TARGET) && (theRealState == 3)) ||
+							(theRealState == 2)	)
+				{
+					theCurrentBot->mOrderCompleted = *((int*)p);
+					theCurrentBot->mOrderState++;
+				}
+				else
+				{
+					// Reset
+					theCurrentBot->mOrderState = 0;
+					theCurrentBot->mOrderNumPlayers = -1;
+					theCurrentBot->mOrderType = ORDERTYPE_UNDEFINED;
+					theCurrentBot->mOrderTargetType = ORDERTARGETTYPE_UNDEFINED;
+					theCurrentBot->mOrderLocation[0] = theCurrentBot->mOrderLocation[1] = theCurrentBot->mOrderLocation[2] = 0.0f;
+					theCurrentBot->mOrderTargetIndex = -1;
+					theCurrentBot->mOrderCompleted = false;
+				}
+			}
+		}
+	}
+}
+
+
+
+void BotClient_AVH_SetPlayMode(void *p, int bot_index)
+{
+	static int state = 0;   // current state machine state
+	
+	if (state == 0)
+	{
+		state++;
+		
+		bots[bot_index].mBotPlayMode = (AvHPlayMode)(*(byte *)p);  // amount of money
+		bots[bot_index].pBotEnemy = NULL;
+	}
+	else
+	{
+		state = 0;  // ingore this field
+	}
+}
+
+void BotClient_AVH_SetResources(void *p, int bot_index)
+{
+	static int state = 0;   // current state machine state
+	
+	if(state == 0)
+	{
+		state++;
+	}
+	else if(state == 1)
+	{
+		bots[bot_index].mResources = (*(int *)p);  // amount of money
+		state += 4;
+	}
+	else
+	{
+		state = 0;  // ingore this field
+	}
+}
+
+
+
diff --git a/main/source/HPB_bot/dlls/bot_client.h b/main/source/HPB_bot/dlls/bot_client.h
new file mode 100644
index 00000000..4dc9e030
--- /dev/null
+++ b/main/source/HPB_bot/dlls/bot_client.h
@@ -0,0 +1,96 @@
+//
+// HPB_bot - botman's High Ping Bastard bot
+//
+// (http://planethalflife.com/botman/)
+//
+// bot_client.h
+//
+
+void BotClient_TFC_VGUI(void *p, int bot_index);
+void BotClient_CS_VGUI(void *p, int bot_index);
+void BotClient_CS_ShowMenu(void *p, int bot_index);
+void BotClient_Gearbox_VGUI(void *p, int bot_index);
+void BotClient_FLF_VGUI(void *p, int bot_index);
+
+void BotClient_Valve_WeaponList(void *p, int bot_index);
+void BotClient_TFC_WeaponList(void *p, int bot_index);
+void BotClient_CS_WeaponList(void *p, int bot_index);
+void BotClient_Gearbox_WeaponList(void *p, int bot_index);
+void BotClient_FLF_WeaponList(void *p, int bot_index);
+
+void BotClient_Valve_CurrentWeapon(void *p, int bot_index);
+void BotClient_TFC_CurrentWeapon(void *p, int bot_index);
+void BotClient_CS_CurrentWeapon(void *p, int bot_index);
+void BotClient_Gearbox_CurrentWeapon(void *p, int bot_index);
+void BotClient_FLF_CurrentWeapon(void *p, int bot_index);
+
+void BotClient_Valve_AmmoX(void *p, int bot_index);
+void BotClient_TFC_AmmoX(void *p, int bot_index);
+void BotClient_CS_AmmoX(void *p, int bot_index);
+void BotClient_Gearbox_AmmoX(void *p, int bot_index);
+void BotClient_FLF_AmmoX(void *p, int bot_index);
+
+void BotClient_Valve_AmmoPickup(void *p, int bot_index);
+void BotClient_TFC_AmmoPickup(void *p, int bot_index);
+void BotClient_CS_AmmoPickup(void *p, int bot_index);
+void BotClient_Gearbox_AmmoPickup(void *p, int bot_index);
+void BotClient_FLF_AmmoPickup(void *p, int bot_index);
+
+void BotClient_Valve_WeaponPickup(void *p, int bot_index);
+void BotClient_TFC_WeaponPickup(void *p, int bot_index);
+void BotClient_CS_WeaponPickup(void *p, int bot_index);
+void BotClient_Gearbox_WeaponPickup(void *p, int bot_index);
+void BotClient_FLF_WeaponPickup(void *p, int bot_index);
+
+void BotClient_Valve_ItemPickup(void *p, int bot_index);
+void BotClient_TFC_ItemPickup(void *p, int bot_index);
+void BotClient_CS_ItemPickup(void *p, int bot_index);
+void BotClient_Gearbox_ItemPickup(void *p, int bot_index);
+void BotClient_FLF_ItemPickup(void *p, int bot_index);
+
+void BotClient_Valve_Health(void *p, int bot_index);
+void BotClient_TFC_Health(void *p, int bot_index);
+void BotClient_CS_Health(void *p, int bot_index);
+void BotClient_Gearbox_Health(void *p, int bot_index);
+void BotClient_FLF_Health(void *p, int bot_index);
+
+void BotClient_Valve_Battery(void *p, int bot_index);
+void BotClient_TFC_Battery(void *p, int bot_index);
+void BotClient_CS_Battery(void *p, int bot_index);
+void BotClient_Gearbox_Battery(void *p, int bot_index);
+void BotClient_FLF_Battery(void *p, int bot_index);
+
+void BotClient_Valve_Damage(void *p, int bot_index);
+void BotClient_TFC_Damage(void *p, int bot_index);
+void BotClient_CS_Damage(void *p, int bot_index);
+void BotClient_Gearbox_Damage(void *p, int bot_index);
+void BotClient_FLF_Damage(void *p, int bot_index);
+
+void BotClient_CS_Money(void *p, int bot_index);
+
+void BotClient_Valve_DeathMsg(void *p, int bot_index);
+void BotClient_TFC_DeathMsg(void *p, int bot_index);
+void BotClient_CS_DeathMsg(void *p, int bot_index);
+void BotClient_Gearbox_DeathMsg(void *p, int bot_index);
+void BotClient_FLF_DeathMsg(void *p, int bot_index);
+
+void BotClient_FLF_TextMsg(void *p, int bot_index);
+
+void BotClient_FLF_WarmUp(void *p, int bot_index);
+void BotClient_FLF_WarmUpAll(void *p, int bot_index);
+
+void BotClient_FLF_WinMessage(void *p, int bot_index);
+
+void BotClient_FLF_TempEntity(void *p, int bot_index);
+
+void BotClient_Valve_ScreenFade(void *p, int bot_index);
+void BotClient_TFC_ScreenFade(void *p, int bot_index);
+void BotClient_CS_ScreenFade(void *p, int bot_index);
+void BotClient_Gearbox_ScreenFade(void *p, int bot_index);
+void BotClient_FLF_ScreenFade(void *p, int bot_index);
+
+// AvH client functions
+void BotClient_AVH_SetOrder(void *p, int bot_index);
+void BotClient_AVH_SetPlayMode(void *p, int bot_index);
+void BotClient_AVH_SetResources(void *p, int bot_index);
+
diff --git a/main/source/HPB_bot/dlls/bot_combat.cpp b/main/source/HPB_bot/dlls/bot_combat.cpp
new file mode 100644
index 00000000..85d4d609
--- /dev/null
+++ b/main/source/HPB_bot/dlls/bot_combat.cpp
@@ -0,0 +1,1301 @@
+//
+// HPB bot - botman's High Ping Bastard bot
+//
+// (http://planethalflife.com/botman/)
+//
+// bot_combat.cpp
+//
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+
+#include "bot.h"
+#include "bot_func.h"
+#include "bot_weapons.h"
+#include "mod/AvHBasePlayerWeaponConstants.h"
+#include "mod/AvHMarineWeaponConstants.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayer.h"
+
+extern int mod_id;
+extern bot_weapon_t weapon_defs[MAX_WEAPONS];
+extern bool b_observer_mode;
+extern int team_allies[4];
+extern edict_t *pent_info_ctfdetect;
+extern float is_team_play;
+extern bool checked_teamplay;
+
+FILE *fp;
+
+
+typedef struct
+{
+   int iId;  // the weapon ID value
+   char  weapon_name[64];  // name of the weapon when selecting it
+   int   skill_level;   // bot skill must be less than or equal to this value
+   float primary_min_distance;   // 0 = no minimum
+   float primary_max_distance;   // 9999 = no maximum
+   float secondary_min_distance; // 0 = no minimum
+   float secondary_max_distance; // 9999 = no maximum
+   int   use_percent;   // times out of 100 to use this weapon when available
+   bool  can_use_underwater;     // can use this weapon underwater
+   int   primary_fire_percent;   // times out of 100 to use primary fire
+   int   min_primary_ammo;       // minimum ammout of primary ammo needed to fire
+   int   min_secondary_ammo;     // minimum ammout of seconday ammo needed to fire
+   bool  primary_fire_hold;      // hold down primary fire button to use?
+   bool  secondary_fire_hold;    // hold down secondary fire button to use?
+   bool  primary_fire_charge;    // charge weapon using primary fire?
+   bool  secondary_fire_charge;  // charge weapon using secondary fire?
+   float primary_charge_delay;   // time to charge weapon
+   float secondary_charge_delay; // time to charge weapon
+} bot_weapon_select_t;
+
+typedef struct
+{
+   int iId;
+   float primary_base_delay;
+   float primary_min_delay[5];
+   float primary_max_delay[5];
+   float secondary_base_delay;
+   float secondary_min_delay[5];
+   float secondary_max_delay[5];
+} bot_fire_delay_t;
+
+
+// weapons are stored in priority order, most desired weapon should be at
+// the start of the array and least desired should be at the end
+
+bot_weapon_select_t valve_weapon_select[] = {
+   {VALVE_WEAPON_CROWBAR, "weapon_crowbar", 2, 0.0, 50.0, 0.0, 0.0,
+    100, TRUE, 100, 0, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {VALVE_WEAPON_HANDGRENADE, "weapon_handgrenade", 5, 250.0, 750.0, 0.0, 0.0,
+    30, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {VALVE_WEAPON_SNARK, "weapon_snark", 5, 150.0, 500.0, 0.0, 0.0,
+    50, FALSE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {VALVE_WEAPON_EGON, "weapon_egon", 5, 0.0, 9999.0, 0.0, 0.0,
+    100, FALSE, 100, 1, 0, TRUE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {VALVE_WEAPON_GAUSS, "weapon_gauss", 5, 0.0, 9999.0, 0.0, 9999.0,
+    100, FALSE, 80, 1, 10, FALSE, FALSE, FALSE, TRUE, 0.0, 0.8},
+   {VALVE_WEAPON_SHOTGUN, "weapon_shotgun", 5, 30.0, 150.0, 30.0, 150.0,
+    100, FALSE, 70, 1, 2, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {VALVE_WEAPON_PYTHON, "weapon_357", 5, 30.0, 700.0, 0.0, 0.0,
+    100, FALSE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {VALVE_WEAPON_HORNETGUN, "weapon_hornetgun", 5, 30.0, 1000.0, 30.0, 1000.0,
+    100, TRUE, 50, 1, 4, FALSE, TRUE, FALSE, FALSE, 0.0, 0.0},
+   {VALVE_WEAPON_MP5, "weapon_9mmAR", 5, 0.0, 250.0, 300.0, 600.0,
+    100, FALSE, 90, 1, 1, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {VALVE_WEAPON_CROSSBOW, "weapon_crossbow", 5, 100.0, 1000.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {VALVE_WEAPON_RPG, "weapon_rpg", 5, 300.0, 9999.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {VALVE_WEAPON_GLOCK, "weapon_9mmhandgun", 5, 0.0, 1200.0, 0.0, 1200.0,
+    100, TRUE, 70, 1, 1, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   /* terminator */
+   {0, "", 0, 0.0, 0.0, 0.0, 0.0, 0, TRUE, 0, 1, 1, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0}
+};
+
+bot_weapon_select_t tfc_weapon_select[] = {
+   {TF_WEAPON_AXE, "tf_weapon_axe", 5, 0.0, 50.0, 0.0, 0.0,
+    100, TRUE, 100, 0, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {TF_WEAPON_KNIFE, "tf_weapon_knife", 5, 0.0, 40.0, 0.0, 0.0,
+    100, TRUE, 100, 0, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {TF_WEAPON_SPANNER, "tf_weapon_knife", 5, 0.0, 40.0, 0.0, 0.0,
+    100, TRUE, 100, 0, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {TF_WEAPON_MEDIKIT, "tf_weapon_medikit", 5, 0.0, 40.0, 0.0, 0.0,
+    100, TRUE, 100, 0, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {TF_WEAPON_SNIPERRIFLE, "tf_weapon_sniperrifle", 5, 300.0, 2500.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, FALSE, FALSE, TRUE, FALSE, 1.0, 0.0},
+   {TF_WEAPON_FLAMETHROWER, "tf_weapon_flamethrower", 5, 100.0, 500.0, 0.0, 0.0,
+    100, FALSE, 100, 1, 0, TRUE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {TF_WEAPON_AC, "tf_weapon_ac", 5, 50.0, 1000.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, TRUE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {TF_WEAPON_GL, "tf_weapon_gl", 5, 300.0, 900.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {TF_WEAPON_RPG, "tf_weapon_rpg", 5, 300.0, 900.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {TF_WEAPON_IC, "tf_weapon_ic", 5, 300.0, 800.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {TF_WEAPON_TRANQ, "tf_weapon_tranq", 5, 40.0, 1000.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {TF_WEAPON_RAILGUN, "tf_weapon_railgun", 5, 40.0, 800.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {TF_WEAPON_SUPERNAILGUN, "tf_weapon_superng", 5, 40.0, 800.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, TRUE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {TF_WEAPON_SUPERSHOTGUN, "tf_weapon_supershotgun", 5, 40.0, 500.0, 0.0, 0.0,
+    100, TRUE, 100, 2, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {TF_WEAPON_AUTORIFLE, "tf_weapon_autorifle", 5, 0.0, 800.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {TF_WEAPON_SHOTGUN, "tf_weapon_shotgun", 5, 40.0, 400.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {TF_WEAPON_NAILGUN, "tf_weapon_ng", 5, 40.0, 600.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   /* terminator */
+   {0, "", 0, 0.0, 0.0, 0.0, 0.0, 0, TRUE, 0, 1, 1, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0}
+};
+
+bot_weapon_select_t cs_weapon_select[] = {
+   {CS_WEAPON_KNIFE, "weapon_knife", 5, 0.0, 50.0, 0.0, 0.0,
+    100, TRUE, 100, 0, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {CS_WEAPON_USP, "weapon_usp", 5, 0.0, 1200.0, 0.0, 1200.0,
+    100, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {CS_WEAPON_GLOCK18, "weapon_glock18", 5, 0.0, 1200.0, 0.0, 1200.0,
+    100, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   /* terminator */
+   {0, "", 0, 0.0, 0.0, 0.0, 0.0, 0, TRUE, 0, 1, 1, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0}
+};
+
+bot_weapon_select_t gearbox_weapon_select[] = {
+   {GEARBOX_WEAPON_PIPEWRENCH, "weapon_pipewrench", 3, 0.0, 50.0, 0.0, 0.0,
+    100, TRUE, 100, 0, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {GEARBOX_WEAPON_KNIFE, "weapon_knife", 4, 0.0, 50.0, 0.0, 0.0,
+    100, TRUE, 100, 0, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {GEARBOX_WEAPON_CROWBAR, "weapon_crowbar", 2, 0.0, 50.0, 0.0, 0.0,
+    100, TRUE, 100, 0, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {GEARBOX_WEAPON_DISPLACER, "weapon_displacer", 5, 100.0, 1000.0, 0.0, 0.0,
+    100, TRUE, 100, 0, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {GEARBOX_WEAPON_SPORELAUNCHER, "weapon_sporelauncher", 5, 500.0, 1000.0, 0.0, 0.0,
+    100, TRUE, 100, 0, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {GEARBOX_WEAPON_SHOCKRIFLE, "weapon_shockrifle", 5, 50.0, 800.0, 0.0, 0.0,
+    100, TRUE, 100, 0, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {GEARBOX_WEAPON_SNIPERRIFLE, "weapon_sniperrifle", 5, 50.0, 1500.0, 0.0, 0.0,
+    100, FALSE, 100, 0, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {GEARBOX_WEAPON_HANDGRENADE, "weapon_handgrenade", 5, 250.0, 750.0, 0.0, 0.0,
+    30, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {GEARBOX_WEAPON_SNARK, "weapon_snark", 5, 150.0, 500.0, 0.0, 0.0,
+    50, FALSE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {GEARBOX_WEAPON_EGON, "weapon_egon", 5, 0.0, 9999.0, 0.0, 0.0,
+    100, FALSE, 100, 1, 0, TRUE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {GEARBOX_WEAPON_GAUSS, "weapon_gauss", 5, 0.0, 9999.0, 0.0, 9999.0,
+    100, FALSE, 80, 1, 10, FALSE, FALSE, FALSE, TRUE, 0.0, 0.8},
+   {GEARBOX_WEAPON_M249, "weapon_m249", 5, 0.0, 400.0, 0.0, 0.0,
+    100, FALSE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {GEARBOX_WEAPON_SHOTGUN, "weapon_shotgun", 5, 30.0, 150.0, 30.0, 150.0,
+    100, FALSE, 70, 1, 2, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {GEARBOX_WEAPON_EAGLE, "weapon_eagle", 5, 0.0, 1200.0, 0.0, 0.0,
+    100, FALSE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {GEARBOX_WEAPON_PYTHON, "weapon_357", 5, 30.0, 700.0, 0.0, 0.0,
+    100, FALSE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {GEARBOX_WEAPON_HORNETGUN, "weapon_hornetgun", 5, 30.0, 1000.0, 30.0, 1000.0,
+    100, TRUE, 50, 1, 4, FALSE, TRUE, FALSE, FALSE, 0.0, 0.0},
+   {GEARBOX_WEAPON_MP5, "weapon_9mmAR", 5, 0.0, 250.0, 300.0, 600.0,
+    100, FALSE, 90, 1, 1, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {GEARBOX_WEAPON_CROSSBOW, "weapon_crossbow", 5, 100.0, 1000.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {GEARBOX_WEAPON_RPG, "weapon_rpg", 5, 300.0, 9999.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {GEARBOX_WEAPON_GLOCK, "weapon_9mmhandgun", 5, 0.0, 1200.0, 0.0, 1200.0,
+    100, TRUE, 70, 1, 1, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   /* terminator */
+   {0, "", 0, 0.0, 0.0, 0.0, 0.0, 0, TRUE, 0, 1, 1, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0}
+};
+
+bot_weapon_select_t frontline_weapon_select[] = {
+   {FLF_WEAPON_HEGRENADE, "weapon_hegrenade", 3, 200.0, 1000.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {FLF_WEAPON_FLASHBANG, "weapon_flashbang", 3, 100.0, 800.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+//   {FLF_WEAPON_KNIFE, "weapon_knife", 3, 0.0, 60.0, 0.0, 0.0,
+//    100, TRUE, 100, 0, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {FLF_WEAPON_HK21, "weapon_hk21", 5, 0.0, 900.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, TRUE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {FLF_WEAPON_UMP45, "weapon_ump45", 5, 0.0, 900.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, TRUE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {FLF_WEAPON_FAMAS, "weapon_famas", 5, 0.0, 500.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, TRUE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {FLF_WEAPON_MSG90, "weapon_msg90", 5, 0.0, 2500.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {FLF_WEAPON_MP5A2, "weapon_mp5a2", 5, 0.0, 900.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, TRUE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {FLF_WEAPON_AK5, "weapon_ak5", 5, 0.0, 900.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, TRUE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {FLF_WEAPON_MP5SD, "weapon_mp5sd", 5, 0.0, 900.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, TRUE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {FLF_WEAPON_M4, "weapon_m4", 5, 0.0, 900.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, TRUE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {FLF_WEAPON_SPAS12, "weapon_spas12", 5, 0.0, 900.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {FLF_WEAPON_MAC10, "weapon_mac10", 5, 0.0, 500.0, 0.0, 0.0,
+    100, TRUE, 100, 1, 0, TRUE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {FLF_WEAPON_BERETTA, "weapon_beretta", 5, 0.0, 1200.0, 0.0, 1200.0,
+    100, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   {FLF_WEAPON_MK23, "weapon_mk23", 5, 0.0, 1200.0, 0.0, 1200.0,
+    100, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0},
+   /* terminator */
+   {0, "", 0, 0.0, 0.0, 0.0, 0.0, 0, TRUE, 0, 1, 1, FALSE, FALSE, FALSE, FALSE, 0.0, 0.0}
+};
+
+//int iId;  // the weapon ID value
+//char  weapon_name[64];  // name of the weapon when selecting it
+//int   skill_level;   // bot skill must be less than or equal to this value
+//float primary_min_distance;   // 0 = no minimum
+//float primary_max_distance;   // 9999 = no maximum
+//float secondary_min_distance; // 0 = no minimum
+//float secondary_max_distance; // 9999 = no maximum
+//int   use_percent;   // times out of 100 to use this weapon when available
+//bool  can_use_underwater;     // can use this weapon underwater
+//int   primary_fire_percent;   // times out of 100 to use primary fire
+//int   min_primary_ammo;       // minimum ammout of primary ammo needed to fire
+//int   min_secondary_ammo;     // minimum ammout of seconday ammo needed to fire
+//bool  primary_fire_hold;      // hold down primary fire button to use?
+//bool  secondary_fire_hold;    // hold down secondary fire button to use?
+//bool  primary_fire_charge;    // charge weapon using primary fire?
+//bool  secondary_fire_charge;  // charge weapon using secondary fire?
+//float primary_charge_delay;   // time to charge weapon
+//float secondary_charge_delay; // time to charge weapon
+
+bot_weapon_select_t ns_weapon_select[] = {
+	{AVH_WEAPON_GRENADE_GUN, kwsGrenadeGun, 3, 120, kGGRange, 0.0, 0.0, 100, FALSE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0f, 0.0f},
+	{AVH_WEAPON_SONIC, kwsShotGun, 3, 0.0, kSGRange, 0.0, 0.0, 100, FALSE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0f, 0.0f},
+	{AVH_WEAPON_HMG, kwsHeavyMachineGun, 3, 0.0, kHMGRange, 0.0, 0.0, 100, FALSE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0f, 0.0f},
+	{AVH_WEAPON_MG, kwsMachineGun, 3, 0.0, kMGRange, 0.0, 0.0, 100, FALSE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0f, 0.0f},
+	{AVH_WEAPON_PISTOL, kwsPistol, 3, 0.0, kHGRange, 0.0, 0.0, 75, FALSE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0f, 0.0f},
+	{AVH_WEAPON_KNIFE, kwsKnife, 3, 0.0, kKNRange, 0.0, 0.0, 50, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0f, 0.0f},
+
+	// Base alien abilities
+	{AVH_WEAPON_PRIMALSCREAM, kwsPrimalScream, 3, 0.0, 300, 0.0, 0.0, 20, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0f, 0.0f},
+	{AVH_WEAPON_SWIPE, kwsSwipe, 3, 0.0, kSwipeRange, 0.0, 0.0, 75, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0f, 0.0f},
+	{AVH_WEAPON_SPORES, kwsSporeGun, 3, 0.0, kSporeRange, 0.0, 0.0, 75, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0f, 0.0f},
+	{AVH_WEAPON_SPIT, kwsSpitGun, 3, 0.0, kSpitGRange, 0.0, 0.0, 75, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0f, 0.0f},
+	{AVH_WEAPON_CLAWS, kwsClaws, 3, 0.0, kClawsRange, 0.0, 0.0, 75, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0f, 0.0f},
+	{AVH_WEAPON_BITE, kwsBiteGun, 3, 0.0, 60, 0.0, 0.0, 75, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0f, 0.0f},
+	{AVH_ABILITY_LEAP, kwsLeap, 3, 0.0, 600, 0.0, 0.0, 50, FALSE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0f, 0.0f},
+	{AVH_WEAPON_SPIKE, kwsSpikeGun, 3, 0.0, kSpikeRange, 0.0, 0.0, 75, TRUE, 100, 1, 0, FALSE, FALSE, FALSE, FALSE, 0.0f, 0.0f},
+};
+
+// weapon firing delay based on skill (min and max delay for each weapon)
+// THESE MUST MATCH THE SAME ORDER AS THE WEAPON SELECT ARRAY!!!
+
+bot_fire_delay_t valve_fire_delay[] = {
+   {VALVE_WEAPON_CROWBAR,
+    0.3, {0.0, 0.2, 0.3, 0.4, 0.6}, {0.1, 0.3, 0.5, 0.7, 1.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {VALVE_WEAPON_HANDGRENADE,
+    0.1, {1.0, 2.0, 3.0, 4.0, 5.0}, {3.0, 4.0, 5.0, 6.0, 7.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {VALVE_WEAPON_SNARK,
+    0.1, {0.0, 0.1, 0.2, 0.4, 0.6}, {0.1, 0.2, 0.5, 0.7, 1.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {VALVE_WEAPON_EGON,
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {VALVE_WEAPON_GAUSS,
+    0.2, {0.0, 0.2, 0.3, 0.5, 1.0}, {0.1, 0.3, 0.5, 0.8, 1.2},
+    1.0, {0.2, 0.3, 0.5, 0.8, 1.2}, {0.5, 0.7, 1.0, 1.5, 2.0}},
+   {VALVE_WEAPON_SHOTGUN,
+    0.75, {0.0, 0.2, 0.4, 0.6, 0.8}, {0.25, 0.5, 0.8, 1.2, 2.0},
+    1.5, {0.0, 0.2, 0.4, 0.6, 0.8}, {0.25, 0.5, 0.8, 1.2, 2.0}},
+   {VALVE_WEAPON_PYTHON,
+    0.75, {0.0, 0.2, 0.4, 1.0, 1.5}, {0.25, 0.5, 0.8, 1.3, 2.2},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {VALVE_WEAPON_HORNETGUN,
+    0.25, {0.0, 0.25, 0.4, 0.6, 1.0}, {0.1, 0.4, 0.7, 1.0, 1.5},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {VALVE_WEAPON_MP5,
+    0.1, {0.0, 0.1, 0.25, 0.4, 0.5}, {0.1, 0.3, 0.45, 0.65, 0.8},
+    1.0, {0.0, 0.4, 0.7, 1.0, 1.4}, {0.3, 0.7, 1.0, 1.6, 2.0}},
+   {VALVE_WEAPON_CROSSBOW,
+    0.75, {0.0, 0.2, 0.5, 0.8, 1.0}, {0.25, 0.4, 0.7, 1.0, 1.3},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {VALVE_WEAPON_RPG,
+    1.5, {1.0, 2.0, 3.0, 4.0, 5.0}, {3.0, 4.0, 5.0, 6.0, 7.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {VALVE_WEAPON_GLOCK,
+    0.3, {0.0, 0.1, 0.2, 0.3, 0.4}, {0.1, 0.2, 0.3, 0.4, 0.5},
+    0.2, {0.0, 0.0, 0.1, 0.1, 0.2}, {0.1, 0.1, 0.2, 0.2, 0.4}},
+   /* terminator */
+   {0, 0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0},
+       0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}}
+};
+
+bot_fire_delay_t tfc_fire_delay[] = {
+   {TF_WEAPON_AXE,
+    0.3, {0.0, 0.2, 0.3, 0.4, 0.6}, {0.1, 0.3, 0.5, 0.7, 1.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {TF_WEAPON_KNIFE,
+    0.3, {0.0, 0.2, 0.3, 0.4, 0.6}, {0.1, 0.3, 0.5, 0.7, 1.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {TF_WEAPON_SPANNER,
+    0.3, {0.0, 0.2, 0.3, 0.4, 0.6}, {0.1, 0.3, 0.5, 0.7, 1.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {TF_WEAPON_MEDIKIT,
+    0.3, {0.0, 0.2, 0.3, 0.4, 0.6}, {0.1, 0.3, 0.5, 0.7, 1.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {TF_WEAPON_SNIPERRIFLE,
+    1.0, {0.0, 0.4, 0.7, 1.0, 1.4}, {0.3, 0.7, 1.0, 1.6, 2.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {TF_WEAPON_FLAMETHROWER,
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {TF_WEAPON_AC,
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {TF_WEAPON_GL,
+    0.6, {0.0, 0.2, 0.5, 0.8, 1.0}, {0.25, 0.4, 0.7, 1.0, 1.3},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {TF_WEAPON_RPG,
+    0.5, {0.0, 0.1, 0.3, 0.6, 1.0}, {0.1, 0.2, 0.7, 1.0, 2.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {TF_WEAPON_IC,
+    2.0, {1.0, 2.0, 3.0, 4.0, 5.0}, {3.0, 4.0, 5.0, 6.0, 7.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {TF_WEAPON_TRANQ,
+    1.5, {1.0, 2.0, 3.0, 4.0, 5.0}, {3.0, 4.0, 5.0, 6.0, 7.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {TF_WEAPON_RAILGUN,
+    0.4, {0.0, 0.1, 0.2, 0.3, 0.4}, {0.1, 0.2, 0.3, 0.4, 0.5},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {TF_WEAPON_SUPERNAILGUN,
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {TF_WEAPON_SUPERSHOTGUN,
+    0.6, {0.0, 0.2, 0.5, 0.8, 1.0}, {0.25, 0.4, 0.7, 1.0, 1.3},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {TF_WEAPON_AUTORIFLE,
+    0.1, {0.0, 0.1, 0.2, 0.4, 0.6}, {0.1, 0.2, 0.5, 0.7, 1.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {TF_WEAPON_SHOTGUN,
+    0.5, {0.0, 0.2, 0.4, 0.6, 0.8}, {0.25, 0.5, 0.8, 1.2, 2.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {TF_WEAPON_NAILGUN,
+    0.1, {0.0, 0.1, 0.2, 0.4, 0.6}, {0.1, 0.2, 0.5, 0.7, 1.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   /* terminator */
+   {0, 0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0},
+       0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}}
+};
+
+bot_fire_delay_t cs_fire_delay[] = {
+   {CS_WEAPON_KNIFE,
+    0.3, {0.0, 0.2, 0.3, 0.4, 0.6}, {0.1, 0.3, 0.5, 0.7, 1.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {CS_WEAPON_USP,
+    0.3, {0.0, 0.1, 0.2, 0.3, 0.4}, {0.1, 0.2, 0.3, 0.4, 0.5},
+    0.2, {0.0, 0.0, 0.1, 0.1, 0.2}, {0.1, 0.1, 0.2, 0.2, 0.4}},
+   {CS_WEAPON_GLOCK18,
+    0.3, {0.0, 0.1, 0.2, 0.3, 0.4}, {0.1, 0.2, 0.3, 0.4, 0.5},
+    0.2, {0.0, 0.0, 0.1, 0.1, 0.2}, {0.1, 0.1, 0.2, 0.2, 0.4}},
+   /* terminator */
+   {0, 0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0},
+       0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}}
+};
+
+bot_fire_delay_t gearbox_fire_delay[] = {
+   {GEARBOX_WEAPON_PIPEWRENCH,
+    0.5, {0.0, 0.2, 0.3, 0.4, 0.6}, {0.1, 0.3, 0.5, 0.7, 1.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {GEARBOX_WEAPON_KNIFE,
+    0.4, {0.0, 0.2, 0.3, 0.4, 0.6}, {0.1, 0.3, 0.5, 0.7, 1.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {GEARBOX_WEAPON_CROWBAR,
+    0.3, {0.0, 0.2, 0.3, 0.4, 0.6}, {0.1, 0.3, 0.5, 0.7, 1.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {GEARBOX_WEAPON_DISPLACER,
+    5.0, {0.0, 0.5, 0.8, 1.6, 2.5}, {0.3, 0.8, 1.4, 2.2, 3.5},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {GEARBOX_WEAPON_SPORELAUNCHER,
+    0.5, {0.0, 0.2, 0.3, 0.4, 0.6}, {0.1, 0.3, 0.5, 0.7, 1.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {GEARBOX_WEAPON_SHOCKRIFLE,
+    0.1, {0.0, 0.1, 0.2, 0.3, 0.4}, {0.1, 0.2, 0.3, 0.4, 0.5},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {GEARBOX_WEAPON_SNIPERRIFLE,
+    1.5, {0.0, 0.2, 0.4, 0.6, 0.8}, {0.25, 0.5, 0.8, 1.2, 2.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {GEARBOX_WEAPON_HANDGRENADE,
+    0.1, {1.0, 2.0, 3.0, 4.0, 5.0}, {3.0, 4.0, 5.0, 6.0, 7.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {GEARBOX_WEAPON_SNARK,
+    0.1, {0.0, 0.1, 0.2, 0.4, 0.6}, {0.1, 0.2, 0.5, 0.7, 1.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {GEARBOX_WEAPON_EGON,
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {GEARBOX_WEAPON_GAUSS,
+    0.2, {0.0, 0.2, 0.3, 0.5, 1.0}, {0.1, 0.3, 0.5, 0.8, 1.2},
+    1.0, {0.2, 0.3, 0.5, 0.8, 1.2}, {0.5, 0.7, 1.0, 1.5, 2.0}},
+   {GEARBOX_WEAPON_M249,
+    0.1, {0.0, 0.1, 0.25, 0.4, 0.5}, {0.1, 0.3, 0.45, 0.65, 0.8},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {GEARBOX_WEAPON_SHOTGUN,
+    0.75, {0.0, 0.2, 0.4, 0.6, 0.8}, {0.25, 0.5, 0.8, 1.2, 2.0},
+    1.5, {0.0, 0.2, 0.4, 0.6, 0.8}, {0.25, 0.5, 0.8, 1.2, 2.0}},
+   {GEARBOX_WEAPON_EAGLE,
+    0.25, {0.0, 0.1, 0.2, 0.3, 0.5}, {0.1, 0.25, 0.4, 0.7, 1.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {GEARBOX_WEAPON_PYTHON,
+    0.75, {0.0, 0.2, 0.4, 1.0, 1.5}, {0.25, 0.5, 0.8, 1.3, 2.2},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {GEARBOX_WEAPON_HORNETGUN,
+    0.25, {0.0, 0.25, 0.4, 0.6, 1.0}, {0.1, 0.4, 0.7, 1.0, 1.5},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {GEARBOX_WEAPON_MP5,
+    0.1, {0.0, 0.1, 0.25, 0.4, 0.5}, {0.1, 0.3, 0.45, 0.65, 0.8},
+    1.0, {0.0, 0.4, 0.7, 1.0, 1.4}, {0.3, 0.7, 1.0, 1.6, 2.0}},
+   {GEARBOX_WEAPON_CROSSBOW,
+    0.75, {0.0, 0.2, 0.5, 0.8, 1.0}, {0.25, 0.4, 0.7, 1.0, 1.3},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {GEARBOX_WEAPON_RPG,
+    1.5, {1.0, 2.0, 3.0, 4.0, 5.0}, {3.0, 4.0, 5.0, 6.0, 7.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {GEARBOX_WEAPON_GLOCK,
+    0.3, {0.0, 0.1, 0.2, 0.3, 0.4}, {0.1, 0.2, 0.3, 0.4, 0.5},
+    0.2, {0.0, 0.0, 0.1, 0.1, 0.2}, {0.1, 0.1, 0.2, 0.2, 0.4}},
+   /* terminator */
+   {0, 0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0},
+       0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}}
+};
+
+bot_fire_delay_t frontline_fire_delay[] = {
+   {FLF_WEAPON_HEGRENADE,
+    0.3, {0.0, 0.1, 0.2, 0.3, 0.4}, {0.1, 0.2, 0.3, 0.4, 0.5},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {FLF_WEAPON_FLASHBANG,
+    0.3, {0.0, 0.1, 0.2, 0.3, 0.4}, {0.1, 0.2, 0.3, 0.4, 0.5},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+//   {FLF_WEAPON_KNIFE,
+//    0.3, {0.0, 0.1, 0.2, 0.3, 0.4}, {0.1, 0.2, 0.3, 0.4, 0.5},
+//    0.2, {0.0, 0.0, 0.1, 0.1, 0.2}, {0.1, 0.1, 0.2, 0.2, 0.4}},
+   {FLF_WEAPON_HK21,
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {FLF_WEAPON_UMP45,
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {FLF_WEAPON_FAMAS,
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {FLF_WEAPON_MSG90,
+    1.2, {0.0, 0.1, 0.2, 0.3, 0.4}, {0.1, 0.2, 0.3, 0.4, 0.5},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {FLF_WEAPON_MP5A2,
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {FLF_WEAPON_AK5,
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {FLF_WEAPON_MP5SD,
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {FLF_WEAPON_M4,
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {FLF_WEAPON_SPAS12,
+    0.9, {0.0, 0.1, 0.2, 0.3, 0.4}, {0.1, 0.2, 0.3, 0.4, 0.5},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {FLF_WEAPON_MAC10,
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {FLF_WEAPON_BERETTA,
+    0.4, {0.0, 0.1, 0.2, 0.3, 0.4}, {0.1, 0.2, 0.3, 0.4, 0.5},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   {FLF_WEAPON_MK23,
+    0.4, {0.0, 0.1, 0.2, 0.3, 0.4}, {0.1, 0.2, 0.3, 0.4, 0.5},
+    0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+   /* terminator */
+   {0, 0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0},
+       0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}}
+};
+bot_fire_delay_t ns_fire_delay[] = {
+	{AVH_WEAPON_GRENADE_GUN,	0.3f,	{0.0, 0.0, 0.0, 0.0, 0.0}, {0.2, 0.3, 0.4, 0.5, 1.0}, 0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+	{AVH_WEAPON_SONIC,	0.0f,	{0.0, 0.0, 0.0, 0.1, 0.3}, {0.0, 0.0, 0.0, 0.2, 0.6}, 0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+	{AVH_WEAPON_HMG,	0.0f,	{0.0, 0.0, 0.0, 0.1, 0.3}, {0.0, 0.0, 0.0, 0.2, 0.6}, 0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+	{AVH_WEAPON_MG,		0.0f,	{0.0, 0.0, 0.0, 0.1, 0.3}, {0.0, 0.0, 0.0, 0.2, 0.6}, 0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+	{AVH_WEAPON_PISTOL,	0.0f,	{0.0, 0.0, 0.0, 0.0, 0.0}, {0.1, 0.15, 0.2, 0.0, 0.0}, 0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+	{AVH_WEAPON_KNIFE,	0.0f,	{0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}, 0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+
+	{AVH_WEAPON_PRIMALSCREAM,			0.0f,	{0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}, 0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+	{AVH_WEAPON_SWIPE,			0.0f,	{0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}, 0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+	{AVH_WEAPON_SPORES,			0.0f,	{0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}, 0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+	{AVH_WEAPON_SPIT,			0.0f,	{0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}, 0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+	{AVH_WEAPON_CLAWS,			0.0f,	{0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.4, 0.5}, 0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+	{AVH_WEAPON_BITE,			0.0f,	{0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}, 0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+	{AVH_ABILITY_LEAP,			0.0f,	{0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}, 0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}},
+	{AVH_WEAPON_SPIKE,			0.0f,	{0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}, 0.0, {0.0, 0.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 0.0, 0.0}}
+};
+
+void BotCheckTeamplay(void)
+{
+   // is this TFC or Counter-Strike or OpFor teamplay or FrontLineForce?
+   if ((mod_id == TFC_DLL) || (mod_id == CSTRIKE_DLL) ||
+       ((mod_id == GEARBOX_DLL) && (pent_info_ctfdetect != NULL)) ||
+       (mod_id == FRONTLINE_DLL) ||
+	   (mod_id == AVH_DLL) )
+      is_team_play = 1.0;
+   else
+      is_team_play = CVAR_GET_FLOAT("mp_teamplay");  // teamplay enabled?
+
+   checked_teamplay = TRUE;
+}
+
+
+edict_t *BotFindEnemy( bot_t *pBot )
+{
+   Vector vecEnd;
+   static bool flag=TRUE;
+   edict_t *pent = NULL;
+   edict_t *pNewEnemy;
+   float nearestdistance;
+   int i;
+
+   edict_t *pEdict = pBot->pEdict;
+
+   if(pBot->mBotPlayMode != PLAYMODE_PLAYING)
+   {
+	   pBot->pBotEnemy = NULL;
+   }
+
+   if (pBot->pBotEnemy != NULL)  // does the bot already have an enemy?
+   {
+      vecEnd = pBot->pBotEnemy->v.origin + pBot->pBotEnemy->v.view_ofs;
+
+      // if the enemy is dead?
+      if (!IsAlive(pBot->pBotEnemy))  // is the enemy dead?, assume bot killed it
+      {
+         // the enemy is dead, jump for joy about 10% of the time
+         if (RANDOM_LONG(1, 100) <= 10)
+            pEdict->v.button |= IN_JUMP;
+
+		 // Taunt sometimes after a kill
+		 if(RANDOM_LONG(1, 5) == 1)
+		 {
+			 pBot->mTimeOfNextTaunt = gpGlobals->time + RANDOM_FLOAT(.3f, 4.0f);
+		 }
+
+         // don't have an enemy anymore so null out the pointer...
+         pBot->pBotEnemy = NULL;
+      }
+      else if (FInViewCone( &vecEnd, pEdict ) &&
+               FVisible( vecEnd, pEdict ))
+      {
+         if ((mod_id == TFC_DLL) &&
+             (pEdict->v.playerclass == TFC_CLASS_MEDIC))
+         {
+            if (pBot->pBotEnemy->v.health >= pBot->pBotEnemy->v.max_health)
+            {
+               pBot->pBotEnemy = NULL;  // player is healed, null out pointer
+            }
+         }
+         else
+         {
+            // if enemy is still visible and in field of view, keep it
+
+            // face the enemy
+            Vector v_enemy = pBot->pBotEnemy->v.origin - pEdict->v.origin;
+            Vector bot_angles = UTIL_VecToAngles( v_enemy );
+
+            pEdict->v.ideal_yaw = bot_angles.y;
+
+            BotFixIdealYaw(pEdict);
+
+            // keep track of when we last saw an enemy
+            pBot->f_bot_see_enemy_time = gpGlobals->time;
+
+            return (pBot->pBotEnemy);
+         }
+      }
+   }
+
+   pent = NULL;
+   pNewEnemy = NULL;
+   nearestdistance = 1000;
+
+   if (mod_id == TFC_DLL)
+   {
+      if (pEdict->v.playerclass == TFC_CLASS_MEDIC)
+      {
+         // search the world for players...
+         for (i = 1; i <= gpGlobals->maxClients; i++)
+         {
+            edict_t *pPlayer = INDEXENT(i);
+
+            // skip invalid players and skip self (i.e. this bot)
+            if ((pPlayer) && (!pPlayer->free) && (pPlayer != pEdict))
+            {
+               // skip this player if not alive (i.e. dead or dying)
+               if (!IsAlive(pPlayer))
+                  continue;
+
+               if ((b_observer_mode) && !(pPlayer->v.flags & FL_FAKECLIENT))
+                  continue;
+
+               int player_team = UTIL_GetTeam(pPlayer);
+               int bot_team = UTIL_GetTeam(pEdict);
+
+               // don't target your enemies...
+               if ((bot_team != player_team) &&
+                   !(team_allies[bot_team] & (1<<player_team)))
+                  continue;
+
+               // check if player needs to be healed...
+               if ((pPlayer->v.health / pPlayer->v.max_health) > 0.50)
+                  continue;  // health greater than 50% so ignore
+
+               vecEnd = pPlayer->v.origin + pPlayer->v.view_ofs;
+
+               // see if bot can see the player...
+               if (FInViewCone( &vecEnd, pEdict ) &&
+                   FVisible( vecEnd, pEdict ))
+               {
+                  float distance = (pPlayer->v.origin - pEdict->v.origin).Length();
+
+                  if (distance < nearestdistance)
+                  {
+                     nearestdistance = distance;
+                     pNewEnemy = pPlayer;
+
+                     pBot->pBotUser = NULL;  // don't follow user when enemy found
+                  }
+               }
+            }
+         }
+      }
+
+      if (pNewEnemy == NULL)
+      {
+         while ((pent = UTIL_FindEntityByClassname( pent, "building_sentrygun" )) != NULL)
+         {
+            int sentry_team = -1;
+            int bot_team = UTIL_GetTeam(pEdict);
+
+            if (pent->v.colormap == 0xA096)
+               sentry_team = 0;  // blue team's sentry
+            else if (pent->v.colormap == 0x04FA)
+               sentry_team = 1;  // red team's sentry
+            else if (pent->v.colormap == 0x372D)
+               sentry_team = 2;  // yellow team's sentry
+            else if (pent->v.colormap == 0x6E64)
+               sentry_team = 3;  // green team's sentry
+
+            // don't target your own team's sentry guns...
+            if (bot_team == sentry_team)
+               continue;
+
+            // don't target your allie's sentry guns either...
+            if (team_allies[bot_team] & (1<<sentry_team))
+               continue;
+
+            vecEnd = pent->v.origin + pent->v.view_ofs;
+
+            // is this sentry gun visible?
+            if (FInViewCone( &vecEnd, pEdict ) &&
+                FVisible( vecEnd, pEdict ))
+            {
+               float distance = (pent->v.origin - pEdict->v.origin).Length();
+
+               // is this the closest sentry gun?
+               if (distance < nearestdistance)
+               {
+                  nearestdistance = distance;
+                  pNewEnemy = pent;
+
+                  pBot->pBotUser = NULL;  // don't follow user when enemy found
+               }
+            }
+         }
+      }
+   }
+
+   if (pNewEnemy == NULL)
+   {
+      nearestdistance = 2500;
+
+      // search the world for players...(and enemies)
+      //for (i = 1; i <= gpGlobals->maxClients; i++)
+      for (i = 1; i <= gpGlobals->maxEntities; i++)
+      {
+         edict_t *pEntity = INDEXENT(i);
+
+         // skip invalid players and skip self (i.e. this bot)
+         if ((pEntity) && (!pEntity->free) && (pEntity != pEdict) && (FBitSet(pEntity->v.flags, FL_MONSTER) || FBitSet(pEntity->v.flags, FL_CLIENT)))
+         {
+			 // Skip webs?
+			 const char* theClassName = STRING(pEntity->v.classname);
+
+			 // Skip cloaked players
+//			 if(pEntity->v.iuser4 & MASK_ALIEN_CLOAKED)
+//				 continue;
+			 
+            // skip this player if not alive (i.e. dead or dying)
+            if (!IsAlive(pEntity))
+               continue;
+
+            if ((b_observer_mode) && !(pEntity->v.flags & FL_FAKECLIENT))
+               continue;
+
+            if (!checked_teamplay)  // check for team play...
+               BotCheckTeamplay();
+
+            // is team play enabled?
+            if (is_team_play > 0.0)
+            {
+               int player_team = UTIL_GetTeam(pEntity);
+               int bot_team = UTIL_GetTeam(pEdict);
+
+               // don't target your teammates...
+               if (bot_team == player_team)
+                  continue;
+
+               if (mod_id == TFC_DLL)
+               {
+                  // don't target your allies either...
+                  if (team_allies[bot_team] & (1<<player_team))
+                     continue;
+               }
+            }
+
+            vecEnd = pEntity->v.origin + pEntity->v.view_ofs;
+
+			float theDistance = (pEdict->v.origin - pEntity->v.origin).Length();
+
+            // see if bot can see the player...
+            if ((FInViewCone( &vecEnd, pEdict ) &&
+                FVisible( vecEnd, pEdict )) || (theDistance < 32))
+            {
+               float distance = (pEntity->v.origin - pEdict->v.origin).Length();
+               if (distance < nearestdistance)
+               {
+                  nearestdistance = distance;
+                  pNewEnemy = pEntity;
+
+                  pBot->pBotUser = NULL;  // don't follow user when enemy found
+               }
+            }
+         }
+      }
+   }
+
+   if (pNewEnemy)
+   {
+      // face the enemy
+      Vector v_enemy = pNewEnemy->v.origin - pEdict->v.origin;
+      Vector bot_angles = UTIL_VecToAngles( v_enemy );
+
+      pEdict->v.ideal_yaw = bot_angles.y;
+
+      BotFixIdealYaw(pEdict);
+
+      // keep track of when we last saw an enemy
+      pBot->f_bot_see_enemy_time = gpGlobals->time;
+   }
+
+   // has the bot NOT seen an ememy for at least 5 seconds (time to reload)?
+   if ((pBot->f_bot_see_enemy_time > 0) &&
+       ((pBot->f_bot_see_enemy_time + 5.0) <= gpGlobals->time))
+   {
+      pBot->f_bot_see_enemy_time = -1;  // so we won't keep reloading
+
+      if ((mod_id == VALVE_DLL) || (mod_id == GEARBOX_DLL) || (mod_id == AVH_DLL))
+      {
+         pEdict->v.button |= IN_RELOAD;  // press reload button
+      }
+   }
+
+   return (pNewEnemy);
+}
+
+
+Vector BotBodyTarget( edict_t *pBotEnemy, bot_t *pBot )
+{
+   Vector target;
+   float f_distance;
+   float f_scale;
+   int d_x = 0;
+   int d_y = 0;
+   int d_z = 0;
+
+   edict_t *pEdict = pBot->pEdict;
+
+   f_distance = (pBotEnemy->v.origin - pEdict->v.origin).Length();
+
+   if (f_distance > 1000)
+      f_scale = 1.0;
+   else if (f_distance > 100)
+      f_scale = f_distance / 1000.0;
+   else
+      f_scale = 0.1;
+
+   switch (pBot->bot_skill)
+   {
+      case 0:
+         // VERY GOOD, same as from CBasePlayer::BodyTarget (in player.h)
+         target = pBotEnemy->v.origin + pBotEnemy->v.view_ofs * RANDOM_FLOAT( 0.5, 1.1 );
+         d_x = 0;  // no offset
+         d_y = 0;
+         d_z = 0;
+         break;
+      case 1:
+         // GOOD, offset a little for x, y, and z
+         target = pBotEnemy->v.origin + pBotEnemy->v.view_ofs;  // aim for the head (if you can find it)
+         d_x = RANDOM_FLOAT(-5, 5) * f_scale;
+         d_y = RANDOM_FLOAT(-5, 5) * f_scale;
+         d_z = RANDOM_FLOAT(-10, 10) * f_scale;
+         break;
+      case 2:
+         // FAIR, offset somewhat for x, y, and z
+         target = pBotEnemy->v.origin;  // aim for the body
+         d_x = RANDOM_FLOAT(-10, 10) * f_scale;
+         d_y = RANDOM_FLOAT(-10, 10) * f_scale;
+         d_z = RANDOM_FLOAT(-18, 18) * f_scale;
+         break;
+      case 3:
+         // POOR, offset for x, y, and z
+         target = pBotEnemy->v.origin;  // aim for the body
+         d_x = RANDOM_FLOAT(-20, 20) * f_scale;
+         d_y = RANDOM_FLOAT(-20, 20) * f_scale;
+         d_z = RANDOM_FLOAT(-32, 32) * f_scale;
+         break;
+      case 4:
+         // BAD, offset lots for x, y, and z
+         target = pBotEnemy->v.origin;  // aim for the body
+         d_x = RANDOM_FLOAT(-35, 35) * f_scale;
+         d_y = RANDOM_FLOAT(-35, 35) * f_scale;
+         d_z = RANDOM_FLOAT(-50, 50) * f_scale;
+         break;
+   }
+
+   target = target + Vector(d_x, d_y, d_z);
+
+   return target;
+}
+
+
+// specifing a weapon_choice allows you to choose the weapon the bot will
+// use (assuming enough ammo exists for that weapon)
+// BotFireWeapon will return TRUE if weapon was fired, FALSE otherwise
+
+bool BotFireWeapon( Vector v_enemy, bot_t *pBot, int weapon_choice)
+{
+   bot_weapon_select_t *pSelect = NULL;
+   bot_fire_delay_t *pDelay = NULL;
+   int select_index;
+   int iId;
+   bool use_primary;
+   bool use_secondary;
+   int use_percent;
+   int primary_percent;
+
+   edict_t *pEdict = pBot->pEdict;
+
+   float distance = v_enemy.Length();  // how far away is the enemy?
+
+   if (mod_id == VALVE_DLL)
+   {
+      pSelect = &valve_weapon_select[0];
+      pDelay = &valve_fire_delay[0];
+   }
+   else if (mod_id == TFC_DLL)
+   {
+      pSelect = &tfc_weapon_select[0];
+      pDelay = &tfc_fire_delay[0];
+   }
+   else if (mod_id == CSTRIKE_DLL)
+   {
+      pSelect = &cs_weapon_select[0];
+      pDelay = &cs_fire_delay[0];
+   }
+   else if (mod_id == GEARBOX_DLL)
+   {
+      pSelect = &gearbox_weapon_select[0];
+      pDelay = &gearbox_fire_delay[0];
+   }
+   else if (mod_id == FRONTLINE_DLL)
+   {
+      pSelect = &frontline_weapon_select[0];
+      pDelay = &frontline_fire_delay[0];
+   }
+   else if (mod_id == AVH_DLL)
+   {
+	   pSelect = &ns_weapon_select[0];
+	   pDelay = &ns_fire_delay[0];
+   }
+
+   if (pSelect)
+   {
+      // are we charging the primary fire?
+      if (pBot->f_primary_charging > 0)
+      {
+         iId = pBot->charging_weapon_id;
+
+         if (mod_id == TFC_DLL)
+         {
+            if (iId == TF_WEAPON_SNIPERRIFLE)
+            {
+               pBot->f_move_speed = 0;  // don't move while using sniper rifle
+            }
+         }
+
+         // is it time to fire the charged weapon?
+         if (pBot->f_primary_charging <= gpGlobals->time)
+         {
+            // we DON'T set pEdict->v.button here to release the
+            // fire button which will fire the charged weapon
+
+            pBot->f_primary_charging = -1;  // -1 means not charging
+
+            // find the correct fire delay for this weapon
+            select_index = 0;
+
+            while ((pSelect[select_index].iId) &&
+                   (pSelect[select_index].iId != iId))
+               select_index++;
+
+            // set next time to shoot
+            int skill = pBot->bot_skill;
+            float base_delay, min_delay, max_delay;
+
+            base_delay = pDelay[select_index].primary_base_delay;
+            min_delay = pDelay[select_index].primary_min_delay[skill];
+            max_delay = pDelay[select_index].primary_max_delay[skill];
+
+            pBot->f_shoot_time = gpGlobals->time + base_delay +
+               RANDOM_FLOAT(min_delay, max_delay);
+
+            return TRUE;
+         }
+         else
+         {
+            pEdict->v.button |= IN_ATTACK;   // charge the weapon
+            pBot->f_shoot_time = gpGlobals->time;  // keep charging
+
+            return TRUE;
+         }
+      }
+
+      // are we charging the secondary fire?
+      if (pBot->f_secondary_charging > 0)
+      {
+         iId = pBot->charging_weapon_id;
+
+         // is it time to fire the charged weapon?
+         if (pBot->f_secondary_charging <= gpGlobals->time)
+         {
+            // we DON'T set pEdict->v.button here to release the
+            // fire button which will fire the charged weapon
+
+            pBot->f_secondary_charging = -1;  // -1 means not charging
+
+            // find the correct fire delay for this weapon
+            select_index = 0;
+
+            while ((pSelect[select_index].iId) &&
+                   (pSelect[select_index].iId != iId))
+               select_index++;
+
+            // set next time to shoot
+            int skill = pBot->bot_skill;
+            float base_delay, min_delay, max_delay;
+
+            base_delay = pDelay[select_index].secondary_base_delay;
+            min_delay = pDelay[select_index].secondary_min_delay[skill];
+            max_delay = pDelay[select_index].secondary_max_delay[skill];
+
+            pBot->f_shoot_time = gpGlobals->time + base_delay +
+               RANDOM_FLOAT(min_delay, max_delay);
+
+            return TRUE;
+         }
+         else
+         {
+            pEdict->v.button |= IN_ATTACK2;  // charge the weapon
+            pBot->f_shoot_time = gpGlobals->time;  // keep charging
+
+            return TRUE;
+         }
+      }
+
+      select_index = 0;
+
+      // loop through all the weapons until terminator is found...
+      while (pSelect[select_index].iId)
+      {
+         // was a weapon choice specified? (and if so do they NOT match?)
+         if ((weapon_choice != 0) &&
+             (weapon_choice != pSelect[select_index].iId))
+         {
+            select_index++;  // skip to next weapon
+            continue;
+         }
+
+         // is the bot NOT carrying this weapon?
+         if (!(pBot->bot_weapons & (1<<pSelect[select_index].iId)))
+         {
+            select_index++;  // skip to next weapon
+            continue;
+         }   
+
+         // is the bot NOT skilled enough to use this weapon?
+         if ((pBot->bot_skill+1) > pSelect[select_index].skill_level)
+         {
+            select_index++;  // skip to next weapon
+            continue;
+         }
+
+         // is the bot underwater and does this weapon NOT work under water?
+         if ((pEdict->v.waterlevel == 3) &&
+             !(pSelect[select_index].can_use_underwater))
+         {
+            select_index++;  // skip to next weapon
+            continue;
+         }
+
+         use_percent = RANDOM_LONG(1, 100);
+
+         // is use percent greater than weapon use percent?
+         if (use_percent > pSelect[select_index].use_percent)
+         {
+            select_index++;  // skip to next weapon
+            continue;
+         }
+
+         iId = pSelect[select_index].iId;
+         use_primary = FALSE;
+         use_secondary = FALSE;
+         primary_percent = RANDOM_LONG(1, 100);
+
+         // is primary percent less than weapon primary percent AND
+         // no ammo required for this weapon OR
+            // enough ammo available to fire AND
+         // the bot is far enough away to use primary fire AND
+         // the bot is close enough to the enemy to use primary fire
+
+         if ((primary_percent <= pSelect[select_index].primary_fire_percent) &&
+             ((weapon_defs[iId].iAmmo1 == -1) ||
+              (pBot->m_rgAmmo[weapon_defs[iId].iAmmo1] >=
+               pSelect[select_index].min_primary_ammo)) &&
+             (distance >= pSelect[select_index].primary_min_distance) &&
+             (distance <= pSelect[select_index].primary_max_distance))
+         {
+            use_primary = TRUE;
+         }
+
+         // otherwise see if there is enough secondary ammo AND
+         // the bot is far enough away to use secondary fire AND
+         // the bot is close enough to the enemy to use secondary fire
+
+         else if (((weapon_defs[iId].iAmmo2 == -1) ||
+                   (pBot->m_rgAmmo[weapon_defs[iId].iAmmo2] >=
+                    pSelect[select_index].min_secondary_ammo)) &&
+                  (distance >= pSelect[select_index].secondary_min_distance) &&
+                  (distance <= pSelect[select_index].secondary_max_distance))
+         {
+            use_secondary = TRUE;
+         }
+
+         // see if there wasn't enough ammo to fire the weapon...
+         if ((use_primary == FALSE) && (use_secondary == FALSE))
+         {
+            select_index++;  // skip to next weapon
+            continue;
+         }
+
+         // select this weapon if it isn't already selected
+         if (pBot->current_weapon.iId != iId)
+            UTIL_SelectItem(pEdict, pSelect[select_index].weapon_name);
+
+         if (pDelay[select_index].iId != iId)
+         {
+            char msg[80];
+            sprintf(msg, "fire_delay mismatch for weapon id=%d\n",iId);
+            ALERT(at_console, msg);
+
+            return FALSE;
+         }
+
+         if (mod_id == TFC_DLL)
+         {
+            if (iId == TF_WEAPON_SNIPERRIFLE)
+            {
+               pBot->f_move_speed = 0;  // don't move while using sniper rifle
+
+               if (pEdict->v.velocity.Length() > 50)
+               {
+                  return FALSE;  // don't press attack key until velocity is < 50
+               }
+            }
+
+            if (pEdict->v.playerclass == TFC_CLASS_MEDIC)
+            {
+               int player_team = UTIL_GetTeam(pBot->pBotEnemy);
+               int bot_team = UTIL_GetTeam(pEdict);
+
+               // only heal your teammates or allies...
+               if (((bot_team == player_team) ||
+                    (team_allies[bot_team] & (1<<player_team))) &&
+                   (iId != TF_WEAPON_MEDIKIT))
+               {
+                  return FALSE;  // don't "fire" unless weapon is medikit
+               }
+            }
+         }
+
+         if (use_primary)
+         {
+            pEdict->v.button |= IN_ATTACK;  // use primary attack
+
+            if (pSelect[select_index].primary_fire_charge)
+            {
+               pBot->charging_weapon_id = iId;
+
+               // release primary fire after the appropriate delay...
+               pBot->f_primary_charging = gpGlobals->time +
+                              pSelect[select_index].primary_charge_delay;
+
+               pBot->f_shoot_time = gpGlobals->time;  // keep charging
+            }
+            else
+            {
+               // set next time to shoot
+               if (pSelect[select_index].primary_fire_hold)
+                  pBot->f_shoot_time = gpGlobals->time;  // don't let button up
+               else
+               {
+                  int skill = pBot->bot_skill;
+                  float base_delay, min_delay, max_delay;
+
+                  base_delay = pDelay[select_index].primary_base_delay;
+                  min_delay = pDelay[select_index].primary_min_delay[skill];
+                  max_delay = pDelay[select_index].primary_max_delay[skill];
+
+                  pBot->f_shoot_time = gpGlobals->time + base_delay +
+                     RANDOM_FLOAT(min_delay, max_delay);
+               }
+            }
+         }
+         else  // MUST be use_secondary...
+         {
+            pEdict->v.button |= IN_ATTACK2;  // use secondary attack
+
+            if (pSelect[select_index].secondary_fire_charge)
+            {
+               pBot->charging_weapon_id = iId;
+
+               // release secondary fire after the appropriate delay...
+               pBot->f_secondary_charging = gpGlobals->time +
+                              pSelect[select_index].secondary_charge_delay;
+
+               pBot->f_shoot_time = gpGlobals->time;  // keep charging
+            }
+            else
+            {
+               // set next time to shoot
+               if (pSelect[select_index].secondary_fire_hold)
+                  pBot->f_shoot_time = gpGlobals->time;  // don't let button up
+               else
+               {
+                  int skill = pBot->bot_skill;
+                  float base_delay, min_delay, max_delay;
+
+                  base_delay = pDelay[select_index].secondary_base_delay;
+                  min_delay = pDelay[select_index].secondary_min_delay[skill];
+                  max_delay = pDelay[select_index].secondary_max_delay[skill];
+
+                  pBot->f_shoot_time = gpGlobals->time + base_delay +
+                     RANDOM_FLOAT(min_delay, max_delay);
+               }
+            }
+         }
+
+         return TRUE;  // weapon was fired
+      }
+   }
+
+   // didn't have any available weapons or ammo, return FALSE
+   return FALSE;
+}
+
+
+void BotShootAtEnemy( bot_t *pBot )
+{
+   float f_distance;
+
+   edict_t *pEdict = pBot->pEdict;
+
+   // aim for the head and/or body
+   Vector v_enemy = BotBodyTarget( pBot->pBotEnemy, pBot ) - GetGunPosition(pEdict);
+
+   pEdict->v.v_angle = UTIL_VecToAngles( v_enemy );
+
+   if (pEdict->v.v_angle.y > 180)
+      pEdict->v.v_angle.y -=360;
+
+   // Paulo-La-Frite - START bot aiming bug fix
+   if (pEdict->v.v_angle.x > 180)
+      pEdict->v.v_angle.x -=360;
+
+   // set the body angles to point the gun correctly
+   pEdict->v.angles.x = pEdict->v.v_angle.x / 3;
+   pEdict->v.angles.y = pEdict->v.v_angle.y;
+   pEdict->v.angles.z = 0;
+
+   // adjust the view angle pitch to aim correctly (MUST be after body v.angles stuff)
+   pEdict->v.v_angle.x = -pEdict->v.v_angle.x;
+   // Paulo-La-Frite - END
+
+   float x = pEdict->v.v_angle.y;
+   if (x > 180) x -= 360;
+   if (abs(pEdict->v.ideal_yaw - x) > 2.0)
+      fp = NULL;
+
+   pEdict->v.ideal_yaw = pEdict->v.v_angle.y;
+
+   BotFixIdealYaw(pEdict);
+
+
+   v_enemy.z = 0;  // ignore z component (up & down)
+
+   f_distance = v_enemy.Length();  // how far away is the enemy scum?
+
+   if (f_distance > 200)      // run if distance to enemy is far
+      pBot->f_move_speed = pBot->f_max_speed;
+   else if (f_distance > 20)  // walk if distance is closer
+      pBot->f_move_speed = pBot->f_max_speed / 2;
+   else                     // don't move if close enough
+      pBot->f_move_speed = 0.0;
+
+
+   // is it time to shoot yet?
+   if (pBot->f_shoot_time <= gpGlobals->time)
+   {
+      // select the best weapon to use at this distance and fire...
+      BotFireWeapon(v_enemy, pBot, 0);
+   }
+}
+
+
+bool BotShootTripmine( bot_t *pBot )
+{
+   edict_t *pEdict = pBot->pEdict;
+
+   if (pBot->b_shoot_tripmine != TRUE)
+      return FALSE;
+
+   // aim at the tripmine and fire the glock...
+
+   Vector v_enemy = pBot->v_tripmine - GetGunPosition( pEdict );
+
+   pEdict->v.v_angle = UTIL_VecToAngles( v_enemy );
+
+   if (pEdict->v.v_angle.y > 180)
+      pEdict->v.v_angle.y -=360;
+
+   // Paulo-La-Frite - START bot aiming bug fix
+   if (pEdict->v.v_angle.x > 180)
+      pEdict->v.v_angle.x -=360;
+
+   // set the body angles to point the gun correctly
+   pEdict->v.angles.x = pEdict->v.v_angle.x / 3;
+   pEdict->v.angles.y = pEdict->v.v_angle.y;
+   pEdict->v.angles.z = 0;
+
+   // adjust the view angle pitch to aim correctly (MUST be after body v.angles stuff)
+   pEdict->v.v_angle.x = -pEdict->v.v_angle.x;
+   // Paulo-La-Frite - END
+
+   pEdict->v.ideal_yaw = pEdict->v.v_angle.y;
+
+   BotFixIdealYaw(pEdict);
+
+   return (BotFireWeapon( v_enemy, pBot, VALVE_WEAPON_GLOCK ));
+}
+
diff --git a/main/source/HPB_bot/dlls/bot_func.h b/main/source/HPB_bot/dlls/bot_func.h
new file mode 100644
index 00000000..c7427485
--- /dev/null
+++ b/main/source/HPB_bot/dlls/bot_func.h
@@ -0,0 +1,52 @@
+//
+// HPB_bot - botman's High Ping Bastard bot
+//
+// (http://planethalflife.com/botman/)
+//
+// bot_func.h
+//
+
+#ifndef BOT_FUNC_H
+#define BOT_FUNC_H
+
+
+//prototypes of bot functions...
+
+void BotSpawnInit( bot_t *pBot );
+void BotCreate( edict_t *pPlayer, const char *arg1, const char *arg2,
+                const char *arg3, const char *arg4 );
+void BotStartGame( bot_t *pBot );
+int BotInFieldOfView( bot_t *pBot, Vector dest );
+bool BotEntityIsVisible( bot_t *pBot, Vector dest );
+void BotFindItem( bot_t *pBot );
+void BotThink( bot_t *pBot );
+
+
+void BotFixIdealPitch( edict_t *pEdict );
+float BotChangePitch( bot_t *pBot, float speed );
+void BotFixIdealYaw( edict_t *pEdict );
+float BotChangeYaw( bot_t *pBot, float speed );
+bool BotFindWaypoint( bot_t *pBot );
+bool BotHeadTowardWaypoint( bot_t *pBot );
+void BotOnLadder( bot_t *pBot, float moved_distance );
+void BotUnderWater( bot_t *pBot );
+void BotUseLift( bot_t *pBot, float moved_distance );
+bool BotStuckInCorner( bot_t *pBot );
+void BotTurnAtWall( bot_t *pBot, TraceResult *tr );
+bool BotCantMoveForward( bot_t *pBot, TraceResult *tr );
+bool BotCanJumpUp( bot_t *pBot );
+bool BotCanDuckUnder( bot_t *pBot );
+void BotRandomTurn( bot_t *pBot );
+bool BotFollowUser( bot_t *pBot );
+bool BotCheckWallOnLeft( bot_t *pBot );
+bool BotCheckWallOnRight( bot_t *pBot );
+
+edict_t *BotFindEnemy( bot_t *pBot );
+Vector BotBodyTarget( edict_t *pBotEnemy, bot_t *pBot );
+bool BotFireWeapon( Vector v_enemy, bot_t *pBot, int weapon_choice);
+void BotShootAtEnemy( bot_t *pBot );
+bool BotShootTripmine( bot_t *pBot );
+
+
+#endif // BOT_FUNC_H
+
diff --git a/main/source/HPB_bot/dlls/bot_navigate.cpp b/main/source/HPB_bot/dlls/bot_navigate.cpp
new file mode 100644
index 00000000..1f9672db
--- /dev/null
+++ b/main/source/HPB_bot/dlls/bot_navigate.cpp
@@ -0,0 +1,1094 @@
+//
+// HPB bot - botman's High Ping Bastard bot
+//
+// (http://planethalflife.com/botman/)
+//
+// bot_navigate.cpp
+//
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+
+#include "bot.h"
+#include "bot_func.h"
+#include "waypoint.h"
+
+
+extern int mod_id;
+extern WAYPOINT waypoints[MAX_WAYPOINTS];
+extern int num_waypoints;  // number of waypoints currently in use
+extern int team_allies[4];
+extern edict_t *pent_info_ctfdetect;
+extern float is_team_play;
+extern bool checked_teamplay;
+extern FLAG_S flags[MAX_FLAGS];
+extern int num_flags;
+
+extern int flf_bug_fix;
+
+static FILE *fp;
+
+
+
+void BotFixIdealPitch(edict_t *pEdict)
+{
+   // check for wrap around of angle...
+   if (pEdict->v.idealpitch > 180)
+      pEdict->v.idealpitch -= 360;
+
+   if (pEdict->v.idealpitch < -180)
+      pEdict->v.idealpitch += 360;
+}
+
+
+float BotChangePitch( bot_t *pBot, float speed )
+{
+   edict_t *pEdict = pBot->pEdict;
+   float ideal;
+   float current;
+   float current_180;  // current +/- 180 degrees
+   float diff;
+
+   // turn from the current v_angle pitch to the idealpitch by selecting
+   // the quickest way to turn to face that direction
+   
+   current = pEdict->v.v_angle.x;
+
+   ideal = pEdict->v.idealpitch;
+
+   // find the difference in the current and ideal angle
+   diff = abs(current - ideal);
+
+   // check if the bot is already facing the idealpitch direction...
+   if (diff <= 1)
+      return diff;  // return number of degrees turned
+
+   // check if difference is less than the max degrees per turn
+   if (diff < speed)
+      speed = diff;  // just need to turn a little bit (less than max)
+
+   // here we have four cases, both angle positive, one positive and
+   // the other negative, one negative and the other positive, or
+   // both negative.  handle each case separately...
+
+   if ((current >= 0) && (ideal >= 0))  // both positive
+   {
+      if (current > ideal)
+         current -= speed;
+      else
+         current += speed;
+   }
+   else if ((current >= 0) && (ideal < 0))
+   {
+      current_180 = current - 180;
+
+      if (current_180 > ideal)
+         current += speed;
+      else
+         current -= speed;
+   }
+   else if ((current < 0) && (ideal >= 0))
+   {
+      current_180 = current + 180;
+      if (current_180 > ideal)
+         current += speed;
+      else
+         current -= speed;
+   }
+   else  // (current < 0) && (ideal < 0)  both negative
+   {
+      if (current > ideal)
+         current -= speed;
+      else
+         current += speed;
+   }
+
+   // check for wrap around of angle...
+   if (current > 180)
+      current -= 360;
+   if (current < -180)
+      current += 360;
+
+   pEdict->v.v_angle.x = current;
+
+   return speed;  // return number of degrees turned
+}
+
+
+void BotFixIdealYaw(edict_t *pEdict)
+{
+   // check for wrap around of angle...
+   if (pEdict->v.ideal_yaw > 180)
+      pEdict->v.ideal_yaw -= 360;
+
+   if (pEdict->v.ideal_yaw < -180)
+      pEdict->v.ideal_yaw += 360;
+}
+
+
+float BotChangeYaw( bot_t *pBot, float speed )
+{
+   edict_t *pEdict = pBot->pEdict;
+   float ideal;
+   float current;
+   float current_180;  // current +/- 180 degrees
+   float diff;
+
+   // turn from the current v_angle yaw to the ideal_yaw by selecting
+   // the quickest way to turn to face that direction
+   
+   current = pEdict->v.v_angle.y;
+
+   ideal = pEdict->v.ideal_yaw;
+
+   // find the difference in the current and ideal angle
+   diff = abs(current - ideal);
+
+   // check if the bot is already facing the ideal_yaw direction...
+   if (diff <= 1)
+      return diff;  // return number of degrees turned
+
+   // check if difference is less than the max degrees per turn
+   if (diff < speed)
+      speed = diff;  // just need to turn a little bit (less than max)
+
+   // here we have four cases, both angle positive, one positive and
+   // the other negative, one negative and the other positive, or
+   // both negative.  handle each case separately...
+
+   if ((current >= 0) && (ideal >= 0))  // both positive
+   {
+      if (current > ideal)
+         current -= speed;
+      else
+         current += speed;
+   }
+   else if ((current >= 0) && (ideal < 0))
+   {
+      current_180 = current - 180;
+
+      if (current_180 > ideal)
+         current += speed;
+      else
+         current -= speed;
+   }
+   else if ((current < 0) && (ideal >= 0))
+   {
+      current_180 = current + 180;
+      if (current_180 > ideal)
+         current += speed;
+      else
+         current -= speed;
+   }
+   else  // (current < 0) && (ideal < 0)  both negative
+   {
+      if (current > ideal)
+         current -= speed;
+      else
+         current += speed;
+   }
+
+   // check for wrap around of angle...
+   if (current > 180)
+      current -= 360;
+   if (current < -180)
+      current += 360;
+
+   pEdict->v.v_angle.y = current;
+
+   return speed;  // return number of degrees turned
+}
+
+
+bool BotFindWaypoint( bot_t *pBot )
+{
+   // Do whatever you want here to find the next waypoint that the
+   // bot should head towards
+
+   return FALSE;  // couldn't find a waypoint
+}
+
+
+bool BotHeadTowardWaypoint( bot_t *pBot )
+{
+   // You could do other stuff here if you needed to.
+
+   // This would probably be a good place to check to see how close to a
+   // the current waypoint the bot is, and if the bot is close enough to
+   // the desired waypoint then call BotFindWaypoint to find the next one.
+
+   if (BotFindWaypoint(pBot))
+      return TRUE;
+   else
+      return FALSE;
+}
+
+
+void BotOnLadder( bot_t *pBot, float moved_distance )
+{
+   Vector v_src, v_dest, view_angles;
+   TraceResult tr;
+   float angle = 0.0;
+   bool done = FALSE;
+
+   edict_t *pEdict = pBot->pEdict;
+
+   // check if the bot has JUST touched this ladder...
+   if (pBot->ladder_dir == LADDER_UNKNOWN)
+   {
+      // try to square up the bot on the ladder...
+      while ((!done) && (angle < 180.0))
+      {
+         // try looking in one direction (forward + angle)
+         view_angles = pEdict->v.v_angle;
+         view_angles.y = pEdict->v.v_angle.y + angle;
+
+         if (view_angles.y < 0.0)
+            view_angles.y += 360.0;
+         if (view_angles.y > 360.0)
+            view_angles.y -= 360.0;
+
+         UTIL_MakeVectors( view_angles );
+
+         v_src = pEdict->v.origin + pEdict->v.view_ofs;
+         v_dest = v_src + gpGlobals->v_forward * 30;
+
+         UTIL_TraceLine( v_src, v_dest, dont_ignore_monsters,
+                         pEdict->v.pContainingEntity, &tr);
+
+         if (tr.flFraction < 1.0)  // hit something?
+         {
+            if (strcmp("func_wall", STRING(tr.pHit->v.classname)) == 0)
+            {
+               // square up to the wall...
+               view_angles = UTIL_VecToAngles(tr.vecPlaneNormal);
+
+               // Normal comes OUT from wall, so flip it around...
+               view_angles.y += 180;
+
+               if (view_angles.y > 180)
+                  view_angles.y -= 360;
+
+               pEdict->v.ideal_yaw = view_angles.y;
+
+               BotFixIdealYaw(pEdict);
+
+               done = TRUE;
+            }
+         }
+         else
+         {
+            // try looking in the other direction (forward - angle)
+            view_angles = pEdict->v.v_angle;
+            view_angles.y = pEdict->v.v_angle.y - angle;
+
+            if (view_angles.y < 0.0)
+               view_angles.y += 360.0;
+            if (view_angles.y > 360.0)
+               view_angles.y -= 360.0;
+
+            UTIL_MakeVectors( view_angles );
+
+            v_src = pEdict->v.origin + pEdict->v.view_ofs;
+            v_dest = v_src + gpGlobals->v_forward * 30;
+
+            UTIL_TraceLine( v_src, v_dest, dont_ignore_monsters,
+                            pEdict->v.pContainingEntity, &tr);
+
+            if (tr.flFraction < 1.0)  // hit something?
+            {
+               if (strcmp("func_wall", STRING(tr.pHit->v.classname)) == 0)
+               {
+                  // square up to the wall...
+                  view_angles = UTIL_VecToAngles(tr.vecPlaneNormal);
+
+                  // Normal comes OUT from wall, so flip it around...
+                  view_angles.y += 180;
+
+                  if (view_angles.y > 180)
+                     view_angles.y -= 360;
+
+                  pEdict->v.ideal_yaw = view_angles.y;
+
+                  BotFixIdealYaw(pEdict);
+
+                  done = TRUE;
+               }
+            }
+         }
+
+         angle += 10;
+      }
+
+      if (!done)  // if didn't find a wall, just reset ideal_yaw...
+      {
+         // set ideal_yaw to current yaw (so bot won't keep turning)
+         pEdict->v.ideal_yaw = pEdict->v.v_angle.y;
+
+         BotFixIdealYaw(pEdict);
+      }
+   }
+
+   // moves the bot up or down a ladder.  if the bot can't move
+   // (i.e. get's stuck with someone else on ladder), the bot will
+   // change directions and go the other way on the ladder.
+
+   if (pBot->ladder_dir == LADDER_UP)  // is the bot currently going up?
+   {
+      pEdict->v.v_angle.x = -60;  // look upwards
+
+      // check if the bot hasn't moved much since the last location...
+      if ((moved_distance <= 1) && (pBot->prev_speed >= 1.0))
+      {
+         // the bot must be stuck, change directions...
+
+         pEdict->v.v_angle.x = 60;  // look downwards
+         pBot->ladder_dir = LADDER_DOWN;
+      }
+   }
+   else if (pBot->ladder_dir == LADDER_DOWN)  // is the bot currently going down?
+   {
+      pEdict->v.v_angle.x = 60;  // look downwards
+
+      // check if the bot hasn't moved much since the last location...
+      if ((moved_distance <= 1) && (pBot->prev_speed >= 1.0))
+      {
+         // the bot must be stuck, change directions...
+
+         pEdict->v.v_angle.x = -60;  // look upwards
+         pBot->ladder_dir = LADDER_UP;
+      }
+   }
+   else  // the bot hasn't picked a direction yet, try going up...
+   {
+      pEdict->v.v_angle.x = -60;  // look upwards
+      pBot->ladder_dir = LADDER_UP;
+   }
+
+   // move forward (i.e. in the direction the bot is looking, up or down)
+   pEdict->v.button |= IN_FORWARD;
+}
+
+
+void BotUnderWater( bot_t *pBot )
+{
+   bool found_waypoint = FALSE;
+
+   edict_t *pEdict = pBot->pEdict;
+
+   // are there waypoints in this level (and not trying to exit water)?
+   if ((num_waypoints > 0) &&
+       (pBot->f_exit_water_time < gpGlobals->time))
+   {
+      // head towards a waypoint
+      found_waypoint = BotHeadTowardWaypoint(pBot);
+   }
+
+   if (found_waypoint == FALSE)
+   {
+      // handle movements under water.  right now, just try to keep from
+      // drowning by swimming up towards the surface and look to see if
+      // there is a surface the bot can jump up onto to get out of the
+      // water.  bots DON'T like water!
+
+      Vector v_src, v_forward;
+      TraceResult tr;
+      int contents;
+   
+      // swim up towards the surface
+      pEdict->v.v_angle.x = -60;  // look upwards
+   
+      // move forward (i.e. in the direction the bot is looking, up or down)
+      pEdict->v.button |= IN_FORWARD;
+   
+      // set gpGlobals angles based on current view angle (for TraceLine)
+      UTIL_MakeVectors( pEdict->v.v_angle );
+   
+      // look from eye position straight forward (remember: the bot is looking
+      // upwards at a 60 degree angle so TraceLine will go out and up...
+   
+      v_src = pEdict->v.origin + pEdict->v.view_ofs;  // EyePosition()
+      v_forward = v_src + gpGlobals->v_forward * 90;
+   
+      // trace from the bot's eyes straight forward...
+      UTIL_TraceLine( v_src, v_forward, dont_ignore_monsters,
+                      pEdict->v.pContainingEntity, &tr);
+   
+      // check if the trace didn't hit anything (i.e. nothing in the way)...
+      if (tr.flFraction >= 1.0)
+      {
+         // find out what the contents is of the end of the trace...
+         contents = UTIL_PointContents( tr.vecEndPos );
+   
+         // check if the trace endpoint is in open space...
+         if (contents == CONTENTS_EMPTY)
+         {
+            // ok so far, we are at the surface of the water, continue...
+   
+            v_src = tr.vecEndPos;
+            v_forward = v_src;
+            v_forward.z -= 90;
+   
+            // trace from the previous end point straight down...
+            UTIL_TraceLine( v_src, v_forward, dont_ignore_monsters,
+                            pEdict->v.pContainingEntity, &tr);
+   
+            // check if the trace hit something...
+            if (tr.flFraction < 1.0)
+            {
+               contents = UTIL_PointContents( tr.vecEndPos );
+   
+               // if contents isn't water then assume it's land, jump!
+               if (contents != CONTENTS_WATER)
+               {
+                  pEdict->v.button |= IN_JUMP;
+               }
+            }
+         }
+      }
+   }
+}
+
+
+void BotUseLift( bot_t *pBot, float moved_distance )
+{
+   edict_t *pEdict = pBot->pEdict;
+
+   // just need to press the button once, when the flag gets set...
+   if (pBot->f_use_button_time == gpGlobals->time)
+   {
+      pEdict->v.button = IN_USE;
+
+      // face opposite from the button
+      pEdict->v.ideal_yaw += 180;  // rotate 180 degrees
+
+      BotFixIdealYaw(pEdict);
+   }
+
+   // check if the bot has waited too long for the lift to move...
+   if (((pBot->f_use_button_time + 2.0) < gpGlobals->time) &&
+       (!pBot->b_lift_moving))
+   {
+      // clear use button flag
+      pBot->b_use_button = FALSE;
+
+      // bot doesn't have to set f_find_item since the bot
+      // should already be facing away from the button
+
+      pBot->f_move_speed = pBot->f_max_speed;
+   }
+
+   // check if lift has started moving...
+   if ((moved_distance > 1) && (!pBot->b_lift_moving))
+   {
+      pBot->b_lift_moving = TRUE;
+   }
+
+   // check if lift has stopped moving...
+   if ((moved_distance <= 1) && (pBot->b_lift_moving))
+   {
+      TraceResult tr1, tr2;
+      Vector v_src, v_forward, v_right, v_left;
+      Vector v_down, v_forward_down, v_right_down, v_left_down;
+
+      pBot->b_use_button = FALSE;
+
+      // TraceLines in 4 directions to find which way to go...
+
+      UTIL_MakeVectors( pEdict->v.v_angle );
+
+      v_src = pEdict->v.origin + pEdict->v.view_ofs;
+      v_forward = v_src + gpGlobals->v_forward * 90;
+      v_right = v_src + gpGlobals->v_right * 90;
+      v_left = v_src + gpGlobals->v_right * -90;
+
+      v_down = pEdict->v.v_angle;
+      v_down.x = v_down.x + 45;  // look down at 45 degree angle
+
+      UTIL_MakeVectors( v_down );
+
+      v_forward_down = v_src + gpGlobals->v_forward * 100;
+      v_right_down = v_src + gpGlobals->v_right * 100;
+      v_left_down = v_src + gpGlobals->v_right * -100;
+
+      // try tracing forward first...
+      UTIL_TraceLine( v_src, v_forward, dont_ignore_monsters,
+                      pEdict->v.pContainingEntity, &tr1);
+      UTIL_TraceLine( v_src, v_forward_down, dont_ignore_monsters,
+                      pEdict->v.pContainingEntity, &tr2);
+
+      // check if we hit a wall or didn't find a floor...
+      if ((tr1.flFraction < 1.0) || (tr2.flFraction >= 1.0))
+      {
+         // try tracing to the RIGHT side next...
+         UTIL_TraceLine( v_src, v_right, dont_ignore_monsters,
+                         pEdict->v.pContainingEntity, &tr1);
+         UTIL_TraceLine( v_src, v_right_down, dont_ignore_monsters,
+                         pEdict->v.pContainingEntity, &tr2);
+
+         // check if we hit a wall or didn't find a floor...
+         if ((tr1.flFraction < 1.0) || (tr2.flFraction >= 1.0))
+         {
+            // try tracing to the LEFT side next...
+            UTIL_TraceLine( v_src, v_left, dont_ignore_monsters,
+                            pEdict->v.pContainingEntity, &tr1);
+            UTIL_TraceLine( v_src, v_left_down, dont_ignore_monsters,
+                            pEdict->v.pContainingEntity, &tr2);
+
+            // check if we hit a wall or didn't find a floor...
+            if ((tr1.flFraction < 1.0) || (tr2.flFraction >= 1.0))
+            {
+               // only thing to do is turn around...
+               pEdict->v.ideal_yaw += 180;  // turn all the way around
+            }
+            else
+            {
+               pEdict->v.ideal_yaw += 90;  // turn to the LEFT
+            }
+         }
+         else
+         {
+            pEdict->v.ideal_yaw -= 90;  // turn to the RIGHT
+         }
+
+         BotFixIdealYaw(pEdict);
+      }
+
+      BotChangeYaw( pBot, pEdict->v.yaw_speed );
+
+      pBot->f_move_speed = pBot->f_max_speed;
+   }
+}
+
+
+bool BotStuckInCorner( bot_t *pBot )
+{
+   TraceResult tr;
+   Vector v_src, v_dest;
+   edict_t *pEdict = pBot->pEdict;
+   
+   UTIL_MakeVectors( pEdict->v.v_angle );
+
+   // trace 45 degrees to the right...
+   v_src = pEdict->v.origin;
+   v_dest = v_src + gpGlobals->v_forward*20 + gpGlobals->v_right*20;
+
+   UTIL_TraceLine( v_src, v_dest, dont_ignore_monsters,
+                   pEdict->v.pContainingEntity, &tr);
+
+   if (tr.flFraction >= 1.0)
+      return FALSE;  // no wall, so not in a corner
+
+   // trace 45 degrees to the left...
+   v_src = pEdict->v.origin;
+   v_dest = v_src + gpGlobals->v_forward*20 - gpGlobals->v_right*20;
+
+   UTIL_TraceLine( v_src, v_dest, dont_ignore_monsters,
+                   pEdict->v.pContainingEntity, &tr);
+
+   if (tr.flFraction >= 1.0)
+      return FALSE;  // no wall, so not in a corner
+
+   return TRUE;  // bot is in a corner
+}
+
+
+void BotTurnAtWall( bot_t *pBot, TraceResult *tr )
+{
+   edict_t *pEdict = pBot->pEdict;
+   Vector Normal;
+   float Y, Y1, Y2, D1, D2, Z;
+
+   // Find the normal vector from the trace result.  The normal vector will
+   // be a vector that is perpendicular to the surface from the TraceResult.
+
+   Normal = UTIL_VecToAngles(tr->vecPlaneNormal);
+
+   // Since the bot keeps it's view angle in -180 < x < 180 degrees format,
+   // and since TraceResults are 0 < x < 360, we convert the bot's view
+   // angle (yaw) to the same format at TraceResult.
+
+   Y = pEdict->v.v_angle.y;
+   Y = Y + 180;
+   if (Y > 359) Y -= 360;
+
+   // Turn the normal vector around 180 degrees (i.e. make it point towards
+   // the wall not away from it.  That makes finding the angles that the
+   // bot needs to turn a little easier.
+
+   Normal.y = Normal.y - 180;
+   if (Normal.y < 0)
+   Normal.y += 360;
+
+   // Here we compare the bots view angle (Y) to the Normal - 90 degrees (Y1)
+   // and the Normal + 90 degrees (Y2).  These two angles (Y1 & Y2) represent
+   // angles that are parallel to the wall surface, but heading in opposite
+   // directions.  We want the bot to choose the one that will require the
+   // least amount of turning (saves time) and have the bot head off in that
+   // direction.
+
+   Y1 = Normal.y - 90;
+   if (RANDOM_LONG(1, 100) <= 50)
+   {
+      Y1 = Y1 - RANDOM_FLOAT(5.0, 20.0);
+   }
+   if (Y1 < 0) Y1 += 360;
+
+   Y2 = Normal.y + 90;
+   if (RANDOM_LONG(1, 100) <= 50)
+   {
+      Y2 = Y2 + RANDOM_FLOAT(5.0, 20.0);
+   }
+   if (Y2 > 359) Y2 -= 360;
+
+   // D1 and D2 are the difference (in degrees) between the bot's current
+   // angle and Y1 or Y2 (respectively).
+
+   D1 = abs(Y - Y1);
+   if (D1 > 179) D1 = abs(D1 - 360);
+   D2 = abs(Y - Y2);
+   if (D2 > 179) D2 = abs(D2 - 360);
+
+   // If difference 1 (D1) is more than difference 2 (D2) then the bot will
+   // have to turn LESS if it heads in direction Y1 otherwise, head in
+   // direction Y2.  I know this seems backwards, but try some sample angles
+   // out on some graph paper and go through these equations using a
+   // calculator, you'll see what I mean.
+
+   if (D1 > D2)
+      Z = Y1;
+   else
+      Z = Y2;
+
+   // convert from TraceResult 0 to 360 degree format back to bot's
+   // -180 to 180 degree format.
+
+   if (Z > 180)
+      Z -= 360;
+
+   // set the direction to head off into...
+   pEdict->v.ideal_yaw = Z;
+
+   BotFixIdealYaw(pEdict);
+}
+
+
+bool BotCantMoveForward( bot_t *pBot, TraceResult *tr )
+{
+   edict_t *pEdict = pBot->pEdict;
+
+   // use some TraceLines to determine if anything is blocking the current
+   // path of the bot.
+
+   Vector v_src, v_forward;
+
+   UTIL_MakeVectors( pEdict->v.v_angle );
+
+   // first do a trace from the bot's eyes forward...
+
+   v_src = pEdict->v.origin + pEdict->v.view_ofs;  // EyePosition()
+   v_forward = v_src + gpGlobals->v_forward * 40;
+
+   // trace from the bot's eyes straight forward...
+   UTIL_TraceLine( v_src, v_forward, dont_ignore_monsters,
+                   pEdict->v.pContainingEntity, tr);
+
+   // check if the trace hit something...
+   if (tr->flFraction < 1.0)
+   {
+      return TRUE;  // bot's head will hit something
+   }
+
+   // bot's head is clear, check at waist level...
+
+   v_src = pEdict->v.origin;
+   v_forward = v_src + gpGlobals->v_forward * 40;
+
+   // trace from the bot's waist straight forward...
+   UTIL_TraceLine( v_src, v_forward, dont_ignore_monsters,
+                   pEdict->v.pContainingEntity, tr);
+
+   // check if the trace hit something...
+   if (tr->flFraction < 1.0)
+   {
+      return TRUE;  // bot's body will hit something
+   }
+
+   return FALSE;  // bot can move forward, return false
+}
+
+
+bool BotCanJumpUp( bot_t *pBot )
+{
+   // What I do here is trace 3 lines straight out, one unit higher than
+   // the highest normal jumping distance.  I trace once at the center of
+   // the body, once at the right side, and once at the left side.  If all
+   // three of these TraceLines don't hit an obstruction then I know the
+   // area to jump to is clear.  I then need to trace from head level,
+   // above where the bot will jump to, downward to see if there is anything
+   // blocking the jump.  There could be a narrow opening that the body
+   // will not fit into.  These horizontal and vertical TraceLines seem
+   // to catch most of the problems with falsely trying to jump on something
+   // that the bot can not get onto.
+
+	// Make flier imitate flight
+	if(pBot->pEdict->v.iuser3 == AVH_USER3_ALIEN_PLAYER3)
+	{
+		if(RANDOM_LONG(0, 2) == 0)
+		{
+			return TRUE;
+		}
+	}
+
+   TraceResult tr;
+   Vector v_jump, v_source, v_dest;
+   edict_t *pEdict = pBot->pEdict;
+
+   // convert current view angle to vectors for TraceLine math...
+
+   v_jump = pEdict->v.v_angle;
+   v_jump.x = 0;  // reset pitch to 0 (level horizontally)
+   v_jump.z = 0;  // reset roll to 0 (straight up and down)
+
+   UTIL_MakeVectors( v_jump );
+
+   // use center of the body first...
+
+   // maximum jump height is 45, so check one unit above that (46)
+   v_source = pEdict->v.origin + Vector(0, 0, -36 + 46);
+   v_dest = v_source + gpGlobals->v_forward * 24;
+
+   // trace a line forward at maximum jump height...
+   UTIL_TraceLine( v_source, v_dest, dont_ignore_monsters,
+                   pEdict->v.pContainingEntity, &tr);
+
+   // if trace hit something, return FALSE
+   if (tr.flFraction < 1.0)
+      return FALSE;
+
+   // now check same height to one side of the bot...
+   v_source = pEdict->v.origin + gpGlobals->v_right * 16 + Vector(0, 0, -36 + 46);
+   v_dest = v_source + gpGlobals->v_forward * 24;
+
+   // trace a line forward at maximum jump height...
+   UTIL_TraceLine( v_source, v_dest, dont_ignore_monsters,
+                   pEdict->v.pContainingEntity, &tr);
+
+   // if trace hit something, return FALSE
+   if (tr.flFraction < 1.0)
+      return FALSE;
+
+   // now check same height on the other side of the bot...
+   v_source = pEdict->v.origin + gpGlobals->v_right * -16 + Vector(0, 0, -36 + 46);
+   v_dest = v_source + gpGlobals->v_forward * 24;
+
+   // trace a line forward at maximum jump height...
+   UTIL_TraceLine( v_source, v_dest, dont_ignore_monsters,
+                   pEdict->v.pContainingEntity, &tr);
+
+   // if trace hit something, return FALSE
+   if (tr.flFraction < 1.0)
+      return FALSE;
+
+   // now trace from head level downward to check for obstructions...
+
+   // start of trace is 24 units in front of bot, 72 units above head...
+   v_source = pEdict->v.origin + gpGlobals->v_forward * 24;
+
+   // offset 72 units from top of head (72 + 36)
+   v_source.z = v_source.z + 108;
+
+   // end point of trace is 99 units straight down from start...
+   // (99 is 108 minus the jump limit height which is 45 - 36 = 9)
+   v_dest = v_source + Vector(0, 0, -99);
+
+   // trace a line straight down toward the ground...
+   UTIL_TraceLine( v_source, v_dest, dont_ignore_monsters,
+                   pEdict->v.pContainingEntity, &tr);
+
+   // if trace hit something, return FALSE
+   if (tr.flFraction < 1.0)
+      return FALSE;
+
+   // now check same height to one side of the bot...
+   v_source = pEdict->v.origin + gpGlobals->v_right * 16 + gpGlobals->v_forward * 24;
+   v_source.z = v_source.z + 108;
+   v_dest = v_source + Vector(0, 0, -99);
+
+   // trace a line straight down toward the ground...
+   UTIL_TraceLine( v_source, v_dest, dont_ignore_monsters,
+                   pEdict->v.pContainingEntity, &tr);
+
+   // if trace hit something, return FALSE
+   if (tr.flFraction < 1.0)
+      return FALSE;
+
+   // now check same height on the other side of the bot...
+   v_source = pEdict->v.origin + gpGlobals->v_right * -16 + gpGlobals->v_forward * 24;
+   v_source.z = v_source.z + 108;
+   v_dest = v_source + Vector(0, 0, -99);
+
+   // trace a line straight down toward the ground...
+   UTIL_TraceLine( v_source, v_dest, dont_ignore_monsters,
+                   pEdict->v.pContainingEntity, &tr);
+
+   // if trace hit something, return FALSE
+   if (tr.flFraction < 1.0)
+      return FALSE;
+
+   return TRUE;
+}
+
+
+bool BotCanDuckUnder( bot_t *pBot )
+{
+   // What I do here is trace 3 lines straight out, one unit higher than
+   // the ducking height.  I trace once at the center of the body, once
+   // at the right side, and once at the left side.  If all three of these
+   // TraceLines don't hit an obstruction then I know the area to duck to
+   // is clear.  I then need to trace from the ground up, 72 units, to make
+   // sure that there is something blocking the TraceLine.  Then we know
+   // we can duck under it.
+
+   TraceResult tr;
+   Vector v_duck, v_source, v_dest;
+   edict_t *pEdict = pBot->pEdict;
+
+   // convert current view angle to vectors for TraceLine math...
+
+   v_duck = pEdict->v.v_angle;
+   v_duck.x = 0;  // reset pitch to 0 (level horizontally)
+   v_duck.z = 0;  // reset roll to 0 (straight up and down)
+
+   UTIL_MakeVectors( v_duck );
+
+   // use center of the body first...
+
+   // duck height is 36, so check one unit above that (37)
+   v_source = pEdict->v.origin + Vector(0, 0, -36 + 37);
+   v_dest = v_source + gpGlobals->v_forward * 24;
+
+   // trace a line forward at duck height...
+   UTIL_TraceLine( v_source, v_dest, dont_ignore_monsters,
+                   pEdict->v.pContainingEntity, &tr);
+
+   // if trace hit something, return FALSE
+   if (tr.flFraction < 1.0)
+      return FALSE;
+
+   // now check same height to one side of the bot...
+   v_source = pEdict->v.origin + gpGlobals->v_right * 16 + Vector(0, 0, -36 + 37);
+   v_dest = v_source + gpGlobals->v_forward * 24;
+
+   // trace a line forward at duck height...
+   UTIL_TraceLine( v_source, v_dest, dont_ignore_monsters,
+                   pEdict->v.pContainingEntity, &tr);
+
+   // if trace hit something, return FALSE
+   if (tr.flFraction < 1.0)
+      return FALSE;
+
+   // now check same height on the other side of the bot...
+   v_source = pEdict->v.origin + gpGlobals->v_right * -16 + Vector(0, 0, -36 + 37);
+   v_dest = v_source + gpGlobals->v_forward * 24;
+
+   // trace a line forward at duck height...
+   UTIL_TraceLine( v_source, v_dest, dont_ignore_monsters,
+                   pEdict->v.pContainingEntity, &tr);
+
+   // if trace hit something, return FALSE
+   if (tr.flFraction < 1.0)
+      return FALSE;
+
+   // now trace from the ground up to check for object to duck under...
+
+   // start of trace is 24 units in front of bot near ground...
+   v_source = pEdict->v.origin + gpGlobals->v_forward * 24;
+   v_source.z = v_source.z - 35;  // offset to feet + 1 unit up
+
+   // end point of trace is 72 units straight up from start...
+   v_dest = v_source + Vector(0, 0, 72);
+
+   // trace a line straight up in the air...
+   UTIL_TraceLine( v_source, v_dest, dont_ignore_monsters,
+                   pEdict->v.pContainingEntity, &tr);
+
+   // if trace didn't hit something, return FALSE
+   if (tr.flFraction >= 1.0)
+      return FALSE;
+
+   // now check same height to one side of the bot...
+   v_source = pEdict->v.origin + gpGlobals->v_right * 16 + gpGlobals->v_forward * 24;
+   v_source.z = v_source.z - 35;  // offset to feet + 1 unit up
+   v_dest = v_source + Vector(0, 0, 72);
+
+   // trace a line straight up in the air...
+   UTIL_TraceLine( v_source, v_dest, dont_ignore_monsters,
+                   pEdict->v.pContainingEntity, &tr);
+
+   // if trace didn't hit something, return FALSE
+   if (tr.flFraction >= 1.0)
+      return FALSE;
+
+   // now check same height on the other side of the bot...
+   v_source = pEdict->v.origin + gpGlobals->v_right * -16 + gpGlobals->v_forward * 24;
+   v_source.z = v_source.z - 35;  // offset to feet + 1 unit up
+   v_dest = v_source + Vector(0, 0, 72);
+
+   // trace a line straight up in the air...
+   UTIL_TraceLine( v_source, v_dest, dont_ignore_monsters,
+                   pEdict->v.pContainingEntity, &tr);
+
+   // if trace didn't hit something, return FALSE
+   if (tr.flFraction >= 1.0)
+      return FALSE;
+
+   return TRUE;
+}
+
+
+void BotRandomTurn( bot_t *pBot )
+{
+   pBot->f_move_speed = 0;  // don't move while turning
+            
+   if (RANDOM_LONG(1, 100) <= 10)
+   {
+      // 10 percent of the time turn completely around...
+      pBot->pEdict->v.ideal_yaw += 180;
+   }
+   else
+   {
+      // turn randomly between 30 and 60 degress
+      if (pBot->wander_dir == WANDER_LEFT)
+         pBot->pEdict->v.ideal_yaw += RANDOM_LONG(30, 60);
+      else
+         pBot->pEdict->v.ideal_yaw -= RANDOM_LONG(30, 60);
+   }
+            
+   BotFixIdealYaw(pBot->pEdict);
+}
+
+
+bool BotFollowUser( bot_t *pBot )
+{
+   bool user_visible;
+   float f_distance;
+   edict_t *pEdict = pBot->pEdict;
+
+   Vector vecEnd = pBot->pBotUser->v.origin + pBot->pBotUser->v.view_ofs;
+
+   if (pBot->pEdict->v.waterlevel != 3)  // is bot NOT under water?
+      pEdict->v.v_angle.x = 0;  // reset pitch to 0 (level horizontally)
+
+   pEdict->v.v_angle.z = 0;  // reset roll to 0 (straight up and down)
+
+   pEdict->v.angles.x = 0;
+   pEdict->v.angles.y = pEdict->v.v_angle.y;
+   pEdict->v.angles.z = 0;
+
+   // Stop following when person crouches
+   if (!IsAlive( pBot->pBotUser ) || (pBot->pBotUser->v.flags & FL_DUCKING))
+   {
+      // the bot's user is dead!
+      pBot->pBotUser = NULL;
+      return FALSE;
+   }
+
+   user_visible = FInViewCone( &vecEnd, pEdict ) &&
+                  FVisible( vecEnd, pEdict );
+
+   // check if the "user" is still visible or if the user has been visible
+   // in the last 5 seconds (or the player just starting "using" the bot)
+
+   if (user_visible || (pBot->f_bot_use_time + 5 > gpGlobals->time))
+   {
+      if (user_visible)
+         pBot->f_bot_use_time = gpGlobals->time;  // reset "last visible time"
+
+      // face the user
+      Vector v_user = pBot->pBotUser->v.origin - pEdict->v.origin;
+      Vector bot_angles = UTIL_VecToAngles( v_user );
+
+      pEdict->v.ideal_yaw = bot_angles.y;
+
+      BotFixIdealYaw(pEdict);
+
+      f_distance = v_user.Length( );  // how far away is the "user"?
+
+      if (f_distance > 200)      // run if distance to enemy is far
+         pBot->f_move_speed = pBot->f_max_speed;
+      else if (f_distance > 50)  // walk if distance is closer
+         pBot->f_move_speed = pBot->f_max_speed / 2;
+      else                     // don't move if close enough
+         pBot->f_move_speed = 0.0;
+
+      return TRUE;
+   }
+   else
+   {
+      // person to follow has gone out of sight...
+      pBot->pBotUser = NULL;
+
+      return FALSE;
+   }
+}
+
+
+bool BotCheckWallOnLeft( bot_t *pBot )
+{
+   edict_t *pEdict = pBot->pEdict;
+   Vector v_src, v_left;
+   TraceResult tr;
+
+   UTIL_MakeVectors( pEdict->v.v_angle );
+
+   // do a trace to the left...
+
+   v_src = pEdict->v.origin;
+   v_left = v_src + gpGlobals->v_right * -40;  // 40 units to the left
+
+   UTIL_TraceLine( v_src, v_left, dont_ignore_monsters,
+                   pEdict->v.pContainingEntity, &tr);
+
+   // check if the trace hit something...
+   if (tr.flFraction < 1.0)
+   {
+      if (pBot->f_wall_on_left < 1.0)
+         pBot->f_wall_on_left = gpGlobals->time;
+
+      return TRUE;
+   }
+
+   return FALSE;
+}
+
+
+bool BotCheckWallOnRight( bot_t *pBot )
+{
+   edict_t *pEdict = pBot->pEdict;
+   Vector v_src, v_right;
+   TraceResult tr;
+
+   UTIL_MakeVectors( pEdict->v.v_angle );
+
+   // do a trace to the right...
+
+   v_src = pEdict->v.origin;
+   v_right = v_src + gpGlobals->v_right * 40;  // 40 units to the right
+
+   UTIL_TraceLine( v_src, v_right, dont_ignore_monsters,
+                   pEdict->v.pContainingEntity, &tr);
+
+   // check if the trace hit something...
+   if (tr.flFraction < 1.0)
+   {
+      if (pBot->f_wall_on_right < 1.0)
+         pBot->f_wall_on_right = gpGlobals->time;
+
+      return TRUE;
+   }
+
+   return FALSE;
+}
+
diff --git a/main/source/HPB_bot/dlls/bot_start.cpp b/main/source/HPB_bot/dlls/bot_start.cpp
new file mode 100644
index 00000000..9e676b4a
--- /dev/null
+++ b/main/source/HPB_bot/dlls/bot_start.cpp
@@ -0,0 +1,813 @@
+//
+// HPB bot - botman's High Ping Bastard bot
+//
+// (http://planethalflife.com/botman/)
+//
+// bot_start.cpp
+//
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+
+#include "bot.h"
+#include "bot_func.h"
+#include "bot_weapons.h"
+#include "mod/AvHMessage.h"
+
+extern int mod_id;
+extern edict_t *pent_info_ctfdetect;
+
+extern int max_team_players[4];
+extern int team_class_limits[4];
+extern int max_teams;
+
+
+void BotStartGame( bot_t *pBot )
+{
+   char c_team[32];
+   char c_class[32];
+   char c_item[32];
+   int index, count, retry_count;
+   edict_t *pPlayer;
+   int team;
+   int class_not_allowed;
+
+   edict_t *pEdict = pBot->pEdict;
+
+   //CBaseEntity* theEntity = CBaseEntity::Instance(pEdict);
+   //AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntity);
+
+   if (mod_id == TFC_DLL)
+   {
+      if ((pBot->start_action == MSG_TFC_IDLE) &&
+          (pBot->create_time + 3.0 <= gpGlobals->time))
+      {
+         pBot->start_action = MSG_TFC_TEAM_SELECT;  // force team selection
+      }
+
+      // handle Team Fortress Classic stuff here...
+
+      if (pBot->start_action == MSG_TFC_TEAM_SELECT)
+      {
+         pBot->start_action = MSG_TFC_IDLE;  // switch back to idle
+         pBot->create_time = gpGlobals->time;  // reset
+
+         if ((pBot->bot_team != 1) && (pBot->bot_team != 2) &&
+             (pBot->bot_team != 3) && (pBot->bot_team != 4) &&
+             (pBot->bot_team != 5))
+            pBot->bot_team = -1;
+
+         if (pBot->bot_team == -1)
+            pBot->bot_team = RANDOM_LONG(1, max_teams);
+
+         retry_count = 0;
+
+         while ((retry_count < 4) &&
+                (max_team_players[pBot->bot_team-1] > 0))  // not unlimited?
+         {
+            count = 0;
+
+            // count number of players on this team...
+            for (index = 1; index <= gpGlobals->maxClients; index++)
+            {
+               pPlayer = INDEXENT(index);
+
+               if (pPlayer && !pPlayer->free)
+               {
+                  if (UTIL_GetTeam(pPlayer) == (pBot->bot_team - 1))
+                     count++;
+               }
+            }
+
+            if (count < max_team_players[pBot->bot_team-1])
+               break;  // haven't reached limit yet, continue
+            else
+            {
+               pBot->bot_team++;
+
+               if (pBot->bot_team > max_teams)
+                  pBot->bot_team = 1;
+
+               retry_count++;
+            }
+         }
+
+         // select the team the bot wishes to join...
+         if (pBot->bot_team == 1)
+            strcpy(c_team, "1");
+         else if (pBot->bot_team == 2)
+            strcpy(c_team, "2");
+         else if (pBot->bot_team == 3)
+            strcpy(c_team, "3");
+         else if (pBot->bot_team == 4)
+            strcpy(c_team, "4");
+         else
+            strcpy(c_team, "5");
+
+         FakeClientCommand(pEdict, "jointeam", c_team, NULL);
+
+         return;
+      }
+
+      if (pBot->start_action == MSG_TFC_CLASS_SELECT)
+      {
+         pBot->start_action = MSG_TFC_IDLE;  // switch back to idle
+         pBot->create_time = gpGlobals->time;  // reset
+
+         if ((pBot->bot_class < 0) || (pBot->bot_class > 10))
+            pBot->bot_class = -1;
+
+         if (pBot->bot_class == -1)
+            pBot->bot_class = RANDOM_LONG(1, 10);
+
+         team = UTIL_GetTeam(pEdict);
+
+         if (team_class_limits[team] == -1)  // civilian only?
+         {
+            pBot->bot_class = 0;  // civilian
+         }
+         else
+         {
+            if (pBot->bot_class == 10)
+               class_not_allowed = team_class_limits[team] & (1<<7);
+            else if (pBot->bot_class <= 7)
+               class_not_allowed = team_class_limits[team] & (1<<(pBot->bot_class-1));
+            else
+               class_not_allowed = team_class_limits[team] & (1<<(pBot->bot_class));
+
+            while (class_not_allowed)
+            {
+               pBot->bot_class = RANDOM_LONG(1, 10);
+
+               if (pBot->bot_class == 10)
+                  class_not_allowed = team_class_limits[team] & (1<<7);
+               else if (pBot->bot_class <= 7)
+                  class_not_allowed = team_class_limits[team] & (1<<(pBot->bot_class-1));
+               else
+                  class_not_allowed = team_class_limits[team] & (1<<(pBot->bot_class));
+            }
+         }
+
+         // select the class the bot wishes to use...
+         if (pBot->bot_class == 0)
+            strcpy(c_class, "civilian");
+         else if (pBot->bot_class == 1)
+            strcpy(c_class, "scout");
+         else if (pBot->bot_class == 2)
+            strcpy(c_class, "sniper");
+         else if (pBot->bot_class == 3)
+            strcpy(c_class, "soldier");
+         else if (pBot->bot_class == 4)
+            strcpy(c_class, "demoman");
+         else if (pBot->bot_class == 5)
+            strcpy(c_class, "medic");
+         else if (pBot->bot_class == 6)
+            strcpy(c_class, "hwguy");
+         else if (pBot->bot_class == 7)
+            strcpy(c_class, "pyro");
+         else if (pBot->bot_class == 8)
+            strcpy(c_class, "spy");
+         else if (pBot->bot_class == 9)
+            strcpy(c_class, "engineer");
+         else
+            strcpy(c_class, "randompc");
+
+         FakeClientCommand(pEdict, c_class, NULL, NULL);
+
+         // bot has now joined the game (doesn't need to be started)
+         pBot->not_started = 0;
+
+         return;
+      }
+   }
+   else if (mod_id == CSTRIKE_DLL)
+   {
+      // handle Counter-Strike stuff here...
+
+      if (pBot->start_action == MSG_CS_TEAM_SELECT)
+      {
+         pBot->start_action = MSG_CS_IDLE;  // switch back to idle
+
+         if ((pBot->bot_team != 1) && (pBot->bot_team != 2) &&
+             (pBot->bot_team != 5))
+            pBot->bot_team = -1;
+
+         if (pBot->bot_team == -1)
+            pBot->bot_team = RANDOM_LONG(1, 2);
+
+         // select the team the bot wishes to join...
+         if (pBot->bot_team == 1)
+            strcpy(c_team, "1");
+         else if (pBot->bot_team == 2)
+            strcpy(c_team, "2");
+         else
+            strcpy(c_team, "5");
+
+         FakeClientCommand(pEdict, "menuselect", c_team, NULL);
+
+         return;
+      }
+
+      if (pBot->start_action == MSG_CS_CT_SELECT)  // counter terrorist
+      {
+         pBot->start_action = MSG_CS_IDLE;  // switch back to idle
+
+         if ((pBot->bot_class < 1) || (pBot->bot_class > 4))
+            pBot->bot_class = -1;  // use random if invalid
+
+         if (pBot->bot_class == -1)
+            pBot->bot_class = RANDOM_LONG(1, 4);
+
+         // select the class the bot wishes to use...
+         if (pBot->bot_class == 1)
+            strcpy(c_class, "1");
+         else if (pBot->bot_class == 2)
+            strcpy(c_class, "2");
+         else if (pBot->bot_class == 3)
+            strcpy(c_class, "3");
+         else if (pBot->bot_class == 4)
+            strcpy(c_class, "4");
+         else
+            strcpy(c_class, "5");  // random
+
+         FakeClientCommand(pEdict, "menuselect", c_class, NULL);
+
+         // bot has now joined the game (doesn't need to be started)
+         pBot->not_started = 0;
+
+         return;
+      }
+
+      if (pBot->start_action == MSG_CS_T_SELECT)  // terrorist select
+      {
+         pBot->start_action = MSG_CS_IDLE;  // switch back to idle
+
+         if ((pBot->bot_class < 1) || (pBot->bot_class > 4))
+            pBot->bot_class = -1;  // use random if invalid
+
+         if (pBot->bot_class == -1)
+            pBot->bot_class = RANDOM_LONG(1, 4);
+
+         // select the class the bot wishes to use...
+         if (pBot->bot_class == 1)
+            strcpy(c_class, "1");
+         else if (pBot->bot_class == 2)
+            strcpy(c_class, "2");
+         else if (pBot->bot_class == 3)
+            strcpy(c_class, "3");
+         else if (pBot->bot_class == 4)
+            strcpy(c_class, "4");
+         else
+            strcpy(c_class, "5");  // random
+
+         FakeClientCommand(pEdict, "menuselect", c_class, NULL);
+
+         // bot has now joined the game (doesn't need to be started)
+         pBot->not_started = 0;
+
+         return;
+      }
+   }
+   else if ((mod_id == GEARBOX_DLL) && (pent_info_ctfdetect != NULL))
+   {
+      // handle Opposing Force CTF stuff here...
+
+      if (pBot->start_action == MSG_OPFOR_TEAM_SELECT)
+      {
+         pBot->start_action = MSG_OPFOR_IDLE;  // switch back to idle
+
+         if ((pBot->bot_team != 1) && (pBot->bot_team != 2) &&
+             (pBot->bot_team != 3))
+            pBot->bot_team = -1;
+
+         if (pBot->bot_team == -1)
+            pBot->bot_team = RANDOM_LONG(1, 2);
+
+         // select the team the bot wishes to join...
+         if (pBot->bot_team == 1)
+            strcpy(c_team, "1");
+         else if (pBot->bot_team == 2)
+            strcpy(c_team, "2");
+         else
+            strcpy(c_team, "3");
+
+         FakeClientCommand(pEdict, "jointeam", c_team, NULL);
+
+         return;
+      }
+
+      if (pBot->start_action == MSG_OPFOR_CLASS_SELECT)
+      {
+         pBot->start_action = MSG_OPFOR_IDLE;  // switch back to idle
+
+         if ((pBot->bot_class < 0) || (pBot->bot_class > 10))
+            pBot->bot_class = -1;
+
+         if (pBot->bot_class == -1)
+            pBot->bot_class = RANDOM_LONG(1, 10);
+
+         // select the class the bot wishes to use...
+         if (pBot->bot_class == 1)
+            strcpy(c_class, "1");
+         else if (pBot->bot_class == 2)
+            strcpy(c_class, "2");
+         else if (pBot->bot_class == 3)
+            strcpy(c_class, "3");
+         else if (pBot->bot_class == 4)
+            strcpy(c_class, "4");
+         else if (pBot->bot_class == 5)
+            strcpy(c_class, "5");
+         else if (pBot->bot_class == 6)
+            strcpy(c_class, "6");
+         else
+            strcpy(c_class, "7");
+
+         FakeClientCommand(pEdict, "selectchar", c_class, NULL);
+
+         // bot has now joined the game (doesn't need to be started)
+         pBot->not_started = 0;
+
+         return;
+      }
+   }
+   else if (mod_id == FRONTLINE_DLL)
+   {
+      // handle FrontLineForce stuff here...
+
+      if (pBot->start_action == MSG_FLF_TEAM_SELECT)
+      {
+         pBot->start_action = MSG_FLF_IDLE;  // switch back to idle
+
+         if ((pBot->bot_team != 1) && (pBot->bot_team != 2) &&
+             (pBot->bot_team != 5))
+            pBot->bot_team = -1;
+
+         if (pBot->bot_team == -1)
+            pBot->bot_team = RANDOM_LONG(1, 2);
+
+         // select the team the bot wishes to join...
+         if (pBot->bot_team == 1)
+            strcpy(c_team, "1");
+         else if (pBot->bot_team == 2)
+            strcpy(c_team, "2");
+         else
+            strcpy(c_team, "5");
+
+         FakeClientCommand(pEdict, "jointeam", c_team, NULL);
+
+         return;
+      }
+
+      if (pBot->start_action == MSG_FLF_CLASS_SELECT)
+      {
+         pBot->start_action = MSG_FLF_IDLE;  // switch back to idle
+
+         team = UTIL_GetTeam(pEdict);
+
+         if (team == 0)  // rebels
+         {
+            if ((pBot->bot_class < 0) || (pBot->bot_class > 3))
+               pBot->bot_class = -1;
+
+            if (pBot->bot_class == -1)
+               pBot->bot_class = RANDOM_LONG(1, 3);
+
+            // select the class the bot wishes to use...
+            if (pBot->bot_class == 1)
+               strcpy(c_class, "rebelsrecon");
+            else if (pBot->bot_class == 2)
+               strcpy(c_class, "rebelsassault");
+            else
+               strcpy(c_class, "rebelssupport");
+         }
+         else // commandos
+         {
+            if ((pBot->bot_class < 0) || (pBot->bot_class > 3))
+               pBot->bot_class = -1;
+
+            if (pBot->bot_class == -1)
+               pBot->bot_class = RANDOM_LONG(1, 3);
+
+            // select the class the bot wishes to use...
+            if (pBot->bot_class == 1)
+               strcpy(c_class, "commandosrecon");
+            else if (pBot->bot_class == 2)
+               strcpy(c_class, "commandosassault");
+            else
+               strcpy(c_class, "commandossupport");
+         }
+
+         FakeClientCommand(pEdict, c_class, NULL, NULL);
+
+         return;
+      }
+
+      if (pBot->start_action == MSG_FLF_PISTOL_SELECT)
+      {
+         int prim_weapon_group, sec_weapon_group;
+
+         pBot->start_action = MSG_FLF_IDLE;  // switch back to idle
+
+         int flf_class = UTIL_GetClass(pEdict);
+
+         if (flf_class == 0)  // recon
+         {
+            prim_weapon_group = RANDOM_LONG(1, 3);
+
+            if (prim_weapon_group == 1)  // shotguns
+               pBot->primary_weapon = FLF_WEAPON_SPAS12;
+            else if (prim_weapon_group == 2)  // submachine
+            {
+               int weapon = RANDOM_LONG(1, 4);
+
+               if (weapon == 1)
+                  pBot->primary_weapon = FLF_WEAPON_MP5A2;
+               else if (weapon == 2)
+                  pBot->primary_weapon = FLF_WEAPON_MP5SD;
+               else if (weapon == 3)
+                  pBot->primary_weapon = FLF_WEAPON_MAC10;
+               else
+                  pBot->primary_weapon = FLF_WEAPON_UMP45;
+            }
+            else  // rifles
+            {
+               pBot->primary_weapon = FLF_WEAPON_MSG90;
+            }
+
+            if (prim_weapon_group == 1)
+               sec_weapon_group = RANDOM_LONG(2, 3);
+            else if (prim_weapon_group == 3)
+               sec_weapon_group = RANDOM_LONG(1, 2);
+            else
+            {
+               if (RANDOM_LONG(1, 100) <= 50)
+                  sec_weapon_group = 1;
+               else
+                  sec_weapon_group = 3;
+            }
+
+            if (sec_weapon_group == 1)  // shotguns
+               pBot->secondary_weapon = FLF_WEAPON_SPAS12;
+            else if (sec_weapon_group == 2)  // submachine
+            {
+               int weapon = RANDOM_LONG(1, 4);
+
+               if (weapon == 1)
+                  pBot->secondary_weapon = FLF_WEAPON_MP5A2;
+               else if (weapon == 2)
+                  pBot->secondary_weapon = FLF_WEAPON_MP5SD;
+               else if (weapon == 3)
+                  pBot->secondary_weapon = FLF_WEAPON_MAC10;
+               else
+                  pBot->secondary_weapon = FLF_WEAPON_UMP45;
+            }
+            else  // rifles
+            {
+               pBot->secondary_weapon = FLF_WEAPON_MSG90;
+            }
+         }
+         else if (flf_class == 1)  // assault
+         {
+            prim_weapon_group = RANDOM_LONG(1, 3);
+
+            if (prim_weapon_group == 1)  // shotguns
+               pBot->primary_weapon = FLF_WEAPON_SPAS12;
+            else if (prim_weapon_group == 2)  // submachine
+            {
+               int weapon = RANDOM_LONG(1, 4);
+
+               if (weapon == 1)
+                  pBot->primary_weapon = FLF_WEAPON_MP5A2;
+               else if (weapon == 2)
+                  pBot->primary_weapon = FLF_WEAPON_MP5SD;
+               else if (weapon == 3)
+                  pBot->primary_weapon = FLF_WEAPON_MAC10;
+               else
+                  pBot->primary_weapon = FLF_WEAPON_UMP45;
+            }
+            else  // rifles
+            {
+               int weapon = RANDOM_LONG(1, 3);
+
+               if (weapon == 1)
+                  pBot->primary_weapon = FLF_WEAPON_M4;
+               else if (weapon == 2)
+                  pBot->primary_weapon = FLF_WEAPON_FAMAS;
+               else
+                  pBot->primary_weapon = FLF_WEAPON_AK5;
+            }
+
+            if (prim_weapon_group == 1)
+               sec_weapon_group = RANDOM_LONG(2, 3);
+            else if (prim_weapon_group == 2)
+            {
+               if (RANDOM_LONG(1, 100) <= 50)
+                  sec_weapon_group = 1;
+               else
+                  sec_weapon_group = 3;
+            }
+            else  // prim == 3
+               sec_weapon_group = RANDOM_LONG(1, 2);
+
+            if (sec_weapon_group == 1)  // shotguns
+               pBot->secondary_weapon = FLF_WEAPON_SPAS12;
+            else if (sec_weapon_group == 2)  // submachine
+            {
+               int weapon = RANDOM_LONG(1, 4);
+
+               if (weapon == 1)
+                  pBot->secondary_weapon = FLF_WEAPON_MP5A2;
+               else if (weapon == 2)
+                  pBot->secondary_weapon = FLF_WEAPON_MP5SD;
+               else if (weapon == 3)
+                  pBot->secondary_weapon = FLF_WEAPON_MAC10;
+               else
+                  pBot->secondary_weapon = FLF_WEAPON_UMP45;
+            }
+            else  // rifles
+            {
+               int weapon = RANDOM_LONG(1, 3);
+
+               if (weapon == 1)
+                  pBot->secondary_weapon = FLF_WEAPON_M4;
+               else if (weapon == 2)
+                  pBot->secondary_weapon = FLF_WEAPON_FAMAS;
+               else
+                  pBot->secondary_weapon = FLF_WEAPON_AK5;
+            }
+         }
+         else  // support
+         {
+            prim_weapon_group = RANDOM_LONG(1, 3);
+
+            if (prim_weapon_group == 1)  // shotguns
+               pBot->primary_weapon = FLF_WEAPON_SPAS12;
+            else if (prim_weapon_group == 2)  // submachine
+            {
+               int weapon = RANDOM_LONG(1, 4);
+
+               if (weapon == 1)
+                  pBot->primary_weapon = FLF_WEAPON_MP5A2;
+               else if (weapon == 2)
+                  pBot->primary_weapon = FLF_WEAPON_MP5SD;
+               else if (weapon == 3)
+                  pBot->primary_weapon = FLF_WEAPON_MAC10;
+               else
+                  pBot->primary_weapon = FLF_WEAPON_UMP45;
+            }
+            else if (prim_weapon_group == 3)  // rifles & heavyweapons
+            {
+               if (RANDOM_LONG(1, 100) <= 50)
+               {
+                  int weapon = RANDOM_LONG(1, 3);  // rifles
+
+                  if (weapon == 1)
+                     pBot->primary_weapon = FLF_WEAPON_M4;
+                  else if (weapon == 2)
+                     pBot->primary_weapon = FLF_WEAPON_FAMAS;
+                  else
+                     pBot->primary_weapon = FLF_WEAPON_AK5;
+               }
+               else  // heavy weapons
+               {
+                  pBot->primary_weapon = FLF_WEAPON_HK21;
+               }
+            }
+
+            if (prim_weapon_group == 1)
+               sec_weapon_group = RANDOM_LONG(2, 3);
+            else if (prim_weapon_group == 2)
+            {
+               if (RANDOM_LONG(1, 100) <= 50)
+                  sec_weapon_group = 1;
+               else
+                  sec_weapon_group = 3;
+            }
+            else  // prim == 3
+               sec_weapon_group = RANDOM_LONG(1, 2);
+
+            if (sec_weapon_group == 1)  // shotguns
+               pBot->secondary_weapon = FLF_WEAPON_SPAS12;
+            else if (sec_weapon_group == 2)  // submachine
+            {
+               int weapon = RANDOM_LONG(1, 4);
+
+               if (weapon == 1)
+                  pBot->secondary_weapon = FLF_WEAPON_MP5A2;
+               else if (weapon == 2)
+                  pBot->secondary_weapon = FLF_WEAPON_MP5SD;
+               else if (weapon == 3)
+                  pBot->secondary_weapon = FLF_WEAPON_MAC10;
+               else
+                  pBot->secondary_weapon = FLF_WEAPON_UMP45;
+            }
+            else if (sec_weapon_group == 3)  // rifles & heavyweapons
+            {
+               if (RANDOM_LONG(1, 100) <= 50)
+               {
+                  int weapon = RANDOM_LONG(1, 3);  // rifles
+
+                  if (weapon == 1)
+                     pBot->secondary_weapon = FLF_WEAPON_M4;
+                  else if (weapon == 2)
+                     pBot->secondary_weapon = FLF_WEAPON_FAMAS;
+                  else
+                     pBot->secondary_weapon = FLF_WEAPON_AK5;
+               }
+               else  // heavy weapons
+               {
+                  pBot->secondary_weapon = FLF_WEAPON_HK21;
+               }
+            }
+         }
+
+         int pistol = RANDOM_LONG(1, 2);
+
+         if (pistol == 1)
+            strcpy(c_item, "26");  // mk23
+         else
+            strcpy(c_item, "23");  // beretta
+
+         FakeClientCommand(pEdict, "pistols", c_item, NULL);
+
+         return;
+      }
+
+      if (pBot->start_action == MSG_FLF_WEAPON_SELECT)
+      {
+         int weapon_class;
+
+         pBot->start_action = MSG_FLF_IDLE;  // switch back to idle
+
+         if (pBot->primary_weapon)
+            weapon_class = pBot->primary_weapon;
+         else
+            weapon_class = pBot->secondary_weapon;
+
+         if (weapon_class == FLF_WEAPON_SPAS12)  // shotguns
+            strcpy(c_item, "shotgun");
+         else if ((weapon_class == FLF_WEAPON_MP5A2) ||  // submachine
+                  (weapon_class == FLF_WEAPON_MP5SD) ||
+                  (weapon_class == FLF_WEAPON_MAC10) ||
+                  (weapon_class == FLF_WEAPON_UMP45))
+            strcpy(c_item, "submachine");
+         else if ((weapon_class == FLF_WEAPON_M4) ||
+                  (weapon_class == FLF_WEAPON_FAMAS) ||
+                  (weapon_class == FLF_WEAPON_AK5) ||
+                  (weapon_class == FLF_WEAPON_MSG90))
+            strcpy(c_item, "rifles");
+         else
+            strcpy(c_item, "heavyweapons");
+
+         FakeClientCommand(pEdict, "wpnclass", c_item, NULL);
+
+         return;
+      }
+
+      if (pBot->start_action == MSG_FLF_SHOTGUN_SELECT)
+      {
+         int weapon_class;
+
+         pBot->start_action = MSG_FLF_IDLE;  // switch back to idle
+
+         if (pBot->primary_weapon)
+         {
+            weapon_class = pBot->primary_weapon;
+            pBot->primary_weapon = 0;
+         }
+         else
+         {
+            weapon_class = pBot->secondary_weapon;
+
+            // bot has now joined the game (doesn't need to be started)
+            pBot->not_started = 0;
+         }
+
+         sprintf(c_item, "%d", weapon_class);
+
+         FakeClientCommand(pEdict, "shotgun", c_item, NULL);
+
+         return;
+      }
+
+      if (pBot->start_action == MSG_FLF_SUBMACHINE_SELECT)
+      {
+         int weapon_class;
+
+         pBot->start_action = MSG_FLF_IDLE;  // switch back to idle
+
+         if (pBot->primary_weapon)
+         {
+            weapon_class = pBot->primary_weapon;
+            pBot->primary_weapon = 0;
+         }
+         else
+         {
+            weapon_class = pBot->secondary_weapon;
+
+            // bot has now joined the game (doesn't need to be started)
+            pBot->not_started = 0;
+         }
+
+         sprintf(c_item, "%d", weapon_class);
+
+         FakeClientCommand(pEdict, "submach", c_item, NULL);
+
+         return;
+      }
+
+      if (pBot->start_action == MSG_FLF_RIFLE_SELECT)
+      {
+         int weapon_class;
+
+         pBot->start_action = MSG_FLF_IDLE;  // switch back to idle
+
+         if (pBot->primary_weapon)
+         {
+            weapon_class = pBot->primary_weapon;
+            pBot->primary_weapon = 0;
+         }
+         else
+         {
+            weapon_class = pBot->secondary_weapon;
+
+            // bot has now joined the game (doesn't need to be started)
+            pBot->not_started = 0;
+         }
+
+         sprintf(c_item, "%d", weapon_class);
+
+         FakeClientCommand(pEdict, "rifles", c_item, NULL);
+
+         return;
+      }
+
+      if (pBot->start_action == MSG_FLF_HEAVYWEAPONS_SELECT)
+      {
+         int weapon_class;
+
+         pBot->start_action = MSG_FLF_IDLE;  // switch back to idle
+
+         if (pBot->primary_weapon)
+         {
+            weapon_class = pBot->primary_weapon;
+            pBot->primary_weapon = 0;
+         }
+         else
+         {
+            weapon_class = pBot->secondary_weapon;
+
+            // bot has now joined the game (doesn't need to be started)
+            pBot->not_started = 0;
+         }
+
+         sprintf(c_item, "%d", weapon_class);
+
+         FakeClientCommand(pEdict, "heavyweapons", c_item, NULL);
+
+         return;
+      }
+
+   }
+   else if (mod_id == AVH_DLL)
+   {
+//	   if(pBot->mBotPlayMode == PLAYMODE_READYROOM)
+//	   {
+//		   // Look at desired team and head to nearest start entity
+//		   AvHClassType theClassType = AVH_CLASS_TYPE_UNDEFINED;
+////		   if(pBot->mBotRole == ROLE_UNDEFINED)
+////		   {
+////			   // Choose a random team
+////			   theClassType = AvHClassType(RANDOM_LONG(1, 2));
+////		   }
+////		   else
+////		   {
+////			   theClassType = (AvHClassType)pBot->mBotRole;
+////		   }
+////
+////	       // Now navigate to the nearest start entity
+////	       if(theClassType == AVH_CLASS_TYPE_MARINE)
+////	       {
+//				FakeClientCommand(pEdict, kcAutoAssign, c_item, NULL);
+//				//FakeClientCommand(pEdict, kcJoinTeamOne, c_item, NULL);
+//
+//			   // Try to become a squad leader if possible
+////			   pBot->pEdict->v.impulse = RANK_PROMOTE;
+////		   }
+////	       else if(theClassType == AVH_CLASS_TYPE_ALIEN)
+////	       {
+////			   FakeClientCommand(pEdict, kcJoinTeamTwo, c_item, NULL);
+////		   }
+//
+//		   // bot has now joined the game (doesn't need to be started)
+//		   pBot->not_started = 0;
+//	   }
+   }
+   else
+   {
+      // otherwise, don't need to do anything to start game...
+      pBot->not_started = 0;
+   }
+}
+
diff --git a/main/source/HPB_bot/dlls/bot_weapons.h b/main/source/HPB_bot/dlls/bot_weapons.h
new file mode 100644
index 00000000..1c47d9db
--- /dev/null
+++ b/main/source/HPB_bot/dlls/bot_weapons.h
@@ -0,0 +1,158 @@
+//
+// HPB_bot - botman's High Ping Bastard bot
+//
+// (http://planethalflife.com/botman/)
+//
+// bot_weapons.h
+//
+
+#ifndef BOT_WEAPONS_H
+#define BOT_WEAPONS_H
+
+// weapon ID values for Valve's Half-Life Deathmatch
+#define VALVE_WEAPON_CROWBAR       1
+#define VALVE_WEAPON_GLOCK         2
+#define VALVE_WEAPON_PYTHON        3
+#define VALVE_WEAPON_MP5           4
+#define VALVE_WEAPON_CHAINGUN      5
+#define VALVE_WEAPON_CROSSBOW      6
+#define VALVE_WEAPON_SHOTGUN       7
+#define VALVE_WEAPON_RPG           8
+#define VALVE_WEAPON_GAUSS         9
+#define VALVE_WEAPON_EGON         10
+#define VALVE_WEAPON_HORNETGUN    11
+#define VALVE_WEAPON_HANDGRENADE  12
+#define VALVE_WEAPON_TRIPMINE     13
+#define VALVE_WEAPON_SATCHEL      14
+#define VALVE_WEAPON_SNARK        15
+
+#define VALVE_MAX_NORMAL_BATTERY   100
+#define VALVE_HORNET_MAX_CARRY      8
+
+
+// weapon ID values for Valve's Team Fortress Classic & 1.5
+#define TF_WEAPON_UNKNOWN1       1
+#define TF_WEAPON_UNKNOWN2       2
+#define TF_WEAPON_MEDIKIT        3
+#define TF_WEAPON_SPANNER        4
+#define TF_WEAPON_AXE            5
+#define TF_WEAPON_SNIPERRIFLE    6
+#define TF_WEAPON_AUTORIFLE      7
+#define TF_WEAPON_SHOTGUN        8
+#define TF_WEAPON_SUPERSHOTGUN   9
+#define TF_WEAPON_NAILGUN       10
+#define TF_WEAPON_SUPERNAILGUN  11
+#define TF_WEAPON_GL            12
+#define TF_WEAPON_FLAMETHROWER  13
+#define TF_WEAPON_RPG           14
+#define TF_WEAPON_IC            15
+#define TF_WEAPON_UNKNOWN16     16
+#define TF_WEAPON_AC            17
+#define TF_WEAPON_UNKNOWN18     18
+#define TF_WEAPON_UNKNOWN19     19
+#define TF_WEAPON_TRANQ         20
+#define TF_WEAPON_RAILGUN       21
+#define TF_WEAPON_PL            22
+#define TF_WEAPON_KNIFE         23
+
+
+// weapon ID values for Counter-Strike
+#define CS_WEAPON_P228           1
+#define CS_WEAPON_UNKNOWN2       2
+#define CS_WEAPON_SCOUT          3
+#define CS_WEAPON_HEGRENADE      4
+#define CS_WEAPON_XM1014         5
+#define CS_WEAPON_C4             6
+#define CS_WEAPON_MAC10          7
+#define CS_WEAPON_AUG            8
+#define CS_WEAPON_SMOKEGRENADE   9
+#define CS_WEAPON_ELITE         10
+#define CS_WEAPON_FIVESEVEN     11
+#define CS_WEAPON_UMP45         12
+#define CS_WEAPON_SG550         13
+#define CS_WEAPON_UNKNOWN14     14
+#define CS_WEAPON_UNKNOWN15     15
+#define CS_WEAPON_USP           16
+#define CS_WEAPON_GLOCK18       17
+#define CS_WEAPON_AWP           18
+#define CS_WEAPON_MP5NAVY       19
+#define CS_WEAPON_M249          20
+#define CS_WEAPON_M3            21
+#define CS_WEAPON_M4A1          22
+#define CS_WEAPON_TMP           23
+#define CS_WEAPON_G3SG1         24
+#define CS_WEAPON_FLASHBANG     25
+#define CS_WEAPON_DEAGLE        26
+#define CS_WEAPON_SG552         27
+#define CS_WEAPON_AK47          28
+#define CS_WEAPON_KNIFE         29
+#define CS_WEAPON_P90           30
+
+
+// weapon ID values for Gearbox's OpFor Deathmatch
+#define GEARBOX_WEAPON_CROWBAR       1
+#define GEARBOX_WEAPON_GLOCK         2
+#define GEARBOX_WEAPON_PYTHON        3
+#define GEARBOX_WEAPON_MP5           4
+#define GEARBOX_WEAPON_CHAINGUN      5
+#define GEARBOX_WEAPON_CROSSBOW      6
+#define GEARBOX_WEAPON_SHOTGUN       7
+#define GEARBOX_WEAPON_RPG           8
+#define GEARBOX_WEAPON_GAUSS         9
+#define GEARBOX_WEAPON_EGON         10
+#define GEARBOX_WEAPON_HORNETGUN    11
+#define GEARBOX_WEAPON_HANDGRENADE  12
+#define GEARBOX_WEAPON_TRIPMINE     13
+#define GEARBOX_WEAPON_SATCHEL      14
+#define GEARBOX_WEAPON_SNARK        15
+#define GEARBOX_WEAPON_GRAPPLE      16
+#define GEARBOX_WEAPON_EAGLE        17
+#define GEARBOX_WEAPON_PIPEWRENCH   18
+#define GEARBOX_WEAPON_M249         19
+#define GEARBOX_WEAPON_DISPLACER    20
+#define GEARBOX_WEAPON_UNKNOWN21    21
+#define GEARBOX_WEAPON_SHOCKRIFLE   22
+#define GEARBOX_WEAPON_SPORELAUNCHER 23
+#define GEARBOX_WEAPON_SNIPERRIFLE  24
+#define GEARBOX_WEAPON_KNIFE        25
+
+
+// weapon ID values for FrontLineForce
+#define FLF_WEAPON_AK5           10
+#define FLF_WEAPON_UNKNOWN11     11
+#define FLF_WEAPON_UNKNOWN12     12
+#define FLF_WEAPON_UNKNOWN13     13
+#define FLF_WEAPON_UNKNOWN14     14
+#define FLF_WEAPON_UNKNOWN15     15
+#define FLF_WEAPON_MP5SD         16
+#define FLF_WEAPON_M4            17
+#define FLF_WEAPON_FLASHBANG     18
+#define FLF_WEAPON_HEGRENADE     19
+#define FLF_WEAPON_MP5A2         20
+#define FLF_WEAPON_UMP45         21
+#define FLF_WEAPON_SPAS12        22
+#define FLF_WEAPON_BERETTA       23
+#define FLF_WEAPON_KNIFE         24
+#define FLF_WEAPON_MAC10         25
+#define FLF_WEAPON_MK23          26
+#define FLF_WEAPON_MSG90         27
+#define FLF_WEAPON_FAMAS         28
+#define FLF_WEAPON_HK21          29
+
+
+typedef struct
+{
+   char szClassname[64];
+   int  iAmmo1;     // ammo index for primary ammo
+   int  iAmmo1Max;  // max primary ammo
+   int  iAmmo2;     // ammo index for secondary ammo
+   int  iAmmo2Max;  // max secondary ammo
+   int  iSlot;      // HUD slot (0 based)
+   int  iPosition;  // slot position
+   int  iId;        // weapon ID
+   int  iFlags;     // flags???
+} bot_weapon_t;
+
+
+#endif // BOT_WEAPONS_H
+
diff --git a/main/source/HPB_bot/dlls/current_linux_makefile b/main/source/HPB_bot/dlls/current_linux_makefile
new file mode 100644
index 00000000..3be8a029
--- /dev/null
+++ b/main/source/HPB_bot/dlls/current_linux_makefile
@@ -0,0 +1,44 @@
+#
+# HPB_bot makefile for Linux
+#
+# created: 12/16/2000 botman (botman@mailandnews.com)
+#
+
+# the following specifies the path to your MOD...
+MOD_DIR = /usr/local/games/Half-life/hlds_l/ns
+
+CPP = egcs
+
+BASEFLAGS = -Dstricmp=strcasecmp -Dstrcmpi=strcasecmp -DAVH_SERVER -DLINUX
+
+CFLAGS=$(BASE_CFLAGS) -w -m486 -O2 -ffast-math -funroll-loops \
+	-fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \
+	-malign-jumps=2 -malign-functions=2
+
+INCLUDEDIRS=-I. -I../../engine -I../../common -I../../mod -I../../game_shared -I../../lua/include -I../../pm_shared -I../.. -I../../dlls
+
+LDFLAGS=-lm -lstdc++
+#SHLIBCFLAGS=-fPIC
+SHLIBLDFLAGS=-shared -static
+
+#CPPFLAGS = ${BASEFLAGS} -m486 -O2 -w -I../engine -I../common -I../pm_shared
+CPPFLAGS = ${BASEFLAGS} -m486 -w -I../engine -I../../common -I../../pm_shared
+
+OBJ = bot.o bot_client.o bot_combat.o bot_navigate.o bot_start.o dll.o engine.o h_export.o linkfunc.o util.o waypoint.o
+
+#${CPP} $(SHLIBLDFLAGS) $(LDFLAGS) -o $@ ${OBJ} -ldl
+
+HPB_bot_i386.so: ${OBJ}
+	${CPP} $(CFLAGS) $(SHLIBLDFLAGS) $(LDFLAGS) -o $@ ${OBJ}
+	cp -f HPB_bot_i386.so ${MOD_DIR}/dlls
+
+clean:
+	-rm -f *.o
+	-rm -f *.so	
+
+%.o:	%.cpp
+	${CPP} ${CPPFLAGS} $(INCLUDEDIRS) -c $< -o $@
+
+%.o:	%.c
+	${CPP} ${CPPFLAGS} $(INCLUDEDIRS) -c $< -o $@
+
diff --git a/main/source/HPB_bot/dlls/dll.cpp b/main/source/HPB_bot/dlls/dll.cpp
new file mode 100644
index 00000000..5ef6c468
--- /dev/null
+++ b/main/source/HPB_bot/dlls/dll.cpp
@@ -0,0 +1,1890 @@
+//
+// HPB bot - botman's High Ping Bastard bot
+//
+// (http://planethalflife.com/botman/)
+//
+// dll.cpp
+//
+
+#include "extdll.h"
+#include "enginecallback.h"
+#include "util.h"
+#include "cbase.h"
+#include "entity_state.h"
+
+#include "bot.h"
+#include "bot_func.h"
+#include "waypoint.h"
+#include "mod/AvHServerVariables.h"
+
+#define MENU_NONE  0
+#define MENU_1     1
+#define MENU_2     2
+#define MENU_3     3
+
+extern GETENTITYAPI other_GetEntityAPI;
+extern GETNEWDLLFUNCTIONS other_GetNewDLLFunctions;
+extern enginefuncs_t g_engfuncs;
+extern int debug_engine;
+extern globalvars_t  *gpGlobals;
+extern char *g_argv;
+extern bool g_waypoint_on;
+extern bool g_auto_waypoint;
+extern bool g_path_waypoint;
+extern int num_waypoints;  // number of waypoints currently in use
+extern WAYPOINT waypoints[MAX_WAYPOINTS];
+extern float wp_display_time[MAX_WAYPOINTS];
+extern bot_t bots[32];
+extern bool b_observer_mode;
+extern bool b_botdontshoot;
+//char welcome_msg[] = "HPB bot - http://planethalflife.com/botman";
+
+static FILE *fp;
+
+DLL_FUNCTIONS other_gFunctionTable;
+DLL_GLOBAL const Vector g_vecZero = Vector(0,0,0);
+
+// AvH dll
+int mod_id = AVH_DLL;
+int m_spriteTexture = 0;
+int default_bot_skill = 4;
+int isFakeClientCommand = 0;
+int fake_arg_count;
+float bot_check_time = 30.0;
+int min_bots = -1;
+int max_bots = -1;
+int num_bots = 0;
+int prev_num_bots = 0;
+bool g_GameRules = FALSE;
+edict_t *clients[32];
+edict_t *listenserver_edict = NULL;
+float welcome_time = 0.0;
+bool welcome_sent = FALSE;
+int g_menu_waypoint;
+int g_menu_state = 0;
+
+float is_team_play = 0.0;
+char team_names[MAX_TEAMS][MAX_TEAMNAME_LENGTH];
+int num_teams = 0;
+bool checked_teamplay = FALSE;
+edict_t *pent_info_tfdetect = NULL;
+edict_t *pent_info_ctfdetect = NULL;
+edict_t *pent_info_frontline = NULL;
+edict_t *pent_item_tfgoal = NULL;
+int max_team_players[4];  // for TFC
+int team_class_limits[4];  // for TFC
+int team_allies[4];  // TFC bit mapped allies BLUE, RED, YELLOW, and GREEN
+int max_teams = 0;  // for TFC
+FLAG_S flags[MAX_FLAGS];  // for TFC
+int num_flags = 0;  // for TFC
+
+FILE *bot_cfg_fp = NULL;
+bool need_to_open_cfg = TRUE;
+float bot_cfg_pause_time = 0.0;
+float respawn_time = 0.0;
+bool spawn_time_reset = FALSE;
+
+int flf_bug_fix;  // for FLF 1.1 capture point bug
+int flf_bug_check;  // for FLF 1.1 capture point bug
+
+
+char bot_whine[MAX_BOT_WHINE][81];
+int whine_count;
+int recent_bot_whine[5];
+
+cvar_t sv_bot        = {"bot",""};
+cvar_t sv_freezebots = {"freezebots","0"};
+
+char *show_menu_1 =
+   {"Waypoint Tags\n\n1. Team Specific\n2. Wait for Lift\n3. Door\n4. Sniper Spot\n5. More..."};
+char *show_menu_2 =
+   {"Waypoint Tags\n\n1. Team 1\n2. Team 2\n3. Team 3\n4. Team 4\n5. CANCEL"};
+char *show_menu_2_flf =
+   {"Waypoint Tags\n\n1. Attackers\n2. Defenders\n\n5. CANCEL"};
+char *show_menu_3 =
+   {"Waypoint Tags\n\n1. Flag Location\n2. Flag Goal Location\n\n5. CANCEL"};
+char *show_menu_3_flf =
+   {"Waypoint Tags\n\n1. Capture Point\n2. Defend Point\n3. Prone\n\n5. CANCEL"};
+
+
+void BotNameInit(void);
+void UpdateClientData(const struct edict_s *ent, int sendweapons, struct clientdata_s *cd);
+void ProcessBotCfgFile(void);
+
+
+void GameDLLInit( void )
+{
+   char filename[256];
+   char buffer[256];
+   int i, length;
+   FILE *bfp;
+   char *ptr;
+
+   CVAR_REGISTER (&sv_bot);
+   CVAR_REGISTER (&sv_freezebots);
+
+   for (i=0; i<32; i++)
+      clients[i] = NULL;
+
+   whine_count = 0;
+
+   // initialize the bots array of structures...
+   memset(bots, 0, sizeof(bots));
+
+   for (i=0; i < 5; i++)
+      recent_bot_whine[i] = -1;
+
+   BotNameInit();
+
+
+   UTIL_BuildFileName(filename, "bot_whine.txt", NULL);
+
+   bfp = fopen(filename, "r");
+
+   if (bfp != NULL)
+   {
+      while ((whine_count < MAX_BOT_WHINE) &&
+             (fgets(buffer, 80, bfp) != NULL))
+      {
+         length = strlen(buffer);
+
+         if (buffer[length-1] == '\n')
+         {
+            buffer[length-1] = 0;  // remove '\n'
+            length--;
+         }
+
+         if ((ptr = strstr(buffer, "%n")) != NULL)
+         {
+            *(ptr+1) = 's';  // change %n to %s
+         }
+
+         if (length > 0)
+         {
+            strcpy(bot_whine[whine_count], buffer);
+            whine_count++;
+         }
+      }
+
+      fclose(bfp);
+   }
+
+   (*other_gFunctionTable.pfnGameInit)();
+}
+
+int DispatchSpawn( edict_t *pent )
+{
+   int index;
+
+   if (gpGlobals->deathmatch)
+   {
+      char *pClassname = (char *)STRING(pent->v.classname);
+
+      if (debug_engine)
+      {
+         fp=fopen("bot.txt","a");
+         fprintf(fp, "DispatchSpawn: %x %s\n",pent,pClassname);
+         if (pent->v.model != 0)
+            fprintf(fp, " model=%s\n",STRING(pent->v.model));
+         fclose(fp);
+      }
+
+      if (strcmp(pClassname, "worldspawn") == 0)
+      {
+         // do level initialization stuff here...
+
+         WaypointInit();
+         WaypointLoad(NULL);
+
+         pent_info_tfdetect = NULL;
+         pent_info_ctfdetect = NULL;
+         pent_info_frontline = NULL;
+         pent_item_tfgoal = NULL;
+
+         for (index=0; index < 4; index++)
+         {
+            max_team_players[index] = 0;  // no player limit
+            team_class_limits[index] = 0;  // no class limits
+            team_allies[index] = 0;
+         }
+
+         max_teams = 0;
+         num_flags = 0;
+
+         PRECACHE_SOUND("weapons/xbow_hit1.wav");      // waypoint add
+         PRECACHE_SOUND("weapons/mine_activate.wav");  // waypoint delete
+         PRECACHE_SOUND("common/wpn_hudoff.wav");      // path add/delete start
+         PRECACHE_SOUND("common/wpn_hudon.wav");       // path add/delete done
+         PRECACHE_SOUND("common/wpn_moveselect.wav");  // path add/delete cancel
+         PRECACHE_SOUND("common/wpn_denyselect.wav");  // path add/delete error
+
+         m_spriteTexture = PRECACHE_MODEL( "sprites/lgtning.spr");
+
+         g_GameRules = TRUE;
+
+         is_team_play = 0.0;
+         memset(team_names, 0, sizeof(team_names));
+         num_teams = 0;
+         checked_teamplay = FALSE;
+
+         bot_cfg_pause_time = 0.0;
+         respawn_time = 0.0;
+         spawn_time_reset = FALSE;
+
+         prev_num_bots = num_bots;
+         num_bots = 0;
+
+         flf_bug_fix = 0;
+         flf_bug_check = 0;
+
+         bot_check_time = gpGlobals->time + 30.0;
+      }
+   }
+
+   return (*other_gFunctionTable.pfnSpawn)(pent);
+}
+
+void DispatchThink( edict_t *pent )
+{
+   (*other_gFunctionTable.pfnThink)(pent);
+}
+
+void DispatchUse( edict_t *pentUsed, edict_t *pentOther )
+{
+   (*other_gFunctionTable.pfnUse)(pentUsed, pentOther);
+}
+
+void DispatchTouch( edict_t *pentTouched, edict_t *pentOther )
+{
+   (*other_gFunctionTable.pfnTouch)(pentTouched, pentOther);
+}
+
+void DispatchBlocked( edict_t *pentBlocked, edict_t *pentOther )
+{
+   (*other_gFunctionTable.pfnBlocked)(pentBlocked, pentOther);
+}
+
+void DispatchKeyValue( edict_t *pentKeyvalue, KeyValueData *pkvd )
+{
+   static edict_t *temp_pent;
+   static int flag_index;
+
+//   fp=fopen("bot.txt","a"); fprintf(fp, "DispatchKeyValue: %x %s=%s\n",pentKeyvalue,pkvd->szKeyName,pkvd->szValue); fclose(fp);
+
+   if (mod_id == TFC_DLL)
+   {
+      if (pentKeyvalue == pent_info_tfdetect)
+      {
+         if (strcmp(pkvd->szKeyName, "ammo_medikit") == 0)  // max BLUE players
+            max_team_players[0] = atoi(pkvd->szValue);
+         else if (strcmp(pkvd->szKeyName, "ammo_detpack") == 0)  // max RED players
+            max_team_players[1] = atoi(pkvd->szValue);
+         else if (strcmp(pkvd->szKeyName, "maxammo_medikit") == 0)  // max YELLOW players
+            max_team_players[2] = atoi(pkvd->szValue);
+         else if (strcmp(pkvd->szKeyName, "maxammo_detpack") == 0)  // max GREEN players
+            max_team_players[3] = atoi(pkvd->szValue);
+
+         else if (strcmp(pkvd->szKeyName, "maxammo_shells") == 0)  // BLUE class limits
+            team_class_limits[0] = atoi(pkvd->szValue);
+         else if (strcmp(pkvd->szKeyName, "maxammo_nails") == 0)  // RED class limits
+            team_class_limits[1] = atoi(pkvd->szValue);
+         else if (strcmp(pkvd->szKeyName, "maxammo_rockets") == 0)  // YELLOW class limits
+            team_class_limits[2] = atoi(pkvd->szValue);
+         else if (strcmp(pkvd->szKeyName, "maxammo_cells") == 0)  // GREEN class limits
+            team_class_limits[3] = atoi(pkvd->szValue);
+
+         else if (strcmp(pkvd->szKeyName, "team1_allies") == 0)  // BLUE allies
+            team_allies[0] = atoi(pkvd->szValue);
+         else if (strcmp(pkvd->szKeyName, "team2_allies") == 0)  // RED allies
+            team_allies[1] = atoi(pkvd->szValue);
+         else if (strcmp(pkvd->szKeyName, "team3_allies") == 0)  // YELLOW allies
+            team_allies[2] = atoi(pkvd->szValue);
+         else if (strcmp(pkvd->szKeyName, "team4_allies") == 0)  // GREEN allies
+            team_allies[3] = atoi(pkvd->szValue);
+      }
+      else if (pent_info_tfdetect == NULL)
+      {
+         if ((strcmp(pkvd->szKeyName, "classname") == 0) &&
+             (strcmp(pkvd->szValue, "info_tfdetect") == 0))
+         {
+            pent_info_tfdetect = pentKeyvalue;
+         }
+      }
+
+      if (pentKeyvalue == pent_item_tfgoal)
+      {
+         if (strcmp(pkvd->szKeyName, "team_no") == 0)
+            flags[flag_index].team_no = atoi(pkvd->szValue);
+
+         if ((strcmp(pkvd->szKeyName, "mdl") == 0) &&
+             ((strcmp(pkvd->szValue, "models/flag.mdl") == 0) ||
+              (strcmp(pkvd->szValue, "models/keycard.mdl") == 0) ||
+              (strcmp(pkvd->szValue, "models/ball.mdl") == 0)))
+         {
+            flags[flag_index].mdl_match = TRUE;
+            num_flags++;
+         }
+      }
+      else if (pent_item_tfgoal == NULL)
+      {
+         if ((strcmp(pkvd->szKeyName, "classname") == 0) &&
+             (strcmp(pkvd->szValue, "item_tfgoal") == 0))
+         {
+            if (num_flags < MAX_FLAGS)
+            {
+               pent_item_tfgoal = pentKeyvalue;
+
+               flags[num_flags].mdl_match = FALSE;
+               flags[num_flags].team_no = 0;  // any team unless specified
+               flags[num_flags].edict = pentKeyvalue;
+
+               flag_index = num_flags;  // in case the mdl comes before team_no
+            }
+         }
+      }
+      else
+      {
+         pent_item_tfgoal = NULL;  // reset for non-flag item_tfgoal's
+      }
+
+      if ((strcmp(pkvd->szKeyName, "classname") == 0) &&
+          ((strcmp(pkvd->szValue, "info_player_teamspawn") == 0) ||
+           (strcmp(pkvd->szValue, "i_p_t") == 0)))
+      {
+         temp_pent = pentKeyvalue;
+      }
+      else if (pentKeyvalue == temp_pent)
+      {
+         if (strcmp(pkvd->szKeyName, "team_no") == 0)
+         {
+            int value = atoi(pkvd->szValue);
+
+            if (value > max_teams)
+               max_teams = value;
+         }
+      }
+   }
+   else if (mod_id == GEARBOX_DLL)
+   {
+      if (pent_info_ctfdetect == NULL)
+      {
+         if ((strcmp(pkvd->szKeyName, "classname") == 0) &&
+             (strcmp(pkvd->szValue, "info_ctfdetect") == 0))
+         {
+            pent_info_ctfdetect = pentKeyvalue;
+         }
+      }
+   }
+
+   (*other_gFunctionTable.pfnKeyValue)(pentKeyvalue, pkvd);
+}
+
+void DispatchSave( edict_t *pent, SAVERESTOREDATA *pSaveData )
+{
+   (*other_gFunctionTable.pfnSave)(pent, pSaveData);
+}
+
+int DispatchRestore( edict_t *pent, SAVERESTOREDATA *pSaveData, int globalEntity )
+{
+   return (*other_gFunctionTable.pfnRestore)(pent, pSaveData, globalEntity);
+}
+
+void DispatchObjectCollsionBox( edict_t *pent )
+{
+   (*other_gFunctionTable.pfnSetAbsBox)(pent);
+}
+
+void SaveWriteFields( SAVERESTOREDATA *pSaveData, const char *pname, void *pBaseData, TYPEDESCRIPTION *pFields, int fieldCount )
+{
+   (*other_gFunctionTable.pfnSaveWriteFields)(pSaveData, pname, pBaseData, pFields, fieldCount);
+}
+
+void SaveReadFields( SAVERESTOREDATA *pSaveData, const char *pname, void *pBaseData, TYPEDESCRIPTION *pFields, int fieldCount )
+{
+   (*other_gFunctionTable.pfnSaveReadFields)(pSaveData, pname, pBaseData, pFields, fieldCount);
+}
+
+void SaveGlobalState( SAVERESTOREDATA *pSaveData )
+{
+   (*other_gFunctionTable.pfnSaveGlobalState)(pSaveData);
+}
+
+void RestoreGlobalState( SAVERESTOREDATA *pSaveData )
+{
+   (*other_gFunctionTable.pfnRestoreGlobalState)(pSaveData);
+}
+
+void ResetGlobalState( void )
+{
+   (*other_gFunctionTable.pfnResetGlobalState)();
+}
+
+BOOL ClientConnect( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[ 128 ]  )
+{ 
+   if (gpGlobals->deathmatch)
+   {
+      int i;
+      int count = 0;
+
+      if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp, "ClientConnect: pent=%x name=%s\n",pEntity,pszName); fclose(fp); }
+
+      // check if this client is the listen server client
+      if (strcmp(pszAddress, "loopback") == 0)
+      {
+         // save the edict of the listen server client...
+         listenserver_edict = pEntity;
+      }
+
+      // check if this is NOT a bot joining the server...
+      if (strcmp(pszAddress, "127.0.0.1") != 0)
+      {
+         // don't try to add bots for 60 seconds, give client time to get added
+         bot_check_time = gpGlobals->time + 60.0;
+
+         for (i=0; i < 32; i++)
+         {
+            if (bots[i].is_used)  // count the number of bots in use
+               count++;
+         }
+
+         // if there are currently more than the minimum number of bots running
+         // then kick one of the bots off the server...
+         if ((count > min_bots) && (min_bots != -1))
+         {
+            for (i=0; i < 32; i++)
+            {
+               if (bots[i].is_used)  // is this slot used?
+               {
+                  char cmd[80];
+
+                  sprintf(cmd, "kick \"%s\"\n", bots[i].name);
+
+                  SERVER_COMMAND(cmd);  // kick the bot using (kick "name")
+
+                  break;
+               }
+            }
+         }
+      }
+   }
+
+   return (*other_gFunctionTable.pfnClientConnect)(pEntity, pszName, pszAddress, szRejectReason);
+}
+
+void ClientDisconnect( edict_t *pEntity )
+{
+   if (gpGlobals->deathmatch)
+   {
+      int i;
+
+      if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp, "ClientDisconnect: %x\n",pEntity); fclose(fp); }
+
+      i = 0;
+      while ((i < 32) && (clients[i] != pEntity))
+         i++;
+
+      if (i < 32)
+         clients[i] = NULL;
+
+
+      for (i=0; i < 32; i++)
+      {
+         if (bots[i].pEdict == pEntity)
+         {
+            // someone kicked this bot off of the server...
+
+            bots[i].is_used = FALSE;  // this slot is now free to use
+
+            bots[i].kick_time = gpGlobals->time;  // save the kicked time
+
+            break;
+         }
+      }
+   }
+
+   (*other_gFunctionTable.pfnClientDisconnect)(pEntity);
+}
+
+void ClientKill( edict_t *pEntity )
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp, "ClientKill: %x\n",pEntity); fclose(fp); }
+   (*other_gFunctionTable.pfnClientKill)(pEntity);
+}
+
+void ClientPutInServer( edict_t *pEntity )
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp, "ClientPutInServer: %x\n",pEntity); fclose(fp); }
+
+   int i = 0;
+
+   while ((i < 32) && (clients[i] != NULL))
+      i++;
+
+   if (i < 32)
+      clients[i] = pEntity;  // store this clients edict in the clients array
+
+   (*other_gFunctionTable.pfnClientPutInServer)(pEntity);
+}
+
+void ClientCommand( edict_t *pEntity )
+{
+   // only allow custom commands if deathmatch mode and NOT dedicated server and
+   // client sending command is the listen server client...
+
+   if ((gpGlobals->deathmatch) && /*(!IS_DEDICATED_SERVER()) &&*/
+       (pEntity == listenserver_edict))
+   {
+      const char *pcmd = Cmd_Argv(0);
+      const char *arg1 = Cmd_Argv(1);
+      const char *arg2 = Cmd_Argv(2);
+      const char *arg3 = Cmd_Argv(3);
+      const char *arg4 = Cmd_Argv(4);
+      char msg[80];
+
+      if (debug_engine)
+      {
+         fp=fopen("bot.txt","a"); fprintf(fp,"ClientCommand: %s",pcmd);
+         if ((arg1 != NULL) && (*arg1 != 0))
+            fprintf(fp," %s", arg1);
+         if ((arg2 != NULL) && (*arg2 != 0))
+            fprintf(fp," %s", arg2);
+         if ((arg3 != NULL) && (*arg3 != 0))
+            fprintf(fp," %s", arg3);
+         if ((arg4 != NULL) && (*arg4 != 0))
+            fprintf(fp," %s", arg4);
+         fprintf(fp, "\n");
+         fclose(fp);
+      }
+
+      if (FStrEq(pcmd, "addbot"))
+      {
+         BotCreate( pEntity, arg1, arg2, arg3, arg4 );
+
+         bot_check_time = gpGlobals->time + 5.0;
+
+         return;
+      }
+      else if (FStrEq(pcmd, "observer"))
+      {
+         if ((arg1 != NULL) && (*arg1 != 0))
+         {
+            int temp = atoi(arg1);
+            if (temp)
+               b_observer_mode = TRUE;
+            else
+               b_observer_mode = FALSE;
+         }
+
+         if (b_observer_mode)
+            ClientPrint(pEntity, HUD_PRINTNOTIFY, "observer mode ENABLED\n");
+         else
+            ClientPrint(pEntity, HUD_PRINTNOTIFY, "observer mode DISABLED\n");
+
+         return;
+      }
+      else if (FStrEq(pcmd, "botskill"))
+      {
+         if ((arg1 != NULL) && (*arg1 != 0))
+         {
+            int temp = atoi(arg1);
+
+            if ((temp < 1) || (temp > 5))
+               ClientPrint(pEntity, HUD_PRINTNOTIFY, "invalid botskill value!\n");
+            else
+               default_bot_skill = temp;
+         }
+
+         sprintf(msg, "botskill is %d\n", default_bot_skill);
+         ClientPrint(pEntity, HUD_PRINTNOTIFY, msg);
+
+         return;
+      }
+      else if (FStrEq(pcmd, "botdontshoot"))
+      {
+         if ((arg1 != NULL) && (*arg1 != 0))
+         {
+            int temp = atoi(arg1);
+            if (temp)
+               b_botdontshoot = TRUE;
+            else
+               b_botdontshoot = FALSE;
+         }
+
+         if (b_botdontshoot)
+            ClientPrint(pEntity, HUD_PRINTNOTIFY, "botdontshoot ENABLED\n");
+         else
+            ClientPrint(pEntity, HUD_PRINTNOTIFY, "botdontshoot DISABLED\n");
+
+         return;
+      }
+      else if (FStrEq(pcmd, "debug_engine"))
+      {
+         debug_engine = 1;
+
+         ClientPrint(pEntity, HUD_PRINTNOTIFY, "debug_engine enabled!\n");
+
+         return;
+      }
+      else if (FStrEq(pcmd, "waypoint"))
+      {
+         if (FStrEq(arg1, "on"))
+         {
+            g_waypoint_on = TRUE;
+
+            ClientPrint(pEntity, HUD_PRINTNOTIFY, "waypoints are ON\n");
+         }
+         else if (FStrEq(arg1, "off"))
+         {
+            g_waypoint_on = FALSE;
+
+            ClientPrint(pEntity, HUD_PRINTNOTIFY, "waypoints are OFF\n");
+         }
+         else if (FStrEq(arg1, "add"))
+         {
+            if (!g_waypoint_on)
+               g_waypoint_on = TRUE;  // turn waypoints on if off
+
+            WaypointAdd(pEntity);
+         }
+         else if (FStrEq(arg1, "delete"))
+         {
+            if (!g_waypoint_on)
+               g_waypoint_on = TRUE;  // turn waypoints on if off
+
+            WaypointDelete(pEntity);
+         }
+         else if (FStrEq(arg1, "save"))
+         {
+            WaypointSave();
+
+            ClientPrint(pEntity, HUD_PRINTNOTIFY, "waypoints saved\n");
+         }
+         else if (FStrEq(arg1, "load"))
+         {
+            if (WaypointLoad(pEntity))
+               ClientPrint(pEntity, HUD_PRINTNOTIFY, "waypoints loaded\n");
+         }
+         else if (FStrEq(arg1, "menu"))
+         {
+            int index;
+
+            if (num_waypoints < 1)
+               return;
+
+            index = WaypointFindNearest(pEntity, 50.0, -1);
+
+            if (index == -1)
+               return;
+
+            g_menu_waypoint = index;
+            g_menu_state = MENU_1;
+
+            UTIL_ShowMenu(pEntity, 0x1F, -1, FALSE, show_menu_1);
+         }
+         else if (FStrEq(arg1, "info"))
+         {
+            WaypointPrintInfo(pEntity);
+         }
+         else
+         {
+            if (g_waypoint_on)
+               ClientPrint(pEntity, HUD_PRINTNOTIFY, "waypoints are ON\n");
+            else
+               ClientPrint(pEntity, HUD_PRINTNOTIFY, "waypoints are OFF\n");
+         }
+
+         return;
+      }
+      else if (FStrEq(pcmd, "autowaypoint"))
+      {
+         if (FStrEq(arg1, "on"))
+         {
+            g_auto_waypoint = TRUE;
+            g_waypoint_on = TRUE;  // turn this on just in case
+         }
+         else if (FStrEq(arg1, "off"))
+         {
+            g_auto_waypoint = FALSE;
+         }
+
+         if (g_auto_waypoint)
+            sprintf(msg, "autowaypoint is ON\n");
+         else
+            sprintf(msg, "autowaypoint is OFF\n");
+
+         ClientPrint(pEntity, HUD_PRINTNOTIFY, msg);
+
+         return;
+      }
+      else if (FStrEq(pcmd, "pathwaypoint"))
+      {
+         if (FStrEq(arg1, "on"))
+         {
+            g_path_waypoint = TRUE;
+            g_waypoint_on = TRUE;  // turn this on just in case
+
+            ClientPrint(pEntity, HUD_PRINTNOTIFY, "pathwaypoint is ON\n");
+         }
+         else if (FStrEq(arg1, "off"))
+         {
+            g_path_waypoint = FALSE;
+
+            ClientPrint(pEntity, HUD_PRINTNOTIFY, "pathwaypoint is OFF\n");
+         }
+         else if (FStrEq(arg1, "create1"))
+         {
+            WaypointCreatePath(pEntity, 1);
+         }
+         else if (FStrEq(arg1, "create2"))
+         {
+            WaypointCreatePath(pEntity, 2);
+         }
+         else if (FStrEq(arg1, "remove1"))
+         {
+            WaypointRemovePath(pEntity, 1);
+         }
+         else if (FStrEq(arg1, "remove2"))
+         {
+            WaypointRemovePath(pEntity, 2);
+         }
+
+         return;
+      }
+      else if (FStrEq(pcmd, "menuselect") && (g_menu_state != MENU_NONE))
+      {
+         if (g_menu_state == MENU_1)  // main menu...
+         {
+            if (FStrEq(arg1, "1"))  // team specific...
+            {
+               g_menu_state = MENU_2;  // display team specific menu...
+
+               if (mod_id == FRONTLINE_DLL)
+                  UTIL_ShowMenu(pEntity, 0x13, -1, FALSE, show_menu_2_flf);
+               else
+                  UTIL_ShowMenu(pEntity, 0x1F, -1, FALSE, show_menu_2);
+
+               return;
+            }
+            else if (FStrEq(arg1, "2"))  // wait for lift...
+            {
+               if (waypoints[g_menu_waypoint].flags & W_FL_LIFT)
+                  waypoints[g_menu_waypoint].flags &= ~W_FL_LIFT;  // off
+               else
+                  waypoints[g_menu_waypoint].flags |= W_FL_LIFT;  // on
+            }
+            else if (FStrEq(arg1, "3"))  // door waypoint
+            {
+               if (waypoints[g_menu_waypoint].flags & W_FL_DOOR)
+                  waypoints[g_menu_waypoint].flags &= ~W_FL_DOOR;  // off
+               else
+                  waypoints[g_menu_waypoint].flags |= W_FL_DOOR;  // on
+            }
+            else if (FStrEq(arg1, "4"))  // sniper spot
+            {
+               if (waypoints[g_menu_waypoint].flags & W_FL_SNIPER)
+                  waypoints[g_menu_waypoint].flags &= ~W_FL_SNIPER;  // off
+               else
+               {
+                  waypoints[g_menu_waypoint].flags |= W_FL_SNIPER;  // on
+
+                  // set the aiming waypoint...
+
+                  WaypointAddAiming(pEntity);
+               }
+            }
+            else if (FStrEq(arg1, "5"))  // more...
+            {
+               g_menu_state = MENU_3;
+
+               if (mod_id == FRONTLINE_DLL)
+                  UTIL_ShowMenu(pEntity, 0x17, -1, FALSE, show_menu_3_flf);
+               else
+                  UTIL_ShowMenu(pEntity, 0x13, -1, FALSE, show_menu_3);
+
+               return;
+            }
+         }
+         else if (g_menu_state == MENU_2)  // team specific menu
+         {
+            if (waypoints[g_menu_waypoint].flags & W_FL_TEAM_SPECIFIC)
+            {
+               waypoints[g_menu_waypoint].flags &= ~W_FL_TEAM;
+               waypoints[g_menu_waypoint].flags &= ~W_FL_TEAM_SPECIFIC; // off
+            }
+            else
+            {
+               int team = atoi(arg1);
+
+               team--;  // make 0 to 3
+
+               // this is kind of a kludge (team bits MUST be LSB!!!)
+               waypoints[g_menu_waypoint].flags |= team;
+               waypoints[g_menu_waypoint].flags |= W_FL_TEAM_SPECIFIC; // on
+            }
+         }
+         else if (g_menu_state == MENU_3)  // second menu...
+         {
+            if (mod_id == FRONTLINE_DLL)
+            {
+               if (FStrEq(arg1, "1"))  // capture point
+               {
+                  if (waypoints[g_menu_waypoint].flags & W_FL_FLF_CAP)
+                     waypoints[g_menu_waypoint].flags &= ~W_FL_FLF_CAP;  // off
+                  else
+                     waypoints[g_menu_waypoint].flags |= W_FL_FLF_CAP;  // on
+               }
+               else if (FStrEq(arg1, "2"))  // defend point
+               {
+                  if (waypoints[g_menu_waypoint].flags & W_FL_FLF_DEFEND)
+                     waypoints[g_menu_waypoint].flags &= ~W_FL_FLF_DEFEND;  // off
+                  else
+                  {
+                     waypoints[g_menu_waypoint].flags |= W_FL_FLF_DEFEND;  // on
+
+                     // set the aiming waypoint...
+
+                     WaypointAddAiming(pEntity);
+                  }
+               }
+               else if (FStrEq(arg1, "3"))  // go prone
+               {
+                  if (waypoints[g_menu_waypoint].flags & W_FL_PRONE)
+                     waypoints[g_menu_waypoint].flags &= ~W_FL_PRONE;  // off
+                  else
+                     waypoints[g_menu_waypoint].flags |= W_FL_PRONE;  // on
+               }
+            }
+            else
+            {
+               if (FStrEq(arg1, "1"))  // flag location
+               {
+                  if (waypoints[g_menu_waypoint].flags & W_FL_TFC_FLAG)
+                     waypoints[g_menu_waypoint].flags &= ~W_FL_TFC_FLAG;  // off
+                  else
+                     waypoints[g_menu_waypoint].flags |= W_FL_TFC_FLAG;  // on
+               }
+               else if (FStrEq(arg1, "2"))  // flag goal
+               {
+                  if (waypoints[g_menu_waypoint].flags & W_FL_TFC_FLAG_GOAL)
+                     waypoints[g_menu_waypoint].flags &= ~W_FL_TFC_FLAG_GOAL;  // off
+                  else
+                     waypoints[g_menu_waypoint].flags |= W_FL_TFC_FLAG_GOAL;  // on
+               }
+            }
+         }
+
+         g_menu_state = MENU_NONE;
+
+         return;
+      }
+      else if (FStrEq(pcmd, "search"))
+      {
+         edict_t *pent = NULL;
+         float radius = 50;
+         char str[80];
+
+         ClientPrint(pEntity, HUD_PRINTCONSOLE, "searching...\n");
+
+         while ((pent = UTIL_FindEntityInSphere( pent, pEntity->v.origin, radius )) != NULL)
+         {
+            sprintf(str, "Found %s at %5.2f %5.2f %5.2f\n",
+                       STRING(pent->v.classname),
+                       pent->v.origin.x, pent->v.origin.y,
+                       pent->v.origin.z);
+            ClientPrint(pEntity, HUD_PRINTCONSOLE, str);
+
+            FILE *fp=fopen("bot.txt", "a");
+            fprintf(fp, "ClientCommmand: search %s", str);
+            fclose(fp);
+         }
+
+         return;
+      }
+   }
+
+   (*other_gFunctionTable.pfnClientCommand)(pEntity);
+}
+
+void ClientUserInfoChanged( edict_t *pEntity, char *infobuffer )
+{
+   if (debug_engine) { fp=fopen("bot.txt", "a"); fprintf(fp, "ClientUserInfoChanged: pEntity=%x infobuffer=%s\n", pEntity, infobuffer); fclose(fp); }
+
+   (*other_gFunctionTable.pfnClientUserInfoChanged)(pEntity, infobuffer);
+}
+
+void ServerActivate( edict_t *pEdictList, int edictCount, int clientMax )
+{
+   (*other_gFunctionTable.pfnServerActivate)(pEdictList, edictCount, clientMax);
+}
+
+void ServerDeactivate( void )
+{
+   (*other_gFunctionTable.pfnServerDeactivate)();
+}
+
+void PlayerPreThink( edict_t *pEntity )
+{
+   (*other_gFunctionTable.pfnPlayerPreThink)(pEntity);
+}
+
+void PlayerPostThink( edict_t *pEntity )
+{
+   (*other_gFunctionTable.pfnPlayerPostThink)(pEntity);
+}
+
+void StartFrame( void )
+{
+   if (gpGlobals->deathmatch)
+   {
+      edict_t *pPlayer;
+      static float check_server_cmd = 0.0;
+      static int i, index, player_index, bot_index;
+      static float previous_time = -1.0;
+      static float client_update_time = 0.0;
+      clientdata_s cd;
+      char msg[256];
+      int count;
+
+      // if a new map has started then (MUST BE FIRST IN StartFrame)...
+      if ((gpGlobals->time + 0.1) < previous_time)
+      {
+         char filename[256];
+         char mapname[64];
+
+         check_server_cmd = 0.0;  // reset at start of map
+
+         // check if mapname_bot.cfg file exists...
+
+         strcpy(mapname, STRING(gpGlobals->mapname));
+         strcat(mapname, "_bot.cfg");
+
+         UTIL_BuildFileName(filename, "maps", mapname);
+
+         if ((bot_cfg_fp = fopen(filename, "r")) != NULL)
+         {
+            sprintf(msg, "Executing %s\n", filename);
+            ALERT( at_console, msg );
+
+            for (index = 0; index < 32; index++)
+            {
+               bots[index].is_used = FALSE;
+               bots[index].respawn_state = 0;
+               bots[index].kick_time = 0.0;
+            }
+
+            if (IS_DEDICATED_SERVER())
+               bot_cfg_pause_time = gpGlobals->time + 5.0;
+            else
+               bot_cfg_pause_time = gpGlobals->time + 20.0;
+         }
+         else
+         {
+            count = 0;
+
+            // mark the bots as needing to be respawned...
+            for (index = 0; index < 32; index++)
+            {
+               if (count >= prev_num_bots)
+               {
+                  bots[index].is_used = FALSE;
+                  bots[index].respawn_state = 0;
+                  bots[index].kick_time = 0.0;
+               }
+
+               if (bots[index].is_used)  // is this slot used?
+               {
+                  bots[index].respawn_state = RESPAWN_NEED_TO_RESPAWN;
+                  count++;
+               }
+
+               // check for any bots that were very recently kicked...
+               if ((bots[index].kick_time + 5.0) > previous_time)
+               {
+                  bots[index].respawn_state = RESPAWN_NEED_TO_RESPAWN;
+                  count++;
+               }
+               else
+                  bots[index].kick_time = 0.0;  // reset to prevent false spawns later
+            }
+
+            // set the respawn time
+            if (IS_DEDICATED_SERVER())
+               respawn_time = gpGlobals->time + 5.0;
+            else
+               respawn_time = gpGlobals->time + 20.0;
+         }
+
+         client_update_time = gpGlobals->time + 10.0;  // start updating client data again
+
+         bot_check_time = gpGlobals->time + 30.0;
+      }
+
+      if (!IS_DEDICATED_SERVER())
+      {
+         if ((listenserver_edict != NULL) && (welcome_sent == FALSE) &&
+             (welcome_time < 1.0))
+         {
+            // are they out of observer mode yet?
+            if (IsAlive(listenserver_edict))
+               welcome_time = gpGlobals->time + 5.0;  // welcome in 5 seconds
+         }
+
+         if ((welcome_time > 0.0) && (welcome_time < gpGlobals->time) &&
+             (welcome_sent == FALSE))
+         {
+            // let's send a welcome message to this client...
+            //UTIL_SayText(welcome_msg, listenserver_edict);
+
+            welcome_sent = TRUE;  // clear this so we only do it once
+         }
+      }
+
+      if (client_update_time <= gpGlobals->time)
+      {
+         client_update_time = gpGlobals->time + 1.0;
+
+         for (i=0; i < 32; i++)
+         {
+            if (bots[i].is_used)
+            {
+               memset(&cd, 0, sizeof(cd));
+
+               UpdateClientData( bots[i].pEdict, 1, &cd );
+
+               // see if a weapon was dropped...
+               if (bots[i].bot_weapons != cd.weapons)
+               {
+                  bots[i].bot_weapons = cd.weapons;
+               }
+            }
+         }
+      }
+
+      count = 0;
+
+      for (bot_index = 0; bot_index < gpGlobals->maxClients; bot_index++)
+      {
+         if ((bots[bot_index].is_used) &&  // is this slot used AND
+             (bots[bot_index].respawn_state == RESPAWN_IDLE))  // not respawning
+         {
+            BotThink(&bots[bot_index]);
+
+            count++;
+
+            if ((mod_id == FRONTLINE_DLL) && (flf_bug_check == 0))
+            {
+               edict_t *pent = NULL;
+               int fix_flag = 0;
+
+               flf_bug_check = 1;
+
+               while ((pent = UTIL_FindEntityByClassname( pent, "capture_point" )) != NULL)
+               {
+                  if (pent->v.skin != 0)  // not blue skin?
+                  {
+                     flf_bug_fix = 1;  // need to use bug fix code
+                  }
+               }
+            }
+         }
+      }
+
+      if (count > num_bots)
+         num_bots = count;
+
+      for (player_index = 1; player_index <= gpGlobals->maxClients; player_index++)
+      {
+         pPlayer = INDEXENT(player_index);
+
+         if (pPlayer && !pPlayer->free)
+         {
+            if ((g_waypoint_on) && FBitSet(pPlayer->v.flags, FL_CLIENT))
+            {
+                  WaypointThink(pPlayer);
+            }
+
+            if ((mod_id == FRONTLINE_DLL) && (flf_bug_check == 0))
+            {
+               edict_t *pent = NULL;
+               int fix_flag = 0;
+
+               flf_bug_check = 1;
+
+               while ((pent = UTIL_FindEntityByClassname( pent, "capture_point" )) != NULL)
+               {
+                  if (pent->v.skin != 0)  // not blue skin?
+                  {
+                     flf_bug_fix = 1;  // need to use bug fix code
+                  }
+               }
+            }
+         }
+      }
+
+      // are we currently respawning bots and is it time to spawn one yet?
+      if ((respawn_time > 1.0) && (respawn_time <= gpGlobals->time))
+      {
+         int index = 0;
+
+         // find bot needing to be respawned...
+         while ((index < 32) &&
+                (bots[index].respawn_state != RESPAWN_NEED_TO_RESPAWN))
+            index++;
+
+         if (index < 32)
+         {
+            bots[index].respawn_state = RESPAWN_IS_RESPAWNING;
+            bots[index].is_used = FALSE;      // free up this slot
+
+            // respawn 1 bot then wait a while (otherwise engine crashes)
+            if ((mod_id == VALVE_DLL) ||
+                ((mod_id == GEARBOX_DLL) && (pent_info_ctfdetect == NULL)))
+            {
+               char c_skill[2];
+
+               sprintf(c_skill, "%d", bots[index].bot_skill);
+
+               BotCreate(NULL, bots[index].skin, bots[index].name, c_skill, NULL);
+            }
+            else
+            {
+               char c_skill[2];
+               char c_team[2];
+               char c_class[3];
+
+               sprintf(c_skill, "%d", bots[index].bot_skill);
+               sprintf(c_team, "%d", bots[index].bot_team);
+               sprintf(c_class, "%d", bots[index].bot_class);
+
+               if ((mod_id == TFC_DLL) || (mod_id == GEARBOX_DLL))
+                  BotCreate(NULL, NULL, NULL, bots[index].name, c_skill);
+               else
+                  BotCreate(NULL, c_team, c_class, bots[index].name, c_skill);
+            }
+
+            respawn_time = gpGlobals->time + 2.0;  // set next respawn time
+
+            bot_check_time = gpGlobals->time + 5.0;
+         }
+         else
+         {
+            respawn_time = 0.0;
+         }
+      }
+
+      if (g_GameRules)
+      {
+         if (need_to_open_cfg)  // have we open bot.cfg file yet?
+         {
+            char filename[256];
+            char mapname[64];
+
+            need_to_open_cfg = FALSE;  // only do this once!!!
+
+            // check if mapname_bot.cfg file exists...
+
+            strcpy(mapname, STRING(gpGlobals->mapname));
+            strcat(mapname, "_bot.cfg");
+
+            UTIL_BuildFileName(filename, "maps", mapname);
+
+            if ((bot_cfg_fp = fopen(filename, "r")) != NULL)
+            {
+               sprintf(msg, "Executing %s\n", filename);
+               ALERT( at_console, msg );
+            }
+            else
+            {
+               UTIL_BuildFileName(filename, "bot.cfg", NULL);
+
+               sprintf(msg, "Executing %s\n", filename);
+               ALERT( at_console, msg );
+
+               bot_cfg_fp = fopen(filename, "r");
+
+               if (bot_cfg_fp == NULL)
+                  ALERT( at_console, "bot.cfg file not found\n" );
+            }
+
+            if (IS_DEDICATED_SERVER())
+               bot_cfg_pause_time = gpGlobals->time + 5.0;
+            else
+               bot_cfg_pause_time = gpGlobals->time + 20.0;
+         }
+
+         if (!IS_DEDICATED_SERVER() && !spawn_time_reset)
+         {
+            if (listenserver_edict != NULL)
+            {
+               if (IsAlive(listenserver_edict))
+               {
+                  spawn_time_reset = TRUE;
+
+                  if (respawn_time >= 1.0)
+                     respawn_time = min(respawn_time, gpGlobals->time + (float)1.0);
+
+                  if (bot_cfg_pause_time >= 1.0)
+                     bot_cfg_pause_time = min(bot_cfg_pause_time, gpGlobals->time + (float)1.0);
+               }
+            }
+         }
+
+         if ((bot_cfg_fp) &&
+             (bot_cfg_pause_time >= 1.0) && (bot_cfg_pause_time <= gpGlobals->time))
+         {
+            // process bot.cfg file options...
+            ProcessBotCfgFile();
+         }
+
+      }      
+
+      // if time to check for server commands then do so...
+      if ((check_server_cmd <= gpGlobals->time) && IS_DEDICATED_SERVER())
+      {
+         check_server_cmd = gpGlobals->time + 1.0;
+
+         char *cvar_bot = (char *)CVAR_GET_STRING( "bot" );
+
+         if ( cvar_bot && cvar_bot[0] )
+         {
+            char cmd_line[80];
+            char *cmd, *arg1, *arg2, *arg3, *arg4;
+
+            strcpy(cmd_line, cvar_bot);
+
+            index = 0;
+            cmd = cmd_line;
+            arg1 = arg2 = arg3 = arg4 = NULL;
+
+            // skip to blank or end of string...
+            while ((cmd_line[index] != ' ') && (cmd_line[index] != 0))
+               index++;
+
+            if (cmd_line[index] == ' ')
+            {
+               cmd_line[index++] = 0;
+               arg1 = &cmd_line[index];
+
+               // skip to blank or end of string...
+               while ((cmd_line[index] != ' ') && (cmd_line[index] != 0))
+                  index++;
+
+               if (cmd_line[index] == ' ')
+               {
+                  cmd_line[index++] = 0;
+                  arg2 = &cmd_line[index];
+
+                  // skip to blank or end of string...
+                  while ((cmd_line[index] != ' ') && (cmd_line[index] != 0))
+                     index++;
+
+                  if (cmd_line[index] == ' ')
+                  {
+                     cmd_line[index++] = 0;
+                     arg3 = &cmd_line[index];
+
+                     // skip to blank or end of string...
+                     while ((cmd_line[index] != ' ') && (cmd_line[index] != 0))
+                        index++;
+
+                     if (cmd_line[index] == ' ')
+                     {
+                        cmd_line[index++] = 0;
+                        arg4 = &cmd_line[index];
+                     }
+                  }
+               }
+            }
+
+            if (strcmp(cmd, "addbot") == 0)
+            {
+               BotCreate( NULL, arg1, arg2, arg3, arg4 );
+
+               bot_check_time = gpGlobals->time + 5.0;
+            }
+            else if (strcmp(cmd, "min_bots") == 0)
+            {
+               min_bots = atoi( arg1 );
+
+               if ((min_bots < 0) || (min_bots > 31))
+                  min_bots = 1;
+      
+               sprintf(msg, "min_bots set to %d\n", min_bots);
+               printf(msg);
+            }
+            else if (strcmp(cmd, "max_bots") == 0)
+            {
+               max_bots = atoi( arg1 );
+     
+               if ((max_bots < 0) || (max_bots > 31)) 
+                  max_bots = 1;
+
+               sprintf(msg, "max_bots set to %d\n", max_bots);
+               printf(msg);
+            }
+
+            CVAR_SET_STRING("bot", "");
+         }
+      }
+
+      // check if time to see if a bot needs to be created...
+      if (bot_check_time < gpGlobals->time)
+      {
+         int count = 0;
+
+         bot_check_time = gpGlobals->time + 5.0;
+
+         for (i = 0; i < 32; i++)
+         {
+            if (clients[i] != NULL)
+               count++;
+         }
+
+         // if there are currently less than the maximum number of "players"
+         // then add another bot using the default skill level...
+         if ((count < max_bots) && (max_bots != -1))
+         {
+            BotCreate( NULL, NULL, NULL, NULL, NULL );
+         }
+      }
+
+      previous_time = gpGlobals->time;
+   }
+
+   (*other_gFunctionTable.pfnStartFrame)();
+}
+
+void ParmsNewLevel( void )
+{
+   (*other_gFunctionTable.pfnParmsNewLevel)();
+}
+
+void ParmsChangeLevel( void )
+{
+   (*other_gFunctionTable.pfnParmsChangeLevel)();
+}
+
+const char *GetGameDescription( void )
+{
+   return (*other_gFunctionTable.pfnGetGameDescription)();
+}
+
+void PlayerCustomization( edict_t *pEntity, customization_t *pCust )
+{
+   if (debug_engine) { fp=fopen("bot.txt", "a"); fprintf(fp, "PlayerCustomization: %x\n",pEntity); fclose(fp); }
+
+   (*other_gFunctionTable.pfnPlayerCustomization)(pEntity, pCust);
+}
+
+void SpectatorConnect( edict_t *pEntity )
+{
+   (*other_gFunctionTable.pfnSpectatorConnect)(pEntity);
+}
+
+void SpectatorDisconnect( edict_t *pEntity )
+{
+   (*other_gFunctionTable.pfnSpectatorDisconnect)(pEntity);
+}
+
+void SpectatorThink( edict_t *pEntity )
+{
+   (*other_gFunctionTable.pfnSpectatorThink)(pEntity);
+}
+
+void Sys_Error( const char *error_string )
+{
+   (*other_gFunctionTable.pfnSys_Error)(error_string);
+}
+
+void PM_Move ( struct playermove_s *ppmove, int server )
+{
+   (*other_gFunctionTable.pfnPM_Move)(ppmove, server);
+}
+
+void PM_Init ( struct playermove_s *ppmove )
+{
+   (*other_gFunctionTable.pfnPM_Init)(ppmove);
+}
+
+char PM_FindTextureType( char *name )
+{
+   return (*other_gFunctionTable.pfnPM_FindTextureType)(name);
+}
+
+void SetupVisibility( edict_t *pViewEntity, edict_t *pClient, unsigned char **pvs, unsigned char **pas )
+{
+   (*other_gFunctionTable.pfnSetupVisibility)(pViewEntity, pClient, pvs, pas);
+}
+
+void UpdateClientData ( const struct edict_s *ent, int sendweapons, struct clientdata_s *cd )
+{
+   (*other_gFunctionTable.pfnUpdateClientData)(ent, sendweapons, cd);
+}
+
+int AddToFullPack( struct entity_state_s *state, int e, edict_t *ent, edict_t *host, int hostflags, int player, unsigned char *pSet )
+{
+   return (*other_gFunctionTable.pfnAddToFullPack)(state, e, ent, host, hostflags, player, pSet);
+}
+
+void CreateBaseline( int player, int eindex, struct entity_state_s *baseline, struct edict_s *entity, int playermodelindex, vec3_t player_mins, vec3_t player_maxs )
+{
+   (*other_gFunctionTable.pfnCreateBaseline)(player, eindex, baseline, entity, playermodelindex, player_mins, player_maxs);
+}
+
+void RegisterEncoders( void )
+{
+   (*other_gFunctionTable.pfnRegisterEncoders)();
+}
+
+int GetWeaponData( struct edict_s *player, struct weapon_data_s *info )
+{
+   return (*other_gFunctionTable.pfnGetWeaponData)(player, info);
+}
+
+void CmdStart( const edict_t *player, const struct usercmd_s *cmd, unsigned int random_seed )
+{
+   (*other_gFunctionTable.pfnCmdStart)(player, cmd, random_seed);
+}
+
+void CmdEnd ( const edict_t *player )
+{
+   (*other_gFunctionTable.pfnCmdEnd)(player);
+}
+
+int ConnectionlessPacket( const struct netadr_s *net_from, const char *args, char *response_buffer, int *response_buffer_size )
+{
+   return (*other_gFunctionTable.pfnConnectionlessPacket)(net_from, args, response_buffer, response_buffer_size);
+}
+
+int GetHullBounds( int hullnumber, float *mins, float *maxs )
+{
+   return (*other_gFunctionTable.pfnGetHullBounds)(hullnumber, mins, maxs);
+}
+
+void CreateInstancedBaselines( void )
+{
+   (*other_gFunctionTable.pfnCreateInstancedBaselines)();
+}
+
+int InconsistentFile( const edict_t *player, const char *filename, char *disconnect_message )
+{
+   if (debug_engine) { fp=fopen("bot.txt", "a"); fprintf(fp, "InconsistentFile: %x filename=%s\n",player,filename); fclose(fp); }
+
+   return (*other_gFunctionTable.pfnInconsistentFile)(player, filename, disconnect_message);
+}
+
+int AllowLagCompensation( void )
+{
+   return (*other_gFunctionTable.pfnAllowLagCompensation)();
+}
+
+
+DLL_FUNCTIONS gFunctionTable =
+{
+   GameDLLInit,               //pfnGameInit
+   DispatchSpawn,             //pfnSpawn
+   DispatchThink,             //pfnThink
+   DispatchUse,               //pfnUse
+   DispatchTouch,             //pfnTouch
+   DispatchBlocked,           //pfnBlocked
+   DispatchKeyValue,          //pfnKeyValue
+   DispatchSave,              //pfnSave
+   DispatchRestore,           //pfnRestore
+   DispatchObjectCollsionBox, //pfnAbsBox
+
+   SaveWriteFields,           //pfnSaveWriteFields
+   SaveReadFields,            //pfnSaveReadFields
+
+   SaveGlobalState,           //pfnSaveGlobalState
+   RestoreGlobalState,        //pfnRestoreGlobalState
+   ResetGlobalState,          //pfnResetGlobalState
+
+   ClientConnect,             //pfnClientConnect
+   ClientDisconnect,          //pfnClientDisconnect
+   ClientKill,                //pfnClientKill
+   ClientPutInServer,         //pfnClientPutInServer
+   ClientCommand,             //pfnClientCommand
+   ClientUserInfoChanged,     //pfnClientUserInfoChanged
+   ServerActivate,            //pfnServerActivate
+   ServerDeactivate,          //pfnServerDeactivate
+
+   PlayerPreThink,            //pfnPlayerPreThink
+   PlayerPostThink,           //pfnPlayerPostThink
+
+   StartFrame,                //pfnStartFrame
+   ParmsNewLevel,             //pfnParmsNewLevel
+   ParmsChangeLevel,          //pfnParmsChangeLevel
+
+   GetGameDescription,        //pfnGetGameDescription    Returns string describing current .dll game.
+   PlayerCustomization,       //pfnPlayerCustomization   Notifies .dll of new customization for player.
+
+   SpectatorConnect,          //pfnSpectatorConnect      Called when spectator joins server
+   SpectatorDisconnect,       //pfnSpectatorDisconnect   Called when spectator leaves the server
+   SpectatorThink,            //pfnSpectatorThink        Called when spectator sends a command packet (usercmd_t)
+
+   Sys_Error,                 //pfnSys_Error          Called when engine has encountered an error
+
+   PM_Move,                   //pfnPM_Move
+   PM_Init,                   //pfnPM_Init            Server version of player movement initialization
+   PM_FindTextureType,        //pfnPM_FindTextureType
+
+   SetupVisibility,           //pfnSetupVisibility        Set up PVS and PAS for networking for this client
+   UpdateClientData,          //pfnUpdateClientData       Set up data sent only to specific client
+   AddToFullPack,             //pfnAddToFullPack
+   CreateBaseline,            //pfnCreateBaseline        Tweak entity baseline for network encoding, allows setup of player baselines, too.
+   RegisterEncoders,          //pfnRegisterEncoders      Callbacks for network encoding
+   GetWeaponData,             //pfnGetWeaponData
+   CmdStart,                  //pfnCmdStart
+   CmdEnd,                    //pfnCmdEnd
+   ConnectionlessPacket,      //pfnConnectionlessPacket
+   GetHullBounds,             //pfnGetHullBounds
+   CreateInstancedBaselines,  //pfnCreateInstancedBaselines
+   InconsistentFile,          //pfnInconsistentFile
+   AllowLagCompensation,      //pfnAllowLagCompensation
+};
+
+#ifdef __BORLANDC__
+int EXPORT GetEntityAPI( DLL_FUNCTIONS *pFunctionTable, int interfaceVersion )
+#else
+extern "C" EXPORT int GetEntityAPI( DLL_FUNCTIONS *pFunctionTable, int interfaceVersion )
+#endif
+{
+   // check if engine's pointer is valid and version is correct...
+
+   if ( !pFunctionTable || interfaceVersion != INTERFACE_VERSION )
+      return FALSE;
+
+   // pass engine callback function table to engine...
+   memcpy( pFunctionTable, &gFunctionTable, sizeof( DLL_FUNCTIONS ) );
+
+   // pass other DLLs engine callbacks to function table...
+   if (!(*other_GetEntityAPI)(&other_gFunctionTable, INTERFACE_VERSION))
+   {
+      return FALSE;  // error initializing function table!!!
+   }
+
+   return TRUE;
+}
+
+
+#ifdef __BORLANDC__
+int EXPORT GetNewDLLFunctions( NEW_DLL_FUNCTIONS *pFunctionTable, int *interfaceVersion )
+#else
+extern "C" EXPORT int GetNewDLLFunctions( NEW_DLL_FUNCTIONS *pFunctionTable, int *interfaceVersion )
+#endif
+{
+   if (other_GetNewDLLFunctions == NULL)
+      return FALSE;
+
+   // pass other DLLs engine callbacks to function table...
+   if (!(*other_GetNewDLLFunctions)(pFunctionTable, interfaceVersion))
+   {
+      return FALSE;  // error initializing function table!!!
+   }
+
+   return TRUE;
+}
+
+
+void FakeClientCommand(edict_t *pBot, char *arg1, char *arg2, char *arg3)
+{
+   int length;
+
+   memset(g_argv, 0, sizeof(g_argv));
+
+   isFakeClientCommand = 1;
+
+   if ((arg1 == NULL) || (*arg1 == 0))
+      return;
+
+   if ((arg2 == NULL) || (*arg2 == 0))
+   {
+      length = sprintf(&g_argv[0], "%s", arg1);
+      fake_arg_count = 1;
+   }
+   else if ((arg3 == NULL) || (*arg3 == 0))
+   {
+      length = sprintf(&g_argv[0], "%s %s", arg1, arg2);
+      fake_arg_count = 2;
+   }
+   else
+   {
+      length = sprintf(&g_argv[0], "%s %s %s", arg1, arg2, arg3);
+      fake_arg_count = 3;
+   }
+
+   g_argv[length] = 0;  // null terminate just in case
+
+   strcpy(&g_argv[64], arg1);
+
+   if (arg2)
+      strcpy(&g_argv[128], arg2);
+
+   if (arg3)
+      strcpy(&g_argv[192], arg3);
+
+   // allow the MOD DLL to execute the ClientCommand...
+   ClientCommand(pBot);
+
+   isFakeClientCommand = 0;
+}
+
+
+const char *Cmd_Args( void )
+{
+   if (isFakeClientCommand)
+   {
+      return &g_argv[0];
+   }
+   else
+   {
+      return (*g_engfuncs.pfnCmd_Args)();
+   }
+}
+
+
+const char *Cmd_Argv( int argc )
+{
+   if (isFakeClientCommand)
+   {
+      if (argc == 0)
+      {
+         return &g_argv[64];
+      }
+      else if (argc == 1)
+      {
+         return &g_argv[128];
+      }
+      else if (argc == 2)
+      {
+         return &g_argv[192];
+      }
+      else
+      {
+         return NULL;
+      }
+   }
+   else
+   {
+      return (*g_engfuncs.pfnCmd_Argv)(argc);
+   }
+}
+
+
+int Cmd_Argc( void )
+{
+   if (isFakeClientCommand)
+   {
+      return fake_arg_count;
+   }
+   else
+   {
+      return (*g_engfuncs.pfnCmd_Argc)();
+   }
+}
+
+
+void ProcessBotCfgFile(void)
+{
+   int ch;
+   char cmd_line[256];
+   int cmd_index;
+   static char server_cmd[80];
+   char *cmd, *arg1, *arg2, *arg3, *arg4;
+   char msg[80];
+
+   if (bot_cfg_pause_time > gpGlobals->time)
+      return;
+
+   if (bot_cfg_fp == NULL)
+      return;
+
+   cmd_index = 0;
+   cmd_line[cmd_index] = 0;
+
+   ch = fgetc(bot_cfg_fp);
+
+   // skip any leading blanks
+   while (ch == ' ')
+      ch = fgetc(bot_cfg_fp);
+
+   while ((ch != EOF) && (ch != '\r') && (ch != '\n'))
+   {
+      if (ch == '\t')  // convert tabs to spaces
+         ch = ' ';
+
+      cmd_line[cmd_index] = ch;
+
+      ch = fgetc(bot_cfg_fp);
+
+      // skip multiple spaces in input file
+      while ((cmd_line[cmd_index] == ' ') &&
+             (ch == ' '))      
+         ch = fgetc(bot_cfg_fp);
+
+      cmd_index++;
+   }
+
+   if (ch == '\r')  // is it a carriage return?
+   {
+      ch = fgetc(bot_cfg_fp);  // skip the linefeed
+   }
+
+   // if reached end of file, then close it
+   if (ch == EOF)
+   {
+      fclose(bot_cfg_fp);
+
+      bot_cfg_fp = NULL;
+
+      bot_cfg_pause_time = 0.0;
+   }
+
+   cmd_line[cmd_index] = 0;  // terminate the command line
+
+   // copy the command line to a server command buffer...
+   strcpy(server_cmd, cmd_line);
+   strcat(server_cmd, "\n");
+
+   cmd_index = 0;
+   cmd = cmd_line;
+   arg1 = arg2 = arg3 = arg4 = NULL;
+
+   // skip to blank or end of string...
+   while ((cmd_line[cmd_index] != ' ') && (cmd_line[cmd_index] != 0))
+      cmd_index++;
+
+   if (cmd_line[cmd_index] == ' ')
+   {
+      cmd_line[cmd_index++] = 0;
+      arg1 = &cmd_line[cmd_index];
+
+      // skip to blank or end of string...
+      while ((cmd_line[cmd_index] != ' ') && (cmd_line[cmd_index] != 0))
+         cmd_index++;
+
+      if (cmd_line[cmd_index] == ' ')
+      {
+         cmd_line[cmd_index++] = 0;
+         arg2 = &cmd_line[cmd_index];
+
+         // skip to blank or end of string...
+         while ((cmd_line[cmd_index] != ' ') && (cmd_line[cmd_index] != 0))
+            cmd_index++;
+
+         if (cmd_line[cmd_index] == ' ')
+         {
+            cmd_line[cmd_index++] = 0;
+            arg3 = &cmd_line[cmd_index];
+
+            // skip to blank or end of string...
+            while ((cmd_line[cmd_index] != ' ') && (cmd_line[cmd_index] != 0))
+               cmd_index++;
+
+            if (cmd_line[cmd_index] == ' ')
+            {
+               cmd_line[cmd_index++] = 0;
+               arg4 = &cmd_line[cmd_index];
+            }
+         }
+      }
+   }
+
+   if ((cmd_line[0] == '#') || (cmd_line[0] == 0))
+      return;  // return if comment or blank line
+
+   if (strcmp(cmd, "addbot") == 0)
+   {
+      BotCreate( NULL, arg1, arg2, arg3, arg4 );
+
+      // have to delay here or engine gives "Tried to write to
+      // uninitialized sizebuf_t" error and crashes...
+
+      bot_cfg_pause_time = gpGlobals->time + 2.0;
+      bot_check_time = gpGlobals->time + 5.0;
+
+      return;
+   }
+
+   if (strcmp(cmd, "botskill") == 0)
+   {
+      int temp = atoi(arg1);
+
+      if ((temp >= 1) && (temp <= 5))
+         default_bot_skill = atoi( arg1 );  // set default bot skill level
+
+      return;
+   }
+
+   if (strcmp(cmd, "observer") == 0)
+   {
+      int temp = atoi(arg1);
+
+      if (temp)
+         b_observer_mode = TRUE;
+      else
+         b_observer_mode = FALSE;
+
+      return;
+   }
+
+   if (strcmp(cmd, "botdontshoot") == 0)
+   {
+      int temp = atoi(arg1);
+
+      if (temp)
+         b_botdontshoot = TRUE;
+      else
+         b_botdontshoot = FALSE;
+
+      return;
+   }
+
+   if (strcmp(cmd, "min_bots") == 0)
+   {
+      min_bots = atoi( arg1 );
+
+      if ((min_bots < 0) || (min_bots > 31))
+         min_bots = 1;
+
+      if (IS_DEDICATED_SERVER())
+      {
+         sprintf(msg, "min_bots set to %d\n", min_bots);
+         printf(msg);
+      }
+
+      return;
+   }
+
+   if (strcmp(cmd, "max_bots") == 0)
+   {
+      max_bots = atoi( arg1 );
+
+      if ((max_bots < 0) || (max_bots > 31)) 
+         max_bots = 1;
+
+      if (IS_DEDICATED_SERVER())
+      {
+         sprintf(msg, "max_bots set to %d\n", max_bots);
+         printf(msg);
+      }
+
+      return;
+   }
+
+   if (strcmp(cmd, "pause") == 0)
+   {
+      bot_cfg_pause_time = gpGlobals->time + atoi( arg1 );
+
+      return;
+   }
+
+   sprintf(msg, "executing server command: %s\n", server_cmd);
+   ALERT( at_console, msg );
+
+   if (IS_DEDICATED_SERVER())
+      printf(msg);
+
+   SERVER_COMMAND(server_cmd);
+}
+
diff --git a/main/source/HPB_bot/dlls/engine.cpp b/main/source/HPB_bot/dlls/engine.cpp
new file mode 100644
index 00000000..dbf32bc6
--- /dev/null
+++ b/main/source/HPB_bot/dlls/engine.cpp
@@ -0,0 +1,1233 @@
+//
+// HPB bot - botman's High Ping Bastard bot
+//
+// (http://planethalflife.com/botman/)
+//
+// engine.cpp
+//
+
+#include "extdll.h"
+#include "util.h"
+
+#include "bot.h"
+#include "bot_client.h"
+#include "HPB_bot/engine/engine.h"
+
+
+extern enginefuncs_t g_engfuncs;
+extern bot_t bots[32];
+extern int mod_id;
+
+
+int debug_engine = 0;
+
+void (*botMsgFunction)(void *, int) = NULL;
+void (*botMsgEndFunction)(void *, int) = NULL;
+int botMsgIndex;
+
+// messages created in RegUserMsg which will be "caught"
+int message_VGUI = 0;
+int message_ShowMenu = 0;
+int message_WeaponList = 0;
+int message_CurWeapon = 0;
+int message_AmmoX = 0;
+int message_WeapPickup = 0;
+int message_AmmoPickup = 0;
+int message_ItemPickup = 0;
+int message_Health = 0;
+int message_Battery = 0;  // Armor
+int message_Damage = 0;
+int message_Money = 0;  // for Counter-Strike
+int message_DeathMsg = 0;
+int message_TextMsg = 0;
+int message_WarmUp = 0;      // for Front Line Force
+int message_WinMessage = 0;  // for Front Line Force
+int message_ScreenFade = 0;
+
+// AvH messages
+int message_SetPlayMode = 0;
+int message_SetOrder = 0;
+int message_SetResources = 0;
+
+static FILE *fp;
+
+
+int pfnPrecacheModel(char* s)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnPrecacheModel: %s\n",s); fclose(fp); }
+   return (*g_engfuncs.pfnPrecacheModel)(s);
+}
+int pfnPrecacheSound(char* s)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnPrecacheSound: %s\n",s); fclose(fp); }
+   return (*g_engfuncs.pfnPrecacheSound)(s);
+}
+void pfnSetModel(edict_t *e, const char *m)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnSetModel: edict=%x %s\n",e,m); fclose(fp); }
+   (*g_engfuncs.pfnSetModel)(e, m);
+}
+int pfnModelIndex(const char *m)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnModelIndex: %s\n",m); fclose(fp); }
+   return (*g_engfuncs.pfnModelIndex)(m);
+}
+int pfnModelFrames(int modelIndex)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnModelFrames:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnModelFrames)(modelIndex);
+}
+void pfnSetSize(edict_t *e, const float *rgflMin, const float *rgflMax)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnSetSize: %x\n",e); fclose(fp); }
+   (*g_engfuncs.pfnSetSize)(e, rgflMin, rgflMax);
+}
+void pfnChangeLevel(char* s1, char* s2)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnChangeLevel:\n"); fclose(fp); }
+
+   // kick any bot off of the server after time/frag limit...
+   for (int index = 0; index < 32; index++)
+   {
+      if (bots[index].is_used)  // is this slot used?
+      {
+         char cmd[40];
+
+         sprintf(cmd, "kick \"%s\"\n", bots[index].name);
+
+         bots[index].respawn_state = RESPAWN_NEED_TO_RESPAWN;
+
+         SERVER_COMMAND(cmd);  // kick the bot using (kick "name")
+      }
+   }
+
+   (*g_engfuncs.pfnChangeLevel)(s1, s2);
+}
+void pfnGetSpawnParms(edict_t *ent)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnGetSpawnParms:\n"); fclose(fp); }
+   (*g_engfuncs.pfnGetSpawnParms)(ent);
+}
+void pfnSaveSpawnParms(edict_t *ent)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnSaveSpawnParms:\n"); fclose(fp); }
+   (*g_engfuncs.pfnSaveSpawnParms)(ent);
+}
+float pfnVecToYaw(const float *rgflVector)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnVecToYaw:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnVecToYaw)(rgflVector);
+}
+void pfnVecToAngles(const float *rgflVectorIn, float *rgflVectorOut)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnVecToAngles:\n"); fclose(fp); }
+   (*g_engfuncs.pfnVecToAngles)(rgflVectorIn, rgflVectorOut);
+}
+void pfnMoveToOrigin(edict_t *ent, const float *pflGoal, float dist, int iMoveType)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnMoveToOrigin:\n"); fclose(fp); }
+   (*g_engfuncs.pfnMoveToOrigin)(ent, pflGoal, dist, iMoveType);
+}
+void pfnChangeYaw(edict_t* ent)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnChangeYaw:\n"); fclose(fp); }
+   (*g_engfuncs.pfnChangeYaw)(ent);
+}
+void pfnChangePitch(edict_t* ent)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnChangePitch:\n"); fclose(fp); }
+   (*g_engfuncs.pfnChangePitch)(ent);
+}
+edict_t* pfnFindEntityByString(edict_t *pEdictStartSearchAfter, const char *pszField, const char *pszValue)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnFindEntityByString: %s\n",pszValue); fclose(fp); }
+   return (*g_engfuncs.pfnFindEntityByString)(pEdictStartSearchAfter, pszField, pszValue);
+}
+int pfnGetEntityIllum(edict_t* pEnt)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnGetEntityIllum:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnGetEntityIllum)(pEnt);
+}
+edict_t* pfnFindEntityInSphere(edict_t *pEdictStartSearchAfter, const float *org, float rad)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnFindEntityInSphere:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnFindEntityInSphere)(pEdictStartSearchAfter, org, rad);
+}
+edict_t* pfnFindClientInPVS(edict_t *pEdict)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnFindClientInPVS:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnFindClientInPVS)(pEdict);
+}
+edict_t* pfnEntitiesInPVS(edict_t *pplayer)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnEntitiesInPVS:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnEntitiesInPVS)(pplayer);
+}
+void pfnMakeVectors(const float *rgflVector)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnMakeVectors:\n"); fclose(fp); }
+   (*g_engfuncs.pfnMakeVectors)(rgflVector);
+}
+void pfnAngleVectors(const float *rgflVector, float *forward, float *right, float *up)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnAngleVectors:\n"); fclose(fp); }
+   (*g_engfuncs.pfnAngleVectors)(rgflVector, forward, right, up);
+}
+edict_t* pfnCreateEntity(void)
+{
+   edict_t *pent = (*g_engfuncs.pfnCreateEntity)();
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnCreateEntity: %x\n",pent); fclose(fp); }
+   return pent;
+}
+void pfnRemoveEntity(edict_t* e)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnRemoveEntity: %x\n",e); fclose(fp); }
+   if (debug_engine)
+   {
+      fp=fopen("bot.txt","a");
+      fprintf(fp,"pfnRemoveEntity: %x\n",e);
+      if (e->v.model != 0)
+         fprintf(fp," model=%s\n", STRING(e->v.model));
+      fclose(fp);
+   }
+
+   (*g_engfuncs.pfnRemoveEntity)(e);
+}
+edict_t* pfnCreateNamedEntity(int className)
+{
+   edict_t *pent = (*g_engfuncs.pfnCreateNamedEntity)(className);
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnCreateNamedEntity: edict=%x name=%s\n",pent,STRING(className)); fclose(fp); }
+   return pent;
+}
+void pfnMakeStatic(edict_t *ent)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnMakeStatic:\n"); fclose(fp); }
+   (*g_engfuncs.pfnMakeStatic)(ent);
+}
+int pfnEntIsOnFloor(edict_t *e)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnEntIsOnFloor:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnEntIsOnFloor)(e);
+}
+int pfnDropToFloor(edict_t* e)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnDropToFloor:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnDropToFloor)(e);
+}
+int pfnWalkMove(edict_t *ent, float yaw, float dist, int iMode)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnWalkMove:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnWalkMove)(ent, yaw, dist, iMode);
+}
+void pfnSetOrigin(edict_t *e, const float *rgflOrigin)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnSetOrigin:\n"); fclose(fp); }
+   (*g_engfuncs.pfnSetOrigin)(e, rgflOrigin);
+}
+void pfnEmitSound(edict_t *entity, int channel, const char *sample, /*int*/float volume, float attenuation, int fFlags, int pitch)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnEmitSound:\n"); fclose(fp); }
+   (*g_engfuncs.pfnEmitSound)(entity, channel, sample, volume, attenuation, fFlags, pitch);
+}
+void pfnEmitAmbientSound(edict_t *entity, float *pos, const char *samp, float vol, float attenuation, int fFlags, int pitch)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnEmitAmbientSound:\n"); fclose(fp); }
+   (*g_engfuncs.pfnEmitAmbientSound)(entity, pos, samp, vol, attenuation, fFlags, pitch);
+}
+void pfnTraceLine(const float *v1, const float *v2, int fNoMonsters, edict_t *pentToSkip, TraceResult *ptr)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnTraceLine:\n"); fclose(fp); }
+   (*g_engfuncs.pfnTraceLine)(v1, v2, fNoMonsters, pentToSkip, ptr);
+}
+void pfnTraceToss(edict_t* pent, edict_t* pentToIgnore, TraceResult *ptr)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnTraceToss:\n"); fclose(fp); }
+   (*g_engfuncs.pfnTraceToss)(pent, pentToIgnore, ptr);
+}
+int pfnTraceMonsterHull(edict_t *pEdict, const float *v1, const float *v2, int fNoMonsters, edict_t *pentToSkip, TraceResult *ptr)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnTraceMonsterHull:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnTraceMonsterHull)(pEdict, v1, v2, fNoMonsters, pentToSkip, ptr);
+}
+void pfnTraceHull(const float *v1, const float *v2, int fNoMonsters, int hullNumber, edict_t *pentToSkip, TraceResult *ptr)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnTraceHull:\n"); fclose(fp); }
+   (*g_engfuncs.pfnTraceHull)(v1, v2, fNoMonsters, hullNumber, pentToSkip, ptr);
+}
+void pfnTraceModel(const float *v1, const float *v2, int hullNumber, edict_t *pent, TraceResult *ptr)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnTraceModel:\n"); fclose(fp); }
+   (*g_engfuncs.pfnTraceModel)(v1, v2, hullNumber, pent, ptr);
+}
+const char *pfnTraceTexture(edict_t *pTextureEntity, const float *v1, const float *v2 )
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnTraceTexture:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnTraceTexture)(pTextureEntity, v1, v2);
+}
+void pfnTraceSphere(const float *v1, const float *v2, int fNoMonsters, float radius, edict_t *pentToSkip, TraceResult *ptr)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnTraceSphere:\n"); fclose(fp); }
+   (*g_engfuncs.pfnTraceSphere)(v1, v2, fNoMonsters, radius, pentToSkip, ptr);
+}
+void pfnGetAimVector(edict_t* ent, float speed, float *rgflReturn)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnGetAimVector:\n"); fclose(fp); }
+   (*g_engfuncs.pfnGetAimVector)(ent, speed, rgflReturn);
+}
+void pfnServerCommand(char* str)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnServerCommand: %s\n",str); fclose(fp); }
+   (*g_engfuncs.pfnServerCommand)(str);
+}
+void pfnServerExecute(void)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnServerExecute:\n"); fclose(fp); }
+   (*g_engfuncs.pfnServerExecute)();
+}
+void pfnClientCommand(edict_t* pEdict, char* szFmt, ...)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnClientCommand=%s\n",szFmt); fclose(fp); }
+   return;
+}
+void pfnParticleEffect(const float *org, const float *dir, float color, float count)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnParticleEffect:\n"); fclose(fp); }
+   (*g_engfuncs.pfnParticleEffect)(org, dir, color, count);
+}
+void pfnLightStyle(int style, char* val)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnLightStyle:\n"); fclose(fp); }
+   (*g_engfuncs.pfnLightStyle)(style, val);
+}
+int pfnDecalIndex(const char *name)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnDecalIndex:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnDecalIndex)(name);
+}
+int pfnPointContents(const float *rgflVector)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnPointContents:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnPointContents)(rgflVector);
+}
+void pfnMessageBegin(int msg_dest, int msg_type, const float *pOrigin, edict_t *ed)
+{
+   if (gpGlobals->deathmatch)
+   {
+      int index = -1;
+
+      if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnMessageBegin: edict=%x dest=%d type=%d\n",ed,msg_dest,msg_type); fclose(fp); }
+
+      if (ed)
+      {
+         index = UTIL_GetBotIndex(ed);
+
+         // is this message for a bot?
+         if (index != -1)
+         {
+            botMsgFunction = NULL;     // no msg function until known otherwise
+            botMsgEndFunction = NULL;  // no msg end function until known otherwise
+            botMsgIndex = index;       // index of bot receiving message
+
+            if (mod_id == VALVE_DLL)
+            {
+               if (msg_type == message_WeaponList)
+                  botMsgFunction = BotClient_Valve_WeaponList;
+               else if (msg_type == message_CurWeapon)
+                  botMsgFunction = BotClient_Valve_CurrentWeapon;
+               else if (msg_type == message_AmmoX)
+                  botMsgFunction = BotClient_Valve_AmmoX;
+               else if (msg_type == message_AmmoPickup)
+                  botMsgFunction = BotClient_Valve_AmmoPickup;
+               else if (msg_type == message_WeapPickup)
+                  botMsgFunction = BotClient_Valve_WeaponPickup;
+               else if (msg_type == message_ItemPickup)
+                  botMsgFunction = BotClient_Valve_ItemPickup;
+               else if (msg_type == message_Health)
+                  botMsgFunction = BotClient_Valve_Health;
+               else if (msg_type == message_Battery)
+                  botMsgFunction = BotClient_Valve_Battery;
+               else if (msg_type == message_Damage)
+                  botMsgFunction = BotClient_Valve_Damage;
+               else if (msg_type == message_ScreenFade)
+                  botMsgFunction = BotClient_Valve_ScreenFade;
+            }
+            else if (mod_id == TFC_DLL)
+            {
+               if (msg_type == message_VGUI)
+                  botMsgFunction = BotClient_TFC_VGUI;
+               else if (msg_type == message_WeaponList)
+                  botMsgFunction = BotClient_TFC_WeaponList;
+               else if (msg_type == message_CurWeapon)
+                  botMsgFunction = BotClient_TFC_CurrentWeapon;
+               else if (msg_type == message_AmmoX)
+                  botMsgFunction = BotClient_TFC_AmmoX;
+               else if (msg_type == message_AmmoPickup)
+                  botMsgFunction = BotClient_TFC_AmmoPickup;
+               else if (msg_type == message_WeapPickup)
+                  botMsgFunction = BotClient_TFC_WeaponPickup;
+               else if (msg_type == message_ItemPickup)
+                  botMsgFunction = BotClient_TFC_ItemPickup;
+               else if (msg_type == message_Health)
+                  botMsgFunction = BotClient_TFC_Health;
+               else if (msg_type == message_Battery)
+                  botMsgFunction = BotClient_TFC_Battery;
+               else if (msg_type == message_Damage)
+                  botMsgFunction = BotClient_TFC_Damage;
+               else if (msg_type == message_ScreenFade)
+                  botMsgFunction = BotClient_TFC_ScreenFade;
+            }
+            else if (mod_id == CSTRIKE_DLL)
+            {
+               if (msg_type == message_VGUI)
+                  botMsgFunction = BotClient_CS_VGUI;
+               else if (msg_type == message_ShowMenu)
+                  botMsgFunction = BotClient_CS_ShowMenu;
+               else if (msg_type == message_WeaponList)
+                  botMsgFunction = BotClient_CS_WeaponList;
+               else if (msg_type == message_CurWeapon)
+                  botMsgFunction = BotClient_CS_CurrentWeapon;
+               else if (msg_type == message_AmmoX)
+                  botMsgFunction = BotClient_CS_AmmoX;
+               else if (msg_type == message_WeapPickup)
+                  botMsgFunction = BotClient_CS_WeaponPickup;
+               else if (msg_type == message_AmmoPickup)
+                  botMsgFunction = BotClient_CS_AmmoPickup;
+               else if (msg_type == message_ItemPickup)
+                  botMsgFunction = BotClient_CS_ItemPickup;
+               else if (msg_type == message_Health)
+                  botMsgFunction = BotClient_CS_Health;
+               else if (msg_type == message_Battery)
+                  botMsgFunction = BotClient_CS_Battery;
+               else if (msg_type == message_Damage)
+                  botMsgFunction = BotClient_CS_Damage;
+               else if (msg_type == message_Money)
+                  botMsgFunction = BotClient_CS_Money;
+               else if (msg_type == message_ScreenFade)
+                  botMsgFunction = BotClient_CS_ScreenFade;
+            }
+            else if (mod_id == GEARBOX_DLL)
+            {
+               if (msg_type == message_VGUI)
+                  botMsgFunction = BotClient_Gearbox_VGUI;
+               else if (msg_type == message_WeaponList)
+                  botMsgFunction = BotClient_Gearbox_WeaponList;
+               else if (msg_type == message_CurWeapon)
+                  botMsgFunction = BotClient_Gearbox_CurrentWeapon;
+               else if (msg_type == message_AmmoX)
+                  botMsgFunction = BotClient_Gearbox_AmmoX;
+               else if (msg_type == message_AmmoPickup)
+                  botMsgFunction = BotClient_Gearbox_AmmoPickup;
+               else if (msg_type == message_WeapPickup)
+                  botMsgFunction = BotClient_Gearbox_WeaponPickup;
+               else if (msg_type == message_ItemPickup)
+                  botMsgFunction = BotClient_Gearbox_ItemPickup;
+               else if (msg_type == message_Health)
+                  botMsgFunction = BotClient_Gearbox_Health;
+               else if (msg_type == message_Battery)
+                  botMsgFunction = BotClient_Gearbox_Battery;
+               else if (msg_type == message_Damage)
+                  botMsgFunction = BotClient_Gearbox_Damage;
+               else if (msg_type == message_ScreenFade)
+                  botMsgFunction = BotClient_Gearbox_ScreenFade;
+            }
+            else if (mod_id == FRONTLINE_DLL)
+            {
+               if (msg_type == message_VGUI)
+                  botMsgFunction = BotClient_FLF_VGUI;
+               else if (msg_type == message_WeaponList)
+                  botMsgFunction = BotClient_FLF_WeaponList;
+               else if (msg_type == message_CurWeapon)
+                  botMsgFunction = BotClient_FLF_CurrentWeapon;
+               else if (msg_type == message_AmmoX)
+                  botMsgFunction = BotClient_FLF_AmmoX;
+               else if (msg_type == message_AmmoPickup)
+                  botMsgFunction = BotClient_FLF_AmmoPickup;
+               else if (msg_type == message_WeapPickup)
+                  botMsgFunction = BotClient_FLF_WeaponPickup;
+               else if (msg_type == message_ItemPickup)
+                  botMsgFunction = BotClient_FLF_ItemPickup;
+               else if (msg_type == message_Health)
+                  botMsgFunction = BotClient_FLF_Health;
+               else if (msg_type == message_Battery)
+                  botMsgFunction = BotClient_FLF_Battery;
+               else if (msg_type == message_Damage)
+                  botMsgFunction = BotClient_FLF_Damage;
+               else if (msg_type == message_TextMsg)
+                  botMsgFunction = BotClient_FLF_TextMsg;
+               else if (msg_type == message_WarmUp)
+                  botMsgFunction = BotClient_FLF_WarmUp;
+               else if (msg_type == message_ScreenFade)
+                  botMsgFunction = BotClient_FLF_ScreenFade;
+               else if (msg_type == 23)                     // SVC_TEMPENTITY
+               {
+                  botMsgFunction = BotClient_FLF_TempEntity;
+                  botMsgEndFunction = BotClient_FLF_TempEntity;
+               }
+            }
+			else if (mod_id == AVH_DLL)
+			{
+				if (msg_type == message_SetPlayMode)
+					botMsgFunction = BotClient_AVH_SetPlayMode;
+				else if (msg_type == message_AmmoX)
+					botMsgFunction = BotClient_Valve_AmmoX;
+				else if (msg_type == message_AmmoPickup)
+					botMsgFunction = BotClient_Valve_AmmoPickup;
+				else if (msg_type == message_WeapPickup)
+					botMsgFunction = BotClient_Valve_WeaponPickup;
+				else if (msg_type == message_ItemPickup)
+					botMsgFunction = BotClient_Valve_ItemPickup;
+				else if (msg_type == message_WeaponList)
+					botMsgFunction = BotClient_Valve_WeaponList;
+				else if (msg_type == message_SetOrder)
+					botMsgFunction = BotClient_AVH_SetOrder;
+				else if (msg_type == message_SetResources)
+					botMsgFunction = BotClient_AVH_SetResources;
+			}
+         }
+      }
+      else if (msg_dest == MSG_ALL)
+      {
+         botMsgFunction = NULL;  // no msg function until known otherwise
+         botMsgIndex = -1;       // index of bot receiving message (none)
+
+         if (mod_id == VALVE_DLL)
+         {
+            if (msg_type == message_DeathMsg)
+               botMsgFunction = BotClient_Valve_DeathMsg;
+         }
+         else if (mod_id == TFC_DLL)
+         {
+            if (msg_type == message_DeathMsg)
+               botMsgFunction = BotClient_TFC_DeathMsg;
+         }
+         else if (mod_id == CSTRIKE_DLL)
+         {
+            if (msg_type == message_DeathMsg)
+               botMsgFunction = BotClient_CS_DeathMsg;
+         }
+         else if (mod_id == GEARBOX_DLL)
+         {
+            if (msg_type == message_DeathMsg)
+               botMsgFunction = BotClient_Gearbox_DeathMsg;
+         }
+         else if (mod_id == FRONTLINE_DLL)
+         {
+            if (msg_type == message_DeathMsg)
+               botMsgFunction = BotClient_FLF_DeathMsg;
+            else if (msg_type == message_WarmUp)
+               botMsgFunction = BotClient_FLF_WarmUpAll;
+            else if (msg_type == message_WinMessage)
+               botMsgFunction = BotClient_FLF_WinMessage;
+         }
+      }
+   }
+
+   (*g_engfuncs.pfnMessageBegin)(msg_dest, msg_type, pOrigin, ed);
+}
+void pfnMessageEnd(void)
+{
+   if (gpGlobals->deathmatch)
+   {
+      if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnMessageEnd:\n"); fclose(fp); }
+
+      if (botMsgEndFunction)
+         (*botMsgEndFunction)(NULL, botMsgIndex);  // NULL indicated msg end
+
+      // clear out the bot message function pointers...
+      botMsgFunction = NULL;
+      botMsgEndFunction = NULL;
+   }
+
+   (*g_engfuncs.pfnMessageEnd)();
+}
+void pfnWriteByte(int iValue)
+{
+   if (gpGlobals->deathmatch)
+   {
+      if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnWriteByte: %d\n",iValue); fclose(fp); }
+
+      // if this message is for a bot, call the client message function...
+      if (botMsgFunction)
+         (*botMsgFunction)((void *)&iValue, botMsgIndex);
+   }
+
+   (*g_engfuncs.pfnWriteByte)(iValue);
+}
+void pfnWriteChar(int iValue)
+{
+   if (gpGlobals->deathmatch)
+   {
+      if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnWriteChar: %d\n",iValue); fclose(fp); }
+
+      // if this message is for a bot, call the client message function...
+      if (botMsgFunction)
+         (*botMsgFunction)((void *)&iValue, botMsgIndex);
+   }
+
+   (*g_engfuncs.pfnWriteChar)(iValue);
+}
+void pfnWriteShort(int iValue)
+{
+   if (gpGlobals->deathmatch)
+   {
+      if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnWriteShort: %d\n",iValue); fclose(fp); }
+
+      // if this message is for a bot, call the client message function...
+      if (botMsgFunction)
+         (*botMsgFunction)((void *)&iValue, botMsgIndex);
+   }
+
+   (*g_engfuncs.pfnWriteShort)(iValue);
+}
+void pfnWriteLong(int iValue)
+{
+   if (gpGlobals->deathmatch)
+   {
+      if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnWriteLong: %d\n",iValue); fclose(fp); }
+
+      // if this message is for a bot, call the client message function...
+      if (botMsgFunction)
+         (*botMsgFunction)((void *)&iValue, botMsgIndex);
+   }
+
+   (*g_engfuncs.pfnWriteLong)(iValue);
+}
+void pfnWriteAngle(float flValue)
+{
+   if (gpGlobals->deathmatch)
+   {
+      if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnWriteAngle: %f\n",flValue); fclose(fp); }
+
+      // if this message is for a bot, call the client message function...
+      if (botMsgFunction)
+         (*botMsgFunction)((void *)&flValue, botMsgIndex);
+   }
+
+   (*g_engfuncs.pfnWriteAngle)(flValue);
+}
+void pfnWriteCoord(float flValue)
+{
+   if (gpGlobals->deathmatch)
+   {
+      if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnWriteCoord: %f\n",flValue); fclose(fp); }
+
+      // if this message is for a bot, call the client message function...
+      if (botMsgFunction)
+         (*botMsgFunction)((void *)&flValue, botMsgIndex);
+   }
+
+   (*g_engfuncs.pfnWriteCoord)(flValue);
+}
+void pfnWriteString(const char *sz)
+{
+   if (gpGlobals->deathmatch)
+   {
+      if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnWriteString: %s\n",sz); fclose(fp); }
+
+      // if this message is for a bot, call the client message function...
+      if (botMsgFunction)
+         (*botMsgFunction)((void *)sz, botMsgIndex);
+   }
+
+   (*g_engfuncs.pfnWriteString)(sz);
+}
+void pfnWriteEntity(int iValue)
+{
+   if (gpGlobals->deathmatch)
+   {
+      if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnWriteEntity: %d\n",iValue); fclose(fp); }
+
+      // if this message is for a bot, call the client message function...
+      if (botMsgFunction)
+         (*botMsgFunction)((void *)&iValue, botMsgIndex);
+   }
+
+   (*g_engfuncs.pfnWriteEntity)(iValue);
+}
+void pfnCVarRegister(cvar_t *pCvar)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnCVarRegister:\n"); fclose(fp); }
+   (*g_engfuncs.pfnCVarRegister)(pCvar);
+}
+float pfnCVarGetFloat(const char *szVarName)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnCVarGetFloat: %s\n",szVarName); fclose(fp); }
+   return (*g_engfuncs.pfnCVarGetFloat)(szVarName);
+}
+const char* pfnCVarGetString(const char *szVarName)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnCVarGetString:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnCVarGetString)(szVarName);
+}
+void pfnCVarSetFloat(const char *szVarName, float flValue)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnCVarSetFloat:\n"); fclose(fp); }
+   (*g_engfuncs.pfnCVarSetFloat)(szVarName, flValue);
+}
+void pfnCVarSetString(const char *szVarName, const char *szValue)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnCVarSetString:\n"); fclose(fp); }
+   (*g_engfuncs.pfnCVarSetString)(szVarName, szValue);
+}
+void* pfnPvAllocEntPrivateData(edict_t *pEdict, long cb)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnPvAllocEntPrivateData:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnPvAllocEntPrivateData)(pEdict, cb);
+}
+void* pfnPvEntPrivateData(edict_t *pEdict)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnPvEntPrivateData:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnPvEntPrivateData)(pEdict);
+}
+void pfnFreeEntPrivateData(edict_t *pEdict)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnFreeEntPrivateData:\n"); fclose(fp); }
+   (*g_engfuncs.pfnFreeEntPrivateData)(pEdict);
+}
+const char* pfnSzFromIndex(int iString)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnSzFromIndex:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnSzFromIndex)(iString);
+}
+int pfnAllocString(const char *szValue)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnAllocString:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnAllocString)(szValue);
+}
+entvars_t* pfnGetVarsOfEnt(edict_t *pEdict)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnGetVarsOfEnt:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnGetVarsOfEnt)(pEdict);
+}
+edict_t* pfnPEntityOfEntOffset(int iEntOffset)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnPEntityOfEntOffset:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnPEntityOfEntOffset)(iEntOffset);
+}
+int pfnEntOffsetOfPEntity(const edict_t *pEdict)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnEntOffsetOfPEntity: %x\n",pEdict); fclose(fp); }
+   return (*g_engfuncs.pfnEntOffsetOfPEntity)(pEdict);
+}
+int pfnIndexOfEdict(const edict_t *pEdict)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnIndexOfEdict: %x\n",pEdict); fclose(fp); }
+   return (*g_engfuncs.pfnIndexOfEdict)(pEdict);
+}
+edict_t* pfnPEntityOfEntIndex(int iEntIndex)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnPEntityOfEntIndex:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnPEntityOfEntIndex)(iEntIndex);
+}
+edict_t* pfnFindEntityByVars(entvars_t* pvars)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnFindEntityByVars:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnFindEntityByVars)(pvars);
+}
+void* pfnGetModelPtr(edict_t* pEdict)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnGetModelPtr: %x\n",pEdict); fclose(fp); }
+   return (*g_engfuncs.pfnGetModelPtr)(pEdict);
+}
+int pfnRegUserMsg(const char *pszName, int iSize)
+{
+   int msg;
+
+   msg = (*g_engfuncs.pfnRegUserMsg)(pszName, iSize);
+
+   //if (gpGlobals->deathmatch)
+   //{
+#ifdef _DEBUG
+      fp=fopen("bot.txt","a"); fprintf(fp,"pfnRegUserMsg: pszName=%s msg=%d\n",pszName,msg); fclose(fp);
+#endif
+
+      if (mod_id == VALVE_DLL)
+      {
+         if (strcmp(pszName, "WeaponList") == 0)
+            message_WeaponList = msg;
+         else if (strcmp(pszName, "CurWeapon") == 0)
+            message_CurWeapon = msg;
+         else if (strcmp(pszName, "AmmoX") == 0)
+            message_AmmoX = msg;
+         else if (strcmp(pszName, "AmmoPickup") == 0)
+            message_AmmoPickup = msg;
+         else if (strcmp(pszName, "WeapPickup") == 0)
+            message_WeapPickup = msg;
+         else if (strcmp(pszName, "ItemPickup") == 0)
+            message_ItemPickup = msg;
+         else if (strcmp(pszName, "Health") == 0)
+            message_Health = msg;
+         else if (strcmp(pszName, "Battery") == 0)
+            message_Battery = msg;
+         else if (strcmp(pszName, "Damage") == 0)
+            message_Damage = msg;
+         else if (strcmp(pszName, "DeathMsg") == 0)
+            message_DeathMsg = msg;
+         else if (strcmp(pszName, "ScreenFade") == 0)
+            message_ScreenFade = msg;
+      }
+      else if (mod_id == TFC_DLL)
+      {
+         if (strcmp(pszName, "VGUIMenu") == 0)
+            message_VGUI = msg;
+         else if (strcmp(pszName, "WeaponList") == 0)
+            message_WeaponList = msg;
+         else if (strcmp(pszName, "CurWeapon") == 0)
+            message_CurWeapon = msg;
+         else if (strcmp(pszName, "AmmoX") == 0)
+            message_AmmoX = msg;
+         else if (strcmp(pszName, "AmmoPickup") == 0)
+            message_AmmoPickup = msg;
+         else if (strcmp(pszName, "WeapPickup") == 0)
+            message_WeapPickup = msg;
+         else if (strcmp(pszName, "ItemPickup") == 0)
+            message_ItemPickup = msg;
+         else if (strcmp(pszName, "Health") == 0)
+            message_Health = msg;
+         else if (strcmp(pszName, "Battery") == 0)
+            message_Battery = msg;
+         else if (strcmp(pszName, "Damage") == 0)
+            message_Damage = msg;
+         else if (strcmp(pszName, "DeathMsg") == 0)
+            message_DeathMsg = msg;
+         else if (strcmp(pszName, "ScreenFade") == 0)
+            message_ScreenFade = msg;
+      }
+      else if (mod_id == CSTRIKE_DLL)
+      {
+         if (strcmp(pszName, "VGUIMenu") == 0)
+            message_VGUI = msg;
+         else if (strcmp(pszName, "ShowMenu") == 0)
+            message_ShowMenu = msg;
+         else if (strcmp(pszName, "WeaponList") == 0)
+            message_WeaponList = msg;
+         else if (strcmp(pszName, "CurWeapon") == 0)
+            message_CurWeapon = msg;
+         else if (strcmp(pszName, "AmmoX") == 0)
+            message_AmmoX = msg;
+         else if (strcmp(pszName, "AmmoPickup") == 0)
+            message_AmmoPickup = msg;
+         else if (strcmp(pszName, "WeapPickup") == 0)
+            message_WeapPickup = msg;
+         else if (strcmp(pszName, "ItemPickup") == 0)
+            message_ItemPickup = msg;
+         else if (strcmp(pszName, "Health") == 0)
+            message_Health = msg;
+         else if (strcmp(pszName, "Battery") == 0)
+            message_Battery = msg;
+         else if (strcmp(pszName, "Damage") == 0)
+            message_Damage = msg;
+         else if (strcmp(pszName, "Money") == 0)
+            message_Money = msg;
+         else if (strcmp(pszName, "DeathMsg") == 0)
+            message_DeathMsg = msg;
+         else if (strcmp(pszName, "ScreenFade") == 0)
+            message_ScreenFade = msg;
+      }
+      else if (mod_id == GEARBOX_DLL)
+      {
+         if (strcmp(pszName, "VGUIMenu") == 0)
+            message_VGUI = msg;
+         else if (strcmp(pszName, "WeaponList") == 0)
+            message_WeaponList = msg;
+         else if (strcmp(pszName, "CurWeapon") == 0)
+            message_CurWeapon = msg;
+         else if (strcmp(pszName, "AmmoX") == 0)
+            message_AmmoX = msg;
+         else if (strcmp(pszName, "AmmoPickup") == 0)
+            message_AmmoPickup = msg;
+         else if (strcmp(pszName, "WeapPickup") == 0)
+            message_WeapPickup = msg;
+         else if (strcmp(pszName, "ItemPickup") == 0)
+            message_ItemPickup = msg;
+         else if (strcmp(pszName, "Health") == 0)
+            message_Health = msg;
+         else if (strcmp(pszName, "Battery") == 0)
+            message_Battery = msg;
+         else if (strcmp(pszName, "Damage") == 0)
+            message_Damage = msg;
+         else if (strcmp(pszName, "DeathMsg") == 0)
+            message_DeathMsg = msg;
+         else if (strcmp(pszName, "ScreenFade") == 0)
+            message_ScreenFade = msg;
+      }
+      else if (mod_id == FRONTLINE_DLL)
+      {
+         if (strcmp(pszName, "VGUIMenu") == 0)
+            message_VGUI = msg;
+         else if (strcmp(pszName, "WeaponList") == 0)
+            message_WeaponList = msg;
+         else if (strcmp(pszName, "CurWeapon") == 0)
+            message_CurWeapon = msg;
+         else if (strcmp(pszName, "AmmoX") == 0)
+            message_AmmoX = msg;
+         else if (strcmp(pszName, "AmmoPickup") == 0)
+            message_AmmoPickup = msg;
+         else if (strcmp(pszName, "WeapPickup") == 0)
+            message_WeapPickup = msg;
+         else if (strcmp(pszName, "ItemPickup") == 0)
+            message_ItemPickup = msg;
+         else if (strcmp(pszName, "Health") == 0)
+            message_Health = msg;
+         else if (strcmp(pszName, "Battery") == 0)
+            message_Battery = msg;
+         else if (strcmp(pszName, "Damage") == 0)
+            message_Damage = msg;
+         else if (strcmp(pszName, "DeathMsg") == 0)
+            message_DeathMsg = msg;
+         else if (strcmp(pszName, "TextMsg") == 0)
+            message_TextMsg = msg;
+         else if (strcmp(pszName, "WarmUp") == 0)
+            message_WarmUp = msg;
+         else if (strcmp(pszName, "WinMessage") == 0)
+            message_WinMessage = msg;
+         else if (strcmp(pszName, "ScreenFade") == 0)
+            message_ScreenFade = msg;
+      }
+      else if (mod_id == AVH_DLL)
+	  {
+		  if (strcmp(pszName, "SetPlayMode") == 0)
+			  message_SetPlayMode = msg;
+		  else if (strcmp(pszName, "AmmoX") == 0)
+			  message_AmmoX = msg;
+		  else if (strcmp(pszName, "AmmoPickup") == 0)
+			  message_AmmoPickup = msg;
+		  else if (strcmp(pszName, "WeapPickup") == 0)
+			  message_WeapPickup = msg;
+		  else if (strcmp(pszName, "ItemPickup") == 0)
+			  message_ItemPickup = msg;
+		  else if (strcmp(pszName, "WeaponList") == 0)
+			  message_WeaponList = msg;
+		  else if (strcmp(pszName, "SetOrder") == 0)
+			  message_SetOrder = msg;
+		  else if (strcmp(pszName, "SetRsrces") == 0)
+			  message_SetResources = msg;
+			  
+	  }
+   //}
+
+   return msg;
+}
+void pfnAnimationAutomove(const edict_t* pEdict, float flTime)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnAnimationAutomove:\n"); fclose(fp); }
+   (*g_engfuncs.pfnAnimationAutomove)(pEdict, flTime);
+}
+void pfnGetBonePosition(const edict_t* pEdict, int iBone, float *rgflOrigin, float *rgflAngles )
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnGetBonePosition:\n"); fclose(fp); }
+   (*g_engfuncs.pfnGetBonePosition)(pEdict, iBone, rgflOrigin, rgflAngles);
+}
+unsigned long pfnFunctionFromName( const char *pName )
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnFunctionFromName:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnFunctionFromName)(pName);
+}
+const char *pfnNameForFunction( unsigned long function )
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnNameForFunction:\n"); fclose(fp); }
+   const char* theName = (*g_engfuncs.pfnNameForFunction)(function);
+   return theName;
+}
+void pfnClientPrintf( edict_t* pEdict, PRINT_TYPE ptype, const char *szMsg )
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnClientPrintf:\n"); fclose(fp); }
+   (*g_engfuncs.pfnClientPrintf)(pEdict, ptype, szMsg);
+}
+void pfnServerPrint( const char *szMsg )
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnServerPrint: %s\n",szMsg); fclose(fp); }
+   (*g_engfuncs.pfnServerPrint)(szMsg);
+}
+void pfnGetAttachment(const edict_t *pEdict, int iAttachment, float *rgflOrigin, float *rgflAngles )
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnGetAttachment:\n"); fclose(fp); }
+   (*g_engfuncs.pfnGetAttachment)(pEdict, iAttachment, rgflOrigin, rgflAngles);
+}
+void pfnCRC32_Init(CRC32_t *pulCRC)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnCRC32_Init:\n"); fclose(fp); }
+   (*g_engfuncs.pfnCRC32_Init)(pulCRC);
+}
+void pfnCRC32_ProcessBuffer(CRC32_t *pulCRC, void *p, int len)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnCRC32_ProcessBuffer:\n"); fclose(fp); }
+   (*g_engfuncs.pfnCRC32_ProcessBuffer)(pulCRC, p, len);
+}
+void pfnCRC32_ProcessByte(CRC32_t *pulCRC, unsigned char ch)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnCRC32_ProcessByte:\n"); fclose(fp); }
+   (*g_engfuncs.pfnCRC32_ProcessByte)(pulCRC, ch);
+}
+CRC32_t pfnCRC32_Final(CRC32_t pulCRC)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnCRC32_Final:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnCRC32_Final)(pulCRC);
+}
+long pfnRandomLong(long lLow, long lHigh)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnRandomLong: lLow=%d lHigh=%d\n",lLow,lHigh); fclose(fp); }
+   return (*g_engfuncs.pfnRandomLong)(lLow, lHigh);
+}
+float pfnRandomFloat(float flLow, float flHigh)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnRandomFloat:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnRandomFloat)(flLow, flHigh);
+}
+void pfnSetView(const edict_t *pClient, const edict_t *pViewent )
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnSetView:\n"); fclose(fp); }
+   (*g_engfuncs.pfnSetView)(pClient, pViewent);
+}
+float pfnTime( void )
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnTime:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnTime)();
+}
+void pfnCrosshairAngle(const edict_t *pClient, float pitch, float yaw)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnCrosshairAngle:\n"); fclose(fp); }
+   (*g_engfuncs.pfnCrosshairAngle)(pClient, pitch, yaw);
+}
+byte *pfnLoadFileForMe(char *filename, int *pLength)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnLoadFileForMe: filename=%s\n",filename); fclose(fp); }
+   return (*g_engfuncs.pfnLoadFileForMe)(filename, pLength);
+}
+void pfnFreeFile(void *buffer)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnFreeFile:\n"); fclose(fp); }
+   (*g_engfuncs.pfnFreeFile)(buffer);
+}
+void pfnEndSection(const char *pszSectionName)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnEndSection:\n"); fclose(fp); }
+   (*g_engfuncs.pfnEndSection)(pszSectionName);
+}
+int pfnCompareFileTime(char *filename1, char *filename2, int *iCompare)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnCompareFileTime:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnCompareFileTime)(filename1, filename2, iCompare);
+}
+void pfnGetGameDir(char *szGetGameDir)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnGetGameDir:\n"); fclose(fp); }
+   (*g_engfuncs.pfnGetGameDir)(szGetGameDir);
+}
+void pfnCvar_RegisterVariable(cvar_t *variable)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnCvar_RegisterVariable:\n"); fclose(fp); }
+   (*g_engfuncs.pfnCvar_RegisterVariable)(variable);
+}
+void pfnFadeClientVolume(const edict_t *pEdict, int fadePercent, int fadeOutSeconds, int holdTime, int fadeInSeconds)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnFadeClientVolume:\n"); fclose(fp); }
+   (*g_engfuncs.pfnFadeClientVolume)(pEdict, fadePercent, fadeOutSeconds, holdTime, fadeInSeconds);
+}
+void pfnSetClientMaxspeed(const edict_t *pEdict, float fNewMaxspeed)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnSetClientMaxspeed: edict=%x %f\n",pEdict,fNewMaxspeed); fclose(fp); }
+   (*g_engfuncs.pfnSetClientMaxspeed)(pEdict, fNewMaxspeed);
+}
+edict_t * pfnCreateFakeClient(const char *netname)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnCreateFakeClient:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnCreateFakeClient)(netname);
+}
+void pfnRunPlayerMove(edict_t *fakeclient, const float *viewangles, float forwardmove, float sidemove, float upmove, unsigned short buttons, byte impulse, byte msec )
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnRunPlayerMove:\n"); fclose(fp); }
+   (*g_engfuncs.pfnRunPlayerMove)(fakeclient, viewangles, forwardmove, sidemove, upmove, buttons, impulse, msec);
+}
+int pfnNumberOfEntities(void)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnNumberOfEntities:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnNumberOfEntities)();
+}
+char* pfnGetInfoKeyBuffer(edict_t *e)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnGetInfoKeyBuffer:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnGetInfoKeyBuffer)(e);
+}
+char* pfnInfoKeyValue(char *infobuffer, char *key)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnInfoKeyValue: %s %s\n",infobuffer,key); fclose(fp); }
+   return (*g_engfuncs.pfnInfoKeyValue)(infobuffer, key);
+}
+void pfnSetKeyValue(char *infobuffer, char *key, char *value)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnSetKeyValue: %s %s\n",key,value); fclose(fp); }
+   (*g_engfuncs.pfnSetKeyValue)(infobuffer, key, value);
+}
+void pfnSetClientKeyValue(int clientIndex, char *infobuffer, char *key, char *value)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnSetClientKeyValue: %s %s\n",key,value); fclose(fp); }
+   (*g_engfuncs.pfnSetClientKeyValue)(clientIndex, infobuffer, key, value);
+}
+int pfnIsMapValid(char *filename)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnIsMapValid:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnIsMapValid)(filename);
+}
+void pfnStaticDecal( const float *origin, int decalIndex, int entityIndex, int modelIndex )
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnStaticDecal:\n"); fclose(fp); }
+   (*g_engfuncs.pfnStaticDecal)(origin, decalIndex, entityIndex, modelIndex);
+}
+int pfnPrecacheGeneric(char* s)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnPrecacheGeneric: %s\n",s); fclose(fp); }
+   return (*g_engfuncs.pfnPrecacheGeneric)(s);
+}
+int pfnGetPlayerUserId(edict_t *e )
+{
+   if (gpGlobals->deathmatch)
+   {
+      if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnGetPlayerUserId: %x\n",e); fclose(fp); }
+
+      if (mod_id == GEARBOX_DLL)
+      {
+         // is this edict a bot?
+         if (UTIL_GetBotPointer( e ))
+            return 0;  // don't return a valid index (so bot won't get kicked)
+      }
+   }
+
+   return (*g_engfuncs.pfnGetPlayerUserId)(e);
+}
+void pfnBuildSoundMsg(edict_t *entity, int channel, const char *sample, /*int*/float volume, float attenuation, int fFlags, int pitch, int msg_dest, int msg_type, const float *pOrigin, edict_t *ed)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnBuildSoundMsg:\n"); fclose(fp); }
+   (*g_engfuncs.pfnBuildSoundMsg)(entity, channel, sample, volume, attenuation, fFlags, pitch, msg_dest, msg_type, pOrigin, ed);
+}
+int pfnIsDedicatedServer(void)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnIsDedicatedServer:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnIsDedicatedServer)();
+}
+cvar_t* pfnCVarGetPointer(const char *szVarName)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnCVarGetPointer: %s\n",szVarName); fclose(fp); }
+   return (*g_engfuncs.pfnCVarGetPointer)(szVarName);
+}
+unsigned int pfnGetPlayerWONId(edict_t *e)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnGetPlayerWONId: %x\n",e); fclose(fp); }
+   return (*g_engfuncs.pfnGetPlayerWONId)(e);
+}
+
+
+// new stuff for SDK 2.0
+
+void pfnInfo_RemoveKey(char *s, const char *key)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnInfo_RemoveKey:\n"); fclose(fp); }
+   (*g_engfuncs.pfnInfo_RemoveKey)(s, key);
+}
+const char *pfnGetPhysicsKeyValue(const edict_t *pClient, const char *key)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnGetPhysicsKeyValue:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnGetPhysicsKeyValue)(pClient, key);
+}
+void pfnSetPhysicsKeyValue(const edict_t *pClient, const char *key, const char *value)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnSetPhysicsKeyValue:\n"); fclose(fp); }
+   (*g_engfuncs.pfnSetPhysicsKeyValue)(pClient, key, value);
+}
+const char *pfnGetPhysicsInfoString(const edict_t *pClient)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnGetPhysicsInfoString:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnGetPhysicsInfoString)(pClient);
+}
+unsigned short pfnPrecacheEvent(int type, const char *psz)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnPrecacheEvent:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnPrecacheEvent)(type, psz);
+}
+void pfnPlaybackEvent(int flags, const edict_t *pInvoker, unsigned short eventindex, float delay,
+   float *origin, float *angles, float fparam1,float fparam2, int iparam1, int iparam2, int bparam1, int bparam2)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnPlaybackEvent:\n"); fclose(fp); }
+   (*g_engfuncs.pfnPlaybackEvent)(flags, pInvoker, eventindex, delay, origin, angles, fparam1, fparam2, iparam1, iparam2, bparam1, bparam2);
+}
+unsigned char *pfnSetFatPVS(float *org)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnSetFatPVS:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnSetFatPVS)(org);
+}
+unsigned char *pfnSetFatPAS(float *org)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnSetFatPAS:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnSetFatPAS)(org);
+}
+int pfnCheckVisibility(const edict_t *entity, unsigned char *pset)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnCheckVisibility:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnCheckVisibility)(entity, pset);
+}
+void pfnDeltaSetField(struct delta_s *pFields, const char *fieldname)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnDeltaSetField:\n"); fclose(fp); }
+   (*g_engfuncs.pfnDeltaSetField)(pFields, fieldname);
+}
+void pfnDeltaUnsetField(struct delta_s *pFields, const char *fieldname)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnDeltaUnsetField:\n"); fclose(fp); }
+   (*g_engfuncs.pfnDeltaUnsetField)(pFields, fieldname);
+}
+void pfnDeltaAddEncoder(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to))
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnDeltaAddEncoder:\n"); fclose(fp); }
+   (*g_engfuncs.pfnDeltaAddEncoder)(name, conditionalencode);
+}
+int pfnGetCurrentPlayer(void)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnGetCurrentPlayer:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnGetCurrentPlayer)();
+}
+int pfnCanSkipPlayer(const edict_t *player)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnCanSkipPlayer:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnCanSkipPlayer)(player);
+}
+int pfnDeltaFindField(struct delta_s *pFields, const char *fieldname)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnDeltaFindField:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnDeltaFindField)(pFields, fieldname);
+}
+void pfnDeltaSetFieldByIndex(struct delta_s *pFields, int fieldNumber)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnDeltaSetFieldByIndex:\n"); fclose(fp); }
+   (*g_engfuncs.pfnDeltaSetFieldByIndex)(pFields, fieldNumber);
+}
+void pfnDeltaUnsetFieldByIndex(struct delta_s *pFields, int fieldNumber)
+{
+//   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnDeltaUnsetFieldByIndex:\n"); fclose(fp); }
+   (*g_engfuncs.pfnDeltaUnsetFieldByIndex)(pFields, fieldNumber);
+}
+void pfnSetGroupMask(int mask, int op)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnSetGroupMask:\n"); fclose(fp); }
+   (*g_engfuncs.pfnSetGroupMask)(mask, op);
+}
+int pfnCreateInstancedBaseline(int classname, struct entity_state_s *baseline)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnCreateInstancedBaseline:\n"); fclose(fp); }
+   return (*g_engfuncs.pfnCreateInstancedBaseline)(classname, baseline);
+}
+void pfnCvar_DirectSet(struct cvar_s *var, char *value)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnCvar_DirectSet:\n"); fclose(fp); }
+   (*g_engfuncs.pfnCvar_DirectSet)(var, value);
+}
+void pfnForceUnmodified(FORCE_TYPE type, float *mins, float *maxs, const char *filename)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnForceUnmodified:\n"); fclose(fp); }
+   (*g_engfuncs.pfnForceUnmodified)(type, mins, maxs, filename);
+}
+void pfnGetPlayerStats(const edict_t *pClient, int *ping, int *packet_loss)
+{
+   if (debug_engine) { fp=fopen("bot.txt","a"); fprintf(fp,"pfnGetPlayerStats:\n"); fclose(fp); }
+   (*g_engfuncs.pfnGetPlayerStats)(pClient, ping, packet_loss);
+}
+
diff --git a/main/source/HPB_bot/dlls/h_export.cpp b/main/source/HPB_bot/dlls/h_export.cpp
new file mode 100644
index 00000000..cf3d458c
--- /dev/null
+++ b/main/source/HPB_bot/dlls/h_export.cpp
@@ -0,0 +1,290 @@
+//
+// HPB bot - botman's High Ping Bastard bot
+//
+// (http://planethalflife.com/botman/)
+//
+// h_export.cpp
+//
+
+#include "extdll.h"
+#include "enginecallback.h"
+#include "util.h"
+#include "cbase.h"
+#include "mod/AvHConstants.h"
+
+#include "bot.h"
+#include "HPB_bot/engine/engine.h"
+#include "types.h"
+
+#ifndef __linux__
+
+HINSTANCE h_Library = NULL;
+HGLOBAL h_global_argv = NULL;
+
+#else
+
+void *h_Library = NULL;
+char h_global_argv[1024];
+
+#endif
+
+enginefuncs_t g_engfuncs;
+globalvars_t  *gpGlobals;
+char *g_argv;
+
+static FILE *fp;
+
+
+GETENTITYAPI other_GetEntityAPI = NULL;
+GETNEWDLLFUNCTIONS other_GetNewDLLFunctions = NULL;
+GIVEFNPTRSTODLL other_GiveFnptrsToDll = NULL;
+
+extern int mod_id;
+
+
+#ifndef __linux__
+
+// Required DLL entry point
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+{
+   if (fdwReason == DLL_PROCESS_ATTACH)
+   {
+   }
+   else if (fdwReason == DLL_PROCESS_DETACH)
+   {
+      if (h_Library)
+         FreeLibrary(h_Library);
+
+      if (h_global_argv)
+      {
+         GlobalUnlock(h_global_argv);
+         GlobalFree(h_global_argv);
+      }
+   }
+
+   return TRUE;
+}
+
+#endif
+
+#ifndef __linux__
+#ifdef __BORLANDC__
+extern "C" DLLEXPORT void EXPORT GiveFnptrsToDll(enginefuncs_t* pengfuncsFromEngine, globalvars_t *pGlobals)
+#else
+void DLLEXPORT GiveFnptrsToDll( enginefuncs_t* pengfuncsFromEngine, globalvars_t *pGlobals )
+#endif
+#else
+extern "C" DLLEXPORT GiveFnptrsToDll( enginefuncs_t* pengfuncsFromEngine, globalvars_t *pGlobals )
+#endif
+{
+   int pos;
+   char game_dir[256];
+   char mod_name[32];
+
+//#ifdef AVH_MAPPER_BUILD
+//strcpy(mod_name, kModDirectory);
+//#endif
+
+   // get the engine functions from the engine...
+
+   memcpy(&g_engfuncs, pengfuncsFromEngine, sizeof(enginefuncs_t));
+   gpGlobals = pGlobals;
+
+   // find the directory name of the currently running MOD...
+   (*g_engfuncs.pfnGetGameDir)(game_dir);
+
+   pos = strlen(game_dir) - 1;
+
+   // scan backwards till first directory separator...
+   while ((pos) && (game_dir[pos] != '/'))
+      pos--;
+
+   if (pos == 0)
+   {
+      // Error getting directory name!
+
+		ALERT( at_error, "HPB_bot - Error determining MOD directory name!" );
+   }
+
+   pos++;
+   strcpy(mod_name, &game_dir[pos]);
+
+   mod_id = AVH_DLL;
+
+
+#ifdef WIN32
+   string theTempName = string(getModDirectory()) + "\\dlls\\ns.dll";
+   h_Library = LoadLibrary(theTempName.c_str());
+// TODO: Add this in when supporting linux again
+#else
+	printf("DLopening ns/dlls/HPB_bot_i386.so...");
+	h_Library = dlopen("ns/dlls/HPB_bot_i386.so", RTLD_NOW);
+#endif
+   
+   
+   if (h_Library == NULL)
+   {
+      // Directory error or Unsupported MOD!
+
+		ALERT( at_error, "HPB_bot - MOD dll not found (or unsupported MOD)!" );
+   }
+
+
+#ifndef __linux__
+   h_global_argv = GlobalAlloc(GMEM_SHARE, 1024);
+   g_argv = (char *)GlobalLock(h_global_argv);
+#else
+   g_argv = (char *)h_global_argv;
+#endif
+
+   other_GetEntityAPI = (GETENTITYAPI)GetProcAddress(h_Library, "GetEntityAPI");
+
+   if (other_GetEntityAPI == NULL)
+   {
+      // Can't find GetEntityAPI!
+
+		ALERT( at_error, "HPB_bot - Can't get MOD's GetEntityAPI!" );
+   }
+
+   other_GetNewDLLFunctions = (GETNEWDLLFUNCTIONS)GetProcAddress(h_Library, "GetNewDLLFunctions");
+
+//   if (other_GetNewDLLFunctions == NULL)
+//   {
+//      // Can't find GetNewDLLFunctions!
+//
+//		ALERT( at_error, "HPB_bot - Can't get MOD's GetNewDLLFunctions!" );
+//   }
+
+   other_GiveFnptrsToDll = (GIVEFNPTRSTODLL)GetProcAddress(h_Library, "GiveFnptrsToDll");
+
+   if (other_GiveFnptrsToDll == NULL)
+   {
+      // Can't find GiveFnptrsToDll!
+
+		ALERT( at_error, "HPB_bot - Can't get MOD's GiveFnptrsToDll!" );
+   }
+
+   pengfuncsFromEngine->pfnCmd_Args = Cmd_Args;
+   pengfuncsFromEngine->pfnCmd_Argv = Cmd_Argv;
+   pengfuncsFromEngine->pfnCmd_Argc = Cmd_Argc;
+
+   pengfuncsFromEngine->pfnPrecacheModel = pfnPrecacheModel;
+   pengfuncsFromEngine->pfnPrecacheSound = pfnPrecacheSound;
+   pengfuncsFromEngine->pfnSetModel = pfnSetModel;
+   pengfuncsFromEngine->pfnModelIndex = pfnModelIndex;
+   pengfuncsFromEngine->pfnModelFrames = pfnModelFrames;
+   pengfuncsFromEngine->pfnSetSize = pfnSetSize;
+   pengfuncsFromEngine->pfnChangeLevel = pfnChangeLevel;
+   pengfuncsFromEngine->pfnGetSpawnParms = pfnGetSpawnParms;
+   pengfuncsFromEngine->pfnSaveSpawnParms = pfnSaveSpawnParms;
+   pengfuncsFromEngine->pfnVecToYaw = pfnVecToYaw;
+   pengfuncsFromEngine->pfnVecToAngles = pfnVecToAngles;
+   pengfuncsFromEngine->pfnMoveToOrigin = pfnMoveToOrigin;
+   pengfuncsFromEngine->pfnChangeYaw = pfnChangeYaw;
+   pengfuncsFromEngine->pfnChangePitch = pfnChangePitch;
+   pengfuncsFromEngine->pfnFindEntityByString = pfnFindEntityByString;
+   pengfuncsFromEngine->pfnGetEntityIllum = pfnGetEntityIllum;
+   pengfuncsFromEngine->pfnFindEntityInSphere = pfnFindEntityInSphere;
+   pengfuncsFromEngine->pfnFindClientInPVS = pfnFindClientInPVS;
+   pengfuncsFromEngine->pfnEntitiesInPVS = pfnEntitiesInPVS;
+   pengfuncsFromEngine->pfnMakeVectors = pfnMakeVectors;
+   pengfuncsFromEngine->pfnAngleVectors = pfnAngleVectors;
+   pengfuncsFromEngine->pfnCreateEntity = pfnCreateEntity;
+   pengfuncsFromEngine->pfnRemoveEntity = pfnRemoveEntity;
+   pengfuncsFromEngine->pfnCreateNamedEntity = pfnCreateNamedEntity;
+   pengfuncsFromEngine->pfnMakeStatic = pfnMakeStatic;
+   pengfuncsFromEngine->pfnEntIsOnFloor = pfnEntIsOnFloor;
+   pengfuncsFromEngine->pfnDropToFloor = pfnDropToFloor;
+   pengfuncsFromEngine->pfnWalkMove = pfnWalkMove;
+   pengfuncsFromEngine->pfnSetOrigin = pfnSetOrigin;
+   pengfuncsFromEngine->pfnEmitSound = pfnEmitSound;
+   pengfuncsFromEngine->pfnEmitAmbientSound = pfnEmitAmbientSound;
+   pengfuncsFromEngine->pfnTraceLine = pfnTraceLine;
+   pengfuncsFromEngine->pfnTraceToss = pfnTraceToss;
+   pengfuncsFromEngine->pfnTraceMonsterHull = pfnTraceMonsterHull;
+   pengfuncsFromEngine->pfnTraceHull = pfnTraceHull;
+   pengfuncsFromEngine->pfnTraceModel = pfnTraceModel;
+   pengfuncsFromEngine->pfnTraceTexture = pfnTraceTexture;
+   pengfuncsFromEngine->pfnTraceSphere = pfnTraceSphere;
+   pengfuncsFromEngine->pfnGetAimVector = pfnGetAimVector;
+   pengfuncsFromEngine->pfnServerCommand = pfnServerCommand;
+   pengfuncsFromEngine->pfnServerExecute = pfnServerExecute;
+
+   pengfuncsFromEngine->pfnClientCommand = pfnClientCommand;
+
+   pengfuncsFromEngine->pfnParticleEffect = pfnParticleEffect;
+   pengfuncsFromEngine->pfnLightStyle = pfnLightStyle;
+   pengfuncsFromEngine->pfnDecalIndex = pfnDecalIndex;
+   pengfuncsFromEngine->pfnPointContents = pfnPointContents;
+   pengfuncsFromEngine->pfnMessageBegin = pfnMessageBegin;
+   pengfuncsFromEngine->pfnMessageEnd = pfnMessageEnd;
+   pengfuncsFromEngine->pfnWriteByte = pfnWriteByte;
+   pengfuncsFromEngine->pfnWriteChar = pfnWriteChar;
+   pengfuncsFromEngine->pfnWriteShort = pfnWriteShort;
+   pengfuncsFromEngine->pfnWriteLong = pfnWriteLong;
+   pengfuncsFromEngine->pfnWriteAngle = pfnWriteAngle;
+   pengfuncsFromEngine->pfnWriteCoord = pfnWriteCoord;
+   pengfuncsFromEngine->pfnWriteString = pfnWriteString;
+   pengfuncsFromEngine->pfnWriteEntity = pfnWriteEntity;
+   pengfuncsFromEngine->pfnCVarRegister = pfnCVarRegister;
+   pengfuncsFromEngine->pfnCVarGetFloat = pfnCVarGetFloat;
+   pengfuncsFromEngine->pfnCVarGetString = pfnCVarGetString;
+   pengfuncsFromEngine->pfnCVarSetFloat = pfnCVarSetFloat;
+   pengfuncsFromEngine->pfnCVarSetString = pfnCVarSetString;
+   pengfuncsFromEngine->pfnPvAllocEntPrivateData = pfnPvAllocEntPrivateData;
+   pengfuncsFromEngine->pfnPvEntPrivateData = pfnPvEntPrivateData;
+   pengfuncsFromEngine->pfnFreeEntPrivateData = pfnFreeEntPrivateData;
+   pengfuncsFromEngine->pfnSzFromIndex = pfnSzFromIndex;
+   pengfuncsFromEngine->pfnAllocString = pfnAllocString;
+   pengfuncsFromEngine->pfnGetVarsOfEnt = pfnGetVarsOfEnt;
+   pengfuncsFromEngine->pfnPEntityOfEntOffset = pfnPEntityOfEntOffset;
+   pengfuncsFromEngine->pfnEntOffsetOfPEntity = pfnEntOffsetOfPEntity;
+   pengfuncsFromEngine->pfnIndexOfEdict = pfnIndexOfEdict;
+   pengfuncsFromEngine->pfnPEntityOfEntIndex = pfnPEntityOfEntIndex;
+   pengfuncsFromEngine->pfnFindEntityByVars = pfnFindEntityByVars;
+   pengfuncsFromEngine->pfnGetModelPtr = pfnGetModelPtr;
+   pengfuncsFromEngine->pfnRegUserMsg = pfnRegUserMsg;
+   pengfuncsFromEngine->pfnAnimationAutomove = pfnAnimationAutomove;
+   pengfuncsFromEngine->pfnGetBonePosition = pfnGetBonePosition;
+   pengfuncsFromEngine->pfnFunctionFromName = pfnFunctionFromName;
+   pengfuncsFromEngine->pfnNameForFunction = pfnNameForFunction;
+   pengfuncsFromEngine->pfnClientPrintf = pfnClientPrintf;
+   pengfuncsFromEngine->pfnServerPrint = pfnServerPrint;
+   pengfuncsFromEngine->pfnGetAttachment = pfnGetAttachment;
+   pengfuncsFromEngine->pfnCRC32_Init = pfnCRC32_Init;
+   pengfuncsFromEngine->pfnCRC32_ProcessBuffer = pfnCRC32_ProcessBuffer;
+   pengfuncsFromEngine->pfnCRC32_ProcessByte = pfnCRC32_ProcessByte;
+   pengfuncsFromEngine->pfnCRC32_Final = pfnCRC32_Final;
+   pengfuncsFromEngine->pfnRandomLong = pfnRandomLong;
+   pengfuncsFromEngine->pfnRandomFloat = pfnRandomFloat;
+   pengfuncsFromEngine->pfnSetView = pfnSetView;
+   pengfuncsFromEngine->pfnTime = pfnTime;
+   pengfuncsFromEngine->pfnCrosshairAngle = pfnCrosshairAngle;
+   pengfuncsFromEngine->pfnLoadFileForMe = pfnLoadFileForMe;
+   pengfuncsFromEngine->pfnFreeFile = pfnFreeFile;
+   pengfuncsFromEngine->pfnEndSection = pfnEndSection;
+   pengfuncsFromEngine->pfnCompareFileTime = pfnCompareFileTime;
+   pengfuncsFromEngine->pfnGetGameDir = pfnGetGameDir;
+   pengfuncsFromEngine->pfnCvar_RegisterVariable = pfnCvar_RegisterVariable;
+   pengfuncsFromEngine->pfnFadeClientVolume = pfnFadeClientVolume;
+   pengfuncsFromEngine->pfnSetClientMaxspeed = pfnSetClientMaxspeed;
+   pengfuncsFromEngine->pfnCreateFakeClient = pfnCreateFakeClient;
+   pengfuncsFromEngine->pfnRunPlayerMove = pfnRunPlayerMove;
+   pengfuncsFromEngine->pfnNumberOfEntities = pfnNumberOfEntities;
+   pengfuncsFromEngine->pfnGetInfoKeyBuffer = pfnGetInfoKeyBuffer;
+   pengfuncsFromEngine->pfnInfoKeyValue = pfnInfoKeyValue;
+   pengfuncsFromEngine->pfnSetKeyValue = pfnSetKeyValue;
+   pengfuncsFromEngine->pfnSetClientKeyValue = pfnSetClientKeyValue;
+   pengfuncsFromEngine->pfnIsMapValid = pfnIsMapValid;
+   pengfuncsFromEngine->pfnStaticDecal = pfnStaticDecal;
+   pengfuncsFromEngine->pfnPrecacheGeneric = pfnPrecacheGeneric;
+   pengfuncsFromEngine->pfnGetPlayerUserId = pfnGetPlayerUserId;
+   pengfuncsFromEngine->pfnBuildSoundMsg = pfnBuildSoundMsg;
+   pengfuncsFromEngine->pfnIsDedicatedServer = pfnIsDedicatedServer;
+   pengfuncsFromEngine->pfnCVarGetPointer = pfnCVarGetPointer;
+   pengfuncsFromEngine->pfnGetPlayerWONId = pfnGetPlayerWONId;
+
+   // give the engine functions to the other DLL...
+   (*other_GiveFnptrsToDll)(pengfuncsFromEngine, pGlobals);
+}
+
diff --git a/main/source/HPB_bot/dlls/linkfunc.cpp b/main/source/HPB_bot/dlls/linkfunc.cpp
new file mode 100644
index 00000000..60d084e9
--- /dev/null
+++ b/main/source/HPB_bot/dlls/linkfunc.cpp
@@ -0,0 +1,689 @@
+//
+// HPB bot - botman's High Ping Bastard bot
+//
+// (http://planethalflife.com/botman/)
+//
+// linkfunc.cpp
+//
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+
+#include "bot.h"
+
+// For some reason, including these and using them doesn't work.  Has something to do with
+// the preprocessor but I don't get it...
+//#include "mod/AvHConstants.h"
+//#include "mod/AvHMarineEquipmentConstants.h"
+
+#ifdef __BORLANDC__
+extern HINSTANCE _h_Library;
+#elif _WIN32
+extern HINSTANCE h_Library;
+#else
+extern void *h_Library;
+#endif
+
+#ifdef __BORLANDC__
+
+#define LINK_ENTITY_TO_FUNC(mapClassName) \
+ extern "C" EXPORT void mapClassName( entvars_t *pev ); \
+ void mapClassName( entvars_t *pev ) { \
+      static LINK_ENTITY_FUNC otherClassName = NULL; \
+      static int skip_this = 0; \
+      if (skip_this) return; \
+      if (otherClassName == NULL) \
+         otherClassName = (LINK_ENTITY_FUNC)GetProcAddress(_h_Library, #mapClassName); \
+      if (otherClassName == NULL) { \
+         skip_this = 1; return; \
+      } \
+      (*otherClassName)(pev); }
+
+#else
+
+#define LINK_ENTITY_TO_FUNC(mapClassName) \
+ extern "C" EXPORT void mapClassName( entvars_t *pev ); \
+ void mapClassName( entvars_t *pev ) { \
+      static LINK_ENTITY_FUNC otherClassName = NULL; \
+      static int skip_this = 0; \
+      if (skip_this) return; \
+      if (otherClassName == NULL) \
+         otherClassName = (LINK_ENTITY_FUNC)GetProcAddress(h_Library, #mapClassName); \
+      if (otherClassName == NULL) { \
+         skip_this = 1; return; \
+      } \
+      (*otherClassName)(pev); }
+
+#endif
+
+// new stuff for 1.1.0.4 release
+//LINK_ENTITY_TO_FUNC(CreateInterface);
+
+// entities for Valve's hl.dll and Standard SDK...
+LINK_ENTITY_TO_FUNC(aiscripted_sequence);
+LINK_ENTITY_TO_FUNC(ambient_generic);
+LINK_ENTITY_TO_FUNC(ammo_357);
+LINK_ENTITY_TO_FUNC(ammo_9mmAR);
+LINK_ENTITY_TO_FUNC(ammo_9mmbox);
+LINK_ENTITY_TO_FUNC(ammo_9mmclip);
+LINK_ENTITY_TO_FUNC(ammo_ARgrenades);
+LINK_ENTITY_TO_FUNC(ammo_buckshot);
+LINK_ENTITY_TO_FUNC(ammo_crossbow);
+LINK_ENTITY_TO_FUNC(ammo_egonclip);
+LINK_ENTITY_TO_FUNC(ammo_gaussclip);
+LINK_ENTITY_TO_FUNC(ammo_glockclip);
+LINK_ENTITY_TO_FUNC(ammo_mp5clip);
+LINK_ENTITY_TO_FUNC(ammo_mp5grenades);
+LINK_ENTITY_TO_FUNC(ammo_rpgclip);
+LINK_ENTITY_TO_FUNC(beam);
+LINK_ENTITY_TO_FUNC(bmortar);
+LINK_ENTITY_TO_FUNC(bodyque);
+LINK_ENTITY_TO_FUNC(button_target);
+LINK_ENTITY_TO_FUNC(cine_blood);
+LINK_ENTITY_TO_FUNC(controller_energy_ball);
+LINK_ENTITY_TO_FUNC(controller_head_ball);
+LINK_ENTITY_TO_FUNC(crossbow_bolt);
+LINK_ENTITY_TO_FUNC(cycler);
+LINK_ENTITY_TO_FUNC(cycler_prdroid);
+LINK_ENTITY_TO_FUNC(cycler_sprite);
+LINK_ENTITY_TO_FUNC(cycler_weapon);
+LINK_ENTITY_TO_FUNC(cycler_wreckage);
+LINK_ENTITY_TO_FUNC(DelayedUse);
+LINK_ENTITY_TO_FUNC(env_beam);
+LINK_ENTITY_TO_FUNC(env_beverage);
+LINK_ENTITY_TO_FUNC(env_blood);
+LINK_ENTITY_TO_FUNC(env_bubbles);
+LINK_ENTITY_TO_FUNC(env_debris);
+LINK_ENTITY_TO_FUNC(env_explosion);
+LINK_ENTITY_TO_FUNC(env_fade);
+LINK_ENTITY_TO_FUNC(env_funnel);
+LINK_ENTITY_TO_FUNC(env_global);
+LINK_ENTITY_TO_FUNC(env_glow);
+LINK_ENTITY_TO_FUNC(env_laser);
+LINK_ENTITY_TO_FUNC(env_lightning);
+LINK_ENTITY_TO_FUNC(env_message);
+LINK_ENTITY_TO_FUNC(env_render);
+LINK_ENTITY_TO_FUNC(env_shake);
+LINK_ENTITY_TO_FUNC(env_shooter);
+LINK_ENTITY_TO_FUNC(env_smoker);
+LINK_ENTITY_TO_FUNC(env_sound);
+LINK_ENTITY_TO_FUNC(env_spark);
+LINK_ENTITY_TO_FUNC(env_sprite);
+LINK_ENTITY_TO_FUNC(fireanddie);
+LINK_ENTITY_TO_FUNC(func_breakable);
+LINK_ENTITY_TO_FUNC(func_button);
+LINK_ENTITY_TO_FUNC(func_conveyor);
+LINK_ENTITY_TO_FUNC(func_door);
+LINK_ENTITY_TO_FUNC(func_door_rotating);
+LINK_ENTITY_TO_FUNC(func_friction);
+LINK_ENTITY_TO_FUNC(func_guntarget);
+LINK_ENTITY_TO_FUNC(func_healthcharger);
+LINK_ENTITY_TO_FUNC(func_illusionary);
+LINK_ENTITY_TO_FUNC(func_ladder);
+LINK_ENTITY_TO_FUNC(func_monsterclip);
+LINK_ENTITY_TO_FUNC(func_mortar_field);
+LINK_ENTITY_TO_FUNC(func_pendulum);
+LINK_ENTITY_TO_FUNC(func_plat);
+LINK_ENTITY_TO_FUNC(func_platrot);
+LINK_ENTITY_TO_FUNC(func_pushable);
+LINK_ENTITY_TO_FUNC(func_recharge);
+LINK_ENTITY_TO_FUNC(func_rot_button);
+LINK_ENTITY_TO_FUNC(func_rotating);
+LINK_ENTITY_TO_FUNC(func_tank);
+LINK_ENTITY_TO_FUNC(func_tankcontrols);
+LINK_ENTITY_TO_FUNC(func_tanklaser);
+LINK_ENTITY_TO_FUNC(func_tankmortar);
+LINK_ENTITY_TO_FUNC(func_tankrocket);
+LINK_ENTITY_TO_FUNC(func_trackautochange);
+LINK_ENTITY_TO_FUNC(func_trackchange);
+LINK_ENTITY_TO_FUNC(func_tracktrain);
+LINK_ENTITY_TO_FUNC(func_train);
+LINK_ENTITY_TO_FUNC(func_traincontrols);
+LINK_ENTITY_TO_FUNC(func_wall);
+LINK_ENTITY_TO_FUNC(func_wall_toggle);
+LINK_ENTITY_TO_FUNC(func_water);
+LINK_ENTITY_TO_FUNC(game_counter);
+LINK_ENTITY_TO_FUNC(game_counter_set);
+LINK_ENTITY_TO_FUNC(game_end);
+LINK_ENTITY_TO_FUNC(game_player_equip);
+LINK_ENTITY_TO_FUNC(game_player_hurt);
+LINK_ENTITY_TO_FUNC(game_player_team);
+LINK_ENTITY_TO_FUNC(game_score);
+LINK_ENTITY_TO_FUNC(game_team_master);
+LINK_ENTITY_TO_FUNC(game_team_set);
+LINK_ENTITY_TO_FUNC(game_text);
+LINK_ENTITY_TO_FUNC(game_zone_player);
+LINK_ENTITY_TO_FUNC(garg_stomp);
+LINK_ENTITY_TO_FUNC(gibshooter);
+LINK_ENTITY_TO_FUNC(grenade);
+LINK_ENTITY_TO_FUNC(hornet);
+LINK_ENTITY_TO_FUNC(hvr_rocket);
+LINK_ENTITY_TO_FUNC(info_bigmomma);
+LINK_ENTITY_TO_FUNC(info_intermission);
+LINK_ENTITY_TO_FUNC(info_landmark);
+LINK_ENTITY_TO_FUNC(info_node);
+LINK_ENTITY_TO_FUNC(info_node_air);
+LINK_ENTITY_TO_FUNC(info_null);
+LINK_ENTITY_TO_FUNC(info_player_deathmatch);
+LINK_ENTITY_TO_FUNC(info_player_start);
+LINK_ENTITY_TO_FUNC(info_target);
+LINK_ENTITY_TO_FUNC(info_teleport_destination);
+LINK_ENTITY_TO_FUNC(infodecal);
+LINK_ENTITY_TO_FUNC(item_airtank);
+LINK_ENTITY_TO_FUNC(item_antidote);
+LINK_ENTITY_TO_FUNC(item_battery);
+LINK_ENTITY_TO_FUNC(item_healthkit);
+LINK_ENTITY_TO_FUNC(item_longjump);
+LINK_ENTITY_TO_FUNC(item_security);
+LINK_ENTITY_TO_FUNC(item_sodacan);
+LINK_ENTITY_TO_FUNC(item_suit);
+LINK_ENTITY_TO_FUNC(laser_spot);
+LINK_ENTITY_TO_FUNC(light);
+LINK_ENTITY_TO_FUNC(light_environment);
+LINK_ENTITY_TO_FUNC(light_spot);
+LINK_ENTITY_TO_FUNC(momentary_door);
+LINK_ENTITY_TO_FUNC(momentary_rot_button);
+LINK_ENTITY_TO_FUNC(monstermaker);
+LINK_ENTITY_TO_FUNC(monster_alien_controller);
+LINK_ENTITY_TO_FUNC(monster_alien_grunt);
+LINK_ENTITY_TO_FUNC(monster_alien_slave);
+LINK_ENTITY_TO_FUNC(monster_apache);
+LINK_ENTITY_TO_FUNC(monster_babycrab);
+LINK_ENTITY_TO_FUNC(monster_barnacle);
+LINK_ENTITY_TO_FUNC(monster_barney);
+LINK_ENTITY_TO_FUNC(monster_barney_dead);
+LINK_ENTITY_TO_FUNC(monster_bigmomma);
+LINK_ENTITY_TO_FUNC(monster_bloater);
+LINK_ENTITY_TO_FUNC(monster_bullchicken);
+LINK_ENTITY_TO_FUNC(monster_cine2_hvyweapons);
+LINK_ENTITY_TO_FUNC(monster_cine2_scientist);
+LINK_ENTITY_TO_FUNC(monster_cine2_slave);
+LINK_ENTITY_TO_FUNC(monster_cine3_barney);
+LINK_ENTITY_TO_FUNC(monster_cine3_scientist);
+LINK_ENTITY_TO_FUNC(monster_cine_barney);
+LINK_ENTITY_TO_FUNC(monster_cine_panther);
+LINK_ENTITY_TO_FUNC(monster_cine_scientist);
+LINK_ENTITY_TO_FUNC(monster_cockroach);
+LINK_ENTITY_TO_FUNC(monster_flyer);
+LINK_ENTITY_TO_FUNC(monster_flyer_flock);
+LINK_ENTITY_TO_FUNC(monster_furniture);
+LINK_ENTITY_TO_FUNC(monster_gargantua);
+LINK_ENTITY_TO_FUNC(monster_generic);
+LINK_ENTITY_TO_FUNC(monster_gman);
+LINK_ENTITY_TO_FUNC(monster_grunt_repel);
+LINK_ENTITY_TO_FUNC(monster_headcrab);
+LINK_ENTITY_TO_FUNC(monster_hevsuit_dead);
+LINK_ENTITY_TO_FUNC(monster_hgrunt_dead);
+LINK_ENTITY_TO_FUNC(monster_houndeye);
+LINK_ENTITY_TO_FUNC(monster_human_assassin);
+LINK_ENTITY_TO_FUNC(monster_human_grunt);
+LINK_ENTITY_TO_FUNC(monster_ichthyosaur);
+LINK_ENTITY_TO_FUNC(monster_leech);
+LINK_ENTITY_TO_FUNC(monster_miniturret);
+LINK_ENTITY_TO_FUNC(monster_mortar);
+LINK_ENTITY_TO_FUNC(monster_nihilanth);
+LINK_ENTITY_TO_FUNC(monster_osprey);
+LINK_ENTITY_TO_FUNC(monster_rat);
+LINK_ENTITY_TO_FUNC(monster_satchel);
+LINK_ENTITY_TO_FUNC(monster_scientist);
+LINK_ENTITY_TO_FUNC(monster_scientist_dead);
+LINK_ENTITY_TO_FUNC(monster_sentry);
+LINK_ENTITY_TO_FUNC(monster_sitting_scientist);
+LINK_ENTITY_TO_FUNC(monster_snark);
+LINK_ENTITY_TO_FUNC(monster_tentacle);
+LINK_ENTITY_TO_FUNC(monster_tentaclemaw);
+LINK_ENTITY_TO_FUNC(monster_tripmine);
+LINK_ENTITY_TO_FUNC(monster_turret);
+LINK_ENTITY_TO_FUNC(monster_vortigaunt);
+LINK_ENTITY_TO_FUNC(monster_zombie);
+LINK_ENTITY_TO_FUNC(multi_manager);
+LINK_ENTITY_TO_FUNC(multisource);
+LINK_ENTITY_TO_FUNC(nihilanth_energy_ball);
+LINK_ENTITY_TO_FUNC(node_viewer);
+LINK_ENTITY_TO_FUNC(node_viewer_fly);
+LINK_ENTITY_TO_FUNC(node_viewer_human);
+LINK_ENTITY_TO_FUNC(node_viewer_large);
+LINK_ENTITY_TO_FUNC(path_corner);
+LINK_ENTITY_TO_FUNC(path_track);
+LINK_ENTITY_TO_FUNC(player);
+LINK_ENTITY_TO_FUNC(player_loadsaved);
+LINK_ENTITY_TO_FUNC(player_weaponstrip);
+LINK_ENTITY_TO_FUNC(rpg_rocket);
+LINK_ENTITY_TO_FUNC(scripted_sentence);
+LINK_ENTITY_TO_FUNC(scripted_sequence);
+LINK_ENTITY_TO_FUNC(soundent);
+LINK_ENTITY_TO_FUNC(spark_shower);
+LINK_ENTITY_TO_FUNC(speaker);
+LINK_ENTITY_TO_FUNC(squidspit);
+LINK_ENTITY_TO_FUNC(streak_spiral);
+LINK_ENTITY_TO_FUNC(target_cdaudio);
+LINK_ENTITY_TO_FUNC(test_effect);
+LINK_ENTITY_TO_FUNC(testhull);
+LINK_ENTITY_TO_FUNC(trigger);
+LINK_ENTITY_TO_FUNC(trigger_auto);
+LINK_ENTITY_TO_FUNC(trigger_autosave);
+LINK_ENTITY_TO_FUNC(trigger_camera);
+LINK_ENTITY_TO_FUNC(trigger_cdaudio);
+LINK_ENTITY_TO_FUNC(trigger_changelevel);
+LINK_ENTITY_TO_FUNC(trigger_changetarget);
+LINK_ENTITY_TO_FUNC(trigger_counter);
+LINK_ENTITY_TO_FUNC(trigger_endsection);
+LINK_ENTITY_TO_FUNC(trigger_gravity);
+LINK_ENTITY_TO_FUNC(trigger_hurt);
+LINK_ENTITY_TO_FUNC(trigger_monsterjump);
+LINK_ENTITY_TO_FUNC(trigger_multiple);
+LINK_ENTITY_TO_FUNC(trigger_once);
+LINK_ENTITY_TO_FUNC(trigger_push);
+LINK_ENTITY_TO_FUNC(trigger_relay);
+LINK_ENTITY_TO_FUNC(trigger_teleport);
+LINK_ENTITY_TO_FUNC(trigger_transition);
+LINK_ENTITY_TO_FUNC(weapon_357);
+LINK_ENTITY_TO_FUNC(weapon_9mmAR);
+LINK_ENTITY_TO_FUNC(weapon_9mmhandgun);
+LINK_ENTITY_TO_FUNC(weapon_crossbow);
+LINK_ENTITY_TO_FUNC(weapon_crowbar);
+LINK_ENTITY_TO_FUNC(weapon_egon);
+LINK_ENTITY_TO_FUNC(weapon_gauss);
+LINK_ENTITY_TO_FUNC(weapon_glock);
+LINK_ENTITY_TO_FUNC(weapon_handgrenade);
+LINK_ENTITY_TO_FUNC(weapon_hornetgun);
+LINK_ENTITY_TO_FUNC(weapon_mp5);
+LINK_ENTITY_TO_FUNC(weapon_python);
+LINK_ENTITY_TO_FUNC(weapon_rpg);
+LINK_ENTITY_TO_FUNC(weapon_satchel);
+//LINK_ENTITY_TO_FUNC(weapon_shotgun);
+LINK_ENTITY_TO_FUNC(weapon_snark);
+LINK_ENTITY_TO_FUNC(weapon_tripmine);
+LINK_ENTITY_TO_FUNC(weaponbox);
+LINK_ENTITY_TO_FUNC(world_items);
+LINK_ENTITY_TO_FUNC(worldspawn);
+LINK_ENTITY_TO_FUNC(xen_hair);
+LINK_ENTITY_TO_FUNC(xen_hull);
+LINK_ENTITY_TO_FUNC(xen_plantlight);
+LINK_ENTITY_TO_FUNC(xen_spore_large);
+LINK_ENTITY_TO_FUNC(xen_spore_medium);
+LINK_ENTITY_TO_FUNC(xen_spore_small);
+LINK_ENTITY_TO_FUNC(xen_tree);
+LINK_ENTITY_TO_FUNC(xen_ttrigger);
+
+//// entities for Team Fortress 1.5
+//LINK_ENTITY_TO_FUNC(building_dispenser);
+//LINK_ENTITY_TO_FUNC(building_sentrygun);
+//LINK_ENTITY_TO_FUNC(building_sentrygun_base);
+//LINK_ENTITY_TO_FUNC(detpack);
+//LINK_ENTITY_TO_FUNC(dispenser_refill_timer);
+//LINK_ENTITY_TO_FUNC(func_nobuild);
+//LINK_ENTITY_TO_FUNC(func_nogrenades);
+//LINK_ENTITY_TO_FUNC(ghost);
+//LINK_ENTITY_TO_FUNC(i_p_t);
+//LINK_ENTITY_TO_FUNC(i_t_g);
+//LINK_ENTITY_TO_FUNC(i_t_t);
+//LINK_ENTITY_TO_FUNC(info_areadef);
+//LINK_ENTITY_TO_FUNC(info_player_teamspawn);
+//LINK_ENTITY_TO_FUNC(info_tf_teamcheck);
+//LINK_ENTITY_TO_FUNC(info_tf_teamset);
+//LINK_ENTITY_TO_FUNC(info_tfdetect);
+//LINK_ENTITY_TO_FUNC(info_tfgoal);
+//LINK_ENTITY_TO_FUNC(info_tfgoal_timer);
+//LINK_ENTITY_TO_FUNC(item_armor1);
+//LINK_ENTITY_TO_FUNC(item_armor2);
+//LINK_ENTITY_TO_FUNC(item_armor3);
+//LINK_ENTITY_TO_FUNC(item_artifact_envirosuit);
+//LINK_ENTITY_TO_FUNC(item_artifact_invisibility);
+//LINK_ENTITY_TO_FUNC(item_artifact_invulnerability);
+//LINK_ENTITY_TO_FUNC(item_artifact_super_damage);
+//LINK_ENTITY_TO_FUNC(item_cells);
+//LINK_ENTITY_TO_FUNC(item_health);
+//LINK_ENTITY_TO_FUNC(item_rockets);
+//LINK_ENTITY_TO_FUNC(item_shells);
+//LINK_ENTITY_TO_FUNC(item_spikes);
+//LINK_ENTITY_TO_FUNC(item_tfgoal);
+//LINK_ENTITY_TO_FUNC(teledeath);
+//LINK_ENTITY_TO_FUNC(tf_ammo_rpgclip);
+//LINK_ENTITY_TO_FUNC(tf_flame);
+//LINK_ENTITY_TO_FUNC(tf_flamethrower_burst);
+//LINK_ENTITY_TO_FUNC(tf_gl_grenade);
+//LINK_ENTITY_TO_FUNC(tf_ic_rocket);
+//LINK_ENTITY_TO_FUNC(tf_nailgun_nail);
+//LINK_ENTITY_TO_FUNC(tf_rpg_rocket);
+//LINK_ENTITY_TO_FUNC(tf_weapon_ac);
+//LINK_ENTITY_TO_FUNC(tf_weapon_autorifle);
+//LINK_ENTITY_TO_FUNC(tf_weapon_axe);
+//LINK_ENTITY_TO_FUNC(tf_weapon_caltrop);
+//LINK_ENTITY_TO_FUNC(tf_weapon_caltropgrenade);
+//LINK_ENTITY_TO_FUNC(tf_weapon_concussiongrenade);
+//LINK_ENTITY_TO_FUNC(tf_weapon_empgrenade);
+//LINK_ENTITY_TO_FUNC(tf_weapon_flamethrower);
+//LINK_ENTITY_TO_FUNC(tf_weapon_gasgrenade);
+//LINK_ENTITY_TO_FUNC(tf_weapon_genericprimedgrenade);
+//LINK_ENTITY_TO_FUNC(tf_weapon_gl);
+//LINK_ENTITY_TO_FUNC(tf_weapon_ic);
+//LINK_ENTITY_TO_FUNC(tf_weapon_knife);
+//LINK_ENTITY_TO_FUNC(tf_weapon_medikit);
+//LINK_ENTITY_TO_FUNC(tf_weapon_mirvbomblet);
+//LINK_ENTITY_TO_FUNC(tf_weapon_mirvgrenade);
+//LINK_ENTITY_TO_FUNC(tf_weapon_nailgrenade);
+//LINK_ENTITY_TO_FUNC(tf_weapon_napalmgrenade);
+//LINK_ENTITY_TO_FUNC(tf_weapon_ng);
+//LINK_ENTITY_TO_FUNC(tf_weapon_normalgrenade);
+//LINK_ENTITY_TO_FUNC(tf_weapon_pl);
+//LINK_ENTITY_TO_FUNC(tf_weapon_railgun);
+//LINK_ENTITY_TO_FUNC(tf_weapon_rpg);
+//LINK_ENTITY_TO_FUNC(tf_weapon_shotgun);
+//LINK_ENTITY_TO_FUNC(tf_weapon_sniperrifle);
+//LINK_ENTITY_TO_FUNC(tf_weapon_spanner);
+//LINK_ENTITY_TO_FUNC(tf_weapon_superng);
+//LINK_ENTITY_TO_FUNC(tf_weapon_supershotgun);
+//LINK_ENTITY_TO_FUNC(tf_weapon_tranq);
+//LINK_ENTITY_TO_FUNC(timer);
+//
+//// entities for Counter-Strike (Beta 6.5, 6.6, 7.0, 7.1) & 1.0
+//LINK_ENTITY_TO_FUNC(ammo_338magnum);
+//LINK_ENTITY_TO_FUNC(ammo_357sig);
+//LINK_ENTITY_TO_FUNC(ammo_45acp);
+//LINK_ENTITY_TO_FUNC(ammo_50ae);
+//LINK_ENTITY_TO_FUNC(ammo_556nato);
+//LINK_ENTITY_TO_FUNC(ammo_556natobox);
+//LINK_ENTITY_TO_FUNC(ammo_57mm);
+//LINK_ENTITY_TO_FUNC(ammo_762nato);
+//LINK_ENTITY_TO_FUNC(ammo_9mm);
+//LINK_ENTITY_TO_FUNC(armoury_entity);
+//LINK_ENTITY_TO_FUNC(env_bombglow);
+//LINK_ENTITY_TO_FUNC(func_bomb_target);
+//LINK_ENTITY_TO_FUNC(func_buyzone);
+//LINK_ENTITY_TO_FUNC(func_escapezone);
+//LINK_ENTITY_TO_FUNC(func_grencatch);
+//LINK_ENTITY_TO_FUNC(func_hostage_rescue);
+//LINK_ENTITY_TO_FUNC(func_vehicle);
+//LINK_ENTITY_TO_FUNC(func_vehiclecontrols);
+//LINK_ENTITY_TO_FUNC(func_vip_safetyzone);
+//LINK_ENTITY_TO_FUNC(func_weaponcheck);
+//LINK_ENTITY_TO_FUNC(hostage_entity);
+//LINK_ENTITY_TO_FUNC(info_bomb_target);
+//LINK_ENTITY_TO_FUNC(info_hostage_rescue);
+//LINK_ENTITY_TO_FUNC(info_map_parameters);
+//LINK_ENTITY_TO_FUNC(info_vip_start);
+//LINK_ENTITY_TO_FUNC(item_assaultsuit);
+//LINK_ENTITY_TO_FUNC(item_kevlar);
+//LINK_ENTITY_TO_FUNC(item_thighpack);
+//LINK_ENTITY_TO_FUNC(weapon_ak47);
+//LINK_ENTITY_TO_FUNC(weapon_aug);
+//LINK_ENTITY_TO_FUNC(weapon_awp);
+//LINK_ENTITY_TO_FUNC(weapon_c4);
+//LINK_ENTITY_TO_FUNC(weapon_deagle);
+//LINK_ENTITY_TO_FUNC(weapon_elite);
+//LINK_ENTITY_TO_FUNC(weapon_fiveseven);
+//LINK_ENTITY_TO_FUNC(weapon_flashbang);
+//LINK_ENTITY_TO_FUNC(weapon_g3sg1);
+//LINK_ENTITY_TO_FUNC(weapon_glock18);
+//LINK_ENTITY_TO_FUNC(weapon_hegrenade);
+//LINK_ENTITY_TO_FUNC(weapon_knife);
+//LINK_ENTITY_TO_FUNC(weapon_m249);
+//LINK_ENTITY_TO_FUNC(weapon_m3);
+//LINK_ENTITY_TO_FUNC(weapon_m4a1);
+//LINK_ENTITY_TO_FUNC(weapon_mac10);
+//LINK_ENTITY_TO_FUNC(weapon_mp5navy);
+//LINK_ENTITY_TO_FUNC(weapon_p228);
+//LINK_ENTITY_TO_FUNC(weapon_p90);
+//LINK_ENTITY_TO_FUNC(weapon_scout);
+//LINK_ENTITY_TO_FUNC(weapon_sg550);
+//LINK_ENTITY_TO_FUNC(weapon_sg552);
+//LINK_ENTITY_TO_FUNC(weapon_smokegrenade);
+//LINK_ENTITY_TO_FUNC(weapon_tmp);
+//LINK_ENTITY_TO_FUNC(weapon_usp);
+//LINK_ENTITY_TO_FUNC(weapon_ump45);
+//LINK_ENTITY_TO_FUNC(weapon_xm1014);
+//
+//// entities for Opposing Force
+//LINK_ENTITY_TO_FUNC(ammo_556);
+//LINK_ENTITY_TO_FUNC(ammo_762);
+//LINK_ENTITY_TO_FUNC(ammo_eagleclip);
+//LINK_ENTITY_TO_FUNC(ammo_spore);
+//LINK_ENTITY_TO_FUNC(charged_bolt);
+//LINK_ENTITY_TO_FUNC(displacer_ball);
+//LINK_ENTITY_TO_FUNC(eagle_laser);
+//LINK_ENTITY_TO_FUNC(env_blowercannon);
+//LINK_ENTITY_TO_FUNC(env_electrified_wire);
+//LINK_ENTITY_TO_FUNC(env_genewormcloud);
+//LINK_ENTITY_TO_FUNC(env_genewormspawn);
+//LINK_ENTITY_TO_FUNC(env_rope);
+//LINK_ENTITY_TO_FUNC(env_spritetrain);
+//LINK_ENTITY_TO_FUNC(func_op4mortarcontroller);
+//LINK_ENTITY_TO_FUNC(func_tank_of);
+//LINK_ENTITY_TO_FUNC(func_tankcontrols_of);
+//LINK_ENTITY_TO_FUNC(func_tanklaser_of);
+//LINK_ENTITY_TO_FUNC(func_tankmortar_of);
+//LINK_ENTITY_TO_FUNC(func_tankrocket_of);
+//LINK_ENTITY_TO_FUNC(gonomeguts);
+//LINK_ENTITY_TO_FUNC(grapple_tip);
+//LINK_ENTITY_TO_FUNC(hvr_blkop_rocket);
+//LINK_ENTITY_TO_FUNC(info_ctfdetect);
+//LINK_ENTITY_TO_FUNC(info_ctfspawn);
+//LINK_ENTITY_TO_FUNC(info_ctfspawn_powerup);
+//LINK_ENTITY_TO_FUNC(info_displacer_earth_target);
+//LINK_ENTITY_TO_FUNC(info_displacer_xen_target);
+//LINK_ENTITY_TO_FUNC(info_pitworm);
+//LINK_ENTITY_TO_FUNC(info_pitworm_steam_lock);
+//LINK_ENTITY_TO_FUNC(item_ctfaccelerator);
+//LINK_ENTITY_TO_FUNC(item_ctfbackpack);
+//LINK_ENTITY_TO_FUNC(item_ctfbase);
+//LINK_ENTITY_TO_FUNC(item_ctfflag);
+//LINK_ENTITY_TO_FUNC(item_ctflongjump);
+//LINK_ENTITY_TO_FUNC(item_ctfportablehev);
+//LINK_ENTITY_TO_FUNC(item_ctfregeneration);
+//LINK_ENTITY_TO_FUNC(item_generic);
+//LINK_ENTITY_TO_FUNC(item_nuclearbomb);
+//LINK_ENTITY_TO_FUNC(item_nuclearbombbutton);
+//LINK_ENTITY_TO_FUNC(item_nuclearbombtimer);
+//LINK_ENTITY_TO_FUNC(item_vest);
+//LINK_ENTITY_TO_FUNC(monster_ShockTrooper_dead);
+//LINK_ENTITY_TO_FUNC(monster_alien_babyvoltigore);
+//LINK_ENTITY_TO_FUNC(monster_alien_slave_dead);
+//LINK_ENTITY_TO_FUNC(monster_alien_voltigore);
+//LINK_ENTITY_TO_FUNC(monster_assassin_repel);
+//LINK_ENTITY_TO_FUNC(monster_blkop_apache);
+//LINK_ENTITY_TO_FUNC(monster_blkop_osprey);
+//LINK_ENTITY_TO_FUNC(monster_cleansuit_scientist);
+//LINK_ENTITY_TO_FUNC(monster_cleansuit_scientist_dead);
+//LINK_ENTITY_TO_FUNC(monster_drillsergeant);
+//LINK_ENTITY_TO_FUNC(monster_fgrunt_repel);
+//LINK_ENTITY_TO_FUNC(monster_geneworm);
+//LINK_ENTITY_TO_FUNC(monster_gonome);
+//LINK_ENTITY_TO_FUNC(monster_gonome_dead);
+//LINK_ENTITY_TO_FUNC(monster_grunt_ally_repel);
+//LINK_ENTITY_TO_FUNC(monster_hfgrunt_dead);
+//LINK_ENTITY_TO_FUNC(monster_houndeye_dead);
+//LINK_ENTITY_TO_FUNC(monster_human_friendly_grunt);
+//LINK_ENTITY_TO_FUNC(monster_human_grunt_ally);
+//LINK_ENTITY_TO_FUNC(monster_human_grunt_ally_dead);
+//LINK_ENTITY_TO_FUNC(monster_human_medic_ally);
+//LINK_ENTITY_TO_FUNC(monster_human_torch_ally);
+//LINK_ENTITY_TO_FUNC(monster_male_assassin);
+//LINK_ENTITY_TO_FUNC(monster_massassin_dead);
+//LINK_ENTITY_TO_FUNC(monster_medic_ally_repel);
+//LINK_ENTITY_TO_FUNC(monster_op4loader);
+//LINK_ENTITY_TO_FUNC(monster_otis);
+//LINK_ENTITY_TO_FUNC(monster_otis_dead);
+//LINK_ENTITY_TO_FUNC(monster_penguin);
+//LINK_ENTITY_TO_FUNC(monster_pitdrone);
+//LINK_ENTITY_TO_FUNC(monster_pitworm);
+//LINK_ENTITY_TO_FUNC(monster_pitworm_up);
+//LINK_ENTITY_TO_FUNC(monster_recruit);
+//LINK_ENTITY_TO_FUNC(monster_shockroach);
+//LINK_ENTITY_TO_FUNC(monster_shocktrooper);
+//LINK_ENTITY_TO_FUNC(monster_shocktrooper_repel);
+//LINK_ENTITY_TO_FUNC(monster_sitting_cleansuit_scientist);
+//LINK_ENTITY_TO_FUNC(monster_skeleton_dead);
+//LINK_ENTITY_TO_FUNC(monster_torch_ally_repel);
+//LINK_ENTITY_TO_FUNC(monster_zombie_barney);
+//LINK_ENTITY_TO_FUNC(monster_zombie_soldier);
+//LINK_ENTITY_TO_FUNC(monster_zombie_soldier_dead);
+//LINK_ENTITY_TO_FUNC(mortar_shell);
+//LINK_ENTITY_TO_FUNC(op4mortar);
+//LINK_ENTITY_TO_FUNC(pitdronespike);
+//LINK_ENTITY_TO_FUNC(pitworm_gib);
+//LINK_ENTITY_TO_FUNC(pitworm_gibshooter);
+//LINK_ENTITY_TO_FUNC(rope_sample);
+//LINK_ENTITY_TO_FUNC(rope_segment);
+//LINK_ENTITY_TO_FUNC(shock_beam);
+//LINK_ENTITY_TO_FUNC(spore);
+//LINK_ENTITY_TO_FUNC(trigger_ctfgeneric);
+//LINK_ENTITY_TO_FUNC(trigger_geneworm_hit);
+//LINK_ENTITY_TO_FUNC(trigger_kill_nogib);
+//LINK_ENTITY_TO_FUNC(trigger_playerfreeze);
+//LINK_ENTITY_TO_FUNC(trigger_xen_return);
+//LINK_ENTITY_TO_FUNC(weapon_displacer);
+//LINK_ENTITY_TO_FUNC(weapon_eagle);
+//LINK_ENTITY_TO_FUNC(weapon_grapple);
+//LINK_ENTITY_TO_FUNC(weapon_penguin);
+//LINK_ENTITY_TO_FUNC(weapon_pipewrench);
+//LINK_ENTITY_TO_FUNC(weapon_shockrifle);
+//LINK_ENTITY_TO_FUNC(weapon_shockroach);
+//LINK_ENTITY_TO_FUNC(weapon_sniperrifle);
+//LINK_ENTITY_TO_FUNC(weapon_sporelauncher);
+//
+//// entities for FrontLineForce (1.0)
+//LINK_ENTITY_TO_FUNC(ammo_ak5);
+//LINK_ENTITY_TO_FUNC(ammo_beretta);
+//LINK_ENTITY_TO_FUNC(ammo_famas);
+//LINK_ENTITY_TO_FUNC(ammo_hk21);
+//LINK_ENTITY_TO_FUNC(ammo_m4);
+//LINK_ENTITY_TO_FUNC(ammo_mac10);
+//LINK_ENTITY_TO_FUNC(ammo_mk23);
+//LINK_ENTITY_TO_FUNC(ammo_mp5a2);
+//LINK_ENTITY_TO_FUNC(ammo_mp5sd);
+//LINK_ENTITY_TO_FUNC(ammo_msg90);
+//LINK_ENTITY_TO_FUNC(ammo_spas12);
+//LINK_ENTITY_TO_FUNC(ammo_ump45);
+//LINK_ENTITY_TO_FUNC(capture_point);
+//LINK_ENTITY_TO_FUNC(info_frontline);
+//LINK_ENTITY_TO_FUNC(info_player_attacker);
+//LINK_ENTITY_TO_FUNC(info_player_defender);
+//LINK_ENTITY_TO_FUNC(info_player_observer);
+//LINK_ENTITY_TO_FUNC(weapon_ak5);
+//LINK_ENTITY_TO_FUNC(weapon_beretta);
+//LINK_ENTITY_TO_FUNC(weapon_famas);
+//LINK_ENTITY_TO_FUNC(weapon_hk21);
+//LINK_ENTITY_TO_FUNC(weapon_m4);
+//LINK_ENTITY_TO_FUNC(weapon_mk23);
+//LINK_ENTITY_TO_FUNC(weapon_mp5a2);
+//LINK_ENTITY_TO_FUNC(weapon_mp5sd);
+//LINK_ENTITY_TO_FUNC(weapon_msg90);
+//LINK_ENTITY_TO_FUNC(weapon_spas12);
+
+// entities for Natural Selection
+LINK_ENTITY_TO_FUNC(info_team_start);
+LINK_ENTITY_TO_FUNC(info_spectate);
+LINK_ENTITY_TO_FUNC(info_join_team);
+LINK_ENTITY_TO_FUNC(info_leave_game);
+LINK_ENTITY_TO_FUNC(info_join_autoassign);
+LINK_ENTITY_TO_FUNC(info_mapinfo);
+LINK_ENTITY_TO_FUNC(info_gameplay);
+
+LINK_ENTITY_TO_FUNC(env_fog);
+LINK_ENTITY_TO_FUNC(env_gamma);
+LINK_ENTITY_TO_FUNC(env_particles);
+LINK_ENTITY_TO_FUNC(env_particles_custom);
+
+LINK_ENTITY_TO_FUNC(func_weldable);
+LINK_ENTITY_TO_FUNC(func_seethrough);
+LINK_ENTITY_TO_FUNC(func_seethroughdoor);
+//LINK_ENTITY_TO_FUNC(func_waypoint);
+LINK_ENTITY_TO_FUNC(func_nobuild);
+LINK_ENTITY_TO_FUNC(func_resource);
+
+LINK_ENTITY_TO_FUNC(target_mp3audio);
+LINK_ENTITY_TO_FUNC(trigger_random);
+LINK_ENTITY_TO_FUNC(trigger_presence);
+LINK_ENTITY_TO_FUNC(trigger_script);
+LINK_ENTITY_TO_FUNC(info_location);
+
+LINK_ENTITY_TO_FUNC(team_hive);
+LINK_ENTITY_TO_FUNC(team_command);
+LINK_ENTITY_TO_FUNC(team_breach);
+LINK_ENTITY_TO_FUNC(team_egg);
+LINK_ENTITY_TO_FUNC(team_webstrand);
+
+// Marine weapons and equipment
+LINK_ENTITY_TO_FUNC(weapon_knife);
+LINK_ENTITY_TO_FUNC(weapon_grenade);
+LINK_ENTITY_TO_FUNC(weapon_machinegun);
+LINK_ENTITY_TO_FUNC(weapon_pistol);
+LINK_ENTITY_TO_FUNC(weapon_flamegun);
+LINK_ENTITY_TO_FUNC(weapon_heavymachinegun);
+LINK_ENTITY_TO_FUNC(weapon_grenadegun);
+LINK_ENTITY_TO_FUNC(weapon_shotgun);
+LINK_ENTITY_TO_FUNC(weapon_nukegun);
+LINK_ENTITY_TO_FUNC(weapon_mine);
+LINK_ENTITY_TO_FUNC(weapon_welder);
+
+LINK_ENTITY_TO_FUNC(item_genericammo);
+LINK_ENTITY_TO_FUNC(item_mine);
+LINK_ENTITY_TO_FUNC(item_health);
+LINK_ENTITY_TO_FUNC(item_catalyst);
+LINK_ENTITY_TO_FUNC(item_heavyarmor);
+LINK_ENTITY_TO_FUNC(item_jetpack);
+
+LINK_ENTITY_TO_FUNC(scan);
+LINK_ENTITY_TO_FUNC(turret);
+LINK_ENTITY_TO_FUNC(phasegate);
+LINK_ENTITY_TO_FUNC(siegeturret);
+LINK_ENTITY_TO_FUNC(nuke);
+
+// Marine buildings
+LINK_ENTITY_TO_FUNC(resourcetower);
+LINK_ENTITY_TO_FUNC(team_infportal);
+LINK_ENTITY_TO_FUNC(team_turretfactory);
+LINK_ENTITY_TO_FUNC(team_advturretfactory);
+LINK_ENTITY_TO_FUNC(team_armory);
+LINK_ENTITY_TO_FUNC(team_advarmory);
+LINK_ENTITY_TO_FUNC(team_armslab);
+LINK_ENTITY_TO_FUNC(team_prototypelab);
+LINK_ENTITY_TO_FUNC(team_observatory);
+LINK_ENTITY_TO_FUNC(team_chemlab);
+LINK_ENTITY_TO_FUNC(team_medlab);
+LINK_ENTITY_TO_FUNC(team_nukeplant);
+
+// Alien buildings
+LINK_ENTITY_TO_FUNC(alienresourcetower);
+LINK_ENTITY_TO_FUNC(defensechamber);
+LINK_ENTITY_TO_FUNC(spikeprojectile);
+LINK_ENTITY_TO_FUNC(offensechamber);
+LINK_ENTITY_TO_FUNC(sensorychamber);
+LINK_ENTITY_TO_FUNC(movementchamber);
+
+// Alien abilities that are technically weapons (along with their projectiles)
+LINK_ENTITY_TO_FUNC(weapon_acidrocket);
+LINK_ENTITY_TO_FUNC(weapon_acidrocketgun); 
+LINK_ENTITY_TO_FUNC(weapon_bilebomb);
+LINK_ENTITY_TO_FUNC(weapon_bilebombgun);
+LINK_ENTITY_TO_FUNC(weapon_bitegun);
+LINK_ENTITY_TO_FUNC(weapon_blink);
+LINK_ENTITY_TO_FUNC(weapon_claws);
+LINK_ENTITY_TO_FUNC(weapon_devour);
+LINK_ENTITY_TO_FUNC(weapon_divinewind);
+LINK_ENTITY_TO_FUNC(weapon_healingspray);
+LINK_ENTITY_TO_FUNC(weapon_metabolize);
+LINK_ENTITY_TO_FUNC(weapon_parasite);
+LINK_ENTITY_TO_FUNC(weapon_primalscream);
+LINK_ENTITY_TO_FUNC(weapon_spikegun);
+LINK_ENTITY_TO_FUNC(weapon_bite2gun);
+LINK_ENTITY_TO_FUNC(weapon_spit);
+LINK_ENTITY_TO_FUNC(weapon_spore);
+LINK_ENTITY_TO_FUNC(weapon_stomp);
+LINK_ENTITY_TO_FUNC(weapon_swipe);
+LINK_ENTITY_TO_FUNC(weapon_umbra);
+LINK_ENTITY_TO_FUNC(weapon_webspinner);
+
+// Alien abilities
+LINK_ENTITY_TO_FUNC(weapon_leap);
+LINK_ENTITY_TO_FUNC(weapon_charge);
+
+LINK_ENTITY_TO_FUNC(webgunprojectile);
+LINK_ENTITY_TO_FUNC(spitgunprojectile);
+LINK_ENTITY_TO_FUNC(stompprojectile);
+LINK_ENTITY_TO_FUNC(sporegunprojectile);
+LINK_ENTITY_TO_FUNC(umbracloud);
+LINK_ENTITY_TO_FUNC(umbraprojectile);
+
diff --git a/main/source/HPB_bot/dlls/util.cpp b/main/source/HPB_bot/dlls/util.cpp
new file mode 100644
index 00000000..5f2bb6ed
--- /dev/null
+++ b/main/source/HPB_bot/dlls/util.cpp
@@ -0,0 +1,661 @@
+/***
+*
+*  Copyright (c) 1999, Valve LLC. All rights reserved.
+*
+*  This product contains software technology licensed from Id 
+*  Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*  All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+//
+// HPB_bot - botman's High Ping Bastard bot
+//
+// (http://planethalflife.com/botman/)
+//
+// util.cpp
+//
+
+#include "extdll.h"
+#include "util.h"
+#include "HPB_bot/engine/engine.h"
+#include "dlls/cbase.h"
+#include "dlls/player.h"
+
+#include "bot.h"
+#include "bot_func.h"
+
+
+extern int mod_id;
+extern bot_t bots[32];
+extern edict_t *pent_info_ctfdetect;
+extern char team_names[MAX_TEAMS][MAX_TEAMNAME_LENGTH];
+extern int num_teams;
+
+int gmsgTextMsg = 0;
+int gmsgSayText = 0;
+int gmsgShowMenu = 0;
+
+
+Vector UTIL_VecToAngles( const Vector &vec )
+{
+   float rgflVecOut[3];
+   VEC_TO_ANGLES(vec, rgflVecOut);
+   return Vector(rgflVecOut);
+}
+
+
+// Overloaded to add IGNORE_GLASS
+void UTIL_TraceLine( const Vector &vecStart, const Vector &vecEnd, IGNORE_MONSTERS igmon, IGNORE_GLASS ignoreGlass, edict_t *pentIgnore, TraceResult *ptr )
+{
+   TRACE_LINE( vecStart, vecEnd, (igmon == ignore_monsters ? TRUE : FALSE) | (ignoreGlass?0x100:0), pentIgnore, ptr );
+}
+
+
+void UTIL_TraceLine( const Vector &vecStart, const Vector &vecEnd, IGNORE_MONSTERS igmon, edict_t *pentIgnore, TraceResult *ptr )
+{
+   TRACE_LINE( vecStart, vecEnd, (igmon == ignore_monsters ? TRUE : FALSE), pentIgnore, ptr );
+}
+
+
+void UTIL_MakeVectors( const Vector &vecAngles )
+{
+   MAKE_VECTORS( vecAngles );
+}
+
+
+edict_t *UTIL_FindEntityInSphere( edict_t *pentStart, const Vector &vecCenter, float flRadius )
+{
+   edict_t  *pentEntity;
+
+   pentEntity = FIND_ENTITY_IN_SPHERE( pentStart, vecCenter, flRadius);
+
+   if (!FNullEnt(pentEntity))
+      return pentEntity;
+
+   return NULL;
+}
+
+
+edict_t *UTIL_FindEntityByString( edict_t *pentStart, const char *szKeyword, const char *szValue )
+{
+   edict_t *pentEntity;
+
+   pentEntity = FIND_ENTITY_BY_STRING( pentStart, szKeyword, szValue );
+
+   if (!FNullEnt(pentEntity))
+      return pentEntity;
+   return NULL;
+}
+
+edict_t *UTIL_FindEntityByClassname( edict_t *pentStart, const char *szName )
+{
+   return UTIL_FindEntityByString( pentStart, "classname", szName );
+}
+
+edict_t *UTIL_FindEntityByTargetname( edict_t *pentStart, const char *szName )
+{
+   return UTIL_FindEntityByString( pentStart, "targetname", szName );
+}
+
+
+int UTIL_PointContents( const Vector &vec )
+{
+   return POINT_CONTENTS(vec);
+}
+
+
+void UTIL_SetSize( entvars_t *pev, const Vector &vecMin, const Vector &vecMax )
+{
+   SET_SIZE( ENT(pev), vecMin, vecMax );
+}
+
+
+void UTIL_SetOrigin( entvars_t *pev, const Vector &vecOrigin )
+{
+   SET_ORIGIN(ENT(pev), vecOrigin );
+}
+
+
+void ClientPrint( edict_t *pEntity, int msg_dest, const char *msg_name)
+{
+//   if (gmsgTextMsg == 0)
+//      gmsgTextMsg = REG_USER_MSG( "TextMsg", -1 );
+//
+//   pfnMessageBegin( MSG_ONE, gmsgTextMsg, NULL, pEntity );
+//
+//   pfnWriteByte( msg_dest );
+//   pfnWriteString( msg_name );
+//   pfnMessageEnd();
+}
+
+void UTIL_SayText( const char *pText, edict_t *pEdict )
+{
+//   if (gmsgSayText == 0)
+//      gmsgSayText = REG_USER_MSG( "SayText", -1 );
+//
+//   pfnMessageBegin( MSG_ONE, gmsgSayText, NULL, pEdict );
+//      pfnWriteByte( ENTINDEX(pEdict) );
+//      if (mod_id == FRONTLINE_DLL)
+//         pfnWriteShort(0);
+//      pfnWriteString( pText );
+//   pfnMessageEnd();
+}
+
+
+void UTIL_HostSay( edict_t *pEntity, int teamonly, char *message )
+{
+//   int   j;
+//   char  text[128];
+//   char *pc;
+//   int   sender_team, player_team;
+//   edict_t *client;
+//
+//   // make sure the text has content
+//   for ( pc = message; pc != NULL && *pc != 0; pc++ )
+//   {
+//      if ( isprint( *pc ) && !isspace( *pc ) )
+//      {
+//         pc = NULL;   // we've found an alphanumeric character,  so text is valid
+//         break;
+//      }
+//   }
+//
+//   if ( pc != NULL )
+//      return;  // no character found, so say nothing
+//
+//   // turn on color set 2  (color on,  no sound)
+//   if ( teamonly )
+//      sprintf( text, "%c(TEAM) %s: ", 2, STRING( pEntity->v.netname ) );
+//   else
+//      sprintf( text, "%c%s: ", 2, STRING( pEntity->v.netname ) );
+//
+//   j = sizeof(text) - 2 - strlen(text);  // -2 for /n and null terminator
+//   if ( (int)strlen(message) > j )
+//      message[j] = 0;
+//
+//   strcat( text, message );
+//   strcat( text, "\n" );
+//
+//   // loop through all players
+//   // Start with the first player.
+//   // This may return the world in single player if the client types something between levels or during spawn
+//   // so check it, or it will infinite loop
+//
+//   if (gmsgSayText == 0)
+//      gmsgSayText = REG_USER_MSG( "SayText", -1 );
+//
+//   sender_team = UTIL_GetTeam(pEntity);
+//
+//   client = NULL;
+//   while ( ((client = UTIL_FindEntityByClassname( client, "player" )) != NULL) &&
+//           (!FNullEnt(client)) ) 
+//   {
+//      if ( client == pEntity )  // skip sender of message
+//         continue;
+//
+//      player_team = UTIL_GetTeam(client);
+//
+//      if ( teamonly && (sender_team != player_team) )
+//         continue;
+//
+//      pfnMessageBegin( MSG_ONE, gmsgSayText, NULL, client );
+//         pfnWriteByte( ENTINDEX(pEntity) );
+//         if (mod_id == FRONTLINE_DLL)
+//            pfnWriteShort(0);
+//         pfnWriteString( text );
+//      pfnMessageEnd();
+//   }
+//
+//   // print to the sending client
+//   pfnMessageBegin( MSG_ONE, gmsgSayText, NULL, pEntity );
+//      pfnWriteByte( ENTINDEX(pEntity) );
+//      if (mod_id == FRONTLINE_DLL)
+//         pfnWriteShort(0);
+//      pfnWriteString( text );
+//   pfnMessageEnd();
+//   
+//   // echo to server console
+//   g_engfuncs.pfnServerPrint( text );
+}
+
+
+#ifdef   DEBUG
+edict_t *DBG_EntOfVars( const entvars_t *pev )
+{
+   if (pev->pContainingEntity != NULL)
+      return pev->pContainingEntity;
+   ALERT(at_console, "entvars_t pContainingEntity is NULL, calling into engine");
+   edict_t* pent = (*g_engfuncs.pfnFindEntityByVars)((entvars_t*)pev);
+   if (pent == NULL)
+      ALERT(at_console, "DAMN!  Even the engine couldn't FindEntityByVars!");
+   ((entvars_t *)pev)->pContainingEntity = pent;
+   return pent;
+}
+#endif //DEBUG
+
+
+// return team number 0 through 3 based what MOD uses for team numbers
+int UTIL_GetTeam(edict_t *pEntity)
+{
+   if (mod_id == TFC_DLL)
+   {
+      return pEntity->v.team - 1;  // TFC teams are 1-4 based
+   }
+   else if (mod_id == CSTRIKE_DLL)
+   {
+      char *infobuffer;
+      char model_name[32];
+
+      infobuffer = (*g_engfuncs.pfnGetInfoKeyBuffer)( pEntity );
+      strcpy(model_name, (g_engfuncs.pfnInfoKeyValue(infobuffer, "model")));
+
+      if ((strcmp(model_name, "terror") == 0) ||  // Phoenix Connektion
+          (strcmp(model_name, "arab") == 0) ||    // old L337 Krew
+          (strcmp(model_name, "leet") == 0) ||    // L337 Krew
+          (strcmp(model_name, "artic") == 0) ||   // Artic Avenger
+          (strcmp(model_name, "guerilla") == 0))  // Gorilla Warfare
+      {
+         return 0;
+      }
+      else if ((strcmp(model_name, "urban") == 0) ||  // Seal Team 6
+               (strcmp(model_name, "gsg9") == 0) ||   // German GSG-9
+               (strcmp(model_name, "sas") == 0) ||    // UK SAS
+               (strcmp(model_name, "gign") == 0) ||   // French GIGN
+               (strcmp(model_name, "vip") == 0))      // VIP
+      {
+         return 1;
+      }
+
+      return 0;  // return zero if team is unknown
+   }
+   else if ((mod_id == GEARBOX_DLL) && (pent_info_ctfdetect != NULL))
+   {
+      // OpFor CTF map...
+
+      char *infobuffer;
+      char model_name[32];
+
+      infobuffer = (*g_engfuncs.pfnGetInfoKeyBuffer)( pEntity );
+      strcpy(model_name, (g_engfuncs.pfnInfoKeyValue(infobuffer, "model")));
+
+      if ((strcmp(model_name, "ctf_barney") == 0) ||
+          (strcmp(model_name, "cl_suit") == 0) ||
+          (strcmp(model_name, "ctf_gina") == 0) ||
+          (strcmp(model_name, "ctf_gordon") == 0) ||
+          (strcmp(model_name, "otis") == 0) ||
+          (strcmp(model_name, "ctf_scientist") == 0))
+      {
+         return 0;
+      }
+      else if ((strcmp(model_name, "beret") == 0) ||
+               (strcmp(model_name, "drill") == 0) ||
+               (strcmp(model_name, "grunt") == 0) ||
+               (strcmp(model_name, "recruit") == 0) ||
+               (strcmp(model_name, "shephard") == 0) ||
+               (strcmp(model_name, "tower") == 0))
+      {
+         return 1;
+      }
+
+      return 0;  // return zero if team is unknown
+   }
+   else if (mod_id == FRONTLINE_DLL)
+   {
+      return pEntity->v.team - 1;  // Front Line Force teams are 1-4 based
+   }
+   else if(mod_id == AVH_DLL)
+   {
+	   return pEntity->v.team;
+   }
+   else  // must be HL or OpFor deathmatch...
+   {
+      char *infobuffer;
+      char model_name[32];
+
+      if (team_names[0][0] == 0)
+      {
+         char *pName;
+         char teamlist[MAX_TEAMS*MAX_TEAMNAME_LENGTH];
+         int i;
+
+         num_teams = 0;
+         strcpy(teamlist, CVAR_GET_STRING("mp_teamlist"));
+         pName = teamlist;
+         pName = strtok(pName, ";");
+
+         while (pName != NULL && *pName)
+         {
+            // check that team isn't defined twice
+            for (i=0; i < num_teams; i++)
+               if (strcmp(pName, team_names[i]) == 0)
+                  break;
+            if (i == num_teams)
+            {
+               strcpy(team_names[num_teams], pName);
+               num_teams++;
+            }
+            pName = strtok(NULL, ";");
+         }
+      }
+
+      infobuffer = (*g_engfuncs.pfnGetInfoKeyBuffer)( pEntity );
+      strcpy(model_name, (g_engfuncs.pfnInfoKeyValue(infobuffer, "model")));
+
+      for (int index=0; index < num_teams; index++)
+      {
+         if (strcmp(model_name, team_names[index]) == 0)
+            return index;
+      }
+
+      return 0;
+   }
+}
+
+
+// return class number 0 through N
+int UTIL_GetClass(edict_t *pEntity)
+{
+   char *infobuffer;
+   char model_name[32];
+
+   infobuffer = (*g_engfuncs.pfnGetInfoKeyBuffer)( pEntity );
+   strcpy(model_name, (g_engfuncs.pfnInfoKeyValue(infobuffer, "model")));
+
+   if (mod_id == FRONTLINE_DLL)
+   {
+      if ((strcmp(model_name, "natorecon") == 0) ||
+          (strcmp(model_name, "axisrecon") == 0))
+      {
+         return 0;  // recon
+      }
+      else if ((strcmp(model_name, "natoassault") == 0) ||
+               (strcmp(model_name, "axisassault") == 0))
+      {
+         return 1;  // assault
+      }
+      else if ((strcmp(model_name, "natosupport") == 0) ||
+               (strcmp(model_name, "axissupport") == 0))
+      {
+         return 2;  // support
+      }
+   }
+
+   return 0;
+}
+
+
+int UTIL_GetBotIndex(edict_t *pEdict)
+{
+   int index;
+
+   for (index=0; index < 32; index++)
+   {
+      if (bots[index].pEdict == pEdict)
+      {
+         return index;
+      }
+   }
+
+   return -1;  // return -1 if edict is not a bot
+}
+
+
+bot_t *UTIL_GetBotPointer(edict_t *pEdict)
+{
+   int index;
+
+   for (index=0; index < 32; index++)
+   {
+      if (bots[index].pEdict == pEdict)
+      {
+         break;
+      }
+   }
+
+   if (index < 32)
+      return (&bots[index]);
+
+   return NULL;  // return NULL if edict is not a bot
+}
+
+
+bool IsAlive(edict_t *pEdict)
+{
+   return ((pEdict->v.deadflag == DEAD_NO) &&
+           (pEdict->v.health > 0) && !(pEdict->v.flags & FL_NOTARGET));
+}
+
+
+bool FInViewCone(Vector *pOrigin, edict_t *pEdict)
+{
+   Vector2D vec2LOS;
+   float    flDot;
+
+   UTIL_MakeVectors ( pEdict->v.angles );
+
+   vec2LOS = ( *pOrigin - pEdict->v.origin ).Make2D();
+   vec2LOS = vec2LOS.Normalize();
+
+   flDot = DotProduct (vec2LOS , gpGlobals->v_forward.Make2D() );
+
+   if ( flDot > 0.50 )  // 60 degree field of view 
+   {
+      return TRUE;
+   }
+   else
+   {
+      return FALSE;
+   }
+}
+
+
+bool FVisible( const Vector &vecOrigin, edict_t *pEdict )
+{
+   TraceResult tr;
+   Vector      vecLookerOrigin;
+
+   // look through caller's eyes
+   vecLookerOrigin = pEdict->v.origin + pEdict->v.view_ofs;
+
+   int bInWater = (UTIL_PointContents (vecOrigin) == CONTENTS_WATER);
+   int bLookerInWater = (UTIL_PointContents (vecLookerOrigin) == CONTENTS_WATER);
+
+   // don't look through water
+   if (bInWater != bLookerInWater)
+      return FALSE;
+
+   UTIL_TraceLine(vecLookerOrigin, vecOrigin, ignore_monsters, ignore_glass, pEdict, &tr);
+
+   if (tr.flFraction != 1.0)
+   {
+      return FALSE;  // Line of sight is not established
+   }
+   else
+   {
+      return TRUE;  // line of sight is valid.
+   }
+}
+
+
+Vector GetGunPosition(edict_t *pEdict)
+{
+   return (pEdict->v.origin + pEdict->v.view_ofs);
+}
+
+
+void UTIL_SelectItem(edict_t *pEdict, char *item_name)
+{
+   FakeClientCommand(pEdict, item_name, NULL, NULL);
+}
+
+
+Vector VecBModelOrigin(edict_t *pEdict)
+{
+   return pEdict->v.absmin + (pEdict->v.size * 0.5);
+}
+
+
+bool UpdateSounds(edict_t *pEdict, edict_t *pPlayer)
+{
+   float distance;
+   static bool check_footstep_sounds = TRUE;
+   static float footstep_sounds_on;
+   float sensitivity = 1.0;
+   float volume;
+
+   // update sounds made by this player, alert bots if they are nearby...
+
+   if (check_footstep_sounds)
+   {
+      check_footstep_sounds = FALSE;
+      footstep_sounds_on = CVAR_GET_FLOAT("mp_footsteps");
+   }
+
+   if (footstep_sounds_on > 0.0)
+   {
+	   CBasePlayer* thePlayer = (CBasePlayer*)CBaseEntity::Instance(pPlayer);
+
+      // check if this player is moving fast enough to make sounds...
+      if (pPlayer->v.velocity.Length2D() > thePlayer->GetMaxWalkSpeed())
+      {
+         volume = 500.0;  // volume of sound being made (just pick something)
+
+         Vector v_sound = pPlayer->v.origin - pEdict->v.origin;
+
+         distance = v_sound.Length();
+
+         // is the bot close enough to hear this sound?
+         if (distance < (volume * sensitivity))
+         {
+            Vector bot_angles = UTIL_VecToAngles( v_sound );
+
+            pEdict->v.ideal_yaw = bot_angles.y;
+
+            BotFixIdealYaw(pEdict);
+
+            return TRUE;
+         }
+      }
+   }
+
+   return FALSE;
+}
+
+
+void UTIL_ShowMenu( edict_t *pEdict, int slots, int displaytime, bool needmore, char *pText )
+{
+//   if (gmsgShowMenu == 0)
+//      gmsgShowMenu = REG_USER_MSG( "ShowMenu", -1 );
+//
+//   pfnMessageBegin( MSG_ONE, gmsgShowMenu, NULL, pEdict );
+//
+//   pfnWriteShort( slots );
+//   pfnWriteChar( displaytime );
+//   pfnWriteByte( needmore );
+//   pfnWriteString( pText );
+//
+//   pfnMessageEnd();
+}
+
+void UTIL_BuildFileName(char *filename, char *arg1, char *arg2)
+{
+
+   if (mod_id == VALVE_DLL)
+#ifndef __linux__
+      strcpy(filename, "valve\\");
+#else
+      strcpy(filename, "valve/");
+#endif
+
+   else if (mod_id == TFC_DLL)
+#ifndef __linux__
+      strcpy(filename, "tfc\\");
+#else
+      strcpy(filename, "tfc/");
+#endif
+
+   else if (mod_id == CSTRIKE_DLL)
+#ifndef __linux__
+      strcpy(filename, "cstrike\\");
+#else
+      strcpy(filename, "cstrike/");
+#endif
+
+   else if (mod_id == GEARBOX_DLL)
+#ifndef __linux__
+      strcpy(filename, "gearbox\\");
+#else
+      strcpy(filename, "gearbox/");
+#endif
+
+   else if (mod_id == FRONTLINE_DLL)
+#ifndef __linux__
+      strcpy(filename, "frontline\\");
+#else
+      strcpy(filename, "frontline/");
+#endif
+
+   else if (mod_id == AVH_DLL)
+   {
+	string filenameString = string(getModDirectory());
+#ifndef __linux__
+	filenameString += "\\";
+#else
+	filenameString += '/';
+#endif
+	strcpy(filename,filenameString.c_str());
+   }  
+   else
+   {
+      filename[0] = 0;
+      return;
+   }
+
+   if ((arg1) && (*arg1) && (arg2) && (*arg2))
+   {
+      strcat(filename, arg1);
+
+#ifndef __linux__
+      strcat(filename, "\\");
+#else
+      strcat(filename, "/");
+#endif
+
+      strcat(filename, arg2);
+   }
+   else if ((arg1) && (*arg1))
+   {
+      strcat(filename, arg1);
+   }
+
+   printf("UTIL_BuildFileName:");
+   printf(filename);
+   printf("\n");
+}
+
+//=========================================================
+// UTIL_LogPrintf - Prints a logged message to console.
+// Preceded by LOG: ( timestamp ) < message >
+//=========================================================
+void UTIL_LogPrintf( char *fmt, ... )
+{
+   va_list        argptr;
+   static char    string[1024];
+   
+   va_start ( argptr, fmt );
+   vsprintf ( string, fmt, argptr );
+   va_end   ( argptr );
+
+   // Print to server console
+   printf("UTIL_LogPrintf:");
+   printf(string);
+   printf("\n");
+   ALERT( at_logged, "%s", string );
+}
+
diff --git a/main/source/HPB_bot/dlls/waypoint.cpp b/main/source/HPB_bot/dlls/waypoint.cpp
new file mode 100644
index 00000000..549cebd9
--- /dev/null
+++ b/main/source/HPB_bot/dlls/waypoint.cpp
@@ -0,0 +1,1938 @@
+// HPB bot - botman's High Ping Bastard bot
+//
+// (http://planethalflife.com/botman/)
+//
+// waypoint.cpp
+//
+
+#ifndef __linux__
+#include <io.h>
+#endif
+#include <fcntl.h>
+#ifndef __linux__
+#include <sys\stat.h>
+#else
+#include <sys/stat.h>
+#endif
+
+#include "extdll.h"
+#include "enginecallback.h"
+#include "util.h"
+#include "cbase.h"
+
+#include "bot.h"
+#include "waypoint.h"
+//#include "mod/NetworkMeter.h"
+
+extern int mod_id;
+extern int m_spriteTexture;
+
+// waypoints with information bits (flags)
+WAYPOINT waypoints[MAX_WAYPOINTS];
+
+// number of waypoints currently in use
+int num_waypoints;
+
+// declare the array of head pointers to the path structures...
+PATH *paths[MAX_WAYPOINTS];
+
+// time that this waypoint was displayed (while editing)
+float wp_display_time[MAX_WAYPOINTS];
+
+bool g_waypoint_paths = FALSE;  // have any paths been allocated?
+bool g_waypoint_on = FALSE;
+bool g_auto_waypoint = FALSE;
+bool g_path_waypoint = FALSE;
+Vector last_waypoint;
+float f_path_time = 0.0;
+
+unsigned int route_num_waypoints;
+unsigned short *shortest_path[4] = {NULL, NULL, NULL, NULL};
+unsigned short *from_to[4] = {NULL, NULL, NULL, NULL};
+
+static FILE *fp;
+
+
+void WaypointDebug(void)
+{
+   int y = 1, x = 1;
+
+   fp=fopen("bot.txt","a");
+   fprintf(fp,"WaypointDebug: LINKED LIST ERROR!!!\n");
+   fclose(fp);
+
+   x = x - 1;  // x is zero
+   y = y / x;  // cause an divide by zero exception
+
+   return;
+}
+
+
+// free the linked list of waypoint path nodes...
+void WaypointFree(void)
+{
+   for (int i=0; i < MAX_WAYPOINTS; i++)
+   {
+      int count = 0;
+
+      if (paths[i])
+      {
+         PATH *p = paths[i];
+         PATH *p_next;
+
+         while (p)  // free the linked list
+         {
+            p_next = p->next;  // save the link to next
+            free(p);
+            p = p_next;
+
+#ifdef _DEBUG
+            count++;
+            if (count > 1000) WaypointDebug();
+#endif
+         }
+
+         paths[i] = NULL;
+      }
+   }
+}
+
+
+// initialize the waypoint structures...
+void WaypointInit(void)
+{
+   int i;
+
+   // have any waypoint path nodes been allocated yet?
+   if (g_waypoint_paths)
+      WaypointFree();  // must free previously allocated path memory
+
+   for (i=0; i < 4; i++)
+   {
+      if (shortest_path[i] != NULL)
+         free(shortest_path[i]);
+
+      if (from_to[i] != NULL)
+         free(from_to[i]);
+   }
+
+   for (i=0; i < MAX_WAYPOINTS; i++)
+   {
+      waypoints[i].flags = 0;
+      waypoints[i].origin = Vector(0,0,0);
+
+      wp_display_time[i] = 0.0;
+
+      paths[i] = NULL;  // no paths allocated yet
+   }
+
+   f_path_time = 0.0;  // reset waypoint path display time
+
+   num_waypoints = 0;
+
+   last_waypoint = Vector(0,0,0);
+
+   for (i=0; i < 4; i++)
+   {
+      shortest_path[i] = NULL;
+      from_to[i] = NULL;
+   }
+}
+
+
+// add a path from one waypoint (add_index) to another (path_index)...
+void WaypointAddPath(short int add_index, short int path_index)
+{
+   PATH *p, *prev;
+   int i;
+   int count = 0;
+
+   p = paths[add_index];
+   prev = NULL;
+
+   // find an empty slot for new path_index...
+   while (p != NULL)
+   {
+      i = 0;
+
+      while (i < MAX_PATH_INDEX)
+      {
+         if (p->index[i] == -1)
+         {
+            p->index[i] = path_index;
+
+            return;
+         }
+
+         i++;
+      }
+
+      prev = p;     // save the previous node in linked list
+      p = p->next;  // go to next node in linked list
+
+#ifdef _DEBUG
+      count++;
+      if (count > 100) WaypointDebug();
+#endif
+   }
+
+   p = (PATH *)malloc(sizeof(PATH));
+
+   if (p == NULL)
+   {
+      ALERT(at_error, "HPB_bot - Error allocating memory for path!");
+   }
+
+   p->index[0] = path_index;
+   p->index[1] = -1;
+   p->index[2] = -1;
+   p->index[3] = -1;
+   p->next = NULL;
+
+   if (prev != NULL)
+      prev->next = p;  // link new node into existing list
+
+   if (paths[add_index] == NULL)
+      paths[add_index] = p;  // save head point if necessary
+}
+
+
+// delete all paths to this waypoint index...
+void WaypointDeletePath(short int del_index)
+{
+   PATH *p;
+   int index, i;
+
+   // search all paths for this index...
+   for (index=0; index < num_waypoints; index++)
+   {
+      p = paths[index];
+
+      int count = 0;
+
+      // search linked list for del_index...
+      while (p != NULL)
+      {
+         i = 0;
+
+         while (i < MAX_PATH_INDEX)
+         {
+            if (p->index[i] == del_index)
+            {
+               p->index[i] = -1;  // unassign this path
+            }
+
+            i++;
+         }
+
+         p = p->next;  // go to next node in linked list
+
+#ifdef _DEBUG
+         count++;
+         if (count > 100) WaypointDebug();
+#endif
+      }
+   }
+}
+
+
+// delete a path from a waypoint (path_index) to another waypoint
+// (del_index)...
+void WaypointDeletePath(short int path_index, short int del_index)
+{
+   PATH *p;
+   int i;
+   int count = 0;
+
+   p = paths[path_index];
+
+   // search linked list for del_index...
+   while (p != NULL)
+   {
+      i = 0;
+
+      while (i < MAX_PATH_INDEX)
+      {
+         if (p->index[i] == del_index)
+         {
+            p->index[i] = -1;  // unassign this path
+         }
+
+         i++;
+      }
+
+      p = p->next;  // go to next node in linked list
+
+#ifdef _DEBUG
+      count++;
+      if (count > 100) WaypointDebug();
+#endif
+   }
+}
+
+
+// find a path from the current waypoint. (pPath MUST be NULL on the
+// initial call. subsequent calls will return other paths if they exist.)
+int WaypointFindPath(PATH **pPath, int *path_index, int waypoint_index, int team)
+{
+   int index;
+   int count = 0;
+
+   if (*pPath == NULL)
+   {
+      *pPath = paths[waypoint_index];
+      *path_index = 0;
+   }
+
+   if (*path_index == MAX_PATH_INDEX)
+   {
+      *path_index = 0;
+
+      *pPath = (*pPath)->next;  // go to next node in linked list
+   }
+
+   while (*pPath != NULL)
+   {
+      while (*path_index < MAX_PATH_INDEX)
+      {
+         if ((*pPath)->index[*path_index] != -1)  // found a path?
+         {
+            // save the return value
+            index = (*pPath)->index[*path_index];
+
+            // skip this path if next waypoint is team specific and NOT this team
+            if ((team != -1) && (waypoints[index].flags & W_FL_TEAM_SPECIFIC) &&
+                ((waypoints[index].flags & W_FL_TEAM) != team))
+            {
+               (*path_index)++;
+               continue;
+            }
+
+            // set up stuff for subsequent calls...
+            (*path_index)++;
+
+            return index;
+         }
+
+         (*path_index)++;
+      }
+
+      *path_index = 0;
+
+      *pPath = (*pPath)->next;  // go to next node in linked list
+
+#ifdef _DEBUG
+      count++;
+      if (count > 100) WaypointDebug();
+#endif
+   }
+
+   return -1;
+}
+
+
+// find the nearest waypoint to the player and return the index
+// (-1 if not found)...
+int WaypointFindNearest(edict_t *pEntity, float range, int team)
+{
+   int i, min_index;
+   float distance;
+   float min_distance;
+   TraceResult tr;
+
+   if (num_waypoints < 1)
+      return -1;
+
+   // find the nearest waypoint...
+
+   min_index = -1;
+   min_distance = 9999.0;
+
+   for (i=0; i < num_waypoints; i++)
+   {
+      if (waypoints[i].flags & W_FL_DELETED)
+         continue;  // skip any deleted waypoints
+
+      if (waypoints[i].flags & W_FL_AIMING)
+         continue;  // skip any aiming waypoints
+
+      // skip this waypoint if it's team specific and teams don't match...
+      if ((team != -1) && (waypoints[i].flags & W_FL_TEAM_SPECIFIC) &&
+          ((waypoints[i].flags & W_FL_TEAM) != team))
+         continue;
+
+      distance = (waypoints[i].origin - pEntity->v.origin).Length();
+
+      if ((distance < min_distance) && (distance < range))
+      {
+         // if waypoint is visible from current position (even behind head)...
+         UTIL_TraceLine( pEntity->v.origin + pEntity->v.view_ofs, waypoints[i].origin,
+                         ignore_monsters, pEntity->v.pContainingEntity, &tr );
+
+         if (tr.flFraction >= 1.0)
+         {
+            min_index = i;
+            min_distance = distance;
+         }
+      }
+   }
+
+   return min_index;
+}
+
+
+// find the nearest waypoint to the source postition and return the index
+// of that waypoint...
+int WaypointFindNearest(Vector v_src, edict_t *pEntity, float range, int team)
+{
+   int index, min_index;
+   float distance;
+   float min_distance;
+   TraceResult tr;
+
+   if (num_waypoints < 1)
+      return -1;
+
+   // find the nearest waypoint...
+
+   min_index = -1;
+   min_distance = 9999.0;
+
+   for (index=0; index < num_waypoints; index++)
+   {
+      if (waypoints[index].flags & W_FL_DELETED)
+         continue;  // skip any deleted waypoints
+
+      if (waypoints[index].flags & W_FL_AIMING)
+         continue;  // skip any aiming waypoints
+
+      // skip this waypoint if it's team specific and teams don't match...
+      if ((team != -1) && (waypoints[index].flags & W_FL_TEAM_SPECIFIC) &&
+          ((waypoints[index].flags & W_FL_TEAM) != team))
+         continue;
+
+      distance = (waypoints[index].origin - v_src).Length();
+
+      if ((distance < min_distance) && (distance < range))
+      {
+         // if waypoint is visible from source position...
+         UTIL_TraceLine( v_src, waypoints[index].origin, ignore_monsters,
+                         pEntity->v.pContainingEntity, &tr );
+
+         if (tr.flFraction >= 1.0)
+         {
+            min_index = index;
+            min_distance = distance;
+         }
+      }
+   }
+
+   return min_index;
+}
+
+
+// find the goal nearest to the player matching the "flags" bits and return
+// the index of that waypoint...
+int WaypointFindNearestGoal(edict_t *pEntity, int src, int team, int flags)
+{
+   int index, min_index;
+   int distance, min_distance;
+
+   if (num_waypoints < 1)
+      return -1;
+
+   // find the nearest waypoint with the matching flags...
+
+   min_index = -1;
+   min_distance = 99999;
+
+   for (index=0; index < num_waypoints; index++)
+   {
+      if (index == src)
+         continue;  // skip the source waypoint
+
+      if (waypoints[index].flags & W_FL_DELETED)
+         continue;  // skip any deleted waypoints
+
+      if (waypoints[index].flags & W_FL_AIMING)
+         continue;  // skip any aiming waypoints
+
+      // skip this waypoint if it's team specific and teams don't match...
+      if ((team != -1) && (waypoints[index].flags & W_FL_TEAM_SPECIFIC) &&
+          ((waypoints[index].flags & W_FL_TEAM) != team))
+         continue;
+
+      if ((waypoints[index].flags & flags) != flags)
+         continue;  // skip this waypoint if the flags don't match
+
+      distance = WaypointDistanceFromTo(src, index, team);
+
+      if (distance < min_distance)
+      {
+         min_index = index;
+         min_distance = distance;
+      }
+   }
+
+   return min_index;
+}
+
+
+// find the goal nearest to the source position (v_src) matching the "flags"
+// bits and return the index of that waypoint...
+int WaypointFindNearestGoal(Vector v_src, edict_t *pEntity, float range, int team, int flags)
+{
+   int index, min_index;
+   int distance, min_distance;
+
+   if (num_waypoints < 1)
+      return -1;
+
+   // find the nearest waypoint with the matching flags...
+
+   min_index = -1;
+   min_distance = 99999;
+
+   for (index=0; index < num_waypoints; index++)
+   {
+      if (waypoints[index].flags & W_FL_DELETED)
+         continue;  // skip any deleted waypoints
+
+      if (waypoints[index].flags & W_FL_AIMING)
+         continue;  // skip any aiming waypoints
+
+      // skip this waypoint if it's team specific and teams don't match...
+      if ((team != -1) && (waypoints[index].flags & W_FL_TEAM_SPECIFIC) &&
+          ((waypoints[index].flags & W_FL_TEAM) != team))
+         continue;
+
+      if ((waypoints[index].flags & flags) != flags)
+         continue;  // skip this waypoint if the flags don't match
+
+      distance = (waypoints[index].origin - v_src).Length();
+
+      if ((distance < range) && (distance < min_distance))
+      {
+         min_index = index;
+         min_distance = distance;
+      }
+   }
+
+   return min_index;
+}
+
+
+// find a random goal matching the "flags" bits and return the index of
+// that waypoint...
+int WaypointFindRandomGoal(edict_t *pEntity, int team, int flags)
+{
+   int index;
+   int indexes[50];
+   int count = 0;
+
+   if (num_waypoints < 1)
+      return -1;
+
+   // find all the waypoints with the matching flags...
+
+   for (index=0; index < num_waypoints; index++)
+   {
+      if (waypoints[index].flags & W_FL_DELETED)
+         continue;  // skip any deleted waypoints
+
+      if (waypoints[index].flags & W_FL_AIMING)
+         continue;  // skip any aiming waypoints
+
+      // skip this waypoint if it's team specific and teams don't match...
+      if ((team != -1) && (waypoints[index].flags & W_FL_TEAM_SPECIFIC) &&
+          ((waypoints[index].flags & W_FL_TEAM) != team))
+         continue;
+
+      if ((waypoints[index].flags & flags) != flags)
+         continue;  // skip this waypoint if the flags don't match
+
+      if (count < 50)
+      {
+         indexes[count] = index;
+
+         count++;
+      }
+   }
+
+   if (count == 0)  // no matching waypoints found
+      return -1;
+
+   index = RANDOM_LONG(1, count) - 1;
+
+   return indexes[index];
+}
+
+
+// find a random goal within a range of a position (v_src) matching the
+// "flags" bits and return the index of that waypoint...
+int WaypointFindRandomGoal(Vector v_src, edict_t *pEntity, float range, int team, int flags)
+{
+   int index;
+   int indexes[50];
+   int count = 0;
+   float distance;
+
+   if (num_waypoints < 1)
+      return -1;
+
+   // find all the waypoints with the matching flags...
+
+   for (index=0; index < num_waypoints; index++)
+   {
+      if (waypoints[index].flags & W_FL_DELETED)
+         continue;  // skip any deleted waypoints
+
+      if (waypoints[index].flags & W_FL_AIMING)
+         continue;  // skip any aiming waypoints
+
+      // skip this waypoint if it's team specific and teams don't match...
+      if ((team != -1) && (waypoints[index].flags & W_FL_TEAM_SPECIFIC) &&
+          ((waypoints[index].flags & W_FL_TEAM) != team))
+         continue;
+
+      if ((waypoints[index].flags & flags) != flags)
+         continue;  // skip this waypoint if the flags don't match
+
+      distance = (waypoints[index].origin - v_src).Length();
+
+      if ((distance < range) && (count < 50))
+      {
+         indexes[count] = index;
+
+         count++;
+      }
+   }
+
+   if (count == 0)  // no matching waypoints found
+      return -1;
+
+   index = RANDOM_LONG(1, count) - 1;
+
+   return indexes[index];
+}
+
+
+// find the nearest "special" aiming waypoint (for sniper aiming)...
+int WaypointFindNearestAiming(Vector v_origin)
+{
+   int index;
+   int min_index = -1;
+   int min_distance = 9999.0;
+   float distance;
+
+   if (num_waypoints < 1)
+      return -1;
+
+   // search for nearby aiming waypoint...
+   for (index=0; index < num_waypoints; index++)
+   {
+      if (waypoints[index].flags & W_FL_DELETED)
+         continue;  // skip any deleted waypoints
+
+      if ((waypoints[index].flags & W_FL_AIMING) == 0)
+         continue;  // skip any NON aiming waypoints
+
+      distance = (v_origin - waypoints[index].origin).Length();
+
+      if ((distance < min_distance) && (distance < 40))
+      {
+         min_index = index;
+         min_distance = distance;
+      }
+   }
+
+   return min_index;
+}
+
+
+void WaypointDrawBeam(edict_t *pEntity, Vector start, Vector end, int width,
+        int noise, int red, int green, int blue, int brightness, int speed)
+{
+//   MESSAGE_BEGIN(MSG_ONE, SVC_TEMPENTITY, NULL, pEntity);
+//   WRITE_BYTE( TE_BEAMPOINTS);
+//   WRITE_COORD(start.x);
+//   WRITE_COORD(start.y);
+//   WRITE_COORD(start.z);
+//   WRITE_COORD(end.x);
+//   WRITE_COORD(end.y);
+//   WRITE_COORD(end.z);
+//   WRITE_SHORT( m_spriteTexture );
+//   WRITE_BYTE( 1 ); // framestart
+//   WRITE_BYTE( 10 ); // framerate
+//   WRITE_BYTE( 10 ); // life in 0.1's
+//   WRITE_BYTE( width ); // width
+//   WRITE_BYTE( noise );  // noise
+//
+//   WRITE_BYTE( red );   // r, g, b
+//   WRITE_BYTE( green );   // r, g, b
+//   WRITE_BYTE( blue );   // r, g, b
+//
+//   WRITE_BYTE( brightness );   // brightness
+//   WRITE_BYTE( speed );    // speed
+//   MESSAGE_END();
+}
+
+
+void WaypointAdd(edict_t *pEntity)
+{
+   int index;
+   edict_t *pent = NULL;
+   float radius = 40;
+   char item_name[64];
+
+   if (num_waypoints >= MAX_WAYPOINTS)
+      return;
+
+   index = 0;
+
+   // find the next available slot for the new waypoint...
+   while (index < num_waypoints)
+   {
+      if (waypoints[index].flags & W_FL_DELETED)
+         break;
+
+      index++;
+   }
+
+   waypoints[index].flags = 0;
+
+   // store the origin (location) of this waypoint (use entity origin)
+   waypoints[index].origin = pEntity->v.origin;
+
+   // store the last used waypoint for the auto waypoint code...
+   last_waypoint = pEntity->v.origin;
+
+   // set the time that this waypoint was originally displayed...
+   wp_display_time[index] = gpGlobals->time;
+
+
+   Vector start, end;
+
+   start = pEntity->v.origin - Vector(0, 0, 34);
+   end = start + Vector(0, 0, 68);
+
+   if ((pEntity->v.flags & FL_DUCKING) == FL_DUCKING)
+   {
+      waypoints[index].flags |= W_FL_CROUCH;  // crouching waypoint
+
+      start = pEntity->v.origin - Vector(0, 0, 17);
+      end = start + Vector(0, 0, 34);
+   }
+
+   if (pEntity->v.movetype == MOVETYPE_FLY)
+      waypoints[index].flags |= W_FL_LADDER;  // waypoint on a ladder
+
+
+   //********************************************************
+   // look for lift, ammo, flag, health, armor, etc.
+   //********************************************************
+
+   while ((pent = UTIL_FindEntityInSphere( pent, pEntity->v.origin, radius )) != NULL)
+   {
+      strcpy(item_name, STRING(pent->v.classname));
+
+      if (strcmp("item_healthkit", item_name) == 0)
+      {
+         ClientPrint(pEntity, HUD_PRINTCONSOLE, "found a healthkit!\n");
+         waypoints[index].flags = W_FL_HEALTH;
+      }
+
+      if (strncmp("item_armor", item_name, 10) == 0)
+      {
+         ClientPrint(pEntity, HUD_PRINTCONSOLE, "found some armor!\n");
+         waypoints[index].flags = W_FL_ARMOR;
+      }
+
+      // *************
+      // LOOK FOR AMMO
+      // *************
+
+   }
+
+   // draw a blue waypoint
+   WaypointDrawBeam(pEntity, start, end, 30, 0, 0, 0, 255, 250, 5);
+
+   EMIT_SOUND_DYN2(pEntity, CHAN_WEAPON, "weapons/xbow_hit1.wav", 1.0,
+                   ATTN_NORM, 0, 100);
+
+   // increment total number of waypoints if adding at end of array...
+   if (index == num_waypoints)
+      num_waypoints++;
+
+   // calculate all the paths to this new waypoint
+   for (int i=0; i < num_waypoints; i++)
+   {
+      if (i == index)
+         continue;  // skip the waypoint that was just added
+
+      if (waypoints[i].flags & W_FL_AIMING)
+         continue;  // skip any aiming waypoints
+
+      // check if the waypoint is reachable from the new one (one-way)
+      if ( WaypointReachable(pEntity->v.origin, waypoints[i].origin, pEntity) )
+      {
+         WaypointAddPath(index, i);
+      }
+
+      // check if the new one is reachable from the waypoint (other way)
+      if ( WaypointReachable(waypoints[i].origin, pEntity->v.origin, pEntity) )
+      {
+         WaypointAddPath(i, index);
+      }
+   }
+}
+
+
+void WaypointAddAiming(edict_t *pEntity)
+{
+   int index;
+   edict_t *pent = NULL;
+
+   if (num_waypoints >= MAX_WAYPOINTS)
+      return;
+
+   index = 0;
+
+   // find the next available slot for the new waypoint...
+   while (index < num_waypoints)
+   {
+      if (waypoints[index].flags & W_FL_DELETED)
+         break;
+
+      index++;
+   }
+
+   waypoints[index].flags = W_FL_AIMING;  // aiming waypoint
+
+   Vector v_angle = pEntity->v.v_angle;
+
+   v_angle.x = 0;  // reset pitch to horizontal
+   v_angle.z = 0;  // reset roll to level
+
+   UTIL_MakeVectors(v_angle);
+
+   // store the origin (location) of this waypoint (use entity origin)
+   waypoints[index].origin = pEntity->v.origin + gpGlobals->v_forward * 25;
+
+   // set the time that this waypoint was originally displayed...
+   wp_display_time[index] = gpGlobals->time;
+
+
+   Vector start, end;
+
+   start = pEntity->v.origin - Vector(0, 0, 10);
+   end = start + Vector(0, 0, 14);
+
+   // draw a blue waypoint
+   WaypointDrawBeam(pEntity, start, end, 30, 0, 0, 0, 255, 250, 5);
+
+   EMIT_SOUND_DYN2(pEntity, CHAN_WEAPON, "weapons/xbow_hit1.wav", 1.0,
+                   ATTN_NORM, 0, 100);
+
+   // increment total number of waypoints if adding at end of array...
+   if (index == num_waypoints)
+      num_waypoints++;
+}
+
+
+void WaypointDelete(edict_t *pEntity)
+{
+   int index;
+   int count = 0;
+
+   if (num_waypoints < 1)
+      return;
+
+   index = WaypointFindNearest(pEntity, 50.0, -1);
+
+   if (index == -1)
+      return;
+
+   if ((waypoints[index].flags & W_FL_SNIPER) ||
+       ((mod_id == FRONTLINE_DLL) && (waypoints[index].flags & W_FL_FLF_DEFEND)))
+   {
+      int i;
+      int min_index = -1;
+      int min_distance = 9999.0;
+      float distance;
+
+      // search for nearby aiming waypoint and delete it also...
+      for (i=0; i < num_waypoints; i++)
+      {
+         if (waypoints[i].flags & W_FL_DELETED)
+            continue;  // skip any deleted waypoints
+
+         if ((waypoints[i].flags & W_FL_AIMING) == 0)
+            continue;  // skip any NON aiming waypoints
+
+         distance = (waypoints[i].origin - waypoints[index].origin).Length();
+
+         if ((distance < min_distance) && (distance < 40))
+         {
+            min_index = i;
+            min_distance = distance;
+         }
+      }
+
+      if (min_index != -1)
+      {
+         waypoints[min_index].flags = W_FL_DELETED;  // not being used
+         waypoints[min_index].origin = Vector(0,0,0);
+
+         wp_display_time[min_index] = 0.0;
+      }
+   }
+
+   // delete any paths that lead to this index...
+   WaypointDeletePath(index);
+
+   // free the path for this index...
+
+   if (paths[index] != NULL)
+   {
+      PATH *p = paths[index];
+      PATH *p_next;
+
+      while (p)  // free the linked list
+      {
+         p_next = p->next;  // save the link to next
+         free(p);
+         p = p_next;
+
+#ifdef _DEBUG
+         count++;
+         if (count > 100) WaypointDebug();
+#endif
+      }
+
+      paths[index] = NULL;
+   }
+
+   waypoints[index].flags = W_FL_DELETED;  // not being used
+   waypoints[index].origin = Vector(0,0,0);
+
+   wp_display_time[index] = 0.0;
+
+   EMIT_SOUND_DYN2(pEntity, CHAN_WEAPON, "weapons/mine_activate.wav", 1.0,
+                   ATTN_NORM, 0, 100);
+}
+
+
+// allow player to manually create a path from one waypoint to another
+void WaypointCreatePath(edict_t *pEntity, int cmd)
+{
+   static int waypoint1 = -1;  // initialized to unassigned
+   static int waypoint2 = -1;  // initialized to unassigned
+
+   if (cmd == 1)  // assign source of path
+   {
+      waypoint1 = WaypointFindNearest(pEntity, 50.0, -1);
+
+      if (waypoint1 == -1)
+      {
+         // play "cancelled" sound...
+         EMIT_SOUND_DYN2(pEntity, CHAN_WEAPON, "common/wpn_moveselect.wav", 1.0,
+                         ATTN_NORM, 0, 100);
+
+         return;
+      }
+
+      // play "start" sound...
+      EMIT_SOUND_DYN2(pEntity, CHAN_WEAPON, "common/wpn_hudoff.wav", 1.0,
+                      ATTN_NORM, 0, 100);
+
+      return;
+   }
+
+   if (cmd == 2)  // assign dest of path and make path
+   {
+      waypoint2 = WaypointFindNearest(pEntity, 50.0, -1);
+
+      if ((waypoint1 == -1) || (waypoint2 == -1))
+      {
+         // play "error" sound...
+         EMIT_SOUND_DYN2(pEntity, CHAN_WEAPON, "common/wpn_denyselect.wav", 1.0,
+                         ATTN_NORM, 0, 100);
+
+         return;
+      }
+
+      WaypointAddPath(waypoint1, waypoint2);
+
+      // play "done" sound...
+      EMIT_SOUND_DYN2(pEntity, CHAN_WEAPON, "common/wpn_hudon.wav", 1.0,
+                      ATTN_NORM, 0, 100);
+   }
+}
+
+
+// allow player to manually remove a path from one waypoint to another
+void WaypointRemovePath(edict_t *pEntity, int cmd)
+{
+   static int waypoint1 = -1;  // initialized to unassigned
+   static int waypoint2 = -1;  // initialized to unassigned
+
+   if (cmd == 1)  // assign source of path
+   {
+      waypoint1 = WaypointFindNearest(pEntity, 50.0, -1);
+
+      if (waypoint1 == -1)
+      {
+         // play "cancelled" sound...
+         EMIT_SOUND_DYN2(pEntity, CHAN_WEAPON, "common/wpn_moveselect.wav", 1.0,
+                         ATTN_NORM, 0, 100);
+
+         return;
+      }
+
+      // play "start" sound...
+      EMIT_SOUND_DYN2(pEntity, CHAN_WEAPON, "common/wpn_hudoff.wav", 1.0,
+                      ATTN_NORM, 0, 100);
+
+      return;
+   }
+
+   if (cmd == 2)  // assign dest of path and make path
+   {
+      waypoint2 = WaypointFindNearest(pEntity, 50.0, -1);
+
+      if ((waypoint1 == -1) || (waypoint2 == -1))
+      {
+         // play "error" sound...
+         EMIT_SOUND_DYN2(pEntity, CHAN_WEAPON, "common/wpn_denyselect.wav", 1.0,
+                         ATTN_NORM, 0, 100);
+
+         return;
+      }
+
+      WaypointDeletePath(waypoint1, waypoint2);
+
+      // play "done" sound...
+      EMIT_SOUND_DYN2(pEntity, CHAN_WEAPON, "common/wpn_hudon.wav", 1.0,
+                      ATTN_NORM, 0, 100);
+   }
+}
+
+
+bool WaypointLoad(edict_t *pEntity)
+{
+   char mapname[64];
+   char filename[256];
+   WAYPOINT_HDR header;
+   char msg[80];
+   int index, i;
+   short int num;
+   short int path_index;
+
+   strcpy(mapname, STRING(gpGlobals->mapname));
+   strcat(mapname, ".wpt");
+
+   UTIL_BuildFileName(filename, "maps", mapname);
+
+   if (IS_DEDICATED_SERVER())
+      printf("loading waypoint file: %s\n", filename);
+
+   FILE *bfp = fopen(filename, "rb");
+
+   // if file exists, read the waypoint structure from it
+   if (bfp != NULL)
+   {
+      fread(&header, sizeof(header), 1, bfp);
+
+      header.filetype[7] = 0;
+      if (strcmp(header.filetype, "HPB_bot") == 0)
+      {
+         if (header.waypoint_file_version != WAYPOINT_VERSION)
+         {
+            if (pEntity)
+               ClientPrint(pEntity, HUD_PRINTNOTIFY, "Incompatible HPB bot waypoint file version!\nWaypoints not loaded!\n");
+
+            fclose(bfp);
+            return FALSE;
+         }
+
+         header.mapname[31] = 0;
+
+         if (strcmp(header.mapname, STRING(gpGlobals->mapname)) == 0)
+         {
+            WaypointInit();  // remove any existing waypoints
+
+            for (i=0; i < header.number_of_waypoints; i++)
+            {
+               fread(&waypoints[i], sizeof(waypoints[0]), 1, bfp);
+               num_waypoints++;
+            }
+
+            // read and add waypoint paths...
+            for (index=0; index < num_waypoints; index++)
+            {
+               // read the number of paths from this node...
+               fread(&num, sizeof(num), 1, bfp);
+
+               for (i=0; i < num; i++)
+               {
+                  fread(&path_index, sizeof(path_index), 1, bfp);
+
+                  WaypointAddPath(index, path_index);
+               }
+            }
+
+            g_waypoint_paths = TRUE;  // keep track so path can be freed
+         }
+         else
+         {
+            if (pEntity)
+            {
+               sprintf(msg, "%s HPB bot waypoints are not for this map!\n", filename);
+               ClientPrint(pEntity, HUD_PRINTNOTIFY, msg);
+            }
+
+            fclose(bfp);
+            return FALSE;
+         }
+      }
+      else
+      {
+         if (pEntity)
+         {
+            sprintf(msg, "%s is not a HPB bot waypoint file!\n", filename);
+            ClientPrint(pEntity, HUD_PRINTNOTIFY, msg);
+         }
+
+         fclose(bfp);
+         return FALSE;
+      }
+
+      fclose(bfp);
+
+      WaypointRouteInit();
+   }
+   else
+   {
+      if (pEntity)
+      {
+         sprintf(msg, "Waypoint file %s does not exist!\n", filename);
+         ClientPrint(pEntity, HUD_PRINTNOTIFY, msg);
+      }
+
+      if (IS_DEDICATED_SERVER())
+         printf("waypoint file %s not found!\n", filename);
+
+      return FALSE;
+   }
+
+   return TRUE;
+}
+
+
+void WaypointSave(void)
+{
+   char filename[256];
+   char mapname[64];
+   WAYPOINT_HDR header;
+   int index, i;
+   short int num;
+   PATH *p;
+
+   strcpy(header.filetype, "HPB_bot");
+
+   header.waypoint_file_version = WAYPOINT_VERSION;
+
+   header.waypoint_file_flags = 0;  // not currently used
+
+   header.number_of_waypoints = num_waypoints;
+
+   memset(header.mapname, 0, sizeof(header.mapname));
+   strncpy(header.mapname, STRING(gpGlobals->mapname), 31);
+   header.mapname[31] = 0;
+
+   strcpy(mapname, STRING(gpGlobals->mapname));
+   strcat(mapname, ".wpt");
+
+   UTIL_BuildFileName(filename, "maps", mapname);
+
+   FILE *bfp = fopen(filename, "wb");
+
+   // write the waypoint header to the file...
+   fwrite(&header, sizeof(header), 1, bfp);
+
+   // write the waypoint data to the file...
+   for (index=0; index < num_waypoints; index++)
+   {
+      fwrite(&waypoints[index], sizeof(waypoints[0]), 1, bfp);
+   }
+
+   // save the waypoint paths...
+   for (index=0; index < num_waypoints; index++)
+   {
+      // count the number of paths from this node...
+
+      p = paths[index];
+      num = 0;
+
+      while (p != NULL)
+      {
+         i = 0;
+
+         while (i < MAX_PATH_INDEX)
+         {
+            if (p->index[i] != -1)
+               num++;  // count path node if it's used
+
+            i++;
+         }
+
+         p = p->next;  // go to next node in linked list
+      }
+
+      fwrite(&num, sizeof(num), 1, bfp);  // write the count
+
+      // now write out each path index...
+
+      p = paths[index];
+
+      while (p != NULL)
+      {
+         i = 0;
+
+         while (i < MAX_PATH_INDEX)
+         {
+            if (p->index[i] != -1)  // save path node if it's used
+               fwrite(&p->index[i], sizeof(p->index[0]), 1, bfp);
+
+            i++;
+         }
+
+         p = p->next;  // go to next node in linked list
+      }
+   }
+
+   fclose(bfp);
+}
+
+
+bool WaypointReachable(Vector v_src, Vector v_dest, edict_t *pEntity)
+{
+   TraceResult tr;
+   float curr_height, last_height;
+
+   float distance = (v_dest - v_src).Length();
+
+   // is the destination close enough?
+   if (distance < REACHABLE_RANGE)
+   {
+      // check if this waypoint is "visible"...
+
+      UTIL_TraceLine( v_src, v_dest, ignore_monsters,
+                      pEntity->v.pContainingEntity, &tr );
+
+      // if waypoint is visible from current position (even behind head)...
+      if (tr.flFraction >= 1.0)
+      {
+         // check for special case of both waypoints being underwater...
+         if ((POINT_CONTENTS( v_src ) == CONTENTS_WATER) &&
+             (POINT_CONTENTS( v_dest ) == CONTENTS_WATER))
+         {
+            return TRUE;
+         }
+
+         // check for special case of waypoint being suspended in mid-air...
+
+         // is dest waypoint higher than src? (45 is max jump height)
+         if (v_dest.z > (v_src.z + 45.0))
+         {
+            Vector v_new_src = v_dest;
+            Vector v_new_dest = v_dest;
+
+            v_new_dest.z = v_new_dest.z - 50;  // straight down 50 units
+
+            UTIL_TraceLine(v_new_src, v_new_dest, dont_ignore_monsters,
+                           pEntity->v.pContainingEntity, &tr);
+
+            // check if we didn't hit anything, if not then it's in mid-air
+            if (tr.flFraction >= 1.0)
+            {
+               return FALSE;  // can't reach this one
+            }
+         }
+
+         // check if distance to ground increases more than jump height
+         // at points between source and destination...
+
+         Vector v_direction = (v_dest - v_src).Normalize();  // 1 unit long
+         Vector v_check = v_src;
+         Vector v_down = v_src;
+
+         v_down.z = v_down.z - 1000.0;  // straight down 1000 units
+
+         UTIL_TraceLine(v_check, v_down, ignore_monsters,
+                        pEntity->v.pContainingEntity, &tr);
+
+         last_height = tr.flFraction * 1000.0;  // height from ground
+
+         distance = (v_dest - v_check).Length();  // distance from goal
+
+         while (distance > 10.0)
+         {
+            // move 10 units closer to the goal...
+            v_check = v_check + (v_direction * 10.0);
+
+            v_down = v_check;
+            v_down.z = v_down.z - 1000.0;  // straight down 1000 units
+
+            UTIL_TraceLine(v_check, v_down, ignore_monsters,
+                           pEntity->v.pContainingEntity, &tr);
+
+            curr_height = tr.flFraction * 1000.0;  // height from ground
+
+            // is the difference in the last height and the current height
+            // higher that the jump height?
+            if ((last_height - curr_height) > 45.0)
+            {
+               // can't get there from here...
+               return FALSE;
+            }
+
+            last_height = curr_height;
+
+            distance = (v_dest - v_check).Length();  // distance from goal
+         }
+
+         return TRUE;
+      }
+   }
+
+   return FALSE;
+}
+
+
+// find the nearest reachable waypoint
+int WaypointFindReachable(edict_t *pEntity, float range, int team)
+{
+   int i, min_index;
+   float distance;
+   float min_distance;
+   TraceResult tr;
+
+   // find the nearest waypoint...
+
+   min_distance = 9999.0;
+
+   for (i=0; i < num_waypoints; i++)
+   {
+      if (waypoints[i].flags & W_FL_DELETED)
+         continue;  // skip any deleted waypoints
+
+      if (waypoints[i].flags & W_FL_AIMING)
+         continue;  // skip any aiming waypoints
+
+      // skip this waypoint if it's team specific and teams don't match...
+      if ((team != -1) && (waypoints[i].flags & W_FL_TEAM_SPECIFIC) &&
+          ((waypoints[i].flags & W_FL_TEAM) != team))
+         continue;
+
+      distance = (waypoints[i].origin - pEntity->v.origin).Length();
+
+      if (distance < min_distance)
+      {
+         // if waypoint is visible from current position (even behind head)...
+         UTIL_TraceLine( pEntity->v.origin + pEntity->v.view_ofs, waypoints[i].origin,
+                         ignore_monsters, pEntity->v.pContainingEntity, &tr );
+
+         if (tr.flFraction >= 1.0)
+         {
+            if (WaypointReachable(pEntity->v.origin, waypoints[i].origin, pEntity))
+            {
+               min_index = i;
+               min_distance = distance;
+            }
+         }
+      }
+   }
+
+   // if not close enough to a waypoint then just return
+   if (min_distance > range)
+      return -1;
+
+   return min_index;
+
+}
+
+
+void WaypointPrintInfo(edict_t *pEntity)
+{
+   char msg[80];
+   int index;
+   int flags;
+
+   // find the nearest waypoint...
+   index = WaypointFindNearest(pEntity, 50.0, -1);
+
+   if (index == -1)
+      return;
+
+   sprintf(msg,"Waypoint %d of %d total\n", index, num_waypoints);
+   ClientPrint(pEntity, HUD_PRINTNOTIFY, msg);
+
+   flags = waypoints[index].flags;
+
+   if (flags & W_FL_TEAM_SPECIFIC)
+   {
+      if (mod_id == FRONTLINE_DLL)
+      {
+         if ((flags & W_FL_TEAM) == 0)
+            strcpy(msg, "Waypoint is for Attackers\n");
+         else if ((flags & W_FL_TEAM) == 1)
+            strcpy(msg, "Waypoint is for Defenders\n");
+      }
+      else
+      {
+         if ((flags & W_FL_TEAM) == 0)
+            strcpy(msg, "Waypoint is for TEAM 1\n");
+         else if ((flags & W_FL_TEAM) == 1)
+            strcpy(msg, "Waypoint is for TEAM 2\n");
+         else if ((flags & W_FL_TEAM) == 2)
+            strcpy(msg, "Waypoint is for TEAM 3\n");
+         else if ((flags & W_FL_TEAM) == 3)
+            strcpy(msg, "Waypoint is for TEAM 4\n");
+      }
+
+      ClientPrint(pEntity, HUD_PRINTNOTIFY, msg);
+   }
+
+   if (flags & W_FL_LIFT)
+      ClientPrint(pEntity, HUD_PRINTNOTIFY, "Bot will wait for lift before approaching\n");
+
+   if (flags & W_FL_LADDER)
+      ClientPrint(pEntity, HUD_PRINTNOTIFY, "This waypoint is on a ladder\n");
+
+   if (flags & W_FL_DOOR)
+      ClientPrint(pEntity, HUD_PRINTNOTIFY, "This is a door waypoint\n");
+
+   if (flags & W_FL_HEALTH)
+      ClientPrint(pEntity, HUD_PRINTNOTIFY, "There is health near this waypoint\n");
+
+   if (flags & W_FL_ARMOR)
+      ClientPrint(pEntity, HUD_PRINTNOTIFY, "There is armor near this waypoint\n");
+
+   if (flags & W_FL_AMMO)
+      ClientPrint(pEntity, HUD_PRINTNOTIFY, "There is ammo near this waypoint\n");
+
+   if (flags & W_FL_SNIPER)
+      ClientPrint(pEntity, HUD_PRINTNOTIFY, "This is a sniper waypoint\n");
+
+   if (flags & W_FL_TFC_FLAG)
+   {
+      if (mod_id == FRONTLINE_DLL)
+         ClientPrint(pEntity, HUD_PRINTNOTIFY, "There is a capture point near this waypoint\n");
+      else
+         ClientPrint(pEntity, HUD_PRINTNOTIFY, "There is a flag near this waypoint\n");
+   }
+
+   if (flags & W_FL_TFC_FLAG_GOAL)
+   {
+      if (mod_id == FRONTLINE_DLL)
+         ClientPrint(pEntity, HUD_PRINTNOTIFY, "This is a defender location\n");
+      else
+         ClientPrint(pEntity, HUD_PRINTNOTIFY, "There is a flag goal near this waypoint\n");
+   }
+
+   if (flags & W_FL_PRONE)
+      ClientPrint(pEntity, HUD_PRINTNOTIFY, "Bot will go prone here\n");
+}
+
+
+void WaypointThink(edict_t *pEntity)
+{
+   float distance, min_distance;
+   Vector start, end;
+   int i, index;
+
+   if (g_auto_waypoint)  // is auto waypoint on?
+   {
+      // find the distance from the last used waypoint
+      distance = (last_waypoint - pEntity->v.origin).Length();
+
+      if (distance > 200)
+      {
+         min_distance = 9999.0;
+
+         // check that no other reachable waypoints are nearby...
+         for (i=0; i < num_waypoints; i++)
+         {
+            if (waypoints[i].flags & W_FL_DELETED)
+               continue;
+
+            if (waypoints[i].flags & W_FL_AIMING)
+               continue;
+
+            if (WaypointReachable(pEntity->v.origin, waypoints[i].origin, pEntity))
+            {
+               distance = (waypoints[i].origin - pEntity->v.origin).Length();
+
+               if (distance < min_distance)
+                  min_distance = distance;
+            }
+         }
+
+         // make sure nearest waypoint is far enough away...
+         if (min_distance >= 200)
+            WaypointAdd(pEntity);  // place a waypoint here
+      }
+   }
+
+   min_distance = 9999.0;
+
+   if (g_waypoint_on)  // display the waypoints if turned on...
+   {
+      for (i=0; i < num_waypoints; i++)
+      {
+         if ((waypoints[i].flags & W_FL_DELETED) == W_FL_DELETED)
+            continue;
+
+         distance = (waypoints[i].origin - pEntity->v.origin).Length();
+
+         if (distance < 500)
+         {
+            if (distance < min_distance)
+            {
+               index = i; // store index of nearest waypoint
+               min_distance = distance;
+            }
+
+            if ((wp_display_time[i] + 1.0) < gpGlobals->time)
+            {
+               if (waypoints[i].flags & W_FL_CROUCH)
+               {
+                  start = waypoints[i].origin - Vector(0, 0, 17);
+                  end = start + Vector(0, 0, 34);
+               }
+               else if (waypoints[i].flags & W_FL_AIMING)
+               {
+                  start = waypoints[i].origin + Vector(0, 0, 10);
+                  end = start + Vector(0, 0, 14);
+               }
+               else
+               {
+                  start = waypoints[i].origin - Vector(0, 0, 34);
+                  end = start + Vector(0, 0, 68);
+               }
+
+               // draw a blue waypoint
+               WaypointDrawBeam(pEntity, start, end, 30, 0, 0, 0, 255, 250, 5);
+
+               wp_display_time[i] = gpGlobals->time;
+            }
+         }
+      }
+
+      // check if path waypointing is on...
+      if (g_path_waypoint)
+      {
+         // check if player is close enough to a waypoint and time to draw path...
+         if ((min_distance <= 50) && (f_path_time <= gpGlobals->time))
+         {
+            PATH *p;
+
+            f_path_time = gpGlobals->time + 1.0;
+
+            p = paths[index];
+
+            while (p != NULL)
+            {
+               i = 0;
+
+               while (i < MAX_PATH_INDEX)
+               {
+                  if (p->index[i] != -1)
+                  {
+                     Vector v_src = waypoints[index].origin;
+                     Vector v_dest = waypoints[p->index[i]].origin;
+
+                     // draw a white line to this index's waypoint
+                     WaypointDrawBeam(pEntity, v_src, v_dest, 10, 2, 250, 250, 250, 200, 10);
+                  }
+
+                  i++;
+               }
+
+               p = p->next;  // go to next node in linked list
+            }
+         }
+      }
+   }
+}
+
+
+// run Floyd's algorithm on the waypoint list to generate the least cost
+// path matrix...
+void WaypointFloyds(unsigned short *shortest_path, unsigned short *from_to)
+{
+   unsigned int x, y, z;
+   int changed = 1;
+   int distance;
+
+   for (y=0; y < route_num_waypoints; y++)
+   {
+      for (z=0; z < route_num_waypoints; z++)
+      {
+         from_to[y * route_num_waypoints + z] = z;
+      }
+   }
+
+   while (changed)
+   {
+      changed = 0;
+
+      for (x=0; x < route_num_waypoints; x++)
+      {
+         for (y=0; y < route_num_waypoints; y++)
+         {
+            for (z=0; z < route_num_waypoints; z++)
+            {
+               if ((shortest_path[y * route_num_waypoints + x] == WAYPOINT_UNREACHABLE) ||
+                   (shortest_path[x * route_num_waypoints + z] == WAYPOINT_UNREACHABLE))
+                  continue;
+
+               distance = shortest_path[y * route_num_waypoints + x] +
+                          shortest_path[x * route_num_waypoints + z];
+
+               if (distance > WAYPOINT_MAX_DISTANCE)
+                  distance = WAYPOINT_MAX_DISTANCE;
+
+               if ((distance < shortest_path[y * route_num_waypoints + z]) ||
+                   (shortest_path[y * route_num_waypoints + z] == WAYPOINT_UNREACHABLE))
+               {
+                  shortest_path[y * route_num_waypoints + z] = distance;
+                  from_to[y * route_num_waypoints + z] = from_to[y * route_num_waypoints + x];
+                  changed = 1;
+               }
+            }
+         }
+      }
+   }
+}
+
+
+// load the waypoint route files (.wp1, .wp2, etc.) or generate them if
+// they don't exist...
+void WaypointRouteInit(void)
+{
+   unsigned int index;
+   bool build_matrix[4];
+   int matrix;
+   unsigned int array_size;
+   unsigned int row;
+   int i, offset;
+   unsigned int a, b;
+   float distance;
+   unsigned short *pShortestPath, *pFromTo;
+   char msg[80];
+   unsigned int num_items;
+   FILE *bfp;
+   char filename[256];
+   char filename2[256];
+   char mapname[64];
+
+   if (num_waypoints == 0)
+      return;
+
+   // save number of current waypoints in case waypoints get added later
+   route_num_waypoints = num_waypoints;
+
+   strcpy(mapname, STRING(gpGlobals->mapname));
+   strcat(mapname, ".wpt");
+
+   UTIL_BuildFileName(filename, "maps", mapname);
+
+   build_matrix[0] = TRUE;  // always build matrix 0 (non-team and team 1)
+   build_matrix[1] = FALSE;
+   build_matrix[2] = FALSE;
+   build_matrix[3] = FALSE;
+
+   // find out how many route matrixes to create...
+   for (index=0; index < route_num_waypoints; index++)
+   {
+      if (waypoints[index].flags & W_FL_TEAM_SPECIFIC)
+      {
+         if ((waypoints[index].flags & W_FL_TEAM) == 0x01)  // team 2?
+            build_matrix[1] = TRUE;
+
+         if ((waypoints[index].flags & W_FL_TEAM) == 0x02)  // team 3?
+            build_matrix[2] = TRUE;
+
+         if ((waypoints[index].flags & W_FL_TEAM) == 0x03)  // team 4?
+            build_matrix[3] = TRUE;
+      }
+   }
+
+   array_size = route_num_waypoints * route_num_waypoints;
+
+   for (matrix=0; matrix < 4; matrix++)
+   {
+      if (build_matrix[matrix])
+      {
+         char ext_str[5];  // ".wpX\0"
+         int file1, file2;
+         struct stat stat1, stat2;
+
+         sprintf(ext_str, ".wp%d", matrix+1);
+
+         strcpy(mapname, STRING(gpGlobals->mapname));
+         strcat(mapname, ext_str);
+
+         UTIL_BuildFileName(filename2, "maps", mapname);
+
+         if (access(filename2, 0) == 0)  // does the .wpX file exist?
+         {
+            file1 = open(filename, O_RDONLY);
+            file2 = open(filename2, O_RDONLY);
+
+            fstat(file1, &stat1);
+            fstat(file2, &stat2);
+
+            close(file1);
+            close(file2);
+
+            if (stat1.st_mtime < stat2.st_mtime)  // is .wpt older than .wpX file?
+            {
+               sprintf(msg, "loading HPB bot waypoint paths for team %d\n", matrix+1);
+               ALERT(at_console, msg);
+
+               shortest_path[matrix] = (unsigned short *)malloc(sizeof(unsigned short) * array_size);
+
+               if (shortest_path[matrix] == NULL)
+                  ALERT(at_error, "HPB_bot - Error allocating memory for shortest path!");
+
+               from_to[matrix] = (unsigned short *)malloc(sizeof(unsigned short) * array_size);
+
+               if (from_to[matrix] == NULL)
+                  ALERT(at_error, "HPB_bot - Error allocating memory for from to matrix!");
+
+               bfp = fopen(filename2, "rb");
+
+               if (bfp != NULL)
+               {
+                  num_items = fread(shortest_path[matrix], sizeof(unsigned short), array_size, bfp);
+
+                  if (num_items != array_size)
+                  {
+                     // if couldn't read enough data, free memory to recalculate it
+
+                     ALERT(at_console, "error reading enough path items, recalculating...\n");
+
+                     free(shortest_path[matrix]);
+                     shortest_path[matrix] = NULL;
+
+                     free(from_to[matrix]);
+                     from_to[matrix] = NULL;
+                  }
+                  else
+                  {
+                     num_items = fread(from_to[matrix], sizeof(unsigned short), array_size, bfp);
+
+                     if (num_items != array_size)
+                     {
+                        // if couldn't read enough data, free memory to recalculate it
+
+                        ALERT(at_console, "error reading enough path items, recalculating...\n");
+
+                        free(shortest_path[matrix]);
+                        shortest_path[matrix] = NULL;
+
+                        free(from_to[matrix]);
+                        from_to[matrix] = NULL;
+                     }
+                  }
+               }
+               else
+               {
+                  ALERT(at_console, "HPB_bot - Error reading waypoint paths!\n");
+
+                  free(shortest_path[matrix]);
+                  shortest_path[matrix] = NULL;
+
+                  free(from_to[matrix]);
+                  from_to[matrix] = NULL;
+               }
+
+               fclose(bfp);
+            }
+         }
+
+         if (shortest_path[matrix] == NULL)
+         {
+            sprintf(msg, "calculating HPB bot waypoint paths for team %d...\n", matrix+1);
+            ALERT(at_console, msg);
+
+            shortest_path[matrix] = (unsigned short *)malloc(sizeof(unsigned short) * array_size);
+
+            if (shortest_path[matrix] == NULL)
+               ALERT(at_error, "HPB_bot - Error allocating memory for shortest path!");
+
+            from_to[matrix] = (unsigned short *)malloc(sizeof(unsigned short) * array_size);
+
+            if (from_to[matrix] == NULL)
+               ALERT(at_error, "HPB_bot - Error allocating memory for from to matrix!");
+
+            pShortestPath = shortest_path[matrix];
+            pFromTo = from_to[matrix];
+
+            for (index=0; index < array_size; index++)
+               pShortestPath[index] = WAYPOINT_UNREACHABLE;
+
+            for (index=0; index < route_num_waypoints; index++)
+               pShortestPath[index * route_num_waypoints + index] = 0;  // zero diagonal
+
+            for (row=0; row < route_num_waypoints; row++)
+            {
+               if (paths[row] != NULL)
+               {
+                  PATH *p = paths[row];
+
+                  while (p)
+                  {
+                     i = 0;
+
+                     while (i < MAX_PATH_INDEX)
+                     {
+                        if (p->index[i] != -1)
+                        {
+                           index = p->index[i];
+
+                           // check if this is NOT team specific OR matches this team
+                           if (!(waypoints[index].flags & W_FL_TEAM_SPECIFIC) ||
+                               ((waypoints[index].flags & W_FL_TEAM) == matrix))
+                           {
+                              distance = (waypoints[row].origin - waypoints[index].origin).Length();
+
+                              if (distance > (float)WAYPOINT_MAX_DISTANCE)
+                                 distance = (float)WAYPOINT_MAX_DISTANCE;
+
+                              if (distance > REACHABLE_RANGE)
+                              {
+                                 sprintf(msg, "Waypoint path distance > %4.1f at from %d to %d\n",
+                                              REACHABLE_RANGE, row, index);
+                                 ALERT(at_console, msg);
+                              }
+                              else
+                              {
+                                 offset = row * route_num_waypoints + index;
+
+                                 pShortestPath[offset] = (unsigned short)distance;
+                              }
+                           }
+                        }
+
+                        i++;
+                     }
+
+                     p = p->next;  // go to next node in linked list
+                  }
+               }
+            }
+
+            // run Floyd's Algorithm to generate the from_to matrix...
+            WaypointFloyds(pShortestPath, pFromTo);
+
+            for (a=0; a < route_num_waypoints; a++)
+            {
+               for (b=0; b < route_num_waypoints; b++)
+                  if (pShortestPath[a * route_num_waypoints + b] == WAYPOINT_UNREACHABLE)
+                    pFromTo[a * route_num_waypoints + b] = WAYPOINT_UNREACHABLE;
+            }
+
+            bfp = fopen(filename2, "wb");
+
+            if (bfp != NULL)
+            {
+               num_items = fwrite(shortest_path[matrix], sizeof(unsigned short), array_size, bfp);
+
+               if (num_items != array_size)
+               {
+                  // if couldn't write enough data, close file and delete it
+
+                  fclose(bfp);
+                  unlink(filename2);
+               }
+               else
+               {
+                  num_items = fwrite(from_to[matrix], sizeof(unsigned short), array_size, bfp);
+
+                  fclose(bfp);
+
+                  if (num_items != array_size)
+                  {
+                     // if couldn't write enough data, delete file
+                     unlink(filename2);
+                  }
+               }
+            }
+            else
+            {
+               ALERT(at_console, "HPB_bot - Error writing waypoint paths!\n");
+            }
+
+            sprintf(msg, "HPB bot waypoint path calculations for team %d complete!\n",matrix+1);
+            ALERT(at_console, msg);
+         }
+      }
+   }
+
+}
+
+
+// return the next waypoint index for a path from the Floyd matrix when
+// going from a source waypoint index (src) to a destination waypoint
+// index (dest)...
+unsigned short WaypointRouteFromTo(int src, int dest, int team)
+{
+   unsigned short *pFromTo;
+
+   if ((team < -1) || (team > 3))
+      return -1;
+
+   if (team == -1)  // -1 means non-team play
+      team = 0;
+
+   if (from_to[team] == NULL)  // if no team specific waypoints use team 0
+      team = 0;
+
+   if (from_to[team] == NULL)  // if no route information just return
+      return -1;
+
+   pFromTo = from_to[team];
+
+   return pFromTo[src * route_num_waypoints + dest];
+}
+
+
+// return the total distance (based on the Floyd matrix) of a path from
+// the source waypoint index (src) to the destination waypoint index
+// (dest)...
+int WaypointDistanceFromTo(int src, int dest, int team)
+{
+   unsigned short *pShortestPath;
+
+   if ((team < -1) || (team > 3))
+      return -1;
+
+   if (team == -1)  // -1 means non-team play
+      team = 0;
+
+   if (from_to[team] == NULL)  // if no team specific waypoints use team 0
+      team = 0;
+
+   if (from_to[team] == NULL)  // if no route information just return
+      return -1;
+
+   pShortestPath = shortest_path[team];
+
+   return (int)(pShortestPath[src * route_num_waypoints + dest]);
+}
+
diff --git a/main/source/HPB_bot/dlls/waypoint.h b/main/source/HPB_bot/dlls/waypoint.h
new file mode 100644
index 00000000..dc84707c
--- /dev/null
+++ b/main/source/HPB_bot/dlls/waypoint.h
@@ -0,0 +1,104 @@
+//
+// HPB_bot - botman's High Ping Bastard bot
+//
+// (http://planethalflife.com/botman/)
+//
+// waypoint.h
+//
+
+#ifndef WAYPOINT_H
+#define WAYPOINT_H
+
+#include <limits.h>
+
+#define MAX_WAYPOINTS 1024
+
+#define REACHABLE_RANGE 400.0
+
+// defines for waypoint flags field (32 bits are available)
+#define W_FL_TEAM        ((1<<0) + (1<<1))  /* allow for 4 teams (0-3) */
+#define W_FL_TEAM_SPECIFIC (1<<2)  /* waypoint only for specified team */
+#define W_FL_CROUCH      (1<<3)  /* must crouch to reach this waypoint */
+#define W_FL_LADDER      (1<<4)  /* waypoint on a ladder */
+#define W_FL_LIFT        (1<<5)  /* wait for lift to be down before approaching this waypoint */
+#define W_FL_DOOR        (1<<6)  /* wait for door to open */
+#define W_FL_HEALTH      (1<<7)  /* health kit (or wall mounted) location */
+#define W_FL_ARMOR       (1<<8)  /* armor (or HEV) location */
+#define W_FL_AMMO        (1<<9)  /* ammo location */
+#define W_FL_SNIPER      (1<<10) /* sniper waypoint (a good sniper spot) */
+
+#define W_FL_TFC_FLAG    (1<<11) /* flag position (or hostage or president) */
+#define W_FL_FLF_CAP     (1<<11) /* Front Line Force capture point */
+
+#define W_FL_TFC_FLAG_GOAL (1<<12) /* flag return position (or rescue zone) */
+#define W_FL_FLF_DEFEND  (1<<12) /* Front Line Force defend point */
+
+#define W_FL_PRONE       (1<<13) /* go prone (laying down) */
+#define W_FL_AIMING      (1<<14) /* aiming waypoint */
+
+#define W_FL_DELETED     (1<<31) /* used by waypoint allocation code */
+
+
+#define WAYPOINT_VERSION 4
+
+// define the waypoint file header structure...
+typedef struct {
+   char filetype[8];  // should be "HPB_bot\0"
+   int  waypoint_file_version;
+   int  waypoint_file_flags;  // not currently used
+   int  number_of_waypoints;
+   char mapname[32];  // name of map for these waypoints
+} WAYPOINT_HDR;
+
+
+// define the structure for waypoints...
+typedef struct {
+   int    flags;    // button, lift, flag, health, ammo, etc.
+   Vector origin;   // location
+} WAYPOINT;
+
+
+
+#define WAYPOINT_UNREACHABLE   USHRT_MAX
+#define WAYPOINT_MAX_DISTANCE (USHRT_MAX-1)
+
+#define MAX_PATH_INDEX 4
+
+// define the structure for waypoint paths (paths are connections between
+// two waypoint nodes that indicates the bot can get from point A to point B.
+// note that paths DON'T have to be two-way.  sometimes they are just one-way
+// connections between two points.  There is an array called "paths" that
+// contains head pointers to these structures for each waypoint index.
+typedef struct path {
+   short int index[MAX_PATH_INDEX];  // indexes of waypoints (index -1 means not used)
+   struct path *next;   // link to next structure
+} PATH;
+
+
+// waypoint function prototypes...
+void WaypointInit(void);
+int  WaypointFindPath(PATH **pPath, int *path_index, int waypoint_index, int team);
+int  WaypointFindNearest(edict_t *pEntity, float distance, int team);
+int  WaypointFindNearest(Vector v_src, edict_t *pEntity, float range, int team);
+int  WaypointFindNearestGoal(edict_t *pEntity, int src, int team, int flags);
+int  WaypointFindNearestGoal(Vector v_src, edict_t *pEntity, float range, int team, int flags);
+int  WaypointFindRandomGoal(edict_t *pEntity, int team, int flags);
+int  WaypointFindRandomGoal(Vector v_src, edict_t *pEntity, float range, int team, int flags);
+int  WaypointFindNearestAiming(Vector v_origin);
+void WaypointAdd(edict_t *pEntity);
+void WaypointAddAiming(edict_t *pEntity);
+void WaypointDelete(edict_t *pEntity);
+void WaypointCreatePath(edict_t *pEntity, int cmd);
+void WaypointRemovePath(edict_t *pEntity, int cmd);
+bool WaypointLoad(edict_t *pEntity);
+void WaypointSave(void);
+bool WaypointReachable(Vector v_srv, Vector v_dest, edict_t *pEntity);
+int  WaypointFindReachable(edict_t *pEntity, float range, int team);
+void WaypointPrintInfo(edict_t *pEntity);
+void WaypointThink(edict_t *pEntity);
+void WaypointFloyds(short *shortest_path, short *from_to);
+void WaypointRouteInit(void);
+unsigned short WaypointRouteFromTo(int src, int dest, int team);
+int  WaypointDistanceFromTo(int src, int dest, int team);
+
+#endif // WAYPOINT_H
diff --git a/main/source/HPB_bot/engine/engine.h b/main/source/HPB_bot/engine/engine.h
new file mode 100644
index 00000000..02a2c4ee
--- /dev/null
+++ b/main/source/HPB_bot/engine/engine.h
@@ -0,0 +1,156 @@
+//
+// HPB_bot - botman's High Ping Bastard bot
+//
+// (http://planethalflife.com/botman/)
+//
+// engine.h
+//
+
+#ifndef ENGINE_H
+#define ENGINE_H
+
+// engine prototypes (from engine\eiface.h)...
+int pfnPrecacheModel( char* s );
+int pfnPrecacheSound( char* s );
+void pfnSetModel( edict_t *e, const char *m );
+int pfnModelIndex( const char *m );
+int pfnModelFrames( int modelIndex );
+void pfnSetSize( edict_t *e, const float *rgflMin, const float *rgflMax );
+void pfnChangeLevel( char* s1, char* s2 );
+void pfnGetSpawnParms( edict_t *ent );
+void pfnSaveSpawnParms( edict_t *ent );
+float pfnVecToYaw( const float *rgflVector );
+void pfnVecToAngles( const float *rgflVectorIn, float *rgflVectorOut );
+void pfnMoveToOrigin( edict_t *ent, const float *pflGoal, float dist, int iMoveType );
+void pfnChangeYaw( edict_t* ent );
+void pfnChangePitch( edict_t* ent );
+edict_t* pfnFindEntityByString( edict_t *pEdictStartSearchAfter, const char *pszField, const char *pszValue );
+int pfnGetEntityIllum( edict_t* pEnt );
+edict_t* pfnFindEntityInSphere( edict_t *pEdictStartSearchAfter, const float *org, float rad );
+edict_t* pfnFindClientInPVS( edict_t *pEdict );
+edict_t* pfnEntitiesInPVS( edict_t *pplayer );
+void pfnMakeVectors( const float *rgflVector );
+void pfnAngleVectors( const float *rgflVector, float *forward, float *right, float *up );
+edict_t* pfnCreateEntity( void );
+void pfnRemoveEntity( edict_t* e );
+edict_t* pfnCreateNamedEntity( int className );
+void pfnMakeStatic( edict_t *ent );
+int pfnEntIsOnFloor( edict_t *e );
+int pfnDropToFloor( edict_t* e );
+int pfnWalkMove( edict_t *ent, float yaw, float dist, int iMode );
+void pfnSetOrigin( edict_t *e, const float *rgflOrigin );
+void pfnEmitSound( edict_t *entity, int channel, const char *sample, /*int*/float volume, float attenuation, int fFlags, int pitch );
+void pfnEmitAmbientSound( edict_t *entity, float *pos, const char *samp, float vol, float attenuation, int fFlags, int pitch );
+void pfnTraceLine( const float *v1, const float *v2, int fNoMonsters, edict_t *pentToSkip, TraceResult *ptr );
+void pfnTraceToss( edict_t* pent, edict_t* pentToIgnore, TraceResult *ptr );
+int pfnTraceMonsterHull( edict_t *pEdict, const float *v1, const float *v2, int fNoMonsters, edict_t *pentToSkip, TraceResult *ptr );
+void pfnTraceHull( const float *v1, const float *v2, int fNoMonsters, int hullNumber, edict_t *pentToSkip, TraceResult *ptr );
+void pfnTraceModel( const float *v1, const float *v2, int hullNumber, edict_t *pent, TraceResult *ptr );
+const char *pfnTraceTexture( edict_t *pTextureEntity, const float *v1, const float *v2 );
+void pfnTraceSphere( const float *v1, const float *v2, int fNoMonsters, float radius, edict_t *pentToSkip, TraceResult *ptr );
+void pfnGetAimVector( edict_t* ent, float speed, float *rgflReturn );
+void pfnServerCommand( char* str );
+void pfnServerExecute( void );
+void pfnClientCommand( edict_t* pEdict, char* szFmt, ... );
+void pfnParticleEffect( const float *org, const float *dir, float color, float count );
+void pfnLightStyle( int style, char* val );
+int pfnDecalIndex( const char *name );
+int pfnPointContents( const float *rgflVector );
+void pfnMessageBegin( int msg_dest, int msg_type, const float *pOrigin, edict_t *ed );
+void pfnMessageEnd( void );
+void pfnWriteByte( int iValue );
+void pfnWriteChar( int iValue );
+void pfnWriteShort( int iValue );
+void pfnWriteLong( int iValue );
+void pfnWriteAngle( float flValue );
+void pfnWriteCoord( float flValue );
+void pfnWriteString( const char *sz );
+void pfnWriteEntity( int iValue );
+void pfnCVarRegister( cvar_t *pCvar );
+float pfnCVarGetFloat( const char *szVarName );
+const char* pfnCVarGetString( const char *szVarName );
+void pfnCVarSetFloat( const char *szVarName, float flValue );
+void pfnCVarSetString( const char *szVarName, const char *szValue );
+void pfnAlertMessage( ALERT_TYPE atype, char *szFmt, ... );
+void pfnEngineFprintf( FILE *pfile, char *szFmt, ... );
+void* pfnPvAllocEntPrivateData( edict_t *pEdict, long cb );
+void* pfnPvEntPrivateData( edict_t *pEdict );
+void pfnFreeEntPrivateData( edict_t *pEdict );
+const char* pfnSzFromIndex( int iString );
+int pfnAllocString( const char *szValue );
+struct entvars_s* pfnGetVarsOfEnt( edict_t *pEdict );
+edict_t* pfnPEntityOfEntOffset( int iEntOffset );
+int pfnEntOffsetOfPEntity( const edict_t *pEdict );
+int pfnIndexOfEdict( const edict_t *pEdict );
+edict_t* pfnPEntityOfEntIndex( int iEntIndex );
+edict_t* pfnFindEntityByVars( struct entvars_s* pvars );
+void* pfnGetModelPtr( edict_t* pEdict );
+int pfnRegUserMsg( const char *pszName, int iSize );
+void pfnAnimationAutomove( const edict_t* pEdict, float flTime );
+void pfnGetBonePosition( const edict_t* pEdict, int iBone, float *rgflOrigin, float *rgflAngles );
+unsigned long pfnFunctionFromName( const char *pName );
+const char *pfnNameForFunction( unsigned long function );
+void pfnClientPrintf( edict_t* pEdict, PRINT_TYPE ptype, const char *szMsg );
+void pfnServerPrint( const char *szMsg );
+const char *pfnCmd_Args( void );
+const char *pfnCmd_Argv( int argc );
+int pfnCmd_Argc( void );
+void pfnGetAttachment( const edict_t *pEdict, int iAttachment, float *rgflOrigin, float *rgflAngles );
+void pfnCRC32_Init( CRC32_t *pulCRC );
+void pfnCRC32_ProcessBuffer( CRC32_t *pulCRC, void *p, int len );
+void pfnCRC32_ProcessByte( CRC32_t *pulCRC, unsigned char ch );
+CRC32_t pfnCRC32_Final( CRC32_t pulCRC );
+long pfnRandomLong( long lLow, long lHigh );
+float pfnRandomFloat( float flLow, float flHigh );
+void pfnSetView( const edict_t *pClient, const edict_t *pViewent );
+float pfnTime( void );
+void pfnCrosshairAngle( const edict_t *pClient, float pitch, float yaw );
+byte * pfnLoadFileForMe( char *filename, int *pLength );
+void pfnFreeFile( void *buffer );
+void pfnEndSection( const char *pszSectionName );
+int pfnCompareFileTime( char *filename1, char *filename2, int *iCompare );
+void pfnGetGameDir( char *szGetGameDir );
+void pfnCvar_RegisterVariable( cvar_t *variable );
+void pfnFadeClientVolume( const edict_t *pEdict, int fadePercent, int fadeOutSeconds, int holdTime, int fadeInSeconds );
+void pfnSetClientMaxspeed( const edict_t *pEdict, float fNewMaxspeed );
+edict_t * pfnCreateFakeClient( const char *netname );
+void pfnRunPlayerMove( edict_t *fakeclient, const float *viewangles, float forwardmove, float sidemove, float upmove, unsigned short buttons, byte impulse, byte msec );
+int pfnNumberOfEntities( void );
+char* pfnGetInfoKeyBuffer( edict_t *e );
+char* pfnInfoKeyValue( char *infobuffer, char *key );
+void pfnSetKeyValue( char *infobuffer, char *key, char *value );
+void pfnSetClientKeyValue( int clientIndex, char *infobuffer, char *key, char *value );
+int pfnIsMapValid( char *filename );
+void pfnStaticDecal( const float *origin, int decalIndex, int entityIndex, int modelIndex );
+int pfnPrecacheGeneric( char* s );
+int pfnGetPlayerUserId( edict_t *e );
+void pfnBuildSoundMsg( edict_t *entity, int channel, const char *sample, /*int*/float volume, float attenuation, int fFlags, int pitch, int msg_dest, int msg_type, const float *pOrigin, edict_t *ed );
+int pfnIsDedicatedServer( void );
+cvar_t *pfnCVarGetPointer( const char *szVarName );
+unsigned int pfnGetPlayerWONId( edict_t *e );
+
+void pfnInfo_RemoveKey( char *s, const char *key );
+const char *pfnGetPhysicsKeyValue( const edict_t *pClient, const char *key );
+void pfnSetPhysicsKeyValue( const edict_t *pClient, const char *key, const char *value );
+const char *pfnGetPhysicsInfoString( const edict_t *pClient );
+unsigned short pfnPrecacheEvent( int type, const char*psz );
+void pfnPlaybackEvent( int flags, const edict_t *pInvoker, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 );
+unsigned char *pfnSetFatPVS( float *org );
+unsigned char *pfnSetFatPAS( float *org );
+int pfnCheckVisibility ( const edict_t *entity, unsigned char *pset );
+void pfnDeltaSetField( struct delta_s *pFields, const char *fieldname );
+void pfnDeltaUnsetField( struct delta_s *pFields, const char *fieldname );
+void pfnDeltaAddEncoder( char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) );
+int pfnGetCurrentPlayer( void );
+int pfnCanSkipPlayer( const edict_t *player );
+int pfnDeltaFindField( struct delta_s *pFields, const char *fieldname );
+void pfnDeltaSetFieldByIndex( struct delta_s *pFields, int fieldNumber );
+void pfnDeltaUnsetFieldByIndex( struct delta_s *pFields, int fieldNumber );
+void pfnSetGroupMask( int mask, int op );
+int pfnCreateInstancedBaseline( int classname, struct entity_state_s *baseline );
+void pfnCvar_DirectSet( struct cvar_s *var, char *value );
+void pfnForceUnmodified( FORCE_TYPE type, float *mins, float *maxs, const char *filename );
+void pfnGetPlayerStats( const edict_t *pClient, int *ping, int *packet_loss );
+
+#endif // ENGINE_H
+
diff --git a/main/source/HPB_bot/exports/exports.c b/main/source/HPB_bot/exports/exports.c
new file mode 100644
index 00000000..3de4c147
--- /dev/null
+++ b/main/source/HPB_bot/exports/exports.c
@@ -0,0 +1,419 @@
+//
+// (http://planethalflife.com/botman/)
+//
+// exports.c
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <windows.h>
+
+
+#define DOS_SIGNATURE   0x5A4D       /* MZ */
+#define NT_SIGNATURE    0x00004550   /* PE00 */
+
+
+// globals
+WORD *p_Ordinals = NULL;
+DWORD *p_Names = NULL;
+DWORD *p_Functions = NULL;
+int num_ordinals;
+
+
+typedef struct {                        // DOS .EXE header
+    WORD   e_magic;                     // Magic number
+    WORD   e_cblp;                      // Bytes on last page of file
+    WORD   e_cp;                        // Pages in file
+    WORD   e_crlc;                      // Relocations
+    WORD   e_cparhdr;                   // Size of header in paragraphs
+    WORD   e_minalloc;                  // Minimum extra paragraphs needed
+    WORD   e_maxalloc;                  // Maximum extra paragraphs needed
+    WORD   e_ss;                        // Initial (relative) SS value
+    WORD   e_sp;                        // Initial SP value
+    WORD   e_csum;                      // Checksum
+    WORD   e_ip;                        // Initial IP value
+    WORD   e_cs;                        // Initial (relative) CS value
+    WORD   e_lfarlc;                    // File address of relocation table
+    WORD   e_ovno;                      // Overlay number
+    WORD   e_res[4];                    // Reserved words
+    WORD   e_oemid;                     // OEM identifier (for e_oeminfo)
+    WORD   e_oeminfo;                   // OEM information; e_oemid specific
+    WORD   e_res2[10];                  // Reserved words
+    LONG   e_lfanew;                    // File address of new exe header
+  } DOS_HEADER, *P_DOS_HEADER;
+
+typedef struct {
+    WORD    Machine;
+    WORD    NumberOfSections;
+    DWORD   TimeDateStamp;
+    DWORD   PointerToSymbolTable;
+    DWORD   NumberOfSymbols;
+    WORD    SizeOfOptionalHeader;
+    WORD    Characteristics;
+} PE_HEADER, *P_PE_HEADER;
+
+#define SIZEOF_SHORT_NAME              8
+
+typedef struct {
+    BYTE    Name[SIZEOF_SHORT_NAME];
+    union {
+            DWORD   PhysicalAddress;
+            DWORD   VirtualSize;
+    } Misc;
+    DWORD   VirtualAddress;
+    DWORD   SizeOfRawData;
+    DWORD   PointerToRawData;
+    DWORD   PointerToRelocations;
+    DWORD   PointerToLinenumbers;
+    WORD    NumberOfRelocations;
+    WORD    NumberOfLinenumbers;
+    DWORD   Characteristics;
+} SECTION_HEADER, *P_SECTION_HEADER;
+
+typedef struct {
+    DWORD   VirtualAddress;
+    DWORD   Size;
+} DATA_DIRECTORY, *P_DATA_DIRECTORY;
+
+#define NUMBEROF_DIRECTORY_ENTRIES    16
+
+typedef struct {
+    WORD    Magic;
+    BYTE    MajorLinkerVersion;
+    BYTE    MinorLinkerVersion;
+    DWORD   SizeOfCode;
+    DWORD   SizeOfInitializedData;
+    DWORD   SizeOfUninitializedData;
+    DWORD   AddressOfEntryPoint;
+    DWORD   BaseOfCode;
+    DWORD   BaseOfData;
+    DWORD   ImageBase;
+    DWORD   SectionAlignment;
+    DWORD   FileAlignment;
+    WORD    MajorOperatingSystemVersion;
+    WORD    MinorOperatingSystemVersion;
+    WORD    MajorImageVersion;
+    WORD    MinorImageVersion;
+    WORD    MajorSubsystemVersion;
+    WORD    MinorSubsystemVersion;
+    DWORD   Win32VersionValue;
+    DWORD   SizeOfImage;
+    DWORD   SizeOfHeaders;
+    DWORD   CheckSum;
+    WORD    Subsystem;
+    WORD    DllCharacteristics;
+    DWORD   SizeOfStackReserve;
+    DWORD   SizeOfStackCommit;
+    DWORD   SizeOfHeapReserve;
+    DWORD   SizeOfHeapCommit;
+    DWORD   LoaderFlags;
+    DWORD   NumberOfRvaAndSizes;
+    DATA_DIRECTORY DataDirectory[NUMBEROF_DIRECTORY_ENTRIES];
+} OPTIONAL_HEADER, *P_OPTIONAL_HEADER;
+
+typedef struct {
+    DWORD   Characteristics;
+    DWORD   TimeDateStamp;
+    WORD    MajorVersion;
+    WORD    MinorVersion;
+    DWORD   Name;
+    DWORD   Base;
+    DWORD   NumberOfFunctions;
+    DWORD   NumberOfNames;
+    DWORD   AddressOfFunctions;     // RVA from base of image
+    DWORD   AddressOfNames;         // RVA from base of image
+    DWORD   AddressOfNameOrdinals;  // RVA from base of image
+} EXPORT_DIRECTORY, *P_EXPORT_DIRECTORY;
+
+
+void FreeNameFuncGlobals(void)
+{
+   if (p_Ordinals)
+      free(p_Ordinals);
+   if (p_Functions)
+      free(p_Functions);
+   if (p_Names)
+      free(p_Names);
+}
+
+
+void FgetString(char *str, FILE *bfp)
+{
+   char ch;
+
+   while ((ch = fgetc(bfp)) != EOF)
+   {
+      *str++ = ch;
+      if (ch == 0)
+         break;
+   }
+}
+
+
+int main(int argc, char *argv[])
+{
+   FILE *bfp;
+   char filename[80];
+   BOOL extended = FALSE;
+   DOS_HEADER dos_header;
+   LONG nt_signature;
+   PE_HEADER pe_header;
+   SECTION_HEADER section_header;
+   BOOL edata_found;
+   OPTIONAL_HEADER optional_header;
+   LONG edata_offset;
+   LONG edata_delta;
+   EXPORT_DIRECTORY export_directory;
+   LONG name_offset;
+   LONG ordinal_offset;
+   LONG function_offset;
+   char function_name[256];
+   int i, index;
+   BOOL error;
+   //char msg[80];
+
+
+   if (argc < 2)
+   {
+      printf("usage: exports [-e] filename.dll\n");
+      return -1;
+   }
+
+   if (argc > 2)
+   {
+      if (argv[1][0] == '-')
+      {
+         if (argv[1][1] == 'e')
+         {
+            strcpy(filename, argv[2]);
+            extended = TRUE;
+         }
+         else
+         {
+            printf("unknown option \"%s\"\n\n", argv[1]);
+            printf("usage: exports [-e] filename.dll\n");
+            return -1;
+         }
+      }
+      else
+      {
+         printf("usage: exports [-e] filename.dll\n");
+         return -1;
+      }
+   }
+   else
+      strcpy(filename, argv[1]);
+
+   if ((bfp=fopen(filename, "rb")) == NULL)
+   {
+      printf("DLL file %s not found!", filename);
+      return -1;
+   }
+
+   if (fread(&dos_header, sizeof(dos_header), 1, bfp) != 1)
+   {
+      printf("%s is NOT a valid DLL file!", filename);
+      return -1;
+   }
+
+   if (dos_header.e_magic != DOS_SIGNATURE)
+   {
+      printf("file does not have a valid DLL signature!");
+      return -1;
+   }
+
+   if (fseek(bfp, dos_header.e_lfanew, SEEK_SET) == -1)
+   {
+      printf("error seeking to new exe header!");
+      return -1;
+   }
+
+   if (fread(&nt_signature, sizeof(nt_signature), 1, bfp) != 1)
+   {
+      printf("file does not have a valid NT signature!");
+      return -1;
+   }
+
+   if (nt_signature != NT_SIGNATURE)
+   {
+      printf("file does not have a valid NT signature!");
+      return -1;
+   }
+
+   if (fread(&pe_header, sizeof(pe_header), 1, bfp) != 1)
+   {
+      printf("file does not have a valid PE header!");
+      return -1;
+   }
+
+   if (pe_header.SizeOfOptionalHeader == 0)
+   {
+      printf("file does not have an optional header!");
+      return -1;
+   }
+
+   if (fread(&optional_header, sizeof(optional_header), 1, bfp) != 1)
+   {
+      printf("file does not have a valid optional header!");
+      return -1;
+   }
+
+   edata_found = FALSE;
+
+   for (i=0; i < pe_header.NumberOfSections; i++)
+   {
+      if (fread(&section_header, sizeof(section_header), 1, bfp) != 1)
+      {
+         printf("error reading section header!");
+         return -1;
+      }
+
+      if (strcmp((char *)section_header.Name, ".edata") == 0)
+      {
+         edata_found = TRUE;
+         break;
+      }
+   }
+
+   if (edata_found)
+   {
+      edata_offset = section_header.PointerToRawData;
+      edata_delta = section_header.VirtualAddress - section_header.PointerToRawData; 
+   }
+   else
+   {
+      edata_offset = optional_header.DataDirectory[0].VirtualAddress;
+      edata_delta = 0L;
+   }
+
+
+   if (fseek(bfp, edata_offset, SEEK_SET) == -1)
+   {
+      printf("file does not have a valid exports section!");
+      return -1;
+   }
+
+   if (fread(&export_directory, sizeof(export_directory), 1, bfp) != 1)
+   {
+      printf("file does not have a valid optional header!");
+      return -1;
+   }
+
+   num_ordinals = export_directory.NumberOfNames;  // also number of ordinals
+
+
+   ordinal_offset = export_directory.AddressOfNameOrdinals - edata_delta;
+
+   if (fseek(bfp, ordinal_offset, SEEK_SET) == -1)
+   {
+      printf("file does not have a valid ordinals section!");
+      return -1;
+   }
+
+   if ((p_Ordinals = (WORD *)malloc(num_ordinals * sizeof(WORD))) == NULL)
+   {
+      printf("error allocating memory for ordinals section!");
+      return -1;
+   }
+
+   if (fread(p_Ordinals, num_ordinals * sizeof(WORD), 1, bfp) != 1)
+   {
+      FreeNameFuncGlobals();
+
+      printf("error reading ordinals table!");
+      return -1;
+   }
+
+
+   function_offset = export_directory.AddressOfFunctions - edata_delta;
+
+   if (fseek(bfp, function_offset, SEEK_SET) == -1)
+   {
+      FreeNameFuncGlobals();
+
+      printf("file does not have a valid export address section!");
+      return -1;
+   }
+
+   if ((p_Functions = (DWORD *)malloc(num_ordinals * sizeof(DWORD))) == NULL)
+   {
+      FreeNameFuncGlobals();
+
+      printf("error allocating memory for export address section!");
+      return -1;
+   }
+
+   if (fread(p_Functions, num_ordinals * sizeof(DWORD), 1, bfp) != 1)
+   {
+      FreeNameFuncGlobals();
+
+      printf("error reading export address section!");
+      return -1;
+   }
+
+
+   name_offset = export_directory.AddressOfNames - edata_delta;
+
+   if (fseek(bfp, name_offset, SEEK_SET) == -1)
+   {
+      FreeNameFuncGlobals();
+
+      printf("file does not have a valid names section!");
+      return -1;
+   }
+
+   if ((p_Names = (DWORD *)malloc(num_ordinals * sizeof(DWORD))) == NULL)
+   {
+      FreeNameFuncGlobals();
+
+      printf("error allocating memory for names section!");
+      return -1;
+   }
+
+   if (fread(p_Names, num_ordinals * sizeof(DWORD), 1, bfp) != 1)
+   {
+      FreeNameFuncGlobals();
+
+      printf("error reading names table!");
+      return -1;
+   }
+
+   error = FALSE;
+
+   for (i=0; (i < num_ordinals) && (error==FALSE); i++)
+   {
+      name_offset = p_Names[i] - edata_delta;
+
+      if (name_offset != 0)
+      {
+         if (fseek(bfp, name_offset, SEEK_SET) == -1)
+         {
+            printf("error in loading names section!\n");
+            error = TRUE;
+         }
+         else
+         {
+            FgetString(function_name, bfp);
+
+            if (extended)
+            {
+               index = p_Ordinals[i];
+
+               printf("ordinal=%3d addr=%08lX name=%s\n",
+                   (p_Ordinals[i]+1), p_Functions[index], function_name);
+            }
+            else
+               printf("%s\n", function_name);
+         }
+      }
+   }
+
+   FreeNameFuncGlobals();
+
+   fclose(bfp);
+
+   return 0;
+}
+
+
diff --git a/main/source/HPB_bot/exports/exports.dsp b/main/source/HPB_bot/exports/exports.dsp
new file mode 100644
index 00000000..65382224
--- /dev/null
+++ b/main/source/HPB_bot/exports/exports.dsp
@@ -0,0 +1,100 @@
+# Microsoft Developer Studio Project File - Name="exports" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=exports - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "exports.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "exports.mak" CFG="exports - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "exports - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "exports - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "exports - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "exports - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "exports - Win32 Release"
+# Name "exports - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\exports.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/main/source/Natural_Selection.ncb b/main/source/Natural_Selection.ncb
new file mode 100644
index 00000000..4b03f3fc
Binary files /dev/null and b/main/source/Natural_Selection.ncb differ
diff --git a/main/source/Natural_Selection.sln b/main/source/Natural_Selection.sln
new file mode 100644
index 00000000..d3f5c8bd
--- /dev/null
+++ b/main/source/Natural_Selection.sln
@@ -0,0 +1,92 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HPB_bot", "HPB_bot\dlls\HPB_bot.vcproj", "{44018A66-3207-4CAB-BD27-3C6C59014E21}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C57D57F4-74B2-401F-BE6A-30E2BF8146C2} = {C57D57F4-74B2-401F-BE6A-30E2BF8146C2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Textrep", "TEXTREP\Textrep.vcproj", "{CF72E070-32CA-408C-9890-2D92C6565DD9}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C57D57F4-74B2-401F-BE6A-30E2BF8146C2} = {C57D57F4-74B2-401F-BE6A-30E2BF8146C2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Util", "UTIL\Util.vcproj", "{C57D57F4-74B2-401F-BE6A-30E2BF8146C2}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cl_dll", "cl_dll\cl_dll.vcproj", "{4F2D8BCB-E519-4BD6-9E90-F9BD279A7F81}"
+	ProjectSection(ProjectDependencies) = postProject
+		{788F4843-CF73-4980-9A99-FBF840C359E5} = {788F4843-CF73-4980-9A99-FBF840C359E5}
+		{CF72E070-32CA-408C-9890-2D92C6565DD9} = {CF72E070-32CA-408C-9890-2D92C6565DD9}
+		{F3B3C199-350B-40B1-A6A9-BE5E7BC457AB} = {F3B3C199-350B-40B1-A6A9-BE5E7BC457AB}
+		{C03B17AC-8484-4453-843B-B38EBA7C5775} = {C03B17AC-8484-4453-843B-B38EBA7C5775}
+		{C57D57F4-74B2-401F-BE6A-30E2BF8146C2} = {C57D57F4-74B2-401F-BE6A-30E2BF8146C2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curllib", "curl\lib\curllib.vcproj", "{788F4843-CF73-4980-9A99-FBF840C359E5}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl", "dlls\hl.vcproj", "{FE9B1F1B-866D-4A5A-A303-FAEE34F90025}"
+	ProjectSection(ProjectDependencies) = postProject
+		{788F4843-CF73-4980-9A99-FBF840C359E5} = {788F4843-CF73-4980-9A99-FBF840C359E5}
+		{CF72E070-32CA-408C-9890-2D92C6565DD9} = {CF72E070-32CA-408C-9890-2D92C6565DD9}
+		{F3B3C199-350B-40B1-A6A9-BE5E7BC457AB} = {F3B3C199-350B-40B1-A6A9-BE5E7BC457AB}
+		{C03B17AC-8484-4453-843B-B38EBA7C5775} = {C03B17AC-8484-4453-843B-B38EBA7C5775}
+		{C57D57F4-74B2-401F-BE6A-30E2BF8146C2} = {C57D57F4-74B2-401F-BE6A-30E2BF8146C2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "particles", "particles\particles.vcproj", "{F3B3C199-350B-40B1-A6A9-BE5E7BC457AB}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "lua\lua.vcproj", "{C03B17AC-8484-4453-843B-B38EBA7C5775}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{44018A66-3207-4CAB-BD27-3C6C59014E21}.Debug.ActiveCfg = Debug|Win32
+		{44018A66-3207-4CAB-BD27-3C6C59014E21}.Debug.Build.0 = Debug|Win32
+		{44018A66-3207-4CAB-BD27-3C6C59014E21}.Release.ActiveCfg = Release|Win32
+		{44018A66-3207-4CAB-BD27-3C6C59014E21}.Release.Build.0 = Release|Win32
+		{CF72E070-32CA-408C-9890-2D92C6565DD9}.Debug.ActiveCfg = Debug|Win32
+		{CF72E070-32CA-408C-9890-2D92C6565DD9}.Debug.Build.0 = Debug|Win32
+		{CF72E070-32CA-408C-9890-2D92C6565DD9}.Release.ActiveCfg = Release|Win32
+		{CF72E070-32CA-408C-9890-2D92C6565DD9}.Release.Build.0 = Release|Win32
+		{C57D57F4-74B2-401F-BE6A-30E2BF8146C2}.Debug.ActiveCfg = Debug|Win32
+		{C57D57F4-74B2-401F-BE6A-30E2BF8146C2}.Debug.Build.0 = Debug|Win32
+		{C57D57F4-74B2-401F-BE6A-30E2BF8146C2}.Release.ActiveCfg = Release|Win32
+		{C57D57F4-74B2-401F-BE6A-30E2BF8146C2}.Release.Build.0 = Release|Win32
+		{4F2D8BCB-E519-4BD6-9E90-F9BD279A7F81}.Debug.ActiveCfg = Debug|Win32
+		{4F2D8BCB-E519-4BD6-9E90-F9BD279A7F81}.Debug.Build.0 = Debug|Win32
+		{4F2D8BCB-E519-4BD6-9E90-F9BD279A7F81}.Release.ActiveCfg = Release|Win32
+		{4F2D8BCB-E519-4BD6-9E90-F9BD279A7F81}.Release.Build.0 = Release|Win32
+		{788F4843-CF73-4980-9A99-FBF840C359E5}.Debug.ActiveCfg = Debug|Win32
+		{788F4843-CF73-4980-9A99-FBF840C359E5}.Debug.Build.0 = Debug|Win32
+		{788F4843-CF73-4980-9A99-FBF840C359E5}.Release.ActiveCfg = Release|Win32
+		{788F4843-CF73-4980-9A99-FBF840C359E5}.Release.Build.0 = Release|Win32
+		{FE9B1F1B-866D-4A5A-A303-FAEE34F90025}.Debug.ActiveCfg = Debug|Win32
+		{FE9B1F1B-866D-4A5A-A303-FAEE34F90025}.Debug.Build.0 = Debug|Win32
+		{FE9B1F1B-866D-4A5A-A303-FAEE34F90025}.Release.ActiveCfg = Release|Win32
+		{FE9B1F1B-866D-4A5A-A303-FAEE34F90025}.Release.Build.0 = Release|Win32
+		{F3B3C199-350B-40B1-A6A9-BE5E7BC457AB}.Debug.ActiveCfg = Debug|Win32
+		{F3B3C199-350B-40B1-A6A9-BE5E7BC457AB}.Debug.Build.0 = Debug|Win32
+		{F3B3C199-350B-40B1-A6A9-BE5E7BC457AB}.Release.ActiveCfg = Release|Win32
+		{F3B3C199-350B-40B1-A6A9-BE5E7BC457AB}.Release.Build.0 = Release|Win32
+		{C03B17AC-8484-4453-843B-B38EBA7C5775}.Debug.ActiveCfg = Debug|Win32
+		{C03B17AC-8484-4453-843B-B38EBA7C5775}.Debug.Build.0 = Debug|Win32
+		{C03B17AC-8484-4453-843B-B38EBA7C5775}.Release.ActiveCfg = Release|Win32
+		{C03B17AC-8484-4453-843B-B38EBA7C5775}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionItems) = postSolution
+		..\Balance.txt = ..\Balance.txt
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/main/source/Natural_Selection.suo b/main/source/Natural_Selection.suo
new file mode 100644
index 00000000..4053953d
Binary files /dev/null and b/main/source/Natural_Selection.suo differ
diff --git a/main/source/build.h b/main/source/build.h
new file mode 100644
index 00000000..6dd57dd1
--- /dev/null
+++ b/main/source/build.h
@@ -0,0 +1,107 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: build.h $
+// $Date: 2002/11/22 22:09:10 $
+//
+//-------------------------------------------------------------------------------
+// $Log: build.h,v $
+// Revision 1.17  2002/11/22 22:09:10  Flayra
+// - Updated version #
+//
+// Revision 1.16  2002/11/22 21:07:55  Flayra
+// - Removed dev build, use DEBUG instead
+//
+// Revision 1.15  2002/11/15 19:09:57  Flayra
+// - Reworked network metering to be easily toggleable
+//
+// Revision 1.14  2002/11/12 02:20:25  Flayra
+// - Updated version number
+//
+// Revision 1.13  2002/11/06 01:37:07  Flayra
+// - Regular update
+//
+// Revision 1.12  2002/11/03 04:54:45  Flayra
+// - Regular update
+//
+// Revision 1.11  2002/10/24 21:09:04  Flayra
+// - No longer needed
+//
+// Revision 1.10  2002/10/20 16:33:31  Flayra
+// - Regular update
+//
+// Revision 1.9  2002/10/16 20:48:18  Flayra
+// - Regular update
+//
+// Revision 1.8  2002/10/03 19:07:12  Flayra
+// - Profiling switch
+// - Regular game version update
+//
+// Revision 1.7  2002/09/23 21:51:39  Flayra
+// - Regular update
+//
+// Revision 1.6  2002/09/09 19:38:34  Flayra
+// - Tried implementing DirectX version of gamma ramp support
+//
+// Revision 1.5  2002/08/16 02:21:37  Flayra
+// - Re-enabled selection
+//
+// Revision 1.4  2002/08/09 00:14:59  Flayra
+// - Removed selection prediction
+//
+// Revision 1.3  2002/05/23 02:41:53  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef BUILD_H
+#define BUILD_H
+
+// Build options
+#define CLIENT_WEAPONS
+#define AVH_PREDICT_SELECT
+
+// Build in code to help playtest.  Choose neither, AVH_PLAYTEST_BUILD, or AVH_PLAYTEST_BUILD _and_ AVH_LAN_PLAYTEST_BUILD
+#ifdef DEBUG
+#define AVH_PLAYTEST_BUILD
+//#define AVH_LAN_PLAYTEST_BUILD
+#endif
+
+// Build in code for security.  This forces the server to uplink and only allows authenticated players to join the server.
+//#ifndef DEBUG
+//#define AVH_SECURE_PRERELEASE_BUILD
+//#endif
+
+// When you're doing a final secure build of your client .dll and you're ready to
+// send the binary to Valve to be processed, you need to change this to 1 and rebuild
+//#define FINAL_VAC_BUILD
+
+// Define this when debugging on a different machine in a "live" environment (ie, trying to catch crashes)
+//#define AVH_EXTERNAL_BUILD
+
+//#define USE_DIRECTX_8
+
+// May not be working completely
+//#define SKULK_VIEW_ROTATION
+
+// Mapper build?
+//#define AVH_MAPPER_BUILD
+
+// Sends profiling info to log
+//#define PROFILE_BUILD
+
+// Use multiple weapons sounds for upgrades
+//#define AVH_UPGRADE_SOUNDS
+
+// Define to track and meter network messages, don't define to use basic HL networking
+//#define USE_NETWORK_METERING
+
+// Define to have server report server and player data to master server
+//#define USE_UPP
+
+#endif
\ No newline at end of file
diff --git a/main/source/cl_dll/CLabelHeader.h b/main/source/cl_dll/CLabelHeader.h
new file mode 100644
index 00000000..259a79b3
--- /dev/null
+++ b/main/source/cl_dll/CLabelHeader.h
@@ -0,0 +1,193 @@
+#ifndef CLABELHEADER_H
+#define CLABELHEADER_H
+
+#include<VGUI_TextImage.h>
+#include "cl_dll/vgui_TeamFortressViewport.h"
+
+class CTextImage2 : public Image
+{
+public:
+	CTextImage2()
+	{
+		_image[0] = new TextImage("");
+		_image[1] = new TextImage("");
+	}
+	
+	~CTextImage2()
+	{
+		delete _image[0];
+		delete _image[1];
+	}
+	
+	TextImage *GetImage(int image)
+	{
+		return _image[image];
+	}
+	
+	void getSize(int &wide, int &tall)
+	{
+		int w1, w2, t1, t2;
+		_image[0]->getTextSize(w1, t1);
+		_image[1]->getTextSize(w2, t2);
+		
+		wide = w1 + w2;
+		tall = max(t1, t2);
+		setSize(wide, tall);
+	}
+	
+	void doPaint(Panel *panel)
+	{
+		_image[0]->doPaint(panel);
+		_image[1]->doPaint(panel);
+	}
+	
+	void setPos(int x, int y)
+	{
+		_image[0]->setPos(x, y);
+		
+		int swide, stall;
+		_image[0]->getSize(swide, stall);
+		
+		int wide, tall;
+		_image[1]->getSize(wide, tall);
+		_image[1]->setPos(x + wide, y + (stall * 0.9) - tall);
+	}
+	
+	void setColor(Color color)
+	{
+		_image[0]->setColor(color);
+	}
+	
+	void setColor2(Color color)
+	{
+		_image[1]->setColor(color);
+	}
+	
+private:
+	TextImage *_image[2];
+	
+};
+
+class CLabelHeader : public Label
+{
+public:
+	CLabelHeader() : Label("")
+	{
+		_dualImage = new CTextImage2();
+		_dualImage->setColor2(Color(255, 170, 0, 0));
+		_row = -2;
+		_useFgColorAsImageColor = true;
+		_offset[0] = 0;
+		_offset[1] = 0;
+	}
+
+	~CLabelHeader()
+	{
+		delete _dualImage;
+	}
+
+	void setRow(int row)
+	{
+		_row = row;
+	}
+
+	void setFgColorAsImageColor(bool state)
+	{
+		_useFgColorAsImageColor = state;
+	}
+
+	virtual void setText(int textBufferLen, const char* text)
+	{
+		_dualImage->GetImage(0)->setText(text);
+
+		// calculate the text size
+		Font *font = _dualImage->GetImage(0)->getFont();
+		_gap = 0;
+		for (const char *ch = text; *ch != 0; ch++)
+		{
+			int a, b, c;
+			font->getCharABCwide(*ch, a, b, c);
+			_gap += (a + b + c);
+		}
+
+		_gap += XRES(5);
+	}
+
+	virtual void setText(const char* text)
+	{
+		// strip any non-alnum characters from the end
+		char buf[512];
+		strcpy(buf, text);
+
+		int len = strlen(buf);
+		while (len && isspace(buf[--len]))
+		{
+			buf[len] = 0;
+		}
+
+		CLabelHeader::setText(0, buf);
+	}
+
+	void setText2(const char *text)
+	{
+		_dualImage->GetImage(1)->setText(text);
+	}
+
+	void getTextSize(int &wide, int &tall)
+	{
+		_dualImage->getSize(wide, tall);
+	}
+
+	void setFgColor(int r,int g,int b,int a)
+	{
+		Label::setFgColor(r,g,b,a);
+		Color color(r,g,b,a);
+		_dualImage->setColor(color);
+		_dualImage->setColor2(color);
+		if (_image && _useFgColorAsImageColor)
+		{
+			_image->setColor(color);
+		}
+		repaint();
+	}
+
+	void setFgColor(Scheme::SchemeColor sc)
+	{
+		int r, g, b, a;
+		Label::setFgColor(sc);
+		Label::getFgColor( r, g, b, a );
+
+		// Call the r,g,b,a version so it sets the color in the dualImage..
+		setFgColor( r, g, b, a );
+	}
+
+	void setFont(Font *font)
+	{
+		_dualImage->GetImage(0)->setFont(font);
+	}
+
+	void setFont2(Font *font)
+	{
+		_dualImage->GetImage(1)->setFont(font);
+	}
+
+	// this adjust the absolute position of the text after alignment is calculated
+	void setTextOffset(int x, int y)
+	{
+		_offset[0] = x;
+		_offset[1] = y;
+	}
+
+	void paint();
+	void paintBackground();
+	void calcAlignment(int iwide, int itall, int &x, int &y);
+
+private:
+	CTextImage2 *_dualImage;
+	int _row;
+	int _gap;
+	int _offset[2];
+	bool _useFgColorAsImageColor;
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/cl_dll/GameStudioModelRenderer.cpp b/main/source/cl_dll/GameStudioModelRenderer.cpp
new file mode 100644
index 00000000..e5e9ebc0
--- /dev/null
+++ b/main/source/cl_dll/GameStudioModelRenderer.cpp
@@ -0,0 +1,116 @@
+#include <assert.h>
+#include "hud.h"
+#include "cl_util.h"
+#include "const.h"
+#include "com_model.h"
+#include "studio.h"
+#include "entity_state.h"
+#include "cl_entity.h"
+#include "dlight.h"
+#include "triangleapi.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <memory.h>
+#include <math.h>
+
+#include "studio_util.h"
+#include "r_studioint.h"
+
+#include "StudioModelRenderer.h"
+#include "GameStudioModelRenderer.h"
+
+#include "engine/APIProxy.h"
+#include "cl_dll/Exports.h"
+
+//
+// Override the StudioModelRender virtual member functions here to implement custom bone
+//  setup, blending, etc.
+//
+
+// Global engine <-> studio model rendering code interface
+extern engine_studio_api_t IEngineStudio;
+
+// The renderer object, created on the stack.
+CGameStudioModelRenderer g_StudioRenderer;
+/*
+====================
+CGameStudioModelRenderer
+
+====================
+*/
+CGameStudioModelRenderer::CGameStudioModelRenderer( void )
+{
+}
+
+////////////////////////////////////
+// Hooks to class implementation
+////////////////////////////////////
+
+/*
+====================
+R_StudioDrawPlayer
+
+====================
+*/
+int R_StudioDrawPlayer( int flags, entity_state_t *pplayer )
+{
+	return g_StudioRenderer.StudioDrawPlayer( flags, pplayer );
+}
+
+/*
+====================
+R_StudioDrawModel
+
+====================
+*/
+int R_StudioDrawModel( int flags )
+{
+	return g_StudioRenderer.StudioDrawModel( flags );
+}
+
+/*
+====================
+R_StudioInit
+
+====================
+*/
+void R_StudioInit( void )
+{
+	g_StudioRenderer.Init();
+}
+
+// The simple drawing interface we'll pass back to the engine
+r_studio_interface_t studio =
+{
+	STUDIO_INTERFACE_VERSION,
+	R_StudioDrawModel,
+	R_StudioDrawPlayer,
+};
+
+/*
+====================
+HUD_GetStudioModelInterface
+
+Export this function for the engine to use the studio renderer class to render objects.
+====================
+*/
+extern "C" int CL_DLLEXPORT HUD_GetStudioModelInterface( int version, struct r_studio_interface_s **ppinterface, struct engine_studio_api_s *pstudio )
+{
+	RecClStudioInterface(version, ppinterface, pstudio);
+	
+	if ( version != STUDIO_INTERFACE_VERSION )
+		return 0;
+
+	// Point the engine to our callbacks
+	*ppinterface = &studio;
+
+	// Copy in engine helper functions
+	memcpy( &IEngineStudio, pstudio, sizeof( IEngineStudio ) );
+
+	// Initialize local variables, etc.
+	R_StudioInit();
+
+	// Success
+	return 1;
+}
diff --git a/main/source/cl_dll/GameStudioModelRenderer.h b/main/source/cl_dll/GameStudioModelRenderer.h
new file mode 100644
index 00000000..92c596e6
--- /dev/null
+++ b/main/source/cl_dll/GameStudioModelRenderer.h
@@ -0,0 +1,19 @@
+#if !defined( GAMESTUDIOMODELRENDERER_H )
+#define GAMESTUDIOMODELRENDERER_H
+#if defined( _WIN32 )
+#pragma once
+#endif
+
+/*
+====================
+CGameStudioModelRenderer
+
+====================
+*/
+class CGameStudioModelRenderer : public CStudioModelRenderer
+{
+public:
+	CGameStudioModelRenderer( void );
+};
+
+#endif // GAMESTUDIOMODELRENDERER_H
\ No newline at end of file
diff --git a/main/source/cl_dll/GameStudioModelRenderer_Sample.cpp b/main/source/cl_dll/GameStudioModelRenderer_Sample.cpp
new file mode 100644
index 00000000..d9592b05
--- /dev/null
+++ b/main/source/cl_dll/GameStudioModelRenderer_Sample.cpp
@@ -0,0 +1,985 @@
+#include <assert.h>
+#include "hud.h"
+#include "cl_util.h"
+#include "const.h"
+#include "com_model.h"
+#include "studio.h"
+#include "entity_state.h"
+#include "cl_entity.h"
+#include "dlight.h"
+#include "triangleapi.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <memory.h>
+#include <math.h>
+
+#include "studio_util.h"
+#include "r_studioint.h"
+
+#include "StudioModelRenderer.h"
+#include "GameStudioModelRenderer.h"
+
+// Predicted values saved off in hl_weapons.cpp
+void Game_GetSequence( int *seq, int *gaitseq );
+void Game_GetOrientation( float *o, float *a );
+
+float g_flStartScaleTime;
+int iPrevRenderState;
+int iRenderStateChanged;
+
+// Global engine <-> studio model rendering code interface
+extern engine_studio_api_t IEngineStudio;
+
+typedef struct
+{
+	vec3_t		origin;
+	vec3_t		angles;
+
+	vec3_t		realangles;
+
+	float		animtime;
+	float		frame;
+	int			sequence;
+	int			gaitsequence;
+	float		framerate;
+
+	int			m_fSequenceLoops;
+	int			m_fSequenceFinished;
+
+	byte		controller[ 4 ];
+	byte		blending[ 2 ];
+
+	latchedvars_t	lv;
+} client_anim_state_t;
+
+static client_anim_state_t g_state;
+static client_anim_state_t g_clientstate;
+
+// The renderer object, created on the stack.
+CGameStudioModelRenderer g_StudioRenderer;
+/*
+====================
+CGameStudioModelRenderer
+
+====================
+*/
+CGameStudioModelRenderer::CGameStudioModelRenderer( void )
+{
+	// If you want to predict animations locally, set this to TRUE
+	// NOTE:  The animation code is somewhat broken, but gives you a sense for how
+	//  to do client side animation of the predicted player in a third person game.
+	m_bLocal = false;
+}
+
+/*
+====================
+StudioSetupBones
+
+====================
+*/
+void CGameStudioModelRenderer::StudioSetupBones ( void )
+{
+	int					i;
+	double				f;
+
+	mstudiobone_t		*pbones;
+	mstudioseqdesc_t	*pseqdesc;
+	mstudioanim_t		*panim;
+
+	static float		pos[MAXSTUDIOBONES][3];
+	static vec4_t		q[MAXSTUDIOBONES];
+	float				bonematrix[3][4];
+
+	static float		pos2[MAXSTUDIOBONES][3];
+	static vec4_t		q2[MAXSTUDIOBONES];
+	static float		pos3[MAXSTUDIOBONES][3];
+	static vec4_t		q3[MAXSTUDIOBONES];
+	static float		pos4[MAXSTUDIOBONES][3];
+	static vec4_t		q4[MAXSTUDIOBONES];
+
+	// Use default bone setup for nonplayers
+	if ( !m_pCurrentEntity->player )
+	{
+		CStudioModelRenderer::StudioSetupBones();
+		return;
+	}
+
+	// Bound sequence number.
+	if ( m_pCurrentEntity->curstate.sequence >= m_pStudioHeader->numseq ) 
+	{
+		m_pCurrentEntity->curstate.sequence = 0;
+	}
+
+	pseqdesc = (mstudioseqdesc_t *)((byte *)m_pStudioHeader + m_pStudioHeader->seqindex) + m_pCurrentEntity->curstate.sequence;
+
+	if ( m_pPlayerInfo && m_pPlayerInfo->gaitsequence != 0 )
+	{
+		f = m_pPlayerInfo->gaitframe;
+	}
+	else 
+	{
+		f = StudioEstimateFrame( pseqdesc );
+	}
+
+	// This game knows how to do three way blending
+	if ( pseqdesc->numblends == 3 )
+	{
+		float				s;
+
+		// Get left anim
+		panim = StudioGetAnim( m_pRenderModel, pseqdesc );
+
+		// Blending is 0-127 == Left to Middle, 128 to 255 == Middle to right
+		if ( m_pCurrentEntity->curstate.blending[0] <= 127 )
+		{
+			StudioCalcRotations( pos, q, pseqdesc, panim, f );
+			
+			// Scale 0-127 blending up to 0-255
+			s = m_pCurrentEntity->curstate.blending[0];
+			s = ( s * 2.0 );
+		}
+		else
+		{
+			
+			// Skip ahead to middle
+			panim += m_pStudioHeader->numbones;
+
+			StudioCalcRotations( pos, q, pseqdesc, panim, f );
+
+			// Scale 127-255 blending up to 0-255
+			s = m_pCurrentEntity->curstate.blending[0];
+			s = 2.0 * ( s - 127.0 );
+		}
+
+		// Normalize interpolant
+		s /= 255.0;
+
+		// Go to middle or right
+		panim += m_pStudioHeader->numbones;
+
+		StudioCalcRotations( pos2, q2, pseqdesc, panim, f );
+
+		// Spherically interpolate the bones
+		StudioSlerpBones( q, pos, q2, pos2, s );
+	}
+	else
+	{
+		panim = StudioGetAnim( m_pRenderModel, pseqdesc );
+		StudioCalcRotations( pos, q, pseqdesc, panim, f );
+	}
+
+	// Are we in the process of transitioning from one sequence to another.
+	if ( m_fDoInterp &&
+		m_pCurrentEntity->latched.sequencetime &&
+		( m_pCurrentEntity->latched.sequencetime + 0.2 > m_clTime ) && 
+		( m_pCurrentEntity->latched.prevsequence < m_pStudioHeader->numseq ))
+	{
+		// blend from last sequence
+		static float		pos1b[MAXSTUDIOBONES][3];
+		static vec4_t		q1b[MAXSTUDIOBONES];
+		float				s;
+
+		// Blending value into last sequence
+		unsigned char prevseqblending = m_pCurrentEntity->latched.prevseqblending[ 0 ];
+
+		// Point at previous sequenece
+		pseqdesc = (mstudioseqdesc_t *)((byte *)m_pStudioHeader + m_pStudioHeader->seqindex) + m_pCurrentEntity->latched.prevsequence;
+		
+		// Know how to do three way blends
+		if ( pseqdesc->numblends == 3 )
+		{
+			float				s;
+
+			// Get left animation
+			panim = StudioGetAnim( m_pRenderModel, pseqdesc );
+
+			if ( prevseqblending <= 127 )
+			{
+				// Set up bones based on final frame of previous sequence
+				StudioCalcRotations( pos1b, q1b, pseqdesc, panim, m_pCurrentEntity->latched.prevframe );
+				
+				s = prevseqblending;
+				s = ( s * 2.0 );
+			}
+			else
+			{
+				// Skip to middle blend
+				panim += m_pStudioHeader->numbones;
+
+				StudioCalcRotations( pos1b, q1b, pseqdesc, panim, m_pCurrentEntity->latched.prevframe );
+
+				s = prevseqblending;
+				s = 2.0 * ( s - 127.0 );
+			}
+
+			// Normalize
+			s /= 255.0;
+
+			panim += m_pStudioHeader->numbones;
+			StudioCalcRotations( pos2, q2, pseqdesc, panim, m_pCurrentEntity->latched.prevframe );
+
+			// Interpolate bones
+			StudioSlerpBones( q1b, pos1b, q2, pos2, s );
+		}
+		else
+		{
+			panim = StudioGetAnim( m_pRenderModel, pseqdesc );
+			// clip prevframe
+			StudioCalcRotations( pos1b, q1b, pseqdesc, panim, m_pCurrentEntity->latched.prevframe );
+		}
+
+		// Now blend last frame of previous sequence with current sequence.
+		s = 1.0 - (m_clTime - m_pCurrentEntity->latched.sequencetime) / 0.2;
+		StudioSlerpBones( q, pos, q1b, pos1b, s );
+	}
+	else
+	{
+		m_pCurrentEntity->latched.prevframe = f;
+	}
+
+	// Now convert quaternions and bone positions into matrices
+	pbones = (mstudiobone_t *)((byte *)m_pStudioHeader + m_pStudioHeader->boneindex);
+
+	for (i = 0; i < m_pStudioHeader->numbones; i++) 
+	{
+		QuaternionMatrix( q[i], bonematrix );
+
+		bonematrix[0][3] = pos[i][0];
+		bonematrix[1][3] = pos[i][1];
+		bonematrix[2][3] = pos[i][2];
+
+		if (pbones[i].parent == -1) 
+		{
+			if ( IEngineStudio.IsHardware() )
+			{
+				ConcatTransforms ((*m_protationmatrix), bonematrix, (*m_pbonetransform)[i]);
+				ConcatTransforms ((*m_protationmatrix), bonematrix, (*m_plighttransform)[i]);
+			}
+			else
+			{
+				ConcatTransforms ((*m_paliastransform), bonematrix, (*m_pbonetransform)[i]);
+				ConcatTransforms ((*m_protationmatrix), bonematrix, (*m_plighttransform)[i]);
+			}
+
+			// Apply client-side effects to the transformation matrix
+			StudioFxTransform( m_pCurrentEntity, (*m_pbonetransform)[i] );
+		} 
+		else 
+		{
+			ConcatTransforms ((*m_pbonetransform)[pbones[i].parent], bonematrix, (*m_pbonetransform)[i]);
+			ConcatTransforms ((*m_plighttransform)[pbones[i].parent], bonematrix, (*m_plighttransform)[i]);
+		}
+	}
+}
+
+/*
+====================
+StudioEstimateGait
+
+====================
+*/
+void CGameStudioModelRenderer::StudioEstimateGait( entity_state_t *pplayer )
+{
+	float dt;
+	vec3_t est_velocity;
+
+	dt = (m_clTime - m_clOldTime);
+	dt = max( 0.0, dt );
+	dt = min( 1.0, dt );
+
+	if (dt == 0 || m_pPlayerInfo->renderframe == m_nFrameCount)
+	{
+		m_flGaitMovement = 0;
+		return;
+	}
+
+	// VectorAdd( pplayer->velocity, pplayer->prediction_error, est_velocity );
+	if ( m_fGaitEstimation )
+	{
+		VectorSubtract( m_pCurrentEntity->origin, m_pPlayerInfo->prevgaitorigin, est_velocity );
+		VectorCopy( m_pCurrentEntity->origin, m_pPlayerInfo->prevgaitorigin );
+		m_flGaitMovement = Length( est_velocity );
+		if (dt <= 0 || m_flGaitMovement / dt < 5)
+		{
+			m_flGaitMovement = 0;
+			est_velocity[0] = 0;
+			est_velocity[1] = 0;
+		}
+	}
+	else
+	{
+		VectorCopy( pplayer->velocity, est_velocity );
+		m_flGaitMovement = Length( est_velocity ) * dt;
+	}
+
+	if (est_velocity[1] == 0 && est_velocity[0] == 0)
+	{
+		float flYawDiff = m_pCurrentEntity->angles[YAW] - m_pPlayerInfo->gaityaw;
+		flYawDiff = flYawDiff - (int)(flYawDiff / 360) * 360;
+		if (flYawDiff > 180)
+			flYawDiff -= 360;
+		if (flYawDiff < -180)
+			flYawDiff += 360;
+
+		if (dt < 0.25)
+			flYawDiff *= dt * 4;
+		else
+			flYawDiff *= dt;
+
+		m_pPlayerInfo->gaityaw += flYawDiff;
+		m_pPlayerInfo->gaityaw = m_pPlayerInfo->gaityaw - (int)(m_pPlayerInfo->gaityaw / 360) * 360;
+
+		m_flGaitMovement = 0;
+	}
+	else
+	{
+		m_pPlayerInfo->gaityaw = (atan2(est_velocity[1], est_velocity[0]) * 180 / M_PI);
+		if (m_pPlayerInfo->gaityaw > 180)
+			m_pPlayerInfo->gaityaw = 180;
+		if (m_pPlayerInfo->gaityaw < -180)
+			m_pPlayerInfo->gaityaw = -180;
+	}
+
+}
+
+/*
+====================
+StudioProcessGait
+
+====================
+*/
+void CGameStudioModelRenderer::StudioProcessGait( entity_state_t *pplayer )
+{
+	mstudioseqdesc_t	*pseqdesc;
+	float dt;
+	float flYaw;	 // view direction relative to movement
+
+	pseqdesc = (mstudioseqdesc_t *)((byte *)m_pStudioHeader + m_pStudioHeader->seqindex) + m_pCurrentEntity->curstate.sequence;
+
+	m_pCurrentEntity->angles[PITCH] = 0;
+	m_pCurrentEntity->latched.prevangles[PITCH] = m_pCurrentEntity->angles[PITCH];
+
+	dt = (m_clTime - m_clOldTime);
+	dt = max( 0.0, dt );
+	dt = min( 1.0, dt );
+
+	StudioEstimateGait( pplayer );
+
+	// calc side to side turning
+	flYaw = m_pCurrentEntity->angles[YAW] - m_pPlayerInfo->gaityaw;
+
+	flYaw = fmod( flYaw, 360.0 );
+
+	if (flYaw < -180)
+	{
+		flYaw = flYaw + 360;
+	}
+	else if (flYaw > 180)
+	{
+		flYaw = flYaw - 360;
+	}
+
+	float maxyaw = 120.0;
+
+	if (flYaw > maxyaw)
+	{
+		m_pPlayerInfo->gaityaw = m_pPlayerInfo->gaityaw - 180;
+		m_flGaitMovement = -m_flGaitMovement;
+		flYaw = flYaw - 180;
+	}
+	else if (flYaw < -maxyaw)
+	{
+		m_pPlayerInfo->gaityaw = m_pPlayerInfo->gaityaw + 180;
+		m_flGaitMovement = -m_flGaitMovement;
+		flYaw = flYaw + 180;
+	}
+
+	float blend_yaw = ( flYaw / 90.0 ) * 128.0 + 127.0;
+	blend_yaw = min( 255.0, blend_yaw );
+	blend_yaw = max( 0.0, blend_yaw );
+	
+	blend_yaw = 255.0 - blend_yaw;
+
+	m_pCurrentEntity->curstate.blending[0] = (int)(blend_yaw);
+	m_pCurrentEntity->latched.prevblending[0] = m_pCurrentEntity->curstate.blending[0];
+	m_pCurrentEntity->latched.prevseqblending[0] = m_pCurrentEntity->curstate.blending[0];
+
+	m_pCurrentEntity->angles[YAW] = m_pPlayerInfo->gaityaw;
+	if (m_pCurrentEntity->angles[YAW] < -0)
+	{
+		m_pCurrentEntity->angles[YAW] += 360;
+	}
+	m_pCurrentEntity->latched.prevangles[YAW] = m_pCurrentEntity->angles[YAW];
+
+	pseqdesc = (mstudioseqdesc_t *)((byte *)m_pStudioHeader + m_pStudioHeader->seqindex) + pplayer->gaitsequence;
+	
+	// Calc gait frame
+	if (pseqdesc->linearmovement[0] > 0)
+	{
+		m_pPlayerInfo->gaitframe += (m_flGaitMovement / pseqdesc->linearmovement[0]) * pseqdesc->numframes;
+	}
+	else
+	{
+		m_pPlayerInfo->gaitframe += pseqdesc->fps * dt * m_pCurrentEntity->curstate.framerate;
+	}
+
+	// Do modulo
+	m_pPlayerInfo->gaitframe = m_pPlayerInfo->gaitframe - (int)(m_pPlayerInfo->gaitframe / pseqdesc->numframes) * pseqdesc->numframes;
+	if (m_pPlayerInfo->gaitframe < 0)
+	{
+		m_pPlayerInfo->gaitframe += pseqdesc->numframes;
+	}
+}
+
+/*
+==============================
+SavePlayerState
+
+For local player, in third person, we need to store real render data and then
+  setup for with fake/client side animation data
+==============================
+*/
+void CGameStudioModelRenderer::SavePlayerState( entity_state_t *pplayer )
+{
+	client_anim_state_t *st;
+	cl_entity_t *ent = IEngineStudio.GetCurrentEntity();
+	assert( ent );
+	if ( !ent )
+		return;
+
+	st = &g_state;
+
+	st->angles		= ent->curstate.angles;
+	st->origin		= ent->curstate.origin;
+
+	st->realangles	= ent->angles;
+
+	st->sequence	= ent->curstate.sequence;
+	st->gaitsequence = pplayer->gaitsequence;
+	st->animtime	= ent->curstate.animtime;
+	st->frame		= ent->curstate.frame;
+	st->framerate	= ent->curstate.framerate;
+	memcpy( st->blending, ent->curstate.blending, 2 );
+	memcpy( st->controller, ent->curstate.controller, 4 );
+
+	st->lv = ent->latched;
+}
+
+void GetSequenceInfo( void *pmodel, client_anim_state_t *pev, float *pflFrameRate, float *pflGroundSpeed )
+{
+	studiohdr_t *pstudiohdr;
+	
+	pstudiohdr = (studiohdr_t *)pmodel;
+	if (! pstudiohdr)
+		return;
+
+	mstudioseqdesc_t	*pseqdesc;
+
+	if (pev->sequence >= pstudiohdr->numseq)
+	{
+		*pflFrameRate = 0.0;
+		*pflGroundSpeed = 0.0;
+		return;
+	}
+
+	pseqdesc = (mstudioseqdesc_t *)((byte *)pstudiohdr + pstudiohdr->seqindex) + (int)pev->sequence;
+
+	if (pseqdesc->numframes > 1)
+	{
+		*pflFrameRate = 256 * pseqdesc->fps / (pseqdesc->numframes - 1);
+		*pflGroundSpeed = sqrt( pseqdesc->linearmovement[0]*pseqdesc->linearmovement[0]+ pseqdesc->linearmovement[1]*pseqdesc->linearmovement[1]+ pseqdesc->linearmovement[2]*pseqdesc->linearmovement[2] );
+		*pflGroundSpeed = *pflGroundSpeed * pseqdesc->fps / (pseqdesc->numframes - 1);
+	}
+	else
+	{
+		*pflFrameRate = 256.0;
+		*pflGroundSpeed = 0.0;
+	}
+}
+
+int GetSequenceFlags( void *pmodel, client_anim_state_t *pev )
+{
+	studiohdr_t *pstudiohdr;
+	
+	pstudiohdr = (studiohdr_t *)pmodel;
+	if ( !pstudiohdr || pev->sequence >= pstudiohdr->numseq )
+		return 0;
+
+	mstudioseqdesc_t	*pseqdesc;
+	pseqdesc = (mstudioseqdesc_t *)((byte *)pstudiohdr + pstudiohdr->seqindex) + (int)pev->sequence;
+
+	return pseqdesc->flags;
+}
+
+float StudioFrameAdvance ( client_anim_state_t *st, float framerate, float flInterval )
+{
+	if (flInterval == 0.0)
+	{
+		flInterval = (gEngfuncs.GetClientTime() - st->animtime);
+		if (flInterval <= 0.001)
+		{
+			st->animtime = gEngfuncs.GetClientTime();
+			return 0.0;
+		}
+	}
+	if (!st->animtime)
+		flInterval = 0.0;
+	
+	st->frame += flInterval * framerate * st->framerate;
+	st->animtime = gEngfuncs.GetClientTime();
+
+	if (st->frame < 0.0 || st->frame >= 256.0) 
+	{
+		if ( st->m_fSequenceLoops )
+			st->frame -= (int)(st->frame / 256.0) * 256.0;
+		else
+			st->frame = (st->frame < 0.0) ? 0 : 255;
+		st->m_fSequenceFinished = TRUE;	// just in case it wasn't caught in GetEvents
+	}
+
+	return flInterval;
+}
+
+/*
+==============================
+SetupClientAnimation
+
+Called to set up local player's animation values
+==============================
+*/
+void CGameStudioModelRenderer::SetupClientAnimation( entity_state_t *pplayer )
+{
+	static double oldtime;
+	double curtime, dt;
+
+	client_anim_state_t *st;
+	float fr, gs;
+
+	cl_entity_t *ent = IEngineStudio.GetCurrentEntity();
+	assert( ent );
+	if ( !ent )
+		return;
+
+	curtime = gEngfuncs.GetClientTime();
+	dt = curtime - oldtime;
+	dt = min( 1.0, max( 0.0, dt ) );
+
+	oldtime = curtime;
+	st = &g_clientstate;
+	
+	st->framerate = 1.0;
+
+	int oldseq = st->sequence;
+	Game_GetSequence( &st->sequence, &st->gaitsequence ); //CVAR_GET_FLOAT( "sequence" );
+	Game_GetOrientation( (float *)&st->origin, (float *)&st->angles );
+	st->realangles = st->angles;
+
+	if ( st->sequence != oldseq )
+	{
+		st->frame = 0.0;
+		st->lv.prevsequence = oldseq;
+		st->lv.sequencetime = st->animtime;
+
+		memcpy( st->lv.prevseqblending, st->blending, 2 );
+		memcpy( st->lv.prevcontroller, st->controller, 4 );
+	}
+
+	void *pmodel = (studiohdr_t *)IEngineStudio.Mod_Extradata( ent->model );
+
+	GetSequenceInfo( pmodel, st, &fr, &gs );
+	st->m_fSequenceLoops = ((GetSequenceFlags( pmodel, st ) & STUDIO_LOOPING) != 0);
+	StudioFrameAdvance( st, fr, dt );
+	
+//	gEngfuncs.Con_Printf( "gs %i frame %f\n", st->gaitsequence, st->frame );
+
+	ent->angles				= st->realangles;
+	ent->curstate.angles	= st->angles;
+	ent->curstate.origin	= st->origin;
+
+	ent->curstate.sequence	= st->sequence;
+	pplayer->gaitsequence = st->gaitsequence;
+	ent->curstate.animtime	= st->animtime;
+	ent->curstate.frame		= st->frame;
+	ent->curstate.framerate	= st->framerate;
+	memcpy( ent->curstate.blending, st->blending, 2 );
+	memcpy( ent->curstate.controller, st->controller, 4 );
+
+	ent->latched = st->lv;
+}
+
+/*
+==============================
+RestorePlayerState
+
+Called to restore original player state information
+==============================
+*/
+void CGameStudioModelRenderer::RestorePlayerState( entity_state_t *pplayer )
+{
+	client_anim_state_t *st;
+	cl_entity_t *ent = IEngineStudio.GetCurrentEntity();
+	assert( ent );
+	if ( !ent )
+		return;
+
+	st = &g_clientstate;
+
+	st->angles		= ent->curstate.angles;
+	st->origin		= ent->curstate.origin;
+	st->realangles  = ent->angles;
+
+	st->sequence	= ent->curstate.sequence;
+	st->gaitsequence = pplayer->gaitsequence;
+	st->animtime	= ent->curstate.animtime;
+	st->frame		= ent->curstate.frame;
+	st->framerate	= ent->curstate.framerate;
+	memcpy( st->blending, ent->curstate.blending, 2 );
+	memcpy( st->controller, ent->curstate.controller, 4 );
+
+	st->lv = ent->latched;
+
+	st = &g_state;
+
+	ent->curstate.angles	= st->angles;
+	ent->curstate.origin	= st->origin;
+	ent->angles				= st->realangles;
+
+	ent->curstate.sequence	= st->sequence;
+	pplayer->gaitsequence = st->gaitsequence;
+	ent->curstate.animtime	= st->animtime;
+	ent->curstate.frame		= st->frame;
+	ent->curstate.framerate	= st->framerate;
+	memcpy( ent->curstate.blending, st->blending, 2 );
+	memcpy( ent->curstate.controller, st->controller, 4 );
+
+	ent->latched = st->lv;
+}
+
+/*
+==============================
+StudioDrawPlayer
+
+==============================
+*/
+int CGameStudioModelRenderer::StudioDrawPlayer( int flags, entity_state_t *pplayer )
+{
+	int iret = 0;
+
+	bool isLocalPlayer = false;
+		
+	// Set up for client?
+	if ( m_bLocal && IEngineStudio.GetCurrentEntity() == gEngfuncs.GetLocalPlayer() )
+	{
+		isLocalPlayer = true;
+	}
+
+	if ( isLocalPlayer )
+	{
+		// Store original data
+		SavePlayerState( pplayer );
+
+		// Copy in client side animation data
+		SetupClientAnimation( pplayer );
+	}
+
+	// Call real draw function
+	iret = _StudioDrawPlayer( flags, pplayer );
+
+	// Restore for client?
+	if ( isLocalPlayer )
+	{
+		// Restore the original data for the player
+		RestorePlayerState( pplayer );
+	}
+
+	return iret;
+}
+
+/*
+====================
+_StudioDrawPlayer
+
+====================
+*/
+int CGameStudioModelRenderer::_StudioDrawPlayer( int flags, entity_state_t *pplayer )
+{
+	alight_t lighting;
+	vec3_t dir;
+
+	m_pCurrentEntity = IEngineStudio.GetCurrentEntity();
+	IEngineStudio.GetTimes( &m_nFrameCount, &m_clTime, &m_clOldTime );
+	IEngineStudio.GetViewInfo( m_vRenderOrigin, m_vUp, m_vRight, m_vNormal );
+	IEngineStudio.GetAliasScale( &m_fSoftwareXScale, &m_fSoftwareYScale );
+
+	m_nPlayerIndex = pplayer->number - 1;
+
+	if (m_nPlayerIndex < 0 || m_nPlayerIndex >= gEngfuncs.GetMaxClients())
+		return 0;
+
+	m_pRenderModel = IEngineStudio.SetupPlayerModel( m_nPlayerIndex );
+	if (m_pRenderModel == NULL)
+		return 0;
+
+	m_pStudioHeader = (studiohdr_t *)IEngineStudio.Mod_Extradata (m_pRenderModel);
+	IEngineStudio.StudioSetHeader( m_pStudioHeader );
+	IEngineStudio.SetRenderModel( m_pRenderModel );
+
+	if (pplayer->gaitsequence)
+	{
+		vec3_t orig_angles;
+		m_pPlayerInfo = IEngineStudio.PlayerInfo( m_nPlayerIndex );
+
+		VectorCopy( m_pCurrentEntity->angles, orig_angles );
+	
+		StudioProcessGait( pplayer );
+
+		m_pPlayerInfo->gaitsequence = pplayer->gaitsequence;
+		m_pPlayerInfo = NULL;
+
+		StudioSetUpTransform( 0 );
+		VectorCopy( orig_angles, m_pCurrentEntity->angles );
+	}
+	else
+	{
+		m_pCurrentEntity->curstate.controller[0] = 127;
+		m_pCurrentEntity->curstate.controller[1] = 127;
+		m_pCurrentEntity->curstate.controller[2] = 127;
+		m_pCurrentEntity->curstate.controller[3] = 127;
+		m_pCurrentEntity->latched.prevcontroller[0] = m_pCurrentEntity->curstate.controller[0];
+		m_pCurrentEntity->latched.prevcontroller[1] = m_pCurrentEntity->curstate.controller[1];
+		m_pCurrentEntity->latched.prevcontroller[2] = m_pCurrentEntity->curstate.controller[2];
+		m_pCurrentEntity->latched.prevcontroller[3] = m_pCurrentEntity->curstate.controller[3];
+		
+		m_pPlayerInfo = IEngineStudio.PlayerInfo( m_nPlayerIndex );
+		m_pPlayerInfo->gaitsequence = 0;
+
+		StudioSetUpTransform( 0 );
+	}
+
+	if (flags & STUDIO_RENDER)
+	{
+		// see if the bounding box lets us trivially reject, also sets
+		if (!IEngineStudio.StudioCheckBBox ())
+			return 0;
+
+		(*m_pModelsDrawn)++;
+		(*m_pStudioModelCount)++; // render data cache cookie
+
+		if (m_pStudioHeader->numbodyparts == 0)
+			return 1;
+	}
+
+	m_pPlayerInfo = IEngineStudio.PlayerInfo( m_nPlayerIndex );
+	StudioSetupBones( );
+	StudioSaveBones( );
+	m_pPlayerInfo->renderframe = m_nFrameCount;
+
+	m_pPlayerInfo = NULL;
+
+	if (flags & STUDIO_EVENTS)
+	{
+		StudioCalcAttachments( );
+		IEngineStudio.StudioClientEvents( );
+		// copy attachments into global entity array
+		if ( m_pCurrentEntity->index > 0 )
+		{
+			cl_entity_t *ent = gEngfuncs.GetEntityByIndex( m_pCurrentEntity->index );
+
+			memcpy( ent->attachment, m_pCurrentEntity->attachment, sizeof( vec3_t ) * 4 );
+		}
+	}
+
+	if (flags & STUDIO_RENDER)
+	{
+		/*
+		if (m_pCvarHiModels->value && m_pRenderModel != m_pCurrentEntity->model  )
+		{
+			// show highest resolution multiplayer model
+			m_pCurrentEntity->curstate.body = 255;
+		}
+
+		if (!(m_pCvarDeveloper->value == 0 && gEngfuncs.GetMaxClients() == 1 ) && ( m_pRenderModel == m_pCurrentEntity->model ) )
+		{
+			m_pCurrentEntity->curstate.body = 1; // force helmet
+		}
+		*/
+
+		lighting.plightvec = dir;
+		IEngineStudio.StudioDynamicLight(m_pCurrentEntity, &lighting );
+
+		IEngineStudio.StudioEntityLight( &lighting );
+
+		// model and frame independant
+		IEngineStudio.StudioSetupLighting (&lighting);
+
+		m_pPlayerInfo = IEngineStudio.PlayerInfo( m_nPlayerIndex );
+
+		// get remap colors
+		m_nTopColor = m_pPlayerInfo->topcolor;
+		if (m_nTopColor < 0)
+			m_nTopColor = 0;
+		if (m_nTopColor > 360)
+			m_nTopColor = 360;
+		m_nBottomColor = m_pPlayerInfo->bottomcolor;
+		if (m_nBottomColor < 0)
+			m_nBottomColor = 0;
+		if (m_nBottomColor > 360)
+			m_nBottomColor = 360;
+
+		IEngineStudio.StudioSetRemapColors( m_nTopColor, m_nBottomColor );
+
+		StudioRenderModel( );
+		m_pPlayerInfo = NULL;
+
+		if (pplayer->weaponmodel)
+		{
+			cl_entity_t saveent = *m_pCurrentEntity;
+
+			model_t *pweaponmodel = IEngineStudio.GetModelByIndex( pplayer->weaponmodel );
+
+			m_pStudioHeader = (studiohdr_t *)IEngineStudio.Mod_Extradata (pweaponmodel);
+			IEngineStudio.StudioSetHeader( m_pStudioHeader );
+
+			StudioMergeBones( pweaponmodel);
+
+			IEngineStudio.StudioSetupLighting (&lighting);
+
+			StudioRenderModel( );
+
+			StudioCalcAttachments( );
+
+			*m_pCurrentEntity = saveent;
+		}
+	}
+
+	return 1;
+}
+
+/*
+====================
+Studio_FxTransform
+
+====================
+*/
+void CGameStudioModelRenderer::StudioFxTransform( cl_entity_t *ent, float transform[3][4] )
+{
+	switch( ent->curstate.renderfx )
+	{
+	case kRenderFxDistort:
+	case kRenderFxHologram:
+		if ( gEngfuncs.pfnRandomLong(0,49) == 0 )
+		{
+			int axis = gEngfuncs.pfnRandomLong(0,1);
+			if ( axis == 1 ) // Choose between x & z
+				axis = 2;
+			VectorScale( transform[axis], gEngfuncs.pfnRandomFloat(1,1.484), transform[axis] );
+		}
+		else if ( gEngfuncs.pfnRandomLong(0,49) == 0 )
+		{
+			float offset;
+			int axis = gEngfuncs.pfnRandomLong(0,1);
+			if ( axis == 1 ) // Choose between x & z
+				axis = 2;
+			offset = gEngfuncs.pfnRandomFloat(-10,10);
+			transform[gEngfuncs.pfnRandomLong(0,2)][3] += offset;
+		}
+		break;
+	case kRenderFxExplode:
+		{
+			if ( iRenderStateChanged )
+			{
+				g_flStartScaleTime = m_clTime;
+				iRenderStateChanged = FALSE;
+			}
+
+			// Make the Model continue to shrink
+			float flTimeDelta = m_clTime - g_flStartScaleTime;
+			if ( flTimeDelta > 0 )
+			{
+				float flScale = 0.001;
+				// Goes almost all away
+				if ( flTimeDelta <= 2.0 )
+					flScale = 1.0 - (flTimeDelta / 2.0);
+
+				for (int i = 0; i < 3; i++)
+				{
+					for (int j = 0; j < 3; j++)
+						transform[i][j] *= flScale;
+				}
+			}
+		}
+		break;
+	}
+}
+
+////////////////////////////////////
+// Hooks to class implementation
+////////////////////////////////////
+
+/*
+====================
+R_StudioDrawPlayer
+
+====================
+*/
+int R_StudioDrawPlayer( int flags, entity_state_t *pplayer )
+{
+	return g_StudioRenderer.StudioDrawPlayer( flags, pplayer );
+}
+
+/*
+====================
+R_StudioDrawModel
+
+====================
+*/
+int R_StudioDrawModel( int flags )
+{
+	return g_StudioRenderer.StudioDrawModel( flags );
+}
+
+/*
+====================
+R_StudioInit
+
+====================
+*/
+void R_StudioInit( void )
+{
+	g_StudioRenderer.Init();
+}
+
+// The simple drawing interface we'll pass back to the engine
+r_studio_interface_t studio =
+{
+	STUDIO_INTERFACE_VERSION,
+	R_StudioDrawModel,
+	R_StudioDrawPlayer,
+};
+
+/*
+====================
+HUD_GetStudioModelInterface
+
+Export this function for the engine to use the studio renderer class to render objects.
+====================
+*/
+#define DLLEXPORT __declspec( dllexport )
+extern "C" int DLLEXPORT HUD_GetStudioModelInterface( int version, struct r_studio_interface_s **ppinterface, struct engine_studio_api_s *pstudio )
+{
+	if ( version != STUDIO_INTERFACE_VERSION )
+		return 0;
+
+	// Point the engine to our callbacks
+	*ppinterface = &studio;
+
+	// Copy in engine helper functions
+	memcpy( &IEngineStudio, pstudio, sizeof( IEngineStudio ) );
+
+	// Initialize local variables, etc.
+	R_StudioInit();
+
+	// Success
+	return 1;
+}
diff --git a/main/source/cl_dll/GameStudioModelRenderer_Sample.h b/main/source/cl_dll/GameStudioModelRenderer_Sample.h
new file mode 100644
index 00000000..3fe5ea5c
--- /dev/null
+++ b/main/source/cl_dll/GameStudioModelRenderer_Sample.h
@@ -0,0 +1,48 @@
+#if !defined( GAMESTUDIOMODELRENDERER_H )
+#define GAMESTUDIOMODELRENDERER_H
+#if defined( _WIN32 )
+#pragma once
+#endif
+
+/*
+====================
+CGameStudioModelRenderer
+
+====================
+*/
+class CGameStudioModelRenderer : public CStudioModelRenderer
+{
+public:
+	CGameStudioModelRenderer( void );
+
+	// Set up model bone positions
+	virtual void StudioSetupBones ( void );	
+
+	// Estimate gait frame for player
+	virtual void StudioEstimateGait ( entity_state_t *pplayer );
+
+	// Process movement of player
+	virtual void StudioProcessGait ( entity_state_t *pplayer );
+
+	// Player drawing code
+	virtual int StudioDrawPlayer( int flags, entity_state_t *pplayer );
+	virtual int _StudioDrawPlayer( int flags, entity_state_t *pplayer );
+
+	// Apply special effects to transform matrix
+	virtual void StudioFxTransform( cl_entity_t *ent, float transform[3][4] );
+
+private:
+	// For local player, in third person, we need to store real render data and then
+	//  setup for with fake/client side animation data
+	void SavePlayerState( entity_state_t *pplayer );
+	// Called to set up local player's animation values
+	void SetupClientAnimation( entity_state_t *pplayer );
+	// Called to restore original player state information
+	void RestorePlayerState( entity_state_t *pplayer );
+
+private: 
+	// Private data
+	bool m_bLocal;
+};
+
+#endif // GAMESTUDIOMODELRENDERER_H
\ No newline at end of file
diff --git a/main/source/cl_dll/StudioModelRenderer.cpp b/main/source/cl_dll/StudioModelRenderer.cpp
new file mode 100644
index 00000000..274429be
--- /dev/null
+++ b/main/source/cl_dll/StudioModelRenderer.cpp
@@ -0,0 +1,1910 @@
+// studio_model.cpp
+// routines for setting up to draw 3DStudio models
+
+#include "hud.h"
+#include "cl_util.h"
+#include "const.h"
+#include "com_model.h"
+#include "studio.h"
+#include "entity_state.h"
+#include "cl_entity.h"
+#include "dlight.h"
+#include "triangleapi.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <memory.h>
+#include <math.h>
+
+#include "studio_util.h"
+#include "r_studioint.h"
+
+#include "StudioModelRenderer.h"
+#include "GameStudioModelRenderer.h"
+
+#include "util/MathUtil.h"
+
+// Global engine <-> studio model rendering code interface
+engine_studio_api_t IEngineStudio;
+
+#include "mod/AvHSpecials.h"
+
+int GetRenderModeForModelName(int inRenderMode, char* inName)
+{
+	int theRenderMode = inRenderMode;
+
+//	if(!strncmp("tcol", inName, 4))
+//	{
+//		theRenderMode = kRenderTransColor;
+//	}
+	if(!strncmp("ttex", inName, 4))
+	{
+		theRenderMode = kRenderTransTexture;
+	}
+	else if(!strncmp("glow", inName, 4))
+	{
+		theRenderMode = kRenderGlow;
+	}
+	else if(!strncmp("talp", inName, 4))
+	{
+		theRenderMode = kRenderTransAlpha;
+	}
+	else if(!strncmp("tadd", inName, 4))
+	{
+		theRenderMode = kRenderTransAdd;
+	}
+	
+	return theRenderMode;
+}
+
+
+/////////////////////
+// Implementation of CStudioModelRenderer.h
+
+/*
+====================
+Init
+
+====================
+*/
+void CStudioModelRenderer::Init( void )
+{
+	// Set up some variables shared with engine
+	m_pCvarHiModels			= IEngineStudio.GetCvar( "cl_himodels" );
+	m_pCvarDeveloper		= IEngineStudio.GetCvar( "developer" );
+	m_pCvarDrawEntities		= IEngineStudio.GetCvar( "r_drawentities" );
+
+	m_pChromeSprite			= IEngineStudio.GetChromeSprite();
+
+	IEngineStudio.GetModelCounters( &m_pStudioModelCount, &m_pModelsDrawn );
+
+	// Get pointers to engine data structures
+	m_pbonetransform		= (float (*)[MAXSTUDIOBONES][3][4])IEngineStudio.StudioGetBoneTransform();
+	m_plighttransform		= (float (*)[MAXSTUDIOBONES][3][4])IEngineStudio.StudioGetLightTransform();
+	m_paliastransform		= (float (*)[3][4])IEngineStudio.StudioGetAliasTransform();
+	m_protationmatrix		= (float (*)[3][4])IEngineStudio.StudioGetRotationMatrix();
+}
+
+/*
+====================
+CStudioModelRenderer
+
+====================
+*/
+CStudioModelRenderer::CStudioModelRenderer( void )
+{
+	m_fDoInterp			= 1;
+	m_fGaitEstimation	= 1;
+	m_pCurrentEntity	= NULL;
+	m_pCvarHiModels		= NULL;
+	m_pCvarDeveloper	= NULL;
+	m_pCvarDrawEntities	= NULL;
+	m_pChromeSprite		= NULL;
+	m_pStudioModelCount	= NULL;
+	m_pModelsDrawn		= NULL;
+	m_protationmatrix	= NULL;
+	m_paliastransform	= NULL;
+	m_pbonetransform	= NULL;
+	m_plighttransform	= NULL;
+	m_pStudioHeader		= NULL;
+	m_pBodyPart			= NULL;
+	m_pSubModel			= NULL;
+	m_pPlayerInfo		= NULL;
+	m_pRenderModel		= NULL;
+}
+
+/*
+====================
+~CStudioModelRenderer
+
+====================
+*/
+CStudioModelRenderer::~CStudioModelRenderer( void )
+{
+}
+
+/*
+====================
+StudioCalcBoneAdj
+
+====================
+*/
+void CStudioModelRenderer::StudioCalcBoneAdj( float dadt, float *adj, const byte *pcontroller1, const byte *pcontroller2, byte mouthopen )
+{
+	int					i, j;
+	float				value;
+	mstudiobonecontroller_t *pbonecontroller;
+	
+	pbonecontroller = (mstudiobonecontroller_t *)((byte *)m_pStudioHeader + m_pStudioHeader->bonecontrollerindex);
+
+	for (j = 0; j < m_pStudioHeader->numbonecontrollers; j++)
+	{
+		i = pbonecontroller[j].index;
+		if (i <= 3)
+		{
+			// check for 360% wrapping
+			if (pbonecontroller[j].type & STUDIO_RLOOP)
+			{
+				if (abs(pcontroller1[i] - pcontroller2[i]) > 128)
+				{
+					int a, b;
+					a = (pcontroller1[j] + 128) % 256;
+					b = (pcontroller2[j] + 128) % 256;
+					value = ((a * dadt) + (b * (1 - dadt)) - 128) * (360.0/256.0) + pbonecontroller[j].start;
+				}
+				else 
+				{
+					value = ((pcontroller1[i] * dadt + (pcontroller2[i]) * (1.0 - dadt))) * (360.0/256.0) + pbonecontroller[j].start;
+				}
+			}
+			else 
+			{
+				value = (pcontroller1[i] * dadt + pcontroller2[i] * (1.0 - dadt)) / 255.0;
+				if (value < 0) value = 0;
+				if (value > 1.0) value = 1.0;
+				value = (1.0 - value) * pbonecontroller[j].start + value * pbonecontroller[j].end;
+			}
+			// Con_DPrintf( "%d %d %f : %f\n", m_pCurrentEntity->curstate.controller[j], m_pCurrentEntity->latched.prevcontroller[j], value, dadt );
+		}
+		else
+		{
+			value = mouthopen / 64.0;
+			if (value > 1.0) value = 1.0;				
+			value = (1.0 - value) * pbonecontroller[j].start + value * pbonecontroller[j].end;
+			// Con_DPrintf("%d %f\n", mouthopen, value );
+		}
+		switch(pbonecontroller[j].type & STUDIO_TYPES)
+		{
+		case STUDIO_XR:
+		case STUDIO_YR:
+		case STUDIO_ZR:
+			adj[j] = value * (M_PI / 180.0);
+			break;
+		case STUDIO_X:
+		case STUDIO_Y:
+		case STUDIO_Z:
+			adj[j] = value;
+			break;
+		}
+	}
+}
+
+
+/*
+====================
+StudioCalcBoneQuaterion
+
+====================
+*/
+void CStudioModelRenderer::StudioCalcBoneQuaterion( int frame, float s, mstudiobone_t *pbone, mstudioanim_t *panim, float *adj, float *q )
+{
+	int					j, k;
+	vec4_t				q1, q2;
+	vec3_t				angle1, angle2;
+	mstudioanimvalue_t	*panimvalue;
+
+	for (j = 0; j < 3; j++)
+	{
+		if (panim->offset[j+3] == 0)
+		{
+			angle2[j] = angle1[j] = pbone->value[j+3]; // default;
+		}
+		else
+		{
+			panimvalue = (mstudioanimvalue_t *)((byte *)panim + panim->offset[j+3]);
+			k = frame;
+			// DEBUG
+			if (panimvalue->num.total < panimvalue->num.valid)
+				k = 0;
+			while (panimvalue->num.total <= k)
+			{
+				k -= panimvalue->num.total;
+				panimvalue += panimvalue->num.valid + 1;
+				// DEBUG
+				if (panimvalue->num.total < panimvalue->num.valid)
+					k = 0;
+			}
+			// Bah, missing blend!
+			if (panimvalue->num.valid > k)
+			{
+				angle1[j] = panimvalue[k+1].value;
+
+				if (panimvalue->num.valid > k + 1)
+				{
+					angle2[j] = panimvalue[k+2].value;
+				}
+				else
+				{
+					if (panimvalue->num.total > k + 1)
+						angle2[j] = angle1[j];
+					else
+						angle2[j] = panimvalue[panimvalue->num.valid+2].value;
+				}
+			}
+			else
+			{
+				angle1[j] = panimvalue[panimvalue->num.valid].value;
+				if (panimvalue->num.total > k + 1)
+				{
+					angle2[j] = angle1[j];
+				}
+				else
+				{
+					angle2[j] = panimvalue[panimvalue->num.valid + 2].value;
+				}
+			}
+			angle1[j] = pbone->value[j+3] + angle1[j] * pbone->scale[j+3];
+			angle2[j] = pbone->value[j+3] + angle2[j] * pbone->scale[j+3];
+		}
+
+		if (pbone->bonecontroller[j+3] != -1)
+		{
+			angle1[j] += adj[pbone->bonecontroller[j+3]];
+			angle2[j] += adj[pbone->bonecontroller[j+3]];
+		}
+	}
+
+	if (!VectorCompare( angle1, angle2 ))
+	{
+		AngleQuaternion( angle1, q1 );
+		AngleQuaternion( angle2, q2 );
+		QuaternionSlerp( q1, q2, s, q );
+	}
+	else
+	{
+		AngleQuaternion( angle1, q );
+	}
+}
+
+/*
+====================
+StudioCalcBonePosition
+
+====================
+*/
+void CStudioModelRenderer::StudioCalcBonePosition( int frame, float s, mstudiobone_t *pbone, mstudioanim_t *panim, float *adj, float *pos )
+{
+	int					j, k;
+	mstudioanimvalue_t	*panimvalue;
+
+	for (j = 0; j < 3; j++)
+	{
+		pos[j] = pbone->value[j]; // default;
+		if (panim->offset[j] != 0)
+		{
+			panimvalue = (mstudioanimvalue_t *)((byte *)panim + panim->offset[j]);
+			/*
+			if (i == 0 && j == 0)
+				Con_DPrintf("%d  %d:%d  %f\n", frame, panimvalue->num.valid, panimvalue->num.total, s );
+			*/
+			
+			k = frame;
+			// DEBUG
+			if (panimvalue->num.total < panimvalue->num.valid)
+				k = 0;
+			// find span of values that includes the frame we want
+			while (panimvalue->num.total <= k)
+			{
+				k -= panimvalue->num.total;
+				panimvalue += panimvalue->num.valid + 1;
+  				// DEBUG
+				if (panimvalue->num.total < panimvalue->num.valid)
+					k = 0;
+			}
+			// if we're inside the span
+			if (panimvalue->num.valid > k)
+			{
+				// and there's more data in the span
+				if (panimvalue->num.valid > k + 1)
+				{
+					pos[j] += (panimvalue[k+1].value * (1.0 - s) + s * panimvalue[k+2].value) * pbone->scale[j];
+				}
+				else
+				{
+					pos[j] += panimvalue[k+1].value * pbone->scale[j];
+				}
+			}
+			else
+			{
+				// are we at the end of the repeating values section and there's another section with data?
+				if (panimvalue->num.total <= k + 1)
+				{
+					pos[j] += (panimvalue[panimvalue->num.valid].value * (1.0 - s) + s * panimvalue[panimvalue->num.valid + 2].value) * pbone->scale[j];
+				}
+				else
+				{
+					pos[j] += panimvalue[panimvalue->num.valid].value * pbone->scale[j];
+				}
+			}
+		}
+		if ( pbone->bonecontroller[j] != -1 && adj )
+		{
+			pos[j] += adj[pbone->bonecontroller[j]];
+		}
+	}
+}
+
+/*
+====================
+StudioSlerpBones
+
+====================
+*/
+void CStudioModelRenderer::StudioSlerpBones( vec4_t q1[], float pos1[][3], vec4_t q2[], float pos2[][3], float s )
+{
+	int			i;
+	vec4_t		q3;
+	float		s1;
+
+	if (s < 0) s = 0;
+	else if (s > 1.0) s = 1.0;
+
+	s1 = 1.0 - s;
+
+	for (i = 0; i < m_pStudioHeader->numbones; i++)
+	{
+		QuaternionSlerp( q1[i], q2[i], s, q3 );
+		q1[i][0] = q3[0];
+		q1[i][1] = q3[1];
+		q1[i][2] = q3[2];
+		q1[i][3] = q3[3];
+		pos1[i][0] = pos1[i][0] * s1 + pos2[i][0] * s;
+		pos1[i][1] = pos1[i][1] * s1 + pos2[i][1] * s;
+		pos1[i][2] = pos1[i][2] * s1 + pos2[i][2] * s;
+	}
+}
+
+/*
+====================
+StudioGetAnim
+
+====================
+*/
+mstudioanim_t *CStudioModelRenderer::StudioGetAnim( model_t *m_pSubModel, mstudioseqdesc_t *pseqdesc )
+{
+	mstudioseqgroup_t	*pseqgroup;
+	cache_user_t *paSequences;
+
+	pseqgroup = (mstudioseqgroup_t *)((byte *)m_pStudioHeader + m_pStudioHeader->seqgroupindex) + pseqdesc->seqgroup;
+
+	if (pseqdesc->seqgroup == 0)
+	{
+		return (mstudioanim_t *)((byte *)m_pStudioHeader + pseqgroup->data + pseqdesc->animindex);
+	}
+
+	paSequences = (cache_user_t *)m_pSubModel->submodels;
+
+	if (paSequences == NULL)
+	{
+		paSequences = (cache_user_t *)IEngineStudio.Mem_Calloc( 16, sizeof( cache_user_t ) ); // UNDONE: leak!
+		m_pSubModel->submodels = (dmodel_t *)paSequences;
+	}
+
+	if (!IEngineStudio.Cache_Check( (struct cache_user_s *)&(paSequences[pseqdesc->seqgroup])))
+	{
+		gEngfuncs.Con_DPrintf("loading %s\n", pseqgroup->name );
+		IEngineStudio.LoadCacheFile( pseqgroup->name, (struct cache_user_s *)&paSequences[pseqdesc->seqgroup] );
+	}
+	return (mstudioanim_t *)((byte *)paSequences[pseqdesc->seqgroup].data + pseqdesc->animindex);
+}
+
+/*
+====================
+StudioPlayerBlend
+
+====================
+*/
+void CStudioModelRenderer::StudioPlayerBlend( mstudioseqdesc_t *pseqdesc, int *pBlend, float *pPitch )
+{
+	// calc up/down pointing
+	*pBlend = (*pPitch * 3);
+	if (*pBlend < pseqdesc->blendstart[0])
+	{
+		*pPitch -= pseqdesc->blendstart[0] / 3.0;
+		*pBlend = 0;
+	}
+	else if (*pBlend > pseqdesc->blendend[0])
+	{
+		*pPitch -= pseqdesc->blendend[0] / 3.0;
+		*pBlend = 255;
+	}
+	else
+	{
+		if (pseqdesc->blendend[0] - pseqdesc->blendstart[0] < 0.1) // catch qc error
+			*pBlend = 127;
+		else
+			*pBlend = 255 * (*pBlend - pseqdesc->blendstart[0]) / (pseqdesc->blendend[0] - pseqdesc->blendstart[0]);
+		*pPitch = 0;
+	}
+}
+
+/*
+====================
+StudioSetUpTransform
+
+====================
+*/
+void CStudioModelRenderer::StudioSetUpTransform (int trivial_accept)
+{
+	int				i;
+	vec3_t			angles;
+	vec3_t			modelpos;
+
+// tweek model origin	
+	//for (i = 0; i < 3; i++)
+	//	modelpos[i] = m_pCurrentEntity->origin[i];
+
+	VectorCopy( m_pCurrentEntity->origin, modelpos );
+
+// TODO: should really be stored with the entity instead of being reconstructed
+// TODO: should use a look-up table
+// TODO: could cache lazily, stored in the entity
+	angles[ROLL] = m_pCurrentEntity->curstate.angles[ROLL];
+	angles[PITCH] = m_pCurrentEntity->curstate.angles[PITCH];
+	angles[YAW] = m_pCurrentEntity->curstate.angles[YAW];
+
+	//Con_DPrintf("Angles %4.2f prev %4.2f for %i\n", angles[PITCH], m_pCurrentEntity->index);
+	//Con_DPrintf("movetype %d %d\n", m_pCurrentEntity->movetype, m_pCurrentEntity->aiment );
+
+	if (m_pCurrentEntity->curstate.movetype == MOVETYPE_STEP) 
+	{
+		float			f = 0;
+		float			d;
+
+		// don't do it if the goalstarttime hasn't updated in a while.
+
+		// NOTE:  Because we need to interpolate multiplayer characters, the interpolation time limit
+		//  was increased to 1.0 s., which is 2x the max lag we are accounting for.
+
+		if ( ( m_clTime < m_pCurrentEntity->curstate.animtime + 1.0f ) &&
+			 ( m_pCurrentEntity->curstate.animtime != m_pCurrentEntity->latched.prevanimtime ) )
+		{
+			f = (m_clTime - m_pCurrentEntity->curstate.animtime) / (m_pCurrentEntity->curstate.animtime - m_pCurrentEntity->latched.prevanimtime);
+			//Con_DPrintf("%4.2f %.2f %.2f\n", f, m_pCurrentEntity->curstate.animtime, m_clTime);
+		}
+
+		if (m_fDoInterp)
+		{
+			// ugly hack to interpolate angle, position. current is reached 0.1 seconds after being set
+			f = f - 1.0;
+		}
+		else
+		{
+			f = 0;
+		}
+
+		for (i = 0; i < 3; i++)
+		{
+			modelpos[i] += (m_pCurrentEntity->origin[i] - m_pCurrentEntity->latched.prevorigin[i]) * f;
+		}
+
+		// NOTE:  Because multiplayer lag can be relatively large, we don't want to cap
+		//  f at 1.5 anymore.
+		//if (f > -1.0 && f < 1.5) {}
+
+//			Con_DPrintf("%.0f %.0f\n",m_pCurrentEntity->msg_angles[0][YAW], m_pCurrentEntity->msg_angles[1][YAW] );
+		for (i = 0; i < 3; i++)
+		{
+			float ang1, ang2;
+
+			ang1 = m_pCurrentEntity->angles[i];
+			ang2 = m_pCurrentEntity->latched.prevangles[i];
+
+			d = ang1 - ang2;
+			if (d > 180)
+			{
+				d -= 360;
+			}
+			else if (d < -180)
+			{	
+				d += 360;
+			}
+
+			angles[i] += d * f;
+		}
+		//Con_DPrintf("%.3f \n", f );
+	}
+	else if ( m_pCurrentEntity->curstate.movetype != MOVETYPE_NONE ) 
+	{
+		VectorCopy( m_pCurrentEntity->angles, angles );
+	}
+
+    // Added by mmcguire.
+
+    if (m_pCurrentEntity->curstate.iuser3 == AVH_USER3_ALIEN_PLAYER1)  
+    {  
+
+		// Override the orientation with the values stored in vuser1.
+
+        VectorCopy(m_pCurrentEntity->curstate.vuser1, angles);
+
+        // The code that sets up the transformation negates the pitch
+        // for some reason, so compensate for that here.
+
+        angles[PITCH] = -angles[PITCH];
+
+    }
+
+
+//	bool theIsWallSticking = GetHasUpgrade(m_pCurrentEntity->curstate.iuser4, MASK_WALLSTICKING);
+//	if(theIsWallSticking)
+//	{
+//		//RotateFloatValuesByVector(angles[ROLL], angles[YAW], angles[PITCH], m_pCurrentEntity->curstate.vuser1);
+//		//VectorCopy(m_pCurrentEntity->curstate.vuser1, angles);
+//		
+//		// Surface normal is in vuser1.  Transform current forward to new forward
+//		vec3_t theCurrentForward;
+//		vec3_t theCurrentRight;
+//		vec3_t theCurrentUp;
+//		gEngfuncs.pfnAngleVectors(angles, theCurrentForward, theCurrentRight, theCurrentUp);
+//		
+//		vec3_t theWallUp = m_pCurrentEntity->curstate.vuser1;
+//		
+//		vec3_t theWallSide;
+//		CrossProduct(theWallUp, theCurrentForward, theWallSide);
+//		
+//		vec3_t theWallForward;
+//		//CrossProduct(theWallUp, theWallSide, theWallForward);
+//		VectorCopy(theCurrentForward, theWallForward);
+//		
+//		// Build matrix to transform current frame of reference to that of sticking to wall
+//		float theViewToWallMatrix[3][4];
+//		theViewToWallMatrix[0][0] = theWallForward.x;
+//		theViewToWallMatrix[0][1] = theWallForward.y;
+//		theViewToWallMatrix[0][2] = theWallForward.z;
+//		
+//		theViewToWallMatrix[1][0] = theWallSide.x;
+//		theViewToWallMatrix[1][1] = theWallSide.y;
+//		theViewToWallMatrix[1][2] = theWallSide.z;
+//		
+//		theViewToWallMatrix[2][0] = theWallUp.x;
+//		theViewToWallMatrix[2][1] = theWallUp.y;
+//		theViewToWallMatrix[2][2] = theWallUp.z;
+//		
+//		vec3_t theNewForward;
+//		VectorTransform(theCurrentForward, theViewToWallMatrix, theNewForward);
+//		
+//		// Transform new forward to angles
+//		VectorAngles(theNewForward, angles);
+//	}
+
+	//Con_DPrintf("%.0f %0.f %0.f\n", modelpos[0], modelpos[1], modelpos[2] );
+	//Con_DPrintf("%.0f %0.f %0.f\n", angles[0], angles[1], angles[2] );
+
+	angles[PITCH] = -angles[PITCH];
+	AngleMatrix (angles, (*m_protationmatrix));
+
+	if ( !IEngineStudio.IsHardware() )
+	{
+		static float viewmatrix[3][4];
+
+		VectorCopy (m_vRight, viewmatrix[0]);
+		VectorCopy (m_vUp, viewmatrix[1]);
+		VectorInverse (viewmatrix[1]);
+		VectorCopy (m_vNormal, viewmatrix[2]);
+
+		(*m_protationmatrix)[0][3] = modelpos[0] - m_vRenderOrigin[0];
+		(*m_protationmatrix)[1][3] = modelpos[1] - m_vRenderOrigin[1];
+		(*m_protationmatrix)[2][3] = modelpos[2] - m_vRenderOrigin[2];
+
+		ConcatTransforms (viewmatrix, (*m_protationmatrix), (*m_paliastransform));
+
+		// do the scaling up of x and y to screen coordinates as part of the transform
+		// for the unclipped case (it would mess up clipping in the clipped case).
+		// Also scale down z, so 1/z is scaled 31 bits for free, and scale down x and y
+		// correspondingly so the projected x and y come out right
+		// FIXME: make this work for clipped case too?
+		if (trivial_accept)
+		{
+			for (i=0 ; i<4 ; i++)
+			{
+				(*m_paliastransform)[0][i] *= m_fSoftwareXScale *
+						(1.0 / (ZISCALE * 0x10000));
+				(*m_paliastransform)[1][i] *= m_fSoftwareYScale *
+						(1.0 / (ZISCALE * 0x10000));
+				(*m_paliastransform)[2][i] *= 1.0 / (ZISCALE * 0x10000);
+
+			}
+		}
+	}
+
+	(*m_protationmatrix)[0][3] = modelpos[0];
+	(*m_protationmatrix)[1][3] = modelpos[1];
+	(*m_protationmatrix)[2][3] = modelpos[2];
+}
+
+
+/*
+====================
+StudioEstimateInterpolant
+
+====================
+*/
+float CStudioModelRenderer::StudioEstimateInterpolant( void )
+{
+	float dadt = 1.0;
+
+	if ( m_fDoInterp && ( m_pCurrentEntity->curstate.animtime >= m_pCurrentEntity->latched.prevanimtime + 0.01 ) )
+	{
+		dadt = (m_clTime - m_pCurrentEntity->curstate.animtime) / 0.1;
+		if (dadt > 2.0)
+		{
+			dadt = 2.0;
+		}
+	}
+	return dadt;
+}
+
+/*
+====================
+StudioCalcRotations
+
+====================
+*/
+void CStudioModelRenderer::StudioCalcRotations ( float pos[][3], vec4_t *q, mstudioseqdesc_t *pseqdesc, mstudioanim_t *panim, float f )
+{
+	int					i;
+	int					frame;
+	mstudiobone_t		*pbone;
+
+	float				s;
+	float				adj[MAXSTUDIOCONTROLLERS];
+	float				dadt;
+
+	if (f > pseqdesc->numframes - 1)
+	{
+		f = 0;	// bah, fix this bug with changing sequences too fast
+	}
+	// BUG ( somewhere else ) but this code should validate this data.
+	// This could cause a crash if the frame # is negative, so we'll go ahead
+	//  and clamp it here
+	else if ( f < -0.01 )
+	{
+		f = -0.01;
+	}
+
+	frame = (int)f;
+
+	 //gEngfuncs.Con_DPrintf("%d %.4f %.4f %.4f %.4f %d\n", m_pCurrentEntity->curstate.sequence, m_clTime, m_pCurrentEntity->animtime, m_pCurrentEntity->frame, f, frame );
+
+	// gEngfuncs.Con_DPrintf( "%f %f %f\n", m_pCurrentEntity->angles[ROLL], m_pCurrentEntity->angles[PITCH], m_pCurrentEntity->angles[YAW] );
+
+	 //gEngfuncs.Con_DPrintf("frame %d %d\n", frame1, frame2 );
+
+
+	dadt = StudioEstimateInterpolant( );
+	s = (f - frame);
+
+	// add in programtic controllers
+	pbone		= (mstudiobone_t *)((byte *)m_pStudioHeader + m_pStudioHeader->boneindex);
+
+	StudioCalcBoneAdj( dadt, adj, m_pCurrentEntity->curstate.controller, m_pCurrentEntity->latched.prevcontroller, m_pCurrentEntity->mouth.mouthopen );
+
+	for (i = 0; i < m_pStudioHeader->numbones; i++, pbone++, panim++) 
+	{
+		StudioCalcBoneQuaterion( frame, s, pbone, panim, adj, q[i] );
+
+		StudioCalcBonePosition( frame, s, pbone, panim, adj, pos[i] );
+		// if (0 && i == 0)
+		//	Con_DPrintf("%d %d %d %d\n", m_pCurrentEntity->curstate.sequence, frame, j, k );
+	}
+
+	if (pseqdesc->motiontype & STUDIO_X)
+	{
+		pos[pseqdesc->motionbone][0] = 0.0;
+	}
+	if (pseqdesc->motiontype & STUDIO_Y)
+	{
+		pos[pseqdesc->motionbone][1] = 0.0;
+	}
+	if (pseqdesc->motiontype & STUDIO_Z)
+	{
+		pos[pseqdesc->motionbone][2] = 0.0;
+	}
+
+	//gEngfuncs.Con_Printf("framerate %f\n", m_pCurrentEntity->curstate.framerate);
+	
+	s = 0 * ((1.0 - (f - (int)(f))) / (pseqdesc->numframes)) * m_pCurrentEntity->curstate.framerate;
+
+	if (pseqdesc->motiontype & STUDIO_LX)
+	{
+		pos[pseqdesc->motionbone][0] += s * pseqdesc->linearmovement[0];
+	}
+	if (pseqdesc->motiontype & STUDIO_LY)
+	{
+		pos[pseqdesc->motionbone][1] += s * pseqdesc->linearmovement[1];
+	}
+	if (pseqdesc->motiontype & STUDIO_LZ)
+	{
+		pos[pseqdesc->motionbone][2] += s * pseqdesc->linearmovement[2];
+	}
+}
+
+/*
+====================
+Studio_FxTransform
+
+====================
+*/
+void CStudioModelRenderer::StudioFxTransform( cl_entity_t *ent, float transform[3][4] )
+{
+	switch( ent->curstate.renderfx )
+	{
+	case kRenderFxDistort:
+	case kRenderFxHologram:
+		if ( gEngfuncs.pfnRandomLong(0,49) == 0 )
+		{
+			int axis = gEngfuncs.pfnRandomLong(0,1);
+			if ( axis == 1 ) // Choose between x & z
+				axis = 2;
+			VectorScale( transform[axis], gEngfuncs.pfnRandomFloat(1,1.484), transform[axis] );
+		}
+		else if ( gEngfuncs.pfnRandomLong(0,49) == 0 )
+		{
+			float offset;
+			int axis = gEngfuncs.pfnRandomLong(0,1);
+			if ( axis == 1 ) // Choose between x & z
+				axis = 2;
+			offset = gEngfuncs.pfnRandomFloat(-10,10);
+			transform[gEngfuncs.pfnRandomLong(0,2)][3] += offset;
+		}
+	break;
+	case kRenderFxExplode:
+		{
+			float scale;
+
+			scale = 1.0 + ( m_clTime - ent->curstate.animtime) * 10.0;
+			if ( scale > 2 )	// Don't blow up more than 200%
+				scale = 2;
+			transform[0][1] *= scale;
+			transform[1][1] *= scale;
+			transform[2][1] *= scale;
+		}
+	break;
+
+	}
+}
+
+/*
+====================
+StudioEstimateFrame
+
+====================
+*/
+float CStudioModelRenderer::StudioEstimateFrame( mstudioseqdesc_t *pseqdesc )
+{
+	double				dfdt, f;
+
+	if ( m_fDoInterp )
+	{
+		if ( m_clTime < m_pCurrentEntity->curstate.animtime )
+		{
+			dfdt = 0;
+		}
+		else
+		{
+			dfdt = (m_clTime - m_pCurrentEntity->curstate.animtime) * m_pCurrentEntity->curstate.framerate * pseqdesc->fps;
+
+		}
+	}
+	else
+	{
+		dfdt = 0;
+	}
+
+	if (pseqdesc->numframes <= 1)
+	{
+		f = 0;
+	}
+	else
+	{
+		f = (m_pCurrentEntity->curstate.frame * (pseqdesc->numframes - 1)) / 256.0;
+	}
+ 	
+	f += dfdt;
+	
+	if (pseqdesc->flags & STUDIO_LOOPING) 
+	{
+		if (pseqdesc->numframes > 1)
+		{
+			f -= (int)(f / (pseqdesc->numframes - 1)) *  (pseqdesc->numframes - 1);
+		}
+		if (f < 0) 
+		{
+			f += (pseqdesc->numframes - 1);
+		}
+	}
+	else 
+	{
+		if (f >= pseqdesc->numframes - 1.001) 
+		{
+			f = pseqdesc->numframes - 1.001;
+		}
+		if (f < 0.0) 
+		{
+			f = 0.0;
+		}
+	}
+	return f;
+}
+
+bool GetDoesBoneHaveParent(int inMaybeBeneathBone, int inParentBone, mstudiobone_t* inBones)
+{
+	bool theSuccess = false;
+
+	ASSERT(inMaybeBeneathBone < MAXSTUDIOBONES);
+	ASSERT(inParentBone < MAXSTUDIOBONES);
+
+	int theCurrentParent = inBones[inMaybeBeneathBone].parent;
+
+	if(theCurrentParent == inParentBone)
+	{
+		theSuccess = true;
+	}
+	else if(theCurrentParent != -1)
+	{
+		theSuccess = GetDoesBoneHaveParent(theCurrentParent, inParentBone, inBones);
+	}
+
+	return theSuccess;
+}
+
+/*
+====================
+StudioSetupBones
+
+====================
+*/
+void CStudioModelRenderer::StudioSetupBones ( void )
+{
+	int					i;
+	double				f;
+
+	mstudiobone_t		*pbones;
+	mstudioseqdesc_t	*pseqdesc;
+	mstudioanim_t		*panim;
+
+	static float		pos[MAXSTUDIOBONES][3];
+	static vec4_t		q[MAXSTUDIOBONES];
+	float				bonematrix[3][4];
+
+	static float		pos2[MAXSTUDIOBONES][3];
+	static vec4_t		q2[MAXSTUDIOBONES];
+	static float		pos3[MAXSTUDIOBONES][3];
+	static vec4_t		q3[MAXSTUDIOBONES];
+	static float		pos4[MAXSTUDIOBONES][3];
+	static vec4_t		q4[MAXSTUDIOBONES];
+
+	if (m_pCurrentEntity->curstate.sequence >=  m_pStudioHeader->numseq) 
+	{
+		m_pCurrentEntity->curstate.sequence = 0;
+	}
+	else if (m_pCurrentEntity->curstate.sequence < 0) 
+	{
+		m_pCurrentEntity->curstate.sequence = 0;
+	}
+
+	pseqdesc = (mstudioseqdesc_t *)((byte *)m_pStudioHeader + m_pStudioHeader->seqindex) + m_pCurrentEntity->curstate.sequence;
+
+	f = StudioEstimateFrame( pseqdesc );
+
+	if (m_pCurrentEntity->latched.prevframe > f)
+	{
+		//Con_DPrintf("%f %f\n", m_pCurrentEntity->prevframe, f );
+	}
+
+	panim = StudioGetAnim( m_pRenderModel, pseqdesc );
+	StudioCalcRotations( pos, q, pseqdesc, panim, f );
+
+	if (pseqdesc->numblends > 1)
+	{
+		float				s;
+		float				dadt;
+
+		panim += m_pStudioHeader->numbones;
+		StudioCalcRotations( pos2, q2, pseqdesc, panim, f );
+
+		dadt = StudioEstimateInterpolant();
+		s = (m_pCurrentEntity->curstate.blending[0] * dadt + m_pCurrentEntity->latched.prevblending[0] * (1.0 - dadt)) / 255.0;
+
+		StudioSlerpBones( q, pos, q2, pos2, s );
+
+		if (pseqdesc->numblends == 4)
+		{
+			panim += m_pStudioHeader->numbones;
+			StudioCalcRotations( pos3, q3, pseqdesc, panim, f );
+
+			panim += m_pStudioHeader->numbones;
+			StudioCalcRotations( pos4, q4, pseqdesc, panim, f );
+
+			s = (m_pCurrentEntity->curstate.blending[0] * dadt + m_pCurrentEntity->latched.prevblending[0] * (1.0 - dadt)) / 255.0;
+			StudioSlerpBones( q3, pos3, q4, pos4, s );
+
+			s = (m_pCurrentEntity->curstate.blending[1] * dadt + m_pCurrentEntity->latched.prevblending[1] * (1.0 - dadt)) / 255.0;
+			StudioSlerpBones( q, pos, q3, pos3, s );
+		}
+	}
+	
+	if (m_fDoInterp &&
+		m_pCurrentEntity->latched.sequencetime &&
+		( m_pCurrentEntity->latched.sequencetime + 0.2 > m_clTime ) && 
+		( m_pCurrentEntity->latched.prevsequence < m_pStudioHeader->numseq ))
+	{
+		// blend from last sequence
+		static float		pos1b[MAXSTUDIOBONES][3];
+		static vec4_t		q1b[MAXSTUDIOBONES];
+		float				s;
+
+		pseqdesc = (mstudioseqdesc_t *)((byte *)m_pStudioHeader + m_pStudioHeader->seqindex) + m_pCurrentEntity->latched.prevsequence;
+		panim = StudioGetAnim( m_pRenderModel, pseqdesc );
+		// clip prevframe
+		StudioCalcRotations( pos1b, q1b, pseqdesc, panim, m_pCurrentEntity->latched.prevframe );
+
+		if (pseqdesc->numblends > 1)
+		{
+			panim += m_pStudioHeader->numbones;
+			StudioCalcRotations( pos2, q2, pseqdesc, panim, m_pCurrentEntity->latched.prevframe );
+
+			s = (m_pCurrentEntity->latched.prevseqblending[0]) / 255.0;
+			StudioSlerpBones( q1b, pos1b, q2, pos2, s );
+
+			if (pseqdesc->numblends == 4)
+			{
+				panim += m_pStudioHeader->numbones;
+				StudioCalcRotations( pos3, q3, pseqdesc, panim, m_pCurrentEntity->latched.prevframe );
+
+				panim += m_pStudioHeader->numbones;
+				StudioCalcRotations( pos4, q4, pseqdesc, panim, m_pCurrentEntity->latched.prevframe );
+
+				s = (m_pCurrentEntity->latched.prevseqblending[0]) / 255.0;
+				StudioSlerpBones( q3, pos3, q4, pos4, s );
+
+				s = (m_pCurrentEntity->latched.prevseqblending[1]) / 255.0;
+				StudioSlerpBones( q1b, pos1b, q3, pos3, s );
+			}
+		}
+
+		s = 1.0 - (m_clTime - m_pCurrentEntity->latched.sequencetime) / 0.2;
+		StudioSlerpBones( q, pos, q1b, pos1b, s );
+	}
+	else
+	{
+		//Con_DPrintf("prevframe = %4.2f\n", f);
+		m_pCurrentEntity->latched.prevframe = f;
+	}
+
+	pbones = (mstudiobone_t *)((byte *)m_pStudioHeader + m_pStudioHeader->boneindex);
+
+	// calc gait animation
+	if (m_pPlayerInfo && (m_pPlayerInfo->gaitsequence != 0) && (m_pPlayerInfo->gaitsequence != 255))
+	{
+		m_pPlayerInfo->gaitsequence = max(min(m_pPlayerInfo->gaitsequence, m_pStudioHeader->numseq-1), 0);
+		
+//		// Trim sequences within range (not sure why this is out of range though)
+//		int theIndex = min(max(0, m_pStudioHeader->seqindex), m_pStudioHeader->numseq - 1);
+//		if(theIndex != m_pStudioHeader->seqindex)
+//		{
+//			m_pStudioHeader->seqindex = theIndex;
+//			m_pPlayerInfo->gaitsequence = 0;
+//		}
+		
+		pseqdesc = (mstudioseqdesc_t *)((byte *)m_pStudioHeader + m_pStudioHeader->seqindex) + m_pPlayerInfo->gaitsequence;
+
+		panim = StudioGetAnim( m_pRenderModel, pseqdesc );
+		StudioCalcRotations( pos2, q2, pseqdesc, panim, m_pPlayerInfo->gaitframe );
+
+// Valve way
+//		for (i = 0; i < m_pStudioHeader->numbones; i++)
+//		{
+//			if (strcmp( pbones[i].name, "Bip01 Spine") == 0)
+//				break;
+//			memcpy( pos[i], pos2[i], sizeof( pos[i] ));
+//			memcpy( q[i], q2[i], sizeof( q[i] ));
+//		}
+
+// NS way
+		// Look up parent bone that defines the boundary for gaitsequence
+		int theNumParents = 0;
+		int theParents[MAXSTUDIOBONES];
+		memset(theParents, -1, sizeof(int)*MAXSTUDIOBONES);
+		
+		for (i = 0; i < m_pStudioHeader->numbones; i++)
+		{
+			// Must contain "Thigh"
+			if(strstr(pbones[i].name, "Thigh"))
+			{
+				theParents[theNumParents++] = i;
+			}
+		}
+		// If this is firing, it means a model has a gaitsequence set but doesn't have a bone that defines which bones are used for that gaitsequence
+		//ASSERT(theNumParents > 0);
+
+		// If there aren't any thighs, assume that the old HL way was used
+		if(theNumParents > 0)
+		{
+			int theNumBonesWithThisParent = 0;
+			int theBonesWithParent[MAXSTUDIOBONES];
+			
+			// For each bone
+			for(i = 0; i < m_pStudioHeader->numbones; i++)
+			{
+				for(int j = 0; j < theNumParents; j++)
+				{
+					// Does bone have this parent bone?
+					int theParent = theParents[j];
+					//if(/*(i == theParent) ||*/ GetDoesBoneHaveParent(i, theParent, pbones))
+					char* theBoneName = pbones[i].name;
+					if(!strcmp(theBoneName, "Bip01") || (!strcmp(theBoneName, "Bip01 Pelvis")) || (i == theParent) || GetDoesBoneHaveParent(i, theParent, pbones))
+					{
+						// If so, add it to the list and increment num bones
+						theBonesWithParent[theNumBonesWithThisParent++] = i;
+						break;
+					}
+				}
+			}
+			
+			for(int j = 0; j < theNumBonesWithThisParent; j++)
+			{
+				int i = theBonesWithParent[j];
+				
+				// If the bone is in this list, use that bones data (gaitsequence) instead of the existing data (sequence)
+				memcpy( pos[i], pos2[i], sizeof( pos[i] ));
+				memcpy( q[i], q2[i], sizeof( q[i] ));
+			}
+		}
+		else
+		{
+			for (i = 0; i < m_pStudioHeader->numbones; i++)
+			{
+				if (strcmp( pbones[i].name, "Bip01 Spine") == 0)
+					break;
+				memcpy( pos[i], pos2[i], sizeof( pos[i] ));
+				memcpy( q[i], q2[i], sizeof( q[i] ));
+			}
+		}
+		
+		//gEngfuncs.Con_Printf("gait: %d, frame: %f\n", m_pPlayerInfo->gaitsequence, m_pPlayerInfo->gaitframe);
+	}
+
+
+	for (i = 0; i < m_pStudioHeader->numbones; i++) 
+	{
+		QuaternionMatrix( q[i], bonematrix );
+
+		bonematrix[0][3] = pos[i][0];
+		bonematrix[1][3] = pos[i][1];
+		bonematrix[2][3] = pos[i][2];
+
+		if (pbones[i].parent == -1) 
+		{
+			if ( IEngineStudio.IsHardware() )
+			{
+				ConcatTransforms ((*m_protationmatrix), bonematrix, (*m_pbonetransform)[i]);
+				// MatrixCopy should be faster...
+				//ConcatTransforms ((*m_protationmatrix), bonematrix, (*m_plighttransform)[i]);
+				MatrixCopy( (*m_pbonetransform)[i], (*m_plighttransform)[i] );
+			}
+			else
+			{
+				ConcatTransforms ((*m_paliastransform), bonematrix, (*m_pbonetransform)[i]);
+				ConcatTransforms ((*m_protationmatrix), bonematrix, (*m_plighttransform)[i]);
+			}
+
+			// Apply client-side effects to the transformation matrix
+			StudioFxTransform( m_pCurrentEntity, (*m_pbonetransform)[i] );
+		} 
+		else 
+		{
+			ConcatTransforms ((*m_pbonetransform)[pbones[i].parent], bonematrix, (*m_pbonetransform)[i]);
+			ConcatTransforms ((*m_plighttransform)[pbones[i].parent], bonematrix, (*m_plighttransform)[i]);
+		}
+	}
+}
+
+
+/*
+====================
+StudioSaveBones
+
+====================
+*/
+void CStudioModelRenderer::StudioSaveBones( void )
+{
+	int		i;
+
+	mstudiobone_t		*pbones;
+	pbones = (mstudiobone_t *)((byte *)m_pStudioHeader + m_pStudioHeader->boneindex);
+
+	m_nCachedBones = m_pStudioHeader->numbones;
+
+	for (i = 0; i < m_pStudioHeader->numbones; i++) 
+	{
+		strcpy( m_nCachedBoneNames[i], pbones[i].name );
+		MatrixCopy( (*m_pbonetransform)[i], m_rgCachedBoneTransform[i] );
+		MatrixCopy( (*m_plighttransform)[i], m_rgCachedLightTransform[i] );
+	}
+}
+
+
+/*
+====================
+StudioMergeBones
+
+====================
+*/
+void CStudioModelRenderer::StudioMergeBones ( model_t *m_pSubModel )
+{
+	int					i, j;
+	double				f;
+	int					do_hunt = true;
+
+	mstudiobone_t		*pbones;
+	mstudioseqdesc_t	*pseqdesc;
+	mstudioanim_t		*panim;
+
+	static float		pos[MAXSTUDIOBONES][3];
+	float				bonematrix[3][4];
+	static vec4_t		q[MAXSTUDIOBONES];
+
+	if (m_pCurrentEntity->curstate.sequence >=  m_pStudioHeader->numseq) 
+	{
+		m_pCurrentEntity->curstate.sequence = 0;
+	}
+
+	pseqdesc = (mstudioseqdesc_t *)((byte *)m_pStudioHeader + m_pStudioHeader->seqindex) + m_pCurrentEntity->curstate.sequence;
+
+	f = StudioEstimateFrame( pseqdesc );
+
+	if (m_pCurrentEntity->latched.prevframe > f)
+	{
+		//Con_DPrintf("%f %f\n", m_pCurrentEntity->prevframe, f );
+	}
+
+	panim = StudioGetAnim( m_pSubModel, pseqdesc );
+	StudioCalcRotations( pos, q, pseqdesc, panim, f );
+
+	pbones = (mstudiobone_t *)((byte *)m_pStudioHeader + m_pStudioHeader->boneindex);
+
+
+	for (i = 0; i < m_pStudioHeader->numbones; i++) 
+	{
+		for (j = 0; j < m_nCachedBones; j++)
+		{
+			if (stricmp(pbones[i].name, m_nCachedBoneNames[j]) == 0)
+			{
+				MatrixCopy( m_rgCachedBoneTransform[j], (*m_pbonetransform)[i] );
+				MatrixCopy( m_rgCachedLightTransform[j], (*m_plighttransform)[i] );
+				break;
+			}
+		}
+		if (j >= m_nCachedBones)
+		{
+			QuaternionMatrix( q[i], bonematrix );
+
+			bonematrix[0][3] = pos[i][0];
+			bonematrix[1][3] = pos[i][1];
+			bonematrix[2][3] = pos[i][2];
+
+			if (pbones[i].parent == -1) 
+			{
+				if ( IEngineStudio.IsHardware() )
+				{
+					ConcatTransforms ((*m_protationmatrix), bonematrix, (*m_pbonetransform)[i]);
+					// MatrixCopy should be faster...
+					//ConcatTransforms ((*m_protationmatrix), bonematrix, (*m_plighttransform)[i]);
+					MatrixCopy( (*m_pbonetransform)[i], (*m_plighttransform)[i] );
+				}
+				else
+				{
+					ConcatTransforms ((*m_paliastransform), bonematrix, (*m_pbonetransform)[i]);
+					ConcatTransforms ((*m_protationmatrix), bonematrix, (*m_plighttransform)[i]);
+				}
+
+				// Apply client-side effects to the transformation matrix
+				StudioFxTransform( m_pCurrentEntity, (*m_pbonetransform)[i] );
+			} 
+			else 
+			{
+				ConcatTransforms ((*m_pbonetransform)[pbones[i].parent], bonematrix, (*m_pbonetransform)[i]);
+				ConcatTransforms ((*m_plighttransform)[pbones[i].parent], bonematrix, (*m_plighttransform)[i]);
+			}
+		}
+	}
+}
+
+/*
+====================
+StudioDrawModel
+
+====================
+*/
+int CStudioModelRenderer::StudioDrawModel( int flags )
+{
+	alight_t lighting;
+	vec3_t dir;
+
+	m_pCurrentEntity = IEngineStudio.GetCurrentEntity();
+	IEngineStudio.GetTimes( &m_nFrameCount, &m_clTime, &m_clOldTime );
+	IEngineStudio.GetViewInfo( m_vRenderOrigin, m_vUp, m_vRight, m_vNormal );
+	IEngineStudio.GetAliasScale( &m_fSoftwareXScale, &m_fSoftwareYScale );
+
+	// Horrible hack for preventing visual artifacts while being digested
+	if(gHUD.GetIsBeingDigested())
+	{
+		return 0;
+	}
+
+    /*
+	// Now render eyebeam if model is marine //
+	// If player is a marine
+	if(m_pCurrentEntity->curstate.iuser3 == AVH_USER3_MARINE_PLAYER)
+	{
+		// Get eyepiece attachment
+		vec3_t theEyepieceOrigin;
+		VectorCopy(m_pCurrentEntity->attachment[2], theEyepieceOrigin);
+		
+		// Build this line
+		
+		// Run a traceline along this line until it hits
+		
+		// Get endpoint
+		
+		// Draw red additive light along this line
+		//gEngfuncs.pEfxAPI->R_RocketTrail();
+	}
+    */
+
+	if (m_pCurrentEntity->curstate.renderfx == kRenderFxDeadPlayer)
+	{
+		entity_state_t deadplayer;
+
+		int result;
+		int save_interp;
+
+		if (m_pCurrentEntity->curstate.renderamt <= 0 || m_pCurrentEntity->curstate.renderamt > gEngfuncs.GetMaxClients() )
+			return 0;
+
+		// get copy of player
+		deadplayer = *(IEngineStudio.GetPlayerState( m_pCurrentEntity->curstate.renderamt - 1 )); //cl.frames[cl.parsecount & CL_UPDATE_MASK].playerstate[m_pCurrentEntity->curstate.renderamt-1];
+
+		// clear weapon, movement state
+		deadplayer.number = m_pCurrentEntity->curstate.renderamt;
+		deadplayer.weaponmodel = 0;
+		deadplayer.gaitsequence = 0;
+
+		deadplayer.movetype = MOVETYPE_NONE;
+		VectorCopy( m_pCurrentEntity->curstate.angles, deadplayer.angles );
+		VectorCopy( m_pCurrentEntity->curstate.origin, deadplayer.origin );
+
+		save_interp = m_fDoInterp;
+		m_fDoInterp = 0;
+		
+		// draw as though it were a player
+		result = StudioDrawPlayer( flags, &deadplayer );
+		
+		m_fDoInterp = save_interp;
+		return result;
+	}
+
+	m_pRenderModel = m_pCurrentEntity->model;
+	m_pStudioHeader = (studiohdr_t *)IEngineStudio.Mod_Extradata (m_pRenderModel);
+	IEngineStudio.StudioSetHeader( m_pStudioHeader );
+	IEngineStudio.SetRenderModel( m_pRenderModel );
+
+	StudioSetUpTransform( 0 );
+
+	if (flags & STUDIO_RENDER)
+	{
+		// see if the bounding box lets us trivially reject, also sets
+		if (!IEngineStudio.StudioCheckBBox ())
+			return 0;
+
+		(*m_pModelsDrawn)++;
+		(*m_pStudioModelCount)++; // render data cache cookie
+
+		if (m_pStudioHeader->numbodyparts == 0)
+			return 1;
+	}
+
+	if (m_pCurrentEntity->curstate.movetype == MOVETYPE_FOLLOW)
+	{
+		StudioMergeBones( m_pRenderModel );
+	}
+	else
+	{
+		StudioSetupBones( );
+	}
+	StudioSaveBones( );
+
+	if (flags & STUDIO_EVENTS)
+	{
+		StudioCalcAttachments( );
+		IEngineStudio.StudioClientEvents( );
+		// copy attachments into global entity array
+		if ( m_pCurrentEntity->index > 0 )
+		{
+			cl_entity_t *ent = gEngfuncs.GetEntityByIndex( m_pCurrentEntity->index );
+
+			memcpy( ent->attachment, m_pCurrentEntity->attachment, sizeof( vec3_t ) * 4 );
+		}
+	}
+
+	if (flags & STUDIO_RENDER)
+	{
+		lighting.plightvec = dir;
+		IEngineStudio.StudioDynamicLight(m_pCurrentEntity, &lighting );
+
+		IEngineStudio.StudioEntityLight( &lighting );
+
+		// model and frame independant
+		IEngineStudio.StudioSetupLighting (&lighting);
+
+		// get remap colors
+		m_nTopColor = m_pCurrentEntity->curstate.colormap & 0xFF;
+		m_nBottomColor = (m_pCurrentEntity->curstate.colormap & 0xFF00) >> 8;
+
+		IEngineStudio.StudioSetRemapColors( m_nTopColor, m_nBottomColor );
+
+		StudioRenderModel();
+
+		// If this is the local player's view model, hook into HUD
+		char theModelName[MAX_MODEL_NAME];
+		strcpy(theModelName, this->m_pCurrentEntity->model->name);
+			
+		gHUD.PostModelRender(theModelName);
+	}
+
+	return 1;
+}
+
+/*
+====================
+StudioEstimateGait
+
+====================
+*/
+void CStudioModelRenderer::StudioEstimateGait( entity_state_t *pplayer )
+{
+	float dt;
+	vec3_t est_velocity;
+
+	dt = (m_clTime - m_clOldTime);
+	if (dt < 0)
+		dt = 0;
+	else if (dt > 1.0)
+		dt = 1;
+
+	if (dt == 0 || m_pPlayerInfo->renderframe == m_nFrameCount)
+	{
+		m_flGaitMovement = 0;
+		return;
+	}
+
+	// VectorAdd( pplayer->velocity, pplayer->prediction_error, est_velocity );
+	if ( m_fGaitEstimation )
+	{
+		VectorSubtract( m_pCurrentEntity->origin, m_pPlayerInfo->prevgaitorigin, est_velocity );
+		VectorCopy( m_pCurrentEntity->origin, m_pPlayerInfo->prevgaitorigin );
+		m_flGaitMovement = Length( est_velocity );
+		if (dt <= 0 || m_flGaitMovement / dt < 5)
+		{
+			m_flGaitMovement = 0;
+			est_velocity[0] = 0;
+			est_velocity[1] = 0;
+		}
+	}
+	else
+	{
+		VectorCopy( pplayer->velocity, est_velocity );
+		m_flGaitMovement = Length( est_velocity ) * dt;
+	}
+
+	if (est_velocity[1] == 0 && est_velocity[0] == 0)
+	{
+		float flYawDiff = m_pCurrentEntity->angles[YAW] - m_pPlayerInfo->gaityaw;
+		flYawDiff = flYawDiff - (int)(flYawDiff / 360) * 360;
+		if (flYawDiff > 180)
+			flYawDiff -= 360;
+		if (flYawDiff < -180)
+			flYawDiff += 360;
+
+		if (dt < 0.25)
+			flYawDiff *= dt * 4;
+		else
+			flYawDiff *= dt;
+
+		m_pPlayerInfo->gaityaw += flYawDiff;
+		m_pPlayerInfo->gaityaw = m_pPlayerInfo->gaityaw - (int)(m_pPlayerInfo->gaityaw / 360) * 360;
+
+		m_flGaitMovement = 0;
+	}
+	else
+	{
+		m_pPlayerInfo->gaityaw = (atan2(est_velocity[1], est_velocity[0]) * 180 / M_PI);
+		if (m_pPlayerInfo->gaityaw > 180)
+			m_pPlayerInfo->gaityaw = 180;
+		if (m_pPlayerInfo->gaityaw < -180)
+			m_pPlayerInfo->gaityaw = -180;
+	}
+
+}
+
+/*
+====================
+StudioProcessGait
+
+====================
+*/
+void CStudioModelRenderer::StudioProcessGait( entity_state_t *pplayer )
+{
+	mstudioseqdesc_t	*pseqdesc;
+	float dt;
+	int iBlend;
+	float flYaw;	 // view direction relative to movement
+
+	m_pCurrentEntity->curstate.sequence = max(min(m_pCurrentEntity->curstate.sequence, m_pStudioHeader->numseq-1), 0);
+
+	pseqdesc = (mstudioseqdesc_t *)((byte *)m_pStudioHeader + m_pStudioHeader->seqindex) + m_pCurrentEntity->curstate.sequence;
+
+	StudioPlayerBlend( pseqdesc, &iBlend, &m_pCurrentEntity->angles[PITCH] );
+
+	m_pCurrentEntity->latched.prevangles[PITCH] = m_pCurrentEntity->angles[PITCH];
+	m_pCurrentEntity->curstate.blending[0] = iBlend;
+	m_pCurrentEntity->latched.prevblending[0] = m_pCurrentEntity->curstate.blending[0];
+	m_pCurrentEntity->latched.prevseqblending[0] = m_pCurrentEntity->curstate.blending[0];
+
+	// Con_DPrintf("%f %d\n", m_pCurrentEntity->angles[PITCH], m_pCurrentEntity->blending[0] );
+
+	dt = (m_clTime - m_clOldTime);
+	if (dt < 0)
+		dt = 0;
+	else if (dt > 1.0)
+		dt = 1;
+
+	StudioEstimateGait( pplayer );
+
+	// Con_DPrintf("%f %f\n", m_pCurrentEntity->angles[YAW], m_pPlayerInfo->gaityaw );
+
+	// calc side to side turning
+	flYaw = m_pCurrentEntity->angles[YAW] - m_pPlayerInfo->gaityaw;
+	flYaw = flYaw - (int)(flYaw / 360) * 360;
+	if (flYaw < -180)
+		flYaw = flYaw + 360;
+	if (flYaw > 180)
+		flYaw = flYaw - 360;
+
+	if (flYaw > 120)
+	{
+		m_pPlayerInfo->gaityaw = m_pPlayerInfo->gaityaw - 180;
+		m_flGaitMovement = -m_flGaitMovement;
+		flYaw = flYaw - 180;
+	}
+	else if (flYaw < -120)
+	{
+		m_pPlayerInfo->gaityaw = m_pPlayerInfo->gaityaw + 180;
+		m_flGaitMovement = -m_flGaitMovement;
+		flYaw = flYaw + 180;
+	}
+
+	// adjust torso
+	m_pCurrentEntity->curstate.controller[0] = ((flYaw / 4.0) + 30) / (60.0 / 255.0);
+	m_pCurrentEntity->curstate.controller[1] = ((flYaw / 4.0) + 30) / (60.0 / 255.0);
+	m_pCurrentEntity->curstate.controller[2] = ((flYaw / 4.0) + 30) / (60.0 / 255.0);
+	m_pCurrentEntity->curstate.controller[3] = ((flYaw / 4.0) + 30) / (60.0 / 255.0);
+	m_pCurrentEntity->latched.prevcontroller[0] = m_pCurrentEntity->curstate.controller[0];
+	m_pCurrentEntity->latched.prevcontroller[1] = m_pCurrentEntity->curstate.controller[1];
+	m_pCurrentEntity->latched.prevcontroller[2] = m_pCurrentEntity->curstate.controller[2];
+	m_pCurrentEntity->latched.prevcontroller[3] = m_pCurrentEntity->curstate.controller[3];
+
+	m_pCurrentEntity->angles[YAW] = m_pPlayerInfo->gaityaw;
+	if (m_pCurrentEntity->angles[YAW] < -0)
+		m_pCurrentEntity->angles[YAW] += 360;
+	m_pCurrentEntity->latched.prevangles[YAW] = m_pCurrentEntity->angles[YAW];
+
+	pplayer->gaitsequence = max(min(pplayer->gaitsequence, m_pStudioHeader->numseq-1), 0);
+	
+	pseqdesc = (mstudioseqdesc_t *)((byte *)m_pStudioHeader + m_pStudioHeader->seqindex) + pplayer->gaitsequence;
+
+	// calc gait frame
+	if (pseqdesc->linearmovement[0] > 0)
+	{
+		m_pPlayerInfo->gaitframe += (m_flGaitMovement / pseqdesc->linearmovement[0]) * pseqdesc->numframes;
+	}
+	else
+	{
+		m_pPlayerInfo->gaitframe += pseqdesc->fps * dt;
+	}
+
+	// do modulo
+	m_pPlayerInfo->gaitframe = m_pPlayerInfo->gaitframe - (int)(m_pPlayerInfo->gaitframe / pseqdesc->numframes) * pseqdesc->numframes;
+	if (m_pPlayerInfo->gaitframe < 0)
+		m_pPlayerInfo->gaitframe += pseqdesc->numframes;
+}
+
+/*
+====================
+StudioDrawPlayer
+
+====================
+*/
+int CStudioModelRenderer::StudioDrawPlayer( int flags, entity_state_t *pplayer )
+{
+	alight_t lighting;
+	vec3_t dir;
+
+	m_pCurrentEntity = IEngineStudio.GetCurrentEntity();
+	IEngineStudio.GetTimes( &m_nFrameCount, &m_clTime, &m_clOldTime );
+	IEngineStudio.GetViewInfo( m_vRenderOrigin, m_vUp, m_vRight, m_vNormal );
+	IEngineStudio.GetAliasScale( &m_fSoftwareXScale, &m_fSoftwareYScale );
+
+	// Horrible hack for preventing visual artifacts while being digested
+	if(gHUD.GetIsBeingDigested())
+	{
+		return 0;
+	}
+
+	// Con_DPrintf("DrawPlayer %d\n", m_pCurrentEntity->blending[0] );
+
+	// Con_DPrintf("DrawPlayer %d %d (%d)\n", m_nFrameCount, pplayer->player_index, m_pCurrentEntity->curstate.sequence );
+
+	// Con_DPrintf("Player %.2f %.2f %.2f\n", pplayer->velocity[0], pplayer->velocity[1], pplayer->velocity[2] );
+
+	m_nPlayerIndex = pplayer->number - 1;
+
+	if (m_nPlayerIndex < 0 || m_nPlayerIndex >= gEngfuncs.GetMaxClients())
+		return 0;
+
+	//m_pRenderModel = IEngineStudio.SetupPlayerModel( m_nPlayerIndex );
+	m_pRenderModel = m_pCurrentEntity->model;
+	if (m_pRenderModel == NULL)
+		return 0;
+
+	m_pStudioHeader = (studiohdr_t *)IEngineStudio.Mod_Extradata (m_pRenderModel);
+	IEngineStudio.StudioSetHeader( m_pStudioHeader );
+	IEngineStudio.SetRenderModel( m_pRenderModel );
+
+	if (pplayer->gaitsequence)
+	{
+		vec3_t orig_angles;
+		m_pPlayerInfo = IEngineStudio.PlayerInfo( m_nPlayerIndex );
+
+		VectorCopy( m_pCurrentEntity->angles, orig_angles );
+	
+		StudioProcessGait( pplayer );
+
+		m_pPlayerInfo->gaitsequence = pplayer->gaitsequence;
+		m_pPlayerInfo = NULL;
+
+		StudioSetUpTransform( 0 );
+		VectorCopy( orig_angles, m_pCurrentEntity->angles );
+	}
+	else
+	{
+		m_pCurrentEntity->curstate.controller[0] = 127;
+		m_pCurrentEntity->curstate.controller[1] = 127;
+		m_pCurrentEntity->curstate.controller[2] = 127;
+		m_pCurrentEntity->curstate.controller[3] = 127;
+		m_pCurrentEntity->latched.prevcontroller[0] = m_pCurrentEntity->curstate.controller[0];
+		m_pCurrentEntity->latched.prevcontroller[1] = m_pCurrentEntity->curstate.controller[1];
+		m_pCurrentEntity->latched.prevcontroller[2] = m_pCurrentEntity->curstate.controller[2];
+		m_pCurrentEntity->latched.prevcontroller[3] = m_pCurrentEntity->curstate.controller[3];
+		
+		m_pPlayerInfo = IEngineStudio.PlayerInfo( m_nPlayerIndex );
+		m_pPlayerInfo->gaitsequence = 0;
+
+		StudioSetUpTransform( 0 );
+	}
+
+	if (flags & STUDIO_RENDER)
+	{
+		// see if the bounding box lets us trivially reject, also sets
+		if (!IEngineStudio.StudioCheckBBox ())
+			return 0;
+
+		(*m_pModelsDrawn)++;
+		(*m_pStudioModelCount)++; // render data cache cookie
+
+		if (m_pStudioHeader->numbodyparts == 0)
+			return 1;
+	}
+
+	m_pPlayerInfo = IEngineStudio.PlayerInfo( m_nPlayerIndex );
+	StudioSetupBones( );
+	StudioSaveBones( );
+	m_pPlayerInfo->renderframe = m_nFrameCount;
+
+	m_pPlayerInfo = NULL;
+
+	if (flags & STUDIO_EVENTS)
+	{
+		StudioCalcAttachments( );
+		IEngineStudio.StudioClientEvents( );
+		// copy attachments into global entity array
+		if ( m_pCurrentEntity->index > 0 )
+		{
+			cl_entity_t *ent = gEngfuncs.GetEntityByIndex( m_pCurrentEntity->index );
+
+			memcpy( ent->attachment, m_pCurrentEntity->attachment, sizeof( vec3_t ) * 4 );
+		}
+	}
+
+	if (flags & STUDIO_RENDER)
+	{
+        /*
+		if (m_pCvarHiModels->value && m_pRenderModel != m_pCurrentEntity->model  )
+		{
+			// show highest resolution multiplayer model
+			m_pCurrentEntity->curstate.body = 255;
+		}
+        */
+
+		lighting.plightvec = dir;
+		IEngineStudio.StudioDynamicLight(m_pCurrentEntity, &lighting );
+
+		IEngineStudio.StudioEntityLight( &lighting );
+
+		// model and frame independant
+		IEngineStudio.StudioSetupLighting (&lighting);
+
+		m_pPlayerInfo = IEngineStudio.PlayerInfo( m_nPlayerIndex );
+
+		// get remap colors
+		m_nTopColor = m_pPlayerInfo->topcolor;
+		m_nBottomColor = m_pPlayerInfo->bottomcolor;
+		if (m_nTopColor < 0)
+			m_nTopColor = 0;
+		if (m_nTopColor > 360)
+			m_nTopColor = 360;
+		if (m_nBottomColor < 0)
+			m_nBottomColor = 0;
+		if (m_nBottomColor > 360)
+			m_nBottomColor = 360;
+
+		IEngineStudio.StudioSetRemapColors( m_nTopColor, m_nBottomColor );
+
+		StudioRenderModel( );
+		m_pPlayerInfo = NULL;
+
+		if (pplayer->weaponmodel)
+		{
+			cl_entity_t saveent = *m_pCurrentEntity;
+
+			model_t *pweaponmodel = IEngineStudio.GetModelByIndex( pplayer->weaponmodel );
+
+			m_pStudioHeader = (studiohdr_t *)IEngineStudio.Mod_Extradata (pweaponmodel);
+			IEngineStudio.StudioSetHeader( m_pStudioHeader );
+
+			StudioMergeBones( pweaponmodel);
+
+			IEngineStudio.StudioSetupLighting (&lighting);
+
+			StudioRenderModel( );
+
+			StudioCalcAttachments( );
+
+			*m_pCurrentEntity = saveent;
+		}
+	}
+
+	return 1;
+}
+
+/*
+====================
+StudioCalcAttachments
+
+====================
+*/
+void CStudioModelRenderer::StudioCalcAttachments( void )
+{
+	int i;
+	mstudioattachment_t *pattachment;
+
+	if ( m_pStudioHeader->numattachments > 4 )
+	{
+		gEngfuncs.Con_DPrintf( "Too many attachments on %s\n", m_pCurrentEntity->model->name );
+		exit( -1 );
+	}
+
+	// calculate attachment points
+	pattachment = (mstudioattachment_t *)((byte *)m_pStudioHeader + m_pStudioHeader->attachmentindex);
+	for (i = 0; i < m_pStudioHeader->numattachments; i++)
+	{
+		VectorTransform( pattachment[i].org, (*m_plighttransform)[pattachment[i].bone],  m_pCurrentEntity->attachment[i] );
+	}
+}
+
+/*
+====================
+StudioRenderModel
+
+====================
+*/
+void CStudioModelRenderer::StudioRenderModel( void )
+{
+	IEngineStudio.SetChromeOrigin();
+	IEngineStudio.SetForceFaceFlags( 0 );
+
+	if ( m_pCurrentEntity->curstate.renderfx == kRenderFxGlowShell )
+	{
+		m_pCurrentEntity->curstate.renderfx = kRenderFxNone;
+		StudioRenderFinal( );
+		
+		if ( !IEngineStudio.IsHardware() )
+		{
+			gEngfuncs.pTriAPI->RenderMode( kRenderTransAdd );
+		}
+
+		IEngineStudio.SetForceFaceFlags( STUDIO_NF_CHROME );
+
+		gEngfuncs.pTriAPI->SpriteTexture( m_pChromeSprite, 0 );
+		m_pCurrentEntity->curstate.renderfx = kRenderFxGlowShell;
+
+		StudioRenderFinal( );
+		if ( !IEngineStudio.IsHardware() )
+		{
+			gEngfuncs.pTriAPI->RenderMode( kRenderNormal );
+		}
+	}
+	else
+	{
+		StudioRenderFinal( );
+	}
+}
+
+/*
+====================
+StudioRenderFinal_Software
+
+====================
+*/
+void CStudioModelRenderer::StudioRenderFinal_Software( void )
+{
+	int i;
+
+	// Note, rendermode set here has effect in SW
+	IEngineStudio.SetupRenderer( 0 ); 
+
+	// Put this in here?
+	//int theRenderMode = GetRenderModeForModelName(rendermode, m_pSubModel[i].name);
+
+	if (m_pCvarDrawEntities->value == 2)
+	{
+		IEngineStudio.StudioDrawBones( );
+	}
+	else if (m_pCvarDrawEntities->value == 3)
+	{
+		IEngineStudio.StudioDrawHulls( );
+	}
+	else
+	{
+		for (i=0 ; i < m_pStudioHeader->numbodyparts ; i++)
+		{
+			IEngineStudio.StudioSetupModel( i, (void **)&m_pBodyPart, (void **)&m_pSubModel );
+			IEngineStudio.StudioDrawPoints( );
+		}
+	}
+
+	if (m_pCvarDrawEntities->value == 4)
+	{
+		gEngfuncs.pTriAPI->RenderMode( kRenderTransAdd );
+		IEngineStudio.StudioDrawHulls( );
+		gEngfuncs.pTriAPI->RenderMode( kRenderNormal );
+	}
+
+	if (m_pCvarDrawEntities->value == 5)
+	{
+		IEngineStudio.StudioDrawAbsBBox( );
+	}
+	
+	IEngineStudio.RestoreRenderer();
+}
+
+/*
+====================
+StudioRenderFinal_Hardware
+
+  ====================
+*/
+void CStudioModelRenderer::StudioRenderFinal_Hardware( void )
+{
+	int i;
+	int rendermode;
+	
+	rendermode = IEngineStudio.GetForceFaceFlags() ? kRenderTransAdd : m_pCurrentEntity->curstate.rendermode;
+	IEngineStudio.SetupRenderer( rendermode );
+	
+	if (m_pCvarDrawEntities->value == 2)
+	{
+		IEngineStudio.StudioDrawBones();
+	}
+	else if (m_pCvarDrawEntities->value == 3)
+	{
+		IEngineStudio.StudioDrawHulls();
+	}
+	else
+	{
+		for (i=0 ; i < m_pStudioHeader->numbodyparts ; i++)
+		{
+			IEngineStudio.StudioSetupModel( i, (void **)&m_pBodyPart, (void **)&m_pSubModel );
+			if (m_fDoInterp)
+			{
+				// interpolation messes up bounding boxes.
+				m_pCurrentEntity->trivial_accept = 0; 
+			}
+
+			IEngineStudio.GL_SetRenderMode(rendermode);
+
+//			mstudiobodyparts_t*	pbodypart = (mstudiobodyparts_t *)((byte *)m_pStudioHeader + m_pStudioHeader->bodypartindex) + i;
+//			
+//			//int index = m_bodynum / pbodypart->base;
+//			//index = index % pbodypart->nummodels;
+//			
+//			mstudiomodel_t* theModel = (mstudiomodel_t *)((byte *)m_pStudioHeader + pbodypart->modelindex);// + index;
+//			ASSERT(theModel);
+//
+//			int theModelRenderMode = rendermode;//GetRenderModeForModelName(rendermode, theModel->name);
+//
+//			// This could be dangerous...how to find out?
+//			//IEngineStudio.SetupRenderer( theModelRenderMode );
+//			
+//			IEngineStudio.GL_SetRenderMode( theModelRenderMode );
+
+			IEngineStudio.StudioDrawPoints();
+			IEngineStudio.GL_StudioDrawShadow();
+		}
+	}
+
+	if ( m_pCvarDrawEntities->value == 4 )
+	{
+		gEngfuncs.pTriAPI->RenderMode( kRenderTransAdd );
+		IEngineStudio.StudioDrawHulls( );
+		gEngfuncs.pTriAPI->RenderMode( kRenderNormal );
+	}
+
+	if (m_pCvarDrawEntities->value == 5)
+	{
+		IEngineStudio.StudioDrawAbsBBox( );
+	}
+
+	IEngineStudio.RestoreRenderer();
+}
+
+/*
+====================
+StudioRenderFinal
+
+====================
+*/
+void CStudioModelRenderer::StudioRenderFinal(void)
+{
+	if ( IEngineStudio.IsHardware() )
+	{
+		StudioRenderFinal_Hardware();
+	}
+	else
+	{
+		StudioRenderFinal_Software();
+	}
+}
+
diff --git a/main/source/cl_dll/StudioModelRenderer.h b/main/source/cl_dll/StudioModelRenderer.h
new file mode 100644
index 00000000..0220d448
--- /dev/null
+++ b/main/source/cl_dll/StudioModelRenderer.h
@@ -0,0 +1,182 @@
+#if !defined ( STUDIOMODELRENDERER_H )
+#define STUDIOMODELRENDERER_H
+#if defined( _WIN32 )
+#pragma once
+#endif
+
+/*
+====================
+CStudioModelRenderer
+
+====================
+*/
+class CStudioModelRenderer
+{
+public:
+	// Construction/Destruction
+	CStudioModelRenderer( void );
+	virtual ~CStudioModelRenderer( void );
+
+	// Initialization
+	virtual void Init( void );
+
+public:  
+	// Public Interfaces
+	virtual int StudioDrawModel ( int flags );
+	virtual int StudioDrawPlayer ( int flags, struct entity_state_s *pplayer );
+
+public:
+	// Local interfaces
+	//
+
+	// Look up animation data for sequence
+	virtual mstudioanim_t *StudioGetAnim ( model_t *m_pSubModel, mstudioseqdesc_t *pseqdesc );
+
+	// Interpolate model position and angles and set up matrices
+	virtual void StudioSetUpTransform (int trivial_accept);
+
+	// Set up model bone positions
+	virtual void StudioSetupBones ( void );	
+
+	// Find final attachment points
+	virtual void StudioCalcAttachments ( void );
+	
+	// Save bone matrices and names
+	virtual void StudioSaveBones( void );
+
+	// Merge cached bones with current bones for model
+	virtual void StudioMergeBones ( model_t *m_pSubModel );
+
+	// Determine interpolation fraction
+	virtual float StudioEstimateInterpolant( void );
+
+	// Determine current frame for rendering
+	virtual float StudioEstimateFrame ( mstudioseqdesc_t *pseqdesc );
+
+	// Apply special effects to transform matrix
+	virtual void StudioFxTransform( cl_entity_t *ent, float transform[3][4] );
+
+	// Spherical interpolation of bones
+	virtual void StudioSlerpBones ( vec4_t q1[], float pos1[][3], vec4_t q2[], float pos2[][3], float s );
+
+	// Compute bone adjustments ( bone controllers )
+	virtual void StudioCalcBoneAdj ( float dadt, float *adj, const byte *pcontroller1, const byte *pcontroller2, byte mouthopen );
+
+	// Get bone quaternions
+	virtual void StudioCalcBoneQuaterion ( int frame, float s, mstudiobone_t *pbone, mstudioanim_t *panim, float *adj, float *q );
+
+	// Get bone positions
+	virtual void StudioCalcBonePosition ( int frame, float s, mstudiobone_t *pbone, mstudioanim_t *panim, float *adj, float *pos );
+
+	// Compute rotations
+	virtual void StudioCalcRotations ( float pos[][3], vec4_t *q, mstudioseqdesc_t *pseqdesc, mstudioanim_t *panim, float f );
+
+	// Send bones and verts to renderer
+	virtual void StudioRenderModel ( void );
+
+	// Finalize rendering
+	virtual void StudioRenderFinal (void);
+	
+	// GL&D3D vs. Software renderer finishing functions
+	virtual void StudioRenderFinal_Software ( void );
+	virtual void StudioRenderFinal_Hardware ( void );
+
+	// Player specific data
+	// Determine pitch and blending amounts for players
+	virtual void StudioPlayerBlend ( mstudioseqdesc_t *pseqdesc, int *pBlend, float *pPitch );
+
+	// Estimate gait frame for player
+	virtual void StudioEstimateGait ( entity_state_t *pplayer );
+
+	// Process movement of player
+	virtual void StudioProcessGait ( entity_state_t *pplayer );
+
+public:
+
+	// Client clock
+	double			m_clTime;				
+	// Old Client clock
+	double			m_clOldTime;			
+
+	// Do interpolation?
+	int				m_fDoInterp;			
+	// Do gait estimation?
+	int				m_fGaitEstimation;		
+
+	// Current render frame #
+	int				m_nFrameCount;
+
+	// Cvars that studio model code needs to reference
+	//
+	// Use high quality models?
+	cvar_t			*m_pCvarHiModels;	
+	// Developer debug output desired?
+	cvar_t			*m_pCvarDeveloper;
+	// Draw entities bone hit boxes, etc?
+	cvar_t			*m_pCvarDrawEntities;
+
+	// The entity which we are currently rendering.
+	cl_entity_t		*m_pCurrentEntity;		
+
+	// The model for the entity being rendered
+	model_t			*m_pRenderModel;
+
+	// Player info for current player, if drawing a player
+	player_info_t	*m_pPlayerInfo;
+
+	// The index of the player being drawn
+	int				m_nPlayerIndex;
+
+	// The player's gait movement
+	float			m_flGaitMovement;
+
+	// Pointer to header block for studio model data
+	studiohdr_t		*m_pStudioHeader;
+	
+	// Pointers to current body part and submodel
+	mstudiobodyparts_t *m_pBodyPart;
+	mstudiomodel_t	*m_pSubModel;
+
+	// Palette substition for top and bottom of model
+	int				m_nTopColor;			
+	int				m_nBottomColor;
+
+	//
+	// Sprite model used for drawing studio model chrome
+	model_t			*m_pChromeSprite;
+
+	// Caching
+	// Number of bones in bone cache
+	int				m_nCachedBones; 
+	// Names of cached bones
+	char			m_nCachedBoneNames[ MAXSTUDIOBONES ][ 32 ];
+	// Cached bone & light transformation matrices
+	float			m_rgCachedBoneTransform [ MAXSTUDIOBONES ][ 3 ][ 4 ];
+	float			m_rgCachedLightTransform[ MAXSTUDIOBONES ][ 3 ][ 4 ];
+
+	// Software renderer scale factors
+	float			m_fSoftwareXScale, m_fSoftwareYScale;
+
+	// Current view vectors and render origin
+	float			m_vUp[ 3 ];
+	float			m_vRight[ 3 ];
+	float			m_vNormal[ 3 ];
+
+	float			m_vRenderOrigin[ 3 ];
+	
+	// Model render counters ( from engine )
+	int				*m_pStudioModelCount;
+	int				*m_pModelsDrawn;
+
+	// Matrices
+	// Model to world transformation
+	float			(*m_protationmatrix)[ 3 ][ 4 ];	
+	// Model to view transformation
+	float			(*m_paliastransform)[ 3 ][ 4 ];	
+
+	// Concatenated bone and light transforms
+	float			(*m_pbonetransform) [ MAXSTUDIOBONES ][ 3 ][ 4 ];
+	float			(*m_plighttransform)[ MAXSTUDIOBONES ][ 3 ][ 4 ];
+};
+
+#endif // STUDIOMODELRENDERER_H
\ No newline at end of file
diff --git a/main/source/cl_dll/ammo.cpp b/main/source/cl_dll/ammo.cpp
new file mode 100644
index 00000000..5498b293
--- /dev/null
+++ b/main/source/cl_dll/ammo.cpp
@@ -0,0 +1,1410 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// Ammo.cpp
+//
+// implementation of CHudAmmo class
+//
+
+#include "hud.h"
+#include "cl_util.h"
+#include "parsemsg.h"
+
+#include <string.h>
+#include <stdio.h>
+
+#include "ammohistory.h"
+#include "vgui_TeamFortressViewport.h"
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHScrollHandler.h"
+#include "build.h"
+
+WEAPON *gpActiveSel;	// NULL means off, 1 means just the menu bar, otherwise
+						// this points to the active weapon menu item
+WEAPON *gpLastSel;		// Last weapon menu selection 
+
+bool HUD_GetWeaponEnabled(int inID);
+client_sprite_t *GetSpriteList(client_sprite_t *pList, const char *psz, int iRes, int iCount);
+
+WeaponsResource gWR;
+
+int g_weaponselect = 0;
+
+//Equivalent to DECLARE_COMMAND(lastinv,LastInv) except we use gWR instead of gHud
+void __CmdFunc_LastInv(void)
+{
+	gWR.UserCmd_LastInv();
+}
+
+void WeaponsResource::Init(void)
+{
+	memset( rgWeapons, 0, sizeof rgWeapons );
+	lastWeapon = NULL;
+	HOOK_COMMAND("lastinv",LastInv);
+	Reset();
+}
+
+void WeaponsResource :: LoadAllWeaponSprites( void )
+{
+	for (int i = 0; i < MAX_WEAPONS; i++)
+	{
+		if ( rgWeapons[i].iId )
+			LoadWeaponSprites( &rgWeapons[i] );
+	}
+}
+
+int WeaponsResource :: CountAmmo( int iId ) 
+{ 
+	if ( iId < 0 )
+		return 0;
+
+	return riAmmo[iId];
+}
+
+int WeaponsResource :: HasAmmo( WEAPON *p )
+{
+	if ( !p )
+		return FALSE;
+
+	// weapons with no max ammo can always be selected
+	if ( p->iMax1 == -1 )
+		return TRUE;
+
+	return (p->iAmmoType == -1) || p->iClip > 0 || CountAmmo(p->iAmmoType) 
+		|| CountAmmo(p->iAmmo2Type) || ( p->iFlags & WEAPON_FLAGS_SELECTONEMPTY );
+}
+
+int WeaponsResource::IsEnabled(WEAPON* p)
+{
+	int theIsEnabled = FALSE;
+	// If weapon is enabled
+	if(HUD_GetWeaponEnabled(p->iId))
+	{
+		theIsEnabled = this->HasAmmo(p);
+	}
+	return theIsEnabled;
+}
+
+int WeaponsResource::IsSelectable(WEAPON* p)
+{
+	int theIsSelectable = FALSE;
+	if(p != NULL ) 
+	{
+//		char msg[1024];
+//		sprintf(msg, "Weapon %s: ", p->szName);
+//		ConsolePrint(msg);
+		if ( HUD_GetWeaponEnabled(p->iId))
+		{
+			theIsSelectable = TRUE;
+//			ConsolePrint("Enabled\n");
+		}
+		else 
+		{
+//			ConsolePrint("Not Enabled\n");
+		}
+	}
+//	else 
+//	{
+//		ConsolePrint("Null Weapon\n");
+//	}
+	return theIsSelectable;
+}
+
+void WeaponsResource :: LoadWeaponSprites( WEAPON *pWeapon )
+{
+	int i, iRes;
+
+	if (ScreenWidth() < 640)
+		iRes = 320;
+	else
+		iRes = 640;
+
+	char sz[128];
+
+	if ( !pWeapon )
+		return;
+
+	memset( &pWeapon->rcActive, 0, sizeof(wrect_t) );
+	memset( &pWeapon->rcInactive, 0, sizeof(wrect_t) );
+	memset( &pWeapon->rcAmmo, 0, sizeof(wrect_t) );
+	memset( &pWeapon->rcAmmo2, 0, sizeof(wrect_t) );
+	pWeapon->hInactive = 0;
+	pWeapon->hActive = 0;
+	pWeapon->hAmmo = 0;
+	pWeapon->hAmmo2 = 0;
+
+	sprintf(sz, "sprites/%s.txt", pWeapon->szName);
+	client_sprite_t *pList = SPR_GetList(sz, &i);
+
+	if (!pList)
+	{
+		ASSERT(pList);
+		return;
+	}
+
+	client_sprite_t *p;
+	
+	p = GetSpriteList( pList, "crosshair", iRes, i );
+	if (p)
+	{
+		sprintf(sz, "sprites/%s.spr", p->szSprite);
+		pWeapon->hCrosshair = Safe_SPR_Load(sz);
+		pWeapon->rcCrosshair = p->rc;
+	}
+	else
+		pWeapon->hCrosshair = NULL;
+
+	p = GetSpriteList(pList, "autoaim", iRes, i);
+	if (p)
+	{
+		sprintf(sz, "sprites/%s.spr", p->szSprite);
+		pWeapon->hAutoaim = Safe_SPR_Load(sz);
+		pWeapon->rcAutoaim = p->rc;
+	}
+	else
+		pWeapon->hAutoaim = 0;
+
+	p = GetSpriteList( pList, "zoom", iRes, i );
+	if (p)
+	{
+		sprintf(sz, "sprites/%s.spr", p->szSprite);
+		pWeapon->hZoomedCrosshair = Safe_SPR_Load(sz);
+		pWeapon->rcZoomedCrosshair = p->rc;
+	}
+	else
+	{
+		pWeapon->hZoomedCrosshair = pWeapon->hCrosshair; //default to non-zoomed crosshair
+		pWeapon->rcZoomedCrosshair = pWeapon->rcCrosshair;
+	}
+
+	p = GetSpriteList(pList, "zoom_autoaim", iRes, i);
+	if (p)
+	{
+		sprintf(sz, "sprites/%s.spr", p->szSprite);
+		pWeapon->hZoomedAutoaim = Safe_SPR_Load(sz);
+		pWeapon->rcZoomedAutoaim = p->rc;
+	}
+	else
+	{
+		pWeapon->hZoomedAutoaim = pWeapon->hZoomedCrosshair;  //default to zoomed crosshair
+		pWeapon->rcZoomedAutoaim = pWeapon->rcZoomedCrosshair;
+	}
+
+	p = GetSpriteList(pList, "weapon", iRes, i);
+	if (p)
+	{
+		sprintf(sz, "sprites/%s.spr", p->szSprite);
+		pWeapon->hInactive = Safe_SPR_Load(sz);
+		pWeapon->rcInactive = p->rc;
+
+		gHR.iHistoryGap = max( gHR.iHistoryGap, pWeapon->rcActive.bottom - pWeapon->rcActive.top );
+	}
+	else
+		pWeapon->hInactive = 0;
+
+	p = GetSpriteList(pList, "weapon_s", iRes, i);
+	if (p)
+	{
+		sprintf(sz, "sprites/%s.spr", p->szSprite);
+		pWeapon->hActive = Safe_SPR_Load(sz);
+		pWeapon->rcActive = p->rc;
+	}
+	else
+		pWeapon->hActive = 0;
+
+	p = GetSpriteList(pList, "ammo", iRes, i);
+	if (p)
+	{
+		sprintf(sz, "sprites/%s.spr", p->szSprite);
+		pWeapon->hAmmo = Safe_SPR_Load(sz);
+		pWeapon->rcAmmo = p->rc;
+
+		gHR.iHistoryGap = max( gHR.iHistoryGap, pWeapon->rcActive.bottom - pWeapon->rcActive.top );
+	}
+	else
+		pWeapon->hAmmo = 0;
+
+	p = GetSpriteList(pList, "ammo2", iRes, i);
+	if (p)
+	{
+		sprintf(sz, "sprites/%s.spr", p->szSprite);
+		pWeapon->hAmmo2 = Safe_SPR_Load(sz);
+		pWeapon->rcAmmo2 = p->rc;
+
+		gHR.iHistoryGap = max( gHR.iHistoryGap, pWeapon->rcActive.bottom - pWeapon->rcActive.top );
+	}
+	else
+		pWeapon->hAmmo2 = 0;
+
+}
+
+// Returns the first weapon for a given slot.
+WEAPON *WeaponsResource :: GetFirstPos( int iSlot )
+{
+	WEAPON *pret = NULL;
+
+	for (int i = 0; i < MAX_WEAPON_POSITIONS; i++)
+	{
+		if (this->IsSelectable(rgSlots[iSlot][i]))
+		{
+			pret = rgSlots[iSlot][i];
+			break;
+		}
+	}
+
+	return pret;
+}
+
+
+WEAPON* WeaponsResource :: GetNextActivePos( int iSlot, int iSlotPos )
+{
+	if ( iSlotPos >= MAX_WEAPON_POSITIONS || iSlot >= MAX_WEAPON_SLOTS )
+		return NULL;
+
+	WEAPON *p = gWR.rgSlots[ iSlot ][ iSlotPos+1 ];
+	
+	if (!this->IsSelectable(p))
+		return GetNextActivePos( iSlot, iSlotPos + 1 );
+
+	return p;
+}
+
+void WeaponsResource::SetCurrentWeapon(WEAPON* newWeapon)
+{
+	WEAPON* currentWeapon = this->GetWeapon(gHUD.GetCurrentWeaponID());
+	// puzl: 497 - Because weapon state can get out of sync, we should allow this even if the weapons are the same 
+	// && newWeapon != currentWeapon 
+	if(newWeapon != NULL )
+	{ 
+		lastWeapon = currentWeapon;
+		//if ( newWeapon != currentWeapon )
+		ServerCmd(newWeapon->szName);
+		g_weaponselect = newWeapon->iId;
+	}
+}
+
+void WeaponsResource::UserCmd_LastInv(void)
+{
+	if(this->IsSelectable(this->lastWeapon) && this->lastWeapon != this->GetWeapon(gHUD.GetCurrentWeaponID()))
+	{ 
+		this->SetCurrentWeapon(lastWeapon);
+		//voogru: Should a sound be played?
+		/*const char* theSound = AvHSHUGetCommonSoundName(gHUD.GetIsAlien(), WEAPON_SOUND_HUD_ON);
+		gHUD.PlayHUDSound(theSound, kHUDSoundVolume);*/
+	}
+}
+
+void WeaponsResource::SetValidWeapon(void)
+{
+	WEAPON* p = this->GetFirstPos(0); //alien attack 1 or primary marine weapon
+	if(gHUD.GetIsAlien())
+	{
+		this->SetCurrentWeapon(p);
+	}
+	else
+	{
+		if(this->IsSelectable(p) && this->HasAmmo(p))
+		{
+			this->SetCurrentWeapon(p);
+		}
+		else
+		{
+			p = this->GetFirstPos(1); //pistol slot
+			if(this->IsSelectable(p) && this->HasAmmo(p))
+			{
+				this->SetCurrentWeapon(p);
+			}
+			else
+			{
+				p = this->GetFirstPos(2); //knife slot
+				this->SetCurrentWeapon(p);
+			}
+		}
+	}
+}
+
+int giBucketHeight, giBucketWidth, giABHeight, giABWidth; // Ammo Bar width and height
+
+HSPRITE ghsprBuckets;					// Sprite for top row of weapons menu
+
+DECLARE_MESSAGE(m_Ammo, CurWeapon );	// Current weapon and clip
+DECLARE_MESSAGE(m_Ammo, WeaponList);	// new weapon type
+DECLARE_MESSAGE(m_Ammo, AmmoX);			// update known ammo type's count
+DECLARE_MESSAGE(m_Ammo, AmmoPickup);	// flashes an ammo pickup record
+DECLARE_MESSAGE(m_Ammo, WeapPickup);    // flashes a weapon pickup record
+DECLARE_MESSAGE(m_Ammo, HideWeapon);	// hides the weapon, ammo, and crosshair displays temporarily
+DECLARE_MESSAGE(m_Ammo, ItemPickup);
+
+DECLARE_COMMAND(m_Ammo, Slot1);
+DECLARE_COMMAND(m_Ammo, Slot2);
+DECLARE_COMMAND(m_Ammo, Slot3);
+DECLARE_COMMAND(m_Ammo, Slot4);
+DECLARE_COMMAND(m_Ammo, Slot5);
+DECLARE_COMMAND(m_Ammo, Slot6);
+DECLARE_COMMAND(m_Ammo, Slot7);
+DECLARE_COMMAND(m_Ammo, Slot8);
+DECLARE_COMMAND(m_Ammo, Slot9);
+DECLARE_COMMAND(m_Ammo, Slot10);
+DECLARE_COMMAND(m_Ammo, Close);
+DECLARE_COMMAND(m_Ammo, NextWeapon);
+DECLARE_COMMAND(m_Ammo, PrevWeapon);
+
+// width of ammo fonts
+#define AMMO_SMALL_WIDTH 10
+#define AMMO_LARGE_WIDTH 20
+
+#define HISTORY_DRAW_TIME	"5"
+
+int CHudAmmo::Init(void)
+{
+	gHUD.AddHudElem(this);
+
+	HOOK_MESSAGE(CurWeapon);
+	HOOK_MESSAGE(WeaponList);
+	HOOK_MESSAGE(AmmoPickup);
+	HOOK_MESSAGE(WeapPickup);
+	HOOK_MESSAGE(ItemPickup);
+	HOOK_MESSAGE(HideWeapon);
+	HOOK_MESSAGE(AmmoX);
+
+	HOOK_COMMAND("slot1", Slot1);
+	HOOK_COMMAND("slot2", Slot2);
+	HOOK_COMMAND("slot3", Slot3);
+	HOOK_COMMAND("slot4", Slot4);
+	HOOK_COMMAND("slot5", Slot5);
+	HOOK_COMMAND("slot6", Slot6);
+	HOOK_COMMAND("slot7", Slot7);
+	HOOK_COMMAND("slot8", Slot8);
+	HOOK_COMMAND("slot9", Slot9);
+	HOOK_COMMAND("slot10", Slot10);
+	HOOK_COMMAND("cancelselect", Close);
+	HOOK_COMMAND("invnext", NextWeapon);
+	HOOK_COMMAND("invprev", PrevWeapon);
+
+	Reset();
+
+	CVAR_CREATE( "hud_drawhistory_time", HISTORY_DRAW_TIME, 0 );
+	CVAR_CREATE( "hud_fastswitch", "0", FCVAR_ARCHIVE );		// controls whether or not weapons can be selected in one keypress
+
+	m_iFlags |= HUD_ACTIVE; //!!!
+
+	gWR.Init();
+	gHR.Init();
+
+	return 1;
+};
+
+void CHudAmmo::Reset(void)
+{
+	m_fFade = 0;
+	m_iFlags |= HUD_ACTIVE; //!!!
+
+	gpActiveSel = NULL;
+	gHUD.m_iHideHUDDisplay = 0;
+
+	gWR.Reset();
+	gHR.Reset();
+
+	//	VidInit();
+
+}
+
+int CHudAmmo::VidInit(void)
+{
+	// Load sprites for buckets (top row of weapon menu)
+	m_HUD_bucket0 = gHUD.GetSpriteIndex( "bucket1" );
+	m_HUD_selection = gHUD.GetSpriteIndex( "selection" );
+
+	ghsprBuckets = gHUD.GetSprite(m_HUD_bucket0);
+	giBucketWidth = gHUD.GetSpriteRect(m_HUD_bucket0).right - gHUD.GetSpriteRect(m_HUD_bucket0).left;
+	giBucketHeight = gHUD.GetSpriteRect(m_HUD_bucket0).bottom - gHUD.GetSpriteRect(m_HUD_bucket0).top;
+
+	gHR.iHistoryGap = max( gHR.iHistoryGap, gHUD.GetSpriteRect(m_HUD_bucket0).bottom - gHUD.GetSpriteRect(m_HUD_bucket0).top);
+
+	// If we've already loaded weapons, let's get new sprites
+	gWR.LoadAllWeaponSprites();
+
+	if (ScreenWidth() >= 640)
+	{
+		giABWidth = 20;
+		giABHeight = 4;
+	}
+	else
+	{
+		giABWidth = 10;
+		giABHeight = 2;
+	}
+
+	return 1;
+}
+
+//
+// Think:
+//  Used for selection of weapon menu item.
+//
+void CHudAmmo::Think(void)
+{
+	if ( gHUD.m_fPlayerDead )
+		return;
+
+	if ( gHUD.m_iWeaponBits != gWR.iOldWeaponBits )
+	{
+		gWR.iOldWeaponBits = gHUD.m_iWeaponBits;
+		bool droppedCurrent = false;
+
+		for (int i = MAX_WEAPONS-1; i > 0; i-- )
+		{
+			WEAPON *p = gWR.GetWeapon(i);
+
+			if ( p )
+			{
+				if ( gHUD.m_iWeaponBits & ( 1 << p->iId ) )
+					gWR.PickupWeapon( p );
+				else
+					gWR.DropWeapon( p );
+			}
+		}
+	}
+
+	//voogru: This probably isnt a good place to do this for some reason in release mode this crashes aliens.
+	/*if(gHUD.GetIsAlien()) //check for hive death causing loss of current weapon
+	{
+		WEAPON* currentWeapon = gWR.GetWeapon(gHUD.GetCurrentWeaponID());
+		if(!gWR.IsSelectable(currentWeapon)) //current weapon isn't valid
+		{
+			gWR.SetValidWeapon(); //get best option
+		}
+	}*/
+
+	if (!gpActiveSel)
+		return;
+
+	// has the player selected one?
+	if (gHUD.m_iKeyBits & IN_ATTACK)
+	{
+		if (gpActiveSel != (WEAPON *)1)
+		{
+			gWR.SetCurrentWeapon(gpActiveSel);
+		}
+
+		gpLastSel = gpActiveSel;
+		gpActiveSel = NULL;
+		gHUD.m_iKeyBits &= ~IN_ATTACK;
+
+		const char* theSound = AvHSHUGetCommonSoundName(gHUD.GetIsAlien(), WEAPON_SOUND_SELECT);
+		gHUD.PlayHUDSound(theSound, kHUDSoundVolume);
+	}
+}
+
+//
+// Helper function to return a Ammo pointer from id
+//
+
+HSPRITE* WeaponsResource :: GetAmmoPicFromWeapon( int iAmmoId, wrect_t& rect )
+{
+	for ( int i = 0; i < MAX_WEAPONS; i++ )
+	{
+		if ( rgWeapons[i].iAmmoType == iAmmoId )
+		{
+			rect = rgWeapons[i].rcAmmo;
+			return &rgWeapons[i].hAmmo;
+		}
+		else if ( rgWeapons[i].iAmmo2Type == iAmmoId )
+		{
+			rect = rgWeapons[i].rcAmmo2;
+			return &rgWeapons[i].hAmmo2;
+		}
+	}
+
+	return NULL;
+}
+
+
+// Menu Selection Code
+
+void WeaponsResource :: SelectSlot( int iSlot, int fAdvance, int iDirection )
+{
+	if ( gHUD.m_Menu.m_fMenuDisplayed && (fAdvance == FALSE) && (iDirection == 1) )	
+	{ // menu is overriding slot use commands
+		gHUD.m_Menu.SelectMenuItem( iSlot + 1 );  // slots are one off the key numbers
+		return;
+	}
+
+	if ( iSlot > MAX_WEAPON_SLOTS )
+		return;
+	
+	if ( gHUD.m_fPlayerDead || gHUD.m_iHideHUDDisplay & ( HIDEHUD_WEAPONS | HIDEHUD_ALL ) )
+		return;
+	
+	if (!(gHUD.m_iWeaponBits & (1<<(WEAPON_SUIT)) )) //require suit
+		return;
+	
+	if ( ! ( gHUD.m_iWeaponBits & ~(1<<(WEAPON_SUIT)) )) //require something besides suit
+		return;
+	
+	WEAPON *p = NULL;
+	bool fastSwitch = CVAR_GET_FLOAT( "hud_fastswitch" ) != 0;
+	if ((gpActiveSel == NULL) || (gpActiveSel == (WEAPON *)1) || (iSlot != gpActiveSel->iSlot))
+	{
+		p = GetFirstPos(iSlot);
+		const char* theSound = AvHSHUGetCommonSoundName(gHUD.GetIsAlien(), WEAPON_SOUND_HUD_ON);
+		gHUD.PlayHUDSound(theSound, kHUDSoundVolume);
+
+		if (this->IsSelectable(p) && fastSwitch) //check to see if we can use fastSwitch
+		{
+			WEAPON *p2 = GetNextActivePos( p->iSlot, p->iSlotPos );
+			if (!this->IsSelectable(p2)) //only one target in the bucket
+			{
+				this->SetCurrentWeapon(p);
+				return;
+			}
+		}
+	}
+	else
+	{
+		const char* theSound = AvHSHUGetCommonSoundName(gHUD.GetIsAlien(), WEAPON_SOUND_MOVE_SELECT);
+		gHUD.PlayHUDSound(theSound, kHUDSoundVolume);
+
+		if ( gpActiveSel )
+			p = GetNextActivePos( gpActiveSel->iSlot, gpActiveSel->iSlotPos );
+		if ( !p )
+			p = GetFirstPos( iSlot );
+	}
+	
+	if (!this->IsSelectable(p))  // no valid selection found
+	{
+		// if fastSwitch is on, ignore, else turn on the menu
+		if ( !fastSwitch ) {
+			gpActiveSel = (WEAPON *)1;
+		}
+		else {
+			gpActiveSel = NULL;
+		}
+	}
+	else 
+	{
+		gpActiveSel = p;
+	}
+}
+
+//------------------------------------------------------------------------
+// Message Handlers
+//------------------------------------------------------------------------
+
+//
+// AmmoX  -- Update the count of a known type of ammo
+// 
+int CHudAmmo::MsgFunc_AmmoX(const char *pszName, int iSize, void *pbuf)
+{
+	BEGIN_READ( pbuf, iSize );
+
+	int iIndex = READ_BYTE();
+	int iCount = READ_BYTE();
+
+	gWR.SetAmmo( iIndex, abs(iCount) );
+
+	return 1;
+}
+
+int CHudAmmo::MsgFunc_AmmoPickup( const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+	int iIndex = READ_BYTE();
+	int iCount = READ_BYTE();
+
+	// Add ammo to the history
+	gHR.AddToHistory( HISTSLOT_AMMO, iIndex, abs(iCount) );
+
+	return 1;
+}
+
+int CHudAmmo::MsgFunc_WeapPickup( const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+	int iIndex = READ_BYTE();
+
+	// Add the weapon to the history
+	gHR.AddToHistory( HISTSLOT_WEAP, iIndex );
+
+	return 1;
+}
+
+int CHudAmmo::MsgFunc_ItemPickup( const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+	const char *szName = READ_STRING();
+
+	// Add the weapon to the history
+	gHR.AddToHistory( HISTSLOT_ITEM, szName );
+
+	return 1;
+}
+
+
+int CHudAmmo::MsgFunc_HideWeapon( const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+	
+	gHUD.m_iHideHUDDisplay = READ_BYTE();
+
+	if (gEngfuncs.IsSpectateOnly())
+		return 1;
+	if ( gHUD.m_iHideHUDDisplay & ( HIDEHUD_WEAPONS | HIDEHUD_ALL ) )
+	{
+		static wrect_t nullrc;
+		gpActiveSel = NULL;
+		gHUD.SetCurrentCrosshair( 0, nullrc, 0, 0, 0 );
+	}
+	else
+	{
+		if ( m_pWeapon )
+			gHUD.SetCurrentCrosshair( m_pWeapon->hCrosshair, m_pWeapon->rcCrosshair, 255, 255, 255 );
+	}
+
+	return 1;
+}
+
+// 
+//  CurWeapon: Update hud state with the current weapon and clip count. Ammo
+//  counts are updated with AmmoX. Server assures that the Weapon ammo type 
+//  numbers match a real ammo type.
+//
+int CHudAmmo::MsgFunc_CurWeapon(const char *pszName, int iSize, void *pbuf )
+{
+	static wrect_t nullrc;
+	int fOnTarget = FALSE;
+
+	BEGIN_READ( pbuf, iSize );
+
+	int iState = READ_BYTE();
+	int iId = READ_CHAR();
+	int iClip = READ_CHAR();
+	// puzl: 497 read enable state from the server ( assign it below )
+	int iEnabled = READ_BYTE();
+
+	// detect if we're also on target
+	if ( iState > 1 )
+	{
+		fOnTarget = TRUE;
+	}
+
+	if ( iId < 1 )
+	{
+		gHUD.SetCurrentCrosshair(0, nullrc, 0, 0, 0);
+		return 0;
+	}
+
+	if ( g_iUser1 != OBS_IN_EYE )
+	{
+	// Is player dead???
+	if ((iId == -1) && (iClip == -1))
+	{
+		gHUD.m_fPlayerDead = TRUE;
+		gpActiveSel = NULL;
+		return 1;
+	}
+	gHUD.m_fPlayerDead = FALSE;
+	}
+
+	WEAPON *pWeapon = gWR.GetWeapon( iId );
+
+	if ( !pWeapon )
+		return 0;
+
+	pWeapon->iEnabled=iEnabled;
+
+	if ( iClip < -1 )
+		pWeapon->iClip = abs(iClip);
+	else
+		pWeapon->iClip = iClip;
+
+
+	if ( iState == 0 )	// we're not the current weapon, so update no more 
+		return 1;
+
+	m_pWeapon = pWeapon;
+
+	if ( !(gHUD.m_iHideHUDDisplay & ( HIDEHUD_WEAPONS | HIDEHUD_ALL )) )
+	{
+		if ( gHUD.m_iFOV >= 90 )
+		{ // normal crosshairs
+			if (fOnTarget && m_pWeapon->hAutoaim)
+				gHUD.SetCurrentCrosshair(m_pWeapon->hAutoaim, m_pWeapon->rcAutoaim, 255, 255, 255);
+			else
+				gHUD.SetCurrentCrosshair(m_pWeapon->hCrosshair, m_pWeapon->rcCrosshair, 255, 255, 255);
+		}
+		else
+		{ // zoomed crosshairs
+			if (fOnTarget && m_pWeapon->hZoomedAutoaim)
+				gHUD.SetCurrentCrosshair(m_pWeapon->hZoomedAutoaim, m_pWeapon->rcZoomedAutoaim, 255, 255, 255);
+			else
+				gHUD.SetCurrentCrosshair(m_pWeapon->hZoomedCrosshair, m_pWeapon->rcZoomedCrosshair, 255, 255, 255);
+		}
+	}
+
+	m_fFade = 200.0f; //!!!
+	m_iFlags |= HUD_ACTIVE;
+	
+	return 1;
+}
+
+//
+// WeaponList -- Tells the hud about a new weapon type.
+//
+int CHudAmmo::MsgFunc_WeaponList(const char *pszName, int iSize, void *pbuf )
+{
+
+	BEGIN_READ( pbuf, iSize );
+	
+	WEAPON Weapon;
+
+	strcpy( Weapon.szName, READ_STRING() );
+	Weapon.iAmmoType = (int)READ_CHAR();	
+	
+	Weapon.iMax1 = READ_BYTE();
+	if (Weapon.iMax1 == 255)
+		Weapon.iMax1 = -1;
+
+	Weapon.iAmmo2Type = READ_CHAR();
+	Weapon.iMax2 = READ_BYTE();
+	if (Weapon.iMax2 == 255)
+		Weapon.iMax2 = -1;
+
+	Weapon.iSlot = READ_CHAR();
+	Weapon.iSlotPos = READ_CHAR();
+	Weapon.iId = READ_CHAR();
+	Weapon.iFlags = READ_BYTE();
+	Weapon.iClip = 0;
+	// puzl: 497 - default value for enable state
+	Weapon.iEnabled = 0;
+
+	gWR.AddWeapon( &Weapon );
+	return 1;
+
+}
+
+//------------------------------------------------------------------------
+// Command Handlers
+//------------------------------------------------------------------------
+// Slot button pressed
+void CHudAmmo::SlotInput( int iSlot )
+{
+	// Let the Viewport use it first, for menus
+	if ( gViewPort && gViewPort->SlotInput( iSlot ) )
+		return;
+
+	gWR.SelectSlot(iSlot, FALSE, 1);
+}
+
+void CHudAmmo::UserCmd_Slot1(void)
+{
+	SlotInput( 0 );
+}
+
+void CHudAmmo::UserCmd_Slot2(void)
+{
+	SlotInput( 1 );
+}
+
+void CHudAmmo::UserCmd_Slot3(void)
+{
+	SlotInput( 2 );
+}
+
+void CHudAmmo::UserCmd_Slot4(void)
+{
+	SlotInput( 3 );
+}
+
+void CHudAmmo::UserCmd_Slot5(void)
+{
+	SlotInput( 4 );
+}
+
+void CHudAmmo::UserCmd_Slot6(void)
+{
+	SlotInput( 5 );
+}
+
+void CHudAmmo::UserCmd_Slot7(void)
+{
+	SlotInput( 6 );
+}
+
+void CHudAmmo::UserCmd_Slot8(void)
+{
+	SlotInput( 7 );
+}
+
+void CHudAmmo::UserCmd_Slot9(void)
+{
+	SlotInput( 8 );
+}
+
+void CHudAmmo::UserCmd_Slot10(void)
+{
+	SlotInput( 9 );
+}
+
+void CHudAmmo::UserCmd_Close(void)
+{
+	if (gpActiveSel)
+	{
+		gpLastSel = gpActiveSel;
+		gpActiveSel = NULL;
+
+		const char* theSound = AvHSHUGetCommonSoundName(gHUD.GetIsAlien(), WEAPON_SOUND_HUD_OFF);
+		gHUD.PlayHUDSound(theSound, kHUDSoundVolume);
+	}
+	else
+	{
+		bool thePotentiallyEnableOptionsScreen = false;
+		bool theOptionsScreenEnabled = false;
+
+		#ifdef DEBUG
+		thePotentiallyEnableOptionsScreen = true;
+		#endif
+
+		#ifdef AVH_PLAYTEST_BUILD
+		thePotentiallyEnableOptionsScreen = true;
+
+		if(thePotentiallyEnableOptionsScreen)
+		{
+			if(!gHUD.GetInTopDownMode())
+			{
+				if(gHUD.GetBalanceInts().size() > 0)
+				{
+					theOptionsScreenEnabled = true;
+				}
+			}
+		}
+		#endif
+
+		if(theOptionsScreenEnabled)
+		{
+			// Toggle game options menu
+			if(gViewPort->IsOptionsMenuVisible())
+			{
+				gViewPort->HideOptionsMenu();
+			}
+			else
+			{
+				gViewPort->ShowOptionsMenu();
+			}
+		}
+		else
+		{
+			if(gHUD.GetInTopDownMode())
+			{
+				gHUD.Cancel();
+			}
+			else
+			{
+				ClientCmd("escape");
+			}
+		}
+	}
+}
+
+
+// Selects the next item in the weapon menu
+void CHudAmmo::UserCmd_NextWeapon(void)
+{
+	if(gHUD.GetInTopDownMode())
+	{
+		AvHScrollHandler::ScrollHeightUp();
+	}
+
+	if ( gHUD.m_fPlayerDead || (gHUD.m_iHideHUDDisplay & (HIDEHUD_WEAPONS | HIDEHUD_ALL)) )
+		return;
+
+	if ( !gpActiveSel || gpActiveSel == (WEAPON*)1 )
+		gpActiveSel = m_pWeapon;
+
+	int pos = 0;
+	int slot = 0;
+	if ( gpActiveSel )
+	{
+		pos = gpActiveSel->iSlotPos + 1;
+		slot = gpActiveSel->iSlot;
+	}
+
+	for ( int loop = 0; loop <= 1; loop++ )
+	{
+		for ( ; slot < MAX_WEAPON_SLOTS; slot++ )
+		{
+			for ( ; pos < MAX_WEAPON_POSITIONS; pos++ )
+			{
+				WEAPON *wsp = gWR.GetWeaponSlot( slot, pos );
+
+				if (gWR.IsSelectable(wsp))
+				{
+					gpActiveSel = wsp;
+					return;
+				}
+			}
+
+			pos = 0;
+		}
+
+		slot = 0;  // start looking from the first slot again
+	}
+
+	gpActiveSel = NULL;
+}
+
+// Selects the previous item in the menu
+void CHudAmmo::UserCmd_PrevWeapon(void)
+{
+	if(gHUD.GetInTopDownMode())
+	{
+		AvHScrollHandler::ScrollHeightDown();
+	}
+	
+	if ( gHUD.m_fPlayerDead || (gHUD.m_iHideHUDDisplay & (HIDEHUD_WEAPONS | HIDEHUD_ALL)) )
+		return;
+
+	if ( !gpActiveSel || gpActiveSel == (WEAPON*)1 )
+		gpActiveSel = m_pWeapon;
+
+	int pos = MAX_WEAPON_POSITIONS-1;
+	int slot = MAX_WEAPON_SLOTS-1;
+	if ( gpActiveSel )
+	{
+		pos = gpActiveSel->iSlotPos - 1;
+		slot = gpActiveSel->iSlot;
+	}
+	
+	for ( int loop = 0; loop <= 1; loop++ )
+	{
+		for ( ; slot >= 0; slot-- )
+		{
+			for ( ; pos >= 0; pos-- )
+			{
+				WEAPON *wsp = gWR.GetWeaponSlot( slot, pos );
+
+				if (gWR.IsSelectable(wsp))
+				{
+					gpActiveSel = wsp;
+					return;
+				}
+			}
+
+			pos = MAX_WEAPON_POSITIONS-1;
+		}
+		
+		slot = MAX_WEAPON_SLOTS-1;
+	}
+
+	gpActiveSel = NULL;
+}
+
+void CHudAmmo::SetCurrentClip(int inClip)
+{
+	if(this->m_pWeapon)
+	{
+		this->m_pWeapon->iClip = inClip;
+	}
+}
+
+//-------------------------------------------------------------------------
+// Drawing code
+//-------------------------------------------------------------------------
+
+int CHudAmmo::Draw(float flTime)
+{
+	int a, x, y, r, g, b;
+	int AmmoWidth;
+
+	if (!(gHUD.m_iWeaponBits & (1<<(WEAPON_SUIT)) ))
+		return 1;
+
+	if (/*!gHUD.GetIsAlive() ||*/ (gHUD.m_iHideHUDDisplay & ( HIDEHUD_WEAPONS | HIDEHUD_ALL )) )
+		return 1;
+
+	// Draw Weapon Menu
+	DrawWList(flTime);
+
+	// Draw ammo pickup history
+	gHR.DrawAmmoHistory( flTime );
+
+	if (!(m_iFlags & HUD_ACTIVE))
+		return 0;
+
+	if (!m_pWeapon)
+		return 0;
+
+	WEAPON *pw = m_pWeapon; // shorthand
+
+	// SPR_Draw Ammo
+	if ((pw->iAmmoType < 0) && (pw->iAmmo2Type < 0))
+		return 0;
+
+
+	int iFlags = DHN_DRAWZERO; // draw 0 values
+
+	AmmoWidth = gHUD.GetSpriteRect(gHUD.m_HUD_number_0).right - gHUD.GetSpriteRect(gHUD.m_HUD_number_0).left;
+
+	a = (int) max( MIN_ALPHA, m_fFade );
+
+	if (m_fFade > 0)
+		m_fFade -= (gHUD.m_flTimeDelta * 20);
+
+	gHUD.GetPrimaryHudColor(r, g, b);
+	
+	ScaleColors(r, g, b, a );
+
+    int theViewport[4];
+    gHUD.GetViewport(theViewport);
+
+	// Does this weapon have a clip?
+	y = theViewport[1] + theViewport[3] - gHUD.m_iFontHeight - gHUD.m_iFontHeight/2;
+
+	// Does weapon have any ammo at all?
+	if (m_pWeapon->iAmmoType > 0)
+	{
+		int iIconWidth = m_pWeapon->rcAmmo.right - m_pWeapon->rcAmmo.left;
+		
+		if (pw->iClip >= 0)
+		{
+			// room for the number and the '|' and the current ammo
+			
+			x = theViewport[0] + theViewport[2] - (8 * AmmoWidth) - iIconWidth;
+			x = gHUD.DrawHudNumber(x, y, iFlags | DHN_3DIGITS, pw->iClip, r, g, b);
+
+			wrect_t rc;
+			rc.top = 0;
+			rc.left = 0;
+			rc.right = AmmoWidth;
+			rc.bottom = 100;
+
+			int iBarWidth =  AmmoWidth/10;
+
+			x += AmmoWidth/2;
+
+			gHUD.GetPrimaryHudColor(r, g, b);
+			
+			// draw the | bar
+			FillRGBA(x, y, iBarWidth, gHUD.m_iFontHeight, r, g, b, a);
+
+			x += iBarWidth + AmmoWidth/2;;
+
+			// GL Seems to need this
+			ScaleColors(r, g, b, a );
+			x = gHUD.DrawHudNumber(x, y, iFlags | DHN_3DIGITS, gWR.CountAmmo(pw->iAmmoType), r, g, b);		
+
+
+		}
+		else
+		{
+			// SPR_Draw a bullets only line
+			x = theViewport[0] + theViewport[2]  - 4 * AmmoWidth - iIconWidth;
+			x = gHUD.DrawHudNumber(x, y, iFlags | DHN_3DIGITS, gWR.CountAmmo(pw->iAmmoType), r, g, b);
+		}
+
+		// Draw the ammo Icon
+		int iOffset = (m_pWeapon->rcAmmo.bottom - m_pWeapon->rcAmmo.top)/8;
+		SPR_Set(m_pWeapon->hAmmo, r, g, b);
+		SPR_DrawAdditive(0, x, y - iOffset, &m_pWeapon->rcAmmo);
+	}
+
+	// Does weapon have seconday ammo?
+	if (pw->iAmmo2Type > 0) 
+	{
+		int iIconWidth = m_pWeapon->rcAmmo2.right - m_pWeapon->rcAmmo2.left;
+
+		// Do we have secondary ammo?
+		if ((pw->iAmmo2Type != 0) && (gWR.CountAmmo(pw->iAmmo2Type) > 0))
+		{
+			y -= gHUD.m_iFontHeight + gHUD.m_iFontHeight/4;
+			x = theViewport[0] + theViewport[2] - 4 * AmmoWidth - iIconWidth;
+			x = gHUD.DrawHudNumber(x, y, iFlags|DHN_3DIGITS, gWR.CountAmmo(pw->iAmmo2Type), r, g, b);
+
+			// Draw the ammo Icon
+			SPR_Set(m_pWeapon->hAmmo2, r, g, b);
+			int iOffset = (m_pWeapon->rcAmmo2.bottom - m_pWeapon->rcAmmo2.top)/8;
+			SPR_DrawAdditive(0, x, y - iOffset, &m_pWeapon->rcAmmo2);
+		}
+	}
+	return 1;
+}
+
+
+//
+// Draws the ammo bar on the hud
+//
+int DrawBar(int x, int y, int width, int height, float f)
+{
+	int r, g, b;
+
+	if (f < 0)
+		f = 0;
+	if (f > 1)
+		f = 1;
+
+	if (f)
+	{
+		int w = f * width;
+
+		// Always show at least one pixel if we have ammo.
+		if (w <= 0)
+			w = 1;
+		UnpackRGB(r, g, b, RGB_GREENISH);
+		FillRGBA(x, y, w, height, r, g, b, 255);
+		x += w;
+		width -= w;
+	}
+
+	gHUD.GetPrimaryHudColor(r, g, b);
+	FillRGBA(x, y, width, height, r, g, b, 128);
+
+	return (x + width);
+}
+
+
+
+void DrawAmmoBar(WEAPON *p, int x, int y, int width, int height)
+{
+	if ( !p )
+		return;
+	
+	if (p->iAmmoType != -1)
+	{
+		if (!gWR.CountAmmo(p->iAmmoType))
+			return;
+
+		float f = (float)gWR.CountAmmo(p->iAmmoType)/(float)p->iMax1;
+		
+		x = DrawBar(x, y, width, height, f);
+
+
+		// Do we have secondary ammo too?
+
+		if (p->iAmmo2Type != -1)
+		{
+			f = (float)gWR.CountAmmo(p->iAmmo2Type)/(float)p->iMax2;
+
+			x += 5; //!!!
+
+			DrawBar(x, y, width, height, f);
+		}
+	}
+}
+
+
+
+
+//
+// Draw Weapon Menu
+//
+int CHudAmmo::DrawWList(float flTime)
+{
+	int r,g,b,x,y,a,i;
+
+	if ( !gpActiveSel )
+	{
+		gHUD.SetSelectingWeaponID(-1);
+		return 0;
+	}
+
+	int iActiveSlot;
+
+	if ( gpActiveSel == (WEAPON *)1 )
+		iActiveSlot = -1;	// current slot has no weapons
+	else 
+		iActiveSlot = gpActiveSel->iSlot;
+
+	x = 10; //!!!
+	y = 10; //!!!
+	
+
+	// Ensure that there are available choices in the active slot
+	if ( iActiveSlot > 0 )
+	{
+		if ( !gWR.GetFirstPos( iActiveSlot ) )
+		{
+			gpActiveSel = (WEAPON *)1;
+			iActiveSlot = -1;
+		}
+	}
+		
+	// Draw top line
+	for ( i = 0; i < MAX_WEAPON_SLOTS; i++ )
+	{
+		int iWidth;
+
+		gHUD.GetPrimaryHudColor(r, g, b);
+
+		if ( iActiveSlot == i )
+			a = 255;
+		else
+			a = 192;
+
+		ScaleColors(r, g, b, 255);
+		SPR_Set(gHUD.GetSprite(m_HUD_bucket0 + i), r, g, b );
+
+		// make active slot wide enough to accomodate gun pictures
+		if ( i == iActiveSlot )
+		{
+			WEAPON *p = gWR.GetFirstPos(iActiveSlot);
+			if ( p )
+				iWidth = p->rcActive.right - p->rcActive.left;
+			else
+				iWidth = giBucketWidth;
+		}
+		else
+			iWidth = giBucketWidth;
+
+		SPR_DrawAdditive(0, x, y, &gHUD.GetSpriteRect(m_HUD_bucket0 + i));
+		
+		x += iWidth + 5;
+	}
+
+
+	a = 128; //!!!
+	x = 10;
+
+	// Draw all of the buckets
+	for (i = 0; i < MAX_WEAPON_SLOTS; i++)
+	{
+		y = giBucketHeight + 10;
+
+		// If this is the active slot, draw the bigger pictures,
+		// otherwise just draw boxes
+		if ( i == iActiveSlot )
+		{
+			WEAPON *p = gWR.GetFirstPos( i );
+			int iWidth = giBucketWidth;
+			if ( p )
+				iWidth = p->rcActive.right - p->rcActive.left;
+
+			for ( int iPos = 0; iPos < MAX_WEAPON_POSITIONS; iPos++ )
+			{
+				p = gWR.GetWeaponSlot( i, iPos );
+
+				if ( !p || !p->iId )
+					continue;
+
+				// Preserve red/yellow depending on whether it has ammo or not
+				if(!gWR.IsEnabled(p))
+				{
+					UnpackRGB(r,g,b, RGB_REDISH);
+					ScaleColors(r, g, b, 128);
+				}
+				else
+				{
+					gHUD.GetPrimaryHudColor(r, g, b);
+					ScaleColors(r, g, b, 192);
+				}
+
+				if ( gpActiveSel == p )
+				{
+					SPR_Set(p->hActive, r, g, b );
+					SPR_DrawAdditive(0, x, y, &p->rcActive);
+
+					SPR_Set(gHUD.GetSprite(m_HUD_selection), r, g, b );
+					SPR_DrawAdditive(0, x, y, &gHUD.GetSpriteRect(m_HUD_selection));
+
+					// Lookup iID for helptext
+					gHUD.SetSelectingWeaponID(p->iId, r, g, b);
+				}
+				else
+				{
+					// Draw Weapon if Red if no ammo
+
+					//if (gWR.IsSelectable(p))
+					//	ScaleColors(r, g, b, 192);
+					//else
+					//{
+					//	UnpackRGB(r,g,b, RGB_REDISH);
+					//	ScaleColors(r, g, b, 128);
+					//}
+
+					SPR_Set( p->hInactive, r, g, b );
+					SPR_DrawAdditive( 0, x, y, &p->rcInactive );
+				}
+
+				// Draw Ammo Bar
+
+				DrawAmmoBar(p, x + giABWidth/2, y, giABWidth, giABHeight);
+				
+				y += p->rcActive.bottom - p->rcActive.top + 5;
+			}
+
+			x += iWidth + 5;
+
+		}
+		else
+		{
+			// Draw Row of weapons.
+			gHUD.GetPrimaryHudColor(r, g, b);
+			
+			for ( int iPos = 0; iPos < MAX_WEAPON_POSITIONS; iPos++ )
+			{
+				WEAPON *p = gWR.GetWeaponSlot( i, iPos );
+				
+				if ( !p || !p->iId )
+					continue;
+
+				if ( gWR.IsEnabled(p) )
+				{
+					gHUD.GetPrimaryHudColor(r, g, b);
+					a = 128;
+				}
+				else
+				{
+					UnpackRGB(r,g,b, RGB_REDISH);
+					a = 96;
+				}
+
+				FillRGBA( x, y, giBucketWidth, giBucketHeight, r, g, b, a );
+
+				y += giBucketHeight + 5;
+			}
+
+			x += giBucketWidth + 5;
+		}
+	}	
+
+	return 1;
+
+}
+
+
+/* =================================
+	GetSpriteList
+
+Finds and returns the matching 
+sprite name 'psz' and resolution 'iRes'
+in the given sprite list 'pList'
+iCount is the number of items in the pList
+================================= */
+client_sprite_t *GetSpriteList(client_sprite_t *pList, const char *psz, int iRes, int iCount)
+{
+	if (!pList)
+		return NULL;
+
+	int i = iCount;
+	client_sprite_t *p = pList;
+
+	while(i--)
+	{
+		if ((!strcmp(psz, p->szName)) && (p->iRes == iRes))
+			return p;
+		p++;
+	}
+
+	return NULL;
+}
diff --git a/main/source/cl_dll/ammo.h b/main/source/cl_dll/ammo.h
new file mode 100644
index 00000000..20bfa987
--- /dev/null
+++ b/main/source/cl_dll/ammo.h
@@ -0,0 +1,64 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+#ifndef __AMMO_H__
+#define __AMMO_H__
+
+#define MAX_WEAPON_NAME 128
+
+
+#define WEAPON_FLAGS_SELECTONEMPTY	1
+
+#define WEAPON_IS_ONTARGET 0x40
+
+struct WEAPON
+{
+	char	szName[MAX_WEAPON_NAME];
+	int		iAmmoType;
+	int		iAmmo2Type;
+	int		iMax1;
+	int		iMax2;
+	int		iSlot;
+	int		iSlotPos;
+	int		iFlags;
+	int		iId;
+	int		iClip;
+	// puzl: 497 - weapon enable state
+	int		iEnabled;
+
+	int		iCount;		// # of itesm in plist
+
+	HSPRITE hActive;
+	wrect_t rcActive;
+	HSPRITE hInactive;
+	wrect_t rcInactive;
+	HSPRITE	hAmmo;
+	wrect_t rcAmmo;
+	HSPRITE hAmmo2;
+	wrect_t rcAmmo2;
+	HSPRITE hCrosshair;
+	wrect_t rcCrosshair;
+	HSPRITE hAutoaim;
+	wrect_t rcAutoaim;
+	HSPRITE hZoomedCrosshair;
+	wrect_t rcZoomedCrosshair;
+	HSPRITE hZoomedAutoaim;
+	wrect_t rcZoomedAutoaim;
+};
+
+typedef int AMMO;
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/cl_dll/ammo_secondary.cpp b/main/source/cl_dll/ammo_secondary.cpp
new file mode 100644
index 00000000..8e1f835e
--- /dev/null
+++ b/main/source/cl_dll/ammo_secondary.cpp
@@ -0,0 +1,159 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// ammo_secondary.cpp
+//
+// implementation of CHudAmmoSecondary class
+//
+
+#include "hud.h"
+#include "cl_util.h"
+#include <string.h>
+#include <stdio.h>
+#include "parsemsg.h"
+
+DECLARE_MESSAGE( m_AmmoSecondary, SecAmmoVal );
+DECLARE_MESSAGE( m_AmmoSecondary, SecAmmoIcon );
+
+int CHudAmmoSecondary :: Init( void )
+{
+	HOOK_MESSAGE( SecAmmoVal );
+	HOOK_MESSAGE( SecAmmoIcon );
+
+	gHUD.AddHudElem(this);
+	m_HUD_ammoicon = 0;
+
+	for ( int i = 0; i < MAX_SEC_AMMO_VALUES; i++ )
+		m_iAmmoAmounts[i] = -1;  // -1 means don't draw this value
+
+	Reset();
+
+	return 1;
+}
+
+void CHudAmmoSecondary :: Reset( void )
+{
+	m_fFade = 0;
+}
+
+int CHudAmmoSecondary :: VidInit( void )
+{
+	return 1;
+}
+
+int CHudAmmoSecondary :: Draw(float flTime)
+{
+	if ( (gHUD.m_iHideHUDDisplay & ( HIDEHUD_WEAPONS | HIDEHUD_ALL )) )
+		return 1;
+
+	// draw secondary ammo icons above normal ammo readout
+	int a, x, y, r, g, b, AmmoWidth;
+	gHUD.GetPrimaryHudColor(r, g, b);
+	a = (int) max( MIN_ALPHA, m_fFade );
+	if (m_fFade > 0)
+		m_fFade -= (gHUD.m_flTimeDelta * 20);  // slowly lower alpha to fade out icons
+	ScaleColors( r, g, b, a );
+
+	AmmoWidth = gHUD.GetSpriteRect(gHUD.m_HUD_number_0).right - gHUD.GetSpriteRect(gHUD.m_HUD_number_0).left;
+
+	y = ScreenHeight() - (gHUD.m_iFontHeight*4);  // this is one font height higher than the weapon ammo values
+	x = ScreenWidth() - AmmoWidth;
+
+	if ( m_HUD_ammoicon )
+	{
+		// Draw the ammo icon
+		x -= (gHUD.GetSpriteRect(m_HUD_ammoicon).right - gHUD.GetSpriteRect(m_HUD_ammoicon).left);
+		y -= (gHUD.GetSpriteRect(m_HUD_ammoicon).top - gHUD.GetSpriteRect(m_HUD_ammoicon).bottom);
+
+		SPR_Set( gHUD.GetSprite(m_HUD_ammoicon), r, g, b );
+		SPR_DrawAdditive( 0, x, y, &gHUD.GetSpriteRect(m_HUD_ammoicon) );
+	}
+	else
+	{  // move the cursor by the '0' char instead, since we don't have an icon to work with
+		x -= AmmoWidth;
+		y -= (gHUD.GetSpriteRect(gHUD.m_HUD_number_0).top - gHUD.GetSpriteRect(gHUD.m_HUD_number_0).bottom);
+	}
+
+	// draw the ammo counts, in reverse order, from right to left
+	for ( int i = MAX_SEC_AMMO_VALUES-1; i >= 0; i-- )
+	{
+		if ( m_iAmmoAmounts[i] < 0 )
+			continue; // negative ammo amounts imply that they shouldn't be drawn
+
+		// half a char gap between the ammo number and the previous pic
+		x -= (AmmoWidth / 2);
+
+		// draw the number, right-aligned
+		x -= (gHUD.GetNumWidth( m_iAmmoAmounts[i], DHN_DRAWZERO ) * AmmoWidth);
+		gHUD.DrawHudNumber( x, y, DHN_DRAWZERO, m_iAmmoAmounts[i], r, g, b );
+
+		if ( i != 0 )
+		{
+			// draw the divider bar
+			x -= (AmmoWidth / 2);
+			FillRGBA(x, y, (AmmoWidth/10), gHUD.m_iFontHeight, r, g, b, a);
+		}
+	}
+
+	return 1;
+}
+
+// Message handler for Secondary Ammo Value
+// accepts one value:
+//		string:  sprite name
+int CHudAmmoSecondary :: MsgFunc_SecAmmoIcon( const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+	m_HUD_ammoicon = gHUD.GetSpriteIndex( READ_STRING() );
+
+	return 1;
+}
+
+// Message handler for Secondary Ammo Icon
+// Sets an ammo value
+// takes two values:
+//		byte:  ammo index
+//		byte:  ammo value
+int CHudAmmoSecondary :: MsgFunc_SecAmmoVal( const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+
+	int index = READ_BYTE();
+	if ( index < 0 || index >= MAX_SEC_AMMO_VALUES )
+		return 1;
+
+	m_iAmmoAmounts[index] = READ_BYTE();
+	m_iFlags |= HUD_ACTIVE;
+
+	// check to see if there is anything left to draw
+	int count = 0;
+	for ( int i = 0; i < MAX_SEC_AMMO_VALUES; i++ )
+	{
+		count += max( 0, m_iAmmoAmounts[i] );
+	}
+
+	if ( count == 0 ) 
+	{	// the ammo fields are all empty, so turn off this hud area
+		m_iFlags &= ~HUD_ACTIVE;
+		return 1;
+	}
+
+	// make the icons light up
+	m_fFade = 200.0f;
+
+	return 1;
+}
+
+
diff --git a/main/source/cl_dll/ammohistory.cpp b/main/source/cl_dll/ammohistory.cpp
new file mode 100644
index 00000000..76aec248
--- /dev/null
+++ b/main/source/cl_dll/ammohistory.cpp
@@ -0,0 +1,190 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+//  ammohistory.cpp
+//
+
+
+#include "hud.h"
+#include "cl_util.h"
+#include "parsemsg.h"
+
+#include <string.h>
+#include <stdio.h>
+
+#include "ammohistory.h"
+
+HistoryResource gHR;
+
+#define AMMO_PICKUP_GAP (gHR.iHistoryGap+5)
+#define AMMO_PICKUP_PICK_HEIGHT		(32 + (gHR.iHistoryGap * 2))
+#define AMMO_PICKUP_HEIGHT_MAX		(ScreenHeight() - 100)
+
+#define MAX_ITEM_NAME	32
+int HISTORY_DRAW_TIME = 5;
+
+// keep a list of items
+struct ITEM_INFO
+{
+	char szName[MAX_ITEM_NAME];
+	HSPRITE spr;
+	wrect_t rect;
+};
+
+void HistoryResource :: AddToHistory( int iType, int iId, int iCount )
+{
+	if ( iType == HISTSLOT_AMMO && !iCount )
+		return;  // no amount, so don't add
+
+	if ( (((AMMO_PICKUP_GAP * iCurrentHistorySlot) + AMMO_PICKUP_PICK_HEIGHT) > AMMO_PICKUP_HEIGHT_MAX) || (iCurrentHistorySlot >= MAX_HISTORY) )
+	{	// the pic would have to be drawn too high
+		// so start from the bottom
+		iCurrentHistorySlot = 0;
+	}
+	
+	HIST_ITEM *freeslot = &rgAmmoHistory[iCurrentHistorySlot++];  // default to just writing to the first slot
+	HISTORY_DRAW_TIME = CVAR_GET_FLOAT( "hud_drawhistory_time" );
+
+	freeslot->type = iType;
+	freeslot->iId = iId;
+	freeslot->iCount = iCount;
+	freeslot->DisplayTime = gHUD.m_flTime + HISTORY_DRAW_TIME;
+}
+
+void HistoryResource :: AddToHistory( int iType, const char *szName, int iCount )
+{
+	if ( iType != HISTSLOT_ITEM )
+		return;
+
+	if ( (((AMMO_PICKUP_GAP * iCurrentHistorySlot) + AMMO_PICKUP_PICK_HEIGHT) > AMMO_PICKUP_HEIGHT_MAX) || (iCurrentHistorySlot >= MAX_HISTORY) )
+	{	// the pic would have to be drawn too high
+		// so start from the bottom
+		iCurrentHistorySlot = 0;
+	}
+
+	HIST_ITEM *freeslot = &rgAmmoHistory[iCurrentHistorySlot++];  // default to just writing to the first slot
+
+	// I am really unhappy with all the code in this file
+
+	int i = gHUD.GetSpriteIndex( szName );
+	if ( i == -1 )
+		return;  // unknown sprite name, don't add it to history
+
+	freeslot->iId = i;
+	freeslot->type = iType;
+	freeslot->iCount = iCount;
+
+	HISTORY_DRAW_TIME = CVAR_GET_FLOAT( "hud_drawhistory_time" );
+	freeslot->DisplayTime = gHUD.m_flTime + HISTORY_DRAW_TIME;
+}
+
+
+void HistoryResource :: CheckClearHistory( void )
+{
+	for ( int i = 0; i < MAX_HISTORY; i++ )
+	{
+		if ( rgAmmoHistory[i].type )
+			return;
+	}
+
+	iCurrentHistorySlot = 0;
+}
+
+//
+// Draw Ammo pickup history
+//
+int HistoryResource :: DrawAmmoHistory( float flTime )
+{
+	for ( int i = 0; i < MAX_HISTORY; i++ )
+	{
+		if ( rgAmmoHistory[i].type )
+		{
+			rgAmmoHistory[i].DisplayTime = min( rgAmmoHistory[i].DisplayTime, gHUD.m_flTime + HISTORY_DRAW_TIME );
+
+			if ( rgAmmoHistory[i].DisplayTime <= flTime )
+			{  // pic drawing time has expired
+				memset( &rgAmmoHistory[i], 0, sizeof(HIST_ITEM) );
+				CheckClearHistory();
+			}
+			else if ( rgAmmoHistory[i].type == HISTSLOT_AMMO )
+			{
+				wrect_t rcPic;
+				HSPRITE *spr = gWR.GetAmmoPicFromWeapon( rgAmmoHistory[i].iId, rcPic );
+
+				int r, g, b;
+				gHUD.GetPrimaryHudColor(r, g, b);
+				float scale = (rgAmmoHistory[i].DisplayTime - flTime) * 80;
+				ScaleColors(r, g, b, min(scale, 255) );
+
+				// Draw the pic
+				int ypos = ScreenHeight() - (AMMO_PICKUP_PICK_HEIGHT + (AMMO_PICKUP_GAP * i));
+				int xpos = ScreenWidth() - 24;
+				if ( spr && *spr )    // weapon isn't loaded yet so just don't draw the pic
+				{ // the dll has to make sure it has sent info the weapons you need
+					SPR_Set( *spr, r, g, b );
+					SPR_DrawAdditive( 0, xpos, ypos, &rcPic );
+				}
+
+				// Draw the number
+				gHUD.DrawHudNumberString( xpos - 10, ypos, xpos - 100, rgAmmoHistory[i].iCount, r, g, b );
+			}
+			else if ( rgAmmoHistory[i].type == HISTSLOT_WEAP )
+			{
+				WEAPON *weap = gWR.GetWeapon( rgAmmoHistory[i].iId );
+
+				if ( !weap )
+					return 1;  // we don't know about the weapon yet, so don't draw anything
+
+				int r, g, b;
+				gHUD.GetPrimaryHudColor(r, g, b);
+				
+				if ( !gWR.HasAmmo( weap ) )
+					UnpackRGB(r,g,b, RGB_REDISH);	// if the weapon doesn't have ammo, display it as red
+
+				float scale = (rgAmmoHistory[i].DisplayTime - flTime) * 80;
+				ScaleColors(r, g, b, min(scale, 255) );
+
+				int ypos = ScreenHeight() - (AMMO_PICKUP_PICK_HEIGHT + (AMMO_PICKUP_GAP * i));
+				int xpos = ScreenWidth() - (weap->rcInactive.right - weap->rcInactive.left);
+				SPR_Set( weap->hInactive, r, g, b );
+				SPR_DrawAdditive( 0, xpos, ypos, &weap->rcInactive );
+			}
+			else if ( rgAmmoHistory[i].type == HISTSLOT_ITEM )
+			{
+				int r, g, b;
+
+				if ( !rgAmmoHistory[i].iId )
+					continue;  // sprite not loaded
+
+				wrect_t rect = gHUD.GetSpriteRect( rgAmmoHistory[i].iId );
+
+				gHUD.GetPrimaryHudColor(r, g, b);
+				float scale = (rgAmmoHistory[i].DisplayTime - flTime) * 80;
+				ScaleColors(r, g, b, min(scale, 255) );
+
+				int ypos = ScreenHeight() - (AMMO_PICKUP_PICK_HEIGHT + (AMMO_PICKUP_GAP * i));
+				int xpos = ScreenWidth() - (rect.right - rect.left) - 10;
+
+				SPR_Set( gHUD.GetSprite( rgAmmoHistory[i].iId ), r, g, b );
+				SPR_DrawAdditive( 0, xpos, ypos, &rect );
+			}
+		}
+	}
+
+
+	return 1;
+}
+
+
diff --git a/main/source/cl_dll/ammohistory.h b/main/source/cl_dll/ammohistory.h
new file mode 100644
index 00000000..0969f42c
--- /dev/null
+++ b/main/source/cl_dll/ammohistory.h
@@ -0,0 +1,165 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+* Modified by Charles G. Cleveland
+*
+* $Workfile: ammohistory.h $
+* $Date: 2002/06/25 17:05:31 $
+*
+*-------------------------------------------------------------------------------
+* $Log: ammohistory.h,v $
+* Revision 1.3  2002/06/25 17:05:31  Flayra
+* - Weapon enabling/disabling works differently now
+*
+*===============================================================================
+****/
+//
+// ammohistory.h
+//
+
+// this is the max number of items in each bucket
+//#define MAX_WEAPON_POSITIONS		MAX_WEAPON_SLOTS
+#define MAX_WEAPON_POSITIONS		10
+
+class WeaponsResource
+{
+private:
+	// Information about weapons & ammo
+	WEAPON		rgWeapons[MAX_WEAPONS];	// Weapons Array
+
+	// counts of weapons * ammo
+	WEAPON*		rgSlots[MAX_WEAPON_SLOTS+1][MAX_WEAPON_POSITIONS+1];	// The slots currently in use by weapons.  The value is a pointer to the weapon;  if it's NULL, no weapon is there
+	int			riAmmo[MAX_AMMO_TYPES];							// count of each ammo type
+
+	//client-side lastinv
+	WEAPON*		lastWeapon;
+
+public:
+	void Init(void);
+
+	void Reset( void )
+	{
+		iOldWeaponBits = 0;
+		memset( rgSlots, 0, sizeof rgSlots );
+		memset( riAmmo, 0, sizeof riAmmo );
+		lastWeapon = NULL;
+	}
+
+///// WEAPON /////
+	int			iOldWeaponBits;
+
+	WEAPON *GetWeapon( int iId ) { return &rgWeapons[iId]; }
+	void AddWeapon( WEAPON *wp ) 
+	{ 
+		rgWeapons[ wp->iId ] = *wp;	
+		LoadWeaponSprites( &rgWeapons[ wp->iId ] );
+	}
+
+	void PickupWeapon( WEAPON *wp )
+	{
+		rgSlots[ wp->iSlot ][ wp->iSlotPos ] = wp;
+	}
+
+	void DropWeapon( WEAPON *wp )
+	{
+		rgSlots[ wp->iSlot ][ wp->iSlotPos ] = NULL;
+		if(lastWeapon == wp) //dropped last weapon, remove it from the list
+		{ 
+			lastWeapon = NULL; 
+		}
+	}
+
+	void DropAllWeapons( void )
+	{
+		for ( int i = 0; i < MAX_WEAPONS; i++ )
+		{
+			if ( rgWeapons[i].iId )
+				DropWeapon( &rgWeapons[i] );
+		}
+	}
+
+	WEAPON* GetWeaponSlot( int slot, int pos ) { return rgSlots[slot][pos]; }
+
+	void LoadWeaponSprites( WEAPON* wp );
+	void LoadAllWeaponSprites( void );
+	WEAPON* GetFirstPos( int iSlot );
+	void SelectSlot( int iSlot, int fAdvance, int iDirection );
+	WEAPON* GetNextActivePos( int iSlot, int iSlotPos );
+
+	void UserCmd_LastInv(void);
+	void SetValidWeapon(void);
+	void SetCurrentWeapon(WEAPON* wp);
+	int IsEnabled( WEAPON *p );
+	int IsSelectable(WEAPON *p);
+	int HasAmmo( WEAPON *p );
+
+
+///// AMMO /////
+	AMMO GetAmmo( int iId ) { return riAmmo[ iId ]; }
+
+	void SetAmmo( int iId, int iCount ) { riAmmo[ iId ] = iCount;	}
+
+	int CountAmmo( int iId );
+
+	HSPRITE* GetAmmoPicFromWeapon( int iAmmoId, wrect_t& rect );
+};
+
+extern WeaponsResource gWR;
+
+
+#define MAX_HISTORY 12
+enum {
+	HISTSLOT_EMPTY,
+	HISTSLOT_AMMO,
+	HISTSLOT_WEAP,
+	HISTSLOT_ITEM,
+};
+
+class HistoryResource
+{
+private:
+	struct HIST_ITEM {
+		int type;
+		float DisplayTime;  // the time at which this item should be removed from the history
+		int iCount;
+		int iId;
+	};
+
+	HIST_ITEM rgAmmoHistory[MAX_HISTORY];
+
+public:
+
+	void Init( void )
+	{
+		Reset();
+	}
+
+	void Reset( void )
+	{
+		memset( rgAmmoHistory, 0, sizeof rgAmmoHistory );
+	}
+
+	int iHistoryGap;
+	int iCurrentHistorySlot;
+
+	void AddToHistory( int iType, int iId, int iCount = 0 );
+	void AddToHistory( int iType, const char *szName, int iCount = 0 );
+
+	void CheckClearHistory( void );
+	int DrawAmmoHistory( float flTime );
+};
+
+extern HistoryResource gHR;
+
+
+
diff --git a/main/source/cl_dll/battery.cpp b/main/source/cl_dll/battery.cpp
new file mode 100644
index 00000000..c3fc6352
--- /dev/null
+++ b/main/source/cl_dll/battery.cpp
@@ -0,0 +1,156 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// battery.cpp
+//
+// implementation of CHudBattery class
+//
+
+#include "hud.h"
+#include "cl_util.h"
+#include "parsemsg.h"
+
+#include <string.h>
+#include <stdio.h>
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHHudConstants.h"
+
+DECLARE_MESSAGE(m_Battery, Battery)
+
+int CHudBattery::Init(void)
+{
+	m_iBat = 0;
+	m_fFade = 0;
+	m_iFlags = 0;
+
+	HOOK_MESSAGE(Battery);
+
+	gHUD.AddHudElem(this);
+
+	return 1;
+};
+
+
+int CHudBattery::VidInit(void)
+{
+	int HUD_suit_empty = gHUD.GetSpriteIndex( "suit_empty" );
+	int HUD_suit_full = gHUD.GetSpriteIndex( "suit_full" );
+
+	m_hSprite1 = m_hSprite2 = 0;  // delaying get sprite handles until we know the sprites are loaded
+	m_prc1 = &gHUD.GetSpriteRect( HUD_suit_empty );
+	m_prc2 = &gHUD.GetSpriteRect( HUD_suit_full );
+	m_iHeight = m_prc2->bottom - m_prc1->top;
+	m_fFade = 0;
+	return 1;
+};
+
+int CHudBattery:: MsgFunc_Battery(const char *pszName,  int iSize, void *pbuf )
+{
+	m_iFlags |= HUD_ACTIVE;
+
+	
+	BEGIN_READ( pbuf, iSize );
+	int x = READ_SHORT();
+
+	if (x != m_iBat)
+	{
+		// We're sent the health of the player we're observing as if it were our own
+		m_fFade = FADE_TIME;
+		m_iBat = x;
+	}
+
+	return 1;
+}
+
+
+int CHudBattery::Draw(float flTime)
+{
+	
+    if ( gHUD.m_iHideHUDDisplay & HIDEHUD_HEALTH )
+		return 1;
+
+	int r, g, b, x, y, a;
+	wrect_t rc;
+	
+	rc = *m_prc2;
+	
+	int theMaxArmor = gHUD.GetHUDMaxArmor();
+	float theScalar = 1.0f/theMaxArmor;
+	
+	rc.top  += m_iHeight * ((float)(theMaxArmor-(min(theMaxArmor, m_iBat))) * theScalar);	// battery can go from 0 to 100 so * 0.01 goes from 0 to 1
+	
+	gHUD.GetPrimaryHudColor(r, g, b);
+	
+	if (!(gHUD.m_iWeaponBits & (1<<(WEAPON_SUIT)) ))
+		return 1;
+	
+	// Has health changed? Flash the health #
+	if (m_fFade)
+	{
+		if (m_fFade > FADE_TIME)
+			m_fFade = FADE_TIME;
+		
+		m_fFade -= (gHUD.m_flTimeDelta * 20);
+		if (m_fFade <= 0)
+		{
+			a = 128;
+			m_fFade = 0;
+		}
+		
+		// Fade the health number back to dim
+		
+		a = MIN_ALPHA +  (m_fFade/FADE_TIME) * 128;
+		
+	}
+	else
+		a = MIN_ALPHA;
+	
+	ScaleColors(r, g, b, a );
+	
+	int iOffset = (m_prc1->bottom - m_prc1->top)/6;
+
+	int theInset = 0;
+	if(gHUD.GetIsAlien())
+	{
+		theInset = ScreenWidth()*kResourceEnergyBarWidth;
+	}
+
+    int theViewport[4];
+    gHUD.GetViewport(theViewport);
+
+	y = theViewport[1] + theViewport[3] - gHUD.m_iFontHeight - gHUD.m_iFontHeight / 2;
+	x = theViewport[0] + theInset + kArmorLeftInset*ScreenWidth();
+
+	// make sure we have the right sprite handles
+	if ( !m_hSprite1 )
+		m_hSprite1 = gHUD.GetSprite( gHUD.GetSpriteIndex( "suit_empty" ) );
+	if ( !m_hSprite2 )
+		m_hSprite2 = gHUD.GetSprite( gHUD.GetSpriteIndex( "suit_full" ) );
+
+	SPR_Set(m_hSprite1, r, g, b );
+	SPR_DrawAdditive( 0,  x, y - iOffset, m_prc1);
+
+	if (rc.bottom > rc.top)
+	{
+		SPR_Set(m_hSprite2, r, g, b );
+		SPR_DrawAdditive( 0, x, y - iOffset + (rc.top - m_prc2->top), &rc);
+	}
+
+	x += (m_prc1->right - m_prc1->left);
+	x = gHUD.DrawHudNumber(x, y, DHN_3DIGITS | DHN_DRAWZERO, m_iBat, r, g, b);
+    
+	return 1;
+    
+}
\ No newline at end of file
diff --git a/main/source/cl_dll/camera.h b/main/source/cl_dll/camera.h
new file mode 100644
index 00000000..7b7cd017
--- /dev/null
+++ b/main/source/cl_dll/camera.h
@@ -0,0 +1,17 @@
+// Camera.h  --  defines and such for a 3rd person camera
+// NOTE: must include quakedef.h first
+
+#ifndef _CAMERA_H_
+#define _CAMEA_H_
+
+// pitch, yaw, dist
+extern vec3_t cam_ofs;
+// Using third person camera
+extern int cam_thirdperson;
+
+void CAM_Init( void );
+void CAM_ClearStates( void );
+void CAM_StartMouseMove(void);
+void CAM_EndMouseMove(void);
+
+#endif		// _CAMERA_H_
diff --git a/main/source/cl_dll/cdll_int.cpp b/main/source/cl_dll/cdll_int.cpp
new file mode 100644
index 00000000..15e3ba62
--- /dev/null
+++ b/main/source/cl_dll/cdll_int.cpp
@@ -0,0 +1,443 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+//  cdll_int.c
+//
+// this implementation handles the linking of the engine to the DLL
+//
+
+#include "hud.h"
+#include "cl_util.h"
+#include "netadr.h"
+#include "vgui_schememanager.h"
+#include "particles/papi.h"
+
+//extern "C"
+//{
+#include "pm_shared.h"
+//}
+
+#include <string.h>
+#include "hud_servers.h"
+#include "vgui_int.h"
+#include "mod\AvHHud.h"
+#include "mod\AvHUIFactory.h"
+#include "mod\AvHParticleSystemManager.h"
+#include "mod\AvHHulls.h"
+#include "interface.h"
+#include "ITrackerUser.h"
+
+#include "engine/APIProxy.h"
+#include "cl_dll/Exports.h"
+
+cl_enginefunc_t gEngfuncs;
+
+// Instead of using default Half-life HUD, use more flexible one I've added
+//CHud gHUD;
+//UIHud gHUD("StratHL/ui.txt", new AvHUIFactory());
+AvHHud gHUD((string(getModDirectory()) + "/ui.txt").c_str(), new AvHUIFactory());
+
+TeamFortressViewport *gViewPort = NULL;
+
+HINTERFACEMODULE g_hTrackerModule = NULL;
+ITrackerUser *g_pTrackerUser = NULL;
+
+void InitInput (void);
+void EV_HookEvents( void );
+void IN_Commands( void );
+
+/*
+================================
+HUD_GetHullBounds
+
+  Engine calls this to enumerate player collision hulls, for prediction.  Return 0 if the hullnumber doesn't exist.
+================================
+*/
+int CL_DLLEXPORT HUD_GetHullBounds( int hullnumber, float *mins, float *maxs )
+{
+	RecClGetHullBounds(hullnumber, mins, maxs);
+	
+	int iret = 0;
+
+	switch ( hullnumber )
+	{
+	case 0:	// Human and level 4 alien, crouched level 5
+		HULL0_MIN.CopyToArray(mins);
+		HULL0_MAX.CopyToArray(maxs);
+		iret = 1;
+		break;
+
+	case 1:	// Crouched human, level 2 alien, level 3, crouched level 3 and 4
+		HULL1_MIN.CopyToArray(mins);
+		HULL1_MAX.CopyToArray(maxs);
+		iret = 1;
+		break;
+
+	case 2:	 // Point based hull
+		HULL2_MIN.CopyToArray(mins);
+		HULL2_MAX.CopyToArray(maxs);
+		iret = 1;
+		break;
+
+	case 3: // Huge alien
+		HULL3_MIN.CopyToArray(mins);
+		HULL3_MAX.CopyToArray(maxs);
+		iret = 1;
+		break;
+	}
+
+	return iret;
+}
+
+/*
+================================
+HUD_ConnectionlessPacket
+
+ Return 1 if the packet is valid.  Set response_buffer_size if you want to send a response packet.  Incoming, it holds the max
+  size of the response_buffer, so you must zero it out if you choose not to respond.
+================================
+*/
+int	CL_DLLEXPORT HUD_ConnectionlessPacket( const struct netadr_s *net_from, const char *args, char *response_buffer, int *response_buffer_size )
+{
+	RecClConnectionlessPacket(net_from, args, response_buffer, response_buffer_size);
+
+	// Parse stuff from args
+	int max_buffer_size = *response_buffer_size;
+
+	// Zero it out since we aren't going to respond.
+	// If we wanted to response, we'd write data into response_buffer
+	*response_buffer_size = 0;
+
+	// Since we don't listen for anything here, just respond that it's a bogus message
+	// If we didn't reject the message, we'd return 1 for success instead.
+	return 0;
+}
+
+void CL_DLLEXPORT HUD_PlayerMoveInit( struct playermove_s *ppmove )
+{
+	RecClClientMoveInit(ppmove);
+
+	PM_Init( ppmove );
+}
+
+char CL_DLLEXPORT HUD_PlayerMoveTexture( char *name )
+{
+	RecClClientTextureType(name);
+
+	return PM_FindTextureType( name );
+}
+
+void CL_DLLEXPORT HUD_PlayerMove( struct playermove_s *ppmove, int server )
+{
+	RecClClientMove(ppmove, server);
+
+	PM_Move( ppmove, server );
+}
+
+int CL_DLLEXPORT Initialize( cl_enginefunc_t *pEnginefuncs, int iVersion )
+{
+	gEngfuncs = *pEnginefuncs;
+
+	RecClInitialize(pEnginefuncs, iVersion);
+
+	if (iVersion != CLDLL_INTERFACE_VERSION)
+		return 0;
+
+	memcpy(&gEngfuncs, pEnginefuncs, sizeof(cl_enginefunc_t));
+
+	EV_HookEvents();
+	// get tracker interface, if any
+	char szDir[512];
+	if (!gEngfuncs.COM_ExpandFilename("Bin/TrackerUI.dll", szDir, sizeof(szDir)))
+	{
+		g_pTrackerUser = NULL;
+		g_hTrackerModule = NULL;
+		return 1;
+	}
+
+	g_hTrackerModule = Sys_LoadModule(szDir);
+	CreateInterfaceFn trackerFactory = Sys_GetFactory(g_hTrackerModule);
+	if (!trackerFactory)
+	{
+		g_pTrackerUser = NULL;
+		g_hTrackerModule = NULL;
+		return 1;
+	}
+
+	g_pTrackerUser = (ITrackerUser *)trackerFactory(TRACKERUSER_INTERFACE_VERSION, NULL);
+	return 1;
+}
+
+
+/*
+==========================
+	HUD_VidInit
+
+Called when the game initializes
+and whenever the vid_mode is changed
+so the HUD can reinitialize itself.
+==========================
+*/
+
+int CL_DLLEXPORT HUD_VidInit( void )
+{
+	RecClHudVidInit();
+	gHUD.VidInit();
+
+	VGui_Startup();
+
+	return 1;
+}
+
+/*
+==========================
+HUD_Init
+
+  Called whenever the client connects
+  to a server.  Reinitializes all 
+  the hud variables.
+  ==========================
+*/
+
+void CL_DLLEXPORT HUD_Init( void )
+{
+	RecClHudInit();
+	InitInput();
+	gHUD.Init();
+	Scheme_Init();
+}
+
+
+void UIDrawVariableBarSpriteHoles(int inSprite, int inX, int inY, float inPercentage)
+{
+	// Assumes that frame 0 is the empty sprite, frame 1 is full sprite
+	const int kEmptyFrame = 0;
+	const int kFullFrame = 1;
+	
+	int theSpriteWidth = SPR_Width(inSprite, kFullFrame);
+	int theSpriteHeight = SPR_Height(inSprite, kFullFrame);
+	
+	int theColorComponent = 255;
+	
+	// Draw empty sprite
+	SPR_Set(inSprite, theColorComponent, theColorComponent, theColorComponent);
+	SPR_DrawHoles(kEmptyFrame, inX, inY, NULL);
+	
+	// Draw secondary level if specified, at half brightness
+	int theFilledHeight = theSpriteHeight*inPercentage;
+	theFilledHeight = theSpriteHeight*inPercentage;
+	
+	// Draw partially full sprite.  Enable scissor so it's not all drawn.
+	SPR_EnableScissor(inX, inY + (theSpriteHeight - theFilledHeight), theSpriteWidth, theFilledHeight);
+	
+	SPR_Set(inSprite, theColorComponent, theColorComponent, theColorComponent);
+	SPR_DrawHoles(kFullFrame, inX, inY, NULL);
+	
+	SPR_DisableScissor();
+}
+
+// Demonstrates black lines around the edge of sprites (both using tri API and SPR_* calls)
+// Demonstrates scissor not working properly
+void Direct3DTest()
+{
+	static int theSprite = 0;
+	
+	if(!theSprite)
+	{
+		theSprite = Safe_SPR_Load("sprites/640a-energy.spr");
+	}
+
+	// Draw alien energy
+	if(theSprite)
+	{
+		int theFrame = 0;
+		
+		int theX = ScreenWidth() - SPR_Width(theSprite, theFrame);
+		int theY = ScreenHeight() - SPR_Height(theSprite, theFrame);
+
+		// 0-1, depending how much to draw
+		float theFactor = .5f;
+		UIDrawVariableBarSpriteHoles(theSprite, theX, theY, theFactor);
+	}
+}
+
+/*
+==========================
+HUD_Redraw
+
+  called every screen frame to
+  redraw the HUD.
+  ===========================
+*/
+
+int CL_DLLEXPORT HUD_Redraw( float time, int intermission )
+{
+	RecClHudRedraw(time, intermission);
+
+	gHUD.Redraw( time, intermission );
+
+	//Direct3DTest();
+
+	//SoftwareTest();
+
+	return 1;
+}
+
+
+/*
+==========================
+	HUD_UpdateClientData
+
+called every time shared client
+dll/engine data gets changed,
+and gives the cdll a chance
+to modify the data.
+
+returns 1 if anything has been changed, 0 otherwise.
+==========================
+*/
+
+int CL_DLLEXPORT HUD_UpdateClientData(client_data_t *pcldata, float flTime )
+{
+	RecClHudUpdateClientData(pcldata, flTime);
+
+	IN_Commands();
+
+	return gHUD.UpdateClientData(pcldata, flTime );
+}
+
+/*
+==========================
+	HUD_Reset
+
+Called at start and end of demos to restore to "non"HUD state.
+==========================
+*/
+
+void CL_DLLEXPORT HUD_Reset( void )
+{
+	RecClHudReset();
+
+	gHUD.VidInit();
+	AvHParticleSystemManager::Instance()->Reset();
+}
+
+/*
+==========================
+HUD_Frame
+
+  Called by engine every frame that client .dll is loaded
+  ==========================
+*/
+
+void CL_DLLEXPORT HUD_Frame( double time )
+{
+	RecClHudFrame(time);
+	
+	ServersThink( time );
+	
+	GetClientVoiceMgr()->Frame(time);
+}
+
+
+/*
+==========================
+HUD_VoiceStatus
+
+  Called when a player starts or stops talking.
+  ==========================
+*/
+
+void CL_DLLEXPORT HUD_VoiceStatus(int entindex, qboolean bTalking)
+{
+	RecClVoiceStatus(entindex, bTalking);
+	
+	GetClientVoiceMgr()->UpdateSpeakerStatus(entindex, bTalking);
+}
+
+/*
+==========================
+HUD_DirectorEvent
+
+  Called when a director event message was received
+  ==========================
+*/
+
+void CL_DLLEXPORT HUD_DirectorMessage( int iSize, void *pbuf )
+{
+	RecClDirectorMessage(iSize, pbuf);
+    gHUD.m_Spectator.DirectorMessage( iSize, pbuf );
+}
+
+
+
+#if defined( FINAL_VAC_BUILD )
+
+cldll_func_dst_t *g_pcldstAddrs;
+
+extern "C" void __declspec( dllexport ) F(void *pv)
+{
+	cldll_func_t *pcldll_func = (cldll_func_t *)pv;
+
+	g_pcldstAddrs = ((cldll_func_dst_t *)pcldll_func->pHudVidInitFunc);
+
+	cldll_func_t cldll_func = 
+	{
+	Initialize,
+	HUD_Init,
+	HUD_VidInit,
+	HUD_Redraw,
+	HUD_UpdateClientData,
+	HUD_Reset,
+	HUD_PlayerMove,
+	HUD_PlayerMoveInit,
+	HUD_PlayerMoveTexture,
+	IN_ActivateMouse,
+	IN_DeactivateMouse,
+	IN_MouseEvent,
+	IN_ClearStates,
+	IN_Accumulate,
+	CL_CreateMove,
+	CL_IsThirdPerson,
+	CL_CameraOffset,
+	KB_Find,
+	CAM_Think,
+	V_CalcRefdef,
+	HUD_AddEntity,
+	HUD_CreateEntities,
+	HUD_DrawNormalTriangles,
+	HUD_DrawTransparentTriangles,
+	HUD_StudioEvent,
+	HUD_PostRunCmd,
+	HUD_Shutdown,
+	HUD_TxferLocalOverrides,
+	HUD_ProcessPlayerState,
+	HUD_TxferPredictionData,
+	Demo_ReadBuffer,
+	HUD_ConnectionlessPacket,
+	HUD_GetHullBounds,
+	HUD_Frame,
+	HUD_Key_Event,
+	HUD_TempEntUpdate,
+	HUD_GetUserEntity,
+	HUD_VoiceStatus,
+	HUD_DirectorMessage,
+	HUD_GetStudioModelInterface,
+	};
+
+	*pcldll_func = cldll_func;
+}
+
+#endif // FINAL_VAC_BUILD
\ No newline at end of file
diff --git a/main/source/cl_dll/chud.h b/main/source/cl_dll/chud.h
new file mode 100644
index 00000000..aa00f392
--- /dev/null
+++ b/main/source/cl_dll/chud.h
@@ -0,0 +1,127 @@
+#ifndef CHUD_H
+#define CHUD_H
+
+#include "cl_dll/chudmisc.h"
+#include "cl_dll/hud_spectator.h"
+#include "mod/AvHFont.h"
+
+
+class CHud
+{
+private:
+	HUDLIST						*m_pHudList;
+	HSPRITE						m_hsprLogo;
+	int							m_iLogo;
+	client_sprite_t				*m_pSpriteList;
+	int							m_iSpriteCount;
+	int							m_iSpriteCountAllRes;
+	float						m_flMouseSensitivity;
+	int							m_iConcussionEffect; 
+
+public:
+
+	HSPRITE						m_hsprCursor;
+	float m_flTime;	   // the current client time
+	float m_fOldTime;  // the time at which the HUD was last redrawn
+	double m_flTimeDelta; // the difference between flTime and fOldTime
+	Vector	m_vecOrigin;
+	Vector	m_vecAngles;
+	int		m_iKeyBits;
+	int		m_iHideHUDDisplay;
+	int		m_iFOV;
+	int		m_Teamplay;
+	int		m_iRes;
+	cvar_t  *m_pCvarStealMouse;
+	cvar_t	*m_pCvarDraw;
+
+	int m_iFontHeight;
+	int DrawHudNumber(int x, int y, int iFlags, int iNumber, int r, int g, int b );
+	int DrawHudStringCentered(int x, int y, int iMaxX, const char *szString, int r, int g, int b );
+	int DrawHudString(int x, int y, int iMaxX, const char *szString, int r, int g, int b );
+	int GetHudStringHeight();
+	int GetHudStringWidth(const char* szIt);
+	int DrawHudStringReverse( int xpos, int ypos, int iMinX, char *szString, int r, int g, int b );
+	int DrawHudNumberString( int xpos, int ypos, int iMinX, int iNumber, int r, int g, int b );
+	int GetNumWidth(int iNumber, int iFlags);
+
+private:
+	// the memory for these arrays are allocated in the first call to CHud::VidInit(), when the hud.txt and associated sprites are loaded.
+	// freed in ~CHud()
+	HSPRITE *m_rghSprites;	/*[HUD_SPRITE_COUNT]*/			// the sprites loaded from hud.txt
+	wrect_t *m_rgrcRects;	/*[HUD_SPRITE_COUNT]*/
+	char *m_rgszSpriteNames; /*[HUD_SPRITE_COUNT][MAX_SPRITE_NAME_LENGTH]*/
+
+	struct cvar_s *default_fov;
+
+
+public:
+	HSPRITE GetSprite( int index ) 
+	{
+		return (index < 0) ? 0 : m_rghSprites[index];
+	}
+
+	wrect_t& GetSpriteRect( int index )
+	{
+		return m_rgrcRects[index];
+	}
+
+	
+	int GetSpriteIndex( const char *SpriteName );	// gets a sprite index, for use in the m_rghSprites[] array
+
+	CHudAmmo		m_Ammo;
+	CHudHealth		m_Health;
+	CHudSpectator	m_Spectator;
+	CHudGeiger		m_Geiger;
+	CHudBattery		m_Battery;
+	CHudTrain		m_Train;
+	CHudFlashlight	m_Flash;
+	CHudMessage		m_Message;
+	CHudStatusBar   m_StatusBar;
+	CHudDeathNotice m_DeathNotice;
+	CHudSayText		m_SayText;
+	CHudMenu		m_Menu;
+	CHudAmmoSecondary	m_AmmoSecondary;
+	CHudTextMessage m_TextMessage;
+	CHudStatusIcons m_StatusIcons;
+    
+    AvHFont mFont;
+    AvHFont mSmallFont;
+
+	void Init( void );
+	void VidInit( void );
+	void Think(void);
+	int Redraw( float flTime, int intermission );
+	int UpdateClientData( client_data_t *cdata, float time );
+
+	CHud() : m_iSpriteCount(0), m_pHudList(NULL) {}  
+	~CHud();			// destructor, frees allocated memory
+
+	// user messages
+	int _cdecl MsgFunc_Damage(const char *pszName, int iSize, void *pbuf );
+	int _cdecl MsgFunc_GameMode(const char *pszName, int iSize, void *pbuf );
+	int _cdecl MsgFunc_Logo(const char *pszName,  int iSize, void *pbuf);
+	int _cdecl MsgFunc_ResetHUD(const char *pszName,  int iSize, void *pbuf);
+	void _cdecl MsgFunc_InitHUD( const char *pszName, int iSize, void *pbuf );
+	void _cdecl MsgFunc_ViewMode( const char *pszName, int iSize, void *pbuf );
+	int _cdecl MsgFunc_SetFOV(const char *pszName,  int iSize, void *pbuf);
+	int  _cdecl MsgFunc_Concuss( const char *pszName, int iSize, void *pbuf );
+
+	// Screen information
+	SCREENINFO	m_scrinfo;
+
+	int	m_iWeaponBits;
+	int	m_fPlayerDead;
+	int m_iIntermission;
+
+	// sprite indexes
+	int m_HUD_number_0;
+
+	void AddHudElem(CHudBase *p);
+
+	float GetSensitivity();
+
+};
+
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/cl_dll/chudmisc.h b/main/source/cl_dll/chudmisc.h
new file mode 100644
index 00000000..6e0dcd94
--- /dev/null
+++ b/main/source/cl_dll/chudmisc.h
@@ -0,0 +1,556 @@
+#ifndef CHUDMISC_H
+#define CHUDMISC_H
+
+#define RGB_YELLOWISH 0x00FFA000 //255,160,0
+#define RGB_REDISH 0x00FF1010 //255,160,0
+#define RGB_GREENISH 0x0000A000 //0,160,0
+#define RGB_MARINE_BLUE 0x000099FF //0 153 255
+#define RGB_MARINE_SELECTED 0x006EE6FF //110, 230, 255
+#define RGB_MARINE_PARASITED 0x00E3F03D //227, 240, 61
+
+#include "wrect.h"
+#include "cl_dll.h"
+#include "ammo.h"
+#include "game_shared/teamconst.h"
+
+#define DHN_DRAWZERO 1
+#define DHN_2DIGITS  2
+#define DHN_3DIGITS  4
+#define MIN_ALPHA	 100	
+
+#define		HUDELEM_ACTIVE	1
+
+typedef struct {
+	int x, y;
+} POSITION;
+
+typedef struct {
+	unsigned char r,g,b,a;
+} RGBA;
+
+typedef struct cvar_s cvar_t;
+
+
+#define HUD_ACTIVE	1
+#define HUD_INTERMISSION 2
+
+#define MAX_PLAYER_NAME_LENGTH		32
+
+#define	MAX_MOTD_LENGTH				1536
+
+//
+//-----------------------------------------------------
+//
+class CHudBase
+{
+public:
+	POSITION  m_pos;
+	int   m_type;
+	int	  m_iFlags; // active, moving, 
+	virtual		~CHudBase() {}
+	virtual int Init( void ) {return 0;}
+	virtual int VidInit( void ) {return 0;}
+	virtual int Draw(float flTime) {return 0;}
+	virtual void Think(void) {return;}
+	virtual void Reset(void) {return;}
+	virtual void InitHUDData( void ) {}		// called every time a server is connected to
+	
+};
+
+struct HUDLIST {
+	CHudBase	*p;
+	HUDLIST		*pNext;
+};
+
+
+
+//
+//-----------------------------------------------------
+//
+#include "..\game_shared\voice_status.h"
+#include "hud_spectator.h"
+
+
+//
+//-----------------------------------------------------
+//
+class CHudAmmo: public CHudBase
+{
+public:
+	int Init( void );
+	int VidInit( void );
+	int Draw(float flTime);
+	void Think(void);
+	void Reset(void);
+	int DrawWList(float flTime);
+	int MsgFunc_CurWeapon(const char *pszName, int iSize, void *pbuf);
+	int MsgFunc_WeaponList(const char *pszName, int iSize, void *pbuf);
+	int MsgFunc_AmmoX(const char *pszName, int iSize, void *pbuf);
+	int MsgFunc_AmmoPickup( const char *pszName, int iSize, void *pbuf );
+	int MsgFunc_WeapPickup( const char *pszName, int iSize, void *pbuf );
+	int MsgFunc_ItemPickup( const char *pszName, int iSize, void *pbuf );
+	int MsgFunc_HideWeapon( const char *pszName, int iSize, void *pbuf );
+	
+	void SlotInput( int iSlot );
+	void _cdecl UserCmd_Slot1( void );
+	void _cdecl UserCmd_Slot2( void );
+	void _cdecl UserCmd_Slot3( void );
+	void _cdecl UserCmd_Slot4( void );
+	void _cdecl UserCmd_Slot5( void );
+	void _cdecl UserCmd_Slot6( void );
+	void _cdecl UserCmd_Slot7( void );
+	void _cdecl UserCmd_Slot8( void );
+	void _cdecl UserCmd_Slot9( void );
+	void _cdecl UserCmd_Slot10( void );
+	void _cdecl UserCmd_Close( void );
+	void _cdecl UserCmd_NextWeapon( void );
+	void _cdecl UserCmd_PrevWeapon( void );
+	
+	void SetCurrentClip(int inClip);
+private:
+	float m_fFade;
+	RGBA  m_rgba;
+	WEAPON *m_pWeapon;
+	int	m_HUD_bucket0;
+	int m_HUD_selection;
+	
+};
+
+
+
+//
+//-----------------------------------------------------
+//
+class CHudAmmoSecondary: public CHudBase
+{
+public:
+	int Init( void );
+	int VidInit( void );
+	void Reset( void );
+	int Draw(float flTime);
+	
+	int MsgFunc_SecAmmoVal( const char *pszName, int iSize, void *pbuf );
+	int MsgFunc_SecAmmoIcon( const char *pszName, int iSize, void *pbuf );
+	
+private:
+	enum {
+		MAX_SEC_AMMO_VALUES = 4
+	};
+	
+	int m_HUD_ammoicon; // sprite indices
+	int m_iAmmoAmounts[MAX_SEC_AMMO_VALUES];
+	float m_fFade;
+};
+
+
+#include "health.h"
+
+
+#define FADE_TIME 100
+
+
+
+
+//
+//-----------------------------------------------------
+//
+class CHudGeiger: public CHudBase
+{
+public:
+	int Init( void );
+	int VidInit( void );
+	int Draw(float flTime);
+	int MsgFunc_Geiger(const char *pszName, int iSize, void *pbuf);
+	
+private:
+	int m_iGeigerRange;
+
+};
+
+//
+//-----------------------------------------------------
+//
+class CHudTrain: public CHudBase
+{
+public:
+	int Init( void );
+	int VidInit( void );
+	int Draw(float flTime);
+	int MsgFunc_Train(const char *pszName, int iSize, void *pbuf);
+
+private:
+	HSPRITE m_hSprite;
+	int m_iPos;
+
+};
+
+//
+//-----------------------------------------------------
+//
+// REMOVED: Vgui has replaced this.
+//
+/*
+class CHudMOTD : public CHudBase
+{
+public:
+	int Init( void );
+	int VidInit( void );
+	int Draw( float flTime );
+	void Reset( void );
+
+	int MsgFunc_MOTD( const char *pszName, int iSize, void *pbuf );
+
+protected:
+	static int MOTD_DISPLAY_TIME;
+	char m_szMOTD[ MAX_MOTD_LENGTH ];
+	float m_flActiveRemaining;
+	int m_iLines;
+};
+*/
+
+//
+//-----------------------------------------------------
+//
+class CHudStatusBar : public CHudBase
+{
+public:
+	int Init( void );
+	int VidInit( void );
+	int Draw( float flTime );
+	const char* GetStatusString() const;
+	void Reset( void );
+	void ParseStatusString( int line_num );
+	
+	int MsgFunc_StatusText( const char *pszName, int iSize, void *pbuf );
+	int MsgFunc_StatusValue( const char *pszName, int iSize, void *pbuf );
+	
+protected:
+	void ReparseStringIfNeeded();
+
+	enum { 
+		MAX_STATUSTEXT_LENGTH = 128,
+			MAX_STATUSBAR_VALUES = 8,
+			MAX_STATUSBAR_LINES = 2,
+	};
+	
+	char m_szStatusText[MAX_STATUSBAR_LINES][MAX_STATUSTEXT_LENGTH];  // a text string describing how the status bar is to be drawn
+	char m_szStatusBar[MAX_STATUSBAR_LINES][MAX_STATUSTEXT_LENGTH];	// the constructed bar that is drawn
+	int m_iStatusValues[MAX_STATUSBAR_VALUES];  // an array of values for use in the status bar
+	
+	int m_bReparseString; // set to TRUE whenever the m_szStatusBar needs to be recalculated
+	
+	// an array of colors...one color for each line
+	float *m_pflNameColors[MAX_STATUSBAR_LINES];
+};
+
+
+//
+//-----------------------------------------------------
+//
+// REMOVED: Vgui has replaced this.
+//
+/*
+class CHudScoreboard: public CHudBase
+{
+public:
+	int Init( void );
+	void InitHUDData( void );
+	int VidInit( void );
+	int Draw( float flTime );
+	int DrawPlayers( int xoffset, float listslot, int nameoffset = 0, char *team = NULL ); // returns the ypos where it finishes drawing
+	void UserCmd_ShowScores( void );
+	void UserCmd_HideScores( void );
+	int MsgFunc_ScoreInfo( const char *pszName, int iSize, void *pbuf );
+	int MsgFunc_TeamInfo( const char *pszName, int iSize, void *pbuf );
+	int MsgFunc_TeamScore( const char *pszName, int iSize, void *pbuf );
+	void DeathMsg( int killer, int victim );
+
+	int m_iNumTeams;
+
+	int m_iLastKilledBy;
+	int m_fLastKillTime;
+	int m_iPlayerNum;
+	int m_iShowscoresHeld;
+
+	void GetAllPlayersInfo( void );
+private:
+	struct cvar_s *cl_showpacketloss;
+
+};
+*/
+
+#define CUSTOM_ICON_LENGTH 32
+
+struct extra_player_info_t
+{
+	short score;
+    short lastScore;
+    float timeOfLastScoreChange;
+
+    short frags;
+	short deaths;
+	short playerclass;
+	short teamnumber;
+	char teamname[MAX_TEAM_NAME];
+	short auth;
+	short color;
+	char customicon[CUSTOM_ICON_LENGTH + 3]; //last 3 characters is the color.
+};
+
+struct team_info_t 
+{
+	char name[MAX_TEAM_NAME];
+    short score;
+	short frags;
+	short deaths;
+	short ping;
+	short packetloss;
+	short ownteam;
+	short players;
+	int already_drawn;
+	int scores_overriden;
+	int teamnumber;
+};
+
+extern hud_player_info_t	g_PlayerInfoList[MAX_PLAYERS+1];	   // player info from the engine
+extern extra_player_info_t  g_PlayerExtraInfo[MAX_PLAYERS+1];   // additional player info sent directly to the client dll
+extern team_info_t			g_TeamInfo[MAX_TEAMS+1];
+extern int					g_IsSpectator[MAX_PLAYERS+1];
+
+
+//
+//-----------------------------------------------------
+//
+class CHudDeathNotice : public CHudBase
+{
+public:
+	int Init( void );
+	void InitHUDData( void );
+	int VidInit( void );
+	int Draw( float flTime );
+	int MsgFunc_DeathMsg( const char *pszName, int iSize, void *pbuf );
+	
+private:
+	int m_HUD_d_skull;  // sprite index of skull icon
+};
+
+
+//
+//-----------------------------------------------------
+//
+class CHudMenu : public CHudBase
+{
+public:
+	int Init( void );
+	void InitHUDData( void );
+	int VidInit( void );
+	void Reset( void );
+	int Draw( float flTime );
+	int MsgFunc_ShowMenu( const char *pszName, int iSize, void *pbuf );
+	
+	void SelectMenuItem( int menu_item );
+	
+	int m_fMenuDisplayed;
+	int m_bitsValidSlots;
+	float m_flShutoffTime;
+	int m_fWaitingForMore;
+};
+
+
+//
+//-----------------------------------------------------
+//
+class CHudSayText : public CHudBase
+{
+public:
+	int Init( void );
+	void InitHUDData( void );
+	int VidInit( void );
+	int Draw( float flTime );
+	int MsgFunc_SayText( const char *pszName, int iSize, void *pbuf );
+	void SayTextPrint( const char *pszBuf, int iBufSize, int clientIndex = -1 );
+	void EnsureTextFitsInOneLineAndWrapIfHaveTo( int line );
+friend class CHud;
+friend class CHudSpectator;
+
+private:
+
+	struct cvar_s *	m_HUD_saytext;
+	struct cvar_s *	m_HUD_saytext_time;
+};
+
+
+//
+//-----------------------------------------------------
+//
+class CHudBattery: public CHudBase
+{
+public:
+	int Init( void );
+	int VidInit( void );
+	int Draw(float flTime);
+	int MsgFunc_Battery(const char *pszName,  int iSize, void *pbuf );
+	
+private:
+	HSPRITE m_hSprite1;
+	HSPRITE m_hSprite2;
+	wrect_t *m_prc1;
+	wrect_t *m_prc2;
+	int	  m_iBat;	
+	float m_fFade;
+	int	  m_iHeight;		// width of the battery innards
+};
+
+
+
+//
+//-----------------------------------------------------
+//
+class CHudFlashlight: public CHudBase
+{
+public:
+	int Init( void );
+	int VidInit( void );
+	int Draw(float flTime);
+	void Reset( void );
+	int MsgFunc_Flashlight(const char *pszName,  int iSize, void *pbuf );
+	int MsgFunc_FlashBat(const char *pszName,  int iSize, void *pbuf );
+	
+private:
+	HSPRITE m_hSprite1;
+	HSPRITE m_hSprite2;
+	HSPRITE m_hBeam;
+	wrect_t *m_prc1;
+	wrect_t *m_prc2;
+	wrect_t *m_prcBeam;
+	float m_flBat;	
+	int	  m_iBat;	
+	int	  m_fOn;
+	float m_fFade;
+	int	  m_iWidth;		// width of the battery innards
+};
+
+
+//
+//-----------------------------------------------------
+//
+const int maxHUDMessages = 16;
+struct message_parms_t
+{
+	client_textmessage_t	*pMessage;
+	float	time;
+	int x, y;
+	int	totalWidth, totalHeight;
+	int width;
+	int lines;
+	int lineLength;
+	int length;
+	int r, g, b;
+	int text;
+	int fadeBlend;
+	float charTime;
+	float fadeTime;
+};
+
+
+//
+//-----------------------------------------------------
+//
+class CHudTextMessage: public CHudBase
+{
+public:
+	int Init( void );
+	static char *LocaliseTextString( const char *msg, char *dst_buffer, int buffer_size );
+	static char *BufferedLocaliseTextString( const char *msg );
+	char *LookupString( const char *msg_name, int *msg_dest = NULL );
+	int MsgFunc_TextMsg(const char *pszName, int iSize, void *pbuf);
+};
+
+
+//
+//-----------------------------------------------------
+//
+
+class CHudMessage: public CHudBase
+{
+public:
+	int Init( void );
+	int VidInit( void );
+	int Draw(float flTime);
+	int MsgFunc_HudText(const char *pszName, int iSize, void *pbuf);
+	int MsgFunc_HudText2(const char *pszName, int iSize, void *pbuf);
+	int MsgFunc_GameTitle(const char *pszName, int iSize, void *pbuf);
+	
+	float FadeBlend( float fadein, float fadeout, float hold, float localTime );
+	int	XPosition( float x, int width, int lineWidth );
+	int YPosition( float y, int height );
+
+	void MessageAddPlayerID(const char* pName, bool inEnemy);
+
+	void MessageAdd( const char *pName, float time );
+	bool MessageRemove( const char *pName );
+	void MessageDrawScan( client_textmessage_t *pMessage, float time );
+	void MessageScanStart( void );
+	void MessageScanNextChar( void );
+	void Reset( void );
+	
+private:
+	bool DrawMessage(client_textmessage_t* inMessage, float inStartTime, float inCurrentTime);
+	void SetPlayerIDPosition();
+
+	client_textmessage_t		*m_pMessages[maxHUDMessages];
+	float						m_startTime[maxHUDMessages];
+	message_parms_t				m_parms;
+	float						m_gameTitleTime;
+	client_textmessage_t		*m_pGameTitle;
+	
+	client_textmessage_t		mPlayerIDMessage;
+	float						mPlayerIDTime;
+	char*						mPlayerID;
+	
+	int m_HUD_title_life;
+	int m_HUD_title_half;
+};
+
+//
+//-----------------------------------------------------
+//
+#define MAX_SPRITE_NAME_LENGTH	24
+
+class CHudStatusIcons: public CHudBase
+{
+public:
+	int Init( void );
+	int VidInit( void );
+	void Reset( void );
+	int Draw(float flTime);
+	int MsgFunc_StatusIcon(const char *pszName, int iSize, void *pbuf);
+	
+	enum { 
+		MAX_ICONSPRITENAME_LENGTH = MAX_SPRITE_NAME_LENGTH,
+			MAX_ICONSPRITES = 4,
+	};
+	
+	
+	//had to make these public so CHud could access them (to enable concussion icon)
+	//could use a friend declaration instead...
+	void EnableIcon( char *pszIconName, unsigned char red, unsigned char green, unsigned char blue );
+	void DisableIcon( char *pszIconName );
+	
+private:
+	
+	typedef struct
+	{
+		char szSpriteName[MAX_ICONSPRITENAME_LENGTH];
+		HSPRITE spr;
+		wrect_t rc;
+		unsigned char r, g, b;
+	} icon_sprite_t;
+	
+	icon_sprite_t m_IconList[MAX_ICONSPRITES];
+	
+};
+
+typedef struct cvar_s cvar_t;
+
+#endif
\ No newline at end of file
diff --git a/main/source/cl_dll/cl_dll.h b/main/source/cl_dll/cl_dll.h
new file mode 100644
index 00000000..cbadc147
--- /dev/null
+++ b/main/source/cl_dll/cl_dll.h
@@ -0,0 +1,38 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+//  cl_dll.h
+//
+
+// 4-23-98  JOHN
+
+//
+//  This DLL is linked by the client when they first initialize.
+// This DLL is responsible for the following tasks:
+//		- Loading the HUD graphics upon initialization
+//		- Drawing the HUD graphics every frame
+//		- Handling the custum HUD-update packets
+//
+typedef unsigned char byte;
+typedef unsigned short word;
+typedef float vec_t;
+typedef int (*pfnUserMsgHook)(const char *pszName, int iSize, void *pbuf);
+
+#include "util_vector.h"
+
+#include "../engine/cdll_int.h"
+#include "../dlls/cdll_dll.h"
+
+extern cl_enginefunc_t gEngfuncs;
diff --git a/main/source/cl_dll/cl_dll.vcproj b/main/source/cl_dll/cl_dll.vcproj
new file mode 100644
index 00000000..8f65fa20
--- /dev/null
+++ b/main/source/cl_dll/cl_dll.vcproj
@@ -0,0 +1,3423 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="cl_dll"
+	RootNamespace="cl_dll"
+	SccProjectName=""
+	SccAuxPath=""
+	SccLocalPath=""
+	SccProvider="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+			IntermediateDirectory="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				OptimizeForProcessor="1"
+				AdditionalIncludeDirectories="$(SolutionDir);$(SolutionDir)engine;$(SolutionDir)common;$(SolutionDir)pm_shared;$(SolutionDir)dlls;$(SolutionDir)game_shared;$(SolutionDir)fmod\inc;$(SolutionDir)utils\vgui\include"
+				PreprocessorDefinitions="_DEBUG;_MBCS;DEBUG;WIN32;_WINDOWS;AVH_CLIENT;$(NoInherit)"
+				RuntimeLibrary="1"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Debug/cl_dll.pch"
+				AssemblerListingLocation="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ObjectFile="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ProgramDataBaseFileName="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib ws2_32.lib particles.lib textrep.lib util.lib $(SolutionDir)\utils\vgui\lib\win32_vc6\vgui.lib"
+				OutputFile="$(SolutionDir)..\cl_dlls\client.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="$(SolutionDir)lib\$(ConfigurationName)"
+				IgnoreDefaultLibraryNames="libcmt.lib"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(SolutionDir)..\cl_dlls/client.pdb"
+				GenerateMapFile="FALSE"
+				MapFileName=""
+				SubSystem="2"
+				BaseAddress="0x01900000"
+				ImportLibrary="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/cl_dll.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/cl_dll.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+			IntermediateDirectory="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="$(SolutionDir);$(SolutionDir)engine;$(SolutionDir)common;$(SolutionDir)pm_shared;$(SolutionDir)dlls;$(SolutionDir)game_shared;$(SolutionDir)fmod\inc;$(SolutionDir)utils\vgui\include"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;AVH_CLIENT;$(NOINHERIT)"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ObjectFile="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ProgramDataBaseFileName="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="0"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib ws2_32.lib particles.lib textrep.lib util.lib $(SolutionDir)\utils\vgui\lib\win32_vc6\vgui.lib"
+				OutputFile="$(SolutionDir)..\cl_dlls\client.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="$(SolutionDir)lib\$(ConfigurationName)"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="FALSE"
+				ProgramDatabaseFile=""
+				GenerateMapFile="FALSE"
+				MapFileName=""
+				SubSystem="2"
+				ImportLibrary="$(SolutionDir)\temp\$(ProjectName)\$(ConfigurationName)/cl_dll.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/cl_dll.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90">
+			<File
+				RelativePath="ammo.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="ammo_secondary.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="ammohistory.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="battery.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="cdll_int.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="com_weapons.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="death.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="demo.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="entity.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="ev_common.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="events.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="flashlight.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="GameStudioModelRenderer.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="geiger.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="health.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="hud.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="hud_msg.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="hud_redraw.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="hud_servers.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="hud_spectator.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="hud_update.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="in_camera.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="input.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="inputw32.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\common\interface.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="menu.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="message.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="overview.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="parsemsg.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\pm_shared\pm_debug.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\pm_shared\pm_math.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\pm_shared\pm_shared.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="saytext.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="status_icons.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="statusbar.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="studio_util.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="StudioModelRenderer.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="text_message.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="train.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="tri.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="util.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\game_shared\vgui_checkbutton2.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="vgui_ClassMenu.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="vgui_ConsolePanel.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="vgui_ControlConfigPanel.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="vgui_CustomObjects.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\game_shared\vgui_grid.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\game_shared\vgui_helpers.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="vgui_int.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\game_shared\vgui_listbox.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\game_shared\vgui_loadtga.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="vgui_MOTDWindow.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="vgui_SchemeManager.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="vgui_ScorePanel.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\game_shared\vgui_scrollbar2.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="vgui_ServerBrowser.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\game_shared\vgui_slider2.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="vgui_SpectatorPanel.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="vgui_TeamFortressViewport.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="vgui_teammenu.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="view.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\game_shared\voice_banmgr.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\game_shared\voice_status.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\game_shared\voice_vgui_tweakdlg.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<Filter
+				Name="hl"
+				Filter="*.CPP">
+				<File
+					RelativePath="cl_util.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="ev_hldm.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="hl\hl_baseentity.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="hl\hl_objects.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="hl\hl_weapons.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\dlls\wpn_shared\hl_wpn_glock.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+			<Filter
+				Name="client-side weapons"
+				Filter="">
+				<File
+					RelativePath="..\mod\AvHAcidRocketGun.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHAlienAbilities.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHAlienAbilities.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHAlienWeaponConstants.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHAlienWeapons.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHBasePlayerWeapon.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHBasePlayerWeaponConstants.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHBileBombGun.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHBite.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHBite2.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHBlink.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHClaws.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHDevour.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHDivineWind.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHGrenade.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHGrenadeGun.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHHealingSpray.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHHeavyMachineGun.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHItemInfo.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHKnife.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHMachineGun.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHMarineWeapon.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHMarineWeapon.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHMarineWeaponConstants.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHMarineWeapons.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHMetabolize.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHMine.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHParasiteGun.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHPistol.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHPrimalScream.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHSonicGun.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHSpikeGun.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHSpitGun.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHSpores.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHStomp.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHSwipe.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHUmbraGun.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHWebSpinner.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHWelder.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;fi;fd">
+			<File
+				RelativePath="ammo.h">
+			</File>
+			<File
+				RelativePath="ammohistory.h">
+			</File>
+			<File
+				RelativePath="..\game_shared\bitvec.h">
+			</File>
+			<File
+				RelativePath="camera.h">
+			</File>
+			<File
+				RelativePath="cl_dll.h">
+			</File>
+			<File
+				RelativePath="com_weapons.h">
+			</File>
+			<File
+				RelativePath="demo.h">
+			</File>
+			<File
+				RelativePath="ev_hldm.h">
+			</File>
+			<File
+				RelativePath="eventscripts.h">
+			</File>
+			<File
+				RelativePath="GameStudioModelRenderer.h">
+			</File>
+			<File
+				RelativePath="health.h">
+			</File>
+			<File
+				RelativePath="hud.h">
+			</File>
+			<File
+				RelativePath="hud_iface.h">
+			</File>
+			<File
+				RelativePath="hud_servers.h">
+			</File>
+			<File
+				RelativePath="hud_servers_priv.h">
+			</File>
+			<File
+				RelativePath="hud_spectator.h">
+			</File>
+			<File
+				RelativePath="in_defs.h">
+			</File>
+			<File
+				RelativePath="..\common\itrackeruser.h">
+			</File>
+			<File
+				RelativePath="kbutton.h">
+			</File>
+			<File
+				RelativePath="overview.h">
+			</File>
+			<File
+				RelativePath="parsemsg.h">
+			</File>
+			<File
+				RelativePath="..\pm_shared\pm_debug.h">
+			</File>
+			<File
+				RelativePath="..\pm_shared\pm_defs.h">
+			</File>
+			<File
+				RelativePath="..\pm_shared\pm_info.h">
+			</File>
+			<File
+				RelativePath="..\pm_shared\pm_materials.h">
+			</File>
+			<File
+				RelativePath="..\pm_shared\pm_movevars.h">
+			</File>
+			<File
+				RelativePath="..\pm_shared\pm_shared.h">
+			</File>
+			<File
+				RelativePath="studio_util.h">
+			</File>
+			<File
+				RelativePath="StudioModelRenderer.h">
+			</File>
+			<File
+				RelativePath="..\upp\UPPClientInterface.h">
+			</File>
+			<File
+				RelativePath="..\upp\UPPCommonInterface.h">
+			</File>
+			<File
+				RelativePath="..\upp\UPPTypes.h">
+			</File>
+			<File
+				RelativePath="util.h">
+			</File>
+			<File
+				RelativePath="util_vector.h">
+			</File>
+			<File
+				RelativePath="..\game_shared\vgui_checkbutton2.h">
+			</File>
+			<File
+				RelativePath="vgui_ConsolePanel.h">
+			</File>
+			<File
+				RelativePath="vgui_ControlConfigPanel.h">
+			</File>
+			<File
+				RelativePath="..\game_shared\vgui_defaultinputsignal.h">
+			</File>
+			<File
+				RelativePath="..\game_shared\vgui_grid.h">
+			</File>
+			<File
+				RelativePath="..\game_shared\vgui_helpers.h">
+			</File>
+			<File
+				RelativePath="vgui_int.h">
+			</File>
+			<File
+				RelativePath="..\game_shared\vgui_listbox.h">
+			</File>
+			<File
+				RelativePath="..\game_shared\vgui_loadtga.h">
+			</File>
+			<File
+				RelativePath="vgui_SchemeManager.h">
+			</File>
+			<File
+				RelativePath="vgui_ScorePanel.h">
+			</File>
+			<File
+				RelativePath="..\game_shared\vgui_scrollbar2.h">
+			</File>
+			<File
+				RelativePath="vgui_ServerBrowser.h">
+			</File>
+			<File
+				RelativePath="..\game_shared\vgui_slider2.h">
+			</File>
+			<File
+				RelativePath="vgui_TeamFortressViewport.h">
+			</File>
+			<File
+				RelativePath="view.h">
+			</File>
+			<File
+				RelativePath="..\game_shared\voice_common.h">
+			</File>
+			<File
+				RelativePath="..\game_shared\voice_status.h">
+			</File>
+			<File
+				RelativePath="..\game_shared\voice_vgui_tweakdlg.h">
+			</File>
+			<File
+				RelativePath="wrect.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="ui"
+			Filter="">
+			<File
+				RelativePath="..\ui\ColoredPanel.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_DEBUG;_MBCS;DEBUG;WIN32;_WINDOWS;AVH_CLIENT;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\ui\ColoredPanel.h">
+			</File>
+			<File
+				RelativePath="..\ui\DummyPanel.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_DEBUG;_MBCS;DEBUG;WIN32;_WINDOWS;AVH_CLIENT;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\ui\FadingImageLabel.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_DEBUG;_MBCS;DEBUG;WIN32;_WINDOWS;AVH_CLIENT;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\ui\FadingImageLabel.h">
+			</File>
+			<File
+				RelativePath="..\ui\MarqueeComponent.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_DEBUG;_MBCS;DEBUG;WIN32;_WINDOWS;AVH_CLIENT;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\ui\MarqueeComponent.h">
+			</File>
+			<File
+				RelativePath="..\ui\PieMenu.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_DEBUG;_MBCS;DEBUG;WIN32;_WINDOWS;AVH_CLIENT;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\ui\PieMenu.h">
+			</File>
+			<File
+				RelativePath="..\ui\PieNode.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_DEBUG;_MBCS;DEBUG;WIN32;_WINDOWS;AVH_CLIENT;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\ui\PieNode.h">
+			</File>
+			<File
+				RelativePath="..\ui\ReloadableComponent.h">
+			</File>
+			<File
+				RelativePath="..\ui\SliderPlus.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_DEBUG;_MBCS;DEBUG;WIN32;_WINDOWS;AVH_CLIENT;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\ui\SliderPlus.h">
+			</File>
+			<File
+				RelativePath="..\ui\SpritePanel.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_DEBUG;_MBCS;DEBUG;WIN32;_WINDOWS;AVH_CLIENT;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\ui\SpritePanel.h">
+			</File>
+			<File
+				RelativePath="..\ui\StaticLabel.h">
+			</File>
+			<File
+				RelativePath="..\ui\UIComponent.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_DEBUG;_MBCS;DEBUG;WIN32;_WINDOWS;AVH_CLIENT;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\ui\UIComponent.h">
+			</File>
+			<File
+				RelativePath="..\ui\UIComponents.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_DEBUG;_MBCS;DEBUG;WIN32;_WINDOWS;AVH_CLIENT;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\ui\UIComponents.h">
+			</File>
+			<File
+				RelativePath="..\ui\UIFactory.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_DEBUG;_MBCS;DEBUG;WIN32;_WINDOWS;AVH_CLIENT;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\ui\UIFactory.h">
+			</File>
+			<File
+				RelativePath="..\ui\UIHud.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_DEBUG;_MBCS;DEBUG;WIN32;_WINDOWS;AVH_CLIENT;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\ui\UIHud.h">
+			</File>
+			<File
+				RelativePath="..\ui\UIManager.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_DEBUG;_MBCS;DEBUG;WIN32;_WINDOWS;AVH_CLIENT;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\ui\UIManager.h">
+			</File>
+			<File
+				RelativePath="..\ui\UIPieMenu.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_DEBUG;_MBCS;DEBUG;WIN32;_WINDOWS;AVH_CLIENT;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\ui\UIPieMenu.h">
+			</File>
+			<File
+				RelativePath="..\ui\UIUtil.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_DEBUG;_MBCS;DEBUG;WIN32;_WINDOWS;AVH_CLIENT;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\ui\UIUtil.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="mod"
+			Filter="">
+			<File
+				RelativePath="..\mod\AnimationUtil.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AnimationUtil.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHActionButtons.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHActionButtons.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHAlienWeapon.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHAlienWeapon.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHAmbientSound.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHAmbientSound.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHAssert.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHBalance.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHBalance.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHBalanceAnalysis.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHBalanceAnalysis.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHBaseInfoLocation.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHBaseInfoLocation.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHClientUtil.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHClientUtil.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHCommanderModeHandler.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHCommanderModeHandler.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHConstants.cpp">
+			</File>
+			<File
+				RelativePath="..\mod\AvHConstants.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHEntityHierarchy.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHEntityHierarchy.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHEvents.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHFont.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHFont.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHHelp.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHHud.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHHud.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHHudRender.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHLogoutComponent.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHLogoutComponent.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHMapExtents.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHMapExtents.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHMinimap.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHMinimap.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHMovementUtil.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHMovementUtil.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHOrder.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHOrder.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHOverviewControl.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHOverviewControl.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHOverviewMap.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHOverviewMap.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHParticleEditorHandler.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHParticleEditorHandler.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHPieMenuHandler.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHPieMenuHandler.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHPlayerUpgrade.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHPlayerUpgrade.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHScriptClient.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHScriptManager.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHScriptManager.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHScriptShared.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHScrollHandler.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHScrollHandler.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHScrollPanel.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHSharedMovementInfo.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHSharedMovementInfo.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHSharedUtil.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHSharedUtil.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHSpecials.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHSpecials.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHSpriteAPI.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHSpriteAPI.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHTeamHierarchy.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHTeamHierarchy.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHTechImpulsePanel.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHTechImpulsePanel.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHTechNodes.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHTechSlotManager.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHTooltip.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHTooltip.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHUIFactory.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHUIFactory.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHVisibleBlipList.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHVisibleBlipList.h">
+			</File>
+			<File
+				RelativePath="..\mod\ChatPanel.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\ChatPanel.h">
+			</File>
+			<File
+				RelativePath="..\mod\CollisionChecker.cpp">
+			</File>
+			<File
+				RelativePath="..\mod\CollisionChecker.h">
+			</File>
+			<File
+				RelativePath="..\mod\CollisionUtil.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\CollisionUtil.h">
+			</File>
+			<File
+				RelativePath="..\ui\InvisiblePanel.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\ui\InvisiblePanel.h">
+			</File>
+			<Filter
+				Name="particles"
+				Filter="">
+				<File
+					RelativePath="..\mod\AvHParticleSystem.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHParticleSystem.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHParticleSystemManager.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHParticleSystemManager.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHParticleTemplate.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHParticleTemplate.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHParticleTemplateClient.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHParticleTemplateClient.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHSelectionHelper.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHSelectionHelper.h">
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/main/source/cl_dll/cl_util.cpp b/main/source/cl_dll/cl_util.cpp
new file mode 100644
index 00000000..0a77c5d6
--- /dev/null
+++ b/main/source/cl_dll/cl_util.cpp
@@ -0,0 +1,64 @@
+#include "hud.h"
+#include "cl_dll/cl_util.h"
+
+float gTextR = 1;
+float gTextG = 1;
+float gTextB = 1;
+
+void DrawSetTextColor(float r, float g, float b )
+{
+    gTextR = r;
+    gTextG = g;
+    gTextB = b;
+    gEngfuncs.pfnDrawSetTextColor(r, g, b);    
+}
+
+int DrawConsoleString( int x, int y, const char *string )
+{
+	//return gEngfuncs.pfnDrawConsoleString( x, y, (char*) string );
+
+    if (string[0] == 2)
+    {
+        ++string;
+    }
+
+    int result = gHUD.GetSmallFont().DrawString(x, y, string, gTextR * 255, gTextG * 255, gTextB * 255, kRenderTransAdd);
+    DrawSetTextColor(1, 1, 1);
+
+    return result;
+
+}
+
+void GetConsoleStringSize( const char *string, int *width, int *height )
+{
+	
+    //gEngfuncs.pfnDrawConsoleStringLen( string, width, height );
+    
+    if (string[0] == 2)
+    {
+        ++string;
+    }
+    
+    *width  = gHUD.GetSmallFont().GetStringWidth(string);
+    *height = gHUD.GetSmallFont().GetStringHeight();
+
+}
+
+int ConsoleStringLen( const char *string )
+{
+	int _width, _height;
+	GetConsoleStringSize( string, &_width, &_height );
+	return _width;
+}
+
+void ConsolePrint( const char *string )
+{
+    // TODO Max: implement this
+	gEngfuncs.pfnConsolePrint( string );
+}
+
+void CenterPrint( const char *string )
+{
+    // TODO Max: implement this
+	gEngfuncs.pfnCenterPrint( string );
+}
\ No newline at end of file
diff --git a/main/source/cl_dll/cl_util.h b/main/source/cl_dll/cl_util.h
new file mode 100644
index 00000000..8aabc79a
--- /dev/null
+++ b/main/source/cl_dll/cl_util.h
@@ -0,0 +1,147 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// cl_util.h
+//
+#ifndef CL_UTIL_H
+#define CL_UTIL_H
+
+#include "cvardef.h"
+#include "common/vector_util.h"
+#include "vgui_Panel.h"
+#include "types.h"
+#include "cl_dll/cl_dll.h"
+#include "cl_dll/hud.h"
+
+#ifndef TRUE
+#define TRUE 1
+#define FALSE 0
+#endif
+
+// Macros to hook function calls into the HUD object
+#define HOOK_MESSAGE(x) gEngfuncs.pfnHookUserMsg(#x, __MsgFunc_##x );
+
+#define DECLARE_MESSAGE(y, x) int __MsgFunc_##x(const char *pszName, int iSize, void *pbuf) \
+							{ \
+							return gHUD.##y.MsgFunc_##x(pszName, iSize, pbuf ); \
+							}
+
+
+#define HOOK_COMMAND(x, y) gEngfuncs.pfnAddCommand( x, __CmdFunc_##y );
+#define DECLARE_COMMAND(y, x) void __CmdFunc_##x( void ) \
+							{ \
+								gHUD.##y.UserCmd_##x( ); \
+							}
+
+inline float CVAR_GET_FLOAT( const char *x ) {	return gEngfuncs.pfnGetCvarFloat( (char*)x ); }
+inline char* CVAR_GET_STRING( const char *x ) {	return gEngfuncs.pfnGetCvarString( (char*)x ); }
+inline struct cvar_s *CVAR_CREATE( const char *cv, const char *val, const int flags ) {	return gEngfuncs.pfnRegisterVariable( (char*)cv, (char*)val, flags ); }
+
+//#define SPR_Load (*gEngfuncs.pfnSPR_Load)
+HSPRITE Safe_SPR_Load(const char* inSpriteName);
+#define SPR_Set (*gEngfuncs.pfnSPR_Set)
+#define SPR_Frames (*gEngfuncs.pfnSPR_Frames)
+#define SPR_GetList (*gEngfuncs.pfnSPR_GetList)
+
+// SPR_Draw  draws a the current sprite as solid
+#define SPR_Draw (*gEngfuncs.pfnSPR_Draw)
+// SPR_DrawHoles  draws the current sprites,  with color index255 not drawn (transparent)
+#define SPR_DrawHoles (*gEngfuncs.pfnSPR_DrawHoles)
+// SPR_DrawAdditive  adds the sprites RGB values to the background  (additive transulency)
+#define SPR_DrawAdditive (*gEngfuncs.pfnSPR_DrawAdditive)
+
+// SPR_EnableScissor  sets a clipping rect for HUD sprites.  (0,0) is the top-left hand corner of the screen.
+#define SPR_EnableScissor (*gEngfuncs.pfnSPR_EnableScissor)
+// SPR_DisableScissor  disables the clipping rect
+#define SPR_DisableScissor (*gEngfuncs.pfnSPR_DisableScissor)
+
+void CreatePickingRay( int mousex, int mousey, Vector& outVecPickingRay);
+					  
+//
+#define FillRGBA (*gEngfuncs.pfnFillRGBA)
+
+int ScreenHeight();
+int ScreenWidth();
+
+// Use this to set any co-ords in 640x480 space
+#define XRES(x)		((int)(float(x)  * ((float)ScreenWidth() / 640.0f) + 0.5f))
+#define YRES(y)		((int)(float(y)  * ((float)ScreenHeight() / 480.0f) + 0.5f))
+
+// use this to project world coordinates to screen coordinates
+#define XPROJECT(x)	( (1.0f+(x))*ScreenWidth()*0.5f )
+#define YPROJECT(y) ( (1.0f-(y))*ScreenHeight()*0.5f )
+
+#define GetScreenInfo (*gEngfuncs.pfnGetScreenInfo)
+#define ServerCmd (*gEngfuncs.pfnServerCmd)
+#define ClientCmd (*gEngfuncs.pfnClientCmd)
+#define SetCrosshair (*gEngfuncs.pfnSetCrosshair)
+#define AngleVectors (*gEngfuncs.pfnAngleVectors)
+
+
+// Gets the height & width of a sprite,  at the specified frame
+inline int SPR_Height( HSPRITE x, int f )	{ return gEngfuncs.pfnSPR_Height(x, f); }
+inline int SPR_Width( HSPRITE x, int f )	{ return gEngfuncs.pfnSPR_Width(x, f); }
+
+inline 	client_textmessage_t	*TextMessageGet( const char *pName ) { return gEngfuncs.pfnTextMessageGet( pName ); }
+inline 	int						TextMessageDrawChar( int x, int y, int number, int r, int g, int b ) 
+{ 
+	return gEngfuncs.pfnDrawCharacter( x, y, number, r, g, b ); 
+}
+
+void DrawSetTextColor(float r, float g, float b );
+
+
+int DrawConsoleString( int x, int y, const char *string );
+
+void GetConsoleStringSize( const char *string, int *width, int *height );
+int ConsoleStringLen( const char *string );
+
+void ConsolePrint( const char *string );
+void CenterPrint( const char *string );
+
+// returns the players name of entity no.
+#define GetPlayerInfo (*gEngfuncs.pfnGetPlayerInfo)
+
+// sound functions
+//inline void PlaySound( char *szSound, float vol ) { gEngfuncs.pfnPlaySoundByName( szSound, vol ); }
+//inline void PlaySound( int iSound, float vol ) { gEngfuncs.pfnPlaySoundByIndex( iSound, vol ); }
+
+#define max(a, b)  (((a) > (b)) ? (a) : (b))
+#define min(a, b)  (((a) < (b)) ? (a) : (b))
+#define fabs(x)	   ((x) > 0 ? (x) : 0 - (x))
+
+void ScaleColors( int &r, int &g, int &b, int a );
+
+// disable 'possible loss of data converting float to int' warning message
+#pragma warning( disable: 4244 )
+// disable 'truncation from 'const double' to 'float' warning message
+#pragma warning( disable: 4305 )
+
+inline void UnpackRGB(int &r, int &g, int &b, unsigned long ulRGB)\
+{\
+	r = (ulRGB & 0xFF0000) >>16;\
+	g = (ulRGB & 0xFF00) >> 8;\
+	b = ulRGB & 0xFF;\
+}
+
+void FillRGBAClipped(vgui::Panel* inPanel, int inStartX, int inStartY, int inWidth, int inHeight, int r, int g, int b, int a);
+
+HSPRITE LoadSprite(const char *pszName);
+
+//bool LocalizeString(const char* inMessage, char* outBuffer, int inBufferSize);
+bool LocalizeString(const char* inMessage, string& outputString);
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/cl_dll/com_weapons.cpp b/main/source/cl_dll/com_weapons.cpp
new file mode 100644
index 00000000..f7270654
--- /dev/null
+++ b/main/source/cl_dll/com_weapons.cpp
@@ -0,0 +1,278 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+// Com_Weapons.cpp
+// Shared weapons common/shared functions
+#include <stdarg.h>
+#include "hud.h"
+#include "cl_util.h"
+#include "com_weapons.h"
+
+#include "const.h"
+#include "entity_state.h"
+#include "r_efx.h"
+
+// g_runfuncs is true if this is the first time we've "predicated" a particular movement/firing
+//  command.  If it is 1, then we should play events/sounds etc., otherwise, we just will be
+//  updating state info, but not firing events
+int	g_runfuncs = 0;
+
+// During our weapon prediction processing, we'll need to reference some data that is part of
+//  the final state passed into the postthink functionality.  We'll set this pointer and then
+//  reset it to NULL as appropriate
+struct local_state_s *g_finalstate = NULL;
+
+/*
+====================
+COM_Log
+
+Log debug messages to file ( appends )
+====================
+*/
+void COM_Log( char *pszFile, char *fmt, ...)
+{
+	va_list		argptr;
+	char		string[1024];
+	FILE *fp;
+	char *pfilename;
+	
+	if ( !pszFile )
+	{
+		pfilename = "c:\\hllog.txt";
+	}
+	else
+	{
+		pfilename = pszFile;
+	}
+
+	va_start (argptr,fmt);
+	vsprintf (string, fmt,argptr);
+	va_end (argptr);
+
+	fp = fopen( pfilename, "a+t");
+	if (fp)
+	{
+		fprintf(fp, "%s", string);
+		fclose(fp);
+	}
+}
+
+// remember the current animation for the view model, in case we get out of sync with
+//  server.
+static int g_currentanim;
+
+/*
+=====================
+HUD_SendWeaponAnim
+
+Change weapon model animation
+=====================
+*/
+void HUD_SendWeaponAnim( int iAnim, int body, int force )
+{
+	if(iAnim >= 0)
+	{
+		// Don't actually change it.
+		if ( !g_runfuncs && !force )
+			return;
+	
+		g_currentanim = iAnim;
+	
+		// Tell animation system new info
+		gEngfuncs.pfnWeaponAnim( iAnim, body );
+	}
+}
+
+/*
+=====================
+HUD_GetWeaponAnim
+
+Retrieve current predicted weapon animation
+=====================
+*/
+int HUD_GetWeaponAnim( void )
+{
+	return g_currentanim;
+}
+
+/*
+=====================
+HUD_PlaySound
+
+Play a sound, if we are seeing this command for the first time
+=====================
+*/
+void HUD_PlaySound( char *sound, float volume )
+{
+	if ( !g_runfuncs || !g_finalstate )
+		return;
+
+	gEngfuncs.pfnPlaySoundByNameAtLocation( sound, volume, (float *)&g_finalstate->playerstate.origin );
+}
+
+/*
+=====================
+HUD_PlaybackEvent
+
+Directly queue up an event on the client
+=====================
+*/
+void HUD_PlaybackEvent( int flags, const edict_t *pInvoker, unsigned short eventindex, float delay,
+	float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 )
+{
+	vec3_t org;
+	vec3_t ang;
+
+	if ( !g_runfuncs || !g_finalstate )
+		return;
+
+	// Weapon prediction events are assumed to occur at the player's origin
+	org			= g_finalstate->playerstate.origin;
+	ang			= v_angles;
+	gEngfuncs.pfnPlaybackEvent( flags, pInvoker, eventindex, delay, (float *)&org, (float *)&ang, fparam1, fparam2, iparam1, iparam2, bparam1, bparam2 );
+}
+
+/*
+=====================
+HUD_SetMaxSpeed
+
+=====================
+*/
+void HUD_SetMaxSpeed( const edict_t *ed, float speed )
+{
+}
+
+
+/*
+=====================
+UTIL_WeaponTimeBase
+
+Always 0.0 on client, even if not predicting weapons ( won't get called
+ in that case )
+=====================
+*/
+float UTIL_WeaponTimeBase( void )
+{
+	return 0.0;
+}
+
+static unsigned int glSeed = 0; 
+
+unsigned int seed_table[ 256 ] =
+{
+	28985, 27138, 26457, 9451, 17764, 10909, 28790, 8716, 6361, 4853, 17798, 21977, 19643, 20662, 10834, 20103,
+	27067, 28634, 18623, 25849, 8576, 26234, 23887, 18228, 32587, 4836, 3306, 1811, 3035, 24559, 18399, 315,
+	26766, 907, 24102, 12370, 9674, 2972, 10472, 16492, 22683, 11529, 27968, 30406, 13213, 2319, 23620, 16823,
+	10013, 23772, 21567, 1251, 19579, 20313, 18241, 30130, 8402, 20807, 27354, 7169, 21211, 17293, 5410, 19223,
+	10255, 22480, 27388, 9946, 15628, 24389, 17308, 2370, 9530, 31683, 25927, 23567, 11694, 26397, 32602, 15031,
+	18255, 17582, 1422, 28835, 23607, 12597, 20602, 10138, 5212, 1252, 10074, 23166, 19823, 31667, 5902, 24630,
+	18948, 14330, 14950, 8939, 23540, 21311, 22428, 22391, 3583, 29004, 30498, 18714, 4278, 2437, 22430, 3439,
+	28313, 23161, 25396, 13471, 19324, 15287, 2563, 18901, 13103, 16867, 9714, 14322, 15197, 26889, 19372, 26241,
+	31925, 14640, 11497, 8941, 10056, 6451, 28656, 10737, 13874, 17356, 8281, 25937, 1661, 4850, 7448, 12744,
+	21826, 5477, 10167, 16705, 26897, 8839, 30947, 27978, 27283, 24685, 32298, 3525, 12398, 28726, 9475, 10208,
+	617, 13467, 22287, 2376, 6097, 26312, 2974, 9114, 21787, 28010, 4725, 15387, 3274, 10762, 31695, 17320,
+	18324, 12441, 16801, 27376, 22464, 7500, 5666, 18144, 15314, 31914, 31627, 6495, 5226, 31203, 2331, 4668,
+	12650, 18275, 351, 7268, 31319, 30119, 7600, 2905, 13826, 11343, 13053, 15583, 30055, 31093, 5067, 761,
+	9685, 11070, 21369, 27155, 3663, 26542, 20169, 12161, 15411, 30401, 7580, 31784, 8985, 29367, 20989, 14203,
+	29694, 21167, 10337, 1706, 28578, 887, 3373, 19477, 14382, 675, 7033, 15111, 26138, 12252, 30996, 21409,
+	25678, 18555, 13256, 23316, 22407, 16727, 991, 9236, 5373, 29402, 6117, 15241, 27715, 19291, 19888, 19847
+};
+
+unsigned int U_Random( void ) 
+{ 
+	glSeed *= 69069; 
+	glSeed += seed_table[ glSeed & 0xff ];
+ 
+	return ( ++glSeed & 0x0fffffff ); 
+} 
+
+void U_Srand( unsigned int seed )
+{
+	glSeed = seed_table[ seed & 0xff ];
+}
+
+/*
+=====================
+UTIL_SharedRandomLong
+=====================
+*/
+int UTIL_SharedRandomLong( unsigned int seed, int low, int high )
+{
+	unsigned int range;
+
+	U_Srand( (int)seed + low + high );
+
+	range = high - low + 1;
+	if ( !(range - 1) )
+	{
+		return low;
+	}
+	else
+	{
+		int offset;
+		int rnum;
+
+		rnum = U_Random();
+
+		offset = rnum % range;
+
+		return (low + offset);
+	}
+}
+
+/*
+=====================
+UTIL_SharedRandomFloat
+=====================
+*/
+float UTIL_SharedRandomFloat( unsigned int seed, float low, float high )
+{
+
+	U_Srand( (int)seed + *(int *)&low + *(int *)&high );
+
+	U_Random();
+	U_Random();
+
+	float range = high - low;
+	if ( !range )
+	{
+		return low;
+	}
+	else
+	{
+		int tensixrand;
+		float offset;
+
+		tensixrand = U_Random() & 65535;
+
+		offset = (float)tensixrand / 65536.0;
+
+		return (low + offset * range );
+	}
+}
+
+/*
+======================
+stub_*
+
+stub functions for such things as precaching.  So we don't have to modify weapons code that
+ is compiled into both game and client .dlls.
+======================
+*/
+int				stub_PrecacheModel		( char* s ) { return 0; }
+int				stub_PrecacheSound		( char* s ) { return 0; }
+unsigned short	stub_PrecacheEvent		( int type, const char *s ) { return 0; }
+const char		*stub_NameForFunction	( unsigned long function ) { return "func"; }
+void			stub_SetModel			( edict_t *e, const char *m ) {}
diff --git a/main/source/cl_dll/com_weapons.h b/main/source/cl_dll/com_weapons.h
new file mode 100644
index 00000000..aa58ba77
--- /dev/null
+++ b/main/source/cl_dll/com_weapons.h
@@ -0,0 +1,49 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+// com_weapons.h
+// Shared weapons common function prototypes
+#if !defined( COM_WEAPONSH )
+#define COM_WEAPONSH
+#ifdef _WIN32
+#pragma once
+#endif
+
+#include "hud_iface.h"
+
+// TODO: Remove this?  Insert this?
+//extern "C"
+//{
+//	void DLLEXPORT HUD_PostRunCmd( struct local_state_s *from, struct local_state_s *to, struct usercmd_s *cmd, int runfuncs, double time, unsigned int random_seed );
+//}
+
+void			COM_Log( char *pszFile, char *fmt, ...);
+int				CL_IsDead( void );
+
+float			UTIL_SharedRandomFloat( unsigned int seed, float low, float high );
+int				UTIL_SharedRandomLong( unsigned int seed, int low, int high );
+
+int				HUD_GetWeaponAnim( void );
+void			HUD_SendWeaponAnim( int iAnim, int body, int force );
+void			HUD_PlaySound( char *sound, float volume );
+void			HUD_PlaybackEvent( int flags, const struct edict_s *pInvoker, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 );
+void			HUD_SetMaxSpeed( const struct edict_s *ed, float speed );
+int				stub_PrecacheModel( char* s );
+int				stub_PrecacheSound( char* s );
+unsigned short	stub_PrecacheEvent( int type, const char *s );
+const char		*stub_NameForFunction	( unsigned long function );
+void			stub_SetModel			( struct edict_s *e, const char *m );
+
+
+extern cvar_t *cl_lw;
+
+extern int g_runfuncs;
+extern vec3_t v_angles;
+extern float g_lastFOV;
+extern struct local_state_s *g_finalstate;
+
+#endif
\ No newline at end of file
diff --git a/main/source/cl_dll/death.cpp b/main/source/cl_dll/death.cpp
new file mode 100644
index 00000000..ddfdee45
--- /dev/null
+++ b/main/source/cl_dll/death.cpp
@@ -0,0 +1,329 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// death notice
+//
+#include "hud.h"
+#include "cl_util.h"
+#include "parsemsg.h"
+
+#include <string.h>
+#include <stdio.h>
+
+#include "vgui_TeamFortressViewport.h"
+#include "mod/AvHHudConstants.h"
+#include "pm_shared/pm_shared.h"
+
+DECLARE_MESSAGE( m_DeathNotice, DeathMsg );
+
+struct DeathNoticeItem {
+	char szKiller[MAX_PLAYER_NAME_LENGTH*2];
+	char szVictim[MAX_PLAYER_NAME_LENGTH*2];
+	int iId;	// the index number of the associated sprite
+	int iSuicide;
+	int iTeamKill;
+	int iNonPlayerKill;
+	float flDisplayTime;
+	float *KillerColor;
+	float *VictimColor;
+};
+
+#define MAX_DEATHNOTICES	4
+static int DEATHNOTICE_DISPLAY_TIME = 6;
+
+#define DEATHNOTICE_TOP		20
+
+DeathNoticeItem rgDeathNoticeList[ MAX_DEATHNOTICES + 1 ];
+
+// Changing these?  Change them in vgui_TeamFortressViewport::iTeamColors as well
+float g_ColorWhite[3] = { 1.0, 1.0f, 1.0 };
+float g_ColorBlue[3] = { .49, .65, .82 };
+float g_ColorOrange[3] = { 1.0, .66, 0.0 };
+float g_ColorGreen[3] = { .56, .84, .55 };
+float g_ColorRed[3]	= { .78, .35, .27 };
+
+float g_ColorYellow[3] = { 1.0, .96, .39 };
+
+float* GetClientColor(int clientIndex)
+{
+	int theTeamNumber = g_PlayerExtraInfo[clientIndex].teamnumber;
+	return kFTeamColors[theTeamNumber];
+//	outColor[0] = kTeamColors[theTeamNumber][0];
+//	outColor[1] = kTeamColors[theTeamNumber][1];
+//	outColor[2] = kTeamColors[theTeamNumber][2];
+}
+
+int CHudDeathNotice :: Init( void )
+{
+	gHUD.AddHudElem( this );
+
+	HOOK_MESSAGE( DeathMsg );
+
+	CVAR_CREATE( "hud_deathnotice_time", "6", 0 );
+
+	return 1;
+}
+
+
+void CHudDeathNotice :: InitHUDData( void )
+{
+	memset( rgDeathNoticeList, 0, sizeof(rgDeathNoticeList) );
+}
+
+
+int CHudDeathNotice :: VidInit( void )
+{
+	m_HUD_d_skull = gHUD.GetSpriteIndex( "d_skull" );
+
+	return 1;
+}
+
+int CHudDeathNotice :: Draw( float flTime )
+{
+	int x, y, r, g, b;
+
+	for ( int i = 0; i < MAX_DEATHNOTICES; i++ )
+	{
+		if ( rgDeathNoticeList[i].iId == 0 )
+			break;  // we've gone through them all
+
+		if ( rgDeathNoticeList[i].flDisplayTime < flTime )
+		{ // display time has expired
+			// remove the current item from the list
+			memmove( &rgDeathNoticeList[i], &rgDeathNoticeList[i+1], sizeof(DeathNoticeItem) * (MAX_DEATHNOTICES - i) );
+			i--;  // continue on the next item;  stop the counter getting incremented
+			continue;
+		}
+
+		rgDeathNoticeList[i].flDisplayTime = min( rgDeathNoticeList[i].flDisplayTime, gHUD.m_flTime + DEATHNOTICE_DISPLAY_TIME );
+
+		// Only draw if the viewport will let me
+		if ( gViewPort && gViewPort->AllowedToPrintText() )
+		{
+			// Draw the death notice
+			//y = DEATHNOTICE_TOP + (20 * i);  //!!!
+			int theBaseY = DEATHNOTICE_TOP;
+
+			// Bring down death messages when in top down or when we're drawing letter box
+			if(gHUD.m_Spectator.IsInOverviewMode())
+			{
+				// No HUD elements to compensate for
+			}
+			else if(gHUD.GetInTopDownMode())
+			{
+				theBaseY = .10*ScreenHeight();
+			}
+			else if(gHUD.GetIsMarine())
+			{
+				theBaseY = .26*ScreenHeight();
+			}
+			else if(gHUD.GetIsAlien())
+			{
+				theBaseY = kHiveNormScreenY*ScreenHeight() + (kMaxHives-1)*((kHiveNormScreenHeight + kHiveNormScreenVerticalSpacing)*ScreenHeight());
+			}
+
+			// Lower death messages more when spectating so they don't overlap (due to letterbox)
+			if(g_iUser1 != OBS_NONE)
+			{
+				theBaseY += .06*ScreenHeight();
+			}
+
+			y = theBaseY + (20 * i);  //!!!
+
+			int id = (rgDeathNoticeList[i].iId == -1) ? m_HUD_d_skull : rgDeathNoticeList[i].iId;
+			x = ScreenWidth() - ConsoleStringLen(rgDeathNoticeList[i].szVictim) - (gHUD.GetSpriteRect(id).right - gHUD.GetSpriteRect(id).left);
+
+			if ( !rgDeathNoticeList[i].iSuicide )
+			{
+				x -= (5 + ConsoleStringLen( rgDeathNoticeList[i].szKiller ) );
+
+				// Draw killers name
+				if ( rgDeathNoticeList[i].KillerColor )
+					DrawSetTextColor( rgDeathNoticeList[i].KillerColor[0], rgDeathNoticeList[i].KillerColor[1], rgDeathNoticeList[i].KillerColor[2] );
+				x = 5 + DrawConsoleString( x, y, rgDeathNoticeList[i].szKiller );
+			}
+
+			r = 255;  g = 80;	b = 0;
+			if ( rgDeathNoticeList[i].iTeamKill )
+			{
+				r = 10;	g = 240; b = 10;  // display it in sickly green
+			}
+
+			// Draw death weapon
+			SPR_Set( gHUD.GetSprite(id), r, g, b );
+			SPR_DrawAdditive( 0, x, y, &gHUD.GetSpriteRect(id) );
+
+			x += (gHUD.GetSpriteRect(id).right - gHUD.GetSpriteRect(id).left);
+
+			// Draw victims name (if it was a player that was killed)
+			if (rgDeathNoticeList[i].iNonPlayerKill == FALSE)
+			{
+				if ( rgDeathNoticeList[i].VictimColor )
+					DrawSetTextColor( rgDeathNoticeList[i].VictimColor[0], rgDeathNoticeList[i].VictimColor[1], rgDeathNoticeList[i].VictimColor[2] );
+				x = DrawConsoleString( x, y, rgDeathNoticeList[i].szVictim );
+			}
+		}
+	}
+
+	return 1;
+}
+
+// This message handler may be better off elsewhere
+int CHudDeathNotice :: MsgFunc_DeathMsg( const char *pszName, int iSize, void *pbuf )
+{
+	m_iFlags |= HUD_ACTIVE;
+
+	BEGIN_READ( pbuf, iSize );
+
+	int killer = READ_BYTE();
+	int victim = READ_BYTE();
+
+	char killedwith[32];
+	strcpy( killedwith, "d_" );
+	strncat( killedwith, READ_STRING(), 32 );
+
+	if (gViewPort)
+		gViewPort->DeathMsg( killer, victim );
+
+	gHUD.m_Spectator.DeathMessage(victim);
+
+	for ( int i = 0; i < MAX_DEATHNOTICES; i++ )
+	{
+		if ( rgDeathNoticeList[i].iId == 0 )
+			break;
+	}
+	if ( i == MAX_DEATHNOTICES )
+	{ // move the rest of the list forward to make room for this item
+		memmove( rgDeathNoticeList, rgDeathNoticeList+1, sizeof(DeathNoticeItem) * MAX_DEATHNOTICES );
+		i = MAX_DEATHNOTICES - 1;
+	}
+
+	if (gViewPort)
+		gViewPort->GetAllPlayersInfo();
+
+	// Get the Killer's name
+	char *killer_name = g_PlayerInfoList[ killer ].name;
+	if ( !killer_name )
+	{
+		killer_name = "";
+		rgDeathNoticeList[i].szKiller[0] = 0;
+	}
+	else
+	{
+		rgDeathNoticeList[i].KillerColor = GetClientColor( killer);
+		strncpy( rgDeathNoticeList[i].szKiller, killer_name, MAX_PLAYER_NAME_LENGTH );
+		rgDeathNoticeList[i].szKiller[MAX_PLAYER_NAME_LENGTH-1] = 0;
+	}
+
+	// Get the Victim's name
+	char *victim_name = NULL;
+	// If victim is -1, the killer killed a specific, non-player object (like a sentrygun)
+	if ( ((char)victim) != -1 )
+		victim_name = g_PlayerInfoList[ victim ].name;
+	if ( !victim_name )
+	{
+		victim_name = "";
+		rgDeathNoticeList[i].szVictim[0] = 0;
+	}
+	else
+	{
+		rgDeathNoticeList[i].VictimColor = GetClientColor(victim);
+		strncpy( rgDeathNoticeList[i].szVictim, victim_name, MAX_PLAYER_NAME_LENGTH );
+		rgDeathNoticeList[i].szVictim[MAX_PLAYER_NAME_LENGTH-1] = 0;
+	}
+
+	// Is it a non-player object kill?
+	if ( ((char)victim) == -1 )
+	{
+		rgDeathNoticeList[i].iNonPlayerKill = TRUE;
+
+		// Store the object's name in the Victim slot (skip the d_ bit)
+		strcpy( rgDeathNoticeList[i].szVictim, killedwith+2 );
+	}
+	else
+	{
+		if ( killer == victim || killer == 0 )
+			rgDeathNoticeList[i].iSuicide = TRUE;
+
+		if ( !strcmp( killedwith, "d_teammate" ) )
+			rgDeathNoticeList[i].iTeamKill = TRUE;
+	}
+
+	// Find the sprite in the list
+	int spr = gHUD.GetSpriteIndex( killedwith );
+
+	rgDeathNoticeList[i].iId = spr;
+
+	DEATHNOTICE_DISPLAY_TIME = CVAR_GET_FLOAT( "hud_deathnotice_time" );
+	rgDeathNoticeList[i].flDisplayTime = gHUD.m_flTime + DEATHNOTICE_DISPLAY_TIME;
+
+	if (rgDeathNoticeList[i].iNonPlayerKill)
+	{
+		ConsolePrint( rgDeathNoticeList[i].szKiller );
+		ConsolePrint( " killed a " );
+		ConsolePrint( rgDeathNoticeList[i].szVictim );
+		ConsolePrint( "\n" );
+	}
+	else
+	{
+		// record the death notice in the console
+		if ( rgDeathNoticeList[i].iSuicide )
+		{
+			ConsolePrint( rgDeathNoticeList[i].szVictim );
+
+			if ( !strcmp( killedwith, "d_world" ) )
+			{
+				ConsolePrint( " died" );
+			}
+			else
+			{
+				ConsolePrint( " killed self" );
+			}
+		}
+		else if ( rgDeathNoticeList[i].iTeamKill )
+		{
+			ConsolePrint( rgDeathNoticeList[i].szKiller );
+			ConsolePrint( " killed his teammate " );
+			ConsolePrint( rgDeathNoticeList[i].szVictim );
+		}
+		else
+		{
+			ConsolePrint( rgDeathNoticeList[i].szKiller );
+			ConsolePrint( " killed " );
+			ConsolePrint( rgDeathNoticeList[i].szVictim );
+		}
+
+		if ( killedwith && *killedwith && (*killedwith > 13 ) && strcmp( killedwith, "d_world" ) && !rgDeathNoticeList[i].iTeamKill )
+		{
+			ConsolePrint( " with " );
+
+			// replace the code names with the 'real' names
+			if ( !strcmp( killedwith+2, "egon" ) )
+				strcpy( killedwith, "d_gluon gun" );
+			if ( !strcmp( killedwith+2, "gauss" ) )
+				strcpy( killedwith, "d_tau cannon" );
+
+			ConsolePrint( killedwith+2 ); // skip over the "d_" part
+		}
+
+		ConsolePrint( "\n" );
+	}
+
+	return 1;
+}
+
+
+
+
diff --git a/main/source/cl_dll/demo.cpp b/main/source/cl_dll/demo.cpp
new file mode 100644
index 00000000..0039e87a
--- /dev/null
+++ b/main/source/cl_dll/demo.cpp
@@ -0,0 +1,273 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#include "hud.h"
+#include "cl_util.h"
+#include "demo.h"
+#include "demo_api.h"
+#include <memory.h>
+
+#include "engine/APIProxy.h"
+#include "Exports.h"
+#include "mod/AvHParticleTemplateClient.h"
+#include "cl_dll/view.h"
+
+extern AvHParticleTemplateListClient	gParticleTemplateList;
+
+int g_demosniper = 0;
+int g_demosniperdamage = 0;
+float g_demosniperorg[3];
+float g_demosniperangles[3];
+float g_demozoom;
+vec3_t gPlaybackViewOrigin;
+
+int	ScorePanel_InitializeDemoPlayback(int inSize, unsigned char* inBuffer);
+void ScorePanel_InitializeDemoRecording();
+
+float gNormMouseX = 0;
+float gNormMouseY = 0;
+
+// FIXME:  There should be buffer helper functions to avoid all of the *(int *)& crap.
+
+void Demo_WriteByte(int inType, unsigned char inByte)
+{
+	Demo_WriteBuffer(inType, sizeof(unsigned char), &inByte);
+}
+
+void Demo_WriteVector(int inType, vec3_t inVector)
+{
+	float theFloatArray[3];
+
+	theFloatArray[0] = inVector.x;
+	theFloatArray[1] = inVector.y;
+	theFloatArray[2] = inVector.z;
+
+	Demo_WriteBuffer(inType, 3*sizeof(float), (unsigned char*)theFloatArray);
+}
+
+void Demo_WriteFloat(int inType, float inFloat)
+{
+	Demo_WriteBuffer(inType, sizeof(float), (unsigned char*)&inFloat);
+}
+
+void Demo_WriteInt(int inType, int inInt)
+{
+	Demo_WriteBuffer(inType, sizeof(int), (unsigned char*)&inInt);
+}
+
+/*
+=====================
+Demo_WriteBuffer
+
+Write some data to the demo stream
+=====================
+*/
+void Demo_WriteBuffer( int type, int size, unsigned char *buffer )
+{
+	int pos = 0;
+	unsigned char buf[ 32 * 1024 ];
+	*( int * )&buf[pos] = type;
+	pos+=sizeof( int );
+
+	memcpy( &buf[pos], buffer, size );
+
+	// Write full buffer out
+	gEngfuncs.pDemoAPI->WriteBuffer( size + sizeof( int ), buf );
+}
+
+/*
+=====================
+Demo_ReadBuffer
+
+Engine wants us to parse some data from the demo stream
+=====================
+*/
+void CL_DLLEXPORT Demo_ReadBuffer( int size, unsigned char *buffer )
+{
+	RecClReadDemoBuffer(size, buffer);
+	
+	int type;
+	int i = 0;
+	bool theMouseVisibility = false;
+
+	type = *( int * )buffer;
+	i += sizeof( int );
+	switch ( type )
+	{
+	case TYPE_SNIPERDOT:
+		g_demosniper = *(int * )&buffer[ i ];
+		i += sizeof( int );
+		
+		if ( g_demosniper )
+		{
+			g_demosniperdamage = *( int * )&buffer[ i ];
+			i += sizeof( int );
+
+			g_demosniperangles[ 0 ] = *(float *)&buffer[i];
+			i += sizeof( float );
+			g_demosniperangles[ 1 ] = *(float *)&buffer[i];
+			i += sizeof( float );
+			g_demosniperangles[ 2 ] = *(float *)&buffer[i];
+			i += sizeof( float );
+			g_demosniperorg[ 0 ] = *(float *)&buffer[i];
+			i += sizeof( float );
+			g_demosniperorg[ 1 ] = *(float *)&buffer[i];
+			i += sizeof( float );
+			g_demosniperorg[ 2 ] = *(float *)&buffer[i];
+			i += sizeof( float );
+		}
+		break;
+	case TYPE_ZOOM:
+		g_demozoom = *(float * )&buffer[ i ];
+		i += sizeof( float );
+		break;
+
+	case TYPE_BASESTATE:
+		i += gHUD.InitializeDemoPlayback(size, (unsigned char *)&buffer[i]);
+		break;
+
+	case TYPE_MOUSEVIS:
+		//theMouseVisibility = *(unsigned char * )&buffer[ i ];
+		//gHUD.GetManager().SetMouseVisibility(theMouseVisibility);
+		i += sizeof(unsigned char);
+		break;
+
+	case TYPE_MOUSEX:
+		//gNormMouseX = *(float * )&buffer[ i ];
+		i += sizeof( float );
+		break;
+		
+	case TYPE_MOUSEY:
+		//gNormMouseY = *(float * )&buffer[ i ];
+		i += sizeof( float );
+		break;
+
+	case TYPE_VIEWANGLES:
+		v_angles[0] = *(float * )&buffer[ i ];
+		i += sizeof( float );
+		
+		v_angles[1] = *(float * )&buffer[ i ];
+		i += sizeof( float );
+		
+		v_angles[2] = *(float * )&buffer[ i ];
+		i += sizeof( float );
+		break;
+
+	case TYPE_VIEWORIGIN:
+		v_origin[0] = *(float * )&buffer[ i ];
+		i += sizeof( float );
+		
+		v_origin[1] = *(float * )&buffer[ i ];
+		i += sizeof( float );
+
+		v_origin[2] = *(float * )&buffer[ i ];
+		i += sizeof( float );
+		break;
+
+	case TYPE_PARTICLES:
+		i += gParticleTemplateList.InitializeDemoPlayback(size, (unsigned char*)&buffer[i]);
+		break;
+
+	case TYPE_BASESTATE2:
+		i += gHUD.InitializeDemoPlayback2(size, (unsigned char *)&buffer[i]);
+		break;
+
+	case TYPE_PLAYERINFO:
+		i += ScorePanel_InitializeDemoPlayback(size, (unsigned char *)&buffer[i]);
+		break;
+
+	case TYPE_WEAPONINFO:
+		i += gHUD.InitializeWeaponInfoPlayback(size, (unsigned char *)&buffer[i]);
+		break;
+
+	default:
+		gEngfuncs.Con_DPrintf( "Unknown demo buffer type, skipping.\n" );
+		break;
+	}
+}
+
+// Returns num bytes needed to save/restore a string
+int GetDataSize(const string& inString)
+{
+	// String length
+	int theSize = sizeof(int);
+
+	// String data
+	theSize += inString.length();
+
+	return theSize;
+}
+
+void LoadData(void* inBuffer, const unsigned char* inData, int inSizeToCopy, int& inSizeVariable)
+{
+	memcpy(inBuffer, inData + inSizeVariable, inSizeToCopy);
+	inSizeVariable += inSizeToCopy;
+}
+
+void LoadStringData(string& outString, const unsigned char* inData, int& inBytesRead)
+{
+	// Read in string length (could be 0)
+	int theStringLength = 0;
+	memcpy(&theStringLength, inData + inBytesRead, sizeof(int));
+	inBytesRead += sizeof(int);
+
+	// Read in string, if greater then 0
+	if(theStringLength > 0)
+	{
+		char* theStringData = new char[theStringLength+1];
+		memcpy(theStringData, inData + inBytesRead, theStringLength);
+		theStringData[theStringLength] = '\0';
+		inBytesRead += theStringLength;
+		
+		outString = string(theStringData);
+
+		delete [] theStringData;
+		theStringData = NULL;
+	}
+}
+
+void LoadVectorData(float* outData, const unsigned char* inData, int& inBytesRead)
+{
+	int theSize = 3*sizeof(float);
+	memcpy(outData, inData + inBytesRead, theSize);
+	inBytesRead += theSize;
+}
+
+void SaveData(unsigned char* inBuffer, const void* inData, int inSizeToCopy, int& inSizeVariable)
+{
+	memcpy(inBuffer + inSizeVariable, inData, inSizeToCopy);
+	inSizeVariable += inSizeToCopy;
+}
+
+// Save out string, works for empty strings
+void SaveStringData(unsigned char* inBuffer, const string& inString, int& inSizeVariable)
+{
+	int theStringLength = inString.length();
+
+	// Write out string length
+	memcpy(inBuffer + inSizeVariable, &theStringLength, sizeof(int));
+	inSizeVariable += sizeof(int);
+
+	// Write out string data, if any
+	memcpy(inBuffer + inSizeVariable, inString.c_str(), theStringLength);
+	inSizeVariable += theStringLength;
+}
+
+void SaveVectorData(unsigned char* inBuffer, float* inData, int& inSizeVariable)
+{
+	int theLength = 3*sizeof(float);
+
+	memcpy(inBuffer + inSizeVariable, inData, theLength);
+	inSizeVariable += theLength;
+}
diff --git a/main/source/cl_dll/demo.h b/main/source/cl_dll/demo.h
new file mode 100644
index 00000000..6ca80533
--- /dev/null
+++ b/main/source/cl_dll/demo.h
@@ -0,0 +1,56 @@
+#if !defined( DEMOH )
+#define DEMOH
+#pragma once
+
+// Types of demo messages we can write/parse
+enum
+{
+	TYPE_SNIPERDOT = 0,
+	TYPE_ZOOM,
+
+	TYPE_BASESTATE,
+	TYPE_MOUSEVIS,
+	TYPE_MOUSEX,
+	TYPE_MOUSEY,
+	TYPE_VIEWORIGIN,
+	TYPE_VIEWANGLES,
+	TYPE_PARTICLES,
+
+	// More base state that wasn't originally saved (made a separate type for backwards-compatibility)
+	TYPE_BASESTATE2,
+	TYPE_PLAYERINFO,
+	TYPE_WEAPONINFO,
+};
+
+void Demo_WriteVector(int inType, vec3_t inVector);
+void Demo_WriteByte(int inType, unsigned char inByte);
+void Demo_WriteFloat(int inType, float inFloat);
+void Demo_WriteInt(int inType, int inInt);
+void Demo_WriteBuffer( int type, int size, unsigned char *buffer );
+#define LOAD_DATA(x) LoadData(&x, inBuffer, sizeof(x), theBytesRead);
+#define SAVE_DATA(x) SaveData(theCharArray, &x, sizeof(x), theCounter);
+
+int GetDataSize(const string& inString);
+
+void LoadData(void* inBuffer, const unsigned char* inData, int inSizeToCopy, int& inSizeVariable);
+void LoadStringData(string& outString, const unsigned char* inData, int& inBytesRead);
+void LoadVectorData(float* outData, const unsigned char* inData, int& inBytesRead);
+
+void SaveData(unsigned char* inBuffer, const void* inData, int inSizeToCopy, int& inSizeVariable);
+void SaveStringData(unsigned char* inBuffer, const string& inString, int& inSizeVariable);
+void SaveVectorData(unsigned char* inBuffer, float* inData, int& inSizeVariable);
+
+extern int g_demosniper;
+extern int g_demosniperdamage;
+extern float g_demosniperorg[3];
+extern float g_demosniperangles[3];
+extern float g_demozoom;
+
+extern float gNormMouseX;
+extern float gNormMouseY;
+
+extern int gVisibleMouse;
+extern vec3_t v_angles;
+extern vec3_t v_origin;
+
+#endif
\ No newline at end of file
diff --git a/main/source/cl_dll/entity.cpp b/main/source/cl_dll/entity.cpp
new file mode 100644
index 00000000..4194d9e6
--- /dev/null
+++ b/main/source/cl_dll/entity.cpp
@@ -0,0 +1,1046 @@
+// Client side entity management functions
+
+#include <memory.h>
+
+#include "hud.h"
+#include "cl_util.h"
+#include "const.h"
+#include "entity_types.h"
+#include "studio_event.h" // def. of mstudioevent_t
+#include "r_efx.h"
+#include "event_api.h"
+#include "pm_defs.h"
+#include "pmtrace.h"	
+#include "pm_shared/pm_shared.h"
+#include "mod/AvHParticleSystemManager.h"
+#include "mod/AvHSpecials.h"
+
+#include "engine/APIProxy.h"
+#include "Exports.h"
+
+void Game_AddObjects( void );
+
+extern vec3_t v_origin;
+double gClientTimeLastUpdate;
+int g_iAlive = 1;
+
+bool gTempEntClearAllFlag = false;
+
+/*
+========================
+HUD_AddEntity
+	Return 0 to filter entity from visible list for rendering
+========================
+*/
+int CL_DLLEXPORT HUD_AddEntity( int type, struct cl_entity_s *ent, const char *modelname )
+{
+	RecClAddEntity(type, ent, modelname);
+
+	if(ent->curstate.iuser3 == AVH_USER3_MARINE_PLAYER)
+	{
+		int a = 0;
+	}
+
+	gHUD.ClientProcessEntity(&ent->curstate);
+
+	// Particle entities have a model so they will be forced through this function,
+	// but we don't want to draw them.
+	int theSpecialState = ent->curstate.iuser3;
+	if( (theSpecialState == AVH_USER3_PARTICLE_ON) ||
+		(theSpecialState == AVH_USER3_PARTICLE_OFF) ||
+		(theSpecialState == AVH_USER3_AUDIO_ON) ||
+		(theSpecialState == AVH_USER3_AUDIO_OFF) ||
+		(theSpecialState == AVH_USER3_NOBUILD))
+	{
+		return 0;
+	}
+
+	switch ( type )
+	{
+	case ET_NORMAL:
+	case ET_PLAYER:
+	case ET_BEAM:
+	case ET_TEMPENTITY:
+	case ET_FRAGMENTED:
+	default:
+		break;
+	}
+
+	if ( g_iUser1 == OBS_IN_EYE  && ent->index == g_iUser2 )
+	{
+		// Don't draw the player we are following in eye
+        return 0;
+	}
+    
+	return 1;
+
+}
+
+/*
+=========================
+HUD_TxferLocalOverrides
+
+The server sends us our origin with extra precision as part of the clientdata structure, not during the normal
+playerstate update in entity_state_t.  In order for these overrides to eventually get to the appropriate playerstate
+structure, we need to copy them into the state structure at this point.
+=========================
+*/
+void CL_DLLEXPORT HUD_TxferLocalOverrides( struct entity_state_s *state, const struct clientdata_s *client )
+{
+	RecClTxferLocalOverrides(state, client);
+
+	VectorCopy( client->origin, state->origin );
+
+	// Spectator
+	state->iuser1 = client->iuser1;
+	state->iuser2 = client->iuser2;
+	state->iuser3 = client->iuser3;
+	state->iuser4 = client->iuser4;
+
+	state->fuser1 = client->fuser1;
+	state->fuser2 = client->fuser2;
+	state->fuser3 = client->fuser3;
+	state->fuser4 = client->fuser4;
+
+	state->vuser1 = client->vuser1;
+	//state->vuser2 = client->vuser2;
+	//state->vuser3 = client->vuser3;
+	state->vuser4 = client->vuser4;
+}
+
+/*
+=========================
+HUD_ProcessPlayerState
+
+We have received entity_state_t for this player over the network.  We need to copy appropriate fields to the
+playerstate structure
+=========================
+*/
+void CL_DLLEXPORT HUD_ProcessPlayerState( struct entity_state_s *dst, const struct entity_state_s *src )
+{
+	RecClProcessPlayerState(dst, src);
+
+	// Copy in network data
+	VectorCopy( src->origin, dst->origin );
+	VectorCopy( src->angles, dst->angles );
+
+	VectorCopy( src->velocity, dst->velocity );
+
+	dst->frame					= src->frame;
+	dst->modelindex				= src->modelindex;
+	dst->skin					= src->skin;
+	dst->effects				= src->effects;
+	dst->weaponmodel			= src->weaponmodel;
+	dst->movetype				= src->movetype;
+	dst->sequence				= src->sequence;
+	dst->animtime				= src->animtime;
+	
+	dst->solid					= src->solid;
+	
+	dst->rendermode				= src->rendermode;
+	dst->renderamt				= src->renderamt;	
+	dst->rendercolor.r			= src->rendercolor.r;
+	dst->rendercolor.g			= src->rendercolor.g;
+	dst->rendercolor.b			= src->rendercolor.b;
+	dst->renderfx				= src->renderfx;
+
+	dst->framerate				= src->framerate;
+	dst->body					= src->body;
+
+	memcpy( &dst->controller[0], &src->controller[0], 4 * sizeof( byte ) );
+	memcpy( &dst->blending[0], &src->blending[0], 2 * sizeof( byte ) );
+
+	VectorCopy( src->basevelocity, dst->basevelocity );
+
+	dst->friction				= src->friction;
+	dst->gravity				= src->gravity;
+	dst->gaitsequence			= src->gaitsequence;
+	dst->spectator				= src->spectator;
+	dst->usehull				= src->usehull;
+	dst->playerclass			= src->playerclass;
+	dst->team					= src->team;
+	dst->colormap				= src->colormap;
+	
+	// Save off some data so other areas of the Client DLL can get to it
+	cl_entity_t *player = gEngfuncs.GetLocalPlayer();	// Get the local player's index
+	if ( dst->number == player->index )
+	{
+		g_iPlayerClass = dst->playerclass;
+		g_iTeamNumber = dst->team;
+
+		g_iUser1 = src->iuser1;
+		g_iUser2 = src->iuser2;
+		g_iUser3 = src->iuser3;
+
+	}
+	
+	// AvH
+	// Copy special movement mode...is this needed?
+	dst->iuser1 = src->iuser1;
+	dst->iuser2 = src->iuser2;
+	dst->iuser3 = src->iuser3;
+	dst->iuser4 = src->iuser4;
+
+	dst->fuser1 = src->fuser1;
+	dst->fuser2 = src->fuser2;
+	dst->fuser3 = src->fuser3;
+	dst->fuser4 = src->fuser4;
+
+	dst->vuser1 = src->vuser1;
+	//dst->vuser2 = src->vuser2;
+	//dst->vuser3 = src->vuser3;
+	dst->vuser4 = src->vuser4;
+}
+
+/*
+=========================
+HUD_TxferPredictionData
+
+Because we can predict an arbitrary number of frames before the server responds with an update, we need to be able to copy client side prediction data in
+ from the state that the server ack'd receiving, which can be anywhere along the predicted frame path ( i.e., we could predict 20 frames into the future and the server ack's
+ up through 10 of those frames, so we need to copy persistent client-side only state from the 10th predicted frame to the slot the server
+ update is occupying.
+=========================
+*/
+void CL_DLLEXPORT HUD_TxferPredictionData ( struct entity_state_s *ps, const struct entity_state_s *pps, struct clientdata_s *pcd, const struct clientdata_s *ppcd, struct weapon_data_s *wd, const struct weapon_data_s *pwd )
+{
+	RecClTxferPredictionData(ps, pps, pcd, ppcd, wd, pwd);
+
+	ps->oldbuttons				= pps->oldbuttons;
+	ps->flFallVelocity			= pps->flFallVelocity;
+	ps->iStepLeft				= pps->iStepLeft;
+	ps->playerclass				= pps->playerclass;
+
+	pcd->viewmodel				= ppcd->viewmodel;
+	pcd->m_iId					= ppcd->m_iId;
+	pcd->ammo_shells			= ppcd->ammo_shells;
+	pcd->ammo_nails				= ppcd->ammo_nails;
+	pcd->ammo_cells				= ppcd->ammo_cells;
+	pcd->ammo_rockets			= ppcd->ammo_rockets;
+	pcd->m_flNextAttack			= ppcd->m_flNextAttack;
+	pcd->fov					= ppcd->fov;
+	pcd->weaponanim				= ppcd->weaponanim;
+	pcd->tfstate				= ppcd->tfstate;
+	pcd->maxspeed				= ppcd->maxspeed;
+
+	pcd->deadflag				= ppcd->deadflag;
+
+	// Spectating or not dead == get control over view angles.
+	g_iAlive = ( ppcd->iuser1 || ( pcd->deadflag == DEAD_NO ) ) ? 1 : 0;
+
+	// Spectator
+	pcd->iuser1					= ppcd->iuser1;
+	pcd->iuser2					= ppcd->iuser2;
+	pcd->iuser3					= ppcd->iuser3;
+	pcd->iuser4					= ppcd->iuser4;
+
+	pcd->fuser1					= ppcd->fuser1;
+	pcd->fuser2					= ppcd->fuser2;
+	pcd->fuser3					= ppcd->fuser3;
+	pcd->fuser4					= ppcd->fuser4;
+
+	if( gEngfuncs.IsSpectateOnly() )
+	{
+		// in specator mode we tell the engine who we want to spectate and how
+		// iuser3 is not used for duck prevention (since the spectator can't duck at all)
+		pcd->iuser1 = g_iUser1;	// observer mode
+		pcd->iuser2 = g_iUser2; // first target
+		pcd->iuser3 = g_iUser3; // second target
+
+	}
+
+	VectorCopy( ppcd->vuser1, pcd->vuser1 );
+	//VectorCopy( ppcd->vuser2, pcd->vuser2 );
+	//VectorCopy( ppcd->vuser3, pcd->vuser3 );
+	VectorCopy( ppcd->vuser4, pcd->vuser4 );
+
+	memcpy( wd, pwd, 32 * sizeof( weapon_data_t ) );
+}
+
+/*
+//#define TEST_IT
+#if defined( TEST_IT )
+
+cl_entity_t mymodel[9];
+
+void MoveModel( void )
+{
+	cl_entity_t *player;
+	int i, j;
+	int modelindex;
+	struct model_s *mod;
+
+	// Load it up with some bogus data
+	player = gEngfuncs.GetLocalPlayer();
+	if ( !player )
+		return;
+
+	mod = gEngfuncs.CL_LoadModel( "models/sentry3.mdl", &modelindex );
+	for ( i = 0; i < 3; i++ )
+	{
+		for ( j = 0; j < 3; j++ )
+		{
+			// Don't draw over ourself...
+			if ( ( i == 1 ) && ( j == 1 ) )
+				continue;
+
+			mymodel[ i * 3 + j ] = *player;
+
+			mymodel[ i * 3 + j ].player = 0;
+
+			mymodel[ i * 3 + j ].model = mod;
+			mymodel[ i * 3 + j ].curstate.modelindex = modelindex;
+		
+				// Move it out a bit
+			mymodel[ i * 3 + j ].origin[0] = player->origin[0] + 50 * ( 1 - i );
+			mymodel[ i * 3 + j ].origin[1] = player->origin[1] + 50 * ( 1 - j );
+
+			gEngfuncs.CL_CreateVisibleEntity( ET_NORMAL, &mymodel[i*3+j] );
+		}
+	}
+
+}
+
+#endif
+
+//#define TRACE_TEST
+#if defined( TRACE_TEST )
+
+extern int hitent;
+
+cl_entity_t hit;
+
+void TraceModel( void )
+{
+	cl_entity_t *ent;
+
+	if ( hitent <= 0 )
+		return;
+
+	// Load it up with some bogus data
+	ent = gEngfuncs.GetEntityByIndex( hitent );
+	if ( !ent )
+		return;
+
+	hit = *ent;
+	//hit.curstate.rendermode = kRenderTransTexture;
+	//hit.curstate.renderfx = kRenderFxGlowShell;
+	//hit.curstate.renderamt = 100;
+
+	hit.origin[2] += 40;
+
+	gEngfuncs.CL_CreateVisibleEntity( ET_NORMAL, &hit );
+}
+
+#endif
+*/
+
+/*
+void ParticleCallback( struct particle_s *particle, float frametime )
+{
+	int i;
+
+	for ( i = 0; i < 3; i++ )
+	{
+		particle->org[ i ] += particle->vel[ i ] * frametime;
+	}
+}
+
+cvar_t *color = NULL;
+void Particles( void )
+{
+	static float lasttime;
+	float curtime;
+	
+	curtime = gEngfuncs.GetClientTime();
+
+	if ( ( curtime - lasttime ) < 2.0 )
+		return;
+
+	if ( !color )
+	{
+		color = gEngfuncs.pfnRegisterVariable ( "color","255 0 0", 0 );
+	}
+
+	lasttime = curtime;
+
+	// Create a few particles
+	particle_t *p;
+	int i, j;
+
+	for ( i = 0; i < 1000; i++ )
+	{
+		int r, g, b;
+		p = gEngfuncs.pEfxAPI->R_AllocParticle( ParticleCallback );
+		if ( !p )
+			break;
+
+		for ( j = 0; j < 3; j++ )
+		{
+			p->org[ j ] = v_origin[ j ] + gEngfuncs.pfnRandomFloat( -32.0, 32.0 );;
+			p->vel[ j ] = gEngfuncs.pfnRandomFloat( -100.0, 100.0 );
+		}
+
+		if ( color )
+		{
+			sscanf( color->string, "%i %i %i", &r, &g, &b );
+		}
+		else
+		{
+			r = 192;
+			g = 0;
+			b = 0;
+		}
+
+		p->color = 	gEngfuncs.pEfxAPI->R_LookupColor( r, g, b );
+		gEngfuncs.pEfxAPI->R_GetPackedColor( &p->packedColor, p->color );
+
+		// p->die is set to current time so all you have to do is add an additional time to it
+		p->die += 3.0;
+	}
+}
+*/
+
+/*
+void TempEntCallback ( struct tempent_s *ent, float frametime, float currenttime )
+{
+	int i;
+
+	for ( i = 0; i < 3; i++ )
+	{
+		ent->entity.curstate.origin[ i ] += ent->entity.baseline.origin[ i ] * frametime;
+	}
+}
+
+void TempEnts( void )
+{
+	static float lasttime;
+	float curtime;
+	
+	curtime = gEngfuncs.GetClientTime();
+
+	if ( ( curtime - lasttime ) < 10.0 )
+		return;
+
+	lasttime = curtime;
+
+	TEMPENTITY *p;
+	int i, j;
+	struct model_s *mod;
+	vec3_t origin;
+	int index;
+
+	mod = gEngfuncs.CL_LoadModel( "sprites/laserdot.spr", &index );
+
+	for ( i = 0; i < 100; i++ )
+	{
+		for ( j = 0; j < 3; j++ )
+		{
+			origin[ j ] = v_origin[ j ];
+			if ( j != 2 )
+			{
+				origin[ j ] += 75;
+			}
+		}
+
+		p = gEngfuncs.pEfxAPI->CL_TentEntAllocCustom( (float *)&origin, mod, 0, TempEntCallback );
+		if ( !p )
+			break;
+
+		for ( j = 0; j < 3; j++ )
+		{
+			p->entity.curstate.origin[ j ] = origin[ j ];
+
+			// Store velocity in baseline origin
+			p->entity.baseline.origin[ j ] = gEngfuncs.pfnRandomFloat( -100, 100 );
+		}
+
+		// p->die is set to current time so all you have to do is add an additional time to it
+		p->die += 10.0;
+	}
+}
+*/
+
+#if defined( BEAM_TEST )
+// Note can't index beam[ 0 ] in Beam callback, so don't use that index
+// Room for 1 beam ( 0 can't be used )
+static cl_entity_t beams[ 2 ];
+
+void BeamEndModel( void )
+{
+	cl_entity_t *player, *model;
+	int modelindex;
+	struct model_s *mod;
+
+	// Load it up with some bogus data
+	player = gEngfuncs.GetLocalPlayer();
+	if ( !player )
+		return;
+
+	mod = gEngfuncs.CL_LoadModel( "models/sentry3.mdl", &modelindex );
+	if ( !mod )
+		return;
+
+	// Slot 1
+	model = &beams[ 1 ];
+
+	*model = *player;
+	model->player = 0;
+	model->model = mod;
+	model->curstate.modelindex = modelindex;
+		
+	// Move it out a bit
+	model->origin[0] = player->origin[0] - 100;
+	model->origin[1] = player->origin[1];
+
+	model->attachment[0] = model->origin;
+	model->attachment[1] = model->origin;
+	model->attachment[2] = model->origin;
+	model->attachment[3] = model->origin;
+
+	gEngfuncs.CL_CreateVisibleEntity( ET_NORMAL, model );
+}
+
+void Beams( void )
+{
+	static float lasttime;
+	float curtime;
+	struct model_s *mod;
+	int index;
+
+	BeamEndModel();
+	
+	curtime = gEngfuncs.GetClientTime();
+	float end[ 3 ];
+
+	if ( ( curtime - lasttime ) < 10.0 )
+		return;
+
+	mod = gEngfuncs.CL_LoadModel( "sprites/laserbeam.spr", &index );
+	if ( !mod )
+		return;
+
+	lasttime = curtime;
+
+	end [ 0 ] = v_origin.x + 100;
+	end [ 1 ] = v_origin.y + 100;
+	end [ 2 ] = v_origin.z;
+
+	BEAM *p1;
+	p1 = gEngfuncs.pEfxAPI->R_BeamEntPoint( -1, end, index,
+		10.0, 2.0, 0.3, 1.0, 5.0, 0.0, 1.0, 1.0, 1.0, 1.0 );
+}
+#endif
+
+/*
+=========================
+HUD_CreateEntities
+	
+Gives us a chance to add additional entities to the render this frame
+=========================
+*/
+void CL_DLLEXPORT HUD_CreateEntities( void )
+{
+	RecClCreateEntities();
+
+	// e.g., create a persistent cl_entity_t somewhere.
+	// Load an appropriate model into it ( gEngfuncs.CL_LoadModel )
+	// Call gEngfuncs.CL_CreateVisibleEntity to add it to the visedicts list
+/*
+#if defined( TEST_IT )
+	MoveModel();
+#endif
+
+#if defined( TRACE_TEST )
+	TraceModel();
+#endif
+*/
+/*
+	Particles();
+*/
+/*
+	TempEnts();
+*/
+
+#if defined( BEAM_TEST )
+	Beams();
+#endif
+
+	// Add in any game specific objects
+	Game_AddObjects();
+
+	GetClientVoiceMgr()->CreateEntities();
+}
+
+/*
+=========================
+HUD_StudioEvent
+
+The entity's studio model description indicated an event was
+fired during this frame, handle the event by it's tag ( e.g., muzzleflash, sound )
+=========================
+*/
+void CL_DLLEXPORT HUD_StudioEvent( const struct mstudioevent_s *event, const struct cl_entity_s *entity )
+{
+	RecClStudioEvent(event, entity);
+
+	switch( event->event )
+	{
+	case 5001:
+		gEngfuncs.pEfxAPI->R_MuzzleFlash( (float *)&entity->attachment[0], atoi( event->options) );
+		break;
+	case 5011:
+		gEngfuncs.pEfxAPI->R_MuzzleFlash( (float *)&entity->attachment[1], atoi( event->options) );
+		break;
+	case 5021:
+		gEngfuncs.pEfxAPI->R_MuzzleFlash( (float *)&entity->attachment[2], atoi( event->options) );
+		break;
+	case 5031:
+		gEngfuncs.pEfxAPI->R_MuzzleFlash( (float *)&entity->attachment[3], atoi( event->options) );
+		break;
+	case 5002:
+		gEngfuncs.pEfxAPI->R_SparkEffect( (float *)&entity->attachment[0], atoi( event->options), -100, 100 );
+		break;
+	// Client side sound
+	case 5004:		
+		gEngfuncs.pfnPlaySoundByNameAtLocation( (char *)event->options, 1.0, (float *)&entity->attachment[0] );
+		break;
+
+	// Particles!
+	case 7000:
+		AvHParticleSystemManager::Instance()->CreateParticleSystem(string(event->options), entity->attachment[0]);
+		break;
+
+	case 7010:
+		AvHParticleSystemManager::Instance()->CreateParticleSystem(string(event->options), entity->attachment[1]);
+		break;
+		
+	case 7020:
+		AvHParticleSystemManager::Instance()->CreateParticleSystem(string(event->options), entity->attachment[2]);
+		break;
+		
+	case 7030:
+		AvHParticleSystemManager::Instance()->CreateParticleSystem(string(event->options), entity->attachment[3]);
+		break;
+		
+	default:
+		break;
+	}
+}
+
+/*
+=================
+CL_UpdateTEnts
+
+Simulation and cleanup of temporary entities
+=================
+*/
+void CL_DLLEXPORT HUD_TempEntUpdate (
+	double frametime,   // Simulation time
+	double client_time, // Absolute time on client
+	double cl_gravity,  // True gravity on client
+	TEMPENTITY **ppTempEntFree,   // List of freed temporary ents
+	TEMPENTITY **ppTempEntActive, // List 
+	int		( *Callback_AddVisibleEntity )( cl_entity_t *pEntity ),
+	void	( *Callback_TempEntPlaySound )( TEMPENTITY *pTemp, float damp ) )
+{
+	RecClTempEntUpdate(frametime, client_time, cl_gravity, ppTempEntFree, ppTempEntActive, Callback_AddVisibleEntity, Callback_TempEntPlaySound);
+
+	static int gTempEntFrame = 0;
+	int			i;
+	TEMPENTITY	*pTemp, *pnext, *pprev;
+	float		freq, gravity, gravitySlow, life, fastFreq;
+
+	// don't simulate when we're paused
+	if(gClientTimeLastUpdate != client_time)
+	{
+		gClientTimeLastUpdate = client_time;
+		
+		// Nothing to simulate
+		if ( *ppTempEntActive )		
+		{
+			// in order to have tents collide with players, we have to run the player prediction code so
+			// that the client has the player list. We run this code once when we detect any COLLIDEALL 
+			// tent, then set this BOOL to true so the code doesn't get run again if there's more than
+			// one COLLIDEALL ent for this update. (often are).
+			gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction( false, true );
+			
+			// Store off the old count
+			gEngfuncs.pEventAPI->EV_PushPMStates();
+			
+			// Now add in all of the players.
+			gEngfuncs.pEventAPI->EV_SetSolidPlayers ( -1 );	
+			
+			// !!!BUGBUG	-- This needs to be time based
+			gTempEntFrame = (gTempEntFrame+1) & 31;
+			
+			pTemp = *ppTempEntActive;
+
+			bool theIsDone = false;
+			
+			// !!! Don't simulate while paused....  This is sort of a hack, revisit.
+			if ( frametime <= 0 )
+			{
+				while ( pTemp )
+				{
+					if ( !(pTemp->flags & FTENT_NOMODEL ) )
+					{
+						Callback_AddVisibleEntity( &pTemp->entity );
+					}
+					pTemp = pTemp->next;
+				}
+				//goto finish;
+				
+				theIsDone = true;
+			}
+
+			if(!theIsDone)
+			{
+				pprev = NULL;
+				freq = client_time * 0.01;
+				fastFreq = client_time * 5.5;
+				gravity = -frametime * cl_gravity;
+				gravitySlow = gravity * 0.5;
+				
+				while ( pTemp )
+				{
+					int active;
+					
+					active = 1;
+					
+					life = pTemp->die - client_time;
+					pnext = pTemp->next;
+					if ( life < 0 )
+					{
+						if ( pTemp->flags & FTENT_FADEOUT )
+						{
+							if (pTemp->entity.curstate.rendermode == kRenderNormal)
+								pTemp->entity.curstate.rendermode = kRenderTransTexture;
+							pTemp->entity.curstate.renderamt = pTemp->entity.baseline.renderamt * ( 1 + life * pTemp->fadeSpeed );
+							if ( pTemp->entity.curstate.renderamt <= 0 )
+								active = 0;
+							
+						}
+						else 
+							active = 0;
+					}
+					if ( !active )		// Kill it
+					{
+						pTemp->next = *ppTempEntFree;
+						*ppTempEntFree = pTemp;
+						if ( !pprev )	// Deleting at head of list
+							*ppTempEntActive = pnext;
+						else
+							pprev->next = pnext;
+					}
+					else
+					{
+						pprev = pTemp;
+						
+						VectorCopy( pTemp->entity.origin, pTemp->entity.prevstate.origin );
+						
+						if ( pTemp->flags & FTENT_SPARKSHOWER )
+						{
+							// Adjust speed if it's time
+							// Scale is next think time
+							if ( client_time > pTemp->entity.baseline.scale )
+							{
+								// Show Sparks
+								gEngfuncs.pEfxAPI->R_SparkEffect( pTemp->entity.origin, 8, -200, 200 );
+								
+								// Reduce life
+								pTemp->entity.baseline.framerate -= 0.1;
+								
+								if ( pTemp->entity.baseline.framerate <= 0.0 )
+								{
+									pTemp->die = client_time;
+								}
+								else
+								{
+									// So it will die no matter what
+									pTemp->die = client_time + 0.5;
+									
+									// Next think
+									pTemp->entity.baseline.scale = client_time + 0.1;
+								}
+							}
+						}
+						else if ( pTemp->flags & FTENT_PLYRATTACHMENT )
+						{
+							cl_entity_t *pClient;
+							
+							pClient = gEngfuncs.GetEntityByIndex( pTemp->clientIndex );
+							
+							VectorAdd( pClient->origin, pTemp->tentOffset, pTemp->entity.origin );
+						}
+						else if ( pTemp->flags & FTENT_SINEWAVE )
+						{
+							pTemp->x += pTemp->entity.baseline.origin[0] * frametime;
+							pTemp->y += pTemp->entity.baseline.origin[1] * frametime;
+							
+							pTemp->entity.origin[0] = pTemp->x + sin( pTemp->entity.baseline.origin[2] + client_time * pTemp->entity.prevstate.frame ) * (10*pTemp->entity.curstate.framerate);
+							pTemp->entity.origin[1] = pTemp->y + sin( pTemp->entity.baseline.origin[2] + fastFreq + 0.7 ) * (8*pTemp->entity.curstate.framerate);
+							pTemp->entity.origin[2] += pTemp->entity.baseline.origin[2] * frametime;
+						}
+						else if ( pTemp->flags & FTENT_SPIRAL )
+						{
+							float s, c;
+							s = sin( pTemp->entity.baseline.origin[2] + fastFreq );
+							c = cos( pTemp->entity.baseline.origin[2] + fastFreq );
+							
+							pTemp->entity.origin[0] += pTemp->entity.baseline.origin[0] * frametime + 8 * sin( client_time * 20 + (int)pTemp );
+							pTemp->entity.origin[1] += pTemp->entity.baseline.origin[1] * frametime + 4 * sin( client_time * 30 + (int)pTemp );
+							pTemp->entity.origin[2] += pTemp->entity.baseline.origin[2] * frametime;
+						}
+						
+						else 
+						{
+							for ( i = 0; i < 3; i++ ) 
+								pTemp->entity.origin[i] += pTemp->entity.baseline.origin[i] * frametime;
+						}
+						
+						if ( pTemp->flags & FTENT_SPRANIMATE )
+						{
+							pTemp->entity.curstate.frame += frametime * pTemp->entity.curstate.framerate;
+							if ( pTemp->entity.curstate.frame >= pTemp->frameMax )
+							{
+								pTemp->entity.curstate.frame = pTemp->entity.curstate.frame - (int)(pTemp->entity.curstate.frame);
+								
+								if ( !(pTemp->flags & FTENT_SPRANIMATELOOP) )
+								{
+									// this animating sprite isn't set to loop, so destroy it.
+									pTemp->die = client_time;
+									pTemp = pnext;
+									continue;
+								}
+							}
+						}
+						else if ( pTemp->flags & FTENT_SPRCYCLE )
+						{
+							pTemp->entity.curstate.frame += frametime * 10;
+							if ( pTemp->entity.curstate.frame >= pTemp->frameMax )
+							{
+								pTemp->entity.curstate.frame = pTemp->entity.curstate.frame - (int)(pTemp->entity.curstate.frame);
+							}
+						}
+						// Experiment
+#if 0
+						if ( pTemp->flags & FTENT_SCALE )
+							pTemp->entity.curstate.framerate += 20.0 * (frametime / pTemp->entity.curstate.framerate);
+#endif
+						
+						if ( pTemp->flags & FTENT_ROTATE )
+						{
+							pTemp->entity.angles[0] += pTemp->entity.baseline.angles[0] * frametime;
+							pTemp->entity.angles[1] += pTemp->entity.baseline.angles[1] * frametime;
+							pTemp->entity.angles[2] += pTemp->entity.baseline.angles[2] * frametime;
+							
+							VectorCopy( pTemp->entity.angles, pTemp->entity.latched.prevangles );
+						}
+						
+						if ( pTemp->flags & (FTENT_COLLIDEALL | FTENT_COLLIDEWORLD) )
+						{
+							vec3_t	traceNormal;
+							float	traceFraction = 1;
+							
+							if ( pTemp->flags & FTENT_COLLIDEALL )
+							{
+								pmtrace_t pmtrace;
+								physent_t *pe;
+								
+								gEngfuncs.pEventAPI->EV_SetTraceHull( 2 );
+								
+								gEngfuncs.pEventAPI->EV_PlayerTrace( pTemp->entity.prevstate.origin, pTemp->entity.origin, PM_STUDIO_BOX, -1, &pmtrace );
+								
+								
+								if ( pmtrace.fraction != 1 )
+								{
+									pe = gEngfuncs.pEventAPI->EV_GetPhysent( pmtrace.ent );
+									
+									if ( !pmtrace.ent || ( pe->info != pTemp->clientIndex ) )
+									{
+										traceFraction = pmtrace.fraction;
+										VectorCopy( pmtrace.plane.normal, traceNormal );
+										
+										if ( pTemp->hitcallback )
+										{
+											(*pTemp->hitcallback)( pTemp, &pmtrace );
+										}
+									}
+								}
+							}
+							else if ( pTemp->flags & FTENT_COLLIDEWORLD )
+							{
+								pmtrace_t pmtrace;
+								
+								gEngfuncs.pEventAPI->EV_SetTraceHull( 2 );
+								
+								gEngfuncs.pEventAPI->EV_PlayerTrace( pTemp->entity.prevstate.origin, pTemp->entity.origin, PM_STUDIO_BOX | PM_WORLD_ONLY, -1, &pmtrace );					
+								
+								if ( pmtrace.fraction != 1 )
+								{
+									traceFraction = pmtrace.fraction;
+									VectorCopy( pmtrace.plane.normal, traceNormal );
+									
+									if ( pTemp->flags & FTENT_SPARKSHOWER )
+									{
+										// Chop spark speeds a bit more
+										//
+										VectorScale( pTemp->entity.baseline.origin, 0.6, pTemp->entity.baseline.origin );
+										
+										if ( Length( pTemp->entity.baseline.origin ) < 10 )
+										{
+											pTemp->entity.baseline.framerate = 0.0;								
+										}
+									}
+									
+									if ( pTemp->hitcallback )
+									{
+										(*pTemp->hitcallback)( pTemp, &pmtrace );
+									}
+								}
+							}
+							
+							if ( traceFraction != 1 )	// Decent collision now, and damping works
+							{
+								float  proj, damp;
+								
+								// Place at contact point
+								VectorMA( pTemp->entity.prevstate.origin, traceFraction*frametime, pTemp->entity.baseline.origin, pTemp->entity.origin );
+								// Damp velocity
+								damp = pTemp->bounceFactor;
+								if ( pTemp->flags & (FTENT_GRAVITY|FTENT_SLOWGRAVITY) )
+								{
+									damp *= 0.5;
+									if ( traceNormal[2] > 0.9 )		// Hit floor?
+									{
+										if ( pTemp->entity.baseline.origin[2] <= 0 && pTemp->entity.baseline.origin[2] >= gravity*3 )
+										{
+											damp = 0;		// Stop
+											pTemp->flags &= ~(FTENT_ROTATE|FTENT_GRAVITY|FTENT_SLOWGRAVITY|FTENT_COLLIDEWORLD|FTENT_SMOKETRAIL);
+											pTemp->entity.angles[0] = 0;
+											pTemp->entity.angles[2] = 0;
+										}
+									}
+								}
+								
+								if (pTemp->hitSound)
+								{
+									Callback_TempEntPlaySound(pTemp, damp);
+								}
+								
+								if (pTemp->flags & FTENT_COLLIDEKILL)
+								{
+									// die on impact
+									pTemp->flags &= ~FTENT_FADEOUT;	
+									pTemp->die = client_time;			
+								}
+								else
+								{
+									// Reflect velocity
+									if ( damp != 0 )
+									{
+										proj = DotProduct( pTemp->entity.baseline.origin, traceNormal );
+										VectorMA( pTemp->entity.baseline.origin, -proj*2, traceNormal, pTemp->entity.baseline.origin );
+										// Reflect rotation (fake)
+										
+										pTemp->entity.angles[1] = -pTemp->entity.angles[1];
+									}
+									
+									if ( damp != 1 )
+									{
+										
+										VectorScale( pTemp->entity.baseline.origin, damp, pTemp->entity.baseline.origin );
+										VectorScale( pTemp->entity.angles, 0.9, pTemp->entity.angles );
+									}
+								}
+							}
+							}
+							
+							
+							if ( (pTemp->flags & FTENT_FLICKER) && gTempEntFrame == pTemp->entity.curstate.effects )
+							{
+								dlight_t *dl = gEngfuncs.pEfxAPI->CL_AllocDlight (0);
+								VectorCopy (pTemp->entity.origin, dl->origin);
+								dl->radius = 60;
+								dl->color.r = 255;
+								dl->color.g = 120;
+								dl->color.b = 0;
+								dl->die = client_time + 0.01;
+							}
+							
+							if ( pTemp->flags & FTENT_SMOKETRAIL )
+							{
+								gEngfuncs.pEfxAPI->R_RocketTrail (pTemp->entity.prevstate.origin, pTemp->entity.origin, 1);
+							}
+							
+							if ( pTemp->flags & FTENT_GRAVITY )
+								pTemp->entity.baseline.origin[2] += gravity;
+							else if ( pTemp->flags & FTENT_SLOWGRAVITY )
+								pTemp->entity.baseline.origin[2] += gravitySlow;
+							
+							if ( pTemp->flags & FTENT_CLIENTCUSTOM )
+							{
+								if ( pTemp->callback )
+								{
+									( *pTemp->callback )( pTemp, frametime, client_time );
+								}
+							}
+							
+							// Cull to PVS (not frustum cull, just PVS)
+							if ( !(pTemp->flags & FTENT_NOMODEL ) )
+							{
+								if ( !Callback_AddVisibleEntity( &pTemp->entity ) )
+								{
+									if ( !(pTemp->flags & FTENT_PERSIST) ) 
+									{
+										pTemp->die = client_time;			// If we can't draw it this frame, just dump it.
+										pTemp->flags &= ~FTENT_FADEOUT;	// Don't fade out, just die
+									}
+								}
+							}
+					}
+					pTemp = pnext;
+				}
+			}
+
+			// Restore state info
+			gEngfuncs.pEventAPI->EV_PopPMStates();
+		}
+	}
+
+//finish:
+//	// Restore state info
+//	gEngfuncs.pEventAPI->EV_PopPMStates();
+}
+
+/*
+=================
+HUD_GetUserEntity
+
+If you specify negative numbers for beam start and end point entities, then
+  the engine will call back into this function requesting a pointer to a cl_entity_t 
+  object that describes the entity to attach the beam onto.
+
+Indices must start at 1, not zero.
+=================
+*/
+cl_entity_t CL_DLLEXPORT *HUD_GetUserEntity( int index )
+{
+	RecClGetUserEntity(index);
+
+#if defined( BEAM_TEST )
+	// None by default, you would return a valic pointer if you create a client side
+	//  beam and attach it to a client side entity.
+	if ( index > 0 && index <= 1 )
+	{
+		return &beams[ index ];
+	}
+	else
+	{
+		return NULL;
+	}
+#else
+	return NULL;
+#endif
+}
diff --git a/main/source/cl_dll/ev_common.cpp b/main/source/cl_dll/ev_common.cpp
new file mode 100644
index 00000000..f60a59d3
--- /dev/null
+++ b/main/source/cl_dll/ev_common.cpp
@@ -0,0 +1,216 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+// shared event functions
+#include "hud.h"
+#include "cl_util.h"
+#include "const.h"
+#include "entity_state.h"
+#include "cl_entity.h"
+
+#include "r_efx.h"
+
+#include "eventscripts.h"
+#include "event_api.h"
+#include "pm_shared.h"
+
+#define IS_FIRSTPERSON_SPEC ( g_iUser1 == OBS_IN_EYE)
+/*
+=================
+GetEntity
+
+Return's the requested cl_entity_t
+=================
+*/
+struct cl_entity_s *GetEntity( int idx )
+{
+	return gEngfuncs.GetEntityByIndex( idx );
+}
+
+/*
+=================
+GetViewEntity
+
+Return's the current weapon/view model
+=================
+*/
+struct cl_entity_s *GetViewEntity( void )
+{
+	return gEngfuncs.GetViewModel();
+}
+
+physent_t* GetPhysEntity(int inPhysIndex)
+{
+	return gEngfuncs.pEventAPI->EV_GetPhysent( inPhysIndex );
+}
+
+void DoCenterPrint(char* inString)
+{
+	CenterPrint(inString);
+}
+
+
+/*
+=================
+EV_CreateTracer
+
+Creates a tracer effect
+=================
+*/
+void EV_CreateTracer( float *start, float *end )
+{
+	gEngfuncs.pEfxAPI->R_TracerEffect( start, end );
+}
+
+/*
+=================
+EV_IsPlayer
+
+Is the entity's index in the player range?
+=================
+*/
+qboolean EV_IsPlayer( int idx )
+{
+	if ( idx >= 1 && idx <= gEngfuncs.GetMaxClients() )
+		return true;
+
+	return false;
+}
+
+/*
+=================
+EV_IsLocal
+
+Is the entity == the local player
+=================
+*/
+qboolean EV_IsLocal( int idx )
+{
+	// check if we are in some way in first person spec mode
+	if ( IS_FIRSTPERSON_SPEC  )
+		return (g_iUser2 == idx);
+	else
+		return gEngfuncs.pEventAPI->EV_IsLocal( idx - 1 ) ? true : false;
+}
+
+/*
+=================
+EV_GetGunPosition
+
+Figure out the height of the gun
+=================
+*/
+void EV_GetGunPosition( event_args_t *args, float *pos, float *origin )
+{
+	int idx;
+	vec3_t view_ofs;
+
+	idx = args->entindex;
+
+	VectorClear( view_ofs );
+	view_ofs[2] = DEFAULT_VIEWHEIGHT;
+
+	if ( EV_IsPlayer( idx ) )
+	{
+		// in spec mode use entity viewheigh, not own
+		if ( EV_IsLocal( idx ) && !IS_FIRSTPERSON_SPEC )
+		{
+			// Grab predicted result for local player
+			gEngfuncs.pEventAPI->EV_LocalPlayerViewheight( view_ofs );
+		}
+		else if ( args->ducking == 1 )
+		{
+			view_ofs[2] = VEC_DUCK_VIEW;
+		}
+	}
+
+	VectorAdd( origin, view_ofs, pos );
+}
+
+/*
+=================
+EV_EjectBrass
+
+Bullet shell casings
+=================
+*/
+void EV_EjectBrass( float *origin, float *velocity, float rotation, int model, int soundtype )
+{
+	vec3_t endpos;
+	VectorClear( endpos );
+	endpos[1] = rotation;
+	gEngfuncs.pEfxAPI->R_TempModel( origin, velocity, endpos, 2.5, model, soundtype );
+}
+
+/*
+=================
+EV_GetDefaultShellInfo
+
+Determine where to eject shells from
+=================
+*/
+void EV_GetDefaultShellInfo( event_args_t *args, float *origin, float *velocity, float *ShellVelocity, float *ShellOrigin, float *forward, float *right, float *up, float forwardScale, float upScale, float rightScale )
+{
+	int i;
+	vec3_t view_ofs;
+	float fR, fU;
+
+	int idx;
+
+	idx = args->entindex;
+
+	VectorClear( view_ofs );
+	view_ofs[2] = DEFAULT_VIEWHEIGHT;
+
+	if ( EV_IsPlayer( idx ) )
+	{
+		if ( EV_IsLocal( idx ) )
+		{
+			gEngfuncs.pEventAPI->EV_LocalPlayerViewheight( view_ofs );
+		}
+		else if ( args->ducking == 1 )
+		{
+			view_ofs[2] = VEC_DUCK_VIEW;
+		}
+	}
+
+	fR = gEngfuncs.pfnRandomFloat( 50, 70 );
+	fU = gEngfuncs.pfnRandomFloat( 100, 150 );
+
+	for ( i = 0; i < 3; i++ )
+	{
+		ShellVelocity[i] = velocity[i] + right[i] * fR + up[i] * fU + forward[i] * 25;
+		ShellOrigin[i]   = origin[i] + view_ofs[i] + up[i] * upScale + forward[i] * forwardScale + right[i] * rightScale;
+	}
+}
+
+/*
+=================
+EV_MuzzleFlash
+
+Flag weapon/view model for muzzle flash
+=================
+*/
+void EV_MuzzleFlash( void )
+{
+	// Add muzzle flash to current weapon model
+	cl_entity_t *ent = GetViewEntity();
+	if ( !ent )
+	{
+		return;
+	}
+
+	// Or in the muzzle flash
+	ent->curstate.effects |= EF_MUZZLEFLASH;
+}
\ No newline at end of file
diff --git a/main/source/cl_dll/ev_hldm.cpp b/main/source/cl_dll/ev_hldm.cpp
new file mode 100644
index 00000000..45f01f19
--- /dev/null
+++ b/main/source/cl_dll/ev_hldm.cpp
@@ -0,0 +1,1966 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//#include "hud.h"
+#include "mod/AvHHud.h"
+#include "cl_util.h"
+#include "const.h"
+#include "entity_state.h"
+#include "cl_entity.h"
+#include "entity_types.h"
+#include "usercmd.h"
+#include "pm_defs.h"
+#include "pm_materials.h"
+
+#include "eventscripts.h"
+#include "ev_hldm.h"
+
+#include "r_efx.h"
+#include "event_api.h"
+#include "event_args.h"
+#include "in_defs.h"
+#include "mod/AvHBasePlayerWeaponConstants.h"
+#include "mod/AvHMarineWeaponConstants.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include <string.h>
+
+static int tracerCount[ 32 ];
+extern AvHHud gHUD;
+
+#include "r_studioint.h"
+#include "com_model.h"
+
+extern engine_studio_api_t IEngineStudio;
+
+//extern "C" char PM_FindTextureType( char *name );
+char PM_FindTextureType( char *name );
+
+void V_PunchAxis( int axis, float punch );
+void VectorAngles( const float *forward, float *angles );
+Vector UTIL_GetRandomSpreadDir(unsigned int inSeed, int inShotNumber, const Vector& inBaseDirection, const Vector& inRight, const Vector& inUp, const Vector& inSpread);
+
+extern "C"
+{
+
+// HLDM
+void EV_FireGlock1( struct event_args_s *args  );
+void EV_FireGlock2( struct event_args_s *args  );
+void EV_FireShotGunSingle( struct event_args_s *args  );
+void EV_FireShotGunDouble( struct event_args_s *args  );
+void EV_FireMP5( struct event_args_s *args  );
+void EV_FireMP52( struct event_args_s *args  );
+void EV_FirePython( struct event_args_s *args  );
+void EV_FireGauss( struct event_args_s *args  );
+void EV_SpinGauss( struct event_args_s *args  );
+void EV_Crowbar( struct event_args_s *args  );
+void EV_FireCrossbow( struct event_args_s *args  );
+void EV_FireCrossbow2( struct event_args_s *args  );
+void EV_FireRpg( struct event_args_s *args  );
+void EV_EgonFire( struct event_args_s *args  );
+void EV_EgonStop( struct event_args_s *args  );
+void EV_HornetGunFire( struct event_args_s *args  );
+void EV_TripmineFire( struct event_args_s *args  );
+void EV_SnarkFire( struct event_args_s *args  );
+
+
+void EV_TrainPitchAdjust( struct event_args_s *args );
+}
+
+#define VECTOR_CONE_1DEGREES Vector( 0.00873, 0.00873, 0.00873 )
+#define VECTOR_CONE_2DEGREES Vector( 0.01745, 0.01745, 0.01745 )
+#define VECTOR_CONE_3DEGREES Vector( 0.02618, 0.02618, 0.02618 )
+#define VECTOR_CONE_4DEGREES Vector( 0.03490, 0.03490, 0.03490 )
+#define VECTOR_CONE_5DEGREES Vector( 0.04362, 0.04362, 0.04362 )
+#define VECTOR_CONE_6DEGREES Vector( 0.05234, 0.05234, 0.05234 )
+#define VECTOR_CONE_7DEGREES Vector( 0.06105, 0.06105, 0.06105 )	
+#define VECTOR_CONE_8DEGREES Vector( 0.06976, 0.06976, 0.06976 )
+#define VECTOR_CONE_9DEGREES Vector( 0.07846, 0.07846, 0.07846 )
+#define VECTOR_CONE_10DEGREES Vector( 0.08716, 0.08716, 0.08716 )
+#define VECTOR_CONE_15DEGREES Vector( 0.13053, 0.13053, 0.13053 )
+#define VECTOR_CONE_20DEGREES Vector( 0.17365, 0.17365, 0.17365 )
+
+// play a strike sound based on the texture that was hit by the attack traceline.  VecSrc/VecEnd are the
+// original traceline endpoints used by the attacker, iBulletType is the type of bullet that hit the texture.
+// returns volume of strike instrument (crowbar) to play
+float EV_HLDM_PlayTextureSound( int idx, pmtrace_t *ptr, float *vecSrc, float *vecEnd, int iBulletType, int inSoundProbability)
+{
+	// hit the world, try to play sound based on texture material type
+	char chTextureType = CHAR_TEX_CONCRETE;
+	float fvol;
+	float fvolbar = 0.0f;
+	char *rgsz[4];
+	int cnt;
+	float fattn = ATTN_NORM;
+	int entity;
+	char *pTextureName;
+	char texname[ 64 ];
+	char szbuffer[ 64 ];
+
+	if(gEngfuncs.pfnRandomLong(1, inSoundProbability) == 1)
+	{
+		
+		entity = gEngfuncs.pEventAPI->EV_IndexFromTrace( ptr );
+	
+		// FIXME check if playtexture sounds movevar is set
+		//
+	
+		chTextureType = 0;
+	
+		// Player
+		if ( entity >= 1 && entity <= gEngfuncs.GetMaxClients() )
+		{
+			// hit body
+			chTextureType = CHAR_TEX_FLESH;
+		}
+		else if ( entity == 0 )
+		{
+			// get texture from entity or world (world is ent(0))
+			pTextureName = (char *)gEngfuncs.pEventAPI->EV_TraceTexture( ptr->ent, vecSrc, vecEnd );
+			
+			if ( pTextureName )
+			{
+				strcpy( texname, pTextureName );
+				pTextureName = texname;
+	
+				// strip leading '-0' or '+0~' or '{' or '!'
+				if (*pTextureName == '-' || *pTextureName == '+')
+				{
+					pTextureName += 2;
+				}
+	
+				if (*pTextureName == '{' || *pTextureName == '!' || *pTextureName == '~' || *pTextureName == ' ')
+				{
+					pTextureName++;
+				}
+				
+				// '}}'
+				strcpy( szbuffer, pTextureName );
+				szbuffer[ CBTEXTURENAMEMAX - 1 ] = 0;
+					
+				// get texture type
+				chTextureType = PM_FindTextureType( szbuffer );	
+			}
+		}
+	
+		switch (chTextureType)
+		{
+		default:
+		case CHAR_TEX_CONCRETE: fvol = 0.3;	fvolbar = 0.6;
+			rgsz[0] = "weapons/ric_conc-1.wav";
+			rgsz[1] = "weapons/ric_conc-2.wav";
+			cnt = 2;
+			break;
+		case CHAR_TEX_METAL: fvol = 0.3; fvolbar = 0.3;
+			rgsz[0] = "weapons/ric_metal-1.wav";
+			rgsz[1] = "weapons/ric_metal-2.wav";
+			cnt = 2;
+			break;
+		case CHAR_TEX_DIRT:	fvol = 0.9; fvolbar = 0.1;
+			rgsz[0] = "player/pl_dirt1.wav";
+			rgsz[1] = "player/pl_dirt2.wav";
+			rgsz[2] = "player/pl_dirt3.wav";
+			cnt = 3;
+			break;
+		case CHAR_TEX_VENT:	fvol = 0.5; fvolbar = 0.3;
+			rgsz[0] = "player/pl_duct1.wav";
+			rgsz[1] = "player/pl_duct1.wav";
+			cnt = 2;
+			break;
+		case CHAR_TEX_GRATE: fvol = 0.9; fvolbar = 0.5;
+			rgsz[0] = "player/pl_grate1.wav";
+			rgsz[1] = "player/pl_grate4.wav";
+			cnt = 2;
+			break;
+		case CHAR_TEX_TILE:	fvol = 0.8; fvolbar = 0.2;
+			rgsz[0] = "player/pl_tile1.wav";
+			rgsz[1] = "player/pl_tile3.wav";
+			rgsz[2] = "player/pl_tile2.wav";
+			rgsz[3] = "player/pl_tile4.wav";
+			cnt = 4;
+			break;
+		case CHAR_TEX_SLOSH: fvol = 0.9; fvolbar = 0.0;
+			rgsz[0] = "player/pl_slosh1.wav";
+			rgsz[1] = "player/pl_slosh3.wav";
+			rgsz[2] = "player/pl_slosh2.wav";
+			rgsz[3] = "player/pl_slosh4.wav";
+			cnt = 4;
+			break;
+		case CHAR_TEX_WOOD: fvol = 0.9; fvolbar = 0.2;
+			rgsz[0] = "debris/wood1.wav";
+			rgsz[1] = "debris/wood2.wav";
+			rgsz[2] = "debris/wood3.wav";
+			cnt = 3;
+			break;
+		case CHAR_TEX_GLASS:
+		case CHAR_TEX_COMPUTER:
+			fvol = 0.8; fvolbar = 0.2;
+			rgsz[0] = "debris/glass1.wav";
+			rgsz[1] = "debris/glass2.wav";
+			rgsz[2] = "debris/glass3.wav";
+			cnt = 3;
+			break;
+		case CHAR_TEX_FLESH:
+			if (iBulletType == BULLET_PLAYER_CROWBAR)
+				return 0.0; // crowbar already makes this sound
+			fvol = 1.0;	fvolbar = 0.2;
+			rgsz[0] = "weapons/bullet_hit1.wav";
+			rgsz[1] = "weapons/bullet_hit2.wav";
+			fattn = 1.0;
+			cnt = 2;
+			break;
+		}
+
+		if(iBulletType == BULLET_MONSTER_9MM)
+		{
+			fvol = 0.3;	
+			fvolbar = 0.6;
+			rgsz[0] = "weapons/a_ric1.wav";
+			rgsz[1] = "weapons/a_ric2.wav";
+			rgsz[2] = "weapons/a_ric3.wav";
+			cnt = 3;
+		}
+	
+		// play material hit sound
+		gEngfuncs.pEventAPI->EV_PlaySound( 0, ptr->endpos, CHAN_STATIC, rgsz[gEngfuncs.pfnRandomLong(0,cnt-1)], fvol, fattn, 0, 96 + gEngfuncs.pfnRandomLong(0,0xf) );
+	}
+
+	return fvolbar;
+}
+
+char *EV_HLDM_DamageDecal( physent_t *pe )
+{
+	static char decalname[ 32 ];
+	int idx;
+
+	if ( pe->classnumber == 1 )
+	{
+		idx = gEngfuncs.pfnRandomLong( 0, 2 );
+		sprintf( decalname, "{break%i", idx + 1 );
+	}
+	else if ( pe->rendermode != kRenderNormal )
+	{
+		sprintf( decalname, "{bproof1" );
+	}
+	else
+	{
+		idx = gEngfuncs.pfnRandomLong( 0, 4 );
+		sprintf( decalname, "{shot%i", idx + 1 );
+	}
+	return decalname;
+}
+
+void EV_HLDM_GunshotDecalTrace( pmtrace_t *pTrace, char *decalName, int inChanceOfSound)
+{
+	int iRand;
+	physent_t *pe;
+
+	gEngfuncs.pEfxAPI->R_BulletImpactParticles( pTrace->endpos );
+
+	iRand = gEngfuncs.pfnRandomLong(1, inChanceOfSound);
+	if ( iRand == 1)// not every bullet makes a sound.
+	{
+		const float kRicochetVolume = .2f;
+		int theRandomSound = gEngfuncs.pfnRandomLong(0, 4);
+		switch(theRandomSound)
+		{
+		case 0:	gEngfuncs.pEventAPI->EV_PlaySound( -1, pTrace->endpos, 0, "weapons/ric1.wav", kRicochetVolume, ATTN_NORM, 0, PITCH_NORM ); break;
+		case 1:	gEngfuncs.pEventAPI->EV_PlaySound( -1, pTrace->endpos, 0, "weapons/ric2.wav", kRicochetVolume, ATTN_NORM, 0, PITCH_NORM ); break;
+		case 2:	gEngfuncs.pEventAPI->EV_PlaySound( -1, pTrace->endpos, 0, "weapons/ric3.wav", kRicochetVolume, ATTN_NORM, 0, PITCH_NORM ); break;
+		case 3:	gEngfuncs.pEventAPI->EV_PlaySound( -1, pTrace->endpos, 0, "weapons/ric4.wav", kRicochetVolume, ATTN_NORM, 0, PITCH_NORM ); break;
+		case 4:	gEngfuncs.pEventAPI->EV_PlaySound( -1, pTrace->endpos, 0, "weapons/ric5.wav", kRicochetVolume, ATTN_NORM, 0, PITCH_NORM ); break;
+		}
+	}
+
+	pe = gEngfuncs.pEventAPI->EV_GetPhysent( pTrace->ent );
+
+	// Only decal brush models such as the world etc.
+	if (  decalName && decalName[0] && pe && ( pe->solid == SOLID_BSP || pe->movetype == MOVETYPE_PUSHSTEP ) )
+	{
+		if ( CVAR_GET_FLOAT( "r_decals" ) )
+		{
+			gEngfuncs.pEfxAPI->R_DecalShoot( 
+				gEngfuncs.pEfxAPI->Draw_DecalIndex( gEngfuncs.pEfxAPI->Draw_DecalIndexFromName( decalName ) ), 
+				gEngfuncs.pEventAPI->EV_IndexFromTrace( pTrace ), 0, pTrace->endpos, 0 );
+		}
+	}
+}
+
+void EV_HLDM_DecalGunshot( pmtrace_t *pTrace, int iBulletType, int inSoundProbability)
+{
+	physent_t *pe;
+
+	pe = gEngfuncs.pEventAPI->EV_GetPhysent( pTrace->ent );
+
+	if ( pe && pe->solid == SOLID_BSP )
+	{
+		EV_HLDM_GunshotDecalTrace( pTrace, EV_HLDM_DamageDecal( pe ), inSoundProbability);
+	}
+}
+
+int EV_HLDM_CheckTracer( int idx, float *vecSrc, float *end, float *forward, float *right, int iBulletType, int iTracerFreq, int *tracerCount )
+{
+	int tracer = 0;
+	int i;
+	qboolean player = idx >= 1 && idx <= gEngfuncs.GetMaxClients() ? true : false;
+
+	if ( iTracerFreq != 0 && ( (*tracerCount)++ % iTracerFreq) == 0 )
+	{
+		vec3_t vecTracerSrc;
+
+		if ( player )
+		{
+			vec3_t offset( 0, 0, -4 );
+
+			// adjust tracer position for player
+			for ( i = 0; i < 3; i++ )
+			{
+				vecTracerSrc[ i ] = vecSrc[ i ] + offset[ i ] + right[ i ] * 2 + forward[ i ] * 16;
+			}
+		}
+		else
+		{
+			VectorCopy( vecSrc, vecTracerSrc );
+		}
+		
+		if ( iTracerFreq != 1 )		// guns that always trace also always decal
+			tracer = 1;
+
+		switch( iBulletType )
+		{
+		case BULLET_PLAYER_MP5:
+		case BULLET_MONSTER_MP5:
+		case BULLET_MONSTER_9MM:
+		case BULLET_MONSTER_12MM:
+		default:
+			EV_CreateTracer( vecTracerSrc, end );
+			break;
+		}
+	}
+
+	return tracer;
+}
+
+
+/*
+================
+FireBullets
+
+Go to the trouble of combining multiple pellets into a single damage call.
+================
+*/
+//void EV_HLDM_FireBullets( int idx, float *forward, float *right, float *up, int cShots, float *vecSrc, float *vecDirShooting, float flDistance, int iBulletType, int iTracerFreq, int *tracerCount, float flSpreadX, float flSpreadY )
+//{
+//	int i;
+//	int iShot;
+//	int tracer;
+//
+//	// Store off the old count
+//	gEngfuncs.pEventAPI->EV_PushPMStates();
+//
+//	gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction(false, true);
+//	
+//	// Now add in all of the players.
+//	gEngfuncs.pEventAPI->EV_SetSolidPlayers ( idx - 1 );	
+//	
+//	gEngfuncs.pEventAPI->EV_SetTraceHull( 2 );
+//	
+//	for ( iShot = 1; iShot <= cShots; iShot++ )	
+//	{
+//		vec3_t vecDir, vecEnd;
+//		
+//		float x, y, z;
+//		//We randomize for the Shotgun.
+//		if ( iBulletType == BULLET_PLAYER_BUCKSHOT )
+//		{
+//			do {
+//				x = gEngfuncs.pfnRandomFloat(-0.5,0.5) + gEngfuncs.pfnRandomFloat(-0.5,0.5);
+//				y = gEngfuncs.pfnRandomFloat(-0.5,0.5) + gEngfuncs.pfnRandomFloat(-0.5,0.5);
+//				z = x*x+y*y;
+//			} while (z > 1);
+//			
+//			for ( i = 0 ; i < 3; i++ )
+//			{
+//				vecDir[i] = vecDirShooting[i] + x * flSpreadX * right[ i ] + y * flSpreadY * up [ i ];
+//				vecEnd[i] = vecSrc[ i ] + flDistance * vecDir[ i ];
+//			}
+//		}//But other guns already have their spread randomized in the synched spread.
+//		else
+//		{
+//			
+//			for ( i = 0 ; i < 3; i++ )
+//			{
+//				vecDir[i] = vecDirShooting[i] + flSpreadX * right[ i ] + flSpreadY * up [ i ];
+//				vecEnd[i] = vecSrc[ i ] + flDistance * vecDir[ i ];
+//			}
+//		}
+//
+//		// For debugging
+//		//gEngfuncs.pEfxAPI->R_TracerEffect(vecSrc, vecEnd);
+//		
+//		pmtrace_t tr;
+//		gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecEnd, PM_STUDIO_BOX, -1, &tr );
+//
+//		//gEngfuncs.pEfxAPI->R_BulletImpactParticles(tr.endpos);
+//		
+//		tracer = EV_HLDM_CheckTracer( idx, vecSrc, tr.endpos, forward, right, iBulletType, iTracerFreq, tracerCount );
+//		
+//		physent_t *pe = gEngfuncs.pEventAPI->EV_GetPhysent( tr.ent );
+//		bool thePlayBulletHitEffect = /*true;//*/!tr.inwater && pe && !pe->player;
+//		
+//		// do damage, paint decals
+//		if ( tr.fraction != 1.0 )
+//		{
+//			switch(iBulletType)
+//			{
+//			default:
+//			case BULLET_PLAYER_9MM:		
+//				
+//				//EV_HLDM_PlayTextureSound( idx, &tr, vecSrc, vecEnd, iBulletType );
+//				EV_HLDM_DecalGunshot( &tr, iBulletType );
+//			
+//					break;
+//			case BULLET_PLAYER_MP5:		
+//				
+//				if ( !tracer )
+//				{
+//					//EV_HLDM_PlayTextureSound( idx, &tr, vecSrc, vecEnd, iBulletType );
+//					EV_HLDM_DecalGunshot( &tr, iBulletType );
+//
+//					// Only play weapon effects if we hit the
+//					if(thePlayBulletHitEffect)
+//					{
+//						//int theSprite = gEngfuncs.pEventAPI->EV_FindModelIndex(kGenericWallpuff);
+//						//TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->R_TempSprite(tr.endpos, vec3_origin, .6f, theSprite, kRenderGlow, kRenderFxNoDissipation, .5, 1.0, FTENT_COLLIDEALL | FTENT_SPRANIMATE | FTENT_SPRANIMATELOOP | FTENT_PERSIST);
+//						//theTempEntity->entity.curstate.framerate = 30;
+//
+//						gEngfuncs.pEfxAPI->R_SparkEffect(tr.endpos, 6, 10, 100);
+//					}
+//				}
+//				break;
+//			case BULLET_PLAYER_BUCKSHOT:
+//				if ( !tracer )
+//				{
+//					EV_HLDM_DecalGunshot( &tr, iBulletType );
+//
+//					// Add cool shotgun effect here
+//					//gEngfuncs.pEfxAPI->R_RocketTrail(vecSrc, tr.endpos, 1);
+//					gEngfuncs.pEfxAPI->R_BulletImpactParticles(tr.endpos);
+//
+//					//if(thePlayBulletHitEffect)
+//					//{
+//					//	int theSprite = gEngfuncs.pEventAPI->EV_FindModelIndex(kGenericWallpuff);
+//					//	TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->R_TempSprite(tr.endpos, vec3_origin, 1.0f, theSprite, kRenderGlow, kRenderFxNoDissipation, .5, 1.0, FTENT_COLLIDEALL | FTENT_SPRANIMATE | FTENT_SPRANIMATELOOP | FTENT_PERSIST);
+//					//	theTempEntity->entity.curstate.framerate = 30;
+//					//}
+//
+//					gEngfuncs.pEfxAPI->R_SparkEffect(tr.endpos, 5, 100, 200);
+//				}
+//				break;
+//			case BULLET_PLAYER_357:
+//				if ( !tracer )
+//				{
+//					//EV_HLDM_PlayTextureSound( idx, &tr, vecSrc, vecEnd, iBulletType );
+//					EV_HLDM_DecalGunshot( &tr, iBulletType );
+//
+//					if(thePlayBulletHitEffect)
+//					{
+//						// Make the smoke stick out of the target or wall just a little bit to avoid crappy sprite-in-wall effect
+//						Vector theEndPos = tr.endpos - 20*vecDir;
+//						int theSprite = gEngfuncs.pEventAPI->EV_FindModelIndex(kGenericWallpuff);
+//						Vector theUp(0, 0, 30);
+//						TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->R_TempSprite(theEndPos, theUp, .3f, theSprite, kRenderTransAdd, kRenderFxFadeSlow, .3, 0.6, FTENT_COLLIDEALL | FTENT_SPRANIMATE | FTENT_SPRANIMATELOOP | FTENT_PERSIST);
+//						if(theTempEntity)
+//						{
+//							theTempEntity->entity.curstate.framerate = 50;
+//						}
+//					
+//						//// Create rising area of smoke above gun wielder
+//						//if(gEngfuncs.pfnRandomLong(0, 3) == 0)
+//						//{
+//						//	vec3_t theSource;
+//						//	VectorCopy(vecSrc, theSource);
+//						//	theSource.z += 60;
+//						//	theSource.z += 60;
+//						//	
+//						//	theTempEntity = gEngfuncs.pEfxAPI->R_TempSprite(vecSrc, vec3_origin, 1.0f, theSprite, kRenderGlow, kRenderFxNoDissipation, .3, 3.0, FTENT_COLLIDEALL | FTENT_SPRANIMATE | FTENT_SPRANIMATELOOP | FTENT_PERSIST);
+//						//	theTempEntity->entity.curstate.framerate = 30;
+//						//}
+//						
+//						// TODO: Add more here like splinters of wall and plaster
+//						gEngfuncs.pEfxAPI->R_SparkEffect(tr.endpos, 12, 100, 200);
+//					}
+//				}
+//				break;
+//			case BULLET_MONSTER_9MM:		
+//				break;
+//			}
+//		}
+//	}
+//
+//	gEngfuncs.pEventAPI->EV_PopPMStates();
+//}
+
+/*
+================
+EV_HLDM_FireBulletsPlayer
+
+Client-side prediction friendly version of EV_HLDM_FireBullets
+================
+*/
+void EV_HLDM_FireBulletsPlayer( int idx, float *forward, float *right, float *up, int cShots, float *vecSrc, float *vecDirShooting, float flDistance, int iBulletType, int iTracerFreq, int *tracerCount, Vector& inSpread, int inRandomSeed)
+{
+//	int i;
+	int iShot;
+	int tracer;
+
+	// Store off the old count
+	gEngfuncs.pEventAPI->EV_PushPMStates();
+
+	gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction(false, true);
+	
+	// Now add in all of the players.
+	gEngfuncs.pEventAPI->EV_SetSolidPlayers ( idx - 1 );	
+	
+	gEngfuncs.pEventAPI->EV_SetTraceHull( 2 );
+	
+	for ( iShot = 1; iShot <= cShots; iShot++ )	
+	{
+		vec3_t vecDir, vecEnd;
+		
+//		float x, y, z;
+//		//We randomize for the Shotgun.
+//		if ( iBulletType == BULLET_PLAYER_BUCKSHOT )
+//		{
+//			do {
+//				x = gEngfuncs.pfnRandomFloat(-0.5,0.5) + gEngfuncs.pfnRandomFloat(-0.5,0.5);
+//				y = gEngfuncs.pfnRandomFloat(-0.5,0.5) + gEngfuncs.pfnRandomFloat(-0.5,0.5);
+//				z = x*x+y*y;
+//			} while (z > 1);
+//			
+//			for ( i = 0 ; i < 3; i++ )
+//			{
+//				vecDir[i] = vecDirShooting[i] + x * flSpreadX * right[ i ] + y * flSpreadY * up [ i ];
+//				vecEnd[i] = vecSrc[ i ] + flDistance * vecDir[ i ];
+//			}
+//		}//But other guns already have their spread randomized in the synched spread.
+//		else
+//		{
+						
+			//for ( i = 0 ; i < 3; i++ )
+			//{
+			//	vecDir[i] = vecDirShooting[i] + flSpreadX * right[ i ] + flSpreadY * up [ i ];
+			//	vecEnd[i] = vecSrc[ i ] + flDistance * vecDir[ i ];
+			//}
+			vecDir = UTIL_GetRandomSpreadDir(inRandomSeed, iShot, vecDirShooting, right, up, inSpread);
+			VectorMA(vecSrc, flDistance, vecDir, vecEnd);
+			//vecEnd = vecSrc + flDistance*vecDir;
+//		}
+
+		// For debugging
+		//gEngfuncs.pEfxAPI->R_TracerEffect(vecSrc, vecEnd);
+		
+		pmtrace_t tr;
+		gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecEnd, PM_STUDIO_BOX, -1, &tr );
+
+		//gEngfuncs.pEfxAPI->R_BulletImpactParticles(tr.endpos);
+		
+		tracer = EV_HLDM_CheckTracer( idx, vecSrc, tr.endpos, forward, right, iBulletType, iTracerFreq, tracerCount );
+		
+		physent_t *pe = gEngfuncs.pEventAPI->EV_GetPhysent( tr.ent );
+		bool thePlayBulletHitEffect = /*true;//*/!tr.inwater && pe && !pe->player;
+		int theSoundProbability = 2;
+		
+		// do damage, paint decals
+		if ( tr.fraction != 1.0 )
+		{
+			switch(iBulletType)
+			{
+			default:
+			case BULLET_PLAYER_9MM:		
+				EV_HLDM_PlayTextureSound( idx, &tr, vecSrc, vecEnd, iBulletType, theSoundProbability);
+				EV_HLDM_DecalGunshot( &tr, iBulletType, theSoundProbability);
+				break;
+
+			case BULLET_PLAYER_MP5:		
+				
+				if ( !tracer )
+				{
+					EV_HLDM_PlayTextureSound( idx, &tr, vecSrc, vecEnd, iBulletType, theSoundProbability);
+
+					theSoundProbability = 8;
+					EV_HLDM_DecalGunshot( &tr, iBulletType, theSoundProbability);
+
+					// Only play weapon effects if we hit the
+					if(thePlayBulletHitEffect)
+					{
+						// Make the smoke stick out of the target or wall just a little bit to avoid crappy sprite-in-wall effect
+						Vector theEndPos = tr.endpos - 20*vecDir;
+						int theSprite = gEngfuncs.pEventAPI->EV_FindModelIndex(kGenericWallpuff);
+						Vector theUp(0, 0, 30);
+						TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->R_TempSprite(theEndPos, theUp, .3f, theSprite, kRenderTransAdd, kRenderFxFadeSlow, .1, 0.6, FTENT_COLLIDEALL | FTENT_SPRANIMATE | FTENT_SPRANIMATELOOP | FTENT_PERSIST);
+						if(theTempEntity)
+						{
+							theTempEntity->entity.curstate.framerate = 50;
+						}
+
+						gEngfuncs.pEfxAPI->R_SparkEffect(tr.endpos, 6, 10, 100);
+					}
+				}
+				break;
+			case BULLET_PLAYER_BUCKSHOT:
+				if ( !tracer )
+				{
+					theSoundProbability = BALANCE_IVAR(kSGBulletsPerShot)/2;
+					EV_HLDM_PlayTextureSound( idx, &tr, vecSrc, vecEnd, iBulletType, theSoundProbability);
+
+					theSoundProbability = BALANCE_IVAR(kSGBulletsPerShot)/2;
+					EV_HLDM_DecalGunshot( &tr, iBulletType, theSoundProbability);
+
+                    if(thePlayBulletHitEffect)
+                    {
+					    // Add cool shotgun effect here
+					    //gEngfuncs.pEfxAPI->R_RocketTrail(vecSrc, tr.endpos, 1);
+					    gEngfuncs.pEfxAPI->R_BulletImpactParticles(tr.endpos);
+
+					    //if(thePlayBulletHitEffect)
+					    //{
+					    //	int theSprite = gEngfuncs.pEventAPI->EV_FindModelIndex(kGenericWallpuff);
+					    //	TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->R_TempSprite(tr.endpos, vec3_origin, 1.0f, theSprite, kRenderGlow, kRenderFxNoDissipation, .5, 1.0, FTENT_COLLIDEALL | FTENT_SPRANIMATE | FTENT_SPRANIMATELOOP | FTENT_PERSIST);
+					    //	theTempEntity->entity.curstate.framerate = 30;
+					    //}
+
+					    gEngfuncs.pEfxAPI->R_SparkEffect(tr.endpos, 5, 100, 200);
+                    }
+				}
+				break;
+			case BULLET_PLAYER_357:
+				if ( !tracer )
+				{
+					theSoundProbability = 1;
+					EV_HLDM_PlayTextureSound( idx, &tr, vecSrc, vecEnd, iBulletType, theSoundProbability);
+					EV_HLDM_DecalGunshot( &tr, iBulletType, theSoundProbability);
+
+					if(thePlayBulletHitEffect)
+					{
+						// Make the smoke stick out of the target or wall just a little bit to avoid crappy sprite-in-wall effect
+						Vector theEndPos = tr.endpos - 20*vecDir;
+						int theSprite = gEngfuncs.pEventAPI->EV_FindModelIndex(kGenericWallpuff);
+						Vector theUp(0, 0, 30);
+						TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->R_TempSprite(theEndPos, theUp, .3f, theSprite, kRenderTransAdd, kRenderFxFadeSlow, .15, 0.6, FTENT_COLLIDEALL | FTENT_SPRANIMATE | FTENT_SPRANIMATELOOP | FTENT_PERSIST);
+						if(theTempEntity)
+						{
+							theTempEntity->entity.curstate.framerate = 50;
+						}
+					
+						//// Create rising area of smoke above gun wielder
+						//if(gEngfuncs.pfnRandomLong(0, 3) == 0)
+						//{
+						//	vec3_t theSource;
+						//	VectorCopy(vecSrc, theSource);
+						//	theSource.z += 60;
+						//	theSource.z += 60;
+						//	
+						//	theTempEntity = gEngfuncs.pEfxAPI->R_TempSprite(vecSrc, vec3_origin, 1.0f, theSprite, kRenderGlow, kRenderFxNoDissipation, .3, 3.0, FTENT_COLLIDEALL | FTENT_SPRANIMATE | FTENT_SPRANIMATELOOP | FTENT_PERSIST);
+						//	theTempEntity->entity.curstate.framerate = 30;
+						//}
+						
+						// TODO: Add more here like splinters of wall and plaster
+						gEngfuncs.pEfxAPI->R_SparkEffect(tr.endpos, 12, 100, 200);
+					}
+				}
+				break;
+			case BULLET_MONSTER_9MM:		
+				if(!tracer)
+				{
+					EV_HLDM_PlayTextureSound( idx, &tr, vecSrc, vecEnd, iBulletType, theSoundProbability);
+					//EV_HLDM_DecalGunshot( &tr, iBulletType, theSoundProbability);
+					
+					// Only play weapon effects if we hit the
+					if(thePlayBulletHitEffect)
+					{
+						int theSprite = gEngfuncs.pEventAPI->EV_FindModelIndex(kSpikeGunHitSprite);
+						TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->R_TempSprite(tr.endpos, vec3_origin, .6f, theSprite, kRenderTransAdd, kRenderFxNoDissipation, .5f, .4f, FTENT_COLLIDEALL | FTENT_SPRANIMATE | FTENT_SPRANIMATELOOP | FTENT_PERSIST);
+						if(theTempEntity)
+						{
+							theTempEntity->entity.curstate.framerate = 30;
+						}
+					}
+				}
+				break;
+			}
+		}
+	}
+
+	gEngfuncs.pEventAPI->EV_PopPMStates();
+}
+
+
+
+//======================
+//	    GLOCK START
+//======================
+//void EV_FireGlock1( event_args_t *args )
+//{
+//	int idx;
+//	vec3_t origin;
+//	vec3_t angles;
+//	vec3_t velocity;
+//	int empty;
+//
+//	vec3_t ShellVelocity;
+//	vec3_t ShellOrigin;
+//	int shell;
+//	vec3_t vecSrc, vecAiming;
+//	vec3_t up, right, forward;
+//	
+//	idx = args->entindex;
+//	VectorCopy( args->origin, origin );
+//	VectorCopy( args->angles, angles );
+//	VectorCopy( args->velocity, velocity );
+//
+//	empty = args->bparam1;
+//	AngleVectors( angles, forward, right, up );
+//
+//	shell = gEngfuncs.pEventAPI->EV_FindModelIndex ("models/shell.mdl");// brass shell
+//
+//	if ( EV_IsLocal( idx ) )
+//	{
+//		EV_MuzzleFlash();
+//		gEngfuncs.pEventAPI->EV_WeaponAnimation( empty ? GLOCK_SHOOT_EMPTY : GLOCK_SHOOT, 2 );
+//
+//		V_PunchAxis( 0, -2.0 );
+//	}
+//
+//	EV_GetDefaultShellInfo( args, origin, velocity, ShellVelocity, ShellOrigin, forward, right, up, 20, -12, 4 );
+//
+//	EV_EjectBrass ( ShellOrigin, ShellVelocity, angles[ YAW ], shell, TE_BOUNCE_SHELL ); 
+//
+//	gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/pl_gun3.wav", gEngfuncs.pfnRandomFloat(0.92, 1.0), ATTN_NORM, 0, 98 + gEngfuncs.pfnRandomLong( 0, 3 ) );
+//
+//	EV_GetGunPosition( args, vecSrc, origin );
+//	
+//	VectorCopy( forward, vecAiming );
+//
+//	EV_HLDM_FireBullets( idx, forward, right, up, 1, vecSrc, vecAiming, 8192, BULLET_PLAYER_9MM, 0, 0, args->fparam1, args->fparam2);
+//}
+
+//void EV_FireGlock2( event_args_t *args )
+//{
+//	int idx;
+//	vec3_t origin;
+//	vec3_t angles;
+//	vec3_t velocity;
+//	
+//	vec3_t ShellVelocity;
+//	vec3_t ShellOrigin;
+//	int shell;
+//	vec3_t vecSrc, vecAiming;
+//	vec3_t vecSpread;
+//	vec3_t up, right, forward;
+//
+//	idx = args->entindex;
+//	VectorCopy( args->origin, origin );
+//	VectorCopy( args->angles, angles );
+//	VectorCopy( args->velocity, velocity );
+//
+//	AngleVectors( angles, forward, right, up );
+//
+//	shell = gEngfuncs.pEventAPI->EV_FindModelIndex ("models/shell.mdl");// brass shell
+//
+//	if ( EV_IsLocal( idx ) )
+//	{
+//		// Add muzzle flash to current weapon model
+//		EV_MuzzleFlash();
+//		gEngfuncs.pEventAPI->EV_WeaponAnimation( GLOCK_SHOOT, 2 );
+//
+//		V_PunchAxis( 0, -2.0 );
+//	}
+//
+//	EV_GetDefaultShellInfo( args, origin, velocity, ShellVelocity, ShellOrigin, forward, right, up, 20, -12, 4 );
+//
+//	EV_EjectBrass ( ShellOrigin, ShellVelocity, angles[ YAW ], shell, TE_BOUNCE_SHELL ); 
+//
+//	gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/pl_gun3.wav", gEngfuncs.pfnRandomFloat(0.92, 1.0), ATTN_NORM, 0, 98 + gEngfuncs.pfnRandomLong( 0, 3 ) );
+//
+//	EV_GetGunPosition( args, vecSrc, origin );
+//	
+//	VectorCopy( forward, vecAiming );
+//
+//	EV_HLDM_FireBullets( idx, forward, right, up, 1, vecSrc, vecAiming, 8192, BULLET_PLAYER_9MM, 0, &tracerCount[idx-1], args->fparam1, args->fparam2 );
+//	
+//}
+//======================
+//	   GLOCK END
+//======================
+
+//======================
+//	  SHOTGUN START
+//======================
+//void EV_FireShotGunDouble( event_args_t *args )
+//{
+//	int idx;
+//	vec3_t origin;
+//	vec3_t angles;
+//	vec3_t velocity;
+//
+//	int j;
+//	vec3_t ShellVelocity;
+//	vec3_t ShellOrigin;
+//	int shell;
+//	vec3_t vecSrc, vecAiming;
+//	vec3_t vecSpread;
+//	vec3_t up, right, forward;
+//	float flSpread = 0.01;
+//
+//	idx = args->entindex;
+//	VectorCopy( args->origin, origin );
+//	VectorCopy( args->angles, angles );
+//	VectorCopy( args->velocity, velocity );
+//
+//	AngleVectors( angles, forward, right, up );
+//
+//	shell = gEngfuncs.pEventAPI->EV_FindModelIndex ("models/shotgunshell.mdl");// brass shell
+//
+//	if ( EV_IsLocal( idx ) )
+//	{
+//		// Add muzzle flash to current weapon model
+//		EV_MuzzleFlash();
+//		gEngfuncs.pEventAPI->EV_WeaponAnimation( SHOTGUN_FIRE2, 2 );
+//		V_PunchAxis( 0, -10.0 );
+//	}
+//
+//	for ( j = 0; j < 2; j++ )
+//	{
+//		EV_GetDefaultShellInfo( args, origin, velocity, ShellVelocity, ShellOrigin, forward, right, up, 32, -12, 6 );
+//
+//		EV_EjectBrass ( ShellOrigin, ShellVelocity, angles[ YAW ], shell, TE_BOUNCE_SHOTSHELL ); 
+//	}
+//
+//	gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/dbarrel1.wav", gEngfuncs.pfnRandomFloat(0.98, 1.0), ATTN_NORM, 0, 85 + gEngfuncs.pfnRandomLong( 0, 0x1f ) );
+//
+//	EV_GetGunPosition( args, vecSrc, origin );
+//	VectorCopy( forward, vecAiming );
+//
+//		if ( gEngfuncs.GetMaxClients() > 1 )
+//	{
+//		EV_HLDM_FireBullets( idx, forward, right, up, 8, vecSrc, vecAiming, 2048, BULLET_PLAYER_BUCKSHOT, 0, &tracerCount[idx-1], 0.17365, 0.04362 );
+//	}
+//	else
+//	{
+//		EV_HLDM_FireBullets( idx, forward, right, up, 12, vecSrc, vecAiming, 2048, BULLET_PLAYER_BUCKSHOT, 0, &tracerCount[idx-1], 0.08716, 0.08716 );
+//	}
+//
+//	if ( EV_IsLocal( idx ) )
+//	{
+//		V_PunchAxis( 0, -10.0 );
+//	}
+//}
+
+//void EV_FireShotGunSingle( event_args_t *args )
+//{
+//	int idx;
+//	vec3_t origin;
+//	vec3_t angles;
+//	vec3_t velocity;
+//	
+//	vec3_t ShellVelocity;
+//	vec3_t ShellOrigin;
+//	int shell;
+//	vec3_t vecSrc, vecAiming;
+//	vec3_t vecSpread;
+//	vec3_t up, right, forward;
+//	float flSpread = 0.01;
+//
+//	idx = args->entindex;
+//	VectorCopy( args->origin, origin );
+//	VectorCopy( args->angles, angles );
+//	VectorCopy( args->velocity, velocity );
+//
+//	AngleVectors( angles, forward, right, up );
+//
+//	shell = gEngfuncs.pEventAPI->EV_FindModelIndex ("models/shotgunshell.mdl");// brass shell
+//
+//	if ( EV_IsLocal( idx ) )
+//	{
+//		// Add muzzle flash to current weapon model
+//		EV_MuzzleFlash();
+//		gEngfuncs.pEventAPI->EV_WeaponAnimation( SHOTGUN_FIRE, 2 );
+//
+//		V_PunchAxis( 0, -5.0 );
+//	}
+//
+//	EV_GetDefaultShellInfo( args, origin, velocity, ShellVelocity, ShellOrigin, forward, right, up, 32, -12, 6 );
+//
+//	EV_EjectBrass ( ShellOrigin, ShellVelocity, angles[ YAW ], shell, TE_BOUNCE_SHOTSHELL ); 
+//
+//	gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/sbarrel1.wav", gEngfuncs.pfnRandomFloat(0.95, 1.0), ATTN_NORM, 0, 93 + gEngfuncs.pfnRandomLong( 0, 0x1f ) );
+//
+//	EV_GetGunPosition( args, vecSrc, origin );
+//	VectorCopy( forward, vecAiming );
+//
+//	if ( gEngfuncs.GetMaxClients() > 1 )
+//	{
+//		EV_HLDM_FireBullets( idx, forward, right, up, 4, vecSrc, vecAiming, 2048, BULLET_PLAYER_BUCKSHOT, 0, &tracerCount[idx-1], 0.08716, 0.04362 );
+//	}
+//	else
+//	{
+//		EV_HLDM_FireBullets( idx, forward, right, up, 6, vecSrc, vecAiming, 2048, BULLET_PLAYER_BUCKSHOT, 0, &tracerCount[idx-1], 0.08716, 0.08716 );
+//	}
+//}
+//======================
+//	   SHOTGUN END
+//======================
+
+//======================
+//	    MP5 START
+//======================
+//void EV_FireMP5( event_args_t *args )
+//{
+//	int idx;
+//	vec3_t origin;
+//	vec3_t angles;
+//	vec3_t velocity;
+//
+//	vec3_t ShellVelocity;
+//	vec3_t ShellOrigin;
+//	int shell;
+//	vec3_t vecSrc, vecAiming;
+//	vec3_t up, right, forward;
+//	float flSpread = 0.01;
+//
+//	idx = args->entindex;
+//	VectorCopy( args->origin, origin );
+//	VectorCopy( args->angles, angles );
+//	VectorCopy( args->velocity, velocity );
+//
+//	AngleVectors( angles, forward, right, up );
+//
+//	shell = gEngfuncs.pEventAPI->EV_FindModelIndex ("models/shell.mdl");// brass shell
+//	
+//	if ( EV_IsLocal( idx ) )
+//	{
+//		// Add muzzle flash to current weapon model
+//		EV_MuzzleFlash();
+//		gEngfuncs.pEventAPI->EV_WeaponAnimation( MG_FIRE1 + gEngfuncs.pfnRandomLong(0,2), 2 );
+//	}
+//
+//	EV_GetDefaultShellInfo( args, origin, velocity, ShellVelocity, ShellOrigin, forward, right, up, 20, -12, 4 );
+//
+//	EV_EjectBrass ( ShellOrigin, ShellVelocity, angles[ YAW ], shell, TE_BOUNCE_SHELL ); 
+//
+//	switch( gEngfuncs.pfnRandomLong( 0, 1 ) )
+//	{
+//	case 0:
+//		gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/hks1.wav", 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ) );
+//		break;
+//	case 1:
+//		gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/hks2.wav", 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ) );
+//		break;
+//	}
+//
+//	EV_GetGunPosition( args, vecSrc, origin );
+//	VectorCopy( forward, vecAiming );
+//
+//	if ( gEngfuncs.GetMaxClients() > 1 )
+//	{
+//		EV_HLDM_FireBullets( idx, forward, right, up, 1, vecSrc, vecAiming, 8192, BULLET_PLAYER_MP5, 2, &tracerCount[idx-1], args->fparam1, args->fparam2 );
+//	}
+//	else
+//	{
+//		EV_HLDM_FireBullets( idx, forward, right, up, 1, vecSrc, vecAiming, 8192, BULLET_PLAYER_MP5, 2, &tracerCount[idx-1], args->fparam1, args->fparam2 );
+//	}
+//}
+
+// We only predict the animation and sound
+// The grenade is still launched from the server.
+//void EV_FireMP52( event_args_t *args )
+//{
+//	int idx;
+//	vec3_t origin;
+//	
+//	idx = args->entindex;
+//	VectorCopy( args->origin, origin );
+//
+//	if ( EV_IsLocal( idx ) )
+//	{
+//		// NOTE: Put this back in if needed <<< cgc >>>
+//		//gEngfuncs.pEventAPI->EV_WeaponAnimation( MP5_LAUNCH, 2 );
+//		//V_PunchAxis( 0, -10 );
+//	}
+//
+//	switch( gEngfuncs.pfnRandomLong( 0, 1 ) )
+//	{
+//	case 0:
+//		gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/glauncher.wav", 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ) );
+//		break;
+//	case 1:
+//		gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/glauncher2.wav", 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ) );
+//		break;
+//	}
+//}
+//======================
+//		 MP5 END
+//======================
+
+//======================
+//	   PHYTON START 
+//	     ( .357 )
+//======================
+//void EV_FirePython( event_args_t *args )
+//{
+//	int idx;
+//	vec3_t origin;
+//	vec3_t angles;
+//	vec3_t velocity;
+//
+//	vec3_t vecSrc, vecAiming;
+//	vec3_t up, right, forward;
+//	float flSpread = 0.01;
+//
+//	idx = args->entindex;
+//	VectorCopy( args->origin, origin );
+//	VectorCopy( args->angles, angles );
+//	VectorCopy( args->velocity, velocity );
+//
+//	AngleVectors( angles, forward, right, up );
+//
+//	if ( EV_IsLocal( idx ) )
+//	{
+//		// Python uses different body in multiplayer versus single player
+//		int multiplayer = gEngfuncs.GetMaxClients() == 1 ? 0 : 1;
+//
+//		// Add muzzle flash to current weapon model
+//		EV_MuzzleFlash();
+//		gEngfuncs.pEventAPI->EV_WeaponAnimation( PYTHON_FIRE1, multiplayer ? 1 : 0 );
+//
+//		V_PunchAxis( 0, -10.0 );
+//	}
+//
+//	switch( gEngfuncs.pfnRandomLong( 0, 1 ) )
+//	{
+//	case 0:
+//		gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/357_shot1.wav", gEngfuncs.pfnRandomFloat(0.8, 0.9), ATTN_NORM, 0, PITCH_NORM );
+//		break;
+//	case 1:
+//		gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/357_shot2.wav", gEngfuncs.pfnRandomFloat(0.8, 0.9), ATTN_NORM, 0, PITCH_NORM );
+//		break;
+//	}
+//
+//	EV_GetGunPosition( args, vecSrc, origin );
+//	
+//	VectorCopy( forward, vecAiming );
+//
+//	EV_HLDM_FireBullets( idx, forward, right, up, 1, vecSrc, vecAiming, 8192, BULLET_PLAYER_357, 0, 0, args->fparam1, args->fparam2 );
+//}
+//======================
+//	    PHYTON END 
+//	     ( .357 )
+//======================
+
+//======================
+//	   GAUSS START 
+//======================
+#define SND_CHANGE_PITCH	(1<<7)		// duplicated in protocol.h change sound pitch
+
+void EV_SpinGauss( event_args_t *args )
+{
+	int idx;
+	vec3_t origin;
+	vec3_t angles;
+	vec3_t velocity;
+	int iSoundState = 0;
+
+	int pitch;
+
+	idx = args->entindex;
+	VectorCopy( args->origin, origin );
+	VectorCopy( args->angles, angles );
+	VectorCopy( args->velocity, velocity );
+
+	pitch = args->iparam1;
+
+	iSoundState = args->bparam1 ? SND_CHANGE_PITCH : 0;
+
+	gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "ambience/pulsemachine.wav", 1.0, ATTN_NORM, iSoundState, pitch );
+}
+
+/*
+==============================
+EV_StopPreviousGauss
+
+==============================
+*/
+void EV_StopPreviousGauss( int idx )
+{
+	// Make sure we don't have a gauss spin event in the queue for this guy
+	gEngfuncs.pEventAPI->EV_KillEvents( idx, "events/gaussspin.sc" );
+	gEngfuncs.pEventAPI->EV_StopSound( idx, CHAN_WEAPON, "ambience/pulsemachine.wav" );
+}
+
+void EV_FireGauss( event_args_t *args )
+{
+	int idx;
+	vec3_t origin;
+	vec3_t angles;
+	vec3_t velocity;
+	float flDamage = args->fparam1;
+	int primaryfire = args->bparam1;
+
+	int m_fPrimaryFire = args->bparam1;
+	int m_iWeaponVolume = GAUSS_PRIMARY_FIRE_VOLUME;
+	vec3_t vecSrc;
+	vec3_t vecDest;
+	edict_t		*pentIgnore;
+	pmtrace_t tr, beam_tr;
+	float flMaxFrac = 1.0;
+	int	nTotal = 0;
+	int fHasPunched = 0;
+	int fFirstBeam = 1;
+	int	nMaxHits = 10;
+	physent_t *pEntity;
+	int m_iBeam, m_iGlow, m_iBalls;
+	vec3_t up, right, forward;
+
+	idx = args->entindex;
+	VectorCopy( args->origin, origin );
+	VectorCopy( args->angles, angles );
+	VectorCopy( args->velocity, velocity );
+
+	if ( args->bparam2 )
+	{
+		EV_StopPreviousGauss( idx );
+		return;
+	}
+
+//	Con_Printf( "Firing gauss with %f\n", flDamage );
+	EV_GetGunPosition( args, vecSrc, origin );
+
+	m_iBeam = gEngfuncs.pEventAPI->EV_FindModelIndex( "sprites/smoke.spr" );
+	m_iBalls = m_iGlow = gEngfuncs.pEventAPI->EV_FindModelIndex( "sprites/hotglow.spr" );
+	
+	AngleVectors( angles, forward, right, up );
+
+	VectorMA( vecSrc, 8192, forward, vecDest );
+
+	if ( EV_IsLocal( idx ) )
+	{
+		V_PunchAxis( 0, -2.0 );
+		gEngfuncs.pEventAPI->EV_WeaponAnimation( GAUSS_FIRE2, 2 );
+	}
+
+	gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/gauss2.wav", 0.5 + flDamage * (1.0 / 400.0), ATTN_NORM, 0, 85 + gEngfuncs.pfnRandomLong( 0, 0x1f ) );
+
+	while (flDamage > 10 && nMaxHits > 0)
+	{
+		nMaxHits--;
+
+		gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction( false, true );
+		
+		// Store off the old count
+		gEngfuncs.pEventAPI->EV_PushPMStates();
+	
+		// Now add in all of the players.
+		gEngfuncs.pEventAPI->EV_SetSolidPlayers ( idx - 1 );	
+
+		gEngfuncs.pEventAPI->EV_SetTraceHull( 2 );
+		gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecDest, PM_STUDIO_BOX, -1, &tr );
+
+		gEngfuncs.pEventAPI->EV_PopPMStates();
+
+		if ( tr.allsolid )
+			break;
+
+		if (fFirstBeam)
+		{
+			if ( EV_IsLocal( idx ) )
+			{
+				// Add muzzle flash to current weapon model
+				EV_MuzzleFlash();
+			}
+			fFirstBeam = 0;
+
+			gEngfuncs.pEfxAPI->R_BeamEntPoint( 
+				idx | 0x1000,
+				tr.endpos,
+				m_iBeam,
+				0.1,
+				m_fPrimaryFire ? 1.0 : 2.5,
+				0.0,
+				m_fPrimaryFire ? 128.0 : flDamage,
+				0,
+				0,
+				0,
+				m_fPrimaryFire ? 255 : 255,
+				m_fPrimaryFire ? 128 : 255,
+				m_fPrimaryFire ? 0 : 255
+			);
+		}
+		else
+		{
+			gEngfuncs.pEfxAPI->R_BeamPoints( vecSrc,
+				tr.endpos,
+				m_iBeam,
+				0.1,
+				m_fPrimaryFire ? 1.0 : 2.5,
+				0.0,
+				m_fPrimaryFire ? 128.0 : flDamage,
+				0,
+				0,
+				0,
+				m_fPrimaryFire ? 255 : 255,
+				m_fPrimaryFire ? 128 : 255,
+				m_fPrimaryFire ? 0 : 255
+			);
+		}
+
+		pEntity = gEngfuncs.pEventAPI->EV_GetPhysent( tr.ent );
+		if ( pEntity == NULL )
+			break;
+
+		if ( pEntity->solid == SOLID_BSP )
+		{
+			float n;
+
+			pentIgnore = NULL;
+
+			n = -DotProduct( tr.plane.normal, forward );
+
+			if (n < 0.5) // 60 degrees	
+			{
+				// ALERT( at_console, "reflect %f\n", n );
+				// reflect
+				vec3_t r;
+			
+				VectorMA( forward, 2.0 * n, tr.plane.normal, r );
+
+				flMaxFrac = flMaxFrac - tr.fraction;
+				
+				VectorCopy( r, forward );
+
+				VectorMA( tr.endpos, 8.0, forward, vecSrc );
+				VectorMA( vecSrc, 8192.0, forward, vecDest );
+
+				gEngfuncs.pEfxAPI->R_TempSprite( tr.endpos, vec3_origin, 0.2, m_iGlow, kRenderGlow, kRenderFxNoDissipation, flDamage * n / 255.0, flDamage * n * 0.5 * 0.1, FTENT_FADEOUT );
+				
+				vec3_t fwd;
+				VectorAdd( tr.endpos, tr.plane.normal, fwd );
+
+				gEngfuncs.pEfxAPI->R_Sprite_Trail( TE_SPRITETRAIL, tr.endpos, fwd, m_iBalls, 3, 0.1, gEngfuncs.pfnRandomFloat( 10, 20 ) / 100.0, 100,
+									255, 100 );
+	
+				// lose energy
+				if ( n == 0 )
+				{
+					n = 0.1;
+				}
+				
+				flDamage = flDamage * (1 - n);
+
+			}
+			else
+			{
+				// tunnel
+				EV_HLDM_DecalGunshot( &tr, BULLET_MONSTER_12MM );
+
+				gEngfuncs.pEfxAPI->R_TempSprite( tr.endpos, vec3_origin, 1.0, m_iGlow, kRenderGlow, kRenderFxNoDissipation, flDamage / 255.0, 6.0, FTENT_FADEOUT );
+
+				// limit it to one hole punch
+				if (fHasPunched)
+				{
+					break;
+				}
+				fHasPunched = 1;
+				
+				// try punching through wall if secondary attack (primary is incapable of breaking through)
+				if ( !m_fPrimaryFire )
+				{
+					vec3_t start;
+
+					VectorMA( tr.endpos, 8.0, forward, start );
+
+					// Store off the old count
+					gEngfuncs.pEventAPI->EV_PushPMStates();
+						
+					// Now add in all of the players.
+					gEngfuncs.pEventAPI->EV_SetSolidPlayers ( idx - 1 );
+
+					gEngfuncs.pEventAPI->EV_SetTraceHull( 2 );
+					gEngfuncs.pEventAPI->EV_PlayerTrace( start, vecDest, PM_STUDIO_BOX, -1, &beam_tr );
+
+					if ( !beam_tr.allsolid )
+					{
+						vec3_t delta;
+						float n;
+
+						// trace backwards to find exit point
+
+						gEngfuncs.pEventAPI->EV_PlayerTrace( beam_tr.endpos, tr.endpos, PM_STUDIO_BOX, -1, &beam_tr );
+
+						VectorSubtract( beam_tr.endpos, tr.endpos, delta );
+						
+						n = Length( delta );
+
+						if (n < flDamage)
+						{
+							if (n == 0)
+								n = 1;
+							flDamage -= n;
+
+							// absorption balls
+							{
+								vec3_t fwd;
+								VectorSubtract( tr.endpos, forward, fwd );
+								gEngfuncs.pEfxAPI->R_Sprite_Trail( TE_SPRITETRAIL, tr.endpos, fwd, m_iBalls, 3, 0.1, gEngfuncs.pfnRandomFloat( 10, 20 ) / 100.0, 100,
+									255, 100 );
+							}
+
+	//////////////////////////////////// WHAT TO DO HERE
+							// CSoundEnt::InsertSound ( bits_SOUND_COMBAT, pev->origin, NORMAL_EXPLOSION_VOLUME, 3.0 );
+
+							EV_HLDM_DecalGunshot( &beam_tr, BULLET_MONSTER_12MM );
+							
+							gEngfuncs.pEfxAPI->R_TempSprite( beam_tr.endpos, vec3_origin, 0.1, m_iGlow, kRenderGlow, kRenderFxNoDissipation, flDamage / 255.0, 6.0, FTENT_FADEOUT );
+			
+							// balls
+							{
+								vec3_t fwd;
+								VectorSubtract( beam_tr.endpos, forward, fwd );
+								gEngfuncs.pEfxAPI->R_Sprite_Trail( TE_SPRITETRAIL, beam_tr.endpos, fwd, m_iBalls, (int)(flDamage * 0.3), 0.1, gEngfuncs.pfnRandomFloat( 10, 20 ) / 100.0, 200,
+									255, 40 );
+							}
+							
+							VectorAdd( beam_tr.endpos, forward, vecSrc );
+						}
+					}
+					else
+					{
+						flDamage = 0;
+					}
+
+					gEngfuncs.pEventAPI->EV_PopPMStates();
+				}
+				else
+				{
+					if ( m_fPrimaryFire )
+					{
+						// slug doesn't punch through ever with primary 
+						// fire, so leave a little glowy bit and make some balls
+						gEngfuncs.pEfxAPI->R_TempSprite( tr.endpos, vec3_origin, 0.2, m_iGlow, kRenderGlow, kRenderFxNoDissipation, 200.0 / 255.0, 0.3, FTENT_FADEOUT );
+			
+						{
+							vec3_t fwd;
+							VectorAdd( tr.endpos, tr.plane.normal, fwd );
+							gEngfuncs.pEfxAPI->R_Sprite_Trail( TE_SPRITETRAIL, tr.endpos, fwd, m_iBalls, 8, 0.6, gEngfuncs.pfnRandomFloat( 10, 20 ) / 100.0, 100,
+								255, 200 );
+						}
+					}
+
+					flDamage = 0;
+				}
+			}
+		}
+		else
+		{
+			VectorAdd( tr.endpos, forward, vecSrc );
+		}
+	}
+}
+//======================
+//	   GAUSS END 
+//======================
+
+//======================
+//	   CROWBAR START
+//======================
+
+enum crowbar_e {
+	CROWBAR_IDLE = 0,
+	CROWBAR_DRAW,
+	CROWBAR_HOLSTER,
+	CROWBAR_ATTACK1HIT,
+	CROWBAR_ATTACK1MISS,
+	CROWBAR_ATTACK2MISS,
+	CROWBAR_ATTACK2HIT,
+	CROWBAR_ATTACK3MISS,
+	CROWBAR_ATTACK3HIT
+};
+
+int g_iSwing;
+
+//Only predict the miss sounds, hit sounds are still played 
+//server side, so players don't get the wrong idea.
+void EV_Crowbar( event_args_t *args )
+{
+	int idx;
+	vec3_t origin;
+	vec3_t angles;
+	vec3_t velocity;
+
+	idx = args->entindex;
+	VectorCopy( args->origin, origin );
+	
+	//Play Swing sound
+	gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/cbar_miss1.wav", 1, ATTN_NORM, 0, PITCH_NORM); 
+
+	if ( EV_IsLocal( idx ) )
+	{
+		gEngfuncs.pEventAPI->EV_WeaponAnimation( CROWBAR_ATTACK1MISS, 1 );
+
+		switch( (g_iSwing++) % 3 )
+		{
+			case 0:
+				gEngfuncs.pEventAPI->EV_WeaponAnimation ( CROWBAR_ATTACK1MISS, 1 ); break;
+			case 1:
+				gEngfuncs.pEventAPI->EV_WeaponAnimation ( CROWBAR_ATTACK2MISS, 1 ); break;
+			case 2:
+				gEngfuncs.pEventAPI->EV_WeaponAnimation ( CROWBAR_ATTACK3MISS, 1 ); break;
+		}
+	}
+}
+//======================
+//	   CROWBAR END 
+//======================
+
+//======================
+//	  CROSSBOW END 
+//======================
+enum crossbow_e {
+	CROSSBOW_IDLE1 = 0,	// full
+	CROSSBOW_IDLE2,		// empty
+	CROSSBOW_FIDGET1,	// full
+	CROSSBOW_FIDGET2,	// empty
+	CROSSBOW_FIRE1,		// full
+	CROSSBOW_FIRE2,		// reload
+	CROSSBOW_FIRE3,		// empty
+	CROSSBOW_RELOAD,	// from empty
+	CROSSBOW_DRAW1,		// full
+	CROSSBOW_DRAW2,		// empty
+	CROSSBOW_HOLSTER1,	// full
+	CROSSBOW_HOLSTER2,	// empty
+};
+
+//=====================
+// EV_BoltCallback
+// This function is used to correct the origin and angles 
+// of the bolt, so it looks like it's stuck on the wall.
+//=====================
+void EV_BoltCallback ( struct tempent_s *ent, float frametime, float currenttime )
+{
+	ent->entity.origin = ent->entity.baseline.vuser1;
+	ent->entity.angles = ent->entity.baseline.vuser2;
+}
+
+void EV_FireCrossbow2( event_args_t *args )
+{
+	vec3_t vecSrc, vecEnd;
+	vec3_t up, right, forward;
+	pmtrace_t tr;
+
+	int idx;
+	vec3_t origin;
+	vec3_t angles;
+	vec3_t velocity;
+
+	idx = args->entindex;
+	VectorCopy( args->origin, origin );
+	VectorCopy( args->angles, angles );
+
+	VectorCopy( args->velocity, velocity );
+	
+	AngleVectors( angles, forward, right, up );
+
+	EV_GetGunPosition( args, vecSrc, origin );
+
+	VectorMA( vecSrc, 8192, forward, vecEnd );
+
+	gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/xbow_fire1.wav", 1, ATTN_NORM, 0, 93 + gEngfuncs.pfnRandomLong(0,0xF) );
+	gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_ITEM, "weapons/xbow_reload1.wav", gEngfuncs.pfnRandomFloat(0.95, 1.0), ATTN_NORM, 0, 93 + gEngfuncs.pfnRandomLong(0,0xF) );
+
+	if ( EV_IsLocal( idx ) )
+	{
+		if ( args->iparam1 )
+			gEngfuncs.pEventAPI->EV_WeaponAnimation( CROSSBOW_FIRE1, 1 );
+		else if ( args->iparam2 )
+			gEngfuncs.pEventAPI->EV_WeaponAnimation( CROSSBOW_FIRE3, 1 );
+	}
+
+	// Store off the old count
+	gEngfuncs.pEventAPI->EV_PushPMStates();
+
+	// Now add in all of the players.
+	gEngfuncs.pEventAPI->EV_SetSolidPlayers ( idx - 1 );	
+	gEngfuncs.pEventAPI->EV_SetTraceHull( 2 );
+	gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecEnd, PM_STUDIO_BOX, -1, &tr );
+	
+	//We hit something
+	if ( tr.fraction < 1.0 )
+	{
+		physent_t *pe = gEngfuncs.pEventAPI->EV_GetPhysent( tr.ent ); 
+
+		//Not the world, let's assume we hit something organic ( dog, cat, uncle joe, etc ).
+		if ( pe->solid != SOLID_BSP )
+		{
+			switch( gEngfuncs.pfnRandomLong(0,1) )
+			{
+			case 0:
+				gEngfuncs.pEventAPI->EV_PlaySound( idx, tr.endpos, CHAN_BODY, "weapons/xbow_hitbod1.wav", 1, ATTN_NORM, 0, PITCH_NORM ); break;
+			case 1:
+				gEngfuncs.pEventAPI->EV_PlaySound( idx, tr.endpos, CHAN_BODY, "weapons/xbow_hitbod2.wav", 1, ATTN_NORM, 0, PITCH_NORM ); break;
+			}
+		}
+		//Stick to world but don't stick to glass, it might break and leave the bolt floating. It can still stick to other non-transparent breakables though.
+		else if ( pe->rendermode == kRenderNormal ) 
+		{
+			gEngfuncs.pEventAPI->EV_PlaySound( 0, tr.endpos, CHAN_BODY, "weapons/xbow_hit1.wav", gEngfuncs.pfnRandomFloat(0.95, 1.0), ATTN_NORM, 0, PITCH_NORM );
+		
+			//Not underwater, do some sparks...
+			if ( gEngfuncs.PM_PointContents( tr.endpos, NULL ) != CONTENTS_WATER)
+				 gEngfuncs.pEfxAPI->R_SparkShower( tr.endpos );
+
+			vec3_t vBoltAngles;
+			int iModelIndex = gEngfuncs.pEventAPI->EV_FindModelIndex( "models/crossbow_bolt.mdl" );
+
+			VectorAngles( forward, vBoltAngles );
+
+			TEMPENTITY *bolt = gEngfuncs.pEfxAPI->R_TempModel( tr.endpos - forward * 10, Vector( 0, 0, 0), vBoltAngles , 5, iModelIndex, TE_BOUNCE_NULL );
+			
+			if ( bolt )
+			{
+				bolt->flags |= ( FTENT_CLIENTCUSTOM ); //So it calls the callback function.
+				bolt->entity.baseline.vuser1 = tr.endpos - forward * 10; // Pull out a little bit
+				bolt->entity.baseline.vuser2 = vBoltAngles; //Look forward!
+				bolt->callback = EV_BoltCallback; //So we can set the angles and origin back. (Stick the bolt to the wall)
+			}
+		}
+	}
+
+	gEngfuncs.pEventAPI->EV_PopPMStates();
+}
+
+//TODO: Fully predict the fliying bolt.
+void EV_FireCrossbow( event_args_t *args )
+{
+	int idx;
+	vec3_t origin;
+
+	idx = args->entindex;
+	VectorCopy( args->origin, origin );
+	
+	gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/xbow_fire1.wav", 1, ATTN_NORM, 0, 93 + gEngfuncs.pfnRandomLong(0,0xF) );
+	gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_ITEM, "weapons/xbow_reload1.wav", gEngfuncs.pfnRandomFloat(0.95, 1.0), ATTN_NORM, 0, 93 + gEngfuncs.pfnRandomLong(0,0xF) );
+
+	//Only play the weapon anims if I shot it. 
+	if ( EV_IsLocal( idx ) )
+	{
+		if ( args->iparam1 )
+			gEngfuncs.pEventAPI->EV_WeaponAnimation( CROSSBOW_FIRE1, 1 );
+		else if ( args->iparam2 )
+			gEngfuncs.pEventAPI->EV_WeaponAnimation( CROSSBOW_FIRE3, 1 );
+
+		V_PunchAxis( 0, -2.0 );
+	}
+}
+//======================
+//	   CROSSBOW END 
+//======================
+
+//======================
+//	    RPG START 
+//======================
+enum rpg_e {
+	RPG_IDLE = 0,
+	RPG_FIDGET,
+	RPG_RELOAD,		// to reload
+	RPG_FIRE2,		// to empty
+	RPG_HOLSTER1,	// loaded
+	RPG_DRAW1,		// loaded
+	RPG_HOLSTER2,	// unloaded
+	RPG_DRAW_UL,	// unloaded
+	RPG_IDLE_UL,	// unloaded idle
+	RPG_FIDGET_UL,	// unloaded fidget
+};
+
+void EV_FireRpg( event_args_t *args )
+{
+	int idx;
+	vec3_t origin;
+
+	idx = args->entindex;
+	VectorCopy( args->origin, origin );
+	
+	gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/rocketfire1.wav", 0.9, ATTN_NORM, 0, PITCH_NORM );
+	gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_ITEM, "weapons/glauncher.wav", 0.7, ATTN_NORM, 0, PITCH_NORM );
+
+	//Only play the weapon anims if I shot it. 
+	if ( EV_IsLocal( idx ) )
+	{
+		gEngfuncs.pEventAPI->EV_WeaponAnimation( RPG_FIRE2, 1 );
+	
+		V_PunchAxis( 0, -5.0 );
+	}
+}
+//======================
+//	     RPG END 
+//======================
+
+//======================
+//	    EGON END 
+//======================
+enum egon_e {
+	EGON_IDLE1 = 0,
+	EGON_FIDGET1,
+	EGON_ALTFIREON,
+	EGON_ALTFIRECYCLE,
+	EGON_ALTFIREOFF,
+	EGON_FIRE1,
+	EGON_FIRE2,
+	EGON_FIRE3,
+	EGON_FIRE4,
+	EGON_DRAW,
+	EGON_HOLSTER
+};
+
+int g_fireAnims1[] = { EGON_FIRE1, EGON_FIRE2, EGON_FIRE3, EGON_FIRE4 };
+int g_fireAnims2[] = { EGON_ALTFIRECYCLE };
+
+enum EGON_FIRESTATE { FIRE_OFF, FIRE_CHARGE };
+enum EGON_FIREMODE { FIRE_NARROW, FIRE_WIDE};
+
+#define	EGON_PRIMARY_VOLUME		450
+#define EGON_BEAM_SPRITE		"sprites/xbeam1.spr"
+#define EGON_FLARE_SPRITE		"sprites/XSpark1.spr"
+#define EGON_SOUND_OFF			"weapons/egon_off1.wav"
+#define EGON_SOUND_RUN			"weapons/egon_run3.wav"
+#define EGON_SOUND_STARTUP		"weapons/egon_windup2.wav"
+
+#define ARRAYSIZE(p)		(sizeof(p)/sizeof(p[0]))
+
+BEAM *pBeam;
+BEAM *pBeam2;
+
+void EV_EgonFire( event_args_t *args )
+{
+	int idx, iFireState, iFireMode;
+	vec3_t origin;
+
+	idx = args->entindex;
+	VectorCopy( args->origin, origin );
+	iFireState = args->iparam1;
+	iFireMode = args->iparam2;
+	int iStartup = args->bparam1;
+	
+
+	if ( iStartup )
+	{
+		if ( iFireMode == FIRE_WIDE )
+			gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, EGON_SOUND_STARTUP, 0.98, ATTN_NORM, 0, 125 );
+		else
+			gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, EGON_SOUND_STARTUP, 0.9, ATTN_NORM, 0, 100 );
+	}
+	else
+	{
+		if ( iFireMode == FIRE_WIDE )
+			gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_STATIC, EGON_SOUND_RUN, 0.98, ATTN_NORM, 0, 125 );
+		else
+			gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_STATIC, EGON_SOUND_RUN, 0.9, ATTN_NORM, 0, 100 );
+	}
+
+	//Only play the weapon anims if I shot it.
+	if ( EV_IsLocal( idx ) )
+		gEngfuncs.pEventAPI->EV_WeaponAnimation ( g_fireAnims1[ gEngfuncs.pfnRandomLong( 0, 3 ) ], 1 );
+
+	if ( iStartup == 1 && EV_IsLocal( idx ) && !pBeam && !pBeam2  )
+	{
+		vec3_t vecSrc, vecEnd, origin, angles, forward, right, up;
+		pmtrace_t tr;
+
+		cl_entity_t *pl = gEngfuncs.GetEntityByIndex( idx );
+
+		if ( pl )
+		{
+			VectorCopy( gHUD.m_vecAngles, angles );
+			
+			AngleVectors( angles, forward, right, up );
+
+			EV_GetGunPosition( args, vecSrc, pl->origin );
+	
+	VectorMA( vecSrc, 2048, forward, vecEnd );
+
+	gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction( false, true );	
+		
+	// Store off the old count
+	gEngfuncs.pEventAPI->EV_PushPMStates();
+	
+	// Now add in all of the players.
+	gEngfuncs.pEventAPI->EV_SetSolidPlayers ( idx - 1 );	
+
+	gEngfuncs.pEventAPI->EV_SetTraceHull( 2 );
+	gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecEnd, PM_STUDIO_BOX, -1, &tr );
+
+	gEngfuncs.pEventAPI->EV_PopPMStates();
+
+			int iBeamModelIndex = gEngfuncs.pEventAPI->EV_FindModelIndex( EGON_BEAM_SPRITE );
+
+			float r = 50.0f;
+			float g = 50.0f;
+			float b = 125.0f;
+
+			if ( IEngineStudio.IsHardware() )
+			{
+				r /= 100.0f;
+				g /= 100.0f;
+			}
+				
+		
+			pBeam = gEngfuncs.pEfxAPI->R_BeamEntPoint ( idx | 0x1000, tr.endpos, iBeamModelIndex, 99999, 3.5, 0.2, 0.7, 55, 0, 0, r, g, b );
+
+			if ( pBeam )
+				 pBeam->flags |= ( FBEAM_SINENOISE );
+ 
+			pBeam2 = gEngfuncs.pEfxAPI->R_BeamEntPoint ( idx | 0x1000, tr.endpos, iBeamModelIndex, 99999, 5.0, 0.08, 0.7, 25, 0, 0, r, g, b );
+		}
+	}
+}
+
+void EV_EgonStop( event_args_t *args )
+{
+	int idx;
+	vec3_t origin;
+
+	idx = args->entindex;
+	VectorCopy ( args->origin, origin );
+
+	gEngfuncs.pEventAPI->EV_StopSound( idx, CHAN_STATIC, EGON_SOUND_RUN );
+	
+	if ( args->iparam1 )
+		 gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, EGON_SOUND_OFF, 0.98, ATTN_NORM, 0, 100 );
+
+	if ( EV_IsLocal( idx ) )
+	{
+		if ( pBeam )
+		{
+			pBeam->die = 0.0;
+			pBeam = NULL;
+		}
+			
+		
+		if ( pBeam2 )
+		{
+			pBeam2->die = 0.0;
+			pBeam2 = NULL;
+		}
+	}
+}
+//======================
+//	    EGON END 
+//======================
+
+//======================
+//	   HORNET START
+//======================
+enum hgun_e {
+	HGUN_IDLE1 = 0,
+	HGUN_FIDGETSWAY,
+	HGUN_FIDGETSHAKE,
+	HGUN_DOWN,
+	HGUN_UP,
+	HGUN_SHOOT
+};
+
+void EV_HornetGunFire( event_args_t *args )
+{
+	int idx, iFireMode;
+	vec3_t origin, angles, vecSrc, forward, right, up;
+
+	idx = args->entindex;
+	VectorCopy( args->origin, origin );
+	VectorCopy( args->angles, angles );
+	iFireMode = args->iparam1;
+
+	//Only play the weapon anims if I shot it.
+	if ( EV_IsLocal( idx ) )
+	{
+		V_PunchAxis( 0, gEngfuncs.pfnRandomLong ( 0, 2 ) );
+		gEngfuncs.pEventAPI->EV_WeaponAnimation ( HGUN_SHOOT, 1 );
+	}
+
+	switch ( gEngfuncs.pfnRandomLong ( 0 , 2 ) )
+	{
+		case 0:	gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "agrunt/ag_fire1.wav", 1, ATTN_NORM, 0, 100 );	break;
+		case 1:	gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "agrunt/ag_fire2.wav", 1, ATTN_NORM, 0, 100 );	break;
+		case 2:	gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "agrunt/ag_fire3.wav", 1, ATTN_NORM, 0, 100 );	break;
+	}
+}
+//======================
+//	   HORNET END
+//======================
+
+//======================
+//	   TRIPMINE START
+//======================
+enum tripmine_e {
+	TRIPMINE_IDLE1 = 0,
+	TRIPMINE_IDLE2,
+	TRIPMINE_ARM1,
+	TRIPMINE_ARM2,
+	TRIPMINE_FIDGET,
+	TRIPMINE_HOLSTER,
+	TRIPMINE_DRAW,
+	TRIPMINE_WORLD,
+	TRIPMINE_GROUND,
+};
+
+//We only check if it's possible to put a trip mine
+//and if it is, then we play the animation. Server still places it.
+void EV_TripmineFire( event_args_t *args )
+{
+	int idx;
+	vec3_t vecSrc, angles, view_ofs, forward;
+	pmtrace_t tr;
+
+	idx = args->entindex;
+	VectorCopy( args->origin, vecSrc );
+	VectorCopy( args->angles, angles );
+
+	AngleVectors ( angles, forward, NULL, NULL );
+		
+	if ( !EV_IsLocal ( idx ) )
+		return;
+
+	// Grab predicted result for local player
+	gEngfuncs.pEventAPI->EV_LocalPlayerViewheight( view_ofs );
+
+	vecSrc = vecSrc + view_ofs;
+
+	// Store off the old count
+	gEngfuncs.pEventAPI->EV_PushPMStates();
+
+	// Now add in all of the players.
+	gEngfuncs.pEventAPI->EV_SetSolidPlayers ( idx - 1 );	
+	gEngfuncs.pEventAPI->EV_SetTraceHull( 2 );
+	gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecSrc + forward * 128, PM_NORMAL, -1, &tr );
+
+	//Hit something solid
+	if ( tr.fraction < 1.0 )
+		 gEngfuncs.pEventAPI->EV_WeaponAnimation ( TRIPMINE_DRAW, 0 );
+	
+	gEngfuncs.pEventAPI->EV_PopPMStates();
+}
+//======================
+//	   TRIPMINE END
+//======================
+
+//======================
+//	   SQUEAK START
+//======================
+enum squeak_e {
+	SQUEAK_IDLE1 = 0,
+	SQUEAK_FIDGETFIT,
+	SQUEAK_FIDGETNIP,
+	SQUEAK_DOWN,
+	SQUEAK_UP,
+	SQUEAK_THROW
+};
+
+#define VEC_HULL_MIN		Vector(-16, -16, -36)
+#define VEC_DUCK_HULL_MIN	Vector(-16, -16, -18 )
+
+void EV_SnarkFire( event_args_t *args )
+{
+	int idx;
+	vec3_t vecSrc, angles, view_ofs, forward;
+	pmtrace_t tr;
+
+	idx = args->entindex;
+	VectorCopy( args->origin, vecSrc );
+	VectorCopy( args->angles, angles );
+
+	AngleVectors ( angles, forward, NULL, NULL );
+		
+	if ( !EV_IsLocal ( idx ) )
+		return;
+	
+	if ( args->ducking )
+		vecSrc = vecSrc - ( VEC_HULL_MIN - VEC_DUCK_HULL_MIN );
+	
+	// Store off the old count
+	gEngfuncs.pEventAPI->EV_PushPMStates();
+
+	// Now add in all of the players.
+	gEngfuncs.pEventAPI->EV_SetSolidPlayers ( idx - 1 );	
+	gEngfuncs.pEventAPI->EV_SetTraceHull( 2 );
+	gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc + forward * 20, vecSrc + forward * 64, PM_NORMAL, -1, &tr );
+
+	//Find space to drop the thing.
+	if ( tr.allsolid == 0 && tr.startsolid == 0 && tr.fraction > 0.25 )
+		 gEngfuncs.pEventAPI->EV_WeaponAnimation ( SQUEAK_THROW, 0 );
+	
+	gEngfuncs.pEventAPI->EV_PopPMStates();
+}
+//======================
+//	   SQUEAK END
+//======================
+
+void EV_TrainPitchAdjust( event_args_t *args )
+{
+	int idx;
+	vec3_t origin;
+
+	unsigned short us_params;
+	int noise;
+	float m_flVolume;
+	int pitch;
+	int stop;
+	
+	char sz[ 256 ];
+
+	idx = args->entindex;
+	
+	VectorCopy( args->origin, origin );
+
+	us_params = (unsigned short)args->iparam1;
+	stop	  = args->bparam1;
+
+	m_flVolume	= (float)(us_params & 0x003f)/40.0;
+	noise		= (int)(((us_params) >> 12 ) & 0x0007);
+	pitch		= (int)( 10.0 * (float)( ( us_params >> 6 ) & 0x003f ) );
+
+	switch ( noise )
+	{
+	case 1: strcpy( sz, "plats/ttrain1.wav"); break;
+	case 2: strcpy( sz, "plats/ttrain2.wav"); break;
+	case 3: strcpy( sz, "plats/ttrain3.wav"); break; 
+	case 4: strcpy( sz, "plats/ttrain4.wav"); break;
+	case 5: strcpy( sz, "plats/ttrain6.wav"); break;
+	case 6: strcpy( sz, "plats/ttrain7.wav"); break;
+	default:
+		// no sound
+		strcpy( sz, "" );
+		return;
+	}
+
+	if ( stop )
+	{
+		gEngfuncs.pEventAPI->EV_StopSound( idx, CHAN_STATIC, sz );
+	}
+	else
+	{
+		gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_STATIC, sz, m_flVolume, ATTN_NORM, SND_CHANGE_PITCH, pitch );
+	}
+}
+
+int EV_TFC_IsAllyTeam( int iTeam1, int iTeam2 )
+{
+	return 0;
+}
diff --git a/main/source/cl_dll/ev_hldm.h b/main/source/cl_dll/ev_hldm.h
new file mode 100644
index 00000000..eaf13adc
--- /dev/null
+++ b/main/source/cl_dll/ev_hldm.h
@@ -0,0 +1,73 @@
+#if !defined ( EV_HLDMH )
+#define EV_HLDMH
+
+#include "common/bullettypes.h"
+
+enum glock_e {
+	GLOCK_IDLE1 = 0,
+	GLOCK_IDLE2,
+	GLOCK_IDLE3,
+	GLOCK_SHOOT,
+	GLOCK_SHOOT_EMPTY,
+	GLOCK_RELOAD,
+	GLOCK_RELOAD_NOT_EMPTY,
+	GLOCK_DRAW,
+	GLOCK_HOLSTER,
+	GLOCK_ADD_SILENCER
+};
+
+enum shotgun_e {
+	SHOTGUN_IDLE = 0,
+	SHOTGUN_FIRE,
+	SHOTGUN_FIRE2,
+	SHOTGUN_RELOAD,
+	SHOTGUN_PUMP,
+	SHOTGUN_START_RELOAD,
+	SHOTGUN_DRAW,
+	SHOTGUN_HOLSTER,
+	SHOTGUN_IDLE4,
+	SHOTGUN_IDLE_DEEP
+};
+
+//enum mp5_e
+enum avhmg_e
+{
+	MG_LONGIDLE = 0,
+	MG_IDLE1,
+	MG_LAUNCH,
+	MG_RELOAD,
+	MG_DEPLOY,
+	MG_FIRE1,
+	MG_FIRE2,
+	MG_FIRE3,
+};
+
+enum python_e {
+	PYTHON_IDLE1 = 0,
+	PYTHON_FIDGET,
+	PYTHON_FIRE1,
+	PYTHON_RELOAD,
+	PYTHON_HOLSTER,
+	PYTHON_DRAW,
+	PYTHON_IDLE2,
+	PYTHON_IDLE3
+};
+
+#define	GAUSS_PRIMARY_CHARGE_VOLUME	256// how loud gauss is while charging
+#define GAUSS_PRIMARY_FIRE_VOLUME	450// how loud gauss is when discharged
+
+enum gauss_e {
+	GAUSS_IDLE = 0,
+	GAUSS_IDLE2,
+	GAUSS_FIDGET,
+	GAUSS_SPINUP,
+	GAUSS_SPIN,
+	GAUSS_FIRE,
+	GAUSS_FIRE2,
+	GAUSS_HOLSTER,
+	GAUSS_DRAW
+};
+
+#include "common/hldm.h"
+
+#endif // EV_HLDMH
\ No newline at end of file
diff --git a/main/source/cl_dll/events.cpp b/main/source/cl_dll/events.cpp
new file mode 100644
index 00000000..60061f1f
--- /dev/null
+++ b/main/source/cl_dll/events.cpp
@@ -0,0 +1,16 @@
+#include "hud.h"
+#include "cl_util.h"
+
+void Game_HookEvents( void );
+
+/*
+===================
+EV_HookEvents
+
+See if game specific code wants to hook any events.
+===================
+*/
+void EV_HookEvents( void )
+{
+	Game_HookEvents();
+}
\ No newline at end of file
diff --git a/main/source/cl_dll/eventscripts.h b/main/source/cl_dll/eventscripts.h
new file mode 100644
index 00000000..0e169ed8
--- /dev/null
+++ b/main/source/cl_dll/eventscripts.h
@@ -0,0 +1,33 @@
+// eventscripts.h
+#if !defined ( EVENTSCRIPTSH )
+#define EVENTSCRIPTSH
+
+#include "common/const.h"
+
+// defaults for clientinfo messages
+#define	DEFAULT_VIEWHEIGHT	28
+
+#ifndef VEC_DUCK_VIEW
+#define VEC_DUCK_VIEW 12
+#endif
+
+#define FTENT_FADEOUT			0x00000080
+
+#include "common/damagetypes.h"
+#include "pm_shared/pm_defs.h"
+
+// Some of these are HL/TFC specific?
+void EV_EjectBrass( float *origin, float *velocity, float rotation, int model, int soundtype );
+void EV_GetGunPosition( struct event_args_s *args, float *pos, float *origin );
+void EV_GetDefaultShellInfo( struct event_args_s *args, float *origin, float *velocity, float *ShellVelocity, float *ShellOrigin, float *forward, float *right, float *up, float forwardScale, float upScale, float rightScale );
+qboolean EV_IsLocal( int idx );
+qboolean EV_IsPlayer( int idx );
+void EV_CreateTracer( float *start, float *end );
+
+struct cl_entity_s *GetEntity( int idx );
+struct cl_entity_s *GetViewEntity( void );
+physent_t* GetPhysEntity(int inPhysIndex);
+void DoCenterPrint(char* inString);
+void EV_MuzzleFlash( void );
+
+#endif // EVENTSCRIPTSH
diff --git a/main/source/cl_dll/exports.h b/main/source/cl_dll/exports.h
new file mode 100644
index 00000000..070e1a2a
--- /dev/null
+++ b/main/source/cl_dll/exports.h
@@ -0,0 +1,165 @@
+
+#include "build.h"
+
+#if defined( FINAL_VAC_BUILD )
+#define CL_DLLEXPORT
+#else
+#define CL_DLLEXPORT __declspec( dllexport )
+#endif // FINAL_VAC_BUILD
+
+
+extern "C" 
+{
+	// From hl_weapons
+	void CL_DLLEXPORT HUD_PostRunCmd( struct local_state_s *from, struct local_state_s *to, struct usercmd_s *cmd, int runfuncs, double time, unsigned int random_seed );
+
+	// From cdll_int
+	int CL_DLLEXPORT Initialize( cl_enginefunc_t *pEnginefuncs, int iVersion );
+	int CL_DLLEXPORT HUD_VidInit( void );
+	void CL_DLLEXPORT HUD_Init( void );
+	int CL_DLLEXPORT HUD_Redraw( float flTime, int intermission );
+	int CL_DLLEXPORT HUD_UpdateClientData( client_data_t *cdata, float flTime );
+	void CL_DLLEXPORT HUD_Reset ( void );
+	void CL_DLLEXPORT HUD_PlayerMove( struct playermove_s *ppmove, int server );
+	void CL_DLLEXPORT HUD_PlayerMoveInit( struct playermove_s *ppmove );
+	char CL_DLLEXPORT HUD_PlayerMoveTexture( char *name );
+	int CL_DLLEXPORT HUD_ConnectionlessPacket( const struct netadr_s *net_from, const char *args, char *response_buffer, int *response_buffer_size );
+	int CL_DLLEXPORT HUD_GetHullBounds( int hullnumber, float *mins, float *maxs );
+	void CL_DLLEXPORT HUD_Frame( double time );
+	void CL_DLLEXPORT HUD_VoiceStatus(int entindex, qboolean bTalking);
+	void CL_DLLEXPORT HUD_DirectorMessage( int iSize, void *pbuf );
+
+	// From demo
+	void CL_DLLEXPORT Demo_ReadBuffer( int size, unsigned char *buffer );
+
+	// From entity
+	int CL_DLLEXPORT HUD_AddEntity( int type, struct cl_entity_s *ent, const char *modelname );
+	void CL_DLLEXPORT HUD_CreateEntities( void );
+	void CL_DLLEXPORT HUD_StudioEvent( const struct mstudioevent_s *event, const struct cl_entity_s *entity );
+	void CL_DLLEXPORT HUD_TxferLocalOverrides( struct entity_state_s *state, const struct clientdata_s *client );
+	void CL_DLLEXPORT HUD_ProcessPlayerState( struct entity_state_s *dst, const struct entity_state_s *src );
+	void CL_DLLEXPORT HUD_TxferPredictionData ( struct entity_state_s *ps, const struct entity_state_s *pps, struct clientdata_s *pcd, const struct clientdata_s *ppcd, struct weapon_data_s *wd, const struct weapon_data_s *pwd );
+	void CL_DLLEXPORT HUD_TempEntUpdate( double frametime, double client_time, double cl_gravity, struct tempent_s **ppTempEntFree, struct tempent_s **ppTempEntActive, int ( *Callback_AddVisibleEntity )( struct cl_entity_s *pEntity ), void ( *Callback_TempEntPlaySound )( struct tempent_s *pTemp, float damp ) );
+	struct cl_entity_s CL_DLLEXPORT *HUD_GetUserEntity( int index );
+
+	// From in_camera
+	void CL_DLLEXPORT CAM_Think( void );
+	int CL_DLLEXPORT CL_IsThirdPerson( void );
+	void CL_DLLEXPORT CL_CameraOffset( float *ofs );
+
+	// From input
+	struct kbutton_s CL_DLLEXPORT *KB_Find( const char *name );
+	void CL_DLLEXPORT CL_CreateMove ( float frametime, struct usercmd_s *cmd, int active );
+	void CL_DLLEXPORT HUD_Shutdown( void );
+	int CL_DLLEXPORT HUD_Key_Event( int eventcode, int keynum, const char *pszCurrentBinding );
+
+	// From inputw32
+	void CL_DLLEXPORT IN_ActivateMouse( void );
+	void CL_DLLEXPORT IN_DeactivateMouse( void );
+	void CL_DLLEXPORT IN_MouseEvent (int mstate);
+	void CL_DLLEXPORT IN_Accumulate (void);
+	void CL_DLLEXPORT IN_ClearStates (void);
+
+	// From tri
+	void CL_DLLEXPORT HUD_DrawNormalTriangles( void );
+	void CL_DLLEXPORT HUD_DrawTransparentTriangles( void );
+
+	// From view
+	void	CL_DLLEXPORT V_CalcRefdef( struct ref_params_s *pparams );
+
+	// From GameStudioModelRenderer
+	int CL_DLLEXPORT HUD_GetStudioModelInterface( int version, struct r_studio_interface_s **ppinterface, struct engine_studio_api_s *pstudio );
+}
+
+
+
+#if defined( FINAL_VAC_BUILD )
+
+extern cldll_func_dst_t *g_pcldstAddrs;
+
+// Macros for the client receiving calls from the engine
+#define RecClInitialize(a, b)			(g_pcldstAddrs->pInitFunc(&a, &b))
+#define RecClHudInit()					(g_pcldstAddrs->pHudInitFunc())
+#define RecClHudVidInit()				(g_pcldstAddrs->pHudVidInitFunc())
+#define RecClHudRedraw(a, b)			(g_pcldstAddrs->pHudRedrawFunc(&a, &b))
+#define RecClHudUpdateClientData(a, b)	(g_pcldstAddrs->pHudUpdateClientDataFunc(&a, &b))
+#define RecClHudReset()					(g_pcldstAddrs->pHudResetFunc())
+#define RecClClientMove(a, b)			(g_pcldstAddrs->pClientMove(&a, &b))
+#define RecClClientMoveInit(a)			(g_pcldstAddrs->pClientMoveInit(&a))
+#define RecClClientTextureType(a)		(g_pcldstAddrs->pClientTextureType(&a))
+#define RecClIN_ActivateMouse()			(g_pcldstAddrs->pIN_ActivateMouse())
+#define RecClIN_DeactivateMouse()		(g_pcldstAddrs->pIN_DeactivateMouse())
+#define RecClIN_MouseEvent(a)			(g_pcldstAddrs->pIN_MouseEvent(&a))
+#define RecClIN_ClearStates()			(g_pcldstAddrs->pIN_ClearStates())
+#define RecClIN_Accumulate()			(g_pcldstAddrs->pIN_Accumulate())
+#define RecClCL_CreateMove(a, b, c)		(g_pcldstAddrs->pCL_CreateMove(&a, &b, &c))
+#define RecClCL_IsThirdPerson()			(g_pcldstAddrs->pCL_IsThirdPerson())
+#define RecClCL_GetCameraOffsets(a)		(g_pcldstAddrs->pCL_GetCameraOffsets(&a))
+#define RecClFindKey(a)					(g_pcldstAddrs->pFindKey(&a))
+#define RecClCamThink()					(g_pcldstAddrs->pCamThink())
+#define RecClCalcRefdef(a)				(g_pcldstAddrs->pCalcRefdef(&a))
+#define RecClAddEntity(a, b, c)			(g_pcldstAddrs->pAddEntity(&a, &b, &c))
+#define RecClCreateEntities()			(g_pcldstAddrs->pCreateEntities())
+#define RecClDrawNormalTriangles()		(g_pcldstAddrs->pDrawNormalTriangles())
+#define RecClDrawTransparentTriangles()	(g_pcldstAddrs->pDrawTransparentTriangles())
+#define RecClStudioEvent(a, b)			(g_pcldstAddrs->pStudioEvent(&a, &b))
+#define RecClPostRunCmd(a, b, c, d, e, f)		(g_pcldstAddrs->pPostRunCmd(&a, &b, &c, &d, &e, &f))
+#define RecClShutdown()					(g_pcldstAddrs->pShutdown())
+#define RecClTxferLocalOverrides(a, b)	(g_pcldstAddrs->pTxferLocalOverrides(&a, &b))
+#define RecClProcessPlayerState(a, b)	(g_pcldstAddrs->pProcessPlayerState(&a, &b))
+#define RecClTxferPredictionData(a, b, c, d, e, f)		(g_pcldstAddrs->pTxferPredictionData(&a, &b, &c, &d, &e, &f))
+#define RecClReadDemoBuffer(a, b)		(g_pcldstAddrs->pReadDemoBuffer(&a, &b))
+#define RecClConnectionlessPacket(a, b, c, d)		(g_pcldstAddrs->pConnectionlessPacket(&a, &b, &c, &d))
+#define RecClGetHullBounds(a, b, c)		(g_pcldstAddrs->pGetHullBounds(&a, &b, &c))
+#define RecClHudFrame(a)				(g_pcldstAddrs->pHudFrame(&a))
+#define RecClKeyEvent(a, b, c)			(g_pcldstAddrs->pKeyEvent(&a, &b, &c))
+#define RecClTempEntUpdate(a, b, c, d, e, f, g)	(g_pcldstAddrs->pTempEntUpdate(&a, &b, &c, &d, &e, &f, &g))
+#define RecClGetUserEntity(a)			(g_pcldstAddrs->pGetUserEntity(&a))
+#define RecClVoiceStatus(a, b)			(g_pcldstAddrs->pVoiceStatus(&a, &b))
+#define RecClDirectorMessage(a, b)		(g_pcldstAddrs->pDirectorMessage(&a, &b))
+#define RecClStudioInterface(a, b, c)	(g_pcldstAddrs->pStudioInterface(&a, &b, &c))
+
+#else
+
+#define RecClInitialize(a, b)			
+#define RecClHudInit()					
+#define RecClHudVidInit()				
+#define RecClHudRedraw(a, b)			
+#define RecClHudUpdateClientData(a, b)	
+#define RecClHudReset()					
+#define RecClClientMove(a, b)			
+#define RecClClientMoveInit(a)			
+#define RecClClientTextureType(a)		
+#define RecClIN_ActivateMouse()			
+#define RecClIN_DeactivateMouse()		
+#define RecClIN_MouseEvent(a)			
+#define RecClIN_ClearStates()			
+#define RecClIN_Accumulate()			
+#define RecClCL_CreateMove(a, b, c)		
+#define RecClCL_IsThirdPerson()			
+#define RecClCL_GetCameraOffsets(a)		
+#define RecClFindKey(a)					
+#define RecClCamThink()					
+#define RecClCalcRefdef(a)				
+#define RecClAddEntity(a, b, c)			
+#define RecClCreateEntities()			
+#define RecClDrawNormalTriangles()		
+#define RecClDrawTransparentTriangles()	
+#define RecClStudioEvent(a, b)			
+#define RecClPostRunCmd(a, b, c, d, e, f)		
+#define RecClShutdown()					
+#define RecClTxferLocalOverrides(a, b)	
+#define RecClProcessPlayerState(a, b)	
+#define RecClTxferPredictionData(a, b, c, d, e, f)		
+#define RecClReadDemoBuffer(a, b)		
+#define RecClConnectionlessPacket(a, b, c, d)		
+#define RecClGetHullBounds(a, b, c)		
+#define RecClHudFrame(a)				
+#define RecClKeyEvent(a, b, c)			
+#define RecClTempEntUpdate(a, b, c, d, e, f, g)	
+#define RecClGetUserEntity(a)			
+#define RecClVoiceStatus(a, b)			
+#define RecClDirectorMessage(a, b)
+#define RecClStudioInterface(a, b, c)	
+
+#endif // FINAL_VAC_BUILD
diff --git a/main/source/cl_dll/flashlight.cpp b/main/source/cl_dll/flashlight.cpp
new file mode 100644
index 00000000..0f604b85
--- /dev/null
+++ b/main/source/cl_dll/flashlight.cpp
@@ -0,0 +1,151 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// flashlight.cpp
+//
+// implementation of CHudFlashlight class
+//
+
+#include "hud.h"
+#include "cl_util.h"
+#include "parsemsg.h"
+
+#include <string.h>
+#include <stdio.h>
+
+
+
+DECLARE_MESSAGE(m_Flash, FlashBat)
+DECLARE_MESSAGE(m_Flash, Flashlight)
+
+#define BAT_NAME "sprites/%d_Flashlight.spr"
+
+int CHudFlashlight::Init(void)
+{
+	m_fFade = 0;
+	m_fOn = 0;
+
+	HOOK_MESSAGE(Flashlight);
+	HOOK_MESSAGE(FlashBat);
+
+	m_iFlags |= HUD_ACTIVE;
+
+	//gHUD.AddHudElem(this);
+
+	return 1;
+};
+
+void CHudFlashlight::Reset(void)
+{
+	m_fFade = 0;
+	m_fOn = 0;
+}
+
+int CHudFlashlight::VidInit(void)
+{
+	int HUD_flash_empty = gHUD.GetSpriteIndex( "flash_empty" );
+	int HUD_flash_full = gHUD.GetSpriteIndex( "flash_full" );
+	int HUD_flash_beam = gHUD.GetSpriteIndex( "flash_beam" );
+
+	m_hSprite1 = gHUD.GetSprite(HUD_flash_empty);
+	m_hSprite2 = gHUD.GetSprite(HUD_flash_full);
+	m_hBeam = gHUD.GetSprite(HUD_flash_beam);
+	m_prc1 = &gHUD.GetSpriteRect(HUD_flash_empty);
+	m_prc2 = &gHUD.GetSpriteRect(HUD_flash_full);
+	m_prcBeam = &gHUD.GetSpriteRect(HUD_flash_beam);
+	m_iWidth = m_prc2->right - m_prc2->left;
+
+	return 1;
+};
+
+int CHudFlashlight:: MsgFunc_FlashBat(const char *pszName,  int iSize, void *pbuf )
+{
+
+	
+	BEGIN_READ( pbuf, iSize );
+	int x = READ_BYTE();
+	m_iBat = x;
+	m_flBat = ((float)x)/100.0;
+
+	return 1;
+}
+
+int CHudFlashlight:: MsgFunc_Flashlight(const char *pszName,  int iSize, void *pbuf )
+{
+
+	BEGIN_READ( pbuf, iSize );
+	m_fOn = READ_BYTE();
+	int x = READ_BYTE();
+	m_iBat = x;
+	m_flBat = ((float)x)/100.0;
+
+	return 1;
+}
+
+int CHudFlashlight::Draw(float flTime)
+{
+	if ( gHUD.m_iHideHUDDisplay & ( HIDEHUD_FLASHLIGHT | HIDEHUD_ALL ) )
+		return 1;
+
+	int r, g, b, x, y, a;
+	wrect_t rc;
+
+	if (!(gHUD.m_iWeaponBits & (1<<(WEAPON_SUIT)) ))
+		return 1;
+
+	if (m_fOn)
+		a = 225;
+	else
+		a = MIN_ALPHA;
+
+	if (m_flBat < 0.20)
+		UnpackRGB(r,g,b, RGB_REDISH);
+	else
+	{
+		gHUD.GetPrimaryHudColor(r, g, b);
+	}
+
+	ScaleColors(r, g, b, a);
+
+	y = (m_prc1->bottom - m_prc2->top)/2;
+	x = ScreenWidth() - m_iWidth - m_iWidth/2 ;
+
+	// Draw the flashlight casing
+	SPR_Set(m_hSprite1, r, g, b );
+	SPR_DrawAdditive( 0,  x, y, m_prc1);
+
+	if ( m_fOn )
+	{  // draw the flashlight beam
+		x = ScreenWidth() - m_iWidth/2;
+
+		SPR_Set( m_hBeam, r, g, b );
+		SPR_DrawAdditive( 0, x, y, m_prcBeam );
+	}
+
+	// draw the flashlight energy level
+	x = ScreenWidth() - m_iWidth - m_iWidth/2 ;
+	int iOffset = m_iWidth * (1.0 - m_flBat);
+	if (iOffset < m_iWidth)
+	{
+		rc = *m_prc2;
+		rc.left += iOffset;
+
+		SPR_Set(m_hSprite2, r, g, b );
+		SPR_DrawAdditive( 0, x + iOffset, y, &rc);
+	}
+
+
+	return 1;
+}
\ No newline at end of file
diff --git a/main/source/cl_dll/geiger.cpp b/main/source/cl_dll/geiger.cpp
new file mode 100644
index 00000000..9d31d438
--- /dev/null
+++ b/main/source/cl_dll/geiger.cpp
@@ -0,0 +1,184 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// Geiger.cpp
+//
+// implementation of CHudAmmo class
+//
+
+#include "hud.h"
+#include "cl_util.h"
+#include <string.h>
+#include <time.h>
+#include <stdio.h>
+
+#include "parsemsg.h"
+
+DECLARE_MESSAGE(m_Geiger, Geiger )
+
+int CHudGeiger::Init(void)
+{
+	HOOK_MESSAGE( Geiger );
+
+	m_iGeigerRange = 0;
+	m_iFlags = 0;
+
+	//gHUD.AddHudElem(this);
+
+	srand( (unsigned)time( NULL ) );
+
+	return 1;
+};
+
+int CHudGeiger::VidInit(void)
+{
+	return 1;
+};
+
+int CHudGeiger::MsgFunc_Geiger(const char *pszName,  int iSize, void *pbuf)
+{
+
+	BEGIN_READ( pbuf, iSize );
+
+	// update geiger data
+	m_iGeigerRange = READ_BYTE();
+	m_iGeigerRange = m_iGeigerRange << 2;
+	
+	m_iFlags |= HUD_ACTIVE;
+
+	return 1;
+}
+
+int CHudGeiger::Draw (float flTime)
+{
+	/*
+    int pct;
+	float flvol;
+	int rg[3];
+	int i;
+	
+	if (m_iGeigerRange < 1000 && m_iGeigerRange > 0)
+	{
+		// peicewise linear is better than continuous formula for this
+		if (m_iGeigerRange > 800)
+		{
+			pct = 0;			//Con_Printf ( "range > 800\n");
+		}
+		else if (m_iGeigerRange > 600)
+		{
+			pct = 2;
+			flvol = 0.4;		//Con_Printf ( "range > 600\n");
+			rg[0] = 1;
+			rg[1] = 1;
+			i = 2;
+		}
+		else if (m_iGeigerRange > 500)
+		{
+			pct = 4;
+			flvol = 0.5;		//Con_Printf ( "range > 500\n");
+			rg[0] = 1;
+			rg[1] = 2;
+			i = 2;
+		}
+		else if (m_iGeigerRange > 400)
+		{
+			pct = 8;
+			flvol = 0.6;		//Con_Printf ( "range > 400\n");
+			rg[0] = 1;
+			rg[1] = 2;
+			rg[2] = 3;
+			i = 3;
+		}
+		else if (m_iGeigerRange > 300)
+		{
+			pct = 8;
+			flvol = 0.7;		//Con_Printf ( "range > 300\n");
+			rg[0] = 2;
+			rg[1] = 3;
+			rg[2] = 4;
+			i = 3;
+		}
+		else if (m_iGeigerRange > 200)
+		{
+			pct = 28;
+			flvol = 0.78;		//Con_Printf ( "range > 200\n");
+			rg[0] = 2;
+			rg[1] = 3;
+			rg[2] = 4;
+			i = 3;
+		}
+		else if (m_iGeigerRange > 150)
+		{
+			pct = 40;
+			flvol = 0.80;		//Con_Printf ( "range > 150\n");
+			rg[0] = 3;
+			rg[1] = 4;
+			rg[2] = 5;
+			i = 3;
+		}
+		else if (m_iGeigerRange > 100)
+		{
+			pct = 60;
+			flvol = 0.85;		//Con_Printf ( "range > 100\n");
+			rg[0] = 3;
+			rg[1] = 4;
+			rg[2] = 5;
+			i = 3;
+		}
+		else if (m_iGeigerRange > 75)
+		{
+			pct = 80;
+			flvol = 0.9;		//Con_Printf ( "range > 75\n");
+			//gflGeigerDelay = cl.time + GEIGERDELAY * 0.75;
+			rg[0] = 4;
+			rg[1] = 5;
+			rg[2] = 6;
+			i = 3;
+		}
+		else if (m_iGeigerRange > 50)
+		{
+			pct = 90;
+			flvol = 0.95;		//Con_Printf ( "range > 50\n");
+			rg[0] = 5;
+			rg[1] = 6;
+			i = 2;
+		}
+		else
+		{
+			pct = 95;
+			flvol = 1.0;		//Con_Printf ( "range < 50\n");
+			rg[0] = 5;
+			rg[1] = 6;
+			i = 2;
+		}
+
+		flvol = (flvol * ((rand() & 127)) / 255) + 0.25; // UTIL_RandomFloat(0.25, 0.5);
+
+		if ((rand() & 127) < pct || (rand() & 127) < pct)
+		{
+			//S_StartDynamicSound (-1, 0, rgsfx[rand() % i], r_origin, flvol, 1.0, 0, 100);	
+			char sz[256];
+			
+			int j = rand() & 1;
+			if (i > 2)
+				j += rand() & 1;
+
+			sprintf(sz, "player/geiger%d.wav", j + 1);
+			//PlaySound(sz, flvol);
+		}
+	}
+    */
+	return 1;
+}
diff --git a/main/source/cl_dll/health.cpp b/main/source/cl_dll/health.cpp
new file mode 100644
index 00000000..78451bd6
--- /dev/null
+++ b/main/source/cl_dll/health.cpp
@@ -0,0 +1,524 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// Health.cpp
+//
+// implementation of CHudHealth class
+//
+
+#include "STDIO.H"
+#include "STDLIB.H"
+#include "MATH.H"
+
+#include "hud.h"
+#include "cl_util.h"
+#include "parsemsg.h"
+#include <string.h>
+#include "mod/AvHHudConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+
+DECLARE_MESSAGE(m_Health, Health )
+DECLARE_MESSAGE(m_Health, Damage )
+//DECLARE_MESSAGE(m_Health, ClCorpse );
+
+#define PAIN_NAME "sprites/%d_pain.spr"
+#define DAMAGE_NAME "sprites/%d_dmg.spr"
+
+int giDmgHeight, giDmgWidth;
+
+int giDmgFlags[NUM_DMG_TYPES] = 
+{
+	DMG_POISON,
+	DMG_ACID,
+	DMG_FREEZE|DMG_SLOWFREEZE,
+	DMG_DROWN,
+	DMG_BURN|DMG_SLOWBURN,
+	DMG_NERVEGAS, 
+	DMG_RADIATION,
+	DMG_SHOCK,
+	DMG_CALTROP,
+	DMG_TRANQ,
+	DMG_CONCUSS,
+	DMG_HALLUC
+};
+
+int CHudHealth::Init(void)
+{
+	HOOK_MESSAGE(Health);
+	HOOK_MESSAGE(Damage);
+	//HOOK_MESSAGE(ClCorpse);
+
+	m_iHealth = 100;
+	m_fFade = 0;
+	m_iFlags = 0;
+	m_bitsDamage = 0;
+	m_fAttackFront = m_fAttackRear = m_fAttackRight = m_fAttackLeft = 0;
+	giDmgHeight = 0;
+	giDmgWidth = 0;
+
+	memset(m_dmg, 0, sizeof(DAMAGE_IMAGE) * NUM_DMG_TYPES);
+
+
+	gHUD.AddHudElem(this);
+	return 1;
+}
+
+void CHudHealth::Reset( void )
+{
+	// make sure the pain compass is cleared when the player respawns
+	m_fAttackFront = m_fAttackRear = m_fAttackRight = m_fAttackLeft = 0;
+
+
+	// force all the flashing damage icons to expire
+	m_bitsDamage = 0;
+	for ( int i = 0; i < NUM_DMG_TYPES; i++ )
+	{
+		m_dmg[i].fExpire = 0;
+	}
+}
+
+int CHudHealth::VidInit(void)
+{
+	m_hSprite = 0;
+
+	m_HUD_dmg_bio = gHUD.GetSpriteIndex( "dmg_bio" ) + 1;
+	m_HUD_cross = gHUD.GetSpriteIndex( "cross" );
+
+	giDmgHeight = gHUD.GetSpriteRect(m_HUD_dmg_bio).right - gHUD.GetSpriteRect(m_HUD_dmg_bio).left;
+	giDmgWidth = gHUD.GetSpriteRect(m_HUD_dmg_bio).bottom - gHUD.GetSpriteRect(m_HUD_dmg_bio).top;
+	return 1;
+}
+
+int CHudHealth:: MsgFunc_Health(const char *pszName,  int iSize, void *pbuf )
+{
+	int theBytesRead = 0;
+
+	// TODO: update local health data
+	BEGIN_READ( pbuf, iSize );
+	int x = READ_SHORT();
+	theBytesRead += 2;
+
+	m_iFlags |= HUD_ACTIVE;
+
+	// Only update the fade if we've changed health
+	if (x != m_iHealth)
+	{
+		// We're sent the health of the player we're observing as if it were our own
+		m_fFade = FADE_TIME;
+		m_iHealth = x;
+	}
+
+	return theBytesRead;
+}
+
+
+int CHudHealth:: MsgFunc_Damage(const char *pszName,  int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+
+	int armor = READ_BYTE();	// armor
+	int damageTaken = READ_BYTE();	// health
+	long bitsDamage = READ_LONG(); // damage bits
+
+	vec3_t vecFrom;
+
+	for ( int i = 0 ; i < 3 ; i++)
+		vecFrom[i] = READ_COORD();
+
+	UpdateTiles(gHUD.m_flTime, bitsDamage);
+
+	// Actually took damage?
+	if ( damageTaken > 0 || armor > 0 )
+		CalcDamageDirection(vecFrom);
+
+	return 1;
+}
+
+
+// Returns back a color from the
+// Green <-> Yellow <-> Red ramp
+void CHudHealth::GetPainColor( int &r, int &g, int &b )
+{
+	int theMaxHealth = gHUD.GetHUDMaxHealth();
+
+	if (m_iHealth > theMaxHealth/4)
+	{
+		gHUD.GetPrimaryHudColor(r, g, b);
+	}
+	else
+	{
+		r = 250;
+		g = 0;
+		b = 0;
+	}
+}
+
+int CHudHealth::Draw(float flTime)
+{
+	int r, g, b;
+	int a = 0, x, y;
+	int HealthWidth;
+
+	if ( /*!gHUD.GetIsAlive() ||*/ (gHUD.m_iHideHUDDisplay & HIDEHUD_HEALTH) /*|| gEngfuncs.IsSpectateOnly()*/ )
+		return 1;
+
+	if ( !m_hSprite )
+		m_hSprite = LoadSprite(PAIN_NAME);
+	
+	// Has health changed? Flash the health #
+	if (m_fFade)
+	{
+		m_fFade -= (gHUD.m_flTimeDelta * 20);
+		if (m_fFade <= 0)
+		{
+			a = MIN_ALPHA;
+			m_fFade = 0;
+		}
+
+		// Fade the health number back to dim
+
+		a = MIN_ALPHA +  (m_fFade/FADE_TIME) * 128;
+
+	}
+	else
+		a = MIN_ALPHA;
+
+	// Potentially se upgrades and health of spectator target
+	int theUpgrades = gHUD.GetHUDUpgrades();
+
+	// If health is getting low, make it bright red
+	int theMaxHealth = gHUD.GetHUDMaxHealth();
+	if (m_iHealth <= theMaxHealth/10)
+	{
+		a = 255;
+	}
+		
+	GetPainColor( r, g, b );
+	ScaleColors(r, g, b, a );
+
+    int theViewport[4];
+    gHUD.GetViewport(theViewport);
+
+	// Only draw health if we have the suit.
+	if (gHUD.m_iWeaponBits & (1<<(WEAPON_SUIT)))
+	{
+		HealthWidth = gHUD.GetSpriteRect(gHUD.m_HUD_number_0).right - gHUD.GetSpriteRect(gHUD.m_HUD_number_0).left;
+		int CrossWidth = gHUD.GetSpriteRect(m_HUD_cross).right - gHUD.GetSpriteRect(m_HUD_cross).left;
+
+		y = theViewport[1] + theViewport[3] - gHUD.m_iFontHeight - gHUD.m_iFontHeight / 2;
+		
+		x = theViewport[0] + CrossWidth /2;
+
+		int theInset = 0;
+		if(gHUD.GetIsAlien() && !gHUD.GetIsCombatMode())
+		{
+			theInset = ScreenWidth()*kResourceEnergyBarWidth;
+		}
+		x += theInset;// + kHealthLeftInset*ScreenWidth;
+		
+		SPR_Set(gHUD.GetSprite(m_HUD_cross), r, g, b);
+		SPR_DrawAdditive(0, x, y, &gHUD.GetSpriteRect(m_HUD_cross));
+
+		x += CrossWidth + HealthWidth / 2;
+
+		x = gHUD.DrawHudNumber(x, y, DHN_3DIGITS | DHN_DRAWZERO, m_iHealth, r, g, b);
+
+		x += HealthWidth/2;
+
+		gHUD.GetPrimaryHudColor(r, g, b);
+		
+		int iHeight = gHUD.m_iFontHeight;
+		int iWidth = HealthWidth/10;
+		FillRGBA(x, y, iWidth, iHeight, r, g, b, a);
+	}
+
+	DrawDamage(flTime);
+	return DrawPain(flTime);
+}
+
+void CHudHealth::CalcDamageDirection(vec3_t vecFrom)
+{
+	vec3_t	forward, right, up;
+	float	side, front;
+	vec3_t vecOrigin, vecAngles;
+
+	if (!vecFrom[0] && !vecFrom[1] && !vecFrom[2])
+	{
+		m_fAttackFront = m_fAttackRear = m_fAttackRight = m_fAttackLeft = 0;
+		return;
+	}
+
+
+	memcpy(vecOrigin, gHUD.m_vecOrigin, sizeof(vec3_t));
+	memcpy(vecAngles, gHUD.m_vecAngles, sizeof(vec3_t));
+
+
+	VectorSubtract (vecFrom, vecOrigin, vecFrom);
+
+	float flDistToTarget = vecFrom.Length();
+
+	vecFrom = vecFrom.Normalize();
+	AngleVectors (vecAngles, forward, right, up);
+
+	front = DotProduct (vecFrom, right);
+	side = DotProduct (vecFrom, forward);
+
+	if (flDistToTarget <= 50)
+	{
+		m_fAttackFront = m_fAttackRear = m_fAttackRight = m_fAttackLeft = 1;
+	}
+	else 
+	{
+		if (side > 0)
+		{
+			if (side > 0.3)
+				m_fAttackFront = max(m_fAttackFront, side);
+		}
+		else
+		{
+			float f = fabs(side);
+			if (f > 0.3)
+				m_fAttackRear = max(m_fAttackRear, f);
+		}
+
+		if (front > 0)
+		{
+			if (front > 0.3)
+				m_fAttackRight = max(m_fAttackRight, front);
+		}
+		else
+		{
+			float f = fabs(front);
+			if (f > 0.3)
+				m_fAttackLeft = max(m_fAttackLeft, f);
+		}
+	}
+}
+
+int CHudHealth::DrawPain(float flTime)
+{
+	if (!(m_fAttackFront || m_fAttackRear || m_fAttackLeft || m_fAttackRight))
+		return 1;
+
+	int r, g, b;
+	int x, y, a, shade;
+
+	// TODO:  get the shift value of the health
+	a = 255;	// max brightness until then
+
+	float fFade = gHUD.m_flTimeDelta * 2;
+	
+	// SPR_Draw top
+	if (m_fAttackFront > 0.4)
+	{
+		GetPainColor(r,g,b);
+		shade = a * max( m_fAttackFront, 0.5 );
+		ScaleColors(r, g, b, shade);
+		SPR_Set(m_hSprite, r, g, b );
+
+		x = ScreenWidth()/2 - SPR_Width(m_hSprite, 0)/2;
+		y = ScreenHeight()/2 - SPR_Height(m_hSprite,0) * 3;
+		SPR_DrawAdditive(0, x, y, NULL);
+		m_fAttackFront = max( 0, m_fAttackFront - fFade );
+	} else
+		m_fAttackFront = 0;
+
+	if (m_fAttackRight > 0.4)
+	{
+		GetPainColor(r,g,b);
+		shade = a * max( m_fAttackRight, 0.5 );
+		ScaleColors(r, g, b, shade);
+		SPR_Set(m_hSprite, r, g, b );
+
+		x = ScreenWidth()/2 + SPR_Width(m_hSprite, 1) * 2;
+		y = ScreenHeight()/2 - SPR_Height(m_hSprite,1)/2;
+		SPR_DrawAdditive(1, x, y, NULL);
+		m_fAttackRight = max( 0, m_fAttackRight - fFade );
+	} else
+		m_fAttackRight = 0;
+
+	if (m_fAttackRear > 0.4)
+	{
+		GetPainColor(r,g,b);
+		shade = a * max( m_fAttackRear, 0.5 );
+		ScaleColors(r, g, b, shade);
+		SPR_Set(m_hSprite, r, g, b );
+
+		x = ScreenWidth()/2 - SPR_Width(m_hSprite, 2)/2;
+		y = ScreenHeight()/2 + SPR_Height(m_hSprite,2) * 2;
+		SPR_DrawAdditive(2, x, y, NULL);
+		m_fAttackRear = max( 0, m_fAttackRear - fFade );
+	} else
+		m_fAttackRear = 0;
+
+	if (m_fAttackLeft > 0.4)
+	{
+		GetPainColor(r,g,b);
+		shade = a * max( m_fAttackLeft, 0.5 );
+		ScaleColors(r, g, b, shade);
+		SPR_Set(m_hSprite, r, g, b );
+
+		x = ScreenWidth()/2 - SPR_Width(m_hSprite, 3) * 3;
+		y = ScreenHeight()/2 - SPR_Height(m_hSprite,3)/2;
+		SPR_DrawAdditive(3, x, y, NULL);
+
+		m_fAttackLeft = max( 0, m_fAttackLeft - fFade );
+	} else
+		m_fAttackLeft = 0;
+
+	return 1;
+}
+
+int CHudHealth::DrawDamage(float flTime)
+{
+	int r, g, b, a;
+	DAMAGE_IMAGE *pdmg;
+
+	if (!m_bitsDamage)
+		return 1;
+
+	gHUD.GetPrimaryHudColor(r, g, b);
+	a = (int)( fabs(sin(flTime*2)) * 256.0);
+
+	ScaleColors(r, g, b, a);
+
+	// Draw all the items
+	for (int i = 0; i < NUM_DMG_TYPES; i++)
+	{
+		if (m_bitsDamage & giDmgFlags[i])
+		{
+			pdmg = &m_dmg[i];
+			SPR_Set(gHUD.GetSprite(m_HUD_dmg_bio + i), r, g, b );
+			SPR_DrawAdditive(0, pdmg->x, pdmg->y, &gHUD.GetSpriteRect(m_HUD_dmg_bio + i));
+		}
+	}
+
+
+	// check for bits that should be expired
+	for ( i = 0; i < NUM_DMG_TYPES; i++ )
+	{
+		DAMAGE_IMAGE *pdmg = &m_dmg[i];
+
+		if ( m_bitsDamage & giDmgFlags[i] )
+		{
+			pdmg->fExpire = min( flTime + DMG_IMAGE_LIFE, pdmg->fExpire );
+
+			if ( pdmg->fExpire <= flTime		// when the time has expired
+				&& a < 40 )						// and the flash is at the low point of the cycle
+			{
+				pdmg->fExpire = 0;
+
+				int y = pdmg->y;
+				pdmg->x = pdmg->y = 0;
+
+				// move everyone above down
+				for (int j = 0; j < NUM_DMG_TYPES; j++)
+				{
+					pdmg = &m_dmg[j];
+					if ((pdmg->y) && (pdmg->y < y))
+						pdmg->y += giDmgHeight;
+
+				}
+
+				m_bitsDamage &= ~giDmgFlags[i];  // clear the bits
+			}
+		}
+	}
+
+	return 1;
+}
+ 
+
+void CHudHealth::UpdateTiles(float flTime, long bitsDamage)
+{	
+	DAMAGE_IMAGE *pdmg;
+
+	// Which types are new?
+	long bitsOn = ~m_bitsDamage & bitsDamage;
+	
+	for (int i = 0; i < NUM_DMG_TYPES; i++)
+	{
+		pdmg = &m_dmg[i];
+
+		// Is this one already on?
+		if (m_bitsDamage & giDmgFlags[i])
+		{
+			pdmg->fExpire = flTime + DMG_IMAGE_LIFE; // extend the duration
+			if (!pdmg->fBaseline)
+				pdmg->fBaseline = flTime;
+		}
+
+		// Are we just turning it on?
+		if (bitsOn & giDmgFlags[i])
+		{
+			// put this one at the bottom
+			pdmg->x = giDmgWidth/8;
+			pdmg->y = ScreenHeight() - giDmgHeight * 2;
+			pdmg->fExpire=flTime + DMG_IMAGE_LIFE;
+			
+			// move everyone else up
+			for (int j = 0; j < NUM_DMG_TYPES; j++)
+			{
+				if (j == i)
+					continue;
+
+				pdmg = &m_dmg[j];
+				if (pdmg->y)
+					pdmg->y -= giDmgHeight;
+
+			}
+			pdmg = &m_dmg[i];
+		}	
+	}	
+
+	// damage bits are only turned on here;  they are turned off when the draw time has expired (in DrawDamage())
+	m_bitsDamage |= bitsDamage;
+}
+
+
+void CreateCorpse ( Vector vOrigin, Vector vAngles, const char *pModel, float flAnimTime, int iSequence, int iBody );
+
+//int CHudHealth::MsgFunc_ClCorpse( const char *pszName, int iSize, void *pbuf )
+//{
+//	BEGIN_READ( pbuf, iSize );
+//
+//	char szModel[64];
+//	Vector vOrigin;
+//	Vector vAngles;
+//	float flAnimTime = 0;
+//	int iSequence = 0;
+//	int iBody = 0;
+//
+//	char *pModel = READ_STRING();
+//
+//	sprintf ( szModel, "models/player/%s/%s.mdl", pModel, pModel );
+//
+//	vOrigin.x = READ_LONG(); vOrigin.x /= 128.0f;
+//	vOrigin.y = READ_LONG(); vOrigin.y /= 128.0f;
+//	vOrigin.z = READ_LONG(); vOrigin.z /= 128.0f;
+//
+//	vAngles.x = READ_COORD();
+//	vAngles.y = READ_COORD();
+//	vAngles.z = READ_COORD();
+//
+//	flAnimTime = ((float)READ_LONG()/100.0f) + gEngfuncs.GetClientTime();
+//	
+//	iSequence = READ_BYTE();
+//	iBody = READ_BYTE();
+//
+//	CreateCorpse ( vOrigin, vAngles, szModel, flAnimTime, iSequence, iBody );
+//
+//	return 1;
+//}
diff --git a/main/source/cl_dll/health.h b/main/source/cl_dll/health.h
new file mode 100644
index 00000000..ad9db1ed
--- /dev/null
+++ b/main/source/cl_dll/health.h
@@ -0,0 +1,118 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+#ifndef HEALTH_H
+#define HEALTH_H
+
+#define DMG_IMAGE_LIFE		2	// seconds that image is up
+
+#define DMG_IMAGE_POISON	0
+#define DMG_IMAGE_ACID		1
+#define DMG_IMAGE_COLD		2
+#define DMG_IMAGE_DROWN		3
+#define DMG_IMAGE_BURN		4
+#define DMG_IMAGE_NERVE		5
+#define DMG_IMAGE_RAD		6
+#define DMG_IMAGE_SHOCK		7
+//tf defines
+#define DMG_IMAGE_CALTROP	8
+#define DMG_IMAGE_TRANQ		9
+#define DMG_IMAGE_CONCUSS	10
+#define DMG_IMAGE_HALLUC	11
+#define NUM_DMG_TYPES		12
+// instant damage
+
+//// time-based damage
+////mask off TF-specific stuff too
+//#define DMG_TIMEBASED		(~(0xff003fff))	// mask for time-based damage
+//
+//
+//#define DMG_DROWN			(1 << 14)	// Drowning
+//#define DMG_FIRSTTIMEBASED  DMG_DROWN
+//
+//#define DMG_PARALYZE		(1 << 15)	// slows affected creature down
+//#define DMG_NERVEGAS		(1 << 16)	// nerve toxins, very bad
+//#define DMG_POISON			(1 << 17)	// blood poisioning
+//#define DMG_RADIATION		(1 << 18)	// radiation exposure
+//#define DMG_DROWNRECOVER	(1 << 19)	// drowning recovery
+//#define DMG_ACID			(1 << 20)	// toxic chemicals or acid burns
+//#define DMG_SLOWBURN		(1 << 21)	// in an oven
+//#define DMG_SLOWFREEZE		(1 << 22)	// in a subzero freezer
+//#define DMG_MORTAR			(1 << 23)	// Hit by air raid (done to distinguish grenade from mortar)
+//
+////TF ADDITIONS
+//#define DMG_IGNITE			(1 << 24)	// Players hit by this begin to burn
+//#define DMG_RADIUS_MAX		(1 << 25)	// Radius damage with this flag doesn't decrease over distance
+//#define DMG_RADIUS_QUAKE	(1 << 26)	// Radius damage is done like Quake. 1/2 damage at 1/2 radius.
+//#define DMG_IGNOREARMOR		(1 << 27)	// Damage ignores target's armor
+//#define DMG_AIMED			(1 << 28)   // Does Hit location damage
+//#define DMG_WALLPIERCING	(1 << 29)	// Blast Damages ents through walls
+//
+//#define DMG_CALTROP				(1<<30)
+//#define DMG_HALLUC				(1<<31)
+#include "common/damagetypes.h"
+
+// TF Healing Additions for TakeHealth
+#define DMG_IGNORE_MAXHEALTH	DMG_IGNITE
+// TF Redefines since we never use the originals
+#define DMG_NAIL				DMG_SLASH
+#define DMG_NOT_SELF			DMG_FREEZE
+
+
+#define DMG_TRANQ				DMG_MORTAR
+#define DMG_CONCUSS				DMG_SONIC
+
+
+
+typedef struct
+{
+	float fExpire;
+	float fBaseline;
+	int	x, y;
+} DAMAGE_IMAGE;
+	
+//
+//-----------------------------------------------------
+//
+class CHudHealth: public CHudBase
+{
+public:
+	virtual int Init( void );
+	virtual int VidInit( void );
+	virtual int Draw(float fTime);
+	virtual void Reset( void );
+	//int MsgFunc_ClCorpse(const char *pszName,  int iSize, void *pbuf);
+	int MsgFunc_Health(const char *pszName,  int iSize, void *pbuf);
+	int MsgFunc_Damage(const char *pszName,  int iSize, void *pbuf);
+	int m_iHealth;
+	int m_HUD_dmg_bio;
+	int m_HUD_cross;
+	float m_fAttackFront, m_fAttackRear, m_fAttackLeft, m_fAttackRight;
+	void GetPainColor( int &r, int &g, int &b );
+	float m_fFade;
+
+private:
+	HSPRITE m_hSprite;
+	HSPRITE m_hDamage;
+	
+	DAMAGE_IMAGE m_dmg[NUM_DMG_TYPES];
+	int	m_bitsDamage;
+	int DrawPain(float fTime);
+	int DrawDamage(float fTime);
+	void CalcDamageDirection(vec3_t vecFrom);
+	void UpdateTiles(float fTime, long bits);
+};	
+
+#endif
\ No newline at end of file
diff --git a/main/source/cl_dll/hl/hl_baseentity.cpp b/main/source/cl_dll/hl/hl_baseentity.cpp
new file mode 100644
index 00000000..27b9f244
--- /dev/null
+++ b/main/source/cl_dll/hl/hl_baseentity.cpp
@@ -0,0 +1,295 @@
+/***
+*
+*	Copyright (c) 1996-2002, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+/*
+==========================
+This file contains "stubs" of class member implementations so that we can predict certain
+ weapons client side.  From time to time you might find that you need to implement part of the
+ these functions.  If so, cut it from here, paste it in hl_weapons.cpp or somewhere else and
+ add in the functionality you need.
+==========================
+*/
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"player.h"
+#include	"weapons.h"
+#include	"nodes.h"
+#include	"soundent.h"
+#include	"skill.h"
+
+// Globals used by game logic
+const Vector g_vecZero = Vector( 0, 0, 0 );
+int gmsgWeapPickup = 0;
+enginefuncs_t g_engfuncs;
+globalvars_t  *gpGlobals;
+
+ItemInfo CBasePlayerItem::ItemInfoArray[MAX_WEAPONS];
+
+void EMIT_SOUND_DYN(edict_t *entity, int channel, const char *sample, float volume, float attenuation, int flags, int pitch) { }
+
+// CBaseEntity Stubs
+int CBaseEntity :: TakeHealth( float flHealth, int bitsDamageType ) { return 1; }
+int CBaseEntity :: TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType ) { return 1; }
+CBaseEntity *CBaseEntity::GetNextTarget( void ) { return NULL; }
+int CBaseEntity::Save( CSave &save ) { return 1; }
+int CBaseEntity::Restore( CRestore &restore ) { return 1; }
+void CBaseEntity::SetObjectCollisionBox( void ) { }
+int	CBaseEntity :: Intersects( CBaseEntity *pOther ) { return 0; }
+void CBaseEntity :: MakeDormant( void ) { }
+int CBaseEntity :: IsDormant( void ) { return 0; }
+BOOL CBaseEntity :: IsInWorld( void ) { return TRUE; }
+int CBaseEntity::ShouldToggle( USE_TYPE useType, BOOL currentState ) { return 0; }
+int	CBaseEntity :: DamageDecal( int bitsDamageType ) { return -1; }
+CBaseEntity * CBaseEntity::Create( const char *szName, const Vector &vecOrigin, const Vector &vecAngles, edict_t *pentOwner ) { return NULL; }
+void CBaseEntity::SUB_Remove( void ) { }
+void CBaseEntity::AddChecksum(Checksum& inChecksum) {}
+void CBaseEntity::UpdateOnRemove() {}
+
+// CBaseDelay Stubs
+void CBaseDelay :: KeyValue( struct KeyValueData_s * ) { }
+int CBaseDelay::Restore( class CRestore & ) { return 1; }
+int CBaseDelay::Save( class CSave & ) { return 1; }
+
+// CBaseAnimating Stubs
+int CBaseAnimating::Restore( class CRestore & ) { return 1; }
+int CBaseAnimating::Save( class CSave & ) { return 1; }
+
+// DEBUG Stubs
+edict_t *DBG_EntOfVars( const entvars_t *pev ) { return NULL; }
+// Now in AvHAssert.cpp
+//void DBG_AssertFunction(bool fExpr,	const char*	szExpr,	const char*	szFile,	int szLine,	const char*	szMessage) { }
+
+// UTIL_* Stubs
+void UTIL_PrecacheOther( const char *szClassname ) { }
+void UTIL_BloodDrips( const Vector &origin, const Vector &direction, int color, int amount ) { }
+void UTIL_DecalTrace( TraceResult *pTrace, int decalNumber ) { }
+void UTIL_GunshotDecalTrace( TraceResult *pTrace, int decalNumber ) { }
+void UTIL_MakeVectors( const Vector &vecAngles ) { }
+BOOL UTIL_IsValidEntity( edict_t *pent ) { return TRUE; }
+void UTIL_SetOrigin( entvars_t *, const Vector &org ) { }
+BOOL UTIL_GetNextBestWeapon( CBasePlayer *pPlayer, CBasePlayerItem *pCurrentWeapon ) { return TRUE; }
+void UTIL_LogPrintf(char *,...) { }
+void UTIL_ClientPrintAll( int,char const *,char const *,char const *,char const *,char const *) { }
+void ClientPrint( entvars_t *client, int msg_dest, const char *msg_name, const char *param1, const char *param2, const char *param3, const char *param4 ) { }
+
+// CBaseToggle Stubs
+int CBaseToggle::Restore( class CRestore & ) { return 1; }
+int CBaseToggle::Save( class CSave & ) { return 1; }
+void CBaseToggle :: KeyValue( struct KeyValueData_s * ) { }
+void CBaseToggle::SaveDataForReset() {}
+void CBaseToggle::ResetEntity() {}
+
+// CGrenade Stubs
+void CGrenade::BounceSound( void ) { }
+void CGrenade::Explode( Vector, Vector ) { }
+void CGrenade::Explode( TraceResult *, int ) { }
+void CGrenade::Killed( entvars_t *, int ) { }
+void CGrenade::Spawn( void ) { }
+CGrenade * CGrenade:: ShootTimed( entvars_t *pevOwner, Vector vecStart, Vector vecVelocity, float time ){ return 0; }
+CGrenade *CGrenade::ShootContact( entvars_t *pevOwner, Vector vecStart, Vector vecVelocity ){ return 0; }
+void CGrenade::DetonateUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value ){ }
+
+void UTIL_Remove( CBaseEntity *pEntity ){ }
+struct skilldata_t  gSkillData;
+void UTIL_SetSize( entvars_t *pev, const Vector &vecMin, const Vector &vecMax ){ }
+CBaseEntity *UTIL_FindEntityInSphere( CBaseEntity *pStartEntity, const Vector &vecCenter, float flRadius ){ return 0;}
+
+Vector UTIL_VecToAngles( const Vector &vec ){ return 0; }
+CSprite *CSprite::SpriteCreate( const char *pSpriteName, const Vector &origin, BOOL animate ) { return 0; }
+void CBeam::PointEntInit( const Vector &start, int endIndex ) { }
+CBeam *CBeam::BeamCreate( const char *pSpriteName, int width ) { return NULL; }
+void CSprite::Expand( float scaleSpeed, float fadeSpeed ) { }
+
+
+CBaseEntity* CBaseMonster :: CheckTraceHullAttack( float flDist, float& ioDamage, int iDmgType ) { return NULL; }
+int CBaseMonster::GetHull() const { return head_hull; }
+void CBaseMonster :: Look ( int iDistance ) { }
+float CBaseAnimating :: StudioFrameAdvance ( float flInterval ) { return 0.0; }
+int CBaseMonster::IRelationship ( CBaseEntity *pTarget ) { return 0; }
+CBaseEntity *CBaseMonster :: BestVisibleEnemy ( void ) { return NULL; }
+BOOL CBaseMonster :: FInViewCone ( CBaseEntity *pEntity ) { return FALSE; }
+BOOL CBaseMonster :: FInViewCone ( Vector *pOrigin ) { return FALSE; }
+BOOL CBaseEntity :: FVisible ( CBaseEntity *pEntity ) { return FALSE; }
+BOOL CBaseEntity :: FVisible ( const Vector &vecOrigin ) { return FALSE; }
+void CBaseMonster :: MakeIdealYaw( Vector vecTarget ) { }
+float CBaseMonster::ChangeYaw ( int yawSpeed ) { return 0; }
+int CBaseAnimating :: LookupActivity ( int activity ) { return 0; }
+int CBaseAnimating :: LookupActivityHeaviest ( int activity ) { return 0; }
+int CBaseAnimating :: LookupSequence ( const char *label ) { return 0; }
+void CBaseAnimating :: ResetSequenceInfo ( ) { }
+BOOL CBaseAnimating :: GetSequenceFlags( ) { return FALSE; }
+void CBaseAnimating :: DispatchAnimEvents ( float flInterval ) { }
+float CBaseAnimating :: SetBoneController ( int iController, float flValue ) { return 0.0; }
+void CBaseAnimating :: InitBoneControllers ( void ) { }
+float CBaseAnimating :: SetBlending ( int iBlender, float flValue ) { return 0; }
+void CBaseAnimating :: GetBonePosition ( int iBone, Vector &origin, Vector &angles ) { }
+void CBaseAnimating :: GetAttachment ( int iAttachment, Vector &origin, Vector &angles ) { }
+int CBaseAnimating :: FindTransition( int iEndingSequence, int iGoalSequence, int *piDir ) { return -1; }
+void CBaseAnimating :: GetAutomovement( Vector &origin, Vector &angles, float flInterval ) { }
+void CBaseAnimating :: SetBodygroup( int iGroup, int iValue ) { }
+int CBaseAnimating :: GetBodygroup( int iGroup ) { return 0; }
+void CBaseEntity::TraceAttack(entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType) { }
+void CBaseEntity::FireBullets(ULONG cShots, Vector vecSrc, Vector vecDirShooting, Vector vecSpread, float flDistance, int iBulletType, int iTracerFreq, int iDamage, entvars_t *pevAttacker, int inDamageType ) { }
+void CBaseEntity :: TraceBleed( float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType ) { }
+void CBaseMonster :: MakeDamageBloodDecal ( int cCount, float flNoise, TraceResult *ptr, const Vector &vecDir ) { }
+void CBaseMonster::ReportAIState( void ) { }
+void CBaseMonster :: KeyValue( KeyValueData *pkvd ) { }
+BOOL CBaseMonster :: FCheckAITrigger ( void ) { return FALSE; }
+void CBaseMonster::CorpseFallThink( void ) { }
+void CBaseMonster :: MonsterInitDead( void ) { }
+void CBaseMonster :: TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType) { }
+BOOL CBaseMonster :: ShouldFadeOnDeath( void ) { return FALSE; }
+void CBaseMonster :: RadiusDamage(entvars_t* pevInflictor, entvars_t*	pevAttacker, float flDamage, int iClassIgnore, int bitsDamageType ) { }
+void CBaseMonster :: RadiusDamage( Vector vecSrc, entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int iClassIgnore, int bitsDamageType ) { }
+void CBaseMonster::FadeMonster( void ) { }
+void CBaseMonster :: GibMonster( void ) { }
+BOOL CBaseMonster :: HasHumanGibs( void ) { return FALSE; }
+BOOL CBaseMonster :: HasAlienGibs( void ) { return FALSE; }
+Activity CBaseMonster :: GetDeathActivity ( void ) { return ACT_DIE_HEADSHOT; }
+void CBaseMonster::BecomeDead( void ) {}
+void CBaseMonster :: Killed( entvars_t *pevAttacker, int iGib ) {}
+int CBaseMonster :: TakeHealth (float flHealth, int bitsDamageType) { return 0; }
+int CBaseMonster :: TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType ) { return 0; }
+
+int TrainSpeed(int iSpeed, int iMax) { 	return 0; }
+void CBasePlayer :: DeathSound( void ) { }
+int CBasePlayer :: TakeHealth( float flHealth, int bitsDamageType ) { return 0; }
+void CBasePlayer :: TabulateAmmo() { }
+void CBasePlayer :: TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType) { }
+int CBasePlayer :: TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType ) { return 0; }
+void CBasePlayer::PackDeadPlayerItems( void ) { }
+void CBasePlayer::RemoveAllItems( BOOL removeSuit ) { }
+void CBasePlayer::SetAnimation( PLAYER_ANIM playerAnim ) { }
+void CBasePlayer::WaterMove() { }
+void CBasePlayer :: InitPlayerFromSpawn(edict_t* inSpawn) {}
+BOOL CBasePlayer::IsOnLadder( void ) { return FALSE; }
+BOOL CBasePlayer::IsAlive() const { return FALSE; }
+BOOL CBasePlayer::IsAlive(bool) const { return FALSE; }
+void CBasePlayer::PlayerDeathThink(void) { }
+void CBasePlayer::StartDeathCam( void ) { }
+void CBasePlayer::StartObserver( Vector vecPosition, Vector vecViewAngle ) { }
+void CBasePlayer::StopObserver() { }
+void CBasePlayer::PlayerUse ( void ) { }
+void CBasePlayer::Jump() { }
+void CBasePlayer::Duck( ) { }
+int  CBasePlayer::Classify ( void ) { return 0; }
+void CBasePlayer::PreThink(void) { }
+void CBasePlayer::CheckTimeBasedDamage()  { }
+void CBasePlayer :: UpdateGeigerCounter( void ) { }
+void CBasePlayer::CheckSuitUpdate() { }
+void CBasePlayer::SetSuitUpdate(char *name, int fgroup, int iNoRepeatTime) { }
+void CBasePlayer :: UpdatePlayerSound ( void ) { }
+void CBasePlayer::PostThink() { }
+void CBasePlayer::EffectivePlayerClassChanged() {}
+void CBasePlayer::NeedsTeamUpdate() {}
+void CBasePlayer::SendTeamUpdate() {}
+void CBasePlayer::Suicide() {}
+void CBasePlayer :: Precache( void ) { }
+int CBasePlayer::Save( CSave &save ) { return 0; }
+void CBasePlayer::RenewItems(void) { }
+int CBasePlayer::Restore( CRestore &restore ) { return 0; }
+void CBasePlayer::SelectNextItem( int iItem ) { }
+BOOL CBasePlayer::HasWeapons( void ) { return FALSE; }
+void CBasePlayer::SelectPrevItem( int iItem ) { }
+CBaseEntity *FindEntityForward( CBaseEntity *pMe ) { return NULL; }
+BOOL CBasePlayer :: FlashlightIsOn( void ) { return FALSE; }
+void CBasePlayer :: FlashlightTurnOn( void ) { }
+void CBasePlayer :: FlashlightTurnOff( void ) { }
+void CBasePlayer :: ForceClientDllUpdate( void ) { }
+void CBasePlayer::ImpulseCommands( ) { }
+void CBasePlayer::CheatImpulseCommands( int iImpulse ) { }
+int CBasePlayer::AddPlayerItem( CBasePlayerItem *pItem ) { return FALSE; }
+int CBasePlayer::RemovePlayerItem( CBasePlayerItem *pItem ) { return FALSE; }
+void CBasePlayer::ItemPreFrame() { }
+void CBasePlayer::ItemPostFrame() { }
+int CBasePlayer::AmmoInventory( int iAmmoIndex ) { return -1; }
+int CBasePlayer::GetAmmoIndex(const char *psz) { return -1; }
+int CBasePlayer::GetMaxWalkSpeed() const { return 220; }
+void CBasePlayer::SendAmmoUpdate(void) { }
+void CBasePlayer::SendWeaponUpdate() {}
+void CBasePlayer :: UpdateClientData( void ) { }
+BOOL CBasePlayer :: FBecomeProne ( void ) { return TRUE; }
+void CBasePlayer :: BarnacleVictimBitten ( entvars_t *pevBarnacle ) { }
+void CBasePlayer :: BarnacleVictimReleased ( void ) { }
+int CBasePlayer :: Illumination( void ) { return 0; }
+void CBasePlayer :: EnableControl(BOOL fControl) { }
+Vector CBasePlayer :: GetAutoaimVector( float flDelta ) { return g_vecZero; }
+Vector CBasePlayer :: AutoaimDeflection( Vector &vecSrc, float flDist, float flDelta  ) { return g_vecZero; }
+void CBasePlayer :: ResetAutoaim( ) { }
+void CBasePlayer :: SetCustomDecalFrames( int nFrames ) { }
+int CBasePlayer :: GetCustomDecalFrames( void ) { return -1; }
+void CBasePlayer::DropPlayerItem ( char *pszItemName ) { }
+BOOL CBasePlayer::HasPlayerItem( CBasePlayerItem *pCheckItem ) { return FALSE; }
+BOOL CBasePlayer :: SwitchWeapon( CBasePlayerItem *pWeapon )  { return FALSE; }
+Vector CBasePlayer :: GetGunPosition( void ) { return g_vecZero; }
+char *CBasePlayer::TeamID( void ) { return ""; }
+void CBasePlayer::SetTeamID(const char* inTeamID) {};
+int CBasePlayer :: GiveAmmo( int iCount, char *szName, int iMax ) { return 0; }
+void CBasePlayer::AddPoints( int score, BOOL bAllowNegativeScore ) { } 
+void CBasePlayer::AddPointsToTeam( int score, BOOL bAllowNegativeScore ) { } 
+void CBasePlayer::GiveNamedItem(const char* szName, bool inSendMessage) { } 
+
+void ClearMultiDamage(void) { }
+void ApplyMultiDamage(entvars_t *pevInflictor, entvars_t *pevAttacker ) { }
+void AddMultiDamage( entvars_t *pevInflictor, CBaseEntity *pEntity, float flDamage, int bitsDamageType) { }
+void SpawnBlood(Vector vecSpot, int bloodColor, float flDamage) { }
+int DamageDecal( CBaseEntity *pEntity, int bitsDamageType ) { return 0; }
+void DecalGunshot( TraceResult *pTrace, int iBulletType ) { }
+void EjectBrass ( const Vector &vecOrigin, const Vector &vecVelocity, float rotation, int model, int soundtype ) { }
+void AddAmmoNameToAmmoRegistry( const char *szAmmoname ) { }
+
+BOOL CBasePlayerItem::CanDeploy( void ) { return TRUE; } 
+BOOL CBasePlayerItem::CanHolster( void ) { return TRUE; }
+BOOL CBasePlayerItem::Deploy( )	{ return TRUE; }
+BOOL CBasePlayerItem::IsUseable( void ) { return TRUE; }
+void CBasePlayerItem::Spawn() {}
+
+int CBasePlayerItem::Restore( class CRestore & ) { return 1; }
+int CBasePlayerItem::Save( class CSave & ) { return 1; }
+int CBasePlayerWeapon::Restore( class CRestore & ) { return 1; }
+int CBasePlayerWeapon::Save( class CSave & ) { return 1; }
+void CBasePlayerItem :: SetObjectCollisionBox( void ) { }
+void CBasePlayerItem :: FallInit( void ) { }
+void CBasePlayerItem::FallThink ( void ) { }
+void CBasePlayerItem::Materialize( void ) { }
+void CBasePlayerItem::AttemptToMaterialize( void ) { }
+void CBasePlayerItem :: CheckRespawn ( void ) { }
+CBaseEntity* CBasePlayerItem::Respawn( void ) { return NULL; }
+void CBasePlayerItem::DefaultTouch( CBaseEntity *pOther ) { }
+void CBasePlayerItem::DestroyItem( void ) { }
+void CBasePlayerItem::VirtualDestroyItem( void ) { }
+int CBasePlayerItem::AddToPlayer( CBasePlayer *pPlayer ) { return TRUE; }
+void CBasePlayerItem::Drop( void ) { }
+void CBasePlayerItem::Kill( void ) { }
+void CBasePlayerItem::Holster( int skiplocal ) { }
+void CBasePlayerItem::AttachToPlayer ( CBasePlayer *pPlayer ) { }
+int CBasePlayerWeapon::AddDuplicate( CBasePlayerItem *pOriginal ) { return 0; }
+int CBasePlayerWeapon::AddToPlayer( CBasePlayer *pPlayer ) { return FALSE; }
+int CBasePlayerWeapon::UpdateClientData( CBasePlayer *pPlayer ) { return 0; }
+BOOL CBasePlayerWeapon :: AddPrimaryAmmo( int iCount, char *szName, int iMaxClip, int iMaxCarry ) { return TRUE; }
+BOOL CBasePlayerWeapon :: AddSecondaryAmmo( int iCount, char *szName, int iMax ) { return TRUE; }
+BOOL CBasePlayerWeapon :: IsUseable( void ) { return TRUE; }
+int CBasePlayerWeapon::PrimaryAmmoIndex( void ) { return -1; }
+int CBasePlayerWeapon::SecondaryAmmoIndex( void ) {	return -1; }
+void CBasePlayerAmmo::Spawn( void ) { }
+CBaseEntity* CBasePlayerAmmo::Respawn( void ) { return this; }
+void CBasePlayerAmmo::Materialize( void ) { }
+void CBasePlayerAmmo :: DefaultTouch( CBaseEntity *pOther ) { }
+int CBasePlayerWeapon::ExtractAmmo( CBasePlayerWeapon *pWeapon ) { return 0; }
+int CBasePlayerWeapon::ExtractClipAmmo( CBasePlayerWeapon *pWeapon ) { return 0; }	
+void CBasePlayerWeapon::RetireWeapon( void ) { }
+void CSoundEnt::InsertSound ( int iType, const Vector &vecOrigin, int iVolume, float flDuration ) {}
+void RadiusDamage( Vector vecSrc, entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, float flRadius, int iClassIgnore, int bitsDamageType ){}
\ No newline at end of file
diff --git a/main/source/cl_dll/hl/hl_events.cpp b/main/source/cl_dll/hl/hl_events.cpp
new file mode 100644
index 00000000..ec8d77f5
--- /dev/null
+++ b/main/source/cl_dll/hl/hl_events.cpp
@@ -0,0 +1,99 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#include "../hud.h"
+#include "../cl_util.h"
+#include "event_api.h"
+#include "mod/AvHMarineWeaponConstants.h"
+#include "mod/AvHAlienWeaponConstants.h"
+
+extern "C"
+{
+// HLDM
+void EV_FireGlock1( struct event_args_s *args  );
+void EV_FireGlock2( struct event_args_s *args  );
+void EV_FireShotGunSingle( struct event_args_s *args  );
+void EV_FireShotGunDouble( struct event_args_s *args  );
+void EV_FireMP5( struct event_args_s *args  );
+void EV_FireMP52( struct event_args_s *args  );
+void EV_FirePython( struct event_args_s *args  );
+void EV_FireGauss( struct event_args_s *args  );
+void EV_SpinGauss( struct event_args_s *args  );
+void EV_Crowbar( struct event_args_s *args );
+void EV_FireCrossbow( struct event_args_s *args );
+void EV_FireCrossbow2( struct event_args_s *args );
+void EV_FireRpg( struct event_args_s *args );
+void EV_EgonFire( struct event_args_s *args );
+void EV_EgonStop( struct event_args_s *args );
+void EV_HornetGunFire( struct event_args_s *args );
+void EV_TripmineFire( struct event_args_s *args );
+void EV_SnarkFire( struct event_args_s *args );
+
+
+
+void EV_TrainPitchAdjust( struct event_args_s *args );
+}
+
+/*
+======================
+Game_HookEvents
+
+Associate script file name with callback functions.  Callback's must be extern "C" so
+ the engine doesn't get confused about name mangling stuff.  Note that the format is
+ always the same.  Of course, a clever mod team could actually embed parameters, behavior
+ into the actual .sc files and create a .sc file parser and hook their functionality through
+ that.. i.e., a scripting system.
+
+That was what we were going to do, but we ran out of time...oh well.
+======================
+*/
+
+#define AVH_HOOK_EVENT(s) gEngfuncs.pfnHookEvent("events/"#s".dsc", EV_#s)
+
+void Game_HookEvents( void )
+{
+//	gEngfuncs.pfnHookEvent( "events/glock1.sc",					EV_FireGlock1 );
+//	gEngfuncs.pfnHookEvent( "events/glock2.sc",					EV_FireGlock2 );
+//	gEngfuncs.pfnHookEvent( "events/shotgun1.sc",				EV_FireShotGunSingle );
+//	gEngfuncs.pfnHookEvent( "events/shotgun2.sc",				EV_FireShotGunDouble );
+//	gEngfuncs.pfnHookEvent( "events/mp5.sc",					EV_FireMP5 );
+//	gEngfuncs.pfnHookEvent( "events/python.sc",					EV_FirePython );
+//	gEngfuncs.pfnHookEvent( "events/gauss.sc",					EV_FireGauss );
+//	gEngfuncs.pfnHookEvent( "events/gaussspin.sc",				EV_SpinGauss );
+//	gEngfuncs.pfnHookEvent( "events/train.sc",					EV_TrainPitchAdjust );
+
+    // Hook marine weapons
+    AVH_HOOK_EVENT(kMGEventName);
+
+//	gEngfuncs.pfnHookEvent("events/train.sc",					EV_TrainPitchAdjust);
+//	gEngfuncs.pfnHookEvent( "events/glock1.sc",					EV_FireGlock1 );
+//	gEngfuncs.pfnHookEvent( "events/glock2.sc",					EV_FireGlock2 );
+//	gEngfuncs.pfnHookEvent( "events/shotgun1.sc",				EV_FireShotGunSingle );
+//	gEngfuncs.pfnHookEvent( "events/shotgun2.sc",				EV_FireShotGunDouble );
+//	gEngfuncs.pfnHookEvent( "events/mp5.sc",					EV_FireMP5 );
+//	gEngfuncs.pfnHookEvent( "events/mp52.sc",					EV_FireMP52 );
+//	gEngfuncs.pfnHookEvent( "events/python.sc",					EV_FirePython );
+//	gEngfuncs.pfnHookEvent( "events/gauss.sc",					EV_FireGauss );
+//	gEngfuncs.pfnHookEvent( "events/gaussspin.sc",				EV_SpinGauss );
+//	gEngfuncs.pfnHookEvent( "events/train.sc",					EV_TrainPitchAdjust );
+//	gEngfuncs.pfnHookEvent( "events/crowbar.sc",				EV_Crowbar );
+//	gEngfuncs.pfnHookEvent( "events/crossbow1.sc",				EV_FireCrossbow );
+//	gEngfuncs.pfnHookEvent( "events/crossbow2.sc",				EV_FireCrossbow2 );
+//	gEngfuncs.pfnHookEvent( "events/rpg.sc",					EV_FireRpg );
+//	gEngfuncs.pfnHookEvent( "events/egon_fire.sc",				EV_EgonFire );
+//	gEngfuncs.pfnHookEvent( "events/egon_stop.sc",				EV_EgonStop );
+//	gEngfuncs.pfnHookEvent( "events/firehornet.sc",				EV_HornetGunFire );
+//	gEngfuncs.pfnHookEvent( "events/tripfire.sc",				EV_TripmineFire );
+//	gEngfuncs.pfnHookEvent( "events/snarkfire.sc",				EV_SnarkFire );
+}
diff --git a/main/source/cl_dll/hl/hl_objects.cpp b/main/source/cl_dll/hl/hl_objects.cpp
new file mode 100644
index 00000000..e84762b8
--- /dev/null
+++ b/main/source/cl_dll/hl/hl_objects.cpp
@@ -0,0 +1,89 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#include "../hud.h"
+#include "../cl_util.h"
+#include "../demo.h"
+
+#include "demo_api.h"
+#include "const.h"
+#include "entity_state.h"
+#include "cl_entity.h"
+
+#include "pm_defs.h"
+#include "event_api.h"
+#include "entity_types.h"
+#include "r_efx.h"
+
+extern BEAM *pBeam;
+extern BEAM *pBeam2;
+void HUD_GetLastOrg( float *org );
+
+void UpdateBeams ( void )
+{
+	vec3_t forward, vecSrc, vecEnd, origin, angles, right, up;
+	vec3_t view_ofs;
+	pmtrace_t tr;
+	cl_entity_t *pthisplayer = gEngfuncs.GetLocalPlayer();
+	int idx = pthisplayer->index;
+		
+	// Get our exact viewangles from engine
+	gEngfuncs.GetViewAngles( (float *)angles );
+
+	// Determine our last predicted origin
+	HUD_GetLastOrg( (float *)&origin );
+
+	AngleVectors( angles, forward, right, up );
+
+	VectorCopy( origin, vecSrc );
+	VectorMA( vecSrc, 2048, forward, vecEnd );
+
+	gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction( false, true );	
+						
+	// Store off the old count
+	gEngfuncs.pEventAPI->EV_PushPMStates();
+					
+	// Now add in all of the players.
+	gEngfuncs.pEventAPI->EV_SetSolidPlayers ( idx - 1 );	
+
+	gEngfuncs.pEventAPI->EV_SetTraceHull( 2 );
+	gEngfuncs.pEventAPI->EV_PlayerTrace( vecSrc, vecEnd, PM_STUDIO_BOX, -1, &tr );
+
+	gEngfuncs.pEventAPI->EV_PopPMStates();
+
+	if ( pBeam )
+	{
+		pBeam->target = tr.endpos;
+		pBeam->die	  = gEngfuncs.GetClientTime() + 0.1; // We keep it alive just a little bit forward in the future, just in case.
+	}
+	
+	if ( pBeam2 )
+	{
+		pBeam2->target = tr.endpos;
+		pBeam2->die	   = gEngfuncs.GetClientTime() + 0.1; // We keep it alive just a little bit forward in the future, just in case.
+	}
+}
+
+/*
+=====================
+Game_AddObjects
+
+Add game specific, client-side objects here
+=====================
+*/
+void Game_AddObjects( void )
+{
+	if ( pBeam && pBeam2 )
+		UpdateBeams();
+}
diff --git a/main/source/cl_dll/hl/hl_weapons.cpp b/main/source/cl_dll/hl/hl_weapons.cpp
new file mode 100644
index 00000000..be1c478b
--- /dev/null
+++ b/main/source/cl_dll/hl/hl_weapons.cpp
@@ -0,0 +1,1434 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+*   Modified by Charlie Cleveland:
+*
+* $Workfile: hl_weapons.cpp $
+* $Date: 2002/10/24 21:11:52 $
+*
+* -------------------------------------------------------------------------------
+*  $Log: hl_weapons.cpp,v $
+*  Revision 1.31  2002/10/24 21:11:52  Flayra
+*  - Updated jetpack effect because it was really buggy this old way
+*
+*  Revision 1.30  2002/10/16 02:12:10  Flayra
+*  - Valve anti-cheat integrated!
+*
+*  Revision 1.29  2002/10/16 00:36:40  Flayra
+*  - Removed blink fail
+*
+*  Revision 1.28  2002/08/31 18:01:59  Flayra
+*  - Work at VALVe
+*
+*  Revision 1.27  2002/07/08 16:09:03  Flayra
+*  - Removed unneeded code here, so random numbers were generated properly on both client and server
+*
+*  Revision 1.26  2002/07/01 20:56:31  Flayra
+*  - Added babbler gun
+*
+*  Revision 1.25  2002/06/25 17:03:01  Flayra
+*  - Removed old weapons, added new weapons, fixed mines, iuser3 enables and disables weapons
+*
+* ===============================================================================
+****/
+#include "../hud.h"
+#include "../cl_util.h"
+#include "const.h"
+#include "entity_state.h"
+#include "cl_entity.h"
+#include "../demo.h"
+#include "common/usercmd.h"
+#include "common/event_flags.h"
+#include "common/event_api.h"
+#include "cl_dll/com_weapons.h"
+#include "cl_dll/ammo.h"
+#include "cl_dll/ammohistory.h"
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "player.h"
+#include "mod/AvHEvents.h"
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "player.h"
+
+#include "usercmd.h"
+#include "entity_state.h"
+#include "demo_api.h"
+#include "pm_defs.h"
+#include "event_api.h"
+#include "r_efx.h"
+
+#include "../hud_iface.h"
+#include "../com_weapons.h"
+
+#include "mod/AvHMarineWeapons.h"
+#include "mod/AvHSpecials.h"
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHAlienAbilities.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHMovementUtil.h"
+
+#include "engine/APIProxy.h"
+#include "cl_dll/Exports.h"
+
+extern globalvars_t *gpGlobals;
+extern bool gIsJetpacking;
+
+// Pool of client side entities/entvars_t
+static entvars_t	ev[ 32 ];
+static int			num_ents = 0;
+
+// The entity we'll use to represent the local client
+static CBasePlayer	player;
+
+// Local version of game .dll global variables ( time, etc. )
+static globalvars_t	Globals; 
+
+static CBasePlayerWeapon *g_pWpns[ 32 ];
+
+vec3_t previousorigin;
+
+// HLDM Weapon placeholder entities.
+//CGlock				g_Glock;
+
+// NS weapons
+AvHKnife			gKnife;
+AvHMachineGun		gMachineGun;
+AvHPistol			gPistol;
+AvHSonicGun			gSonicGun;
+AvHHeavyMachineGun	gHeavyMachineGun;
+AvHGrenadeGun		gGrenadeGun;
+AvHGrenade          gGrenade;
+AvHWelder			gWelder;
+AvHMine				gMine;
+AvHSpitGun			gSpitGun;
+AvHClaws			gClaws;
+AvHSpore			gSpores;
+AvHBite				gBite;
+AvHBite2			gBite2;
+AvHSpikeGun			gSpikeGun;
+AvHSwipe			gSwipe;
+AvHWebSpinner		gWebSpinner;
+AvHPrimalScream		gPrimalScream;
+AvHParasiteGun		gParasite;
+AvHUmbraGun			gUmbra;
+AvHBlinkGun			gBlink;
+AvHDivineWind		gDivineWind;
+//AvHParalysisGun		gParalysisGun;
+AvHBileBombGun		gBileBomb;
+AvHAcidRocketGun	gAcidRocket;
+AvHHealingSpray		gHealingSpray;
+AvHMetabolize		gMetabolize;
+AvHDevour			gDevour;
+AvHStomp			gStomp;
+
+// Alien abilities
+AvHLeap				gLeap;
+AvHCharge			gCharge;
+
+// Jetpack events
+int gJetpackEventID;
+//int gWallJumpEventID;
+//int gFlightEventID;
+int gTeleportEventID;
+int gPhaseInEventID;
+int gSiegeHitEventID;
+int gSiegeViewHitEventID;
+int gCommanderPointsAwardedEventID;
+int gBlinkEffectSuccessEventID;
+
+//bool gPlayingJetpack = false;
+//CGlock g_Glock;
+//CCrowbar g_Crowbar;
+//CPython g_Python;
+//CMP5 g_Mp5;
+//CCrossbow g_Crossbow;
+//CShotgun g_Shotgun;
+//CRpg g_Rpg;
+//CGauss g_Gauss;
+//CEgon g_Egon;
+//CHgun g_HGun;
+//CHandGrenade g_HandGren;
+//CSatchel g_Satchel;
+//CTripmine g_Tripmine;
+//CSqueak g_Snark;
+
+/*
+======================
+AlertMessage
+
+Print debug messages to console
+======================
+*/
+void AlertMessage( ALERT_TYPE atype, char *szFmt, ... )
+{
+	va_list		argptr;
+	static char	string[1024];
+	
+	va_start (argptr, szFmt);
+	vsprintf (string, szFmt,argptr);
+	va_end (argptr);
+
+	gEngfuncs.Con_Printf( "cl:  " );
+	gEngfuncs.Con_Printf( string );
+}
+
+// Client-side effects for jetpack
+void CheckJetpack()
+{
+	// if local player is jetpacking, play effects immediately
+//	if(gIsJetpacking && !gPlayingJetpack)
+//	{	
+//		cl_entity_t* thePlayer;
+//		thePlayer = gEngfuncs.GetLocalPlayer();
+//		ASSERT(thePlayer);
+//		
+//		// Play event locally, server will tell everyone else to play event
+//		gEngfuncs.pEventAPI->EV_PlaybackEvent(0, NULL, gJetpackEventID, 0, thePlayer->origin, (float *)&g_vecZero, 0.0, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+//		
+//		//gPlayingJetpack = true;
+//	}
+	// Check to turn it off too (in case there's a network anomaly or the game resets or something, just trying to be safe)
+	//else if(!gIsJetpacking && (gPlayingJetpack))
+	//{
+	//	gEngfuncs.pEventAPI->EV_PlaybackEvent(0, NULL, gEndJetpackEventID, 0, (float *)&g_vecZero, (float *)&g_vecZero, 0.0, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+	//	
+	//	gPlayingJetpack = false;
+	//}
+}
+
+//Returns if it's multiplayer.
+//Mostly used by the client side weapons.
+bool bIsMultiplayer ( void )
+{
+	return gEngfuncs.GetMaxClients() == 1 ? 0 : 1;
+}
+//Just loads a v_ model.
+void LoadVModel ( char *szViewModel, CBasePlayer *m_pPlayer )
+{
+	gEngfuncs.CL_LoadModel( szViewModel, &m_pPlayer->pev->viewmodel );
+}
+
+/*
+=====================
+HUD_PrepEntity
+
+Links the raw entity to an entvars_s holder.  If a player is passed in as the owner, then
+we set up the m_pPlayer field.
+=====================
+*/
+void HUD_PrepEntity( CBaseEntity *pEntity, CBasePlayer *pWeaponOwner )
+{
+	typedef	vector<int>	IDListType;
+	static IDListType	sIDList;
+
+	memset( &ev[ num_ents ], 0, sizeof( entvars_t ) );
+	pEntity->pev = &ev[ num_ents++ ];
+
+	pEntity->Precache();
+	pEntity->Spawn();
+
+	if ( pWeaponOwner )
+	{
+		ItemInfo info;
+		
+		((CBasePlayerWeapon *)pEntity)->m_pPlayer = pWeaponOwner;
+		
+		((CBasePlayerWeapon *)pEntity)->GetItemInfo( &info );
+
+		// ASSERT that a weapon with this id isn't in the list
+		int theNewID = info.iId;
+		IDListType::iterator theIter = std::find(sIDList.begin(), sIDList.end(), theNewID);
+		ASSERT(theIter == sIDList.end());
+
+		// Insert id into our list
+		sIDList.push_back(theNewID);
+
+		g_pWpns[ theNewID ] = (CBasePlayerWeapon *)pEntity;
+	}
+}
+
+/*
+=====================
+CBaseEntity :: Killed
+
+If weapons code "kills" an entity, just set its effects to EF_NODRAW
+=====================
+*/
+void CBaseEntity :: Killed( entvars_t *pevAttacker, int iGib )
+{
+	pev->effects |= EF_NODRAW;
+}
+
+/*
+=====================
+CBasePlayerWeapon :: DefaultReload
+=====================
+*/
+BOOL CBasePlayerWeapon :: DefaultReload( int iClipSize, int iAnim, float fDelay, int body )
+{
+
+	if (m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] <= 0)
+		return FALSE;
+
+	int j = min(iClipSize - m_iClip, m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType]);	
+
+	if (j == 0)
+		return FALSE;
+
+	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + fDelay;
+
+	//!!UNDONE -- reload sound goes here !!!
+	//SendWeaponAnim( iAnim, UseDecrement(), body );
+
+	m_fInReload = TRUE;
+
+	m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + kDeployIdleInterval;
+	return TRUE;
+}
+
+/*
+=====================
+CBasePlayerWeapon :: CanDeploy
+=====================
+*/
+BOOL CBasePlayerWeapon :: CanDeploy( void ) 
+{
+	BOOL bHasAmmo = 0;
+
+	if ( !pszAmmo1() )
+	{
+		// this weapon doesn't use ammo, can always deploy.
+		return TRUE;
+	}
+
+	if ( pszAmmo1() )
+	{
+		bHasAmmo |= (m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] != 0);
+	}
+	if ( pszAmmo2() )
+	{
+		bHasAmmo |= (m_pPlayer->m_rgAmmo[m_iSecondaryAmmoType] != 0);
+	}
+	if (m_iClip > 0)
+	{
+		bHasAmmo |= 1;
+	}
+	if (!bHasAmmo)
+	{
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+/*
+=====================
+CBasePlayerWeapon :: DefaultDeploy
+
+=====================
+*/
+BOOL CBasePlayerWeapon :: DefaultDeploy( char *szViewModel, char *szWeaponModel, int iAnim, char *szAnimExt, int skiplocal, int	body )
+{
+	if ( !CanDeploy() )
+		return FALSE;
+
+	gEngfuncs.CL_LoadModel( szViewModel, &m_pPlayer->pev->viewmodel );
+	
+	SendWeaponAnim( iAnim, skiplocal, body );
+
+	m_pPlayer->m_flNextAttack = this->GetDeployTime();
+	m_flTimeWeaponIdle = this->GetDeployTime() + kDeployIdleInterval;
+	return TRUE;
+}
+
+/*
+=====================
+CBasePlayerWeapon :: PlayEmptySound
+
+=====================
+*/
+BOOL CBasePlayerWeapon :: PlayEmptySound( void )
+{
+	if (m_iPlayEmptySound)
+	{
+		HUD_PlaySound( "weapons/357_cock1.wav", 0.8 );
+		m_iPlayEmptySound = 0;
+		return 0;
+	}
+	return 0;
+}
+
+/*
+=====================
+CBasePlayerWeapon :: ResetEmptySound
+
+=====================
+*/
+void CBasePlayerWeapon :: ResetEmptySound( void )
+{
+	m_iPlayEmptySound = 1;
+}
+
+/*
+=====================
+CBasePlayerWeapon::Holster
+
+Put away weapon
+=====================
+*/
+void CBasePlayerWeapon::Holster( int skiplocal /* = 0 */ )
+{ 
+	m_fInReload = FALSE; // cancel any reload in progress.
+	m_pPlayer->pev->viewmodel = 0; 
+}
+
+/*
+=====================
+CBasePlayerWeapon::SendWeaponAnim
+
+Animate weapon model
+=====================
+*/
+void CBasePlayerWeapon::SendWeaponAnim( int iAnim, int skiplocal, int body )
+{
+	m_pPlayer->pev->weaponanim = iAnim;
+	
+	HUD_SendWeaponAnim( iAnim, body, 0 );
+}
+
+/*
+=====================
+CBaseEntity::FireBulletsPlayer
+
+Only produces random numbers to match the server ones.
+=====================
+*/
+Vector CBaseEntity::FireBulletsPlayer ( ULONG cShots, Vector vecSrc, Vector vecDirShooting, Vector vecSpread, float flDistance, int iBulletType, int iTracerFreq, int iDamage, entvars_t *pevAttacker, int shared_rand )
+{
+	//float x, y, z;
+	Vector theShotDirection;
+
+	theShotDirection.x = theShotDirection.y = theShotDirection.z = 0;
+		
+//	for ( ULONG iShot = 1; iShot <= cShots; iShot++ )
+//	{
+//		if ( pevAttacker == NULL )
+//		{
+//			// get circular gaussian spread
+//			do {
+//					x = RANDOM_FLOAT(-0.5, 0.5) + RANDOM_FLOAT(-0.5, 0.5);
+//					y = RANDOM_FLOAT(-0.5, 0.5) + RANDOM_FLOAT(-0.5, 0.5);
+//					z = x*x+y*y;
+//			} while (z > 1);
+//		}
+//		else
+//		{
+//			//Use player's random seed.
+//			// get circular gaussian spread
+//			x = UTIL_SharedRandomFloat( shared_rand + iShot, -0.5, 0.5 ) + UTIL_SharedRandomFloat( shared_rand + ( 1 + iShot ) , -0.5, 0.5 );
+//			y = UTIL_SharedRandomFloat( shared_rand + ( 2 + iShot ), -0.5, 0.5 ) + UTIL_SharedRandomFloat( shared_rand + ( 3 + iShot ), -0.5, 0.5 );
+//			z = x * x + y * y;
+//		}
+//
+//		UTIL_GetRandomSpreadDir(shared_rand, iShot, vecDirShooting)					
+//	}
+
+//    return Vector ( (float)(x * vecSpread.x), (float)(y * vecSpread.y), 0.0f );
+	return theShotDirection;
+}
+
+
+bool GetCanUseWeapon()
+{
+    // This mirrors the functionality of AvHPlayer::GetCanUseWeapon.
+    return !gHUD.GetIsInTopDownMode() && !gHUD.GetIsBeingDigested() && !gHUD.GetIsEnsnared() && !gHUD.GetIsStunned() && gEngfuncs.GetViewModel() != NULL;
+}
+
+/*
+=====================
+CBasePlayerWeapon::ItemPostFrame
+
+Handles weapon firing, reloading, etc.
+=====================
+*/
+void CBasePlayerWeapon::ItemPostFrame( void )
+{
+
+	if ((m_fInReload) && (m_pPlayer->m_flNextAttack <= 0.0))
+	{
+///////////////////////////////////////////////////////////////////////////////////////////////////////
+// Put code in here to predict reloads (ie, have the ammo on screen update before we get a response) //
+///////////////////////////////////////////////////////////////////////////////////////////////////////
+//#if 0 // FIXME, need ammo on client to make this work right
+//		// complete the reload. 
+//		int j = min( iMaxClip() - m_iClip, m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType]);	
+//
+//		// Add them to the clip
+//		m_iClip += j;
+//		m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] -= j;
+//#else	
+//		m_iClip += 10;
+//#endif
+		m_fInReload = FALSE;
+	}
+
+	if ((m_pPlayer->pev->button & IN_ATTACK2) && (m_flNextSecondaryAttack <= 0.0))
+	{
+        if (GetCanUseWeapon())
+        {
+		    if ( pszAmmo2() && !m_pPlayer->m_rgAmmo[SecondaryAmmoIndex()] )
+		    {
+			    m_fFireOnEmpty = TRUE;
+		    }
+
+		    SecondaryAttack();
+		    m_pPlayer->pev->button &= ~IN_ATTACK2;
+        }
+	}
+    else if ( (m_pPlayer->pev->button & IN_ATTACK) && (m_flNextPrimaryAttack <= 0.0) )
+	{
+        if (GetCanUseWeapon())
+        {
+		    if ( (m_iClip == 0 && pszAmmo1()) || 
+			    (iMaxClip() == -1 && !m_pPlayer->m_rgAmmo[PrimaryAmmoIndex()] ) )
+		    {
+			    m_fFireOnEmpty = TRUE;
+		    }
+
+		    //#ifdef AVH_CLIENT
+		    //if((m_iClip == 0) && ?
+		    //#endif
+
+		    PrimaryAttack();
+        }
+	}
+	else if ( m_pPlayer->pev->button & IN_RELOAD && iMaxClip() != WEAPON_NOCLIP && !m_fInReload ) 
+	{
+        if (GetCanUseWeapon())
+        {
+    		// reload when reload is pressed, or if no buttons are down and weapon is empty.
+	    	Reload();
+        }
+	}
+	else if ( !(m_pPlayer->pev->button & (IN_ATTACK|IN_ATTACK2) ) )
+	{
+        if (GetCanUseWeapon())
+        {
+
+		    // no fire buttons down
+
+		    m_fFireOnEmpty = FALSE;
+
+		    // weapon is useable. Reload if empty and weapon has waited as long as it has to after firing
+		    if ( m_iClip == 0 && !(iFlags() & ITEM_FLAG_NOAUTORELOAD) && m_flNextPrimaryAttack < 0.0 )
+		    {
+			    // << CGC >> Only reload if we have more ammo to reload with
+			    if(m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] > 0)
+			    {
+				    Reload();
+				    return;
+			    }
+		    }
+
+		    WeaponIdle( );
+        }
+		return;
+	}
+	
+	// catch all
+	if ( ShouldWeaponIdle() )
+	{
+		WeaponIdle();
+	}
+}
+
+/*
+=====================
+CBasePlayer::SelectItem
+
+  Switch weapons
+=====================
+*/
+void CBasePlayer::SelectItem(const char *pstr)
+{
+	if (!pstr)
+		return;
+
+	CBasePlayerItem *pItem = NULL;
+
+	if (!pItem)
+		return;
+
+	
+	if (pItem == m_pActiveItem)
+		return;
+
+	if (m_pActiveItem)
+		m_pActiveItem->Holster( );
+	
+	m_pLastItem = m_pActiveItem;
+	m_pActiveItem = pItem;
+
+	if (m_pActiveItem)
+	{
+		m_pActiveItem->Deploy( );
+	}
+}
+
+/*
+=====================
+CBasePlayer::SelectLastItem
+
+=====================
+*/
+void CBasePlayer::SelectLastItem(void)
+{
+	if (!m_pLastItem)
+	{
+		return;
+	}
+
+	if ( m_pActiveItem && !m_pActiveItem->CanHolster() )
+	{
+		return;
+	}
+
+	if (m_pActiveItem)
+		m_pActiveItem->Holster( );
+	
+	CBasePlayerItem *pTemp = m_pActiveItem;
+	m_pActiveItem = m_pLastItem;
+	m_pLastItem = pTemp;
+	m_pActiveItem->Deploy( );
+}
+
+/*
+=====================
+CBasePlayer::Killed
+
+=====================
+*/
+void CBasePlayer::Killed( entvars_t *pevAttacker, int iGib )
+{
+	// Holster weapon immediately, to allow it to cleanup
+	if ( m_pActiveItem )
+		 m_pActiveItem->Holster( );
+}
+
+/*
+=====================
+CBasePlayer::Spawn
+
+=====================
+*/
+void CBasePlayer::Spawn( void )
+{
+	if (m_pActiveItem)
+		m_pActiveItem->Deploy( );
+}
+
+/*
+=====================
+UTIL_TraceLine
+
+Don't actually trace, but act like the trace didn't hit anything.
+=====================
+*/
+void UTIL_TraceLine( const Vector &vecStart, const Vector &vecEnd, IGNORE_MONSTERS igmon, edict_t *pentIgnore, TraceResult *ptr )
+{
+	memset( ptr, 0, sizeof( *ptr ) );
+	ptr->flFraction = 1.0;
+}
+
+/*
+=====================
+UTIL_ParticleBox
+
+For debugging, draw a box around a player made out of particles
+=====================
+*/
+void UTIL_ParticleBox( CBasePlayer *player, float *mins, float *maxs, float life, unsigned char r, unsigned char g, unsigned char b )
+{
+	int i;
+	vec3_t mmin, mmax;
+
+	for ( i = 0; i < 3; i++ )
+	{
+		mmin[ i ] = player->pev->origin[ i ] + mins[ i ];
+		mmax[ i ] = player->pev->origin[ i ] + maxs[ i ];
+	}
+
+	gEngfuncs.pEfxAPI->R_ParticleBox( (float *)&mmin, (float *)&mmax, 5.0, 0, 255, 0 );
+}
+
+/*
+=====================
+UTIL_ParticleBoxes
+
+For debugging, draw boxes for other collidable players
+=====================
+*/
+void UTIL_ParticleBoxes( void )
+{
+	int idx;
+	physent_t *pe;
+	cl_entity_t *player;
+	vec3_t mins, maxs;
+	
+	gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction( false, true );
+
+	// Store off the old count
+	gEngfuncs.pEventAPI->EV_PushPMStates();
+
+	player = gEngfuncs.GetLocalPlayer();
+	// Now add in all of the players.
+	gEngfuncs.pEventAPI->EV_SetSolidPlayers ( player->index - 1 );	
+
+	for ( idx = 1; idx < 100; idx++ )
+	{
+		pe = gEngfuncs.pEventAPI->EV_GetPhysent( idx );
+		if ( !pe )
+			break;
+
+		if ( pe->info >= 1 && pe->info <= gEngfuncs.GetMaxClients() )
+		{
+			mins = pe->origin + pe->mins;
+			maxs = pe->origin + pe->maxs;
+
+			gEngfuncs.pEfxAPI->R_ParticleBox( (float *)&mins, (float *)&maxs, 0, 0, 255, 2.0 );
+		}
+	}
+
+	gEngfuncs.pEventAPI->EV_PopPMStates();
+}
+
+/*
+=====================
+UTIL_ParticleLine
+
+For debugging, draw a line made out of particles
+=====================
+*/
+void UTIL_ParticleLine( CBasePlayer *player, float *start, float *end, float life, unsigned char r, unsigned char g, unsigned char b )
+{
+	gEngfuncs.pEfxAPI->R_ParticleLine( start, end, r, g, b, life );
+}
+
+/*
+=====================
+CBasePlayerWeapon::PrintState
+
+For debugging, print out state variables to log file
+=====================
+*/
+void CBasePlayerWeapon::PrintState( void )
+{
+	COM_Log( "c:\\hl.log", "%.4f ", gpGlobals->time );
+	COM_Log( "c:\\hl.log", "%.4f ", m_pPlayer->m_flNextAttack );
+	COM_Log( "c:\\hl.log", "%.4f ", m_flNextPrimaryAttack );
+	COM_Log( "c:\\hl.log", "%.4f ", m_flTimeWeaponIdle - gpGlobals->time);
+	COM_Log( "c:\\hl.log", "%i ", m_iClip );
+	COM_Log( "c:\\hl.log", "\r\n");
+}
+
+/*
+=====================
+HUD_InitClientWeapons
+
+Set up weapons, player and functions needed to run weapons code client-side.
+=====================
+*/
+void HUD_InitClientWeapons( void )
+{
+	static int initialized = 0;
+	if ( initialized )
+		return;
+
+	initialized = 1;
+
+	// Set up pointer ( dummy object )
+	gpGlobals = &Globals;
+
+	// Fill in current time ( probably not needed )
+	gpGlobals->time = gEngfuncs.GetClientTime();
+
+	// Fake functions
+	g_engfuncs.pfnPrecacheModel		= stub_PrecacheModel;
+	g_engfuncs.pfnPrecacheSound		= stub_PrecacheSound;
+	g_engfuncs.pfnPrecacheEvent		= stub_PrecacheEvent;
+	g_engfuncs.pfnNameForFunction	= stub_NameForFunction;
+	g_engfuncs.pfnSetModel			= stub_SetModel;
+	g_engfuncs.pfnSetClientMaxspeed = HUD_SetMaxSpeed;
+
+	// Handled locally
+	g_engfuncs.pfnPlaybackEvent		= HUD_PlaybackEvent;
+	g_engfuncs.pfnAlertMessage		= AlertMessage;
+
+	// Pass through to engine
+	g_engfuncs.pfnPrecacheEvent		= gEngfuncs.pfnPrecacheEvent;
+	g_engfuncs.pfnRandomFloat		= gEngfuncs.pfnRandomFloat;
+	g_engfuncs.pfnRandomLong		= gEngfuncs.pfnRandomLong;
+
+	// Allocate a slot for the local player
+	HUD_PrepEntity( &player		, NULL );
+
+
+	// Allocate slot(s) for each weapon that we are going to be predicting
+	//HUD_PrepEntity( &g_Glock, &player );
+	HUD_PrepEntity( &gKnife, &player);
+	HUD_PrepEntity( &gMachineGun, &player);
+	HUD_PrepEntity( &gPistol, &player);
+	HUD_PrepEntity( &gSonicGun, &player);
+	HUD_PrepEntity( &gHeavyMachineGun, &player);
+	HUD_PrepEntity( &gGrenadeGun, &player);
+    HUD_PrepEntity( &gGrenade, &player);
+	HUD_PrepEntity( &gWelder, &player);
+	HUD_PrepEntity( &gMine, &player);
+	HUD_PrepEntity( &gSpitGun, &player);
+	HUD_PrepEntity( &gClaws, &player);
+	HUD_PrepEntity( &gSpores, &player);
+	HUD_PrepEntity( &gSpikeGun, &player);
+	HUD_PrepEntity( &gBite, &player);
+	HUD_PrepEntity( &gBite2, &player);
+	HUD_PrepEntity( &gSwipe, &player);
+	HUD_PrepEntity( &gWebSpinner, &player);
+	HUD_PrepEntity( &gPrimalScream, &player);
+	//HUD_PrepEntity( &gParalysisGun, &player);
+
+	HUD_PrepEntity( &gBlink, &player);
+	HUD_PrepEntity( &gParasite, &player);
+	HUD_PrepEntity( &gUmbra, &player);
+	HUD_PrepEntity( &gDivineWind, &player);
+	HUD_PrepEntity( &gBileBomb, &player);
+	HUD_PrepEntity( &gAcidRocket, &player);
+	HUD_PrepEntity( &gHealingSpray, &player);
+	HUD_PrepEntity( &gMetabolize, &player);
+	HUD_PrepEntity( &gStomp, &player);
+	HUD_PrepEntity( &gDevour, &player);
+	
+	HUD_PrepEntity( &gLeap, &player);
+	HUD_PrepEntity( &gCharge, &player);
+
+	gJetpackEventID = PRECACHE_EVENT(1, kJetpackEvent);
+	//gWallJumpEventID = PRECACHE_EVENT(1, kWallJumpEvent);
+	//gFlightEventID = PRECACHE_EVENT(1, kFlightEvent);
+	gTeleportEventID = PRECACHE_EVENT(1, kTeleportEvent);
+	gPhaseInEventID = PRECACHE_EVENT(1, kPhaseInEvent);
+	gSiegeHitEventID = PRECACHE_EVENT(1, kSiegeHitEvent);
+	gSiegeViewHitEventID = PRECACHE_EVENT(1, kSiegeViewHitEvent);
+	gCommanderPointsAwardedEventID = PRECACHE_EVENT(1, kCommanderPointsAwardedEvent);
+	gBlinkEffectSuccessEventID = PRECACHE_EVENT(1, kBlinkEffectSuccessEventName);
+}
+
+/*
+=====================
+=======
+	HUD_PrepEntity( &g_Glock	, &player );
+	HUD_PrepEntity( &g_Crowbar	, &player );
+	HUD_PrepEntity( &g_Python	, &player );
+	HUD_PrepEntity( &g_Mp5	, &player );
+	HUD_PrepEntity( &g_Crossbow	, &player );
+	HUD_PrepEntity( &g_Shotgun	, &player );
+	HUD_PrepEntity( &g_Rpg	, &player );
+	HUD_PrepEntity( &g_Gauss	, &player );
+	HUD_PrepEntity( &g_Egon	, &player );
+	HUD_PrepEntity( &g_HGun	, &player );
+	HUD_PrepEntity( &g_HandGren	, &player );
+	HUD_PrepEntity( &g_Satchel	, &player );
+	HUD_PrepEntity( &g_Tripmine	, &player );
+	HUD_PrepEntity( &g_Snark	, &player );
+}
+
+/*
+=====================
+HUD_GetLastOrg
+
+Retruns the last position that we stored for egon beam endpoint.
+=====================
+*/
+void HUD_GetLastOrg( float *org )
+{
+	int i;
+	
+	// Return last origin
+	for ( i = 0; i < 3; i++ )
+	{
+		org[i] = previousorigin[i];
+	}
+}
+
+/*
+=====================
+HUD_SetLastOrg
+
+Remember our exact predicted origin so we can draw the egon to the right position.
+=====================
+*/
+void HUD_SetLastOrg( void )
+{
+	int i;
+	
+	// Offset final origin by view_offset
+	for ( i = 0; i < 3; i++ )
+	{
+		previousorigin[i] = g_finalstate->playerstate.origin[i] + g_finalstate->client.view_ofs[ i ];
+	}
+}
+
+
+CBasePlayerWeapon* HUD_GetWeaponForID(int inID)
+{
+	CBasePlayerWeapon* pWeapon = NULL;
+
+	switch(inID)
+	{
+//	case WEAPON_GLOCK:
+//		pWeapon = &g_Glock;
+//		break;
+	case AVH_WEAPON_KNIFE:
+		pWeapon = &gKnife;
+		break;
+	case AVH_WEAPON_MG:
+		pWeapon = &gMachineGun;
+		break;
+	case AVH_WEAPON_PISTOL:
+		pWeapon = &gPistol;
+		break;
+	case AVH_WEAPON_SONIC:
+		pWeapon = &gSonicGun;
+		break;
+	case AVH_WEAPON_HMG:
+		pWeapon = &gHeavyMachineGun;
+		break;
+	case AVH_WEAPON_GRENADE_GUN:
+		pWeapon = &gGrenadeGun;
+		break;
+    case AVH_WEAPON_GRENADE:
+        pWeapon = &gGrenade;
+        break;
+	case AVH_WEAPON_WELDER:
+		pWeapon = &gWelder;
+		break;
+	case AVH_WEAPON_MINE:
+		pWeapon = &gMine;
+		break;
+	case AVH_WEAPON_SPIT:
+		pWeapon = &gSpitGun;
+		break;
+	case AVH_WEAPON_CLAWS:
+		pWeapon = &gClaws;
+		break;
+	case AVH_WEAPON_SPORES:
+		pWeapon = &gSpores;
+		break;
+	case AVH_WEAPON_SPIKE:
+		pWeapon = &gSpikeGun;
+		break;
+	case AVH_WEAPON_BITE:
+		pWeapon = &gBite;
+		break;
+	case AVH_WEAPON_BITE2:
+		pWeapon = &gBite2;
+		break;
+	case AVH_WEAPON_SWIPE:
+		pWeapon = &gSwipe;
+		break;
+	case AVH_WEAPON_WEBSPINNER:
+		pWeapon = &gWebSpinner;
+		break;
+	case AVH_WEAPON_PRIMALSCREAM:
+		pWeapon = &gPrimalScream;
+		break;
+	case AVH_WEAPON_PARASITE:
+		pWeapon = &gParasite;
+		break;
+	case AVH_WEAPON_UMBRA:
+		pWeapon = &gUmbra;
+		break;
+	case AVH_WEAPON_BLINK:
+		pWeapon = &gBlink;
+		break;
+	case AVH_WEAPON_DIVINEWIND:
+		pWeapon = &gDivineWind;
+		break;
+//	case AVH_WEAPON_PARALYSIS:
+//		pWeapon = &gParalysisGun;
+//		break;
+	case AVH_WEAPON_BILEBOMB:
+		pWeapon = &gBileBomb;
+		break;
+	case AVH_WEAPON_ACIDROCKET:
+		pWeapon = &gAcidRocket;
+		break;
+	case AVH_WEAPON_HEALINGSPRAY:
+		pWeapon = &gHealingSpray;
+		break;
+	case AVH_WEAPON_METABOLIZE:
+		pWeapon = &gMetabolize;
+		break;
+	case AVH_WEAPON_STOMP:
+		pWeapon = &gStomp;
+		break;
+	case AVH_WEAPON_DEVOUR:
+		pWeapon = &gDevour;
+		break;
+
+	// Abilities
+	case AVH_ABILITY_LEAP:
+		pWeapon = &gLeap;
+		break;
+	case AVH_ABILITY_CHARGE:
+		pWeapon = &gCharge;
+		break;
+	}
+
+	return pWeapon;
+}
+
+
+bool HUD_GetWeaponEnabled(int inID)
+{
+	ASSERT(inID >= 0);
+	ASSERT(inID < 32);
+
+	// puzl: 497 - use the enabled state in the associated WEAPON instead of the CBasePlayerWeapon's iuser3
+	bool theWeaponEnabled = false;
+	CBasePlayerWeapon* theWeapon = g_pWpns[inID];
+	if(theWeapon)
+	{
+		ItemInfo theItemInfo;
+		theWeapon->GetItemInfo(&theItemInfo);
+		WEAPON *pWeapon = gWR.GetWeapon( theItemInfo.iId );
+		if ( pWeapon != 0 ) {
+			theWeaponEnabled = (pWeapon->iEnabled == 1);
+		}
+	}
+
+	return theWeaponEnabled;
+}
+
+/*
+=====================
+HUD_WeaponsPostThink
+
+Run Weapon firing code on client
+=====================
+*/
+void HUD_WeaponsPostThink( local_state_s *from, local_state_s *to, usercmd_t *cmd, double time, unsigned int random_seed )
+{
+	int i;
+	int buttonsChanged;
+	CBasePlayerWeapon* pCurrent = NULL;
+	weapon_data_t nulldata, *pfrom, *pto;
+	static int lasthealth;
+
+	memset( &nulldata, 0, sizeof( nulldata ) );
+
+	HUD_InitClientWeapons();	
+
+	// Get current clock
+	gpGlobals->time = time;
+
+	// Fill in data based on selected weapon
+	// FIXME, make this a method in each weapon?  where you pass in an entity_state_t *?
+	// Store pointer to our destination entity_state_t so we can get our origin, etc. from it
+	CBasePlayerWeapon* pWeapon = HUD_GetWeaponForID(from->client.m_iId);
+
+	//  for setting up events on the client
+	g_finalstate = to;
+
+	// If we are running events/etc. go ahead and see if we
+	//  managed to die between last frame and this one
+	// If so, run the appropriate player killed or spawn function
+	if ( g_runfuncs )
+	{
+		if ( to->client.health <= 0 && lasthealth > 0 )
+		{
+			player.Killed( NULL, 0 );
+			
+		}
+		else if ( to->client.health > 0 && lasthealth <= 0 )
+		{
+			player.Spawn();
+		}
+
+		lasthealth = to->client.health;
+	}
+
+	// We are not predicting the current weapon, just bow out here.
+	if ( !pWeapon )
+		return;
+
+	for ( i = 0; i < 32; i++ )
+	{
+		pCurrent = g_pWpns[ i ];
+		if ( !pCurrent )
+		{
+			continue;
+		}
+
+		pfrom = &from->weapondata[ i ];
+		
+		pCurrent->m_fInReload			= pfrom->m_fInReload;
+		pCurrent->m_fInSpecialReload	= pfrom->m_fInSpecialReload;
+//		pCurrent->m_flPumpTime			= pfrom->m_flPumpTime;
+		pCurrent->m_iClip				= pfrom->m_iClip;
+		pCurrent->m_flNextPrimaryAttack	= pfrom->m_flNextPrimaryAttack;
+		pCurrent->m_flNextSecondaryAttack = pfrom->m_flNextSecondaryAttack;
+		pCurrent->m_flTimeWeaponIdle	= pfrom->m_flTimeWeaponIdle;
+		if(pWeapon && (pWeapon->m_iId == pfrom->m_iId))
+		{
+			// Predict clip
+			gHUD.m_Ammo.SetCurrentClip(pfrom->m_iClip);
+
+			AvHBasePlayerWeapon* theWeapon = dynamic_cast<AvHBasePlayerWeapon*>(pWeapon);
+			if(theWeapon)
+			{
+				gHUD.SetCurrentWeaponData(pWeapon->m_iId, theWeapon->GetEnabledState());
+			}
+
+			//gHUD.SetClientDebugCSP(pfrom, from->client.m_flNextAttack);
+		}
+
+		// Tell HUD what energy level is needed to use weapon, so alien HUD can indicate this
+		float theEnergyLevel = 0.0f;
+		AvHMUGetEnergyCost((AvHWeaponID)(pWeapon->m_iId), theEnergyLevel);
+		gHUD.SetCurrentUseableEnergyLevel(theEnergyLevel);
+
+// New SDK stuff...needed?
+//		pCurrent->pev->fuser1			= pfrom->fuser1;
+		pCurrent->m_flStartThrow		= pfrom->fuser2;
+		pCurrent->m_flReleaseThrow		= pfrom->fuser3;
+//		pCurrent->m_chargeReady			= pfrom->iuser1;
+//		pCurrent->m_fInAttack			= pfrom->iuser2;
+		pCurrent->pev->iuser3			= pfrom->iuser3;
+	
+//		pCurrent->m_iSecondaryAmmoType		= (int)from->client.vuser3[2];
+		pCurrent->m_iPrimaryAmmoType		= (int)from->client.vuser4[0];
+//		player.m_rgAmmo[ pCurrent->m_iPrimaryAmmoType ]	= (int)from->client.vuser4[1];
+//		player.m_rgAmmo[ pCurrent->m_iSecondaryAmmoType ]	= (int)from->client.vuser4[2];
+	}
+
+	// For random weapon events, use this seed to seed random # generator
+	player.random_seed = random_seed;
+
+	// Get old buttons from previous state.
+	player.m_afButtonLast = from->playerstate.oldbuttons;
+
+	// Which buttsons chave changed
+	buttonsChanged = (player.m_afButtonLast ^ cmd->buttons);	// These buttons have changed this frame
+	
+	// Debounced button codes for pressed/released
+	// The changed ones still down are "pressed"
+	player.m_afButtonPressed =  buttonsChanged & cmd->buttons;	
+	// The ones not down are "released"
+	player.m_afButtonReleased = buttonsChanged & (~cmd->buttons);
+
+	// Set player variables that weapons code might check/alter
+	player.pev->button = cmd->buttons;
+
+	player.pev->velocity = from->client.velocity;
+	player.pev->flags = from->client.flags;
+
+	player.pev->deadflag = from->client.deadflag;
+	player.pev->waterlevel = from->client.waterlevel;
+	player.pev->maxspeed    = from->client.maxspeed;
+	player.pev->fov = from->client.fov;
+	player.pev->weaponanim = from->client.weaponanim;
+	player.pev->viewmodel = from->client.viewmodel;
+	player.m_flNextAttack = from->client.m_flNextAttack;
+	//player.m_flNextAmmoBurn = from->client.fuser2;
+	//player.m_flAmmoStartCharge = from->client.fuser3;
+
+	// Removed this because NS uses vuser1 and vuser2 (and the HL weapons aren't used)
+	////Stores all our ammo info, so the client side weapons can use them.
+	//player.ammo_9mm			= (int)from->client.vuser1[0];
+	//player.ammo_357			= (int)from->client.vuser1[1];
+	//player.ammo_argrens		= (int)from->client.vuser1[2];
+	//player.ammo_bolts		= (int)from->client.ammo_nails; //is an int anyways...
+	//player.ammo_buckshot	= (int)from->client.ammo_shells; 
+	//player.ammo_uranium		= (int)from->client.ammo_cells;
+	//player.ammo_hornets		= (int)from->client.vuser2[0];
+	//player.ammo_rockets		= (int)from->client.ammo_rockets;
+
+	
+	// Point to current weapon object
+	if ( from->client.m_iId )
+	{
+		player.m_pActiveItem = g_pWpns[ from->client.m_iId ];
+	}
+
+	if ( player.m_pActiveItem->m_iId == WEAPON_RPG )
+	{
+		 ( ( CRpg * )player.m_pActiveItem)->m_fSpotActive = (int)from->client.vuser2[ 1 ];
+		 ( ( CRpg * )player.m_pActiveItem)->m_cActiveRockets = (int)from->client.vuser2[ 2 ];
+	}
+
+    // Don't go firing anything if we have died.
+	// Or if we don't have a weapon model deployed
+	if ( ( player.pev->deadflag != ( DEAD_DISCARDBODY + 1 ) ) && !CL_IsDead() && player.pev->viewmodel && !g_iUser1 )
+	{
+
+		if ( player.m_flNextAttack <= 0 )
+        {
+			pWeapon->ItemPostFrame();
+		}
+//    	if ( g_runfuncs )
+//		{
+//			pWeapon->PrintState();
+//		}
+	}
+
+	// Assume that we are not going to switch weapons
+	to->client.m_iId					= from->client.m_iId;
+
+	// Now see if we issued a changeweapon command ( and we're not dead )
+	if ( cmd->weaponselect && ( player.pev->deadflag != ( DEAD_DISCARDBODY + 1 ) ) )
+	{
+		// Switched to a different weapon?
+		if ( from->weapondata[ cmd->weaponselect ].m_iId == cmd->weaponselect )
+		{
+			ASSERT(cmd->weaponselect >= 0);
+			ASSERT(cmd->weaponselect < 32);
+
+			CBasePlayerWeapon *pNew = g_pWpns[ cmd->weaponselect ];
+			if ( pNew && ( pNew != pWeapon ) && player.m_pActiveItem && player.m_pActiveItem->CanHolster())
+			{
+				// Put away old weapon
+				if (player.m_pActiveItem)
+					player.m_pActiveItem->Holster( );
+				
+				player.m_pLastItem = player.m_pActiveItem;
+				player.m_pActiveItem = pNew;
+
+				// Deploy new weapon
+				if (player.m_pActiveItem)
+				{
+					player.m_pActiveItem->Deploy( );
+				}
+
+				// Update weapon id so we can predict things correctly.
+				to->client.m_iId = cmd->weaponselect;
+			}
+		}
+	}
+
+	// Copy in results of prediction code
+	to->client.viewmodel				= player.pev->viewmodel;
+	to->client.fov						= player.pev->fov;
+	to->client.weaponanim				= player.pev->weaponanim;
+	to->client.m_flNextAttack			= player.m_flNextAttack;
+	//to->client.fuser2					= player.m_flNextAmmoBurn;
+	//to->client.fuser3					= player.m_flAmmoStartCharge;
+	to->client.maxspeed					= player.pev->maxspeed;
+
+// Removed this because NS uses vuser1 and vuser2 (and the HL weapons aren't used)
+//	//HL Weapons
+//	to->client.vuser1[0]				= player.ammo_9mm;
+//	to->client.vuser1[1]				= player.ammo_357;
+//	to->client.vuser1[2]				= player.ammo_argrens;
+//
+//	to->client.ammo_nails				= player.ammo_bolts;
+//	to->client.ammo_shells				= player.ammo_buckshot;
+//	to->client.ammo_cells				= player.ammo_uranium;
+//	to->client.vuser2[0]				= player.ammo_hornets;
+//	to->client.ammo_rockets				= player.ammo_rockets;
+
+	if ( player.m_pActiveItem->m_iId == WEAPON_RPG )
+	{
+		 from->client.vuser2[ 1 ] = ( ( CRpg * )player.m_pActiveItem)->m_fSpotActive;
+		 from->client.vuser2[ 2 ] = ( ( CRpg * )player.m_pActiveItem)->m_cActiveRockets;
+	}
+
+	// Make sure that weapon animation matches what the game .dll is telling us
+	//  over the wire ( fixes some animation glitches )
+	if ( g_runfuncs && ( HUD_GetWeaponAnim() != to->client.weaponanim ) )
+	{
+		int body = 2;
+
+		//Pop the model to body 0.
+		//if ( pWeapon == &g_Tripmine )
+		//	body = 0;
+		
+		// Force a fixed anim down to viewmodel
+		HUD_SendWeaponAnim( to->client.weaponanim, body, 1 );
+	}
+
+	for ( i = 0; i < 32; i++ )
+	{
+		pCurrent = g_pWpns[ i ];
+
+		pto = &to->weapondata[ i ];
+
+		if ( !pCurrent )
+		{
+			memset( pto, 0, sizeof( weapon_data_t ) );
+			continue;
+		}
+	
+		pto->m_fInReload				= pCurrent->m_fInReload;
+		pto->m_fInSpecialReload			= pCurrent->m_fInSpecialReload;
+//		pto->m_flPumpTime				= pCurrent->m_flPumpTime;
+		pto->m_iClip					= pCurrent->m_iClip; 
+		pto->m_flNextPrimaryAttack		= pCurrent->m_flNextPrimaryAttack;
+		pto->m_flNextSecondaryAttack	= pCurrent->m_flNextSecondaryAttack;
+		pto->m_flTimeWeaponIdle			= pCurrent->m_flTimeWeaponIdle;
+//		pto->fuser1						= pCurrent->pev->fuser1;
+//		pto->fuser2						= pCurrent->m_flStartThrow;
+//		pto->fuser3						= pCurrent->m_flReleaseThrow;
+//		pto->iuser1						= pCurrent->m_chargeReady;
+//		pto->iuser2						= pCurrent->m_fInAttack;
+		pto->iuser3						= pCurrent->pev->iuser3;
+
+		// Decrement weapon counters, server does this at same time ( during post think, after doing everything else )
+		pto->m_flNextReload				-= cmd->msec / 1000.0;
+		pto->m_fNextAimBonus			-= cmd->msec / 1000.0;
+		pto->m_flNextPrimaryAttack		-= cmd->msec / 1000.0;
+		pto->m_flNextSecondaryAttack	-= cmd->msec / 1000.0;
+		pto->m_flTimeWeaponIdle			-= cmd->msec / 1000.0;
+		pto->fuser1						-= cmd->msec / 1000.0;
+
+		to->client.vuser3[2]				= pCurrent->m_iSecondaryAmmoType;
+		to->client.vuser4 = pCurrent->pev->vuser4;
+//		to->client.vuser4[0]				= pCurrent->m_iPrimaryAmmoType;
+//		to->client.vuser4[1]				= player.m_rgAmmo[ pCurrent->m_iPrimaryAmmoType ];
+//		to->client.vuser4[2]				= player.m_rgAmmo[ pCurrent->m_iSecondaryAmmoType ];
+
+/*		if ( pto->m_flPumpTime != -9999 )
+		{
+			pto->m_flPumpTime -= cmd->msec / 1000.0;
+			if ( pto->m_flPumpTime < -0.001 )
+				pto->m_flPumpTime = -0.001;
+		}*/
+
+		if ( pto->m_fNextAimBonus < -1.0 )
+		{
+			pto->m_fNextAimBonus = -1.0;
+		}
+
+		if ( pto->m_flNextPrimaryAttack < -1.0 )
+		{
+			pto->m_flNextPrimaryAttack = -1.0;
+		}
+
+		if ( pto->m_flNextSecondaryAttack < -0.001 )
+		{
+			pto->m_flNextSecondaryAttack = -0.001;
+		}
+
+		if ( pto->m_flTimeWeaponIdle < -0.001 )
+		{
+			pto->m_flTimeWeaponIdle = -0.001;
+		}
+
+		if ( pto->m_flNextReload < -0.001 )
+		{
+			pto->m_flNextReload = -0.001;
+		}
+
+		if ( pto->fuser1 < -0.001 )
+		{
+			pto->fuser1 = -0.001;
+		}
+	}
+
+	// m_flNextAttack is now part of the weapons, but is part of the player instead
+	to->client.m_flNextAttack -= cmd->msec / 1000.0;
+	if ( to->client.m_flNextAttack < -0.001 )
+	{
+		to->client.m_flNextAttack = -0.001;
+	}
+
+	to->client.fuser2 -= cmd->msec / 1000.0;
+	if ( to->client.fuser2 < -0.001 )
+	{
+		to->client.fuser2 = -0.001;
+	}
+	
+	to->client.fuser3 -= cmd->msec / 1000.0;
+	if ( to->client.fuser3 < -0.001 )
+	{
+		to->client.fuser3 = -0.001;
+    }
+
+	// Store off the last position from the predicted state.
+	HUD_SetLastOrg();
+
+	// Wipe it so we can't use it after this frame
+	g_finalstate = NULL;
+}
+
+
+/*
+=====================
+HUD_PostRunCmd
+
+Client calls this during prediction, after it has moved the player and updated any info changed into to->
+time is the current client clock based on prediction
+cmd is the command that caused the movement, etc
+runfuncs is 1 if this is the first time we've predicted this command.  If so, sounds and effects should play, otherwise, they should
+be ignored
+=====================
+*/
+void CL_DLLEXPORT HUD_PostRunCmd( struct local_state_s *from, struct local_state_s *to, struct usercmd_s *cmd, int runfuncs, double time, unsigned int random_seed )
+{
+	RecClPostRunCmd(from, to, cmd, runfuncs, time, random_seed);
+
+	g_runfuncs = runfuncs;
+
+#if defined( CLIENT_WEAPONS )
+
+//	if(from->client.m_iId != WEAPON_GLOCK)
+//	{
+//		int a = 0;
+//	}
+
+	if ( cl_lw && cl_lw->value )
+	{
+		HUD_WeaponsPostThink( from, to, cmd, time, random_seed );
+	}
+	else
+#endif
+	{
+		to->client.fov = g_lastFOV;
+	}
+
+	// Check to see whether too play local jetpack effects
+	if(runfuncs)
+	{
+		static sLastTime = 0;
+		float theTimePassed = time - sLastTime;
+
+		//CheckJetpack();
+		
+		//UpdateJetpackLights();
+
+		sLastTime = time;
+	}
+
+	// All games can use FOV state
+	g_lastFOV = to->client.fov;
+}
+
+
+
diff --git a/main/source/cl_dll/hud.cpp b/main/source/cl_dll/hud.cpp
new file mode 100644
index 00000000..81a0e5fb
--- /dev/null
+++ b/main/source/cl_dll/hud.cpp
@@ -0,0 +1,736 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// hud.cpp
+//
+// implementation of CHud class
+//
+
+#include "hud.h"
+#include "cl_util.h"
+#include <string.h>
+#include <stdio.h>
+#include "parsemsg.h"
+#include "hud_servers.h"
+#include "vgui_TeamFortressViewport.h"
+#include "vgui_int.h"
+
+#include "demo.h"
+#include "demo_api.h"
+#include "ui/UIComponent.h"
+#include "vgui_scorepanel.h"
+
+#include "mod/ChatPanel.h"
+
+class CHLVoiceStatusHelper : public IVoiceStatusHelper
+{
+public:
+	virtual void GetPlayerTextColor(int entindex, int color[3])
+	{
+		color[0] = color[1] = color[2] = 255;
+
+		if( entindex >= 0 && entindex < sizeof(g_PlayerExtraInfo)/sizeof(g_PlayerExtraInfo[0]) )
+		{
+			int iTeam = g_PlayerExtraInfo[entindex].teamnumber;
+
+			if ( iTeam < 0 )
+			{
+				iTeam = 0;
+			}
+
+			iTeam = iTeam % iNumberOfTeamColors;
+
+			color[0] = kTeamColors[iTeam][0];
+			color[1] = kTeamColors[iTeam][1];
+			color[2] = kTeamColors[iTeam][2];
+
+            // Draw commander voice differently
+            short thePlayerClass = g_PlayerExtraInfo[entindex].playerclass;
+            switch(thePlayerClass)
+            {
+            case PLAYERCLASS_COMMANDER:
+                color[0] = color[1] = color[2] = 255;
+                break;
+            }
+		}
+	}
+
+	virtual void UpdateCursorState()
+	{
+		gViewPort->UpdateCursorState();
+	}
+
+	virtual int	GetAckIconHeight()
+	{
+		return ScreenHeight() - gHUD.m_iFontHeight*3 - 6;
+	}
+
+	virtual bool			CanShowSpeakerLabels()
+	{
+		if( gViewPort && gViewPort->m_pScoreBoard )
+			return !gViewPort->m_pScoreBoard->isVisible();
+		else
+			return false;
+	}
+};
+static CHLVoiceStatusHelper g_VoiceStatusHelper;
+
+
+extern client_sprite_t *GetSpriteList(client_sprite_t *pList, const char *psz, int iRes, int iCount);
+//CImageLabel* gTestLabel = NULL;
+//extern Label* gTestLabel;
+
+extern cvar_t *sensitivity;
+cvar_t *cl_lw = NULL;
+
+void ShutdownInput (void);
+
+//DECLARE_MESSAGE(m_Logo, Logo)
+int __MsgFunc_Logo(const char *pszName, int iSize, void *pbuf)
+{
+	return gHUD.MsgFunc_Logo(pszName, iSize, pbuf );
+}
+
+//DECLARE_MESSAGE(m_Logo, Logo)
+int __MsgFunc_ResetHUD(const char *pszName, int iSize, void *pbuf)
+{
+	return gHUD.MsgFunc_ResetHUD(pszName, iSize, pbuf );
+}
+
+int __MsgFunc_InitHUD(const char *pszName, int iSize, void *pbuf)
+{
+	gHUD.MsgFunc_InitHUD( pszName, iSize, pbuf );
+	return 1;
+}
+
+int __MsgFunc_ViewMode(const char *pszName, int iSize, void *pbuf)
+{
+	gHUD.MsgFunc_ViewMode( pszName, iSize, pbuf );
+	return 1;
+}
+
+int __MsgFunc_SetFOV(const char *pszName, int iSize, void *pbuf)
+{
+	return gHUD.MsgFunc_SetFOV( pszName, iSize, pbuf );
+}
+
+int __MsgFunc_Concuss(const char *pszName, int iSize, void *pbuf)
+{
+	return gHUD.MsgFunc_Concuss( pszName, iSize, pbuf );
+}
+
+int __MsgFunc_GameMode(const char *pszName, int iSize, void *pbuf )
+{
+	return gHUD.MsgFunc_GameMode( pszName, iSize, pbuf );
+}
+
+// TFFree Command Menu
+void __CmdFunc_OpenCommandMenu(void)
+{
+	if ( gViewPort )
+	{
+		gViewPort->ShowCommandMenu(gViewPort->m_StandardMenu);
+	}
+}
+
+// TFC "special" command
+void __CmdFunc_InputPlayerSpecial(void)
+{
+	if ( gViewPort )
+	{
+		gViewPort->InputPlayerSpecial();
+	}
+}
+
+void __CmdFunc_CloseCommandMenu(void)
+{
+	if ( gViewPort )
+	{
+		gViewPort->InputSignalHideCommandMenu();
+	}
+}
+
+void __CmdFunc_ForceCloseCommandMenu( void )
+{
+	if ( gViewPort )
+	{
+		gViewPort->HideCommandMenu();
+	}
+}
+
+void __CmdFunc_ToggleServerBrowser( void )
+{
+	if ( gViewPort )
+	{
+		gViewPort->ToggleServerBrowser();
+	}
+}
+
+void __CmdFunc_NSMessageMode(void)
+{
+	if(gEngfuncs.Cmd_Argc() >= 2)
+	{
+		if(gViewPort)
+		{
+			ChatPanel *theChatPanel = gViewPort->GetChatPanel();
+
+			if(theChatPanel)
+			{
+				theChatPanel->setVisible(true);
+				theChatPanel->requestFocus();
+				theChatPanel->SetChatMode( (string)gEngfuncs.Cmd_Argv(1) );
+			}
+		}
+	}
+}
+
+void __CmdFunc_SpecialDummy(void)
+{
+	return;
+}
+
+// TFFree Command Menu Message Handlers
+int __MsgFunc_ValClass(const char *pszName, int iSize, void *pbuf)
+{
+	if (gViewPort)
+		return gViewPort->MsgFunc_ValClass( pszName, iSize, pbuf );
+	return 0;
+}
+
+int __MsgFunc_TeamNames(const char *pszName, int iSize, void *pbuf)
+{
+	if (gViewPort)
+		return gViewPort->MsgFunc_TeamNames( pszName, iSize, pbuf );
+	return 0;
+}
+
+int __MsgFunc_Feign(const char *pszName, int iSize, void *pbuf)
+{
+	if (gViewPort)
+		return gViewPort->MsgFunc_Feign( pszName, iSize, pbuf );
+	return 0;
+}
+
+int __MsgFunc_Detpack(const char *pszName, int iSize, void *pbuf)
+{
+	if (gViewPort)
+		return gViewPort->MsgFunc_Detpack( pszName, iSize, pbuf );
+	return 0;
+}
+
+int __MsgFunc_VGUIMenu(const char *pszName, int iSize, void *pbuf)
+{
+	if (gViewPort)
+		return gViewPort->MsgFunc_VGUIMenu( pszName, iSize, pbuf );
+	return 0;
+}
+
+int __MsgFunc_MOTD(const char *pszName, int iSize, void *pbuf)
+{
+	if (gViewPort)
+		return gViewPort->MsgFunc_MOTD( pszName, iSize, pbuf );
+	return 0;
+}
+
+int __MsgFunc_BuildSt(const char *pszName, int iSize, void *pbuf)
+{
+	if (gViewPort)
+		return gViewPort->MsgFunc_BuildSt( pszName, iSize, pbuf );
+	return 0;
+}
+
+int __MsgFunc_RandomPC(const char *pszName, int iSize, void *pbuf)
+{
+	if (gViewPort)
+		return gViewPort->MsgFunc_RandomPC( pszName, iSize, pbuf );
+	return 0;
+}
+ 
+int __MsgFunc_ServerName(const char *pszName, int iSize, void *pbuf)
+{
+	if (gViewPort)
+		return gViewPort->MsgFunc_ServerName( pszName, iSize, pbuf );
+	return 0;
+}
+
+int __MsgFunc_ScoreInfo(const char *pszName, int iSize, void *pbuf)
+{
+	if (gViewPort)
+		return gViewPort->MsgFunc_ScoreInfo( pszName, iSize, pbuf );
+	return 0;
+}
+
+int __MsgFunc_TeamScore(const char *pszName, int iSize, void *pbuf)
+{
+	if (gViewPort)
+		return gViewPort->MsgFunc_TeamScore( pszName, iSize, pbuf );
+	return 0;
+}
+
+int __MsgFunc_TeamInfo(const char *pszName, int iSize, void *pbuf)
+{
+	if (gViewPort)
+		return gViewPort->MsgFunc_TeamInfo( pszName, iSize, pbuf );
+	return 0;
+}
+
+int __MsgFunc_Spectator(const char *pszName, int iSize, void *pbuf)
+{
+	if (gViewPort)
+		return gViewPort->MsgFunc_Spectator( pszName, iSize, pbuf );
+	return 0;
+}
+
+int __MsgFunc_AllowSpec(const char *pszName, int iSize, void *pbuf)
+{
+	if (gViewPort)
+		return gViewPort->MsgFunc_AllowSpec( pszName, iSize, pbuf );
+	return 0;
+}
+
+// This is called every time the DLL is loaded
+void CHud :: Init( void )
+{
+	HOOK_MESSAGE( Logo );
+	HOOK_MESSAGE( ResetHUD );
+	HOOK_MESSAGE( GameMode );
+	HOOK_MESSAGE( InitHUD );
+	HOOK_MESSAGE( ViewMode );
+	HOOK_MESSAGE( SetFOV );
+	HOOK_MESSAGE( Concuss );
+
+	// TFFree CommandMenu
+	HOOK_COMMAND( "+commandmenu", OpenCommandMenu );
+	HOOK_COMMAND( "-commandmenu", CloseCommandMenu );
+	HOOK_COMMAND( "ForceCloseCommandMenu", ForceCloseCommandMenu );
+	HOOK_COMMAND( "special", InputPlayerSpecial );
+	HOOK_COMMAND( "togglebrowser", ToggleServerBrowser );
+	HOOK_COMMAND( "nsmessagemode", NSMessageMode);
+	HOOK_COMMAND( "_special", SpecialDummy);
+
+
+	HOOK_MESSAGE( ValClass );
+	HOOK_MESSAGE( TeamNames );
+	HOOK_MESSAGE( Feign );
+	HOOK_MESSAGE( Detpack );
+	HOOK_MESSAGE( MOTD );
+	HOOK_MESSAGE( BuildSt );
+	HOOK_MESSAGE( RandomPC );
+	HOOK_MESSAGE( ServerName );
+	HOOK_MESSAGE( ScoreInfo );
+	HOOK_MESSAGE( TeamScore );
+	HOOK_MESSAGE( TeamInfo );
+
+	HOOK_MESSAGE( Spectator );
+	HOOK_MESSAGE( AllowSpec );
+
+	// VGUI Menus
+	HOOK_MESSAGE( VGUIMenu );
+
+	CVAR_CREATE( "hud_classautokill", "1", FCVAR_ARCHIVE | FCVAR_USERINFO );		// controls whether or not to suicide immediately on TF class switch
+	CVAR_CREATE( "hud_takesshots", "0", FCVAR_ARCHIVE );		// controls whether or not to automatically take screenshots at the end of a round
+
+#ifdef DEBUG
+    CVAR_CREATE( "hud_hideview", "0", FCVAR_ARCHIVE );
+#endif
+
+	m_iLogo = 0;
+	m_iFOV = 0;
+
+	CVAR_CREATE( "zoom_sensitivity_ratio", "1.2", 0 );
+	default_fov = CVAR_CREATE( "default_fov", "90", 0 );
+	m_pCvarStealMouse = CVAR_CREATE( "hud_capturemouse", "1", FCVAR_ARCHIVE );
+	m_pCvarDraw = CVAR_CREATE( "hud_draw", "1", FCVAR_ARCHIVE );
+	cl_lw = gEngfuncs.pfnGetCvarPointer( "cl_lw" );
+
+    CVAR_CREATE( "cl_showspeed", "0", 0);
+
+	m_pSpriteList = NULL;
+
+	// Clear any old HUD list
+	if ( m_pHudList )
+	{
+		HUDLIST *pList;
+		while ( m_pHudList )
+		{
+			pList = m_pHudList;
+			m_pHudList = m_pHudList->pNext;
+			free( pList );
+		}
+		m_pHudList = NULL;
+	}
+
+	// In case we get messages before the first update -- time will be valid
+	m_flTime = 1.0;
+
+	m_Ammo.Init();
+	m_Health.Init();
+	m_Spectator.Init();
+	m_SayText.Init();
+	m_Geiger.Init();
+	m_Train.Init();
+	m_Battery.Init();
+	m_Flash.Init();
+	m_Message.Init();
+	m_StatusBar.Init();
+	m_DeathNotice.Init();
+	m_AmmoSecondary.Init();
+	m_TextMessage.Init();
+	m_StatusIcons.Init();
+	
+    m_Spectator.m_chatEnabled = (m_SayText.m_HUD_saytext->value!=0);
+    
+    GetClientVoiceMgr()->Init(&g_VoiceStatusHelper, (vgui::Panel**)&gViewPort);
+
+	m_Menu.Init();
+	
+	ServersInit();
+
+	MsgFunc_ResetHUD(0, 0, NULL );
+}
+
+// CHud destructor
+// cleans up memory allocated for m_rg* arrays
+CHud :: ~CHud()
+{
+	delete [] m_rghSprites;
+	delete [] m_rgrcRects;
+	delete [] m_rgszSpriteNames;
+
+	if ( m_pHudList )
+	{
+		HUDLIST *pList;
+		while ( m_pHudList )
+		{
+			pList = m_pHudList;
+			m_pHudList = m_pHudList->pNext;
+			free( pList );
+		}
+		m_pHudList = NULL;
+	}
+
+	ServersShutdown();
+}
+
+// GetSpriteIndex()
+// searches through the sprite list loaded from hud.txt for a name matching SpriteName
+// returns an index into the gHUD.m_rghSprites[] array
+// returns 0 if sprite not found
+int CHud :: GetSpriteIndex( const char *SpriteName )
+{
+	// look through the loaded sprite name list for SpriteName
+	for ( int i = 0; i < m_iSpriteCount; i++ )
+	{
+		if ( strncmp( SpriteName, m_rgszSpriteNames + (i * MAX_SPRITE_NAME_LENGTH), MAX_SPRITE_NAME_LENGTH ) == 0 )
+			return i;
+	}
+
+	return -1; // invalid sprite
+}
+
+void CHud :: VidInit( void )
+{
+	m_scrinfo.iSize = sizeof(m_scrinfo);
+	GetScreenInfo(&m_scrinfo);
+
+	// The NS viewport isn't set up yet
+	int theViewPort[4];
+	theViewPort[0] = theViewPort[1] = 0;
+	theViewPort[2] = this->m_scrinfo.iWidth;
+	theViewPort[3] = this->m_scrinfo.iHeight;
+
+	gHUD.SetViewport(theViewPort);
+
+    mFont.Load("sprites/font_arial");
+    mSmallFont.Load("sprites/font_arialsmall");
+
+	// ----------
+	// Load Sprites
+	// ---------
+//	m_hsprFont = LoadSprite("sprites/%d_font.spr");
+	
+	m_hsprLogo = 0;	
+	m_hsprCursor = 0;
+
+	if (ScreenWidth() < 640)
+		m_iRes = 320;
+	else
+		m_iRes = 640;
+
+	// Only load this once
+	if ( !m_pSpriteList )
+	{
+		// we need to load the hud.txt, and all sprites within
+		m_pSpriteList = SPR_GetList("sprites/hud.txt", &m_iSpriteCountAllRes);
+
+		if (m_pSpriteList)
+		{
+			// count the number of sprites of the appropriate res
+			m_iSpriteCount = 0;
+			client_sprite_t *p = m_pSpriteList;
+			for ( int j = 0; j < m_iSpriteCountAllRes; j++ )
+			{
+				if ( p->iRes == m_iRes )
+					m_iSpriteCount++;
+				p++;
+			}
+
+			// allocated memory for sprite handle arrays
+ 			m_rghSprites = new HSPRITE[m_iSpriteCount];
+			m_rgrcRects = new wrect_t[m_iSpriteCount];
+			m_rgszSpriteNames = new char[m_iSpriteCount * MAX_SPRITE_NAME_LENGTH];
+
+			p = m_pSpriteList;
+			int index = 0;
+			for ( j = 0; j < m_iSpriteCountAllRes; j++ )
+			{
+				if ( p->iRes == m_iRes )
+				{
+					char sz[256];
+					sprintf(sz, "sprites/%s.spr", p->szSprite);
+					m_rghSprites[index] = Safe_SPR_Load(sz);
+					m_rgrcRects[index] = p->rc;
+					strncpy( &m_rgszSpriteNames[index * MAX_SPRITE_NAME_LENGTH], p->szName, MAX_SPRITE_NAME_LENGTH );
+
+					index++;
+				}
+
+				p++;
+			}
+		}
+	}
+	else
+	{
+		// we have already have loaded the sprite reference from hud.txt, but
+		// we need to make sure all the sprites have been loaded (we've gone through a transition, or loaded a save game)
+		client_sprite_t *p = m_pSpriteList;
+		int index = 0;
+		for ( int j = 0; j < m_iSpriteCountAllRes; j++ )
+		{
+			if ( p->iRes == m_iRes )
+			{
+				char sz[256];
+				sprintf( sz, "sprites/%s.spr", p->szSprite );
+				m_rghSprites[index] = Safe_SPR_Load(sz);
+				index++;
+			}
+
+			p++;
+		}
+	}
+
+	// assumption: number_1, number_2, etc, are all listed and loaded sequentially
+	m_HUD_number_0 = GetSpriteIndex( "number_0" );
+
+	m_iFontHeight = m_rgrcRects[m_HUD_number_0].bottom - m_rgrcRects[m_HUD_number_0].top;
+
+	m_Ammo.VidInit();
+	m_Health.VidInit();
+	m_Spectator.VidInit();
+	m_Geiger.VidInit();
+	m_Train.VidInit();
+	m_Battery.VidInit();
+	m_Flash.VidInit();
+	m_Message.VidInit();
+	m_StatusBar.VidInit();
+	m_DeathNotice.VidInit();
+	m_SayText.VidInit();
+	m_Menu.VidInit();
+	m_AmmoSecondary.VidInit();
+	m_TextMessage.VidInit();
+	m_StatusIcons.VidInit();
+	GetClientVoiceMgr()->VidInit();
+}
+
+int CHud::MsgFunc_Logo(const char *pszName,  int iSize, void *pbuf)
+{
+	BEGIN_READ( pbuf, iSize );
+
+	// update Train data
+	m_iLogo = READ_BYTE();
+
+	return 1;
+}
+
+float g_lastFOV = 0.0;
+
+/*
+============
+COM_FileBase
+============
+*/
+// Extracts the base name of a file (no path, no extension, assumes '/' as path separator)
+void COM_FileBase ( const char *in, char *out)
+{
+	int len, start, end;
+
+	len = strlen( in );
+	
+	// scan backward for '.'
+	end = len - 1;
+	while ( end && in[end] != '.' && in[end] != '/' && in[end] != '\\' )
+		end--;
+	
+	if ( in[end] != '.' )		// no '.', copy to end
+		end = len-1;
+	else 
+		end--;					// Found ',', copy to left of '.'
+
+
+	// Scan backward for '/'
+	start = len-1;
+	while ( start >= 0 && in[start] != '/' && in[start] != '\\' )
+		start--;
+
+	if ( in[start] != '/' && in[start] != '\\' )
+		start = 0;
+	else 
+		start++;
+
+	// Length of new sting
+	len = end - start + 1;
+
+	// Copy partial string
+	strncpy( out, &in[start], len );
+	// Terminate it
+	out[len] = 0;
+}
+
+/*
+=================
+HUD_IsGame
+
+=================
+*/
+int HUD_IsGame( const char *game )
+{
+	const char *gamedir;
+	char gd[ 1024 ];
+
+	gamedir = gEngfuncs.pfnGetGameDirectory();
+	if ( gamedir && gamedir[0] )
+	{
+		COM_FileBase( gamedir, gd );
+		if ( !stricmp( gd, game ) )
+			return 1;
+	}
+	return 0;
+}
+
+/*
+=====================
+HUD_GetFOV
+
+Returns last FOV
+=====================
+*/
+float HUD_GetFOV( void )
+{
+	if ( gEngfuncs.pDemoAPI->IsRecording() )
+	{
+		// Write it
+		int i = 0;
+		unsigned char buf[ 100 ];
+
+		// Active
+		*( float * )&buf[ i ] = g_lastFOV;
+		i += sizeof( float );
+
+		Demo_WriteBuffer( TYPE_ZOOM, i, buf );
+	}
+
+	if ( gEngfuncs.pDemoAPI->IsPlayingback() )
+	{
+		g_lastFOV = g_demozoom;
+	}
+	return g_lastFOV;
+}
+
+int CHud::MsgFunc_SetFOV(const char *pszName,  int iSize, void *pbuf)
+{
+	BEGIN_READ( pbuf, iSize );
+
+	int newfov = READ_BYTE();
+	int def_fov = CVAR_GET_FLOAT( "default_fov" );
+
+	//Weapon prediction already takes care of changing the fog. ( g_lastFOV ).
+	if ( cl_lw && cl_lw->value )
+		return 1;
+
+	g_lastFOV = newfov;
+
+	if ( newfov == 0 )
+	{
+		m_iFOV = def_fov;
+	}
+	else
+	{
+		m_iFOV = newfov;
+	}
+
+	// the clients fov is actually set in the client data update section of the hud
+
+	// Set a new sensitivity
+	if ( m_iFOV == def_fov )
+	{  
+		// reset to saved sensitivity
+		m_flMouseSensitivity = 0;
+	}
+	else
+	{  
+		// set a new sensitivity that is proportional to the change from the FOV default
+		m_flMouseSensitivity = sensitivity->value * ((float)newfov / (float)def_fov) * CVAR_GET_FLOAT("zoom_sensitivity_ratio");
+	}
+
+	return 1;
+}
+
+
+void CHud::AddHudElem(CHudBase *phudelem)
+{
+	HUDLIST *pdl, *ptemp;
+
+//phudelem->Think();
+
+	if (!phudelem)
+		return;
+
+	pdl = (HUDLIST *)malloc(sizeof(HUDLIST));
+	if (!pdl)
+		return;
+
+	memset(pdl, 0, sizeof(HUDLIST));
+	pdl->p = phudelem;
+
+	if (!m_pHudList)
+	{
+		m_pHudList = pdl;
+		return;
+	}
+
+	ptemp = m_pHudList;
+
+	while (ptemp->pNext)
+		ptemp = ptemp->pNext;
+
+	ptemp->pNext = pdl;
+}
+
+float CHud::GetSensitivity( void )
+{
+	return m_flMouseSensitivity;
+}
+
+
diff --git a/main/source/cl_dll/hud.h b/main/source/cl_dll/hud.h
new file mode 100644
index 00000000..3cb759d4
--- /dev/null
+++ b/main/source/cl_dll/hud.h
@@ -0,0 +1,86 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//			
+//  hud.h
+//
+// class CHud declaration
+//
+// CHud handles the message, calculation, and drawing the HUD
+//
+
+#ifndef HL_HUD_H
+#define HL_HUD_H
+
+#include "CHud.h"
+
+class TeamFortressViewport;
+
+class AvHHud;
+#include "mod/AvHHud.h"
+extern AvHHud gHUD;
+
+#include "wrect.h"
+#include "cl_dll.h"
+#include "ammo.h"
+#include "cl_dll/chudmisc.h"
+
+#include "..\game_shared\voice_status.h"
+#include "hud_spectator.h"
+
+/*
+class CHudScoreboard: public CHudBase
+{
+public:
+	int Init( void );
+	void InitHUDData( void );
+	int VidInit( void );
+	int Draw( float flTime );
+	int DrawPlayers( int xoffset, float listslot, int nameoffset = 0, char *team = NULL ); // returns the ypos where it finishes drawing
+	void UserCmd_ShowScores( void );
+	void UserCmd_HideScores( void );
+	int MsgFunc_ScoreInfo( const char *pszName, int iSize, void *pbuf );
+	int MsgFunc_TeamInfo( const char *pszName, int iSize, void *pbuf );
+	int MsgFunc_TeamScore( const char *pszName, int iSize, void *pbuf );
+	void DeathMsg( int killer, int victim );
+
+	int m_iNumTeams;
+
+	int m_iLastKilledBy;
+	int m_fLastKillTime;
+	int m_iPlayerNum;
+	int m_iShowscoresHeld;
+
+	void GetAllPlayersInfo( void );
+private:
+	struct cvar_s *cl_showpacketloss;
+
+};
+*/
+
+//
+//-----------------------------------------------------
+//
+
+#include "cl_dll/chud.h"
+
+extern TeamFortressViewport *gViewPort;
+
+extern int g_iPlayerClass;
+extern int g_iTeamNumber;
+extern int g_iUser1;
+extern int g_iUser2;
+extern int g_iUser3;
+
+#endif
diff --git a/main/source/cl_dll/hud_iface.h b/main/source/cl_dll/hud_iface.h
new file mode 100644
index 00000000..eb232271
--- /dev/null
+++ b/main/source/cl_dll/hud_iface.h
@@ -0,0 +1,12 @@
+#if !defined( HUD_IFACEH )
+#define HUD_IFACEH
+#pragma once
+
+#define EXPORT		_declspec( dllexport )
+
+typedef int (*pfnUserMsgHook)(const char *pszName, int iSize, void *pbuf);
+#include "wrect.h"
+#include "../engine/cdll_int.h"
+extern cl_enginefunc_t gEngfuncs;
+
+#endif
\ No newline at end of file
diff --git a/main/source/cl_dll/hud_msg.cpp b/main/source/cl_dll/hud_msg.cpp
new file mode 100644
index 00000000..ebdea784
--- /dev/null
+++ b/main/source/cl_dll/hud_msg.cpp
@@ -0,0 +1,123 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+//  hud_msg.cpp
+//
+
+#include "hud.h"
+#include "cl_util.h"
+#include "parsemsg.h"
+#include "r_efx.h"
+
+#define MAX_CLIENTS 32
+
+#if !defined( _TFC )
+extern BEAM *pBeam;
+extern BEAM *pBeam2;
+#endif 
+/// USER-DEFINED SERVER MESSAGE HANDLERS
+
+int CHud :: MsgFunc_ResetHUD(const char *pszName, int iSize, void *pbuf )
+{
+	/* <<< cgc >>> Removed this, the receiving message is expecting a size of zero and is asserting.  Why was this broken, I didn't change it? >>> */
+	/*ASSERT( iSize == 0 );*/
+	int theByteRead = READ_BYTE();
+
+	// clear all hud data
+	HUDLIST *pList = m_pHudList;
+
+	while ( pList )
+	{
+		if ( pList->p )
+			pList->p->Reset();
+		pList = pList->pNext;
+	}
+
+	// reset sensitivity
+	m_flMouseSensitivity = 0;
+
+	// reset concussion effect
+	m_iConcussionEffect = 0;
+
+	return 1;
+}
+
+void CAM_ToFirstPerson(void);
+void CHud :: MsgFunc_ViewMode( const char *pszName, int iSize, void *pbuf )
+{
+	CAM_ToFirstPerson();
+}
+
+void CHud :: MsgFunc_InitHUD( const char *pszName, int iSize, void *pbuf )
+{
+	// prepare all hud data
+	HUDLIST *pList = m_pHudList;
+
+	while (pList)
+	{
+		if ( pList->p )
+			pList->p->InitHUDData();
+		pList = pList->pNext;
+	}
+#if !defined( _TFC )
+	//Probably not a good place to put this.
+	pBeam = pBeam2 = NULL;
+#endif
+}
+
+
+int CHud :: MsgFunc_GameMode(const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+	m_Teamplay = READ_BYTE();
+
+	return 1;
+}
+
+
+int CHud :: MsgFunc_Damage(const char *pszName, int iSize, void *pbuf )
+{
+	int		armor, blood;
+	Vector	from;
+	int		i;
+	float	count;
+	
+	BEGIN_READ( pbuf, iSize );
+	armor = READ_BYTE();
+	blood = READ_BYTE();
+
+	for (i=0 ; i<3 ; i++)
+		from[i] = READ_COORD();
+
+	count = (blood * 0.5) + (armor * 0.5);
+
+	if (count < 10)
+		count = 10;
+
+	// TODO: kick viewangles,  show damage visually
+
+	return 1;
+}
+
+int CHud :: MsgFunc_Concuss( const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+	m_iConcussionEffect = READ_BYTE();
+	if (m_iConcussionEffect)
+		this->m_StatusIcons.EnableIcon("dmg_concuss",255,160,0);
+	else
+		this->m_StatusIcons.DisableIcon("dmg_concuss");
+	return 1;
+}
diff --git a/main/source/cl_dll/hud_redraw.cpp b/main/source/cl_dll/hud_redraw.cpp
new file mode 100644
index 00000000..a768562f
--- /dev/null
+++ b/main/source/cl_dll/hud_redraw.cpp
@@ -0,0 +1,411 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// hud_redraw.cpp
+//
+#include <math.h>
+#include "hud.h"
+#include "cl_util.h"
+#include "mod/AvHFont.h"
+
+#include "vgui_TeamFortressViewport.h"
+
+#define MAX_LOGO_FRAMES 56
+
+int grgLogoFrame[MAX_LOGO_FRAMES] = 
+{
+	1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 13, 13, 13, 13, 13, 12, 11, 10, 9, 8, 14, 15,
+	16, 17, 18, 19, 20, 20, 20, 20, 20, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 
+	29, 29, 29, 29, 29, 28, 27, 26, 25, 24, 30, 31 
+};
+
+
+extern int g_iVisibleMouse;
+
+float HUD_GetFOV( void );
+
+extern cvar_t *sensitivity;
+extern cvar_t *cl_forcedefaultfov;
+
+// Think
+void CHud::Think(void)
+{
+	int newfov;
+	HUDLIST *pList = m_pHudList;
+
+	while (pList)
+	{
+		if (pList->p->m_iFlags & HUD_ACTIVE)
+			pList->p->Think();
+		pList = pList->pNext;
+	}
+
+	newfov = HUD_GetFOV();
+	if ( newfov == 0 )
+	{
+		m_iFOV = default_fov->value;
+	}
+	else
+	{
+		m_iFOV = newfov;
+	}
+
+	if(cl_forcedefaultfov->value)
+	{
+		m_iFOV = 90;
+	}
+
+	// the clients fov is actually set in the client data update section of the hud
+
+	// Set a new sensitivity
+	if ( m_iFOV == default_fov->value )
+	{  
+		// reset to saved sensitivity
+		m_flMouseSensitivity = 0;
+	}
+	else
+	{  
+		// set a new sensitivity that is proportional to the change from the FOV default
+		m_flMouseSensitivity = sensitivity->value * ((float)newfov / (float)default_fov->value) * CVAR_GET_FLOAT("zoom_sensitivity_ratio");
+	}
+
+	// think about default fov
+	if ( m_iFOV == 0 )
+	{  // only let players adjust up in fov,  and only if they are not overriden by something else
+		m_iFOV = max( default_fov->value, 90 );  
+	}
+}
+
+// Redraw
+// step through the local data,  placing the appropriate graphics & text as appropriate
+// returns 1 if they've changed, 0 otherwise
+int CHud :: Redraw( float flTime, int intermission )
+{
+	m_fOldTime = m_flTime;	// save time of previous redraw
+	m_flTime = flTime;
+	m_flTimeDelta = (double)m_flTime - m_fOldTime;
+	static m_flShotTime = 0;
+	
+	// Clock was reset, reset delta
+	if ( m_flTimeDelta < 0 )
+		m_flTimeDelta = 0;
+
+	// Bring up the scoreboard during intermission
+	if (gViewPort)
+	{
+		if ( m_iIntermission && !intermission )
+		{
+			// Have to do this here so the scoreboard goes away
+			m_iIntermission = intermission;
+			gViewPort->HideCommandMenu();
+			gViewPort->HideScoreBoard();
+			gViewPort->UpdateSpectatorPanel();
+		}
+		else if ( !m_iIntermission && intermission )
+		{
+			m_iIntermission = intermission;
+			gViewPort->HideCommandMenu();
+			gViewPort->HideVGUIMenu();
+			gViewPort->ShowScoreBoard();
+			gViewPort->UpdateSpectatorPanel();
+
+			// Take a screenshot if the client's got the cvar set
+			if ( CVAR_GET_FLOAT( "hud_takesshots" ) != 0 )
+				m_flShotTime = flTime + 1.0;	// Take a screenshot in a second
+		}
+	}
+
+	if (m_flShotTime && m_flShotTime < flTime)
+	{
+		gEngfuncs.pfnClientCmd("snapshot\n");
+		m_flShotTime = 0;
+	}
+
+	m_iIntermission = intermission;
+
+	// if no redrawing is necessary
+	// return 0;
+
+	
+	if ( m_pCvarDraw->value)
+	{
+	HUDLIST *pList = m_pHudList;
+
+	while (pList)
+	{
+		if ( !intermission )
+		{
+			if ( (pList->p->m_iFlags & HUD_ACTIVE) && (!(m_iHideHUDDisplay & HIDEHUD_CHAT) && !(m_iHideHUDDisplay & HIDEHUD_ALL)) )
+				pList->p->Draw(flTime);
+		}
+		else
+		{  // it's an intermission,  so only draw hud elements that are set to draw during intermissions
+			if ( pList->p->m_iFlags & HUD_INTERMISSION )
+				pList->p->Draw( flTime );
+		}
+
+		pList = pList->pNext;
+		}
+	}
+
+	// are we in demo mode? do we need to draw the logo in the top corner?
+	if (m_iLogo)
+	{
+		int x, y, i;
+
+		if (m_hsprLogo == 0)
+			m_hsprLogo = LoadSprite("sprites/%d_logo.spr");
+
+		SPR_Set(m_hsprLogo, 250, 250, 250 );
+		
+		x = SPR_Width(m_hsprLogo, 0);
+		x = ScreenWidth() - x;
+		y = SPR_Height(m_hsprLogo, 0)/2;
+
+		// Draw the logo at 20 fps
+		int iFrame = (int)(flTime * 20) % MAX_LOGO_FRAMES;
+		i = grgLogoFrame[iFrame] - 1;
+
+		SPR_DrawAdditive(i, x, y, NULL);
+	}
+	
+	/*
+	if ( g_iVisibleMouse )
+	{
+	void IN_GetMousePos( int *mx, int *my );
+	int mx, my;
+	
+	  IN_GetMousePos( &mx, &my );
+	  
+		if (m_hsprCursor == 0)
+		{
+		char sz[256];
+		sprintf( sz, "sprites/cursor.spr" );
+		m_hsprCursor = SPR_Load( sz );
+		}
+		
+		  SPR_Set(m_hsprCursor, 250, 250, 250 );
+		  
+			// Draw the logo at 20 fps
+			SPR_DrawAdditive( 0, mx, my, NULL );
+			}
+	*/
+	
+	return 1;
+}
+
+void ScaleColors( int &r, int &g, int &b, int a )
+{
+	float x = (float)a / 255;
+	r = (int)(r * x);
+	g = (int)(g * x);
+	b = (int)(b * x);
+}
+
+int CHud::GetHudStringHeight()
+{
+
+    /*
+	int theHeight = 0;
+	theHeight = gHUD.m_scrinfo.iCharHeight;
+	return theHeight;
+    */
+
+    return mFont.GetStringHeight();
+
+}
+
+int CHud::GetHudStringWidth(const char* szIt)
+{
+    /*
+	int theWidth = 0;
+
+	// draw the string until we hit the null character or a newline character
+	for ( ; *szIt != 0 && *szIt != '\n'; szIt++ )
+	{
+		theWidth += gHUD.m_scrinfo.charWidths[ *szIt ];
+	}
+	
+	return theWidth;
+    */
+
+    return mFont.GetStringWidth(szIt);
+
+}
+
+int CHud::DrawHudStringCentered(int x, int y, int iMaxX, const char *szString, int r, int g, int b )
+{
+	int theStringWidth = this->GetHudStringWidth(szString);
+	return this->DrawHudString(x - theStringWidth/2, y, iMaxX, szString, r, g, b);
+}
+
+int CHud :: DrawHudString(int xpos, int ypos, int iMaxX, const char *szIt, int r, int g, int b )
+{
+    /*
+	// Try to prevent software-mode crash
+	int theStringHeight = this->GetHudStringHeight();
+
+	if((ypos + theStringHeight) < ScreenHeight())
+	{
+		// draw the string until we hit the null character or a newline character
+		for ( ; *szIt != 0 && *szIt != '\n'; szIt++ )
+		{
+			int next = xpos + gHUD.m_scrinfo.charWidths[ *szIt ]; // variable-width fonts look cool
+			if ( next > iMaxX )
+				return xpos;
+		
+			TextMessageDrawChar( xpos, ypos, *szIt, r, g, b );
+			xpos = next;		
+		}
+	}
+
+	return xpos;
+    */
+
+    return mFont.DrawString(xpos, ypos, szIt, r, g, b);
+
+}
+
+int CHud :: DrawHudNumberString( int xpos, int ypos, int iMinX, int iNumber, int r, int g, int b )
+{
+	char szString[32];
+	sprintf( szString, "%d", iNumber );
+	return DrawHudStringReverse( xpos, ypos, iMinX, szString, r, g, b );
+
+}
+
+// draws a string from right to left (right-aligned)
+int CHud :: DrawHudStringReverse( int xpos, int ypos, int iMinX, char *szString, int r, int g, int b )
+{
+ 
+    /*
+	// find the end of the string
+	for ( char *szIt = szString; *szIt != 0; szIt++ )
+	{ // we should count the length?		
+	}
+
+	// iterate throug the string in reverse
+	for ( szIt--;  szIt != (szString-1);  szIt-- )	
+	{
+		int next = xpos - gHUD.m_scrinfo.charWidths[ *szIt ]; // variable-width fonts look cool
+		if ( next < iMinX )
+			return xpos;
+		xpos = next;
+
+		TextMessageDrawChar( xpos, ypos, *szIt, r, g, b );
+	}
+
+	return xpos;
+    */
+
+    return mFont.DrawStringReverse(xpos, ypos, szString, r, g, b);
+    
+}
+
+int CHud :: DrawHudNumber( int x, int y, int iFlags, int iNumber, int r, int g, int b)
+{
+	int iWidth = GetSpriteRect(m_HUD_number_0).right - GetSpriteRect(m_HUD_number_0).left;
+	int k;
+	
+	if (iNumber > 0)
+	{
+		// SPR_Draw 100's
+		if (iNumber >= 100)
+		{
+			 k = iNumber/100;
+			SPR_Set(GetSprite(m_HUD_number_0 + k), r, g, b );
+			SPR_DrawAdditive( 0, x, y, &GetSpriteRect(m_HUD_number_0 + k));
+			x += iWidth;
+		}
+		else if (iFlags & (DHN_3DIGITS))
+		{
+			//SPR_DrawAdditive( 0, x, y, &rc );
+			x += iWidth;
+		}
+
+		// SPR_Draw 10's
+		if (iNumber >= 10)
+		{
+			k = (iNumber % 100)/10;
+			SPR_Set(GetSprite(m_HUD_number_0 + k), r, g, b );
+			SPR_DrawAdditive( 0, x, y, &GetSpriteRect(m_HUD_number_0 + k));
+			x += iWidth;
+		}
+		else if (iFlags & (DHN_3DIGITS | DHN_2DIGITS))
+		{
+			//SPR_DrawAdditive( 0, x, y, &rc );
+			x += iWidth;
+		}
+
+		// SPR_Draw ones
+		k = iNumber % 10;
+		SPR_Set(GetSprite(m_HUD_number_0 + k), r, g, b );
+		SPR_DrawAdditive(0,  x, y, &GetSpriteRect(m_HUD_number_0 + k));
+		x += iWidth;
+	} 
+	else if (iFlags & DHN_DRAWZERO) 
+	{
+		SPR_Set(GetSprite(m_HUD_number_0), r, g, b );
+
+		// SPR_Draw 100's
+		if (iFlags & (DHN_3DIGITS))
+		{
+			//SPR_DrawAdditive( 0, x, y, &rc );
+			x += iWidth;
+		}
+
+		if (iFlags & (DHN_3DIGITS | DHN_2DIGITS))
+		{
+			//SPR_DrawAdditive( 0, x, y, &rc );
+			x += iWidth;
+		}
+
+		// SPR_Draw ones
+		
+		SPR_DrawAdditive( 0,  x, y, &GetSpriteRect(m_HUD_number_0));
+		x += iWidth;
+	}
+
+	return x;
+}
+
+
+int CHud::GetNumWidth( int iNumber, int iFlags )
+{
+	if (iFlags & (DHN_3DIGITS))
+		return 3;
+
+	if (iFlags & (DHN_2DIGITS))
+		return 2;
+
+	if (iNumber <= 0)
+	{
+		if (iFlags & (DHN_DRAWZERO))
+			return 1;
+		else
+			return 0;
+	}
+
+	if (iNumber < 10)
+		return 1;
+
+	if (iNumber < 100)
+		return 2;
+
+	return 3;
+
+}	
+
+
diff --git a/main/source/cl_dll/hud_servers.cpp b/main/source/cl_dll/hud_servers.cpp
new file mode 100644
index 00000000..c3c64da3
--- /dev/null
+++ b/main/source/cl_dll/hud_servers.cpp
@@ -0,0 +1,1223 @@
+// hud_servers.cpp
+#include "hud.h"
+#include "cl_util.h"
+#include "hud_servers_priv.h"
+#include "hud_servers.h"
+#include "net_api.h"
+#include <string.h>
+#include <winsock.h>
+
+static int	context_id;
+
+// Default master server address in case we can't read any from woncomm.lst file
+#define VALVE_MASTER_ADDRESS "half-life.east.won.net"
+#define PORT_MASTER	 27010
+#define PORT_SERVER  27015
+
+// File where we really should look for master servers
+#define MASTER_PARSE_FILE "woncomm.lst"
+
+#define MAX_QUERIES 20
+
+#define NET_API gEngfuncs.pNetAPI
+
+static CHudServers *g_pServers = NULL;
+
+/*
+===================
+ListResponse
+
+Callback from engine
+===================
+*/
+void NET_CALLBACK ListResponse( struct net_response_s *response )
+{
+	if ( g_pServers )
+	{
+		g_pServers->ListResponse( response );
+	}
+}
+
+/*
+===================
+ServerResponse
+
+Callback from engine
+===================
+*/
+void NET_CALLBACK ServerResponse( struct net_response_s *response )
+{
+	if ( g_pServers )
+	{
+		g_pServers->ServerResponse( response );
+	}
+}
+
+/*
+===================
+PingResponse
+
+Callback from engine
+===================
+*/
+void NET_CALLBACK PingResponse( struct net_response_s *response )
+{
+	if ( g_pServers )
+	{
+		g_pServers->PingResponse( response );
+	}
+}
+
+/*
+===================
+RulesResponse
+
+Callback from engine
+===================
+*/
+void NET_CALLBACK RulesResponse( struct net_response_s *response )
+{
+	if ( g_pServers )
+	{
+		g_pServers->RulesResponse( response );
+	}
+}
+/*
+===================
+PlayersResponse
+
+Callback from engine
+===================
+*/
+void NET_CALLBACK PlayersResponse( struct net_response_s *response )
+{
+	if ( g_pServers )
+	{
+		g_pServers->PlayersResponse( response );
+	}
+}
+/*
+===================
+ListResponse
+
+===================
+*/
+void CHudServers::ListResponse( struct net_response_s *response )
+{
+	request_t *list;
+	request_t *p;
+	int c = 0;
+
+	if ( !( response->error == NET_SUCCESS ) )
+		return;
+
+	if ( response->type != NETAPI_REQUEST_SERVERLIST )
+		return;
+
+	if ( response->response )
+	{
+		list = ( request_t * ) response->response;
+		while ( list )
+		{
+			c++;
+
+			//if ( c < 40 )
+			{
+				// Copy from parsed stuff
+				p = new request_t;
+				p->context = -1;
+				p->remote_address = list->remote_address;
+				p->next = m_pServerList;
+				m_pServerList = p;
+			}
+
+			// Move on
+			list = list->next;
+		}
+	}
+
+	gEngfuncs.Con_Printf( "got list\n" );
+
+	m_nQuerying = 1;
+	m_nActiveQueries = 0;
+}
+
+/*
+===================
+ServerResponse
+
+===================
+*/
+void CHudServers::ServerResponse( struct net_response_s *response )
+{
+	char *szresponse;
+	request_t *p;
+	server_t *browser;
+	int	len;
+	char sz[ 32 ];
+
+	// Remove from active list
+	p = FindRequest( response->context, m_pActiveList );
+	if ( p )
+	{
+		RemoveServerFromList( &m_pActiveList, p );
+		m_nActiveQueries--;
+	}
+	
+	if ( response->error != NET_SUCCESS )
+		return;
+	
+	switch ( response->type )
+	{
+	case NETAPI_REQUEST_DETAILS:
+		if ( response->response )
+		{
+			szresponse = (char *)response->response;
+			len = strlen( szresponse ) + 100 + 1;
+			sprintf( sz, "%i", (int)( 1000.0 * response->ping ) );
+
+			browser = new server_t;
+			browser->remote_address = response->remote_address;
+			browser->info = new char[ len ];
+			browser->ping = (int)( 1000.0 * response->ping );
+			strcpy( browser->info, szresponse );
+
+			NET_API->SetValueForKey( browser->info, "address", gEngfuncs.pNetAPI->AdrToString( &response->remote_address ), len );
+			NET_API->SetValueForKey( browser->info, "ping", sz, len );
+			
+			AddServer( &m_pServers, browser );
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+/*
+===================
+PingResponse
+
+===================
+*/
+void CHudServers::PingResponse( struct net_response_s *response )
+{
+	char sz[ 32 ];
+
+	if ( response->error != NET_SUCCESS )
+		return;
+
+	switch ( response->type )
+	{
+	case NETAPI_REQUEST_PING:
+		sprintf( sz, "%.2f", 1000.0 * response->ping );
+
+		gEngfuncs.Con_Printf( "ping == %s\n", sz );
+		break;
+	default:
+		break;
+	}
+}
+
+/*
+===================
+RulesResponse
+
+===================
+*/
+void CHudServers::RulesResponse( struct net_response_s *response )
+{
+	char *szresponse;
+	
+	if ( response->error != NET_SUCCESS )
+		return;
+	
+	switch ( response->type )
+	{
+	case NETAPI_REQUEST_RULES:
+		if ( response->response )
+		{
+			szresponse = (char *)response->response;
+
+			gEngfuncs.Con_Printf( "rules %s\n", szresponse );
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+/*
+===================
+PlayersResponse
+
+===================
+*/
+void CHudServers::PlayersResponse( struct net_response_s *response )
+{
+	char *szresponse;
+
+	if ( response->error != NET_SUCCESS )
+		return;
+	
+	switch ( response->type )
+	{
+	case NETAPI_REQUEST_PLAYERS:
+		if ( response->response )
+		{
+			szresponse = (char *)response->response;
+
+			gEngfuncs.Con_Printf( "players %s\n", szresponse );
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+/*
+===================
+CompareServers
+
+Return 1 if p1 is "less than" p2, 0 otherwise
+===================
+*/
+int	CHudServers::CompareServers( server_t *p1, server_t *p2 )
+{
+	const char *n1, *n2;
+
+	if ( p1->ping < p2->ping )
+		return 1;
+
+	if ( p1->ping == p2->ping )
+	{
+		// Pings equal, sort by second key:  hostname
+		if ( p1->info && p2->info )
+		{
+			n1 = NET_API->ValueForKey( p1->info, "hostname" );
+			n2 = NET_API->ValueForKey( p2->info, "hostname" );
+
+			if ( n1 && n2 )
+			{
+				if ( stricmp( n1, n2 ) < 0 )
+					return 1;
+			}
+		}
+	}
+
+	return 0;
+}
+
+/*
+===================
+AddServer
+
+===================
+*/
+void CHudServers::AddServer( server_t **ppList, server_t *p )
+{
+server_t *list;
+
+	if ( !ppList || ! p )
+		return;
+
+	m_nServerCount++;
+
+	// What sort key?  Ping?
+	list = *ppList;
+
+	// Head of list?
+	if ( !list )
+	{
+		p->next = NULL;
+		*ppList = p;
+		return;
+	}
+
+	// Put on head of list
+	if ( CompareServers( p, list ) )
+	{
+		p->next = *ppList;
+		*ppList = p;
+	}
+	else
+	{
+		while ( list->next )
+		{
+			// Insert before list next
+			if ( CompareServers( p, list->next ) )
+			{
+				p->next = list->next->next;
+				list->next = p;
+				return;
+			}
+
+			list = list->next;
+		}
+
+		// Just add at end
+		p->next = NULL;
+		list->next = p;
+	}
+}
+
+/*
+===================
+Think
+
+===================
+*/
+void CHudServers::Think( double time )
+{
+	m_fElapsed += time;
+
+	if ( !m_nRequesting )
+		return;
+
+	if ( !m_nQuerying )
+		return;
+
+	QueryThink();
+
+	if ( ServerListSize() > 0 )
+		return;
+
+	m_dStarted = 0.0;
+	m_nRequesting = 0;
+	m_nDone = 0;
+	m_nQuerying = 0;
+	m_nActiveQueries = 0;
+}
+
+/*
+===================
+QueryThink
+
+===================
+*/
+void CHudServers::QueryThink( void )
+{
+	request_t *p;
+
+	if ( !m_nRequesting || m_nDone )
+		return;
+
+	if ( !m_nQuerying )
+		return;
+
+	if ( m_nActiveQueries > MAX_QUERIES )
+		return;
+
+	// Nothing left
+	if ( !m_pServerList )
+		return;
+
+	while ( 1 )
+	{
+		p = m_pServerList;
+
+		// No more in list?
+		if ( !p )
+			break;
+
+		// Move to next
+		m_pServerList = m_pServerList->next;
+
+		// Setup context_id
+		p->context = context_id;
+
+		// Start up query on this one
+		NET_API->SendRequest( context_id++, NETAPI_REQUEST_DETAILS, 0, 2.0, &p->remote_address, ::ServerResponse );
+
+		// Increment active list
+		m_nActiveQueries++;
+
+		// Add to active list
+		p->next = m_pActiveList;
+		m_pActiveList = p;
+
+		// Too many active?
+		if ( m_nActiveQueries > MAX_QUERIES )
+			break;
+	}
+}
+
+/*
+==================
+ServerListSize
+
+# of servers in active query and in pending to be queried lists
+==================
+*/
+int	CHudServers::ServerListSize( void )
+{
+	int c = 0;
+	request_t *p;
+
+	p = m_pServerList;
+	while ( p )
+	{
+		c++;
+		p = p->next;
+	}
+
+	p = m_pActiveList;
+	while ( p )
+	{
+		c++;
+		p = p->next;
+	}
+
+	return c;
+}
+
+/*
+===================
+FindRequest
+
+Look up a request by context id
+===================
+*/
+CHudServers::request_t *CHudServers::FindRequest( int context, request_t *pList )
+{
+	request_t *p;
+	p = pList;
+	while ( p )
+	{
+		if ( context == p->context )
+			return p;
+
+		p = p->next;
+	}
+	return NULL;
+}
+
+/*
+===================
+RemoveServerFromList
+
+Remote, but don't delete, item from *ppList
+===================
+*/
+void CHudServers::RemoveServerFromList( request_t **ppList, request_t *item )
+{
+	request_t *p, *n;
+	request_t *newlist = NULL;
+
+	if ( !ppList )
+		return;
+
+	p = *ppList;
+	while ( p )
+	{
+		n = p->next;
+		if ( p != item )
+		{
+			p->next = newlist;
+			newlist = p;
+		}
+		p = n;
+	}
+	*ppList = newlist;
+}
+
+/*
+===================
+ClearRequestList
+
+===================
+*/
+void CHudServers::ClearRequestList( request_t **ppList )
+{
+	request_t *p, *n;
+
+	if ( !ppList )
+		return;
+
+	p = *ppList;
+	while ( p )
+	{
+		n = p->next;
+		delete p;
+		p = n;
+	}
+	*ppList = NULL;
+}
+
+/*
+===================
+ClearServerList
+
+===================
+*/
+void CHudServers::ClearServerList( server_t **ppList )
+{
+	server_t *p, *n;
+
+	if ( !ppList )
+		return;
+
+	p = *ppList;
+	while ( p )
+	{
+		n = p->next;
+		delete[] p->info;
+		delete p;
+		p = n;
+	}
+	*ppList = NULL;
+}
+
+int CompareField( CHudServers::server_t *p1, CHudServers::server_t *p2, const char *fieldname, int iSortOrder )
+{
+	const char *sz1, *sz2;
+	float fv1, fv2;
+
+	sz1 = NET_API->ValueForKey( p1->info, fieldname );
+	sz2 = NET_API->ValueForKey( p2->info, fieldname );
+
+	fv1 = atof( sz1 );
+	fv2 = atof( sz2 );
+
+	if ( fv1 && fv2 )
+	{
+		if ( fv1 > fv2 )
+			return iSortOrder;
+		else if ( fv1 < fv2 )
+			return -iSortOrder;
+		else
+			return 0;
+	}
+
+	// String compare
+	return stricmp( sz1, sz2 );
+}
+
+int CALLBACK ServerListCompareFunc( CHudServers::server_t *p1, CHudServers::server_t *p2, const char *fieldname )
+{
+	if (!p1 || !p2)  // No meaningful comparison
+		return 0;  
+
+	int iSortOrder = 1;
+
+	int retval = 0;
+
+	retval = CompareField( p1, p2, fieldname, iSortOrder );
+
+	return retval;
+}
+
+static char g_fieldname[ 256 ];
+int __cdecl FnServerCompare(const void *elem1, const void *elem2 )
+{
+	CHudServers::server_t *list1, *list2;
+
+	list1 = *(CHudServers::server_t **)elem1;
+	list2 = *(CHudServers::server_t **)elem2;
+
+	return ServerListCompareFunc( list1, list2, g_fieldname );
+}
+
+void CHudServers::SortServers( const char *fieldname )
+{
+	server_t *p;
+	// Create a list
+	if ( !m_pServers )
+		return;
+
+	strcpy( g_fieldname, fieldname );
+
+	int i;
+	int c = 0;
+
+	p = m_pServers;
+	while ( p )
+	{
+		c++;
+		p = p->next;
+	}
+
+	server_t **pSortArray;
+	
+	pSortArray = new server_t *[ c ];
+	memset( pSortArray, 0, c  * sizeof( server_t * ) );
+
+	// Now copy the list into the pSortArray:
+	p = m_pServers;
+	i = 0;
+	while ( p )
+	{
+		pSortArray[ i++ ] = p;
+		p = p->next;
+	}
+
+	// Now do that actual sorting.
+	size_t nCount = c;
+	size_t nSize  = sizeof( server_t * );
+
+	qsort(
+		pSortArray,
+		(size_t)nCount,
+		(size_t)nSize,
+		FnServerCompare
+	);
+
+	// Now rebuild the list.
+	m_pServers = pSortArray[0];
+	for ( i = 0; i < c - 1; i++ )
+	{
+		pSortArray[ i ]->next = pSortArray[ i + 1 ];
+	}
+	pSortArray[ c - 1 ]->next = NULL;
+
+	// Clean Up.
+	delete[] pSortArray;
+}
+
+/*
+===================
+GetServer
+
+Return particular server
+===================
+*/
+CHudServers::server_t *CHudServers::GetServer( int server )
+{
+	int c = 0;
+	server_t *p;
+
+	p = m_pServers;
+	while ( p )
+	{
+		if ( c == server )
+			return p;
+
+		c++;
+		p = p->next;
+	}
+	return NULL;
+}
+
+/*
+===================
+GetServerInfo
+
+Return info ( key/value ) string for particular server
+===================
+*/
+char *CHudServers::GetServerInfo( int server )
+{
+	server_t *p = GetServer( server );
+	if ( p )
+	{
+		return p->info;
+	}
+	return NULL;
+}
+
+/*
+===================
+CancelRequest
+
+Kill all pending requests in engine
+===================
+*/
+void CHudServers::CancelRequest( void )
+{
+	m_nRequesting = 0;
+	m_nQuerying   = 0;
+	m_nDone		  = 1;
+
+	NET_API->CancelAllRequests();
+}
+
+/*
+==================
+LoadMasterAddresses
+
+Loads the master server addresses from file and into the passed in array
+==================
+*/
+int CHudServers::LoadMasterAddresses( int maxservers, int *count, netadr_t *padr )
+{
+	int			i;
+	char		szMaster[ 256 ];
+	char		szMasterFile[256];
+	char		*pbuffer = NULL;
+	char		*pstart = NULL ;
+	netadr_t	adr;
+	char		szAdr[64];
+	int			nPort;
+	int			nCount = 0;
+	bool		bIgnore;
+	int			nDefaultPort;
+
+	// Assume default master and master file
+	strcpy( szMaster, VALVE_MASTER_ADDRESS );    // IP:PORT string
+	strcpy( szMasterFile, MASTER_PARSE_FILE );
+
+	// See if there is a command line override
+	i = gEngfuncs.CheckParm( "-comm", &pstart );
+	if ( i && pstart )
+	{
+		strcpy (szMasterFile, pstart );
+	}
+
+	// Read them in from proper file
+	pbuffer = (char *)gEngfuncs.COM_LoadFile( szMasterFile, 5, NULL ); // Use malloc
+	if ( !pbuffer )
+	{
+		goto finish_master;
+	}
+
+	pstart = pbuffer;
+
+	while ( nCount < maxservers )
+	{
+		pstart = gEngfuncs.COM_ParseFile( pstart, m_szToken );
+
+		if ( strlen(m_szToken) <= 0)
+			break;
+
+		bIgnore = true;
+
+		if ( !stricmp( m_szToken, "Master" ) )
+		{
+			nDefaultPort = PORT_MASTER;
+			bIgnore = FALSE;
+		}
+
+		// Now parse all addresses between { }
+		pstart = gEngfuncs.COM_ParseFile( pstart, m_szToken );
+		if ( strlen(m_szToken) <= 0 )
+			break;
+
+		if ( stricmp ( m_szToken, "{" ) )
+			break;
+
+		// Parse addresses until we get to "}"
+		while ( nCount < maxservers )
+		{
+			char base[256];
+
+			// Now parse all addresses between { }
+			pstart = gEngfuncs.COM_ParseFile( pstart, m_szToken );
+			
+			if (strlen(m_szToken) <= 0)
+				break;
+
+			if ( !stricmp ( m_szToken, "}" ) )
+				break;
+			
+			sprintf( base, "%s", m_szToken );
+				
+			pstart = gEngfuncs.COM_ParseFile( pstart, m_szToken );
+			
+			if (strlen(m_szToken) <= 0)
+				break;
+
+			if ( stricmp( m_szToken, ":" ) )
+				break;
+
+			pstart = gEngfuncs.COM_ParseFile( pstart, m_szToken );
+			
+			if (strlen(m_szToken) <= 0)
+				break;
+
+			nPort = atoi ( m_szToken );
+			if ( !nPort )
+				nPort = nDefaultPort;
+
+			sprintf( szAdr, "%s:%i", base, nPort );
+
+			// Can we resolve it any better
+			if ( !NET_API->StringToAdr( szAdr, &adr ) )
+				bIgnore = true;
+
+			if ( !bIgnore )
+			{
+				padr[ nCount++ ] = adr;
+			}
+		}
+	}
+
+finish_master:
+	if ( !nCount )
+	{
+		sprintf( szMaster, VALVE_MASTER_ADDRESS );    // IP:PORT string
+
+		// Convert to netadr_t
+		if ( NET_API->StringToAdr ( szMaster, &adr ) )
+		{
+		
+			padr[ nCount++ ] = adr;
+		}
+	}
+
+	*count = nCount;
+
+	if ( pbuffer )
+	{
+		gEngfuncs.COM_FreeFile( pbuffer );
+	}
+
+	return ( nCount > 0 ) ? 1 : 0;
+}
+
+/*
+===================
+RequestList
+
+Request list of game servers from master
+===================
+*/
+void CHudServers::RequestList( void )
+{
+	m_nRequesting	= 1;
+	m_nDone			= 0;
+	m_dStarted		= m_fElapsed;
+
+	int	count = 0;
+	netadr_t adr;
+
+	if ( !LoadMasterAddresses( 1, &count, &adr ) )
+	{
+		gEngfuncs.Con_DPrintf( "SendRequest:  Unable to read master server addresses\n" );
+		return;
+	}
+
+	ClearRequestList( &m_pActiveList );
+	ClearRequestList( &m_pServerList );
+	ClearServerList( &m_pServers );
+
+	m_nServerCount = 0;
+
+	// Make sure networking system has started.
+	NET_API->InitNetworking();
+
+	// Kill off left overs if any
+	NET_API->CancelAllRequests();
+
+	// Request Server List from master
+	NET_API->SendRequest( context_id++, NETAPI_REQUEST_SERVERLIST, 0, 5.0, &adr, ::ListResponse );
+}
+
+void CHudServers::RequestBroadcastList( int clearpending )
+{
+	m_nRequesting	= 1;
+	m_nDone			= 0;
+	m_dStarted		= m_fElapsed;
+
+	netadr_t		adr;
+	memset( &adr, 0, sizeof( adr ) );
+
+	if ( clearpending )
+	{
+		ClearRequestList( &m_pActiveList );
+		ClearRequestList( &m_pServerList );
+		ClearServerList( &m_pServers );
+
+		m_nServerCount = 0;
+	}
+
+	// Make sure to byte swap server if necessary ( using "host" to "net" conversion
+	adr.port = htons( PORT_SERVER );
+
+	// Make sure networking system has started.
+	NET_API->InitNetworking();
+
+	if ( clearpending )
+	{
+		// Kill off left overs if any
+		NET_API->CancelAllRequests();
+	}
+
+	adr.type = NA_BROADCAST;
+
+	// Request Servers from LAN via IP
+	NET_API->SendRequest( context_id++, NETAPI_REQUEST_DETAILS, FNETAPI_MULTIPLE_RESPONSE, 5.0, &adr, ::ServerResponse );
+
+	adr.type = NA_BROADCAST_IPX;
+
+	// Request Servers from LAN via IPX ( if supported )
+	NET_API->SendRequest( context_id++, NETAPI_REQUEST_DETAILS, FNETAPI_MULTIPLE_RESPONSE, 5.0, &adr, ::ServerResponse );
+}
+
+void CHudServers::ServerPing( int server )
+{
+	server_t *p;
+	
+	p = GetServer( server );
+	if ( !p )
+		return;
+
+	// Make sure networking system has started.
+	NET_API->InitNetworking();
+
+	// Request Server List from master
+	NET_API->SendRequest( context_id++, NETAPI_REQUEST_PING, 0, 5.0, &p->remote_address, ::PingResponse );
+}
+
+void CHudServers::ServerRules( int server )
+{
+	server_t *p;
+	
+	p = GetServer( server );
+	if ( !p )
+		return;
+
+	// Make sure networking system has started.
+	NET_API->InitNetworking();
+
+	// Request Server List from master
+	NET_API->SendRequest( context_id++, NETAPI_REQUEST_RULES, 0, 5.0, &p->remote_address, ::RulesResponse );
+}
+
+void CHudServers::ServerPlayers( int server )
+{
+	server_t *p;
+	
+	p = GetServer( server );
+	if ( !p )
+		return;
+
+	// Make sure networking system has started.
+	NET_API->InitNetworking();
+
+	// Request Server List from master
+	NET_API->SendRequest( context_id++, NETAPI_REQUEST_PLAYERS, 0, 5.0, &p->remote_address, ::PlayersResponse );
+}
+
+int CHudServers::isQuerying()
+{
+	return m_nRequesting ? 1 : 0;
+}
+
+
+/*
+===================
+GetServerCount
+
+Return number of servers in browser list
+===================
+*/
+int CHudServers::GetServerCount( void )
+{
+	return m_nServerCount;
+}
+
+/*
+===================
+CHudServers
+
+===================
+*/
+CHudServers::CHudServers( void )
+{
+	m_nRequesting		= 0;
+	m_dStarted			= 0.0;
+	m_nDone				= 0;
+	m_pServerList		= NULL;
+	m_pServers			= NULL;
+	m_pActiveList		= NULL;
+	m_nQuerying			= 0;
+	m_nActiveQueries	= 0;
+	
+	m_fElapsed			= 0.0;
+
+
+	m_pPingRequest		= NULL;
+	m_pRulesRequest		= NULL;
+	m_pPlayersRequest	= NULL;
+}
+
+/*
+===================
+~CHudServers
+
+===================
+*/
+CHudServers::~CHudServers( void )
+{
+	ClearRequestList( &m_pActiveList );
+	ClearRequestList( &m_pServerList );
+	ClearServerList( &m_pServers );
+
+	m_nServerCount = 0;
+
+	if ( m_pPingRequest )
+	{
+		delete m_pPingRequest;
+		m_pPingRequest = NULL;
+
+	}
+	
+	if ( m_pRulesRequest )
+	{
+		delete m_pRulesRequest;
+		m_pRulesRequest = NULL;
+	}
+
+	if ( m_pPlayersRequest )
+	{
+		delete m_pPlayersRequest;
+		m_pPlayersRequest = NULL;
+	}
+}
+
+///////////////////////////////
+//
+// PUBLIC APIs
+//
+///////////////////////////////
+
+/*
+===================
+ServersGetCount
+
+===================
+*/
+int	ServersGetCount( void )
+{
+	if ( g_pServers )
+	{
+		return g_pServers->GetServerCount();
+	}
+	return 0;
+}
+
+int	ServersIsQuerying( void )
+{
+	if ( g_pServers )
+	{
+		return g_pServers->isQuerying();
+	}
+	return 0;
+}
+
+/*
+===================
+ServersGetInfo
+
+===================
+*/
+const char *ServersGetInfo( int server )
+{
+	if ( g_pServers )
+	{
+		return g_pServers->GetServerInfo( server );
+	}
+	
+	return NULL;
+}
+
+void SortServers( const char *fieldname )
+{
+	if ( g_pServers )
+	{
+		g_pServers->SortServers( fieldname );
+	}
+}
+
+/*
+===================
+ServersShutdown
+
+===================
+*/
+void ServersShutdown( void )
+{
+	if ( g_pServers )
+	{
+		delete g_pServers;
+		g_pServers = NULL;
+	}
+}
+
+/*
+===================
+ServersInit
+
+===================
+*/
+void ServersInit( void )
+{
+	// Kill any previous instance
+	ServersShutdown();
+	
+	g_pServers = new CHudServers();
+}
+
+/*
+===================
+ServersThink
+
+===================
+*/
+void ServersThink( double time )
+{
+	if ( g_pServers )
+	{
+		g_pServers->Think( time );
+	}
+}
+
+/*
+===================
+ServersCancel
+
+===================
+*/
+void ServersCancel( void )
+{
+	if ( g_pServers )
+	{
+		g_pServers->CancelRequest();
+	}
+}
+
+// Requests
+/*
+===================
+ServersList
+
+===================
+*/
+void ServersList( void )
+{
+	if ( g_pServers )
+	{
+		g_pServers->RequestList();
+	}
+}
+
+void BroadcastServersList( int clearpending )
+{
+	if ( g_pServers )
+	{
+		g_pServers->RequestBroadcastList( clearpending );
+	}
+}
+
+void ServerPing( int server )
+{
+	if ( g_pServers )
+	{
+		g_pServers->ServerPing( server );
+	}
+}
+
+void ServerRules( int server )
+{
+	if ( g_pServers )
+	{
+		g_pServers->ServerRules( server );
+	}
+}
+
+void ServerPlayers( int server )
+{
+	if ( g_pServers )
+	{
+		g_pServers->ServerPlayers( server );
+	}
+}
\ No newline at end of file
diff --git a/main/source/cl_dll/hud_servers.h b/main/source/cl_dll/hud_servers.h
new file mode 100644
index 00000000..cb8a725b
--- /dev/null
+++ b/main/source/cl_dll/hud_servers.h
@@ -0,0 +1,34 @@
+#if !defined( HUD_SERVERSH )
+#define HUD_SERVERSH
+#pragma once
+
+#define NET_CALLBACK /* */
+
+// Dispatchers
+void NET_CALLBACK ListResponse( struct net_response_s *response );
+void NET_CALLBACK ServerResponse( struct net_response_s *response );
+void NET_CALLBACK PingResponse( struct net_response_s *response );
+void NET_CALLBACK RulesResponse( struct net_response_s *response );
+void NET_CALLBACK PlayersResponse( struct net_response_s *response );
+
+void ServersInit( void );
+void ServersShutdown( void );
+void ServersThink( double time );
+void ServersCancel( void );
+
+// Get list and get server info from each
+void ServersList( void );
+
+// Query for IP / IPX LAN servers
+void BroadcastServersList( int clearpending );
+
+void ServerPing( int server );
+void ServerRules( int server );
+void ServerPlayers( int server );
+
+int	ServersGetCount( void );
+const char *ServersGetInfo( int server );
+int	ServersIsQuerying( void );
+void SortServers( const char *fieldname );
+
+#endif // HUD_SERVERSH
\ No newline at end of file
diff --git a/main/source/cl_dll/hud_servers_priv.h b/main/source/cl_dll/hud_servers_priv.h
new file mode 100644
index 00000000..a571f2d8
--- /dev/null
+++ b/main/source/cl_dll/hud_servers_priv.h
@@ -0,0 +1,91 @@
+#if !defined( HUD_SERVERS_PRIVH )
+#define HUD_SERVERS_PRIVH
+#pragma once
+
+#include "netadr.h"
+
+class CHudServers
+{
+public:
+	typedef struct request_s
+	{
+		struct request_s	*next;
+		netadr_t					remote_address;
+		int							context;
+	} request_t;
+
+	typedef struct server_s
+	{
+		struct server_s	*next;
+		netadr_t				remote_address;
+		char					*info;
+		int						ping;
+	} server_t;
+
+	CHudServers();
+	~CHudServers();
+
+	void	Think( double time );
+	void	QueryThink( void );
+	int		isQuerying( void );
+
+	int		LoadMasterAddresses( int maxservers, int *count, netadr_t *padr );
+
+	void	RequestList( void );
+	void	RequestBroadcastList( int clearpending );
+
+	void	ServerPing( int server );
+	void	ServerRules( int server );
+	void	ServerPlayers( int server );
+
+	void	CancelRequest( void );
+
+	int		CompareServers( server_t *p1, server_t *p2 );
+
+	void	ClearServerList( server_t **ppList );
+	void	ClearRequestList( request_t **ppList );
+
+	void	AddServer( server_t **ppList, server_t *p );
+
+	void	RemoveServerFromList( request_t **ppList, request_t *item );
+
+	request_t *FindRequest( int context, request_t *pList );
+
+	int		ServerListSize( void );
+	char	*GetServerInfo( int server );
+	int		GetServerCount( void );
+	void	SortServers( const char *fieldname );
+
+	void	ListResponse( struct net_response_s *response );
+	void	ServerResponse( struct net_response_s *response );
+	void	PingResponse( struct net_response_s *response );
+	void	RulesResponse( struct net_response_s *response );
+	void	PlayersResponse( struct net_response_s *response );
+private:
+	
+	server_t *GetServer( int server );
+
+	//
+	char				m_szToken[ 1024 ];
+	int					m_nRequesting;
+	int					m_nDone;
+
+	double				m_dStarted;
+
+	request_t	*m_pServerList;
+	request_t	*m_pActiveList;
+	
+	server_t		*m_pServers;
+
+	int					m_nServerCount;
+
+	int					m_nActiveQueries;
+	int					m_nQuerying;
+	double				m_fElapsed;
+
+	request_t			*m_pPingRequest;
+	request_t			*m_pRulesRequest;
+	request_t			*m_pPlayersRequest;
+};
+
+#endif // HUD_SERVERS_PRIVH
\ No newline at end of file
diff --git a/main/source/cl_dll/hud_spectator.cpp b/main/source/cl_dll/hud_spectator.cpp
new file mode 100644
index 00000000..a084082f
--- /dev/null
+++ b/main/source/cl_dll/hud_spectator.cpp
@@ -0,0 +1,1972 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#include "hud.h"
+#include "cl_util.h"
+#include "cl_entity.h"
+#include "triangleapi.h"
+#include "vgui_TeamFortressViewport.h"
+#include "vgui_SpectatorPanel.h"
+#include "hltv.h"
+
+#include "pm_shared.h"
+#include "pm_defs.h"
+#include "pmtrace.h"
+#include "parsemsg.h"
+#include "entity_types.h"
+
+// these are included for the math functions
+#include "com_model.h"
+#include "demo_api.h"
+#include "event_api.h"
+#include "studio_util.h"
+#include "screenfade.h"
+#include "util/STLUtil.h"
+#include "mod/AvHTitles.h"
+#include "mod/AvHSprites.h"
+
+#pragma warning(disable: 4244)
+
+extern int		iJumpSpectator;
+extern float	vJumpOrigin[3];
+extern float	vJumpAngles[3]; 
+
+extern void V_GetInEyePos(int entity, float * origin, float * angles );
+extern void V_ResetChaseCam();
+extern void V_GetChasePos(int target, float * cl_angles, float * origin, float * angles);
+extern void VectorAngles( const float *forward, float *angles );
+extern "C" void NormalizeAngles( float *angles );
+extern float * GetClientColor( int clientIndex );
+
+extern vec3_t v_origin;		// last view origin
+extern vec3_t v_angles;		// last view angle
+extern vec3_t v_cl_angles;	// last client/mouse angle
+extern vec3_t v_sim_org;	// last sim origin
+
+void SpectatorMode(void)
+{
+
+	if ( gEngfuncs.Cmd_Argc() <= 1 )
+	{
+		gEngfuncs.Con_Printf( "usage:  spec_mode <Mode>\n" );
+		return;
+	}
+
+	// SetModes() will decide if command is executed on server or local
+	if ( gEngfuncs.Cmd_Argc() == 2 )
+		gHUD.m_Spectator.SetMode( atoi( gEngfuncs.Cmd_Argv(1) ));
+	
+	//else if ( gEngfuncs.Cmd_Argc() == 3 )
+	//	gHUD.m_Spectator.SetMode( atoi( gEngfuncs.Cmd_Argv(1) ), atoi( gEngfuncs.Cmd_Argv(2) )  );	
+}
+
+void SpectatorSpray(void)
+{
+	vec3_t forward;
+	char string[128];
+
+	if ( !gEngfuncs.IsSpectateOnly() )
+		return;
+
+	AngleVectors(v_angles,forward,NULL,NULL);
+	VectorScale(forward, 128, forward);
+	VectorAdd(forward, v_origin, forward);
+	pmtrace_t * trace = gEngfuncs.PM_TraceLine( v_origin, forward, PM_TRACELINE_PHYSENTSONLY, 2, -1 );
+	if ( trace->fraction != 1.0 )
+	{
+		sprintf(string, "drc_spray %.2f %.2f %.2f %i", 
+			trace->endpos[0], trace->endpos[1], trace->endpos[2], trace->ent );
+		gEngfuncs.pfnServerCmd(string);
+	}
+
+}
+void SpectatorHelp(void)
+{
+	if ( gViewPort )
+	{
+		gViewPort->ShowVGUIMenu( MENU_SPECHELP );
+	}
+	else
+	{
+  		char *text = CHudTextMessage::BufferedLocaliseTextString( "#Spec_Help_Text" );
+			
+		if ( text )
+		{
+			while ( *text )
+			{
+				if ( *text != 13 )
+					gEngfuncs.Con_Printf( "%c", *text );
+				text++;
+			}
+		}
+	}
+}
+
+void SpectatorMenu( void )
+{
+	if ( gEngfuncs.Cmd_Argc() <= 1 )
+	{
+		gEngfuncs.Con_Printf( "usage:  spec_menu <0|1>\n" );
+		return;
+	}
+	
+	gViewPort->m_pSpectatorPanel->ShowMenu( atoi( gEngfuncs.Cmd_Argv(1))!=0  );
+}
+
+void ToggleScores( void )
+{
+	if ( gViewPort )
+	{
+		if (gViewPort->IsScoreBoardVisible() )
+		{
+			gViewPort->HideScoreBoard();
+		}
+		else
+		{
+			gViewPort->ShowScoreBoard();
+		}
+	}
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+//-----------------------------------------------------------------------------
+int CHudSpectator::Init()
+{
+	gHUD.AddHudElem(this);
+
+	m_iFlags |= HUD_ACTIVE;
+	m_flNextObserverInput = 0.0f;
+	m_zoomDelta	= 0.0f;
+	m_moveDelta = 0.0f;
+	iJumpSpectator	= 0;
+
+	memset( &m_OverviewData, 0, sizeof(m_OverviewData));
+	memset( &m_OverviewEntities, 0, sizeof(m_OverviewEntities));
+	m_lastPrimaryObject = m_lastSecondaryObject = 0;
+
+	gEngfuncs.pfnAddCommand ("spec_mode", SpectatorMode );
+	gEngfuncs.pfnAddCommand ("spec_decal", SpectatorSpray );
+	gEngfuncs.pfnAddCommand ("spec_help", SpectatorHelp );
+	gEngfuncs.pfnAddCommand ("spec_menu", SpectatorMenu );
+	gEngfuncs.pfnAddCommand ("togglescores", ToggleScores );
+
+	m_drawnames		= gEngfuncs.pfnRegisterVariable("spec_drawnames","1",0);
+	m_drawcone		= gEngfuncs.pfnRegisterVariable("spec_drawcone","1",0);
+	m_drawstatus	= gEngfuncs.pfnRegisterVariable("spec_drawstatus","1",0);
+	m_autoDirector	= gEngfuncs.pfnRegisterVariable("spec_autodirector","1",0);
+
+    // Removed by mmcguire.
+    m_overviewMode  = false;
+    //m_overview	    = gEngfuncs.pfnRegisterVariable("spec_overview","1",0);
+    //m_pip			= gEngfuncs.pfnRegisterVariable("spec_pip","1",0);
+	
+	if ( !m_drawnames || !m_drawcone || !m_drawstatus || !m_autoDirector /*|| !m_pip*/)
+	{
+		gEngfuncs.Con_Printf("ERROR! Couldn't register all spectator variables.\n");
+		return 0;
+	}
+
+	return 1;
+}
+
+
+//-----------------------------------------------------------------------------
+// UTIL_StringToVector originally from ..\dlls\util.cpp, slightly changed
+//-----------------------------------------------------------------------------
+
+void UTIL_StringToVector( float * pVector, const char *pString )
+{
+	char *pstr, *pfront, tempString[128];
+	int	j;
+
+	strcpy( tempString, pString );
+	pstr = pfront = tempString;
+	
+	for ( j = 0; j < 3; j++ )		
+	{
+		pVector[j] = atof( pfront );
+		
+		while ( *pstr && *pstr != ' ' )
+			pstr++;
+		if (!*pstr)
+			break;
+		pstr++;
+		pfront = pstr;
+	}
+
+	if (j < 2)
+	{
+		for (j = j+1;j < 3; j++)
+			pVector[j] = 0;
+	}
+}
+
+int UTIL_FindEntityInMap(char * name, float * origin, float * angle)
+{
+	int				n,found = 0;
+	char			keyname[256];
+	char			token[1024];
+
+	cl_entity_t *	pEnt = gEngfuncs.GetEntityByIndex( 0 );	// get world model
+
+	if ( !pEnt ) return 0;
+
+	if ( !pEnt->model )	return 0;
+
+	char * data = pEnt->model->entities;
+
+	while (data)
+	{
+		data = gEngfuncs.COM_ParseFile(data, token);
+		
+		if ( (token[0] == '}') ||  (token[0]==0) )
+			break;
+
+		if (!data)
+		{
+			gEngfuncs.Con_DPrintf("UTIL_FindEntityInMap: EOF without closing brace\n");
+			return 0;
+		}
+
+		if (token[0] != '{')
+		{
+			gEngfuncs.Con_DPrintf("UTIL_FindEntityInMap: expected {\n");
+			return 0;
+		}
+
+		// we parse the first { now parse entities properties
+		
+		while ( 1 )
+		{	
+			// parse key
+			data = gEngfuncs.COM_ParseFile(data, token);
+			if (token[0] == '}')
+				break; // finish parsing this entity
+
+			if (!data)
+			{	
+				gEngfuncs.Con_DPrintf("UTIL_FindEntityInMap: EOF without closing brace\n");
+				return 0;
+			};
+			
+			strcpy (keyname, token);
+
+			// another hack to fix keynames with trailing spaces
+			n = strlen(keyname);
+			while (n && keyname[n-1] == ' ')
+			{
+				keyname[n-1] = 0;
+				n--;
+			}
+			
+			// parse value	
+			data = gEngfuncs.COM_ParseFile(data, token);
+			if (!data)
+			{	
+				gEngfuncs.Con_DPrintf("UTIL_FindEntityInMap: EOF without closing brace\n");
+				return 0;
+			};
+	
+			if (token[0] == '}')
+			{
+				gEngfuncs.Con_DPrintf("UTIL_FindEntityInMap: closing brace without data");
+				return 0;
+			}
+
+			if (!strcmp(keyname,"classname"))
+			{
+				if (!strcmp(token, name ))
+				{
+					found = 1;	// thats our entity
+				}
+			};
+
+			if( !strcmp( keyname, "angle" ) )
+			{
+				float y = atof( token );
+				
+				if (y >= 0)
+				{
+					angle[0] = 0.0f;
+					angle[1] = y;
+				}
+				else if ((int)y == -1)
+				{
+					angle[0] = -90.0f;
+					angle[1] =   0.0f;;
+				}
+				else
+				{
+					angle[0] = 90.0f;
+					angle[1] =  0.0f;
+				}
+
+				angle[2] =  0.0f;
+			}
+
+			if( !strcmp( keyname, "angles" ) )
+			{
+				UTIL_StringToVector(angle, token);
+			}
+			
+			if (!strcmp(keyname,"origin"))
+			{
+				UTIL_StringToVector(origin, token);
+
+			};
+				
+		} // while (1)
+
+		if (found)
+			return 1;
+
+	}
+
+	return 0;	// we search all entities, but didn't found the correct
+
+}
+
+//-----------------------------------------------------------------------------
+// SetSpectatorStartPosition(): 
+// Get valid map position and 'beam' spectator to this position
+//-----------------------------------------------------------------------------
+
+void CHudSpectator::SetSpectatorStartPosition()
+{
+	// search for info_player start
+	if ( UTIL_FindEntityInMap( "trigger_camera",  m_cameraOrigin, m_cameraAngles ) )
+		iJumpSpectator = 1;
+
+	else if ( UTIL_FindEntityInMap( "info_player_start",  m_cameraOrigin, m_cameraAngles ) )
+		iJumpSpectator = 1;
+
+	else if ( UTIL_FindEntityInMap( "info_player_deathmatch",  m_cameraOrigin, m_cameraAngles ) )
+		iJumpSpectator = 1;
+
+	else if ( UTIL_FindEntityInMap( "info_player_coop",  m_cameraOrigin, m_cameraAngles ) )
+		iJumpSpectator = 1;
+	else
+	{
+		// jump to 0,0,0 if no better position was found
+		VectorCopy(vec3_origin, m_cameraOrigin);
+		VectorCopy(vec3_origin, m_cameraAngles);
+	}
+	
+	VectorCopy(m_cameraOrigin, vJumpOrigin);
+	VectorCopy(m_cameraAngles, vJumpAngles);
+
+	iJumpSpectator = 1;	// jump anyway
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Loads new icons
+//-----------------------------------------------------------------------------
+int CHudSpectator::VidInit()
+{
+	m_hsprPlayerMarine	= Safe_SPR_Load("sprites/iplayerm.spr");
+	m_hsprPlayerAlien	= Safe_SPR_Load("sprites/iplayera.spr");
+	m_hsprPlayerDead	= Safe_SPR_Load("sprites/iplayerdead.spr");
+	m_hsprUnkownMap		= Safe_SPR_Load("sprites/tile.spr");
+	//m_hsprBeam			= Safe_SPR_Load("sprites/laserbeam.spr");
+	//m_hsprCamera		= Safe_SPR_Load("sprites/camera.spr");
+	m_hCrosshair		= Safe_SPR_Load("sprites/crosshairs.spr");
+    m_hsprWhite         = Safe_SPR_Load(kWhiteSprite);
+	
+	return 1;
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+// Input  : flTime - 
+//			intermission - 
+//-----------------------------------------------------------------------------
+int CHudSpectator::Draw(float flTime)
+{
+
+	// draw only in spectator mode
+	if ( !g_iUser1  )
+		return 0;
+
+    // Removed by mmcguire.
+    /*
+	// if user pressed zoom, aplly changes
+	if ( (m_zoomDelta != 0.0f) && (	g_iUser1 == OBS_MAP_FREE ) )
+	{
+		m_mapZoom += m_zoomDelta;
+
+		if ( m_mapZoom > 3.0f ) 
+			m_mapZoom = 3.0f;
+
+		if ( m_mapZoom < 0.5f ) 
+			m_mapZoom = 0.5f;
+	}
+
+	// if user moves in map mode, change map origin
+	if ( (m_moveDelta != 0.0f) && (g_iUser1 != OBS_ROAMING) )
+	{
+		vec3_t	right;
+		AngleVectors(v_angles, NULL, right, NULL);
+		VectorNormalize(right);
+		VectorScale(right, m_moveDelta, right );
+
+		VectorAdd( m_mapOrigin, right, m_mapOrigin )
+
+	}
+    */
+	    
+    //DrawOverviewMap();
+
+/*
+	if (!IsInOverviewMode())
+    {
+		return 0;
+    }
+
+    if (m_hsprWhite != NULL)
+    {
+
+        float bgColor[] = { 0.1, 0.1, 0.1, 1 };
+        float borderColor[] = { 1, 1, 1, 1 };
+
+        gEngfuncs.pTriAPI->RenderMode(kRenderNormal);
+        gEngfuncs.pTriAPI->CullFace(TRI_NONE);
+
+        gEngfuncs.pTriAPI->SpriteTexture((struct model_s*)(gEngfuncs.GetSpritePointer(m_hsprWhite)), 0);
+
+        float gammaScale = 1.0f / gHUD.GetGammaSlope();
+        
+        // Draw the border on the overview map and the inset view.
+
+        gEngfuncs.pTriAPI->RenderMode(kRenderNormal);
+        gEngfuncs.pTriAPI->CullFace(TRI_NONE);
+
+        gEngfuncs.pTriAPI->SpriteTexture((struct model_s*)(gEngfuncs.GetSpritePointer(m_hsprWhite)), 0);
+        gEngfuncs.pTriAPI->Color4f(gammaScale * borderColor[0], gammaScale * borderColor[1], gammaScale * borderColor[2], borderColor[3]);
+
+        gEngfuncs.pTriAPI->Begin(TRI_LINES);
+    
+        int insetX1 = XRES(m_OverviewData.insetWindowX);
+        int insetY1 = YRES(m_OverviewData.insetWindowY);
+        int insetX2 = insetX1 + XRES(m_OverviewData.insetWindowWidth);
+        int insetY2 = insetY1 + YRES(m_OverviewData.insetWindowHeight);
+
+        gEngfuncs.pTriAPI->Vertex3f(insetX1, insetY1, 1);
+        gEngfuncs.pTriAPI->Vertex3f(insetX2, insetY1, 1);
+
+        gEngfuncs.pTriAPI->Vertex3f(insetX2, insetY1, 1);
+        gEngfuncs.pTriAPI->Vertex3f(insetX2, insetY2, 1);
+        
+        gEngfuncs.pTriAPI->Vertex3f(insetX2, insetY2, 1);
+        gEngfuncs.pTriAPI->Vertex3f(insetX1, insetY2, 1);
+    
+        gEngfuncs.pTriAPI->Vertex3f(insetX1, insetY2, 1);
+        gEngfuncs.pTriAPI->Vertex3f(insetX1, insetY1, 1);
+
+        gEngfuncs.pTriAPI->End();
+    
+    }*/
+
+
+
+    /*
+	// Only draw the icon names only if map mode is in Main Mode
+	if ( g_iUser1 < OBS_MAP_FREE  ) 
+		return 1;
+	
+	if ( !m_drawnames->value )
+		return 1;
+	
+	// make sure we have player info
+	gViewPort->GetAllPlayersInfo();
+    */
+
+	return 1;
+
+}
+
+bool CHudSpectator::IsInOverviewMode() const
+{
+    return g_iUser1 && m_overviewMode && gHUD.GetIsNSMode();
+}
+
+void CHudSpectator::SetOverviewMode(bool overviewMode)
+{
+    m_overviewMode = overviewMode;
+}
+
+void CHudSpectator::DrawOverviewMap()
+{
+
+	// draw only in spectator mode
+	if (!IsInOverviewMode())
+    {
+		return;
+    }
+
+    AvHOverviewMap& theOverviewMap = gHUD.GetOverviewMap();
+
+    AvHOverviewMap::DrawInfo theDrawInfo;
+
+    theDrawInfo.mX = XRES(m_OverviewData.insetWindowX + m_OverviewData.insetWindowWidth + 4);
+    theDrawInfo.mY = YRES(SPECTATOR_PANEL_HEIGHT + 4);
+    theDrawInfo.mWidth  = ScreenWidth() - theDrawInfo.mX - XRES(4);
+    theDrawInfo.mHeight = ScreenHeight() - YRES(SPECTATOR_PANEL_HEIGHT + 4) - theDrawInfo.mY;
+    
+    AvHMapExtents theMapExtents;
+    theOverviewMap.GetMapExtents(theMapExtents);
+
+    theDrawInfo.mFullScreen = true;
+
+	float worldWidth  = theMapExtents.GetMaxMapX() - theMapExtents.GetMinMapX();
+	float worldHeight = theMapExtents.GetMaxMapY() - theMapExtents.GetMinMapY();
+
+	float xScale;
+	float yScale;
+
+	float aspect1 = worldWidth / worldHeight;
+    float aspect2 = ((float)theDrawInfo.mWidth) / theDrawInfo.mHeight; 
+    
+    if (aspect1 > aspect2)
+	{
+		xScale = 1;
+		yScale = 1 / aspect2;
+	}
+	else
+	{
+		xScale = aspect2;
+		yScale = 1;
+    }
+
+	float centerX = (theMapExtents.GetMinMapX() + theMapExtents.GetMaxMapX()) / 2;
+	float centerY = (theMapExtents.GetMinMapY() + theMapExtents.GetMaxMapY()) / 2;
+    
+    theDrawInfo.mViewWorldMinX = centerX - worldWidth  * xScale * 0.5;
+    theDrawInfo.mViewWorldMinY = centerY - worldHeight * yScale * 0.5;
+    theDrawInfo.mViewWorldMaxX = centerX + worldWidth  * xScale * 0.5;
+    theDrawInfo.mViewWorldMaxY = centerY + worldHeight * yScale * 0.5;
+
+    if (m_hsprWhite != NULL)
+    {
+
+        float bgColor[] = { 0.1, 0.1, 0.1, 1 };
+        float borderColor[] = { 1, 1, 1, 1 };
+
+        gEngfuncs.pTriAPI->RenderMode(kRenderNormal);
+        gEngfuncs.pTriAPI->CullFace(TRI_NONE);
+
+        gEngfuncs.pTriAPI->SpriteTexture((struct model_s*)(gEngfuncs.GetSpritePointer(m_hsprWhite)), 0);
+
+        float gammaScale = 1.0f / gHUD.GetGammaSlope();
+        
+        // Draw the background.
+        
+	    gEngfuncs.pTriAPI->Color4f(gammaScale * bgColor[0], gammaScale * bgColor[1], gammaScale * bgColor[2], bgColor[3]);
+
+        gEngfuncs.pTriAPI->Begin(TRI_QUADS);
+    
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX, theDrawInfo.mY, 1);
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX, theDrawInfo.mY + theDrawInfo.mHeight, 1);
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX + theDrawInfo.mWidth, theDrawInfo.mY + theDrawInfo.mHeight, 1);
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX + theDrawInfo.mWidth, theDrawInfo.mY, 1);
+    
+        gEngfuncs.pTriAPI->End();
+   
+        // Draw the overview map.
+
+        theOverviewMap.Draw(theDrawInfo);
+
+        // Draw the border on the overview map and the inset view.
+
+        gEngfuncs.pTriAPI->RenderMode(kRenderNormal);
+        gEngfuncs.pTriAPI->CullFace(TRI_NONE);
+
+        gEngfuncs.pTriAPI->SpriteTexture((struct model_s*)(gEngfuncs.GetSpritePointer(m_hsprWhite)), 0);
+        gEngfuncs.pTriAPI->Color4f(gammaScale * borderColor[0], gammaScale * borderColor[1], gammaScale * borderColor[2], borderColor[3]);
+
+        gEngfuncs.pTriAPI->Begin(TRI_LINES);
+    
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX, theDrawInfo.mY, 1);
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX, theDrawInfo.mY + theDrawInfo.mHeight, 1);
+
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX, theDrawInfo.mY + theDrawInfo.mHeight, 1);
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX + theDrawInfo.mWidth, theDrawInfo.mY + theDrawInfo.mHeight, 1);
+        
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX + theDrawInfo.mWidth, theDrawInfo.mY + theDrawInfo.mHeight, 1);
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX + theDrawInfo.mWidth, theDrawInfo.mY, 1);
+    
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX + theDrawInfo.mWidth, theDrawInfo.mY, 1);
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX, theDrawInfo.mY, 1);
+
+        int insetX1 = XRES(m_OverviewData.insetWindowX);
+        int insetY1 = YRES(m_OverviewData.insetWindowY);
+        int insetX2 = insetX1 + XRES(m_OverviewData.insetWindowWidth);
+        int insetY2 = insetY1 + YRES(m_OverviewData.insetWindowHeight);
+
+        gEngfuncs.pTriAPI->Vertex3f(insetX1, insetY1, 1);
+        gEngfuncs.pTriAPI->Vertex3f(insetX2, insetY1, 1);
+
+        gEngfuncs.pTriAPI->Vertex3f(insetX2, insetY1, 1);
+        gEngfuncs.pTriAPI->Vertex3f(insetX2, insetY2, 1);
+        
+        gEngfuncs.pTriAPI->Vertex3f(insetX2, insetY2, 1);
+        gEngfuncs.pTriAPI->Vertex3f(insetX1, insetY2, 1);
+    
+        gEngfuncs.pTriAPI->Vertex3f(insetX1, insetY2, 1);
+        gEngfuncs.pTriAPI->Vertex3f(insetX1, insetY1, 1);
+
+        gEngfuncs.pTriAPI->End();
+    
+    }
+
+
+}
+
+
+void CHudSpectator::DirectorMessage( int iSize, void *pbuf )
+{
+	float	value;
+	char *	string;
+
+	BEGIN_READ( pbuf, iSize );
+
+	int cmd = READ_BYTE();
+	
+	switch ( cmd )	// director command byte 
+	{ 
+		case DRC_CMD_START	:	
+							// now we have to do some things clientside, since the proxy doesn't know our mod 
+							g_iPlayerClass = 0;
+							g_iTeamNumber = 0;
+
+							// fake a InitHUD & ResetHUD message
+							gHUD.MsgFunc_InitHUD(NULL,0, NULL);
+							gHUD.MsgFunc_ResetHUD(NULL, 0, NULL);
+														
+							break;
+
+		case DRC_CMD_EVENT	:
+							m_lastPrimaryObject		=	READ_WORD();
+							m_lastSecondaryObject	=	READ_WORD();
+							m_iObserverFlags		=	READ_LONG();
+														
+							if ( m_autoDirector->value )
+							{
+								if ( (g_iUser2 != m_lastPrimaryObject) || (g_iUser3 != m_lastSecondaryObject) )
+									V_ResetChaseCam();	
+
+								g_iUser2 = m_lastPrimaryObject;
+								g_iUser3 = m_lastSecondaryObject;
+							}
+
+							// gEngfuncs.Con_Printf("Director Camera: %i %i\n", firstObject, secondObject);
+							break;
+
+		case DRC_CMD_MODE  :
+							if ( m_autoDirector->value )
+							{
+								SetMode( READ_BYTE());
+							}
+							break;
+
+		case DRC_CMD_CAMERA	:
+							if ( m_autoDirector->value )
+							{
+								vJumpOrigin[0] = READ_COORD();	// position
+								vJumpOrigin[1] = READ_COORD();
+								vJumpOrigin[2] = READ_COORD();
+
+								vJumpAngles[0] = READ_COORD();	// view angle
+								vJumpAngles[1] = READ_COORD();
+								vJumpAngles[2] = READ_COORD();
+
+								gEngfuncs.SetViewAngles( vJumpAngles );
+
+								iJumpSpectator = 1;
+							}
+							break;
+
+		case DRC_CMD_MESSAGE:
+							{
+								client_textmessage_t * msg = &m_HUDMessages[m_lastHudMessage];
+								
+								msg->effect = READ_BYTE();		// effect
+
+								UnpackRGB( (int&)msg->r1, (int&)msg->g1, (int&)msg->b1, READ_LONG() );		// color
+								msg->r2 = msg->r1;
+								msg->g2 = msg->g1;
+								msg->b2 = msg->b1;
+								msg->a2 = msg->a1 = 0xFF;	// not transparent
+										
+								msg->x = READ_FLOAT();	// x pos
+								msg->y = READ_FLOAT();	// y pos
+												
+								msg->fadein		= READ_FLOAT();	// fadein
+								msg->fadeout	= READ_FLOAT();	// fadeout
+								msg->holdtime	= READ_FLOAT();	// holdtime
+								msg->fxtime		= READ_FLOAT();	// fxtime;
+
+								strncpy( m_HUDMessageText[m_lastHudMessage], READ_STRING(), 128 );
+								m_HUDMessageText[m_lastHudMessage][127]=0;	// text 
+
+								msg->pMessage = m_HUDMessageText[m_lastHudMessage];
+								msg->pName	  = "HUD_MESSAGE";
+
+								gHUD.m_Message.MessageAdd( msg->pName, gHUD.m_flTime);
+
+								m_lastHudMessage++;
+								m_lastHudMessage %= MAX_SPEC_HUD_MESSAGES;
+			
+							}
+
+							break;
+
+		case DRC_CMD_SOUND :
+							string = READ_STRING();
+							value =  READ_FLOAT();
+							
+							// gEngfuncs.Con_Printf("DRC_CMD_FX_SOUND: %s %.2f\n", string, value );
+							gEngfuncs.pEventAPI->EV_PlaySound(0, v_origin, CHAN_BODY, string, value, ATTN_NORM, 0, PITCH_NORM );
+							
+							break;
+
+		case DRC_CMD_TIMESCALE	:
+							value = READ_FLOAT();
+							break;
+
+
+
+		case DRC_CMD_STATUS:
+							READ_LONG(); // total number of spectator slots
+							m_iSpectatorNumber = READ_LONG(); // total number of spectator
+							READ_WORD(); // total number of relay proxies
+
+							gViewPort->UpdateSpectatorPanel();
+							break;
+
+		case DRC_CMD_BANNER:
+							// gEngfuncs.Con_DPrintf("GUI: Banner %s\n",READ_STRING() ); // name of banner tga eg gfx/temp/7454562234563475.tga
+							gViewPort->m_pSpectatorPanel->m_TopBanner->LoadImage( READ_STRING() );
+							gViewPort->UpdateSpectatorPanel();
+							break;
+
+		case DRC_CMD_FADE:		
+							/*{
+								screenfade_t sf;
+								
+								sf.fader = 255;
+								sf.fadeg = 0;
+								sf.fadeb = 0;
+								sf.fadealpha = 128;
+								sf.fadeFlags = FFADE_STAYOUT | FFADE_OUT;
+
+								// gHUD.m_flTime = cl.time
+				
+								stream->ReadFloat();	// 	duration
+								sf.stream->ReadFloat();	//	holdTime
+								sf.fadeFlags = READ_SHORT();	//	flags
+								stream->ReadLong();	// color	RGB
+
+								CallEnghudSetScreenFade( &sf );
+							}*/
+							break;
+
+		case DRC_CMD_STUFFTEXT:
+							ClientCmd( READ_STRING() );
+							break;
+
+		default			:	gEngfuncs.Con_DPrintf("CHudSpectator::DirectorMessage: unknown command %i.\n", cmd );
+	}
+}
+
+void CHudSpectator::FindNextPlayer(bool bReverse)
+{
+	// MOD AUTHORS: Modify the logic of this function if you want to restrict the observer to watching
+	//				only a subset of the players. e.g. Make it check the target's team.
+
+	int		iStart;
+	cl_entity_t * pEnt = NULL;
+
+	// if we are NOT in HLTV mode, spectator targets are set on server
+	if ( !gEngfuncs.IsSpectateOnly() )
+	{
+		char cmdstring[32];
+		// forward command to server
+		sprintf(cmdstring,"follownext %i",bReverse?1:0);
+		gEngfuncs.pfnServerCmd(cmdstring);
+		return;
+	}
+	
+	if ( g_iUser2 )
+		iStart = g_iUser2;
+	else
+		iStart = 1;
+
+	g_iUser2 = 0;
+
+	int	    iCurrent = iStart;
+
+	int iDir = bReverse ? -1 : 1; 
+
+	// make sure we have player info
+	gViewPort->GetAllPlayersInfo();
+
+
+	do
+	{
+		iCurrent += iDir;
+
+		// Loop through the clients
+		if (iCurrent > MAX_PLAYERS)
+			iCurrent = 1;
+		if (iCurrent < 1)
+			iCurrent = MAX_PLAYERS;
+
+		pEnt = gEngfuncs.GetEntityByIndex( iCurrent );
+
+		if ( !IsActivePlayer( pEnt ) )
+			continue;
+
+		// MOD AUTHORS: Add checks on target here.
+
+		g_iUser2 = iCurrent;
+		break;
+
+	} while ( iCurrent != iStart );
+
+	// Did we find a target?
+	if ( !g_iUser2 )
+	{
+		gEngfuncs.Con_DPrintf( "No observer targets.\n" );
+		// take save camera position 
+		VectorCopy(m_cameraOrigin, vJumpOrigin);
+		VectorCopy(m_cameraAngles, vJumpAngles);
+	}
+	else
+	{
+		// use new entity position for roaming
+		VectorCopy ( pEnt->origin, vJumpOrigin );
+		VectorCopy ( pEnt->angles, vJumpAngles );
+	}
+	iJumpSpectator = 1;
+}
+
+void CHudSpectator::HandleButtonsDown( int ButtonPressed )
+{
+    if ( !gViewPort )
+        return;
+    
+    //Not in intermission.
+    if ( gHUD.m_iIntermission )
+        return;
+    
+    if ( !g_iUser1 )
+        return; // dont do anything if not in spectator mode
+    
+    // don't handle buttons during normal demo playback
+    if ( gEngfuncs.pDemoAPI->IsPlayingback() && !gEngfuncs.IsSpectateOnly() )
+        return;
+
+    int theNewMainMode = g_iUser1;
+
+    // Jump changes main window modes
+    if ( ButtonPressed & IN_JUMP )
+    {
+        bool theFirstPerson = (g_iUser1 == OBS_IN_EYE);
+        bool theInOverviewMode = gHUD.m_Spectator.IsInOverviewMode();
+
+        // NS
+        if(gHUD.GetIsNSMode())
+        {
+            // First-person full -> chase camera full -> firstperson with overview -> chase camera with overview
+            if(theFirstPerson && !theInOverviewMode)
+            {
+                gHUD.m_Spectator.SetMode(OBS_CHASE_LOCKED);
+                //gHUD.m_Spectator.SetOverviewMode(false);
+            }
+            else if(!theFirstPerson && !theInOverviewMode)
+            {
+                gHUD.m_Spectator.SetMode(OBS_IN_EYE);
+                gHUD.m_Spectator.SetOverviewMode(true);
+            }
+            else if(theFirstPerson && theInOverviewMode)
+            {
+                gHUD.m_Spectator.SetMode(OBS_CHASE_LOCKED);
+                //gHUD.m_Spectator.SetOverviewMode(true);
+            }
+            else if(!theFirstPerson && theInOverviewMode)
+            {
+                gHUD.m_Spectator.SetMode(OBS_IN_EYE);
+                gHUD.m_Spectator.SetOverviewMode(false);
+            }
+        }
+        // Combat
+        else
+        {
+            // First-person full -> chase camera full
+            if(theFirstPerson)
+            {
+                gHUD.m_Spectator.SetMode(OBS_CHASE_LOCKED);
+                gHUD.m_Spectator.SetOverviewMode(false);
+            }
+            else
+            {
+                gHUD.m_Spectator.SetMode(OBS_IN_EYE);
+                gHUD.m_Spectator.SetOverviewMode(false);
+            }
+        }
+    }
+    
+    //g_iUser1 = theNewMainMode;
+
+    // Attack moves to the next player
+    if ( ButtonPressed & (IN_MOVELEFT | IN_MOVERIGHT) )
+    { 
+        FindNextPlayer( (ButtonPressed & IN_MOVELEFT) ? true:false );
+        
+//        if ( g_iUser1 == OBS_ROAMING )
+//        {
+//            gEngfuncs.SetViewAngles( vJumpAngles );
+//            iJumpSpectator = 1;
+//            
+//        }
+
+        // lease directed mode if player want to see another player
+        m_autoDirector->value = 0.0f;
+    }
+
+/*
+	double time = gEngfuncs.GetClientTime();
+
+	int newMainMode		= g_iUser1;
+	int newInsetMode	= m_pip->value;
+
+	// gEngfuncs.Con_Printf(" HandleButtons:%i\n", ButtonPressed );
+	if ( !gViewPort )
+		return;
+
+	//Not in intermission.
+	if ( gHUD.m_iIntermission )
+		 return;
+
+	if ( !g_iUser1 )
+		return; // dont do anything if not in spectator mode
+
+	// don't handle buttons during normal demo playback
+	if ( gEngfuncs.pDemoAPI->IsPlayingback() && !gEngfuncs.IsSpectateOnly() )
+		return;
+	// Slow down mouse clicks. 
+	if ( m_flNextObserverInput > time )
+		return;
+
+	// enable spectator screen
+	if ( ButtonPressed & IN_DUCK )
+	{
+		gViewPort->m_pSpectatorPanel->ShowMenu(!gViewPort->m_pSpectatorPanel->m_menuVisible);
+	}
+	
+	//  'Use' changes inset window mode
+	if ( ButtonPressed & IN_USE )
+	{
+		newInsetMode = ToggleInset(true);
+	}
+
+	// if not in HLTV mode, buttons are handled server side
+	if ( gEngfuncs.IsSpectateOnly() )
+	{
+		// changing target or chase mode not in overviewmode without inset window
+
+		// Jump changes main window modes
+		if ( ButtonPressed & IN_JUMP )
+		{
+			if ( g_iUser1 == OBS_CHASE_LOCKED )
+				newMainMode = OBS_CHASE_FREE;
+
+			else if ( g_iUser1 == OBS_CHASE_FREE )
+				newMainMode = OBS_IN_EYE;
+
+			else if ( g_iUser1 == OBS_IN_EYE )
+				newMainMode = OBS_ROAMING;
+
+			else if ( g_iUser1 == OBS_ROAMING )
+				newMainMode = OBS_MAP_FREE;
+
+			else if ( g_iUser1 == OBS_MAP_FREE )
+				newMainMode = OBS_MAP_CHASE;
+
+			else
+				newMainMode = OBS_CHASE_FREE;	// don't use OBS_CHASE_LOCKED anymore
+		}
+
+		// Attack moves to the next player
+		if ( ButtonPressed & (IN_ATTACK | IN_ATTACK2) )
+		{ 
+			FindNextPlayer( (ButtonPressed & IN_ATTACK2) ? true:false );
+
+			if ( g_iUser1 == OBS_ROAMING )
+			{
+				gEngfuncs.SetViewAngles( vJumpAngles );
+				iJumpSpectator = 1;
+	
+			}
+			// lease directed mode if player want to see another player
+			m_autoDirector->value = 0.0f;
+		}
+	}
+
+	SetModes(newMainMode, newInsetMode);
+
+	if ( g_iUser1 == OBS_MAP_FREE )
+	{
+		if ( ButtonPressed & IN_FORWARD )
+			m_zoomDelta =  0.01f;
+
+		if ( ButtonPressed & IN_BACK )
+			m_zoomDelta = -0.01f;
+		
+		if ( ButtonPressed & IN_MOVELEFT )
+			m_moveDelta = -12.0f;
+
+		if ( ButtonPressed & IN_MOVERIGHT )
+			m_moveDelta =  12.0f;
+	}
+
+	m_flNextObserverInput = time + 0.2;
+*/
+
+}
+
+void CHudSpectator::HandleButtonsUp( int ButtonPressed )
+{
+	if ( !gViewPort )
+		return;
+
+	if ( !gViewPort->m_pSpectatorPanel->isVisible() )
+		return; // dont do anything if not in spectator mode
+
+	if ( ButtonPressed & (IN_FORWARD | IN_BACK) )
+		m_zoomDelta = 0.0f;
+	
+	if ( ButtonPressed & (IN_MOVELEFT | IN_MOVERIGHT) )
+		m_moveDelta = 0.0f;
+}
+
+void CHudSpectator::SetMode(int iNewMainMode)
+{
+	// if value == -1 keep old value
+	if ( iNewMainMode == -1 )
+		iNewMainMode = g_iUser1;
+
+	// main modes ettings will override inset window settings
+	if ( iNewMainMode != g_iUser1 )
+	{
+		// if we are NOT in HLTV mode, main spectator mode is set on server
+		if ( !gEngfuncs.IsSpectateOnly() )
+		{
+			char cmdstring[32];
+			// forward command to server
+			sprintf(cmdstring,"specmode %i",iNewMainMode );
+			gEngfuncs.pfnServerCmd(cmdstring);
+			return;
+		}
+        else
+        {
+            if ( !g_iUser2 && (iNewMainMode !=OBS_ROAMING ) )	// make sure we have a target
+            {
+                // choose last Director object if still available
+                if ( IsActivePlayer( gEngfuncs.GetEntityByIndex( m_lastPrimaryObject ) ) )
+                {
+                    g_iUser2 = m_lastPrimaryObject;
+                    g_iUser3 = m_lastSecondaryObject;
+                }
+                else
+                {
+                    FindNextPlayer(false); // find any target
+                }
+            }
+            
+            switch ( iNewMainMode )
+            {
+            case OBS_CHASE_LOCKED:
+                g_iUser1 = OBS_CHASE_LOCKED;
+                break;
+                
+            case OBS_CHASE_FREE:
+                g_iUser1 = OBS_CHASE_FREE;
+                break;
+                
+            case OBS_ROAMING	:	// jump to current vJumpOrigin/angle
+                g_iUser1 = OBS_ROAMING;
+                if ( g_iUser2 )
+                {
+                    V_GetChasePos( g_iUser2, v_cl_angles, vJumpOrigin, vJumpAngles );
+                    gEngfuncs.SetViewAngles( vJumpAngles );
+                    iJumpSpectator = 1;
+                }
+                break;
+                
+            case OBS_IN_EYE:
+                g_iUser1 = OBS_IN_EYE;
+                break;
+            
+            /*
+            case OBS_MAP_FREE	:	g_iUser1 = OBS_MAP_FREE;
+                // reset user values
+                m_mapZoom = m_OverviewData.zoom;
+                m_mapOrigin = m_OverviewData.origin;
+                break;
+                
+            case OBS_MAP_CHASE	:	g_iUser1 = OBS_MAP_CHASE;
+                // reset user values
+                m_mapZoom = m_OverviewData.zoom;
+                m_mapOrigin = m_OverviewData.origin;
+                break;
+            */
+            }
+            
+            if ( (g_iUser1 == OBS_IN_EYE) || (g_iUser1 == OBS_ROAMING) ) 
+            {
+                m_crosshairRect.left	 = 24;
+                m_crosshairRect.top	 = 0;
+                m_crosshairRect.right	 = 48;
+                m_crosshairRect.bottom = 24;
+                
+                gHUD.SetCurrentCrosshair( m_hCrosshair, m_crosshairRect, 255, 255, 255 );
+            }
+            else
+            {
+                memset( &m_crosshairRect,0,sizeof(m_crosshairRect) );
+                gHUD.SetCurrentCrosshair( 0, m_crosshairRect, 0, 0, 0 );
+            } 
+            
+            //char string[128];
+            //sprintf(string, "#Spec_Mode%d", g_iUser1 );
+            //sprintf(string, "%c%s", HUD_PRINTCENTER, CHudTextMessage::BufferedLocaliseTextString( string ));
+            //gHUD.m_TextMessage.MsgFunc_TextMsg(NULL, strlen(string)+1, string );
+        }
+    }    
+
+    gViewPort->UpdateSpectatorPanel();
+}
+
+bool CHudSpectator::IsActivePlayer(cl_entity_t * ent)
+{
+	return ( ent && 
+			 ent->player && 
+			 ent->curstate.solid != SOLID_NOT &&
+			 ent != gEngfuncs.GetLocalPlayer() &&
+			 g_PlayerInfoList[ent->index].name != NULL
+			);
+}
+
+
+bool CHudSpectator::ParseOverviewFile( )
+{
+	//char filename[255];
+	//char levelname[255];
+	//char token[1024];
+	//float height;
+	
+	char *pfile  = NULL;
+
+	memset( &m_OverviewData, 0, sizeof(m_OverviewData));
+
+	// fill in standrd values
+	m_OverviewData.insetWindowX = 4;	// upper left corner
+	m_OverviewData.insetWindowY = 4 + SPECTATOR_PANEL_HEIGHT;
+	m_OverviewData.insetWindowHeight = 180;
+	m_OverviewData.insetWindowWidth = 240;
+	m_OverviewData.origin[0] = 0.0f;
+	m_OverviewData.origin[1] = 0.0f;
+	m_OverviewData.origin[2] = 0.0f;
+	m_OverviewData.zoom	= 1.0f;
+	m_OverviewData.layers = 0;
+	m_OverviewData.layersHeights[0] = 0.0f;
+	strcpy( m_OverviewData.map, gEngfuncs.pfnGetLevelName() );
+
+	if ( strlen( m_OverviewData.map ) == 0 )
+		return false; // not active yet
+
+    /*
+	strcpy(levelname, m_OverviewData.map + 5);
+	levelname[strlen(levelname)-4] = 0;
+	
+    sprintf(filename, "overviews/%s.txt", levelname );
+
+	pfile = (char *)gEngfuncs.COM_LoadFile( filename, 5, NULL);
+
+	if (!pfile)
+	{
+		gEngfuncs.Con_Printf("Couldn't open file %s. Using default values for overiew mode.\n", filename );
+		return false;
+	}
+	
+	while (true)
+	{
+		pfile = gEngfuncs.COM_ParseFile(pfile, token);
+
+		if (!pfile)
+			break;
+
+		if ( !stricmp( token, "global" ) )
+		{
+			// parse the global data
+			pfile = gEngfuncs.COM_ParseFile(pfile, token);
+			if ( stricmp( token, "{" ) ) 
+			{
+				gEngfuncs.Con_Printf("Error parsing overview file %s. (expected { )\n", filename );
+				return false;
+			}
+
+			pfile = gEngfuncs.COM_ParseFile(pfile,token);
+
+			while (stricmp( token, "}") )
+			{
+				if ( !stricmp( token, "zoom" ) )
+				{
+					pfile = gEngfuncs.COM_ParseFile(pfile,token);
+					m_OverviewData.zoom = atof( token );
+				} 
+				else if ( !stricmp( token, "origin" ) )
+				{
+					pfile = gEngfuncs.COM_ParseFile(pfile, token); 
+					m_OverviewData.origin[0] = atof( token );
+					pfile = gEngfuncs.COM_ParseFile(pfile,token); 
+					m_OverviewData.origin[1] = atof( token );
+					pfile = gEngfuncs.COM_ParseFile(pfile, token); 
+					m_OverviewData.origin[2] = atof( token );
+				}
+				else if ( !stricmp( token, "rotated" ) )
+				{
+					pfile = gEngfuncs.COM_ParseFile(pfile,token); 
+					m_OverviewData.rotated = atoi( token );
+				}
+				else if ( !stricmp( token, "inset" ) )
+				{
+
+                    // Removed by mmcguire.
+                    // This isn't supported anymore.
+					pfile = gEngfuncs.COM_ParseFile(pfile,token); 
+					//m_OverviewData.insetWindowX = atof( token );
+					pfile = gEngfuncs.COM_ParseFile(pfile,token); 
+					//m_OverviewData.insetWindowY = atof( token );
+					pfile = gEngfuncs.COM_ParseFile(pfile,token); 
+					//m_OverviewData.insetWindowWidth = atof( token );
+					pfile = gEngfuncs.COM_ParseFile(pfile,token); 
+					//m_OverviewData.insetWindowHeight = atof( token );
+
+				}
+				else
+				{
+					gEngfuncs.Con_Printf("Error parsing overview file %s. (%s unkown)\n", filename, token );
+					return false;
+				}
+
+				pfile = gEngfuncs.COM_ParseFile(pfile,token); // parse next token
+
+			}
+		}
+		else if ( !stricmp( token, "layer" ) )
+		{
+			// parse a layer data
+
+			if ( m_OverviewData.layers == OVERVIEW_MAX_LAYERS )
+			{
+				gEngfuncs.Con_Printf("Error parsing overview file %s. ( too many layers )\n", filename );
+				return false;
+			}
+
+			pfile = gEngfuncs.COM_ParseFile(pfile,token);
+
+				
+			if ( stricmp( token, "{" ) ) 
+			{
+				gEngfuncs.Con_Printf("Error parsing overview file %s. (expected { )\n", filename );
+				return false;
+			}
+
+			pfile = gEngfuncs.COM_ParseFile(pfile,token);
+
+			while (stricmp( token, "}") )
+			{
+				if ( !stricmp( token, "image" ) )
+				{
+					pfile = gEngfuncs.COM_ParseFile(pfile,token);
+					strcpy(m_OverviewData.layersImages[ m_OverviewData.layers ], token);
+					
+					
+				} 
+				else if ( !stricmp( token, "height" ) )
+				{
+					pfile = gEngfuncs.COM_ParseFile(pfile,token); 
+					height = atof(token);
+					m_OverviewData.layersHeights[ m_OverviewData.layers ] = height;
+				}
+				else
+				{
+					gEngfuncs.Con_Printf("Error parsing overview file %s. (%s unkown)\n", filename, token );
+					return false;
+				}
+
+				pfile = gEngfuncs.COM_ParseFile(pfile,token); // parse next token
+			}
+
+			m_OverviewData.layers++;
+
+		}
+	}
+
+	gEngfuncs.COM_FreeFile( pfile );
+    */
+
+	m_mapZoom = m_OverviewData.zoom;
+	m_mapOrigin = m_OverviewData.origin;
+
+	return true;
+
+}
+
+void CHudSpectator::LoadMapSprites()
+{
+	// right now only support for one map layer
+	if (m_OverviewData.layers > 0 )
+	{
+		m_MapSprite = gEngfuncs.LoadMapSprite( m_OverviewData.layersImages[0] );
+	}
+	else
+		m_MapSprite = NULL; // the standard "unkown map" sprite will be used instead
+}
+
+void CHudSpectator::DrawOverviewLayer()
+{
+	float screenaspect, xs, ys, xStep, yStep, x,y,z;
+	int ix,iy,i,xTiles,yTiles,frame;
+
+	qboolean	hasMapImage = m_MapSprite?TRUE:FALSE;
+	model_t *   dummySprite = (struct model_s *)gEngfuncs.GetSpritePointer( m_hsprUnkownMap);
+
+	if ( hasMapImage)
+	{
+		i = m_MapSprite->numframes / (4*3);
+		i = sqrt((float)i);
+		xTiles = i*4;
+		yTiles = i*3;
+	}
+	else
+	{
+		xTiles = 8;
+		yTiles = 6;
+	}
+
+
+	screenaspect = 4.0f/3.0f;	
+
+
+	xs = m_OverviewData.origin[0];
+	ys = m_OverviewData.origin[1];
+	z  = ( 90.0f - v_angles[0] ) / 90.0f;		
+	z *= m_OverviewData.layersHeights[0]; // gOverviewData.z_min - 32;	
+
+	// i = r_overviewTexture + ( layer*OVERVIEW_X_TILES*OVERVIEW_Y_TILES );
+
+	gEngfuncs.pTriAPI->RenderMode( kRenderTransTexture );
+	gEngfuncs.pTriAPI->CullFace( TRI_NONE );
+	gEngfuncs.pTriAPI->Color4f( 1.0, 1.0, 1.0, 1.0 );
+
+	frame = 0;
+	
+
+	// rotated view ?
+	if ( m_OverviewData.rotated )
+	{
+		xStep = (2*4096.0f / m_OverviewData.zoom ) / xTiles;
+		yStep = -(2*4096.0f / (m_OverviewData.zoom* screenaspect) ) / yTiles;
+
+		y = ys + (4096.0f / (m_OverviewData.zoom * screenaspect));
+
+		for (iy = 0; iy < yTiles; iy++)
+		{
+			x = xs - (4096.0f / (m_OverviewData.zoom));
+
+			for (ix = 0; ix < xTiles; ix++)
+			{
+				if (hasMapImage)
+					gEngfuncs.pTriAPI->SpriteTexture( m_MapSprite, frame );
+				else
+					gEngfuncs.pTriAPI->SpriteTexture( dummySprite, 0 );
+
+				gEngfuncs.pTriAPI->Begin( TRI_QUADS );
+					gEngfuncs.pTriAPI->TexCoord2f( 0, 0 );
+					gEngfuncs.pTriAPI->Vertex3f (x, y, z);
+
+					gEngfuncs.pTriAPI->TexCoord2f( 1, 0 );
+					gEngfuncs.pTriAPI->Vertex3f (x+xStep ,y,  z);
+
+					gEngfuncs.pTriAPI->TexCoord2f( 1, 1 );
+					gEngfuncs.pTriAPI->Vertex3f (x+xStep, y+yStep, z);
+
+					gEngfuncs.pTriAPI->TexCoord2f( 0, 1 );
+					gEngfuncs.pTriAPI->Vertex3f (x, y+yStep, z);
+				gEngfuncs.pTriAPI->End();
+
+				frame++;
+				x+= xStep;
+			}
+
+			y+=yStep;
+		}
+	} 
+	else
+	{
+		xStep = -(2*4096.0f / m_OverviewData.zoom ) / xTiles;
+		yStep = -(2*4096.0f / (m_OverviewData.zoom* screenaspect) ) / yTiles;
+
+				
+		x = xs + (4096.0f / (m_OverviewData.zoom * screenaspect ));
+
+		
+		
+		for (ix = 0; ix < yTiles; ix++)
+		{
+			
+			y = ys + (4096.0f / (m_OverviewData.zoom));	
+						
+			for (iy = 0; iy < xTiles; iy++)	
+			{
+				if (hasMapImage)
+					gEngfuncs.pTriAPI->SpriteTexture( m_MapSprite, frame );
+				else
+					gEngfuncs.pTriAPI->SpriteTexture( dummySprite, 0 );
+
+				gEngfuncs.pTriAPI->Begin( TRI_QUADS );
+					gEngfuncs.pTriAPI->TexCoord2f( 0, 0 );
+					gEngfuncs.pTriAPI->Vertex3f (x, y, z);
+
+					gEngfuncs.pTriAPI->TexCoord2f( 0, 1 );
+					gEngfuncs.pTriAPI->Vertex3f (x+xStep ,y,  z);
+
+					gEngfuncs.pTriAPI->TexCoord2f( 1, 1 );
+					gEngfuncs.pTriAPI->Vertex3f (x+xStep, y+yStep, z);
+
+					gEngfuncs.pTriAPI->TexCoord2f( 1, 0 );
+					gEngfuncs.pTriAPI->Vertex3f (x, y+yStep, z);
+				gEngfuncs.pTriAPI->End();
+
+				frame++;
+				
+				y+=yStep;
+			}
+
+			x+= xStep;
+			
+		}
+	}
+}
+
+void CHudSpectator::DrawOverviewEntities()
+{
+    /*
+	int				i,ir,ig,ib;
+	struct model_s *hSpriteModel;
+	vec3_t			origin, angles, point, forward, right, left, up, world, screen, offset;
+	float			x,y,z, r,g,b, sizeScale = 4.0f;
+	cl_entity_t *	ent;
+	float rmatrix[3][4];	// transformation matrix
+	
+	float			zScale = (90.0f - v_angles[0] ) / 90.0f;
+	
+
+	z = m_OverviewData.layersHeights[0] * zScale;
+	// get yellow/brown HUD color
+	//UnpackRGB(ir,ig,ib, RGB_YELLOWISH);
+	gHUD.GetPrimaryHudColor(ir, ig, ib);
+	r = (float)ir/255.0f;
+	g = (float)ig/255.0f;
+	b = (float)ib/255.0f;
+	
+	gEngfuncs.pTriAPI->CullFace( TRI_NONE );
+
+	for (i=0; i < MAX_PLAYERS; i++ )
+		m_vPlayerPos[i][2] = -1;	// mark as invisible 
+
+    // draw all players
+	
+    float depthOffset = 0;
+
+    for (i=MAX_OVERVIEW_ENTITIES - 1; i >= 0; i--)
+	{
+		if ( !m_OverviewEntities[i].hSprite )
+			continue;
+
+		hSpriteModel = (struct model_s *)gEngfuncs.GetSpritePointer( m_OverviewEntities[i].hSprite );
+		ent = m_OverviewEntities[i].entity;
+
+		int theSpriteFrame = m_OverviewEntities[i].mFrame;
+		gEngfuncs.pTriAPI->SpriteTexture( hSpriteModel,  theSpriteFrame);
+		
+        gEngfuncs.pTriAPI->RenderMode(  kRenderTransAdd);
+
+		// see R_DrawSpriteModel
+		// draws players sprite
+
+		AngleVectors(ent->angles, right, up, NULL );
+
+		VectorCopy(ent->origin,origin);
+
+		// Set origin of blip to just above map height, so blips are all drawn on map
+		origin.z = m_OverviewData.layersHeights[0] + kOverviewEntityZHeight + depthOffset;
+
+        gEngfuncs.pTriAPI->Begin( TRI_QUADS );
+
+        float gammaSlope = gHUD.GetGammaSlope();
+
+        gEngfuncs.pTriAPI->Color4f(
+            m_OverviewEntities[i].mColorR / gammaSlope, 
+            m_OverviewEntities[i].mColorG / gammaSlope,
+            m_OverviewEntities[i].mColorB / gammaSlope,
+            1);
+		
+		gEngfuncs.pTriAPI->TexCoord2f (1, 0);
+		VectorMA (origin,  16.0f * sizeScale, up, point);
+		VectorMA (point,   16.0f * sizeScale, right, point);
+		point[2] *= zScale;
+		gEngfuncs.pTriAPI->Vertex3fv (point);
+
+		gEngfuncs.pTriAPI->TexCoord2f (0, 0);
+		
+		VectorMA (origin,  16.0f * sizeScale, up, point);
+		VectorMA (point,  -16.0f * sizeScale, right, point);
+		point[2] *= zScale;
+		gEngfuncs.pTriAPI->Vertex3fv (point);
+
+		gEngfuncs.pTriAPI->TexCoord2f (0,1);
+		VectorMA (origin, -16.0f * sizeScale, up, point);
+		VectorMA (point,  -16.0f * sizeScale, right, point);
+		point[2] *= zScale;
+		gEngfuncs.pTriAPI->Vertex3fv (point);
+
+		gEngfuncs.pTriAPI->TexCoord2f (1,1);
+		VectorMA (origin, -16.0f * sizeScale, up, point);
+		VectorMA (point,   16.0f * sizeScale, right, point);
+		point[2] *= zScale;
+		gEngfuncs.pTriAPI->Vertex3fv (point);
+
+		gEngfuncs.pTriAPI->End ();
+
+		
+		if ( !ent->player)
+			continue;
+		// draw line under player icons
+		origin[2] *= zScale;
+
+		gEngfuncs.pTriAPI->RenderMode( kRenderTransAdd );
+		
+		hSpriteModel = (struct model_s *)gEngfuncs.GetSpritePointer( m_hsprBeam );
+		gEngfuncs.pTriAPI->SpriteTexture( hSpriteModel, 0 );
+		
+		gEngfuncs.pTriAPI->Color4f(r, g, b, 0.3);
+
+		gEngfuncs.pTriAPI->Begin ( TRI_QUADS );
+		gEngfuncs.pTriAPI->TexCoord2f (1, 0);
+		gEngfuncs.pTriAPI->Vertex3f (origin[0]+4, origin[1]+4, origin[2]-zScale);
+		gEngfuncs.pTriAPI->TexCoord2f (0, 0);
+		gEngfuncs.pTriAPI->Vertex3f (origin[0]-4, origin[1]-4, origin[2]-zScale);
+		gEngfuncs.pTriAPI->TexCoord2f (0, 1);
+		gEngfuncs.pTriAPI->Vertex3f (origin[0]-4, origin[1]-4,z);
+		gEngfuncs.pTriAPI->TexCoord2f (1, 1);
+		gEngfuncs.pTriAPI->Vertex3f (origin[0]+4, origin[1]+4,z);
+		gEngfuncs.pTriAPI->End ();
+
+		gEngfuncs.pTriAPI->Begin ( TRI_QUADS );
+		gEngfuncs.pTriAPI->TexCoord2f (1, 0);
+		gEngfuncs.pTriAPI->Vertex3f (origin[0]-4, origin[1]+4, origin[2]-zScale);
+		gEngfuncs.pTriAPI->TexCoord2f (0, 0);
+		gEngfuncs.pTriAPI->Vertex3f (origin[0]+4, origin[1]-4, origin[2]-zScale);
+		gEngfuncs.pTriAPI->TexCoord2f (0, 1);
+		gEngfuncs.pTriAPI->Vertex3f (origin[0]+4, origin[1]-4,z);
+		gEngfuncs.pTriAPI->TexCoord2f (1, 1);
+		gEngfuncs.pTriAPI->Vertex3f (origin[0]-4, origin[1]+4,z);
+		gEngfuncs.pTriAPI->End ();
+
+		// calculate screen position for name and infromation in hud::draw()
+		if ( gEngfuncs.pTriAPI->WorldToScreen(origin,screen) )
+			continue;	// object is behind viewer
+
+		screen[0] = XPROJECT(screen[0]);
+		screen[1] = YPROJECT(screen[1]);
+		screen[2] = 0.0f;
+
+		// calculate some offset under the icon
+		origin[0]+=32.0f;
+		origin[1]+=32.0f;
+		
+		gEngfuncs.pTriAPI->WorldToScreen(origin,offset);
+
+		offset[0] = XPROJECT(offset[0]);
+		offset[1] = YPROJECT(offset[1]);
+		offset[2] = 0.0f;
+			
+		VectorSubtract(offset, screen, offset );
+
+		int playerNum = ent->index - 1;
+
+		m_vPlayerPos[playerNum][0] = screen[0];	
+		m_vPlayerPos[playerNum][1] = screen[1] + Length(offset);	
+		m_vPlayerPos[playerNum][2] = 1;	// mark player as visible 
+
+
+	}
+
+	if ( !m_pip || !m_drawcone->value )
+		return;
+
+	// get current camera position and angle
+
+	if ( m_pip == INSET_IN_EYE || g_iUser1 == OBS_IN_EYE )
+	{ 
+		V_GetInEyePos( g_iUser2, origin, angles );
+	}
+	else if ( m_pip == INSET_CHASE_FREE  || g_iUser1 == OBS_CHASE_FREE )
+	{
+		V_GetChasePos( g_iUser2, v_cl_angles, origin, angles );
+	}
+	else if ( g_iUser1 == OBS_ROAMING )
+	{
+		VectorCopy( v_sim_org, origin );
+		VectorCopy( v_cl_angles, angles );
+	}
+	else
+		V_GetChasePos( g_iUser2, NULL, origin, angles );
+
+	
+	// draw camera sprite
+
+	x = origin[0];
+	y = origin[1];
+	z = origin[2];
+
+	// Set origin of cone to just above map height, so blips are all drawn on map
+	z = m_OverviewData.layersHeights[0] + kOverviewEntityZHeight;
+
+	angles[0] = 0; // always show horizontal camera sprite
+
+	hSpriteModel = (struct model_s *)gEngfuncs.GetSpritePointer( m_hsprCamera );
+	gEngfuncs.pTriAPI->RenderMode( kRenderTransAdd );
+	gEngfuncs.pTriAPI->SpriteTexture( hSpriteModel, 0 );
+	
+	
+	gEngfuncs.pTriAPI->Color4f( r, g, b, 1.0 );
+
+	AngleVectors(angles, forward, NULL, NULL );
+	VectorScale (forward, 512.0f, forward);
+	
+	offset[0] =  0.0f; 
+	offset[1] = 45.0f; 
+	offset[2] =  0.0f; 
+
+	AngleMatrix(offset, rmatrix );
+	VectorTransform(forward, rmatrix , right );
+
+	offset[1]= -45.0f;
+	AngleMatrix(offset, rmatrix );
+	VectorTransform(forward, rmatrix , left );
+
+	gEngfuncs.pTriAPI->Begin (TRI_TRIANGLES);
+		gEngfuncs.pTriAPI->TexCoord2f( 0, 0 );
+		gEngfuncs.pTriAPI->Vertex3f (x+right[0], y+right[1], (z+right[2]) * zScale);
+
+		gEngfuncs.pTriAPI->TexCoord2f( 0, 1 );
+		gEngfuncs.pTriAPI->Vertex3f (x, y, z  * zScale);
+		
+		gEngfuncs.pTriAPI->TexCoord2f( 1, 1 );
+		gEngfuncs.pTriAPI->Vertex3f (x+left[0], y+left[1], (z+left[2]) * zScale);
+	gEngfuncs.pTriAPI->End ();
+    */
+
+}
+
+
+
+void CHudSpectator::DrawOverview()
+{
+    /*
+	// draw only in sepctator mode
+	if ( !g_iUser1 )
+		return;
+
+	// Only draw the overview if Map Mode is selected for this view
+	if ( m_iDrawCycle == 0 &&  ( (g_iUser1 != OBS_MAP_FREE) && (g_iUser1 != OBS_MAP_CHASE) ) ) 
+		return;
+
+	if ( m_iDrawCycle == 1 && m_pip->value < INSET_MAP_FREE )
+		return;
+
+	DrawOverviewLayer();
+	DrawOverviewEntities();
+	CheckOverviewEntities();
+    */
+
+}
+
+
+
+void CHudSpectator::CheckOverviewEntities()
+{
+	double time = gEngfuncs.GetClientTime();
+
+	// removes old entities from list
+	for ( int i = 0; i< MAX_OVERVIEW_ENTITIES; i++ )
+	{
+		// remove entity from list if it is too old
+		if ( m_OverviewEntities[i].killTime < time )
+		{
+			memset( &m_OverviewEntities[i], 0, sizeof (overviewEntity_t) );
+		}
+	}
+}
+
+bool CHudSpectator::AddOverviewEntity( int type, struct cl_entity_s *ent, const char *modelname)
+{
+	HSPRITE	hSprite = 0;
+	double  duration = -1.0f;	// duration -1 means show it only this frame;
+	int theFrame = 0;
+	bool theSuccess = false;
+    int theRenderMode;
+
+	if ( ent )
+	{
+
+		if (ent->curstate.solid != SOLID_NOT)
+		{
+            gHUD.GetSpriteForUser3(AvHUser3(ent->curstate.iuser3), hSprite, theFrame, theRenderMode);
+        }
+
+		/*
+        if ( type == ET_PLAYER )
+		{
+			if ( ent->curstate.solid != SOLID_NOT)
+			{
+				int thePlayerClass = g_PlayerExtraInfo[ent->index].playerclass;
+				switch(thePlayerClass)
+				{
+				case PLAYERCLASS_ALIVE_MARINE:
+					hSprite = this->m_hsprPlayerMarine;
+					theFrame = 0;
+					break;
+				case PLAYERCLASS_ALIVE_HEAVY_MARINE:
+					hSprite = this->m_hsprPlayerMarine;
+					theFrame = 1;
+					break;
+				case PLAYERCLASS_COMMANDER:
+					hSprite = this->m_hsprPlayerMarine;
+					theFrame = 2;
+					break;
+				case PLAYERCLASS_ALIVE_LEVEL1:
+					hSprite = this->m_hsprPlayerAlien;
+					theFrame = 0;
+					break;
+				case PLAYERCLASS_ALIVE_LEVEL2:
+					hSprite = this->m_hsprPlayerAlien;
+					theFrame = 1;
+					break;
+				case PLAYERCLASS_ALIVE_LEVEL3:
+					hSprite = this->m_hsprPlayerAlien;
+					theFrame = 2;
+					break;
+				case PLAYERCLASS_ALIVE_LEVEL4:
+					hSprite = this->m_hsprPlayerAlien;
+					theFrame = 3;
+					break;
+				case PLAYERCLASS_ALIVE_LEVEL5:
+					hSprite = this->m_hsprPlayerAlien;
+					theFrame = 4;
+					break;
+				case PLAYERCLASS_ALIVE_GESTATING:
+					hSprite = this->m_hsprPlayerAlien;
+					theFrame = 5;
+					break;
+		
+				case PLAYERCLASS_ALIVE_DIGESTING:
+					break;
+				}
+			}
+			else
+			{
+				// it's an spectator
+			}
+		}
+		else if (type == ET_NORMAL)
+		{
+			// Now help icons
+			if(hSprite == 0)
+			{
+				AvHUser3 theUser3 = AvHUser3(ent->curstate.iuser3);
+				theFrame = gHUD.GetHelpIconFrameFromUser3(theUser3);
+				if(theFrame != -1)
+				{
+					hSprite = gHUD.GetHelpSprite();
+				}
+			}
+		}
+        */
+	}
+
+	if(hSprite > 0)
+	{
+        
+        int theTeam = ent->curstate.team;
+
+        float theR = kFTeamColors[theTeam][0];
+        float theG = kFTeamColors[theTeam][1];
+        float theB = kFTeamColors[theTeam][2];
+
+        theSuccess = AddOverviewEntityToList(hSprite, ent, gEngfuncs.GetClientTime() + duration, theFrame, theRenderMode, theR, theG, theB);
+	
+    }
+
+	return theSuccess;
+}
+
+void CHudSpectator::DeathMessage(int victim)
+{
+	// find out where the victim is
+	cl_entity_t *pl = gEngfuncs.GetEntityByIndex(victim);
+
+	if (pl && pl->player)
+		AddOverviewEntityToList(m_hsprPlayerDead, pl, gEngfuncs.GetClientTime() + 2.0f, 0, kRenderTransTexture, 1, 1, 1);
+}
+
+bool CHudSpectator::AddOverviewEntityToList(HSPRITE sprite, cl_entity_t *ent, double killTime, int inFrame, int inRenderMode, float r, float g, float b)
+{
+	for ( int i = 0; i< MAX_OVERVIEW_ENTITIES; i++ )
+	{
+		// find empty entity slot
+		if ( m_OverviewEntities[i].entity == NULL)
+		{
+			m_OverviewEntities[i].entity = ent;
+			m_OverviewEntities[i].hSprite = sprite;
+			m_OverviewEntities[i].killTime = killTime;
+			m_OverviewEntities[i].mFrame = inFrame;
+            m_OverviewEntities[i].mRenderMode = inRenderMode;
+            m_OverviewEntities[i].mColorR = r;
+            m_OverviewEntities[i].mColorG = g;
+            m_OverviewEntities[i].mColorB = b;
+            return true;
+		}
+	}
+
+	return false;	// maximum overview entities reached
+}
+void CHudSpectator::CheckSettings()
+{
+	// disallow same inset mode as main mode:
+
+	//m_pip->value = floor(m_pip->value);
+	
+	// Removed by mmcguire.
+    /*
+    if ( ( g_iUser1 < OBS_MAP_FREE ) && ( m_pip->value == INSET_CHASE_LOCKED || m_pip->value == INSET_IN_EYE ) )
+	{
+		// otherwise both would show in World picures
+		m_pip->value = INSET_OFF;
+	}
+
+	// disble in intermission screen
+	if ( gHUD.m_iIntermission )
+		m_pip->value = INSET_OFF;
+    */
+
+	// check chat mode
+	if ( m_chatEnabled != (gHUD.m_SayText.m_HUD_saytext->value!=0) )
+	{
+		// hud_saytext changed
+		m_chatEnabled = (gHUD.m_SayText.m_HUD_saytext->value!=0);
+
+		if ( gEngfuncs.IsSpectateOnly() )
+		{
+			// tell proxy our new chat mode
+			char chatcmd[32];
+			sprintf(chatcmd, "ignoremsg %i", m_chatEnabled?0:1 );
+			gEngfuncs.pfnServerCmd(chatcmd);
+		}
+	}
+
+	// HL/TFC has no oberserver corsshair, so set it client side
+	if ( g_iUser1 == OBS_IN_EYE ) 
+	{
+		m_crosshairRect.left	 = 24;
+		m_crosshairRect.top	 = 0;
+		m_crosshairRect.right	 = 48;
+		m_crosshairRect.bottom = 24;
+					
+		gHUD.SetCurrentCrosshair( m_hCrosshair, m_crosshairRect, 255, 255, 255 );
+	}
+	else
+	{
+		memset( &m_crosshairRect,0,sizeof(m_crosshairRect) );
+		gHUD.SetCurrentCrosshair( 0, m_crosshairRect, 0, 0, 0 );
+	} 
+
+    // Removed by mmcguire.
+    /*
+	// if we are a real player on server don't allow inset window
+	// in First Person mode since this is our resticted forcecamera mode 2
+	// team number 3 = SPECTATOR see player.h
+
+	if ( ( (g_iTeamNumber == 1) || (g_iTeamNumber == 2)) && (g_iUser1 == OBS_IN_EYE) )
+		m_pip->value = INSET_OFF;
+    */
+
+	// draw small border around inset view, adjust upper black bar
+	//gViewPort->m_pSpectatorPanel->EnableInsetView( m_pip->value != INSET_OFF );
+    gViewPort->m_pSpectatorPanel->EnableInsetView( IsInOverviewMode() );
+
+}
+
+
+void CHudSpectator::Reset()
+{
+	// Reset HUD
+	if ( strcmp( m_OverviewData.map, gEngfuncs.pfnGetLevelName() ) )
+	{
+		// update level overview if level changed
+		ParseOverviewFile();
+		LoadMapSprites();
+	}
+
+	memset( &m_OverviewEntities, 0, sizeof(m_OverviewEntities));
+
+	SetSpectatorStartPosition();
+}
+
+void CHudSpectator::InitHUDData()
+{
+	m_lastPrimaryObject = m_lastSecondaryObject = 0;
+	m_flNextObserverInput = 0.0f;
+	m_lastHudMessage = 0;
+	m_iSpectatorNumber = 0;
+	iJumpSpectator	= 0;
+	g_iUser1 = g_iUser2 = 0;
+
+	memset( &m_OverviewData, 0, sizeof(m_OverviewData));
+	memset( &m_OverviewEntities, 0, sizeof(m_OverviewEntities));
+
+	if ( gEngfuncs.IsSpectateOnly() || gEngfuncs.pDemoAPI->IsPlayingback() )
+		m_autoDirector->value = 1.0f;
+	else
+		m_autoDirector->value = 0.0f;
+
+	Reset();
+
+	SetMode( OBS_CHASE_FREE);
+
+	g_iUser2 = 0; // fake not target until first camera command
+
+	// reset HUD FOV
+	gHUD.m_iFOV =  CVAR_GET_FLOAT("default_fov");
+}
+
diff --git a/main/source/cl_dll/hud_spectator.h b/main/source/cl_dll/hud_spectator.h
new file mode 100644
index 00000000..91816a17
--- /dev/null
+++ b/main/source/cl_dll/hud_spectator.h
@@ -0,0 +1,143 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef SPECTATOR_H
+#define SPECTATOR_H
+#pragma once
+
+#include "cl_entity.h"
+
+// Removed by mmcguire.
+/*
+#define INSET_OFF				0
+#define	INSET_CHASE_LOCKED		1
+#define	INSET_IN_EYE			2
+*/
+
+#define MAX_SPEC_HUD_MESSAGES	8
+
+
+
+#define OVERVIEW_TILE_SIZE		128		// don't change this
+#define OVERVIEW_MAX_LAYERS		1
+
+//-----------------------------------------------------------------------------
+// Purpose: Handles the drawing of the spectator stuff (camera & top-down map and all the things on it )
+//-----------------------------------------------------------------------------
+
+typedef struct overviewInfo_s {
+	char		map[64];	// cl.levelname or empty
+	vec3_t		origin;		// center of map
+	float		zoom;		// zoom of map images
+	int			layers;		// how may layers do we have
+	float		layersHeights[OVERVIEW_MAX_LAYERS];
+	char		layersImages[OVERVIEW_MAX_LAYERS][255];
+	qboolean	rotated;	// are map images rotated (90 degrees) ?
+	
+	int			insetWindowX;
+	int			insetWindowY;
+	int			insetWindowHeight;
+	int			insetWindowWidth;
+} overviewInfo_t;
+
+typedef struct overviewEntity_s {
+
+	HSPRITE					hSprite;
+	struct cl_entity_s *	entity;
+	double					killTime;
+	int						mFrame;
+    int                     mRenderMode;
+    float                   mColorR;
+    float                   mColorG;
+    float                   mColorB;
+} overviewEntity_t;
+
+#define	 MAX_OVERVIEW_ENTITIES		256
+const int kOverviewEntityZHeight = 100;
+
+class CHudSpectator : public CHudBase
+{
+public:
+	void Reset();
+	void CheckSettings();
+	void InitHUDData( void );
+	bool AddOverviewEntityToList( HSPRITE sprite, cl_entity_t * ent, double killTime, int inFrame, int inRenderMode, float r, float g, float b);
+	void DeathMessage(int victim);
+	bool AddOverviewEntity( int type, struct cl_entity_s *ent, const char *modelname );
+	void CheckOverviewEntities();
+	void DrawOverview();
+    void DrawOverviewEntities();
+	void GetMapPosition( float * returnvec );
+	void DrawOverviewLayer();
+	void LoadMapSprites();
+	bool ParseOverviewFile();
+	bool IsActivePlayer(cl_entity_t * ent);
+	void SetMode(int iMainMode);
+	void HandleButtonsDown(int ButtonPressed);
+	void HandleButtonsUp(int ButtonPressed);
+	void FindNextPlayer( bool bReverse );
+	void DirectorMessage( int iSize, void *pbuf );
+	void SetSpectatorStartPosition();
+	int Init();
+	int VidInit();
+    
+    bool IsInOverviewMode() const;
+    void SetOverviewMode(bool overviewMode);
+
+	int Draw(float flTime);
+	void DrawOverviewMap();
+
+	int m_iDrawCycle;
+	client_textmessage_t m_HUDMessages[MAX_SPEC_HUD_MESSAGES];
+	char				m_HUDMessageText[MAX_SPEC_HUD_MESSAGES][128];
+	int					m_lastHudMessage;
+	overviewInfo_t		m_OverviewData;
+	overviewEntity_t	m_OverviewEntities[MAX_OVERVIEW_ENTITIES];
+	int					m_iObserverFlags;
+	int					m_iSpectatorNumber;
+	
+	float				m_mapZoom;		// zoom the user currently uses
+	vec3_t				m_mapOrigin;	// origin where user rotates around
+	cvar_t *			m_drawnames;
+	cvar_t *			m_drawcone;
+	cvar_t *			m_drawstatus;
+	cvar_t *			m_autoDirector;
+
+    // Removed by mmcguire.
+    bool                m_overviewMode;
+    //cvar_t *			m_overview;
+    //cvar_t *			m_pip;
+
+
+	qboolean			m_chatEnabled;
+
+	vec3_t				m_cameraOrigin;	// a help camera
+	vec3_t				m_cameraAngles;	// and it's angles
+
+private:
+	vec3_t		m_vPlayerPos[MAX_PLAYERS];
+	HSPRITE		m_hsprPlayerMarine;
+	HSPRITE		m_hsprPlayerAlien;
+	HSPRITE		m_hsprCamera;
+	HSPRITE		m_hsprPlayerDead;
+	HSPRITE		m_hsprViewcone;
+	HSPRITE		m_hsprUnkownMap;
+	HSPRITE		m_hsprBeam;
+	HSPRITE		m_hCrosshair;
+    HSPRITE     m_hsprWhite;
+
+	wrect_t		m_crosshairRect;
+
+	struct model_s * m_MapSprite;	// each layer image is saved in one sprite, where each tile is a sprite frame
+	float		m_flNextObserverInput;
+	float		m_zoomDelta;
+	float		m_moveDelta;
+	int			m_lastPrimaryObject;
+	int			m_lastSecondaryObject;
+};
+
+#endif // SPECTATOR_H
diff --git a/main/source/cl_dll/hud_update.cpp b/main/source/cl_dll/hud_update.cpp
new file mode 100644
index 00000000..c8ccbac2
--- /dev/null
+++ b/main/source/cl_dll/hud_update.cpp
@@ -0,0 +1,54 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+//  hud_update.cpp
+//
+
+#include <math.h>
+#include "hud.h"
+#include "cl_util.h"
+#include <stdlib.h>
+#include <memory.h>
+
+int CL_ButtonBits( int );
+void CL_ResetButtonBits( int bits );
+
+extern float v_idlescale;
+float in_fov;
+extern void HUD_SetCmdBits( int bits );
+
+int CHud::UpdateClientData(client_data_t *cdata, float time)
+{
+	memcpy(m_vecOrigin, cdata->origin, sizeof(vec3_t));
+	memcpy(m_vecAngles, cdata->viewangles, sizeof(vec3_t));
+	
+	m_iKeyBits = CL_ButtonBits( 0 );
+	m_iWeaponBits = cdata->iWeaponBits;
+
+	in_fov = cdata->fov;
+
+	Think();
+
+	cdata->fov = m_iFOV;
+	
+	v_idlescale = m_iConcussionEffect;
+
+	CL_ResetButtonBits( m_iKeyBits );
+
+	// return 1 if in anything in the client_data struct has been changed, 0 otherwise
+	return 1;
+}
+
+
diff --git a/main/source/cl_dll/in_camera.cpp b/main/source/cl_dll/in_camera.cpp
new file mode 100644
index 00000000..7a7b3d08
--- /dev/null
+++ b/main/source/cl_dll/in_camera.cpp
@@ -0,0 +1,645 @@
+#include "hud.h"
+#include "cl_util.h"
+#include "camera.h"
+#include "kbutton.h"
+#include "cvardef.h"
+#include "usercmd.h"
+#include "const.h"
+#include "camera.h"
+#include "in_defs.h"
+
+#include "APIProxy.h"
+#include "Exports.h"
+
+#include "windows.h"
+#include "build.h"
+
+float CL_KeyState (kbutton_t *key);
+extern "C" 
+{
+	void CL_DLLEXPORT CAM_Think( void );
+	int CL_DLLEXPORT CL_IsThirdPerson( void );
+	void CL_DLLEXPORT CL_CameraOffset( float *ofs );
+}
+
+extern cl_enginefunc_t gEngfuncs;
+
+//-------------------------------------------------- Constants
+
+#define CAM_DIST_DELTA 1.0
+#define CAM_ANGLE_DELTA 2.5
+#define CAM_ANGLE_SPEED 2.5
+#define CAM_MIN_DIST 30.0
+#define CAM_ANGLE_MOVE .5
+#define MAX_ANGLE_DIFF 10.0
+#define PITCH_MAX 90.0
+#define PITCH_MIN 0
+#define YAW_MAX  135.0
+#define YAW_MIN	 -135.0
+
+enum ECAM_Command
+{
+	CAM_COMMAND_NONE = 0,
+	CAM_COMMAND_TOTHIRDPERSON = 1,
+	CAM_COMMAND_TOFIRSTPERSON = 2
+};
+
+//-------------------------------------------------- Global Variables
+
+cvar_t	*cam_command;
+cvar_t	*cam_snapto;
+cvar_t	*cam_idealyaw;
+cvar_t	*cam_idealpitch;
+cvar_t	*cam_idealdist;
+cvar_t	*cam_contain;
+
+cvar_t	*c_maxpitch;
+cvar_t	*c_minpitch;
+cvar_t	*c_maxyaw;
+cvar_t	*c_minyaw;
+cvar_t	*c_maxdistance;
+cvar_t	*c_mindistance;
+
+// pitch, yaw, dist
+vec3_t cam_ofs;
+
+
+// In third person
+int cam_thirdperson;
+int cam_mousemove; //true if we are moving the cam with the mouse, False if not
+int iMouseInUse=0;
+int cam_distancemove;
+extern int mouse_x, mouse_y;  //used to determine what the current x and y values are
+int cam_old_mouse_x, cam_old_mouse_y; //holds the last ticks mouse movement
+POINT		cam_mouse;
+//-------------------------------------------------- Local Variables
+
+static kbutton_t cam_pitchup, cam_pitchdown, cam_yawleft, cam_yawright;
+static kbutton_t cam_in, cam_out, cam_move;
+
+//-------------------------------------------------- Prototypes
+
+void CAM_ToThirdPerson(void);
+void CAM_ToFirstPerson(void);
+void CAM_StartDistance(void);
+void CAM_EndDistance(void);
+
+
+//-------------------------------------------------- Local Functions
+
+float MoveToward( float cur, float goal, float maxspeed )
+{
+	if( cur != goal )
+	{
+		if( abs( cur - goal ) > 180.0 )
+		{
+			if( cur < goal )
+				cur += 360.0;
+			else
+				cur -= 360.0;
+		}
+
+		if( cur < goal )
+		{
+			if( cur < goal - 1.0 )
+				cur += ( goal - cur ) / 4.0;
+			else
+				cur = goal;
+		}
+		else
+		{
+			if( cur > goal + 1.0 )
+				cur -= ( cur - goal ) / 4.0;
+			else
+				cur = goal;
+		}
+	}
+
+
+	// bring cur back into range
+	if( cur < 0 )
+		cur += 360.0;
+	else if( cur >= 360 )
+		cur -= 360;
+
+	return cur;
+}
+
+
+//-------------------------------------------------- Gobal Functions
+
+typedef struct
+{
+	vec3_t		boxmins, boxmaxs;// enclose the test object along entire move
+	float		*mins, *maxs;	// size of the moving object
+	vec3_t		mins2, maxs2;	// size when clipping against mosnters
+	float		*start, *end;
+	trace_t		trace;
+	int			type;
+	edict_t		*passedict;
+	qboolean	monsterclip;
+} moveclip_t;
+
+extern trace_t SV_ClipMoveToEntity (edict_t *ent, vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end);
+
+void CL_DLLEXPORT CAM_Think( void )
+{
+	RecClCamThink();
+
+#ifdef HL_CAMERA
+	vec3_t origin;
+	vec3_t ext, pnt, camForward, camRight, camUp;
+	moveclip_t	clip;
+	float dist;
+	vec3_t camAngles;
+	float flSensitivity;
+#ifdef LATER
+	int i;
+#endif
+	vec3_t viewangles;
+
+	switch( (int) cam_command->value )
+	{
+		case CAM_COMMAND_TOTHIRDPERSON:
+			CAM_ToThirdPerson();
+			break;
+
+		case CAM_COMMAND_TOFIRSTPERSON:
+			CAM_ToFirstPerson();
+			break;
+
+		case CAM_COMMAND_NONE:
+		default:
+			break;
+	}
+
+	if( !cam_thirdperson )
+		return;
+	
+#ifdef LATER
+	if ( cam_contain->value )
+	{
+		gEngfuncs.GetClientOrigin( origin );
+		ext[0] = ext[1] = ext[2] = 0.0;
+	}
+#endif
+
+	camAngles[ PITCH ] = cam_idealpitch->value;
+	camAngles[ YAW ] = cam_idealyaw->value;
+	dist = cam_idealdist->value;
+	//
+	//movement of the camera with the mouse
+	//
+	if (cam_mousemove)
+	{
+	    //get windows cursor position
+		GetCursorPos (&cam_mouse);
+		//check for X delta values and adjust accordingly
+		//eventually adjust YAW based on amount of movement
+	  //don't do any movement of the cam using YAW/PITCH if we are zooming in/out the camera	
+	  if (!cam_distancemove)
+	  {
+		
+		//keep the camera within certain limits around the player (ie avoid certain bad viewing angles)  
+		if (cam_mouse.x>gEngfuncs.GetWindowCenterX())
+		{
+			//if ((camAngles[YAW]>=225.0)||(camAngles[YAW]<135.0))
+			if (camAngles[YAW]<c_maxyaw->value)
+			{
+				camAngles[ YAW ] += (CAM_ANGLE_MOVE)*((cam_mouse.x-gEngfuncs.GetWindowCenterX())/2);
+			}
+			if (camAngles[YAW]>c_maxyaw->value)
+			{
+				
+				camAngles[YAW]=c_maxyaw->value;
+			}
+		}
+		else if (cam_mouse.x<gEngfuncs.GetWindowCenterX())
+		{
+			//if ((camAngles[YAW]<=135.0)||(camAngles[YAW]>225.0))
+			if (camAngles[YAW]>c_minyaw->value)
+			{
+			   camAngles[ YAW ] -= (CAM_ANGLE_MOVE)* ((gEngfuncs.GetWindowCenterX()-cam_mouse.x)/2);
+			   	
+			}
+			if (camAngles[YAW]<c_minyaw->value)
+			{
+				camAngles[YAW]=c_minyaw->value;
+				
+			}
+		}
+
+		//check for y delta values and adjust accordingly
+		//eventually adjust PITCH based on amount of movement
+		//also make sure camera is within bounds
+		if (cam_mouse.y>gEngfuncs.GetWindowCenterY())
+		{
+			if(camAngles[PITCH]<c_maxpitch->value)
+			{
+			    camAngles[PITCH] +=(CAM_ANGLE_MOVE)* ((cam_mouse.y-gEngfuncs.GetWindowCenterY())/2);
+			}
+			if (camAngles[PITCH]>c_maxpitch->value)
+			{
+				camAngles[PITCH]=c_maxpitch->value;
+			}
+		}
+		else if (cam_mouse.y<gEngfuncs.GetWindowCenterY())
+		{
+			if (camAngles[PITCH]>c_minpitch->value)
+			{
+			   camAngles[PITCH] -= (CAM_ANGLE_MOVE)*((gEngfuncs.GetWindowCenterY()-cam_mouse.y)/2);
+			}
+			if (camAngles[PITCH]<c_minpitch->value)
+			{
+				camAngles[PITCH]=c_minpitch->value;
+			}
+		}
+
+		//set old mouse coordinates to current mouse coordinates
+		//since we are done with the mouse
+
+		if ( ( flSensitivity = gHUD.GetSensitivity() ) != 0 )
+		{
+			cam_old_mouse_x=cam_mouse.x*flSensitivity;
+			cam_old_mouse_y=cam_mouse.y*flSensitivity;
+		}
+		else
+		{
+			cam_old_mouse_x=cam_mouse.x;
+			cam_old_mouse_y=cam_mouse.y;
+		}
+		SetCursorPos (gEngfuncs.GetWindowCenterX(), gEngfuncs.GetWindowCenterY());
+	  }
+	}
+
+	//Nathan code here
+	if( CL_KeyState( &cam_pitchup ) )
+		camAngles[ PITCH ] += CAM_ANGLE_DELTA;
+	else if( CL_KeyState( &cam_pitchdown ) )
+		camAngles[ PITCH ] -= CAM_ANGLE_DELTA;
+
+	if( CL_KeyState( &cam_yawleft ) )
+		camAngles[ YAW ] -= CAM_ANGLE_DELTA;
+	else if( CL_KeyState( &cam_yawright ) )
+		camAngles[ YAW ] += CAM_ANGLE_DELTA;
+
+	if( CL_KeyState( &cam_in ) )
+	{
+		dist -= CAM_DIST_DELTA;
+		if( dist < CAM_MIN_DIST )
+		{
+			// If we go back into first person, reset the angle
+			camAngles[ PITCH ] = 0;
+			camAngles[ YAW ] = 0;
+			dist = CAM_MIN_DIST;
+		}
+
+	}
+	else if( CL_KeyState( &cam_out ) )
+		dist += CAM_DIST_DELTA;
+
+	if (cam_distancemove)
+	{
+		if (cam_mouse.y>gEngfuncs.GetWindowCenterY())
+		{
+			if(dist<c_maxdistance->value)
+			{
+			    dist +=CAM_DIST_DELTA * ((cam_mouse.y-gEngfuncs.GetWindowCenterY())/2);
+			}
+			if (dist>c_maxdistance->value)
+			{
+				dist=c_maxdistance->value;
+			}
+		}
+		else if (cam_mouse.y<gEngfuncs.GetWindowCenterY())
+		{
+			if (dist>c_mindistance->value)
+			{
+			   dist -= (CAM_DIST_DELTA)*((gEngfuncs.GetWindowCenterY()-cam_mouse.y)/2);
+			}
+			if (dist<c_mindistance->value)
+			{
+				dist=c_mindistance->value;
+			}
+		}
+		//set old mouse coordinates to current mouse coordinates
+		//since we are done with the mouse
+		cam_old_mouse_x=cam_mouse.x*gHUD.GetSensitivity();
+		cam_old_mouse_y=cam_mouse.y*gHUD.GetSensitivity();
+		SetCursorPos (gEngfuncs.GetWindowCenterX(), gEngfuncs.GetWindowCenterY());
+	}
+#ifdef LATER
+	if( cam_contain->value )
+	{
+		// check new ideal
+		VectorCopy( origin, pnt );
+		AngleVectors( camAngles, camForward, camRight, camUp );
+		for (i=0 ; i<3 ; i++)
+			pnt[i] += -dist*camForward[i];
+
+		// check line from r_refdef.vieworg to pnt
+		memset ( &clip, 0, sizeof ( moveclip_t ) );
+		clip.trace = SV_ClipMoveToEntity( sv.edicts, r_refdef.vieworg, ext, ext, pnt );
+		if( clip.trace.fraction == 1.0 )
+		{
+			// update ideal
+			cam_idealpitch->value = camAngles[ PITCH ];
+			cam_idealyaw->value = camAngles[ YAW ];
+			cam_idealdist->value = dist;
+		}
+	}
+	else
+#endif
+	{
+		// update ideal
+		cam_idealpitch->value = camAngles[ PITCH ];
+		cam_idealyaw->value = camAngles[ YAW ];
+		cam_idealdist->value = dist;
+	}
+
+	// Move towards ideal
+	VectorCopy( cam_ofs, camAngles );
+
+	gEngfuncs.GetViewAngles( (float *)viewangles );
+
+	if( cam_snapto->value )
+	{
+		camAngles[ YAW ] = cam_idealyaw->value + viewangles[ YAW ];
+		camAngles[ PITCH ] = cam_idealpitch->value + viewangles[ PITCH ];
+		camAngles[ 2 ] = cam_idealdist->value;
+	}
+	else
+	{
+		if( camAngles[ YAW ] - viewangles[ YAW ] != cam_idealyaw->value )
+			camAngles[ YAW ] = MoveToward( camAngles[ YAW ], cam_idealyaw->value + viewangles[ YAW ], CAM_ANGLE_SPEED );
+
+		if( camAngles[ PITCH ] - viewangles[ PITCH ] != cam_idealpitch->value )
+			camAngles[ PITCH ] = MoveToward( camAngles[ PITCH ], cam_idealpitch->value + viewangles[ PITCH ], CAM_ANGLE_SPEED );
+
+		if( abs( camAngles[ 2 ] - cam_idealdist->value ) < 2.0 )
+			camAngles[ 2 ] = cam_idealdist->value;
+		else
+			camAngles[ 2 ] += ( cam_idealdist->value - camAngles[ 2 ] ) / 4.0;
+	}
+#ifdef LATER
+	if( cam_contain->value )
+	{
+		// Test new position
+		dist = camAngles[ ROLL ];
+		camAngles[ ROLL ] = 0;
+
+		VectorCopy( origin, pnt );
+		AngleVectors( camAngles, camForward, camRight, camUp );
+		for (i=0 ; i<3 ; i++)
+			pnt[i] += -dist*camForward[i];
+
+		// check line from r_refdef.vieworg to pnt
+		memset ( &clip, 0, sizeof ( moveclip_t ) );
+		ext[0] = ext[1] = ext[2] = 0.0;
+		clip.trace = SV_ClipMoveToEntity( sv.edicts, r_refdef.vieworg, ext, ext, pnt );
+		if( clip.trace.fraction != 1.0 )
+			return;
+	}
+#endif
+	cam_ofs[ 0 ] = camAngles[ 0 ];
+	cam_ofs[ 1 ] = camAngles[ 1 ];
+	cam_ofs[ 2 ] = dist;
+
+// HL_CAMERA
+#endif
+}
+
+extern void KeyDown (kbutton_t *b);	// HACK
+extern void KeyUp (kbutton_t *b);	// HACK
+
+void CAM_PitchUpDown(void) { KeyDown( &cam_pitchup ); }
+void CAM_PitchUpUp(void) { KeyUp( &cam_pitchup ); }
+void CAM_PitchDownDown(void) { KeyDown( &cam_pitchdown ); }
+void CAM_PitchDownUp(void) { KeyUp( &cam_pitchdown ); }
+void CAM_YawLeftDown(void) { KeyDown( &cam_yawleft ); }
+void CAM_YawLeftUp(void) { KeyUp( &cam_yawleft ); }
+void CAM_YawRightDown(void) { KeyDown( &cam_yawright ); }
+void CAM_YawRightUp(void) { KeyUp( &cam_yawright ); }
+void CAM_InDown(void) { KeyDown( &cam_in ); }
+void CAM_InUp(void) { KeyUp( &cam_in ); }
+void CAM_OutDown(void) { KeyDown( &cam_out ); }
+void CAM_OutUp(void) { KeyUp( &cam_out ); }
+
+void CAM_ToThirdPerson(void)
+{ 
+	vec3_t viewangles;
+
+#if !defined( DEBUG )
+	if ( gEngfuncs.GetMaxClients() > 1 )
+	{
+		// no thirdperson in multiplayer.
+		return;
+	}
+#endif
+
+	gEngfuncs.GetViewAngles( (float *)viewangles );
+
+	if( !cam_thirdperson )
+	{
+		cam_thirdperson = 1; 
+		
+		cam_ofs[ YAW ] = viewangles[ YAW ]; 
+		cam_ofs[ PITCH ] = viewangles[ PITCH ]; 
+		cam_ofs[ 2 ] = CAM_MIN_DIST; 
+	}
+
+	gEngfuncs.Cvar_SetValue( "cam_command", 0 );
+}
+
+void CAM_ToFirstPerson(void) 
+{ 
+	cam_thirdperson = 0;
+	
+	gEngfuncs.Cvar_SetValue( "cam_command", 0 );
+}
+
+void CAM_ToggleSnapto( void )
+{ 
+	cam_snapto->value = !cam_snapto->value;
+}
+
+void CAM_Toggle( void )
+{
+	int a = 0;
+
+#ifdef DEBUG
+	if(cam_thirdperson)
+	{
+		CAM_ToFirstPerson();
+	}
+	else
+	{
+		CAM_ToThirdPerson();
+	}
+#endif
+}
+
+void CAM_Init( void )
+{
+	gEngfuncs.pfnAddCommand( "+campitchup", CAM_PitchUpDown );
+	gEngfuncs.pfnAddCommand( "-campitchup", CAM_PitchUpUp );
+	gEngfuncs.pfnAddCommand( "+campitchdown", CAM_PitchDownDown );
+	gEngfuncs.pfnAddCommand( "-campitchdown", CAM_PitchDownUp );
+	gEngfuncs.pfnAddCommand( "+camyawleft", CAM_YawLeftDown );
+	gEngfuncs.pfnAddCommand( "-camyawleft", CAM_YawLeftUp );
+	gEngfuncs.pfnAddCommand( "+camyawright", CAM_YawRightDown );
+	gEngfuncs.pfnAddCommand( "-camyawright", CAM_YawRightUp );
+	gEngfuncs.pfnAddCommand( "+camin", CAM_InDown );
+	gEngfuncs.pfnAddCommand( "-camin", CAM_InUp );
+	gEngfuncs.pfnAddCommand( "+camout", CAM_OutDown );
+	gEngfuncs.pfnAddCommand( "-camout", CAM_OutUp );
+	gEngfuncs.pfnAddCommand( "thirdperson", CAM_ToThirdPerson );
+	gEngfuncs.pfnAddCommand( "firstperson", CAM_ToFirstPerson );
+	gEngfuncs.pfnAddCommand( "+cammousemove",CAM_StartMouseMove);
+	gEngfuncs.pfnAddCommand( "-cammousemove",CAM_EndMouseMove);
+	gEngfuncs.pfnAddCommand( "+camdistance", CAM_StartDistance );
+	gEngfuncs.pfnAddCommand( "-camdistance", CAM_EndDistance );
+	gEngfuncs.pfnAddCommand( "snapto", CAM_ToggleSnapto );
+#ifdef DEBUG
+	gEngfuncs.pfnAddCommand( "camtoggle", CAM_Toggle );
+#endif
+
+	cam_command				= gEngfuncs.pfnRegisterVariable ( "cam_command", "0", 0 );	 // tells camera to go to thirdperson
+	cam_snapto				= gEngfuncs.pfnRegisterVariable ( "cam_snapto", "0", 0 );	 // snap to thirdperson view
+	cam_idealyaw			= gEngfuncs.pfnRegisterVariable ( "cam_idealyaw", "90", 0 );	 // thirdperson yaw
+	cam_idealpitch			= gEngfuncs.pfnRegisterVariable ( "cam_idealpitch", "0", 0 );	 // thirperson pitch
+	cam_idealdist			= gEngfuncs.pfnRegisterVariable ( "cam_idealdist", "64", 0 );	 // thirdperson distance
+	cam_contain				= gEngfuncs.pfnRegisterVariable ( "cam_contain", "0", 0 );	// contain camera to world
+
+	c_maxpitch				= gEngfuncs.pfnRegisterVariable ( "c_maxpitch", "90.0", 0 );
+	c_minpitch				= gEngfuncs.pfnRegisterVariable ( "c_minpitch", "0.0", 0 );
+	c_maxyaw				= gEngfuncs.pfnRegisterVariable ( "c_maxyaw",   "135.0", 0 );
+	c_minyaw				= gEngfuncs.pfnRegisterVariable ( "c_minyaw",   "-135.0", 0 );
+	c_maxdistance			= gEngfuncs.pfnRegisterVariable ( "c_maxdistance",   "200.0", 0 );
+	c_mindistance			= gEngfuncs.pfnRegisterVariable ( "c_mindistance",   "30.0", 0 );
+}
+
+void CAM_ClearStates( void )
+{
+	vec3_t viewangles;
+
+	gEngfuncs.GetViewAngles( (float *)viewangles );
+
+	cam_pitchup.state = 0;
+	cam_pitchdown.state = 0;
+	cam_yawleft.state = 0;
+	cam_yawright.state = 0;
+	cam_in.state = 0;
+	cam_out.state = 0;
+
+	cam_thirdperson = 0;
+	cam_command->value = 0;
+	cam_mousemove=0;
+
+	cam_snapto->value = 0;
+	cam_distancemove = 0;
+
+	cam_ofs[ 0 ] = 0.0;
+	cam_ofs[ 1 ] = 0.0;
+	cam_ofs[ 2 ] = CAM_MIN_DIST;
+
+	cam_idealpitch->value = viewangles[ PITCH ];
+	cam_idealyaw->value = viewangles[ YAW ];
+	cam_idealdist->value = CAM_MIN_DIST;
+}
+
+void CAM_StartMouseMove(void)
+{
+	float flSensitivity;
+		
+	//only move the cam with mouse if we are in third person.
+	if (cam_thirdperson)
+	{
+		//set appropriate flags and initialize the old mouse position
+		//variables for mouse camera movement
+		if (!cam_mousemove)
+		{
+			cam_mousemove=1;
+			iMouseInUse=1;
+			GetCursorPos (&cam_mouse);
+
+			if ( ( flSensitivity = gHUD.GetSensitivity() ) != 0 )
+			{
+				cam_old_mouse_x=cam_mouse.x*flSensitivity;
+				cam_old_mouse_y=cam_mouse.y*flSensitivity;
+			}
+			else
+			{
+				cam_old_mouse_x=cam_mouse.x;
+				cam_old_mouse_y=cam_mouse.y;
+			}
+		}
+	}
+	//we are not in 3rd person view..therefore do not allow camera movement
+	else
+	{   
+		cam_mousemove=0;
+		iMouseInUse=0;
+	}
+}
+
+//the key has been released for camera movement
+//tell the engine that mouse camera movement is off
+void CAM_EndMouseMove(void)
+{
+   cam_mousemove=0;
+   iMouseInUse=0;
+}
+
+
+//----------------------------------------------------------
+//routines to start the process of moving the cam in or out 
+//using the mouse
+//----------------------------------------------------------
+void CAM_StartDistance(void)
+{
+	//only move the cam with mouse if we are in third person.
+	if (cam_thirdperson)
+	{
+	  //set appropriate flags and initialize the old mouse position
+	  //variables for mouse camera movement
+	  if (!cam_distancemove)
+	  {
+		  cam_distancemove=1;
+		  cam_mousemove=1;
+		  iMouseInUse=1;
+		  GetCursorPos (&cam_mouse);
+		  cam_old_mouse_x=cam_mouse.x*gHUD.GetSensitivity();
+		  cam_old_mouse_y=cam_mouse.y*gHUD.GetSensitivity();
+	  }
+	}
+	//we are not in 3rd person view..therefore do not allow camera movement
+	else
+	{   
+		cam_distancemove=0;
+		cam_mousemove=0;
+		iMouseInUse=0;
+	}
+}
+
+//the key has been released for camera movement
+//tell the engine that mouse camera movement is off
+void CAM_EndDistance(void)
+{
+   cam_distancemove=0;
+   cam_mousemove=0;
+   iMouseInUse=0;
+}
+
+int CL_DLLEXPORT CL_IsThirdPerson( void )
+{
+	RecClCL_IsThirdPerson();
+	return (cam_thirdperson ? 1 : 0) || (g_iUser1 && (g_iUser2 == gEngfuncs.GetLocalPlayer()->index) );
+}
+
+void CL_DLLEXPORT CL_CameraOffset( float *ofs )
+{
+	RecClCL_GetCameraOffsets(ofs);
+	
+	VectorCopy( cam_ofs, ofs );
+}
\ No newline at end of file
diff --git a/main/source/cl_dll/in_defs.h b/main/source/cl_dll/in_defs.h
new file mode 100644
index 00000000..60d99feb
--- /dev/null
+++ b/main/source/cl_dll/in_defs.h
@@ -0,0 +1,12 @@
+#if !defined( IN_DEFSH )
+#define IN_DEFSH
+#pragma once
+
+// up / down
+#define	PITCH	0
+// left / right
+#define	YAW		1
+// fall over
+#define	ROLL	2 
+
+#endif
\ No newline at end of file
diff --git a/main/source/cl_dll/input.cpp b/main/source/cl_dll/input.cpp
new file mode 100644
index 00000000..1cb43583
--- /dev/null
+++ b/main/source/cl_dll/input.cpp
@@ -0,0 +1,1654 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: input.cpp $
+// $Date: 2002/10/16 02:12:21 $
+//
+//-------------------------------------------------------------------------------
+// $Log: input.cpp,v $
+// Revision 1.28  2002/10/16 02:12:21  Flayra
+// - Valve anti-cheat integrated!
+//
+// Revision 1.27  2002/08/09 00:13:04  Flayra
+// - Removed explicitly allowing specific commands.  I can't remember why this was needed, but it doesn't appear to be anymore.
+//
+// Revision 1.26  2002/08/02 21:39:03  Flayra
+// - Refactored variable names
+//
+// Revision 1.25  2002/07/08 16:13:31  Flayra
+// - Fixed bug where command was able to switch weapons via mousewheel (bug #239)
+//
+//===============================================================================
+// cl.input.c  -- builds an intended movement command to send to the server
+
+//xxxxxx Move bob and pitch drifting code here and other stuff from view if needed
+
+// Quake is a trademark of Id Software, Inc., (c) 1996 Id Software, Inc. All
+// rights reserved.
+#include "hud.h"
+#include "cl_util.h"
+#include "camera.h"
+extern "C"
+{
+#include "kbutton.h"
+}
+#include "cvardef.h"
+#include "usercmd.h"
+#include "const.h"
+#include "camera.h"
+#include "in_defs.h"
+#include "view.h"
+#include <string.h>
+#include <ctype.h>
+#include "engine/keydefs.h"
+
+#include "vgui_TeamFortressViewport.h"
+#include "mod/AvHServerVariables.h"// should we go ahead and just make a SharedVariables.h instead?
+#include "mod/AvHClientVariables.h"
+#include "mod/AvHMessage.h"
+#include "fmod.h"
+#include "mod/AvHScriptManager.h"
+#include "mod/AvHScrollHandler.h"
+#include "mod/AvHCommanderModeHandler.h"
+#include "Util/Mat3.h"
+
+#include "APIProxy.h"
+#include "Exports.h"
+
+extern int g_iAlive;
+
+extern int g_weaponselect;
+extern cl_enginefunc_t gEngfuncs;
+bool gResetViewAngles = false;
+vec3_t gViewAngles;
+extern AvHCommanderModeHandler	gCommanderHandler;
+
+///////////////////////////////
+// Begin Max's Code
+///////////////////////////////
+
+float gPlayerAngles[3]       = { 0, 0, 0 };
+float gTargetPlayerAngles[3] = { 0, 0, 0 };
+float gWorldViewAngles[3] = { 0, 0, 0 };
+
+///////////////////////////////
+// End Max's Code
+///////////////////////////////
+
+// Defined in pm_math.c
+//extern "C" float anglemod( float a );
+float anglemod( float a );
+
+void IN_Init (void);
+void IN_Move ( float frametime, float ioRotationDeltas[3], float ioTranslationDeltas[3]);
+void IN_Shutdown( void );
+void V_Init( void );
+void VectorAngles( const float *forward, float *angles );
+int CL_ButtonBits( int );
+
+// xxx need client dll function to get and clear impuse
+extern cvar_t *in_joystick;
+
+int	in_impulse	= 0;
+int	in_cancel	= 0;
+
+cvar_t	*m_pitch;
+cvar_t	*m_yaw;
+cvar_t	*m_forward;
+cvar_t	*m_side;
+
+cvar_t	*lookstrafe;
+cvar_t	*lookspring;
+//cvar_t	*cl_pitchup;
+//cvar_t	*cl_pitchdown;
+cvar_t	*cl_upspeed;
+cvar_t	*cl_movespeedkey;
+cvar_t	*cl_yawspeed;
+cvar_t	*cl_pitchspeed;
+cvar_t	*cl_anglespeedkey;
+cvar_t	*cl_vsmoothing;
+cvar_t  *cl_autohelp;
+cvar_t  *cl_centerentityid;
+cvar_t  *cl_musicenabled;
+cvar_t	*cl_musicdelay;
+cvar_t  *cl_musicvolume;
+cvar_t  *cl_musicdir;
+cvar_t	*cl_quickselecttime;
+cvar_t	*cl_highdetail;
+cvar_t	*cl_cmhotkeys;
+cvar_t	*cl_forcedefaultfov;
+cvar_t	*cl_dynamiclights;
+cvar_t	*cl_buildmessages;
+cvar_t	*cl_particleinfo;
+
+/*
+===============================================================================
+
+KEY BUTTONS
+
+Continuous button event tracking is complicated by the fact that two different
+input sources (say, mouse button 1 and the control key) can both press the
+same button, but the button should only be released when both of the
+pressing key have been released.
+
+When a key event issues a button command (+forward, +attack, etc), it appends
+its key number as a parameter to the command so it can be matched up with
+the release.
+
+state bit 0 is the current state of the key
+state bit 1 is edge triggered on the up to down transition
+state bit 2 is edge triggered on the down to up transition
+
+===============================================================================
+*/
+
+
+kbutton_t	in_mlook;
+kbutton_t	in_klook;
+kbutton_t	in_jlook;
+kbutton_t	in_left;
+kbutton_t	in_right;
+kbutton_t	in_forward;
+kbutton_t	in_back;
+kbutton_t	in_lookup;
+kbutton_t	in_lookdown;
+kbutton_t	in_moveleft;
+kbutton_t	in_moveright;
+kbutton_t	in_strafe;
+kbutton_t	in_speed;
+kbutton_t	in_use;
+kbutton_t	in_jump;
+kbutton_t	in_attack;
+kbutton_t	in_attack2;
+kbutton_t	in_up;
+kbutton_t	in_down;
+kbutton_t	in_duck;
+kbutton_t	in_reload;
+kbutton_t	in_alt1;
+kbutton_t	in_score;
+kbutton_t	in_break;
+kbutton_t	in_graph;  // Display the netgraph
+
+typedef struct kblist_s
+{
+	struct kblist_s *next;
+	kbutton_t *pkey;
+	char name[32];
+} kblist_t;
+
+kblist_t *g_kbkeys = NULL;
+
+vector< pair <int, string> > g_PrevCmds; 
+
+/*
+============
+KB_ConvertString
+
+Removes references to +use and replaces them with the keyname in the output string.  If
+ a binding is unfound, then the original text is retained.
+NOTE:  Only works for text with +word in it.
+============
+*/
+int KB_ConvertString( char *in, char **ppout )
+{
+	char sz[ 4096 ];
+	char binding[ 64 ];
+	char *p;
+	char *pOut;
+	char *pEnd;
+	const char *pBinding;
+
+	if ( !ppout )
+		return 0;
+
+	*ppout = NULL;
+	p = in;
+	pOut = sz;
+	while ( *p )
+	{
+		if ( *p == '+' )
+		{
+			pEnd = binding;
+			while ( *p && ( isalnum( *p ) || ( pEnd == binding ) ) && ( ( pEnd - binding ) < 63 ) )
+			{
+				*pEnd++ = *p++;
+			}
+
+			*pEnd =  '\0';
+
+			pBinding = NULL;
+			if ( strlen( binding + 1 ) > 0 )
+			{
+				// See if there is a binding for binding?
+				pBinding = gEngfuncs.Key_LookupBinding( binding + 1 );
+			}
+
+			if ( pBinding )
+			{
+				*pOut++ = '[';
+				pEnd = (char *)pBinding;
+			}
+			else
+			{
+				pEnd = binding;
+			}
+
+			while ( *pEnd )
+			{
+				*pOut++ = *pEnd++;
+			}
+
+			if ( pBinding )
+			{
+				*pOut++ = ']';
+			}
+		}
+		else
+		{
+			*pOut++ = *p++;
+		}
+	}
+
+	*pOut = '\0';
+
+	pOut = ( char * )malloc( strlen( sz ) + 1 );
+	strcpy( pOut, sz );
+	*ppout = pOut;
+
+	return 1;
+}
+
+/*
+============
+KB_Find
+
+Allows the engine to get a kbutton_t directly ( so it can check +mlook state, etc ) for saving out to .cfg files
+============
+*/
+struct kbutton_s CL_DLLEXPORT *KB_Find( const char *name )
+{
+	RecClFindKey(name);
+
+	kblist_t *p;
+	p = g_kbkeys;
+	while ( p )
+	{
+		if ( !stricmp( name, p->name ) )
+			return p->pkey;
+
+		p = p->next;
+	}
+	return NULL;
+}
+
+/*
+============
+KB_Add
+
+Add a kbutton_t * to the list of pointers the engine can retrieve via KB_Find
+============
+*/
+void KB_Add( const char *name, kbutton_t *pkb )
+{
+	kblist_t *p;	
+	kbutton_t *kb;
+
+	kb = KB_Find( name );
+	
+	if ( kb )
+		return;
+
+	p = ( kblist_t * )malloc( sizeof( kblist_t ) );
+	memset( p, 0, sizeof( *p ) );
+
+	strcpy( p->name, name );
+	p->pkey = pkb;
+
+	p->next = g_kbkeys;
+	g_kbkeys = p;
+}
+
+/*
+============
+KB_Init
+
+Add kbutton_t definitions that the engine can query if needed
+============
+*/
+void KB_Init( void )
+{
+	g_kbkeys = NULL;
+
+	KB_Add( "in_graph", &in_graph );
+	KB_Add( "in_mlook", &in_mlook );
+	KB_Add( "in_jlook", &in_jlook );
+}
+
+/*
+============
+KB_Shutdown
+
+Clear kblist
+============
+*/
+void KB_Shutdown( void )
+{
+	kblist_t *p, *n;
+	p = g_kbkeys;
+	while ( p )
+	{
+		n = p->next;
+		free( p );
+		p = n;
+	}
+	g_kbkeys = NULL;
+}
+
+void KeyDown (kbutton_t *b);
+void KeyUp (kbutton_t *b);
+
+/*
+============
+KeyDown
+============
+*/
+void KeyDown (kbutton_t *b)
+{
+	int		k;
+	char	*c;
+
+	c = gEngfuncs.Cmd_Argv(1);
+	if (c[0])
+		k = atoi(c);
+	else
+		k = -1;		// typed manually at the console for continuous down
+
+	int theBlockScripts = (int)gHUD.GetServerVariableFloat(kvBlockScripts);
+
+	char *pCmd = gEngfuncs.Cmd_Argv(0);
+
+	if(theBlockScripts && pCmd)
+	{
+		bool bFound = false;
+
+		//Check thier last few commands (this prevents false positives if a player is hits several keys real fast)
+		for (int i = 0; i < g_PrevCmds.size(); i++) 
+		{
+			//Check both the key pressed and the command it executed.
+			if(k == g_PrevCmds[i].first && !strcmp(pCmd, g_PrevCmds[i].second.c_str()))
+			{
+				bFound = true;
+				break;
+			}
+		}
+
+//		//If they used mwheeldown/mwheelup to activate repeating command, make sure they didnt use +attack or +jump to prevent exploits.
+//		if(k == K_MWHEELDOWN || k == K_MWHEELUP && theBlockScripts == 2)
+//		{
+//			if(strstr(pCmd, "+"))//I could also do pCmd[0] == '+', but that could possibly be bypassed.
+//				bFound = false;
+//		}
+		
+
+		if(!bFound 
+			&& strcmp(pCmd, "+mlook") 
+			&& strcmp(pCmd, "+jlook")
+			&& strcmp(pCmd, "+showscores")
+			&& strcmp(pCmd, "+use"))
+		{
+			gEngfuncs.pfnCenterPrint("Scripting is not allowed on this server.");
+			b->down[0] = b->down[1] = 0;
+			b->state = 4;	// impulse up
+			return;
+		}
+	}
+
+	if (k == b->down[0] || k == b->down[1])
+		return;		// repeating key
+	
+	if (!b->down[0])
+		b->down[0] = k;
+	else if (!b->down[1])
+		b->down[1] = k;
+	else
+	{
+		gEngfuncs.Con_DPrintf ("Three keys down for a button '%c' '%c' '%c'!\n", b->down[0], b->down[1], c);
+		return;
+	}
+	
+	if (b->state & 1)
+		return;		// still down
+	b->state |= 1 + 2;	// down + impulse down
+}
+
+/*
+============
+KeyUp
+============
+*/
+void KeyUp (kbutton_t *b)
+{
+	int		k;
+	char	*c;
+
+	c = gEngfuncs.Cmd_Argv(1);
+	if (c[0])
+		k = atoi(c);
+	else
+	{ // typed manually at the console, assume for unsticking, so clear all
+		b->down[0] = b->down[1] = 0;
+		b->state = 4;	// impulse up
+		return;
+	}
+
+	if (b->down[0] == k)
+		b->down[0] = 0;
+	else if (b->down[1] == k)
+		b->down[1] = 0;
+	else
+		return;		// key up without coresponding down (menu pass through)
+	if (b->down[0] || b->down[1])
+	{
+		//Con_Printf ("Keys down for button: '%c' '%c' '%c' (%d,%d,%d)!\n", b->down[0], b->down[1], c, b->down[0], b->down[1], c);
+		return;		// some other key is still holding it down
+	}
+
+	if (!(b->state & 1))
+		return;		// still up (this should not happen)
+
+	b->state &= ~1;		// now up
+	b->state |= 4; 		// impulse up
+}
+
+
+bool AvHContainsBlockedCommands(const char* inInput)
+{
+    if (inInput == NULL)
+    {
+        return false;
+    }
+
+    const char* kBlockedCommand[] =
+        {
+            "exec",
+            "wait",
+            "special",
+            "_special"
+        };
+
+    // Check for a ; indicating multiple commands.
+
+    if (strchr(inInput, ';') != NULL)
+    {
+        return true;
+    }
+
+    // Check if any of the blocked commands are being used.
+
+    const char* theCommandEnd = strpbrk(inInput, " \t");
+    
+    int theCommandLength;
+    
+    if (theCommandEnd == NULL)
+    {
+        theCommandLength = strlen(inInput);
+    }
+    else
+    {
+        theCommandLength = theCommandEnd - inInput;
+    }
+
+    for (int i = 0; i < sizeof(kBlockedCommand) / sizeof(const char*); ++i)
+    {
+        if ((int)strlen(kBlockedCommand[i]) == theCommandLength &&
+            strncmp(inInput, kBlockedCommand[i], theCommandLength) == 0)
+        {
+            return true;
+        }
+	}
+    return false;
+}
+
+/*
+============
+HUD_Key_Event
+
+Return 1 to allow engine to process the key, otherwise, act on it as needed
+============
+*/
+int CL_DLLEXPORT HUD_Key_Event( int down, int keynum, const char *pszCurrentBinding )
+{
+    RecClKeyEvent(down, keynum, pszCurrentBinding);
+
+    // Check to see if the event has any outlawed commands in it.
+    float theBlockScripts = gHUD.GetServerVariableFloat(kvBlockScripts);
+    
+	if (theBlockScripts && AvHContainsBlockedCommands(pszCurrentBinding))
+	{
+		if(down)//voogru: only show when going down.
+			gEngfuncs.pfnCenterPrint("Scripting is not allowed on this server.\n"); 
+		return 0;
+	}
+
+	if(pszCurrentBinding)
+	{
+		if(g_PrevCmds.size() >= 5)
+			g_PrevCmds.erase(g_PrevCmds.begin());//remove the oldest command
+
+		g_PrevCmds.push_back(make_pair(keynum, (string)pszCurrentBinding));
+	}
+
+	int theProcessKeyBinding = 1;
+
+//	char theKeyBinding[256] = "none";
+//	if(pszCurrentBinding)
+//	{
+//		sprintf(theKeyBinding, pszCurrentBinding);
+//	}
+//
+//	char theMessage[512];
+//	sprintf(theMessage, "%s (down: %d, keynum %d)", theKeyBinding, down, keynum);
+//	CenterPrint(theMessage);
+
+	if(gViewPort /*&& gViewPort->IsOptionsMenuVisible()*/)
+	{
+		
+        theProcessKeyBinding = gViewPort->KeyInput(down, keynum, pszCurrentBinding);
+
+		if(pszCurrentBinding && (!strcmp(pszCurrentBinding, "toggleconsole") || !strcmp(pszCurrentBinding, "cancelselect")))
+		{
+			theProcessKeyBinding = 1;
+		}
+	}
+
+
+	// Process topdown commands with precedence first
+	if(theProcessKeyBinding && gHUD.GetInTopDownMode())
+	{
+		if((keynum != 0) && down/*&& pszCurrentBinding*/)
+		{
+			AvHMessageID theMessageID = gHUD.HotKeyHit(keynum);
+			if((theMessageID != MESSAGE_NULL) || (keynum == K_ESCAPE))
+			{
+				// If ESC or cancel was hit, cancel ghost building
+				if((keynum == K_ESCAPE) || (theMessageID == MESSAGE_CANCEL))
+				{
+					gHUD.SetGhostBuildingMode(MESSAGE_NULL);
+				}
+
+				theProcessKeyBinding = 0;
+			}
+			
+//			// Else look for hotkey commands
+//			int thePrefixLength = strlen(kHotKeyPrefix);
+//			if(down && !strncmp(pszCurrentBinding, kHotKeyPrefix, thePrefixLength))
+//			{
+//				// Strip out number, pass it to HUD
+//				char theNumberString[8];
+//				memset(theNumberString, 0, 8);
+//				int theBindingLength = strlen(pszCurrentBinding);
+//				ASSERT(theBindingLength > thePrefixLength);
+//				strncpy(theNumberString, pszCurrentBinding + thePrefixLength, theBindingLength - thePrefixLength);
+//				
+//				int theBuildTech = MakeIntFromString(string(theNumberString));
+//			
+//				gHUD.HotKeyHit(theBuildTech);
+//			
+//				theProcessKeyBinding = 0;
+//			}
+//			else
+//			{
+//				// Look for top down only commands, like scrolling
+//				if(!strcmp("+forward", pszCurrentBinding))
+//				{
+//					AvHScrollHandler::ScrollUp();
+//					theProcessKeyBinding = 0;
+//				}
+//				else if(!strcmp("-forward", pszCurrentBinding))
+//				{
+//					AvHScrollHandler::StopScroll();
+//					theProcessKeyBinding = 0;
+//				}
+//				else if(!strcmp("+back", pszCurrentBinding))
+//				{
+//					AvHScrollHandler::ScrollDown();
+//					theProcessKeyBinding = 0;
+//				}
+//				else if(!strcmp("-back", pszCurrentBinding))
+//				{
+//					AvHScrollHandler::StopScroll();
+//					theProcessKeyBinding = 0;
+//				}
+//				else if(!strcmp("+moveleft", pszCurrentBinding))
+//				{
+//					AvHScrollHandler::ScrollLeft();
+//					theProcessKeyBinding = 0;
+//				}
+//				else if(!strcmp("-moveleft", pszCurrentBinding))
+//				{
+//					AvHScrollHandler::StopScroll();
+//					theProcessKeyBinding = 0;
+//				}
+//				else if(!strcmp("+moveright", pszCurrentBinding))
+//				{
+//					AvHScrollHandler::ScrollRight();
+//					theProcessKeyBinding = 0;
+//				}
+//				else if(!strcmp("-moveright", pszCurrentBinding))
+//				{
+//					AvHScrollHandler::StopScroll();
+//					theProcessKeyBinding = 0;
+//				}
+//			}
+		}
+	}
+
+	if(theProcessKeyBinding)
+	{
+		// Process only a couple keybindings in top down mode
+//		if(!gHUD.GetInTopDownMode() || (pszCurrentBinding && 
+//
+//			// Misc. commands
+//			(!strcmp(pszCurrentBinding, "toggleconsole") || !strcmp(pszCurrentBinding, "cancelselect") || !strcmp(pszCurrentBinding, "+showscores") || !strcmp(pszCurrentBinding, "-showscores") || !strcmp(pszCurrentBinding, "messagemode") || !strcmp(pszCurrentBinding, "messagemode2") || !strcmp(pszCurrentBinding, "snapshot") || !strcmp(pszCurrentBinding, "screenshot") || !strcmp(pszCurrentBinding, "+jump") || !strcmp(pszCurrentBinding, "addbot") || !strcmp(pszCurrentBinding, "+voicerecord") || !strcmp(pszCurrentBinding, "-voicerecord") || 
+//
+//			// Movement commands
+//			!strcmp(pszCurrentBinding, "testevent") /*|| !strcmp(pszCurrentBinding, "invnext") || !strcmp(pszCurrentBinding, "invprev")*/ || !strcmp(pszCurrentBinding, "+moveleft") || !strcmp(pszCurrentBinding, "-moveleft") || !strcmp(pszCurrentBinding, "+moveright") || !strcmp(pszCurrentBinding, "-moveright") || !strcmp(pszCurrentBinding, "+moveup")  || !strcmp(pszCurrentBinding, "-moveup") || !strcmp(pszCurrentBinding, "+movedown") || !strcmp(pszCurrentBinding, "-movedown") ||
+//		
+//			// For selecting groups
+//			!strcmp(pszCurrentBinding, "slot1") || !strcmp(pszCurrentBinding, "slot2") || !strcmp(pszCurrentBinding, "slot3") || !strcmp(pszCurrentBinding, "slot4") || !strcmp(pszCurrentBinding, "slot5") || 
+//		
+//			// For creating groups
+//			!strcmp(pszCurrentBinding, "+duck") || !strcmp(pszCurrentBinding, "-duck") ||
+//		
+//			// For testing ease
+//			!strcmp(pszCurrentBinding, "givepoints")
+//		
+//			)))
+//		{
+			if (gViewPort)
+				theProcessKeyBinding = gViewPort->KeyInput(down, keynum, pszCurrentBinding);
+		
+//			// Don't
+//			if(!strcmp(pszCurrentBinding, "+jump") && gHUD.GetInTopDownMode())
+//			{
+//				gHUD.GotoAlert();
+//			}
+
+//		}
+	}
+	
+	return theProcessKeyBinding;
+}
+
+void IN_BreakDown( void ) { KeyDown( &in_break );};
+void IN_BreakUp( void ) { KeyUp( &in_break ); };
+void IN_KLookDown (void) {KeyDown(&in_klook);}
+void IN_KLookUp (void) {KeyUp(&in_klook);}
+void IN_JLookDown (void) {KeyDown(&in_jlook);}
+void IN_JLookUp (void) {KeyUp(&in_jlook);}
+void IN_MLookDown (void) {KeyDown(&in_mlook);}
+void IN_UpDown(void) {KeyDown(&in_up);}
+void IN_UpUp(void) {KeyUp(&in_up);}
+void IN_DownDown(void) {KeyDown(&in_down);}
+void IN_DownUp(void) {KeyUp(&in_down);}
+void IN_LeftDown(void) {KeyDown(&in_left);}
+void IN_LeftUp(void) {KeyUp(&in_left);}
+void IN_RightDown(void) {KeyDown(&in_right);}
+void IN_RightUp(void) {KeyUp(&in_right);}
+
+void IN_ForwardDown(void)
+{
+	KeyDown(&in_forward);
+	gHUD.m_Spectator.HandleButtonsDown( IN_FORWARD );
+}
+
+void IN_ForwardUp(void)
+{
+	KeyUp(&in_forward);
+	gHUD.m_Spectator.HandleButtonsUp( IN_FORWARD );
+}
+
+void IN_BackDown(void)
+{
+	KeyDown(&in_back);
+	gHUD.m_Spectator.HandleButtonsDown( IN_BACK );
+}
+
+void IN_BackUp(void)
+{
+	KeyUp(&in_back);
+	gHUD.m_Spectator.HandleButtonsUp( IN_BACK );
+}
+void IN_LookupDown(void) {KeyDown(&in_lookup);}
+void IN_LookupUp(void) {KeyUp(&in_lookup);}
+void IN_LookdownDown(void) {KeyDown(&in_lookdown);}
+void IN_LookdownUp(void) {KeyUp(&in_lookdown);}
+void IN_MoveleftDown(void)
+{
+	KeyDown(&in_moveleft);
+	gHUD.m_Spectator.HandleButtonsDown( IN_MOVELEFT );
+}
+
+void IN_MoveleftUp(void)
+{
+	KeyUp(&in_moveleft);
+	gHUD.m_Spectator.HandleButtonsUp( IN_MOVELEFT );
+}
+
+void IN_MoverightDown(void)
+{
+	KeyDown(&in_moveright);
+	gHUD.m_Spectator.HandleButtonsDown( IN_MOVERIGHT );
+}
+
+void IN_MoverightUp(void)
+{
+	KeyUp(&in_moveright);
+	gHUD.m_Spectator.HandleButtonsUp( IN_MOVERIGHT );
+}
+void IN_SpeedDown(void) {KeyDown(&in_speed);}
+void IN_SpeedUp(void) {KeyUp(&in_speed);}
+void IN_StrafeDown(void) {KeyDown(&in_strafe);}
+void IN_StrafeUp(void) {KeyUp(&in_strafe);}
+
+// needs capture by hud/vgui also
+extern void __CmdFunc_InputPlayerSpecial(void);
+
+void IN_Attack2Down(void) 
+{
+	KeyDown(&in_attack2);
+	__CmdFunc_InputPlayerSpecial();
+	//gHUD.m_Spectator.HandleButtonsDown( IN_ATTACK2 );
+}
+
+void IN_Attack2Up(void) {KeyUp(&in_attack2);}
+void IN_UseDown (void)
+{
+	KeyDown(&in_use);
+	gHUD.m_Spectator.HandleButtonsDown( IN_USE );
+}
+void IN_UseUp (void) {KeyUp(&in_use);}
+void IN_JumpDown (void)
+{
+	KeyDown(&in_jump);
+
+	if(gHUD.GetInTopDownMode())
+	{
+		//gHUD.GotoAlert();
+	}
+	
+	gHUD.m_Spectator.HandleButtonsDown( IN_JUMP );
+
+}
+
+void IN_JumpUp (void) 
+{
+    KeyUp(&in_jump);
+    gHUD.m_Spectator.HandleButtonsUp( IN_JUMP );
+}
+
+void IN_DuckDown(void)
+{
+	KeyDown(&in_duck);
+	gHUD.m_Spectator.HandleButtonsDown( IN_DUCK );
+}
+
+void IN_DuckUp(void) {KeyUp(&in_duck);}
+void IN_ReloadDown(void) {KeyDown(&in_reload);}
+void IN_ReloadUp(void) {KeyUp(&in_reload);}
+void IN_Alt1Down(void) {KeyDown(&in_alt1);}
+void IN_Alt1Up(void) {KeyUp(&in_alt1);}
+void IN_GraphDown(void) {KeyDown(&in_graph);}
+void IN_GraphUp(void) {KeyUp(&in_graph);}
+
+void IN_AttackDown(void)
+{
+	KeyDown( &in_attack );
+	gHUD.m_Spectator.HandleButtonsDown( IN_ATTACK );
+}
+
+void IN_AttackUp(void)
+{
+	KeyUp( &in_attack );
+	in_cancel = 0;
+}
+
+// Special handling
+void IN_Cancel(void)
+{
+	in_cancel = 1;
+}
+
+void IN_Impulse (void)
+{
+	in_impulse = atoi( gEngfuncs.Cmd_Argv(1) );
+}
+
+void IN_ScoreDown(void)
+{
+	KeyDown(&in_score);
+
+	if ( gViewPort )
+	{
+		//if(gHUD.SwitchUIMode(SCOREBOARD_MODE))
+		//{
+			gViewPort->ShowScoreBoard();
+		//}
+	}
+}
+
+void IN_ScoreUp(void)
+{
+	KeyUp(&in_score);
+
+	// Removed because it was getting called and hiding mouse <<< cgc >>>
+	if ( gViewPort )
+	{
+		//if(gHUD.SwitchUIMode(MAIN_MODE))
+		//{
+			gViewPort->HideScoreBoard();
+		//}
+	}
+}
+
+void IN_MLookUp (void)
+{
+	KeyUp( &in_mlook );
+	if ( !( in_mlook.state & 1 ) && lookspring->value )
+	{
+		V_StartPitchDrift();
+	}
+}
+
+/*
+===============
+CL_KeyState
+
+Returns 0.25 if a key was pressed and released during the frame,
+0.5 if it was pressed and held
+0 if held then released, and
+1.0 if held for the entire time
+===============
+*/
+float CL_KeyState (kbutton_t *key)
+{
+	float		val = 0.0;
+	int			impulsedown, impulseup, down;
+	
+	impulsedown = key->state & 2;
+	impulseup	= key->state & 4;
+	down		= key->state & 1;
+	
+	if ( impulsedown && !impulseup )
+	{
+		// pressed and held this frame?
+		val = down ? 0.5 : 0.0;
+	}
+
+	if ( impulseup && !impulsedown )
+	{
+		// released this frame?
+		val = down ? 0.0 : 0.0;
+	}
+
+	if ( !impulsedown && !impulseup )
+	{
+		// held the entire frame?
+		val = down ? 1.0 : 0.0;
+	}
+
+	if ( impulsedown && impulseup )
+	{
+		if ( down )
+		{
+			// released and re-pressed this frame
+			val = 0.75;	
+		}
+		else
+		{
+			// pressed and released this frame
+			val = 0.25;	
+		}
+	}
+
+	// clear impulses
+	key->state &= 1;		
+	return val;
+}
+
+/*
+================
+CL_AdjustAngles
+
+Moves the local angle positions
+================
+*/
+void CL_AdjustAngles ( float frametime, float *viewangles )
+{
+	float	speed;
+	float	up, down;
+	
+	if (in_speed.state & 1)
+	{
+		speed = frametime * cl_anglespeedkey->value;
+	}
+	else
+	{
+		speed = frametime;
+	}
+
+	if (!(in_strafe.state & 1))
+	{
+		viewangles[YAW] -= speed*cl_yawspeed->value*CL_KeyState (&in_right);
+		viewangles[YAW] += speed*cl_yawspeed->value*CL_KeyState (&in_left);
+		viewangles[YAW] = anglemod(viewangles[YAW]);
+	}
+	if (in_klook.state & 1)
+	{
+		V_StopPitchDrift ();
+		viewangles[PITCH] -= speed*cl_pitchspeed->value * CL_KeyState (&in_forward);
+		viewangles[PITCH] += speed*cl_pitchspeed->value * CL_KeyState (&in_back);
+	}
+	
+	up = CL_KeyState (&in_lookup);
+	down = CL_KeyState(&in_lookdown);
+	
+	viewangles[PITCH] -= speed*cl_pitchspeed->value * up;
+	viewangles[PITCH] += speed*cl_pitchspeed->value * down;
+
+	if (up || down)
+		V_StopPitchDrift ();
+		
+	if (viewangles[PITCH] > 89)
+		viewangles[PITCH] = 89;
+	if (viewangles[PITCH] < -89)
+		viewangles[PITCH] = -89;
+
+	if (viewangles[ROLL] > 50)
+		viewangles[ROLL] = 50;
+	if (viewangles[ROLL] < -50)
+		viewangles[ROLL] = -50;
+}
+
+/*
+================
+CL_CreateMove
+
+Send the intended movement message to the server
+if active == 1 then we are 1) not playing back demos ( where our commands are ignored ) and
+2 ) we have finished signing on to server
+================
+*/
+void CL_DLLEXPORT CL_CreateMove ( float frametime, struct usercmd_s *cmd, int active )
+{	
+	RecClCL_CreateMove(frametime, cmd, active);
+
+	float spd;
+	vec3_t viewangles;
+	static vec3_t oldangles;
+
+	if ( active && (!gViewPort || !gViewPort->IsOptionsMenuVisible()) /*&& !gHUD.GetShowingMap()*/)
+	{
+		int theButtonState = CL_ButtonBits( 1 );
+
+        memset (cmd, 0, sizeof(*cmd));
+
+		float theRotationDeltas[3] = {0,0,0};
+		float theTranslationDeltas[3] = {0,0,0};
+
+		IN_Move(frametime,theRotationDeltas,theTranslationDeltas);
+
+		if(gResetViewAngles)
+		{
+			VectorCopy(gViewAngles,viewangles);
+			gResetViewAngles = false;
+		}
+		else
+		{
+			gEngfuncs.GetViewAngles( (float *)viewangles );
+		}
+		VectorAdd(viewangles,theRotationDeltas,viewangles);
+		CL_AdjustAngles ( frametime, viewangles );
+
+#ifdef SKULK_VIEW_ROTATION
+		//note : this code uses an older view angle tracking system 
+		//and won't compile without changes
+		cl_entity_t* ent = gEngfuncs.GetLocalPlayer();
+		if (ent->curstate.iuser3 == AVH_USER3_ALIEN_PLAYER1)
+		{
+
+			// Transform the view angles from the local space of the entity into
+			// the world space.
+
+			Mat3 objectMatrix(gPlayerAngles);
+			Mat3 viewMatrix(gPlayerViewAngles);
+
+			(objectMatrix * viewMatrix).GetEulerAngles(viewangles);
+
+			// Since we've updated the local coordinate frame to align with the view,
+			// reset the local view angles.
+
+			gPlayerViewAngles[YAW]  = 90;
+			gPlayerViewAngles[ROLL] = 0;
+		
+		}
+		else
+#endif
+
+		gEngfuncs.SetViewAngles( (float *)viewangles );
+		VectorCopy (viewangles,gWorldViewAngles);
+
+		// If we're in topdown mode
+		bool theProcessedMove = false;
+		bool theIsSendingSpecialEvent = false;
+		bool theOverrideImpulse = false;
+		float theWorldX, theWorldY;
+		int theScriptImpulse = 0;
+
+		AvHMessageID theAlienAbility = MESSAGE_NULL;
+		AvHMessageID theGroupMessage = MESSAGE_NULL;
+
+		//int theUpgradeVar = gEngfuncs.GetLocalPlayer()->curstate.iuser4;
+		//bool theIsParalyzed = GetHasUpgrade(theUpgradeVar, PLAYER_PARALYZED);
+		if(AvHScriptManager::Instance()->GetClientMove(theButtonState, theScriptImpulse))
+		{
+			if(theScriptImpulse)
+			{
+				theOverrideImpulse = true;
+			}
+			//theProcessedMove = true;
+			
+			// TODO: Pass theButtonState to override all CL_KeyState() calls
+		}
+		else if(gHUD.GetInTopDownMode())
+		{
+			cmd->upmove = cmd->sidemove = cmd->forwardmove = 0;
+
+			// If a button was JUST pressed or released
+			vec3_t theMouseNormPos;
+			AvHMessageID theTechEvent = MESSAGE_NULL;
+			if(gCommanderHandler.GetMoveToWorldPosition(theWorldX, theWorldY))
+			{
+				// Commander wants to scroll to an area of the mini-map
+				cmd->impulse = COMMANDER_MOVETO;
+				cmd->upmove = theWorldX/kWorldPosNetworkConstant;
+				cmd->sidemove = theWorldY/kWorldPosNetworkConstant;
+				gCommanderHandler.ClearMoveToPosition();
+				gHUD.ClearTrackingEntity();
+				
+				theIsSendingSpecialEvent = true;
+				theProcessedMove = true;
+			}
+			else if(gCommanderHandler.GetDefaultOrderPosition(theWorldX, theWorldY))
+			{
+				// Commander wants to scroll to an area of the mini-map
+				cmd->impulse = COMMANDER_DEFAULTORDER;
+				cmd->upmove = theWorldX/kWorldPosNetworkConstant;
+				cmd->sidemove = theWorldY/kWorldPosNetworkConstant;
+				gCommanderHandler.ClearDefaultOrderPosition();
+				gHUD.ClearTrackingEntity();
+				
+				theIsSendingSpecialEvent = true;
+				theProcessedMove = true;
+			}
+			else if(gHUD.GetAndClearTechEvent(theTechEvent))
+			{
+				cmd->impulse = theTechEvent;
+				theProcessedMove = true;
+				theIsSendingSpecialEvent = true;
+				gHUD.ClearTrackingEntity();
+
+			}
+			// else scroll
+			else
+			{
+				// Scroll the view if the HUD tells us to, otherwise use normal key presses
+				int theScrollX = 0, theScrollY = 0, theScrollZ = 0;
+				gHUD.GetAndClearTopDownScrollAmount(theScrollX, theScrollY, theScrollZ);
+				
+				if(theScrollX || theScrollY || theScrollZ)
+				{
+					// Commander move speed
+					float kCommanderMoveSpeed = 1000;					
+					cmd->upmove += kCommanderMoveSpeed * theScrollY;
+					cmd->sidemove += kCommanderMoveSpeed * theScrollX;
+					cmd->forwardmove += kCommanderMoveSpeed * theScrollZ;
+					if(theScrollZ != 0)
+					{
+						int a = 0;
+					}
+					//cmd->forwardmove += 0;//cl_forwardspeed->value * theScrollZ;
+
+					cmd->impulse = COMMANDER_SCROLL;
+					theOverrideImpulse = true;
+
+					gHUD.ClearTrackingEntity();
+
+					//theIsSendingSpecialEvent = true;
+					theProcessedMove = true;
+				}
+				else if(gHUD.GetAndClearGroupEvent(theGroupMessage))
+				{
+					cmd->impulse = theGroupMessage;
+					theIsSendingSpecialEvent = true;
+					theProcessedMove = true;
+					
+					gHUD.SetLastHotkeySelectionEvent(theGroupMessage);
+				}
+//				else if(gHUD.GetTrackingEntity() > 0)
+//				{
+//					int theTrackingEntity = gHUD.GetTrackingEntity();
+//					cmd->upmove = theTrackingEntity*kHotKeyNetworkFactor;
+//					cmd->impulse = COMMANDER_TRACKENTITY;
+//					
+//					theIsSendingSpecialEvent = true;
+//					theProcessedMove = true;
+//				}
+                else if(in_impulse != 0)
+                {
+                    bool theProcessImpulse = false;
+                    switch(in_impulse)
+                    {
+                    case COMMANDER_SELECTALL:
+                    case COMMANDER_NEXTIDLE:
+                    case COMMANDER_NEXTAMMO:
+                    case COMMANDER_NEXTHEALTH:
+                        theProcessImpulse = true;
+                        break;
+                    }
+
+                    if(theProcessImpulse)
+                    {
+                        cmd->impulse = in_impulse;
+                        in_impulse = 0;
+
+                        theProcessedMove = true;
+                        theIsSendingSpecialEvent = true;
+                    }
+                }
+
+				if(!theProcessedMove && gHUD.GetAndClearSelectionEvent(theMouseNormPos, theTechEvent))
+				{
+					// Store world position x,y in upmove,sidemove 
+					cmd->upmove = theMouseNormPos.x*kSelectionNetworkConstant;
+					cmd->sidemove = theMouseNormPos.y*kSelectionNetworkConstant;
+					cmd->forwardmove = theMouseNormPos.z*kSelectionNetworkConstant;
+					
+					// Set impulse indicating this
+					//cmd->impulse = COMMANDER_MOUSECOORD;
+					
+					// This could be COMMANDER_MOUSECOORD or BUILD_TURRET or one of the other BUILD_ events
+					// They are all sent the same way
+					cmd->impulse = theTechEvent;
+					
+					// Order mode isn't currently used but may be in the future
+					//cmd->weaponselect = gHUD.GetOrderMode();
+					
+					// Set buttons.  Attack gets turned off when we're in mouse mode (apparently)
+					// so we need to set the buttons manually
+					cmd->buttons = theButtonState;
+					if(gHUD.GetMouseOneDown())
+					{
+						cmd->buttons |= IN_ATTACK;
+					}
+					if(gHUD.GetMouseTwoDown())
+					{
+						cmd->buttons |= IN_ATTACK2;
+					}
+					
+					gHUD.ClearTrackingEntity();
+
+					theIsSendingSpecialEvent = true;
+					theProcessedMove = true;
+				}
+			}
+		}
+		else if(gHUD.GetAndClearAlienAbility(theAlienAbility))
+		{
+			cmd->impulse = theAlienAbility;
+			
+			// Added by mmcguire.
+			// 255 signifies that the impulse came from us and not from the console.
+			cmd->weaponselect = 255; 
+			
+			theProcessedMove = true;
+			theIsSendingSpecialEvent = true;
+
+		}
+
+		// else process move normally
+		if(!theProcessedMove)
+		{
+			if ( in_strafe.state & 1 )
+			{
+				cmd->sidemove += kSideSpeed * CL_KeyState (&in_right);
+				cmd->sidemove -= kSideSpeed * CL_KeyState (&in_left);
+			}
+			
+			cmd->sidemove += kSideSpeed * CL_KeyState (&in_moveright);
+			cmd->sidemove -= kSideSpeed * CL_KeyState (&in_moveleft);
+			
+			cmd->upmove += cl_upspeed->value * CL_KeyState (&in_up);
+			cmd->upmove -= cl_upspeed->value * CL_KeyState (&in_down);
+			
+			if ( !(in_klook.state & 1 ) )
+			{	
+				cmd->forwardmove += kForwardSpeed * CL_KeyState (&in_forward);
+				cmd->forwardmove -= kBackSpeed * CL_KeyState (&in_back);
+			}	
+		}
+		
+		if(!theIsSendingSpecialEvent)
+		{
+			// adjust for speed key
+			if ( in_speed.state & 1 )
+			{
+				cmd->forwardmove *= cl_movespeedkey->value;
+				cmd->sidemove *= cl_movespeedkey->value;
+				cmd->upmove *= cl_movespeedkey->value;
+			}
+			
+			// clip to maxspeed
+			spd = gEngfuncs.GetClientMaxspeed();
+
+			if ( spd != 0.0 )
+			{
+				// scale the 3 speeds so that the total velocity is not > cl.maxspeed
+				float fmov = sqrt( (cmd->forwardmove*cmd->forwardmove) + (cmd->sidemove*cmd->sidemove) + (cmd->upmove*cmd->upmove) );
+				
+				if ( fmov > spd )
+				{
+					float fratio = spd / fmov;
+					cmd->forwardmove *= fratio;
+					cmd->sidemove *= fratio;
+					cmd->upmove *= fratio;
+				}
+			}
+
+			// Allow mice and other controllers to add their inputs
+			cmd->forwardmove += theTranslationDeltas[0];
+			cmd->sidemove += theTranslationDeltas[1];
+			cmd->upmove += theTranslationDeltas[2];
+			
+			if(!theOverrideImpulse)
+			{
+				cmd->impulse = in_impulse;
+				in_impulse = 0;
+			}
+			
+			cmd->weaponselect = g_weaponselect;
+			g_weaponselect = 0;
+			
+			//
+			// set button and flag bits
+			//
+			cmd->buttons = theButtonState;
+
+			// If they're in a modal dialog, or we're stunned, ignore the attack button.
+			int theLocalUpgrades = gHUD.GetLocalUpgrades();
+			if( GetClientVoiceMgr()->IsInSquelchMode() )
+			{
+				cmd->buttons &= ~IN_ATTACK;
+			}
+			
+			// Using joystick?
+			if ( in_joystick->value )
+			{
+				if ( cmd->forwardmove > 0 )
+				{
+					cmd->buttons |= IN_FORWARD;
+				}
+				else if ( cmd->forwardmove < 0 )
+				{
+					cmd->buttons |= IN_BACK;
+				}
+			}
+		}
+	}
+
+    ///////////////////////////////
+	// Begin Max's Code
+	///////////////////////////////		
+
+	// If the entity is a Skulk then transform the move from local space to
+    // world space.
+
+
+#ifdef SKULK_VIEW_ROTATION	
+    cl_entity_t* ent = gEngfuncs.GetLocalPlayer();
+	if (ent->curstate.iuser3 == AVH_USER3_ALIEN_PLAYER1 && cl_rotateview->value != 0)
+	{
+
+        vec3_t forward;
+        vec3_t right;
+        vec3_t up;
+
+        AngleVectors(gWorldViewAngles, forward, right, up);
+
+        VectorScale(forward, cmd->forwardmove, forward);
+        VectorScale(right, cmd->sidemove, right);
+        VectorScale(up, cmd->upmove, up);
+
+        vec3_t normalForward;
+        vec3_t normalRight;
+        vec3_t normalUp;
+        
+        AngleVectors(ent->angles, normalForward, normalRight, normalUp);
+        
+        cmd->forwardmove = DotProduct(normalForward, forward) +
+                           DotProduct(normalForward, right) +
+                           DotProduct(normalForward, up);
+
+        cmd->sidemove    = DotProduct(normalRight, forward) +
+                           DotProduct(normalRight, right) +
+                           DotProduct(normalRight, up);
+     
+        cmd->upmove      = DotProduct(normalUp, forward) +
+                           DotProduct(normalUp, right) +
+                           DotProduct(normalUp, up);
+
+	}
+
+#endif
+
+	///////////////////////////////
+	// End Max's Code
+	///////////////////////////////		
+	
+	gEngfuncs.GetViewAngles( (float *)viewangles );
+
+	// Set current view angles but not if frozen (this still allows you to rotate in first-person, but player model won't change)
+	int theUser4 = gHUD.GetLocalUpgrades();
+	bool theIsFrozen = GetHasUpgrade(theUser4, MASK_PLAYER_STUNNED) || GetHasUpgrade(theUser4, MASK_ALIEN_EMBRYO);
+
+	if ( g_iAlive && !theIsFrozen)
+	{
+		VectorCopy( viewangles, cmd->viewangles );
+		VectorCopy( viewangles, oldangles );
+	}
+	else
+	{
+		VectorCopy( oldangles, cmd->viewangles );
+	}
+}
+
+/*
+============
+CL_IsDead
+
+Returns 1 if health is <= 0
+============
+*/
+int	CL_IsDead( void )
+{
+	return ( gHUD.m_Health.m_iHealth <= 0 ) ? 1 : 0;
+}
+
+/*
+============
+CL_ButtonBits
+
+Returns appropriate button info for keyboard and mouse state
+Set bResetState to 1 to clear old state info
+============
+*/
+int CL_ButtonBits( int bResetState )
+{
+	int bits = 0;
+
+	if ( in_attack.state & 3 )
+	{
+		bits |= IN_ATTACK;
+	}
+	
+	if (in_duck.state & 3)
+	{
+		bits |= IN_DUCK;
+	}
+ 
+	if (in_jump.state & 3)
+	{
+		bits |= IN_JUMP;
+	}
+
+	if ( in_forward.state & 3 )
+	{
+		bits |= IN_FORWARD;
+	}
+	
+	if (in_back.state & 3)
+	{
+		bits |= IN_BACK;
+	}
+
+	if (in_use.state & 3)
+	{
+		bits |= IN_USE;
+	}
+
+	if (in_cancel)
+	{
+		bits |= IN_CANCEL;
+	}
+
+	if ( in_left.state & 3 )
+	{
+		bits |= IN_LEFT;
+	}
+	
+	if (in_right.state & 3)
+	{
+		bits |= IN_RIGHT;
+	}
+	
+	if ( in_moveleft.state & 3 )
+	{
+		bits |= IN_MOVELEFT;
+	}
+	
+	if (in_moveright.state & 3)
+	{
+		bits |= IN_MOVERIGHT;
+	}
+
+	if (in_attack2.state & 3)
+	{
+		bits |= IN_ATTACK2;
+	}
+
+	if (in_reload.state & 3)
+	{
+		bits |= IN_RELOAD;
+	}
+
+	if (in_alt1.state & 3)
+	{
+		bits |= IN_ALT1;
+	}
+
+	if ( in_score.state & 3 )
+	{
+		bits |= IN_SCORE;
+	}
+
+	// Dead or in intermission? Shore scoreboard, too
+	if ( CL_IsDead() || gHUD.m_iIntermission )
+	{
+		bits |= IN_SCORE;
+	}
+
+	if ( bResetState )
+	{
+		in_attack.state &= ~2;
+		in_duck.state &= ~2;
+		in_jump.state &= ~2;
+		in_forward.state &= ~2;
+		in_back.state &= ~2;
+		in_use.state &= ~2;
+		in_left.state &= ~2;
+		in_right.state &= ~2;
+		in_moveleft.state &= ~2;
+		in_moveright.state &= ~2;
+		in_attack2.state &= ~2;
+		in_reload.state &= ~2;
+		in_alt1.state &= ~2;
+		in_score.state &= ~2;
+	}
+
+	return bits;
+}
+
+/*
+============
+CL_ResetButtonBits
+
+============
+*/
+void CL_ResetButtonBits( int bits )
+{
+	int bitsNew = CL_ButtonBits( 0 ) ^ bits;
+
+	// Has the attack button been changed
+	if ( bitsNew & IN_ATTACK )
+	{
+		// Was it pressed? or let go?
+		if ( bits & IN_ATTACK )
+		{
+			KeyDown( &in_attack );
+		}
+		else
+		{
+			// totally clear state
+			in_attack.state &= ~7;
+		}
+	}
+}
+
+/*
+============
+InitInput
+============
+*/
+void InitInput (void)
+{
+	gEngfuncs.pfnAddCommand ("+moveup",IN_UpDown);
+	gEngfuncs.pfnAddCommand ("-moveup",IN_UpUp);
+	gEngfuncs.pfnAddCommand ("+movedown",IN_DownDown);
+	gEngfuncs.pfnAddCommand ("-movedown",IN_DownUp);
+	gEngfuncs.pfnAddCommand ("+left",IN_LeftDown);
+	gEngfuncs.pfnAddCommand ("-left",IN_LeftUp);
+	gEngfuncs.pfnAddCommand ("+right",IN_RightDown);
+	gEngfuncs.pfnAddCommand ("-right",IN_RightUp);
+	gEngfuncs.pfnAddCommand ("+forward",IN_ForwardDown);
+	gEngfuncs.pfnAddCommand ("-forward",IN_ForwardUp);
+	gEngfuncs.pfnAddCommand ("+back",IN_BackDown);
+	gEngfuncs.pfnAddCommand ("-back",IN_BackUp);
+	gEngfuncs.pfnAddCommand ("+lookup", IN_LookupDown);
+	gEngfuncs.pfnAddCommand ("-lookup", IN_LookupUp);
+	gEngfuncs.pfnAddCommand ("+lookdown", IN_LookdownDown);
+	gEngfuncs.pfnAddCommand ("-lookdown", IN_LookdownUp);
+	gEngfuncs.pfnAddCommand ("+strafe", IN_StrafeDown);
+	gEngfuncs.pfnAddCommand ("-strafe", IN_StrafeUp);
+	gEngfuncs.pfnAddCommand ("+moveleft", IN_MoveleftDown);
+	gEngfuncs.pfnAddCommand ("-moveleft", IN_MoveleftUp);
+	gEngfuncs.pfnAddCommand ("+moveright", IN_MoverightDown);
+	gEngfuncs.pfnAddCommand ("-moveright", IN_MoverightUp);
+	gEngfuncs.pfnAddCommand ("+speed", IN_SpeedDown);
+	gEngfuncs.pfnAddCommand ("-speed", IN_SpeedUp);
+	gEngfuncs.pfnAddCommand ("+attack", IN_AttackDown);
+	gEngfuncs.pfnAddCommand ("-attack", IN_AttackUp);
+	gEngfuncs.pfnAddCommand ("+attack2", IN_Attack2Down);
+	gEngfuncs.pfnAddCommand ("-attack2", IN_Attack2Up);
+	gEngfuncs.pfnAddCommand ("+use", IN_UseDown);
+	gEngfuncs.pfnAddCommand ("-use", IN_UseUp);
+	gEngfuncs.pfnAddCommand ("+jump", IN_JumpDown);
+	gEngfuncs.pfnAddCommand ("-jump", IN_JumpUp);
+	gEngfuncs.pfnAddCommand ("impulse", IN_Impulse);
+	gEngfuncs.pfnAddCommand ("+klook", IN_KLookDown);
+	gEngfuncs.pfnAddCommand ("-klook", IN_KLookUp);
+	gEngfuncs.pfnAddCommand ("+mlook", IN_MLookDown);
+	gEngfuncs.pfnAddCommand ("-mlook", IN_MLookUp);
+	gEngfuncs.pfnAddCommand ("+jlook", IN_JLookDown);
+	gEngfuncs.pfnAddCommand ("-jlook", IN_JLookUp);
+	gEngfuncs.pfnAddCommand ("+duck", IN_DuckDown);
+	gEngfuncs.pfnAddCommand ("-duck", IN_DuckUp);
+	gEngfuncs.pfnAddCommand ("+reload", IN_ReloadDown);
+	gEngfuncs.pfnAddCommand ("-reload", IN_ReloadUp);
+	gEngfuncs.pfnAddCommand ("+alt1", IN_Alt1Down);
+	gEngfuncs.pfnAddCommand ("-alt1", IN_Alt1Up);
+	gEngfuncs.pfnAddCommand ("+score", IN_ScoreDown);
+	gEngfuncs.pfnAddCommand ("-score", IN_ScoreUp);
+	gEngfuncs.pfnAddCommand ("+showscores", IN_ScoreDown);
+	gEngfuncs.pfnAddCommand ("-showscores", IN_ScoreUp);
+	gEngfuncs.pfnAddCommand ("+graph", IN_GraphDown);
+	gEngfuncs.pfnAddCommand ("-graph", IN_GraphUp);
+	gEngfuncs.pfnAddCommand ("+break",IN_BreakDown);
+	gEngfuncs.pfnAddCommand ("-break",IN_BreakUp);
+
+	lookstrafe			= gEngfuncs.pfnRegisterVariable ( "lookstrafe", "0", FCVAR_ARCHIVE );
+	lookspring			= gEngfuncs.pfnRegisterVariable ( "lookspring", "0", FCVAR_ARCHIVE );
+	cl_anglespeedkey	= gEngfuncs.pfnRegisterVariable ( "cl_anglespeedkey", "0.67", 0 );
+	cl_yawspeed			= gEngfuncs.pfnRegisterVariable ( "cl_yawspeed", "210", 0 );
+	cl_pitchspeed		= gEngfuncs.pfnRegisterVariable ( "cl_pitchspeed", "225", 0 );
+	cl_upspeed			= gEngfuncs.pfnRegisterVariable ( "cl_upspeed", "320", 0 );
+	cl_movespeedkey		= gEngfuncs.pfnRegisterVariable ( "cl_movespeedkey", "0.3", 0 );
+	//cl_pitchup			= gEngfuncs.pfnRegisterVariable ( "cl_pitchup", "89", 0 );
+	//cl_pitchdown		= gEngfuncs.pfnRegisterVariable ( "cl_pitchdown", "89", 0 );
+
+	cl_vsmoothing		= gEngfuncs.pfnRegisterVariable ( "cl_vsmoothing", "0.05", FCVAR_ARCHIVE );
+
+	m_pitch			    = gEngfuncs.pfnRegisterVariable ( "m_pitch","0.022", FCVAR_ARCHIVE );
+	m_yaw				= gEngfuncs.pfnRegisterVariable ( "m_yaw","0.022", FCVAR_ARCHIVE );
+	m_forward			= gEngfuncs.pfnRegisterVariable ( "m_forward","1", FCVAR_ARCHIVE );
+	m_side				= gEngfuncs.pfnRegisterVariable ( "m_side","0.8", FCVAR_ARCHIVE );
+
+	cl_autohelp			= gEngfuncs.pfnRegisterVariable ( kvAutoHelp, "1.0", FCVAR_ARCHIVE );
+	cl_centerentityid	= gEngfuncs.pfnRegisterVariable ( kvCenterEntityID, "0.0", FCVAR_ARCHIVE );
+	cl_musicenabled		= gEngfuncs.pfnRegisterVariable ( kvMusicEnabled, "1.0", FCVAR_ARCHIVE );
+	cl_musicvolume		= gEngfuncs.pfnRegisterVariable ( kvMusicVolume, "155", FCVAR_ARCHIVE );
+	cl_musicdir			= gEngfuncs.pfnRegisterVariable ( kvMusicDirectory, "", FCVAR_ARCHIVE);
+	cl_musicdelay		= gEngfuncs.pfnRegisterVariable ( kvMusicDelay, "90", FCVAR_ARCHIVE);
+	cl_forcedefaultfov	= gEngfuncs.pfnRegisterVariable ( kvForceDefaultFOV, "0", FCVAR_ARCHIVE );
+	cl_dynamiclights	= gEngfuncs.pfnRegisterVariable ( kvDynamicLights, "1", FCVAR_ARCHIVE );
+	cl_buildmessages	= gEngfuncs.pfnRegisterVariable ( kvBuildMessages, "1", FCVAR_ARCHIVE);
+	cl_quickselecttime	= gEngfuncs.pfnRegisterVariable ( kvQuickSelectTime, ".15", FCVAR_ARCHIVE );
+	cl_highdetail		= gEngfuncs.pfnRegisterVariable ( kvHighDetail, "1", FCVAR_ARCHIVE );
+	cl_cmhotkeys		= gEngfuncs.pfnRegisterVariable ( kvCMHotkeys, "qwerasdfzxcv", FCVAR_ARCHIVE );
+	cl_forcedefaultfov	= gEngfuncs.pfnRegisterVariable ( kvForceDefaultFOV, "0", FCVAR_ARCHIVE );
+	cl_particleinfo		= gEngfuncs.pfnRegisterVariable ( kvParticleInfo, "0", FCVAR_ARCHIVE );
+
+	// Initialize third person camera controls.
+	CAM_Init();
+	// Initialize inputs
+	IN_Init();
+	// Initialize keyboard
+	KB_Init();
+	// Initialize view system
+	V_Init();
+}
+
+/*
+============
+ShutdownInput
+============
+*/
+void ShutdownInput (void)
+{
+	IN_Shutdown();
+	KB_Shutdown();
+}
+
+void CL_DLLEXPORT HUD_Shutdown( void )
+{
+	RecClShutdown();
+
+	ShutdownInput();
+
+	gHUD.Shutdown();
+}
diff --git a/main/source/cl_dll/inputw32.cpp b/main/source/cl_dll/inputw32.cpp
new file mode 100644
index 00000000..ad082523
--- /dev/null
+++ b/main/source/cl_dll/inputw32.cpp
@@ -0,0 +1,1031 @@
+// in_win.c -- windows 95 mouse and joystick code
+// 02/21/97 JCB Added extended DirectInput code to support external controllers.
+
+#include "hud.h"
+#include "cl_util.h"
+#include "camera.h"
+#include "kbutton.h"
+#include "cvardef.h"
+#include "usercmd.h"
+#include "const.h"
+#include "camera.h"
+#include "in_defs.h"
+#include "../engine/keydefs.h"
+#include "view.h"
+#include "windows.h"
+#include "mod/ChatPanel.h"
+
+#include "APIProxy.h"
+#include "Exports.h"
+
+#define MOUSE_BUTTON_COUNT 5
+
+// Set this to 1 to show mouse cursor.  Experimental
+int	g_iVisibleMouse = 0;
+
+extern cl_enginefunc_t gEngfuncs;
+
+extern int iMouseInUse;
+
+extern kbutton_t	in_strafe;
+extern kbutton_t	in_mlook;
+extern kbutton_t	in_speed;
+extern kbutton_t	in_jlook;
+
+extern cvar_t	*m_pitch;
+extern cvar_t	*m_yaw;
+extern cvar_t	*m_forward;
+extern cvar_t	*m_side;
+
+extern cvar_t *lookstrafe;
+extern cvar_t *lookspring;
+extern cvar_t *cl_yawspeed;
+extern cvar_t *cl_pitchspeed;
+extern cvar_t *cl_movespeedkey;
+
+// mouse variables
+cvar_t		*m_filter;
+cvar_t		*sensitivity;
+
+int			mouse_buttons;
+int			mouse_oldbuttonstate;
+POINT		current_pos;
+int			mouse_x, mouse_y, old_mouse_x, old_mouse_y, mx_accum, my_accum;
+
+static int	restore_spi;
+static int	originalmouseparms[3], newmouseparms[3] = {0, 0, 1};
+static int	mouseactive;
+int			mouseinitialized;
+static int	mouseparmsvalid;
+static int	mouseshowtoggle = 1;
+
+HHOOK gKeyboardHook = NULL;
+
+///////////////////////////////
+// Begin Max's Code
+///////////////////////////////		
+
+extern float gPlayerViewAngles[3];
+
+///////////////////////////////
+// End Max's Code
+///////////////////////////////		
+
+// joystick defines and variables
+// where should defines be moved?
+#define JOY_ABSOLUTE_AXIS	0x00000000		// control like a joystick
+#define JOY_RELATIVE_AXIS	0x00000010		// control like a mouse, spinner, trackball
+#define	JOY_MAX_AXES		6				// X, Y, Z, R, U, V
+#define JOY_AXIS_X			0
+#define JOY_AXIS_Y			1
+#define JOY_AXIS_Z			2
+#define JOY_AXIS_R			3
+#define JOY_AXIS_U			4
+#define JOY_AXIS_V			5
+
+enum _ControlList
+{
+	AxisNada = 0,
+	AxisForward,
+	AxisLook,
+	AxisSide,
+	AxisTurn
+};
+
+DWORD dwAxisFlags[JOY_MAX_AXES] =
+{
+	JOY_RETURNX,
+	JOY_RETURNY,
+	JOY_RETURNZ,
+	JOY_RETURNR,
+	JOY_RETURNU,
+	JOY_RETURNV
+};
+
+DWORD	dwAxisMap[ JOY_MAX_AXES ];
+DWORD	dwControlMap[ JOY_MAX_AXES ];
+PDWORD	pdwRawValue[ JOY_MAX_AXES ];
+
+// none of these cvars are saved over a session
+// this means that advanced controller configuration needs to be executed
+// each time.  this avoids any problems with getting back to a default usage
+// or when changing from one controller to another.  this way at least something
+// works.
+cvar_t	*in_joystick;
+cvar_t	*joy_name;
+cvar_t	*joy_advanced;
+cvar_t	*joy_advaxisx;
+cvar_t	*joy_advaxisy;
+cvar_t	*joy_advaxisz;
+cvar_t	*joy_advaxisr;
+cvar_t	*joy_advaxisu;
+cvar_t	*joy_advaxisv;
+cvar_t	*joy_forwardthreshold;
+cvar_t	*joy_sidethreshold;
+cvar_t	*joy_pitchthreshold;
+cvar_t	*joy_yawthreshold;
+cvar_t	*joy_forwardsensitivity;
+cvar_t	*joy_sidesensitivity;
+cvar_t	*joy_pitchsensitivity;
+cvar_t	*joy_yawsensitivity;
+cvar_t	*joy_wwhack1;
+cvar_t	*joy_wwhack2;
+
+int			joy_avail, joy_advancedinit, joy_haspov;
+DWORD		joy_oldbuttonstate, joy_oldpovstate;
+
+int			joy_id;
+DWORD		joy_flags;
+DWORD		joy_numbuttons;
+
+static JOYINFOEX	ji;
+
+/*
+===========
+Force_CenterView_f
+===========
+*/
+void Force_CenterView_f (void)
+{
+	vec3_t viewangles;
+
+	if (!iMouseInUse)
+	{
+		gEngfuncs.GetViewAngles( (float *)viewangles );
+	    viewangles[PITCH] = 0;
+		gEngfuncs.SetViewAngles( (float *)viewangles );
+	}
+}
+
+bool gLostFocus     = true;
+bool gSteamUIActive = true;
+
+/*
+===========
+IN_ActivateMouse
+===========
+*/
+void CL_DLLEXPORT IN_ActivateMouse (void)
+{
+    
+    RecClIN_ActivateMouse();
+
+    if (gLostFocus)
+    {
+        gLostFocus = false;
+    }
+    else
+    {
+        
+        gSteamUIActive = false;
+
+        int count;
+        
+        do
+        {
+            count = ShowCursor(FALSE);
+        }
+        while (count >= 0);
+
+    }
+
+    if (!gSteamUIActive)
+    {
+        
+        if (mouseinitialized)
+	    {
+		    if (mouseparmsvalid)
+            {
+			    restore_spi = SystemParametersInfo (SPI_SETMOUSE, 0, newmouseparms, 0);
+            }
+		    mouseactive = 1;
+	    }
+        
+        gHUD.OnDeactivateSteamUI();
+        
+    }
+
+}
+
+/*
+===========
+IN_DeactivateMouse
+===========
+*/
+void CL_DLLEXPORT IN_DeactivateMouse (void)
+{
+
+    RecClIN_DeactivateMouse();
+
+    if (GetActiveWindow() != GetFocus())
+    {
+        gLostFocus = true;
+        gHUD.OnLostFocus();
+    }
+    else
+    {
+
+        gSteamUIActive = true;
+    
+        int count;
+        
+        do
+        {
+            count = ShowCursor(TRUE);
+        }
+        while (count < 0);
+    
+    }
+
+	if (mouseinitialized)
+	{
+		if (restore_spi)
+        {
+			SystemParametersInfo (SPI_SETMOUSE, 0, originalmouseparms, 0);
+        }
+
+		mouseactive = 0;
+	}
+
+    if (gSteamUIActive)
+    {
+        gHUD.OnActivateSteamUI();
+    }
+
+}
+
+/*
+===========
+IN_StartupMouse
+===========
+*/
+void IN_StartupMouse (void)
+{
+	if ( gEngfuncs.CheckParm ("-nomouse", NULL ) ) 
+		return; 
+
+	mouseinitialized = 1;
+	mouseparmsvalid = SystemParametersInfo (SPI_GETMOUSE, 0, originalmouseparms, 0);
+
+	if (mouseparmsvalid)
+	{
+		if ( gEngfuncs.CheckParm ("-noforcemspd", NULL ) ) 
+			newmouseparms[2] = originalmouseparms[2];
+
+		if ( gEngfuncs.CheckParm ("-noforcemaccel", NULL ) ) 
+		{
+			newmouseparms[0] = originalmouseparms[0];
+			newmouseparms[1] = originalmouseparms[1];
+		}
+
+		if ( gEngfuncs.CheckParm ("-noforcemparms", NULL ) ) 
+		{
+			newmouseparms[0] = originalmouseparms[0];
+			newmouseparms[1] = originalmouseparms[1];
+			newmouseparms[2] = originalmouseparms[2];
+		}
+	}
+
+	mouse_buttons = MOUSE_BUTTON_COUNT;
+
+}
+
+/*
+===========
+IN_GetMousePos
+
+Ask for mouse position from engine
+===========
+*/
+void IN_GetMousePos( int *mx, int *my )
+{
+	gEngfuncs.GetMousePosition( mx, my );
+}
+
+/*
+===========
+IN_ResetMouse
+
+FIXME: Call through to engine?
+===========
+*/
+void IN_ResetMouse( void )
+{
+	SetCursorPos ( gEngfuncs.GetWindowCenterX(), gEngfuncs.GetWindowCenterY() );	
+}
+
+/*
+===========
+IN_MouseEvent
+===========
+*/
+void CL_DLLEXPORT IN_MouseEvent (int mstate)
+{
+	RecClIN_MouseEvent(mstate);
+
+	int		i;
+
+	if ( iMouseInUse || g_iVisibleMouse )
+		return;
+
+	// perform button actions
+	for (i=0 ; i<mouse_buttons ; i++)
+	{
+		if ( (mstate & (1<<i)) &&
+			!(mouse_oldbuttonstate & (1<<i)) )
+		{
+			gEngfuncs.Key_Event (K_MOUSE1 + i, 1);
+		}
+
+		if ( !(mstate & (1<<i)) &&
+			(mouse_oldbuttonstate & (1<<i)) )
+		{
+			gEngfuncs.Key_Event (K_MOUSE1 + i, 0);
+		}
+	}	
+	
+	mouse_oldbuttonstate = mstate;
+}
+
+/*
+===========
+IN_MouseMove
+===========
+*/
+void IN_MouseMove ( float frametime, float ioRotationDeltas[3], float ioTranslationDeltas[3])
+{
+	int		mx, my;
+
+	if ( in_mlook.state & 1)
+	{
+		V_StopPitchDrift ();
+	}
+
+	//jjb - this disbles normal mouse control if the user is trying to 
+	//      move the camera, or if the mouse cursor is visible or if we're in intermission
+	if ( !iMouseInUse && !g_iVisibleMouse && !gHUD.m_iIntermission )
+	{
+
+		GetCursorPos (&current_pos);
+
+		mx = current_pos.x - gEngfuncs.GetWindowCenterX() + mx_accum;
+		my = current_pos.y - gEngfuncs.GetWindowCenterY() + my_accum;
+
+		mx_accum = 0;
+		my_accum = 0;
+
+		if (m_filter->value)
+		{
+			mouse_x = (mx + old_mouse_x) * 0.5;
+			mouse_y = (my + old_mouse_y) * 0.5;
+		}
+		else
+		{
+			mouse_x = mx;
+			mouse_y = my;
+		}
+
+		old_mouse_x = mx;
+		old_mouse_y = my;
+
+		if ( gHUD.GetSensitivity() != 0 )
+		{
+			mouse_x *= gHUD.GetSensitivity();
+			mouse_y *= gHUD.GetSensitivity();
+		}
+		else
+		{
+			mouse_x *= sensitivity->value;
+			mouse_y *= sensitivity->value;
+		}
+
+		// add mouse X/Y movement to cmd
+		if ( (in_strafe.state & 1) || (lookstrafe->value && (in_mlook.state & 1) ))
+			ioTranslationDeltas[1] += m_side->value * mouse_x;
+		else
+			ioRotationDeltas[YAW] -= m_yaw->value * mouse_x;
+
+		if ( (in_mlook.state & 1) && !(in_strafe.state & 1))
+		{
+			ioRotationDeltas[PITCH] += m_pitch->value * mouse_y;
+		}
+		else
+		{
+			if ((in_strafe.state & 1) && gEngfuncs.IsNoClipping() )
+			{
+				ioTranslationDeltas[2] -= m_forward->value * mouse_y;
+			}
+			else
+			{
+				ioTranslationDeltas[0] -= m_forward->value * mouse_y;
+			}
+		}
+
+		// if the mouse has moved, force it to the center, so there's room to move
+		if ( mx || my )
+		{
+			IN_ResetMouse();
+		}
+	}
+
+/*
+//#define TRACE_TEST
+#if defined( TRACE_TEST )
+	{
+		int mx, my;
+		void V_Move( int mx, int my );
+		IN_GetMousePos( &mx, &my );
+		V_Move( mx, my );
+	}
+#endif
+*/
+}
+
+/*
+===========
+IN_Accumulate
+===========
+*/
+void CL_DLLEXPORT IN_Accumulate (void)
+{
+	RecClIN_Accumulate();
+
+	//only accumulate mouse if we are not moving the camera with the mouse
+	if ( !iMouseInUse && !g_iVisibleMouse )
+	{
+	    if (mouseactive)
+	    {
+			GetCursorPos (&current_pos);
+
+			mx_accum += current_pos.x - gEngfuncs.GetWindowCenterX();
+			my_accum += current_pos.y - gEngfuncs.GetWindowCenterY();
+
+			// force the mouse to the center, so there's room to move
+			IN_ResetMouse();
+		}
+	}
+
+}
+
+/*
+===================
+IN_ClearStates
+===================
+*/
+void CL_DLLEXPORT IN_ClearStates (void)
+{
+	RecClIN_ClearStates();
+
+	if ( !mouseactive )
+		return;
+
+	mx_accum = 0;
+	my_accum = 0;
+	mouse_oldbuttonstate = 0;
+}
+
+/* 
+=============== 
+IN_StartupJoystick 
+=============== 
+*/  
+void IN_StartupJoystick (void) 
+{ 
+	int			numdevs;
+	JOYCAPS		jc;
+	MMRESULT	mmr;
+ 
+ 	// assume no joystick
+	joy_avail = 0; 
+
+	// abort startup if user requests no joystick
+	if ( gEngfuncs.CheckParm ("-nojoy", NULL ) ) 
+		return; 
+ 
+	// verify joystick driver is present
+	if ((numdevs = joyGetNumDevs ()) == 0)
+	{
+		gEngfuncs.Con_DPrintf ("joystick not found -- driver not present\n\n");
+		return;
+	}
+
+	// cycle through the joystick ids for the first valid one
+	for (joy_id=0 ; joy_id<numdevs ; joy_id++)
+	{
+		memset (&ji, 0, sizeof(ji));
+		ji.dwSize = sizeof(ji);
+		ji.dwFlags = JOY_RETURNCENTERED;
+
+		if ((mmr = joyGetPosEx (joy_id, &ji)) == JOYERR_NOERROR)
+			break;
+	} 
+
+	// abort startup if we didn't find a valid joystick
+	if (mmr != JOYERR_NOERROR)
+	{
+		gEngfuncs.Con_DPrintf ("joystick not found -- no valid joysticks (%x)\n\n", mmr);
+		return;
+	}
+
+	// get the capabilities of the selected joystick
+	// abort startup if command fails
+	memset (&jc, 0, sizeof(jc));
+	if ((mmr = joyGetDevCaps (joy_id, &jc, sizeof(jc))) != JOYERR_NOERROR)
+	{
+		gEngfuncs.Con_DPrintf ("joystick not found -- invalid joystick capabilities (%x)\n\n", mmr); 
+		return;
+	}
+
+	// save the joystick's number of buttons and POV status
+	joy_numbuttons = jc.wNumButtons;
+	joy_haspov = jc.wCaps & JOYCAPS_HASPOV;
+
+	// old button and POV states default to no buttons pressed
+	joy_oldbuttonstate = joy_oldpovstate = 0;
+
+	// mark the joystick as available and advanced initialization not completed
+	// this is needed as cvars are not available during initialization
+	gEngfuncs.Con_Printf ("joystick found\n\n", mmr); 
+	joy_avail = 1; 
+	joy_advancedinit = 0;
+}
+
+
+/*
+===========
+RawValuePointer
+===========
+*/
+PDWORD RawValuePointer (int axis)
+{
+	switch (axis)
+	{
+	case JOY_AXIS_X:
+		return &ji.dwXpos;
+	case JOY_AXIS_Y:
+		return &ji.dwYpos;
+	case JOY_AXIS_Z:
+		return &ji.dwZpos;
+	case JOY_AXIS_R:
+		return &ji.dwRpos;
+	case JOY_AXIS_U:
+		return &ji.dwUpos;
+	case JOY_AXIS_V:
+		return &ji.dwVpos;
+	}
+	// FIX: need to do some kind of error
+	return &ji.dwXpos;
+}
+
+
+/*
+===========
+Joy_AdvancedUpdate_f
+===========
+*/
+void Joy_AdvancedUpdate_f (void)
+{
+
+	// called once by IN_ReadJoystick and by user whenever an update is needed
+	// cvars are now available
+	int	i;
+	DWORD dwTemp;
+
+	// initialize all the maps
+	for (i = 0; i < JOY_MAX_AXES; i++)
+	{
+		dwAxisMap[i] = AxisNada;
+		dwControlMap[i] = JOY_ABSOLUTE_AXIS;
+		pdwRawValue[i] = RawValuePointer(i);
+	}
+
+	if( joy_advanced->value == 0.0)
+	{
+		// default joystick initialization
+		// 2 axes only with joystick control
+		dwAxisMap[JOY_AXIS_X] = AxisTurn;
+		// dwControlMap[JOY_AXIS_X] = JOY_ABSOLUTE_AXIS;
+		dwAxisMap[JOY_AXIS_Y] = AxisForward;
+		// dwControlMap[JOY_AXIS_Y] = JOY_ABSOLUTE_AXIS;
+	}
+	else
+	{
+		if ( strcmp ( joy_name->string, "joystick") != 0 )
+		{
+			// notify user of advanced controller
+			gEngfuncs.Con_Printf ("\n%s configured\n\n", joy_name->string);
+		}
+
+		// advanced initialization here
+		// data supplied by user via joy_axisn cvars
+		dwTemp = (DWORD) joy_advaxisx->value;
+		dwAxisMap[JOY_AXIS_X] = dwTemp & 0x0000000f;
+		dwControlMap[JOY_AXIS_X] = dwTemp & JOY_RELATIVE_AXIS;
+		dwTemp = (DWORD) joy_advaxisy->value;
+		dwAxisMap[JOY_AXIS_Y] = dwTemp & 0x0000000f;
+		dwControlMap[JOY_AXIS_Y] = dwTemp & JOY_RELATIVE_AXIS;
+		dwTemp = (DWORD) joy_advaxisz->value;
+		dwAxisMap[JOY_AXIS_Z] = dwTemp & 0x0000000f;
+		dwControlMap[JOY_AXIS_Z] = dwTemp & JOY_RELATIVE_AXIS;
+		dwTemp = (DWORD) joy_advaxisr->value;
+		dwAxisMap[JOY_AXIS_R] = dwTemp & 0x0000000f;
+		dwControlMap[JOY_AXIS_R] = dwTemp & JOY_RELATIVE_AXIS;
+		dwTemp = (DWORD) joy_advaxisu->value;
+		dwAxisMap[JOY_AXIS_U] = dwTemp & 0x0000000f;
+		dwControlMap[JOY_AXIS_U] = dwTemp & JOY_RELATIVE_AXIS;
+		dwTemp = (DWORD) joy_advaxisv->value;
+		dwAxisMap[JOY_AXIS_V] = dwTemp & 0x0000000f;
+		dwControlMap[JOY_AXIS_V] = dwTemp & JOY_RELATIVE_AXIS;
+	}
+
+	// compute the axes to collect from DirectInput
+	joy_flags = JOY_RETURNCENTERED | JOY_RETURNBUTTONS | JOY_RETURNPOV;
+	for (i = 0; i < JOY_MAX_AXES; i++)
+	{
+		if (dwAxisMap[i] != AxisNada)
+		{
+			joy_flags |= dwAxisFlags[i];
+		}
+	}
+}
+
+
+/*
+===========
+IN_Commands
+===========
+*/
+void IN_Commands (void)
+{
+	int		i, key_index;
+	DWORD	buttonstate, povstate;
+
+	if (!joy_avail)
+	{
+		return;
+	}
+
+	
+	// loop through the joystick buttons
+	// key a joystick event or auxillary event for higher number buttons for each state change
+	buttonstate = ji.dwButtons;
+	for (i=0 ; i < (int)joy_numbuttons ; i++)
+	{
+		if ( (buttonstate & (1<<i)) && !(joy_oldbuttonstate & (1<<i)) )
+		{
+			key_index = (i < 4) ? K_JOY1 : K_AUX1;
+			gEngfuncs.Key_Event (key_index + i, 1);
+		}
+
+		if ( !(buttonstate & (1<<i)) && (joy_oldbuttonstate & (1<<i)) )
+		{
+			key_index = (i < 4) ? K_JOY1 : K_AUX1;
+			gEngfuncs.Key_Event (key_index + i, 0);
+		}
+	}
+	joy_oldbuttonstate = buttonstate;
+
+	if (joy_haspov)
+	{
+		// convert POV information into 4 bits of state information
+		// this avoids any potential problems related to moving from one
+		// direction to another without going through the center position
+		povstate = 0;
+		if(ji.dwPOV != JOY_POVCENTERED)
+		{
+			if (ji.dwPOV == JOY_POVFORWARD)
+				povstate |= 0x01;
+			if (ji.dwPOV == JOY_POVRIGHT)
+				povstate |= 0x02;
+			if (ji.dwPOV == JOY_POVBACKWARD)
+				povstate |= 0x04;
+			if (ji.dwPOV == JOY_POVLEFT)
+				povstate |= 0x08;
+		}
+		// determine which bits have changed and key an auxillary event for each change
+		for (i=0 ; i < 4 ; i++)
+		{
+			if ( (povstate & (1<<i)) && !(joy_oldpovstate & (1<<i)) )
+			{
+				gEngfuncs.Key_Event (K_AUX29 + i, 1);
+			}
+
+			if ( !(povstate & (1<<i)) && (joy_oldpovstate & (1<<i)) )
+			{
+				gEngfuncs.Key_Event (K_AUX29 + i, 0);
+			}
+		}
+		joy_oldpovstate = povstate;
+	}
+}
+
+
+/* 
+=============== 
+IN_ReadJoystick
+=============== 
+*/  
+int IN_ReadJoystick (void)
+{
+
+	memset (&ji, 0, sizeof(ji));
+	ji.dwSize = sizeof(ji);
+	ji.dwFlags = joy_flags;
+
+	if (joyGetPosEx (joy_id, &ji) == JOYERR_NOERROR)
+	{
+		// this is a hack -- there is a bug in the Logitech WingMan Warrior DirectInput Driver
+		// rather than having 32768 be the zero point, they have the zero point at 32668
+		// go figure -- anyway, now we get the full resolution out of the device
+		if (joy_wwhack1->value != 0.0)
+		{
+			ji.dwUpos += 100;
+		}
+		return 1;
+	}
+	else
+	{
+		// read error occurred
+		// turning off the joystick seems too harsh for 1 read error,\
+		// but what should be done?
+		// Con_Printf ("IN_ReadJoystick: no response\n");
+		// joy_avail = 0;
+		return 0;
+	}
+}
+
+
+/*
+===========
+IN_JoyMove
+===========
+*/
+void IN_JoyMove ( float frametime, float ioRotationDeltas[3], float ioTranslationDeltas[3])
+{
+	float	speed, aspeed;
+	float	fAxisValue, fTemp;
+	int		i;
+	
+	// complete initialization if first time in
+	// this is needed as cvars are not available at initialization time
+	if( joy_advancedinit != 1 )
+	{
+		Joy_AdvancedUpdate_f();
+		joy_advancedinit = 1;
+	}
+
+	// verify joystick is available and that the user wants to use it
+	if (!joy_avail || !in_joystick->value)
+	{
+		return; 
+	}
+ 
+	// collect the joystick data, if possible
+	if (IN_ReadJoystick () != 1)
+	{
+		return;
+	}
+
+	if (in_speed.state & 1)
+		speed = cl_movespeedkey->value;
+	else
+		speed = 1;
+
+	aspeed = speed * frametime;
+
+	// loop through the axes
+	for (i = 0; i < JOY_MAX_AXES; i++)
+	{
+		// get the floating point zero-centered, potentially-inverted data for the current axis
+		fAxisValue = (float) *pdwRawValue[i];
+		// move centerpoint to zero
+		fAxisValue -= 32768.0;
+
+		if (joy_wwhack2->value != 0.0)
+		{
+			if (dwAxisMap[i] == AxisTurn)
+			{
+				// this is a special formula for the Logitech WingMan Warrior
+				// y=ax^b; where a = 300 and b = 1.3
+				// also x values are in increments of 800 (so this is factored out)
+				// then bounds check result to level out excessively high spin rates
+				fTemp = 300.0 * pow(abs(fAxisValue) / 800.0, 1.3);
+				if (fTemp > 14000.0)
+					fTemp = 14000.0;
+				// restore direction information
+				fAxisValue = (fAxisValue > 0.0) ? fTemp : -fTemp;
+			}
+		}
+
+		// convert range from -32768..32767 to -1..1 
+		fAxisValue /= 32768.0;
+
+		switch (dwAxisMap[i])
+		{
+		case AxisForward:
+			if ((joy_advanced->value == 0.0) && (in_jlook.state & 1))
+			{
+				// user wants forward control to become look control
+				if (fabs(fAxisValue) > joy_pitchthreshold->value)
+				{		
+					// if mouse invert is on, invert the joystick pitch value
+					// only absolute control support here (joy_advanced is 0)
+					if (m_pitch->value < 0.0)
+					{
+						ioRotationDeltas[PITCH] -= (fAxisValue * joy_pitchsensitivity->value) * aspeed * cl_pitchspeed->value;
+					}
+					else
+					{
+						ioRotationDeltas[PITCH] += (fAxisValue * joy_pitchsensitivity->value) * aspeed * cl_pitchspeed->value;
+					}
+					V_StopPitchDrift();
+				}
+				else
+				{
+					// no pitch movement
+					// disable pitch return-to-center unless requested by user
+					// *** this code can be removed when the lookspring bug is fixed
+					// *** the bug always has the lookspring feature on
+					if(lookspring->value == 0.0)
+					{
+						V_StopPitchDrift();
+					}
+				}
+			}
+			else
+			{
+				// user wants forward control to be forward control
+				if (fabs(fAxisValue) > joy_forwardthreshold->value)
+				{
+					ioTranslationDeltas[0] += (fAxisValue * joy_forwardsensitivity->value) * speed * kForwardSpeed;
+				}
+			}
+			break;
+
+		case AxisSide:
+			if (fabs(fAxisValue) > joy_sidethreshold->value)
+			{
+				ioTranslationDeltas[1] += (fAxisValue * joy_sidesensitivity->value) * speed * kSideSpeed;
+			}
+			break;
+
+		case AxisTurn:
+			if ((in_strafe.state & 1) || (lookstrafe->value && (in_jlook.state & 1)))
+			{
+				// user wants turn control to become side control
+				if (fabs(fAxisValue) > joy_sidethreshold->value)
+				{
+					ioTranslationDeltas[1] -= (fAxisValue * joy_sidesensitivity->value) * speed * kSideSpeed;
+				}
+			}
+			else
+			{
+				// user wants turn control to be turn control
+				if (fabs(fAxisValue) > joy_yawthreshold->value)
+				{
+					if(dwControlMap[i] == JOY_ABSOLUTE_AXIS)
+					{
+						ioRotationDeltas[YAW] += (fAxisValue * joy_yawsensitivity->value) * aspeed * cl_yawspeed->value;
+					}
+					else
+					{
+						ioRotationDeltas[YAW] += (fAxisValue * joy_yawsensitivity->value) * speed * 180.0;
+					}
+
+				}
+			}
+			break;
+
+		case AxisLook:
+			if (in_jlook.state & 1)
+			{
+				if (fabs(fAxisValue) > joy_pitchthreshold->value)
+				{
+					// pitch movement detected and pitch movement desired by user
+					if(dwControlMap[i] == JOY_ABSOLUTE_AXIS)
+					{
+						ioRotationDeltas[PITCH] += (fAxisValue * joy_pitchsensitivity->value) * aspeed * cl_pitchspeed->value;
+					}
+					else
+					{
+						ioRotationDeltas[PITCH] += (fAxisValue * joy_pitchsensitivity->value) * speed * 180.0;
+					}
+					V_StopPitchDrift();
+				}
+				else
+				{
+					// no pitch movement
+					// disable pitch return-to-center unless requested by user
+					// *** this code can be removed when the lookspring bug is fixed
+					// *** the bug always has the lookspring feature on
+					if( lookspring->value == 0.0 )
+					{
+						V_StopPitchDrift();
+					}
+				}
+			}
+			break;
+
+		default:
+			break;
+		}
+	}
+}
+
+/*
+===========
+IN_Move
+===========
+*/
+void IN_Move ( float frametime, float ioRotationDeltas[3], float ioTranslationDeltas[3])
+{
+	if ( !iMouseInUse && mouseactive )
+	{
+		IN_MouseMove ( frametime, ioRotationDeltas, ioTranslationDeltas);
+	}
+
+	IN_JoyMove ( frametime, ioRotationDeltas, ioTranslationDeltas);
+}
+
+LRESULT CALLBACK KeyboardHookProc(int nCode, WPARAM wParam, LPARAM lParam)
+{
+
+    UINT virtualKey = wParam;
+    UINT scanCode   = (lParam & 0xFF0000) >> 16;
+    bool pressed    = (lParam & 0x80000000) == 0;
+    
+    if (gHUD.OnKeyEvent(virtualKey, scanCode, pressed))
+    {
+        // Don't let Half-Life get the key.
+        return 1;
+    }
+
+    return 0;
+
+}
+
+/*
+===========
+IN_Init
+===========
+*/
+void IN_Init (void)
+{
+	m_filter				= gEngfuncs.pfnRegisterVariable ( "m_filter","0", FCVAR_ARCHIVE );
+	sensitivity				= gEngfuncs.pfnRegisterVariable ( "sensitivity","3", FCVAR_ARCHIVE ); // user mouse sensitivity setting.
+
+	in_joystick				= gEngfuncs.pfnRegisterVariable ( "joystick","0", FCVAR_ARCHIVE );
+	joy_name				= gEngfuncs.pfnRegisterVariable ( "joyname", "joystick", 0 );
+	joy_advanced			= gEngfuncs.pfnRegisterVariable ( "joyadvanced", "0", 0 );
+	joy_advaxisx			= gEngfuncs.pfnRegisterVariable ( "joyadvaxisx", "0", 0 );
+	joy_advaxisy			= gEngfuncs.pfnRegisterVariable ( "joyadvaxisy", "0", 0 );
+	joy_advaxisz			= gEngfuncs.pfnRegisterVariable ( "joyadvaxisz", "0", 0 );
+	joy_advaxisr			= gEngfuncs.pfnRegisterVariable ( "joyadvaxisr", "0", 0 );
+	joy_advaxisu			= gEngfuncs.pfnRegisterVariable ( "joyadvaxisu", "0", 0 );
+	joy_advaxisv			= gEngfuncs.pfnRegisterVariable ( "joyadvaxisv", "0", 0 );
+	joy_forwardthreshold	= gEngfuncs.pfnRegisterVariable ( "joyforwardthreshold", "0.15", 0 );
+	joy_sidethreshold		= gEngfuncs.pfnRegisterVariable ( "joysidethreshold", "0.15", 0 );
+	joy_pitchthreshold		= gEngfuncs.pfnRegisterVariable ( "joypitchthreshold", "0.15", 0 );
+	joy_yawthreshold		= gEngfuncs.pfnRegisterVariable ( "joyyawthreshold", "0.15", 0 );
+	joy_forwardsensitivity	= gEngfuncs.pfnRegisterVariable ( "joyforwardsensitivity", "-1.0", 0 );
+	joy_sidesensitivity		= gEngfuncs.pfnRegisterVariable ( "joysidesensitivity", "-1.0", 0 );
+	joy_pitchsensitivity	= gEngfuncs.pfnRegisterVariable ( "joypitchsensitivity", "1.0", 0 );
+	joy_yawsensitivity		= gEngfuncs.pfnRegisterVariable ( "joyyawsensitivity", "-1.0", 0 );
+	joy_wwhack1				= gEngfuncs.pfnRegisterVariable ( "joywwhack1", "0.0", 0 );
+	joy_wwhack2				= gEngfuncs.pfnRegisterVariable ( "joywwhack2", "0.0", 0 );
+
+	gEngfuncs.pfnAddCommand ("force_centerview", Force_CenterView_f);
+	gEngfuncs.pfnAddCommand ("joyadvancedupdate", Joy_AdvancedUpdate_f);
+
+	IN_StartupMouse ();
+	IN_StartupJoystick ();  
+
+    // Install a keyboard hook so we can trap ESC before Steam gets it.
+
+    DWORD threadID = GetCurrentThreadId();
+    gKeyboardHook = SetWindowsHookEx(WH_KEYBOARD, KeyboardHookProc, GetModuleHandle(NULL), threadID);
+
+    if (gKeyboardHook == NULL)
+    {
+        ConsolePrint("Unable to install keyboard hook\n");
+    }
+
+}
+
+
+/*
+===========
+IN_Shutdown
+===========
+*/
+void IN_Shutdown (void)
+{
+
+	IN_DeactivateMouse ();
+    
+    if (gKeyboardHook != NULL)
+    {
+        UnhookWindowsHookEx(gKeyboardHook);
+    }
+
+}
diff --git a/main/source/cl_dll/kbutton.h b/main/source/cl_dll/kbutton.h
new file mode 100644
index 00000000..c3a7c138
--- /dev/null
+++ b/main/source/cl_dll/kbutton.h
@@ -0,0 +1,11 @@
+#if !defined( KBUTTONH )
+#define KBUTTONH
+#pragma once
+
+typedef struct kbutton_s
+{
+	int		down[2];		// key nums holding it down
+	int		state;			// low bit is down state
+} kbutton_t;
+
+#endif // !KBUTTONH
\ No newline at end of file
diff --git a/main/source/cl_dll/menu.cpp b/main/source/cl_dll/menu.cpp
new file mode 100644
index 00000000..aced9538
--- /dev/null
+++ b/main/source/cl_dll/menu.cpp
@@ -0,0 +1,187 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// menu.cpp
+//
+// generic menu handler
+//
+#include "hud.h"
+#include "cl_util.h"
+#include "parsemsg.h"
+
+#include <string.h>
+#include <stdio.h>
+
+#include "vgui_TeamFortressViewport.h"
+
+#define MAX_MENU_STRING	512
+char g_szMenuString[MAX_MENU_STRING];
+char g_szPrelocalisedMenuString[MAX_MENU_STRING];
+
+int KB_ConvertString( char *in, char **ppout );
+
+DECLARE_MESSAGE( m_Menu, ShowMenu );
+
+int CHudMenu :: Init( void )
+{
+	gHUD.AddHudElem( this );
+
+	HOOK_MESSAGE( ShowMenu );
+
+	InitHUDData();
+
+	return 1;
+}
+
+void CHudMenu :: InitHUDData( void )
+{
+	m_fMenuDisplayed = 0;
+	m_bitsValidSlots = 0;
+	Reset();
+}
+
+void CHudMenu :: Reset( void )
+{
+	g_szPrelocalisedMenuString[0] = 0;
+	m_fWaitingForMore = FALSE;
+}
+
+int CHudMenu :: VidInit( void )
+{
+	return 1;
+}
+
+int CHudMenu :: Draw( float flTime )
+{
+	// check for if menu is set to disappear
+	if ( m_flShutoffTime > 0 )
+	{
+		if ( m_flShutoffTime <= gHUD.m_flTime )
+		{  // times up, shutoff
+			m_fMenuDisplayed = 0;
+			m_iFlags &= ~HUD_ACTIVE;
+			return 1;
+		}
+	}
+
+	// don't draw the menu if the scoreboard is being shown
+	if ( gViewPort && gViewPort->IsScoreBoardVisible() )
+		return 1;
+
+	// draw the menu, along the left-hand side of the screen
+
+	// count the number of newlines
+	int nlc = 0;
+	for ( int i = 0; i < MAX_MENU_STRING && g_szMenuString[i] != '\0'; i++ )
+	{
+		if ( g_szMenuString[i] == '\n' )
+			nlc++;
+	}
+
+	// center it
+	int y = (ScreenHeight()/2) - ((nlc/2)*12) - 40; // make sure it is above the say text
+	int x = 20;
+
+	i = 0;
+	while ( i < MAX_MENU_STRING && g_szMenuString[i] != '\0' )
+	{
+		gHUD.DrawHudString( x, y, 320, g_szMenuString + i, 255, 255, 255 );
+		y += 12;
+
+		while ( i < MAX_MENU_STRING && g_szMenuString[i] != '\0' && g_szMenuString[i] != '\n' )
+			i++;
+		if ( g_szMenuString[i] == '\n' )
+			i++;
+	}
+	
+	return 1;
+}
+
+// selects an item from the menu
+void CHudMenu :: SelectMenuItem( int menu_item )
+{
+	// if menu_item is in a valid slot,  send a menuselect command to the server
+	if ( (menu_item > 0) && (m_bitsValidSlots & (1 << (menu_item-1))) )
+	{
+		char szbuf[32];
+		sprintf( szbuf, "menuselect %d\n", menu_item );
+		ClientCmd( szbuf );
+
+		// remove the menu
+		m_fMenuDisplayed = 0;
+		m_iFlags &= ~HUD_ACTIVE;
+	}
+}
+
+
+// Message handler for ShowMenu message
+// takes four values:
+//		short: a bitfield of keys that are valid input
+//		char : the duration, in seconds, the menu should stay up. -1 means is stays until something is chosen.
+//		byte : a boolean, TRUE if there is more string yet to be received before displaying the menu, FALSE if it's the last string
+//		string: menu string to display
+// if this message is never received, then scores will simply be the combined totals of the players.
+int CHudMenu :: MsgFunc_ShowMenu( const char *pszName, int iSize, void *pbuf )
+{
+	char *temp = NULL;
+
+	BEGIN_READ( pbuf, iSize );
+
+	m_bitsValidSlots = READ_SHORT();
+	int DisplayTime = READ_CHAR();
+	int NeedMore = READ_BYTE();
+
+	if ( DisplayTime > 0 )
+		m_flShutoffTime = DisplayTime + gHUD.m_flTime;
+	else
+		m_flShutoffTime = -1;
+
+	if ( m_bitsValidSlots )
+	{
+		if ( !m_fWaitingForMore ) // this is the start of a new menu
+		{
+			strncpy( g_szPrelocalisedMenuString, READ_STRING(), MAX_MENU_STRING );
+		}
+		else
+		{  // append to the current menu string
+			strncat( g_szPrelocalisedMenuString, READ_STRING(), MAX_MENU_STRING - strlen(g_szPrelocalisedMenuString) );
+		}
+		g_szPrelocalisedMenuString[MAX_MENU_STRING-1] = 0;  // ensure null termination (strncat/strncpy does not)
+
+		if ( !NeedMore )
+		{  // we have the whole string, so we can localise it now
+			strcpy( g_szMenuString, gHUD.m_TextMessage.BufferedLocaliseTextString( g_szPrelocalisedMenuString ) );
+
+			// Swap in characters
+			if ( KB_ConvertString( g_szMenuString, &temp ) )
+			{
+				strcpy( g_szMenuString, temp );
+				free( temp );
+			}
+		}
+
+		m_fMenuDisplayed = 1;
+		m_iFlags |= HUD_ACTIVE;
+	}
+	else
+	{
+		m_fMenuDisplayed = 0; // no valid slots means that the menu should be turned off
+		m_iFlags &= ~HUD_ACTIVE;
+	}
+
+	m_fWaitingForMore = NeedMore;
+
+	return 1;
+}
diff --git a/main/source/cl_dll/message.cpp b/main/source/cl_dll/message.cpp
new file mode 100644
index 00000000..cdbfa887
--- /dev/null
+++ b/main/source/cl_dll/message.cpp
@@ -0,0 +1,700 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// Message.cpp
+//
+// implementation of CHudMessage class
+//
+
+#include "hud.h"
+#include "cl_util.h"
+#include <string.h>
+#include <stdio.h>
+#include "parsemsg.h"
+#include "mod/AvHClientVariables.h"
+
+DECLARE_MESSAGE( m_Message, HudText )
+DECLARE_MESSAGE( m_Message, HudText2 )
+DECLARE_MESSAGE( m_Message, GameTitle )
+
+// 1 Global client_textmessage_t for custom messages that aren't in the titles.txt
+client_textmessage_t	g_pCustomMessage;
+char *g_pCustomName = "Custom";
+char g_pCustomText[1024];
+
+int CHudMessage::Init(void)
+{
+	HOOK_MESSAGE( HudText );
+	HOOK_MESSAGE( HudText2 );
+	HOOK_MESSAGE( GameTitle );
+
+	gHUD.AddHudElem(this);
+
+	Reset();
+
+	return 1;
+};
+
+int CHudMessage::VidInit( void )
+{
+	m_HUD_title_half = gHUD.GetSpriteIndex( "title_half" );
+	m_HUD_title_life = gHUD.GetSpriteIndex( "title_life" );
+
+	return 1;
+};
+
+const int kDefaultRComp = 25;
+const int kDefaultGComp = 255;
+const int kDefaultBComp = 25;
+
+const int kEnemyRComp = 255;
+const int kEnemyGComp = 25;
+const int kEnemyBComp = 25;
+
+void CHudMessage::Reset( void )
+{
+ 	memset( m_pMessages, 0, sizeof( m_pMessages[0] ) * maxHUDMessages );
+	memset( m_startTime, 0, sizeof( m_startTime[0] ) * maxHUDMessages );
+	
+	m_gameTitleTime = 0;
+	m_pGameTitle = NULL;
+
+	// Player id stuff
+	this->mPlayerIDTime = 0;
+	this->mPlayerID = NULL;
+
+	this->mPlayerIDMessage.effect = 1;
+	this->mPlayerIDMessage.r1 = kDefaultRComp;
+	this->mPlayerIDMessage.g1 = kDefaultGComp;
+	this->mPlayerIDMessage.b1 = kDefaultBComp;
+	this->mPlayerIDMessage.a1 = 255;
+
+	this->mPlayerIDMessage.g2 = 255;
+	this->mPlayerIDMessage.r2 = this->mPlayerIDMessage.b2 = 25;
+	this->mPlayerIDMessage.a2 = 255;
+
+	this->SetPlayerIDPosition();
+		
+	this->mPlayerIDMessage.fadein = 0.04;
+	this->mPlayerIDMessage.fadeout = 0.5;
+	this->mPlayerIDMessage.fxtime = 0.25;
+	this->mPlayerIDMessage.holdtime = 5;
+	this->mPlayerIDMessage.pName = NULL;
+	this->mPlayerIDMessage.pMessage = NULL;
+}
+
+void CHudMessage::SetPlayerIDPosition()
+{
+	if(gEngfuncs.pfnGetCvarFloat(kvCenterEntityID) || gHUD.GetInTopDownMode())
+	{
+		this->mPlayerIDMessage.x = -1;		// Centered
+		this->mPlayerIDMessage.y = -1;		// Centered
+	}
+	else
+	{
+		this->mPlayerIDMessage.x = .3;
+		this->mPlayerIDMessage.y = .9;
+	}
+}
+
+float CHudMessage::FadeBlend( float fadein, float fadeout, float hold, float localTime )
+{
+	float fadeTime = fadein + hold;
+	float fadeBlend;
+
+	if ( localTime < 0 )
+		return 0;
+
+	if ( localTime < fadein )
+	{
+		fadeBlend = 1 - ((fadein - localTime) / fadein);
+	}
+	else if ( localTime > fadeTime )
+	{
+		if ( fadeout > 0 )
+			fadeBlend = 1 - ((localTime - fadeTime) / fadeout);
+		else
+			fadeBlend = 0;
+	}
+	else
+		fadeBlend = 1;
+
+	return fadeBlend;
+}
+
+
+int	CHudMessage::XPosition( float x, int width, int totalWidth )
+{
+	int xPos;
+
+	if ( x == -1 )
+	{
+		xPos = (ScreenWidth() - width) / 2;
+	}
+	else
+	{
+		if ( x < 0 )
+			xPos = (1.0 + x) * ScreenWidth() - totalWidth;	// Alight right
+		else
+			xPos = x * ScreenWidth();
+	}
+
+	if ( xPos + width > ScreenWidth() )
+		xPos = ScreenWidth() - width;
+	else if ( xPos < 0 )
+		xPos = 0;
+
+	return xPos;
+}
+
+
+int CHudMessage::YPosition( float y, int height )
+{
+	int yPos;
+
+	if ( y == -1 )	// Centered?
+		yPos = (ScreenHeight() - height) * 0.5;
+	else
+	{
+		// Alight bottom?
+		if ( y < 0 )
+			yPos = (1.0 + y) * ScreenHeight() - height;	// Alight bottom
+		else // align top
+			yPos = y * ScreenHeight();
+	}
+
+	if ( yPos + height > ScreenHeight() )
+		yPos = ScreenHeight() - height;
+	else if ( yPos < 0 )
+		yPos = 0;
+
+	return yPos;
+}
+
+
+void CHudMessage::MessageScanNextChar( void )
+{
+	int srcRed, srcGreen, srcBlue, destRed, destGreen, destBlue;
+	int blend;
+
+	srcRed = m_parms.pMessage->r1;
+	srcGreen = m_parms.pMessage->g1;
+	srcBlue = m_parms.pMessage->b1;
+	blend = 0;	// Pure source
+
+	switch( m_parms.pMessage->effect )
+	{
+	// Fade-in / Fade-out
+	case 0:
+	case 1:
+		destRed = destGreen = destBlue = 0;
+		blend = m_parms.fadeBlend;
+		break;
+
+	case 2:
+		m_parms.charTime += m_parms.pMessage->fadein;
+		if ( m_parms.charTime > m_parms.time )
+		{
+			srcRed = srcGreen = srcBlue = 0;
+			blend = 0;	// pure source
+		}
+		else
+		{
+			float deltaTime = m_parms.time - m_parms.charTime;
+
+			destRed = destGreen = destBlue = 0;
+			if ( m_parms.time > m_parms.fadeTime )
+			{
+				blend = m_parms.fadeBlend;
+			}
+			else if ( deltaTime > m_parms.pMessage->fxtime )
+				blend = 0;	// pure dest
+			else
+			{
+				destRed = m_parms.pMessage->r2;
+				destGreen = m_parms.pMessage->g2;
+				destBlue = m_parms.pMessage->b2;
+				blend = 255 - (deltaTime * (1.0/m_parms.pMessage->fxtime) * 255.0 + 0.5);
+			}
+		}
+		break;
+	}
+	if ( blend > 255 )
+		blend = 255;
+	else if ( blend < 0 )
+		blend = 0;
+
+	m_parms.r = ((srcRed * (255-blend)) + (destRed * blend)) >> 8;
+	m_parms.g = ((srcGreen * (255-blend)) + (destGreen * blend)) >> 8;
+	m_parms.b = ((srcBlue * (255-blend)) + (destBlue * blend)) >> 8;
+
+	if ( m_parms.pMessage->effect == 1 && m_parms.charTime != 0 )
+	{
+		if ( m_parms.x >= 0 && m_parms.y >= 0 && (m_parms.x + gHUD.m_scrinfo.charWidths[ m_parms.text ]) <= ScreenWidth() )
+			TextMessageDrawChar( m_parms.x, m_parms.y, m_parms.text, m_parms.pMessage->r2, m_parms.pMessage->g2, m_parms.pMessage->b2 );
+	}
+}
+
+
+void CHudMessage::MessageScanStart( void )
+{
+	switch( m_parms.pMessage->effect )
+	{
+	// Fade-in / out with flicker
+	case 1:
+	case 0:
+		m_parms.fadeTime = m_parms.pMessage->fadein + m_parms.pMessage->holdtime;
+		
+
+		if ( m_parms.time < m_parms.pMessage->fadein )
+		{
+			m_parms.fadeBlend = ((m_parms.pMessage->fadein - m_parms.time) * (1.0/m_parms.pMessage->fadein) * 255);
+		}
+		else if ( m_parms.time > m_parms.fadeTime )
+		{
+			if ( m_parms.pMessage->fadeout > 0 )
+				m_parms.fadeBlend = (((m_parms.time - m_parms.fadeTime) / m_parms.pMessage->fadeout) * 255);
+			else
+				m_parms.fadeBlend = 255; // Pure dest (off)
+		}
+		else
+			m_parms.fadeBlend = 0;	// Pure source (on)
+		m_parms.charTime = 0;
+
+		if ( m_parms.pMessage->effect == 1 && (rand()%100) < 10 )
+			m_parms.charTime = 1;
+		break;
+
+	case 2:
+		m_parms.fadeTime = (m_parms.pMessage->fadein * m_parms.length) + m_parms.pMessage->holdtime;
+		
+		if ( m_parms.time > m_parms.fadeTime && m_parms.pMessage->fadeout > 0 )
+			m_parms.fadeBlend = (((m_parms.time - m_parms.fadeTime) / m_parms.pMessage->fadeout) * 255);
+		else
+			m_parms.fadeBlend = 0;
+		break;
+	}
+}
+
+
+void CHudMessage::MessageDrawScan( client_textmessage_t *pMessage, float time )
+{
+	int i, j, length, width;
+	const char *pText;
+	//unsigned char line[80];
+	unsigned char line[256];
+
+	pText = pMessage->pMessage;
+	ASSERT(pText != NULL);
+
+	// Count lines
+	m_parms.lines = 1;
+	m_parms.time = time;
+	m_parms.pMessage = pMessage;
+	length = 0;
+	width = 0;
+	m_parms.totalWidth = 0;
+	while ( *pText )
+	{
+		if ( *pText == '\n' )
+		{
+			m_parms.lines++;
+			if ( width > m_parms.totalWidth )
+				m_parms.totalWidth = width;
+			width = 0;
+		}
+		else
+			width += gHUD.m_scrinfo.charWidths[*pText];
+		pText++;
+		length++;
+	}
+	m_parms.length = length;
+	m_parms.totalHeight = (m_parms.lines * gHUD.m_scrinfo.iCharHeight);
+
+
+	m_parms.y = YPosition( pMessage->y, m_parms.totalHeight );
+	pText = pMessage->pMessage;
+
+	m_parms.charTime = 0;
+
+	MessageScanStart();
+
+	for ( i = 0; i < m_parms.lines; i++ )
+	{
+		m_parms.lineLength = 0;
+		m_parms.width = 0;
+		while ( *pText && *pText != '\n' )
+		{
+			unsigned char c = *pText;
+			line[m_parms.lineLength] = c;
+			m_parms.width += gHUD.m_scrinfo.charWidths[c];
+			m_parms.lineLength++;
+			pText++;
+		}
+		pText++;		// Skip LF
+		line[m_parms.lineLength] = 0;
+
+		m_parms.x = XPosition( pMessage->x, m_parms.width, m_parms.totalWidth );
+
+		for ( j = 0; j < m_parms.lineLength; j++ )
+		{
+			m_parms.text = line[j];
+			int next = m_parms.x + gHUD.m_scrinfo.charWidths[ m_parms.text ];
+			MessageScanNextChar();
+			
+			if ( m_parms.x >= 0 && m_parms.y >= 0 && next <= ScreenWidth() )
+				TextMessageDrawChar( m_parms.x, m_parms.y, m_parms.text, m_parms.r, m_parms.g, m_parms.b );
+			m_parms.x = next;
+		}
+
+		m_parms.y += gHUD.m_scrinfo.iCharHeight;
+	}
+}
+
+
+int CHudMessage::Draw( float fTime )
+{
+	int i, drawn;
+	client_textmessage_t *pMessage;
+	
+	drawn = 0;
+
+	if ( m_gameTitleTime > 0 )
+	{
+		float localTime = gHUD.m_flTime - m_gameTitleTime;
+		float brightness;
+
+		// Maybe timer isn't set yet
+		if ( m_gameTitleTime > gHUD.m_flTime )
+			m_gameTitleTime = gHUD.m_flTime;
+
+		if ( localTime > (m_pGameTitle->fadein + m_pGameTitle->holdtime + m_pGameTitle->fadeout) )
+			m_gameTitleTime = 0;
+		else
+		{
+			brightness = FadeBlend( m_pGameTitle->fadein, m_pGameTitle->fadeout, m_pGameTitle->holdtime, localTime );
+
+			int halfWidth = gHUD.GetSpriteRect(m_HUD_title_half).right - gHUD.GetSpriteRect(m_HUD_title_half).left;
+			int fullWidth = halfWidth + gHUD.GetSpriteRect(m_HUD_title_life).right - gHUD.GetSpriteRect(m_HUD_title_life).left;
+			int fullHeight = gHUD.GetSpriteRect(m_HUD_title_half).bottom - gHUD.GetSpriteRect(m_HUD_title_half).top;
+
+			int x = XPosition( m_pGameTitle->x, fullWidth, fullWidth );
+			int y = YPosition( m_pGameTitle->y, fullHeight );
+
+
+			SPR_Set( gHUD.GetSprite(m_HUD_title_half), brightness * m_pGameTitle->r1, brightness * m_pGameTitle->g1, brightness * m_pGameTitle->b1 );
+			SPR_DrawAdditive( 0, x, y, &gHUD.GetSpriteRect(m_HUD_title_half) );
+
+			SPR_Set( gHUD.GetSprite(m_HUD_title_life), brightness * m_pGameTitle->r1, brightness * m_pGameTitle->g1, brightness * m_pGameTitle->b1 );
+			SPR_DrawAdditive( 0, x + halfWidth, y, &gHUD.GetSpriteRect(m_HUD_title_life) );
+
+			drawn++;
+		}
+	}
+
+	// Draw player id
+//	if(this->mPlayerIDTime > 0)
+//	{
+//		float localTime = gHUD.m_flTime - this->mPlayerIDTime;
+//		//float brightness;
+//		
+//		// Maybe timer isn't set yet
+//		if ( this->mPlayerIDTime > gHUD.m_flTime )
+//			this->mPlayerIDTime = gHUD.m_flTime;
+//		
+//		if ( localTime > (this->mPlayerIDMessage.fadein + this->mPlayerIDMessage.holdtime + this->mPlayerIDMessage.fadeout) )
+//		{
+//			this->mPlayerIDTime = 0;
+//			this->mPlayerIDMessage.pName = NULL;
+//			this->mPlayerIDMessage.pMessage = NULL;
+//		}
+//		else
+//		{
+//			drawn++;
+//		}
+//	}
+	
+	// Fixup level transitions
+	for ( i = 0; i < maxHUDMessages; i++ )
+	{
+		// Assume m_parms.time contains last time
+		if ( m_pMessages[i] )
+		{
+			pMessage = m_pMessages[i];
+			if ( m_startTime[i] > gHUD.m_flTime )
+				m_startTime[i] = gHUD.m_flTime + m_parms.time - m_startTime[i] + 0.2;	// Server takes 0.2 seconds to spawn, adjust for this
+		}
+	}
+	
+	for ( i = 0; i < maxHUDMessages; i++ )
+	{
+		client_textmessage_t* theMessage = this->m_pMessages[i];
+		if(theMessage)
+		{
+			if(this->DrawMessage(theMessage, this->m_startTime[i], fTime))
+			{
+				drawn++;
+			}
+			else
+			{
+				// The message is over
+				this->m_pMessages[i] = NULL;
+			}
+		}
+	}
+
+	if(this->DrawMessage(&this->mPlayerIDMessage, this->mPlayerIDTime, fTime))
+	{
+		drawn++;
+	}
+	else
+	{
+		this->mPlayerIDMessage.pName = NULL;
+		this->mPlayerIDMessage.pMessage = NULL;
+	}
+		
+	
+	// Remember the time -- to fix up level transitions
+	m_parms.time = gHUD.m_flTime;
+	// Don't call until we get another message
+	if ( !drawn )
+		m_iFlags &= ~HUD_ACTIVE;
+	
+	return 1;
+}
+
+bool CHudMessage::DrawMessage(client_textmessage_t* inMessage, float inStartTime, float inCurrentTime)
+{
+	ASSERT(inMessage);
+	bool theDrewMessage = false;
+
+	if(inMessage->pMessage)
+	{
+		float endTime;
+		
+		// This is when the message is over
+		switch( inMessage->effect )
+		{
+		case 0:
+		case 1:
+			endTime = inStartTime + inMessage->fadein + inMessage->fadeout + inMessage->holdtime;
+			break;
+			
+			// Fade in is per character in scanning messages
+		case 2:
+			endTime = inStartTime + (inMessage->fadein * strlen( inMessage->pMessage )) + inMessage->fadeout + inMessage->holdtime;
+			break;
+		}
+		
+		if ( inCurrentTime <= endTime )
+		{
+			float messageTime = inCurrentTime - inStartTime;
+			
+			// Draw the message
+			// effect 0 is fade in/fade out
+			// effect 1 is flickery credits
+			// effect 2 is write out (training room)
+			MessageDrawScan( inMessage, messageTime );
+			theDrewMessage = true;		
+		}
+	}
+
+	return theDrewMessage;
+}
+
+void CHudMessage::MessageAdd( const char *pName, float time )
+{
+	int i,j;
+	client_textmessage_t *tempMessage;
+	
+	for ( i = 0; i < maxHUDMessages; i++ )
+	{
+		if ( !m_pMessages[i] )
+		{
+			// Trim off a leading # if it's there
+			if ( pName[0] == '#' ) 
+				tempMessage = TextMessageGet( pName+1 );
+			else
+				tempMessage = TextMessageGet( pName );
+			// If we couldnt find it in the titles.txt, just create it
+			if ( !tempMessage )
+			{
+				g_pCustomMessage.effect = 2;
+				g_pCustomMessage.r1 = g_pCustomMessage.g1 = g_pCustomMessage.b1 = g_pCustomMessage.a1 = 100;
+				g_pCustomMessage.r2 = 240;
+				g_pCustomMessage.g2 = 110;
+				g_pCustomMessage.b2 = 0;
+				g_pCustomMessage.a2 = 0;
+				g_pCustomMessage.x = -1;		// Centered
+				g_pCustomMessage.y = 0.7;
+				g_pCustomMessage.fadein = 0.01;
+				g_pCustomMessage.fadeout = 1.5;
+				g_pCustomMessage.fxtime = 0.25;
+				g_pCustomMessage.holdtime = 5;
+				g_pCustomMessage.pName = g_pCustomName;
+				strcpy( g_pCustomText, pName );
+				g_pCustomMessage.pMessage = g_pCustomText;
+				
+				tempMessage = &g_pCustomMessage;
+			}
+			
+			for ( j = 0; j < maxHUDMessages; j++ )
+			{
+				if ( m_pMessages[j] )
+				{
+					// is this message already in the list
+					if ( !strcmp( tempMessage->pMessage, m_pMessages[j]->pMessage ) )
+					{
+						return;
+					}
+					
+					// get rid of any other messages in same location (only one displays at a time)
+					if ( fabs( tempMessage->y - m_pMessages[j]->y ) < 0.0001 )
+					{
+						if ( fabs( tempMessage->x - m_pMessages[j]->x ) < 0.0001 )
+						{
+							m_pMessages[j] = NULL;
+						}
+					}
+				}
+			}
+			
+			m_pMessages[i] = tempMessage;
+			m_startTime[i] = time;
+			return;
+		}
+	}
+}
+
+void CHudMessage::MessageAddPlayerID(const char* inName, bool inEnemy)
+{
+	// If we're already drawing this, extend the time
+	//if(inName && this->mPlayerIDMessage.pMessage && !strcmp(inName, this->mPlayerIDMessage.pMessage))
+	//{
+	//	//this->mPlayerIDMessage.holdtime = 
+	//}
+	//else
+	//{
+		// else add this message
+		this->mPlayerIDMessage.pMessage = inName;
+	
+		//strcpy( g_pCustomText, pName );
+		//this->mPlayerIDMessage.pMessage = g_pCustomText;
+		this->mPlayerIDTime = gHUD.m_flTime;
+
+		// Set color depending on if friend or enemy
+		if(inEnemy)
+		{
+			this->mPlayerIDMessage.r1 = kEnemyRComp;
+			this->mPlayerIDMessage.g1 = kEnemyGComp;
+			this->mPlayerIDMessage.b1 = kEnemyBComp;
+		}
+		else
+		{
+			this->mPlayerIDMessage.r1 = kDefaultRComp;
+			this->mPlayerIDMessage.g1 = kDefaultGComp;
+			this->mPlayerIDMessage.b1 = kDefaultBComp;
+		}
+
+		this->SetPlayerIDPosition();
+
+		// Turn on drawing
+		if(inName)
+		{
+			if ( !(m_iFlags & HUD_ACTIVE) )
+				m_iFlags |= HUD_ACTIVE;
+		}
+		
+	//}
+}
+
+bool CHudMessage::MessageRemove(const char *pName)
+{
+	const char* theMessage = pName;
+	bool theSuccess = false;
+	bool theNeedsTranslation = (pName[0] == '#');
+	
+	// Trim off a leading # if it's there
+	if(theNeedsTranslation) 
+	{
+		client_textmessage_t* tempMessage = TextMessageGet(pName + 1);
+		if(tempMessage)
+		{
+			theMessage = tempMessage->pMessage;
+		}
+	}
+	
+	if(theMessage)
+	{
+		for (int j = 0; j < maxHUDMessages; j++ )
+		{
+			if ( m_pMessages[j] )
+			{
+				// is this message already in the list
+				if (!strcmp(theMessage, m_pMessages[j]->pMessage))
+				{
+					m_startTime[j] = -1;
+					theSuccess = true;
+				}
+			}
+		}
+	}
+	return theSuccess;
+}
+
+int CHudMessage::MsgFunc_HudText( const char *pszName,  int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+
+	char *pString = READ_STRING();
+
+	MessageAdd( pString, gHUD.m_flTime );
+
+	// Remember the time -- to fix up level transitions
+	m_parms.time = gHUD.m_flTime;
+	
+	// Turn on drawing
+	if ( !(m_iFlags & HUD_ACTIVE) )
+		m_iFlags |= HUD_ACTIVE;
+	
+	return 1;
+}
+
+int CHudMessage::MsgFunc_HudText2( const char *pszName,  int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+	
+	char *pString = READ_STRING();
+	bool theIsAutoHelp = READ_BYTE();
+	
+	gHUD.AddTooltip(pString, theIsAutoHelp);
+	
+	return 2;
+}
+
+int CHudMessage::MsgFunc_GameTitle( const char *pszName,  int iSize, void *pbuf )
+{
+	m_pGameTitle = TextMessageGet( "GAMETITLE" );
+	if ( m_pGameTitle != NULL )
+	{
+		m_gameTitleTime = gHUD.m_flTime;
+
+		// Turn on drawing
+		if ( !(m_iFlags & HUD_ACTIVE) )
+			m_iFlags |= HUD_ACTIVE;
+	}
+
+	return 1;
+}
diff --git a/main/source/cl_dll/overview.cpp b/main/source/cl_dll/overview.cpp
new file mode 100644
index 00000000..95aec524
--- /dev/null
+++ b/main/source/cl_dll/overview.cpp
@@ -0,0 +1,160 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#include "hud.h"
+#include "cl_util.h"
+#include "cl_entity.h"
+#include "triangleapi.h"
+#include "vgui_TeamFortressViewport.h"
+
+// these are included for the math functions
+#include "com_model.h"
+#include "studio_util.h"
+
+#pragma warning(disable: 4244)
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+//-----------------------------------------------------------------------------
+int CHudOverview::Init()
+{
+	gHUD.AddHudElem(this);
+
+	m_iFlags |= HUD_ACTIVE;
+
+	return 1;
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Loads new icons
+//-----------------------------------------------------------------------------
+int CHudOverview::VidInit()
+{
+	m_hsprPlayer = Safe_SPR_Load("sprites/ring.spr");
+	m_hsprViewcone = Safe_SPR_Load("sprites/camera.spr");
+
+	return 1;
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+// Input  : flTime - 
+//			intermission - 
+//-----------------------------------------------------------------------------
+int CHudOverview::Draw(float flTime)
+{
+	// only draw in overview mode
+	if (!gEngfuncs.Overview_GetOverviewState())
+		return 1;
+
+	// make sure we have player info
+	gViewPort->GetAllPlayersInfo();
+
+	// calculate player size on the overview
+	int x1, y1, x2, y2;
+	float v0[3]={0,0,0}, v1[3]={64,64,0};
+	gEngfuncs.Overview_WorldToScreen(v0, &x1, &y1);
+	gEngfuncs.Overview_WorldToScreen(v1, &x2, &y2);
+	float scale = abs(x2 - x1);
+
+	// loop through all the players and draw them on the map
+	for (int i = 1; i <= MAX_PLAYERS; i++)
+	{
+		cl_entity_t *pl = gEngfuncs.GetEntityByIndex(i);
+
+		if (pl && pl->player && pl->curstate.health > 0 && pl->curstate.solid != SOLID_NOT)
+		{
+			int x, y, z = 0;
+			float v[3]={pl->origin[0], pl->origin[1], 0};
+			gEngfuncs.Overview_WorldToScreen(v, &x, &y);
+
+			// hack in some team colors
+			float r, g, bc;
+			if (g_PlayerExtraInfo[i].teamnumber == 1)
+			{
+				r = 0.0f; g = 0.0f; bc = 1.0f;
+			}
+			else if (g_PlayerExtraInfo[i].teamnumber == 2)
+			{
+				r = 1.0f; g = 0.0f; bc = 0.0f;
+			}
+			else
+			{
+				// just use the default orange color if the team isn't set
+				r = 1.0f; g = 0.7f; bc = 0.0f;
+			}
+
+			// set the current texture
+			gEngfuncs.pTriAPI->SpriteTexture((struct model_s *)gEngfuncs.GetSpritePointer(m_hsprPlayer), 0);
+
+			// additive render mode
+			gEngfuncs.pTriAPI->RenderMode(kRenderTransAdd);
+
+			// no culling
+			gEngfuncs.pTriAPI->CullFace(TRI_NONE);
+
+			// draw a square
+			gEngfuncs.pTriAPI->Begin(TRI_QUADS);
+
+			// set the color to be that of the team
+			gEngfuncs.pTriAPI->Color4f(r, g, bc, 1.0f);
+
+			// calculate rotational matrix
+			vec3_t a, b, angles;
+			float rmatrix[3][4];	// transformation matrix
+			VectorCopy(pl->angles, angles);
+			angles[0] = 0.0f;
+			angles[1] += 90.f;
+			angles[1] = -angles[1];
+			angles[2] = 0.0f;
+			AngleMatrix(angles, rmatrix);
+			a[2] = 0;
+
+			a[0] = -scale; a[1] = -scale;
+			VectorTransform(a, rmatrix , b );
+			gEngfuncs.pTriAPI->TexCoord2f( 0, 0 );
+			gEngfuncs.pTriAPI->Vertex3f(x + b[0], y + b[1], z);
+
+			a[0]=-scale; a[1] = scale;
+			VectorTransform(a, rmatrix , b );
+			gEngfuncs.pTriAPI->TexCoord2f( 0, 1 );
+			gEngfuncs.pTriAPI->Vertex3f (x + b[0], y + b[1], z);
+			
+			a[0]=scale; a[1] = scale;
+			VectorTransform(a, rmatrix , b );
+			gEngfuncs.pTriAPI->TexCoord2f( 1, 1 );
+			gEngfuncs.pTriAPI->Vertex3f (x + b[0], y + b[1], z);
+
+			a[0]=scale; a[1] = -scale;
+			VectorTransform(a, rmatrix , b );
+			gEngfuncs.pTriAPI->TexCoord2f( 1, 0 );
+			gEngfuncs.pTriAPI->Vertex3f (x + b[0], y + b[1], z);
+
+			// finish up
+			gEngfuncs.pTriAPI->End();
+			gEngfuncs.pTriAPI->RenderMode( kRenderNormal );
+
+			// draw the players name and health underneath
+			char string[256];
+			sprintf(string, "%s (%i%%)", g_PlayerInfoList[i].name, pl->curstate.health);
+			DrawConsoleString(x, y + (1.1 * scale), string);
+		}
+	}
+
+	return 1;
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: called every time a server is connected to
+//-----------------------------------------------------------------------------
+void CHudOverview::InitHUDData()
+{
+//  this block would force the spectator view to be on
+//	gEngfuncs.Overview_SetDrawOverview( 1 );
+//	gEngfuncs.Overview_SetDrawInset( 0 );
+}
+
diff --git a/main/source/cl_dll/overview.h b/main/source/cl_dll/overview.h
new file mode 100644
index 00000000..e87de10d
--- /dev/null
+++ b/main/source/cl_dll/overview.h
@@ -0,0 +1,31 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef OVERVIEW_H
+#define OVERVIEW_H
+#pragma once
+
+
+//-----------------------------------------------------------------------------
+// Purpose: Handles the drawing of the top-down map and all the things on it
+//-----------------------------------------------------------------------------
+class CHudOverview : public CHudBase
+{
+public:
+	int Init();
+	int VidInit();
+
+	int Draw(float flTime);
+	void InitHUDData( void );
+
+private:
+	HSPRITE m_hsprPlayer;
+	HSPRITE m_hsprViewcone;
+};
+
+
+#endif // OVERVIEW_H
diff --git a/main/source/cl_dll/parsemsg.cpp b/main/source/cl_dll/parsemsg.cpp
new file mode 100644
index 00000000..d7070de5
--- /dev/null
+++ b/main/source/cl_dll/parsemsg.cpp
@@ -0,0 +1,166 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+//  parsemsg.cpp
+//
+typedef unsigned char byte;
+#define true 1
+
+static byte *gpBuf;
+static int giSize;
+static int giRead;
+static int giBadRead;
+
+void BEGIN_READ( void *buf, int size )
+{
+	giRead = 0;
+	giBadRead = 0;
+	giSize = size;
+	gpBuf = (byte*)buf;
+}
+
+
+int READ_CHAR( void )
+{
+	int     c;
+	
+	if (giRead + 1 > giSize)
+	{
+		giBadRead = true;
+		return -1;
+	}
+		
+	c = (signed char)gpBuf[giRead];
+	giRead++;
+	
+	return c;
+}
+
+int READ_BYTE( void )
+{
+	int     c;
+	
+	if (giRead+1 > giSize)
+	{
+		giBadRead = true;
+		return -1;
+	}
+		
+	c = (unsigned char)gpBuf[giRead];
+	giRead++;
+	
+	return c;
+}
+
+int READ_SHORT( void )
+{
+	int     c;
+	
+	if (giRead+2 > giSize)
+	{
+		giBadRead = true;
+		return -1;
+	}
+		
+	c = (short)( gpBuf[giRead] + ( gpBuf[giRead+1] << 8 ) );
+	
+	giRead += 2;
+	
+	return c;
+}
+
+int READ_WORD( void )
+{
+	return READ_SHORT();
+}
+
+
+int READ_LONG( void )
+{
+	int     c;
+	
+	if (giRead+4 > giSize)
+	{
+		giBadRead = true;
+		return -1;
+	}
+		
+ 	c = gpBuf[giRead] + (gpBuf[giRead + 1] << 8) + (gpBuf[giRead + 2] << 16) + (gpBuf[giRead + 3] << 24);
+	
+	giRead += 4;
+	
+	return c;
+}
+
+float READ_FLOAT( void )
+{
+	union
+	{
+		byte    b[4];
+		float   f;
+		int     l;
+	} dat;
+	
+	dat.b[0] = gpBuf[giRead];
+	dat.b[1] = gpBuf[giRead+1];
+	dat.b[2] = gpBuf[giRead+2];
+	dat.b[3] = gpBuf[giRead+3];
+	giRead += 4;
+	
+//	dat.l = LittleLong (dat.l);
+
+	return dat.f;   
+}
+
+char* READ_STRING( void )
+{
+	static char     string[2048];
+	int             l,c;
+
+	string[0] = 0;
+
+	l = 0;
+	do
+	{
+		if ( giRead+1 > giSize )
+			break; // no more characters
+
+		c = READ_CHAR();
+		if (c == -1 || c == 0)
+			break;
+		string[l] = c;
+		l++;
+	} while (l < sizeof(string)-1);
+	
+	string[l] = 0;
+	
+	return string;
+}
+
+float READ_COORD( void )
+{
+	return (float)(READ_SHORT() * (1.0/8));
+}
+
+float READ_ANGLE( void )
+{
+	return (float)(READ_CHAR() * (360.0/256));
+}
+
+float READ_HIRESANGLE( void )
+{
+	return (float)(READ_SHORT() * (360.0/65536));
+}
+
diff --git a/main/source/cl_dll/parsemsg.h b/main/source/cl_dll/parsemsg.h
new file mode 100644
index 00000000..382ac58a
--- /dev/null
+++ b/main/source/cl_dll/parsemsg.h
@@ -0,0 +1,40 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+//  parsemsg.h
+//
+
+//#define ASSERT( x )
+
+void BEGIN_READ( void *buf, int size );
+int READ_CHAR( void );
+int READ_BYTE( void );
+int READ_SHORT( void );
+int READ_WORD( void );
+int READ_LONG( void );
+float READ_FLOAT( void );
+char* READ_STRING( void );
+float READ_COORD( void );
+float READ_ANGLE( void );
+float READ_HIRESANGLE( void );
+
+
+
+
+
+
+
+
+
diff --git a/main/source/cl_dll/r_studioint.h b/main/source/cl_dll/r_studioint.h
new file mode 100644
index 00000000..973ae182
--- /dev/null
+++ b/main/source/cl_dll/r_studioint.h
@@ -0,0 +1,108 @@
+#if !defined( R_STUDIOINT_H )
+#define R_STUDIOINT_H
+#if defined( _WIN32 )
+#pragma once
+#endif
+
+#define STUDIO_INTERFACE_VERSION 1
+
+typedef struct engine_studio_api_s
+{
+	// Allocate number*size bytes and zero it
+	void			*( *Mem_Calloc )				( int number, size_t size );
+	// Check to see if pointer is in the cache
+	void			*( *Cache_Check )				( struct cache_user_s *c );
+	// Load file into cache ( can be swapped out on demand )
+	void			( *LoadCacheFile )				( char *path, struct cache_user_s *cu );
+	// Retrieve model pointer for the named model
+	struct model_s	*( *Mod_ForName )				( const char *name, int crash_if_missing );
+	// Retrieve pointer to studio model data block from a model
+	void			*( *Mod_Extradata )				( struct model_s *mod );
+	// Retrieve indexed model from client side model precache list
+	struct model_s	*( *GetModelByIndex )			( int index );
+	// Get entity that is set for rendering
+	struct cl_entity_s * ( *GetCurrentEntity )		( void );
+	// Get referenced player_info_t
+	struct player_info_s *( *PlayerInfo )			( int index );
+	// Get most recently received player state data from network system
+	struct entity_state_s *( *GetPlayerState )		( int index );
+	// Get viewentity
+	struct cl_entity_s * ( *GetViewEntity )			( void );
+	// Get current frame count, and last two timestampes on client
+	void			( *GetTimes )					( int *framecount, double *current, double *old );
+	// Get a pointer to a cvar by name
+	struct cvar_s	*( *GetCvar )					( const char *name );
+	// Get current render origin and view vectors ( up, right and vpn )
+	void			( *GetViewInfo )				( float *origin, float *upv, float *rightv, float *vpnv );
+	// Get sprite model used for applying chrome effect
+	struct model_s	*( *GetChromeSprite )			( void );
+	// Get model counters so we can incement instrumentation
+	void			( *GetModelCounters )			( int **s, int **a );
+	// Get software scaling coefficients
+	void			( *GetAliasScale )				( float *x, float *y );
+
+	// Get bone, light, alias, and rotation matrices
+	float			****( *StudioGetBoneTransform ) ( void );
+	float			****( *StudioGetLightTransform )( void );
+	float			***( *StudioGetAliasTransform ) ( void );
+	float			***( *StudioGetRotationMatrix ) ( void );
+
+	// Set up body part, and get submodel pointers
+	void			( *StudioSetupModel )			( int bodypart, void **ppbodypart, void **ppsubmodel );
+	// Check if entity's bbox is in the view frustum
+	int				( *StudioCheckBBox )			( void );
+	// Apply lighting effects to model
+	void			( *StudioDynamicLight )			( struct cl_entity_s *ent, struct alight_s *plight );
+	void			( *StudioEntityLight )			( struct alight_s *plight );
+	void			( *StudioSetupLighting )		( struct alight_s *plighting );
+
+	// Draw mesh vertices
+	void			( *StudioDrawPoints )			( void );
+
+	// Draw hulls around bones
+	void			( *StudioDrawHulls )			( void );
+	// Draw bbox around studio models
+	void			( *StudioDrawAbsBBox )			( void );
+	// Draws bones
+	void			( *StudioDrawBones )			( void );
+	// Loads in appropriate texture for model
+	void			( *StudioSetupSkin )			( void *ptexturehdr, int index );
+	// Sets up for remapped colors
+	void			( *StudioSetRemapColors )		( int top, int bottom );
+	// Set's player model and returns model pointer
+	struct model_s	*( *SetupPlayerModel )			( int index );
+	// Fires any events embedded in animation
+	void			( *StudioClientEvents )			( void );
+	// Retrieve/set forced render effects flags
+	int				( *GetForceFaceFlags )			( void );
+	void			( *SetForceFaceFlags )			( int flags );
+	// Tell engine the value of the studio model header
+	void			( *StudioSetHeader )			( void *header );
+	// Tell engine which model_t * is being renderered
+	void			( *SetRenderModel )				( struct model_s *model );
+
+	// Final state setup and restore for rendering
+	void			( *SetupRenderer )				( int rendermode );
+	void			( *RestoreRenderer )			( void );
+
+	// Set render origin for applying chrome effect
+	void			( *SetChromeOrigin )			( void );
+
+	// True if using D3D/OpenGL
+	int				( *IsHardware )					( void );
+	
+	// Only called by hardware interface
+	void			( *GL_StudioDrawShadow )		( void );
+	void			( *GL_SetRenderMode )			( int mode );
+} engine_studio_api_t;
+
+typedef struct r_studio_interface_s
+{
+	int				version;
+	int				( *StudioDrawModel	)			( int flags );
+	int				( *StudioDrawPlayer	)			( int flags, struct entity_state_s *pplayer );
+} r_studio_interface_t;
+
+extern r_studio_interface_t *pStudioAPI;
+
+#endif // R_STUDIOINT_H
\ No newline at end of file
diff --git a/main/source/cl_dll/saytext.cpp b/main/source/cl_dll/saytext.cpp
new file mode 100644
index 00000000..885efb1b
--- /dev/null
+++ b/main/source/cl_dll/saytext.cpp
@@ -0,0 +1,383 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// saytext.cpp
+//
+// implementation of CHudSayText class
+//
+
+#include "hud.h"
+#include "cl_util.h"
+#include "parsemsg.h"
+
+#include <string.h>
+#include <stdio.h>
+
+#include "vgui_TeamFortressViewport.h"
+#include "mod/AvHClientUtil.h"
+#include "mod/ChatPanel.h"
+
+float* GetClientColor(int clientIndex);
+
+#define MAX_LINES	5
+#define MAX_CHARS_PER_LINE	256  /* it can be less than this, depending on char size */
+
+// allow 20 pixels on either side of the text
+#define MAX_LINE_WIDTH  ( ScreenWidth() - 40 )
+#define LINE_START  10
+static float SCROLL_SPEED = 5;
+
+static char g_szLineBuffer[ MAX_LINES + 1 ][ MAX_CHARS_PER_LINE ];
+static float *g_pflNameColors[ MAX_LINES + 1 ];
+static int g_iNameLengths[ MAX_LINES + 1 ];
+static float flScrollTime = 0;  // the time at which the lines next scroll up
+
+static int Y_START = 0;
+static int line_height = 0;
+
+DECLARE_MESSAGE( m_SayText, SayText );
+
+int CHudSayText :: Init( void )
+{
+	gHUD.AddHudElem( this );
+
+	HOOK_MESSAGE( SayText );
+
+	InitHUDData();
+
+	m_HUD_saytext =			gEngfuncs.pfnRegisterVariable( "hud_saytext", "1", 0 );
+	m_HUD_saytext_time =	gEngfuncs.pfnRegisterVariable( "hud_saytext_time", "5", 0 );
+
+	m_iFlags |= HUD_INTERMISSION; // is always drawn during an intermission
+
+	return 1;
+}
+
+
+void CHudSayText :: InitHUDData( void )
+{
+	memset( g_szLineBuffer, 0, sizeof g_szLineBuffer );
+	memset( g_pflNameColors, 0, sizeof g_pflNameColors );
+	memset( g_iNameLengths, 0, sizeof g_iNameLengths );
+}
+
+int CHudSayText :: VidInit( void )
+{
+	return 1;
+}
+
+
+int ScrollTextUp( void )
+{
+	ConsolePrint( g_szLineBuffer[0] ); // move the first line into the console buffer
+	g_szLineBuffer[MAX_LINES][0] = 0;
+	memmove( g_szLineBuffer[0], g_szLineBuffer[1], sizeof(g_szLineBuffer) - sizeof(g_szLineBuffer[0]) ); // overwrite the first line
+	memmove( &g_pflNameColors[0], &g_pflNameColors[1], sizeof(g_pflNameColors) - sizeof(g_pflNameColors[0]) );
+	memmove( &g_iNameLengths[0], &g_iNameLengths[1], sizeof(g_iNameLengths) - sizeof(g_iNameLengths[0]) );
+	g_szLineBuffer[MAX_LINES-1][0] = 0;
+
+	if ( g_szLineBuffer[0][0] == ' ' ) // also scroll up following lines
+	{
+		g_szLineBuffer[0][0] = 2;
+		return 1 + ScrollTextUp();
+	}
+
+	return 1;
+}
+
+int CHudSayText :: Draw( float flTime )
+{
+	int y = Y_START;
+
+	if ( ( gViewPort && gViewPort->AllowedToPrintText() == FALSE) || !m_HUD_saytext->value )
+		return 1;
+
+	// make sure the scrolltime is within reasonable bounds,  to guard against the clock being reset
+	flScrollTime = min( flScrollTime, flTime + m_HUD_saytext_time->value );
+
+	// make sure the scrolltime is within reasonable bounds,  to guard against the clock being reset
+	flScrollTime = min( flScrollTime, flTime + m_HUD_saytext_time->value );
+
+	if ( flScrollTime <= flTime )
+	{
+		if ( *g_szLineBuffer[0] )
+		{
+			flScrollTime = flTime + m_HUD_saytext_time->value;
+			// push the console up
+			ScrollTextUp();
+		}
+		else
+		{ // buffer is empty,  just disable drawing of this section
+			m_iFlags &= ~HUD_ACTIVE;
+		}
+	}
+
+	for ( int i = 0; i < MAX_LINES; i++ )
+	{
+		if ( *g_szLineBuffer[i] )
+		{
+			if ( *g_szLineBuffer[i] == 2 && g_pflNameColors[i] )
+			{
+				// it's a saytext string
+				static char buf[MAX_PLAYER_NAME_LENGTH+32];
+
+				// draw the first x characters in the player color
+				strncpy( buf, g_szLineBuffer[i], min(g_iNameLengths[i], MAX_PLAYER_NAME_LENGTH+32) );
+				buf[ min(g_iNameLengths[i], MAX_PLAYER_NAME_LENGTH+31) ] = 0;
+				DrawSetTextColor( g_pflNameColors[i][0], g_pflNameColors[i][1], g_pflNameColors[i][2] );
+
+				// If we're an alien, move chat over a bit so it doesn't overlap energy bar
+				int theDrawX = LINE_START;
+				//if(gHUD.GetIsAlien())
+				//{
+				//	theDrawX += .07f*ScreenWidth;
+				//}
+				int x = DrawConsoleString(theDrawX, y, buf );
+
+				// color is reset after each string draw
+				DrawConsoleString( x, y, g_szLineBuffer[i] + g_iNameLengths[i] );
+			}
+			else
+			{
+				// normal draw
+				DrawConsoleString( LINE_START, y, g_szLineBuffer[i] );
+			}
+		}
+
+		y += line_height;
+	}
+
+
+	return 1;
+}
+
+int CHudSayText :: MsgFunc_SayText( const char *pszName, int iSize, void *pbuf )
+{
+
+	BEGIN_READ( pbuf, iSize );
+
+	// Read client who spoke the message
+	int client_index = READ_BYTE();		
+
+	// Read message
+	const char* inString = READ_STRING();
+	string theChatMessage(inString);
+
+	// Read location of player when he spoke this (" " if nowhere)
+	const char* theLocation = READ_STRING();
+
+	string theTranslatedLocation;
+	if(LocalizeString(theLocation, theTranslatedLocation))
+	{
+		// If player is on our team, add location
+		cl_entity_s* theEntity = gEngfuncs.GetEntityByIndex(client_index);
+		cl_entity_s* theLocalPlayer = gEngfuncs.GetLocalPlayer();
+
+		if(theEntity && theLocalPlayer && (theEntity->curstate.team == theLocalPlayer->curstate.team))
+		{
+			// Search for first : so we can insert location 
+			int theColonIndex = theChatMessage.find_first_of(":");
+			if((theColonIndex > 0) && (theColonIndex < (int)theChatMessage.length()))
+			{
+				AvHCUTrimExtraneousLocationText(theTranslatedLocation);
+				
+				// Insert location
+				string theNewMessage = theChatMessage.substr(0, theColonIndex);
+				theNewMessage += " (";
+				
+				theNewMessage += theTranslatedLocation;
+				theNewMessage += ")";
+				theNewMessage += theChatMessage.substr(theColonIndex/*, theChatMessage.length()*/);
+			
+				// Replace the message with new one
+				theChatMessage = theNewMessage;
+			}
+		}
+	}
+
+	SayTextPrint(theChatMessage.c_str(), theChatMessage.length(),  client_index );
+	
+	return 1;
+}
+
+void CHudSayText :: SayTextPrint( const char *pszBuf, int iBufSize, int clientIndex )
+{
+	if ( gViewPort && gViewPort->AllowedToPrintText() == FALSE )
+	{
+		// Print it straight to the console
+		ConsolePrint( pszBuf );
+		return;
+	}
+
+	// find an empty string slot
+	for ( int i = 0; i < MAX_LINES; i++ )
+	{
+		if ( ! *g_szLineBuffer[i] )
+			break;
+	}
+	if ( i == MAX_LINES )
+	{
+		// force scroll buffer up
+		ScrollTextUp();
+		i = MAX_LINES - 1;
+	}
+
+	g_iNameLengths[i] = 0;
+	g_pflNameColors[i] = NULL;
+
+	// if it's a say message, search for the players name in the string
+	if ( *pszBuf == 2 && clientIndex > 0 )
+	{
+		GetPlayerInfo( clientIndex, &g_PlayerInfoList[clientIndex] );
+		const char *pName = g_PlayerInfoList[clientIndex].name;
+
+		if ( pName )
+		{
+			const char *nameInString = strstr( pszBuf, pName );
+
+			if ( nameInString )
+			{
+				g_iNameLengths[i] = strlen( pName ) + (nameInString - pszBuf);
+				g_pflNameColors[i] = GetClientColor(clientIndex);
+			}
+		}
+	}
+
+	strncpy( g_szLineBuffer[i], pszBuf, max(iBufSize -1, MAX_CHARS_PER_LINE-1) );
+
+	// make sure the text fits in one line
+	EnsureTextFitsInOneLineAndWrapIfHaveTo( i );
+
+	// Set scroll time
+	if ( i == 0 )
+	{
+		flScrollTime = gHUD.m_flTime + m_HUD_saytext_time->value;
+	}
+
+	m_iFlags |= HUD_ACTIVE;
+	//PlaySound( "misc/talk.wav", 1 );
+	gHUD.PlayHUDSound("misc/talk.wav", 1);
+
+    Y_START = ScreenHeight()*.7f;
+
+    ChatPanel* theChatPanel = gViewPort->GetChatPanel();
+
+    if (theChatPanel != NULL)
+    {
+
+        int theX;
+        int theY;
+        int theWidth;
+        int theHeight;
+    
+        gViewPort->GetChatPanel()->getPos(theX, theY);
+        gViewPort->GetChatPanel()->getSize(theWidth, theHeight);
+    
+        //Y_START = theY + theHeight + 5; //voogru: this is too high imo.
+		Y_START = ScreenHeight()*.5f;
+    }
+
+}
+
+void CHudSayText :: EnsureTextFitsInOneLineAndWrapIfHaveTo( int line )
+{
+	int line_width = 0;
+	GetConsoleStringSize( g_szLineBuffer[line], &line_width, &line_height );
+
+	if ( (line_width + LINE_START) > MAX_LINE_WIDTH )
+	{ // string is too long to fit on line
+		// scan the string until we find what word is too long,  and wrap the end of the sentence after the word
+		int length = LINE_START;
+		int tmp_len = 0;
+		char *last_break = NULL;
+		for ( char *x = g_szLineBuffer[line]; *x != 0; x++ )
+		{
+			// check for a color change, if so skip past it
+			if ( x[0] == '/' && x[1] == '(' )
+			{
+				x += 2;
+				// skip forward until past mode specifier
+				while ( *x != 0 && *x != ')' )
+					x++;
+
+				if ( *x != 0 )
+					x++;
+
+				if ( *x == 0 )
+					break;
+			}
+
+			char buf[2];
+			buf[1] = 0;
+
+			if ( *x == ' ' && x != g_szLineBuffer[line] )  // store each line break,  except for the very first character
+				last_break = x;
+
+			buf[0] = *x;  // get the length of the current character
+			GetConsoleStringSize( buf, &tmp_len, &line_height );
+			length += tmp_len;
+
+			if ( length > MAX_LINE_WIDTH )
+			{  // needs to be broken up
+				if ( !last_break )
+					last_break = x-1;
+
+				x = last_break;
+
+				// find an empty string slot
+				int j;
+				do 
+				{
+					for ( j = 0; j < MAX_LINES; j++ )
+					{
+						if ( ! *g_szLineBuffer[j] )
+							break;
+					}
+					if ( j == MAX_LINES )
+					{
+						// need to make more room to display text, scroll stuff up then fix the pointers
+						int linesmoved = ScrollTextUp();
+						line -= linesmoved;
+						last_break = last_break - (sizeof(g_szLineBuffer[0]) * linesmoved);
+					}
+				}
+				while ( j == MAX_LINES );
+
+				// copy remaining string into next buffer,  making sure it starts with a space character
+				if ( (char)*last_break == (char)' ' )
+				{
+					int linelen = strlen(g_szLineBuffer[j]);
+					int remaininglen = strlen(last_break);
+
+					if ( (linelen - remaininglen) <= MAX_CHARS_PER_LINE )
+						strcat( g_szLineBuffer[j], last_break );
+				}
+				else
+				{
+					if ( (strlen(g_szLineBuffer[j]) - strlen(last_break) - 2) < MAX_CHARS_PER_LINE )
+					{
+						strcat( g_szLineBuffer[j], " " );
+						strcat( g_szLineBuffer[j], last_break );
+					}
+				}
+
+				*last_break = 0; // cut off the last string
+
+				EnsureTextFitsInOneLineAndWrapIfHaveTo( j );
+				break;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/source/cl_dll/soundsystem.cpp b/main/source/cl_dll/soundsystem.cpp
new file mode 100644
index 00000000..f04fa695
--- /dev/null
+++ b/main/source/cl_dll/soundsystem.cpp
@@ -0,0 +1,168 @@
+//======== (C) Copyright 1999, 2000 Valve, L.L.C. All rights reserved. ========
+//
+// The copyright to the contents herein is the property of Valve, L.L.C.
+// The contents may be used and/or copied only with the written permission of
+// Valve, L.L.C., or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile:     $
+// $Date: 2001/09/13 22:28:00 $
+//
+//-----------------------------------------------------------------------------
+// $Log: soundsystem.cpp,v $
+// Revision 1.2  2001/09/13 22:28:00  Charlie
+// - Updated NS with new Half-life 1108 patch in preparation for voice support and spectator mode
+//
+// Revision 1.1.2.1  2001/09/13 14:42:29  Charlie
+// - HL1108
+//
+//
+// $NoKeywords: $
+//=============================================================================
+#include <windows.h>
+#include <dsound.h>
+#include <mmsystem.h>
+#include "r_studioint.h"
+
+extern engine_studio_api_t IEngineStudio;
+
+#define RENDERTYPE_UNDEFINED	0
+#define RENDERTYPE_SOFTWARE		1
+#define RENDERTYPE_HARDWARE		2
+
+#define ENGINE_LAUNCHER_API_VERSION 1
+
+LPDIRECTSOUND       lpDS		= NULL;
+LPDIRECTSOUNDBUFFER lpDSBuf		= NULL;
+LPHWAVEOUT			lpHW		= NULL;
+
+static HMODULE hEngine = 0;
+
+typedef struct engine_api_s
+{
+	int		version;
+	int		rendertype;
+	int		size;
+
+	// Functions
+	void	( *unused1 )					( void );
+	void	( *unused2 )					( void );
+	void	( *unused3 )					( void );
+	void	( *unused4 )					( void );
+	void	( *unused5 )					( void );
+	void	( *unused6 )					( void );
+	void	( *unused7 )					( void );
+	void	( *unused8 )					( void );
+	void	( *unused9 )					( void );
+	void	( *unused10 )					( void );
+	void	( *unused11 )					( void );
+	void	( *unused12 )					( void );
+	void	( *unused13 )					( void );
+	void	( *unused14 )					( void );
+	void	( *unused15 )					( void );
+	void	( *unused16 )					( void );
+	void	( *unused17 )					( void );
+	void	( *unused18 )					( void );
+	void	( *unused19 )					( void );
+	void	( *unused20 )					( void );
+	void	( *unused21 )					( void );
+	void	( *unused22 )					( void );
+	void	( *unused23 )					( void );
+	void	( *unused24 )					( void );
+	void	( *unused25 )					( void );
+	void	( *unused26 )					( void );
+	void	( *unused27 )					( void );
+	void	( *unused28 )					( void );
+	void	( *unused29 )					( void );
+	void	( *unused30 )					( void );
+	void	( *unused31 )					( void );
+	void	( *unused32 )					( void );
+	void	( *unused33 )					( void );
+	void	( *unused34 )					( void );
+
+	void	( *S_GetDSPointer )				( struct IDirectSound **lpDS, struct IDirectSoundBuffer **lpDSBuf );
+	void 	*( *S_GetWAVPointer )			( void );
+
+	void	( *unused35 )					( void );
+	void	( *unused36 )					( void );
+	void	( *unused37 )					( void );
+	void	( *unused38 )					( void );
+	void	( *unused39 )					( void );
+	void	( *unused40 )					( void );
+	void	( *unused41 )					( void );
+	void	( *unused42 )					( void );
+	void	( *unused43 )					( void );
+	void	( *unused44 )					( void );
+	void	( *unused45 )					( void );
+	void	( *unused46 )					( void );
+	void	( *unused47 )					( void );
+	void	( *unused48 )					( void );
+	void	( *unused49 )					( void );
+	void	( *unused50 )					( void );
+	void	( *unused51 )					( void );
+	void	( *unused52 )					( void );
+	void	( *unused53 )					( void );
+	void	( *unused54 )					( void );
+	void	( *unused55 )					( void );
+} engine_api_t;
+
+static engine_api_t engineapi;
+
+typedef int (*engine_api_func)( int version, int size, struct engine_api_s *api );
+
+//-----------------------------------------------------------------------------
+// Purpose: Get launcher/engine interface from engine module
+// Input  : hMod - 
+// Output : int
+//-----------------------------------------------------------------------------
+int Eng_LoadFunctions( HMODULE hMod )
+{
+	engine_api_func pfnEngineAPI;
+	
+	pfnEngineAPI = ( engine_api_func )GetProcAddress( hMod, "Sys_EngineAPI"  );
+	if ( !pfnEngineAPI )
+		return 0;
+
+	if ( !(*pfnEngineAPI)( ENGINE_LAUNCHER_API_VERSION, sizeof( engine_api_t ), &engineapi ) )
+		return 0;
+
+	// All is okay
+	return 1;
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Load proper engine .dll and get pointer to either DSound and primary buffer or HWAVEOUT ( NT 4.0, e.g. )
+//-----------------------------------------------------------------------------
+void LoadSoundAPIs( void )
+{
+	hEngine = ::LoadLibrary( IEngineStudio.IsHardware() ? "hw.dll" : "sw.dll" );
+	if ( hEngine )
+	{
+		if ( Eng_LoadFunctions( hEngine ) )
+		{
+			if ( engineapi.S_GetDSPointer && engineapi.S_GetWAVPointer )
+			{
+				engineapi.S_GetDSPointer(&lpDS, &lpDSBuf);
+				lpHW = (HWAVEOUT FAR *)engineapi.S_GetWAVPointer();
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Close engine library, release sound pointers
+//-----------------------------------------------------------------------------
+void ShutdownSoundAPIs( void )
+{
+	if( hEngine )
+	{
+		FreeLibrary( hEngine );
+		hEngine = 0;
+	}
+	
+	lpDS = 0;
+	lpDSBuf = 0;
+	lpHW = 0;
+}
diff --git a/main/source/cl_dll/status_icons.cpp b/main/source/cl_dll/status_icons.cpp
new file mode 100644
index 00000000..2d9aeecc
--- /dev/null
+++ b/main/source/cl_dll/status_icons.cpp
@@ -0,0 +1,162 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// status_icons.cpp
+//
+#include "hud.h"
+#include "cl_util.h"
+#include "const.h"
+#include "entity_state.h"
+#include "cl_entity.h"
+#include <string.h>
+#include <stdio.h>
+#include "parsemsg.h"
+#include "event_api.h"
+
+DECLARE_MESSAGE( m_StatusIcons, StatusIcon );
+
+int CHudStatusIcons::Init( void )
+{
+	HOOK_MESSAGE( StatusIcon );
+
+	gHUD.AddHudElem( this );
+
+	Reset();
+
+	return 1;
+}
+
+int CHudStatusIcons::VidInit( void )
+{
+
+	return 1;
+}
+
+void CHudStatusIcons::Reset( void )
+{
+	memset( m_IconList, 0, sizeof m_IconList );
+	m_iFlags &= ~HUD_ACTIVE;
+}
+
+// Draw status icons along the left-hand side of the screen
+int CHudStatusIcons::Draw( float flTime )
+{
+	if (gEngfuncs.IsSpectateOnly())
+		return 1;
+	// find starting position to draw from, along right-hand side of screen
+	int x = 5;
+	int y = ScreenHeight() / 2;
+	
+	// loop through icon list, and draw any valid icons drawing up from the middle of screen
+	for ( int i = 0; i < MAX_ICONSPRITES; i++ )
+	{
+		if ( m_IconList[i].spr )
+		{
+			y -= ( m_IconList[i].rc.bottom - m_IconList[i].rc.top ) + 5;
+			
+			SPR_Set( m_IconList[i].spr, m_IconList[i].r, m_IconList[i].g, m_IconList[i].b );
+			SPR_DrawAdditive( 0, x, y, &m_IconList[i].rc );
+		}
+	}
+	
+	return 1;
+}
+
+// Message handler for StatusIcon message
+// accepts five values:
+//		byte   : TRUE = ENABLE icon, FALSE = DISABLE icon
+//		string : the sprite name to display
+//		byte   : red
+//		byte   : green
+//		byte   : blue
+int CHudStatusIcons::MsgFunc_StatusIcon( const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+
+	int ShouldEnable = READ_BYTE();
+	char *pszIconName = READ_STRING();
+	if ( ShouldEnable )
+	{
+		int r = READ_BYTE();
+		int g = READ_BYTE();
+		int b = READ_BYTE();
+		EnableIcon( pszIconName, r, g, b );
+		m_iFlags |= HUD_ACTIVE;
+	}
+	else
+	{
+		DisableIcon( pszIconName );
+	}
+
+	return 1;
+}
+
+// add the icon to the icon list, and set it's drawing color
+void CHudStatusIcons::EnableIcon( char *pszIconName, unsigned char red, unsigned char green, unsigned char blue )
+{
+	// check to see if the sprite is in the current list
+	for ( int i = 0; i < MAX_ICONSPRITES; i++ )
+	{
+		if ( !stricmp( m_IconList[i].szSpriteName, pszIconName ) )
+			break;
+	}
+
+	if ( i == MAX_ICONSPRITES )
+	{
+		// icon not in list, so find an empty slot to add to
+		for ( i = 0; i < MAX_ICONSPRITES; i++ )
+		{
+			if ( !m_IconList[i].spr )
+				break;
+		}
+	}
+
+	// if we've run out of space in the list, overwrite the first icon
+	if ( i == MAX_ICONSPRITES )
+	{
+		i = 0;
+	}
+
+	// Load the sprite and add it to the list
+	// the sprite must be listed in hud.txt
+	int spr_index = gHUD.GetSpriteIndex( pszIconName );
+	m_IconList[i].spr = gHUD.GetSprite( spr_index );
+	m_IconList[i].rc = gHUD.GetSpriteRect( spr_index );
+	m_IconList[i].r = red;
+	m_IconList[i].g = green;
+	m_IconList[i].b = blue;
+	strcpy( m_IconList[i].szSpriteName, pszIconName );
+
+	// Hack: Play Timer sound when a grenade icon is played (in 0.8 seconds)
+	if ( strstr(m_IconList[i].szSpriteName, "grenade") )
+	{
+		cl_entity_t *pthisplayer = gEngfuncs.GetLocalPlayer();
+		gEngfuncs.pEventAPI->EV_PlaySound( pthisplayer->index, pthisplayer->origin, CHAN_STATIC, "weapons/timer.wav", 1.0, ATTN_NORM, 0, PITCH_NORM );
+	}
+}
+
+void CHudStatusIcons::DisableIcon( char *pszIconName )
+{
+	// find the sprite is in the current list
+	for ( int i = 0; i < MAX_ICONSPRITES; i++ )
+	{
+		if ( !stricmp( m_IconList[i].szSpriteName, pszIconName ) )
+		{
+			// clear the item from the list
+			memset( &m_IconList[i], 0, sizeof icon_sprite_t );
+			return;
+		}
+	}
+}
diff --git a/main/source/cl_dll/statusbar.cpp b/main/source/cl_dll/statusbar.cpp
new file mode 100644
index 00000000..c2615511
--- /dev/null
+++ b/main/source/cl_dll/statusbar.cpp
@@ -0,0 +1,300 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// statusbar.cpp
+//
+// generic text status bar, set by game dll
+// runs across bottom of screen
+//
+
+#include "hud.h"
+#include "cl_util.h"
+#include "parsemsg.h"
+
+#include <string.h>
+#include <stdio.h>
+
+DECLARE_MESSAGE( m_StatusBar, StatusText );
+DECLARE_MESSAGE( m_StatusBar, StatusValue );
+
+#define STATUSBAR_ID_LINE		1
+
+float *GetClientColor( int clientIndex );
+extern float g_ColorYellow[3];
+
+int CHudStatusBar :: Init( void )
+{
+	//gHUD.AddHudElem( this );
+
+	HOOK_MESSAGE( StatusText );
+	HOOK_MESSAGE( StatusValue );
+
+	Reset();
+
+	CVAR_CREATE( "hud_centerid", "0", FCVAR_ARCHIVE );
+
+	return 1;
+}
+
+int CHudStatusBar :: VidInit( void )
+{
+	// Load sprites here
+
+	return 1;
+}
+
+void CHudStatusBar :: Reset( void )
+{
+	int i = 0;
+
+	m_iFlags &= ~HUD_ACTIVE;  // start out inactive
+	for ( i = 0; i < MAX_STATUSBAR_LINES; i++ )
+    {
+		m_szStatusText[i][0] = 0;
+        m_iStatusValues[i] = -1;
+    }
+	
+    //memset( m_iStatusValues, 0, sizeof m_iStatusValues );
+
+	m_iStatusValues[0] = 1;  // 0 is the special index, which always returns true
+
+	// reset our colors for the status bar lines (yellow is default)
+	for ( i = 0; i < MAX_STATUSBAR_LINES; i++ )
+		m_pflNameColors[i] = g_ColorYellow;
+}
+
+const char* CHudStatusBar::GetStatusString() const
+{
+	static char kStatusString[1024];
+
+	memset(kStatusString, 0, 1024);
+
+	for(int i = 0; i < MAX_STATUSBAR_LINES; i++)
+	{
+		const char* theCurrentString = m_szStatusBar[i];
+		if(strlen(theCurrentString) > 0)
+		{
+			strcat(kStatusString, theCurrentString);
+		}
+	}
+
+	return kStatusString;
+}
+
+void CHudStatusBar :: ParseStatusString( int line_num )
+{
+	// localise string first
+	char szBuffer[MAX_STATUSTEXT_LENGTH];
+	memset( szBuffer, 0, sizeof szBuffer );
+	gHUD.m_TextMessage.LocaliseTextString( m_szStatusText[line_num], szBuffer, MAX_STATUSTEXT_LENGTH );
+
+	// parse m_szStatusText & m_iStatusValues into m_szStatusBar
+	memset( m_szStatusBar[line_num], 0, MAX_STATUSTEXT_LENGTH );
+	char *src = szBuffer;
+	char *dst = m_szStatusBar[line_num];
+
+	char *src_start = src, *dst_start = dst;
+
+	while ( *src != 0 )
+	{
+		while ( *src == '\n' )
+			src++;  // skip over any newlines
+
+		if ( ((src - src_start) >= MAX_STATUSTEXT_LENGTH) || ((dst - dst_start) >= MAX_STATUSTEXT_LENGTH) )
+			break;
+
+		int index = atoi( src );
+		// should we draw this line?
+		if ( (index >= 0 && index < MAX_STATUSBAR_VALUES) && (m_iStatusValues[index] != -1))
+		{  // parse this line and append result to the status bar
+			while ( *src >= '0' && *src <= '9' )
+				src++;
+
+			if ( *src == '\n' || *src == 0 )
+				continue; // no more left in this text line
+
+			// copy the text, char by char, until we hit a % or a \n
+			while ( *src != '\n' && *src != 0 )
+			{
+				if ( *src != '%' )
+				{  // just copy the character
+					*dst = *src;
+					dst++, src++;
+				}
+				else
+				{
+					// get the descriptor
+					char valtype = *(++src); // move over %
+
+					// if it's a %, draw a % sign
+					if ( valtype == '%' )
+					{
+						*dst = valtype;
+						dst++, src++;
+						continue;
+					}
+
+					// move over descriptor, then get and move over the index
+					index = atoi( ++src ); 
+					while ( *src >= '0' && *src <= '9' )
+						src++;
+
+					if ( index >= 0 && index < MAX_STATUSBAR_VALUES )
+					{
+						int indexval = m_iStatusValues[index];
+
+						// get the string to substitute in place of the %XX
+						char szRepString[MAX_PLAYER_NAME_LENGTH];
+						switch ( valtype )
+						{
+						case 'p':  // player name
+							GetPlayerInfo( indexval, &g_PlayerInfoList[indexval] );
+							if ( g_PlayerInfoList[indexval].name != NULL )
+							{
+								strncpy( szRepString, g_PlayerInfoList[indexval].name, MAX_PLAYER_NAME_LENGTH );
+								m_pflNameColors[line_num] = GetClientColor( indexval );
+							}
+							else
+							{
+								strcpy( szRepString, "******" );
+							}
+
+							break;
+						case 'i':  // number
+							sprintf( szRepString, "%d", indexval );
+							break;
+						default:
+							szRepString[0] = 0;
+						}
+
+						for ( char *cp = szRepString; *cp != 0 && ((dst - dst_start) < MAX_STATUSTEXT_LENGTH); cp++, dst++ )
+							*dst = *cp;
+					}
+				}
+			}
+		}
+		else
+		{
+			// skip to next line of text
+			while ( *src != 0 && *src != '\n' )
+				src++;
+		}
+	}
+}
+
+void CHudStatusBar::ReparseStringIfNeeded()
+{
+	if ( m_bReparseString )
+	{
+		for ( int i = 0; i < MAX_STATUSBAR_LINES; i++ )
+		{
+			m_pflNameColors[i] = g_ColorYellow;
+			ParseStatusString( i );
+		}
+		m_bReparseString = FALSE;
+	}
+	
+}
+
+int CHudStatusBar :: Draw( float fTime )
+{
+ 
+	this->ReparseStringIfNeeded();
+
+	// Draw the status bar lines
+	for ( int i = 0; i < MAX_STATUSBAR_LINES; i++ )
+	{
+		int TextHeight, TextWidth;
+		GetConsoleStringSize( m_szStatusBar[i], &TextWidth, &TextHeight );
+
+		int Y_START;
+		if ( ScreenHeight() >= 480 )
+			Y_START = ScreenHeight() - 55;
+		else
+			Y_START = ScreenHeight() - 45;
+
+		int x = 5;
+		int y = Y_START - ( TextHeight * i ); // draw along bottom of screen
+
+		// let user set status ID bar centering
+		if ( (i == STATUSBAR_ID_LINE) && CVAR_GET_FLOAT("hud_centerid") )
+		{
+			x = max( 0, max(2, (ScreenWidth() - TextWidth)) / 2 );
+			y = (ScreenHeight() / 2) + (TextHeight*CVAR_GET_FLOAT("hud_centerid"));
+		}
+
+		if ( m_pflNameColors[i] )
+			DrawSetTextColor( m_pflNameColors[i][0], m_pflNameColors[i][1], m_pflNameColors[i][2] );
+
+		DrawConsoleString( x, y, m_szStatusBar[i] );
+	}
+
+	return 1;
+}
+
+// Message handler for StatusText message
+// accepts two values:
+//		byte: line number of status bar text 
+//		string: status bar text
+// this string describes how the status bar should be drawn
+// a semi-regular expression:
+// ( slotnum ([a..z] [%pX] [%iX])*)*
+// where slotnum is an index into the Value table (see below)
+// if slotnum is 0, the string is always drawn
+// if StatusValue[slotnum] != 0, the following string is drawn, upto the next newline - otherwise the text is skipped upto next newline
+// %pX, where X is an integer, will substitute a player name here, getting the player index from StatusValue[X]
+// %iX, where X is an integer, will substitute a number here, getting the number from StatusValue[X]
+int CHudStatusBar :: MsgFunc_StatusText( const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+
+	int line = READ_BYTE();
+
+	if ( line < 0 || line >= MAX_STATUSBAR_LINES )
+		return 1;
+
+	strncpy( m_szStatusText[line], READ_STRING(), MAX_STATUSTEXT_LENGTH );
+	m_szStatusText[line][MAX_STATUSTEXT_LENGTH-1] = 0;  // ensure it's null terminated ( strncpy() won't null terminate if read string too long)
+
+	if ( m_szStatusText[0] == 0 )
+		m_iFlags &= ~HUD_ACTIVE;
+	else
+		m_iFlags |= HUD_ACTIVE;  // we have status text, so turn on the status bar
+
+	m_bReparseString = TRUE;
+	this->ReparseStringIfNeeded();
+
+	return 1;
+}
+
+// Message handler for StatusText message
+// accepts two values:
+//		byte: index into the status value array
+//		short: value to store
+int CHudStatusBar :: MsgFunc_StatusValue( const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+
+	int index = READ_BYTE();
+	if ( index < 1 || index >= MAX_STATUSBAR_VALUES )
+		return 1; // index out of range
+
+	m_iStatusValues[index] = READ_SHORT();
+
+	m_bReparseString = TRUE;
+	this->ReparseStringIfNeeded();
+	
+	return 1;
+}
\ No newline at end of file
diff --git a/main/source/cl_dll/studio_util.cpp b/main/source/cl_dll/studio_util.cpp
new file mode 100644
index 00000000..87fc4471
--- /dev/null
+++ b/main/source/cl_dll/studio_util.cpp
@@ -0,0 +1,244 @@
+#include <memory.h>
+#include "hud.h"
+#include "cl_util.h"
+#include "const.h"
+#include "com_model.h"
+#include "studio_util.h"
+
+/*
+====================
+AngleMatrix
+
+====================
+*/
+void AngleMatrix (const float *angles, float (*matrix)[4] )
+{
+	float		angle;
+	float		sr, sp, sy, cr, cp, cy;
+	
+	angle = angles[YAW] * (M_PI*2 / 360);
+	sy = sin(angle);
+	cy = cos(angle);
+	angle = angles[PITCH] * (M_PI*2 / 360);
+	sp = sin(angle);
+	cp = cos(angle);
+	angle = angles[ROLL] * (M_PI*2 / 360);
+	sr = sin(angle);
+	cr = cos(angle);
+
+	// matrix = (YAW * PITCH) * ROLL
+	matrix[0][0] = cp*cy;
+	matrix[1][0] = cp*sy;
+	matrix[2][0] = -sp;
+	matrix[0][1] = sr*sp*cy+cr*-sy;
+	matrix[1][1] = sr*sp*sy+cr*cy;
+	matrix[2][1] = sr*cp;
+	matrix[0][2] = (cr*sp*cy+-sr*-sy);
+	matrix[1][2] = (cr*sp*sy+-sr*cy);
+	matrix[2][2] = cr*cp;
+	matrix[0][3] = 0.0;
+	matrix[1][3] = 0.0;
+	matrix[2][3] = 0.0;
+}
+
+/*
+====================
+VectorCompare
+
+====================
+*/
+int VectorCompare (const float *v1, const float *v2)
+{
+	int		i;
+	
+	for (i=0 ; i<3 ; i++)
+		if (v1[i] != v2[i])
+			return 0;
+			
+	return 1;
+}
+
+/*
+====================
+CrossProduct
+
+====================
+*/
+void CrossProduct (const float *v1, const float *v2, float *cross)
+{
+	cross[0] = v1[1]*v2[2] - v1[2]*v2[1];
+	cross[1] = v1[2]*v2[0] - v1[0]*v2[2];
+	cross[2] = v1[0]*v2[1] - v1[1]*v2[0];
+}
+
+/*
+====================
+VectorTransform
+
+====================
+*/
+void VectorTransform (const float *in1, float in2[3][4], float *out)
+{
+	out[0] = DotProduct(in1, in2[0]) + in2[0][3];
+	out[1] = DotProduct(in1, in2[1]) + in2[1][3];
+	out[2] = DotProduct(in1, in2[2]) + in2[2][3];
+}
+
+/*
+================
+ConcatTransforms
+
+================
+*/
+void ConcatTransforms (float in1[3][4], float in2[3][4], float out[3][4])
+{
+	out[0][0] = in1[0][0] * in2[0][0] + in1[0][1] * in2[1][0] +
+				in1[0][2] * in2[2][0];
+	out[0][1] = in1[0][0] * in2[0][1] + in1[0][1] * in2[1][1] +
+				in1[0][2] * in2[2][1];
+	out[0][2] = in1[0][0] * in2[0][2] + in1[0][1] * in2[1][2] +
+				in1[0][2] * in2[2][2];
+	out[0][3] = in1[0][0] * in2[0][3] + in1[0][1] * in2[1][3] +
+				in1[0][2] * in2[2][3] + in1[0][3];
+	out[1][0] = in1[1][0] * in2[0][0] + in1[1][1] * in2[1][0] +
+				in1[1][2] * in2[2][0];
+	out[1][1] = in1[1][0] * in2[0][1] + in1[1][1] * in2[1][1] +
+				in1[1][2] * in2[2][1];
+	out[1][2] = in1[1][0] * in2[0][2] + in1[1][1] * in2[1][2] +
+				in1[1][2] * in2[2][2];
+	out[1][3] = in1[1][0] * in2[0][3] + in1[1][1] * in2[1][3] +
+				in1[1][2] * in2[2][3] + in1[1][3];
+	out[2][0] = in1[2][0] * in2[0][0] + in1[2][1] * in2[1][0] +
+				in1[2][2] * in2[2][0];
+	out[2][1] = in1[2][0] * in2[0][1] + in1[2][1] * in2[1][1] +
+				in1[2][2] * in2[2][1];
+	out[2][2] = in1[2][0] * in2[0][2] + in1[2][1] * in2[1][2] +
+				in1[2][2] * in2[2][2];
+	out[2][3] = in1[2][0] * in2[0][3] + in1[2][1] * in2[1][3] +
+				in1[2][2] * in2[2][3] + in1[2][3];
+}
+
+// angles index are not the same as ROLL, PITCH, YAW
+
+/*
+====================
+AngleQuaternion
+
+====================
+*/
+void AngleQuaternion( float *angles, vec4_t quaternion )
+{
+	float		angle;
+	float		sr, sp, sy, cr, cp, cy;
+
+	// FIXME: rescale the inputs to 1/2 angle
+	angle = angles[2] * 0.5;
+	sy = sin(angle);
+	cy = cos(angle);
+	angle = angles[1] * 0.5;
+	sp = sin(angle);
+	cp = cos(angle);
+	angle = angles[0] * 0.5;
+	sr = sin(angle);
+	cr = cos(angle);
+
+	quaternion[0] = sr*cp*cy-cr*sp*sy; // X
+	quaternion[1] = cr*sp*cy+sr*cp*sy; // Y
+	quaternion[2] = cr*cp*sy-sr*sp*cy; // Z
+	quaternion[3] = cr*cp*cy+sr*sp*sy; // W
+}
+
+/*
+====================
+QuaternionSlerp
+
+====================
+*/
+void QuaternionSlerp( vec4_t p, vec4_t q, float t, vec4_t qt )
+{
+	int i;
+	float	omega, cosom, sinom, sclp, sclq;
+
+	// decide if one of the quaternions is backwards
+	float a = 0;
+	float b = 0;
+
+	for (i = 0; i < 4; i++)
+	{
+		a += (p[i]-q[i])*(p[i]-q[i]);
+		b += (p[i]+q[i])*(p[i]+q[i]);
+	}
+	if (a > b)
+	{
+		for (i = 0; i < 4; i++)
+		{
+			q[i] = -q[i];
+		}
+	}
+
+	cosom = p[0]*q[0] + p[1]*q[1] + p[2]*q[2] + p[3]*q[3];
+
+	if ((1.0 + cosom) > 0.000001)
+	{
+		if ((1.0 - cosom) > 0.000001)
+		{
+			omega = acos( cosom );
+			sinom = sin( omega );
+			sclp = sin( (1.0 - t)*omega) / sinom;
+			sclq = sin( t*omega ) / sinom;
+		}
+		else
+		{
+			sclp = 1.0 - t;
+			sclq = t;
+		}
+		for (i = 0; i < 4; i++) {
+			qt[i] = sclp * p[i] + sclq * q[i];
+		}
+	}
+	else
+	{
+		qt[0] = -q[1];
+		qt[1] = q[0];
+		qt[2] = -q[3];
+		qt[3] = q[2];
+		sclp = sin( (1.0 - t) * (0.5 * M_PI));
+		sclq = sin( t * (0.5 * M_PI));
+		for (i = 0; i < 3; i++)
+		{
+			qt[i] = sclp * p[i] + sclq * qt[i];
+		}
+	}
+}
+
+/*
+====================
+QuaternionMatrix
+
+====================
+*/
+void QuaternionMatrix( vec4_t quaternion, float (*matrix)[4] )
+{
+	matrix[0][0] = 1.0 - 2.0 * quaternion[1] * quaternion[1] - 2.0 * quaternion[2] * quaternion[2];
+	matrix[1][0] = 2.0 * quaternion[0] * quaternion[1] + 2.0 * quaternion[3] * quaternion[2];
+	matrix[2][0] = 2.0 * quaternion[0] * quaternion[2] - 2.0 * quaternion[3] * quaternion[1];
+
+	matrix[0][1] = 2.0 * quaternion[0] * quaternion[1] - 2.0 * quaternion[3] * quaternion[2];
+	matrix[1][1] = 1.0 - 2.0 * quaternion[0] * quaternion[0] - 2.0 * quaternion[2] * quaternion[2];
+	matrix[2][1] = 2.0 * quaternion[1] * quaternion[2] + 2.0 * quaternion[3] * quaternion[0];
+
+	matrix[0][2] = 2.0 * quaternion[0] * quaternion[2] + 2.0 * quaternion[3] * quaternion[1];
+	matrix[1][2] = 2.0 * quaternion[1] * quaternion[2] - 2.0 * quaternion[3] * quaternion[0];
+	matrix[2][2] = 1.0 - 2.0 * quaternion[0] * quaternion[0] - 2.0 * quaternion[1] * quaternion[1];
+}
+
+/*
+====================
+MatrixCopy
+
+====================
+*/
+void MatrixCopy( float in[3][4], float out[3][4] )
+{
+	memcpy( out, in, sizeof( float ) * 3 * 4 );
+}
\ No newline at end of file
diff --git a/main/source/cl_dll/studio_util.h b/main/source/cl_dll/studio_util.h
new file mode 100644
index 00000000..df472ee6
--- /dev/null
+++ b/main/source/cl_dll/studio_util.h
@@ -0,0 +1,33 @@
+#if !defined( STUDIO_UTIL_H )
+#define STUDIO_UTIL_H
+#if defined( WIN32 )
+#pragma once
+#endif
+
+#ifndef M_PI
+#define M_PI		3.14159265358979323846	// matches value in gcc v2 math.h
+#endif
+
+#ifndef PITCH
+// MOVEMENT INFO
+// up / down
+#define	PITCH	0
+// left / right
+#define	YAW		1
+// fall over
+#define	ROLL	2
+#endif
+
+#define FDotProduct( a, b ) (fabs((a[0])*(b[0])) + fabs((a[1])*(b[1])) + fabs((a[2])*(b[2])))
+
+void	AngleMatrix (const float *angles, float (*matrix)[4] );
+int		VectorCompare (const float *v1, const float *v2);
+void	CrossProduct (const float *v1, const float *v2, float *cross);
+void	VectorTransform (const float *in1, float in2[3][4], float *out);
+void	ConcatTransforms (float in1[3][4], float in2[3][4], float out[3][4]);
+void	MatrixCopy( float in[3][4], float out[3][4] );
+void	QuaternionMatrix( vec4_t quaternion, float (*matrix)[4] );
+void	QuaternionSlerp( vec4_t p, vec4_t q, float t, vec4_t qt );
+void	AngleQuaternion( float *angles, vec4_t quaternion );
+
+#endif // STUDIO_UTIL_H
\ No newline at end of file
diff --git a/main/source/cl_dll/text_message.cpp b/main/source/cl_dll/text_message.cpp
new file mode 100644
index 00000000..277f8b0c
--- /dev/null
+++ b/main/source/cl_dll/text_message.cpp
@@ -0,0 +1,213 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// text_message.cpp
+//
+// implementation of CHudTextMessage class
+//
+// this class routes messages through titles.txt for localisation
+//
+
+#include "hud.h"
+#include "cl_util.h"
+#include <string.h>
+#include <stdio.h>
+#include "parsemsg.h"
+
+#include "vgui_TeamFortressViewport.h"
+
+DECLARE_MESSAGE( m_TextMessage, TextMsg );
+
+int CHudTextMessage::Init(void)
+{
+	HOOK_MESSAGE( TextMsg );
+
+	gHUD.AddHudElem( this );
+
+	Reset();
+
+	return 1;
+};
+
+// Searches through the string for any msg names (indicated by a '#')
+// any found are looked up in titles.txt and the new message substituted
+// the new value is pushed into dst_buffer
+char *CHudTextMessage::LocaliseTextString( const char *msg, char *dst_buffer, int buffer_size )
+{
+	char *dst = dst_buffer;
+	for ( char *src = (char*)msg; *src != 0 && buffer_size > 0; buffer_size-- )
+	{
+		if ( *src == '#' )
+		{
+			// cut msg name out of string
+			static char word_buf[255];
+			char *wdst = word_buf, *word_start = src;
+			for ( ++src ; (*src >= 'A' && *src <= 'z') || (*src >= '0' && *src <= '9'); wdst++, src++ )
+			{
+				*wdst = *src;
+			}
+			*wdst = 0;
+
+			// lookup msg name in titles.txt
+			client_textmessage_t *clmsg = TextMessageGet( word_buf );
+			if ( !clmsg || !(clmsg->pMessage) )
+			{
+				src = word_start;
+				*dst = *src;
+				dst++, src++;
+				continue;
+			}
+
+			// copy string into message over the msg name
+			for ( char *wsrc = (char*)clmsg->pMessage; *wsrc != 0; wsrc++, dst++ )
+			{
+				*dst = *wsrc;
+			}
+			*dst = 0;
+		}
+		else
+		{
+			*dst = *src;
+			dst++, src++;
+			*dst = 0;
+		}
+	}
+
+	dst_buffer[buffer_size-1] = 0; // ensure null termination
+	return dst_buffer;
+}
+
+// As above, but with a local static buffer
+char *CHudTextMessage::BufferedLocaliseTextString( const char *msg )
+{
+	static char dst_buffer[1024];
+	LocaliseTextString( msg, dst_buffer, 1024 );
+	return dst_buffer;
+}
+
+// Simplified version of LocaliseTextString;  assumes string is only one word
+char *CHudTextMessage::LookupString( const char *msg, int *msg_dest )
+{
+	if ( !msg )
+		return "";
+
+	// '#' character indicates this is a reference to a string in titles.txt, and not the string itself
+	if ( msg[0] == '#' ) 
+	{
+		// this is a message name, so look up the real message
+		client_textmessage_t *clmsg = TextMessageGet( msg+1 );
+
+		if ( !clmsg || !(clmsg->pMessage) )
+			return (char*)msg; // lookup failed, so return the original string
+		
+		if ( msg_dest )
+		{
+			// check to see if titles.txt info overrides msg destination
+			// if clmsg->effect is less than 0, then clmsg->effect holds -1 * message_destination
+			if ( clmsg->effect < 0 )  // 
+				*msg_dest = -clmsg->effect;
+		}
+
+		return (char*)clmsg->pMessage;
+	}
+	else
+	{  // nothing special about this message, so just return the same string
+		return (char*)msg;
+	}
+}
+
+void StripEndNewlineFromString( char *str )
+{
+	int s = strlen( str ) - 1;
+	if ( str[s] == '\n' || str[s] == '\r' )
+		str[s] = 0;
+}
+
+// converts all '\r' characters to '\n', so that the engine can deal with the properly
+// returns a pointer to str
+char* ConvertCRtoNL( char *str )
+{
+	for ( char *ch = str; *ch != 0; ch++ )
+		if ( *ch == '\r' )
+			*ch = '\n';
+	return str;
+}
+
+// Message handler for text messages
+// displays a string, looking them up from the titles.txt file, which can be localised
+// parameters:
+//   byte:   message direction  ( HUD_PRINTCONSOLE, HUD_PRINTNOTIFY, HUD_PRINTCENTER, HUD_PRINTTALK )
+//   string: message
+// optional parameters:
+//   string: message parameter 1
+//   string: message parameter 2
+//   string: message parameter 3
+//   string: message parameter 4
+// any string that starts with the character '#' is a message name, and is used to look up the real message in titles.txt
+// the next (optional) one to four strings are parameters for that string (which can also be message names if they begin with '#')
+int CHudTextMessage::MsgFunc_TextMsg( const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+
+	int msg_dest = READ_BYTE();
+
+	static char szBuf[6][128];
+	char *msg_text = LookupString( READ_STRING(), &msg_dest );
+	msg_text = strcpy( szBuf[0], msg_text );
+
+	// keep reading strings and using C format strings for subsituting the strings into the localised text string
+	char *sstr1 = LookupString( READ_STRING() );
+	sstr1 = strcpy( szBuf[1], sstr1 );
+	StripEndNewlineFromString( sstr1 );  // these strings are meant for subsitution into the main strings, so cull the automatic end newlines
+	char *sstr2 = LookupString( READ_STRING() );
+	sstr2 = strcpy( szBuf[2], sstr2 );
+	StripEndNewlineFromString( sstr2 );
+	char *sstr3 = LookupString( READ_STRING() );
+	sstr3 = strcpy( szBuf[3], sstr3 );
+	StripEndNewlineFromString( sstr3 );
+	char *sstr4 = LookupString( READ_STRING() );
+	sstr4 = strcpy( szBuf[4], sstr4 );
+	StripEndNewlineFromString( sstr4 );
+	char *psz = szBuf[5];
+
+	if ( gViewPort && gViewPort->AllowedToPrintText() == FALSE )
+		return 1;
+
+	switch ( msg_dest )
+	{
+	case HUD_PRINTCENTER:
+		sprintf( psz, msg_text, sstr1, sstr2, sstr3, sstr4 );
+		CenterPrint( ConvertCRtoNL( psz ) );
+		break;
+
+	case HUD_PRINTNOTIFY:
+		psz[0] = 1;  // mark this message to go into the notify buffer
+		sprintf( psz+1, msg_text, sstr1, sstr2, sstr3, sstr4 );
+		ConsolePrint( ConvertCRtoNL( psz ) );
+		break;
+
+	case HUD_PRINTTALK:
+		sprintf( psz, msg_text, sstr1, sstr2, sstr3, sstr4 );
+		gHUD.m_SayText.SayTextPrint( ConvertCRtoNL( psz ), 128 );
+		break;
+
+	case HUD_PRINTCONSOLE:
+		sprintf( psz, msg_text, sstr1, sstr2, sstr3, sstr4 );
+		ConsolePrint( ConvertCRtoNL( psz ) );
+		break;
+	}
+
+	return 1;
+}
diff --git a/main/source/cl_dll/tf_defs.h b/main/source/cl_dll/tf_defs.h
new file mode 100644
index 00000000..2e0ead56
--- /dev/null
+++ b/main/source/cl_dll/tf_defs.h
@@ -0,0 +1,1387 @@
+/***
+*
+*	Copyright (c) 1996-2002, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+****/
+
+#ifndef __TF_DEFS_H
+#define __TF_DEFS_H
+
+//===========================================================================
+// OLD OPTIONS.QC
+//===========================================================================
+#define DEFAULT_AUTOZOOM		 FALSE
+#define WEINER_SNIPER                           // autoaiming for sniper rifle
+#define FLAME_MAXWORLDNUM        20             // maximum number of flames in the world. DO NOT PUT BELOW 20.
+
+//#define MAX_WORLD_PIPEBOMBS      15             // This is divided between teams - this is the most you should have on a net server
+#define MAX_PLAYER_PIPEBOMBS	 8				// maximum number of pipebombs any 1 player can have active
+#define MAX_PLAYER_AMMOBOXES  3				// maximum number of ammoboxes any 1 player can have active
+
+//#define MAX_WORLD_FLARES         9              // This is the total number of flares allowed in the world at one time
+//#define MAX_WORLD_AMMOBOXES      20             // This is divided between teams - this is the most you should have on a net server
+#define GR_TYPE_MIRV_NO          4              // Number of Mirvs a Mirv Grenade breaks into
+#define GR_TYPE_NAPALM_NO        8              // Number of flames napalm grenade breaks into (unused if net server)
+#define MEDIKIT_IS_BIOWEAPON					// Medikit acts as a bioweapon against enemies
+
+#define TEAM_HELP_RATE   60     // used only if teamplay bit 64 (help team with lower score) is set.  
+								// 60 is a mild setting, and won't make too much difference
+								// increasing it _decreases_ the amount of help the losing team gets
+								// Minimum setting is 1, which would really help the losing team
+
+#define DISPLAY_CLASS_HELP			TRUE            // Change this to #OFF if you don't want the class help to 
+													// appear whenever a player connects
+#define NEVER_TEAMFRAGS				FALSE			// teamfrags options always off 
+#define ALWAYS_TEAMFRAGS			FALSE			// teamfrags options always on 
+#define CHECK_SPEEDS				TRUE            // makes sure players aren't moving too fast
+#define SNIPER_RIFLE_RELOAD_TIME    1.5				// seconds
+
+#define MAPBRIEFING_MAXTEXTLENGTH	512
+#define PLAYER_PUSH_VELOCITY			 50			// Players push teammates if they're moving under this speed
+
+// Debug Options
+//#define MAP_DEBUG                     // Debug for Map code. I suggest running in a hi-res
+										// mode and/or piping the output from the server to a file.
+#ifdef MAP_DEBUG
+	#define MDEBUG(x) x
+#else
+	#define MDEBUG(x)
+#endif
+//#define VERBOSE                       // Verbose Debugging on/off
+
+//===========================================================================
+// OLD QUAKE Defs
+//===========================================================================
+// items
+#define IT_AXE					4096 
+#define IT_SHOTGUN				1 
+#define IT_SUPER_SHOTGUN		2 
+#define IT_NAILGUN				4 
+#define IT_SUPER_NAILGUN		8 
+#define IT_GRENADE_LAUNCHER		16 
+#define IT_ROCKET_LAUNCHER		32 
+#define IT_LIGHTNING			64 
+#define IT_EXTRA_WEAPON			128 
+
+#define IT_SHELLS				256 
+#define IT_NAILS				512 
+#define IT_ROCKETS				1024 
+#define IT_CELLS				2048 
+
+#define IT_ARMOR1				8192 
+#define IT_ARMOR2				16384 
+#define IT_ARMOR3				32768 
+#define IT_SUPERHEALTH			65536 
+
+#define IT_KEY1					131072 
+#define IT_KEY2					262144 
+
+#define IT_INVISIBILITY			524288 
+#define IT_INVULNERABILITY		1048576 
+#define IT_SUIT					2097152
+#define IT_QUAD					4194304 
+#define IT_HOOK					8388608
+
+#define IT_KEY3					16777216	// Stomp invisibility
+#define IT_KEY4					33554432	// Stomp invulnerability
+
+//===========================================================================
+// TEAMFORTRESS Defs
+//===========================================================================
+// TeamFortress State Flags
+#define TFSTATE_GRENPRIMED		1 	// Whether the player has a primed grenade
+#define TFSTATE_RELOADING		2 	// Whether the player is reloading
+#define TFSTATE_ALTKILL			4  	// #TRUE if killed with a weapon not in self.weapon: NOT USED ANYMORE
+#define TFSTATE_RANDOMPC		8   // Whether Playerclass is random, new one each respawn
+#define TFSTATE_INFECTED		16 	// set when player is infected by the bioweapon
+#define TFSTATE_INVINCIBLE		32 	// Player has permanent Invincibility (Usually by GoalItem)
+#define TFSTATE_INVISIBLE		64 	// Player has permanent Invisibility (Usually by GoalItem)
+#define TFSTATE_QUAD			128 // Player has permanent Quad Damage (Usually by GoalItem)
+#define TFSTATE_RADSUIT			256 // Player has permanent Radsuit (Usually by GoalItem)
+#define TFSTATE_BURNING			512 // Is on fire
+#define TFSTATE_GRENTHROWING	1024  // is throwing a grenade
+#define TFSTATE_AIMING			2048  // is using the laser sight
+#define TFSTATE_ZOOMOFF			4096  // doesn't want the FOV changed when zooming
+#define TFSTATE_RESPAWN_READY	8192  // is waiting for respawn, and has pressed fire
+#define TFSTATE_HALLUCINATING  16384  // set when player is hallucinating
+#define TFSTATE_TRANQUILISED   32768  // set when player is tranquilised
+#define TFSTATE_CANT_MOVE	   65536  // set when player is setting a detpack
+#define TFSTATE_RESET_FLAMETIME 131072 // set when the player has to have his flames increased in health
+
+// Defines used by TF_T_Damage (see combat.qc)
+#define TF_TD_IGNOREARMOUR	1  // Bypasses the armour of the target
+#define TF_TD_NOTTEAM		2  // Doesn't damage a team member (indicates direct fire weapon)
+#define TF_TD_NOTSELF		4  // Doesn't damage self
+
+#define TF_TD_OTHER			0  // Ignore armorclass
+#define TF_TD_SHOT			1  // Bullet damage
+#define TF_TD_NAIL			2  // Nail damage
+#define TF_TD_EXPLOSION		4  // Explosion damage
+#define TF_TD_ELECTRICITY	8  // Electric damage
+#define TF_TD_FIRE			16  // Fire damage
+#define TF_TD_NOSOUND		256 // Special damage. Makes no sound/painframe, etc
+
+/*==================================================*/
+/* Toggleable Game Settings							*/
+/*==================================================*/
+#define TF_RESPAWNDELAY1	5 	// seconds of waiting before player can respawn
+#define TF_RESPAWNDELAY2	10 	// seconds of waiting before player can respawn
+#define TF_RESPAWNDELAY3	20 	// seconds of waiting before player can respawn
+
+#define TEAMPLAY_NORMAL			 1			
+#define TEAMPLAY_HALFDIRECT		 2
+#define TEAMPLAY_NODIRECT		 4
+#define TEAMPLAY_HALFEXPLOSIVE	 8
+#define TEAMPLAY_NOEXPLOSIVE	 16
+#define TEAMPLAY_LESSPLAYERSHELP 32
+#define TEAMPLAY_LESSSCOREHELP	 64
+#define TEAMPLAY_HALFDIRECTARMOR 128
+#define TEAMPLAY_NODIRECTARMOR 	 256
+#define TEAMPLAY_HALFEXPARMOR	 512
+#define TEAMPLAY_NOEXPARMOR		 1024
+#define TEAMPLAY_HALFDIRMIRROR	 2048
+#define TEAMPLAY_FULLDIRMIRROR	 4096
+#define TEAMPLAY_HALFEXPMIRROR	 8192
+#define TEAMPLAY_FULLEXPMIRROR	 16384
+
+#define TEAMPLAY_TEAMDAMAGE		(TEAMPLAY_NODIRECT | TEAMPLAY_HALFDIRECT | TEAMPLAY_HALFEXPLOSIVE | TEAMPLAY_NOEXPLOSIVE)
+// FortressMap stuff
+#define TEAM1_CIVILIANS 1	
+#define TEAM2_CIVILIANS 2
+#define TEAM3_CIVILIANS 4	
+#define TEAM4_CIVILIANS 8	
+
+// Defines for the playerclass
+#define PC_UNDEFINED	0 
+
+#define PC_SCOUT		1 
+#define PC_SNIPER		2 
+#define PC_SOLDIER		3 
+#define PC_DEMOMAN		4 
+#define PC_MEDIC		5 
+#define PC_HVYWEAP		6 
+#define PC_PYRO			7
+#define PC_SPY			8
+#define PC_ENGINEER		9
+
+// Insert new class definitions here
+
+// PC_RANDOM _MUST_ be the third last class
+#define PC_RANDOM		10 		// Random playerclass
+#define PC_CIVILIAN		11		// Civilians are a special class. They cannot
+								// be chosen by players, only enforced by maps
+#define PC_LASTCLASS	12 		// Use this as the high-boundary for any loops
+								// through the playerclass.
+
+#define SENTRY_COLOR	10		// will be in the PC_RANDOM slot for team colors
+// These are just for the scanner
+#define SCAN_SENTRY		13
+#define SCAN_GOALITEM	14
+
+// Values returned by CheckArea
+enum
+{
+	CAREA_CLEAR,
+	CAREA_BLOCKED,
+	CAREA_NOBUILD
+};
+
+/*==================================================*/
+/* Impulse Defines		                        	*/
+/*==================================================*/
+// Alias check to see whether they already have the aliases
+#define TF_ALIAS_CHECK		13 
+
+// CTF Support Impulses
+#define HOOK_IMP1		22
+#define FLAG_INFO		23
+#define HOOK_IMP2		39
+
+// Axe
+#define AXE_IMP			40
+
+// Camera Impulse
+#define TF_CAM_TARGET			50
+#define TF_CAM_ZOOM				51
+#define TF_CAM_ANGLE			52
+#define TF_CAM_VEC				53
+#define TF_CAM_PROJECTILE		54
+#define TF_CAM_PROJECTILE_Z		55
+#define TF_CAM_REVANGLE			56
+#define TF_CAM_OFFSET			57
+#define TF_CAM_DROP				58	
+#define TF_CAM_FADETOBLACK		59
+#define TF_CAM_FADEFROMBLACK	60
+#define TF_CAM_FADETOWHITE		61
+#define TF_CAM_FADEFROMWHITE	62
+
+// Last Weapon impulse
+#define TF_LAST_WEAPON			69
+
+// Status Bar Resolution Settings.  Same as CTF to maintain ease of use.
+#define TF_STATUSBAR_RES_START	71
+#define TF_STATUSBAR_RES_END	81
+
+// Clan Messages
+#define TF_MESSAGE_1			82
+#define TF_MESSAGE_2			83
+#define TF_MESSAGE_3			84
+#define TF_MESSAGE_4			85
+#define TF_MESSAGE_5			86
+
+#define TF_CHANGE_CLASS			99	// Bring up the Class Change menu
+
+// Added to PC_??? to get impulse to use if this clashes with your 
+// own impulses, just change this value, not the PC_??
+#define TF_CHANGEPC			100 
+// The next few impulses are all the class selections
+//PC_SCOUT		101 
+//PC_SNIPER		102 
+//PC_SOLDIER	103 
+//PC_DEMOMAN	104 
+//PC_MEDIC		105 
+//PC_HVYWEAP	106 
+//PC_PYRO		107 
+//PC_RANDOM		108
+//PC_CIVILIAN	109  // Cannot be used
+//PC_SPY		110
+//PC_ENGINEER	111
+
+// Help impulses
+#define TF_DISPLAYLOCATION  118
+#define TF_STATUS_QUERY		119
+
+#define TF_HELP_MAP			131
+
+// Information impulses
+#define TF_INVENTORY		135
+#define TF_SHOWTF			136 
+#define TF_SHOWLEGALCLASSES	137
+
+// Team Impulses
+#define TF_TEAM_1			140   // Join Team 1
+#define TF_TEAM_2			141   // Join Team 2
+#define TF_TEAM_3			142   // Join Team 3
+#define TF_TEAM_4			143   // Join Team 4
+#define TF_TEAM_CLASSES		144   // Impulse to display team classes
+#define TF_TEAM_SCORES		145   // Impulse to display team scores
+#define TF_TEAM_LIST		146   // Impulse to display the players in each team.
+
+// Grenade Impulses
+#define TF_GRENADE_1		150   // Prime grenade type 1
+#define TF_GRENADE_2		151   // Prime grenade type 2
+#define TF_GRENADE_T		152   // Throw primed grenade
+
+// Impulses for new items
+//#define TF_SCAN				159		// Scanner Pre-Impulse
+#define TF_AUTO_SCAN		159		// Scanner On/Off
+#define TF_SCAN_ENEMY		160		// Impulses to toggle scanning of enemies
+#define TF_SCAN_FRIENDLY	161		// Impulses to toggle scanning of friendlies 
+//#define TF_SCAN_10			162		// Scan using 10 enery (1 cell)
+#define TF_SCAN_SOUND		162		// Scanner sounds on/off
+#define TF_SCAN_30			163		// Scan using 30 energy (2 cells)
+#define TF_SCAN_100			164		// Scan using 100 energy (5 cells)
+#define TF_DETPACK_5		165		// Detpack set to 5 seconds
+#define TF_DETPACK_20		166		// Detpack set to 20 seconds
+#define TF_DETPACK_50		167		// Detpack set to 50 seconds
+#define TF_DETPACK			168		// Detpack Pre-Impulse
+#define TF_DETPACK_STOP		169		// Impulse to stop setting detpack
+#define TF_PB_DETONATE		170		// Detonate Pipebombs
+
+// Special skill
+#define TF_SPECIAL_SKILL	171
+
+// Ammo Drop impulse
+#define TF_DROP_AMMO        172
+
+// Reload impulse
+#define TF_RELOAD			173
+
+// auto-zoom toggle
+#define TF_AUTOZOOM			174
+
+// drop/pass commands
+#define TF_DROPKEY			175
+
+// Select Medikit		
+#define TF_MEDIKIT			176
+
+// Spy Impulses
+#define TF_SPY_SPY			177		// On net, go invisible, on LAN, change skin/color
+#define TF_SPY_DIE			178		// Feign Death
+
+// Engineer Impulses
+#define TF_ENGINEER_BUILD	179
+#define TF_ENGINEER_SANDBAG	180
+
+// Medic
+#define TF_MEDIC_HELPME		181
+
+// Status bar
+#define TF_STATUSBAR_ON		182
+#define TF_STATUSBAR_OFF	183
+
+// Discard impulse
+#define TF_DISCARD 	  		184
+
+// ID Player impulse
+#define TF_ID	 	  		185
+
+// Clan Battle impulses
+#define TF_SHOWIDS			186
+
+// More Engineer Impulses
+#define TF_ENGINEER_DETDISP 187
+#define TF_ENGINEER_DETSENT 188
+
+// Admin Commands
+#define TF_ADMIN_DEAL_CYCLE		189
+#define TF_ADMIN_KICK			190
+#define TF_ADMIN_BAN			191
+#define TF_ADMIN_COUNTPLAYERS	192
+#define TF_ADMIN_CEASEFIRE		193
+
+// Drop Goal Items
+#define TF_DROPGOALITEMS 		194
+
+// More Admin Commands
+#define TF_ADMIN_NEXT			195
+
+// More Engineer Impulses
+#define TF_ENGINEER_DETEXIT 	196
+#define TF_ENGINEER_DETENTRANCE	197
+
+// Yet MORE Admin Commands
+#define TF_ADMIN_LISTIPS		198
+
+// Silent Spy Feign
+#define TF_SPY_SILENTDIE		199
+
+
+/*==================================================*/
+/*==================================================*/
+#define TEAM1_COLOR		150
+#define TEAM2_COLOR		250
+#define TEAM3_COLOR		45
+#define TEAM4_COLOR		100
+
+/*==================================================*/
+/* Defines for the ENGINEER's Building ability		*/
+/*==================================================*/
+// Ammo costs
+#define AMMO_COST_SHELLS		2		// Metal needed to make 1 shell
+#define AMMO_COST_NAILS			1
+#define AMMO_COST_ROCKETS		2
+#define AMMO_COST_CELLS			2
+
+// Building types
+#define BUILD_DISPENSER				1
+#define BUILD_SENTRYGUN				2
+#define BUILD_MORTAR				3
+#define BUILD_TELEPORTER_ENTRANCE	4
+#define BUILD_TELEPORTER_EXIT		5
+
+// Building metal costs
+#define BUILD_COST_DISPENSER	100		// Metal needed to built 
+#define BUILD_COST_SENTRYGUN	130		
+#define BUILD_COST_MORTAR		150		
+#define BUILD_COST_TELEPORTER	125		
+
+#define BUILD_COST_SANDBAG		20		// Built with a separate alias
+
+// Building times
+#define BUILD_TIME_DISPENSER	2		// seconds to build
+#define BUILD_TIME_SENTRYGUN	5		
+#define BUILD_TIME_MORTAR		5		
+#define BUILD_TIME_TELEPORTER	4		
+
+// Building health levels
+#define BUILD_HEALTH_DISPENSER	150		// Health of the building
+#define BUILD_HEALTH_SENTRYGUN	150		
+#define BUILD_HEALTH_MORTAR		200		
+#define BUILD_HEALTH_TELEPORTER 80
+
+// Dispenser's maximum carrying capability
+#define BUILD_DISPENSER_MAX_SHELLS  400
+#define BUILD_DISPENSER_MAX_NAILS   600
+#define BUILD_DISPENSER_MAX_ROCKETS 300
+#define BUILD_DISPENSER_MAX_CELLS   400
+#define BUILD_DISPENSER_MAX_ARMOR   500
+
+// Build state sent down to client
+#define BS_BUILDING			(1<<0)
+#define BS_HAS_DISPENSER	(1<<1)
+#define BS_HAS_SENTRYGUN	(1<<2)
+#define BS_CANB_DISPENSER	(1<<3)
+#define BS_CANB_SENTRYGUN	(1<<4)
+/*==================================================*/
+/* Ammo quantities for dropping & dispenser use		*/
+/*==================================================*/
+#define DROP_SHELLS   20
+#define DROP_NAILS    20
+#define DROP_ROCKETS  10
+#define DROP_CELLS    10
+#define DROP_ARMOR	  40
+
+/*==================================================*/
+/* Team Defines				            			*/
+/*==================================================*/
+#define TM_MAX_NO	4 			// Max number of teams. Simply changing this value isn't enough.
+								// A new global to hold new team colors is needed, and more flags
+								// in the spawnpoint spawnflags may need to be used.
+								// Basically, don't change this unless you know what you're doing :)
+
+/*==================================================*/
+/* New Weapon Defines		                        */
+/*==================================================*/
+#define WEAP_HOOK				1
+#define WEAP_BIOWEAPON			2
+#define WEAP_MEDIKIT			4
+#define WEAP_SPANNER			8
+#define WEAP_AXE				16
+#define WEAP_SNIPER_RIFLE		32
+#define WEAP_AUTO_RIFLE			64
+#define WEAP_SHOTGUN			128
+#define WEAP_SUPER_SHOTGUN		256
+#define WEAP_NAILGUN			512
+#define WEAP_SUPER_NAILGUN		1024
+#define WEAP_GRENADE_LAUNCHER	2048
+#define WEAP_FLAMETHROWER		4096
+#define WEAP_ROCKET_LAUNCHER	8192
+#define WEAP_INCENDIARY			16384
+#define WEAP_ASSAULT_CANNON		32768
+#define WEAP_LIGHTNING			65536
+#define WEAP_DETPACK			131072
+#define WEAP_TRANQ				262144
+#define WEAP_LASER				524288
+// still room for 12 more weapons
+// but we can remove some by giving the weapons
+// a weapon mode (like the rifle)
+
+// HL-compatible weapon numbers
+#define WEAPON_HOOK				1
+#define WEAPON_BIOWEAPON		(WEAPON_HOOK+1)
+#define WEAPON_MEDIKIT			(WEAPON_HOOK+2)
+#define WEAPON_SPANNER			(WEAPON_HOOK+3)
+#define WEAPON_AXE				(WEAPON_HOOK+4)
+#define WEAPON_SNIPER_RIFLE		(WEAPON_HOOK+5)
+#define WEAPON_AUTO_RIFLE		(WEAPON_HOOK+6)
+#define WEAPON_TF_SHOTGUN		(WEAPON_HOOK+7)
+#define WEAPON_SUPER_SHOTGUN	(WEAPON_HOOK+8)
+#define WEAPON_NAILGUN			(WEAPON_HOOK+9)
+#define WEAPON_SUPER_NAILGUN	(WEAPON_HOOK+10)
+#define WEAPON_GRENADE_LAUNCHER	(WEAPON_HOOK+11)
+#define WEAPON_FLAMETHROWER		(WEAPON_HOOK+12)
+#define WEAPON_ROCKET_LAUNCHER	(WEAPON_HOOK+13)
+#define WEAPON_INCENDIARY		(WEAPON_HOOK+14)
+#define WEAPON_ASSAULT_CANNON	(WEAPON_HOOK+16)
+#define WEAPON_LIGHTNING		(WEAPON_HOOK+17)
+#define WEAPON_DETPACK			(WEAPON_HOOK+18)
+#define WEAPON_TRANQ			(WEAPON_HOOK+19)
+#define WEAPON_LASER			(WEAPON_HOOK+20)
+#define WEAPON_PIPEBOMB_LAUNCHER (WEAPON_HOOK+21)
+#define WEAPON_KNIFE			(WEAPON_HOOK+22)
+#define WEAPON_BENCHMARK		(WEAPON_HOOK+23)
+
+/*==================================================*/
+/* New Weapon Related Defines		                */
+/*==================================================*/
+// shots per reload 
+#define RE_SHOTGUN			8
+#define RE_SUPER_SHOTGUN	16 // 8 shots
+#define RE_GRENADE_LAUNCHER	6 
+#define RE_ROCKET_LAUNCHER	4 
+
+// reload times
+#define RE_SHOTGUN_TIME				2 
+#define RE_SUPER_SHOTGUN_TIME		3 
+#define RE_GRENADE_LAUNCHER_TIME	4 
+#define RE_ROCKET_LAUNCHER_TIME		5 
+
+// Maximum velocity you can move and fire the Sniper Rifle
+#define WEAP_SNIPER_RIFLE_MAX_MOVE	50 
+
+// Medikit
+#define WEAP_MEDIKIT_HEAL	200  // Amount medikit heals per hit
+#define WEAP_MEDIKIT_OVERHEAL 50 // Amount of superhealth over max_health the medikit will dispense
+
+// Spanner
+#define WEAP_SPANNER_REPAIR 10
+
+// Detpack
+#define WEAP_DETPACK_DISARMTIME		3   	// Time it takes to disarm a Detpack
+#define WEAP_DETPACK_SETTIME		3   	// Time it takes to set a Detpack
+#define WEAP_DETPACK_SIZE			700	 	// Explosion Size
+#define WEAP_DETPACK_GOAL_SIZE		1500 	// Explosion Size for goal triggering
+#define WEAP_DETPACK_BITS_NO		12  	// Bits that detpack explodes into
+
+// Tranquiliser Gun
+#define TRANQ_TIME			15
+
+// Grenades
+#define GR_PRIMETIME		3
+#define GR_CALTROP_PRIME	0.5
+#define GR_TYPE_NONE		0 
+#define GR_TYPE_NORMAL		1 
+#define GR_TYPE_CONCUSSION	2 
+#define GR_TYPE_NAIL		3 
+#define GR_TYPE_MIRV		4 
+#define GR_TYPE_NAPALM		5 
+//#define GR_TYPE_FLARE		6 
+#define GR_TYPE_GAS			7
+#define GR_TYPE_EMP			8
+#define GR_TYPE_CALTROP		9
+//#define GR_TYPE_FLASH		10
+
+// Defines for WeaponMode
+#define GL_NORMAL	0 
+#define GL_PIPEBOMB	1
+
+// Defines for OLD Concussion Grenade
+#define GR_OLD_CONCUSS_TIME		5 
+#define GR_OLD_CONCUSS_DEC		20 
+
+// Defines for Concussion Grenade
+#define GR_CONCUSS_TIME		0.25 
+#define GR_CONCUSS_DEC		10
+#define MEDIUM_PING			150
+#define HIGH_PING			200
+
+// Defines for the Gas Grenade
+#define GR_HALLU_TIME		0.3
+#define GR_OLD_HALLU_TIME	0.5
+#define GR_HALLU_DEC		2.5
+
+// Defines for the BioInfection
+#define BIO_JUMP_RADIUS 128		// The distance the bioinfection can jump between players
+
+/*==================================================*/
+/* New Items			                        	*/
+/*==================================================*/
+#define NIT_SCANNER				1 
+
+#define NIT_SILVER_DOOR_OPENED 	#IT_KEY1	// 131072 
+#define NIT_GOLD_DOOR_OPENED 	#IT_KEY2	// 262144
+
+/*==================================================*/
+/* New Item Flags		                        	*/
+/*==================================================*/
+#define NIT_SCANNER_ENEMY		1 	// Detect enemies
+#define NIT_SCANNER_FRIENDLY	2 	// Detect friendlies (team members)
+#define NIT_SCANNER_SOUND		4 	// Motion detection. Only report moving entities.
+
+/*==================================================*/
+/* New Item Related Defines		                    */
+/*==================================================*/
+#define NIT_SCANNER_POWER			25	// The amount of power spent on a scan with the scanner
+										// is multiplied by this to get the scanrange.
+#define NIT_SCANNER_MAXCELL			50 	// The maximum number of cells than can be used in one scan
+#define NIT_SCANNER_MIN_MOVEMENT	50 	// The minimum velocity an entity must have to be detected
+										// by scanners that only detect movement
+
+/*==================================================*/
+/* Variables used for New Weapons and Reloading     */
+/*==================================================*/
+// Armor Classes : Bitfields. Use the "armorclass" of armor for the Armor Type.
+#define AT_SAVESHOT			1   // Kevlar  	 : Reduces bullet damage by 15%
+#define AT_SAVENAIL			2   // Wood :) 	 : Reduces nail damage by 15%
+#define AT_SAVEEXPLOSION	4  	// Blast   	 : Reduces explosion damage by 15%
+#define AT_SAVEELECTRICITY	8 	// Shock	 : Reduces electricity damage by 15%
+#define AT_SAVEFIRE			16 	// Asbestos	 : Reduces fire damage by 15%
+
+/*==========================================================================*/
+/* TEAMFORTRESS CLASS DETAILS												*/
+/*==========================================================================*/
+// Class Details for SCOUT
+#define PC_SCOUT_SKIN				4 		// Skin for this class when Classkin is on.
+#define PC_SCOUT_MAXHEALTH			75 		// Maximum Health Level
+#define PC_SCOUT_MAXSPEED			400		// Maximum movement speed
+#define PC_SCOUT_MAXSTRAFESPEED		400		// Maximum strafing movement speed
+#define PC_SCOUT_MAXARMOR			50 		// Maximum Armor Level, of any armor class
+#define PC_SCOUT_INITARMOR			25 		// Armor level when respawned
+#define PC_SCOUT_MAXARMORTYPE		0.3		// Maximum level of Armor absorption
+#define PC_SCOUT_INITARMORTYPE		0.3		// Absorption Level of armor when respawned
+#define PC_SCOUT_ARMORCLASSES		3 		// #AT_SAVESHOT | #AT_SAVENAIL   		<-Armor Classes allowed for this class
+#define PC_SCOUT_INITARMORCLASS		0 		// Armorclass worn when respawned
+#define PC_SCOUT_WEAPONS			WEAP_AXE | WEAP_SHOTGUN | WEAP_NAILGUN
+#define PC_SCOUT_MAXAMMO_SHOT		50 		// Maximum amount of shot ammo this class can carry
+#define PC_SCOUT_MAXAMMO_NAIL		200		// Maximum amount of nail ammo this class can carry
+#define PC_SCOUT_MAXAMMO_CELL		100		// Maximum amount of cell ammo this class can carry
+#define PC_SCOUT_MAXAMMO_ROCKET		25 		// Maximum amount of rocket ammo this class can carry
+#define PC_SCOUT_INITAMMO_SHOT		25 		// Amount of shot ammo this class has when respawned
+#define PC_SCOUT_INITAMMO_NAIL		100		// Amount of nail ammo this class has when respawned
+#define PC_SCOUT_INITAMMO_CELL		50 		// Amount of cell ammo this class has when respawned
+#define PC_SCOUT_INITAMMO_ROCKET	0 		// Amount of rocket ammo this class has when respawned
+#define PC_SCOUT_GRENADE_TYPE_1		GR_TYPE_CALTROP			 //    <- 1st Type of Grenade this class has
+#define PC_SCOUT_GRENADE_TYPE_2		GR_TYPE_CONCUSSION      //    <- 2nd Type of Grenade this class has
+#define PC_SCOUT_GRENADE_INIT_1		2 		// Number of grenades of Type 1 this class has when respawned
+#define PC_SCOUT_GRENADE_INIT_2		3 		// Number of grenades of Type 2 this class has when respawned
+#define PC_SCOUT_TF_ITEMS			NIT_SCANNER  // <- TeamFortress Items this class has
+
+#define PC_SCOUT_MOTION_MIN_I		0.5 	// < Short range
+#define PC_SCOUT_MOTION_MIN_MOVE	50 		// Minimum vlen of player velocity to be picked up by motion detector
+#define PC_SCOUT_SCAN_TIME			2		// # of seconds between each scan pulse
+#define PC_SCOUT_SCAN_RANGE			100		// Default scanner range
+#define PC_SCOUT_SCAN_COST			2		// Default scanner cell useage per scan
+
+// Class Details for SNIPER
+#define PC_SNIPER_SKIN				5 
+#define PC_SNIPER_MAXHEALTH			90 
+#define PC_SNIPER_MAXSPEED			300 		
+#define PC_SNIPER_MAXSTRAFESPEED	300 
+#define PC_SNIPER_MAXARMOR			50 
+#define PC_SNIPER_INITARMOR			0 
+#define PC_SNIPER_MAXARMORTYPE		0.3 
+#define PC_SNIPER_INITARMORTYPE		0.3 
+#define PC_SNIPER_ARMORCLASSES		3 		// #AT_SAVESHOT | #AT_SAVENAIL
+#define PC_SNIPER_INITARMORCLASS	0 
+#define PC_SNIPER_WEAPONS			WEAP_SNIPER_RIFLE | WEAP_AUTO_RIFLE | WEAP_AXE | WEAP_NAILGUN
+#define PC_SNIPER_MAXAMMO_SHOT		75 
+#define PC_SNIPER_MAXAMMO_NAIL		100 
+#define PC_SNIPER_MAXAMMO_CELL		50 
+#define PC_SNIPER_MAXAMMO_ROCKET	25 
+#define PC_SNIPER_INITAMMO_SHOT		60 
+#define PC_SNIPER_INITAMMO_NAIL		50 
+#define PC_SNIPER_INITAMMO_CELL		0 
+#define PC_SNIPER_INITAMMO_ROCKET	0 
+#define PC_SNIPER_GRENADE_TYPE_1	GR_TYPE_NORMAL
+#define PC_SNIPER_GRENADE_TYPE_2	GR_TYPE_NONE
+#define PC_SNIPER_GRENADE_INIT_1	2 	 
+#define PC_SNIPER_GRENADE_INIT_2	0
+#define PC_SNIPER_TF_ITEMS			0 
+
+// Class Details for SOLDIER
+#define PC_SOLDIER_SKIN				6 			
+#define PC_SOLDIER_MAXHEALTH		100	 
+#define PC_SOLDIER_MAXSPEED			240 
+#define PC_SOLDIER_MAXSTRAFESPEED	240 
+#define PC_SOLDIER_MAXARMOR			200 
+#define PC_SOLDIER_INITARMOR		100 
+#define PC_SOLDIER_MAXARMORTYPE		0.8 
+#define PC_SOLDIER_INITARMORTYPE	0.8 
+#define PC_SOLDIER_ARMORCLASSES		31 		// ALL
+#define PC_SOLDIER_INITARMORCLASS	0 
+#define PC_SOLDIER_WEAPONS		 	WEAP_AXE | WEAP_SHOTGUN | WEAP_SUPER_SHOTGUN | WEAP_ROCKET_LAUNCHER
+#define PC_SOLDIER_MAXAMMO_SHOT		100 
+#define PC_SOLDIER_MAXAMMO_NAIL		100 
+#define PC_SOLDIER_MAXAMMO_CELL		50 
+#define PC_SOLDIER_MAXAMMO_ROCKET	50 
+#define PC_SOLDIER_INITAMMO_SHOT	50 
+#define PC_SOLDIER_INITAMMO_NAIL	0 
+#define PC_SOLDIER_INITAMMO_CELL	0 
+#define PC_SOLDIER_INITAMMO_ROCKET	10 
+#define PC_SOLDIER_GRENADE_TYPE_1	GR_TYPE_NORMAL
+#define PC_SOLDIER_GRENADE_TYPE_2	GR_TYPE_NAIL
+#define PC_SOLDIER_GRENADE_INIT_1	2
+#define PC_SOLDIER_GRENADE_INIT_2	1 	 
+#define PC_SOLDIER_TF_ITEMS			0 
+
+#define MAX_NAIL_GRENS				2	// Can only have 2 Nail grens active
+#define MAX_NAPALM_GRENS			2	// Can only have 2 Napalm grens active
+#define MAX_GAS_GRENS				2	// Can only have 2 Gas grenades active
+#define MAX_MIRV_GRENS				2	// Can only have 2 Mirv's
+#define MAX_CONCUSSION_GRENS		3
+#define MAX_CALTROP_CANS			3
+
+// Class Details for DEMOLITION MAN
+#define PC_DEMOMAN_SKIN				1 
+#define PC_DEMOMAN_MAXHEALTH		90 
+#define PC_DEMOMAN_MAXSPEED			280 		
+#define PC_DEMOMAN_MAXSTRAFESPEED	280 
+#define PC_DEMOMAN_MAXARMOR			120 
+#define PC_DEMOMAN_INITARMOR		50 
+#define PC_DEMOMAN_MAXARMORTYPE		0.6 
+#define PC_DEMOMAN_INITARMORTYPE	0.6 
+#define PC_DEMOMAN_ARMORCLASSES		31 		// ALL
+#define PC_DEMOMAN_INITARMORCLASS	0 		
+#define PC_DEMOMAN_WEAPONS			WEAP_AXE | WEAP_SHOTGUN | WEAP_GRENADE_LAUNCHER | WEAP_DETPACK
+#define PC_DEMOMAN_MAXAMMO_SHOT		75 
+#define PC_DEMOMAN_MAXAMMO_NAIL		50 
+#define PC_DEMOMAN_MAXAMMO_CELL		50 
+#define PC_DEMOMAN_MAXAMMO_ROCKET	50 
+#define PC_DEMOMAN_MAXAMMO_DETPACK	1 
+#define PC_DEMOMAN_INITAMMO_SHOT	30 
+#define PC_DEMOMAN_INITAMMO_NAIL	0 
+#define PC_DEMOMAN_INITAMMO_CELL	0 
+#define PC_DEMOMAN_INITAMMO_ROCKET	20 
+#define PC_DEMOMAN_INITAMMO_DETPACK	1 
+#define PC_DEMOMAN_GRENADE_TYPE_1	GR_TYPE_NORMAL
+#define PC_DEMOMAN_GRENADE_TYPE_2	GR_TYPE_MIRV
+#define PC_DEMOMAN_GRENADE_INIT_1	2
+#define PC_DEMOMAN_GRENADE_INIT_2	2 	 
+#define PC_DEMOMAN_TF_ITEMS			0 
+
+// Class Details for COMBAT MEDIC
+#define PC_MEDIC_SKIN				3 
+#define PC_MEDIC_MAXHEALTH			90 
+#define PC_MEDIC_MAXSPEED			320 
+#define PC_MEDIC_MAXSTRAFESPEED		320 
+#define PC_MEDIC_MAXARMOR			100
+#define PC_MEDIC_INITARMOR			50 
+#define PC_MEDIC_MAXARMORTYPE		0.6 
+#define PC_MEDIC_INITARMORTYPE		0.3 
+#define PC_MEDIC_ARMORCLASSES		11 		// ALL except EXPLOSION
+#define PC_MEDIC_INITARMORCLASS		0 
+#define PC_MEDIC_WEAPONS			WEAP_BIOWEAPON | WEAP_MEDIKIT | WEAP_SHOTGUN | WEAP_SUPER_SHOTGUN | WEAP_SUPER_NAILGUN
+#define PC_MEDIC_MAXAMMO_SHOT		75 
+#define PC_MEDIC_MAXAMMO_NAIL		150 
+#define PC_MEDIC_MAXAMMO_CELL		50 
+#define PC_MEDIC_MAXAMMO_ROCKET		25 
+#define PC_MEDIC_MAXAMMO_MEDIKIT	100 
+#define PC_MEDIC_INITAMMO_SHOT		50 
+#define PC_MEDIC_INITAMMO_NAIL		50 
+#define PC_MEDIC_INITAMMO_CELL		0 
+#define PC_MEDIC_INITAMMO_ROCKET	0 
+#define PC_MEDIC_INITAMMO_MEDIKIT	50 
+#define PC_MEDIC_GRENADE_TYPE_1		GR_TYPE_NORMAL
+#define PC_MEDIC_GRENADE_TYPE_2		GR_TYPE_CONCUSSION
+#define PC_MEDIC_GRENADE_INIT_1		2
+#define PC_MEDIC_GRENADE_INIT_2		2 	 
+#define PC_MEDIC_TF_ITEMS			0 
+#define PC_MEDIC_REGEN_TIME			3   // Number of seconds between each regen.
+#define PC_MEDIC_REGEN_AMOUNT		2 	// Amount of health regenerated each regen.
+
+// Class Details for HVYWEAP
+#define PC_HVYWEAP_SKIN				2 
+#define PC_HVYWEAP_MAXHEALTH		100 
+#define PC_HVYWEAP_MAXSPEED			230		
+#define PC_HVYWEAP_MAXSTRAFESPEED	230
+#define PC_HVYWEAP_MAXARMOR			300 
+#define PC_HVYWEAP_INITARMOR		150 
+#define PC_HVYWEAP_MAXARMORTYPE		0.8 
+#define PC_HVYWEAP_INITARMORTYPE	0.8 
+#define PC_HVYWEAP_ARMORCLASSES		31 			// ALL
+#define PC_HVYWEAP_INITARMORCLASS	0 		
+#define PC_HVYWEAP_WEAPONS			WEAP_ASSAULT_CANNON | WEAP_AXE | WEAP_SHOTGUN | WEAP_SUPER_SHOTGUN
+#define PC_HVYWEAP_MAXAMMO_SHOT		200 
+#define PC_HVYWEAP_MAXAMMO_NAIL		200 
+#define PC_HVYWEAP_MAXAMMO_CELL		50 
+#define PC_HVYWEAP_MAXAMMO_ROCKET	25 
+#define PC_HVYWEAP_INITAMMO_SHOT	200 
+#define PC_HVYWEAP_INITAMMO_NAIL	0 
+#define PC_HVYWEAP_INITAMMO_CELL	30 
+#define PC_HVYWEAP_INITAMMO_ROCKET	0 
+#define PC_HVYWEAP_GRENADE_TYPE_1	GR_TYPE_NORMAL
+#define PC_HVYWEAP_GRENADE_TYPE_2	GR_TYPE_MIRV
+#define PC_HVYWEAP_GRENADE_INIT_1	2
+#define PC_HVYWEAP_GRENADE_INIT_2	1 	 
+#define PC_HVYWEAP_TF_ITEMS			0 
+#define PC_HVYWEAP_CELL_USAGE		7	// Amount of cells spent to power up assault cannon
+
+
+
+// Class Details for PYRO
+#define PC_PYRO_SKIN			21 
+#define PC_PYRO_MAXHEALTH		100 
+#define PC_PYRO_MAXSPEED		300 
+#define PC_PYRO_MAXSTRAFESPEED	300
+#define PC_PYRO_MAXARMOR		150 
+#define PC_PYRO_INITARMOR		50 
+#define PC_PYRO_MAXARMORTYPE	0.6 
+#define PC_PYRO_INITARMORTYPE	0.6 
+#define PC_PYRO_ARMORCLASSES	27 		// ALL except EXPLOSION
+#define PC_PYRO_INITARMORCLASS	16  	// #AT_SAVEFIRE
+#define PC_PYRO_WEAPONS			WEAP_INCENDIARY | WEAP_FLAMETHROWER | WEAP_AXE | WEAP_SHOTGUN
+#define PC_PYRO_MAXAMMO_SHOT	40 
+#define PC_PYRO_MAXAMMO_NAIL	50 
+#define PC_PYRO_MAXAMMO_CELL	200 
+#define PC_PYRO_MAXAMMO_ROCKET	20 
+#define PC_PYRO_INITAMMO_SHOT	20 
+#define PC_PYRO_INITAMMO_NAIL	0 
+#define PC_PYRO_INITAMMO_CELL	120 
+#define PC_PYRO_INITAMMO_ROCKET	5 
+#define PC_PYRO_GRENADE_TYPE_1	GR_TYPE_NORMAL
+#define PC_PYRO_GRENADE_TYPE_2	GR_TYPE_NAPALM
+#define PC_PYRO_GRENADE_INIT_1	2
+#define PC_PYRO_GRENADE_INIT_2	4 	 
+#define PC_PYRO_TF_ITEMS		0
+#define PC_PYRO_ROCKET_USAGE	3	// Number of rockets per incendiary cannon shot
+
+// Class Details for SPY
+#define PC_SPY_SKIN				22 
+#define PC_SPY_MAXHEALTH		90 
+#define PC_SPY_MAXSPEED			300 
+#define PC_SPY_MAXSTRAFESPEED	300 
+#define PC_SPY_MAXARMOR			100 
+#define PC_SPY_INITARMOR		25 
+#define PC_SPY_MAXARMORTYPE		0.6		// Was 0.3 
+#define PC_SPY_INITARMORTYPE	0.6		// Was 0.3
+#define PC_SPY_ARMORCLASSES		27 		// ALL except EXPLOSION
+#define PC_SPY_INITARMORCLASS	0  
+#define PC_SPY_WEAPONS			WEAP_AXE | WEAP_TRANQ | WEAP_SUPER_SHOTGUN | WEAP_NAILGUN
+#define PC_SPY_MAXAMMO_SHOT		40 
+#define PC_SPY_MAXAMMO_NAIL		100 
+#define PC_SPY_MAXAMMO_CELL		30 
+#define PC_SPY_MAXAMMO_ROCKET	15 
+#define PC_SPY_INITAMMO_SHOT	40 
+#define PC_SPY_INITAMMO_NAIL	50 
+#define PC_SPY_INITAMMO_CELL	10 
+#define PC_SPY_INITAMMO_ROCKET	0 
+#define PC_SPY_GRENADE_TYPE_1	GR_TYPE_NORMAL
+#define PC_SPY_GRENADE_TYPE_2	GR_TYPE_GAS
+#define PC_SPY_GRENADE_INIT_1	2 	 
+#define PC_SPY_GRENADE_INIT_2	2 	 
+#define PC_SPY_TF_ITEMS			0 
+#define PC_SPY_CELL_REGEN_TIME		5	
+#define PC_SPY_CELL_REGEN_AMOUNT	1
+#define PC_SPY_CELL_USAGE			3	// Amount of cells spent while invisible
+#define PC_SPY_GO_UNDERCOVER_TIME	4	// Time it takes to go undercover
+
+// Class Details for ENGINEER
+#define PC_ENGINEER_SKIN			22 		// Not used anymore
+#define PC_ENGINEER_MAXHEALTH		80 
+#define PC_ENGINEER_MAXSPEED		300 
+#define PC_ENGINEER_MAXSTRAFESPEED	300
+#define PC_ENGINEER_MAXARMOR		50
+#define PC_ENGINEER_INITARMOR		25 
+#define PC_ENGINEER_MAXARMORTYPE	0.6 
+#define PC_ENGINEER_INITARMORTYPE	0.3 
+#define PC_ENGINEER_ARMORCLASSES	31 		// ALL
+#define PC_ENGINEER_INITARMORCLASS	0  
+#define PC_ENGINEER_WEAPONS			WEAP_SPANNER | WEAP_LASER | WEAP_SUPER_SHOTGUN
+#define PC_ENGINEER_MAXAMMO_SHOT	50
+#define PC_ENGINEER_MAXAMMO_NAIL	50 
+#define PC_ENGINEER_MAXAMMO_CELL	200		// synonymous with metal 
+#define PC_ENGINEER_MAXAMMO_ROCKET	30 
+#define PC_ENGINEER_INITAMMO_SHOT	20 
+#define PC_ENGINEER_INITAMMO_NAIL	25 
+#define PC_ENGINEER_INITAMMO_CELL	100 	// synonymous with metal 
+#define PC_ENGINEER_INITAMMO_ROCKET	0 
+#define PC_ENGINEER_GRENADE_TYPE_1	GR_TYPE_NORMAL
+#define PC_ENGINEER_GRENADE_TYPE_2	GR_TYPE_EMP
+#define PC_ENGINEER_GRENADE_INIT_1	2 	 
+#define PC_ENGINEER_GRENADE_INIT_2	2 	 
+#define PC_ENGINEER_TF_ITEMS		0 
+
+// Class Details for CIVILIAN
+#define PC_CIVILIAN_SKIN			22 
+#define PC_CIVILIAN_MAXHEALTH		50
+#define PC_CIVILIAN_MAXSPEED		240
+#define PC_CIVILIAN_MAXSTRAFESPEED	240
+#define PC_CIVILIAN_MAXARMOR		0
+#define PC_CIVILIAN_INITARMOR		0 
+#define PC_CIVILIAN_MAXARMORTYPE	0
+#define PC_CIVILIAN_INITARMORTYPE	0 
+#define PC_CIVILIAN_ARMORCLASSES	0 		
+#define PC_CIVILIAN_INITARMORCLASS	0
+#define PC_CIVILIAN_WEAPONS			WEAP_AXE
+#define PC_CIVILIAN_MAXAMMO_SHOT	0
+#define PC_CIVILIAN_MAXAMMO_NAIL	0 
+#define PC_CIVILIAN_MAXAMMO_CELL	0 
+#define PC_CIVILIAN_MAXAMMO_ROCKET	0 
+#define PC_CIVILIAN_INITAMMO_SHOT	0 
+#define PC_CIVILIAN_INITAMMO_NAIL	0 
+#define PC_CIVILIAN_INITAMMO_CELL	0 
+#define PC_CIVILIAN_INITAMMO_ROCKET	0 
+#define PC_CIVILIAN_GRENADE_TYPE_1	0
+#define PC_CIVILIAN_GRENADE_TYPE_2	0
+#define PC_CIVILIAN_GRENADE_INIT_1	0 	 
+#define PC_CIVILIAN_GRENADE_INIT_2	0 	 
+#define PC_CIVILIAN_TF_ITEMS		0 
+
+
+/*==========================================================================*/
+/* TEAMFORTRESS GOALS														*/
+/*==========================================================================*/
+// For all these defines, see the tfortmap.txt that came with the zip
+// for complete descriptions.
+// Defines for Goal Activation types : goal_activation (in goals)
+#define TFGA_TOUCH			1  // Activated when touched
+#define TFGA_TOUCH_DETPACK	2  // Activated when touched by a detpack explosion
+#define TFGA_REVERSE_AP		4  // Activated when AP details are _not_ met
+#define TFGA_SPANNER		8  // Activated when hit by an engineer's spanner
+#define TFGA_DROPTOGROUND	2048 // Drop to Ground when spawning
+
+// Defines for Goal Effects types : goal_effect
+#define TFGE_AP				  1  // AP is affected. Default.
+#define TFGE_AP_TEAM		  2  // All of the AP's team.
+#define TFGE_NOT_AP_TEAM	  4  // All except AP's team.
+#define TFGE_NOT_AP			  8  // All except AP.
+#define TFGE_WALL			  16 // If set, walls stop the Radius effects
+#define TFGE_SAME_ENVIRONMENT 32 // If set, players in a different environment to the Goal are not affected
+#define TFGE_TIMER_CHECK_AP	  64 // If set, Timer Goals check their critera for all players fitting their effects
+
+// Defines for Goal Result types : goal_result
+#define TFGR_SINGLE				1  // Goal can only be activated once
+#define TFGR_ADD_BONUSES		2 	// Any Goals activated by this one give their bonuses
+#define TFGR_ENDGAME			4 	// Goal fires Intermission, displays scores, and ends level
+#define TFGR_NO_ITEM_RESULTS	8	// GoalItems given by this Goal don't do results
+#define TFGR_REMOVE_DISGUISE	16 // Prevent/Remove undercover from any Spy
+#define TFGR_FORCE_RESPAWN		32 // Forces the player to teleport to a respawn point
+#define TFGR_DESTROY_BUILDINGS	64 // Destroys this player's buildings, if anys
+
+// Defines for Goal Group Result types : goal_group
+// None!
+// But I'm leaving this variable in there, since it's fairly likely
+// that some will show up sometime.
+
+// Defines for Goal Item types, : goal_activation (in items)
+#define TFGI_GLOW			1   // Players carrying this GoalItem will glow
+#define TFGI_SLOW			2   // Players carrying this GoalItem will move at half-speed
+#define TFGI_DROP			4   // Players dying with this item will drop it
+#define TFGI_RETURN_DROP	8   // Return if a player with it dies
+#define TFGI_RETURN_GOAL	16  // Return if a player with it has it removed by a goal's activation
+#define TFGI_RETURN_REMOVE	32  // Return if it is removed by TFGI_REMOVE
+#define TFGI_REVERSE_AP		64  // Only pickup if the player _doesn't_ match AP Details
+#define TFGI_REMOVE			128 // Remove if left untouched for 2 minutes after being dropped
+#define TFGI_KEEP			256 // Players keep this item even when they die
+#define TFGI_ITEMGLOWS		512	// Item glows when on the ground
+#define TFGI_DONTREMOVERES	1024 // Don't remove results when the item is removed
+#define TFGI_DROPTOGROUND	2048 // Drop To Ground when spawning
+#define TFGI_CANBEDROPPED	4096 // Can be voluntarily dropped by players
+#define TFGI_SOLID			8192 // Is solid... blocks bullets, etc
+
+// Defines for methods of GoalItem returning
+#define GI_RET_DROP_DEAD 	0		// Dropped by a dead player
+#define GI_RET_DROP_LIVING 	1		// Dropped by a living player
+#define GI_RET_GOAL			2		// Returned by a Goal
+#define GI_RET_TIME			3		// Returned due to timeout
+
+// Defines for TeamSpawnpoints : goal_activation (in teamspawns)
+#define TFSP_MULTIPLEITEMS	1  // Give out the GoalItem multiple times
+#define TFSP_MULTIPLEMSGS	2  // Display the message multiple times
+
+// Defines for TeamSpawnpoints : goal_effects (in teamspawns)
+#define TFSP_REMOVESELF		1  // Remove itself after being spawned on
+
+// Defines for Goal States
+#define TFGS_ACTIVE		1 
+#define TFGS_INACTIVE	2 
+#define TFGS_REMOVED	3 
+#define TFGS_DELAYED	4
+
+// Defines for GoalItem Removing from Player Methods
+#define GI_DROP_PLAYERDEATH	  0		// Dropped by a dying player
+#define GI_DROP_REMOVEGOAL	  1		// Removed by a Goal
+#define GI_DROP_PLAYERDROP	  2		// Dropped by a player
+
+// Legal Playerclass Handling
+#define TF_ILL_SCOUT 		1
+#define TF_ILL_SNIPER		2
+#define TF_ILL_SOLDIER		4
+#define TF_ILL_DEMOMAN		8
+#define TF_ILL_MEDIC		16
+#define TF_ILL_HVYWEP		32
+#define TF_ILL_PYRO			64
+#define TF_ILL_RANDOMPC		128
+#define TF_ILL_SPY			256
+#define TF_ILL_ENGINEER		512
+
+// Addition classes
+#define CLASS_TFGOAL					128
+#define CLASS_TFGOAL_TIMER			129
+#define CLASS_TFGOAL_ITEM			130
+#define CLASS_TFSPAWN				   131
+
+/*==========================================================================*/
+/* Flamethrower																*/
+/*==========================================================================*/
+#define FLAME_PLYRMAXTIME	5.0 // lifetime in seconds of a flame on a player
+#define FLAME_MAXBURNTIME	8  	// lifetime in seconds of a flame on the world (big ones)
+#define NAPALM_MAXBURNTIME	20 	// lifetime in seconds of flame from a napalm grenade
+#define FLAME_MAXPLYRFLAMES	4 	// maximum number of flames on a player
+#define FLAME_NUMLIGHTS		1 	// maximum number of light flame 
+#define FLAME_BURNRATIO		0.3 // the chance of a flame not 'sticking'
+#define GR_TYPE_FLAMES_NO	15 	// number of flames spawned when a grenade explode
+#define FLAME_DAMAGE_TIME	1	// Interval between damage burns from flames
+#define FLAME_EFFECT_TIME	0.2	// frequency at which we display flame effects.
+#define FLAME_THINK_TIME	0.1	// Seconds between times the flame checks burn
+#define PER_FLAME_DAMAGE	2	// Damage taken per second per flame by burning players
+
+/*==================================================*/
+/* CTF Support defines 								*/
+/*==================================================*/
+#define CTF_FLAG1 		1
+#define CTF_FLAG2 		2
+#define CTF_DROPOFF1 	3
+#define CTF_DROPOFF2 	4
+#define CTF_SCORE1   	5
+#define CTF_SCORE2   	6
+
+//.float	hook_out;
+
+/*==================================================*/
+/* Camera defines	 								*/
+/*==================================================*/
+/*
+float live_camera;
+.float camdist;
+.vector camangle;
+.entity camera_list;
+*/
+
+/*==================================================*/
+/* QuakeWorld defines 								*/
+/*==================================================*/
+/*
+float already_chosen_map;
+
+// grappling hook variables
+.entity	hook;	
+.float	on_hook;
+.float  fire_held_down;// flag - TRUE if player is still holding down the
+                       // fire button after throwing a hook.
+*/
+/*==================================================*/
+/* Server Settings								    */
+/*==================================================*/
+// Admin modes
+#define ADMIN_MODE_NONE	0
+#define ADMIN_MODE_DEAL	1
+
+/*==================================================*/
+/* Death Message defines							*/
+/*==================================================*/
+#define DMSG_SHOTGUN			1
+#define DMSG_SSHOTGUN			2
+#define DMSG_NAILGUN			3
+#define DMSG_SNAILGUN			4
+#define DMSG_GRENADEL			5
+#define DMSG_ROCKETL			6
+#define DMSG_LIGHTNING			7
+#define DMSG_GREN_HAND			8
+#define DMSG_GREN_NAIL			9
+#define DMSG_GREN_MIRV			10
+#define DMSG_GREN_PIPE			11
+#define DMSG_DETPACK			12
+#define DMSG_BIOWEAPON			13
+#define DMSG_BIOWEAPON_ATT		14
+#define DMSG_FLAME				15
+#define DMSG_DETPACK_DIS		16
+#define DMSG_AXE				17
+#define DMSG_SNIPERRIFLE		18
+#define DMSG_AUTORIFLE			19
+#define DMSG_ASSAULTCANNON		20
+#define DMSG_HOOK				21
+#define DMSG_BACKSTAB			22
+#define DMSG_MEDIKIT			23
+#define DMSG_GREN_GAS			24
+#define DMSG_TRANQ				25
+#define DMSG_LASERBOLT			26
+#define DMSG_SENTRYGUN_BULLET 	27
+#define DMSG_SNIPERLEGSHOT		28
+#define DMSG_SNIPERHEADSHOT		29
+#define DMSG_GREN_EMP			30
+#define DMSG_GREN_EMP_AMMO		31
+#define DMSG_SPANNER			32
+#define DMSG_INCENDIARY			33
+#define DMSG_SENTRYGUN_ROCKET	34
+#define DMSG_GREN_FLASH			35
+#define DMSG_TRIGGER			36
+#define DMSG_MIRROR				37
+#define DMSG_SENTRYDEATH		38
+#define DMSG_DISPENSERDEATH		39
+#define DMSG_GREN_AIRPIPE		40
+#define DMSG_CALTROP			41
+
+/*==================================================*/
+// TOGGLEFLAGS
+/*==================================================*/
+// Some of the toggleflags aren't used anymore, but the bits are still
+// there to provide compatability with old maps
+#define TFLAG_CLASS_PERSIST			(1 << 0)  		// Persistent Classes Bit
+#define TFLAG_CHEATCHECK			(1 << 1) 		// Cheatchecking Bit
+#define TFLAG_RESPAWNDELAY			(1 << 2) 		// RespawnDelay bit
+//#define TFLAG_UN					(1 << 3)		// NOT USED ANYMORE
+#define TFLAG_OLD_GRENS				(1 << 3)		// Use old concussion grenade and flash grenade
+#define TFLAG_UN2					(1 << 4)		// NOT USED ANYMORE
+#define TFLAG_UN3					(1 << 5)		// NOT USED ANYMORE
+#define TFLAG_UN4					(1 << 6)		// NOT USED ANYMORE: Was Autoteam. CVAR tfc_autoteam used now.
+#define TFLAG_TEAMFRAGS				(1 << 7)		// Individual Frags, or Frags = TeamScore
+#define TFLAG_FIRSTENTRY			(1 << 8)		// Used to determine the first time toggleflags is set
+													// In a map. Cannot be toggled by players.
+#define TFLAG_SPYINVIS				(1 << 9)		// Spy invisible only
+#define TFLAG_GRAPPLE				(1 << 10)	// Grapple on/off
+//#define TFLAG_FULLTEAMSCORE		(1 << 11)  	// Each Team's score is TeamScore + Frags
+#define TFLAG_FLAGEMULATION			(1 << 12)  	// Flag emulation on for old TF maps
+#define TFLAG_USE_STANDARD			(1 << 13)  	// Use the TF War standard for Flag emulation
+
+#define TFLAG_FRAGSCORING			(1 << 14)	// Use frag scoring only
+
+/*======================*/
+//      Menu stuff      //
+/*======================*/
+
+#define MENU_DEFAULT				1
+#define MENU_TEAM 					2
+#define MENU_CLASS 					3
+#define MENU_MAPBRIEFING			4
+#define MENU_INTRO 					5
+#define MENU_CLASSHELP				6
+#define MENU_CLASSHELP2 			7
+#define MENU_REPEATHELP 			8
+
+#define MENU_SPECHELP				9
+
+
+#define MENU_SPY					12
+#define MENU_SPY_SKIN				13
+#define MENU_SPY_COLOR				14
+#define MENU_ENGINEER				15
+#define MENU_ENGINEER_FIX_DISPENSER	16
+#define MENU_ENGINEER_FIX_SENTRYGUN	17
+#define MENU_ENGINEER_FIX_MORTAR	18
+#define MENU_DISPENSER				19
+#define MENU_CLASS_CHANGE			20
+#define MENU_TEAM_CHANGE			21
+
+#define MENU_REFRESH_RATE 			25
+
+#define MENU_VOICETWEAK				50
+
+//============================
+// Timer Types
+#define TF_TIMER_ANY				0
+#define TF_TIMER_CONCUSSION			1
+#define TF_TIMER_INFECTION			2
+#define TF_TIMER_HALLUCINATION		3
+#define TF_TIMER_TRANQUILISATION	4
+#define TF_TIMER_ROTHEALTH			5
+#define TF_TIMER_REGENERATION		6
+#define TF_TIMER_GRENPRIME			7
+#define TF_TIMER_CELLREGENERATION	8
+#define TF_TIMER_DETPACKSET			9
+#define TF_TIMER_DETPACKDISARM		10
+#define TF_TIMER_BUILD				11
+#define TF_TIMER_CHECKBUILDDISTANCE 12
+#define TF_TIMER_DISGUISE			13
+#define TF_TIMER_DISPENSERREFILL	14
+
+// Non Player timers
+#define TF_TIMER_RETURNITEM			100
+#define TF_TIMER_DELAYEDGOAL		101
+#define TF_TIMER_ENDROUND			102
+
+//============================
+// Teamscore printing
+#define TS_PRINT_SHORT				1
+#define TS_PRINT_LONG				2
+#define TS_PRINT_LONG_TO_ALL		3
+
+#ifndef TF_DEFS_ONLY
+typedef struct
+{
+	int topColor;
+	int bottomColor;
+} team_color_t;
+/*==================================================*/
+/* GLOBAL VARIABLES									*/
+/*==================================================*/
+// FortressMap stuff
+extern float number_of_teams;	// number of teams supported by the map
+extern int   illegalclasses[5];	// Illegal playerclasses for all teams
+extern int   civilianteams;		// Bitfield holding Civilian teams
+extern Vector  rgbcolors[5];		 // RGB colors for each of the 4 teams
+
+extern team_color_t teamcolors[5][PC_LASTCLASS]; // Colors for each of the 4 teams
+extern int   teamscores[5];		// Goal Score of each team
+extern int	 g_iOrderedTeams[5]; // Teams ordered into order of winners->losers
+extern int	 teamfrags[5];		// Total Frags for each team
+extern int   teamlives[5];		// Number of lives each team's players have
+extern int   teammaxplayers[5];	// Max number of players allowed in each team
+extern float teamadvantage[5];	// only used if the teamplay equalisation bits are set
+								// stores the damage ratio players take/give
+extern int   teamallies[5];		// Keeps track of which teams are allied
+extern string_t	team_names[5];
+
+extern BOOL  CTF_Map;
+extern BOOL  birthday;
+extern BOOL  christmas;
+
+extern float num_world_flames;
+
+// Clan Battle stuff
+extern float clan_scores_dumped;
+extern float cb_prematch_time;
+extern float fOldPrematch;
+extern float fOldCeaseFire;
+extern float cb_ceasefire_time;
+extern float last_id;
+extern float spy_off;
+extern float old_grens;		
+extern float flagem_checked;
+extern float flNextEqualisationCalc;
+extern BOOL  cease_fire;
+extern BOOL  no_cease_fire_text;
+extern BOOL  initial_cease_fire;
+extern BOOL  last_cease_fire;
+// Autokick stuff
+extern float autokick_kills;
+
+extern float deathmsg;		// Global, which is set before every T_Damage, to indicate
+							// the death message that should be used.
+
+extern char *sTeamSpawnNames[];
+extern char *sClassNames[];
+extern char *sNewClassModelFiles[];
+extern char *sOldClassModelFiles[];
+extern char *sClassModels[];
+extern char *sClassCfgs[];
+extern char *sGrenadeNames[];
+extern string_t	team_menu_string;	
+
+extern int toggleflags;					// toggleable flags
+
+extern BOOL g_bFirstClient;
+
+extern float g_fNextPrematchAlert;
+
+typedef struct
+{
+	int			ip;
+	edict_t	*pEdict;
+} ip_storage_t;
+
+extern ip_storage_t g_IpStorage[32];
+
+class CGhost;
+/*==========================================================================*/
+BOOL ClassIsRestricted(float tno, int pc);
+char* GetTeamName(int tno);
+int TeamFortress_GetNoPlayers();
+void DestroyBuilding(CBaseEntity *eng, char *bld);
+void teamsprint( int tno, CBaseEntity *ignore, int msg_dest, const char *st, const char *param1 = NULL, const char *param2 = NULL, const char *param3 = NULL );
+float anglemod( float v );
+
+// Team Funcs
+BOOL TeamFortress_TeamIsCivilian(float tno);
+void TeamFortress_TeamShowScores(BOOL bLong, CBasePlayer *pPlayer);
+BOOL TeamFortress_TeamPutPlayerInTeam();
+void TeamFortress_TeamSetColor(int tno);
+void TeamFortress_TeamIncreaseScore(int tno, int scoretoadd);
+int TeamFortress_TeamGetScoreFrags(int tno);
+int TeamFortress_TeamGetNoPlayers(int tno);
+float TeamEqualiseDamage(CBaseEntity *targ, CBaseEntity *attacker, float damage);
+BOOL IsSpawnPointValid( Vector &pos );
+BOOL TeamFortress_SortTeams( void );
+void DumpClanScores( void );
+void CalculateTeamEqualiser();
+
+// mapscript funcs
+void ParseTFServerSettings();
+void ParseTFMapSettings();
+CBaseEntity* Finditem(int ino);
+CBaseEntity* Findgoal(int gno);
+CBaseEntity* Findteamspawn(int gno);
+void RemoveGoal(CBaseEntity *Goal);
+void tfgoalitem_GiveToPlayer(CBaseEntity *Item, CBasePlayer *AP, CBaseEntity *Goal);
+void dremove( CBaseEntity *te );
+void tfgoalitem_RemoveFromPlayer(CBaseEntity *Item, CBasePlayer *AP, int iMethod);
+void tfgoalitem_drop(CBaseEntity *Item, BOOL PAlive, CBasePlayer *P);
+void DisplayItemStatus(CBaseEntity *Goal, CBasePlayer *Player, CBaseEntity *Item);
+void tfgoalitem_checkgoalreturn(CBaseEntity *Item);
+void DoGoalWork(CBaseEntity *Goal, CBasePlayer *AP);
+void DoResults(CBaseEntity *Goal, CBasePlayer *AP, BOOL bAddBonuses);
+void DoGroupWork(CBaseEntity *Goal, CBasePlayer *AP);
+// hooks into the mapscript for all entities
+BOOL ActivateDoResults(CBaseEntity *Goal, CBasePlayer *AP, CBaseEntity *ActivatingGoal);
+BOOL ActivationSucceeded(CBaseEntity *Goal, CBasePlayer *AP, CBaseEntity *ActivatingGoal);
+
+// prematch & ceasefire
+void Display_Prematch();
+void Check_Ceasefire();
+
+// admin
+void KickPlayer( CBaseEntity *pTarget );
+void BanPlayer( CBaseEntity *pTarget );
+CGhost *FindGhost( int iGhostID );
+int GetBattleID( edict_t *pEntity );
+
+extern cvar_t	tfc_spam_penalty1;// the initial gag penalty for a spammer (seconds)
+extern cvar_t	tfc_spam_penalty2;// incremental gag penalty (seconds) for each time gagged spammer continues to speak.
+extern cvar_t	tfc_spam_limit; // at this many points, gag the spammer
+extern cvar_t	tfc_clanbattle, tfc_clanbattle_prematch, tfc_prematch, tfc_clanbattle_ceasefire, tfc_balance_teams, tfc_balance_scores;
+extern cvar_t   tfc_clanbattle_locked, tfc_birthday, tfc_autokick_kills, tfc_fragscoring, tfc_autokick_time, tfc_adminpwd;
+extern cvar_t	weaponstay, footsteps, flashlight, aimcrosshair, falldamage, teamplay;
+extern cvar_t	allow_spectators;
+
+/*==========================================================================*/
+class CTFFlame : public CBaseMonster
+{
+public:
+	void	Spawn( void );
+	void	Precache( void );
+	void	EXPORT FlameThink( void );
+	static  CTFFlame *FlameSpawn( CBaseEntity *pOwner, CBaseEntity *pTarget );
+	void	FlameDestroy( void );
+
+	float	m_flNextDamageTime;
+};
+
+/*==========================================================================*/
+// MAPSCRIPT CLASSES
+class CTFGoal : public CBaseAnimating
+{
+public:
+	void	Spawn( void );
+	void	StartGoal( void );
+	void	EXPORT PlaceGoal( void );
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	int		Classify ( void ) { return	CLASS_TFGOAL; }
+
+	void	SetObjectCollisionBox( void );
+};
+ 
+class CTFGoalItem : public CTFGoal
+{
+public:
+	void	Spawn( void );
+	void	StartItem( void );
+	void	EXPORT PlaceItem( void );
+	int		Classify ( void ) { return	CLASS_TFGOAL_ITEM; }
+
+	float	m_flDroppedAt;
+};
+
+class CTFTimerGoal : public CTFGoal
+{
+public:
+	void	Spawn( void );
+	int		Classify ( void ) { return	CLASS_TFGOAL_TIMER; }
+};
+
+class CTFSpawn : public CBaseEntity
+{
+public:
+	void	Spawn( void );
+	void	Activate( void );
+	int		Classify ( void ) { return	CLASS_TFSPAWN; }
+	BOOL	CheckTeam( int iTeamNo );
+	EHANDLE m_pTeamCheck;
+};
+
+class CTFDetect : public CBaseEntity
+{
+public:
+	void	Spawn( void );
+	int		Classify ( void ) { return	CLASS_TFGOAL; }
+};
+
+class CTelefragDeath : public CBaseEntity
+{
+public:
+	void		Spawn( void );
+	void		EXPORT	DeathTouch( CBaseEntity *pOther );
+};
+
+class CTeamCheck : public CBaseDelay
+{
+public:
+	void Spawn( void );
+	void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	BOOL TeamMatches( int iTeam );
+};
+class CTeamSet : public CBaseDelay
+{
+public:
+	void Spawn( void );
+	void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+};
+#endif // TF_DEFS_ONLY
+#endif // __TF_DEFS_H
+
+
diff --git a/main/source/cl_dll/train.cpp b/main/source/cl_dll/train.cpp
new file mode 100644
index 00000000..2c133ce6
--- /dev/null
+++ b/main/source/cl_dll/train.cpp
@@ -0,0 +1,85 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// Train.cpp
+//
+// implementation of CHudAmmo class
+//
+
+#include "hud.h"
+#include "cl_util.h"
+#include <string.h>
+#include <stdio.h>
+#include "parsemsg.h"
+
+DECLARE_MESSAGE(m_Train, Train )
+
+
+int CHudTrain::Init(void)
+{
+	HOOK_MESSAGE( Train );
+
+	m_iPos = 0;
+	m_iFlags = 0;
+	//gHUD.AddHudElem(this);
+
+	return 1;
+};
+
+int CHudTrain::VidInit(void)
+{
+	m_hSprite = 0;
+
+	return 1;
+};
+
+int CHudTrain::Draw(float fTime)
+{
+	if ( !m_hSprite )
+		m_hSprite = LoadSprite("sprites/%d_train.spr");
+
+	if (m_iPos)
+	{
+		int r, g, b, x, y;
+
+		gHUD.GetPrimaryHudColor(r, g, b);
+		SPR_Set(m_hSprite, r, g, b );
+
+		// This should show up to the right and part way up the armor number
+		y = ScreenHeight() - SPR_Height(m_hSprite,0) - gHUD.m_iFontHeight;
+		x = ScreenWidth()/3 + SPR_Width(m_hSprite,0)/4;
+
+		SPR_DrawAdditive( m_iPos - 1,  x, y, NULL);
+
+	}
+
+	return 1;
+}
+
+
+int CHudTrain::MsgFunc_Train(const char *pszName,  int iSize, void *pbuf)
+{
+	BEGIN_READ( pbuf, iSize );
+
+	// update Train data
+	m_iPos = READ_BYTE();
+
+	if (m_iPos)
+		m_iFlags |= HUD_ACTIVE;
+	else
+		m_iFlags &= ~HUD_ACTIVE;
+
+	return 1;
+}
diff --git a/main/source/cl_dll/tri.cpp b/main/source/cl_dll/tri.cpp
new file mode 100644
index 00000000..634fde28
--- /dev/null
+++ b/main/source/cl_dll/tri.cpp
@@ -0,0 +1,455 @@
+// Triangle rendering, if any
+
+#include "hud.h"
+#include "cl_util.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/demo.h"
+
+// Triangle rendering apis are in gEngfuncs.pTriAPI
+
+#include "const.h"
+#include "entity_state.h"
+#include "cl_entity.h"
+#include "triangleapi.h"
+#include "APIProxy.h"
+#include "Exports.h"
+#include "particles/p_vector.h"
+#include "particles/papi.h"
+#include "mod/AvHParticleSystemManager.h"
+
+#include "pm_defs.h"
+#include "pm_shared.h"
+#include "pm_movevars.h"
+#include "mod/AvHEvents.h"
+#include "mod/AvHScriptManager.h"
+#include "mod/AvHClientVariables.h"
+
+#include "common/com_model.h"
+#include "mod/CollisionUtil.h"
+
+
+extern playermove_t *pmove;
+
+extern vec3_t v_origin;
+extern vec3_t gLastCommanderViewpoint;
+
+// A fountain
+/*
+=================
+Draw_Triangles
+
+  Example routine.  Draws a sprite offset from the player origin.
+  =================
+*/
+//void Draw_Triangles( void )
+//{
+//	cl_entity_t *player;
+//	vec3_t org;
+//	
+//	// Load it up with some bogus data
+//	player = gEngfuncs.GetLocalPlayer();
+//	if ( !player )
+//		return;
+//	
+//	org = player->origin;
+//	
+//	org.x += 0;
+//	org.y += 0;
+//
+//	pVector theView(player->angles.x, player->angles.y, player->angles.z);
+//	theView.normalize();
+//	pVector theUp(0.0f, 0.0f, 1.0f);
+//	pVector theBase(org.x, org.y, org.z);
+//
+//	// Do what the particles do.
+//	ComputeParticles(theBase);
+//
+//	// Create a triangle, sigh
+//	//gEngfuncs.pTriAPI->RenderMode( kRenderNormal );
+//	gEngfuncs.pTriAPI->CullFace( TRI_NONE );
+//
+//	gEngfuncs.pTriAPI->Brightness( 1 );
+//
+//	if (gHUD.m_hsprCursor == 0)
+//	{
+//		char sz[256];
+//		//sprintf( sz, "sprites/cursor.spr" );
+//		//sprintf( sz, "sprites/myrain.spr" );
+//		sprintf( sz, "sprites/haze2.spr" );
+//		gHUD.m_hsprCursor = SPR_Load( sz );
+//	}
+//	
+//	if ( !gEngfuncs.pTriAPI->SpriteTexture( (struct model_s *)gEngfuncs.GetSpritePointer( gHUD.m_hsprCursor ), 0 ))
+//	{
+//		return;
+//	}
+//
+//	gEngfuncs.pTriAPI->RenderMode( kRenderTransAdd  );
+//	gEngfuncs.pTriAPI->Color4f(1.0f, 1.0f, 1.0f, .5f);
+//	gEngfuncs.pTriAPI->CullFace( TRI_NONE );
+//	DrawGroupTriSplat(theView, theUp, 70, true, true, true);
+//	
+//	//// Create a triangle, sigh
+//	//gEngfuncs.pTriAPI->RenderMode( kRenderNormal );
+//	//
+//	//gEngfuncs.pTriAPI->Begin( TRI_QUADS );
+//	//// Overload p->color with index into tracer palette, p->packedColor with brightness
+//	//gEngfuncs.pTriAPI->Color4f( 1.0, 1.0, 1.0, 1.0 );
+//	//// UNDONE: This gouraud shading causes tracers to disappear on some cards (permedia2)
+//	//gEngfuncs.pTriAPI->Brightness( 1 );
+//	//gEngfuncs.pTriAPI->TexCoord2f( 0, 0 );
+//	//gEngfuncs.pTriAPI->Vertex3f( org.x, org.y, org.z );
+//	//
+//	//gEngfuncs.pTriAPI->Brightness( 1 );
+//	//gEngfuncs.pTriAPI->TexCoord2f( 0, 1 );
+//	//gEngfuncs.pTriAPI->Vertex3f( org.x, org.y + 50, org.z );
+//	//
+//	//gEngfuncs.pTriAPI->Brightness( 1 );
+//	//gEngfuncs.pTriAPI->TexCoord2f( 1, 1 );
+//	//gEngfuncs.pTriAPI->Vertex3f( org.x + 50, org.y + 50, org.z );
+//	//
+//	//gEngfuncs.pTriAPI->Brightness( 1 );
+//	//gEngfuncs.pTriAPI->TexCoord2f( 1, 0 );
+//	//gEngfuncs.pTriAPI->Vertex3f( org.x + 50, org.y, org.z );
+//	
+//
+//	gEngfuncs.pTriAPI->End();
+//	gEngfuncs.pTriAPI->RenderMode( kRenderNormal );
+//}	
+
+//#endif
+
+void AngleMatrix (const vec3_t angles, float (*matrix)[4] )
+{
+	float		angle;
+	float		sr, sp, sy, cr, cp, cy;
+	
+	angle = angles[2] * (M_PI*2 / 360);
+	sy = sin(angle);
+	cy = cos(angle);
+	angle = angles[1] * (M_PI*2 / 360);
+	sp = sin(angle);
+	cp = cos(angle);
+	angle = angles[0] * (M_PI*2 / 360);
+	sr = sin(angle);
+	cr = cos(angle);
+	
+	// matrix = (Z * Y) * X
+	matrix[0][0] = cp*cy;
+	matrix[1][0] = cp*sy;
+	matrix[2][0] = -sp;
+	matrix[0][1] = sr*sp*cy+cr*-sy;
+	matrix[1][1] = sr*sp*sy+cr*cy;
+	matrix[2][1] = sr*cp;
+	matrix[0][2] = (cr*sp*cy+-sr*-sy);
+	matrix[1][2] = (cr*sp*sy+-sr*cy);
+	matrix[2][2] = cr*cp;
+	matrix[0][3] = 0.0;
+	matrix[1][3] = 0.0;
+	matrix[2][3] = 0.0;
+}
+
+void VectorRotate (const vec3_t in1, const float in2[3][4], vec3_t& out)
+{
+	out[0] = DotProduct(in1, in2[0]);
+	out[1] = DotProduct(in1, in2[1]);
+	out[2] = DotProduct(in1, in2[2]);
+}
+
+/*
+=================
+HUD_DrawNormalTriangles
+
+  Non-transparent triangles-- add them here
+  =================
+*/
+void CL_DLLEXPORT HUD_DrawNormalTriangles( void )
+{
+	RecClDrawNormalTriangles();
+	
+	//	pVector			theView;
+	//	cl_entity_t*	thePlayer;
+	//	
+	//	thePlayer = gEngfuncs.GetLocalPlayer();
+	//	if(thePlayer)
+	//	{	
+	//		pVector theView(thePlayer->angles.x, thePlayer->angles.y, thePlayer->angles.z);
+	//		theView.normalize();
+	//
+	//		//AvHParticleSystemManager::Instance()->Draw(theView);
+	//		static int theAngle = 0;
+	//		//static HSPRITE theSprite = 0;
+	//		DrawCircleOnGroundAtPoint(thePlayer->origin, 6, theAngle++, 100, .5f, .5f, 1.0f, .5f);
+	//	}
+	
+	gHUD.PreRenderFrame();
+	
+	//gHUD.m_Spectator.DrawOverview();
+	
+#if defined( TEST_IT )
+	//	Draw_Triangles();
+#endif
+}
+
+
+void DrawHitBox(const OBBox& inBox)
+{
+
+    HSPRITE sprite = Safe_SPR_Load("sprites/white.spr");
+
+    vec3_t theBoxPoint[8];
+
+    for (int i = 0; i < 8; ++i)
+    {
+
+        vec3_t xAmount;
+        vec3_t yAmount;
+        vec3_t zAmount;
+
+        if (i & 1)
+        {
+            VectorScale(inBox.mAxis[0],  inBox.mExtents[0], xAmount);
+        }
+        else
+        {
+            VectorScale(inBox.mAxis[0], -inBox.mExtents[0], xAmount);
+        }
+        
+        if (i & 2)
+        {
+            VectorScale(inBox.mAxis[1],  inBox.mExtents[1], yAmount);
+        }
+        else
+        {
+            VectorScale(inBox.mAxis[1], -inBox.mExtents[1], yAmount);
+        }
+        
+        if (i & 4)
+        {
+            VectorScale(inBox.mAxis[2],  inBox.mExtents[2], zAmount);
+        }
+        else
+        {
+            VectorScale(inBox.mAxis[2], -inBox.mExtents[2], zAmount);
+        }
+        
+        VectorAdd(inBox.mOrigin,  xAmount, theBoxPoint[i]);
+        VectorAdd(theBoxPoint[i], yAmount, theBoxPoint[i]);
+        VectorAdd(theBoxPoint[i], zAmount, theBoxPoint[i]);
+        
+    }
+    
+    struct model_s* spritePtr = (struct model_s*)(gEngfuncs.GetSpritePointer(sprite));
+    gEngfuncs.pTriAPI->SpriteTexture(spritePtr, 0);
+
+    gEngfuncs.pTriAPI->Begin(TRI_LINES);
+
+    gEngfuncs.pTriAPI->Color4f(1, 1, 1, 1);
+
+    // Bottom.
+        
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[0]);
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[1]);
+    
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[1]);
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[3]);
+    
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[3]);
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[2]);
+
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[2]);
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[0]);
+
+    // Top.
+
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[4]);
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[6]);
+    
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[6]);
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[7]);
+    
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[7]);
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[5]);
+
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[5]);
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[4]);
+
+    // Sides.
+
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[0]);
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[4]);
+    
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[2]);
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[6]);
+    
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[3]);
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[7]);
+
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[1]);
+    gEngfuncs.pTriAPI->Vertex3fv(theBoxPoint[5]);
+
+    gEngfuncs.pTriAPI->End();
+
+}
+
+
+void DrawHitBoxes()
+{
+
+    extern int cam_thirdperson;
+
+    for (int j = 1; j < 512; ++j)
+    {
+
+        cl_entity_t* entity = gEngfuncs.GetEntityByIndex(j);
+
+        if (entity == gEngfuncs.GetLocalPlayer() && !cam_thirdperson)
+        {
+            continue;
+        }
+
+        if (entity->curstate.effects & EF_NODRAW)
+        {
+            continue;
+        }
+
+        if (entity != NULL && entity->model != NULL && entity->model->type == mod_studio)
+        {
+        
+            int theEntityIndex = j;
+
+            OBBox theBox[256];
+            int   theNumBoxes;
+
+            NS_GetHitBoxesForEntity(theEntityIndex, 256, theBox, theNumBoxes, gEngfuncs.GetClientTime());
+
+            for (int i = 0; i < theNumBoxes; ++i)
+            {
+                DrawHitBox(theBox[i]);
+            }
+        
+        }
+    
+    }
+    
+}
+ 
+
+
+/*
+
+  =================
+  HUD_DrawTransparentTriangles
+  
+	Render any triangles with transparent rendermode needs here
+	=================
+*/
+void CL_DLLEXPORT HUD_DrawTransparentTriangles( void )
+{
+	RecClDrawTransparentTriangles();
+	
+	cl_entity_t*	thePlayer;
+	
+	if (gHUD.GetParticlesVisible() && gHUD.GetSafeForSpriteDrawing())
+	{
+		// get local player
+		thePlayer = gEngfuncs.GetLocalPlayer();
+		if(thePlayer)
+		{
+			//pVector theView(thePlayer->angles.x, thePlayer->angles.y, thePlayer->angles.z);
+			//pVector theView(viewangles[0], viewangles[1], viewangles[2]);
+			//theView.normalize();
+			
+			vec3_t angles, up, right, forward;
+			//		gEngfuncs.pfnAngleVectors(thePlayer->angles, forward, right, up);
+			
+			// This view doesn't take pitch into account.  Pitch is stored in x.  While yaw goes from -180 to 180,
+			// pitch goes from -10 (looking up) to 10 (looking down).  Alter forward[YAW} (forward[0]) so 
+			// the particles can billboard themselves correctly.
+			
+			//		float thePitch = thePlayer->angles[PITCH];
+			//		float theNormAngle = thePitch/-10.0f;
+			//		int theAngle = theNormAngle*90;
+			//		//float theYaw = thePlayer->angles[YAW];
+			//
+			//		vec3_t theRotationAngles;
+			//		theRotationAngles[0] = theAngle;
+			//		theRotationAngles[1] = 0;
+			//		theRotationAngles[2] = 0;
+			//
+			//		float theMatrix[3][4];
+			//		AngleMatrix(theRotationAngles, theMatrix);
+			//
+			//		vec3_t theOut;
+			//		VectorRotate(forward, theMatrix, theOut);
+			//		pVector theRealView(theOut[0], theOut[1], theOut[2]);
+			
+			pVector theRealView;
+            gEngfuncs.pfnAngleVectors(v_angles, forward, right, up);
+			
+			theRealView.x = forward[0];
+			theRealView.y = forward[1];
+			theRealView.z = forward[2];
+			
+			// Disable fog
+			float theFogColor[3];
+			theFogColor[0] = theFogColor[1] = theFogColor[2] = 0.0f;
+			gEngfuncs.pTriAPI->Fog(theFogColor, 0, 0, 0);
+		
+			// Draw particles via tri API, without z-buffering, unless we're debugging
+			//if(cl_particleinfo->value == 0)
+			//{
+				AvHParticleSystemManager::Instance()->Draw(theRealView);
+			//}
+			
+			//DrawOrdersForPlayers(gHUD.GetDrawPlayerOrders());
+			
+			//DrawRangeIndicator();
+			
+			//DrawBlips(theRealView);
+			
+			//DrawMarineLights(theRealView);
+		
+			AvHScriptManager::Instance()->DrawTransparent();
+			
+			//DrawDebugEffects();
+			
+			//static int theAngle = 0;
+			//DrawCircleOnGroundAtPoint(thePlayer->origin, 6, theAngle++, 100, 1.0f, 1.0f, 1.0f, .2f);
+		}
+
+        // Draw the hitboxes for all of the objects.
+
+/*
+#ifdef AVH_PLAYTEST_BUILD
+        if (CVAR_GET_FLOAT("sv_cheats") != 0 && CVAR_GET_FLOAT("cl_drawhitboxes") != 0)
+        {
+            DrawHitBoxes();
+        }
+#endif
+*/        
+		// Assumes that the only time players don't have view models is when they are commanding, gestating, cocooned
+		// or when they aren't playing.  See the end of StudioModelRenderer::StudioDrawModel().
+		//if((gHUD.GetRole() == ROLE_COMMANDER) || (gHUD.GetRole() == ROLE_GESTATING) || (gHUD.GetRole() == ROLE_COCOONED) || (gHUD.GetPlayMode() != PLAYMODE_PLAYING))
+		cl_entity_t* theViewEntity = gEngfuncs.GetViewModel();
+		if(!theViewEntity || !theViewEntity->model)
+		{
+			// This should always be rendered with the commander viewpoint
+//			vec3_t theCurrentOrigin = v_origin;
+//		
+//			if(gHUD.GetInTopDownMode())
+//			{
+//				v_origin = gLastCommanderViewpoint;
+//			}
+			
+			gHUD.RenderNoZBuffering();
+		
+//			if(gHUD.GetInTopDownMode())
+//			{
+//				v_origin = theCurrentOrigin;
+//			}
+		}
+		
+		gHUD.PostRenderFrame();
+	}
+}
\ No newline at end of file
diff --git a/main/source/cl_dll/util.cpp b/main/source/cl_dll/util.cpp
new file mode 100644
index 00000000..b44b04eb
--- /dev/null
+++ b/main/source/cl_dll/util.cpp
@@ -0,0 +1,314 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// util.cpp
+//
+// implementation of class-less helper functions
+//
+
+#include "STDIO.H"
+#include "STDLIB.H"
+#include "MATH.H"
+
+#include "hud.h"
+#include "cl_util.h"
+#include "common/cl_entity.h"
+#include <string.h>
+#ifndef M_PI
+#define M_PI		3.14159265358979323846	// matches value in gcc v2 math.h
+#endif
+
+#include "pm_defs.h"
+#include "pm_shared.h"
+#include "pm_movevars.h"
+extern playermove_t *pmove;
+
+extern float HUD_GetFOV( void );
+vec3_t vec3_origin( 0, 0, 0 );
+extern vec3_t v_angles;
+//double sqrt(double x);
+//
+//float Length(const float *v)
+//{
+//	int		i;
+//	float	length;
+//	
+//	length = 0;
+//	for (i=0 ; i< 3 ; i++)
+//		length += v[i]*v[i];
+//	length = sqrt (length);		// FIXME
+//
+//	return length;
+//}
+//
+//void VectorAngles( const float *forward, float *angles )
+//{
+//	float	tmp, yaw, pitch;
+//	
+//	if (forward[1] == 0 && forward[0] == 0)
+//	{
+//		yaw = 0;
+//		if (forward[2] > 0)
+//			pitch = 90;
+//		else
+//			pitch = 270;
+//	}
+//	else
+//	{
+//		yaw = (atan2(forward[1], forward[0]) * 180 / M_PI);
+//		if (yaw < 0)
+//			yaw += 360;
+//
+//		tmp = sqrt (forward[0]*forward[0] + forward[1]*forward[1]);
+//		pitch = (atan2(forward[2], tmp) * 180 / M_PI);
+//		if (pitch < 0)
+//			pitch += 360;
+//	}
+//	
+//	angles[0] = pitch;
+//	angles[1] = yaw;
+//	angles[2] = 0;
+//}
+//
+//float VectorNormalize (float *v)
+//{
+//	float	length, ilength;
+//
+//	length = v[0]*v[0] + v[1]*v[1] + v[2]*v[2];
+//	length = sqrt (length);		// FIXME
+//
+//	if (length)
+//	{
+//		ilength = 1/length;
+//		v[0] *= ilength;
+//		v[1] *= ilength;
+//		v[2] *= ilength;
+//	}
+//		
+//	return length;
+//
+//}
+//
+//void VectorInverse ( float *v )
+//{
+//	v[0] = -v[0];
+//	v[1] = -v[1];
+//	v[2] = -v[2];
+//}
+//
+//void VectorScale (const float *in, float scale, float *out)
+//{
+//	out[0] = in[0]*scale;
+//	out[1] = in[1]*scale;
+//	out[2] = in[2]*scale;
+//}
+//
+//void VectorMA (const float *veca, float scale, const float *vecb, float *vecc)
+//{
+//	vecc[0] = veca[0] + scale*vecb[0];
+//	vecc[1] = veca[1] + scale*vecb[1];
+//	vecc[2] = veca[2] + scale*vecb[2];
+//}
+
+int ScreenHeight()
+{
+	// CGC: Replace code when ready to fix overview map
+	//int theViewport[4];
+	//gHUD.GetViewport(theViewport);
+	//return theViewport[3];
+	return gHUD.m_scrinfo.iHeight;
+}
+
+// ScreenWidth returns the width of the screen, in pixels
+//#define ScreenWidth ( int theViewport[4];  gHUD.GetViewport(theViewport);  return theViewport[2]; )
+int ScreenWidth()
+{
+	//int theViewport[4];
+	//gHUD.GetViewport(theViewport);
+	//return theViewport[2];
+	return gHUD.m_scrinfo.iWidth;
+}
+
+
+HSPRITE Safe_SPR_Load(const char* inSpriteName)
+{
+	HSPRITE theSpriteHandle = gEngfuncs.pfnSPR_Load(inSpriteName);
+	
+	// Check for "Can't allocate 128 HUD sprites" crash
+	ASSERT(theSpriteHandle < 128);
+	
+	return theSpriteHandle;
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+// Given a field of view and mouse/screen positions as well as the current
+//  render origin and angles, returns a unit vector through the mouse position
+//  that can be used to trace into the world under the mouse click pixel.
+// Input  : fov - 
+//                      mousex - 
+//                      mousey - 
+//                      screenwidth - 
+//                      screenheight - 
+//                      vecRenderAngles - 
+//                      c_x - 
+//                      vpn - 
+//                      vup - 
+//                      360.0 - 
+//-----------------------------------------------------------------------------
+void CreatePickingRay( int mousex, int mousey, Vector& outVecPickingRay )
+{
+	float dx, dy;
+	float c_x, c_y;
+	float dist;
+	Vector vpn, vup, vright;
+
+//	char gDebugMessage[256];
+
+	float fovDegrees = gHUD.m_iFOV;
+
+	//cl_entity_s* theLocalEntity = gEngfuncs.GetLocalPlayer();
+	//Vector vecRenderOrigin = theLocalEntity->origin;
+	//Vector vecRenderAngles = theLocalEntity->angles;
+	//Vector vecRenderAngles;
+	vec3_t vecRenderAngles;
+	//gEngfuncs.GetViewAngles((float*)vecRenderAngles);
+	VectorCopy(v_angles, vecRenderAngles);
+
+	//vec3_t theForward, theRight, theUp;
+	//AngleVectors(v_angles, theForward, theRight, theUp);
+
+	//ASSERT(v_angles.x == vecRenderAngles.x);
+	//ASSERT(v_angles.y == vecRenderAngles.y);
+	//ASSERT(v_angles.z == vecRenderAngles.z);
+	
+	c_x = ScreenWidth() / 2;
+	c_y = ScreenHeight() / 2;
+	
+	
+	dx = (float)mousex - c_x;
+	// Invert Y
+	dy = c_y - (float)mousey;
+
+//	sprintf(gDebugMessage, "inMouseX/Y: %d/%d, dx/dy = %d/%d", (int)mousex, (int)mousey, (int)dx, (int)dy);
+//	CenterPrint(gDebugMessage);
+	
+	// Convert view plane distance
+	dist = c_x / tan( M_PI * fovDegrees / 360.0 );
+	
+	
+	// Decompose view angles
+	AngleVectors( vecRenderAngles, vpn, vright, vup );
+	
+	
+	// Offset forward by view plane distance, and then by pixel offsets
+	outVecPickingRay = vpn * dist + vright * ( dx ) + vup * ( dy );
+
+	//sprintf(gDebugMessage, "outVecPickingRay: %.0f, %.0f, %.0f", outVecPickingRay.x, outVecPickingRay.y, outVecPickingRay.z);
+	//CenterPrint(gDebugMessage);
+	
+	// Convert to unit vector
+	VectorNormalize( outVecPickingRay );
+}
+
+void FillRGBAClipped(vgui::Panel* inPanel, int inStartX, int inStartY, int inWidth, int inHeight, int r, int g, int b, int a)
+{
+	int thePanelXPos, thePanelYPos;
+	inPanel->getPos(thePanelXPos, thePanelYPos);
+
+	int thePanelWidth, thePanelHeight;
+	inPanel->getSize(thePanelWidth, thePanelHeight);
+
+	// Clip starting point
+	inStartX = min(max(0, inStartX), thePanelWidth-1);
+	inStartY = min(max(0, inStartY), thePanelHeight-1);
+
+	// Clip width if it goes too far
+	ASSERT(inWidth >= 0);
+	ASSERT(inHeight >= 0);
+
+	if(inStartX + inWidth >= thePanelWidth)
+	{
+		inWidth = max(0, thePanelWidth - inStartX);
+	}
+	if(inStartY + inHeight >= thePanelHeight)
+	{
+		inHeight = max(0, thePanelHeight - inStartY);
+	}
+
+	// Now we can draw
+	FillRGBA(inStartX, inStartY, inWidth, inHeight, r, g, b, a);
+	
+}
+
+
+HSPRITE LoadSprite(const char *pszName)
+{
+	int i;
+	char sz[256]; 
+
+	if (ScreenWidth() < 640)
+		i = 320;
+	else
+		i = 640;
+
+	sprintf(sz, pszName, i);
+
+	return Safe_SPR_Load(sz);
+}
+
+bool LocalizeString(const char* inMessage, string& outputString)
+{
+	#define kMaxLocalizedStringLength 1024
+
+	bool theSuccess = false;
+	char theInputString[kMaxLocalizedStringLength];
+	char theOutputString[kMaxLocalizedStringLength];
+
+	// Don't localize empty strings
+	if(strcmp(inMessage, ""))
+	{
+		if(*inMessage != '#')
+		{
+			sprintf(theInputString, "#%s", inMessage);
+		}
+		else
+		{
+			sprintf(theInputString, "%s", inMessage);
+		}
+		
+		if((CHudTextMessage::LocaliseTextString(theInputString, theOutputString, kMaxLocalizedStringLength) != NULL))
+		{
+			outputString = theOutputString;
+
+			if(theOutputString[0] != '#')
+			{
+				theSuccess = true;
+			}
+			else
+			{
+				string theTempString = theOutputString;
+				theTempString = theTempString.substr(1, theTempString.length());
+				outputString = theTempString;
+			}
+		}
+		else
+		{
+			outputString = string("err: ") + theInputString;
+		}
+	}
+	
+	return theSuccess;
+}
\ No newline at end of file
diff --git a/main/source/cl_dll/util_vector.h b/main/source/cl_dll/util_vector.h
new file mode 100644
index 00000000..801ef250
--- /dev/null
+++ b/main/source/cl_dll/util_vector.h
@@ -0,0 +1,38 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//  Vector.h
+// A subset of the extdll.h in the project HL Entity DLL
+//
+#ifndef UTIL_VECTOR_H
+#define UTIL_VECTOR_H
+
+// Misc C-runtime library headers
+#include "STDIO.H"
+#include "STDLIB.H"
+#include "MATH.H"
+
+// Header file containing definition of globalvars_t and entvars_t
+typedef int	func_t;					//
+typedef int	string_t;				// from engine's pr_comp.h;
+typedef float vec_t;				// needed before including progdefs.h
+
+#include "common/vectorclasses.h"
+
+#ifndef THEVECTOR3T
+#define THEVECTOR3T
+#define vec3_t Vector
+#endif
+
+#endif
\ No newline at end of file
diff --git a/main/source/cl_dll/vgui_ClassMenu.cpp b/main/source/cl_dll/vgui_ClassMenu.cpp
new file mode 100644
index 00000000..d8cbf579
--- /dev/null
+++ b/main/source/cl_dll/vgui_ClassMenu.cpp
@@ -0,0 +1,441 @@
+//=========== (C) Copyright 1999 Valve, L.L.C. All rights reserved. ===========
+//
+// The copyright to the contents herein is the property of Valve, L.L.C.
+// The contents may be used and/or copied only with the written permission of
+// Valve, L.L.C., or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: TFC Class Menu 
+//
+// $Workfile:     $
+// $Date: 2002/07/08 16:15:13 $
+//
+//-----------------------------------------------------------------------------
+// $Log: vgui_ClassMenu.cpp,v $
+// Revision 1.3  2002/07/08 16:15:13  Flayra
+// - Refactored team color management
+//
+// Revision 1.2  2001/09/13 22:28:00  Charlie
+// - Updated NS with new Half-life 1108 patch in preparation for voice support and spectator mode
+//
+// Revision 1.1.1.1.2.1  2001/09/13 14:42:29  Charlie
+// - HL1108
+//
+//
+// $NoKeywords: $
+//=============================================================================
+
+#include "VGUI_Font.h"
+#include <VGUI_TextImage.h>
+
+#include "hud.h"
+#include "cl_util.h"
+#include "camera.h"
+#include "kbutton.h"
+#include "cvardef.h"
+#include "usercmd.h"
+#include "const.h"
+#include "camera.h"
+#include "in_defs.h"
+#include "parsemsg.h"
+
+#include "vgui_int.h"
+#include "vgui_TeamFortressViewport.h"
+#include "vgui_ServerBrowser.h"
+
+// Class Menu Dimensions
+#define CLASSMENU_TITLE_X				XRES(40)
+#define CLASSMENU_TITLE_Y				YRES(32)
+#define CLASSMENU_TOPLEFT_BUTTON_X		XRES(40)
+#define CLASSMENU_TOPLEFT_BUTTON_Y		YRES(80)
+#define CLASSMENU_BUTTON_SIZE_X			XRES(124)
+#define CLASSMENU_BUTTON_SIZE_Y			YRES(24)
+#define CLASSMENU_BUTTON_SPACER_Y		YRES(8)
+#define CLASSMENU_WINDOW_X				XRES(176)
+#define CLASSMENU_WINDOW_Y				YRES(80)
+#define CLASSMENU_WINDOW_SIZE_X			XRES(424)
+#define CLASSMENU_WINDOW_SIZE_Y			YRES(312)
+#define CLASSMENU_WINDOW_TEXT_X			XRES(150)
+#define CLASSMENU_WINDOW_TEXT_Y			YRES(80)
+#define CLASSMENU_WINDOW_NAME_X			XRES(150)
+#define CLASSMENU_WINDOW_NAME_Y			YRES(8)
+#define CLASSMENU_WINDOW_PLAYERS_Y		YRES(42)
+
+// Creation
+CClassMenuPanel::CClassMenuPanel(int iTrans, int iRemoveMe, int x,int y,int wide,int tall) : CMenuPanel(iTrans, iRemoveMe, x,y,wide,tall)
+{
+	// don't show class graphics at below 640x480 resolution
+	bool bShowClassGraphic = true;
+	if ( ScreenWidth() < 640 )
+	{
+		bShowClassGraphic = false;
+	}
+
+	memset( m_pClassImages, 0, sizeof(m_pClassImages) );
+
+	// Get the scheme used for the Titles
+	CSchemeManager *pSchemes = gViewPort->GetSchemeManager();
+
+	// schemes
+	SchemeHandle_t hTitleScheme = pSchemes->getSchemeHandle( "Title Font" );
+	SchemeHandle_t hClassWindowText = pSchemes->getSchemeHandle( "Briefing Text" );
+
+	// color schemes
+	int r, g, b, a;
+
+	// Create the title
+	Label *pLabel = new Label( "", CLASSMENU_TITLE_X, CLASSMENU_TITLE_Y );
+	pLabel->setParent( this );
+	pLabel->setFont( pSchemes->getFont(hTitleScheme) );
+	pSchemes->getFgColor( hTitleScheme, r, g, b, a );
+	pLabel->setFgColor( r, g, b, a );
+	pSchemes->getBgColor( hTitleScheme, r, g, b, a );
+	pLabel->setBgColor( r, g, b, a );
+	pLabel->setContentAlignment( vgui::Label::a_west );
+	pLabel->setText(gHUD.m_TextMessage.BufferedLocaliseTextString("#Title_SelectYourClass"));
+
+	// Create the Scroll panel
+	m_pScrollPanel = new CTFScrollPanel( CLASSMENU_WINDOW_X, CLASSMENU_WINDOW_Y, CLASSMENU_WINDOW_SIZE_X, CLASSMENU_WINDOW_SIZE_Y );
+	m_pScrollPanel->setParent(this);
+	//force the scrollbars on, so after the validate clientClip will be smaller
+	m_pScrollPanel->setScrollBarAutoVisible(false, false);
+	m_pScrollPanel->setScrollBarVisible(true, true);
+	m_pScrollPanel->setBorder( new LineBorder( Color(255 * 0.7,170 * 0.7,0,0) ) );
+	m_pScrollPanel->validate();
+
+	int clientWide=m_pScrollPanel->getClient()->getWide();
+
+	//turn scrollpanel back into auto show scrollbar mode and validate
+	m_pScrollPanel->setScrollBarAutoVisible(false,true);
+	m_pScrollPanel->setScrollBarVisible(false,false);
+	m_pScrollPanel->validate();
+
+	// Create the Class buttons
+	for (int i = 0; i <= PC_RANDOM; i++)
+	{
+		char sz[256]; 
+		int iYPos = CLASSMENU_TOPLEFT_BUTTON_Y + ( (CLASSMENU_BUTTON_SIZE_Y + CLASSMENU_BUTTON_SPACER_Y) * i );
+
+		ActionSignal *pASignal = new CMenuHandler_StringCommandClassSelect( sTFClassSelection[i], true );
+
+		// Class button
+		sprintf(sz, "%s", CHudTextMessage::BufferedLocaliseTextString( sLocalisedClasses[i] ) );
+		m_pButtons[i] = new ClassButton( i, sz, CLASSMENU_TOPLEFT_BUTTON_X, iYPos, CLASSMENU_BUTTON_SIZE_X, CLASSMENU_BUTTON_SIZE_Y, true);
+		// RandomPC uses '0'
+		if ( i >= 1 && i <= 9 )
+		{
+			sprintf(sz,"%d",i);
+		}
+		else
+		{
+			sprintf(sz,"0");
+		}
+		m_pButtons[i]->setBoundKey( sz[0] );
+		m_pButtons[i]->setContentAlignment( vgui::Label::a_west );
+		m_pButtons[i]->addActionSignal( pASignal );
+		m_pButtons[i]->addInputSignal( new CHandler_MenuButtonOver(this, i) );
+		m_pButtons[i]->setParent( this );
+
+		// Create the Class Info Window
+		//m_pClassInfoPanel[i] = new CTransparentPanel( 255, CLASSMENU_WINDOW_X, CLASSMENU_WINDOW_Y, CLASSMENU_WINDOW_SIZE_X, CLASSMENU_WINDOW_SIZE_Y );
+		m_pClassInfoPanel[i] = new CTransparentPanel( 255, 0, 0, clientWide, CLASSMENU_WINDOW_SIZE_Y );
+		m_pClassInfoPanel[i]->setParent( m_pScrollPanel->getClient() );
+		//m_pClassInfoPanel[i]->setVisible( false );
+
+		// don't show class pic in lower resolutions
+		int textOffs = XRES(8);
+
+		if ( bShowClassGraphic )
+		{
+			textOffs = CLASSMENU_WINDOW_NAME_X;
+		}
+
+		// Create the Class Name Label
+		sprintf(sz, "#Title_%s", sTFClassSelection[i]);
+		char* localName=CHudTextMessage::BufferedLocaliseTextString( sz );
+		Label *pNameLabel = new Label( "", textOffs, CLASSMENU_WINDOW_NAME_Y );
+		pNameLabel->setFont( pSchemes->getFont(hTitleScheme) ); 
+		pNameLabel->setParent( m_pClassInfoPanel[i] );
+		pSchemes->getFgColor( hTitleScheme, r, g, b, a );
+		pNameLabel->setFgColor( r, g, b, a );
+		pSchemes->getBgColor( hTitleScheme, r, g, b, a );
+		pNameLabel->setBgColor( r, g, b, a );
+		pNameLabel->setContentAlignment( vgui::Label::a_west );
+		//pNameLabel->setBorder(new LineBorder());
+		pNameLabel->setText(localName);
+
+		// Create the Class Image
+		if ( bShowClassGraphic )
+		{
+			for ( int team = 0; team < 2; team++ )
+			{
+				if ( team == 1 )
+				{
+					sprintf( sz, "%sred", sTFClassSelection[i] );
+				}
+				else
+				{
+					sprintf( sz, "%sblue", sTFClassSelection[i] );
+				}
+
+				m_pClassImages[team][i] = new CImageLabel( sz, 0, 0, CLASSMENU_WINDOW_TEXT_X, CLASSMENU_WINDOW_TEXT_Y );
+
+				CImageLabel *pLabel = m_pClassImages[team][i];
+				pLabel->setParent( m_pClassInfoPanel[i] );
+				//pLabel->setBorder(new LineBorder());
+
+				if ( team != 1 )
+				{
+					pLabel->setVisible( false );
+				}
+				
+				// Reposition it based upon it's size
+				int xOut, yOut;
+				pNameLabel->getTextSize( xOut, yOut );
+				pLabel->setPos( (CLASSMENU_WINDOW_TEXT_X - pLabel->getWide()) / 2, yOut /2 );
+			}
+		}
+
+		// Create the Player count string
+		gHUD.m_TextMessage.LocaliseTextString( "#Title_CurrentlyOnYourTeam", m_sPlayersOnTeamString, STRLENMAX_PLAYERSONTEAM );
+		m_pPlayers[i] = new Label( "", textOffs, CLASSMENU_WINDOW_PLAYERS_Y );
+		m_pPlayers[i]->setParent( m_pClassInfoPanel[i] );
+		m_pPlayers[i]->setBgColor( 0, 0, 0, 255 );
+		m_pPlayers[i]->setContentAlignment( vgui::Label::a_west );
+		m_pPlayers[i]->setFont( pSchemes->getFont(hClassWindowText) );
+
+		// Open up the Class Briefing File
+		sprintf(sz, "classes/short_%s.txt", sTFClassSelection[i]);
+		char *cText = "Class Description not available.";
+		char *pfile = (char *)gEngfuncs.COM_LoadFile( sz, 5, NULL );
+		if (pfile)
+		{
+			cText = pfile;
+		}
+		
+		// Create the Text info window
+		TextPanel *pTextWindow = new TextPanel(cText, textOffs, CLASSMENU_WINDOW_TEXT_Y, (CLASSMENU_WINDOW_SIZE_X - textOffs)-5, CLASSMENU_WINDOW_SIZE_Y - CLASSMENU_WINDOW_TEXT_Y);
+		pTextWindow->setParent( m_pClassInfoPanel[i] );
+		pTextWindow->setFont( pSchemes->getFont(hClassWindowText) );
+		pSchemes->getFgColor( hClassWindowText, r, g, b, a );
+		pTextWindow->setFgColor( r, g, b, a );
+		pSchemes->getBgColor( hClassWindowText, r, g, b, a );
+		pTextWindow->setBgColor( r, g, b, a );
+
+		// Resize the Info panel to fit it all
+		int wide,tall;
+		pTextWindow->getTextImage()->getTextSizeWrapped( wide,tall);
+		pTextWindow->setSize(wide,tall);
+
+		int xx,yy;
+		pTextWindow->getPos(xx,yy);
+		int maxX=xx+wide;
+		int maxY=yy+tall;
+
+		//check to see if the image goes lower than the text
+		//just use the red teams [0] images
+		if(m_pClassImages[0][i]!=null)
+		{
+			m_pClassImages[0][i]->getPos(xx,yy);
+			if((yy+m_pClassImages[0][i]->getTall())>maxY)
+			{
+				maxY=yy+m_pClassImages[0][i]->getTall();
+			}
+		}
+
+		m_pClassInfoPanel[i]->setSize( maxX , maxY );
+		if (pfile) gEngfuncs.COM_FreeFile( pfile );
+		//m_pClassInfoPanel[i]->setBorder(new LineBorder());
+
+	}
+
+	// Create the Cancel button
+	m_pCancelButton = new CommandButton( gHUD.m_TextMessage.BufferedLocaliseTextString( "#Menu_Cancel" ), CLASSMENU_TOPLEFT_BUTTON_X, 0, CLASSMENU_BUTTON_SIZE_X, CLASSMENU_BUTTON_SIZE_Y);
+	m_pCancelButton->setParent( this );
+	m_pCancelButton->addActionSignal( new CMenuHandler_TextWindow(HIDE_TEXTWINDOW) );
+
+	m_iCurrentInfo = 0;
+
+}
+
+
+// Update
+void CClassMenuPanel::Update()
+{
+	// Don't allow the player to join a team if they're not in a team
+	if (!g_iTeamNumber)
+		return;
+
+	int	 iYPos = CLASSMENU_TOPLEFT_BUTTON_Y;
+
+	// Cycle through the rest of the buttons
+	for (int i = 0; i <= PC_RANDOM; i++)
+	{
+		bool bCivilian = (gViewPort->GetValidClasses(g_iTeamNumber) == -1);
+
+		if ( bCivilian )
+		{
+			// If this team can only be civilians, only the civilian button's visible
+			if (i == 0)
+			{
+				m_pButtons[0]->setVisible( true );
+				SetActiveInfo( 0 );
+				iYPos += CLASSMENU_BUTTON_SIZE_Y + CLASSMENU_BUTTON_SPACER_Y;
+			}
+			else
+			{
+				m_pButtons[i]->setVisible( false );
+			}
+		}
+		else 
+		{
+			if ( m_pButtons[i]->IsNotValid() || i == 0 )
+			{
+				m_pButtons[i]->setVisible( false );
+			}
+			else
+			{
+				m_pButtons[i]->setVisible( true );
+				m_pButtons[i]->setPos( CLASSMENU_TOPLEFT_BUTTON_X, iYPos );
+				iYPos += CLASSMENU_BUTTON_SIZE_Y + CLASSMENU_BUTTON_SPACER_Y;
+
+				// Start with the first option up
+				if (!m_iCurrentInfo)
+					SetActiveInfo( i );
+			}
+		}
+
+		// Now count the number of teammembers of this class
+		int iTotal = 0;
+		for ( int j = 1; j <= MAX_PLAYERS; j++ )
+		{
+			if ( g_PlayerInfoList[j].name == NULL )
+				continue; // empty player slot, skip
+			if ( g_PlayerExtraInfo[j].teamname[0] == 0 )
+				continue; // skip over players who are not in a team
+			if ( g_PlayerInfoList[j].thisplayer )
+				continue; // skip this player
+			if ( g_PlayerExtraInfo[j].teamnumber != g_iTeamNumber )
+				continue; // skip over players in other teams
+
+			// If this team is forced to be civilians, just count the number of teammates
+			if ( g_PlayerExtraInfo[j].playerclass != i && !bCivilian )
+				continue;
+
+			iTotal++;
+		}
+
+		char sz[256]; 
+		sprintf(sz, m_sPlayersOnTeamString, iTotal);
+		m_pPlayers[i]->setText( sz );
+
+		// Set the text color to the teamcolor
+		m_pPlayers[i]->setFgColor(	kTeamColors[g_iTeamNumber % iNumberOfTeamColors][0],
+									kTeamColors[g_iTeamNumber % iNumberOfTeamColors][1],
+									kTeamColors[g_iTeamNumber % iNumberOfTeamColors][2],
+									0 );
+
+		// set the graphic to be the team pick
+		for ( int team = 0; team < MAX_TEAMS; team++ )
+		{
+			// unset all the other images
+			if ( m_pClassImages[team][i] )
+			{
+				m_pClassImages[team][i]->setVisible( false );
+			}
+
+			// set the current team image
+			if ( m_pClassImages[g_iTeamNumber-1][i] != NULL )
+			{
+				m_pClassImages[g_iTeamNumber-1][i]->setVisible( true );
+			}
+			else if ( m_pClassImages[0][i] )
+			{
+				m_pClassImages[0][i]->setVisible( true );
+			}
+		}
+	}
+
+	// If the player already has a class, make the cancel button visible
+	if ( g_iPlayerClass )
+	{
+		m_pCancelButton->setPos( CLASSMENU_TOPLEFT_BUTTON_X, iYPos );
+		m_pCancelButton->setVisible( true );
+	}
+	else
+	{
+		m_pCancelButton->setVisible( false );
+	}
+}
+
+//======================================
+// Key inputs for the Class Menu
+bool CClassMenuPanel::SlotInput( int iSlot )
+{
+	if ( (iSlot < 0) || (iSlot > 9) )
+		return false;
+	if ( !m_pButtons[ iSlot ] )
+		return false;
+
+	// Is the button pushable? (0 is special case)
+	if (iSlot == 0)
+	{
+		// Selects Civilian and RandomPC
+		if ( gViewPort->GetValidClasses(g_iTeamNumber) == -1 )
+		{
+			m_pButtons[ 0 ]->fireActionSignal();
+			return true;
+		}
+
+		// Select RandomPC
+		iSlot = 10;
+	}
+
+	if ( !(m_pButtons[ iSlot ]->IsNotValid()) )
+	{
+		m_pButtons[ iSlot ]->fireActionSignal();
+		return true;
+	}
+
+	return false;
+}
+
+//======================================
+// Update the Class menu before opening it
+void CClassMenuPanel::Open( void )
+{
+	Update();
+	CMenuPanel::Open();
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Called each time a new level is started.
+//-----------------------------------------------------------------------------
+void CClassMenuPanel::Initialize( void )
+{
+	setVisible( false );
+	m_pScrollPanel->setScrollValue( 0, 0 );
+}
+
+//======================================
+// Mouse is over a class button, bring up the class info
+void CClassMenuPanel::SetActiveInfo( int iInput )
+{
+	// Remove all the Info panels and bring up the specified one
+	for (int i = 0; i <= PC_RANDOM; i++)
+	{
+		m_pButtons[i]->setArmed( false );
+		m_pClassInfoPanel[i]->setVisible( false );
+	}
+
+	if ( iInput > PC_RANDOM || iInput < 0 )
+		iInput = 0;
+
+	m_pButtons[iInput]->setArmed( true );
+	m_pClassInfoPanel[iInput]->setVisible( true );
+	m_iCurrentInfo = iInput;
+
+	m_pScrollPanel->setScrollValue(0,0);
+	m_pScrollPanel->validate();
+}
+
diff --git a/main/source/cl_dll/vgui_ConsolePanel.cpp b/main/source/cl_dll/vgui_ConsolePanel.cpp
new file mode 100644
index 00000000..bb8f9cff
--- /dev/null
+++ b/main/source/cl_dll/vgui_ConsolePanel.cpp
@@ -0,0 +1,95 @@
+
+#include"vgui_ConsolePanel.h"
+#include"hud.h"
+#include<VGUI_ActionSignal.h>
+#include<VGUI_TextGrid.h>
+#include<VGUI_TextEntry.h>
+#include<VGUI_EtchedBorder.h>
+#include<VGUI_LoweredBorder.h>
+
+using namespace vgui;
+
+
+namespace
+{
+
+class Handler : public ActionSignal
+{
+private:
+	
+	ConsolePanel* _consolePanel;
+
+public:
+
+	Handler(ConsolePanel* consolePanel)
+	{
+		_consolePanel=consolePanel;
+	}
+
+public:
+
+	virtual void actionPerformed(Panel* panel)
+	{
+		_consolePanel->doExecCommand();
+	}
+
+};
+
+}
+
+
+
+ConsolePanel::ConsolePanel(int x,int y,int wide,int tall) : Panel(x,y,wide,tall)
+{
+	setBorder(new EtchedBorder());
+	
+	_textGrid=new TextGrid(80,21,5,5,200,100);
+	_textGrid->setBorder(new LoweredBorder());
+	_textGrid->setParent(this);
+	
+	_textEntry=new TextEntry("",5,5,200,20);
+	_textEntry->setParent(this);
+	_textEntry->addActionSignal(new Handler(this));
+}
+
+int ConsolePanel::print(const char* text)
+{
+	return _textGrid->printf("%s",text);
+}
+
+int ConsolePanel::vprintf(const char* format,va_list argList)
+{
+	return _textGrid->vprintf(format,argList);
+}
+
+int ConsolePanel::printf(const char* format,...)
+{
+	va_list argList;
+	va_start(argList,format);
+	int ret=vprintf(format,argList);
+	va_end(argList);
+	return ret;
+}
+
+void ConsolePanel::doExecCommand()
+{
+	char buf[2048];
+	_textEntry->getText(0,buf,2048);
+	_textEntry->setText(null,0);
+	gEngfuncs.pfnClientCmd(buf);
+}
+
+void ConsolePanel::setSize(int wide,int tall)
+{
+	Panel::setSize(wide,tall);
+		
+	getPaintSize(wide,tall);
+
+	_textGrid->setBounds(5,5,wide-10,tall-35);
+	_textEntry->setBounds(5,tall-25,wide-10,20);
+}
+
+
+
+
+
diff --git a/main/source/cl_dll/vgui_ConsolePanel.h b/main/source/cl_dll/vgui_ConsolePanel.h
new file mode 100644
index 00000000..8edfc035
--- /dev/null
+++ b/main/source/cl_dll/vgui_ConsolePanel.h
@@ -0,0 +1,32 @@
+
+#ifndef CONSOLEPANEL_H
+#define CONSOLEPANEL_H
+
+#include<stdarg.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+class TextGrid;
+class TextEntry;
+}
+
+
+class ConsolePanel : public vgui::Panel
+{
+private:
+	vgui::TextGrid*  _textGrid;
+	vgui::TextEntry* _textEntry;
+public:
+	ConsolePanel(int x,int y,int wide,int tall);
+public:
+	virtual void setSize(int wide,int tall);
+	virtual int  print(const char* text);
+	virtual int  vprintf(const char* format,va_list argList);
+	virtual int  printf(const char* format,...);
+	virtual void doExecCommand();
+};
+
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/cl_dll/vgui_ControlConfigPanel.cpp b/main/source/cl_dll/vgui_ControlConfigPanel.cpp
new file mode 100644
index 00000000..2abe1fb2
--- /dev/null
+++ b/main/source/cl_dll/vgui_ControlConfigPanel.cpp
@@ -0,0 +1,206 @@
+
+#include<stdio.h>
+#include"vgui_ControlConfigPanel.h"
+#include<VGUI_HeaderPanel.h>
+#include<VGUI_TablePanel.h>
+#include<VGUI_Label.h>
+#include<VGUI_ScrollPanel.h>
+#include<VGUI_Scheme.h>
+#include<VGUI_DataInputStream.h>
+#include<VGUI.h>
+#include<VGUI_TextEntry.h>
+
+using namespace vgui;
+
+namespace
+{
+class FooTablePanel : public TablePanel
+{
+private:
+	Label*              _label;
+	TextEntry*          _textEntry;
+	ControlConfigPanel* _controlConfigPanel;
+public:
+	FooTablePanel(ControlConfigPanel* controlConfigPanel,int x,int y,int wide,int tall,int columnCount) : TablePanel(x,y,wide,tall,columnCount)
+	{
+		_controlConfigPanel=controlConfigPanel;
+		_label=new Label("You are a dumb monkey",0,0,100,20);
+		_label->setBgColor(Scheme::sc_primary3);
+		_label->setFgColor(Scheme::sc_primary1);
+		_label->setFont(Scheme::sf_primary3);
+
+		_textEntry=new TextEntry("",0,0,100,20);
+		//_textEntry->setFont(Scheme::sf_primary3);
+	}
+public:
+	virtual int getRowCount()
+	{
+		return _controlConfigPanel->GetCVarCount();
+	}
+	virtual int getCellTall(int row)
+	{
+		return 12;
+	}
+	virtual Panel* getCellRenderer(int column,int row,bool columnSelected,bool rowSelected,bool cellSelected)
+	{
+		char cvar[128],desc[128],bind[128],bindAlt[128];
+		_controlConfigPanel->GetCVar(row,cvar,128,desc,128);
+
+		if(cellSelected)
+		{
+			_label->setBgColor(Scheme::sc_primary1);
+			_label->setFgColor(Scheme::sc_primary3);
+		}
+		else
+		if(rowSelected)
+		{
+			_label->setBgColor(Scheme::sc_primary2);
+			_label->setFgColor(Scheme::sc_primary1);
+		}
+		else
+		{
+			_label->setBgColor(Scheme::sc_primary3);
+			_label->setFgColor(Scheme::sc_primary1);
+		}
+
+		switch(column)
+		{
+			case 0:
+			{
+				_label->setText(desc);
+				_label->setContentAlignment(Label::a_west);
+				break;
+			}
+			case 1:
+			{
+				_controlConfigPanel->GetCVarBind(cvar,bind,128,bindAlt,128);
+				_label->setText(bind);
+				_label->setContentAlignment(Label::a_center);
+				break;
+			}
+			case 2:
+			{
+				_controlConfigPanel->GetCVarBind(cvar,bind,128,bindAlt,128);
+				_label->setText(bindAlt);
+				_label->setContentAlignment(Label::a_center);
+				break;
+			}
+			default:
+			{
+				_label->setText("");
+				break;
+			}
+		}
+
+		return _label;
+	}
+	virtual Panel* startCellEditing(int column,int row)
+	{
+		_textEntry->setText("Goat",strlen("Goat"));
+		_textEntry->requestFocus();
+		return _textEntry;
+	}
+};
+}
+
+ControlConfigPanel::ControlConfigPanel(int x,int y,int wide,int tall) : Panel(x,y,wide,tall)
+{
+	setPaintBorderEnabled(false);
+	setPaintBackgroundEnabled(false);
+	setPaintEnabled(false);
+
+	_actionLabel=new Label("Action");
+	_actionLabel->setBgColor(Scheme::sc_primary3);
+	_actionLabel->setFgColor(Scheme::sc_primary3);
+
+	_keyButtonLabel=new Label("Key / Button");
+	_keyButtonLabel->setBgColor(Scheme::sc_primary3);
+	_keyButtonLabel->setFgColor(Scheme::sc_primary3);
+
+	_alternateLabel=new Label("Alternate");
+	_alternateLabel->setBgColor(Scheme::sc_primary3);
+	_alternateLabel->setFgColor(Scheme::sc_primary3);
+	
+	_headerPanel=new HeaderPanel(0,0,wide,20);
+	_headerPanel->setParent(this);
+
+	_headerPanel->addSectionPanel(_actionLabel);
+	_headerPanel->addSectionPanel(_keyButtonLabel);
+	_headerPanel->addSectionPanel(_alternateLabel);
+	
+	_headerPanel->setSliderPos( 0, wide/2 );
+	_headerPanel->setSliderPos( 1, (wide/2) + (wide/4) );
+	_headerPanel->setSliderPos( 2, wide );
+
+	_scrollPanel=new ScrollPanel(0,20,wide,tall-20);
+	_scrollPanel->setParent(this);
+	_scrollPanel->setPaintBorderEnabled(false);
+	_scrollPanel->setPaintBackgroundEnabled(false);
+	_scrollPanel->setPaintEnabled(false);
+	_scrollPanel->getClient()->setPaintBorderEnabled(false);
+	_scrollPanel->getClient()->setPaintBackgroundEnabled(false);
+	_scrollPanel->getClient()->setPaintEnabled(false);
+	_scrollPanel->setScrollBarVisible(false,true);
+
+	_tablePanel=new FooTablePanel(this,0,0,_scrollPanel->getClient()->getWide(),800, 3);
+	_tablePanel->setParent(_scrollPanel->getClient());
+	_tablePanel->setHeaderPanel(_headerPanel);
+	_tablePanel->setBgColor(Color(200,0,0,255));
+	_tablePanel->setFgColor(Color(Scheme::sc_primary2));
+	_tablePanel->setGridVisible(true,true);
+	_tablePanel->setGridSize(1,1);
+}
+
+void ControlConfigPanel::AddCVar(const char* cvar,const char* desc)
+{
+	_cvarDar.addElement(vgui_strdup(cvar));
+	_descDar.addElement(vgui_strdup(desc));
+}
+
+int ControlConfigPanel::GetCVarCount()
+{
+	return _cvarDar.getCount();
+}
+
+void ControlConfigPanel::GetCVar(int index,char* cvar,int cvarLen,char* desc,int descLen)
+{
+	vgui_strcpy(cvar,cvarLen,_cvarDar[index]);
+	vgui_strcpy(desc,descLen,_descDar[index]);
+}
+
+void ControlConfigPanel::AddCVarFromInputStream(InputStream* is)
+{
+	if(is==null)
+	{
+		return;
+	}
+	
+	DataInputStream dis(is);
+
+	bool success;
+
+	while(1)
+	{
+		char buf[256],cvar[128],desc[128];
+		dis.readLine(buf,256,success);
+		if(!success)
+		{
+			break;
+		}
+		if(sscanf(buf,"\"%[^\"]\" \"%[^\"]\"",cvar,desc)==2)
+		{
+			AddCVar(cvar,desc);
+		}
+	}
+}
+
+void ControlConfigPanel::GetCVarBind(const char* cvar,char* bind,int bindLen,char* bindAlt,int bindAltLen)
+{
+	sprintf(bind,"%s : Bind",cvar);
+	sprintf(bindAlt,"%s : BindAlt",cvar);
+}
+
+void ControlConfigPanel::SetCVarBind(const char* cvar,const char* bind,const char* bindAlt)
+{
+}
+
diff --git a/main/source/cl_dll/vgui_ControlConfigPanel.h b/main/source/cl_dll/vgui_ControlConfigPanel.h
new file mode 100644
index 00000000..9a5a41f5
--- /dev/null
+++ b/main/source/cl_dll/vgui_ControlConfigPanel.h
@@ -0,0 +1,41 @@
+
+#ifndef CONTROLCONFIGPANEL_H
+#define CONTROLCONFIGPANEL_H
+
+#include<VGUI_Panel.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+class HeaderPanel;
+class TablePanel;
+class ScrollPanel;
+class InputStream;
+class Label;
+}
+
+class ControlConfigPanel : public vgui::Panel
+{
+private:
+	vgui::HeaderPanel* _headerPanel;
+	vgui::TablePanel*  _tablePanel;
+	vgui::ScrollPanel* _scrollPanel;
+	vgui::Dar<char*>   _cvarDar;
+	vgui::Dar<char*>   _descDar;
+	vgui::Label*       _actionLabel;
+	vgui::Label*       _keyButtonLabel;
+	vgui::Label*       _alternateLabel;
+public:
+	ControlConfigPanel(int x,int y,int wide,int tall);
+public:
+	void AddCVar(const char* cvar,const char* desc);
+	void AddCVarFromInputStream(vgui::InputStream* is);
+	int  GetCVarCount();
+	void GetCVar(int index,char* cvar,int cvarLen,char* desc,int descLen);
+	void GetCVarBind(const char* cvar,char* bind,int bindLen,char* bindAlt,int bindAltLen);
+	void SetCVarBind(const char* cvar,const char* bind,const char* bindAlt);
+};
+
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/cl_dll/vgui_CustomObjects.cpp b/main/source/cl_dll/vgui_CustomObjects.cpp
new file mode 100644
index 00000000..4f834569
--- /dev/null
+++ b/main/source/cl_dll/vgui_CustomObjects.cpp
@@ -0,0 +1,540 @@
+//=========== (C) Copyright 1996-2002 Valve, L.L.C. All rights reserved. ===========
+//
+// The copyright to the contents herein is the property of Valve, L.L.C.
+// The contents may be used and/or copied only with the written permission of
+// Valve, L.L.C., or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: Contains implementation of various VGUI-derived objects
+//
+// $Workfile:     $
+// $Date: 2001/09/13 22:28:00 $
+//
+//-----------------------------------------------------------------------------
+// $Log: vgui_CustomObjects.cpp,v $
+// Revision 1.2  2001/09/13 22:28:00  Charlie
+// - Updated NS with new Half-life 1108 patch in preparation for voice support and spectator mode
+//
+// Revision 1.1.1.1.2.1  2001/09/13 14:42:29  Charlie
+// - HL1108
+//
+//
+// $NoKeywords: $
+//=============================================================================
+
+#include "VGUI_Font.h"
+
+#include "hud.h"
+#include "cl_util.h"
+#include "camera.h"
+#include "kbutton.h"
+#include "cvardef.h"
+#include "usercmd.h"
+#include "const.h"
+#include "camera.h"
+#include "in_defs.h"
+#include "parsemsg.h"
+
+#include "vgui_int.h"
+#include "vgui_TeamFortressViewport.h"
+#include "vgui_ServerBrowser.h"
+#include "..\game_shared\vgui_LoadTGA.h"
+
+// Arrow filenames
+char *sArrowFilenames[] =
+{
+	"arrowup",
+	"arrowdn", 
+	"arrowlt",
+	"arrowrt", 
+};
+
+// Get the name of TGA file, without a gamedir
+char *GetTGANameForRes(const char *pszName)
+{
+	int i;
+	char sz[256]; 
+	static char gd[256]; 
+	if (ScreenWidth() < 640)
+		i = 320;
+	else
+		i = 640;
+	sprintf(sz, pszName, i);
+	sprintf(gd, "gfx/vgui/%s.tga", sz);
+	return gd;
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Loads a .tga file and returns a pointer to the VGUI tga object
+//-----------------------------------------------------------------------------
+BitmapTGA *LoadTGAForRes( const char* pImageName )
+{
+	BitmapTGA	*pTGA;
+
+	char sz[256];
+	sprintf(sz, "%%d_%s", pImageName);
+	pTGA = vgui_LoadTGA(GetTGANameForRes(sz));
+
+	return pTGA;
+}
+
+//===========================================================
+// All TFC Hud buttons are derived from this one.
+CommandButton::CommandButton( const char* text,int x,int y,int wide,int tall, bool bNoHighlight) : Button("",x,y,wide,tall)
+{
+	m_iPlayerClass = 0;
+	m_bNoHighlight = bNoHighlight;
+	m_bFlat = false;
+	Init();
+	setText( text );
+}
+
+CommandButton::CommandButton( int iPlayerClass, const char* text,int x,int y,int wide,int tall, bool bFlat) : Button("",x,y,wide,tall)
+{
+	m_iPlayerClass = iPlayerClass;
+	m_bNoHighlight = false;
+	m_bFlat = bFlat;
+	Init();
+	setText( text );
+}
+CommandButton::CommandButton(const char *text, int x, int y, int wide, int tall, bool bNoHighlight, bool bFlat) : Button("",x,y,wide,tall)
+{
+	m_iPlayerClass = 0;
+	m_bFlat = bFlat;
+	m_bNoHighlight = bNoHighlight;
+	Init();
+	setText( text );
+}
+
+void CommandButton::Init( void )
+{
+	m_pSubMenu = NULL;
+	m_pSubLabel = NULL;
+	m_pParentMenu = NULL;
+
+	// Set text color to orange
+	setFgColor(Scheme::sc_primary1);
+
+	// left align
+	setContentAlignment( vgui::Label::a_west );
+
+	// Add the Highlight signal
+	if (!m_bNoHighlight)
+		addInputSignal( new CHandler_CommandButtonHighlight(this) );
+
+	// not bound to any button yet
+	m_cBoundKey = 0;
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Prepends the button text with the current bound key
+//			if no bound key, then a clear space ' ' instead
+//-----------------------------------------------------------------------------
+void CommandButton::RecalculateText( void )
+{
+	char szBuf[128];
+
+	if ( m_cBoundKey != 0 )
+	{
+		if ( m_cBoundKey == (char)255 )
+		{
+			strcpy( szBuf, m_sMainText );
+		}
+		else
+		{
+		sprintf( szBuf, "  %c  %s", m_cBoundKey, m_sMainText );
+		}
+		szBuf[MAX_BUTTON_SIZE-1] = 0;
+	}
+	else
+	{
+		// just draw a space if no key bound
+		sprintf( szBuf, "     %s", m_sMainText );
+		szBuf[MAX_BUTTON_SIZE-1] = 0;
+	}
+
+	Button::setText( szBuf );
+}
+
+void CommandButton::setText( const char *text )
+{
+	strncpy( m_sMainText, text, MAX_BUTTON_SIZE );
+	m_sMainText[MAX_BUTTON_SIZE-1] = 0;
+
+	RecalculateText();
+}
+
+void CommandButton::setBoundKey( char boundKey )
+{
+	m_cBoundKey = boundKey;
+	RecalculateText();
+}
+
+char CommandButton::getBoundKey( void )
+{
+	return m_cBoundKey;
+}
+
+void CommandButton::AddSubMenu( CCommandMenu *pNewMenu )
+{
+	m_pSubMenu = pNewMenu;
+
+	// Prevent this button from being pushed
+	setMouseClickEnabled( MOUSE_LEFT, false );
+}
+
+void CommandButton::UpdateSubMenus( int iAdjustment )
+{
+	if ( m_pSubMenu )
+		m_pSubMenu->RecalculatePositions( iAdjustment );
+}
+
+void CommandButton::paint()
+{
+	// Make the sub label paint the same as the button
+	if ( m_pSubLabel )
+	{
+		if ( isSelected() )
+			m_pSubLabel->PushDown();
+		else
+			m_pSubLabel->PushUp();
+	}
+
+	// draw armed button text in white
+	if ( isArmed() )
+	{
+		setFgColor( Scheme::sc_secondary2 );
+	}
+	else
+	{
+		setFgColor( Scheme::sc_primary1 );
+	}
+	
+	Button::paint();
+}
+
+void CommandButton::paintBackground()
+{
+	if ( m_bFlat )
+	{
+		if ( isArmed() )
+		{
+			// Orange Border
+			drawSetColor( Scheme::sc_secondary1 );
+			drawOutlinedRect(0,0,_size[0],_size[1]);
+		}
+	}
+	else
+	{
+		if ( isArmed() )
+		{
+			// Orange highlight background
+			drawSetColor( Scheme::sc_primary2 );
+			drawFilledRect(0,0,_size[0],_size[1]);
+		}
+
+		// Orange Border
+		drawSetColor( Scheme::sc_secondary1 );
+		drawOutlinedRect(0,0,_size[0],_size[1]);
+	}
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Highlights the current button, and all it's parent menus
+//-----------------------------------------------------------------------------
+void CommandButton::cursorEntered( void )
+{
+	// unarm all the other buttons in this menu
+	CCommandMenu *containingMenu = getParentMenu();
+	if ( containingMenu )
+	{
+		containingMenu->ClearButtonsOfArmedState();
+
+		// make all our higher buttons armed
+		CCommandMenu *pCParent = containingMenu->GetParentMenu();
+		if ( pCParent )
+		{
+			CommandButton *pParentButton = pCParent->FindButtonWithSubmenu( containingMenu );
+
+			pParentButton->cursorEntered();
+		}
+	}
+
+	// arm ourselves
+	setArmed( true );
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+//-----------------------------------------------------------------------------
+void CommandButton::cursorExited( void )
+{
+	// only clear ourselves if we have do not have a containing menu
+	// only stay armed if we have a sub menu
+	// the buttons only unarm themselves when another button is armed instead
+	if ( !getParentMenu() || !GetSubMenu() )
+	{
+		setArmed( false );
+	}
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Returns the command menu that the button is part of, if any
+// Output : CCommandMenu *
+//-----------------------------------------------------------------------------
+CCommandMenu *CommandButton::getParentMenu( void )
+{ 
+	return m_pParentMenu; 
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Sets the menu that contains this button
+// Input  : *pParentMenu - 
+//-----------------------------------------------------------------------------
+void CommandButton::setParentMenu( CCommandMenu *pParentMenu )
+{
+	m_pParentMenu = pParentMenu;
+}
+
+
+//===========================================================
+int ClassButton::IsNotValid()
+{
+	// If this is the main ChangeClass button, remove it if the player's only able to be civilians
+	if ( m_iPlayerClass == -1 )
+	{
+		if (gViewPort->GetValidClasses(g_iTeamNumber) == -1)
+			return true;
+
+		return false;
+	}
+
+	// Is it an illegal class?
+	if ((gViewPort->GetValidClasses(0) & sTFValidClassInts[ m_iPlayerClass ]) || (gViewPort->GetValidClasses(g_iTeamNumber) & sTFValidClassInts[ m_iPlayerClass ]))
+		return true;
+
+	// Only check current class if they've got autokill on
+	bool bAutoKill = CVAR_GET_FLOAT( "hud_classautokill" ) != 0;
+	if ( bAutoKill )
+	{	
+		// Is it the player's current class?
+		if ( (gViewPort->IsRandomPC() && m_iPlayerClass == PC_RANDOM) || (!gViewPort->IsRandomPC() && (m_iPlayerClass == g_iPlayerClass)) )
+			return true;
+	}
+
+	return false;
+}
+
+//===========================================================
+// Button with Class image beneath it
+CImageLabel::CImageLabel( const char* pImageName,int x,int y ) : Label( "", x,y )
+{
+	setContentFitted(true);
+	m_pTGA = LoadTGAForRes(pImageName);
+	setImage( m_pTGA );
+}
+
+CImageLabel::CImageLabel( const char* pImageName,int x,int y,int wide,int tall ) : Label( "", x,y,wide,tall )
+{
+	setContentFitted(true);
+	m_pTGA = LoadTGAForRes(pImageName);
+	setImage( m_pTGA );
+}
+
+//===========================================================
+// Image size
+int CImageLabel::getImageWide( void )
+{
+	if( m_pTGA )
+	{
+		int iXSize, iYSize;
+		m_pTGA->getSize( iXSize, iYSize );
+		return iXSize;
+	}
+	else
+	{
+		return 1;
+	}
+}
+
+int CImageLabel::getImageTall( void )
+{
+	if( m_pTGA )
+	{
+		int iXSize, iYSize;
+		m_pTGA->getSize( iXSize, iYSize );
+		return iYSize;
+	}
+	else
+	{
+		return 1;
+	}
+}
+
+void CImageLabel::LoadImage(const char * pImageName)
+{
+	if ( m_pTGA )
+		delete m_pTGA;
+
+	// Load the Image
+	m_pTGA = LoadTGAForRes(pImageName);
+
+	if ( m_pTGA == NULL )
+	{
+		// we didn't find a matching image file for this resolution
+		// try to load file resolution independent
+
+		char sz[256];
+		sprintf(sz, "%s/%s",gEngfuncs.pfnGetGameDirectory(), pImageName );
+		FileInputStream* fis = new FileInputStream( sz, false );
+		m_pTGA = new BitmapTGA(fis,true);
+		fis->close();
+	}
+
+	if ( m_pTGA == NULL )
+		return;	// unable to load image
+	 	
+	int w,t;
+
+	m_pTGA->getSize( w, t );
+
+	setSize( XRES (w),YRES (t) );
+	setImage( m_pTGA );
+}
+//===========================================================
+// Various overloaded paint functions for Custom VGUI objects
+void CCommandMenu::paintBackground()
+{
+	// Transparent black background
+
+	if ( m_iSpectCmdMenu ) 
+		 drawSetColor( 0, 0, 0, 64 );
+	else
+		 drawSetColor(Scheme::sc_primary3);
+
+	drawFilledRect(0,0,_size[0],_size[1]);
+}
+
+//=================================================================================
+// CUSTOM SCROLLPANEL
+//=================================================================================
+CTFScrollButton::CTFScrollButton(int iArrow, const char* text,int x,int y,int wide,int tall) : CommandButton(text,x,y,wide,tall)
+{
+	// Set text color to orange
+	setFgColor(Scheme::sc_primary1);
+
+	// Load in the arrow
+	m_pTGA = LoadTGAForRes( sArrowFilenames[iArrow] );
+	setImage( m_pTGA );
+
+	// Highlight signal
+	InputSignal *pISignal = new CHandler_CommandButtonHighlight(this);
+	addInputSignal(pISignal);
+}
+
+void CTFScrollButton::paint( void )
+{
+	if (!m_pTGA)
+		return;
+
+	// draw armed button text in white
+	if ( isArmed() )
+	{
+		m_pTGA->setColor( Color(255,255,255, 0) );
+	}
+	else
+	{
+		m_pTGA->setColor( Color(255,255,255, 128) );
+	}
+
+	m_pTGA->doPaint(this);
+}
+
+void CTFScrollButton::paintBackground( void )
+{
+/*
+	if ( isArmed() )
+	{
+		// Orange highlight background
+		drawSetColor( Scheme::sc_primary2 );
+		drawFilledRect(0,0,_size[0],_size[1]);
+	}
+
+	// Orange Border
+	drawSetColor( Scheme::sc_secondary1 );
+	drawOutlinedRect(0,0,_size[0]-1,_size[1]);
+*/
+}
+
+void CTFSlider::paintBackground( void )
+{
+	int wide,tall,nobx,noby;
+	getPaintSize(wide,tall);
+	getNobPos(nobx,noby);
+
+	// Border
+	drawSetColor( Scheme::sc_secondary1 );
+	drawOutlinedRect( 0,0,wide,tall );
+
+	if( isVertical() )
+	{
+		// Nob Fill
+		drawSetColor( Scheme::sc_primary2 );
+		drawFilledRect( 0,nobx,wide,noby );
+
+		// Nob Outline
+		drawSetColor( Scheme::sc_primary1 );
+		drawOutlinedRect( 0,nobx,wide,noby );
+	}
+	else
+	{
+		// Nob Fill
+		drawSetColor( Scheme::sc_primary2 );
+		drawFilledRect( nobx,0,noby,tall );
+
+		// Nob Outline
+		drawSetColor( Scheme::sc_primary1 );
+		drawOutlinedRect( nobx,0,noby,tall );
+	}
+}
+
+CTFScrollPanel::CTFScrollPanel(int x,int y,int wide,int tall) : ScrollPanel(x,y,wide,tall)
+{
+	ScrollBar *pScrollBar = getVerticalScrollBar();
+	pScrollBar->setButton( new CTFScrollButton( ARROW_UP, "", 0,0,16,16 ), 0 );
+	pScrollBar->setButton( new CTFScrollButton( ARROW_DOWN, "", 0,0,16,16 ), 1 );
+	pScrollBar->setSlider( new CTFSlider(0,wide-1,wide,(tall-(wide*2))+2,true) ); 
+	pScrollBar->setPaintBorderEnabled(false);
+	pScrollBar->setPaintBackgroundEnabled(false);
+	pScrollBar->setPaintEnabled(false);
+
+	pScrollBar = getHorizontalScrollBar();
+	pScrollBar->setButton( new CTFScrollButton( ARROW_LEFT, "", 0,0,16,16 ), 0 );
+	pScrollBar->setButton( new CTFScrollButton( ARROW_RIGHT, "", 0,0,16,16 ), 1 );
+	pScrollBar->setSlider( new CTFSlider(tall,0,wide-(tall*2),tall,false) );
+	pScrollBar->setPaintBorderEnabled(false);
+	pScrollBar->setPaintBackgroundEnabled(false);
+	pScrollBar->setPaintEnabled(false);
+}
+
+
+//=================================================================================
+// CUSTOM HANDLERS
+//=================================================================================
+void CHandler_MenuButtonOver::cursorEntered(Panel *panel)
+{
+	if ( gViewPort && m_pMenuPanel )
+	{
+		m_pMenuPanel->SetActiveInfo( m_iButton );
+	}
+}
+
+void CMenuHandler_StringCommandClassSelect::actionPerformed(Panel* panel)
+{
+	CMenuHandler_StringCommand::actionPerformed( panel );
+
+	bool bAutoKill = CVAR_GET_FLOAT( "hud_classautokill" ) != 0;
+	if ( bAutoKill && g_iPlayerClass != 0 )
+		gEngfuncs.pfnClientCmd("kill");
+}
+
diff --git a/main/source/cl_dll/vgui_MOTDWindow.cpp b/main/source/cl_dll/vgui_MOTDWindow.cpp
new file mode 100644
index 00000000..6bd550b6
--- /dev/null
+++ b/main/source/cl_dll/vgui_MOTDWindow.cpp
@@ -0,0 +1,168 @@
+//=========== (C) Copyright 1999 Valve, L.L.C. All rights reserved. ===========
+//
+// The copyright to the contents herein is the property of Valve, L.L.C.
+// The contents may be used and/or copied only with the written permission of
+// Valve, L.L.C., or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile:     $
+// $Date: 2001/09/13 22:28:00 $
+//
+//-----------------------------------------------------------------------------
+// $Log: vgui_MOTDWindow.cpp,v $
+// Revision 1.3  2001/09/13 22:28:00  Charlie
+// - Updated NS with new Half-life 1108 patch in preparation for voice support and spectator mode
+//
+// Revision 1.2  2001/04/09 19:31:35  charlie
+// - Quick hacky tests to try out menus for team/class picking...yuck
+// Revision 1.1.1.1.2.1  2001/09/13 14:42:29  Charlie
+// - HL1108
+//
+// Revision 1.1.1.1  2000/06/17 14:12:45  charlie
+// Final version of new HL SDK.  May not compile.  
+// Previous versions of my MSVC project files and utility .bat files.
+// This is my starting point; there is no mod-specific code in here.
+//
+//
+// $NoKeywords: $
+//=============================================================================
+
+#include "VGUI_Font.h"
+#include "VGUI_ScrollPanel.h"
+#include "VGUI_TextImage.h"
+
+#include<VGUI_StackLayout.h>
+
+#include "hud.h"
+#include "cl_util.h"
+#include "camera.h"
+#include "kbutton.h"
+#include "const.h"
+
+#include "vgui_int.h"
+#include "vgui_TeamFortressViewport.h"
+#include "vgui_ServerBrowser.h"
+
+#define MOTD_TITLE_X		XRES(16)
+#define MOTD_TITLE_Y		YRES(16)
+
+#define MOTD_WINDOW_X				XRES(112)
+#define MOTD_WINDOW_Y				YRES(80)
+#define MOTD_WINDOW_SIZE_X			XRES(424)
+#define MOTD_WINDOW_SIZE_Y			YRES(312)
+
+//-----------------------------------------------------------------------------
+// Purpose: Displays the MOTD and basic server information
+//-----------------------------------------------------------------------------
+class CMessageWindowPanel : public CMenuPanel
+{
+public:
+	CMessageWindowPanel( const char *szMOTD, const char *szTitle, int iShadeFullScreen, int iRemoveMe, int x, int y, int wide, int tall );
+
+private:
+	CTransparentPanel *m_pBackgroundPanel;
+
+};
+
+//-----------------------------------------------------------------------------
+// Purpose: Creates a new CMessageWindowPanel
+// Output : CMenuPanel - interface to the panel
+//-----------------------------------------------------------------------------
+CMenuPanel *CMessageWindowPanel_Create( const char *szMOTD, const char *szTitle, int iShadeFullscreen, int iRemoveMe, int x, int y, int wide, int tall )
+{
+	return new CMessageWindowPanel( szMOTD, szTitle, iShadeFullscreen, iRemoveMe, x, y, wide, tall );
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Constructs a message panel
+//-----------------------------------------------------------------------------
+CMessageWindowPanel::CMessageWindowPanel( const char *szMOTD, const char *szTitle, int iShadeFullscreen, int iRemoveMe, int x, int y, int wide, int tall ) : CMenuPanel( iShadeFullscreen ? 100 : 255, iRemoveMe, x, y, wide, tall )
+{
+	// Get the scheme used for the Titles
+	CSchemeManager *pSchemes = gViewPort->GetSchemeManager();
+
+	// schemes
+	SchemeHandle_t hTitleScheme = pSchemes->getSchemeHandle( "Title Font" );
+	SchemeHandle_t hMOTDText = pSchemes->getSchemeHandle( "Briefing Text" );
+
+	// color schemes
+	int r, g, b, a;
+
+	// Create the window
+	m_pBackgroundPanel = new CTransparentPanel( iShadeFullscreen ? 255 : 100, MOTD_WINDOW_X, MOTD_WINDOW_Y, MOTD_WINDOW_SIZE_X, MOTD_WINDOW_SIZE_Y );
+	m_pBackgroundPanel->setParent( this );
+	m_pBackgroundPanel->setBorder( new LineBorder( Color(255 * 0.7,170 * 0.7,0,0)) );
+	m_pBackgroundPanel->setVisible( true );
+
+	int iXSize,iYSize,iXPos,iYPos;
+	m_pBackgroundPanel->getPos( iXPos,iYPos );
+	m_pBackgroundPanel->getSize( iXSize,iYSize );
+
+	// Create the title
+	Label *pLabel = new Label( "", iXPos + MOTD_TITLE_X, iYPos + MOTD_TITLE_Y );
+	pLabel->setParent( this );
+	pLabel->setFont( pSchemes->getFont(hTitleScheme) );
+	pLabel->setFont( Scheme::sf_primary1 );
+
+	pSchemes->getFgColor( hTitleScheme, r, g, b, a );
+	pLabel->setFgColor( r, g, b, a );
+	pLabel->setFgColor( Scheme::sc_primary1 );
+	pSchemes->getBgColor( hTitleScheme, r, g, b, a );
+	pLabel->setBgColor( r, g, b, a );
+	pLabel->setContentAlignment( vgui::Label::a_west );
+	pLabel->setText(szTitle);
+
+	// Create the Scroll panel
+	ScrollPanel *pScrollPanel = new CTFScrollPanel( iXPos + XRES(16), iYPos + MOTD_TITLE_Y*2 + YRES(16), iXSize - XRES(32), iYSize - (YRES(48) + BUTTON_SIZE_Y*2) );
+	pScrollPanel->setParent(this);
+	
+	//force the scrollbars on so clientClip will take them in account after the validate
+	pScrollPanel->setScrollBarAutoVisible(false, false);
+	pScrollPanel->setScrollBarVisible(true, true);
+	pScrollPanel->validate();
+
+	// Create the text panel
+	TextPanel *pText = new TextPanel( "", 0,0, 64,64);
+	pText->setParent( pScrollPanel->getClient() );
+
+	// get the font and colors from the scheme
+	pText->setFont( pSchemes->getFont(hMOTDText) );
+	pSchemes->getFgColor( hMOTDText, r, g, b, a );
+	pText->setFgColor( r, g, b, a );
+	pSchemes->getBgColor( hMOTDText, r, g, b, a );
+	pText->setBgColor( r, g, b, a );
+	pText->setText(szMOTD);
+
+	// Get the total size of the MOTD text and resize the text panel
+	int iScrollSizeX, iScrollSizeY;
+
+	// First, set the size so that the client's wdith is correct at least because the
+	//  width is critical for getting the "wrapped" size right.
+	// You'll see a horizontal scroll bar if there is a single word that won't wrap in the
+	//  specified width.
+	pText->getTextImage()->setSize(pScrollPanel->getClientClip()->getWide(), pScrollPanel->getClientClip()->getTall());
+	pText->getTextImage()->getTextSizeWrapped( iScrollSizeX, iScrollSizeY );
+	
+	// Now resize the textpanel to fit the scrolled size
+	pText->setSize( iScrollSizeX , iScrollSizeY );
+
+	//turn the scrollbars back into automode
+	pScrollPanel->setScrollBarAutoVisible(true, true);
+	pScrollPanel->setScrollBarVisible(false, false);
+
+	pScrollPanel->validate();
+
+	CommandButton *pButton = new CommandButton( CHudTextMessage::BufferedLocaliseTextString( "#Menu_OK" ), iXPos + XRES(16), iYPos + iYSize - YRES(16) - BUTTON_SIZE_Y, CMENU_SIZE_X, BUTTON_SIZE_Y);
+	pButton->addActionSignal(new CMenuHandler_TextWindow(HIDE_TEXTWINDOW));
+	pButton->addActionSignal(new CMenuHandler_TextWindow(SHOW_CLASSDESC));
+	pButton->setParent(this);
+
+}
+
+
+
+
+
+
diff --git a/main/source/cl_dll/vgui_SchemeManager.cpp b/main/source/cl_dll/vgui_SchemeManager.cpp
new file mode 100644
index 00000000..3ba3b08f
--- /dev/null
+++ b/main/source/cl_dll/vgui_SchemeManager.cpp
@@ -0,0 +1,560 @@
+//=========== (C) Copyright 1996-2002 Valve, L.L.C. All rights reserved. ===========
+//
+// The copyright to the contents herein is the property of Valve, L.L.C.
+// The contents may be used and/or copied only with the written permission of
+// Valve, L.L.C., or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile:     $
+// $Date: 2001/09/13 15:01:48 $
+//
+//-----------------------------------------------------------------------------
+// $Log: vgui_SchemeManager.cpp,v $
+// Revision 1.3  2001/09/13 15:01:48  Charlie
+// - Merging with 1108
+//
+// Revision 1.2  2001/09/12 16:34:26  Charlie
+// - Slightly better error checking
+// Revision 1.1.1.1.2.2  2001/09/13 14:42:30  Charlie
+// - HL1108
+//
+// Revision 1.1.1.1  2000/06/17 14:12:45  charlie
+// Final version of new HL SDK.  May not compile.  
+// Previous versions of my MSVC project files and utility .bat files.
+// This is my starting point; there is no mod-specific code in here.
+//
+//
+// $NoKeywords: $
+//=============================================================================
+
+#include "hud.h"
+#include "vgui_SchemeManager.h"
+#include "cvardef.h"
+
+#include <string.h>
+
+
+cvar_t *g_CV_BitmapFonts;
+
+
+void Scheme_Init()
+{
+	g_CV_BitmapFonts = gEngfuncs.pfnRegisterVariable("bitmapfonts", "1", 0);
+}
+
+
+
+//-----------------------------------------------------------------------------
+// Purpose: Scheme managers data container
+//-----------------------------------------------------------------------------
+class CSchemeManager::CScheme
+{
+public:
+	enum { 
+		SCHEME_NAME_LENGTH = 32,
+		FONT_NAME_LENGTH = 48,
+		FONT_FILENAME_LENGTH = 64,
+	};
+	
+	// name
+	char schemeName[SCHEME_NAME_LENGTH];
+
+	// font
+	char fontName[FONT_NAME_LENGTH];
+
+	int fontSize;
+	int fontWeight;
+
+	vgui::Font *font;
+	int ownFontPointer; // true if the font is ours to delete
+
+	// scheme
+	byte fgColor[4];
+	byte bgColor[4];
+	byte armedFgColor[4];
+	byte armedBgColor[4]; 
+	byte mousedownFgColor[4];
+	byte mousedownBgColor[4];
+	byte borderColor[4];
+
+	// construction/destruction
+	CScheme();
+	~CScheme();
+};
+
+CSchemeManager::CScheme::CScheme()
+{
+	schemeName[0] = 0;
+	fontName[0] = 0;
+	fontSize = 0;
+	fontWeight = 0;
+	font = NULL;
+	ownFontPointer = false;
+}
+
+CSchemeManager::CScheme::~CScheme()
+{
+	// only delete our font pointer if we own it
+	if ( ownFontPointer )
+	{
+		delete font;
+	}
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: resolution information
+//			!! needs to be shared out
+//-----------------------------------------------------------------------------
+static int g_ResArray[] =
+{
+	320,
+	400,
+	512,
+	640,
+	800,
+	1024,
+	1152,
+	1280,
+	1600
+};
+static int g_NumReses = sizeof(g_ResArray) / sizeof(int);
+
+static byte *LoadFileByResolution( const char *filePrefix, int xRes, const char *filePostfix )
+{
+	// find our resolution in the res array
+	int resNum = g_NumReses - 1;
+	while ( g_ResArray[resNum] > xRes )
+	{
+		resNum--;
+
+		if ( resNum < 0 )
+			return NULL;
+	}
+
+	// try open the file
+	byte *pFile = NULL;
+	while ( 1 )
+	{
+
+		// try load
+		char fname[256];
+		sprintf( fname, "%s%d%s", filePrefix, g_ResArray[resNum], filePostfix );
+		pFile = gEngfuncs.COM_LoadFile( fname, 5, NULL );
+
+		if ( pFile )
+			break;
+
+		if ( resNum == 0 )
+			return NULL;
+
+		resNum--;
+	};
+
+	return pFile;
+}
+
+static void ParseRGBAFromString( byte colorArray[4], const char *colorVector )
+{
+	int r, g, b, a;
+	sscanf( colorVector, "%d %d %d %d", &r, &g, &b, &a );
+	colorArray[0] = r;
+	colorArray[1] = g;
+	colorArray[2] = b;
+	colorArray[3] = a;
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: initializes the scheme manager
+//			loading the scheme files for the current resolution
+// Input  : xRes - 
+//			yRes - dimensions of output window
+//-----------------------------------------------------------------------------
+CSchemeManager::CSchemeManager( int xRes, int yRes )
+{
+	// basic setup
+	m_pSchemeList = NULL;
+	m_iNumSchemes = 0;
+
+	// find the closest matching scheme file to our resolution
+	char token[1024];
+	char *pFile = (char*)LoadFileByResolution( "", xRes, "_textscheme.txt" );
+	m_xRes = xRes;
+
+	char *pFileStart = pFile;
+	
+	byte *pFontData;
+	int fontFileLength;
+	char fontFilename[512];
+
+	//
+	// Read the scheme descriptions from the text file, into a temporary array
+	// format is simply:
+	// <paramName name> = <paramValue>
+	//
+	// a <paramName name> of "SchemeName" signals a new scheme is being described
+	//
+
+	const static int numTmpSchemes = 64;
+	static CScheme tmpSchemes[numTmpSchemes];
+	memset( tmpSchemes, 0, sizeof(tmpSchemes) );
+	int currentScheme = -1;
+	CScheme *pScheme = NULL;
+
+	if ( !pFile )
+	{
+		gEngfuncs.Con_DPrintf( "Unable to find *_textscheme.txt\n");
+		goto buildDefaultFont;
+	}
+
+	// record what has been entered so we can create defaults from the different values
+	bool hasFgColor, hasBgColor, hasArmedFgColor, hasArmedBgColor, hasMouseDownFgColor, hasMouseDownBgColor;
+
+	pFile = gEngfuncs.COM_ParseFile( pFile, token );
+	while ( strlen(token) > 0 && (currentScheme < numTmpSchemes) )
+	{
+		// get the paramName name
+		static const int tokenSize = 64;
+		char paramName[tokenSize], paramValue[tokenSize];
+
+		strncpy( paramName, token, tokenSize );
+		paramName[tokenSize-1] = 0; // ensure null termination
+
+		// get the '=' character
+		pFile = gEngfuncs.COM_ParseFile( pFile, token );
+		if ( stricmp( token, "=" ) )
+		{
+			if ( currentScheme < 0 )
+			{
+				gEngfuncs.Con_Printf( "error parsing font scheme text file at file start - expected '=', found '%s''\n", token );
+			}
+			else
+			{
+				gEngfuncs.Con_Printf( "error parsing font scheme text file at scheme '%s' - expected '=', found '%s''\n", tmpSchemes[currentScheme].schemeName, token );
+			}
+			break;
+		}
+
+		// get paramValue
+		pFile = gEngfuncs.COM_ParseFile( pFile, token );
+		strncpy( paramValue, token, tokenSize );
+		paramValue[tokenSize-1] = 0; // ensure null termination
+		
+		// is this a new scheme?
+		if ( !stricmp(paramName, "SchemeName") )
+		{
+			// setup the defaults for the current scheme
+			if ( pScheme )
+			{
+				// foreground color defaults (normal -> armed -> mouse down)
+				if ( !hasFgColor )
+				{
+					pScheme->fgColor[0] = pScheme->fgColor[1] = pScheme->fgColor[2] = pScheme->fgColor[3] = 255;
+				}
+				if ( !hasArmedFgColor )
+				{
+					memcpy( pScheme->armedFgColor, pScheme->fgColor, sizeof(pScheme->armedFgColor) );
+				}
+				if ( !hasMouseDownFgColor )
+				{
+					memcpy( pScheme->mousedownFgColor, pScheme->armedFgColor, sizeof(pScheme->mousedownFgColor) );
+				}
+
+				// background color (normal -> armed -> mouse down)
+				if ( !hasBgColor )
+				{
+					pScheme->bgColor[0] = pScheme->bgColor[1] = pScheme->bgColor[2] = pScheme->bgColor[3] = 0;
+				}
+				if ( !hasArmedBgColor )
+				{
+					memcpy( pScheme->armedBgColor, pScheme->bgColor, sizeof(pScheme->armedBgColor) );
+				}
+				if ( !hasMouseDownBgColor )
+				{
+					memcpy( pScheme->mousedownBgColor, pScheme->armedBgColor, sizeof(pScheme->mousedownBgColor) );
+				}
+
+				// font size
+				if ( !pScheme->fontSize )
+				{
+					pScheme->fontSize = 17;
+				}
+				if ( !pScheme->fontName[0] )
+				{
+					strcpy( pScheme->fontName, "Arial" );
+				}
+			}
+
+			// create the new scheme
+			currentScheme++;
+			pScheme = &tmpSchemes[currentScheme];
+			hasFgColor = hasBgColor = hasArmedFgColor = hasArmedBgColor = hasMouseDownFgColor = hasMouseDownBgColor = false;
+
+			strncpy( pScheme->schemeName, paramValue, CScheme::SCHEME_NAME_LENGTH );
+			pScheme->schemeName[CScheme::SCHEME_NAME_LENGTH-1] = '\0'; // ensure null termination of string
+		}
+
+		if ( !pScheme )
+		{
+			gEngfuncs.Con_Printf( "font scheme text file MUST start with a 'SchemeName'\n");
+			break;
+		}
+
+		// pull the data out into the scheme
+		if ( !stricmp(paramName, "FontName") )
+		{
+			strncpy( pScheme->fontName, paramValue, CScheme::FONT_NAME_LENGTH );
+			pScheme->fontName[CScheme::FONT_NAME_LENGTH-1] = 0;
+		}
+		else if ( !stricmp(paramName, "FontSize") )
+		{
+			pScheme->fontSize = atoi( paramValue );
+		}
+		else if ( !stricmp(paramName, "FontWeight") )
+		{
+			pScheme->fontWeight = atoi( paramValue );
+		}
+		else if ( !stricmp(paramName, "FgColor") )
+		{
+			ParseRGBAFromString( pScheme->fgColor, paramValue );
+			hasFgColor = true;
+		}
+		else if ( !stricmp(paramName, "BgColor") )
+		{
+			ParseRGBAFromString( pScheme->bgColor, paramValue );
+			hasBgColor = true;
+		}
+		else if ( !stricmp(paramName, "FgColorArmed") )
+		{
+			ParseRGBAFromString( pScheme->armedFgColor, paramValue );
+			hasArmedFgColor = true;
+		}	
+		else if ( !stricmp(paramName, "BgColorArmed") )
+		{
+			ParseRGBAFromString( pScheme->armedBgColor, paramValue );
+			hasArmedBgColor = true;
+		}
+		else if ( !stricmp(paramName, "FgColorMousedown") )
+		{
+			ParseRGBAFromString( pScheme->mousedownFgColor, paramValue );
+			hasMouseDownFgColor = true;
+		}
+		else if ( !stricmp(paramName, "BgColorMousedown") )
+		{
+			ParseRGBAFromString( pScheme->mousedownBgColor, paramValue );
+			hasMouseDownBgColor = true;
+		}
+		else if ( !stricmp(paramName, "BorderColor") )
+		{
+			ParseRGBAFromString( pScheme->borderColor, paramValue );
+			hasMouseDownBgColor = true;
+		}
+
+		// get the new token last, so we now if the loop needs to be continued or not
+		pFile = gEngfuncs.COM_ParseFile( pFile, token );
+	}
+
+	// free the file
+	gEngfuncs.COM_FreeFile( pFileStart );
+
+
+buildDefaultFont:
+
+	// make sure we have at least 1 valid font
+	if ( currentScheme < 0 )
+	{
+		currentScheme = 0;
+		strcpy( tmpSchemes[0].schemeName, "Default Scheme" );
+		strcpy( tmpSchemes[0].fontName, "Arial" );
+		tmpSchemes[0].fontSize = 0;
+		tmpSchemes[0].fgColor[0] = tmpSchemes[0].fgColor[1] = tmpSchemes[0].fgColor[2] = tmpSchemes[0].fgColor[3] = 255;
+		tmpSchemes[0].armedFgColor[0] = tmpSchemes[0].armedFgColor[1] = tmpSchemes[0].armedFgColor[2] = tmpSchemes[0].armedFgColor[3] = 255;
+		tmpSchemes[0].mousedownFgColor[0] = tmpSchemes[0].mousedownFgColor[1] = tmpSchemes[0].mousedownFgColor[2] = tmpSchemes[0].mousedownFgColor[3] = 255;
+	}
+
+	// we have the full list of schemes in the tmpSchemes array
+	// now allocate the correct sized list
+	m_iNumSchemes = currentScheme + 1; // 0-based index
+	m_pSchemeList = new CScheme[ m_iNumSchemes ];
+
+	// copy in the data
+	memcpy( m_pSchemeList, tmpSchemes, sizeof(CScheme) * m_iNumSchemes );
+
+	// create the fonts
+	for ( int i = 0; i < m_iNumSchemes; i++ )
+	{
+		m_pSchemeList[i].font = NULL;
+
+		// see if the current font values exist in a previously loaded font
+		for ( int j = 0; j < i; j++ )
+		{
+			// check if the font name, size, and weight are the same
+			if ( !stricmp(m_pSchemeList[i].fontName, m_pSchemeList[j].fontName)  
+				&& m_pSchemeList[i].fontSize == m_pSchemeList[j].fontSize
+				&& m_pSchemeList[i].fontWeight == m_pSchemeList[j].fontWeight )
+			{
+				// copy the pointer, but mark i as not owning it
+				m_pSchemeList[i].font = m_pSchemeList[j].font;
+				m_pSchemeList[i].ownFontPointer = false;
+			}
+		}
+
+		// if we haven't found the font already, load it ourselves
+		if ( !m_pSchemeList[i].font )
+		{
+			fontFileLength = -1;
+			pFontData = NULL;
+
+			if(g_CV_BitmapFonts && g_CV_BitmapFonts->value)
+			{
+				sprintf(fontFilename, "gfx\\vgui\\fonts\\%d_%s.tga", m_xRes, m_pSchemeList[i].schemeName);
+				pFontData = gEngfuncs.COM_LoadFile( fontFilename, 5, &fontFileLength );
+				if(!pFontData)
+					gEngfuncs.Con_Printf("Missing bitmap font: %s\n", fontFilename);
+			}
+
+			m_pSchemeList[i].font = new vgui::Font(
+				m_pSchemeList[i].fontName, 
+				pFontData,
+				fontFileLength,
+				m_pSchemeList[i].fontSize, 
+				0, 
+				0, 
+				m_pSchemeList[i].fontWeight, 
+				false, 
+				false, 
+				false, 
+				false);
+			
+			m_pSchemeList[i].ownFontPointer = true;
+		}
+
+		// fix up alpha values; VGUI uses 1-A (A=0 being solid, A=255 transparent)
+		m_pSchemeList[i].fgColor[3] = 255 - m_pSchemeList[i].fgColor[3];
+		m_pSchemeList[i].bgColor[3] = 255 - m_pSchemeList[i].bgColor[3];
+		m_pSchemeList[i].armedFgColor[3] = 255 - m_pSchemeList[i].armedFgColor[3];
+		m_pSchemeList[i].armedBgColor[3] = 255 - m_pSchemeList[i].armedBgColor[3];
+		m_pSchemeList[i].mousedownFgColor[3] = 255 - m_pSchemeList[i].mousedownFgColor[3];
+		m_pSchemeList[i].mousedownBgColor[3] = 255 - m_pSchemeList[i].mousedownBgColor[3];
+	}
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: frees all the memory used by the scheme manager
+//-----------------------------------------------------------------------------
+CSchemeManager::~CSchemeManager()
+{
+	delete [] m_pSchemeList;
+	m_iNumSchemes = 0;
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Finds a scheme in the list, by name
+// Input  : char *schemeName - string name of the scheme
+// Output : SchemeHandle_t handle to the scheme
+//-----------------------------------------------------------------------------
+SchemeHandle_t CSchemeManager::getSchemeHandle( const char *schemeName )
+{
+	// iterate through the list
+	for ( int i = 0; i < m_iNumSchemes; i++ )
+	{
+		if ( !stricmp(schemeName, m_pSchemeList[i].schemeName) )
+			return i;
+	}
+
+	return 0;
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: always returns a valid scheme handle
+// Input  : schemeHandle - 
+// Output : CScheme
+//-----------------------------------------------------------------------------
+CSchemeManager::CScheme *CSchemeManager::getSafeScheme( SchemeHandle_t schemeHandle )
+{
+	ASSERT(schemeHandle >= 0);
+	ASSERT(schemeHandle < m_iNumSchemes);
+
+	if ( schemeHandle < m_iNumSchemes )
+		return m_pSchemeList + schemeHandle;
+
+	return m_pSchemeList;
+}
+
+
+//-----------------------------------------------------------------------------
+// Purpose: Returns the schemes pointer to a font
+// Input  : schemeHandle - 
+// Output : vgui::Font
+//-----------------------------------------------------------------------------
+vgui::Font *CSchemeManager::getFont( SchemeHandle_t schemeHandle )
+{
+	return getSafeScheme( schemeHandle )->font;
+}
+
+void CSchemeManager::getFgColor( SchemeHandle_t schemeHandle, int &r, int &g, int &b, int &a )
+{
+	CScheme *pScheme = getSafeScheme( schemeHandle );
+	r = pScheme->fgColor[0];
+	g = pScheme->fgColor[1];
+	b = pScheme->fgColor[2];
+	a = pScheme->fgColor[3];
+}
+
+void CSchemeManager::getBgColor( SchemeHandle_t schemeHandle, int &r, int &g, int &b, int &a )
+{
+	CScheme *pScheme = getSafeScheme( schemeHandle );
+	r = pScheme->bgColor[0];
+	g = pScheme->bgColor[1];
+	b = pScheme->bgColor[2];
+	a = pScheme->bgColor[3];
+}
+
+void CSchemeManager::getFgArmedColor( SchemeHandle_t schemeHandle, int &r, int &g, int &b, int &a )
+{
+	CScheme *pScheme = getSafeScheme( schemeHandle );
+	r = pScheme->armedFgColor[0];
+	g = pScheme->armedFgColor[1];
+	b = pScheme->armedFgColor[2];
+	a = pScheme->armedFgColor[3];
+}
+
+void CSchemeManager::getBgArmedColor( SchemeHandle_t schemeHandle, int &r, int &g, int &b, int &a )
+{
+	CScheme *pScheme = getSafeScheme( schemeHandle );
+	r = pScheme->armedBgColor[0];
+	g = pScheme->armedBgColor[1];
+	b = pScheme->armedBgColor[2];
+	a = pScheme->armedBgColor[3];
+}
+
+void CSchemeManager::getFgMousedownColor( SchemeHandle_t schemeHandle, int &r, int &g, int &b, int &a )
+{
+	CScheme *pScheme = getSafeScheme( schemeHandle );
+	r = pScheme->mousedownFgColor[0];
+	g = pScheme->mousedownFgColor[1];
+	b = pScheme->mousedownFgColor[2];
+	a = pScheme->mousedownFgColor[3];
+}
+
+void CSchemeManager::getBgMousedownColor( SchemeHandle_t schemeHandle, int &r, int &g, int &b, int &a )
+{
+	CScheme *pScheme = getSafeScheme( schemeHandle );
+	r = pScheme->mousedownBgColor[0];
+	g = pScheme->mousedownBgColor[1];
+	b = pScheme->mousedownBgColor[2];
+	a = pScheme->mousedownBgColor[3];
+}
+
+void CSchemeManager::getBorderColor( SchemeHandle_t schemeHandle, int &r, int &g, int &b, int &a )
+{
+	CScheme *pScheme = getSafeScheme( schemeHandle );
+	r = pScheme->borderColor[0];
+	g = pScheme->borderColor[1];
+	b = pScheme->borderColor[2];
+	a = pScheme->borderColor[3];
+}
+
+
+
diff --git a/main/source/cl_dll/vgui_SchemeManager.h b/main/source/cl_dll/vgui_SchemeManager.h
new file mode 100644
index 00000000..6fed4cc4
--- /dev/null
+++ b/main/source/cl_dll/vgui_SchemeManager.h
@@ -0,0 +1,51 @@
+#ifndef VGUI_SCHEMEMANAGER_H
+#define VGUI_SCHEMEMANAGER_H
+
+#include <VGUI_Font.h>
+
+
+// handle to an individual scheme
+typedef int SchemeHandle_t;
+
+
+// Register console variables, etc..
+void Scheme_Init();
+
+
+//-----------------------------------------------------------------------------
+// Purpose: Handles the loading of text scheme description from disk
+//			supports different font/color/size schemes at different resolutions 
+//-----------------------------------------------------------------------------
+class CSchemeManager
+{
+public:
+	// initialization
+	CSchemeManager( int xRes, int yRes );
+	virtual ~CSchemeManager();
+
+	// scheme handling
+	SchemeHandle_t getSchemeHandle( const char *schemeName );
+
+	// getting info from schemes
+	vgui::Font *getFont( SchemeHandle_t schemeHandle );
+	void getFgColor( SchemeHandle_t schemeHandle, int &r, int &g, int &b, int &a );
+	void getBgColor( SchemeHandle_t schemeHandle, int &r, int &g, int &b, int &a );
+	void getFgArmedColor( SchemeHandle_t schemeHandle, int &r, int &g, int &b, int &a );
+	void getBgArmedColor( SchemeHandle_t schemeHandle, int &r, int &g, int &b, int &a );
+	void getFgMousedownColor( SchemeHandle_t schemeHandle, int &r, int &g, int &b, int &a );
+	void getBgMousedownColor( SchemeHandle_t schemeHandle, int &r, int &g, int &b, int &a );
+	void getBorderColor( SchemeHandle_t schemeHandle, int &r, int &g, int &b, int &a );
+
+private:
+	class CScheme;
+	CScheme *m_pSchemeList;
+	int m_iNumSchemes;
+
+	// Resolution we were initted at.
+	int		m_xRes;
+
+	CScheme *getSafeScheme( SchemeHandle_t schemeHandle );
+};
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/cl_dll/vgui_ScorePanel.cpp b/main/source/cl_dll/vgui_ScorePanel.cpp
new file mode 100644
index 00000000..d7f27b0e
--- /dev/null
+++ b/main/source/cl_dll/vgui_ScorePanel.cpp
@@ -0,0 +1,1626 @@
+//=========== (C) Copyright 1999 Valve, L.L.C. All rights reserved. ===========
+//
+// The copyright to the contents herein is the property of Valve, L.L.C.
+// The contents may be used and/or copied only with the written permission of
+// Valve, L.L.C., or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: VGUI scoreboard
+//
+// $Workfile:     $
+// $Date: 2002/10/24 21:13:15 $
+//
+//-----------------------------------------------------------------------------
+// $Log: vgui_ScorePanel.cpp,v $
+// Revision 1.15  2002/10/24 21:13:15  Flayra
+// - Fixed gamma correction for auth icons
+//
+// Revision 1.14  2002/10/18 22:13:48  Flayra
+// - Gamma-correction for auth icons
+//
+// Revision 1.13  2002/10/16 00:37:33  Flayra
+// - Added support for authentication in scoreboard
+//
+// Revision 1.12  2002/09/09 19:42:55  Flayra
+// - Fixed problem where scores were sometimes displayed for marines
+//
+// Revision 1.11  2002/08/31 18:02:11  Flayra
+// - Work at VALVe
+//
+// Revision 1.10  2002/08/09 00:11:33  Flayra
+// - Fixed scoreboard
+//
+// Revision 1.9  2002/07/08 16:15:13  Flayra
+// - Refactored team color management
+//
+// Revision 1.8  2002/06/25 17:06:48  Flayra
+// - Removed memory overwrite from hlcoder list
+//
+// Revision 1.7  2002/06/03 16:12:21  Flayra
+// - Show player status for players on your team (LEV1, GEST, COMM, etc.)
+//
+// Revision 1.6  2002/04/16 19:30:21  Charlie
+// - Fixed crash when holding tab right when joining server, added "REIN" status
+//
+// Revision 1.5  2002/03/27 21:17:18  Charlie
+// - Scoreboard now shows alien scores, and doesn't show marine scores.  Also draws DEAD and COMM indicators, and scoring is handled properly for aliens (points for kills, buildings)
+//
+// Revision 1.4  2002/03/08 02:37:52  Charlie
+// - Refactored crappy-ass score panel.  It's not perfect, but it's better.  Removed TFC code, added DEAD and COMM tags to scoreboard.
+//
+// Revision 1.3  2001/11/13 17:51:02  Charlie
+// - Increased max teams, changed team colors (allow aliens vs. aliens and fronts vs. fronts), general scoreboard support
+//
+// Revision 1.2  2001/09/13 22:28:01  Charlie
+// - Updated NS with new Half-life 1108 patch in preparation for voice support and spectator mode
+//
+// Revision 1.1.1.1.2.1  2001/09/13 14:42:30  Charlie
+// - HL1108
+//
+//
+// $NoKeywords: $
+//=============================================================================
+
+
+#include<VGUI_LineBorder.h>
+
+#include "hud.h"
+#include "cl_util.h"
+#include "const.h"
+#include "entity_state.h"
+#include "cl_entity.h"
+#include "vgui_TeamFortressViewport.h"
+#include "vgui_ScorePanel.h"
+#include "..\game_shared\vgui_helpers.h"
+#include "..\game_shared\vgui_loadtga.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHTitles.h"
+#include "vgui_SpectatorPanel.h"
+#include "cl_dll/demo.h"
+#include "mod/AvHServerVariables.h"
+#include "util\STLUtil.h"
+
+#include "ITrackerUser.h"
+extern ITrackerUser *g_pTrackerUser;
+
+hud_player_info_t	 g_PlayerInfoList[MAX_PLAYERS+1];	   // player info from the engine
+extra_player_info_t  g_PlayerExtraInfo[MAX_PLAYERS+1];   // additional player info sent directly to the client dll
+team_info_t			 g_TeamInfo[MAX_TEAMS+1];
+int					 g_IsSpectator[MAX_PLAYERS+1];
+
+int HUD_IsGame( const char *game );
+int EV_TFC_IsAllyTeam( int iTeam1, int iTeam2 );
+
+// Scoreboard dimensions
+#define SBOARD_TITLE_SIZE_Y			YRES(22)
+
+#define X_BORDER					XRES(4)
+
+void LoadData(void* inBuffer, const unsigned char* inData, int inSizeToCopy, int& inSizeVariable);
+void SaveData(unsigned char* inBuffer, const void* inData, int inSizeToCopy, int& inSizeVariable);
+
+int	ScorePanel_InitializeDemoPlayback(int inSize, unsigned char* inBuffer)
+{
+	int theBytesRead = 0;
+
+	LoadData(&g_PlayerInfoList, inBuffer, (MAX_PLAYERS+1)*sizeof(hud_player_info_t), theBytesRead);
+	LoadData(&g_PlayerExtraInfo, inBuffer, (MAX_PLAYERS+1)*sizeof(extra_player_info_t), theBytesRead);
+	LoadData(&g_TeamInfo, inBuffer, (MAX_PLAYERS+1)*sizeof(team_info_t), theBytesRead);
+	LoadData(&g_IsSpectator, inBuffer, (MAX_PLAYERS+1)*sizeof(int), theBytesRead);
+
+	return theBytesRead;
+}
+
+void ScorePanel_InitializeDemoRecording()
+{
+	// Now save out team info
+	int theTotalSize = (MAX_PLAYERS + 1)*(sizeof(hud_player_info_t) + sizeof(extra_player_info_t) + sizeof(team_info_t) + sizeof(int));
+	unsigned char* theCharArray = new unsigned char[theTotalSize];
+	if(theCharArray)
+	{
+		int theCounter = 0;
+		SaveData(theCharArray, &g_PlayerInfoList, (MAX_PLAYERS+1)*sizeof(hud_player_info_t), theCounter);
+		SaveData(theCharArray, &g_PlayerExtraInfo, (MAX_PLAYERS+1)*sizeof(extra_player_info_t), theCounter);
+		SaveData(theCharArray, &g_TeamInfo, (MAX_PLAYERS+1)*sizeof(team_info_t), theCounter);
+		SaveData(theCharArray, &g_IsSpectator, (MAX_PLAYERS+1)*sizeof(int), theCounter);
+		
+		Demo_WriteBuffer(TYPE_PLAYERINFO, theTotalSize, theCharArray);
+	}
+}
+
+// Column sizes
+class SBColumnInfo
+{
+public:
+	char				*m_pTitle;		// If null, ignore, if starts with #, it's localized, otherwise use the string directly.
+	int					m_Width;		// Based on 640 width. Scaled to fit other resolutions.
+	Label::Alignment	m_Alignment;	
+};
+
+// grid size is marked out for 640x480 screen
+
+SBColumnInfo g_ColumnInfo[NUM_COLUMNS] =
+{
+	{NULL,			24,			Label::a_east},		// tracker column
+    {NULL,			24,			Label::a_east},		// status icons
+	{NULL,			150,		Label::a_east},		// name
+	{NULL,			56,			Label::a_east},		// class
+	{"#SCORE",		40,			Label::a_east},     // score
+    {"#KILLS",      40,         Label::a_east},     // kills
+	{"#DEATHS",		40,			Label::a_east},     // deaths
+	{"#LATENCY",	40,			Label::a_east},     // ping
+	{"#VOICE",		40,			Label::a_east},     
+	{NULL,			2,			Label::a_east},		// blank column to take up the slack
+};
+
+
+#define TEAM_NO				0
+#define TEAM_YES			1
+#define TEAM_SPECTATORS		2
+#define TEAM_BLANK			3
+
+Color BuildColor(int inR, int inG, int inB, float inScalar)
+{
+	Color theColor = Color((int)(inR/inScalar), (int)(inG/inScalar), (int)(inB/inScalar), 0);
+	return theColor;
+}
+
+
+//-----------------------------------------------------------------------------
+// ScorePanel::HitTestPanel.
+//-----------------------------------------------------------------------------
+
+void ScorePanel::HitTestPanel::internalMousePressed(MouseCode code)
+{
+	for(int i=0;i<_inputSignalDar.getCount();i++)
+	{
+		_inputSignalDar[i]->mousePressed(code,this);
+	}
+}
+
+
+
+//-----------------------------------------------------------------------------
+// Purpose: Create the ScoreBoard panel
+//-----------------------------------------------------------------------------
+ScorePanel::ScorePanel(int x,int y,int wide,int tall) : Panel(x,y,wide,tall)
+{
+	CSchemeManager *pSchemes = gViewPort->GetSchemeManager();
+	SchemeHandle_t hTitleScheme = pSchemes->getSchemeHandle("Scoreboard Title Text");
+	SchemeHandle_t hSmallScheme = pSchemes->getSchemeHandle("Scoreboard Small Text");
+	SchemeHandle_t hTinyScheme = pSchemes->getSchemeHandle("Scoreboard Tiny Text");
+	Font *tfont = pSchemes->getFont(hTitleScheme);
+	Font *smallfont = pSchemes->getFont(hSmallScheme);
+	Font *tinyfont = pSchemes->getFont(hTinyScheme);
+	
+	setBgColor(0, 0, 0, 96);
+	m_pCurrentHighlightLabel = NULL;
+	m_iHighlightRow = -1;
+
+	m_pTrackerIcon = NULL;
+	m_pDevIcon = NULL;
+	m_pPTIcon = NULL;
+	m_pGuideIcon = NULL;
+	m_pServerOpIcon = NULL;
+	m_pContribIcon = NULL;
+	m_pCheatingDeathIcon = NULL;
+	m_pVeteranIcon = NULL;
+	
+	m_pTrackerIcon = vgui_LoadTGANoInvertAlpha("gfx/vgui/640_scoreboardtracker.tga");
+	m_pDevIcon = vgui_LoadTGANoInvertAlpha("gfx/vgui/640_scoreboarddev.tga");
+	m_pPTIcon = vgui_LoadTGANoInvertAlpha("gfx/vgui/640_scoreboardpt.tga");
+	m_pGuideIcon = vgui_LoadTGANoInvertAlpha("gfx/vgui/640_scoreboardguide.tga");
+	m_pServerOpIcon = vgui_LoadTGANoInvertAlpha("gfx/vgui/640_scoreboardserverop.tga");
+	m_pContribIcon = vgui_LoadTGANoInvertAlpha("gfx/vgui/640_scoreboardcontrib.tga");
+	m_pCheatingDeathIcon = vgui_LoadTGANoInvertAlpha("gfx/vgui/640_scoreboardcd.tga");
+	m_pVeteranIcon = vgui_LoadTGANoInvertAlpha("gfx/vgui/640_scoreboardveteran.tga");
+	
+	// Initialize the top title.
+	m_TitleLabel.setFont(tfont);
+	m_TitleLabel.setText("");
+	m_TitleLabel.setBgColor( 0, 0, 0, 255 );
+	m_TitleLabel.setFgColor( Scheme::sc_primary1 );
+	m_TitleLabel.setContentAlignment( vgui::Label::a_west );
+
+	LineBorder *border = new LineBorder(Color(60, 60, 60, 128));
+	setBorder(border);
+	setPaintBorderEnabled(true);
+
+	int xpos = g_ColumnInfo[0].m_Width + 3;
+	if (ScreenWidth() >= 640)
+	{
+		// only expand column size for res greater than 640
+		xpos = XRES(xpos);
+	}
+	m_TitleLabel.setBounds(xpos, 4, wide, SBOARD_TITLE_SIZE_Y);
+	m_TitleLabel.setContentFitted(false);
+	m_TitleLabel.setParent(this);
+
+	// Setup the header (labels like "name", "class", etc..).
+	m_HeaderGrid.SetDimensions(NUM_COLUMNS, 1);
+	m_HeaderGrid.SetSpacing(0, 0);
+	
+	for(int i=0; i < NUM_COLUMNS; i++)
+	{
+		if (g_ColumnInfo[i].m_pTitle && g_ColumnInfo[i].m_pTitle[0] == '#')
+			m_HeaderLabels[i].setText(CHudTextMessage::BufferedLocaliseTextString(g_ColumnInfo[i].m_pTitle));
+		else if(g_ColumnInfo[i].m_pTitle)
+			m_HeaderLabels[i].setText(g_ColumnInfo[i].m_pTitle);
+
+		int xwide = g_ColumnInfo[i].m_Width;
+		if (ScreenWidth() >= 640)
+		{
+			xwide = XRES(xwide);
+		}
+		else if (ScreenWidth() == 400)
+		{
+			// hack to make 400x300 resolution scoreboard fit
+			if (i == 1)
+			{
+				// reduces size of player name cell
+				xwide -= 28;
+			}
+			else if (i == 0)
+			{
+				// tracker icon cell
+				xwide -= 8;
+			}
+		}
+		
+		m_HeaderGrid.SetColumnWidth(i, xwide);
+		m_HeaderGrid.SetEntry(i, 0, &m_HeaderLabels[i]);
+
+		m_HeaderLabels[i].setBgColor(0,0,0,255);
+		m_HeaderLabels[i].setBgColor(0,0,0,255);
+		
+        int theColorIndex = 0;
+        Color gammaAdjustedTeamColor = BuildColor(kTeamColors[theColorIndex][0], kTeamColors[theColorIndex][1], kTeamColors[theColorIndex][2], gHUD.GetGammaSlope());
+        int theR, theG, theB, theA;
+        gammaAdjustedTeamColor.getColor(theR, theG, theB, theA);
+        m_HeaderLabels[i].setFgColor(theR, theG, theB, theA);
+
+		m_HeaderLabels[i].setFont(smallfont);
+		m_HeaderLabels[i].setContentAlignment(g_ColumnInfo[i].m_Alignment);
+
+		int yres = 12;
+		if (ScreenHeight() >= 480)
+		{
+			yres = YRES(yres);
+		}
+		m_HeaderLabels[i].setSize(50, yres);
+	}
+
+	// Set the width of the last column to be the remaining space.
+	int ex, ey, ew, eh;
+	m_HeaderGrid.GetEntryBox(NUM_COLUMNS - 2, 0, ex, ey, ew, eh);
+	m_HeaderGrid.SetColumnWidth(NUM_COLUMNS - 1, (wide - X_BORDER) - (ex + ew));
+
+	m_HeaderGrid.AutoSetRowHeights();
+	m_HeaderGrid.setBounds(X_BORDER, SBOARD_TITLE_SIZE_Y, wide - X_BORDER*2, m_HeaderGrid.GetRowHeight(0));
+	m_HeaderGrid.setParent(this);
+	m_HeaderGrid.setBgColor(0,0,0,255);
+
+
+	// Now setup the listbox with the actual player data in it.
+	int headerX, headerY, headerWidth, headerHeight;
+	m_HeaderGrid.getBounds(headerX, headerY, headerWidth, headerHeight);
+	m_PlayerList.setBounds(headerX, headerY+headerHeight, headerWidth, tall - headerY - headerHeight - 6);
+	m_PlayerList.setBgColor(0,0,0,255);
+	m_PlayerList.setParent(this);
+
+	for(int row=0; row < NUM_ROWS; row++)
+	{
+		CGrid *pGridRow = &m_PlayerGrids[row];
+
+		pGridRow->SetDimensions(NUM_COLUMNS, 1);
+		
+		for(int col=0; col < NUM_COLUMNS; col++)
+		{
+			m_PlayerEntries[col][row].setContentFitted(false);
+			m_PlayerEntries[col][row].setRow(row);
+			m_PlayerEntries[col][row].addInputSignal(this);
+			pGridRow->SetEntry(col, 0, &m_PlayerEntries[col][row]);
+		}
+
+		pGridRow->setBgColor(0,0,0,255);
+//		pGridRow->SetSpacing(2, 0);f
+		pGridRow->SetSpacing(0, 0);
+		pGridRow->CopyColumnWidths(&m_HeaderGrid);
+		pGridRow->AutoSetRowHeights();
+		pGridRow->setSize(PanelWidth(pGridRow), pGridRow->CalcDrawHeight());
+		pGridRow->RepositionContents();
+
+		m_PlayerList.AddItem(pGridRow);
+	}
+
+
+	// Add the hit test panel. It is invisible and traps mouse clicks so we can go into squelch mode.
+	m_HitTestPanel.setBgColor(0,0,0,255);
+	m_HitTestPanel.setParent(this);
+	m_HitTestPanel.setBounds(0, 0, wide, tall);
+	m_HitTestPanel.addInputSignal(this);
+
+	m_pCloseButton = new CommandButton( "x", wide-XRES(12 + 4), YRES(2), XRES( 12 ) , YRES( 12 ) );
+	m_pCloseButton->setParent( this );
+	m_pCloseButton->addActionSignal( new CMenuHandler_StringCommandWatch( "-showscores", true ) );
+	m_pCloseButton->setBgColor(0,0,0,255);
+	m_pCloseButton->setFgColor( 255, 255, 255, 0 );
+	m_pCloseButton->setFont(tfont);
+	m_pCloseButton->setBoundKey( (char)255 );
+	m_pCloseButton->setContentAlignment(Label::a_center);
+	Initialize();
+}
+
+
+//-----------------------------------------------------------------------------
+// Purpose: Called each time a new level is started.
+//-----------------------------------------------------------------------------
+void ScorePanel::Initialize( void )
+{
+	// Clear out scoreboard data
+	m_iLastKilledBy = 0;
+	m_fLastKillTime = 0;
+	m_iPlayerNum = 0;
+	m_iNumTeams = 0;
+	memset( g_PlayerExtraInfo, 0, sizeof g_PlayerExtraInfo );
+	memset( g_TeamInfo, 0, sizeof g_TeamInfo );
+}
+
+bool HACK_GetPlayerUniqueID( int iPlayer, char playerID[16] )
+{
+	return !!gEngfuncs.GetPlayerUniqueID( iPlayer, playerID );
+}
+//-----------------------------------------------------------------------------
+// Purpose: Recalculate the internal scoreboard data
+//-----------------------------------------------------------------------------
+void ScorePanel::Update()
+{
+	// Set the title
+	string theTitleName;
+
+	if (gViewPort->m_szServerName)
+	{
+		char sz[MAX_SERVERNAME_LENGTH + MAX_MAPNAME_LENGTH + 256];
+		sprintf(sz, "%s", gViewPort->m_szServerName );
+		string theServerName = string(sz);
+		if(theServerName.length() > MAX_SERVERNAME_LENGTH) //string wasn't terminated
+		{ theServerName.resize(MAX_SERVERNAME_LENGTH); }
+		theTitleName += theServerName;
+	}
+
+	string theMapName = gHUD.GetMapName();
+	if(theMapName != "")
+	{
+		//sprintf(sz, "%s : %s", gViewPort->m_szServerName, theMapName.c_str());
+		if(theTitleName != "")
+		{
+			theTitleName += " ";
+		}
+
+		theTitleName += "(";
+		theTitleName += theMapName;
+		theTitleName += ")";
+	}
+
+	m_TitleLabel.setText(theTitleName.c_str());
+
+    int theColorIndex = 0;
+    
+    // Set gamma-correct title color
+    Color gammaAdjustedTeamColor = BuildColor(kTeamColors[theColorIndex][0], kTeamColors[theColorIndex][1], kTeamColors[theColorIndex][2], gHUD.GetGammaSlope());
+    
+    int theR, theG, theB, theA;
+    gammaAdjustedTeamColor.getColor(theR, theG, theB, theA);
+
+    m_TitleLabel.setFgColor(theR, theG, theB, theA);
+
+	m_iRows = 0;
+	gViewPort->GetAllPlayersInfo();
+
+	// Clear out sorts
+	int i = 0;
+	for (i = 0; i < NUM_ROWS; i++)
+	{
+		m_iSortedRows[i] = 0;
+		m_iIsATeam[i] = TEAM_IND;
+	}
+
+	// Fix for memory overrun bug
+	for (i = 0; i < MAX_PLAYERS; i++)
+	{
+		m_bHasBeenSorted[i] = false;
+	}
+
+	// If it's not teamplay, sort all the players. Otherwise, sort the teams.
+	if ( !gHUD.m_Teamplay )
+		SortPlayers( 0, NULL );
+	else
+		SortTeams();
+
+	// set scrollbar range
+	m_PlayerList.SetScrollRange(m_iRows);
+
+	FillGrid();
+	if ( gViewPort->m_pSpectatorPanel->m_menuVisible )
+	{
+		 m_pCloseButton->setVisible ( true );
+	}
+	else 
+	{
+		 m_pCloseButton->setVisible ( false );
+	}
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Sort all the teams
+//-----------------------------------------------------------------------------
+void ScorePanel::SortTeams()
+{
+	// clear out team scores
+	float theCurrentTime = gHUD.GetTimeOfLastUpdate();
+
+	for ( int i = 1; i <= m_iNumTeams; i++ )
+	{
+		if ( !g_TeamInfo[i].scores_overriden )
+			g_TeamInfo[i].score = g_TeamInfo[i].frags = g_TeamInfo[i].deaths = 0;
+		g_TeamInfo[i].ping = g_TeamInfo[i].packetloss = 0;
+	}
+
+	// recalc the team scores, then draw them
+	for ( i = 1; i <= MAX_PLAYERS; i++ )
+	{
+		if ( g_PlayerInfoList[i].name == NULL )
+			continue; // empty player slot, skip
+
+		if ( g_PlayerExtraInfo[i].teamname[0] == 0 )
+			continue; // skip over players who are not in a team
+
+		// find what team this player is in
+		for ( int j = 1; j <= m_iNumTeams; j++ )
+		{
+			if ( !stricmp( g_PlayerExtraInfo[i].teamname, g_TeamInfo[j].name ) )
+				break;
+		}
+		if ( j > m_iNumTeams )  // player is not in a team, skip to the next guy
+			continue;
+
+		if ( !g_TeamInfo[j].scores_overriden )
+		{
+            g_TeamInfo[j].score += g_PlayerExtraInfo[i].score;
+			g_TeamInfo[j].frags += g_PlayerExtraInfo[i].frags;
+			g_TeamInfo[j].deaths += g_PlayerExtraInfo[i].deaths;
+		}
+
+		g_TeamInfo[j].ping += g_PlayerInfoList[i].ping;
+		g_TeamInfo[j].packetloss += g_PlayerInfoList[i].packetloss;
+
+		if ( g_PlayerInfoList[i].thisplayer )
+			g_TeamInfo[j].ownteam = TRUE;
+		else
+			g_TeamInfo[j].ownteam = FALSE;
+
+		// Set the team's number (used for team colors)
+		g_TeamInfo[j].teamnumber = g_PlayerExtraInfo[i].teamnumber;
+	}
+
+	// find team ping/packetloss averages
+	for ( i = 1; i <= m_iNumTeams; i++ )
+	//for ( i = 0; i <= m_iNumTeams; i++ )
+	{
+		g_TeamInfo[i].already_drawn = FALSE;
+
+		if ( g_TeamInfo[i].players > 0 )
+		{
+			g_TeamInfo[i].ping /= g_TeamInfo[i].players;  // use the average ping of all the players in the team as the teams ping
+			g_TeamInfo[i].packetloss /= g_TeamInfo[i].players;  // use the average ping of all the players in the team as the teams ping
+		}
+	}
+	
+	// Draw the teams
+	//	while ( 1 )
+	//	{
+	//		int highest_frags = -99999; int lowest_deaths = 99999;
+	//		int best_team = 0;
+	//
+	//		for ( i = 1; i <= m_iNumTeams; i++ )
+	//		{
+	//			if ( g_TeamInfo[i].players < 1 )
+	//				continue;
+	//
+	//			// Spectator team can't be the best team if there are others
+	//			if ( !g_TeamInfo[i].already_drawn && g_TeamInfo[i].frags >= highest_frags )
+	//			{
+	//				if ( g_TeamInfo[i].frags > highest_frags || g_TeamInfo[i].deaths < lowest_deaths )
+	//				{
+	//					best_team = i;
+	//					lowest_deaths = g_TeamInfo[i].deaths;
+	//					highest_frags = g_TeamInfo[i].frags;
+	//				}
+	//			}
+	//		}
+	//
+	//		// draw the best team on the scoreboard
+	//		if ( !best_team )
+	//			break;
+//	for(i = 1 ; i <= m_iNumTeams; i++)
+//	{
+//		int best_team = i;
+//		
+//		// Put this team in the sorted list
+//		m_iSortedRows[ m_iRows ] = best_team;
+//		m_iIsATeam[ m_iRows ] = TEAM_YES;
+//		g_TeamInfo[best_team].already_drawn = TRUE;  // set the already_drawn to be TRUE, so this team won't get sorted again
+//		m_iRows++;
+//		
+//		// Now sort all the players on this team
+//		SortPlayers( 0, g_TeamInfo[best_team].name );
+//	}
+	
+	// Sort the teams by numerical order, skipping spectators
+	//	for(i = 1; i < m_iNumTeams; i++)
+	//	{
+	//		SortPlayers(0, g_TeamInfo[i].name);
+	//	}
+	
+	SortActivePlayers(kMarine1Team);
+	SortActivePlayers(kAlien1Team);
+	SortActivePlayers(kMarine2Team);
+	SortActivePlayers(kAlien2Team);
+	SortActivePlayers(kSpectatorTeam);
+	SortActivePlayers(kUndefinedTeam);
+	
+	// Add all the players who aren't in a team yet into spectators
+	//SortPlayers( TEAM_SPECTATORS, NULL );
+}
+
+void ScorePanel::SortActivePlayers(char* inTeam, bool inSortByEntityIndex)
+{
+	for(int i = 1; i <= m_iNumTeams; i++)
+	{
+		if(!strcmp(g_TeamInfo[i].name, inTeam))
+		{
+			int best_team = i;
+			
+			// Put this team in the sorted list
+			m_iSortedRows[ m_iRows ] = best_team;
+			m_iIsATeam[ m_iRows ] = TEAM_YES;
+			g_TeamInfo[best_team].already_drawn = TRUE;  // set the already_drawn to be TRUE, so this team won't get sorted again
+			m_iRows++;
+			
+			// Now sort all the players on this team
+			SortPlayers(0, g_TeamInfo[best_team].name, inSortByEntityIndex);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Sort a list of players
+//-----------------------------------------------------------------------------
+void ScorePanel::SortPlayers( int iTeam, char *team, bool inSortByEntityIndex)
+{
+	bool bCreatedTeam = false;
+
+	// draw the players, in order,  and restricted to team if set
+	while ( 1 )
+	{
+		// Find the top ranking player
+		int theBestTotalScore = -99999;
+        int theBestDeaths = 0;
+		int theBestPlayer = 0;
+
+		for ( int i = 1; i <= MAX_PLAYERS; i++ )
+		{
+			if ( m_bHasBeenSorted[i] == false && g_PlayerInfoList[i].name /*&& g_PlayerExtraInfo[i].frags >= theBestTotalScore*/ )
+			{
+				cl_entity_t *ent = gEngfuncs.GetEntityByIndex( i );
+
+				if ( ent && !(team && stricmp(g_PlayerExtraInfo[i].teamname, team)) )  
+				{
+					extra_player_info_t *pl_info = &g_PlayerExtraInfo[i];
+
+					// Sort by player index to mask marine status
+					if(inSortByEntityIndex)
+					{
+						if((theBestPlayer == 0) || (i < theBestPlayer))
+						{
+							theBestPlayer = i;
+						}
+					}
+					else
+                    {
+                        // overall rank = score + kills (with least deaths breaking ties)
+                        int thePlayerScore = pl_info->score;// + pl_info->frags - pl_info->deaths;
+                        int thePlayerDeaths = pl_info->deaths;
+                        if((thePlayerScore > theBestTotalScore) || ((thePlayerScore == theBestTotalScore) && (pl_info->deaths < theBestDeaths)))
+                        {
+                            theBestPlayer = i;
+                            theBestTotalScore = thePlayerScore;
+                            theBestDeaths = thePlayerDeaths;
+                        }
+                    }
+				}
+			}
+		}
+
+		if ( !theBestPlayer )
+			break;
+
+		// If we haven't created the Team yet, do it first
+		if (!bCreatedTeam && iTeam)
+		{
+			m_iIsATeam[ m_iRows ] = iTeam;
+			m_iRows++;
+
+			bCreatedTeam = true;
+		}
+
+		// Put this player in the sorted list
+		m_iSortedRows[ m_iRows ] = theBestPlayer;
+		m_bHasBeenSorted[ theBestPlayer ] = true;
+		m_iRows++;
+	}
+
+	if (team)
+	{
+		m_iIsATeam[m_iRows++] = TEAM_BLANK;
+	}
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Recalculate the existing teams in the match
+//-----------------------------------------------------------------------------
+void ScorePanel::RebuildTeams()
+{
+	// clear out player counts from teams
+	for ( int i = 1; i <= m_iNumTeams; i++ )
+	{
+		g_TeamInfo[i].players = 0;
+	}
+
+	// rebuild the team list
+	gViewPort->GetAllPlayersInfo();
+	m_iNumTeams = 0;
+	for ( i = 1; i <= MAX_PLAYERS; i++ )
+	{
+		if ( g_PlayerInfoList[i].name == NULL )
+			continue;
+
+		if ( g_PlayerExtraInfo[i].teamname[0] == 0 )
+			continue; // skip over players who are not in a team
+
+		// is this player in an existing team?
+		for ( int j = 1; j <= m_iNumTeams; j++ )
+		{
+			if ( g_TeamInfo[j].name[0] == '\0' )
+				break;
+
+			if ( !stricmp( g_PlayerExtraInfo[i].teamname, g_TeamInfo[j].name ) )
+				break;
+		}
+
+		if ( j > m_iNumTeams )
+		{ // they aren't in a listed team, so make a new one
+			// search through for an empty team slot
+			for ( int j = 1; j <= m_iNumTeams; j++ )
+			{
+				if ( g_TeamInfo[j].name[0] == '\0' )
+					break;
+			}
+			m_iNumTeams = max( j, m_iNumTeams );
+
+			strncpy( g_TeamInfo[j].name, g_PlayerExtraInfo[i].teamname, MAX_TEAM_NAME );
+			g_TeamInfo[j].players = 0;
+		}
+
+		g_TeamInfo[j].players++;
+	}
+
+	// clear out any empty teams
+	for ( i = 1; i <= m_iNumTeams; i++ )
+	{
+		if ( g_TeamInfo[i].players < 1 )
+			memset( &g_TeamInfo[i], 0, sizeof(team_info_t) );
+	}
+
+	// Update the scoreboard
+	Update();
+}
+
+
+void ScorePanel::FillGrid()
+{
+	CSchemeManager *pSchemes = gViewPort->GetSchemeManager();
+	SchemeHandle_t hScheme = pSchemes->getSchemeHandle("Scoreboard Text");
+	SchemeHandle_t hTitleScheme = pSchemes->getSchemeHandle("Scoreboard Title Text");
+	SchemeHandle_t hSmallScheme = pSchemes->getSchemeHandle("Scoreboard Small Text");
+	SchemeHandle_t hTinyScheme = pSchemes->getSchemeHandle("Scoreboard Tiny Text");
+
+	Font *sfont = pSchemes->getFont(hScheme);
+	Font *tfont = pSchemes->getFont(hTitleScheme);
+	Font *smallfont = pSchemes->getFont(hSmallScheme);
+	Font *tinyfont = pSchemes->getFont(hTinyScheme);
+
+	// update highlight position
+	int x, y;
+	getApp()->getCursorPos(x, y);
+	cursorMoved(x, y, this);
+	
+	// remove highlight row if we're not in squelch mode
+	if (!GetClientVoiceMgr()->IsInSquelchMode())
+	{
+		m_iHighlightRow = -1;
+	}
+	
+	bool bNextRowIsGap = false;
+	
+	for(int row=0; row < NUM_ROWS; row++)
+	{
+		CGrid *pGridRow = &m_PlayerGrids[row];
+		pGridRow->SetRowUnderline(0, false, 0, 0, 0, 0, 0);
+		
+		if(row >= m_iRows)
+		{
+			for(int col=0; col < NUM_COLUMNS; col++)
+				m_PlayerEntries[col][row].setVisible(false);
+			
+			continue;
+		}
+		
+		bool bRowIsGap = false;
+		if (bNextRowIsGap)
+		{
+			bNextRowIsGap = false;
+			bRowIsGap = true;
+		}
+		
+		// Get the player's data
+		int theSortedRow = m_iSortedRows[row];
+		hud_player_info_t* pl_info = &g_PlayerInfoList[theSortedRow];
+		extra_player_info_t* theExtraPlayerInfo = &g_PlayerExtraInfo[theSortedRow];
+		int thePlayerClass = theExtraPlayerInfo->playerclass;
+		short thePlayerAuthentication = theExtraPlayerInfo->auth;
+		int theIconColor = theExtraPlayerInfo->color;
+		bool thePlayerIsDead = (thePlayerClass == (int)(PLAYERCLASS_DEAD_MARINE)) || (thePlayerClass == (int)(PLAYERCLASS_DEAD_ALIEN)) || (thePlayerClass == (int)(PLAYERCLASS_REINFORCING));
+		short theTeamNumber = theExtraPlayerInfo->teamnumber;
+		string theCustomIcon = (string)theExtraPlayerInfo->customicon;
+
+		// Code to test DEBUG
+#if 0
+		#ifdef DEBUG
+		extern int gGlobalDebugAuth;
+		thePlayerAuthentication = 1;
+		thePlayerAuthentication <<= gGlobalDebugAuth;
+		#endif
+#endif
+
+		team_info_t* team_info = &g_TeamInfo[m_iSortedRows[row]];
+		int theColorIndex = theTeamNumber % iNumberOfTeamColors;
+
+        int theLocalPlayerTeam = 0;
+        if(gEngfuncs.GetLocalPlayer())
+        {
+            theLocalPlayerTeam = gEngfuncs.GetLocalPlayer()->curstate.team;
+        }
+		
+		for(int col=0; col < NUM_COLUMNS; col++)
+		{
+			CLabelHeader *pLabel = &m_PlayerEntries[col][row];
+
+			pLabel->setVisible(true);
+			pLabel->setText2("");
+			pLabel->setImage(NULL);
+			pLabel->setFont(sfont);
+			pLabel->setTextOffset(0, 0);
+			
+			int rowheight = 13;
+			if (ScreenHeight() > 480)
+			{
+				rowheight = YRES(rowheight);
+			}
+			else
+			{
+				// more tweaking, make sure icons fit at low res
+				rowheight = 15;
+			}
+			pLabel->setSize(pLabel->getWide(), rowheight);
+			pLabel->setBgColor(0, 0, 0, 255);
+			
+			char sz[128];
+
+			// This could be zero if the player hits tab before getting the first message from the server
+			//ASSERT(this->m_iNumTeams > 0);
+
+			// Get the team's data
+//			team_info_t* team_info = &g_TeamInfo[0];
+//			for(int i = 0; i < this->m_iNumTeams; i++)
+//			{
+//				team_info_t* theCurrentTeam = &g_TeamInfo[i+1];
+//				if(theCurrentTeam->teamnumber == theTeamNumber)
+//				{
+//					team_info = theCurrentTeam;
+//					break;
+//				}
+//			}
+
+			Color gammaAdjustedTeamColor = BuildColor(kTeamColors[theColorIndex][0], kTeamColors[theColorIndex][1], kTeamColors[theColorIndex][2], gHUD.GetGammaSlope());
+            pLabel->setFgColor(gammaAdjustedTeamColor[0], gammaAdjustedTeamColor[1], gammaAdjustedTeamColor[2], 0);
+
+			if (m_iIsATeam[row] == TEAM_BLANK)
+			{
+				pLabel->setText(" ");
+				continue;
+			}
+			else if ( m_iIsATeam[row] == TEAM_YES )
+			{
+				theColorIndex = team_info->teamnumber % iNumberOfTeamColors;
+
+				// team color text for team names
+				
+				
+
+				// different height for team header rows
+				rowheight = 20;
+				if (ScreenHeight() >= 480)
+				{
+					rowheight = YRES(rowheight);
+				}
+				pLabel->setSize(pLabel->getWide(), rowheight);
+				pLabel->setFont(tfont);
+
+				pGridRow->SetRowUnderline(	0,
+											true,
+											YRES(3),
+											gammaAdjustedTeamColor[0],
+											gammaAdjustedTeamColor[1],
+											gammaAdjustedTeamColor[2],
+											0 );
+			}
+			else if ( m_iIsATeam[row] == TEAM_SPECTATORS )
+			{
+				// grey text for spectators
+				pLabel->setFgColor(100, 100, 100, 0);
+
+				// different height for team header rows
+				rowheight = 20;
+				if (ScreenHeight() >= 480)
+				{
+					rowheight = YRES(rowheight);
+				}
+				pLabel->setSize(pLabel->getWide(), rowheight);
+				pLabel->setFont(tfont);
+
+				pGridRow->SetRowUnderline(0, true, YRES(3), 100, 100, 100, 0);
+			}
+			else
+			{
+				if(thePlayerIsDead)
+				{
+					pLabel->setFgColor(255, 0, 0, 0);
+				}
+				else
+				{
+					// team color text for player names
+					pLabel->setFgColor(gammaAdjustedTeamColor[0], gammaAdjustedTeamColor[1], gammaAdjustedTeamColor[2], 0);
+				}
+				
+				// Set background color
+				if ( pl_info && pl_info->thisplayer ) // if it is their name, draw it a different color
+				{
+					// Highlight this player
+					pLabel->setFgColor(Scheme::sc_white);
+					pLabel->setBgColor(gammaAdjustedTeamColor[0], gammaAdjustedTeamColor[1], gammaAdjustedTeamColor[2], 196 );
+				}
+				else if ( theSortedRow == m_iLastKilledBy && m_fLastKillTime && m_fLastKillTime > gHUD.m_flTime )
+				{
+					// Killer's name
+					pLabel->setBgColor( 255,0,0, 255 - ((float)15 * (float)(m_fLastKillTime - gHUD.m_flTime)) );
+				}
+			}				
+
+			// Align 
+            switch(col)
+            {
+            case COLUMN_NAME:
+            case COLUMN_CLASS:
+                pLabel->setContentAlignment( vgui::Label::a_west );
+                break;
+
+            case COLUMN_TRACKER:
+            case COLUMN_RANK_ICON:
+            case COLUMN_VOICE:
+                pLabel->setContentAlignment( vgui::Label::a_center );
+                break;
+
+            case COLUMN_SCORE:
+            case COLUMN_KILLS:
+            case COLUMN_DEATHS:
+            case COLUMN_LATENCY:
+            default:
+                pLabel->setContentAlignment( vgui::Label::a_east );
+                break;
+            }
+
+			// Fill out with the correct data
+			strcpy(sz, "");
+			if ( m_iIsATeam[row] )
+			{
+				char sz2[128];
+
+				switch (col)
+				{
+				case COLUMN_NAME:
+					if ( m_iIsATeam[row] == TEAM_SPECTATORS )
+					{
+						sprintf( sz2, CHudTextMessage::BufferedLocaliseTextString( "#Spectators" ) );
+					}
+					else
+					{
+						if(team_info)
+						{
+							sprintf( sz2, gViewPort->GetTeamName(team_info->teamnumber) );
+						}
+					}
+
+					strcpy(sz, sz2);
+
+					// Append the number of players
+					if ( m_iIsATeam[row] == TEAM_YES && team_info)
+					{
+						if (team_info->players == 1)
+						{
+							sprintf(sz2, "(%d %s)", team_info->players, CHudTextMessage::BufferedLocaliseTextString( "#Player" ) );
+						}
+						else
+						{
+							sprintf(sz2, "(%d %s)", team_info->players, CHudTextMessage::BufferedLocaliseTextString( "#Player_plural" ) );
+						}
+
+						pLabel->setText2(sz2);
+						pLabel->setFont2(smallfont);
+					}
+					break;
+				case COLUMN_VOICE:
+					break;
+				case COLUMN_CLASS:
+					break;
+                case COLUMN_SCORE:
+                    // Don't show score for enemies unless spectating or in RR
+                    if ((m_iIsATeam[row] == TEAM_YES) && team_info && ((theLocalPlayerTeam == 0) || (theLocalPlayerTeam == team_info->teamnumber)))
+                        sprintf(sz, "%d",  team_info->score);
+                    break;
+				case COLUMN_KILLS:
+					if ((m_iIsATeam[row] == TEAM_YES) && team_info) 
+						sprintf(sz, "%d",  team_info->frags );
+					break;
+				case COLUMN_DEATHS:
+					if ((m_iIsATeam[row] == TEAM_YES) && team_info)
+						sprintf(sz, "%d",  team_info->deaths );
+					break;
+				case COLUMN_LATENCY:
+					if ((m_iIsATeam[row] == TEAM_YES) && team_info)
+						sprintf(sz, "%d", team_info->ping );
+					break;
+				default:
+					break;
+				}
+			}
+			else
+			{
+				// Are these stats for an enemy?  Score and other stats shouldn't be drawn for enemies.
+				bool theIsForEnemy = false;
+
+				int theLocalPlayerTeam = 0;
+				if(gEngfuncs.GetLocalPlayer())
+				{
+					theLocalPlayerTeam = gEngfuncs.GetLocalPlayer()->curstate.team;
+				}
+
+				if((theLocalPlayerTeam != 0) && (theExtraPlayerInfo->teamnumber != theLocalPlayerTeam))
+				{
+					theIsForEnemy = true;
+				}
+				
+				switch (col)
+				{
+				case COLUMN_NAME:
+					
+					if (g_pTrackerUser)
+					{
+						int playerSlot = m_iSortedRows[row];
+						int trackerID = gEngfuncs.GetTrackerIDForPlayer(playerSlot);
+						const char *trackerName = g_pTrackerUser->GetUserName(trackerID);
+						if (trackerName && *trackerName)
+						{
+							sprintf(sz, "   (%s)", trackerName);
+							pLabel->setText2(sz);
+						}
+					}
+					
+					if(pl_info)
+					{
+						sprintf(sz, "%s  ", pl_info->name);
+					}
+					break;
+				case COLUMN_VOICE:
+					sz[0] = 0;
+					// in HLTV mode allow spectator to turn on/off commentator voice
+					if (pl_info && (!pl_info->thisplayer || gEngfuncs.IsSpectateOnly()))
+					{
+						GetClientVoiceMgr()->UpdateSpeakerImage(pLabel, theSortedRow);
+					}
+					break;
+				case COLUMN_CLASS:
+					// No class for other team's members (unless allied or spectator, and make sure player is on our team)
+					strcpy(sz, "");
+
+					if(team_info && ((theLocalPlayerTeam == theTeamNumber) || (gHUD.GetPlayMode() == PLAYMODE_OBSERVER)))
+					{
+						switch(thePlayerClass)
+						{
+						case (int)(PLAYERCLASS_DEAD_MARINE):
+						case (int)(PLAYERCLASS_DEAD_ALIEN):
+							sprintf(sz, "%s", CHudTextMessage::BufferedLocaliseTextString(kClassDead));
+							break;
+						case (int)(PLAYERCLASS_REINFORCING):
+							sprintf(sz, "%s", CHudTextMessage::BufferedLocaliseTextString(kClassReinforcing));
+							break;
+						case (int)(PLAYERCLASS_REINFORCINGCOMPLETE):
+							sprintf(sz, "%s", CHudTextMessage::BufferedLocaliseTextString(kClassReinforcingComplete));
+							break;
+						case (int)(PLAYERCLASS_ALIVE_JETPACK_MARINE):
+							sprintf(sz, "%s", CHudTextMessage::BufferedLocaliseTextString(kClassJetpackMarine));
+							break;
+						case (int)(PLAYERCLASS_ALIVE_HEAVY_MARINE):
+							sprintf(sz, "%s", CHudTextMessage::BufferedLocaliseTextString(kClassHeavyMarine));
+							break;
+						case (int)(PLAYERCLASS_COMMANDER):
+							sprintf(sz, "%s", CHudTextMessage::BufferedLocaliseTextString(kClassCommander));
+							break;
+						case (int)(PLAYERCLASS_ALIVE_LEVEL1):
+							sprintf(sz, "%s", CHudTextMessage::BufferedLocaliseTextString(kClassLevel1));
+							break;
+						case (int)(PLAYERCLASS_ALIVE_LEVEL2):
+							sprintf(sz, "%s", CHudTextMessage::BufferedLocaliseTextString(kClassLevel2));
+							break;
+						case (int)(PLAYERCLASS_ALIVE_LEVEL3):
+							sprintf(sz, "%s", CHudTextMessage::BufferedLocaliseTextString(kClassLevel3));
+							break;
+						case (int)(PLAYERCLASS_ALIVE_LEVEL4):
+							sprintf(sz, "%s", CHudTextMessage::BufferedLocaliseTextString(kClassLevel4));
+							break;
+						case (int)(PLAYERCLASS_ALIVE_LEVEL5):
+							sprintf(sz, "%s", CHudTextMessage::BufferedLocaliseTextString(kClassLevel5));
+							break;
+						case (int)(PLAYERCLASS_ALIVE_DIGESTING):
+							sprintf(sz, "%s", CHudTextMessage::BufferedLocaliseTextString(kClassDigesting));
+							break;
+						case (int)(PLAYERCLASS_ALIVE_GESTATING):
+							sprintf(sz, "%s", CHudTextMessage::BufferedLocaliseTextString(kClassGestating));
+							break;
+						default:
+							break;
+						}
+					}
+					break;
+						
+				case COLUMN_RANK_ICON:
+					if(thePlayerAuthentication & PLAYERAUTH_UPP_MODE)
+					{
+						if(g_pTrackerUser)
+						{
+							int playerSlot = theSortedRow;
+							int trackerID = gEngfuncs.GetTrackerIDForPlayer(playerSlot);
+
+							if (g_pTrackerUser->IsFriend(trackerID) && trackerID != g_pTrackerUser->GetTrackerID())
+							{
+								pLabel->setImage(m_pTrackerIcon);
+								pLabel->setFgColorAsImageColor(false);
+								m_pTrackerIcon->setColor(Color(255, 255, 255, 0));
+							}
+						}
+						else
+						{
+							//find the filename
+							short theIconNameBytes = (thePlayerAuthentication & ~PLAYERAUTH_UPP_MODE);
+							string theIconName;
+							MakeHexPairsFromBytes((unsigned char*)&theIconNameBytes,theIconName,2);
+							theIconName = string("gfx/vgui/icons/") + theIconName + string(".tga");
+
+							//find the color - 2 bits apiece for R,G,B
+							int theColor[3] = {0,0,0};
+							theColor[0] = ((theIconColor >> 6) & 0x03) * 64; //Red
+							theColor[1] = ((theIconColor >> 4) & 0x03) * 64; //Green
+							theColor[2] = ((theIconColor >> 2) & 0x03) * 64; //Blue
+		
+							//remaining two bits are fine granularity brightness shift for all three colors
+							int brightness_shift = (theIconColor & 0x03) * 16;
+							float max = max(theColor[0],max(theColor[1],theColor[2]));
+							theColor[0] += ((int)(theColor[0]/max))*brightness_shift;
+							theColor[1] += ((int)(theColor[1]/max))*brightness_shift;
+							theColor[2] += ((int)(theColor[2]/max))*brightness_shift;
+
+							vgui::BitmapTGA *pIcon = GetIconPointer(theIconName);
+
+							//Icon hasnt been loaded, load it now and add it to list of icons.
+							if(pIcon == NULL)
+							{
+								pIcon = vgui_LoadTGANoInvertAlpha(theIconName.c_str());
+
+								if(pIcon)
+									m_CustomIconList.push_back( make_pair(pIcon, theIconName) );
+							}
+				
+							//set the icon + color
+							if(pIcon)
+							{ 
+								pLabel->setImage(pIcon);
+								pLabel->setFgColorAsImageColor(false);
+								pIcon->setColor(BuildColor(theColor[0],theColor[1],theColor[2], gHUD.GetGammaSlope())); 
+							}
+						}
+					}
+					else //NOT UPP
+					{
+						// Check if we have authority.  Right now these override the tracker icons.  Listed in increasing order of "importance".
+						if(thePlayerAuthentication & PLAYERAUTH_CHEATINGDEATH)
+						{
+							// Red
+							pLabel->setImage(m_pCheatingDeathIcon);
+							pLabel->setFgColorAsImageColor(false);
+							m_pCheatingDeathIcon->setColor(BuildColor(255, 69, 9, gHUD.GetGammaSlope()));
+						}
+						if(thePlayerAuthentication & PLAYERAUTH_VETERAN)
+						{
+							// Yellow
+							pLabel->setImage(m_pVeteranIcon);
+							pLabel->setFgColorAsImageColor(false);
+							m_pVeteranIcon->setColor(BuildColor(248, 252, 0, gHUD.GetGammaSlope()));
+						}
+						if(thePlayerAuthentication & PLAYERAUTH_BETASERVEROP)
+						{
+							// Whitish
+							pLabel->setImage(m_pServerOpIcon);
+							pLabel->setFgColorAsImageColor(false);
+							m_pServerOpIcon->setColor(BuildColor(220, 220, 220, gHUD.GetGammaSlope()));
+						}
+						if(thePlayerAuthentication & PLAYERAUTH_CONTRIBUTOR)
+						{
+							// Light blue
+							pLabel->setImage(m_pContribIcon);
+							pLabel->setFgColorAsImageColor(false);
+							m_pContribIcon->setColor(BuildColor(117, 214, 241, gHUD.GetGammaSlope()));
+						}
+						if(thePlayerAuthentication & PLAYERAUTH_GUIDE)
+						{
+							// Magenta
+							pLabel->setImage(m_pGuideIcon);
+							pLabel->setFgColorAsImageColor(false);
+							m_pGuideIcon->setColor(BuildColor(208, 16, 190, gHUD.GetGammaSlope()));
+						}
+						if(thePlayerAuthentication & PLAYERAUTH_PLAYTESTER)
+						{
+							// Orange
+							pLabel->setImage(m_pPTIcon);
+							pLabel->setFgColorAsImageColor(false);
+							m_pPTIcon->setColor(BuildColor(255, 167, 54, gHUD.GetGammaSlope()));
+						}
+						if(thePlayerAuthentication & PLAYERAUTH_DEVELOPER)
+						{
+							// TSA blue
+							pLabel->setImage(m_pDevIcon);
+							pLabel->setFgColorAsImageColor(false);
+							m_pDevIcon->setColor(BuildColor(100, 215, 255, gHUD.GetGammaSlope()));
+						}
+
+						if(thePlayerAuthentication & PLAYERAUTH_SERVEROP)
+						{
+							// Bright green
+							pLabel->setImage(m_pServerOpIcon);
+							pLabel->setFgColorAsImageColor(false);
+							m_pServerOpIcon->setColor(BuildColor(0, 255, 0, gHUD.GetGammaSlope()));
+						}
+
+						// Allow custom icons to override other general icons
+						if(thePlayerAuthentication & PLAYERAUTH_CUSTOM)
+						{
+							if(theCustomIcon != "")
+							{
+								string theIconName = theCustomIcon.substr(0, strlen(theCustomIcon.c_str()) - 3);
+								string theFullCustomIconString = string("gfx/vgui/640_") + theIconName + string(".tga");
+
+								vgui::BitmapTGA *pIcon = GetIconPointer(theCustomIcon);
+
+								//Icon hasnt been loaded, load it now and add it to list of icons.
+								if(pIcon == NULL)
+								{
+									pIcon = vgui_LoadTGANoInvertAlpha(theFullCustomIconString.c_str());
+
+									if(pIcon)
+										m_CustomIconList.push_back( make_pair(pIcon, theCustomIcon) );
+								}
+								
+								if(pIcon)
+								{
+									pLabel->setImage(pIcon);
+									pLabel->setFgColorAsImageColor(false);
+
+									// Parse color (last 3 bytes are the RGB values 1-9)
+									string theColor = theCustomIcon.substr( strlen(theCustomIcon.c_str())-3, 3);
+									int theRed = (MakeIntFromString(theColor.substr(0, 1))/9.0f)*255;
+									int theGreen = (MakeIntFromString(theColor.substr(1, 1))/9.0f)*255;
+									int theBlue = (MakeIntFromString(theColor.substr(2, 1))/9.0f)*255;
+
+									pIcon->setColor(BuildColor(theRed, theGreen, theBlue, gHUD.GetGammaSlope()));
+								}
+							}
+						}
+					
+						if(g_pTrackerUser)
+						{
+							int playerSlot = theSortedRow;
+							int trackerID = gEngfuncs.GetTrackerIDForPlayer(playerSlot);
+
+							if (g_pTrackerUser->IsFriend(trackerID) && trackerID != g_pTrackerUser->GetTrackerID())
+							{
+								pLabel->setImage(m_pTrackerIcon);
+								pLabel->setFgColorAsImageColor(false);
+								m_pTrackerIcon->setColor(Color(255, 255, 255, 0));
+							}
+						}
+					}
+					break;
+                case COLUMN_SCORE:
+                    if(!theIsForEnemy)
+                    {
+                        const float kDeltaDisplayTime = 3.0f;
+                        float theTimeSinceChange = gHUD.GetTimeOfLastUpdate() - theExtraPlayerInfo->timeOfLastScoreChange;
+                        if((theExtraPlayerInfo->score > theExtraPlayerInfo->lastScore) && (theTimeSinceChange > 0) && (theTimeSinceChange < kDeltaDisplayTime) && (theExtraPlayerInfo->teamnumber != 0))
+                        {
+                            // draw score with change
+                            int theDelta = (theExtraPlayerInfo->score - theExtraPlayerInfo->lastScore);
+                            sprintf(sz, "(+%d) %d",  theDelta, theExtraPlayerInfo->score);
+                        }
+                        else
+                        {
+                            sprintf(sz, "%d", theExtraPlayerInfo->score);
+                        }
+                        
+                    }
+                    break;
+
+				case COLUMN_KILLS:
+                    sprintf(sz, "%d", theExtraPlayerInfo->frags);
+                    break;
+
+				case COLUMN_DEATHS:
+					sprintf(sz, "%d", theExtraPlayerInfo->deaths);
+					break;
+				case COLUMN_LATENCY:
+					if(pl_info)
+					{
+						sprintf(sz, "%d", pl_info->ping );
+					}
+					break;
+				default:
+					break;
+				}
+			}
+
+            pLabel->setText(sz);
+		}
+	}
+
+	for(row=0; row < NUM_ROWS; row++)
+	{
+		CGrid *pGridRow = &m_PlayerGrids[row];
+
+		pGridRow->AutoSetRowHeights();
+		pGridRow->setSize(PanelWidth(pGridRow), pGridRow->CalcDrawHeight());
+		pGridRow->RepositionContents();
+	}
+
+	// hack, for the thing to resize
+	m_PlayerList.getSize(x, y);
+	m_PlayerList.setSize(x, y);
+}
+
+
+//-----------------------------------------------------------------------------
+// Purpose: Setup highlights for player names in scoreboard
+//-----------------------------------------------------------------------------
+void ScorePanel::DeathMsg( int killer, int victim )
+{
+	// if we were the one killed,  or the world killed us, set the scoreboard to indicate suicide
+	if ( victim == m_iPlayerNum || killer == 0 )
+	{
+		m_iLastKilledBy = killer ? killer : m_iPlayerNum;
+		m_fLastKillTime = gHUD.m_flTime + 10;	// display who we were killed by for 10 seconds
+
+		if ( killer == m_iPlayerNum )
+			m_iLastKilledBy = m_iPlayerNum;
+	}
+}
+
+
+void ScorePanel::Open( void )
+{
+	RebuildTeams();
+	setVisible(true);
+	m_HitTestPanel.setVisible(true);
+}
+
+bool ScorePanel::SetSquelchMode(bool inMode)
+{
+	bool theSuccess = false;
+
+	if(inMode && !GetClientVoiceMgr()->IsInSquelchMode())
+	{
+		GetClientVoiceMgr()->StartSquelchMode();
+		m_HitTestPanel.setVisible(false);
+		theSuccess = true;
+	}
+	else if(!inMode && GetClientVoiceMgr()->IsInSquelchMode())
+	{
+		GetClientVoiceMgr()->StopSquelchMode();
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+void ScorePanel::mousePressed(MouseCode code, Panel* panel)
+{
+	if(gHUD.m_iIntermission)
+		return;
+
+	if (!GetClientVoiceMgr()->IsInSquelchMode())
+	{
+		//GetClientVoiceMgr()->StartSquelchMode();
+		//m_HitTestPanel.setVisible(false);
+		this->SetSquelchMode(true);
+	}
+	else if (m_iHighlightRow >= 0)
+	{
+		// mouse has been pressed, toggle mute state
+		int iPlayer = m_iSortedRows[m_iHighlightRow];
+		if (iPlayer > 0)
+		{
+			// print text message
+			hud_player_info_t *pl_info = &g_PlayerInfoList[iPlayer];
+
+			if (pl_info && pl_info->name && pl_info->name[0])
+			{
+				char string[256];
+				if (GetClientVoiceMgr()->IsPlayerBlocked(iPlayer))
+				{
+					char string1[1024];
+
+					// remove mute
+					GetClientVoiceMgr()->SetPlayerBlockedState(iPlayer, false);
+
+					sprintf( string1, CHudTextMessage::BufferedLocaliseTextString( "#Unmuted" ), pl_info->name );
+					sprintf( string, "%c** %s\n", HUD_PRINTTALK, string1 );
+
+					gHUD.m_TextMessage.MsgFunc_TextMsg(NULL, strlen(string)+1, string );
+				}
+				else
+				{
+					char string1[1024];
+					char string2[1024];
+
+					// mute the player
+					GetClientVoiceMgr()->SetPlayerBlockedState(iPlayer, true);
+
+					sprintf( string1, CHudTextMessage::BufferedLocaliseTextString( "#Muted" ), pl_info->name );
+					sprintf( string2, CHudTextMessage::BufferedLocaliseTextString( "#No_longer_hear_that_player" ) );
+					sprintf( string, "%c** %s %s\n", HUD_PRINTTALK, string1, string2 );
+
+					gHUD.m_TextMessage.MsgFunc_TextMsg(NULL, strlen(string)+1, string );
+				}
+			}
+		}
+	}
+}
+
+void ScorePanel::cursorMoved(int x, int y, Panel *panel)
+{
+	if (GetClientVoiceMgr()->IsInSquelchMode())
+	{
+		// look for which cell the mouse is currently over
+		for (int i = 0; i < NUM_ROWS; i++)
+		{
+			int row, col;
+			if (m_PlayerGrids[i].getCellAtPoint(x, y, row, col))
+			{
+				MouseOverCell(i, col);
+				return;
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Handles mouse movement over a cell
+// Input  : row - 
+//			col - 
+//-----------------------------------------------------------------------------
+void ScorePanel::MouseOverCell(int row, int col)
+{
+	CLabelHeader *label = &m_PlayerEntries[col][row];
+
+	// clear the previously highlighted label
+	if (m_pCurrentHighlightLabel != label)
+	{
+		m_pCurrentHighlightLabel = NULL;
+		m_iHighlightRow = -1;
+	}
+	if (!label)
+		return;
+
+	// don't act on teams
+	if (m_iIsATeam[row] != TEAM_IND)
+		return;
+
+	// don't act on disconnected players or ourselves
+	hud_player_info_t *pl_info = &g_PlayerInfoList[ m_iSortedRows[row] ];
+	if (!pl_info->name || !pl_info->name[0])
+		return;
+
+	if (pl_info->thisplayer && !gEngfuncs.IsSpectateOnly() )
+		return;
+
+	// only act on audible players
+	if (!GetClientVoiceMgr()->IsPlayerAudible(m_iSortedRows[row]))
+		return;
+
+	// setup the new highlight
+	m_pCurrentHighlightLabel = label;
+	m_iHighlightRow = row;
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Label paint functions - take into account current highligh status
+//-----------------------------------------------------------------------------
+void CLabelHeader::paintBackground()
+{
+	Color oldBg;
+	getBgColor(oldBg);
+
+	if (gViewPort->GetScoreBoard()->m_iHighlightRow == _row)
+	{
+		setBgColor(134, 91, 19, 0);
+	}
+
+	Panel::paintBackground();
+
+	setBgColor(oldBg);
+}
+		
+
+//-----------------------------------------------------------------------------
+// Purpose: Label paint functions - take into account current highligh status
+//-----------------------------------------------------------------------------
+void CLabelHeader::paint()
+{
+	Color oldFg;
+	getFgColor(oldFg);
+
+	if (gViewPort->GetScoreBoard()->m_iHighlightRow == _row)
+	{
+		setFgColor(255, 255, 255, 0);
+	}
+
+	// draw text
+	int x, y, iwide, itall;
+	getTextSize(iwide, itall);
+	calcAlignment(iwide, itall, x, y);
+	_dualImage->setPos(x, y);
+
+	int x1, y1;
+	_dualImage->GetImage(1)->getPos(x1, y1);
+	_dualImage->GetImage(1)->setPos(_gap, y1);
+
+	_dualImage->doPaint(this);
+
+	// get size of the panel and the image
+	if (_image)
+	{
+		Color imgColor;
+		getFgColor( imgColor );
+		if( _useFgColorAsImageColor )
+		{
+			_image->setColor( imgColor );
+		}
+		_image->getSize(iwide, itall);
+		calcAlignment(iwide, itall, x, y);
+		_image->setPos(x, y);
+		_image->doPaint(this);
+	}
+
+	setFgColor(oldFg[0], oldFg[1], oldFg[2], oldFg[3]);
+}
+
+
+void CLabelHeader::calcAlignment(int iwide, int itall, int &x, int &y)
+{
+	// calculate alignment ourselves, since vgui is so broken
+	int wide, tall;
+	getSize(wide, tall);
+
+	x = 0, y = 0;
+
+	// align left/right
+	switch (_contentAlignment)
+	{
+		// left
+		case Label::a_northwest:
+		case Label::a_west:
+		case Label::a_southwest:
+		{
+			x = 0;
+			break;
+		}
+		
+		// center
+		case Label::a_north:
+		case Label::a_center:
+		case Label::a_south:
+		{
+			x = (wide - iwide) / 2;
+			break;
+		}
+		
+		// right
+		case Label::a_northeast:
+		case Label::a_east:
+		case Label::a_southeast:
+		{
+			x = wide - iwide;
+			break;
+		}
+	}
+
+	// top/down
+	switch (_contentAlignment)
+	{
+		// top
+		case Label::a_northwest:
+		case Label::a_north:
+		case Label::a_northeast:
+		{
+			y = 0;
+			break;
+		}
+		
+		// center
+		case Label::a_west:
+		case Label::a_center:
+		case Label::a_east:
+		{
+			y = (tall - itall) / 2;
+			break;
+		}
+		
+		// south
+		case Label::a_southwest:
+		case Label::a_south:
+		case Label::a_southeast:
+		{
+			y = tall - itall;
+			break;
+		}
+	}
+
+// don't clip to Y
+//	if (y < 0)
+//	{
+//		y = 0;
+//	}
+	if (x < 0)
+	{
+		x = 0;
+	}
+
+	x += _offset[0];
+	y += _offset[1];
+}
diff --git a/main/source/cl_dll/vgui_ScorePanel.h b/main/source/cl_dll/vgui_ScorePanel.h
new file mode 100644
index 00000000..a865da93
--- /dev/null
+++ b/main/source/cl_dll/vgui_ScorePanel.h
@@ -0,0 +1,166 @@
+
+#ifndef SCOREPANEL_H
+#define SCOREPANEL_H
+
+#include<VGUI_Panel.h>
+#include<VGUI_TablePanel.h>
+#include<VGUI_HeaderPanel.h>
+#include<VGUI_TextGrid.h>
+#include<VGUI_Label.h>
+#include<VGUI_TextImage.h>
+#include "..\game_shared\vgui_listbox.h"
+
+#include <ctype.h>
+
+#define MAX_SCORES					10
+#define MAX_SCOREBOARD_TEAMS		5
+
+// Scoreboard cells
+#define COLUMN_TRACKER		0
+#define COLUMN_RANK_ICON	1
+#define COLUMN_NAME			2
+#define COLUMN_CLASS		3
+#define COLUMN_SCORE        4
+#define COLUMN_KILLS        5
+#define COLUMN_DEATHS		6
+#define COLUMN_LATENCY		7
+#define COLUMN_VOICE		8
+#define COLUMN_BLANK		9
+#define NUM_COLUMNS			10
+#define NUM_ROWS			(MAX_PLAYERS + (MAX_SCOREBOARD_TEAMS * 2))
+
+using namespace vgui;
+
+#include "cl_dll/CLabelHeader.h"
+
+class ScoreTablePanel;
+
+#include "..\game_shared\vgui_grid.h"
+#include "..\game_shared\vgui_defaultinputsignal.h"
+
+//-----------------------------------------------------------------------------
+// Purpose: Scoreboard back panel
+//-----------------------------------------------------------------------------
+class ScorePanel : public Panel, public vgui::CDefaultInputSignal
+{
+private:
+	// Default panel implementation doesn't forward mouse messages when there is no cursor and we need them.
+	class HitTestPanel : public Panel
+	{
+	public:
+		virtual void	internalMousePressed(MouseCode code);
+	};
+
+
+private:
+
+	Label			m_TitleLabel;
+	
+	// Here is how these controls are arranged hierarchically.
+	// m_HeaderGrid
+	//     m_HeaderLabels
+
+	// m_PlayerGridScroll
+	//     m_PlayerGrid
+	//         m_PlayerEntries 
+
+	CGrid			m_HeaderGrid;
+	CLabelHeader	m_HeaderLabels[NUM_COLUMNS];			// Labels above the 
+	CLabelHeader	*m_pCurrentHighlightLabel;
+	int				m_iHighlightRow;
+	
+	vgui::CListBox	m_PlayerList;
+	CGrid			m_PlayerGrids[NUM_ROWS];				// The grid with player and team info. 
+	CLabelHeader	m_PlayerEntries[NUM_COLUMNS][NUM_ROWS];	// Labels for the grid entries.
+
+	ScorePanel::HitTestPanel	m_HitTestPanel;
+	CommandButton				*m_pCloseButton;
+	CLabelHeader*	GetPlayerEntry(int x, int y)	{return &m_PlayerEntries[x][y];}
+
+	vgui::BitmapTGA *m_pTrackerIcon;
+
+	vgui::BitmapTGA *m_pDevIcon;
+	vgui::BitmapTGA *m_pPTIcon;
+	vgui::BitmapTGA *m_pGuideIcon;
+	vgui::BitmapTGA *m_pServerOpIcon;
+	vgui::BitmapTGA *m_pContribIcon;
+	vgui::BitmapTGA *m_pCheatingDeathIcon;
+	vgui::BitmapTGA *m_pVeteranIcon;
+	vector< pair <vgui::BitmapTGA *, string> > m_CustomIconList;
+
+public:
+	
+	int				m_iNumTeams;
+	int				m_iPlayerNum;
+	int				m_iShowscoresHeld;
+
+	int				m_iRows;
+	int				m_iSortedRows[NUM_ROWS];
+	int				m_iIsATeam[NUM_ROWS];
+	bool			m_bHasBeenSorted[MAX_PLAYERS];
+	int				m_iLastKilledBy;
+	int				m_fLastKillTime;
+public:
+
+	ScorePanel(int x,int y,int wide,int tall);
+
+	void Update( void );
+
+	void SortTeams( void );
+	void SortActivePlayers(char* inTeam, bool inSortByEntityIndex = false);
+	void SortPlayers( int iTeam, char *team, bool inSortByEntityIndex = false);
+	void RebuildTeams( void );
+	bool SetSquelchMode(bool inMode);
+
+	void FillGrid();
+
+	void DeathMsg( int killer, int victim );
+
+	void Initialize( void );
+
+	void Open( void );
+
+	void MouseOverCell(int row, int col);
+
+// InputSignal overrides.
+public:
+
+	virtual void mousePressed(MouseCode code, Panel* panel);
+	virtual void cursorMoved(int x, int y, Panel *panel);
+
+	vgui::BitmapTGA *GetIconPointer(string inIconName)
+	{
+		vgui::BitmapTGA *pIcon = NULL;
+
+		for (int i = 0; i < m_CustomIconList.size(); i++) 
+		{
+			if(inIconName == m_CustomIconList[i].second)
+			{
+				if(m_CustomIconList[i].first)
+				{
+					pIcon = m_CustomIconList[i].first;
+					break;
+				}
+			}
+		}
+		return pIcon;
+	}
+
+	void DeleteCustomIcons( void )
+	{
+		for (int i = 0; i < m_CustomIconList.size(); i++) 
+		{
+			if(m_CustomIconList[i].first)
+				delete m_CustomIconList[i].first;
+
+			m_CustomIconList[i].first = NULL;
+			m_CustomIconList[i].second = "";
+		}
+
+		m_CustomIconList.clear();
+	};
+
+	friend CLabelHeader;
+};
+
+#endif
diff --git a/main/source/cl_dll/vgui_ServerBrowser.cpp b/main/source/cl_dll/vgui_ServerBrowser.cpp
new file mode 100644
index 00000000..0db0d4c5
--- /dev/null
+++ b/main/source/cl_dll/vgui_ServerBrowser.cpp
@@ -0,0 +1,617 @@
+
+#include<VGUI_HeaderPanel.h>
+#include<VGUI_TablePanel.h>
+#include<VGUI_LineBorder.h>
+#include<VGUI_Label.h>
+#include<VGUI_Button.h>
+#include<VGUI_ActionSignal.h>
+
+#include "hud.h"
+#include "cl_util.h"
+#include "hud_servers.h"
+#include "net_api.h"
+
+#include "vgui_TeamFortressViewport.h"
+#include "vgui_ServerBrowser.h"
+
+using namespace vgui;
+
+namespace
+{
+
+#define MAX_SB_ROWS 24
+
+#define NUM_COLUMNS 5
+
+#define HEADER_SIZE_Y			YRES(18)
+
+// Column sizes
+#define CSIZE_ADDRESS			XRES(200)
+#define CSIZE_SERVER			XRES(400) 
+#define CSIZE_MAP				XRES(500)
+#define CSIZE_CURRENT			XRES(570)
+#define CSIZE_PING				XRES(640)
+
+#define CELL_HEIGHT				YRES(15)
+
+class ServerBrowserTablePanel;
+
+class CBrowser_InputSignal : public InputSignal
+{
+private:
+	ServerBrowserTablePanel *m_pBrowser;
+public:
+	CBrowser_InputSignal( ServerBrowserTablePanel *pBrowser )
+	{
+		m_pBrowser = pBrowser;
+	}
+
+	virtual void cursorMoved(int x,int y,Panel* panel) {};
+	virtual void cursorEntered(Panel* panel){};
+	virtual void cursorExited(Panel* Panel) {};
+
+	virtual void mousePressed(MouseCode code,Panel* panel);
+
+	virtual void mouseDoublePressed(MouseCode code,Panel* panel);
+	virtual void mouseReleased(MouseCode code,Panel* panel) {};
+	virtual void mouseWheeled(int delta,Panel* panel) {};
+	virtual void keyPressed(KeyCode code,Panel* panel) {};
+	virtual void keyTyped(KeyCode code,Panel* panel) {};
+	virtual void keyReleased(KeyCode code,Panel* panel) {};
+	virtual void keyFocusTicked(Panel* panel) {};
+};
+
+class ServerBrowserTablePanel : public TablePanel
+{
+private:
+	Label				*m_pLabel;
+	int					m_nMouseOverRow;
+
+public:
+	
+	ServerBrowserTablePanel( int x,int y,int wide,int tall,int columnCount) : TablePanel( x,y,wide,tall,columnCount)
+	{
+		m_pLabel = new Label( "", 0, 0 /*,wide, tall*/ );
+		
+		m_nMouseOverRow = 0;
+	}
+
+public:
+	void setMouseOverRow( int row )
+	{
+		m_nMouseOverRow	= row;
+	}
+
+	void DoSort( char *sortkey )
+	{
+		// Request server list and refresh servers...
+		SortServers( sortkey );
+	}
+
+	void DoRefresh( void )
+	{
+		// Request server list and refresh servers...
+		ServersList();
+		BroadcastServersList( 0 );
+	}
+	
+	void DoBroadcastRefresh( void )
+	{
+		// Request server list and refresh servers...
+		BroadcastServersList( 1 );
+	}
+
+	void DoStop( void )
+	{
+		// Stop requesting
+		ServersCancel();
+	}
+
+	void DoCancel( void )
+	{
+		ClientCmd( "togglebrowser\n" );
+	}
+
+	void DoConnect( void )
+	{
+		const char *info;
+		const char *address;
+		char sz[ 256 ];
+
+		info = ServersGetInfo( m_nMouseOverRow );
+		if ( !info )
+			return;
+
+		address = gEngfuncs.pNetAPI->ValueForKey( info, "address" );
+		//gEngfuncs.Con_Printf( "Connecting to %s\n", address );
+
+		sprintf( sz, "connect %s\n", address );
+
+		ClientCmd( sz );
+
+		DoCancel();
+	}
+
+	void DoPing( void )
+	{
+		ServerPing( 0 );
+		ServerRules( 0 );
+		ServerPlayers( 0 );
+	}
+
+	virtual int getRowCount()
+	{
+		int rowcount;
+		int height, width;
+
+		getSize( width, height );
+
+		// Space for buttons
+		height -= YRES(20);
+		height = max( 0, height );
+
+		rowcount = height / CELL_HEIGHT;
+
+		return rowcount;
+	}
+
+	virtual int getCellTall(int row)
+	{
+		return CELL_HEIGHT - 2;
+	}
+	
+	virtual Panel* getCellRenderer(int column,int row,bool columnSelected,bool rowSelected,bool cellSelected)
+	{
+		const char *info;
+		const char *val, *val2;
+		char sz[ 32 ];
+
+		info = ServersGetInfo( row );
+
+		if ( row == m_nMouseOverRow )
+		{
+			m_pLabel->setFgColor( 200, 240, 63, 100 );
+		}
+		else
+		{
+			m_pLabel->setFgColor( 255, 255, 255, 0 );
+		}
+		m_pLabel->setBgColor( 0, 0, 0, 200 );
+		m_pLabel->setContentAlignment( vgui::Label::a_west );
+		m_pLabel->setFont( Scheme::sf_primary2 );
+
+		if ( info )
+		{
+			// Fill out with the correct data
+			switch ( column )
+			{
+			case 0:
+				val = gEngfuncs.pNetAPI->ValueForKey( info, "address" );
+				if ( val )
+				{
+					strncpy( sz, val, 31 );
+					sz[ 31 ] = '\0';
+					// Server Name;
+					m_pLabel->setText( sz );
+				}
+				break;
+			case 1:
+				val = gEngfuncs.pNetAPI->ValueForKey( info, "hostname" );
+				if ( val )
+				{
+					strncpy( sz, val, 31 );
+					sz[ 31 ] = '\0';
+					// Server Map;
+					m_pLabel->setText( sz );
+				}
+				break;
+			case 2:
+				val = gEngfuncs.pNetAPI->ValueForKey( info, "map" );
+				if ( val )
+				{
+					strncpy( sz, val, 31 );
+					sz[ 31 ] = '\0';
+					// Server Name;
+					m_pLabel->setText( sz );
+				}
+				break;
+			case 3:
+				val = gEngfuncs.pNetAPI->ValueForKey( info, "current" );
+				val2 = gEngfuncs.pNetAPI->ValueForKey( info, "max" );
+				if ( val && val2 )
+				{
+					sprintf( sz, "%s/%s", val, val2 );
+					sz[ 31 ] = '\0';
+					// Server Map;
+					m_pLabel->setText( sz );
+				}
+				break;
+			case 4:
+				val = gEngfuncs.pNetAPI->ValueForKey( info, "ping" );
+				if ( val )
+				{
+					strncpy( sz, val, 31 );
+					sz[ 31 ] = '\0';
+					// Server Name;
+					m_pLabel->setText( sz );
+				}
+				break;
+			default:
+				break;
+			}
+		}
+		else
+		{
+			if ( !row && !column )
+			{
+				if ( ServersIsQuerying() )
+				{
+					m_pLabel->setText( "Waiting for servers to respond..." );
+				}
+				else
+				{
+					m_pLabel->setText( "Press 'Refresh' to search for servers..." );
+				}
+			}
+			else
+			{
+				m_pLabel->setText( "" );
+			}
+		}
+		
+		return m_pLabel;
+	}
+
+	virtual Panel* startCellEditing(int column,int row)
+	{
+		return null;
+	}
+
+};
+
+class ConnectHandler : public ActionSignal
+{
+private:
+	ServerBrowserTablePanel *m_pBrowser;
+
+public:
+	ConnectHandler( ServerBrowserTablePanel *browser )
+	{
+		m_pBrowser = browser;	
+	}
+
+	virtual void actionPerformed( Panel *panel )
+	{
+		m_pBrowser->DoConnect();
+	}
+};
+
+class RefreshHandler : public ActionSignal
+{
+private:
+	ServerBrowserTablePanel *m_pBrowser;
+
+public:
+	RefreshHandler( ServerBrowserTablePanel *browser )
+	{
+		m_pBrowser = browser;	
+	}
+
+	virtual void actionPerformed( Panel *panel )
+	{
+		m_pBrowser->DoRefresh();
+	}
+};
+
+class BroadcastRefreshHandler : public ActionSignal
+{
+private:
+	ServerBrowserTablePanel *m_pBrowser;
+
+public:
+	BroadcastRefreshHandler( ServerBrowserTablePanel *browser )
+	{
+		m_pBrowser = browser;	
+	}
+
+	virtual void actionPerformed( Panel *panel )
+	{
+		m_pBrowser->DoBroadcastRefresh();
+	}
+};
+
+class StopHandler : public ActionSignal
+{
+private:
+	ServerBrowserTablePanel *m_pBrowser;
+
+public:
+	StopHandler( ServerBrowserTablePanel *browser )
+	{
+		m_pBrowser = browser;	
+	}
+
+	virtual void actionPerformed( Panel *panel )
+	{
+		m_pBrowser->DoStop();
+	}
+};
+
+class CancelHandler : public ActionSignal
+{
+private:
+	ServerBrowserTablePanel *m_pBrowser;
+
+public:
+	CancelHandler( ServerBrowserTablePanel *browser )
+	{
+		m_pBrowser = browser;	
+	}
+
+	virtual void actionPerformed( Panel *panel )
+	{
+		m_pBrowser->DoCancel();
+	}
+};
+
+class PingHandler : public ActionSignal
+{
+private:
+	ServerBrowserTablePanel *m_pBrowser;
+
+public:
+	PingHandler( ServerBrowserTablePanel *browser )
+	{
+		m_pBrowser = browser;	
+	}
+
+	virtual void actionPerformed( Panel *panel )
+	{
+		m_pBrowser->DoPing();
+	}
+};
+
+class SortHandler : public ActionSignal
+{
+private:
+	ServerBrowserTablePanel *m_pBrowser;
+
+public:
+	SortHandler( ServerBrowserTablePanel *browser )
+	{
+		m_pBrowser = browser;	
+	}
+
+	virtual void actionPerformed( Panel *panel )
+	{
+		m_pBrowser->DoSort( "map" );
+	}
+};
+
+}
+
+class LabelSortInputHandler : public InputSignal
+{
+private:
+	ServerBrowserTablePanel *m_pBrowser;
+	char m_szSortKey[ 64 ];
+
+public:
+	LabelSortInputHandler( ServerBrowserTablePanel *pBrowser, char *name )
+	{
+		m_pBrowser = pBrowser;
+		strcpy( m_szSortKey, name );
+	}
+
+	virtual void cursorMoved(int x,int y,Panel* panel) {};
+	virtual void cursorEntered(Panel* panel){};
+	virtual void cursorExited(Panel* Panel) {};
+
+	virtual void mousePressed(MouseCode code,Panel* panel)
+	{
+		m_pBrowser->DoSort( m_szSortKey );
+	}
+
+	virtual void mouseDoublePressed(MouseCode code,Panel* panel)
+	{
+		m_pBrowser->DoSort( m_szSortKey );
+	}
+
+	virtual void mouseReleased(MouseCode code,Panel* panel) {};
+	virtual void mouseWheeled(int delta,Panel* panel) {};
+	virtual void keyPressed(KeyCode code,Panel* panel) {};
+	virtual void keyTyped(KeyCode code,Panel* panel) {};
+	virtual void keyReleased(KeyCode code,Panel* panel) {};
+	virtual void keyFocusTicked(Panel* panel) {};
+};
+
+class CSBLabel : public Label
+{
+
+private:
+	char m_szSortKey[ 64 ];
+	ServerBrowserTablePanel *m_pBrowser;
+
+public:
+	CSBLabel( char *name, char *sortkey ) : Label( name )
+	{
+		m_pBrowser = NULL;
+
+		strcpy( m_szSortKey, sortkey );
+
+		int label_bg_r = 120,
+			label_bg_g = 75,
+			label_bg_b = 32,
+			label_bg_a = 200;
+
+		int label_fg_r = 255,
+			label_fg_g = 0,
+			label_fg_b = 0,
+			label_fg_a = 0;
+
+		setContentAlignment( vgui::Label::a_west );
+		setFgColor( label_fg_r, label_fg_g, label_fg_b, label_fg_a );
+		setBgColor( label_bg_r, label_bg_g, label_bg_b, label_bg_a );
+		setFont( Scheme::sf_primary2 );
+
+	}
+
+	void setTable( ServerBrowserTablePanel *browser )
+	{
+		m_pBrowser = browser;
+
+		addInputSignal( new LabelSortInputHandler( (ServerBrowserTablePanel * )m_pBrowser, m_szSortKey ) );
+	}
+};
+
+ServerBrowser::ServerBrowser(int x,int y,int wide,int tall) : CTransparentPanel( 100, x,y,wide,tall )
+{
+	int i;
+
+	_headerPanel = new HeaderPanel(0,0,wide,HEADER_SIZE_Y);
+	_headerPanel->setParent(this);
+	_headerPanel->setFgColor( 100,100,100, 100 );
+	_headerPanel->setBgColor( 0, 0, 0, 100 );
+
+	CSBLabel *pLabel[5];
+	
+	pLabel[0] = new CSBLabel( "Address", "address" );
+	pLabel[1] = new CSBLabel( "Server", "hostname" );
+	pLabel[2] = new CSBLabel( "Map", "map" );
+	pLabel[3] = new CSBLabel( "Current", "current" );
+	pLabel[4] = new CSBLabel( "Latency", "ping" );
+
+	for ( i = 0; i < 5; i++ )
+	{
+		_headerPanel->addSectionPanel( pLabel[i] );
+	}
+
+	// _headerPanel->setFont( Scheme::sf_primary1 );
+
+	_headerPanel->setSliderPos( 0, CSIZE_ADDRESS );
+	_headerPanel->setSliderPos( 1, CSIZE_SERVER );
+	_headerPanel->setSliderPos( 2, CSIZE_MAP );
+	_headerPanel->setSliderPos( 3, CSIZE_CURRENT );
+	_headerPanel->setSliderPos( 4, CSIZE_PING );
+
+	_tablePanel = new ServerBrowserTablePanel( 0, HEADER_SIZE_Y, wide, tall - HEADER_SIZE_Y, NUM_COLUMNS );
+	_tablePanel->setParent(this);
+	_tablePanel->setHeaderPanel(_headerPanel);
+	_tablePanel->setFgColor( 100,100,100, 100 );
+	_tablePanel->setBgColor( 0, 0, 0, 100 );
+
+	_tablePanel->addInputSignal( new CBrowser_InputSignal( (ServerBrowserTablePanel *)_tablePanel ) );
+
+	for ( i = 0; i < 5; i++ )
+	{
+		pLabel[i]->setTable( (ServerBrowserTablePanel * )_tablePanel );
+	}
+
+	int bw = 80, bh = 15;
+	int by = tall - HEADER_SIZE_Y;
+
+	int btnx = 10;
+
+	_connectButton = new CommandButton( "Connect", btnx, by, bw, bh );
+	_connectButton->setParent( this );
+	_connectButton->addActionSignal( new ConnectHandler(  (ServerBrowserTablePanel * )_tablePanel ) );
+
+	btnx += bw;
+
+	_refreshButton = new CommandButton( "Refresh", btnx, by, bw, bh );
+	_refreshButton->setParent( this );
+	_refreshButton->addActionSignal( new RefreshHandler(  (ServerBrowserTablePanel * )_tablePanel ) );
+
+	/*
+	btnx += bw;
+
+	_broadcastRefreshButton = new CommandButton( "LAN", btnx, by, bw, bh );
+	_broadcastRefreshButton->setParent( this );
+	_broadcastRefreshButton->addActionSignal( new BroadcastRefreshHandler(  (ServerBrowserTablePanel * )_tablePanel ) );
+	*/
+
+	btnx += bw;
+
+	_stopButton = new CommandButton( "Stop", btnx, by, bw, bh );
+	_stopButton->setParent( this );
+	_stopButton->addActionSignal( new StopHandler(  (ServerBrowserTablePanel * )_tablePanel ) );
+
+	/*
+	btnx += bw;
+
+	_pingButton = new CommandButton( "Test", btnx, by, bw, bh );
+	_pingButton->setParent( this );
+	_pingButton->addActionSignal( new PingHandler(  (ServerBrowserTablePanel * )_tablePanel ) );
+	
+	btnx += bw;
+
+	_sortButton = new CommandButton( "Sort", btnx, by, bw, bh );
+	_sortButton->setParent( this );
+	_sortButton->addActionSignal( new SortHandler(  (ServerBrowserTablePanel * )_tablePanel ) );
+	*/
+
+	btnx += bw;
+
+	_cancelButton = new CommandButton( "Close", btnx, by, bw, bh );
+	_cancelButton->setParent( this );
+	_cancelButton->addActionSignal( new CancelHandler(  (ServerBrowserTablePanel * )_tablePanel ) );
+
+	setPaintBorderEnabled(false);
+	setPaintBackgroundEnabled(false);
+	setPaintEnabled(false);
+
+}
+
+void ServerBrowser::setSize(int wide,int tall)
+{
+	Panel::setSize(wide,tall);
+
+	_headerPanel->setBounds(0,0,wide,HEADER_SIZE_Y);
+	_tablePanel->setBounds(0,HEADER_SIZE_Y,wide,tall - HEADER_SIZE_Y);
+	
+	_connectButton->setBounds( 5, tall - HEADER_SIZE_Y, 75, 15 );
+	_refreshButton->setBounds( 85, tall - HEADER_SIZE_Y, 75, 15 );
+	/*
+	_broadcastRefreshButton->setBounds( 165, tall - HEADER_SIZE_Y, 75, 15 );
+	*/
+	_stopButton->setBounds( 165, tall - HEADER_SIZE_Y, 75, 15 );
+	/*
+	_pingButton->setBounds( 325, tall - HEADER_SIZE_Y, 75, 15 );
+	*/
+	_cancelButton->setBounds( 245, tall - HEADER_SIZE_Y, 75, 15 );
+}
+
+void CBrowser_InputSignal::mousePressed(MouseCode code,Panel* panel)
+{
+	int x, y;
+	int therow = 2;
+
+	if ( code != MOUSE_LEFT )
+		return;
+
+	panel->getApp()->getCursorPos(x,y);
+	panel->screenToLocal( x, y );
+
+	therow = y / CELL_HEIGHT;
+	
+	// Figure out which row it's on
+	m_pBrowser->setMouseOverRow( therow );
+}
+
+void CBrowser_InputSignal::mouseDoublePressed(MouseCode code,Panel* panel)
+{
+	int x, y;
+	int therow = 2;
+
+	if ( code != MOUSE_LEFT )
+		return;
+
+	panel->getApp()->getCursorPos(x,y);
+	panel->screenToLocal( x, y );
+
+	therow = y / CELL_HEIGHT;
+	
+	// Figure out which row it's on
+	m_pBrowser->setMouseOverRow( therow );
+	m_pBrowser->DoConnect();
+}
diff --git a/main/source/cl_dll/vgui_ServerBrowser.h b/main/source/cl_dll/vgui_ServerBrowser.h
new file mode 100644
index 00000000..7dc819aa
--- /dev/null
+++ b/main/source/cl_dll/vgui_ServerBrowser.h
@@ -0,0 +1,44 @@
+
+#ifndef ServerBrowser_H
+#define ServerBrowser_H
+
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+class Button;
+class TablePanel;
+class HeaderPanel;
+}
+
+class CTransparentPanel;
+class CommandButton;
+
+// Scoreboard positions
+#define SB_X_INDENT				(20 * ((float)ScreenHeight / 640))
+#define SB_Y_INDENT				(20 * ((float)ScreenHeight / 480))
+
+class ServerBrowser : public CTransparentPanel
+{
+private:
+	HeaderPanel * _headerPanel;
+	TablePanel*  _tablePanel;
+
+	CommandButton*	   _connectButton;
+	CommandButton*	   _refreshButton;
+	CommandButton*	   _broadcastRefreshButton;
+	CommandButton*	   _stopButton;
+	CommandButton*	   _sortButton;
+	CommandButton*	   _cancelButton;
+
+	CommandButton*		_pingButton;
+
+public:
+	ServerBrowser(int x,int y,int wide,int tall);
+public:
+	virtual void setSize(int wide,int tall);
+};
+
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/cl_dll/vgui_SpectatorPanel.cpp b/main/source/cl_dll/vgui_SpectatorPanel.cpp
new file mode 100644
index 00000000..7008972f
--- /dev/null
+++ b/main/source/cl_dll/vgui_SpectatorPanel.cpp
@@ -0,0 +1,443 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+// vgui_SpectatorPanel.cpp: implementation of the SpectatorPanel class.
+//
+//////////////////////////////////////////////////////////////////////
+
+#include "hud.h"
+#include "cl_util.h"
+#include "const.h"
+#include "entity_state.h"
+#include "cl_entity.h"
+#include "pm_shared.h"
+#include "vgui_TeamFortressViewport.h"
+#include "vgui_SpectatorPanel.h"
+#include "vgui_scorepanel.h"
+#include "mod/AvHOverviewControl.h"
+
+
+#define BANNER_WIDTH	256
+#define BANNER_HEIGHT	64
+
+
+#define OPTIONS_BUTTON_X 96
+#define CAMOPTIONS_BUTTON_X 200
+
+
+class Spectator_CheckButtonHandler : public ICheckButton2Handler
+{
+
+public:
+
+	Spectator_CheckButtonHandler(SpectatorPanel * panel)
+	{
+		m_pFather = panel;
+	}
+
+	virtual void StateChanged(CCheckButton2* pButton)
+    {
+        m_pFather->StateChanged(pButton);
+    }
+
+private:
+    
+    SpectatorPanel * m_pFather;
+
+};
+
+//////////////////////////////////////////////////////////////////////
+// Construction/Destruction
+//////////////////////////////////////////////////////////////////////
+
+SpectatorPanel::SpectatorPanel(int x,int y,int wide,int tall) : Panel(x,y,wide,tall)
+{
+    m_overviewButton     = NULL;
+    m_autoDirectorButton = NULL;
+    m_firstPersonButton  = NULL;
+    m_overviewControl    = NULL;
+}
+
+SpectatorPanel::~SpectatorPanel()
+{
+
+}
+
+void SpectatorPanel::StateChanged(CCheckButton2* pButton)
+{
+    bool theOverviewMode = false;
+    if(m_overviewButton)
+    {
+        theOverviewMode = m_overviewButton->IsChecked();
+    }
+    gHUD.m_Spectator.SetOverviewMode(theOverviewMode);
+
+    int theMode = OBS_NONE;
+
+    if (m_firstPersonButton->IsChecked())
+    {
+        theMode = OBS_IN_EYE;
+    }
+    else
+    {
+        theMode = OBS_CHASE_LOCKED;
+    }
+    
+    gHUD.m_Spectator.SetMode(theMode);
+
+    if (m_autoDirectorButton != NULL)
+    {
+        if (m_autoDirectorButton->IsChecked())
+        {
+            gEngfuncs.Cvar_SetValue("spec_autodirector", 1);
+        }
+        else
+        {
+            gEngfuncs.Cvar_SetValue("spec_autodirector", 0);
+        }
+    }
+
+    Update(); // Update so that the components reflect the new state.
+
+}
+
+void SpectatorPanel::ActionSignal(int cmd)
+{
+
+	switch (cmd)
+	{
+		/*
+        case SPECTATOR_PANEL_CMD_NONE :			break;
+        */
+
+		case SPECTATOR_PANEL_CMD_PLAYERS :		
+            gViewPort->UpdatePlayerMenu();
+            gViewPort->ShowCommandMenu(gViewPort->m_SpectatorPlayerMenu);
+            break;
+
+		case SPECTATOR_PANEL_CMD_NEXTPLAYER :	gHUD.m_Spectator.FindNextPlayer(true);
+												break;
+
+		case SPECTATOR_PANEL_CMD_PREVPLAYER :	gHUD.m_Spectator.FindNextPlayer(false);
+												break;
+
+    /*
+		case SPECTATOR_PANEL_CMD_HIDEMENU	:	ShowMenu(false); 
+												break;
+
+		case SPECTATOR_PANEL_CMD_CAMERA :		gViewPort->ShowCommandMenu( gViewPort->m_SpectatorCameraMenu );
+												break;
+		
+        */
+		default : 	gEngfuncs.Con_DPrintf("Unknown SpectatorPanel ActionSingal %i.\n",cmd); break;
+	}
+
+}
+
+
+void SpectatorPanel::Initialize()
+{
+	int x,y,wide,tall;
+	
+	getBounds(x,y,wide,tall);
+
+	CSchemeManager * pSchemes = gViewPort->GetSchemeManager();
+
+
+    int colorR = 128 / gHUD.GetGammaSlope();
+    int colorG = 128 / gHUD.GetGammaSlope();
+    int colorB = 128 / gHUD.GetGammaSlope();
+
+    int armedColorR = 255 / gHUD.GetGammaSlope();
+    int armedColorG = 255 / gHUD.GetGammaSlope();
+    int armedColorB = 255 / gHUD.GetGammaSlope();
+
+
+	SchemeHandle_t hSmallScheme = pSchemes->getSchemeHandle( /*"Team Info Text"*/ "PieMenuScheme" );
+	Font* font = pSchemes->getFont(hSmallScheme);
+
+	//m_TopBorder = new CTransparentPanel(64, 0, 0, ScreenWidth, YRES(PANEL_HEIGHT));
+	m_TopBorder = new CTransparentPanel(1, 0, ScreenHeight() - YRES(32), ScreenWidth(), YRES(SPECTATOR_PANEL_HEIGHT));
+    m_TopBorder->setParent(this);
+
+	m_BottomBorder = new CTransparentPanel(1, 0, ScreenHeight() - YRES(32), ScreenWidth(), YRES(SPECTATOR_PANEL_HEIGHT));
+	m_BottomBorder->setParent(this);
+
+	setPaintBackgroundEnabled(false);
+
+	m_ExtraInfo = new Label( "Extra Info", 0, 0, wide, YRES(SPECTATOR_PANEL_HEIGHT) );
+	m_ExtraInfo->setParent(m_TopBorder);
+	m_ExtraInfo->setFont( font );
+
+	m_ExtraInfo->setPaintBackgroundEnabled(false);
+	m_ExtraInfo->setFgColor( 143, 143, 54, 0 );
+	m_ExtraInfo->setContentAlignment( vgui::Label::a_west );
+
+	
+
+	m_TimerImage = new CImageLabel( "timer", 0, 0, 14, 14 );
+	m_TimerImage->setParent(m_TopBorder);
+
+	m_TopBanner = new CImageLabel( "banner", 0, 0, XRES(BANNER_WIDTH), YRES(BANNER_HEIGHT) );
+	m_TopBanner->setParent(this);
+
+	m_CurrentTime = new Label( "00:00", 0, 0, wide, YRES(SPECTATOR_PANEL_HEIGHT) );
+	m_CurrentTime->setParent(m_TopBorder);
+	m_CurrentTime->setFont( pSchemes->getFont(hSmallScheme) );
+	m_CurrentTime->setPaintBackgroundEnabled(false);
+	m_CurrentTime->setFgColor( 143, 143, 54, 0 );
+	m_CurrentTime->setContentAlignment( vgui::Label::a_west );
+
+	m_Separator = new Panel( 0, 0, XRES( 64 ), YRES( 96 ));
+	m_Separator->setParent( m_TopBorder );
+	m_Separator->setFgColor( 59, 58, 34, 48 );
+	m_Separator->setBgColor( 59, 58, 34, 48 );
+	
+	for ( int j= 0; j < TEAM_NUMBER; j++ )
+	{
+		m_TeamScores[j] = new Label( "   ", 0, 0, wide, YRES(SPECTATOR_PANEL_HEIGHT) );
+		m_TeamScores[j]->setParent( m_TopBorder );
+		m_TeamScores[j]->setFont( pSchemes->getFont(hSmallScheme) );
+		m_TeamScores[j]->setPaintBackgroundEnabled(false);
+		m_TeamScores[j]->setFgColor( 143, 143, 54, 0 );
+		m_TeamScores[j]->setContentAlignment( vgui::Label::a_west );
+		m_TeamScores[j]->setVisible ( false );
+	}
+	
+    
+	m_PrevPlayerButton= new ColorButton("<", XRES(390 - 20 - 4), YRES(6), XRES(20), YRES(20), false, false );
+	m_PrevPlayerButton->setParent( m_BottomBorder );
+	m_PrevPlayerButton->setContentAlignment( vgui::Label::a_center );
+	m_PrevPlayerButton->setBoundKey( (char)255 );	// special no bound to avoid leading spaces in name 
+	m_PrevPlayerButton->addActionSignal( new CSpectatorHandler_Command(this,SPECTATOR_PANEL_CMD_PREVPLAYER) );
+	m_PrevPlayerButton->setUnArmedBorderColor ( colorR, colorG, colorB, 0 );
+	m_PrevPlayerButton->setArmedBorderColor ( armedColorR, armedColorR, armedColorR, 0);
+	m_PrevPlayerButton->setUnArmedColor ( colorR, colorG, colorB, 0 );
+	m_PrevPlayerButton->setArmedColor ( armedColorR, armedColorR, armedColorR, 0);
+
+	m_NextPlayerButton= new ColorButton(">", XRES(390 + 200 + 4), YRES(6), XRES(20), YRES(20), false, false );
+	m_NextPlayerButton->setParent( m_BottomBorder );
+	m_NextPlayerButton->setContentAlignment( vgui::Label::a_center );
+	m_NextPlayerButton->setBoundKey( (char)255 );	// special no bound to avoid leading spaces in name 
+	m_NextPlayerButton->addActionSignal( new CSpectatorHandler_Command(this,SPECTATOR_PANEL_CMD_NEXTPLAYER) );
+	m_NextPlayerButton->setUnArmedBorderColor ( colorR, colorG, colorB, 0 );
+	m_NextPlayerButton->setArmedBorderColor ( armedColorR, armedColorR, armedColorR, 0);
+	m_NextPlayerButton->setUnArmedColor ( colorR, colorG, colorB, 0);
+	m_NextPlayerButton->setArmedColor ( armedColorR, armedColorR, armedColorR, 0);
+	
+	// Initialize the bottom title.
+
+    m_BottomMainLabel = new ColorButton( "Spectator Bottom", XRES(390), YRES(6), XRES(200), YRES(20), false, false  );
+	m_BottomMainLabel->setFont(font);
+    m_BottomMainLabel->setParent(m_BottomBorder);
+    m_BottomMainLabel->setContentAlignment( vgui::Label::a_center );
+    m_BottomMainLabel->addActionSignal( new CSpectatorHandler_Command(this,SPECTATOR_PANEL_CMD_PLAYERS) );
+
+	m_BottomMainLabel->setUnArmedBorderColor ( colorR, colorG, colorB, 0);
+	m_BottomMainLabel->setArmedBorderColor ( armedColorR, armedColorR, armedColorR, 0);
+	m_BottomMainLabel->setUnArmedColor ( colorR, colorG, colorB, 0);
+    m_BottomMainLabel->setArmedColor ( armedColorR, armedColorR, armedColorR, 0);
+
+
+
+    m_menuVisible = true;
+
+	m_insetVisible = false;
+
+    m_ExtraInfo->setVisible( false );
+	m_Separator->setVisible( false );
+	m_TimerImage->setVisible( false );
+
+    m_TopBorder->setVisible(true);
+    m_BottomBorder->setVisible( true );
+
+    m_overviewButton = new CCheckButton2();
+    m_overviewButton->setFont(font);
+    m_overviewButton->setParent( m_BottomBorder );
+    m_overviewButton->SetText("Overview");
+    m_overviewButton->setPos(XRES(10), YRES(6));
+    m_overviewButton->setSize(XRES(100), YRES(20));
+    m_overviewButton->SetImages("gfx/vgui/640_checkset.tga", "gfx/vgui/640_checkunset.tga");
+    m_overviewButton->SetHandler(new Spectator_CheckButtonHandler(this));
+    m_overviewButton->SetTextColor(colorR, colorG, colorB, 0);
+
+	m_firstPersonButton = new CCheckButton2();
+    m_firstPersonButton->setFont(font);
+	m_firstPersonButton->setParent( m_BottomBorder );
+    m_firstPersonButton->SetText("First person");
+    m_firstPersonButton->setPos(XRES(10 + 100), YRES(6));
+    m_firstPersonButton->setSize(XRES(100), YRES(20));
+    m_firstPersonButton->SetImages("gfx/vgui/640_checkset.tga", "gfx/vgui/640_checkunset.tga");
+    m_firstPersonButton->SetHandler(new Spectator_CheckButtonHandler(this));
+    m_firstPersonButton->SetTextColor(colorR, colorG, colorB, 0);
+
+    m_autoDirectorButton = new CCheckButton2();
+    m_autoDirectorButton->setFont(font);
+    m_autoDirectorButton->setParent( m_BottomBorder );
+    m_autoDirectorButton->SetText("Auto-director");
+    m_autoDirectorButton->setPos(XRES(10 + 200), YRES(6));
+    m_autoDirectorButton->setSize(XRES(100), YRES(20));
+    m_autoDirectorButton->SetImages("gfx/vgui/640_checkset.tga", "gfx/vgui/640_checkunset.tga");
+    m_autoDirectorButton->SetHandler(new Spectator_CheckButtonHandler(this));
+    m_autoDirectorButton->SetTextColor(colorR, colorG, colorB, 0);
+
+
+/*
+    m_OverviewData.insetWindowX = 4;	// upper left corner
+	m_OverviewData.insetWindowY = 4 + SPECTATOR_PANEL_HEIGHT;
+	m_OverviewData.insetWindowHeight = 180;
+	m_OverviewData.insetWindowWidth = 240;
+
+
+    theDrawInfo.mX = XRES(m_OverviewData.insetWindowX + m_OverviewData.insetWindowWidth + 4);
+    theDrawInfo.mY = YRES(SPECTATOR_PANEL_HEIGHT + 4);
+    theDrawInfo.mWidth  = ScreenWidth() - theDrawInfo.mX - XRES(4);
+    theDrawInfo.mHeight = ScreenHeight() - YRES(SPECTATOR_PANEL_HEIGHT + 4) - theDrawInfo.mY;
+*/
+
+    int theX      = XRES(4 + 240 + 4);
+    int theY      = YRES(SPECTATOR_PANEL_HEIGHT + 4);
+    int theWidth  = ScreenWidth() - theX - XRES(4);
+    int theHeight = ScreenHeight() - YRES(SPECTATOR_PANEL_HEIGHT + 4) - theY;
+
+    m_overviewControl = new AvHOverviewControl;
+    m_overviewControl->setPos(theX, theY);
+    m_overviewControl->setSize(theWidth, theHeight);
+    m_overviewControl->setParent(this);
+
+}
+
+void SpectatorPanel::ShowMenu(bool isVisible)
+{
+
+    if ( !isVisible )
+	{
+		gViewPort->HideCommandMenu();
+	}
+
+	m_menuVisible = isVisible;
+
+	gViewPort->UpdateCursorState();
+
+}
+
+
+void SpectatorPanel::EnableInsetView(bool isEnabled)
+{
+
+
+	int x = gHUD.m_Spectator.m_OverviewData.insetWindowX;
+	int y = gHUD.m_Spectator.m_OverviewData.insetWindowY;
+	int wide = gHUD.m_Spectator.m_OverviewData.insetWindowWidth;
+	int tall = gHUD.m_Spectator.m_OverviewData.insetWindowHeight;
+	int offset = x + wide + 2;
+	
+	if ( isEnabled )
+	{
+		// short black bar to see full inset
+		m_TopBorder->setBounds(	XRES(offset), 0, XRES(640 - offset ), YRES(SPECTATOR_PANEL_HEIGHT) );
+
+		if ( gEngfuncs.IsSpectateOnly() )
+		{
+			m_TopBanner->setVisible( true );
+			m_TopBanner->setPos( XRES(offset), 0 );
+		}
+		else
+			m_TopBanner->setVisible( false );
+		
+	}
+	else
+	{	
+		// full black bar, no inset border
+		// show banner only in real HLTV mode
+		if ( gEngfuncs.IsSpectateOnly() )
+		{
+			m_TopBanner->setVisible( true );
+			m_TopBanner->setPos( 0,0 );
+		}
+		else
+			m_TopBanner->setVisible( false );
+
+		m_TopBorder->setBounds( 0, 0, ScreenWidth(), YRES(SPECTATOR_PANEL_HEIGHT) );
+
+	}
+
+	m_insetVisible = isEnabled;
+
+	Update();
+
+}
+
+
+void SpectatorPanel::Update()
+{
+    
+    // Update the check boxes.
+    m_overviewButton->SetChecked(gHUD.m_Spectator.IsInOverviewMode());
+    m_overviewButton->setVisible(gHUD.GetIsNSMode());
+    
+    m_firstPersonButton->SetChecked(g_iUser1 == OBS_IN_EYE);
+
+    m_autoDirectorButton->SetChecked(CVAR_GET_FLOAT("spec_autodirector") != 0);
+    m_autoDirectorButton->setVisible(gEngfuncs.IsSpectateOnly());
+
+    m_overviewControl->setVisible(gHUD.m_Spectator.IsInOverviewMode());
+
+	int iTextWidth, iTextHeight;
+	int iTimeHeight, iTimeWidth;
+	int offset,j;
+
+    // TODO Max: Figure out what this is for.
+
+	if ( m_insetVisible )
+		offset = gHUD.m_Spectator.m_OverviewData.insetWindowX + gHUD.m_Spectator.m_OverviewData.insetWindowWidth + 2;
+	else
+		offset = 0;
+
+	//bool visible = gHUD.m_Spectator.m_drawstatus->value != 0;
+    bool visible = true;
+	
+	m_ExtraInfo->setVisible( visible );
+	m_TimerImage->setVisible( visible );
+	m_CurrentTime->setVisible( visible );
+	m_Separator->setVisible( visible );
+
+	for ( j= 0; j < TEAM_NUMBER; j++ )
+		m_TeamScores[j]->setVisible( visible );
+
+	if ( !visible )
+		return;
+		
+	m_ExtraInfo->getTextSize( iTextWidth, iTextHeight );
+	m_CurrentTime->getTextSize( iTimeWidth, iTimeHeight );
+
+	iTimeWidth += XRES ( 14 ); // +timer icon
+	iTimeWidth += ( 4-(iTimeWidth%4) );
+
+	if ( iTimeWidth > iTextWidth )
+		iTextWidth = iTimeWidth;
+
+	int xPos = ScreenWidth() - ( iTextWidth + XRES ( 4 + offset ) );
+
+	m_ExtraInfo->setBounds( xPos, YRES( 1 ), iTextWidth, iTextHeight );
+
+	m_TimerImage->setBounds( xPos, YRES( 2 ) + iTextHeight , XRES(14), YRES(14) );
+	
+	m_CurrentTime->setBounds( xPos + XRES ( 14 + 1 ), YRES( 2 ) + iTextHeight , iTimeWidth, iTimeHeight );
+
+	m_Separator->setPos( ScreenWidth() - ( iTextWidth + XRES ( 4+2+4+offset ) ) , YRES( 1 ) );
+	m_Separator->setSize( XRES( 4 ), YRES( SPECTATOR_PANEL_HEIGHT - 2 ) );
+
+	for ( j= 0; j < TEAM_NUMBER; j++ )
+	{
+		int iwidth, iheight;
+			
+		m_TeamScores[j]->getTextSize( iwidth, iheight );
+		m_TeamScores[j]->setBounds( ScreenWidth() - ( iTextWidth + XRES ( 4+2+4+2+offset ) + iwidth ), YRES( 1 ) + ( iheight * j ), iwidth, iheight );
+	}
+
+}
diff --git a/main/source/cl_dll/vgui_SpectatorPanel.h b/main/source/cl_dll/vgui_SpectatorPanel.h
new file mode 100644
index 00000000..008fa5fc
--- /dev/null
+++ b/main/source/cl_dll/vgui_SpectatorPanel.h
@@ -0,0 +1,115 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+// vgui_SpectatorPanel.h: interface for the SpectatorPanel class.
+//
+//////////////////////////////////////////////////////////////////////
+
+#ifndef SPECTATORPANEL_H
+#define SPECTATORPANEL_H
+
+#include <VGUI_Panel.h>
+#include <VGUI_Label.h>
+#include <VGUI_Button.h>
+
+using namespace vgui;
+
+#define SPECTATOR_PANEL_CMD_NONE				0
+
+#define SPECTATOR_PANEL_CMD_OPTIONS				1
+#define	SPECTATOR_PANEL_CMD_PREVPLAYER			2
+#define SPECTATOR_PANEL_CMD_NEXTPLAYER			3
+#define	SPECTATOR_PANEL_CMD_HIDEMENU			4
+#define	SPECTATOR_PANEL_CMD_TOGGLE_INSET		5
+#define SPECTATOR_PANEL_CMD_CAMERA				6
+#define SPECTATOR_PANEL_CMD_PLAYERS				7
+
+
+#define SPECTATOR_PANEL_HEIGHT 32 // Height of the letter box strips.
+
+
+#define TEAM_NUMBER 2
+
+class AvHOverviewControl;
+
+class SpectatorPanel : public Panel //, public vgui::CDefaultInputSignal
+{
+
+public:
+	SpectatorPanel(int x,int y,int wide,int tall);
+	virtual ~SpectatorPanel();
+
+	void			ActionSignal(int cmd);
+    void            StateChanged(CCheckButton2* pButton);
+
+	// InputSignal overrides.
+public:
+	void Initialize();
+	void Update();
+	
+
+
+public:
+
+	void EnableInsetView(bool isEnabled);
+	void ShowMenu(bool isVisible);
+
+	
+	//ColorButton		  *	m_OptionButton;
+	ColorButton	  *	m_PrevPlayerButton;
+	ColorButton	  *	m_NextPlayerButton;
+	//ColorButton     *	m_CamButton;	
+
+	CTransparentPanel *			m_TopBorder;
+	CTransparentPanel *			m_BottomBorder;
+	
+	ColorButton		*m_BottomMainLabel;
+	CImageLabel		*m_TimerImage;
+	Label			*m_CurrentTime;
+	Label			*m_ExtraInfo;
+	Panel			*m_Separator;
+
+	Label			*m_TeamScores[TEAM_NUMBER];
+	
+	CImageLabel		*m_TopBanner;
+
+	bool			m_menuVisible;
+	bool			m_insetVisible;
+
+    // Added by mmcguire.
+    CCheckButton2*      m_overviewButton;
+    CCheckButton2*      m_autoDirectorButton;
+    CCheckButton2*      m_firstPersonButton;
+
+    AvHOverviewControl* m_overviewControl;
+
+};
+
+
+
+class CSpectatorHandler_Command : public ActionSignal
+{
+
+private:
+	SpectatorPanel * m_pFather;
+	int				 m_cmd;
+
+public:
+	CSpectatorHandler_Command( SpectatorPanel * panel, int cmd )
+	{
+		m_pFather = panel;
+		m_cmd = cmd;
+	}
+
+	virtual void actionPerformed( Panel * panel )
+	{
+		m_pFather->ActionSignal(m_cmd);
+	}
+};
+
+
+#endif // !defined SPECTATORPANEL_H
diff --git a/main/source/cl_dll/vgui_TeamFortressViewport.cpp b/main/source/cl_dll/vgui_TeamFortressViewport.cpp
new file mode 100644
index 00000000..7dc48f81
--- /dev/null
+++ b/main/source/cl_dll/vgui_TeamFortressViewport.cpp
@@ -0,0 +1,3225 @@
+//=========== (C) Copyright 1999 Valve, L.L.C. All rights reserved. ===========
+//
+// The copyright to the contents herein is the property of Valve, L.L.C.
+// The contents may be used and/or copied only with the written permission of
+// Valve, L.L.C., or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: Client DLL VGUI Viewport
+//
+// $Workfile:     $
+// $Date: 2002/10/28 20:32:17 $
+//
+//-----------------------------------------------------------------------------
+// $Log: vgui_TeamFortressViewport.cpp,v $
+// Revision 1.12  2002/10/28 20:32:17  Flayra
+// - Don't display disconcerting error message
+//
+// Revision 1.11  2002/10/16 00:37:33  Flayra
+// - Added support for authentication in scoreboard
+//
+// Revision 1.10  2002/07/08 16:15:13  Flayra
+// - Refactored team color management
+//
+// Revision 1.9  2002/04/16 19:32:07  Charlie
+// - Removed crappy way of handling pop-up menu changes, removed pressing enter to go back to RR (was getting in way of chat, now just use "readyroom" - F4 -)
+//
+// Revision 1.8  2002/02/25 20:35:41  Charlie
+// - Added hotgrouping of units and buildings, moving to units or buildings when double-tapping, and camera tracking
+//
+// Revision 1.7  2002/01/30 18:34:32  Charlie
+// - Fixed doubled-cursor problem with scoreboard (only show sprite cursor, not Windows cursor)
+//
+// Revision 1.6  2001/11/13 17:51:02  Charlie
+// - Increased max teams, changed team colors (allow aliens vs. aliens and fronts vs. fronts), general scoreboard support
+//
+// Revision 1.5  2001/10/22 19:26:32  Charlie
+// - Changes to make scoreboard work in commander mode
+//
+// Revision 1.4  2001/09/13 15:01:02  Charlie
+// - Merging with 1108
+//
+// Revision 1.3  2001/06/02 14:26:47  charlie
+// - Commented out UpdateCursorState because it was causing problems (look into this)
+// Revision 1.1.1.1.2.1  2001/09/13 14:42:30  Charlie
+// - HL1108
+//
+// Revision 1.2  2001/04/09 19:31:35  charlie
+// - Quick hacky tests to try out menus for team/class picking...yuck
+//
+// Revision 1.1.1.1  2000/06/17 14:12:45  charlie
+// Final version of new HL SDK.  May not compile.  
+// Previous versions of my MSVC project files and utility .bat files.
+// This is my starting point; there is no mod-specific code in here.
+//
+//
+// $NoKeywords: $
+//=============================================================================
+#include<VGUI_Cursor.h>
+#include<VGUI_Frame.h>
+#include<VGUI_Label.h>
+#include<VGUI_Surface.h>
+#include<VGUI_BorderLayout.h>
+#include<VGUI_Panel.h>
+#include<VGUI_ImagePanel.h>
+#include<VGUI_Button.h>
+#include<VGUI_ActionSignal.h>
+#include<VGUI_InputSignal.h>
+#include<VGUI_MenuSeparator.h>
+#include<VGUI_TextPanel.h>
+#include<VGUI_LoweredBorder.h>
+#include<VGUI_LineBorder.h>
+#include<VGUI_Scheme.h>
+#include<VGUI_Font.h>
+#include<VGUI_App.h>
+#include<VGUI_BuildGroup.h>
+
+#include "hud.h"
+#include "cl_util.h"
+#include "camera.h"
+#include "kbutton.h"
+#include "cvardef.h"
+#include "usercmd.h"
+#include "const.h"
+#include "camera.h"
+#include "in_defs.h"
+#include "parsemsg.h"
+#include "pm_shared.h"
+#include "../engine/keydefs.h"
+#include "demo.h"
+#include "demo_api.h"
+
+#include "vgui_int.h"
+#include "vgui_TeamFortressViewport.h"
+#include "vgui_ServerBrowser.h"
+#include "vgui_ScorePanel.h"
+#include "vgui_SpectatorPanel.h"
+#include "game_shared\vgui_loadtga.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHTitles.h"
+#include "mod/AvHPieMenuHandler.h"
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHCommandConstants.h"
+#include "mod/AvHBalanceAnalysis.h"
+#include "mod/ChatPanel.h"
+
+extern int g_iVisibleMouse;
+class CCommandMenu;
+int g_iPlayerClass;
+int g_iTeamNumber;
+int g_iUser1;
+int g_iUser2;
+int g_iUser3;
+
+// Scoreboard positions
+#define SBOARD_INDENT_X			XRES(75)
+#define SBOARD_INDENT_Y			YRES(40)
+
+// low-res scoreboard indents
+#define SBOARD_INDENT_X_512		30
+#define SBOARD_INDENT_Y_512		30
+
+#define SBOARD_INDENT_X_400		0
+#define SBOARD_INDENT_Y_400		20
+
+
+const int kPlayerMenuWidth = 200;
+
+void IN_ResetMouse( void );
+extern CMenuPanel *CMessageWindowPanel_Create( const char *szMOTD, const char *szTitle, int iShadeFullscreen, int iRemoveMe, int x, int y, int wide, int tall );
+extern float * GetClientColor( int clientIndex );
+
+using namespace vgui;
+
+
+class PlayerButton : public CommandButton
+{
+
+public:
+    
+    PlayerButton(int inPlayerNumber, const char* text,int x,int y,int wide,int tall, bool bNoHighlight, bool bFlat )
+        : CommandButton(text, x, y, wide, tall, bNoHighlight, bFlat)
+    {
+        mPlayerNumber = inPlayerNumber;
+    }
+
+    void paint()
+	{
+    	
+        // Set the color of the button based on the team color (or red if the player is dead).
+
+	    int theTeamNumber = g_PlayerExtraInfo[mPlayerNumber].teamnumber % iNumberOfTeamColors;
+        int r, g, b;
+
+        switch (g_PlayerExtraInfo[mPlayerNumber].playerclass)
+        {
+    
+        case PLAYERCLASS_DEAD_MARINE:
+        case PLAYERCLASS_DEAD_ALIEN:
+        case PLAYERCLASS_REINFORCING:
+            r = 255 / gHUD.GetGammaSlope();
+            g = 0 / gHUD.GetGammaSlope();
+            b = 0 / gHUD.GetGammaSlope();
+            break;
+
+        default:
+            r = kTeamColors[theTeamNumber][0] / gHUD.GetGammaSlope();
+            g = kTeamColors[theTeamNumber][1] / gHUD.GetGammaSlope();
+            b = kTeamColors[theTeamNumber][2] / gHUD.GetGammaSlope();
+            break;
+
+        }
+	        
+        setFgColor(r, g, b, 0);
+
+        Button::paint();
+	
+    }
+
+    void paintBackground()
+    {
+		if ( isArmed() )
+		{
+			// Orange Border
+			drawSetColor(255, 255, 255, 0);
+			drawOutlinedRect(0,0,_size[0],_size[1]);
+		}
+    }
+
+private:
+
+    int mPlayerNumber;
+
+};
+
+
+// Used for Class specific buttons
+char *sTFClasses[] =
+{
+	"",
+	"SCOUT",
+	"SNIPER",
+	"SOLDIER",
+	"DEMOMAN",
+	"MEDIC",
+	"HWGUY",
+	"PYRO",
+	"SPY",
+	"ENGINEER",
+	"CIVILIAN",
+};
+
+char *sLocalisedClasses[] = 
+{
+	"#Civilian",
+	"#Scout",
+	"#Sniper",
+	"#Soldier",
+	"#Demoman",
+	"#Medic",
+	"#HWGuy",
+	"#Pyro",
+	"#Spy",
+	"#Engineer",
+	"#Random",
+	"#Civilian",
+};
+
+char *sTFClassSelection[] = 
+{
+	"civilian",
+	"scout",
+	"sniper",
+	"soldier",
+	"demoman",
+	"medic",
+	"hwguy",
+	"pyro",
+	"spy",
+	"engineer",
+	"randompc",
+	"civilian",
+};
+
+const int kNumOptionsButtons = 4;
+
+char* kOptionsButtons[kNumOptionsButtons*2] =
+{
+	"#Menu_Marine1Team", "jointeamone",
+	"#Menu_Alien1Team", "jointeamtwo",
+	"#Menu_ReadyRoom", "readyroom",
+	"#Menu_LeaveGame", "escape",
+};
+
+int iBuildingCosts[] =
+{
+	BUILD_COST_DISPENSER,
+	BUILD_COST_SENTRYGUN
+};
+
+// This maps class numbers to the Invalid Class bit.
+// This is needed for backwards compatability in maps that were finished before
+// all the classes were in TF. Hence the wacky sequence.
+int sTFValidClassInts[] =
+{
+	0,
+	TF_ILL_SCOUT,
+	TF_ILL_SNIPER,
+	TF_ILL_SOLDIER,
+	TF_ILL_DEMOMAN,
+	TF_ILL_MEDIC,
+	TF_ILL_HVYWEP,
+	TF_ILL_PYRO,
+	TF_ILL_SPY,
+	TF_ILL_ENGINEER,
+	TF_ILL_RANDOMPC,
+};
+
+// Get the name of TGA file, based on GameDir
+char* GetVGUITGAName(const char *pszName)
+{
+	int i;
+	char sz[256]; 
+	static char gd[256]; 
+	const char *gamedir;
+
+	if (ScreenWidth() < 640)
+		i = 320;
+	else
+		i = 640;
+	sprintf(sz, pszName, i);
+
+	gamedir = gEngfuncs.pfnGetGameDirectory();
+	sprintf(gd, "%s/gfx/vgui/%s.tga",gamedir,sz);
+
+	return gd;
+}
+
+//================================================================
+// COMMAND MENU
+//================================================================
+void CCommandMenu::AddButton( CommandButton *pButton )
+{
+	if (m_iButtons >= MAX_BUTTONS)
+		return;
+
+	m_aButtons[m_iButtons] = pButton;
+	m_iButtons++;
+	pButton->setParent( this );
+	pButton->setFont( Scheme::sf_primary3 );
+
+	// give the button a default key binding
+	if ( m_iButtons < 10 )
+	{
+		pButton->setBoundKey( m_iButtons + '0' );
+	}
+	else if ( m_iButtons == 10 )
+	{
+		pButton->setBoundKey( '0' );
+	}
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Tries to find a button that has a key bound to the input, and
+//			presses the button if found
+// Input  : keyNum - the character number of the input key
+// Output : Returns true if the command menu should close, false otherwise
+//-----------------------------------------------------------------------------
+bool CCommandMenu::KeyInput( int keyNum )
+{
+	// loop through all our buttons looking for one bound to keyNum
+	for ( int i = 0; i < m_iButtons; i++ )
+	{
+		if ( !m_aButtons[i]->IsNotValid() )
+		{
+			if ( m_aButtons[i]->getBoundKey() == keyNum )
+			{
+				// hit the button
+				if ( m_aButtons[i]->GetSubMenu() )
+				{
+					// open the sub menu
+					gViewPort->SetCurrentCommandMenu( m_aButtons[i]->GetSubMenu() );
+					return false;
+				}
+				else
+				{
+					// run the bound command
+					m_aButtons[i]->fireActionSignal();
+					return true;
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: clears the current menus buttons of any armed (highlighted) 
+//			state, and all their sub buttons
+//-----------------------------------------------------------------------------
+void CCommandMenu::ClearButtonsOfArmedState( void )
+{
+	for ( int i = 0; i < GetNumButtons(); i++ )
+	{
+		m_aButtons[i]->setArmed( false );
+
+		if ( m_aButtons[i]->GetSubMenu() )
+		{
+			m_aButtons[i]->GetSubMenu()->ClearButtonsOfArmedState();
+		}
+	}
+}
+
+void CCommandMenu::RemoveAllButtons()
+{
+	
+    for ( int i = 0; i < GetNumButtons(); i++ )
+	{
+
+        if ( m_aButtons[i]->GetSubMenu() )
+		{
+			m_aButtons[i]->GetSubMenu()->RemoveAllButtons();
+		}
+        
+        removeChild(m_aButtons[i]);
+        
+        delete m_aButtons[i];
+        m_aButtons[i] = NULL;
+	
+    }
+    
+    m_iButtons = 0;
+
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+// Input  : *pSubMenu - 
+// Output : CommandButton
+//-----------------------------------------------------------------------------
+CommandButton *CCommandMenu::FindButtonWithSubmenu( CCommandMenu *pSubMenu )
+{
+	for ( int i = 0; i < GetNumButtons(); i++ )
+	{
+		if ( m_aButtons[i]->GetSubMenu() == pSubMenu )
+			return m_aButtons[i];
+	}
+
+	return NULL;
+}
+
+// Recalculate the visible buttons
+bool CCommandMenu::RecalculateVisibles( int iYOffset, bool bHideAll )
+{
+	int		i, iCurrentY = 0;
+	int		iVisibleButtons = 0;
+
+	// Cycle through all the buttons in this menu, and see which will be visible
+	for (i = 0; i < m_iButtons; i++)
+	{
+		int iClass = m_aButtons[i]->GetPlayerClass();
+		if ( (iClass && iClass != g_iPlayerClass ) || ( m_aButtons[i]->IsNotValid() ) || bHideAll )
+		{
+			m_aButtons[i]->setVisible( false );
+			if ( m_aButtons[i]->GetSubMenu() != NULL )
+			{
+				(m_aButtons[i]->GetSubMenu())->RecalculateVisibles( 0, true );
+			}
+		}
+		else
+		{
+ 			// If it's got a submenu, force it to check visibilities
+			if ( m_aButtons[i]->GetSubMenu() != NULL )
+			{
+				if ( !(m_aButtons[i]->GetSubMenu())->RecalculateVisibles( 0 , false ) )
+				{
+					// The submenu had no visible buttons, so don't display this button
+					m_aButtons[i]->setVisible( false );
+					continue;
+				}
+			}
+
+			m_aButtons[i]->setVisible( true );
+			iVisibleButtons++;
+		}
+	}
+
+	// Set Size
+	setSize( _size[0], (iVisibleButtons * (m_flButtonSizeY-1)) + 1 );
+
+	if ( iYOffset )
+	{
+		m_iYOffset = iYOffset;
+	}
+
+	for (i = 0; i < m_iButtons; i++)
+	{
+		if ( m_aButtons[i]->isVisible() )
+		{
+			if ( m_aButtons[i]->GetSubMenu() != NULL )
+				(m_aButtons[i]->GetSubMenu())->RecalculateVisibles( iCurrentY + m_iYOffset, false );
+			
+
+			// Make sure it's at the right Y position
+			// m_aButtons[i]->getPos( iXPos, iYPos );
+
+			if ( m_iDirection )
+			{
+				m_aButtons[i]->setPos( 0, (iVisibleButtons-1) * (m_flButtonSizeY-1) - iCurrentY );
+			}
+			else
+			{
+				m_aButtons[i]->setPos( 0, iCurrentY );
+			}
+
+			iCurrentY += (m_flButtonSizeY-1);
+		}
+	}
+
+	return iVisibleButtons?true:false;
+}
+
+// Make sure all submenus can fit on the screen
+void CCommandMenu::RecalculatePositions( int iYOffset )
+{
+	int iTop;
+	int iAdjust = 0;
+
+	m_iYOffset+= iYOffset;
+	if ( m_iDirection )
+		iTop = ScreenHeight() - (m_iYOffset + _size[1] );
+	else
+		iTop = m_iYOffset;
+
+	if ( iTop < 0 )
+		iTop = 0;
+	// Calculate if this is going to fit onscreen, and shuffle it up if it won't
+	int iBottom = iTop + _size[1];
+	if ( iBottom > ScreenHeight() )
+	{
+		// Move in increments of button sizes
+		while (iAdjust < (iBottom - ScreenHeight()))
+		{
+			iAdjust += m_flButtonSizeY - 1;
+		}
+		iTop -= iAdjust;
+
+		// Make sure it doesn't move off the top of the screen (the menu's too big to fit it all)
+		if ( iTop < 0 )
+		{
+			iAdjust -= (0 - iTop);
+			iTop = 0;
+		}
+	}
+
+	setPos( _pos[0], iTop );
+	// We need to force all menus below this one to update their positions now, because they
+	// might have submenus riding off buttons in this menu that have just shifted.
+	for (int i = 0; i < m_iButtons; i++)
+		m_aButtons[i]->UpdateSubMenus( iAdjust );
+}
+
+
+// Make this menu and all menus above it in the chain visible
+void CCommandMenu::MakeVisible( CCommandMenu *pChildMenu )
+{
+/*
+	// Push down the button leading to the child menu
+	for (int i = 0; i < m_iButtons; i++)
+	{
+		if ( (pChildMenu != NULL) && (m_aButtons[i]->GetSubMenu() == pChildMenu) )
+		{
+			m_aButtons[i]->setArmed( true );
+		}
+		else
+		{
+			m_aButtons[i]->setArmed( false );
+		}
+	}
+*/
+
+	setVisible(true);
+	if (m_pParentMenu)
+		m_pParentMenu->MakeVisible( this );
+}
+
+//================================================================
+// CreateSubMenu
+CCommandMenu *TeamFortressViewport::CreateSubMenu( CommandButton *pButton, CCommandMenu *pParentMenu, int iYOffset, int iXOffset )
+{
+	int iXPos = 0;
+	int iYPos = 0;
+	int iWide = CMENU_SIZE_X;
+	int iTall = 0;
+	int iDirection = 0;
+
+	if (pParentMenu)
+	{
+		iXPos = m_pCurrentCommandMenu->GetXOffset() + (CMENU_SIZE_X - 1) + iXOffset;
+		iYPos = m_pCurrentCommandMenu->GetYOffset() + iYOffset;
+		iDirection = pParentMenu->GetDirection();
+	}
+
+	CCommandMenu *pMenu = new CCommandMenu(pParentMenu, iDirection, iXPos, iYPos, iWide, iTall );
+	pMenu->setParent(this);
+	pButton->AddSubMenu( pMenu );
+	pButton->setFont( Scheme::sf_primary3 );
+	pMenu->m_flButtonSizeY = m_pCurrentCommandMenu->m_flButtonSizeY;
+
+	// Create the Submenu-open signal
+	InputSignal *pISignal = new CMenuHandler_PopupSubMenuInput(pButton, pMenu);
+	pButton->addInputSignal(pISignal);
+
+	// Put a > to show it's a submenu
+	CImageLabel *pLabel = new CImageLabel( "arrow", CMENU_SIZE_X - SUBMENU_SIZE_X, SUBMENU_SIZE_Y );
+	pLabel->setParent(pButton);
+	pLabel->addInputSignal(pISignal);
+
+	// Reposition
+	pLabel->getPos( iXPos, iYPos );
+	pLabel->setPos( CMENU_SIZE_X - pLabel->getImageWide(), (BUTTON_SIZE_Y - pLabel->getImageTall()) / 2 );
+
+	// Create the mouse off signal for the Label too
+	if (!pButton->m_bNoHighlight)
+		pLabel->addInputSignal( new CHandler_CommandButtonHighlight(pButton) );
+
+	return pMenu;
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Makes sure the memory allocated for TeamFortressViewport is nulled out
+// Input  : stAllocateBlock - 
+// Output : void *
+//-----------------------------------------------------------------------------
+void *TeamFortressViewport::operator new( size_t stAllocateBlock )
+{
+//	void *mem = Panel::operator new( stAllocateBlock );
+	void *mem = ::operator new( stAllocateBlock );
+	memset( mem, 0, stAllocateBlock );
+	return mem;
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: InputSignal handler for the main viewport
+//-----------------------------------------------------------------------------
+class CViewPortInputHandler : public InputSignal
+{
+public:
+	bool bPressed;
+
+	CViewPortInputHandler()
+	{
+	}
+
+	virtual void cursorMoved(int x,int y,Panel* panel) {}
+	virtual void cursorEntered(Panel* panel) {}
+	virtual void cursorExited(Panel* panel) {}
+	virtual void mousePressed(MouseCode code,Panel* panel) 
+	{
+		if ( code != MOUSE_LEFT )
+		{
+			// send a message to close the command menu
+			// this needs to be a message, since a direct call screws the timing
+			gEngfuncs.pfnClientCmd( "ForceCloseCommandMenu\n" );
+		}
+	}
+	virtual void mouseReleased(MouseCode code,Panel* panel)
+	{
+	}
+
+	virtual void mouseDoublePressed(MouseCode code,Panel* panel) {}
+	virtual void mouseWheeled(int delta,Panel* panel) {}
+	virtual void keyPressed(KeyCode code,Panel* panel) {}
+	virtual void keyTyped(KeyCode code,Panel* panel) {}
+	virtual void keyReleased(KeyCode code,Panel* panel) {}
+	virtual void keyFocusTicked(Panel* panel) {}
+};
+
+
+//================================================================
+TeamFortressViewport::TeamFortressViewport(int x,int y,int wide,int tall) : Panel(x,y,wide,tall), m_SchemeManager(wide,tall)
+{
+	gViewPort = this;
+	m_iInitialized = false;
+	m_pTeamMenu = NULL;
+	m_pClassMenu = NULL;
+	m_pScoreBoard = NULL;
+	mOptionsScreen = NULL;
+	mOptionsButtons = new CommandButton*[kNumOptionsButtons];
+	
+	#ifdef AVH_PLAYTEST_BUILD
+	mPlaytestVariables = new CListBox();
+	memset(this->mOptionsButtons, NULL, sizeof(CommandButton*)*kNumOptionsButtons);
+	mPlaytestAnalysis = new CListBox();
+	#endif
+
+	m_pSpectatorPanel = NULL;
+	m_pCurrentMenu = NULL;
+	m_pCurrentCommandMenu = NULL;
+
+	Initialize();
+	addInputSignal( new CViewPortInputHandler );
+
+	int r, g, b, a;
+	
+	Scheme* pScheme = App::getInstance()->getScheme();
+
+	// primary text color
+	// Get the colors
+	//!! two different types of scheme here, need to integrate
+	SchemeHandle_t hPrimaryScheme = m_SchemeManager.getSchemeHandle( "Primary Button Text" );
+	{
+		// font
+		pScheme->setFont( Scheme::sf_primary1, m_SchemeManager.getFont(hPrimaryScheme) );
+
+		// text color
+		m_SchemeManager.getFgColor( hPrimaryScheme, r, g, b, a );
+		pScheme->setColor(Scheme::sc_primary1, r, g, b, a );		// sc_primary1 is non-transparent orange
+
+		// background color (transparent black)
+		m_SchemeManager.getBgColor( hPrimaryScheme, r, g, b, a );
+		pScheme->setColor(Scheme::sc_primary3, r, g, b, a );
+
+		// armed foreground color
+		m_SchemeManager.getFgArmedColor( hPrimaryScheme, r, g, b, a );
+		pScheme->setColor(Scheme::sc_secondary2, r, g, b, a );
+
+		// armed background color
+		m_SchemeManager.getBgArmedColor( hPrimaryScheme, r, g, b, a );
+		pScheme->setColor(Scheme::sc_primary2, r, g, b, a );
+
+		//!! need to get this color from scheme file
+		// used for orange borders around buttons
+		m_SchemeManager.getBorderColor( hPrimaryScheme, r, g, b, a );
+		// pScheme->setColor(Scheme::sc_secondary1, r, g, b, a );
+		pScheme->setColor(Scheme::sc_secondary1, 255*0.7, 170*0.7, 0, 0);
+	}
+
+	// Change the second primary font (used in the scoreboard)
+	SchemeHandle_t hScoreboardScheme = m_SchemeManager.getSchemeHandle( "Scoreboard Text" );
+	{
+		pScheme->setFont(Scheme::sf_primary2, m_SchemeManager.getFont(hScoreboardScheme) );
+	}
+	
+	// Change the third primary font (used in command menu)
+	SchemeHandle_t hCommandMenuScheme = m_SchemeManager.getSchemeHandle( "CommandMenu Text" );
+	{
+		pScheme->setFont(Scheme::sf_primary3, m_SchemeManager.getFont(hCommandMenuScheme) );
+	}
+
+	App::getInstance()->setScheme(pScheme);
+
+	// VGUI MENUS
+	CreateTeamMenu();
+	CreateClassMenu();
+	CreateSpectatorMenu();
+	CreateScoreBoard();
+	CreateOptionsMenu();
+	// Init command menus
+	m_iNumMenus = 0;
+	m_iCurrentTeamNumber = m_iUser1 = m_iUser2 = m_iUser3 = 0;
+
+	m_StandardMenu = CreateCommandMenu("commandmenu.txt", 0, CMENU_TOP, false, CMENU_SIZE_X, BUTTON_SIZE_Y, 0 );
+	m_SpectatorOptionsMenu = CreateCommandMenu("spectatormenu.txt", 1, YRES(32), true, CMENU_SIZE_X, BUTTON_SIZE_Y / 2, 0 );	// above bottom bar, flat design
+	m_SpectatorCameraMenu = CreateCommandMenu("spectcammenu.txt", 1, YRES(32), true, XRES( 200 ), BUTTON_SIZE_Y / 2, ScreenWidth() - ( XRES ( 200 ) + 15 ) );	// above bottom bar, flat design
+
+    CreatePlayerMenu();
+
+	CreateServerBrowser();
+
+	m_chatPanel = new ChatPanel(10, (ScreenHeight() * 0.75 - 30) / 2, ScreenWidth() - 20, 30);
+    m_chatPanel->setParent(this);
+    m_chatPanel->setVisible(false);
+
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Called everytime a new level is started. Viewport clears out it's data.
+//-----------------------------------------------------------------------------
+void TeamFortressViewport::Initialize( void )
+{
+	// Force each menu to Initialize
+	if (m_pTeamMenu)
+	{
+		m_pTeamMenu->Initialize();
+	}
+	if (m_pClassMenu)
+	{
+		m_pClassMenu->Initialize();
+	}
+	if (m_pScoreBoard)
+	{
+		m_pScoreBoard->Initialize();
+		HideScoreBoard();
+	}
+//	if(mOptionsScreen)
+//	{
+//		mOptionsScreen->Initialize();
+//	}
+	if (m_pSpectatorPanel)
+	{
+		// Spectator menu doesn't need initializing
+		m_pSpectatorPanel->setVisible( false );
+	}
+
+	// Make sure all menus are hidden
+	HideVGUIMenu();
+	HideCommandMenu();
+
+	// Clear out some data
+	m_iGotAllMOTD = true;
+	m_iRandomPC = false;
+	m_flScoreBoardLastUpdated = 0;
+	m_flSpectatorPanelLastUpdated = 0;
+
+	// reset player info
+	g_iPlayerClass = 0;
+	g_iTeamNumber = 0;
+
+	memset(this->m_sMapName, 0, MAX_MAPNAME_LENGTH);
+	memset(this->m_szServerName, 0, MAX_SERVERNAME_LENGTH);
+	for (int i = 0; i < 5; i++)
+	{
+		m_iValidClasses[i] = 0;
+		strcpy(m_sTeamNames[i], "");
+	}
+
+	#ifdef AVH_PLAYTEST_BUILD
+	this->mBalanceChanged = false;
+	#endif
+
+	App::getInstance()->setCursorOveride( App::getInstance()->getScheme()->getCursor(Scheme::SchemeCursor::scu_none) );
+}
+
+class CException;
+//-----------------------------------------------------------------------------
+// Purpose: Read the Command Menu structure from the txt file and create the menu.
+//			Returns Index of menu in m_pCommandMenus
+//-----------------------------------------------------------------------------
+int TeamFortressViewport::CreateCommandMenu( char * menuFile, int direction, int yOffset, bool flatDesign, float flButtonSizeX, float flButtonSizeY, int xOffset )
+{
+	// COMMAND MENU
+	// Create the root of this new Command Menu
+
+	int newIndex = m_iNumMenus;
+	
+	m_pCommandMenus[newIndex] = new CCommandMenu(NULL, direction, xOffset, yOffset, flButtonSizeX, 300);	// This will be resized once we know how many items are in it
+	m_pCommandMenus[newIndex]->setParent(this);
+	m_pCommandMenus[newIndex]->setVisible(false);
+	m_pCommandMenus[newIndex]->m_flButtonSizeY = flButtonSizeY;
+	m_pCommandMenus[newIndex]->m_iSpectCmdMenu = direction;
+
+	m_iNumMenus++;
+
+	// Read Command Menu from the txt file
+	char token[1024];
+	char *pfile = (char*)gEngfuncs.COM_LoadFile( menuFile, 5, NULL);
+	if (!pfile)
+	{
+		gEngfuncs.Con_DPrintf( "Unable to open %s\n", menuFile);
+		SetCurrentCommandMenu( NULL );
+		return newIndex;
+	}
+
+try
+{
+	// First, read in the localisation strings
+
+	// Detpack strings
+	gHUD.m_TextMessage.LocaliseTextString( "#DetpackSet_For5Seconds",   m_sDetpackStrings[0], MAX_BUTTON_SIZE );
+	gHUD.m_TextMessage.LocaliseTextString( "#DetpackSet_For20Seconds",   m_sDetpackStrings[1], MAX_BUTTON_SIZE );
+	gHUD.m_TextMessage.LocaliseTextString( "#DetpackSet_For50Seconds",   m_sDetpackStrings[2], MAX_BUTTON_SIZE );
+
+	// Now start parsing the menu structure
+	m_pCurrentCommandMenu = m_pCommandMenus[newIndex];
+	char szLastButtonText[32] = "file start";
+	pfile = gEngfuncs.COM_ParseFile(pfile, token);
+	while ( ( strlen ( token ) > 0 ) && ( m_iNumMenus < MAX_MENUS ) )
+	{
+		// Keep looping until we hit the end of this menu
+		while ( token[0] != '}' && ( strlen( token ) > 0 ) )
+		{
+			char cText[32] = "";
+			char cBoundKey[32] = "";
+			char cCustom[32] = "";
+			static const int cCommandLength = 128;
+			char cCommand[cCommandLength] = "";
+			char szMap[MAX_MAPNAME] = "";
+			int	 iPlayerClass = 0;
+			int  iCustom = false;
+			int  iTeamOnly = -1;
+			int  iToggle = 0;
+			int  iButtonY;
+			bool bGetExtraToken = true;
+			CommandButton *pButton = NULL;
+			
+			// We should never be here without a Command Menu
+			if (!m_pCurrentCommandMenu)
+			{
+				gEngfuncs.Con_Printf("Error in %s file after '%s'.\n",menuFile, szLastButtonText );
+				m_iInitialized = false;
+				return newIndex;
+			}
+
+			// token should already be the bound key, or the custom name
+			strncpy( cCustom, token, 32 );
+			cCustom[31] = '\0';
+
+			// See if it's a custom button
+			if (!strcmp(cCustom, "CUSTOM") )
+			{
+				iCustom = true;
+
+				// Get the next token
+				pfile = gEngfuncs.COM_ParseFile(pfile, token);
+			}
+			// See if it's a map
+			else if (!strcmp(cCustom, "MAP") )
+			{
+				// Get the mapname
+				pfile = gEngfuncs.COM_ParseFile(pfile, token);
+				strncpy( szMap, token, MAX_MAPNAME );
+				szMap[MAX_MAPNAME-1] = '\0';
+
+				// Get the next token
+				pfile = gEngfuncs.COM_ParseFile(pfile, token);
+			}
+			else if ( !strncmp(cCustom, "TEAM", 4) ) // TEAM1, TEAM2, TEAM3, TEAM4
+			{
+				// make it a team only button
+				iTeamOnly = atoi( cCustom + 4 );
+				
+				// Get the next token
+				pfile = gEngfuncs.COM_ParseFile(pfile, token);
+			}
+			else if ( !strncmp(cCustom, "TOGGLE", 6) ) 
+			{
+				iToggle = true;
+				// Get the next token
+				pfile = gEngfuncs.COM_ParseFile(pfile, token);
+			}
+			else
+			{
+				// See if it's a Class
+				for (int i = 1; i <= PC_ENGINEER; i++)
+				{
+					if ( !strcmp(token, sTFClasses[i]) )
+					{
+						// Save it off
+						iPlayerClass = i;
+
+						// Get the button text
+						pfile = gEngfuncs.COM_ParseFile(pfile, token);
+						break;
+					}
+				}
+			}
+
+			// Get the button bound key
+			strncpy( cBoundKey, token, 32 );
+			cText[31] = '\0';
+
+			// Get the button text
+			pfile = gEngfuncs.COM_ParseFile(pfile, token);
+			strncpy( cText, token, 32 );
+			cText[31] = '\0';
+
+			// save off the last button text we've come across (for error reporting)
+			strcpy( szLastButtonText, cText );
+
+			// Get the button command
+			pfile = gEngfuncs.COM_ParseFile(pfile, token);
+			strncpy( cCommand, token, cCommandLength );
+			cCommand[cCommandLength - 1] = '\0';
+
+			iButtonY = (BUTTON_SIZE_Y-1) * m_pCurrentCommandMenu->GetNumButtons();
+			// Custom button handling
+			if ( iCustom )
+			{
+				pButton = CreateCustomButton( cText, cCommand, iButtonY );
+
+				// Get the next token to see if we're a menu
+				pfile = gEngfuncs.COM_ParseFile(pfile, token);
+
+				if ( token[0] == '{' )
+				{
+					strcpy( cCommand, token );
+				}
+				else
+				{
+					bGetExtraToken = false;
+				}
+			}
+			else if ( szMap[0] != '\0' )
+			{
+				// create a map button
+				pButton = new MapButton(szMap, cText, xOffset, iButtonY, flButtonSizeX, flButtonSizeY );
+			}
+			else if ( iTeamOnly != -1)
+			{
+				// button that only shows up if the player is on team iTeamOnly
+				pButton = new TeamOnlyCommandButton( iTeamOnly, cText, xOffset, iButtonY, flButtonSizeX, flButtonSizeY, flatDesign );
+			}
+			else if ( iToggle && direction == 0 )
+			{
+				pButton = new ToggleCommandButton( cCommand, cText, xOffset, iButtonY, flButtonSizeX, flButtonSizeY, flatDesign );
+			}
+			else if ( direction == 1 )
+			{
+				if ( iToggle )
+					pButton = new SpectToggleButton( cCommand, cText, xOffset, iButtonY, flButtonSizeX, flButtonSizeY, flatDesign );
+				else
+					pButton = new SpectButton( iPlayerClass, cText, xOffset, iButtonY, flButtonSizeX, flButtonSizeY );
+			}
+			else
+			{
+				// normal button
+				pButton = new CommandButton( iPlayerClass, cText, xOffset, iButtonY, flButtonSizeX, flButtonSizeY, flatDesign );
+			}
+
+			// add the button into the command menu
+			if ( pButton )
+			{
+				m_pCurrentCommandMenu->AddButton( pButton );
+				pButton->setBoundKey( cBoundKey[0] );
+				pButton->setParentMenu( m_pCurrentCommandMenu );
+
+				// Override font in CommandMenu
+				pButton->setFont( Scheme::sf_primary3 );
+			}
+
+			// Find out if it's a submenu or a button we're dealing with
+			if ( cCommand[0] == '{' )
+			{
+				if ( m_iNumMenus >= MAX_MENUS )
+				{
+					gEngfuncs.Con_Printf( "Too many menus in %s past '%s'\n",menuFile, szLastButtonText );
+				}
+				else
+				{
+					// Create the menu
+					m_pCommandMenus[m_iNumMenus] = CreateSubMenu(pButton, m_pCurrentCommandMenu, iButtonY );
+					m_pCurrentCommandMenu = m_pCommandMenus[m_iNumMenus];
+					m_iNumMenus++;
+				}
+			}
+			else if ( !iCustom )
+			{
+				// Create the button and attach it to the current menu
+				if ( iToggle )
+					pButton->addActionSignal(new CMenuHandler_ToggleCvar(cCommand));
+				else
+					pButton->addActionSignal(new CMenuHandler_StringCommand(cCommand));
+				// Create an input signal that'll popup the current menu
+				pButton->addInputSignal( new CMenuHandler_PopupSubMenuInput(pButton, m_pCurrentCommandMenu) );
+			}
+
+			// Get the next token
+			if ( bGetExtraToken )
+			{
+				pfile = gEngfuncs.COM_ParseFile(pfile, token);
+			}
+		}
+
+		// Move back up a menu
+		m_pCurrentCommandMenu = m_pCurrentCommandMenu->GetParentMenu();
+
+		pfile = gEngfuncs.COM_ParseFile(pfile, token);
+	}
+}
+catch( CException *e )
+{
+	e;
+	//e->Delete();
+	e = NULL;
+	m_iInitialized = false;
+	return newIndex;
+}
+
+	SetCurrentMenu( NULL );
+	SetCurrentCommandMenu( NULL );
+	gEngfuncs.COM_FreeFile( pfile );
+
+	m_iInitialized = true;
+	return newIndex;
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Creates all the class choices under a spy's disguise menus, and
+//			maps a command to them
+// Output : CCommandMenu
+//-----------------------------------------------------------------------------
+CCommandMenu *TeamFortressViewport::CreateDisguiseSubmenu( CommandButton *pButton, CCommandMenu *pParentMenu, const char *commandText, int iYOffset, int iXOffset )
+{
+	// create the submenu, under which the class choices will be listed
+	CCommandMenu *pMenu = CreateSubMenu( pButton, pParentMenu, iYOffset, iXOffset );
+	m_pCommandMenus[m_iNumMenus] = pMenu;
+	m_iNumMenus++;
+
+	// create the class choice buttons
+	for ( int i = PC_SCOUT; i <= PC_ENGINEER; i++ )
+	{
+		CommandButton *pDisguiseButton = new CommandButton( CHudTextMessage::BufferedLocaliseTextString( sLocalisedClasses[i] ), 0, BUTTON_SIZE_Y, CMENU_SIZE_X, BUTTON_SIZE_Y );
+		
+		char sz[256]; 
+		sprintf(sz, "%s %d", commandText, i );
+		pDisguiseButton->addActionSignal(new CMenuHandler_StringCommand(sz));
+		
+		pMenu->AddButton( pDisguiseButton );
+	}
+	
+	return pMenu;
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+// Input  : *pButtonText - 
+//			*pButtonName - 
+// Output : CommandButton
+//-----------------------------------------------------------------------------
+CommandButton *TeamFortressViewport::CreateCustomButton( char *pButtonText, char *pButtonName, int iYOffset )
+{
+	CommandButton *pButton = NULL;
+	CCommandMenu  *pMenu = NULL;
+
+	// ChangeTeam
+	if ( !strcmp( pButtonName, "!CHANGETEAM" ) )
+	{
+		// ChangeTeam Submenu
+		pButton = new CommandButton(pButtonText, 0, BUTTON_SIZE_Y * 2, CMENU_SIZE_X, BUTTON_SIZE_Y);
+
+		// Create the submenu
+		pMenu = CreateSubMenu(pButton, m_pCurrentCommandMenu, iYOffset );
+		m_pCommandMenus[m_iNumMenus] = pMenu;
+		m_iNumMenus++;
+
+		// ChangeTeam buttons
+		for (int i = 0; i < 4; i++)
+		{
+			char sz[256]; 
+			sprintf(sz, "jointeam %d", i+1);
+			m_pTeamButtons[i] = new TeamButton(i+1, "teamname", 0, BUTTON_SIZE_Y, CMENU_SIZE_X, BUTTON_SIZE_Y);
+			m_pTeamButtons[i]->addActionSignal(new CMenuHandler_StringCommandWatch( sz ));
+			pMenu->AddButton( m_pTeamButtons[i] ); 
+		}
+
+		// Auto Assign button
+		m_pTeamButtons[4] = new TeamButton(5, gHUD.m_TextMessage.BufferedLocaliseTextString( "#Team_AutoAssign" ), 0, BUTTON_SIZE_Y, CMENU_SIZE_X, BUTTON_SIZE_Y);
+		m_pTeamButtons[4]->addActionSignal(new CMenuHandler_StringCommand( "jointeam 5" ));
+		pMenu->AddButton( m_pTeamButtons[4] ); 
+
+		// Spectate button
+		m_pTeamButtons[5] = new SpectateButton( CHudTextMessage::BufferedLocaliseTextString( "#Menu_Spectate" ), 0, BUTTON_SIZE_Y, CMENU_SIZE_X, BUTTON_SIZE_Y, false);
+		m_pTeamButtons[5]->addActionSignal(new CMenuHandler_StringCommand( "spectate" ));
+		pMenu->AddButton( m_pTeamButtons[5] ); 
+	}
+	// ChangeClass
+	else if ( !strcmp( pButtonName, "!CHANGECLASS" ) )
+	{
+		// Create the Change class menu
+		pButton = new ClassButton(-1, pButtonText, 0, BUTTON_SIZE_Y, CMENU_SIZE_X, BUTTON_SIZE_Y, false);
+
+		// ChangeClass Submenu
+		pMenu = CreateSubMenu(pButton, m_pCurrentCommandMenu, iYOffset );
+		m_pCommandMenus[m_iNumMenus] = pMenu;
+		m_iNumMenus++;
+
+		for (int i = PC_SCOUT; i <= PC_RANDOM; i++ )
+		{
+			char sz[256]; 
+
+			// ChangeClass buttons
+			CHudTextMessage::LocaliseTextString( sLocalisedClasses[i], sz, 256 );
+			ClassButton *pClassButton = new ClassButton( i, sz, 0, BUTTON_SIZE_Y, CMENU_SIZE_X, BUTTON_SIZE_Y, false);
+
+			sprintf(sz, "%s", sTFClassSelection[i]);
+			pClassButton->addActionSignal(new CMenuHandler_StringCommandClassSelect(sz));
+			pMenu->AddButton( pClassButton );
+		}
+	}
+	// Map Briefing
+	else if ( !strcmp( pButtonName, "!MAPBRIEFING" ) )
+	{
+		pButton = new CommandButton(pButtonText, 0, BUTTON_SIZE_Y * m_pCurrentCommandMenu->GetNumButtons(), CMENU_SIZE_X, BUTTON_SIZE_Y);
+		pButton->addActionSignal(new CMenuHandler_TextWindow(MENU_MAPBRIEFING));
+		// Create an input signal that'll popup the current menu
+		pButton->addInputSignal( new CMenuHandler_PopupSubMenuInput(pButton, m_pCurrentCommandMenu) );
+	}
+	// Class Descriptions
+	else if ( !strcmp( pButtonName, "!CLASSDESC" ) )
+	{
+		pButton = new ClassButton(0, pButtonText, 0, BUTTON_SIZE_Y * m_pCurrentCommandMenu->GetNumButtons(), CMENU_SIZE_X, BUTTON_SIZE_Y, false);
+		pButton->addActionSignal(new CMenuHandler_TextWindow(MENU_CLASSHELP));
+		// Create an input signal that'll popup the current menu
+		pButton->addInputSignal( new CMenuHandler_PopupSubMenuInput(pButton, m_pCurrentCommandMenu) );
+	}
+	else if ( !strcmp( pButtonName, "!SERVERINFO" ) )
+	{
+		pButton = new ClassButton(0, pButtonText, 0, BUTTON_SIZE_Y * m_pCurrentCommandMenu->GetNumButtons(), CMENU_SIZE_X, BUTTON_SIZE_Y, false);
+		pButton->addActionSignal(new CMenuHandler_TextWindow(MENU_INTRO));
+		// Create an input signal that'll popup the current menu
+		pButton->addInputSignal( new CMenuHandler_PopupSubMenuInput(pButton, m_pCurrentCommandMenu) );
+	}
+	// Spy abilities
+	else if ( !strcmp( pButtonName, "!SPY" ) )
+	{
+		pButton = new DisguiseButton( 0, pButtonText, 0, BUTTON_SIZE_Y, CMENU_SIZE_X, BUTTON_SIZE_Y );
+	}
+	// Feign
+	else if ( !strcmp( pButtonName, "!FEIGN" ) )
+	{
+		pButton = new FeignButton(FALSE, pButtonText, 0, BUTTON_SIZE_Y, CMENU_SIZE_X, BUTTON_SIZE_Y);
+		pButton->addActionSignal(new CMenuHandler_StringCommand( "feign" ));
+		// Create an input signal that'll popup the current menu
+		pButton->addInputSignal( new CMenuHandler_PopupSubMenuInput(pButton, m_pCurrentCommandMenu) );
+	}
+	// Feign Silently
+	else if ( !strcmp( pButtonName, "!FEIGNSILENT" ) )
+	{
+		pButton = new FeignButton(FALSE, pButtonText, 0, BUTTON_SIZE_Y, CMENU_SIZE_X, BUTTON_SIZE_Y);
+		pButton->addActionSignal(new CMenuHandler_StringCommand( "sfeign" ));
+		// Create an input signal that'll popup the current menu
+		pButton->addInputSignal( new CMenuHandler_PopupSubMenuInput(pButton, m_pCurrentCommandMenu) );
+	}
+	// Stop Feigning
+	else if ( !strcmp( pButtonName, "!FEIGNSTOP" ) )
+	{
+		pButton = new FeignButton(TRUE, pButtonText, 0, BUTTON_SIZE_Y, CMENU_SIZE_X, BUTTON_SIZE_Y);
+		pButton->addActionSignal(new CMenuHandler_StringCommand( "feign" ));
+		// Create an input signal that'll popup the current menu
+		pButton->addInputSignal( new CMenuHandler_PopupSubMenuInput(pButton, m_pCurrentCommandMenu) );
+	}
+	// Disguise
+	else if ( !strcmp( pButtonName, "!DISGUISEENEMY" ) )
+	{
+		// Create the disguise enemy button, which active only if there are 2 teams
+		pButton = new DisguiseButton(DISGUISE_TEAM2, pButtonText, 0, BUTTON_SIZE_Y, CMENU_SIZE_X, BUTTON_SIZE_Y);
+		CreateDisguiseSubmenu( pButton, m_pCurrentCommandMenu, "disguise_enemy", iYOffset);
+	}
+	else if ( !strcmp( pButtonName, "!DISGUISEFRIENDLY" ) )
+	{
+		// Create the disguise friendly button, which active only if there are 1 or 2 teams
+		pButton = new DisguiseButton(DISGUISE_TEAM1 | DISGUISE_TEAM2, pButtonText, 0, BUTTON_SIZE_Y, CMENU_SIZE_X, BUTTON_SIZE_Y);
+		CreateDisguiseSubmenu( pButton, m_pCurrentCommandMenu, "disguise_friendly", iYOffset );
+	}
+	else if ( !strcmp( pButtonName, "!DISGUISE" ) )
+	{
+		// Create the Disguise button
+		pButton = new DisguiseButton( DISGUISE_TEAM3 | DISGUISE_TEAM4, pButtonText, 0, BUTTON_SIZE_Y, CMENU_SIZE_X, BUTTON_SIZE_Y);
+		CCommandMenu *pDisguiseMenu = CreateSubMenu( pButton, m_pCurrentCommandMenu, iYOffset );
+		m_pCommandMenus[m_iNumMenus] = pDisguiseMenu;
+		m_iNumMenus++;
+
+		// Disguise Enemy submenu buttons
+		for ( int i = 1; i <= 4; i++ )
+		{
+			// only show the 4th disguise button if we have 4 teams
+			m_pDisguiseButtons[i] = new DisguiseButton( ((i < 4) ? DISGUISE_TEAM3 : 0) | DISGUISE_TEAM4, "Disguise", 0, BUTTON_SIZE_Y, CMENU_SIZE_X, BUTTON_SIZE_Y);
+
+			pDisguiseMenu->AddButton( m_pDisguiseButtons[i] );
+			m_pDisguiseButtons[i]->setParentMenu( pDisguiseMenu );
+
+			char sz[256]; 
+			sprintf( sz, "disguise %d", i );
+			CreateDisguiseSubmenu( m_pDisguiseButtons[i], pDisguiseMenu, sz, iYOffset, CMENU_SIZE_X - 1 );
+		}
+	}
+	// Start setting a Detpack
+	else if ( !strcmp( pButtonName, "!DETPACKSTART" ) )
+	{
+		// Detpack Submenu
+		pButton = new DetpackButton(2, pButtonText, 0, BUTTON_SIZE_Y * 2, CMENU_SIZE_X, BUTTON_SIZE_Y);
+
+		// Create the submenu
+		pMenu = CreateSubMenu(pButton, m_pCurrentCommandMenu, iYOffset );
+		m_pCommandMenus[m_iNumMenus] = pMenu;
+		m_iNumMenus++;
+
+		// Set detpack buttons
+		CommandButton *pDetButton;
+		pDetButton = new CommandButton(m_sDetpackStrings[0], 0, BUTTON_SIZE_Y, CMENU_SIZE_X, BUTTON_SIZE_Y);
+		pDetButton->addActionSignal(new CMenuHandler_StringCommand("detstart 5"));
+		pMenu->AddButton( pDetButton );
+		pDetButton = new CommandButton(m_sDetpackStrings[1], 0, BUTTON_SIZE_Y, CMENU_SIZE_X, BUTTON_SIZE_Y);
+		pDetButton->addActionSignal(new CMenuHandler_StringCommand("detstart 20"));
+		pMenu->AddButton( pDetButton );
+		pDetButton = new CommandButton(m_sDetpackStrings[2], 0, BUTTON_SIZE_Y, CMENU_SIZE_X, BUTTON_SIZE_Y);
+		pDetButton->addActionSignal(new CMenuHandler_StringCommand("detstart 50"));
+		pMenu->AddButton( pDetButton );
+	}
+	// Stop setting a Detpack
+	else if ( !strcmp( pButtonName, "!DETPACKSTOP" ) )
+	{
+		pButton = new DetpackButton(1, pButtonText, 0, BUTTON_SIZE_Y, CMENU_SIZE_X, BUTTON_SIZE_Y);
+		pButton->addActionSignal(new CMenuHandler_StringCommand( "detstop" ));
+		// Create an input signal that'll popup the current menu
+		pButton->addInputSignal( new CMenuHandler_PopupSubMenuInput(pButton, m_pCurrentCommandMenu) );
+	}
+	// Engineer building
+	else if ( !strcmp( pButtonName, "!BUILD" ) )
+	{
+		// only appears if the player is an engineer, and either they have built something or have enough metal to build
+		pButton = new BuildButton( BUILDSTATE_BASE, 0, pButtonText, 0, BUTTON_SIZE_Y * 2, CMENU_SIZE_X, BUTTON_SIZE_Y);
+	}
+	else if ( !strcmp( pButtonName, "!BUILDSENTRY" ) )
+	{
+		pButton = new BuildButton( BUILDSTATE_CANBUILD, BuildButton::SENTRYGUN, pButtonText, 0, BUTTON_SIZE_Y * 2, CMENU_SIZE_X, BUTTON_SIZE_Y);
+		pButton->addActionSignal(new CMenuHandler_StringCommand("build 2"));
+		// Create an input signal that'll popup the current menu
+		pButton->addInputSignal( new CMenuHandler_PopupSubMenuInput(pButton, m_pCurrentCommandMenu) );
+	}
+	else if ( !strcmp( pButtonName, "!BUILDDISPENSER" ) )
+	{
+		pButton = new BuildButton( BUILDSTATE_CANBUILD, BuildButton::DISPENSER, pButtonText, 0, BUTTON_SIZE_Y * 2, CMENU_SIZE_X, BUTTON_SIZE_Y);
+		pButton->addActionSignal(new CMenuHandler_StringCommand("build 1"));
+		// Create an input signal that'll popup the current menu
+		pButton->addInputSignal( new CMenuHandler_PopupSubMenuInput(pButton, m_pCurrentCommandMenu) );
+	}
+	else if ( !strcmp( pButtonName, "!ROTATESENTRY180" ) )
+	{
+		pButton = new BuildButton( BUILDSTATE_HASBUILDING, BuildButton::SENTRYGUN, pButtonText, 0, BUTTON_SIZE_Y * 2, CMENU_SIZE_X, BUTTON_SIZE_Y);
+		pButton->addActionSignal(new CMenuHandler_StringCommand("rotatesentry180"));
+		// Create an input signal that'll popup the current menu
+		pButton->addInputSignal( new CMenuHandler_PopupSubMenuInput(pButton, m_pCurrentCommandMenu) );
+	}
+	else if ( !strcmp( pButtonName, "!ROTATESENTRY" ) )
+	{
+		pButton = new BuildButton( BUILDSTATE_HASBUILDING, BuildButton::SENTRYGUN, pButtonText, 0, BUTTON_SIZE_Y * 2, CMENU_SIZE_X, BUTTON_SIZE_Y);
+		pButton->addActionSignal(new CMenuHandler_StringCommand("rotatesentry"));
+		// Create an input signal that'll popup the current menu
+		pButton->addInputSignal( new CMenuHandler_PopupSubMenuInput(pButton, m_pCurrentCommandMenu) );
+	}
+	else if ( !strcmp( pButtonName, "!DISMANTLEDISPENSER" ) )
+	{
+		pButton = new BuildButton( BUILDSTATE_HASBUILDING, BuildButton::DISPENSER, pButtonText, 0, BUTTON_SIZE_Y * 2, CMENU_SIZE_X, BUTTON_SIZE_Y);
+		pButton->addActionSignal(new CMenuHandler_StringCommand("dismantle 1"));
+		// Create an input signal that'll popup the current menu
+		pButton->addInputSignal( new CMenuHandler_PopupSubMenuInput(pButton, m_pCurrentCommandMenu) );
+	}
+	else if ( !strcmp( pButtonName, "!DISMANTLESENTRY" ) )
+	{
+		pButton = new BuildButton( BUILDSTATE_HASBUILDING, BuildButton::SENTRYGUN, pButtonText, 0, BUTTON_SIZE_Y * 2, CMENU_SIZE_X, BUTTON_SIZE_Y);
+		pButton->addActionSignal(new CMenuHandler_StringCommand("dismantle 2"));
+		// Create an input signal that'll popup the current menu
+		pButton->addInputSignal( new CMenuHandler_PopupSubMenuInput(pButton, m_pCurrentCommandMenu) );
+	}
+	else if ( !strcmp( pButtonName, "!DETONATEDISPENSER" ) )
+	{
+		pButton = new BuildButton( BUILDSTATE_HASBUILDING, BuildButton::DISPENSER, pButtonText, 0, BUTTON_SIZE_Y * 2, CMENU_SIZE_X, BUTTON_SIZE_Y);
+		pButton->addActionSignal(new CMenuHandler_StringCommand("detdispenser"));
+		// Create an input signal that'll popup the current menu
+		pButton->addInputSignal( new CMenuHandler_PopupSubMenuInput(pButton, m_pCurrentCommandMenu) );
+	}
+	else if ( !strcmp( pButtonName, "!DETONATESENTRY" ) )
+	{
+		pButton = new BuildButton( BUILDSTATE_HASBUILDING, BuildButton::SENTRYGUN, pButtonText, 0, BUTTON_SIZE_Y * 2, CMENU_SIZE_X, BUTTON_SIZE_Y);
+		pButton->addActionSignal(new CMenuHandler_StringCommand("detsentry"));
+		// Create an input signal that'll popup the current menu
+		pButton->addInputSignal( new CMenuHandler_PopupSubMenuInput(pButton, m_pCurrentCommandMenu) );
+	}
+	// Stop building
+	else if ( !strcmp( pButtonName, "!BUILDSTOP" ) )
+	{
+		pButton = new BuildButton( BUILDSTATE_BUILDING, 0, pButtonText, 0, BUTTON_SIZE_Y * 2, CMENU_SIZE_X, BUTTON_SIZE_Y);
+		pButton->addActionSignal(new CMenuHandler_StringCommand("build"));
+		// Create an input signal that'll popup the current menu
+		pButton->addInputSignal( new CMenuHandler_PopupSubMenuInput(pButton, m_pCurrentCommandMenu) );
+	}
+
+	return pButton;
+}
+
+void TeamFortressViewport::ToggleServerBrowser()
+{
+	if (!m_iInitialized)
+		return;
+
+	if ( !m_pServerBrowser )
+		return;
+
+	if ( m_pServerBrowser->isVisible() )
+	{
+		m_pServerBrowser->setVisible( false );
+	}
+	else
+	{
+		m_pServerBrowser->setVisible( true );
+	}
+
+	UpdateCursorState();
+}
+
+//=======================================================================
+void TeamFortressViewport::ShowCommandMenu(int menuIndex)
+{
+	if (!m_iInitialized)
+		return;
+
+	//Already have a menu open.
+	if ( m_pCurrentMenu )  
+		return;
+
+	// is the command menu open?
+	if ( m_pCurrentCommandMenu == m_pCommandMenus[menuIndex] )
+	{
+		HideCommandMenu();
+		return;
+	}
+
+	// Not visible while in intermission
+	if ( gHUD.m_iIntermission )
+		return;
+
+	// Recalculate visible menus
+	UpdateCommandMenu( menuIndex );
+	HideVGUIMenu();
+
+	SetCurrentCommandMenu( m_pCommandMenus[menuIndex] );
+	m_flMenuOpenTime = gHUD.m_flTime;
+	UpdateCursorState();
+
+	// get command menu parameters
+	for ( int i = 2; i < gEngfuncs.Cmd_Argc(); i++ )
+	{
+		const char *param = gEngfuncs.Cmd_Argv( i - 1 );
+		if ( param )
+		{
+			if ( m_pCurrentCommandMenu->KeyInput(param[0]) )
+			{
+				// kill the menu open time, since the key input is final
+				HideCommandMenu();
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Handles the key input of "-commandmenu"
+// Input  : 
+//-----------------------------------------------------------------------------
+void TeamFortressViewport::InputSignalHideCommandMenu()
+{
+	if (!m_iInitialized)
+		return;
+
+	// if they've just tapped the command menu key, leave it open
+	if ( (m_flMenuOpenTime + 0.3) > gHUD.m_flTime )
+		return;
+
+	HideCommandMenu();
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Hides the command menu
+//-----------------------------------------------------------------------------
+void TeamFortressViewport::HideCommandMenu()
+{
+	if (!m_iInitialized)
+		return;
+
+	if ( m_pCommandMenus[m_StandardMenu] )
+	{
+		m_pCommandMenus[m_StandardMenu]->ClearButtonsOfArmedState();
+	}
+
+	if ( m_pCommandMenus[m_SpectatorOptionsMenu] )
+	{
+		m_pCommandMenus[m_SpectatorOptionsMenu]->ClearButtonsOfArmedState();
+	}
+
+	if ( m_pCommandMenus[m_SpectatorCameraMenu] )
+	{
+		m_pCommandMenus[m_SpectatorCameraMenu]->ClearButtonsOfArmedState();
+	}
+
+	m_flMenuOpenTime = 0.0f;
+	SetCurrentCommandMenu( NULL );
+	UpdateCursorState();
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Bring up the scoreboard
+//-----------------------------------------------------------------------------
+void TeamFortressViewport::ShowScoreBoard( void )
+{
+	if (m_pScoreBoard)
+	{
+		// No Scoreboard in single-player
+		if ( gEngfuncs.GetMaxClients() > 1 )
+		{
+			if(gHUD.SwitchUIMode(SCOREBOARD_MODE))
+			{
+				m_pScoreBoard->Open();
+				
+				// TODO: HLSDK 2.3 requires this?
+				//UpdateCursorState();
+
+				// If cursor is visible, set squelch mode automatically (used for commander)
+				if(gHUD.GetIsInTopDownMode())
+				{
+					m_pScoreBoard->SetSquelchMode(true);
+				}
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Returns true if the scoreboard is up
+//-----------------------------------------------------------------------------
+bool TeamFortressViewport::IsScoreBoardVisible( void )
+{
+	if (m_pScoreBoard)
+		return m_pScoreBoard->isVisible();
+
+	return false;
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Hide the scoreboard
+//-----------------------------------------------------------------------------
+const float kButtonWidth = .15f;
+const float kButtonHeight = .08f;
+const float kButtonHorizontalSpacing = .15f;
+const float kButtonVerticalSpacing = .05f;
+const float xInset = .05f;
+const float yInset = .07f;
+
+void TeamFortressViewport::HideScoreBoard( void )
+{
+	// Prevent removal of scoreboard during intermission
+	if ( gHUD.m_iIntermission )
+		return;
+
+	if (m_pScoreBoard && m_pScoreBoard->isVisible())
+	{
+		// Hide other components
+		if(gHUD.SwitchUIMode(MAIN_MODE))
+		{
+			m_pScoreBoard->setVisible(false);
+			
+			//GetClientVoiceMgr()->StopSquelchMode();
+			m_pScoreBoard->SetSquelchMode(false);
+			
+			//UpdateCursorState();
+		}
+	}
+}
+
+void TeamFortressViewport::ShowOptionsMenu()
+{
+	if(this->mOptionsScreen)
+	{
+		const char* theSound = AvHSHUGetCommonSoundName(gHUD.GetIsAlien(), WEAPON_SOUND_HUD_ON);
+		gHUD.PlayHUDSound(theSound, kHUDSoundVolume);
+
+		this->mOptionsScreen->setVisible(true);
+
+		for(int i = 0; i < kNumOptionsButtons; i++)
+		{
+			if(this->mOptionsButtons[i])
+			{
+				this->mOptionsButtons[i]->setVisible(true);
+			}
+		}
+
+		#ifdef AVH_PLAYTEST_BUILD
+		this->mNSLogoLabel->setVisible(true);
+
+		// Only create control if server sent them down
+		const BalanceIntListType& theBalanceInts = gHUD.GetBalanceInts();
+		int theNumBalanceInts = theBalanceInts.size();
+		if(this->mPlaytestVariables && (theNumBalanceInts > 0))
+		{
+			// Clear out existing entries
+			this->mPlaytestVariables->Init();
+
+			// Populate playtest info
+			this->mPlaytestVariableRow = 0;
+			for(BalanceIntListType::const_iterator theIter = theBalanceInts.begin(); theIter != theBalanceInts.end(); theIter++)
+			{
+				this->AddBalanceVariable(theIter->first);
+			}
+
+			const BalanceFloatListType& theBalanceFloats = gHUD.GetBalanceFloats();
+			for(BalanceFloatListType::const_iterator theFloatIter = theBalanceFloats.begin(); theFloatIter != theBalanceFloats.end(); theFloatIter++)
+			{
+				this->AddBalanceVariable(theFloatIter->first);
+			}
+
+			this->mPlaytestVariables->setSize(this->mPlaytestVariableWidth, this->mPlaytestVariableHeight);
+			this->mPlaytestVariables->setVisible(true);
+		}
+
+		if(this->mPlaytestAnalysis)
+		{
+			this->mPlaytestAnalysis->setSize(this->mPlaytestAnalysisWidth, this->mPlaytestAnalysisHeight);
+			this->mPlaytestAnalysis->setVisible(true);
+		}
+
+		this->mPlaytestVariableValue->addInputSignal(&this->mPlaytestInputSignal);
+		this->mPlaytestVariableValue->setSize(kButtonWidth*ScreenWidth(), kButtonHeight*ScreenHeight());
+		this->mPlaytestVariableValue->setParent(this->mOptionsScreen);
+//		this->mPlaytestVariableValue->setFont(Scheme::sf_primary1);
+		this->mPlaytestVariableValue->setVisible(true);
+		this->mPlaytestVariableValue->setText(this->mPlaytestVariableValueBeforeHide.c_str(), this->mPlaytestVariableValueBeforeHide.length());
+
+		this->mPlaytestVariableName.setVisible(true);
+		#endif
+
+		//this->mOptionsEscapeButton->setVisible(true);
+		gHUD.GetManager().SetMouseVisibility(true);
+	}
+}
+
+#ifdef AVH_PLAYTEST_BUILD
+
+Color kPlaytestEntryLabelBGColor(0, 0, 0, 50);
+Color kPlaytestEntryLabelFGColor(255, 255, 255, 70);
+Color kPlaytestEntryLabelSelectedBGColor(0, 0, 0, 50);
+Color kPlaytestEntryLabelSelectedFGColor(255, 255, 255, 0);
+
+void TeamFortressViewport::AddAnalysisLine(const string& inAnalysisLine)
+{
+	// Add entry
+	vgui::Label* theCurrentLabel = this->mPlaytestAnalysisLabels + this->mPlaytestAnalysisRow;
+	string theLabelText = inAnalysisLine;
+	theCurrentLabel->setText(theLabelText.c_str());
+	theCurrentLabel->setVisible(true);
+	theCurrentLabel->setSize(this->mPlaytestAnalysisWidth, kButtonHeight*ScreenHeight());
+	theCurrentLabel->setParent(this->mOptionsScreen);
+	//theCurrentLabel->addInputSignal(&this->mPlaytestInputSignal);
+	
+	int theR, theG, theB, theA;
+	kPlaytestEntryLabelFGColor.getColor(theR, theG, theB, theA);
+	theCurrentLabel->setFgColor(theR, theG, theB, theA);
+	theCurrentLabel->setBgColor(kPlaytestEntryLabelBGColor);
+	
+	theCurrentLabel->setFont(Scheme::sf_primary1);
+	theCurrentLabel->setContentAlignment(vgui::Label::a_west);
+	
+	this->mPlaytestAnalysis->AddItem(this->mPlaytestAnalysisLabels + this->mPlaytestAnalysisRow);
+	
+	this->mPlaytestAnalysisRow++;
+}
+
+void TeamFortressViewport::RecomputeAnalysis()
+{
+	if(this->mPlaytestAnalysis)
+	{
+		//this->mPlaytestAnalysis->setVisible(false);
+
+		this->mPlaytestAnalysis->Init();
+		this->mPlaytestAnalysisRow = 0;
+		
+		// Fetch list of balance strings
+		StringList theBalanceAnalyses;
+		AvHBAComputeAnalysis(theBalanceAnalyses);
+		
+		// Add them
+		for(StringList::const_iterator theIter = theBalanceAnalyses.begin(); theIter != theBalanceAnalyses.end(); theIter++)
+		{
+			this->AddAnalysisLine(*theIter);
+		}
+		
+		//this->mPlaytestAnalysis->setVisible(true);
+	}
+}
+
+
+void TeamFortressViewport::AddBalanceVariable(const	string& inVariableName)
+{
+	// Add entry
+	vgui::Label* theCurrentLabel = this->mPlaytestEntryLabels + this->mPlaytestVariableRow;
+	string theLabelText = inVariableName;
+	theCurrentLabel->setText(theLabelText.c_str());
+	theCurrentLabel->setVisible(true);
+	theCurrentLabel->setSize(this->mPlaytestVariableWidth, kButtonHeight*ScreenHeight());
+	theCurrentLabel->setParent(this->mOptionsScreen);
+	theCurrentLabel->addInputSignal(&this->mPlaytestInputSignal);
+	
+	int theR, theG, theB, theA;
+	kPlaytestEntryLabelFGColor.getColor(theR, theG, theB, theA);
+	theCurrentLabel->setFgColor(theR, theG, theB, theA);
+	theCurrentLabel->setBgColor(kPlaytestEntryLabelBGColor);
+
+	theCurrentLabel->setFont(Scheme::sf_primary1);
+	theCurrentLabel->setContentAlignment(vgui::Label::a_west);
+	
+	this->mPlaytestVariables->AddItem(this->mPlaytestEntryLabels + this->mPlaytestVariableRow);
+
+	this->mPlaytestVariableRow++;
+}
+
+// Input signal for playtest labels in options menu
+void OptionsScreenInputSignal::SelectLabel(Panel* inPanel)
+{
+	SmartLabel* theLabel = dynamic_cast<SmartLabel*>(inPanel);
+	
+	if(theLabel)
+	{
+		// Look up variable name
+		string theString = theLabel->getText();
+		
+		float theValue = 0.0f;
+		bool theFoundValue = false;
+		bool theFoundFloat = false;
+		
+		const BalanceIntListType& theBalanceInts = gHUD.GetBalanceInts();
+		for(BalanceIntListType::const_iterator theIter = theBalanceInts.begin(); theIter != theBalanceInts.end(); theIter++)
+		{
+			if(theIter->first == theString)
+			{
+				theValue = theIter->second;
+				theFoundValue = true;
+				break;
+			}
+		}
+		
+		if(!theFoundValue)
+		{
+			const BalanceFloatListType& theBalanceFloats = gHUD.GetBalanceFloats();
+			for(BalanceFloatListType::const_iterator theIter = theBalanceFloats.begin(); theIter != theBalanceFloats.end(); theIter++)
+			{
+				if(theIter->first == theString)
+				{
+					theValue = theIter->second;
+					theFoundValue = true;
+					theFoundFloat = true;
+					break;
+				}
+			}
+		}
+		
+		if(theFoundValue)
+		{
+			const char* theSound = AvHSHUGetCommonSoundName(gHUD.GetIsAlien(), WEAPON_SOUND_MOVE_SELECT);
+			gHUD.PlayHUDSound(theSound, kHUDSoundVolume);
+
+			// Read value from this label
+			gViewPort->mPlaytestVariableName.setText(theString.length(), theString.c_str());
+			
+			// Set text entry value
+			char theReadableValue[1024];
+			if(theFoundFloat)
+			{
+				sprintf(theReadableValue, "%.2f", theValue);
+			}
+			else
+			{
+				sprintf(theReadableValue, "%d", (int)theValue);
+			}
+			
+			gViewPort->mPlaytestVariableValue->setText(theReadableValue, strlen(theReadableValue));
+		}
+	}
+}
+
+
+void OptionsScreenInputSignal::cursorMoved(int x,int y,Panel* panel)
+{
+}
+
+void OptionsScreenInputSignal::cursorEntered(Panel* inPanel)
+{
+	SmartLabel* theCurrentLabel = dynamic_cast<SmartLabel*>(inPanel);
+	if(theCurrentLabel)
+	{
+		int theR, theG, theB, theA;
+		kPlaytestEntryLabelSelectedFGColor.getColor(theR, theG, theB, theA);
+		theCurrentLabel->setFgColor(theR, theG, theB, theA);
+		
+		theCurrentLabel->setBgColor(kPlaytestEntryLabelSelectedBGColor);
+	}
+}
+
+void OptionsScreenInputSignal::cursorExited(Panel* inPanel)
+{
+	SmartLabel* theCurrentLabel = dynamic_cast<SmartLabel*>(inPanel);
+	if(theCurrentLabel)
+	{
+		int theR, theG, theB, theA;
+		kPlaytestEntryLabelFGColor.getColor(theR, theG, theB, theA);
+		theCurrentLabel->setFgColor(theR, theG, theB, theA);
+		
+		theCurrentLabel->setBgColor(kPlaytestEntryLabelBGColor);
+	}
+}
+
+void OptionsScreenInputSignal::mousePressed(MouseCode code,Panel* panel)
+{
+	if(code == MOUSE_LEFT)
+	{
+		this->SelectLabel(panel);
+	}
+}
+
+void OptionsScreenInputSignal::mouseDoublePressed(MouseCode code,Panel* panel)
+{
+}
+
+void OptionsScreenInputSignal::mouseReleased(MouseCode code,Panel* panel)
+{
+}
+
+void OptionsScreenInputSignal::mouseWheeled(int delta,Panel* panel)
+{
+}
+
+void OptionsScreenInputSignal::keyPressed(KeyCode code,Panel* panel)
+{
+}
+
+void OptionsScreenInputSignal::keyTyped(KeyCode code, Panel* panel)
+{
+	if((panel == gViewPort->mPlaytestVariableValue) && (code == KEY_ENTER))
+	{
+		// Read variable name
+		string theVariableName = gViewPort->mPlaytestVariableName.getText();
+		
+		// Read variable value out of text entry
+		char theBuff[256];
+		gViewPort->mPlaytestVariableValue->getText(0, theBuff, 256);
+		string theValue(theBuff);
+
+		// Emit console command to change this value
+		string theConsoleCommand = string(kcSetBalanceVar) + " " + theVariableName + " " + theValue;
+
+		char theBuff2[256];
+		sprintf(theBuff2, "%s", theConsoleCommand.c_str());
+		gEngfuncs.pfnClientCmd(theBuff2);
+	}
+}
+
+void OptionsScreenInputSignal::keyReleased(KeyCode code,Panel* panel)
+{
+}
+
+void OptionsScreenInputSignal::keyFocusTicked(Panel* panel)
+{
+}
+#endif
+
+
+
+void TeamFortressViewport::HideOptionsMenu()
+{
+	if(this->mOptionsScreen)
+	{
+		const char* theSound = AvHSHUGetCommonSoundName(gHUD.GetIsAlien(), WEAPON_SOUND_HUD_OFF);
+		gHUD.PlayHUDSound(theSound, kHUDSoundVolume);
+		
+		this->mOptionsScreen->setVisible(false);
+		for(int i = 0; i < kNumOptionsButtons; i++)
+		{
+			if(this->mOptionsButtons[i])
+			{
+				this->mOptionsButtons[i]->setVisible(false);
+			}
+		}
+		
+		#ifdef AVH_PLAYTEST_BUILD
+		this->mNSLogoLabel->setVisible(false);
+
+		if(this->mPlaytestVariables)
+		{
+			this->mPlaytestVariables->setVisible(false);
+			this->mPlaytestVariables->setBgColor(128, 128, 128, 10);
+			this->mPlaytestVariables->setFgColor(128, 128, 128, 40);
+		}
+
+		if(this->mPlaytestAnalysis)
+		{
+			this->mPlaytestAnalysis->setVisible(false);
+			this->mPlaytestAnalysis->setBgColor(128, 128, 128, 10);
+			this->mPlaytestAnalysis->setFgColor(128, 128, 128, 40);
+		}
+
+		this->mPlaytestVariableValue->setVisible(false);
+		this->mPlaytestVariableValue->removeInputSignal(&this->mPlaytestInputSignal);
+
+		// Save text of the value so we can restore it when the screen comes back up (can't figure out way to turn off input)
+		char theText[1024];
+		this->mPlaytestVariableValue->getText(0, theText, 1024);
+		this->mPlaytestVariableValueBeforeHide = "";
+		if(theText[0] != '\0')
+		{
+			this->mPlaytestVariableValueBeforeHide = string(theText);
+		}
+
+		this->mPlaytestVariableValue->requestFocusNext(); 
+
+		this->mPlaytestVariableName.setVisible(false);
+		#endif
+
+		gHUD.GetManager().SetMouseVisibility(false);
+
+		gEngfuncs.pfnSetMousePos(gEngfuncs.GetWindowCenterX(), gEngfuncs.GetWindowCenterY());
+	}
+}
+
+bool TeamFortressViewport::IsOptionsMenuVisible()
+{
+	bool theIsVisible = false;
+
+	if(this->mOptionsScreen)
+	{
+		theIsVisible = this->mOptionsScreen->isVisible();
+	}
+
+	return theIsVisible;
+}
+
+
+//-----------------------------------------------------------------------------
+// Purpose: Activate's the player special ability
+//			called when the player hits their "special" key
+//-----------------------------------------------------------------------------
+void TeamFortressViewport::InputPlayerSpecial( void )
+{
+	if (!m_iInitialized)
+		return;
+
+	if ( g_iPlayerClass == PC_ENGINEER || g_iPlayerClass == PC_SPY )
+	{
+		ShowCommandMenu( gViewPort->m_StandardMenu );
+
+		if ( m_pCurrentCommandMenu )
+		{
+			m_pCurrentCommandMenu->KeyInput( '7' );
+		}
+	}
+	else
+	{
+		// if it's any other class, just send the command down to the server
+		ClientCmd( "_special" );
+	}
+}
+
+// Set the submenu of the Command Menu
+void TeamFortressViewport::SetCurrentCommandMenu( CCommandMenu *pNewMenu )
+{
+	for (int i = 0; i < m_iNumMenus; i++)
+		m_pCommandMenus[i]->setVisible(false);
+
+	m_pCurrentCommandMenu = pNewMenu;
+
+	if (m_pCurrentCommandMenu)
+		m_pCurrentCommandMenu->MakeVisible( NULL );
+}
+
+void TeamFortressViewport::UpdateCommandMenu(int menuIndex)
+{
+	m_pCommandMenus[menuIndex]->RecalculateVisibles( 0, false );
+	m_pCommandMenus[menuIndex]->RecalculatePositions( 0 );
+}
+
+void COM_FileBase ( const char *in, char *out);
+
+void TeamFortressViewport::UpdateSpectatorPanel()
+{
+	m_iUser1 = g_iUser1;
+	m_iUser2 = g_iUser2;
+	m_iUser3 = g_iUser3;
+		
+	if (!m_pSpectatorPanel)
+		return;
+
+	if ( g_iUser1 && gHUD.m_pCvarDraw->value && !gHUD.m_iIntermission)	// don't draw in dev_overview mode
+	{
+		char bottomText[128];
+		char helpString2[128];
+		char * name;
+		int player = 0;
+
+		// check if spectator combinations are still valid
+		gHUD.m_Spectator.CheckSettings();
+
+		if ( !m_pSpectatorPanel->isVisible() )
+		{
+			m_pSpectatorPanel->setVisible( true );	// show spectator panel, but
+			m_pSpectatorPanel->ShowMenu( true );
+			
+            // Removed by mmcguire.
+            // This text isn't applicable anymore.            
+
+            /*
+    		char tempString[128];
+
+            _snprintf( tempString, sizeof( tempString ) - 1, "%c%s", HUD_PRINTCENTER, CHudTextMessage::BufferedLocaliseTextString( "#Spec_Duck" ) );
+			tempString[ sizeof( tempString ) - 1 ] = '\0';
+
+			gHUD.m_TextMessage.MsgFunc_TextMsg( NULL, strlen( tempString ) + 1, tempString );
+            */
+		}
+		
+		sprintf(bottomText,"#Spec_Mode%d", g_iUser1 );
+		sprintf(helpString2,"#Spec_Mode%d", g_iUser1 );
+
+		if ( gEngfuncs.IsSpectateOnly() )
+			strcat(helpString2, " - HLTV");
+
+		// check if we're locked onto a target, show the player's name
+		if ( (g_iUser2 > 0) && (g_iUser2 <= gEngfuncs.GetMaxClients()) && (g_iUser1 != OBS_ROAMING) )
+		{
+			player = g_iUser2;
+		}
+
+        name = g_PlayerInfoList[player].name;
+
+		// create player & health string
+		if ( player && name )
+		{
+			strcpy( bottomText, name );
+		}
+/*
+		// in first person mode colorize player names
+		if ( (g_iUser1 == OBS_IN_EYE) && player )
+		{
+			float * color = GetClientColor( player );
+			int r = color[0]*255;
+			int g = color[1]*255;
+			int b = color[2]*255;
+			
+			// set team color, a bit transparent
+			m_pSpectatorPanel->m_BottomMainLabel->setFgColor(r,g,b,0);
+		}
+		else
+		{	// restore GUI color
+			m_pSpectatorPanel->m_BottomMainLabel->setFgColor( 143, 143, 54, 0 );
+		}
+*/
+		// add sting auto if we are in auto directed mode
+		if ( CVAR_GET_FLOAT("spec_autodirector") != 0 )
+		{
+			char tempString[128];
+			sprintf(tempString, "#Spec_Auto %s", helpString2);
+			strcpy( helpString2, tempString );
+		}
+
+		m_pSpectatorPanel->m_BottomMainLabel->setText( CHudTextMessage::BufferedLocaliseTextString( bottomText ) );
+
+		
+		// update extra info field
+		char szText[64];
+
+		if ( gEngfuncs.IsSpectateOnly() )
+		{
+			// in HLTV mode show number of spectators
+            _snprintf( szText, 63, "%s: %d", CHudTextMessage::BufferedLocaliseTextString( "#Spectators" ), gHUD.m_Spectator.m_iSpectatorNumber );
+		}
+		else
+		{
+			// otherwise show map name
+			char szMapName[64];
+			COM_FileBase( gEngfuncs.pfnGetLevelName(), szMapName );
+
+			_snprintf ( szText, 63, "%s: %s",CHudTextMessage::BufferedLocaliseTextString( "#Spec_Map" ), szMapName );
+		}
+
+		szText[63] = 0;
+
+		m_pSpectatorPanel->m_ExtraInfo->setText ( szText );
+		
+		/*
+		int timer = (int)( gHUD.m_roundTimer.m_flTimeEnd - gHUD.m_flTime );
+
+		if ( timer < 0 )
+			 timer	= 0;
+
+		_snprintf ( szText, 63, "%d:%02d\n", (timer / 60), (timer % 60) );
+		
+		szText[63] = 0;
+				
+		m_pSpectatorPanel->m_CurrentTime->setText( szText ); */
+		int theTimeToDisplay = gHUD.GetGameTime();
+		_snprintf ( szText, 63, "%d:%02d\n", (theTimeToDisplay / 60), (theTimeToDisplay % 60) );
+		szText[63] = 0;
+		m_pSpectatorPanel->m_CurrentTime->setText( szText );
+
+		// update spectator panel
+		gViewPort->m_pSpectatorPanel->Update();
+	}
+	else
+	{
+		if ( m_pSpectatorPanel->isVisible() )
+		{
+			m_pSpectatorPanel->setVisible( false );
+		}
+        if (m_pSpectatorPanel->m_menuVisible)
+        {
+			m_pSpectatorPanel->ShowMenu( false );	// dsiable all menus/buttons
+        }
+
+	}
+
+	// If balance has changed, recompute balance
+	#ifdef AVH_PLAYTEST_BUILD
+	if(this->mBalanceChanged && this->IsOptionsMenuVisible())
+	{
+		this->RecomputeAnalysis();
+		this->mBalanceChanged = false;
+	}
+	#endif
+
+	m_flSpectatorPanelLastUpdated = gHUD.m_flTime + 1.0; // update every seconds
+}
+
+//======================================================================
+void TeamFortressViewport::CreateScoreBoard( void )
+{
+	int xdent = SBOARD_INDENT_X;
+    int ydent = SBOARD_INDENT_Y;
+	if (ScreenWidth() == 512)
+	{
+		xdent = SBOARD_INDENT_X_512; 
+		ydent = SBOARD_INDENT_Y_512;
+	}
+	else if (ScreenWidth() == 400)
+	{
+		xdent = SBOARD_INDENT_X_400; 
+		ydent = SBOARD_INDENT_Y_400;
+	}
+
+	m_pScoreBoard = new ScorePanel(xdent, ydent, ScreenWidth() - (xdent * 2), ScreenHeight() - (ydent * 2));
+	m_pScoreBoard->setParent(this);
+	m_pScoreBoard->setVisible(false);
+}
+
+void TeamFortressViewport::CreateOptionsMenu()
+{
+	//this->mOptionsScreen = new ColoredPanel(0, 0, ScreenWidth, ScreenHeight);
+	this->mOptionsScreen = new CTransparentPanel(128, 0, 0, ScreenWidth(), ScreenHeight());
+	this->mOptionsScreen->setBorder( new LineBorder( Color(255*0.7,170*0.7,0,0 )) );
+	this->mOptionsScreen->setParent(this);
+	this->mOptionsScreen->setBgColor(128, 128, 128, 40);
+	this->mOptionsScreen->setVisible(false);
+
+	int theScreenWidth = ScreenWidth();
+	int theScreenHeight = ScreenHeight();
+
+	// Populate playtest info
+	#ifdef AVH_PLAYTEST_BUILD
+	this->mPlaytestVariables->setVisible(false);
+	this->mPlaytestVariables->setParent(this->mOptionsScreen);
+	int thePlaytestX = (xInset /*+ kButtonWidth + kButtonHorizontalSpacing*/)*ScreenWidth();
+	int thePlaytestY = yInset*ScreenHeight();
+	this->mPlaytestVariables->setPos(thePlaytestX, thePlaytestY);
+
+	this->mPlaytestVariableWidth = kButtonWidth*2.1f*ScreenWidth();
+	this->mPlaytestVariableHeight = kButtonHeight*10.0f*ScreenHeight();
+	int theColumnTwoX = thePlaytestX + this->mPlaytestVariableWidth + xInset*ScreenWidth();
+
+	this->mPlaytestAnalysis->setVisible(false);
+	this->mPlaytestAnalysis->setParent(this->mOptionsScreen);
+	this->mPlaytestAnalysis->setPos(.4f*ScreenWidth(), .6*ScreenHeight());
+	this->mPlaytestAnalysisWidth = .4*ScreenWidth();
+	this->mPlaytestAnalysisHeight = .3*ScreenHeight();
+
+	this->mNSLogoBitmap = vgui_LoadTGANoInvertAlpha("gfx/vgui/ns-logo.tga");
+	this->mNSLogoBitmap->setColor(Color(255, 255, 255, 0));
+	int theBitmapWidth, theBitmapHeight;
+	this->mNSLogoBitmap->getSize(theBitmapWidth, theBitmapHeight);
+	this->mNSLogoLabel = new vgui::Label("", theColumnTwoX, thePlaytestY, theBitmapWidth, theBitmapHeight);
+	this->mNSLogoLabel->setParent(this->mOptionsScreen);
+	this->mNSLogoLabel->setImage(this->mNSLogoBitmap);
+	//this->mNSLogoLabel->setFgColorAsImageColor(false);
+
+	Color thePlaytestBGColor(0, 0, 0, 0);
+	Color thePlaytestFGColor(128, 128, 128, 128);
+
+	this->mPlaytestVariableName.setParent(this);
+	int thePlaytestVariableNameY = thePlaytestY + theBitmapHeight + yInset*ScreenHeight();
+	this->mPlaytestVariableName.setPos(theColumnTwoX, thePlaytestVariableNameY);//= new vgui::Label("", kPlaytestVariableXOffset*theScreenWidth, kPlaytestVariableYOffset*theScreenHeight, kButtonWidth, kButtonHeight);
+	this->mPlaytestVariableName.setSize(kButtonWidth, kButtonHeight);
+	this->mPlaytestVariableName.setBgColor(thePlaytestBGColor);
+	this->mPlaytestVariableName.setFgColor(Scheme::sc_white);
+
+	this->mPlaytestVariableValue = new TextEntry("", theColumnTwoX, thePlaytestVariableNameY + yInset*theScreenHeight, kButtonWidth, kButtonHeight/2.0f);
+	this->mPlaytestVariableValue->setBgColor(thePlaytestBGColor);
+	this->mPlaytestVariableValue->setFgColor(Scheme::sc_white);
+
+	for(int i = 0; i < kNumOptionsButtons; i++)
+	{
+		const char* theLabel = kOptionsButtons[i*2];
+		char* theCommand = kOptionsButtons[i*2 + 1];
+		//CommandButton* theCurrentCommandButton = this->mOptionsButtons[i];
+		
+		this->mOptionsButtons[i] = new CommandButton(CHudTextMessage::BufferedLocaliseTextString(theLabel), theColumnTwoX + theBitmapWidth + xInset*theScreenWidth, yInset*theScreenHeight + (float)i*(kButtonHeight+kButtonVerticalSpacing)*ScreenHeight(), kButtonWidth*theScreenWidth, kButtonHeight*theScreenHeight);
+		this->mOptionsButtons[i]->setParent(this->mOptionsScreen);
+		this->mOptionsButtons[i]->setBgColor(128, 128, 128, 40);
+		this->mOptionsButtons[i]->addActionSignal(new COptionsScreen_StringCommand(theCommand));
+		this->mOptionsButtons[i]->setVisible(false);
+		this->mOptionsButtons[i]->setFont(Scheme::sf_primary1);
+	}
+	#endif
+}
+
+void TeamFortressViewport::CreateServerBrowser( void )
+{
+	m_pServerBrowser = new ServerBrowser( 0, 0, ScreenWidth(), ScreenHeight() );
+	m_pServerBrowser->setParent(this);
+	m_pServerBrowser->setVisible(false);
+}
+
+void TeamFortressViewport::CreatePlayerMenu()
+{
+
+	int newIndex = m_iNumMenus;
+    
+    m_pCommandMenus[newIndex] = new CCommandMenu(NULL, 1, XRES(390), YRES(32), XRES(kPlayerMenuWidth), YRES(300));	// This will be resized once we know how many items are in it
+    
+    m_pCommandMenus[newIndex]->setParent(this);
+	m_pCommandMenus[newIndex]->setVisible(false);
+	m_pCommandMenus[newIndex]->m_flButtonSizeY = BUTTON_SIZE_Y / 2;
+	m_pCommandMenus[newIndex]->m_iSpectCmdMenu = 1;
+
+	m_iNumMenus++;
+
+    m_SpectatorPlayerMenu = newIndex;
+
+}
+
+void TeamFortressViewport::UpdatePlayerMenu()
+{
+
+    CCommandMenu* pMenu = m_pCommandMenus[m_SpectatorPlayerMenu];
+
+    int xOffset = 0;
+    
+    float flButtonSizeX = XRES(kPlayerMenuWidth);
+    float flButtonSizeY = BUTTON_SIZE_Y / 2;
+    
+    // Create a menu item for each of the players.
+    
+    pMenu->ClearButtonsOfArmedState();
+    pMenu->RemoveAllButtons();
+
+    // Make sure we have player info
+	gViewPort->GetAllPlayersInfo();
+
+    for (int team = 0; team < 4; ++team)
+    {
+
+        if (gHUD.GetPlayMode() != PLAYMODE_OBSERVER)
+        {
+            // Filter out players who aren't on our team.
+
+		    int theLocalPlayerTeam = 0;
+
+			if (gEngfuncs.GetLocalPlayer())
+			{
+				theLocalPlayerTeam = gEngfuncs.GetLocalPlayer()->curstate.team;
+			}
+
+            if (theLocalPlayerTeam != team)
+            {
+                continue;
+            }
+
+        }
+
+        for (int i = 1; i <= MAX_PLAYERS; ++i)
+        {
+
+	        if ( g_PlayerInfoList[i].name == NULL )
+			    continue; // empty player slot, skip
+
+		    if ( g_PlayerExtraInfo[i].teamname[0] == 0 )
+			    continue; // skip over players who are not in a team
+
+            if ( g_PlayerExtraInfo[i].teamnumber != team)
+                continue;
+
+            switch(g_PlayerExtraInfo[i].playerclass)
+            {
+            case PLAYERCLASS_SPECTATOR:
+            case PLAYERCLASS_COMMANDER:
+            case PLAYERCLASS_REINFORCING:
+                continue;
+            }
+
+            int iButtonY = (BUTTON_SIZE_Y-1) * pMenu->GetNumButtons();
+
+            PlayerButton* pButton = new PlayerButton(i, g_PlayerInfoList[i].name, 0, iButtonY, flButtonSizeX, flButtonSizeY, false, true);
+
+            //pButton->setArmedColor(teamR, teamG, teamB, 0);
+	        //pButton->setUnArmedColor(teamR, teamG, teamB, 0);
+	        //pButton->setArmedBorderColor(255 / gHUD.GetGammaSlope(), 255 / gHUD.GetGammaSlope(), 255 / gHUD.GetGammaSlope(), 0);
+	        
+	        if ( pButton )
+	        {
+		        pMenu->AddButton( pButton );
+		        pButton->setParentMenu( pMenu );
+		        pButton->setFont( Scheme::sf_primary3 );
+
+                char command[MAX_COMMAND_SIZE];
+                sprintf(command, "follow %d", i);
+
+                pButton->addActionSignal(new CMenuHandler_StringCommand(command));
+
+            }
+    
+        }
+    }
+
+}
+
+//======================================================================
+// Set the VGUI Menu
+void TeamFortressViewport::SetCurrentMenu( CMenuPanel *pMenu )
+{
+	m_pCurrentMenu = pMenu;
+	if ( m_pCurrentMenu )
+	{
+		// Don't open menus in demo playback
+		if ( gEngfuncs.pDemoAPI->IsPlayingback() )
+			return;
+
+		m_pCurrentMenu->Open();
+	}
+}
+
+//================================================================
+// Text Window
+CMenuPanel* TeamFortressViewport::CreateTextWindow( int iTextToShow )
+{
+	char sz[256];
+	char *cText;
+	char *pfile = NULL;
+	static const int MAX_TITLE_LENGTH = 32;
+	char cTitle[MAX_TITLE_LENGTH];
+
+	if ( iTextToShow == SHOW_MOTD )
+	{
+		if (!m_szServerName || !m_szServerName[0])
+			strcpy( cTitle, kAvHGameName );
+		else
+			strncpy( cTitle, m_szServerName, MAX_TITLE_LENGTH );
+		cTitle[MAX_TITLE_LENGTH-1] = 0;
+		cText = m_szMOTD;
+	}
+	else if ( iTextToShow == SHOW_MAPBRIEFING )
+	{
+		// Get the current mapname, and open it's map briefing text
+		if (m_sMapName && m_sMapName[0])
+		{
+			strcpy( sz, "maps/");
+			strcat( sz, m_sMapName );
+			strcat( sz, ".txt" );
+		}
+		else
+		{
+			const char *level = gEngfuncs.pfnGetLevelName();
+			if (!level)
+				return NULL;
+
+			strcpy( sz, level );
+			char *ch = strchr( sz, '.' );
+			*ch = '\0';
+			strcat( sz, ".txt" );
+
+			// pull out the map name
+			strcpy( m_sMapName, level );
+			ch = strchr( m_sMapName, '.' );
+			if ( ch )
+			{
+				*ch = 0;
+			}
+
+			ch = strchr( m_sMapName, '/' );
+			if ( ch )
+			{
+				// move the string back over the '/'
+				memmove( m_sMapName, ch+1, strlen(ch)+1 );
+			}
+		}
+
+		pfile = (char*)gEngfuncs.COM_LoadFile( sz, 5, NULL );
+
+		if (!pfile)
+			return NULL;
+
+		cText = pfile;
+
+		strncpy( cTitle, m_sMapName, MAX_TITLE_LENGTH );
+		cTitle[MAX_TITLE_LENGTH-1] = 0;
+	}
+	else if ( iTextToShow == SHOW_CLASSDESC )
+	{
+		switch ( g_iPlayerClass )
+		{
+		case PC_SCOUT:		cText = CHudTextMessage::BufferedLocaliseTextString( "#Help_scout" ); 
+							CHudTextMessage::LocaliseTextString( "#Title_scout", cTitle, MAX_TITLE_LENGTH ); break;
+		case PC_SNIPER:		cText = CHudTextMessage::BufferedLocaliseTextString( "#Help_sniper" );
+							CHudTextMessage::LocaliseTextString( "#Title_sniper", cTitle, MAX_TITLE_LENGTH ); break;
+		case PC_SOLDIER:	cText = CHudTextMessage::BufferedLocaliseTextString( "#Help_soldier" );
+							CHudTextMessage::LocaliseTextString( "#Title_soldier", cTitle, MAX_TITLE_LENGTH ); break;
+		case PC_DEMOMAN:	cText = CHudTextMessage::BufferedLocaliseTextString( "#Help_demoman" );
+							CHudTextMessage::LocaliseTextString( "#Title_demoman", cTitle, MAX_TITLE_LENGTH ); break;
+		case PC_MEDIC:		cText = CHudTextMessage::BufferedLocaliseTextString( "#Help_medic" );
+							CHudTextMessage::LocaliseTextString( "#Title_medic", cTitle, MAX_TITLE_LENGTH ); break;
+		case PC_HVYWEAP:	cText = CHudTextMessage::BufferedLocaliseTextString( "#Help_hwguy" );
+							CHudTextMessage::LocaliseTextString( "#Title_hwguy", cTitle, MAX_TITLE_LENGTH ); break;
+		case PC_PYRO:		cText = CHudTextMessage::BufferedLocaliseTextString( "#Help_pyro" );
+							CHudTextMessage::LocaliseTextString( "#Title_pyro", cTitle, MAX_TITLE_LENGTH ); break;
+		case PC_SPY:		cText = CHudTextMessage::BufferedLocaliseTextString( "#Help_spy" );
+							CHudTextMessage::LocaliseTextString( "#Title_spy", cTitle, MAX_TITLE_LENGTH ); break;
+		case PC_ENGINEER:	cText = CHudTextMessage::BufferedLocaliseTextString( "#Help_engineer" );
+							CHudTextMessage::LocaliseTextString( "#Title_engineer", cTitle, MAX_TITLE_LENGTH ); break;
+		case PC_CIVILIAN:	cText = CHudTextMessage::BufferedLocaliseTextString( "#Help_civilian" );
+			CHudTextMessage::LocaliseTextString( "#Title_civilian", cTitle, MAX_TITLE_LENGTH ); break;
+		default:
+			return NULL;
+		}
+		
+		if ( g_iPlayerClass == PC_CIVILIAN )
+		{
+			sprintf(sz, "classes/long_civilian.txt");
+		}
+		else
+		{
+			sprintf(sz, "classes/long_%s.txt", sTFClassSelection[ g_iPlayerClass ]);
+		}
+		char *pfile = (char*)gEngfuncs.COM_LoadFile( sz, 5, NULL );
+		if (pfile)
+		{
+			cText = pfile;
+		}
+	}
+	else if ( iTextToShow == SHOW_SPECHELP )
+	{
+		CHudTextMessage::LocaliseTextString( "#Spec_Help_Title", cTitle, MAX_TITLE_LENGTH );
+		cTitle[MAX_TITLE_LENGTH-1] = 0;
+		
+		char *pfile = CHudTextMessage::BufferedLocaliseTextString( "#Spec_Help_Text" );
+		if ( pfile )
+		{
+			cText = pfile;
+		}
+	}
+
+	// if we're in the game (ie. have selected a class), flag the menu to be only grayed in the dialog box, instead of full screen
+	CMenuPanel *pMOTDPanel = CMessageWindowPanel_Create( cText, cTitle, g_iPlayerClass == PC_UNDEFINED, false, 0, 0, ScreenWidth(), ScreenHeight() );
+	pMOTDPanel->setParent( this );
+	
+	if ( pfile )
+		gEngfuncs.COM_FreeFile( pfile );
+	
+	return pMOTDPanel;
+}
+
+char* TeamFortressViewport::GetTeamName( int iTeam ) 
+{ 
+	return m_sTeamNames[iTeam]; 
+}
+
+//================================================================
+// VGUI Menus
+void TeamFortressViewport::ShowVGUIMenu( int iMenu )
+{
+	CMenuPanel *pNewMenu = NULL;
+
+	gHUD.SetUsingVGUI(true);
+
+	// Don't open menus in demo playback
+	if ( gEngfuncs.pDemoAPI->IsPlayingback() )
+		return;
+
+	// Don't open any menus except the MOTD during intermission
+	// MOTD needs to be accepted because it's sent down to the client 
+	// after map change, before intermission's turned off
+	if ( gHUD.m_iIntermission && iMenu != MENU_INTRO )
+		return;
+
+	// Don't create one if it's already in the list
+	if (m_pCurrentMenu)
+	{
+		CMenuPanel *pMenu = m_pCurrentMenu;
+		while (pMenu != NULL)
+		{
+			if (pMenu->GetMenuID() == iMenu)
+				return;
+			pMenu = pMenu->GetNextMenu();
+		}
+	}
+
+	switch ( iMenu )
+	{
+	case MENU_TEAM:		
+		pNewMenu = ShowTeamMenu(); 
+		break;
+
+	// Map Briefing removed now that it appears in the team menu
+	case MENU_MAPBRIEFING:
+		pNewMenu = CreateTextWindow( SHOW_MAPBRIEFING );
+		break;
+
+	case MENU_INTRO:
+		pNewMenu = CreateTextWindow( SHOW_MOTD );
+		break;
+
+	case MENU_CLASSHELP:
+		pNewMenu = CreateTextWindow( SHOW_CLASSDESC );
+		break;
+
+	case MENU_SPECHELP:
+		pNewMenu = CreateTextWindow( SHOW_SPECHELP );
+		break;
+	case MENU_CLASS:
+		pNewMenu = ShowClassMenu();
+		break;
+
+	default:
+		break;
+	}
+
+	if (!pNewMenu)
+		return;
+
+	// Close the Command Menu if it's open
+	HideCommandMenu();
+
+	pNewMenu->SetMenuID( iMenu );
+	pNewMenu->SetActive( true );
+	pNewMenu->setParent(this);
+
+	// See if another menu is visible, and if so, cache this one for display once the other one's finished
+	if (m_pCurrentMenu)
+	{
+		if ( m_pCurrentMenu->GetMenuID() == MENU_CLASS && iMenu == MENU_TEAM )
+		{
+			CMenuPanel *temp = m_pCurrentMenu;
+			m_pCurrentMenu->Close();
+			m_pCurrentMenu = pNewMenu;
+			m_pCurrentMenu->SetNextMenu( temp );
+			m_pCurrentMenu->Open();
+			UpdateCursorState();
+		}
+		else
+		{
+			m_pCurrentMenu->SetNextMenu( pNewMenu );
+		}
+	}
+	else
+	{
+		m_pCurrentMenu = pNewMenu;
+		m_pCurrentMenu->Open();
+		UpdateCursorState();
+	}
+}
+
+// Removes all VGUI Menu's onscreen
+void TeamFortressViewport::HideVGUIMenu()
+{
+	while (m_pCurrentMenu)
+	{
+		HideTopMenu();
+	}
+	gHUD.SetUsingVGUI(false);
+}
+
+// Remove the top VGUI menu, and bring up the next one
+void TeamFortressViewport::HideTopMenu()
+{
+	if (m_pCurrentMenu)
+	{
+		// Close the top one
+		m_pCurrentMenu->Close();
+
+		// Bring up the next one
+		gViewPort->SetCurrentMenu( m_pCurrentMenu->GetNextMenu() );
+	}
+
+	UpdateCursorState();
+}
+
+// Return TRUE if the HUD's allowed to print text messages
+bool TeamFortressViewport::AllowedToPrintText( void )
+{
+	// Prevent text messages when fullscreen menus are up
+	if ( m_pCurrentMenu && g_iPlayerClass == 0 )
+	{
+		int iId = m_pCurrentMenu->GetMenuID();
+		if ( iId == MENU_TEAM || iId == MENU_CLASS || iId == MENU_INTRO || iId == MENU_CLASSHELP )
+			return FALSE;
+	}
+
+	return TRUE;
+}
+
+//======================================================================================
+// TEAM MENU
+//======================================================================================
+// Bring up the Team selection Menu
+CMenuPanel* TeamFortressViewport::ShowTeamMenu()
+{
+	// Don't open menus in demo playback
+	if ( gEngfuncs.pDemoAPI->IsPlayingback() )
+		return NULL;
+
+	m_pTeamMenu->Reset();
+	return m_pTeamMenu;
+}
+
+void TeamFortressViewport::CreateTeamMenu()
+{
+	// Create the panel
+	m_pTeamMenu = new CTeamMenuPanel(100, false, 0, 0, ScreenWidth(), ScreenHeight());
+	m_pTeamMenu->setParent( this );
+	m_pTeamMenu->setVisible( false );
+}
+
+//======================================================================================
+// CLASS MENU
+//======================================================================================
+// Bring up the Class selection Menu
+CMenuPanel* TeamFortressViewport::ShowClassMenu()
+{
+	// Don't open menus in demo playback
+	if ( gEngfuncs.pDemoAPI->IsPlayingback() )
+		return NULL;
+
+	m_pClassMenu->Reset();
+	return m_pClassMenu;
+}
+
+void TeamFortressViewport::CreateClassMenu()
+{
+	// Create the panel
+	m_pClassMenu = new CClassMenuPanel(100, false, 0, 0, ScreenWidth(), ScreenHeight());
+	m_pClassMenu->setParent(this);
+	m_pClassMenu->setVisible( false );
+}
+
+//======================================================================================
+//======================================================================================
+// SPECTATOR MENU
+//======================================================================================
+// Spectator "Menu" explaining the Spectator buttons
+void TeamFortressViewport::CreateSpectatorMenu()
+{
+	// Create the Panel
+	m_pSpectatorPanel = new SpectatorPanel(0, 0, ScreenWidth(), ScreenHeight());
+	m_pSpectatorPanel->setParent(this);
+	m_pSpectatorPanel->setVisible(false);
+	m_pSpectatorPanel->Initialize();
+}
+
+//======================================================================================
+// UPDATE HUD SECTIONS
+//======================================================================================
+// We've got an update on player info
+// Recalculate any menus that use it.
+void TeamFortressViewport::UpdateOnPlayerInfo()
+{
+	if (m_pTeamMenu)
+		m_pTeamMenu->Update();
+	if (m_pClassMenu)
+		m_pClassMenu->Update();
+	if (m_pScoreBoard)
+		m_pScoreBoard->Update();
+}
+
+void TeamFortressViewport::UpdateCursorState()
+{
+
+    if (gHUD.GetInTopDownMode() || m_pSpectatorPanel->isVisible() || GetClientVoiceMgr()->IsInSquelchMode())
+    {
+        gHUD.GetManager().SetMouseVisibility(true);
+    }
+    else
+    {
+    
+		// Don't reset mouse in demo playback
+		if ( !gEngfuncs.pDemoAPI->IsPlayingback() )
+		{
+			IN_ResetMouse();
+		}    
+    
+        gHUD.GetManager().SetMouseVisibility(false);
+    
+    }
+	
+    /*
+    if(!gHUD.GetInTopDownMode())
+	{
+		// Need cursor if any VGUI window is up
+		if ( m_pSpectatorPanel->m_menuVisible || m_pCurrentMenu || m_pTeamMenu->isVisible() || m_pServerBrowser->isVisible() || GetClientVoiceMgr()->IsInSquelchMode() )
+		{
+			gHUD.GetManager().SetMouseVisibility(true);
+			//g_iVisibleMouse = true;
+			//App::getInstance()->setCursorOveride( App::getInstance()->getScheme()->getCursor(Scheme::SchemeCursor::scu_arrow) );
+			return;
+		}
+		else if ( m_pCurrentCommandMenu )
+		{
+			// commandmenu doesn't have cursor if hud_capturemouse is turned off
+			if ( gHUD.m_pCvarStealMouse->value != 0.0f )
+			{
+				gHUD.GetManager().SetMouseVisibility(true);
+				//g_iVisibleMouse = true;
+				//App::getInstance()->setCursorOveride( App::getInstance()->getScheme()->getCursor(Scheme::SchemeCursor::scu_arrow) );
+				return;
+			}
+		}
+			
+		// Don't reset mouse in demo playback
+		if ( !gEngfuncs.pDemoAPI->IsPlayingback() )
+		{
+			IN_ResetMouse();
+		}
+		
+		gHUD.GetManager().SetMouseVisibility(false);
+		//g_iVisibleMouse = false;
+		//App::getInstance()->setCursorOveride( App::getInstance()->getScheme()->getCursor(Scheme::SchemeCursor::scu_none) );
+	}
+    */
+
+}
+
+void TeamFortressViewport::UpdateHighlights()
+{
+	if (m_pCurrentCommandMenu)
+		m_pCurrentCommandMenu->MakeVisible( NULL );
+}
+
+void TeamFortressViewport::GetAllPlayersInfo( void )
+{
+	for ( int i = 1; i <= MAX_PLAYERS; i++ )
+	{
+		GetPlayerInfo( i, &g_PlayerInfoList[i] );
+
+		if ( g_PlayerInfoList[i].thisplayer )
+			m_pScoreBoard->m_iPlayerNum = i;  // !!!HACK: this should be initialized elsewhere... maybe gotten from the engine
+	}
+}
+
+void TeamFortressViewport::paintBackground()
+{
+	if (m_pScoreBoard)
+	{
+		int x, y;
+		getApp()->getCursorPos(x, y);
+		m_pScoreBoard->cursorMoved(x, y, m_pScoreBoard);
+	}
+
+	// See if the command menu is visible and needs recalculating due to some external change
+	if ( g_iTeamNumber != m_iCurrentTeamNumber )
+	{
+		UpdateCommandMenu( m_StandardMenu );
+
+		if ( m_pClassMenu )
+		{
+			m_pClassMenu->Update();
+		}
+
+		m_iCurrentTeamNumber = g_iTeamNumber;
+	}
+
+	if ( g_iPlayerClass != m_iCurrentPlayerClass )
+	{
+		UpdateCommandMenu( m_StandardMenu );
+
+		m_iCurrentPlayerClass = g_iPlayerClass;
+	}
+
+	// See if the Spectator Menu needs to be update
+	if (	( g_iUser1 != m_iUser1 || g_iUser2 != m_iUser2 ) ||
+			( m_flSpectatorPanelLastUpdated < gHUD.m_flTime ) )
+	{
+		UpdateSpectatorPanel();
+	}
+
+	// Update the Scoreboard, if it's visible
+	if ( m_pScoreBoard->isVisible() && (m_flScoreBoardLastUpdated < gHUD.m_flTime) )
+	{
+		m_pScoreBoard->Update();
+		m_flScoreBoardLastUpdated = gHUD.m_flTime + 0.5;
+	}
+
+	int extents[4];
+	getAbsExtents(extents[0],extents[1],extents[2],extents[3]);
+	VGui_ViewportPaintBackground(extents);
+}
+
+//================================================================
+// Input Handler for Drag N Drop panels
+void CDragNDropHandler::cursorMoved(int x,int y,Panel* panel)
+{
+	if(m_bDragging)
+	{
+		App::getInstance()->getCursorPos(x,y);			
+		m_pPanel->setPos(m_iaDragOrgPos[0]+(x-m_iaDragStart[0]),m_iaDragOrgPos[1]+(y-m_iaDragStart[1]));
+		
+		if(m_pPanel->getParent()!=null)
+		{			
+			m_pPanel->getParent()->repaint();
+		}
+	}
+}
+
+void CDragNDropHandler::mousePressed(MouseCode code,Panel* panel)
+{
+	int x,y;
+	App::getInstance()->getCursorPos(x,y);
+	m_bDragging=true;
+	m_iaDragStart[0]=x;
+	m_iaDragStart[1]=y;
+	m_pPanel->getPos(m_iaDragOrgPos[0],m_iaDragOrgPos[1]);
+	App::getInstance()->setMouseCapture(panel);
+
+	m_pPanel->setDragged(m_bDragging);
+	m_pPanel->requestFocus();
+} 
+
+void CDragNDropHandler::mouseReleased(MouseCode code,Panel* panel)
+{
+	m_bDragging=false;
+	m_pPanel->setDragged(m_bDragging);
+	App::getInstance()->setMouseCapture(null);
+}
+
+//================================================================
+// Number Key Input
+bool TeamFortressViewport::SlotInput( int iSlot )
+{
+	// If there's a menu up, give it the input
+	if ( m_pCurrentMenu )
+		return m_pCurrentMenu->SlotInput( iSlot );
+
+	if(gHUD.SlotInput(iSlot))
+	{
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+// Direct Key Input
+int	TeamFortressViewport::KeyInput( int down, int keynum, const char *pszCurrentBinding )
+{
+
+    if (m_chatPanel->isVisible())
+    {
+        // Don't let the game handle the input while the user is typing in the
+        // chat window.
+        return 0;
+    }
+    
+    if (down && pszCurrentBinding && !strcmp(pszCurrentBinding,  kcGlobalChat))
+	{
+        m_chatPanel->setVisible(true);
+        m_chatPanel->requestFocus();
+        m_chatPanel->SetChatMode("say");
+        return 0;
+	}
+    else if (down && pszCurrentBinding && !strcmp(pszCurrentBinding,  kcTeamChat))
+	{
+        m_chatPanel->setVisible(true);
+        m_chatPanel->requestFocus();
+        m_chatPanel->SetChatMode("say_team");
+		return 0;
+	}
+
+  
+	// Enter gets out of Spectator Mode by bringing up the Team Menu
+//	if (m_iUser1 && gEngfuncs.Con_IsVisible() == false )
+//	{
+//		//if ( down && (keynum == K_ENTER || keynum == K_KP_ENTER) )
+//		if ( down && keynum == K_F1 )
+//		{
+//			//ShowVGUIMenu( MENU_TEAM );
+//			gEngfuncs.pfnClientCmd(kcReadyRoom);
+//		}
+//	}
+
+	// Open Text Window?
+	if (m_pCurrentMenu && gEngfuncs.Con_IsVisible() == false)
+	{
+		int iMenuID = m_pCurrentMenu->GetMenuID();
+
+		// Get number keys as Input for Team/Class menus
+		if (iMenuID == MENU_TEAM || iMenuID == MENU_CLASS)
+		{
+			// Escape gets you out of Team/Class menus if the Cancel button is visible
+			if ( keynum == K_ESCAPE )
+			{
+				if ( (iMenuID == MENU_TEAM && g_iTeamNumber) || (iMenuID == MENU_CLASS && g_iPlayerClass) )
+				{
+					HideTopMenu();
+					return 0;
+				}
+			}
+
+			for (int i = '0'; i <= '9'; i++)
+			{
+				if ( down && (keynum == i) )
+				{
+					SlotInput( i - '0' );
+					return 0;
+				}
+			}
+		}
+
+		// Grab enter keys to close TextWindows
+		if ( down && (keynum == K_ENTER || keynum == K_KP_ENTER || keynum == K_SPACE || keynum == K_ESCAPE) )
+		{
+			if ( iMenuID == MENU_MAPBRIEFING || iMenuID == MENU_INTRO || iMenuID == MENU_CLASSHELP )
+			{
+				HideTopMenu();
+				return 0;
+			}
+		}
+
+		// Grab jump key on Team Menu as autoassign
+		if ( pszCurrentBinding && down && !strcmp(pszCurrentBinding, "+jump") )
+		{
+			if (iMenuID == MENU_TEAM)
+			{
+				m_pTeamMenu->SlotInput(5);
+				return 0;
+			}
+		}
+
+	}
+
+	// if we're in a command menu, try hit one of it's buttons
+	if ( down && m_pCurrentCommandMenu )
+	{
+		// Escape hides the command menu
+		if ( keynum == K_ESCAPE )
+		{
+			HideCommandMenu();
+			return 0;
+		}
+
+		// only trap the number keys
+		if ( keynum >= '0' && keynum <= '9' )
+		{
+			if ( m_pCurrentCommandMenu->KeyInput(keynum) )
+			{
+				// a final command has been issued, so close the command menu
+				HideCommandMenu();
+			}
+
+			return 0;
+		}
+	}
+
+	return 1;
+}
+
+ChatPanel* TeamFortressViewport::GetChatPanel()
+{
+    return m_chatPanel;    
+}
+
+//================================================================
+// Message Handlers
+int TeamFortressViewport::MsgFunc_ValClass(const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+	
+	for (int i = 0; i < 5; i++)
+		m_iValidClasses[i] = READ_SHORT();
+
+	// Force the menu to update
+	UpdateCommandMenu( m_StandardMenu );
+
+	return 1;
+}
+
+int TeamFortressViewport::MsgFunc_TeamNames(const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+	
+	m_iNumberOfTeams = READ_BYTE();
+
+	for (int i = 0; i < m_iNumberOfTeams; i++)
+	{
+		//int teamNum = i + 1;
+		int teamNum = i;
+
+		// Build team title
+		gHUD.m_TextMessage.LocaliseTextString( READ_STRING(), m_sTeamNames[teamNum], MAX_TEAMNAME_SIZE );
+
+		// Don't append "Team: 0" or "Team: Spectators", only for higher teams 
+		if((i >= 1) && (i < m_iNumberOfTeams-1))
+		{
+			char theTeamTranslation[128];
+			strcpy(theTeamTranslation, gHUD.m_TextMessage.LookupString(kTeamTitle));
+			
+			char theFullTeamName[256];
+			sprintf(theFullTeamName, "%s %d: %s", theTeamTranslation, i, m_sTeamNames[teamNum]);
+
+			strcpy(m_sTeamNames[teamNum], theFullTeamName);
+		}
+		
+		// Set the team name buttons
+		if (m_pTeamButtons[i])
+			m_pTeamButtons[i]->setText( m_sTeamNames[teamNum] );
+
+		// range check this value...m_pDisguiseButtons[5];
+		if ( teamNum < 5 )
+		{
+			// Set the disguise buttons
+			if ( m_pDisguiseButtons[teamNum] )
+				m_pDisguiseButtons[teamNum]->setText( m_sTeamNames[teamNum] );
+		}
+	}
+
+	// Update the Team Menu
+	if (m_pTeamMenu)
+		m_pTeamMenu->Update();
+
+	return 1;
+}
+
+int TeamFortressViewport::MsgFunc_Feign(const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+	
+	m_iIsFeigning = READ_BYTE();
+
+	// Force the menu to update
+	UpdateCommandMenu( m_StandardMenu );
+
+	return 1;
+}
+
+int TeamFortressViewport::MsgFunc_Detpack(const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+
+	m_iIsSettingDetpack = READ_BYTE();
+
+	// Force the menu to update
+	UpdateCommandMenu( m_StandardMenu );
+
+	return 1;
+}
+
+int TeamFortressViewport::MsgFunc_VGUIMenu(const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+
+	int iMenu = READ_BYTE();
+
+	// Map briefing includes the name of the map (because it's sent down before the client knows what map it is)
+	if (iMenu == MENU_MAPBRIEFING)
+	{
+		strncpy( m_sMapName, READ_STRING(), sizeof(m_sMapName) );
+		m_sMapName[ sizeof(m_sMapName) - 1 ] = '\0';
+	}
+
+	// Bring up the menu6
+	ShowVGUIMenu( iMenu );
+
+	return 1;
+}
+
+int TeamFortressViewport::MsgFunc_MOTD( const char *pszName, int iSize, void *pbuf )
+{
+	if (m_iGotAllMOTD)
+		m_szMOTD[0] = 0;
+
+	BEGIN_READ( pbuf, iSize );
+
+	m_iGotAllMOTD = READ_BYTE();
+
+	int roomInArray = sizeof(m_szMOTD) - strlen(m_szMOTD) - 1;
+
+	strncat( m_szMOTD, READ_STRING(), roomInArray >= 0 ? roomInArray : 0 );
+	m_szMOTD[ sizeof(m_szMOTD)-1 ] = '\0';
+
+	// don't show MOTD for HLTV spectators
+	if ( m_iGotAllMOTD && !gEngfuncs.IsSpectateOnly() )
+	{
+		//ShowVGUIMenu( MENU_INTRO );
+		//gHUD.GetManager().SetMouseVisibility(true);
+		//ShowOptionsMenu();
+//		gHUD.AddTooltip(m_szMOTD, false, kMOTDToolTipMaxWidth);
+	}
+
+	return 1;
+}
+
+int TeamFortressViewport::MsgFunc_BuildSt( const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+
+	m_iBuildState = READ_BYTE();
+
+	// Force the menu to update
+	UpdateCommandMenu( m_StandardMenu );
+
+	return 1;
+}
+
+int TeamFortressViewport::MsgFunc_RandomPC( const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+
+	m_iRandomPC = READ_BYTE();
+
+	return 1;
+}
+
+int TeamFortressViewport::MsgFunc_ServerName( const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+
+	memset(this->m_szServerName, 0, MAX_SERVERNAME_LENGTH);
+
+	strncpy( m_szServerName, READ_STRING(), MAX_SERVERNAME_LENGTH );
+
+	return 1;
+}
+
+int TeamFortressViewport::MsgFunc_ScoreInfo( const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+	short cl = READ_BYTE();
+    short score = READ_SHORT();
+	short frags = READ_SHORT();
+	short deaths = READ_SHORT();
+	short playerclass = READ_BYTE();
+	short auth = READ_SHORT();
+	bool is_upp = (auth & PLAYERAUTH_UPP_MODE);
+	short teamnumber = READ_SHORT();
+	short color = 0;
+	
+	if(is_upp)
+	{
+		color = READ_BYTE();
+	}
+	else if(auth & PLAYERAUTH_CUSTOM)
+	{
+		//clear the string (I dont think this array is reset anywhere else (since everything is set when the score info message is sent anyways)
+		//so just memset it here to prevent any possible problems.
+		memset(&g_PlayerExtraInfo[cl].customicon, 0, sizeof(g_PlayerExtraInfo[cl].customicon));
+
+		// Read custom icon
+		char* theString = READ_STRING();
+
+		if(theString && strlen(theString) >= 4 && strlen(theString) <= CUSTOM_ICON_LENGTH+2)//make sure the string is within the right size.
+			strncpy(g_PlayerExtraInfo[cl].customicon, theString, sizeof(g_PlayerExtraInfo[cl].customicon)-1);
+	}
+
+	if ( cl > 0 && cl <= MAX_PLAYERS )
+	{
+        // Update score, but show + or - indicator on scoreboard when it changes
+		g_PlayerExtraInfo[cl].lastScore = g_PlayerExtraInfo[cl].score;
+        g_PlayerExtraInfo[cl].score = score;
+		if(g_PlayerExtraInfo[cl].score != g_PlayerExtraInfo[cl].lastScore)
+		{
+			g_PlayerExtraInfo[cl].timeOfLastScoreChange = gHUD.GetTimeOfLastUpdate();
+		}
+
+        // Update other info
+        g_PlayerExtraInfo[cl].frags = frags;
+		g_PlayerExtraInfo[cl].deaths = deaths;
+		g_PlayerExtraInfo[cl].playerclass = playerclass;
+		g_PlayerExtraInfo[cl].teamnumber = teamnumber;
+		g_PlayerExtraInfo[cl].auth = auth;
+		g_PlayerExtraInfo[cl].color = color;
+
+		// Don't go below 0!
+		if ( g_PlayerExtraInfo[cl].teamnumber < 0 )
+			 g_PlayerExtraInfo[cl].teamnumber = 0;
+
+		UpdateOnPlayerInfo();
+	}
+
+	return 1;
+}
+
+// Message handler for TeamScore message
+// accepts three values:
+//		string: team name
+//		short: teams kills
+//		short: teams deaths 
+// if this message is never received, then scores will simply be the combined totals of the players.
+int TeamFortressViewport::MsgFunc_TeamScore( const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+	char *TeamName = READ_STRING();
+
+	// find the team matching the name
+	for ( int i = 1; i <= m_pScoreBoard->m_iNumTeams; i++ )
+	{
+		if ( !stricmp( TeamName, g_TeamInfo[i].name ) )
+			break;
+	}
+
+	if ( i > m_pScoreBoard->m_iNumTeams )
+		return 1;
+
+	// use this new score data instead of combined player scoresw
+	g_TeamInfo[i].scores_overriden = TRUE;
+	g_TeamInfo[i].frags = READ_SHORT();
+	g_TeamInfo[i].deaths = READ_SHORT();
+
+	return 1;
+}
+
+// Message handler for TeamInfo message
+// accepts two values:
+//		byte: client number
+//		string: client team name
+int TeamFortressViewport::MsgFunc_TeamInfo( const char *pszName, int iSize, void *pbuf )
+{
+	if (!m_pScoreBoard)
+		return 1;
+
+	BEGIN_READ( pbuf, iSize );
+	short cl = READ_BYTE();
+	
+	if ( cl > 0 && cl <= MAX_PLAYERS )
+	{  
+		// set the players team
+		strncpy( g_PlayerExtraInfo[cl].teamname, READ_STRING(), MAX_TEAM_NAME );
+	}
+
+	// rebuild the list of teams
+	m_pScoreBoard->RebuildTeams();
+
+	return 1;
+}
+
+void TeamFortressViewport::DeathMsg( int killer, int victim )
+{
+	m_pScoreBoard->DeathMsg(killer,victim);
+}
+
+int TeamFortressViewport::MsgFunc_Spectator( const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+
+	short cl = READ_BYTE();
+	if ( cl > 0 && cl <= MAX_PLAYERS )
+	{
+		g_IsSpectator[cl] = READ_BYTE();
+	}
+
+	return 1;
+}
+
+int TeamFortressViewport::MsgFunc_AllowSpec( const char *pszName, int iSize, void *pbuf )
+{
+	BEGIN_READ( pbuf, iSize );
+
+	m_iAllowSpectators = READ_BYTE();
+
+	// Force the menu to update
+	UpdateCommandMenu( m_StandardMenu );
+
+	// If the team menu is up, update it too
+	if (m_pTeamMenu)
+		m_pTeamMenu->Update();
+
+	return 1;
+}
+
diff --git a/main/source/cl_dll/vgui_TeamFortressViewport.h b/main/source/cl_dll/vgui_TeamFortressViewport.h
new file mode 100644
index 00000000..54edbaff
--- /dev/null
+++ b/main/source/cl_dll/vgui_TeamFortressViewport.h
@@ -0,0 +1,1825 @@
+
+#ifndef TEAMFORTRESSVIEWPORT_H
+#define TEAMFORTRESSVIEWPORT_H
+
+#include<VGUI_Panel.h>
+#include<VGUI_Frame.h>
+#include<VGUI_TextPanel.h>
+#include<VGUI_Label.h>
+#include<VGUI_Button.h>
+#include<VGUI_ActionSignal.h>
+#include<VGUI_InputSignal.h>
+#include<VGUI_Scheme.h>
+#include<VGUI_Image.h>
+#include<VGUI_FileInputStream.h>
+#include<VGUI_BitmapTGA.h>
+#include<VGUI_DesktopIcon.h>
+#include<VGUI_App.h>
+#include<VGUI_MiniApp.h>
+#include<VGUI_LineBorder.h>
+#include<VGUI_String.h>
+#include<VGUI_ScrollPanel.h>
+#include<VGUI_ScrollBar.h>
+#include<VGUI_Slider.h>
+#include<VGUI_ListBox.h>
+#include<VGUI_TextEntry.h>
+#include "cl_dll/CLabelHeader.h"
+#include "build.h"
+#include "game_shared/VGUI_Grid.h"
+
+
+// custom scheme handling
+#include "vgui_SchemeManager.h"
+
+#define TF_DEFS_ONLY
+#include "tf_defs.h"
+
+using namespace vgui;
+
+class Cursor;
+class ScorePanel;
+class SpectatorPanel;
+class CCommandMenu;
+class CommandLabel;
+class CommandButton;
+class BuildButton;
+class ClassButton;
+class CMenuPanel;
+class ServerBrowser;
+class DragNDropPanel;
+class CTransparentPanel;
+class CClassMenuPanel;
+class CTeamMenuPanel;
+class ChatPanel;
+
+char* GetVGUITGAName(const char *pszName);
+BitmapTGA *LoadTGAForRes(const char* pImageName);
+void ScaleColors( int &r, int &g, int &b, int a );
+extern char *sTFClassSelection[];
+extern int sTFValidClassInts[];
+extern char *sLocalisedClasses[];
+
+#define MAX_SERVERNAME_LENGTH	32
+#define MAX_MAPNAME_LENGTH		32
+
+// Command Menu positions 
+#define MAX_MENUS				80
+#define MAX_BUTTONS				100
+
+#define BUTTON_SIZE_Y			YRES(30)
+#define CMENU_SIZE_X			XRES(160)
+
+#define SUBMENU_SIZE_X			(CMENU_SIZE_X / 8)
+#define SUBMENU_SIZE_Y			(BUTTON_SIZE_Y / 6)
+
+#define CMENU_TOP				(BUTTON_SIZE_Y * 4)
+
+#define MAX_TEAMNAME_SIZE		64
+#define MAX_BUTTON_SIZE			32
+
+// Map Briefing Window
+#define MAPBRIEF_INDENT			30
+
+// Team Menu
+#define TMENU_INDENT_X			(30 * ((float)ScreenHeight / 640))
+#define TMENU_HEADER			100
+#define TMENU_SIZE_X			(ScreenWidth - (TMENU_INDENT_X * 2))
+#define TMENU_SIZE_Y			(TMENU_HEADER + BUTTON_SIZE_Y * 7)
+#define TMENU_PLAYER_INDENT		(((float)TMENU_SIZE_X / 3) * 2)
+#define TMENU_INDENT_Y			(((float)ScreenHeight - TMENU_SIZE_Y) / 2)
+
+// Class Menu
+#define CLMENU_INDENT_X			(30 * ((float)ScreenHeight / 640))
+#define CLMENU_HEADER			100
+#define CLMENU_SIZE_X			(ScreenWidth - (CLMENU_INDENT_X * 2))
+#define CLMENU_SIZE_Y			(CLMENU_HEADER + BUTTON_SIZE_Y * 11)
+#define CLMENU_PLAYER_INDENT	(((float)CLMENU_SIZE_X / 3) * 2)
+#define CLMENU_INDENT_Y			(((float)ScreenHeight - CLMENU_SIZE_Y) / 2)
+
+// Arrows
+enum
+{
+	ARROW_UP,
+	ARROW_DOWN,
+	ARROW_LEFT,
+	ARROW_RIGHT,
+};
+
+//==============================================================================
+// VIEWPORT PIECES
+//============================================================
+// Wrapper for an Image Label without a background
+class CImageLabel : public Label
+{
+public:
+	BitmapTGA	*m_pTGA;
+
+public:
+	void LoadImage(const char * pImageName);
+	CImageLabel( const char* pImageName,int x,int y );
+	CImageLabel( const char* pImageName,int x,int y,int wide,int tall );
+
+	virtual int getImageTall();
+	virtual int getImageWide();
+
+	virtual void paintBackground()
+	{
+		// Do nothing, so the background's left transparent.
+	}
+};
+
+// Command Label
+// Overridden label so we can darken it when submenus open
+class CommandLabel : public Label
+{
+private:
+	int		m_iState;
+
+public:
+	CommandLabel(const char* text,int x,int y,int wide,int tall) : Label(text,x,y,wide,tall)
+	{
+		m_iState = false;
+	}
+
+	void PushUp()
+	{
+		m_iState = false;
+		repaint();
+	}
+
+	void PushDown()
+	{
+		m_iState = true;
+		repaint();
+	}
+};
+
+//============================================================
+// Command Buttons
+class CommandButton : public Button
+{
+private:
+	int		m_iPlayerClass;
+	bool	m_bFlat;
+
+	// Submenus under this button
+	CCommandMenu *m_pSubMenu;
+	CCommandMenu *m_pParentMenu;
+	CommandLabel *m_pSubLabel;
+
+	char m_sMainText[MAX_BUTTON_SIZE];
+	char m_cBoundKey;
+
+	SchemeHandle_t m_hTextScheme;
+
+	void RecalculateText( void );
+
+public:
+	bool	m_bNoHighlight;
+
+public:
+	CommandButton(const char* text,int x,int y,int wide,int tall, bool bNoHighlight, bool bFlat);
+	// Constructors
+	CommandButton( const char* text,int x,int y,int wide,int tall, bool bNoHighlight = false);
+	CommandButton( int iPlayerClass, const char* text,int x,int y,int wide,int tall, bool bFlat );
+
+	void Init( void );
+
+	// Menu Handling
+	void AddSubMenu( CCommandMenu *pNewMenu );
+	void AddSubLabel( CommandLabel *pSubLabel )
+	{
+		m_pSubLabel = pSubLabel;
+	}
+
+	virtual int IsNotValid( void )
+	{
+		return false;
+	}
+
+	void UpdateSubMenus( int iAdjustment );
+	int GetPlayerClass() { return m_iPlayerClass; };
+	CCommandMenu *GetSubMenu() { return m_pSubMenu; };
+	
+	CCommandMenu *getParentMenu( void );
+	void setParentMenu( CCommandMenu *pParentMenu );
+
+	// Overloaded vgui functions
+	virtual void paint();
+	virtual void setText( const char *text );
+	virtual void paintBackground();
+
+	void cursorEntered( void );
+	void cursorExited( void );
+
+	void setBoundKey( char boundKey );
+	char getBoundKey( void );
+};
+
+class ColorButton : public CommandButton
+{
+private:
+
+	Color *ArmedColor;
+	Color *UnArmedColor;
+
+	Color *ArmedBorderColor;
+	Color *UnArmedBorderColor;
+
+public:
+	ColorButton( const char* text,int x,int y,int wide,int tall, bool bNoHighlight, bool bFlat ) : 
+	  CommandButton( text, x, y, wide, tall, bNoHighlight, bFlat  ) 
+	  {
+		  ArmedColor = NULL;
+		  UnArmedColor = NULL;
+		  ArmedBorderColor = NULL;
+		  UnArmedBorderColor = NULL;
+	  }
+	
+
+	virtual void paintBackground()
+	{
+		int r, g, b, a;
+		Color bgcolor;
+
+		if ( isArmed() )
+		{
+			// Highlight background
+		/*	getBgColor(bgcolor);
+			bgcolor.getColor(r, g, b, a);
+			drawSetColor( r,g,b,a );
+			drawFilledRect(0,0,_size[0],_size[1]);*/
+
+			if ( ArmedBorderColor )
+			{
+				ArmedBorderColor->getColor( r, g, b, a);
+				drawSetColor( r, g, b, a );
+				drawOutlinedRect(0,0,_size[0],_size[1]);
+			}
+		}
+		else
+		{
+			if ( UnArmedBorderColor )
+			{
+				UnArmedBorderColor->getColor( r, g, b, a);
+				drawSetColor( r, g, b, a );
+				drawOutlinedRect(0,0,_size[0],_size[1]);
+			}
+		}
+	}
+	void paint()
+	{
+		int r, g, b, a;
+		if ( isArmed() )
+		{
+			if (ArmedColor)
+			{
+				ArmedColor->getColor(r, g, b, a);
+				setFgColor(r, g, b, a);
+			}
+			else
+				setFgColor( Scheme::sc_secondary2 );
+		}
+		else
+		{
+			if (UnArmedColor)
+			{
+				UnArmedColor->getColor(r, g, b, a);
+				setFgColor(r, g, b, a);
+			}
+			else
+				setFgColor( Scheme::sc_primary1 );
+		}
+		
+		Button::paint();
+	}
+	
+	void setArmedColor ( int r, int g, int b, int a )
+	{
+		ArmedColor = new Color( r, g, b, a );
+	}
+
+	void setUnArmedColor ( int r, int g, int b, int a )
+	{
+		UnArmedColor = new Color( r, g, b, a );
+	}
+
+	void setArmedBorderColor ( int r, int g, int b, int a )
+	{
+		ArmedBorderColor = new Color( r, g, b, a );
+	}
+
+	void setUnArmedBorderColor ( int r, int g, int b, int a )
+	{
+		UnArmedBorderColor = new Color( r, g, b, a );
+	}
+};
+
+class SpectButton : public CommandButton
+{
+private:
+	
+public:
+	SpectButton( int iPlayerClass, const char* text,int x,int y,int wide,int tall ) : 
+	  CommandButton( text, x, y, wide, tall, false)
+	  {
+		  	Init();
+			
+			setText( text );
+	  }
+		
+	virtual void paintBackground()
+	{
+		if ( isArmed())
+		{
+			drawSetColor( 143,143, 54, 125 ); 
+			drawFilledRect( 5, 0,_size[0] - 5,_size[1]);
+		}
+	}
+
+	virtual void paint()
+	{
+	
+		if ( isArmed() )
+		{
+			setFgColor( 194, 202, 54, 0 );
+		}
+		else
+		{
+			setFgColor( 143, 143, 54, 15 );
+		}
+
+		Button::paint();
+	}
+};
+//============================================================
+// Command Menus
+class CCommandMenu : public Panel
+{
+private:
+	CCommandMenu *m_pParentMenu;
+	int			  m_iXOffset;
+	int			  m_iYOffset;
+
+	// Buttons in this menu
+	CommandButton *m_aButtons[ MAX_BUTTONS ];
+	int			  m_iButtons;
+
+	// opens menu from top to bottom (0 = default), or from bottom to top (1)?
+	int				m_iDirection; 
+public:
+	CCommandMenu( CCommandMenu *pParentMenu, int x,int y,int wide,int tall ) : Panel(x,y,wide,tall)
+	{
+		m_pParentMenu = pParentMenu;
+		m_iXOffset = x;
+		m_iYOffset = y;
+		m_iButtons = 0;
+		m_iDirection = 0;
+	}
+
+	CCommandMenu( CCommandMenu *pParentMenu, int direction, int x,int y,int wide,int tall ) : Panel(x,y,wide,tall)
+	{
+		m_pParentMenu = pParentMenu;
+		m_iXOffset = x;
+		m_iYOffset = y;
+		m_iButtons = 0;
+		m_iDirection = direction;
+	}
+
+	float		m_flButtonSizeY;
+	int			m_iSpectCmdMenu;
+	void		AddButton( CommandButton *pButton );
+	bool		RecalculateVisibles( int iNewYPos, bool bHideAll );
+	void		RecalculatePositions( int iYOffset );
+	void		MakeVisible( CCommandMenu *pChildMenu );
+
+	CCommandMenu *GetParentMenu() { return m_pParentMenu; };
+	int			GetXOffset() { return m_iXOffset; };
+	int			GetYOffset() { return m_iYOffset; };
+	int			GetDirection() { return m_iDirection; };
+	int			GetNumButtons() { return m_iButtons; };
+	CommandButton *FindButtonWithSubmenu( CCommandMenu *pSubMenu );
+
+	void		ClearButtonsOfArmedState( void );
+    void        RemoveAllButtons();
+
+	bool		KeyInput( int keyNum );
+
+	virtual void paintBackground();
+};
+
+#ifdef AVH_PLAYTEST_BUILD
+class OptionsScreenInputSignal : public InputSignal
+{
+public:
+	virtual void cursorMoved(int x,int y,Panel* panel);
+	virtual void cursorEntered(Panel* panel);
+	virtual void cursorExited(Panel* panel);
+	virtual void mousePressed(MouseCode code,Panel* panel);
+	virtual void mouseDoublePressed(MouseCode code,Panel* panel);
+	virtual void mouseReleased(MouseCode code,Panel* panel);
+	virtual void mouseWheeled(int delta,Panel* panel);
+	virtual void keyPressed(KeyCode code,Panel* panel);
+	virtual void keyTyped(KeyCode code,Panel* panel);
+	virtual void keyReleased(KeyCode code,Panel* panel);
+	virtual void keyFocusTicked(Panel* panel);
+
+private:
+	void SelectLabel(Panel* inPanel);
+};
+#endif
+
+class SmartLabel : public vgui::Label
+{
+public:
+	virtual void	setText(int inTextBufferLen, const char* inText)
+	{
+		Label::setText(inTextBufferLen, inText);
+		this->mString = string(inText);
+	}
+
+	virtual string	getText() const
+	{
+		return this->mString;
+	}
+
+private:
+	string			mString;
+};
+
+//==============================================================================
+class TeamFortressViewport : public Panel
+{
+private:
+	vgui::Cursor* _cursorNone;
+	vgui::Cursor* _cursorArrow;
+
+	int			 m_iInitialized;
+
+	CCommandMenu *m_pCommandMenus[ MAX_MENUS ];
+	CCommandMenu *m_pCurrentCommandMenu;
+	float		 m_flMenuOpenTime;
+	float		 m_flScoreBoardLastUpdated;
+	float		 m_flSpectatorPanelLastUpdated;
+	int			 m_iNumMenus;
+	int			 m_iCurrentTeamNumber;
+	int			 m_iCurrentPlayerClass;
+	int			 m_iUser1;
+	int			 m_iUser2;
+	int			 m_iUser3;
+
+	// VGUI Menus
+	void		 CreateTeamMenu( void );
+	CMenuPanel*	 ShowTeamMenu( void );
+	void		 CreateClassMenu( void );
+	CMenuPanel*	 ShowClassMenu( void );
+	void		 CreateSpectatorMenu( void );
+
+	// Scheme handler
+	CSchemeManager m_SchemeManager;
+
+	// MOTD
+	int		m_iGotAllMOTD;
+	char	m_szMOTD[ MAX_MOTD_LENGTH ];
+
+	//  Command Menu Team buttons
+	CommandButton *m_pTeamButtons[6];
+	CommandButton *m_pDisguiseButtons[5];
+	BuildButton   *m_pBuildButtons[3];
+	BuildButton   *m_pBuildActiveButtons[3];
+
+	// Server Browser
+	ServerBrowser *m_pServerBrowser;
+
+	// Spectator "menu"
+	CTransparentPanel	*m_pSpectatorMenu;
+	Label				*m_pSpectatorLabel;
+	Label				*m_pSpectatorHelpLabel;
+	int					m_iAllowSpectators;
+
+    ChatPanel*          m_chatPanel;
+
+	// Data for specific sections of the Command Menu
+	int			m_iValidClasses[5];
+	int			m_iIsFeigning;
+	int			m_iIsSettingDetpack;
+	int			m_iNumberOfTeams;
+	int			m_iBuildState;
+	int			m_iRandomPC;
+	char		m_sTeamNames[5][MAX_TEAMNAME_SIZE];
+
+	// Localisation strings
+	char		m_sDetpackStrings[3][MAX_BUTTON_SIZE];
+
+	char		m_sMapName[MAX_MAPNAME_LENGTH];
+public:
+	TeamFortressViewport(int x,int y,int wide,int tall);
+	void Initialize( void );
+
+	int		CreateCommandMenu( char * menuFile, int direction, int yOffset, bool flatDesign, float flButtonSizeX, float flButtonSizeY, int xOffset );
+	void	CreateScoreBoard( void );
+	void	CreateOptionsMenu();
+    
+    void    CreatePlayerMenu();
+    void    UpdatePlayerMenu();
+
+	void	CreateServerBrowser( void );
+	CommandButton * CreateCustomButton( char *pButtonText, char * pButtonName, int  iYOffset );
+	CCommandMenu *	CreateDisguiseSubmenu( CommandButton *pButton, CCommandMenu *pParentMenu, const char *commandText, int iYOffset, int iXOffset = 0 );
+
+	void UpdateCursorState( void );
+	void UpdateCommandMenu(int menuIndex);
+	void UpdateOnPlayerInfo( void );
+	void UpdateHighlights( void );
+	void UpdateSpectatorPanel( void );
+
+	int	 KeyInput( int down, int keynum, const char *pszCurrentBinding );
+	void InputPlayerSpecial( void );
+	void GetAllPlayersInfo( void );
+	void DeathMsg( int killer, int victim );
+
+    ChatPanel* GetChatPanel();
+    
+	void ShowCommandMenu(int menuIndex);
+	void InputSignalHideCommandMenu( void );
+	void HideCommandMenu( void );
+	void SetCurrentCommandMenu( CCommandMenu *pNewMenu );
+	void SetCurrentMenu( CMenuPanel *pMenu );
+
+	void ShowScoreBoard( void );
+	void HideScoreBoard( void );
+	bool IsScoreBoardVisible( void );
+
+	void ShowOptionsMenu();
+	void HideOptionsMenu();
+	bool IsOptionsMenuVisible();
+
+	bool AllowedToPrintText( void );
+
+	void ShowVGUIMenu( int iMenu );
+	void HideVGUIMenu( void );
+	void HideTopMenu( void );
+
+	void ToggleServerBrowser( void );
+
+	CMenuPanel* CreateTextWindow( int iTextToShow );
+
+	CCommandMenu *CreateSubMenu( CommandButton *pButton, CCommandMenu *pParentMenu, int iYOffset, int iXOffset = 0 );
+
+	// Data Handlers
+	int GetValidClasses(int iTeam) { return m_iValidClasses[iTeam]; };
+	int GetNumberOfTeams() { return m_iNumberOfTeams; };
+	int GetIsFeigning() { return m_iIsFeigning; };
+	int GetIsSettingDetpack() { return m_iIsSettingDetpack; };
+	int GetBuildState() { return m_iBuildState; };
+	int IsRandomPC() { return m_iRandomPC; };
+	char *GetTeamName( int iTeam );
+	int GetAllowSpectators() { return m_iAllowSpectators; };
+
+	// Message Handlers
+	int MsgFunc_ValClass(const char *pszName, int iSize, void *pbuf );
+	int MsgFunc_TeamNames(const char *pszName, int iSize, void *pbuf );
+	int MsgFunc_Feign(const char *pszName, int iSize, void *pbuf );
+	int MsgFunc_Detpack(const char *pszName, int iSize, void *pbuf );
+	int MsgFunc_VGUIMenu(const char *pszName, int iSize, void *pbuf );
+	int MsgFunc_MOTD( const char *pszName, int iSize, void *pbuf );
+	int MsgFunc_BuildSt( const char *pszName, int iSize, void *pbuf );
+	int MsgFunc_RandomPC( const char *pszName, int iSize, void *pbuf );
+	int MsgFunc_ServerName( const char *pszName, int iSize, void *pbuf );
+	int MsgFunc_ScoreInfo( const char *pszName, int iSize, void *pbuf );
+	int MsgFunc_TeamScore( const char *pszName, int iSize, void *pbuf );
+	int MsgFunc_TeamInfo( const char *pszName, int iSize, void *pbuf );
+	int MsgFunc_Spectator( const char *pszName, int iSize, void *pbuf );
+	int MsgFunc_AllowSpec( const char *pszName, int iSize, void *pbuf );
+
+	// Input
+	bool SlotInput( int iSlot );
+
+	virtual void paintBackground();
+
+	CSchemeManager *GetSchemeManager( void ) { return &m_SchemeManager; }
+	ScorePanel *GetScoreBoard( void ) { return m_pScoreBoard; }
+
+	void *operator new( size_t stAllocateBlock );
+
+public:
+	// VGUI Menus
+	CMenuPanel		*m_pCurrentMenu;
+	CTeamMenuPanel	*m_pTeamMenu;
+	int						m_StandardMenu;	// indexs in m_pCommandMenus
+	int						m_SpectatorOptionsMenu;
+	int						m_SpectatorCameraMenu;
+    int                     m_SpectatorPlayerMenu;
+	CClassMenuPanel	*m_pClassMenu;
+	ScorePanel		*m_pScoreBoard;
+	CTransparentPanel*	mOptionsScreen;
+	CommandButton**		mOptionsButtons;
+
+	#ifdef AVH_PLAYTEST_BUILD
+	void						AddAnalysisLine(const string& inAnalysisLine);
+	void						AddBalanceVariable(const string& inVariableName);
+
+	#define						kMaxPlaytestVariables 2048
+
+	CListBox*					mPlaytestVariables;
+	SmartLabel					mPlaytestEntryLabels[kMaxPlaytestVariables];
+	int							mPlaytestVariableRow;
+
+	CListBox*					mPlaytestAnalysis;
+	SmartLabel					mPlaytestAnalysisLabels[kMaxPlaytestVariables];
+	int							mPlaytestAnalysisRow;
+	bool						mBalanceChanged;
+	void						RecomputeAnalysis();
+
+	OptionsScreenInputSignal	mPlaytestInputSignal;
+	SmartLabel					mPlaytestVariableName;
+	TextEntry*					mPlaytestVariableValue;
+	string						mPlaytestVariableValueBeforeHide;
+	int							mPlaytestVariableWidth;
+	int							mPlaytestVariableHeight;
+	int							mPlaytestAnalysisWidth;
+	int							mPlaytestAnalysisHeight;
+	vgui::BitmapTGA*			mNSLogoBitmap;
+	vgui::Label*				mNSLogoLabel;
+	#endif
+
+	SpectatorPanel	*m_pSpectatorPanel;
+	char			m_szServerName[ MAX_SERVERNAME_LENGTH ];
+};
+
+//============================================================
+// Command Menu Button Handlers
+#define MAX_COMMAND_SIZE	256
+
+class CMenuHandler_StringCommand : public ActionSignal
+{
+protected:
+	char	m_pszCommand[MAX_COMMAND_SIZE];
+	int		m_iCloseVGUIMenu;
+public:
+	CMenuHandler_StringCommand( char *pszCommand )
+	{
+		strncpy( m_pszCommand, pszCommand, MAX_COMMAND_SIZE);
+		m_pszCommand[MAX_COMMAND_SIZE-1] = '\0';
+		m_iCloseVGUIMenu = false;
+	}
+
+	CMenuHandler_StringCommand( char *pszCommand, int iClose )
+	{
+		strncpy( m_pszCommand, pszCommand, MAX_COMMAND_SIZE);
+		m_pszCommand[MAX_COMMAND_SIZE-1] = '\0';
+		m_iCloseVGUIMenu = true;
+	}
+
+	virtual void actionPerformed(Panel* panel)
+	{
+		gEngfuncs.pfnClientCmd(m_pszCommand);
+
+		if (m_iCloseVGUIMenu)
+			gViewPort->HideTopMenu();
+		else
+			gViewPort->HideCommandMenu();
+	}
+};
+
+class COptionsScreen_StringCommand : public CMenuHandler_StringCommand
+{
+public:
+	COptionsScreen_StringCommand( char *pszCommand ) : CMenuHandler_StringCommand(pszCommand)
+	{
+	}
+
+	virtual void actionPerformed(Panel* panel)
+	{
+		CMenuHandler_StringCommand::actionPerformed(panel);
+
+		gViewPort->HideOptionsMenu();
+	}
+};
+
+
+
+// This works the same as CMenuHandler_StringCommand, except it watches the string command 
+// for specific commands, and modifies client vars based upon them.
+class CMenuHandler_StringCommandWatch : public CMenuHandler_StringCommand
+{
+private:
+public:
+	CMenuHandler_StringCommandWatch( char *pszCommand ) : CMenuHandler_StringCommand( pszCommand )
+	{
+	}
+
+	CMenuHandler_StringCommandWatch( char *pszCommand, int iClose ) : CMenuHandler_StringCommand( pszCommand, iClose )
+	{
+	}
+
+	virtual void actionPerformed(Panel* panel)
+	{
+		CMenuHandler_StringCommand::actionPerformed( panel );
+
+		// Try to guess the player's new team (it'll be corrected if it's wrong)
+		if ( !strcmp( m_pszCommand, "jointeam 1" ) )
+			g_iTeamNumber = 1;
+		else if ( !strcmp( m_pszCommand, "jointeam 2" ) )
+			g_iTeamNumber = 2;
+		else if ( !strcmp( m_pszCommand, "jointeam 3" ) )
+			g_iTeamNumber = 3;
+		else if ( !strcmp( m_pszCommand, "jointeam 4" ) )
+			g_iTeamNumber = 4;
+	}
+};
+
+// Used instead of CMenuHandler_StringCommand for Class Selection buttons.
+// Checks the state of hud_classautokill and kills the player if set
+class CMenuHandler_StringCommandClassSelect : public CMenuHandler_StringCommand
+{
+private:
+public:
+	CMenuHandler_StringCommandClassSelect( char *pszCommand ) : CMenuHandler_StringCommand( pszCommand )
+	{
+	}
+
+	CMenuHandler_StringCommandClassSelect( char *pszCommand, int iClose ) : CMenuHandler_StringCommand( pszCommand, iClose )
+	{
+	}
+
+	virtual void actionPerformed(Panel* panel);
+};
+
+class CMenuHandler_PopupSubMenuInput : public InputSignal
+{
+private:
+	CCommandMenu *m_pSubMenu;
+	Button		 *m_pButton;
+public:
+	CMenuHandler_PopupSubMenuInput( Button *pButton, CCommandMenu *pSubMenu )
+	{
+		m_pSubMenu = pSubMenu;
+		m_pButton = pButton;
+	}
+
+	virtual void cursorMoved(int x,int y,Panel* panel)
+	{
+		//gViewPort->SetCurrentCommandMenu( m_pSubMenu );
+	}
+
+	virtual void cursorEntered(Panel* panel) 
+	{
+		gViewPort->SetCurrentCommandMenu( m_pSubMenu );
+
+		if (m_pButton)
+			m_pButton->setArmed(true);
+	};
+	virtual void cursorExited(Panel* Panel) {};
+	virtual void mousePressed(MouseCode code,Panel* panel)  {};
+	virtual void mouseDoublePressed(MouseCode code,Panel* panel)  {};
+	virtual void mouseReleased(MouseCode code,Panel* panel) {};
+	virtual void mouseWheeled(int delta,Panel* panel) {};
+	virtual void keyPressed(KeyCode code,Panel* panel) {};
+	virtual void keyTyped(KeyCode code,Panel* panel) {};
+	virtual void keyReleased(KeyCode code,Panel* panel) {};
+	virtual void keyFocusTicked(Panel* panel) {};
+};
+
+class CMenuHandler_LabelInput : public InputSignal
+{
+private:
+	ActionSignal *m_pActionSignal;
+public:
+	CMenuHandler_LabelInput( ActionSignal *pSignal )
+	{
+		m_pActionSignal = pSignal;
+	}
+
+	virtual void mousePressed(MouseCode code,Panel* panel)
+	{
+		m_pActionSignal->actionPerformed( panel );
+	}
+
+	virtual void mouseReleased(MouseCode code,Panel* panel) {};
+	virtual void cursorEntered(Panel* panel) {};
+	virtual void cursorExited(Panel* Panel) {};
+	virtual void cursorMoved(int x,int y,Panel* panel) {};
+	virtual void mouseDoublePressed(MouseCode code,Panel* panel)  {};
+	virtual void mouseWheeled(int delta,Panel* panel) {};
+	virtual void keyPressed(KeyCode code,Panel* panel) {};
+	virtual void keyTyped(KeyCode code,Panel* panel) {};
+	virtual void keyReleased(KeyCode code,Panel* panel) {};
+	virtual void keyFocusTicked(Panel* panel) {};
+};
+
+#define HIDE_TEXTWINDOW		0
+#define SHOW_MAPBRIEFING	1
+#define SHOW_CLASSDESC		2
+#define SHOW_MOTD			3
+#define SHOW_SPECHELP		4
+
+class CMenuHandler_TextWindow : public ActionSignal
+{
+private:
+	int	m_iState;
+public:
+	CMenuHandler_TextWindow( int iState )
+	{
+		m_iState = iState;
+	}
+
+	virtual void actionPerformed(Panel* panel)
+	{
+		if (m_iState == HIDE_TEXTWINDOW)
+		{
+			gViewPort->HideTopMenu();
+		}
+		else 
+		{
+			gViewPort->HideCommandMenu();
+			gViewPort->ShowVGUIMenu( m_iState );
+		}
+	}
+};
+
+class CMenuHandler_ToggleCvar : public ActionSignal
+{
+private:
+	struct cvar_s * m_cvar;
+
+public:
+	CMenuHandler_ToggleCvar( char * cvarname )
+	{
+		m_cvar = gEngfuncs.pfnGetCvarPointer( cvarname );
+	}
+
+	virtual void actionPerformed(Panel* panel)
+	{
+		if ( m_cvar->value )
+			m_cvar->value = 0.0f;
+		else
+			m_cvar->value = 1.0f;
+
+		gViewPort->UpdateSpectatorPanel();
+	}
+
+	
+};
+class CDragNDropHandler : public InputSignal
+{
+private:
+	DragNDropPanel*	m_pPanel;
+	bool			m_bDragging;
+	int				m_iaDragOrgPos[2];
+	int				m_iaDragStart[2];
+
+public:
+	CDragNDropHandler(DragNDropPanel* pPanel)
+	{
+		m_pPanel = pPanel;
+		m_bDragging = false;
+	}
+
+	void cursorMoved(int x,int y,Panel* panel);
+	void mousePressed(MouseCode code,Panel* panel);
+	void mouseReleased(MouseCode code,Panel* panel);
+
+	void mouseDoublePressed(MouseCode code,Panel* panel) {};
+	void cursorEntered(Panel* panel) {};
+	void cursorExited(Panel* panel) {};
+	void mouseWheeled(int delta,Panel* panel) {};
+	void keyPressed(KeyCode code,Panel* panel) {};
+	void keyTyped(KeyCode code,Panel* panel) {};
+	void keyReleased(KeyCode code,Panel* panel) {};
+	void keyFocusTicked(Panel* panel) {};
+};
+
+class CHandler_MenuButtonOver : public InputSignal
+{
+private:
+	int			m_iButton;
+	CMenuPanel	*m_pMenuPanel;
+public:
+	CHandler_MenuButtonOver( CMenuPanel *pPanel, int iButton )
+	{
+		m_iButton = iButton;
+		m_pMenuPanel = pPanel;
+	}
+		
+	void cursorEntered(Panel *panel);
+
+	void cursorMoved(int x,int y,Panel* panel) {};
+	void mousePressed(MouseCode code,Panel* panel) {};
+	void mouseReleased(MouseCode code,Panel* panel) {};
+	void mouseDoublePressed(MouseCode code,Panel* panel) {};
+	void cursorExited(Panel* panel) {};
+	void mouseWheeled(int delta,Panel* panel) {};
+	void keyPressed(KeyCode code,Panel* panel) {};
+	void keyTyped(KeyCode code,Panel* panel) {};
+	void keyReleased(KeyCode code,Panel* panel) {};
+	void keyFocusTicked(Panel* panel) {};
+};
+
+class CHandler_ButtonHighlight : public InputSignal
+{
+private:
+	Button *m_pButton;
+public:
+	CHandler_ButtonHighlight( Button *pButton )
+	{
+		m_pButton = pButton;
+	}
+
+	virtual void cursorEntered(Panel* panel) 
+	{ 
+		m_pButton->setArmed(true);
+	};
+	virtual void cursorExited(Panel* Panel) 
+	{
+		m_pButton->setArmed(false);
+	};
+	virtual void mousePressed(MouseCode code,Panel* panel) {};
+	virtual void mouseReleased(MouseCode code,Panel* panel) {};
+	virtual void cursorMoved(int x,int y,Panel* panel) {};
+	virtual void mouseDoublePressed(MouseCode code,Panel* panel)  {};
+	virtual void mouseWheeled(int delta,Panel* panel) {};
+	virtual void keyPressed(KeyCode code,Panel* panel) {};
+	virtual void keyTyped(KeyCode code,Panel* panel) {};
+	virtual void keyReleased(KeyCode code,Panel* panel) {};
+	virtual void keyFocusTicked(Panel* panel) {};
+};
+
+//-----------------------------------------------------------------------------
+// Purpose: Special handler for highlighting of command menu buttons
+//-----------------------------------------------------------------------------
+class CHandler_CommandButtonHighlight : public CHandler_ButtonHighlight
+{
+private:
+	CommandButton *m_pCommandButton;
+public:
+	CHandler_CommandButtonHighlight( CommandButton *pButton ) : CHandler_ButtonHighlight( pButton )
+	{
+		m_pCommandButton = pButton;
+	}
+
+	virtual void cursorEntered( Panel *panel )
+	{
+		m_pCommandButton->cursorEntered();
+	}
+
+	virtual void cursorExited( Panel *panel )
+	{
+		m_pCommandButton->cursorExited();
+	}
+};
+
+
+//================================================================
+// Overidden Command Buttons for special visibilities
+class ClassButton : public CommandButton
+{
+protected:
+	int	m_iPlayerClass;
+
+public:
+	ClassButton( int iClass, const char* text,int x,int y,int wide,int tall, bool bNoHighlight ) : CommandButton( text,x,y,wide,tall, bNoHighlight)
+	{
+		m_iPlayerClass = iClass;
+	}
+
+	virtual int IsNotValid();
+};
+
+class TeamButton : public CommandButton
+{
+private:
+	int	m_iTeamNumber;
+public:
+	TeamButton( int iTeam, const char* text,int x,int y,int wide,int tall ) : CommandButton( text,x,y,wide,tall)
+	{
+		m_iTeamNumber = iTeam;
+	}
+
+	virtual int IsNotValid()
+	{
+		int iTeams = gViewPort->GetNumberOfTeams();
+		// Never valid if there's only 1 team
+		if (iTeams == 1)
+			return true;
+
+		// Auto Team's always visible
+		if (m_iTeamNumber == 5)
+			return false;
+
+		if (iTeams >= m_iTeamNumber && m_iTeamNumber != g_iTeamNumber)
+			return false;
+
+		return true;
+	}
+};
+
+class FeignButton : public CommandButton
+{
+private:
+	int	m_iFeignState;
+public:
+	FeignButton( int iState, const char* text,int x,int y,int wide,int tall ) : CommandButton( text,x,y,wide,tall)
+	{
+		m_iFeignState = iState;
+	}
+
+	virtual int IsNotValid()
+	{
+		// Only visible for spies
+		if (g_iPlayerClass != PC_SPY)
+			return true;
+
+		if (m_iFeignState == gViewPort->GetIsFeigning())
+			return false;
+
+		return true;
+	}
+};
+
+class SpectateButton : public CommandButton
+{
+public:
+	SpectateButton( const char* text,int x,int y,int wide,int tall, bool bNoHighlight ) : CommandButton( text,x,y,wide,tall, bNoHighlight)
+	{
+	}
+
+	virtual int IsNotValid()
+	{
+		// Only visible if the server allows it
+		if ( gViewPort->GetAllowSpectators() != 0 )
+			return false;
+
+		return true;
+	}
+};
+
+#define		DISGUISE_TEAM1		(1<<0)
+#define		DISGUISE_TEAM2		(1<<1)
+#define		DISGUISE_TEAM3		(1<<2)
+#define		DISGUISE_TEAM4		(1<<3)
+
+class DisguiseButton : public CommandButton
+{
+private:
+	int m_iValidTeamsBits;
+	int m_iThisTeam;
+public:
+	DisguiseButton( int iValidTeamNumsBits, const char* text,int x,int y,int wide,int tall ) : CommandButton( text,x,y,wide,tall,false )
+	{
+		m_iValidTeamsBits = iValidTeamNumsBits;
+	}
+
+	virtual int IsNotValid()
+	{
+		// Only visible for spies
+		if ( g_iPlayerClass != PC_SPY )
+			return true;
+
+		// if it's not tied to a specific team, then always show (for spies)
+		if ( !m_iValidTeamsBits )
+			return false;
+
+		// if we're tied to a team make sure we can change to that team
+		int iTmp = 1 << (gViewPort->GetNumberOfTeams() - 1);
+		if ( m_iValidTeamsBits & iTmp )
+			return false;
+
+		return true;
+	}
+};
+
+class DetpackButton : public CommandButton
+{
+private:
+	int	m_iDetpackState;
+public:
+	DetpackButton( int iState, const char* text,int x,int y,int wide,int tall ) : CommandButton( text,x,y,wide,tall)
+	{
+		m_iDetpackState = iState;
+	}
+
+	virtual int IsNotValid()
+	{
+		// Only visible for demomen
+		if (g_iPlayerClass != PC_DEMOMAN)
+			return true;
+
+		if (m_iDetpackState == gViewPort->GetIsSettingDetpack())
+			return false;
+
+		return true;
+	}
+};
+
+extern int iBuildingCosts[];
+#define BUILDSTATE_HASBUILDING		(1<<0)		// Data is building ID (1 = Dispenser, 2 = Sentry)
+#define BUILDSTATE_BUILDING			(1<<1)
+#define BUILDSTATE_BASE				(1<<2)
+#define BUILDSTATE_CANBUILD			(1<<3)		// Data is building ID (0 = Dispenser, 1 = Sentry)
+
+class BuildButton : public CommandButton
+{
+private:
+	int	m_iBuildState;
+	int m_iBuildData;
+
+public:
+	enum Buildings
+	{
+		DISPENSER = 0,
+		SENTRYGUN = 1,
+	};
+
+	BuildButton( int iState, int iData, const char* text,int x,int y,int wide,int tall ) : CommandButton( text,x,y,wide,tall)
+	{
+		m_iBuildState = iState;
+		m_iBuildData = iData;
+	}
+
+	virtual int IsNotValid()
+	{
+		// Only visible for engineers
+		if (g_iPlayerClass != PC_ENGINEER)
+			return true;
+
+		// If this isn't set, it's only active when they're not building
+		if (m_iBuildState & BUILDSTATE_BUILDING)
+		{
+			// Make sure the player's building
+			if ( !(gViewPort->GetBuildState() & BS_BUILDING) )
+				return true;
+		}
+		else
+		{
+			// Make sure the player's not building
+			if ( gViewPort->GetBuildState() & BS_BUILDING )
+				return true;
+		}
+
+		if (m_iBuildState & BUILDSTATE_BASE)
+		{
+			// Only appear if we've got enough metal to build something, or something already built
+			if ( gViewPort->GetBuildState() & (BS_HAS_SENTRYGUN | BS_HAS_DISPENSER | BS_CANB_SENTRYGUN | BS_CANB_DISPENSER) )
+				return false;
+
+			return true;
+		}
+
+		// Must have a building
+		if (m_iBuildState & BUILDSTATE_HASBUILDING)
+		{
+			if ( m_iBuildData == BuildButton::DISPENSER && !(gViewPort->GetBuildState() & BS_HAS_DISPENSER) )
+				return true;
+			if ( m_iBuildData == BuildButton::SENTRYGUN && !(gViewPort->GetBuildState() & BS_HAS_SENTRYGUN) )
+				return true;
+		}
+
+		// Can build something
+		if (m_iBuildState & BUILDSTATE_CANBUILD)
+		{
+			// Make sure they've got the ammo and don't have one already
+			if ( m_iBuildData == BuildButton::DISPENSER && (gViewPort->GetBuildState() & BS_CANB_DISPENSER) )
+				return false;
+			if ( m_iBuildData == BuildButton::SENTRYGUN && (gViewPort->GetBuildState() & BS_CANB_SENTRYGUN) )
+				return false;
+
+			return true;
+		}
+
+		return false;
+	}
+};
+
+#define MAX_MAPNAME 256
+
+class MapButton : public CommandButton
+{
+private:
+	char m_szMapName[ MAX_MAPNAME ];
+
+public:
+	MapButton( const char *pMapName, const char* text,int x,int y,int wide,int tall ) : CommandButton( text,x,y,wide,tall)
+	{
+		sprintf( m_szMapName, "maps/%s.bsp", pMapName );
+	}
+
+	virtual int IsNotValid()
+	{
+		const char *level = gEngfuncs.pfnGetLevelName();
+		if (!level)
+			return true;
+
+		// Does it match the current map name?
+		if ( strcmp(m_szMapName, level) )
+			return true;
+
+		return false;
+	}
+};
+
+//-----------------------------------------------------------------------------
+// Purpose: CommandButton which is only displayed if the player is on team X
+//-----------------------------------------------------------------------------
+class TeamOnlyCommandButton : public CommandButton
+{
+private:
+	int m_iTeamNum;
+
+public:
+	TeamOnlyCommandButton( int iTeamNum, const char* text,int x,int y,int wide,int tall, bool flat ) : 
+	  CommandButton( text, x, y, wide, tall, false, flat ), m_iTeamNum(iTeamNum) {}
+
+	virtual int IsNotValid()
+	{
+		if ( g_iTeamNumber != m_iTeamNum )
+			return true;
+
+		return CommandButton::IsNotValid();
+	}
+
+	virtual void paintBackground()
+	{
+		if ( isArmed() )
+		{
+			drawSetColor( 143,143, 54, 125 ); 
+			drawFilledRect( 5, 0,_size[0] - 5,_size[1]);
+		}
+	}
+	
+	virtual void paint( void )
+	{
+		if ( isArmed() )
+		{ 
+			setFgColor( 194, 202, 54, 0 );
+		}
+		else
+		{
+			setFgColor( 143, 143, 54, 15 );
+		}
+
+		Button::paint();
+	}
+};
+
+//-----------------------------------------------------------------------------
+// Purpose: CommandButton which is only displayed if the player is on team X
+//-----------------------------------------------------------------------------
+class ToggleCommandButton : public CommandButton, public InputSignal
+{
+private:
+	struct cvar_s * m_cvar;
+	CImageLabel *	pLabelOn;
+	CImageLabel *	pLabelOff;
+	
+
+public:
+	ToggleCommandButton( const char* cvarname, const char* text,int x,int y,int wide,int tall, bool flat ) : 
+	  CommandButton( text, x, y, wide, tall, false, flat )
+	 {
+		m_cvar = gEngfuncs.pfnGetCvarPointer( cvarname );
+
+			// Put a > to show it's a submenu
+		pLabelOn = new CImageLabel( "checked", 0, 0 );
+		pLabelOn->setParent(this);
+		pLabelOn->addInputSignal(this);
+				
+		pLabelOff = new CImageLabel( "unchecked", 0, 0 );
+		pLabelOff->setParent(this);
+		pLabelOff->setEnabled(true);
+		pLabelOff->addInputSignal(this);
+
+		int textwide, texttall;
+		getTextSize( textwide, texttall);
+	
+		// Reposition
+		pLabelOn->setPos( textwide, (tall - pLabelOn->getTall()) / 2 );
+
+		pLabelOff->setPos( textwide, (tall - pLabelOff->getTall()) / 2 );
+		
+		// Set text color to orange
+		setFgColor(Scheme::sc_primary1);
+	}
+
+	virtual void cursorEntered(Panel* panel)
+	{
+		CommandButton::cursorEntered();
+	}
+
+	virtual void cursorExited(Panel* panel)
+	{
+		CommandButton::cursorExited();
+	}
+
+	virtual void mousePressed(MouseCode code,Panel* panel)
+	{
+		doClick();
+	};
+
+	virtual void cursorMoved(int x,int y,Panel* panel) {};
+	
+	virtual void mouseDoublePressed(MouseCode code,Panel* panel)  {};
+	virtual void mouseReleased(MouseCode code,Panel* panel) {};
+	virtual void mouseWheeled(int delta,Panel* panel) {};
+	virtual void keyPressed(KeyCode code,Panel* panel) {};
+	virtual void keyTyped(KeyCode code,Panel* panel) {};
+	virtual void keyReleased(KeyCode code,Panel* panel) {};
+	virtual void keyFocusTicked(Panel* panel) {};
+
+	virtual void paint( void )
+	{
+		if ( !m_cvar )
+		{
+			pLabelOff->setVisible(false);
+			pLabelOn->setVisible(false);
+		} 
+		else if ( m_cvar->value )
+		{
+			pLabelOff->setVisible(false);
+			pLabelOn->setVisible(true);
+		}
+		else
+		{
+			pLabelOff->setVisible(true);
+			pLabelOn->setVisible(false);
+		}
+
+		CommandButton::paint();
+
+	} 
+};
+class SpectToggleButton : public CommandButton, public InputSignal
+{
+private:
+	struct cvar_s * m_cvar;
+	CImageLabel *	pLabelOn; 
+
+public:
+	SpectToggleButton( const char* cvarname, const char* text,int x,int y,int wide,int tall, bool flat ) : 
+	  CommandButton( text, x, y, wide, tall, false, flat )
+	 {
+		m_cvar = gEngfuncs.pfnGetCvarPointer( cvarname );
+
+		// Put a > to show it's a submenu
+		pLabelOn = new CImageLabel( "checked", 0, 0 );
+		pLabelOn->setParent(this);
+		pLabelOn->addInputSignal(this);
+		
+
+		int textwide, texttall;
+		getTextSize( textwide, texttall);
+	
+		// Reposition
+		pLabelOn->setPos( textwide, (tall - pLabelOn->getTall()) / 2 );
+	  } 
+
+	virtual void cursorEntered(Panel* panel)
+	{
+		CommandButton::cursorEntered();
+	}
+
+	virtual void cursorExited(Panel* panel)
+	{
+		CommandButton::cursorExited();
+	}
+
+	virtual void mousePressed(MouseCode code,Panel* panel)
+	{
+		doClick();
+	};
+
+	virtual void cursorMoved(int x,int y,Panel* panel) {};
+	
+	virtual void mouseDoublePressed(MouseCode code,Panel* panel)  {};
+	virtual void mouseReleased(MouseCode code,Panel* panel) {};
+	virtual void mouseWheeled(int delta,Panel* panel) {};
+	virtual void keyPressed(KeyCode code,Panel* panel) {};
+	virtual void keyTyped(KeyCode code,Panel* panel) {};
+	virtual void keyReleased(KeyCode code,Panel* panel) {};
+	virtual void keyFocusTicked(Panel* panel) {};
+
+	virtual void paintBackground()
+	{
+		if ( isArmed() )
+		{
+			drawSetColor( 143,143, 54, 125 ); 
+			drawFilledRect( 5, 0,_size[0] - 5,_size[1]);
+		}
+	}
+	
+	virtual void paint( void )
+	{
+		if ( isArmed() )
+		{ 
+			setFgColor( 194, 202, 54, 0 );
+		}
+		else
+		{
+			setFgColor( 143, 143, 54, 15 );
+		}
+
+		if ( !m_cvar )
+		{
+			pLabelOn->setVisible(false);
+		} 
+		else if ( m_cvar->value )
+		{
+			pLabelOn->setVisible(true);
+		}
+		else
+		{
+			pLabelOn->setVisible(false);
+		}
+
+		Button::paint();
+	} 
+};
+
+/*
+class SpectToggleButton : public ToggleCommandButton
+{
+private:
+	struct cvar_s * m_cvar;
+	CImageLabel *	pLabelOn;
+	CImageLabel *	pLabelOff;
+	
+public:
+
+	SpectToggleButton( const char* cvarname, const char* text,int x,int y,int wide,int tall, bool flat ) : 
+	  ToggleCommandButton( cvarname, text, x, y, wide, tall, flat, TRUE )
+	 {
+		m_cvar = gEngfuncs.pfnGetCvarPointer( cvarname );
+
+			// Put a > to show it's a submenu
+		pLabelOn = new CImageLabel( "checked", 0, 0 );
+		pLabelOn->setParent(this);
+		pLabelOn->addInputSignal(this);
+				
+		pLabelOff = new CImageLabel( "unchecked", 0, 0 );
+		pLabelOff->setParent(this);
+		pLabelOff->setEnabled(true);
+		pLabelOff->addInputSignal(this);
+
+		int textwide, texttall;
+		getTextSize( textwide, texttall);
+	
+		// Reposition
+		pLabelOn->setPos( textwide, (tall - pLabelOn->getTall()) / 2 );
+
+		pLabelOff->setPos( textwide, (tall - pLabelOff->getTall()) / 2 );
+		
+		// Set text color to orange
+		setFgColor(Scheme::sc_primary1);
+	}
+		
+	virtual void paintBackground()
+	{
+		if ( isArmed())
+		{
+			drawSetColor( 143,143, 54, 125 ); 
+			drawFilledRect( 5, 0,_size[0] - 5,_size[1]);
+		}
+	}
+
+	virtual void paint()
+	{
+	
+		if ( isArmed() )
+		{ 
+			setFgColor( 194, 202, 54, 0 );
+		}
+		else
+		{
+			setFgColor( 143, 143, 54, 15 );
+		}
+
+			if ( !m_cvar )
+		{
+			pLabelOff->setVisible(false);
+			pLabelOn->setVisible(false);
+		} 
+		else if ( m_cvar->value )
+		{
+			pLabelOff->setVisible(false);
+			pLabelOn->setVisible(true);
+		}
+		else
+		{
+			pLabelOff->setVisible(true);
+			pLabelOn->setVisible(false);
+		}
+
+		Button::paint();
+	}
+};
+*/
+//============================================================
+// Panel that can be dragged around
+class DragNDropPanel : public Panel
+{
+private:
+	bool		m_bBeingDragged;
+	LineBorder	*m_pBorder;
+public:
+	DragNDropPanel(int x,int y,int wide,int tall) : Panel(x,y,wide,tall)
+	{
+		m_bBeingDragged = false;
+
+		// Create the Drag Handler
+		addInputSignal( new CDragNDropHandler(this) );
+
+		// Create the border (for dragging)
+		m_pBorder = new LineBorder();
+	}
+
+	virtual void setDragged( bool bState )
+	{
+		m_bBeingDragged = bState;
+
+		if (m_bBeingDragged)
+			setBorder(m_pBorder);
+		else
+			setBorder(NULL);
+	}
+};
+
+//================================================================
+// Panel that draws itself with a transparent black background
+class CTransparentPanel : public Panel
+{
+private:
+	int	m_iTransparency;
+public:
+	CTransparentPanel(int iTrans, int x,int y,int wide,int tall) : Panel(x,y,wide,tall)
+	{
+		m_iTransparency = iTrans;
+	}
+
+    void SetTransparency(int inTransparency)
+    {
+        m_iTransparency = inTransparency;
+    }
+
+	virtual void paintBackground()
+	{
+		if (m_iTransparency)
+		{
+			// Transparent black background
+			drawSetColor( 0,0,0, m_iTransparency );
+			drawFilledRect(0,0,_size[0],_size[1]);
+		}
+	}
+};
+
+//================================================================
+// Menu Panel that supports buffering of menus
+class CMenuPanel : public CTransparentPanel
+{
+private:
+	CMenuPanel *m_pNextMenu;
+	int			m_iMenuID;
+	int			m_iRemoveMe;
+	int			m_iIsActive;
+	float		m_flOpenTime;
+public:
+	CMenuPanel(int iRemoveMe, int x,int y,int wide,int tall) : CTransparentPanel(100, x,y,wide,tall)
+	{
+		Reset();
+		m_iRemoveMe = iRemoveMe;
+	}
+
+	CMenuPanel(int iTrans, int iRemoveMe, int x,int y,int wide,int tall) : CTransparentPanel(iTrans, x,y,wide,tall)
+	{
+		Reset();
+		m_iRemoveMe = iRemoveMe;
+	}
+
+	virtual void Reset( void )
+	{
+		m_pNextMenu = NULL;
+		m_iIsActive = false;
+		m_flOpenTime = 0;
+	}
+
+	void SetNextMenu( CMenuPanel *pNextPanel )
+	{
+		if (m_pNextMenu)
+			m_pNextMenu->SetNextMenu( pNextPanel );
+		else
+			m_pNextMenu = pNextPanel;
+	}
+
+	void SetMenuID( int iID )
+	{
+		m_iMenuID = iID;
+	}
+
+	void SetActive( int iState )
+	{
+		m_iIsActive = iState;
+	}
+
+	virtual void Open( void )
+	{
+		setVisible( true );
+
+		// Note the open time, so we can delay input for a bit
+		m_flOpenTime = gHUD.m_flTime;
+	}
+
+	virtual void Close( void )
+	{
+		setVisible( false );
+		m_iIsActive = false;
+
+		if ( m_iRemoveMe )
+			gViewPort->removeChild( this );
+
+		// This MenuPanel has now been deleted. Don't append code here.
+	}
+
+	int			ShouldBeRemoved() { return m_iRemoveMe; };
+	CMenuPanel* GetNextMenu() { return m_pNextMenu; };
+	int			GetMenuID() { return m_iMenuID; };
+	int			IsActive() { return m_iIsActive; };
+	float		GetOpenTime() { return m_flOpenTime; };
+
+	// Numeric input
+	virtual bool SlotInput( int iSlot ) { return false; };
+	virtual void SetActiveInfo( int iInput ) {};
+};
+
+//================================================================
+// Custom drawn scroll bars
+class CTFScrollButton : public CommandButton
+{
+private:
+	BitmapTGA	*m_pTGA;
+
+public:
+	CTFScrollButton(int iArrow, const char* text,int x,int y,int wide,int tall);
+
+	virtual void paint( void );
+	virtual void paintBackground( void );
+};
+
+// Custom drawn slider bar
+class CTFSlider : public Slider
+{
+public:
+	CTFSlider(int x,int y,int wide,int tall,bool vertical) : Slider(x,y,wide,tall,vertical)
+	{
+	};
+
+	virtual void paintBackground( void );
+};
+
+// Custom drawn scrollpanel
+class CTFScrollPanel : public ScrollPanel
+{
+public:
+	CTFScrollPanel(int x,int y,int wide,int tall);
+};
+
+//================================================================
+// Menu Panels that take key input
+//============================================================
+class CClassMenuPanel : public CMenuPanel
+{
+private:
+	CTransparentPanel	*m_pClassInfoPanel[PC_LASTCLASS];
+	Label				*m_pPlayers[PC_LASTCLASS];
+	ClassButton			*m_pButtons[PC_LASTCLASS];
+	CommandButton		*m_pCancelButton;
+	ScrollPanel			*m_pScrollPanel;
+
+	CImageLabel			*m_pClassImages[MAX_TEAMS][PC_LASTCLASS];
+
+	int					m_iCurrentInfo;
+
+	enum { STRLENMAX_PLAYERSONTEAM = 128 };
+	char m_sPlayersOnTeamString[STRLENMAX_PLAYERSONTEAM];
+
+public:
+	CClassMenuPanel(int iTrans, int iRemoveMe, int x,int y,int wide,int tall);
+
+	virtual bool SlotInput( int iSlot );
+	virtual void Open( void );
+	virtual void Update( void );
+	virtual void SetActiveInfo( int iInput );
+	virtual void Initialize( void );
+
+	virtual void Reset( void )
+	{
+		CMenuPanel::Reset();
+		m_iCurrentInfo = 0;
+	}
+};
+
+class CTeamMenuPanel : public CMenuPanel
+{
+public:
+	ScrollPanel         *m_pScrollPanel;
+	CTransparentPanel	*m_pTeamWindow;
+	Label				*m_pMapTitle;
+	TextPanel			*m_pBriefing;
+	TextPanel			*m_pTeamInfoPanel[6];
+	CommandButton		*m_pButtons[6];
+	bool				m_bUpdatedMapName;
+	CommandButton		*m_pCancelButton;
+	CommandButton		*m_pSpectateButton;
+
+	int					m_iCurrentInfo;
+
+public:
+	CTeamMenuPanel(int iTrans, int iRemoveMe, int x,int y,int wide,int tall);
+
+	virtual bool SlotInput( int iSlot );
+	virtual void Open( void );
+	virtual void Update( void );
+	virtual void SetActiveInfo( int iInput );
+	virtual void paintBackground( void );
+
+	virtual void Initialize( void );
+
+	virtual void Reset( void )
+	{
+		CMenuPanel::Reset();
+		m_iCurrentInfo = 0;
+	}
+};
+
+//=========================================================
+// Specific Menus to handle old HUD sections
+class CHealthPanel : public DragNDropPanel
+{
+private:
+	BitmapTGA	*m_pHealthTGA;
+	Label		*m_pHealthLabel;
+public:
+	CHealthPanel(int x,int y,int wide,int tall) : DragNDropPanel(x,y,wide,tall)
+	{
+		// Load the Health icon
+		FileInputStream* fis = new FileInputStream( GetVGUITGAName("%d_hud_health"), false);
+		m_pHealthTGA = new BitmapTGA(fis,true);
+		fis->close();
+
+		// Create the Health Label
+		int iXSize,iYSize;
+		m_pHealthTGA->getSize(iXSize,iYSize);
+		m_pHealthLabel = new Label("",0,0,iXSize,iYSize);
+		m_pHealthLabel->setImage(m_pHealthTGA);
+		m_pHealthLabel->setParent(this);
+
+		// Set panel dimension
+		// Shouldn't be needed once Billy's fized setImage not recalculating the size
+		//setSize( iXSize + 100, gHUD.m_iFontHeight + 10 );
+		//m_pHealthLabel->setPos( 10, (getTall() - iYSize) / 2 );
+	}
+
+	virtual void paintBackground()
+	{
+	}
+
+	void paint()
+	{
+		// Get the paint color
+		int r,g,b,a;
+		// Has health changed? Flash the health #
+		if (gHUD.m_Health.m_fFade)
+		{
+			gHUD.m_Health.m_fFade -= (gHUD.m_flTimeDelta * 20);
+			if (gHUD.m_Health.m_fFade <= 0)
+			{
+				a = MIN_ALPHA;
+				gHUD.m_Health.m_fFade = 0;
+			}
+
+			// Fade the health number back to dim
+			a = MIN_ALPHA +  (gHUD.m_Health.m_fFade/FADE_TIME) * 128;
+		}
+		else
+			a = MIN_ALPHA;
+
+		gHUD.m_Health.GetPainColor( r, g, b );
+		ScaleColors(r, g, b, a );
+
+		// If health is getting low, make it bright red
+		if (gHUD.m_Health.m_iHealth <= 15)
+			a = 255;
+
+		int iXSize,iYSize, iXPos, iYPos;
+		m_pHealthTGA->getSize(iXSize,iYSize);
+		m_pHealthTGA->getPos(iXPos, iYPos);
+
+		// Paint the player's health
+		int x = gHUD.DrawHudNumber( iXPos + iXSize + 5, iYPos + 5, DHN_3DIGITS | DHN_DRAWZERO, gHUD.m_Health.m_iHealth, r, g, b);
+
+		// Draw the vertical line
+		int HealthWidth = gHUD.GetSpriteRect(gHUD.m_HUD_number_0).right - gHUD.GetSpriteRect(gHUD.m_HUD_number_0).left;
+		x += HealthWidth / 2;
+		FillRGBA(x, iYPos + 5, HealthWidth / 10, gHUD.m_iFontHeight, 255, 160, 0, a);
+	}
+};
+
+#endif
diff --git a/main/source/cl_dll/vgui_int.cpp b/main/source/cl_dll/vgui_int.cpp
new file mode 100644
index 00000000..b854690f
--- /dev/null
+++ b/main/source/cl_dll/vgui_int.cpp
@@ -0,0 +1,132 @@
+
+#include"vgui_int.h"
+#include<VGUI_Label.h>
+#include<VGUI_BorderLayout.h>
+#include<VGUI_LineBorder.h>
+#include<VGUI_SurfaceBase.h>
+#include<VGUI_TextEntry.h>
+#include<VGUI_ActionSignal.h>
+#include<string.h>
+#include "hud.h"
+#include "cl_util.h"
+#include "camera.h"
+#include "kbutton.h"
+#include "cvardef.h"
+#include "usercmd.h"
+#include "const.h"
+#include "camera.h"
+#include "in_defs.h"
+#include "vgui_TeamFortressViewport.h"
+#include "vgui_ControlConfigPanel.h"
+
+//Label *gTestLabel = NULL;
+//CImageLabel* gTestLabel;
+
+namespace
+{
+
+class TexturePanel : public Panel , public ActionSignal
+{
+private:
+	int _bindIndex;
+	TextEntry* _textEntry;
+public:
+	TexturePanel() : Panel(0,0,256,276)
+	{
+		_bindIndex=2700;
+		_textEntry=new TextEntry("2700",0,0,128,20);
+		_textEntry->setParent(this);
+		_textEntry->addActionSignal(this);
+	}
+public:
+	virtual bool isWithin(int x,int y)
+	{
+		return _textEntry->isWithin(x,y);
+	}
+public:
+	virtual void actionPerformed(Panel* panel)
+	{
+		char buf[256];
+		_textEntry->getText(0,buf,256);
+		sscanf(buf,"%d",&_bindIndex);
+	}
+protected:
+	virtual void paintBackground()
+	{
+			Panel::paintBackground();
+			
+			int wide,tall;
+			getPaintSize(wide,tall);
+		
+			drawSetColor(0,0,255,0);
+			drawSetTexture(_bindIndex);
+			drawTexturedRect(0,19,257,257);
+	}
+
+};
+
+}
+
+using namespace vgui;
+
+void VGui_ViewportPaintBackground(int extents[4])
+{
+	gEngfuncs.VGui_ViewportPaintBackground(extents);
+}
+
+void* VGui_GetPanel()
+{
+	return (Panel*)gEngfuncs.VGui_GetPanel();
+}
+
+void VGui_Startup()
+{
+	Panel* root=(Panel*)VGui_GetPanel();
+	root->setBgColor(128,128,0,0);
+	//root->setNonPainted(false);
+	//root->setBorder(new LineBorder());
+	root->setLayout(new BorderLayout(0));
+
+	//root->getSurfaceBase()->setEmulatedCursorVisible(true);
+
+	if (gViewPort != NULL)
+	{
+//		root->removeChild(gViewPort);
+
+		// free the memory
+//		delete gViewPort;
+//		gViewPort = NULL;
+
+		gViewPort->Initialize();
+	}
+	else
+	{
+		gViewPort = new TeamFortressViewport(0,0,root->getWide(),root->getTall());
+		gViewPort->setParent(root);
+
+//        //gTestLabel = new Label( "TestLabel", 125, 125, 200, 50 );
+//    	gTestLabel = new CImageLabel( "arrowdn", 125, 125, 200, 50 );
+//    	gTestLabel->setParent( root );
+//
+//	    //gTestLabel->setFgColor(0, 255, 0, 128);
+//	    //gTestLabel->setBgColor( 0, 0, 0, 128);
+//
+//        gTestLabel->m_pTGA->setColor( vgui::Color(0, 255, 0, 128) );
+	}
+
+    // Comment this out when not debugging
+	//TexturePanel* texturePanel=new TexturePanel();
+	//texturePanel->setParent(gViewPort);
+
+}
+
+void VGui_Shutdown()
+{
+    delete gViewPort;
+	gViewPort = NULL;
+}
+
+
+
+
+
diff --git a/main/source/cl_dll/vgui_int.h b/main/source/cl_dll/vgui_int.h
new file mode 100644
index 00000000..1ba0da2f
--- /dev/null
+++ b/main/source/cl_dll/vgui_int.h
@@ -0,0 +1,16 @@
+
+#ifndef VGUI_INT_H
+#define VGUI_INT_H
+
+extern "C"
+{
+void VGui_Startup();
+void VGui_Shutdown();
+void* VGui_GetPanel();
+
+//Only safe to call from inside subclass of Panel::paintBackground
+void VGui_ViewportPaintBackground(int extents[4]);
+}
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/cl_dll/vgui_teammenu.cpp b/main/source/cl_dll/vgui_teammenu.cpp
new file mode 100644
index 00000000..f339647a
--- /dev/null
+++ b/main/source/cl_dll/vgui_teammenu.cpp
@@ -0,0 +1,402 @@
+//=========== (C) Copyright 1996-2002 Valve, L.L.C. All rights reserved. ===========
+//
+// The copyright to the contents herein is the property of Valve, L.L.C.
+// The contents may be used and/or copied only with the written permission of
+// Valve, L.L.C., or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: TFC Team Menu
+//
+// $Workfile:     $
+// $Date: 2002/07/08 16:15:13 $
+//
+//-----------------------------------------------------------------------------
+// $Log: vgui_teammenu.cpp,v $
+// Revision 1.3  2002/07/08 16:15:13  Flayra
+// - Refactored team color management
+//
+// Revision 1.2  2001/09/13 22:28:01  Charlie
+// - Updated NS with new Half-life 1108 patch in preparation for voice support and spectator mode
+//
+// Revision 1.1.1.1.2.1  2001/09/13 14:42:30  Charlie
+// - HL1108
+//
+//
+// $NoKeywords: $
+//=============================================================================
+
+#include "vgui_int.h"
+#include "VGUI_Font.h"
+#include "VGUI_ScrollPanel.h"
+#include "VGUI_TextImage.h"
+
+#include "hud.h"
+#include "cl_util.h"
+#include "vgui_TeamFortressViewport.h"
+
+// Team Menu Dimensions
+#define TEAMMENU_TITLE_X				XRES(40)
+#define TEAMMENU_TITLE_Y				YRES(32)
+#define TEAMMENU_TOPLEFT_BUTTON_X		XRES(40)
+#define TEAMMENU_TOPLEFT_BUTTON_Y		YRES(80)
+#define TEAMMENU_BUTTON_SIZE_X			XRES(124)
+#define TEAMMENU_BUTTON_SIZE_Y			YRES(24)
+#define TEAMMENU_BUTTON_SPACER_Y		YRES(8)
+#define TEAMMENU_WINDOW_X				XRES(176)
+#define TEAMMENU_WINDOW_Y				YRES(80)
+#define TEAMMENU_WINDOW_SIZE_X			XRES(424)
+#define TEAMMENU_WINDOW_SIZE_Y			YRES(312)
+#define TEAMMENU_WINDOW_TITLE_X			XRES(16)
+#define TEAMMENU_WINDOW_TITLE_Y			YRES(16)
+#define TEAMMENU_WINDOW_TEXT_X			XRES(16)
+#define TEAMMENU_WINDOW_TEXT_Y			YRES(48)
+#define TEAMMENU_WINDOW_TEXT_SIZE_Y		YRES(178)
+#define TEAMMENU_WINDOW_INFO_X			XRES(16)
+#define TEAMMENU_WINDOW_INFO_Y			YRES(234)
+      
+// Creation
+CTeamMenuPanel::CTeamMenuPanel(int iTrans, int iRemoveMe, int x,int y,int wide,int tall) : CMenuPanel(iTrans, iRemoveMe, x,y,wide,tall)
+{
+	// Get the scheme used for the Titles
+	CSchemeManager *pSchemes = gViewPort->GetSchemeManager();
+
+	// schemes
+	SchemeHandle_t hTitleScheme = pSchemes->getSchemeHandle( "Title Font" );
+	SchemeHandle_t hTeamWindowText = pSchemes->getSchemeHandle( "Briefing Text" );
+	SchemeHandle_t hTeamInfoText = pSchemes->getSchemeHandle( "Team Info Text" );
+
+	// get the Font used for the Titles
+	Font *pTitleFont = pSchemes->getFont( hTitleScheme );
+	int r, g, b, a;
+
+	// Create the title
+	Label *pLabel = new Label( "", TEAMMENU_TITLE_X, TEAMMENU_TITLE_Y );
+	pLabel->setParent( this );
+	pLabel->setFont( pTitleFont );
+	pSchemes->getFgColor( hTitleScheme, r, g, b, a );
+	pLabel->setFgColor( r, g, b, a );
+	pSchemes->getBgColor( hTitleScheme, r, g, b, a );
+	pLabel->setBgColor( r, g, b, a );
+	pLabel->setContentAlignment( vgui::Label::a_west );
+	pLabel->setText(gHUD.m_TextMessage.BufferedLocaliseTextString("#Title_SelectYourTeam"));
+
+	// Create the Info Window
+	m_pTeamWindow  = new CTransparentPanel( 255, TEAMMENU_WINDOW_X, TEAMMENU_WINDOW_Y, TEAMMENU_WINDOW_SIZE_X, TEAMMENU_WINDOW_SIZE_Y );
+	m_pTeamWindow->setParent( this );
+	m_pTeamWindow->setBorder( new LineBorder( Color(255*0.7,170*0.7,0,0 )) );
+
+	// Create the Map Name Label
+	m_pMapTitle = new Label( "", TEAMMENU_WINDOW_TITLE_X, TEAMMENU_WINDOW_TITLE_Y );
+	m_pMapTitle->setFont( pTitleFont ); 
+	m_pMapTitle->setParent( m_pTeamWindow );
+	pSchemes->getFgColor( hTitleScheme, r, g, b, a );
+	m_pMapTitle->setFgColor( r, g, b, a );
+	pSchemes->getBgColor( hTitleScheme, r, g, b, a );
+	m_pMapTitle->setBgColor( r, g, b, a );
+	m_pMapTitle->setContentAlignment( vgui::Label::a_west );
+
+	// Create the Scroll panel
+	m_pScrollPanel = new CTFScrollPanel( TEAMMENU_WINDOW_TEXT_X, TEAMMENU_WINDOW_TEXT_Y, TEAMMENU_WINDOW_SIZE_X - (TEAMMENU_WINDOW_TEXT_X * 2), TEAMMENU_WINDOW_TEXT_SIZE_Y );
+	m_pScrollPanel->setParent(m_pTeamWindow);
+	m_pScrollPanel->setScrollBarVisible(false, false);
+
+	// Create the Map Briefing panel
+	m_pBriefing = new TextPanel("", 0,0, TEAMMENU_WINDOW_SIZE_X - TEAMMENU_WINDOW_TEXT_X, TEAMMENU_WINDOW_TEXT_SIZE_Y );
+	m_pBriefing->setParent( m_pScrollPanel->getClient() );
+	m_pBriefing->setFont( pSchemes->getFont(hTeamWindowText) );
+	pSchemes->getFgColor( hTeamWindowText, r, g, b, a );
+	m_pBriefing->setFgColor( r, g, b, a );
+	pSchemes->getBgColor( hTeamWindowText, r, g, b, a );
+	m_pBriefing->setBgColor( r, g, b, a );
+
+	m_pBriefing->setText( gHUD.m_TextMessage.BufferedLocaliseTextString("#Map_Description_not_available") );
+	
+	// Team Menu buttons
+	for (int i = 1; i <= 5; i++)
+	{
+		char sz[256]; 
+
+		int iYPos = TEAMMENU_TOPLEFT_BUTTON_Y + ( (TEAMMENU_BUTTON_SIZE_Y + TEAMMENU_BUTTON_SPACER_Y) * i );
+
+		// Team button
+		m_pButtons[i] = new CommandButton( "", TEAMMENU_TOPLEFT_BUTTON_X, iYPos, TEAMMENU_BUTTON_SIZE_X, TEAMMENU_BUTTON_SIZE_Y, true);
+		m_pButtons[i]->setParent( this );
+		m_pButtons[i]->setContentAlignment( vgui::Label::a_west );
+		m_pButtons[i]->setVisible( false );
+
+		// AutoAssign button uses special case
+		if (i == 5)
+		{
+			m_pButtons[5]->setBoundKey( '5' );
+			m_pButtons[5]->setText( gHUD.m_TextMessage.BufferedLocaliseTextString("#Team_AutoAssign") );
+			m_pButtons[5]->setVisible( true );
+		}
+
+		// Create the Signals
+		sprintf(sz, "jointeam %d", i);
+		m_pButtons[i]->addActionSignal( new CMenuHandler_StringCommandWatch( sz, true ) );
+		m_pButtons[i]->addInputSignal( new CHandler_MenuButtonOver(this, i) );
+
+		// Create the Team Info panel
+		m_pTeamInfoPanel[i] = new TextPanel("", TEAMMENU_WINDOW_INFO_X, TEAMMENU_WINDOW_INFO_Y, TEAMMENU_WINDOW_SIZE_X - TEAMMENU_WINDOW_INFO_X, TEAMMENU_WINDOW_SIZE_X - TEAMMENU_WINDOW_INFO_Y );
+		m_pTeamInfoPanel[i]->setParent( m_pTeamWindow );
+		m_pTeamInfoPanel[i]->setFont( pSchemes->getFont(hTeamInfoText) );
+		m_pTeamInfoPanel[i]->setFgColor(	kTeamColors[i % iNumberOfTeamColors][0],
+											kTeamColors[i % iNumberOfTeamColors][1],
+											kTeamColors[i % iNumberOfTeamColors][2],
+											0 );
+		m_pTeamInfoPanel[i]->setBgColor( 0,0,0, 255 );
+	}
+
+	// Create the Cancel button
+	m_pCancelButton = new CommandButton( CHudTextMessage::BufferedLocaliseTextString( "#Menu_Cancel" ), TEAMMENU_TOPLEFT_BUTTON_X, 0, TEAMMENU_BUTTON_SIZE_X, TEAMMENU_BUTTON_SIZE_Y);
+	m_pCancelButton->setParent( this );
+	m_pCancelButton->addActionSignal( new CMenuHandler_TextWindow(HIDE_TEXTWINDOW) );
+
+	// Create the Spectate button
+	m_pSpectateButton = new SpectateButton( CHudTextMessage::BufferedLocaliseTextString( "#Menu_Spectate" ), TEAMMENU_TOPLEFT_BUTTON_X, 0, TEAMMENU_BUTTON_SIZE_X, TEAMMENU_BUTTON_SIZE_Y, true);
+	m_pSpectateButton->setParent( this );
+	m_pSpectateButton->addActionSignal( new CMenuHandler_StringCommand( "spectate", true ) );
+	m_pSpectateButton->setBoundKey( '6' );
+	m_pSpectateButton->addInputSignal( new CHandler_MenuButtonOver(this, 6) );
+
+	Initialize();
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Called each time a new level is started.
+//-----------------------------------------------------------------------------
+void CTeamMenuPanel::Initialize( void )
+{
+	m_bUpdatedMapName = false;
+	m_iCurrentInfo = 0;
+	m_pScrollPanel->setScrollValue( 0, 0 );
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Called everytime the Team Menu is displayed
+//-----------------------------------------------------------------------------
+void CTeamMenuPanel::Update( void )
+{
+	int	 iYPos = TEAMMENU_TOPLEFT_BUTTON_Y;
+
+	// Set the team buttons
+	for (int i = 1; i <= 4; i++)
+	{
+		if (m_pButtons[i])
+		{
+			if ( i <= gViewPort->GetNumberOfTeams() )
+			{
+				m_pButtons[i]->setText( gViewPort->GetTeamName(i) );
+
+				// bound key replacement
+				char sz[32]; 
+				sprintf( sz, "%d", i );
+				m_pButtons[i]->setBoundKey( sz[0] );
+
+				m_pButtons[i]->setVisible( true );
+				m_pButtons[i]->setPos( TEAMMENU_TOPLEFT_BUTTON_X, iYPos );
+				iYPos += TEAMMENU_BUTTON_SIZE_Y + TEAMMENU_BUTTON_SPACER_Y;
+
+				// Start with the first option up
+				if (!m_iCurrentInfo)
+					SetActiveInfo( i );
+
+				char szPlayerList[ (MAX_PLAYER_NAME_LENGTH + 3) * 31 ];  // name + ", "
+				strcpy(szPlayerList, "\n");
+				// Update the Team Info
+				// Now count the number of teammembers of this class
+				int iTotal = 0;
+				for ( int j = 1; j <= MAX_PLAYERS; j++ )
+				{
+					if ( g_PlayerInfoList[j].name == NULL )
+						continue; // empty player slot, skip
+					if ( g_PlayerInfoList[j].thisplayer )
+						continue; // skip this player
+					if ( g_PlayerExtraInfo[j].teamnumber != i )
+						continue; // skip over players in other teams
+
+					iTotal++;
+					if (iTotal > 1)
+						strncat( szPlayerList, ", ", sizeof(szPlayerList) - strlen(szPlayerList) );
+					strncat( szPlayerList, g_PlayerInfoList[j].name, sizeof(szPlayerList) - strlen(szPlayerList) );
+					szPlayerList[ sizeof(szPlayerList) - 1 ] = '\0';
+				}
+
+				if (iTotal > 0)
+				{
+					// Set the text of the info Panel
+					char szText[ ((MAX_PLAYER_NAME_LENGTH + 3) * 31) + 256 ]; 
+					if (iTotal == 1)
+						sprintf(szText, "%s: %d Player (%d points)", gViewPort->GetTeamName(i), iTotal, g_TeamInfo[i].frags );
+					else
+						sprintf(szText, "%s: %d Players (%d points)", gViewPort->GetTeamName(i), iTotal, g_TeamInfo[i].frags );
+					strncat( szText, szPlayerList, sizeof(szText) - strlen(szText) );
+					szText[ sizeof(szText) - 1 ] = '\0';
+
+					m_pTeamInfoPanel[i]->setText( szText );
+				}
+				else
+				{
+					m_pTeamInfoPanel[i]->setText( "" );
+				}
+			}
+			else
+			{
+				// Hide the button (may be visible from previous maps)
+				m_pButtons[i]->setVisible( false );
+			}
+		}
+	}
+
+	// Move the AutoAssign button into place
+	m_pButtons[5]->setPos( TEAMMENU_TOPLEFT_BUTTON_X, iYPos );
+	iYPos += TEAMMENU_BUTTON_SIZE_Y + TEAMMENU_BUTTON_SPACER_Y;
+
+	// Spectate button
+	if (m_pSpectateButton->IsNotValid())
+	{
+		m_pSpectateButton->setVisible( false );
+	}
+	else
+	{
+		m_pSpectateButton->setPos( TEAMMENU_TOPLEFT_BUTTON_X, iYPos );
+		m_pSpectateButton->setVisible( true );
+		iYPos += TEAMMENU_BUTTON_SIZE_Y + TEAMMENU_BUTTON_SPACER_Y;
+	}
+	
+	// If the player is already in a team, make the cancel button visible
+	if ( g_iTeamNumber )
+	{
+		m_pCancelButton->setPos( TEAMMENU_TOPLEFT_BUTTON_X, iYPos );
+		iYPos += TEAMMENU_BUTTON_SIZE_Y + TEAMMENU_BUTTON_SPACER_Y;
+		m_pCancelButton->setVisible( true );
+	}
+	else
+	{
+		m_pCancelButton->setVisible( false );
+	}
+
+	// Set the Map Title
+	if (!m_bUpdatedMapName)
+	{
+		const char *level = gEngfuncs.pfnGetLevelName();
+		if (level && level[0])
+		{
+			char sz[256]; 
+			char szTitle[256]; 
+			char *ch;
+
+			// Update the level name
+			strcpy( sz, level );
+			ch = strchr( sz, '/' );
+			if (!ch)
+				ch = strchr( sz, '\\' );
+			strcpy( szTitle, ch+1 );
+			ch = strchr( szTitle, '.' );
+			*ch = '\0';
+			m_pMapTitle->setText( szTitle );
+			*ch = '.';
+
+			// Update the map briefing
+			strcpy( sz, level );
+			ch = strchr( sz, '.' );
+			*ch = '\0';
+			strcat( sz, ".txt" );
+			char *pfile = (char*)gEngfuncs.COM_LoadFile( sz, 5, NULL );
+			if (pfile)
+			{
+				m_pBriefing->setText( pfile );
+
+				// Get the total size of the Briefing text and resize the text panel
+				int iXSize, iYSize;
+				m_pBriefing->getTextImage()->getTextSize( iXSize, iYSize );
+				m_pBriefing->setSize( iXSize, iYSize );
+				gEngfuncs.COM_FreeFile( pfile );
+			}
+
+			m_bUpdatedMapName = true;
+		}
+	}
+
+	m_pScrollPanel->validate();
+}
+
+//=====================================
+// Key inputs
+bool CTeamMenuPanel::SlotInput( int iSlot )
+{
+	// Check for AutoAssign
+	if ( iSlot == 5)
+	{
+		m_pButtons[5]->fireActionSignal();
+		return true;
+	}
+
+	// Spectate
+	if ( iSlot == 6)
+	{
+		m_pSpectateButton->fireActionSignal();
+		return true;
+	}
+
+	// Otherwise, see if a particular team is selectable
+	if ( (iSlot < 1) || (iSlot > gViewPort->GetNumberOfTeams()) )
+		return false;
+	if ( !m_pButtons[ iSlot ] )
+		return false;
+
+	// Is the button pushable?
+	if ( m_pButtons[ iSlot ]->isVisible() )
+	{
+		m_pButtons[ iSlot ]->fireActionSignal();
+		return true;
+	}
+
+	return false;
+}
+
+//======================================
+// Update the Team menu before opening it
+void CTeamMenuPanel::Open( void )
+{
+	Update();
+	CMenuPanel::Open();
+}
+
+void CTeamMenuPanel::paintBackground()
+{
+	// make sure we get the map briefing up
+	if ( !m_bUpdatedMapName )
+		Update();
+
+	CMenuPanel::paintBackground();
+}
+
+//======================================
+// Mouse is over a team button, bring up the class info
+void CTeamMenuPanel::SetActiveInfo( int iInput )
+{
+	// Remove all the Info panels and bring up the specified one
+	m_pSpectateButton->setArmed( false );
+	for (int i = 1; i <= 5; i++)
+	{
+		m_pButtons[i]->setArmed( false );
+		m_pTeamInfoPanel[i]->setVisible( false );
+	}
+
+	// 6 is Spectate
+	if (iInput == 6)
+	{
+		m_pSpectateButton->setArmed( true );
+	}
+	else
+	{
+		m_pButtons[iInput]->setArmed( true );
+		m_pTeamInfoPanel[iInput]->setVisible( true );
+	}
+
+	m_iCurrentInfo = iInput;
+
+	m_pScrollPanel->validate();
+}
diff --git a/main/source/cl_dll/view.cpp b/main/source/cl_dll/view.cpp
new file mode 100644
index 00000000..a7cdc157
--- /dev/null
+++ b/main/source/cl_dll/view.cpp
@@ -0,0 +1,2764 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+// view/refresh setup functions
+
+#include "hud.h"
+#include "cl_util.h"
+#include "cvardef.h"
+#include "usercmd.h"
+#include "const.h"
+
+#include "entity_state.h"
+#include "cl_entity.h"
+#include "ref_params.h"
+#include "in_defs.h" // PITCH YAW ROLL
+#include "pm_movevars.h"
+#include "pm_shared.h"
+#include "pm_defs.h"
+#include "event_api.h"
+#include "pmtrace.h"
+#include "screenfade.h"
+#include "shake.h"
+#include "mod/AvHClientUtil.h"
+#include "APIProxy.h"
+#include "Exports.h"
+#include "hltv.h"
+#include "util/MathUtil.h"
+#include "util/STLUtil.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "mod/AvHMarineWeaponConstants.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHSpecials.h"
+
+extern		float	gTopDownViewOrigin[3];
+extern		float	gTopDownViewAngles[3];
+
+#ifndef M_PI
+#define M_PI		3.14159265358979323846	// matches value in gcc v2 math.h
+#endif
+
+void PM_ParticleLine( float *start, float *end, int pcolor, float life, float vert);
+int PM_GetVisEntInfo( int ent );
+int PM_GetPhysEntInfo( int ent );
+void InterpolateAngles( float *start, float *end, float *output, float frac );
+void NormalizeAngles(float* angles);
+float AngleBetweenVectors(float * v1, float * v2 );
+
+void V_DropPunchAngle ( float frametime, float *ev_punchangle );
+void VectorAngles( const float *forward, float *angles );
+void V_CalcTopDownRefdef ( struct ref_params_s *pparams );
+
+extern float	vJumpOrigin[3];
+extern float	vJumpAngles[3];
+
+#include "r_studioint.h"
+#include "com_model.h"
+
+extern engine_studio_api_t IEngineStudio;
+
+/*
+The view is allowed to move slightly from it's true position for bobbing,
+but if it exceeds 8 pixels linear distance (spherical, not box), the list of
+entities sent from the server may not include everything in the pvs, especially
+when crossing a water boudnary.
+*/
+
+extern cvar_t	*chase_active;
+extern cvar_t	*scr_ofsx, *scr_ofsy, *scr_ofsz;
+extern cvar_t	*cl_vsmoothing;
+
+#define	CAM_MODE_RELAX		1
+#define CAM_MODE_FOCUS		2
+
+vec3_t		v_origin, v_angles, v_cl_angles, v_sim_org, v_lastAngles, v_view_ofs;
+float		v_frametime, v_lastDistance;	
+float		v_cameraRelaxAngle	= 5.0f;
+float		v_cameraFocusAngle	= 35.0f;
+int			v_cameraMode = CAM_MODE_FOCUS;
+qboolean	v_resetCamera = 1;
+
+extern float	gTopDownHeight;
+
+vec3_t gLastCommanderViewpoint;
+
+vec3_t ev_punchangle;
+
+cvar_t	*scr_ofsx;
+cvar_t	*scr_ofsy;
+cvar_t	*scr_ofsz;
+
+cvar_t	*v_centermove;
+cvar_t	*v_centerspeed;
+
+cvar_t	*cl_bobcycle;
+cvar_t	*cl_bob;
+cvar_t	*cl_bobup;
+cvar_t	*cl_waterdist;
+cvar_t	*cl_chasedist;
+cvar_t  *cl_hudcam;
+
+// These cvars are not registered (so users can't cheat), so set the ->value field directly
+// Register these cvars in V_Init() if needed for easy tweaking
+cvar_t	v_iyaw_cycle		= {"v_iyaw_cycle", "2", 0, 2};
+cvar_t	v_iroll_cycle		= {"v_iroll_cycle", "0.5", 0, 0.5};
+cvar_t	v_ipitch_cycle		= {"v_ipitch_cycle", "1", 0, 1};
+cvar_t	v_iyaw_level		= {"v_iyaw_level", "0.3", 0, 0.3};
+cvar_t	v_iroll_level		= {"v_iroll_level", "0.1", 0, 0.1};
+cvar_t	v_ipitch_level		= {"v_ipitch_level", "0.3", 0, 0.3};
+
+float	v_idlescale;  // used by TFC for concussion grenade effect
+
+/*
+//=============================================================================
+void V_NormalizeAngles( float *angles )
+{
+	int i;
+	// Normalize angles
+	for ( i = 0; i < 3; i++ )
+	{
+		if ( angles[i] > 180.0 )
+		{
+			angles[i] -= 360.0;
+		}
+		else if ( angles[i] < -180.0 )
+		{
+			angles[i] += 360.0;
+		}
+	}
+}
+
+/*
+===================
+V_InterpolateAngles
+
+Interpolate Euler angles.
+FIXME:  Use Quaternions to avoid discontinuities
+Frac is 0.0 to 1.0 ( i.e., should probably be clamped, but doesn't have to be )
+===================
+
+void V_InterpolateAngles( float *start, float *end, float *output, float frac )
+{
+	int i;
+	float ang1, ang2;
+	float d;
+	
+	V_NormalizeAngles( start );
+	V_NormalizeAngles( end );
+
+	for ( i = 0 ; i < 3 ; i++ )
+	{
+		ang1 = start[i];
+		ang2 = end[i];
+
+		d = ang2 - ang1;
+		if ( d > 180 )
+		{
+			d -= 360;
+		}
+		else if ( d < -180 )
+		{	
+			d += 360;
+		}
+
+		output[i] = ang1 + d * frac;
+	}
+
+	V_NormalizeAngles( output );
+} */
+
+// Quakeworld bob code, this fixes jitters in the mutliplayer since the clock (pparams->time) isn't quite linear
+float V_CalcBob ( struct ref_params_s *pparams )
+{
+	static	double	bobtime;
+	static float	bob;
+	float	cycle;
+	static float	lasttime;
+	vec3_t	vel;
+	
+	if ( pparams->onground == -1 ||
+		 pparams->time == lasttime )
+	{
+		// just use old value
+		return bob;	
+	}
+
+	lasttime = pparams->time;
+
+	bobtime += pparams->frametime;
+	cycle = bobtime - (int)( bobtime / cl_bobcycle->value ) * cl_bobcycle->value;
+	cycle /= cl_bobcycle->value;
+	
+	if ( cycle < cl_bobup->value )
+	{
+		cycle = M_PI * cycle / cl_bobup->value;
+	}
+	else
+	{
+		cycle = M_PI + M_PI * ( cycle - cl_bobup->value )/( 1.0 - cl_bobup->value );
+	}
+
+	// bob is proportional to simulated velocity in the xy plane
+	// (don't count Z, or jumping messes it up)
+	VectorCopy( pparams->simvel, vel );
+	vel[2] = 0;
+
+	bob = sqrt( vel[0] * vel[0] + vel[1] * vel[1] ) * cl_bob->value;
+	bob = bob * 0.3 + bob * 0.7 * sin(cycle);
+	bob = min( bob, 4 );
+	bob = max( bob, -7 );
+	return bob;
+	
+}
+
+/*
+===============
+V_CalcRoll
+Used by view and sv_user
+===============
+*/
+float V_CalcRoll (vec3_t angles, vec3_t velocity, float rollangle, float rollspeed )
+{
+    float   sign;
+    float   side;
+    float   value;
+	vec3_t  forward, right, up;
+    
+	AngleVectors ( angles, forward, right, up );
+    
+	side = DotProduct (velocity, right);
+    sign = side < 0 ? -1 : 1;
+    side = fabs( side );
+    
+	value = rollangle;
+    if (side < rollspeed)
+	{
+		side = side * value / rollspeed;
+	}
+    else
+	{
+		side = value;
+	}
+	return side * sign;
+}
+
+typedef struct pitchdrift_s
+{
+	float		pitchvel;
+	int			nodrift;
+	float		driftmove;
+	double		laststop;
+} pitchdrift_t;
+
+static pitchdrift_t pd;
+
+void V_StartPitchDrift( void )
+{
+	if ( pd.laststop == gEngfuncs.GetClientTime() )
+	{
+		return;		// something else is keeping it from drifting
+	}
+
+	if ( pd.nodrift || !pd.pitchvel )
+	{
+		pd.pitchvel = v_centerspeed->value;
+		pd.nodrift = 0;
+		pd.driftmove = 0;
+	}
+}
+
+void V_StopPitchDrift ( void )
+{
+	pd.laststop = gEngfuncs.GetClientTime();
+	pd.nodrift = 1;
+	pd.pitchvel = 0;
+}
+
+/*
+===============
+V_DriftPitch
+
+Moves the client pitch angle towards idealpitch sent by the server.
+
+If the user is adjusting pitch manually, either with lookup/lookdown,
+mlook and mouse, or klook and keyboard, pitch drifting is constantly stopped.
+===============
+*/
+void V_DriftPitch ( struct ref_params_s *pparams )
+{
+	float		delta, move;
+
+	if ( gEngfuncs.IsNoClipping() || !pparams->onground || pparams->demoplayback || pparams->spectator )
+	{
+		pd.driftmove = 0;
+		pd.pitchvel = 0;
+		return;
+	}
+
+	// don't count small mouse motion
+	if (pd.nodrift)
+	{
+		if ( fabs( pparams->cmd->forwardmove ) < kForwardSpeed )
+			pd.driftmove = 0;
+		else
+			pd.driftmove += pparams->frametime;
+	
+		if ( pd.driftmove > v_centermove->value)
+		{
+			V_StartPitchDrift ();
+		}
+		return;
+	}
+	
+	delta = pparams->idealpitch - pparams->cl_viewangles[PITCH];
+
+	if (!delta)
+	{
+		pd.pitchvel = 0;
+		return;
+	}
+
+	move = pparams->frametime * pd.pitchvel;
+	pd.pitchvel += pparams->frametime * v_centerspeed->value;
+	
+//Con_Printf ("move: %f (%f)\n", move, pparams->frametime);
+
+	if (delta > 0)
+	{
+		if (move > delta)
+		{
+			pd.pitchvel = 0;
+			move = delta;
+		}
+		pparams->cl_viewangles[PITCH] += move;
+	}
+	else if (delta < 0)
+	{
+		if (move > -delta)
+		{
+			pd.pitchvel = 0;
+			move = -delta;
+		}
+		pparams->cl_viewangles[PITCH] -= move;
+	}
+}
+
+/* 
+============================================================================== 
+						VIEW RENDERING 
+============================================================================== 
+*/ 
+
+/*
+==================
+V_CalcGunAngle
+==================
+*/
+void V_CalcGunAngle ( struct ref_params_s *pparams )
+{	
+	cl_entity_t *viewent;
+	
+	viewent = gEngfuncs.GetViewModel();
+	if ( !viewent )
+		return;
+
+	viewent->angles[YAW]   =  pparams->viewangles[YAW]   + pparams->crosshairangle[YAW];
+	viewent->angles[PITCH] = -pparams->viewangles[PITCH] + pparams->crosshairangle[PITCH] * 0.25;
+	viewent->angles[ROLL]  -= v_idlescale * sin(pparams->time*v_iroll_cycle.value) * v_iroll_level.value;
+	
+	// don't apply all of the v_ipitch to prevent normally unseen parts of viewmodel from coming into view.
+	viewent->angles[PITCH] -= v_idlescale * sin(pparams->time*v_ipitch_cycle.value) * (v_ipitch_level.value * 0.5);
+	viewent->angles[YAW]   -= v_idlescale * sin(pparams->time*v_iyaw_cycle.value) * v_iyaw_level.value;
+
+	VectorCopy( viewent->angles, viewent->curstate.angles );
+	VectorCopy( viewent->angles, viewent->latched.prevangles );
+}
+
+/*
+==============
+V_AddIdle
+
+Idle swaying
+==============
+*/
+void V_AddIdle ( struct ref_params_s *pparams )
+{
+	pparams->viewangles[ROLL] += v_idlescale * sin(pparams->time*v_iroll_cycle.value) * v_iroll_level.value;
+	pparams->viewangles[PITCH] += v_idlescale * sin(pparams->time*v_ipitch_cycle.value) * v_ipitch_level.value;
+	pparams->viewangles[YAW] += v_idlescale * sin(pparams->time*v_iyaw_cycle.value) * v_iyaw_level.value;
+}
+
+
+/*
+==============
+V_CalcViewRoll
+
+Roll is induced by movement and damage
+==============
+*/
+void V_CalcViewRoll ( struct ref_params_s *pparams )
+{
+	float		side;
+	cl_entity_t *viewentity;
+	
+	viewentity = gEngfuncs.GetEntityByIndex( pparams->viewentity );
+	if ( !viewentity )
+		return;
+
+	side = V_CalcRoll ( viewentity->angles, pparams->simvel, pparams->movevars->rollangle, pparams->movevars->rollspeed );
+
+	pparams->viewangles[ROLL] += side;
+
+	if ( pparams->health <= 0 && ( pparams->viewheight[2] != 0 ) )
+	{
+		// only roll the view if the player is dead and the viewheight[2] is nonzero 
+		// this is so deadcam in multiplayer will work.
+		pparams->viewangles[ROLL] = 80;	// dead view angle
+		return;
+	}
+}
+
+
+/*
+==================
+V_CalcIntermissionRefdef
+
+==================
+*/
+void V_CalcIntermissionRefdef ( struct ref_params_s *pparams )
+{
+	cl_entity_t	*ent, *view;
+	float		old;
+
+	// ent is the player model ( visible when out of body )
+	ent = gEngfuncs.GetLocalPlayer();
+	
+	// view is the weapon model (only visible from inside body )
+	view = gEngfuncs.GetViewModel();
+
+	VectorCopy ( pparams->simorg, pparams->vieworg );
+	VectorCopy ( pparams->cl_viewangles, pparams->viewangles );
+
+	view->model = NULL;
+
+	// allways idle in intermission
+	old = v_idlescale;
+	v_idlescale = 1;
+
+	V_AddIdle ( pparams );
+
+	if ( gEngfuncs.IsSpectateOnly() )
+	{
+        // in HLTV we must go to 'intermission' position by ourself
+        VectorCopy( gHUD.m_Spectator.m_cameraOrigin, pparams->vieworg );
+		VectorCopy( gHUD.m_Spectator.m_cameraAngles, pparams->viewangles );
+	}
+
+	v_idlescale = old;
+
+	v_cl_angles = pparams->cl_viewangles;
+	v_origin = pparams->vieworg;
+	v_angles = pparams->viewangles;
+    v_view_ofs = pparams->viewheight;
+
+}
+
+#define ORIGIN_BACKUP 64
+#define ORIGIN_MASK ( ORIGIN_BACKUP - 1 )
+
+typedef struct 
+{
+	float Origins[ ORIGIN_BACKUP ][3];
+	float OriginTime[ ORIGIN_BACKUP ];
+
+	float Angles[ ORIGIN_BACKUP ][3];
+	float AngleTime[ ORIGIN_BACKUP ];
+
+	int CurrentOrigin;
+	int CurrentAngle;
+} viewinterp_t;
+
+/*
+==================
+V_CalcRefdef
+
+==================
+*/
+void V_CalcNormalRefdef ( struct ref_params_s *pparams )
+{
+	cl_entity_t		*ent, *view;
+	int				i;
+	vec3_t			angles;
+	float			bob, waterOffset;
+	static viewinterp_t		ViewInterp;
+
+	static float oldz = 0;
+	static float lasttime;
+
+	vec3_t camAngles, camForward, camRight, camUp;
+	cl_entity_t *pwater;
+
+	V_DriftPitch ( pparams );
+
+	if ( gEngfuncs.IsSpectateOnly() )
+	{
+		ent = gEngfuncs.GetEntityByIndex( g_iUser2 );
+	}
+	else
+	{
+		// ent is the player model ( visible when out of body )
+		ent = gEngfuncs.GetLocalPlayer();
+	}
+	
+	// view is the weapon model (only visible from inside body )
+	view = gEngfuncs.GetViewModel();
+
+	// transform the view offset by the model's matrix to get the offset from
+	// model origin for the view
+	bob = V_CalcBob ( pparams );
+
+	// refresh position
+	VectorCopy ( pparams->simorg, pparams->vieworg );
+	pparams->vieworg[2] += ( bob );
+	VectorAdd( pparams->vieworg, pparams->viewheight, pparams->vieworg );
+
+	VectorCopy ( pparams->cl_viewangles, pparams->viewangles );
+
+	gEngfuncs.V_CalcShake();
+	gEngfuncs.V_ApplyShake( pparams->vieworg, pparams->viewangles, 1.0 );
+
+	// never let view origin sit exactly on a node line, because a water plane can
+	// dissapear when viewed with the eye exactly on it.
+	// FIXME, we send origin at 1/128 now, change this?
+	// the server protocol only specifies to 1/16 pixel, so add 1/32 in each axis
+	
+	pparams->vieworg[0] += 1.0/32;
+	pparams->vieworg[1] += 1.0/32;
+	pparams->vieworg[2] += 1.0/32;
+
+	// Check for problems around water, move the viewer artificially if necessary 
+	// -- this prevents drawing errors in GL due to waves
+
+	waterOffset = 0;
+	if ( pparams->waterlevel >= 2 )
+	{
+		int		i, contents, waterDist, waterEntity;
+		vec3_t	point;
+		waterDist = cl_waterdist->value;
+
+		if ( pparams->hardware )
+		{
+			waterEntity = gEngfuncs.PM_WaterEntity( pparams->simorg );
+			if ( waterEntity >= 0 && waterEntity < pparams->max_entities )
+			{
+				pwater = gEngfuncs.GetEntityByIndex( waterEntity );
+				if ( pwater && ( pwater->model != NULL ) )
+				{
+					waterDist += ( pwater->curstate.scale * 16 );	// Add in wave height
+				}
+			}
+		}
+		else
+		{
+			waterEntity = 0;	// Don't need this in software
+		}
+		
+		VectorCopy( pparams->vieworg, point );
+
+		// Eyes are above water, make sure we're above the waves
+		if ( pparams->waterlevel == 2 )	
+		{
+			point[2] -= waterDist;
+			for ( i = 0; i < waterDist; i++ )
+			{
+				contents = gEngfuncs.PM_PointContents( point, NULL );
+				if ( contents > CONTENTS_WATER )
+					break;
+				point[2] += 1;
+			}
+			waterOffset = (point[2] + waterDist) - pparams->vieworg[2];
+		}
+		else
+		{
+			// eyes are under water.  Make sure we're far enough under
+			point[2] += waterDist;
+
+			for ( i = 0; i < waterDist; i++ )
+			{
+				contents = gEngfuncs.PM_PointContents( point, NULL );
+				if ( contents <= CONTENTS_WATER )
+					break;
+				point[2] -= 1;
+			}
+			waterOffset = (point[2] - waterDist) - pparams->vieworg[2];
+		}
+	}
+
+	pparams->vieworg[2] += waterOffset;
+	
+	V_CalcViewRoll ( pparams );
+	
+	V_AddIdle ( pparams );
+
+	// offsets
+	VectorCopy( pparams->cl_viewangles, angles );
+
+	AngleVectors ( angles, pparams->forward, pparams->right, pparams->up );
+
+	// don't allow cheats in multiplayer
+	if ( pparams->maxclients <= 1 )
+	{
+		for ( i=0 ; i<3 ; i++ )
+		{
+			pparams->vieworg[i] += scr_ofsx->value*pparams->forward[i] + scr_ofsy->value*pparams->right[i] + scr_ofsz->value*pparams->up[i];
+		}
+	}
+	
+	// Treating cam_ofs[2] as the distance
+	if( CL_IsThirdPerson() )
+	{
+		vec3_t ofs;
+
+		ofs[0] = ofs[1] = ofs[2] = 0.0;
+
+		CL_CameraOffset( (float *)&ofs );
+
+		VectorCopy( ofs, camAngles );
+		camAngles[ ROLL ]	= 0;
+
+		AngleVectors( camAngles, camForward, camRight, camUp );
+
+		for ( i = 0; i < 3; i++ )
+		{
+			pparams->vieworg[ i ] += -ofs[2] * camForward[ i ];
+		}
+	}
+	
+	// Give gun our viewangles
+	VectorCopy ( pparams->cl_viewangles, view->angles );
+	
+	// set up gun position
+	V_CalcGunAngle ( pparams );
+
+	// Use predicted origin as view origin.
+	VectorCopy ( pparams->simorg, view->origin );      
+	view->origin[2] += ( waterOffset );
+	VectorAdd( view->origin, pparams->viewheight, view->origin );
+
+	// Let the viewmodel shake at about 10% of the amplitude
+	gEngfuncs.V_ApplyShake( view->origin, view->angles, 0.9 );
+
+	for ( i = 0; i < 3; i++ )
+	{
+		view->origin[ i ] += bob * 0.4 * pparams->forward[ i ];
+	}
+	view->origin[2] += bob;
+
+	// throw in a little tilt.
+	view->angles[YAW]   -= bob * 0.5;
+	view->angles[ROLL]  -= bob * 1;
+	view->angles[PITCH] -= bob * 0.3;
+
+	// pushing the view origin down off of the same X/Z plane as the ent's origin will give the
+	// gun a very nice 'shifting' effect when the player looks up/down. If there is a problem
+	// with view model distortion, this may be a cause. (SJB). 
+	view->origin[2] -= 1;
+
+	// fudge position around to keep amount of weapon visible
+	// roughly equal with different FOV
+	if (pparams->viewsize == 110)
+	{
+		view->origin[2] += 1;
+	}
+	else if (pparams->viewsize == 100)
+	{
+		view->origin[2] += 2;
+	}
+	else if (pparams->viewsize == 90)
+	{
+		view->origin[2] += 1;
+	}
+	else if (pparams->viewsize == 80)
+	{
+		view->origin[2] += 0.5;
+	}
+
+	// Add in the punchangle, if any
+	VectorAdd ( pparams->viewangles, pparams->punchangle, pparams->viewangles );
+
+	// Include client side punch, too
+	VectorAdd ( pparams->viewangles, (float *)&ev_punchangle, pparams->viewangles);
+
+	V_DropPunchAngle ( pparams->frametime, (float *)&ev_punchangle );
+
+	// smooth out stair step ups
+#if 1
+	if ( !pparams->smoothing && pparams->onground && pparams->simorg[2] - oldz > 0)
+	{
+		float steptime;
+		
+		steptime = pparams->time - lasttime;
+		if (steptime < 0)
+	//FIXME		I_Error ("steptime < 0");
+			steptime = 0;
+
+		oldz += steptime * 150;
+		if (oldz > pparams->simorg[2])
+			oldz = pparams->simorg[2];
+		if (pparams->simorg[2] - oldz > 18)
+			oldz = pparams->simorg[2]- 18;
+		pparams->vieworg[2] += oldz - pparams->simorg[2];
+		view->origin[2] += oldz - pparams->simorg[2];
+	}
+	else
+	{
+		oldz = pparams->simorg[2];
+	}
+#endif
+
+	{
+		static float lastorg[3];
+		vec3_t delta;
+
+		VectorSubtract( pparams->simorg, lastorg, delta );
+
+		if ( Length( delta ) != 0.0 )
+		{
+			VectorCopy( pparams->simorg, ViewInterp.Origins[ ViewInterp.CurrentOrigin & ORIGIN_MASK ] );
+			ViewInterp.OriginTime[ ViewInterp.CurrentOrigin & ORIGIN_MASK ] = pparams->time;
+			ViewInterp.CurrentOrigin++;
+
+			VectorCopy( pparams->simorg, lastorg );
+		}
+	}
+
+	// Smooth out whole view in multiplayer when on trains, lifts
+	if ( cl_vsmoothing && cl_vsmoothing->value &&
+		( pparams->smoothing && ( pparams->maxclients > 1 ) ) )
+	{
+		int foundidx;
+		int i;
+		float t;
+
+		if ( cl_vsmoothing->value < 0.0 )
+		{
+			gEngfuncs.Cvar_SetValue( "cl_vsmoothing", 0.0 );
+		}
+
+		t = pparams->time - cl_vsmoothing->value;
+
+		for ( i = 1; i < ORIGIN_MASK; i++ )
+		{
+			foundidx = ViewInterp.CurrentOrigin - 1 - i;
+			if ( ViewInterp.OriginTime[ foundidx & ORIGIN_MASK ] <= t )
+				break;
+		}
+
+		if ( i < ORIGIN_MASK &&  ViewInterp.OriginTime[ foundidx & ORIGIN_MASK ] != 0.0 )
+		{
+			// Interpolate
+			vec3_t delta;
+			double frac;
+			double dt;
+			vec3_t neworg;
+
+			dt = ViewInterp.OriginTime[ (foundidx + 1) & ORIGIN_MASK ] - ViewInterp.OriginTime[ foundidx & ORIGIN_MASK ];
+			if ( dt > 0.0 )
+			{
+				frac = ( t - ViewInterp.OriginTime[ foundidx & ORIGIN_MASK] ) / dt;
+				frac = min( 1.0, frac );
+				VectorSubtract( ViewInterp.Origins[ ( foundidx + 1 ) & ORIGIN_MASK ], ViewInterp.Origins[ foundidx & ORIGIN_MASK ], delta );
+				VectorMA( ViewInterp.Origins[ foundidx & ORIGIN_MASK ], frac, delta, neworg );
+
+				// Dont interpolate large changes
+				if ( Length( delta ) < 64 )
+				{
+					VectorSubtract( neworg, pparams->simorg, delta );
+
+					VectorAdd( pparams->simorg, delta, pparams->simorg );
+					VectorAdd( pparams->vieworg, delta, pparams->vieworg );
+					VectorAdd( view->origin, delta, view->origin );
+
+				}
+			}
+		}
+	}
+
+	// Store off v_angles before munging for third person
+	v_angles = pparams->viewangles;
+	v_lastAngles = pparams->viewangles;
+//	v_cl_angles = pparams->cl_viewangles;	// keep old user mouse angles !
+	if ( CL_IsThirdPerson() )
+	{
+		VectorCopy( camAngles, pparams->viewangles);
+		float pitch = camAngles[ 0 ];
+
+		// Normalize angles
+		if ( pitch > 180 ) 
+			pitch -= 360.0;
+		else if ( pitch < -180 )
+			pitch += 360;
+
+		// Player pitch is inverted
+		pitch /= -3.0;
+
+		// Slam local player's pitch value
+		ent->angles[ 0 ] = pitch;
+		ent->curstate.angles[ 0 ] = pitch;
+		ent->prevstate.angles[ 0 ] = pitch;
+		ent->latched.prevangles[ 0 ] = pitch;
+	}
+
+	// override all previous settings if the viewent isn't the client
+	if ( pparams->viewentity > pparams->maxclients )
+	{
+		cl_entity_t *viewentity;
+		viewentity = gEngfuncs.GetEntityByIndex( pparams->viewentity );
+		if ( viewentity )
+		{
+			VectorCopy( viewentity->origin, pparams->vieworg );
+			VectorCopy( viewentity->angles, pparams->viewangles );
+
+			// Store off overridden viewangles
+			v_angles = pparams->viewangles;
+		}
+	}
+
+	lasttime = pparams->time;
+
+	v_origin = pparams->vieworg;
+    v_view_ofs = pparams->viewheight;
+
+}
+
+/*
+==================
+V_CalcTopDownRefdef
+
+==================
+*/
+void V_CalcTopDownRefdef ( struct ref_params_s *pparams )
+{
+	cl_entity_t		*ent, *view;
+	int				i;
+	vec3_t			angles;
+	//float			waterOffset;
+	static viewinterp_t		ViewInterp;
+
+	static float oldz = 0;
+	static float lasttime;
+
+	vec3_t camAngles, camForward, camRight, camUp;
+	//cl_entity_t *pwater;
+
+	V_DriftPitch ( pparams );
+
+	if ( gEngfuncs.IsSpectateOnly() )
+	{
+		ent = gEngfuncs.GetEntityByIndex( g_iUser2 );
+	}
+	else
+	{
+		// ent is the player model ( visible when out of body )
+		ent = gEngfuncs.GetLocalPlayer();
+	}
+	
+	// view is the weapon model (only visible from inside body )
+	view = gEngfuncs.GetViewModel();
+
+	// Override topdown position and angles from physics code
+	VectorCopy( gTopDownViewOrigin, pparams->vieworg );
+	VectorCopy( gTopDownViewOrigin, pparams->simorg );
+
+	VectorCopy( gTopDownViewAngles, pparams->cl_viewangles );
+	VectorCopy( gTopDownViewAngles, pparams->viewangles );
+
+	gEngfuncs.V_CalcShake();
+	gEngfuncs.V_ApplyShake( pparams->vieworg, pparams->viewangles, 1.0 );
+
+//	// never let view origin sit exactly on a node line, because a water plane can
+//	// dissapear when viewed with the eye exactly on it.
+//	// FIXME, we send origin at 1/128 now, change this?
+//	// the server protocol only specifies to 1/16 pixel, so add 1/32 in each axis
+//	
+//	pparams->vieworg[0] += 1.0/32;
+//	pparams->vieworg[1] += 1.0/32;
+//	pparams->vieworg[2] += 1.0/32;
+//
+//	// Check for problems around water, move the viewer artificially if necessary 
+//	// -- this prevents drawing errors in GL due to waves
+//
+//	waterOffset = 0;
+//	if ( pparams->waterlevel >= 2 )
+//	{
+//		int		i, contents, waterDist, waterEntity;
+//		vec3_t	point;
+//		waterDist = cl_waterdist->value;
+//
+//		if ( pparams->hardware )
+//		{
+//			waterEntity = gEngfuncs.PM_WaterEntity( pparams->simorg );
+//			if ( waterEntity >= 0 && waterEntity < pparams->max_entities )
+//			{
+//				pwater = gEngfuncs.GetEntityByIndex( waterEntity );
+//				if ( pwater && ( pwater->model != NULL ) )
+//				{
+//					waterDist += ( pwater->curstate.scale * 16 );	// Add in wave height
+//				}
+//			}
+//		}
+//		else
+//		{
+//			waterEntity = 0;	// Don't need this in software
+//		}
+//		
+//		VectorCopy( pparams->vieworg, point );
+//
+//		// Eyes are above water, make sure we're above the waves
+//		if ( pparams->waterlevel == 2 )	
+//		{
+//			point[2] -= waterDist;
+//			for ( i = 0; i < waterDist; i++ )
+//			{
+//				contents = gEngfuncs.PM_PointContents( point, NULL );
+//				if ( contents > CONTENTS_WATER )
+//					break;
+//				point[2] += 1;
+//			}
+//			waterOffset = (point[2] + waterDist) - pparams->vieworg[2];
+//		}
+//		else
+//		{
+//			// eyes are under water.  Make sure we're far enough under
+//			point[2] += waterDist;
+//
+//			for ( i = 0; i < waterDist; i++ )
+//			{
+//				contents = gEngfuncs.PM_PointContents( point, NULL );
+//				if ( contents <= CONTENTS_WATER )
+//					break;
+//				point[2] -= 1;
+//			}
+//			waterOffset = (point[2] - waterDist) - pparams->vieworg[2];
+//		}
+//	}
+//
+//	pparams->vieworg[2] += waterOffset;
+	
+	V_CalcViewRoll ( pparams );
+	
+	//V_AddIdle ( pparams );
+
+	// offsets
+	VectorCopy( pparams->cl_viewangles, angles );
+
+	AngleVectors ( angles, pparams->forward, pparams->right, pparams->up );
+
+	// don't allow cheats in multiplayer
+	if ( pparams->maxclients <= 1 )
+	{
+		for ( i=0 ; i<3 ; i++ )
+		{
+			pparams->vieworg[i] += scr_ofsx->value*pparams->forward[i] + scr_ofsy->value*pparams->right[i] + scr_ofsz->value*pparams->up[i];
+		}
+	}
+	
+	// Treating cam_ofs[2] as the distance
+//	if( CL_IsThirdPerson() )
+//	{
+//		vec3_t ofs;
+//
+//		ofs[0] = ofs[1] = ofs[2] = 0.0;
+//
+//		CL_CameraOffset( (float *)&ofs );
+//
+//		VectorCopy( ofs, camAngles );
+//		camAngles[ ROLL ]	= 0;
+//
+//		AngleVectors( camAngles, camForward, camRight, camUp );
+//
+//		for ( i = 0; i < 3; i++ )
+//		{
+//			pparams->vieworg[ i ] += -ofs[2] * camForward[ i ];
+//		}
+//	}
+	
+	// Give gun our viewangles
+//	VectorCopy ( pparams->cl_viewangles, view->angles );
+	
+	// set up gun position
+//	V_CalcGunAngle ( pparams );
+
+	// Use predicted origin as view origin.
+//	VectorCopy ( pparams->simorg, view->origin );      
+////	view->origin[2] += ( waterOffset );
+//	VectorAdd( view->origin, pparams->viewheight, view->origin );
+
+	// Let the viewmodel shake at about 10% of the amplitude
+//	gEngfuncs.V_ApplyShake( view->origin, view->angles, 0.9 );
+
+//	for ( i = 0; i < 3; i++ )
+//	{
+//		view->origin[ i ] += bob * 0.4 * pparams->forward[ i ];
+//	}
+//	view->origin[2] += bob;
+//
+//	// throw in a little tilt.
+//	view->angles[YAW]   -= bob * 0.5;
+//	view->angles[ROLL]  -= bob * 1;
+//	view->angles[PITCH] -= bob * 0.3;
+//
+//	// pushing the view origin down off of the same X/Z plane as the ent's origin will give the
+//	// gun a very nice 'shifting' effect when the player looks up/down. If there is a problem
+//	// with view model distortion, this may be a cause. (SJB). 
+//	view->origin[2] -= 1;
+//
+//	// fudge position around to keep amount of weapon visible
+//	// roughly equal with different FOV
+//	if (pparams->viewsize == 110)
+//	{
+//		view->origin[2] += 1;
+//	}
+//	else if (pparams->viewsize == 100)
+//	{
+//		view->origin[2] += 2;
+//	}
+//	else if (pparams->viewsize == 90)
+//	{
+//		view->origin[2] += 1;
+//	}
+//	else if (pparams->viewsize == 80)
+//	{
+//		view->origin[2] += 0.5;
+//	}
+
+	// Add in the punchangle, if any
+//	VectorAdd ( pparams->viewangles, pparams->punchangle, pparams->viewangles );
+//
+//	// Include client side punch, too
+////	VectorAdd ( pparams->viewangles, (float *)&ev_punchangle, pparams->viewangles);
+//
+//	V_DropPunchAngle ( pparams->frametime, (float *)&ev_punchangle );
+
+	// smooth out stair step ups
+#if 1
+	if ( !pparams->smoothing && pparams->onground && pparams->simorg[2] - oldz > 0)
+	{
+		float steptime;
+		
+		steptime = pparams->time - lasttime;
+		if (steptime < 0)
+	//FIXME		I_Error ("steptime < 0");
+			steptime = 0;
+
+		oldz += steptime * 150;
+		if (oldz > pparams->simorg[2])
+			oldz = pparams->simorg[2];
+		if (pparams->simorg[2] - oldz > 18)
+			oldz = pparams->simorg[2]- 18;
+		pparams->vieworg[2] += oldz - pparams->simorg[2];
+		view->origin[2] += oldz - pparams->simorg[2];
+	}
+	else
+	{
+		oldz = pparams->simorg[2];
+	}
+#endif
+
+	{
+		static float lastorg[3];
+		vec3_t delta;
+
+		VectorSubtract( pparams->simorg, lastorg, delta );
+
+		if ( Length( delta ) != 0.0 )
+		{
+			VectorCopy( pparams->simorg, ViewInterp.Origins[ ViewInterp.CurrentOrigin & ORIGIN_MASK ] );
+			ViewInterp.OriginTime[ ViewInterp.CurrentOrigin & ORIGIN_MASK ] = pparams->time;
+			ViewInterp.CurrentOrigin++;
+
+			VectorCopy( pparams->simorg, lastorg );
+		}
+	}
+
+	// Smooth out whole view in multiplayer when on trains, lifts
+	if ( cl_vsmoothing && cl_vsmoothing->value &&
+		( pparams->smoothing && ( pparams->maxclients > 1 ) ) )
+	{
+		int foundidx;
+		int i;
+		float t;
+
+		if ( cl_vsmoothing->value < 0.0 )
+		{
+			gEngfuncs.Cvar_SetValue( "cl_vsmoothing", 0.0 );
+		}
+
+		t = pparams->time - cl_vsmoothing->value;
+
+		for ( i = 1; i < ORIGIN_MASK; i++ )
+		{
+			foundidx = ViewInterp.CurrentOrigin - 1 - i;
+			if ( ViewInterp.OriginTime[ foundidx & ORIGIN_MASK ] <= t )
+				break;
+		}
+
+		if ( i < ORIGIN_MASK &&  ViewInterp.OriginTime[ foundidx & ORIGIN_MASK ] != 0.0 )
+		{
+			// Interpolate
+			vec3_t delta;
+			double frac;
+			double dt;
+			vec3_t neworg;
+
+			dt = ViewInterp.OriginTime[ (foundidx + 1) & ORIGIN_MASK ] - ViewInterp.OriginTime[ foundidx & ORIGIN_MASK ];
+			if ( dt > 0.0 )
+			{
+				frac = ( t - ViewInterp.OriginTime[ foundidx & ORIGIN_MASK] ) / dt;
+				frac = min( 1.0, frac );
+				VectorSubtract( ViewInterp.Origins[ ( foundidx + 1 ) & ORIGIN_MASK ], ViewInterp.Origins[ foundidx & ORIGIN_MASK ], delta );
+				VectorMA( ViewInterp.Origins[ foundidx & ORIGIN_MASK ], frac, delta, neworg );
+
+				// Dont interpolate large changes
+				if ( Length( delta ) < 64 )
+				{
+					VectorSubtract( neworg, pparams->simorg, delta );
+
+					VectorAdd( pparams->simorg, delta, pparams->simorg );
+					VectorAdd( pparams->vieworg, delta, pparams->vieworg );
+					VectorAdd( view->origin, delta, view->origin );
+
+					//VectorCopy( pparams->simorg, gTopDownViewOrigin );
+				}
+			}
+		}
+	}
+
+	// Store off v_angles before munging for third person
+	v_angles = pparams->viewangles;
+	v_lastAngles = pparams->viewangles;
+//	v_cl_angles = pparams->cl_viewangles;	// keep old user mouse angles !
+//	if ( CL_IsThirdPerson() )
+//	{
+//		VectorCopy( camAngles, pparams->viewangles);
+//		float pitch = camAngles[ 0 ];
+//
+//		// Normalize angles
+//		if ( pitch > 180 ) 
+//			pitch -= 360.0;
+//		else if ( pitch < -180 )
+//			pitch += 360;
+//
+//		// Player pitch is inverted
+//		pitch /= -3.0;
+//
+//		// Slam local player's pitch value
+//		ent->angles[ 0 ] = pitch;
+//		ent->curstate.angles[ 0 ] = pitch;
+//		ent->prevstate.angles[ 0 ] = pitch;
+//		ent->latched.prevangles[ 0 ] = pitch;
+//	}
+
+//	// override all previous settings if the viewent isn't the client
+//	if ( pparams->viewentity > pparams->maxclients )
+//	{
+//		cl_entity_t *viewentity;
+//		viewentity = gEngfuncs.GetEntityByIndex( pparams->viewentity );
+//		if ( viewentity )
+//		{
+//			VectorCopy( viewentity->origin, pparams->vieworg );
+//			VectorCopy( viewentity->angles, pparams->viewangles );
+//
+//			// Store off overridden viewangles
+//			v_angles = pparams->viewangles;
+//		}
+//	}
+
+	lasttime = pparams->time;
+
+	v_origin = pparams->vieworg;
+    v_view_ofs = pparams->viewheight;
+
+}
+
+void V_SmoothInterpolateAngles( float * startAngle, float * endAngle, float * finalAngle, float degreesPerSec )
+{
+	float absd,frac,d,threshhold;
+	
+	NormalizeAngles( startAngle );
+	NormalizeAngles( endAngle );
+
+	for ( int i = 0 ; i < 3 ; i++ )
+	{
+		d = endAngle[i] - startAngle[i];
+
+		if ( d > 180.0f )
+		{
+			d -= 360.0f;
+		}
+		else if ( d < -180.0f )
+		{	
+			d += 360.0f;
+		}
+
+		absd = fabs(d);
+
+		if ( absd > 0.01f )
+		{
+			frac = degreesPerSec * v_frametime;
+
+			threshhold= degreesPerSec / 4;
+
+			if ( absd < threshhold )
+			{
+				float h = absd / threshhold;
+				h *= h;
+				frac*= h;  // slow down last degrees
+			}
+
+			if ( frac >  absd )
+			{
+				finalAngle[i] = endAngle[i];
+			}
+			else
+			{
+				if ( d>0)
+					finalAngle[i] = startAngle[i] + frac;
+				else
+					finalAngle[i] = startAngle[i] - frac;
+			}
+		}
+		else
+		{
+			finalAngle[i] = endAngle[i];
+		}
+
+	}
+
+	NormalizeAngles( finalAngle );
+}
+
+// Get the origin of the Observer based around the target's position and angles
+void V_GetChaseOrigin( float * angles, float * origin, float distance, float * returnvec )
+{
+	vec3_t	vecEnd;
+	vec3_t	forward;
+	vec3_t	vecStart;
+	pmtrace_t * trace;
+	int maxLoops = 8;
+
+	int ignoreent = -1;	// first, ignore no entity
+	
+	cl_entity_t	 *	ent = NULL;
+	
+	// Trace back from the target using the player's view angles
+	AngleVectors(angles, forward, NULL, NULL);
+	
+	VectorScale(forward,-1,forward);
+
+	VectorCopy( origin, vecStart );
+
+	VectorMA(vecStart, distance , forward, vecEnd);
+
+	while ( maxLoops > 0)
+	{
+		trace = gEngfuncs.PM_TraceLine( vecStart, vecEnd, PM_TRACELINE_PHYSENTSONLY, 2, ignoreent );
+
+		// WARNING! trace->ent is is the number in physent list not the normal entity number
+
+		if ( trace->ent <= 0)
+			break;	// we hit the world or nothing, stop trace
+
+		ent = gEngfuncs.GetEntityByIndex( PM_GetPhysEntInfo( trace->ent ) );
+
+		if ( ent == NULL )
+			break;
+
+		// hit non-player solid BSP , stop here
+		if ( ent->curstate.solid == SOLID_BSP && !ent->player ) 
+			break;
+
+		// if close enought to end pos, stop, otherwise continue trace
+		if( VectorDistance(trace->endpos, vecEnd ) < 1.0f )
+		{
+			break;
+		}
+		else
+		{
+			ignoreent = trace->ent;	// ignore last hit entity
+			VectorCopy( trace->endpos, vecStart);
+		}
+
+		maxLoops--;
+	}  
+
+/*	if ( ent )
+	{
+		gEngfuncs.Con_Printf("Trace loops %i , entity %i, model %s, solid %i\n",(8-maxLoops),ent->curstate.number, ent->model->name , ent->curstate.solid ); 
+	} */
+
+	VectorMA( trace->endpos, 4, trace->plane.normal, returnvec );
+
+	v_lastDistance = VectorDistance(trace->endpos, origin);	// real distance without offset
+}
+
+/*void V_GetDeathCam(cl_entity_t * ent1, cl_entity_t * ent2, float * angle, float * origin)
+{
+	float newAngle[3]; float newOrigin[3]; 
+
+	float distance = 168.0f;
+
+	v_lastDistance+= v_frametime * 96.0f;	// move unit per seconds back
+
+	if ( v_resetCamera )
+		v_lastDistance = 64.0f;
+
+	if ( distance > v_lastDistance )
+		distance = v_lastDistance;
+
+	VectorCopy(ent1->origin, newOrigin);
+
+	if ( ent1->player )
+		newOrigin[2]+= 17; // head level of living player
+
+	// get new angle towards second target
+	if ( ent2 )
+	{
+		VectorSubtract( ent2->origin, ent1->origin, newAngle );
+		VectorAngles( newAngle, newAngle );
+		newAngle[0] = -newAngle[0];
+	}
+	else
+	{
+		// if no second target is given, look down to dead player
+		newAngle[0] = 90.0f;
+		newAngle[1] = 0.0f;
+		newAngle[2] = 0;
+	}
+
+	// and smooth view
+	V_SmoothInterpolateAngles( v_lastAngles, newAngle, angle, 120.0f );
+			
+	V_GetChaseOrigin( angle, newOrigin, distance, origin );
+
+	VectorCopy(angle, v_lastAngles);
+}*/
+
+void V_GetSingleTargetCam(cl_entity_t * ent1, float * angle, float * origin)
+{
+	float newAngle[3]; float newOrigin[3]; 
+	
+	int flags 	   = gHUD.m_Spectator.m_iObserverFlags;
+
+	// see is target is a dead player
+	qboolean deadPlayer = ent1->player && (ent1->curstate.solid == SOLID_NOT);
+	
+	float dfactor   = ( flags & DRC_FLAG_DRAMATIC )? -1.0f : 1.0f;
+
+	float distance = 112.0f + ( 16.0f * dfactor ); // get close if dramatic;
+	
+	// go away in final scenes or if player just died
+	if ( flags & DRC_FLAG_FINAL )
+		distance*=2.0f;	
+	else if ( deadPlayer )
+		distance*=1.5f;	
+
+	// let v_lastDistance float smoothly away
+	v_lastDistance+= v_frametime * 32.0f;	// move unit per seconds back
+
+	if ( distance > v_lastDistance )
+		distance = v_lastDistance;
+	
+	VectorCopy(ent1->origin, newOrigin);
+
+	if ( ent1->player )
+	{
+		if ( deadPlayer )  
+			newOrigin[2]+= 2;	//laying on ground
+		else
+			newOrigin[2]+= 17; // head level of living player
+			
+	}
+	else
+		newOrigin[2]+= 8;	// object, tricky, must be above bomb in CS
+
+	// we have no second target, choose view direction based on
+	// show front of primary target
+	VectorCopy(ent1->angles, newAngle);
+
+	// show dead players from front, normal players back
+	if ( flags & DRC_FLAG_FACEPLAYER )
+		newAngle[1]+= 180.0f;
+
+
+	newAngle[0]+= 12.5f * dfactor; // lower angle if dramatic
+
+	// if final scene (bomb), show from real high pos
+	if ( flags & DRC_FLAG_FINAL )
+		newAngle[0] = 22.5f; 
+
+	// choose side of object/player			
+	if ( flags & DRC_FLAG_SIDE )
+		newAngle[1]+=22.5f;
+	else
+		newAngle[1]-=22.5f;
+
+	V_SmoothInterpolateAngles( v_lastAngles, newAngle, angle, 120.0f );
+
+	// HACK, if player is dead don't clip against his dead body, can't check this
+	V_GetChaseOrigin( angle, newOrigin, distance, origin );
+}
+
+float MaxAngleBetweenAngles(  float * a1, float * a2 )
+{
+	float d, maxd = 0.0f;
+
+	NormalizeAngles( a1 );
+	NormalizeAngles( a2 );
+
+	for ( int i = 0 ; i < 3 ; i++ )
+	{
+		d = a2[i] - a1[i];
+		if ( d > 180 )
+		{
+			d -= 360;
+		}
+		else if ( d < -180 )
+		{	
+			d += 360;
+		}
+
+		d = fabs(d);
+
+		if ( d > maxd )
+			maxd=d;
+	}
+
+	return maxd;
+}
+
+void V_GetDoubleTargetsCam(cl_entity_t	 * ent1, cl_entity_t * ent2,float * angle, float * origin)
+{
+	float newAngle[3]; float newOrigin[3]; float tempVec[3];
+
+	int flags 	   = gHUD.m_Spectator.m_iObserverFlags;
+
+	float dfactor   = ( flags & DRC_FLAG_DRAMATIC )? -1.0f : 1.0f;
+
+	float distance = 112.0f + ( 16.0f * dfactor ); // get close if dramatic;
+	
+	// go away in final scenes or if player just died
+	if ( flags & DRC_FLAG_FINAL )
+		distance*=2.0f;	
+	
+	// let v_lastDistance float smoothly away
+	v_lastDistance+= v_frametime * 32.0f;	// move unit per seconds back
+
+	if ( distance > v_lastDistance )
+		distance = v_lastDistance;
+
+	VectorCopy(ent1->origin, newOrigin);
+
+	if ( ent1->player )
+		newOrigin[2]+= 17; // head level of living player
+	else
+		newOrigin[2]+= 8;	// object, tricky, must be above bomb in CS
+
+	// get new angle towards second target
+	VectorSubtract( ent2->origin, ent1->origin, newAngle );
+
+	VectorAngles( newAngle, newAngle );
+	newAngle[0] = -newAngle[0];
+
+	// set angle diffrent in Dramtaic scenes
+	newAngle[0]+= 12.5f * dfactor; // lower angle if dramatic
+			
+	if ( flags & DRC_FLAG_SIDE )
+		newAngle[1]+=22.5f;
+	else
+		newAngle[1]-=22.5f;
+
+	float d = MaxAngleBetweenAngles( v_lastAngles, newAngle );
+	
+	if ( ( d < v_cameraFocusAngle) && ( v_cameraMode == CAM_MODE_RELAX ) )
+	{
+		// difference is to small and we are in relax camera mode, keep viewangles
+		VectorCopy(v_lastAngles, newAngle );
+	}
+	else if ( (d < v_cameraRelaxAngle) && (v_cameraMode == CAM_MODE_FOCUS) )
+	{
+		// we catched up with our target, relax again
+		v_cameraMode = CAM_MODE_RELAX;
+	}
+	else
+	{
+		// target move too far away, focus camera again
+		v_cameraMode = CAM_MODE_FOCUS;
+	}
+	
+	// and smooth view, if not a scene cut
+	if ( v_resetCamera || (v_cameraMode == CAM_MODE_RELAX) )
+	{
+		VectorCopy( newAngle, angle );
+	}
+	else
+	{
+		V_SmoothInterpolateAngles( v_lastAngles, newAngle, angle, 180.0f );
+	}
+	
+	V_GetChaseOrigin( newAngle, newOrigin, distance, origin );
+	
+	// move position up, if very close at target
+	if ( v_lastDistance < 64.0f )
+		origin[2]+= 16.0f*( 1.0f - (v_lastDistance / 64.0f ) );
+	
+	// calculate angle to second target
+	VectorSubtract( ent2->origin, origin, tempVec );
+	VectorAngles( tempVec, tempVec );
+	tempVec[0] = -tempVec[0];
+	
+	/* take middle between two viewangles
+	InterpolateAngles( newAngle, tempVec, newAngle, 0.5f); */
+}
+
+
+void V_GetDirectedChasePosition(cl_entity_t	 * ent1, cl_entity_t * ent2,float * angle, float * origin)
+{
+
+	if ( v_resetCamera )
+	{
+		v_lastDistance = 4096.0f;
+		// v_cameraMode = CAM_MODE_FOCUS;
+	}
+	
+	if ( ( ent2 == (cl_entity_t*)0xFFFFFFFF ) || ( ent1->player && (ent1->curstate.solid == SOLID_NOT) ) )
+	{
+		// we have no second target or player just died
+		V_GetSingleTargetCam(ent1, angle, origin);
+	}
+	else if ( ent2 )
+	{
+		// keep both target in view
+		V_GetDoubleTargetsCam( ent1, ent2, angle, origin );
+	}
+	else
+	{
+		// second target disappeard somehow (dead)
+		
+		// keep last good viewangle
+		float newOrigin[3];
+		
+		int flags 	   = gHUD.m_Spectator.m_iObserverFlags;
+		
+		float dfactor   = ( flags & DRC_FLAG_DRAMATIC )? -1.0f : 1.0f;
+		
+		float distance = 112.0f + ( 16.0f * dfactor ); // get close if dramatic;
+		
+		// go away in final scenes or if player just died
+		if ( flags & DRC_FLAG_FINAL )
+			distance*=2.0f;	
+		
+		// let v_lastDistance float smoothly away
+		v_lastDistance+= v_frametime * 32.0f;	// move unit per seconds back
+		
+		if ( distance > v_lastDistance )
+			distance = v_lastDistance;
+		
+		VectorCopy(ent1->origin, newOrigin);
+		
+		if ( ent1->player )
+			newOrigin[2]+= 17; // head level of living player
+		else
+			newOrigin[2]+= 8;	// object, tricky, must be above bomb in CS
+		
+		V_GetChaseOrigin( angle, newOrigin, distance, origin );
+	}
+	
+	VectorCopy(angle, v_lastAngles);
+}
+
+void V_GetChasePos(int target, float * cl_angles, float * origin, float * angles)
+{
+	cl_entity_t	 *	ent = NULL;
+	
+	if ( target ) 
+	{
+		ent = gEngfuncs.GetEntityByIndex( target );
+	};
+	
+	if (!ent)
+	{
+		// just copy a save in-map position
+		VectorCopy ( vJumpAngles, angles );
+		VectorCopy ( vJumpOrigin, origin );
+		return;
+	}
+	
+	
+	
+	if ( gHUD.m_Spectator.m_autoDirector->value )
+	{
+		if ( g_iUser3 )
+			V_GetDirectedChasePosition( ent, gEngfuncs.GetEntityByIndex( g_iUser3 ),
+			angles, origin );
+		else
+			V_GetDirectedChasePosition( ent, ( cl_entity_t*)0xFFFFFFFF,
+			angles, origin );
+	}
+	else
+	{
+		if ( cl_angles == NULL )	// no mouse angles given, use entity angles ( locked mode )
+		{
+			VectorCopy ( ent->angles, angles);
+			angles[0]*=-1;
+		}
+		else
+			VectorCopy ( cl_angles, angles);
+		
+		
+		VectorCopy ( ent->origin, origin);
+		
+		origin[2]+= 28; // DEFAULT_VIEWHEIGHT - some offset
+		
+		V_GetChaseOrigin( angles, origin, cl_chasedist->value, origin );
+	}
+	
+	v_resetCamera = false;	
+}
+
+void V_ResetChaseCam()
+{
+	v_resetCamera = true;
+}
+
+void V_GetInEyePos(int entity, float *origin, float * angles )
+{
+	cl_entity_t	 * ent = gEngfuncs.GetEntityByIndex( entity );
+
+	if ( !ent )
+		return;
+
+	if ( !ent->player || g_PlayerInfoList[entity].name == NULL )
+		return;
+
+	VectorCopy ( ent->origin, origin );
+	VectorCopy ( ent->angles, angles );
+
+	angles[0]*=-M_PI;
+
+	if ( ent->curstate.solid == SOLID_NOT )
+	{
+		angles[ROLL] = 80;	// dead view angle
+		origin[2]+= -8 ; // PM_DEAD_VIEWHEIGHT
+	}
+	else if (ent->curstate.usehull == 1 )
+		origin[2]+= 12; // VEC_DUCK_VIEW;
+	else
+		// exacty eye position can't be caluculated since it depends on
+		// client values like cl_bobcycle, this offset matches the default values
+		origin[2]+= 28; // DEFAULT_VIEWHEIGHT
+}
+
+void V_GetMapFreePosition( float * cl_angles, float * origin, float * angles )
+{
+	vec3_t forward;
+	vec3_t zScaledTarget;
+
+	VectorCopy(cl_angles, angles);
+
+	// modify angles since we don't wanna see map's bottom
+	angles[0] = 51.25f + 38.75f*(angles[0]/90.0f);
+
+	zScaledTarget[0] = gHUD.m_Spectator.m_mapOrigin[0];
+	zScaledTarget[1] = gHUD.m_Spectator.m_mapOrigin[1];
+	zScaledTarget[2] = gHUD.m_Spectator.m_mapOrigin[2] * (( 90.0f - angles[0] ) / 90.0f );
+	
+
+	AngleVectors(angles, forward, NULL, NULL);
+	
+	VectorNormalize(forward);
+	
+	VectorMA(zScaledTarget, -( 4096.0f / gHUD.m_Spectator.m_mapZoom ), forward , origin);
+}
+
+void V_GetMapChasePosition(int target, float * cl_angles, float * origin, float * angles)
+{
+	vec3_t forward;
+	
+	if ( target )
+	{
+		cl_entity_t	 *	ent = gEngfuncs.GetEntityByIndex( target );
+		
+		if ( gHUD.m_Spectator.m_autoDirector->value )
+		{
+			// this is done to get the angles made by director mode
+			V_GetChasePos(target, cl_angles, origin, angles);
+			VectorCopy(ent->origin, origin);
+			
+			// keep fix chase angle horizontal
+			angles[0] = 45.0f;
+		}
+		else
+		{
+			VectorCopy(cl_angles, angles);
+			VectorCopy(ent->origin, origin);
+			
+			// modify angles since we don't wanna see map's bottom
+			angles[0] = 51.25f + 38.75f*(angles[0]/90.0f);
+		}
+	}
+	else
+	{
+		// keep out roaming position, but modify angles
+		VectorCopy(cl_angles, angles);
+		angles[0] = 51.25f + 38.75f*(angles[0]/90.0f);
+	}
+	
+	origin[2] *= (( 90.0f - angles[0] ) / 90.0f );
+	angles[2] = 0.0f;	// don't roll angle (if chased player is dead)
+	
+	AngleVectors(angles, forward, NULL, NULL);
+	
+	VectorNormalize(forward);
+	
+	VectorMA(origin, -1536, forward, origin); 
+}
+
+void V_GetMiniMapOriginAndAngle(float * cl_angles, float * origin, float * angles)
+{
+	// Center map on local player
+	VectorCopy(gEngfuncs.GetLocalPlayer()->curstate.origin, origin);
+	//v_origin.z += 300;
+	
+	//// Set view height above parsed map settings
+	origin[2] = gHUD.m_Spectator.m_OverviewData.origin.z + 100;
+	
+	//if(gHUD.m_Spectator.m_OverviewData.layers > 0)
+	//{
+	//	v_origin.z = gHUD.m_Spectator.m_OverviewData.layersHeights[0];
+	//}
+	//
+	//v_origin.z += 300;
+	
+	//V_GetMapChasePosition(gEngfuncs.GetLocalPlayer()->index, v_cl_angles, v_origin, v_angles );
+	
+	// Set view like top down
+	cl_angles[0] = angles[0] = 90;//kTopDownYaw;
+	cl_angles[1] = angles[1] = 90;//kTopDownPitch;
+	cl_angles[2] = angles[2] = 0;//kTopDownRoll;
+}
+
+int V_FindViewModelByWeaponModel(int weaponindex, int inUser3, int inUser4)
+{
+	int theViewModelIndex = 0;
+
+	static char * modelmap[][2] =	{
+		{ kKNPModel,			kKNVModel },
+		{ kHGPModel,			kHGVModel },
+		{ kMGPModel,			kMGVModel },
+		{ kSGPModel,			kSGVModel },
+		{ kHMGPModel,			kHMGVModel },
+		{ kGGPModel,			kGGVModel },
+		{ kTripminePModel,		kTripmineVModel },
+		{ kWelderPModel,		kWelderVModel },
+		{ NULL, NULL } 
+	};
+
+	static char * hvymodelmap[][2] =	{
+		{ kKNPModel,			kKNHVVModel },
+		{ kHGPModel,			kHGHVVModel },
+		{ kMGPModel,			kMGHVVModel },
+		{ kSGPModel,			kSGHVVModel },
+		{ kHMGPModel,			kHMGHVVModel },
+		{ kGGPModel,			kGGHVVModel },
+		{ kTripminePModel,		kTripmineHVVModel },
+		{ kWelderPModel,		kWelderHVVModel },
+		{ NULL, NULL } 
+	};
+
+	struct model_s * weaponModel = NULL;
+
+	// If we're an alien, get view model that way
+	if((inUser3 == AVH_USER3_ALIEN_PLAYER1) || (inUser3 == AVH_USER3_ALIEN_PLAYER2) || (inUser3 == AVH_USER3_ALIEN_PLAYER3) || (inUser3 == AVH_USER3_ALIEN_PLAYER4) || (inUser3 == AVH_USER3_ALIEN_PLAYER5))
+	{
+		const char* theViewModel = "";
+		switch(inUser3)
+		{
+		case AVH_USER3_ALIEN_PLAYER1:
+			theViewModel = kLevel1ViewModel;
+			break;
+		case AVH_USER3_ALIEN_PLAYER2:
+			theViewModel = kLevel2ViewModel;
+			break;
+		case AVH_USER3_ALIEN_PLAYER3:
+			theViewModel = kLevel3ViewModel;
+			break;
+		case AVH_USER3_ALIEN_PLAYER4:
+			theViewModel = kLevel4ViewModel;
+			break;
+		case AVH_USER3_ALIEN_PLAYER5:
+			theViewModel = kLevel5ViewModel;
+			break;
+		}
+
+		theViewModelIndex = gEngfuncs.pEventAPI->EV_FindModelIndex(theViewModel); 
+	}
+	// else we're holding a weapon
+	else
+	{
+		// Take user3 and user4 into account for heavy armor
+		if(inUser3 == AVH_USER3_MARINE_PLAYER)
+		{
+			weaponModel = IEngineStudio.GetModelByIndex( weaponindex );
+			
+			if ( weaponModel )
+			{
+				//int len = strlen( weaponModel->name );
+				int i = 0;
+
+				if(GetHasUpgrade(inUser4, MASK_UPGRADE_13))
+				{
+					while ( *hvymodelmap[i] != NULL )
+					{
+						const char* theCurrentPWeapon = hvymodelmap[i][0];
+						const char* theCurrentVWeapon = hvymodelmap[i][1];
+
+						if ( !SafeStrcmp( weaponModel->name, theCurrentPWeapon) )
+						{
+							theViewModelIndex = gEngfuncs.pEventAPI->EV_FindModelIndex( theCurrentVWeapon );
+						}
+						i++;
+					}
+				}
+				else
+				{
+					while ( *modelmap[i] != NULL )
+					{
+						const char* theCurrentPWeapon = modelmap[i][0];
+						const char* theCurrentVWeapon = modelmap[i][1];
+
+						if ( !SafeStrcmp( weaponModel->name, theCurrentPWeapon) )
+						{
+							theViewModelIndex = gEngfuncs.pEventAPI->EV_FindModelIndex( theCurrentVWeapon );
+						}
+						i++;
+					}
+				}
+			}
+		}
+	}
+
+	return theViewModelIndex;
+}
+
+/*
+==================
+V_CalcSpectatorRefdef
+
+==================
+*/
+
+static int lastWeaponModelIndex = 0;
+static int lastViewModelIndex = 0;
+
+void V_CalcSpectatorRefdef ( struct ref_params_s * pparams )
+{
+
+	vec3_t					angles;
+	static viewinterp_t		ViewInterp;
+	static float			bob = 0.0f;
+	static vec3_t			velocity ( 0.0f, 0.0f, 0.0f);
+
+	static float lasttime;
+
+	static float lastang[3];
+	static float lastorg[3];
+
+	vec3_t delta;
+	pparams->onlyClientDraw = false;
+
+	// refresh position
+	VectorCopy ( pparams->simorg, v_sim_org );
+
+	// get old values
+	VectorCopy ( pparams->cl_viewangles, v_cl_angles );
+	VectorCopy ( pparams->viewangles, v_angles );
+	VectorCopy ( pparams->vieworg, v_origin );
+    VectorCopy ( pparams->viewheight, v_view_ofs);
+
+	v_frametime = pparams->frametime;
+
+	if ( pparams->nextView == 0 )
+	{
+		// first renderer cycle, full screen
+
+        if (!gHUD.m_Spectator.IsInOverviewMode())
+        {
+            
+            switch ( g_iUser1 )
+		    {
+			    case OBS_CHASE_LOCKED:	V_GetChasePos( g_iUser2, NULL, v_origin, v_angles );
+									    break;
+
+			    case OBS_CHASE_FREE:	V_GetChasePos( g_iUser2, v_cl_angles, v_origin, v_angles );
+									    break;
+
+			    case OBS_ROAMING	:	VectorCopy (v_cl_angles, v_angles);
+									    VectorCopy (v_sim_org, v_origin);
+									    break;
+
+			    case OBS_IN_EYE		:   V_GetInEyePos( g_iUser2, v_origin, v_angles );
+									    break;
+				    
+		    }          
+            
+        }
+        else
+        {
+            pparams->onlyClientDraw = true;
+            V_GetMapFreePosition( v_cl_angles, v_origin, v_angles );        
+        }
+        
+
+        // Removed by mmcguire.
+        /*
+		switch ( g_iUser1 )
+		{
+			case OBS_CHASE_LOCKED:	V_GetChasePos( g_iUser2, NULL, v_origin, v_angles );
+									break;
+
+			case OBS_CHASE_FREE:	V_GetChasePos( g_iUser2, v_cl_angles, v_origin, v_angles );
+									break;
+
+			case OBS_ROAMING	:	VectorCopy (v_cl_angles, v_angles);
+									VectorCopy (v_sim_org, v_origin);
+									break;
+
+			case OBS_IN_EYE		:   V_GetInEyePos( g_iUser2, v_origin, v_angles );
+									break;
+				
+			case OBS_MAP_FREE  :	pparams->onlyClientDraw = true;
+									V_GetMapFreePosition( v_cl_angles, v_origin, v_angles );
+									break;
+
+			case OBS_MAP_CHASE  :	pparams->onlyClientDraw = true;
+									V_GetMapChasePosition( g_iUser2, v_cl_angles, v_origin, v_angles );
+									break;
+		}
+        */
+
+        if (g_iUser1)
+        {
+		
+            // Adjust the viewport so that the letterbox spectator mode
+            // doesn't cut anything off.
+            
+            pparams->viewport[1] += YRES(32);
+		    pparams->viewport[3] -= YRES(32 * 2);
+        
+        }
+
+		if ( gHUD.m_Spectator.IsInOverviewMode())
+        {
+			pparams->nextView = 1;	// force a second renderer view
+        }
+
+		gHUD.m_Spectator.m_iDrawCycle = 0;
+
+	}
+	else
+	{
+		// second renderer cycle, inset window
+
+		// set inset parameters
+		pparams->viewport[0] = XRES(gHUD.m_Spectator.m_OverviewData.insetWindowX) + 1;	// change viewport to inset window
+		pparams->viewport[1] = YRES(gHUD.m_Spectator.m_OverviewData.insetWindowY) + 1;
+		pparams->viewport[2] = XRES(gHUD.m_Spectator.m_OverviewData.insetWindowWidth) - 2;
+		pparams->viewport[3] = YRES(gHUD.m_Spectator.m_OverviewData.insetWindowHeight) - 2;
+		pparams->nextView	 = 0;	// on further view
+		pparams->onlyClientDraw = false;
+
+        if (gHUD.m_Spectator.IsInOverviewMode())
+        {
+            if (g_iUser1 == OBS_IN_EYE)
+            {
+                V_GetInEyePos( g_iUser2, v_origin, v_angles );
+            }
+            else if (g_iUser1 == OBS_CHASE_FREE)
+            {
+                V_GetChasePos( g_iUser2, v_cl_angles, v_origin, v_angles );
+            }
+            else if (g_iUser1 == OBS_CHASE_LOCKED)
+            {
+                V_GetChasePos( g_iUser2, NULL, v_origin, v_angles );
+            }
+            else if (g_iUser1 == OBS_ROAMING)
+            {
+                VectorCopy (v_cl_angles, v_angles);
+                VectorCopy (v_sim_org, v_origin);
+            }
+        }
+
+        // Removed by mmcguire.
+        /*
+		// override some settings in certain modes
+		switch ( (int)gHUD.m_Spectator.m_pip->value )
+		{
+            case INSET_CHASE_FREE : V_GetChasePos( g_iUser2, v_cl_angles, v_origin, v_angles );
+                                    break;
+
+            case INSET_CHASE_LOCKED : V_GetChasePos( g_iUser2, NULL, v_origin, v_angles );
+									break;	
+
+			case INSET_IN_EYE	 :	V_GetInEyePos( g_iUser2, v_origin, v_angles );
+									break;
+
+			case INSET_MAP_FREE  :	pparams->onlyClientDraw = true;
+									V_GetMapFreePosition( v_cl_angles, v_origin, v_angles );
+									break;
+
+			case INSET_MAP_CHASE  :	pparams->onlyClientDraw = true;
+
+									if ( g_iUser1 == OBS_ROAMING )
+										V_GetMapChasePosition( 0, v_cl_angles, v_origin, v_angles );
+									else
+										V_GetMapChasePosition( g_iUser2, v_cl_angles, v_origin, v_angles );
+
+									break;
+		}
+        */
+
+		gHUD.m_Spectator.m_iDrawCycle = 1;
+	}
+
+
+	// do the smoothing only once per frame, not in roaming or map mode
+	if ( (gHUD.m_Spectator.m_iDrawCycle == 0) && (g_iUser1 == OBS_IN_EYE)  )
+	{
+		// smooth angles
+
+		VectorSubtract( v_angles, lastang, delta );
+		if ( Length( delta ) != 0.0f )
+		{
+			VectorCopy( v_angles, ViewInterp.Angles[ ViewInterp.CurrentAngle & ORIGIN_MASK ] );
+			ViewInterp.AngleTime[ ViewInterp.CurrentAngle & ORIGIN_MASK ] = pparams->time;
+			ViewInterp.CurrentAngle++;
+			VectorCopy( v_angles, lastang );
+		}
+
+		if ( cl_vsmoothing && cl_vsmoothing->value )
+		{
+			int foundidx;
+			int i;
+			float t;
+
+			t = pparams->time - cl_vsmoothing->value;
+
+			for ( i = 1; i < ORIGIN_MASK; i++ )
+			{
+				foundidx = ViewInterp.CurrentAngle - 1 - i;
+				if ( ViewInterp.AngleTime[ foundidx & ORIGIN_MASK ] <= t )
+					break;
+			}
+			
+			if ( i < ORIGIN_MASK && ViewInterp.AngleTime[ foundidx & ORIGIN_MASK ] != 0.0 )
+			{
+				// Interpolate
+				double dt;
+				float  da;
+				vec3_t	v1,v2;
+
+				AngleVectors( ViewInterp.Angles[ foundidx & ORIGIN_MASK ], v1, NULL, NULL );
+				AngleVectors( ViewInterp.Angles[ (foundidx + 1) & ORIGIN_MASK ], v2, NULL, NULL );
+				da = AngleBetweenVectors( v1, v2 );
+
+				dt = ViewInterp.AngleTime[ (foundidx + 1) & ORIGIN_MASK ] - ViewInterp.AngleTime[ foundidx & ORIGIN_MASK ];
+					
+				if ( dt > 0.0 && ( da < 22.5f) )
+				{
+					double frac;
+
+					frac = ( t - ViewInterp.AngleTime[ foundidx & ORIGIN_MASK] ) / dt;
+					frac = min( 1.0, frac );
+
+					// interpolate angles
+					InterpolateAngles( ViewInterp.Angles[ foundidx & ORIGIN_MASK ], ViewInterp.Angles[ (foundidx + 1) & ORIGIN_MASK ], v_angles, frac );
+				}
+			}
+		} 
+
+  		// smooth origin
+		
+		VectorSubtract( v_origin, lastorg, delta );
+
+		if ( Length( delta ) != 0.0 )
+		{
+			VectorCopy( v_origin, ViewInterp.Origins[ ViewInterp.CurrentOrigin & ORIGIN_MASK ] );
+			ViewInterp.OriginTime[ ViewInterp.CurrentOrigin & ORIGIN_MASK ] = pparams->time;
+			ViewInterp.CurrentOrigin++;
+
+			VectorCopy( v_origin, lastorg );
+		}
+
+		// don't smooth in roaming (already smoothd), 
+		if ( cl_vsmoothing && cl_vsmoothing->value  )
+		{
+			int foundidx;
+			int i;
+			float t;
+
+			t = pparams->time - cl_vsmoothing->value;
+
+			for ( i = 1; i < ORIGIN_MASK; i++ )
+			{
+				foundidx = ViewInterp.CurrentOrigin - 1 - i;
+				if ( ViewInterp.OriginTime[ foundidx & ORIGIN_MASK ] <= t )
+					break;
+			}
+
+			if ( i < ORIGIN_MASK &&  ViewInterp.OriginTime[ foundidx & ORIGIN_MASK ] != 0.0 )
+			{
+				// Interpolate
+				vec3_t delta;
+				double frac;
+				double dt;
+				vec3_t neworg;
+
+				dt = ViewInterp.OriginTime[ (foundidx + 1) & ORIGIN_MASK ] - ViewInterp.OriginTime[ foundidx & ORIGIN_MASK ];
+				if ( dt > 0.0 )
+				{
+					frac = ( t - ViewInterp.OriginTime[ foundidx & ORIGIN_MASK] ) / dt;
+					frac = min( 1.0, frac );
+					VectorSubtract( ViewInterp.Origins[ ( foundidx + 1 ) & ORIGIN_MASK ], ViewInterp.Origins[ foundidx & ORIGIN_MASK ], delta );
+					VectorMA( ViewInterp.Origins[ foundidx & ORIGIN_MASK ], frac, delta, neworg );
+
+					// Dont interpolate large changes
+					if ( Length( delta ) < 64 )
+					{
+						VectorCopy( neworg, v_origin );
+					}
+				}
+			}
+		}
+	}	
+
+	// Hack in weapon model:
+	cl_entity_t* ent = gEngfuncs.GetEntityByIndex(g_iUser2);
+	cl_entity_t* gunModel = gEngfuncs.GetViewModel();
+	if ( (g_iUser1 == OBS_IN_EYE) && ent && g_iUser2 )
+	{
+		// get position for weapon model
+		VectorCopy( v_origin, gunModel->origin);
+		VectorCopy( v_angles, gunModel->angles);
+
+		// add idle tremble
+		gunModel->angles[PITCH]*=-1;
+		
+		// calculate player velocity
+		float timeDiff = ent->curstate.msg_time - ent->prevstate.msg_time;
+
+		if ( timeDiff > 0 )
+		{
+			vec3_t distance;
+			VectorSubtract(ent->prevstate.origin, ent->curstate.origin, distance);
+			VectorScale(distance, 1/timeDiff, distance );
+
+			velocity[0] = velocity[0]*0.66f + distance[0]*0.33f;
+			velocity[1] = velocity[1]*0.66f + distance[1]*0.33f;
+			velocity[2] = velocity[2]*0.66f + distance[2]*0.33f;
+			
+			VectorCopy(velocity, pparams->simvel);
+			pparams->onground = 1;
+
+			bob = V_CalcBob( pparams );
+		}
+
+		vec3_t forward;
+		AngleVectors(v_angles, forward, NULL, NULL );
+
+		for ( int i = 0; i < 3; i++ )
+		{
+			gunModel->origin[ i ] += bob * 0.4 * forward[ i ];
+		}
+		
+		// throw in a little tilt.
+		gunModel->angles[YAW]   -= bob * 0.5;
+		gunModel->angles[ROLL]  -= bob * 1;
+		gunModel->angles[PITCH] -= bob * 0.3;
+
+		VectorCopy( gunModel->angles, gunModel->curstate.angles );
+		VectorCopy( gunModel->angles, gunModel->latched.prevangles );
+
+		lastWeaponModelIndex = ent->curstate.weaponmodel;
+		int theCurrentViewModel = V_FindViewModelByWeaponModel( lastWeaponModelIndex, ent->curstate.iuser3, ent->curstate.iuser4);
+
+		//if ( lastWeaponModelIndex != ent->curstate.weaponmodel )
+		if ( lastViewModelIndex != theCurrentViewModel )
+		{
+			// weapon model changed
+			lastViewModelIndex = theCurrentViewModel;
+			if ( lastViewModelIndex )
+			{
+				gEngfuncs.pfnWeaponAnim(0,0);	// reset weapon animation
+			}
+			else
+			{
+				// model not found
+				gunModel->model = NULL;	// disable weaopn model
+				lastWeaponModelIndex = lastViewModelIndex = 0;
+			}
+		}
+
+		if ( lastViewModelIndex )
+		{
+			gunModel->model = IEngineStudio.GetModelByIndex( lastViewModelIndex );
+			gunModel->curstate.modelindex = lastViewModelIndex;
+			gunModel->curstate.frame = 0;
+			gunModel->curstate.colormap = 0; 
+			gunModel->index = g_iUser2;
+		}
+		else
+		{
+			gunModel->model = NULL;	// disable weaopn model
+		}
+	}
+	else
+	{
+		gunModel->model = NULL;	// disable weaopn model
+		lastWeaponModelIndex = lastViewModelIndex = 0;
+	}
+
+	lasttime = pparams->time; 
+
+	// write back new values into pparams
+
+	VectorCopy ( v_angles, pparams->viewangles )
+	VectorCopy ( v_origin, pparams->vieworg );
+
+}
+
+void CL_DLLEXPORT V_CalcRefdef( struct ref_params_s *pparams )
+{
+	RecClCalcRefdef(pparams);
+	
+    if (!pparams->hardware)
+    {
+        // Don't show anything in software mode.
+        pparams->onlyClientDraw = true;
+        pparams->viewport[0] = 0;
+        pparams->viewport[1] = 0;
+        pparams->viewport[2] = 0;
+        pparams->viewport[3] = 0;
+    }
+    else
+    {
+
+        // intermission / finale rendering
+	    if ( pparams->intermission )
+	    {	
+		    V_CalcIntermissionRefdef ( pparams );	
+	    }
+	    else if ( pparams->spectator || g_iUser1) // g_iUser1 true if in spectator mode
+	    {
+		    V_CalcSpectatorRefdef ( pparams );	
+	    }
+	    else if ( !pparams->paused )
+	    {
+		    if(gHUD.GetInTopDownMode())
+		    {
+			    V_CalcTopDownRefdef ( pparams );
+		    }
+		    else
+		    {
+			    V_CalcNormalRefdef ( pparams );
+		    }
+	    }
+    
+    }
+
+    gHUD.SetViewport(pparams->viewport);
+
+//// Example of how to overlay the whole screen with red at 50 % alpha
+//#define SF_TEST
+//#if defined SF_TEST
+//	{
+//		screenfade_t sf;
+//		gEngfuncs.pfnGetScreenFade( &sf );
+//
+//		sf.fader = 0;
+//		sf.fadeg = 255;
+//		sf.fadeb = 0;
+//		sf.fadealpha = 60;
+//		sf.fadeFlags = FFADE_STAYOUT | FFADE_OUT;
+//
+//		gEngfuncs.pfnSetScreenFade( &sf );
+//	}
+//#endif
+}
+
+/*
+=============
+V_DropPunchAngle
+
+=============
+*/
+void V_DropPunchAngle ( float frametime, float *ev_punchangle )
+{
+	float	len;
+	
+	len = VectorNormalize ( ev_punchangle );
+	len -= (10.0 + len * 0.5) * frametime;
+	len = max( len, 0.0 );
+	VectorScale ( ev_punchangle, len, ev_punchangle );
+}
+
+/*
+=============
+V_PunchAxis
+
+Client side punch effect
+=============
+*/
+void V_PunchAxis( int axis, float punch )
+{
+	ev_punchangle[ axis ] = punch;
+}
+
+/*
+=============
+V_Init
+=============
+*/
+void V_Init (void)
+{
+	gEngfuncs.pfnAddCommand ("centerview", V_StartPitchDrift );
+
+	scr_ofsx			= gEngfuncs.pfnRegisterVariable( "scr_ofsx","0", 0 );
+	scr_ofsy			= gEngfuncs.pfnRegisterVariable( "scr_ofsy","0", 0 );
+	scr_ofsz			= gEngfuncs.pfnRegisterVariable( "scr_ofsz","0", 0 );
+
+	v_centermove		= gEngfuncs.pfnRegisterVariable( "v_centermove", "0.15", 0 );
+	v_centerspeed		= gEngfuncs.pfnRegisterVariable( "v_centerspeed","500", 0 );
+
+	cl_bobcycle			= gEngfuncs.pfnRegisterVariable( "cl_bobcycle","0.8", 0 );// best default for my experimental gun wag (sjb)
+	cl_bob				= gEngfuncs.pfnRegisterVariable( "cl_bob","0.01", 0 );// best default for my experimental gun wag (sjb)
+	cl_bobup			= gEngfuncs.pfnRegisterVariable( "cl_bobup","0.5", 0 );
+	cl_waterdist		= gEngfuncs.pfnRegisterVariable( "cl_waterdist","4", 0 );
+	cl_hudcam			= gEngfuncs.pfnRegisterVariable( "cl_hudcam", "1", 0 );
+	cl_chasedist		= gEngfuncs.pfnRegisterVariable( "cl_chasedist", "200", 0 );
+}
+
+
+//#define TRACE_TEST
+#if defined( TRACE_TEST )
+
+extern float in_fov;
+/*
+====================
+CalcFov
+====================
+*/
+float CalcFov (float fov_x, float width, float height)
+{
+	float	a;
+	float	x;
+
+	if (fov_x < 1 || fov_x > 179)
+		fov_x = 90;	// error, set to 90
+
+	x = width/tan(fov_x/360*M_PI);
+
+	a = atan (height/x);
+
+	a = a*360/M_PI;
+
+	return a;
+}
+
+int hitent = -1;
+
+void V_Move( int mx, int my )
+{
+	float fov;
+	float fx, fy;
+	float dx, dy;
+	float c_x, c_y;
+	float dX, dY;
+	vec3_t forward, up, right;
+	vec3_t newangles;
+
+	vec3_t farpoint;
+	pmtrace_t tr;
+
+	fov = CalcFov( in_fov, (float)ScreenWidth, (float)ScreenHeight );
+
+	c_x = (float)ScreenWidth / 2.0;
+	c_y = (float)ScreenHeight / 2.0;
+
+	dx = (float)mx - c_x;
+	dy = (float)my - c_y;
+
+	// Proportion we moved in each direction
+	fx = dx / c_x;
+	fy = dy / c_y;
+
+	dX = fx * in_fov / 2.0 ;
+	dY = fy * fov / 2.0;
+
+	newangles = v_angles;
+
+	newangles[ YAW ] -= dX;
+	newangles[ PITCH ] += dY;
+
+	// Now rotate v_forward around that point
+	AngleVectors ( newangles, forward, right, up );
+
+	farpoint = v_origin + 8192 * forward;
+
+	// Trace
+	tr = *(gEngfuncs.PM_TraceLine( (float *)&v_origin, (float *)&farpoint, PM_TRACELINE_PHYSENTSONLY, 2 /*point sized hull*/, -1 ));
+
+	if ( tr.fraction != 1.0 && tr.ent != 0 )
+	{
+		hitent = PM_GetPhysEntInfo( tr.ent );
+		PM_ParticleLine( (float *)&v_origin, (float *)&tr.endpos, 5, 1.0, 0.0 );
+	}
+	else
+	{
+		hitent = -1;
+	}
+}
+
+#endif
+
+
+
+
+///*
+//==================
+//V_CalcTopDownRefdef
+//
+//==================
+//*/
+//void V_CalcTopDownRefdef ( struct ref_params_s *pparams )
+//{
+//	cl_entity_t		*ent, *view;
+//	int				i;
+//	vec3_t			angles;
+//	static viewinterp_t		ViewInterp;
+//
+//	static float oldz = 0;
+//	static float lasttime;
+//
+//	static float lastang[3];
+//	vec3_t angdelta;
+//
+//	vec3_t camAngles, camForward, camRight, camUp;
+//	//cl_entity_t *pwater;
+//
+//	// don't allow cheats in multiplayer
+//	if ( pparams->maxclients > 1 )
+//	{
+//		scr_ofsx->value = 0.0;
+//		scr_ofsy->value = 0.0;
+//		scr_ofsz->value = 0.0;
+//	}
+//
+//
+//	V_DriftPitch ( pparams );
+//
+//	// ent is the player model ( visible when out of body )
+//	ent = gEngfuncs.GetLocalPlayer();
+//	
+//	// view is the weapon model (only visible from inside body )
+//	view = gEngfuncs.GetViewModel();
+//
+//	// Observer angle capturing and smoothing
+//	if ( iHasNewViewOrigin )
+//	{
+//		// Get the angles from the physics code
+//		VectorCopy( gTopDownViewOrigin, pparams->vieworg );
+//		VectorCopy( gTopDownViewOrigin, pparams->simorg );
+//	}
+//
+//	// Override position to commander position
+//	pparams->vieworg[2] = gTopDownHeight;
+//	pparams->simorg[2] = gTopDownHeight;
+//
+//	// Override view height when in top down
+//	pparams->viewheight[2] = 0.0f;
+//	
+//	// refresh position
+//	VectorCopy ( pparams->simorg, pparams->vieworg );
+//	VectorAdd( pparams->vieworg, pparams->viewheight, pparams->vieworg );
+//
+//	// Observer angle capturing and smoothing
+//	if ( iHasNewViewAngles )
+//	{
+//		// Get the angles from the physics code
+//		VectorCopy( gTopDownViewAngles, pparams->cl_viewangles );
+//	}
+//
+//	VectorSubtract( pparams->cl_viewangles, lastang, angdelta );
+//	if ( Length( angdelta ) != 0.0 )
+//	{
+//		VectorCopy( pparams->cl_viewangles, ViewInterp.Angles[ ViewInterp.CurrentAngle & ORIGIN_MASK ] );
+//		ViewInterp.AngleTime[ ViewInterp.CurrentAngle & ORIGIN_MASK ] = pparams->time;
+//		ViewInterp.CurrentAngle++;
+//
+//		VectorCopy( pparams->cl_viewangles, lastang );
+//	}
+//
+//	if ( cl_vsmoothing && cl_vsmoothing->value && ( iIsSpectator & SPEC_SMOOTH_ANGLES ) )
+//	{
+//		int foundidx;
+//		int i;
+//		float t;
+//
+//		if ( cl_vsmoothing->value < 0.0 )
+//		{
+//			gEngfuncs.Cvar_SetValue( "cl_vsmoothing", 0.0 );
+//		}
+//
+//		t = pparams->time - cl_vsmoothing->value;
+//
+//		for ( i = 1; i < ORIGIN_MASK; i++ )
+//		{
+//			foundidx = ViewInterp.CurrentAngle - 1 - i;
+//			if ( ViewInterp.AngleTime[ foundidx & ORIGIN_MASK ] <= t )
+//				break;
+//		}
+//
+//		if ( i < ORIGIN_MASK && ViewInterp.AngleTime[ foundidx & ORIGIN_MASK ] != 0.0 )
+//		{
+//			// Interpolate
+//			double dt;
+//
+//			dt = ViewInterp.AngleTime[ (foundidx + 1) & ORIGIN_MASK ] - ViewInterp.AngleTime[ foundidx & ORIGIN_MASK ];
+//			if ( dt > 0.0 )
+//			{
+//				double frac;
+//
+//				frac = ( t - ViewInterp.AngleTime[ foundidx & ORIGIN_MASK] ) / dt;
+//				frac = min( 1.0, frac );
+//
+//				// interpolate angles
+//				InterpolateAngles( ViewInterp.Angles[ foundidx & ORIGIN_MASK ], ViewInterp.Angles[ (foundidx + 1) & ORIGIN_MASK ], pparams->cl_viewangles, frac );
+//
+//				VectorCopy( pparams->cl_viewangles, gTopDownViewAngles );
+//			}
+//		}
+//	}
+//
+//
+//	VectorCopy ( pparams->cl_viewangles, pparams->viewangles );
+//
+//	gEngfuncs.V_CalcShake();
+//	gEngfuncs.V_ApplyShake( pparams->vieworg, pparams->viewangles, 1.0 );
+//
+////	// never let view origin sit exactly on a node line, because a water plane can
+////	// dissapear when viewed with the eye exactly on it.
+////	// FIXME, we send origin at 1/128 now, change this?
+////	// the server protocol only specifies to 1/16 pixel, so add 1/32 in each axis
+////	
+////	pparams->vieworg[0] += 1.0/32;
+////	pparams->vieworg[1] += 1.0/32;
+////	pparams->vieworg[2] += 1.0/32;
+//
+//	// Check for problems around water, move the viewer artificially if necessary 
+//	// -- this prevents drawing errors in GL due to waves
+//
+////	if ( pparams->waterlevel >= 2 )
+////	{
+////		int		waterDist, waterEntity;
+////		vec3_t	point;
+////		waterDist = cl_waterdist->value;
+////
+////		if ( pparams->hardware )
+////		{
+////			waterEntity = gEngfuncs.PM_WaterEntity( pparams->simorg );
+////			if ( waterEntity >= 0 && waterEntity < pparams->max_entities )
+////			{
+////				pwater = gEngfuncs.GetEntityByIndex( waterEntity );
+////				if ( pwater && ( pwater->model != NULL ) )
+////				{
+////					waterDist += ( pwater->curstate.scale * 16 );	// Add in wave height
+////				}
+////			}
+////		}
+////		else
+////		{
+////			waterEntity = 0;	// Don't need this in software
+////		}
+////		
+////		VectorCopy( pparams->vieworg, point );
+////	}
+//
+//	V_CalcViewRoll ( pparams );
+//	
+//	//V_AddIdle ( pparams );
+//
+//	// offsets
+//	VectorCopy( pparams->cl_viewangles, angles );
+//
+//	AngleVectors ( angles, pparams->forward, pparams->right, pparams->up );
+//
+//	for ( i=0 ; i<3 ; i++ )
+//	{
+//		pparams->vieworg[i] += scr_ofsx->value*pparams->forward[i] + scr_ofsy->value*pparams->right[i] + scr_ofsz->value*pparams->up[i];
+//	}
+//	
+//	// Treating cam_ofs[2] as the distance
+////	if( CL_IsThirdPerson() )
+////	{
+////		vec3_t ofs;
+////
+////		ofs[0] = ofs[1] = ofs[2] = 0.0;
+////
+////		CL_CameraOffset( (float *)&ofs );
+////
+////		VectorCopy( ofs, camAngles );
+////		camAngles[ ROLL ]	= 0;
+////
+////		AngleVectors( camAngles, camForward, camRight, camUp );
+////
+////		for ( i = 0; i < 3; i++ )
+////		{
+////			pparams->vieworg[ i ] += -ofs[2] * camForward[ i ];
+////		}
+////	}
+//	
+//	// Give gun our viewangles
+////	VectorCopy ( pparams->cl_viewangles, view->angles );
+//	
+//	// set up gun position
+////	V_CalcGunAngle ( pparams );
+//
+//	// Use predicted origin as view origin.
+//	VectorCopy ( pparams->simorg, view->origin );      
+//	VectorAdd( view->origin, pparams->viewheight, view->origin );
+//
+//	// Let the viewmodel shake at about 10% of the amplitude
+////	gEngfuncs.V_ApplyShake( view->origin, view->angles, 0.9 );
+//
+//	// smooth out stair step ups
+//#if 1
+//	if ( !pparams->smoothing && pparams->onground && pparams->simorg[2] - oldz > 0)
+//	{
+//		float steptime;
+//		
+//		steptime = pparams->time - lasttime;
+//		if (steptime < 0)
+//	//FIXME		I_Error ("steptime < 0");
+//			steptime = 0;
+//
+//		oldz += steptime * 150;
+//		if (oldz > pparams->simorg[2])
+//			oldz = pparams->simorg[2];
+//		if (pparams->simorg[2] - oldz > 18)
+//			oldz = pparams->simorg[2]- 18;
+//		pparams->vieworg[2] += oldz - pparams->simorg[2];
+//		view->origin[2] += oldz - pparams->simorg[2];
+//	}
+//	else
+//	{
+//		oldz = pparams->simorg[2];
+//	}
+//#endif
+//
+//	{
+//		static float lastorg[3];
+//		vec3_t delta;
+//
+//		VectorSubtract( pparams->simorg, lastorg, delta );
+//
+//		if ( Length( delta ) != 0.0 )
+//		{
+//			VectorCopy( pparams->simorg, ViewInterp.Origins[ ViewInterp.CurrentOrigin & ORIGIN_MASK ] );
+//			ViewInterp.OriginTime[ ViewInterp.CurrentOrigin & ORIGIN_MASK ] = pparams->time;
+//			ViewInterp.CurrentOrigin++;
+//
+//			VectorCopy( pparams->simorg, lastorg );
+//		}
+//	}
+//
+//	// Smooth out whole view in multiplayer when on trains, lifts
+//	if ( cl_vsmoothing && cl_vsmoothing->value &&
+//		( ( iIsSpectator & SPEC_SMOOTH_ORIGIN ) || (pparams->smoothing && ( pparams->maxclients > 1 ) ) ) )
+//	{
+//		int foundidx;
+//		int i;
+//		float t;
+//
+//		if ( cl_vsmoothing->value < 0.0 )
+//		{
+//			gEngfuncs.Cvar_SetValue( "cl_vsmoothing", 0.0 );
+//		}
+//
+//		t = pparams->time - cl_vsmoothing->value;
+//
+//		for ( i = 1; i < ORIGIN_MASK; i++ )
+//		{
+//			foundidx = ViewInterp.CurrentOrigin - 1 - i;
+//			if ( ViewInterp.OriginTime[ foundidx & ORIGIN_MASK ] <= t )
+//				break;
+//		}
+//
+//		if ( i < ORIGIN_MASK &&  ViewInterp.OriginTime[ foundidx & ORIGIN_MASK ] != 0.0 )
+//		{
+//			// Interpolate
+//			vec3_t delta;
+//			double frac;
+//			double dt;
+//			vec3_t neworg;
+//
+//			dt = ViewInterp.OriginTime[ (foundidx + 1) & ORIGIN_MASK ] - ViewInterp.OriginTime[ foundidx & ORIGIN_MASK ];
+//			if ( dt > 0.0 )
+//			{
+//				frac = ( t - ViewInterp.OriginTime[ foundidx & ORIGIN_MASK] ) / dt;
+//				frac = min( 1.0, frac );
+//				VectorSubtract( ViewInterp.Origins[ ( foundidx + 1 ) & ORIGIN_MASK ], ViewInterp.Origins[ foundidx & ORIGIN_MASK ], delta );
+//				VectorMA( ViewInterp.Origins[ foundidx & ORIGIN_MASK ], frac, delta, neworg );
+//
+//				// Dont interpolate large changes
+//				if ( Length( delta ) < 64 )
+//				{
+//					VectorSubtract( neworg, pparams->simorg, delta );
+//
+//					VectorAdd( pparams->simorg, delta, pparams->simorg );
+//					VectorAdd( pparams->vieworg, delta, pparams->vieworg );
+//					VectorAdd( view->origin, delta, view->origin );
+//
+//					VectorCopy( pparams->simorg, gTopDownViewOrigin );
+//				}
+//			}
+//		}
+//	}
+//
+//	// Store off v_angles before munging for third person
+//	v_angles = pparams->viewangles;
+//
+//	// override all previous settings if the viewent isn't the client
+//	if ( pparams->viewentity > pparams->maxclients )
+//	{
+//		cl_entity_t *viewentity;
+//		viewentity = gEngfuncs.GetEntityByIndex( pparams->viewentity );
+//		if ( viewentity )
+//		{
+//			VectorCopy( viewentity->origin, pparams->vieworg );
+//			VectorCopy( viewentity->angles, pparams->viewangles );
+//
+//			// Store off overridden viewangles
+//			v_angles = pparams->viewangles;
+//		}
+//	}
+//
+//	lasttime = pparams->time;
+//
+//	v_origin = pparams->vieworg;
+//}
+
diff --git a/main/source/cl_dll/view.h b/main/source/cl_dll/view.h
new file mode 100644
index 00000000..83d6566e
--- /dev/null
+++ b/main/source/cl_dll/view.h
@@ -0,0 +1,8 @@
+#if !defined ( VIEWH )
+#define VIEWH 
+#pragma once
+
+void V_StartPitchDrift( void );
+void V_StopPitchDrift( void );
+
+#endif // !VIEWH
\ No newline at end of file
diff --git a/main/source/cl_dll/wrect.h b/main/source/cl_dll/wrect.h
new file mode 100644
index 00000000..1346fabf
--- /dev/null
+++ b/main/source/cl_dll/wrect.h
@@ -0,0 +1,9 @@
+#if !defined( WRECTH )
+#define WRECTH
+
+typedef struct rect_s
+{
+	int				left, right, top, bottom;
+} wrect_t;
+
+#endif
\ No newline at end of file
diff --git a/main/source/common/beamdef.h b/main/source/common/beamdef.h
new file mode 100644
index 00000000..48ac07b7
--- /dev/null
+++ b/main/source/common/beamdef.h
@@ -0,0 +1,62 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined ( BEAMDEFH )
+#define BEAMDEFH
+#ifdef _WIN32
+#pragma once
+#endif
+
+#define FBEAM_STARTENTITY		0x00000001
+#define FBEAM_ENDENTITY			0x00000002
+#define FBEAM_FADEIN			0x00000004
+#define FBEAM_FADEOUT			0x00000008
+#define FBEAM_SINENOISE			0x00000010
+#define FBEAM_SOLID				0x00000020
+#define FBEAM_SHADEIN			0x00000040
+#define FBEAM_SHADEOUT			0x00000080
+#define FBEAM_STARTVISIBLE		0x10000000		// Has this client actually seen this beam's start entity yet?
+#define FBEAM_ENDVISIBLE		0x20000000		// Has this client actually seen this beam's end entity yet?
+#define FBEAM_ISACTIVE			0x40000000
+#define FBEAM_FOREVER			0x80000000
+
+typedef struct beam_s BEAM;
+struct beam_s
+{
+	BEAM		*next;
+	int			type;
+	int			flags;
+	vec3_t		source;
+	vec3_t		target;
+	vec3_t		delta;
+	float		t;		// 0 .. 1 over lifetime of beam
+	float		freq;
+	float		die;
+	float		width;
+	float		amplitude;
+	float		r, g, b;
+	float		brightness;
+	float		speed;
+	float		frameRate;
+	float		frame;
+	int			segments;
+	int			startEntity;
+	int			endEntity;
+	int			modelIndex;
+	int			frameCount;
+	struct model_s		*pFollowModel;
+	struct particle_s	*particles;
+};
+
+#endif
diff --git a/main/source/common/bullettypes.h b/main/source/common/bullettypes.h
new file mode 100644
index 00000000..1b615690
--- /dev/null
+++ b/main/source/common/bullettypes.h
@@ -0,0 +1,19 @@
+#ifndef BULLET_TYPES_H
+#define BULLET_TYPES_H
+
+// bullet types
+typedef	enum
+{
+	BULLET_NONE = 0,
+	BULLET_PLAYER_9MM, // glock
+	BULLET_PLAYER_MP5, // mp5
+	BULLET_PLAYER_357, // python
+	BULLET_PLAYER_BUCKSHOT, // shotgun
+	BULLET_PLAYER_CROWBAR, // crowbar swipe
+
+	BULLET_MONSTER_9MM,
+	BULLET_MONSTER_MP5,
+	BULLET_MONSTER_12MM,
+} Bullet;
+
+#endif
\ No newline at end of file
diff --git a/main/source/common/cl_entity.h b/main/source/common/cl_entity.h
new file mode 100644
index 00000000..902c0679
--- /dev/null
+++ b/main/source/common/cl_entity.h
@@ -0,0 +1,115 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+// cl_entity.h
+#if !defined( CL_ENTITYH )
+#define CL_ENTITYH
+#ifdef _WIN32
+#pragma once
+#endif
+
+typedef struct efrag_s
+{
+	struct mleaf_s		*leaf;
+	struct efrag_s		*leafnext;
+	struct cl_entity_s	*entity;
+	struct efrag_s		*entnext;
+} efrag_t;
+
+typedef struct
+{
+	byte					mouthopen;		// 0 = mouth closed, 255 = mouth agape
+	byte					sndcount;		// counter for running average
+	int						sndavg;			// running average
+} mouth_t;
+
+typedef struct
+{
+	float					prevanimtime;  
+	float					sequencetime;
+	byte					prevseqblending[2];
+	vec3_t					prevorigin;
+	vec3_t					prevangles;
+
+	int						prevsequence;
+	float					prevframe;
+
+	byte					prevcontroller[4];
+	byte					prevblending[2];
+} latchedvars_t;
+
+typedef struct
+{
+	// Time stamp for this movement
+	float					animtime;
+
+	vec3_t					origin;
+	vec3_t					angles;
+} position_history_t;
+
+typedef struct cl_entity_s cl_entity_t;
+
+#define HISTORY_MAX		64  // Must be power of 2
+#define HISTORY_MASK	( HISTORY_MAX - 1 )
+
+
+#if !defined( ENTITY_STATEH )
+#include "entity_state.h"
+#endif
+
+#if !defined( PROGS_H )
+#include "progs.h"
+#endif
+
+struct cl_entity_s
+{
+	int						index;      // Index into cl_entities ( should match actual slot, but not necessarily )
+
+	qboolean				player;     // True if this entity is a "player"
+	
+	entity_state_t			baseline;   // The original state from which to delta during an uncompressed message
+	entity_state_t			prevstate;  // The state information from the penultimate message received from the server
+	entity_state_t			curstate;   // The state information from the last message received from server
+
+	int						current_position;  // Last received history update index
+	position_history_t		ph[ HISTORY_MAX ];   // History of position and angle updates for this player
+
+	mouth_t					mouth;			// For synchronizing mouth movements.
+
+	latchedvars_t			latched;		// Variables used by studio model rendering routines
+
+	// Information based on interplocation, extrapolation, prediction, or just copied from last msg received.
+	//
+	float					lastmove;
+
+	// Actual render position and angles
+	vec3_t					origin;
+	vec3_t					angles;
+
+	// Attachment points
+	vec3_t					attachment[4];
+
+	// Other entity local information
+	int						trivial_accept;
+
+	struct model_s			*model;			// cl.model_precache[ curstate.modelindes ];  all visible entities have a model
+	struct efrag_s			*efrag;			// linked list of efrags
+	struct mnode_s			*topnode;		// for bmodels, first world node that splits bmodel, or NULL if not split
+
+	float					syncbase;		// for client-side animations -- used by obsolete alias animation system, remove?
+	int						visframe;		// last frame this entity was found in an active leaf
+	colorVec				cvFloorColor;
+};
+
+#endif // !CL_ENTITYH
diff --git a/main/source/common/com_model.h b/main/source/common/com_model.h
new file mode 100644
index 00000000..78c2147a
--- /dev/null
+++ b/main/source/common/com_model.h
@@ -0,0 +1,344 @@
+// com_model.h
+#if !defined( COM_MODEL_H )
+#define COM_MODEL_H
+#if defined( _WIN32 )
+#pragma once
+#endif
+
+#define STUDIO_RENDER 1
+#define STUDIO_EVENTS 2
+
+#define MAX_CLIENTS			32
+#define	MAX_EDICTS			900
+
+#define MAX_MODEL_NAME		64
+#define MAX_MAP_HULLS		4
+#define	MIPLEVELS			4
+#define	NUM_AMBIENTS		4		// automatic ambient sounds
+#define	MAXLIGHTMAPS		4
+#define	PLANE_ANYZ			5
+
+#define ALIAS_Z_CLIP_PLANE	5
+
+// flags in finalvert_t.flags
+#define ALIAS_LEFT_CLIP				0x0001
+#define ALIAS_TOP_CLIP				0x0002
+#define ALIAS_RIGHT_CLIP			0x0004
+#define ALIAS_BOTTOM_CLIP			0x0008
+#define ALIAS_Z_CLIP				0x0010
+#define ALIAS_ONSEAM				0x0020
+#define ALIAS_XY_CLIP_MASK			0x000F
+
+#define	ZISCALE	((float)0x8000)
+
+#define CACHE_SIZE	32		// used to align key data structures
+
+typedef enum
+{
+	mod_brush, 
+	mod_sprite, 
+	mod_alias, 
+	mod_studio
+} modtype_t;
+
+// must match definition in modelgen.h
+#ifndef SYNCTYPE_T
+#define SYNCTYPE_T
+
+typedef enum
+{
+	ST_SYNC=0,
+	ST_RAND
+} synctype_t;
+
+#endif
+
+typedef struct
+{
+	float		mins[3], maxs[3];
+	float		origin[3];
+	int			headnode[MAX_MAP_HULLS];
+	int			visleafs;		// not including the solid leaf 0
+	int			firstface, numfaces;
+} dmodel_t;
+
+// plane_t structure
+typedef struct mplane_s
+{
+	vec3_t	normal;			// surface normal
+	float	dist;			// closest appoach to origin
+	byte	type;			// for texture axis selection and fast side tests
+	byte	signbits;		// signx + signy<<1 + signz<<1
+	byte	pad[2];
+} mplane_t;
+
+typedef struct
+{
+	vec3_t		position;
+} mvertex_t;
+
+typedef struct
+{
+	unsigned short	v[2];
+	unsigned int	cachededgeoffset;
+} medge_t;
+
+typedef struct texture_s
+{
+	char		name[16];
+	unsigned	width, height;
+	int			anim_total;				// total tenths in sequence ( 0 = no)
+	int			anim_min, anim_max;		// time for this frame min <=time< max
+	struct texture_s *anim_next;		// in the animation sequence
+	struct texture_s *alternate_anims;	// bmodels in frame 1 use these
+	unsigned	offsets[MIPLEVELS];		// four mip maps stored
+	unsigned	paloffset;
+} texture_t;
+
+typedef struct
+{
+	float		vecs[2][4];		// [s/t] unit vectors in world space. 
+								// [i][3] is the s/t offset relative to the origin.
+								// s or t = dot(3Dpoint,vecs[i])+vecs[i][3]
+	float		mipadjust;		// ?? mipmap limits for very small surfaces
+	texture_t	*texture;
+	int			flags;			// sky or slime, no lightmap or 256 subdivision
+} mtexinfo_t;
+
+typedef struct mnode_s
+{
+// common with leaf
+	int			contents;		// 0, to differentiate from leafs
+	int			visframe;		// node needs to be traversed if current
+	
+	short		minmaxs[6];		// for bounding box culling
+
+	struct mnode_s	*parent;
+
+// node specific
+	mplane_t	*plane;
+	struct mnode_s	*children[2];	
+
+	unsigned short		firstsurface;
+	unsigned short		numsurfaces;
+} mnode_t;
+
+typedef struct msurface_s	msurface_t;
+typedef struct decal_s		decal_t;
+
+// JAY: Compress this as much as possible
+struct decal_s
+{
+	decal_t		*pnext;			// linked list for each surface
+	msurface_t	*psurface;		// Surface id for persistence / unlinking
+	short		dx;				// Offsets into surface texture (in texture coordinates, so we don't need floats)
+	short		dy;
+	short		texture;		// Decal texture
+	byte		scale;			// Pixel scale
+	byte		flags;			// Decal flags
+
+	short		entityIndex;	// Entity this is attached to
+};
+
+typedef struct mleaf_s
+{
+// common with node
+	int			contents;		// wil be a negative contents number
+	int			visframe;		// node needs to be traversed if current
+
+	short		minmaxs[6];		// for bounding box culling
+
+	struct mnode_s	*parent;
+
+// leaf specific
+	byte		*compressed_vis;
+	struct efrag_s	*efrags;
+
+	msurface_t	**firstmarksurface;
+	int			nummarksurfaces;
+	int			key;			// BSP sequence number for leaf's contents
+	byte		ambient_sound_level[NUM_AMBIENTS];
+} mleaf_t;
+
+struct msurface_s
+{
+	int			visframe;		// should be drawn when node is crossed
+
+	int			dlightframe;	// last frame the surface was checked by an animated light
+	int			dlightbits;		// dynamically generated. Indicates if the surface illumination 
+								// is modified by an animated light.
+
+	mplane_t	*plane;			// pointer to shared plane			
+	int			flags;			// see SURF_ #defines
+
+	int			firstedge;	// look up in model->surfedges[], negative numbers
+	int			numedges;	// are backwards edges
+	
+// surface generation data
+	struct surfcache_s	*cachespots[MIPLEVELS];
+
+	short		texturemins[2]; // smallest s/t position on the surface.
+	short		extents[2];		// ?? s/t texture size, 1..256 for all non-sky surfaces
+
+	mtexinfo_t	*texinfo;		
+	
+// lighting info
+	byte		styles[MAXLIGHTMAPS]; // index into d_lightstylevalue[] for animated lights 
+									  // no one surface can be effected by more than 4 
+									  // animated lights.
+	color24		*samples;
+	
+	decal_t		*pdecals;
+};
+
+typedef struct
+{
+	int			planenum;
+	short		children[2];	// negative numbers are contents
+} dclipnode_t;
+
+typedef struct hull_s
+{
+	dclipnode_t	*clipnodes;
+	mplane_t	*planes;
+	int			firstclipnode;
+	int			lastclipnode;
+	vec3_t		clip_mins;
+	vec3_t		clip_maxs;
+} hull_t;
+
+#if !defined( CACHE_USER ) && !defined( QUAKEDEF_H )
+#define CACHE_USER
+typedef struct cache_user_s
+{
+	void	*data;
+} cache_user_t;
+#endif
+
+typedef struct model_s
+{
+	char		name[ MAX_MODEL_NAME ];
+	qboolean	needload;		// bmodels and sprites don't cache normally
+
+	modtype_t	type;
+	int			numframes;
+	synctype_t	synctype;
+	
+	int			flags;
+
+//
+// volume occupied by the model
+//		
+	vec3_t		mins, maxs;
+	float		radius;
+
+//
+// brush model
+//
+	int			firstmodelsurface, nummodelsurfaces;
+
+	int			numsubmodels;
+	dmodel_t	*submodels;
+
+	int			numplanes;
+	mplane_t	*planes;
+
+	int			numleafs;		// number of visible leafs, not counting 0
+	struct mleaf_s		*leafs;
+
+	int			numvertexes;
+	mvertex_t	*vertexes;
+
+	int			numedges;
+	medge_t		*edges;
+
+	int			numnodes;
+	mnode_t		*nodes;
+
+	int			numtexinfo;
+	mtexinfo_t	*texinfo;
+
+	int			numsurfaces;
+	msurface_t	*surfaces;
+
+	int			numsurfedges;
+	int			*surfedges;
+
+	int			numclipnodes;
+	dclipnode_t	*clipnodes;
+
+	int			nummarksurfaces;
+	msurface_t	**marksurfaces;
+
+	hull_t		hulls[MAX_MAP_HULLS];
+
+	int			numtextures;
+	texture_t	**textures;
+
+	byte		*visdata;
+
+	color24		*lightdata;
+
+	char		*entities;
+
+//
+// additional model data
+//
+	cache_user_t	cache;		// only access through Mod_Extradata
+
+} model_t;
+
+typedef vec_t vec4_t[4];
+
+typedef struct alight_s
+{
+	int			ambientlight;	// clip at 128
+	int			shadelight;		// clip at 192 - ambientlight
+	vec3_t		color;
+	float		*plightvec;
+} alight_t;
+
+typedef struct auxvert_s
+{
+	float	fv[3];		// viewspace x, y
+} auxvert_t;
+
+#include "custom.h"
+
+#define	MAX_INFO_STRING			256
+#define	MAX_SCOREBOARDNAME		32
+typedef struct player_info_s
+{
+	// User id on server
+	int		userid;
+
+	// User info string
+	char	userinfo[ MAX_INFO_STRING ];
+
+	// Name
+	char	name[ MAX_SCOREBOARDNAME ];
+
+	// Spectator or not, unused
+	int		spectator;
+
+	int		ping;
+	int		packet_loss;
+
+	// skin information
+	char	model[MAX_QPATH];
+	int		topcolor;
+	int		bottomcolor;
+
+	// last frame rendered
+	int		renderframe;	
+
+	// Gait frame estimation
+	int		gaitsequence;
+	float	gaitframe;
+	float	gaityaw;
+	vec3_t	prevgaitorigin;
+
+	customization_t customdata;
+} player_info_t;
+
+#endif // #define COM_MODEL_H
diff --git a/main/source/common/con_nprint.h b/main/source/common/con_nprint.h
new file mode 100644
index 00000000..5128d87f
--- /dev/null
+++ b/main/source/common/con_nprint.h
@@ -0,0 +1,31 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined( CON_NPRINTH )
+#define CON_NPRINTH
+#ifdef _WIN32
+#pragma once
+#endif
+
+typedef struct con_nprint_s
+{
+	int		index;			// Row #
+	float	time_to_live;	// # of seconds before it dissappears
+	float	color[ 3 ];		// RGB colors ( 0.0 -> 1.0 scale )
+} con_nprint_t;
+
+void Con_NPrintf( int idx, char *fmt, ... );
+void Con_NXPrintf( struct con_nprint_s *info, char *fmt, ... );
+
+#endif
diff --git a/main/source/common/const.h b/main/source/common/const.h
new file mode 100644
index 00000000..4df5d74f
--- /dev/null
+++ b/main/source/common/const.h
@@ -0,0 +1,744 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef CONST_H
+#define CONST_H
+//
+// Constants shared by the engine and dlls
+// This header file included by engine files and DLL files.
+// Most came from server.h
+
+// edict->flags
+#define	FL_FLY					(1<<0)	// Changes the SV_Movestep() behavior to not need to be on ground
+#define	FL_SWIM					(1<<1)	// Changes the SV_Movestep() behavior to not need to be on ground (but stay in water)
+#define	FL_CONVEYOR				(1<<2)
+#define	FL_CLIENT				(1<<3)
+#define	FL_INWATER				(1<<4)
+#define	FL_MONSTER				(1<<5)
+#define	FL_GODMODE				(1<<6)
+#define	FL_NOTARGET				(1<<7)
+#define	FL_SKIPLOCALHOST		(1<<8)	// Don't send entity to local host, it's predicting this entity itself
+#define	FL_ONGROUND				(1<<9)	// At rest / on the ground
+#define	FL_PARTIALGROUND		(1<<10)	// not all corners are valid
+#define	FL_WATERJUMP			(1<<11)	// player jumping out of water
+#define FL_FROZEN				(1<<12) // Player is frozen for 3rd person camera
+#define FL_FAKECLIENT			(1<<13)	// JAC: fake client, simulated server side; don't send network messages to them
+#define FL_DUCKING				(1<<14)	// Player flag -- Player is fully crouched
+#define FL_FLOAT				(1<<15)	// Apply floating force to this entity when in water
+#define FL_GRAPHED				(1<<16) // worldgraph has this ent listed as something that blocks a connection
+
+// UNDONE: Do we need these?
+#define FL_IMMUNE_WATER			(1<<17)
+#define	FL_IMMUNE_SLIME			(1<<18)
+#define FL_IMMUNE_LAVA			(1<<19)
+
+#define FL_PROXY				(1<<20)	// This is a spectator proxy
+#define FL_ALWAYSTHINK			(1<<21)	// Brush model flag -- call think every frame regardless of nextthink - ltime (for constantly changing velocity/path)
+#define FL_BASEVELOCITY			(1<<22)	// Base velocity has been applied this frame (used to convert base velocity into momentum)
+#define FL_MONSTERCLIP			(1<<23)	// Only collide in with monsters who have FL_MONSTERCLIP set
+#define FL_ONTRAIN				(1<<24) // Player is _controlling_ a train, so movement commands should be ignored on client during prediction.
+#define FL_WORLDBRUSH			(1<<25)	// Not moveable/removeable brush entity (really part of the world, but represented as an entity for transparency or something)
+#define FL_SPECTATOR            (1<<26) // This client is a spectator, don't run touch functions, etc.
+#define FL_CUSTOMENTITY			(1<<29)	// This is a custom entity
+#define FL_KILLME				(1<<30)	// This entity is marked for death -- This allows the engine to kill ents at the appropriate time
+#define FL_DORMANT				(1<<31)	// Entity is dormant, no updates to client
+
+
+// Goes into globalvars_t.trace_flags
+#define FTRACE_SIMPLEBOX		(1<<0)	// Traceline with a simple box
+
+
+// walkmove modes
+#define	WALKMOVE_NORMAL		0 // normal walkmove
+#define WALKMOVE_WORLDONLY	1 // doesn't hit ANY entities, no matter what the solid type
+#define WALKMOVE_CHECKONLY	2 // move, but don't touch triggers
+
+// edict->movetype values
+#define	MOVETYPE_NONE			0		// never moves
+//#define	MOVETYPE_ANGLENOCLIP	1
+//#define	MOVETYPE_ANGLECLIP		2
+#define	MOVETYPE_WALK			3		// Player only - moving on the ground
+#define	MOVETYPE_STEP			4		// gravity, special edge handling -- monsters use this
+#define	MOVETYPE_FLY			5		// No gravity, but still collides with stuff
+#define	MOVETYPE_TOSS			6		// gravity/collisions
+#define	MOVETYPE_PUSH			7		// no clip to world, push and crush
+#define	MOVETYPE_NOCLIP			8		// No gravity, no collisions, still do velocity/avelocity
+#define	MOVETYPE_FLYMISSILE		9		// extra size to monsters
+#define	MOVETYPE_BOUNCE			10		// Just like Toss, but reflect velocity when contacting surfaces
+#define MOVETYPE_BOUNCEMISSILE	11		// bounce w/o gravity
+#define MOVETYPE_FOLLOW			12		// track movement of aiment
+#define	MOVETYPE_PUSHSTEP		13		// BSP model that needs physics/world collisions (uses nearest hull for world collision)
+
+// edict->solid values
+// NOTE: Some movetypes will cause collisions independent of SOLID_NOT/SOLID_TRIGGER when the entity moves
+// SOLID only effects OTHER entities colliding with this one when they move - UGH!
+#define	SOLID_NOT				0		// no interaction with other objects
+#define	SOLID_TRIGGER			1		// touch on edge, but not blocking
+#define	SOLID_BBOX				2		// touch on edge, block
+#define	SOLID_SLIDEBOX			3		// touch on edge, but not an onground
+#define	SOLID_BSP				4		// bsp clip, touch on edge, block
+
+// edict->deadflag values
+#define	DEAD_NO					0 // alive
+#define	DEAD_DYING				1 // playing death animation or still falling off of a ledge waiting to hit ground
+#define	DEAD_DEAD				2 // dead. lying still.
+#define DEAD_RESPAWNABLE		3
+#define DEAD_DISCARDBODY		4
+
+#define	DAMAGE_NO				0
+#define	DAMAGE_YES				1
+#define	DAMAGE_AIM				2
+
+// entity effects
+#define	EF_BRIGHTFIELD			1	// swirling cloud of particles
+#define	EF_MUZZLEFLASH 			2	// single frame ELIGHT on entity attachment 0
+#define	EF_BRIGHTLIGHT 			4	// DLIGHT centered at entity origin
+#define	EF_DIMLIGHT 			8	// player flashlight
+#define EF_INVLIGHT				16	// get lighting from ceiling
+#define EF_NOINTERP				32	// don't interpolate the next frame
+#define EF_LIGHT				64	// rocket flare glow sprite
+#define EF_NODRAW				128	// don't draw entity
+
+// entity flags
+#define EFLAG_SLERP				1	// do studio interpolation of this entity
+		
+//
+// temp entity events
+//
+#define	TE_BEAMPOINTS		0		// beam effect between two points
+// coord coord coord (start position) 
+// coord coord coord (end position) 
+// short (sprite index) 
+// byte (starting frame) 
+// byte (frame rate in 0.1's) 
+// byte (life in 0.1's) 
+// byte (line width in 0.1's) 
+// byte (noise amplitude in 0.01's) 
+// byte,byte,byte (color)
+// byte (brightness)
+// byte (scroll speed in 0.1's)
+
+#define	TE_BEAMENTPOINT		1		// beam effect between point and entity
+// short (start entity) 
+// coord coord coord (end position) 
+// short (sprite index) 
+// byte (starting frame) 
+// byte (frame rate in 0.1's) 
+// byte (life in 0.1's) 
+// byte (line width in 0.1's) 
+// byte (noise amplitude in 0.01's) 
+// byte,byte,byte (color)
+// byte (brightness)
+// byte (scroll speed in 0.1's)
+
+#define	TE_GUNSHOT			2		// particle effect plus ricochet sound
+// coord coord coord (position) 
+
+#define	TE_EXPLOSION		3		// additive sprite, 2 dynamic lights, flickering particles, explosion sound, move vertically 8 pps
+// coord coord coord (position) 
+// short (sprite index)
+// byte (scale in 0.1's)
+// byte (framerate)
+// byte (flags)
+//
+// The Explosion effect has some flags to control performance/aesthetic features:
+#define TE_EXPLFLAG_NONE		0	// all flags clear makes default Half-Life explosion
+#define TE_EXPLFLAG_NOADDITIVE	1	// sprite will be drawn opaque (ensure that the sprite you send is a non-additive sprite)
+#define TE_EXPLFLAG_NODLIGHTS	2	// do not render dynamic lights
+#define TE_EXPLFLAG_NOSOUND		4	// do not play client explosion sound
+#define TE_EXPLFLAG_NOPARTICLES	8	// do not draw particles
+
+
+#define	TE_TAREXPLOSION		4		// Quake1 "tarbaby" explosion with sound
+// coord coord coord (position) 
+
+#define	TE_SMOKE			5		// alphablend sprite, move vertically 30 pps
+// coord coord coord (position) 
+// short (sprite index)
+// byte (scale in 0.1's)
+// byte (framerate)
+
+#define	TE_TRACER			6		// tracer effect from point to point
+// coord, coord, coord (start) 
+// coord, coord, coord (end)
+
+#define	TE_LIGHTNING		7		// TE_BEAMPOINTS with simplified parameters
+// coord, coord, coord (start) 
+// coord, coord, coord (end) 
+// byte (life in 0.1's) 
+// byte (width in 0.1's) 
+// byte (amplitude in 0.01's)
+// short (sprite model index)
+
+#define	TE_BEAMENTS			8		
+// short (start entity) 
+// short (end entity) 
+// short (sprite index) 
+// byte (starting frame) 
+// byte (frame rate in 0.1's) 
+// byte (life in 0.1's) 
+// byte (line width in 0.1's) 
+// byte (noise amplitude in 0.01's) 
+// byte,byte,byte (color)
+// byte (brightness)
+// byte (scroll speed in 0.1's)
+
+#define	TE_SPARKS			9		// 8 random tracers with gravity, ricochet sprite
+// coord coord coord (position) 
+
+#define	TE_LAVASPLASH		10		// Quake1 lava splash
+// coord coord coord (position) 
+
+#define	TE_TELEPORT			11		// Quake1 teleport splash
+// coord coord coord (position) 
+
+#define TE_EXPLOSION2		12		// Quake1 colormaped (base palette) particle explosion with sound
+// coord coord coord (position) 
+// byte (starting color)
+// byte (num colors)
+
+#define TE_BSPDECAL			13		// Decal from the .BSP file 
+// coord, coord, coord (x,y,z), decal position (center of texture in world)
+// short (texture index of precached decal texture name)
+// short (entity index)
+// [optional - only included if previous short is non-zero (not the world)] short (index of model of above entity)
+
+#define TE_IMPLOSION		14		// tracers moving toward a point
+// coord, coord, coord (position)
+// byte (radius)
+// byte (count)
+// byte (life in 0.1's) 
+
+#define TE_SPRITETRAIL		15		// line of moving glow sprites with gravity, fadeout, and collisions
+// coord, coord, coord (start) 
+// coord, coord, coord (end) 
+// short (sprite index)
+// byte (count)
+// byte (life in 0.1's) 
+// byte (scale in 0.1's) 
+// byte (velocity along vector in 10's)
+// byte (randomness of velocity in 10's)
+
+#define TE_BEAM				16		// obsolete
+
+#define TE_SPRITE			17		// additive sprite, plays 1 cycle
+// coord, coord, coord (position) 
+// short (sprite index) 
+// byte (scale in 0.1's) 
+// byte (brightness)
+
+#define TE_BEAMSPRITE		18		// A beam with a sprite at the end
+// coord, coord, coord (start position) 
+// coord, coord, coord (end position) 
+// short (beam sprite index) 
+// short (end sprite index) 
+
+#define TE_BEAMTORUS		19		// screen aligned beam ring, expands to max radius over lifetime
+// coord coord coord (center position) 
+// coord coord coord (axis and radius) 
+// short (sprite index) 
+// byte (starting frame) 
+// byte (frame rate in 0.1's) 
+// byte (life in 0.1's) 
+// byte (line width in 0.1's) 
+// byte (noise amplitude in 0.01's) 
+// byte,byte,byte (color)
+// byte (brightness)
+// byte (scroll speed in 0.1's)
+
+#define TE_BEAMDISK			20		// disk that expands to max radius over lifetime
+// coord coord coord (center position) 
+// coord coord coord (axis and radius) 
+// short (sprite index) 
+// byte (starting frame) 
+// byte (frame rate in 0.1's) 
+// byte (life in 0.1's) 
+// byte (line width in 0.1's) 
+// byte (noise amplitude in 0.01's) 
+// byte,byte,byte (color)
+// byte (brightness)
+// byte (scroll speed in 0.1's)
+
+#define TE_BEAMCYLINDER		21		// cylinder that expands to max radius over lifetime
+// coord coord coord (center position) 
+// coord coord coord (axis and radius) 
+// short (sprite index) 
+// byte (starting frame) 
+// byte (frame rate in 0.1's) 
+// byte (life in 0.1's) 
+// byte (line width in 0.1's) 
+// byte (noise amplitude in 0.01's) 
+// byte,byte,byte (color)
+// byte (brightness)
+// byte (scroll speed in 0.1's)
+
+#define TE_BEAMFOLLOW		22		// create a line of decaying beam segments until entity stops moving
+// short (entity:attachment to follow)
+// short (sprite index)
+// byte (life in 0.1's) 
+// byte (line width in 0.1's) 
+// byte,byte,byte (color)
+// byte (brightness)
+
+#define TE_GLOWSPRITE		23		
+// coord, coord, coord (pos) short (model index) byte (scale / 10)
+
+#define TE_BEAMRING			24		// connect a beam ring to two entities
+// short (start entity) 
+// short (end entity) 
+// short (sprite index) 
+// byte (starting frame) 
+// byte (frame rate in 0.1's) 
+// byte (life in 0.1's) 
+// byte (line width in 0.1's) 
+// byte (noise amplitude in 0.01's) 
+// byte,byte,byte (color)
+// byte (brightness)
+// byte (scroll speed in 0.1's)
+
+#define TE_STREAK_SPLASH	25		// oriented shower of tracers
+// coord coord coord (start position) 
+// coord coord coord (direction vector) 
+// byte (color)
+// short (count)
+// short (base speed)
+// short (ramdon velocity)
+
+#define TE_BEAMHOSE			26		// obsolete
+
+#define TE_DLIGHT			27		// dynamic light, effect world, minor entity effect
+// coord, coord, coord (pos) 
+// byte (radius in 10's) 
+// byte byte byte (color)
+// byte (brightness)
+// byte (life in 10's)
+// byte (decay rate in 10's)
+
+#define TE_ELIGHT			28		// point entity light, no world effect
+// short (entity:attachment to follow)
+// coord coord coord (initial position) 
+// coord (radius)
+// byte byte byte (color)
+// byte (life in 0.1's)
+// coord (decay rate)
+
+#define TE_TEXTMESSAGE		29
+// short 1.2.13 x (-1 = center)
+// short 1.2.13 y (-1 = center)
+// byte Effect 0 = fade in/fade out
+			// 1 is flickery credits
+			// 2 is write out (training room)
+
+// 4 bytes r,g,b,a color1	(text color)
+// 4 bytes r,g,b,a color2	(effect color)
+// ushort 8.8 fadein time
+// ushort 8.8  fadeout time
+// ushort 8.8 hold time
+// optional ushort 8.8 fxtime	(time the highlight lags behing the leading text in effect 2)
+// string text message		(512 chars max sz string)
+#define TE_LINE				30
+// coord, coord, coord		startpos
+// coord, coord, coord		endpos
+// short life in 0.1 s
+// 3 bytes r, g, b
+
+#define TE_BOX				31
+// coord, coord, coord		boxmins
+// coord, coord, coord		boxmaxs
+// short life in 0.1 s
+// 3 bytes r, g, b
+
+#define TE_KILLBEAM			99		// kill all beams attached to entity
+// short (entity)
+
+#define TE_LARGEFUNNEL		100
+// coord coord coord (funnel position)
+// short (sprite index) 
+// short (flags) 
+
+#define	TE_BLOODSTREAM		101		// particle spray
+// coord coord coord (start position)
+// coord coord coord (spray vector)
+// byte (color)
+// byte (speed)
+
+#define	TE_SHOWLINE			102		// line of particles every 5 units, dies in 30 seconds
+// coord coord coord (start position)
+// coord coord coord (end position)
+
+#define TE_BLOOD			103		// particle spray
+// coord coord coord (start position)
+// coord coord coord (spray vector)
+// byte (color)
+// byte (speed)
+
+#define TE_DECAL			104		// Decal applied to a brush entity (not the world)
+// coord, coord, coord (x,y,z), decal position (center of texture in world)
+// byte (texture index of precached decal texture name)
+// short (entity index)
+
+#define TE_FIZZ				105		// create alpha sprites inside of entity, float upwards
+// short (entity)
+// short (sprite index)
+// byte (density)
+
+#define TE_MODEL			106		// create a moving model that bounces and makes a sound when it hits
+// coord, coord, coord (position) 
+// coord, coord, coord (velocity)
+// angle (initial yaw)
+// short (model index)
+// byte (bounce sound type)
+// byte (life in 0.1's)
+
+#define TE_EXPLODEMODEL		107		// spherical shower of models, picks from set
+// coord, coord, coord (origin)
+// coord (velocity)
+// short (model index)
+// short (count)
+// byte (life in 0.1's)
+
+#define TE_BREAKMODEL		108		// box of models or sprites
+// coord, coord, coord (position)
+// coord, coord, coord (size)
+// coord, coord, coord (velocity)
+// byte (random velocity in 10's)
+// short (sprite or model index)
+// byte (count)
+// byte (life in 0.1 secs)
+// byte (flags)
+
+#define TE_GUNSHOTDECAL		109		// decal and ricochet sound
+// coord, coord, coord (position)
+// short (entity index???)
+// byte (decal???)
+
+#define TE_SPRITE_SPRAY		110		// spay of alpha sprites
+// coord, coord, coord (position)
+// coord, coord, coord (velocity)
+// short (sprite index)
+// byte (count)
+// byte (speed)
+// byte (noise)
+
+#define TE_ARMOR_RICOCHET	111		// quick spark sprite, client ricochet sound. 
+// coord, coord, coord (position)
+// byte (scale in 0.1's)
+
+#define TE_PLAYERDECAL		112		// ???
+// byte (playerindex)
+// coord, coord, coord (position)
+// short (entity???)
+// byte (decal number???)
+// [optional] short (model index???)
+
+#define TE_BUBBLES			113		// create alpha sprites inside of box, float upwards
+// coord, coord, coord (min start position)
+// coord, coord, coord (max start position)
+// coord (float height)
+// short (model index)
+// byte (count)
+// coord (speed)
+
+#define TE_BUBBLETRAIL		114		// create alpha sprites along a line, float upwards
+// coord, coord, coord (min start position)
+// coord, coord, coord (max start position)
+// coord (float height)
+// short (model index)
+// byte (count)
+// coord (speed)
+
+#define TE_BLOODSPRITE		115		// spray of opaque sprite1's that fall, single sprite2 for 1..2 secs (this is a high-priority tent)
+// coord, coord, coord (position)
+// short (sprite1 index)
+// short (sprite2 index)
+// byte (color)
+// byte (scale)
+
+#define TE_WORLDDECAL		116		// Decal applied to the world brush
+// coord, coord, coord (x,y,z), decal position (center of texture in world)
+// byte (texture index of precached decal texture name)
+
+#define TE_WORLDDECALHIGH	117		// Decal (with texture index > 256) applied to world brush
+// coord, coord, coord (x,y,z), decal position (center of texture in world)
+// byte (texture index of precached decal texture name - 256)
+
+#define TE_DECALHIGH		118		// Same as TE_DECAL, but the texture index was greater than 256
+// coord, coord, coord (x,y,z), decal position (center of texture in world)
+// byte (texture index of precached decal texture name - 256)
+// short (entity index)
+
+#define TE_PROJECTILE		119		// Makes a projectile (like a nail) (this is a high-priority tent)
+// coord, coord, coord (position)
+// coord, coord, coord (velocity)
+// short (modelindex)
+// byte (life)
+// byte (owner)  projectile won't collide with owner (if owner == 0, projectile will hit any client).
+
+#define TE_SPRAY			120		// Throws a shower of sprites or models
+// coord, coord, coord (position)
+// coord, coord, coord (direction)
+// short (modelindex)
+// byte (count)
+// byte (speed)
+// byte (noise)
+// byte (rendermode)
+
+#define TE_PLAYERSPRITES	121		// sprites emit from a player's bounding box (ONLY use for players!)
+// byte (playernum)
+// short (sprite modelindex)
+// byte (count)
+// byte (variance) (0 = no variance in size) (10 = 10% variance in size)
+
+#define TE_PARTICLEBURST	122		// very similar to lavasplash.
+// coord (origin)
+// short (radius)
+// byte (particle color)
+// byte (duration * 10) (will be randomized a bit)
+
+#define TE_FIREFIELD			123		// makes a field of fire.
+// coord (origin)
+// short (radius) (fire is made in a square around origin. -radius, -radius to radius, radius)
+// short (modelindex)
+// byte (count)
+// byte (flags)
+// byte (duration (in seconds) * 10) (will be randomized a bit)
+//
+// to keep network traffic low, this message has associated flags that fit into a byte:
+#define TEFIRE_FLAG_ALLFLOAT	1 // all sprites will drift upwards as they animate
+#define TEFIRE_FLAG_SOMEFLOAT	2 // some of the sprites will drift upwards. (50% chance)
+#define TEFIRE_FLAG_LOOP		4 // if set, sprite plays at 15 fps, otherwise plays at whatever rate stretches the animation over the sprite's duration.
+#define TEFIRE_FLAG_ALPHA		8 // if set, sprite is rendered alpha blended at 50% else, opaque
+#define TEFIRE_FLAG_PLANAR		16 // if set, all fire sprites have same initial Z instead of randomly filling a cube. 
+
+#define TE_PLAYERATTACHMENT			124 // attaches a TENT to a player (this is a high-priority tent)
+// byte (entity index of player)
+// coord (vertical offset) ( attachment origin.z = player origin.z + vertical offset )
+// short (model index)
+// short (life * 10 );
+
+#define TE_KILLPLAYERATTACHMENTS	125 // will expire all TENTS attached to a player.
+// byte (entity index of player)
+
+#define TE_MULTIGUNSHOT				126 // much more compact shotgun message
+// This message is used to make a client approximate a 'spray' of gunfire.
+// Any weapon that fires more than one bullet per frame and fires in a bit of a spread is
+// a good candidate for MULTIGUNSHOT use. (shotguns)
+//
+// NOTE: This effect makes the client do traces for each bullet, these client traces ignore
+//		 entities that have studio models.Traces are 4096 long.
+//
+// coord (origin)
+// coord (origin)
+// coord (origin)
+// coord (direction)
+// coord (direction)
+// coord (direction)
+// coord (x noise * 100)
+// coord (y noise * 100)
+// byte (count)
+// byte (bullethole decal texture index)
+
+#define TE_USERTRACER				127 // larger message than the standard tracer, but allows some customization.
+// coord (origin)
+// coord (origin)
+// coord (origin)
+// coord (velocity)
+// coord (velocity)
+// coord (velocity)
+// byte ( life * 10 )
+// byte ( color ) this is an index into an array of color vectors in the engine. (0 - )
+// byte ( length * 10 )
+
+
+
+#define	MSG_BROADCAST		0		// unreliable to all
+#define	MSG_ONE				1		// reliable to one (msg_entity)
+#define	MSG_ALL				2		// reliable to all
+#define	MSG_INIT			3		// write to the init string
+#define MSG_PVS				4		// Ents in PVS of org
+#define MSG_PAS				5		// Ents in PAS of org
+#define MSG_PVS_R			6		// Reliable to PVS
+#define MSG_PAS_R			7		// Reliable to PAS
+#define MSG_ONE_UNRELIABLE	8		// Send to one client, but don't put in reliable stream, put in unreliable datagram ( could be dropped )
+#define	MSG_SPEC			9		// Sends to all spectator proxies
+
+// contents of a spot in the world
+#define	CONTENTS_EMPTY		-1
+#define	CONTENTS_SOLID		-2
+#define	CONTENTS_WATER		-3
+#define	CONTENTS_SLIME		-4
+#define	CONTENTS_LAVA		-5
+#define	CONTENTS_SKY		-6
+/* These additional contents constants are defined in bspfile.h
+#define	CONTENTS_ORIGIN		-7		// removed at csg time
+#define	CONTENTS_CLIP		-8		// changed to contents_solid
+#define	CONTENTS_CURRENT_0		-9
+#define	CONTENTS_CURRENT_90		-10
+#define	CONTENTS_CURRENT_180	-11
+#define	CONTENTS_CURRENT_270	-12
+#define	CONTENTS_CURRENT_UP		-13
+#define	CONTENTS_CURRENT_DOWN	-14
+
+#define CONTENTS_TRANSLUCENT	-15
+*/
+#define	CONTENTS_LADDER		-16
+
+// Used when trying to make bsp optimizations
+//#define	CONTENTS_PORTAL		-17
+
+#define	CONTENT_FLYFIELD			-17
+#define	CONTENT_GRAVITY_FLYFIELD	-18
+#define	CONTENT_FOG					-19
+
+#define CONTENT_EMPTY	-1
+#define CONTENT_SOLID	-2
+#define	CONTENT_WATER	-3
+#define CONTENT_SLIME	-4
+#define CONTENT_LAVA	-5
+#define CONTENT_SKY		-6
+
+// channels
+#define CHAN_AUTO			0
+#define CHAN_WEAPON			1
+#define	CHAN_VOICE			2
+#define CHAN_ITEM			3
+#define	CHAN_BODY			4
+#define CHAN_STREAM			5			// allocate stream channel from the static or dynamic area
+#define CHAN_STATIC			6			// allocate channel from the static area 
+#define CHAN_NETWORKVOICE_BASE	7		// voice data coming across the network
+#define CHAN_NETWORKVOICE_END	500		// network voice data reserves slots (CHAN_NETWORKVOICE_BASE through CHAN_NETWORKVOICE_END).
+
+// attenuation values
+#define ATTN_NONE		0
+#define	ATTN_NORM		(float)0.8
+#define ATTN_IDLE		(float)2
+#define ATTN_STATIC		(float)1.25 
+
+// pitch values
+#define	PITCH_NORM		100			// non-pitch shifted
+#define PITCH_LOW		95			// other values are possible - 0-255, where 255 is very high
+#define PITCH_HIGH		120
+
+// volume values
+#define VOL_NORM		1.0
+
+// plats
+#define	PLAT_LOW_TRIGGER	1
+
+// Trains
+#define	SF_TRAIN_WAIT_RETRIGGER	1
+#define SF_TRAIN_START_ON		4		// Train is initially moving
+#define SF_TRAIN_PASSABLE		8		// Train is not solid -- used to make water trains
+
+// buttons
+#ifndef IN_BUTTONS_H
+#include "in_buttons.h"
+#endif
+
+// Break Model Defines
+
+#define BREAK_TYPEMASK	0x4F
+#define BREAK_GLASS		0x01
+#define BREAK_METAL		0x02
+#define BREAK_FLESH		0x04
+#define BREAK_WOOD		0x08
+
+#define BREAK_SMOKE		0x10
+#define BREAK_TRANS		0x20
+#define BREAK_CONCRETE	0x40
+#define BREAK_2			0x80
+
+// Colliding temp entity sounds
+
+#define BOUNCE_GLASS	BREAK_GLASS
+#define	BOUNCE_METAL	BREAK_METAL
+#define BOUNCE_FLESH	BREAK_FLESH
+#define BOUNCE_WOOD		BREAK_WOOD
+#define BOUNCE_SHRAP	0x10
+#define BOUNCE_SHELL	0x20
+#define	BOUNCE_CONCRETE BREAK_CONCRETE
+#define BOUNCE_SHOTSHELL 0x80
+
+// Temp entity bounce sound types
+#define TE_BOUNCE_NULL		0
+#define TE_BOUNCE_SHELL		1
+#define TE_BOUNCE_SHOTSHELL	2
+
+#include "common/renderingconst.h"
+
+typedef int	func_t;
+typedef int	string_t;
+
+typedef unsigned char 		byte;
+typedef unsigned short 		word;
+#define _DEF_BYTE_
+
+#undef true
+#undef false
+
+#ifndef __cplusplus
+typedef enum {false, true}	qboolean;
+#else 
+typedef int qboolean;
+#endif
+
+typedef struct
+{
+	byte r, g, b;
+} color24;
+
+typedef struct
+{
+	unsigned r, g, b, a;
+} colorVec;
+
+#ifdef _WIN32
+#pragma pack(push,2)
+#endif
+
+typedef struct
+{
+	unsigned short r, g, b, a;
+} PackedColorVec;
+
+#ifdef _WIN32
+#pragma pack(pop)
+#endif
+typedef struct link_s
+{
+	struct link_s	*prev, *next;
+} link_t;
+
+typedef struct edict_s edict_t;
+
+typedef struct
+{
+	vec3_t	normal;
+	float	dist;
+} plane_t;
+
+typedef struct
+{
+	qboolean	allsolid;	// if true, plane is not valid
+	qboolean	startsolid;	// if true, the initial point was in a solid area
+	qboolean	inopen, inwater;
+	float	fraction;		// time completed, 1.0 = didn't hit anything
+	vec3_t	endpos;			// final position
+	plane_t	plane;			// surface normal at impact
+	edict_t	*ent;			// entity the surface is on
+	int		hitgroup;		// 0 == generic, non zero is specific body part
+} trace_t;
+
+#endif
+
diff --git a/main/source/common/crc.h b/main/source/common/crc.h
new file mode 100644
index 00000000..f2f69abe
--- /dev/null
+++ b/main/source/common/crc.h
@@ -0,0 +1,52 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/* crc.h */
+#ifndef CRC_H
+#define CRC_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+// MD5 Hash
+typedef struct
+{
+	unsigned int buf[4];
+    unsigned int bits[2];
+    unsigned char in[64];
+} MD5Context_t;
+
+
+typedef unsigned long CRC32_t;
+void CRC32_Init(CRC32_t *pulCRC);
+CRC32_t CRC32_Final(CRC32_t pulCRC);
+void CRC32_ProcessBuffer(CRC32_t *pulCRC, void *p, int len);
+void CRC32_ProcessByte(CRC32_t *pulCRC, unsigned char ch);
+int CRC_File(CRC32_t *crcvalue, char *pszFileName);
+
+unsigned char COM_BlockSequenceCRCByte (unsigned char *base, int length, int sequence);
+
+void MD5Init(MD5Context_t *context);
+void MD5Update(MD5Context_t *context, unsigned char const *buf,
+               unsigned int len);
+void MD5Final(unsigned char digest[16], MD5Context_t *context);
+void Transform(unsigned int buf[4], unsigned int const in[16]);
+
+int MD5_Hash_File(unsigned char digest[16], char *pszFileName, int bUsefopen, int bSeed, unsigned int seed[4]);
+char *MD5_Print(unsigned char hash[16]);
+int MD5_Hash_CachedFile(unsigned char digest[16], unsigned char *pCache, int nFileSize, int bSeed, unsigned int seed[4]);
+
+int CRC_MapFile(CRC32_t *crcvalue, char *pszFileName);
+
+#endif
diff --git a/main/source/common/cvardef.h b/main/source/common/cvardef.h
new file mode 100644
index 00000000..2d599a35
--- /dev/null
+++ b/main/source/common/cvardef.h
@@ -0,0 +1,36 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef CVARDEF_H
+#define CVARDEF_H
+
+#define	FCVAR_ARCHIVE		(1<<0)	// set to cause it to be saved to vars.rc
+#define	FCVAR_USERINFO		(1<<1)	// changes the client's info string
+#define	FCVAR_SERVER		(1<<2)	// notifies players when changed
+#define FCVAR_EXTDLL		(1<<3)	// defined by external DLL
+#define FCVAR_CLIENTDLL     (1<<4)  // defined by the client dll
+#define FCVAR_PROTECTED     (1<<5)  // It's a server cvar, but we don't send the data since it's a password, etc.  Sends 1 if it's not bland/zero, 0 otherwise as value
+#define FCVAR_SPONLY        (1<<6)  // This cvar cannot be changed by clients connected to a multiplayer server.
+#define FCVAR_PRINTABLEONLY (1<<7)  // This cvar's string cannot contain unprintable characters ( e.g., used for player name etc ).
+#define FCVAR_UNLOGGED		(1<<8)  // If this is a FCVAR_SERVER, don't log changes to the log file / console if we are creating a log
+
+typedef struct cvar_s
+{
+	char	*name;
+	char	*string;
+	int		flags;
+	float	value;
+	struct cvar_s *next;
+} cvar_t;
+#endif
diff --git a/main/source/common/damagetypes.h b/main/source/common/damagetypes.h
new file mode 100644
index 00000000..cceea945
--- /dev/null
+++ b/main/source/common/damagetypes.h
@@ -0,0 +1,58 @@
+#ifndef DAMAGETYPES_H
+#define DAMAGETYPES_H
+
+#define DMG_GENERIC			0			// generic damage was done
+#define DMG_CRUSH			(1 << 0)	// crushed by falling or moving object
+#define DMG_BULLET			(1 << 1)	// shot
+#define DMG_SLASH			(1 << 2)	// cut, clawed, stabbed
+#define DMG_BURN			(1 << 3)	// heat burned
+#define DMG_FREEZE			(1 << 4)	// frozen
+#define DMG_FALL			(1 << 5)	// fell too far
+#define DMG_BLAST			(1 << 6)	// explosive blast damage
+#define DMG_CLUB			(1 << 7)	// crowbar, punch, headbutt
+#define DMG_SHOCK			(1 << 8)	// electric shock
+#define DMG_SONIC			(1 << 9)	// sound pulse shockwave
+#define DMG_ENERGYBEAM		(1 << 10)	// laser or other high energy beam 
+#define DMG_NEVERGIB		(1 << 12)	// with this bit OR'd in, no damage type will be able to gib victims upon death
+#define DMG_ALWAYSGIB		(1 << 13)	// with this bit OR'd in, any damage type can be made to gib victims upon death.
+#define DMG_DROWN			(1 << 14)	// Drowning
+
+// NS damage types
+// Special notes: babblers count as players
+#define NS_DMG_NORMAL		DMG_BULLET		// Normal damage against all targets
+#define NS_DMG_PIERCING		DMG_SONIC		// Normal against players, half vs. structures
+#define NS_DMG_BLAST		DMG_BLAST		// Normal vs. players, double vs. structures
+#define NS_DMG_ORGANIC		DMG_FREEZE		// Only damages living things (players, living structures)
+#define NS_DMG_STRUCTURAL	DMG_ENERGYBEAM	// Doesn't damage players
+#define NS_DMG_LIGHT		DMG_SHOCK		// Half damage to heavily armored targets
+#define NS_DMG_ACID			DMG_MORTAR		// Double armor damage
+
+// time-based damage
+//mask off TF-specific stuff too
+#define DMG_TIMEBASED		(~(0xff003fff))	// mask for time-based damage
+
+#define DMG_DROWN			(1 << 14)	// Drowning
+#define DMG_FIRSTTIMEBASED  DMG_DROWN
+
+#define DMG_PARALYZE		(1 << 15)	// slows affected creature down
+#define DMG_NERVEGAS		(1 << 16)	// nerve toxins, very bad
+#define DMG_POISON			(1 << 17)	// blood poisioning
+#define DMG_RADIATION		(1 << 18)	// radiation exposure
+#define DMG_DROWNRECOVER	(1 << 19)	// drowning recovery
+#define DMG_ACID			(1 << 20)	// toxic chemicals or acid burns
+#define DMG_SLOWBURN		(1 << 21)	// in an oven
+#define DMG_SLOWFREEZE		(1 << 22)	// in a subzero freezer
+#define DMG_MORTAR			(1 << 23)	// Hit by air raid (done to distinguish grenade from mortar)
+
+//TF ADDITIONS
+#define DMG_IGNITE			(1 << 24)	// Players hit by this begin to burn
+#define DMG_RADIUS_MAX		(1 << 25)	// Radius damage with this flag doesn't decrease over distance
+#define DMG_RADIUS_QUAKE	(1 << 26)	// Radius damage is done like Quake. 1/2 damage at 1/2 radius.
+#define DMG_IGNOREARMOR		(1 << 27)	// Damage ignores target's armor
+#define DMG_AIMED			(1 << 28)   // Does Hit location damage
+#define DMG_WALLPIERCING	(1 << 29)	// Blast Damages ents through walls
+
+#define DMG_CALTROP				(1<<30)
+#define DMG_HALLUC				(1<<31)
+
+#endif
\ No newline at end of file
diff --git a/main/source/common/demo_api.h b/main/source/common/demo_api.h
new file mode 100644
index 00000000..f87d5ee8
--- /dev/null
+++ b/main/source/common/demo_api.h
@@ -0,0 +1,31 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined ( DEMO_APIH )
+#define DEMO_APIH
+#ifdef _WIN32
+#pragma once
+#endif
+
+typedef struct demo_api_s
+{
+	int		( *IsRecording )	( void );
+	int		( *IsPlayingback )	( void );
+	int		( *IsTimeDemo )		( void );
+	void	( *WriteBuffer )	( int size, unsigned char *buffer );
+} demo_api_t;
+
+extern demo_api_t demoapi;
+
+#endif
diff --git a/main/source/common/director_cmds.h b/main/source/common/director_cmds.h
new file mode 100644
index 00000000..850ddab7
--- /dev/null
+++ b/main/source/common/director_cmds.h
@@ -0,0 +1,31 @@
+// director_cmds.h
+// sub commands for svc_director
+
+#define DRC_ACTIVE				0	// tells client that he's an spectator and will get director command
+#define DRC_STATUS				1	// send status infos about proxy 
+#define DRC_CAMERA				2	// set the actual director camera position
+#define DRC_EVENT				3	// informs the dircetor about ann important game event
+
+
+#define DRC_FLAG_PRIO_MASK		0x0F	//	priorities between 0 and 15 (15 most important)
+#define DRC_FLAG_SIDE			(1<<4)	
+#define DRC_FLAG_DRAMATIC		(1<<5)
+
+
+
+// commands of the director API function CallDirectorProc(...)
+
+#define DRCAPI_NOP					0	// no operation
+#define DRCAPI_ACTIVE				1	// de/acivates director mode in engine
+#define DRCAPI_STATUS				2   // request proxy information
+#define DRCAPI_SETCAM				3	// set camera n to given position and angle
+#define DRCAPI_GETCAM				4	// request camera n position and angle
+#define DRCAPI_DIRPLAY				5	// set director time and play with normal speed
+#define DRCAPI_DIRFREEZE			6	// freeze directo at this time
+#define DRCAPI_SETVIEWMODE			7	// overview or 4 cameras 
+#define DRCAPI_SETOVERVIEWPARAMS	8	// sets parameter for overview mode
+#define DRCAPI_SETFOCUS				9	// set the camera which has the input focus
+#define DRCAPI_GETTARGETS			10	// queries engine for player list
+#define DRCAPI_SETVIEWPOINTS		11	// gives engine all waypoints
+
+
diff --git a/main/source/common/dlight.h b/main/source/common/dlight.h
new file mode 100644
index 00000000..ac74c655
--- /dev/null
+++ b/main/source/common/dlight.h
@@ -0,0 +1,33 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined ( DLIGHTH )
+#define DLIGHTH
+#ifdef _WIN32
+#pragma once
+#endif
+
+typedef struct dlight_s
+{
+	vec3_t	origin;
+	float	radius;
+	color24	color;
+	float	die;				// stop lighting after this time
+	float	decay;				// drop this each second
+	float	minlight;			// don't add when contributing less
+	int		key;
+	qboolean	dark;			// subtracts light instead of adding
+} dlight_t;
+
+#endif
diff --git a/main/source/common/dll_state.h b/main/source/common/dll_state.h
new file mode 100644
index 00000000..403f591d
--- /dev/null
+++ b/main/source/common/dll_state.h
@@ -0,0 +1,16 @@
+//DLL State Flags
+
+#define DLL_INACTIVE 0		// no dll
+#define DLL_ACTIVE   1		// dll is running
+#define DLL_PAUSED   2		// dll is paused
+#define DLL_CLOSE    3		// closing down dll
+#define DLL_TRANS    4 		// Level Transition
+
+// DLL Pause reasons
+
+#define DLL_NORMAL        0   // User hit Esc or something.
+#define DLL_QUIT          4   // Quit now
+#define DLL_RESTART       6   // Switch to launcher for linux, does a quit but returns 1
+
+// DLL Substate info ( not relevant )
+#define ENG_NORMAL         (1<<0)
diff --git a/main/source/common/engine_launcher_api.h b/main/source/common/engine_launcher_api.h
new file mode 100644
index 00000000..fef1a650
--- /dev/null
+++ b/main/source/common/engine_launcher_api.h
@@ -0,0 +1,103 @@
+// engine/launcher interface
+#if !defined( ENGINE_LAUNCHER_APIH )
+#define ENGINE_LAUNCHER_APIH
+#ifdef _WIN32
+#pragma once
+#endif
+
+//typedef void ( *xcommand_t ) ( void );
+
+#define RENDERTYPE_UNDEFINED	0
+#define RENDERTYPE_SOFTWARE		1
+#define RENDERTYPE_HARDWARE		2
+
+#define ENGINE_LAUNCHER_API_VERSION 1
+
+typedef struct engine_api_s
+{
+	int		version;
+	int		rendertype;
+	int		size;
+
+	// Functions
+	int		( *GetEngineState )				( void );
+	void	( *Cbuf_AddText )				( char *text ); // append cmd at end of buf
+	void	( *Cbuf_InsertText )			( char *text ); // insert cmd at start of buf
+	void	( *Cmd_AddCommand )				( char *cmd_name, void ( *funcname )( void ) );
+	int		( *Cmd_Argc )					( void );
+	char	*( *Cmd_Args )					( void );
+	char	*( *Cmd_Argv )					( int arg );
+	void	( *Con_Printf )					( char *, ... );
+	void	( *Con_SafePrintf )				( char *, ... );
+	void	( *Cvar_Set )					( char *var_name, char *value );
+	void	( *Cvar_SetValue )				( char *var_name, float value );
+	int		( *Cvar_VariableInt )			( char *var_name );
+	char	*( *Cvar_VariableString )		( char *var_name );
+	float	( *Cvar_VariableValue )			( char *var_name );
+	void	( *ForceReloadProfile )			( void );
+	int		( *GetGameInfo )				( struct GameInfo_s *pGI, char *pszChannel );
+	void	( *GameSetBackground )			( int bBack );
+	void	( *GameSetState )				( int iState );
+	void	( *GameSetSubState )			( int iState );
+	int		( *GetPauseState )				( void );
+	int		( *Host_Frame )					( float time, int iState, int *stateInfo );
+	void	( *Host_GetHostInfo )			( float *fps, int *nActive, int *nSpectators, int *nMaxPlayers, char *pszMap );
+	void	( *Host_Shutdown )				( void );
+	int		( *Game_Init )					( char *lpCmdLine, unsigned char *pMem, int iSize, struct exefuncs_s *pef, void *, int );
+	void	( *IN_ActivateMouse )			( void );
+	void	( *IN_ClearStates )				( void );
+	void	( *IN_DeactivateMouse )			( void );
+	void	( *IN_MouseEvent )				( int mstate );
+	void	( *Keyboard_ReturnToGame )		( void );
+	void	( *Key_ClearStates )			( void );
+	void	( *Key_Event )					( int key, int down );
+	int		( *LoadGame )					( const char *pszSlot );
+	void	( *S_BlockSound )				( void );
+	void	( *S_ClearBuffer )				( void );
+	void	( *S_GetDSPointer )				( struct IDirectSound **lpDS, struct IDirectSoundBuffer **lpDSBuf );
+	void 	*( *S_GetWAVPointer )			( void );
+	void	( *S_UnblockSound )				( void );
+	int		( *SaveGame )					( const char *pszSlot, const char *pszComment );
+	void	( *SetAuth )					( void *pobj );
+	void	( *SetMessagePumpDisableMode )	( int bMode );
+	void	( *SetPauseState )				( int bPause );
+	void	( *SetStartupMode )				( int bMode );
+	void	( *SNDDMA_Shutdown )			( void );
+	void	( *Snd_AcquireBuffer )			( void );
+	void	( *Snd_ReleaseBuffer )			( void );
+	void	( *StoreProfile )				( void );
+	double	( *Sys_FloatTime )				( void );
+	void	( *VID_UpdateWindowVars )		( void *prc, int x, int y );
+	void	( *VID_UpdateVID )				( struct viddef_s *pvid );
+
+	// VGUI interfaces
+	void	( *VGui_CallEngineSurfaceProc )	( void* hwnd, unsigned int msg, unsigned int wparam, long lparam );
+
+	// notifications that the launcher is taking/giving focus to the engine
+	void    ( *EngineTakingFocus )			( void );
+	void    ( *LauncherTakingFocus )		( void );
+
+#ifdef _WIN32
+	// Only filled in by rendertype RENDERTYPE_HARDWARE
+	void	( *GL_Init )					( void );
+	int		( *GL_SetMode )					( HWND hwndGame, HDC *pmaindc, HGLRC *pbaseRC, int fD3D, const char *p, const char *pszCmdLine );
+	void	( *GL_Shutdown )				( HWND hwnd, HDC hdc, HGLRC hglrc );
+
+	void	( *QGL_D3DShared )				( struct tagD3DGlobals *d3dGShared );
+
+	int		( WINAPI *glSwapBuffers )		( HDC dc );
+	void	( *DirectorProc ) ( unsigned int cmd, void * params );
+#else
+	// NOT USED IN LINUX!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+	void	( *GL_Init )					( void );
+	void	( *GL_SetMode )					( void );
+	void	( *GL_Shutdown )				( void );
+	void	( *QGL_D3DShared )				( void );
+	void	( *glSwapBuffers )				( void );
+	void	( *DirectorProc )				( void );
+	// LINUX
+#endif
+
+} engine_api_t;
+
+#endif // ENGINE_LAUNCHER_APIH
diff --git a/main/source/common/entity_state.h b/main/source/common/entity_state.h
new file mode 100644
index 00000000..ee9b0cd9
--- /dev/null
+++ b/main/source/common/entity_state.h
@@ -0,0 +1,194 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined( ENTITY_STATEH )
+#define ENTITY_STATEH
+#ifdef _WIN32
+#pragma once
+#endif
+#include "common/const.h"
+
+// For entityType below
+#define ENTITY_NORMAL		(1<<0)
+#define ENTITY_BEAM			(1<<1)
+
+// Entity state is used for the baseline and for delta compression of a packet of 
+//  entities that is sent to a client.
+typedef struct entity_state_s entity_state_t;
+
+struct entity_state_s
+{
+// Fields which are filled in by routines outside of delta compression
+	int			entityType;
+	// Index into cl_entities array for this entity.
+	int			number;      
+	float		msg_time;
+
+	// Message number last time the player/entity state was updated.
+	int			messagenum;		
+
+	// Fields which can be transitted and reconstructed over the network stream
+	vec3_t		origin;
+	vec3_t		angles;
+
+	int			modelindex;
+	int			sequence;
+	float		frame;
+	int			colormap;
+	short		skin;
+	short		solid;
+	int			effects;
+	float		scale;
+
+	byte		eflags;
+	
+	// Render information
+	int			rendermode;
+	int			renderamt;
+	color24		rendercolor;
+	int			renderfx;
+
+	int			movetype;
+	float		animtime;
+	float		framerate;
+	int			body;
+	byte		controller[4];
+	byte		blending[4];
+	vec3_t		velocity;
+
+	// Send bbox down to client for use during prediction.
+	vec3_t		mins;    
+	vec3_t		maxs;
+
+	int			aiment;
+	// If owned by a player, the index of that player ( for projectiles ).
+	int			owner; 
+
+	// Friction, for prediction.
+	float		friction;       
+	// Gravity multiplier
+	float		gravity;		
+
+// PLAYER SPECIFIC
+	int			team;
+	int			playerclass;
+	int			health;
+	qboolean	spectator;  
+	int         weaponmodel;
+	int			gaitsequence;
+	// If standing on conveyor, e.g.
+	vec3_t		basevelocity;   
+	// Use the crouched hull, or the regular player hull.
+	int			usehull;		
+	// Latched buttons last time state updated.
+	int			oldbuttons;     
+	// -1 = in air, else pmove entity number
+	int			onground;		
+	int			iStepLeft;
+	// How fast we are falling
+	float		flFallVelocity;  
+
+	float		fov;
+	int			weaponanim;
+
+	// Parametric movement overrides
+	vec3_t				startpos;
+	vec3_t				endpos;
+	float				impacttime;
+	float				starttime;
+
+	// For mods
+	int			iuser1;
+	int			iuser2;
+	int			iuser3;
+	int			iuser4;
+	float		fuser1;
+	float		fuser2;
+	float		fuser3;
+	float		fuser4;
+	vec3_t		vuser1;
+	vec3_t		vuser2;
+	vec3_t		vuser3;
+	vec3_t		vuser4;
+};
+
+#include "pm_info.h"
+
+typedef struct clientdata_s
+{
+	vec3_t				origin;
+	vec3_t				velocity;
+
+	int					viewmodel;
+	vec3_t				punchangle;
+	int					flags;
+	int					waterlevel;
+	int					watertype;
+	vec3_t				view_ofs;
+	float				health;
+
+	int					bInDuck;
+
+	int					weapons; // remove?
+	
+	int					flTimeStepSound;
+	int					flDuckTime;
+	int					flSwimTime;
+	int					waterjumptime;
+
+	float				maxspeed;
+
+	float				fov;
+	int					weaponanim;
+
+	int					m_iId;
+	int					ammo_shells;
+	int					ammo_nails;
+	int					ammo_cells;
+	int					ammo_rockets;
+	float				m_flNextAttack;
+	
+	int					tfstate;
+
+	int					pushmsec;
+
+	int					deadflag;
+
+	char				physinfo[ MAX_PHYSINFO_STRING ];
+
+	// For mods
+	int					iuser1;
+	int					iuser2;
+	int					iuser3;
+	int					iuser4;
+	float				fuser1;
+	float				fuser2;
+	float				fuser3;
+	float				fuser4;
+	vec3_t				vuser1;
+	vec3_t				vuser2;
+	vec3_t				vuser3;
+	vec3_t				vuser4;
+} clientdata_t;
+
+#include "weaponinfo.h"
+
+typedef struct local_state_s
+{
+	entity_state_t playerstate;
+	clientdata_t   client;
+	weapon_data_t  weapondata[ 32 ];
+} local_state_t;
+
+#endif // !ENTITY_STATEH
diff --git a/main/source/common/entity_types.h b/main/source/common/entity_types.h
new file mode 100644
index 00000000..856a61bf
--- /dev/null
+++ b/main/source/common/entity_types.h
@@ -0,0 +1,26 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+// entity_types.h
+#if !defined( ENTITY_TYPESH )
+#define ENTITY_TYPESH
+
+#define ET_NORMAL		0
+#define ET_PLAYER		1
+#define ET_TEMPENTITY	2
+#define ET_BEAM			3
+// BMODEL or SPRITE that was split across BSP nodes
+#define ET_FRAGMENTED	4
+
+#endif // !ENTITY_TYPESH
diff --git a/main/source/common/event_api.h b/main/source/common/event_api.h
new file mode 100644
index 00000000..466f3b40
--- /dev/null
+++ b/main/source/common/event_api.h
@@ -0,0 +1,51 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined ( EVENT_APIH )
+#define EVENT_APIH
+#ifdef _WIN32
+#pragma once
+#endif
+
+#define EVENT_API_VERSION 1
+
+typedef struct event_api_s
+{
+	int		version;
+	void	( *EV_PlaySound ) ( int ent, float *origin, int channel, const char *sample, float volume, float attenuation, int fFlags, int pitch );
+	void	( *EV_StopSound ) ( int ent, int channel, const char *sample );
+	int		( *EV_FindModelIndex )( const char *pmodel );
+	int		( *EV_IsLocal ) ( int playernum );
+	int		( *EV_LocalPlayerDucking ) ( void );
+	void	( *EV_LocalPlayerViewheight ) ( float * );
+	void	( *EV_LocalPlayerBounds ) ( int hull, float *mins, float *maxs );
+	int		( *EV_IndexFromTrace) ( struct pmtrace_s *pTrace );
+	struct physent_s *( *EV_GetPhysent ) ( int idx );
+	void	( *EV_SetUpPlayerPrediction ) ( int dopred, int bIncludeLocalClient );
+	void	( *EV_PushPMStates ) ( void );
+	void	( *EV_PopPMStates ) ( void );
+	void	( *EV_SetSolidPlayers ) (int playernum);
+	void	( *EV_SetTraceHull ) ( int hull );
+	void	( *EV_PlayerTrace ) ( float *start, float *end, int traceFlags, int ignore_pe, struct pmtrace_s *tr );
+	void	( *EV_WeaponAnimation ) ( int sequence, int body );
+	unsigned short ( *EV_PrecacheEvent ) ( int type, const char* psz );
+	void	( *EV_PlaybackEvent ) ( int flags, const struct edict_s *pInvoker, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 );
+	const char *( *EV_TraceTexture ) ( int ground, float *vstart, float *vend );
+	void	( *EV_StopAllSounds ) ( int entnum, int entchannel );
+	void    ( *EV_KillEvents ) ( int entnum, const char *eventname );
+} event_api_t;
+
+extern event_api_t eventapi;
+
+#endif
diff --git a/main/source/common/event_args.h b/main/source/common/event_args.h
new file mode 100644
index 00000000..acbe8c34
--- /dev/null
+++ b/main/source/common/event_args.h
@@ -0,0 +1,50 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined( EVENT_ARGSH )
+#define EVENT_ARGSH
+#ifdef _WIN32
+#pragma once
+#endif
+
+// Event was invoked with stated origin
+#define FEVENT_ORIGIN	( 1<<0 )
+
+// Event was invoked with stated angles
+#define FEVENT_ANGLES	( 1<<1 )
+
+typedef struct event_args_s
+{
+	int		flags;
+
+	// Transmitted
+	int		entindex;
+
+	float	origin[3];
+	float	angles[3];
+	float	velocity[3];
+
+	int		ducking;
+
+	float	fparam1;
+	float	fparam2;
+
+	int		iparam1;
+	int		iparam2;
+
+	int		bparam1;
+	int		bparam2;
+} event_args_t;
+
+#endif
diff --git a/main/source/common/event_flags.h b/main/source/common/event_flags.h
new file mode 100644
index 00000000..9e1aa545
--- /dev/null
+++ b/main/source/common/event_flags.h
@@ -0,0 +1,47 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined( EVENT_FLAGSH )
+#define EVENT_FLAGSH
+#ifdef _WIN32
+#pragma once
+#endif
+
+// Skip local host for event send.
+#define FEV_NOTHOST		(1<<0)    
+
+// Send the event reliably.  You must specify the origin and angles and use
+// PLAYBACK_EVENT_FULL for this to work correctly on the server for anything
+// that depends on the event origin/angles.  I.e., the origin/angles are not
+// taken from the invoking edict for reliable events.
+#define FEV_RELIABLE	(1<<1)	 
+
+// Don't restrict to PAS/PVS, send this event to _everybody_ on the server ( useful for stopping CHAN_STATIC
+//  sounds started by client event when client is not in PVS anymore ( hwguy in TFC e.g. ).
+#define FEV_GLOBAL		(1<<2)
+
+// If this client already has one of these events in its queue, just update the event instead of sending it as a duplicate
+//
+#define FEV_UPDATE		(1<<3)
+
+// Only send to entity specified as the invoker
+#define	FEV_HOSTONLY	(1<<4)
+
+// Only send if the event was created on the server.
+#define FEV_SERVER		(1<<5)
+
+// Only issue event client side ( from shared code )
+#define FEV_CLIENT		(1<<6)
+
+#endif
diff --git a/main/source/common/exefuncs.h b/main/source/common/exefuncs.h
new file mode 100644
index 00000000..a82f7dce
--- /dev/null
+++ b/main/source/common/exefuncs.h
@@ -0,0 +1,43 @@
+// exefuncs.h
+#ifndef EXEFUNCS_H
+#define EXEFUNCS_H
+
+// Engine hands this to DLLs for functionality callbacks
+typedef struct exefuncs_s
+{
+	int			fMMX;
+	int			iCPUMhz;
+	void		(*unused1)(void);
+	void		(*unused2)(void);
+	void		(*unused3)(void);
+	void		(*unused4)(void);
+	void		(*VID_ForceLockState)(int lk);
+	int			(*VID_ForceUnlockedAndReturnState)(void);
+	void		(*unused5)(void);
+	void		(*unused6)(void);
+	void		(*unused7)(void);
+	void		(*unused8)(void);
+	void		(*unused9)(void);
+	void		(*unused10)(void);
+	void		(*unused11)(void);
+	void		(*unused12)(void);
+	void		(*unused13)(void);
+	void		(*unused14)(void);
+	void		(*unused15)(void);
+	void        (*ErrorMessage)(int nLevel, const char *pszErrorMessage);
+	void		(*unused16)(void);
+	void        (*Sys_Printf)(char *fmt, ...);
+	void		(*unused17)(void);
+	void		(*unused18)(void);
+	void		(*unused19)(void);
+	void		(*unused20)(void);
+	void		(*unused21)(void);
+	void		(*unused22)(void);
+	void		(*unused23)(void);
+	void		(*unused24)(void);
+	void		(*unused25)(void);
+	void		(*unused26)(void);
+	void		(*unused27)(void);
+} exefuncs_t;
+
+#endif
diff --git a/main/source/common/hldm.h b/main/source/common/hldm.h
new file mode 100644
index 00000000..2c27445b
--- /dev/null
+++ b/main/source/common/hldm.h
@@ -0,0 +1,33 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: hldm.h $
+// $Date: 2002/08/02 21:42:34 $
+//
+//-------------------------------------------------------------------------------
+// $Log: hldm.h,v $
+// Revision 1.4  2002/08/02 21:42:34  Flayra
+// - Allow ability to control how often a ricochet sound plays
+//
+// Revision 1.3  2002/07/08 16:17:46  Flayra
+// - Reworked bullet firing to add random spread (bug #236)
+//
+//===============================================================================
+#ifndef HLDM_H
+#define HLDM_H
+
+#include "common/pmtrace.h"
+
+void EV_HLDM_GunshotDecalTrace( pmtrace_t *pTrace, char *decalName, int inChanceOfSound = 1);
+void EV_HLDM_DecalGunshot( pmtrace_t *pTrace, int iBulletType, int inChanceOfSound = 1);
+int EV_HLDM_CheckTracer( int idx, float *vecSrc, float *end, float *forward, float *right, int iBulletType, int iTracerFreq, int *tracerCount );
+void EV_HLDM_FireBullets( int idx, float *forward, float *right, float *up, int cShots, float *vecSrc, float *vecDirShooting, float flDistance, int iBulletType, int iTracerFreq, int *tracerCount, float flSpreadX, float flSpreadY );
+void EV_HLDM_FireBulletsPlayer( int idx, float *forward, float *right, float *up, int cShots, float *vecSrc, float *vecDirShooting, float flDistance, int iBulletType, int iTracerFreq, int *tracerCount, Vector& inSpread, int inRandomSeed);
+
+#endif
\ No newline at end of file
diff --git a/main/source/common/hltv.h b/main/source/common/hltv.h
new file mode 100644
index 00000000..ff00d249
--- /dev/null
+++ b/main/source/common/hltv.h
@@ -0,0 +1,57 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+// hltv.h
+// all shared consts between server, clients and proxy
+
+#ifndef HLTV_H
+#define HLTV_H
+
+#define TYPE_CLIENT				0	// client is a normal HL client (default)
+#define TYPE_PROXY				1	// client is another proxy
+#define TYPE_COMMENTATOR		3	// client is a commentator
+#define TYPE_DEMO				4	// client is a demo file
+// sub commands of svc_hltv:
+#define HLTV_ACTIVE				0	// tells client that he's an spectator and will get director commands
+#define HLTV_STATUS				1	// send status infos about proxy 
+#define HLTV_LISTEN				2	// tell client to listen to a multicast stream
+
+// sub commands of svc_director:
+#define DRC_CMD_NONE				0	// NULL director command
+#define DRC_CMD_START				1	// start director mode
+#define DRC_CMD_EVENT				2	// informs about director command
+#define DRC_CMD_MODE				3	// switches camera modes
+#define DRC_CMD_CAMERA				4	// sets camera registers
+#define DRC_CMD_TIMESCALE			5	// sets time scale
+#define DRC_CMD_MESSAGE				6	// send HUD centerprint
+#define DRC_CMD_SOUND				7	// plays a particular sound
+#define DRC_CMD_STATUS				8	// status info about broadcast
+#define DRC_CMD_BANNER				9	// banner file name for HLTV gui
+#define	DRC_CMD_FADE				10	// send screen fade command
+#define DRC_CMD_SHAKE				11	// send screen shake command
+#define DRC_CMD_STUFFTEXT			12	// like the normal svc_stufftext but as director command
+
+#define DRC_CMD_LAST				12
+
+
+
+// HLTV_EVENT event flags
+#define DRC_FLAG_PRIO_MASK		0x0F	// priorities between 0 and 15 (15 most important)
+#define DRC_FLAG_SIDE			(1<<4)	// 
+#define DRC_FLAG_DRAMATIC		(1<<5)	// is a dramatic scene
+#define DRC_FLAG_SLOWMOTION		(1<<6)  // would look good in SloMo
+#define DRC_FLAG_FACEPLAYER		(1<<7)  // player is doning something (reload/defuse bomb etc)
+#define DRC_FLAG_INTRO			(1<<8)	// is a introduction scene
+#define DRC_FLAG_FINAL			(1<<9)	// is a final scene
+#define DRC_FLAG_NO_RANDOM		(1<<10)	// don't randomize event data
+
+
+#define MAX_DIRECTOR_CMD_PARAMETERS		4
+#define MAX_DIRECTOR_CMD_STRING			128
+
+
+#endif // HLTV_H
diff --git a/main/source/common/in_buttons.h b/main/source/common/in_buttons.h
new file mode 100644
index 00000000..1894b0a6
--- /dev/null
+++ b/main/source/common/in_buttons.h
@@ -0,0 +1,38 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef IN_BUTTONS_H
+#define IN_BUTTONS_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+#define IN_ATTACK	(1 << 0)
+#define IN_JUMP		(1 << 1)
+#define IN_DUCK		(1 << 2)
+#define IN_FORWARD	(1 << 3)
+#define IN_BACK		(1 << 4)
+#define IN_USE		(1 << 5)
+#define IN_CANCEL	(1 << 6)
+#define IN_LEFT		(1 << 7)
+#define IN_RIGHT	(1 << 8)
+#define IN_MOVELEFT	(1 << 9)
+#define IN_MOVERIGHT (1 << 10)
+#define IN_ATTACK2	(1 << 11)
+#define IN_RUN      (1 << 12)
+#define IN_RELOAD	(1 << 13)
+#define IN_ALT1		(1 << 14)
+#define IN_SCORE	(1 << 15)   // Used by client.dll for when scoreboard is held down
+
+#endif // IN_BUTTONS_H
diff --git a/main/source/common/interface.cpp b/main/source/common/interface.cpp
new file mode 100644
index 00000000..42f4801d
--- /dev/null
+++ b/main/source/common/interface.cpp
@@ -0,0 +1,144 @@
+
+#include <string.h>
+#include <stdlib.h>
+#include "interface.h"
+
+#ifndef _WIN32  // LINUX
+#include <dlfcn.h>
+#include <unistd.h> // getcwd
+#include <stdio.h> // sprintf
+#endif
+
+
+// ------------------------------------------------------------------------------------ //
+// InterfaceReg.
+// ------------------------------------------------------------------------------------ //
+InterfaceReg *InterfaceReg::s_pInterfaceRegs = NULL;
+
+
+InterfaceReg::InterfaceReg( InstantiateInterfaceFn fn, const char *pName ) :
+	m_pName(pName)
+{
+	m_CreateFn = fn;
+	m_pNext = s_pInterfaceRegs;
+	s_pInterfaceRegs = this;
+}
+
+
+
+// ------------------------------------------------------------------------------------ //
+// CreateInterface.
+// ------------------------------------------------------------------------------------ //
+EXPORT_FUNCTION IBaseInterface *CreateInterface( const char *pName, int *pReturnCode )
+{
+	InterfaceReg *pCur;
+	
+	for(pCur=InterfaceReg::s_pInterfaceRegs; pCur; pCur=pCur->m_pNext)
+	{
+		if(strcmp(pCur->m_pName, pName) == 0)
+		{
+			if ( pReturnCode )
+			{
+				*pReturnCode = IFACE_OK;
+			}
+			return pCur->m_CreateFn();
+		}
+	}
+	
+	if ( pReturnCode )
+	{
+		*pReturnCode = IFACE_FAILED;
+	}
+	return NULL;	
+}
+
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include "windows.h"
+#endif
+
+
+#ifdef _WIN32
+HINTERFACEMODULE Sys_LoadModule(const char *pModuleName)
+{
+	return (HINTERFACEMODULE)LoadLibrary(pModuleName);
+}
+
+#else  // LINUX
+HINTERFACEMODULE Sys_LoadModule(const char *pModuleName)
+{
+	// Linux dlopen() doesn't look in the current directory for libraries.
+	// We tell it to, so people don't have to 'install' libraries as root.
+
+	char szCwd[1024];
+	char szAbsoluteLibFilename[1024];
+
+	getcwd( szCwd, sizeof( szCwd ) );
+	if ( szCwd[ strlen( szCwd ) - 1 ] == '/' )
+		szCwd[ strlen( szCwd ) - 1 ] = 0;
+
+	sprintf( szAbsoluteLibFilename, "%s/%s", szCwd, pModuleName );
+
+	return (HINTERFACEMODULE)dlopen( szAbsoluteLibFilename, RTLD_NOW );
+}
+
+#endif
+
+
+#ifdef _WIN32
+void Sys_FreeModule(HINTERFACEMODULE hModule)
+{
+	if(!hModule)
+		return;
+
+	FreeLibrary((HMODULE)hModule);
+}
+
+#else  // LINUX
+void Sys_FreeModule(HINTERFACEMODULE hModule)
+{
+	if(!hModule)
+		return;
+
+	dlclose( (void *)hModule );
+}
+
+#endif
+
+
+//-----------------------------------------------------------------------------
+// Purpose: returns the instance of this module
+// Output : interface_instance_t
+//-----------------------------------------------------------------------------
+CreateInterfaceFn Sys_GetFactoryThis( void )
+{
+	return CreateInterface;
+}
+
+
+//-----------------------------------------------------------------------------
+// Purpose: returns the instance of the named module
+// Input  : *pModuleName - name of the module
+// Output : interface_instance_t - instance of that module
+//-----------------------------------------------------------------------------
+
+#ifdef _WIN32
+CreateInterfaceFn Sys_GetFactory( HINTERFACEMODULE hModule )
+{
+	if(!hModule)
+		return NULL;
+
+	return (CreateInterfaceFn)GetProcAddress((HMODULE)hModule, CREATEINTERFACE_PROCNAME);
+}
+
+#else  // LINUX
+CreateInterfaceFn Sys_GetFactory( HINTERFACEMODULE hModule )
+{
+	if(!hModule)
+		return NULL;
+
+	return (CreateInterfaceFn)dlsym( (void *)hModule, CREATEINTERFACE_PROCNAME );
+}
+
+#endif
diff --git a/main/source/common/interface.h b/main/source/common/interface.h
new file mode 100644
index 00000000..8099662a
--- /dev/null
+++ b/main/source/common/interface.h
@@ -0,0 +1,123 @@
+
+// This header defines the interface convention used in the valve engine.
+// To make an interface and expose it:
+//    1. Derive from IBaseInterface.
+//    2. The interface must be ALL pure virtuals, and have no data members.
+//    3. Define a name for it.
+//    4. In its implementation file, use EXPOSE_INTERFACE or EXPOSE_SINGLE_INTERFACE.
+
+// Versioning
+// There are two versioning cases that are handled by this:
+// 1. You add functions to the end of an interface, so it is binary compatible with the previous interface. In this case, 
+//    you need two EXPOSE_INTERFACEs: one to expose your class as the old interface and one to expose it as the new interface.
+// 2. You update an interface so it's not compatible anymore (but you still want to be able to expose the old interface 
+//    for legacy code). In this case, you need to make a new version name for your new interface, and make a wrapper interface and 
+//    expose it for the old interface.
+
+#ifndef INTERFACE_H
+#define INTERFACE_H
+
+#ifdef __cplusplus
+
+// All interfaces derive from this.
+class IBaseInterface
+{
+public:
+
+	virtual			~IBaseInterface() {}
+};
+
+
+#define CREATEINTERFACE_PROCNAME	"CreateInterface"
+typedef IBaseInterface* (*CreateInterfaceFn)(const char *pName, int *pReturnCode);
+
+
+typedef IBaseInterface* (*InstantiateInterfaceFn)();
+
+
+// Used internally to register classes.
+class InterfaceReg
+{
+public:
+				InterfaceReg(InstantiateInterfaceFn fn, const char *pName);
+
+public:
+
+	InstantiateInterfaceFn	m_CreateFn;
+	const char				*m_pName;
+
+	InterfaceReg			*m_pNext; // For the global list.
+	static InterfaceReg		*s_pInterfaceRegs;
+};
+
+
+// Use this to expose an interface that can have multiple instances.
+// e.g.:
+// EXPOSE_INTERFACE( CInterfaceImp, IInterface, "MyInterface001" )
+// This will expose a class called CInterfaceImp that implements IInterface (a pure class)
+// clients can receive a pointer to this class by calling CreateInterface( "MyInterface001" )
+//
+// In practice, the shared header file defines the interface (IInterface) and version name ("MyInterface001")
+// so that each component can use these names/vtables to communicate
+//
+// A single class can support multiple interfaces through multiple inheritance
+//
+#define EXPOSE_INTERFACE_FN(functionName, interfaceName, versionName) \
+	static InterfaceReg __g_Create##className##_reg(functionName, versionName);
+
+#define EXPOSE_INTERFACE(className, interfaceName, versionName) \
+	static IBaseInterface* __Create##className##_interface() {return (interfaceName *)new className;}\
+	static InterfaceReg __g_Create##className##_reg(__Create##className##_interface, versionName );
+
+// Use this to expose a singleton interface with a global variable you've created.
+#define EXPOSE_SINGLE_INTERFACE_GLOBALVAR(className, interfaceName, versionName, globalVarName) \
+	static IBaseInterface* __Create##className##interfaceName##_interface() {return (interfaceName *)&globalVarName;}\
+	static InterfaceReg __g_Create##className##interfaceName##_reg(__Create##className##interfaceName##_interface, versionName);
+
+// Use this to expose a singleton interface. This creates the global variable for you automatically.
+#define EXPOSE_SINGLE_INTERFACE(className, interfaceName, versionName) \
+	static className __g_##className##_singleton;\
+	EXPOSE_SINGLE_INTERFACE_GLOBALVAR(className, interfaceName, versionName, __g_##className##_singleton)
+
+
+#ifdef WIN32
+	#define EXPORT_FUNCTION __declspec(dllexport)
+#else
+	#define EXPORT_FUNCTION
+#endif
+
+
+// This function is automatically exported and allows you to access any interfaces exposed with the above macros.
+// if pReturnCode is set, it will return one of the following values
+// extend this for other error conditions/code
+enum 
+{
+	IFACE_OK = 0,
+	IFACE_FAILED
+};
+
+
+extern "C"
+{
+	EXPORT_FUNCTION IBaseInterface* CreateInterface(const char *pName, int *pReturnCode);
+};
+
+
+// Handle to an interface (HInterfaceModule_t* is just there for type safety).
+typedef struct HInterfaceModule_t* HINTERFACEMODULE;
+
+
+// Use these to load and unload a module.
+extern HINTERFACEMODULE		Sys_LoadModule(const char *pModuleName);
+extern void					Sys_FreeModule(HINTERFACEMODULE hModule);
+
+// Use these to get the factory function from either a loaded module or the current module.
+extern CreateInterfaceFn	Sys_GetFactory( HINTERFACEMODULE hModule );
+extern CreateInterfaceFn	Sys_GetFactoryThis( void );
+
+#endif // __cplusplus
+
+#endif
+
+
+
diff --git a/main/source/common/itrackeruser.h b/main/source/common/itrackeruser.h
new file mode 100644
index 00000000..5ba185c9
--- /dev/null
+++ b/main/source/common/itrackeruser.h
@@ -0,0 +1,46 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef ITRACKERUSER_H
+#define ITRACKERUSER_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+#include "interface.h"
+
+//-----------------------------------------------------------------------------
+// Purpose: Interface to accessing information about tracker users
+//-----------------------------------------------------------------------------
+class ITrackerUser : public IBaseInterface
+{
+public:
+	// returns true if the interface is ready for use
+	virtual bool IsValid() = 0;
+
+	// returns the tracker ID of the current user
+	virtual int GetTrackerID() = 0;
+
+	// returns information about a user
+	// information may not be known about some users, "" will be returned
+	virtual const char *GetUserName(int trackerID) = 0;
+	virtual const char *GetFirstName(int trackerID) = 0;
+	virtual const char *GetLastName(int trackerID) = 0;
+	virtual const char *GetEmail(int trackerID) = 0;
+
+	// returns true if friendID is a friend of the current user 
+	// ie. the current is authorized to see when the friend is online
+	virtual bool IsFriend(int friendID) = 0;
+
+	// requests authorization from a user
+	virtual void RequestAuthorizationFromUser(int potentialFriendID) = 0;
+};
+
+#define TRACKERUSER_INTERFACE_VERSION "TrackerUser001"
+
+
+#endif // ITRACKERUSER_H
diff --git a/main/source/common/ivoicetweak.h b/main/source/common/ivoicetweak.h
new file mode 100644
index 00000000..9c39a5fe
--- /dev/null
+++ b/main/source/common/ivoicetweak.h
@@ -0,0 +1,35 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef IVOICETWEAK_H
+#define IVOICETWEAK_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+// These provide access to the voice controls.
+typedef enum
+{
+	MicrophoneVolume=0,			// values 0-1.
+	OtherSpeakerScale			// values 0-1. Scales how loud other players are.
+} VoiceTweakControl;
+
+
+typedef struct IVoiceTweak_s
+{
+	// These turn voice tweak mode on and off. While in voice tweak mode, the user's voice is echoed back
+	// without sending to the server. 
+	int				(*StartVoiceTweakMode)();	// Returns 0 on error.
+	void			(*EndVoiceTweakMode)();
+	
+	// Get/set control values.
+	void			(*SetControlFloat)(VoiceTweakControl iControl, float value);
+	float			(*GetControlFloat)(VoiceTweakControl iControl);
+} IVoiceTweak;
+
+
+#endif // IVOICETWEAK_H
diff --git a/main/source/common/mathlib.h b/main/source/common/mathlib.h
new file mode 100644
index 00000000..7d62c4c8
--- /dev/null
+++ b/main/source/common/mathlib.h
@@ -0,0 +1,154 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+// mathlib.h
+#ifndef MATHLIB_H
+#define MATHLIB_H
+
+typedef float vec_t;
+typedef vec_t vec3_t[3];
+typedef vec_t vec4_t[4];	// x,y,z,w
+typedef vec_t vec5_t[5];
+
+typedef short vec_s_t;
+typedef vec_s_t vec3s_t[3];
+typedef vec_s_t vec4s_t[4];	// x,y,z,w
+typedef vec_s_t vec5s_t[5];
+
+typedef	int	fixed4_t;
+typedef	int	fixed8_t;
+typedef	int	fixed16_t;
+
+#ifndef M_PI
+#define M_PI		3.14159265358979323846	// matches value in gcc v2 math.h
+#endif
+
+struct mplane_s;
+
+extern vec3_t vec3_origin;
+extern	int nanmask;
+
+#define	IS_NAN(x) (((*(int *)&x)&nanmask)==nanmask)
+
+#include "common/vec_op.h"
+//#ifndef VECTOR_H
+//	#define DotProduct(x,y) ((x)[0]*(y)[0]+(x)[1]*(y)[1]+(x)[2]*(y)[2])
+//#endif
+//
+//#define VectorSubtract(a,b,c) {(c)[0]=(a)[0]-(b)[0];(c)[1]=(a)[1]-(b)[1];(c)[2]=(a)[2]-(b)[2];}
+//#define VectorAdd(a,b,c) {(c)[0]=(a)[0]+(b)[0];(c)[1]=(a)[1]+(b)[1];(c)[2]=(a)[2]+(b)[2];}
+//#define VectorCopy(a,b) {(b)[0]=(a)[0];(b)[1]=(a)[1];(b)[2]=(a)[2];}
+//#define VectorClear(a) {(a)[0]=0.0;(a)[1]=0.0;(a)[2]=0.0;}
+
+//void VectorMA (const vec3_t veca, float scale, const vec3_t vecb, vec3_t vecc);
+
+vec_t _DotProduct (vec3_t v1, vec3_t v2);
+void _VectorSubtract (vec3_t veca, vec3_t vecb, vec3_t out);
+void _VectorAdd (vec3_t veca, vec3_t vecb, vec3_t out);
+void _VectorCopy (vec3_t in, vec3_t out);
+
+int VectorCompare (const vec3_t v1, const vec3_t v2);
+//float Length (const vec3_t v);
+void CrossProduct (const vec3_t v1, const vec3_t v2, vec3_t cross);
+//float VectorNormalize (vec3_t v);		// returns vector length
+void VectorInverse (vec3_t v);
+//void VectorScale (const vec3_t in, vec_t scale, vec3_t out);
+int Q_log2(int val);
+
+void R_ConcatRotations (float in1[3][3], float in2[3][3], float out[3][3]);
+void R_ConcatTransforms (float in1[3][4], float in2[3][4], float out[3][4]);
+
+// Here are some "manual" INLINE routines for doing floating point to integer conversions
+extern short new_cw, old_cw;
+
+typedef union DLONG {
+	int		i[2];
+	double	d;
+	float	f;
+	} DLONG;
+
+extern DLONG	dlong;
+
+#ifdef _WIN32
+void __inline set_fpu_cw(void)
+{
+_asm	
+	{		wait
+			fnstcw	old_cw
+			wait
+			mov		ax, word ptr old_cw
+			or		ah, 0xc
+			mov		word ptr new_cw,ax
+			fldcw	new_cw
+	}
+}
+
+int __inline quick_ftol(float f)
+{
+	_asm {
+		// Assumes that we are already in chop mode, and only need a 32-bit int
+		fld		DWORD PTR f
+		fistp	DWORD PTR dlong
+	}
+	return dlong.i[0];
+}
+
+void __inline restore_fpu_cw(void)
+{
+	_asm	fldcw	old_cw
+}
+#else
+#define set_fpu_cw() /* */
+#define quick_ftol(f) ftol(f)
+#define restore_fpu_cw() /* */
+#endif
+
+void FloorDivMod (double numer, double denom, int *quotient,
+		int *rem);
+fixed16_t Invert24To16(fixed16_t val);
+int GreatestCommonDivisor (int i1, int i2);
+
+void AngleVectors (const vec3_t angles, vec3_t forward, vec3_t right, vec3_t up);
+void AngleVectorsTranspose (const vec3_t angles, vec3_t forward, vec3_t right, vec3_t up);
+#define AngleIVectors	AngleVectorsTranspose
+
+void AngleMatrix (const vec3_t angles, float (*matrix)[4] );
+void AngleIMatrix (const vec3_t angles, float (*matrix)[4] );
+void VectorTransform (const vec3_t in1, float in2[3][4], vec3_t out);
+
+void VectorMatrix( vec3_t forward, vec3_t right, vec3_t up);
+//void VectorAngles( const vec3_t forward, vec3_t angles );
+
+int BoxOnPlaneSide (vec3_t emins, vec3_t emaxs, struct mplane_s *plane);
+float	anglemod(float a);
+
+
+
+#define BOX_ON_PLANE_SIDE(emins, emaxs, p)	\
+	(((p)->type < 3)?						\
+	(										\
+		((p)->dist <= (emins)[(p)->type])?	\
+			1								\
+		:									\
+		(									\
+			((p)->dist >= (emaxs)[(p)->type])?\
+				2							\
+			:								\
+				3							\
+		)									\
+	)										\
+	:										\
+		BoxOnPlaneSide( (emins), (emaxs), (p)))
+
+#endif
\ No newline at end of file
diff --git a/main/source/common/net_api.h b/main/source/common/net_api.h
new file mode 100644
index 00000000..769a6f23
--- /dev/null
+++ b/main/source/common/net_api.h
@@ -0,0 +1,92 @@
+#if !defined( NET_APIH )
+#define NET_APIH
+#ifdef _WIN32
+#pragma once
+#endif
+
+#if !defined ( NETADRH )
+#include "netadr.h"
+#endif
+
+#define NETAPI_REQUEST_SERVERLIST	( 0 )  // Doesn't need a remote address
+#define NETAPI_REQUEST_PING			( 1 )
+#define NETAPI_REQUEST_RULES		( 2 )
+#define NETAPI_REQUEST_PLAYERS		( 3 )
+#define NETAPI_REQUEST_DETAILS		( 4 )
+
+// Set this flag for things like broadcast requests, etc. where the engine should not
+//  kill the request hook after receiving the first response
+#define FNETAPI_MULTIPLE_RESPONSE ( 1<<0 )
+
+typedef void ( *net_api_response_func_t ) ( struct net_response_s *response );
+
+#define NET_SUCCESS						( 0 )
+#define NET_ERROR_TIMEOUT				( 1<<0 )
+#define NET_ERROR_PROTO_UNSUPPORTED		( 1<<1 )
+#define NET_ERROR_UNDEFINED				( 1<<2 )
+
+typedef struct net_adrlist_s
+{
+	struct net_adrlist_s	*next;
+	netadr_t				remote_address;
+} net_adrlist_t;
+
+typedef struct net_response_s
+{
+	// NET_SUCCESS or an error code
+	int			error;
+
+	// Context ID
+	int			context;
+	// Type
+	int			type;
+
+	// Server that is responding to the request
+	netadr_t	remote_address;
+
+	// Response RTT ping time
+	double		ping;
+	// Key/Value pair string ( separated by backlash \ characters )
+	// WARNING:  You must copy this buffer in the callback function, because it is freed
+	//  by the engine right after the call!!!!
+	// ALSO:  For NETAPI_REQUEST_SERVERLIST requests, this will be a pointer to a linked list of net_adrlist_t's
+	void		*response;
+} net_response_t;
+
+typedef struct net_status_s
+{
+		// Connected to remote server?  1 == yes, 0 otherwise
+	int			connected; 
+	// Client's IP address
+	netadr_t	local_address;
+	// Address of remote server
+	netadr_t	remote_address;
+	// Packet Loss ( as a percentage )
+	int			packet_loss;
+	// Latency, in seconds ( multiply by 1000.0 to get milliseconds )
+	double		latency;
+	// Connection time, in seconds
+	double		connection_time;
+	// Rate setting ( for incoming data )
+	double		rate;
+} net_status_t;
+
+typedef struct net_api_s
+{
+	// APIs
+	void		( *InitNetworking )( void );
+	void		( *Status ) ( struct net_status_s *status );
+	void		( *SendRequest) ( int context, int request, int flags, double timeout, struct netadr_s *remote_address, net_api_response_func_t response );
+	void		( *CancelRequest ) ( int context );
+	void		( *CancelAllRequests ) ( void );
+	char		*( *AdrToString ) ( struct netadr_s *a );
+	int			( *CompareAdr ) ( struct netadr_s *a, struct netadr_s *b );
+	int			( *StringToAdr ) ( char *s, struct netadr_s *a );
+	const char *( *ValueForKey ) ( const char *s, const char *key );
+	void		( *RemoveKey ) ( char *s, const char *key );
+	void		( *SetValueForKey ) (char *s, const char *key, const char *value, int maxsize );
+} net_api_t;
+
+extern net_api_t netapi;
+
+#endif // NET_APIH
\ No newline at end of file
diff --git a/main/source/common/netadr.h b/main/source/common/netadr.h
new file mode 100644
index 00000000..5d295244
--- /dev/null
+++ b/main/source/common/netadr.h
@@ -0,0 +1,40 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+// netadr.h
+#ifndef NETADR_H
+#define NETADR_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+typedef enum
+{
+	NA_UNUSED,
+	NA_LOOPBACK,
+	NA_BROADCAST,
+	NA_IP,
+	NA_IPX,
+	NA_BROADCAST_IPX,
+} netadrtype_t;
+
+typedef struct netadr_s
+{
+	netadrtype_t	type;
+	unsigned char	ip[4];
+	unsigned char	ipx[10];
+	unsigned short	port;
+} netadr_t;
+
+#endif // NETADR_H
diff --git a/main/source/common/nowin.h b/main/source/common/nowin.h
new file mode 100644
index 00000000..315ac83c
--- /dev/null
+++ b/main/source/common/nowin.h
@@ -0,0 +1,9 @@
+
+#ifndef INC_NOWIN_H
+#define INC_NOWIN_H
+#ifndef _WIN32
+
+#include <unistd.h>
+
+#endif //!_WIN32
+#endif //INC_NOWIN_H
\ No newline at end of file
diff --git a/main/source/common/particledef.h b/main/source/common/particledef.h
new file mode 100644
index 00000000..823f4fd6
--- /dev/null
+++ b/main/source/common/particledef.h
@@ -0,0 +1,57 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined( PARTICLEDEFH )
+#define PARTICLEDEFH
+#ifdef _WIN32
+#pragma once
+#endif
+
+typedef enum {
+	pt_static, 
+	pt_grav,
+	pt_slowgrav,
+	pt_fire,
+	pt_explode,
+	pt_explode2,
+	pt_blob,
+	pt_blob2,
+	pt_vox_slowgrav,
+	pt_vox_grav,
+	pt_clientcustom   // Must have callback function specified
+} ptype_t;
+
+// !!! if this is changed, it must be changed in d_ifacea.h too !!!
+typedef struct particle_s
+{
+// driver-usable fields
+	vec3_t		org;
+	short		color;
+	short		packedColor;
+// drivers never touch the following fields
+	struct particle_s	*next;
+	vec3_t		vel;
+	float		ramp;
+	float		die;
+	ptype_t		type;
+	void		(*deathfunc)( struct particle_s *particle );
+
+	// for pt_clientcusttom, we'll call this function each frame
+	void		(*callback)( struct particle_s *particle, float frametime );
+	
+	// For deathfunc, etc.
+	unsigned char context;
+} particle_t;
+
+#endif
diff --git a/main/source/common/pmtrace.h b/main/source/common/pmtrace.h
new file mode 100644
index 00000000..071185fa
--- /dev/null
+++ b/main/source/common/pmtrace.h
@@ -0,0 +1,43 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined( PMTRACEH )
+#define PMTRACEH
+#ifdef _WIN32
+#pragma once
+#endif
+
+typedef struct
+{
+	vec3_t	normal;
+	float	dist;
+} pmplane_t;
+
+typedef struct pmtrace_s pmtrace_t;
+
+struct pmtrace_s
+{
+	qboolean	allsolid;	      // if true, plane is not valid
+	qboolean	startsolid;	      // if true, the initial point was in a solid area
+	qboolean	inopen, inwater;  // End point is in empty space or in water
+	float		fraction;		  // time completed, 1.0 = didn't hit anything
+	vec3_t		endpos;			  // final position
+	pmplane_t	plane;		      // surface normal at impact
+	int			ent;			  // entity at impact
+	vec3_t      deltavelocity;    // Change in player's velocity caused by impact.  
+								  // Only run on server.
+	int         hitgroup;
+};
+
+#endif
diff --git a/main/source/common/qfont.h b/main/source/common/qfont.h
new file mode 100644
index 00000000..3989001a
--- /dev/null
+++ b/main/source/common/qfont.h
@@ -0,0 +1,40 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined( QFONTH )
+#define QFONTH
+#ifdef _WIN32
+#pragma once
+#endif
+
+// Font stuff
+
+#define NUM_GLYPHS 256
+
+typedef struct
+{
+	short startoffset;
+	short charwidth;
+} charinfo;
+
+typedef struct qfont_s
+{
+	int 		width, height;
+	int			rowcount;
+	int			rowheight;
+	charinfo	fontinfo[ NUM_GLYPHS ];
+	byte 		data[4];
+} qfont_t;
+
+#endif // qfont.h
diff --git a/main/source/common/r_efx.h b/main/source/common/r_efx.h
new file mode 100644
index 00000000..436128cf
--- /dev/null
+++ b/main/source/common/r_efx.h
@@ -0,0 +1,197 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined ( R_EFXH )
+#define R_EFXH
+#ifdef _WIN32
+#pragma once
+#endif
+
+// particle_t
+#if !defined( PARTICLEDEFH )  
+#include "particledef.h"
+#endif
+
+// BEAM
+#if !defined( BEAMDEFH )
+#include "beamdef.h"
+#endif
+
+// dlight_t
+#if !defined ( DLIGHTH )
+#include "dlight.h"
+#endif
+
+// cl_entity_t
+#if !defined( CL_ENTITYH )
+#include "cl_entity.h"
+#endif
+
+/*
+// FOR REFERENCE, These are the built-in tracer colors.  Note, color 4 is the one
+//  that uses the tracerred/tracergreen/tracerblue and traceralpha cvar settings
+color24 gTracerColors[] =
+{
+	{ 255, 255, 255 },		// White
+	{ 255, 0, 0 },			// Red
+	{ 0, 255, 0 },			// Green
+	{ 0, 0, 255 },			// Blue
+	{ 0, 0, 0 },			// Tracer default, filled in from cvars, etc.
+	{ 255, 167, 17 },		// Yellow-orange sparks
+	{ 255, 130, 90 },		// Yellowish streaks (garg)
+	{ 55, 60, 144 },		// Blue egon streak
+	{ 255, 130, 90 },		// More Yellowish streaks (garg)
+	{ 255, 140, 90 },		// More Yellowish streaks (garg)
+	{ 200, 130, 90 },		// More red streaks (garg)
+	{ 255, 120, 70 },		// Darker red streaks (garg)
+};
+*/
+
+// Temporary entity array
+#define TENTPRIORITY_LOW	0
+#define TENTPRIORITY_HIGH	1
+
+// TEMPENTITY flags
+#define	FTENT_NONE				0x00000000
+#define	FTENT_SINEWAVE			0x00000001
+#define	FTENT_GRAVITY			0x00000002
+#define FTENT_ROTATE			0x00000004
+#define	FTENT_SLOWGRAVITY		0x00000008
+#define FTENT_SMOKETRAIL		0x00000010
+#define FTENT_COLLIDEWORLD		0x00000020
+#define FTENT_FLICKER			0x00000040
+#define FTENT_FADEOUT			0x00000080
+#define FTENT_SPRANIMATE		0x00000100
+#define FTENT_HITSOUND			0x00000200
+#define FTENT_SPIRAL			0x00000400
+#define FTENT_SPRCYCLE			0x00000800
+#define FTENT_COLLIDEALL		0x00001000 // will collide with world and slideboxes
+#define FTENT_PERSIST			0x00002000 // tent is not removed when unable to draw 
+#define FTENT_COLLIDEKILL		0x00004000 // tent is removed upon collision with anything
+#define FTENT_PLYRATTACHMENT	0x00008000 // tent is attached to a player (owner)
+#define FTENT_SPRANIMATELOOP	0x00010000 // animating sprite doesn't die when last frame is displayed
+#define FTENT_SPARKSHOWER		0x00020000
+#define FTENT_NOMODEL			0x00040000 // Doesn't have a model, never try to draw ( it just triggers other things )
+#define FTENT_CLIENTCUSTOM		0x00080000 // Must specify callback.  Callback function is responsible for killing tempent and updating fields ( unless other flags specify how to do things )
+
+typedef struct tempent_s	TEMPENTITY;
+typedef struct tempent_s
+{
+	int			flags;
+	float		die;
+	float		frameMax;
+	float		x;
+	float		y;
+	float		z;
+	float		fadeSpeed;
+	float		bounceFactor;
+	int			hitSound;
+	void		( *hitcallback )	( struct tempent_s *ent, struct pmtrace_s *ptr );
+	void		( *callback )		( struct tempent_s *ent, float frametime, float currenttime );
+	TEMPENTITY	*next;
+	int			priority;
+	short		clientIndex;	// if attached, this is the index of the client to stick to
+								// if COLLIDEALL, this is the index of the client to ignore
+								// TENTS with FTENT_PLYRATTACHMENT MUST set the clientindex! 
+
+	vec3_t		tentOffset;		// if attached, client origin + tentOffset = tent origin.
+	cl_entity_t	entity;
+
+	// baseline.origin		- velocity
+	// baseline.renderamt	- starting fadeout intensity
+	// baseline.angles		- angle velocity
+} TEMPENTITY;
+
+typedef struct efx_api_s efx_api_t;
+
+struct efx_api_s
+{
+	particle_t  *( *R_AllocParticle )			( void ( *callback ) ( struct particle_s *particle, float frametime ) );
+	void		( *R_BlobExplosion )			( float * org );
+	void		( *R_Blood )					( float * org, float * dir, int pcolor, int speed );
+	void		( *R_BloodSprite )				( float * org, int colorindex, int modelIndex, int modelIndex2, float size );
+	void		( *R_BloodStream )				( float * org, float * dir, int pcolor, int speed );
+	void		( *R_BreakModel )				( float *pos, float *size, float *dir, float random, float life, int count, int modelIndex, char flags );
+	void		( *R_Bubbles )					( float * mins, float * maxs, float height, int modelIndex, int count, float speed );
+	void		( *R_BubbleTrail )				( float * start, float * end, float height, int modelIndex, int count, float speed );
+	void		( *R_BulletImpactParticles )	( float * pos );
+	void		( *R_EntityParticles )			( struct cl_entity_s *ent );
+	void		( *R_Explosion )				( float *pos, int model, float scale, float framerate, int flags );
+	void		( *R_FizzEffect )				( struct cl_entity_s *pent, int modelIndex, int density );
+	void		( *R_FireField ) 				( float * org, int radius, int modelIndex, int count, int flags, float life );
+	void		( *R_FlickerParticles )			( float * org );
+	void		( *R_FunnelSprite )				( float *org, int modelIndex, int reverse );
+	void		( *R_Implosion )				( float * end, float radius, int count, float life );
+	void		( *R_LargeFunnel )				( float * org, int reverse );
+	void		( *R_LavaSplash )				( float * org );
+	void		( *R_MultiGunshot )				( float * org, float * dir, float * noise, int count, int decalCount, int *decalIndices );
+	void		( *R_MuzzleFlash )				( float *pos1, int type );
+	void		( *R_ParticleBox )				( float *mins, float *maxs, unsigned char r, unsigned char g, unsigned char b, float life );
+	void		( *R_ParticleBurst )			( float * pos, int size, int color, float life );
+	void		( *R_ParticleExplosion )		( float * org );
+	void		( *R_ParticleExplosion2 )		( float * org, int colorStart, int colorLength );
+	void		( *R_ParticleLine )				( float * start, float *end, unsigned char r, unsigned char g, unsigned char b, float life );
+	void		( *R_PlayerSprites )			( int client, int modelIndex, int count, int size );
+	void		( *R_Projectile )				( float * origin, float * velocity, int modelIndex, int life, int owner, void (*hitcallback)( struct tempent_s *ent, struct pmtrace_s *ptr ) );
+	void		( *R_RicochetSound )			( float * pos );
+	void		( *R_RicochetSprite )			( float *pos, struct model_s *pmodel, float duration, float scale );
+	void		( *R_RocketFlare )				( float *pos );
+	void		( *R_RocketTrail )				( float * start, float * end, int type );
+	void		( *R_RunParticleEffect )		( float * org, float * dir, int color, int count );
+	void		( *R_ShowLine )					( float * start, float * end );
+	void		( *R_SparkEffect )				( float *pos, int count, int velocityMin, int velocityMax );
+	void		( *R_SparkShower )				( float *pos );
+	void		( *R_SparkStreaks )				( float * pos, int count, int velocityMin, int velocityMax );
+	void		( *R_Spray )					( float * pos, float * dir, int modelIndex, int count, int speed, int spread, int rendermode );
+	void		( *R_Sprite_Explode )			( TEMPENTITY *pTemp, float scale, int flags );
+	void		( *R_Sprite_Smoke )				( TEMPENTITY *pTemp, float scale );
+	void		( *R_Sprite_Spray )				( float * pos, float * dir, int modelIndex, int count, int speed, int iRand );
+	void		( *R_Sprite_Trail )				( int type, float * start, float * end, int modelIndex, int count, float life, float size, float amplitude, int renderamt, float speed );
+	void		( *R_Sprite_WallPuff )			( TEMPENTITY *pTemp, float scale );
+	void		( *R_StreakSplash )				( float * pos, float * dir, int color, int count, float speed, int velocityMin, int velocityMax );
+	void		( *R_TracerEffect )				( float * start, float * end );
+	void		( *R_UserTracerParticle )		( float * org, float * vel, float life, int colorIndex, float length, unsigned char deathcontext, void ( *deathfunc)( struct particle_s *particle ) );
+	particle_t *( *R_TracerParticles )			( float * org, float * vel, float life );
+	void		( *R_TeleportSplash )			( float * org );
+	void		( *R_TempSphereModel )			( float *pos, float speed, float life, int count, int modelIndex );
+	TEMPENTITY	*( *R_TempModel )				( float *pos, float *dir, float *angles, float life, int modelIndex, int soundtype );
+	TEMPENTITY	*( *R_DefaultSprite )			( float *pos, int spriteIndex, float framerate );
+	TEMPENTITY	*( *R_TempSprite )				( float *pos, float *dir, float scale, int modelIndex, int rendermode, int renderfx, float a, float life, int flags );
+	int			( *Draw_DecalIndex )			( int id );
+	int			( *Draw_DecalIndexFromName )	( char *name );
+	void		( *R_DecalShoot )				( int textureIndex, int entity, int modelIndex, float * position, int flags );
+	void		( *R_AttachTentToPlayer )		( int client, int modelIndex, float zoffset, float life );
+	void		( *R_KillAttachedTents )		( int client );
+	BEAM		*( *R_BeamCirclePoints )		( int type, float * start, float * end, int modelIndex, float life, float width, float amplitude, float brightness, float speed, int startFrame, float framerate, float r, float g, float b );
+	BEAM		*( *R_BeamEntPoint )			( int startEnt, float * end, int modelIndex, float life, float width, float amplitude, float brightness, float speed, int startFrame, float framerate, float r, float g, float b );
+	BEAM		*( *R_BeamEnts )				( int startEnt, int endEnt, int modelIndex, float life, float width, float amplitude, float brightness, float speed, int startFrame, float framerate, float r, float g, float b );
+	BEAM		*( *R_BeamFollow )				( int startEnt, int modelIndex, float life, float width, float r, float g, float b, float brightness );
+	void		( *R_BeamKill )					( int deadEntity );
+	BEAM		*( *R_BeamLightning )			( float * start, float * end, int modelIndex, float life, float width, float amplitude, float brightness, float speed );
+	BEAM		*( *R_BeamPoints )				( float * start, float * end, int modelIndex, float life, float width, float amplitude, float brightness, float speed, int startFrame, float framerate, float r, float g, float b );
+	BEAM		*( *R_BeamRing )				( int startEnt, int endEnt, int modelIndex, float life, float width, float amplitude, float brightness, float speed, int startFrame, float framerate, float r, float g, float b );
+	dlight_t	*( *CL_AllocDlight )			( int key );
+	dlight_t	*( *CL_AllocElight )			( int key );
+	TEMPENTITY	*( *CL_TempEntAlloc )			( float * org, struct model_s *model );
+	TEMPENTITY	*( *CL_TempEntAllocNoModel )	( float * org );
+	TEMPENTITY	*( *CL_TempEntAllocHigh )		( float * org, struct model_s *model );
+	TEMPENTITY	*( *CL_TentEntAllocCustom )		( float *origin, struct model_s *model, int high, void ( *callback ) ( struct tempent_s *ent, float frametime, float currenttime ) );
+	void		( *R_GetPackedColor )			( short *packed, short color );
+	short		( *R_LookupColor )				( unsigned char r, unsigned char g, unsigned char b );
+	void		( *R_DecalRemoveAll )			( int textureIndex ); //textureIndex points to the decal index in the array, not the actual texture index.
+};
+
+extern efx_api_t efx;
+
+#endif
diff --git a/main/source/common/ref_params.h b/main/source/common/ref_params.h
new file mode 100644
index 00000000..974fcc70
--- /dev/null
+++ b/main/source/common/ref_params.h
@@ -0,0 +1,75 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined( REF_PARAMSH )
+#define REF_PARAMSH
+
+typedef struct ref_params_s
+{
+	// Output
+	float	vieworg[3];
+	float	viewangles[3];
+
+	float	forward[3];
+	float	right[3];
+	float   up[3];
+
+	// Client frametime;
+	float	frametime;
+	// Client time
+	float	time;
+
+	// Misc
+	int		intermission;
+	int		paused;
+	int		spectator;
+	int		onground;
+	int		waterlevel;
+
+	float	simvel[3];
+	float	simorg[3];
+
+	float	viewheight[3];
+	float	idealpitch;
+
+	float	cl_viewangles[3];
+
+	int		health;
+	float	crosshairangle[3];
+	float	viewsize;
+
+	float	punchangle[3];
+	int		maxclients;
+	int		viewentity;
+	int		playernum;
+	int		max_entities;
+	int		demoplayback;
+	int		hardware;
+
+	int		smoothing;
+
+	// Last issued usercmd
+	struct usercmd_s *cmd;
+
+	// Movevars
+	struct movevars_s *movevars;
+
+	int		viewport[4];		// the viewport coordinates x ,y , width, height
+
+	int		nextView;			// the renderer calls ClientDLL_CalcRefdef() and Renderview
+								// so long in cycles until this value is 0 (multiple views)
+	int		onlyClientDraw;		// if !=0 nothing is drawn by the engine except clientDraw functions
+} ref_params_t;
+
+#endif // !REF_PARAMSH
diff --git a/main/source/common/renderingconst.h b/main/source/common/renderingconst.h
new file mode 100644
index 00000000..f06a60f2
--- /dev/null
+++ b/main/source/common/renderingconst.h
@@ -0,0 +1,41 @@
+#ifndef RENDERINGCONST_H
+#define RENDERINGCONST_H
+
+// Rendering constants
+enum 
+{	
+	kRenderNormal,			// src
+	kRenderTransColor,		// c*a+dest*(1-a)
+	kRenderTransTexture,	// src*a+dest*(1-a)
+	kRenderGlow,			// src*a+dest -- No Z buffer checks
+	kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	kRenderTransAdd,		// src*a+dest
+};
+
+enum 
+{	
+	kRenderFxNone = 0, 
+	kRenderFxPulseSlow, 
+	kRenderFxPulseFast, 
+	kRenderFxPulseSlowWide, 
+	kRenderFxPulseFastWide, 
+	kRenderFxFadeSlow, 
+	kRenderFxFadeFast, 
+	kRenderFxSolidSlow, 
+	kRenderFxSolidFast, 	   
+	kRenderFxStrobeSlow, 
+	kRenderFxStrobeFast, 
+	kRenderFxStrobeFaster, 
+	kRenderFxFlickerSlow, 
+	kRenderFxFlickerFast,
+	kRenderFxNoDissipation,
+	kRenderFxDistort,			// Distort/scale/translate flicker
+	kRenderFxHologram,			// kRenderFxDistort + distance fade
+	kRenderFxDeadPlayer,		// kRenderAmt is the player index
+	kRenderFxExplode,			// Scale up really big!
+	kRenderFxGlowShell,			// Glowing Shell
+	kRenderFxClampMinScale,		// Keep this sprite from getting very small (SPRITES only!)
+};
+
+#endif
+
diff --git a/main/source/common/screenfade.h b/main/source/common/screenfade.h
new file mode 100644
index 00000000..2311d06d
--- /dev/null
+++ b/main/source/common/screenfade.h
@@ -0,0 +1,18 @@
+#if !defined( SCREENFADEH )
+#define SCREENFADEH
+#ifdef _WIN32
+#pragma once
+#endif
+
+
+typedef struct screenfade_s
+{
+	float		fadeSpeed;		// How fast to fade (tics / second) (+ fade in, - fade out)
+	float		fadeEnd;		// When the fading hits maximum
+	float		fadeTotalEnd;	// Total End Time of the fade (used for FFADE_OUT)
+	float		fadeReset;		// When to reset to not fading (for fadeout and hold)
+	byte		fader, fadeg, fadeb, fadealpha;	// Fade color
+	int			fadeFlags;		// Fading flags
+} screenfade_t;
+
+#endif // !SCREENFADEH
diff --git a/main/source/common/studio_event.h b/main/source/common/studio_event.h
new file mode 100644
index 00000000..8fae6f54
--- /dev/null
+++ b/main/source/common/studio_event.h
@@ -0,0 +1,29 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined( STUDIO_EVENTH )
+#define STUDIO_EVENTH
+#ifdef _WIN32
+#pragma once
+#endif
+
+typedef struct mstudioevent_s
+{
+	int 				frame;
+	int					event;
+	int					type;
+	char				options[64];
+} mstudioevent_t;
+
+#endif // STUDIO_EVENTH
diff --git a/main/source/common/triangleapi.h b/main/source/common/triangleapi.h
new file mode 100644
index 00000000..5041e0b7
--- /dev/null
+++ b/main/source/common/triangleapi.h
@@ -0,0 +1,59 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined( TRIANGLEAPIH )
+#define TRIANGLEAPIH
+#ifdef _WIN32
+#pragma once
+#endif
+
+typedef enum 
+{
+	TRI_FRONT = 0,
+	TRI_NONE = 1,
+} TRICULLSTYLE;
+
+#define TRI_API_VERSION		1
+
+#define TRI_TRIANGLES		0
+#define TRI_TRIANGLE_FAN	1
+#define TRI_QUADS			2
+#define TRI_POLYGON			3
+#define TRI_LINES			4	
+#define TRI_TRIANGLE_STRIP	5
+#define TRI_QUAD_STRIP		6
+
+typedef struct triangleapi_s
+{
+	int			version;
+
+	void		( *RenderMode )( int mode );
+	void		( *Begin )( int primitiveCode );
+	void		( *End ) ( void );
+
+	void		( *Color4f ) ( float r, float g, float b, float a );
+	void		( *Color4ub ) ( unsigned char r, unsigned char g, unsigned char b, unsigned char a );
+	void		( *TexCoord2f ) ( float u, float v );
+	void		( *Vertex3fv ) ( float *worldPnt );
+	void		( *Vertex3f ) ( float x, float y, float z );
+	void		( *Brightness ) ( float brightness );
+	void		( *CullFace ) ( TRICULLSTYLE style );
+	int			( *SpriteTexture ) ( struct model_s *pSpriteModel, int frame );
+	int			( *WorldToScreen ) ( float *world, float *screen );  // Returns 1 if it's z clipped
+	void		( *Fog ) ( float flFogColor[3], float flStart, float flEnd, int bOn ); //Works just like GL_FOG, flFogColor is r/g/b.
+	void		( *ScreenToWorld ) ( float *screen, float *world  ); 
+
+} triangleapi_t;
+
+#endif // !TRIANGLEAPIH
diff --git a/main/source/common/usercmd.h b/main/source/common/usercmd.h
new file mode 100644
index 00000000..5f9bf82a
--- /dev/null
+++ b/main/source/common/usercmd.h
@@ -0,0 +1,41 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef USERCMD_H
+#define USERCMD_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+typedef struct usercmd_s
+{
+	short	lerp_msec;      // Interpolation time on client
+	byte	msec;           // Duration in ms of command
+	vec3_t	viewangles;     // Command view angles.
+
+// intended velocities
+	float	forwardmove;    // Forward velocity.
+	float	sidemove;       // Sideways velocity.
+	float	upmove;         // Upward velocity.
+	byte	lightlevel;     // Light level at spot where we are standing.
+	unsigned short  buttons;  // Attack buttons
+	byte    impulse;          // Impulse command issued.
+	byte	weaponselect;	// Current weapon id
+
+// Experimental player impact stuff.
+	int		impact_index;
+	vec3_t	impact_position;
+} usercmd_t;
+
+#endif // USERCMD_H
diff --git a/main/source/common/vec_op.h b/main/source/common/vec_op.h
new file mode 100644
index 00000000..1090c923
--- /dev/null
+++ b/main/source/common/vec_op.h
@@ -0,0 +1,10 @@
+#ifndef VECOP_H
+#define VECOP_H
+
+#define DotProduct(x,y) ((x)[0]*(y)[0]+(x)[1]*(y)[1]+(x)[2]*(y)[2])
+#define VectorSubtract(a,b,c) {(c)[0]=(a)[0]-(b)[0];(c)[1]=(a)[1]-(b)[1];(c)[2]=(a)[2]-(b)[2];}
+#define VectorAdd(a,b,c) {(c)[0]=(a)[0]+(b)[0];(c)[1]=(a)[1]+(b)[1];(c)[2]=(a)[2]+(b)[2];}
+#define VectorCopy(a,b) {(b)[0]=(a)[0];(b)[1]=(a)[1];(b)[2]=(a)[2];}
+#define VectorClear(a) { a[0]=0.0;a[1]=0.0;a[2]=0.0;}
+
+#endif
\ No newline at end of file
diff --git a/main/source/common/vector_util.h b/main/source/common/vector_util.h
new file mode 100644
index 00000000..0a649950
--- /dev/null
+++ b/main/source/common/vector_util.h
@@ -0,0 +1,14 @@
+#ifndef VECTOR_UTIL_H
+#define VECTOR_UTIL_H
+
+#include "common/vec_op.h"
+
+float Length(const float *v);
+void VectorMA (const float *veca, float scale, const float *vecb, float *vecc);
+void VectorScale (const float *in, float scale, float *out);
+float VectorNormalize (float *v);
+void VectorInverse ( float *v );
+
+extern vec3_t vec3_origin;
+
+#endif
\ No newline at end of file
diff --git a/main/source/common/vectorclasses.h b/main/source/common/vectorclasses.h
new file mode 100644
index 00000000..c5b2f115
--- /dev/null
+++ b/main/source/common/vectorclasses.h
@@ -0,0 +1,97 @@
+#ifndef VECTORCLASSES_H
+#define VECTORCLASSES_H
+
+//=========================================================
+// 2DVector - used for many pathfinding and many other 
+// operations that are treated as planar rather than 3d.
+//=========================================================
+class Vector2D
+{
+public:
+	inline Vector2D(void)									{ }
+	inline Vector2D(float X, float Y)						{ x = X; y = Y; }
+	inline Vector2D operator+(const Vector2D& v)	const	{ return Vector2D(x+v.x, y+v.y);	}
+	inline Vector2D operator-(const Vector2D& v)	const	{ return Vector2D(x-v.x, y-v.y);	}
+	inline Vector2D operator*(float fl)				const	{ return Vector2D(x*fl, y*fl);	}
+	inline Vector2D operator/(float fl)				const	{ return Vector2D(x/fl, y/fl);	}
+	
+	inline float Length(void)						const	{ return (float)sqrt(x*x + y*y );		}
+
+	inline Vector2D Normalize ( void ) const
+	{
+		Vector2D vec2;
+
+		float flLen = Length();
+		if ( flLen == 0 )
+		{
+			return Vector2D( (float)0, (float)0 );
+		}
+		else
+		{
+			flLen = 1 / flLen;
+			return Vector2D( x * flLen, y * flLen );
+		}
+	}
+
+	vec_t	x, y;
+};
+
+inline float DotProduct(const Vector2D& a, const Vector2D& b) { return( a.x*b.x + a.y*b.y ); }
+inline Vector2D operator*(float fl, const Vector2D& v)	{ return v * fl; }
+
+//=========================================================
+// 3D Vector
+//=========================================================
+class Vector						// same data-layout as engine's vec3_t,
+{								//		which is a vec_t[3]
+public:
+	// Construction/destruction
+	inline Vector(void)								{ }
+	inline Vector(float X, float Y, float Z)		{ x = X; y = Y; z = Z;						}
+	inline Vector(double X, double Y, double Z)		{ x = (float)X; y = (float)Y; z = (float)Z;	}
+	inline Vector(int X, int Y, int Z)				{ x = (float)X; y = (float)Y; z = (float)Z;	}
+	inline Vector(const Vector& v)					{ x = v.x; y = v.y; z = v.z;				} 
+	inline Vector(float rgfl[3])					{ x = rgfl[0]; y = rgfl[1]; z = rgfl[2];	}
+
+	// Operators
+	inline Vector operator-(void) const				{ return Vector(-x,-y,-z);				}
+	inline int operator==(const Vector& v) const	{ return x==v.x && y==v.y && z==v.z;	}
+	inline int operator!=(const Vector& v) const	{ return !(*this==v);					}
+	inline Vector operator+(const Vector& v) const	{ return Vector(x+v.x, y+v.y, z+v.z);	}
+	inline Vector operator-(const Vector& v) const	{ return Vector(x-v.x, y-v.y, z-v.z);	}
+	inline Vector operator*(float fl) const			{ return Vector(x*fl, y*fl, z*fl);		}
+	inline Vector operator/(float fl) const			{ return Vector(x/fl, y/fl, z/fl);		}
+	
+	// Methods
+	inline void CopyToArray(float* rgfl) const		{ rgfl[0] = x, rgfl[1] = y, rgfl[2] = z; }
+	inline float Length(void) const					{ return (float)sqrt(x*x + y*y + z*z); }
+	operator float *()								{ return &x; } // Vectors will now automatically convert to float * when needed
+	operator const float *() const					{ return &x; } // Vectors will now automatically convert to float * when needed
+	inline Vector Normalize(void) const
+	{
+		float flLen = Length();
+		if (flLen == 0) return Vector(0,0,1); // ????
+		flLen = 1 / flLen;
+		return Vector(x * flLen, y * flLen, z * flLen);
+	}
+
+	inline Vector2D Make2D ( void ) const
+	{
+		Vector2D	Vec2;
+
+		Vec2.x = x;
+		Vec2.y = y;
+
+		return Vec2;
+	}
+	inline float Length2D(void) const					{ return (float)sqrt(x*x + y*y); }
+
+	// Members
+	vec_t x, y, z;
+};
+
+inline Vector operator*(float fl, const Vector& v)	{ return v * fl; }
+inline float DotProduct(const Vector& a, const Vector& b) { return(a.x*b.x+a.y*b.y+a.z*b.z); }
+inline Vector CrossProduct(const Vector& a, const Vector& b) { return Vector( a.y*b.z - a.z*b.y, a.z*b.x - a.x*b.z, a.x*b.y - a.y*b.x ); }
+
+#endif
\ No newline at end of file
diff --git a/main/source/common/weaponinfo.h b/main/source/common/weaponinfo.h
new file mode 100644
index 00000000..39ee1935
--- /dev/null
+++ b/main/source/common/weaponinfo.h
@@ -0,0 +1,52 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined ( WEAPONINFOH )
+#define WEAPONINFOH
+#ifdef _WIN32
+#pragma once
+#endif
+
+// Info about weapons player might have in his/her possession
+typedef struct weapon_data_s
+{
+	int			m_iId;
+	int			m_iClip;
+
+	float		m_flNextPrimaryAttack;
+	float		m_flNextSecondaryAttack;
+	float		m_flTimeWeaponIdle;
+
+	int			m_fInReload;
+	int			m_fInSpecialReload;
+	float		m_flNextReload;
+	float		m_flPumpTime;
+	float		m_fReloadTime;
+
+	float		m_fAimedDamage;
+	float		m_fNextAimBonus;
+	int			m_fInZoom;
+	int			m_iWeaponState;
+
+	int			iuser1;
+	int			iuser2;
+	int			iuser3;
+	int			iuser4;
+	float		fuser1;
+	float		fuser2;
+	float		fuser3;
+	float		fuser4;
+} weapon_data_t;
+
+#endif
diff --git a/main/source/curl/CHANGES b/main/source/curl/CHANGES
new file mode 100644
index 00000000..a58f6d6c
--- /dev/null
+++ b/main/source/curl/CHANGES
@@ -0,0 +1,2060 @@
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+                                  Changelog
+
+Version 7.10.5 (19 May 2003)
+
+Daniel (15 May)
+- Changed the order for the in_addr_t testing, as 'unsigned long' seems to be
+  a very common type inet_addr() returns.
+
+Daniel (14 May)
+- George Comninos provided a fix that calls the progress meter when waiting
+  for FTP command responses take >1 second. It'll make applications more
+  "responsive" even when dealing with very slow ftp servers.
+
+Daniel (12 May)
+- George Comninos pointed out that libcurl uploads had two quirks:
+   o when using FTP PORT command, it used blocking sockets!
+   o it could loop a long time without doing progress meter updates
+  Both items are fixed now.
+
+Daniel (9 May)
+- Dan Fandrich changed CURLOPT_ENCODING to select all supported encodings if
+  set to "".  This frees the application from having to know which encodings
+  the library supports.
+
+- Dan Fandrich pointed out we had three unnecessary files in CVS that is
+  generated with libtoolize, so they're now removed and libtoolize is invoked
+  accordingly in the buildconf script.
+
+- Avery Fay found out that the CURLOPT_INTERFACE way of first checking if the
+  given name is a network interface gave a real performance penalty on Linux,
+  so now we more appropriately first check if it is an IP number and if so
+  we don't check for a network interface with that name.
+
+- CURLOPT_FTP_USE_EPRT added. Set this to FALSE to disable libcurl's attempts
+  to use EPRT and LPRT before the traditional PORT command. The command line
+  tool sets this option with '--disable-eprt'.
+
+Version 7.10.5-pre2 (6 May 2003)
+
+Daniel (6 May)
+- Kevin Delafield reported another case where we didn't correctly check for
+  EAGAIN but only EWOULDBLOCK, which caused badness on HPUX.
+
+Daniel (4 May)
+- Ben Greear noticed that the check for 'writable argv' exited the configure
+  script when run for cross-compiling, which wasn't nice. Now it'll default to
+  no and output a warning about the fact that it was not checked for.
+
+Daniel (2 May)
+- Added test case 62 and fixed some more on the cookie sending with a custom
+  Host: header set.
+
+Daniel (1 May)
+- Andy Cedilnik fixed a few compiler warnings.
+
+- Made the "SSL read error: 5" error message more verbose, by adding code that
+  queries the OpenSSL library to fill in the error buffer.
+
+Daniel (30 Apr)
+- Added sys/select.h include in the curl/multi.h file, after having been
+  reminded about this by Rich Gray.
+
+- I made each test set its own server requirements, thus abandoning the
+  previous system where the test number implied what server(s) to use for a
+  specific test.
+
+- David Balazic made curl more RFC1738-compliant for FTP URLs, by fixing so
+  that libcurl now uses one CWD command for each path part. A bunch of test
+  cases were fixed to work accordingly.
+
+- Cookie fixes:
+
+  A. Save domains in jars like Mozilla does. It means all domains set in
+     Set-Cookie: headers are dot-prefixed.
+  B. Save and use the 'tailmatch' field in the Mozilla/Netscape cookie jars
+     (the second column).
+  C. Reject cookies using illegal domains in the Set-Cookie: line. Concerns
+     both domains with too few dots or domains that are outside the currently
+     operating server host's domain.
+  D. Set the path part by default to the one used in the request, if none was
+     set in the Set-Cookie line.
+
+  To make item C really good, I also made libcurl notice custom Host: headers
+  and extract the host name set in there and use that as the host name for the
+  site we're getting the cookies from. This allows user to specify a site's
+  IP-address, but still be able to receive and send its cookies properly if
+  you provide a valid Host: name for the site.
+
+Daniel (29 Apr)
+- Peter Kovacs provided a patch that makes the CURLINFO_CONNECT_TIME work fine
+  when using the multi interface (too).
+
+Version 7.10.5-pre1 (23 Apr 2003)
+
+Daniel (23 Apr)
+- Upgraded to libtool 1.5.
+
+Daniel (22 Apr)
+- Peter Sylvester pointed out that curl_easy_setopt() will always (wrongly)
+  return CURLE_OK no matter what happens.
+
+- Dan Fandrich fixed some gzip decompression bugs and flaws.
+
+Daniel (16 Apr)
+- Fixed minor typo in man page, reported in the Debian bug tracker.
+
+Daniel (15 Apr)
+- Fixed some FTP tests in the test suite that failed on my Solaris host, due
+  to the config.h not being included before the system headers. When done that
+  way, it did get a mixed sense of if big files are supported or not and then
+  stat() and fstat() (as used in test case 505) got confused and failed to
+  return a proper file size.
+
+- Formposting a file using a .html suffix is now properly set to Content-Type:    text/html.
+
+Daniel (14 Apr)
+- Fixed the SSL error handling to return proper SSL error messages again, they
+  broke in 7.10.4. I also attempt to track down CA cert problems and then
+  return the CURLE_SSL_CACERT error code.
+
+- The curl tool now intercepts the CURLE_SSL_CACERT error code and displays
+  a fairly big and explanatory error message. Kevin Roth helped me out with
+  the wording.
+
+Daniel (11 Apr)
+- Nic Hines provided a second patch for gzip decompression, and fixed a bug
+  when deflate or gzip contents were downloaded using chunked encoding.
+
+- Dan Fandrich made libcurl support automatic decompression of gzip contents
+  (as an addition to the previous deflate support).
+
+- I made the CWD command during FTP session consider all 2xy codes to be OK
+  responses.
+
+Daniel (10 Apr)
+- Vlad Krupin fixed a URL parsing issue. URLs that were not using a slash
+  after the host name, but still had "?" and parameters appended, as in
+  "http://hostname.com?foobar=moo", were not properly parsed by libcurl.
+
+Daniel (9 Apr)
+- Made CURLOPT_TIMECONDITION work for FTP transfers, using the same syntax as
+  for HTTP. This then made -z work for ftp transfers too. Added test case 139
+  and 140 for verifying this.
+
+- Getting the file date of an ftp file used the wrong time zone when
+  displayed. It is supposedly always GMT. Added test case 141 for this.
+
+- Made the test suite's FTP server support MDTM.
+
+- The default DEBUGFUNCTION, as enabled with CURLOPT_VERBOSE now outputs
+  CURLINFO_HEADER_IN data as well. The most notable effect from this is that
+  using curl -v, you get to see the incoming "headers" as well. This is
+  perhaps most useful when doing ftp.
+
+Daniel (8 Apr)
+- James Bursa fixed a flaw in the Content-Type extraction code, which missed
+  the first letter if no space followed the colon.
+
+- Magnus Nilsson pointed out that share.c was missing in the MSVC project
+  file.
+
+Daniel (6 Apr)
+- Ryan Weaver provided a patch that makes the CA cert bundle not get installed
+  anymore when 'configure --without-ssl' has been used.
+
+Daniel (4 Apr)
+- Martijn Broenland found another cases where a server application didn't
+  like the boundary string used by curl when foing a multi-part/formpost. We
+  modified the boundary string to look like the one IE uses, as this is
+  probably gonna make curl work with more applications.
+
+Daniel (3 Apr)
+- Kevin Roth reported that a bunch of tests fails on cygwin. One set fails
+  when using perl 5.8 (and they run fine with perl 5.6), and another set
+  failed because of an artifact in the test suite's FTP server that I
+  corrected. It turned out the FTP server code was still having a file opened
+  while the main test script removed it and invoked the HTTP server that
+  attempted to create the same file name of the file the FTP server kept open.
+  This operation works fine on unix, but not on cygwin.
+
+Version 7.10.4 (2 Apr 2003)
+
+Daniel (1 Apr)
+- Added test case 505 to exercise FTP upload with rename done with libcurl,
+  and for that I had to extend the test suite's FTP server to deal with the
+  RNFR and RNTO commands.
+
+Daniel (31 Mar)
+- Even more SSL config check modifications after Richard's testing.
+
+Version 7.10.4-pre6 (31 Mar 2003)
+
+Daniel (31 Mar)
+- More fixes for the SSL session ID cache checks when SSL configs are changed
+  between connections. Based on tests and talks with Richard Bramante.
+
+- Guillaume Cottenceau provided a patch that added CURLOPT_UNRESTRICTED_AUTH.
+  When enabled, it will prevent libcurl from limiting to which host it sends
+  user+password to when following locations. By default, libcurl only sends
+  name and password to the original host used in the first URL, but with this
+  option set it will send the auth info to all hosts it follows location
+  headers to. The new tool command line option for this is named
+  "--location-trusted".
+
+- Frankie Fong reported a problem with libcurl if you re-used an easy handle
+  with a proxy, and you first made a https:// connction to a host and then
+  switched to a http:// one to the same host. libcurl would then wrongly re-use
+  the same connection for it and fail to get the second URL properly
+
+Daniel (29 Mar)
+- Dan Shearer's fix that makes curl complain if invoked with nothing but "curl
+  -O" was applied.
+
+Daniel (26 Mar)
+- Bryan Kemp was friendly enough to lend me an account on his Redhat 9 box and
+  I could fix the configure problems on redhat 8.1 and 9 in no time thanks to
+  this. Thanks a bunch Bryan!
+
+Daniel (25 Mar)
+- Renamed configure.in to configure.ac
+
+Version 7.10.4-pre5 (25 Mar 2003)
+
+Daniel (25 Mar)
+- Richard Bramante provided a fix for a handle re-use problem seen when you
+  change options on an SSL-enabled connection between requests. Previously,
+  changing peer verification or host verification and similar things was not
+  taken into account when a connection were checked for re-use and thus
+  enabling stricter check between requests on a re-used connection made no
+  difference and the connection would thus be used erroneously.
+
+Daniel (24 Mar)
+- Götz Babin-Ebell pointed out that the ca-bundle.crt file contained a
+  certificate from Trustcenter that was a demo certificate only that was never
+  indended to be part of a CA bundle.
+
+Daniel (21 Mar)
+- Life is a mystery. Within a time period of 17 hours, Tim Pope and Michael
+  Churchill filed one bug report each, both identifying problems with a second
+  transfer when doing persistant transfers re-using a connection. Tim's one is
+  #706624, labeled "Multiple uploads per handle fail" and Michael's #707003
+  "Does not send Authorization: header when reusing connection". I could track
+  both down to the same piece of logic and it turned out libcurl was not using
+  new settings properly when re-using an existing connection. This concerned
+  both uploading and downloading and involved exactly those pieces these two
+  reports identified. This code has been this faulty since the day I
+  introduced persistant connection support in libcurl, more than 2 years ago.
+
+Daniel (20 Mar 2003)
+- Five year anniversary. Today five years ago, the first ever curl release saw
+  the light of day.
+
+Daniel (17 Mar)
+- Andy Cedilnik corrected flaws in some libcurl example-usage sources.
+
+Daniel (16 Mar)
+- Juan F. Codagnone reported that the fix from March 2nd was incomplete.
+
+- Added code to the configure.in to check for select() argument types. I've
+  not made any code use the results just yet though.
+
+Daniel (15 Mar)
+- Gisle Vanem provided two patches to build better on Windows.
+
+- Adjusted the test suite code to better make sure that the server(s) required
+  for a specific test is properly started before the test case is attempted.
+  Many tests now run a lot faster than before.
+
+Daniel (14 Mar)
+- Another configure.in adjustment made the configure detect functions properly
+  on HPUX now.
+
+Daniel (13 Mar)
+- Philippe Raoult fixed pre4-compile quirks for FreeBSD.
+
+Version 7.10.4-pre4 (13 Mar 2003)
+
+Daniel (13 Mar)
+- Added a backup-check for functions that aren't found by AC_CHECK_FUNCS()
+  as I believe some checks on HPUX need this. At least some of the info given
+  to us by Rick Jones seemed to indicate this.
+
+Daniel (12 Mar)
+- Thomas Tonino found out that if you used the curl tool to do PUT operations
+  as in 'curl www.foo.com/dir/ -T file' and the file name included for example
+  space or other characters that don't belong in URLs, curl did not properly
+  URL encode them before using them in the URL.
+
+- Added an option to configure called --enable-libgcc that simply adds -lgcc
+  to the LIBS variable, as this seems to be a common problem.
+
+- I modified the configure.in file, so that the headers are now checked in an
+  order of "viality". We must also make sure to use the "default headers"
+  parameter to AC_CHECK_HEADERS() so that headers are checked with the proper
+  prerequisites included (i.e all the major and generally important header
+  files are included there by default). This might be what we need for various
+  Sun, HP, AIX and Tru64 systems to behave good again on the header check
+  front.
+
+- Rick Jones pointed out a few compiler warnings on HP-UX that I addressed.
+
+- I made the configure --help output nicer by using AC_HELP_STRING() a lot
+  more.
+
+Daniel (11 Mar)
+- Christophe Demory fixed the socket sending code to work better on HP-UX
+  when sending data to a socket that would block. It then returns EAGAIN, not
+  EWOULDBLOCK.
+
+- Richard Gorton improved the seeding function for systems without a good
+  and reliable random source.
+
+- Richard Gorton fixed a few warnings that popped up when you built curl
+  using the Sun compiler on a 64bit SPARC platform.
+
+- Martin C. Martin fixed a case where a connect failure using the multi
+  interface didn't produce a human readable error string.
+
+Daniel (10 Mar)
+- Reverted ltmain.sh back to libtool 1.4.2 status again, as the 1.4.3 version
+  broke the build on numerous platforms. It seems that libtool 1.4.3 puts some
+  requirements on what versions of the other tools (autoconf + automake) that
+  I am not familiar with and thus I couldn't fulfill at this point.
+
+  Yes, this is more than mildly frustrating.
+
+Daniel (7 Mar)
+- Run libtoolize version 1.4.3.
+
+Version 7.10.4-pre3 (4 Mar 2003)
+
+Daniel (3 Mar)
+- Added share.obj to the VC6 and Borland libcurl makefiles.
+
+- Troels Walsted Hansen found and investigated a problem with libcurl on AIX,
+  presumably only on 4.3 or later. gethostbyname_r() is not returning data
+  that is possible to "keep" and cache the way libcurl does. But instead these
+  versions of AIX uses a gethostbyname() that works thread-safely we can
+  instead use the ordinary gethostbyname() and our pack_hostent() approach to
+  achieve what we want. The configure script now attempts to detect AIX 4.3 or
+  later to adjust for this.
+
+Daniel (2 Mar)
+- Juan F. Codagnone found a problem introduced in 7.10.3 when you first did a
+  POST and then back to a GET using the same easy handle.
+
+Daniel (28 Feb)
+- Removed the strequal and strnequal defines from curl/curl.h header. They
+  were never meant for the public header anyway. Philippe Raoult brought it
+  up.
+
+- James Bursa fixed the RISC OS build.
+
+Daniel (27 Feb)
+- Avery Fay pointed out the very misleading curl_multi_info_read man page, and
+  I updated it to become more accurate.
+
+- Salvatore Sorrentino found a problem with FTP downloading that turned out to
+  be his FTP server returning size zero (0 bytes) when SIZE was used on a file
+  while being in BINARY mode. We now make a second check for the actual size
+  by scanning the RETR reply anyway, even if the SIZE command returned 0.
+
+Daniel (26 Feb)
+- Kyle Sallee reported a case where he would do a transfer that didn't update
+  the progress meter properly. It turned out to be a case where libcurl would
+  loop a little too eagerly in the tranfer loop, which isn't really good for
+  the APIs, especially not the multi API.
+
+Version 7.10.4-pre2 (24 Feb 2003)
+
+Daniel (24 Feb)
+- Kjetil Jacobsen found out that setting CURLOPT_MAXCONNECTS to a value higher
+  than 5 could cause a segfault.
+
+- I believe I fixed the 'Expect: 100-continue' behavior that has been broken
+  for a while (I think since my change dated Dec 10 2002). When this header is
+  used, libcurl should wait for a HTTP 100 (or timeout) before sending the
+  post/put data.
+
+Daniel (14 Feb)
+- Matthew Clarke provided some info what to modify to make curl build
+  flawlessly on AIX 3.2.5.
+
+- Martin C. Martin found and fixed a problem in the multi interface when
+  running on Windows and trying to connect to a port without a listener.
+
+Daniel (13 Feb)
+- Christopher R. Palmer fixed Curl_base64_encode() to deal with zeroes in the
+  data to encode.
+
+Daniel (4 Feb)
+- Jean-Philippe added the first code that enables the 'share' system. This
+  should now enable sharing of DNS data between two curl easy handles.
+
+- Incorporated Nico Baggus' fixes to again compile flawlessly on VMS.
+
+- James Bursa corrected a bad comment in the public include file curl/multi.h
+
+- Peter Forret reported one of those error:00000000 cases in libcurl again
+  when connecting to a HTTPS site, and this time I did discover some oddities
+  in how curl reports SSL errors back. It could miss showing the actual error.
+
+Version 7.10.4-pre1 (3 Feb 2003)
+
+Daniel (3 Feb)
+- Removed things in the docs saying capath doesn't work on Windows, as Julian
+  Noble told us it works fine.
+
+Daniel (31 Jan)
+- Kevin Roth fixed the zlib build stuff in the Mingw32 makefile.
+
+Daniel (30 Jan)
+- Kevin Roth found out that curl on Windows always checked for the CA cert
+  bundle using the environment variable and the path scan, even though
+  -k/--insecure was used.
+
+- Hamish Mackenzie pointed out that curl only did strict host name verifying
+  if capath or cainfo was used. Now it'll always do it unless -k / --insecure
+  is used!
+
+- Pavel Cenek pointed out that the Content-Type extraction was done wrongly
+  as the full string was not fetched. Added test case 57 to verify that curl
+  does it right now.
+
+Daniel (29 Jan)
+- Jamie Wilkinson provided a patch that now makes curl attempt to clear out
+  "sensitive" command line arguments so that they don't appear in ps outputs
+  (only on platforms that allow writing to argv[]).
+
+- John McGowan found out that the DEBUGFUNCTION could be called with bad
+  arguments and thus cause the --trace outputs to go wrong.
+
+- Removed all the emacs local variables from all files. Mats Lidell provided
+  the new sample.emacs file (for a sample of what to include in your .emacs)
+  and the curl-style.el that sets a better c-style for editing curl sources.
+
+- Dave Halbakken found a problem with FTP downloads that could accidently
+  return CURLE_PARTIAL_FILE when curl_easy_perform() was called with NOBODY
+  set TRUE.
+
+Daniel (27 Jan)
+- The fopen.c example was flawed as Nick Humfrey noticed, and I fixed it to
+  work again.
+
+Daniel (24 Jan)
+- Bertrand Demiddelaer found and fixed a memory leak (the content-type string)
+  when following locations.
+
+Daniel (22 Jan 2003)
+- Ian Wilkes and Legoff Vincent both independently provided fixes for making
+  curl/multi.h work properly when compiled with a C++ compiler.
+
+Daniel (20 Jan 2003)
+- Fixed 'buildconf' to check version number of the required tools before
+  they're actually used.
+
+- Wrote 'testcurl.sh', a script targeted for automatic and distributed curl
+  tests on various platforms.
+
+- David Thiel pointed out that the .netrc file was not being dealt with
+  properly anymore. I broke this in the password prompting "fix".
+
+- Markus F.X.J. Oberhumer patched libcurl to allocate the scratch buffer only
+  on demand and thus we save 32KB in each curl handle that don't use that
+  buffer. This need appeared when some people started using thousands of
+  simultaneous curl handles... :-)
+
+Daniel (16 Jan 2003)
+- Markus Oberhumer fixed curl-config --cflags when the includedir was not
+  /usr/include.
+
+- Markus Oberhumer fixed CURLINFO_PRIVATE to properly return NULL if it was
+  set to NULL!
+
+Version 7.10.3 (14 Jan 2003)
+
+Daniel (10 Jan 2003)
+- Steve Oliphant pointed out that test case 105 did not work anymore and this
+  was due to a missing fix for the password prompting.
+
+Version 7.10.3-pre6 (10 Jan 2003)
+
+Daniel (9 Jan 2003)
+- Bryan Kemp pointed out that curl -u could not provide a blank password
+  without prompting the user. It can now. -u username: makes the password
+  empty, while -u username makes curl prompt the user for a password.
+
+- Kjetil Jacobsen found a remaining connect problem in the multi interface on
+  ipv4 systems (Linux only?), that I fixed and Kjetil verified that it fixed
+  his problems.
+
+- memanalyze.pl now reads a file name from the command line, and no longer
+  takes the data on stdin as before.
+
+Version 7.10.3-pre5 (9 Jan 2003)
+
+Daniel (9 Jan 2003)
+- Fixed tests/memanalyze.pl to work with file names that contain colons (as on
+  Windows).
+  
+- Kjetil Jacobsen quickly pointed out that lib/share.h was missing...
+
+Version 7.10.3-pre4 (9 Jan 2003)
+
+Daniel (9 Jan 2003)
+- Updated lib/share.c quite a bit to match the design document at
+  http://curl.haxx.se/dev/sharing.txt a lot more.
+
+  I'll try to update the document soonish. share.c is still not actually used
+  by libcurl, but the API is slowly getting there and we can start
+  implementing code that takes advantage of this system.
+
+Daniel (8 Jan 2003)
+- Updated share stuff in curl/curl.h, including data types, structs and
+  function prototypes. The corresponding files in lib/ were also modified
+  of course to remain compilable. Based on input from Jean-Philippe and also
+  to make it more in line with the design document.
+
+- Jean-Philippe Barrette-LaPierre patched a very trivial memory leak in
+  curl_escape() that would happen when realloc() returns NULL...
+
+- Matthew Blain provided feedback to make the --create-dirs stuff build
+  properly on Windows.
+
+- Fixed the #include in tests/libtest/first.c as Legoff Vincent pointed out.
+
+Daniel (7 Jan 2003)
+- Philippe Raoult provided a patch that now makes libcurl properly support
+  wildcard checks for certificate names.
+
+- Simon Liu added CURLOPT_HTTP200ALIASES, to let an application set other
+  strings recognized as "HTTP 200" to allow http-like protocols to get
+  downloaded fine by curl.
+
+- Now using autoconf 2.57 and automake 1.7.2
+
+- Doing "curl -I ftp://domain/non-existing-file" still outputed a date!
+  Wayne Haigh reported.
+
+- The error message is now written properly with a newline in the --trace
+  file.
+
+Daniel (6 Jan 2003)
+- Sterling Hughes fixed a possible bug: previously, if you called
+  curl_easy_perform and then set the global dns cache, the global cache
+  wouldn't be used. Pointed out by Jean-Philippe Barrette-LaPierre.
+
+- Matthew Blain's fixed the VC6 libcurl makefile to include better debug data
+  on debug builds.
+
+Daniel (27 Dec 2002)
+- Philippe Raoult reported a bug with HTTPS connections which I evidently
+  added in my 19 dec fix. I corrected it.
+
+Daniel (20 Dec)
+- Idea from the Debian latest patch: use AM_MAINTAINER_MODE in the configure
+  script to make the default makefile less confusing "to the casual
+  installer".
+
+Version 7.10.3-pre3 (20 Dec)
+
+Daniel (19 Dec)
+- Matthew Blain patched the Curl_base64_decode() function.
+
+- Evan Jordan reported in bug report #653022 that the SSL_read() usage was
+  wrong, and it certainly was. It could lead to curl using too much CPU due to
+  a stupid loop.
+
+Daniel (18 Dec)
+- As suggested by Margus Freudenthal, CURLE_HTTP_NOT_FOUND was renamed to
+  CURLE_HTTP_RETURNED_ERROR since it is returned on any >= 400 code when
+  CURLOPT_FAILONERROR is set.
+
+Daniel (17 Dec)
+- Bug reported #651464, reported by Christopher Palmer, provided an example
+  source code using the multi interface that hang when trying to connect to a
+  proxy on a localhost port where no proxy was listening. This bug was not
+  repeatable on libcurls that were IPv6-enabled.
+
+Daniel (16 Dec)
+- Christopher Palmer also noticed what Vojtech Janota already was
+  experiencing: The attempted name resolve fix for glibc 2.2.93 caused libcurl
+  to crash when used on some older glibc versions. The problem is of course
+  the silliness of the 2.2.93. I committed a fix that hopefully should make
+  the binary run fine on either one of the versions, even though the solution
+  is not as nice as I'd like it to be.
+
+Daniel (13 Dec)
+- Bug report #651460 by Christopher R. Palmer showed that when using libcurl
+  to for example go over a proxy on localhost, it would attempt to connect
+  through the proxy TWICE.
+
+  I added test case 503 with which I managed to repeat this problem and I
+  fixed the code to not re-attempt any connects (which also made it a nicer
+  fix for the #650941 bug mentioned below).
+
+  The sws server was extended to deal with CONNECT in order to make test
+  case 503 do good.
+
+- Evan Jordan posted bug report #650989 about a memory leak in the public key
+  retrieving code. He provided a suggested fix and I merely applied it!
+
+- Bug report #650941, posted by Christopher R. Palmer identified a problem
+  with the multi interface and getting file:// URLs. This was now fixed and
+  test case 502 was added to verify this.
+
+Daniel (12 Dec)
+- Test case 500 and 501 are the first ever libcurl test cases that run.
+
+- Made "configure --enable-debug" cut off all -O* options to the compiler
+
+- Finally fixed the test suite's ftp server so that test case 402 doesn't
+  cause the following test case to fail anymore!
+
+Daniel (11 Dec)
+- CURL_MAX_WRITE_SIZE is now decreased to 16KB since it makes the Windows
+  version perform uploads much faster!!! RBramante did lots of research on
+  this topic.
+
+- Fixed the #include in curl/curl.h to include the other files outside the
+  extern "C" scope.
+
+Daniel (10 Dec)
+- Moved around and added more logic:
+
+  First, POST data is never sent as part of the request headers in the http.c
+  code. It is always sent the "normal" read callback then send() way. This now
+  enables a plain HTTP POST to be sent chunked if we want to. This also
+  reduces the risk of having very big POSTs causing problems.
+
+  Further, sending off the initial HTTP request is not done using a loop
+  anymore. If it wasn't all sent off in the first send(), the rest of the
+  request is sent off in the normal transfer select() loop. This makes several
+  things possible, but mainly it makes libcurl block less when used from the
+  multi interface and it also reduces the risk of problems with issuing very
+  large requests.
+
+Daniel (9 Dec)
+- Moved the read callback pointer and data within the structs to a more
+  suitable place. This in preparation for a better HTTP-request sending code
+  without (a silly) loop.
+
+- The Dodds fix seems not to work.
+
+- Vojtech Janota tests proved that the resolve fix from oct 21st is not good
+  enough since obviously older glibcs might return EAGAIN without this meaning
+  that the buffer was too small.
+
+- [the other day] Made libcurl loop on recv() and send() now until done, and
+  then get back to select(). Previously it went back to select() more often
+  which really was a slight overhead. This was due to the reported performance
+  problems on HTTP PUT on Windows. I couldn't see any notable difference on
+  Linux...
+
+Version 7.10.3-pre2 (4 Dec 2002)
+
+Daniel (4 Dec 2002)
+- Lots of work with Malcolm Dodds made me add a temporary code fix that now
+  shortens the timeout waiting for the 226 or 250 line after a completed
+  FTP transfer.
+
+  If no data is received within 60 seconds, this is taken as a sign of a dead
+  control connection and we bail out.
+
+Daniel (3 Dec 2002)
+- Ralph's bug report #644841 identified a problem in which curl returned a
+  timeout error code when in fact the problem was not a timeout. The proper
+  error should now be propagated better when they're detected in the FTP
+  response reading function.
+
+- Updated the Borland Makefiles.
+
+Daniel (2 Dec 2002)
+- Nicolas Berloquin provided a patch that introduced --create-dirs to the
+  command line tool. When used in combination with -o, it lets curl create
+  [non-existing] directories used in -o, suitably used with #-combinations
+  such as:
+
+     curl "www.images.com/{flowers,cities,parks,mountains}/pic_[1-100].jpg \
+       -o "dir_#1/pic#2.jpg" --create-dirs
+
+Version 7.10.3-pre1
+
+Daniel (28 Nov 2002)
+- I visited Lars Nordgren and had a go with his problem, which lead me to
+  implement this fix. If libcurl detects the added custom header
+  "Transfer-Encoding: chunked", it will now enable a chunked transfer.
+
+  Also, chunked transfer didn't quite work before but seems to do so now.
+
+- Kjetil Jacobsen pointed out that ./configure --disable-ipv6 --without-zlib
+  didn't work on any platform...
+
+Daniel (26 Nov 2002)
+- Fixed a bad addrinfo free in the hostip.c code, hardly exposed anywhere
+
+- Dan Becker found and fixed a minor memory leak on persistent connnections
+  using CURLOPT_USERPWD.
+
+Daniel (22 Nov 2002)
+- Based on Ralph Mitchell's excellent analysis I found a bug in the test suite
+  web server (sws) which now lets test case 306 run fine even in combination
+  with the other test cases.
+
+- Juan Ignacio Hervás found a crash in the verbose connect message that is
+  used on persistent connections. This bug was added in 7.10.2 due to the
+  rearranged name resolve code.
+
+Daniel (20 Nov 2002)
+- Kjetil Jacobsen provided a patch that introduces:
+
+   CURLOPT_PRIVATE stores a private pointer in the curl handle.
+
+   CURLINFO_PRIVATE retrieves the private pointer from the curl handle.
+
+- Karol Pietrzak pointed out how curl-config --cflags didn't output a good
+  include dir so I've removed that for now.
+
+Version 7.10.2 (18 Nov 2002)
+
+Daniel (11 Nov 2002)
+- Dave Halbakken added curl_version_info to lib/libcurl.def to make libcurl
+  properly build with MSVC on Windows.
+
+Daniel (8 Nov 2002)
+- Doing HTTP PUT without a specified file size now makes libcurl use
+  Transfer-Encoding: chunked.
+
+Daniel (7 Nov 2002)
+- Bug report #634625 identified how curl returned timeout immediately when
+  CURLOPT_CONNECTTIMEOUT was used and provided a fix.
+
+Version 7.10.2-pre4 (6 Nov 2002)
+
+Daniel (5 Nov 2002)
+- Lehel Bernadt found out and fixed. libcurl sent error message to the debug
+  output when it stored the error message.
+
+- Avery Fay found some problems with the DNS cache (when the cache time was
+  set to 0 we got a memory leak, but when the leak was fixed he got a crash
+  when he used the CURLOPT_INTERFACE with that) that had me do some real
+  restructuring so that we now have a reference counter in the dns cache
+  entries to prevent an entry to get flushed while still actually in use.
+
+  I also detected that we previously didn't update the time stamp when we
+  extracted an entry from the cache so that must've been a reason for some
+  very weird dns cache bugs.
+
+Version 7.10.2-pre3
+
+Daniel (31 Oct 2002)
+- Downgraded automake to 1.6.3 in an attempt to fix cygwin problems. (It
+  turned out this didn't help though.)
+
+- Disable the DNS cache (by setting the timeout to 0) made libcurl leak
+  memory. Avery Fay brought the example code that proved this.
+
+Version 7.10.2-pre2
+
+Daniel (28 Oct 2002)
+- Upgraded to autoconf 2.54 and automake 1.7 on the release-build host.
+
+- Kevin Roth made the command line tool check for a CURL_CA_BUNDLE environment
+  variable (if --cacert isn't used) and if not set, the Windows version will
+  check for a file named "curl-ca-bundle.crt" in the current directory or the
+  directory where curl is located. That file is then used as CA root cert
+  bundle.
+
+- Avery Fay pointed out that curl's configure scrip didn't get right if you
+  used autoconf newer than 2.52. This was due to some badly quoted code.
+
+Version 7.10.2-pre1
+
+Daniel (23 Oct 2002)
+- Emiliano Ida confirmed that we now build properly with the Borland C++
+  compiler too. We needed yet another fix for the ISO cpp check in the curl.h
+  header file.
+
+- Yet another fix was needed to get the HTTP download without headers to work.
+  This time it was needed if the first "believed header" was read all in the
+  first read. Test 306 has not run properly since the 11th october fix.
+
+Daniel (21 Oct 2002)
+- Zvi Har'El pointed out a problem with curl's name resolving on Redhat 8
+  machines (running IPv6 disabled). Mats Lidell let me use an account on his
+  machine and I could verify that gethostbyname_r() has been changed to return
+  EAGAIN instead of ERANGE when the given buffer size is too small. This is
+  glibc 2.2.93.
+
+- Albert Chin helped me get the -no-undefined option corrected in
+  lib/Makefile.am since Cygwin builds want it there while Solaris builds don't
+  want it present. Kevin Roth helped me try it out on cygwin.
+  
+- Nikita Schmidt provided a bug fix for a FOLLOWLOCATION bug introduced when
+  the ../ support got in (7.10.1).
+
+Daniel (18 Oct 2002)
+- Fabrizio Ammollo pointed out a remaining problem with FOLLOWLOCATION in
+  the multi interface.
+
+Daniel (17 Oct 2002)
+- Richard Cooper's experimenting proved that -j (CURLOPT_COOKIESESSION) didn't
+  work quite as supposed. You needed to set it *before* you use
+  CURLOPT_COOKIEFILE, and we dont' want that kind of dependencies.
+
+Daniel (15 Oct 2002)
+- Andrés García provided corrections for erratas in four libcurl man pages.
+
+Daniel (13 Oct 2002)
+- Starting now, we generate and include PDF versions of all the docs in the
+  release archives.
+
+Daniel (12 Oct 2002)
+- Trying to connect to a host on a bad port number caused the multi interface
+  to never return failure and it appeared to keep on trying forever (it just
+  didn't do anything).
+
+Daniel (11 Oct 2002)
+- Downloading HTTP without headers didn't work 100%, some of the initial data
+  got written twice. Kevin Roth reported.
+
+- Kevin Roth found out the "config file" parser in the client code could
+  segfault, like if DOS newlines were used.
+
+Version 7.10.1 (11 Oct 2002)
+
+Daniel (10 Oct 2002)
+- Jeff Lawson fixed a few problems with connection re-use that remained when
+  you set CURLOPT_PROXY to "".
+
+Daniel (9 Oct 2002)
+- Craig Davison found a terrible flaw and Cris Bailiff helped out in the
+  search. Getting HTTP data from servers when the headers are split up in
+  multiple reads, could cause junk data to get inserted among the saved
+  headers. This only concerns HTTP(S) headers.
+
+Daniel (8 Oct 2002)
+- Vincent Penquerc'h gave us the good suggestion that when the ERRRORBUFFER
+  is set internally, the error text is sent to the debug function as well.
+
+- I fixed the telnet code to timeout properly as the option tells it to. On
+  non-windows platforms.
+
+Daniel (7 Oct 2002)
+- John Crow pointed out that libcurl-the-guide wasn't included in the release
+  tarball!
+
+- Kevin Roth pointed out that make install didn't do right if build outside
+  the source tree (ca-bundle wise).
+
+- FOLLOWLOCATION bugfix for the multi interface
+
+Daniel (4 Oct 2002)
+- Kevin Roth got problems with his cygwin build with -no-undefined was not
+  present in lib/Makefile.am so I put it back in there again. The poor one who
+  needs to remove it again must write a configure script to detect that need.
+
+- Ralph Mitchell pointed out that curl was a bit naive and didn't deal with ./
+  or ../ stuff in the string passed back in a Location: header when following
+  locations.
+
+- Albert Chin helped me to work out a better configure.in check for zlib, and
+  both --without-zlib and -with-zlib seem to work rather well right now.
+
+- Zvi Har'El improvied the OpenSSL ENGINE check in the configure script to
+  become more accurate.
+
+Daniel (1 Oct 2002)
+- Detlef Schmier pointed out the lack of a --without-libz option to configure,
+  so I added one.
+
+Version 7.10 (1 Oct 2002)
+
+Daniel (30 Sep 2002)
+- Modified the curl_version_info() proto and returned struct once again, and
+  updated the man page accordingly.
+
+- Cris Bailiff found out that the pre-releases crashed on name lookups on
+  names such as "a:" or "baz:" (on Linux versions not being ipv6-enabled) due
+  to some weird return codes from gethostbyname_r(). I'll blame the complete
+  lack of docs in that department. Cris provided a fix, which I modified only
+  slightly.
+
+Daniel (27 Sep 2002)
+- After a suggestion from Christian Kurz to Debian curl package maintainer
+  Domenico Andreoli, I made it possible to override the proxy environment
+  variables better. Now, by setting -x "" you can explicitly tell libcurl to
+  not use a proxy, no matter whan the environment variables say.
+
+Version 7.10-pre4
+
+Daniel (26 Sep 2002)
+- Extended curl_version_info() more and wrote a man page for it.
+
+Daniel (25 Sep 2002)
+- libcurl could leak memory when downloading multiple files using http ranges,
+  reported and fixed by Jean-Luc Guevel.
+
+- Walter J. Mack provided code and docs for the new curl_free() function that
+  shall be used to free memory that is allocated by libcurl and returned back
+  to the application, as curl_escape() and curl_unescape() do.
+
+- Yarram Sunil pointed out a flaw in the multi interface where a failed
+  connection didn't close down properly and thus a second transfer using the
+  same handle failed.
+
+- Andrés García fixed a flaw that made (among other things) dict-fetches
+  return a random value.
+
+Daniel (24 Sep 2002)
+- Wez Furlong brought his initial patch that introduced curl_version_info().
+  We might need to tweak it somewhat before release.
+
+Daniel (20 Sep 2002)
+- Craig Markwardt fixed another Tru64 IP resolve problem.
+
+Daniel (19 Sep 2002)
+- Dolbneff A.V and Spiridonoff A.V made the file:// code work with resumes
+  in the same style other code does.
+
+- Ilguiz Latypov fixed a flaw in the client code when fetching multiple URLs
+  and -C - was used. The first file's resume position was then accidentally
+  reused on all the other files too.
+
+Daniel (18 Sep 2002)
+- The curl_easy_setopt.3 man page was greatly modified and the options have
+  now been grouped in logical groups so that it should be somewhat easier to
+  read it and find things you search for.
+
+Daniel (13 Sep 2002)
+- Kevin Roth pinpointed a scary flaw in libcurl, when the HTTP server doesn't
+  send any headers back, only raw content. Right, that is a violation of the
+  standard but still happens at times and we need to deal with it. Test case
+  306 was added to verify that we do right now.
+
+Version 7.10-pre3
+
+Daniel (11 Sep 2002)
+- Lukasz Czekierda found out that curl didn't send a correct HTTP Host: header
+  when you specified the URL with an IPv6 IP-address.
+
+Daniel (4 Sep 2002)
+- Sven Neuhaus made --silent being acknowledged even when multiple URLs
+  were used. It used to output "[1/2]: http://host/a.html.de --> a.html.d" etc
+  even when told to shut up.
+
+Daniel (3 Sep 2002)
+- Updated all source code headers to use MIT-license references only, and
+  point to the COPYING file and the http://curl.haxx.se/docs/copyright.html
+  URL. I've cut out all references to MPL that I could find.
+
+- Corected the makefiles to not always use -lz when linking
+
+Version 7.10-pre2
+
+Daniel (2 Sep 2002)
+- James Gallagher added Content-Encoding support to libcurl so now curl and
+  libcurl-using apps can request compressed contents using the 'deflate'
+  method. See the special file lib/README.encoding for details.
+
+  curl --compressed is now used to request compressed contents.
+
+  curl-config --feature will include 'libz' if this feature was around when
+  the library was built.
+
+Daniel (30 Aug 2002)
+- Applied an anonymous SOCKS5-proxy patch. Not properly working in all
+  situations though, as all getaddrinfo()-using libcurls will fail on this.
+  This is because of the somewhat naive way the current code tries to extract
+  the IP address of the proxy.
+
+- Fixed up the SSL cert fixes from the other day even more after more inputs
+  from Cris. Added three new SSL error codes to make the
+  CURLE_SSL_CONNECT_ERROR slightly less overloaded.
+
+Daniel (27 Aug 2002)
+- After lots of talk with Tom Zerucha, Nick Gimbrone and Cris Bailiff I
+  decided to talk the bold path and I now made libcurl do CA certificate
+  verification by default. Thus library users need to explicitly turn this off
+  if you want to connect to sites without proper checking. We also install a
+  CA cert bundle on 'make install' now.
+
+  The curl tool now requires the -k/--insecure option in order to allow
+  connections and operations on SSL sites that aren't properly verified with
+  -cafile or --capath.
+
+  curl-config --ca displays the built-in path to the CA cert bundle.
+
+Daniel (26 Aug 2002)
+- Andrew Francis cleaned up some code that now compiles fine without the need
+  for ugly MSVC pragmas.
+
+- Keith MacDonald found a minor bug in src/main.c that made it close stdin
+  instead of the actual file handle. It shouldn't have resulted in much
+  trouble as most operating systems close all file handles on process exit
+  anyway.
+
+Daniel (22 Aug 2002)
+- Markus Oberhumer provided some documentation for his previously provided
+  CURLOPT_NOSIGNAL fix.
+
+- Patched the lib/Makefile.am to hopefully no longer complain on undefined
+  symbols that seemed to occur on builds with shared OpenSSL libraries on
+  Solaris lately...
+
+Daniel (20 Aug 2002)
+- Fixed compiler warnings on MSCV++ compiles. We're looking for help here:
+  remove the pragmas from lib/config-win32.h and adjust the sources where
+  the warnings occur. Hiding them with pragmas like this is not the correct
+  way of dealing with compiler warnings.
+
+Daniel (13 Aug 2002)
+- Ulrich Zadow made the global include files in curl/* include themselves
+  using "curl.h" instead of <curl/curl.h> which thus allows people to more
+  freely decide how to include curl and how to setup their include paths.
+
+- Sterling Hughes added the curl_share* interface, somewhat as discussed
+  previously.
+
+- Jörn Hartroth pointed out that poll() was used in the pre1 source code and
+  it isn't very portable, so now I check for it in the configure script and
+  work around it.
+
+Version 7.9.9-pre1
+
+Daniel (12 Aug 2002)
+- Applied my initial take on making the multi stuff more asynchronous. Connects
+  should now return back without "hanging" until it has connected for real.
+  This should also be the case for FTP-PASV connects.
+
+Daniel (9 Aug 2002)
+- Applied Markus F.X.J. Oberhumer's patch that introduces CURLOPT_NOSIGNAL,
+  which effectively prevents libcurl from doing anything that may cause
+  signals to get sent. This is basicly for multi-threaded applications that
+  now can use timeouts properly, without risking any signals to burst in and
+  ruin the party.
+  
+Daniel (5 Aug 2002)
+- Lukasz Czekierda reported that RFC2732-style literal IPv6 addresses didn't
+  work. When did that code vanish? Anyway, it's back again now and seems to
+  work!
+
+- Jonatan Lander found out that POSTing an empty string didn't work with the
+  command line tool.
+
+Daniel (3 Aug 2002)
+- Jörn Hartroth fixed the libcurl.def file to build the windows DLL with
+  the multi interface enabled.
+
+Daniel (1 Aug 2002)
+- The ftp PORT command now uses a better default IP address, as it will
+  extract and use the local IP address used by the control connection.
+
+- Modified the #include lines in curl/multi.h to work better on more
+  platforms.
+
+Daniel (31 Jul 2002)
+- Attempted a fix for Ray DeGennaro's reported HP-UX host name resolve
+  problems.
+
+Daniel (30 Jul 2002)
+- Priya Ramakrishnan and Ryan Jones compiles curl/curl.h with a C++ compiler
+  and don't get __STDC__ defined, which required us to extend the preprocessor
+  check for the ## operator usage.
+
+- Correct the description for CURLOPT_PASSWDFUNCTION, if set to NULL the
+  internal default function will be put back.
+
+- danfuzz at milk.com found out that libcurl badly assumed a space after
+  'Set-Cookie:' so if it wasn't present, it caused the first letter of the
+  cookie name to fall off!
+
+Daniel (29 Jul 2002)
+- The password prompt asking for user password used stdout and now uses
+  stderr instead to better allow redirecting. It also leaked a fopen() file
+  handle that is now fixed.
+
+Daniel (28 Jul 2002)
+- HAVE_SETVBUF was left out from src/main.c which made -N not work. Found out
+  by M T.
+
+Daniel (26 Jun 2002)
+- Glen Nakamura solved a crash in the name resolving function for IP-only
+  addresses on Alpha Linux (at least).
+
+- T. Bharath corrected the high resolution timer introduced in 7.9.8.
+
+Daniel (22 Jun 2002)
+- Andrés García pointed out man page errors in curl_formadd.3. I fixed.
+
+Daniel (19 Jun 2002)
+- Chris Combes pointed out a flaw in curl_escape(). I fixed. We no longer
+  tries to generate nor parse '+' in URLs. Spaces become %20, and only %-codes
+  are translated by curl_unescape().
+
+Daniel (15 Jun 2002)
+- Added --limit-rate to the curl tool. Allows the user to set a maxmimum
+  upper limit to how much bandwidth to use for transfers.
+
+- CURLOPT_BUFFERSIZE was added to libcurl. This sets a prefered size for the
+  receive buffer in libcurl. The main point of this would be that the write
+  callback gets called more often and with smaller chunks.
+
+Daniel (14 Jun 2002)
+- Yarram Sunil found out that the SocketIsDead() function performed a lot
+  faster on Windows when removing the 1 microsecond timeout.
+
+- Hanno L. Kranzhoff fixed the VC++ project files.
+
+- Tom Mattison found out that ftp transfers closed the connection a little
+  too often.
+
+- Miklos Nemeth posted a VC++ makefile fix and some INSTALL comments on how
+  to disable specific protocols when building for Windows.
+
+Version 7.9.8
+
+Daniel (13 Jun 2002)
+- Time to let this baby go.
+
+Daniel (12 Jun 2002)
+- Chris Combes added three new options for curl_formadd(): CURLFORM_BUFFER,
+  CURLFORM_BUFFERPTR, CURLFORM_BUFFERLENGTH.  They are used to create a
+  multipart that appears as a regular file upload, but the data is provided
+  with a pointer and length.
+  
+- Nico Baggus made the VMS version use sigsetjmp() too.
+
+- Jörn Hartroth fixed the mingw32 build using the mm lib.
+
+- Applied patches by Kris Kennaway that correct format string problems in
+  lib/ftp.c and lib/ldap.c.
+
+Version 7.9.8-pre3
+
+Daniel (11 Jun 2002)
+- James Cone brought the idea of using sigsetjmp() in the signal handler to
+  make the time-out of name lookups to work, even when the underlying name
+  resolver library traps EINTR. The use of sigsetjmp() and siglongjmp() for
+  this may be a bit drastic, and also not likely to exist on all platforms.  I
+  added careful checking for this in the configure script, even checks for it
+  being a macro (which seems to be the case in for example Linux).
+
+  sigsetjmp() seems to be mentioned in the Single Unix specification.
+
+- Miklos Nemeth brought a patch that allows libcurl to get built with specific
+  protocols disabled. This is done by running ./configure
+  --disable-[protocol].
+
+- FTP range downloads could make CURLE_FTP_WRITE_ERROR get returned. We now
+  make precautions to not return this for range downloads.
+
+  Added test case 135 that makes an ftp range download. Had to tweak the
+  runtests.pl script a bit too.
+
+- Bug report #566835 identified a strlen() on a NULL pointer. Added additional
+  check to prevent this.
+
+Daniel (10 Jun 2002)
+- Found and corrected a connect failure problem that didn't create a human
+  error text.
+
+- Added code to compile with OpenSSL 0.9.7. Based on patch from Jacob Meuser
+  and comments from Götz Babin-Ebell.
+
+- Gautam Mani found a socket descriptor leak that happened when FTP transfers
+  failed and you reinvoked curl_easy_perform().
+
+Daniel (5 Jun 2002)
+- Gustaf Hui corrected curl_multi_remove_handle() so that it won't crash no
+  matter when you decide to remove the CURL handle.
+
+- HAVE_RAND_STATUS was added to lib/config-win32.h by Andreas Olsson, as it
+  makes windows builds stop complaining about "weak seeding" when it in fact
+  isn't.
+
+- Another 64bit architecture crash that was introduced in 7.9.7 was now
+  removed, as bug report #564585 clarified. This happened due to our attempts
+  to only allocate only as much memory as is actually needed for name
+  resolving (using realloc) which called for a function that could 'move' a
+  hostent struct in memory.
+
+Version 7.9.8-pre2
+
+Daniel (3 Jun 2002)
+- T. Bharath fixed the CURLINFO_REDIRECT_TIME to return a correct time and
+  made the CURLINFO_REQUEST_SIZE return the correct total request size. He
+  also made the win32 timers use higher resolution than before.
+
+Daniel (29 May 2002)
+- Renaud Chaillat made me aware of the fact that libcurl returned an error if
+  you tried to get an empty FTP file. This seemed like a wrong thing to do, so
+  now it no longer does that! I just hope that no one built anything fancy
+  upon this unexpected behavior...
+
+Daniel (28 May 2002)
+- Cris Bailiff brought CURLOPT_CAPATH that works like CURLOPT_CAINFO but
+  specifies a path to a directory with certificates rather than a single file
+  with them all concatenated. --capath was added to the command line tool
+  for the same function.
+
+  Windows users need to pay attention that the directory should be setup with
+  the c_rehash tool of the OpenSSL package, and that creates symlinks by
+  default that need to be replaced with actual copies to work on Windows.
+
+- Gustaf Hui provided new code that changes how curl_multi_info_read()
+  messages are stored, so that they don't have to be kept around for the multi
+  handle's entire life time. He also made it return failure codes properly
+  which it didn't do before.
+
+Daniel (27 May 2002)
+- Gustaf Hui pointed out that running curl_multi_perform() without doing
+  curl_multi_fdset() first was not really a working combo. I added an internal
+  check for this and have some extra select() code without timeout to make the
+  library internals work identically nevertheless. We might need to somehow
+  either document that once you've used the *_fdset() you should remain using
+  them in select() or you should blank them somehow so that libcurl won't go
+  crazy.
+
+Version 7.9.8-pre1
+
+Daniel (22 May 2002)
+- James Cone brought an excellent patch, including several tests and docs!
+  CURLOPT_NETRC now takes an enum as argument instead of the previous boolean.
+  --netrc-optional was introduced as an addition to --netrc to allow the
+  command line client to take use of all that new netrc stuff.
+
+- Bug report #558888 showed a case where libcurl re-used the previous host
+  name when a connection over a proxy was re-used but to a different target
+  host.
+
+Daniel (21 May 2002)
+- Edin Kadribasic helped me sort out a problem to made libcurl crash when
+  trying to HTTP POST an empty string.
+
+- Clarified that Juergen Wilke donated the original tests/server/sws.c code.
+
+- Jean-Philippe Barrette-LaPierre made curl_formadd() return a typedef named
+  CURLFORMcode instead of the previous 'int', and the various return codes are
+  now globally exported. It allows applications to better figure out what goes
+  wrong when curl_formadd() returns errors.
+
+Daniel (20 May 2002)
+- Roland Zimmermann pointed out that SSL_CTX_use_certificate_chain_file()
+  is prefered to SSL_CTX_use_certificate_file().
+
+Daniel (17 May 2002)
+- Bug report #556869 pointed out that src/writeout.c didn't compile on freebsd
+  after my AIX fixes the other week.
+
+- Bug report #556930 pointed out a FreeBSD core dump introduced in 7.9.7 in
+  the DNS struct realloc stuff. Actually, this crash could happen on all
+  systems that made the pack_hostent() function get invoked.
+
+- I removed several compiler warnings in the test suite's HTTP server.
+
+Version 7.9.7
+
+Daniel (10 May 2002)
+- Kevin Roth adjusted the --trace-ascii output slightly.
+
+- Paul Harrington found out that src/writeout.c needed an additional header
+  file included for AIX builds
+
+Version 7.9.7-pre2
+
+Daniel (7 May 2002)
+- Updated the man page with --trace-ascii and -j/--junk-session-cookies.
+
+- Made --trace-ascii do pretty much the same as --trace but without the hex
+  part in the output.
+
+- Added CURLOPT_COOKIESESSION that when enabled makes libcurl ignore session
+  cookies read from a file. This option is enforced by the curl command line
+  tool using the new -j/--junk-session-cookies option. After discussions with
+  Kevin Roth. This makes it easier to use curl to fully emulate a browser's
+  behavior, even when it comes to "session cookies". Session cookies are
+  cookies that a normal browser discards when the browser is shut
+  down. They're identified by not having any expire date/time.
+
+- When CURLOPT_DEBUGDATA was set, it ruined the CURLOPT_STDERR setting and
+  this was discovered when --trace was made to crash.
+
+- Using -v and --trace at the same time confused matters. -v is now pretty
+  much ignored when --trace or --trace-ascii is used.
+
+- Made --trace (and --trace-ascii) support - as file name to pass output to
+  stdout instead. It makes it consistent with how other options work.
+
+Version 7.9.7-pre1
+
+Daniel (6 May 2002)
+- Added multi-post.c to the examples directory. I got the basic source for
+  this from Gustaf Hui.
+
+Daniel (3 May 2002)
+- CURL_MAX_WRITE_SIZE is now an exported #define in the curl/curl.h header and
+  can be used to figure out the maximum buffer size your write callback can
+  get.
+
+- CURLOPT_READDATA is now an alias for CURLOPT_INFILE and CURLOPT_WRITEDATE is
+  an alias for CURLOPT_FILE. These two were added for conformity. Most other
+  callback function's userdata are provided with options using a similar name-
+  scheme.
+
+- Added "--trace [file]" to the command line tool. It makes a very detailed
+  trace dump get stored, with a full protocol dump that includes all received
+  and transmitted data. This could be a very effective tool for debugging what
+  goes wrong. This dump includes every byte the way it is sent to/received
+  from the server. The dump is the plain-text version, so SSL transfers will
+  still be readable.
+
+- I found out that the DEBUGFUNCTION was not called properly everywhere as we
+  wanted it to. I fixed it.
+
+- -D now stores all headers to the same file if multiple URLs are given on the
+  command line! Kevin Roth made me aware of that it didn't already do this!
+
+- Gustaf Hui wrote an excellent formpost example that used the multi
+  interface.  Unfortunately, it didn't work due to several bugs in how
+  transfers were made when the multi interface was used.
+
+Daniel (2 May 2002)
+- Hanno Kranzhoff found out that when doing multiple transfers on the same
+  easy handle, the progress meter would show a bad "currently downloaded
+  value" when the transfer starts.
+
+Daniel (1 May 2002)
+- Applied another patch by Jacky Lam to make the name resolve info realloc()
+  stuff work properly.
+
+Daniel (28 April 2002)
+- curl_multi_info_read() is now implemented!
+
+Daniel (27 April 2002)
+- Updated BUGS, TODO, FAQ, INSTALL and added BINDINGS.
+
+- I think I fixed the DNS cache prune crach Jacky Lam found and reported.
+
+- I cleaned up the name prefix stuff in the hash and llist modules.
+
+- FTP responses should now be better on timing out properly. The timeout value
+  is maximum timeout for the entire request operation, but before this, the
+  timeout was used as a maximum allowed time between two reads...
+
+Daniel (26 April 2002)
+- Fixed the test suite http server to not use snprintf() anymore due to better
+  portability.
+
+Daniel (25 April 2002)
+- With Sterling Hughes' new DNS pruning, Jacky Lam asked if this wouldn't
+  cause problems since the pruning is only checking the entry time, and it
+  sure could cause problems. Therefor, I've now added and changed code so that
+  this should not be a problem. Nowhere in the code will be store name
+  resolved information around so that a sunsequent DNS cache prune should
+  cause a problem. This of course called for some mild internal changes.
+
+Daniel (23 April 2002)
+- Improved the 'no_proxy' check, as using port numbers in the URL confused it
+  previously. Reported by Erwan Legrand in bug report #547484.
+
+- The --interface option now works even on IPv6 enabled builds. Reported by
+  'thor'.
+
+Daniel (22 April 2002)
+- The #defines names starting with TIMECOND now has CURL_ prefixes. (The old
+  names are still #defined too.) Pointed out by Robert Olson.
+
+- Jacky Lam brought code that lets the name resolve function only use as much
+  memory as it actually needs. This only works on certain operating systems,
+  but is totally transparant to all users.
+
+Daniel (19 April 2002)
+- Bjorn Reese fixed pack_hostent to work properly with 64 bit pointers.
+
+Daniel (18 April 2002)
+- Sterling Hughes added code to prune old DNS cache entries, since Jacky Lam
+  experienced very big caches.
+
+Daniel (17 April 2002)
+- Dirk Manske patched the 301 response to work against the RFC but more like
+  common browsers do. If a POST get a 301 back, it'll switch to GET in the
+  next request (if location-following is enabled).
+
+Daniel (16 April 2002)
+- Dirk Manske posted a patch originally written by Ingo Wilken that introduced
+  two new CURLINFO_* values: CURLINFO_REDIRECT_TIME and
+  CURLINFO_REDIRECT_COUNT.
+
+Daniel (15 April 2002)
+- Jonatan Lander patched the verbose text 'Disables POST, goes with GET' to
+  reflect reality better, like when the first request isn't POST and when
+  the second isn't GET... :-)
+
+- Craig Davison pointed out that when curl_formadd()ing a file that doesn't
+  exist, libcurl doesn't return error. Now, curl_easy_perform() will return
+  CURLE_READ_ERROR if that is the case. Test 41 was added to verify this.
+
+Version 7.9.6
+
+Daniel (14 April 2002)
+- Dirk Manske brought a fix that makes libcurl strip off white spaces from the
+  beginning of cookie contents.
+
+- Had to patch include/curl/curl.h since MSVC doesn't set the __STDC__ define.
+  Moonesamy pointed out the problem, Bjorn Reese the solution.
+
+Version 7.9.6-pre5
+
+Daniel (12 April 2002)
+- Fixed the TIMER_CONNECT to be more accurate for FTP transfers. Previously
+  FTP transfers got the "connect done" time set after the initial FTP commands
+  and not directly after the TCP/IP connect as it should.
+
+  I also made the time stamp get set even if the connect itself fails, which
+  it didn't do previously.
+
+- Jean-Philippe Barrette-LaPierre provided his patch that introduces
+  CURLOPT_DEBUGFUNCTION and CURLOPT_DEBUGDATA. They allow a program to a set a
+  callback to receive debug/information data. That includes headers and data
+  that is received and sent. CURLOPT_VERBOSE still controls it.
+
+  By default, there is an internal debugfunction that will make things look
+  and work as before if not changed.
+
+Daniel (10 April 2002)
+- Sebastien Willemijns found out that -x didn't use the default port number as
+  is documented. It does now.
+
+- libcurl-errors.3 is a new man page attempting to document all libcurl error
+  codes
+
+- Added two new error codes and changed the behaviour of two old ones
+  slightly:
+
+  CURLE_WRITE_ERROR
+   This error was returned *both* for errors that occured when writing
+   received data to a local file, as well as when we get problems writing data
+   to a remote server. CURLE_SEND_ERROR has now been added for the latter
+   error.
+
+  CURLE_READ_ERROR
+   This error was similarly returned *both* for errors when reading a local
+   file, as well as when getting problems when reading network data.
+   CURLE_RECV_ERROR has now been added for the latter error.
+
+ (Two test cases were adjusted accordingly.)
+
+Daniel (9 April 2002)
+- runtests.pl now sets the HOME variable before running curl, to prevent any
+  actual ~/.curlrc file to fool the tests!
+
+Version 7.9.6-pre4
+
+Daniel (8 April 2002)
+- Michael Curtis provided new functionality for curl on some platforms. Using
+  the --environment option, curl will *set* a bunch of environment variables
+  to values. The names are the same ones as for the -w/--writeout option.
+
+  For now, this only works on the RISC OS version, as this feature relies on
+  both OS support and that it matches OS paradigms.
+
+- Jacky Lam provided a fix for getting headers-only when the reply is HTTP/1.0
+  and 304, I edited it slightly.
+
+Daniel (5 April 2002)
+- As requested by Jay Graves, the '.curlrc' file (or _curlrc as it is called
+  when used in windows), is now loaded from the current directory if the HOME
+  environment variable isn't set (or if it is too long). I also enlarged the
+  array used to store the full file path in, to 512 bytes.
+
+- Kevin Roth pointed out to me why the "19 March" change regarding -G and -I
+  was stupid and the change was reverted. Added test case 48 to verify the
+  functionality.
+
+Version 7.9.6-pre3
+
+Daniel (4 April 2002)
+- Jonatan Lander brought a patch that makes curl/curl.h compile nicely on
+  pre-ISO compilers, like when using gcc -traditional.
+
+Daniel (3 April 2002)
+- Jacky Lam identified a glitch when getting headers-only, where libcurl would
+  "hang" 1 second in vain in the select() loop before returning back.
+
+- Tor Arntsen brought a patch for multipart formposts. It turned out that the
+  "CGI_Lite Perl package" makes some bad assumptions on what letters that may
+  be used in boundary strings and thus curl could confuse it by including '+'
+  and '/'. While this is standards-compliant, we change the behavior to work
+  smoothly with existing software based on that package.
+
+Daniel (2 April 2002)
+- Gerhard Herre filed bug report #536238 where he pointed out a crash in
+  verbose FTP passive transfers for AIX.
+
+- Clarence Gardner pointed out a minor flaw in how libcurl didn't properly
+  take care of all errors that SSL_read() could return.
+
+- Jacky Lam fixed a MALLOCDEBUG problem in lib/getinfo.c
+
+Daniel (27 March 2002)
+- T. Bharath pointed out a flaw in the connection re-use function that didn't
+  check proxy connections properly for "deadness" before they were re-used.
+
+- Pedro Neves found out that HTTP POSTing with --data-binary did not properly
+  work under Windows as the file specified wasn't read fully binary!
+
+Daniel (25 March 2002)
+- Jacky Lam brought a fix that improves treatment of cookies using identical
+  domains but with leading dots properly.
+
+Daniel (22 March 2002)
+- Miklos Nemeth updated the windows section of the docs/INSTALL file and the
+  windows makefiles.
+
+- Jon Dillon provided us with several good-looking curl images for
+  promotion. View them here http://curl.haxx.se/icons.html
+
+Daniel (20 March 2002)
+- Peter Verhas found out that CRLF replacement in uploads was not working. I
+  fixed it, and added test case 128 that verifies the functionality.
+
+- The list formerly known as curl-main is now named curl-users and is hosted
+  by sourceforge. Susbcribe to the new list, get off the old one.
+
+Version 7.9.6-pre2
+
+Daniel (19 March 2002)
+- Made -G and -I on the same command line cause an error.
+
+- Moved the multi.h file to the "public" include directory and made it get
+  included by curl.h so that no extra include files will be necessary to use
+  it.
+
+  Added docs and man pages for the multi interface to the release archive.
+  Added the three example source codes too.
+
+  Necessary steps in my campaign to sneak in the multi interface... ;-)
+
+- Updated the year in all copyright notices in all C and H files.
+
+Daniel (18 March 2002)
+- Tomas Szepe found out that -d and -G didn't mix as they should. I broke this
+  in 7.9.5... Added test case 32 for this.
+
+Version 7.9.6-pre1
+
+Daniel (16 March 2002)
+- Peter Verhas pointed out that the curl_escape and curl_unscape man pages
+  contained factual errors.
+
+- Albert Choy found and corrected a problem with the verbose output when doing
+  PASV ftp transfers. It could make libcurl crash.
+
+  Details in bug report #530562:
+  http://sourceforge.net/tracker/?func=detail&atid=100976&aid=530562&group_id=976
+
+Daniel (15 March 2002)
+- Jun-ichiro itojun Hagino filed bug report #530204 that clearly pointed out
+  the PF_INET fix from February 19 as a not-very-good fix as it broke IPv6
+  capability! That patch is now reverted.
+
+  The problem with slow name lookups with getaddrinfo() on non-IPv6 enabled
+  hosts are instead made by first checking if the stack is IPv6-enabled and if
+  not, the PF_INET is used and otherwise we go with the full PF_UNSPEC.
+
+- T. Bharath pointed out that when we return an "error" from a WRITEFUNCTION
+  as described in the man page, libcurl did not return the documented error
+  code (CURLE_WRITE_ERROR) but would instead return CURLE_READ_ERROR. This is
+  now corrected.
+
+Daniel (14 March 2002)
+- Setting CURLOPT_POST without setting CURLOPT_POSTFIELDS now read the POST-
+  data from the callback.
+
+- The GOPHER support seems to be broken. I don't think I'll even start fixing
+  it until someone else finds out... :-)
+
+Daniel (13 March 2002)
+- Trying 'curl -I ftp.sunet.se' or similar did a SIZE on a silly "(nil)"
+  string. If such a file would be present, curl returned the size of it! Now
+  we prevent this.
+
+- Curl_sendf() was fixed to deal with situation where Curl_write() would've
+  blocked and thus return -1.
+
+- Setting CURLOPT_PROGRESSFUNCTION to NULL now restores the internal function.
+
+- All CURLFORM_* options can now be used in a CURLFORM_ARRAY except the
+  CURLFORM_ARRAY itself. This was necessary since we couldn't expand the
+  CURLFORM_* list proprely and unrestricted until this was the case. It was
+  also a bit peculiar to users why some options could be used in an array
+  while others couldn't.
+
+- Removed some silly CRLF lines that had accidentally slipped into src/main.c
+  Nico Baggus pointed them out to me.
+
+Daniel (11 March 2002)
+- CURLFORM_FILENAME was added. This can be set when creating a file upload
+  part, to set the 'filename' field to a custom value. If this isn't used,
+  the actually used filename will be included instead (as libcurl always has
+  done). curl was adjusted accordingly, and now -F accepts a 'filename=' field
+  too, and allows constructs such as:
+
+    -F 'name=@filename;filename=/dev/null'
+
+  and this can be combined with type= too, in a manner similar to:
+
+   -F "file=@log/test39.txt;filename=fakerfile;type=moo/foobar"
+
+  Test case 39 was added to verify this functionality.
+
+- The struct formerly known as HttpPost is now named curl_httppost to properly
+  use the curl name space. I added a #define for the old name to make existing
+  programs compile even when this new include file is used.
+
+Daniel (8 March 2002)
+- Clifford also discovered that if the client code failed early, as when doing
+  "curl -O" only, it would do fclose(NULL) which caused a segmentation fault
+  on some systems.
+
+- Clifford Wolf provided a patch that made --progress-bar work again.
+
+- I closed bug report #527032 by making sure that we add a newline after a
+  transfer when --progress-bar has been used. Before, without the newline, it
+  made the subsequent text come out wrong.
+
+Version 7.9.5
+
+Daniel (7 March 2002)
+- Added docs/KNOWN_BUGS to the release archive.
+
+Daniel (6 March 2002)
+- Kevin Roth corrected a flaw in the curl client globbing code that made it
+  mess up backslashes. This was most notable on windows (cygwin) machines when
+  using file://.
+
+- Brad provided another fix for building outside the source-tree.
+
+- Ralph Mitchell patched away a few compiler warnings in tests/server/sws.c
+
+Daniel (5 March 2002)
+- I noticed that the typedef in curl.h for the progress callback prototype was
+  wrong and thus applications that used it would not get the proper input
+  data. It used size_t where the implementation actually uses doubles!
+
+  I wish I could blame someone else, but this was my fault. Again.
+
+Version 7.9.5-pre6
+
+Daniel (4 March 2002)
+- Cut off the changes done during 2001 from this changelog file and put them
+  in a separate file (CHANGES.2001), available from CVS of course.
+
+- I removed the multi directory. The example sources were moved to the
+  docs/examples directory where they belong.
+
+- Wrote 7 new man pages for the current functions in the new multi interface.
+  They're all still pretty basic, but we can use them as a start and add more
+  contents to them when we figure out what to write. The large amount of man
+  pages for libcurl now present made me decide to put them in a new separate
+  subdirectory in the docs directory. Named libcurl.
+
+- Giuseppe Corbelli provided a template file for the EPM package manager, it
+  gets generated nicely by the configure script now.
+
+Version 7.9.5-pre5
+
+Daniel (1 March 2002)
+- Moved the memanalyze.pl script into the tests/ dir and added it to the
+  release archives. It was previously only present in the CVS tree.
+
+- Modified the February 17th Host: fix, as bug report #523718 pointed out that
+  it caused crashes!
+
+- Nico Baggus added more error codes to the VMS stuff.
+
+- Wesley Laxton brought the code that introduced the new CURLOPT_PREQUOTE
+  option. It is just another FTP quote option that allows the user to specify
+  a list of FTP commands to issue *just before* the transfer command (RETR or
+  STOR etc). It has turned up a few systems that really need this.
+
+  The curl command line tool can also take advantage of this by prefixing the
+  quote commands with a plus (+) in similar style that post transfer quote
+  commands are specified.
+
+  This is not yet documented. There is no test case for this yet.
+
+Daniel (28 February 2002)
+- Ralph Mitchell made some serious efforts and put a lot of sweat in setting
+  up scripts and things for me to be able to repeat his problems, and I
+  finally could.  I found a problem with the header byte counter that wasn't
+  increased properly and thus we could return CURLE_GOT_NOTHING when we in
+  fact had received data.
+
+Daniel (27 February 2002)
+- I had to revert the non-space parsing cookie fix I posted to the mailing
+  list. Expire dates do have spaces and still need to get parsed properly!
+  Instead we just ignore trailing white space and it seems to work...
+
+Daniel (26 February 2002)
+- Made the cookie property 'Max-Age' work, just since we already tried to
+  support it, it is better to do it right. No one uses this anyway.
+
+- The cookie parser could crash if a really weird (illegal) cookie line was
+  received. I also made it better discard really oddly formatted lines better.
+
+  Made the cookie jar store the second field from the left using the syntax
+  that Netscape and Mozilla probably like. Curl itself ignores it.
+
+  Added test case 31 for these cases.
+
+  Clay Loveless' email regarding some cookie issues started my cleanup.
+
+- Kevin Roth pointed out that my automake fiddles broke the ability to build
+  outside the source-tree and I posted a patch to the mailing list that brings
+  this ability back.
+
+Version 7.9.5-pre4
+
+Daniel (25 February 2002)
+- Fiddled with the automake files to make all source files in the lib
+  directory not have ../src in the include path, and the src sources shouldn't
+  have ../lib!
+
+- All 79 test cases ran OK under Linux and Solaris using the new HTTP server
+  in the test suite. The new HTTP server was first donated by Georg Horn and
+  subsequently modified to work with the test suite. It is currently still not
+  portable enough to run on "all over" but this is a start and I can run all
+  curl tests on my machines. This is an important requirement for the upcoming
+  public release.
+
+- Using -d and -I on the same command line now reports an error, as it implies
+  two different HTTP requests that can't be mixed.
+
+- Jeffrey Pohlmeyer provided a patch that made the -w/--write-out option
+  support %{content_type} to get the content type of the recent download.
+
+- Kevin Roth reported that pre2 and pre3 didn't compile properly on cygwin,
+  and this was because I used #ifdef HAVE_WINSOCK_H in lib/multi.h to figure
+  out if we could include winsock.h which turns out not to be a wise choice to
+  do on cygwin since it has the file but can't include it!
+
+Daniel (22 February 2002)
+- Added src/config-vms.h to the release archive.
+
+- Fixed the connection timeout value again, the change from February 18 wasn't
+  complete.
+
+Version 7.9.5-pre3
+
+Daniel (21 February 2002)
+- Kevin Roth and Andrés García both found out that lib/config.h.in was missing
+  in the pre-release archive and thus the configure script failed.
+
+Version 7.9.5-pre2
+
+Daniel (20 February 2002)
+- Andrés García provided a solution to bug report #515228. the total time
+  counter was not set correctly when -I was used during some conditions (all
+  headers were read in one single read).
+
+- Nico Baggus provided a huge patch with minor tweaks all over to make curl
+  compile nicely on VMS.
+
+Daniel (19 February 2002)
+- Rick Richardson found out that by replacing PF_UNSPEC with PF_INET in the
+  getaddrinfo() calls, he could speed up some name resolving calls with an
+  order of magnitudes on his Redhat Linux 7.2.
+
+- Philip Gladstone found a second INADDR_NONE problem where we used long
+  intead of in_addr_t which caused 64bit problemos. We really shouldn't define
+  that on two different places.
+
+Daniel (18 February 2002)
+- Philip Gladstone found a problem in how HTTP requests were sent if the
+  request couldn't be sent all at once.
+
+- Emil found and corrected a bad connection timeout comparison that made curl
+  use the longest of connect-timeout and timout as a timeout value, instead of
+  the shortest as it was supposed to!
+
+- Aron Roberts provided updated information about LDAP URL syntax to go into
+  the manual as a replacement for the old references.
+
+Daniel (17 February 2002)
+- Philip Gladstone pointed out two missing include files that made curl core
+  dump on 64bit architectures. We need to pay more attention on these details.
+  It is *lethal* to for example forget the malloc() prototype, as 'int' is
+  32bit and malloc() must return a 64bit pointer on these platforms.
+
+- Giaslas Georgios fixed a problem with Host: headers on repeated requests on
+  the same handle using a proxy.
+
+Daniel (8 February 2002)
+- Hanno L. Kranzhoff accurately found out that disabling the Expect: header
+  when doing multipart formposts didn't work very well. It disabled other
+  parts of the request header too, resulting in a broken header. When I fixed
+  this, I also noticed that the Content-Type wasn't possible to disable. It is
+  now, even though it probably is really stupid to try to do this (because of
+  the boundary string that is included in the internally generated header,
+  used as form part separator.)
+
+Daniel (7 February 2002)
+- I moved the config*.h files from the root directory to the lib/ directory.
+
+- I've added the new test suite HTTP server to the CVS repository, It seems to
+  work pretty good now, but we must make it get used by the test scripts
+  properly and then we need to make sure that it compiles, builds and runs on
+  most operating systems.
+
+Version 7.9.5-pre1
+
+Daniel (6 February 2002)
+- Miklos Nemeth provided updated windows makefiles and INSTALL docs.
+
+- Mr Larry Fahnoe found a problem with formposts and I managed to track down
+  and patch this bug. This was actually two bugs, as the posted size was also
+  said to be two bytes too large.
+
+- Brent Beardsley found out and brought a correction for the
+  CURLINFO_CONTENT_TYPE parser that was off one byte. This was my fault, I
+  accidentaly broke Giaslas Georgios' patch.
+
+Daniel (5 February 2002)
+- Kevin Roth found yet another SSL download problem.
+
+Version 7.9.4
+
+- no changes since pre-release
+
+Version 7.9.4-pre2
+
+Daniel (3 February 2002)
+- Eric Melville provided a few spelling corrections in the curl man page.
+
+Daniel (1 February 2002)
+- Andreas Damm corrected the unconditional use of gmtime() in getdate, it now
+  uses gmtime_r() on all hosts that have it.
+
+Daniel (31 January 2002)
+- An anonymous bug report identified a problem in the DNS caching which made it
+  sometimes allocate one byte too little to store the cache entry in. This
+  happened when the port number started with 1!
+
+- Albert Chin provided a patch that improves the gethostbyname_r() configure
+  check on HP-UX 11.00.
+
+Version 7.9.4-pre1
+
+Daniel (30 January 2002)
+- Georg Horn found another way the SSL reading failed due to the non-blocking
+  state of the sockets! I fixed.
+
+Daniel (29 January 2002)
+- Multipart formposts now send the full request properly, including the CRLF.
+  They were previously treated as part of the post data.
+
+- The upload byte counter bugged.
+
+- T. Bharath pointed out that we seed SSL on every connect, which is a time-
+  consuming operation that should only be needed to do once. We patched
+  libcurl to now only seed on the first connect when unseeded. The seeded
+  status is global so it'll now only happen once during a program's life time.
+
+  If the random_file or egdsocket is set, the seed will be re-made though.
+
+- Giaslas Georgios introduced CURLINFO_CONTENT_TYPE that lets
+  curl_easy_getinfo() read the content-type from the previous request.
+
+Daniel (28 January 2002)
+- Kjetil Jacobsen found a way to crash curl and after much debugging, it
+  turned out it was a IPv4-linux only problem introduced in 7.9.3 related to
+  name resolving.
+
+- Andreas Damm posted a huge patch that made the curl_getdate() function fully
+  reentrant!
+
+- Steve Marx pointed out that you couldn't mix CURLOPT_CUSTOMREQUEST with
+  CURLOPT_POSTFIELDS. You can now!
+
+Daniel (25 January 2002)
+- Krishnendu Majumdar pointed out that the header length counter was not reset
+  between multiple requests on the same handle.
+
+- Pedro Neves rightfully questioned why curl always append \r\n to the data
+  that is sent in HTTP POST requests. Unfortunately, this broke the test suite
+  as the test HTTP server is lame enough not to deal with this... :-O
+
+- Following Location: headers when the connection didn't close didn't work as
+  libcurl didn't properly stop reading. This problem was added in 7.9.3 due to
+  the restructured internals. 'Frank' posted a bug report about this.
+
+Daniel (24 January 2002)
+- Kevin Roth very quickly spotted that we wrongly installed the example
+  programs that were built in the multi directory, when 'make install' was
+  used. :-/
+
+Version 7.9.3
+
+Daniel (23 January 2002)
+- Andrés García found a persistancy problem when doing HTTP HEAD, that made
+  curl "hang" until the connection was closed by the server. This problem has
+  been introduced in 7.9.3 due to internal rewrites, this was not present in
+  7.9.2.
+
+Version 7.9.3-pre4
+
+Daniel (19 January 2002)
+- Antonio filed bug report #505514 and provided a fix! When doing multipart
+  formposts, libcurl would include an error text in the actual post if a
+  specified file wasn't found. This is not libcurl's job. Instead we add an
+  empty part.
+
+Daniel (18 January 2002)
+- Played around with stricter compiler warnings for gcc (when ./configure
+  --enable-debug is used) and changed some minor things to stop the warnings.
+
+- Commented out the 'long long' and 'long double' checks in configure.in, as
+  we don't currently use them anyway and the code in lib/mprintf.c that use
+  them causes warnings.
+
+- Saul Good and jonatan pointed out Mac OS X build problems with pre3 and how
+  to correct them. Two compiler warnings were removed as well.
+
+- Andrés García fixed two minor mingw32 building problems.
+
+Version 7.9.3-pre3
+
+Daniel (17 January 2002)
+- docs/libcurl-the-guide is a new tutorial for our libcurl programming
+  friends.
+
+- Richard Archer brought back the ability to compile and build with OpenSSL
+  versions before 0.9.5.
+  [http://sourceforge.net/tracker/?func=detail&atid=100976&aid=504163&group_id=976]
+
+- The DNS cache code didn't take the port number into account, which made it
+  work rather bad on IPv6-enabled hosts (especially when doing passive
+  FTP). Sterling fixed it.
+
+Daniel (16 January 2002)
+- Georg Horn could make a transfer time-out without error text. I found it and
+  corrected it.
+
+- SSL writes didn't work, they return an uninitialized value that caused
+  havoc all over. Georg Horn experienced this.
+
+- Kevin Roth patched the curl_version() function to use the proper OpenSSL
+  function for version information. This way, curl will report the version of
+  the SSL library actually running right now, not the one that had its headers
+  installed when libcurl was built. Mainly intersting when running with shared
+  OpenSSL libraries.  
+
+Version 7.9.3-pre2
+
+Daniel (16 January 2002)
+- Mofied the main transfer loop and related stuff to deal with non-blocking
+  sockets in the upload section. While doing this, I've now separated the
+  connection oriented buffers to have one for downloads and one for uploads
+  (as two can happen simultaneously). I also shrunk the buffers to 20K
+  each. As we have a scratch buffer twice the size of the upload buffer, we
+  arrived at 80K for buffers compared with the previous 150K.
+
+- Added the --cc option to curl-config command as it enables so very cool
+  one-liners. Have a go a this one, building the simple.c example:
+
+        $ `curl-config --cc --cflags --libs` -o example simple.c
+
+Daniel (14 January 2002)
+- I made all socket reads (recv) handle EWOULDBLOCK. I hope nicely. Now we
+  only need to address all writes (send) too and then I'm ready for another
+  pre-release...
+
+- Stoned Elipot patched the in_addr_t configure test to make it work better on
+  more platforms.
+
+Daniel (9 January 2002)
+- Cris Bailiff found out that filling up curl's SSL session cache caused a
+  crash!
+
+- Posted the curl questionnaire on the web site. If you haven't posted your
+  opinions there yet, go there and do it now while it is still there:
+
+        http://curl.haxx.se/q/
+
+- Georg Horn quickly found out that the SSL reading no longer worked as
+  supposed since the switch to non-blocking sockets. I've made a quick patch
+  (for reading only) but we should improve it even further.
+
+Version 7.9.3-pre1
+
+Daniel (7 January 2002)
+- I made the 'bool' typedef use an "unsigned char". It makes it the same on
+  all platforms, no matter what the platform thinks the default format for
+  char is. This was noticed since we made a silly comparison involving such a
+  bool variable, and only one compiler/platform combination (on Debian Linux)
+  complained about it (that happened to have its char unsigned by default).
+
+- Bug report #495290 identified a cookie parsing problem that was corrected.
+  When a Set-Cookie: line is received without a trailing semicolon, libcurl
+  didn't read the last "name=value" pair of the line, leading to confusions...
+
+- Sterling committed his updated DNS cache code.
+
+- I worked with Georg Horn and comments from Götz Babin-Ebell and switched
+  curl's socket operations completely over to non-blocking for the entire
+  operation (previously we used non-blocking only for the connection phase).
+  We had to do this to make the SSL connection phase timeout properly without
+  the use of signals. A little extra code to deal with this was added.
+
+- T. Bharath pointed out a slightly obscure cookie engine flaw.
+
+- Pete Su pointed out that libcurl didn't treat HTTP code 204 as it should.
+  204-replies never provides a response-body. This resulted in bad persistant
+  behavior when 204 was received.
+
+Daniel (5 January 2002)
+- SM updated the VC++ library Makefiles for the new source files.
+
+Daniel (4 January 2002)
+- I discovered that we wrongly used inet_ntoa() (instead of inet_ntoa_r() in
+  two places in the source code). One happened with VERBOSE set on connects,
+  and the other when VERBOSE was on and krb4 over nat was used... I honestly
+  don't think anyone has suffered from these mistakes.
+
+- I replaced a lot of silly occurances of printf() to instead use the more
+  appropriate Curl_infof() or Curl_failf(). The krb4 and telnet code were
+  affected.
+
+- Philip Gladstone found a few more problems with 64-bit archs (the 64-bit
+  sparc on solaris 8).
+
+- After discussions on the libcurl list with Raoul Cridlig, I just made FTP
+  response lines get passed to the header callback if such a one is
+  registered. It'll make it possible for any application to get all the
+  responses an FTP server sends to libcurl.
+
+Daniel (3 January 2002)
+- Sterling Hughes brought a few buckets of code. Now, libcurl will
+  automatically cache DNS lookups and re-use the previous results first if any
+  such is available. It greatly improves speed when doing many repeated
+  operations to the same host.
+
+- As the test case uses --include and then --head, I had to modify src/main.c
+  to deal with this situation slightly better than previously. When done, we
+  have 100% good tests again in the main branch.
+
+Daniel (2 January 2002)
+- Made test case 25 run again in the multi-dev branch. But it seems that the
+  changes done on dec-20 made test case 104 cease to work (in both branches).
+
+- Philip Gladstone pointed out a few portability problems in the source code
+  that didn't compile on 64-bit sparcs using Sun's native compiler.
diff --git a/main/source/curl/COPYING b/main/source/curl/COPYING
new file mode 100644
index 00000000..54153506
--- /dev/null
+++ b/main/source/curl/COPYING
@@ -0,0 +1,21 @@
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1996 - 2003, Daniel Stenberg, <daniel@haxx.se>.
+
+All rights reserved.
+
+Permission to use, copy, modify, and distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright
+notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
+NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization of the copyright holder.
diff --git a/main/source/curl/Makefile b/main/source/curl/Makefile
new file mode 100644
index 00000000..f1cd41fb
--- /dev/null
+++ b/main/source/curl/Makefile
@@ -0,0 +1,76 @@
+#############################################################################
+#                                  _   _ ____  _     
+#  Project                     ___| | | |  _ \| |    
+#                             / __| | | | |_) | |    
+#                            | (__| |_| |  _ <| |___ 
+#                             \___|\___/|_| \_\_____|
+#
+# Copyright (C) 2002, Daniel Stenberg, <daniel@haxx.se>, et al.
+#
+# In order to be useful for every potential user, curl and libcurl are
+# dual-licensed under the MPL and the MIT/X-derivate licenses.
+#
+# You may opt to use, copy, modify, merge, publish, distribute and/or sell
+# copies of the Software, and permit persons to whom the Software is
+# furnished to do so, under the terms of the MPL or the MIT/X-derivate
+# licenses. You may pick one of these licenses.
+#
+# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+# KIND, either express or implied.
+#
+# $Id: Makefile.dist,v 1.12 2002/09/07 21:44:02 hartroth Exp $
+#############################################################################
+
+all:
+	./configure
+	make
+
+ssl:
+	./configure --with-ssl
+	make
+
+borland:
+	cd lib & make -f Makefile.b32
+	cd src & make -f Makefile.b32
+
+mingw32:
+	cd lib & make -f Makefile.m32 ZLIB=1
+	cd src & make -f Makefile.m32 ZLIB=1
+
+mingw32-ssl:
+	cd lib & make -f Makefile.m32 SSL=1 ZLIB=1
+	cd src & make -f Makefile.m32 SSL=1 ZLIB=1
+
+vc:
+	cd lib
+	nmake -f Makefile.vc6 cfg=release
+	cd ..\src
+	nmake -f Makefile.vc6
+
+vc-ssl:
+	cd lib
+	nmake -f Makefile.vc6 cfg=release-ssl
+	cd ..\src
+	nmake -f Makefile.vc6 cfg=release-ssl
+
+vc-ssl-dll:
+	cd lib
+	nmake -f Makefile.vc6 cfg=release-ssl-dll
+	cd ..\src
+	nmake -f Makefile.vc6
+
+cygwin:
+	./configure
+	make
+
+cygwin-ssl:
+	./configure --with-ssl
+	make
+
+unix: all
+
+unix-ssl: ssl
+
+linux: all
+
+linux-ssl: ssl
diff --git a/main/source/curl/Makefile.am b/main/source/curl/Makefile.am
new file mode 100644
index 00000000..368a0e8c
--- /dev/null
+++ b/main/source/curl/Makefile.am
@@ -0,0 +1,79 @@
+#
+# $Id: Makefile.am,v 1.41 2003/03/31 11:37:47 bagder Exp $
+#
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = CHANGES COPYING maketgz SSLCERTS reconf Makefile.dist	\
+  curl-config.in build_vms.com curl-style.el sample.emacs testcurl.sh
+
+bin_SCRIPTS = curl-config
+
+SUBDIRS = docs lib src include tests packages
+
+# create a root makefile in the distribution:
+dist-hook:
+	rm -rf $(top_builddir)/tests/log
+	cp $(srcdir)/Makefile.dist $(distdir)/Makefile
+
+html:
+	cd docs; make html
+
+pdf:
+	cd docs; make pdf
+
+check: test
+
+test:
+	@(cd tests; $(MAKE) quiet-test)
+
+test-full:
+	@(cd tests; $(MAKE) full-test)
+
+#
+# Build source and binary rpms. For rpm-3.0 and above, the ~/.rpmmacros
+# must contain the following line:
+# %_topdir /home/loic/local/rpm
+# and that /home/loic/local/rpm contains the directory SOURCES, BUILD etc.
+#
+# cd /home/loic/local/rpm ; mkdir -p SOURCES BUILD RPMS/i386 SPECS SRPMS
+#
+# If additional configure flags are needed to build the package, add the
+# following in ~/.rpmmacros
+# %configure CFLAGS="%{optflags}" ./configure %{_target_platform} --prefix=%{_prefix} ${AM_CONFIGFLAGS}
+# and run make rpm in the following way:
+# AM_CONFIGFLAGS='--with-uri=/home/users/loic/local/RedHat-6.2' make rpm
+#
+
+rpms:
+	$(MAKE) RPMDIST=curl rpm
+	$(MAKE) RPMDIST=curl-ssl rpm
+
+rpm:
+	RPM_TOPDIR=`rpm --showrc | $(PERL) -n -e 'print if(s/.*_topdir\s+(.*)/$$1/)'` ; \
+	cp $(srcdir)/packages/Linux/RPM/$(RPMDIST).spec $$RPM_TOPDIR/SPECS ; \
+	cp $(PACKAGE)-$(VERSION).tar.gz $$RPM_TOPDIR/SOURCES ; \
+	rpm -ba --clean --rmsource $$RPM_TOPDIR/SPECS/$(RPMDIST).spec ; \
+	mv $$RPM_TOPDIR/RPMS/i386/$(RPMDIST)-*.rpm . ; \
+	mv $$RPM_TOPDIR/SRPMS/$(RPMDIST)-*.src.rpm .
+
+#
+# Build a Solaris pkkgadd format file
+# run 'make pkgadd' once you've done './configure' and 'make' to make a Solaris pkgadd format
+# file (which ends up back in this directory).
+# The pkgadd file is in 'pkgtrans' format, so to install on Solaris, do
+# pkgadd -d ./HAXXcurl-*
+#
+
+# gak - libtool requires an absoulte directory, hence the pwd below...
+pkgadd:
+	umask 022 ; \
+	make install DESTDIR=`/bin/pwd`/packages/Solaris/root ; \
+	cat COPYING > $(srcdir)/packages/Solaris/copyright ; \
+	cd $(srcdir)/packages/Solaris && $(MAKE) package
+
+#
+# Build a cygwin binary tarball installation file
+# resulting .tar.bz2 file will end up at packages/Win32/cygwin
+cygwinbin:
+	$(MAKE) -C packages/Win32/cygwin cygwinbin
diff --git a/main/source/curl/Makefile.dist b/main/source/curl/Makefile.dist
new file mode 100644
index 00000000..f1cd41fb
--- /dev/null
+++ b/main/source/curl/Makefile.dist
@@ -0,0 +1,76 @@
+#############################################################################
+#                                  _   _ ____  _     
+#  Project                     ___| | | |  _ \| |    
+#                             / __| | | | |_) | |    
+#                            | (__| |_| |  _ <| |___ 
+#                             \___|\___/|_| \_\_____|
+#
+# Copyright (C) 2002, Daniel Stenberg, <daniel@haxx.se>, et al.
+#
+# In order to be useful for every potential user, curl and libcurl are
+# dual-licensed under the MPL and the MIT/X-derivate licenses.
+#
+# You may opt to use, copy, modify, merge, publish, distribute and/or sell
+# copies of the Software, and permit persons to whom the Software is
+# furnished to do so, under the terms of the MPL or the MIT/X-derivate
+# licenses. You may pick one of these licenses.
+#
+# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+# KIND, either express or implied.
+#
+# $Id: Makefile.dist,v 1.12 2002/09/07 21:44:02 hartroth Exp $
+#############################################################################
+
+all:
+	./configure
+	make
+
+ssl:
+	./configure --with-ssl
+	make
+
+borland:
+	cd lib & make -f Makefile.b32
+	cd src & make -f Makefile.b32
+
+mingw32:
+	cd lib & make -f Makefile.m32 ZLIB=1
+	cd src & make -f Makefile.m32 ZLIB=1
+
+mingw32-ssl:
+	cd lib & make -f Makefile.m32 SSL=1 ZLIB=1
+	cd src & make -f Makefile.m32 SSL=1 ZLIB=1
+
+vc:
+	cd lib
+	nmake -f Makefile.vc6 cfg=release
+	cd ..\src
+	nmake -f Makefile.vc6
+
+vc-ssl:
+	cd lib
+	nmake -f Makefile.vc6 cfg=release-ssl
+	cd ..\src
+	nmake -f Makefile.vc6 cfg=release-ssl
+
+vc-ssl-dll:
+	cd lib
+	nmake -f Makefile.vc6 cfg=release-ssl-dll
+	cd ..\src
+	nmake -f Makefile.vc6
+
+cygwin:
+	./configure
+	make
+
+cygwin-ssl:
+	./configure --with-ssl
+	make
+
+unix: all
+
+unix-ssl: ssl
+
+linux: all
+
+linux-ssl: ssl
diff --git a/main/source/curl/Makefile.in b/main/source/curl/Makefile.in
new file mode 100644
index 00000000..09ef58b3
--- /dev/null
+++ b/main/source/curl/Makefile.in
@@ -0,0 +1,664 @@
+# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# $Id: Makefile.am,v 1.41 2003/03/31 11:37:47 bagder Exp $
+#
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = .
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CA_BUNDLE = @CURL_CA_BUNDLE@
+CURL_DISABLE_DICT = @CURL_DISABLE_DICT@
+CURL_DISABLE_FILE = @CURL_DISABLE_FILE@
+CURL_DISABLE_FTP = @CURL_DISABLE_FTP@
+CURL_DISABLE_GOPHER = @CURL_DISABLE_GOPHER@
+CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@
+CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@
+CURL_DISABLE_TELNET = @CURL_DISABLE_TELNET@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_LIBZ = @HAVE_LIBZ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPV6_ENABLED = @IPV6_ENABLED@
+KRB4_ENABLED = @KRB4_ENABLED@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NO_UNDEFINED_FALSE = @NO_UNDEFINED_FALSE@
+NO_UNDEFINED_TRUE = @NO_UNDEFINED_TRUE@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_ENABLED = @OPENSSL_ENABLED@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKGADD_NAME = @PKGADD_NAME@
+PKGADD_PKG = @PKGADD_PKG@
+PKGADD_VENDOR = @PKGADD_VENDOR@
+PKGCONFIG = @PKGCONFIG@
+RANDOM_FILE = @RANDOM_FILE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VERSIONNUM = @VERSIONNUM@
+YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = CHANGES COPYING maketgz SSLCERTS reconf Makefile.dist	\
+  curl-config.in build_vms.com curl-style.el sample.emacs testcurl.sh
+
+
+bin_SCRIPTS = curl-config
+
+SUBDIRS = docs lib src include tests packages
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/lib/config.h \
+	$(top_builddir)/src/config.h \
+	$(top_builddir)/tests/server/config.h \
+	$(top_builddir)/lib/ca-bundle.h
+CONFIG_CLEAN_FILES = curl-config
+SCRIPTS = $(bin_SCRIPTS)
+
+DIST_SOURCES =
+
+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+	ps-recursive install-info-recursive uninstall-info-recursive \
+	all-recursive install-data-recursive install-exec-recursive \
+	installdirs-recursive install-recursive uninstall-recursive \
+	check-recursive installcheck-recursive
+DIST_COMMON = README COPYING Makefile.am Makefile.in acinclude.m4 \
+	aclocal.m4 config.guess config.sub configure configure.ac \
+	curl-config.in depcomp install-sh ltmain.sh missing \
+	mkinstalldirs
+DIST_SUBDIRS = $(SUBDIRS)
+all: all-recursive
+
+.SUFFIXES:
+
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+
+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+	cd $(srcdir) && $(AUTOCONF)
+
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac acinclude.m4
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+curl-config: $(top_builddir)/config.status curl-config.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+install-binSCRIPTS: $(bin_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f $$d$$p; then \
+	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	    echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
+	    $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
+	  else :; fi; \
+	done
+
+uninstall-binSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+	  rm -f $(DESTDIR)$(bindir)/$$f; \
+	done
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ETAGS = etags
+ETAGSFLAGS =
+
+CTAGS = ctags
+CTAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = .
+distdir = $(PACKAGE)-$(VERSION)
+
+am__remove_distdir = \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	mkdir $(distdir)
+	$(mkinstalldirs) $(distdir)/. $(distdir)/packages/EPM $(distdir)/packages/Linux/RPM
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d $(distdir)/$$subdir \
+	    || mkdir $(distdir)/$$subdir \
+	    || exit 1; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$(top_distdir)" \
+	        distdir=../$(distdir)/$$subdir \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r $(distdir)
+dist-gzip: distdir
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+dist dist-all: distdir
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	$(am__remove_distdir)
+	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/=build
+	mkdir $(distdir)/=inst
+	chmod a-w $(distdir)
+	dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && cd $(distdir)/=build \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
+	  && rm -f $(distdir).tar.gz \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	$(am__remove_distdir)
+	@echo "$(distdir).tar.gz is ready for distribution" | \
+	  sed 'h;s/./=/g;p;x;p;x'
+distuninstallcheck:
+	cd $(distuninstallcheck_dir) \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(SCRIPTS)
+installdirs: installdirs-recursive
+installdirs-am:
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+distclean-am: clean-am distclean-generic distclean-libtool \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-binSCRIPTS
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf autom4te.cache
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-binSCRIPTS uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+	clean-generic clean-libtool clean-recursive ctags \
+	ctags-recursive dist dist-all dist-gzip distcheck distclean \
+	distclean-generic distclean-libtool distclean-recursive \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am dvi-recursive info info-am info-recursive install \
+	install-am install-binSCRIPTS install-data install-data-am \
+	install-data-recursive install-exec install-exec-am \
+	install-exec-recursive install-info install-info-am \
+	install-info-recursive install-man install-recursive \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am installdirs-recursive maintainer-clean \
+	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
+	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
+	tags-recursive uninstall uninstall-am uninstall-binSCRIPTS \
+	uninstall-info-am uninstall-info-recursive uninstall-recursive
+
+
+# create a root makefile in the distribution:
+dist-hook:
+	rm -rf $(top_builddir)/tests/log
+	cp $(srcdir)/Makefile.dist $(distdir)/Makefile
+
+html:
+	cd docs; make html
+
+pdf:
+	cd docs; make pdf
+
+check: test
+
+test:
+	@(cd tests; $(MAKE) quiet-test)
+
+test-full:
+	@(cd tests; $(MAKE) full-test)
+
+#
+# Build source and binary rpms. For rpm-3.0 and above, the ~/.rpmmacros
+# must contain the following line:
+# %_topdir /home/loic/local/rpm
+# and that /home/loic/local/rpm contains the directory SOURCES, BUILD etc.
+#
+# cd /home/loic/local/rpm ; mkdir -p SOURCES BUILD RPMS/i386 SPECS SRPMS
+#
+# If additional configure flags are needed to build the package, add the
+# following in ~/.rpmmacros
+# %configure CFLAGS="%{optflags}" ./configure %{_target_platform} --prefix=%{_prefix} ${AM_CONFIGFLAGS}
+# and run make rpm in the following way:
+# AM_CONFIGFLAGS='--with-uri=/home/users/loic/local/RedHat-6.2' make rpm
+#
+
+rpms:
+	$(MAKE) RPMDIST=curl rpm
+	$(MAKE) RPMDIST=curl-ssl rpm
+
+rpm:
+	RPM_TOPDIR=`rpm --showrc | $(PERL) -n -e 'print if(s/.*_topdir\s+(.*)/$$1/)'` ; \
+	cp $(srcdir)/packages/Linux/RPM/$(RPMDIST).spec $$RPM_TOPDIR/SPECS ; \
+	cp $(PACKAGE)-$(VERSION).tar.gz $$RPM_TOPDIR/SOURCES ; \
+	rpm -ba --clean --rmsource $$RPM_TOPDIR/SPECS/$(RPMDIST).spec ; \
+	mv $$RPM_TOPDIR/RPMS/i386/$(RPMDIST)-*.rpm . ; \
+	mv $$RPM_TOPDIR/SRPMS/$(RPMDIST)-*.src.rpm .
+
+#
+# Build a Solaris pkkgadd format file
+# run 'make pkgadd' once you've done './configure' and 'make' to make a Solaris pkgadd format
+# file (which ends up back in this directory).
+# The pkgadd file is in 'pkgtrans' format, so to install on Solaris, do
+# pkgadd -d ./HAXXcurl-*
+#
+
+# gak - libtool requires an absoulte directory, hence the pwd below...
+pkgadd:
+	umask 022 ; \
+	make install DESTDIR=`/bin/pwd`/packages/Solaris/root ; \
+	cat COPYING > $(srcdir)/packages/Solaris/copyright ; \
+	cd $(srcdir)/packages/Solaris && $(MAKE) package
+
+#
+# Build a cygwin binary tarball installation file
+# resulting .tar.bz2 file will end up at packages/Win32/cygwin
+cygwinbin:
+	$(MAKE) -C packages/Win32/cygwin cygwinbin
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/main/source/curl/README b/main/source/curl/README
new file mode 100644
index 00000000..09da4f18
--- /dev/null
+++ b/main/source/curl/README
@@ -0,0 +1,68 @@
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+README
+
+  Curl is a command line tool for transfering data specified with URL
+  syntax. Find out how to use Curl by reading the curl.1 man page or the
+  MANUAL document. Find out how to install Curl by reading the INSTALL
+  document.
+
+  libcurl is the library curl is using to do its job. It is readily
+  available to be used by your software. Read the libcurl.3 man page to
+  learn how!
+
+  You find answers to the most frequent questions we get in the FAQ document.
+
+  Study the COPYING file for distribution terms and similar.
+
+CONTACT
+
+  If you have problems, questions, ideas or suggestions, please contact us
+  by posting to a suitable mailing list. See http://curl.haxx.se/mail/
+
+  Many major contributors to the project are listed in the THANKS document.
+
+WEB SITE
+
+  Visit the curl web site or mirrors for the latest news:
+
+        Sweden    -- http://curl.haxx.se/
+        US        -- http://curl.sf.net/
+        Australia -- http://curl.planetmirror.com/
+
+DOWNLOAD
+
+  The official download mirror sites are:
+
+        Sweden    -- ftp://ftp.sunet.se/pub/www/utilities/curl/
+        Sweden    -- http://cool.haxx.se/curl/
+        Germany   -- ftp://ftp.fu-berlin.de/pub/unix/network/curl/
+        Australia -- http://curl.planetmirror.com/download/
+        US        -- http://curl.sourceforge.net/download/
+        Hongkong  -- http://www.execve.net/curl/
+
+CVS
+
+  To download the very latest source off the CVS server do this:
+
+    cvs -d :pserver:anonymous@cvs.curl.sourceforge.net:/cvsroot/curl login
+
+  (just press enter when asked for password)
+
+    cvs -d :pserver:anonymous@cvs.curl.sourceforge.net:/cvsroot/curl co curl 
+
+  (you'll get a directory named curl created, filled with the source code)
+
+    cvs -d :pserver:anonymous@cvs.curl.sourceforge.net:/cvsroot/curl logout
+        
+  (you're off the hook!)
+
+NOTICE
+
+  Curl contains pieces of source code that is Copyright (c) 1998, 1999
+  Kungliga Tekniska Högskolan. This notice is included here to comply with the
+  distribution terms.
diff --git a/main/source/curl/SSLCERTS b/main/source/curl/SSLCERTS
new file mode 100644
index 00000000..099b10d9
--- /dev/null
+++ b/main/source/curl/SSLCERTS
@@ -0,0 +1,39 @@
+                      Peer SSL Certificate Verification
+                      =================================
+
+Starting in 7.10, libcurl performs peer SSL certificate verification by
+default. This is done by installing a default CA cert bundle on 'make install'
+(or similar), that CA bundle package is used by default on operations against
+SSL servers.
+
+Alas, if you communicate with HTTPS servers using certificates that are signed
+by CAs present in the bundle, you will not notice any changed behavior and you
+will seamlessly get a higher security level on your SSL connections since you
+can be sure that the remote server really is the one it claims to be.
+
+If the remote server uses a self-signed certificate, or if you don't install
+curl's CA cert bundle or if it uses a certificate signed by a CA that isn't
+included in the bundle, then you need to do one of the following:
+
+ 1. Tell libcurl to *not* verify the peer. With libcurl you disable with with
+    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, FALSE);
+
+    With the curl command tool, you disable this with -k/--insecure.
+
+ 2. Get a CA certificate that can verify the remote server and use the proper
+    option to point out this CA cert for verification when connecting. For
+    libcurl hackers: curl_easy_setopt(curl, CURLOPT_CAPATH, capath);
+
+    With the curl command tool: --cacert [file]
+
+Neglecting to use one of the above menthods when dealing with a server using a
+certficate that isn't signed by one of the certficates in the installed CA
+cert bundle, will cause SSL to report an error ("certificate verify failed")
+during the handshake and SSL will then refuse further communication with that
+server.
+
+This procedure has been deemed The Right Thing even though it adds this extra
+trouble for some users, since it adds security to a majority of the SSL
+connections that previously weren't really secure. It turned out many people
+were using previous versions of curl/libcurl without realizing the need for
+the CA cert options to get truly secure SSL connections.
diff --git a/main/source/curl/acinclude.m4 b/main/source/curl/acinclude.m4
new file mode 100644
index 00000000..947e129d
--- /dev/null
+++ b/main/source/curl/acinclude.m4
@@ -0,0 +1,445 @@
+dnl Check for how to set a socket to non-blocking state. There seems to exist
+dnl four known different ways, with the one used almost everywhere being POSIX
+dnl and XPG3, while the other different ways for different systems (old BSD,
+dnl Windows and Amiga).
+dnl
+dnl There are two known platforms (AIX 3.x and SunOS 4.1.x) where the
+dnl O_NONBLOCK define is found but does not work. This condition is attempted
+dnl to get caught in this script by using an excessive number of #ifdefs...
+dnl
+AC_DEFUN(CURL_CHECK_NONBLOCKING_SOCKET,
+[
+  AC_MSG_CHECKING([non-blocking sockets style])
+
+  AC_TRY_COMPILE([
+/* headers for O_NONBLOCK test */
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
+],[
+/* try to compile O_NONBLOCK */
+
+#if defined(sun) || defined(__sun__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+# if defined(__SVR4) || defined(__srv4__)
+#  define PLATFORM_SOLARIS
+# else
+#  define PLATFORM_SUNOS4
+# endif
+#endif
+#if (defined(_AIX) || defined(__xlC__)) && !defined(_AIX4)
+# define PLATFORM_AIX_V3
+#endif
+
+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3)
+#error "O_NONBLOCK does not work on this platform"
+#endif
+  int socket;
+  int flags = fcntl(socket, F_SETFL, flags | O_NONBLOCK);
+],[
+dnl the O_NONBLOCK test was fine
+nonblock="O_NONBLOCK"
+AC_DEFINE(HAVE_O_NONBLOCK, 1, [use O_NONBLOCK for non-blocking sockets])
+],[
+dnl the code was bad, try a different program now, test 2
+
+  AC_TRY_COMPILE([
+/* headers for FIONBIO test */
+#include <unistd.h>
+#include <stropts.h>
+],[
+/* FIONBIO source test */
+ int flags = ioctl(socket, FIONBIO, &flags);
+],[
+dnl FIONBIO test was good
+nonblock="FIONBIO"
+AC_DEFINE(HAVE_FIONBIO, 1, [use FIONBIO for non-blocking sockets])
+],[
+dnl FIONBIO test was also bad
+dnl the code was bad, try a different program now, test 3
+
+  AC_TRY_COMPILE([
+/* headers for ioctlsocket test (cygwin?) */
+#include <windows.h>
+],[
+/* ioctlsocket source code */
+ int flags = ioctlsocket(socket, FIONBIO, &flags);
+],[
+dnl ioctlsocket test was good
+nonblock="ioctlsocket"
+AC_DEFINE(HAVE_IOCTLSOCKET, 1, [use ioctlsocket() for non-blocking sockets])
+],[
+dnl ioctlsocket didnt compile!
+
+  AC_TRY_COMPILE([
+/* headers for IoctlSocket test (Amiga?) */
+#include <sys/ioctl.h>
+],[
+/* IoctlSocket source code */
+ int flags = IoctlSocket(socket, FIONBIO, (long)1);
+],[
+dnl ioctlsocket test was good
+nonblock="IoctlSocket"
+AC_DEFINE(HAVE_IOCTLSOCKET_CASE, 1, [use Ioctlsocket() for non-blocking sockets])
+],[
+dnl ioctlsocket didnt compile!
+nonblock="nada"
+AC_DEFINE(HAVE_DISABLED_NONBLOCKING, 1, [disabled non-blocking sockets])
+])
+dnl end of forth test
+
+])
+dnl end of third test
+
+])
+dnl end of second test
+
+])
+dnl end of non-blocking try-compile test
+  AC_MSG_RESULT($nonblock)
+
+  if test "$nonblock" = "nada"; then
+    AC_MSG_WARN([non-block sockets disabled])
+  fi
+])
+
+dnl Check for socklen_t: historically on BSD it is an int, and in
+dnl POSIX 1g it is a type of its own, but some platforms use different
+dnl types for the argument to getsockopt, getpeername, etc.  So we
+dnl have to test to find something that will work.
+AC_DEFUN([TYPE_SOCKLEN_T],
+[
+   AC_CHECK_TYPE([socklen_t], ,[
+      AC_MSG_CHECKING([for socklen_t equivalent])
+      AC_CACHE_VAL([curl_cv_socklen_t_equiv],
+      [
+         # Systems have either "struct sockaddr *" or
+         # "void *" as the second argument to getpeername
+         curl_cv_socklen_t_equiv=
+         for arg2 in "struct sockaddr" void; do
+            for t in int size_t unsigned long "unsigned long"; do
+               AC_TRY_COMPILE([
+                  #include <sys/types.h>
+                  #include <sys/socket.h>
+
+                  int getpeername (int, $arg2 *, $t *);
+               ],[
+                  $t len;
+                  getpeername(0,0,&len);
+               ],[
+                  curl_cv_socklen_t_equiv="$t"
+                  break
+               ])
+            done
+         done
+
+         if test "x$curl_cv_socklen_t_equiv" = x; then
+            AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
+         fi
+      ])
+      AC_MSG_RESULT($curl_cv_socklen_t_equiv)
+      AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
+			[type to use in place of socklen_t if not defined])],
+      [#include <sys/types.h>
+#include <sys/socket.h>])
+])
+
+dnl Check for in_addr_t: it is used to receive the return code of inet_addr()
+dnl and a few other things. If not found, we set it to unsigned int, as even
+dnl 64-bit implementations use to set it to a 32-bit type.
+AC_DEFUN([TYPE_IN_ADDR_T],
+[
+   AC_CHECK_TYPE([in_addr_t], ,[
+      AC_MSG_CHECKING([for in_addr_t equivalent])
+      AC_CACHE_VAL([curl_cv_in_addr_t_equiv],
+      [
+         curl_cv_in_addr_t_equiv=
+         for t in "unsigned long" int size_t unsigned long; do
+            AC_TRY_COMPILE([
+               #include <sys/types.h>
+               #include <sys/socket.h>
+               #include <arpa/inet.h>
+            ],[
+               $t data = inet_addr ("1.2.3.4");
+            ],[
+               curl_cv_in_addr_t_equiv="$t"
+               break
+            ])
+         done
+
+         if test "x$curl_cv_in_addr_t_equiv" = x; then
+            AC_MSG_ERROR([Cannot find a type to use in place of in_addr_t])
+         fi
+      ])
+      AC_MSG_RESULT($curl_cv_in_addr_t_equiv)
+      AC_DEFINE_UNQUOTED(in_addr_t, $curl_cv_in_addr_t_equiv,
+			[type to use in place of in_addr_t if not defined])],
+      [#include <sys/types.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>])
+])
+
+dnl ************************************************************
+dnl check for "localhost", if it doesn't exist, we can't do the
+dnl gethostbyname_r tests!
+dnl 
+
+AC_DEFUN(CURL_CHECK_WORKING_RESOLVER,[
+AC_MSG_CHECKING([if "localhost" resolves])
+AC_TRY_RUN([
+#include <string.h>
+#include <sys/types.h>
+#include <netdb.h>
+
+int
+main () {
+struct hostent *h;
+h = gethostbyname("localhost");
+exit (h == NULL ? 1 : 0); }],[
+      AC_MSG_RESULT(yes)],[
+      AC_MSG_RESULT(no)
+      AC_MSG_ERROR([can't figure out gethostbyname_r() since localhost doesn't resolve])
+
+      ]
+)
+])
+
+dnl ************************************************************
+dnl check for working getaddrinfo()
+dnl
+AC_DEFUN(CURL_CHECK_WORKING_GETADDRINFO,[
+  AC_CACHE_CHECK(for working getaddrinfo, ac_cv_working_getaddrinfo,[
+  AC_TRY_RUN( [
+#include <netdb.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+
+void main(void) {
+    struct addrinfo hints, *ai;
+    int error;
+
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_STREAM;
+    error = getaddrinfo("127.0.0.1", "8080", &hints, &ai);
+    if (error) {
+        exit(1);
+    }
+    else {
+        exit(0);
+    }
+}
+],[
+  ac_cv_working_getaddrinfo="yes"
+],[
+  ac_cv_working_getaddrinfo="no"
+],[
+  ac_cv_working_getaddrinfo="yes"
+])])
+if test "$ac_cv_working_getaddrinfo" = "yes"; then
+  AC_DEFINE(HAVE_GETADDRINFO, 1, [Define if getaddrinfo exists and works])
+  AC_DEFINE(ENABLE_IPV6, 1, [Define if you want to enable IPv6 support])
+
+  IPV6_ENABLED=1
+  AC_SUBST(IPV6_ENABLED)
+fi
+])
+
+
+AC_DEFUN(CURL_CHECK_LOCALTIME_R,
+[
+  dnl check for a few thread-safe functions
+  AC_CHECK_FUNCS(localtime_r,[
+    AC_MSG_CHECKING(whether localtime_r is declared)
+    AC_EGREP_CPP(localtime_r,[
+#include <time.h>],[
+      AC_MSG_RESULT(yes)],[
+      AC_MSG_RESULT(no)
+      AC_MSG_CHECKING(whether localtime_r with -D_REENTRANT is declared)
+      AC_EGREP_CPP(localtime_r,[
+#define _REENTRANT
+#include <time.h>],[
+	AC_DEFINE(NEED_REENTRANT)
+	AC_MSG_RESULT(yes)],
+	AC_MSG_RESULT(no))])])
+])
+
+AC_DEFUN(CURL_CHECK_INET_NTOA_R,
+[
+  dnl determine if function definition for inet_ntoa_r exists.
+  AC_CHECK_FUNCS(inet_ntoa_r,[
+    AC_MSG_CHECKING(whether inet_ntoa_r is declared)
+    AC_EGREP_CPP(inet_ntoa_r,[
+#include <arpa/inet.h>],[
+      AC_DEFINE(HAVE_INET_NTOA_R_DECL, 1, [inet_ntoa_r() is declared])
+      AC_MSG_RESULT(yes)],[
+      AC_MSG_RESULT(no)
+      AC_MSG_CHECKING(whether inet_ntoa_r with -D_REENTRANT is declared)
+      AC_EGREP_CPP(inet_ntoa_r,[
+#define _REENTRANT
+#include <arpa/inet.h>],[
+	AC_DEFINE(HAVE_INET_NTOA_R_DECL, 1, [inet_ntoa_r() is declared])
+	AC_DEFINE(NEED_REENTRANT, 1, [need REENTRANT defined])
+	AC_MSG_RESULT(yes)],
+	AC_MSG_RESULT(no))])])
+])
+
+AC_DEFUN(CURL_CHECK_GETHOSTBYADDR_R,
+[
+  dnl check for number of arguments to gethostbyaddr_r. it might take
+  dnl either 5, 7, or 8 arguments.
+  AC_CHECK_FUNCS(gethostbyaddr_r,[
+    AC_MSG_CHECKING(if gethostbyaddr_r takes 5 arguments)
+    AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <netdb.h>],[
+char * address;
+int length;
+int type;
+struct hostent h;
+struct hostent_data hdata;
+int rc;
+rc = gethostbyaddr_r(address, length, type, &h, &hdata);],[
+      AC_MSG_RESULT(yes)
+      AC_DEFINE(HAVE_GETHOSTBYADDR_R_5, 1, [gethostbyaddr_r() takes 5 args])
+      ac_cv_gethostbyaddr_args=5],[
+      AC_MSG_RESULT(no)
+      AC_MSG_CHECKING(if gethostbyaddr_r with -D_REENTRANT takes 5 arguments)
+      AC_TRY_COMPILE([
+#define _REENTRANT
+#include <sys/types.h>
+#include <netdb.h>],[
+char * address;
+int length;
+int type;
+struct hostent h;
+struct hostent_data hdata;
+int rc;
+rc = gethostbyaddr_r(address, length, type, &h, &hdata);],[
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(HAVE_GETHOSTBYADDR_R_5, 1, [gethostbyaddr_r() takes 5 args])
+	AC_DEFINE(NEED_REENTRANT, 1, [need REENTRANT])
+	ac_cv_gethostbyaddr_args=5],[
+	AC_MSG_RESULT(no)
+	AC_MSG_CHECKING(if gethostbyaddr_r takes 7 arguments)
+	AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <netdb.h>],[
+char * address;
+int length;
+int type;
+struct hostent h;
+char buffer[8192];
+int h_errnop;
+struct hostent * hp;
+
+hp = gethostbyaddr_r(address, length, type, &h,
+                     buffer, 8192, &h_errnop);],[
+	  AC_MSG_RESULT(yes)
+	  AC_DEFINE(HAVE_GETHOSTBYADDR_R_7, 1, [gethostbyaddr_r() takes 7 args] )
+	  ac_cv_gethostbyaddr_args=7],[
+	  AC_MSG_RESULT(no)
+	  AC_MSG_CHECKING(if gethostbyaddr_r takes 8 arguments)
+	  AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <netdb.h>],[
+char * address;
+int length;
+int type;
+struct hostent h;
+char buffer[8192];
+int h_errnop;
+struct hostent * hp;
+int rc;
+
+rc = gethostbyaddr_r(address, length, type, &h,
+                     buffer, 8192, &hp, &h_errnop);],[
+	    AC_MSG_RESULT(yes)
+	    AC_DEFINE(HAVE_GETHOSTBYADDR_R_8, 1, [gethostbyaddr_r() takes 8 args])
+	    ac_cv_gethostbyaddr_args=8],[
+	    AC_MSG_RESULT(no)
+	    have_missing_r_funcs="$have_missing_r_funcs gethostbyaddr_r"])])])])])
+])
+
+AC_DEFUN(CURL_CHECK_GETHOSTBYNAME_R,
+[
+  dnl check for number of arguments to gethostbyname_r. it might take
+  dnl either 3, 5, or 6 arguments.
+  AC_CHECK_FUNCS(gethostbyname_r,[
+    AC_MSG_CHECKING([if gethostbyname_r takes 3 arguments])
+    AC_TRY_COMPILE([
+#include <string.h>
+#include <sys/types.h>
+#include <netdb.h>
+#undef NULL
+#define NULL (void *)0
+
+int
+gethostbyname_r(const char *, struct hostent *, struct hostent_data *);],[
+struct hostent_data data;
+gethostbyname_r(NULL, NULL, NULL);],[
+      AC_MSG_RESULT(yes)
+      AC_DEFINE(HAVE_GETHOSTBYNAME_R_3, 1, [gethostbyname_r() takes 3 args])
+      ac_cv_gethostbyname_args=3],[
+      AC_MSG_RESULT(no)
+      AC_MSG_CHECKING([if gethostbyname_r with -D_REENTRANT takes 3 arguments])
+      AC_TRY_COMPILE([
+#define _REENTRANT
+
+#include <string.h>
+#include <sys/types.h>
+#include <netdb.h>
+#undef NULL
+#define NULL (void *)0
+
+int
+gethostbyname_r(const char *,struct hostent *, struct hostent_data *);],[
+struct hostent_data data;
+gethostbyname_r(NULL, NULL, NULL);],[
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(HAVE_GETHOSTBYNAME_R_3, 1, [gethostbyname_r() takes 3 args])
+	AC_DEFINE(NEED_REENTRANT, 1, [needs REENTRANT])
+	ac_cv_gethostbyname_args=3],[
+	AC_MSG_RESULT(no)
+	AC_MSG_CHECKING([if gethostbyname_r takes 5 arguments])
+	AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <netdb.h>
+#undef NULL
+#define NULL (void *)0
+
+struct hostent *
+gethostbyname_r(const char *, struct hostent *, char *, int, int *);],[
+gethostbyname_r(NULL, NULL, NULL, 0, NULL);],[
+	  AC_MSG_RESULT(yes)
+	  AC_DEFINE(HAVE_GETHOSTBYNAME_R_5, 1, [gethostbyname_r() takes 5 args])
+          ac_cv_gethostbyname_args=5],[
+	  AC_MSG_RESULT(no)
+	  AC_MSG_CHECKING([if gethostbyname_r takes 6 arguments])
+	  AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <netdb.h>
+#undef NULL
+#define NULL (void *)0
+
+int
+gethostbyname_r(const char *, struct hostent *, char *, size_t,
+struct hostent **, int *);],[
+gethostbyname_r(NULL, NULL, NULL, 0, NULL, NULL);],[
+	    AC_MSG_RESULT(yes)
+	    AC_DEFINE(HAVE_GETHOSTBYNAME_R_6, 1, [gethostbyname_r() takes 6 args])
+            ac_cv_gethostbyname_args=6],[
+	    AC_MSG_RESULT(no)
+	    have_missing_r_funcs="$have_missing_r_funcs gethostbyname_r"],
+	    [ac_cv_gethostbyname_args=0])],
+	  [ac_cv_gethostbyname_args=0])],
+	[ac_cv_gethostbyname_args=0])],
+      [ac_cv_gethostbyname_args=0])])
+
+if test "$ac_cv_func_gethostbyname_r" = "yes"; then
+  if test "$ac_cv_gethostbyname_args" = "0"; then
+    dnl there's a gethostbyname_r() function, but we don't know how
+    dnl many arguments it wants!
+    AC_MSG_ERROR([couldn't figure out how to use gethostbyname_r()])
+  fi
+fi
+])
diff --git a/main/source/curl/aclocal.m4 b/main/source/curl/aclocal.m4
new file mode 100644
index 00000000..890b74b5
--- /dev/null
+++ b/main/source/curl/aclocal.m4
@@ -0,0 +1,7128 @@
+# generated automatically by aclocal 1.7.2 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+dnl Check for how to set a socket to non-blocking state. There seems to exist
+dnl four known different ways, with the one used almost everywhere being POSIX
+dnl and XPG3, while the other different ways for different systems (old BSD,
+dnl Windows and Amiga).
+dnl
+dnl There are two known platforms (AIX 3.x and SunOS 4.1.x) where the
+dnl O_NONBLOCK define is found but does not work. This condition is attempted
+dnl to get caught in this script by using an excessive number of #ifdefs...
+dnl
+AC_DEFUN(CURL_CHECK_NONBLOCKING_SOCKET,
+[
+  AC_MSG_CHECKING([non-blocking sockets style])
+
+  AC_TRY_COMPILE([
+/* headers for O_NONBLOCK test */
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
+],[
+/* try to compile O_NONBLOCK */
+
+#if defined(sun) || defined(__sun__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+# if defined(__SVR4) || defined(__srv4__)
+#  define PLATFORM_SOLARIS
+# else
+#  define PLATFORM_SUNOS4
+# endif
+#endif
+#if (defined(_AIX) || defined(__xlC__)) && !defined(_AIX4)
+# define PLATFORM_AIX_V3
+#endif
+
+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3)
+#error "O_NONBLOCK does not work on this platform"
+#endif
+  int socket;
+  int flags = fcntl(socket, F_SETFL, flags | O_NONBLOCK);
+],[
+dnl the O_NONBLOCK test was fine
+nonblock="O_NONBLOCK"
+AC_DEFINE(HAVE_O_NONBLOCK, 1, [use O_NONBLOCK for non-blocking sockets])
+],[
+dnl the code was bad, try a different program now, test 2
+
+  AC_TRY_COMPILE([
+/* headers for FIONBIO test */
+#include <unistd.h>
+#include <stropts.h>
+],[
+/* FIONBIO source test */
+ int flags = ioctl(socket, FIONBIO, &flags);
+],[
+dnl FIONBIO test was good
+nonblock="FIONBIO"
+AC_DEFINE(HAVE_FIONBIO, 1, [use FIONBIO for non-blocking sockets])
+],[
+dnl FIONBIO test was also bad
+dnl the code was bad, try a different program now, test 3
+
+  AC_TRY_COMPILE([
+/* headers for ioctlsocket test (cygwin?) */
+#include <windows.h>
+],[
+/* ioctlsocket source code */
+ int flags = ioctlsocket(socket, FIONBIO, &flags);
+],[
+dnl ioctlsocket test was good
+nonblock="ioctlsocket"
+AC_DEFINE(HAVE_IOCTLSOCKET, 1, [use ioctlsocket() for non-blocking sockets])
+],[
+dnl ioctlsocket didnt compile!
+
+  AC_TRY_COMPILE([
+/* headers for IoctlSocket test (Amiga?) */
+#include <sys/ioctl.h>
+],[
+/* IoctlSocket source code */
+ int flags = IoctlSocket(socket, FIONBIO, (long)1);
+],[
+dnl ioctlsocket test was good
+nonblock="IoctlSocket"
+AC_DEFINE(HAVE_IOCTLSOCKET_CASE, 1, [use Ioctlsocket() for non-blocking sockets])
+],[
+dnl ioctlsocket didnt compile!
+nonblock="nada"
+AC_DEFINE(HAVE_DISABLED_NONBLOCKING, 1, [disabled non-blocking sockets])
+])
+dnl end of forth test
+
+])
+dnl end of third test
+
+])
+dnl end of second test
+
+])
+dnl end of non-blocking try-compile test
+  AC_MSG_RESULT($nonblock)
+
+  if test "$nonblock" = "nada"; then
+    AC_MSG_WARN([non-block sockets disabled])
+  fi
+])
+
+dnl Check for socklen_t: historically on BSD it is an int, and in
+dnl POSIX 1g it is a type of its own, but some platforms use different
+dnl types for the argument to getsockopt, getpeername, etc.  So we
+dnl have to test to find something that will work.
+AC_DEFUN([TYPE_SOCKLEN_T],
+[
+   AC_CHECK_TYPE([socklen_t], ,[
+      AC_MSG_CHECKING([for socklen_t equivalent])
+      AC_CACHE_VAL([curl_cv_socklen_t_equiv],
+      [
+         # Systems have either "struct sockaddr *" or
+         # "void *" as the second argument to getpeername
+         curl_cv_socklen_t_equiv=
+         for arg2 in "struct sockaddr" void; do
+            for t in int size_t unsigned long "unsigned long"; do
+               AC_TRY_COMPILE([
+                  #include <sys/types.h>
+                  #include <sys/socket.h>
+
+                  int getpeername (int, $arg2 *, $t *);
+               ],[
+                  $t len;
+                  getpeername(0,0,&len);
+               ],[
+                  curl_cv_socklen_t_equiv="$t"
+                  break
+               ])
+            done
+         done
+
+         if test "x$curl_cv_socklen_t_equiv" = x; then
+            AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
+         fi
+      ])
+      AC_MSG_RESULT($curl_cv_socklen_t_equiv)
+      AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
+			[type to use in place of socklen_t if not defined])],
+      [#include <sys/types.h>
+#include <sys/socket.h>])
+])
+
+dnl Check for in_addr_t: it is used to receive the return code of inet_addr()
+dnl and a few other things. If not found, we set it to unsigned int, as even
+dnl 64-bit implementations use to set it to a 32-bit type.
+AC_DEFUN([TYPE_IN_ADDR_T],
+[
+   AC_CHECK_TYPE([in_addr_t], ,[
+      AC_MSG_CHECKING([for in_addr_t equivalent])
+      AC_CACHE_VAL([curl_cv_in_addr_t_equiv],
+      [
+         curl_cv_in_addr_t_equiv=
+         for t in "unsigned long" int size_t unsigned long; do
+            AC_TRY_COMPILE([
+               #include <sys/types.h>
+               #include <sys/socket.h>
+               #include <arpa/inet.h>
+            ],[
+               $t data = inet_addr ("1.2.3.4");
+            ],[
+               curl_cv_in_addr_t_equiv="$t"
+               break
+            ])
+         done
+
+         if test "x$curl_cv_in_addr_t_equiv" = x; then
+            AC_MSG_ERROR([Cannot find a type to use in place of in_addr_t])
+         fi
+      ])
+      AC_MSG_RESULT($curl_cv_in_addr_t_equiv)
+      AC_DEFINE_UNQUOTED(in_addr_t, $curl_cv_in_addr_t_equiv,
+			[type to use in place of in_addr_t if not defined])],
+      [#include <sys/types.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>])
+])
+
+dnl ************************************************************
+dnl check for "localhost", if it doesn't exist, we can't do the
+dnl gethostbyname_r tests!
+dnl 
+
+AC_DEFUN(CURL_CHECK_WORKING_RESOLVER,[
+AC_MSG_CHECKING([if "localhost" resolves])
+AC_TRY_RUN([
+#include <string.h>
+#include <sys/types.h>
+#include <netdb.h>
+
+int
+main () {
+struct hostent *h;
+h = gethostbyname("localhost");
+exit (h == NULL ? 1 : 0); }],[
+      AC_MSG_RESULT(yes)],[
+      AC_MSG_RESULT(no)
+      AC_MSG_ERROR([can't figure out gethostbyname_r() since localhost doesn't resolve])
+
+      ]
+)
+])
+
+dnl ************************************************************
+dnl check for working getaddrinfo()
+dnl
+AC_DEFUN(CURL_CHECK_WORKING_GETADDRINFO,[
+  AC_CACHE_CHECK(for working getaddrinfo, ac_cv_working_getaddrinfo,[
+  AC_TRY_RUN( [
+#include <netdb.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+
+void main(void) {
+    struct addrinfo hints, *ai;
+    int error;
+
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_STREAM;
+    error = getaddrinfo("127.0.0.1", "8080", &hints, &ai);
+    if (error) {
+        exit(1);
+    }
+    else {
+        exit(0);
+    }
+}
+],[
+  ac_cv_working_getaddrinfo="yes"
+],[
+  ac_cv_working_getaddrinfo="no"
+],[
+  ac_cv_working_getaddrinfo="yes"
+])])
+if test "$ac_cv_working_getaddrinfo" = "yes"; then
+  AC_DEFINE(HAVE_GETADDRINFO, 1, [Define if getaddrinfo exists and works])
+  AC_DEFINE(ENABLE_IPV6, 1, [Define if you want to enable IPv6 support])
+
+  IPV6_ENABLED=1
+  AC_SUBST(IPV6_ENABLED)
+fi
+])
+
+
+AC_DEFUN(CURL_CHECK_LOCALTIME_R,
+[
+  dnl check for a few thread-safe functions
+  AC_CHECK_FUNCS(localtime_r,[
+    AC_MSG_CHECKING(whether localtime_r is declared)
+    AC_EGREP_CPP(localtime_r,[
+#include <time.h>],[
+      AC_MSG_RESULT(yes)],[
+      AC_MSG_RESULT(no)
+      AC_MSG_CHECKING(whether localtime_r with -D_REENTRANT is declared)
+      AC_EGREP_CPP(localtime_r,[
+#define _REENTRANT
+#include <time.h>],[
+	AC_DEFINE(NEED_REENTRANT)
+	AC_MSG_RESULT(yes)],
+	AC_MSG_RESULT(no))])])
+])
+
+AC_DEFUN(CURL_CHECK_INET_NTOA_R,
+[
+  dnl determine if function definition for inet_ntoa_r exists.
+  AC_CHECK_FUNCS(inet_ntoa_r,[
+    AC_MSG_CHECKING(whether inet_ntoa_r is declared)
+    AC_EGREP_CPP(inet_ntoa_r,[
+#include <arpa/inet.h>],[
+      AC_DEFINE(HAVE_INET_NTOA_R_DECL, 1, [inet_ntoa_r() is declared])
+      AC_MSG_RESULT(yes)],[
+      AC_MSG_RESULT(no)
+      AC_MSG_CHECKING(whether inet_ntoa_r with -D_REENTRANT is declared)
+      AC_EGREP_CPP(inet_ntoa_r,[
+#define _REENTRANT
+#include <arpa/inet.h>],[
+	AC_DEFINE(HAVE_INET_NTOA_R_DECL, 1, [inet_ntoa_r() is declared])
+	AC_DEFINE(NEED_REENTRANT, 1, [need REENTRANT defined])
+	AC_MSG_RESULT(yes)],
+	AC_MSG_RESULT(no))])])
+])
+
+AC_DEFUN(CURL_CHECK_GETHOSTBYADDR_R,
+[
+  dnl check for number of arguments to gethostbyaddr_r. it might take
+  dnl either 5, 7, or 8 arguments.
+  AC_CHECK_FUNCS(gethostbyaddr_r,[
+    AC_MSG_CHECKING(if gethostbyaddr_r takes 5 arguments)
+    AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <netdb.h>],[
+char * address;
+int length;
+int type;
+struct hostent h;
+struct hostent_data hdata;
+int rc;
+rc = gethostbyaddr_r(address, length, type, &h, &hdata);],[
+      AC_MSG_RESULT(yes)
+      AC_DEFINE(HAVE_GETHOSTBYADDR_R_5, 1, [gethostbyaddr_r() takes 5 args])
+      ac_cv_gethostbyaddr_args=5],[
+      AC_MSG_RESULT(no)
+      AC_MSG_CHECKING(if gethostbyaddr_r with -D_REENTRANT takes 5 arguments)
+      AC_TRY_COMPILE([
+#define _REENTRANT
+#include <sys/types.h>
+#include <netdb.h>],[
+char * address;
+int length;
+int type;
+struct hostent h;
+struct hostent_data hdata;
+int rc;
+rc = gethostbyaddr_r(address, length, type, &h, &hdata);],[
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(HAVE_GETHOSTBYADDR_R_5, 1, [gethostbyaddr_r() takes 5 args])
+	AC_DEFINE(NEED_REENTRANT, 1, [need REENTRANT])
+	ac_cv_gethostbyaddr_args=5],[
+	AC_MSG_RESULT(no)
+	AC_MSG_CHECKING(if gethostbyaddr_r takes 7 arguments)
+	AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <netdb.h>],[
+char * address;
+int length;
+int type;
+struct hostent h;
+char buffer[8192];
+int h_errnop;
+struct hostent * hp;
+
+hp = gethostbyaddr_r(address, length, type, &h,
+                     buffer, 8192, &h_errnop);],[
+	  AC_MSG_RESULT(yes)
+	  AC_DEFINE(HAVE_GETHOSTBYADDR_R_7, 1, [gethostbyaddr_r() takes 7 args] )
+	  ac_cv_gethostbyaddr_args=7],[
+	  AC_MSG_RESULT(no)
+	  AC_MSG_CHECKING(if gethostbyaddr_r takes 8 arguments)
+	  AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <netdb.h>],[
+char * address;
+int length;
+int type;
+struct hostent h;
+char buffer[8192];
+int h_errnop;
+struct hostent * hp;
+int rc;
+
+rc = gethostbyaddr_r(address, length, type, &h,
+                     buffer, 8192, &hp, &h_errnop);],[
+	    AC_MSG_RESULT(yes)
+	    AC_DEFINE(HAVE_GETHOSTBYADDR_R_8, 1, [gethostbyaddr_r() takes 8 args])
+	    ac_cv_gethostbyaddr_args=8],[
+	    AC_MSG_RESULT(no)
+	    have_missing_r_funcs="$have_missing_r_funcs gethostbyaddr_r"])])])])])
+])
+
+AC_DEFUN(CURL_CHECK_GETHOSTBYNAME_R,
+[
+  dnl check for number of arguments to gethostbyname_r. it might take
+  dnl either 3, 5, or 6 arguments.
+  AC_CHECK_FUNCS(gethostbyname_r,[
+    AC_MSG_CHECKING([if gethostbyname_r takes 3 arguments])
+    AC_TRY_COMPILE([
+#include <string.h>
+#include <sys/types.h>
+#include <netdb.h>
+#undef NULL
+#define NULL (void *)0
+
+int
+gethostbyname_r(const char *, struct hostent *, struct hostent_data *);],[
+struct hostent_data data;
+gethostbyname_r(NULL, NULL, NULL);],[
+      AC_MSG_RESULT(yes)
+      AC_DEFINE(HAVE_GETHOSTBYNAME_R_3, 1, [gethostbyname_r() takes 3 args])
+      ac_cv_gethostbyname_args=3],[
+      AC_MSG_RESULT(no)
+      AC_MSG_CHECKING([if gethostbyname_r with -D_REENTRANT takes 3 arguments])
+      AC_TRY_COMPILE([
+#define _REENTRANT
+
+#include <string.h>
+#include <sys/types.h>
+#include <netdb.h>
+#undef NULL
+#define NULL (void *)0
+
+int
+gethostbyname_r(const char *,struct hostent *, struct hostent_data *);],[
+struct hostent_data data;
+gethostbyname_r(NULL, NULL, NULL);],[
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(HAVE_GETHOSTBYNAME_R_3, 1, [gethostbyname_r() takes 3 args])
+	AC_DEFINE(NEED_REENTRANT, 1, [needs REENTRANT])
+	ac_cv_gethostbyname_args=3],[
+	AC_MSG_RESULT(no)
+	AC_MSG_CHECKING([if gethostbyname_r takes 5 arguments])
+	AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <netdb.h>
+#undef NULL
+#define NULL (void *)0
+
+struct hostent *
+gethostbyname_r(const char *, struct hostent *, char *, int, int *);],[
+gethostbyname_r(NULL, NULL, NULL, 0, NULL);],[
+	  AC_MSG_RESULT(yes)
+	  AC_DEFINE(HAVE_GETHOSTBYNAME_R_5, 1, [gethostbyname_r() takes 5 args])
+          ac_cv_gethostbyname_args=5],[
+	  AC_MSG_RESULT(no)
+	  AC_MSG_CHECKING([if gethostbyname_r takes 6 arguments])
+	  AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <netdb.h>
+#undef NULL
+#define NULL (void *)0
+
+int
+gethostbyname_r(const char *, struct hostent *, char *, size_t,
+struct hostent **, int *);],[
+gethostbyname_r(NULL, NULL, NULL, 0, NULL, NULL);],[
+	    AC_MSG_RESULT(yes)
+	    AC_DEFINE(HAVE_GETHOSTBYNAME_R_6, 1, [gethostbyname_r() takes 6 args])
+            ac_cv_gethostbyname_args=6],[
+	    AC_MSG_RESULT(no)
+	    have_missing_r_funcs="$have_missing_r_funcs gethostbyname_r"],
+	    [ac_cv_gethostbyname_args=0])],
+	  [ac_cv_gethostbyname_args=0])],
+	[ac_cv_gethostbyname_args=0])],
+      [ac_cv_gethostbyname_args=0])])
+
+if test "$ac_cv_func_gethostbyname_r" = "yes"; then
+  if test "$ac_cv_gethostbyname_args" = "0"; then
+    dnl there's a gethostbyname_r() function, but we don't know how
+    dnl many arguments it wants!
+    AC_MSG_ERROR([couldn't figure out how to use gethostbyname_r()])
+  fi
+fi
+])
+
+# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
+
+# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+AC_PREREQ([2.52])
+
+# serial 6
+
+# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+
+# Add --enable-maintainer-mode option to configure.
+# From Jim Meyering
+
+# Copyright 1996, 1998, 2000, 2001, 2002  Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
+
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode is disabled by default
+  AC_ARG_ENABLE(maintainer-mode,
+[  --enable-maintainer-mode enable make rules and dependencies not useful
+                          (and sometimes confusing) to the casual installer],
+      USE_MAINTAINER_MODE=$enableval,
+      USE_MAINTAINER_MODE=no)
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST(MAINT)dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
+# AM_CONDITIONAL                                              -*- Autoconf -*-
+
+# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 5
+
+AC_PREREQ(2.52)
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+        [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])
+AC_SUBST([$1_FALSE])
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.])
+fi])])
+
+# Do all the work for Automake.                            -*- Autoconf -*-
+
+# This macro actually does too much some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 8
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+AC_PREREQ([2.54])
+
+# Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
+# the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+   test -f $srcdir/config.status; then
+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+ AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
+ AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG(AMTAR, tar)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+                  [_AM_DEPENDENCIES(CC)],
+                  [define([AC_PROG_CC],
+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                  [_AM_DEPENDENCIES(CXX)],
+                  [define([AC_PROG_CXX],
+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+])
+])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+
+# Copyright 2002  Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION so it can be traced.
+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+	 [AM_AUTOMAKE_VERSION([1.7.2])])
+
+# Helper functions for option handling.                    -*- Autoconf -*-
+
+# Copyright 2001, 2002  Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+#
+# Check to make sure that the build environment is sane.
+#
+
+# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
+
+#  -*- Autoconf -*-
+
+
+# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+
+# AM_AUX_DIR_EXPAND
+
+# Copyright 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+# Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_AUX_DIR_EXPAND], [
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+
+# Copyright 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+
+# AM_PROG_INSTALL_STRIP
+
+# Copyright 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# serial 4						-*- Autoconf -*-
+
+# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    echo '#include "conftest.h"' > conftest.c
+    echo 'int i;' > conftest.h
+    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=conftest.c object=conftest.o \
+       depfile=conftest.Po tmpdepfile=conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&
+       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      am_cv_$1_dependencies_compiler_type=$depmode
+      break
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[rm -f .deps 2>/dev/null
+mkdir .deps 2>/dev/null
+if test -d .deps; then
+  DEPDIR=.deps
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  DEPDIR=_deps
+fi
+rmdir .deps 2>/dev/null
+AC_SUBST([DEPDIR])
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking Speeds up one-time builds
+  --enable-dependency-tracking  Do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])
+])
+
+# Generate code to set up dependency tracking.   -*- Autoconf -*-
+
+# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+#serial 2
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[for mf in $CONFIG_FILES; do
+  # Strip MF so we end up with the name of the file.
+  mf=`echo "$mf" | sed -e 's/:.*$//'`
+  # Check whether this is an Automake generated Makefile or not.
+  # We used to match only the files named `Makefile.in', but
+  # some people rename them; so instead we look at the file content.
+  # Grep'ing the first line is not enough: some people post-process
+  # each Makefile.in and add a new line on top of each file to say so.
+  # So let's grep whole file.
+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+    dirpart=`AS_DIRNAME("$mf")`
+  else
+    continue
+  fi
+  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
+  # Extract the definition of DEP_FILES from the Makefile without
+  # running `make'.
+  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+  test -z "$DEPDIR" && continue
+  # When using ansi2knr, U may be empty or an underscore; expand it
+  U=`sed -n -e '/^U = / s///p' < "$mf"`
+  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+  # We invoke sed twice because it is the simplest approach to
+  # changing $(DEPDIR) to its actual value in the expansion.
+  for file in `sed -n -e '
+    /^DEP_FILES = .*\\\\$/ {
+      s/^DEP_FILES = //
+      :loop
+	s/\\\\$//
+	p
+	n
+	/\\\\$/ b loop
+      p
+    }
+    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+    # Make sure the directory exists.
+    test -f "$dirpart/$file" && continue
+    fdir=`AS_DIRNAME(["$file"])`
+    AS_MKDIR_P([$dirpart/$fdir])
+    # echo "creating $dirpart/$file"
+    echo '# dummy' > "$dirpart/$file"
+  done
+done
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Check to see how 'make' treats includes.	-*- Autoconf -*-
+
+# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+doit:
+	@echo done
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote="\""
+      _am_result=BSD
+   fi
+fi
+AC_SUBST(am__include)
+AC_SUBST(am__quote)
+AC_MSG_RESULT($_am_result)
+rm -f confinc confmf
+])
+
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+# serial 47 AC_PROG_LIBTOOL
+
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+         [],
+         [m4_define([AC_PROVIDE_IFELSE],
+	         [m4_ifdef([AC_PROVIDE_$1],
+		           [$2], [$3])])])
+
+
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+    [AC_LIBTOOL_CXX],
+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+  ])])
+dnl And a similar setup for Fortran 77 support
+  AC_PROVIDE_IFELSE([AC_PROG_F77],
+    [AC_LIBTOOL_F77],
+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+    [AC_LIBTOOL_GCJ],
+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+      [AC_LIBTOOL_GCJ],
+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+	[AC_LIBTOOL_GCJ],
+      [ifdef([AC_PROG_GCJ],
+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([A][M_PROG_GCJ],
+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([LT_AC_PROG_GCJ],
+	     [define([LT_AC_PROG_GCJ],
+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
+
+
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
+
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
+
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
+
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+# Same as above, but do not quote variable references.
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except M$VC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+AC_CHECK_TOOL(AR, ar, false)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+    ;;
+  *)
+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+# Only perform the check for file, if the check method requires it
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    AC_PATH_MAGIC
+  fi
+  ;;
+esac
+
+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+enable_win32_dll=yes, enable_win32_dll=no)
+
+AC_ARG_ENABLE([libtool-lock],
+    [AC_HELP_STRING([--disable-libtool-lock],
+	[avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+AC_ARG_WITH([pic],
+    [AC_HELP_STRING([--with-pic],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [pic_mode="$withval"],
+    [pic_mode=default])
+test -z "$pic_mode" && pic_mode=default
+
+# Use C for the default configuration in the libtool script
+tagname=
+AC_LIBTOOL_LANG_C_CONFIG
+_LT_AC_TAGCONFIG
+])# AC_LIBTOOL_SETUP
+
+
+# _LT_AC_SYS_COMPILER
+# -------------------
+AC_DEFUN([_LT_AC_SYS_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_AC_SYS_COMPILER
+
+
+# _LT_AC_SYS_LIBPATH_AIX
+# ----------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`; fi],[])
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+])# _LT_AC_SYS_LIBPATH_AIX
+
+
+# _LT_AC_SHELL_INIT(ARG)
+# ----------------------
+AC_DEFUN([_LT_AC_SHELL_INIT],
+[ifdef([AC_DIVERSION_NOTICE],
+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+	 [AC_DIVERT_PUSH(NOTICE)])
+$1
+AC_DIVERT_POP
+])# _LT_AC_SHELL_INIT
+
+
+# _LT_AC_PROG_ECHO_BACKSLASH
+# --------------------------
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn't interpret backslashes.
+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+[_LT_AC_SHELL_INIT([
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+  ;;
+esac
+
+echo=${ECHO-echo}
+if test "X[$]1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X[$]1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+fi
+
+if test "X[$]1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+[$]*
+EOF
+  exit 0
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+
+if test -z "$ECHO"; then
+if test "X${echo_test_string+set}" != Xset; then
+# find a string as large as possible, as long as the shell can cope with it
+  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+       echo_test_string="`eval $cmd`" &&
+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+    then
+      break
+    fi
+  done
+fi
+
+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+   test "X$echo_testing_string" = "X$echo_test_string"; then
+  :
+else
+  # The Solaris, AIX, and Digital Unix default echo programs unquote
+  # backslashes.  This makes it impossible to quote backslashes using
+  #   echo "$something" | sed 's/\\/\\\\/g'
+  #
+  # So, first we look for a working echo in the user's PATH.
+
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for dir in $PATH /usr/ucb; do
+    IFS="$lt_save_ifs"
+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      echo="$dir/echo"
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+
+  if test "X$echo" = Xecho; then
+    # We didn't find a better echo, so look for alternatives.
+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      # This shell has a builtin print -r that does the trick.
+      echo='print -r'
+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+      # If we have ksh, try running configure again with it.
+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+      export ORIGINAL_CONFIG_SHELL
+      CONFIG_SHELL=/bin/ksh
+      export CONFIG_SHELL
+      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+    else
+      # Try using printf.
+      echo='printf %s\n'
+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+	 test "X$echo_testing_string" = "X$echo_test_string"; then
+	# Cool, printf works
+	:
+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	export CONFIG_SHELL
+	SHELL="$CONFIG_SHELL"
+	export SHELL
+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+      else
+	# maybe with a smaller string...
+	prev=:
+
+	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+	  then
+	    break
+	  fi
+	  prev="$cmd"
+	done
+
+	if test "$prev" != 'sed 50q "[$]0"'; then
+	  echo_test_string=`eval $prev`
+	  export echo_test_string
+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+	else
+	  # Oops.  We lost completely, so just stick with echo.
+	  echo=echo
+	fi
+      fi
+    fi
+  fi
+fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+ECHO=$echo
+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
+
+AC_SUBST(ECHO)
+])])# _LT_AC_PROG_ECHO_BACKSLASH
+
+
+# _LT_AC_LOCK
+# -----------
+AC_DEFUN([_LT_AC_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+    [AC_HELP_STRING([--disable-libtool-lock],
+	[avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *ELF-32*)
+      HPUX_IA64_MODE="32"
+      ;;
+    *ELF-64*)
+      HPUX_IA64_MODE="64"
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+   if test "$lt_cv_prog_gnu_ld" = yes; then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -melf32bsmip"
+      ;;
+    *N32*)
+      LD="${LD-ld} -melf32bmipn32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -melf64bmip"
+      ;;
+    esac
+   else
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -32"
+      ;;
+    *N32*)
+      LD="${LD-ld} -n32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -64"
+      ;;
+    esac
+   fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case "`/usr/bin/file conftest.o`" in
+    *32-bit*)
+      case $host in
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_i386"
+          ;;
+        ppc64-*linux*)
+          LD="${LD-ld} -m elf32ppclinux"
+          ;;
+        s390x-*linux*)
+          LD="${LD-ld} -m elf_s390"
+          ;;
+        sparc64-*linux*)
+          LD="${LD-ld} -m elf32_sparc"
+          ;;
+      esac
+      ;;
+    *64-bit*)
+      case $host in
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        ppc*-*linux*|powerpc*-*linux*)
+          LD="${LD-ld} -m elf64ppc"
+          ;;
+        s390*-*linux*)
+          LD="${LD-ld} -m elf64_s390"
+          ;;
+        sparc*-*linux*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+  ])
+esac
+
+need_locks="$enable_libtool_lock"
+
+])# _LT_AC_LOCK
+
+
+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+[AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s conftest.err; then
+       $2=yes
+     fi
+   fi
+   $rm conftest*
+])
+
+if test x"[$]$2" = xyes; then
+    ifelse([$5], , :, [$5])
+else
+    ifelse([$6], , :, [$6])
+fi
+])# AC_LIBTOOL_COMPILER_OPTION
+
+
+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                          [ACTION-SUCCESS], [ACTION-FAILURE])
+# ------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+[AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $3"
+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+     else
+       $2=yes
+     fi
+   fi
+   $rm conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+    ifelse([$4], , :, [$4])
+else
+    ifelse([$5], , :, [$5])
+fi
+])# AC_LIBTOOL_LINKER_OPTION
+
+
+# AC_LIBTOOL_SYS_MAX_CMD_LEN
+# --------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+[# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  testring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+ *)
+    # If test is not a shell built-in, we'll probably end up computing a
+    # maximum length that is only half of the actual maximum length, but
+    # we can't tell.
+    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
+	       = "XX$testring") >/dev/null 2>&1 &&
+	    new_result=`expr "X$testring" : ".*" 2>&1` &&
+	    lt_cv_sys_max_cmd_len=$new_result &&
+	    test $i != 17 # 1/2 MB should be enough
+    do
+      i=`expr $i + 1`
+      testring=$testring$testring
+    done
+    testring=
+    # Add a significant safety factor because C++ compilers can tack on massive
+    # amounts of additional arguments before passing them to the linker.
+    # It appears as though 1/2 is a usable value.
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    ;;
+  esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+
+
+# _LT_AC_CHECK_DLFCN
+# --------------------
+AC_DEFUN([_LT_AC_CHECK_DLFCN],
+[AC_CHECK_HEADERS(dlfcn.h)dnl
+])# _LT_AC_CHECK_DLFCN
+
+
+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ------------------------------------------------------------------
+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+[#line __oline__ "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+
+    exit (status);
+}]
+EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_unknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_AC_TRY_DLOPEN_SELF
+
+
+# AC_LIBTOOL_DLOPEN_SELF
+# -------------------
+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+   ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+   ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+   ;;
+    
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen="dlopen"],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_AC_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      LDFLAGS="$LDFLAGS $link_static_flag"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+    	  lt_cv_dlopen_self_static, [dnl
+	  _LT_AC_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+])# AC_LIBTOOL_DLOPEN_SELF
+
+
+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+# ---------------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler
+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $rm -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+   # that will create temporary files in the current directory regardless of
+   # the output directory.  Thus, making CWD read-only will cause this test
+   # to fail, enabling locking or at least warning the user not to do parallel
+   # builds.
+   chmod -w .
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s out/conftest.err; then
+       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w .
+   $rm conftest* out/*
+   rmdir out
+   cd ..
+   rmdir conftest
+   $rm conftest*
+])
+])# AC_LIBTOOL_PROG_CC_C_O
+
+
+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
+# -----------------------------------------
+# Check to see if we can do hard links to lock some files if needed
+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
+[AC_REQUIRE([_LT_AC_LOCK])dnl
+
+hard_links="nottested"
+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
+
+
+# AC_LIBTOOL_OBJDIR
+# -----------------
+AC_DEFUN([AC_LIBTOOL_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+])# AC_LIBTOOL_OBJDIR
+
+
+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
+# ----------------------------------------------
+# Check hardcoding attributes.
+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_AC_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_AC_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
+
+
+# AC_LIBTOOL_SYS_LIB_STRIP
+# ------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
+[striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib="$STRIP -x"
+         AC_MSG_RESULT([yes])
+       else
+  AC_MSG_RESULT([no])
+fi
+       ;;
+   *)
+  AC_MSG_RESULT([no])
+    ;;
+  esac  
+fi
+])# AC_LIBTOOL_SYS_LIB_STRIP
+
+
+# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+[AC_MSG_CHECKING([dynamic linker characteristics])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+if test "$GCC" = yes; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix4* | aix5*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi4*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32*)
+  version_type=windows
+  shrext=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $rm \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
+      ;;
+    mingw*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  # FIXME: Relying on posixy $() will cause problems for
+  #        cross-compilation, but unfortunately the echo tests do not
+  #        yet detect zsh echo's removal of \ escapes.
+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then 
+  sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+  fi
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+freebsd*)
+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  *) # from 3.2 on
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case "$host_cpu" in
+  ia64*)
+    shrext='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+   hppa*64*)
+     shrext='.sl'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+   *)
+    shrext='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+nto-qnx)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+openbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+sco3.2v5*)
+  version_type=osf
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+
+
+# _LT_AC_TAGCONFIG
+# ----------------
+AC_DEFUN([_LT_AC_TAGCONFIG],
+[AC_ARG_WITH([tags],
+    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+        [include additional configurations @<:@automatic@:>@])],
+    [tagnames="$withval"])
+
+if test -f "$ltmain" && test -n "$tagnames"; then
+  if test ! -f "${ofile}"; then
+    AC_MSG_WARN([output file `$ofile' does not exist])
+  fi
+
+  if test -z "$LTCC"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+    if test -z "$LTCC"; then
+      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+    else
+      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+    fi
+  fi
+
+  # Extract list of available tagged configurations in $ofile.
+  # Note that this assumes the entire list is on one line.
+  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
+
+  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+  for tagname in $tagnames; do
+    IFS="$lt_save_ifs"
+    # Check whether tagname contains only valid characters
+    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
+    "") ;;
+    *)  AC_MSG_ERROR([invalid tag name: $tagname])
+	;;
+    esac
+
+    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+    then
+      AC_MSG_ERROR([tag name \"$tagname\" already exists])
+    fi
+
+    # Update the list of available tags.
+    if test -n "$tagname"; then
+      echo appending configuration tag \"$tagname\" to $ofile
+
+      case $tagname in
+      CXX)
+	if test -n "$CXX" && test "X$CXX" != "Xno"; then
+	  AC_LIBTOOL_LANG_CXX_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
+
+      F77)
+	if test -n "$F77" && test "X$F77" != "Xno"; then
+	  AC_LIBTOOL_LANG_F77_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
+
+      GCJ)
+	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+	  AC_LIBTOOL_LANG_GCJ_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
+
+      RC)
+	AC_LIBTOOL_LANG_RC_CONFIG
+	;;
+
+      *)
+	AC_MSG_ERROR([Unsupported tag name: $tagname])
+	;;
+      esac
+
+      # Append the new tag name to the list of available tags.
+      if test -n "$tagname" ; then
+      available_tags="$available_tags $tagname"
+    fi
+    fi
+  done
+  IFS="$lt_save_ifs"
+
+  # Now substitute the updated list of available tags.
+  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+    mv "${ofile}T" "$ofile"
+    chmod +x "$ofile"
+  else
+    rm -f "${ofile}T"
+    AC_MSG_ERROR([unable to update list of available tagged configurations.])
+  fi
+fi
+])# _LT_AC_TAGCONFIG
+
+
+# AC_LIBTOOL_DLOPEN
+# -----------------
+# enable checks for dlopen support
+AC_DEFUN([AC_LIBTOOL_DLOPEN],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
+])# AC_LIBTOOL_DLOPEN
+
+
+# AC_LIBTOOL_WIN32_DLL
+# --------------------
+# declare package support for building win32 dll's
+AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+])# AC_LIBTOOL_WIN32_DLL
+
+
+# AC_ENABLE_SHARED([DEFAULT])
+# ---------------------------
+# implement the --enable-shared flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_SHARED],
+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([shared],
+    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
+])# AC_ENABLE_SHARED
+
+
+# AC_DISABLE_SHARED
+# -----------------
+#- set the default shared flag to --disable-shared
+AC_DEFUN([AC_DISABLE_SHARED],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_SHARED(no)
+])# AC_DISABLE_SHARED
+
+
+# AC_ENABLE_STATIC([DEFAULT])
+# ---------------------------
+# implement the --enable-static flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_STATIC],
+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([static],
+    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
+])# AC_ENABLE_STATIC
+
+
+# AC_DISABLE_STATIC
+# -----------------
+# set the default static flag to --disable-static
+AC_DEFUN([AC_DISABLE_STATIC],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_STATIC(no)
+])# AC_DISABLE_STATIC
+
+
+# AC_ENABLE_FAST_INSTALL([DEFAULT])
+# ---------------------------------
+# implement the --enable-fast-install flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([fast-install],
+    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
+])# AC_ENABLE_FAST_INSTALL
+
+
+# AC_DISABLE_FAST_INSTALL
+# -----------------------
+# set the default to --disable-fast-install
+AC_DEFUN([AC_DISABLE_FAST_INSTALL],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_FAST_INSTALL(no)
+])# AC_DISABLE_FAST_INSTALL
+
+
+# AC_LIBTOOL_PICMODE([MODE])
+# --------------------------
+# implement the --with-pic flag
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+AC_DEFUN([AC_LIBTOOL_PICMODE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+pic_mode=ifelse($#,1,$1,default)
+])# AC_LIBTOOL_PICMODE
+
+
+# AC_PROG_EGREP
+# -------------
+# This is predefined starting with Autoconf 2.54, so this conditional
+# definition can be removed once we require Autoconf 2.54 or later.
+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+    then ac_cv_prog_egrep='grep -E'
+    else ac_cv_prog_egrep='egrep'
+    fi])
+ EGREP=$ac_cv_prog_egrep
+ AC_SUBST([EGREP])
+])])
+
+
+# AC_PATH_TOOL_PREFIX
+# -------------------
+# find a file program which can recognise shared library
+AC_DEFUN([AC_PATH_TOOL_PREFIX],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="ifelse([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$1; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+])# AC_PATH_TOOL_PREFIX
+
+
+# AC_PATH_MAGIC
+# -------------
+# find a file program which can recognise a shared library
+AC_DEFUN([AC_PATH_MAGIC],
+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# AC_PATH_MAGIC
+
+
+# AC_PROG_LD
+# ----------
+# find the path to the GNU or non-GNU linker
+AC_DEFUN([AC_PROG_LD],
+[AC_ARG_WITH([gnu-ld],
+    [AC_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])
+AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some GNU ld's only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_PROG_LD_GNU
+])# AC_PROG_LD
+
+
+# AC_PROG_LD_GNU
+# --------------
+AC_DEFUN([AC_PROG_LD_GNU],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+case `"$LD" -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# AC_PROG_LD_GNU
+
+
+# AC_PROG_LD_RELOAD_FLAG
+# ----------------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+])# AC_PROG_LD_RELOAD_FLAG
+
+
+# AC_DEPLIBS_CHECK_METHOD
+# -----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+[AC_CACHE_CHECK([how to recognise dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix4* | aix5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi4*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin* | mingw* | pw32*)
+  # win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='win32_libid'
+  ;;
+
+darwin* | rhapsody*)
+  # this will be overwritten by pass_all, but leave it in just in case
+  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  case "$host_os" in
+  rhapsody* | darwin1.[[012]])
+    lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
+    ;;
+  *) # Darwin 1.3 on
+    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+    ;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd*)
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case "$host_cpu" in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+  irix5* | nonstopux*)
+    # this will be overridden with pass_all, but let us keep it just in case
+    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+    ;;
+  *)
+    case $LD in
+    *-32|*"-32 ") libmagic=32-bit;;
+    *-n32|*"-n32 ") libmagic=N32;;
+    *-64|*"-64 ") libmagic=64-bit;;
+    *) libmagic=never-match;;
+    esac
+    # this will be overridden with pass_all, but let us keep it just in case
+    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
+    ;;
+  esac
+  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be Linux ELF.
+linux*)
+  case $host_cpu in
+  alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*)
+    lt_cv_deplibs_check_method=pass_all ;;
+  *)
+    # glibc up to 2.1.1 does not perform some relocations on ARM
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
+  esac
+  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+nto-qnx)
+  lt_cv_deplibs_check_method=unknown
+  ;;
+
+openbsd*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
+  else
+    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  # this will be overridden with pass_all, but let us keep it just in case
+  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sco3.2v5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  lt_cv_file_magic_test_file=/lib/libc.so
+  ;;
+
+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+])# AC_DEPLIBS_CHECK_METHOD
+
+
+# AC_PROG_NM
+# ----------
+# find the path to a BSD-compatible name lister
+AC_DEFUN([AC_PROG_NM],
+[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+      # Check to see if the nm accepts a BSD-compat flag.
+      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+      #   nm: unknown option "B" ignored
+      # Tru64's nm complains that /dev/null is an invalid object file
+      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+      */dev/null* | *'Invalid file or object type'*)
+	lt_cv_path_NM="$tmp_nm -B"
+	break
+        ;;
+      *)
+	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	*/dev/null*)
+	  lt_cv_path_NM="$tmp_nm -p"
+	  break
+	  ;;
+	*)
+	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	  continue # so that we can try to find one that supports BSD flags
+	  ;;
+	esac
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+fi])
+NM="$lt_cv_path_NM"
+])# AC_PROG_NM
+
+
+# AC_CHECK_LIBM
+# -------------
+# check for math library
+AC_DEFUN([AC_CHECK_LIBM],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  ;;
+esac
+])# AC_CHECK_LIBM
+
+
+# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
+# -----------------------------------
+# sets LIBLTDL to the link flags for the libltdl convenience library and
+# LTDLINCL to the include flags for the libltdl header and adds
+# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
+# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
+# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
+# '${top_srcdir}/' (note the single quotes!).  If your package is not
+# flat and you're not using automake, define top_builddir and
+# top_srcdir appropriately in the Makefiles.
+AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  case $enable_ltdl_convenience in
+  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+  "") enable_ltdl_convenience=yes
+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+  esac
+  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_CONVENIENCE
+
+
+# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
+# -----------------------------------
+# sets LIBLTDL to the link flags for the libltdl installable library and
+# LTDLINCL to the include flags for the libltdl header and adds
+# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
+# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+# DIRECTORY is not provided and an installed libltdl is not found, it is
+# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
+# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
+# quotes!).  If your package is not flat and you're not using automake,
+# define top_builddir and top_srcdir appropriately in the Makefiles.
+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  AC_CHECK_LIB(ltdl, lt_dlinit,
+  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+  [if test x"$enable_ltdl_install" = xno; then
+     AC_MSG_WARN([libltdl not installed, but installation disabled])
+   else
+     enable_ltdl_install=yes
+   fi
+  ])
+  if test x"$enable_ltdl_install" = x"yes"; then
+    ac_configure_args="$ac_configure_args --enable-ltdl-install"
+    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  else
+    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+    LIBLTDL="-lltdl"
+    LTDLINCL=
+  fi
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_INSTALLABLE
+
+
+# AC_LIBTOOL_CXX
+# --------------
+# enable support for C++ libraries
+AC_DEFUN([AC_LIBTOOL_CXX],
+[AC_REQUIRE([_LT_AC_LANG_CXX])
+])# AC_LIBTOOL_CXX
+
+
+# _LT_AC_LANG_CXX
+# ---------------
+AC_DEFUN([_LT_AC_LANG_CXX],
+[AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([AC_PROG_CXXCPP])
+_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,CXX" | sed 's/^,//'`])
+])# _LT_AC_LANG_CXX
+
+
+# AC_LIBTOOL_F77
+# --------------
+# enable support for Fortran 77 libraries
+AC_DEFUN([AC_LIBTOOL_F77],
+[AC_REQUIRE([_LT_AC_LANG_F77])
+])# AC_LIBTOOL_F77
+
+
+# _LT_AC_LANG_F77
+# ---------------
+AC_DEFUN([_LT_AC_LANG_F77],
+[AC_REQUIRE([AC_PROG_F77])
+_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,F77" | sed 's/^,//'`])
+])# _LT_AC_LANG_F77
+
+
+# AC_LIBTOOL_GCJ
+# --------------
+# enable support for GCJ libraries
+AC_DEFUN([AC_LIBTOOL_GCJ],
+[AC_REQUIRE([_LT_AC_LANG_GCJ])
+])# AC_LIBTOOL_GCJ
+
+
+# _LT_AC_LANG_GCJ
+# ---------------
+AC_DEFUN([_LT_AC_LANG_GCJ],
+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
+      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
+_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,GCJ" | sed 's/^,//'`])
+])# _LT_AC_LANG_GCJ
+
+
+# AC_LIBTOOL_RC
+# --------------
+# enable support for Windows resource files
+AC_DEFUN([AC_LIBTOOL_RC],
+[AC_REQUIRE([LT_AC_PROG_RC])
+_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,RC" | sed 's/^,//'`])
+])# AC_LIBTOOL_RC
+
+
+# AC_LIBTOOL_LANG_C_CONFIG
+# ------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
+AC_DEFUN([_LT_AC_LANG_C_CONFIG],
+[lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;\n"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}\n'
+
+_LT_AC_SYS_COMPILER
+
+#
+# Check for any special shared library compilation flags.
+#
+_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
+if test "$GCC" = no; then
+  case $host_os in
+  sco3.2v5*)
+    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
+    ;;
+  esac
+fi
+if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
+  AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
+  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ 	]]" >/dev/null; then :
+  else
+    AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
+    _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
+  fi
+fi
+
+
+#
+# Check to make sure the static flag actually works.
+#
+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
+  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
+  [],
+  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+
+
+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+AC_LIBTOOL_SYS_LIB_STRIP
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_DLOPEN_SELF($1)
+
+# Report which librarie types wil actually be built
+AC_MSG_CHECKING([if libtool supports shared libraries])
+AC_MSG_RESULT([$can_build_shared])
+
+AC_MSG_CHECKING([whether to build shared libraries])
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case "$host_os" in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+
+aix4*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
+  ;;
+  darwin* | rhapsody*)
+  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then 
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    case "$host_os" in
+    rhapsody* | darwin1.[[012]])
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+      ;;
+    *) # Darwin 1.3 on
+      test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+      ;;
+    esac
+    # FIXME: Relying on posixy $() will cause problems for
+    #        cross-compilation, but unfortunately the echo tests do not
+    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+    #	       `"' quotes if we put them in here... so don't!
+		output_verbose_link_cmd='echo'
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
+    _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+		  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+		  _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    fi
+    ;;  
+esac
+AC_MSG_RESULT([$enable_shared])
+
+AC_MSG_CHECKING([whether to build static libraries])
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+AC_MSG_RESULT([$enable_static])
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_C_CONFIG
+
+
+# AC_LIBTOOL_LANG_CXX_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
+AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+[AC_LANG_PUSH(C++)
+AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([AC_PROG_CXXCPP])
+
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+_LT_AC_TAGVAR(always_export_symbols, $1)=no
+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_direct, $1)=no
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(module_cmds, $1)=
+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_AC_TAGVAR(no_undefined_flag, $1)=
+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Dependencies to place before and after the object being linked:
+_LT_AC_TAGVAR(predep_objects, $1)=
+_LT_AC_TAGVAR(postdep_objects, $1)=
+_LT_AC_TAGVAR(predeps, $1)=
+_LT_AC_TAGVAR(postdeps, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+
+# Source file extension for C++ test sources.
+ac_ext=cc
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;\n"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_LD=$LD
+lt_save_GCC=$GCC
+GCC=$GXX
+lt_save_with_gnu_ld=$with_gnu_ld
+lt_save_path_LD=$lt_cv_path_LD
+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+else
+  unset lt_cv_prog_gnu_ld
+fi
+if test -n "${lt_cv_path_LDCXX+set}"; then
+  lt_cv_path_LD=$lt_cv_path_LDCXX
+else
+  unset lt_cv_path_LD
+fi
+test -z "${LDCXX+set}" || LD=$LDCXX
+CC=${CXX-"c++"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+
+# We don't want -fno-exception wen compiling C++ code, so set the
+# no_builtin_flag separately
+if test "$GXX" = yes; then
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+else
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+fi
+
+if test "$GXX" = yes; then
+  # Set up default GNU C++ configuration
+
+  AC_PROG_LD
+
+  # Check if GNU C++ uses GNU ld as the underlying linker, since the
+  # archiving commands below assume that GNU ld is being used.
+  if test "$with_gnu_ld" = yes; then
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+    #     investigate it a little bit more. (MM)
+    wlarc='${wl}'
+
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+	grep 'no-whole-archive' > /dev/null; then
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    with_gnu_ld=no
+    wlarc=
+
+    # A generic and very simple default shared library creation
+    # command for GNU C++ for the case where it uses the native
+    # linker, instead of GNU ld.  If possible, this setting should
+    # overridden to take advantage of the native linker features on
+    # the platform it is being used on.
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+  fi
+
+  # Commands to make compiler produce verbose output that lists
+  # what "hidden" libraries, object files and flags are used when
+  # linking a shared library.
+  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+else
+  GXX=no
+  with_gnu_ld=no
+  wlarc=
+fi
+
+# PORTME: fill in a description of your system's C++ link characteristics
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+case $host_os in
+  aix3*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  aix4* | aix5*)
+    if test "$host_cpu" = ia64; then
+      # On IA64, the linker does run time linking by default, so we don't
+      # have to do anything special.
+      aix_use_runtimelinking=no
+      exp_sym_flag='-Bexport'
+      no_entry_flag=""
+    else
+      aix_use_runtimelinking=no
+
+      # Test if we are trying to use run time linking or normal
+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+      # need to do runtime linking.
+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+	for ld_flag in $LDFLAGS; do
+	  case $ld_flag in
+	  *-brtl*)
+	    aix_use_runtimelinking=yes
+	    break
+	    ;;
+	  esac
+	done
+      esac
+
+      exp_sym_flag='-bexport'
+      no_entry_flag='-bnoentry'
+    fi
+
+    # When large executables or shared objects are built, AIX ld can
+    # have problems creating the table of contents.  If linking a library
+    # or program results in "error TOC overflow" add -mminimal-toc to
+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+    _LT_AC_TAGVAR(archive_cmds, $1)=''
+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+    if test "$GXX" = yes; then
+      case $host_os in aix4.[012]|aix4.[012].*)
+      # We only want to do this on AIX 4.2 and lower, the check
+      # below for broken collect2 doesn't work under 4.3+
+	collect2name=`${CC} -print-prog-name=collect2`
+	if test -f "$collect2name" && \
+	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	then
+	  # We have reworked collect2
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	else
+	  # We have old collect2
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+	fi
+      esac
+      shared_flag='-shared'
+    else
+      # not using gcc
+      if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	shared_flag='-G'
+      else
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag='${wl}-G'
+	else
+	  shared_flag='${wl}-bM:SRE'
+	fi
+      fi
+    fi
+
+    # It seems that -bexpall does not export symbols beginning with
+    # underscore (_), so it is better to generate a list of symbols to export.
+    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+    if test "$aix_use_runtimelinking" = yes; then
+      # Warning - without using the other runtime loading flags (-brtl),
+      # -berok will link without error, but may produce a broken library.
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+      # Determine the default libpath from the value encoded in an empty executable.
+      _LT_AC_SYS_LIBPATH_AIX
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+     else
+      if test "$host_cpu" = ia64; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+      else
+	# Determine the default libpath from the value encoded in an empty executable.
+	_LT_AC_SYS_LIBPATH_AIX
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	# Warning - without using the other run time loading flags,
+	# -berok will link without error, but may produce a broken library.
+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	# -bexpall does not export symbols beginning with underscore (_)
+	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
+	# Exported symbols can be pulled into shared objects from archives
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+	# This is similar to how AIX traditionally builds it's shared libraries.
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+      fi
+    fi
+    ;;
+  chorus*)
+    case $cc_basename in
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+
+  cygwin* | mingw* | pw32*)
+    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+    # as there is no search path for DLLs.
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+    _LT_AC_TAGVAR(always_export_symbols, $1)=no
+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      # If the export-symbols file already is a .def file (1st line
+      # is EXPORTS), use it as is; otherwise, prepend...
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	cp $export_symbols $output_objdir/$soname.def;
+      else
+	echo EXPORTS > $output_objdir/$soname.def;
+	cat $export_symbols >> $output_objdir/$soname.def;
+      fi~
+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+  ;;
+
+  darwin* | rhapsody*)
+   if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then 
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    case "$host_os" in
+    rhapsody* | darwin1.[[012]])
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+      ;;
+    *) # Darwin 1.3 on
+      test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+      ;;
+    esac
+    	lt_int_apple_cc_single_mod=no
+    	output_verbose_link_cmd='echo'
+    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+    	  lt_int_apple_cc_single_mod=yes
+    	fi
+    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+    	else
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      fi
+      _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+
+    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      else
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      fi
+        _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+   fi 
+    ;;
+
+  dgux*)
+    case $cc_basename in
+      ec++)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      ghcx)
+	# Green Hills C++ Compiler
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  freebsd[12]*)
+    # C++ shared libraries reported to be fairly broken before switch to ELF
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  freebsd-elf*)
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    ;;
+  freebsd*)
+    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+    # conventions
+    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+    ;;
+  gnu*)
+    ;;
+  hpux9*)
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				# but as the default
+				# location of the library.
+
+    case $cc_basename in
+    CC)
+      # FIXME: insert proper C++ library support
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    aCC)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      #
+      # There doesn't appear to be a way to prevent this compiler from
+      # explicitly linking system object files so we need to strip them
+      # from the output so that they don't get included in the library
+      # dependencies.
+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+      ;;
+    *)
+      if test "$GXX" = yes; then
+        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+        # FIXME: insert proper C++ library support
+        _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+    ;;
+  hpux10*|hpux11*)
+    if test $with_gnu_ld = no; then
+      case "$host_cpu" in
+      hppa*64*)
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+        ;;
+      ia64*)
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+        ;;
+      *)
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        ;;
+      esac
+    fi
+    case "$host_cpu" in
+    hppa*64*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+    ia64*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					      # but as the default
+					      # location of the library.
+      ;;
+    *)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					      # but as the default
+					      # location of the library.
+      ;;
+    esac
+
+    case $cc_basename in
+      CC)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      aCC)
+	case "$host_cpu" in
+	hppa*64*|ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	esac
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes; then
+	  if test $with_gnu_ld = no; then
+	    case "$host_cpu" in
+	    ia64*|hppa*64*)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+	      ;;
+	    *)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    esac
+	  fi
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+    esac
+    ;;
+  irix5* | irix6*)
+    case $cc_basename in
+      CC)
+	# SGI C++
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+
+	# Archives containing C++ object files must be created using
+	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	# necessary to make sure instantiated templates are included
+	# in the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	;;
+      *)
+	if test "$GXX" = yes; then
+	  if test "$with_gnu_ld" = no; then
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	  else
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+	  fi
+	fi
+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+	;;
+    esac
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+    ;;
+  linux*)
+    case $cc_basename in
+      KCC)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+	# Archives containing C++ object files must be created using
+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	;;
+      icpc)
+	# Intel C++
+	with_gnu_ld=yes
+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	;;
+      cxx)
+	# Compaq C++
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	runpath_var=LD_RUN_PATH
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+    esac
+    ;;
+  lynxos*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  m88k*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  mvs*)
+    case $cc_basename in
+      cxx)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  netbsd*)
+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+      wlarc=
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    fi
+    # Workaround some broken pre-1.5 toolchains
+    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+    ;;
+  osf3*)
+    case $cc_basename in
+      KCC)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Archives containing C++ object files must be created using
+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+
+	;;
+      RCC)
+	# Rational C++ 2.4.1
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      cxx)
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	  # Commands to make compiler produce verbose output that lists
+	  # what "hidden" libraries, object files and flags are used when
+	  # linking a shared library.
+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+    esac
+    ;;
+  osf4* | osf5*)
+    case $cc_basename in
+      KCC)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Archives containing C++ object files must be created using
+	# the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+	;;
+      RCC)
+	# Rational C++ 2.4.1
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      cxx)
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	  echo "-hidden">> $lib.exp~
+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
+	  $rm $lib.exp'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	  # Commands to make compiler produce verbose output that lists
+	  # what "hidden" libraries, object files and flags are used when
+	  # linking a shared library.
+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+    esac
+    ;;
+  psos*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  sco*)
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    case $cc_basename in
+      CC)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  sunos4*)
+    case $cc_basename in
+      CC)
+	# Sun C++ 4.x
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      lcc)
+	# Lucid
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  solaris*)
+    case $cc_basename in
+      CC)
+	# Sun C++ 4.2, 5.x and Centerline C++
+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	case $host_os in
+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+	  *)
+	    # The C++ compiler is used as linker so we must use $wl
+	    # flag to pass the commands to the underlying system
+	    # linker.
+	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	esac
+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+
+	# Archives containing C++ object files must be created using
+	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	# necessary to make sure instantiated templates are included
+	# in the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	;;
+      gcx)
+	# Green Hills C++ Compiler
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	# The C++ compiler must be used to create the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	;;
+      *)
+	# GNU C++ compiler with Solaris linker
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+	  else
+	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	    # platform.
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+	  fi
+
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	fi
+	;;
+    esac
+    ;;
+  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    ;;
+  tandem*)
+    case $cc_basename in
+      NCC)
+	# NonStop-UX NCC 3.20
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  vxworks*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  *)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+esac
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_AC_TAGVAR(GCC, $1)="$GXX"
+_LT_AC_TAGVAR(LD, $1)="$LD"
+
+AC_LIBTOOL_POSTDEP_PREDEP($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+AC_LIBTOOL_SYS_LIB_STRIP
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_DLOPEN_SELF($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC=$lt_save_CC
+LDCXX=$LD
+LD=$lt_save_LD
+GCC=$lt_save_GCC
+with_gnu_ldcxx=$with_gnu_ld
+with_gnu_ld=$lt_save_with_gnu_ld
+lt_cv_path_LDCXX=$lt_cv_path_LD
+lt_cv_path_LD=$lt_save_path_LD
+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+])# AC_LIBTOOL_LANG_CXX_CONFIG
+
+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+# ------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
+int a;
+void foo (void) { a = 0; }
+EOF
+],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+EOF
+],[$1],[F77],[cat > conftest.$ac_ext <<EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+EOF
+],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+EOF
+])
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  # The `*' in the case matches for architectures that use `case' in
+  # $output_verbose_cmd can trigger glob expansion during the loop
+  # eval without this substitution.
+  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
+
+  for p in `eval $output_verbose_link_cmd`; do
+    case $p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" \
+	  || test $p = "-R"; then
+	 prev=$p
+	 continue
+       else
+	 prev=
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 case $p in
+	 -L* | -R*)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
+	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       ;;
+
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
+	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
+	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$rm -f confest.$objext
+
+case " $_LT_AC_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+])# AC_LIBTOOL_POSTDEP_PREDEP
+
+# AC_LIBTOOL_LANG_F77_CONFIG
+# ------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
+AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
+[AC_REQUIRE([AC_PROG_F77])
+AC_LANG_PUSH(Fortran 77)
+
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+_LT_AC_TAGVAR(always_export_symbols, $1)=no
+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_direct, $1)=no
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(module_cmds, $1)=
+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_AC_TAGVAR(no_undefined_flag, $1)=
+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="      program t\n      end\n"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${F77-"f77"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+
+AC_MSG_CHECKING([if libtool supports shared libraries])
+AC_MSG_RESULT([$can_build_shared])
+
+AC_MSG_CHECKING([whether to build shared libraries])
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case "$host_os" in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+aix4*)
+  test "$enable_shared" = yes && enable_static=no
+  ;;
+esac
+AC_MSG_RESULT([$enable_shared])
+
+AC_MSG_CHECKING([whether to build static libraries])
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+AC_MSG_RESULT([$enable_static])
+
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_AC_TAGVAR(GCC, $1)="$G77"
+_LT_AC_TAGVAR(LD, $1)="$LD"
+
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+AC_LIBTOOL_SYS_LIB_STRIP
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_F77_CONFIG
+
+
+# AC_LIBTOOL_LANG_GCJ_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
+[AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}\n"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${GCJ-"gcj"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+
+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+AC_LIBTOOL_SYS_LIB_STRIP
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_DLOPEN_SELF($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_GCJ_CONFIG
+
+
+# AC_LIBTOOL_LANG_RC_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the Windows resource compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
+AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
+[AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${RC-"windres"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_RC_CONFIG
+
+
+# AC_LIBTOOL_CONFIG([TAGNAME])
+# ----------------------------
+# If TAGNAME is not passed, then create an initial libtool script
+# with a default configuration from the untagged config vars.  Otherwise
+# add code to config.status for appending the configuration named by
+# TAGNAME from the matching tagged config vars.
+AC_DEFUN([AC_LIBTOOL_CONFIG],
+[# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi  
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    _LT_AC_TAGVAR(compiler, $1) \
+    _LT_AC_TAGVAR(CC, $1) \
+    _LT_AC_TAGVAR(LD, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
+    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
+    _LT_AC_TAGVAR(old_archive_cmds, $1) \
+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
+    _LT_AC_TAGVAR(predep_objects, $1) \
+    _LT_AC_TAGVAR(postdep_objects, $1) \
+    _LT_AC_TAGVAR(predeps, $1) \
+    _LT_AC_TAGVAR(postdeps, $1) \
+    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+    _LT_AC_TAGVAR(archive_cmds, $1) \
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+    _LT_AC_TAGVAR(postinstall_cmds, $1) \
+    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
+    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
+    _LT_AC_TAGVAR(no_undefined_flag, $1) \
+    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
+    _LT_AC_TAGVAR(hardcode_automatic, $1) \
+    _LT_AC_TAGVAR(module_cmds, $1) \
+    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+    _LT_AC_TAGVAR(exclude_expsyms, $1) \
+    _LT_AC_TAGVAR(include_expsyms, $1); do
+
+    case $var in
+    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
+    _LT_AC_TAGVAR(archive_cmds, $1) | \
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+    _LT_AC_TAGVAR(module_cmds, $1) | \
+    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \   
+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\[$]0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
+    ;;
+  esac
+
+ifelse([$1], [],
+  [cfgfile="${ofile}T"
+  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+  $rm -f "$cfgfile"
+  AC_MSG_NOTICE([creating $ofile])],
+  [cfgfile="$ofile"])
+
+  cat <<__EOF__ >> "$cfgfile"
+ifelse([$1], [],
+[#! $SHELL
+
+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
+#
+# This file is part of GNU Libtool:
+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="$SED -e s/^X//"
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+
+# The names of the tagged configurations supported by this script.
+available_tags=
+
+# ### BEGIN LIBTOOL CONFIG],
+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A C compiler.
+LTCC=$lt_LTCC
+
+# A language-specific compiler.
+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+
+# Is the compiler the GNU C compiler?
+with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# The linker used to build libraries.
+LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally ".so").
+shrext='$shrext'
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+pic_mode=$pic_mode
+
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+
+# Must we lock files when doing compilation ?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
+archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
+module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
+
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
+
+# Symbols that must always be exported.
+include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
+
+ifelse([$1],[],
+[# ### END LIBTOOL CONFIG],
+[# ### END LIBTOOL TAG CONFIG: $tagname])
+
+__EOF__
+
+ifelse([$1],[], [
+  case $host_os in
+  aix3*)
+    cat <<\EOF >> "$cfgfile"
+
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+EOF
+    ;;
+  esac
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" || \
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+])
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  test -f Makefile && make "$ltmain"
+fi
+])# AC_LIBTOOL_CONFIG
+
+
+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------------------
+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+
+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+
+  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
+
+
+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+# ---------------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+[AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([AC_PROG_NM])
+AC_REQUIRE([AC_OBJEXT])
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Transform the above into a raw symbol and a C symbol.
+symxfrm='\1 \2\3 \3'
+
+# Transform an extracted symbol line into a proper C declaration
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*) # Its linker distinguishes data from code symbols
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris* | sysv5*)
+  symcode='[[BDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGISTW]]' ;;
+esac
+
+# Try without a prefix undercore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Write the raw and C identifiers.
+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if grep ' nm_test_var$' "$nlist" >/dev/null; then
+	if grep ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
+
+	  cat <<EOF >> conftest.$ac_ext
+#if defined (__STDC__) && __STDC__
+# define lt_ptr_t void *
+#else
+# define lt_ptr_t char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+  const char *name;
+  lt_ptr_t address;
+}
+lt_preloaded_symbols[[]] =
+{
+EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+	  cat <<\EOF >> conftest.$ac_ext
+  {0, (lt_ptr_t) 0}
+};
+
+#ifdef __cplusplus
+}
+#endif
+EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -f conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+
+
+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
+# ---------------------------------------
+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
+[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
+
+AC_MSG_CHECKING([for $compiler option to produce PIC])
+ ifelse([$1],[CXX],[
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+      ;;
+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | os2* | pw32*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case "$host_cpu" in
+      hppa*64*|ia64*)
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix4* | aix5*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68)
+	  # Green Hills C++ Compiler
+	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++)
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx)
+	    # Green Hills C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+	    if test "$host_cpu" != ia64; then
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+	    case "$host_cpu" in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux*)
+	case $cc_basename in
+	  KCC)
+	    # KAI C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  icpc)
+	    # Intel C++
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;; 
+	  cxx)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx)
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC)
+	    # Rational C++ 2.4.1
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx)
+	    # Digital/Compaq C++
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      sco*)
+	case $cc_basename in
+	  CC)
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx)
+	    # Green Hills C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC)
+	    # Sun C++ 4.x
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc)
+	    # Lucid
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC)
+	    # NonStop-UX NCC 3.20
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      unixware*)
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+      ;;
+
+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case "$host_cpu" in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case "$host_cpu" in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    newsos6)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    linux*)
+      case $CC in
+      icc|ecc)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      ccc)
+        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      esac
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    sco3.2v5*)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
+      ;;
+
+    solaris*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sunos4*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    uts4*)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+case "$host_os" in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+])
+
+
+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
+# ------------------------------------
+# See if the linker supports building shared libraries.
+AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ifelse([$1],[CXX],[
+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  case $host_os in
+  aix4* | aix5*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+  ;;
+  cygwin* | mingw*)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  *)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  esac
+],[
+  runpath_var=
+  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_AC_TAGVAR(archive_cmds, $1)=
+  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
+  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+  _LT_AC_TAGVAR(module_cmds, $1)=
+  _LT_AC_TAGVAR(module_expsym_cmds, $1)=  
+  _LT_AC_TAGVAR(always_export_symbols, $1)=no
+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_AC_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix3* | aix4* | aix5*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+EOF
+      fi
+      ;;
+
+    amigaos*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we can't use
+      # them.
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(always_export_symbols, $1)=no
+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris* | sysv5*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+EOF
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sunos4*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
+      runpath_var=LD_RUN_PATH
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+      # ancient GNU ld didn't support --whole-archive et. al.
+      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+ 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+      fi
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$link_static_flag"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix4* | aix5*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_AC_TAGVAR(archive_cmds, $1)=''
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[012]|aix4.[012].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" && \
+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	  then
+  	  # We have reworked collect2
+  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	  else
+  	  # We have old collect2
+  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+  	  # It fails to find uninstalled libraries when the uninstalled
+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+  	  # to unsupported forces relinking
+  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	esac
+	shared_flag='-shared'
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+  	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+  	if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+  	fi
+	fi
+      fi
+
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+       # Determine the default libpath from the value encoded in an empty executable.
+       _LT_AC_SYS_LIBPATH_AIX
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       else
+	if test "$host_cpu" = ia64; then
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an empty executable.
+	 _LT_AC_SYS_LIBPATH_AIX
+	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  # -bexpall does not export symbols beginning with underscore (_)
+	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+	  # Exported symbols can be pulled into shared objects from archives
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  # This is similar to how AIX traditionally builds it's shared libraries.
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      # see comment about different semantics on the GNU ld section
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    bsdi4*)
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+      # FIXME: Should let the user specify the lib program.
+      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    darwin* | rhapsody*)
+    if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then 
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      case "$host_os" in
+      rhapsody* | darwin1.[[012]])
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+	;;
+      *) # Darwin 1.3 on
+	test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+	;;
+      esac
+      # FIXME: Relying on posixy $() will cause problems for
+      #        cross-compilation, but unfortunately the echo tests do not
+      #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+      #	       `"' quotes if we put them in here... so don't!
+    	lt_int_apple_cc_single_mod=no
+    	output_verbose_link_cmd='echo'
+    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+    	  lt_int_apple_cc_single_mod=yes
+    	fi
+    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+    	else
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      fi
+      _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        else
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        fi
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    fi  
+      ;;
+
+    dgux*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    freebsd1*)
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
+    hpux10* | hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case "$host_cpu" in
+	hppa*64*|ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case "$host_cpu" in
+	hppa*64*|ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	case "$host_cpu" in
+	hppa*64*)
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    openbsd*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      else
+       case $host_os in
+	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	   ;;
+	 *)
+	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	   ;;
+       esac
+      fi
+      ;;
+
+    os2*)
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    sco3.2v5*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var=LD_RUN_PATH
+      hardcode_runpath_var=yes
+      ;;
+
+    solaris*)
+      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+      esac
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4.2uw2*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      hardcode_runpath_var=yes
+      runpath_var=LD_RUN_PATH
+      ;;
+
+   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      runpath_var='LD_RUN_PATH'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv5*)
+      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+      # $CC -shared without GNU ld will not create a library from C++
+      # object files and a static libstdc++, better avoid it by now
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+      ;;
+
+    uts4*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+  fi
+])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_AC_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+      $rm conftest*
+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+  
+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
+        then
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+        else
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+        fi
+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $rm conftest*
+      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
+      ;;
+    esac
+  fi
+  ;;
+esac
+])# AC_LIBTOOL_PROG_LD_SHLIBS
+
+
+# _LT_AC_FILE_LTDLL_C
+# -------------------
+# Be careful that the start marker always follows a newline.
+AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
+# /* ltdll.c starts here */
+# #define WIN32_LEAN_AND_MEAN
+# #include <windows.h>
+# #undef WIN32_LEAN_AND_MEAN
+# #include <stdio.h>
+#
+# #ifndef __CYGWIN__
+# #  ifdef __CYGWIN32__
+# #    define __CYGWIN__ __CYGWIN32__
+# #  endif
+# #endif
+#
+# #ifdef __cplusplus
+# extern "C" {
+# #endif
+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+# #ifdef __cplusplus
+# }
+# #endif
+#
+# #ifdef __CYGWIN__
+# #include <cygwin/cygwin_dll.h>
+# DECLARE_CYGWIN_DLL( DllMain );
+# #endif
+# HINSTANCE __hDllInstance_base;
+#
+# BOOL APIENTRY
+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+# {
+#   __hDllInstance_base = hInst;
+#   return TRUE;
+# }
+# /* ltdll.c ends here */
+])# _LT_AC_FILE_LTDLL_C
+
+
+# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+# ---------------------------------
+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
+
+
+# old names
+AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
+AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
+AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
+AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+
+# This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])
+
+AC_DEFUN([LT_AC_PROG_GCJ],
+[AC_CHECK_TOOL(GCJ, gcj, no)
+  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+  AC_SUBST(GCJFLAGS)
+])
+
+AC_DEFUN([LT_AC_PROG_RC],
+[AC_CHECK_TOOL(RC, windres, no)
+])
+
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+# LT_AC_PROG_SED
+# --------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+AC_DEFUN([LT_AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && break
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+SED=$lt_cv_path_SED
+])
+AC_MSG_RESULT([$SED])
+])
+
diff --git a/main/source/curl/build_vms.com b/main/source/curl/build_vms.com
new file mode 100644
index 00000000..142d846b
--- /dev/null
+++ b/main/source/curl/build_vms.com
@@ -0,0 +1,69 @@
+$!
+$
+$	on control_y then goto Common_Exit!
+$	orig = f$environment("DEFAULT")
+$	loc  = f$environment("PROCEDURE")
+$	def = f$parse("X.X;1",loc) - "X.X;1"
+$
+$	set def 'def'
+$	cc_qual = "/define=HAVE_CONFIG_H=1/include=(""../include/"",""../"",""../../openssl-0_9_7/include/"")"
+$	if p1 .eqs. "LISTING" then cc_qual = cc_qual + "/LIST/MACHINE"
+$	if p1 .eqs. "DEBUG" then cc_qual = cc_qual + "/LIST/MACHINE/DEBUG"
+$	msg_qual = ""
+$	call build "[.lib]" "*.c"
+$	call build "[.src]" "*.c"
+$	call build "[.src]" "*.msg"
+$	link /exe=curl.exe [.src]curl/lib/include=main,[.lib]curl/lib, -
+		[-.openssl-0_9_7.axp.exe.ssl]libssl/lib, -
+		[-.openssl-0_9_7.axp.exe.crypto]libcrypto/lib
+$
+$
+$	goto Common_Exit
+$build:	subroutine
+$	set noon
+$	set default 'p1'
+$	search = p2
+$	reset = f$search("reset")
+$	if f$search("CURL.OLB") .eqs. ""
+$	then
+$		LIB/CREATE/OBJECT CURL.OLB
+$	endif
+$	reset = f$search("reset",1)
+$Loop:
+$	file = f$search(search,1)
+$	if file .eqs. "" then goto EndLoop
+$		obj = f$search(f$parse(".OBJ;",file),2)
+$		if (obj .nes. "")
+$		then
+$			if (f$cvtime(f$file(file,"rdt")) .gts. f$cvtime(f$file(obj,"rdt")))
+$			then
+$				call compile 'file'
+$				lib/object curl.OLB 'f$parse(".obj;",file)'
+$			else
+$!				write sys$output "File: ''file' is up to date"
+$			endif
+$		else
+$!			write sys$output "Object for file: ''file' does not exist"
+$			call compile 'file'
+$			lib/object curl.OLB 'f$parse(".obj;",file)'
+$		endif
+$	goto Loop
+$EndLoop:
+$	purge
+$	set def 'def'
+$	endsubroutine	! Build
+$
+$compile:	subroutine
+$	set noon
+$	file = p1
+$	qual = p2+p3+p4+p5+p6+p7+p8
+$	typ = f$parse(file,,,"TYPE") - "."
+$	cmd_c = "CC "+cc_qual
+$	cmd_msg = "MESSAGE "+msg_qual
+$	x = cmd_'typ'
+$	'x' 'file'
+$	ENDSUBROUTINE	! Compile
+$
+$Common_Exit:
+$	set default 'orig'
+$	exit
diff --git a/main/source/curl/config.guess b/main/source/curl/config.guess
new file mode 100644
index 00000000..6cdcc158
--- /dev/null
+++ b/main/source/curl/config.guess
@@ -0,0 +1,1400 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002 Free Software Foundation, Inc.
+
+timestamp='2002-11-30'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Per Bothner <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit build system type.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# This shell variable is my proudest work .. or something. --bje
+
+set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
+(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
+   || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
+dummy=$tmpdir/dummy ;
+files="$dummy.c $dummy.o $dummy.rel $dummy" ;
+trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	rm -f $files ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ;
+unset files'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep __ELF__ >/dev/null
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+	        os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mipseb-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    alpha:OSF1:*:*)
+	if test $UNAME_RELEASE = "V4.0"; then
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+	fi
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	eval $set_cc_for_build
+	cat <<EOF >$dummy.s
+	.data
+\$Lformat:
+	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+
+	.text
+	.globl main
+	.align 4
+	.ent main
+main:
+	.frame \$30,16,\$26,0
+	ldgp \$29,0(\$27)
+	.prologue 1
+	.long 0x47e03d80 # implver \$0
+	lda \$2,-1
+	.long 0x47e20c21 # amask \$2,\$1
+	lda \$16,\$Lformat
+	mov \$0,\$17
+	not \$1,\$18
+	jsr \$26,printf
+	ldgp \$29,0(\$26)
+	mov 0,\$16
+	jsr \$26,exit
+	.end main
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
+	if test "$?" = 0 ; then
+		case `$dummy` in
+			0-0)
+				UNAME_MACHINE="alpha"
+				;;
+			1-0)
+				UNAME_MACHINE="alphaev5"
+				;;
+			1-1)
+				UNAME_MACHINE="alphaev56"
+				;;
+			1-101)
+				UNAME_MACHINE="alphapca56"
+				;;
+			2-303)
+				UNAME_MACHINE="alphaev6"
+				;;
+			2-307)
+				UNAME_MACHINE="alphaev67"
+				;;
+			2-1307)
+				UNAME_MACHINE="alphaev68"
+				;;
+			3-1307)
+				UNAME_MACHINE="alphaev7"
+				;;
+		esac
+	fi
+	rm -f $dummy.s $dummy && rmdir $tmpdir
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit 0 ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit 0 ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit 0 ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit 0;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit 0 ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit 0 ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit 0 ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit 0;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit 0;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit 0 ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit 0 ;;
+    DRS?6000:UNIX_SV:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+	esac ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    i86pc:SunOS:5.*:*)
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit 0 ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit 0 ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit 0 ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit 0 ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit 0 ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit 0 ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c \
+	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+	rm -f $dummy.c $dummy && rmdir $tmpdir
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit 0 ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit 0 ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit 0 ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit 0 ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit 0 ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit 0 ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit 0 ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    AViiON:dgux:*:*)
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+ 	exit 0 ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit 0 ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit 0 ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit 0 ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit 0 ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit 0 ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit 0 ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+		rm -f $dummy.c $dummy && rmdir $tmpdir
+		echo rs6000-ibm-aix3.2.5
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit 0 ;;
+    *:AIX:*:[45])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit 0 ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit 0 ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit 0 ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit 0 ;;                           # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit 0 ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit 0 ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit 0 ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit 0 ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      532)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+                          32) HP_ARCH="hppa2.0n" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+                        esac ;;
+                    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^              //' << EOF >$dummy.c
+
+              #define _HPUX_SOURCE
+              #include <stdlib.h>
+              #include <unistd.h>
+
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+		    rm -f $dummy.c $dummy && rmdir $tmpdir
+		fi ;;
+	esac
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit 0 ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit 0 ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+	rm -f $dummy.c $dummy && rmdir $tmpdir
+	echo unknown-hitachi-hiuxwe2
+	exit 0 ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit 0 ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit 0 ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit 0 ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit 0 ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit 0 ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit 0 ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit 0 ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+        exit 0 ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+        exit 0 ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+        exit 0 ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+        exit 0 ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+        exit 0 ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*T3D:*:*:*)
+	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit 0 ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:FreeBSD:*:*)
+	# Determine whether the default compiler uses glibc.
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#if __GLIBC__ >= 2
+	LIBC=gnu
+	#else
+	LIBC=
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	rm -f $dummy.c && rmdir $tmpdir
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	exit 0 ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit 0 ;;
+    i*:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit 0 ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit 0 ;;
+    x86:Interix*:3*)
+	echo i586-pc-interix3
+	exit 0 ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit 0 ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit 0 ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit 0 ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit 0 ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    *:GNU:*:*)
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit 0 ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit 0 ;;
+    arm*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    mips:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips
+	#undef mipsel
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mipsel
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	rm -f $dummy.c && rmdir $tmpdir
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	;;
+    mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips64
+	#undef mips64el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mips64el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips64
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	rm -f $dummy.c && rmdir $tmpdir
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
+	exit 0 ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit 0 ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit 0 ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
+	esac
+	exit 0 ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit 0 ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit 0 ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    x86_64:Linux:*:*)
+	echo x86_64-unknown-linux-gnu
+	exit 0 ;;
+    i*86:Linux:*:*)
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us. cd to the root directory to prevent
+	# problems with other programs or directories called `ld' in the path.
+	# Set LC_ALL=C to ensure ld outputs messages in English.
+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+			 | sed -ne '/supported targets:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported targets: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_targets" in
+	  elf32-i386)
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+		;;
+	  a.out-i386-linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit 0 ;;
+	  coff-i386)
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		exit 0 ;;
+	  "")
+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+		# one that does not give us useful --help.
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+		exit 0 ;;
+	esac
+	# Determine whether the default compiler is a.out or elf
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#ifdef __ELF__
+	# ifdef __GLIBC__
+	#  if __GLIBC__ >= 2
+	LIBC=gnu
+	#  else
+	LIBC=gnulibc1
+	#  endif
+	# else
+	LIBC=gnulibc1
+	# endif
+	#else
+	#ifdef __INTEL_COMPILER
+	LIBC=gnu
+	#else
+	LIBC=gnuaout
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	rm -f $dummy.c && rmdir $tmpdir
+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit 0 ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit 0 ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit 0 ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit 0 ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit 0 ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit 0 ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit 0 ;;
+    i*86:*:5:[78]*)
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit 0 ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit 0 ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
+        exit 0 ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit 0 ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit 0 ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit 0 ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit 0 ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit 0 ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit 0 ;;
+    M68*:*:R3V[567]*:*)
+	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && echo i486-ncr-sysv4 && exit 0 ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit 0 ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit 0 ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit 0 ;;
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit 0 ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit 0 ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit 0 ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit 0 ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit 0 ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit 0 ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        exit 0 ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit 0 ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit 0 ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit 0 ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    *:Darwin:*:*)
+	echo `uname -p`-apple-darwin${UNAME_RELEASE}
+	exit 0 ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit 0 ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit 0 ;;
+    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit 0 ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit 0 ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit 0 ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit 0 ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit 0 ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit 0 ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit 0 ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit 0 ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit 0 ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit 0 ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit 0 ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+	  ""
+#endif
+         ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+rm -f $dummy.c $dummy && rmdir $tmpdir
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit 0 ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit 0 ;;
+    c34*)
+	echo c34-convex-bsd
+	exit 0 ;;
+    c38*)
+	echo c38-convex-bsd
+	exit 0 ;;
+    c4*)
+	echo c4-convex-bsd
+	exit 0 ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+    ftp://ftp.gnu.org/pub/gnu/config/
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/main/source/curl/config.sub b/main/source/curl/config.sub
new file mode 100644
index 00000000..df03fce1
--- /dev/null
+++ b/main/source/curl/config.sub
@@ -0,0 +1,1469 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002 Free Software Foundation, Inc.
+
+timestamp='2002-11-30'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit 0;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis)
+		os=
+		basic_machine=$1
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+ 	-chorusrdb)
+ 		os=-chorusrdb
+		basic_machine=$1
+ 		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k \
+	| m32r | m68000 | m68k | m88k | mcore \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64vr | mips64vrel \
+	| mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| ns16k | ns32k \
+	| openrisc | or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| pyramid \
+	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| strongarm \
+	| tahoe | thumb | tic80 | tron \
+	| v850 | v850e \
+	| we32k \
+	| x86 | xscale | xstormy16 | xtensa \
+	| z8k)
+		basic_machine=$basic_machine-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12)
+		# Motorola 68HC11/12.
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* \
+	| bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
+	| clipper-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* \
+	| m32r-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | mcore-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39 | mipstx39el \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| pyramid-* \
+	| romp-* | rs6000-* \
+	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
+	| v850-* | v850e-* | vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+	| xtensa-* \
+	| ymp-* \
+	| z8k-*)
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	mmix*)
+		basic_machine=mmix-knuth
+		os=-mmixware
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	or32 | or32-*)
+		basic_machine=or32-unknown
+		os=-coff
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2)
+		basic_machine=i686-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc)	basic_machine=powerpc-unknown
+		;;
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3d)
+		basic_machine=alpha-cray
+		os=-unicos
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+        tic4x | c4x*)
+		basic_machine=tic4x-unknown
+		os=-coff
+		;;
+	tic54x | c54x*)
+		basic_machine=tic54x-unknown
+		os=-coff
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
+		basic_machine=sh-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparc | sparcv9 | sparcv9b)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/main/source/curl/configure b/main/source/curl/configure
new file mode 100644
index 00000000..080733d5
--- /dev/null
+++ b/main/source/curl/configure
@@ -0,0 +1,27746 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.57 for curl -.
+#
+# Report bugs to <curl-bug@haxx.se>.
+#
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+#
+# Copyright (c) 1998 - 2003 Daniel Stenberg, <daniel@haxx.se>
+# This configure script may be copied, distributed and modified under the
+# terms of the curl license; see COPYING for more details
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# Work around bugs in pre-3.0 UWIN ksh.
+$as_unset ENV MAIL MAILPATH
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    $as_unset $as_var
+  fi
+done
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)$' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\/\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+
+
+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  case $0 in
+    *[\\/]* ) as_myself=$0 ;;
+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+
+       ;;
+  esac
+  # We did not find ourselves, most probably we were run as `sh COMMAND'
+  # in which case we are not to be found in the path.
+  if test "x$as_myself" = x; then
+    as_myself=$0
+  fi
+  if test ! -f "$as_myself"; then
+    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for as_base in sh bash ksh sh5; do
+	 case $as_dir in
+	 /*)
+	   if ("$as_dir/$as_base" -c '
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+	     CONFIG_SHELL=$as_dir/$as_base
+	     export CONFIG_SHELL
+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+	   fi;;
+	 esac
+       done
+done
+;;
+  esac
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |
+    sed '
+      N
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      t loop
+      s,-$,,
+      s,^['$as_cr_digits']*\n,,
+    ' >$as_me.lineno &&
+  chmod +x $as_me.lineno ||
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensible to this).
+  . ./$as_me.lineno
+  # Exit status is that of the last command.
+  exit
+}
+
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  as_mkdir_p=false
+fi
+
+as_executable_p="test -f"
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH
+
+
+
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
+  ;;
+esac
+
+echo=${ECHO-echo}
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "$0" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+$*
+EOF
+  exit 0
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+
+if test -z "$ECHO"; then
+if test "X${echo_test_string+set}" != Xset; then
+# find a string as large as possible, as long as the shell can cope with it
+  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+       echo_test_string="`eval $cmd`" &&
+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+    then
+      break
+    fi
+  done
+fi
+
+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+   test "X$echo_testing_string" = "X$echo_test_string"; then
+  :
+else
+  # The Solaris, AIX, and Digital Unix default echo programs unquote
+  # backslashes.  This makes it impossible to quote backslashes using
+  #   echo "$something" | sed 's/\\/\\\\/g'
+  #
+  # So, first we look for a working echo in the user's PATH.
+
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for dir in $PATH /usr/ucb; do
+    IFS="$lt_save_ifs"
+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      echo="$dir/echo"
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+
+  if test "X$echo" = Xecho; then
+    # We didn't find a better echo, so look for alternatives.
+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      # This shell has a builtin print -r that does the trick.
+      echo='print -r'
+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+      # If we have ksh, try running configure again with it.
+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+      export ORIGINAL_CONFIG_SHELL
+      CONFIG_SHELL=/bin/ksh
+      export CONFIG_SHELL
+      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
+    else
+      # Try using printf.
+      echo='printf %s\n'
+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+	 test "X$echo_testing_string" = "X$echo_test_string"; then
+	# Cool, printf works
+	:
+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	export CONFIG_SHELL
+	SHELL="$CONFIG_SHELL"
+	export SHELL
+	echo="$CONFIG_SHELL $0 --fallback-echo"
+      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	echo="$CONFIG_SHELL $0 --fallback-echo"
+      else
+	# maybe with a smaller string...
+	prev=:
+
+	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+	  then
+	    break
+	  fi
+	  prev="$cmd"
+	done
+
+	if test "$prev" != 'sed 50q "$0"'; then
+	  echo_test_string=`eval $prev`
+	  export echo_test_string
+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
+	else
+	  # Oops.  We lost completely, so just stick with echo.
+	  echo=echo
+	fi
+      fi
+    fi
+  fi
+fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+ECHO=$echo
+if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
+fi
+
+
+
+
+tagnames=`echo "$tagnames,CXX" | sed 's/^,//'`
+
+tagnames=`echo "$tagnames,F77" | sed 's/^,//'`
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+exec 6>&1
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_config_libobj_dir=.
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete.  It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
+
+# Identity of this package.
+PACKAGE_NAME='curl'
+PACKAGE_TARNAME='curl'
+PACKAGE_VERSION='-'
+PACKAGE_STRING='curl -'
+PACKAGE_BUGREPORT='curl-bug@haxx.se'
+
+ac_unique_file="lib/urldata.h"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# if HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#if HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT SED INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE VERSIONNUM PKGADD_PKG PKGADD_NAME PKGADD_VENDOR build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL NO_UNDEFINED_TRUE NO_UNDEFINED_FALSE CURL_DISABLE_HTTP CURL_DISABLE_GOPHER CURL_DISABLE_FTP CURL_DISABLE_FILE CURL_DISABLE_LDAP CURL_DISABLE_DICT CURL_DISABLE_TELNET IPV6_ENABLED RANDOM_FILE KRB4_ENABLED PKGCONFIG OPENSSL_ENABLED HAVE_LIBZ PERL NROFF CURL_CA_BUNDLE YACC LIBOBJS LTLIBOBJS'
+ac_subst_files=''
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datadir='${prefix}/share'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
+
+ac_prev=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval "$ac_prev=\$ac_option"
+    ac_prev=
+    continue
+  fi
+
+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_option in
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+  | --da=*)
+    datadir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+   { (exit 1); exit 1; }; }
+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    eval "enable_$ac_feature=no" ;;
+
+  -enable-* | --enable-*)
+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+   { (exit 1); exit 1; }; }
+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "enable_$ac_feature='$ac_optarg'" ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst \
+  | --locals | --local | --loca | --loc | --lo)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
+   { (exit 1); exit 1; }; }
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "with_$ac_package='$ac_optarg'" ;;
+
+  -without-* | --without-*)
+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
+   { (exit 1); exit 1; }; }
+    ac_package=`echo $ac_package | sed 's/-/_/g'`
+    eval "with_$ac_package=no" ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+    eval "$ac_envvar='$ac_optarg'"
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  { echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
+fi
+
+# Be sure to have absolute paths.
+for ac_var in exec_prefix prefix
+do
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+              localstatedir libdir includedir oldincludedir infodir mandir
+do
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* ) ;;
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then its parent.
+  ac_confdir=`(dirname "$0") 2>/dev/null ||
+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$0" : 'X\(//\)[^/]' \| \
+         X"$0" : 'X\(//\)$' \| \
+         X"$0" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$0" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r $srcdir/$ac_unique_file; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r $srcdir/$ac_unique_file; then
+  if test "$ac_srcdir_defaulted" = yes; then
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+   { (exit 1); exit 1; }; }
+  else
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   { (exit 1); exit 1; }; }
+  fi
+fi
+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+   { (exit 1); exit 1; }; }
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CC_set=${CC+set}
+ac_env_CC_value=$CC
+ac_cv_env_CC_set=${CC+set}
+ac_cv_env_CC_value=$CC
+ac_env_CFLAGS_set=${CFLAGS+set}
+ac_env_CFLAGS_value=$CFLAGS
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ac_cv_env_CFLAGS_value=$CFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CPP_set=${CPP+set}
+ac_env_CPP_value=$CPP
+ac_cv_env_CPP_set=${CPP+set}
+ac_cv_env_CPP_value=$CPP
+ac_env_CXX_set=${CXX+set}
+ac_env_CXX_value=$CXX
+ac_cv_env_CXX_set=${CXX+set}
+ac_cv_env_CXX_value=$CXX
+ac_env_CXXFLAGS_set=${CXXFLAGS+set}
+ac_env_CXXFLAGS_value=$CXXFLAGS
+ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
+ac_cv_env_CXXFLAGS_value=$CXXFLAGS
+ac_env_CXXCPP_set=${CXXCPP+set}
+ac_env_CXXCPP_value=$CXXCPP
+ac_cv_env_CXXCPP_set=${CXXCPP+set}
+ac_cv_env_CXXCPP_value=$CXXCPP
+ac_env_F77_set=${F77+set}
+ac_env_F77_value=$F77
+ac_cv_env_F77_set=${F77+set}
+ac_cv_env_F77_value=$F77
+ac_env_FFLAGS_set=${FFLAGS+set}
+ac_env_FFLAGS_value=$FFLAGS
+ac_cv_env_FFLAGS_set=${FFLAGS+set}
+ac_cv_env_FFLAGS_value=$FFLAGS
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures curl - to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+_ACEOF
+
+  cat <<_ACEOF
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR           user executables [EPREFIX/bin]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --includedir=DIR       C header files [PREFIX/include]
+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of curl -:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-maintainer-mode enable make rules and dependencies not useful
+                          (and sometimes confusing) to the casual installer
+  --disable-dependency-tracking Speeds up one-time builds
+  --enable-dependency-tracking  Do not reject slow dependency extractors
+  --disable-largefile     omit support for large files
+  --enable-shared[=PKGS]
+                          build shared libraries [default=yes]
+  --enable-static[=PKGS]
+                          build static libraries [default=yes]
+  --enable-fast-install[=PKGS]
+                          optimize for fast installation [default=yes]
+  --disable-libtool-lock  avoid locking (might break parallel builds)
+  --enable-http           Enable HTTP support
+  --disable-http          Disable HTTP support
+  --enable-ftp            Enable FTP support
+  --disable-ftp           Disable FTP support
+  --enable-gopher         Enable GOPHER support
+  --disable-gopher        Disable GOPHER support
+  --enable-file           Enable FILE support
+  --disable-file          Disable FILE support
+  --enable-ldap           Enable LDAP support
+  --disable-ldap          Disable LDAP support
+  --enable-dict           Enable DICT support
+  --disable-dict          Disable DICT support
+  --enable-telnet         Enable TELNET support
+  --disable-telnet        Disable TELNET support
+  --enable-ipv6           Enable ipv6 (with ipv4) support
+  --disable-ipv6          Disable ipv6 support
+  --enable-libgcc         use libgcc when linking
+  --enable-nonblocking    Enable detecting how to do it
+  --disable-nonblocking   Disable non-blocking socket detection
+  --disable-thread        don't look for thread-safe functions
+  --enable-debug          Enable pedantic debug options
+  --disable-debug         Disable debug options
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-pic              try to use only PIC/non-PIC objects [default=use
+                          both]
+  --with-tags[=TAGS]
+                          include additional configurations [automatic]
+  --with-egd-socket=FILE  Entropy Gathering Daemon socket pathname
+  --with-random=FILE      read randomness from FILE (default=/dev/urandom)
+  --with-krb4-includes=DIR
+                          Specify location of kerberos4 headers
+  --with-krb4-libs=DIR    Specify location of kerberos4 libs
+  --with-krb4=DIR         where to look for Kerberos4
+  --with-ssl=PATH         where to look for SSL, PATH points to the SSL
+                          installation (default: /usr/local/ssl)
+  --without-ssl           disable SSL
+  --with-zlib=PATH        search for zlib in PATH
+  --without-zlib          disable use of zlib
+  --with-ca-bundle=FILE   File name to install the CA bundle as
+  --without-ca-bundle     Don't install the CA bundle
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+              headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+  CXX         C++ compiler command
+  CXXFLAGS    C++ compiler flags
+  CXXCPP      C++ preprocessor
+  F77         Fortran 77 compiler command
+  FFLAGS      Fortran 77 compiler flags
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to <curl-bug@haxx.se>.
+_ACEOF
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  ac_popdir=`pwd`
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d $ac_dir || continue
+    ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+    cd $ac_dir
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_srcdir/configure.gnu; then
+      echo
+      $SHELL $ac_srcdir/configure.gnu  --help=recursive
+    elif test -f $ac_srcdir/configure; then
+      echo
+      $SHELL $ac_srcdir/configure  --help=recursive
+    elif test -f $ac_srcdir/configure.ac ||
+           test -f $ac_srcdir/configure.in; then
+      echo
+      $ac_configure --help
+    else
+      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi
+    cd $ac_popdir
+  done
+fi
+
+test -n "$ac_init_help" && exit 0
+if $ac_init_version; then
+  cat <<\_ACEOF
+curl configure -
+generated by GNU Autoconf 2.57
+
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+
+Copyright (c) 1998 - 2003 Daniel Stenberg, <daniel@haxx.se>
+This configure script may be copied, distributed and modified under the
+terms of the curl license; see COPYING for more details
+_ACEOF
+  exit 0
+fi
+exec 5>config.log
+cat >&5 <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by curl $as_me -, which was
+generated by GNU Autoconf 2.57.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  echo "PATH: $as_dir"
+done
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_sep=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    2)
+      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+        ac_must_keep_next=false # Got value, back to normal.
+      else
+        case $ac_arg in
+          *=* | --config-cache | -C | -disable-* | --disable-* \
+          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+          | -with-* | --with-* | -without-* | --without-* | --x)
+            case "$ac_configure_args0 " in
+              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+            esac
+            ;;
+          -* ) ac_must_keep_next=true ;;
+        esac
+      fi
+      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+      # Get rid of the leading space.
+      ac_sep=" "
+      ;;
+    esac
+  done
+done
+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Be sure not to use single quotes in there, as some shells,
+# such as our DU 5.0 friend, will then `close' the trap.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    cat <<\_ASBOX
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+_ASBOX
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+{
+  (set) 2>&1 |
+    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      sed -n \
+        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+      ;;
+    *)
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+}
+    echo
+
+    cat <<\_ASBOX
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+_ASBOX
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=$`echo $ac_var`
+      echo "$ac_var='"'"'$ac_val'"'"'"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      cat <<\_ASBOX
+## ------------- ##
+## Output files. ##
+## ------------- ##
+_ASBOX
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=$`echo $ac_var`
+        echo "$ac_var='"'"'$ac_val'"'"'"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      cat <<\_ASBOX
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+_ASBOX
+      echo
+      sed "/^$/d" confdefs.h | sort
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      echo "$as_me: caught signal $ac_signal"
+    echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core core.* *.core &&
+  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+     ' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer explicitly selected file to automatically selected ones.
+if test -z "$CONFIG_SITE"; then
+  if test "x$prefix" != xNONE; then
+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+  else
+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  fi
+fi
+for ac_site_file in $CONFIG_SITE; do
+  if test -r "$ac_site_file"; then
+    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file"
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special
+  # files actually), so we avoid doing that.
+  if test -f "$cache_file"; then
+    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . $cache_file;;
+      *)                      . ./$cache_file;;
+    esac
+  fi
+else
+  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in `(set) 2>&1 |
+               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+  eval ac_new_val="\$ac_env_${ac_var}_value"
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+        ac_cache_corrupted=:
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                                        ac_config_headers="$ac_config_headers lib/config.h src/config.h tests/server/config.h lib/ca-bundle.h"
+
+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
+    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+  enableval="$enable_maintainer_mode"
+  USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi;
+  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
+
+
+if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+
+  MAINT=$MAINTAINER_MODE_TRUE
+
+
+
+# Extract the first word of "sed", so it can be a program name with args.
+set dummy sed; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_SED+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $SED in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_SED="$SED" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:/usr/bin:/usr/local/bin"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+SED=$ac_cv_path_SED
+
+if test -n "$SED"; then
+  echo "$as_me:$LINENO: result: $SED" >&5
+echo "${ECHO_T}$SED" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+
+VERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' ${srcdir}/include/curl/curl.h`
+am__api_version="1.7"
+ac_aux_dir=
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+  if test -f $ac_dir/install-sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f $ac_dir/install.sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f $ac_dir/shtool; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# ./install, which can be erroneously created by make from ./install.sh.
+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+  ./ | .// | /cC/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+          if test $ac_prog = install &&
+            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+            # AIX install.  It has an incompatible calling convention.
+            :
+          elif test $ac_prog = install &&
+            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+            # program-specific install script used by HP pwplus--don't use.
+            :
+          else
+            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+            break 3
+          fi
+        fi
+      done
+    done
+    ;;
+esac
+done
+
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  We don't cache a
+    # path for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the path is relative.
+    INSTALL=$ac_install_sh
+  fi
+fi
+echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" >&5
+echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" >&2;}
+   { (exit 1); exit 1; }; }
+   fi
+
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+Check your system clock" >&5
+echo "$as_me: error: newly created file is older than distributed files!
+Check your system clock" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+test "$program_prefix" != NONE &&
+  program_transform_name="s,^,$program_prefix,;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
+# Double any \ or $.  echo might interpret backslashes.
+# By default was `s,x,x', remove it if useless.
+cat <<\_ACEOF >conftest.sed
+s/[\\$]/&&/g;s/;s,x,x,$//
+_ACEOF
+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+rm conftest.sed
+
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AWK+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AWK="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$AWK" && break
+done
+
+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.make <<\_ACEOF
+all:
+	@echo 'ac_maketemp="$(MAKE)"'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+  eval ac_cv_prog_make_${ac_make}_set=yes
+else
+  eval ac_cv_prog_make_${ac_make}_set=no
+fi
+rm -f conftest.make
+fi
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  SET_MAKE=
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+ # test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+   test -f $srcdir/config.status; then
+  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE=curl
+ VERSION=$VERSION
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_STRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  STRIP=$ac_ct_STRIP
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+
+
+
+echo "$as_me:$LINENO: checking curl version" >&5
+echo $ECHO_N "checking curl version... $ECHO_C" >&6
+echo "$as_me:$LINENO: result: $VERSION" >&5
+echo "${ECHO_T}$VERSION" >&6
+
+VERSIONNUM=`$SED -ne 's/^#define LIBCURL_VERSION_NUM 0x\(.*\)/\1/p' ${srcdir}/include/curl/curl.h`
+
+
+PKGADD_PKG="HAXXcurl"
+PKGADD_NAME="cURL - a client that groks URLs"
+PKGADD_VENDOR="curl.haxx.se"
+
+
+
+
+
+
+# Make sure we can run config.sub.
+$ac_config_sub sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6
+if test "${ac_cv_build+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_build_alias=$build_alias
+test -z "$ac_cv_build_alias" &&
+  ac_cv_build_alias=`$ac_config_guess`
+test -z "$ac_cv_build_alias" &&
+  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+   { (exit 1); exit 1; }; }
+ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6
+build=$ac_cv_build
+build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+
+echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6
+if test "${ac_cv_host+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_host_alias=$host_alias
+test -z "$ac_cv_host_alias" &&
+  ac_cv_host_alias=$ac_cv_build_alias
+ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6
+host=$ac_cv_host
+host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define OS "${host}"
+_ACEOF
+
+
+rm -f .deps 2>/dev/null
+mkdir .deps 2>/dev/null
+if test -d .deps; then
+  DEPDIR=.deps
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  DEPDIR=_deps
+fi
+rmdir .deps 2>/dev/null
+
+
+          ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+doit:
+	@echo done
+END
+# If we don't find an include directive, just comment out the code.
+echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote="\""
+      _am_result=BSD
+   fi
+fi
+
+
+echo "$as_me:$LINENO: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then
+  enableval="$enable_dependency_tracking"
+
+fi;
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+
+
+if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$ac_ct_CC" && break
+done
+
+  CC=$ac_ct_CC
+fi
+
+fi
+
+
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+
+# Provide some information about the compiler.
+echo "$as_me:$LINENO:" \
+     "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+echo "$as_me:$LINENO: checking for C compiler default output" >&5
+echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+  (eval $ac_link_default) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # Find the output, starting from the most likely.  This scheme is
+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+# resort.
+
+# Be careful to initialize this variable, since it used to be cached.
+# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+ac_cv_exeext=
+# b.out is created by i960 compilers.
+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
+        ;;
+    conftest.$ac_ext )
+        # This is the source file.
+        ;;
+    [ab].out )
+        # We found the default executable, but exeext='' is most
+        # certainly right.
+        break;;
+    *.* )
+        ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+        # FIXME: I believe we export ac_cv_exeext for Libtool,
+        # but it would be cool to find out if it's true.  Does anybody
+        # maintain Libtool? --akim.
+        export ac_cv_exeext
+        break;;
+    * )
+        break;;
+  esac
+done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+See \`config.log' for more details." >&5
+echo "$as_me: error: C compiler cannot create executables
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }
+fi
+
+ac_exeext=$ac_cv_exeext
+echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6
+
+# Check the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+  if { ac_try='./$ac_file'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  fi
+fi
+echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+# Check the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6
+
+echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+          export ac_cv_exeext
+          break;;
+    * ) break;;
+  esac
+done
+else
+  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+rm -f conftest$ac_cv_exeext
+echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
+if test "${ac_cv_objext+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_compiler_gnu=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_compiler_gnu=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+GCC=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+CFLAGS="-g"
+echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_g+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_prog_cc_g=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_prog_cc_stdc=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+# Don't try gcc -ansi; that turns off useful extensions and
+# breaks some systems' header files.
+# AIX			-qlanglvl=ansi
+# Ultrix and OSF/1	-std1
+# HP-UX 10.20 and later	-Ae
+# HP-UX older versions	-Aa -D_HPUX_SOURCE
+# SVR4			-Xc -D__EXTENSIONS__
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_stdc=$ac_arg
+break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext
+done
+rm -f conftest.$ac_ext conftest.$ac_objext
+CC=$ac_save_CC
+
+fi
+
+case "x$ac_cv_prog_cc_stdc" in
+  x|xno)
+    echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;
+  *)
+    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+    CC="$CC $ac_cv_prog_cc_stdc" ;;
+esac
+
+# Some people use a C++ compiler to compile C.  Since we use `exit',
+# in C++ we need to declare it.  In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+  choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  for ac_declaration in \
+   ''\
+   '#include <stdlib.h>' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+continue
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
+fi
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+depcc="$CC"   am_compiler_list=
+
+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    echo '#include "conftest.h"' > conftest.c
+    echo 'int i;' > conftest.h
+    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=conftest.c object=conftest.o \
+       depfile=conftest.Po tmpdepfile=conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&
+       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      am_cv_CC_dependencies_compiler_type=$depmode
+      break
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+
+
+if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                     Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                     Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+if test "${ac_cv_prog_egrep+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+    then ac_cv_prog_egrep='grep -E'
+    else ac_cv_prog_egrep='egrep'
+    fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+ EGREP=$ac_cv_prog_egrep
+
+
+
+echo "$as_me:$LINENO: checking for AIX" >&5
+echo $ECHO_N "checking for AIX... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef _AIX
+  yes
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "yes" >/dev/null 2>&1; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+cat >>confdefs.h <<\_ACEOF
+#define _ALL_SOURCE 1
+_ACEOF
+
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+rm -f conftest*
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$ac_ct_CC" && break
+done
+
+  CC=$ac_ct_CC
+fi
+
+fi
+
+
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+
+# Provide some information about the compiler.
+echo "$as_me:$LINENO:" \
+     "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_compiler_gnu=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_compiler_gnu=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+GCC=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+CFLAGS="-g"
+echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_g+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_prog_cc_g=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_prog_cc_stdc=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+# Don't try gcc -ansi; that turns off useful extensions and
+# breaks some systems' header files.
+# AIX			-qlanglvl=ansi
+# Ultrix and OSF/1	-std1
+# HP-UX 10.20 and later	-Ae
+# HP-UX older versions	-Aa -D_HPUX_SOURCE
+# SVR4			-Xc -D__EXTENSIONS__
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_stdc=$ac_arg
+break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext
+done
+rm -f conftest.$ac_ext conftest.$ac_objext
+CC=$ac_save_CC
+
+fi
+
+case "x$ac_cv_prog_cc_stdc" in
+  x|xno)
+    echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;
+  *)
+    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+    CC="$CC $ac_cv_prog_cc_stdc" ;;
+esac
+
+# Some people use a C++ compiler to compile C.  Since we use `exit',
+# in C++ we need to declare it.  In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+  choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  for ac_declaration in \
+   ''\
+   '#include <stdlib.h>' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+continue
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
+fi
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+depcc="$CC"   am_compiler_list=
+
+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    echo '#include "conftest.h"' > conftest.c
+    echo 'int i;' > conftest.h
+    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=conftest.c object=conftest.o \
+       depfile=conftest.Po tmpdepfile=conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&
+       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      am_cv_CC_dependencies_compiler_type=$depmode
+      break
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+
+
+if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+
+# Check whether --enable-largefile or --disable-largefile was given.
+if test "${enable_largefile+set}" = set; then
+  enableval="$enable_largefile"
+
+fi;
+if test "$enable_largefile" != no; then
+
+  echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
+echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
+if test "${ac_cv_sys_largefile_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_sys_largefile_CC=no
+     if test "$GCC" != yes; then
+       ac_save_CC=$CC
+       while :; do
+     	 # IRIX 6.2 and later do not support large files by default,
+     	 # so use the C compiler's -n32 option if that helps.
+         cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+     	 rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext
+     	 CC="$CC -n32"
+     	 rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sys_largefile_CC=' -n32'; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext
+         break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
+echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
+
+  echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
+if test "${ac_cv_sys_file_offset_bits+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  while :; do
+  ac_cv_sys_file_offset_bits=no
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sys_file_offset_bits=64; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  break
+done
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
+echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
+if test "$ac_cv_sys_file_offset_bits" != no; then
+
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
+
+fi
+rm -f conftest*
+  echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
+echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
+if test "${ac_cv_sys_large_files+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  while :; do
+  ac_cv_sys_large_files=no
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sys_large_files=1; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  break
+done
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
+echo "${ECHO_T}$ac_cv_sys_large_files" >&6
+if test "$ac_cv_sys_large_files" != no; then
+
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+
+fi
+rm -f conftest*
+fi
+
+
+
+
+
+# Check whether --enable-shared or --disable-shared was given.
+if test "${enable_shared+set}" = set; then
+  enableval="$enable_shared"
+  p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_shared=yes
+fi;
+
+# Check whether --enable-static or --disable-static was given.
+if test "${enable_static+set}" = set; then
+  enableval="$enable_static"
+  p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_static=yes
+fi;
+
+# Check whether --enable-fast-install or --disable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then
+  enableval="$enable_fast_install"
+  p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_fast_install=yes
+fi;
+
+echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
+if test "${lt_cv_path_SED+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  # Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && break
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+SED=$lt_cv_path_SED
+
+fi
+
+echo "$as_me:$LINENO: result: $SED" >&5
+echo "${ECHO_T}$SED" >&6
+
+
+# Check whether --with-gnu-ld or --without-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then
+  withval="$with_gnu_ld"
+  test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi;
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+else
+  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+fi
+if test "${lt_cv_path_LD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some GNU ld's only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+if test "${lt_cv_prog_gnu_ld+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+case `"$LD" -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
+if test "${lt_cv_ld_reload_flag+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_ld_reload_flag='-r'
+fi
+echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+
+echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
+if test "${lt_cv_path_NM+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+      # Check to see if the nm accepts a BSD-compat flag.
+      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+      #   nm: unknown option "B" ignored
+      # Tru64's nm complains that /dev/null is an invalid object file
+      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+      */dev/null* | *'Invalid file or object type'*)
+	lt_cv_path_NM="$tmp_nm -B"
+	break
+        ;;
+      *)
+	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	*/dev/null*)
+	  lt_cv_path_NM="$tmp_nm -p"
+	  break
+	  ;;
+	*)
+	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	  continue # so that we can try to find one that supports BSD flags
+	  ;;
+	esac
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+fi
+fi
+echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+echo "${ECHO_T}$lt_cv_path_NM" >&6
+NM="$lt_cv_path_NM"
+
+echo "$as_me:$LINENO: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6
+fi
+
+echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
+if test "${lt_cv_deplibs_check_method+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix4* | aix5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi4*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin* | mingw* | pw32*)
+  # win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='win32_libid'
+  ;;
+
+darwin* | rhapsody*)
+  # this will be overwritten by pass_all, but leave it in just in case
+  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  case "$host_os" in
+  rhapsody* | darwin1.[012])
+    lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
+    ;;
+  *) # Darwin 1.3 on
+    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+    ;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd*)
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case "$host_cpu" in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+  irix5* | nonstopux*)
+    # this will be overridden with pass_all, but let us keep it just in case
+    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+    ;;
+  *)
+    case $LD in
+    *-32|*"-32 ") libmagic=32-bit;;
+    *-n32|*"-n32 ") libmagic=N32;;
+    *-64|*"-64 ") libmagic=64-bit;;
+    *) libmagic=never-match;;
+    esac
+    # this will be overridden with pass_all, but let us keep it just in case
+    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
+    ;;
+  esac
+  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be Linux ELF.
+linux*)
+  case $host_cpu in
+  alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*)
+    lt_cv_deplibs_check_method=pass_all ;;
+  *)
+    # glibc up to 2.1.1 does not perform some relocations on ARM
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
+  esac
+  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+nto-qnx)
+  lt_cv_deplibs_check_method=unknown
+  ;;
+
+openbsd*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+  else
+    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  # this will be overridden with pass_all, but let us keep it just in case
+  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sco3.2v5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  lt_cv_file_magic_test_file=/lib/libc.so
+  ;;
+
+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then
+  enableval="$enable_libtool_lock"
+
+fi;
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *ELF-32*)
+      HPUX_IA64_MODE="32"
+      ;;
+    *ELF-64*)
+      HPUX_IA64_MODE="64"
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '#line 4985 "configure"' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+   if test "$lt_cv_prog_gnu_ld" = yes; then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -melf32bsmip"
+      ;;
+    *N32*)
+      LD="${LD-ld} -melf32bmipn32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -melf64bmip"
+      ;;
+    esac
+   else
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -32"
+      ;;
+    *N32*)
+      LD="${LD-ld} -n32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -64"
+      ;;
+    esac
+   fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    case "`/usr/bin/file conftest.o`" in
+    *32-bit*)
+      case $host in
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_i386"
+          ;;
+        ppc64-*linux*)
+          LD="${LD-ld} -m elf32ppclinux"
+          ;;
+        s390x-*linux*)
+          LD="${LD-ld} -m elf_s390"
+          ;;
+        sparc64-*linux*)
+          LD="${LD-ld} -m elf32_sparc"
+          ;;
+      esac
+      ;;
+    *64-bit*)
+      case $host in
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        ppc*-*linux*|powerpc*-*linux*)
+          LD="${LD-ld} -m elf64ppc"
+          ;;
+        s390*-*linux*)
+          LD="${LD-ld} -m elf64_s390"
+          ;;
+        sparc*-*linux*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
+if test "${lt_cv_cc_needs_belf+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+     cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  lt_cv_cc_needs_belf=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+lt_cv_cc_needs_belf=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_DLLTOOL+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  echo "$as_me:$LINENO: result: $DLLTOOL" >&5
+echo "${ECHO_T}$DLLTOOL" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_ac_ct_DLLTOOL" && ac_cv_prog_ac_ct_DLLTOOL="false"
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
+echo "${ECHO_T}$ac_ct_DLLTOOL" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  DLLTOOL=$ac_ct_DLLTOOL
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AS+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$AS"; then
+  ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AS="${ac_tool_prefix}as"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+  echo "$as_me:$LINENO: result: $AS" >&5
+echo "${ECHO_T}$AS" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_AS"; then
+  ac_ct_AS=$AS
+  # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_AS"; then
+  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AS="as"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="false"
+fi
+fi
+ac_ct_AS=$ac_cv_prog_ac_ct_AS
+if test -n "$ac_ct_AS"; then
+  echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
+echo "${ECHO_T}$ac_ct_AS" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  AS=$ac_ct_AS
+else
+  AS="$ac_cv_prog_AS"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+echo "${ECHO_T}$OBJDUMP" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false"
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+echo "${ECHO_T}$ac_ct_OBJDUMP" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  OBJDUMP=$ac_ct_OBJDUMP
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+  ;;
+
+esac
+
+need_locks="$enable_libtool_lock"
+
+
+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+if test "${ac_cv_header_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_header_stdc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_header_stdc=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then
+  :
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ctype.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+                   (('a' <= (c) && (c) <= 'i') \
+                     || ('j' <= (c) && (c) <= 'r') \
+                     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+        || toupper (i) != TOUPPER (i))
+      exit(2);
+  exit (0);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6
+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+
+
+
+
+
+
+
+
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+                  inttypes.h stdint.h unistd.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+for ac_header in dlfcn.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CXX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+    test -n "$CXX" && break
+  done
+fi
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CXX"; then
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$ac_ct_CXX" && break
+done
+test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
+
+  CXX=$ac_ct_CXX
+fi
+
+
+# Provide some information about the compiler.
+echo "$as_me:$LINENO:" \
+     "checking for C++ compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_compiler_gnu=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_compiler_gnu=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+GXX=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="-g"
+echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_cxx_g+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cxx_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_prog_cxx_g=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+for ac_declaration in \
+   ''\
+   '#include <stdlib.h>' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+continue
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
+fi
+
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+depcc="$CXX"  am_compiler_list=
+
+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+
+  am_cv_CXX_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    echo '#include "conftest.h"' > conftest.c
+    echo 'int i;' > conftest.h
+    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=conftest.c object=conftest.o \
+       depfile=conftest.Po tmpdepfile=conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&
+       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      am_cv_CXX_dependencies_compiler_type=$depmode
+      break
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CXX_dependencies_compiler_type=none
+fi
+
+fi
+echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+
+
+if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+  am__fastdepCXX_TRUE=
+  am__fastdepCXX_FALSE='#'
+else
+  am__fastdepCXX_TRUE='#'
+  am__fastdepCXX_FALSE=
+fi
+
+
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+if test -z "$CXXCPP"; then
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                     Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
+
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
+
+fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+echo "$as_me:$LINENO: result: $CXXCPP" >&5
+echo "${ECHO_T}$CXXCPP" >&6
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                     Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." >&5
+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+ac_ext=f
+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_F77+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$F77"; then
+  ac_cv_prog_F77="$F77" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+F77=$ac_cv_prog_F77
+if test -n "$F77"; then
+  echo "$as_me:$LINENO: result: $F77" >&5
+echo "${ECHO_T}$F77" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+    test -n "$F77" && break
+  done
+fi
+if test -z "$F77"; then
+  ac_ct_F77=$F77
+  for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_F77"; then
+  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_F77="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+ac_ct_F77=$ac_cv_prog_ac_ct_F77
+if test -n "$ac_ct_F77"; then
+  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+echo "${ECHO_T}$ac_ct_F77" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$ac_ct_F77" && break
+done
+
+  F77=$ac_ct_F77
+fi
+
+
+# Provide some information about the compiler.
+echo "$as_me:6468:" \
+     "checking for Fortran 77 compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+# If we don't use `.F' as extension, the preprocessor is not run on the
+# input file.
+ac_save_ext=$ac_ext
+ac_ext=F
+echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
+if test "${ac_cv_f77_compiler_gnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+      program main
+#ifndef __GNUC__
+       choke me
+#endif
+
+      end
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_compiler_gnu=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_compiler_gnu=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_cv_f77_compiler_gnu=$ac_compiler_gnu
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
+ac_ext=$ac_save_ext
+G77=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_FFLAGS=${FFLAGS+set}
+ac_save_FFLAGS=$FFLAGS
+FFLAGS=
+echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_f77_g+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  FFLAGS=-g
+cat >conftest.$ac_ext <<_ACEOF
+      program main
+
+      end
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_f77_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_prog_f77_g=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
+if test "$ac_test_FFLAGS" = set; then
+  FFLAGS=$ac_save_FFLAGS
+elif test $ac_cv_prog_f77_g = yes; then
+  if test "$G77" = yes; then
+    FFLAGS="-g -O2"
+  else
+    FFLAGS="-g"
+  fi
+else
+  if test "$G77" = yes; then
+    FFLAGS="-O2"
+  else
+    FFLAGS=
+  fi
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+
+# find the maximum length of command line arguments
+echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+    i=0
+  testring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+ *)
+    # If test is not a shell built-in, we'll probably end up computing a
+    # maximum length that is only half of the actual maximum length, but
+    # we can't tell.
+    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
+	       = "XX$testring") >/dev/null 2>&1 &&
+	    new_result=`expr "X$testring" : ".*" 2>&1` &&
+	    lt_cv_sys_max_cmd_len=$new_result &&
+	    test $i != 17 # 1/2 MB should be enough
+    do
+      i=`expr $i + 1`
+      testring=$testring$testring
+    done
+    testring=
+    # Add a significant safety factor because C++ compilers can tack on massive
+    # amounts of additional arguments before passing them to the linker.
+    # It appears as though 1/2 is a usable value.
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    ;;
+  esac
+
+fi
+
+if test -n $lt_cv_sys_max_cmd_len ; then
+  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
+else
+  echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6
+fi
+
+
+
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Transform the above into a raw symbol and a C symbol.
+symxfrm='\1 \2\3 \3'
+
+# Transform an extracted symbol line into a proper C declaration
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*) # Its linker distinguishes data from code symbols
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDEGRST]'
+  fi
+  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris* | sysv5*)
+  symcode='[BDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGISTW]' ;;
+esac
+
+# Try without a prefix undercore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Write the raw and C identifiers.
+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+EOF
+
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if grep ' nm_test_var$' "$nlist" >/dev/null; then
+	if grep ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
+
+	  cat <<EOF >> conftest.$ac_ext
+#if defined (__STDC__) && __STDC__
+# define lt_ptr_t void *
+#else
+# define lt_ptr_t char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+  const char *name;
+  lt_ptr_t address;
+}
+lt_preloaded_symbols[] =
+{
+EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+	  cat <<\EOF >> conftest.$ac_ext
+  {0, (lt_ptr_t) 0}
+};
+
+#ifdef __cplusplus
+}
+#endif
+EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -f conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+
+fi
+
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  echo "$as_me:$LINENO: result: failed" >&5
+echo "${ECHO_T}failed" >&6
+else
+  echo "$as_me:$LINENO: result: ok" >&5
+echo "${ECHO_T}ok" >&6
+fi
+
+echo "$as_me:$LINENO: checking for objdir" >&5
+echo $ECHO_N "checking for objdir... $ECHO_C" >&6
+if test "${lt_cv_objdir+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+echo "${ECHO_T}$lt_cv_objdir" >&6
+objdir=$lt_cv_objdir
+
+
+
+
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e s/^X//'
+sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except M$VC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AR+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="${ac_tool_prefix}ar"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  echo "$as_me:$LINENO: result: $AR" >&5
+echo "${ECHO_T}$AR" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_AR"; then
+  ac_ct_AR=$AR
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="ar"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+echo "${ECHO_T}$ac_ct_AR" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  AR=$ac_ct_AR
+else
+  AR="$ac_cv_prog_AR"
+fi
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_RANLIB+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  echo "$as_me:$LINENO: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  RANLIB=$ac_ct_RANLIB
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_STRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  STRIP=$ac_ct_STRIP
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+    ;;
+  *)
+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+# Only perform the check for file, if the check method requires it
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/${ac_tool_prefix}file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    echo "$as_me:$LINENO: checking for file" >&5
+echo $ECHO_N "checking for file... $ECHO_C" >&6
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  else
+    MAGIC_CMD=:
+  fi
+fi
+
+  fi
+  ;;
+esac
+
+enable_dlopen=no
+enable_win32_dll=yes
+
+# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then
+  enableval="$enable_libtool_lock"
+
+fi;
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+
+# Check whether --with-pic or --without-pic was given.
+if test "${with_pic+set}" = set; then
+  withval="$with_pic"
+  pic_mode="$withval"
+else
+  pic_mode=default
+fi;
+test -z "$pic_mode" && pic_mode=default
+
+# Use C for the default configuration in the libtool script
+tagname=
+lt_save_CC="$CC"
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;\n"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}\n'
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+#
+# Check for any special shared library compilation flags.
+#
+lt_prog_cc_shlib=
+if test "$GCC" = no; then
+  case $host_os in
+  sco3.2v5*)
+    lt_prog_cc_shlib='-belf'
+    ;;
+  esac
+fi
+if test -n "$lt_prog_cc_shlib"; then
+  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
+echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
+  if echo "$old_CC $old_CFLAGS " | grep "[ 	]$lt_prog_cc_shlib[ 	]" >/dev/null; then :
+  else
+    { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
+echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
+    lt_cv_prog_cc_can_build_shared=no
+  fi
+fi
+
+
+#
+# Check to make sure the static flag actually works.
+#
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
+if test "${lt_prog_compiler_static_works+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_prog_compiler_static_works=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+     else
+       lt_prog_compiler_static_works=yes
+     fi
+   fi
+   $rm conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
+
+if test x"$lt_prog_compiler_static_works" = xyes; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
+
+
+lt_prog_compiler_no_builtin_flag=
+
+if test "$GCC" = yes; then
+  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+
+  echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
+  ac_outfile=conftest.$ac_objext
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:7473: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:7477: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s conftest.err; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $rm conftest*
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
+
+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+    :
+fi
+
+fi
+
+lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+
+  if test "$GCC" = yes; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+      ;;
+
+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic=-Kconform_pic
+      fi
+      ;;
+
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case "$host_cpu" in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
+      esac
+      ;;
+
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      else
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case "$host_cpu" in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    linux*)
+      case $CC in
+      icc|ecc)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-KPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      ccc)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      esac
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    sco3.2v5*)
+      lt_prog_compiler_pic='-Kpic'
+      lt_prog_compiler_static='-dn'
+      ;;
+
+    solaris*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	lt_prog_compiler_pic='-Kconform_pic'
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
+
+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic" >&6
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+  echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
+if test "${lt_prog_compiler_pic_works+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_prog_compiler_pic_works=no
+  ac_outfile=conftest.$ac_objext
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:7705: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:7709: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s conftest.err; then
+       lt_prog_compiler_pic_works=yes
+     fi
+   fi
+   $rm conftest*
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
+
+if test x"$lt_prog_compiler_pic_works" = xyes; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
+
+fi
+case "$host_os" in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
+
+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $rm -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+   # that will create temporary files in the current directory regardless of
+   # the output directory.  Thus, making CWD read-only will cause this test
+   # to fail, enabling locking or at least warning the user not to do parallel
+   # builds.
+   chmod -w .
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:7772: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:7776: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s out/conftest.err; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w .
+   $rm conftest* out/*
+   rmdir out
+   cd ..
+   rmdir conftest
+   $rm conftest*
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6
+  if test "$hard_links" = no; then
+    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+
+  runpath_var=
+  allow_undefined_flag=
+  enable_shared_with_static_runtimes=no
+  archive_cmds=
+  archive_expsym_cmds=
+  old_archive_From_new_cmds=
+  old_archive_from_expsyms_cmds=
+  export_dynamic_flag_spec=
+  whole_archive_flag_spec=
+  thread_safe_flag_spec=
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_flag_spec_ld=
+  hardcode_libdir_separator=
+  hardcode_direct=no
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  link_all_deplibs=unknown
+  hardcode_automatic=no
+  module_cmds=
+  module_expsym_cmds=
+  always_export_symbols=no
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  ld_shlibs=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix3* | aix4* | aix5*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	ld_shlibs=no
+	cat <<EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+EOF
+      fi
+      ;;
+
+    amigaos*)
+      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we can't use
+      # them.
+      ld_shlibs=no
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      allow_undefined_flag=unsupported
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris* | sysv5*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+	ld_shlibs=no
+	cat <<EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+EOF
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+    esac
+
+    if test "$ld_shlibs" = yes; then
+      runpath_var=LD_RUN_PATH
+      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+      export_dynamic_flag_spec='${wl}--export-dynamic'
+      # ancient GNU ld didn't support --whole-archive et. al.
+      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+ 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	whole_archive_flag_spec=
+      fi
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes && test -z "$link_static_flag"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct=unsupported
+      fi
+      ;;
+
+    aix4* | aix5*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.012|aix4.012.*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" && \
+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	  then
+  	  # We have reworked collect2
+  	  hardcode_direct=yes
+	  else
+  	  # We have old collect2
+  	  hardcode_direct=unsupported
+  	  # It fails to find uninstalled libraries when the uninstalled
+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+  	  # to unsupported forces relinking
+  	  hardcode_minus_L=yes
+  	  hardcode_libdir_flag_spec='-L$libdir'
+  	  hardcode_libdir_separator=
+	  fi
+	esac
+	shared_flag='-shared'
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+  	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+  	if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+  	fi
+	fi
+      fi
+
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag='-berok'
+       # Determine the default libpath from the value encoded in an empty executable.
+       cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`; fi
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       else
+	if test "$host_cpu" = ia64; then
+	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag="-z nodefs"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an empty executable.
+	 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`; fi
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag=' ${wl}-bernotok'
+	  allow_undefined_flag=' ${wl}-berok'
+	  # -bexpall does not export symbols beginning with underscore (_)
+	  always_export_symbols=yes
+	  # Exported symbols can be pulled into shared objects from archives
+	  whole_archive_flag_spec=' '
+	  archive_cmds_need_lc=yes
+	  # This is similar to how AIX traditionally builds it's shared libraries.
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs=no
+      ;;
+
+    bsdi4*)
+      export_dynamic_flag_spec=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      allow_undefined_flag=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      old_archive_From_new_cmds='true'
+      # FIXME: Should let the user specify the lib program.
+      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      enable_shared_with_static_runtimes=yes
+      ;;
+
+    darwin* | rhapsody*)
+    if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+      archive_cmds_need_lc=no
+      case "$host_os" in
+      rhapsody* | darwin1.[012])
+	allow_undefined_flag='-undefined suppress'
+	;;
+      *) # Darwin 1.3 on
+	test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress'
+	;;
+      esac
+      # FIXME: Relying on posixy $() will cause problems for
+      #        cross-compilation, but unfortunately the echo tests do not
+      #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+      #	       `"' quotes if we put them in here... so don't!
+    	lt_int_apple_cc_single_mod=no
+    	output_verbose_link_cmd='echo'
+    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+    	  lt_int_apple_cc_single_mod=yes
+    	fi
+    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+    	else
+        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      fi
+      module_cmds='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        else
+          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        fi
+          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      hardcode_direct=no
+      hardcode_automatic=yes
+      hardcode_shlibpath_var=unsupported
+      whole_archive_flag_spec='-all_load $convenience'
+      link_all_deplibs=yes
+    fi
+      ;;
+
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    freebsd1*)
+      ld_shlibs=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd*)
+      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      export_dynamic_flag_spec='${wl}-E'
+      ;;
+
+    hpux10* | hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case "$host_cpu" in
+	hppa*64*|ia64*)
+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case "$host_cpu" in
+	hppa*64*|ia64*)
+	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  ;;
+	*)
+	  archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	case "$host_cpu" in
+	hppa*64*)
+	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	  hardcode_libdir_flag_spec_ld='+b $libdir'
+	  hardcode_libdir_separator=:
+	  hardcode_direct=no
+	  hardcode_shlibpath_var=no
+	  ;;
+	ia64*)
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_direct=no
+	  hardcode_shlibpath_var=no
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L=yes
+	  ;;
+	*)
+	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	  hardcode_libdir_separator=:
+	  hardcode_direct=yes
+	  export_dynamic_flag_spec='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec_ld='-rpath $libdir'
+      fi
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      link_all_deplibs=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
+
+    openbsd*)
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec='${wl}-E'
+      else
+       case $host_os in
+	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	   hardcode_libdir_flag_spec='-R$libdir'
+	   ;;
+	 *)
+	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	   ;;
+       esac
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      hardcode_libdir_separator=:
+      ;;
+
+    sco3.2v5*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='${wl}-Bexport'
+      runpath_var=LD_RUN_PATH
+      hardcode_runpath_var=yes
+      ;;
+
+    solaris*)
+      no_undefined_flag=' -z text'
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+      else
+	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+      esac
+      link_all_deplibs=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds='$CC -r -o $output$reload_objs'
+	  hardcode_direct=no
+        ;;
+	motorola)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs=yes
+      fi
+      ;;
+
+    sysv4.2uw2*)
+      archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=no
+      hardcode_shlibpath_var=no
+      hardcode_runpath_var=yes
+      runpath_var=LD_RUN_PATH
+      ;;
+
+   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+      no_undefined_flag='${wl}-z ${wl}text'
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv5*)
+      no_undefined_flag=' -z text'
+      # $CC -shared without GNU ld will not create a library from C++
+      # object files and a static libstdc++, better avoid it by now
+      archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      hardcode_libdir_flag_spec=
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
+      ;;
+
+    uts4*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      ld_shlibs=no
+      ;;
+    esac
+  fi
+
+echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+echo "${ECHO_T}$ld_shlibs" >&6
+test "$ld_shlibs" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+      $rm conftest*
+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$lt_prog_compiler_wl
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$allow_undefined_flag
+        allow_undefined_flag=
+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+        then
+	  archive_cmds_need_lc=no
+        else
+	  archive_cmds_need_lc=yes
+        fi
+        allow_undefined_flag=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $rm conftest*
+      echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+echo "${ECHO_T}$archive_cmds_need_lc" >&6
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" || \
+   test -n "$runpath_var " || \
+   test "X$hardcode_automatic"="Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$hardcode_direct" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
+     test "$hardcode_minus_L" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action" >&5
+echo "${ECHO_T}$hardcode_action" >&6
+
+if test "$hardcode_action" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+striplib=
+old_striplib=
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib="$STRIP -x"
+         echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+       ;;
+   *)
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    ;;
+  esac
+fi
+
+echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+if test "$GCC" = yes; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix4* | aix5*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi4*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32*)
+  version_type=windows
+  shrext=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $rm \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
+      ;;
+    mingw*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  # FIXME: Relying on posixy $() will cause problems for
+  #        cross-compilation, but unfortunately the echo tests do not
+  #        yet detect zsh echo's removal of \ escapes.
+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+  fi
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+freebsd*)
+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.01* | freebsdelf3.01*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  *) # from 3.2 on
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case "$host_cpu" in
+  ia64*)
+    shrext='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+   hppa*64*)
+     shrext='.sl'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+   *)
+    shrext='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+nto-qnx)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+openbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+sco3.2v5*)
+  version_type=osf
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6
+test "$dynamic_linker" = no && can_build_shared=no
+
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+   ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+   ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dl_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+   ;;
+
+  *)
+    echo "$as_me:$LINENO: checking for shl_load" >&5
+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+if test "${ac_cv_func_shl_load+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char shl_load (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char shl_load ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_shl_load) || defined (__stub___shl_load)
+choke me
+#else
+char (*f) () = shl_load;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != shl_load;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_shl_load=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_shl_load=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+if test $ac_cv_func_shl_load = yes; then
+  lt_cv_dlopen="shl_load"
+else
+  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char shl_load ();
+int
+main ()
+{
+shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dld_shl_load=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dld_shl_load=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+if test $ac_cv_lib_dld_shl_load = yes; then
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+else
+  echo "$as_me:$LINENO: checking for dlopen" >&5
+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+if test "${ac_cv_func_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char dlopen (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_dlopen) || defined (__stub___dlopen)
+choke me
+#else
+char (*f) () = dlopen;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != dlopen;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+if test $ac_cv_func_dlopen = yes; then
+  lt_cv_dlopen="dlopen"
+else
+  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dl_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_svld_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_svld_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+if test $ac_cv_lib_svld_dlopen = yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+else
+  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dld_link ();
+int
+main ()
+{
+dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dld_dld_link=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dld_dld_link=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
+if test $ac_cv_lib_dld_dld_link = yes; then
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+if test "${lt_cv_dlopen_self+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+#line 9784 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+
+    exit (status);
+}
+EOF
+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      LDFLAGS="$LDFLAGS $link_static_flag"
+      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+if test "${lt_cv_dlopen_self_static+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+#line 9882 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+
+    exit (status);
+}
+EOF
+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+
+# Report which librarie types wil actually be built
+echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6
+
+echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case "$host_os" in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+
+aix4*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
+  ;;
+  darwin* | rhapsody*)
+  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+    archive_cmds_need_lc=no
+    case "$host_os" in
+    rhapsody* | darwin1.[012])
+      allow_undefined_flag='-undefined suppress'
+      ;;
+    *) # Darwin 1.3 on
+      test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress'
+      ;;
+    esac
+    # FIXME: Relying on posixy $() will cause problems for
+    #        cross-compilation, but unfortunately the echo tests do not
+    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+    #	       `"' quotes if we put them in here... so don't!
+		output_verbose_link_cmd='echo'
+    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
+    module_cmds='$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+		  archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+		  module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    hardcode_direct=no
+    hardcode_automatic=yes
+    hardcode_shlibpath_var=unsupported
+    whole_archive_flag_spec='-all_load $convenience'
+    link_all_deplibs=yes
+    fi
+    ;;
+esac
+echo "$as_me:$LINENO: result: $enable_shared" >&5
+echo "${ECHO_T}$enable_shared" >&6
+
+echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+echo "$as_me:$LINENO: result: $enable_static" >&5
+echo "${ECHO_T}$enable_static" >&6
+
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    compiler \
+    CC \
+    LD \
+    lt_prog_compiler_wl \
+    lt_prog_compiler_pic \
+    lt_prog_compiler_static \
+    lt_prog_compiler_no_builtin_flag \
+    export_dynamic_flag_spec \
+    thread_safe_flag_spec \
+    whole_archive_flag_spec \
+    enable_shared_with_static_runtimes \
+    old_archive_cmds \
+    old_archive_from_new_cmds \
+    predep_objects \
+    postdep_objects \
+    predeps \
+    postdeps \
+    compiler_lib_search_path \
+    archive_cmds \
+    archive_expsym_cmds \
+    postinstall_cmds \
+    postuninstall_cmds \
+    old_archive_from_expsyms_cmds \
+    allow_undefined_flag \
+    no_undefined_flag \
+    export_symbols_cmds \
+    hardcode_libdir_flag_spec \
+    hardcode_libdir_flag_spec_ld \
+    hardcode_libdir_separator \
+    hardcode_automatic \
+    module_cmds \
+    module_expsym_cmds \
+    lt_cv_prog_compiler_c_o \
+    exclude_expsyms \
+    include_expsyms; do
+
+    case $var in
+    old_archive_cmds | \
+    old_archive_from_new_cmds | \
+    archive_cmds | \
+    archive_expsym_cmds | \
+    module_cmds | \
+    module_expsym_cmds | \
+    old_archive_from_expsyms_cmds | \
+    export_symbols_cmds | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\$0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+    ;;
+  esac
+
+cfgfile="${ofile}T"
+  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+  $rm -f "$cfgfile"
+  { echo "$as_me:$LINENO: creating $ofile" >&5
+echo "$as_me: creating $ofile" >&6;}
+
+  cat <<__EOF__ >> "$cfgfile"
+#! $SHELL
+
+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
+#
+# This file is part of GNU Libtool:
+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="$SED -e s/^X//"
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+
+# The names of the tagged configurations supported by this script.
+available_tags=
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A C compiler.
+LTCC=$lt_LTCC
+
+# A language-specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally ".so").
+shrext='$shrext'
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+pic_mode=$pic_mode
+
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Must we lock files when doing compilation ?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_predep_objects
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_postdep_objects
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_predeps
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_postdeps
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$hardcode_automatic
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$fix_srcfile_path"
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# ### END LIBTOOL CONFIG
+
+__EOF__
+
+
+  case $host_os in
+  aix3*)
+    cat <<\EOF >> "$cfgfile"
+
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+EOF
+    ;;
+  esac
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" || \
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  test -f Makefile && make "$ltmain"
+fi
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC="$lt_save_CC"
+
+
+# Check whether --with-tags or --without-tags was given.
+if test "${with_tags+set}" = set; then
+  withval="$with_tags"
+  tagnames="$withval"
+fi;
+
+if test -f "$ltmain" && test -n "$tagnames"; then
+  if test ! -f "${ofile}"; then
+    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
+echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
+  fi
+
+  if test -z "$LTCC"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+    if test -z "$LTCC"; then
+      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
+echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
+    else
+      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
+echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
+    fi
+  fi
+
+  # Extract list of available tagged configurations in $ofile.
+  # Note that this assumes the entire list is on one line.
+  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
+
+  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+  for tagname in $tagnames; do
+    IFS="$lt_save_ifs"
+    # Check whether tagname contains only valid characters
+    case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
+    "") ;;
+    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
+echo "$as_me: error: invalid tag name: $tagname" >&2;}
+   { (exit 1); exit 1; }; }
+	;;
+    esac
+
+    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+    then
+      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
+echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+
+    # Update the list of available tags.
+    if test -n "$tagname"; then
+      echo appending configuration tag \"$tagname\" to $ofile
+
+      case $tagname in
+      CXX)
+	if test -n "$CXX" && test "X$CXX" != "Xno"; then
+	  ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+
+
+archive_cmds_need_lc_CXX=no
+allow_undefined_flag_CXX=
+always_export_symbols_CXX=no
+archive_expsym_cmds_CXX=
+export_dynamic_flag_spec_CXX=
+hardcode_direct_CXX=no
+hardcode_libdir_flag_spec_CXX=
+hardcode_libdir_flag_spec_ld_CXX=
+hardcode_libdir_separator_CXX=
+hardcode_minus_L_CXX=no
+hardcode_automatic_CXX=no
+module_cmds_CXX=
+module_expsym_cmds_CXX=
+link_all_deplibs_CXX=unknown
+old_archive_cmds_CXX=$old_archive_cmds
+no_undefined_flag_CXX=
+whole_archive_flag_spec_CXX=
+enable_shared_with_static_runtimes_CXX=no
+
+# Dependencies to place before and after the object being linked:
+predep_objects_CXX=
+postdep_objects_CXX=
+predeps_CXX=
+postdeps_CXX=
+compiler_lib_search_path_CXX=
+
+# Source file extension for C++ test sources.
+ac_ext=cc
+
+# Object file extension for compiled C++ test sources.
+objext=o
+objext_CXX=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;\n"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_LD=$LD
+lt_save_GCC=$GCC
+GCC=$GXX
+lt_save_with_gnu_ld=$with_gnu_ld
+lt_save_path_LD=$lt_cv_path_LD
+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+else
+  unset lt_cv_prog_gnu_ld
+fi
+if test -n "${lt_cv_path_LDCXX+set}"; then
+  lt_cv_path_LD=$lt_cv_path_LDCXX
+else
+  unset lt_cv_path_LD
+fi
+test -z "${LDCXX+set}" || LD=$LDCXX
+CC=${CXX-"c++"}
+compiler=$CC
+compiler_CXX=$CC
+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+
+# We don't want -fno-exception wen compiling C++ code, so set the
+# no_builtin_flag separately
+if test "$GXX" = yes; then
+  lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
+else
+  lt_prog_compiler_no_builtin_flag_CXX=
+fi
+
+if test "$GXX" = yes; then
+  # Set up default GNU C++ configuration
+
+
+# Check whether --with-gnu-ld or --without-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then
+  withval="$with_gnu_ld"
+  test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi;
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+else
+  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+fi
+if test "${lt_cv_path_LD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some GNU ld's only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+if test "${lt_cv_prog_gnu_ld+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+case `"$LD" -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+  # Check if GNU C++ uses GNU ld as the underlying linker, since the
+  # archiving commands below assume that GNU ld is being used.
+  if test "$with_gnu_ld" = yes; then
+    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+    #     investigate it a little bit more. (MM)
+    wlarc='${wl}'
+
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+	grep 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      whole_archive_flag_spec_CXX=
+    fi
+  else
+    with_gnu_ld=no
+    wlarc=
+
+    # A generic and very simple default shared library creation
+    # command for GNU C++ for the case where it uses the native
+    # linker, instead of GNU ld.  If possible, this setting should
+    # overridden to take advantage of the native linker features on
+    # the platform it is being used on.
+    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+  fi
+
+  # Commands to make compiler produce verbose output that lists
+  # what "hidden" libraries, object files and flags are used when
+  # linking a shared library.
+  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+else
+  GXX=no
+  with_gnu_ld=no
+  wlarc=
+fi
+
+# PORTME: fill in a description of your system's C++ link characteristics
+echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+ld_shlibs_CXX=yes
+case $host_os in
+  aix3*)
+    # FIXME: insert proper C++ library support
+    ld_shlibs_CXX=no
+    ;;
+  aix4* | aix5*)
+    if test "$host_cpu" = ia64; then
+      # On IA64, the linker does run time linking by default, so we don't
+      # have to do anything special.
+      aix_use_runtimelinking=no
+      exp_sym_flag='-Bexport'
+      no_entry_flag=""
+    else
+      aix_use_runtimelinking=no
+
+      # Test if we are trying to use run time linking or normal
+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+      # need to do runtime linking.
+      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	for ld_flag in $LDFLAGS; do
+	  case $ld_flag in
+	  *-brtl*)
+	    aix_use_runtimelinking=yes
+	    break
+	    ;;
+	  esac
+	done
+      esac
+
+      exp_sym_flag='-bexport'
+      no_entry_flag='-bnoentry'
+    fi
+
+    # When large executables or shared objects are built, AIX ld can
+    # have problems creating the table of contents.  If linking a library
+    # or program results in "error TOC overflow" add -mminimal-toc to
+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+    archive_cmds_CXX=''
+    hardcode_direct_CXX=yes
+    hardcode_libdir_separator_CXX=':'
+    link_all_deplibs_CXX=yes
+
+    if test "$GXX" = yes; then
+      case $host_os in aix4.012|aix4.012.*)
+      # We only want to do this on AIX 4.2 and lower, the check
+      # below for broken collect2 doesn't work under 4.3+
+	collect2name=`${CC} -print-prog-name=collect2`
+	if test -f "$collect2name" && \
+	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	then
+	  # We have reworked collect2
+	  hardcode_direct_CXX=yes
+	else
+	  # We have old collect2
+	  hardcode_direct_CXX=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L_CXX=yes
+	  hardcode_libdir_flag_spec_CXX='-L$libdir'
+	  hardcode_libdir_separator_CXX=
+	fi
+      esac
+      shared_flag='-shared'
+    else
+      # not using gcc
+      if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	shared_flag='-G'
+      else
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag='${wl}-G'
+	else
+	  shared_flag='${wl}-bM:SRE'
+	fi
+      fi
+    fi
+
+    # It seems that -bexpall does not export symbols beginning with
+    # underscore (_), so it is better to generate a list of symbols to export.
+    always_export_symbols_CXX=yes
+    if test "$aix_use_runtimelinking" = yes; then
+      # Warning - without using the other runtime loading flags (-brtl),
+      # -berok will link without error, but may produce a broken library.
+      allow_undefined_flag_CXX='-berok'
+      # Determine the default libpath from the value encoded in an empty executable.
+      cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`; fi
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+     else
+      if test "$host_cpu" = ia64; then
+	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+	allow_undefined_flag_CXX="-z nodefs"
+	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+      else
+	# Determine the default libpath from the value encoded in an empty executable.
+	cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`; fi
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+	# Warning - without using the other run time loading flags,
+	# -berok will link without error, but may produce a broken library.
+	no_undefined_flag_CXX=' ${wl}-bernotok'
+	allow_undefined_flag_CXX=' ${wl}-berok'
+	# -bexpall does not export symbols beginning with underscore (_)
+	always_export_symbols_CXX=yes
+	# Exported symbols can be pulled into shared objects from archives
+	whole_archive_flag_spec_CXX=' '
+	archive_cmds_need_lc_CXX=yes
+	# This is similar to how AIX traditionally builds it's shared libraries.
+	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+      fi
+    fi
+    ;;
+  chorus*)
+    case $cc_basename in
+      *)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+    esac
+    ;;
+
+  cygwin* | mingw* | pw32*)
+    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+    # as there is no search path for DLLs.
+    hardcode_libdir_flag_spec_CXX='-L$libdir'
+    allow_undefined_flag_CXX=unsupported
+    always_export_symbols_CXX=no
+    enable_shared_with_static_runtimes_CXX=yes
+
+    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      # If the export-symbols file already is a .def file (1st line
+      # is EXPORTS), use it as is; otherwise, prepend...
+      archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	cp $export_symbols $output_objdir/$soname.def;
+      else
+	echo EXPORTS > $output_objdir/$soname.def;
+	cat $export_symbols >> $output_objdir/$soname.def;
+      fi~
+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+    else
+      ld_shlibs_CXX=no
+    fi
+  ;;
+
+  darwin* | rhapsody*)
+   if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+    archive_cmds_need_lc_CXX=no
+    case "$host_os" in
+    rhapsody* | darwin1.[012])
+      allow_undefined_flag_CXX='-undefined suppress'
+      ;;
+    *) # Darwin 1.3 on
+      test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
+      ;;
+    esac
+    	lt_int_apple_cc_single_mod=no
+    	output_verbose_link_cmd='echo'
+    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+    	  lt_int_apple_cc_single_mod=yes
+    	fi
+    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+    	  archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+    	else
+        archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      fi
+      module_cmds_CXX='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+
+    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+        archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      else
+        archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      fi
+        module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    hardcode_direct_CXX=no
+    hardcode_automatic_CXX=yes
+    hardcode_shlibpath_var_CXX=unsupported
+    whole_archive_flag_spec_CXX='-all_load $convenience'
+    link_all_deplibs_CXX=yes
+   fi
+    ;;
+
+  dgux*)
+    case $cc_basename in
+      ec++)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      ghcx)
+	# Green Hills C++ Compiler
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+    esac
+    ;;
+  freebsd12*)
+    # C++ shared libraries reported to be fairly broken before switch to ELF
+    ld_shlibs_CXX=no
+    ;;
+  freebsd-elf*)
+    archive_cmds_need_lc_CXX=no
+    ;;
+  freebsd*)
+    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+    # conventions
+    ld_shlibs_CXX=yes
+    ;;
+  gnu*)
+    ;;
+  hpux9*)
+    hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+    hardcode_libdir_separator_CXX=:
+    export_dynamic_flag_spec_CXX='${wl}-E'
+    hardcode_direct_CXX=yes
+    hardcode_minus_L_CXX=yes # Not in the search PATH,
+				# but as the default
+				# location of the library.
+
+    case $cc_basename in
+    CC)
+      # FIXME: insert proper C++ library support
+      ld_shlibs_CXX=no
+      ;;
+    aCC)
+      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      #
+      # There doesn't appear to be a way to prevent this compiler from
+      # explicitly linking system object files so we need to strip them
+      # from the output so that they don't get included in the library
+      # dependencies.
+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+      ;;
+    *)
+      if test "$GXX" = yes; then
+        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+      fi
+      ;;
+    esac
+    ;;
+  hpux10*|hpux11*)
+    if test $with_gnu_ld = no; then
+      case "$host_cpu" in
+      hppa*64*)
+	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
+	hardcode_libdir_separator_CXX=:
+        ;;
+      ia64*)
+	hardcode_libdir_flag_spec_CXX='-L$libdir'
+        ;;
+      *)
+	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator_CXX=:
+	export_dynamic_flag_spec_CXX='${wl}-E'
+        ;;
+      esac
+    fi
+    case "$host_cpu" in
+    hppa*64*)
+      hardcode_direct_CXX=no
+      hardcode_shlibpath_var_CXX=no
+      ;;
+    ia64*)
+      hardcode_direct_CXX=no
+      hardcode_shlibpath_var_CXX=no
+      hardcode_minus_L_CXX=yes # Not in the search PATH,
+					      # but as the default
+					      # location of the library.
+      ;;
+    *)
+      hardcode_direct_CXX=yes
+      hardcode_minus_L_CXX=yes # Not in the search PATH,
+					      # but as the default
+					      # location of the library.
+      ;;
+    esac
+
+    case $cc_basename in
+      CC)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      aCC)
+	case "$host_cpu" in
+	hppa*64*|ia64*)
+	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+	  ;;
+	*)
+	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	esac
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes; then
+	  if test $with_gnu_ld = no; then
+	    case "$host_cpu" in
+	    ia64*|hppa*64*)
+	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+	      ;;
+	    *)
+	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    esac
+	  fi
+	else
+	  # FIXME: insert proper C++ library support
+	  ld_shlibs_CXX=no
+	fi
+	;;
+    esac
+    ;;
+  irix5* | irix6*)
+    case $cc_basename in
+      CC)
+	# SGI C++
+	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+
+	# Archives containing C++ object files must be created using
+	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	# necessary to make sure instantiated templates are included
+	# in the archive.
+	old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	;;
+      *)
+	if test "$GXX" = yes; then
+	  if test "$with_gnu_ld" = no; then
+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	  else
+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+	  fi
+	fi
+	link_all_deplibs_CXX=yes
+	;;
+    esac
+    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+    hardcode_libdir_separator_CXX=:
+    ;;
+  linux*)
+    case $cc_basename in
+      KCC)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+
+	hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
+	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+
+	# Archives containing C++ object files must be created using
+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+	;;
+      icpc)
+	# Intel C++
+	with_gnu_ld=yes
+	archive_cmds_need_lc_CXX=no
+	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	;;
+      cxx)
+	# Compaq C++
+	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	runpath_var=LD_RUN_PATH
+	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+	hardcode_libdir_separator_CXX=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+    esac
+    ;;
+  lynxos*)
+    # FIXME: insert proper C++ library support
+    ld_shlibs_CXX=no
+    ;;
+  m88k*)
+    # FIXME: insert proper C++ library support
+    ld_shlibs_CXX=no
+    ;;
+  mvs*)
+    case $cc_basename in
+      cxx)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+    esac
+    ;;
+  netbsd*)
+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+      wlarc=
+      hardcode_libdir_flag_spec_CXX='-R$libdir'
+      hardcode_direct_CXX=yes
+      hardcode_shlibpath_var_CXX=no
+    fi
+    # Workaround some broken pre-1.5 toolchains
+    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+    ;;
+  osf3*)
+    case $cc_basename in
+      KCC)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	hardcode_libdir_separator_CXX=:
+
+	# Archives containing C++ object files must be created using
+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+
+	;;
+      RCC)
+	# Rational C++ 2.4.1
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      cxx)
+	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+
+	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	hardcode_libdir_separator_CXX=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	  hardcode_libdir_separator_CXX=:
+
+	  # Commands to make compiler produce verbose output that lists
+	  # what "hidden" libraries, object files and flags are used when
+	  # linking a shared library.
+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+	else
+	  # FIXME: insert proper C++ library support
+	  ld_shlibs_CXX=no
+	fi
+	;;
+    esac
+    ;;
+  osf4* | osf5*)
+    case $cc_basename in
+      KCC)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	hardcode_libdir_separator_CXX=:
+
+	# Archives containing C++ object files must be created using
+	# the KAI C++ compiler.
+	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
+	;;
+      RCC)
+	# Rational C++ 2.4.1
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      cxx)
+	allow_undefined_flag_CXX=' -expect_unresolved \*'
+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	  echo "-hidden">> $lib.exp~
+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
+	  $rm $lib.exp'
+
+	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+	hardcode_libdir_separator_CXX=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	  hardcode_libdir_separator_CXX=:
+
+	  # Commands to make compiler produce verbose output that lists
+	  # what "hidden" libraries, object files and flags are used when
+	  # linking a shared library.
+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+	else
+	  # FIXME: insert proper C++ library support
+	  ld_shlibs_CXX=no
+	fi
+	;;
+    esac
+    ;;
+  psos*)
+    # FIXME: insert proper C++ library support
+    ld_shlibs_CXX=no
+    ;;
+  sco*)
+    archive_cmds_need_lc_CXX=no
+    case $cc_basename in
+      CC)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+    esac
+    ;;
+  sunos4*)
+    case $cc_basename in
+      CC)
+	# Sun C++ 4.x
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      lcc)
+	# Lucid
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+    esac
+    ;;
+  solaris*)
+    case $cc_basename in
+      CC)
+	# Sun C++ 4.2, 5.x and Centerline C++
+	no_undefined_flag_CXX=' -zdefs'
+	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	hardcode_libdir_flag_spec_CXX='-R$libdir'
+	hardcode_shlibpath_var_CXX=no
+	case $host_os in
+	  solaris2.0-5 | solaris2.0-5.*) ;;
+	  *)
+	    # The C++ compiler is used as linker so we must use $wl
+	    # flag to pass the commands to the underlying system
+	    # linker.
+	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	esac
+	link_all_deplibs_CXX=yes
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+
+	# Archives containing C++ object files must be created using
+	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	# necessary to make sure instantiated templates are included
+	# in the archive.
+	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	;;
+      gcx)
+	# Green Hills C++ Compiler
+	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	# The C++ compiler must be used to create the archive.
+	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	;;
+      *)
+	# GNU C++ compiler with Solaris linker
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+	  else
+	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	    # platform.
+	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+	  fi
+
+	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+	fi
+	;;
+    esac
+    ;;
+  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
+    archive_cmds_need_lc_CXX=no
+    ;;
+  tandem*)
+    case $cc_basename in
+      NCC)
+	# NonStop-UX NCC 3.20
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+    esac
+    ;;
+  vxworks*)
+    # FIXME: insert proper C++ library support
+    ld_shlibs_CXX=no
+    ;;
+  *)
+    # FIXME: insert proper C++ library support
+    ld_shlibs_CXX=no
+    ;;
+esac
+echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+echo "${ECHO_T}$ld_shlibs_CXX" >&6
+test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+GCC_CXX="$GXX"
+LD_CXX="$LD"
+
+
+cat > conftest.$ac_ext <<EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+EOF
+
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  # The `*' in the case matches for architectures that use `case' in
+  # $output_verbose_cmd can trigger glob expansion during the loop
+  # eval without this substitution.
+  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
+
+  for p in `eval $output_verbose_link_cmd`; do
+    case $p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" \
+	  || test $p = "-R"; then
+	 prev=$p
+	 continue
+       else
+	 prev=
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 case $p in
+	 -L* | -R*)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$compiler_lib_search_path_CXX"; then
+	     compiler_lib_search_path_CXX="${prev}${p}"
+	   else
+	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$postdeps_CXX"; then
+	   postdeps_CXX="${prev}${p}"
+	 else
+	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
+	 fi
+       fi
+       ;;
+
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$predep_objects_CXX"; then
+	   predep_objects_CXX="$p"
+	 else
+	   predep_objects_CXX="$predep_objects_CXX $p"
+	 fi
+       else
+	 if test -z "$postdep_objects_CXX"; then
+	   postdep_objects_CXX="$p"
+	 else
+	   postdep_objects_CXX="$postdep_objects_CXX $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling CXX test program"
+fi
+
+$rm -f confest.$objext
+
+case " $postdeps_CXX " in
+*" -lc "*) archive_cmds_need_lc_CXX=no ;;
+esac
+
+lt_prog_compiler_wl_CXX=
+lt_prog_compiler_pic_CXX=
+lt_prog_compiler_static_CXX=
+
+echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    lt_prog_compiler_wl_CXX='-Wl,'
+    lt_prog_compiler_static_CXX='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_CXX='-Bstatic'
+      fi
+      ;;
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+      ;;
+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | os2* | pw32*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic_CXX='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      lt_prog_compiler_pic_CXX=
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic_CXX=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case "$host_cpu" in
+      hppa*64*|ia64*)
+	;;
+      *)
+	lt_prog_compiler_pic_CXX='-fPIC'
+	;;
+      esac
+      ;;
+    *)
+      lt_prog_compiler_pic_CXX='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix4* | aix5*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  lt_prog_compiler_static_CXX='-Bstatic'
+	else
+	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68)
+	  # Green Hills C++ Compiler
+	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++)
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  ghcx)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+	    if test "$host_cpu" != ia64; then
+	      lt_prog_compiler_pic_CXX='+Z'
+	    fi
+	    ;;
+	  aCC)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+	    case "$host_cpu" in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      lt_prog_compiler_pic_CXX='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux*)
+	case $cc_basename in
+	  KCC)
+	    # KAI C++ Compiler
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    ;;
+	  icpc)
+	    # Intel C++
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-static'
+	    ;;
+	  cxx)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx)
+	    lt_prog_compiler_pic_CXX='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC)
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    ;;
+	  RCC)
+	    # Rational C++ 2.4.1
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  cxx)
+	    # Digital/Compaq C++
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      sco*)
+	case $cc_basename in
+	  CC)
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    lt_prog_compiler_wl_CXX='-Qoption ld '
+	    ;;
+	  gcx)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC)
+	    # Sun C++ 4.x
+	    lt_prog_compiler_pic_CXX='-pic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  lcc)
+	    # Lucid
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC)
+	    # NonStop-UX NCC 3.20
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      unixware*)
+	;;
+      vxworks*)
+	;;
+      *)
+	lt_prog_compiler_can_build_shared_CXX=no
+	;;
+    esac
+  fi
+
+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic_CXX"; then
+  echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
+if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_prog_compiler_pic_works_CXX=no
+  ac_outfile=conftest.$ac_objext
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:12014: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:12018: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s conftest.err; then
+       lt_prog_compiler_pic_works_CXX=yes
+     fi
+   fi
+   $rm conftest*
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
+
+if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
+    case $lt_prog_compiler_pic_CXX in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
+     esac
+else
+    lt_prog_compiler_pic_CXX=
+     lt_prog_compiler_can_build_shared_CXX=no
+fi
+
+fi
+case "$host_os" in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic_CXX=
+    ;;
+  *)
+    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
+    ;;
+esac
+
+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $rm -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+   # that will create temporary files in the current directory regardless of
+   # the output directory.  Thus, making CWD read-only will cause this test
+   # to fail, enabling locking or at least warning the user not to do parallel
+   # builds.
+   chmod -w .
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:12081: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:12085: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s out/conftest.err; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w .
+   $rm conftest* out/*
+   rmdir out
+   cd ..
+   rmdir conftest
+   $rm conftest*
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6
+  if test "$hard_links" = no; then
+    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+
+  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  case $host_os in
+  aix4* | aix5*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+    else
+      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    export_symbols_cmds_CXX="$ltdll_cmds"
+  ;;
+  cygwin* | mingw*)
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  *)
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  esac
+
+echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+echo "${ECHO_T}$ld_shlibs_CXX" >&6
+test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc_CXX" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc_CXX=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds_CXX in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+      $rm conftest*
+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$lt_prog_compiler_wl_CXX
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+        allow_undefined_flag_CXX=
+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+        then
+	  archive_cmds_need_lc_CXX=no
+        else
+	  archive_cmds_need_lc_CXX=yes
+        fi
+        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $rm conftest*
+      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+hardcode_action_CXX=
+if test -n "$hardcode_libdir_flag_spec_CXX" || \
+   test -n "$runpath_var CXX" || \
+   test "X$hardcode_automatic_CXX"="Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$hardcode_direct_CXX" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
+     test "$hardcode_minus_L_CXX" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_CXX=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_CXX=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_CXX=unsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+echo "${ECHO_T}$hardcode_action_CXX" >&6
+
+if test "$hardcode_action_CXX" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+striplib=
+old_striplib=
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib="$STRIP -x"
+         echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+       ;;
+   *)
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    ;;
+  esac
+fi
+
+echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+if test "$GCC" = yes; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix4* | aix5*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi4*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32*)
+  version_type=windows
+  shrext=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $rm \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
+      ;;
+    mingw*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  # FIXME: Relying on posixy $() will cause problems for
+  #        cross-compilation, but unfortunately the echo tests do not
+  #        yet detect zsh echo's removal of \ escapes.
+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+  fi
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+freebsd*)
+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.01* | freebsdelf3.01*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  *) # from 3.2 on
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case "$host_cpu" in
+  ia64*)
+    shrext='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+   hppa*64*)
+     shrext='.sl'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+   *)
+    shrext='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+nto-qnx)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+openbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+sco3.2v5*)
+  version_type=osf
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6
+test "$dynamic_linker" = no && can_build_shared=no
+
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+   ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+   ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dl_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+   ;;
+
+  *)
+    echo "$as_me:$LINENO: checking for shl_load" >&5
+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+if test "${ac_cv_func_shl_load+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char shl_load (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char shl_load ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_shl_load) || defined (__stub___shl_load)
+choke me
+#else
+char (*f) () = shl_load;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != shl_load;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_shl_load=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_shl_load=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+if test $ac_cv_func_shl_load = yes; then
+  lt_cv_dlopen="shl_load"
+else
+  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char shl_load ();
+int
+main ()
+{
+shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dld_shl_load=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dld_shl_load=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+if test $ac_cv_lib_dld_shl_load = yes; then
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+else
+  echo "$as_me:$LINENO: checking for dlopen" >&5
+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+if test "${ac_cv_func_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char dlopen (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_dlopen) || defined (__stub___dlopen)
+choke me
+#else
+char (*f) () = dlopen;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != dlopen;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+if test $ac_cv_func_dlopen = yes; then
+  lt_cv_dlopen="dlopen"
+else
+  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dl_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_svld_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_svld_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+if test $ac_cv_lib_svld_dlopen = yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+else
+  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dld_link ();
+int
+main ()
+{
+dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dld_dld_link=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dld_dld_link=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
+if test $ac_cv_lib_dld_dld_link = yes; then
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+if test "${lt_cv_dlopen_self+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+#line 13324 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+
+    exit (status);
+}
+EOF
+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      LDFLAGS="$LDFLAGS $link_static_flag"
+      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+if test "${lt_cv_dlopen_self_static+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+#line 13422 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+
+    exit (status);
+}
+EOF
+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    compiler_CXX \
+    CC_CXX \
+    LD_CXX \
+    lt_prog_compiler_wl_CXX \
+    lt_prog_compiler_pic_CXX \
+    lt_prog_compiler_static_CXX \
+    lt_prog_compiler_no_builtin_flag_CXX \
+    export_dynamic_flag_spec_CXX \
+    thread_safe_flag_spec_CXX \
+    whole_archive_flag_spec_CXX \
+    enable_shared_with_static_runtimes_CXX \
+    old_archive_cmds_CXX \
+    old_archive_from_new_cmds_CXX \
+    predep_objects_CXX \
+    postdep_objects_CXX \
+    predeps_CXX \
+    postdeps_CXX \
+    compiler_lib_search_path_CXX \
+    archive_cmds_CXX \
+    archive_expsym_cmds_CXX \
+    postinstall_cmds_CXX \
+    postuninstall_cmds_CXX \
+    old_archive_from_expsyms_cmds_CXX \
+    allow_undefined_flag_CXX \
+    no_undefined_flag_CXX \
+    export_symbols_cmds_CXX \
+    hardcode_libdir_flag_spec_CXX \
+    hardcode_libdir_flag_spec_ld_CXX \
+    hardcode_libdir_separator_CXX \
+    hardcode_automatic_CXX \
+    module_cmds_CXX \
+    module_expsym_cmds_CXX \
+    lt_cv_prog_compiler_c_o_CXX \
+    exclude_expsyms_CXX \
+    include_expsyms_CXX; do
+
+    case $var in
+    old_archive_cmds_CXX | \
+    old_archive_from_new_cmds_CXX | \
+    archive_cmds_CXX | \
+    archive_expsym_cmds_CXX | \
+    module_cmds_CXX | \
+    module_expsym_cmds_CXX | \
+    old_archive_from_expsyms_cmds_CXX | \
+    export_symbols_cmds_CXX | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\$0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+    ;;
+  esac
+
+cfgfile="$ofile"
+
+  cat <<__EOF__ >> "$cfgfile"
+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_CXX
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A C compiler.
+LTCC=$lt_LTCC
+
+# A language-specific compiler.
+CC=$lt_compiler_CXX
+
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC_CXX
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# The linker used to build libraries.
+LD=$lt_LD_CXX
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally ".so").
+shrext='$shrext'
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+pic_mode=$pic_mode
+
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
+# Must we lock files when doing compilation ?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_CXX
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds_CXX
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds_CXX
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_module_cmds_CXX
+module_expsym_cmds=$lt_module_expsym_cmds_CXX
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_predep_objects_CXX
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_postdep_objects_CXX
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_predeps_CXX
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_postdeps_CXX
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_CXX
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_CXX
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_CXX
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
+
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct_CXX
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$hardcode_automatic_CXX
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$fix_srcfile_path_CXX"
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols_CXX
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_CXX
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_CXX
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_CXX
+
+# ### END LIBTOOL TAG CONFIG: $tagname
+
+__EOF__
+
+
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  test -f Makefile && make "$ltmain"
+fi
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC=$lt_save_CC
+LDCXX=$LD
+LD=$lt_save_LD
+GCC=$lt_save_GCC
+with_gnu_ldcxx=$with_gnu_ld
+with_gnu_ld=$lt_save_with_gnu_ld
+lt_cv_path_LDCXX=$lt_cv_path_LD
+lt_cv_path_LD=$lt_save_path_LD
+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+
+	else
+	  tagname=""
+	fi
+	;;
+
+      F77)
+	if test -n "$F77" && test "X$F77" != "Xno"; then
+
+ac_ext=f
+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+
+
+archive_cmds_need_lc_F77=no
+allow_undefined_flag_F77=
+always_export_symbols_F77=no
+archive_expsym_cmds_F77=
+export_dynamic_flag_spec_F77=
+hardcode_direct_F77=no
+hardcode_libdir_flag_spec_F77=
+hardcode_libdir_flag_spec_ld_F77=
+hardcode_libdir_separator_F77=
+hardcode_minus_L_F77=no
+hardcode_automatic_F77=no
+module_cmds_F77=
+module_expsym_cmds_F77=
+link_all_deplibs_F77=unknown
+old_archive_cmds_F77=$old_archive_cmds
+no_undefined_flag_F77=
+whole_archive_flag_spec_F77=
+enable_shared_with_static_runtimes_F77=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+objext_F77=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="      program t\n      end\n"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${F77-"f77"}
+compiler=$CC
+compiler_F77=$CC
+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+
+echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6
+
+echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case "$host_os" in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+aix4*)
+  test "$enable_shared" = yes && enable_static=no
+  ;;
+esac
+echo "$as_me:$LINENO: result: $enable_shared" >&5
+echo "${ECHO_T}$enable_shared" >&6
+
+echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+echo "$as_me:$LINENO: result: $enable_static" >&5
+echo "${ECHO_T}$enable_static" >&6
+
+test "$ld_shlibs_F77" = no && can_build_shared=no
+
+GCC_F77="$G77"
+LD_F77="$LD"
+
+lt_prog_compiler_wl_F77=
+lt_prog_compiler_pic_F77=
+lt_prog_compiler_static_F77=
+
+echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+
+  if test "$GCC" = yes; then
+    lt_prog_compiler_wl_F77='-Wl,'
+    lt_prog_compiler_static_F77='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_F77='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
+      ;;
+
+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic_F77='-fno-common'
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared_F77=no
+      enable_shared=no
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic_F77=-Kconform_pic
+      fi
+      ;;
+
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case "$host_cpu" in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic_F77='-fPIC'
+	;;
+      esac
+      ;;
+
+    *)
+      lt_prog_compiler_pic_F77='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_F77='-Bstatic'
+      else
+	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case "$host_cpu" in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic_F77='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static_F77='-non_shared'
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic_F77='-KPIC'
+      lt_prog_compiler_static_F77='-Bstatic'
+      ;;
+
+    linux*)
+      case $CC in
+      icc|ecc)
+	lt_prog_compiler_wl_F77='-Wl,'
+	lt_prog_compiler_pic_F77='-KPIC'
+	lt_prog_compiler_static_F77='-static'
+        ;;
+      ccc)
+        lt_prog_compiler_wl_F77='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static_F77='-non_shared'
+        ;;
+      esac
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static_F77='-non_shared'
+      ;;
+
+    sco3.2v5*)
+      lt_prog_compiler_pic_F77='-Kpic'
+      lt_prog_compiler_static_F77='-dn'
+      ;;
+
+    solaris*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      lt_prog_compiler_pic_F77='-KPIC'
+      lt_prog_compiler_static_F77='-Bstatic'
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl_F77='-Qoption ld '
+      lt_prog_compiler_pic_F77='-PIC'
+      lt_prog_compiler_static_F77='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      lt_prog_compiler_pic_F77='-KPIC'
+      lt_prog_compiler_static_F77='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	lt_prog_compiler_pic_F77='-Kconform_pic'
+	lt_prog_compiler_static_F77='-Bstatic'
+      fi
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic_F77='-pic'
+      lt_prog_compiler_static_F77='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared_F77=no
+      ;;
+    esac
+  fi
+
+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic_F77"; then
+  echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
+if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_prog_compiler_pic_works_F77=no
+  ac_outfile=conftest.$ac_objext
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic_F77"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:14244: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:14248: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s conftest.err; then
+       lt_prog_compiler_pic_works_F77=yes
+     fi
+   fi
+   $rm conftest*
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
+
+if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+    case $lt_prog_compiler_pic_F77 in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
+     esac
+else
+    lt_prog_compiler_pic_F77=
+     lt_prog_compiler_can_build_shared_F77=no
+fi
+
+fi
+case "$host_os" in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic_F77=
+    ;;
+  *)
+    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
+    ;;
+esac
+
+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_prog_compiler_c_o_F77=no
+   $rm -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+   # that will create temporary files in the current directory regardless of
+   # the output directory.  Thus, making CWD read-only will cause this test
+   # to fail, enabling locking or at least warning the user not to do parallel
+   # builds.
+   chmod -w .
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:14311: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:14315: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s out/conftest.err; then
+       lt_cv_prog_compiler_c_o_F77=yes
+     fi
+   fi
+   chmod u+w .
+   $rm conftest* out/*
+   rmdir out
+   cd ..
+   rmdir conftest
+   $rm conftest*
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6
+  if test "$hard_links" = no; then
+    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+
+  runpath_var=
+  allow_undefined_flag_F77=
+  enable_shared_with_static_runtimes_F77=no
+  archive_cmds_F77=
+  archive_expsym_cmds_F77=
+  old_archive_From_new_cmds_F77=
+  old_archive_from_expsyms_cmds_F77=
+  export_dynamic_flag_spec_F77=
+  whole_archive_flag_spec_F77=
+  thread_safe_flag_spec_F77=
+  hardcode_libdir_flag_spec_F77=
+  hardcode_libdir_flag_spec_ld_F77=
+  hardcode_libdir_separator_F77=
+  hardcode_direct_F77=no
+  hardcode_minus_L_F77=no
+  hardcode_shlibpath_var_F77=unsupported
+  link_all_deplibs_F77=unknown
+  hardcode_automatic_F77=no
+  module_cmds_F77=
+  module_expsym_cmds_F77=
+  always_export_symbols_F77=no
+  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms_F77=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  ld_shlibs_F77=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix3* | aix4* | aix5*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	ld_shlibs_F77=no
+	cat <<EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+EOF
+      fi
+      ;;
+
+    amigaos*)
+      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      hardcode_libdir_flag_spec_F77='-L$libdir'
+      hardcode_minus_L_F77=yes
+
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we can't use
+      # them.
+      ld_shlibs_F77=no
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag_F77=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	ld_shlibs_F77=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec_F77='-L$libdir'
+      allow_undefined_flag_F77=unsupported
+      always_export_symbols_F77=no
+      enable_shared_with_static_runtimes_F77=yes
+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris* | sysv5*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+	ld_shlibs_F77=no
+	cat <<EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+EOF
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs_F77=no
+      fi
+      ;;
+
+    sunos4*)
+      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct_F77=yes
+      hardcode_shlibpath_var_F77=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs_F77=no
+      fi
+      ;;
+    esac
+
+    if test "$ld_shlibs_F77" = yes; then
+      runpath_var=LD_RUN_PATH
+      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
+      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
+      # ancient GNU ld didn't support --whole-archive et. al.
+      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+ 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	whole_archive_flag_spec_F77=
+      fi
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag_F77=unsupported
+      always_export_symbols_F77=yes
+      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L_F77=yes
+      if test "$GCC" = yes && test -z "$link_static_flag"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct_F77=unsupported
+      fi
+      ;;
+
+    aix4* | aix5*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds_F77=''
+      hardcode_direct_F77=yes
+      hardcode_libdir_separator_F77=':'
+      link_all_deplibs_F77=yes
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.012|aix4.012.*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" && \
+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	  then
+  	  # We have reworked collect2
+  	  hardcode_direct_F77=yes
+	  else
+  	  # We have old collect2
+  	  hardcode_direct_F77=unsupported
+  	  # It fails to find uninstalled libraries when the uninstalled
+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+  	  # to unsupported forces relinking
+  	  hardcode_minus_L_F77=yes
+  	  hardcode_libdir_flag_spec_F77='-L$libdir'
+  	  hardcode_libdir_separator_F77=
+	  fi
+	esac
+	shared_flag='-shared'
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+  	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+  	if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+  	fi
+	fi
+      fi
+
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols_F77=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag_F77='-berok'
+       # Determine the default libpath from the value encoded in an empty executable.
+       cat >conftest.$ac_ext <<_ACEOF
+      program main
+
+      end
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`; fi
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
+	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       else
+	if test "$host_cpu" = ia64; then
+	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag_F77="-z nodefs"
+	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an empty executable.
+	 cat >conftest.$ac_ext <<_ACEOF
+      program main
+
+      end
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`; fi
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag_F77=' ${wl}-bernotok'
+	  allow_undefined_flag_F77=' ${wl}-berok'
+	  # -bexpall does not export symbols beginning with underscore (_)
+	  always_export_symbols_F77=yes
+	  # Exported symbols can be pulled into shared objects from archives
+	  whole_archive_flag_spec_F77=' '
+	  archive_cmds_need_lc_F77=yes
+	  # This is similar to how AIX traditionally builds it's shared libraries.
+	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      hardcode_libdir_flag_spec_F77='-L$libdir'
+      hardcode_minus_L_F77=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs_F77=no
+      ;;
+
+    bsdi4*)
+      export_dynamic_flag_spec_F77=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec_F77=' '
+      allow_undefined_flag_F77=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      old_archive_From_new_cmds_F77='true'
+      # FIXME: Should let the user specify the lib program.
+      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      enable_shared_with_static_runtimes_F77=yes
+      ;;
+
+    darwin* | rhapsody*)
+    if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+      archive_cmds_need_lc_F77=no
+      case "$host_os" in
+      rhapsody* | darwin1.[012])
+	allow_undefined_flag_F77='-undefined suppress'
+	;;
+      *) # Darwin 1.3 on
+	test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_F77='-flat_namespace -undefined suppress'
+	;;
+      esac
+      # FIXME: Relying on posixy $() will cause problems for
+      #        cross-compilation, but unfortunately the echo tests do not
+      #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+      #	       `"' quotes if we put them in here... so don't!
+    	lt_int_apple_cc_single_mod=no
+    	output_verbose_link_cmd='echo'
+    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+    	  lt_int_apple_cc_single_mod=yes
+    	fi
+    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+    	else
+        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      fi
+      module_cmds_F77='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        else
+          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        fi
+          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      hardcode_direct_F77=no
+      hardcode_automatic_F77=yes
+      hardcode_shlibpath_var_F77=unsupported
+      whole_archive_flag_spec_F77='-all_load $convenience'
+      link_all_deplibs_F77=yes
+    fi
+      ;;
+
+    dgux*)
+      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec_F77='-L$libdir'
+      hardcode_shlibpath_var_F77=no
+      ;;
+
+    freebsd1*)
+      ld_shlibs_F77=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec_F77='-R$libdir'
+      hardcode_direct_F77=yes
+      hardcode_shlibpath_var_F77=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct_F77=yes
+      hardcode_minus_L_F77=yes
+      hardcode_shlibpath_var_F77=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd*)
+      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec_F77='-R$libdir'
+      hardcode_direct_F77=yes
+      hardcode_shlibpath_var_F77=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator_F77=:
+      hardcode_direct_F77=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L_F77=yes
+      export_dynamic_flag_spec_F77='${wl}-E'
+      ;;
+
+    hpux10* | hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case "$host_cpu" in
+	hppa*64*|ia64*)
+	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case "$host_cpu" in
+	hppa*64*|ia64*)
+	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  ;;
+	*)
+	  archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	case "$host_cpu" in
+	hppa*64*)
+	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
+	  hardcode_libdir_separator_F77=:
+	  hardcode_direct_F77=no
+	  hardcode_shlibpath_var_F77=no
+	  ;;
+	ia64*)
+	  hardcode_libdir_flag_spec_F77='-L$libdir'
+	  hardcode_direct_F77=no
+	  hardcode_shlibpath_var_F77=no
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L_F77=yes
+	  ;;
+	*)
+	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+	  hardcode_libdir_separator_F77=:
+	  hardcode_direct_F77=yes
+	  export_dynamic_flag_spec_F77='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L_F77=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
+      fi
+      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator_F77=:
+      link_all_deplibs_F77=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec_F77='-R$libdir'
+      hardcode_direct_F77=yes
+      hardcode_shlibpath_var_F77=no
+      ;;
+
+    newsos6)
+      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct_F77=yes
+      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator_F77=:
+      hardcode_shlibpath_var_F77=no
+      ;;
+
+    openbsd*)
+      hardcode_direct_F77=yes
+      hardcode_shlibpath_var_F77=no
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec_F77='${wl}-E'
+      else
+       case $host_os in
+	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	   hardcode_libdir_flag_spec_F77='-R$libdir'
+	   ;;
+	 *)
+	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	   ;;
+       esac
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec_F77='-L$libdir'
+      hardcode_minus_L_F77=yes
+      allow_undefined_flag_F77=unsupported
+      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	allow_undefined_flag_F77=' -expect_unresolved \*'
+	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator_F77=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+      else
+	allow_undefined_flag_F77=' -expect_unresolved \*'
+	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec_F77='-rpath $libdir'
+      fi
+      hardcode_libdir_separator_F77=:
+      ;;
+
+    sco3.2v5*)
+      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var_F77=no
+      export_dynamic_flag_spec_F77='${wl}-Bexport'
+      runpath_var=LD_RUN_PATH
+      hardcode_runpath_var=yes
+      ;;
+
+    solaris*)
+      no_undefined_flag_F77=' -z text'
+      if test "$GCC" = yes; then
+	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+      else
+	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      fi
+      hardcode_libdir_flag_spec_F77='-R$libdir'
+      hardcode_shlibpath_var_F77=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
+      esac
+      link_all_deplibs_F77=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec_F77='-L$libdir'
+      hardcode_direct_F77=yes
+      hardcode_minus_L_F77=yes
+      hardcode_shlibpath_var_F77=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct_F77=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds_F77='$CC -r -o $output$reload_objs'
+	  hardcode_direct_F77=no
+        ;;
+	motorola)
+	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var_F77=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var_F77=no
+      export_dynamic_flag_spec_F77='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var_F77=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs_F77=yes
+      fi
+      ;;
+
+    sysv4.2uw2*)
+      archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct_F77=yes
+      hardcode_minus_L_F77=no
+      hardcode_shlibpath_var_F77=no
+      hardcode_runpath_var=yes
+      runpath_var=LD_RUN_PATH
+      ;;
+
+   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+      no_undefined_flag_F77='${wl}-z ${wl}text'
+      if test "$GCC" = yes; then
+	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var_F77=no
+      ;;
+
+    sysv5*)
+      no_undefined_flag_F77=' -z text'
+      # $CC -shared without GNU ld will not create a library from C++
+      # object files and a static libstdc++, better avoid it by now
+      archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      hardcode_libdir_flag_spec_F77=
+      hardcode_shlibpath_var_F77=no
+      runpath_var='LD_RUN_PATH'
+      ;;
+
+    uts4*)
+      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec_F77='-L$libdir'
+      hardcode_shlibpath_var_F77=no
+      ;;
+
+    *)
+      ld_shlibs_F77=no
+      ;;
+    esac
+  fi
+
+echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+echo "${ECHO_T}$ld_shlibs_F77" >&6
+test "$ld_shlibs_F77" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc_F77" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc_F77=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds_F77 in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+      $rm conftest*
+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$lt_prog_compiler_wl_F77
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
+        allow_undefined_flag_F77=
+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+        then
+	  archive_cmds_need_lc_F77=no
+        else
+	  archive_cmds_need_lc_F77=yes
+        fi
+        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $rm conftest*
+      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+hardcode_action_F77=
+if test -n "$hardcode_libdir_flag_spec_F77" || \
+   test -n "$runpath_var F77" || \
+   test "X$hardcode_automatic_F77"="Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$hardcode_direct_F77" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
+     test "$hardcode_minus_L_F77" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_F77=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_F77=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_F77=unsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+echo "${ECHO_T}$hardcode_action_F77" >&6
+
+if test "$hardcode_action_F77" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+striplib=
+old_striplib=
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib="$STRIP -x"
+         echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+       ;;
+   *)
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    ;;
+  esac
+fi
+
+echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+if test "$GCC" = yes; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix4* | aix5*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi4*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32*)
+  version_type=windows
+  shrext=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $rm \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
+      ;;
+    mingw*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  # FIXME: Relying on posixy $() will cause problems for
+  #        cross-compilation, but unfortunately the echo tests do not
+  #        yet detect zsh echo's removal of \ escapes.
+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+  fi
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+freebsd*)
+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.01* | freebsdelf3.01*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  *) # from 3.2 on
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case "$host_cpu" in
+  ia64*)
+    shrext='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+   hppa*64*)
+     shrext='.sl'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+   *)
+    shrext='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+nto-qnx)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+openbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+sco3.2v5*)
+  version_type=osf
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6
+test "$dynamic_linker" = no && can_build_shared=no
+
+
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    compiler_F77 \
+    CC_F77 \
+    LD_F77 \
+    lt_prog_compiler_wl_F77 \
+    lt_prog_compiler_pic_F77 \
+    lt_prog_compiler_static_F77 \
+    lt_prog_compiler_no_builtin_flag_F77 \
+    export_dynamic_flag_spec_F77 \
+    thread_safe_flag_spec_F77 \
+    whole_archive_flag_spec_F77 \
+    enable_shared_with_static_runtimes_F77 \
+    old_archive_cmds_F77 \
+    old_archive_from_new_cmds_F77 \
+    predep_objects_F77 \
+    postdep_objects_F77 \
+    predeps_F77 \
+    postdeps_F77 \
+    compiler_lib_search_path_F77 \
+    archive_cmds_F77 \
+    archive_expsym_cmds_F77 \
+    postinstall_cmds_F77 \
+    postuninstall_cmds_F77 \
+    old_archive_from_expsyms_cmds_F77 \
+    allow_undefined_flag_F77 \
+    no_undefined_flag_F77 \
+    export_symbols_cmds_F77 \
+    hardcode_libdir_flag_spec_F77 \
+    hardcode_libdir_flag_spec_ld_F77 \
+    hardcode_libdir_separator_F77 \
+    hardcode_automatic_F77 \
+    module_cmds_F77 \
+    module_expsym_cmds_F77 \
+    lt_cv_prog_compiler_c_o_F77 \
+    exclude_expsyms_F77 \
+    include_expsyms_F77; do
+
+    case $var in
+    old_archive_cmds_F77 | \
+    old_archive_from_new_cmds_F77 | \
+    archive_cmds_F77 | \
+    archive_expsym_cmds_F77 | \
+    module_cmds_F77 | \
+    module_expsym_cmds_F77 | \
+    old_archive_from_expsyms_cmds_F77 | \
+    export_symbols_cmds_F77 | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\$0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+    ;;
+  esac
+
+cfgfile="$ofile"
+
+  cat <<__EOF__ >> "$cfgfile"
+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_F77
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A C compiler.
+LTCC=$lt_LTCC
+
+# A language-specific compiler.
+CC=$lt_compiler_F77
+
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC_F77
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# The linker used to build libraries.
+LD=$lt_LD_F77
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_F77
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally ".so").
+shrext='$shrext'
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_F77
+pic_mode=$pic_mode
+
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
+
+# Must we lock files when doing compilation ?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_F77
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds_F77
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds_F77
+archive_expsym_cmds=$lt_archive_expsym_cmds_F77
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_module_cmds_F77
+module_expsym_cmds=$lt_module_expsym_cmds_F77
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_predep_objects_F77
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_postdep_objects_F77
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_predeps_F77
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_postdeps_F77
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_F77
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_F77
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_F77
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
+
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct_F77
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L_F77
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$hardcode_automatic_F77
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_F77
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$fix_srcfile_path_F77"
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols_F77
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_F77
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_F77
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_F77
+
+# ### END LIBTOOL TAG CONFIG: $tagname
+
+__EOF__
+
+
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  test -f Makefile && make "$ltmain"
+fi
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC="$lt_save_CC"
+
+	else
+	  tagname=""
+	fi
+	;;
+
+      GCJ)
+	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+
+
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+objext_GCJ=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}\n"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${GCJ-"gcj"}
+compiler=$CC
+compiler_GCJ=$CC
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+archive_cmds_need_lc_GCJ=no
+
+
+lt_prog_compiler_no_builtin_flag_GCJ=
+
+if test "$GCC" = yes; then
+  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
+
+  echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
+  ac_outfile=conftest.$ac_objext
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:16251: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:16255: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s conftest.err; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $rm conftest*
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
+
+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
+else
+    :
+fi
+
+fi
+
+lt_prog_compiler_wl_GCJ=
+lt_prog_compiler_pic_GCJ=
+lt_prog_compiler_static_GCJ=
+
+echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+
+  if test "$GCC" = yes; then
+    lt_prog_compiler_wl_GCJ='-Wl,'
+    lt_prog_compiler_static_GCJ='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_GCJ='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
+      ;;
+
+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic_GCJ='-fno-common'
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared_GCJ=no
+      enable_shared=no
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic_GCJ=-Kconform_pic
+      fi
+      ;;
+
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case "$host_cpu" in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic_GCJ='-fPIC'
+	;;
+      esac
+      ;;
+
+    *)
+      lt_prog_compiler_pic_GCJ='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_GCJ='-Bstatic'
+      else
+	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case "$host_cpu" in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic_GCJ='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static_GCJ='-non_shared'
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic_GCJ='-KPIC'
+      lt_prog_compiler_static_GCJ='-Bstatic'
+      ;;
+
+    linux*)
+      case $CC in
+      icc|ecc)
+	lt_prog_compiler_wl_GCJ='-Wl,'
+	lt_prog_compiler_pic_GCJ='-KPIC'
+	lt_prog_compiler_static_GCJ='-static'
+        ;;
+      ccc)
+        lt_prog_compiler_wl_GCJ='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static_GCJ='-non_shared'
+        ;;
+      esac
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static_GCJ='-non_shared'
+      ;;
+
+    sco3.2v5*)
+      lt_prog_compiler_pic_GCJ='-Kpic'
+      lt_prog_compiler_static_GCJ='-dn'
+      ;;
+
+    solaris*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      lt_prog_compiler_pic_GCJ='-KPIC'
+      lt_prog_compiler_static_GCJ='-Bstatic'
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl_GCJ='-Qoption ld '
+      lt_prog_compiler_pic_GCJ='-PIC'
+      lt_prog_compiler_static_GCJ='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      lt_prog_compiler_pic_GCJ='-KPIC'
+      lt_prog_compiler_static_GCJ='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	lt_prog_compiler_pic_GCJ='-Kconform_pic'
+	lt_prog_compiler_static_GCJ='-Bstatic'
+      fi
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic_GCJ='-pic'
+      lt_prog_compiler_static_GCJ='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared_GCJ=no
+      ;;
+    esac
+  fi
+
+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic_GCJ"; then
+  echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
+if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_prog_compiler_pic_works_GCJ=no
+  ac_outfile=conftest.$ac_objext
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:16483: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:16487: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s conftest.err; then
+       lt_prog_compiler_pic_works_GCJ=yes
+     fi
+   fi
+   $rm conftest*
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
+
+if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
+    case $lt_prog_compiler_pic_GCJ in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
+     esac
+else
+    lt_prog_compiler_pic_GCJ=
+     lt_prog_compiler_can_build_shared_GCJ=no
+fi
+
+fi
+case "$host_os" in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic_GCJ=
+    ;;
+  *)
+    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
+    ;;
+esac
+
+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_prog_compiler_c_o_GCJ=no
+   $rm -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+   # that will create temporary files in the current directory regardless of
+   # the output directory.  Thus, making CWD read-only will cause this test
+   # to fail, enabling locking or at least warning the user not to do parallel
+   # builds.
+   chmod -w .
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:16550: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:16554: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s out/conftest.err; then
+       lt_cv_prog_compiler_c_o_GCJ=yes
+     fi
+   fi
+   chmod u+w .
+   $rm conftest* out/*
+   rmdir out
+   cd ..
+   rmdir conftest
+   $rm conftest*
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6
+  if test "$hard_links" = no; then
+    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+
+  runpath_var=
+  allow_undefined_flag_GCJ=
+  enable_shared_with_static_runtimes_GCJ=no
+  archive_cmds_GCJ=
+  archive_expsym_cmds_GCJ=
+  old_archive_From_new_cmds_GCJ=
+  old_archive_from_expsyms_cmds_GCJ=
+  export_dynamic_flag_spec_GCJ=
+  whole_archive_flag_spec_GCJ=
+  thread_safe_flag_spec_GCJ=
+  hardcode_libdir_flag_spec_GCJ=
+  hardcode_libdir_flag_spec_ld_GCJ=
+  hardcode_libdir_separator_GCJ=
+  hardcode_direct_GCJ=no
+  hardcode_minus_L_GCJ=no
+  hardcode_shlibpath_var_GCJ=unsupported
+  link_all_deplibs_GCJ=unknown
+  hardcode_automatic_GCJ=no
+  module_cmds_GCJ=
+  module_expsym_cmds_GCJ=
+  always_export_symbols_GCJ=no
+  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms_GCJ=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  ld_shlibs_GCJ=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix3* | aix4* | aix5*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	ld_shlibs_GCJ=no
+	cat <<EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+EOF
+      fi
+      ;;
+
+    amigaos*)
+      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+      hardcode_minus_L_GCJ=yes
+
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we can't use
+      # them.
+      ld_shlibs_GCJ=no
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag_GCJ=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	ld_shlibs_GCJ=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+      allow_undefined_flag_GCJ=unsupported
+      always_export_symbols_GCJ=no
+      enable_shared_with_static_runtimes_GCJ=yes
+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris* | sysv5*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+	ld_shlibs_GCJ=no
+	cat <<EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+EOF
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs_GCJ=no
+      fi
+      ;;
+
+    sunos4*)
+      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs_GCJ=no
+      fi
+      ;;
+    esac
+
+    if test "$ld_shlibs_GCJ" = yes; then
+      runpath_var=LD_RUN_PATH
+      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
+      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
+      # ancient GNU ld didn't support --whole-archive et. al.
+      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+ 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	whole_archive_flag_spec_GCJ=
+      fi
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag_GCJ=unsupported
+      always_export_symbols_GCJ=yes
+      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L_GCJ=yes
+      if test "$GCC" = yes && test -z "$link_static_flag"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct_GCJ=unsupported
+      fi
+      ;;
+
+    aix4* | aix5*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds_GCJ=''
+      hardcode_direct_GCJ=yes
+      hardcode_libdir_separator_GCJ=':'
+      link_all_deplibs_GCJ=yes
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.012|aix4.012.*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" && \
+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	  then
+  	  # We have reworked collect2
+  	  hardcode_direct_GCJ=yes
+	  else
+  	  # We have old collect2
+  	  hardcode_direct_GCJ=unsupported
+  	  # It fails to find uninstalled libraries when the uninstalled
+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+  	  # to unsupported forces relinking
+  	  hardcode_minus_L_GCJ=yes
+  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
+  	  hardcode_libdir_separator_GCJ=
+	  fi
+	esac
+	shared_flag='-shared'
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+  	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+  	if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+  	fi
+	fi
+      fi
+
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols_GCJ=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag_GCJ='-berok'
+       # Determine the default libpath from the value encoded in an empty executable.
+       cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`; fi
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
+	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       else
+	if test "$host_cpu" = ia64; then
+	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag_GCJ="-z nodefs"
+	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an empty executable.
+	 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`; fi
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag_GCJ=' ${wl}-bernotok'
+	  allow_undefined_flag_GCJ=' ${wl}-berok'
+	  # -bexpall does not export symbols beginning with underscore (_)
+	  always_export_symbols_GCJ=yes
+	  # Exported symbols can be pulled into shared objects from archives
+	  whole_archive_flag_spec_GCJ=' '
+	  archive_cmds_need_lc_GCJ=yes
+	  # This is similar to how AIX traditionally builds it's shared libraries.
+	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+      hardcode_minus_L_GCJ=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs_GCJ=no
+      ;;
+
+    bsdi4*)
+      export_dynamic_flag_spec_GCJ=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec_GCJ=' '
+      allow_undefined_flag_GCJ=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      old_archive_From_new_cmds_GCJ='true'
+      # FIXME: Should let the user specify the lib program.
+      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      enable_shared_with_static_runtimes_GCJ=yes
+      ;;
+
+    darwin* | rhapsody*)
+    if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+      archive_cmds_need_lc_GCJ=no
+      case "$host_os" in
+      rhapsody* | darwin1.[012])
+	allow_undefined_flag_GCJ='-undefined suppress'
+	;;
+      *) # Darwin 1.3 on
+	test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
+	;;
+      esac
+      # FIXME: Relying on posixy $() will cause problems for
+      #        cross-compilation, but unfortunately the echo tests do not
+      #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+      #	       `"' quotes if we put them in here... so don't!
+    	lt_int_apple_cc_single_mod=no
+    	output_verbose_link_cmd='echo'
+    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+    	  lt_int_apple_cc_single_mod=yes
+    	fi
+    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+    	else
+        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      fi
+      module_cmds_GCJ='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        else
+          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        fi
+          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      hardcode_direct_GCJ=no
+      hardcode_automatic_GCJ=yes
+      hardcode_shlibpath_var_GCJ=unsupported
+      whole_archive_flag_spec_GCJ='-all_load $convenience'
+      link_all_deplibs_GCJ=yes
+    fi
+      ;;
+
+    dgux*)
+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    freebsd1*)
+      ld_shlibs_GCJ=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+      hardcode_direct_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct_GCJ=yes
+      hardcode_minus_L_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd*)
+      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+      hardcode_direct_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator_GCJ=:
+      hardcode_direct_GCJ=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L_GCJ=yes
+      export_dynamic_flag_spec_GCJ='${wl}-E'
+      ;;
+
+    hpux10* | hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case "$host_cpu" in
+	hppa*64*|ia64*)
+	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case "$host_cpu" in
+	hppa*64*|ia64*)
+	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  ;;
+	*)
+	  archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	case "$host_cpu" in
+	hppa*64*)
+	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
+	  hardcode_libdir_separator_GCJ=:
+	  hardcode_direct_GCJ=no
+	  hardcode_shlibpath_var_GCJ=no
+	  ;;
+	ia64*)
+	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
+	  hardcode_direct_GCJ=no
+	  hardcode_shlibpath_var_GCJ=no
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L_GCJ=yes
+	  ;;
+	*)
+	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+	  hardcode_libdir_separator_GCJ=:
+	  hardcode_direct_GCJ=yes
+	  export_dynamic_flag_spec_GCJ='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L_GCJ=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
+      fi
+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator_GCJ=:
+      link_all_deplibs_GCJ=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+      hardcode_direct_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    newsos6)
+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct_GCJ=yes
+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator_GCJ=:
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    openbsd*)
+      hardcode_direct_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec_GCJ='${wl}-E'
+      else
+       case $host_os in
+	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
+	   ;;
+	 *)
+	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	   ;;
+       esac
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+      hardcode_minus_L_GCJ=yes
+      allow_undefined_flag_GCJ=unsupported
+      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	allow_undefined_flag_GCJ=' -expect_unresolved \*'
+	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator_GCJ=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+      else
+	allow_undefined_flag_GCJ=' -expect_unresolved \*'
+	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
+      fi
+      hardcode_libdir_separator_GCJ=:
+      ;;
+
+    sco3.2v5*)
+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var_GCJ=no
+      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
+      runpath_var=LD_RUN_PATH
+      hardcode_runpath_var=yes
+      ;;
+
+    solaris*)
+      no_undefined_flag_GCJ=' -z text'
+      if test "$GCC" = yes; then
+	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+      else
+	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      fi
+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+      hardcode_shlibpath_var_GCJ=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
+      esac
+      link_all_deplibs_GCJ=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+      hardcode_direct_GCJ=yes
+      hardcode_minus_L_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct_GCJ=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
+	  hardcode_direct_GCJ=no
+        ;;
+	motorola)
+	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var_GCJ=no
+      export_dynamic_flag_spec_GCJ='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var_GCJ=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs_GCJ=yes
+      fi
+      ;;
+
+    sysv4.2uw2*)
+      archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct_GCJ=yes
+      hardcode_minus_L_GCJ=no
+      hardcode_shlibpath_var_GCJ=no
+      hardcode_runpath_var=yes
+      runpath_var=LD_RUN_PATH
+      ;;
+
+   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+      no_undefined_flag_GCJ='${wl}-z ${wl}text'
+      if test "$GCC" = yes; then
+	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    sysv5*)
+      no_undefined_flag_GCJ=' -z text'
+      # $CC -shared without GNU ld will not create a library from C++
+      # object files and a static libstdc++, better avoid it by now
+      archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      hardcode_libdir_flag_spec_GCJ=
+      hardcode_shlibpath_var_GCJ=no
+      runpath_var='LD_RUN_PATH'
+      ;;
+
+    uts4*)
+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    *)
+      ld_shlibs_GCJ=no
+      ;;
+    esac
+  fi
+
+echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+echo "${ECHO_T}$ld_shlibs_GCJ" >&6
+test "$ld_shlibs_GCJ" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc_GCJ" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc_GCJ=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds_GCJ in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+      $rm conftest*
+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$lt_prog_compiler_wl_GCJ
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
+        allow_undefined_flag_GCJ=
+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+        then
+	  archive_cmds_need_lc_GCJ=no
+        else
+	  archive_cmds_need_lc_GCJ=yes
+        fi
+        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $rm conftest*
+      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+hardcode_action_GCJ=
+if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+   test -n "$runpath_var GCJ" || \
+   test "X$hardcode_automatic_GCJ"="Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$hardcode_direct_GCJ" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
+     test "$hardcode_minus_L_GCJ" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_GCJ=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_GCJ=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_GCJ=unsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+echo "${ECHO_T}$hardcode_action_GCJ" >&6
+
+if test "$hardcode_action_GCJ" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+striplib=
+old_striplib=
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib="$STRIP -x"
+         echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+       ;;
+   *)
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    ;;
+  esac
+fi
+
+echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+if test "$GCC" = yes; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix4* | aix5*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi4*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32*)
+  version_type=windows
+  shrext=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $rm \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
+      ;;
+    mingw*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  # FIXME: Relying on posixy $() will cause problems for
+  #        cross-compilation, but unfortunately the echo tests do not
+  #        yet detect zsh echo's removal of \ escapes.
+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+  fi
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+freebsd*)
+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.01* | freebsdelf3.01*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  *) # from 3.2 on
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case "$host_cpu" in
+  ia64*)
+    shrext='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+   hppa*64*)
+     shrext='.sl'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+   *)
+    shrext='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+nto-qnx)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+openbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+sco3.2v5*)
+  version_type=osf
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6
+test "$dynamic_linker" = no && can_build_shared=no
+
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+   ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+   ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dl_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+   ;;
+
+  *)
+    echo "$as_me:$LINENO: checking for shl_load" >&5
+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+if test "${ac_cv_func_shl_load+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char shl_load (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char shl_load ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_shl_load) || defined (__stub___shl_load)
+choke me
+#else
+char (*f) () = shl_load;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != shl_load;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_shl_load=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_shl_load=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+if test $ac_cv_func_shl_load = yes; then
+  lt_cv_dlopen="shl_load"
+else
+  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char shl_load ();
+int
+main ()
+{
+shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dld_shl_load=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dld_shl_load=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+if test $ac_cv_lib_dld_shl_load = yes; then
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+else
+  echo "$as_me:$LINENO: checking for dlopen" >&5
+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+if test "${ac_cv_func_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char dlopen (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_dlopen) || defined (__stub___dlopen)
+choke me
+#else
+char (*f) () = dlopen;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != dlopen;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+if test $ac_cv_func_dlopen = yes; then
+  lt_cv_dlopen="dlopen"
+else
+  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dl_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_svld_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_svld_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+if test $ac_cv_lib_svld_dlopen = yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+else
+  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dld_link ();
+int
+main ()
+{
+dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dld_dld_link=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dld_dld_link=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
+if test $ac_cv_lib_dld_dld_link = yes; then
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+if test "${lt_cv_dlopen_self+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+#line 18562 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+
+    exit (status);
+}
+EOF
+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      LDFLAGS="$LDFLAGS $link_static_flag"
+      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+if test "${lt_cv_dlopen_self_static+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+#line 18660 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+
+    exit (status);
+}
+EOF
+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    compiler_GCJ \
+    CC_GCJ \
+    LD_GCJ \
+    lt_prog_compiler_wl_GCJ \
+    lt_prog_compiler_pic_GCJ \
+    lt_prog_compiler_static_GCJ \
+    lt_prog_compiler_no_builtin_flag_GCJ \
+    export_dynamic_flag_spec_GCJ \
+    thread_safe_flag_spec_GCJ \
+    whole_archive_flag_spec_GCJ \
+    enable_shared_with_static_runtimes_GCJ \
+    old_archive_cmds_GCJ \
+    old_archive_from_new_cmds_GCJ \
+    predep_objects_GCJ \
+    postdep_objects_GCJ \
+    predeps_GCJ \
+    postdeps_GCJ \
+    compiler_lib_search_path_GCJ \
+    archive_cmds_GCJ \
+    archive_expsym_cmds_GCJ \
+    postinstall_cmds_GCJ \
+    postuninstall_cmds_GCJ \
+    old_archive_from_expsyms_cmds_GCJ \
+    allow_undefined_flag_GCJ \
+    no_undefined_flag_GCJ \
+    export_symbols_cmds_GCJ \
+    hardcode_libdir_flag_spec_GCJ \
+    hardcode_libdir_flag_spec_ld_GCJ \
+    hardcode_libdir_separator_GCJ \
+    hardcode_automatic_GCJ \
+    module_cmds_GCJ \
+    module_expsym_cmds_GCJ \
+    lt_cv_prog_compiler_c_o_GCJ \
+    exclude_expsyms_GCJ \
+    include_expsyms_GCJ; do
+
+    case $var in
+    old_archive_cmds_GCJ | \
+    old_archive_from_new_cmds_GCJ | \
+    archive_cmds_GCJ | \
+    archive_expsym_cmds_GCJ | \
+    module_cmds_GCJ | \
+    module_expsym_cmds_GCJ | \
+    old_archive_from_expsyms_cmds_GCJ | \
+    export_symbols_cmds_GCJ | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\$0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+    ;;
+  esac
+
+cfgfile="$ofile"
+
+  cat <<__EOF__ >> "$cfgfile"
+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_GCJ
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A C compiler.
+LTCC=$lt_LTCC
+
+# A language-specific compiler.
+CC=$lt_compiler_GCJ
+
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC_GCJ
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# The linker used to build libraries.
+LD=$lt_LD_GCJ
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_GCJ
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally ".so").
+shrext='$shrext'
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_GCJ
+pic_mode=$pic_mode
+
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
+
+# Must we lock files when doing compilation ?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_GCJ
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds_GCJ
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds_GCJ
+archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_module_cmds_GCJ
+module_expsym_cmds=$lt_module_expsym_cmds_GCJ
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_predep_objects_GCJ
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_postdep_objects_GCJ
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_predeps_GCJ
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_postdeps_GCJ
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_GCJ
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_GCJ
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_GCJ
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
+
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct_GCJ
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L_GCJ
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$hardcode_automatic_GCJ
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_GCJ
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$fix_srcfile_path_GCJ"
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols_GCJ
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_GCJ
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_GCJ
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_GCJ
+
+# ### END LIBTOOL TAG CONFIG: $tagname
+
+__EOF__
+
+
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  test -f Makefile && make "$ltmain"
+fi
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC="$lt_save_CC"
+
+	else
+	  tagname=""
+	fi
+	;;
+
+      RC)
+
+
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+objext_RC=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${RC-"windres"}
+compiler=$CC
+compiler_RC=$CC
+lt_cv_prog_compiler_c_o_RC=yes
+
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    compiler_RC \
+    CC_RC \
+    LD_RC \
+    lt_prog_compiler_wl_RC \
+    lt_prog_compiler_pic_RC \
+    lt_prog_compiler_static_RC \
+    lt_prog_compiler_no_builtin_flag_RC \
+    export_dynamic_flag_spec_RC \
+    thread_safe_flag_spec_RC \
+    whole_archive_flag_spec_RC \
+    enable_shared_with_static_runtimes_RC \
+    old_archive_cmds_RC \
+    old_archive_from_new_cmds_RC \
+    predep_objects_RC \
+    postdep_objects_RC \
+    predeps_RC \
+    postdeps_RC \
+    compiler_lib_search_path_RC \
+    archive_cmds_RC \
+    archive_expsym_cmds_RC \
+    postinstall_cmds_RC \
+    postuninstall_cmds_RC \
+    old_archive_from_expsyms_cmds_RC \
+    allow_undefined_flag_RC \
+    no_undefined_flag_RC \
+    export_symbols_cmds_RC \
+    hardcode_libdir_flag_spec_RC \
+    hardcode_libdir_flag_spec_ld_RC \
+    hardcode_libdir_separator_RC \
+    hardcode_automatic_RC \
+    module_cmds_RC \
+    module_expsym_cmds_RC \
+    lt_cv_prog_compiler_c_o_RC \
+    exclude_expsyms_RC \
+    include_expsyms_RC; do
+
+    case $var in
+    old_archive_cmds_RC | \
+    old_archive_from_new_cmds_RC | \
+    archive_cmds_RC | \
+    archive_expsym_cmds_RC | \
+    module_cmds_RC | \
+    module_expsym_cmds_RC | \
+    old_archive_from_expsyms_cmds_RC | \
+    export_symbols_cmds_RC | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\$0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+    ;;
+  esac
+
+cfgfile="$ofile"
+
+  cat <<__EOF__ >> "$cfgfile"
+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_RC
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A C compiler.
+LTCC=$lt_LTCC
+
+# A language-specific compiler.
+CC=$lt_compiler_RC
+
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC_RC
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# The linker used to build libraries.
+LD=$lt_LD_RC
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_RC
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally ".so").
+shrext='$shrext'
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_RC
+pic_mode=$pic_mode
+
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
+
+# Must we lock files when doing compilation ?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_RC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds_RC
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds_RC
+archive_expsym_cmds=$lt_archive_expsym_cmds_RC
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_module_cmds_RC
+module_expsym_cmds=$lt_module_expsym_cmds_RC
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_predep_objects_RC
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_postdep_objects_RC
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_predeps_RC
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_postdeps_RC
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_RC
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_RC
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_RC
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
+
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct_RC
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L_RC
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$hardcode_automatic_RC
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_RC
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$fix_srcfile_path_RC"
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols_RC
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_RC
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_RC
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_RC
+
+# ### END LIBTOOL TAG CONFIG: $tagname
+
+__EOF__
+
+
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  test -f Makefile && make "$ltmain"
+fi
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC="$lt_save_CC"
+
+	;;
+
+      *)
+	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
+echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
+   { (exit 1); exit 1; }; }
+	;;
+      esac
+
+      # Append the new tag name to the list of available tags.
+      if test -n "$tagname" ; then
+      available_tags="$available_tags $tagname"
+    fi
+    fi
+  done
+  IFS="$lt_save_ifs"
+
+  # Now substitute the updated list of available tags.
+  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+    mv "${ofile}T" "$ofile"
+    chmod +x "$ofile"
+  else
+    rm -f "${ofile}T"
+    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
+echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+fi
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+# Prevent multiple expansion
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+case $host in
+  *-*-cygwin | *-*-mingw* | *-*-pw32*)
+    need_no_undefined=yes
+    ;;
+  *)
+    need_no_undefined=no
+    ;;
+esac
+
+
+
+if test x$need_no_undefined = xyes; then
+  NO_UNDEFINED_TRUE=
+  NO_UNDEFINED_FALSE='#'
+else
+  NO_UNDEFINED_TRUE='#'
+  NO_UNDEFINED_FALSE=
+fi
+
+
+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.make <<\_ACEOF
+all:
+	@echo 'ac_maketemp="$(MAKE)"'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+  eval ac_cv_prog_make_${ac_make}_set=yes
+else
+  eval ac_cv_prog_make_${ac_make}_set=no
+fi
+rm -f conftest.make
+fi
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  SET_MAKE=
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+
+echo "$as_me:$LINENO: checking whether to support http" >&5
+echo $ECHO_N "checking whether to support http... $ECHO_C" >&6
+# Check whether --enable-http or --disable-http was given.
+if test "${enable_http+set}" = set; then
+  enableval="$enable_http"
+   case "$enableval" in
+  no)
+       echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define CURL_DISABLE_HTTP 1
+_ACEOF
+
+       { echo "$as_me:$LINENO: WARNING: disable HTTP disables FTP over proxy and GOPHER too" >&5
+echo "$as_me: WARNING: disable HTTP disables FTP over proxy and GOPHER too" >&2;}
+
+cat >>confdefs.h <<\_ACEOF
+#define CURL_DISABLE_GOPHER 1
+_ACEOF
+
+
+
+       ;;
+  *)   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       ;;
+  esac
+else
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+fi;
+echo "$as_me:$LINENO: checking whether to support ftp" >&5
+echo $ECHO_N "checking whether to support ftp... $ECHO_C" >&6
+# Check whether --enable-ftp or --disable-ftp was given.
+if test "${enable_ftp+set}" = set; then
+  enableval="$enable_ftp"
+   case "$enableval" in
+  no)
+       echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define CURL_DISABLE_FTP 1
+_ACEOF
+
+
+       ;;
+  *)   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       ;;
+  esac
+else
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+fi;
+echo "$as_me:$LINENO: checking whether to support gopher" >&5
+echo $ECHO_N "checking whether to support gopher... $ECHO_C" >&6
+# Check whether --enable-gopher or --disable-gopher was given.
+if test "${enable_gopher+set}" = set; then
+  enableval="$enable_gopher"
+   case "$enableval" in
+  no)
+       echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define CURL_DISABLE_GOPHER 1
+_ACEOF
+
+
+       ;;
+  *)   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       ;;
+  esac
+else
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+fi;
+echo "$as_me:$LINENO: checking whether to support file" >&5
+echo $ECHO_N "checking whether to support file... $ECHO_C" >&6
+# Check whether --enable-file or --disable-file was given.
+if test "${enable_file+set}" = set; then
+  enableval="$enable_file"
+   case "$enableval" in
+  no)
+       echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define CURL_DISABLE_FILE 1
+_ACEOF
+
+
+       ;;
+  *)   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       ;;
+  esac
+else
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+fi;
+echo "$as_me:$LINENO: checking whether to support ldap" >&5
+echo $ECHO_N "checking whether to support ldap... $ECHO_C" >&6
+# Check whether --enable-ldap or --disable-ldap was given.
+if test "${enable_ldap+set}" = set; then
+  enableval="$enable_ldap"
+   case "$enableval" in
+  no)
+       echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define CURL_DISABLE_LDAP 1
+_ACEOF
+
+
+       ;;
+  *)   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       ;;
+  esac
+else
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+fi;
+echo "$as_me:$LINENO: checking whether to support dict" >&5
+echo $ECHO_N "checking whether to support dict... $ECHO_C" >&6
+# Check whether --enable-dict or --disable-dict was given.
+if test "${enable_dict+set}" = set; then
+  enableval="$enable_dict"
+   case "$enableval" in
+  no)
+       echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define CURL_DISABLE_DICT 1
+_ACEOF
+
+
+       ;;
+  *)   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       ;;
+  esac
+else
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+fi;
+echo "$as_me:$LINENO: checking whether to support telnet" >&5
+echo $ECHO_N "checking whether to support telnet... $ECHO_C" >&6
+# Check whether --enable-telnet or --disable-telnet was given.
+if test "${enable_telnet+set}" = set; then
+  enableval="$enable_telnet"
+   case "$enableval" in
+  no)
+       echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define CURL_DISABLE_TELNET 1
+_ACEOF
+
+
+       ;;
+  *)   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       ;;
+  esac
+else
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+fi;
+
+
+
+echo "$as_me:$LINENO: checking whether to enable ipv6" >&5
+echo $ECHO_N "checking whether to enable ipv6... $ECHO_C" >&6
+# Check whether --enable-ipv6 or --disable-ipv6 was given.
+if test "${enable_ipv6+set}" = set; then
+  enableval="$enable_ipv6"
+   case "$enableval" in
+  no)
+       echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+       ipv6=no
+       ;;
+  *)   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       ipv6=yes
+       ;;
+  esac
+else
+  if test "$cross_compiling" = yes; then
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+  ipv6=no
+
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+ /* is AF_INET6 available? */
+#include <sys/types.h>
+#include <sys/socket.h>
+main()
+{
+ if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
+   exit(1);
+ else
+   exit(0);
+}
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  ipv6=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+  ipv6=no
+fi
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi;
+
+if test "$ipv6" = "yes"; then
+
+  echo "$as_me:$LINENO: checking for working getaddrinfo" >&5
+echo $ECHO_N "checking for working getaddrinfo... $ECHO_C" >&6
+if test "${ac_cv_working_getaddrinfo+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+  if test "$cross_compiling" = yes; then
+
+  ac_cv_working_getaddrinfo="yes"
+
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <netdb.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+
+void main(void) {
+    struct addrinfo hints, *ai;
+    int error;
+
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_STREAM;
+    error = getaddrinfo("127.0.0.1", "8080", &hints, &ai);
+    if (error) {
+        exit(1);
+    }
+    else {
+        exit(0);
+    }
+}
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+  ac_cv_working_getaddrinfo="yes"
+
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+
+  ac_cv_working_getaddrinfo="no"
+
+fi
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_working_getaddrinfo" >&5
+echo "${ECHO_T}$ac_cv_working_getaddrinfo" >&6
+if test "$ac_cv_working_getaddrinfo" = "yes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GETADDRINFO 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define ENABLE_IPV6 1
+_ACEOF
+
+
+  IPV6_ENABLED=1
+
+fi
+
+fi
+
+
+
+echo "$as_me:$LINENO: checking for gethostbyname" >&5
+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+if test "${ac_cv_func_gethostbyname+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char gethostbyname (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char gethostbyname ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
+choke me
+#else
+char (*f) () = gethostbyname;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != gethostbyname;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_gethostbyname=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_gethostbyname=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+if test $ac_cv_func_gethostbyname = yes; then
+  :
+else
+
+echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lnsl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char gethostbyname ();
+int
+main ()
+{
+gethostbyname ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_nsl_gethostbyname=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_nsl_gethostbyname=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+if test $ac_cv_lib_nsl_gethostbyname = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBNSL 1
+_ACEOF
+
+  LIBS="-lnsl $LIBS"
+
+fi
+
+fi
+
+
+if test "$ac_cv_lib_nsl_gethostbyname" != "yes" -a "$ac_cv_func_gethostbyname" != "yes"; then
+    echo "$as_me:$LINENO: checking for gethostbyname" >&5
+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+if test "${ac_cv_func_gethostbyname+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char gethostbyname (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char gethostbyname ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
+choke me
+#else
+char (*f) () = gethostbyname;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != gethostbyname;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_gethostbyname=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_gethostbyname=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+if test $ac_cv_func_gethostbyname = yes; then
+  :
+else
+
+echo "$as_me:$LINENO: checking for gethostbyname in -lsocket" >&5
+echo $ECHO_N "checking for gethostbyname in -lsocket... $ECHO_C" >&6
+if test "${ac_cv_lib_socket_gethostbyname+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsocket  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char gethostbyname ();
+int
+main ()
+{
+gethostbyname ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_socket_gethostbyname=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_socket_gethostbyname=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_gethostbyname" >&6
+if test $ac_cv_lib_socket_gethostbyname = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSOCKET 1
+_ACEOF
+
+  LIBS="-lsocket $LIBS"
+
+fi
+
+fi
+
+fi
+
+if test "$ac_cv_lib_nsl_gethostbyname" = "$ac_cv_func_gethostbyname"; then
+  echo "$as_me:$LINENO: checking trying both nsl and socket libs" >&5
+echo $ECHO_N "checking trying both nsl and socket libs... $ECHO_C" >&6
+  my_ac_save_LIBS=$LIBS
+  LIBS="-lnsl -lsocket $LIBS"
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+gethostbyname();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  my_ac_link_result=success
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+my_ac_link_result=failure
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+  if test "$my_ac_link_result" = "failure"; then
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    { { echo "$as_me:$LINENO: error: couldn't find libraries for gethostbyname()" >&5
+echo "$as_me: error: couldn't find libraries for gethostbyname()" >&2;}
+   { (exit 1); exit 1; }; }
+        LIBS=$my_ac_save_LIBS
+  else
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  fi
+fi
+
+echo "$as_me:$LINENO: checking for strcasecmp" >&5
+echo $ECHO_N "checking for strcasecmp... $ECHO_C" >&6
+if test "${ac_cv_func_strcasecmp+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char strcasecmp (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char strcasecmp ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_strcasecmp) || defined (__stub___strcasecmp)
+choke me
+#else
+char (*f) () = strcasecmp;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != strcasecmp;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_strcasecmp=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_strcasecmp=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_strcasecmp" >&5
+echo "${ECHO_T}$ac_cv_func_strcasecmp" >&6
+if test $ac_cv_func_strcasecmp = yes; then
+  :
+else
+
+echo "$as_me:$LINENO: checking for strcasecmp in -lresolve" >&5
+echo $ECHO_N "checking for strcasecmp in -lresolve... $ECHO_C" >&6
+if test "${ac_cv_lib_resolve_strcasecmp+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lresolve  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char strcasecmp ();
+int
+main ()
+{
+strcasecmp ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_resolve_strcasecmp=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_resolve_strcasecmp=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_resolve_strcasecmp" >&5
+echo "${ECHO_T}$ac_cv_lib_resolve_strcasecmp" >&6
+if test $ac_cv_lib_resolve_strcasecmp = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBRESOLVE 1
+_ACEOF
+
+  LIBS="-lresolve $LIBS"
+
+fi
+
+fi
+
+
+if test "$ac_cv_lib_resolve_strcasecmp" = "$ac_cv_func_strcasecmp"; then
+  echo "$as_me:$LINENO: checking for strcasecmp in -lresolve" >&5
+echo $ECHO_N "checking for strcasecmp in -lresolve... $ECHO_C" >&6
+if test "${ac_cv_lib_resolve_strcasecmp+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lresolve -lnsl $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char strcasecmp ();
+int
+main ()
+{
+strcasecmp ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_resolve_strcasecmp=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_resolve_strcasecmp=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_resolve_strcasecmp" >&5
+echo "${ECHO_T}$ac_cv_lib_resolve_strcasecmp" >&6
+if test $ac_cv_lib_resolve_strcasecmp = yes; then
+  LIBS="-lresolve $LIBS"
+fi
+
+fi
+
+echo "$as_me:$LINENO: checking for connect" >&5
+echo $ECHO_N "checking for connect... $ECHO_C" >&6
+if test "${ac_cv_func_connect+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char connect (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char connect ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_connect) || defined (__stub___connect)
+choke me
+#else
+char (*f) () = connect;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != connect;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_connect=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_connect=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+echo "${ECHO_T}$ac_cv_func_connect" >&6
+if test $ac_cv_func_connect = yes; then
+  :
+else
+
+echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+if test "${ac_cv_lib_socket_connect+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsocket  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char connect ();
+int
+main ()
+{
+connect ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_socket_connect=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_socket_connect=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+if test $ac_cv_lib_socket_connect = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSOCKET 1
+_ACEOF
+
+  LIBS="-lsocket $LIBS"
+
+fi
+
+fi
+
+
+echo "$as_me:$LINENO: checking for dlclose" >&5
+echo $ECHO_N "checking for dlclose... $ECHO_C" >&6
+if test "${ac_cv_func_dlclose+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char dlclose (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlclose ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_dlclose) || defined (__stub___dlclose)
+choke me
+#else
+char (*f) () = dlclose;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != dlclose;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_dlclose=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_dlclose=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_dlclose" >&5
+echo "${ECHO_T}$ac_cv_func_dlclose" >&6
+if test $ac_cv_func_dlclose = yes; then
+  :
+else
+
+echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dl_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBDL 1
+_ACEOF
+
+  LIBS="-ldl $LIBS"
+
+fi
+
+fi
+
+
+echo "$as_me:$LINENO: checking whether to use libgcc" >&5
+echo $ECHO_N "checking whether to use libgcc... $ECHO_C" >&6
+# Check whether --enable-libgcc or --disable-libgcc was given.
+if test "${enable_libgcc+set}" = set; then
+  enableval="$enable_libgcc"
+   case "$enableval" in
+  yes)
+        LIBS="$LIBS -lgcc"
+       echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       ;;
+  *)   echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+       ;;
+  esac
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+fi;
+
+# Check whether --enable-nonblocking or --disable-nonblocking was given.
+if test "${enable_nonblocking+set}" = set; then
+  enableval="$enable_nonblocking"
+
+  if test "$enableval" = "no" ; then
+    { echo "$as_me:$LINENO: WARNING: non-blocking sockets disabled" >&5
+echo "$as_me: WARNING: non-blocking sockets disabled" >&2;}
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DISABLED_NONBLOCKING 1
+_ACEOF
+
+  else
+
+  echo "$as_me:$LINENO: checking non-blocking sockets style" >&5
+echo $ECHO_N "checking non-blocking sockets style... $ECHO_C" >&6
+
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* headers for O_NONBLOCK test */
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+int
+main ()
+{
+
+/* try to compile O_NONBLOCK */
+
+#if defined(sun) || defined(__sun__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+# if defined(__SVR4) || defined(__srv4__)
+#  define PLATFORM_SOLARIS
+# else
+#  define PLATFORM_SUNOS4
+# endif
+#endif
+#if (defined(_AIX) || defined(__xlC__)) && !defined(_AIX4)
+# define PLATFORM_AIX_V3
+#endif
+
+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3)
+#error "O_NONBLOCK does not work on this platform"
+#endif
+  int socket;
+  int flags = fcntl(socket, F_SETFL, flags | O_NONBLOCK);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+nonblock="O_NONBLOCK"
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_O_NONBLOCK 1
+_ACEOF
+
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* headers for FIONBIO test */
+#include <unistd.h>
+#include <stropts.h>
+
+int
+main ()
+{
+
+/* FIONBIO source test */
+ int flags = ioctl(socket, FIONBIO, &flags);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+nonblock="FIONBIO"
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FIONBIO 1
+_ACEOF
+
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* headers for ioctlsocket test (cygwin?) */
+#include <windows.h>
+
+int
+main ()
+{
+
+/* ioctlsocket source code */
+ int flags = ioctlsocket(socket, FIONBIO, &flags);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+nonblock="ioctlsocket"
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_IOCTLSOCKET 1
+_ACEOF
+
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* headers for IoctlSocket test (Amiga?) */
+#include <sys/ioctl.h>
+
+int
+main ()
+{
+
+/* IoctlSocket source code */
+ int flags = IoctlSocket(socket, FIONBIO, (long)1);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+nonblock="IoctlSocket"
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_IOCTLSOCKET_CASE 1
+_ACEOF
+
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+nonblock="nada"
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DISABLED_NONBLOCKING 1
+_ACEOF
+
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  echo "$as_me:$LINENO: result: $nonblock" >&5
+echo "${ECHO_T}$nonblock" >&6
+
+  if test "$nonblock" = "nada"; then
+    { echo "$as_me:$LINENO: WARNING: non-block sockets disabled" >&5
+echo "$as_me: WARNING: non-block sockets disabled" >&2;}
+  fi
+
+  fi
+
+else
+
+
+  echo "$as_me:$LINENO: checking non-blocking sockets style" >&5
+echo $ECHO_N "checking non-blocking sockets style... $ECHO_C" >&6
+
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* headers for O_NONBLOCK test */
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+int
+main ()
+{
+
+/* try to compile O_NONBLOCK */
+
+#if defined(sun) || defined(__sun__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+# if defined(__SVR4) || defined(__srv4__)
+#  define PLATFORM_SOLARIS
+# else
+#  define PLATFORM_SUNOS4
+# endif
+#endif
+#if (defined(_AIX) || defined(__xlC__)) && !defined(_AIX4)
+# define PLATFORM_AIX_V3
+#endif
+
+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3)
+#error "O_NONBLOCK does not work on this platform"
+#endif
+  int socket;
+  int flags = fcntl(socket, F_SETFL, flags | O_NONBLOCK);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+nonblock="O_NONBLOCK"
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_O_NONBLOCK 1
+_ACEOF
+
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* headers for FIONBIO test */
+#include <unistd.h>
+#include <stropts.h>
+
+int
+main ()
+{
+
+/* FIONBIO source test */
+ int flags = ioctl(socket, FIONBIO, &flags);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+nonblock="FIONBIO"
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FIONBIO 1
+_ACEOF
+
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* headers for ioctlsocket test (cygwin?) */
+#include <windows.h>
+
+int
+main ()
+{
+
+/* ioctlsocket source code */
+ int flags = ioctlsocket(socket, FIONBIO, &flags);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+nonblock="ioctlsocket"
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_IOCTLSOCKET 1
+_ACEOF
+
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* headers for IoctlSocket test (Amiga?) */
+#include <sys/ioctl.h>
+
+int
+main ()
+{
+
+/* IoctlSocket source code */
+ int flags = IoctlSocket(socket, FIONBIO, (long)1);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+nonblock="IoctlSocket"
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_IOCTLSOCKET_CASE 1
+_ACEOF
+
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+nonblock="nada"
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DISABLED_NONBLOCKING 1
+_ACEOF
+
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  echo "$as_me:$LINENO: result: $nonblock" >&5
+echo "${ECHO_T}$nonblock" >&6
+
+  if test "$nonblock" = "nada"; then
+    { echo "$as_me:$LINENO: WARNING: non-block sockets disabled" >&5
+echo "$as_me: WARNING: non-block sockets disabled" >&2;}
+  fi
+
+
+fi;
+
+
+
+# Check whether --with-egd-socket or --without-egd-socket was given.
+if test "${with_egd_socket+set}" = set; then
+  withval="$with_egd_socket"
+   EGD_SOCKET="$withval"
+
+fi;
+if test -n "$EGD_SOCKET" ; then
+
+cat >>confdefs.h <<_ACEOF
+#define EGD_SOCKET "$EGD_SOCKET"
+_ACEOF
+
+fi
+
+
+# Check whether --with-random or --without-random was given.
+if test "${with_random+set}" = set; then
+  withval="$with_random"
+   RANDOM_FILE="$withval"
+else
+
+                echo "$as_me:$LINENO: checking for \"/dev/urandom\"" >&5
+echo $ECHO_N "checking for \"/dev/urandom\"... $ECHO_C" >&6
+if test "${ac_cv_file___dev_urandom_+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  test "$cross_compiling" = yes &&
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
+if test -r ""/dev/urandom""; then
+  ac_cv_file___dev_urandom_=yes
+else
+  ac_cv_file___dev_urandom_=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file___dev_urandom_" >&5
+echo "${ECHO_T}$ac_cv_file___dev_urandom_" >&6
+if test $ac_cv_file___dev_urandom_ = yes; then
+   RANDOM_FILE="/dev/urandom"
+fi
+
+
+
+fi;
+if test -n "$RANDOM_FILE" ; then
+
+
+cat >>confdefs.h <<_ACEOF
+#define RANDOM_FILE "$RANDOM_FILE"
+_ACEOF
+
+fi
+
+
+echo "$as_me:$LINENO: checking if argv can be written to" >&5
+echo $ECHO_N "checking if argv can be written to... $ECHO_C" >&6
+if test "$cross_compiling" = yes; then
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+        { echo "$as_me:$LINENO: WARNING: the previous check could not be made default was used" >&5
+echo "$as_me: WARNING: the previous check could not be made default was used" >&2;}
+
+else
+  cat >conftest.$ac_ext <<_ACEOF
+
+int main(int argc, char ** argv) {
+	argv[0][0] = ' ';
+	return (argv[0][0] == ' ')?0:1;
+}
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_WRITABLE_ARGV 1
+_ACEOF
+
+	echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+
+# Check whether --with-krb4-includes or --without-krb4-includes was given.
+if test "${with_krb4_includes+set}" = set; then
+  withval="$with_krb4_includes"
+
+ CPPFLAGS="$CPPFLAGS -I$withval"
+ KRB4INC="$withval"
+ want_krb4=yes
+
+fi;
+
+
+# Check whether --with-krb4-libs or --without-krb4-libs was given.
+if test "${with_krb4_libs+set}" = set; then
+  withval="$with_krb4_libs"
+
+ LDFLAGS="$LDFLAGS -L$withval"
+ KRB4LIB="$withval"
+ want_krb4=yes
+
+fi;
+
+
+OPT_KRB4=off
+
+# Check whether --with-krb4 or --without-krb4 was given.
+if test "${with_krb4+set}" = set; then
+  withval="$with_krb4"
+
+  OPT_KRB4="$withval"
+  if test X"$OPT_KRB4" != Xyes
+  then
+    LDFLAGS="$LDFLAGS -L$OPT_KRB4/lib"
+    KRB4LIB="$OPT_KRB4/lib"
+    CPPFLAGS="$CPPFLAGS -I$OPT_KRB4/include"
+    KRB4INC="$OPT_KRB4/include"
+  fi
+  want_krb4="yes"
+
+fi;
+
+echo "$as_me:$LINENO: checking if Kerberos4 support is requested" >&5
+echo $ECHO_N "checking if Kerberos4 support is requested... $ECHO_C" >&6
+
+if test "$want_krb4" = yes
+then
+  if test "$ipv6" = "yes"; then
+    echo krb4 is not compatible with IPv6
+    exit 1
+  fi
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+
+  echo "$as_me:$LINENO: checking where to look for Kerberos4" >&5
+echo $ECHO_N "checking where to look for Kerberos4... $ECHO_C" >&6
+  if test X"$OPT_KRB4" = Xyes
+  then
+    echo "$as_me:$LINENO: result: defaults" >&5
+echo "${ECHO_T}defaults" >&6
+  else
+    echo "$as_me:$LINENO: result: libs in $KRB4LIB, headers in $KRB4INC" >&5
+echo "${ECHO_T}libs in $KRB4LIB, headers in $KRB4INC" >&6
+  fi
+
+    echo "$as_me:$LINENO: checking for des_pcbc_encrypt in -ldes" >&5
+echo $ECHO_N "checking for des_pcbc_encrypt in -ldes... $ECHO_C" >&6
+if test "${ac_cv_lib_des_des_pcbc_encrypt+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldes  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char des_pcbc_encrypt ();
+int
+main ()
+{
+des_pcbc_encrypt ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_des_des_pcbc_encrypt=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_des_des_pcbc_encrypt=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_pcbc_encrypt" >&5
+echo "${ECHO_T}$ac_cv_lib_des_des_pcbc_encrypt" >&6
+if test $ac_cv_lib_des_des_pcbc_encrypt = yes; then
+
+
+for ac_header in des.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+        echo "$as_me:$LINENO: checking for res_search" >&5
+echo $ECHO_N "checking for res_search... $ECHO_C" >&6
+if test "${ac_cv_func_res_search+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char res_search (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char res_search ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_res_search) || defined (__stub___res_search)
+choke me
+#else
+char (*f) () = res_search;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != res_search;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_res_search=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_res_search=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_res_search" >&5
+echo "${ECHO_T}$ac_cv_func_res_search" >&6
+if test $ac_cv_func_res_search = yes; then
+  :
+else
+
+echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
+echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6
+if test "${ac_cv_lib_resolv_res_search+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lresolv  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char res_search ();
+int
+main ()
+{
+res_search ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_resolv_res_search=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_resolv_res_search=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
+echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6
+if test $ac_cv_lib_resolv_res_search = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBRESOLV 1
+_ACEOF
+
+  LIBS="-lresolv $LIBS"
+
+fi
+
+fi
+
+
+        echo "$as_me:$LINENO: checking for krb_net_read in -lkrb" >&5
+echo $ECHO_N "checking for krb_net_read in -lkrb... $ECHO_C" >&6
+if test "${ac_cv_lib_krb_krb_net_read+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lkrb  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char krb_net_read ();
+int
+main ()
+{
+krb_net_read ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_krb_krb_net_read=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_krb_krb_net_read=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_krb_krb_net_read" >&5
+echo "${ECHO_T}$ac_cv_lib_krb_krb_net_read" >&6
+if test $ac_cv_lib_krb_krb_net_read = yes; then
+
+
+for ac_header in krb.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+            LIBS="-lkrb -ldes $LIBS"
+
+
+for ac_func in krb_get_our_ip_for_realm
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+
+cat >>confdefs.h <<\_ACEOF
+#define KRB4 1
+_ACEOF
+
+
+            KRB4_ENABLED=1
+
+
+
+for ac_func in strlcpy
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+
+fi
+
+
+fi
+
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+# Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKGCONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PKGCONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:/usr/bin:/usr/local/bin"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_path_PKGCONFIG" && ac_cv_path_PKGCONFIG="no"
+  ;;
+esac
+fi
+PKGCONFIG=$ac_cv_path_PKGCONFIG
+
+if test -n "$PKGCONFIG"; then
+  echo "$as_me:$LINENO: result: $PKGCONFIG" >&5
+echo "${ECHO_T}$PKGCONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+if test "$PKGCONFIG" != "no" ; then
+  echo "$as_me:$LINENO: checking for OpenSSL options using pkg-config" >&5
+echo $ECHO_N "checking for OpenSSL options using pkg-config... $ECHO_C" >&6
+
+  $PKGCONFIG --exists openssl
+  SSL_EXISTS=$?
+
+  if test "$SSL_EXISTS" -eq "0"; then
+    SSL_LIBS=`$PKGCONFIG --libs-only-l openssl 2>/dev/null`
+    SSL_LDFLAGS=`$PKGCONFIG --libs-only-L openssl 2>/dev/null`
+    SSL_CPPFLAGS=`$PKGCONFIG --cflags-only-I openssl 2>/dev/null`
+
+    LIBS="$LIBS $SSL_LIBS"
+    CPPFLAGS="$CPPFLAGS $SSL_CPPFLAGS"
+    LDFLAGS="$LDFLAGS $SSL_LDFLAGS"
+
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  else
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+  fi
+
+fi
+
+
+OPT_SSL=off
+
+# Check whether --with-ssl or --without-ssl was given.
+if test "${with_ssl+set}" = set; then
+  withval="$with_ssl"
+  OPT_SSL=$withval
+fi;
+
+if test X"$OPT_SSL" = Xno
+then
+  { echo "$as_me:$LINENO: WARNING: SSL/https support disabled" >&5
+echo "$as_me: WARNING: SSL/https support disabled" >&2;}
+else
+
+
+    CLEANLDFLAGS="$LDFLAGS"
+  CLEANCPPFLAGS="$CPPFLAGS"
+
+  case "$OPT_SSL" in
+  yes)
+    EXTRA_SSL=/usr/local/ssl ;;
+  off)
+    EXTRA_SSL= ;;
+  *)
+        EXTRA_SSL=$OPT_SSL
+    LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib"
+    CPPFLAGS="$CPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
+    ;;
+  esac
+
+  echo "$as_me:$LINENO: checking for CRYPTO_lock in -lcrypto" >&5
+echo $ECHO_N "checking for CRYPTO_lock in -lcrypto... $ECHO_C" >&6
+if test "${ac_cv_lib_crypto_CRYPTO_lock+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypto  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char CRYPTO_lock ();
+int
+main ()
+{
+CRYPTO_lock ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_crypto_CRYPTO_lock=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_crypto_CRYPTO_lock=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_lock" >&5
+echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_lock" >&6
+if test $ac_cv_lib_crypto_CRYPTO_lock = yes; then
+
+     HAVECRYPTO="yes"
+
+else
+
+     OLDLDFLAGS="$LDFLAGS"
+     OLDCPPFLAGS="$CPPFLAGS"
+     LDFLAGS="$CLEANLDFLAGS -L$EXTRA_SSL/lib"
+     CPPFLAGS="$CLEANCPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
+     echo "$as_me:$LINENO: checking for CRYPTO_add_lock in -lcrypto" >&5
+echo $ECHO_N "checking for CRYPTO_add_lock in -lcrypto... $ECHO_C" >&6
+if test "${ac_cv_lib_crypto_CRYPTO_add_lock+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypto  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char CRYPTO_add_lock ();
+int
+main ()
+{
+CRYPTO_add_lock ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_crypto_CRYPTO_add_lock=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_crypto_CRYPTO_add_lock=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_add_lock" >&5
+echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_add_lock" >&6
+if test $ac_cv_lib_crypto_CRYPTO_add_lock = yes; then
+
+       HAVECRYPTO="yes"
+else
+
+       LDFLAGS="$OLDLDFLAGS"
+       CPPFLAGS="$OLDCPPFLAGS"
+
+fi
+
+
+fi
+
+
+
+  if test "$HAVECRYPTO" = "yes"; then
+
+
+echo "$as_me:$LINENO: checking for CRYPTO_add_lock in -lcrypto" >&5
+echo $ECHO_N "checking for CRYPTO_add_lock in -lcrypto... $ECHO_C" >&6
+if test "${ac_cv_lib_crypto_CRYPTO_add_lock+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypto  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char CRYPTO_add_lock ();
+int
+main ()
+{
+CRYPTO_add_lock ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_crypto_CRYPTO_add_lock=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_crypto_CRYPTO_add_lock=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_add_lock" >&5
+echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_add_lock" >&6
+if test $ac_cv_lib_crypto_CRYPTO_add_lock = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBCRYPTO 1
+_ACEOF
+
+  LIBS="-lcrypto $LIBS"
+
+fi
+
+
+echo "$as_me:$LINENO: checking for SSL_connect in -lssl" >&5
+echo $ECHO_N "checking for SSL_connect in -lssl... $ECHO_C" >&6
+if test "${ac_cv_lib_ssl_SSL_connect+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lssl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char SSL_connect ();
+int
+main ()
+{
+SSL_connect ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_ssl_SSL_connect=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_ssl_SSL_connect=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_connect" >&5
+echo "${ECHO_T}$ac_cv_lib_ssl_SSL_connect" >&6
+if test $ac_cv_lib_ssl_SSL_connect = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSSL 1
+_ACEOF
+
+  LIBS="-lssl $LIBS"
+
+fi
+
+
+    if test "$ac_cv_lib_ssl_SSL_connect" != yes; then
+                echo "$as_me:$LINENO: checking for ssl with RSAglue/rsaref libs in use" >&5
+echo $ECHO_N "checking for ssl with RSAglue/rsaref libs in use... $ECHO_C" >&6;
+        OLIBS=$LIBS
+        LIBS="$LIBS -lRSAglue -lrsaref"
+
+echo "$as_me:$LINENO: checking for SSL_connect in -lssl" >&5
+echo $ECHO_N "checking for SSL_connect in -lssl... $ECHO_C" >&6
+if test "${ac_cv_lib_ssl_SSL_connect+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lssl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char SSL_connect ();
+int
+main ()
+{
+SSL_connect ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_ssl_SSL_connect=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_ssl_SSL_connect=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_connect" >&5
+echo "${ECHO_T}$ac_cv_lib_ssl_SSL_connect" >&6
+if test $ac_cv_lib_ssl_SSL_connect = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSSL 1
+_ACEOF
+
+  LIBS="-lssl $LIBS"
+
+fi
+
+        if test "$ac_cv_lib_ssl_SSL_connect" != yes; then
+                        echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+            LIBS=$OLIBS
+        else
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+        fi
+    fi
+
+
+
+
+
+
+
+
+for ac_header in openssl/x509.h openssl/rsa.h openssl/crypto.h \
+                     openssl/pem.h openssl/ssl.h openssl/err.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ OPENSSL_ENABLED=1
+fi
+
+done
+
+
+    if test $ac_cv_header_openssl_x509_h = no; then
+
+
+
+
+
+
+for ac_header in x509.h rsa.h crypto.h pem.h ssl.h err.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ OPENSSL_ENABLED=1
+fi
+
+done
+
+    fi
+
+            echo "$as_me:$LINENO: checking for ENGINE_init" >&5
+echo $ECHO_N "checking for ENGINE_init... $ECHO_C" >&6
+if test "${ac_cv_func_ENGINE_init+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char ENGINE_init (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char ENGINE_init ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_ENGINE_init) || defined (__stub___ENGINE_init)
+choke me
+#else
+char (*f) () = ENGINE_init;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != ENGINE_init;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_ENGINE_init=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_ENGINE_init=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_ENGINE_init" >&5
+echo "${ECHO_T}$ac_cv_func_ENGINE_init" >&6
+if test $ac_cv_func_ENGINE_init = yes; then
+
+for ac_header in openssl/engine.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+fi
+
+
+
+
+  fi
+
+  if test X"$OPT_SSL" != Xoff &&
+     test "$OPENSSL_ENABLED" != "1"; then
+    { { echo "$as_me:$LINENO: error: OpenSSL libs and/or directories were not found where specified!" >&5
+echo "$as_me: error: OpenSSL libs and/or directories were not found where specified!" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+
+
+
+
+
+
+for ac_func in RAND_status \
+                  RAND_screen \
+                  RAND_egd
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+fi
+
+
+
+_cppflags=$CPPFLAGS
+_ldflags=$LDFLAGS
+OPT_ZLIB="/usr/local"
+
+# Check whether --with-zlib or --without-zlib was given.
+if test "${with_zlib+set}" = set; then
+  withval="$with_zlib"
+  OPT_ZLIB="$withval"
+fi;
+
+case "$OPT_ZLIB" in
+  no)
+    { echo "$as_me:$LINENO: WARNING: zlib disabled" >&5
+echo "$as_me: WARNING: zlib disabled" >&2;} ;;
+  *)
+
+
+echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5
+echo $ECHO_N "checking for inflateEnd in -lz... $ECHO_C" >&6
+if test "${ac_cv_lib_z_inflateEnd+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char inflateEnd ();
+int
+main ()
+{
+inflateEnd ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_z_inflateEnd=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_z_inflateEnd=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflateEnd" >&5
+echo "${ECHO_T}$ac_cv_lib_z_inflateEnd" >&6
+if test $ac_cv_lib_z_inflateEnd = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBZ 1
+_ACEOF
+
+  LIBS="-lz $LIBS"
+
+else
+  if test -d "$OPT_ZLIB"; then
+                      CPPFLAGS="$CPPFLAGS -I$OPT_ZLIB/include"
+                      LDFLAGS="$LDFLAGS -L$OPT_ZLIB/lib"
+                   fi
+fi
+
+
+    if test "${ac_cv_header_zlib_h+set}" = set; then
+  echo "$as_me:$LINENO: checking for zlib.h" >&5
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
+if test "${ac_cv_header_zlib_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking zlib.h usability" >&5
+echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <zlib.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking zlib.h presence" >&5
+echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <zlib.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for zlib.h" >&5
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
+if test "${ac_cv_header_zlib_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_zlib_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
+
+fi
+if test $ac_cv_header_zlib_h = yes; then
+
+      echo "$as_me:$LINENO: checking for gzread in -lz" >&5
+echo $ECHO_N "checking for gzread in -lz... $ECHO_C" >&6
+if test "${ac_cv_lib_z_gzread+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char gzread ();
+int
+main ()
+{
+gzread ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_z_gzread=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_z_gzread=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzread" >&5
+echo "${ECHO_T}$ac_cv_lib_z_gzread" >&6
+if test $ac_cv_lib_z_gzread = yes; then
+  HAVE_LIBZ="1"
+
+                   LIBS="$LIBS -lz"
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ZLIB_H 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBZ 1
+_ACEOF
+
+else
+   CPPFLAGS=$_cppflags
+                   LDFLAGS=$_ldflags
+fi
+
+else
+   CPPFLAGS=$_cppflags
+      LDFLAGS=$_ldflags
+
+fi
+
+
+    ;;
+esac
+
+OPT_THREAD=on
+
+echo "$as_me:$LINENO: checking AIX 4.3 or later" >&5
+echo $ECHO_N "checking AIX 4.3 or later... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+
+#if defined(_AIX) && defined(_AIX43)
+printf("just fine");
+#else
+#error "this is not AIX 4.3 or later"
+#endif
+
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+   OPT_THREAD=off
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+   echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+fi
+rm -f conftest.err conftest.$ac_ext
+
+# Check whether --enable-thread or --disable-thread was given.
+if test "${enable_thread+set}" = set; then
+  enableval="$enable_thread"
+  OPT_THREAD=off
+  { echo "$as_me:$LINENO: WARNING: libcurl will not get built using thread-safe functions" >&5
+echo "$as_me: WARNING: libcurl will not get built using thread-safe functions" >&2;}
+
+fi;
+
+if test X"$OPT_THREAD" = Xoff
+then
+
+cat >>confdefs.h <<\_ACEOF
+#define DISABLED_THREADSAFE 1
+_ACEOF
+
+else
+
+
+
+for ac_func in gethostbyname_r
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+    echo "$as_me:$LINENO: checking if gethostbyname_r takes 3 arguments" >&5
+echo $ECHO_N "checking if gethostbyname_r takes 3 arguments... $ECHO_C" >&6
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <string.h>
+#include <sys/types.h>
+#include <netdb.h>
+#undef NULL
+#define NULL (void *)0
+
+int
+gethostbyname_r(const char *, struct hostent *, struct hostent_data *);
+int
+main ()
+{
+
+struct hostent_data data;
+gethostbyname_r(NULL, NULL, NULL);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+      echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GETHOSTBYNAME_R_3 1
+_ACEOF
+
+      ac_cv_gethostbyname_args=3
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+      echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+      echo "$as_me:$LINENO: checking if gethostbyname_r with -D_REENTRANT takes 3 arguments" >&5
+echo $ECHO_N "checking if gethostbyname_r with -D_REENTRANT takes 3 arguments... $ECHO_C" >&6
+      cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#define _REENTRANT
+
+#include <string.h>
+#include <sys/types.h>
+#include <netdb.h>
+#undef NULL
+#define NULL (void *)0
+
+int
+gethostbyname_r(const char *,struct hostent *, struct hostent_data *);
+int
+main ()
+{
+
+struct hostent_data data;
+gethostbyname_r(NULL, NULL, NULL);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+	echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GETHOSTBYNAME_R_3 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define NEED_REENTRANT 1
+_ACEOF
+
+	ac_cv_gethostbyname_args=3
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+	echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+	echo "$as_me:$LINENO: checking if gethostbyname_r takes 5 arguments" >&5
+echo $ECHO_N "checking if gethostbyname_r takes 5 arguments... $ECHO_C" >&6
+	cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <netdb.h>
+#undef NULL
+#define NULL (void *)0
+
+struct hostent *
+gethostbyname_r(const char *, struct hostent *, char *, int, int *);
+int
+main ()
+{
+
+gethostbyname_r(NULL, NULL, NULL, 0, NULL);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+	  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GETHOSTBYNAME_R_5 1
+_ACEOF
+
+          ac_cv_gethostbyname_args=5
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+	  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+	  echo "$as_me:$LINENO: checking if gethostbyname_r takes 6 arguments" >&5
+echo $ECHO_N "checking if gethostbyname_r takes 6 arguments... $ECHO_C" >&6
+	  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <netdb.h>
+#undef NULL
+#define NULL (void *)0
+
+int
+gethostbyname_r(const char *, struct hostent *, char *, size_t,
+struct hostent **, int *);
+int
+main ()
+{
+
+gethostbyname_r(NULL, NULL, NULL, 0, NULL, NULL);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+	    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GETHOSTBYNAME_R_6 1
+_ACEOF
+
+            ac_cv_gethostbyname_args=6
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+	    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+	    have_missing_r_funcs="$have_missing_r_funcs gethostbyname_r"
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+done
+
+
+if test "$ac_cv_func_gethostbyname_r" = "yes"; then
+  if test "$ac_cv_gethostbyname_args" = "0"; then
+            { { echo "$as_me:$LINENO: error: couldn't figure out how to use gethostbyname_r()" >&5
+echo "$as_me: error: couldn't figure out how to use gethostbyname_r()" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+fi
+
+
+
+
+for ac_func in gethostbyaddr_r
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+    echo "$as_me:$LINENO: checking if gethostbyaddr_r takes 5 arguments" >&5
+echo $ECHO_N "checking if gethostbyaddr_r takes 5 arguments... $ECHO_C" >&6
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <netdb.h>
+int
+main ()
+{
+
+char * address;
+int length;
+int type;
+struct hostent h;
+struct hostent_data hdata;
+int rc;
+rc = gethostbyaddr_r(address, length, type, &h, &hdata);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+      echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GETHOSTBYADDR_R_5 1
+_ACEOF
+
+      ac_cv_gethostbyaddr_args=5
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+      echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+      echo "$as_me:$LINENO: checking if gethostbyaddr_r with -D_REENTRANT takes 5 arguments" >&5
+echo $ECHO_N "checking if gethostbyaddr_r with -D_REENTRANT takes 5 arguments... $ECHO_C" >&6
+      cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#define _REENTRANT
+#include <sys/types.h>
+#include <netdb.h>
+int
+main ()
+{
+
+char * address;
+int length;
+int type;
+struct hostent h;
+struct hostent_data hdata;
+int rc;
+rc = gethostbyaddr_r(address, length, type, &h, &hdata);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+	echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GETHOSTBYADDR_R_5 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define NEED_REENTRANT 1
+_ACEOF
+
+	ac_cv_gethostbyaddr_args=5
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+	echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+	echo "$as_me:$LINENO: checking if gethostbyaddr_r takes 7 arguments" >&5
+echo $ECHO_N "checking if gethostbyaddr_r takes 7 arguments... $ECHO_C" >&6
+	cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <netdb.h>
+int
+main ()
+{
+
+char * address;
+int length;
+int type;
+struct hostent h;
+char buffer[8192];
+int h_errnop;
+struct hostent * hp;
+
+hp = gethostbyaddr_r(address, length, type, &h,
+                     buffer, 8192, &h_errnop);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+	  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GETHOSTBYADDR_R_7 1
+_ACEOF
+
+	  ac_cv_gethostbyaddr_args=7
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+	  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+	  echo "$as_me:$LINENO: checking if gethostbyaddr_r takes 8 arguments" >&5
+echo $ECHO_N "checking if gethostbyaddr_r takes 8 arguments... $ECHO_C" >&6
+	  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <netdb.h>
+int
+main ()
+{
+
+char * address;
+int length;
+int type;
+struct hostent h;
+char buffer[8192];
+int h_errnop;
+struct hostent * hp;
+int rc;
+
+rc = gethostbyaddr_r(address, length, type, &h,
+                     buffer, 8192, &hp, &h_errnop);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+	    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GETHOSTBYADDR_R_8 1
+_ACEOF
+
+	    ac_cv_gethostbyaddr_args=8
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+	    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+	    have_missing_r_funcs="$have_missing_r_funcs gethostbyaddr_r"
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+done
+
+
+
+
+
+for ac_func in inet_ntoa_r
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+    echo "$as_me:$LINENO: checking whether inet_ntoa_r is declared" >&5
+echo $ECHO_N "checking whether inet_ntoa_r is declared... $ECHO_C" >&6
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <arpa/inet.h>
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "inet_ntoa_r" >/dev/null 2>&1; then
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_INET_NTOA_R_DECL 1
+_ACEOF
+
+      echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+
+      echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+      echo "$as_me:$LINENO: checking whether inet_ntoa_r with -D_REENTRANT is declared" >&5
+echo $ECHO_N "checking whether inet_ntoa_r with -D_REENTRANT is declared... $ECHO_C" >&6
+      cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#define _REENTRANT
+#include <arpa/inet.h>
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "inet_ntoa_r" >/dev/null 2>&1; then
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_INET_NTOA_R_DECL 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define NEED_REENTRANT 1
+_ACEOF
+
+	echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+rm -f conftest*
+
+fi
+rm -f conftest*
+
+fi
+done
+
+
+
+
+
+for ac_func in localtime_r
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+    echo "$as_me:$LINENO: checking whether localtime_r is declared" >&5
+echo $ECHO_N "checking whether localtime_r is declared... $ECHO_C" >&6
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <time.h>
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "localtime_r" >/dev/null 2>&1; then
+
+      echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+
+      echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+      echo "$as_me:$LINENO: checking whether localtime_r with -D_REENTRANT is declared" >&5
+echo $ECHO_N "checking whether localtime_r with -D_REENTRANT is declared... $ECHO_C" >&6
+      cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#define _REENTRANT
+#include <time.h>
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "localtime_r" >/dev/null 2>&1; then
+
+	cat >>confdefs.h <<\_ACEOF
+#define NEED_REENTRANT 1
+_ACEOF
+
+	echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+rm -f conftest*
+
+fi
+rm -f conftest*
+
+fi
+done
+
+
+
+
+for ac_func in gmtime_r
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+fi
+
+
+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+if test "${ac_cv_header_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_header_stdc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_header_stdc=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then
+  :
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ctype.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+                   (('a' <= (c) && (c) <= 'i') \
+                     || ('j' <= (c) && (c) <= 'r') \
+                     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+        || toupper (i) != TOUPPER (i))
+      exit(2);
+  exit (0);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6
+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+for ac_header in sys/types.h \
+        sys/time.h \
+        sys/select.h \
+        sys/socket.h \
+        unistd.h \
+        malloc.h \
+        stdlib.h \
+        arpa/inet.h \
+        net/if.h \
+        netinet/in.h \
+        netdb.h \
+        sys/sockio.h \
+        sys/stat.h \
+        sys/param.h \
+        termios.h \
+        termio.h \
+        sgtty.h \
+        fcntl.h \
+        dlfcn.h \
+        alloca.h \
+        winsock.h \
+        time.h \
+        io.h \
+        pwd.h \
+        utime.h \
+        sys/utime.h \
+        sys/poll.h \
+        setjmp.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+if test "${ac_cv_c_const+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+/* FIXME: Include the comments suggested by Paul. */
+#ifndef __cplusplus
+  /* Ultrix mips cc rejects this.  */
+  typedef int charset[2];
+  const charset x;
+  /* SunOS 4.1.1 cc rejects this.  */
+  char const *const *ccp;
+  char **p;
+  /* NEC SVR4.0.2 mips cc rejects this.  */
+  struct point {int x, y;};
+  static struct point const zero = {0,0};
+  /* AIX XL C 1.02.0.0 rejects this.
+     It does not let you subtract one const X* pointer from another in
+     an arm of an if-expression whose if-part is not a constant
+     expression */
+  const char *g = "string";
+  ccp = &g + (g ? g-g : 0);
+  /* HPUX 7.0 cc rejects these. */
+  ++ccp;
+  p = (char**) ccp;
+  ccp = (char const *const *) p;
+  { /* SCO 3.2v4 cc rejects this.  */
+    char *t;
+    char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+    *t++ = 0;
+  }
+  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+    int x[] = {25, 17};
+    const int *foo = &x[0];
+    ++foo;
+  }
+  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+    typedef const int *iptr;
+    iptr p = 0;
+    ++p;
+  }
+  { /* AIX XL C 1.02.0.0 rejects this saying
+       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+    struct s { int j; const int *ap[3]; };
+    struct s *b; b->j = 5;
+  }
+  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+    const int foo = 10;
+  }
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_c_const=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_c_const=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+echo "${ECHO_T}$ac_cv_c_const" >&6
+if test $ac_cv_c_const = no; then
+
+cat >>confdefs.h <<\_ACEOF
+#define const
+_ACEOF
+
+fi
+
+echo "$as_me:$LINENO: checking for size_t" >&5
+echo $ECHO_N "checking for size_t... $ECHO_C" >&6
+if test "${ac_cv_type_size_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((size_t *) 0)
+  return 0;
+if (sizeof (size_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_size_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_size_t=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+echo "${ECHO_T}$ac_cv_type_size_t" >&6
+if test $ac_cv_type_size_t = yes; then
+  :
+else
+
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned
+_ACEOF
+
+fi
+
+echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+if test "${ac_cv_header_time+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/time.h>
+#include <time.h>
+
+int
+main ()
+{
+if ((struct tm *) 0)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_header_time=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_header_time=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+echo "${ECHO_T}$ac_cv_header_time" >&6
+if test $ac_cv_header_time = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define TIME_WITH_SYS_TIME 1
+_ACEOF
+
+fi
+
+
+# mprintf() checks:
+
+# check for 'long double'
+# AC_CHECK_SIZEOF(long double, 8)
+# check for 'long long'
+# AC_CHECK_SIZEOF(long long, 4)
+
+# check for ssize_t
+echo "$as_me:$LINENO: checking for ssize_t" >&5
+echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
+if test "${ac_cv_type_ssize_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((ssize_t *) 0)
+  return 0;
+if (sizeof (ssize_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_ssize_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_ssize_t=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
+echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
+if test $ac_cv_type_ssize_t = yes; then
+  :
+else
+
+cat >>confdefs.h <<_ACEOF
+#define ssize_t int
+_ACEOF
+
+fi
+
+
+
+   echo "$as_me:$LINENO: checking for socklen_t" >&5
+echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
+if test "${ac_cv_type_socklen_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/socket.h>
+
+int
+main ()
+{
+if ((socklen_t *) 0)
+  return 0;
+if (sizeof (socklen_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_socklen_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_socklen_t=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
+echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
+if test $ac_cv_type_socklen_t = yes; then
+  :
+else
+
+      echo "$as_me:$LINENO: checking for socklen_t equivalent" >&5
+echo $ECHO_N "checking for socklen_t equivalent... $ECHO_C" >&6
+      if test "${curl_cv_socklen_t_equiv+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+         # Systems have either "struct sockaddr *" or
+         # "void *" as the second argument to getpeername
+         curl_cv_socklen_t_equiv=
+         for arg2 in "struct sockaddr" void; do
+            for t in int size_t unsigned long "unsigned long"; do
+               cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+                  #include <sys/types.h>
+                  #include <sys/socket.h>
+
+                  int getpeername (int, $arg2 *, $t *);
+
+int
+main ()
+{
+
+                  $t len;
+                  getpeername(0,0,&len);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+                  curl_cv_socklen_t_equiv="$t"
+                  break
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+            done
+         done
+
+         if test "x$curl_cv_socklen_t_equiv" = x; then
+            { { echo "$as_me:$LINENO: error: Cannot find a type to use in place of socklen_t" >&5
+echo "$as_me: error: Cannot find a type to use in place of socklen_t" >&2;}
+   { (exit 1); exit 1; }; }
+         fi
+
+fi
+
+      echo "$as_me:$LINENO: result: $curl_cv_socklen_t_equiv" >&5
+echo "${ECHO_T}$curl_cv_socklen_t_equiv" >&6
+
+cat >>confdefs.h <<_ACEOF
+#define socklen_t $curl_cv_socklen_t_equiv
+_ACEOF
+
+fi
+
+
+
+   echo "$as_me:$LINENO: checking for in_addr_t" >&5
+echo $ECHO_N "checking for in_addr_t... $ECHO_C" >&6
+if test "${ac_cv_type_in_addr_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+if ((in_addr_t *) 0)
+  return 0;
+if (sizeof (in_addr_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_in_addr_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_in_addr_t=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_in_addr_t" >&5
+echo "${ECHO_T}$ac_cv_type_in_addr_t" >&6
+if test $ac_cv_type_in_addr_t = yes; then
+  :
+else
+
+      echo "$as_me:$LINENO: checking for in_addr_t equivalent" >&5
+echo $ECHO_N "checking for in_addr_t equivalent... $ECHO_C" >&6
+      if test "${curl_cv_in_addr_t_equiv+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+         curl_cv_in_addr_t_equiv=
+         for t in "unsigned long" int size_t unsigned long; do
+            cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+               #include <sys/types.h>
+               #include <sys/socket.h>
+               #include <arpa/inet.h>
+
+int
+main ()
+{
+
+               $t data = inet_addr ("1.2.3.4");
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+               curl_cv_in_addr_t_equiv="$t"
+               break
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+         done
+
+         if test "x$curl_cv_in_addr_t_equiv" = x; then
+            { { echo "$as_me:$LINENO: error: Cannot find a type to use in place of in_addr_t" >&5
+echo "$as_me: error: Cannot find a type to use in place of in_addr_t" >&2;}
+   { (exit 1); exit 1; }; }
+         fi
+
+fi
+
+      echo "$as_me:$LINENO: result: $curl_cv_in_addr_t_equiv" >&5
+echo "${ECHO_T}$curl_cv_in_addr_t_equiv" >&6
+
+cat >>confdefs.h <<_ACEOF
+#define in_addr_t $curl_cv_in_addr_t_equiv
+_ACEOF
+
+fi
+
+
+
+
+
+for ac_header in sys/select.h sys/socket.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+echo "$as_me:$LINENO: checking types of arguments for select" >&5
+echo $ECHO_N "checking types of arguments for select... $ECHO_C" >&6
+if test "${ac_cv_func_select_args+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  for ac_arg234 in 'fd_set *' 'int *' 'void *'; do
+ for ac_arg1 in 'int' 'size_t' 'unsigned long' 'unsigned'; do
+  for ac_arg5 in 'struct timeval *' 'const struct timeval *'; do
+   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#if HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+
+int
+main ()
+{
+extern int select ($ac_arg1,
+                                            $ac_arg234, $ac_arg234, $ac_arg234,
+                                            $ac_arg5);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_select_args="$ac_arg1,$ac_arg234,$ac_arg5"; break 3
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  done
+ done
+done
+# Provide a safe default value.
+: ${ac_cv_func_select_args='int,int *,struct timeval *'}
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_select_args" >&5
+echo "${ECHO_T}$ac_cv_func_select_args" >&6
+ac_save_IFS=$IFS; IFS=','
+set dummy `echo "$ac_cv_func_select_args" | sed 's/\*/\*/g'`
+IFS=$ac_save_IFS
+shift
+
+cat >>confdefs.h <<_ACEOF
+#define SELECT_TYPE_ARG1 $1
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define SELECT_TYPE_ARG234 ($2)
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define SELECT_TYPE_ARG5 ($3)
+_ACEOF
+
+rm -f conftest*
+
+
+echo "$as_me:$LINENO: checking return type of signal handlers" >&5
+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
+if test "${ac_cv_type_signal+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <signal.h>
+#ifdef signal
+# undef signal
+#endif
+#ifdef __cplusplus
+extern "C" void (*signal (int, void (*)(int)))(int);
+#else
+void (*signal ()) ();
+#endif
+
+int
+main ()
+{
+int i;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_signal=void
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_signal=int
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
+echo "${ECHO_T}$ac_cv_type_signal" >&6
+
+cat >>confdefs.h <<_ACEOF
+#define RETSIGTYPE $ac_cv_type_signal
+_ACEOF
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+for ac_func in socket \
+                select \
+                strdup \
+                strstr \
+                strtok_r \
+                strftime \
+                uname \
+                strcasecmp \
+                stricmp \
+                strcmpi \
+                gethostbyaddr \
+                gettimeofday \
+                inet_addr \
+                inet_ntoa \
+                tcsetattr \
+                tcgetattr \
+                perror \
+                closesocket \
+                setvbuf \
+                sigaction \
+                signal \
+                getpass_r \
+                strlcat \
+                getpwuid \
+                geteuid \
+                dlopen \
+                utime \
+                sigsetjmp \
+                poll
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+else
+    func="$ac_func"
+  echo "$as_me:$LINENO: checking deeper for $func" >&5
+echo $ECHO_N "checking deeper for $func... $ECHO_C" >&6
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+ $func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: yes!" >&5
+echo "${ECHO_T}yes!" >&6
+               eval "ac_cv_func_$func=yes"
+               def=`echo "HAVE_$func" | tr 'a-z' 'A-Z'`
+
+cat >>confdefs.h <<_ACEOF
+#define $def 1
+_ACEOF
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+echo "$as_me:$LINENO: result: but still no" >&5
+echo "${ECHO_T}but still no" >&6
+
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+
+fi
+done
+
+
+if test "$ac_cv_func_sigsetjmp" != "yes"; then
+  echo "$as_me:$LINENO: checking for sigsetjmp defined as macro" >&5
+echo $ECHO_N "checking for sigsetjmp defined as macro... $ECHO_C" >&6
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <setjmp.h>
+int
+main ()
+{
+sigjmp_buf jmpenv;
+                sigsetjmp(jmpenv, 1);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_SIGSETJMP 1
+_ACEOF
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+
+# Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PERL+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PERL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:/usr/local/bin/perl:/usr/bin/:/usr/local/bin "
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+PERL=$ac_cv_path_PERL
+
+if test -n "$PERL"; then
+  echo "$as_me:$LINENO: result: $PERL" >&5
+echo "${ECHO_T}$PERL" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+
+for ac_prog in gnroff nroff
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_NROFF+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $NROFF in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_NROFF="$NROFF" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:/usr/bin/:/usr/local/bin "
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_NROFF="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+NROFF=$ac_cv_path_NROFF
+
+if test -n "$NROFF"; then
+  echo "$as_me:$LINENO: result: $NROFF" >&5
+echo "${ECHO_T}$NROFF" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$NROFF" && break
+done
+
+
+
+echo "$as_me:$LINENO: checking CA cert bundle install path" >&5
+echo $ECHO_N "checking CA cert bundle install path... $ECHO_C" >&6
+
+
+# Check whether --with-ca-bundle or --without-ca-bundle was given.
+if test "${with_ca_bundle+set}" = set; then
+  withval="$with_ca_bundle"
+   ca="$withval"
+else
+
+  if test "x$prefix" != xNONE; then
+    ca="$prefix/share/curl/curl-ca-bundle.crt"
+  else
+    ca="$ac_default_prefix/share/curl/curl-ca-bundle.crt"
+  fi
+
+fi;
+
+if test X"$OPT_SSL" = Xno
+then
+  ca="no"
+fi
+
+if test "x$ca" = "xno"; then
+    ca=""
+else
+
+cat >>confdefs.h <<_ACEOF
+#define CURL_CA_BUNDLE "$ca"
+_ACEOF
+
+fi
+
+CURL_CA_BUNDLE="$ca"
+
+echo "$as_me:$LINENO: result: $ca" >&5
+echo "${ECHO_T}$ca" >&6
+
+for ac_prog in 'bison -y' byacc
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_YACC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$YACC"; then
+  ac_cv_prog_YACC="$YACC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_YACC="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+YACC=$ac_cv_prog_YACC
+if test -n "$YACC"; then
+  echo "$as_me:$LINENO: result: $YACC" >&5
+echo "${ECHO_T}$YACC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$YACC" && break
+done
+test -n "$YACC" || YACC="yacc"
+
+
+
+echo "$as_me:$LINENO: checking whether to enable debug options" >&5
+echo $ECHO_N "checking whether to enable debug options... $ECHO_C" >&6
+# Check whether --enable-debug or --disable-debug was given.
+if test "${enable_debug+set}" = set; then
+  enableval="$enable_debug"
+   case "$enableval" in
+  no)
+       echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+       ;;
+  *)   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+    CPPFLAGS="$CPPFLAGS -DMALLOCDEBUG"
+    CFLAGS="$CFLAGS -g"
+    if test "$GCC" = "yes"; then
+       CFLAGS="$CFLAGS -W -Wall -Wwrite-strings -pedantic -Wundef -Wpointer-arith -Wnested-externs"
+    fi
+        NEWFLAGS=""
+    for flag in $CFLAGS; do
+      case "$flag" in
+      -O*)
+                ;;
+      *)
+        NEWFLAGS="$NEWFLAGS $flag"
+        ;;
+      esac
+    done
+    CFLAGS=$NEWFLAGS
+       ;;
+  esac
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+fi;
+
+                                                                                                                                                                                                                                      ac_config_files="$ac_config_files Makefile docs/Makefile docs/examples/Makefile docs/libcurl/Makefile include/Makefile include/curl/Makefile src/Makefile lib/Makefile tests/Makefile tests/data/Makefile tests/server/Makefile tests/libtest/Makefile packages/Makefile packages/Win32/Makefile packages/Win32/cygwin/Makefile packages/Linux/Makefile packages/Linux/RPM/Makefile packages/Linux/RPM/curl.spec packages/Linux/RPM/curl-ssl.spec packages/Solaris/Makefile packages/EPM/curl.list packages/EPM/Makefile curl-config"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+        "s/'/'\\\\''/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[ 	]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[ 	]*$//;
+}'
+fi
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_i=`echo "$ac_i" |
+         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+  # 2. Add them.
+  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${NO_UNDEFINED_TRUE}" && test -z "${NO_UNDEFINED_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"NO_UNDEFINED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"NO_UNDEFINED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+: ${CONFIG_STATUS=./config.status}
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# Work around bugs in pre-3.0 UWIN ksh.
+$as_unset ENV MAIL MAILPATH
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    $as_unset $as_var
+  fi
+done
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)$' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\/\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+
+
+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  case $0 in
+    *[\\/]* ) as_myself=$0 ;;
+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+
+       ;;
+  esac
+  # We did not find ourselves, most probably we were run as `sh COMMAND'
+  # in which case we are not to be found in the path.
+  if test "x$as_myself" = x; then
+    as_myself=$0
+  fi
+  if test ! -f "$as_myself"; then
+    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for as_base in sh bash ksh sh5; do
+	 case $as_dir in
+	 /*)
+	   if ("$as_dir/$as_base" -c '
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+	     CONFIG_SHELL=$as_dir/$as_base
+	     export CONFIG_SHELL
+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+	   fi;;
+	 esac
+       done
+done
+;;
+  esac
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |
+    sed '
+      N
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      t loop
+      s,-$,,
+      s,^['$as_cr_digits']*\n,,
+    ' >$as_me.lineno &&
+  chmod +x $as_me.lineno ||
+    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensible to this).
+  . ./$as_me.lineno
+  # Exit status is that of the last command.
+  exit
+}
+
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  as_mkdir_p=false
+fi
+
+as_executable_p="test -f"
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH
+
+exec 6>&1
+
+# Open the log real soon, to keep \$[0] and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.  Logging --version etc. is OK.
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+} >&5
+cat >&5 <<_CSEOF
+
+This file was extended by curl $as_me -, which was
+generated by GNU Autoconf 2.57.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+_CSEOF
+echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+echo >&5
+_ACEOF
+
+# Files that config.status was made for.
+if test -n "$ac_config_files"; then
+  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_headers"; then
+  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_links"; then
+  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_commands"; then
+  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTIONS] [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number, then exit
+  -q, --quiet      do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+  --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+  --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to <bug-autoconf@gnu.org>."
+_ACEOF
+
+cat >>$CONFIG_STATUS <<_ACEOF
+ac_cs_version="\\
+curl config.status -
+configured by $0, generated by GNU Autoconf 2.57,
+  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+srcdir=$srcdir
+INSTALL="$INSTALL"
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=*)
+    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  -*)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  *) # This is not an option, so the user has probably given explicit
+     # arguments.
+     ac_option=$1
+     ac_need_defaults=false;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --vers* | -V )
+    echo "$ac_cs_version"; exit 0 ;;
+  --he | --h)
+    # Conflict between --help and --header
+    { { echo "$as_me:$LINENO: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2;}
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit 0 ;;
+  --debug | --d* | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    ac_need_defaults=false;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2;}
+   { (exit 1); exit 1; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1" ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+if \$ac_cs_recheck; then
+  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+fi
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<_ACEOF
+#
+# INIT-COMMANDS section.
+#
+
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+_ACEOF
+
+
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+for ac_config_target in $ac_config_targets
+do
+  case "$ac_config_target" in
+  # Handling of arguments.
+  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+  "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
+  "docs/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/examples/Makefile" ;;
+  "docs/libcurl/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/libcurl/Makefile" ;;
+  "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
+  "include/curl/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/curl/Makefile" ;;
+  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+  "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
+  "tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+  "tests/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/data/Makefile" ;;
+  "tests/server/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/server/Makefile" ;;
+  "tests/libtest/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/libtest/Makefile" ;;
+  "packages/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/Makefile" ;;
+  "packages/Win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/Win32/Makefile" ;;
+  "packages/Win32/cygwin/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/Win32/cygwin/Makefile" ;;
+  "packages/Linux/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/Linux/Makefile" ;;
+  "packages/Linux/RPM/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/Linux/RPM/Makefile" ;;
+  "packages/Linux/RPM/curl.spec" ) CONFIG_FILES="$CONFIG_FILES packages/Linux/RPM/curl.spec" ;;
+  "packages/Linux/RPM/curl-ssl.spec" ) CONFIG_FILES="$CONFIG_FILES packages/Linux/RPM/curl-ssl.spec" ;;
+  "packages/Solaris/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/Solaris/Makefile" ;;
+  "packages/EPM/curl.list" ) CONFIG_FILES="$CONFIG_FILES packages/EPM/curl.list" ;;
+  "packages/EPM/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/EPM/Makefile" ;;
+  "curl-config" ) CONFIG_FILES="$CONFIG_FILES curl-config" ;;
+  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+  "lib/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS lib/config.h" ;;
+  "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
+  "tests/server/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS tests/server/config.h" ;;
+  "lib/ca-bundle.h" ) CONFIG_HEADERS="$CONFIG_HEADERS lib/ca-bundle.h" ;;
+  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason to put it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Create a temporary directory, and hook for its removal unless debugging.
+$debug ||
+{
+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=./confstat$$-$RANDOM
+  (umask 077 && mkdir $tmp)
+} ||
+{
+   echo "$me: cannot create a temporary directory in ." >&2
+   { (exit 1); exit 1; }
+}
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<_ACEOF
+
+#
+# CONFIG_FILES section.
+#
+
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "\$CONFIG_FILES"; then
+  # Protect against being on the right side of a sed subst in config.status.
+  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+s,@SHELL@,$SHELL,;t t
+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+s,@exec_prefix@,$exec_prefix,;t t
+s,@prefix@,$prefix,;t t
+s,@program_transform_name@,$program_transform_name,;t t
+s,@bindir@,$bindir,;t t
+s,@sbindir@,$sbindir,;t t
+s,@libexecdir@,$libexecdir,;t t
+s,@datadir@,$datadir,;t t
+s,@sysconfdir@,$sysconfdir,;t t
+s,@sharedstatedir@,$sharedstatedir,;t t
+s,@localstatedir@,$localstatedir,;t t
+s,@libdir@,$libdir,;t t
+s,@includedir@,$includedir,;t t
+s,@oldincludedir@,$oldincludedir,;t t
+s,@infodir@,$infodir,;t t
+s,@mandir@,$mandir,;t t
+s,@build_alias@,$build_alias,;t t
+s,@host_alias@,$host_alias,;t t
+s,@target_alias@,$target_alias,;t t
+s,@DEFS@,$DEFS,;t t
+s,@ECHO_C@,$ECHO_C,;t t
+s,@ECHO_N@,$ECHO_N,;t t
+s,@ECHO_T@,$ECHO_T,;t t
+s,@LIBS@,$LIBS,;t t
+s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
+s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
+s,@MAINT@,$MAINT,;t t
+s,@SED@,$SED,;t t
+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@CYGPATH_W@,$CYGPATH_W,;t t
+s,@PACKAGE@,$PACKAGE,;t t
+s,@VERSION@,$VERSION,;t t
+s,@ACLOCAL@,$ACLOCAL,;t t
+s,@AUTOCONF@,$AUTOCONF,;t t
+s,@AUTOMAKE@,$AUTOMAKE,;t t
+s,@AUTOHEADER@,$AUTOHEADER,;t t
+s,@MAKEINFO@,$MAKEINFO,;t t
+s,@AMTAR@,$AMTAR,;t t
+s,@install_sh@,$install_sh,;t t
+s,@STRIP@,$STRIP,;t t
+s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
+s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+s,@AWK@,$AWK,;t t
+s,@SET_MAKE@,$SET_MAKE,;t t
+s,@VERSIONNUM@,$VERSIONNUM,;t t
+s,@PKGADD_PKG@,$PKGADD_PKG,;t t
+s,@PKGADD_NAME@,$PKGADD_NAME,;t t
+s,@PKGADD_VENDOR@,$PKGADD_VENDOR,;t t
+s,@build@,$build,;t t
+s,@build_cpu@,$build_cpu,;t t
+s,@build_vendor@,$build_vendor,;t t
+s,@build_os@,$build_os,;t t
+s,@host@,$host,;t t
+s,@host_cpu@,$host_cpu,;t t
+s,@host_vendor@,$host_vendor,;t t
+s,@host_os@,$host_os,;t t
+s,@CC@,$CC,;t t
+s,@CFLAGS@,$CFLAGS,;t t
+s,@LDFLAGS@,$LDFLAGS,;t t
+s,@CPPFLAGS@,$CPPFLAGS,;t t
+s,@ac_ct_CC@,$ac_ct_CC,;t t
+s,@EXEEXT@,$EXEEXT,;t t
+s,@OBJEXT@,$OBJEXT,;t t
+s,@DEPDIR@,$DEPDIR,;t t
+s,@am__include@,$am__include,;t t
+s,@am__quote@,$am__quote,;t t
+s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
+s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
+s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+s,@CCDEPMODE@,$CCDEPMODE,;t t
+s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
+s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+s,@CPP@,$CPP,;t t
+s,@EGREP@,$EGREP,;t t
+s,@LN_S@,$LN_S,;t t
+s,@ECHO@,$ECHO,;t t
+s,@AR@,$AR,;t t
+s,@ac_ct_AR@,$ac_ct_AR,;t t
+s,@RANLIB@,$RANLIB,;t t
+s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+s,@DLLTOOL@,$DLLTOOL,;t t
+s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t
+s,@AS@,$AS,;t t
+s,@ac_ct_AS@,$ac_ct_AS,;t t
+s,@OBJDUMP@,$OBJDUMP,;t t
+s,@ac_ct_OBJDUMP@,$ac_ct_OBJDUMP,;t t
+s,@CXX@,$CXX,;t t
+s,@CXXFLAGS@,$CXXFLAGS,;t t
+s,@ac_ct_CXX@,$ac_ct_CXX,;t t
+s,@CXXDEPMODE@,$CXXDEPMODE,;t t
+s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
+s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
+s,@CXXCPP@,$CXXCPP,;t t
+s,@F77@,$F77,;t t
+s,@FFLAGS@,$FFLAGS,;t t
+s,@ac_ct_F77@,$ac_ct_F77,;t t
+s,@LIBTOOL@,$LIBTOOL,;t t
+s,@NO_UNDEFINED_TRUE@,$NO_UNDEFINED_TRUE,;t t
+s,@NO_UNDEFINED_FALSE@,$NO_UNDEFINED_FALSE,;t t
+s,@CURL_DISABLE_HTTP@,$CURL_DISABLE_HTTP,;t t
+s,@CURL_DISABLE_GOPHER@,$CURL_DISABLE_GOPHER,;t t
+s,@CURL_DISABLE_FTP@,$CURL_DISABLE_FTP,;t t
+s,@CURL_DISABLE_FILE@,$CURL_DISABLE_FILE,;t t
+s,@CURL_DISABLE_LDAP@,$CURL_DISABLE_LDAP,;t t
+s,@CURL_DISABLE_DICT@,$CURL_DISABLE_DICT,;t t
+s,@CURL_DISABLE_TELNET@,$CURL_DISABLE_TELNET,;t t
+s,@IPV6_ENABLED@,$IPV6_ENABLED,;t t
+s,@RANDOM_FILE@,$RANDOM_FILE,;t t
+s,@KRB4_ENABLED@,$KRB4_ENABLED,;t t
+s,@PKGCONFIG@,$PKGCONFIG,;t t
+s,@OPENSSL_ENABLED@,$OPENSSL_ENABLED,;t t
+s,@HAVE_LIBZ@,$HAVE_LIBZ,;t t
+s,@PERL@,$PERL,;t t
+s,@NROFF@,$NROFF,;t t
+s,@CURL_CA_BUNDLE@,$CURL_CA_BUNDLE,;t t
+s,@YACC@,$YACC,;t t
+s,@LIBOBJS@,$LIBOBJS,;t t
+s,@LTLIBOBJS@,$LTLIBOBJS,;t t
+CEOF
+
+_ACEOF
+
+  cat >>$CONFIG_STATUS <<\_ACEOF
+  # Split the substitutions into bite-sized pieces for seds with
+  # small command number limits, like on Digital OSF/1 and HP-UX.
+  ac_max_sed_lines=48
+  ac_sed_frag=1 # Number of current file.
+  ac_beg=1 # First line for current file.
+  ac_end=$ac_max_sed_lines # Line after last line for current file.
+  ac_more_lines=:
+  ac_sed_cmds=
+  while $ac_more_lines; do
+    if test $ac_beg -gt 1; then
+      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    else
+      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    fi
+    if test ! -s $tmp/subs.frag; then
+      ac_more_lines=false
+    else
+      # The purpose of the label and of the branching condition is to
+      # speed up the sed processing (if there are no `@' at all, there
+      # is no need to browse any of the substitutions).
+      # These are the two extra sed commands mentioned above.
+      (echo ':t
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+      if test -z "$ac_sed_cmds"; then
+  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+      else
+  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+      fi
+      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_beg=$ac_end
+      ac_end=`expr $ac_end + $ac_max_sed_lines`
+    fi
+  done
+  if test -z "$ac_sed_cmds"; then
+    ac_sed_cmds=cat
+  fi
+fi # test -n "$CONFIG_FILES"
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+        cat >$tmp/stdin
+        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;
+  esac
+
+  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$ac_file" : 'X\(//\)[^/]' \| \
+         X"$ac_file" : 'X\(//\)$' \| \
+         X"$ac_file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+  { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
+  else
+    as_dir="$ac_dir"
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$as_dir" : 'X\(//\)[^/]' \| \
+         X"$as_dir" : 'X\(//\)$' \| \
+         X"$as_dir" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }
+
+  ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+  esac
+
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
+  # Let's still pretend it is `configure' which instantiates (i.e., don't
+  # use $as_me), people would be surprised to read:
+  #    /* config.h.  Generated by config.status.  */
+  if test x"$ac_file" = x-; then
+    configure_input=
+  else
+    configure_input="$ac_file.  "
+  fi
+  configure_input=$configure_input"Generated from `echo $ac_file_in |
+                                     sed 's,.*/,,'` by configure."
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+         # Absolute (can't be DOS-style, as IFS=:)
+         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         echo $f;;
+      *) # Relative
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$srcdir/$f"; then
+           # Source tree
+           echo $srcdir/$f
+         else
+           # /dev/null tree
+           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         fi;;
+      esac
+    done` || { (exit 1); exit 1; }
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+  sed "$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s,@configure_input@,$configure_input,;t t
+s,@srcdir@,$ac_srcdir,;t t
+s,@abs_srcdir@,$ac_abs_srcdir,;t t
+s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+s,@builddir@,$ac_builddir,;t t
+s,@abs_builddir@,$ac_abs_builddir,;t t
+s,@top_builddir@,$ac_top_builddir,;t t
+s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
+s,@INSTALL@,$ac_INSTALL,;t t
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+  rm -f $tmp/stdin
+  if test x"$ac_file" != x-; then
+    mv $tmp/out $ac_file
+  else
+    cat $tmp/out
+    rm -f $tmp/out
+  fi
+
+done
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+#
+# CONFIG_HEADER section.
+#
+
+# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+# NAME is the cpp macro being defined and VALUE is the value it is being given.
+#
+# ac_d sets the value in "#define NAME VALUE" lines.
+ac_dA='s,^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
+ac_dB='[ 	].*$,\1#\2'
+ac_dC=' '
+ac_dD=',;t'
+# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+ac_uA='s,^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
+ac_uB='$,\1#\2define\3'
+ac_uC=' '
+ac_uD=',;t'
+
+for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+        cat >$tmp/stdin
+        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;
+  esac
+
+  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+         # Absolute (can't be DOS-style, as IFS=:)
+         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         echo $f;;
+      *) # Relative
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$srcdir/$f"; then
+           # Source tree
+           echo $srcdir/$f
+         else
+           # /dev/null tree
+           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         fi;;
+      esac
+    done` || { (exit 1); exit 1; }
+  # Remove the trailing spaces.
+  sed 's/[ 	]*$//' $ac_file_inputs >$tmp/in
+
+_ACEOF
+
+# Transform confdefs.h into two sed scripts, `conftest.defines' and
+# `conftest.undefs', that substitutes the proper values into
+# config.h.in to produce config.h.  The first handles `#define'
+# templates, and the second `#undef' templates.
+# And first: Protect against being on the right side of a sed subst in
+# config.status.  Protect against being in an unquoted here document
+# in config.status.
+rm -f conftest.defines conftest.undefs
+# Using a here document instead of a string reduces the quoting nightmare.
+# Putting comments in sed scripts is not portable.
+#
+# `end' is used to avoid that the second main sed command (meant for
+# 0-ary CPP macros) applies to n-ary macro definitions.
+# See the Autoconf documentation for `clear'.
+cat >confdef2sed.sed <<\_ACEOF
+s/[\\&,]/\\&/g
+s,[\\$`],\\&,g
+t clear
+: clear
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*\)\(([^)]*)\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+t end
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+: end
+_ACEOF
+# If some macros were called several times there might be several times
+# the same #defines, which is useless.  Nevertheless, we may not want to
+# sort them, since we want the *last* AC-DEFINE to be honored.
+uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
+sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
+rm -f confdef2sed.sed
+
+# This sed command replaces #undef with comments.  This is necessary, for
+# example, in the case of _POSIX_SOURCE, which is predefined and required
+# on some systems where configure will not decide to define it.
+cat >>conftest.undefs <<\_ACEOF
+s,^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+_ACEOF
+
+# Break up conftest.defines because some shells have a limit on the size
+# of here documents, and old seds have small limits too (100 cmds).
+echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
+echo '  if grep "^[ 	]*#[ 	]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
+echo '  :' >>$CONFIG_STATUS
+rm -f conftest.tail
+while grep . conftest.defines >/dev/null
+do
+  # Write a limited-size here document to $tmp/defines.sed.
+  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
+  # Speed up: don't consider the non `#define' lines.
+  echo '/^[ 	]*#[ 	]*define/!b' >>$CONFIG_STATUS
+  # Work around the forget-to-reset-the-flag bug.
+  echo 't clr' >>$CONFIG_STATUS
+  echo ': clr' >>$CONFIG_STATUS
+  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
+  echo 'CEOF
+  sed -f $tmp/defines.sed $tmp/in >$tmp/out
+  rm -f $tmp/in
+  mv $tmp/out $tmp/in
+' >>$CONFIG_STATUS
+  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
+  rm -f conftest.defines
+  mv conftest.tail conftest.defines
+done
+rm -f conftest.defines
+echo '  fi # grep' >>$CONFIG_STATUS
+echo >>$CONFIG_STATUS
+
+# Break up conftest.undefs because some shells have a limit on the size
+# of here documents, and old seds have small limits too (100 cmds).
+echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
+rm -f conftest.tail
+while grep . conftest.undefs >/dev/null
+do
+  # Write a limited-size here document to $tmp/undefs.sed.
+  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
+  # Speed up: don't consider the non `#undef'
+  echo '/^[ 	]*#[ 	]*undef/!b' >>$CONFIG_STATUS
+  # Work around the forget-to-reset-the-flag bug.
+  echo 't clr' >>$CONFIG_STATUS
+  echo ': clr' >>$CONFIG_STATUS
+  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
+  echo 'CEOF
+  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
+  rm -f $tmp/in
+  mv $tmp/out $tmp/in
+' >>$CONFIG_STATUS
+  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
+  rm -f conftest.undefs
+  mv conftest.tail conftest.undefs
+done
+rm -f conftest.undefs
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+  # Let's still pretend it is `configure' which instantiates (i.e., don't
+  # use $as_me), people would be surprised to read:
+  #    /* config.h.  Generated by config.status.  */
+  if test x"$ac_file" = x-; then
+    echo "/* Generated by configure.  */" >$tmp/config.h
+  else
+    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
+  fi
+  cat $tmp/in >>$tmp/config.h
+  rm -f $tmp/in
+  if test x"$ac_file" != x-; then
+    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
+      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$ac_file" : 'X\(//\)[^/]' \| \
+         X"$ac_file" : 'X\(//\)$' \| \
+         X"$ac_file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+      { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
+  else
+    as_dir="$ac_dir"
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$as_dir" : 'X\(//\)[^/]' \| \
+         X"$as_dir" : 'X\(//\)$' \| \
+         X"$as_dir" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }
+
+      rm -f $ac_file
+      mv $tmp/config.h $ac_file
+    fi
+  else
+    cat $tmp/config.h
+    rm -f $tmp/config.h
+  fi
+_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
+echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X$ac_file : 'X\(//\)[^/]' \| \
+         X$ac_file : 'X\(//\)$' \| \
+         X$ac_file : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X$ac_file |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`/stamp-h$_am_stamp_count
+done
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+#
+# CONFIG_COMMANDS section.
+#
+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$ac_dest" : 'X\(//\)[^/]' \| \
+         X"$ac_dest" : 'X\(//\)$' \| \
+         X"$ac_dest" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_dest" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+  ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+
+  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+echo "$as_me: executing $ac_dest commands" >&6;}
+  case $ac_dest in
+    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+  # Strip MF so we end up with the name of the file.
+  mf=`echo "$mf" | sed -e 's/:.*$//'`
+  # Check whether this is an Automake generated Makefile or not.
+  # We used to match only the files named `Makefile.in', but
+  # some people rename them; so instead we look at the file content.
+  # Grep'ing the first line is not enough: some people post-process
+  # each Makefile.in and add a new line on top of each file to say so.
+  # So let's grep whole file.
+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+    dirpart=`(dirname "$mf") 2>/dev/null ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$mf" : 'X\(//\)[^/]' \| \
+         X"$mf" : 'X\(//\)$' \| \
+         X"$mf" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+  else
+    continue
+  fi
+  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
+  # Extract the definition of DEP_FILES from the Makefile without
+  # running `make'.
+  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+  test -z "$DEPDIR" && continue
+  # When using ansi2knr, U may be empty or an underscore; expand it
+  U=`sed -n -e '/^U = / s///p' < "$mf"`
+  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+  # We invoke sed twice because it is the simplest approach to
+  # changing $(DEPDIR) to its actual value in the expansion.
+  for file in `sed -n -e '
+    /^DEP_FILES = .*\\\\$/ {
+      s/^DEP_FILES = //
+      :loop
+	s/\\\\$//
+	p
+	n
+	/\\\\$/ b loop
+      p
+    }
+    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+    # Make sure the directory exists.
+    test -f "$dirpart/$file" && continue
+    fdir=`(dirname "$file") 2>/dev/null ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$file" : 'X\(//\)[^/]' \| \
+         X"$file" : 'X\(//\)$' \| \
+         X"$file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+    { if $as_mkdir_p; then
+    mkdir -p $dirpart/$fdir
+  else
+    as_dir=$dirpart/$fdir
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$as_dir" : 'X\(//\)[^/]' \| \
+         X"$as_dir" : 'X\(//\)$' \| \
+         X"$as_dir" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
+echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
+   { (exit 1); exit 1; }; }; }
+
+    # echo "creating $dirpart/$file"
+    echo '# dummy' > "$dirpart/$file"
+  done
+done
+ ;;
+  esac
+done
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+{ (exit 0); exit 0; }
+_ACEOF
+chmod +x $CONFIG_STATUS
+ac_clean_files=$ac_clean_files_save
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || { (exit 1); exit 1; }
+fi
+
diff --git a/main/source/curl/configure.ac b/main/source/curl/configure.ac
new file mode 100644
index 00000000..8b03d3b6
--- /dev/null
+++ b/main/source/curl/configure.ac
@@ -0,0 +1,921 @@
+dnl $Id: configure.ac,v 1.5 2003/05/04 16:07:19 bagder Exp $
+dnl Process this file with autoconf to produce a configure script.
+
+dnl Ensure that this file is processed with autoconf 2.50 or newer
+dnl Don't even think about removing this check!
+AC_PREREQ(2.50)
+
+dnl We don't know the version number "staticly" so we use a dash here
+AC_INIT(curl, [-], [curl-bug@haxx.se])
+
+dnl configure script copyright
+AC_COPYRIGHT([Copyright (c) 1998 - 2003 Daniel Stenberg, <daniel@haxx.se>
+This configure script may be copied, distributed and modified under the 
+terms of the curl license; see COPYING for more details])
+
+AC_CONFIG_SRCDIR([lib/urldata.h])
+AM_CONFIG_HEADER(lib/config.h src/config.h tests/server/config.h lib/ca-bundle.h)
+AM_MAINTAINER_MODE
+
+AC_PATH_PROG( SED, sed, , $PATH:/usr/bin:/usr/local/bin)
+AC_SUBST(SED)
+
+dnl figure out the libcurl version
+VERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' ${srcdir}/include/curl/curl.h`
+AM_INIT_AUTOMAKE(curl,$VERSION)
+AC_MSG_CHECKING([curl version])
+AC_MSG_RESULT($VERSION)
+
+dnl
+dnl we extract the numerical version for curl-config only
+VERSIONNUM=`$SED -ne 's/^#define LIBCURL_VERSION_NUM 0x\(.*\)/\1/p' ${srcdir}/include/curl/curl.h`
+AC_SUBST(VERSIONNUM)
+
+dnl Solaris pkgadd support definitions
+PKGADD_PKG="HAXXcurl"
+PKGADD_NAME="cURL - a client that groks URLs"
+PKGADD_VENDOR="curl.haxx.se"
+AC_SUBST(PKGADD_PKG)
+AC_SUBST(PKGADD_NAME)
+AC_SUBST(PKGADD_VENDOR)
+
+
+dnl
+dnl Detect the canonical host and target build environment
+dnl
+
+AC_CANONICAL_HOST
+dnl Get system canonical name
+AC_DEFINE_UNQUOTED(OS, "${host}", [cpu-machine-OS])
+
+dnl Check for AIX weirdos
+AC_AIX
+
+dnl Checks for programs.
+AC_PROG_CC
+
+dnl check for how to do large files
+AC_SYS_LARGEFILE
+
+dnl check for cygwin stuff
+AC_LIBTOOL_WIN32_DLL
+
+dnl libtool setup
+AM_PROG_LIBTOOL
+
+case $host in
+  *-*-cygwin | *-*-mingw* | *-*-pw32*)
+    need_no_undefined=yes
+    ;;
+  *)
+    need_no_undefined=no
+    ;;
+esac
+
+AM_CONDITIONAL(NO_UNDEFINED, test x$need_no_undefined = xyes)
+
+dnl The install stuff has already been taken care of by the automake stuff
+dnl AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+
+dnl ************************************************************
+dnl switch off particular protocols
+dnl
+AC_MSG_CHECKING([whether to support http])
+AC_ARG_ENABLE(http,
+AC_HELP_STRING([--enable-http],[Enable HTTP support])
+AC_HELP_STRING([--disable-http],[Disable HTTP support]),
+[ case "$enableval" in
+  no)
+       AC_MSG_RESULT(no)
+       AC_DEFINE(CURL_DISABLE_HTTP, 1, [to disable HTTP])
+       AC_MSG_WARN([disable HTTP disables FTP over proxy and GOPHER too])
+       AC_DEFINE(CURL_DISABLE_GOPHER, 1, [to disable GOPHER])
+       AC_SUBST(CURL_DISABLE_HTTP)
+       AC_SUBST(CURL_DISABLE_GOPHER)
+       ;;
+  *)   AC_MSG_RESULT(yes)
+       ;;
+  esac ],
+       AC_MSG_RESULT(yes)
+)
+AC_MSG_CHECKING([whether to support ftp])
+AC_ARG_ENABLE(ftp,
+AC_HELP_STRING([--enable-ftp],[Enable FTP support])
+AC_HELP_STRING([--disable-ftp],[Disable FTP support]),
+[ case "$enableval" in
+  no)
+       AC_MSG_RESULT(no)
+       AC_DEFINE(CURL_DISABLE_FTP, 1, [to disable FTP])
+       AC_SUBST(CURL_DISABLE_FTP)
+       ;;
+  *)   AC_MSG_RESULT(yes)
+       ;;
+  esac ],
+       AC_MSG_RESULT(yes)
+)
+AC_MSG_CHECKING([whether to support gopher])
+AC_ARG_ENABLE(gopher,
+AC_HELP_STRING([--enable-gopher],[Enable GOPHER support])
+AC_HELP_STRING([--disable-gopher],[Disable GOPHER support]),
+[ case "$enableval" in
+  no)
+       AC_MSG_RESULT(no)
+       AC_DEFINE(CURL_DISABLE_GOPHER, 1, [to disable GOPHER])
+       AC_SUBST(CURL_DISABLE_GOPHER)
+       ;;
+  *)   AC_MSG_RESULT(yes)
+       ;;
+  esac ],
+       AC_MSG_RESULT(yes)
+)
+AC_MSG_CHECKING([whether to support file])
+AC_ARG_ENABLE(file,
+AC_HELP_STRING([--enable-file],[Enable FILE support])
+AC_HELP_STRING([--disable-file],[Disable FILE support]),
+[ case "$enableval" in
+  no)
+       AC_MSG_RESULT(no)
+       AC_DEFINE(CURL_DISABLE_FILE, 1, [to disable FILE])
+       AC_SUBST(CURL_DISABLE_FILE)
+       ;;
+  *)   AC_MSG_RESULT(yes)
+       ;;
+  esac ],
+       AC_MSG_RESULT(yes)
+)
+AC_MSG_CHECKING([whether to support ldap])
+AC_ARG_ENABLE(ldap,
+AC_HELP_STRING([--enable-ldap],[Enable LDAP support])
+AC_HELP_STRING([--disable-ldap],[Disable LDAP support]),
+[ case "$enableval" in
+  no)
+       AC_MSG_RESULT(no)
+       AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])
+       AC_SUBST(CURL_DISABLE_LDAP)
+       ;;
+  *)   AC_MSG_RESULT(yes)
+       ;;
+  esac ],
+       AC_MSG_RESULT(yes)
+)
+AC_MSG_CHECKING([whether to support dict])
+AC_ARG_ENABLE(dict,
+AC_HELP_STRING([--enable-dict],[Enable DICT support])
+AC_HELP_STRING([--disable-dict],[Disable DICT support]),
+[ case "$enableval" in
+  no)
+       AC_MSG_RESULT(no)
+       AC_DEFINE(CURL_DISABLE_DICT, 1, [to disable DICT])
+       AC_SUBST(CURL_DISABLE_DICT)
+       ;;
+  *)   AC_MSG_RESULT(yes)
+       ;;
+  esac ],
+       AC_MSG_RESULT(yes)
+)
+AC_MSG_CHECKING([whether to support telnet])
+AC_ARG_ENABLE(telnet,
+AC_HELP_STRING([--enable-telnet],[Enable TELNET support])
+AC_HELP_STRING([--disable-telnet],[Disable TELNET support]),
+[ case "$enableval" in
+  no)
+       AC_MSG_RESULT(no)
+       AC_DEFINE(CURL_DISABLE_TELNET, 1, [to disable TELNET])
+       AC_SUBST(CURL_DISABLE_TELNET)
+       ;;
+  *)   AC_MSG_RESULT(yes)
+       ;;
+  esac ],
+       AC_MSG_RESULT(yes)
+)
+
+
+dnl **********************************************************************
+dnl Checks for IPv6
+dnl **********************************************************************
+
+AC_MSG_CHECKING([whether to enable ipv6])
+AC_ARG_ENABLE(ipv6,
+AC_HELP_STRING([--enable-ipv6],[Enable ipv6 (with ipv4) support])
+AC_HELP_STRING([--disable-ipv6],[Disable ipv6 support]),
+[ case "$enableval" in
+  no)
+       AC_MSG_RESULT(no)
+       ipv6=no
+       ;;
+  *)   AC_MSG_RESULT(yes)
+       ipv6=yes
+       ;;
+  esac ],
+
+  AC_TRY_RUN([ /* is AF_INET6 available? */
+#include <sys/types.h>
+#include <sys/socket.h>
+main()
+{
+ if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
+   exit(1);
+ else
+   exit(0);
+}
+],
+  AC_MSG_RESULT(yes)
+  ipv6=yes,
+  AC_MSG_RESULT(no)
+  ipv6=no,
+  AC_MSG_RESULT(no)
+  ipv6=no
+))
+
+if test "$ipv6" = "yes"; then
+  CURL_CHECK_WORKING_GETADDRINFO
+fi
+
+
+dnl **********************************************************************
+dnl Checks for libraries.
+dnl **********************************************************************
+
+dnl gethostbyname in the nsl lib?
+AC_CHECK_FUNC(gethostbyname, , [ AC_CHECK_LIB(nsl, gethostbyname) ])
+
+if test "$ac_cv_lib_nsl_gethostbyname" != "yes" -a "$ac_cv_func_gethostbyname" != "yes"; then
+  dnl gethostbyname in the socket lib?
+  AC_CHECK_FUNC(gethostbyname, , [ AC_CHECK_LIB(socket, gethostbyname) ])
+fi
+
+dnl At least one system has been identified to require BOTH nsl and
+dnl socket libs to link properly.
+if test "$ac_cv_lib_nsl_gethostbyname" = "$ac_cv_func_gethostbyname"; then
+  AC_MSG_CHECKING([trying both nsl and socket libs])
+  my_ac_save_LIBS=$LIBS
+  LIBS="-lnsl -lsocket $LIBS"
+  AC_TRY_LINK( ,
+             [gethostbyname();],
+             my_ac_link_result=success,
+             my_ac_link_result=failure )
+
+  if test "$my_ac_link_result" = "failure"; then
+    AC_MSG_RESULT([no])
+    AC_MSG_ERROR([couldn't find libraries for gethostbyname()])
+    dnl restore LIBS
+    LIBS=$my_ac_save_LIBS
+  else
+    AC_MSG_RESULT([yes])
+  fi
+fi
+
+dnl resolve lib?
+AC_CHECK_FUNC(strcasecmp, , [ AC_CHECK_LIB(resolve, strcasecmp) ])
+
+if test "$ac_cv_lib_resolve_strcasecmp" = "$ac_cv_func_strcasecmp"; then
+  AC_CHECK_LIB(resolve, strcasecmp,
+              [LIBS="-lresolve $LIBS"],
+               ,
+               -lnsl)
+fi
+
+dnl socket lib?
+AC_CHECK_FUNC(connect, , [ AC_CHECK_LIB(socket, connect) ])
+
+dnl dl lib?
+AC_CHECK_FUNC(dlclose, , [ AC_CHECK_LIB(dl, dlopen) ])
+
+AC_MSG_CHECKING([whether to use libgcc])
+AC_ARG_ENABLE(libgcc,
+AC_HELP_STRING([--enable-libgcc],[use libgcc when linking]),
+[ case "$enableval" in
+  yes)
+        LIBS="$LIBS -lgcc"
+       AC_MSG_RESULT(yes)
+       ;;
+  *)   AC_MSG_RESULT(no)
+       ;;
+  esac ],
+       AC_MSG_RESULT(no)
+)
+
+dnl **********************************************************************
+dnl Check how non-blocking sockets are set
+dnl **********************************************************************
+AC_ARG_ENABLE(nonblocking,
+AC_HELP_STRING([--enable-nonblocking],[Enable detecting how to do it])
+AC_HELP_STRING([--disable-nonblocking],[Disable non-blocking socket detection]),
+[
+  if test "$enableval" = "no" ; then
+    AC_MSG_WARN([non-blocking sockets disabled])
+    AC_DEFINE(HAVE_DISABLED_NONBLOCKING, 1,
+    [to disable NON-BLOCKING connections])
+  else
+    CURL_CHECK_NONBLOCKING_SOCKET
+  fi
+],
+[
+  CURL_CHECK_NONBLOCKING_SOCKET
+])
+
+dnl **********************************************************************
+dnl Check for the random seed preferences 
+dnl **********************************************************************
+
+AC_ARG_WITH(egd-socket,
+AC_HELP_STRING([--with-egd-socket=FILE],
+               [Entropy Gathering Daemon socket pathname]),
+    [ EGD_SOCKET="$withval" ]
+)
+if test -n "$EGD_SOCKET" ; then
+	AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET",
+        [your Entropy Gathering Daemon socket pathname] )
+fi
+
+dnl Check for user-specified random device
+AC_ARG_WITH(random,
+AC_HELP_STRING([--with-random=FILE],[read randomness from FILE (default=/dev/urandom)]),
+    [ RANDOM_FILE="$withval" ],
+    [
+        dnl Check for random device
+        AC_CHECK_FILE("/dev/urandom", [ RANDOM_FILE="/dev/urandom"] )
+    ]
+)
+if test -n "$RANDOM_FILE" ; then
+	AC_SUBST(RANDOM_FILE)
+	AC_DEFINE_UNQUOTED(RANDOM_FILE, "$RANDOM_FILE",
+        [a suitable file to read random data from])
+fi
+
+dnl **********************************************************************
+dnl Check if the operating system allows programs to write to their own argv[]
+dnl **********************************************************************
+
+AC_MSG_CHECKING([if argv can be written to])
+AC_RUN_IFELSE([[
+int main(int argc, char ** argv) {
+	argv[0][0] = ' ';
+	return (argv[0][0] == ' ')?0:1;
+}
+	]],
+	AC_DEFINE(HAVE_WRITABLE_ARGV, 1, [Define this symbol if your OS supports changing the contents of argv])
+	AC_MSG_RESULT(yes),
+	AC_MSG_RESULT(no),
+        AC_MSG_RESULT(no)
+        AC_MSG_WARN([the previous check could not be made default was used])
+)
+
+dnl **********************************************************************
+dnl Check for the presence of Kerberos4 libraries and headers
+dnl **********************************************************************
+
+AC_ARG_WITH(krb4-includes,
+AC_HELP_STRING([--with-krb4-includes=DIR],
+               [Specify location of kerberos4 headers]),[
+ CPPFLAGS="$CPPFLAGS -I$withval"
+ KRB4INC="$withval"
+ want_krb4=yes
+ ])
+
+AC_ARG_WITH(krb4-libs,
+AC_HELP_STRING([--with-krb4-libs=DIR],[Specify location of kerberos4 libs]),[
+ LDFLAGS="$LDFLAGS -L$withval"
+ KRB4LIB="$withval"
+ want_krb4=yes
+ ])
+
+
+OPT_KRB4=off
+AC_ARG_WITH(krb4,dnl
+AC_HELP_STRING([--with-krb4=DIR],[where to look for Kerberos4]),[
+  OPT_KRB4="$withval"
+  if test X"$OPT_KRB4" != Xyes
+  then
+    LDFLAGS="$LDFLAGS -L$OPT_KRB4/lib"
+    KRB4LIB="$OPT_KRB4/lib"
+    CPPFLAGS="$CPPFLAGS -I$OPT_KRB4/include"
+    KRB4INC="$OPT_KRB4/include"
+  fi
+  want_krb4="yes"
+ ])
+
+AC_MSG_CHECKING([if Kerberos4 support is requested])
+
+if test "$want_krb4" = yes
+then
+  if test "$ipv6" = "yes"; then
+    echo krb4 is not compatible with IPv6
+    exit 1
+  fi
+  AC_MSG_RESULT(yes)
+
+  dnl Check for & handle argument to --with-krb4
+
+  AC_MSG_CHECKING(where to look for Kerberos4)
+  if test X"$OPT_KRB4" = Xyes
+  then
+    AC_MSG_RESULT([defaults])
+  else
+    AC_MSG_RESULT([libs in $KRB4LIB, headers in $KRB4INC])
+  fi
+
+  dnl Check for DES library
+  AC_CHECK_LIB(des, des_pcbc_encrypt,
+  [
+    AC_CHECK_HEADERS(des.h)
+
+    dnl resolv lib?
+    AC_CHECK_FUNC(res_search, , [AC_CHECK_LIB(resolv, res_search)])
+
+    dnl Check for the Kerberos4 library
+    AC_CHECK_LIB(krb, krb_net_read,
+    [
+      dnl Check for header files
+      AC_CHECK_HEADERS(krb.h)
+
+      dnl we found the required libraries, add to LIBS
+      LIBS="-lkrb -ldes $LIBS"
+
+      dnl Check for function krb_get_our_ip_for_realm
+      dnl this is needed for NAT networks
+      AC_CHECK_FUNCS(krb_get_our_ip_for_realm)
+
+      dnl add define KRB4
+      AC_DEFINE(KRB4, 1,
+      [if you have the Kerberos4 libraries (including -ldes)])
+
+      dnl substitute it too!
+      KRB4_ENABLED=1
+      AC_SUBST(KRB4_ENABLED)
+
+      dnl the krb4 stuff needs a strlcpy()
+      AC_CHECK_FUNCS(strlcpy)
+
+    ])
+  ])
+else
+  AC_MSG_RESULT(no)
+fi
+
+dnl Detect the pkg-config tool, as it may have extra info about the
+dnl openssl installation we can use. I *believe* this is what we are
+dnl expected to do on really recent Redhat Linux hosts.
+AC_PATH_PROG( PKGCONFIG, pkg-config, no, $PATH:/usr/bin:/usr/local/bin)
+if test "$PKGCONFIG" != "no" ; then
+  AC_MSG_CHECKING([for OpenSSL options using pkg-config])
+
+  $PKGCONFIG --exists openssl
+  SSL_EXISTS=$?
+
+  if test "$SSL_EXISTS" -eq "0"; then
+    SSL_LIBS=`$PKGCONFIG --libs-only-l openssl 2>/dev/null`
+    SSL_LDFLAGS=`$PKGCONFIG --libs-only-L openssl 2>/dev/null`
+    SSL_CPPFLAGS=`$PKGCONFIG --cflags-only-I openssl 2>/dev/null`
+
+    LIBS="$LIBS $SSL_LIBS"
+    CPPFLAGS="$CPPFLAGS $SSL_CPPFLAGS"
+    LDFLAGS="$LDFLAGS $SSL_LDFLAGS"
+
+    AC_MSG_RESULT([yes])
+  else
+    AC_MSG_RESULT([no])
+  fi
+
+fi
+
+dnl **********************************************************************
+dnl Check for the presence of SSL libraries and headers
+dnl **********************************************************************
+
+dnl Default to compiler & linker defaults for SSL files & libraries.
+OPT_SSL=off
+AC_ARG_WITH(ssl,dnl
+AC_HELP_STRING([--with-ssl=PATH],[where to look for SSL, PATH points to the SSL installation (default: /usr/local/ssl)])
+AC_HELP_STRING([--without-ssl], [disable SSL]),
+  OPT_SSL=$withval)
+
+if test X"$OPT_SSL" = Xno
+then
+  AC_MSG_WARN(SSL/https support disabled)  
+else
+
+  dnl Check for and handle argument to --with-ssl.
+
+  dnl save the pre-ssl check flags for a while
+  CLEANLDFLAGS="$LDFLAGS"
+  CLEANCPPFLAGS="$CPPFLAGS"
+
+  case "$OPT_SSL" in
+  yes)
+    EXTRA_SSL=/usr/local/ssl ;;
+  off)
+    EXTRA_SSL= ;;
+  *)
+    dnl check the given spot right away!
+    EXTRA_SSL=$OPT_SSL
+    LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib"
+    CPPFLAGS="$CPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
+    ;;
+  esac
+
+  AC_CHECK_LIB(crypto, CRYPTO_lock,[
+     HAVECRYPTO="yes"
+     ],[
+     OLDLDFLAGS="$LDFLAGS"
+     OLDCPPFLAGS="$CPPFLAGS"
+     LDFLAGS="$CLEANLDFLAGS -L$EXTRA_SSL/lib"
+     CPPFLAGS="$CLEANCPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
+     AC_CHECK_LIB(crypto, CRYPTO_add_lock,[
+       HAVECRYPTO="yes" ], [
+       LDFLAGS="$OLDLDFLAGS"
+       CPPFLAGS="$OLDCPPFLAGS"
+       ])
+    ])
+
+
+  if test "$HAVECRYPTO" = "yes"; then
+    dnl This is only reasonable to do if crypto actually is there: check for
+    dnl SSL libs NOTE: it is important to do this AFTER the crypto lib
+
+    AC_CHECK_LIB(crypto, CRYPTO_add_lock)
+    AC_CHECK_LIB(ssl, SSL_connect)
+
+    if test "$ac_cv_lib_ssl_SSL_connect" != yes; then
+        dnl we didn't find the SSL lib, try the RSAglue/rsaref stuff
+        AC_MSG_CHECKING(for ssl with RSAglue/rsaref libs in use);
+        OLIBS=$LIBS
+        LIBS="$LIBS -lRSAglue -lrsaref"
+        AC_CHECK_LIB(ssl, SSL_connect)
+        if test "$ac_cv_lib_ssl_SSL_connect" != yes; then
+            dnl still no SSL_connect
+            AC_MSG_RESULT(no)
+            LIBS=$OLIBS
+        else
+            AC_MSG_RESULT(yes)
+        fi
+    fi
+
+
+    dnl Check for SSLeay headers
+    AC_CHECK_HEADERS(openssl/x509.h openssl/rsa.h openssl/crypto.h \
+                     openssl/pem.h openssl/ssl.h openssl/err.h,
+      OPENSSL_ENABLED=1)
+
+    if test $ac_cv_header_openssl_x509_h = no; then
+      AC_CHECK_HEADERS(x509.h rsa.h crypto.h pem.h ssl.h err.h,
+        OPENSSL_ENABLED=1)
+    fi
+
+    dnl If the ENGINE library seems to be around, check for the OpenSSL engine
+    dnl header, it is kind of "separated" from the main SSL check
+    AC_CHECK_FUNC(ENGINE_init, [ AC_CHECK_HEADERS(openssl/engine.h) ])
+
+    AC_SUBST(OPENSSL_ENABLED)
+
+  fi
+
+  if test X"$OPT_SSL" != Xoff &&
+     test "$OPENSSL_ENABLED" != "1"; then
+    AC_MSG_ERROR([OpenSSL libs and/or directories were not found where specified!])
+  fi
+
+
+  dnl these can only exist if openssl exists
+
+  AC_CHECK_FUNCS( RAND_status \
+                  RAND_screen \
+                  RAND_egd )
+
+fi
+
+dnl **********************************************************************
+dnl Check for the presence of ZLIB libraries and headers
+dnl **********************************************************************
+
+dnl Check for & handle argument to --with-zlib.
+
+_cppflags=$CPPFLAGS
+_ldflags=$LDFLAGS
+OPT_ZLIB="/usr/local"
+AC_ARG_WITH(zlib,
+AC_HELP_STRING([--with-zlib=PATH],[search for zlib in PATH])
+AC_HELP_STRING([--without-zlib],[disable use of zlib]),
+               [OPT_ZLIB="$withval"])
+
+case "$OPT_ZLIB" in
+  no)
+    AC_MSG_WARN([zlib disabled]) ;;
+  *)
+    dnl check for the lib first without setting any new path, since many
+    dnl people have it in the default path
+
+    AC_CHECK_LIB(z, inflateEnd, ,
+                   [if test -d "$OPT_ZLIB"; then
+                      CPPFLAGS="$CPPFLAGS -I$OPT_ZLIB/include"
+                      LDFLAGS="$LDFLAGS -L$OPT_ZLIB/lib"
+                   fi])
+
+    AC_CHECK_HEADER(zlib.h,[
+      AC_CHECK_LIB(z, gzread,
+                   [HAVE_LIBZ="1"
+                   AC_SUBST(HAVE_LIBZ)
+                   LIBS="$LIBS -lz"
+                   AC_DEFINE(HAVE_ZLIB_H, 1, [if you have the zlib.h header file])
+                   AC_DEFINE(HAVE_LIBZ, 1, [If zlib is available])],
+                   [ CPPFLAGS=$_cppflags
+                   LDFLAGS=$_ldflags])],
+      [ CPPFLAGS=$_cppflags
+      LDFLAGS=$_ldflags]
+    )
+    ;;
+esac
+
+dnl Default is to try the thread-safe versions of a few functions
+OPT_THREAD=on
+
+dnl detect AIX 4.3 or later
+dnl see full docs on this reasoning in the lib/hostip.c source file
+AC_MSG_CHECKING([AIX 4.3 or later])
+AC_PREPROC_IFELSE([
+#if defined(_AIX) && defined(_AIX43)
+printf("just fine");
+#else
+#error "this is not AIX 4.3 or later"
+#endif
+],
+ [ AC_MSG_RESULT([yes])
+   OPT_THREAD=off ],
+ [ AC_MSG_RESULT([no]) ]
+)
+
+AC_ARG_ENABLE(thread,dnl
+AC_HELP_STRING([--disable-thread],[don't look for thread-safe functions]),
+  OPT_THREAD=off
+  AC_MSG_WARN(libcurl will not get built using thread-safe functions)
+)
+
+if test X"$OPT_THREAD" = Xoff
+then
+  AC_DEFINE(DISABLED_THREADSAFE, 1, \
+Set to explicitly specify we don't want to use thread-safe functions)
+else
+
+  dnl dig around for gethostbyname_r()
+  CURL_CHECK_GETHOSTBYNAME_R()
+
+  dnl dig around for gethostbyaddr_r()
+  CURL_CHECK_GETHOSTBYADDR_R()
+
+  dnl poke around for inet_ntoa_r()
+  CURL_CHECK_INET_NTOA_R()
+
+  dnl is there a localtime_r()
+  CURL_CHECK_LOCALTIME_R()
+
+  AC_CHECK_FUNCS( gmtime_r )
+
+fi
+
+dnl **********************************************************************
+dnl Back to "normal" configuring
+dnl **********************************************************************
+
+dnl Checks for header files.
+AC_HEADER_STDC
+
+dnl First check for the very most basic headers. Then we can use these
+dnl ones as default-headers when checking for the rest!
+AC_CHECK_HEADERS(
+        sys/types.h \
+        sys/time.h \
+        sys/select.h \
+        sys/socket.h \
+        unistd.h \
+        malloc.h \
+        stdlib.h \
+        arpa/inet.h \
+        net/if.h \
+        netinet/in.h \
+        netdb.h \
+        sys/sockio.h \
+        sys/stat.h \
+        sys/param.h \
+        termios.h \
+        termio.h \
+        sgtty.h \
+        fcntl.h \
+        dlfcn.h \
+        alloca.h \
+        winsock.h \
+        time.h \
+        io.h \
+        pwd.h \
+        utime.h \
+        sys/utime.h \
+        sys/poll.h \
+        setjmp.h,
+dnl to do if not found
+[],
+dnl to do if found
+[],
+dnl default includes
+[
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+]
+)
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_TYPE_SIZE_T
+AC_HEADER_TIME
+
+# mprintf() checks:
+
+# check for 'long double'
+# AC_CHECK_SIZEOF(long double, 8)
+# check for 'long long'
+# AC_CHECK_SIZEOF(long long, 4)
+
+# check for ssize_t
+AC_CHECK_TYPE(ssize_t, int)
+
+TYPE_SOCKLEN_T
+TYPE_IN_ADDR_T
+
+AC_FUNC_SELECT_ARGTYPES
+
+dnl Checks for library functions.
+dnl AC_PROG_GCC_TRADITIONAL
+AC_TYPE_SIGNAL
+dnl AC_FUNC_VPRINTF
+AC_CHECK_FUNCS( socket \
+                select \
+                strdup \
+                strstr \
+                strtok_r \
+                strftime \
+                uname \
+                strcasecmp \
+                stricmp \
+                strcmpi \
+                gethostbyaddr \
+                gettimeofday \
+                inet_addr \
+                inet_ntoa \
+                tcsetattr \
+                tcgetattr \
+                perror \
+                closesocket \
+                setvbuf \
+                sigaction \
+                signal \
+                getpass_r \
+                strlcat \
+                getpwuid \
+                geteuid \
+                dlopen \
+                utime \
+                sigsetjmp \
+                poll,
+dnl if found
+[],
+dnl if not found, $ac_func is the name we check for
+  func="$ac_func"
+  AC_MSG_CHECKING([deeper for $func])
+  AC_TRY_LINK( [],
+               [ $func ();],
+               AC_MSG_RESULT(yes!)
+               eval "ac_cv_func_$func=yes"
+               def=`echo "HAVE_$func" | tr 'a-z' 'A-Z'`
+               AC_DEFINE_UNQUOTED($def, 1, [If you have $func]),
+               AC_MSG_RESULT(but still no)
+               )
+
+)
+
+dnl sigsetjmp() might be a macro and no function so if it isn't found already
+dnl we make an extra check here!
+if test "$ac_cv_func_sigsetjmp" != "yes"; then
+  AC_MSG_CHECKING([for sigsetjmp defined as macro])
+  AC_TRY_LINK( [#include <setjmp.h>],
+               [sigjmp_buf jmpenv;
+                sigsetjmp(jmpenv, 1);],
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_SIGSETJMP, 1, [If you have sigsetjmp]),
+               AC_MSG_RESULT(no)
+               )
+fi
+
+AC_PATH_PROG( PERL, perl, , 
+  $PATH:/usr/local/bin/perl:/usr/bin/:/usr/local/bin )
+AC_SUBST(PERL)
+
+AC_PATH_PROGS( NROFF, gnroff nroff, , 
+  $PATH:/usr/bin/:/usr/local/bin )
+AC_SUBST(NROFF)
+
+AC_MSG_CHECKING([CA cert bundle install path])
+
+AC_ARG_WITH(ca-bundle,
+AC_HELP_STRING([--with-ca-bundle=FILE], [File name to install the CA bundle as])
+AC_HELP_STRING([--without-ca-bundle], [Don't install the CA bundle]),
+   [ ca="$withval" ],
+   [
+  if test "x$prefix" != xNONE; then
+    ca="$prefix/share/curl/curl-ca-bundle.crt"
+  else
+    ca="$ac_default_prefix/share/curl/curl-ca-bundle.crt"
+  fi
+   ] )
+
+if test X"$OPT_SSL" = Xno
+then
+  ca="no"
+fi
+
+if test "x$ca" = "xno"; then
+  dnl let's not keep "no" as path name, blank it instead
+  ca=""
+else
+  AC_DEFINE_UNQUOTED(CURL_CA_BUNDLE, "$ca", [CA bundle full path name])
+fi
+
+CURL_CA_BUNDLE="$ca"
+AC_SUBST(CURL_CA_BUNDLE)
+AC_MSG_RESULT([$ca])
+
+AC_PROG_YACC
+
+dnl AC_PATH_PROG( RANLIB, ranlib, /usr/bin/ranlib, 
+dnl   $PATH:/usr/bin/:/usr/local/bin )
+dnl AC_SUBST(RANLIB)
+
+dnl ************************************************************
+dnl lame option to switch on debug options
+dnl
+AC_MSG_CHECKING([whether to enable debug options])
+AC_ARG_ENABLE(debug,
+AC_HELP_STRING([--enable-debug],[Enable pedantic debug options])
+AC_HELP_STRING([--disable-debug],[Disable debug options]),
+[ case "$enableval" in
+  no)
+       AC_MSG_RESULT(no)
+       ;;
+  *)   AC_MSG_RESULT(yes)
+
+    CPPFLAGS="$CPPFLAGS -DMALLOCDEBUG"
+    CFLAGS="$CFLAGS -g" 
+    if test "$GCC" = "yes"; then
+       CFLAGS="$CFLAGS -W -Wall -Wwrite-strings -pedantic -Wundef -Wpointer-arith -Wnested-externs"
+    fi
+    dnl strip off optimizer flags
+    NEWFLAGS=""
+    for flag in $CFLAGS; do
+      case "$flag" in
+      -O*)
+        dnl echo "cut off $flag"
+        ;;
+      *)
+        NEWFLAGS="$NEWFLAGS $flag"
+        ;;
+      esac
+    done
+    CFLAGS=$NEWFLAGS
+       ;;
+  esac ],
+       AC_MSG_RESULT(no)
+)
+
+AC_CONFIG_FILES([Makefile \
+	   docs/Makefile \
+           docs/examples/Makefile \
+           docs/libcurl/Makefile \
+	   include/Makefile \
+	   include/curl/Makefile \
+	   src/Makefile \
+           lib/Makefile \
+           tests/Makefile \
+           tests/data/Makefile \
+           tests/server/Makefile \
+           tests/libtest/Makefile \
+	   packages/Makefile \
+	   packages/Win32/Makefile \
+	   packages/Win32/cygwin/Makefile \
+	   packages/Linux/Makefile \
+	   packages/Linux/RPM/Makefile \
+	   packages/Linux/RPM/curl.spec \
+	   packages/Linux/RPM/curl-ssl.spec \
+           packages/Solaris/Makefile \
+           packages/EPM/curl.list \
+           packages/EPM/Makefile \
+           curl-config
+])
+AC_OUTPUT
diff --git a/main/source/curl/curl-config.in b/main/source/curl/curl-config.in
new file mode 100644
index 00000000..01c986ea
--- /dev/null
+++ b/main/source/curl/curl-config.in
@@ -0,0 +1,130 @@
+#! /bin/sh
+#
+# The idea to this kind of setup info script was stolen from numerous
+# other packages, such as neon, libxml and gnome.
+#
+# $Id: curl-config.in,v 1.17 2003/01/16 10:58:49 bagder Exp $
+#
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+includedir=@includedir@
+
+usage()
+{
+    cat <<EOF
+Usage: curl-config [OPTION]
+
+Available values for OPTION include:
+
+  --ca        ca bundle install path
+  --cc        compiler
+  --cflags    pre-processor and compiler flags
+  --feature   newline separated list of enabled features
+  --help      display this help and exit
+  --libs      library linking information
+  --prefix    curl install prefix
+  --version   output version information
+  --vernum    output the version information as a number (hexadecimal)
+EOF
+
+    exit $1
+}
+
+if test $# -eq 0; then
+    usage 1
+fi
+
+while test $# -gt 0; do
+    case "$1" in
+    # this deals with options in the style
+    # --option=value and extracts the value part
+    # [not currently used]
+    -*=*) value=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+    *) value= ;;
+    esac
+
+    case "$1" in
+    --ca)
+	echo @CURL_CA_BUNDLE@
+	;;
+
+    --cc)
+	echo @CC@
+	;;
+
+    --prefix)
+	echo $prefix
+	;;
+
+    --feature)
+	if test "@OPENSSL_ENABLED@" = "1"; then
+          echo "SSL"
+        fi
+	if test "@KRB4_ENABLED@" = "1"; then
+          echo "KRB4"
+        fi
+	if test "@IPV6_ENABLED@" = "1"; then
+          echo "IPv6"
+        fi
+	if test "@HAVE_LIBZ@" = "1"; then
+          echo "libz"
+        fi
+	if test "@CURL_DISABLE_HTTP@" = "1"; then
+          echo "HTTP-disabled"
+        fi
+	if test "@CURL_DISABLE_FTP@" = "1"; then
+          echo "FTP-disabled"
+        fi
+	if test "@CURL_DISABLE_GOPHER@" = "1"; then
+          echo "GOPHER-disabled"
+        fi
+	if test "@CURL_DISABLE_FILE@" = "1"; then
+          echo "FILE-disabled"
+        fi
+	if test "@CURL_DISABLE_TELNET@" = "1"; then
+          echo "TELNET-disabled"
+        fi
+	if test "@CURL_DISABLE_LDAP@" = "1"; then
+          echo "LDAP-disabled"
+        fi
+	if test "@CURL_DISABLE_DICT@" = "1"; then
+          echo "DICT-disabled"
+        fi
+	;;
+
+    --version)
+	echo libcurl @VERSION@
+	exit 0
+	;;
+
+    --vernum)
+	echo @VERSIONNUM@
+	exit 0
+	;;
+
+    --help)
+	usage 0
+	;;
+
+    --cflags)
+       	if test "X@includedir@" = "X/usr/include"; then
+          echo ""
+        else
+          echo "-I@includedir@"
+        fi
+       	;;
+
+    --libs)
+       	echo -L@libdir@ -lcurl @LDFLAGS@ @LIBS@
+       	;;
+
+    *)
+        echo "unknown option: $1"
+	usage
+	exit 1
+	;;
+    esac
+    shift
+done
+
+exit 0
diff --git a/main/source/curl/curl-style.el b/main/source/curl/curl-style.el
new file mode 100644
index 00000000..f1ee1ac2
--- /dev/null
+++ b/main/source/curl/curl-style.el
@@ -0,0 +1,50 @@
+;;;; Emacs Lisp help for writing curl code. ;;;;
+;;;; $Id: curl-style.el,v 1.3 2003/03/12 08:11:24 bagder Exp $
+
+;;; The curl hacker's C conventions.
+
+;;; After loading this file and added the mode-hook you can in C
+;;; files, put something like this to use the curl style
+;;; automatically:
+;;
+;;   /* -----------------------------------------------------------------
+;;    * local variables:
+;;    * eval: (set c-file-style "curl")
+;;    * end:
+;;    */
+;;
+
+(defconst curl-c-style
+  '((c-basic-offset . 2)
+    (c-comment-only-line-offset . 0)
+    (c-hanging-braces-alist     . ((substatement-open before after)))
+    (c-offsets-alist . ((topmost-intro        . 0)
+			(topmost-intro-cont   . 0)
+			(substatement         . +)
+			(substatement-open    . 0)
+			(statement-case-intro . +)
+			(statement-case-open  . 0)
+			(case-label           . 0)
+			))
+    )
+  "Curl C Programming Style")
+
+;; Customizations for all of c-mode, c++-mode, and objc-mode
+(defun curl-c-mode-common-hook ()
+  "Curl C mode hook"
+  ;; add curl style and set it for the current buffer
+  (c-add-style "curl" curl-c-style t)
+  (setq tab-width 8
+	indent-tabs-mode nil		; Use spaces. Not tabs.
+	comment-column 40
+	c-font-lock-extra-types (append '("bool" "CURL" "CURLcode" "ssize_t" "size_t" "socklen_t" "fd_set"))
+	)
+  ;; keybindings for C, C++, and Objective-C.  We can put these in
+  ;; c-mode-base-map because of inheritance ...
+  (define-key c-mode-base-map "\M-q" 'c-fill-paragraph)
+  (setq c-recognize-knr-p nil)
+  )
+
+;; Set this is in your .emacs if you want to use the c-mode-hook as
+;; defined here right out of the box.
+; (add-hook 'c-mode-common-hook 'curl-c-mode-common-hook)
diff --git a/main/source/curl/depcomp b/main/source/curl/depcomp
new file mode 100644
index 00000000..0a488c7e
--- /dev/null
+++ b/main/source/curl/depcomp
@@ -0,0 +1,411 @@
+#! /bin/sh
+
+# depcomp - compile a program generating dependencies as side-effects
+# Copyright 1999, 2000 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+# `libtool' can also be set to `yes' or `no'.
+
+depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+   # This is just like dashmstdout with a different argument.
+   dashmflag=-xM
+   depmode=dashmstdout
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the `deleted header file' problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+  tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'.  On the theory
+## that the space means something, we add a space to the output as
+## well.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like `#:fec' to the end of the
+    # dependency line.
+    tr ' ' '
+' < "$tmpdepfile" \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+    tr '
+' ' ' >> $depfile
+    echo >> $depfile
+
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' '
+' < "$tmpdepfile" \
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+   >> $depfile
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  This file always lives in the current directory.
+  # Also, the AIX compiler puts `$object:' at the start of each line;
+  # $object doesn't have directory information.
+  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
+  tmpdepfile="$stripped.u"
+  outname="$stripped.o"
+  if test "$libtool" = yes; then
+    "$@" -Wc,-M
+  else
+    "$@" -M
+  fi
+
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form `foo.o: dependent.h'.
+    # Do two passes, one to just change these to
+    # `$object: dependent.h' and one to simply `dependent.h:'.
+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+tru64)
+   # The Tru64 AIX compiler uses -MD to generate dependencies as a side
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put 
+   # dependencies in `foo.d' instead, so we check for that too.
+   # Subdirectories are respected.
+
+   tmpdepfile1="$object.d"
+   tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` 
+   if test "$libtool" = yes; then
+      "$@" -Wc,-MD
+   else
+      "$@" -MD
+   fi
+
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+      rm -f "$tmpdepfile1" "$tmpdepfile2"
+      exit $stat
+   fi
+
+   if test -f "$tmpdepfile1"; then
+      tmpdepfile="$tmpdepfile1"
+   else
+      tmpdepfile="$tmpdepfile2"
+   fi
+   if test -f "$tmpdepfile"; then
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+      # That's a space and a tab in the [].
+      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+      echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the proprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  test -z "$dashmflag" && dashmflag=-M
+  ( IFS=" "
+    case " $* " in
+    *" --mode=compile "*) # this is libtool, let us make it quiet
+      for arg
+      do # cycle over the arguments
+        case "$arg" in
+	"--mode=compile")
+	  # insert --quiet before "--mode=compile"
+	  set fnord "$@" --quiet
+	  shift # fnord
+	  ;;
+	esac
+	set fnord "$@" "$arg"
+	shift # fnord
+	shift # "$arg"
+      done
+      ;;
+    esac
+    "$@" $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
+  ) &
+  proc=$!
+  "$@"
+  stat=$?
+  wait "$proc"
+  if test "$stat" != 0; then exit $stat; fi
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tr ' ' '
+' < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  # X makedepend
+  (
+    shift
+    cleared=no
+    for arg in "$@"; do
+      case $cleared in no)
+        set ""; shift
+	cleared=yes
+      esac
+      case "$arg" in
+        -D*|-I*)
+	  set fnord "$@" "$arg"; shift;;
+	-*)
+	  ;;
+	*)
+	  set fnord "$@" "$arg"; shift;;
+      esac
+    done
+    obj_suffix="`echo $object | sed 's/^.*\././'`"
+    touch "$tmpdepfile"
+    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  ) &
+  proc=$!
+  "$@"
+  stat=$?
+  wait "$proc"
+  if test "$stat" != 0; then exit $stat; fi
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tail +3 "$tmpdepfile" | tr ' ' '
+' | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the proprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  ( IFS=" "
+    case " $* " in
+    *" --mode=compile "*)
+      for arg
+      do # cycle over the arguments
+        case $arg in
+	"--mode=compile")
+	  # insert --quiet before "--mode=compile"
+	  set fnord "$@" --quiet
+	  shift # fnord
+	  ;;
+	esac
+	set fnord "$@" "$arg"
+	shift # fnord
+	shift # "$arg"
+      done
+      ;;
+    esac
+    "$@" -E |
+    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
+  ) &
+  proc=$!
+  "$@"
+  stat=$?
+  wait "$proc"
+  if test "$stat" != 0; then exit $stat; fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the proprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  ( IFS=" "
+    case " $* " in
+    *" --mode=compile "*)
+      for arg
+      do # cycle over the arguments
+        case $arg in
+	"--mode=compile")
+	  # insert --quiet before "--mode=compile"
+	  set fnord "$@" --quiet
+	  shift # fnord
+	  ;;
+	esac
+	set fnord "$@" "$arg"
+	shift # fnord
+	shift # "$arg"
+      done
+      ;;
+    esac
+    "$@" -E |
+    sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  ) &
+  proc=$!
+  "$@"
+  stat=$?
+  wait "$proc"
+  if test "$stat" != 0; then exit $stat; fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  echo "	" >> "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
diff --git a/main/source/curl/docs/BINDINGS b/main/source/curl/docs/BINDINGS
new file mode 100644
index 00000000..a97e820f
--- /dev/null
+++ b/main/source/curl/docs/BINDINGS
@@ -0,0 +1,96 @@
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+                               libcurl bindings
+
+Creative people have written particular bindings or interfaces for various
+environments and programming languages. Using one of these allows you to take
+advantage of curl powers from within your favourite language or system.
+
+This is a list of all known interfaces as of this writing.
+
+The bindings listed below are not part of the curl/libcurl distribution
+archives, but must be downloaded and installed separately.
+
+Basic
+
+  ScriptBasic bindings to libcurl. Writtten by Peter Verhas.
+  http://scriptbasic.com/
+
+C++
+
+  Maintained by Jean-Philippe Barrette-LaPierre.
+  http://curl.haxx.se/libcurl/cplusplus/
+
+Cocoa
+
+  Written by Dan Wood.
+  http://curlhandle.sourceforge.net/
+
+Dylan
+
+  Written by Chris Double.
+  http://dylanlibs.sourceforge.net/
+
+Java
+
+  Written by Daniel Stenberg.
+  http://curl.haxx.se/libcurl/java/
+
+Lua
+
+  Written by Steve Dekorte.
+  http://curl.haxx.se/libcurl/lua/
+
+Object-Pascal
+
+  Free Pascal, Delphi and Kylix binding written by Christophe Espern.
+  http://www.tekool.com/opcurl
+
+Pascal
+
+  Free Pascal, Delphi and Kylix binding written by Jeffrey Pohlmeyer.
+  http://houston.quik.com/jkp/curlpas/
+
+Perl
+
+  Maintained by Cris Bailiff.
+  http://curl.haxx.se/libcurl/perl/
+
+PHP
+
+  Written by Sterling Hughes.
+  http://curl.haxx.se/libcurl/php/
+
+PostgreSQL
+
+  Written by Gian Paolo Ciceri.
+  http://gborg.postgresql.org/project/pgcurl/projdisplay.php
+
+Python
+
+  Written by Kjetil Jacobsen.
+  http://pycurl.sourceforge.net/
+
+Rexx
+
+  Written Mark Hessling. 
+  http://rexxcurl.sourceforge.net/
+
+Ruby
+
+  Written by Hirotaka Matsuyuki. 
+  http://www.d1.dion.ne.jp/~matuyuki/ruby.html
+
+Scheme
+
+  Bigloo binding written by Kirill Lisovsky.
+  http://curl.haxx.se/libcurl/scheme/
+
+Tcl
+
+  Written by Andrés García. 
+  http://personal1.iddeo.es/andresgarci/tclcurl/english/docs.html
diff --git a/main/source/curl/docs/BUGS b/main/source/curl/docs/BUGS
new file mode 100644
index 00000000..8e0ab4a7
--- /dev/null
+++ b/main/source/curl/docs/BUGS
@@ -0,0 +1,82 @@
+$Id: BUGS,v 1.6 2003/03/26 11:44:04 bagder Exp $
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+BUGS
+
+  Curl and libcurl have grown substantially since the beginning. At the time
+  of writing (end of March 2003), there are 35000 lines of source code, and by
+  the time you read this it has probably grown even more.
+
+  Of course there are lots of bugs left. And lots of misfeatures.
+
+  To help us make curl the stable and solid product we want it to be, we need
+  bug reports and bug fixes.
+
+WHERE TO REPORT
+
+  If you can't fix a bug yourself and submit a fix for it, try to report an as
+  detailed report as possible to a curl mailing list to allow one of us to
+  have a go at a solution. You should also post your bug/problem at curl's bug
+  tracking system over at
+
+        http://sourceforge.net/bugs/?group_id=976
+
+  (but please read the sections below first before doing that)
+
+  If you feel you need to ask around first, find a suitable mailing list and
+  post there. The lists are available on http://curl.haxx.se/mail/
+
+WHAT TO REPORT
+
+  When reporting a bug, you should include information that will help us
+  understand what's wrong, what you expected to happen and how to repeat the
+  bad behavior. You therefore need to tell us:
+
+   - your operating system's name and version number (uname -a under a unix
+     is fine)
+   - what version of curl you're using (curl -V is fine)
+   - what URL you were working with (if possible), at least which protocol
+
+  and anything and everything else you think matters. Tell us what you
+  expected to happen, tell use what did happen, tell us how you could make it
+  work another way. Dig around, try out, test. Then include all the tiny bits
+  and pieces in your report. You will benefit from this yourself, as it will
+  enable us to help you quicker and more accurately.
+
+  Since curl deals with networks, it often helps us if you include a protocol
+  debug dump with your bug report. The output you get by using the -v
+  flag. Usually, you also get more info by using -i so that is likely to be
+  useful when reporting bugs as well.
+
+  If curl crashed, causing a core dump (in unix), there is hardly any use to
+  send that huge file to anyone of us. Unless we have an exact same system
+  setup as you, we can't do much with it. What we instead ask of you is to get
+  a stack trace and send that (much smaller) output to us instead!
+
+  The address and how to subscribe to the mailing list is detailed in the
+  MANUAL file.
+
+HOW TO GET A STACK TRACE
+
+  First, you must make sure that you compile all sources with -g and that you
+  don't 'strip' the final executable. Try to avoid optimizing the code as
+  well, remove -O, -O2 etc from the compiler options.
+
+  Run the program until it dumps core.
+
+  Run your debugger on the core file, like '<debugger> curl core'. <debugger>
+  should be replaced with the name of your debugger, in most cases that will
+  be 'gdb', but 'dbx' and others also occur.
+
+  When the debugger has finished loading the core file and presents you a
+  prompt, enter 'where' (without the quotes) and press return.
+
+  The list that is presented is the stack trace. If everything worked, it is
+  supposed to contain the chain of functions that were called when curl
+  crashed. Include the stack trace with your detailed bug report. It'll help a
+  lot.
+
diff --git a/main/source/curl/docs/CONTRIBUTE b/main/source/curl/docs/CONTRIBUTE
new file mode 100644
index 00000000..ba095c2c
--- /dev/null
+++ b/main/source/curl/docs/CONTRIBUTE
@@ -0,0 +1,159 @@
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+To Think About When Contributing Source Code
+
+ This document is intended to offer some simple guidelines that can be useful
+ to keep in mind when you decide to contribute to the project. This concerns
+ new features as well as corrections to existing flaws or bugs.
+
+Join the Community
+
+ Skip over to http://curl.haxx.se/mail/ and join the appropriate mailing
+ list(s).  Read up on details before you post questions. Read this file before
+ you start sending patches! We prefer patches and discussions being held on
+ the mailing list(s), not sent to individuals.
+
+The License Issue
+
+ When contributing with code, you agree to put your changes and new code under
+ the same license curl and libcurl is already using unless stated otherwise.
+
+ If you add a larger piece of code, you can opt to make that file or set of
+ files to use a different license as long as they don't enforce any changes to
+ the rest of the package and they make sense. Such "separate parts" can not be
+ GPL (as we don't want the GPL virus to attack users of libcurl) but they must
+ use "GPL compatible" licenses.
+
+What To Read
+
+ Source code, the man pages, the INTERNALS document, the TODO, the most recent
+ CHANGES. Just lurking on the libcurl mailing list is gonna give you a lot of
+ insights on what's going on right now. Asking there is a good idea too.
+
+Naming
+
+ Try using a non-confusing naming scheme for your new functions and variable
+ names. It doesn't necessarily have to mean that you should use the same as in
+ other places of the code, just that the names should be logical,
+ understandable and be named according to what they're used for. File-local
+ functions should be made static. We like lower case names.
+
+ See the INTERNALS document on how we name non-exported library-global
+ symbols.
+
+Indenting
+
+ Please try using the same indenting levels and bracing method as all the
+ other code already does. It makes the source code a lot easier to follow if
+ all of it is written using the same style. We don't ask you to like it, we
+ just ask you to follow the tradition! ;-) This mainly means: 2-level indents,
+ using spaces only (no tabs) and having the opening brace ({) on the same line
+ as the if() or while().
+
+Commenting
+
+ Comment your source code extensively using C comments (/* comment */), DO NOT
+ use C++ comments (// this style). Commented code is quality code and enables
+ future modifications much more. Uncommented code much more risk being
+ completely replaced when someone wants to extend things, since other persons'
+ source code can get quite hard to read.
+
+General Style
+
+ Keep your functions small. If they're small you avoid a lot of mistakes and
+ you don't accidentally mix up variables etc.
+
+Non-clobbering All Over
+
+ When you write new functionality or fix bugs, it is important that you don't
+ fiddle all over the source files and functions. Remember that it is likely
+ that other people have done changes in the same source files as you have and
+ possibly even in the same functions. If you bring completely new
+ functionality, try writing it in a new source file. If you fix bugs, try to
+ fix one bug at a time and send them as separate patches.
+
+Platform Dependent Code
+
+ Use #ifdef HAVE_FEATURE to do conditional code. We avoid checking for
+ particular operating systems or hardware in the #ifdef lines. The
+ HAVE_FEATURE shall be generated by the configure script for unix-like systems
+ and they are hard-coded in the config-[system].h files for the others.
+
+Separate Patches
+
+ It is annoying when you get a huge patch from someone that is said to fix 511
+ odd problems, but discussions and opinions don't agree with 510 of them - or
+ 509 of them were already fixed in a different way. Then the patcher needs to
+ extract the single interesting patch from somewhere within the huge pile of
+ source, and that gives a lot of extra work. Preferably, all fixes that
+ correct different problems should be in their own patch with an attached
+ description exactly what they correct so that all patches can be selectively
+ applied by the maintainer or other interested parties.
+
+Patch Against Recent Sources
+
+ Please try to get the latest available sources to make your patches
+ against. It makes the life of the developers so much easier. The very best is
+ if you get the most up-to-date sources from the CVS repository, but the
+ latest release archive is quite OK as well!
+
+Document
+
+ Writing docs is dead boring and one of the big problems with many open source
+ projects. Someone's gotta do it. It makes it a lot easier if you submit a
+ small description of your fix or your new features with every contribution so
+ that it can be swiftly added to the package documentation.
+
+ The documentation is always made in man pages (nroff formatted) or plain
+ ASCII files. All HTML files on the web site and in the release archives are
+ generated from the nroff/ASCII versions.
+
+Write Access to CVS Repository
+
+ If you are a frequent contributor, or have another good reason, you can of
+ course get write access to the CVS repository and then you'll be able to
+ check-in all your changes straight into the CVS tree instead of sending all
+ changes by mail as patches. Just ask if this is what you'd want. You will be
+ required to have posted a few quality patches first, before you can be
+ granted write access.
+
+Test Cases
+
+ Since the introduction of the test suite, we can quickly verify that the main
+ features are working as they're supposed to. To maintain this situation and
+ improve it, all new features and functions that are added need to be tested
+ in the test suite. Every feature that is added should get at least one valid
+ test case that verifies that it works as documented. If every submitter also
+ post a few test cases, it won't end up as a heavy burden on a single person!
+
+How To Make a Patch
+
+ Keep a copy of the unmodified curl sources. Make your changes in a separate
+ source tree. When you think you have something that you want to offer the
+ curl community, use GNU diff to generate patches.
+
+ If you have modified a single file, try something like:
+
+     diff -u undmodified-file.c my-changed-one.c > my-fixes.diff
+
+ If you have modified several files, possibly in different directories, you
+ can use diff recursively:
+
+     diff -ur curl-original-dir curl-modfied-sources-dir > my-fixes.diff
+
+ The GNU diff and GNU patch tools exist for virtually all platforms, including
+ all kinds of unixes and Windows:
+
+ For unix-like operating systems:
+
+        http://www.fsf.org/software/patch/patch.html
+        http://www.gnu.org/directory/diffutils.html
+
+ For Windows:
+
+        http://gnuwin32.sourceforge.net/packages/patch.htm
+        http://gnuwin32.sourceforge.net/packages/diffutils.htm
diff --git a/main/source/curl/docs/FAQ b/main/source/curl/docs/FAQ
new file mode 100644
index 00000000..d40492de
--- /dev/null
+++ b/main/source/curl/docs/FAQ
@@ -0,0 +1,781 @@
+Updated: May 9, 2003 (http://curl.haxx.se/docs/faq.html)
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+FAQ
+
+ 1. Philosophy
+  1.1 What is cURL?
+  1.2 What is libcurl?
+  1.3 What is cURL not?
+  1.4 When will you make curl do XXXX ?
+  1.5 Who makes cURL?
+  1.6 What do you get for making cURL?
+  1.7 What about CURL from curl.com?
+  1.8 I have a problem who do I mail?
+
+ 2. Install Related Problems
+  2.1 configure doesn't find OpenSSL even when it is installed
+   2.1.1. native linker doesn't find openssl
+   2.1.2. only the libssl lib is missing
+  2.2 Does curl work/build with other SSL libraries?
+  2.3 Where can I find a copy of LIBEAY32.DLL?
+  2.4 Does cURL support Socks (RFC 1928) ?
+
+ 3. Usage Problems
+  3.1 curl: (1) SSL is disabled, https: not supported
+  3.2 How do I tell curl to resume a transfer?
+  3.3 Why doesn't my posting using -F work?
+  3.4 How do I tell curl to run custom FTP commands?
+  3.5 How can I disable the Pragma: nocache header?
+  3.6 Does curl support ASP, XML, XHTML or HTML version Y?
+  3.7 Can I use curl to delete/rename a file through FTP?
+  3.8 How do I tell curl to follow HTTP redirects?
+  3.9 How do I use curl in my favorite programming language?
+  3.10 What about SOAP, WebDAV, XML-RPC or similar protocols over HTTP?
+  3.11 How do I POST with a different Content-Type?
+  3.12 Why do FTP specific features over HTTP proxy fail?
+  3.13 Why does my single/double quotes fail?
+  3.14 Does curl support javascript or pac (automated proxy config)?
+
+ 4. Running Problems
+  4.1 Problems connecting to SSL servers.
+  4.2 Why do I get problems when I use & or % in the URL?
+  4.3 How can I use {, }, [ or ] to specify multiple URLs?
+  4.4 Why do I get downloaded data even though the web page doesn't exist?
+  4.5 Why do I get return code XXX from a HTTP server?
+   4.5.1 "400 Bad Request"
+   4.5.2 "401 Unauthorized"
+   4.5.3 "403 Forbidden"
+   4.5.4 "404 Not Found"
+   4.5.5 "405 Method Not Allowed"
+   4.5.6 "301 Moved Permanently"
+  4.6 Can you tell me what error code 142 means?
+  4.7 How do I keep user names and passwords secret in Curl command lines?
+  4.8 I found a bug!
+  4.9 Curl can't authenticate to the server that requires NTLM?
+  4.10 My HTTP request using HEAD, PUT or DELETE doesn't work!
+  4.11 Why does my HTTP range requests return the full document?
+  4.12 Why do I get "certificate verify failed" ?
+
+ 5. libcurl Issues
+  5.1 Is libcurl thread-safe?
+  5.2 How can I receive all data into a large memory chunk?
+  5.3 How do I fetch multiple files with libcurl?
+  5.4 Does libcurl do Winsock initing on win32 systems?
+  5.5 Does CURLOPT_FILE and CURLOPT_INFILE work on win32 ?
+  5.6 What about Keep-Alive or persistent connections?
+  5.7 Link errors when building libcurl on Windows!
+
+ 6. License Issues
+  6.1 I have a GPL program, can I use the libcurl library?
+  6.2 I have a closed-source program, can I use the libcurl library?
+  6.3 I have a BSD licensed program, can I use the libcurl library?
+  6.4 I have a program that uses LGPL libraries, can I use libcurl?
+  6.5 Can I modify curl/libcurl for my program and keep the changes secret?
+  6.6 Can you please change the curl/libcurl license to XXXX?
+
+==============================================================================
+
+1. Philosophy
+
+  1.1 What is cURL?
+
+  cURL (or simply just 'curl') is a command line tool for getting or sending
+  files using URL syntax. The name is a play on 'Client for URLs', originally
+  with URL spelled in uppercase to make it obvious it deals with URLs. The
+  fact it can also be pronounced 'see URL' also helped, it works as an
+  abbrivation for "Client URL Request Library" or why not the recursive
+  version: "Curl is a URL Request Library".
+
+  Curl supports a range of common Internet protocols, currently including
+  HTTP, HTTPS, FTP, FTPS, GOPHER, LDAP, DICT, TELNET and FILE.
+
+  We spell it cURL or just curl. We pronounce it with an initial k sound:
+  [kurl].
+
+  NOTE: there are numerous sub-projects and related projects that also use the
+  word curl in the project names in various combinations, but you should take
+  notice that this FAQ is directed at the command-line tool named curl (and
+  libcurl the library), and may therefore not be valid for other curl
+  projects.
+
+  1.2 What is libcurl?
+
+  libcurl is a reliable and portable library which provides you with an easy
+  interface to a range of common Internet protocols.
+
+  You can use libcurl for free in your application even if it is commercial
+  or closed-source.
+
+  1.3 What is cURL not?
+  
+  Curl is *not* a wget clone even though that is a very common misconception.
+  Never, during curl's development, have we intended curl to replace wget or
+  compete on its market. Curl is targeted at single-shot file transfers.
+
+  Curl is not a web site mirroring program. If you wanna use curl to mirror
+  something: fine, go ahead and write a script that wraps around curl to make
+  it reality (like curlmirror.pl does).
+
+  Curl is not an FTP site mirroring program. Sure, get and send FTP with curl
+  but if you want systematic and sequential behavior you should write a
+  script (or write a new program that interfaces libcurl) and do it.
+
+  Curl is not a PHP tool, even though it works perfectly well when used from
+  or with PHP.
+
+  Curl is not a single-OS program. Curl exists, compiles, builds and runs
+  under a wide range of operating systems, including all modern Unixes (and a
+  bunch of older ones too), Windows, Amiga, BeOS, OS/2, OS X, QNX etc.
+
+  1.4 When will you make curl do XXXX ?
+
+  We love suggestions of what to change in order to make curl and libcurl
+  better. We do however believe in a few rules when it comes to the future of
+  curl:
+
+  * Curl -- the command line tool -- is to remain a non-graphical command line
+    tool. If you want GUIs or fancy scripting capabilities, you should look
+    for another tool that uses libcurl.
+
+  * We do not add things to curl that other small and available tools already
+    do very fine at the side. Curl's output is fine to pipe into another
+    program or redirect to another file for the next program to interpret.
+
+  * We focus on protocol related issues and improvements. If you wanna do more
+    magic with the supported protocols than curl currently does, chances are
+    big we will agree. If you wanna add more protocols, we may very well
+    agree.
+
+  * If you want someone else to make all the work while you wait for us to
+    implement it for you, that is not a very friendly attitude. We spend a
+    considerable time already on maintaining and developing curl. In order to
+    get more out of us, you should consider trading in some of your time and
+    efforts in return.
+
+  * If you write the code, chances are bigger that it will get into curl
+    faster.
+
+  1.5 Who makes cURL?
+
+  cURL and libcurl are not made by any single individual. Sure, Daniel
+  Stenberg writes the major parts, but other persons' submissions are
+  important and crucial. Anyone can contribute and post their changes and
+  improvements and have them inserted in the main sources (of course on the
+  condition that developers agree on that the fixes are good).
+
+  The list of contributors in the docs/THANKS file is only a small part of all
+  the people that every day provide us with bug reports, suggestions, ideas
+  and source code.
+
+  curl is developed by a community, with Daniel at the wheel.
+
+  1.6 What do you get for making cURL?
+
+  Project cURL is entirely free and open. No person gets paid for developing
+  curl. We do this voluntarily on our spare time.
+
+  We get some help from companies. Contactor Data hosts the curl web site,
+  Haxx owns the curl web site's domain and sourceforge.net hosts several
+  project services we take advantage from, like the bug tracker, mailing lists
+  and more.
+
+  If you want to support our project with a donation or similar, one way of
+  doing that would be to buy "gift certificates" at useful online shopping
+  sites, such as amazon.com or thinkgeek.com. Another way would be to sponsor
+  us through a banner-program or even better: by helping us coding,
+  documenting, testing etc. You're welcome to send us a buck using paypal, as
+  described here: http://curl.haxx.se/donation.html
+
+  1.7 What about CURL from curl.com?
+
+  During the summer 2001, curl.com was busy advertising their client-side
+  programming language for the web, named CURL.
+
+  We are in no way associated with curl.com or their CURL programming
+  language. 
+
+  Our project name curl has been in effective use since 1998. We were not the
+  first computer related project to use the name "curl" and do not claim any
+  first-hand rights to the name.
+
+  We recognize that we will be living in parallel with curl.com and wish them
+  every success.
+
+  1.8 I have a problem who do I mail?
+
+  Please do not mail any single individual unless you really need to. Keep
+  curl-related questions on a suitable mailing list. All available mailing
+  lists are listed in the MANUAL document and online at
+  http://curl.haxx.se/mail/
+
+  Keeping curl-related questions and discussions on mailing lists allows
+  others to join in and help, to share their ideas, contribute their
+  suggestions and spread their wisdom. Keeping discussions on public mailing
+  lists also allows for others to learn from this (both current and future
+  users thanks to the web based archives of the mailing lists), thus saving us
+  from having to repeat ourselves even more. Thanks for respecting this.
+
+
+2. Install Related Problems
+
+  2.1. configure doesn't find OpenSSL even when it is installed
+
+  This may be because of several reasons.
+
+    2.1.1. native linker doesn't find openssl
+
+    Affected platforms:
+      Solaris (native cc compiler)
+      HPUX (native cc compiler)
+      SGI IRIX (native cc compiler)
+      SCO UNIX (native cc compiler)
+
+    When configuring curl, I specify --with-ssl. OpenSSL is installed in
+    /usr/local/ssl Configure reports SSL in /usr/local/ssl, but fails to find
+    CRYPTO_lock in -lcrypto
+
+    Cause: The cc for this test places the -L/usr/local/ssl/lib AFTER
+    -lcrypto, so ld can't find the library. This is due to a bug in the GNU
+    autoconf tool.
+
+    Workaround: Specifying "LDFLAGS=-L/usr/local/ssl/lib" in front of
+    ./configure places the -L/usr/local/ssl/lib early enough in the command
+    line to make things work
+
+    Solution submitted by: Bob Allison <allisonb@users.sourceforge.net>
+
+    2.1.2. only the libssl lib is missing
+
+    If all include files and the libcrypto lib is present, with only the
+    libssl being missing according to configure, this is mostly likely because
+    a few functions are left out from the libssl.
+
+    If the function names missing include RSA or RSAREF you can be certain
+    that this is because libssl requires the RSA and RSAREF libs to build.
+
+    See the INSTALL file section that explains how to add those libs to
+    configure. Make sure that you remove the config.cache file before you
+    rerun configure with the new flags.
+
+  2.2. Does curl work/build with other SSL libraries?
+
+  Curl has been written to use OpenSSL, although there should not be much
+  problems using a different library. If anyone does "port" curl to use a
+  different SSL library, we are of course very interested in getting the
+  patch!
+
+  2.3. Where can I find a copy of LIBEAY32.DLL?
+
+  That is an OpenSSL binary built for Windows.
+
+  Curl uses OpenSSL to do the SSL stuff. The LIBEAY32.DLL is what curl needs
+  on a windows machine to do https://. Check out the curl web site to find
+  accurate and up-to-date pointers to recent OpenSSL DLLs and other binary
+  packages.
+
+  2.4. Does cURL support Socks (RFC 1928) ?
+
+  There is limited support for SOCKS5 for curl built with IPv6 support
+  disabled.
+
+
+3. Usage problems
+
+  3.1. curl: (1) SSL is disabled, https: not supported
+
+  If you get this output when trying to get anything from a https:// server,
+  it means that the configure script couldn't find all libs and include files
+  it requires for SSL to work. If the configure script fails to find them,
+  curl is simply built without SSL support.
+
+  To get the https:// support into a curl that was previously built but that
+  reports that https:// is not supported, you should dig through the document
+  and logs and check out why the configure script doesn't find the SSL libs
+  and/or include files.
+
+  Also, check out the other paragraph in this FAQ labeled "configure doesn't
+  find OpenSSL even when it is installed".
+
+  3.2. How do I tell curl to resume a transfer?
+
+  Curl supports resumed transfers both ways on both FTP and HTTP.
+
+  Try the -C option.
+
+  3.3. Why doesn't my posting using -F work?
+
+  You can't simply use -F or -d at your choice. The web server that will
+  receive your post assumes one of the formats. If the form you're trying to
+  "fake" sets the type to 'multipart/form-data', then and only then you must
+  use the -F type. In all the most common cases, you should use -d which then
+  causes a posting with the type 'application/x-www-form-urlencoded'.
+
+  This is described in some detail in the MANUAL and TheArtOfHttpScripting
+  documents, and if you don't understand it the first time, read it again
+  before you post questions about this to the mailing list. Also, try reading
+  through the mailing list archives for old postings and questions regarding
+  this.
+
+  3.4. How do I tell curl to run custom FTP commands?
+
+  You can tell curl to perform optional commands both before and/or after a
+  file transfer. Study the -Q/--quote option.
+
+  Since curl is used for file transfers, you don't use curl to just perform
+  FTP commands without transferring anything. Therefore you must always specify
+  a URL to transfer to/from even when doing custom FTP commands.
+
+  3.5. How can I disable the Pragma: nocache header?
+
+  You can change all internally generated headers by adding a replacement with
+  the -H/--header option. By adding a header with empty contents you safely
+  disable that one. Use -H "Pragma:" to disable that specific header.
+
+  3.6. Does curl support ASP, XML, XHTML or HTML version Y?
+
+  To curl, all contents are alike. It doesn't matter how the page was
+  generated. It may be ASP, PHP, Perl, shell-script, SSI or plain
+  HTML-files. There's no difference to curl and it doesn't even know what kind
+  of language that generated the page.
+
+  See also item 3.14 regarding javascript.
+
+  3.7. Can I use curl to delete/rename a file through FTP?
+
+  Yes. You specify custom FTP commands with -Q/--quote.
+
+  One example would be to delete a file after you have downloaded it:
+
+     curl -O ftp://download.com/coolfile -Q '-DELE coolfile'
+
+  3.8 How do I tell curl to follow HTTP redirects?
+
+  Curl does not follow so-called redirects by default. The Location: header
+  that informs the client about this is only interpreted if you're using the
+  -L/--location option. As in:
+
+     curl -L http://redirector.com
+
+  3.9 How do I use curl in my favorite programming language?
+
+  There exist many language interfaces/bindings for curl that integrates it
+  better with various languages. If you are fluid in a script language, you
+  may very well opt to use such an interface instead of using the command line
+  tool.
+
+  Find out more about which languages that support curl directly, and how to
+  install and use them, in the libcurl section of the curl web site:
+
+        http://curl.haxx.se/libcurl/
+
+  In February 2003, there are interfaces available for the following
+  languages: Basic, C, C++, Cocoa, Dylan, Euphoria, Java, Lua, Object-Pascal,
+  Pascal, Perl, PHP, PostgreSQL, Python, Rexx, Ruby, Scheme and Tcl. By the
+  time you read this, additional ones may have appeared!
+
+  3.10 What about SOAP, WebDAV, XML-RPC or similar protocols over HTTP?
+
+  Curl adheres to the HTTP spec, which basically means you can play with *any*
+  protocol that is built on top of HTTP. Protocols such as SOAP, WEBDAV and
+  XML-RPC are all such ones. You can use -X to set custom requests and -H to
+  set custom headers (or replace internally generated ones).
+
+  Using libcurl is of course just as fine and you'd just use the proper
+  library options to do the same.
+
+  3.11 How do I POST with a different Content-Type?
+
+  You can always replace the internally generated headers with -H/--header.
+  To make a simple HTTP POST with text/xml as content-type, do something like:
+
+        curl -d "datatopost" -H "Content-Type: text/xml" [URL]
+
+  3.12 Why do FTP specific features over HTTP proxy fail?
+
+  Because when you use a HTTP proxy, the protocol spoken on the network will
+  be HTTP, even if you specify a FTP URL. This effectively means that you
+  normally can't use FTP specific features such as FTP upload and FTP quote
+  etc.
+
+  There is one exception to this rule, and that is if you can "tunnel through"
+  the given HTTP proxy. Proxy tunneling is enabled with a special option (-p)
+  and is generally not available as proxy admins usually disable tunneling to
+  other ports than 443 (which is used for HTTPS access through proxies).
+
+  3.13 Why does my single/double quotes fail?
+
+  To specify a command line option that includes spaces, you might need to
+  put the entire option within quotes. Like in:
+
+   curl -d " with spaces " url.com
+  
+  or perhaps
+
+   curl -d ' with spaces ' url.com
+
+  Exactly what kind of quotes and how to do this is entirely up to the shell
+  or command line interpreter that you are using. For most unix shells, you
+  can more or less pick either single (') or double (") quotes. For
+  Windows/DOS prompts I believe you're forced to use double (") quotes.
+
+  Please study the documentation for your particular environment. Examples in
+  the curl docs will use a mix of both these ones as shown above. You must
+  adjust them to work in your environment.
+
+  Remember that curl works and runs on more operating systems than most single
+  individuals have ever tried.
+
+  3.14 Does curl support javascript or pac (automated proxy config)?
+
+  Many web pages do magic stuff using embedded javascript. Curl and libcurl
+  have no built-in support for that, so it will be treated just like any other
+  contents.
+
+  .pac files are a netscape invention and are sometimes used by organizations
+  to allow them to differentiate which proxies to use. The .pac contents is
+  just a javascript program that gets invoked by the browser and that returns
+  the name of the proxy to connect to. Since curl doesn't support javascript,
+  it can't support .pac proxy configuration either.
+
+  Some work-arounds usually suggested to overcome this javascript dependency:
+
+    - Depending on the javascript complexity, write up a script that
+      translates it to another language and execute that.
+
+    - Read the javascript code and rewrite the same logic in another language.
+
+    - Implement a javascript interpreted, people have successfully used the
+      Mozilla javascript engine in the past.
+
+    - Ask your admins to stop this, for a static proxy setup or similar.
+
+
+4. Running Problems
+
+  4.1. Problems connecting to SSL servers.
+
+  It took a very long time before we could sort out why curl had problems to
+  connect to certain SSL servers when using SSLeay or OpenSSL v0.9+.  The
+  error sometimes showed up similar to:
+
+  16570:error:1407D071:SSL routines:SSL2_READ:bad mac decode:s2_pkt.c:233:
+
+  It turned out to be because many older SSL servers don't deal with SSLv3
+  requests properly. To correct this problem, tell curl to select SSLv2 from
+  the command line (-2/--sslv2).
+
+  There has also been examples where the remote server didn't like the SSLv2
+  request and instead you had to force curl to use SSLv3 with -3/--sslv3.
+
+  4.2. Why do I get problems when I use & or % in the URL?
+
+  In general unix shells, the & letter is treated special and when used, it
+  runs the specified command in the background. To safely send the & as a part
+  of a URL, you should quote the entire URL by using single (') or double (")
+  quotes around it.
+
+  An example that would invoke a remote CGI that uses &-letters could be:
+
+     curl 'http://www.altavista.com/cgi-bin/query?text=yes&q=curl'
+
+  In Windows, the standard DOS shell treats the %-letter specially and you
+  need to use TWO %-letters for each single one you want to use in the URL.
+
+  Also note that if you want the literal %-letter to be part of the data you
+  pass in a POST using -d/--data you must encode it as '%25' (which then also
+  needs the %-letter doubled on Windows machines).
+
+  4.3. How can I use {, }, [ or ] to specify multiple URLs?
+
+  Because those letters have a special meaning to the shell, and to be used in
+  a URL specified to curl you must quote them.
+
+  An example that downloads two URLs (sequentially) would do:
+
+    curl '{curl,www}.haxx.se'
+
+  To be able to use those letters as actual parts of the URL (without using
+  them for the curl URL "globbing" system), use the -g/--globoff option:
+
+    curl -g 'www.site.com/weirdname[].html'
+
+  4.4. Why do I get downloaded data even though the web page doesn't exist?
+
+  Curl asks remote servers for the page you specify. If the page doesn't exist
+  at the server, the HTTP protocol defines how the server should respond and
+  that means that headers and a "page" will be returned. That's simply how
+  HTTP works.
+
+  By using the --fail option you can tell curl explicitly to not get any data
+  if the HTTP return code doesn't say success.
+
+  4.5 Why do I get return code XXX from a HTTP server?
+
+  RFC2616 clearly explains the return codes. This is a short transcript. Go
+  read the RFC for exact details:
+
+    4.5.1 "400 Bad Request"
+
+    The request could not be understood by the server due to malformed
+    syntax. The client SHOULD NOT repeat the request without modifications.
+
+    4.5.2 "401 Unauthorized"
+
+    The request requires user authentication.
+
+    4.5.3 "403 Forbidden"
+
+    The server understood the request, but is refusing to fulfill it.
+    Authorization will not help and the request SHOULD NOT be repeated.
+
+    4.5.4 "404 Not Found"
+
+    The server has not found anything matching the Request-URI. No indication
+    is given of whether the condition is temporary or permanent.
+
+    4.5.5 "405 Method Not Allowed"
+
+    The method specified in the Request-Line is not allowed for the resource
+    identified by the Request-URI. The response MUST include an Allow header
+    containing a list of valid methods for the requested resource.
+
+    4.5.6 "301 Moved Permanently"
+ 
+    If you get this return code and an HTML output similar to this:
+
+       <H1>Moved Permanently</H1> The document has moved <A
+       HREF="http://same_url_now_with_a_trailing_slash/">here</A>.
+
+    it might be because you request a directory URL but without the trailing
+    slash. Try the same operation again _with_ the trailing URL, or use the
+    -L/--location option to follow the redirection.
+
+  4.6. Can you tell me what error code 142 means?
+
+  All error codes that are larger than the highest documented error code means
+  that curl has exited due to a crash. This is a serious error, and we
+  appreciate a detailed bug report from you that describes how we could go
+  ahead and repeat this!
+
+  4.7. How do I keep user names and passwords secret in Curl command lines?
+
+  This problem has two sides:
+
+  The first part is to avoid having clear-text passwords in the command line
+  so that they don't appear in 'ps' outputs and similar. That is easily
+  avoided by using the "-K" option to tell curl to read parameters from a
+  file or stdin to which you can pass the secret info.
+
+  To keep the passwords in your account secret from the rest of the world is
+  not a task that curl addresses. You could of course encrypt them somehow to
+  at least hide them from being read by human eyes, but that is not what
+  anyone would call security.
+
+  Also note that regular HTTP and FTP passwords are sent in clear across the
+  network. All it takes for anyone to fetch them is to listen on the network.
+  Eavesdropping is very easy.
+
+  4.8 I found a bug!
+
+  It is not a bug if the behavior is documented. Read the docs first.
+
+  If it is a problem with a binary you've downloaded or a package for your
+  particular platform, try contacting the person who built the package/archive
+  you have.
+
+  If there is a bug, read the BUGS document first. Then report it as described
+  in there.
+
+  4.9. Curl can't authenticate to the server that requires NTLM?
+
+  NTLM is a Microsoft proprietary protocol. Unfortunately, curl does not
+  currently support that. Proprietary formats are evil. You should not use
+  such ones.
+
+  4.10 My HTTP request using HEAD, PUT or DELETE doesn't work!
+
+  Many web servers allow or demand that the administrator configures the
+  server properly for these requests to work on the web server.
+
+  Some servers seem to support HEAD only on certain kinds of URLs.
+
+  To fully grasp this, try the documentation for the particular server
+  software you're trying to interact with. This is not anything curl can do
+  anything about.
+
+  4.11 Why does my HTTP range requests return the full document?
+
+  Because the range may not be supported by the server, or the server may
+  choose to ignore it and return the full document anyway.
+
+  4.12 Why do I get "certificate verify failed" ?
+
+  You invoke curl 7.10 or later to communicate on a https:// URL and get an
+  error back looking something similar to this:
+
+      curl: (35) SSL: error:14090086:SSL routines: 
+      SSL3_GET_SERVER_CERTIFICATE:certificate verify failed
+
+  Then it means that curl couldn't verify that the server's certificate was
+  good. Curl verifies the certificate using the CA cert bundle that comes with
+  the curl installation.
+
+  To disable the verification (which makes it act like curl did before 7.10),
+  use -k. This does however enable man-in-the-middle attacks.
+
+  If you get this failure but are having a CA cert bundle installed and used,
+  the server's certificate is not signed by one of the CA's in the bundle. It
+  might for example be self-signed. You then correct this problem by obtaining
+  a valid CA cert for the server. Or again, decrease the security by disabling
+  this check.
+
+  Details are also in the SSLCERTS file in the release archives, found online
+  here: http://curl.haxx.se/docs/sslcerts.html
+
+5. libcurl Issues
+
+  5.1. Is libcurl thread-safe?
+
+  Yes.
+
+  We have written the libcurl code specificly adjusted for multi-threaded
+  programs. libcurl will use thread-safe functions instead of non-safe ones if
+  your system has such.
+
+  We would appreciate some kind of report or README file from those who have
+  used libcurl in a threaded environment.
+
+  5.2 How can I receive all data into a large memory chunk?
+
+  [ See also the examples/getinmemory.c source ]
+
+  You are in full control of the callback function that gets called every time
+  there is data received from the remote server. You can make that callback do
+  whatever you want. You do not have to write the received data to a file.
+
+  One solution to this problem could be to have a pointer to a struct that you
+  pass to the callback function. You set the pointer using the
+  curl_easy_setopt(CURLOPT_FILE) function. Then that pointer will be passed to
+  the callback instead of a FILE * to a file:
+
+        /* imaginary struct */
+        struct MemoryStruct {
+          char *memory;
+          size_t size;
+        };
+
+        /* imaginary callback function */
+        size_t
+        WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data)
+        {
+          register int realsize = size * nmemb;
+          struct MemoryStruct *mem = (struct MemoryStruct *)data;
+        
+          mem->memory = (char *)realloc(mem->memory, mem->size + realsize + 1);
+          if (mem->memory) {
+            memcpy(&(mem->memory[mem->size]), ptr, realsize);
+            mem->size += realsize;
+            mem->memory[mem->size] = 0;
+          }
+          return realsize;
+        }
+
+  5.3 How do I fetch multiple files with libcurl?
+
+  libcurl has excellent support for transferring multiple files. You should
+  just repeatedly set new URLs with curl_easy_setopt() and then transfer it
+  with curl_easy_perform(). The handle you get from curl_easy_init() is not
+  only reusable, but you're even encouraged to reuse it if you can, as that
+  will enable libcurl to use persistent connections.
+
+  5.4 Does libcurl do Winsock initialization on win32 systems?
+
+  Yes, if told to in the curl_global_init() call.
+
+  5.5 Does CURLOPT_FILE and CURLOPT_INFILE work on win32 ?
+
+  Yes, but you cannot open a FILE * and pass the pointer to a DLL and have
+  that DLL use the FILE *. If you set CURLOPT_FILE you must also use
+  CURLOPT_WRITEFUNCTION as well to set a function that writes the file, even
+  if that simply writes the data to the specified FILE*. Similarly, if you use
+  CURLOPT_INFILE you must also specify CURLOPT_READFUNCTION.
+
+  (Provided by Joel DeYoung and Bob Schader)
+
+  5.6 What about Keep-Alive or persistent connections?
+
+  curl and libcurl have excellent support for persistent connections when
+  transferring several files from the same server.  Curl will attempt to reuse
+  connections for all URLs specified on the same command line/config file, and
+  libcurl will reuse connections for all transfers that are made using the
+  same libcurl handle.
+
+  5.7 Link errors when building libcurl on Windows!
+
+  You need to make sure that your project, and all the libraries (both static
+  and dynamic) that it links against, are compiled/linked against the same run
+  time library.
+
+  This is determined by the /MD, /ML, /MT (and their corresponding /M?d)
+  options to the command line compiler. /MD (linking against MSVCRT dll) seems
+  to be the most commonly used option.
+
+  (Provided by Andrew Francis)
+
+
+6. License Issues
+
+  Curl and libcurl are released under a MIT/X derivate license. The license is
+  very liberal and should not impose a problem for your project. This section
+  is just a brief summary for the cases we get the most questions. (Parts of
+  this section was much enhanced by Bjorn Reese.)
+
+  6.1. I have a GPL program, can I use the libcurl library?
+
+  Yes!
+
+  Since libcurl may be distributed under the MIT/X derivate license, it can be
+  used together with GPL in any software.
+
+  6.2. I have a closed-source program, can I use the libcurl library?
+
+  Yes!
+
+  libcurl does not put any restrictions on the program that uses the library.
+
+  6.3. I have a BSD licensed program, can I use the libcurl library?
+
+  Yes!
+
+  libcurl does not put any restrictions on the program that uses the library.
+
+  6.4. I have a program that uses LGPL libraries, can I use libcurl?
+
+  Yes!
+
+  The LGPL license doesn't clash with other licenses.
+
+  6.5. Can I modify curl/libcurl for my program and keep the changes secret?
+
+  Yes!
+
+  The MIT/X derivate license practically allows you to do almost anything with
+  the sources, on the condition that the copyright texts in the sources are
+  left intact.
+
+  6.6. Can you please change the curl/libcurl license to XXXX?
+
+  No.
+
+  We have carefully picked this license after years of development and
+  discussions and a large amount of people have contributed with source code
+  knowing that this is the license we use. This license puts the restrictions
+  we want on curl/libcurl and it does not spread to other programs or
+  libraries that use it. The recent dual license modification should make it
+  possible for everyone to use libcurl or curl in their projects, no matter
+  what license they already have in use.
diff --git a/main/source/curl/docs/FEATURES b/main/source/curl/docs/FEATURES
new file mode 100644
index 00000000..853a3463
--- /dev/null
+++ b/main/source/curl/docs/FEATURES
@@ -0,0 +1,94 @@
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+FEATURES
+
+Misc
+ - full URL syntax
+ - custom maximum download time
+ - custom least download speed acceptable
+ - custom output result after completion
+ - multiple URLs
+ - guesses protocol from host name unless specified
+ - uses .netrc
+ - progress bar/time specs while downloading
+ - "standard" proxy environment variables support
+ - config file support
+ - compiles on win32 (reported built on 29 operating systems)
+ - redirectable stderr
+ - use selected network interface for outgoing traffic
+ - IPv6 support
+ - persistant connections
+
+HTTP
+ - HTTP/1.1 compliant
+ - GET
+ - PUT
+ - HEAD
+ - POST
+ - multipart POST
+ - authentication
+ - resume (both GET and PUT)
+ - follow redirects
+ - maximum amount of redirects to follow
+ - custom HTTP request
+ - cookie get/send fully parsed
+ - understands the netscape cookie file format
+ - custom headers (that can replace/remove internally generated headers)
+ - custom user-agent string
+ - custom referer string
+ - range
+ - proxy authentication
+ - time conditions
+ - via http-proxy
+ - retrieve file modification date
+
+HTTPS (*1)
+ - (all the HTTP features)
+ - using certificates
+ - verify server certificate
+ - via http-proxy
+
+FTP
+ - download
+ - authentication
+ - kerberos security
+ - active/passive using PORT, EPRT, PASV or EPSV
+ - single file size information (compare to HTTP HEAD)
+ - 'type=' URL support
+ - dir listing
+ - dir listing names-only
+ - upload
+ - upload append
+ - upload via http-proxy as HTTP PUT
+ - download resume
+ - upload resume
+ - custom ftp commands (before and/or after the transfer)
+ - simple "range" support
+ - via http-proxy
+ - all operations can be tunneled through a http-proxy
+ - customizable to retrieve file modification date
+
+TELNET
+ - connection negotiation
+ - custom telnet options
+ - stdin/stdout I/O
+
+LDAP (*2)
+ - full LDAP URL support
+
+DICT
+ - extended DICT URL support
+
+GOPHER
+ - GET
+ - via http-proxy
+
+FILE
+ - URL support
+
+        *1 = requires OpenSSL
+        *2 = requires OpenLDAP
diff --git a/main/source/curl/docs/HISTORY b/main/source/curl/docs/HISTORY
new file mode 100644
index 00000000..839da30c
--- /dev/null
+++ b/main/source/curl/docs/HISTORY
@@ -0,0 +1,116 @@
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+                          How cURL Became Like This
+
+
+In the second half of 1997, Daniel Stenberg came up with the idea to make
+currency-exchange calculations available to Internet Relay Chat (IRC)
+users. All the necessary data are published on the Web; he just needed to
+automate their retrieval.
+
+Daniel simply adopted an existing command-line open-source tool, httpget, that
+Brazilian Rafael Sagula had written. After a few minor adjustments, it did
+just what he needed.
+
+Soon, he found currencies on a GOPHER site, so support for that had to go in,
+and not before long FTP download support was added as well. The name of the
+project was changed to urlget to better fit what it actually did now, since
+the http-only days were already passed.
+
+The project slowly grew bigger. When upload capabilities were added and the
+name once again was misleading, a second name change was made and on March 20,
+1998 curl 4 was released. (The version numbering from the previous names were
+kept.)
+
+(Unrelated to this project a company called Curl Corporation filed a US
+trademark on the name "CURL" on May 18 1998. That company had then already
+registered the curl.com domain back in November of the previous year. All this
+was much later brought into the lights.)
+
+SSL support was added, powered by the SSLeay library.
+
+August 1998, added project curl to freshmeat.net.
+
+October 1998, with the curl 4.9 release and the introduction of cookie
+support, curl was no longer released under the GPL license. Now we're at 4000
+lines of code, we switched over to the MPL license to restrict the effects of
+"copyleft".
+
+November 1998, configure script and reported successful compiles on several
+major operating systems. The never-quite-understood -F option was added and
+curl could now simulate quite a lot of a browser.
+
+Curl 5 was released in December 1998 and introduced the first ever curl man
+page. People started making Linux RPM packages out of it.
+
+January 1999, DICT support added.
+
+OpenSSL took over where SSLeay was abandoned.
+
+May 1999, first Debian package.
+
+August 1999, LDAP:// and FILE:// support added. The curl web site gets 1300
+visits weekly.
+
+Released curl 6.0 in September. 15000 lines of code.
+
+December 28 1999, added the project on Sourceforge and started using its
+services for managing the project.
+
+Spring 2000, major internal overhaul to provide a suitable library interface.
+The first non-beta release was named 7.1 and arrived in August. This offered
+the easy interface and turned out to be the beginning of actually getting
+other software and programs to get based on and powered by libcurl. Almost
+20000 lines of code.
+
+August 2000, the curl web site gets 4000 visits weekly.
+
+The PHP guys adopted libcurl already the same month, when the first ever third
+party libcurl binding showed up. CURL has been a supported module in PHP since
+the release of PHP 4.0.2. This would soon get followers. More than 16
+different bindings exist at the time of this writing.
+
+September 2000, kerberos4 support was added.
+
+In November 2000 started the work on a test suite for curl. It was later
+re-written from scratch again.
+
+January 2001, Daniel released curl 7.5.2 under a new license again: MIT (or
+MPL). The MIT license is extremely liberal and can be used combined with GPL
+in other projects. This would finally put an end to the "complaints" from
+people involved in GPLed projects that previously were prohibited from using
+libcurl while it was released under MPL only. (Due to the fact that MPL is
+deemed "GPL incompatible".)
+
+curl supports HTTP 1.1 starting with the release of 7.7, March 22 2001. This
+also introduced libcurl's ability to do persistent connections. 24000 lines of
+code.
+
+August 2001. curl is bundled in Mac OS X, 10.1. It was already becoming more
+and more of a standard utility of Linux distributions and a regular in the BSD
+ports collections. The curl web site gets 8000 visits weekly. Curl Corporation
+contacted Daniel to discuss "the name issue". After Daniel's reply, they have
+never since got in touch again.
+
+September 2001, libcurl 7.9 introduces cookie jar and curl_formadd(). During
+the forthcoming 7.9.x releases, we introduced the multi interface slowly and
+without much whistles.
+
+June 2002, the curl web site gets 13000 visits weekly. curl and libcurl is
+35000 lines of code. Reported successful compiles on more than 40 combinations
+of CPUs and operating systems.
+
+To estimate number of users of the curl tool or libcurl library is next to
+impossible. Around 5000 downloaded packages each week from the main site gives
+a hint, but the packages are mirrored extensively, bundled with numerous OS
+distributions and otherwise retrieved as part of other software.
+
+September 2002, with the release of curl 7.10 it is released under the MIT
+license only.
+
+February 2003, the curl site averages at 20000 visits weekly. At any given
+moment, there's an average of 3 people browsing the curl.haxx.se site.
diff --git a/main/source/curl/docs/INSTALL b/main/source/curl/docs/INSTALL
new file mode 100644
index 00000000..6045ca80
--- /dev/null
+++ b/main/source/curl/docs/INSTALL
@@ -0,0 +1,495 @@
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+                                How To Compile
+
+Curl has been compiled and built on numerous different operating systems.
+
+Most systems build curl the same way (unix-style). Continue reading below for
+more details if you're one of them.
+
+If you're using Windows (95/98/NT/ME/2000/XP or similar), VMS, RISC OS or OS/2
+or cross-compile, you should continue reading from one the paragraphs further
+down.
+
+UNIX
+====
+
+   A normal unix installation is made in three or four steps (after you've
+   unpacked the source archive):
+
+        ./configure
+        make
+        make test (optional)
+        make install
+
+   You probably need to be root when doing the last command.
+
+   If you have checked out the sources from the CVS repository, read the
+   CVS-INFO on how to proceed.
+
+   Get a full listing of all available configure options by invoking it like:
+
+        ./configure --help
+
+   If you want to install curl in a different file hierarchy than /usr/local,
+   you need to specify that already when running configure:
+
+        ./configure --prefix=/path/to/curl/tree
+
+   If you happen to have write permission in that directory, you can do 'make
+   install' without being root. An example of this would be to make a local
+   install in your own home directory:
+
+        ./configure --prefix=$HOME
+        make
+        make install
+
+   The configure script always tries to find a working SSL library unless
+   explicitly told not to. If you have OpenSSL installed in the default search
+   path for your compiler/linker, you don't need to do anything special. If
+   you have OpenSSL installed in /usr/local/ssl, you can run configure like:
+
+	./configure --with-ssl
+
+   If you have OpenSSL installed somewhere else (for example, /opt/OpenSSL,)
+   you can run configure like this:
+
+	./configure --with-ssl=/opt/OpenSSL
+
+   If you insist on forcing a build without SSL support, even though you may
+   have OpenSSL installed in your system, you can run configure like this:
+
+        ./configure --without-ssl
+
+   If you have OpenSSL installed, but with the libraries in one place and the
+   header files somewhere else, you have to set the LDFLAGS and CPPFLAGS
+   environment variables prior to running configure.  Something like this
+   should work:
+
+     (with the Bourne shell and its clones):
+
+       CPPFLAGS="-I/path/to/ssl/include" LDFLAGS="-L/path/to/ssl/lib" \
+           ./configure
+
+     (with csh, tcsh and their clones):
+     
+       env CPPFLAGS="-I/path/to/ssl/include" LDFLAGS="-L/path/to/ssl/lib" \
+       ./configure
+
+   If your SSL library was compiled with rsaref (usually for use in the United
+   States), you may also need to set:
+
+     LIBS=-lRSAglue -lrsaref
+     (as suggested by Doug Kaufman)
+
+   MORE OPTIONS
+
+     To force configure to use the standard cc compiler if both cc and gcc are
+     present, run configure like
+
+       CC=cc ./configure
+         or
+       env Cc=cc ./configure
+
+     To force a static library compile, disable the shared library creation
+     by running configure like:
+
+       ./configure --disable-shared
+
+     To tell the configure script to skip searching for thread-safe functions,
+     add an option like:
+
+       ./configure --disable-thread
+
+     To build curl with kerberos4 support enabled, curl requires the krb4 libs
+     and headers installed. You can then use a set of options to tell
+     configure where those are:
+
+          --with-krb4-includes[=DIR]   Specify location of kerberos4 headers
+          --with-krb4-libs[=DIR]       Specify location of kerberos4 libs
+          --with-krb4[=DIR]            where to look for Kerberos4
+
+     In most cases, /usr/athena is the install prefix and then it works with
+
+       ./configure --with-krb4=/usr/athena
+
+     If you're a curl developer and use gcc, you might want to enable more
+     debug options with the --enable-debug option.
+
+Win32
+=====
+ 
+   Without SSL:
+
+      MingW32 (GCC-2.95) style
+      ------------------------
+        Run the 'mingw32.bat' file to get the proper environment variables
+        set, then run 'make mingw32' in the root dir.
+
+        If you have any problems linking libraries or finding header files, be
+        sure to verify that the provided "Makefile.m32" files use the proper
+        paths, and adjust as necessary.
+
+      Cygwin style
+      ------------
+        Almost identical to the unix installation. Run the configure script in
+        the curl root with 'sh configure'. Make sure you have the sh
+        executable in /bin/ or you'll see the configure fail towards the end.
+
+        Run 'make'
+
+      Microsoft command line style
+      ----------------------------
+        Run the 'vcvars32.bat' file to get the proper environment variables
+        set, then run 'nmake vc' in the root dir.
+
+        The vcvars32.bat file is part of the Microsoft development
+        environment.
+
+      IDE-style
+      -------------------------
+        If you use VC++, Borland or similar compilers. Include all lib source
+        files in a static lib "project" (all .c and .h files that is).
+        (you should name it libcurl or similar)
+
+        Make the sources in the src/ drawer be a "win32 console application"
+        project. Name it curl.
+
+        With VC++, add 'ws2_32.lib' to the link libs when you build curl!
+        Borland seems to do that itself magically. Of course you have to make
+        sure it links with the libcurl too!
+
+        For VC++ 6, there's an included Makefile.vc6 that should be possible
+        to use out-of-the-box.
+
+        Microsoft note: add /Zm200 to the compiler options to increase the
+        compiler's memory allocation limit, as the hugehelp.c won't compile
+        due to "too long puts string".
+
+
+   With SSL:
+
+      MingW32 (GCC-2.95) style
+      ------------------------
+        Run the 'mingw32.bat' file to get the proper environment variables
+        set, then run 'make mingw32-ssl' in the root dir.
+
+        If you have any problems linking libraries or finding header files, be
+        sure to look at the provided "Makefile.m32" files for the proper
+        paths, and adjust as necessary.
+
+      Cygwin style
+      ------------
+        Haven't done, nor got any reports on how to do. It should although be
+        identical to the unix setup for the same purpose. See above.
+
+      Microsoft command line style
+      ----------------------------
+
+        Please read the OpenSSL documentation on how to compile and install
+        the OpenSSL libraries.  The build process of OpenSSL generates the
+        libeay32.dll and ssleay32.dll files in the out32dll subdirectory in
+        the OpenSSL home directory.  OpenSSL static libraries (libeay32.lib,
+        ssleay32.lib, RSAglue.lib) are created in the out32 subdirectory.
+
+        Run the 'vcvars32.bat' file to get a proper environment. The
+        vcvars32.bat file is part of the Microsoft development environment and
+        you may find it in 'C:\Program Files\Microsoft Visual Studio\vc98\bin'
+        provided that you installed Visual C/C++ 6 in the default directory.
+
+        Before running nmake define the OPENSSL_PATH environment variable with
+        the root/base directory of OpenSSL, for example:
+
+          set OPENSSL_PATH=c:\openssl-0.9.6b
+
+        Then run 'nmake vc-ssl' or 'nmake vc-ssl-dll' in curl's root
+        directory.  'nmake vc-ssl' will create a libcurl static and dynamic
+        libraries in the lib subdirectory, as well as a statically linked
+        version of curl.exe in the src subdirectory.  This statically linked
+        version is a standalone executable not requiring any DLL at
+        runtime. This make method requires that you have the static OpenSSL
+        libraries available in OpenSSL's out32 subdirectory.
+	'nmake vc-ssl-dll' creates the libcurl dynamic library and
+	links curl.exe against libcurl and OpenSSL dynamically.
+	This executable requires libcurl.dll and the OpenSSL DLLs
+	at runtime.
+
+      Microsoft / Borland style
+      -------------------------
+        If you have OpenSSL, and want curl to take advantage of it, edit your
+        project properties to use the SSL include path, link with the SSL libs
+        and define the USE_SSLEAY symbol.
+
+   Disabling Specific Protocols:
+
+      The configure utility, unfortunately, is not available for the Windows
+      environment, therefore, you cannot use the various disable-protocol
+      options of the configure utility on this platform.
+
+      However, you can use the following defines to disable specific
+      protocols:
+
+      HTTP_ONLY             disables all protocols except HTTP
+      CURL_DISABLE_FTP      disables FTP
+      CURL_DISABLE_LDAP     disables LDAP
+      CURL_DISABLE_TELNET   disables TELNET
+      CURL_DISABLE_DICT     disables DICT
+      CURL_DISABLE_FILE     disables FILE
+      CURL_DISABLE_GOPHER   disables GOPHER
+
+      If you want to set any of these defines you have the following
+      possibilities:
+
+      - Modify lib/setup.h
+      - Modify lib/Makefile.vc6
+      - Add defines to Project/Settings/C/C++/General/Preprocessor Definitions
+        in the curllib.dsw/curllib.dsp Visual C++ 6 IDE project.
+
+IBM OS/2
+========
+
+   Building under OS/2 is not much different from building under unix.
+   You need:
+
+      - emx 0.9d
+      - GNU make
+      - GNU patch
+      - ksh
+      - GNU bison
+      - GNU file utilities
+      - GNU sed
+      - autoconf 2.13
+
+   If you want to build with OpenSSL or OpenLDAP support, you'll need to
+   download those libraries, too. Dirk Ohme has done some work to port SSL
+   libraries under OS/2, but it looks like he doesn't care about emx.  You'll
+   find his patches on: http://come.to/Dirk_Ohme
+
+   If during the linking you get an error about _errno being an undefined
+   symbol referenced from the text segment, you need to add -D__ST_MT_ERRNO__
+   in your definitions.
+
+   If everything seems to work fine but there's no curl.exe, you need to add
+   -Zexe to your linker flags.
+
+   If you're getting huge binaries, probably your makefiles have the -g in
+   CFLAGS.
+
+VMS
+===
+   (The VMS section is in whole contributed by the friendly Nico Baggus)
+
+   This is the first attempt at porting cURL to VMS.
+
+   Curl seems to work with FTP & HTTP other protocols are not tested.  (the
+   perl http/ftp testing server supplied as testing too cannot work on VMS
+   because vms has no concept of fork(). [ I tried to give it a whack, but
+   thats of no use.
+
+   SSL stuff has not been ported.
+
+   Telnet has about the same issues as for Win32. When the changes for Win32
+   are clear maybe they'l work for VMS too. The basic problem is that select
+   ONLY works for sockets.
+
+   Marked instances of fopen/[f]stat that might become a problem, especially
+   for non stream files. In this regard, the files opened for writing will be
+   created stream/lf and will thus be safe. Just keep in mind that non-binary
+   read/wring from/to files will have a records size limit of 32767 bytes
+   imposed.
+
+   Stat to get the size of the files is again only safe for stream files &
+   fixed record files without implied CC.
+
+   -- My guess is that only allowing access to stream files is the quickest
+   way to get around the most issues. Therefore all files need to to be
+   checked to be sure they will be stream/lf before processing them.  This is
+   the easiest way out, I know. The reason for this is that code that needs to
+   report the filesize will become a pain in the ass otherwise.
+
+   Exit status.... Well we needed something done here,
+
+   VMS has a structured exist status:
+   | 3  |       2    |     1       |  0|
+   |1098|765432109876|5432109876543|210|
+   +----+------------+-------------+---+
+   |Ctrl|  Facility  | Error code  |sev|
+   +----+------------+-------------+---+
+
+   With the Ctrl-bits an application can tell if part or the whole message has
+   allready been printed from the program, DCL doesn't need to print it again.
+
+   Facility - basicaly the program ID. A code assigned to the program
+   the name can be fetched from external or internal message libraries
+   Errorcode - the errodes assigned by the application
+   Sev. - severity: Even = error, off = non error
+		0 = Warning
+		1 = Success
+		2 = Error
+		3 = Information
+		4 = Fatal 
+		<5-7> reserved.
+
+   This all presents itself with:
+   %<FACILITY>-<SeV>-<Errorname>, <Error message>
+
+   See also the src/curlmsg.msg file, it has the source for the messages In
+   src/main.c a section is devoted to message status values, the globalvalues
+   create symbols with certain values, referenced from a compiled message
+   file. Have all exit function use a exit status derived from a translation
+   table with the compiled message codes.
+
+   This was all compiled with:
+
+	Compaq C V6.2-003 on OpenVMS Alpha V7.1-1H2
+
+   So far for porting notes as of:
+   13-jul-2001
+   N. Baggus
+
+QNX
+===
+   (This section was graciously brought to us by David Bentham)
+
+   As QNX is targetted for resource constrained environments, the QNX headers
+   set conservative limits. This includes the FD_SETSIZE macro, set by default
+   to 32. Socket descriptors returned within the CURL library may exceed this,
+   resulting in memory faults/SIGSEGV crashes when passed into select(..)
+   calls using fd_set macros.
+
+   A good all-round solution to this is to override the default when building
+   libcurl, by overriding CFLAGS during configure, example
+   #  configure CFLAGS='-DFD_SETSIZE=64 -g -O2'
+
+CROSS COMPILE
+=============
+
+   (This section was graciously brought to us by Jim Duey, 23-oct-2001)
+
+   Download and unpack the cURL package.  Version should be 7.9.1 or later.
+
+   'cd' to the new directory. (ie. curl-7.9.1-pre4)
+
+   Set environment variables to point to the cross-compile toolchain and call
+   configure with any options you need.  Be sure and specify the '--host' and
+   '--build' parameters at configuration time.  The following script is an
+   example of cross-compiling for the IBM 405GP PowerPC processor using the
+   toolchain from MonteVista for Hardhat Linux.
+
+   (begin script)
+
+   #! /bin/sh
+
+   export PATH=$PATH:/opt/hardhat/devkit/ppc/405/bin
+   export CPPFLAGS="-I/opt/hardhat/devkit/ppc/405/target/usr/include"
+   export AR=ppc_405-ar
+   export AS=ppc_405-as
+   export LD=ppc_405-ld
+   export RANLIB=ppc_405-ranlib
+   export CC=ppc_405-gcc
+   export NM=ppc_405-nm
+
+   configure --target=powerpc-hardhat-linux \
+	--host=powerpc-hardhat-linux \
+	--build=i586-pc-linux-gnu \
+	--prefix=/opt/hardhat/devkit/ppc/405/target/usr/local \
+	--exec-prefix=/usr/local
+
+   (end script)
+
+   The '--prefix' parameter specifies where cURL will be installed.  If
+   'configure' completes successfully, do 'make' and 'make install' as usual.
+
+RISC OS
+=======
+   The library can be cross-compiled using gccsdk as follows:
+
+        CC=riscos-gcc AR=riscos-ar RANLIB='riscos-ar -s' ./configure \
+             --host=arm-riscos-aof --without-random --disable-shared
+        make
+
+   where riscos-gcc and riscos-ar are links to the gccsdk tools.
+   You can then link your program with curl/lib/.libs/libcurl.a
+
+PORTS
+=====
+   This is a probably incomplete list of known hardware and operating systems
+   that curl has been compiled for. If you know a system curl compiles and
+   runs on, that isn't listed, please let us know!
+
+        - Alpha DEC OSF 4
+        - Alpha Digital UNIX v3.2
+        - Alpha FreeBSD 4.1, 4.5
+        - Alpha Linux 2.2, 2.4
+        - Alpha NetBSD 1.5.2
+        - Alpha OpenBSD 3.0
+        - Alpha OpenVMS V7.1-1H2
+        - Alpha Tru64 v5.0 5.1
+        - HP-PA HP-UX 9.X 10.X 11.X
+        - HP-PA Linux
+        - MIPS IRIX 6.2, 6.5
+        - MIPS Linux
+        - Pocket PC/Win CE 3.0
+        - Power AIX 3.2.5, 4.2, 4.3.1, 4.3.2, 5.1
+        - PowerPC Darwin 1.0
+        - PowerPC Linux
+        - PowerPC Mac OS 9
+        - PowerPC Mac OS X
+        - SINIX-Z v5
+        - Sparc Linux
+        - Sparc Solaris 2.4, 2.5, 2.5.1, 2.6, 7, 8
+        - Sparc SunOS 4.1.X
+        - StrongARM (and other ARM) RISC OS 3.1, 4.02
+        - StrongARM Linux 2.4
+        - StrongARM NetBSD 1.4.1
+        - Ultrix 4.3a
+        - i386 BeOS
+        - i386 FreeBSD
+        - i386 HURD
+        - i386 Linux 1.3, 2.0, 2.2, 2.3, 2.4
+        - i386 NetBSD
+        - i386 OS/2
+        - i386 OpenBSD
+        - i386 SCO unix
+        - i386 Solaris 2.7
+        - i386 Windows 95, 98, ME, NT, 2000
+        - i386 QNX 6
+        - i486 ncr-sysv4.3.03 (NCR MP-RAS)
+        - ia64 Linux 2.3.99
+        - m68k AmigaOS 3
+        - m68k Linux
+        - m68k OpenBSD
+        - m88k dg-dgux5.4R3.00
+        - s390 Linux 
+        - XScale/PXA250 Linux 2.4
+
+OpenSSL
+=======
+
+   You'll find OpenSSL information at:
+
+      http://www.openssl.org
+
+
+MingW32/Cygwin
+==============
+
+   You'll find MingW32 and Cygwin information at:
+
+      http://www.mingw.org
+
+OpenLDAP
+========
+
+   You'll find OpenLDAP information at:
+
+      http://www.openldap.org
+
+   You need to install it with shared libraries, which is enabled when running
+   the ldap configure script with "--enable-shared". With my linux 2.0.36
+   kernel I also had to disable using threads (with --without-threads),
+   because the configure script couldn't figure out my system.
diff --git a/main/source/curl/docs/INTERNALS b/main/source/curl/docs/INTERNALS
new file mode 100644
index 00000000..16fdbb5e
--- /dev/null
+++ b/main/source/curl/docs/INTERNALS
@@ -0,0 +1,381 @@
+                                    Updated for curl 7.9.1 on November 2, 2001
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+INTERNALS
+
+ The project is split in two. The library and the client. The client part uses
+ the library, but the library is designed to allow other applications to use
+ it.
+
+ The largest amount of code and complexity is in the library part.
+
+CVS
+===
+ All changes to the sources are committed to the CVS repository as soon as
+ they're somewhat verified to work. Changes shall be commited as independently
+ as possible so that individual changes can be easier spotted and tracked
+ afterwards.
+
+ Tagging shall be used extensively, and by the time we release new archives we
+ should tag the sources with a name similar to the released version number.
+
+Windows vs Unix
+===============
+
+ There are a few differences in how to program curl the unix way compared to
+ the Windows way. The four perhaps most notable details are:
+
+ 1. Different function names for socket operations.
+
+   In curl, this is solved with defines and macros, so that the source looks
+   the same at all places except for the header file that defines them. The
+   macros in use are sclose(), sread() and swrite().
+
+ 2. Windows requires a couple of init calls for the socket stuff.
+
+   Those must be made by the application that uses libcurl, in curl that means
+   src/main.c has some code #ifdef'ed to do just that.
+
+ 3. The file descriptors for network communication and file operations are
+    not easily interchangable as in unix.
+
+   We avoid this by not trying any funny tricks on file descriptors.
+
+ 4. When writing data to stdout, Windows makes end-of-lines the DOS way, thus
+    destroying binary data, although you do want that conversion if it is
+    text coming through... (sigh)
+
+   We set stdout to binary under windows
+
+ Inside the source code, We make an effort to avoid '#ifdef [Your OS]'. All
+ conditionals that deal with features *should* instead be in the format
+ '#ifdef HAVE_THAT_WEIRD_FUNCTION'. Since Windows can't run configure scripts,
+ we maintain two config-win32.h files (one in lib/ and one in src/) that are
+ supposed to look exactly as a config.h file would have looked like on a
+ Windows machine!
+
+ Generally speaking: always remember that this will be compiled on dozens of
+ operating systems. Don't walk on the edge.
+
+Library
+=======
+
+ There are plenty of entry points to the library, namely each publicly defined
+ function that libcurl offers to applications. All of those functions are
+ rather small and easy-to-follow. All the ones prefixed with 'curl_easy' are
+ put in the lib/easy.c file.
+
+ curl_global_init_() and curl_global_cleanup() should be called by the
+ application to initialize and clean up global stuff in the library. As of
+ today, it can handle the global SSL initing if SSL is enabled and it can init
+ the socket layer on windows machines. libcurl itself has no "global" scope.
+
+ All printf()-style functions use the supplied clones in lib/mprintf.c. This
+ makes sure we stay absolutely platform independent.
+
+ curl_easy_init() allocates an internal struct and makes some initializations.
+ The returned handle does not reveal internals. This is the 'SessionHandle'
+ struct which works as an "anchor" struct for all curl_easy functions. All
+ connections performed will get connect-specific data allocated that should be
+ used for things related to particular connections/requests.
+
+ curl_easy_setopt() takes three arguments, where the option stuff must be
+ passed in pairs: the parameter-ID and the parameter-value. The list of
+ options is documented in the man page. This function mainly sets things in
+ the 'SessionHandle' struct.
+
+ curl_easy_perform() does a whole lot of things:
+
+ It starts off in the lib/easy.c file by calling Curl_perform() and the main
+ work then continues in lib/url.c. The flow continues with a call to
+ Curl_connect() to connect to the remote site.
+
+ o Curl_connect()
+
+   ... analyzes the URL, it separates the different components and connects to
+   the remote host. This may involve using a proxy and/or using SSL. The
+   Curl_gethost() function in lib/hostip.c is used for looking up host names.
+
+   When Curl_connect is done, we are connected to the remote site. Then it is
+   time to tell the server to get a document/file. Curl_do() arranges this.
+
+   This function makes sure there's an allocated and initiated 'connectdata'
+   struct that is used for this particular connection only (although there may
+   be several requests performed on the same connect). A bunch of things are
+   inited/inherited from the SessionHandle struct.
+
+ o Curl_do()
+
+   Curl_do() makes sure the proper protocol-specific function is called. The
+   functions are named after the protocols they handle. Curl_ftp(),
+   Curl_http(), Curl_dict(), etc. They all reside in their respective files
+   (ftp.c, http.c and dict.c). HTTPS is handled by Curl_http() and FTPS by
+   Curl_ftp().
+
+   The protocol-specific functions of course deal with protocol-specific
+   negotiations and setup. They have access to the Curl_sendf() (from
+   lib/sendf.c) function to send printf-style formatted data to the remote
+   host and when they're ready to make the actual file transfer they call the
+   Curl_Transfer() function (in lib/transfer.c) to setup the transfer and
+   returns.
+
+   Starting in 7.9.1, if this DO function fails and the connection is being
+   re-used, libcurl will then close this connection, setup a new connection
+   and re-issue the DO request on that. This is because there is no way to be
+   perfectly sure that we have discovered a dead connection before the DO
+   function and thus we might wrongly be re-using a connection that was closed
+   by the remote peer.
+
+ o Transfer()
+
+   Curl_perform() then calls Transfer() in lib/transfer.c that performs
+   the entire file transfer.
+
+   During transfer, the progress functions in lib/progress.c are called at a
+   frequent interval (or at the user's choice, a specified callback might get
+   called). The speedcheck functions in lib/speedcheck.c are also used to
+   verify that the transfer is as fast as required.
+
+ o Curl_done()
+
+   Called after a transfer is done. This function takes care of everything
+   that has to be done after a transfer. This function attempts to leave
+   matters in a state so that Curl_do() should be possible to call again on
+   the same connection (in a persistent connection case). It might also soon
+   be closed with Curl_disconnect().
+
+ o Curl_disconnect()
+
+   When doing normal connections and transfers, no one ever tries to close any
+   connections so this is not normally called when curl_easy_perform() is
+   used. This function is only used when we are certain that no more transfers
+   is going to be made on the connection. It can be also closed by force, or
+   it can be called to make sure that libcurl doesn't keep too many
+   connections alive at the same time (there's a default amount of 5 but that
+   can be changed with the CURLOPT_MAXCONNECTS option).
+
+   This function cleans up all resources that are associated with a single
+   connection.
+
+ Curl_perform() is the function that does the main "connect - do - transfer -
+ done" loop. It loops if there's a Location: to follow.
+
+ When completed, the curl_easy_cleanup() should be called to free up used
+ resources. It runs Curl_disconnect() on all open connectons.
+
+ A quick roundup on internal function sequences (many of these call
+ protocol-specific function-pointers):
+
+  curl_connect - connects to a remote site and does initial connect fluff
+   This also checks for an existing connection to the requested site and uses
+   that one if it is possible.
+
+   curl_do - starts a transfer
+    curl_transfer() - transfers data
+   curl_done - ends a transfer
+
+  curl_disconnect - disconnects from a remote site. This is called when the
+   disconnect is really requested, which doesn't necessarily have to be
+   exactly after curl_done in case we want to keep the connection open for
+   a while.
+
+ HTTP(S)
+
+ HTTP offers a lot and is the protocol in curl that uses the most lines of
+ code. There is a special file (lib/formdata.c) that offers all the multipart
+ post functions.
+
+ base64-functions for user+password stuff (and more) is in (lib/base64.c) and
+ all functions for parsing and sending cookies are found in (lib/cookie.c).
+
+ HTTPS uses in almost every means the same procedure as HTTP, with only two
+ exceptions: the connect procedure is different and the function used to read
+ or write from the socket is different, although the latter fact is hidden in
+ the source by the use of curl_read() for reading and curl_write() for writing
+ data to the remote server.
+
+ http_chunks.c contains functions that understands HTTP 1.1 chunked transfer
+ encoding.
+
+ An interesting detail with the HTTP(S) request, is the add_buffer() series of
+ functions we use. They append data to one single buffer, and when the
+ building is done the entire request is sent off in one single write. This is
+ done this way to overcome problems with flawed firewalls and lame servers.
+
+ FTP
+
+ The Curl_if2ip() function can be used for getting the IP number of a
+ specified network interface, and it resides in lib/if2ip.c.
+
+ Curl_ftpsendf() is used for sending FTP commands to the remote server. It was
+ made a separate function to prevent us programmers from forgetting that they
+ must be CRLF terminated. They must also be sent in one single write() to make
+ firewalls and similar happy.
+
+ Kerberos
+
+ The kerberos support is mainly in lib/krb4.c and lib/security.c.
+
+ TELNET
+
+ Telnet is implemented in lib/telnet.c.
+
+ FILE
+
+ The file:// protocol is dealt with in lib/file.c.
+
+ LDAP
+
+ Everything LDAP is in lib/ldap.c.
+
+ GENERAL
+
+ URL encoding and decoding, called escaping and unescaping in the source code,
+ is found in lib/escape.c.
+
+ While transfering data in Transfer() a few functions might get
+ used. curl_getdate() in lib/getdate.c is for HTTP date comparisons (and
+ more).
+
+ lib/getenv.c offers curl_getenv() which is for reading environment variables
+ in a neat platform independent way. That's used in the client, but also in
+ lib/url.c when checking the proxy environment variables. Note that contrary
+ to the normal unix getenv(), this returns an allocated buffer that must be
+ free()ed after use.
+
+ lib/netrc.c holds the .netrc parser
+
+ lib/timeval.c features replacement functions for systems that don't have
+ gettimeofday() and a few support functions for timeval convertions.
+ 
+ A function named curl_version() that returns the full curl version string is
+ found in lib/version.c.
+
+ If authentication is requested but no password is given, a getpass_r() clone
+ exists in lib/getpass.c. libcurl offers a custom callback that can be used
+ instead of this, but it doesn't change much to us.
+
+Persistent Connections
+======================
+
+ The persistent connection support in libcurl requires some considerations on
+ how to do things inside of the library.
+
+ o The 'SessionHandle' struct returned in the curl_easy_init() call must never
+   hold connection-oriented data. It is meant to hold the root data as well as
+   all the options etc that the library-user may choose.
+ o The 'SessionHandle' struct holds the "connection cache" (an array of
+   pointers to 'connectdata' structs). There's one connectdata struct
+   allocated for each connection that libcurl knows about.
+ o This also enables the 'curl handle' to be reused on subsequent transfers,
+   something that was illegal before libcurl 7.7.
+ o When we are about to perform a transfer with curl_easy_perform(), we first
+   check for an already existing connection in the cache that we can use,
+   otherwise we create a new one and add to the cache. If the cache is full
+   already when we add a new connection, we close one of the present ones. We
+   select which one to close dependent on the close policy that may have been
+   previously set.
+ o When the transfer operation is complete, we try to leave the connection
+   open. Particular options may tell us not to, and protocols may signal
+   closure on connections and then we don't keep it open of course.
+ o When curl_easy_cleanup() is called, we close all still opened connections.
+
+ You do realize that the curl handle must be re-used in order for the
+ persistent connections to work.
+
+Library Symbols
+===============
+ 
+ All symbols used internally in libcurl must use a 'Curl_' prefix if they're
+ used in more than a single file. Single-file symbols must be made static.
+ Public ("exported") symbols must use a 'curl_' prefix. (There are exceptions,
+ but they are to be changed to follow this pattern in future versions.)
+
+Return Codes and Informationals
+===============================
+
+ I've made things simple. Almost every function in libcurl returns a CURLcode,
+ that must be CURLE_OK if everything is OK or otherwise a suitable error code
+ as the curl/curl.h include file defines. The very spot that detects an error
+ must use the Curl_failf() function to set the human-readable error
+ description.
+
+ In aiding the user to understand what's happening and to debug curl usage, we
+ must supply a fair amount of informational messages by using the Curl_infof()
+ function. Those messages are only displayed when the user explicitly asks for
+ them. They are best used when revealing information that isn't otherwise
+ obvious.
+
+Client
+======
+
+ main() resides in src/main.c together with most of the client code.
+
+ src/hugehelp.c is automatically generated by the mkhelp.pl perl script to
+ display the complete "manual" and the src/urlglob.c file holds the functions
+ used for the URL-"globbing" support. Globbing in the sense that the {} and []
+ expansion stuff is there.
+
+ The client mostly messes around to setup its 'config' struct properly, then
+ it calls the curl_easy_*() functions of the library and when it gets back
+ control after the curl_easy_perform() it cleans up the library, checks status
+ and exits.
+
+ When the operation is done, the ourWriteOut() function in src/writeout.c may
+ be called to report about the operation. That function is using the
+ curl_easy_getinfo() function to extract useful information from the curl
+ session.
+
+ Recent versions may loop and do all this several times if many URLs were
+ specified on the command line or config file.
+
+Memory Debugging
+================
+
+ The file lib/memdebug.c contains debug-versions of a few functions. Functions
+ such as malloc, free, fopen, fclose, etc that somehow deal with resources
+ that might give us problems if we "leak" them. The functions in the memdebug
+ system do nothing fancy, they do their normal function and then log
+ information about what they just did. The logged data can then be analyzed
+ after a complete session,
+
+ memanalyze.pl is the perl script present only present in CVS (not part of the
+ release archives) that analyzes a log file generated by the memdebug
+ system. It detects if resources are allocated but never freed and other kinds
+ of errors related to resource management.
+
+ Use -DMALLOCDEBUG when compiling to enable memory debugging, this is also
+ switched on by running configure with --enable-debug.
+
+Test Suite
+==========
+
+ Since November 2000, a test suite has evolved. It is placed in its own
+ subdirectory directly off the root in the curl archive tree, and it contains
+ a bunch of scripts and a lot of test case data.
+
+ The main test script is runtests.pl that will invoke the two servers
+ httpserver.pl and ftpserver.pl before all the test cases are performed. The
+ test suite currently only runs on unix-like platforms.
+
+ You'll find a complete description of the test case data files in the
+ tests/README file.
+
+ The test suite automatically detects if curl was built with the memory
+ debugging enabled, and if it was it will detect memory leaks too.
+
+Building Releases
+=================
+
+ There's no magic to this. When you consider everything stable enough to be
+ released, run the 'maketgz' script (using 'make distcheck' will give you a
+ pretty good view on the status of the current sources). maketgz prompts for
+ version number of the client and the library before it creates a release
+ archive. maketgz uses 'make dist' for the actual archive building, why you
+ need to fill in the Makefile.am files properly for which files that should
+ be included in the release archives.
+
diff --git a/main/source/curl/docs/KNOWN_BUGS b/main/source/curl/docs/KNOWN_BUGS
new file mode 100644
index 00000000..dbbdf292
--- /dev/null
+++ b/main/source/curl/docs/KNOWN_BUGS
@@ -0,0 +1,91 @@
+These are problems known to exist at the time of this release. Feel free to
+join in and help us correct one or more of these! Also be sure to check the
+changelog of the current development status, as one or more of these problems
+may have been fixed since this was written!
+
+* IPv6 support on AIX 4.3.3 doesn't work due to a missing sockaddr_storage
+  struct. It has been reported to work on AIX 5.1 though.
+
+* Running 'make test' on Mac OS X gives 4 errors. This seems to be related
+  to some kind of libtool problem:
+  http://curl.haxx.se/mail/archive-2002-03/0029.html and
+  http://curl.haxx.se/mail/archive-2002-03/0033.html
+
+* libcurl does not deal nicely with files larger than 2GB
+
+* GOPHER transfers seem broken
+
+* configure --disable-http is not fully supported. All other protocols seem
+  to work to disable.
+
+* The -m parameter does not work when using telnet with curl on Windows.
+
+* If a HTTP server responds to a HEAD request and includes a body (thus
+  violating the RFC2616), curl won't wait to read the response but just stop
+  reading and return back. If a second request (let's assume a GET) is then
+  immediately made to the same server again, the connection will be re-used
+  fine of course, and the second request will be sent off but when the
+  response is to get read, the previous response-body is what curl will read
+  and havoc is what happens.
+  More details on this is found in this libcurl mailing list thread:
+  http://curl.haxx.se/mail/lib-2002-08/0000.html
+
+------------------------------------------------------------------------------
+
+Q: My program blows up when I run lots of curl_easy_perform() calls on a
+single thread
+Q: My program dies when a single thread re-enters the win32 select() call
+via curl_easy_perform()
+Q: --- add your own flavour here ---
+
+Single Threaded Re-Entracy
+--------------------------
+
+There is a glitch / trick to using cURL on Win32 related to re-entrancy.
+This experience was gained on verion 7.9.4 using Windows NT SP3 in a banking
+environment (just in case you wanted to know).
+
+If you have already called curl_easy_perform(), and *somehow* you cause your
+single thread of execution to make another call to curl_easy_perform() - the
+windows socket() call used to create a new socket for the second connection
+can return with 10044 / 10043 error codes.
+
+The WSA errors we experienced are:
+WSAEPROTONOSUPPORT 
+(10043) 
+Protocol not supported. 
+The requested protocol has not been configured into the system, or no
+implementation for it exists. For example, a socket call requests a
+SOCK_DGRAM socket, but specifies a stream protocol. 
+
+WSAESOCKTNOSUPPORT 
+(10044) 
+Socket type not supported. 
+The support for the specified socket type does not exist in this address
+family. For example, the optional type SOCK_RAW might be selected in a
+socket call, and the implementation does not support SOCK_RAW sockets at
+all. 
+
+We have experienced this by creating a timer that ticks every 20ms, and on
+the tick making a curl_easy_perform() call.  The call usually completed in
+about 300ms.  And we expected (before this test) that the timer would NOT be
+fired during a call to curl_easy_perform(), howvever, while the first
+curl_easy_perform() is running a tick *is* fired by the windows API somehow,
+and we then call curl_easy_perform() again - thus single threaded
+re-entrancy is achieved.
+
+Notes:
+* We made sure that a new CURL structure was being used for each
+curl_easy_perform() request, and that the curl_global_init() had been called
+beforehand.  
+* I'm happy to answer any questions about this problem to try to track it
+down.
+* Once the socket() call started failing, there is no hope - it never works
+again.
+* Slowing the timer down to give each request enough time to complete solves
+this problem completely.
+
+If anyone has the source code to the WinNT implementation of socket() and
+can figure out WHY this can occur, more tracing can be performed.
+
+        John Clayton <John.Clayton at barclayscapital.com>
diff --git a/main/source/curl/docs/MANUAL b/main/source/curl/docs/MANUAL
new file mode 100644
index 00000000..9a2eaa39
--- /dev/null
+++ b/main/source/curl/docs/MANUAL
@@ -0,0 +1,879 @@
+LATEST VERSION
+
+  You always find news about what's going on as well as the latest versions
+  from the curl web pages, located at:
+
+        http://curl.haxx.se
+
+SIMPLE USAGE
+
+  Get the main page from netscape's web-server:
+
+        curl http://www.netscape.com/
+
+  Get the root README file from funet's ftp-server:
+
+        curl ftp://ftp.funet.fi/README
+
+  Get a web page from a server using port 8000:
+
+        curl http://www.weirdserver.com:8000/
+
+  Get a list of the root directory of an FTP site:
+
+        curl ftp://cool.haxx.se/
+
+  Get a gopher document from funet's gopher server:
+
+        curl gopher://gopher.funet.fi
+
+  Get the definition of curl from a dictionary:
+
+        curl dict://dict.org/m:curl
+
+  Fetch two documents at once:
+
+        curl ftp://cool.haxx.se/ http://www.weirdserver.com:8000/
+
+DOWNLOAD TO A FILE
+
+  Get a web page and store in a local file:
+
+        curl -o thatpage.html http://www.netscape.com/
+
+  Get a web page and store in a local file, make the local file get the name
+  of the remote document (if no file name part is specified in the URL, this
+  will fail):
+
+        curl -O http://www.netscape.com/index.html
+
+  Fetch two files and store them with their remote names:
+
+        curl -O www.haxx.se/index.html -O curl.haxx.se/download.html
+
+USING PASSWORDS
+
+ FTP
+
+   To ftp files using name+passwd, include them in the URL like:
+
+        curl ftp://name:passwd@machine.domain:port/full/path/to/file
+
+   or specify them with the -u flag like
+
+        curl -u name:passwd ftp://machine.domain:port/full/path/to/file
+
+ HTTP
+
+   The HTTP URL doesn't support user and password in the URL string. Curl
+   does support that anyway to provide a ftp-style interface and thus you can
+   pick a file like:
+
+        curl http://name:passwd@machine.domain/full/path/to/file
+
+   or specify user and password separately like in
+
+        curl -u name:passwd http://machine.domain/full/path/to/file
+
+   NOTE! Since HTTP URLs don't support user and password, you can't use that
+   style when using Curl via a proxy. You _must_ use the -u style fetch
+   during such circumstances.
+
+ HTTPS
+
+   Probably most commonly used with private certificates, as explained below.
+
+ GOPHER
+
+   Curl features no password support for gopher.
+
+PROXY
+
+ Get an ftp file using a proxy named my-proxy that uses port 888:
+
+        curl -x my-proxy:888 ftp://ftp.leachsite.com/README
+
+ Get a file from a HTTP server that requires user and password, using the
+ same proxy as above:
+
+        curl -u user:passwd -x my-proxy:888 http://www.get.this/
+
+ Some proxies require special authentication. Specify by using -U as above:
+
+        curl -U user:passwd -x my-proxy:888 http://www.get.this/
+
+ See also the environment variables Curl support that offer further proxy
+ control.
+
+RANGES
+
+  With HTTP 1.1 byte-ranges were introduced. Using this, a client can request
+  to get only one or more subparts of a specified document. Curl supports
+  this with the -r flag.
+
+  Get the first 100 bytes of a document:
+
+        curl -r 0-99 http://www.get.this/
+
+  Get the last 500 bytes of a document:
+
+        curl -r -500 http://www.get.this/
+
+  Curl also supports simple ranges for FTP files as well. Then you can only
+  specify start and stop position.
+
+  Get the first 100 bytes of a document using FTP:
+
+        curl -r 0-99 ftp://www.get.this/README  
+
+UPLOADING
+
+ FTP
+
+  Upload all data on stdin to a specified ftp site:
+
+        curl -T - ftp://ftp.upload.com/myfile
+
+  Upload data from a specified file, login with user and password:
+
+        curl -T uploadfile -u user:passwd ftp://ftp.upload.com/myfile
+
+  Upload a local file to the remote site, and use the local file name remote
+  too:
+ 
+        curl -T uploadfile -u user:passwd ftp://ftp.upload.com/
+
+  Upload a local file to get appended to the remote file using ftp:
+
+        curl -T localfile -a ftp://ftp.upload.com/remotefile
+
+  Curl also supports ftp upload through a proxy, but only if the proxy is
+  configured to allow that kind of tunneling. If it does, you can run curl in
+  a fashion similar to:
+
+        curl --proxytunnel -x proxy:port -T localfile ftp.upload.com
+
+ HTTP
+
+  Upload all data on stdin to a specified http site:
+
+        curl -T - http://www.upload.com/myfile
+
+  Note that the http server must've been configured to accept PUT before this
+  can be done successfully.
+
+  For other ways to do http data upload, see the POST section below.
+
+VERBOSE / DEBUG
+
+  If curl fails where it isn't supposed to, if the servers don't let you in,
+  if you can't understand the responses: use the -v flag to get verbose
+  fetching. Curl will output lots of info and what it sends and receives in
+  order to let the user see all client-server interaction (but it won't show
+  you the actual data).
+
+        curl -v ftp://ftp.upload.com/
+
+  To get even more details and information on what curl does, try using the
+  --trace or --trace-ascii options with a given file name to log to, like
+  this:
+
+        curl --trace trace.txt www.haxx.se
+ 
+
+DETAILED INFORMATION
+
+  Different protocols provide different ways of getting detailed information
+  about specific files/documents. To get curl to show detailed information
+  about a single file, you should use -I/--head option. It displays all
+  available info on a single file for HTTP and FTP. The HTTP information is a
+  lot more extensive.
+
+  For HTTP, you can get the header information (the same as -I would show)
+  shown before the data by using -i/--include. Curl understands the
+  -D/--dump-header option when getting files from both FTP and HTTP, and it
+  will then store the headers in the specified file.
+
+  Store the HTTP headers in a separate file (headers.txt in the example):
+
+        curl --dump-header headers.txt curl.haxx.se
+
+  Note that headers stored in a separate file can be very useful at a later
+  time if you want curl to use cookies sent by the server. More about that in
+  the cookies section.
+
+POST (HTTP)
+
+  It's easy to post data using curl. This is done using the -d <data>
+  option.  The post data must be urlencoded.
+
+  Post a simple "name" and "phone" guestbook.
+
+        curl -d "name=Rafael%20Sagula&phone=3320780" \
+                http://www.where.com/guest.cgi
+
+  How to post a form with curl, lesson #1:
+
+  Dig out all the <input> tags in the form that you want to fill in. (There's
+  a perl program called formfind.pl on the curl site that helps with this).
+
+  If there's a "normal" post, you use -d to post. -d takes a full "post
+  string", which is in the format
+
+        <variable1>=<data1>&<variable2>=<data2>&...
+
+  The 'variable' names are the names set with "name=" in the <input> tags, and
+  the data is the contents you want to fill in for the inputs. The data *must*
+  be properly URL encoded. That means you replace space with + and that you
+  write weird letters with %XX where XX is the hexadecimal representation of
+  the letter's ASCII code.
+
+  Example:
+
+  (page located at http://www.formpost.com/getthis/
+
+        <form action="post.cgi" method="post">
+        <input name=user size=10>
+        <input name=pass type=password size=10>
+        <input name=id type=hidden value="blablabla">
+        <input name=ding value="submit">
+        </form>
+
+  We want to enter user 'foobar' with password '12345'.
+
+  To post to this, you enter a curl command line like:
+
+        curl -d "user=foobar&pass=12345&id=blablabla&dig=submit"  (continues)
+          http://www.formpost.com/getthis/post.cgi
+
+
+  While -d uses the application/x-www-form-urlencoded mime-type, generally
+  understood by CGI's and similar, curl also supports the more capable
+  multipart/form-data type. This latter type supports things like file upload.
+
+  -F accepts parameters like -F "name=contents". If you want the contents to
+  be read from a file, use <@filename> as contents. When specifying a file,
+  you can also specify the file content type by appending ';type=<mime type>'
+  to the file name. You can also post the contents of several files in one
+  field.  For example, the field name 'coolfiles' is used to send three files,
+  with different content types using the following syntax:
+
+        curl -F "coolfiles=@fil1.gif;type=image/gif,fil2.txt,fil3.html" \
+        http://www.post.com/postit.cgi
+
+  If the content-type is not specified, curl will try to guess from the file
+  extension (it only knows a few), or use the previously specified type (from
+  an earlier file if several files are specified in a list) or else it will
+  using the default type 'text/plain'.
+
+  Emulate a fill-in form with -F. Let's say you fill in three fields in a
+  form. One field is a file name which to post, one field is your name and one
+  field is a file description. We want to post the file we have written named
+  "cooltext.txt". To let curl do the posting of this data instead of your
+  favourite browser, you have to read the HTML source of the form page and
+  find the names of the input fields. In our example, the input field names
+  are 'file', 'yourname' and 'filedescription'.
+
+        curl -F "file=@cooltext.txt" -F "yourname=Daniel" \
+             -F "filedescription=Cool text file with cool text inside" \
+             http://www.post.com/postit.cgi
+
+  To send two files in one post you can do it in two ways:
+
+  1. Send multiple files in a single "field" with a single field name:
+ 
+        curl -F "pictures=@dog.gif,cat.gif" 
+ 
+  2. Send two fields with two field names: 
+
+        curl -F "docpicture=@dog.gif" -F "catpicture=@cat.gif" 
+
+REFERRER
+
+  A HTTP request has the option to include information about which address
+  that referred to actual page.  Curl allows you to specify the
+  referrer to be used on the command line. It is especially useful to
+  fool or trick stupid servers or CGI scripts that rely on that information
+  being available or contain certain data.
+
+        curl -e www.coolsite.com http://www.showme.com/
+
+  NOTE: The referer field is defined in the HTTP spec to be a full URL.
+
+USER AGENT
+
+  A HTTP request has the option to include information about the browser
+  that generated the request. Curl allows it to be specified on the command
+  line. It is especially useful to fool or trick stupid servers or CGI
+  scripts that only accept certain browsers.
+
+  Example:
+
+  curl -A 'Mozilla/3.0 (Win95; I)' http://www.nationsbank.com/
+
+  Other common strings:
+    'Mozilla/3.0 (Win95; I)'     Netscape Version 3 for Windows 95
+    'Mozilla/3.04 (Win95; U)'    Netscape Version 3 for Windows 95
+    'Mozilla/2.02 (OS/2; U)'     Netscape Version 2 for OS/2
+    'Mozilla/4.04 [en] (X11; U; AIX 4.2; Nav)'           NS for AIX
+    'Mozilla/4.05 [en] (X11; U; Linux 2.0.32 i586)'      NS for Linux
+
+  Note that Internet Explorer tries hard to be compatible in every way:
+    'Mozilla/4.0 (compatible; MSIE 4.01; Windows 95)'    MSIE for W95
+
+  Mozilla is not the only possible User-Agent name:
+    'Konqueror/1.0'             KDE File Manager desktop client
+    'Lynx/2.7.1 libwww-FM/2.14' Lynx command line browser
+
+COOKIES
+
+  Cookies are generally used by web servers to keep state information at the
+  client's side. The server sets cookies by sending a response line in the
+  headers that looks like 'Set-Cookie: <data>' where the data part then
+  typically contains a set of NAME=VALUE pairs (separated by semicolons ';'
+  like "NAME1=VALUE1; NAME2=VALUE2;"). The server can also specify for what
+  path the "cookie" should be used for (by specifying "path=value"), when the
+  cookie should expire ("expire=DATE"), for what domain to use it
+  ("domain=NAME") and if it should be used on secure connections only
+  ("secure").
+
+  If you've received a page from a server that contains a header like:
+        Set-Cookie: sessionid=boo123; path="/foo";
+
+  it means the server wants that first pair passed on when we get anything in
+  a path beginning with "/foo".
+
+  Example, get a page that wants my name passed in a cookie:
+
+        curl -b "name=Daniel" www.sillypage.com
+
+  Curl also has the ability to use previously received cookies in following
+  sessions. If you get cookies from a server and store them in a file in a
+  manner similar to:
+
+        curl --dump-header headers www.example.com
+
+  ... you can then in a second connect to that (or another) site, use the
+  cookies from the 'headers' file like:
+
+        curl -b headers www.example.com
+
+  While saving headers to a file is a working way to store cookies, it is
+  however error-prone and not the prefered way to do this. Instead, make curl
+  save the incoming cookies using the well-known netscape cookie format like
+  this:
+
+        curl -c cookies.txt www.example.com
+
+  Note that by specifying -b you enable the "cookie awareness" and with -L
+  you can make curl follow a location: (which often is used in combination
+  with cookies). So that if a site sends cookies and a location, you can
+  use a non-existing file to trigger the cookie awareness like:
+
+        curl -L -b empty.txt www.example.com
+
+  The file to read cookies from must be formatted using plain HTTP headers OR
+  as netscape's cookie file. Curl will determine what kind it is based on the
+  file contents.  In the above command, curl will parse the header and store
+  the cookies received from www.example.com.  curl will send to the server the
+  stored cookies which match the request as it follows the location.  The
+  file "empty.txt" may be a non-existant file.
+
+  Alas, to both read and write cookies from a netscape cookie file, you can
+  set both -b and -c to use the same file:
+
+        curl -b cookies.txt -c cookies.txt www.example.com
+
+PROGRESS METER
+
+  The progress meter exists to show a user that something actually is
+  happening. The different fields in the output have the following meaning:
+
+  % Total    % Received % Xferd  Average Speed          Time             Curr.
+                                 Dload  Upload Total    Current  Left    Speed
+  0  151M    0 38608    0     0   9406      0  4:41:43  0:00:04  4:41:39  9287
+
+  From left-to-right:
+   %             - percentage completed of the whole transfer
+   Total         - total size of the whole expected transfer
+   %             - percentage completed of the download
+   Received      - currently downloaded amount of bytes
+   %             - percentage completed of the upload
+   Xferd         - currently uploaded amount of bytes
+   Average Speed
+   Dload         - the average transfer speed of the download
+   Average Speed
+   Upload        - the average transfer speed of the upload
+   Time Total    - expected time to complete the operation
+   Time Current  - time passed since the invoke
+   Time Left     - expected time left to completetion
+   Curr.Speed    - the average transfer speed the last 5 seconds (the first
+                   5 seconds of a transfer is based on less time of course.)
+
+  The -# option will display a totally different progress bar that doesn't
+  need much explanation!
+
+SPEED LIMIT
+
+  Curl allows the user to set the transfer speed conditions that must be met
+  to let the transfer keep going. By using the switch -y and -Y you
+  can make curl abort transfers if the transfer speed is below the specified
+  lowest limit for a specified time.
+
+  To have curl abort the download if the speed is slower than 3000 bytes per
+  second for 1 minute, run:
+
+        curl -Y 3000 -y 60 www.far-away-site.com
+
+  This can very well be used in combination with the overall time limit, so
+  that the above operatioin must be completed in whole within 30 minutes:
+
+        curl -m 1800 -Y 3000 -y 60 www.far-away-site.com
+
+  Forcing curl not to transfer data faster than a given rate is also possible,
+  which might be useful if you're using a limited bandwidth connection and you
+  don't want your transfer to use all of it (sometimes referred to as
+  "bandwith throttle").
+
+  Make curl transfer data no faster than 10 kilobytes per second:
+
+        curl --limit-rate 10K www.far-away-site.com
+
+    or
+
+        curl --limit-rate 10240 www.far-away-site.com
+
+  Or prevent curl from uploading data faster than 1 megabyte per second:
+
+        curl -T upload --limit-rate 1M ftp://uploadshereplease.com
+
+  When using the --limit-rate option, the transfer rate is regulated on a
+  per-second basis, which will cause the total transfer speed to become lower
+  than the given number. Sometimes of course substantially lower, if your
+  transfer stalls during periods.
+
+CONFIG FILE
+
+  Curl automatically tries to read the .curlrc file (or _curlrc file on win32
+  systems) from the user's home dir on startup.
+
+  The config file could be made up with normal command line switches, but you
+  can also specify the long options without the dashes to make it more
+  readable. You can separate the options and the parameter with spaces, or
+  with = or :. Comments can be used within the file. If the first letter on a
+  line is a '#'-letter the rest of the line is treated as a comment.
+
+  If you want the parameter to contain spaces, you must inclose the entire
+  parameter within double quotes ("). Within those quotes, you specify a
+  quote as \".
+
+  NOTE: You must specify options and their arguments on the same line.
+
+  Example, set default time out and proxy in a config file:
+
+        # We want a 30 minute timeout:
+        -m 1800
+        # ... and we use a proxy for all accesses:
+        proxy = proxy.our.domain.com:8080
+
+  White spaces ARE significant at the end of lines, but all white spaces
+  leading up to the first characters of each line are ignored.
+
+  Prevent curl from reading the default file by using -q as the first command
+  line parameter, like:
+
+        curl -q www.thatsite.com
+
+  Force curl to get and display a local help page in case it is invoked
+  without URL by making a config file similar to:
+
+        # default url to get
+        url = "http://help.with.curl.com/curlhelp.html"
+
+  You can specify another config file to be read by using the -K/--config
+  flag. If you set config file name to "-" it'll read the config from stdin,
+  which can be handy if you want to hide options from being visible in process
+  tables etc:
+
+        echo "user = user:passwd" | curl -K - http://that.secret.site.com
+
+EXTRA HEADERS
+
+  When using curl in your own very special programs, you may end up needing
+  to pass on your own custom headers when getting a web page. You can do
+  this by using the -H flag.
+
+  Example, send the header "X-you-and-me: yes" to the server when getting a
+  page:
+
+        curl -H "X-you-and-me: yes" www.love.com
+
+  This can also be useful in case you want curl to send a different text in a
+  header than it normally does. The -H header you specify then replaces the
+  header curl would normally send. If you replace an internal header with an
+  empty one, you prevent that header from being sent. To prevent the Host:
+  header from being used:
+
+        curl -H "Host:" www.server.com
+
+FTP and PATH NAMES
+
+  Do note that when getting files with the ftp:// URL, the given path is
+  relative the directory you enter. To get the file 'README' from your home
+  directory at your ftp site, do:
+
+        curl ftp://user:passwd@my.site.com/README
+
+  But if you want the README file from the root directory of that very same
+  site, you need to specify the absolute file name:
+
+        curl ftp://user:passwd@my.site.com//README
+
+  (I.e with an extra slash in front of the file name.)
+
+FTP and firewalls
+
+  The FTP protocol requires one of the involved parties to open a second
+  connction as soon as data is about to get transfered. There are two ways to
+  do this.
+
+  The default way for curl is to issue the PASV command which causes the
+  server to open another port and await another connection performed by the
+  client. This is good if the client is behind a firewall that don't allow
+  incoming connections.
+
+        curl ftp.download.com
+
+  If the server for example, is behind a firewall that don't allow connections
+  on other ports than 21 (or if it just doesn't support the PASV command), the
+  other way to do it is to use the PORT command and instruct the server to
+  connect to the client on the given (as parameters to the PORT command) IP
+  number and port.
+
+  The -P flag to curl supports a few different options. Your machine may have
+  several IP-addresses and/or network interfaces and curl allows you to select
+  which of them to use. Default address can also be used:
+
+        curl -P - ftp.download.com
+
+  Download with PORT but use the IP address of our 'le0' interface (this does
+  not work on windows):
+
+        curl -P le0 ftp.download.com
+
+  Download with PORT but use 192.168.0.10 as our IP address to use:
+
+        curl -P 192.168.0.10 ftp.download.com
+
+NETWORK INTERFACE
+
+  Get a web page from a server using a specified port for the interface:
+
+	curl --interface eth0:1 http://www.netscape.com/
+
+  or
+
+	curl --interface 192.168.1.10 http://www.netscape.com/
+
+HTTPS
+
+  Secure HTTP requires SSL libraries to be installed and used when curl is
+  built. If that is done, curl is capable of retrieving and posting documents
+  using the HTTPS procotol.
+
+  Example:
+
+        curl https://www.secure-site.com
+
+  Curl is also capable of using your personal certificates to get/post files
+  from sites that require valid certificates. The only drawback is that the
+  certificate needs to be in PEM-format. PEM is a standard and open format to
+  store certificates with, but it is not used by the most commonly used
+  browsers (Netscape and MSIE both use the so called PKCS#12 format). If you
+  want curl to use the certificates you use with your (favourite) browser, you
+  may need to download/compile a converter that can convert your browser's
+  formatted certificates to PEM formatted ones. This kind of converter is
+  included in recent versions of OpenSSL, and for older versions Dr Stephen
+  N. Henson has written a patch for SSLeay that adds this functionality. You
+  can get his patch (that requires an SSLeay installation) from his site at:
+  http://www.drh-consultancy.demon.co.uk/
+
+  Example on how to automatically retrieve a document using a certificate with
+  a personal password:
+
+        curl -E /path/to/cert.pem:password https://secure.site.com/
+
+  If you neglect to specify the password on the command line, you will be
+  prompted for the correct password before any data can be received.
+
+  Many older SSL-servers have problems with SSLv3 or TLS, that newer versions
+  of OpenSSL etc is using, therefore it is sometimes useful to specify what
+  SSL-version curl should use. Use -3, -2 or -1 to specify that exact SSL
+  version to use (for SSLv3, SSLv2 or TLSv1 respectively):
+
+        curl -2 https://secure.site.com/
+
+  Otherwise, curl will first attempt to use v3 and then v2.
+
+  To use OpenSSL to convert your favourite browser's certificate into a PEM
+  formatted one that curl can use, do something like this (assuming netscape,
+  but IE is likely to work similarly):
+
+    You start with hitting the 'security' menu button in netscape. 
+
+    Select 'certificates->yours' and then pick a certificate in the list 
+
+    Press the 'export' button 
+
+    enter your PIN code for the certs 
+
+    select a proper place to save it 
+
+    Run the 'openssl' application to convert the certificate. If you cd to the
+    openssl installation, you can do it like:
+
+     # ./apps/openssl pkcs12 -in [file you saved] -clcerts -out [PEMfile]
+
+
+RESUMING FILE TRANSFERS
+
+ To continue a file transfer where it was previously aborted, curl supports
+ resume on http(s) downloads as well as ftp uploads and downloads.
+
+ Continue downloading a document:
+
+        curl -C - -o file ftp://ftp.server.com/path/file
+
+ Continue uploading a document(*1):
+
+        curl -C - -T file ftp://ftp.server.com/path/file
+
+ Continue downloading a document from a web server(*2):
+
+        curl -C - -o file http://www.server.com/
+
+ (*1) = This requires that the ftp server supports the non-standard command
+        SIZE. If it doesn't, curl will say so.
+
+ (*2) = This requires that the web server supports at least HTTP/1.1. If it
+        doesn't, curl will say so.
+
+TIME CONDITIONS
+
+ HTTP allows a client to specify a time condition for the document it
+ requests. It is If-Modified-Since or If-Unmodified-Since. Curl allow you to
+ specify them with the -z/--time-cond flag.
+
+ For example, you can easily make a download that only gets performed if the
+ remote file is newer than a local copy. It would be made like:
+
+        curl -z local.html http://remote.server.com/remote.html
+
+ Or you can download a file only if the local file is newer than the remote
+ one. Do this by prepending the date string with a '-', as in:
+
+        curl -z -local.html http://remote.server.com/remote.html
+
+ You can specify a "free text" date as condition. Tell curl to only download
+ the file if it was updated since yesterday:
+
+        curl -z yesterday http://remote.server.com/remote.html
+
+ Curl will then accept a wide range of date formats. You always make the date
+ check the other way around by prepending it with a dash '-'.
+
+DICT
+
+  For fun try
+
+        curl dict://dict.org/m:curl
+        curl dict://dict.org/d:heisenbug:jargon
+        curl dict://dict.org/d:daniel:web1913
+
+  Aliases for 'm' are 'match' and 'find', and aliases for 'd' are 'define'
+  and 'lookup'. For example,
+
+        curl dict://dict.org/find:curl
+
+  Commands that break the URL description of the RFC (but not the DICT
+  protocol) are
+
+        curl dict://dict.org/show:db
+        curl dict://dict.org/show:strat
+
+  Authentication is still missing (but this is not required by the RFC)
+
+LDAP
+
+  If you have installed the OpenLDAP library, curl can take advantage of it
+  and offer ldap:// support.
+
+  LDAP is a complex thing and writing an LDAP query is not an easy task. I do
+  advice you to dig up the syntax description for that elsewhere. Two places
+  that might suit you are:
+
+  Netscape's "Netscape Directory SDK 3.0 for C Programmer's Guide Chapter 10:
+  Working with LDAP URLs":
+  http://developer.netscape.com/docs/manuals/dirsdk/csdk30/url.htm
+
+  RFC 2255, "The LDAP URL Format" http://www.rfc-editor.org/rfc/rfc2255.txt
+
+  To show you an example, this is now I can get all people from my local LDAP
+  server that has a certain sub-domain in their email address:
+
+        curl -B "ldap://ldap.frontec.se/o=frontec??sub?mail=*sth.frontec.se"
+
+  If I want the same info in HTML format, I can get it by not using the -B
+  (enforce ASCII) flag.
+
+ENVIRONMENT VARIABLES
+
+  Curl reads and understands the following environment variables:
+
+        http_proxy, HTTPS_PROXY, FTP_PROXY, GOPHER_PROXY
+
+  They should be set for protocol-specific proxies. General proxy should be
+  set with
+        
+        ALL_PROXY
+
+  A comma-separated list of host names that shouldn't go through any proxy is
+  set in (only an asterisk, '*' matches all hosts)
+
+        NO_PROXY
+
+  If a tail substring of the domain-path for a host matches one of these
+  strings, transactions with that node will not be proxied.
+
+
+  The usage of the -x/--proxy flag overrides the environment variables.
+
+NETRC
+
+  Unix introduced the .netrc concept a long time ago. It is a way for a user
+  to specify name and password for commonly visited ftp sites in a file so
+  that you don't have to type them in each time you visit those sites. You
+  realize this is a big security risk if someone else gets hold of your
+  passwords, so therefor most unix programs won't read this file unless it is
+  only readable by yourself (curl doesn't care though).
+
+  Curl supports .netrc files if told so (using the -n/--netrc and
+  --netrc-optional options). This is not restricted to only ftp,
+  but curl can use it for all protocols where authentication is used.
+
+  A very simple .netrc file could look something like:
+
+        machine curl.haxx.se login iamdaniel password mysecret
+
+CUSTOM OUTPUT
+
+  To better allow script programmers to get to know about the progress of
+  curl, the -w/--write-out option was introduced. Using this, you can specify
+  what information from the previous transfer you want to extract.
+
+  To display the amount of bytes downloaded together with some text and an
+  ending newline:
+
+        curl -w 'We downloaded %{size_download} bytes\n' www.download.com
+
+KERBEROS4 FTP TRANSFER
+
+  Curl supports kerberos4 for FTP transfers. You need the kerberos package
+  installed and used at curl build time for it to be used.
+
+  First, get the krb-ticket the normal way, like with the kauth tool. Then use
+  curl in way similar to:
+
+        curl --krb4 private ftp://krb4site.com -u username:fakepwd
+
+  There's no use for a password on the -u switch, but a blank one will make
+  curl ask for one and you already entered the real password to kauth.
+
+TELNET
+
+  The curl telnet support is basic and very easy to use. Curl passes all data
+  passed to it on stdin to the remote server. Connect to a remote telnet
+  server using a command line similar to:
+
+        curl telnet://remote.server.com
+
+  And enter the data to pass to the server on stdin. The result will be sent
+  to stdout or to the file you specify with -o.
+
+  You might want the -N/--no-buffer option to switch off the buffered output
+  for slow connections or similar.
+
+  Pass options to the telnet protocol negotiation, by using the -t option. To
+  tell the server we use a vt100 terminal, try something like:
+
+        curl -tTTYPE=vt100 telnet://remote.server.com
+
+  Other interesting options for it -t include:
+
+   - XDISPLOC=<X display> Sets the X display location.
+
+   - NEW_ENV=<var,val> Sets an environment variable.
+
+  NOTE: the telnet protocol does not specify any way to login with a specified
+  user and password so curl can't do that automatically. To do that, you need
+  to track when the login prompt is received and send the username and
+  password accordingly.
+
+PERSISTANT CONNECTIONS
+
+  Specifying multiple files on a single command line will make curl transfer
+  all of them, one after the other in the specified order.
+
+  libcurl will attempt to use persistant connections for the transfers so that
+  the second transfer to the same host can use the same connection that was
+  already initiated and was left open in the previous transfer. This greatly
+  decreases connection time for all but the first transfer and it makes a far
+  better use of the network.
+
+  Note that curl cannot use persistant connections for transfers that are used
+  in subsequence curl invokes. Try to stuff as many URLs as possible on the
+  same command line if they are using the same host, as that'll make the
+  transfers faster. If you use a http proxy for file transfers, practicly
+  all transfers will be persistant.
+
+  Persistant connections were introduced in curl 7.7.
+
+MAILING LISTS
+
+  For your convenience, we have several open mailing lists to discuss curl,
+  its development and things relevant to this. Get all info at
+  http://curl.haxx.se/mail/. The lists available are:
+
+  curl-users
+
+    Users of the command line tool. How to use it, what doesn't work, new
+    features, related tools, questions, news, installations, compilations,
+    running, porting etc.
+
+  curl-library
+
+    Developers using or developing libcurl. Bugs, extensions, improvements.
+
+  curl-announce
+
+    Low-traffic. Only announcements of new public versions.
+
+  curl-and-PHP
+
+    Using the curl functions in PHP. Everything curl with a PHP angle. Or PHP
+    with a curl angle.
+
+  curl-commits
+
+    Receives notifications on all CVS commits done to the curl source module.
+    This can become quite a large amount of mails during intense development,
+    be aware. This is for us who like email...
+
+  curl-www-commits
+
+    Receives notifications on all CVS commits done to the curl www module
+    (basicly the web site).  This can become quite a large amount of mails
+    during intense changing, be aware. This is for us who like email...
+
+  Please direct curl questions, feature requests and trouble reports to one of
+  these mailing lists instead of mailing any individual.
diff --git a/main/source/curl/docs/Makefile.am b/main/source/curl/docs/Makefile.am
new file mode 100644
index 00000000..925d1419
--- /dev/null
+++ b/main/source/curl/docs/Makefile.am
@@ -0,0 +1,48 @@
+#
+# $Id: Makefile.am,v 1.25 2003/02/26 13:46:38 bagder Exp $
+#
+
+AUTOMAKE_OPTIONS = foreign no-dependencies
+
+man_MANS = \
+	curl.1 \
+	curl-config.1
+
+HTMLPAGES = \
+	curl.html \
+	curl-config.html \
+	index.html
+
+PDFPAGES = \
+	curl.pdf \
+	curl-config.pdf
+
+SUBDIRS = examples libcurl
+
+EXTRA_DIST = MANUAL BUGS CONTRIBUTE FAQ FEATURES INTERNALS		\
+	     README.win32 RESOURCES TODO TheArtOfHttpScripting THANKS	\
+	     VERSIONS KNOWN_BUGS BINDINGS $(man_MANS) $(HTMLPAGES) \
+	     HISTORY INSTALL libcurl-the-guide $(PDFPAGES)
+
+MAN2HTML= gnroff -man $< | man2html >$@
+
+SUFFIXES = .1 .3 .html .pdf
+
+html: $(HTMLPAGES)
+	cd libcurl; make html
+
+.3.html:
+	$(MAN2HTML)
+
+.1.html:
+	$(MAN2HTML)
+
+MAN2PDF = groff -Tps -man curl.1 $< >$@
+
+pdf:
+	for file in $(man_MANS); do \
+	  foo=`echo $$file | sed -e 's/\.[0-9]$$//g'`; \
+	  groff -Tps -man $$file >$$foo.ps; \
+	  ps2pdf $$foo.ps $$foo.pdf; \
+	done
+	cd libcurl; make pdf
diff --git a/main/source/curl/docs/Makefile.in b/main/source/curl/docs/Makefile.in
new file mode 100644
index 00000000..69d60147
--- /dev/null
+++ b/main/source/curl/docs/Makefile.in
@@ -0,0 +1,565 @@
+# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# $Id: Makefile.am,v 1.25 2003/02/26 13:46:38 bagder Exp $
+#
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CA_BUNDLE = @CURL_CA_BUNDLE@
+CURL_DISABLE_DICT = @CURL_DISABLE_DICT@
+CURL_DISABLE_FILE = @CURL_DISABLE_FILE@
+CURL_DISABLE_FTP = @CURL_DISABLE_FTP@
+CURL_DISABLE_GOPHER = @CURL_DISABLE_GOPHER@
+CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@
+CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@
+CURL_DISABLE_TELNET = @CURL_DISABLE_TELNET@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_LIBZ = @HAVE_LIBZ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPV6_ENABLED = @IPV6_ENABLED@
+KRB4_ENABLED = @KRB4_ENABLED@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NO_UNDEFINED_FALSE = @NO_UNDEFINED_FALSE@
+NO_UNDEFINED_TRUE = @NO_UNDEFINED_TRUE@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_ENABLED = @OPENSSL_ENABLED@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKGADD_NAME = @PKGADD_NAME@
+PKGADD_PKG = @PKGADD_PKG@
+PKGADD_VENDOR = @PKGADD_VENDOR@
+PKGCONFIG = @PKGCONFIG@
+RANDOM_FILE = @RANDOM_FILE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VERSIONNUM = @VERSIONNUM@
+YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+
+AUTOMAKE_OPTIONS = foreign no-dependencies
+
+man_MANS = \
+	curl.1 \
+	curl-config.1
+
+
+HTMLPAGES = \
+	curl.html \
+	curl-config.html \
+	index.html
+
+
+PDFPAGES = \
+	curl.pdf \
+	curl-config.pdf
+
+
+SUBDIRS = examples libcurl
+
+EXTRA_DIST = MANUAL BUGS CONTRIBUTE FAQ FEATURES INTERNALS		\
+	     README.win32 RESOURCES TODO TheArtOfHttpScripting THANKS	\
+	     VERSIONS KNOWN_BUGS BINDINGS $(man_MANS) $(HTMLPAGES) \
+	     HISTORY INSTALL libcurl-the-guide $(PDFPAGES)
+
+
+MAN2HTML = gnroff -man $< | man2html >$@
+
+SUFFIXES = .1 .3 .html .pdf
+
+MAN2PDF = groff -Tps -man curl.1 $< >$@
+subdir = docs
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/lib/config.h \
+	$(top_builddir)/src/config.h \
+	$(top_builddir)/tests/server/config.h \
+	$(top_builddir)/lib/ca-bundle.h
+CONFIG_CLEAN_FILES =
+depcomp =
+am__depfiles_maybe =
+DIST_SOURCES =
+MANS = $(man_MANS)
+
+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+	ps-recursive install-info-recursive uninstall-info-recursive \
+	all-recursive install-data-recursive install-exec-recursive \
+	installdirs-recursive install-recursive uninstall-recursive \
+	check-recursive installcheck-recursive
+DIST_COMMON = INSTALL Makefile.am Makefile.in THANKS TODO
+DIST_SUBDIRS = $(SUBDIRS)
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .1 .3 .html .pdf
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  docs/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+man1dir = $(mandir)/man1
+install-man1: $(man1_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+	done
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
+	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
+	done
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ETAGS = etags
+ETAGSFLAGS =
+
+CTAGS = ctags
+CTAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d $(distdir)/$$subdir \
+	    || mkdir $(distdir)/$$subdir \
+	    || exit 1; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$(top_distdir)" \
+	        distdir=../$(distdir)/$$subdir \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(MANS)
+installdirs: installdirs-recursive
+installdirs-am:
+	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+
+distclean-am: clean-am distclean-generic distclean-libtool \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-man
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man: install-man1
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-man
+
+uninstall-info: uninstall-info-recursive
+
+uninstall-man: uninstall-man1
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+	clean-generic clean-libtool clean-recursive ctags \
+	ctags-recursive distclean distclean-generic distclean-libtool \
+	distclean-recursive distclean-tags distdir dvi dvi-am \
+	dvi-recursive info info-am info-recursive install install-am \
+	install-data install-data-am install-data-recursive \
+	install-exec install-exec-am install-exec-recursive \
+	install-info install-info-am install-info-recursive install-man \
+	install-man1 install-recursive install-strip installcheck \
+	installcheck-am installdirs installdirs-am \
+	installdirs-recursive maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+	uninstall uninstall-am uninstall-info-am \
+	uninstall-info-recursive uninstall-man uninstall-man1 \
+	uninstall-recursive
+
+
+html: $(HTMLPAGES)
+	cd libcurl; make html
+
+.3.html:
+	$(MAN2HTML)
+
+.1.html:
+	$(MAN2HTML)
+
+pdf:
+	for file in $(man_MANS); do \
+	  foo=`echo $$file | sed -e 's/\.[0-9]$$//g'`; \
+	  groff -Tps -man $$file >$$foo.ps; \
+	  ps2pdf $$foo.ps $$foo.pdf; \
+	done
+	cd libcurl; make pdf
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/main/source/curl/docs/README.win32 b/main/source/curl/docs/README.win32
new file mode 100644
index 00000000..74275124
--- /dev/null
+++ b/main/source/curl/docs/README.win32
@@ -0,0 +1,22 @@
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+README.win32
+
+  Read the README file first.
+
+  Curl has been compiled, built and run on all sorts of Windows and win32
+  systems. While not being the main develop target, a fair share of curl users
+  are win32-based.
+
+  The unix-style man pages are tricky to read on windows, so therefore are all
+  those pages also converted to HTML and those are also included in the
+  release archives.
+
+  The main curl.1 man page is also "built-in" in the command line tool. Use a
+  command line similar to this in order to extract a separate text file:
+
+        curl -M >manual.txt
diff --git a/main/source/curl/docs/RESOURCES b/main/source/curl/docs/RESOURCES
new file mode 100644
index 00000000..a33720d3
--- /dev/null
+++ b/main/source/curl/docs/RESOURCES
@@ -0,0 +1,124 @@
+                                  _   _ ____  _     
+  Project                     ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+
+This document lists documents that specify standards used by curl, software
+that extends curl, web pages with similar utilities and information pages that
+describe some of the tools that we use to build/compile/develop curl.
+
+Standards
+---------
+
+  RFC 959  - Defines how FTP works
+
+  RFC 1635 - How to Use Anonymous FTP
+
+  RFC 1738 - Uniform Resource Locators
+
+  RFC 1777 - defines the LDAP protocol
+
+  RFC 1808 - Relative Uniform Resource Locators
+
+  RFC 1867 - Form-based File Upload in HTML
+
+  RFC 1950 - ZLIB Compressed Data Format Specification
+
+  RFC 1951 - DEFLATE Compressed Data Format Specification
+
+  RFC 1952 - gzip compression format
+
+  RFC 1959 - LDAP URL syntax
+
+  RFC 2045-2049 - Everything you need to know about MIME! (needed for form
+                  based upload)
+
+  RFC 2068 - HTTP 1.1 (obsoleted by RFC 2616)
+
+  RFC 2109 - HTTP State Management Mechanism (cookie stuff)
+           - Also, read Netscape's specification at
+             http://curl.haxx.se/rfc/cookie_spec.html
+
+  RFC 2183 - The Content-Disposition Header Field
+
+  RFC 2229 - A Dictionary Server Protocol
+
+  RFC 2255 - Newer LDAP URL syntax document.
+
+  RFC 2231 - MIME Parameter Value and Encoded Word Extensions:
+             Character Sets, Languages, and Continuations
+
+  RFC 2388 - "Returning Values from Forms: multipart/form-data"
+             Use this as an addition to the RFC1867 
+
+  RFC 2396 - "Uniform Resource Identifiers: Generic Syntax and Semantics" This
+             one obsoletes RFC 1738, but since RFC 1738 is often mentioned
+             I've left it in this list.
+
+  RFC 2428 - FTP Extensions for IPv6 and NATs
+
+  RFC 2577 - FTP Security Considerations
+
+  RFC 2616 - HTTP 1.1, the latest
+
+  RFC 2617 - HTTP Authentication
+
+  RFC 2718 - Guidelines for new URL Schemes
+             
+  RFC 2732 - Format for Literal IPv6 Addresses in URL's
+             
+  RFC 2818 - HTTP Over TLS (TLS is the successor to SSL)
+             
+  RFC 2964 - Use of HTTP State Management
+             
+  RFC 2965 - HTTP State Management Mechanism. Cookies. Obsoletes RFC2109
+
+Compilers
+---------
+  MingW32 - http://www.mingw.org/
+
+  gcc     - http://www.gnu.org/software/gcc/gcc.html
+
+Software
+--------
+  OpenSSL -  http://www.openssl.org/
+
+  OpenLDAP - http://www.openldap.org/
+
+  zlib -     http://www.cdrom.com/pub/infozip/zlib/
+
+Similar Tools
+-------------
+  wget    - http://sunsite.dk/wget/
+
+  snarf   - http://www.xach.com/snarf/
+
+  lynx    - http://lynx.browser.org/ (well at least when -dump is used)
+
+  swebget - http://www.uni-hildesheim.de/~smol0075/swebget/
+
+  Kermit  - http://www.columbia.edu/kermit/ftpclient
+
+  Pavuk   - http://www.idata.sk/~ondrej/pavuk/
+
+  httpr   - http://zwolak.dhs.org/httpr/
+
+  puf     - http://www.inf.tu-dresden.de/~ob6/sw/puf.html
+
+Related Software
+----------------
+  ftpparse - http://cr.yp.to/ftpparse.html parses FTP LIST responses
+
+  autoconf - http://www.gnu.org/software/autoconf/autoconf.html
+
+  automake - http://www.gnu.org/software/automake/automake.html
+
+  bison    - http://www.gnu.org/software/bison/bison.html
+
+  gzip     - http://www.gnu.org/software/gzip/gzip.html
+
+  tar      - http://www.gnu.org/software/tar/tar.html
+
+  libtool  - http://www.gnu.org/software/libtool/libtool.html
diff --git a/main/source/curl/docs/THANKS b/main/source/curl/docs/THANKS
new file mode 100644
index 00000000..5099af3b
--- /dev/null
+++ b/main/source/curl/docs/THANKS
@@ -0,0 +1,92 @@
+This project has been alive for several years. Countless people have provided
+feedback that have improved curl. Here follows a (incomplete) list of people
+that have contributed with non-trivial parts:
+
+ - Daniel Stenberg <daniel@haxx.se>
+ - Rafael Sagula <sagula@inf.ufrgs.br>
+ - Sampo Kellomaki <sampo@iki.fi>
+ - Linas Vepstas <linas@linas.org>
+ - Bjorn Reese <breese@mail1.stofanet.dk>
+ - Johan Anderson <johan@homemail.com>
+ - Kjell Ericson <Kjell.Ericson@haxx.se>
+ - Troy Engel <tengel@sonic.net>
+ - Ryan Nelson <ryan@inch.com>
+ - Björn Stenberg <bjorn@haxx.se>
+ - Angus Mackay <amackay@gus.ml.org>
+ - Eric Young <eay@cryptsoft.com>
+ - Simon Dick <simond@totally.irrelevant.org>
+ - Oren Tirosh <oren@monty.hishome.net>
+ - Steven G. Johnson <stevenj@alum.mit.edu>
+ - Gilbert Ramirez Jr. <gram@verdict.uthscsa.edu>
+ - Andrés García <ornalux@redestb.es>
+ - Douglas E. Wegscheid <wegscd@whirlpool.com>
+ - Mark Butler <butlerm@xmission.com>
+ - Eric Thelin <eric@generation-i.com>
+ - Marc Boucher <marc@mbsi.ca>
+ - Greg Onufer <Greg.Onufer@Eng.Sun.COM>
+ - Doug Kaufman <dkaufman@rahul.net>
+ - David Eriksson <david@2good.com>
+ - Ralph Beckmann <rabe@uni-paderborn.de>
+ - T. Yamada <tai@imasy.or.jp>
+ - Lars J. Aas <larsa@sim.no>
+ - Jörn Hartroth <Joern.Hartroth@computer.org>
+ - Matthew Clarke <clamat@van.maves.ca>
+ - Linus Nielsen Feltzing <linus@haxx.se>
+ - Felix von Leitner <felix@convergence.de>
+ - Dan Zitter <dzitter@zitter.net>
+ - Jongki Suwandi <Jongki.Suwandi@eng.sun.com>
+ - Chris Maltby <chris@aurema.com>
+ - Ron Zapp <rzapper@yahoo.com>
+ - Paul Marquis <pmarquis@iname.com>
+ - Ellis Pritchard <ellis@citria.com>
+ - Damien Adant <dams@usa.net>
+ - Chris <cbayliss@csc.come>
+ - Marco G. Salvagno <mgs@whiz.cjb.net>
+ - Paul Marquis <pmarquis@iname.com>
+ - David LeBlanc <dleblanc@qnx.com>
+ - Rich Gray at Plus Technologies
+ - Luong Dinh Dung <u8luong@lhsystems.hu>
+ - Torsten Foertsch <torsten.foertsch@gmx.net>
+ - Kristian Köhntopp <kris@koehntopp.de>
+ - Fred Noz <FNoz@siac.com>
+ - Caolan McNamara <caolan@csn.ul.ie>
+ - Albert Chin-A-Young <china@thewrittenword.com>
+ - Stephen Kick <skick@epicrealm.com>
+ - Martin Hedenfalk <mhe@stacken.kth.se>
+ - Richard Prescott <rip at step.polymtl.ca>
+ - Jason S. Priebe <priebe@wral-tv.com>
+ - T. Bharath <TBharath@responsenetworks.com>
+ - Alexander Kourakos <awk@users.sourceforge.net>
+ - James Griffiths <griffiths_james@yahoo.com>
+ - Loic Dachary <loic@senga.org>
+ - Robert Weaver <robert.weaver@sabre.com>
+ - Ingo Ralf Blum <ingoralfblum@ingoralfblum.com>
+ - Jun-ichiro itojun Hagino <itojun@iijlab.net>
+ - Frederic Lepied <flepied@mandrakesoft.com>
+ - Georg Horn <horn@koblenz-net.de>
+ - Cris Bailiff <c.bailiff@awayweb.com>
+ - Sterling Hughes <sterling@designmultimedia.com>
+ - S. Moonesamy
+ - Ingo Wilken <iw@WWW.Ecce-Terram.DE>
+ - Pawel A. Gajda <mis@k2.net.pl>
+ - Patrick Bihan-Faou
+ - Nico Baggus <Nico.Baggus@mail.ing.nl>
+ - Sergio Ballestrero
+ - Andrew Francis <locust@familyhealth.com.au>
+ - Tomasz Lacki <Tomasz.Lacki@primark.pl>
+ - Georg Huettenegger <georg@ist.org>
+ - John Lask <johnlask@hotmail.com>
+ - Eric Lavigne <erlavigne@wanadoo.fr>
+ - Marcus Webster <marcus.webster@phocis.com>
+ - Götz Babin-Ebell <babin­ebell@trustcenter.de>
+ - Andreas Damm <andreas-sourceforge@radab.org>
+ - Jacky Lam <sylam@emsoftltd.com>
+ - James Gallagher <jgallagher@gso.uri.edu>
+ - Kjetil Jacobsen <kjetilja@cs.uit.no>
+ - Markus F.X.J. Oberhumer <markus@oberhumer.com>
+ - Miklos Nemeth <mnemeth@kfkisystems.com>
+ - Kevin Roth <kproth@users.sourceforge.net>
+ - Ralph Mitchell <rmitchell@eds.com>
+ - Dan Fandrich <dan@coneharvesters.com>
+ - Jean-Philippe Barrette-LaPierre <jpb@rrette.com>
+ - Richard Bramante <RBramante@on.com>
diff --git a/main/source/curl/docs/TODO b/main/source/curl/docs/TODO
new file mode 100644
index 00000000..e024b0dc
--- /dev/null
+++ b/main/source/curl/docs/TODO
@@ -0,0 +1,228 @@
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+TODO
+
+ Things to do in project cURL. Please tell us what you think, contribute and
+ send us patches that improve things! Also check the http://curl.haxx.se/dev
+ web section for various technical development notes.
+
+ LIBCURL
+
+ * Introduce an interface to libcurl that allows applications to easier get to
+   know what cookies that are received. Pushing interface that calls a
+   callback on each received cookie? Querying interface that asks about
+   existing cookies? We probably need both. Enable applications to modify
+   existing cookies as well.
+
+ * Make content encoding/decoding internally be made using a filter system.
+
+ * Introduce another callback interface for upload/download that makes one
+   less copy of data and thus a faster operation.
+   [http://curl.haxx.se/dev/no_copy_callbacks.txt]
+
+ * Add asynchronous name resolving (http://libdenise.sf.net/). This should be
+   made to work on most of the supported platforms, or otherwise it isn't
+   really interesting.
+
+ * Data sharing. Tell which easy handles within a multi handle that should
+   share cookies, connection cache, dns cache, ssl session cache.  Full
+   suggestion found here: http://curl.haxx.se/dev/sharing.txt
+
+ * Mutexes. By adding mutex callback support, the 'data sharing' mentioned
+   above can be made between several easy handles running in different threads
+   too. The actual mutex implementations will be left for the application to
+   implement, libcurl will merely call 'getmutex' and 'leavemutex' callbacks.
+   Part of the sharing suggestion at: http://curl.haxx.se/dev/sharing.txt
+
+ * Set the SO_KEEPALIVE socket option to make libcurl notice and disconnect
+   very long time idle connections.
+
+ * Go through the code and verify that libcurl deals with big files >2GB and
+   >4GB all over. Bug reports (and source reviews) indicate that it doesn't
+   currently work properly.
+
+ * CURLOPT_MAXFILESIZE. Prevent downloads that are larger than the specified
+   size. CURLE_FILESIZE_EXCEEDED would then be returned. Gautam Mani
+   requested. That is, the download should not even begin but be aborted
+   immediately.
+
+ * Allow the http_proxy (and other) environment variables to contain user and
+   password as well in the style: http://proxyuser:proxypasswd@proxy:port
+   Berend Reitsma suggested.
+
+ LIBCURL - multi interface
+
+ * Make sure we don't ever loop because of non-blocking sockets return
+   EWOULDBLOCK or similar. This FTP command sending, the SSL connection etc.
+
+ * Make transfers treated more carefully. We need a way to tell libcurl we
+   have data to write, as the current system expects us to upload data each
+   time the socket is writable and there is no way to say that we want to
+   upload data soon just not right now, without that aborting the upload. The
+   opposite situation should be possible as well, that we tell libcurl we're
+   ready to accept read data. Today libcurl feeds the data as soon as it is
+   available for reading, no matter what.
+
+ DOCUMENTATION
+
+ * More and better
+
+ FTP
+
+ * Make CURLOPT_FTPPORT support an additional port number on the IP/if/name,
+   like "blabla:[port]" or possibly even "blabla:[portfirst]-[portsecond]".
+
+ * FTP ASCII upload does not follow RFC959 section 3.1.1.1: "The sender
+   converts the data from an internal character representation to the standard
+   8-bit NVT-ASCII representation (see the Telnet specification).  The
+   receiver will convert the data from the standard form to his own internal
+   form."
+
+ * Since USERPWD always override the user and password specified in URLs, we
+   might need another way to specify user+password for anonymous ftp logins.
+
+ * An option to only download remote FTP files if they're newer than the local
+   one is a good idea, and it would fit right into the same syntax as the
+   already working http dito works (-z). It of course requires that 'MDTM'
+   works, and it isn't a standard FTP command.
+
+ * Add FTPS support with SSL for the data connection too.  This should be made
+   according to the specs written in draft-murray-auth-ftp-ssl-08.txt,
+   "Securing FTP with TLS"
+
+ * --disable-epsv exists, but for active connections we have no --disable-eprt
+   (or even --disable-lprt).
+
+ HTTP
+
+ * If the "body" of the POST is < MSS it really aught to be sent along with
+   the headers. More generally, if the last chunk of the POST body is < MSS,
+   it should be sent with the previous chunk (which may be the POST headers).
+   So long as any one send is larger than MSS (or there is only one send when
+   < MSS :), the Nagle Algorithm will not be a problem on any stack where
+   Nagle is implemented correctly. (pointed out by Rick Jones)
+
+ * Authentication: NTLM. Support for that MS crap called NTLM
+   authentication. MS proxies and servers sometime require that. Since that
+   protocol is a proprietary one, it involves reverse engineering and network
+   sniffing. This should however be a library-based functionality. There are a
+   few different efforts "out there" to make open source HTTP clients support
+   this and it should be possible to take advantage of other people's hard
+   work. http://modntlm.sourceforge.net/ is one. There's a web page at
+   http://www.innovation.ch/java/ntlm.html that contains detailed reverse-
+   engineered info.
+
+ * RFC2617 compliance, "Digest Access Authentication" A valid test page seem
+   to exist at: http://hopf.math.nwu.edu/testpage/digest/ And some friendly
+   person's server source code is available at
+   http://hopf.math.nwu.edu/digestauth/index.html Then there's the Apache
+   mod_digest source code too of course.  It seems as if Netscape doesn't
+   support this, and not many servers do. Although this is a lot better
+   authentication method than the more common "Basic". Basic sends the
+   password in cleartext over the network, this "Digest" method uses a
+   challange-response protocol which increases security quite a lot.
+
+ * Pipelining. Sending multiple requests before the previous one(s) are done.
+   This could possibly be implemented using the multi interface to queue
+   requests and the response data.
+
+ TELNET
+
+ * Make TELNET work on windows98!
+
+ * Reading input (to send to the remote server) on stdin is a crappy solution
+   for library purposes. We need to invent a good way for the application to
+   be able to provide the data to send.
+
+ * Move the telnet support's network select() loop go away and merge the code
+   into the main transfer loop. Until this is done, the multi interface won't
+   work for telnet.
+
+ SSL
+
+ * If you really want to improve the SSL situation, you should probably have a
+   look at SSL cafile loading as well - quick traces look to me like these are
+   done on every request as well, when they should only be necessary once per
+   ssl context (or once per handle). Even better would be to support the SSL
+   CAdir option - instead of loading all of the root CA certs for every
+   request, this option allows you to only read the CA chain that is actually
+   required (into the cache)...
+
+ * Add an interface to libcurl that enables "session IDs" to get
+   exported/imported. Cris Bailiff said: "OpenSSL has functions which can
+   serialise the current SSL state to a buffer of your choice, and
+   recover/reset the state from such a buffer at a later date - this is used
+   by mod_ssl for apache to implement and SSL session ID cache". This whole
+   idea might become moot if we enable the 'data sharing' as mentioned in the
+   LIBCURL label above.
+
+ * OpenSSL supports a callback for customised verification of the peer
+   certificate, but this doesn't seem to be exposed in the libcurl APIs. Could
+   it be? There's so much that could be done if it were! (brought by Chris
+   Clark)
+
+ * Make curl's SSL layer option capable of using other free SSL libraries.
+   Such as the Mozilla Security Services
+   (http://www.mozilla.org/projects/security/pki/nss/) and GNUTLS
+   (http://gnutls.hellug.gr/)
+
+ LDAP
+
+ * Look over the implementation. The looping will have to "go away" from the
+   lib/ldap.c source file and get moved to the main network code so that the
+   multi interface and friends will work for LDAP as well.
+
+ CLIENT
+
+ * Add an option that prevents cURL from overwiting existing local files. When
+   used, and there already is an existing file with the target file name
+   (either -O or -o), a number should be appended (and increased if already
+   existing). So that index.html becomes first index.html.1 and then
+   index.html.2 etc. Jeff Pohlmeyer suggested.
+
+ * "curl ftp://site.com/*.txt"
+
+ * Several URLs can be specified to get downloaded. We should be able to use
+   the same syntax to specify several files to get uploaded (using the same
+   persistant connection), using -T.
+
+ * When the multi interface has been implemented and proved to work, the
+   client could be told to use maximum N simultaneous transfers and then just
+   make sure that happens. It should of course not make more than one
+   connection to the same remote host.
+
+ * Extending the capabilities of the multipart formposting. How about leaving
+   the ';type=foo' syntax as it is and adding an extra tag (headers) which
+   works like this: curl -F "coolfiles=@fil1.txt;headers=@fil1.hdr" where
+   fil1.hdr contains extra headers like
+
+     Content-Type: text/plain; charset=KOI8-R"
+     Content-Transfer-Encoding: base64
+     X-User-Comment: Please don't use browser specific HTML code
+
+   which should overwrite the program reasonable defaults (plain/text,
+   8bit...) (Idea brough to us by kromJx)
+
+ TEST SUITE
+
+ * If perl wasn't found by the configure script, don't attempt to run the
+   tests but explain something nice why it doesn't.
+
+ * Extend the test suite to include more protocols. The telnet could just do
+   ftp or http operations (for which we have test servers).
+
+ * Make the test suite work on more platforms. OpenBSD and Mac OS. Remove
+   fork()s and it should become even more portable.
+
+ * Introduce a test suite that tests libcurl better and more explicitly.
+
+NEXT MAJOR RELEASE
+
+ * curl_easy_cleanup() returns void, but curl_multi_cleanup() returns a
+   CURLMcode. These should be changed to be the same.
+
+ * curl_formparse() should be removed
diff --git a/main/source/curl/docs/TheArtOfHttpScripting b/main/source/curl/docs/TheArtOfHttpScripting
new file mode 100644
index 00000000..4f82a8ef
--- /dev/null
+++ b/main/source/curl/docs/TheArtOfHttpScripting
@@ -0,0 +1,378 @@
+Online:  http://curl.haxx.se/docs/httpscripting.shtml
+Author:  Daniel Stenberg <daniel@haxx.se>
+Date:    October 31, 2001
+Version: 0.5
+
+                The Art Of Scripting HTTP Requests Using Curl
+                =============================================
+
+ This document will assume that you're familiar with HTML and general
+ networking.
+
+ The possibility to write scripts is essential to make a good computer
+ system. Unix' capability to be extended by shell scripts and various tools to
+ run various automated commands and scripts is one reason why it has succeeded
+ so well.
+
+ The increasing amount of applications moving to the web has made "HTTP
+ Scripting" more frequently requested and wanted. To be able to automatically
+ extract information from the web, to fake users, to post or upload data to
+ web servers are all important tasks today.
+
+ Curl is a command line tool for doing all sorts of URL manipulations and
+ transfers, but this particular document will focus on how to use it when
+ doing HTTP requests for fun and profit. I'll assume that you know how to
+ invoke 'curl --help' or 'curl --manual' to get basic information about it.
+
+ Curl is not written to do everything for you. It makes the requests, it gets
+ the data, it sends data and it retrieves the information. You probably need
+ to glue everything together using some kind of script language or repeated
+ manual invokes.
+
+1. The HTTP Protocol
+
+ HTTP is the protocol used to fetch data from web servers. It is a very simple
+ protocol that is built upon TCP/IP. The protocol also allows information to
+ get sent to the server from the client using a few different methods, as will
+ be shown here.
+
+ HTTP is plain ASCII text lines being sent by the client to a server to
+ request a particular action, and then the server replies a few text lines
+ before the actual requested content is sent to the client.
+
+ Using curl's option -v will display what kind of commands curl sends to the
+ server, as well as a few other informational texts. -v is the single most
+ useful option when it comes to debug or even understand the curl<->server
+ interaction.
+
+2. URL
+
+ The Uniform Resource Locator format is how you specify the address of a
+ particular resource on the Internet. You know these, you've seen URLs like
+ http://curl.haxx.se or https://yourbank.com a million times.
+
+3. GET a page
+
+ The simplest and most common request/operation made using HTTP is to get a
+ URL. The URL could itself refer to a web page, an image or a file. The client
+ issues a GET request to the server and receives the document it asked for.
+ If you issue the command line
+
+        curl http://curl.haxx.se
+
+ you get a web page returned in your terminal window. The entire HTML document
+ that that URL holds.
+
+ All HTTP replies contain a set of headers that are normally hidden, use
+ curl's -i option to display them as well as the rest of the document. You can
+ also ask the remote server for ONLY the headers by using the -I option.
+
+4. Forms
+
+ Forms are the general way a web site can present a HTML page with fields for
+ the user to enter data in, and then press some kind of 'OK' or 'submit'
+ button to get that data sent to the server. The server then typically uses
+ the posted data to decide how to act. Like using the entered words to search
+ in a database, or to add the info in a bug track system, display the entered
+ address on a map or using the info as a login-prompt verifying that the user
+ is allowed to see what it is about to see.
+
+ Of course there has to be some kind of program in the server end to receive
+ the data you send. You cannot just invent something out of the air.
+
+ 4.1 GET
+
+  A GET-form uses the method GET, as specified in HTML like:
+
+        <form method="GET" action="junk.cgi">
+          <input type=text name="birthyear">
+          <input type=submit name=press value="OK">
+        </form>
+
+  In your favorite browser, this form will appear with a text box to fill in
+  and a press-button labeled "OK". If you fill in '1905' and press the OK
+  button, your browser will then create a new URL to get for you. The URL will
+  get "junk.cgi?birthyear=1905&press=OK" appended to the path part of the
+  previous URL.
+
+  If the original form was seen on the page "www.hotmail.com/when/birth.html",
+  the second page you'll get will become
+  "www.hotmail.com/when/junk.cgi?birthyear=1905&press=OK".
+
+  Most search engines work this way.
+
+  To make curl do the GET form post for you, just enter the expected created
+  URL:
+
+        curl "www.hotmail.com/when/junk.cgi?birthyear=1905&press=OK"
+
+ 4.2 POST
+
+  The GET method makes all input field names get displayed in the URL field of
+  your browser. That's generally a good thing when you want to be able to
+  bookmark that page with your given data, but it is an obvious disadvantage
+  if you entered secret information in one of the fields or if there are a
+  large amount of fields creating a very long and unreadable URL.
+
+  The HTTP protocol then offers the POST method. This way the client sends the
+  data separated from the URL and thus you won't see any of it in the URL
+  address field.
+
+  The form would look very similar to the previous one:
+
+        <form method="POST" action="junk.cgi">
+          <input type=text name="birthyear">
+          <input type=submit name=press value="OK">
+        </form>
+
+  And to use curl to post this form with the same data filled in as before, we
+  could do it like:
+
+        curl -d "birthyear=1905&press=OK" www.hotmail.com/when/junk.cgi
+
+  This kind of POST will use the Content-Type
+  application/x-www-form-urlencoded and is the most widely used POST kind.
+
+ 4.3 FILE UPLOAD POST
+
+  Back in late 1995 they defined a new way to post data over HTTP. It was
+  documented in the RFC 1867, why this method sometimes is referred to as
+  a RFC1867-posting.
+
+  This method is mainly designed to better support file uploads. A form that
+  allows a user to upload a file could be written like this in HTML:
+
+    <form method="POST" enctype='multipart/form-data' action="upload.cgi">
+      <input type=file name=upload>
+      <input type=submit name=press value="OK">
+    </form>
+
+  This clearly shows that the Content-Type about to be sent is
+  multipart/form-data.
+
+  To post to a form like this with curl, you enter a command line like:
+
+        curl -F upload=@localfilename -F press=OK [URL]
+
+ 4.4 HIDDEN FIELDS
+
+  A very common way for HTML based application to pass state information
+  between pages is to add hidden fields to the forms. Hidden fields are
+  already filled in, they aren't displayed to the user and they get passed
+  along just as all the other fields.
+
+  A similar example form with one visible field, one hidden field and one
+  submit button could look like:
+
+    <form method="POST" action="foobar.cgi">
+      <input type=text name="birthyear">
+      <input type=hidden name="person" value="daniel">
+      <input type=submit name="press" value="OK">
+    </form>
+
+  To post this with curl, you won't have to think about if the fields are
+  hidden or not. To curl they're all the same:
+
+        curl -d "birthyear=1905&press=OK&person=daniel" [URL]
+
+ 4.5 FIGURE OUT WHAT A POST LOOKS LIKE
+
+  When you're about fill in a form and send to a server by using curl instead
+  of a browser, you're of course very interested in sending a POST exactly the
+  way your browser does.
+
+  An easy way to get to see this, is to save the HTML page with the form on
+  your local disk, modify the 'method' to a GET, and press the submit button
+  (you could also change the action URL if you want to).
+
+  You will then clearly see the data get appended to the URL, separated with a
+  '?'-letter as GET forms are supposed to.
+
+5. PUT
+
+ The perhaps best way to upload data to a HTTP server is to use PUT. Then
+ again, this of course requires that someone put a program or script on the
+ server end that knows how to receive a HTTP PUT stream.
+
+ Put a file to a HTTP server with curl:
+
+        curl -T uploadfile www.uploadhttp.com/receive.cgi
+
+6. AUTHENTICATION
+
+ Authentication is the ability to tell the server your username and password
+ so that it can verify that you're allowed to do the request you're doing. The
+ basic authentication used in HTTP is *plain* *text* based, which means it
+ sends username and password only slightly obfuscated, but still fully
+ readable by anyone that sniffs on the network between you and the remote
+ server.
+
+ To tell curl to use a user and password for authentication:
+
+        curl -u name:password www.secrets.com
+ 
+ Sometimes your HTTP access is only available through the use of a HTTP
+ proxy. This seems to be especially common at various companies. A HTTP proxy
+ may require its own user and password to allow the client to get through to
+ the Internet. To specify those with curl, run something like:
+
+        curl -U proxyuser:proxypassword curl.haxx.se
+
+ If you use any one these user+password options but leave out the password
+ part, curl will prompt for the password interactively.
+
+ Do note that when a program is run, its parameters are possible to see when
+ listing the running processes of the system. Thus, other users may be able to
+ watch your passwords if you pass them as plain command line options. There
+ are ways to circumvent this.
+
+7. REFERER
+
+ A HTTP request may include a 'referer' field, which can be used to tell from
+ which URL the client got to this particular resource. Some programs/scripts
+ check the referer field of requests to verify that this wasn't arriving from
+ an external site or an unknown page. While this is a stupid way to check
+ something so easily forged, many scripts still do it. Using curl, you can put
+ anything you want in the referer-field and thus more easily be able to fool
+ the server into serving your request.
+
+ Use curl to set the referer field with:
+
+        curl -e http://curl.haxx.se daniel.haxx.se
+
+8. USER AGENT
+
+ Very similar to the referer field, all HTTP requests may set the User-Agent
+ field. It names what user agent (client) that is being used. Many
+ applications use this information to decide how to display pages. Silly web
+ programmers try to make different pages for users of different browsers to
+ make them look the best possible for their particular browsers. They usually
+ also do different kinds of javascript, vbscript etc.
+
+ At times, you will see that getting a page with curl will not return the same
+ page that you see when getting the page with your browser. Then you know it
+ is time to set the User Agent field to fool the server into thinking you're
+ one of those browsers.
+
+ To make curl look like Internet Explorer on a Windows 2000 box:
+
+        curl -A "Mozilla/4.0 (compatible; MSIE 5.01; Windows NT 5.0)" [URL]
+
+ Or why not look like you're using Netscape 4.73 on a Linux (PIII) box:
+
+        curl -A "Mozilla/4.73 [en] (X11; U; Linux 2.2.15 i686)" [URL]
+
+9. REDIRECTS
+
+ When a resource is requested from a server, the reply from the server may
+ include a hint about where the browser should go next to find this page, or a
+ new page keeping newly generated output. The header that tells the browser
+ to redirect is Location:.
+
+ Curl does not follow Location: headers by default, but will simply display
+ such pages in the same manner it display all HTTP replies. It does however
+ feature an option that will make it attempt to follow the Location: pointers.
+
+ To tell curl to follow a Location: 
+ 
+        curl -L www.sitethatredirects.com
+
+ If you use curl to POST to a site that immediately redirects you to another
+ page, you can safely use -L and -d/-F together. Curl will only use POST in
+ the first request, and then revert to GET in the following operations.
+
+10. COOKIES
+
+ The way the web browsers do "client side state control" is by using
+ cookies. Cookies are just names with associated contents. The cookies are
+ sent to the client by the server. The server tells the client for what path
+ and host name it wants the cookie sent back, and it also sends an expiration
+ date and a few more properties.
+
+ When a client communicates with a server with a name and path as previously
+ specified in a received cookie, the client sends back the cookies and their
+ contents to the server, unless of course they are expired.
+
+ Many applications and servers use this method to connect a series of requests
+ into a single logical session. To be able to use curl in such occasions, we
+ must be able to record and send back cookies the way the web application
+ expects them. The same way browsers deal with them.
+
+ The simplest way to send a few cookies to the server when getting a page with
+ curl is to add them on the command line like:
+
+        curl -b "name=Daniel" www.cookiesite.com
+
+ Cookies are sent as common HTTP headers. This is practical as it allows curl
+ to record cookies simply by recording headers. Record cookies with curl by
+ using the -D option like:
+
+        curl -D headers_and_cookies www.cookiesite.com
+
+ Curl has a full blown cookie parsing engine built-in that comes to use if you
+ want to reconnect to a server and use cookies that were stored from a
+ previous connection (or handicrafted manually to fool the server into
+ believing you had a previous connection). To use previously stored cookies,
+ you run curl like:
+
+        curl -b stored_cookies_in_file www.cookiesite.com
+
+ Curl's "cookie engine" gets enabled when you use the -b option. If you only
+ want curl to understand received cookies, use -b with a file that doesn't
+ exist. Example, if you want to let curl understand cookies from a page and
+ follow a location (and thus possibly send back cookies it received), you can
+ invoke it like:
+
+        curl -b nada -L www.cookiesite.com
+
+ Curl has the ability to read and write cookie files that use the same file
+ format that Netscape and Mozilla do. It is a convenient way to share cookies
+ between browsers and automatic scripts. The -b switch automatically detects
+ if a given file is such a cookie file and parses it, and by using the
+ -c/--cookie-jar option you'll make curl write a new cookie file at the end of
+ an operation:
+
+        curl -b cookies.txt -c newcookies.txt www.cookiesite.com
+
+11. HTTPS
+
+ There are a few ways to do secure HTTP transfers. The by far most common
+ protocol for doing this is what is generally known as HTTPS, HTTP over
+ SSL. SSL encrypts all the data that is sent and received over the network and
+ thus makes it harder for attackers to spy on sensitive information.
+
+ SSL (or TLS as the latest version of the standard is called) offers a
+ truckload of advanced features to allow all those encryptions and key
+ infrastructure mechanisms encrypted HTTP requires.
+
+ Curl supports encrypted fetches thanks to the freely available OpenSSL
+ libraries. To get a page from a HTTPS server, simply run curl like:
+
+        curl https://that.secure.server.com
+
+ 11.1 CERTIFICATES
+
+  In the HTTPS world, you use certificates to validate that you are the one
+  you you claim to be, as an addition to normal passwords. Curl supports
+  client-side certificates. All certificates are locked with a PIN-code, why
+  you need to enter the unlock-code before the certificate can be used by
+  curl. The PIN-code can be specified on the command line or if not, entered
+  interactively when curl queries for it. Use a certificate with curl on a
+  HTTPS server like:
+
+        curl -E mycert.pem https://that.secure.server.com
+
+12. REFERENCES
+
+ RFC 2616 is a must to read if you want in-depth understanding of the HTTP
+ protocol.
+
+ RFC 2396 explains the URL syntax.
+
+ RFC 2109 defines how cookies are supposed to work.
+
+ RFC 1867 defines the HTTP post upload format.
+
+ http://www.openssl.org is the home of the OpenSSL project
+
+ http://curl.haxx.se is the home of the cURL project
diff --git a/main/source/curl/docs/VERSIONS b/main/source/curl/docs/VERSIONS
new file mode 100644
index 00000000..48be6719
--- /dev/null
+++ b/main/source/curl/docs/VERSIONS
@@ -0,0 +1,64 @@
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+Version Numbers and Releases
+
+ Curl is not only curl. Curl is also libcurl. They're actually individually
+ versioned, but they mostly follow each other rather closely.
+
+ The version numbering is always built up using the same system:
+
+        X.Y[.Z][-preN]
+
+ Where
+   X is main version number
+   Y is release number
+   Z is patch number
+   N is pre-release number
+
+ One of these numbers will get bumped in each new release. The numbers to the
+ right of a bumped number will be reset to zero. If Z is zero, it is not
+ included in the version number. The pre release number is only included in
+ pre releases (they're never used in public, official, releases).
+
+ The main version number will get bumped when *really* big, world colliding
+ changes are made. The release number is bumped when big changes are
+ performed. The patch number is bumped when the changes are mere bugfixes and
+ only minor feature changes. The pre-release is a counter, to identify which
+ pre-release a certain release is.
+
+ When reaching the end of a pre-release period, the version without the
+ pre-release part will be released as a public release.
+
+ It means that after release 1.2.3, we can release 2.0 if something really big
+ has been made, 1.3 if not that big changes were made or 1.2.4 if mostly bugs
+ were fixed. Before 1.2.4 is released, we might release a 1.2.4-pre1 release
+ for the brave people to try before the actual release.
+
+ Bumping, as in increasing the number with 1, is unconditionally only
+ affecting one of the numbers (except the ones to the right of it, that may be
+ set to zero). 1 becomes 2, 3 becomes 4, 9 becomes 10, 88 becomes 89 and 99
+ becomes 100. So, after 1.2.9 comes 1.2.10. After 3.99.3, 3.100 might come.
+
+ All original curl source release archives are named according to the libcurl
+ version (not according to the curl client version that, as said before, might
+ differ).
+
+ As a service to any application that might want to support new libcurl
+ features while still being able to build with older versions, all releases
+ have the libcurl version stored in the curl/curl.h file using a static
+ numbering scheme that can be used for comparison. The version number is
+ defined as:
+        
+        #define LIBCURL_VERSION_NUM 0xXXYYZZ
+
+ Where XX, YY and ZZ are the main version, release and patch numbers in
+ hexadecimal. All three numbers are always represented using two digits.  1.2
+ would appear as "0x010200" while version 9.11.7 appears as "0x090b07".
+
+ This 6-digit hexadecimal number does not show pre-release number, and it is
+ always a greater number in a more recent release. It makes comparisons with
+ greater than and less than work.
diff --git a/main/source/curl/docs/curl-config.1 b/main/source/curl/docs/curl-config.1
new file mode 100644
index 00000000..921f05bd
--- /dev/null
+++ b/main/source/curl/docs/curl-config.1
@@ -0,0 +1,64 @@
+.\" You can view this file with:
+.\" nroff -man curl-config.1
+.\" Written by Daniel Stenberg
+.\"
+.TH curl-config 1 "8 Oct 2002" "Curl 7.10" "curl-config manual"
+.SH NAME
+curl-config \- Get information about a libcurl installation
+.SH SYNOPSIS
+.B curl-config [options]
+.SH DESCRIPTION
+.B curl-config
+displays information about a previous curl and libcurl installation.
+.SH OPTIONS
+.IP "--ca"
+Displays the built-in path to the CA cert bundle this libcurl uses.
+.IP "--cc"
+Displays the compiler used to build libcurl.
+.IP "--cflags"
+Set of compiler options (CFLAGS) to use when compiling files that use
+libcurl. Currently that is only thw include path to the curl include files.
+.IP "--feature"
+Lists what particular main features the installed libcurl was built with. At
+the time of writing, this list may include SSL, KRB4 or IPv6. Do not assume
+any particular order. The keywords will be separated by newlines. There may be
+none, one or several keywords in the list.
+.IP "--help"
+Displays the available options.
+.IP "--libs"
+Shows the complete set of libs and other linker options you will need in order
+to link your application with libcurl.
+.IP "--prefix"
+This is the prefix used when libcurl was installed. Libcurl is then installed
+in $prefix/lib and its header files are installed in $prefix/include and so
+on. The prefix is set with "configure --prefix".
+.IP "--version"
+Outputs version information about the installed libcurl.
+.IP "--vernum"
+Outputs version information about the installed libcurl, in numerical mode.
+This outputs the version number, in hexadecimal, with 8 bits for each part;
+major, minor, patch. So that libcurl 7.7.4 would appear as 070704 and libcurl
+12.13.14 would appear as 0c0d0e...
+.SH "EXAMPLES"
+What linker options do I need when I link with libcurl?
+
+  $ curl-config --libs
+
+What compiler options do I need when I compile using libcurl functions?
+
+  $ curl-config --cflags
+
+How do I know if libcurl was built with SSL support?
+
+  $ curl-config --feature | grep SSL
+
+What's the installed libcurl version?
+
+  $ curl-config --version
+
+How do I build a single file with a one-line command?
+
+  $ `curl-config --cc --cflags --libs` -o example example.c
+
+.SH "SEE ALSO"
+.BR curl (1)
diff --git a/main/source/curl/docs/curl-config.html b/main/source/curl/docs/curl-config.html
new file mode 100644
index 00000000..eacdd0b6
--- /dev/null
+++ b/main/source/curl/docs/curl-config.html
@@ -0,0 +1,124 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl-config - Get information about a libcurl installation
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>curl-config</B> <B>[options]</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       <B>curl-config</B> displays information about a previous curl and
+       libcurl installation.
+
+
+</PRE>
+<H2>OPTIONS</H2><PRE>
+       --ca   Displays  the  built-in  path to the CA cert bundle
+              this libcurl uses.
+
+       --cc   Displays the compiler used to build libcurl.
+
+       --cflags
+              Set of compiler options (CFLAGS) to use  when  com-
+              piling  files  that  use libcurl. Currently that is
+              only thw include path to the curl include files.
+
+       --feature
+              Lists what particular main features  the  installed
+              libcurl  was  built  with.  At the time of writing,
+              this list may include SSL, KRB4  or  IPv6.  Do  not
+              assume  any  particular order. The keywords will be
+              separated by newlines. There may be  none,  one  or
+              several keywords in the list.
+
+       --help Displays the available options.
+
+       --libs Shows  the  complete  set  of libs and other linker
+              options you will need in order to link your  appli-
+              cation with libcurl.
+
+       --prefix
+              This is the prefix used when libcurl was installed.
+              Libcurl is then installed in  $prefix/lib  and  its
+              header  files  are installed in $prefix/include and
+              so on. The prefix is set with "configure --prefix".
+
+       --version
+              Outputs  version  information  about  the installed
+              libcurl.
+
+       --vernum
+              Outputs version  information  about  the  installed
+              libcurl,  in numerical mode.  This outputs the ver-
+              sion number, in hexadecimal, with 8 bits  for  each
+              part;  major,  minor,  patch. So that libcurl 7.7.4
+              would appear as 070704 and libcurl  12.13.14  would
+              appear as 0c0d0e...
+
+       What linker options do I need when I link with libcurl?
+
+         $ curl-config --libs
+
+       What  compiler  options  do  I  need  when I compile using
+       libcurl functions?
+
+         $ curl-config --cflags
+
+       How do I know if libcurl was built with SSL support?
+
+         $ curl-config --feature | grep SSL
+
+       What's the installed libcurl version?
+
+         $ curl-config --version
+
+       How do I build a single file with a one-line command?
+
+         $ `curl-config --cc --cflags --libs`  -o  example  exam-
+       ple.c
+
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>curl(1)</B>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/curl-config.pdf b/main/source/curl/docs/curl-config.pdf
new file mode 100644
index 00000000..c84fb9e2
Binary files /dev/null and b/main/source/curl/docs/curl-config.pdf differ
diff --git a/main/source/curl/docs/curl.1 b/main/source/curl/docs/curl.1
new file mode 100644
index 00000000..a72f3818
--- /dev/null
+++ b/main/source/curl/docs/curl.1
@@ -0,0 +1,959 @@
+.\" You can view this file with:
+.\" nroff -man curl.1
+.\" Written by Daniel Stenberg
+.\"
+.TH curl 1 "14 Feb 2003" "Curl 7.10.3" "Curl Manual"
+.SH NAME
+curl \- transfer a URL
+.SH SYNOPSIS
+.B curl [options]
+.I [URL...]
+.SH DESCRIPTION
+.B curl
+is a client to get documents/files from or send documents to a server, using
+any of the supported protocols (HTTP, HTTPS, FTP, GOPHER, DICT, TELNET, LDAP
+or FILE). The command is designed to work without user interaction or any kind
+of interactivity.
+
+curl offers a busload of useful tricks like proxy support, user
+authentication, ftp upload, HTTP post, SSL (https:) connections, cookies, file
+transfer resume and more.
+.SH URL
+The URL syntax is protocol dependent. You'll find a detailed description in
+RFC 2396.
+
+You can specify multiple URLs or parts of URLs by writing part sets within
+braces as in:
+
+ http://site.{one,two,three}.com
+
+or you can get sequences of alphanumeric series by using [] as in:
+
+ ftp://ftp.numericals.com/file[1-100].txt
+ ftp://ftp.numericals.com/file[001-100].txt    (with leading zeros)
+ ftp://ftp.letters.com/file[a-z].txt
+
+It is possible to specify up to 9 sets or series for a URL, but no nesting is
+supported at the moment:
+
+ http://www.any.org/archive[1996-1999]/volume[1-4]part{a,b,c,index}.html
+
+You can specify any amount of URLs on the command line. They will be fetched
+in a sequential manner in the specified order.
+
+Curl will attempt to re-use connections for multiple file transfers, so that
+getting many files from the same server will not do multiple connects /
+handshakes. This improves speed. Of course this is only done on files
+specified on a single command line and cannot be used between separate curl
+invokes.
+.SH OPTIONS
+.IP "-a/--append"
+(FTP)
+When used in a ftp upload, this will tell curl to append to the target
+file instead of overwriting it. If the file doesn't exist, it will
+be created.
+
+If this option is used twice, the second one will disable append mode again.
+.IP "-A/--user-agent <agent string>"
+(HTTP)
+Specify the User-Agent string to send to the HTTP server. Some badly done CGIs
+fail if its not set to "Mozilla/4.0".  To encode blanks in the string,
+surround the string with single quote marks.  This can also be set with the
+-H/--header flag of course.
+
+If this option is set more than once, the last one will be the one that's
+used.
+.IP "-b/--cookie <name=data>"
+(HTTP)
+Pass the data to the HTTP server as a cookie. It is supposedly the
+data previously received from the server in a "Set-Cookie:" line.
+The data should be in the format "NAME1=VALUE1; NAME2=VALUE2".
+
+If no '=' letter is used in the line, it is treated as a filename to use to
+read previously stored cookie lines from, which should be used in this session
+if they match. Using this method also activates the "cookie parser" which will
+make curl record incoming cookies too, which may be handy if you're using this
+in combination with the -L/--location option. The file format of the file to
+read cookies from should be plain HTTP headers or the Netscape/Mozilla cookie
+file format.
+
+.B NOTE
+that the file specified with -b/--cookie is only used as input. No cookies
+will be stored in the file. To store cookies, save the HTTP headers to a file
+using -D/--dump-header!
+
+If this option is set more than once, the last one will be the one that's
+used.
+.IP "-B/--use-ascii"
+Use ASCII transfer when getting an FTP file or LDAP info. For FTP, this can
+also be enforced by using an URL that ends with ";type=A". This option causes
+data sent to stdout to be in text mode for win32 systems.
+
+If this option is used twice, the second one will disable ASCII usage.
+.IP "--ciphers <list of ciphers>"
+(SSL) Specifies which ciphers to use in the connection. The list of ciphers
+must be using valid ciphers. Read up on SSL cipher list details on this URL:
+.I http://www.openssl.org/docs/apps/ciphers.html (Option added in curl 7.9)
+
+If this option is used several times, the last one will override the others.
+.IP "--compressed"
+(HTTP) Request a compressed response using the deflate or gzip
+algorithms and return the uncompressed document.  If this option is used
+and the server sends an unsupported encoding, Curl will report an error.
+.IP "--connect-timeout <seconds>"
+Maximum time in seconds that you allow the connection to the server to take.
+This only limits the connection phase, once curl has connected this option is
+of no more use. See also the \fI--max-time\fP option.
+
+If this option is used several times, the last one will be used.
+.IP "-c/--cookie-jar <file name>"
+Specify to which file you want curl to write all cookies after a completed
+operation. Curl writes all cookies previously read from a specified file as
+well as all cookies received from remote server(s). If no cookies are known,
+no file will be written. The file will be written using the Netscape cookie
+file format. If you set the file name to a single dash, "-", the cookies will
+be written to stdout. (Option added in curl 7.9)
+
+.B NOTE
+If the cookie jar can't be created or written to, the whole curl operation
+won't fail or even report an error clearly. Using -v will get a warning
+displayed, but that is the only visible feedback you get about this possibly
+lethal situation.
+
+If this option is used several times, the last specfied file name will be
+used.
+.IP "-C/--continue-at <offset>"
+Continue/Resume a previous file transfer at the given offset. The given offset
+is the exact number of bytes that will be skipped counted from the beginning
+of the source file before it is transfered to the destination.  If used with
+uploads, the ftp server command SIZE will not be used by curl.
+
+Use "-C -" to tell curl to automatically find out where/how to resume the
+transfer. It then uses the given output/input files to figure that out.
+
+If this option is used several times, the last one will be used.
+.IP "--create-dirs"
+When used in conjunction with the -o option, curl will create the necessary 
+local directory hierarchy as needed.
+.IP "--crlf"
+(FTP) Convert LF to CRLF in upload. Useful for MVS (OS/390).
+
+If this option is used twice, the second will again disable crlf converting.
+.IP "-d/--data <data>"
+(HTTP) Sends the specified data in a POST request to the HTTP server, in a way
+that can emulate as if a user has filled in a HTML form and pressed the submit
+button. Note that the data is sent exactly as specified with no extra
+processing (with all newlines cut off).  The data is expected to be
+"url-encoded". This will cause curl to pass the data to the server using the
+content-type application/x-www-form-urlencoded. Compare to -F. If more than
+one -d/--data option is used on the same command line, the data pieces
+specified will be merged together with a separating &-letter. Thus, using '-d
+name=daniel -d skill=lousy' would generate a post chunk that looks like
+\&'name=daniel&skill=lousy'.
+
+If you start the data with the letter @, the rest should be a file name to
+read the data from, or - if you want curl to read the data from stdin.  The
+contents of the file must already be url-encoded. Multiple files can also be
+specified. Posting data from a file named 'foobar' would thus be done with
+"--data @foobar".
+
+To post data purely binary, you should instead use the --data-binary option.
+
+-d/--data is the same as --data-ascii.
+
+If this option is used several times, the ones following the first will
+append data.
+.IP "--data-ascii <data>"
+(HTTP) This is an alias for the -d/--data option.
+
+If this option is used several times, the ones following the first will
+append data.
+.IP "--data-binary <data>"
+(HTTP) This posts data in a similar manner as --data-ascii does, although when
+using this option the entire context of the posted data is kept as-is. If you
+want to post a binary file without the strip-newlines feature of the
+--data-ascii option, this is for you.
+
+If this option is used several times, the ones following the first will
+append data.
+.IP "--disable-epsv"
+(FTP) Tell curl to disable the use of the EPSV command when doing passive FTP
+downloads. Curl will normally always first attempt to use EPSV before PASV,
+but with this option, it will not try using EPSV.
+
+If this option is used several times, each occurrence will toggle this on/off.
+.IP "-D/--dump-header <file>"
+Write the protocol headers to the specified file.
+
+This option is handy to use when you want to store the cookies that a HTTP
+site sends to you. The cookies could then be read in a second curl invoke by
+using the -b/--cookie option!
+
+When used on FTP, the ftp server response lines are considered being "headers"
+and thus are saved there.
+
+If this option is used several times, the last one will be used.
+.IP "-e/--referer <URL>"
+(HTTP) Sends the "Referer Page" information to the HTTP server. This can also
+be set with the -H/--header flag of course.  When used with
+.I -L/--location 
+you can append ";auto" to the referer URL to make curl automatically set the
+previous URL when it follows a Location: header. The ";auto" string can be
+used alone, even if you don't set an initial referer.
+
+If this option is used several times, the last one will be used.
+.IP "--environment"
+(RISC OS ONLY) Sets a range of environment variables, using the names the -w
+option supports, to easier allow extraction of useful information after having
+run curl.
+
+If this option is used several times, each occurrence will toggle this on/off.
+.IP "--egd-file <file>"
+(HTTPS) Specify the path name to the Entropy Gathering Daemon socket. The
+socket is used to seed the random engine for SSL connections. See also the
+.I "--random-file"
+option.
+.IP "-E/--cert <certificate[:password]>"
+(HTTPS)
+Tells curl to use the specified certificate file when getting a file
+with HTTPS. The certificate must be in PEM format.
+If the optional password isn't specified, it will be queried for on
+the terminal. Note that this certificate is the private key and the private
+certificate concatenated!
+
+If this option is used several times, the last one will be used.
+.IP "--cacert <CA certificate>"
+(HTTPS) Tells curl to use the specified certificate file to verify the
+peer. The file may contain multiple CA certificates. The certificate(s) must
+be in PEM format.
+
+curl recognizes the environment variable named 'CURL_CA_BUNDLE' if that is
+set, and uses the given path as a path to a CA cert bundle. This option
+overrides that variable.
+
+The windows version of curl will automatically look for a CA certs file named
+\'curl-ca-bundle.crt\', either in the same directory as curl.exe, or in the
+Current Working Directory, or in any folder along your PATH.
+
+If this option is used several times, the last one will be used.
+.IP "--capath <CA certificate directory>"
+(HTTPS) Tells curl to use the specified certificate directory to verify the
+peer. The certificates must be in PEM format, and the directory must have been
+processed using the c_rehash utility supplied with openssl. Using --capath can
+allow curl to make https connections much more efficiently than using --cacert
+if the --cacert file contains many CA certificates.
+
+If this option is used several times, the last one will be used.
+.IP "-f/--fail"
+(HTTP) Fail silently (no output at all) on server errors. This is mostly done
+like this to better enable scripts etc to better deal with failed attempts. In
+normal cases when a HTTP server fails to deliver a document, it returns a HTML
+document stating so (which often also describes why and more). This flag will
+prevent curl from outputting that and fail silently instead.
+
+If this option is used twice, the second will again disable silent failure.
+.IP "-F/--form <name=content>"
+(HTTP) This lets curl emulate a filled in form in which a user has pressed the
+submit button. This causes curl to POST data using the content-type
+multipart/form-data according to RFC1867. This enables uploading of binary
+files etc. To force the 'content' part to be be a file, prefix the file name
+with an @ sign. To just get the content part from a file, prefix the file name
+with the letter <. The difference between @ and < is then that @ makes a file
+get attached in the post as a file upload, while the < makes a text field and
+just get the contents for that text field from a file.
+
+Example, to send your password file to the server, where
+\&'password' is the name of the form-field to which /etc/passwd will be the
+input:
+
+\fBcurl\fP -F password=@/etc/passwd www.mypasswords.com
+
+To read the file's content from stdin insted of a file, use - where the file
+name should've been. This goes for both @ and < constructs.
+
+You can also tell curl what Content-Type to use for the file upload part, by
+using 'type=', in a manner similar to:
+
+\fBcurl\fP -F "web=@index.html;type=text/html" url.com
+
+See further examples and details in the MANUAL.
+
+This option can be used multiple times.
+.IP "-g/--globoff"
+This option switches off the "URL globbing parser". When you set this option,
+you can specify URLs that contain the letters {}[] without having them being
+interpreted by curl itself. Note that these letters are not normal legal URL
+contents but they should be encoded according to the URI standard.
+.IP "-G/--get"
+When used, this option will make all data specified with -d/--data or
+--data-binary to be used in a HTTP GET request instead of the POST request
+that otherwise would be used. The data will be appended to the URL with a '?'
+separator. (Option added in curl 7.9)
+
+If used in combination with -I, the POST data will instead be appended to the
+URL with a HEAD request.
+
+If used multiple times, nothing special happens.
+.IP "-h/--help"
+Usage help.
+.IP "-H/--header <header>"
+(HTTP) Extra header to use when getting a web page. You may specify any number
+of extra headers. Note that if you should add a custom header that has the
+same name as one of the internal ones curl would use, your externally set
+header will be used instead of the internal one. This allows you to make even
+trickier stuff than curl would normally do. You should not replace internally
+set headers without knowing perfectly well what you're doing. Replacing an
+internal header with one without content on the right side of the colon will
+prevent that header from appearing.
+
+This option can be used multiple times to add/replace/remove multiple headers.
+.IP "-i/--include"
+(HTTP)
+Include the HTTP-header in the output. The HTTP-header includes things
+like server-name, date of the document, HTTP-version and more...
+
+If this option is used twice, the second will again disable header include.
+.IP "--interface <name>"
+Perform an operation using a specified interface. You can enter interface
+name, IP address or host name. An example could look like:
+
+.B "curl --interface eth0:1 http://www.netscape.com/"
+
+If this option is used several times, the last one will be used.
+.IP "-I/--head"
+(HTTP/FTP)
+Fetch the HTTP-header only! HTTP-servers feature the command HEAD
+which this uses to get nothing but the header of a document. When used
+on a FTP file, curl displays the file size only.
+
+If this option is used twice, the second will again disable header only.
+.IP "-j/--junk-session-cookies"
+(HTTP) When curl is told to read cookies from a given file, this option will
+make it discard all "session cookies". This will basicly have the same effect
+as if a new session is started. Typical browsers always discard session
+cookies when they're closed down. (Added in 7.9.7)
+
+If this option is used several times, each occurrence will toggle this on/off.
+.IP "-k/--insecure"
+(SSL) This option explicitly allows curl to perform "insecure" SSL connections
+and transfers. Starting with curl 7.10, all SSL connections will be attempted
+to be made secure by using the CA certificate bundle installed by
+default. This makes all connections considered "insecure" to fail unless
+-k/--insecure is used.
+
+This option is ignored if --cacert or --capath is used!
+
+If this option is used twice, the second time will again disable it.
+.IP "--krb4 <level>"
+(FTP) Enable kerberos4 authentication and use. The level must be entered and
+should be one of 'clear', 'safe', 'confidential' or 'private'. Should you use
+a level that is not one of these, 'private' will instead be used.
+
+If this option is used several times, the last one will be used.
+.IP "-K/--config <config file>"
+Specify which config file to read curl arguments from. The config file is a
+text file in which command line arguments can be written which then will be
+used as if they were written on the actual command line. Options and their
+parameters must be specified on the same config file line. If the parameter is
+to contain white spaces, the parameter must be inclosed within quotes.  If the
+first column of a config line is a '#' character, the rest of the line will be
+treated as a comment.
+
+Specify the filename as '-' to make curl read the file from stdin.
+
+Note that to be able to specify a URL in the config file, you need to specify
+it using the --url option, and not by simply writing the URL on its own
+line. So, it could look similar to this:
+
+url = "http://curl.haxx.se/docs/"
+
+This option can be used multiple times.
+.IP "--limit-rate <speed>"
+Specify the maximum transfer rate you want curl to use. This feature is useful
+if you have a limited pipe and you'd like your transfer not use your entire
+bandwidth.
+
+The given speed is measured in bytes/second, unless a suffix is
+appended. Appending 'k' or 'K' will count the number as kilobytes, 'm' or M'
+makes it megabytes while 'g' or 'G' makes it gigabytes. Examples: 200K, 3m and
+1G.
+
+This option was introduced in curl 7.10.
+
+If this option is used several times, the last one will be used.
+.IP "-l/--list-only"
+(FTP)
+When listing an FTP directory, this switch forces a name-only view.
+Especially useful if you want to machine-parse the contents of an FTP
+directory since the normal directory view doesn't use a standard look
+or format.
+
+This option causes an FTP NLST command to be sent.  Some FTP servers
+list only files in their response to NLST; they do not include
+subdirectories and symbolic links.
+
+If this option is used twice, the second will again disable list only.
+.IP "-L/--location"
+(HTTP/HTTPS) If the server reports that the requested page has a different
+location (indicated with the header line Location:) this flag will let curl
+attempt to reattempt the get on the new place. If used together with -i or -I,
+headers from all requested pages will be shown. If this flag is used when
+making a HTTP POST, curl will automatically switch to GET after the initial
+POST has been done.
+
+If this option is used twice, the second will again disable location following.
+.IP "-m/--max-time <seconds>"
+Maximum time in seconds that you allow the whole operation to take.  This is
+useful for preventing your batch jobs from hanging for hours due to slow
+networks or links going down.  This doesn't work fully in win32 systems.  See
+also the \fI--connect-timeout\fP option.
+
+If this option is used several times, the last one will be used.
+.IP "-M/--manual"
+Manual. Display the huge help text.
+.IP "-n/--netrc"
+Makes curl scan the
+.I .netrc
+file in the user's home directory for login name and password. This is
+typically used for ftp on unix. If used with http, curl will enable user
+authentication. See
+.BR netrc(4)
+or
+.BR ftp(1)
+for details on the file format. Curl will not complain if that file
+hasn't the right permissions (it should not be world nor group
+readable). The environment variable "HOME" is used to find the home
+directory.
+
+A quick and very simple example of how to setup a
+.I .netrc
+to allow curl to ftp to the machine host.domain.com with user name
+\&'myself' and password 'secret' should look similar to:
+
+.B "machine host.domain.com login myself password secret"
+
+If this option is used twice, the second will again disable netrc usage.
+.IP "-N/--no-buffer"
+Disables the buffering of the output stream. In normal work situations, curl
+will use a standard buffered output stream that will have the effect that it
+will output the data in chunks, not necessarily exactly when the data arrives.
+Using this option will disable that buffering.
+
+If this option is used twice, the second will again switch on buffering.
+.IP "-o/--output <file>"
+Write output to <file> instead of stdout. If you are using {} or [] to fetch
+multiple documents, you can use '#' followed by a number in the <file>
+specifier. That variable will be replaced with the current string for the URL
+being fetched. Like in:
+
+  curl http://{one,two}.site.com -o "file_#1.txt"
+
+or use several variables like:
+
+  curl http://{site,host}.host[1-5].com -o "#1_#2"
+
+You may use this option as many times as you have number of URLs.
+
+See also the --create-dirs option to create the local directories dynamically.
+.IP "-O/--remote-name"
+Write output to a local file named like the remote file we get. (Only
+the file part of the remote file is used, the path is cut off.)
+
+You may use this option as many times as you have number of URLs.
+.IP "-p/--proxytunnel"
+When an HTTP proxy is used, this option will cause non-HTTP protocols to
+attempt to tunnel through the proxy instead of merely using it to do HTTP-like
+operations. The tunnel approach is made with the HTTP proxy CONNECT request
+and requires that the proxy allows direct connect to the remote port number
+curl wants to tunnel through to.
+
+If this option is used twice, the second will again disable proxy tunnel.
+.IP "-P/--ftpport <address>"
+(FTP)
+Reverses the initiator/listener roles when connecting with ftp. This
+switch makes Curl use the PORT command instead of PASV. In
+practice, PORT tells the server to connect to the client's specified
+address and port, while PASV asks the server for an ip address and
+port to connect to. <address> should be one of:
+.RS
+.TP 12
+.B interface
+i.e "eth0" to specify which interface's IP address you want to use  (Unix only)
+.TP
+.B "IP address"
+i.e "192.168.10.1" to specify exact IP number
+.TP
+.B "host name"
+i.e "my.host.domain" to specify machine
+.TP
+.B "-"
+(any single-letter string) to make it pick the machine's default
+.RE
+
+If this option is used several times, the last one will be used.
+.IP "-q"
+If used as the first parameter on the command line, the
+.I $HOME/.curlrc
+file will not be read and used as a config file.
+.IP "-Q/--quote <comand>"
+(FTP) Send an arbitrary command to the remote FTP server, by using the QUOTE
+command of the server. Not all servers support this command, and the set of
+QUOTE commands are server specific! Quote commands are sent BEFORE the
+transfer is taking place. To make commands take place after a successful
+transfer, prefix them with a dash '-'. You may specify any amount of commands
+to be run before and after the transfer. If the server returns failure for one
+of the commands, the entire operation will be aborted.
+
+This option can be used multiple times.
+.IP "--random-file <file>"
+(HTTPS) Specify the path name to file containing what will be considered as
+random data. The data is used to seed the random engine for SSL connections.
+See also the
+.I "--edg-file"
+option.
+.IP "-r/--range <range>"
+(HTTP/FTP)
+Retrieve a byte range (i.e a partial document) from a HTTP/1.1 or FTP
+server. Ranges can be specified in a number of ways.
+.RS
+.TP 10
+.B 0-499
+specifies the first 500 bytes
+.TP
+.B 500-999
+specifies the second 500 bytes
+.TP
+.B -500
+specifies the last 500 bytes
+.TP
+.B 9500
+specifies the bytes from offset 9500 and forward
+.TP
+.B 0-0,-1
+specifies the first and last byte only(*)(H)
+.TP
+.B 500-700,600-799
+specifies 300 bytes from offset 500(H)
+.TP
+.B 100-199,500-599
+specifies two separate 100 bytes ranges(*)(H)
+.RE
+
+(*) = NOTE that this will cause the server to reply with a multipart
+response!
+
+You should also be aware that many HTTP/1.1 servers do not have this feature
+enabled, so that when you attempt to get a range, you'll instead get the whole
+document.
+
+FTP range downloads only support the simple syntax 'start-stop' (optionally
+with one of the numbers omitted). It depends on the non-RFC command SIZE.
+
+If this option is used several times, the last one will be used.
+.IP "-R/--remote-time"
+When used, this will make libcurl attempt to figure out the timestamp of the
+remote file, and if that is available make the local file get that same
+timestamp.
+
+If this option is used twice, the second time disables this again.
+.IP "-s/--silent"
+Silent mode. Don't show progress meter or error messages.  Makes
+Curl mute.
+
+If this option is used twice, the second will again disable mute.
+.IP "-S/--show-error"
+When used with -s it makes curl show error message if it fails.
+
+If this option is used twice, the second will again disable show error.
+.IP "--stderr <file>"
+Redirect all writes to stderr to the specified file instead. If the file name
+is a plain '-', it is instead written to stdout. This option has no point when
+you're using a shell with decent redirecting capabilities.
+
+If this option is used several times, the last one will be used.
+.IP "-t/--telnet-option <OPT=val>"
+Pass options to the telnet protocol. Supported options are:
+
+TTYPE=<term> Sets the terminal type.
+
+XDISPLOC=<X display> Sets the X display location.
+
+NEW_ENV=<var,val> Sets an environment variable.
+.IP "-T/--upload-file <file>"
+This transfers the specified local file to the remote URL. If there is no file
+part in the specified URL, Curl will append the local file name. NOTE that you
+must use a trailing / on the last directory to really prove to Curl that there
+is no file name or curl will think that your last directory name is the remote
+file name to use. That will most likely cause the upload operation to fail. If
+this is used on a http(s) server, the PUT command will be used.
+
+Use the file name "-" (a single dash) to use stdin instead of a given file.
+
+If this option is used several times, the last one will be used.
+.IP "--trace <file>"
+Enables a full trace dump of all incoming and outgoing data, including
+descriptive information, to the given output file. Use "-" as filename to have
+the output sent to stdout.
+
+If this option is used several times, the last one will be used. (Added in
+curl 7.9.7)
+.IP "--trace-ascii <file>"
+Enables a full trace dump of all incoming and outgoing data, including
+descriptive information, to the given output file. Use "-" as filename to have
+the output sent to stdout.
+
+This is very similar to --trace, but leaves out the hex part and only shows
+the ASCII part of the dump. It makes smaller output that might be easier to
+read for untrained humans.
+
+If this option is used several times, the last one will be used. (Added in
+curl 7.9.7)
+.IP "-u/--user <user:password>"
+Specify user and password to use when fetching. Read the MANUAL for detailed
+examples of how to use this. If no password is specified, curl will ask for it
+interactively.
+
+If this option is used several times, the last one will be used.
+.IP "-U/--proxy-user <user:password>"
+Specify user and password to use for Proxy authentication. If no
+password is specified, curl will ask for it interactively.
+
+If this option is used several times, the last one will be used.
+.IP "--url <URL>"
+Specify a URL to fetch. This option is mostly handy when you want to specify
+URL(s) in a config file.
+
+This option may be used any number of times. To control where this URL is written, use the
+.I -o
+or the
+.I -O
+options.
+.IP "-v/--verbose"
+Makes the fetching more verbose/talkative. Mostly usable for debugging. Lines
+starting with '>' means data sent by curl, '<' means data received by curl
+that is hidden in normal cases and lines starting with '*' means additional
+info provided by curl.
+
+Note that if you want to see HTTP headers in the output, \fI-i/--include\fP
+might be option you're looking for.
+
+If you think this option still doesn't give you enough details, consider using
+\fI--trace\fP or \fI--trace-ascii\fP instead.
+
+If this option is used twice, the second will again disable verbose.
+.IP "-V/--version"
+Displays the full version of curl, libcurl and other 3rd party libraries
+linked with the executable.
+.IP "-w/--write-out <format>"
+Defines what to display after a completed and successful operation. The format
+is a string that may contain plain text mixed with any number of variables. The
+string can be specified as "string", to get read from a particular file you
+specify it "@filename" and to tell curl to read the format from stdin you
+write "@-".
+
+The variables present in the output format will be substituted by the value or
+text that curl thinks fit, as described below. All variables are specified
+like %{variable_name} and to output a normal % you just write them like
+%%. You can output a newline by using \\n, a carriage return with \\r and a tab
+space with \\t.
+
+.B NOTE:
+The %-letter is a special letter in the win32-environment, where all
+occurrences of % must be doubled when using this option.
+
+Available variables are at this point:
+.RS
+.TP 15
+.B url_effective
+The URL that was fetched last. This is mostly meaningful if you've told curl
+to follow location: headers.
+.TP
+.B http_code
+The numerical code that was found in the last retrieved HTTP(S) page.
+.TP
+.B time_total
+The total time, in seconds, that the full operation lasted. The time will be
+displayed with millisecond resolution.
+.TP
+.B time_namelookup
+The time, in seconds, it took from the start until the name resolving was
+completed.
+.TP
+.B time_connect
+The time, in seconds, it took from the start until the connect to the remote
+host (or proxy) was completed.
+.TP
+.B time_pretransfer
+The time, in seconds, it took from the start until the file transfer is just
+about to begin. This includes all pre-transfer commands and negotiations that
+are specific to the particular protocol(s) involved.
+.TP
+.B time_starttransfer
+The time, in seconds, it took from the start until the first byte is just about
+to be transfered. This includes time_pretransfer and also the time the
+server needs to calculate the result.
+.TP
+.B size_download
+The total amount of bytes that were downloaded.
+.TP
+.B size_upload
+The total amount of bytes that were uploaded.
+.TP
+.B size_header
+The total amount of bytes of the downloaded headers.
+.TP
+.B size_request
+The total amount of bytes that were sent in the HTTP request.
+.TP
+.B speed_download
+The average download speed that curl measured for the complete download.
+.TP
+.B speed_upload
+The average upload speed that curl measured for the complete upload.
+.TP
+.B content_type
+The Content-Type of the requested document, if there was any. (Added in 7.9.5)
+.RE
+
+If this option is used several times, the last one will be used.
+.IP "-x/--proxy <proxyhost[:port]>"
+Use specified HTTP proxy. If the port number is not specified, it is assumed
+at port 1080.
+
+This option overrides existing environment variables that sets proxy to
+use. If there's an environment variable setting a proxy, you can set proxy to
+"" to override it.
+
+\fBNote\fP that all operations that are performed over a HTTP proxy will
+transparantly be converted to HTTP. It means that certain protocol specific
+operations might not be available. This is not the case if you can tunnel
+through the proxy, as done with the \fI-p/--proxytunnel\fP option.
+
+If this option is used several times, the last one will be used.
+.IP "-X/--request <command>"
+(HTTP)
+Specifies a custom request to use when communicating with the HTTP server.
+The specified request will be used instead of the standard GET. Read the
+HTTP 1.1 specification for details and explanations.
+
+(FTP)
+Specifies a custom FTP command to use instead of LIST when doing file lists
+with ftp.
+
+If this option is used several times, the last one will be used.
+.IP "-y/--speed-time <time>"
+If a download is slower than speed-limit bytes per second during a speed-time
+period, the download gets aborted. If speed-time is used, the default
+speed-limit will be 1 unless set with -y.
+
+This option controls transfers and thus will not affect slow connects etc. If
+this is a concern for you, try the \fI--connect-timeout\fP option.
+
+If this option is used several times, the last one will be used.
+.IP "-Y/--speed-limit <speed>"
+If a download is slower than this given speed, in bytes per second, for
+speed-time seconds it gets aborted. speed-time is set with -Y and is 30 if
+not set.
+
+If this option is used several times, the last one will be used.
+.IP "-z/--time-cond <date expression>"
+(HTTP)
+Request to get a file that has been modified later than the given time and
+date, or one that has been modified before that time. The date expression can
+be all sorts of date strings or if it doesn't match any internal ones, it
+tries to get the time from a given file name instead! See the
+.BR "GNU date(1)"
+or
+.BR "curl_getdate(3)"
+man pages for date expression details.
+
+Start the date expression with a dash (-) to make it request for a document
+that is older than the given date/time, default is a document that is newer
+than the specified date/time.
+
+If this option is used several times, the last one will be used.
+.IP "-Z/--max-redirs <num>"
+Set maximum number of redirection-followings allowed. If -L/--location is
+used, this option can be used to prevent curl from following redirections "in
+absurdum".
+
+If this option is used several times, the last one will be used.
+.IP "-3/--sslv3"
+(HTTPS)
+Forces curl to use SSL version 3 when negotiating with a remote SSL server.
+.IP "-2/--sslv2"
+(HTTPS)
+Forces curl to use SSL version 2 when negotiating with a remote SSL server.
+.IP "-0/--http1.0"
+(HTTP) Forces curl to issue its requests using HTTP 1.0 instead of using its
+internally preferred: HTTP 1.1.
+.IP "-#/--progress-bar"
+Make curl display progress information as a progress bar instead of the
+default statistics.
+
+If this option is used twice, the second will again disable the progress bar.
+.SH FILES
+.I ~/.curlrc
+.RS
+Default config file.
+
+.SH ENVIRONMENT
+.IP "http_proxy [protocol://]<host>[:port]"
+Sets proxy server to use for HTTP.
+.IP "HTTPS_PROXY [protocol://]<host>[:port]"
+Sets proxy server to use for HTTPS.
+.IP "FTP_PROXY [protocol://]<host>[:port]"
+Sets proxy server to use for FTP.
+.IP "GOPHER_PROXY [protocol://]<host>[:port]"
+Sets proxy server to use for GOPHER.
+.IP "ALL_PROXY [protocol://]<host>[:port]"
+Sets proxy server to use if no protocol-specific proxy is set.
+.IP "NO_PROXY <comma-separated list of hosts>"
+list of host names that shouldn't go through any proxy. If set to a asterisk
+'*' only, it matches all hosts.
+.SH EXIT CODES
+There exists a bunch of different error codes and their corresponding error
+messages that may appear during bad conditions. At the time of this writing,
+the exit codes are:
+.IP 1
+Unsupported protocol. This build of curl has no support for this protocol.
+.IP 2
+Failed to initialize.
+.IP 3
+URL malformat. The syntax was not correct.
+.IP 4
+URL user malformatted. The user-part of the URL syntax was not correct.
+.IP 5
+Couldn't resolve proxy. The given proxy host could not be resolved.
+.IP 6
+Couldn't resolve host. The given remote host was not resolved.
+.IP 7
+Failed to connect to host.
+.IP 8
+FTP weird server reply. The server sent data curl couldn't parse.
+.IP 9
+FTP access denied. The server denied login.
+.IP 10
+FTP user/password incorrect. Either one or both were not accepted by the
+server.
+.IP 11
+FTP weird PASS reply. Curl couldn't parse the reply sent to the PASS request.
+.IP 12
+FTP weird USER reply. Curl couldn't parse the reply sent to the USER request.
+.IP 13
+FTP weird PASV reply, Curl couldn't parse the reply sent to the PASV request.
+.IP 14
+FTP weird 227 format. Curl couldn't parse the 227-line the server sent.
+.IP 15
+FTP can't get host. Couldn't resolve the host IP we got in the 227-line.
+.IP 16
+FTP can't reconnect. Couldn't connect to the host we got in the 227-line.
+.IP 17
+FTP couldn't set binary. Couldn't change transfer method to binary.
+.IP 18
+Partial file. Only a part of the file was transfered.
+.IP 19
+FTP couldn't download/access the given file, the RETR (or similar) command
+failed.
+.IP 20
+FTP write error. The transfer was reported bad by the server.
+.IP 21
+FTP quote error. A quote command returned error from the server.
+.IP 22
+HTTP page not retrieved. The requested url was not found or returned another
+error with the HTTP error code being 400 or above. This return code only
+appears if --fail is used.
+.IP 23
+Write error. Curl couldn't write data to a local filesystem or similar.
+.IP 24
+Malformat user. User name badly specified.
+.IP 25
+FTP couldn't STOR file. The server denied the STOR operation.
+.IP 26
+Read error. Various reading problems.
+.IP 27
+Out of memory. A memory allocation request failed.
+.IP 28
+Operation timeout. The specified time-out period was reached according to the
+conditions.
+.IP 29
+FTP couldn't set ASCII. The server returned an unknown reply.
+.IP 30
+FTP PORT failed. The PORT command failed.
+.IP 31
+FTP couldn't use REST. The REST command failed.
+.IP 32
+FTP couldn't use SIZE. The SIZE command failed. The command is an extension
+to the original FTP spec RFC 959.
+.IP 33
+HTTP range error. The range "command" didn't work.
+.IP 34
+HTTP post error. Internal post-request generation error.
+.IP 35
+SSL connect error. The SSL handshaking failed.
+.IP 36
+FTP bad download resume. Couldn't continue an earlier aborted download.
+.IP 37
+FILE couldn't read file. Failed to open the file. Permissions?
+.IP 38
+LDAP cannot bind. LDAP bind operation failed.
+.IP 39
+LDAP search failed.
+.IP 40
+Library not found. The LDAP library was not found.
+.IP 41
+Function not found. A required LDAP function was not found.
+.IP 42
+Aborted by callback. An application told curl to abort the operation.
+.IP 43
+Internal error. A function was called with a bad parameter.
+.IP 44
+Internal error. A function was called in a bad order.
+.IP 45
+Interface error. A specified outgoing interface could not be used.
+.IP 46
+Bad password entered. An error was signaled when the password was entered.
+.IP 47
+Too many redirects. When following redirects, curl hit the maximum amount.
+.IP 48
+Unknown TELNET option specified.
+.IP 49
+Malformed telnet option.
+.IP 51
+The remote peer's SSL certificate wasn't ok
+.IP 52
+The server didn't reply anything, which here is considered an error.
+.IP 53
+SSL crypto engine not found
+.IP 54
+Cannot set SSL crypto engine as default
+.IP 55
+Failed sending network data
+.IP 56
+Failure in receiving network data
+.IP 57
+Share is in use (internal error)
+.IP 58
+Problem with the local certificate
+.IP 59
+Couldn't use specified SSL cipher
+.IP 60
+Problem with the CA cert (path? permission?)
+.IP 61
+Unrecognized transfer encoding
+.IP XX
+There will appear more error codes here in future releases. The existing ones
+are meant to never change.
+.SH BUGS
+If you do find bugs, mail them to curl-bug@haxx.se.
+.SH AUTHORS / CONTRIBUTORS
+Daniel Stenberg is the main author, but the whole list of contributors is
+found in the separate THANKS file.
+.SH WWW
+http://curl.haxx.se
+.SH FTP
+ftp://ftp.sunet.se/pub/www/utilities/curl/
+.SH "SEE ALSO"
+.BR ftp (1),
+.BR wget (1),
+.BR snarf (1)
diff --git a/main/source/curl/docs/curl.html b/main/source/curl/docs/curl.html
new file mode 100644
index 00000000..94a7f979
--- /dev/null
+++ b/main/source/curl/docs/curl.html
@@ -0,0 +1,1282 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl - transfer a URL
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>curl</B> <B>[options]</B> <I>[URL...]</I>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       <B>curl</B> is a client to get documents/files from or send docu-
+       ments to a server, using any of  the  supported  protocols
+       (HTTP,  HTTPS,  FTP,  GOPHER, DICT, TELNET, LDAP or FILE).
+       The command is designed to work without  user  interaction
+       or any kind of interactivity.
+
+       curl offers a busload of useful tricks like proxy support,
+       user authentication, ftp upload, HTTP post,  SSL  (https:)
+       connections, cookies, file transfer resume and more.
+
+
+</PRE>
+<H2>URL</H2><PRE>
+       The  URL  syntax  is  protocol  dependent.  You'll  find a
+       detailed description in RFC 2396.
+
+       You can specify multiple URLs or parts of URLs by  writing
+       part sets within braces as in:
+
+        http://site.{one,two,three}.com
+
+       or  you  can get sequences of alphanumeric series by using
+       [] as in:
+
+        ftp://ftp.numericals.com/file[1-100].txt
+        ftp://ftp.numericals.com/file[001-100].txt    (with lead-
+       ing zeros)
+        ftp://ftp.letters.com/file[a-z].txt
+
+       It  is  possible  to  specify up to 9 sets or series for a
+       URL, but no nesting is supported at the moment:
+
+        http://www.any.org/archive[1996-1999]/vol-
+       ume[1-4]part{a,b,c,index}.html
+
+       You  can  specify  any amount of URLs on the command line.
+       They will be fetched in a sequential manner in the  speci-
+       fied order.
+
+       Curl  will attempt to re-use connections for multiple file
+       transfers, so that getting many files from the same server
+       will  not do multiple connects / handshakes. This improves
+       speed. Of course this is only done on files specified on a
+       single  command  line  and cannot be used between separate
+       curl invokes.
+
+
+</PRE>
+<H2>OPTIONS</H2><PRE>
+       -a/--append
+              writing it. If the file doesn't exist, it  will  be
+              created.
+
+              If  this  option is used twice, the second one will
+              disable append mode again.
+
+       -A/--user-agent &lt;agent string&gt;
+              (HTTP) Specify the User-Agent string to send to the
+              HTTP  server.  Some badly done CGIs fail if its not
+              set to "Mozilla/4.0".   To  encode  blanks  in  the
+              string,  surround  the  string  with  single  quote
+              marks.  This can also be set with  the  -H/--header
+              flag of course.
+
+              If  this option is set more than once, the last one
+              will be the one that's used.
+
+       -b/--cookie &lt;name=data&gt;
+              (HTTP) Pass the  data  to  the  HTTP  server  as  a
+              cookie.   It  is  supposedly  the  data  previously
+              received from the server in a  "Set-Cookie:"  line.
+              The  data  should  be  in the format "NAME1=VALUE1;
+              NAME2=VALUE2".
+
+              If no '=' letter is used in the line, it is treated
+              as  a  filename  to  use  to read previously stored
+              cookie lines from, which should  be  used  in  this
+              session if they match. Using this method also acti-
+              vates the "cookie  parser"  which  will  make  curl
+              record  incoming cookies too, which may be handy if
+              you're  using  this   in   combination   with   the
+              -L/--location  option.  The file format of the file
+              to read cookies from should be plain  HTTP  headers
+              or the Netscape/Mozilla cookie file format.
+
+              <B>NOTE</B>  that  the  file specified with -b/--cookie is
+              only used as input. No cookies will  be  stored  in
+              the  file.  To store cookies, save the HTTP headers
+              to a file using -D/--dump-header!
+
+              If this option is set more than once, the last  one
+              will be the one that's used.
+
+       -B/--use-ascii
+              Use ASCII transfer when getting an FTP file or LDAP
+              info. For FTP, this can also be enforced  by  using
+              an URL that ends with ";type=A". This option causes
+              data sent to stdout to be in text  mode  for  win32
+              systems.
+
+              If  this  option is used twice, the second one will
+              disable ASCII usage.
+              (SSL) Specifies which ciphers to use in the connec-
+              tion.  The  list  of  ciphers  must  be using valid
+              ciphers. Read up on SSL cipher list details on this
+              URL:  <I>http://www.openssl.org/docs/apps/ciphers.html</I>
+              <I>(Option</I> <I>added</I> <I>in</I> <I>curl</I> <I>7.9)</I>
+
+              If this option is used several times, the last  one
+              will override the others.
+
+       --compressed
+              (HTTP)  Request  a  compressed  response  using the
+              deflate or gzip algorithms and  return  the  uncom-
+              pressed  document.   If this option is used and the
+              server sends an  unsupported  encoding,  Curl  will
+              report an error.
+
+       --connect-timeout &lt;seconds&gt;
+              Maximum  time in seconds that you allow the connec-
+              tion to the server to take.  This only  limits  the
+              connection  phase,  once  curl  has  connected this
+              option is of no more use. See also  the  <I>--max-time</I>
+              option.
+
+              If  this option is used several times, the last one
+              will be used.
+
+       -c/--cookie-jar &lt;file name&gt;
+              Specify to which file you want curl  to  write  all
+              cookies  after  a  completed operation. Curl writes
+              all cookies previously read from a  specified  file
+              as   well  as  all  cookies  received  from  remote
+              server(s). If no cookies are known, no file will be
+              written.   The  file  will  be  written  using  the
+              Netscape cookie file format. If you  set  the  file
+              name  to  a  single  dash, "-", the cookies will be
+              written to stdout. (Option added in curl 7.9)
+
+              <B>NOTE</B> If the cookie jar can't be created or  written
+              to,  the  whole  curl  operation won't fail or even
+              report an error clearly. Using -v will get a  warn-
+              ing  displayed,  but that is the only visible feed-
+              back you get about this possibly lethal  situation.
+
+              If  this  option  is  used  several times, the last
+              specfied file name will be used.
+
+       -C/--continue-at &lt;offset&gt;
+              Continue/Resume a previous  file  transfer  at  the
+              given  offset. The given offset is the exact number
+              of bytes that will  be  skipped  counted  from  the
+              beginning  of  the  source file before it is trans-
+              fered to the destination.  If  used  with  uploads,
+
+              Use "-C -" to tell curl to automatically  find  out
+              where/how  to resume the transfer. It then uses the
+              given output/input files to figure that out.
+
+              If this option is used several times, the last  one
+              will be used.
+
+       --create-dirs
+              When  used  in conjunction with the -o option, curl
+              will create the necessary local directory hierarchy
+              as needed.
+
+       --crlf (FTP)  Convert LF to CRLF in upload. Useful for MVS
+              (OS/390).
+
+              If this option is used twice, the second will again
+              disable crlf converting.
+
+       -d/--data &lt;data&gt;
+              (HTTP)  Sends  the specified data in a POST request
+              to the HTTP server, in a way that can emulate as if
+              a  user  has  filled in a HTML form and pressed the
+              submit button. Note that the data is  sent  exactly
+              as  specified  with  no  extra processing (with all
+              newlines cut off).  The  data  is  expected  to  be
+              "url-encoded".  This  will  cause  curl to pass the
+              data to the server using the content-type  applica-
+              tion/x-www-form-urlencoded.  Compare to -F. If more
+              than one -d/--data option is used on the same  com-
+              mand line, the data pieces specified will be merged
+              together with a separating  &amp;-letter.  Thus,  using
+              '-d  name=daniel  -d  skill=lousy' would generate a
+              post       chunk       that       looks        like
+              'name=daniel&amp;skill=lousy'.
+
+              If  you  start the data with the letter @, the rest
+              should be a file name to read the data from,  or  -
+              if  you want curl to read the data from stdin.  The
+              contents of the file must already  be  url-encoded.
+              Multiple  files can also be specified. Posting data
+              from a file named 'foobar' would thus be done  with
+              "--data @foobar".
+
+              To  post data purely binary, you should instead use
+              the --data-binary option.
+
+              -d/--data is the same as --data-ascii.
+
+              If this option is used several times, the ones fol-
+              lowing the first will append data.
+
+              (HTTP) This is an alias for the -d/--data option.
+
+              If this option is used several times, the ones fol-
+              lowing the first will append data.
+
+       --data-binary &lt;data&gt;
+              (HTTP) This posts  data  in  a  similar  manner  as
+              --data-ascii  does, although when using this option
+              the entire context of the posted data is  kept  as-
+              is.  If  you want to post a binary file without the
+              strip-newlines feature of the --data-ascii  option,
+              this is for you.
+
+              If this option is used several times, the ones fol-
+              lowing the first will append data.
+
+       --disable-epsv
+              (FTP) Tell curl to disable the use of the EPSV com-
+              mand  when  doing  passive FTP downloads. Curl will
+              normally always first attempt to  use  EPSV  before
+              PASV,  but  with this option, it will not try using
+              EPSV.
+
+              If this option is used several times,  each  occur-
+              rence will toggle this on/off.
+
+       -D/--dump-header &lt;file&gt;
+              Write the protocol headers to the specified file.
+
+              This  option is handy to use when you want to store
+              the cookies that a HTTP  site  sends  to  you.  The
+              cookies  could then be read in a second curl invoke
+              by using the -b/--cookie option!
+
+              When used on FTP, the ftp server response lines are
+              considered  being  "headers"  and  thus  are  saved
+              there.
+
+              If this option is used several times, the last  one
+              will be used.
+
+       -e/--referer &lt;URL&gt;
+              (HTTP)  Sends the "Referer Page" information to the
+              HTTP  server.  This  can  also  be  set  with   the
+              -H/--header   flag   of  course.   When  used  with
+              <I>-L/--location</I> you can append ";auto" to the referer
+              URL to make curl automatically set the previous URL
+              when it follows a  Location:  header.  The  ";auto"
+              string  can be used alone, even if you don't set an
+              initial referer.
+
+              If this option is used several times, the last  one
+              (RISC  OS  ONLY)  Sets a range of environment vari-
+              ables, using the names the -w option  supports,  to
+              easier allow extraction of useful information after
+              having run curl.
+
+              If this option is used several times,  each  occur-
+              rence will toggle this on/off.
+
+       --egd-file &lt;file&gt;
+              (HTTPS)  Specify the path name to the Entropy Gath-
+              ering Daemon socket. The socket is used to seed the
+              random  engine  for  SSL  connections. See also the
+              <I>--random-file</I> option.
+
+       -E/--cert &lt;certificate[:password]&gt;
+              (HTTPS) Tells curl to use the specified certificate
+              file  when  getting a file with HTTPS. The certifi-
+              cate must be in PEM format.  If the optional  pass-
+              word isn't specified, it will be queried for on the
+              terminal. Note that this certificate is the private
+              key and the private certificate concatenated!
+
+              If  this option is used several times, the last one
+              will be used.
+
+       --cacert &lt;CA certificate&gt;
+              (HTTPS) Tells curl to use the specified certificate
+              file  to verify the peer. The file may contain mul-
+              tiple CA certificates. The certificate(s)  must  be
+              in PEM format.
+
+              curl  recognizes  the  environment  variable  named
+              'CURL_CA_BUNDLE' if that is set, and uses the given
+              path  as  a  path  to a CA cert bundle. This option
+              overrides that variable.
+
+              The windows version of curl will automatically look
+              for  a  CA  certs  file named 'curl-ca-bundle.crt',
+              either in the same directory as curl.exe, or in the
+              Current  Working  Directory, or in any folder along
+              your PATH.
+
+              If this option is used several times, the last  one
+              will be used.
+
+       --capath &lt;CA certificate directory&gt;
+              (HTTPS) Tells curl to use the specified certificate
+              directory to verify the peer. The certificates must
+              be  in PEM format, and the directory must have been
+              processed using the c_rehash utility supplied  with
+              openssl.  Using  --capath  can  allow  curl to make
+              https connections much more efficiently than  using
+
+              If this option is used several times, the last  one
+              will be used.
+
+       -f/--fail
+              (HTTP)  Fail  silently (no output at all) on server
+              errors. This is mostly done  like  this  to  better
+              enable  scripts  etc  to  better  deal  with failed
+              attempts. In normal cases when a HTTP server  fails
+              to  deliver  a document, it returns a HTML document
+              stating so (which  often  also  describes  why  and
+              more).  This flag will prevent curl from outputting
+              that and fail silently instead.
+
+              If this option is used twice, the second will again
+              disable silent failure.
+
+       -F/--form &lt;name=content&gt;
+              (HTTP)  This  lets curl emulate a filled in form in
+              which a user has pressed the  submit  button.  This
+              causes  curl  to  POST  data using the content-type
+              multipart/form-data  according  to  RFC1867.   This
+              enables uploading of binary files etc. To force the
+              'content' part to be be a  file,  prefix  the  file
+              name  with  an @ sign. To just get the content part
+              from a file, prefix the file name with  the  letter
+              &lt;.  The  difference  between @ and &lt; is then that @
+              makes a file get attached in the  post  as  a  file
+              upload, while the &lt; makes a text field and just get
+              the contents for that text field from a file.
+
+              Example, to send your password file to the  server,
+              where  'password'  is the name of the form-field to
+              which /etc/passwd will be the input:
+
+              <B>curl</B> -F password=@/etc/passwd www.mypasswords.com
+
+              To read the file's content from stdin insted  of  a
+              file,  use  -  where  the file name should've been.
+              This goes for both @ and &lt; constructs.
+
+              You can also tell curl what Content-Type to use for
+              the file upload part, by using 'type=', in a manner
+              similar to:
+
+              <B>curl</B> -F "web=@index.html;type=text/html" url.com
+
+              See further examples and details in the MANUAL.
+
+              This option can be used multiple times.
+
+       -g/--globoff
+              contain the letters {}[] without having them  being
+              interpreted by curl itself. Note that these letters
+              are not normal legal URL contents but  they  should
+              be encoded according to the URI standard.
+
+       -G/--get
+              When used, this option will make all data specified
+              with -d/--data or --data-binary to  be  used  in  a
+              HTTP  GET  request instead of the POST request that
+              otherwise would be used. The data will be  appended
+              to  the URL with a '?'  separator. (Option added in
+              curl 7.9)
+
+              If used in combination with -I, the POST data  will
+              instead be appended to the URL with a HEAD request.
+
+              If used multiple times, nothing special happens.
+
+       -h/--help
+              Usage help.
+
+       -H/--header &lt;header&gt;
+              (HTTP) Extra header to use when getting a web page.
+              You  may  specify any number of extra headers. Note
+              that if you should add a custom header that has the
+              same  name  as  one of the internal ones curl would
+              use,  your  externally  set  header  will  be  used
+              instead  of  the  internal  one. This allows you to
+              make even trickier stuff than curl  would  normally
+              do.  You  should not replace internally set headers
+              without knowing perfectly well what  you're  doing.
+              Replacing  an internal header with one without con-
+              tent on the right side of the  colon  will  prevent
+              that header from appearing.
+
+              This   option   can   be  used  multiple  times  to
+              add/replace/remove multiple headers.
+
+       -i/--include
+              (HTTP) Include the HTTP-header in the  output.  The
+              HTTP-header  includes things like server-name, date
+              of the document, HTTP-version and more...
+
+              If this option is used twice, the second will again
+              disable header include.
+
+       --interface &lt;name&gt;
+              Perform  an  operation using a specified interface.
+              You can enter interface name, IP  address  or  host
+              name. An example could look like:
+
+              <B>curl</B> <B>--interface</B> <B>eth0:1</B> <B>http://www.netscape.com/</B>
+              will be used.
+
+       -I/--head
+              (HTTP/FTP) Fetch the HTTP-header only! HTTP-servers
+              feature  the  command  HEAD  which this uses to get
+              nothing but the header of a document. When used  on
+              a FTP file, curl displays the file size only.
+
+              If this option is used twice, the second will again
+              disable header only.
+
+       -j/--junk-session-cookies
+              (HTTP) When curl is told to  read  cookies  from  a
+              given  file,  this  option will make it discard all
+              "session cookies". This will basicly have the  same
+              effect  as  if  a  new  session is started. Typical
+              browsers  always  discard  session   cookies   when
+              they're closed down. (Added in 7.9.7)
+
+              If  this  option is used several times, each occur-
+              rence will toggle this on/off.
+
+       -k/--insecure
+              (SSL) This option explicitly allows curl to perform
+              "insecure"  SSL connections and transfers. Starting
+              with  curl  7.10,  all  SSL  connections  will   be
+              attempted  to  be  made secure by using the CA cer-
+              tificate bundle installed by  default.  This  makes
+              all   connections  considered  "insecure"  to  fail
+              unless -k/--insecure is used.
+
+              This option is ignored if --cacert or  --capath  is
+              used!
+
+              If  this option is used twice, the second time will
+              again disable it.
+
+       --krb4 &lt;level&gt;
+              (FTP) Enable kerberos4 authentication and use.  The
+              level must be entered and should be one of 'clear',
+              'safe', 'confidential' or 'private'. Should you use
+              a  level  that  is not one of these, 'private' will
+              instead be used.
+
+              If this option is used several times, the last  one
+              will be used.
+
+       -K/--config &lt;config file&gt;
+              Specify  which  config  file to read curl arguments
+              from. The config file is a text file in which  com-
+              mand  line arguments can be written which then will
+              be used as if they were written on the actual  com-
+              parameter is to contain white spaces, the parameter
+              must be inclosed within quotes.  If the first  col-
+              umn  of  a config line is a '#' character, the rest
+              of the line will be treated as a comment.
+
+              Specify the filename as '-' to make curl  read  the
+              file from stdin.
+
+              Note that to be able to specify a URL in the config
+              file, you  need  to  specify  it  using  the  --url
+              option,  and  not  by simply writing the URL on its
+              own line. So, it could look similar to this:
+
+              url = "http://curl.haxx.se/docs/"
+
+              This option can be used multiple times.
+
+       --limit-rate &lt;speed&gt;
+              Specify the maximum transfer rate you want curl  to
+              use.  This  feature is useful if you have a limited
+              pipe and you'd like  your  transfer  not  use  your
+              entire bandwidth.
+
+              The given speed is measured in bytes/second, unless
+              a suffix is appended. Appending  'k'  or  'K'  will
+              count  the  number as kilobytes, 'm' or M' makes it
+              megabytes while 'g'  or  'G'  makes  it  gigabytes.
+              Examples: 200K, 3m and 1G.
+
+              This option was introduced in curl 7.10.
+
+              If  this option is used several times, the last one
+              will be used.
+
+       -l/--list-only
+              (FTP) When listing an FTP  directory,  this  switch
+              forces  a name-only view.  Especially useful if you
+              want to machine-parse the contents of an FTP direc-
+              tory  since the normal directory view doesn't use a
+              standard look or format.
+
+              This option causes an FTP NLST command to be  sent.
+              Some  FTP servers list only files in their response
+              to NLST; they do  not  include  subdirectories  and
+              symbolic links.
+
+              If this option is used twice, the second will again
+              disable list only.
+
+       -L/--location
+              (HTTP/HTTPS)  If  the  server  reports   that   the
+              requested  page has a different location (indicated
+              If used together with -i or -I,  headers  from  all
+              requested pages will be shown. If this flag is used
+              when making a HTTP POST,  curl  will  automatically
+              switch to GET after the initial POST has been done.
+
+              If this option is used twice, the second will again
+              disable location following.
+
+       -m/--max-time &lt;seconds&gt;
+              Maximum  time  in  seconds that you allow the whole
+              operation to take.  This is useful  for  preventing
+              your  batch jobs from hanging for hours due to slow
+              networks or links going down.   This  doesn't  work
+              fully  in  win32  systems.  See also the <I>--connect-</I>
+              <I>timeout</I> option.
+
+              If this option is used several times, the last  one
+              will be used.
+
+       -M/--manual
+              Manual. Display the huge help text.
+
+       -n/--netrc
+              Makes  curl scan the <I>.netrc</I> file in the user's home
+              directory for login name and password. This is typ-
+              ically  used  for  ftp  on unix. If used with http,
+              curl will enable user authentication. See  <B>netrc(4)</B>
+              or <B>ftp(1)</B> for details on the file format. Curl will
+              not complain if that file hasn't the right  permis-
+              sions  (it should not be world nor group readable).
+              The environment variable "HOME" is used to find the
+              home directory.
+
+              A  quick  and very simple example of how to setup a
+              <I>.netrc</I>  to  allow  curl  to  ftp  to  the   machine
+              host.domain.com  with  user name 'myself' and pass-
+              word 'secret' should look similar to:
+
+              <B>machine</B>  <B>host.domain.com</B>  <B>login</B>   <B>myself</B>   <B>password</B>
+              <B>secret</B>
+
+              If this option is used twice, the second will again
+              disable netrc usage.
+
+       -N/--no-buffer
+              Disables the buffering of  the  output  stream.  In
+              normal  work  situations,  curl will use a standard
+              buffered output stream that will  have  the  effect
+              that  it will output the data in chunks, not neces-
+              sarily exactly when the data arrives.   Using  this
+              option will disable that buffering.
+
+
+       -o/--output &lt;file&gt;
+              Write output to &lt;file&gt; instead of  stdout.  If  you
+              are using {} or [] to fetch multiple documents, you
+              can use '#' followed by  a  number  in  the  &lt;file&gt;
+              specifier.  That variable will be replaced with the
+              current string for the URL being fetched. Like in:
+
+                curl http://{one,two}.site.com -o "file_#1.txt"
+
+              or use several variables like:
+
+                curl http://{site,host}.host[1-5].com -o "#1_#2"
+
+              You may use this option as many times as  you  have
+              number of URLs.
+
+              See  also  the  --create-dirs  option to create the
+              local directories dynamically.
+
+       -O/--remote-name
+              Write output to a local file named like the  remote
+              file we get. (Only the file part of the remote file
+              is used, the path is cut off.)
+
+              You may use this option as many times as  you  have
+              number of URLs.
+
+       -p/--proxytunnel
+              When  an HTTP proxy is used, this option will cause
+              non-HTTP protocols to attempt to tunnel through the
+              proxy  instead  of  merely using it to do HTTP-like
+              operations. The tunnel approach is  made  with  the
+              HTTP  proxy  CONNECT  request and requires that the
+              proxy allows direct connect to the remote port num-
+              ber curl wants to tunnel through to.
+
+              If this option is used twice, the second will again
+              disable proxy tunnel.
+
+       -P/--ftpport &lt;address&gt;
+              (FTP) Reverses the  initiator/listener  roles  when
+              connecting with ftp. This switch makes Curl use the
+              PORT command instead of  PASV.  In  practice,  PORT
+              tells  the server to connect to the client's speci-
+              fied address and port, while PASV asks  the  server
+              for an ip address and port to connect to. &lt;address&gt;
+              should be one of:
+
+              <B>interface</B>   i.e "eth0" to specify which interface's
+                          IP address you want to use  (Unix only)
+
+
+              <B>host</B> <B>name</B>   i.e "my.host.domain" to specify machine
+
+              <B>-</B>           (any single-letter string) to  make  it
+                          pick the machine's default
+
+       If this option is used several times, the last one will be
+       used.
+
+       -q     If used as the first parameter on the command line,
+              the <I>$HOME/.curlrc</I> file will not be read and used as
+              a config file.
+
+       -Q/--quote &lt;comand&gt;
+              (FTP) Send an arbitrary command to the  remote  FTP
+              server,  by  using the QUOTE command of the server.
+              Not all servers support this command, and  the  set
+              of  QUOTE  commands are server specific! Quote com-
+              mands are sent BEFORE the transfer is taking place.
+              To  make  commands  take  place  after a successful
+              transfer, prefix them with  a  dash  '-'.  You  may
+              specify any amount of commands to be run before and
+              after the transfer. If the server  returns  failure
+              for  one of the commands, the entire operation will
+              be aborted.
+
+              This option can be used multiple times.
+
+       --random-file &lt;file&gt;
+              (HTTPS) Specify the path name  to  file  containing
+              what will be considered as random data. The data is
+              used to seed the random engine for SSL connections.
+              See also the <I>--edg-file</I> option.
+
+       -r/--range &lt;range&gt;
+              (HTTP/FTP)  Retrieve  a  byte  range (i.e a partial
+              document) from a HTTP/1.1 or FTP server. Ranges can
+              be specified in a number of ways.
+
+              <B>0-499</B>     specifies the first 500 bytes
+
+              <B>500-999</B>   specifies the second 500 bytes
+
+              <B>-500</B>      specifies the last 500 bytes
+
+              <B>9500</B>      specifies  the bytes from offset 9500 and
+                        forward
+
+              <B>0-0,-1</B>    specifies  the  first   and   last   byte
+                        only(*)(H)
+
+              <B>500-700,600-799</B>
+                        specifies    two   separate   100   bytes
+                        ranges(*)(H)
+
+       (*) = NOTE that this will cause the server to reply with a
+       multipart response!
+
+       You should also be aware that many HTTP/1.1 servers do not
+       have this feature enabled, so that when you attempt to get
+       a range, you'll instead get the whole document.
+
+       FTP range downloads only support the simple syntax 'start-
+       stop' (optionally with one of  the  numbers  omitted).  It
+       depends on the non-RFC command SIZE.
+
+       If this option is used several times, the last one will be
+       used.
+
+       -R/--remote-time
+              When used, this will make libcurl attempt to figure
+              out  the  timestamp of the remote file, and if that
+              is available make the  local  file  get  that  same
+              timestamp.
+
+              If  this option is used twice, the second time dis-
+              ables this again.
+
+       -s/--silent
+              Silent mode. Don't show  progress  meter  or  error
+              messages.  Makes Curl mute.
+
+              If this option is used twice, the second will again
+              disable mute.
+
+       -S/--show-error
+              When used with -s it makes curl show error  message
+              if it fails.
+
+              If this option is used twice, the second will again
+              disable show error.
+
+       --stderr &lt;file&gt;
+              Redirect all writes to stderr to the specified file
+              instead.  If  the  file  name is a plain '-', it is
+              instead written to stdout. This option has no point
+              when  you're  using a shell with decent redirecting
+              capabilities.
+
+              If this option is used several times, the last  one
+              will be used.
+
+       -t/--telnet-option &lt;OPT=val&gt;
+              Pass  options  to  the  telnet  protocol. Supported
+
+              XDISPLOC=&lt;X display&gt; Sets the X display location.
+
+              NEW_ENV=&lt;var,val&gt; Sets an environment variable.
+
+       -T/--upload-file &lt;file&gt;
+              This transfers the  specified  local  file  to  the
+              remote  URL. If there is no file part in the speci-
+              fied URL, Curl will append  the  local  file  name.
+              NOTE  that  you  must  use a trailing / on the last
+              directory to really prove to Curl that there is  no
+              file  name or curl will think that your last direc-
+              tory name is the remote file name to use. That will
+              most  likely cause the upload operation to fail. If
+              this is used on a http(s) server, the  PUT  command
+              will be used.
+
+              Use  the file name "-" (a single dash) to use stdin
+              instead of a given file.
+
+              If this option is used several times, the last  one
+              will be used.
+
+       --trace &lt;file&gt;
+              Enables  a full trace dump of all incoming and out-
+              going data, including descriptive  information,  to
+              the  given output file. Use "-" as filename to have
+              the output sent to stdout.
+
+              If this option is used several times, the last  one
+              will be used. (Added in curl 7.9.7)
+
+       --trace-ascii &lt;file&gt;
+              Enables  a full trace dump of all incoming and out-
+              going data, including descriptive  information,  to
+              the  given output file. Use "-" as filename to have
+              the output sent to stdout.
+
+              This is very similar to --trace, but leaves out the
+              hex part and only shows the ASCII part of the dump.
+              It makes smaller output that  might  be  easier  to
+              read for untrained humans.
+
+              If  this option is used several times, the last one
+              will be used. (Added in curl 7.9.7)
+
+       -u/--user &lt;user:password&gt;
+              Specify user and password  to  use  when  fetching.
+              Read the MANUAL for detailed examples of how to use
+              this. If no password is specified,  curl  will  ask
+              for it interactively.
+
+
+       -U/--proxy-user &lt;user:password&gt;
+              Specify user and password to use for Proxy  authen-
+              tication.  If  no  password is specified, curl will
+              ask for it interactively.
+
+              If this option is used several times, the last  one
+              will be used.
+
+       --url &lt;URL&gt;
+              Specify a URL to fetch. This option is mostly handy
+              when you want to specify URL(s) in a config file.
+
+              This option may be used any  number  of  times.  To
+              control  where  this  URL is written, use the <I>-o</I> or
+              the <I>-O</I> options.
+
+       -v/--verbose
+              Makes the fetching more  verbose/talkative.  Mostly
+              usable for debugging. Lines starting with '&gt;' means
+              data sent by curl, '&lt;' means data received by  curl
+              that  is  hidden in normal cases and lines starting
+              with '*' means additional info provided by curl.
+
+              Note that if you want to see HTTP  headers  in  the
+              output, <I>-i/--include</I> might be option you're looking
+              for.
+
+              If you think this option  still  doesn't  give  you
+              enough  details, consider using <I>--trace</I> or <I>--trace-</I>
+              <I>ascii</I> instead.
+
+              If this option is used twice, the second will again
+              disable verbose.
+
+       -V/--version
+              Displays  the  full  version  of  curl, libcurl and
+              other 3rd party  libraries  linked  with  the  exe-
+              cutable.
+
+       -w/--write-out &lt;format&gt;
+              Defines  what to display after a completed and suc-
+              cessful operation. The format is a string that  may
+              contain  plain  text mixed with any number of vari-
+              ables. The string can be specified as "string",  to
+              get  read  from  a  particular  file you specify it
+              "@filename" and to tell curl  to  read  the  format
+              from stdin you write "@-".
+
+              The  variables present in the output format will be
+              substituted by the value or text that  curl  thinks
+              fit,  as  described below. All variables are speci-
+              line by using \n, a carriage return with \r  and  a
+              tab space with \t.
+
+              <B>NOTE:</B>  The  %-letter  is  a  special  letter in the
+              win32-environment, where all occurrences of %  must
+              be doubled when using this option.
+
+              Available variables are at this point:
+
+              <B>url_effective</B>  The  URL that was fetched last. This
+                             is mostly meaningful if you've  told
+                             curl to follow location: headers.
+
+              <B>http_code</B>      The numerical code that was found in
+                             the last retrieved HTTP(S) page.
+
+              <B>time_total</B>     The total time, in seconds, that the
+                             full operation lasted. The time will
+                             be displayed with millisecond  reso-
+                             lution.
+
+              <B>time_namelookup</B>
+                             The  time,  in seconds, it took from
+                             the start until the  name  resolving
+                             was completed.
+
+              <B>time_connect</B>   The  time,  in seconds, it took from
+                             the start until the connect  to  the
+                             remote  host  (or  proxy)  was  com-
+                             pleted.
+
+              <B>time_pretransfer</B>
+                             The time, in seconds, it  took  from
+                             the start until the file transfer is
+                             just about to begin.  This  includes
+                             all  pre-transfer commands and nego-
+                             tiations that are  specific  to  the
+                             particular protocol(s) involved.
+
+              <B>time_starttransfer</B>
+                             The  time,  in seconds, it took from
+                             the start until the  first  byte  is
+                             just  about  to  be transfered. This
+                             includes time_pretransfer  and  also
+                             the  time the server needs to calcu-
+                             late the result.
+
+              <B>size_download</B>  The total amount of bytes that  were
+                             downloaded.
+
+              <B>size_upload</B>    The  total amount of bytes that were
+                             uploaded.
+                             downloaded headers.
+
+              <B>size_request</B>   The  total amount of bytes that were
+                             sent in the HTTP request.
+
+              <B>speed_download</B> The average download speed that curl
+                             measured  for the complete download.
+
+              <B>speed_upload</B>   The average upload speed  that  curl
+                             measured for the complete upload.
+
+              <B>content_type</B>   The  Content-Type  of  the requested
+                             document, if there was  any.  (Added
+                             in 7.9.5)
+
+       If this option is used several times, the last one will be
+       used.
+
+       -x/--proxy &lt;proxyhost[:port]&gt;
+              Use specified HTTP proxy. If the port number is not
+              specified, it is assumed at port 1080.
+
+              This  option  overrides  existing environment vari-
+              ables that sets proxy to use. If there's  an  envi-
+              ronment variable setting a proxy, you can set proxy
+              to "" to override it.
+
+              <B>Note</B> that all operations that are performed over  a
+              HTTP proxy will transparantly be converted to HTTP.
+              It means that certain protocol specific  operations
+              might not be available. This is not the case if you
+              can tunnel through the  proxy,  as  done  with  the
+              <I>-p/--proxytunnel</I> option.
+
+              If  this option is used several times, the last one
+              will be used.
+
+       -X/--request &lt;command&gt;
+              (HTTP) Specifies a custom request to use when  com-
+              municating  with  the  HTTP  server.  The specified
+              request will be used instead of the  standard  GET.
+              Read  the  HTTP  1.1  specification for details and
+              explanations.
+
+              (FTP) Specifies a custom FTP command to use instead
+              of LIST when doing file lists with ftp.
+
+              If  this option is used several times, the last one
+              will be used.
+
+       -y/--speed-time &lt;time&gt;
+              If a download is slower than speed-limit bytes  per
+              speed-limit will be 1 unless set with -y.
+
+              This  option  controls  transfers and thus will not
+              affect slow connects etc. If this is a concern  for
+              you, try the <I>--connect-timeout</I> option.
+
+              If  this option is used several times, the last one
+              will be used.
+
+       -Y/--speed-limit &lt;speed&gt;
+              If a download is slower than this given  speed,  in
+              bytes  per  second,  for speed-time seconds it gets
+              aborted. speed-time is set with -Y and is 30 if not
+              set.
+
+              If  this option is used several times, the last one
+              will be used.
+
+       -z/--time-cond &lt;date expression&gt;
+              (HTTP) Request to get a file that has been modified
+              later than the given time and date, or one that has
+              been modified before that time. The date expression
+              can  be  all sorts of date strings or if it doesn't
+              match any internal ones, it tries to get  the  time
+              from a given file name instead! See the <B>GNU</B> <B>date(1)</B>
+              or <B>curl_getdate(3)</B> man pages  for  date  expression
+              details.
+
+              Start  the  date expression with a dash (-) to make
+              it request for a document that is  older  than  the
+              given  date/time,  default  is  a  document that is
+              newer than the specified date/time.
+
+              If this option is used several times, the last  one
+              will be used.
+
+       -Z/--max-redirs &lt;num&gt;
+              Set   maximum   number   of  redirection-followings
+              allowed. If -L/--location is used, this option  can
+              be used to prevent curl from following redirections
+              "in absurdum".
+
+              If this option is used several times, the last  one
+              will be used.
+
+       -3/--sslv3
+              (HTTPS) Forces curl to use SSL version 3 when nego-
+              tiating with a remote SSL server.
+
+       -2/--sslv2
+              (HTTPS) Forces curl to use SSL version 2 when nego-
+              tiating with a remote SSL server.
+              (HTTP) Forces curl to issue its requests using HTTP
+              1.0 instead of using its internally preferred: HTTP
+              1.1.
+
+       -#/--progress-bar
+              Make   curl   display  progress  information  as  a
+              progress bar instead of the default statistics.
+
+              If this option is used twice, the second will again
+              disable the progress bar.
+
+
+</PRE>
+<H2>FILES</H2><PRE>
+       <I>~/.curlrc</I>
+              Default config file.
+
+
+
+</PRE>
+<H2>ENVIRONMENT</H2><PRE>
+       http_proxy [protocol://]&lt;host&gt;[:port]
+              Sets proxy server to use for HTTP.
+
+       HTTPS_PROXY [protocol://]&lt;host&gt;[:port]
+              Sets proxy server to use for HTTPS.
+
+       FTP_PROXY [protocol://]&lt;host&gt;[:port]
+              Sets proxy server to use for FTP.
+
+       GOPHER_PROXY [protocol://]&lt;host&gt;[:port]
+              Sets proxy server to use for GOPHER.
+
+       ALL_PROXY [protocol://]&lt;host&gt;[:port]
+              Sets  proxy  server  to use if no protocol-specific
+              proxy is set.
+
+       NO_PROXY &lt;comma-separated list of hosts&gt;
+              list of host names that shouldn't  go  through  any
+              proxy. If set to a asterisk
+
+
+</PRE>
+<H2>EXIT CODES</H2><PRE>
+       There  exists  a  bunch of different error codes and their
+       corresponding error messages that may  appear  during  bad
+       conditions.  At  the  time of this writing, the exit codes
+       are:
+
+       1      Unsupported protocol. This build  of  curl  has  no
+              support for this protocol.
+
+       2      Failed to initialize.
+
+       3      URL malformat. The syntax was not correct.
+
+       4      URL  user  malformatted.  The  user-part of the URL
+              syntax was not correct.
+              not be resolved.
+
+       6      Couldn't  resolve  host.  The given remote host was
+              not resolved.
+
+       7      Failed to connect to host.
+
+       8      FTP weird server reply. The server sent  data  curl
+              couldn't parse.
+
+       9      FTP access denied. The server denied login.
+
+       10     FTP  user/password  incorrect.  Either  one or both
+              were not accepted by the server.
+
+       11     FTP weird PASS reply. Curl couldn't parse the reply
+              sent to the PASS request.
+
+       12     FTP weird USER reply. Curl couldn't parse the reply
+              sent to the USER request.
+
+       13     FTP weird PASV reply, Curl couldn't parse the reply
+              sent to the PASV request.
+
+       14     FTP  weird  227  format.  Curl  couldn't  parse the
+              227-line the server sent.
+
+       15     FTP can't get host. Couldn't resolve the host IP we
+              got in the 227-line.
+
+       16     FTP  can't  reconnect. Couldn't connect to the host
+              we got in the 227-line.
+
+       17     FTP couldn't set binary. Couldn't  change  transfer
+              method to binary.
+
+       18     Partial  file.  Only  a part of the file was trans-
+              fered.
+
+       19     FTP couldn't download/access the  given  file,  the
+              RETR (or similar) command failed.
+
+       20     FTP  write  error. The transfer was reported bad by
+              the server.
+
+       21     FTP quote error. A  quote  command  returned  error
+              from the server.
+
+       22     HTTP  page not retrieved. The requested url was not
+              found or returned another error with the HTTP error
+              code  being  400  or  above.  This return code only
+              appears if --fail is used.
+              filesystem or similar.
+
+       24     Malformat user. User name badly specified.
+
+       25     FTP  couldn't STOR file. The server denied the STOR
+              operation.
+
+       26     Read error. Various reading problems.
+
+       27     Out of memory. A memory allocation request  failed.
+
+       28     Operation  timeout.  The  specified time-out period
+              was reached according to the conditions.
+
+       29     FTP couldn't set  ASCII.  The  server  returned  an
+              unknown reply.
+
+       30     FTP PORT failed. The PORT command failed.
+
+       31     FTP couldn't use REST. The REST command failed.
+
+       32     FTP couldn't use SIZE. The SIZE command failed. The
+              command is an extension to the  original  FTP  spec
+              RFC 959.
+
+       33     HTTP  range error. The range "command" didn't work.
+
+       34     HTTP post error. Internal  post-request  generation
+              error.
+
+       35     SSL connect error. The SSL handshaking failed.
+
+       36     FTP  bad download resume. Couldn't continue an ear-
+              lier aborted download.
+
+       37     FILE couldn't read file. Failed to open  the  file.
+              Permissions?
+
+       38     LDAP cannot bind. LDAP bind operation failed.
+
+       39     LDAP search failed.
+
+       40     Library  not found. The LDAP library was not found.
+
+       41     Function not found. A required  LDAP  function  was
+              not found.
+
+       42     Aborted  by  callback.  An application told curl to
+              abort the operation.
+
+       43     Internal error. A function was called  with  a  bad
+              parameter.
+              order.
+
+       45     Interface error.  A  specified  outgoing  interface
+              could not be used.
+
+       46     Bad  password  entered.  An error was signaled when
+              the password was entered.
+
+       47     Too many redirects. When following redirects,  curl
+              hit the maximum amount.
+
+       48     Unknown TELNET option specified.
+
+       49     Malformed telnet option.
+
+       51     The remote peer's SSL certificate wasn't ok
+
+       52     The  server  didn't  reply  anything, which here is
+              considered an error.
+
+       53     SSL crypto engine not found
+
+       54     Cannot set SSL crypto engine as default
+
+       55     Failed sending network data
+
+       56     Failure in receiving network data
+
+       57     Share is in use (internal error)
+
+       58     Problem with the local certificate
+
+       59     Couldn't use specified SSL cipher
+
+       60     Problem with the CA cert (path? permission?)
+
+       61     Unrecognized transfer encoding
+
+       XX     There will appear more error codes here  in  future
+              releases.  The  existing  ones  are  meant to never
+              change.
+
+
+</PRE>
+<H2>BUGS</H2><PRE>
+       If you do find bugs, mail them to curl-bug@haxx.se.
+
+
+</PRE>
+<H2>AUTHORS / CONTRIBUTORS</H2><PRE>
+       Daniel Stenberg is the main author, but the whole list  of
+       contributors is found in the separate THANKS file.
+
+
+</PRE>
+<H2>WWW</H2><PRE>
+       http://curl.haxx.se
+
+       ftp://ftp.sunet.se/pub/www/utilities/curl/
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>ftp(1)</B>, <B>wget(1)</B>, <B>snarf(1)</B>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/curl.pdf b/main/source/curl/docs/curl.pdf
new file mode 100644
index 00000000..65e9de0a
Binary files /dev/null and b/main/source/curl/docs/curl.pdf differ
diff --git a/main/source/curl/docs/examples/Makefile.am b/main/source/curl/docs/examples/Makefile.am
new file mode 100644
index 00000000..d1053005
--- /dev/null
+++ b/main/source/curl/docs/examples/Makefile.am
@@ -0,0 +1,15 @@
+#
+# $Id: Makefile.am,v 1.23 2002/06/19 12:30:12 bagder Exp $
+#
+
+AUTOMAKE_OPTIONS = foreign no-dependencies
+
+EXTRA_DIST = README curlgtk.c sepheaders.c simple.c postit2.c		\
+	     persistant.c ftpget.c Makefile.example			\
+	     multithread.c getinmemory.c ftpupload.c httpput.c		\
+	     simplessl.c ftpgetresp.c http-post.c post-callback.c	\
+	     multi-app.c multi-double.c multi-single.c multi-post.c	\
+	     fopen.c simplepost.c
+
+all:
+	@echo "done"
diff --git a/main/source/curl/docs/examples/Makefile.example b/main/source/curl/docs/examples/Makefile.example
new file mode 100644
index 00000000..0be786c0
--- /dev/null
+++ b/main/source/curl/docs/examples/Makefile.example
@@ -0,0 +1,42 @@
+#############################################################################
+#                                  _   _ ____  _     
+#  Project                     ___| | | |  _ \| |    
+#                             / __| | | | |_) | |    
+#                            | (__| |_| |  _ <| |___ 
+#                             \___|\___/|_| \_\_____|
+#
+# $Id: Makefile.example,v 1.3 2002/08/14 23:01:14 bagder Exp $
+#
+
+# What to call the final executable
+TARGET = example
+
+# Which object files that the executable consists of
+OBJS= ftpget.o
+
+# What compiler to use
+CC = gcc
+
+# Compiler flags, -g for debug, -c to make an object file
+CFLAGS = -c -g
+
+# This should point to a directory that holds libcurl, if it isn't
+# in the system's standard lib dir
+# We also set a -L to include the directory where we have the openssl
+# libraries
+LDFLAGS = -L/home/dast/lib -L/usr/local/ssl/lib
+
+# We need -lcurl for the curl stuff
+# We need -lsocket and -lnsl when on Solaris
+# We need -lssl and -lcrypto when using libcurl with SSL support
+# We need -ldl for dlopen() if that is in libdl
+# We need -lpthread for the pthread example
+LIBS = -lcurl -lsocket -lnsl -lssl -lcrypto -dl
+
+# Link the target with all objects and libraries
+$(TARGET) : $(OBJS)
+	$(CC)  -o $(TARGET) $(OBJS) $(LDFLAGS) $(LIBS)
+
+# Compile the source files into object files
+ftpget.o : ftpget.c
+	$(CC) $(CFLAGS) $<
diff --git a/main/source/curl/docs/examples/Makefile.in b/main/source/curl/docs/examples/Makefile.in
new file mode 100644
index 00000000..cd249004
--- /dev/null
+++ b/main/source/curl/docs/examples/Makefile.in
@@ -0,0 +1,334 @@
+# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# $Id: Makefile.am,v 1.23 2002/06/19 12:30:12 bagder Exp $
+#
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CA_BUNDLE = @CURL_CA_BUNDLE@
+CURL_DISABLE_DICT = @CURL_DISABLE_DICT@
+CURL_DISABLE_FILE = @CURL_DISABLE_FILE@
+CURL_DISABLE_FTP = @CURL_DISABLE_FTP@
+CURL_DISABLE_GOPHER = @CURL_DISABLE_GOPHER@
+CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@
+CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@
+CURL_DISABLE_TELNET = @CURL_DISABLE_TELNET@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_LIBZ = @HAVE_LIBZ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPV6_ENABLED = @IPV6_ENABLED@
+KRB4_ENABLED = @KRB4_ENABLED@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NO_UNDEFINED_FALSE = @NO_UNDEFINED_FALSE@
+NO_UNDEFINED_TRUE = @NO_UNDEFINED_TRUE@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_ENABLED = @OPENSSL_ENABLED@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKGADD_NAME = @PKGADD_NAME@
+PKGADD_PKG = @PKGADD_PKG@
+PKGADD_VENDOR = @PKGADD_VENDOR@
+PKGCONFIG = @PKGCONFIG@
+RANDOM_FILE = @RANDOM_FILE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VERSIONNUM = @VERSIONNUM@
+YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+
+AUTOMAKE_OPTIONS = foreign no-dependencies
+
+EXTRA_DIST = README curlgtk.c sepheaders.c simple.c postit2.c		\
+	     persistant.c ftpget.c Makefile.example			\
+	     multithread.c getinmemory.c ftpupload.c httpput.c		\
+	     simplessl.c ftpgetresp.c http-post.c post-callback.c	\
+	     multi-app.c multi-double.c multi-single.c multi-post.c	\
+	     fopen.c simplepost.c
+
+subdir = docs/examples
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/lib/config.h \
+	$(top_builddir)/src/config.h \
+	$(top_builddir)/tests/server/config.h \
+	$(top_builddir)/lib/ca-bundle.h
+CONFIG_CLEAN_FILES =
+depcomp =
+am__depfiles_maybe =
+DIST_SOURCES =
+DIST_COMMON = README Makefile.am Makefile.in
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  docs/examples/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
+
+
+all:
+	@echo "done"
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/main/source/curl/docs/examples/README b/main/source/curl/docs/examples/README
new file mode 100644
index 00000000..66ed1f23
--- /dev/null
+++ b/main/source/curl/docs/examples/README
@@ -0,0 +1,25 @@
+EXAMPLES
+
+This directory is for libcurl programming examples. They are meant to show
+some simple steps on how you can build your own application to take full
+advantage of libcurl.
+
+If you end up with other small but still useful example sources, please mail
+them for submission in future packages and on the web site.
+
+The Makefile.example is an example makefile that could be used to build these
+examples. Just edit the file according to your system and requirements first.
+
+Most examples should build fine using a command line like this:
+
+  $ `curl-config --cc --cflags --libs` -o example example.c
+
+Some compilers don't like having the arguments in this order but instead
+want you do reorganize them like:
+
+  $ `curl-config --cc` -o example example.c `curl-config --cflags --libs`
+
+*PLEASE* do not use the curl.haxx.se site as a test target for your libcurl
+applications/experiments. Even if the examples in this directory use that site
+as an example URL at some places, it doesn't mean that the URLs work or that
+we expect you to actually torture our web site with your tests! Thanks.
diff --git a/main/source/curl/docs/examples/curlgtk.c b/main/source/curl/docs/examples/curlgtk.c
new file mode 100644
index 00000000..c6f47fa1
--- /dev/null
+++ b/main/source/curl/docs/examples/curlgtk.c
@@ -0,0 +1,100 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id: curlgtk.c,v 1.3 2002/03/11 15:00:57 bagder Exp $
+ */
+/* Copyright (c) 2000 David Odin (aka DindinX) for MandrakeSoft */
+/* an attempt to use the curl library in concert with a gtk-threaded application */
+
+#include <stdio.h>
+#include <gtk/gtk.h>
+
+#include <curl/curl.h>
+#include <curl/types.h> /* new for v7 */
+#include <curl/easy.h> /* new for v7 */
+
+#include <pthread.h>
+
+GtkWidget *Bar;
+
+size_t my_read_func(void *ptr, size_t size, size_t nmemb, FILE *stream)
+{
+  return fread(ptr, size, nmemb, stream);
+}
+
+int my_progress_func(GtkWidget *Bar,
+                     double t, /* dltotal */
+                     double d, /* dlnow */
+                     double ultotal,
+                     double ulnow)
+{
+/*  printf("%d / %d (%g %%)\n", d, t, d*100.0/t);*/
+  gdk_threads_enter();
+  gtk_progress_set_value(GTK_PROGRESS(Bar), d*100.0/t);
+  gdk_threads_leave();
+  return 0;
+}
+
+void *curl_thread(void *ptr)
+{
+  CURL *curl;
+  CURLcode res;
+  FILE *outfile;
+  gchar *url = ptr;
+  
+  curl = curl_easy_init();
+  if(curl)
+  {
+    outfile = fopen("/tmp/test.curl", "w");
+
+    curl_easy_setopt(curl, CURLOPT_URL, url);
+    curl_easy_setopt(curl, CURLOPT_FILE, outfile);
+    curl_easy_setopt(curl, CURLOPT_READFUNCTION, my_read_func);
+    curl_easy_setopt(curl, CURLOPT_NOPROGRESS, FALSE);
+    curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, my_progress_func);
+    curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, Bar);
+    
+    res = curl_easy_perform(curl);
+
+    fclose(outfile);
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+  }
+  return NULL;
+}
+
+int main(int argc, char **argv)
+{
+  GtkWidget *Window, *Frame, *Frame2;
+  GtkAdjustment *adj;
+  pthread_t curl_tid;
+
+  /* Init thread */
+  g_thread_init(NULL);
+  
+  gtk_init(&argc, &argv);
+  Window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+  Frame = gtk_frame_new(NULL);
+  gtk_frame_set_shadow_type(GTK_FRAME(Frame), GTK_SHADOW_OUT);
+  gtk_container_add(GTK_CONTAINER(Window), Frame);
+  Frame2 = gtk_frame_new(NULL);
+  gtk_frame_set_shadow_type(GTK_FRAME(Frame2), GTK_SHADOW_IN);
+  gtk_container_add(GTK_CONTAINER(Frame), Frame2);
+  gtk_container_set_border_width(GTK_CONTAINER(Frame2), 5);
+  adj = (GtkAdjustment*)gtk_adjustment_new(0, 0, 100, 0, 0, 0);
+  Bar = gtk_progress_bar_new_with_adjustment(adj);
+  gtk_container_add(GTK_CONTAINER(Frame2), Bar);
+  gtk_widget_show_all(Window);
+
+  pthread_create(&curl_tid, NULL, curl_thread, argv[1]);
+    
+  gdk_threads_enter();
+  gtk_main();
+  gdk_threads_leave();
+  return 0;
+}
+
diff --git a/main/source/curl/docs/examples/fopen.c b/main/source/curl/docs/examples/fopen.c
new file mode 100644
index 00000000..2ba40bb1
--- /dev/null
+++ b/main/source/curl/docs/examples/fopen.c
@@ -0,0 +1,235 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id: fopen.c,v 1.2 2003/01/27 10:25:20 bagder Exp $
+ *
+ * This example source code introduces an fopen()/fread()/fclose() emulation
+ * for URL reads. Using an approach similar to this, you could replace your
+ * program's fopen() with this url_fopen() and fread() with url_fread() and
+ * it should be possible to read remote streams instead of (only) local files.
+ *
+ * See the main() function at the bottom that shows a tiny app in action.
+ *
+ * This source code is a proof of concept. It will need further attention to
+ * become production-use useful and solid.
+ *
+ * This example requires libcurl 7.9.7 or later.
+ */
+#include <stdio.h>
+#include <string.h>
+#include <sys/time.h>
+#include <stdlib.h>
+
+#include <curl/curl.h>
+
+#if (LIBCURL_VERSION_NUM < 0x070907)
+#error "too old libcurl version, get the latest!"
+#endif
+
+struct data {
+  int type;
+  union {
+    CURL *curl;
+    FILE *file;
+  } handle;
+
+  /* This is the documented biggest possible buffer chunk we can get from
+     libcurl in one single callback! */
+  char buffer[CURL_MAX_WRITE_SIZE];
+
+  char *readptr; /* read from here */
+  int bytes;     /* bytes available from read pointer */
+
+  CURLMcode m;   /* stored from a previous url_fread() */
+};
+
+typedef struct data URL_FILE;
+
+/* we use a global one for convenience */
+CURLM *multi_handle;
+
+static
+size_t write_callback(char *buffer,
+                      size_t size,
+                      size_t nitems,
+                      void *userp)
+{
+  URL_FILE *url = (URL_FILE *)userp;
+  size *= nitems;
+
+  memcpy(url->readptr, buffer, size);
+  url->readptr += size;
+  url->bytes += size;
+
+  fprintf(stderr, "callback %d size bytes\n", size);
+
+  return size;
+}
+
+URL_FILE *url_fopen(char *url, char *operation)
+{
+  /* this code could check for URLs or types in the 'url' and
+     basicly use the real fopen() for standard files */
+
+  URL_FILE *file;
+  int still_running;
+  (void)operation;
+
+  file = (URL_FILE *)malloc(sizeof(URL_FILE));
+  if(!file)
+    return NULL;
+
+  memset(file, 0, sizeof(URL_FILE));
+
+  file->type = 1; /* marked as URL, use 0 for plain file */
+  file->handle.curl = curl_easy_init();
+
+  curl_easy_setopt(file->handle.curl, CURLOPT_URL, url);
+  curl_easy_setopt(file->handle.curl, CURLOPT_FILE, file);
+  curl_easy_setopt(file->handle.curl, CURLOPT_VERBOSE, FALSE);
+  curl_easy_setopt(file->handle.curl, CURLOPT_WRITEFUNCTION, write_callback);
+
+  if(!multi_handle)
+    multi_handle = curl_multi_init();
+
+  curl_multi_add_handle(multi_handle, file->handle.curl);
+
+  while(CURLM_CALL_MULTI_PERFORM ==
+        curl_multi_perform(multi_handle, &still_running));
+
+  /* if still_running would be 0 now, we should return NULL */
+
+  return file;
+}
+
+void url_fclose(URL_FILE *file)
+{
+  /* make sure the easy handle is not in the multi handle anymore */
+  curl_multi_remove_handle(multi_handle, file->handle.curl);
+
+  /* cleanup */
+  curl_easy_cleanup(file->handle.curl);
+}
+
+
+
+size_t url_fread(void *ptr, size_t size, size_t nmemb, URL_FILE *file)
+{
+  fd_set fdread;
+  fd_set fdwrite;
+  fd_set fdexcep;
+  int maxfd;
+  struct timeval timeout;
+  int rc;
+  int still_running = 0;
+
+  if(!file->bytes) { /* no data available at this point */
+
+    file->readptr = file->buffer; /* reset read pointer */
+
+    if(CURLM_CALL_MULTI_PERFORM == file->m) {
+      while(CURLM_CALL_MULTI_PERFORM ==
+            curl_multi_perform(multi_handle, &still_running)) {
+        if(file->bytes) {
+          printf("(fread) WOAH! THis happened!\n");
+          break;        
+        }
+      }
+      if(!still_running) {
+        printf("DONE RUNNING AROUND!\n");
+        return 0;
+      }
+    }
+
+    do {
+
+      FD_ZERO(&fdread);
+      FD_ZERO(&fdwrite);
+      FD_ZERO(&fdexcep);
+  
+      /* set a suitable timeout to fail on */
+      timeout.tv_sec = 500; /* 5 minutes */
+      timeout.tv_usec = 0;
+
+      /* get file descriptors from the transfers */
+      curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
+
+      rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);
+
+      switch(rc) {
+      case -1:
+        /* select error */
+        break;
+      case 0:
+        break;
+      default:
+        /* timeout or readable/writable sockets */
+        printf("select() returned %d!\n", rc);
+        do {
+          file->m = curl_multi_perform(multi_handle, &still_running);
+          
+          if(file->bytes)
+            /* we have received data, return that now */
+            break;
+          
+        } while(CURLM_CALL_MULTI_PERFORM == file->m);
+
+        
+        if(!still_running)
+          printf("DONE RUNNING AROUND!\n");
+        
+        break;
+      }
+    } while(still_running && (file->bytes <= 0));
+  }
+  else
+    printf("(fread) Skip network read\n");
+
+  if(file->bytes) {
+    /* data already available, return that */
+    int want = size * nmemb;
+
+    if(file->bytes < want)
+      want = file->bytes;
+
+    memcpy(ptr, file->readptr, want);
+    file->readptr += want;
+    file->bytes -= want;
+
+    printf("(fread) return %d bytes\n", want);
+
+    return want;
+  }
+  return 0; /* no data available to return */
+}
+
+
+int main(int argc, char *argv[])
+{
+  URL_FILE *handle;
+  int nread;
+  char buffer[256];
+
+  (void)argc;
+  (void)argv;
+
+  handle = url_fopen("http://curl.haxx.se/", "r");
+
+  if(!handle) {
+    printf("couldn't url_fopen()\n");
+  }
+
+  do {
+    nread = url_fread(buffer, sizeof(buffer), 1, handle);
+
+    printf("We got: %d bytes\n", nread);
+  } while(nread);
+
+  url_fclose(handle);
+
+  return 0;
+}
diff --git a/main/source/curl/docs/examples/ftpget.c b/main/source/curl/docs/examples/ftpget.c
new file mode 100644
index 00000000..284df092
--- /dev/null
+++ b/main/source/curl/docs/examples/ftpget.c
@@ -0,0 +1,83 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id: ftpget.c,v 1.2 2002/01/08 13:05:44 bagder Exp $
+ */
+
+#include <stdio.h>
+
+#include <curl/curl.h>
+#include <curl/types.h>
+#include <curl/easy.h>
+
+/*
+ * This is an example showing how to get a single file from an FTP server.
+ * It delays the actual destination file creation until the first write
+ * callback so that it won't create an empty file in case the remote file
+ * doesn't exist or something else fails.
+ */
+
+struct FtpFile {
+  char *filename;
+  FILE *stream;
+};
+
+int my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream)
+{
+  struct FtpFile *out=(struct FtpFile *)stream;
+  if(out && !out->stream) {
+    /* open file for writing */
+    out->stream=fopen(out->filename, "wb");
+    if(!out->stream)
+      return -1; /* failure, can't open file to write */
+  }
+  return fwrite(buffer, size, nmemb, out->stream);
+}
+
+
+int main(void)
+{
+  CURL *curl;
+  CURLcode res;
+  struct FtpFile ftpfile={
+    "curl.tar.gz", /* name to store the file as if succesful */
+    NULL
+  };
+
+  curl_global_init(CURL_GLOBAL_DEFAULT);
+  
+  curl = curl_easy_init();
+  if(curl) {
+    /* Get curl 7.9.2 from sunet.se's FTP site: */
+    curl_easy_setopt(curl, CURLOPT_URL,
+                     "ftp://ftp.sunet.se/pub/www/utilities/curl/curl-7.9.2.tar.gz");
+    /* Define our callback to get called when there's data to be written */
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, my_fwrite);
+    /* Set a pointer to our struct to pass to the callback */
+    curl_easy_setopt(curl, CURLOPT_FILE, &ftpfile);
+
+    /* Switch on full protocol/debug output */
+    curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE);
+
+    res = curl_easy_perform(curl);
+
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+
+    if(CURLE_OK != res) {
+      /* we failed */
+      fprintf(stderr, "curl told us %d\n", res);
+    }
+  }
+
+  if(ftpfile.stream)
+    fclose(ftpfile.stream); /* close the local file */
+
+  curl_global_cleanup();
+
+  return 0;
+}
diff --git a/main/source/curl/docs/examples/ftpgetresp.c b/main/source/curl/docs/examples/ftpgetresp.c
new file mode 100644
index 00000000..2360866f
--- /dev/null
+++ b/main/source/curl/docs/examples/ftpgetresp.c
@@ -0,0 +1,61 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id: ftpgetresp.c,v 1.1 2002/01/08 08:25:44 bagder Exp $
+ */
+
+#include <stdio.h>
+
+#include <curl/curl.h>
+#include <curl/types.h>
+#include <curl/easy.h>
+
+/*
+ * Similar to ftpget.c but this also stores the received response-lines
+ * in a separate file using our own callback!
+ *
+ * This functionality was introduced in libcurl 7.9.3.
+ */
+
+size_t
+write_response(void *ptr, size_t size, size_t nmemb, void *data)
+{
+  FILE *writehere = (FILE *)data;
+  return fwrite(ptr, size, nmemb, writehere);
+}
+
+int main(int argc, char **argv)
+{
+  CURL *curl;
+  CURLcode res;
+  FILE *ftpfile;
+  FILE *respfile;
+  
+  /* local file name to store the file as */
+  ftpfile = fopen("ftp-list", "wb"); /* b is binary, needed on win32 */
+
+  /* local file name to store the FTP server's response lines in */
+  respfile = fopen("ftp-responses", "wb"); /* b is binary, needed on win32 */
+
+  curl = curl_easy_init();
+  if(curl) {
+    /* Get a file listing from sunet */
+    curl_easy_setopt(curl, CURLOPT_URL, "ftp://ftp.sunet.se/");
+    curl_easy_setopt(curl, CURLOPT_FILE, ftpfile);
+    curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, write_response);
+    curl_easy_setopt(curl, CURLOPT_WRITEHEADER, respfile);
+    res = curl_easy_perform(curl);
+
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+  }
+
+  fclose(ftpfile); /* close the local file */
+  fclose(respfile); /* close the response file */
+
+  return 0;
+}
diff --git a/main/source/curl/docs/examples/ftpupload.c b/main/source/curl/docs/examples/ftpupload.c
new file mode 100644
index 00000000..a5df6472
--- /dev/null
+++ b/main/source/curl/docs/examples/ftpupload.c
@@ -0,0 +1,91 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id: ftpupload.c,v 1.2 2003/03/17 12:38:08 bagder Exp $
+ */
+
+#include <stdio.h>
+
+#include <curl/curl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+/*
+ * This example shows an FTP upload, with a rename of the file just after
+ * a successful upload.
+ *
+ * Example based on source code provided by Erick Nuwendam. Thanks!
+ */
+
+#define LOCAL_FILE      "/tmp/uploadthis.txt"
+#define UPLOAD_FILE_AS  "while-uploading.txt"
+#define REMOTE_URL      "ftp://localhost/"  UPLOAD_FILE_AS
+#define RENAME_FILE_TO  "renamed-and-fine.txt"
+
+int main(int argc, char **argv)
+{
+  CURL *curl;
+  CURLcode res;
+  FILE *ftpfile;
+  FILE * hd_src ;
+  int hd ;
+  struct stat file_info;
+
+  struct curl_slist *headerlist=NULL;
+  char buf_1 [] = "RNFR " UPLOAD_FILE_AS;
+  char buf_2 [] = "RNTO " RENAME_FILE_TO;
+
+  /* get the file size of the local file */
+  hd = open(LOCAL_FILE, O_RDONLY) ;
+  fstat(hd, &file_info);
+  close(hd) ;
+
+  /* get a FILE * of the same file, could also be made with
+     fdopen() from the previous descriptor, but hey this is just 
+     an example! */
+  hd_src = fopen(LOCAL_FILE, "rb");
+
+  /* In windows, this will init the winsock stuff */
+  curl_global_init(CURL_GLOBAL_ALL);
+
+  /* get a curl handle */
+  curl = curl_easy_init();
+  if(curl) {
+    /* build a list of commands to pass to libcurl */
+    headerlist = curl_slist_append(headerlist, buf_1);
+    headerlist = curl_slist_append(headerlist, buf_2);
+
+    /* enable uploading */
+    curl_easy_setopt(curl, CURLOPT_UPLOAD, TRUE) ;
+
+    /* specify target */
+    curl_easy_setopt(curl,CURLOPT_URL, REMOTE_URL);
+
+    /* pass in that last of FTP commands to run after the transfer */
+    curl_easy_setopt(curl, CURLOPT_POSTQUOTE, headerlist);
+
+    /* now specify which file to upload */
+    curl_easy_setopt(curl, CURLOPT_INFILE, hd_src);
+
+    /* and give the size of the upload (optional) */
+    curl_easy_setopt(curl, CURLOPT_INFILESIZE, file_info.st_size);
+
+    /* Now run off and do what you've been told! */
+    res = curl_easy_perform(curl);
+
+    /* clean up the FTP commands list */
+    curl_slist_free_all (headerlist);
+
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+  }
+  fclose(hd_src); /* close the local file */
+
+  curl_global_cleanup();
+  return 0;
+}
diff --git a/main/source/curl/docs/examples/getinmemory.c b/main/source/curl/docs/examples/getinmemory.c
new file mode 100644
index 00000000..4df73d49
--- /dev/null
+++ b/main/source/curl/docs/examples/getinmemory.c
@@ -0,0 +1,84 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id: getinmemory.c,v 1.3 2003/03/10 17:01:11 bagder Exp $
+ *
+ * Example source code to show how the callback function can be used to
+ * download data into a chunk of memory instead of storing it in a file.
+ *
+ * This exact source code has not been verified to work.
+ */
+
+/* to make this work under windows, use the win32-functions from the
+   win32socket.c file as well */
+
+#include <stdio.h>
+
+#include <curl/curl.h>
+#include <curl/types.h>
+#include <curl/easy.h>
+
+struct MemoryStruct {
+  char *memory;
+  size_t size;
+};
+
+size_t
+WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data)
+{
+  register int realsize = size * nmemb;
+  struct MemoryStruct *mem = (struct MemoryStruct *)data;
+  
+  mem->memory = (char *)realloc(mem->memory, mem->size + realsize + 1);
+  if (mem->memory) {
+    memcpy(&(mem->memory[mem->size]), ptr, realsize);
+    mem->size += realsize;
+    mem->memory[mem->size] = 0;
+  }
+  return realsize;
+}
+
+int main(int argc, char **argv)
+{
+  CURL *curl_handle;
+
+  struct MemoryStruct chunk;
+
+  chunk.memory=NULL; /* we expect realloc(NULL, size) to work */
+  chunk.size = 0;    /* no data at this point */
+
+  /* init the curl session */
+  curl_handle = curl_easy_init();
+
+  /* specify URL to get */
+  curl_easy_setopt(curl_handle, CURLOPT_URL, "http://cool.haxx.se/");
+
+  /* send all data to this function  */
+  curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
+
+  /* we pass our 'chunk' struct to the callback function */
+  curl_easy_setopt(curl_handle, CURLOPT_FILE, (void *)&chunk);
+
+  /* get it! */
+  curl_easy_perform(curl_handle);
+
+  /* cleanup curl stuff */
+  curl_easy_cleanup(curl_handle);
+
+  /*
+   * Now, our chunk.memory points to a memory block that is chunk.size
+   * bytes big and contains the remote file.
+   *
+   * Do something nice with it!
+   *
+   * You should be aware of the fact that at this point we might have an
+   * allocated data block, and nothing has yet deallocated that data. So when
+   * you're done with it, you should free() it as a nice application.
+   */
+
+  return 0;
+}
diff --git a/main/source/curl/docs/examples/http-post.c b/main/source/curl/docs/examples/http-post.c
new file mode 100644
index 00000000..958eee55
--- /dev/null
+++ b/main/source/curl/docs/examples/http-post.c
@@ -0,0 +1,35 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id: http-post.c,v 1.1 2002/01/10 09:00:02 bagder Exp $
+ */
+
+#include <stdio.h>
+#include <curl/curl.h>
+
+int main(void)
+{
+  CURL *curl;
+  CURLcode res;
+
+  curl = curl_easy_init();
+  if(curl) {
+    /* First set the URL that is about to receive our POST. This URL can
+       just as well be a https:// URL if that is what should receive the
+       data. */
+    curl_easy_setopt(curl, CURLOPT_URL, "http://postit.example.com/moo.cgi");
+    /* Now specify the POST data */
+    curl_easy_setopt(curl, CURLOPT_POSTFIELDS, "name=daniel&project=curl");
+
+    /* Perform the request, res will get the return code */
+    res = curl_easy_perform(curl);
+
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+  }
+  return 0;
+}
diff --git a/main/source/curl/docs/examples/httpput.c b/main/source/curl/docs/examples/httpput.c
new file mode 100644
index 00000000..0fbce2cc
--- /dev/null
+++ b/main/source/curl/docs/examples/httpput.c
@@ -0,0 +1,100 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id: httpput.c,v 1.1 2001/09/25 05:55:56 bagder Exp $
+ */
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#include <curl/curl.h>
+
+/*
+ * This example shows a HTTP PUT operation. PUTs a file given as a command
+ * line argument to the URL also given on the command line.
+ *
+ * This example also uses its own read callback.
+ */
+
+size_t read_callback(void *ptr, size_t size, size_t nmemb, void *stream)
+{
+  size_t retcode;
+
+  /* in real-world cases, this would probably get this data differently
+     as this fread() stuff is exactly what the library already would do
+     by default internally */
+  retcode = fread(ptr, size, nmemb, stream);
+
+  fprintf(stderr, "*** We read %d bytes from file\n", retcode);
+
+  return retcode;
+}
+
+int main(int argc, char **argv)
+{
+  CURL *curl;
+  CURLcode res;
+  FILE *ftpfile;
+  FILE * hd_src ;
+  int hd ;
+  struct stat file_info;
+
+  char *file;
+  char *url;
+
+  if(argc < 3)
+    return 1;
+ 
+  file= argv[1];
+  url = argv[2];
+  
+  /* get the file size of the local file */
+  hd = open(file, O_RDONLY) ;
+  fstat(hd, &file_info);
+  close(hd) ;
+
+  /* get a FILE * of the same file, could also be made with
+     fdopen() from the previous descriptor, but hey this is just 
+     an example! */
+  hd_src = fopen(file, "rb");
+
+  /* In windows, this will init the winsock stuff */
+  curl_global_init(CURL_GLOBAL_ALL);
+
+  /* get a curl handle */
+  curl = curl_easy_init();
+  if(curl) {
+    /* we want to use our own read function */
+    curl_easy_setopt(curl, CURLOPT_READFUNCTION, read_callback);
+
+    /* enable uploading */
+    curl_easy_setopt(curl, CURLOPT_UPLOAD, TRUE) ;
+
+    /* HTTP PUT please */
+    curl_easy_setopt(curl, CURLOPT_PUT, TRUE);
+
+    /* specify target */
+    curl_easy_setopt(curl,CURLOPT_URL, url);
+
+    /* now specify which file to upload */
+    curl_easy_setopt(curl, CURLOPT_INFILE, hd_src);
+
+    /* and give the size of the upload (optional) */
+    curl_easy_setopt(curl, CURLOPT_INFILESIZE, file_info.st_size);
+
+    /* Now run off and do what you've been told! */
+    res = curl_easy_perform(curl);
+
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+  }
+  fclose(hd_src); /* close the local file */
+
+  curl_global_cleanup();
+  return 0;
+}
diff --git a/main/source/curl/docs/examples/multi-app.c b/main/source/curl/docs/examples/multi-app.c
new file mode 100644
index 00000000..39e9d1f6
--- /dev/null
+++ b/main/source/curl/docs/examples/multi-app.c
@@ -0,0 +1,99 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id: multi-app.c,v 1.3 2003/01/09 11:43:08 bagder Exp $
+ *
+ * This is an example application source code using the multi interface.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+/* somewhat unix-specific */
+#include <sys/time.h>
+#include <unistd.h>
+
+/* curl stuff */
+#include <curl/curl.h>
+
+/*
+ * Download a HTTP file and upload an FTP file simultaneously.
+ */
+int main(int argc, char **argv)
+{
+  CURL *http_handle;
+  CURL *ftp_handle;
+  CURLM *multi_handle;
+
+  int still_running; /* keep number of running handles */
+
+  http_handle = curl_easy_init();
+  ftp_handle  = curl_easy_init();
+
+  /* set the options (I left out a few, you'll get the point anyway) */
+  curl_easy_setopt(http_handle, CURLOPT_URL, "http://website.com");
+
+  curl_easy_setopt(ftp_handle, CURLOPT_URL, "ftp://ftpsite.com");
+  curl_easy_setopt(ftp_handle, CURLOPT_UPLOAD, TRUE);
+
+  /* init a multi stack */
+  multi_handle = curl_multi_init();
+
+  /* add the individual transfers */
+  curl_multi_add_handle(multi_handle, http_handle);
+  curl_multi_add_handle(multi_handle, ftp_handle);
+
+  /* we start some action by calling perform right away */
+  while(CURLM_CALL_MULTI_PERFORM ==
+        curl_multi_perform(multi_handle, &still_running));
+
+  while(still_running) {
+    struct timeval timeout;
+    int rc; /* select() return code */
+
+    fd_set fdread;
+    fd_set fdwrite;
+    fd_set fdexcep;
+    int maxfd;
+
+    FD_ZERO(&fdread);
+    FD_ZERO(&fdwrite);
+    FD_ZERO(&fdexcep);
+
+    /* set a suitable timeout to play around with */
+    timeout.tv_sec = 1;
+    timeout.tv_usec = 0;
+
+    /* get file descriptors from the transfers */
+    curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
+
+    rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);
+
+    switch(rc) {
+    case -1:
+      /* select error */
+      break;
+    case 0:
+      /* timeout, do something else */
+      break;
+    default:
+      /* one or more of curl's file descriptors say there's data to read
+         or write */
+      while(CURLM_CALL_MULTI_PERFORM ==
+            curl_multi_perform(multi_handle, &still_running));
+      break;
+    }
+  }
+
+  curl_multi_cleanup(multi_handle);
+
+  curl_easy_cleanup(http_handle);
+  curl_easy_cleanup(ftp_handle);
+
+
+  return 0;
+}
diff --git a/main/source/curl/docs/examples/multi-double.c b/main/source/curl/docs/examples/multi-double.c
new file mode 100644
index 00000000..cc3e5f6d
--- /dev/null
+++ b/main/source/curl/docs/examples/multi-double.c
@@ -0,0 +1,95 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id: multi-double.c,v 1.3 2002/12/03 12:34:43 bagder Exp $
+ *
+ * This is a very simple example using the multi interface.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+/* somewhat unix-specific */
+#include <sys/time.h>
+#include <unistd.h>
+
+/* curl stuff */
+#include <curl/curl.h>
+
+/*
+ * Simply download two HTTP files!
+ */
+int main(int argc, char **argv)
+{
+  CURL *http_handle;
+  CURL *http_handle2;
+  CURLM *multi_handle;
+
+  int still_running; /* keep number of running handles */
+
+  http_handle = curl_easy_init();
+  http_handle2 = curl_easy_init();
+
+  /* set options */
+  curl_easy_setopt(http_handle, CURLOPT_URL, "http://www.haxx.se/");
+
+  /* set options */
+  curl_easy_setopt(http_handle2, CURLOPT_URL, "http://localhost/");
+
+  /* init a multi stack */
+  multi_handle = curl_multi_init();
+
+  /* add the individual transfers */
+  curl_multi_add_handle(multi_handle, http_handle);
+  curl_multi_add_handle(multi_handle, http_handle2);
+
+  /* we start some action by calling perform right away */
+  while(CURLM_CALL_MULTI_PERFORM ==
+        curl_multi_perform(multi_handle, &still_running));
+
+  while(still_running) {
+    struct timeval timeout;
+    int rc; /* select() return code */
+
+    fd_set fdread;
+    fd_set fdwrite;
+    fd_set fdexcep;
+    int maxfd;
+
+    FD_ZERO(&fdread);
+    FD_ZERO(&fdwrite);
+    FD_ZERO(&fdexcep);
+
+    /* set a suitable timeout to play around with */
+    timeout.tv_sec = 1;
+    timeout.tv_usec = 0;
+
+    /* get file descriptors from the transfers */
+    curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
+
+    rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);
+
+    switch(rc) {
+    case -1:
+      /* select error */
+      break;
+    case 0:
+    default:
+      /* timeout or readable/writable sockets */
+      while(CURLM_CALL_MULTI_PERFORM ==
+            curl_multi_perform(multi_handle, &still_running));
+      break;
+    }
+  }
+
+  curl_multi_cleanup(multi_handle);
+
+  curl_easy_cleanup(http_handle);
+  curl_easy_cleanup(http_handle2);
+
+  return 0;
+}
diff --git a/main/source/curl/docs/examples/multi-post.c b/main/source/curl/docs/examples/multi-post.c
new file mode 100644
index 00000000..1c6d7a9d
--- /dev/null
+++ b/main/source/curl/docs/examples/multi-post.c
@@ -0,0 +1,126 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id: multi-post.c,v 1.1 2002/05/06 13:38:28 bagder Exp $
+ *
+ * This is an example application source code using the multi interface
+ * to do a multipart formpost without "blocking".
+ */
+#include <stdio.h>
+#include <string.h>
+#include <sys/time.h>
+
+#include <curl/curl.h>
+
+int main(int argc, char *argv[])
+{
+  CURL *curl;
+  CURLcode res;
+
+  CURLM *multi_handle;
+  int still_running;
+
+  struct HttpPost *formpost=NULL;
+  struct HttpPost *lastptr=NULL;
+  struct curl_slist *headerlist=NULL;
+  char buf[] = "Expect:";
+
+  /* Fill in the file upload field */
+  curl_formadd(&formpost,
+               &lastptr,
+               CURLFORM_COPYNAME, "sendfile",
+               CURLFORM_FILE, "postit2.c",
+               CURLFORM_END);
+
+  /* Fill in the filename field */
+  curl_formadd(&formpost,
+               &lastptr,
+               CURLFORM_COPYNAME, "filename",
+               CURLFORM_COPYCONTENTS, "postit2.c",
+               CURLFORM_END);
+
+
+  /* Fill in the submit field too, even if this is rarely needed */
+  curl_formadd(&formpost,
+               &lastptr,
+               CURLFORM_COPYNAME, "submit",
+               CURLFORM_COPYCONTENTS, "send",
+               CURLFORM_END);
+
+  curl = curl_easy_init();
+  multi_handle = curl_multi_init();
+
+  /* initalize custom header list (stating that Expect: 100-continue is not
+     wanted */
+  headerlist = curl_slist_append(headerlist, buf);
+  if(curl && multi_handle) {
+    int perform=0;
+
+    /* what URL that receives this POST */
+    curl_easy_setopt(curl, CURLOPT_URL,
+                     "http://www.fillinyoururl.com/upload.cgi");
+    curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+
+    curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headerlist);
+    curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
+
+    curl_multi_add_handle(multi_handle, curl);
+
+    while(CURLM_CALL_MULTI_PERFORM ==
+          curl_multi_perform(multi_handle, &still_running));
+
+    while(still_running) {
+      struct timeval timeout;
+      int rc; /* select() return code */
+
+      fd_set fdread;
+      fd_set fdwrite;
+      fd_set fdexcep;
+      int maxfd;
+
+      FD_ZERO(&fdread);
+      FD_ZERO(&fdwrite);
+      FD_ZERO(&fdexcep);
+
+      /* set a suitable timeout to play around with */
+      timeout.tv_sec = 1;
+      timeout.tv_usec = 0;
+
+      /* get file descriptors from the transfers */
+      curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
+
+      rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);
+
+      switch(rc) {
+      case -1:
+        /* select error */
+        break;
+      case 0:
+        printf("timeout!\n");
+      default:
+        /* timeout or readable/writable sockets */
+        printf("perform!\n");
+        while(CURLM_CALL_MULTI_PERFORM ==
+              curl_multi_perform(multi_handle, &still_running));
+        printf("running: %d!\n", still_running);
+        break;
+      }
+    }
+
+    curl_multi_cleanup(multi_handle);
+
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+
+    /* then cleanup the formpost chain */
+    curl_formfree(formpost);
+
+    /* free slist */
+    curl_slist_free_all (headerlist);
+  }
+  return 0;
+}
diff --git a/main/source/curl/docs/examples/multi-single.c b/main/source/curl/docs/examples/multi-single.c
new file mode 100644
index 00000000..0aff66ae
--- /dev/null
+++ b/main/source/curl/docs/examples/multi-single.c
@@ -0,0 +1,88 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id: multi-single.c,v 1.3 2003/01/09 11:42:07 bagder Exp $
+ *
+ * This is a very simple example using the multi interface.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+/* somewhat unix-specific */
+#include <sys/time.h>
+#include <unistd.h>
+
+/* curl stuff */
+#include <curl/curl.h>
+
+/*
+ * Simply download a HTTP file.
+ */
+int main(int argc, char **argv)
+{
+  CURL *http_handle;
+  CURLM *multi_handle;
+
+  int still_running; /* keep number of running handles */
+
+  http_handle = curl_easy_init();
+
+  /* set the options (I left out a few, you'll get the point anyway) */
+  curl_easy_setopt(http_handle, CURLOPT_URL, "http://www.haxx.se/");
+
+  /* init a multi stack */
+  multi_handle = curl_multi_init();
+
+  /* add the individual transfers */
+  curl_multi_add_handle(multi_handle, http_handle);
+
+  /* we start some action by calling perform right away */
+  while(CURLM_CALL_MULTI_PERFORM ==
+        curl_multi_perform(multi_handle, &still_running));
+
+  while(still_running) {
+    struct timeval timeout;
+    int rc; /* select() return code */
+
+    fd_set fdread;
+    fd_set fdwrite;
+    fd_set fdexcep;
+    int maxfd;
+
+    FD_ZERO(&fdread);
+    FD_ZERO(&fdwrite);
+    FD_ZERO(&fdexcep);
+
+    /* set a suitable timeout to play around with */
+    timeout.tv_sec = 1;
+    timeout.tv_usec = 0;
+
+    /* get file descriptors from the transfers */
+    curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
+
+    rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);
+
+    switch(rc) {
+    case -1:
+      /* select error */
+      break;
+    case 0:
+    default:
+      /* timeout or readable/writable sockets */
+      while(CURLM_CALL_MULTI_PERFORM ==
+            curl_multi_perform(multi_handle, &still_running));
+      break;
+    }
+  }
+
+  curl_multi_cleanup(multi_handle);
+
+  curl_easy_cleanup(http_handle);
+
+  return 0;
+}
diff --git a/main/source/curl/docs/examples/multithread.c b/main/source/curl/docs/examples/multithread.c
new file mode 100644
index 00000000..6c3e12fe
--- /dev/null
+++ b/main/source/curl/docs/examples/multithread.c
@@ -0,0 +1,70 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id: multithread.c,v 1.1 2001/05/04 09:35:43 bagder Exp $
+ */
+
+/* A multi-threaded example that uses pthreads extensively to fetch
+ * X remote files at once */
+
+#include <stdio.h>
+#include <pthread.h>
+#include <curl/curl.h>
+
+/* silly list of test-URLs */
+char *urls[]= {
+  "http://curl.haxx.se/",
+  "ftp://cool.haxx.se/",
+  "http://www.contactor.se/",
+  "www.haxx.se"
+};
+
+void *pull_one_url(void *url)
+{
+  CURL *curl;
+
+  curl = curl_easy_init();
+
+  curl_easy_setopt(curl, CURLOPT_URL, url);
+  curl_easy_perform(curl);
+
+  curl_easy_cleanup(curl);
+
+  return NULL;
+}
+
+
+/* 
+   int pthread_create(pthread_t *new_thread_ID,
+   const pthread_attr_t *attr,
+   void * (*start_func)(void *), void *arg);
+*/
+
+int main(int argc, char **argv)
+{
+  pthread_t tid[4];
+  int i;
+  int error;
+  for(i=0; i< 4; i++) {
+    error = pthread_create(&tid[i],
+                           NULL, /* default attributes please */
+                           pull_one_url,
+                           urls[i]);
+    if(0 != error)
+      fprintf(stderr, "Couldn't run thread number %d, errno %d\n", i, error);
+    else 
+      fprintf(stderr, "Thread %d, gets %s\n", i, urls[i]);
+  }
+
+  /* now wait for all threads to terminate */
+  for(i=0; i< 4; i++) {
+    error = pthread_join(tid[i], NULL);
+    fprintf(stderr, "Thread %d terminated\n", i);
+  }
+
+  return 0;
+}
diff --git a/main/source/curl/docs/examples/persistant.c b/main/source/curl/docs/examples/persistant.c
new file mode 100644
index 00000000..c476b606
--- /dev/null
+++ b/main/source/curl/docs/examples/persistant.c
@@ -0,0 +1,53 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id: persistant.c,v 1.1 2001/03/05 16:56:10 bagder Exp $
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+
+#include <curl/curl.h>
+
+/* to make this work under windows, use the win32-functions from the
+   docs/examples/win32socket.c file as well */
+
+/* This example REQUIRES libcurl 7.7 or later */
+#if (LIBCURL_VERSION_NUM < 0x070700)
+#error Too old libcurl version, upgrade or stay away.
+#endif
+
+int main(int argc, char **argv)
+{
+  CURL *curl;
+  CURLcode res;
+
+#ifdef MALLOCDEBUG
+  /* this sends all memory debug messages to a specified logfile */
+  curl_memdebug("memdump");
+#endif
+
+  curl = curl_easy_init();
+  if(curl) {
+    curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+    curl_easy_setopt(curl, CURLOPT_HEADER, 1);
+
+    /* get the first document */
+    curl_easy_setopt(curl, CURLOPT_URL, "http://curl.haxx.se/");
+    res = curl_easy_perform(curl);
+
+    /* get another document from the same server using the same
+       connection */
+    curl_easy_setopt(curl, CURLOPT_URL, "http://curl.haxx.se/docs/");
+    res = curl_easy_perform(curl);
+
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+  }
+
+  return 0;
+}
diff --git a/main/source/curl/docs/examples/post-callback.c b/main/source/curl/docs/examples/post-callback.c
new file mode 100644
index 00000000..7fab0e2b
--- /dev/null
+++ b/main/source/curl/docs/examples/post-callback.c
@@ -0,0 +1,89 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id: post-callback.c,v 1.1 2002/03/14 14:53:00 bagder Exp $
+ *
+ * An example source code that issues a HTTP POST and we provide the actual
+ * data through a read callback.
+ *
+ * Please be aware of the fact that the size of the posted data MUST be
+ * specified before the transfer is being made (with CURLOPT_POSTFIELDSIZE).
+ * This requirement will change when libcurl starts supporting chunked-encoded
+ * sends.
+ *
+ * This example requires libcurl 7.9.6 or later.
+ */
+#include <stdio.h>
+#include <string.h>
+#include <curl/curl.h>
+
+#if LIBCURL_VERSION_NUM < 0x070906
+#error this example source requires libcurl 7.9.6 or newer
+#endif
+
+char data[]="this is what we post to the silly web server";
+
+struct WriteThis {
+  char *readptr;
+  int sizeleft;
+};
+
+size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp)
+{
+  struct WriteThis *pooh = (struct WriteThis *)userp;
+
+  if(size*nmemb < 1)
+    return 0;
+
+  if(pooh->sizeleft) {
+    *(char *)ptr = pooh->readptr[0]; /* copy one single byte */
+    pooh->readptr++;                 /* advance pointer */
+    pooh->sizeleft--;                /* less data left */
+    return 1;                        /* we return 1 byte at a time! */
+  }
+
+  return -1;                         /* no more data left to deliver */
+}
+
+int main(void)
+{
+  CURL *curl;
+  CURLcode res;
+
+  struct WriteThis pooh;
+
+  pooh.readptr = data;
+  pooh.sizeleft = strlen(data);
+
+  curl = curl_easy_init();
+  if(curl) {
+    /* First set the URL that is about to receive our POST. */
+    curl_easy_setopt(curl, CURLOPT_URL,
+                     "http://receivingsite.com.pooh/index.cgi");
+    /* Now specify we want to POST data */
+    curl_easy_setopt(curl, CURLOPT_POST, TRUE);
+
+    /* Set the expected POST size */
+    curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, pooh.sizeleft);
+
+    /* we want to use our own read function */
+    curl_easy_setopt(curl, CURLOPT_READFUNCTION, read_callback);
+
+    /* pointer to pass to our read function */
+    curl_easy_setopt(curl, CURLOPT_INFILE, &pooh);
+
+    /* get verbose debug output please */
+    curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+
+    /* Perform the request, res will get the return code */
+    res = curl_easy_perform(curl);
+
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+  }
+  return 0;
+}
diff --git a/main/source/curl/docs/examples/postit2.c b/main/source/curl/docs/examples/postit2.c
new file mode 100644
index 00000000..8e7b9be4
--- /dev/null
+++ b/main/source/curl/docs/examples/postit2.c
@@ -0,0 +1,92 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id: postit2.c,v 1.1 2001/08/23 08:45:20 bagder Exp $
+ *
+ * Example code that uploads a file name 'foo' to a remote script that accepts
+ * "HTML form based" (as described in RFC1738) uploads using HTTP POST.
+ *
+ * The imaginary form we'll fill in looks like:
+ *
+ * <form method="post" enctype="multipart/form-data" action="examplepost.cgi">
+ * Enter file: <input type="file" name="sendfile" size="40">
+ * Enter file name: <input type="text" name="filename" size="30">
+ * <input type="submit" value="send" name="submit">
+ * </form>
+ *
+ * This exact source code has not been verified to work.
+ */
+
+/* to make this work under windows, use the win32-functions from the
+   win32socket.c file as well */
+
+#include <stdio.h>
+#include <string.h>
+
+#include <curl/curl.h>
+#include <curl/types.h>
+#include <curl/easy.h>
+
+#if LIBCURL_VERSION_NUM < 0x070900
+#error "curl_formadd() is not introduced until libcurl 7.9 and later"
+#endif
+
+int main(int argc, char *argv[])
+{
+  CURL *curl;
+  CURLcode res;
+
+  struct HttpPost *formpost=NULL;
+  struct HttpPost *lastptr=NULL;
+  struct curl_slist *headerlist=NULL;
+  char buf[] = "Expect:";
+
+  /* Fill in the file upload field */
+  curl_formadd(&formpost,
+               &lastptr,
+               CURLFORM_COPYNAME, "sendfile",
+               CURLFORM_FILE, "postit2.c",
+               CURLFORM_END);
+
+  /* Fill in the filename field */
+  curl_formadd(&formpost,
+               &lastptr,
+               CURLFORM_COPYNAME, "filename",
+               CURLFORM_COPYCONTENTS, "postit2.c",
+               CURLFORM_END);
+  
+
+  /* Fill in the submit field too, even if this is rarely needed */
+  curl_formadd(&formpost,
+               &lastptr,
+               CURLFORM_COPYNAME, "submit",
+               CURLFORM_COPYCONTENTS, "send",
+               CURLFORM_END);
+
+  curl = curl_easy_init();
+  /* initalize custom header list (stating that Expect: 100-continue is not
+     wanted */
+  headerlist = curl_slist_append(headerlist, buf);
+  if(curl) {
+    /* what URL that receives this POST */
+    curl_easy_setopt(curl, CURLOPT_URL, "http://curl.haxx.se/examplepost.cgi");
+    if ( (argc == 2) && (!strcmp(argv[1], "noexpectheader")) )
+      /* only disable 100-continue header if explicitly requested */
+      curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headerlist);
+    curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
+    res = curl_easy_perform(curl);
+
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+
+    /* then cleanup the formpost chain */
+    curl_formfree(formpost);
+    /* free slist */
+    curl_slist_free_all (headerlist);
+  }
+  return 0;
+}
diff --git a/main/source/curl/docs/examples/sepheaders.c b/main/source/curl/docs/examples/sepheaders.c
new file mode 100644
index 00000000..a1791603
--- /dev/null
+++ b/main/source/curl/docs/examples/sepheaders.c
@@ -0,0 +1,80 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id: sepheaders.c,v 1.5 2003/03/17 12:38:08 bagder Exp $
+ */
+
+/* to make this work under windows, use the win32-functions from the
+   win32socket.c file as well */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <curl/curl.h>
+#include <curl/types.h>
+#include <curl/easy.h>
+
+size_t write_data(void *ptr, size_t size, size_t nmemb, void *stream)
+{
+  int written = fwrite(ptr, size, nmemb, (FILE *)stream);
+  return written;
+}
+
+int main(int argc, char **argv)
+{
+  CURL *curl_handle;
+  char *headerfilename = "head.out";
+  FILE *headerfile;
+  char *bodyfilename = "body.out";
+  FILE *bodyfile;
+
+  /* init the curl session */
+  curl_handle = curl_easy_init();
+
+  /* set URL to get */
+  curl_easy_setopt(curl_handle, CURLOPT_URL, "http://curl.haxx.se");
+
+  /* no progress meter please */
+  curl_easy_setopt(curl_handle, CURLOPT_NOPROGRESS, 1);
+
+  /* shut up completely */
+  curl_easy_setopt(curl_handle, CURLOPT_MUTE, 1);
+
+  /* send all data to this function  */
+  curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, write_data);
+
+  /* open the files */
+  headerfile = fopen(headerfilename,"w");
+  if (headerfile == NULL) {
+    curl_easy_cleanup(curl_handle);
+    return -1;
+  }
+  bodyfile = fopen(bodyfilename,"w");
+  if (bodyfile == NULL) {
+    curl_easy_cleanup(curl_handle);
+    return -1;
+  }
+
+  /* we want the headers to this file handle */
+  curl_easy_setopt(curl_handle,   CURLOPT_WRITEHEADER ,headerfile);
+
+  /*
+   * Notice here that if you want the actual data sent anywhere else but
+   * stdout, you should consider using the CURLOPT_WRITEDATA option.  */
+
+  /* get it! */
+  curl_easy_perform(curl_handle);
+
+  /* close the header file */
+  fclose(headerfile);
+
+  /* cleanup curl stuff */
+  curl_easy_cleanup(curl_handle);
+
+  return 0;
+}
diff --git a/main/source/curl/docs/examples/simple.c b/main/source/curl/docs/examples/simple.c
new file mode 100644
index 00000000..4f718389
--- /dev/null
+++ b/main/source/curl/docs/examples/simple.c
@@ -0,0 +1,28 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id: simple.c,v 1.5 2002/01/09 13:23:01 bagder Exp $
+ */
+
+#include <stdio.h>
+#include <curl/curl.h>
+
+int main(void)
+{
+  CURL *curl;
+  CURLcode res;
+
+  curl = curl_easy_init();
+  if(curl) {
+    curl_easy_setopt(curl, CURLOPT_URL, "curl.haxx.se");
+    res = curl_easy_perform(curl);
+
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+  }
+  return 0;
+}
diff --git a/main/source/curl/docs/examples/simplepost.c b/main/source/curl/docs/examples/simplepost.c
new file mode 100644
index 00000000..124906f8
--- /dev/null
+++ b/main/source/curl/docs/examples/simplepost.c
@@ -0,0 +1,36 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id: simplepost.c,v 1.1 2002/06/19 12:30:12 bagder Exp $
+ */
+
+#include <stdio.h>
+#include <curl/curl.h>
+
+int main(void)
+{
+  CURL *curl;
+  CURLcode res;
+
+  char *postthis="moo mooo moo moo";
+
+  curl = curl_easy_init();
+  if(curl) {
+    curl_easy_setopt(curl, CURLOPT_URL, "http://posthere.com");
+    curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postthis);
+
+    /* if we don't provide POSTFIELDSIZE, libcurl will strlen() by
+       itself */
+    curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, strlen(postthis));
+
+    res = curl_easy_perform(curl);
+
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+  }
+  return 0;
+}
diff --git a/main/source/curl/docs/examples/simplessl.c b/main/source/curl/docs/examples/simplessl.c
new file mode 100644
index 00000000..8c061c5e
--- /dev/null
+++ b/main/source/curl/docs/examples/simplessl.c
@@ -0,0 +1,118 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id: simplessl.c,v 1.4 2002/11/22 07:39:15 bagder Exp $
+ */
+
+#include <stdio.h>
+
+#include <curl/curl.h>
+#include <curl/types.h>
+#include <curl/easy.h>
+
+
+/* some requirements for this to work:
+   1.   set pCertFile to the file with the client certificate
+   2.   if the key is passphrase protected, set pPassphrase to the
+        passphrase you use
+   3.   if you are using a crypto engine:
+   3.1. set a #define USE_ENGINE
+   3.2. set pEngine to the name of the crypto engine you use
+   3.3. set pKeyName to the key identifier you want to use
+   4.   if you don't use a crypto engine:
+   4.1. set pKeyName to the file name of your client key
+   4.2. if the format of the key file is DER, set pKeyType to "DER"
+
+   !! verify of the server certificate is not implemented here !!
+
+   **** This example only works with libcurl 7.9.3 and later! ****
+
+*/
+
+int main(int argc, char **argv)
+{
+  CURL *curl;
+  CURLcode res;
+  FILE *headerfile;
+
+  const char *pCertFile = "testcert.pem";
+  const char *pCACertFile="cacert.pem"
+
+  const char *pKeyName;
+  const char *pKeyType;
+
+  const char *pEngine;
+
+#if USE_ENGINE
+  pKeyName  = "rsa_test";
+  pKeyType  = "ENG";
+  pEngine   = "chil";            /* for nChiper HSM... */
+#else
+  pKeyName  = "testkey.pem";
+  pKeyType  = "PEM";
+  pEngine   = NULL;
+#endif
+
+  const char *pPassphrase = NULL;
+
+  headerfile = fopen("dumpit", "w");
+
+  curl_global_init(CURL_GLOBAL_DEFAULT);
+
+  curl = curl_easy_init();
+  if(curl) {
+    /* what call to write: */
+    curl_easy_setopt(curl, CURLOPT_URL, "HTTPS://your.favourite.ssl.site");
+    curl_easy_setopt(curl, CURLOPT_WRITEHEADER, headerfile);
+
+    while(1)                    /* do some ugly short cut... */
+    {
+       if (pEngine)             /* use crypto engine */
+       {
+          if (curl_easy_setopt(curl, CURLOPT_SSLENGINE,pEngine) != CURLE_OK)
+          {                     /* load the crypto engine */
+             fprintf(stderr,"can't set crypto engine\n");
+             break;
+          }
+          if (curl_easy_setopt(curl, CURLOPT_SSLENGINE_DEFAULT,1) != CURLE_OK)
+          {                     /* set the crypto engine as default */
+                                /* only needed for the first time you load
+                                   a engine in a curl object... */
+             fprintf(stderr,"can't set crypto engine as default\n");
+             break;
+          }
+       }
+                                /* cert is stored PEM coded in file... */
+                                /* since PEM is default, we needn't set it for PEM */
+       curl_easy_setopt(curl,CURLOPT_SSLCERTTYPE,"PEM");
+                                /* set the cert for client authentication */
+       curl_easy_setopt(curl,CURLOPT_SSLCERT,pCertFile);
+                                /* sorry, for engine we must set the passphrase
+                                   (if the key has one...) */
+       if (pPassphrase)
+          curl_easy_setopt(curl,CURLOPT_SSLKEYPASSWD,pPassphrase);
+                                /* if we use a key stored in a crypto engine,
+                                   we must set the key type to "ENG" */
+       curl_easy_setopt(curl,CURLOPT_SSLKEYTYPE,pKeyType);
+                                /* set the private key (file or ID in engine) */
+       curl_easy_setopt(curl,CURLOPT_SSLKEY,pKeyName);
+                                /* set the file with the certs vaildating the server */
+       curl_easy_setopt(curl,CURLOPT_CAINFO,pCACertFile);
+                                /* disconnect if we can't validate server's cert */
+       curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,1);
+       
+       res = curl_easy_perform(curl);
+       break;                   /* we are done... */
+    }
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+  }
+
+  curl_global_cleanup();
+
+  return 0;
+}
diff --git a/main/source/curl/docs/index.html b/main/source/curl/docs/index.html
new file mode 100644
index 00000000..e7705c05
--- /dev/null
+++ b/main/source/curl/docs/index.html
@@ -0,0 +1,21 @@
+<HTML>
+<HEAD>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>Index to Curl documentation</TITLE>
+</HEAD>
+
+<BODY>
+<H1 ALIGN="CENTER">Index to Curl documentation</H1>
+
+<H2>Programs</H2>
+<a href="curl-config.html">curl-config</A>
+<br><a href="curl.html">curl</A>
+
+<h2>Tutorial</h2>
+<a href="TheArtOfHttpScripting">The Art Of Scripting HTTP Requests Using Curl</a> (plain text)
+
+<h2>libcurl</h2>
+See the <a href="libcurl/index.html">libcurl section</a>
+
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl-the-guide b/main/source/curl/docs/libcurl-the-guide
new file mode 100644
index 00000000..fbddb09a
--- /dev/null
+++ b/main/source/curl/docs/libcurl-the-guide
@@ -0,0 +1,1102 @@
+$Id: libcurl-the-guide,v 1.20 2002/12/19 15:22:36 bagder Exp $
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+PROGRAMMING WITH LIBCURL
+
+About this Document
+
+ This document attempts to describe the general principles and some basic
+ approaches to consider when programming with libcurl. The text will focus
+ mainly on the C interface but might apply fairly well on other interfaces as
+ well as they usually follow the C one pretty closely.
+
+ This document will refer to 'the user' as the person writing the source code
+ that uses libcurl. That would probably be you or someone in your position.
+ What will be generally refered to as 'the program' will be the collected
+ source code that you write that is using libcurl for transfers. The program
+ is outside libcurl and libcurl is outside of the program.
+
+ To get the more details on all options and functions described herein, please
+ refer to their respective man pages.
+
+Building
+
+ There are many different ways to build C programs. This chapter will assume a
+ unix-style build process. If you use a different build system, you can still
+ read this to get general information that may apply to your environment as
+ well.
+
+  Compiling the Program
+
+    Your compiler needs to know where the libcurl headers are
+    located. Therefore you must set your compiler's include path to point to
+    the directory where you installed them. The 'curl-config'[3] tool can be
+    used to get this information:
+
+        $ curl-config --cflags
+
+  Linking the Program with libcurl
+
+    When having compiled the program, you need to link your object files to
+    create a single executable. For that to succeed, you need to link with
+    libcurl and possibly also with other libraries that libcurl itself depends
+    on. Like OpenSSL librararies, but even some standard OS libraries may be
+    needed on the command line. To figure out which flags to use, once again
+    the 'curl-config' tool comes to the rescue:
+
+        $ curl-config --libs
+
+  SSL or Not
+
+    libcurl can be built and customized in many ways. One of the things that
+    varies from different libraries and builds is the support for SSL-based
+    transfers, like HTTPS and FTPS. If OpenSSL was detected properly at
+    build-time, libcurl will be built with SSL support. To figure out if an
+    installed libcurl has been built with SSL support enabled, use
+    'curl-config' like this:
+
+        $ curl-config --feature
+
+    And if SSL is supported, the keyword 'SSL' will be written to stdout,
+    possibly together with a few other features that can be on and off on
+    different libcurls.
+
+
+Portable Code in a Portable World
+
+ The people behind libcurl have put a considerable effort to make libcurl work
+ on a large amount of different operating systems and environments.
+
+ You program libcurl the same way on all platforms that libcurl runs on. There
+ are only very few minor considerations that differs. If you just make sure to
+ write your code portable enough, you may very well create yourself a very
+ portable program. libcurl shouldn't stop you from that.
+
+
+Global Preparation
+
+ The program must initialize some of the libcurl functionality globally. That
+ means it should be done exactly once, no matter how many times you intend to
+ use the library. Once for your program's entire life time. This is done using
+
+    curl_global_init()
+
+ and it takes one parameter which is a bit pattern that tells libcurl what to
+ intialize. Using CURL_GLOBAL_ALL will make it initialize all known internal
+ sub modules, and might be a good default option. The current two bits that
+ are specified are:
+
+  CURL_GLOBAL_WIN32 which only does anything on Windows machines. When used on
+  a Windows machine, it'll make libcurl intialize the win32 socket
+  stuff. Without having that initialized properly, your program cannot use
+  sockets properly. You should only do this once for each application, so if
+  your program already does this or of another library in use does it, you
+  should not tell libcurl to do this as well.
+
+  CURL_GLOBAL_SSL which only does anything on libcurls compiled and built
+  SSL-enabled. On these systems, this will make libcurl init OpenSSL properly
+  for this application. This is only needed to do once for each application so
+  if your program or another library already does this, this bit should not be
+  needed.
+
+ libcurl has a default protection mechanism that detects if curl_global_init()
+ hasn't been called by the time curl_easy_perform() is called and if that is
+ the case, libcurl runs the function itself with a guessed bit pattern. Please
+ note that depending solely on this is not considered nice nor very good.
+
+ When the program no longer uses libcurl, it should call
+ curl_global_cleanup(), which is the opposite of the init call. It will then
+ do the reversed operations to cleanup the resources the curl_global_init()
+ call initialized.
+
+ Repeated calls to curl_global_init() and curl_global_cleanup() should be
+ avoided. They should only be called once each.
+
+
+Handle the Easy libcurl
+
+ libcurl version 7 is oriented around the so called easy interface. All
+ operations in the easy interface are prefixed with 'curl_easy'.
+
+ Future libcurls will also offer the multi interface. More about that
+ interface, what it is targeted for and how to use it is still only debated on
+ the libcurl mailing list and developer web pages. Join up to discuss and
+ figure out!
+
+ To use the easy interface, you must first create yourself an easy handle. You
+ need one handle for each easy session you want to perform. Basicly, you
+ should use one handle for every thread you plan to use for transferring. You
+ must never share the same handle in multiple threads.
+
+ Get an easy handle with
+
+    easyhandle = curl_easy_init();
+
+ It returns an easy handle. Using that you proceed to the next step: setting
+ up your preferred actions. A handle is just a logic entity for the upcoming
+ transfer or series of transfers.
+
+ You set properties and options for this handle using curl_easy_setopt(). They
+ control how the subsequent transfer or transfers will be made. Options remain
+ set in the handle until set again to something different. Alas, multiple
+ requests using the same handle will use the same options.
+
+ Many of the informationals you set in libcurl are "strings", pointers to data
+ terminated with a zero byte. Keep in mind that when you set strings with
+ curl_easy_setopt(), libcurl will not copy the data. It will merely point to
+ the data. You MUST make sure that the data remains available for libcurl to
+ use until finished or until you use the same option again to point to
+ something else.
+
+ One of the most basic properties to set in the handle is the URL. You set
+ your preferred URL to transfer with CURLOPT_URL in a manner similar to:
+
+    curl_easy_setopt(easyhandle, CURLOPT_URL, "http://curl.haxx.se/");
+
+ Let's assume for a while that you want to receive data as the URL indentifies
+ a remote resource you want to get here. Since you write a sort of application
+ that needs this transfer, I assume that you would like to get the data passed
+ to you directly instead of simply getting it passed to stdout. So, you write
+ your own function that matches this prototype:
+
+    size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp);
+
+ You tell libcurl to pass all data to this function by issuing a function
+ similar to this:
+
+    curl_easy_setopt(easyhandle, CURLOPT_WRITEFUNCTION, write_data);
+
+ You can control what data your function get in the forth argument by setting
+ another property:
+
+    curl_easy_setopt(easyhandle, CURLOPT_FILE, &internal_struct);
+
+ Using that property, you can easily pass local data between your application
+ and the function that gets invoked by libcurl. libcurl itself won't touch the
+ data you pass with CURLOPT_FILE.
+
+ libcurl offers its own default internal callback that'll take care of the
+ data if you don't set the callback with CURLOPT_WRITEFUNCTION. It will then
+ simply output the received data to stdout. You can have the default callback
+ write the data to a different file handle by passing a 'FILE *' to a file
+ opened for writing with the CURLOPT_FILE option.
+
+ Now, we need to take a step back and have a deep breath. Here's one of those
+ rare platform-dependent nitpicks. Did you spot it? On some platforms[2],
+ libcurl won't be able to operate on files opened by the program. Thus, if you
+ use the default callback and pass in a an open file with CURLOPT_FILE, it
+ will crash. You should therefore avoid this to make your program run fine
+ virtually everywhere.
+
+ There are of course many more options you can set, and we'll get back to a
+ few of them later. Let's instead continue to the actual transfer:
+
+    success = curl_easy_perform(easyhandle);
+
+ The curl_easy_perform() will connect to the remote site, do the necessary
+ commands and receive the transfer. Whenever it receives data, it calls the
+ callback function we previously set. The function may get one byte at a time,
+ or it may get many kilobytes at once. libcurl delivers as much as possible as
+ often as possible. Your callback function should return the number of bytes
+ it "took care of". If that is not the exact same amount of bytes that was
+ passed to it, libcurl will abort the operation and return with an error code.
+
+ When the transfer is complete, the function returns a return code that
+ informs you if it succeeded in its mission or not. If a return code isn't
+ enough for you, you can use the CURLOPT_ERRORBUFFER to point libcurl to a
+ buffer of yours where it'll store a human readable error message as well.
+
+ If you then want to transfer another file, the handle is ready to be used
+ again. Mind you, it is even preferred that you re-use an existing handle if
+ you intend to make another transfer. libcurl will then attempt to re-use the
+ previous
+
+
+Multi-threading issues
+
+ libcurl is completely thread safe, except for two issues: signals and alarm
+ handlers. Signals are needed for a SIGPIPE handler, and the alarm() syscall
+ is used to catch timeouts (mostly during DNS lookup).
+
+ So when using multiple threads you should first ignore SIGPIPE in your main
+ thread and set the CURLOPT_NOSIGNAL option to TRUE for all handles.
+
+ Everything will work fine except that timeouts are not honored during the DNS
+ lookup - this would require some sort of asynchronous DNS lookup (which is
+ planned for a future libcurl version).
+
+ For SIGPIPE info see the UNIX Socket FAQ at
+ http://www.unixguide.net/network/socketfaq/2.22.shtml
+
+ Also, note that CURLOPT_DNS_USE_GLOBAL_CACHE is not thread-safe.
+
+When It Doesn't Work
+
+ There will always be times when the transfer fails for some reason. You might
+ have set the wrong libcurl option or misunderstood what the libcurl option
+ actually does, or the remote server might return non-standard replies that
+ confuse the library which then confuses your program.
+
+ There's one golden rule when these things occur: set the CURLOPT_VERBOSE
+ option to TRUE. It'll cause the library to spew out the entire protocol
+ details it sends, some internal info and some received protcol data as well
+ (especially when using FTP). If you're using HTTP, adding the headers in the
+ received output to study is also a clever way to get a better understanding
+ wht the server behaves the way it does. Include headers in the normal body
+ output with CURLOPT_HEADER set TRUE.
+
+ Of course there are bugs left. We need to get to know about them to be able
+ to fix them, so we're quite dependent on your bug reports! When you do report
+ suspected bugs in libcurl, please include as much details you possibly can: a
+ protocol dump that CURLOPT_VERBOSE produces, library version, as much as
+ possible of your code that uses libcurl, operating system name and version,
+ compiler name and version etc.
+
+ If CURLOPT_VERBOSE is not enough, you increase the level of debug data your
+ application receive by using the CURLOPT_DEBUGFUNCTION.
+
+ Getting some in-depth knowledge about the protocols involved is never wrong,
+ and if you're trying to do funny things, you might very well understand
+ libcurl and how to use it better if you study the appropriate RFC documents
+ at least briefly.
+
+
+Upload Data to a Remote Site
+
+ libcurl tries to keep a protocol independent approach to most transfers, thus
+ uploading to a remote FTP site is very similar to uploading data to a HTTP
+ server with a PUT request.
+
+ Of course, first you either create an easy handle or you re-use one existing
+ one. Then you set the URL to operate on just like before. This is the remote
+ URL, that we now will upload.
+
+ Since we write an application, we most likely want libcurl to get the upload
+ data by asking us for it. To make it do that, we set the read callback and
+ the custom pointer libcurl will pass to our read callback. The read callback
+ should have a prototype similar to:
+
+    size_t function(char *bufptr, size_t size, size_t nitems, void *userp);
+
+ Where bufptr is the pointer to a buffer we fill in with data to upload and
+ size*nitems is the size of the buffer and therefore also the maximum amount
+ of data we can return to libcurl in this call. The 'userp' pointer is the
+ custom pointer we set to point to a struct of ours to pass private data
+ between the application and the callback.
+
+    curl_easy_setopt(easyhandle, CURLOPT_READFUNCTION, read_function);
+
+    curl_easy_setopt(easyhandle, CURLOPT_INFILE, &filedata);
+
+ Tell libcurl that we want to upload:
+
+    curl_easy_setopt(easyhandle, CURLOPT_UPLOAD, TRUE);
+
+ A few protocols won't behave properly when uploads are done without any prior
+ knowledge of the expected file size. So, set the upload file size using the
+ CURLOPT_INFILESIZE for all known file sizes like this[1]:
+
+    curl_easy_setopt(easyhandle, CURLOPT_INFILESIZE, file_size);
+
+ When you call curl_easy_perform() this time, it'll perform all the necessary
+ operations and when it has invoked the upload it'll call your supplied
+ callback to get the data to upload. The program should return as much data as
+ possible in every invoke, as that is likely to make the upload perform as
+ fast as possible. The callback should return the number of bytes it wrote in
+ the buffer. Returning 0 will signal the end of the upload.
+
+
+Passwords
+
+ Many protocols use or even require that user name and password are provided
+ to be able to download or upload the data of your choice. libcurl offers
+ several ways to specify them.
+
+ Most protocols support that you specify the name and password in the URL
+ itself. libcurl will detect this and use them accordingly. This is written
+ like this:
+
+        protocol://user:password@example.com/path/
+
+ If you need any odd letters in your user name or password, you should enter
+ them URL encoded, as %XX where XX is a two-digit hexadecimal number.
+
+ libcurl also provides options to set various passwords. The user name and
+ password as shown embedded in the URL can instead get set with the
+ CURLOPT_USERPWD option. The argument passed to libcurl should be a char * to
+ a string in the format "user:password:". In a manner like this:
+
+        curl_easy_setopt(easyhandle, CURLOPT_USERPWD, "myname:thesecret");
+
+ Another case where name and password might be needed at times, is for those
+ users who need to athenticate themselves to a proxy they use. libcurl offers
+ another option for this, the CURLOPT_PROXYUSERPWD. It is used quite similar
+ to the CURLOPT_USERPWD option like this:
+
+        curl_easy_setopt(easyhandle, CURLOPT_PROXYUSERPWD, "myname:thesecret");
+ 
+ There's a long time unix "standard" way of storing ftp user names and
+ passwords, namely in the $HOME/.netrc file. The file should be made private
+ so that only the user may read it (see also the "Security Considerations"
+ chapter), as it might contain the password in plain text. libcurl has the
+ ability to use this file to figure out what set of user name and password to
+ use for a particular host. As an extension to the normal functionality,
+ libcurl also supports this file for non-FTP protocols such as HTTP. To make
+ curl use this file, use the CURLOPT_NETRC option:
+
+    curl_easy_setopt(easyhandle, CURLOPT_NETRC, TRUE);
+
+ And a very basic example of how such a .netrc file may look like:
+
+    machine myhost.mydomain.com
+    login userlogin
+    password secretword
+
+ All these examples have been cases where the password has been optional, or
+ at least you could leave it out and have libcurl attempt to do its job
+ without it. There are times when the password isn't optional, like when
+ you're using an SSL private key for secure transfers.
+
+ You can in this situation either pass a password to libcurl to use to unlock
+ the private key, or you can let libcurl prompt the user for it. If you prefer
+ to ask the user, then you can provide your own callback function that will be
+ called when libcurl wants the password. That way, you can control how the
+ question will appear to the user.
+
+ To pass the known private key password to libcurl:
+
+    curl_easy_setopt(easyhandle, CURLOPT_SSLKEYPASSWD, "keypassword");
+
+ To make a password callback:
+
+    int enter_passwd(void *ourp, const char *prompt, char *buffer, int len);
+    curl_easy_setopt(easyhandle, CURLOPT_PASSWDFUNCTION, enter_passwd);
+
+
+HTTP POSTing
+
+ We get many questions regarding how to issue HTTP POSTs with libcurl the
+ proper way. This chapter will thus include examples using both different
+ versions of HTTP POST that libcurl supports.
+
+ The first version is the simple POST, the most common version, that most HTML
+ pages using the <form> tag uses. We provide a pointer to the data and tell
+ libcurl to post it all to the remote site:
+
+    char *data="name=daniel&project=curl";
+    curl_easy_setopt(easyhandle, CURLOPT_POSTFIELDS, data);
+    curl_easy_setopt(easyhandle, CURLOPT_URL, "http://posthere.com/");
+
+    curl_easy_perform(easyhandle); /* post away! */
+
+ Simple enough, huh? Since you set the POST options with the
+ CURLOPT_POSTFIELDS, this automaticly switches the handle to use POST in the
+ upcoming request.
+
+ Ok, so what if you want to post binary data that also requires you to set the
+ Content-Type: header of the post? Well, binary posts prevents libcurl from
+ being able to do strlen() on the data to figure out the size, so therefore we
+ must tell libcurl the size of the post data. Setting headers in libcurl
+ requests are done in a generic way, by building a list of our own headers and
+ then passing that list to libcurl.
+
+    struct curl_slist *headers=NULL;
+    headers = curl_slist_append(headers, "Content-Type: text/xml");
+
+    /* post binary data */
+    curl_easy_setopt(easyhandle, CURLOPT_POSTFIELDS, binaryptr);
+
+    /* set the size of the postfields data */
+    curl_easy_setopt(easyhandle, CURLOPT_POSTFIELDSIZE, 23);
+
+    /* pass our list of custom made headers */
+    curl_easy_setopt(easyhandle, CURLOPT_HTTPHEADER, headers);
+
+    curl_easy_perform(easyhandle); /* post away! */
+
+    curl_slist_free_all(headers); /* free the header list */
+
+ While the simple examples above cover the majority of all cases where HTTP
+ POST operations are required, they don't do multipart formposts. Multipart
+ formposts were introduced as a better way to post (possibly large) binary
+ data and was first documented in the RFC1867. They're called multipart
+ because they're built by a chain of parts, each being a single unit. Each
+ part has its own name and contents. You can in fact create and post a
+ multipart formpost with the regular libcurl POST support described above, but
+ that would require that you build a formpost yourself and provide to
+ libcurl. To make that easier, libcurl provides curl_formadd(). Using this
+ function, you add parts to the form. When you're done adding parts, you post
+ the whole form.
+
+ The following example sets two simple text parts with plain textual contents,
+ and then a file with binary contents and upload the whole thing.
+
+    struct curl_httppost *post=NULL;
+    struct curl_httppost *last=NULL;
+    curl_formadd(&post, &last,
+                 CURLFORM_COPYNAME, "name",
+                 CURLFORM_COPYCONTENTS, "daniel", CURLFORM_END);
+    curl_formadd(&post, &last,
+                 CURLFORM_COPYNAME, "project",
+                 CURLFORM_COPYCONTENTS, "curl", CURLFORM_END);
+    curl_formadd(&post, &last,
+                 CURLFORM_COPYNAME, "logotype-image",
+                 CURLFORM_FILECONTENT, "curl.png", CURLFORM_END);
+
+    /* Set the form info */
+    curl_easy_setopt(easyhandle, CURLOPT_HTTPPOST, post);
+
+    curl_easy_perform(easyhandle); /* post away! */
+
+    /* free the post data again */
+    curl_formfree(post);
+
+ Multipart formposts are chains of parts using MIME-style separators and
+ headers. It means that each one of these separate parts get a few headers set
+ that describe the individual content-type, size etc. To enable your
+ application to handicraft this formpost even more, libcurl allows you to
+ supply your own set of custom headers to such an individual form part. You
+ can of course supply headers to as many parts you like, but this little
+ example will show how you set headers to one specific part when you add that
+ to the post handle:
+
+    struct curl_slist *headers=NULL;
+    headers = curl_slist_append(headers, "Content-Type: text/xml");
+
+    curl_formadd(&post, &last,
+                 CURLFORM_COPYNAME, "logotype-image",
+                 CURLFORM_FILECONTENT, "curl.xml",
+                 CURLFORM_CONTENTHEADER, headers,
+                 CURLFORM_END);
+
+    curl_easy_perform(easyhandle); /* post away! */
+
+    curl_formfree(post); /* free post */
+    curl_slist_free_all(post); /* free custom header list */
+
+ Since all options on an easyhandle are "sticky", they remain the same until
+ changed even if you do call curl_easy_perform(), you may need to tell curl to
+ go back to a plain GET request if you intend to do such a one as your next
+ request. You force an easyhandle to back to GET by using the CURLOPT_HTTPGET
+ option:
+
+    curl_easy_setopt(easyhandle, CURLOPT_HTTPGET, TRUE);
+
+ Just setting CURLOPT_POSTFIELDS to "" or NULL will *not* stop libcurl from
+ doing a POST. It will just make it POST without any data to send!
+
+
+Showing Progress
+
+ For historical and traditional reasons, libcurl has a built-in progress meter
+ that can be switched on and then makes it presents a progress meter in your
+ terminal.
+
+ Switch on the progress meter by, oddly enough, set CURLOPT_NOPROGRESS to
+ FALSE. This option is set to TRUE by default.
+
+ For most applications however, the built-in progress meter is useless and
+ what instead is interesting is the ability to specify a progress
+ callback. The function pointer you pass to libcurl will then be called on
+ irregular intervals with information about the current transfer.
+
+ Set the progress callback by using CURLOPT_PROGRESSFUNCTION. And pass a
+ pointer to a function that matches this prototype:
+
+        int progress_callback(void *clientp,
+                              double dltotal,
+                              double dlnow,
+                              double ultotal,
+                              double ulnow);
+
+ If any of the input arguments is unknown, a 0 will be passed. The first
+ argument, the 'clientp' is the pointer you pass to libcurl with
+ CURLOPT_PROGRESSDATA. libcurl won't touch it.
+
+
+libcurl with C++
+
+ There's basicly only one thing to keep in mind when using C++ instead of C
+ when interfacing libcurl:
+
+    "The Callbacks Must Be Plain C"
+
+ So if you want a write callback set in libcurl, you should put it within
+ 'extern'. Similar to this:
+
+     extern "C" {
+       size_t write_data(void *ptr, size_t size, size_t nmemb,
+                         void *ourpointer)
+       {
+         /* do what you want with the data */
+       }
+    }
+
+ This will of course effectively turn the callback code into C. There won't be
+ any "this" pointer available etc.
+
+
+Proxies
+
+ What "proxy" means according to Merriam-Webster: "a person authorized to act
+ for another" but also "the agency, function, or office of a deputy who acts
+ as a substitute for another".
+
+ Proxies are exceedingly common these days. Companies often only offer
+ internet access to employees through their HTTP proxies. Network clients or
+ user-agents ask the proxy for docuements, the proxy does the actual request
+ and then it returns them.
+
+ libcurl has full support for HTTP proxies, so when a given URL is wanted,
+ libcurl will ask the proxy for it instead of trying to connect to the actual
+ host identified in the URL.
+
+ The fact that the proxy is a HTTP proxy puts certain restrictions on what can
+ actually happen. A requested URL that might not be a HTTP URL will be still
+ be passed to the HTTP proxy to deliver back to libcurl. This happens
+ transparantly, and an application may not need to know. I say "may", because
+ at times it is very important to understand that all operations over a HTTP
+ proxy is using the HTTP protocol. For example, you can't invoke your own
+ custom FTP commands or even proper FTP directory listings.
+
+  Proxy Options
+
+    To tell libcurl to use a proxy at a given port number:
+
+       curl_easy_setopt(easyhandle, CURLOPT_PROXY, "proxy-host.com:8080");
+
+    Some proxies require user authentication before allowing a request, and
+    you pass that information similar to this:
+
+       curl_easy_setopt(easyhandle, CURLOPT_PROXYUSERPWD, "user:password");
+
+    If you want to, you can specify the host name only in the CURLOPT_PROXY
+    option, and set the port number separately with CURLOPT_PROXYPORT.
+
+  Environment Variables
+
+    libcurl automaticly checks and uses a set of environment variables to know
+    what proxies to use for certain protocols. The names of the variables are
+    following an ancient de facto standard and are built up as
+    "[protocol]_proxy" (note the lower casing). Which makes the variable
+    'http_proxy' checked for a name of a proxy to use when the input URL is
+    HTTP. Following the same rule, the variable named 'ftp_proxy' is checked
+    for FTP URLs. Again, the proxies are always HTTP proxies, the different
+    names of the variables simply allows different HTTP proxies to be used.
+
+    The proxy environment variable contents should be in the format
+    "[protocol://]machine[:port]". Where the protocol:// part is simply
+    ignored if present (so http://proxy and bluerk://proxy will do the same)
+    and the optional port number specifies on which port the proxy operates on
+    the host. If not specified, the internal default port number will be used
+    and that is most likely *not* the one you would like it to be.
+
+    There are two special environment variables. 'all_proxy' is what sets
+    proxy for any URL in case the protocol specific variable wasn't set, and
+    'no_proxy' defines a list of hosts that should not use a proxy even though
+    a variable may say so. If 'no_proxy' is a plain asterisk ("*") it matches
+    all hosts.
+
+  SSL and Proxies
+
+    SSL is for secure point-to-point connections. This involves strong
+    encryption and similar things, which effectivly makes it impossible for a
+    proxy to operate as a "man in between" which the proxy's task is, as
+    previously discussed. Instead, the only way to have SSL work over a HTTP
+    proxy is to ask the proxy to tunnel trough everything without being able
+    to check or fiddle with the traffic.
+
+    Opening an SSL connection over a HTTP proxy is therefor a matter of asking
+    the proxy for a straight connection to the target host on a specified
+    port. This is made with the HTTP request CONNECT. ("please mr proxy,
+    connect me to that remote host").
+
+    Because of the nature of this operation, where the proxy has no idea what
+    kind of data that is passed in and out through this tunnel, this breaks
+    some of the very few advantages that come from using a proxy, such as
+    caching.  Many organizations prevent this kind of tunneling to other
+    destination port numbers than 443 (which is the default HTTPS port
+    number).
+
+  Tunneling Through Proxy
+
+    As explained above, tunneling is required for SSL to work and often even
+    restricted to the operation intended for SSL; HTTPS.
+
+    This is however not the only time proxy-tunneling might offer benefits to
+    you or your application.
+
+    As tunneling opens a direct connection from your application to the remote
+    machine, it suddenly also re-introduces the ability to do non-HTTP
+    operations over a HTTP proxy. You can in fact use things such as FTP
+    upload or FTP custom commands this way.
+
+    Again, this is often prevented by the adminstrators of proxies and is
+    rarely allowed.
+
+    Tell libcurl to use proxy tunneling like this:
+
+       curl_easy_setopt(easyhandle, CURLOPT_HTTPPROXYTUNNEL, TRUE);
+
+    In fact, there might even be times when you want to do plain HTTP
+    operations using a tunnel like this, as it then enables you to operate on
+    the remote server instead of asking the proxy to do so. libcurl will not
+    stand in the way for such innovative actions either!
+
+  Proxy Auto-Config
+
+    Netscape first came up with this. It is basicly a web page (usually using
+    a .pac extension) with a javascript that when executed by the browser with
+    the requested URL as input, returns information to the browser on how to
+    connect to the URL. The returned information might be "DIRECT" (which
+    means no proxy should be used), "PROXY host:port" (to tell the browser
+    where the proxy for this particular URL is) or "SOCKS host:port" (to
+    direct the brower to a SOCKS proxy).
+
+    libcurl has no means to interpret or evaluate javascript and thus it
+    doesn't support this. If you get yourself in a position where you face
+    this nasty invention, the following advice have been mentioned and used in
+    the past:
+
+    - Depending on the javascript complexity, write up a script that
+      translates it to another language and execute that.
+
+    - Read the javascript code and rewrite the same logic in another language.
+
+    - Implement a javascript interpreted, people have successfully used the
+      Mozilla javascript engine in the past.
+
+    - Ask your admins to stop this, for a static proxy setup or similar.
+
+
+Persistancy Is The Way to Happiness
+
+ Re-cycling the same easy handle several times when doing multiple requests is
+ the way to go.
+
+ After each single curl_easy_perform() operation, libcurl will keep the
+ connection alive and open. A subsequent request using the same easy handle to
+ the same host might just be able to use the already open connection! This
+ reduces network impact a lot.
+
+ Even if the connection is dropped, all connections involving SSL to the same
+ host again, will benefit from libcurl's session ID cache that drasticly
+ reduces re-connection time.
+
+ FTP connections that are kept alive saves a lot of time, as the command-
+ response roundtrips are skipped, and also you don't risk getting blocked
+ without permission to login again like on many FTP servers only allowing N
+ persons to be logged in at the same time.
+
+ libcurl caches DNS name resolving results, to make lookups of a previously
+ looked up name a lot faster.
+
+ Other interesting details that improve performance for subsequent requests
+ may also be added in the future.
+
+ Each easy handle will attempt to keep the last few connections alive for a
+ while in case they are to be used again. You can set the size of this "cache"
+ with the CURLOPT_MAXCONNECTS option. Default is 5. It is very seldom any
+ point in changing this value, and if you think of changing this it is often
+ just a matter of thinking again.
+
+ When the connection cache gets filled, libcurl must close an existing
+ connection in order to get room for the new one. To know which connection to
+ close, libcurl uses a "close policy" that you can affect with the
+ CURLOPT_CLOSEPOLICY option. There's only two polices implemented as of this
+ writing (libcurl 7.9.4) and they are:
+
+  CURLCLOSEPOLICY_LEAST_RECENTLY_USED simply close the one that hasn't been
+  used for the longest time. This is the default behavior.
+
+  CURLCLOSEPOLICY_OLDEST closes the oldest connection, the one that was
+  createst the longest time ago.
+
+ There are, or at least were, plans to support a close policy that would call
+ a user-specified callback to let the user be able to decide which connection
+ to dump when this is necessary and therefor is the CURLOPT_CLOSEFUNCTION an
+ existing option still today. Nothing ever uses this though and this will not
+ be used within the forseeable future either.
+
+ To force your upcoming request to not use an already existing connection (it
+ will even close one first if there happens to be one alive to the same host
+ you're about to operate on), you can do that by setting CURLOPT_FRESH_CONNECT
+ to TRUE. In a similar spirit, you can also forbid the upcoming request to be
+ "lying" around and possibly get re-used after the request by setting
+ CURLOPT_FORBID_REUSE to TRUE.
+
+
+HTTP Headers Used by libcurl
+
+ When you use libcurl to do HTTP requeests, it'll pass along a series of
+ headers automaticly. It might be good for you to know and understand these
+ ones.
+
+  Host
+
+    This header is required by HTTP 1.1 and even many 1.0 servers and should
+    be the name of the server we want to talk to. This includes the port
+    number if anything but default.
+
+  Pragma
+
+    "no-cache". Tells a possible proxy to not grap a copy from the cache but
+    to fetch a fresh one.
+
+  Accept:
+
+    "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*". Cloned from a
+    browser once a hundred years ago.
+
+  Expect:
+
+    When doing multi-part formposts, libcurl will set this header to
+    "100-continue" to ask the server for an "OK" message before it proceeds
+    with sending the data part of the post.
+
+
+Customizing Operations
+
+ There is an ongoing development today where more and more protocols are built
+ upon HTTP for transport. This has obvious benefits as HTTP is a tested and
+ reliable protocol that is widely deployed and have excellent proxy-support.
+
+ When you use one of these protocols, and even when doing other kinds of
+ programming you may need to change the traditional HTTP (or FTP or...)
+ manners. You may need to change words, headers or various data.
+
+ libcurl is your friend here too.
+
+  CUSTOMREQUEST
+
+    If just changing the actual HTTP request keyword is what you want, like
+    when GET, HEAD or POST is not good enough for you, CURLOPT_CUSTOMREQUEST
+    is there for you. It is very simple to use:
+
+       curl_easy_setopt(easyhandle, CURLOPT_CUSTOMREQUEST, "MYOWNRUQUEST");
+
+    When using the custom request, you change the request keyword of the
+    actual request you are performing. Thus, by default you make GET request
+    but you can also make a POST operation (as described before) and then
+    replace the POST keyword if you want to. You're the boss.
+
+  Modify Headers
+
+    HTTP-like protocols pass a series of headers to the server when doing the
+    request, and you're free to pass any amount of extra headers that you
+    think fit. Adding headers are this easy:
+
+       struct curl_slist *headers=NULL; /* init to NULL is important */
+
+       headers = curl_slist_append(headers, "Hey-server-hey: how are you?");
+       headers = curl_slist_append(headers, "X-silly-content: yes");
+
+       /* pass our list of custom made headers */
+       curl_easy_setopt(easyhandle, CURLOPT_HTTPHEADER, headers);
+
+       curl_easy_perform(easyhandle); /* transfer http */
+
+       curl_slist_free_all(headers); /* free the header list */
+
+   ... and if you think some of the internally generated headers, such as
+   Accept: or Host: don't contain the data you want them to contain, you can
+   replace them by simply setting them too:
+
+       headers = curl_slist_append(headers, "Accept: Agent-007");
+       headers = curl_slist_append(headers, "Host: munged.host.line");
+
+  Delete Headers
+
+    If you replace an existing header with one with no contents, you will
+    prevent the header from being sent. Like if you want to completely prevent
+    the "Accept:" header to be sent, you can disable it with code similar to
+    this:
+
+       headers = curl_slist_append(headers, "Accept:");
+
+    Both replacing and cancelling internal headers should be done with careful
+    consideration and you should be aware that you may violate the HTTP
+    protocol when doing so.
+
+  Enforcing chunked transfer-encoding
+
+    By making sure a request uses the custom header "Transfer-Encoding:
+    chunked" when doing a non-GET HTTP operation, libcurl will switch over to
+    "chunked" upload, even though the size of the data to upload might be
+    known. By default, libcurl usually switches over to chunked upload
+    automaticly if the upload data size is unknown.
+
+  HTTP Version
+
+    There's only one aspect left in the HTTP requests that we haven't yet
+    mentioned how to modify: the version field. All HTTP requests includes the
+    version number to tell the server which version we support. libcurl speak
+    HTTP 1.1 by default. Some very old servers don't like getting 1.1-requests
+    and when dealing with stubborn old things like that, you can tell libcurl
+    to use 1.0 instead by doing something like this:
+
+       curl_easy_setopt(easyhandle, CURLOPT_HTTP_VERSION,
+                                    CURLHTTP_VERSION_1_0);
+
+  FTP Custom Commands
+
+    Not all protocols are HTTP-like, and thus the above may not help you when
+    you want to make for example your FTP transfers to behave differently.
+
+    Sending custom commands to a FTP server means that you need to send the
+    comands exactly as the FTP server expects them (RFC959 is a good guide
+    here), and you can only use commands that work on the control-connection
+    alone. All kinds of commands that requires data interchange and thus needs
+    a data-connection must be left to libcurl's own judgement. Also be aware
+    that libcurl will do its very best to change directory to the target
+    directory before doing any transfer, so if you change directory (with CWD
+    or similar) you might confuse libcurl and then it might not attempt to
+    transfer the file in the correct remote directory.
+
+    A little example that deletes a given file before an operation:
+
+      headers = curl_slist_append(headers, "DELE file-to-remove");
+
+      /* pass the list of custom commands to the handle */
+      curl_easy_setopt(easyhandle, CURLOPT_QUOTE, headers);
+
+      curl_easy_perform(easyhandle); /* transfer ftp data! */
+
+      curl_slist_free_all(headers); /* free the header list */
+
+    If you would instead want this operation (or chain of operations) to
+    happen _after_ the data transfer took place the option to
+    curl_easy_setopt() would instead be called CURLOPT_POSTQUOTE and used the
+    exact same way.
+
+    The custom FTP command will be issued to the server in the same order they
+    are added to the list, and if a command gets an error code returned back
+    from the server, no more commands will be issued and libcurl will bail out
+    with an error code (CURLE_FTP_QUOTE_ERROR). Note that if you use
+    CURLOPT_QUOTE to send commands before a transfer, no transfer will
+    actually take place when a quote command has failed.
+
+    If you set the CURLOPT_HEADER to true, you will tell libcurl to get
+    information about the target file and output "headers" about it. The
+    headers will be in "HTTP-style", looking like they do in HTTP.
+
+    The option to enable headers or to run custom FTP commands may be useful
+    to combine with CURLOPT_NOBODY. If this option is set, no actual file
+    content transfer will be performed.
+
+  FTP Custom CUSTOMREQUEST
+
+    If you do what list the contents of a FTP directory using your own defined
+    FTP command, CURLOPT_CUSTOMREQUEST will do just that. "NLST" is the
+    default one for listing directories but you're free to pass in your idea
+    of a good alternative.
+
+
+Cookies Without Chocolate Chips
+
+ In the HTTP sense, a cookie is a name with an associated value. A server
+ sends the name and value to the client, and expects it to get sent back on
+ every subsequent request to the server that matches the particular conditions
+ set. The conditions include that the domain name and path match and that the
+ cookie hasn't become too old.
+
+ In real-world cases, servers send new cookies to replace existing one to
+ update them. Server use cookies to "track" users and to keep "sessions".
+
+ Cookies are sent from server to clients with the header Set-Cookie: and
+ they're sent from clients to servers with the Cookie: header.
+
+ To just send whatever cookie you want to a server, you can use CURLOPT_COOKIE
+ to set a cookie string like this:
+
+    curl_easy_setopt(easyhandle, CURLOPT_COOKIE, "name1=var1; name2=var2;");
+
+ In many cases, that is not enough. You might want to dynamicly save whatever
+ cookies the remote server passes to you, and make sure those cookies are then
+ use accordingly on later requests.
+
+ One way to do this, is to save all headers you receive in a plain file and
+ when you make a request, you tell libcurl to read the previous headers to
+ figure out which cookies to use. Set header file to read cookies from with
+ CURLOPT_COOKIEFILE.
+
+ The CURLOPT_COOKIEFILE option also automaticly enables the cookie parser in
+ libcurl. Until the cookie parser is enabled, libcurl will not parse or
+ understand incoming cookies and they will just be ignored. However, when the
+ parser is enabled the cookies will be understood and the cookies will be kept
+ in memory and used properly in subsequent requests when the same handle is
+ used. Many times this is enough, and you may not have to save the cookies to
+ disk at all. Note that the file you specify to CURLOPT_COOKIEFILE doesn't
+ have to exist to enable the parser, so a common way to just enable the parser
+ and not read able might be to use a file name you know doesn't exist.
+
+ If you rather use existing cookies that you've previously received with your
+ Netscape or Mozilla browsers, you can make libcurl use that cookie file as
+ input. The CURLOPT_COOKIEFILE is used for that too, as libcurl will
+ automaticly find out what kind of file it is and act accordingly.
+
+ The perhaps most advanced cookie operation libcurl offers, is saving the
+ entire internal cookie state back into a Netscape/Mozilla formatted cookie
+ file. We call that the cookie-jar. When you set a file name with
+ CURLOPT_COOKIEJAR, that file name will be created and all received cookies
+ will be stored in it when curl_easy_cleanup() is called. This enabled cookies
+ to get passed on properly between multiple handles without any information
+ getting lost.
+
+
+FTP Peculiarities We Need
+
+ FTP transfers use a second TCP/IP connection for the data transfer. This is
+ usually a fact you can forget and ignore but at times this fact will come
+ back to haunt you. libcurl offers several different ways to custom how the
+ second connection is being made.
+
+ libcurl can either connect to the server a second time or tell the server to
+ connect back to it. The first option is the default and it is also what works
+ best for all the people behind firewalls, NATs or IP-masquarading setups.
+ libcurl then tells the server to open up a new port and wait for a second
+ connection. This is by default attempted with EPSV first, and if that doesn't
+ work it tries PASV instead. (EPSV is an extension to the original FTP spec
+ and does not exist nor work on all FTP servers.)
+
+ You can prevent libcurl from first trying the EPSV command by setting
+ CURLOPT_FTP_USE_EPSV to FALSE.
+
+ In some cases, you will prefer to have the server connect back to you for the
+ second connection. This might be when the server is perhaps behind a firewall
+ or something and only allows connections on a single port. libcurl then
+ informs the remote server which IP address and port number to connect to.
+ This is made with the CURLOPT_FTPPORT option. If you set it to "-", libcurl
+ will use your system's "default IP address". If you want to use a particular
+ IP, you can set the full IP address, a host name to resolve to an IP address
+ or even a local network interface name that libcurl will get the IP address
+ from.
+
+
+Headers Equal Fun
+
+ Some protocols provide "headers", meta-data separated from the normal
+ data. These headers are by default not included in the normal data stream,
+ but you can make them appear in the data stream by setting CURLOPT_HEADER to
+ TRUE.
+
+ What might be even more useful, is libcurl's ability to separate the headers
+ from the data and thus make the callbacks differ. You can for example set a
+ different pointer to pass to the ordinary write callback by setting
+ CURLOPT_WRITEHEADER.
+
+ Or, you can set an entirely separate function to receive the headers, by
+ using CURLOPT_HEADERFUNCTION.
+
+ The headers are passed to the callback function one by one, and you can
+ depend on that fact. It makes it easier for you to add custom header parsers
+ etc.
+
+ "Headers" for FTP transfers equal all the FTP server responses. They aren't
+ actually true headers, but in this case we pretend they are! ;-)
+
+
+Post Transfer Information
+
+ [ curl_easy_getinfo ]
+
+
+Security Considerations
+
+ libcurl is in itself not insecure. If used the right way, you can use libcurl
+ to transfer data pretty safely.
+
+ There are of course many things to consider that may loosen up this
+ situation:
+
+  Command Lines
+
+    If you use a command line tool (such as curl) that uses libcurl, and you
+    give option to the tool on the command line those options can very likely
+    get read by other users of your system when they use 'ps' or other tools
+    to list currently running processes.
+
+    To avoid this problem, never feed sensitive things to programs using
+    command line options.
+
+  .netrc
+
+    .netrc is a pretty handy file/feature that allows you to login quickly and
+    automaticly to frequently visited sites. The file contains passwords in
+    clear text and is a real security risk. In some cases, your .netrc is also
+    stored in a home directory that is NFS mounted or used on another network
+    based file system, so the clear text password will fly through your
+    network every time anyone reads that file!
+
+    To avoid this problem, don't use .netrc files and never store passwords in
+    plain text anywhere.
+
+  Clear Text Passwords
+
+    Many of the protocols libcurl supports send name and password unencrypted
+    as clear text (HTTP Basic authentication, FTP, TELNET etc). It is very
+    easy for anyone on your network or a network nearby yours, to just fire up
+    a network analyzer tool and evesdrop on your passwords. Don't let the fact
+    that HTTP uses base64 encoded passwords fool you. They may not look
+    readable at a first glance, but they very easily "deciphered" by anyone
+    within seconds.
+
+    To avoid this problem, use protocols that don't let snoopers see your
+    password: HTTPS, FTPS and FTP-kerberos are a few examples. HTTP Digest
+    authentication allows this too, but isn't supported by libcurl as of this
+    writing.
+
+  Showing What You Do
+
+    On a related issue, be aware that even in situations like when you have
+    problems with libcurl and ask somone for help, everything you reveal in
+    order to get best possible help might also impose certain security related
+    risks. Host names, user names, paths, operating system specifics etc (not
+    to mention passwords of course) may in fact be used by intruders to gain
+    additional information of a potential target.
+
+    To avoid this problem, you must of course use your common sense. Often,
+    you can just edit out the senstive data or just rearch/replace your true
+    information with faked data.
+
+
+SSL, Certificates and Other Tricks
+
+ [ seeding, passwords, keys, certificates, ENGINE, ca certs ]
+
+Multiple Transfers Using the multi Interface
+
+ The easy interface as described in detail in this document is a synchronous
+ interface that transfers one file at a time and doesn't return until its
+ done.
+
+ The multi interface on the other hand, allows your program to transfer
+ multiple files in both directions at the same time, without forcing you to
+ use multiple threads.
+
+ [fill in lots of more multi stuff here]
+
+Future
+
+ [ sharing between handles, mutexes, pipelining ]
+
+
+-----
+Footnotes:
+
+[1] = libcurl 7.10.3 and later have the ability to switch over to chunked
+      Tranfer-Encoding in cases were HTTP uploads are done with data of an
+      unknown size.
+
+
+[2] = This happens on Windows machines when libcurl is built and used as a
+      DLL. However, you can still do this on Windows if you link with a static
+      library.
+
+[3] = The curl-config tool is generated at build-time (on unix-like systems)
+      and should be installed with the 'make install' or similar instruction
+      that installs the library, header files, man pages etc.
diff --git a/main/source/curl/docs/libcurl/Makefile.am b/main/source/curl/docs/libcurl/Makefile.am
new file mode 100644
index 00000000..bf8b219b
--- /dev/null
+++ b/main/source/curl/docs/libcurl/Makefile.am
@@ -0,0 +1,132 @@
+#
+# $Id: Makefile.am,v 1.6 2002/10/14 07:39:50 bagder Exp $
+#
+
+AUTOMAKE_OPTIONS = foreign no-dependencies
+
+man_MANS = \
+	curl_easy_cleanup.3 \
+	curl_easy_getinfo.3 \
+	curl_easy_init.3 \
+	curl_easy_perform.3 \
+	curl_easy_setopt.3 \
+	curl_easy_duphandle.3 \
+	curl_formparse.3 \
+	curl_formadd.3 \
+	curl_formfree.3 \
+	curl_getdate.3 \
+	curl_getenv.3 \
+	curl_slist_append.3 \
+	curl_slist_free_all.3 \
+	curl_version.3 \
+	curl_version_info.3 \
+	curl_escape.3 \
+	curl_unescape.3 \
+	curl_free.3 \
+	curl_strequal.3 \
+	curl_strnequal.3 \
+	curl_mprintf.3 \
+	curl_global_init.3 \
+	curl_global_cleanup.3 \
+	libcurl.3 \
+	curl_multi_add_handle.3 \
+	curl_multi_cleanup.3 \
+	curl_multi_fdset.3 \
+	curl_multi_info_read.3 \
+	curl_multi_init.3 \
+	curl_multi_perform.3 \
+	curl_multi_remove_handle.3 \
+	libcurl-multi.3 \
+	libcurl-errors.3
+
+HTMLPAGES = \
+	curl_easy_cleanup.html \
+	curl_easy_getinfo.html \
+	curl_easy_init.html \
+	curl_easy_perform.html \
+	curl_easy_setopt.html \
+	curl_easy_duphandle.html \
+	curl_formadd.html \
+	curl_formparse.html \
+	curl_formfree.html \
+	curl_getdate.html \
+	curl_getenv.html \
+	curl_slist_append.html \
+	curl_slist_free_all.html \
+	curl_version.html \
+	curl_version_info.html \
+	curl_escape.html \
+	curl_unescape.html \
+	curl_free.html \
+	curl_strequal.html \
+	curl_strnequal.html \
+	curl_mprintf.html \
+	curl_global_init.html \
+	curl_global_cleanup.html \
+	libcurl.html \
+	curl_multi_add_handle.html \
+	curl_multi_cleanup.html \
+	curl_multi_fdset.html \
+	curl_multi_info_read.html \
+	curl_multi_init.html \
+	curl_multi_perform.html \
+	curl_multi_remove_handle.html \
+	libcurl-multi.html \
+	libcurl-errors.html \
+	index.html
+
+PDFPAGES = \
+	curl_easy_cleanup.pdf \
+	curl_easy_getinfo.pdf \
+	curl_easy_init.pdf \
+	curl_easy_perform.pdf \
+	curl_easy_setopt.pdf \
+	curl_easy_duphandle.pdf \
+	curl_formadd.pdf \
+	curl_formparse.pdf \
+	curl_formfree.pdf \
+	curl_getdate.pdf \
+	curl_getenv.pdf \
+	curl_slist_append.pdf \
+	curl_slist_free_all.pdf \
+	curl_version.pdf \
+	curl_version_info.pdf \
+	curl_escape.pdf \
+	curl_unescape.pdf \
+	curl_free.pdf \
+	curl_strequal.pdf \
+	curl_strnequal.pdf \
+	curl_mprintf.pdf \
+	curl_global_init.pdf \
+	curl_global_cleanup.pdf \
+	libcurl.pdf \
+	curl_multi_add_handle.pdf \
+	curl_multi_cleanup.pdf \
+	curl_multi_fdset.pdf \
+	curl_multi_info_read.pdf \
+	curl_multi_init.pdf \
+	curl_multi_perform.pdf \
+	curl_multi_remove_handle.pdf \
+	libcurl-multi.pdf \
+	libcurl-errors.pdf
+
+EXTRA_DIST = $(man_MANS) $(HTMLPAGES) $(PDFPAGES)
+
+MAN2HTML= gnroff -man $< | man2html >$@
+
+SUFFIXES = .1 .3 .html
+
+html: $(HTMLPAGES)
+
+.3.html:
+	$(MAN2HTML)
+
+.1.html:
+	$(MAN2HTML)
+
+pdf:
+	for file in $(man_MANS); do \
+	  foo=`echo $$file | sed -e 's/\.[0-9]$$//g'`; \
+	  groff -Tps -man $$file >$$foo.ps; \
+	  ps2pdf $$foo.ps $$foo.pdf; \
+	done
diff --git a/main/source/curl/docs/libcurl/Makefile.in b/main/source/curl/docs/libcurl/Makefile.in
new file mode 100644
index 00000000..a96787c1
--- /dev/null
+++ b/main/source/curl/docs/libcurl/Makefile.in
@@ -0,0 +1,505 @@
+# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# $Id: Makefile.am,v 1.6 2002/10/14 07:39:50 bagder Exp $
+#
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CA_BUNDLE = @CURL_CA_BUNDLE@
+CURL_DISABLE_DICT = @CURL_DISABLE_DICT@
+CURL_DISABLE_FILE = @CURL_DISABLE_FILE@
+CURL_DISABLE_FTP = @CURL_DISABLE_FTP@
+CURL_DISABLE_GOPHER = @CURL_DISABLE_GOPHER@
+CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@
+CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@
+CURL_DISABLE_TELNET = @CURL_DISABLE_TELNET@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_LIBZ = @HAVE_LIBZ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPV6_ENABLED = @IPV6_ENABLED@
+KRB4_ENABLED = @KRB4_ENABLED@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NO_UNDEFINED_FALSE = @NO_UNDEFINED_FALSE@
+NO_UNDEFINED_TRUE = @NO_UNDEFINED_TRUE@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_ENABLED = @OPENSSL_ENABLED@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKGADD_NAME = @PKGADD_NAME@
+PKGADD_PKG = @PKGADD_PKG@
+PKGADD_VENDOR = @PKGADD_VENDOR@
+PKGCONFIG = @PKGCONFIG@
+RANDOM_FILE = @RANDOM_FILE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VERSIONNUM = @VERSIONNUM@
+YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+
+AUTOMAKE_OPTIONS = foreign no-dependencies
+
+man_MANS = \
+	curl_easy_cleanup.3 \
+	curl_easy_getinfo.3 \
+	curl_easy_init.3 \
+	curl_easy_perform.3 \
+	curl_easy_setopt.3 \
+	curl_easy_duphandle.3 \
+	curl_formparse.3 \
+	curl_formadd.3 \
+	curl_formfree.3 \
+	curl_getdate.3 \
+	curl_getenv.3 \
+	curl_slist_append.3 \
+	curl_slist_free_all.3 \
+	curl_version.3 \
+	curl_version_info.3 \
+	curl_escape.3 \
+	curl_unescape.3 \
+	curl_free.3 \
+	curl_strequal.3 \
+	curl_strnequal.3 \
+	curl_mprintf.3 \
+	curl_global_init.3 \
+	curl_global_cleanup.3 \
+	libcurl.3 \
+	curl_multi_add_handle.3 \
+	curl_multi_cleanup.3 \
+	curl_multi_fdset.3 \
+	curl_multi_info_read.3 \
+	curl_multi_init.3 \
+	curl_multi_perform.3 \
+	curl_multi_remove_handle.3 \
+	libcurl-multi.3 \
+	libcurl-errors.3
+
+
+HTMLPAGES = \
+	curl_easy_cleanup.html \
+	curl_easy_getinfo.html \
+	curl_easy_init.html \
+	curl_easy_perform.html \
+	curl_easy_setopt.html \
+	curl_easy_duphandle.html \
+	curl_formadd.html \
+	curl_formparse.html \
+	curl_formfree.html \
+	curl_getdate.html \
+	curl_getenv.html \
+	curl_slist_append.html \
+	curl_slist_free_all.html \
+	curl_version.html \
+	curl_version_info.html \
+	curl_escape.html \
+	curl_unescape.html \
+	curl_free.html \
+	curl_strequal.html \
+	curl_strnequal.html \
+	curl_mprintf.html \
+	curl_global_init.html \
+	curl_global_cleanup.html \
+	libcurl.html \
+	curl_multi_add_handle.html \
+	curl_multi_cleanup.html \
+	curl_multi_fdset.html \
+	curl_multi_info_read.html \
+	curl_multi_init.html \
+	curl_multi_perform.html \
+	curl_multi_remove_handle.html \
+	libcurl-multi.html \
+	libcurl-errors.html \
+	index.html
+
+
+PDFPAGES = \
+	curl_easy_cleanup.pdf \
+	curl_easy_getinfo.pdf \
+	curl_easy_init.pdf \
+	curl_easy_perform.pdf \
+	curl_easy_setopt.pdf \
+	curl_easy_duphandle.pdf \
+	curl_formadd.pdf \
+	curl_formparse.pdf \
+	curl_formfree.pdf \
+	curl_getdate.pdf \
+	curl_getenv.pdf \
+	curl_slist_append.pdf \
+	curl_slist_free_all.pdf \
+	curl_version.pdf \
+	curl_version_info.pdf \
+	curl_escape.pdf \
+	curl_unescape.pdf \
+	curl_free.pdf \
+	curl_strequal.pdf \
+	curl_strnequal.pdf \
+	curl_mprintf.pdf \
+	curl_global_init.pdf \
+	curl_global_cleanup.pdf \
+	libcurl.pdf \
+	curl_multi_add_handle.pdf \
+	curl_multi_cleanup.pdf \
+	curl_multi_fdset.pdf \
+	curl_multi_info_read.pdf \
+	curl_multi_init.pdf \
+	curl_multi_perform.pdf \
+	curl_multi_remove_handle.pdf \
+	libcurl-multi.pdf \
+	libcurl-errors.pdf
+
+
+EXTRA_DIST = $(man_MANS) $(HTMLPAGES) $(PDFPAGES)
+
+MAN2HTML = gnroff -man $< | man2html >$@
+
+SUFFIXES = .1 .3 .html
+subdir = docs/libcurl
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/lib/config.h \
+	$(top_builddir)/src/config.h \
+	$(top_builddir)/tests/server/config.h \
+	$(top_builddir)/lib/ca-bundle.h
+CONFIG_CLEAN_FILES =
+depcomp =
+am__depfiles_maybe =
+DIST_SOURCES =
+MANS = $(man_MANS)
+DIST_COMMON = Makefile.am Makefile.in
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .1 .3 .html
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  docs/libcurl/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+man3dir = $(mandir)/man3
+install-man3: $(man3_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(man3dir)
+	@list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.3*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    3*) ;; \
+	    *) ext='3' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst; \
+	done
+uninstall-man3:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.3*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    3*) ;; \
+	    *) ext='3' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \
+	  rm -f $(DESTDIR)$(man3dir)/$$inst; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(MANS)
+
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(man3dir)
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-man
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man: install-man3
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-man
+
+uninstall-man: uninstall-man3
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-man3 install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am uninstall-man uninstall-man3
+
+
+html: $(HTMLPAGES)
+
+.3.html:
+	$(MAN2HTML)
+
+.1.html:
+	$(MAN2HTML)
+
+pdf:
+	for file in $(man_MANS); do \
+	  foo=`echo $$file | sed -e 's/\.[0-9]$$//g'`; \
+	  groff -Tps -man $$file >$$foo.ps; \
+	  ps2pdf $$foo.ps $$foo.pdf; \
+	done
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/main/source/curl/docs/libcurl/curl_easy_cleanup.3 b/main/source/curl/docs/libcurl/curl_easy_cleanup.3
new file mode 100644
index 00000000..9c528441
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_easy_cleanup.3
@@ -0,0 +1,28 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: curl_easy_cleanup.3,v 1.3 2002/11/14 09:54:10 bagder Exp $
+.\"
+.TH curl_easy_cleanup 3 "13 Nov 2002" "libcurl 7.7" "libcurl Manual"
+.SH NAME
+curl_easy_cleanup - End a libcurl easy session
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "void curl_easy_cleanup(CURL *" handle ");"
+.ad
+.SH DESCRIPTION
+This function must be the last function to call for an easy session. It is the
+opposite of the \fIcurl_easy_init\fP function and must be called with the same
+\fIhandle\fP as input that the curl_easy_init call returned.
+
+This will effectively close all connections this handle has used and possibly
+has kept open until now. Don't call this function if you intend to transfer
+more files.
+
+When you've called this, you can safely remove all the strings you've
+previously told libcurl to use, as it won't use them anymore now.
+.SH RETURN VALUE
+None
+.SH "SEE ALSO"
+.BR curl_easy_init "(3), "
+
diff --git a/main/source/curl/docs/libcurl/curl_easy_cleanup.html b/main/source/curl/docs/libcurl/curl_easy_cleanup.html
new file mode 100644
index 00000000..6f415447
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_easy_cleanup.html
@@ -0,0 +1,72 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_easy_cleanup - End a libcurl easy session
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>void</B> <B>curl_easy_cleanup(CURL</B> <B>*</B><I>handle</I><B>);</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       This  function  must  be  the last function to call for an
+       easy session. It is the  opposite  of  the  <I>curl</I><B>_</B><I>easy</I><B>_</B><I>init</I>
+       function  and must be called with the same <I>handle</I> as input
+       that the curl_easy_init call returned.
+
+       This will effectively close all  connections  this  handle
+       has  used and possibly has kept open until now. Don't call
+       this function if you intend to transfer more files.
+
+       When you've called this, you can  safely  remove  all  the
+       strings you've previously told libcurl to use, as it won't
+       use them anymore now.
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       None
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>curl_easy_init(3)</B>,
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_easy_cleanup.pdf b/main/source/curl/docs/libcurl/curl_easy_cleanup.pdf
new file mode 100644
index 00000000..461bc546
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_easy_cleanup.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_easy_duphandle.3 b/main/source/curl/docs/libcurl/curl_easy_duphandle.3
new file mode 100644
index 00000000..633ae615
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_easy_duphandle.3
@@ -0,0 +1,37 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: curl_easy_duphandle.3,v 1.1 2002/03/04 10:09:49 bagder Exp $
+.\"
+.TH curl_easy_duphandle 3 "18 September 2001" "libcurl 7.9" "libcurl Manual"
+.SH NAME
+curl_easy_duphandle - Clone a libcurl session handle
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "CURL *curl_easy_duphandle(CURL *"handle ");"
+.ad
+.SH DESCRIPTION
+This function will return a new curl handle, a duplicate, using all the
+options previously set in the input curl \fIhandle\fP. Both handles can
+subsequently be used independently and they must both be freed with
+\fIcurl_easy_cleanup()\fP.
+
+All strings that the input handle has been told to point to (as opposed to
+copy) with previous calls to \fIcurl_easy_setopt\fP using char * inputs, will
+be pointed to by the new handle as well. You must therefore make sure to keep
+the data around until both handles have been cleaned up.
+
+The new handle will \fBnot\fP inherit any state information, no connections,
+no SSL sessions and no cookies.
+
+\fBNote\fP that even in multi-threaded programs, this function must be called
+in a synchronous way, the input handle may not be in use when cloned.
+
+This function was added in libcurl 7.9.
+.SH RETURN VALUE
+If this function returns NULL, something went wrong and no valid handle was
+returned.
+.SH "SEE ALSO"
+.BR curl_easy_init "(3)," curl_easy_cleanup "(3)," curl_global_init "(3)
+.SH BUGS
+Surely there are some, you tell me!
diff --git a/main/source/curl/docs/libcurl/curl_easy_duphandle.html b/main/source/curl/docs/libcurl/curl_easy_duphandle.html
new file mode 100644
index 00000000..2f5b05cf
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_easy_duphandle.html
@@ -0,0 +1,74 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_easy_duphandle - Clone a libcurl session handle
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>CURL</B> <B>*curl_easy_duphandle(CURL</B> <B>*</B><I>handle</I><B>);</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       This  function will return a new curl handle, a duplicate,
+       using all the options previously set  in  the  input  curl
+       <I>handle</I>.  Both  handles  can  subsequently be used indepen-
+       dently   and   they    must    both    be    freed    with
+       <I>curl</I><B>_</B><I>easy</I><B>_</B><I>cleanup()</I>.
+
+       All  strings  that the input handle has been told to point
+       to  (as  opposed  to  copy)   with   previous   calls   to
+       <I>curl</I><B>_</B><I>easy</I><B>_</B><I>setopt</I>  using  char * inputs, will be pointed to
+       by the new handle as well. You must therefore make sure to
+       keep  the data around until both handles have been cleaned
+       up.
+
+       The new handle will <B>not</B> inherit any state information,  no
+       connections, no SSL sessions and no cookies.
+
+       <B>Note</B>  that  even in multi-threaded programs, this function
+       must be called in a synchronous way, the input handle  may
+       not be in use when cloned.
+
+       This function was added in libcurl 7.9.
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       If this function returns NULL, something went wrong and no
+       valid handle was returned.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>curl_easy_init(3)</B>,<B>curl_easy_cleanup(3)</B>,<B>curl_global_init(3)</B>
+
+
+</PRE>
+<H2>BUGS</H2><PRE>
+       Surely there are some, you tell me!
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_easy_duphandle.pdf b/main/source/curl/docs/libcurl/curl_easy_duphandle.pdf
new file mode 100644
index 00000000..5c072d89
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_easy_duphandle.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_easy_getinfo.3 b/main/source/curl/docs/libcurl/curl_easy_getinfo.3
new file mode 100644
index 00000000..c282cd96
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_easy_getinfo.3
@@ -0,0 +1,131 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: curl_easy_getinfo.3,v 1.5 2003/04/11 16:52:30 bagder Exp $
+.\"
+.TH curl_easy_init 3 "25 Apr 2002" "libcurl 7.9.7" "libcurl Manual"
+.SH NAME
+curl_easy_getinfo - Extract information from a curl session (added in 7.4)
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ... );"
+.ad
+.SH DESCRIPTION
+Request internal information from the curl session with this function.  The
+third argument
+.B MUST
+be a pointer to a long, a pointer to a char * or a pointer to a double (as
+this documentation describes further down).  The data pointed-to will be
+filled in accordingly and can be relied upon only if the function returns
+CURLE_OK.  This function is intended to get used *AFTER* a performed transfer,
+all results from this function are undefined until the transfer is completed.
+.SH AVAILABLE INFORMATION
+These are informations that can be extracted:
+.TP 0.8i
+.B CURLINFO_EFFECTIVE_URL
+Pass a pointer to a 'char *' to receive the last used effective URL.
+.TP
+.B CURLINFO_HTTP_CODE
+Pass a pointer to a long to receive the last received HTTP code.
+.TP
+.B CURLINFO_FILETIME
+Pass a pointer to a long to receive the remote time of the retrieved
+document. If you get -1, it can be because of many reasons (unknown, the
+server hides it or the server doesn't support the command that tells document
+time etc) and the time of the document is unknown. Note that you must tell the
+server to collect this information before the transfer is made, by using the
+CURLOPT_FILETIME option to \fIcurl_easy_setopt(3)\fP. (Added in 7.5)
+.TP
+.B CURLINFO_TOTAL_TIME
+Pass a pointer to a double to receive the total transaction time in seconds
+for the previous transfer. This time does not include the connect time, so if
+you want the complete operation time, you should add the
+CURLINFO_CONNECT_TIME.
+.TP
+.B CURLINFO_NAMELOOKUP_TIME
+Pass a pointer to a double to receive the time, in seconds, it took from the
+start until the name resolving was completed.
+.TP
+.B CURLINFO_CONNECT_TIME
+Pass a pointer to a double to receive the time, in seconds, it took from the
+start until the connect to the remote host (or proxy) was completed.
+.TP
+.B CURLINFO_PRETRANSFER_TIME
+Pass a pointer to a double to receive the time, in seconds, it took from the
+start until the file transfer is just about to begin. This includes all
+pre-transfer commands and negotiations that are specific to the particular
+protocol(s) involved.
+.TP
+.B CURLINFO_STARTTRANSFER_TIME
+Pass a pointer to a double to receive the time, in seconds, it took from the
+start until the first byte is just about to be transfered. This includes
+CURLINFO_PRETRANSFER_TIME and also the time the server needs to calculate
+the result.
+.TP
+.B CURLINFO_REDIRECT_TIME
+Pass a pointer to a double to receive the total time, in seconds, it took for
+all redirection steps include name lookup, connect, pretransfer and transfer
+before final transaction was started. CURLINFO_REDIRECT_TIME contains the
+complete execution time for multiple redirections.  (Added in 7.9.7)
+.TP
+.B CURLINFO_REDIRECT_COUNT
+Pass a pointer to a long to receive the total number of redirections that were
+actually followed.  (Added in 7.9.7)
+.TP
+.B CURLINFO_SIZE_UPLOAD
+Pass a pointer to a double to receive the total amount of bytes that were
+uploaded.
+.TP
+.B CURLINFO_SIZE_DOWNLOAD
+Pass a pointer to a double to receive the total amount of bytes that were
+downloaded. The amount is only for the latest transfer and will be reset again
+for each new transfer.
+.TP
+.B CURLINFO_SPEED_DOWNLOAD
+Pass a pointer to a double to receive the average download speed that curl
+measured for the complete download.
+.TP
+.B CURLINFO_SPEED_UPLOAD
+Pass a pointer to a double to receive the average upload speed that curl
+measured for the complete upload.
+.TP
+.B CURLINFO_HEADER_SIZE
+Pass a pointer to a long to receive the total size of all the headers
+received.
+.TP
+.B CURLINFO_REQUEST_SIZE
+Pass a pointer to a long to receive the total size of the issued
+requests. This is so far only for HTTP requests. Note that this may be more
+than one request if FOLLOWLOCATION is true.
+.TP
+.B CURLINFO_SSL_VERIFYRESULT
+Pass a pointer to a long to receive the result of the certification
+verification that was requested (using the CURLOPT_SSL_VERIFYPEER option to
+curl_easy_setopt). (Added in 7.4.2)
+.TP
+.B CURLINFO_CONTENT_LENGTH_DOWNLOAD
+Pass a pointer to a double to receive the content-length of the download. This
+is the value read from the Content-Length: field.  (Added in 7.6.1)
+.TP
+.B CURLINFO_CONTENT_LENGTH_UPLOAD
+Pass a pointer to a double to receive the specified size of the upload.
+(Added in 7.6.1)
+.TP
+.B CURLINFO_CONTENT_TYPE
+Pass a pointer to a 'char *' to receive the content-type of the downloaded
+object. This is the value read from the Content-Type: field. If you get NULL,
+it means that the server didn't send a valid Content-Type header or that the
+protocol used doesn't support this.  (Added in 7.9.4)
+.TP
+.B CURLINFO_PRIVATE
+Pass a pointer to a 'char *' to receive the pointer to the private data
+associated with the curl handle (set with the CURLOPT_PRIVATE option to curl_easy_setopt).
+(Added in 7.10.3)
+.PP
+.SH RETURN VALUE
+If the operation was successful, CURLE_OK is returned. Otherwise an
+appropriate error code will be returned.
+.SH "SEE ALSO"
+.BR curl_easy_setopt "(3)"
+.SH BUGS
+Surely there are some, you tell me!
diff --git a/main/source/curl/docs/libcurl/curl_easy_getinfo.html b/main/source/curl/docs/libcurl/curl_easy_getinfo.html
new file mode 100644
index 00000000..a638d431
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_easy_getinfo.html
@@ -0,0 +1,180 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_easy_getinfo  -  Extract information from a curl ses-
+       sion (added in 7.4)
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>CURLcode</B> <B>curl_easy_getinfo(CURL</B> <B>*curl,</B> <B>CURLINFO</B> <B>info,</B>  <B>...</B>
+       <B>);</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       Request  internal  information  from the curl session with
+       this function.  The third argument <B>MUST</B> be a pointer to  a
+       long,  a  pointer to a char * or a pointer to a double (as
+       this documentation  describes  further  down).   The  data
+       pointed-to will be filled in accordingly and can be relied
+       upon only if the function returns CURLE_OK.  This function
+       is  intended to get used *AFTER* a performed transfer, all
+       results from this function are undefined until the  trans-
+       fer is completed.
+
+
+</PRE>
+<H2>AVAILABLE INFORMATION</H2><PRE>
+       These are informations that can be extracted:
+
+       <B>CURLINFO_EFFECTIVE_URL</B>
+               Pass  a  pointer to a 'char *' to receive the last
+               used effective URL.
+
+       <B>CURLINFO_HTTP_CODE</B>
+               Pass a pointer to  a  long  to  receive  the  last
+               received HTTP code.
+
+       <B>CURLINFO_FILETIME</B>
+               Pass  a  pointer  to  a long to receive the remote
+               time of the retrieved document. If you get -1,  it
+               can  be  because  of  many  reasons  (unknown, the
+               server hides it or the server doesn't support  the
+               command that tells document time etc) and the time
+               of the document is unknown.  Note  that  you  must
+               tell the server to collect this information before
+               the transfer is made, by using  the  CURLOPT_FILE-
+               TIME option to <I>curl</I><B>_</B><I>easy</I><B>_</B><I>setopt(3)</I>. (Added in 7.5)
+
+       <B>CURLINFO_TOTAL_TIME</B>
+               Pass a pointer to a double to  receive  the  total
+               transaction  time  in  seconds  for  the  previous
+               transfer. This time does not include  the  connect
+               time,  so if you want the complete operation time,
+               you should add the CURLINFO_CONNECT_TIME.
+
+       <B>CURLINFO_NAMELOOKUP_TIME</B>
+               Pass a pointer to a double to receive the time, in
+               seconds,  it  took  from  the start until the name
+               Pass a pointer to a double to receive the time, in
+               seconds,  it took from the start until the connect
+               to the remote host (or proxy) was completed.
+
+       <B>CURLINFO_PRETRANSFER_TIME</B>
+               Pass a pointer to a double to receive the time, in
+               seconds,  it  took  from  the start until the file
+               transfer is just about to begin. This includes all
+               pre-transfer  commands  and  negotiations that are
+               specific to the particular protocol(s) involved.
+
+       <B>CURLINFO_STARTTRANSFER_TIME</B>
+               Pass a pointer to a double to receive the time, in
+               seconds,  it  took  from the start until the first
+               byte is just about to be transfered. This includes
+               CURLINFO_PRETRANSFER_TIME  and  also  the time the
+               server needs to calculate the result.
+
+       <B>CURLINFO_REDIRECT_TIME</B>
+               Pass a pointer to a double to  receive  the  total
+               time,  in  seconds,  it  took  for all redirection
+               steps include name  lookup,  connect,  pretransfer
+               and transfer before final transaction was started.
+               CURLINFO_REDIRECT_TIME contains the complete  exe-
+               cution  time for multiple redirections.  (Added in
+               7.9.7)
+
+       <B>CURLINFO_REDIRECT_COUNT</B>
+               Pass a pointer to a long to receive the total num-
+               ber  of  redirections that were actually followed.
+               (Added in 7.9.7)
+
+       <B>CURLINFO_SIZE_UPLOAD</B>
+               Pass a pointer to a double to  receive  the  total
+               amount of bytes that were uploaded.
+
+       <B>CURLINFO_SIZE_DOWNLOAD</B>
+               Pass  a  pointer  to a double to receive the total
+               amount of bytes that were downloaded.  The  amount
+               is  only for the latest transfer and will be reset
+               again for each new transfer.
+
+       <B>CURLINFO_SPEED_DOWNLOAD</B>
+               Pass a pointer to a double to receive the  average
+               download speed that curl measured for the complete
+               download.
+
+       <B>CURLINFO_SPEED_UPLOAD</B>
+               Pass a pointer to a double to receive the  average
+               upload  speed  that curl measured for the complete
+               upload.
+
+               Pass a pointer to a long to receive the total size
+               of all the headers received.
+
+       <B>CURLINFO_REQUEST_SIZE</B>
+               Pass a pointer to a long to receive the total size
+               of the issued requests. This is so  far  only  for
+               HTTP requests. Note that this may be more than one
+               request if FOLLOWLOCATION is true.
+
+       <B>CURLINFO_SSL_VERIFYRESULT</B>
+               Pass a pointer to a long to receive the result  of
+               the  certification verification that was requested
+               (using  the   CURLOPT_SSL_VERIFYPEER   option   to
+               curl_easy_setopt). (Added in 7.4.2)
+
+       <B>CURLINFO_CONTENT_LENGTH_DOWNLOAD</B>
+               Pass a pointer to a double to receive the content-
+               length of the download. This  is  the  value  read
+               from the Content-Length: field.  (Added in 7.6.1)
+
+       <B>CURLINFO_CONTENT_LENGTH_UPLOAD</B>
+               Pass  a  pointer to a double to receive the speci-
+               fied size of the upload.  (Added in 7.6.1)
+
+       <B>CURLINFO_CONTENT_TYPE</B>
+               Pass a pointer to a 'char *' to receive  the  con-
+               tent-type  of  the  downloaded object. This is the
+               value read from the Content-Type:  field.  If  you
+               get  NULL,  it means that the server didn't send a
+               valid Content-Type header  or  that  the  protocol
+               used doesn't support this.  (Added in 7.9.4)
+
+       <B>CURLINFO_PRIVATE</B>
+               Pass  a  pointer  to  a  'char  *'  to receive the
+               pointer to the private data  associated  with  the
+               curl  handle  (set with the CURLOPT_PRIVATE option
+               to curl_easy_setopt).  (Added in 7.10.3)
+
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       If the operation was  successful,  CURLE_OK  is  returned.
+       Otherwise an appropriate error code will be returned.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>curl_easy_setopt(3)</B>
+
+
+</PRE>
+<H2>BUGS</H2><PRE>
+       Surely there are some, you tell me!
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_easy_getinfo.pdf b/main/source/curl/docs/libcurl/curl_easy_getinfo.pdf
new file mode 100644
index 00000000..51f314b0
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_easy_getinfo.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_easy_init.3 b/main/source/curl/docs/libcurl/curl_easy_init.3
new file mode 100644
index 00000000..3ffa52d5
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_easy_init.3
@@ -0,0 +1,25 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: curl_easy_init.3,v 1.2 2002/03/04 13:06:46 bagder Exp $
+.\"
+.TH curl_easy_init 3 "4 March 2002" "libcurl 7.8.1" "libcurl Manual"
+.SH NAME
+curl_easy_init - Start a libcurl easy session
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "CURL *curl_easy_init( );"
+.ad
+.SH DESCRIPTION
+This function must be the first function to call, and it returns a CURL easy
+handle that you must use as input to other easy-functions. curl_easy_init
+intializes curl and this call MUST have a corresponding call to
+\fIcurl_easy_cleanup\fP when the operation is complete.
+
+.SH RETURN VALUE
+If this function returns NULL, something went wrong and you cannot use the
+other curl functions.
+.SH "SEE ALSO"
+.BR curl_easy_cleanup "(3), " curl_global_init "(3)
+.SH BUGS
+Surely there are some, you tell me!
diff --git a/main/source/curl/docs/libcurl/curl_easy_init.html b/main/source/curl/docs/libcurl/curl_easy_init.html
new file mode 100644
index 00000000..423991ff
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_easy_init.html
@@ -0,0 +1,74 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_easy_init - Start a libcurl easy session
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>CURL</B> <B>*curl_easy_init(</B> <B>);</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       This  function  must be the first function to call, and it
+       returns a CURL easy handle that you must use as  input  to
+       other  easy-functions.  curl_easy_init intializes curl and
+       this   call   MUST   have   a   corresponding   call    to
+       <I>curl</I><B>_</B><I>easy</I><B>_</B><I>cleanup</I> when the operation is complete.
+
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       If  this  function  returns NULL, something went wrong and
+       you cannot use the other curl functions.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>curl_easy_cleanup(3)</B>, <B>curl_global_init(3)</B>
+
+
+</PRE>
+<H2>BUGS</H2><PRE>
+       Surely there are some, you tell me!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_easy_init.pdf b/main/source/curl/docs/libcurl/curl_easy_init.pdf
new file mode 100644
index 00000000..70c0cf45
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_easy_init.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_easy_perform.3 b/main/source/curl/docs/libcurl/curl_easy_perform.3
new file mode 100644
index 00000000..72ffef51
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_easy_perform.3
@@ -0,0 +1,46 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: curl_easy_perform.3,v 1.1 2002/03/04 10:09:49 bagder Exp $
+.\"
+.TH curl_easy_perform 3 "5 Mar 2001" "libcurl 7.7" "libcurl Manual"
+.SH NAME
+curl_easy_perform - Perform a file transfer
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "CURLcode curl_easy_perform(CURL *" handle ");
+.ad
+.SH DESCRIPTION
+This function is called after the init and all the curl_easy_setopt() calls
+are made, and will perform the transfer as described in the options.
+It must be called with the same
+.I handle
+as input as the curl_easy_init call returned.
+
+libcurl version 7.7 or later (for older versions see below): You can do any
+amount of calls to curl_easy_perform() while using the same handle. If you
+intend to transfer more than one file, you are even encouraged to do
+so. libcurl will then attempt to re-use the same connection for the following
+transfers, thus making the operations faster, less CPU intense and using less
+network resources. Just note that you will have to use
+.I curl_easy_setopt
+between the invokes to set options for the following curl_easy_perform.
+
+You must never call this function simultaneously from two places using the
+same handle. Let the function return first before invoking it another time. If
+you want parallel transfers, you must use several curl handles.
+
+Before libcurl version 7.7: You are only allowed to call this function once
+using the same handle. If you want to do repeated calls, you must call
+curl_easy_cleanup and curl_easy_init again first.
+.SH RETURN VALUE
+0 means everything was ok, non-zero means an error occurred as
+.I <curl/curl.h>
+defines. If the CURLOPT_ERRORBUFFER was set with
+.I curl_easy_setopt
+there will be a readable error message in the error buffer when non-zero is
+returned.
+.SH "SEE ALSO"
+.BR curl_easy_init "(3), " curl_easy_setopt "(3), "
+.SH BUGS
+Surely there are some, you tell me!
diff --git a/main/source/curl/docs/libcurl/curl_easy_perform.html b/main/source/curl/docs/libcurl/curl_easy_perform.html
new file mode 100644
index 00000000..97388bd1
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_easy_perform.html
@@ -0,0 +1,74 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_easy_perform - Perform a file transfer
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>CURLcode</B> <B>curl_easy_perform(CURL</B> <B>*</B><I>handle</I><B>);</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       This  function  is  called  after  the  init  and  all the
+       curl_easy_setopt() calls are made, and  will  perform  the
+       transfer  as  described in the options.  It must be called
+       with the same <I>handle</I> as input as the  curl_easy_init  call
+       returned.
+
+       libcurl  version  7.7  or  later  (for  older versions see
+       below): You can do any amount of calls  to  curl_easy_per-
+       form()  while  using  the  same  handle.  If you intend to
+       transfer more than one file, you are even encouraged to do
+       so.  libcurl  will then attempt to re-use the same connec-
+       tion for the following transfers, thus making  the  opera-
+       tions  faster,  less  CPU  intense  and using less network
+       resources.  Just  note  that  you   will   have   to   use
+       <I>curl</I><B>_</B><I>easy</I><B>_</B><I>setopt</I>  between  the  invokes to set options for
+       the following curl_easy_perform.
+
+       You must never call this function simultaneously from  two
+       places  using  the  same  handle.  Let the function return
+       first before invoking it another time. If you want  paral-
+       lel transfers, you must use several curl handles.
+
+       Before  libcurl  version 7.7: You are only allowed to call
+       this function once using the same handle. If you  want  to
+       do  repeated  calls,  you  must call curl_easy_cleanup and
+       curl_easy_init again first.
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       0  means  everything  was  ok,  non-zero  means  an  error
+       occurred  as  <I>&lt;curl/curl.h&gt;</I> defines. If the CURLOPT_ERROR-
+       BUFFER was set with <I>curl</I><B>_</B><I>easy</I><B>_</B><I>setopt</I> there will be a read-
+       able  error  message  in the error buffer when non-zero is
+       returned.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>curl_easy_init(3)</B>, <B>curl_easy_setopt(3)</B>,
+
+
+</PRE>
+<H2>BUGS</H2><PRE>
+       Surely there are some, you tell me!
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_easy_perform.pdf b/main/source/curl/docs/libcurl/curl_easy_perform.pdf
new file mode 100644
index 00000000..bd04db93
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_easy_perform.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_easy_setopt.3 b/main/source/curl/docs/libcurl/curl_easy_setopt.3
new file mode 100644
index 00000000..af5952ea
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_easy_setopt.3
@@ -0,0 +1,853 @@
+.\" nroff -man [file]
+.\" $Id: curl_easy_setopt.3,v 1.40 2003/05/14 09:03:51 bagder Exp $
+.\"
+.TH curl_easy_setopt 3 "3 Dec 2002" "libcurl 7.10.3" "libcurl Manual"
+.SH NAME
+curl_easy_setopt - set options for a curl easy handle
+.SH SYNOPSIS
+#include <curl/curl.h>
+
+CURLcode curl_easy_setopt(CURL *handle, CURLoption option, parameter);
+.ad
+.SH DESCRIPTION
+curl_easy_setopt() is used to tell libcurl how to behave. By using the
+appropriate options to \fIcurl_easy_setopt\fP, you can change libcurl's
+behavior.  All options are set with the \fIoption\fP followed by a
+\fIparameter\fP. That parameter can be a long, a function pointer or an object
+pointer, all depending on what the specific option expects. Read this manual
+carefully as bad input values may cause libcurl to behave badly!  You can only
+set one option in each function call. A typical application uses many
+curl_easy_setopt() calls in the setup phase.
+
+\fBNOTE:\fP strings passed to libcurl as 'char *' arguments, will not be
+copied by the library. Instead you should keep them available until libcurl no
+longer needs them. Failing to do so will cause very odd behavior or even
+crashes. libcurl will need them until you call curl_easy_cleanup() or you set
+the same option again to use a different pointer.
+
+\fBNOTE2:\fP options set with this function call are valid for the forthcoming
+data transfers that are performed when you invoke \fIcurl_easy_perform\fP.
+The options are not in any way reset between transfers, so if you want
+subsequent transfers with different options, you must change them between the
+transfers.
+
+The \fIhandle\fP is the return code from a \fIcurl_easy_init(3)\fP or
+\fIcurl_easy_duphandle(3)\fP call.
+.SH BEHAVIOR OPTIONS
+.TP 0.4i
+.B CURLOPT_VERBOSE
+Set the parameter to non-zero to get the library to display a lot of verbose
+information about its operations. Very useful for libcurl and/or protocol
+debugging and understanding.
+
+You hardly ever want this set in production use, you will almost always want
+this when you debug/report problems. Another neat option for debugging is the
+\fICURLOPT_DEBUGFUNCTION\fP.
+.TP
+.B CURLOPT_HEADER
+A non-zero parameter tells the library to include the header in the body
+output. This is only relevant for protocols that actually have headers
+preceding the data (like HTTP).
+.TP
+.B CURLOPT_NOPROGRESS
+A non-zero parameter tells the library to shut of the built-in progress meter
+completely.
+
+\fBNOTE:\fP future versions of libcurl is likely to not have any built-in
+progress meter at all.
+.TP
+.B CURLOPT_NOSIGNAL
+Pass a long. If it is non-zero, libcurl will not use any functions that
+install signal handlers or any functions that cause signals to be sent to the
+process. This option is mainly here to allow multi-threaded unix applications
+to still set/use all timeout options etc, without risking getting signals.
+(Added in 7.10)
+.PP
+.SH CALLBACK OPTIONS
+.TP 0.4i
+.B CURLOPT_WRITEFUNCTION
+Function pointer that should match the following prototype: \fBsize_t
+function( void *ptr, size_t size, size_t nmemb, void *stream);\fP This
+function gets called by libcurl as soon as there is data reveiced that needs
+to be saved. The size of the data pointed to by \fIptr\fP is \fIsize\fP
+multiplied with \fInmemb\fP, it will not be zero terminated. Return the number
+of bytes actually taken care of. If that amount differs from the amount passed
+to your function, it'll signal an error to the library and it will abort the
+transfer and return \fICURLE_WRITE_ERROR\fP.
+
+Set the \fIstream\fP argument with the \fBCURLOPT_FILE\fP option.
+
+\fBNOTE:\fP you will be passed as much data as possible in all invokes, but
+you cannot possibly make any assumptions. It may be one byte, it may be
+thousands. The maximum amount of data that can be passed to the write callback
+is defined in the curl.h header file: CURL_MAX_WRITE_SIZE.
+.TP
+.B CURLOPT_WRITEDATA
+Data pointer to pass to the file write function. Note that if you specify the
+\fICURLOPT_WRITEFUNCTION\fP, this is the pointer you'll get as input. If you
+don't use a callback, you must pass a 'FILE *' as libcurl will pass this to
+fwrite() when writing data.
+
+\fBNOTE:\fP If you're using libcurl as a win32 DLL, you MUST use the
+\fICURLOPT_WRITEFUNCTION\fP if you set this option or you will experience
+crashes.
+
+This option is also known with the older name \fBCURLOPT_FILE\fP, the name
+CURLOPT_WRITEDATA was introduced in 7.9.7.
+.TP
+.B CURLOPT_READFUNCTION
+Function pointer that should match the following prototype: \fBsize_t
+function( void *ptr, size_t size, size_t nmemb, void *stream);\fP This
+function gets called by libcurl as soon as it needs to read data in order to
+send it to the peer. The data area pointed at by the pointer \fIptr\fP may be
+filled with at most \fIsize\fP multiplied with \fInmemb\fP number of
+bytes. Your function must return the actual number of bytes that you stored in
+that memory area. Returning 0 will signal end-of-file to the library and cause
+it to stop the current transfer.
+.TP
+.B CURLOPT_READDATA
+Data pointer to pass to the file read function. Note that if you specify the
+\fICURLOPT_READFUNCTION\fP, this is the pointer you'll get as input. If you
+don't specify a read callback, this must be a valid FILE *.
+
+\fBNOTE:\fP If you're using libcurl as a win32 DLL, you MUST use a
+\fICURLOPT_READFUNCTION\fP if you set this option.
+
+This option is also known with the older name \fBCURLOPT_INFILE\fP, the name
+CURLOPT_READDATA was introduced in 7.9.7.
+.TP
+.B CURLOPT_PROGRESSFUNCTION
+Function pointer that should match the \fIcurl_progress_callback\fP prototype
+found in \fI<curl/curl.h>\fP. This function gets called by libcurl instead of
+its internal equivalent with a frequent interval during data transfer.
+Unknown/unused argument values will be set to zero (like if you only download
+data, the upload size will remain 0). Returning a non-zero value from this
+callback will cause libcurl to abort the transfer and return
+\fICURLE_ABORTED_BY_CALLBACK\fP.
+
+Also note that \fICURLOPT_NOPROGRESS\fP must be set to FALSE to make this
+function actually get called.
+.TP
+.B CURLOPT_PROGRESSDATA
+Pass a pointer that will be untouched by libcurl and passed as the first
+argument in the progress callback set with \fICURLOPT_PROGRESSFUNCTION\fP.
+.TP
+.B CURLOPT_PASSWDFUNCTION
+Pass a pointer to a \fIcurl_passwd_callback\fP function that will be called
+instead of the internal one if libcurl requests a password. The function must
+match this prototype: \fBint getpass(void *client, char *prompt, char* buffer,
+int buflen );\fP.  If set to NULL, it sets back the function to the internal
+default one. If the function returns a non-zero value, it will abort the
+operation and an error (CURLE_BAD_PASSWORD_ENTERED) will be returned.
+\fIclient\fP is a generic pointer, see \fICURLOPT_PASSWDDATA\fP.  \fIprompt\fP
+is a zero-terminated string that is text that prefixes the input request.
+\fIbuffer\fP is a pointer to data where the entered password should be stored
+and \fIbuflen\fP is the maximum number of bytes that may be written in the
+buffer.  (Added in 7.4.2)
+.TP
+.B CURLOPT_PASSWDDATA
+Pass a void * to whatever data you want. The passed pointer will be the first
+argument sent to the specifed \fICURLOPT_PASSWDFUNCTION\fP function. (Added in
+7.4.2)
+.TP
+.B CURLOPT_HEADERFUNCTION
+Function pointer that should match the following prototype: \fIsize_t
+function( void *ptr, size_t size, size_t nmemb, void *stream);\fP. This
+function gets called by libcurl as soon as there is received header data that
+needs to be written down. The headers are guaranteed to be written one-by-one
+and only complete lines are written. Parsing headers should be easy enough
+using this. The size of the data pointed to by \fIptr\fP is \fIsize\fP
+multiplied with \fInmemb\fP.  The pointer named \fIstream\fP will be the one
+you passed to libcurl with the \fICURLOPT_WRITEHEADER\fP option.  Return the
+number of bytes actually written or return -1 to signal error to the library
+(it will cause it to abort the transfer with a \fICURLE_WRITE_ERROR\fP return
+code). (Added in 7.7.2)
+.TP
+.B CURLOPT_WRITEHEADER
+Pass a pointer to be used to write the header part of the received data to. If
+you don't use your own callback to take care of the writing, this must be a
+valid FILE *. See also the \fICURLOPT_HEADERFUNCTION\fP option above on how to
+set a custom get-all-headers callback.
+.TP
+.B CURLOPT_DEBUGFUNCTION
+Function pointer that should match the following prototype: \fIint
+curl_debug_callback (CURL *, curl_infotype, char *, size_t, void *);\fP
+This function will receive debug information if CURLOPT_VERBOSE is
+enabled. The curl_infotype argument specifies what kind of information it
+is. This funtion must return 0.
+
+NOTE: the data pointed to by the char * passed to this function WILL NOT be
+zero terminated, but will be exactly of the size as told by the size_t
+argument.
+.TP
+.B CURLOPT_DEBUGDATA
+Pass a pointer to whatever you want passed in to your CURLOPT_DEBUGFUNCTION in
+the last void * argument. This pointer is not used by libcurl, it is only
+passed to the callback.
+.PP
+.SH ERROR OPTIONS
+.TP 0.4i
+.B CURLOPT_ERRORBUFFER
+Pass a char * to a buffer that the libcurl may store human readable error
+messages in. This may be more helpful than just the return code from the
+library. The buffer must be at least CURL_ERROR_SIZE big.
+
+Use \fICURLOPT_VERBOSE\fP and \fICURLOPT_DEBUGFUNCTION\fP to better
+debug/trace why errors happen.
+
+\fBNote:\fP if the library does not return an error, the buffer may not have
+been touched. Do not rely on the contents in those cases.
+.TP
+.B CURLOPT_STDERR
+Pass a FILE * as parameter. This is the stream to use instead of stderr
+internally when reporting errors.
+.TP
+.B CURLOPT_FAILONERROR
+A non-zero parameter tells the library to fail silently if the HTTP code
+returned is equal to or larger than 300. The default action would be to return
+the page normally, ignoring that code.
+.PP
+.SH NETWORK OPTIONS
+.TP 0.4i
+.B CURLOPT_URL
+The actual URL to deal with. The parameter should be a char * to a zero
+terminated string. The string must remain present until curl no longer needs
+it, as it doesn't copy the string.
+
+\fBNOTE:\fP this option is (the only one) required to be set before
+\fIcurl_easy_perform(3)\fP is called.
+.TP
+.B CURLOPT_PROXY
+Set HTTP proxy to use. The parameter should be a char * to a zero terminated
+string holding the host name or dotted IP address. To specify port number in
+this string, append :[port] to the end of the host name. The proxy string may
+be prefixed with [protocol]:// since any such prefix will be ignored. The
+proxy's port number may optionally be specified with the separate option
+\fICURLOPT_PROXYPORT\fP.
+
+\fBNOTE:\fP when you tell the library to use a HTTP proxy, libcurl will
+transparently convert operations to HTTP even if you specify a FTP URL
+etc. This may have an impact on what other features of the library you can
+use, such as CURLOPT_QUOTE and similar FTP specifics that don't work unless
+you tunnel through the HTTP proxy. Such tunneling is activated with
+\fICURLOPT_HTTPPROXYTUNNEL\fP.
+
+\fBNOTE2:\fP libcurl respects the environment variables \fBhttp_proxy\fP,
+\fBftp_proxy\fP, \fBall_proxy\fP etc, if any of those is set.
+.TP
+.B CURLOPT_PROXYPORT
+Pass a long with this option to set the proxy port to connect to unless it is
+specified in the proxy string \fICURLOPT_PROXY\fP.
+.TP
+.B CURLOPT_PROXYTYPE
+Pass a long with this option to set type of the proxy. Available options for
+this are CURLPROXY_HTTP and CURLPROXY_SOCKS5, with the HTTP one being
+default. (Added in 7.10)
+.TP
+.B CURLOPT_HTTPPROXYTUNNEL
+Set the parameter to non-zero to get the library to tunnel all operations
+through a given HTTP proxy. Note that there is a big difference between using
+a proxy and to tunnel through it. If you don't know what this means, you
+probably don't want this tunneling option. (Added in 7.3)
+.TP
+.B CURLOPT_INTERFACE
+Pass a char * as parameter. This set the interface name to use as outgoing
+network interface. The name can be an interface name, an IP address or a host
+name. (Added in 7.3)
+.TP
+.B CURLOPT_DNS_CACHE_TIMEOUT
+Pass a long, this sets the timeout in seconds. Name resolves will be kept in
+memory for this number of seconds. Set to zero (0) to completely disable
+caching, or set to -1 to make the cached entries remain forever. By default,
+libcurl caches info for 60 seconds. (Added in 7.9.3)
+.TP
+.B CURLOPT_DNS_USE_GLOBAL_CACHE
+Pass a long. If the value is non-zero, it tells curl to use a global DNS cache
+that will survive between easy handle creations and deletions. This is not
+thread-safe and this will use a global varible. (Added in 7.9.3)
+.TP
+.B CURLOPT_BUFFERSIZE
+Pass a long specifying your prefered size for the receive buffer in libcurl.
+The main point of this would be that the write callback gets called more often
+and with smaller chunks. This is just treated as a request, not an order. You
+cannot be guaranteed to actually get the given size. (Added in 7.10)
+.PP
+.SH NAMES and PASSWORDS OPTIONS
+.TP 0.4i
+.B CURLOPT_NETRC
+This parameter controls the preference of libcurl between using user names and
+passwords from your \fI~/.netrc\fP file, relative to user names and passwords
+in the URL supplied with \fICURLOPT_URL\fP.
+
+\fBNote:\fP libcurl uses a user name (and supplied or prompted password)
+supplied with \fICURLOPT_USERPWD\fP in preference to any of the options
+controlled by this parameter.
+
+Pass a long, set to one of the values described below.
+.RS
+.TP 5
+.B CURL_NETRC_OPTIONAL
+The use of your \fI~/.netrc\fP file is optional,
+and information in the URL is to be preferred.  The file will be scanned
+with the host and user name (to find the password only) or with the host only,
+to find the first user name and password after that \fImachine\fP,
+which ever information is not specified in the URL.
+
+Undefined values of the option will have this effect.
+.TP     
+.B CURL_NETRC_IGNORED
+The library will ignore the file and use only the information in the URL.
+
+This is the default.
+.TP
+.B CURL_NETRC_REQUIRED
+This value tells the library that use of the file is required,
+to ignore the information in the URL,
+and to search the file with the host only.
+.RE
+.TP
+Only machine name, user name and password are taken into account 
+(init macros and similar things aren't supported).
+
+\fBNote:\fP libcurl does not verify that the file has the correct properties
+set (as the standard Unix ftp client does). It should only be readable by
+user.
+.TP
+.B CURLOPT_USERPWD
+Pass a char * as parameter, which should be [user name]:[password] to use for
+the connection. If both the colon and password is left out, you will be
+prompted for it while using a colon with no password will make libcurl use an
+empty password. \fICURLOPT_PASSWDFUNCTION\fP can be used to set your own
+prompt function.
+
+When using HTTP and CURLOPT_FOLLOWLOCATION, libcurl might perform several
+requests to possibly different hosts. libcurl will only send this user and
+password information to hosts using the initial host name, so if libcurl
+follows locations to other hosts it will not send the user and password to
+those. This is enforced to prevent accidental information leakage.
+.TP
+.B CURLOPT_PROXYUSERPWD
+Pass a char * as parameter, which should be [user name]:[password] to use for
+the connection to the HTTP proxy. If the password is left out, you will be
+prompted for it. \fICURLOPT_PASSWDFUNCTION\fP can be used to set your own
+prompt function.
+.PP
+.SH HTTP OPTIONS
+.TP 0.4i
+.B CURLOPT_ENCODING
+Sets the contents of the Accept-Encoding: header sent in an HTTP
+request, and enables decoding of a response when a Content-Encoding:
+header is received.  Three encodings are supported: \fIidentity\fP,
+which does nothing, \fIdeflate\fP which requests the server to
+compress its response using the zlib algorithm, and \fIgzip\fP which
+requests the gzip algorithm.  If a zero-length string is set, then an
+Accept-Encoding: header containing all supported encodings is sent.
+
+This is a request, not an order; the server may or may not do it.  This
+option must be set (to any non-NULL value) or else any unsolicited
+encoding done by the server is ignored. See the special file
+lib/README.encoding for details.
+.TP
+.B CURLOPT_FOLLOWLOCATION
+A non-zero parameter tells the library to follow any Location: header that the
+server sends as part of a HTTP header.
+
+\fBNOTE:\fP this means that the library will re-send the same request on the
+new location and follow new Location: headers all the way until no more such
+headers are returned. \fICURLOPT_MAXREDIRS\fP can be used to limit the number
+of redirects libcurl will follow.
+.TP
+.B CURLOPT_UNRESTRICTED_AUTH
+A non-zero parameter tells the library it can continue to send authentication
+(user+password) when following locations, even when hostname changed. Note
+that this is meaningful only when setting \fICURLOPT_FOLLOWLOCATION\fP.
+.TP
+.B CURLOPT_MAXREDIRS
+Pass a long. The set number will be the redirection limit. If that many
+redirections have been followed, the next redirect will cause an error
+(\fICURLE_TOO_MANY_REDIRECTS\fP). This option only makes sense if the
+\fICURLOPT_FOLLOWLOCATION\fP is used at the same time. (Added in 7.5)
+.TP
+.B CURLOPT_PUT
+A non-zero parameter tells the library to use HTTP PUT to transfer data. The
+data should be set with CURLOPT_READDATA and CURLOPT_INFILESIZE.
+.TP
+.B CURLOPT_POST
+A non-zero parameter tells the library to do a regular HTTP post. This is a
+normal application/x-www-form-urlencoded kind, which is the most commonly used
+one by HTML forms. See the CURLOPT_POSTFIELDS option for how to specify the
+data to post and CURLOPT_POSTFIELDSIZE in how to set the data size. Starting
+with libcurl 7.8, this option is obsolete. Using the CURLOPT_POSTFIELDS option
+will imply this option.
+.TP
+.B CURLOPT_POSTFIELDS
+Pass a char * as parameter, which should be the full data to post in a HTTP
+post operation. You need to make sure that the data is formatted the way you
+want the server to receive it. libcurl will not convert or encode it for
+you. Most web servers will assume this data to be url-encoded. Take note.
+
+This POST is a normal application/x-www-form-urlencoded kind (and libcurl will
+set that Content-Type by default when this option is used), which is the most
+commonly used one by HTML forms. See also the CURLOPT_POST. Using
+CURLOPT_POSTFIELDS implies CURLOPT_POST.
+
+\fBNote:\fP to make multipart/formdata posts (aka rfc1867-posts), check out
+the \fICURLOPT_HTTPPOST\fP option.
+.TP
+.B CURLOPT_POSTFIELDSIZE
+If you want to post data to the server without letting libcurl do a strlen()
+to measure the data size, this option must be used. When this option is used
+you can post fully binary data, which otherwise is likely to fail. If this
+size is set to zero, the library will use strlen() to get the size. (Added in
+libcurl 7.2)
+.TP
+.B CURLOPT_HTTPPOST
+Tells libcurl you want a multipart/formdata HTTP POST to be made and you
+instruct what data to pass on to the server.  Pass a pointer to a linked list
+of HTTP post structs as parameter.  The linked list should be a fully valid
+list of 'struct HttpPost' structs properly filled in. The best and most
+elegant way to do this, is to use \fIcurl_formadd(3)\fP as documented. The
+data in this list must remain intact until you close this curl handle again
+with \fIcurl_easy_cleanup(3)\fP.
+.TP
+.B CURLOPT_REFERER
+Pass a pointer to a zero terminated string as parameter. It will be used to
+set the Referer: header in the http request sent to the remote server. This
+can be used to fool servers or scripts. You can also set any custom header
+with \fICURLOPT_HTTPHEADER\fP.
+.TP
+.B CURLOPT_USERAGENT
+Pass a pointer to a zero terminated string as parameter. It will be used to
+set the User-Agent: header in the http request sent to the remote server. This
+can be used to fool servers or scripts. You can also set any custom header
+with \fICURLOPT_HTTPHEADER\fP.
+.TP
+.B CURLOPT_HTTPHEADER
+Pass a pointer to a linked list of HTTP headers to pass to the server in your
+HTTP request. The linked list should be a fully valid list of \fBstruct
+curl_slist\fP structs properly filled in. Use \fIcurl_slist_append(3)\fP to
+create the list and \fIcurl_slist_free_all(3)\fP to clean up an entire
+list. If you add a header that is otherwise generated and used by libcurl
+internally, your added one will be used instead. If you add a header with no
+contents as in 'Accept:' (no data on the right side of the colon), the
+internally used header will get disabled. Thus, using this option you can add
+new headers, replace internal headers and remove internal headers. The
+headers included in the linked list must not be CRLF-terminated, because
+curl adds CRLF after each header item. Failure to comply with this will
+result in strange bugs because the server will most likely ignore part
+of the headers you specified.
+
+\fBNOTE:\fPThe most commonly replaced headers have "shortcuts" in the options
+CURLOPT_COOKIE, CURLOPT_USERAGENT and CURLOPT_REFERER.
+.TP
+.B CURLOPT_HTTP200ALIASES
+Pass a pointer to a linked list of aliases to be treated as valid HTTP 200
+responses.  Some servers respond with a custom header response line.  For
+example, IceCast servers respond with "ICY 200 OK".  By including this string
+in your list of aliases, the response will be treated as a valid HTTP header
+line such as "HTTP/1.0 200 OK". (Added in 7.10.3)
+
+The linked list should be a fully valid list of struct curl_slist structs, and
+be properly filled in.  Use \fIcurl_slist_append(3)\fP to create the list and
+\fIcurl_slist_free_all(3)\fP to clean up an entire list.
+
+\fBNOTE:\fPThe alias itself is not parsed for any version strings.  So if your
+alias is "MYHTTP/9.9", Libcurl will not treat the server as responding with
+HTTP version 9.9.  Instead Libcurl will use the value set by option
+\fICURLOPT_HTTP_VERSION\fP.
+.TP
+.B CURLOPT_COOKIE
+Pass a pointer to a zero terminated string as parameter. It will be used to
+set a cookie in the http request. The format of the string should be
+NAME=CONTENTS, where NAME is the cookie name and CONTENTS is what the cookie
+should contain.
+
+If you need to set mulitple cookies, you need to set them all using a single
+option and thus you need to concat them all in one single string. Set multiple
+cookies in one string like this: "name1=content1; name2=content2;" etc.
+
+Using this option multiple times will only make the latest string override the
+previously ones.
+.TP
+.B CURLOPT_COOKIEFILE
+Pass a pointer to a zero terminated string as parameter. It should contain the
+name of your file holding cookie data to read. The cookie data may be in
+Netscape / Mozilla cookie data format or just regular HTTP-style headers
+dumped to a file.
+
+Given an empty or non-existing file, this option will enable cookies for this
+curl handle, making it understand and parse received cookies and then use
+matching cookies in future request.
+.TP
+.B CURLOPT_COOKIEJAR
+Pass a file name as char *, zero terminated. This will make libcurl write all
+internally known cookies to the specified file when \fIcurl_easy_cleanup(3)\fP
+is called. If no cookies are known, no file will be created. Specify "-" to
+instead have the cookies written to stdout. Using this option also enables
+cookies for this session, so if you for example follow a location it will make
+matching cookies get sent accordingly. (Added in 7.9)
+
+.B NOTE
+If the cookie jar file can't be created or written to (when the
+curl_easy_cleanup() is called), libcurl will not and cannot report an error
+for this. Using CURLOPT_VERBOSE or CURLOPT_DEBUGFUNCTION will get a warning to
+display, but that is the only visible feedback you get about this possibly
+lethal situation.
+.TP
+.B CURLOPT_TIMECONDITION
+Pass a long as parameter. This defines how the CURLOPT_TIMEVALUE time value is
+treated. You can set this parameter to TIMECOND_IFMODSINCE or
+TIMECOND_IFUNMODSINCE. This is a HTTP-only feature. (TBD)
+.TP
+.B CURLOPT_TIMEVALUE
+Pass a long as parameter. This should be the time in seconds since 1 jan 1970,
+and the time will be used in a condition as specified with
+CURLOPT_TIMECONDITION.
+.TP
+.B CURLOPT_HTTPGET
+Pass a long. If the long is non-zero, this forces the HTTP request to get back
+to GET. Only really usable if POST, PUT or a custom request have been used
+previously using the same curl handle. (Added in 7.8.1)
+.TP
+.B CURLOPT_HTTP_VERSION
+Pass a long, set to one of the values described below. They force libcurl to
+use the specific HTTP versions. This is not sensible to do unless you have a
+good reason.
+.RS
+.TP 5
+.B CURL_HTTP_VERSION_NONE
+We don't care about what version the library uses. libcurl will use whatever
+it thinks fit.
+.TP
+.B CURL_HTTP_VERSION_1_0
+Enforce HTTP 1.0 requests.
+.TP
+.B CURL_HTTP_VERSION_1_1
+Enforce HTTP 1.1 requests.
+.RE
+.PP
+.SH FTP OPTIONS
+.TP 0.4i
+.B CURLOPT_FTPPORT
+Pass a pointer to a zero terminated string as parameter. It will be used to
+get the IP address to use for the ftp PORT instruction. The PORT instruction
+tells the remote server to connect to our specified IP address. The string may
+be a plain IP address, a host name, an network interface name (under Unix) or
+just a '-' letter to let the library use your systems default IP
+address. Default FTP operations are passive, and thus won't use PORT.
+
+You disable PORT again and go back to using the passive version by setting
+this option to NULL.
+.TP
+.B CURLOPT_QUOTE
+Pass a pointer to a linked list of FTP commands to pass to the server prior to
+your ftp request. This will be done before any other FTP commands are issued
+(even before the CWD command). The linked list should be a fully valid list of
+'struct curl_slist' structs properly filled in. Use \fIcurl_slist_append(3)\fP
+to append strings (commands) to the list, and clear the entire list afterwards
+with \fIcurl_slist_free_all(3)\fP. Disable this operation again by setting a
+NULL to this option.
+.TP
+.B CURLOPT_POSTQUOTE
+Pass a pointer to a linked list of FTP commands to pass to the server after
+your ftp transfer request. The linked list should be a fully valid list of
+struct curl_slist structs properly filled in as described for
+\fICURLOPT_QUOTE\fP. Disable this operation again by setting a NULL to this
+option.
+.TP
+.B CURLOPT_PREQUOTE
+Pass a pointer to a linked list of FTP commands to pass to the server after
+the transfer type is set. The linked list should be a fully valid list of
+struct curl_slist structs properly filled in as described for
+\fICURLOPT_QUOTE\fP. Disable this operation again by setting a NULL to this
+option.
+.TP
+.B CURLOPT_FTPLISTONLY
+A non-zero parameter tells the library to just list the names of an ftp
+directory, instead of doing a full directory listing that would include file
+sizes, dates etc.
+
+This causes an FTP NLST command to be sent.  Beware that some FTP servers list
+only files in their response to NLST; they might not include subdirectories
+and symbolic links.
+.TP
+.B CURLOPT_FTPAPPEND
+A non-zero parameter tells the library to append to the remote file instead of
+overwrite it. This is only useful when uploading to a ftp site.
+.TP
+.B CURLOPT_FTP_USE_EPRT
+Pass a long. If the value is non-zero, it tells curl to use the EPRT (and
+LPRT) command when doing active FTP downloads (which is enabled by
+CURLOPT_FTPPORT). Using EPRT means that it will first attempt to use EPRT and
+then LPRT before using PORT, but if you pass FALSE (zero) to this option, it
+will not try using EPRT or LPRT, only plain PORT. (Added in 7.10.5)
+.TP
+.B CURLOPT_FTP_USE_EPSV
+Pass a long. If the value is non-zero, it tells curl to use the EPSV command
+when doing passive FTP downloads (which it always does by default). Using EPSV
+means that it will first attempt to use EPSV before using PASV, but if you
+pass FALSE (zero) to this option, it will not try using EPSV, only plain PASV.
+.PP
+.SH PROTOCOL OPTIONS
+.TP 0.4i
+.B CURLOPT_TRANSFERTEXT
+A non-zero parameter tells the library to use ASCII mode for ftp transfers,
+instead of the default binary transfer. For LDAP transfers it gets the data in
+plain text instead of HTML and for win32 systems it does not set the stdout to
+binary mode. This option can be usable when transferring text data between
+systems with different views on certain characters, such as newlines or
+similar.
+.TP
+.B CURLOPT_CRLF
+Convert Unix newlines to CRLF newlines on transfers.
+.TP
+.B CURLOPT_RANGE
+Pass a char * as parameter, which should contain the specified range you
+want. It should be in the format "X-Y", where X or Y may be left out. HTTP
+transfers also support several intervals, separated with commas as in
+\fI"X-Y,N-M"\fP. Using this kind of multiple intervals will cause the HTTP
+server to send the response document in pieces (using standard MIME separation
+techniques).
+.TP
+.B CURLOPT_RESUME_FROM
+Pass a long as parameter. It contains the offset in number of bytes that you
+want the transfer to start from.
+.TP
+.B CURLOPT_CUSTOMREQUEST
+Pass a pointer to a zero terminated string as parameter. It will be user
+instead of GET or HEAD when doing the HTTP request. This is useful for doing
+DELETE or other more or less obscure HTTP requests. Don't do this at will,
+make sure your server supports the command first.
+.TP
+.B CURLOPT_FILETIME
+Pass a long. If it is a non-zero value, libcurl will attempt to get the
+modification date of the remote document in this operation. This requires that
+the remote server sends the time or replies to a time querying command. The
+\fIcurl_easy_getinfo(3)\fP function with the \fICURLINFO_FILETIME\fP argument
+can be used after a transfer to extract the received time (if any). (Added in
+7.5)
+.TP
+.B CURLOPT_NOBODY
+A non-zero parameter tells the library to not include the body-part in the
+output. This is only relevant for protocols that have separate header and body
+parts.
+.TP
+.B CURLOPT_INFILESIZE
+When uploading a file to a remote site, this option should be used to tell
+libcurl what the expected size of the infile is.
+.TP
+.B CURLOPT_UPLOAD
+A non-zero parameter tells the library to prepare for an upload. The
+CURLOPT_READDATA and CURLOPT_INFILESIZE are also interesting for uploads.
+.PP
+.SH CONNECTION OPTIONS
+.TP 0.4i
+.B CURLOPT_TIMEOUT
+Pass a long as parameter containing the maximum time in seconds that you allow
+the libcurl transfer operation to take. Normally, name lookups can take a
+considerable time and limiting operations to less than a few minutes risk
+aborting perfectly normal operations. This option will cause curl to use the
+SIGALRM to enable time-outing system calls.
+
+\fBNOTE:\fP this is not recommended to use in unix multi-threaded programs, as
+it uses signals unless CURLOPT_NOSIGNAL (see above) is set.
+.TP
+.B CURLOPT_LOW_SPEED_LIMIT
+Pass a long as parameter. It contains the transfer speed in bytes per second
+that the transfer should be below during CURLOPT_LOW_SPEED_TIME seconds for
+the library to consider it too slow and abort.
+.TP
+.B CURLOPT_LOW_SPEED_TIME
+Pass a long as parameter. It contains the time in seconds that the transfer
+should be below the CURLOPT_LOW_SPEED_LIMIT for the library to consider it too
+slow and abort.
+.TP
+.B CURLOPT_MAXCONNECTS
+Pass a long. The set number will be the persistent connection cache size. The
+set amount will be the maximum amount of simultaneously open connections that
+libcurl may cache. Default is 5, and there isn't much point in changing this
+value unless you are perfectly aware of how this work and changes libcurl's
+behaviour. This concerns connection using any of the protocols that support
+persistent connections.
+
+When reaching the maximum limit, curl uses the \fICURLOPT_CLOSEPOLICY\fP to
+figure out which of the existing connections to close to prevent the number of
+open connections to increase.
+
+\fBNOTE:\fP if you already have performed transfers with this curl handle,
+setting a smaller MAXCONNECTS than before may cause open connections to get
+closed unnecessarily. (Added in 7.7)
+.TP
+.B CURLOPT_CLOSEPOLICY
+Pass a long. This option sets what policy libcurl should use when the
+connection cache is filled and one of the open connections has to be closed to
+make room for a new connection. This must be one of the CURLCLOSEPOLICY_*
+defines. Use \fICURLCLOSEPOLICY_LEAST_RECENTLY_USED\fP to make libcurl close
+the connection that was least recently used, that connection is also least
+likely to be capable of re-use. Use \fICURLCLOSEPOLICY_OLDEST\fP to make
+libcurl close the oldest connection, the one that was created first among the
+ones in the connection cache. The other close policies are not support
+yet. (Added in 7.7)
+.TP
+.B CURLOPT_FRESH_CONNECT
+Pass a long. Set to non-zero to make the next transfer use a new (fresh)
+connection by force. If the connection cache is full before this connection,
+one of the existing connections will be closed as according to the selected or
+default policy. This option should be used with caution and only if you
+understand what it does. Set this to 0 to have libcurl attempt re-using an
+existing connection (default behavior).  (Added in 7.7)
+.TP
+.B CURLOPT_FORBID_REUSE
+Pass a long. Set to non-zero to make the next transfer explicitly close the
+connection when done. Normally, libcurl keep all connections alive when done
+with one transfer in case there comes a succeeding one that can re-use them.
+This option should be used with caution and only if you understand what it
+does. Set to 0 to have libcurl keep the connection open for possibly later
+re-use (default behavior). (Added in 7.7)
+.TP
+.B CURLOPT_CONNECTTIMEOUT
+Pass a long. It should contain the maximum time in seconds that you allow the
+connection to the server to take.  This only limits the connection phase, once
+it has connected, this option is of no more use. Set to zero to disable
+connection timeout (it will then only timeout on the system's internal
+timeouts). See also the \fICURLOPT_TIMEOUT\fP option.
+
+\fBNOTE:\fP this is not recommended to use in unix multi-threaded programs, as
+it uses signals unless CURLOPT_NOSIGNAL (see above) is set.
+.PP
+.SH SSL and SECURITY OPTIONS
+.TP 0.4i
+.B CURLOPT_SSLCERT
+Pass a pointer to a zero terminated string as parameter. The string should be
+the file name of your certificate. The default format is "PEM" and can be
+changed with \fICURLOPT_SSLCERTTYPE\fP.
+.TP
+.B CURLOPT_SSLCERTTYPE
+Pass a pointer to a zero terminated string as parameter. The string should be
+the format of your certificate. Supported formats are "PEM" and "DER".  (Added
+in 7.9.3)
+.TP
+.B CURLOPT_SSLCERTPASSWD
+Pass a pointer to a zero terminated string as parameter. It will be used as
+the password required to use the CURLOPT_SSLCERT certificate. If the password
+is not supplied, you will be prompted for it. \fICURLOPT_PASSWDFUNCTION\fP can
+be used to set your own prompt function.
+
+\fBNOTE:\fPThis option is replaced by \fICURLOPT_SSLKEYPASSWD\fP and only
+cept for backward compatibility. You never needed a pass phrase to load
+a certificate but you need one to load your private key.
+.TP
+.B CURLOPT_SSLKEY
+Pass a pointer to a zero terminated string as parameter. The string should be
+the file name of your private key. The default format is "PEM" and can be
+changed with \fICURLOPT_SSLKEYTYPE\fP. (Added in 7.9.3)
+.TP
+.B CURLOPT_SSLKEYTYPE
+Pass a pointer to a zero terminated string as parameter. The string should be
+the format of your private key. Supported formats are "PEM", "DER" and "ENG".
+(Added in 7.9.3)
+
+\fBNOTE:\fPThe format "ENG" enables you to load the private key from a crypto
+engine. in this case \fICURLOPT_SSLKEY\fP is used as an identifier passed to
+the engine. You have to set the crypto engine with \fICURLOPT_SSL_ENGINE\fP.
+.TP
+.B CURLOPT_SSLKEYPASSWD
+Pass a pointer to a zero terminated string as parameter. It will be used as
+the password required to use the \fICURLOPT_SSLKEY\fP private key. If the
+password is not supplied, you will be prompted for
+it. \fICURLOPT_PASSWDFUNCTION\fP can be used to set your own prompt function.
+(Added in 7.9.3)
+.TP
+.B CURLOPT_SSL_ENGINE
+Pass a pointer to a zero terminated string as parameter. It will be used as
+the identifier for the crypto engine you want to use for your private
+key. (Added in 7.9.3)
+
+\fBNOTE:\fPIf the crypto device cannot be loaded,
+\fICURLE_SSL_ENGINE_NOTFOUND\fP is returned.
+.TP
+.B CURLOPT_SSL_ENGINEDEFAULT
+Sets the actual crypto engine as the default for (asymetric) crypto
+operations. (Added in 7.9.3)
+
+\fBNOTE:\fPIf the crypto device cannot be set,
+\fICURLE_SSL_ENGINE_SETFAILED\fP is returned.
+.TP
+.B CURLOPT_SSLVERSION
+Pass a long as parameter. Set what version of SSL to attempt to use, 2 or
+3. By default, the SSL library will try to solve this by itself although some
+servers make this difficult why you at times may have to use this option.
+.TP
+.B CURLOPT_SSL_VERIFYPEER
+Pass a long that is set to a zero value to stop curl from verifying the peer's
+certificate (7.10 starting setting this option to TRUE by default).  Alternate
+certificates to verify against can be specified with the CURLOPT_CAINFO option
+(Added in 7.4.2) or a certificate directory can be specified with the
+CURLOPT_CAPATH option (Added in 7.9.8).  As of 7.10, curl installs a default
+bundle.  CURLOPT_SSL_VERIFYHOST may also need to be set to 1 or 0 if
+CURLOPT_SSL_VERIFYPEER is disabled (it defaults to 2).
+.TP
+.B CURLOPT_CAINFO
+Pass a char * to a zero terminated string naming a file holding one or more
+certificates to verify the peer with. This only makes sense when used in
+combination with the CURLOPT_SSL_VERIFYPEER option. (Added in 7.4.2)
+.TP
+.B CURLOPT_CAPATH
+Pass a char * to a zero terminated string naming a directory holding multiple
+CA certificates to verify the peer with. The certificate directory must be
+prepared using the openssl c_rehash utility. This only makes sense when used
+in combination with the CURLOPT_SSL_VERIFYPEER option. The CAPATH function
+apparently does not work in Windows due to some limitation in openssl. (Added
+in 7.9.8)
+.TP
+.B CURLOPT_RANDOM_FILE
+Pass a char * to a zero terminated file name. The file will be used to read
+from to seed the random engine for SSL. The more random the specified file is,
+the more secure the SSL connection will become.
+.TP
+.B CURLOPT_EGDSOCKET
+Pass a char * to the zero terminated path name to the Entropy Gathering Daemon
+socket. It will be used to seed the random engine for SSL.
+.TP
+.B CURLOPT_SSL_VERIFYHOST
+Pass a long. Set if we should verify the Common name from the peer certificate
+in the SSL handshake, set 1 to check existence, 2 to ensure that it matches
+the provided hostname. This is by default set to 2. (Added in 7.8.1, default
+changed in 7.10)
+.TP
+.B CURLOPT_SSL_CIPHER_LIST
+Pass a char *, pointing to a zero terminated string holding the list of
+ciphers to use for the SSL connection. The list must be syntactly correct, it
+consists of one or more cipher strings separated by colons. Commas or spaces
+are also acceptable separators but colons are normally used, \!, \- and \+ can
+be used as operators. Valid examples of cipher lists include 'RC4-SHA',
+\'SHA1+DES\', 'TLSv1' and 'DEFAULT'. The default list is normally set when you
+compile OpenSSL.
+
+You'll find more details about cipher lists on this URL:
+\fIhttp://www.openssl.org/docs/apps/ciphers.html\fP
+.TP
+.B CURLOPT_KRB4LEVEL
+Pass a char * as parameter. Set the krb4 security level, this also enables
+krb4 awareness.  This is a string, 'clear', 'safe', 'confidential' or
+\&'private'.  If the string is set but doesn't match one of these, 'private'
+will be used. Set the string to NULL to disable kerberos4. The kerberos
+support only works for FTP. (Added in 7.3)
+.PP
+.SH OTHER OPTIONS
+.TP 0.4i
+.B CURLOPT_PRIVATE
+Pass a char * as parameter, pointing to data that should be associated with
+the curl handle.  The pointer can be subsequently retrieved using the
+CURLINFO_PRIVATE options to curl_easy_getinfo. (Added in 7.10.3)
+.PP
+.SH RETURN VALUE
+CURLE_OK (zero) means that the option was set properly, non-zero means an
+error occurred as \fI<curl/curl.h>\fP defines. See the \fIlibcurl-errors.3\fP
+man page for the full list with descriptions.
+.SH "SEE ALSO"
+.BR curl_easy_init "(3), " curl_easy_cleanup "(3), "
+.SH BUGS
+If you find any bugs, or just have questions, subscribe to one of the mailing
+lists and post. We won't bite.
+
diff --git a/main/source/curl/docs/libcurl/curl_easy_setopt.html b/main/source/curl/docs/libcurl/curl_easy_setopt.html
new file mode 100644
index 00000000..d998bd5f
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_easy_setopt.html
@@ -0,0 +1,1082 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_easy_setopt - set options for a curl easy handle
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       #include &lt;curl/curl.h&gt;
+
+       CURLcode curl_easy_setopt(CURL *handle, CURLoption option,
+       parameter);
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       curl_easy_setopt() is used to tell libcurl how to  behave.
+       By  using the appropriate options to <I>curl</I><B>_</B><I>easy</I><B>_</B><I>setopt</I>, you
+       can change libcurl's behavior.  All options are  set  with
+       the  <I>option</I> followed by a <I>parameter</I>. That parameter can be
+       a long, a function  pointer  or  an  object  pointer,  all
+       depending  on  what the specific option expects. Read this
+       manual carefully as bad input values may cause libcurl  to
+       behave  badly!   You can only set one option in each func-
+       tion   call.   A    typical    application    uses    many
+       curl_easy_setopt() calls in the setup phase.
+
+       <B>NOTE:</B>  strings  passed  to  libcurl as 'char *' arguments,
+       will not be copied by the library. Instead you should keep
+       them available until libcurl no longer needs them. Failing
+       to do so will cause very odd  behavior  or  even  crashes.
+       libcurl  will need them until you call curl_easy_cleanup()
+       or you set the  same  option  again  to  use  a  different
+       pointer.
+
+       <B>NOTE2:</B>  options  set with this function call are valid for
+       the forthcoming data transfers that are performed when you
+       invoke  <I>curl</I><B>_</B><I>easy</I><B>_</B><I>perform</I>.  The options are not in any way
+       reset between transfers, so if you want subsequent  trans-
+       fers  with different options, you must change them between
+       the transfers.
+
+       The <I>handle</I> is the return code from a <I>curl</I><B>_</B><I>easy</I><B>_</B><I>init(3)</I>  or
+       <I>curl</I><B>_</B><I>easy</I><B>_</B><I>duphandle(3)</I> call.
+
+
+</PRE>
+<H2>BEHAVIOR OPTIONS</H2><PRE>
+       <B>CURLOPT_VERBOSE</B>
+           Set  the  parameter  to non-zero to get the library to
+           display a lot of verbose information about its  opera-
+           tions.  Very useful for libcurl and/or protocol debug-
+           ging and understanding.
+
+           You hardly ever want this set in production  use,  you
+           will  almost  always  want  this when you debug/report
+           problems. Another neat option  for  debugging  is  the
+           <I>CURLOPT</I><B>_</B><I>DEBUGFUNCTION</I>.
+
+       <B>CURLOPT_HEADER</B>
+           A  non-zero parameter tells the library to include the
+           data (like HTTP).
+
+       <B>CURLOPT_NOPROGRESS</B>
+           A non-zero parameter tells the library to shut of  the
+           built-in progress meter completely.
+
+           <B>NOTE:</B> future versions of libcurl is likely to not have
+           any built-in progress meter at all.
+
+       <B>CURLOPT_NOSIGNAL</B>
+           Pass a long. If it is non-zero, libcurl will  not  use
+           any  functions  that  install  signal  handlers or any
+           functions that cause signals to be sent  to  the  pro-
+           cess.  This  option  is  mainly  here  to allow multi-
+           threaded unix applications to still set/use all  time-
+           out  options  etc,  without  risking  getting signals.
+           (Added in 7.10)
+
+
+
+</PRE>
+<H2>CALLBACK OPTIONS</H2><PRE>
+       <B>CURLOPT_WRITEFUNCTION</B>
+           Function pointer that should match the following  pro-
+           totype:  <B>size_t</B>  <B>function(</B>  <B>void</B>  <B>*ptr,</B>  <B>size_t</B>  <B>size,</B>
+           <B>size_t</B> <B>nmemb,</B> <B>void</B> <B>*stream);</B> This function gets called
+           by  libcurl  as  soon  as  there is data reveiced that
+           needs to be saved. The size of the data pointed to  by
+           <I>ptr</I> is <I>size</I> multiplied with <I>nmemb</I>, it will not be zero
+           terminated. Return the number of bytes actually  taken
+           care of. If that amount differs from the amount passed
+           to your function, it'll signal an error to the library
+           and   it   will   abort   the   transfer   and  return
+           <I>CURLE</I><B>_</B><I>WRITE</I><B>_</B><I>ERROR</I>.
+
+           Set the <I>stream</I> argument with the <B>CURLOPT_FILE</B>  option.
+
+           <B>NOTE:</B>  you  will be passed as much data as possible in
+           all invokes, but you cannot possibly make any  assump-
+           tions.  It  may  be one byte, it may be thousands. The
+           maximum amount of data that can be passed to the write
+           callback   is  defined  in  the  curl.h  header  file:
+           CURL_MAX_WRITE_SIZE.
+
+       <B>CURLOPT_WRITEDATA</B>
+           Data pointer to pass to the file write function.  Note
+           that if you specify the <I>CURLOPT</I><B>_</B><I>WRITEFUNCTION</I>, this is
+           the pointer you'll get as input. If you  don't  use  a
+           callback,  you  must  pass  a 'FILE *' as libcurl will
+           pass this to fwrite() when writing data.
+
+           <B>NOTE:</B> If you're using libcurl as a win32 DLL, you MUST
+           use  the  <I>CURLOPT</I><B>_</B><I>WRITEFUNCTION</I> if you set this option
+           or you will experience crashes.
+           <B>LOPT_FILE</B>,  the  name CURLOPT_WRITEDATA was introduced
+           in 7.9.7.
+
+       <B>CURLOPT_READFUNCTION</B>
+           Function pointer that should match the following  pro-
+           totype:  <B>size_t</B>  <B>function(</B>  <B>void</B>  <B>*ptr,</B>  <B>size_t</B>  <B>size,</B>
+           <B>size_t</B> <B>nmemb,</B> <B>void</B> <B>*stream);</B> This function gets called
+           by  libcurl  as soon as it needs to read data in order
+           to send it to the peer. The data area  pointed  at  by
+           the pointer <I>ptr</I> may be filled with at most <I>size</I> multi-
+           plied with <I>nmemb</I> number of bytes. Your  function  must
+           return  the  actual number of bytes that you stored in
+           that memory area. Returning 0 will signal  end-of-file
+           to the library and cause it to stop the current trans-
+           fer.
+
+       <B>CURLOPT_READDATA</B>
+           Data pointer to pass to the file read  function.  Note
+           that  if you specify the <I>CURLOPT</I><B>_</B><I>READFUNCTION</I>, this is
+           the pointer you'll get as input. If you don't  specify
+           a read callback, this must be a valid FILE *.
+
+           <B>NOTE:</B> If you're using libcurl as a win32 DLL, you MUST
+           use a <I>CURLOPT</I><B>_</B><I>READFUNCTION</I> if you set this option.
+
+           This option is also known with  the  older  name  <B>CUR-</B>
+           <B>LOPT_INFILE</B>,  the name CURLOPT_READDATA was introduced
+           in 7.9.7.
+
+       <B>CURLOPT_PROGRESSFUNCTION</B>
+           Function    pointer    that    should    match     the
+           <I>curl</I><B>_</B><I>progress</I><B>_</B><I>callback</I>      prototype     found     in
+           <I>&lt;curl/curl.h&gt;</I>. This function gets  called  by  libcurl
+           instead  of  its  internal  equivalent with a frequent
+           interval during data transfer.   Unknown/unused  argu-
+           ment  values  will  be  set  to zero (like if you only
+           download data, the upload size will remain 0). Return-
+           ing  a  non-zero  value  from this callback will cause
+           libcurl   to   abort   the   transfer    and    return
+           <I>CURLE</I><B>_</B><I>ABORTED</I><B>_</B><I>BY</I><B>_</B><I>CALLBACK</I>.
+
+           Also note that <I>CURLOPT</I><B>_</B><I>NOPROGRESS</I> must be set to FALSE
+           to make this function actually get called.
+
+       <B>CURLOPT_PROGRESSDATA</B>
+           Pass a pointer that will be untouched by  libcurl  and
+           passed  as the first argument in the progress callback
+           set with <I>CURLOPT</I><B>_</B><I>PROGRESSFUNCTION</I>.
+
+       <B>CURLOPT_PASSWDFUNCTION</B>
+           Pass a pointer to a <I>curl</I><B>_</B><I>passwd</I><B>_</B><I>callback</I> function that
+           will  be called instead of the internal one if libcurl
+           <B>char*</B> <B>buffer,</B> <B>int</B> <B>buflen</B> <B>);</B>.  If set to NULL, it  sets
+           back  the function to the internal default one. If the
+           function returns a non-zero value, it will  abort  the
+           operation  and  an  error (CURLE_BAD_PASSWORD_ENTERED)
+           will be returned.  <I>client</I> is a  generic  pointer,  see
+           <I>CURLOPT</I><B>_</B><I>PASSWDDATA</I>.    <I>prompt</I>   is  a  zero-terminated
+           string that is text that prefixes the  input  request.
+           <I>buffer</I> is a pointer to data where the entered password
+           should be stored and <I>buflen</I> is the maximum  number  of
+           bytes  that  may  be written in the buffer.  (Added in
+           7.4.2)
+
+       <B>CURLOPT_PASSWDDATA</B>
+           Pass a void * to whatever data you  want.  The  passed
+           pointer  will  be  the  first  argument  sent  to  the
+           specifed <I>CURLOPT</I><B>_</B><I>PASSWDFUNCTION</I>  function.  (Added  in
+           7.4.2)
+
+       <B>CURLOPT_HEADERFUNCTION</B>
+           Function  pointer that should match the following pro-
+           totype:  <I>size</I><B>_</B><I>t</I>  <I>function(</I>  <I>void</I>  <I>*ptr,</I>  <I>size</I><B>_</B><I>t</I>  <I>size,</I>
+           <I>size</I><B>_</B><I>t</I>  <I>nmemb,</I>  <I>void</I>  <I>*stream);</I>.  This  function  gets
+           called by libcurl as soon as there is received  header
+           data  that  needs  to be written down. The headers are
+           guaranteed to be written one-by-one and only  complete
+           lines  are  written.  Parsing  headers  should be easy
+           enough using this. The size of the data pointed to  by
+           <I>ptr</I>  is <I>size</I> multiplied with <I>nmemb</I>.  The pointer named
+           <I>stream</I> will be the one you passed to libcurl with  the
+           <I>CURLOPT</I><B>_</B><I>WRITEHEADER</I>  option.   Return  the  number  of
+           bytes actually written or return -1 to signal error to
+           the  library  (it  will cause it to abort the transfer
+           with  a  <I>CURLE</I><B>_</B><I>WRITE</I><B>_</B><I>ERROR</I>  return  code).  (Added  in
+           7.7.2)
+
+       <B>CURLOPT_WRITEHEADER</B>
+           Pass  a pointer to be used to write the header part of
+           the received data to. If you don't use your own  call-
+           back to take care of the writing, this must be a valid
+           FILE *. See  also  the  <I>CURLOPT</I><B>_</B><I>HEADERFUNCTION</I>  option
+           above on how to set a custom get-all-headers callback.
+
+       <B>CURLOPT_DEBUGFUNCTION</B>
+           Function pointer that should match the following  pro-
+           totype:  <I>int</I>  <I>curl</I><B>_</B><I>debug</I><B>_</B><I>callback</I>  <I>(CURL</I> <I>*,</I> <I>curl</I><B>_</B><I>info-</I>
+           <I>type,</I> <I>char</I> <I>*,</I> <I>size</I><B>_</B><I>t,</I>  <I>void</I>  <I>*);</I>  This  function  will
+           receive   debug   information  if  CURLOPT_VERBOSE  is
+           enabled. The  curl_infotype  argument  specifies  what
+           kind of information it is. This funtion must return 0.
+
+           NOTE: the data pointed to by the char * passed to this
+           function  WILL  NOT  be  zero  terminated, but will be
+           Pass a pointer to whatever you want passed in to  your
+           CURLOPT_DEBUGFUNCTION  in  the  last  void * argument.
+           This pointer is not used by libcurl, it is only passed
+           to the callback.
+
+
+
+</PRE>
+<H2>ERROR OPTIONS</H2><PRE>
+       <B>CURLOPT_ERRORBUFFER</B>
+           Pass  a  char * to a buffer that the libcurl may store
+           human readable error messages in.  This  may  be  more
+           helpful  than  just  the return code from the library.
+           The buffer must be at least CURL_ERROR_SIZE big.
+
+           Use <I>CURLOPT</I><B>_</B><I>VERBOSE</I> and <I>CURLOPT</I><B>_</B><I>DEBUGFUNCTION</I> to  bet-
+           ter debug/trace why errors happen.
+
+           <B>Note:</B>  if  the  library  does not return an error, the
+           buffer may not have been touched. Do not rely  on  the
+           contents in those cases.
+
+       <B>CURLOPT_STDERR</B>
+           Pass  a FILE * as parameter. This is the stream to use
+           instead of stderr internally when reporting errors.
+
+       <B>CURLOPT_FAILONERROR</B>
+           A  non-zero  parameter  tells  the  library  to   fail
+           silently  if  the  HTTP  code  returned is equal to or
+           larger than 300. The default action would be to return
+           the page normally, ignoring that code.
+
+
+
+</PRE>
+<H2>NETWORK OPTIONS</H2><PRE>
+       <B>CURLOPT_URL</B>
+           The actual URL to deal with. The parameter should be a
+           char * to a zero terminated string.  The  string  must
+           remain  present  until  curl no longer needs it, as it
+           doesn't copy the string.
+
+           <B>NOTE:</B> this option is (the only one) required to be set
+           before <I>curl</I><B>_</B><I>easy</I><B>_</B><I>perform(3)</I> is called.
+
+       <B>CURLOPT_PROXY</B>
+           Set  HTTP proxy to use. The parameter should be a char
+           * to a zero terminated string holding the host name or
+           dotted  IP  address.  To  specify  port number in this
+           string, append :[port] to the end of  the  host  name.
+           The  proxy  string  may be prefixed with [protocol]://
+           since any such prefix will  be  ignored.  The  proxy's
+           port number may optionally be specified with the sepa-
+           rate option <I>CURLOPT</I><B>_</B><I>PROXYPORT</I>.
+
+           <B>NOTE:</B> when you tell the library to use a  HTTP  proxy,
+           impact  on  what other features of the library you can
+           use, such as CURLOPT_QUOTE and similar  FTP  specifics
+           that  don't  work  unless  you tunnel through the HTTP
+           proxy. Such tunneling is activated with  <I>CURLOPT</I><B>_</B><I>HTTP-</I>
+           <I>PROXYTUNNEL</I>.
+
+           <B>NOTE2:</B>  libcurl  respects  the  environment  variables
+           <B>http_proxy</B>, <B>ftp_proxy</B>, <B>all_proxy</B> etc, if any of  those
+           is set.
+
+       <B>CURLOPT_PROXYPORT</B>
+           Pass  a long with this option to set the proxy port to
+           connect to unless it is specified in the proxy  string
+           <I>CURLOPT</I><B>_</B><I>PROXY</I>.
+
+       <B>CURLOPT_PROXYTYPE</B>
+           Pass a long with this option to set type of the proxy.
+           Available options  for  this  are  CURLPROXY_HTTP  and
+           CURLPROXY_SOCKS5,  with  the  HTTP  one being default.
+           (Added in 7.10)
+
+       <B>CURLOPT_HTTPPROXYTUNNEL</B>
+           Set the parameter to non-zero to get  the  library  to
+           tunnel all operations through a given HTTP proxy. Note
+           that there is a big difference between using  a  proxy
+           and  to tunnel through it. If you don't know what this
+           means, you probably don't want this tunneling  option.
+           (Added in 7.3)
+
+       <B>CURLOPT_INTERFACE</B>
+           Pass  a  char  *  as parameter. This set the interface
+           name to use as outgoing network  interface.  The  name
+           can  be  an  interface  name,  an IP address or a host
+           name. (Added in 7.3)
+
+       <B>CURLOPT_DNS_CACHE_TIMEOUT</B>
+           Pass a long, this sets the timeout  in  seconds.  Name
+           resolves  will  be  kept  in memory for this number of
+           seconds.  Set  to  zero  (0)  to  completely   disable
+           caching,  or  set  to  -1  to  make the cached entries
+           remain forever. By default, libcurl caches info for 60
+           seconds. (Added in 7.9.3)
+
+       <B>CURLOPT_DNS_USE_GLOBAL_CACHE</B>
+           Pass  a  long. If the value is non-zero, it tells curl
+           to use a global DNS cache that  will  survive  between
+           easy  handle  creations  and  deletions.  This  is not
+           thread-safe and this will use a global varible. (Added
+           in 7.9.3)
+
+       <B>CURLOPT_BUFFERSIZE</B>
+           Pass  a  long  specifying  your  prefered size for the
+           often and with smaller chunks. This is just treated as
+           a  request,  not an order. You cannot be guaranteed to
+           actually get the given size. (Added in 7.10)
+
+
+
+</PRE>
+<H2>NAMES and PASSWORDS OPTIONS</H2><PRE>
+       <B>CURLOPT_NETRC</B>
+           This parameter  controls  the  preference  of  libcurl
+           between  using  user  names  and  passwords  from your
+           <I>~/.netrc</I> file, relative to user names and passwords in
+           the URL supplied with <I>CURLOPT</I><B>_</B><I>URL</I>.
+
+           <B>Note:</B>  libcurl  uses  a  user  name  (and  supplied or
+           prompted password) supplied  with  <I>CURLOPT</I><B>_</B><I>USERPWD</I>  in
+           preference  to  any  of the options controlled by this
+           parameter.
+
+           Pass a long, set to one of the values described below.
+
+           <B>CURL_NETRC_OPTIONAL</B>
+                The  use  of  your <I>~/.netrc</I> file is optional, and
+                information in the URL is to be  preferred.   The
+                file  will be scanned with the host and user name
+                (to find the password  only)  or  with  the  host
+                only,  to  find  the first user name and password
+                after that <I>machine</I>, which ever information is not
+                specified in the URL.
+
+                Undefined  values  of  the  option will have this
+                effect.
+
+           <B>CURL_NETRC_IGNORED</B>
+                The library will ignore the file and use only the
+                information in the URL.
+
+                This is the default.
+
+           <B>CURL_NETRC_REQUIRED</B>
+                This value tells the library that use of the file
+                is required, to ignore  the  information  in  the
+                URL, and to search the file with the host only.
+
+       Only machine name, user name and password are taken into
+           account
+           (init macros and similar things aren't supported).
+
+           <B>Note:</B> libcurl does not verify that the  file  has  the
+           correct  properties  set  (as  the  standard  Unix ftp
+           client does). It should only be readable by user.
+
+       <B>CURLOPT_USERPWD</B>
+           Pass a char * as  parameter,  which  should  be  [user
+           prompted  for  it while using a colon with no password
+           will make libcurl use an empty password. <I>CURLOPT</I><B>_</B><I>PASS-</I>
+           <I>WDFUNCTION</I>  can  be  used to set your own prompt func-
+           tion.
+
+           When using HTTP  and  CURLOPT_FOLLOWLOCATION,  libcurl
+           might  perform  several requests to possibly different
+           hosts. libcurl will only send this user  and  password
+           information  to  hosts using the initial host name, so
+           if libcurl follows locations to other  hosts  it  will
+           not  send  the  user  and  password  to those. This is
+           enforced to prevent accidental information leakage.
+
+       <B>CURLOPT_PROXYUSERPWD</B>
+           Pass a char * as  parameter,  which  should  be  [user
+           name]:[password] to use for the connection to the HTTP
+           proxy. If the  password  is  left  out,  you  will  be
+           prompted for it. <I>CURLOPT</I><B>_</B><I>PASSWDFUNCTION</I> can be used to
+           set your own prompt function.
+
+
+
+</PRE>
+<H2>HTTP OPTIONS</H2><PRE>
+       <B>CURLOPT_ENCODING</B>
+           Sets the contents of the Accept-Encoding: header  sent
+           in an HTTP request, and enables decoding of a response
+           when a Content-Encoding: header  is  received.   Three
+           encodings are supported: <I>identity</I>, which does nothing,
+           <I>deflate</I> which requests  the  server  to  compress  its
+           response  using  the  zlib  algorithm,  and <I>gzip</I> which
+           requests the gzip algorithm.  If a zero-length  string
+           is set, then an Accept-Encoding: header containing all
+           supported encodings is sent.
+
+           This is a request, not an order; the server may or may
+           not  do  it.  This option must be set (to any non-NULL
+           value) or else any unsolicited encoding  done  by  the
+           server    is    ignored.    See   the   special   file
+           lib/README.encoding for details.
+
+       <B>CURLOPT_FOLLOWLOCATION</B>
+           A non-zero parameter tells the library to  follow  any
+           Location:  header  that  the server sends as part of a
+           HTTP header.
+
+           <B>NOTE:</B> this means that the  library  will  re-send  the
+           same  request on the new location and follow new Loca-
+           tion: headers all the way until no more  such  headers
+           are  returned.  <I>CURLOPT</I><B>_</B><I>MAXREDIRS</I> can be used to limit
+           the number of redirects libcurl will follow.
+
+       <B>CURLOPT_UNRESTRICTED_AUTH</B>
+           A non-zero parameter tells the library it can continue
+           is  meaningful  only  when setting <I>CURLOPT</I><B>_</B><I>FOLLOWLOCA-</I>
+           <I>TION</I>.
+
+       <B>CURLOPT_MAXREDIRS</B>
+           Pass a long. The set number will  be  the  redirection
+           limit.  If  that many redirections have been followed,
+           the   next    redirect    will    cause    an    error
+           (<I>CURLE</I><B>_</B><I>TOO</I><B>_</B><I>MANY</I><B>_</B><I>REDIRECTS</I>).  This  option  only  makes
+           sense if the <I>CURLOPT</I><B>_</B><I>FOLLOWLOCATION</I>  is  used  at  the
+           same time. (Added in 7.5)
+
+       <B>CURLOPT_PUT</B>
+           A non-zero parameter tells the library to use HTTP PUT
+           to transfer data. The data should  be  set  with  CUR-
+           LOPT_READDATA and CURLOPT_INFILESIZE.
+
+       <B>CURLOPT_POST</B>
+           A non-zero parameter tells the library to do a regular
+           HTTP post. This is  a  normal  application/x-www-form-
+           urlencoded  kind,  which is the most commonly used one
+           by HTML forms. See the CURLOPT_POSTFIELDS  option  for
+           how to specify the data to post and CURLOPT_POSTFIELD-
+           SIZE in how  to  set  the  data  size.  Starting  with
+           libcurl  7.8,  this option is obsolete. Using the CUR-
+           LOPT_POSTFIELDS option will imply this option.
+
+       <B>CURLOPT_POSTFIELDS</B>
+           Pass a char * as parameter, which should be  the  full
+           data  to  post  in  a HTTP post operation. You need to
+           make sure that the data is formatted the way you  want
+           the  server to receive it. libcurl will not convert or
+           encode it for you. Most web servers will  assume  this
+           data to be url-encoded. Take note.
+
+           This  POST  is  a normal application/x-www-form-urlen-
+           coded kind (and libcurl will set that Content-Type  by
+           default  when  this option is used), which is the most
+           commonly used one by HTML forms.  See  also  the  CUR-
+           LOPT_POST.   Using   CURLOPT_POSTFIELDS  implies  CUR-
+           LOPT_POST.
+
+           <B>Note:</B>   to   make   multipart/formdata   posts    (aka
+           rfc1867-posts), check out the <I>CURLOPT</I><B>_</B><I>HTTPPOST</I> option.
+
+       <B>CURLOPT_POSTFIELDSIZE</B>
+           If you want to post data to the server without letting
+           libcurl  do  a strlen() to measure the data size, this
+           option must be used. When this option is used you  can
+           post  fully  binary data, which otherwise is likely to
+           fail. If this size is set to zero,  the  library  will
+           use strlen() to get the size. (Added in libcurl 7.2)
+
+           Tells  libcurl you want a multipart/formdata HTTP POST
+           to be made and you instruct what data to  pass  on  to
+           the  server.   Pass a pointer to a linked list of HTTP
+           post structs as parameter.  The linked list should  be
+           a  fully valid list of 'struct HttpPost' structs prop-
+           erly filled in. The best and most elegant  way  to  do
+           this,  is  to  use  <I>curl</I><B>_</B><I>formadd(3)</I> as documented. The
+           data in this list must remain intact until  you  close
+           this curl handle again with <I>curl</I><B>_</B><I>easy</I><B>_</B><I>cleanup(3)</I>.
+
+       <B>CURLOPT_REFERER</B>
+           Pass  a pointer to a zero terminated string as parame-
+           ter. It will be used to set the Referer: header in the
+           http  request  sent  to the remote server. This can be
+           used to fool servers or scripts. You can also set  any
+           custom header with <I>CURLOPT</I><B>_</B><I>HTTPHEADER</I>.
+
+       <B>CURLOPT_USERAGENT</B>
+           Pass  a pointer to a zero terminated string as parame-
+           ter. It will be used to set the User-Agent: header  in
+           the  http  request sent to the remote server. This can
+           be used to fool servers or scripts. You can  also  set
+           any custom header with <I>CURLOPT</I><B>_</B><I>HTTPHEADER</I>.
+
+       <B>CURLOPT_HTTPHEADER</B>
+           Pass  a  pointer  to  a linked list of HTTP headers to
+           pass to the server in your HTTP  request.  The  linked
+           list should be a fully valid list of <B>struct</B> <B>curl_slist</B>
+           structs properly filled in.  Use  <I>curl</I><B>_</B><I>slist</I><B>_</B><I>append(3)</I>
+           to create the list and <I>curl</I><B>_</B><I>slist</I><B>_</B><I>free</I><B>_</B><I>all(3)</I> to clean
+           up an entire list. If you add a header that is  other-
+           wise  generated  and  used by libcurl internally, your
+           added one will be used instead. If you  add  a  header
+           with no contents as in 'Accept:' (no data on the right
+           side of the colon), the internally  used  header  will
+           get  disabled. Thus, using this option you can add new
+           headers, replace internal headers and remove  internal
+           headers.  The headers included in the linked list must
+           not be CRLF-terminated, because curl adds  CRLF  after
+           each  header  item.  Failure  to comply with this will
+           result in strange bugs because the  server  will  most
+           likely ignore part of the headers you specified.
+
+           <B>NOTE:</B>The  most  commonly replaced headers have "short-
+           cuts" in the options CURLOPT_COOKIE, CURLOPT_USERAGENT
+           and CURLOPT_REFERER.
+
+       <B>CURLOPT_HTTP200ALIASES</B>
+           Pass  a  pointer  to  a  linked  list of aliases to be
+           treated as valid HTTP  200  responses.   Some  servers
+           respond with a custom header response line.  For exam-
+           ple, IceCast servers respond with "ICY  200  OK".   By
+           such as "HTTP/1.0 200 OK". (Added in 7.10.3)
+
+           The linked list should be a fully valid list of struct
+           curl_slist structs, and be properly  filled  in.   Use
+           <I>curl</I><B>_</B><I>slist</I><B>_</B><I>append(3)</I>    to   create   the   list   and
+           <I>curl</I><B>_</B><I>slist</I><B>_</B><I>free</I><B>_</B><I>all(3)</I> to clean up an entire list.
+
+           <B>NOTE:</B>The alias itself is not parsed  for  any  version
+           strings.   So  if  your alias is "MYHTTP/9.9", Libcurl
+           will not treat the server as responding with HTTP ver-
+           sion  9.9.   Instead Libcurl will use the value set by
+           option <I>CURLOPT</I><B>_</B><I>HTTP</I><B>_</B><I>VERSION</I>.
+
+       <B>CURLOPT_COOKIE</B>
+           Pass a pointer to a zero terminated string as  parame-
+           ter.  It  will  be  used  to  set a cookie in the http
+           request. The format of the string should be  NAME=CON-
+           TENTS,  where  NAME is the cookie name and CONTENTS is
+           what the cookie should contain.
+
+           If you need to set mulitple cookies, you need  to  set
+           them  all  using  a single option and thus you need to
+           concat them all in one  single  string.  Set  multiple
+           cookies  in  one  string  like  this: "name1=content1;
+           name2=content2;" etc.
+
+           Using this option multiple times will  only  make  the
+           latest string override the previously ones.
+
+       <B>CURLOPT_COOKIEFILE</B>
+           Pass  a pointer to a zero terminated string as parame-
+           ter. It should contain the name of your  file  holding
+           cookie  data  to  read.  The  cookie  data  may  be in
+           Netscape / Mozilla cookie data format or just  regular
+           HTTP-style headers dumped to a file.
+
+           Given  an empty or non-existing file, this option will
+           enable cookies for this curl handle, making it  under-
+           stand and parse received cookies and then use matching
+           cookies in future request.
+
+       <B>CURLOPT_COOKIEJAR</B>
+           Pass a file name as char *, zero terminated. This will
+           make libcurl write all internally known cookies to the
+           specified file when <I>curl</I><B>_</B><I>easy</I><B>_</B><I>cleanup(3)</I> is called. If
+           no cookies are known, no file will be created. Specify
+           "-" to instead have the  cookies  written  to  stdout.
+           Using  this  option also enables cookies for this ses-
+           sion, so if you for example follow a location it  will
+           make  matching cookies get sent accordingly. (Added in
+           7.9)
+
+           libcurl will not and cannot report an error for  this.
+           Using  CURLOPT_VERBOSE  or  CURLOPT_DEBUGFUNCTION will
+           get a warning to display, but that is the only visible
+           feedback you get about this possibly lethal situation.
+
+       <B>CURLOPT_TIMECONDITION</B>
+           Pass a long as parameter. This defines  how  the  CUR-
+           LOPT_TIMEVALUE time value is treated. You can set this
+           parameter  to  TIMECOND_IFMODSINCE  or  TIMECOND_IFUN-
+           MODSINCE. This is a HTTP-only feature. (TBD)
+
+       <B>CURLOPT_TIMEVALUE</B>
+           Pass  a  long as parameter. This should be the time in
+           seconds since 1 jan 1970, and the time will be used in
+           a condition as specified with CURLOPT_TIMECONDITION.
+
+       <B>CURLOPT_HTTPGET</B>
+           Pass  a long. If the long is non-zero, this forces the
+           HTTP request to get back to GET. Only really usable if
+           POST,  PUT  or  a custom request have been used previ-
+           ously using the same curl handle. (Added in 7.8.1)
+
+       <B>CURLOPT_HTTP_VERSION</B>
+           Pass a long, set to one of the values described below.
+           They  force libcurl to use the specific HTTP versions.
+           This is not sensible to do unless you have a good rea-
+           son.
+
+           <B>CURL_HTTP_VERSION_NONE</B>
+                We  don't  care  about  what  version the library
+                uses. libcurl will use whatever it thinks fit.
+
+           <B>CURL_HTTP_VERSION_1_0</B>
+                Enforce HTTP 1.0 requests.
+
+           <B>CURL_HTTP_VERSION_1_1</B>
+                Enforce HTTP 1.1 requests.
+
+
+
+</PRE>
+<H2>FTP OPTIONS</H2><PRE>
+       <B>CURLOPT_FTPPORT</B>
+           Pass a pointer to a zero terminated string as  parame-
+           ter.  It will be used to get the IP address to use for
+           the ftp PORT instruction. The PORT  instruction  tells
+           the  remote  server  to  connect  to  our specified IP
+           address. The string may be a plain IP address, a  host
+           name, an network interface name (under Unix) or just a
+           '-' letter to let the library use your systems default
+           IP  address.  Default  FTP operations are passive, and
+           thus won't use PORT.
+
+           You disable PORT again and go back to using  the  pas-
+           Pass  a  pointer  to  a linked list of FTP commands to
+           pass to the server prior to  your  ftp  request.  This
+           will  be done before any other FTP commands are issued
+           (even before the CWD command). The linked list  should
+           be  a fully valid list of to append strings (commands)
+           to the list, and clear the entire list afterwards with
+           <I>curl</I><B>_</B><I>slist</I><B>_</B><I>free</I><B>_</B><I>all(3)</I>.  Disable  this operation again
+           by setting a NULL to this option.
+
+       <B>CURLOPT_POSTQUOTE</B>
+           Pass a pointer to a linked list  of  FTP  commands  to
+           pass  to  the  server after your ftp transfer request.
+           The linked list should be a fully valid list of struct
+           curl_slist structs properly filled in as described for
+           <I>CURLOPT</I><B>_</B><I>QUOTE</I>. Disable this operation again by setting
+           a NULL to this option.
+
+       <B>CURLOPT_PREQUOTE</B>
+           Pass  a  pointer  to  a linked list of FTP commands to
+           pass to the server after the transfer type is set. The
+           linked  list  should  be  a fully valid list of struct
+           curl_slist structs properly filled in as described for
+           <I>CURLOPT</I><B>_</B><I>QUOTE</I>. Disable this operation again by setting
+           a NULL to this option.
+
+       <B>CURLOPT_FTPLISTONLY</B>
+           A non-zero parameter tells the library  to  just  list
+           the names of an ftp directory, instead of doing a full
+           directory listing that would include file sizes, dates
+           etc.
+
+           This  causes  an  FTP NLST command to be sent.  Beware
+           that  some  FTP  servers  list  only  files  in  their
+           response  to  NLST; they might not include subdirecto-
+           ries and symbolic links.
+
+       <B>CURLOPT_FTPAPPEND</B>
+           A non-zero parameter tells the library  to  append  to
+           the  remote file instead of overwrite it. This is only
+           useful when uploading to a ftp site.
+
+       <B>CURLOPT_FTP_USE_EPRT</B>
+           Pass a long. If the value is non-zero, it  tells  curl
+           to  use  the EPRT (and LPRT) command when doing active
+           FTP downloads (which is enabled  by  CURLOPT_FTPPORT).
+           Using  EPRT  means  that  it will first attempt to use
+           EPRT and then LPRT before using PORT, but if you  pass
+           FALSE  (zero)  to  this  option, it will not try using
+           EPRT or LPRT, only plain PORT. (Added in 7.10.5)
+
+       <B>CURLOPT_FTP_USE_EPSV</B>
+           Pass a long. If the value is non-zero, it  tells  curl
+           EPSV  means  that  it  will  first attempt to use EPSV
+           before using PASV, but if you  pass  FALSE  (zero)  to
+           this  option,  it  will not try using EPSV, only plain
+           PASV.
+
+
+
+</PRE>
+<H2>PROTOCOL OPTIONS</H2><PRE>
+       <B>CURLOPT_TRANSFERTEXT</B>
+           A non-zero parameter tells the library  to  use  ASCII
+           mode  for ftp transfers, instead of the default binary
+           transfer. For LDAP transfers it gets the data in plain
+           text instead of HTML and for win32 systems it does not
+           set the stdout to binary  mode.  This  option  can  be
+           usable  when  transferring  text  data between systems
+           with different views on certain  characters,  such  as
+           newlines or similar.
+
+       <B>CURLOPT_CRLF</B>
+           Convert Unix newlines to CRLF newlines on transfers.
+
+       <B>CURLOPT_RANGE</B>
+           Pass  a  char * as parameter, which should contain the
+           specified range you want. It should be in  the  format
+           "X-Y",  where  X  or Y may be left out. HTTP transfers
+           also support several intervals, separated with  commas
+           as in <I>"X-Y,N-M"</I>. Using this kind of multiple intervals
+           will cause the HTTP server to send the response  docu-
+           ment  in  pieces (using standard MIME separation tech-
+           niques).
+
+       <B>CURLOPT_RESUME_FROM</B>
+           Pass a long as parameter. It contains  the  offset  in
+           number  of  bytes  that you want the transfer to start
+           from.
+
+       <B>CURLOPT_CUSTOMREQUEST</B>
+           Pass a pointer to a zero terminated string as  parame-
+           ter. It will be user instead of GET or HEAD when doing
+           the HTTP request. This is useful for doing  DELETE  or
+           other  more  or  less  obscure HTTP requests. Don't do
+           this at will, make sure your server supports the  com-
+           mand first.
+
+       <B>CURLOPT_FILETIME</B>
+           Pass  a  long. If it is a non-zero value, libcurl will
+           attempt to get the modification  date  of  the  remote
+           document  in  this  operation.  This requires that the
+           remote server sends the time  or  replies  to  a  time
+           querying  command.  The  <I>curl</I><B>_</B><I>easy</I><B>_</B><I>getinfo(3)</I> function
+           with the <I>CURLINFO</I><B>_</B><I>FILETIME</I> argument can be used  after
+           a  transfer  to  extract  the  received time (if any).
+           (Added in 7.5)
+           A non-zero parameter tells the library to not  include
+           the body-part in the output. This is only relevant for
+           protocols that have separate header and body parts.
+
+       <B>CURLOPT_INFILESIZE</B>
+           When uploading a file to a remote  site,  this  option
+           should  be used to tell libcurl what the expected size
+           of the infile is.
+
+       <B>CURLOPT_UPLOAD</B>
+           A non-zero parameter tells the library to prepare  for
+           an upload. The CURLOPT_READDATA and CURLOPT_INFILESIZE
+           are also interesting for uploads.
+
+
+
+</PRE>
+<H2>CONNECTION OPTIONS</H2><PRE>
+       <B>CURLOPT_TIMEOUT</B>
+           Pass a long as parameter containing the  maximum  time
+           in  seconds that you allow the libcurl transfer opera-
+           tion to take. Normally, name lookups can take  a  con-
+           siderable  time and limiting operations to less than a
+           few minutes risk aborting perfectly normal operations.
+           This  option  will  cause  curl  to use the SIGALRM to
+           enable time-outing system calls.
+
+           <B>NOTE:</B> this is not recommended to use  in  unix  multi-
+           threaded  programs,  as  it  uses  signals unless CUR-
+           LOPT_NOSIGNAL (see above) is set.
+
+       <B>CURLOPT_LOW_SPEED_LIMIT</B>
+           Pass a long as parameter.  It  contains  the  transfer
+           speed  in bytes per second that the transfer should be
+           below during CURLOPT_LOW_SPEED_TIME  seconds  for  the
+           library to consider it too slow and abort.
+
+       <B>CURLOPT_LOW_SPEED_TIME</B>
+           Pass a long as parameter. It contains the time in sec-
+           onds that  the  transfer  should  be  below  the  CUR-
+           LOPT_LOW_SPEED_LIMIT  for  the  library to consider it
+           too slow and abort.
+
+       <B>CURLOPT_MAXCONNECTS</B>
+           Pass a long. The set number  will  be  the  persistent
+           connection cache size. The set amount will be the max-
+           imum amount of simultaneously  open  connections  that
+           libcurl  may cache. Default is 5, and there isn't much
+           point in changing this value unless you are  perfectly
+           aware   of   how   this  work  and  changes  libcurl's
+           behaviour. This concerns connection using any  of  the
+           protocols that support persistent connections.
+
+           When  reaching  the  maximum limit, curl uses the <I>CUR-</I>
+           connections to increase.
+
+           <B>NOTE:</B> if you already  have  performed  transfers  with
+           this  curl  handle, setting a smaller MAXCONNECTS than
+           before may cause open connections to get closed unnec-
+           essarily. (Added in 7.7)
+
+       <B>CURLOPT_CLOSEPOLICY</B>
+           Pass  a  long.  This  option  sets what policy libcurl
+           should use when the connection cache is filled and one
+           of  the open connections has to be closed to make room
+           for a new connection. This must be one  of  the  CURL-
+           CLOSEPOLICY_*      defines.      Use     <I>CURLCLOSEPOL-</I>
+           <I>ICY</I><B>_</B><I>LEAST</I><B>_</B><I>RECENTLY</I><B>_</B><I>USED</I> to make libcurl close the con-
+           nection  that was least recently used, that connection
+           is also least likely to  be  capable  of  re-use.  Use
+           <I>CURLCLOSEPOLICY</I><B>_</B><I>OLDEST</I>  to make libcurl close the old-
+           est connection, the one that was created  first  among
+           the  ones  in  the  connection  cache. The other close
+           policies are not support yet. (Added in 7.7)
+
+       <B>CURLOPT_FRESH_CONNECT</B>
+           Pass a long. Set to non-zero to make the next transfer
+           use  a new (fresh) connection by force. If the connec-
+           tion cache is full before this connection, one of  the
+           existing  connections  will  be closed as according to
+           the selected or default policy. This option should  be
+           used  with  caution and only if you understand what it
+           does. Set this to 0 to have libcurl  attempt  re-using
+           an  existing connection (default behavior).  (Added in
+           7.7)
+
+       <B>CURLOPT_FORBID_REUSE</B>
+           Pass a long. Set to non-zero to make the next transfer
+           explicitly  close  the connection when done. Normally,
+           libcurl keep all connections alive when done with  one
+           transfer in case there comes a succeeding one that can
+           re-use them.  This option should be used with  caution
+           and  only  if you understand what it does. Set to 0 to
+           have libcurl keep the  connection  open  for  possibly
+           later re-use (default behavior). (Added in 7.7)
+
+       <B>CURLOPT_CONNECTTIMEOUT</B>
+           Pass  a  long.  It  should contain the maximum time in
+           seconds that you allow the connection to the server to
+           take.   This only limits the connection phase, once it
+           has connected, this option is of no more use.  Set  to
+           zero  to disable connection timeout (it will then only
+           timeout on the system's internal timeouts).  See  also
+           the <I>CURLOPT</I><B>_</B><I>TIMEOUT</I> option.
+
+           <B>NOTE:</B>  this  is  not recommended to use in unix multi-
+
+
+
+</PRE>
+<H2>SSL and SECURITY OPTIONS</H2><PRE>
+       <B>CURLOPT_SSLCERT</B>
+           Pass  a pointer to a zero terminated string as parame-
+           ter. The string should be the file name of  your  cer-
+           tificate.  The  default  format  is  "PEM"  and can be
+           changed with <I>CURLOPT</I><B>_</B><I>SSLCERTTYPE</I>.
+
+       <B>CURLOPT_SSLCERTTYPE</B>
+           Pass a pointer to a zero terminated string as  parame-
+           ter.  The string should be the format of your certifi-
+           cate. Supported formats are "PEM" and  "DER".   (Added
+           in 7.9.3)
+
+       <B>CURLOPT_SSLCERTPASSWD</B>
+           Pass  a pointer to a zero terminated string as parame-
+           ter. It will be used as the password required  to  use
+           the  CURLOPT_SSLCERT  certificate.  If the password is
+           not supplied,  you  will  be  prompted  for  it.  <I>CUR-</I>
+           <I>LOPT</I><B>_</B><I>PASSWDFUNCTION</I> can be used to set your own prompt
+           function.
+
+           <B>NOTE:</B>This option is replaced  by  <I>CURLOPT</I><B>_</B><I>SSLKEYPASSWD</I>
+           and  only  cept  for backward compatibility. You never
+           needed a pass phrase to load  a  certificate  but  you
+           need one to load your private key.
+
+       <B>CURLOPT_SSLKEY</B>
+           Pass  a pointer to a zero terminated string as parame-
+           ter. The string should be the file name of  your  pri-
+           vate  key.  The  default  format  is  "PEM" and can be
+           changed with <I>CURLOPT</I><B>_</B><I>SSLKEYTYPE</I>. (Added in 7.9.3)
+
+       <B>CURLOPT_SSLKEYTYPE</B>
+           Pass a pointer to a zero terminated string as  parame-
+           ter.  The  string should be the format of your private
+           key. Supported formats are  "PEM",  "DER"  and  "ENG".
+           (Added in 7.9.3)
+
+           <B>NOTE:</B>The  format "ENG" enables you to load the private
+           key from a crypto engine. in this case  <I>CURLOPT</I><B>_</B><I>SSLKEY</I>
+           is  used  as  an  identifier passed to the engine. You
+           have to set the crypto engine with <I>CURLOPT</I><B>_</B><I>SSL</I><B>_</B><I>ENGINE</I>.
+
+       <B>CURLOPT_SSLKEYPASSWD</B>
+           Pass  a pointer to a zero terminated string as parame-
+           ter. It will be used as the password required  to  use
+           the <I>CURLOPT</I><B>_</B><I>SSLKEY</I> private key. If the password is not
+           supplied, you will be prompted for it. <I>CURLOPT</I><B>_</B><I>PASSWD-</I>
+           <I>FUNCTION</I>  can be used to set your own prompt function.
+           (Added in 7.9.3)
+           Pass a pointer to a zero terminated string as  parame-
+           ter.  It will be used as the identifier for the crypto
+           engine you want to use for your private key. (Added in
+           7.9.3)
+
+           <B>NOTE:</B>If   the   crypto   device   cannot   be  loaded,
+           <I>CURLE</I><B>_</B><I>SSL</I><B>_</B><I>ENGINE</I><B>_</B><I>NOTFOUND</I> is returned.
+
+       <B>CURLOPT_SSL_ENGINEDEFAULT</B>
+           Sets the actual crypto engine as the default for (asy-
+           metric) crypto operations. (Added in 7.9.3)
+
+           <B>NOTE:</B>If    the    crypto   device   cannot   be   set,
+           <I>CURLE</I><B>_</B><I>SSL</I><B>_</B><I>ENGINE</I><B>_</B><I>SETFAILED</I> is returned.
+
+       <B>CURLOPT_SSLVERSION</B>
+           Pass a long as parameter. Set what version of  SSL  to
+           attempt  to  use,  2 or 3. By default, the SSL library
+           will try to solve this by itself although some servers
+           make  this  difficult why you at times may have to use
+           this option.
+
+       <B>CURLOPT_SSL_VERIFYPEER</B>
+           Pass a long that is set to a zero value to  stop  curl
+           from  verifying  the peer's certificate (7.10 starting
+           setting this option to TRUE  by  default).   Alternate
+           certificates  to  verify against can be specified with
+           the CURLOPT_CAINFO option (Added in 7.4.2) or  a  cer-
+           tificate  directory  can  be  specified  with the CUR-
+           LOPT_CAPATH option (Added in 7.9.8).  As of 7.10, curl
+           installs a default bundle.  CURLOPT_SSL_VERIFYHOST may
+           also need to be set to 1  or  0  if  CURLOPT_SSL_VERI-
+           FYPEER is disabled (it defaults to 2).
+
+       <B>CURLOPT_CAINFO</B>
+           Pass  a  char  *  to a zero terminated string naming a
+           file holding one or more certificates  to  verify  the
+           peer with. This only makes sense when used in combina-
+           tion with the CURLOPT_SSL_VERIFYPEER option. (Added in
+           7.4.2)
+
+       <B>CURLOPT_CAPATH</B>
+           Pass  a  char  *  to a zero terminated string naming a
+           directory holding multiple CA certificates  to  verify
+           the  peer with. The certificate directory must be pre-
+           pared using the openssl c_rehash  utility.  This  only
+           makes  sense  when  used  in combination with the CUR-
+           LOPT_SSL_VERIFYPEER option. The CAPATH function appar-
+           ently  does not work in Windows due to some limitation
+           in openssl. (Added in 7.9.8)
+
+       <B>CURLOPT_RANDOM_FILE</B>
+           for SSL. The more random the specified  file  is,  the
+           more secure the SSL connection will become.
+
+       <B>CURLOPT_EGDSOCKET</B>
+           Pass  a char * to the zero terminated path name to the
+           Entropy Gathering Daemon socket. It will  be  used  to
+           seed the random engine for SSL.
+
+       <B>CURLOPT_SSL_VERIFYHOST</B>
+           Pass  a  long. Set if we should verify the Common name
+           from the peer certificate in the SSL handshake, set  1
+           to  check  existence,  2 to ensure that it matches the
+           provided hostname. This is by default set to 2. (Added
+           in 7.8.1, default changed in 7.10)
+
+       <B>CURLOPT_SSL_CIPHER_LIST</B>
+           Pass  a  char  *, pointing to a zero terminated string
+           holding the list of ciphers to use for the SSL connec-
+           tion.  The list must be syntactly correct, it consists
+           of one or more cipher  strings  separated  by  colons.
+           Commas  or  spaces  are also acceptable separators but
+           colons are normally used, , - and +  can  be  used  as
+           operators.  Valid  examples  of  cipher  lists include
+           'RC4-SHA',  'SHA1+DES',  'TLSv1'  and  'DEFAULT'.  The
+           default list is normally set when you compile OpenSSL.
+
+           You'll find more details about cipher  lists  on  this
+           URL: <I>http://www.openssl.org/docs/apps/ciphers.html</I>
+
+       <B>CURLOPT_KRB4LEVEL</B>
+           Pass  a  char  *  as  parameter. Set the krb4 security
+           level, this also enables krb4 awareness.   This  is  a
+           string,  'clear', 'safe', 'confidential' or 'private'.
+           If the string is set but doesn't match one  of  these,
+           'private' will be used. Set the string to NULL to dis-
+           able kerberos4. The kerberos support  only  works  for
+           FTP. (Added in 7.3)
+
+
+
+</PRE>
+<H2>OTHER OPTIONS</H2><PRE>
+       <B>CURLOPT_PRIVATE</B>
+           Pass  a  char  *  as  parameter, pointing to data that
+           should  be  associated  with  the  curl  handle.   The
+           pointer   can  be  subsequently  retrieved  using  the
+           CURLINFO_PRIVATE options to curl_easy_getinfo.  (Added
+           in 7.10.3)
+
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       CURLE_OK  (zero)  means  that the option was set properly,
+       non-zero means an error occurred as <I>&lt;curl/curl.h&gt;</I> defines.
+       See  the  <I>libcurl-errors.3</I> man page for the full list with
+       <B>curl_easy_init(3)</B>, <B>curl_easy_cleanup(3)</B>,
+
+
+</PRE>
+<H2>BUGS</H2><PRE>
+       If you find any bugs, or just have questions, subscribe to
+       one of the mailing lists and post. We won't bite.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_easy_setopt.pdf b/main/source/curl/docs/libcurl/curl_easy_setopt.pdf
new file mode 100644
index 00000000..57116572
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_easy_setopt.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_escape.3 b/main/source/curl/docs/libcurl/curl_escape.3
new file mode 100644
index 00000000..e978d908
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_escape.3
@@ -0,0 +1,26 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: curl_escape.3,v 1.3 2002/09/25 12:11:12 bagder Exp $
+.\"
+.TH curl_escape 3 "6 March 2002" "libcurl 7.9" "libcurl Manual"
+.SH NAME
+curl_escape - URL encodes the given string
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "char *curl_escape( char *" url ", int "length " );"
+.ad
+.SH DESCRIPTION
+This function will convert the given input string to an URL encoded string and
+return that as a new allocated string. All input characters that are not a-z,
+A-Z or 0-9 will be converted to their "URL escaped" version (%NN where NN is a
+two-digit hexadecimal number).
+
+If the 'length' argument is set to 0, curl_escape() will use strlen() on the
+input 'url' string to find out the size.
+
+You must curl_free() the returned string when you're done with it.
+.SH RETURN VALUE
+A pointer to a zero terminated string or NULL if it failed.
+.SH "SEE ALSO"
+.I curl_unescape(), curl_free(), RFC 2396
diff --git a/main/source/curl/docs/libcurl/curl_escape.html b/main/source/curl/docs/libcurl/curl_escape.html
new file mode 100644
index 00000000..ce4e4588
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_escape.html
@@ -0,0 +1,72 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_escape - URL encodes the given string
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>char</B> <B>*curl_escape(</B> <B>char</B> <B>*</B><I>url</I><B>,</B> <B>int</B> <I>length</I> <B>);</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       This  function  will  convert the given input string to an
+       URL encoded string and return  that  as  a  new  allocated
+       string.  All input characters that are not a-z, A-Z or 0-9
+       will be converted to  their  "URL  escaped"  version  (%NN
+       where NN is a two-digit hexadecimal number).
+
+       If  the  'length' argument is set to 0, curl_escape() will
+       use strlen() on the input 'url' string  to  find  out  the
+       size.
+
+       You  must curl_free() the returned string when you're done
+       with it.
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       A pointer to a  zero  terminated  string  or  NULL  if  it
+       failed.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <I>curl</I><B>_</B><I>unescape(),</I> <I>curl</I><B>_</B><I>free(),</I> <I>RFC</I> <I>2396</I>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_escape.pdf b/main/source/curl/docs/libcurl/curl_escape.pdf
new file mode 100644
index 00000000..c5371fc2
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_escape.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_formadd.3 b/main/source/curl/docs/libcurl/curl_formadd.3
new file mode 100644
index 00000000..596e761b
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_formadd.3
@@ -0,0 +1,212 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: curl_formadd.3,v 1.6 2002/11/15 14:13:46 bagder Exp $
+.\"
+.TH curl_formadd 3 "24 June 2002" "libcurl 7.9.8" "libcurl Manual"
+.SH NAME
+curl_formadd - add a section to a multipart/formdata HTTP POST
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "CURLFORMcode curl_formadd(struct HttpPost ** " firstitem,
+.BI "struct HttpPost ** " lastitem, " ...);"
+.ad
+.SH DESCRIPTION
+curl_formadd() is used to append sections when building a multipart/formdata
+HTTP POST (sometimes refered to as rfc1867-style posts). Append one section at
+a time until you've added all the sections you want included and then you pass
+the \fIfirstitem\fP pointer as parameter to \fBCURLOPT_HTTPPOST\fP.
+\fIlastitem\fP is set after each call and on repeated invokes it should be
+left as set to allow repeated invokes to find the end of the list faster.
+
+After the \fIlastitem\fP pointer follow the real arguments.
+
+The pointers \fI*firstitem\fP and \fI*lastitem\fP should both be pointing to
+NULL in the first call to this function. All list-data will be allocated by
+the function itself. You must call \fIcurl_formfree\fP after the form post has
+been done to free the resources again.
+
+First, there are some basics you need to understand about multipart/formdata
+posts. Each part consists of at least a NAME and a CONTENTS part. If the part
+is made for file upload, there are also a stored CONTENT-TYPE and a
+FILENAME. Below here, we'll discuss on what options you use to set these
+properties in the parts you want to add to your post.
+.SH OPTIONS
+.B CURLFORM_COPYNAME
+followed by string is used to set the name of this part. libcurl copies the
+given data, so your application doesn't need to keep it around after this
+function call. If the name isn't zero terminated properly, or if you'd like it
+to contain zero bytes, you need to set the length of the name with
+\fBCURLFORM_NAMELENGTH\fP.
+
+.B CURLFORM_PTRNAME
+followed by a string is used for the name of this part. libcurl will use the
+pointer and refer to the data in your application, you must make sure it
+remains until curl no longer needs it. If the name isn't zero terminated
+properly, or if you'd like it to contain zero bytes, you need to set the
+length of the name with \fBCURLFORM_NAMELENGTH\fP.
+
+.B CURLFORM_COPYCONTENTS
+followed by a string is used for the contents of this part, the actual data to
+send away. libcurl copies the given data, so your application doesn't need to
+keep it around after this function call. If the data isn't zero terminated
+properly, or if you'd like it to contain zero bytes, you need to set the
+length of the name with \fBCURLFORM_CONTENTSLENGTH\fP.
+
+.B CURLFORM_PTRCONTENTS
+followed by a string is used for the contents of this part, the actual data to
+send away. libcurl will use the pointer and refer to the data in your
+application, you must make sure it remains until curl no longer needs it. If
+the data isn't zero terminated properly, or if you'd like it to contain zero
+bytes, you need to set the length of the name with
+\fBCURLFORM_CONTENTSLENGTH\fP.
+
+.B CURLFORM_FILECONTENT
+followed by a file name, makes that file read and the contents will be used in
+as data in this part.
+
+.B CURLFORM_FILE
+followed by a file name, makes this part a file upload part. It sets the file
+name field to the actual file name used here, it gets the contents of the file
+and passes as data and sets the content-type if the given file match one of
+the new internally known file extension.  For \fBCURLFORM_FILE\fP the user may
+send one or more files in one part by providing multiple \fBCURLFORM_FILE\fP
+arguments each followed by the filename (and each CURLFORM_FILE is allowed to
+have a CURLFORM_CONTENTTYPE).
+
+.B CURLFORM_CONTENTTYPE
+followed by a pointer to a string with a content-type will make curl use this
+given content-type for this file upload part, possibly instead of an
+internally chosen one.
+
+.B CURLFORM_FILENAME
+followed by a pointer to a string to a name, will make libcurl use the given
+name in the file upload part, intead of the actual file name given to
+\fICURLFORM_FILE\fP.
+
+.B BCURLFORM_BUFFER
+followed by a string, tells libcurl that a buffer is to be used to upload data
+instead of using a file. The given string is used as the value of the file
+name field in the content header.
+
+.B CURLFORM_BUFFERPTR
+followed by a pointer to a data area, tells libcurl the address of the buffer
+containing data to upload (as indicated with \fICURLFORM_BUFFER\fP). The
+buffer containing this data must not be freed until after curl_easy_cleanup is
+called.
+
+.B CURLFORM_BUFFERLENGTH
+followed by a long with the size of the \fICURLFORM_BUFFERPTR\fP data area,
+tells libcurl the length of the buffer to upload.
+
+.B CURLFORM_ARRAY
+Another possibility to send options to curl_formadd() is the
+\fBCURLFORM_ARRAY\fP option, that passes a struct curl_forms array pointer as
+its value. Each curl_forms structure element has a CURLformoption and a char
+pointer. The final element in the array must be a CURLFORM_END. All available
+options can be used in an array, except the CURLFORM_ARRAY option itself!  The
+last argument in such an array must always be \fBCURLFORM_END\fP.
+
+.B CURLFORM_CONTENTHEADER
+specifies extra headers for the form POST section.  This takes a curl_slist
+prepared in the usual way using \fBcurl_slist_append\fP and appends the list
+of headers to those libcurl automatically generates. The list must exist while
+the POST occurs, if you free it before the post completes you may experience
+problems.
+
+When you've passed the HttpPost pointer to \fIcurl_easy_setopt\fP (using the
+\fICURLOPT_HTTPPOST\fP option), you must not free the list until after you've
+called \fIcurl_easy_cleanup\fP for the curl handle.
+
+See example below.
+.SH RETURN VALUE
+0 means everything was ok, non-zero means an error occurred as
+.I <curl/curl.h>
+defines.
+.SH EXAMPLE
+.nf
+
+ struct HttpPost* post = NULL;
+ struct HttpPost* last = NULL;
+ char namebuffer[] = "name buffer";
+ long namelength = strlen(namebuffer);
+ char buffer[] = "test buffer";
+ char htmlbuffer[] = "<HTML>test buffer</HTML>";
+ long htmlbufferlength = strlen(htmlbuffer);
+ struct curl_forms forms[3];
+ char file1[] = "my-face.jpg";
+ char file2[] = "your-face.jpg";
+ /* add null character into htmlbuffer, to demonstrate that
+    transfers of buffers containing null characters actually work
+ */
+ htmlbuffer[8] = '\\0';
+
+ /* Add simple name/content section */
+ curl_formadd(&post, &last, CURLFORM_COPYNAME, "name",
+              CURLFORM_COPYCONTENTS, "content", CURLFORM_END); 
+
+ /* Add simple name/content/contenttype section */
+ curl_formadd(&post, &last, CURLFORM_COPYNAME, "htmlcode",
+              CURLFORM_COPYCONTENTS, "<HTML></HTML>",
+              CURLFORM_CONTENTTYPE, "text/html", CURLFORM_END);
+
+ /* Add name/ptrcontent section */
+ curl_formadd(&post, &last, CURLFORM_COPYNAME, "name_for_ptrcontent",
+              CURLFORM_PTRCONTENTS, buffer, CURLFORM_END);
+
+ /* Add ptrname/ptrcontent section */
+ curl_formadd(&post, &last, CURLFORM_PTRNAME, namebuffer,
+	      CURLFORM_PTRCONTENTS, buffer, CURLFORM_NAMELENGTH,
+	      namelength, CURLFORM_END);
+
+ /* Add name/ptrcontent/contenttype section */
+ curl_formadd(&post, &last, CURLFORM_COPYNAME, "html_code_with_hole",
+              CURLFORM_PTRCONTENTS, htmlbuffer,
+              CURLFORM_CONTENTSLENGTH, htmlbufferlength,
+              CURLFORM_CONTENTTYPE, "text/html", CURLFORM_END);
+
+ /* Add simple file section */
+ curl_formadd(&post, &last, CURLFORM_COPYNAME, "picture",
+              CURLFORM_FILE, "my-face.jpg", CURLFORM_END);
+
+ /* Add file/contenttype section */
+ curl_formadd(&post, &last, CURLFORM_COPYNAME, "picture",
+              CURLFORM_FILE, "my-face.jpg",
+              CURLFORM_CONTENTTYPE, "image/jpeg", CURLFORM_END);
+
+ /* Add two file section */
+ curl_formadd(&post, &last, CURLFORM_COPYNAME, "pictures",
+              CURLFORM_FILE, "my-face.jpg",
+              CURLFORM_FILE, "your-face.jpg", CURLFORM_END);
+
+ /* Add two file section using CURLFORM_ARRAY */
+ forms[0].option = CURLFORM_FILE;
+ forms[0].value  = file1;
+ forms[1].option = CURLFORM_FILE;
+ forms[1].value  = file2;
+ forms[2].option  = CURLFORM_END;
+
+ /* Add a buffer to upload */
+ curl_formadd(&post, &last,
+              CURLFORM_COPYNAME, "name",
+              CURLFORM_BUFFER, "data",
+              CURLFORM_BUFFERPTR, record,
+              CURLFORM_BUFFERLENGTH, record_length,
+              CURLFORM_END);
+
+ /* no option needed for the end marker */
+ curl_formadd(&post, &last, CURLFORM_COPYNAME, "pictures",
+              CURLFORM_ARRAY, forms, CURLFORM_END);
+ /* Add the content of a file as a normal post text value */
+ curl_formadd(&post, &last, CURLFORM_COPYNAME, "filecontent",
+              CURLFORM_FILECONTENT, ".bashrc", CURLFORM_END);
+ /* Set the form info */
+ curl_easy_setopt(curl, CURLOPT_HTTPPOST, post);
+
+.SH "SEE ALSO"
+.BR curl_easy_setopt "(3), "
+.BR curl_formparse "(3) [deprecated], "
+.BR curl_formfree "(3)"
+.SH BUGS
+Surely there are some, you tell me!
+
diff --git a/main/source/curl/docs/libcurl/curl_formadd.html b/main/source/curl/docs/libcurl/curl_formadd.html
new file mode 100644
index 00000000..6680aa5f
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_formadd.html
@@ -0,0 +1,286 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_formadd  - add a section to a multipart/formdata HTTP
+       POST
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>CURLFORMcode</B> <B>curl_formadd(struct</B>  <B>HttpPost</B>  <B>**</B>  <I>firstitem,</I>
+       <B>struct</B> <B>HttpPost</B> <B>**</B> <I>lastitem,</I> <B>...);</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       curl_formadd()  is used to append sections when building a
+       multipart/formdata HTTP  POST  (sometimes  refered  to  as
+       rfc1867-style  posts).  Append one section at a time until
+       you've added all the sections you want included  and  then
+       you  pass  the  <I>firstitem</I>  pointer  as  parameter  to <B>CUR-</B>
+       <B>LOPT_HTTPPOST</B>.  <I>lastitem</I> is set after  each  call  and  on
+       repeated  invokes  it  should  be  left  as  set  to allow
+       repeated invokes to find the end of the list faster.
+
+       After the <I>lastitem</I> pointer follow the real arguments.
+
+       The pointers  <I>*firstitem</I>  and  <I>*lastitem</I>  should  both  be
+       pointing  to  NULL in the first call to this function. All
+       list-data will be allocated by the  function  itself.  You
+       must  call <I>curl</I><B>_</B><I>formfree</I> after the form post has been done
+       to free the resources again.
+
+       First, there are some basics you need to understand  about
+       multipart/formdata posts. Each part consists of at least a
+       NAME and a CONTENTS part. If the part  is  made  for  file
+       upload,  there  are also a stored CONTENT-TYPE and a FILE-
+       NAME. Below here, we'll discuss on what options you use to
+       set  these properties in the parts you want to add to your
+       post.
+
+
+</PRE>
+<H2>OPTIONS</H2><PRE>
+       <B>CURLFORM_COPYNAME</B> followed by string is used  to  set  the
+       name  of this part. libcurl copies the given data, so your
+       application doesn't need to  keep  it  around  after  this
+       function call. If the name isn't zero terminated properly,
+       or if you'd like it to contain zero bytes, you need to set
+       the length of the name with <B>CURLFORM_NAMELENGTH</B>.
+
+       <B>CURLFORM_PTRNAME</B> followed by a string is used for the name
+       of this part. libcurl will use the pointer  and  refer  to
+       the  data  in  your  application,  you  must  make sure it
+       remains until curl no longer needs it. If the  name  isn't
+       zero  terminated  properly, or if you'd like it to contain
+       zero bytes, you need to set the length of  the  name  with
+       <B>CURLFORM_NAMELENGTH</B>.
+
+       <B>CURLFORM_COPYCONTENTS</B> followed by a string is used for the
+       need to keep it around after this function  call.  If  the
+       data  isn't  zero terminated properly, or if you'd like it
+       to contain zero bytes, you need to set the length  of  the
+       name with <B>CURLFORM_CONTENTSLENGTH</B>.
+
+       <B>CURLFORM_PTRCONTENTS</B>  followed by a string is used for the
+       contents of this part,  the  actual  data  to  send  away.
+       libcurl will use the pointer and refer to the data in your
+       application, you must make sure it remains until  curl  no
+       longer  needs  it. If the data isn't zero terminated prop-
+       erly, or if you'd like it to contain zero bytes, you  need
+       to   set   the  length  of  the  name  with  <B>CURLFORM_CON-</B>
+       <B>TENTSLENGTH</B>.
+
+       <B>CURLFORM_FILECONTENT</B> followed by a file name,  makes  that
+       file read and the contents will be used in as data in this
+       part.
+
+       <B>CURLFORM_FILE</B> followed by a file name, makes this  part  a
+       file  upload  part.  It  sets  the  file name field to the
+       actual file name used here, it gets the  contents  of  the
+       file  and  passes as data and sets the content-type if the
+       given file match one of  the  new  internally  known  file
+       extension.   For  <B>CURLFORM_FILE</B>  the  user may send one or
+       more files in one part by providing multiple <B>CURLFORM_FILE</B>
+       arguments  each  followed  by the filename (and each CURL-
+       FORM_FILE is allowed to have a CURLFORM_CONTENTTYPE).
+
+       <B>CURLFORM_CONTENTTYPE</B> followed by a  pointer  to  a  string
+       with a content-type will make curl use this given content-
+       type for this file upload part,  possibly  instead  of  an
+       internally chosen one.
+
+       <B>CURLFORM_FILENAME</B>  followed  by a pointer to a string to a
+       name, will make libcurl use the given  name  in  the  file
+       upload part, intead of the actual file name given to <I>CURL-</I>
+       <I>FORM</I><B>_</B><I>FILE</I>.
+
+       <B>BCURLFORM_BUFFER</B> followed by a string, tells libcurl  that
+       a  buffer  is to be used to upload data instead of using a
+       file. The given string is used as the value  of  the  file
+       name field in the content header.
+
+       <B>CURLFORM_BUFFERPTR</B>  followed  by a pointer to a data area,
+       tells libcurl the address of the buffer containing data to
+       upload  (as  indicated  with  <I>CURLFORM</I><B>_</B><I>BUFFER</I>). The buffer
+       containing  this  data  must  not  be  freed  until  after
+       curl_easy_cleanup is called.
+
+       <B>CURLFORM_BUFFERLENGTH</B>  followed by a long with the size of
+       the <I>CURLFORM</I><B>_</B><I>BUFFERPTR</I> data area, tells libcurl the length
+       of the buffer to upload.
+       curl_formadd() is the <B>CURLFORM_ARRAY</B> option, that passes a
+       struct   curl_forms  array  pointer  as  its  value.  Each
+       curl_forms structure element has a  CURLformoption  and  a
+       char  pointer.  The  final  element in the array must be a
+       CURLFORM_END. All available options  can  be  used  in  an
+       array,  except the CURLFORM_ARRAY option itself!  The last
+       argument in such an array must always be <B>CURLFORM_END</B>.
+
+       <B>CURLFORM_CONTENTHEADER</B> specifies  extra  headers  for  the
+       form  POST  section.   This takes a curl_slist prepared in
+       the usual way using <B>curl_slist_append</B> and appends the list
+       of  headers  to those libcurl automatically generates. The
+       list must exist while the POST  occurs,  if  you  free  it
+       before the post completes you may experience problems.
+
+       When    you've    passed    the    HttpPost   pointer   to
+       <I>curl</I><B>_</B><I>easy</I><B>_</B><I>setopt</I> (using the <I>CURLOPT</I><B>_</B><I>HTTPPOST</I> option),  you
+       must   not   free  the  list  until  after  you've  called
+       <I>curl</I><B>_</B><I>easy</I><B>_</B><I>cleanup</I> for the curl handle.
+
+       See example below.
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       0  means  everything  was  ok,  non-zero  means  an  error
+       occurred as <I>&lt;curl/curl.h&gt;</I> defines.
+
+
+</PRE>
+<H2>EXAMPLE</H2><PRE>
+        struct HttpPost* post = NULL;
+        struct HttpPost* last = NULL;
+        char namebuffer[] = "name buffer";
+        long namelength = strlen(namebuffer);
+        char buffer[] = "test buffer";
+        char htmlbuffer[] = "&lt;HTML&gt;test buffer&lt;/HTML&gt;";
+        long htmlbufferlength = strlen(htmlbuffer);
+        struct curl_forms forms[3];
+        char file1[] = "my-face.jpg";
+        char file2[] = "your-face.jpg";
+        /* add null character into htmlbuffer, to demonstrate that
+           transfers of buffers containing null characters actually work
+        */
+        htmlbuffer[8] = '\0';
+
+        /* Add simple name/content section */
+        curl_formadd(&amp;post, &amp;last, CURLFORM_COPYNAME, "name",
+                     CURLFORM_COPYCONTENTS, "content", CURLFORM_END);
+
+        /* Add simple name/content/contenttype section */
+        curl_formadd(&amp;post, &amp;last, CURLFORM_COPYNAME, "htmlcode",
+                     CURLFORM_COPYCONTENTS, "&lt;HTML&gt;&lt;/HTML&gt;",
+                     CURLFORM_CONTENTTYPE, "text/html", CURLFORM_END);
+
+        /* Add name/ptrcontent section */
+
+        /* Add ptrname/ptrcontent section */
+        curl_formadd(&amp;post, &amp;last, CURLFORM_PTRNAME, namebuffer,
+                  CURLFORM_PTRCONTENTS, buffer, CURLFORM_NAMELENGTH,
+                  namelength, CURLFORM_END);
+
+        /* Add name/ptrcontent/contenttype section */
+        curl_formadd(&amp;post, &amp;last, CURLFORM_COPYNAME, "html_code_with_hole",
+                     CURLFORM_PTRCONTENTS, htmlbuffer,
+                     CURLFORM_CONTENTSLENGTH, htmlbufferlength,
+                     CURLFORM_CONTENTTYPE, "text/html", CURLFORM_END);
+
+        /* Add simple file section */
+        curl_formadd(&amp;post, &amp;last, CURLFORM_COPYNAME, "picture",
+                     CURLFORM_FILE, "my-face.jpg", CURLFORM_END);
+
+        /* Add file/contenttype section */
+        curl_formadd(&amp;post, &amp;last, CURLFORM_COPYNAME, "picture",
+                     CURLFORM_FILE, "my-face.jpg",
+                     CURLFORM_CONTENTTYPE, "image/jpeg", CURLFORM_END);
+
+        /* Add two file section */
+        curl_formadd(&amp;post, &amp;last, CURLFORM_COPYNAME, "pictures",
+                     CURLFORM_FILE, "my-face.jpg",
+                     CURLFORM_FILE, "your-face.jpg", CURLFORM_END);
+
+        /* Add two file section using CURLFORM_ARRAY */
+        forms[0].option = CURLFORM_FILE;
+        forms[0].value  = file1;
+        forms[1].option = CURLFORM_FILE;
+        forms[1].value  = file2;
+        forms[2].option  = CURLFORM_END;
+
+        /* Add a buffer to upload */
+        curl_formadd(&amp;post, &amp;last,
+                     CURLFORM_COPYNAME, "name",
+                     CURLFORM_BUFFER, "data",
+                     CURLFORM_BUFFERPTR, record,
+                     CURLFORM_BUFFERLENGTH, record_length,
+                     CURLFORM_END);
+
+        /* no option needed for the end marker */
+        curl_formadd(&amp;post, &amp;last, CURLFORM_COPYNAME, "pictures",
+                     CURLFORM_ARRAY, forms, CURLFORM_END);
+        /* Add the content of a file as a normal post text value */
+        curl_formadd(&amp;post, &amp;last, CURLFORM_COPYNAME, "filecontent",
+                     CURLFORM_FILECONTENT, ".bashrc", CURLFORM_END);
+        /* Set the form info */
+        curl_easy_setopt(curl, CURLOPT_HTTPPOST, post);
+
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+
+
+</PRE>
+<H2>BUGS</H2><PRE>
+       Surely there are some, you tell me!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_formadd.pdf b/main/source/curl/docs/libcurl/curl_formadd.pdf
new file mode 100644
index 00000000..bafeecdf
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_formadd.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_formfree.3 b/main/source/curl/docs/libcurl/curl_formfree.3
new file mode 100644
index 00000000..6bf8fb5e
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_formfree.3
@@ -0,0 +1,27 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: curl_formfree.3,v 1.1 2002/03/04 10:09:49 bagder Exp $
+.\"
+.TH curl_formfree 3 "6 April 2001" "libcurl 7.7.1" "libcurl Manual"
+.SH NAME
+curl_formfree - free a previously build multipart/formdata HTTP POST chain
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "void curl_formfree(struct HttpPost *" form);
+.ad
+.SH DESCRIPTION
+curl_formfree() is used to clean up data previously built/appended with
+curl_formadd()/curl_formparse(). This must be called when the data has
+been used, which typically means after the curl_easy_perform() has
+been called.
+.SH RETURN VALUE
+None
+.SH "SEE ALSO"
+.BR curl_formparse "(3) [deprecated], "
+.BR curl_formadd "(3) "
+.SH BUGS
+libcurl 7.7.1 and earlier versions does not allow a NULL pointer to be used as
+argument.
+
+
diff --git a/main/source/curl/docs/libcurl/curl_formfree.html b/main/source/curl/docs/libcurl/curl_formfree.html
new file mode 100644
index 00000000..b8d5f50b
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_formfree.html
@@ -0,0 +1,74 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_formfree - free a previously build multipart/formdata
+       HTTP POST chain
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>void</B> <B>curl_formfree(struct</B> <B>HttpPost</B> <B>*</B><I>form);</I>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       curl_formfree()  is  used  to  clean  up  data  previously
+       built/appended  with curl_formadd()/curl_formparse(). This
+       must be called when the data has been  used,  which  typi-
+       cally means after the curl_easy_perform() has been called.
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       None
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>curl_formparse(3)</B> [deprecated], <B>curl_formadd(3)</B>
+
+
+</PRE>
+<H2>BUGS</H2><PRE>
+       libcurl 7.7.1 and earlier versions does not allow  a  NULL
+       pointer to be used as argument.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_formfree.pdf b/main/source/curl/docs/libcurl/curl_formfree.pdf
new file mode 100644
index 00000000..fce02b6e
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_formfree.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_formparse.3 b/main/source/curl/docs/libcurl/curl_formparse.3
new file mode 100644
index 00000000..18df325a
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_formparse.3
@@ -0,0 +1,18 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: curl_formparse.3,v 1.1 2002/03/04 10:09:49 bagder Exp $
+.\"
+.TH curl_formparse 3 "17 Dec 2001" "libcurl 7.9.2" "libcurl Manual"
+.SH NAME
+curl_formparse - add a section to a multipart/formdata HTTP POST:
+deprecated (use curl_formadd instead)
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "CURLcode curl_formparse(char * " string, " struct HttpPost ** " firstitem,
+.BI "struct HttpPost ** " lastitem ");"
+.ad
+.SH DESCRIPTION
+This has been removed deliberately. The \fBcurl_formadd\fP has been introduced
+to replace this function. Do not use this. Convert to the new function
+now. curl_formparse() will be removed from a future version of libcurl.
diff --git a/main/source/curl/docs/libcurl/curl_formparse.html b/main/source/curl/docs/libcurl/curl_formparse.html
new file mode 100644
index 00000000..3c730d20
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_formparse.html
@@ -0,0 +1,68 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_formparse  -  add  a  section to a multipart/formdata
+       HTTP POST: deprecated (use curl_formadd instead)
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>CURLcode</B> <B>curl_formparse(char</B> <B>*</B> <I>string,</I> <B>struct</B> <B>HttpPost</B>  <B>**</B>
+       <I>firstitem,</I> <B>struct</B> <B>HttpPost</B> <B>**</B> <I>lastitem</I><B>);</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       This  has  been removed deliberately. The <B>curl_formadd</B> has
+       been introduced to replace this function. Do not use this.
+       Convert  to the new function now. curl_formparse() will be
+       removed from a future version of libcurl.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_formparse.pdf b/main/source/curl/docs/libcurl/curl_formparse.pdf
new file mode 100644
index 00000000..1d811192
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_formparse.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_free.3 b/main/source/curl/docs/libcurl/curl_free.3
new file mode 100644
index 00000000..7b3266a1
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_free.3
@@ -0,0 +1,17 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: 
+.\"
+.TH curl_free 3 "24 Sept 2002" "libcurl 7.10" "libcurl Manual"
+.SH NAME
+curl_free - reclaim memory that has been obtained through a libcurl call
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "void *curl_free( char *" ptr " );"
+.ad
+.SH DESCRIPTION
+curl_free reclaims memory that has been obtained through a libcurl call. 
+Use curl_free() instead of free() to avoid anomalies that can result from differences in memory management between your application and libcurl.
+.SH "SEE ALSO"
+.I curl_unescape(), curl_free()
diff --git a/main/source/curl/docs/libcurl/curl_free.html b/main/source/curl/docs/libcurl/curl_free.html
new file mode 100644
index 00000000..c22a49b3
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_free.html
@@ -0,0 +1,70 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_free  - reclaim memory that has been obtained through
+       a libcurl call
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>void</B> <B>*curl_free(</B> <B>char</B> <B>*</B><I>ptr</I> <B>);</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       curl_free reclaims memory that has been obtained through a
+       libcurl  call.  Use curl_free() instead of free() to avoid
+       anomalies that can result from differences in memory  man-
+       agement between your application and libcurl.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <I>curl</I><B>_</B><I>unescape(),</I> <I>curl</I><B>_</B><I>free()</I>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_free.pdf b/main/source/curl/docs/libcurl/curl_free.pdf
new file mode 100644
index 00000000..083c441e
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_free.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_getdate.3 b/main/source/curl/docs/libcurl/curl_getdate.3
new file mode 100644
index 00000000..11ea0dc7
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_getdate.3
@@ -0,0 +1,80 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: curl_getdate.3,v 1.1 2002/03/04 10:09:49 bagder Exp $
+.\"
+.TH curl_getdate 3 "5 March 2001" "libcurl 7.0" "libcurl Manual"
+.SH NAME
+curl_getdate - Convert an date in a ASCII string to number of seconds since
+January 1, 1970
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "time_t curl_getdate(char *" datestring ", time_t *"now" );
+.ad
+.SH DESCRIPTION
+This function returns the number of seconds since January 1st 1970, for the
+date and time that the
+.I datestring
+parameter specifies. The 
+.I now
+parameter is there and should hold the current time to allow the datestring to
+specify relative dates/times. Read further in the date string parser section
+below.
+.SH PARSING DATES AND TIMES
+A "date" is a string, possibly empty, containing many items separated by
+whitespace.  The whitespace may be omitted when no ambiguity arises.  The
+empty string means the beginning of today (i.e., midnight).  Order of the
+items is immaterial.  A date string may contain many flavors of items:
+.TP 0.8i
+.B calendar date items
+This can be specified in a number of different ways. Including 1970-09-17, 70-9-17, 70-09-17, 9/17/72, 24 September 1972, 24 Sept 72, 24 Sep 72, Sep 24, 1972, 24-sep-72, 24sep72.
+The year can also be omitted, for example: 9/17 or "sep 17".
+.TP
+.B time of the day items
+This string specifies the time on a given day. Syntax supported includes:
+18:19:0, 18:19, 6:19pm, 18:19-0500 (for specifying the time zone as well).
+.TP
+.B time zone items
+Specifies international time zone. There are a few acronyms supported, but in
+general you should instead use the specific realtive time compared to
+UTC. Supported formats include: -1200, MST, +0100.
+.TP
+.B day of the week items
+Specifies a day of the week. If this is mentioned alone it means that day of
+the week in the future.
+
+Days of the week may be spelled out in full: `Sunday', `Monday', etc or they
+may be abbreviated to their first three letters, optionally followed by a
+period.  The special abbreviations `Tues' for `Tuesday', `Wednes' for
+`Wednesday' and `Thur' or `Thurs' for `Thursday' are also allowed.
+
+A number may precede a day of the week item to move forward supplementary
+weeks.  It is best used in expression like `third monday'.  In this context,
+`last DAY' or `next DAY' is also acceptable; they move one week before or
+after the day that DAY by itself would represent.
+.TP
+.B relative items
+A relative item adjusts a date (or the current date if none) forward or
+backward. Example syntax includes: "1 year", "1 year ago", "2 days", "4
+weeks".
+
+The string `tomorrow' is worth one day in the future (equivalent to `day'),
+the string `yesterday' is worth one day in the past (equivalent to `day ago').
+.TP
+.B pure numbers
+If the decimal number is of the form YYYYMMDD and no other calendar date item
+appears before it in the date string, then YYYY is read as the year, MM as the
+month number and DD as the day of the month, for the specified calendar date.
+.PP
+.SH RETURN VALUE
+This function returns zero when it fails to parse the date string. Otherwise
+it returns the number of seconds as described.
+.SH AUTHORS
+Originally written by Steven M. Bellovin <smb@research.att.com> while at the
+University of North Carolina at Chapel Hill.  Later tweaked by a couple of
+people on Usenet.  Completely overhauled by Rich $alz <rsalz@bbn.com> and Jim
+Berets <jberets@bbn.com> in August, 1990.
+.SH "SEE ALSO"
+.BR 
+.SH BUGS
+Surely there are some, you tell me!
diff --git a/main/source/curl/docs/libcurl/curl_getdate.html b/main/source/curl/docs/libcurl/curl_getdate.html
new file mode 100644
index 00000000..9fe1a315
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_getdate.html
@@ -0,0 +1,130 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_getdate - Convert an date in a ASCII string to number
+       of seconds since January 1, 1970
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>time_t</B> <B>curl_getdate(char</B> <B>*</B><I>datestring</I><B>,</B> <B>time_t</B> <B>*</B><I>now"</I><B>);</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       This function returns the number of seconds since  January
+       1st 1970, for the date and time that the <I>datestring</I> param-
+       eter specifies. The <I>now</I> parameter is there and should hold
+       the  current time to allow the datestring to specify rela-
+       tive dates/times. Read further in the date  string  parser
+       section below.
+
+
+</PRE>
+<H2>PARSING DATES AND TIMES</H2><PRE>
+       A  "date"  is  a  string,  possibly empty, containing many
+       items separated by  whitespace.   The  whitespace  may  be
+       omitted  when no ambiguity arises.  The empty string means
+       the beginning of today (i.e.,  midnight).   Order  of  the
+       items  is immaterial.  A date string may contain many fla-
+       vors of items:
+
+       <B>calendar</B> <B>date</B> <B>items</B>
+               This can be specified in  a  number  of  different
+               ways.  Including  1970-09-17,  70-9-17,  70-09-17,
+               9/17/72, 24 September 1972, 24 Sept 72, 24 Sep 72,
+               Sep  24,  1972,  24-sep-72, 24sep72.  The year can
+               also be omitted, for example: 9/17 or "sep 17".
+
+       <B>time</B> <B>of</B> <B>the</B> <B>day</B> <B>items</B>
+               This string specifies the time  on  a  given  day.
+               Syntax supported includes: 18:19:0, 18:19, 6:19pm,
+               18:19-0500 (for specifying the time zone as well).
+
+       <B>time</B> <B>zone</B> <B>items</B>
+               Specifies international time zone. There are a few
+               acronyms supported,  but  in  general  you  should
+               instead use the specific realtive time compared to
+               UTC. Supported formats include: -1200, MST, +0100.
+
+       <B>day</B> <B>of</B> <B>the</B> <B>week</B> <B>items</B>
+               Specifies  a day of the week. If this is mentioned
+               alone it means that day of the week in the future.
+
+               Days of the week may be spelled out in full: `Sun-
+               day', `Monday', etc or they may be abbreviated  to
+               their  first three letters, optionally followed by
+               a period.  The special  abbreviations  `Tues'  for
+               `Tuesday',  `Wednes' for `Wednesday' and `Thur' or
+               `Thurs' for `Thursday' are also allowed.
+               move forward supplementary weeks.  It is best used
+               in expression like `third monday'.  In  this  con-
+               text, `last DAY' or `next DAY' is also acceptable;
+               they move one week before or after  the  day  that
+               DAY by itself would represent.
+
+       <B>relative</B> <B>items</B>
+               A  relative  item  adjusts  a date (or the current
+               date if none) forward or backward. Example  syntax
+               includes:  "1  year",  "1  year ago", "2 days", "4
+               weeks".
+
+               The string `tomorrow' is  worth  one  day  in  the
+               future  (equivalent to `day'), the string `yester-
+               day' is worth one day in the past  (equivalent  to
+               `day ago').
+
+       <B>pure</B> <B>numbers</B>
+               If  the decimal number is of the form YYYYMMDD and
+               no other calendar date item appears before  it  in
+               the date string, then YYYY is read as the year, MM
+               as the month number and  DD  as  the  day  of  the
+               month, for the specified calendar date.
+
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       This function returns zero when it fails to parse the date
+       string. Otherwise it returns  the  number  of  seconds  as
+       described.
+
+
+</PRE>
+<H2>AUTHORS</H2><PRE>
+       Originally     written     by     Steven    M.    Bellovin
+       &lt;smb@research.att.com&gt; while at the  University  of  North
+       Carolina  at  Chapel  Hill.   Later tweaked by a couple of
+       people on Usenet.   Completely  overhauled  by  Rich  $alz
+       &lt;rsalz@bbn.com&gt;   and   Jim  Berets  &lt;jberets@bbn.com&gt;  in
+       August, 1990.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+
+
+
+</PRE>
+<H2>BUGS</H2><PRE>
+       Surely there are some, you tell me!
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_getdate.pdf b/main/source/curl/docs/libcurl/curl_getdate.pdf
new file mode 100644
index 00000000..564e2c88
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_getdate.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_getenv.3 b/main/source/curl/docs/libcurl/curl_getenv.3
new file mode 100644
index 00000000..15d881be
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_getenv.3
@@ -0,0 +1,32 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: curl_getenv.3,v 1.1 2002/03/04 10:09:49 bagder Exp $
+.\"
+.TH curl_getenv 3 "15 August 2001" "libcurl 7.8.1" "libcurl Manual"
+.SH NAME
+curl_getenv - return value for environment name
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "char *curl_getenv(const char *" name ");
+.ad
+.SH DESCRIPTION
+curl_getenv() is a portable wrapper for the getenv() function, meant to
+emulate its behaviour and provide an identical interface for all operating
+systems libcurl builds on (including win32).
+.SH RETURN VALUE
+If successful, curl_getenv() returns a pointer to the value of the specified
+environment. The memory it refers to is malloc()ed why the application must
+free() this when the data has completed to serve its purpose. When
+.I curl_getenv()
+fails to find the specified name, it returns a null pointer.
+.SH NOTE
+Under unix operating systems, there isn't any point in returning an allocated
+memory, although other systems won't work properly if this isn't done. The
+unix implementation thus have to suffer slightly from the drawbacks of other
+systems.
+.SH "SEE ALSO"
+.BR getenv "(3C), "
+.SH BUGS
+Surely there are some, you tell me!
+
diff --git a/main/source/curl/docs/libcurl/curl_getenv.html b/main/source/curl/docs/libcurl/curl_getenv.html
new file mode 100644
index 00000000..4ee94a31
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_getenv.html
@@ -0,0 +1,76 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_getenv - return value for environment name
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>char</B> <B>*curl_getenv(const</B> <B>char</B> <B>*</B><I>name</I><B>);</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       curl_getenv() is a portable wrapper for the getenv() func-
+       tion, meant to emulate its behaviour and provide an  iden-
+       tical  interface  for all operating systems libcurl builds
+       on (including win32).
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       If successful, curl_getenv()  returns  a  pointer  to  the
+       value  of  the specified environment. The memory it refers
+       to is malloc()ed why the application must free() this when
+       the   data  has  completed  to  serve  its  purpose.  When
+       <I>curl</I><B>_</B><I>getenv()</I> fails to find the specified name, it returns
+       a null pointer.
+
+
+</PRE>
+<H2>NOTE</H2><PRE>
+       Under  unix  operating  systems,  there isn't any point in
+       returning an  allocated  memory,  although  other  systems
+       won't work properly if this isn't done. The unix implemen-
+       tation thus have to suffer slightly from the drawbacks  of
+       other systems.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>getenv(3C)</B>,
+
+
+</PRE>
+<H2>BUGS</H2><PRE>
+       Surely there are some, you tell me!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_getenv.pdf b/main/source/curl/docs/libcurl/curl_getenv.pdf
new file mode 100644
index 00000000..9a114db3
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_getenv.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_global_cleanup.3 b/main/source/curl/docs/libcurl/curl_global_cleanup.3
new file mode 100644
index 00000000..9163fd2e
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_global_cleanup.3
@@ -0,0 +1,27 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: curl_global_cleanup.3,v 1.1 2002/03/04 10:09:49 bagder Exp $
+.\"
+.TH curl_global_cleanup 3 "28 May 2001" "libcurl 7.8" "libcurl Manual"
+.SH NAME
+curl_global_cleanup - Global libcurl cleanup
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "void curl_global_cleanup(void);"
+.ad
+.SH DESCRIPTION
+curl_global_cleanup must be called once (no matter how many threads or libcurl
+sessions that'll be used) by every application that uses libcurl, after all
+uses of libcurl is complete.
+
+This is the opposite of \fIcurl_global_init\fP.
+
+Not calling this function may result in memory leaks.
+
+This function was added in libcurl 7.8.
+.SH "SEE ALSO"
+.BR curl_global_init "(3), "
+.SH BUGS
+None?
+
diff --git a/main/source/curl/docs/libcurl/curl_global_cleanup.html b/main/source/curl/docs/libcurl/curl_global_cleanup.html
new file mode 100644
index 00000000..ad79391c
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_global_cleanup.html
@@ -0,0 +1,72 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_global_cleanup - Global libcurl cleanup
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>void</B> <B>curl_global_cleanup(void);</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       curl_global_cleanup  must  be  called  once (no matter how
+       many threads or libcurl sessions that'll be used) by every
+       application  that  uses libcurl, after all uses of libcurl
+       is complete.
+
+       This is the opposite of <I>curl</I><B>_</B><I>global</I><B>_</B><I>init</I>.
+
+       Not calling this function may result in memory leaks.
+
+       This function was added in libcurl 7.8.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>curl_global_init(3)</B>,
+
+
+</PRE>
+<H2>BUGS</H2><PRE>
+       None?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_global_cleanup.pdf b/main/source/curl/docs/libcurl/curl_global_cleanup.pdf
new file mode 100644
index 00000000..6dbcdc1f
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_global_cleanup.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_global_init.3 b/main/source/curl/docs/libcurl/curl_global_init.3
new file mode 100644
index 00000000..da4951ae
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_global_init.3
@@ -0,0 +1,49 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: curl_global_init.3,v 1.1 2002/03/04 10:09:49 bagder Exp $
+.\"
+.TH curl_global_init 3 "13 Nov 2001" "libcurl 7.9.1" "libcurl Manual"
+.SH NAME
+curl_global_init - Global libcurl initialisation
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "CURLcode curl_global_init(long " flags ");"
+.ad
+.SH DESCRIPTION
+This function should only be called once (no matter how many threads or
+libcurl sessions that'll be used) by every application that uses libcurl.
+
+If this function hasn't been invoked when \fIcurl_easy_init\fP is called, it
+will be done automatically by libcurl.
+
+The flags option is a bit pattern that tells libcurl exact what features to
+init, as described below. Set the desired bits by ORing the values together.
+
+You must however \fBalways\fP use the \fIcurl_global_cleanup\fP function, as
+that cannot be called automatically for you by libcurl.
+
+Calling this function more than once will cause unpredictable results.
+
+This function was added in libcurl 7.8.
+.SH FLAGS
+.TP 5
+.B CURL_GLOBAL_ALL
+Initialize everything possible. This sets all known bits.
+.TP
+.B CURL_GLOBAL_SSL
+Initialize SSL
+.TP
+.B CURL_GLOBAL_WIN32
+Initialize the Win32 socket libraries. (added in libcurl 7.8.1)
+.TP
+.B CURL_GLOBAL_NOTHING
+Initialise nothing extra. This sets no bit.
+.SH RETURN VALUE
+If this function returns non-zero, something went wrong and you cannot use the
+other curl functions.
+.SH "SEE ALSO"
+.BR curl_global_cleanup "(3), "
+.SH BUGS
+None.
+
diff --git a/main/source/curl/docs/libcurl/curl_global_init.html b/main/source/curl/docs/libcurl/curl_global_init.html
new file mode 100644
index 00000000..681b77d4
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_global_init.html
@@ -0,0 +1,128 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_global_init - Global libcurl initialisation
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>CURLcode</B> <B>curl_global_init(long</B> <I>flags</I><B>);</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       This  function  should  only be called once (no matter how
+       many threads or libcurl sessions that'll be used) by every
+       application that uses libcurl.
+
+       If  this  function hasn't been invoked when <I>curl</I><B>_</B><I>easy</I><B>_</B><I>init</I>
+       is called, it will be done automatically by libcurl.
+
+       The flags option is a bit pattern that tells libcurl exact
+       what features to init, as described below. Set the desired
+       bits by ORing the values together.
+
+       You must however <B>always</B> use the <I>curl</I><B>_</B><I>global</I><B>_</B><I>cleanup</I>  func-
+       tion,  as  that  cannot be called automatically for you by
+       libcurl.
+
+       Calling this function more than  once  will  cause  unpre-
+       dictable results.
+
+       This function was added in libcurl 7.8.
+
+
+</PRE>
+<H2>FLAGS</H2><PRE>
+       <B>CURL_GLOBAL_ALL</B>
+            Initialize  everything  possible. This sets all known
+            bits.
+
+       <B>CURL_GLOBAL_SSL</B>
+            Initialize SSL
+
+       <B>CURL_GLOBAL_WIN32</B>
+            Initialize the  Win32  socket  libraries.  (added  in
+            libcurl 7.8.1)
+
+       <B>CURL_GLOBAL_NOTHING</B>
+            Initialise nothing extra. This sets no bit.
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       If  this  function  returns non-zero, something went wrong
+       and you cannot use the other curl functions.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>curl_global_cleanup(3)</B>,
+
+
+</PRE>
+<H2>BUGS</H2><PRE>
+       None.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_global_init.pdf b/main/source/curl/docs/libcurl/curl_global_init.pdf
new file mode 100644
index 00000000..9b40cd55
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_global_init.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_mprintf.3 b/main/source/curl/docs/libcurl/curl_mprintf.3
new file mode 100644
index 00000000..824aa03c
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_mprintf.3
@@ -0,0 +1,88 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: curl_mprintf.3,v 1.1 2002/03/04 10:09:49 bagder Exp $
+.\"
+.TH curl_printf 3 "20 April 2001" "libcurl 7.7.2" "libcurl Manual"
+.SH NAME
+curl_maprintf, curl_mfprintf, curl_mprintf, curl_msnprintf, curl_msprintf
+curl_mvaprintf, curl_mvfprintf, curl_mvprintf, curl_mvsnprintf,
+curl_mvsprintf - formatted output conversion
+.SH SYNOPSIS
+.B #include <curl/mprintf.h>
+.sp
+.BI "int curl_mprintf(const char *" format ", ...);"
+.br
+.BI "int curl_mfprintf(FILE *" fd ", const char *" format ", ...);"
+.br
+.BI "int curl_msprintf(char *" buffer ", const char *" format ", ...);"
+.br
+.BI "int curl_msnprintf(char *" buffer ", size_t " maxlength ", const char *" format ", ...);"
+.br
+.BI "int curl_mvprintf(const char *" format ", va_list " args ");"
+.br
+.BI "int curl_mvfprintf(FILE *" fd ", const char *" format ", va_list " args ");"
+.br
+.BI "int curl_mvsprintf(char *" buffer ", const char *" format ", va_list " args ");"
+.br
+.BI "int curl_mvsnprintf(char *" buffer ", size_t " maxlength ", const char *" format ", va_list " args ");"
+.br
+.BI "char *curl_maprintf(const char *" format ", ...);"
+.br
+.BI "char *curl_mvaprintf(const char *" format ", va_list " args ");"
+.SH DESCRIPTION
+These are all functions that produces output according to a format string and
+given arguments. These are mostly clones of the well-known C-style functions
+and there will be no detailed explanation of all available formatting rules
+and usage here.
+
+See this table for notable exceptions.
+.RS
+.TP
+.B curl_mprintf()
+Normal printf() clone.
+.TP
+.B curl_mfprintf()
+Normal fprinf() clone.
+.TP
+.B curl_msprintf()
+Normal sprintf() clone.
+.TP
+.B curl_msnprintf()
+snprintf() clone. Many systems don't have this. It is just like \fBsprintf\fP
+but with an extra argument after the buffer that specifies the length of the
+target buffer.
+.TP
+.B curl_mvprintf()
+Normal vprintf() clone.
+.TP
+.B curl_mvfprintf()
+Normal vfprintf() clone.
+.TP
+.B curl_mvsprintf()
+Normal vsprintf() clone.
+.TP
+.B curl_mvsnprintf()
+vsnprintf() clone.  Many systems don't have this. It is just like
+\fBvsprintf\fP but with an extra argument after the buffer that specifies the
+length of the target buffer.
+.TP
+.B curl_maprintf()
+Like printf() but returns the output string as a malloc()ed string. The
+returned string must be free()ed by the receiver.
+.TP
+.B curl_mvaprintf()
+Like curl_maprintf() but takes a va_list pointer argument instead of a
+variable amount of arguments.
+.RE
+
+To easily use all these cloned functions instead of the normal ones, #define
+_MPRINTF_REPLACE before you include the <curl/mprintf.h> file. Then all the
+normal names like printf, fprintf, sprintf etc will use the curl-functions
+instead.
+.SH RETURN VALUE
+The \fBcurl_maprintf\fP and \fBcurl_mvaprintf\fP functions return a pointer to
+a newly allocated string, or NULL it it failed.
+
+All other functions return the number of character they actually outputed.
+.SH "SEE ALSO"
+.BR printf "(3), " sprintf "(3), " fprintf "(3), " vprintf "(3) "
diff --git a/main/source/curl/docs/libcurl/curl_mprintf.html b/main/source/curl/docs/libcurl/curl_mprintf.html
new file mode 100644
index 00000000..ff655eb6
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_mprintf.html
@@ -0,0 +1,124 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_maprintf,         curl_mfprintf,        curl_mprintf,
+       curl_msnprintf,  curl_msprintf  curl_mvaprintf,  curl_mvf-
+       printf,  curl_mvprintf,  curl_mvsnprintf, curl_mvsprintf -
+       formatted output conversion
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/mprintf.h&gt;</B>
+
+       <B>int</B> <B>curl_mprintf(const</B> <B>char</B> <B>*</B><I>format</I><B>,</B> <B>...);</B>
+       <B>int</B> <B>curl_mfprintf(FILE</B> <B>*</B><I>fd</I><B>,</B> <B>const</B> <B>char</B> <B>*</B><I>format</I><B>,</B> <B>...);</B>
+       <B>int</B> <B>curl_msprintf(char</B> <B>*</B><I>buffer</I><B>,</B> <B>const</B> <B>char</B> <B>*</B><I>format</I><B>,</B> <B>...);</B>
+       <B>int</B> <B>curl_msnprintf(char</B> <B>*</B><I>buffer</I><B>,</B> <B>size_t</B>  <I>maxlength</I><B>,</B>  <B>const</B>
+       <B>char</B> <B>*</B><I>format</I><B>,</B> <B>...);</B>
+       <B>int</B> <B>curl_mvprintf(const</B> <B>char</B> <B>*</B><I>format</I><B>,</B> <B>va_list</B> <I>args</I><B>);</B>
+       <B>int</B>  <B>curl_mvfprintf(FILE</B>  <B>*</B><I>fd</I><B>,</B> <B>const</B> <B>char</B> <B>*</B><I>format</I><B>,</B> <B>va_list</B>
+       <I>args</I><B>);</B>
+       <B>int</B>  <B>curl_mvsprintf(char</B>  <B>*</B><I>buffer</I><B>,</B>  <B>const</B>  <B>char</B>   <B>*</B><I>format</I><B>,</B>
+       <B>va_list</B> <I>args</I><B>);</B>
+       <B>int</B>  <B>curl_mvsnprintf(char</B> <B>*</B><I>buffer</I><B>,</B> <B>size_t</B> <I>maxlength</I><B>,</B> <B>const</B>
+       <B>char</B> <B>*</B><I>format</I><B>,</B> <B>va_list</B> <I>args</I><B>);</B>
+       <B>char</B> <B>*curl_maprintf(const</B> <B>char</B> <B>*</B><I>format</I><B>,</B> <B>...);</B>
+       <B>char</B> <B>*curl_mvaprintf(const</B> <B>char</B> <B>*</B><I>format</I><B>,</B> <B>va_list</B> <I>args</I><B>);</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       These are all functions that produces output according  to
+       a  format  string  and  given  arguments. These are mostly
+       clones of the well-known C-style functions and there  will
+       be  no  detailed  explanation  of all available formatting
+       rules and usage here.
+
+       See this table for notable exceptions.
+
+              <B>curl_mprintf()</B>
+                     Normal printf() clone.
+
+              <B>curl_mfprintf()</B>
+                     Normal fprinf() clone.
+
+              <B>curl_msprintf()</B>
+                     Normal sprintf() clone.
+
+              <B>curl_msnprintf()</B>
+                     snprintf() clone. Many  systems  don't  have
+                     this.  It  is  just like <B>sprintf</B> but with an
+                     extra argument after the buffer that  speci-
+                     fies the length of the target buffer.
+
+              <B>curl_mvprintf()</B>
+                     Normal vprintf() clone.
+
+              <B>curl_mvfprintf()</B>
+                     Normal vfprintf() clone.
+                     Normal vsprintf() clone.
+
+              <B>curl_mvsnprintf()</B>
+                     vsnprintf()  clone.  Many systems don't have
+                     this. It is just like <B>vsprintf</B> but  with  an
+                     extra  argument after the buffer that speci-
+                     fies the length of the target buffer.
+
+              <B>curl_maprintf()</B>
+                     Like printf() but returns the output  string
+                     as  a malloc()ed string. The returned string
+                     must be free()ed by the receiver.
+
+              <B>curl_mvaprintf()</B>
+                     Like curl_maprintf()  but  takes  a  va_list
+                     pointer   argument  instead  of  a  variable
+                     amount of arguments.
+
+       To easily use all these cloned functions  instead  of  the
+       normal  ones,  #define _MPRINTF_REPLACE before you include
+       the &lt;curl/mprintf.h&gt; file. Then all the normal names  like
+       printf,  fprintf,  sprintf etc will use the curl-functions
+       instead.
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       The <B>curl_maprintf</B> and <B>curl_mvaprintf</B>  functions  return  a
+       pointer to a newly allocated string, or NULL it it failed.
+
+       All other functions return the number  of  character  they
+       actually outputed.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>printf(3)</B>, <B>sprintf(3)</B>, <B>fprintf(3)</B>, <B>vprintf(3)</B>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_mprintf.pdf b/main/source/curl/docs/libcurl/curl_mprintf.pdf
new file mode 100644
index 00000000..4aaacd7a
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_mprintf.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_multi_add_handle.3 b/main/source/curl/docs/libcurl/curl_multi_add_handle.3
new file mode 100644
index 00000000..1bea6216
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_multi_add_handle.3
@@ -0,0 +1,20 @@
+.\" $Id: curl_multi_add_handle.3,v 1.2 2002/03/07 08:50:19 bagder Exp $
+.\"
+.TH curl_multi_add_handle 3 "4 March 2002" "libcurl 7.9.5" "libcurl Manual"
+.SH NAME
+curl_multi_add_handle - add an easy handle to a multi session
+.SH SYNOPSIS
+#include <curl/curl.h>
+
+CURLMcode curl_multi_add_handle(CURLM *multi_handle, CURL *easy_handle);
+.ad
+.SH DESCRIPTION
+Adds a standard easy handle to the multi stack. This will make this multi
+handle control the specified easy handle.
+
+When an easy handle has been added to a multi stack, you can not and you must
+not use curl_easy_perform() on that handle!
+.SH RETURN VALUE
+CURLMcode type, general libcurl multi interface error code.
+.SH "SEE ALSO"
+.BR curl_multi_cleanup "(3)," curl_multi_init "(3)"
diff --git a/main/source/curl/docs/libcurl/curl_multi_add_handle.html b/main/source/curl/docs/libcurl/curl_multi_add_handle.html
new file mode 100644
index 00000000..d95cee48
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_multi_add_handle.html
@@ -0,0 +1,72 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_multi_add_handle - add an easy handle to a multi ses-
+       sion
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       #include &lt;curl/curl.h&gt;
+
+       CURLMcode curl_multi_add_handle(CURLM *multi_handle,  CURL
+       *easy_handle);
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       Adds  a standard easy handle to the multi stack. This will
+       make this multi handle control the specified easy  handle.
+
+       When  an  easy handle has been added to a multi stack, you
+       can not and you must not use curl_easy_perform()  on  that
+       handle!
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       CURLMcode  type,  general  libcurl  multi  interface error
+       code.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>curl_multi_cleanup(3)</B>,<B>curl_multi_init(3)</B>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_multi_add_handle.pdf b/main/source/curl/docs/libcurl/curl_multi_add_handle.pdf
new file mode 100644
index 00000000..5ac3cf30
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_multi_add_handle.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_multi_cleanup.3 b/main/source/curl/docs/libcurl/curl_multi_cleanup.3
new file mode 100644
index 00000000..95aeb3a1
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_multi_cleanup.3
@@ -0,0 +1,18 @@
+.\" $Id: curl_multi_cleanup.3,v 1.1 2002/03/04 10:09:49 bagder Exp $
+.\"
+.TH curl_multi_cleanup 3 "1 March 2002" "libcurl 7.9.5" "libcurl Manual"
+.SH NAME
+curl_multi_cleanup - close down a multi session
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "CURLMcode curl_multi_cleanup( CURLM *multi_handle );"
+.ad
+.SH DESCRIPTION
+Cleans up and removes a whole multi stack. It does not free or touch any
+individual easy handles in any way - they still need to be closed
+individually, using the usual curl_easy_cleanup() way.
+.SH RETURN VALUE
+CURLMcode type, general libcurl multi interface error code.
+.SH "SEE ALSO"
+.BR curl_multi_init "(3)," curl_easy_cleanup "(3)," curl_easy_init "(3)"
diff --git a/main/source/curl/docs/libcurl/curl_multi_cleanup.html b/main/source/curl/docs/libcurl/curl_multi_cleanup.html
new file mode 100644
index 00000000..f3ae3f61
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_multi_cleanup.html
@@ -0,0 +1,72 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_multi_cleanup - close down a multi session
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>CURLMcode</B> <B>curl_multi_cleanup(</B> <B>CURLM</B> <B>*multi_handle</B> <B>);</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       Cleans  up  and  removes  a whole multi stack. It does not
+       free or touch any individual easy handles  in  any  way  -
+       they still need to be closed individually, using the usual
+       curl_easy_cleanup() way.
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       CURLMcode type,  general  libcurl  multi  interface  error
+       code.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>curl_multi_init(3)</B>,<B>curl_easy_cleanup(3)</B>,<B>curl_easy_init(3)</B>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_multi_cleanup.pdf b/main/source/curl/docs/libcurl/curl_multi_cleanup.pdf
new file mode 100644
index 00000000..e9e38ed1
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_multi_cleanup.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_multi_fdset.3 b/main/source/curl/docs/libcurl/curl_multi_fdset.3
new file mode 100644
index 00000000..8e998a35
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_multi_fdset.3
@@ -0,0 +1,27 @@
+.\" $Id: curl_multi_fdset.3,v 1.3 2002/10/15 08:39:30 bagder Exp $
+.\"
+.TH curl_multi_fdset 3 "3 May 2002" "libcurl 7.9.5" "libcurl Manual"
+.SH NAME
+curl_multi_fdset - extracts file descriptor information from a multi handle
+.SH SYNOPSIS
+#include <curl/curl.h>
+
+CURLMcode curl_multi_fdset(CURLM *multi_handle,
+                           fd_set *read_fd_set,
+                           fd_set *write_fd_set,
+                           fd_set *exc_fd_set,
+                           int *max_fd);
+.ad
+.SH DESCRIPTION
+This function extracts file descriptor information from a given multi_handle.
+libcurl returns its fd_set sets. The application can use these to select() or
+poll() on. The curl_multi_perform() function should be called as soon as one
+of them are ready to be read from or written to.
+
+NOTE that once this call is made, you must not remove the sets you point to,
+as libcurl will need to be able to read them. It needs them after select()
+calls, to know if certain sockets are readable or writable.
+.SH RETURN VALUE
+CURLMcode type, general libcurl multi interface error code.
+.SH "SEE ALSO"
+.BR curl_multi_cleanup "(3)," curl_multi_init "(3)"
diff --git a/main/source/curl/docs/libcurl/curl_multi_fdset.html b/main/source/curl/docs/libcurl/curl_multi_fdset.html
new file mode 100644
index 00000000..cb8cc654
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_multi_fdset.html
@@ -0,0 +1,72 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_multi_fdset  -  extracts  file descriptor information
+       from a multi handle
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       #include &lt;curl/curl.h&gt;
+
+       CURLMcode curl_multi_fdset(CURLM *multi_handle,
+                                  fd_set *read_fd_set,
+                                  fd_set *write_fd_set,
+                                  fd_set *exc_fd_set,
+                                  int *max_fd);
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       This function extracts file descriptor information from  a
+       given  multi_handle.  libcurl returns its fd_set sets. The
+       application can use these to select() or  poll()  on.  The
+       curl_multi_perform()  function should be called as soon as
+       one of them are ready to be read from or written to.
+
+       NOTE that once this call is made, you must not remove  the
+       sets you point to, as libcurl will need to be able to read
+       them. It needs them after select() calls, to know if  cer-
+       tain sockets are readable or writable.
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       CURLMcode  type,  general  libcurl  multi  interface error
+       code.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>curl_multi_cleanup(3)</B>,<B>curl_multi_init(3)</B>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_multi_fdset.pdf b/main/source/curl/docs/libcurl/curl_multi_fdset.pdf
new file mode 100644
index 00000000..a34171db
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_multi_fdset.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_multi_info_read.3 b/main/source/curl/docs/libcurl/curl_multi_info_read.3
new file mode 100644
index 00000000..5b66946e
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_multi_info_read.3
@@ -0,0 +1,44 @@
+.\" $Id: curl_multi_info_read.3,v 1.2 2003/02/27 14:25:54 bagder Exp $
+.\"
+.TH curl_multi_info_read 3 "27 Feb 2002" "libcurl 7.10.3" "libcurl Manual"
+.SH NAME
+curl_multi_info_read - read multi stack informationals
+.SH SYNOPSIS
+#include <curl/curl.h>
+
+CURLMsg *curl_multi_info_read( CURLM *multi_handle,
+                               int *msgs_in_queue);
+.ad
+.SH DESCRIPTION
+Ask the multi handle if there are any messages/informationals from the
+individual transfers. Messages may include informationals such as an error
+code from the transfer or just the fact that a transfer is completed. More
+details on these should be written down as well.
+
+Repeated calls to this function will return a new struct each time, until a
+NULL is returned as a signal that there is no more to get at this point. The
+integer pointed to with \fImsgs_in_queue\fP will contain the number of
+remaining messages after this function was called.
+
+The data the returned pointer points to will not survive calling
+curl_multi_cleanup().
+
+The 'CURLMsg' struct is very simple and only contain very basic informations.
+If more involved information is wanted, the particular "easy handle" in
+present in that struct and can thus be used in subsequent regular
+curl_easy_getinfo() calls (or similar):
+
+ struct CURLMsg {
+   CURLMSG msg;       /* what this message means */
+   CURL *easy_handle; /* the handle it concerns */
+   union {
+     void *whatever;    /* message-specific data */
+     CURLcode result;   /* return code for transfer */
+   } data;
+ };
+.SH "RETURN VALUE"
+A pointer to a filled-in struct, or NULL if it failed or ran out of
+structs. It also writes the number of messages left in the queue (after this
+read) in the integer the second argument points to.
+.SH "SEE ALSO"
+.BR curl_multi_cleanup "(3), " curl_multi_init "(3), " curl_multi_perform "(3)"
diff --git a/main/source/curl/docs/libcurl/curl_multi_info_read.html b/main/source/curl/docs/libcurl/curl_multi_info_read.html
new file mode 100644
index 00000000..2d11a231
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_multi_info_read.html
@@ -0,0 +1,72 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_multi_info_read - read multi stack informationals
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       #include &lt;curl/curl.h&gt;
+
+       CURLMsg *curl_multi_info_read( CURLM *multi_handle,
+                                      int *msgs_in_queue);
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       Ask  the  multi  handle if there are any messages/informa-
+       tionals  from  the  individual  transfers.  Messages   may
+       include  informationals  such  as  an  error code from the
+       transfer or just the fact that a  transfer  is  completed.
+       More details on these should be written down as well.
+
+       Repeated  calls  to this function will return a new struct
+       each time, until a NULL is returned as a signal that there
+       is  no  more  to get at this point. The integer pointed to
+       with <I>msgs</I><B>_</B><I>in</I><B>_</B><I>queue</I> will contain the  number  of  remaining
+       messages after this function was called.
+
+       The  data  the returned pointer points to will not survive
+       calling curl_multi_cleanup().
+
+       The 'CURLMsg' struct is very simple and only contain  very
+       basic  informations.   If  more  involved  information  is
+       wanted, the particular "easy handle" in  present  in  that
+       struct   and  can  thus  be  used  in  subsequent  regular
+       curl_easy_getinfo() calls (or similar):
+
+        struct CURLMsg {
+          CURLMSG msg;       /* what this message means */
+          CURL *easy_handle; /* the handle it concerns */
+          union {
+            void *whatever;    /* message-specific data */
+            CURLcode result;   /* return code for transfer */
+          } data;
+        };
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       A pointer to a filled-in struct, or NULL if it  failed  or
+       ran  out of structs. It also writes the number of messages
+       left in the queue (after this read)  in  the  integer  the
+       second argument points to.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>curl_multi_cleanup(3)</B>, <B>curl_multi_init(3)</B>, <B>curl_multi_per-</B>
+       <B>form(3)</B>
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_multi_info_read.pdf b/main/source/curl/docs/libcurl/curl_multi_info_read.pdf
new file mode 100644
index 00000000..f6cb0e55
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_multi_info_read.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_multi_init.3 b/main/source/curl/docs/libcurl/curl_multi_init.3
new file mode 100644
index 00000000..148b7efc
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_multi_init.3
@@ -0,0 +1,22 @@
+.\" $Id: curl_multi_init.3,v 1.2 2002/03/07 08:50:19 bagder Exp $
+.\"
+.TH curl_multi_init 3 "1 March 2002" "libcurl 7.9.5" "libcurl Manual"
+.SH NAME
+curl_multi_init - Start a multi session
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "CURLM *curl_multi_init( );"
+.ad
+.SH DESCRIPTION
+This function returns a CURLM handle to be used as input to all the other
+multi-functions, sometimes refered to as a multi handle on some places in the
+documentation. This init call MUST have a corresponding call to
+\fIcurl_multi_cleanup\fP when the operation is complete.
+.SH RETURN VALUE
+If this function returns NULL, something went wrong and you cannot use the
+other curl functions.
+.SH "SEE ALSO"
+.BR curl_multi_cleanup "(3)," curl_global_init "(3)," curl_easy_init "(3)"
+.SH BUGS
+Surely there are some, you tell me!
diff --git a/main/source/curl/docs/libcurl/curl_multi_init.html b/main/source/curl/docs/libcurl/curl_multi_init.html
new file mode 100644
index 00000000..d47cd87f
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_multi_init.html
@@ -0,0 +1,74 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_multi_init - Start a multi session
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>CURLM</B> <B>*curl_multi_init(</B> <B>);</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       This  function  returns a CURLM handle to be used as input
+       to all the other multi-functions, sometimes refered to  as
+       a  multi  handle on some places in the documentation. This
+       init   call   MUST   have   a   corresponding   call    to
+       <I>curl</I><B>_</B><I>multi</I><B>_</B><I>cleanup</I> when the operation is complete.
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       If  this  function  returns NULL, something went wrong and
+       you cannot use the other curl functions.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>curl_multi_cleanup(3)</B>,<B>curl_global_init(3)</B>,<B>curl_easy_init(3)</B>
+
+
+</PRE>
+<H2>BUGS</H2><PRE>
+       Surely there are some, you tell me!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_multi_init.pdf b/main/source/curl/docs/libcurl/curl_multi_init.pdf
new file mode 100644
index 00000000..4f59ba7d
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_multi_init.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_multi_perform.3 b/main/source/curl/docs/libcurl/curl_multi_perform.3
new file mode 100644
index 00000000..1c2eb70c
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_multi_perform.3
@@ -0,0 +1,36 @@
+.\" $Id: curl_multi_perform.3,v 1.3 2002/12/03 12:40:13 bagder Exp $
+.\"
+.TH curl_multi_perform 3 "1 March 2002" "libcurl 7.9.5" "libcurl Manual"
+.SH NAME
+curl_multi_perform - reads/writes available data from each easy handle
+.SH SYNOPSIS
+#include <curl/curl.h>
+
+CURLMcode curl_multi_perform(CURLM *multi_handle, int *running_handles);
+.ad
+.SH DESCRIPTION
+When the app thinks there's data available for the multi_handle, it should
+call this function to read/write whatever there is to read or write right
+now. curl_multi_perform() returns as soon as the reads/writes are done. This
+function does not require that there actually is any data available for
+reading or that data can be written, it can be called just in case. It will
+write the number of handles that still transfer data in the second argument's
+integer-pointer.
+.SH "RETURN VALUE"
+CURLMcode type, general libcurl multi interface error code.
+
+If you receive \fICURLM_CALL_MULTI_PERFORM\fP, this basicly means that you
+should call \fIcurl_multi_perform\fP again, before you select() on more
+actions. You don't have to do it immediately, but the return code means that
+libcurl may have more data available to return or that there may be more data
+to send off before it is "satisfied".
+
+NOTE that this only returns errors etc regarding the whole multi stack. There
+might still have occurred problems on invidual transfers even when this
+function returns OK.
+.SH "TYPICAL USAGE"
+Most application will use \fIcurl_multi_fdset\fP to get the multi_handle's
+file descriptors, then it'll wait for action on them using select() and as
+soon as one or more of them are ready, \fIcurl_multi_perform\fP gets called.
+.SH "SEE ALSO"
+.BR curl_multi_cleanup "(3)," curl_multi_init "(3)"
diff --git a/main/source/curl/docs/libcurl/curl_multi_perform.html b/main/source/curl/docs/libcurl/curl_multi_perform.html
new file mode 100644
index 00000000..d817da14
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_multi_perform.html
@@ -0,0 +1,74 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_multi_perform - reads/writes available data from each
+       easy handle
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       #include &lt;curl/curl.h&gt;
+
+       CURLMcode  curl_multi_perform(CURLM   *multi_handle,   int
+       *running_handles);
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       When  the  app  thinks  there's  data  available  for  the
+       multi_handle, it should call this function  to  read/write
+       whatever   there   is   to   read   or  write  right  now.
+       curl_multi_perform() returns as soon as  the  reads/writes
+       are  done. This function does not require that there actu-
+       ally is any data available for reading or that data can be
+       written,  it can be called just in case. It will write the
+       number of handles that still transfer data in  the  second
+       argument's integer-pointer.
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       CURLMcode  type,  general  libcurl  multi  interface error
+       code.
+
+       If  you  receive  <I>CURLM</I><B>_</B><I>CALL</I><B>_</B><I>MULTI</I><B>_</B><I>PERFORM</I>,  this  basicly
+       means  that  you  should  call  <I>curl</I><B>_</B><I>multi</I><B>_</B><I>perform</I>  again,
+       before you select() on more actions. You don't have to  do
+       it immediately, but the return code means that libcurl may
+       have more data available to return or that  there  may  be
+       more data to send off before it is "satisfied".
+
+       NOTE that this only returns errors etc regarding the whole
+       multi stack. There might still have occurred  problems  on
+       invidual transfers even when this function returns OK.
+
+
+</PRE>
+<H2>TYPICAL USAGE</H2><PRE>
+       Most  application  will  use  <I>curl</I><B>_</B><I>multi</I><B>_</B><I>fdset</I>  to get the
+       multi_handle's  file  descriptors,  then  it'll  wait  for
+       action  on  them using select() and as soon as one or more
+       of them are ready, <I>curl</I><B>_</B><I>multi</I><B>_</B><I>perform</I> gets called.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>curl_multi_cleanup(3)</B>,<B>curl_multi_init(3)</B>
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_multi_perform.pdf b/main/source/curl/docs/libcurl/curl_multi_perform.pdf
new file mode 100644
index 00000000..1e47deb7
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_multi_perform.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_multi_remove_handle.3 b/main/source/curl/docs/libcurl/curl_multi_remove_handle.3
new file mode 100644
index 00000000..6bc86f1c
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_multi_remove_handle.3
@@ -0,0 +1,23 @@
+.\" $Id: curl_multi_remove_handle.3,v 1.4 2003/03/10 20:43:59 bagder Exp $
+.\"
+.TH curl_multi_remove_handle 3 "6 March 2002" "libcurl 7.9.5" "libcurl Manual"
+.SH NAME
+curl_multi_remove_handle - remove an easy handle from a multi session
+.SH SYNOPSIS
+#include <curl/curl.h>
+
+CURLMcode curl_multi_remove_handle(CURLM *multi_handle, CURL *easy_handle);
+.ad
+.SH DESCRIPTION
+Removes a given easy_handle from the multi_handle. This will make the
+specified easy handle be removed from this multi handle's control.
+
+When the easy handle has been removed from a multi stack, it is again
+perfectly legal to invoke \fIcurl_easy_perform()\fP on this easy handle.
+
+Removing a handle while being used, will effectively halt all transfers in
+progress.
+.SH RETURN VALUE
+CURLMcode type, general libcurl multi interface error code.
+.SH "SEE ALSO"
+.BR curl_multi_cleanup "(3)," curl_multi_init "(3)"
diff --git a/main/source/curl/docs/libcurl/curl_multi_remove_handle.html b/main/source/curl/docs/libcurl/curl_multi_remove_handle.html
new file mode 100644
index 00000000..18674069
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_multi_remove_handle.html
@@ -0,0 +1,72 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_multi_remove_handle  -  remove  an easy handle from a
+       multi session
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       #include &lt;curl/curl.h&gt;
+
+       CURLMcode  curl_multi_remove_handle(CURLM   *multi_handle,
+       CURL *easy_handle);
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       Removes  a  given  easy_handle from the multi_handle. This
+       will make the specified easy handle be removed  from  this
+       multi handle's control.
+
+       When  the easy handle has been removed from a multi stack,
+       it is again perfectly legal to invoke  <I>curl</I><B>_</B><I>easy</I><B>_</B><I>perform()</I>
+       on this easy handle.
+
+       Removing  a handle while being used, will effectively halt
+       all transfers in progress.
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       CURLMcode type,  general  libcurl  multi  interface  error
+       code.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>curl_multi_cleanup(3)</B>,<B>curl_multi_init(3)</B>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_multi_remove_handle.pdf b/main/source/curl/docs/libcurl/curl_multi_remove_handle.pdf
new file mode 100644
index 00000000..152f7e60
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_multi_remove_handle.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_slist_append.3 b/main/source/curl/docs/libcurl/curl_slist_append.3
new file mode 100644
index 00000000..e0a78775
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_slist_append.3
@@ -0,0 +1,38 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: curl_slist_append.3,v 1.2 2003/02/21 15:19:50 bagder Exp $
+.\"
+.TH curl_slist_append 3 "21 Feb 2003" "libcurl 7.10.4" "libcurl Manual"
+.SH NAME
+curl_slist_append - add a string to an slist
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "struct curl_slist *curl_slist_append(struct curl_slist *" list,
+.BI "const char * "string ");"
+.ad
+.SH DESCRIPTION
+curl_slist_append() appends a specified string to a linked list of
+strings. The existing \fIlist\fP should be passed as the first argument while
+the new list is returned from this function. The specified \fIstring\fP has
+been appended when this function returns.
+
+The list should be freed again (after usage) with \fBcurl_slist_free_all()\fP.
+.SH RETURN VALUE
+A null pointer is returned if anything went wrong, otherwise the new list
+pointer is returned.
+.SH EXAMPLE
+ CURL handle;
+ curl_slist *slist=NULL;
+
+ slist = curl_slist_append(slist, "pragma:");
+ curl_easy_setopt(handle, CURLOPT_HTTPHEADER, slist);
+
+ curl_easy_perform(handle);
+
+ curl_slist_free_all(slist); /* free the list again */
+.SH "SEE ALSO"
+.BR curl_slist_free_all "(3), "
+.SH BUGS
+None.
+
diff --git a/main/source/curl/docs/libcurl/curl_slist_append.html b/main/source/curl/docs/libcurl/curl_slist_append.html
new file mode 100644
index 00000000..ba159bdd
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_slist_append.html
@@ -0,0 +1,76 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_slist_append - add a string to an slist
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>struct</B>   <B>curl_slist</B>  <B>*curl_slist_append(struct</B>  <B>curl_slist</B>
+       <B>*</B><I>list,</I> <B>const</B> <B>char</B> <B>*</B> <I>string</I><B>);</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       curl_slist_append() appends a specified string to a linked
+       list of strings. The existing <I>list</I> should be passed as the
+       first argument while the new list is  returned  from  this
+       function. The specified <I>string</I> has been appended when this
+       function returns.
+
+       The  list  should  be  freed  again  (after  usage)   with
+       <B>curl_slist_free_all()</B>.
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       A  null pointer is returned if anything went wrong, other-
+       wise the new list pointer is returned.
+
+
+</PRE>
+<H2>EXAMPLE</H2><PRE>
+        CURL handle;
+        curl_slist *slist=NULL;
+
+        slist = curl_slist_append(slist, "pragma:");
+        curl_easy_setopt(handle, CURLOPT_HTTPHEADER, slist);
+
+        curl_easy_perform(handle);
+
+        curl_slist_free_all(slist); /* free the list again */
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>curl_slist_free_all(3)</B>,
+
+
+</PRE>
+<H2>BUGS</H2><PRE>
+       None.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_slist_append.pdf b/main/source/curl/docs/libcurl/curl_slist_append.pdf
new file mode 100644
index 00000000..cd2fe4e5
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_slist_append.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_slist_free_all.3 b/main/source/curl/docs/libcurl/curl_slist_free_all.3
new file mode 100644
index 00000000..f820750f
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_slist_free_all.3
@@ -0,0 +1,22 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: curl_slist_free_all.3,v 1.1 2002/03/04 10:09:49 bagder Exp $
+.\"
+.TH curl_slist_free_all 3 "5 March 2001" "libcurl 7.0" "libcurl Manual"
+.SH NAME
+curl_slist_free_all - free an entire curl_slist list
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "void curl_slist_free_all(struct curl_slist *" list);
+.ad
+.SH DESCRIPTION
+curl_slist_free_all() removes all traces of a previously built curl_slist
+linked list.
+.SH RETURN VALUE
+Nothing.
+.SH "SEE ALSO"
+.BR curl_slist_append "(3), "
+.SH BUGS
+Surely there are some, you tell me!
+
diff --git a/main/source/curl/docs/libcurl/curl_slist_free_all.html b/main/source/curl/docs/libcurl/curl_slist_free_all.html
new file mode 100644
index 00000000..dd41f963
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_slist_free_all.html
@@ -0,0 +1,74 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_slist_free_all - free an entire curl_slist list
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>void</B> <B>curl_slist_free_all(struct</B> <B>curl_slist</B> <B>*</B><I>list);</I>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       curl_slist_free_all()  removes  all traces of a previously
+       built curl_slist linked list.
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       Nothing.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>curl_slist_append(3)</B>,
+
+
+</PRE>
+<H2>BUGS</H2><PRE>
+       Surely there are some, you tell me!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_slist_free_all.pdf b/main/source/curl/docs/libcurl/curl_slist_free_all.pdf
new file mode 100644
index 00000000..0589592a
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_slist_free_all.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_strequal.3 b/main/source/curl/docs/libcurl/curl_strequal.3
new file mode 100644
index 00000000..0d6c90ce
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_strequal.3
@@ -0,0 +1,30 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: curl_strequal.3,v 1.1 2002/03/04 10:09:49 bagder Exp $
+.\"
+.TH curl_strequal 3 "20 April 2001" "libcurl 7.7.2" "libcurl Manual"
+.SH NAME
+curl_strequal, curl_strnequal - case insensitive string comparisons
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "int curl_strequal(char *" str1 ", char *" str2 ");"
+.sp
+.BI "int curl_strenqual(char *" str1 ", char *" str2 ", size_t " len ");"
+.SH DESCRIPTION
+The
+.B curl_strequal()
+function compares the two strings \fIstr1\fP and \fIstr2\fP, ignoring the case
+of the characters. It returns a non-zero (TRUE) integer if the strings are
+identical.
+.sp
+The \fBcurl_strnequal()\fP function is similar, except it only compares the
+first \fIlen\fP characters of \fIstr1\fP.
+.sp
+These functions are provided by libcurl to enable applications to compare
+strings in a truly portable manner. There are no standard portable case
+insensitive string comparison functions. These two works on all platforms.
+.SH RETURN VALUE
+Non-zero if the strings are identical. Zero if they're not.
+.SH "SEE ALSO"
+.BR strcmp "(3), " strcasecmp "(3)"
diff --git a/main/source/curl/docs/libcurl/curl_strequal.html b/main/source/curl/docs/libcurl/curl_strequal.html
new file mode 100644
index 00000000..3f639fd7
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_strequal.html
@@ -0,0 +1,72 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_strequal,  curl_strnequal  -  case insensitive string
+       comparisons
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>int</B> <B>curl_strequal(char</B> <B>*</B><I>str1</I><B>,</B> <B>char</B> <B>*</B><I>str2</I><B>);</B>
+
+       <B>int</B> <B>curl_strenqual(char</B> <B>*</B><I>str1</I><B>,</B> <B>char</B> <B>*</B><I>str2</I><B>,</B> <B>size_t</B> <I>len</I><B>);</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       The <B>curl_strequal()</B> function compares the two strings <I>str1</I>
+       and  <I>str2</I>, ignoring the case of the characters. It returns
+       a non-zero (TRUE) integer if the strings are identical.
+
+       The <B>curl_strnequal()</B> function is similar, except  it  only
+       compares the first <I>len</I> characters of <I>str1</I>.
+
+       These functions are provided by libcurl to enable applica-
+       tions to compare strings in a truly portable manner. There
+       are  no standard portable case insensitive string compari-
+       son functions. These two works on all platforms.
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       Non-zero if the strings are  identical.  Zero  if  they're
+       not.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>strcmp(3)</B>, <B>strcasecmp(3)</B>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_strequal.pdf b/main/source/curl/docs/libcurl/curl_strequal.pdf
new file mode 100644
index 00000000..893e77f5
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_strequal.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_strnequal.3 b/main/source/curl/docs/libcurl/curl_strnequal.3
new file mode 100644
index 00000000..bc3d8299
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_strnequal.3
@@ -0,0 +1 @@
+.so curl_strequal.3
diff --git a/main/source/curl/docs/libcurl/curl_strnequal.html b/main/source/curl/docs/libcurl/curl_strnequal.html
new file mode 100644
index 00000000..3f639fd7
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_strnequal.html
@@ -0,0 +1,72 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_strequal,  curl_strnequal  -  case insensitive string
+       comparisons
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>int</B> <B>curl_strequal(char</B> <B>*</B><I>str1</I><B>,</B> <B>char</B> <B>*</B><I>str2</I><B>);</B>
+
+       <B>int</B> <B>curl_strenqual(char</B> <B>*</B><I>str1</I><B>,</B> <B>char</B> <B>*</B><I>str2</I><B>,</B> <B>size_t</B> <I>len</I><B>);</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       The <B>curl_strequal()</B> function compares the two strings <I>str1</I>
+       and  <I>str2</I>, ignoring the case of the characters. It returns
+       a non-zero (TRUE) integer if the strings are identical.
+
+       The <B>curl_strnequal()</B> function is similar, except  it  only
+       compares the first <I>len</I> characters of <I>str1</I>.
+
+       These functions are provided by libcurl to enable applica-
+       tions to compare strings in a truly portable manner. There
+       are  no standard portable case insensitive string compari-
+       son functions. These two works on all platforms.
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       Non-zero if the strings are  identical.  Zero  if  they're
+       not.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <B>strcmp(3)</B>, <B>strcasecmp(3)</B>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_strnequal.pdf b/main/source/curl/docs/libcurl/curl_strnequal.pdf
new file mode 100644
index 00000000..893e77f5
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_strnequal.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_unescape.3 b/main/source/curl/docs/libcurl/curl_unescape.3
new file mode 100644
index 00000000..3f6623b0
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_unescape.3
@@ -0,0 +1,27 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: curl_unescape.3,v 1.3 2002/09/25 12:11:12 bagder Exp $
+.\"
+.TH curl_unescape 3 "22 March 2001" "libcurl 7.7" "libcurl Manual"
+.SH NAME
+curl_unescape - URL decodes the given string
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "char *curl_unescape( char *" url ", int "length " );"
+.ad
+.SH DESCRIPTION
+This function will convert the given URL encoded input string to a "plain
+string" and return that as a new allocated string. All input characters that
+are URL encoded (%XX where XX is a two-digit hexadecimal number, or +) will be
+converted to their plain text versions (up to a ? letter, no + letters to the
+right of a ? letter will be converted).
+
+If the 'length' argument is set to 0, curl_unescape() will use strlen() on the
+input 'url' string to find out the size.
+
+You must curl_free() the returned string when you're done with it.
+.SH RETURN VALUE
+A pointer to a zero terminated string or NULL if it failed.
+.SH "SEE ALSO"
+.I curl_escape(), curl_free(), RFC 2396
diff --git a/main/source/curl/docs/libcurl/curl_unescape.html b/main/source/curl/docs/libcurl/curl_unescape.html
new file mode 100644
index 00000000..30079b0f
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_unescape.html
@@ -0,0 +1,72 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_unescape - URL decodes the given string
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>char</B> <B>*curl_unescape(</B> <B>char</B> <B>*</B><I>url</I><B>,</B> <B>int</B> <I>length</I> <B>);</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       This  function  will  convert  the given URL encoded input
+       string to a "plain string" and return that as a new  allo-
+       cated  string.  All  input characters that are URL encoded
+       (%XX where XX is a two-digit  hexadecimal  number,  or  +)
+       will  be converted to their plain text versions (up to a ?
+       letter, no + letters to the right of a ?  letter  will  be
+       converted).
+
+       If the 'length' argument is set to 0, curl_unescape() will
+       use strlen() on the input 'url' string  to  find  out  the
+       size.
+
+       You  must curl_free() the returned string when you're done
+       with it.
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       A pointer to a  zero  terminated  string  or  NULL  if  it
+       failed.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <I>curl</I><B>_</B><I>escape(),</I> <I>curl</I><B>_</B><I>free(),</I> <I>RFC</I> <I>2396</I>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_unescape.pdf b/main/source/curl/docs/libcurl/curl_unescape.pdf
new file mode 100644
index 00000000..c842fbde
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_unescape.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_version.3 b/main/source/curl/docs/libcurl/curl_version.3
new file mode 100644
index 00000000..c8a12a0f
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_version.3
@@ -0,0 +1,27 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: curl_version.3,v 1.1 2002/03/04 10:09:49 bagder Exp $
+.\"
+.TH curl_version 3 "5 March 2001" "libcurl 7.0" "libcurl Manual"
+.SH NAME
+curl_version - returns the libcurl version string
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "char *curl_version( );"
+.ad
+.SH DESCRIPTION
+Returns a human readable string with the version number of libcurl and some of
+its important components (like OpenSSL version).
+
+Note: this returns the actual running lib's version, you might have installed
+a newer lib's include files in your system which may turn your LIBCURL_VERSION
+#define value to differ from this result.
+.SH RETURN VALUE
+A pointer to a zero terminated string.
+.SH "SEE ALSO"
+The
+.I LIBCURL_VERSION
+#define in <curl/curl.h>
+.SH BUGS
+Surely there are some, you tell me!
diff --git a/main/source/curl/docs/libcurl/curl_version.html b/main/source/curl/docs/libcurl/curl_version.html
new file mode 100644
index 00000000..adb5c084
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_version.html
@@ -0,0 +1,74 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_version - returns the libcurl version string
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>char</B> <B>*curl_version(</B> <B>);</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       Returns a human readable string with the version number of
+       libcurl and some of its important components (like OpenSSL
+       version).
+
+       Note:  this  returns the actual running lib's version, you
+       might have installed a newer lib's include files  in  your
+       system  which  may turn your LIBCURL_VERSION #define value
+       to differ from this result.
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       A pointer to a zero terminated string.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       The <I>LIBCURL</I><B>_</B><I>VERSION</I> #define in &lt;curl/curl.h&gt;
+
+
+</PRE>
+<H2>BUGS</H2><PRE>
+       Surely there are some, you tell me!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_version.pdf b/main/source/curl/docs/libcurl/curl_version.pdf
new file mode 100644
index 00000000..073ea6a9
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_version.pdf differ
diff --git a/main/source/curl/docs/libcurl/curl_version_info.3 b/main/source/curl/docs/libcurl/curl_version_info.3
new file mode 100644
index 00000000..c857b1d0
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_version_info.3
@@ -0,0 +1,93 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: curl_version_info.3,v 1.2 2002/09/30 19:51:05 bagder Exp $
+.\"
+.TH curl_version_info 3 "30 Sep 2002" "libcurl 7.10" "libcurl Manual"
+.SH NAME
+curl_version_info - returns run-time libcurl version info
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "curl_version_info_data *curl_version_info( CURLversion "type ");"
+.ad
+.SH DESCRIPTION
+Returns a pointer to a filled in struct with information about various
+run-time features in libcurl. \fItype\fP should be set to the version of this
+functionality by the time you write your program. This way, libcurl will
+always return a proper struct that your program understands, while programs in
+the future might get an different struct. CURLVERSION_NOW will be the most
+recent one for the library you have installed:
+
+        data = curl_version_info(CURLVERSION_NOW);
+
+Applications should use this information to judge if things are possible to do
+or not, instead of using compile-time checks, as dynamic/DLL libraries can be
+changed independent of applications.
+
+The curl_version_info_data struct looks like this
+
+.nf
+typedef struct {
+  CURLversion age;          /* 0 - this kind of struct */
+  const char *version;      /* human readable string */
+  unsigned int version_num; /* numeric representation */
+  const char *host;         /* human readable string */
+  int features;             /* bitmask, see below */
+  char *ssl_version;        /* human readable string */
+  long ssl_version_num;     /* number */
+  char *libz_version;       /* human readable string */
+  const char *protocols[];  /* list of protocols */
+} curl_version_info_data;
+.fi
+
+\fIage\fP describes what kind of struct this is. It is always 0 now. In a
+future libcurl, if this struct changes, this age counter may be increased, and
+then the struct for number 1 will look different (except for this first struct
+field).
+
+\fIversion\fP is just an ascii string for the libcurl version.
+
+\fIversion_num\fP is a 6 digit hexadecimal number created like this: <2 digits
+major number> | <2 digits minor number> | <2 digits patch number>. Version
+7.9.8 is therefore returned as 0x070908.
+
+\fIhost\fP is an ascii string showing what host information that this libcurl
+was built for. As discovered by a configure script or set by the build
+environment.
+
+\fIfeatures\fP can have none, one or more bits set, and the currently defined
+bits are:
+.TP 5.5
+.B CURL_VERSION_IPV6
+supports IPv6
+.TP
+.B CURL_VERSION_KERBEROS4
+supports kerberos4 (when using FTP)
+.TP
+.B CURL_VERSION_SSL
+supports SSL (HTTPS/FTPS)
+.TP
+.B CURL_VERSION_LIBZ
+supports HTTP deflate using libz
+.PP
+\fIssl_version\fP is an ascii string for the OpenSSL version used. If libcurl
+has no SSL support, this is NULL.
+
+\fIssl_version_num\fP is the numerical OpenSSL version value as defined by the
+OpenSSL project. If libcurl has no SSL support, this is 0.
+
+\fIlibz_version\fP is an ascii string (there is no numerical version). If
+libcurl has no libz support, this is NULL.
+
+\fIprotocols\fP is a pointer to an array of char * pointers, containing the
+names protocols that libcurl supports (using lowercase letters). The protocol
+names are the same as would be used in URLs. The array is terminated by a NULL
+entry.
+
+
+.SH RETURN VALUE
+A pointer to a curl_version_info_data struct.
+.SH "SEE ALSO"
+\fIcurl_version(3)\fP
+.SH BUGS
+No known bugs.
diff --git a/main/source/curl/docs/libcurl/curl_version_info.html b/main/source/curl/docs/libcurl/curl_version_info.html
new file mode 100644
index 00000000..726fd4fb
--- /dev/null
+++ b/main/source/curl/docs/libcurl/curl_version_info.html
@@ -0,0 +1,126 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       curl_version_info - returns run-time libcurl version info
+
+
+</PRE>
+<H2>SYNOPSIS</H2><PRE>
+       <B>#include</B> <B>&lt;curl/curl.h&gt;</B>
+
+       <B>curl_version_info_data</B>   <B>*curl_version_info(</B>   <B>CURLversion</B>
+       <I>type</I><B>);</B>
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       Returns a pointer to a filled in struct  with  information
+       about various run-time features in libcurl. <I>type</I> should be
+       set to the version of this functionality by the  time  you
+       write your program. This way, libcurl will always return a
+       proper struct that your program  understands,  while  pro-
+       grams  in  the  future  might  get  an  different  struct.
+       CURLVERSION_NOW will  be  the  most  recent  one  for  the
+       library you have installed:
+
+               data = curl_version_info(CURLVERSION_NOW);
+
+       Applications  should  use  this  information  to  judge if
+       things are possible to do or not, instead  of  using  com-
+       pile-time  checks, as dynamic/DLL libraries can be changed
+       independent of applications.
+
+       The curl_version_info_data struct looks like this
+
+       typedef struct {
+         CURLversion age;          /* 0 - this kind of struct */
+         const char *version;      /* human readable string */
+         unsigned int version_num; /* numeric representation */
+         const char *host;         /* human readable string */
+         int features;             /* bitmask, see below */
+         char *ssl_version;        /* human readable string */
+         long ssl_version_num;     /* number */
+         char *libz_version;       /* human readable string */
+         const char *protocols[];  /* list of protocols */
+       } curl_version_info_data;
+
+       <I>age</I> describes what kind of struct this is. It is always  0
+       now. In a future libcurl, if this struct changes, this age
+       counter may be increased, and then the struct for number 1
+       will  look different (except for this first struct field).
+
+       <I>version</I> is just an ascii string for the libcurl version.
+
+       <I>version</I><B>_</B><I>num</I> is a 6 digit hexadecimal number  created  like
+       this:  &lt;2 digits major number&gt; | &lt;2 digits minor number&gt; |
+       &lt;2  digits  patch  number&gt;.  Version  7.9.8  is  therefore
+       returned as 0x070908.
+
+       <I>host</I> is an ascii string showing what host information that
+
+       <I>features</I> can have none, one or more bits set, and the cur-
+       rently defined bits are:
+
+        <B>CURL_VERSION_IPV6</B>
+             supports IPv6
+
+        <B>CURL_VERSION_KERBEROS4</B>
+             supports kerberos4 (when using FTP)
+
+        <B>CURL_VERSION_SSL</B>
+             supports SSL (HTTPS/FTPS)
+
+        <B>CURL_VERSION_LIBZ</B>
+             supports HTTP deflate using libz
+
+       <I>ssl</I><B>_</B><I>version</I> is an ascii string  for  the  OpenSSL  version
+       used. If libcurl has no SSL support, this is NULL.
+
+       <I>ssl</I><B>_</B><I>version</I><B>_</B><I>num</I>  is the numerical OpenSSL version value as
+       defined by the OpenSSL project. If libcurl has no SSL sup-
+       port, this is 0.
+
+       <I>libz</I><B>_</B><I>version</I>  is  an  ascii  string (there is no numerical
+       version). If libcurl has no libz support, this is NULL.
+
+       <I>protocols</I> is a pointer to an array  of  char  *  pointers,
+       containing  the  names  protocols  that  libcurl  supports
+       (using lowercase letters). The protocol names are the same
+       as  would  be  used  in URLs. The array is terminated by a
+       NULL entry.
+
+
+
+
+</PRE>
+<H2>RETURN VALUE</H2><PRE>
+       A pointer to a curl_version_info_data struct.
+
+
+</PRE>
+<H2>SEE ALSO</H2><PRE>
+       <I>curl</I><B>_</B><I>version(3)</I>
+
+
+</PRE>
+<H2>BUGS</H2><PRE>
+       No known bugs.
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/curl_version_info.pdf b/main/source/curl/docs/libcurl/curl_version_info.pdf
new file mode 100644
index 00000000..03cbc2fc
Binary files /dev/null and b/main/source/curl/docs/libcurl/curl_version_info.pdf differ
diff --git a/main/source/curl/docs/libcurl/index.html b/main/source/curl/docs/libcurl/index.html
new file mode 100644
index 00000000..05356793
--- /dev/null
+++ b/main/source/curl/docs/libcurl/index.html
@@ -0,0 +1,52 @@
+<HTML>
+<HEAD>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>Index to libcurl documentation</TITLE>
+</HEAD>
+
+<BODY>
+<H1 ALIGN="CENTER">Index to libcurl documentation</H1>
+
+<H2>Programs</H2>
+<P><A HREF="../index.html">curl and tools</A>
+
+<h2>Overviews</h2>
+<A HREF="libcurl.html">libcurl</A>
+<br><a href="libcurl-multi.html">libcurl-multi</a>
+<br><a href="libcurl-errors.html">libcurl-errors</a>
+<br><a href="../libcurl-the-guide">libcurl-the-guide</a> (plain text)
+
+<H2>Library Functions (A-Z)</H2>
+<a href="curl_easy_cleanup.html">curl_easy_cleanup</A>
+<br><a href="curl_easy_duphandle.html">curl_easy_duphandle</A>
+<br><a href="curl_easy_getinfo.html">curl_easy_getinfo</A>
+<br><a href="curl_easy_init.html">curl_easy_init</A>
+<br><a href="curl_easy_perform.html">curl_easy_perform</A>
+<br><a href="curl_easy_setopt.html">curl_easy_setopt</A>
+<br><a href="curl_escape.html">curl_escape</A>
+<br><a href="curl_formadd.html">curl_formadd</A>
+<br><a href="curl_formfree.html">curl_formfree</A>
+<br><a href="curl_formparse.html">curl_formparse</A>
+<br><a href="curl_free.html">curl_free</A>
+<br><a href="curl_getdate.html">curl_getdate</A>
+<br><a href="curl_getenv.html">curl_getenv</A>
+<br><a href="curl_global_cleanup.html">curl_global_cleanup</A>
+<br><a href="curl_global_init.html">curl_global_init</A>
+<br><a href="curl_mprintf.html">curl_mprintf</A>
+<br><a href="curl_multi_add_handle.html">curl_multi_add_handle</a>
+<br><a href="curl_multi_cleanup.html">curl_multi_cleanup</a>
+<br><a href="curl_multi_fdset.html">curl_multi_fdset</a>
+<br><a href="curl_multi_info_read.html">curl_multi_info_read</a>
+<br><a href="curl_multi_init.html">curl_multi_init</a>
+<br><a href="curl_multi_perform.html">curl_multi_perform</a>
+<br><a href="curl_multi_remove_handle.html">curl_multi_remove_handle</a>
+<br><a href="curl_slist_append.html">curl_slist_append</A>
+<br><a href="curl_slist_free_all.html">curl_slist_free_all</A>
+<br><a href="curl_strequal.html">curl_strequal</A>
+<br><a href="curl_strnequal.html">curl_strnequal</A>
+<br><a href="curl_unescape.html">curl_unescape</A>
+<br><a href="curl_version.html">curl_version</A>
+<br><a href="curl_version_info.html">curl_version_info</A>
+
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/libcurl-errors.3 b/main/source/curl/docs/libcurl/libcurl-errors.3
new file mode 100644
index 00000000..b809a84a
--- /dev/null
+++ b/main/source/curl/docs/libcurl/libcurl-errors.3
@@ -0,0 +1,240 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: libcurl-errors.3,v 1.3 2002/12/18 16:51:02 bagder Exp $
+.\"
+.TH libcurl-errors 3 "18 Dec 2002" "libcurl 7.10.3" "libcurl errors"
+.SH NAME
+error codes in libcurl
+.SH DESCRIPTION
+This man page includes most, if not all, available error codes in libcurl.
+Why they occur and possibly what you can do to fix the problem.
+.SH "CURLcode"
+Almost all "easy" interface functions return a CURLcode error code. No matter
+what, using \fICURLOPT_ERRORBUFFER\fP is a good idea as it will give you a
+human readable error string that may offer more details about the error cause
+than just the error code does.
+
+This man page is meant to describe libcurl 7.9.6 and later. Earlier versions
+might have had quirks not mentioned here.
+
+CURLcode is one of the following:
+.RS 1
+.TP 5
+.B CURLE_OK (0)
+All fine. Proceed as usual.
+.TP
+.B CURLE_UNSUPPORTED_PROTOCOL (1)
+The URL you passed to libcurl used a protocol that this libcurl does not
+support. The support might be a compile-time option that you didn't use, it
+can be a misspelled protocol string or just a protocol libcurl has no code
+for.
+.TP
+.B CURLE_FAILED_INIT (2)
+Very early initialization code failed. This is likely to be an internal error
+or problem.
+.TP
+.B CURLE_URL_MALFORMAT (3)
+The URL was not properly formatted.
+.TP
+.B CURLE_URL_MALFORMAT_USER (4)
+URL user malformatted. The user-part of the URL syntax was not correct.
+.TP
+.B CURLE_COULDNT_RESOLVE_PROXY (5)
+Couldn't resolve proxy. The given proxy host could not be resolved.
+.TP
+.B CURLE_COULDNT_RESOLVE_HOST (6)
+Couldn't resolve host. The given remote host was not resolved.
+.TP
+.B CURLE_COULDNT_CONNECT (7)
+Failed to connect() to host or proxy.
+.TP
+.B CURLE_FTP_WEIRD_SERVER_REPLY (8)
+After connecting to a FTP server, libcurl expects to get a certain reply back.
+This error code implies that it god a strange or bad reply. The given remote
+server is probably not an OK FTP server.
+.TP
+.B CURLE_FTP_ACCESS_DENIED (9)
+We were denied access when trying to login to an FTP server or when trying to
+change working directory to the one given in the URL.
+.TP
+.B CURLE_FTP_USER_PASSWORD_INCORRECT (10)
+The username and/or the password were incorrect when trying to login to an FTP
+server.
+.TP
+.B CURLE_FTP_WEIRD_PASS_REPLY (11)
+After having sent the FTP password to the server, libcurl expects a proper
+reply. This error code indicates that an unexpected code was returned.
+.TP
+.B CURLE_FTP_WEIRD_USER_REPLY (12)
+After having sent user name to the FTP server, libcurl expects a proper
+reply. This error code indicates that an unexpected code was returned.
+.TP
+.B CURLE_FTP_WEIRD_PASV_REPLY (13)
+libcurl failed to get a sensible result back from the server as a response to
+either a PASV or a EPSV command. The server is flawed.
+.TP
+.B CURLE_FTP_WEIRD_227_FORMAT (14)
+FTP servers return a 227-line as a response to a PASV command. If libcurl
+fails to parse that line, this return code is passed back.
+.TP
+.B CURLE_FTP_CANT_GET_HOST (15)
+An internal failure to lookup the host used for the new connection.
+.TP
+.B CURLE_FTP_CANT_RECONNECT (16)
+A bad return code on either PASV or EPSV was sent by the FTP server,
+preventing libcurl from being able to continue.
+.TP
+.B CURLE_FTP_COULDNT_SET_BINARY (17)
+Received an error when trying to set the transfer mode to binary.
+.TP
+.B CURLE_PARTIAL_FILE (18)
+A file transfer was shorter or larger than expected. This happens when the
+server first reports an expected transfer size, and then delivers data that
+doesn't match the previously given size.
+.TP
+.B CURLE_FTP_COULDNT_RETR_FILE (19)
+This was either a weird reply to a 'RETR' command or a zero byte transfer
+complete.
+.TP
+.B CURLE_FTP_WRITE_ERROR (20)
+After a completed file transfer, the FTP server did not respond a proper
+\"transfer successful\" code.
+.TP
+.B CURLE_FTP_QUOTE_ERROR (21)
+When sending custom "QUOTE" commands to the remote server, one of the commands
+returned an error code that was 400 or higher.
+.TP
+.B CURLE_HTTP_RETURNED_ERROR (22)
+This is returned if CURLOPT_FAILONERROR is set TRUE and the HTTP server
+returns an error code that is >= 400.
+.TP
+.B CURLE_WRITE_ERROR (23)
+An error occurred when writing received data to a local file, or an error was
+returned to libcurl from a write callback.
+.TP
+.B CURLE_MALFORMAT_USER (24)
+Malformat user. User name badly specified. *Not currently used*
+.TP
+.B CURLE_FTP_COULDNT_STOR_FILE (25)
+FTP couldn't STOR file. The server denied the STOR operation. The error buffer
+usually contains the server's explanation to this.
+.TP
+.B CURLE_READ_ERROR (26)
+There was a problem reading a local file or an error returned by the read
+callback.
+.TP
+.B CURLE_OUT_OF_MEMORY (27)
+Out of memory. A memory allocation request failed. This is serious badness and
+things are severly screwed up if this ever occur.
+.TP
+.B CURLE_OPERATION_TIMEOUTED (28)
+Operation timeout. The specified time-out period was reached according to the
+conditions.
+.TP
+.B CURLE_FTP_COULDNT_SET_ASCII (29)
+libcurl failed to set ASCII transfer type (TYPE A).
+.TP
+.B CURLE_FTP_PORT_FAILED (30)
+The FTP PORT command returned error. This mostly happen when you haven't
+specified a good enough address for libcurl to use. See \fICURLOPT_FTPPORT\fP.
+.TP
+.B CURLE_FTP_COULDNT_USE_REST (31)
+The FTP REST command returned error. This should never happen if the server is
+sane.
+.TP
+.B CURLE_FTP_COULDNT_GET_SIZE (32)
+The FTP SIZE command returned errror. SIZE is not a kosher FTP command, it is
+an extension and not all servers support it. This is not a surprising error.
+.TP
+.B CURLE_HTTP_RANGE_ERROR (33)
+The HTTP server does not support or accept range requests.
+.TP
+.B CURLE_HTTP_POST_ERROR (34)
+This is an odd error that mainly occurs due to internal confusion.
+.TP
+.B CURLE_SSL_CONNECT_ERROR (35)
+A problem occured somewhere in the SSL/TLS handshake. You really want the
+error buffer and read the message there as it pinpoints the problem slightly
+more. Could be certificates (file formats, paths, permissions), passwords, and
+others.
+.TP
+.B CURLE_FTP_BAD_DOWNLOAD_RESUME (36)
+Attempting FTP resume beyond file size.
+.TP
+.B CURLE_FILE_COULDNT_READ_FILE (37)
+A file given with FILE:// couldn't be opened. Most likely because the file
+path doesn't identify an existing file. Did you check file permissions?
+.TP
+.B CURLE_LDAP_CANNOT_BIND (38)
+LDAP cannot bind. LDAP bind operation failed.
+.TP
+.B CURLE_LDAP_SEARCH_FAILED (39)
+LDAP search failed.
+.TP
+.B CURLE_LIBRARY_NOT_FOUND (40)
+Library not found. The LDAP library was not found.
+.TP
+.B CURLE_FUNCTION_NOT_FOUND (41)
+Function not found. A required LDAP function was not found.
+.TP
+.B CURLE_ABORTED_BY_CALLBACK (42)
+Aborted by callback. A callback returned "abort" to libcurl.
+.TP
+.B CURLE_BAD_FUNCTION_ARGUMENT (43)
+Internal error. A function was called with a bad parameter.
+.TP
+.B CURLE_BAD_CALLING_ORDER (44)
+Internal error. A function was called in a bad order.
+.TP
+.B CURLE_HTTP_PORT_FAILED (45)
+Interface error. A specified outgoing interface could not be used. Set which
+interface to use for outgoing connections' source IP address with
+CURLOPT_INTERFACE.
+.TP
+.B CURLE_BAD_PASSWORD_ENTERED (46)
+Bad password entered. An error was signaled when the password was
+entered. This can also be the result of a "bad password" returned from a
+specified password callback.
+.TP
+.B CURLE_TOO_MANY_REDIRECTS (47)
+Too many redirects. When following redirects, libcurl hit the maximum amount.
+Set your limit with CURLOPT_MAXREDIRS.
+.TP
+.B CURLE_UNKNOWN_TELNET_OPTION (48)
+An option set with CURLOPT_TELNETOPTIONS was not recognized/known. Refer to
+the appropriate documentation.
+.TP
+.B CURLE_TELNET_OPTION_SYNTAX (49)
+A telnet option string was Illegally formatted.
+.TP
+.B CURLE_OBSOLETE (50)
+This is not an error. This used to be another error code in an old libcurl
+version and is currently unused.
+.TP
+.B CURLE_SSL_PEER_CERTIFICATE (51)
+The remote server's SSL certificate was deemed not OK.
+.TP
+.B CURLE_GOT_NOTHING (52)
+Nothing was returned from the server, and under the circumstances, getting
+nothing is considered an error.
+.TP
+.B CURLE_SSL_ENGINE_NOTFOUND (53)
+The specified crypto engine wasn't found.
+.TP
+.B CURLE_SSL_ENGINE_SETFAILED (54)
+Failed setting the selected SSL crypto engine as default!
+.TP
+.B CURLE_SEND_ERROR (55)
+Failed sending network data.
+.TP
+.B CURLE_RECV_ERROR (56)
+Failure with receiving network data.
+.TP
+.B CURL_LAST
+This is not an error, but in the curl/curl.h file this can be used to know how
+many existing error codes there are.
+.RE
+
+.SH "CURLMcode"
+This is the generic return code used by functions in the libcurl multi
+interface.
diff --git a/main/source/curl/docs/libcurl/libcurl-errors.html b/main/source/curl/docs/libcurl/libcurl-errors.html
new file mode 100644
index 00000000..e0bd7bfa
--- /dev/null
+++ b/main/source/curl/docs/libcurl/libcurl-errors.html
@@ -0,0 +1,330 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       error codes in libcurl
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       This  man  page includes most, if not all, available error
+       codes in libcurl.  Why they occur and  possibly  what  you
+       can do to fix the problem.
+
+
+</PRE>
+<H2>CURLcode</H2><PRE>
+       Almost  all  "easy"  interface functions return a CURLcode
+       error code. No matter what, using <I>CURLOPT</I><B>_</B><I>ERRORBUFFER</I> is a
+       good  idea  as  it  will  give  you a human readable error
+       string that may offer more details about the  error  cause
+       than just the error code does.
+
+       This  man  page  is  meant  to  describe libcurl 7.9.6 and
+       later. Earlier versions might have  had  quirks  not  men-
+       tioned here.
+
+       CURLcode is one of the following:
+
+        <B>CURLE_OK</B> <B>(0)</B>
+             All fine. Proceed as usual.
+
+        <B>CURLE_UNSUPPORTED_PROTOCOL</B> <B>(1)</B>
+             The  URL  you passed to libcurl used a protocol that
+             this libcurl does not support. The support might  be
+             a compile-time option that you didn't use, it can be
+             a misspelled protocol  string  or  just  a  protocol
+             libcurl has no code for.
+
+        <B>CURLE_FAILED_INIT</B> <B>(2)</B>
+             Very  early  initialization  code  failed.  This  is
+             likely to be an internal error or problem.
+
+        <B>CURLE_URL_MALFORMAT</B> <B>(3)</B>
+             The URL was not properly formatted.
+
+        <B>CURLE_URL_MALFORMAT_USER</B> <B>(4)</B>
+             URL user malformatted. The user-part of the URL syn-
+             tax was not correct.
+
+        <B>CURLE_COULDNT_RESOLVE_PROXY</B> <B>(5)</B>
+             Couldn't  resolve  proxy. The given proxy host could
+             not be resolved.
+
+        <B>CURLE_COULDNT_RESOLVE_HOST</B> <B>(6)</B>
+             Couldn't resolve host. The given remote host was not
+             resolved.
+
+        <B>CURLE_COULDNT_CONNECT</B> <B>(7)</B>
+             Failed to connect() to host or proxy.
+
+             After connecting to a FTP server, libcurl expects to
+             get a certain reply back.  This error  code  implies
+             that it god a strange or bad reply. The given remote
+             server is probably not an OK FTP server.
+
+        <B>CURLE_FTP_ACCESS_DENIED</B> <B>(9)</B>
+             We were denied access when trying to login to an FTP
+             server or when trying to change working directory to
+             the one given in the URL.
+
+        <B>CURLE_FTP_USER_PASSWORD_INCORRECT</B> <B>(10)</B>
+             The username and/or the password were incorrect when
+             trying to login to an FTP server.
+
+        <B>CURLE_FTP_WEIRD_PASS_REPLY</B> <B>(11)</B>
+             After  having  sent  the FTP password to the server,
+             libcurl expects a  proper  reply.  This  error  code
+             indicates that an unexpected code was returned.
+
+        <B>CURLE_FTP_WEIRD_USER_REPLY</B> <B>(12)</B>
+             After  having  sent  user  name  to  the FTP server,
+             libcurl expects a  proper  reply.  This  error  code
+             indicates that an unexpected code was returned.
+
+        <B>CURLE_FTP_WEIRD_PASV_REPLY</B> <B>(13)</B>
+             libcurl  failed  to  get a sensible result back from
+             the server as a response to either a PASV or a  EPSV
+             command. The server is flawed.
+
+        <B>CURLE_FTP_WEIRD_227_FORMAT</B> <B>(14)</B>
+             FTP  servers  return  a  227-line as a response to a
+             PASV command. If libcurl fails to parse  that  line,
+             this return code is passed back.
+
+        <B>CURLE_FTP_CANT_GET_HOST</B> <B>(15)</B>
+             An  internal failure to lookup the host used for the
+             new connection.
+
+        <B>CURLE_FTP_CANT_RECONNECT</B> <B>(16)</B>
+             A bad return code on either PASV or EPSV was sent by
+             the  FTP  server, preventing libcurl from being able
+             to continue.
+
+        <B>CURLE_FTP_COULDNT_SET_BINARY</B> <B>(17)</B>
+             Received an error when trying to  set  the  transfer
+             mode to binary.
+
+        <B>CURLE_PARTIAL_FILE</B> <B>(18)</B>
+             A file transfer was shorter or larger than expected.
+             This  happens  when  the  server  first  reports  an
+             expected  transfer size, and then delivers data that
+             doesn't match the previously given size.
+             This was either a weird reply to a 'RETR' command or
+             a zero byte transfer complete.
+
+        <B>CURLE_FTP_WRITE_ERROR</B> <B>(20)</B>
+             After  a completed file transfer, the FTP server did
+             not respond a proper
+
+
+        <B>CURLE_FTP_QUOTE_ERROR</B> <B>(21)</B>
+             When sending custom "QUOTE" commands to  the  remote
+             server,  one  of the commands returned an error code
+             that was 400 or higher.
+
+        <B>CURLE_HTTP_RETURNED_ERROR</B> <B>(22)</B>
+             This is returned if CURLOPT_FAILONERROR is set  TRUE
+             and the HTTP server returns an error code that is &gt;=
+             400.
+
+        <B>CURLE_WRITE_ERROR</B> <B>(23)</B>
+             An error occurred when writing received  data  to  a
+             local file, or an error was returned to libcurl from
+             a write callback.
+
+        <B>CURLE_MALFORMAT_USER</B> <B>(24)</B>
+             Malformat user. User name badly specified. *Not cur-
+             rently used*
+
+        <B>CURLE_FTP_COULDNT_STOR_FILE</B> <B>(25)</B>
+             FTP  couldn't  STOR file. The server denied the STOR
+             operation. The error  buffer  usually  contains  the
+             server's explanation to this.
+
+        <B>CURLE_READ_ERROR</B> <B>(26)</B>
+             There was a problem reading a local file or an error
+             returned by the read callback.
+
+        <B>CURLE_OUT_OF_MEMORY</B> <B>(27)</B>
+             Out of memory. A memory allocation  request  failed.
+             This  is  serious  badness  and  things  are severly
+             screwed up if this ever occur.
+
+        <B>CURLE_OPERATION_TIMEOUTED</B> <B>(28)</B>
+             Operation timeout. The specified time-out period was
+             reached according to the conditions.
+
+        <B>CURLE_FTP_COULDNT_SET_ASCII</B> <B>(29)</B>
+             libcurl  failed to set ASCII transfer type (TYPE A).
+
+        <B>CURLE_FTP_PORT_FAILED</B> <B>(30)</B>
+             The FTP PORT command  returned  error.  This  mostly
+             happen  when  you  haven't  specified  a good enough
+             address for libcurl to use. See <I>CURLOPT</I><B>_</B><I>FTPPORT</I>.
+             The FTP REST command  returned  error.  This  should
+             never happen if the server is sane.
+
+        <B>CURLE_FTP_COULDNT_GET_SIZE</B> <B>(32)</B>
+             The  FTP SIZE command returned errror. SIZE is not a
+             kosher FTP command, it is an extension and  not  all
+             servers  support it. This is not a surprising error.
+
+        <B>CURLE_HTTP_RANGE_ERROR</B> <B>(33)</B>
+             The HTTP server does not  support  or  accept  range
+             requests.
+
+        <B>CURLE_HTTP_POST_ERROR</B> <B>(34)</B>
+             This  is  an  odd  error  that  mainly occurs due to
+             internal confusion.
+
+        <B>CURLE_SSL_CONNECT_ERROR</B> <B>(35)</B>
+             A problem occured somewhere  in  the  SSL/TLS  hand-
+             shake. You really want the error buffer and read the
+             message there as it pinpoints the  problem  slightly
+             more.  Could  be  certificates (file formats, paths,
+             permissions), passwords, and others.
+
+        <B>CURLE_FTP_BAD_DOWNLOAD_RESUME</B> <B>(36)</B>
+             Attempting FTP resume beyond file size.
+
+        <B>CURLE_FILE_COULDNT_READ_FILE</B> <B>(37)</B>
+             A file given with FILE:// couldn't be  opened.  Most
+             likely  because  the  file  path doesn't identify an
+             existing file. Did you check file permissions?
+
+        <B>CURLE_LDAP_CANNOT_BIND</B> <B>(38)</B>
+             LDAP cannot bind. LDAP bind operation failed.
+
+        <B>CURLE_LDAP_SEARCH_FAILED</B> <B>(39)</B>
+             LDAP search failed.
+
+        <B>CURLE_LIBRARY_NOT_FOUND</B> <B>(40)</B>
+             Library not found. The LDAP library was not found.
+
+        <B>CURLE_FUNCTION_NOT_FOUND</B> <B>(41)</B>
+             Function not found. A required LDAP function was not
+             found.
+
+        <B>CURLE_ABORTED_BY_CALLBACK</B> <B>(42)</B>
+             Aborted  by callback. A callback returned "abort" to
+             libcurl.
+
+        <B>CURLE_BAD_FUNCTION_ARGUMENT</B> <B>(43)</B>
+             Internal error. A function was  called  with  a  bad
+             parameter.
+
+             Internal  error.  A  function  was  called  in a bad
+             order.
+
+        <B>CURLE_HTTP_PORT_FAILED</B> <B>(45)</B>
+             Interface  error.  A  specified  outgoing  interface
+             could  not  be  used. Set which interface to use for
+             outgoing connections' source IP  address  with  CUR-
+             LOPT_INTERFACE.
+
+        <B>CURLE_BAD_PASSWORD_ENTERED</B> <B>(46)</B>
+             Bad password entered. An error was signaled when the
+             password was entered. This can also be the result of
+             a  "bad password" returned from a specified password
+             callback.
+
+        <B>CURLE_TOO_MANY_REDIRECTS</B> <B>(47)</B>
+             Too  many  redirects.  When   following   redirects,
+             libcurl hit the maximum amount.  Set your limit with
+             CURLOPT_MAXREDIRS.
+
+        <B>CURLE_UNKNOWN_TELNET_OPTION</B> <B>(48)</B>
+             An option set  with  CURLOPT_TELNETOPTIONS  was  not
+             recognized/known.  Refer to the appropriate documen-
+             tation.
+
+        <B>CURLE_TELNET_OPTION_SYNTAX</B> <B>(49)</B>
+             A telnet option string was Illegally formatted.
+
+        <B>CURLE_OBSOLETE</B> <B>(50)</B>
+             This is not an error. This used to be another  error
+             code  in  an  old  libcurl  version and is currently
+             unused.
+
+        <B>CURLE_SSL_PEER_CERTIFICATE</B> <B>(51)</B>
+             The remote server's SSL certificate was  deemed  not
+             OK.
+
+        <B>CURLE_GOT_NOTHING</B> <B>(52)</B>
+             Nothing  was returned from the server, and under the
+             circumstances,  getting  nothing  is  considered  an
+             error.
+
+        <B>CURLE_SSL_ENGINE_NOTFOUND</B> <B>(53)</B>
+             The specified crypto engine wasn't found.
+
+        <B>CURLE_SSL_ENGINE_SETFAILED</B> <B>(54)</B>
+             Failed  setting  the  selected  SSL crypto engine as
+             default!
+
+        <B>CURLE_SEND_ERROR</B> <B>(55)</B>
+             Failed sending network data.
+
+             Failure with receiving network data.
+
+        <B>CURL_LAST</B>
+             This is not an error, but in  the  curl/curl.h  file
+             this  can  be  used  to know how many existing error
+             codes there are.
+
+
+
+</PRE>
+<H2>CURLMcode</H2><PRE>
+       This is the generic return code used by functions  in  the
+       libcurl multi interface.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/libcurl-errors.pdf b/main/source/curl/docs/libcurl/libcurl-errors.pdf
new file mode 100644
index 00000000..64cddf20
Binary files /dev/null and b/main/source/curl/docs/libcurl/libcurl-errors.pdf differ
diff --git a/main/source/curl/docs/libcurl/libcurl-multi.3 b/main/source/curl/docs/libcurl/libcurl-multi.3
new file mode 100644
index 00000000..8c2465ae
--- /dev/null
+++ b/main/source/curl/docs/libcurl/libcurl-multi.3
@@ -0,0 +1,100 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: libcurl-multi.3,v 1.4 2002/12/03 12:40:13 bagder Exp $
+.\"
+.TH libcurl-multi 5 "13 Oct 2001" "libcurl 7.10.1" "libcurl multi interface"
+.SH NAME
+libcurl-multi \- how to use the multi interface
+.SH DESCRIPTION
+This is an overview on how to use the libcurl multi interface in your C
+programs. There are specific man pages for each function mentioned in
+here. There's also the libcurl-the-guide document for a complete tutorial to
+programming with libcurl and the \fIlibcurl(3)\fP man page for an overview of
+the libcurl easy interface.
+
+All functions in the multi interface are prefixed with curl_multi.
+.SH "PLEASE NOTICE"
+The multi interface is a rather new member of the libcurl family. It has not
+yet been very widely used. It may still be a few more bugs lurking in there
+than we are used to. That said, it might also just work in every aspect you
+try it. Please report all bugs and oddities you see.
+.SH "OBJECTIVES"
+The multi interface introduces several new abilities that the easy interface
+refuses to offer. They are mainly:
+
+1. Enable a "pull" interface. The application that uses libcurl decides where
+and when to ask libcurl to get/send data.
+
+2. Enable multiple simultaneous transfers in the same thread without making it
+complicated for the application.
+
+3. Enable the application to select() on its own file descriptors and curl's
+file descriptors simultaneous easily.
+.SH "ONE MULTI HANDLE MANY EASY HANDLES"
+To use the multi interface, you must first create a 'multi handle' with
+\fIcurl_multi_init\fP. This handle is then used as input to all further
+curl_multi_* functions.
+
+Each single transfer is built up with an easy handle. You must create them,
+and setup the appropriate options for each easy handle, as outlined in the
+\fIlibcurl(3)\fP man page, using \fIcurl_easy_setopt(3)\fP.
+
+When the easy handle is setup for a transfer, then instead of using
+\fIcurl_easy_perform\fP (as when using the easy interface for transfers), you
+should instead add the easy handle to the multi handle using
+\fIcurl_easy_add_handl\fP. The multi handle is sometimes referred to as a
+\'multi stack\' because of the fact that it may hold a large amount of easy
+handles.
+
+Should you change your mind, the easy handle is again removed from the multi
+stack using \fIcurl_multi_remove_handle\fP. Once removed from the multi
+handle, you can again use other easy interface functions like
+\fIcurl_easy_perform\fP on the handle or whatever you think is necessary.
+
+Adding the easy handle to the multi handle does not start the transfer.
+Remember that one of the main ideas with this interface is to let your
+application drive. You drive the transfers by invoking
+\fIcurl_multi_perform\fP. libcurl will then transfer data if there is anything
+available to transfer. It'll use the callbacks and everything else you have
+setup in the individual easy handles. It'll transfer data on all current
+transfers in the multi stack that are ready to transfer anything. It may be
+all, it may be none.
+
+Your application can acquire knowledge from libcurl when it would like to get
+invoked to transfer data, so that you don't have to busy-loop and call that
+\fIcurl_multi_perform\fP like crazy. \fIcurl_multi_fdset\fP offers an
+interface using which you can extract fd_sets from libcurl to use in select()
+or poll() calls in order to get to know when the transfers in the multi stack
+might need attention. This also makes it very easy for your program to wait
+for input on your own private file descriptors at the same time or perhaps
+timeout every now and then, should you want that.
+
+A little note here about the return codes from the multi functions, and
+especially the \fIcurl_multi_perform\fP: if you receive
+\fICURLM_CALL_MULTI_PERFORM\fP, this basicly means that you should call
+\fIcurl_multi_perform\fP again, before you select() on more actions. You don't
+have to do it immediately, but the return code means that libcurl may have
+more data available to return or that there may be more data to send off
+before it is "satisfied".
+
+\fIcurl_multi_perform\fP stores the number of still running transfers in one
+of its input arguments, and by reading that you can figure out when all the
+transfers in the multi handles are done. 'done' does not mean successful. One
+or more of the transfers may have failed. Tracking when this number changes,
+you know when one or more transfers are done.
+
+To get information about completed transfers, to figure out success or not and
+similar, \fIcurl_multi_info_read\fP should be called. It can return a message
+about a current or previous transfer. Repeated invokes of the function get
+more messages until the message queue is empty. The information you receive
+there includes an easy handle pointer which you may use to identify which easy
+handle the information regards.
+
+When all transfers in the multi stack are done, cleanup the multi handle with
+\fIcurl_multi_cleanup\fP. Be careful and please note that you \fBMUST\fP
+invoke separate \fIcurl_easy_cleanup\fP calls on every single easy handle to
+clean them up properly.
+
+If you want to re-use an easy handle that was added to the multi handle for
+transfer, you must first remove it from the multi stack and then re-add it
+again (possbily after having altered some options at your own choice).
diff --git a/main/source/curl/docs/libcurl/libcurl-multi.html b/main/source/curl/docs/libcurl/libcurl-multi.html
new file mode 100644
index 00000000..445ccda9
--- /dev/null
+++ b/main/source/curl/docs/libcurl/libcurl-multi.html
@@ -0,0 +1,176 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       libcurl-multi - how to use the multi interface
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       This is an overview on how to use the libcurl multi inter-
+       face in your C programs. There are specific man pages  for
+       each function mentioned in here. There's also the libcurl-
+       the-guide document for a complete tutorial to  programming
+       with  libcurl  and the <I>libcurl(3)</I> man page for an overview
+       of the libcurl easy interface.
+
+       All functions in the multi  interface  are  prefixed  with
+       curl_multi.
+
+
+</PRE>
+<H2>PLEASE NOTICE</H2><PRE>
+       The  multi interface is a rather new member of the libcurl
+       family. It has not yet been very widely used. It may still
+       be  a  few more bugs lurking in there than we are used to.
+       That said, it might also just work in every aspect you try
+       it. Please report all bugs and oddities you see.
+
+
+</PRE>
+<H2>OBJECTIVES</H2><PRE>
+       The  multi interface introduces several new abilities that
+       the easy interface refuses to offer. They are mainly:
+
+       1. Enable a "pull" interface. The  application  that  uses
+       libcurl  decides where and when to ask libcurl to get/send
+       data.
+
+       2. Enable multiple  simultaneous  transfers  in  the  same
+       thread  without making it complicated for the application.
+
+       3. Enable the application to  select()  on  its  own  file
+       descriptors  and curl's file descriptors simultaneous eas-
+       ily.
+
+
+</PRE>
+<H2>ONE MULTI HANDLE MANY EASY HANDLES</H2><PRE>
+       To use the multi interface, you must first create a 'multi
+       handle'  with <I>curl</I><B>_</B><I>multi</I><B>_</B><I>init</I>. This handle is then used as
+       input to all further curl_multi_* functions.
+
+       Each single transfer is built up with an easy handle.  You
+       must  create  them,  and setup the appropriate options for
+       each easy handle, as outlined in the <I>libcurl(3)</I> man  page,
+       using <I>curl</I><B>_</B><I>easy</I><B>_</B><I>setopt(3)</I>.
+
+       When the easy handle is setup for a transfer, then instead
+       of using <I>curl</I><B>_</B><I>easy</I><B>_</B><I>perform</I> (as when using the easy  inter-
+       face  for transfers), you should instead add the easy han-
+       dle to the multi  handle  using  <I>curl</I><B>_</B><I>easy</I><B>_</B><I>add</I><B>_</B><I>handl</I>.  The
+       multi  handle  is sometimes referred to as a 'multi stack'
+       because of the fact that it may hold  a  large  amount  of
+       easy handles.
+       removed from the multi stack using  <I>curl</I><B>_</B><I>multi</I><B>_</B><I>remove</I><B>_</B><I>han-</I>
+       <I>dle</I>. Once removed from the multi handle, you can again use
+       other easy interface functions like  <I>curl</I><B>_</B><I>easy</I><B>_</B><I>perform</I>  on
+       the handle or whatever you think is necessary.
+
+       Adding  the easy handle to the multi handle does not start
+       the transfer.  Remember that one of the  main  ideas  with
+       this interface is to let your application drive. You drive
+       the transfers by invoking <I>curl</I><B>_</B><I>multi</I><B>_</B><I>perform</I>. libcurl will
+       then  transfer  data  if  there  is  anything available to
+       transfer. It'll use the callbacks and everything else  you
+       have  setup in the individual easy handles. It'll transfer
+       data on all current transfers in the multi stack that  are
+       ready to transfer anything. It may be all, it may be none.
+
+       Your application can acquire knowledge from  libcurl  when
+       it would like to get invoked to transfer data, so that you
+       don't have to busy-loop and call  that  <I>curl</I><B>_</B><I>multi</I><B>_</B><I>perform</I>
+       like  crazy.  <I>curl</I><B>_</B><I>multi</I><B>_</B><I>fdset</I>  offers  an interface using
+       which you can extract  fd_sets  from  libcurl  to  use  in
+       select()  or poll() calls in order to get to know when the
+       transfers in the multi stack might  need  attention.  This
+       also makes it very easy for your program to wait for input
+       on your own private file descriptors at the same  time  or
+       perhaps  timeout every now and then, should you want that.
+
+       A little note here about the return codes from  the  multi
+       functions,  and  especially the <I>curl</I><B>_</B><I>multi</I><B>_</B><I>perform</I>: if you
+       receive <I>CURLM</I><B>_</B><I>CALL</I><B>_</B><I>MULTI</I><B>_</B><I>PERFORM</I>, this basicly means  that
+       you  should  call  <I>curl</I><B>_</B><I>multi</I><B>_</B><I>perform</I>  again,  before  you
+       select() on more actions. You don't have to do it  immedi-
+       ately,  but  the  return  code means that libcurl may have
+       more data available to return or that there  may  be  more
+       data to send off before it is "satisfied".
+
+       <I>curl</I><B>_</B><I>multi</I><B>_</B><I>perform</I>  stores  the  number  of  still running
+       transfers in one of its input arguments,  and  by  reading
+       that  you  can  figure  out  when all the transfers in the
+       multi handles are done. 'done' does not  mean  successful.
+       One  or  more  of  the transfers may have failed. Tracking
+       when this number changes, you know when one or more trans-
+       fers are done.
+
+       To  get  information  about completed transfers, to figure
+       out  success  or  not  and  similar,  <I>curl</I><B>_</B><I>multi</I><B>_</B><I>info</I><B>_</B><I>read</I>
+       should  be called. It can return a message about a current
+       or previous transfer. Repeated invokes of the function get
+       more messages until the message queue is empty. The infor-
+       mation you receive there includes an easy  handle  pointer
+       which you may use to identify which easy handle the infor-
+       mation regards.
+
+       please   note    that    you    <B>MUST</B>    invoke    separate
+       <I>curl</I><B>_</B><I>easy</I><B>_</B><I>cleanup</I>  calls  on  every  single easy handle to
+       clean them up properly.
+
+       If you want to re-use an easy handle that was added to the
+       multi  handle  for transfer, you must first remove it from
+       the multi stack and then re-add it again  (possbily  after
+       having altered some options at your own choice).
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/libcurl-multi.pdf b/main/source/curl/docs/libcurl/libcurl-multi.pdf
new file mode 100644
index 00000000..94e7ad1a
Binary files /dev/null and b/main/source/curl/docs/libcurl/libcurl-multi.pdf differ
diff --git a/main/source/curl/docs/libcurl/libcurl.3 b/main/source/curl/docs/libcurl/libcurl.3
new file mode 100644
index 00000000..c2a9cf90
--- /dev/null
+++ b/main/source/curl/docs/libcurl/libcurl.3
@@ -0,0 +1,120 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" $Id: libcurl.3,v 1.4 2002/04/09 06:20:06 bagder Exp $
+.\"
+.TH libcurl 3 "19 March 2002" "libcurl 7.9.6" "libcurl overview"
+.SH NAME
+libcurl \- client-side URL transfers
+.SH DESCRIPTION
+This is an overview on how to use libcurl in your C programs. There are
+specific man pages for each function mentioned in here. There's also the
+libcurl-the-guide document for a complete tutorial to programming with
+libcurl.
+
+There are a dozen custom bindings that bring libcurl access to your favourite
+language. Look elsewhere for documentation on those.
+
+All applications that use libcurl should call \fIcurl_global_init()\fP exactly
+once before any libcurl function can be used. After all usage of libcurl is
+complete, it \fBmust\fP call \fIcurl_global_cleanup()\fP. In between those two
+calls, you can use libcurl as described below.
+
+When using libcurl's "easy" interface you init your session and get a handle,
+which you use as input to the easy interface functions you use. Use
+\fIcurl_easy_init()\fP to get the handle. There is also the so called "multi"
+interface, try the \fIlibcurl-multi(3)\fP man page for an overview of that.
+
+You continue by setting all the options you want in the upcoming transfer,
+most important among them is the URL itself (you can't transfer anything
+without a specified URL as you may have figured out yourself). You might want
+to set some callbacks as well that will be called from the library when data
+is available etc.  \fIcurl_easy_setopt()\fP is there for this.
+
+When all is setup, you tell libcurl to perform the transfer using
+\fIcurl_easy_perform()\fP.  It will then do the entire operation and won't
+return until it is done (successfully or not).
+
+After the transfer has been made, you can set new options and make another
+transfer, or if you're done, cleanup the session by calling
+\fIcurl_easy_cleanup()\fP.  If you want persistant connections, you don't
+cleanup immediately, but instead run ahead and perform other transfers using
+the same handle. See the chapter below for Persistant Connections.
+
+There is also a series of other helpful functions to use. They are:
+
+.RS
+.TP 10
+.B curl_version()
+displays the libcurl version
+.TP
+.B curl_getdate()
+converts a date string to time_t
+.TP
+.B curl_getenv()
+portable environment variable reader
+.TP
+.B curl_easy_getinfo()
+get information about a performed transfer
+.TP
+.B curl_formadd()
+helps building a HTTP form POST
+.TP
+.B curl_formfree()
+free a list built with curl_formparse()/curl_formadd()
+.TP
+.B curl_slist_append()
+builds a linked list
+.TP
+.B curl_slist_free_all()
+frees a whole curl_slist
+.TP
+.B curl_mprintf()
+portable printf() functions
+.TP
+.B curl_strequal()
+portable case insensitive string comparisons
+.RE
+
+.SH "LINKING WITH LIBCURL"
+On unix-like machines, there's a tool named curl-config that gets installed
+with the rest of the curl stuff when 'make install' is performed.
+
+curl-config is added to make it easier for applications to link with libcurl
+and developers to learn about libcurl and how to use it.
+
+Run 'curl-config --libs' to get the (additional) linker options you need to
+link with the particular version of libcurl you've installed.
+
+For details, see the curl-config.1 man page.
+.SH "LIBCURL SYMBOL NAMES"
+All public functions in the libcurl interface are prefixed with 'curl_' (with
+a lowercase c). You can find other functions in the library source code, but
+other prefixes indicate the functions are private and may change without
+further notice in the next release.
+
+Only use documented functions and functionality!
+.SH "PORTABILITY"
+libcurl works
+.B exactly
+the same, on any of the platforms it compiles and builds on.
+.SH "THREADS"
+Never ever call curl-functions simultaneously using the same handle from
+several threads. libcurl is thread-safe and can be used in any number of
+threads, but you must use separate curl handles if you want to use libcurl in
+more than one thread simultaneously.
+.SH "PERSISTANT CONNECTIONS"
+Persistent connections means that libcurl can re-use the same connection for
+several transfers, if the conditions are right.
+
+libcurl will *always* attempt to use persistent connections. Whenever you use
+curl_easy_perform(), libcurl will attempt to use an existing connection to do
+the transfer, and if none exists it'll open a new one that will be subject for
+re-use on a possible following call to curl_easy_perform().
+
+To allow libcurl to take full advantage of persistent connections, you should
+do as many of your file transfers as possible using the same curl handle. When
+you call curl_easy_cleanup(), all the possibly open connections held by
+libcurl will be closed and forgotten.
+
+Note that the options set with curl_easy_setopt() will be used in on every
+repeat curl_easy_perform() call
diff --git a/main/source/curl/docs/libcurl/libcurl.html b/main/source/curl/docs/libcurl/libcurl.html
new file mode 100644
index 00000000..a08e038a
--- /dev/null
+++ b/main/source/curl/docs/libcurl/libcurl.html
@@ -0,0 +1,178 @@
+<HTML>
+<BODY>
+<PRE>
+<!-- Manpage converted by man2html 3.0.1 -->
+       libcurl - client-side URL transfers
+
+
+</PRE>
+<H2>DESCRIPTION</H2><PRE>
+       This  is  an overview on how to use libcurl in your C pro-
+       grams. There are specific man pages for each function men-
+       tioned  in  here. There's also the libcurl-the-guide docu-
+       ment for a complete tutorial to programming with  libcurl.
+
+       There  are  a  dozen  custom  bindings  that bring libcurl
+       access to your favourite language. Look elsewhere for doc-
+       umentation on those.
+
+       All    applications   that   use   libcurl   should   call
+       <I>curl</I><B>_</B><I>global</I><B>_</B><I>init()</I> exactly once before any  libcurl  func-
+       tion  can be used. After all usage of libcurl is complete,
+       it <B>must</B> call <I>curl</I><B>_</B><I>global</I><B>_</B><I>cleanup()</I>. In between  those  two
+       calls, you can use libcurl as described below.
+
+       When  using  libcurl's "easy" interface you init your ses-
+       sion and get a handle, which you use as input to the  easy
+       interface  functions  you use. Use <I>curl</I><B>_</B><I>easy</I><B>_</B><I>init()</I> to get
+       the handle. There is also the so called "multi" interface,
+       try the <I>libcurl-multi(3)</I> man page for an overview of that.
+
+       You continue by setting all the options you  want  in  the
+       upcoming  transfer,  most  important among them is the URL
+       itself (you can't transfer anything  without  a  specified
+       URL  as you may have figured out yourself). You might want
+       to set some callbacks as well that will be called from the
+       library when data is available etc.  <I>curl</I><B>_</B><I>easy</I><B>_</B><I>setopt()</I> is
+       there for this.
+
+       When all is setup, you tell libcurl to perform the  trans-
+       fer using <I>curl</I><B>_</B><I>easy</I><B>_</B><I>perform()</I>.  It will then do the entire
+       operation and won't return until it is done  (successfully
+       or not).
+
+       After  the transfer has been made, you can set new options
+       and make another transfer, or if you're done, cleanup  the
+       session  by calling <I>curl</I><B>_</B><I>easy</I><B>_</B><I>cleanup()</I>.  If you want per-
+       sistant connections, you don't  cleanup  immediately,  but
+       instead  run  ahead  and perform other transfers using the
+       same handle. See the chapter below for Persistant  Connec-
+       tions.
+
+       There  is also a series of other helpful functions to use.
+       They are:
+
+
+              <B>curl_version()</B>
+                        displays the libcurl version
+
+                        converts a date string to time_t
+
+              <B>curl_getenv()</B>
+                        portable environment variable reader
+
+              <B>curl_easy_getinfo()</B>
+                        get information about a performed  trans-
+                        fer
+
+              <B>curl_formadd()</B>
+                        helps building a HTTP form POST
+
+              <B>curl_formfree()</B>
+                        free   a   list   built  with  curl_form-
+                        parse()/curl_formadd()
+
+              <B>curl_slist_append()</B>
+                        builds a linked list
+
+              <B>curl_slist_free_all()</B>
+                        frees a whole curl_slist
+
+              <B>curl_mprintf()</B>
+                        portable printf() functions
+
+              <B>curl_strequal()</B>
+                        portable case insensitive string  compar-
+                        isons
+
+
+
+</PRE>
+<H2>LINKING WITH LIBCURL</H2><PRE>
+       On  unix-like  machines,  there's a tool named curl-config
+       that gets installed with the rest of the curl  stuff  when
+       'make install' is performed.
+
+       curl-config is added to make it easier for applications to
+       link with libcurl and developers to  learn  about  libcurl
+       and how to use it.
+
+       Run  'curl-config  --libs'  to get the (additional) linker
+       options you need to link with the  particular  version  of
+       libcurl you've installed.
+
+       For details, see the curl-config.1 man page.
+
+
+</PRE>
+<H2>LIBCURL SYMBOL NAMES</H2><PRE>
+       All public functions in the libcurl interface are prefixed
+       with 'curl_' (with a lowercase  c).  You  can  find  other
+       functions  in  the library source code, but other prefixes
+       indicate the functions are private and may change  without
+       further notice in the next release.
+
+       libcurl works <B>exactly</B> the same, on any of the platforms it
+       compiles and builds on.
+
+
+</PRE>
+<H2>THREADS</H2><PRE>
+       Never ever call curl-functions  simultaneously  using  the
+       same  handle  from several threads. libcurl is thread-safe
+       and can be used in any number of threads, but you must use
+       separate  curl  handles if you want to use libcurl in more
+       than one thread simultaneously.
+
+
+</PRE>
+<H2>PERSISTANT CONNECTIONS</H2><PRE>
+       Persistent connections means that libcurl can  re-use  the
+       same  connection  for several transfers, if the conditions
+       are right.
+
+       libcurl will *always* attempt to  use  persistent  connec-
+       tions.  Whenever you use curl_easy_perform(), libcurl will
+       attempt to use an existing connection to do the  transfer,
+       and  if none exists it'll open a new one that will be sub-
+       ject  for  re-use  on  a  possible   following   call   to
+       curl_easy_perform().
+
+       To allow libcurl to take full advantage of persistent con-
+       nections, you should do as many of your file transfers  as
+       possible  using  the  same  curl  handle.  When  you  call
+       curl_easy_cleanup(), all  the  possibly  open  connections
+       held by libcurl will be closed and forgotten.
+
+       Note  that the options set with curl_easy_setopt() will be
+       used in on every repeat curl_easy_perform() call
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+<HR>
+<ADDRESS>
+Man(1) output converted with
+<a href="http://www.oac.uci.edu/indiv/ehood/man2html.html">man2html</a>
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/main/source/curl/docs/libcurl/libcurl.pdf b/main/source/curl/docs/libcurl/libcurl.pdf
new file mode 100644
index 00000000..860889af
Binary files /dev/null and b/main/source/curl/docs/libcurl/libcurl.pdf differ
diff --git a/main/source/curl/include/Makefile.am b/main/source/curl/include/Makefile.am
new file mode 100644
index 00000000..e87875c2
--- /dev/null
+++ b/main/source/curl/include/Makefile.am
@@ -0,0 +1,5 @@
+SUBDIRS = curl
+
+EXTRA_DIST = README
+
+AUTOMAKE_OPTIONS = foreign no-dependencies
diff --git a/main/source/curl/include/Makefile.in b/main/source/curl/include/Makefile.in
new file mode 100644
index 00000000..55aff48a
--- /dev/null
+++ b/main/source/curl/include/Makefile.in
@@ -0,0 +1,464 @@
+# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CA_BUNDLE = @CURL_CA_BUNDLE@
+CURL_DISABLE_DICT = @CURL_DISABLE_DICT@
+CURL_DISABLE_FILE = @CURL_DISABLE_FILE@
+CURL_DISABLE_FTP = @CURL_DISABLE_FTP@
+CURL_DISABLE_GOPHER = @CURL_DISABLE_GOPHER@
+CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@
+CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@
+CURL_DISABLE_TELNET = @CURL_DISABLE_TELNET@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_LIBZ = @HAVE_LIBZ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPV6_ENABLED = @IPV6_ENABLED@
+KRB4_ENABLED = @KRB4_ENABLED@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NO_UNDEFINED_FALSE = @NO_UNDEFINED_FALSE@
+NO_UNDEFINED_TRUE = @NO_UNDEFINED_TRUE@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_ENABLED = @OPENSSL_ENABLED@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKGADD_NAME = @PKGADD_NAME@
+PKGADD_PKG = @PKGADD_PKG@
+PKGADD_VENDOR = @PKGADD_VENDOR@
+PKGCONFIG = @PKGCONFIG@
+RANDOM_FILE = @RANDOM_FILE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VERSIONNUM = @VERSIONNUM@
+YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+SUBDIRS = curl
+
+EXTRA_DIST = README
+
+AUTOMAKE_OPTIONS = foreign no-dependencies
+subdir = include
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/lib/config.h \
+	$(top_builddir)/src/config.h \
+	$(top_builddir)/tests/server/config.h \
+	$(top_builddir)/lib/ca-bundle.h
+CONFIG_CLEAN_FILES =
+depcomp =
+am__depfiles_maybe =
+DIST_SOURCES =
+
+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+	ps-recursive install-info-recursive uninstall-info-recursive \
+	all-recursive install-data-recursive install-exec-recursive \
+	installdirs-recursive install-recursive uninstall-recursive \
+	check-recursive installcheck-recursive
+DIST_COMMON = README Makefile.am Makefile.in
+DIST_SUBDIRS = $(SUBDIRS)
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  include/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ETAGS = etags
+ETAGSFLAGS =
+
+CTAGS = ctags
+CTAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d $(distdir)/$$subdir \
+	    || mkdir $(distdir)/$$subdir \
+	    || exit 1; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$(top_distdir)" \
+	        distdir=../$(distdir)/$$subdir \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+
+distclean-am: clean-am distclean-generic distclean-libtool \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+	clean-generic clean-libtool clean-recursive ctags \
+	ctags-recursive distclean distclean-generic distclean-libtool \
+	distclean-recursive distclean-tags distdir dvi dvi-am \
+	dvi-recursive info info-am info-recursive install install-am \
+	install-data install-data-am install-data-recursive \
+	install-exec install-exec-am install-exec-recursive \
+	install-info install-info-am install-info-recursive install-man \
+	install-recursive install-strip installcheck installcheck-am \
+	installdirs installdirs-am installdirs-recursive \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+	uninstall uninstall-am uninstall-info-am \
+	uninstall-info-recursive uninstall-recursive
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/main/source/curl/include/README b/main/source/curl/include/README
new file mode 100644
index 00000000..62376fa7
--- /dev/null
+++ b/main/source/curl/include/README
@@ -0,0 +1,15 @@
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+Include files for libcurl, external users.
+
+They're all placed in the curl subdirectory here for better fit in any kind
+of environment. You should include files from here using...
+
+        #include <curl/curl.h>
+
+... style and point the compiler's include path to the directory holding the
+curl subdirectory. It makes it more likely to survive future modifications.
diff --git a/main/source/curl/include/curl/Makefile.am b/main/source/curl/include/curl/Makefile.am
new file mode 100644
index 00000000..7682f390
--- /dev/null
+++ b/main/source/curl/include/curl/Makefile.am
@@ -0,0 +1,8 @@
+pkginclude_HEADERS = \
+	curl.h \
+	easy.h \
+	mprintf.h \
+	stdcheaders.h \
+	types.h \
+	multi.h
+pkgincludedir= $(includedir)/curl
diff --git a/main/source/curl/include/curl/Makefile.in b/main/source/curl/include/curl/Makefile.in
new file mode 100644
index 00000000..058dbe41
--- /dev/null
+++ b/main/source/curl/include/curl/Makefile.in
@@ -0,0 +1,394 @@
+# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+top_builddir = ../..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+pkgincludedir = $(includedir)/curl
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CA_BUNDLE = @CURL_CA_BUNDLE@
+CURL_DISABLE_DICT = @CURL_DISABLE_DICT@
+CURL_DISABLE_FILE = @CURL_DISABLE_FILE@
+CURL_DISABLE_FTP = @CURL_DISABLE_FTP@
+CURL_DISABLE_GOPHER = @CURL_DISABLE_GOPHER@
+CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@
+CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@
+CURL_DISABLE_TELNET = @CURL_DISABLE_TELNET@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_LIBZ = @HAVE_LIBZ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPV6_ENABLED = @IPV6_ENABLED@
+KRB4_ENABLED = @KRB4_ENABLED@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NO_UNDEFINED_FALSE = @NO_UNDEFINED_FALSE@
+NO_UNDEFINED_TRUE = @NO_UNDEFINED_TRUE@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_ENABLED = @OPENSSL_ENABLED@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKGADD_NAME = @PKGADD_NAME@
+PKGADD_PKG = @PKGADD_PKG@
+PKGADD_VENDOR = @PKGADD_VENDOR@
+PKGCONFIG = @PKGCONFIG@
+RANDOM_FILE = @RANDOM_FILE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VERSIONNUM = @VERSIONNUM@
+YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+pkginclude_HEADERS = \
+	curl.h \
+	easy.h \
+	mprintf.h \
+	stdcheaders.h \
+	types.h \
+	multi.h
+
+subdir = include/curl
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/lib/config.h \
+	$(top_builddir)/src/config.h \
+	$(top_builddir)/tests/server/config.h \
+	$(top_builddir)/lib/ca-bundle.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+HEADERS = $(pkginclude_HEADERS)
+
+DIST_COMMON = $(pkginclude_HEADERS) Makefile.am Makefile.in
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  include/curl/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+install-pkgincludeHEADERS: $(pkginclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
+	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f"; \
+	  $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \
+	done
+
+uninstall-pkgincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f $(DESTDIR)$(pkgincludedir)/$$f"; \
+	  rm -f $(DESTDIR)$(pkgincludedir)/$$f; \
+	done
+
+ETAGS = etags
+ETAGSFLAGS =
+
+CTAGS = ctags
+CTAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-generic distclean-libtool \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgincludeHEADERS
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool ctags distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am info \
+	info-am install install-am install-data install-data-am \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-pkgincludeHEADERS install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am uninstall-pkgincludeHEADERS
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/main/source/curl/include/curl/curl.h b/main/source/curl/include/curl/curl.h
new file mode 100644
index 00000000..e3ca23ca
--- /dev/null
+++ b/main/source/curl/include/curl/curl.h
@@ -0,0 +1,1012 @@
+#ifndef __CURL_CURL_H
+#define __CURL_CURL_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: curl.h,v 1.194 2003/05/09 07:42:47 bagder Exp $
+ ***************************************************************************/
+
+#include <stdio.h>
+/* The include stuff here is mainly for time_t! */
+#ifdef vms
+# include <types.h>
+# include <time.h>
+#else
+# include <sys/types.h>
+# ifdef TIME_WITH_SYS_TIME
+#  include <sys/time.h>
+#  include <time.h>
+# else
+#  ifdef HAVE_SYS_TIME_H
+#   include <sys/time.h>
+#  else
+#   include <time.h>
+#  endif
+# endif
+#endif /* defined (vms) */
+
+#ifndef TRUE
+#define TRUE 1
+#endif
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+#include "types.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/* stupid #define trick to preserve functionality with older code, but
+   making it use our name space for the future */
+#define HttpPost curl_httppost
+
+struct curl_httppost {
+  struct curl_httppost *next; /* next entry in the list */
+  char *name;     /* pointer to allocated name */
+  long namelength; /* length of name length */
+  char *contents; /* pointer to allocated data contents */
+  long contentslength; /* length of contents field */
+
+  /* CMC: Added support for buffer uploads */
+  char *buffer; /* pointer to allocated buffer contents */
+  long bufferlength; /* length of buffer field */
+
+  char *contenttype; /* Content-Type */
+  struct curl_slist* contentheader; /* list of extra headers for this form */
+  struct curl_httppost *more; /* if one field name has more than one file, this
+                                 link should link to following files */
+  long flags;     /* as defined below */
+#define HTTPPOST_FILENAME (1<<0) /* specified content is a file name */
+#define HTTPPOST_READFILE (1<<1) /* specified content is a file name */
+#define HTTPPOST_PTRNAME (1<<2) /* name is only stored pointer
+                                   do not free in formfree */
+#define HTTPPOST_PTRCONTENTS (1<<3) /* contents is only stored pointer
+                                       do not free in formfree */
+
+/* CMC: Added support for buffer uploads */
+#define HTTPPOST_BUFFER (1<<4) /* upload file from buffer */
+#define HTTPPOST_PTRBUFFER (1<<5) /* upload file from pointer contents */
+
+  char *showfilename; /* The file name to show. If not set, the actual
+                         file name will be used (if this is a file part) */
+};
+
+typedef int (*curl_progress_callback)(void *clientp,
+                                      double dltotal,
+                                      double dlnow,
+                                      double ultotal,
+                                      double ulnow);
+
+  /* Tests have proven that 20K is a very bad buffer size for uploads on
+     Windows, while 16K for some odd reason performed a lot better. */
+#define CURL_MAX_WRITE_SIZE 16384
+
+typedef size_t (*curl_write_callback)(char *buffer,
+                                      size_t size,
+                                      size_t nitems,
+                                      void *outstream);
+
+typedef size_t (*curl_read_callback)(char *buffer,
+                                     size_t size,
+                                     size_t nitems,
+                                     void *instream);
+
+typedef int (*curl_passwd_callback)(void *clientp,
+                                    const char *prompt,
+                                    char *buffer,
+                                    int buflen);
+
+/* the kind of data that is passed to information_callback*/
+typedef enum {
+  CURLINFO_TEXT = 0,
+  CURLINFO_HEADER_IN,    /* 1 */
+  CURLINFO_HEADER_OUT,   /* 2 */
+  CURLINFO_DATA_IN,      /* 3 */
+  CURLINFO_DATA_OUT,     /* 4 */
+  CURLINFO_END
+} curl_infotype;
+
+typedef int (*curl_debug_callback)
+       (CURL *handle,      /* the handle/transfer this concerns */
+        curl_infotype type, /* what kind of data */
+        char *data,        /* points to the data */
+        size_t size,       /* size of the data pointed to */
+        void *userp);      /* whatever the user please */
+  
+/* All possible error codes from all sorts of curl functions. Future versions
+   may return other values, stay prepared.
+
+   Always add new return codes last. Never *EVER* remove any. The return
+   codes must remain the same!
+ */
+
+typedef enum {
+  CURLE_OK = 0,
+  CURLE_UNSUPPORTED_PROTOCOL,    /* 1 */
+  CURLE_FAILED_INIT,             /* 2 */
+  CURLE_URL_MALFORMAT,           /* 3 */
+  CURLE_URL_MALFORMAT_USER,      /* 4 */
+  CURLE_COULDNT_RESOLVE_PROXY,   /* 5 */
+  CURLE_COULDNT_RESOLVE_HOST,    /* 6 */
+  CURLE_COULDNT_CONNECT,         /* 7 */
+  CURLE_FTP_WEIRD_SERVER_REPLY,  /* 8 */
+  CURLE_FTP_ACCESS_DENIED,       /* 9 */
+  CURLE_FTP_USER_PASSWORD_INCORRECT, /* 10 */
+  CURLE_FTP_WEIRD_PASS_REPLY,    /* 11 */
+  CURLE_FTP_WEIRD_USER_REPLY,    /* 12 */
+  CURLE_FTP_WEIRD_PASV_REPLY,    /* 13 */
+  CURLE_FTP_WEIRD_227_FORMAT,    /* 14 */
+  CURLE_FTP_CANT_GET_HOST,       /* 15 */
+  CURLE_FTP_CANT_RECONNECT,      /* 16 */
+  CURLE_FTP_COULDNT_SET_BINARY,  /* 17 */
+  CURLE_PARTIAL_FILE,            /* 18 */
+  CURLE_FTP_COULDNT_RETR_FILE,   /* 19 */
+  CURLE_FTP_WRITE_ERROR,         /* 20 */
+  CURLE_FTP_QUOTE_ERROR,         /* 21 */
+  CURLE_HTTP_RETURNED_ERROR,     /* 22 */
+  CURLE_WRITE_ERROR,             /* 23 */
+  CURLE_MALFORMAT_USER,          /* 24 - user name is illegally specified */
+  CURLE_FTP_COULDNT_STOR_FILE,   /* 25 - failed FTP upload */
+  CURLE_READ_ERROR,              /* 26 - could open/read from file */
+  CURLE_OUT_OF_MEMORY,           /* 27 */
+  CURLE_OPERATION_TIMEOUTED,     /* 28 - the timeout time was reached */
+  CURLE_FTP_COULDNT_SET_ASCII,   /* 29 - TYPE A failed */
+  CURLE_FTP_PORT_FAILED,         /* 30 - FTP PORT operation failed */
+  CURLE_FTP_COULDNT_USE_REST,    /* 31 - the REST command failed */
+  CURLE_FTP_COULDNT_GET_SIZE,    /* 32 - the SIZE command failed */
+  CURLE_HTTP_RANGE_ERROR,        /* 33 - RANGE "command" didn't work */
+  CURLE_HTTP_POST_ERROR,         /* 34 */
+  CURLE_SSL_CONNECT_ERROR,       /* 35 - wrong when connecting with SSL */
+  CURLE_BAD_DOWNLOAD_RESUME,     /* 36 - couldn't resume download */
+  CURLE_FILE_COULDNT_READ_FILE,  /* 37 */
+  CURLE_LDAP_CANNOT_BIND,        /* 38 */
+  CURLE_LDAP_SEARCH_FAILED,      /* 39 */
+  CURLE_LIBRARY_NOT_FOUND,       /* 40 */
+  CURLE_FUNCTION_NOT_FOUND,      /* 41 */
+  CURLE_ABORTED_BY_CALLBACK,     /* 42 */
+  CURLE_BAD_FUNCTION_ARGUMENT,   /* 43 */
+  CURLE_BAD_CALLING_ORDER,       /* 44 */
+  CURLE_HTTP_PORT_FAILED,        /* 45 - HTTP Interface operation failed */
+  CURLE_BAD_PASSWORD_ENTERED,    /* 46 - my_getpass() returns fail */
+  CURLE_TOO_MANY_REDIRECTS ,     /* 47 - catch endless re-direct loops */
+  CURLE_UNKNOWN_TELNET_OPTION,   /* 48 - User specified an unknown option */
+  CURLE_TELNET_OPTION_SYNTAX ,   /* 49 - Malformed telnet option */
+  CURLE_OBSOLETE,	         /* 50 - removed after 7.7.3 */
+  CURLE_SSL_PEER_CERTIFICATE,    /* 51 - peer's certificate wasn't ok */
+  CURLE_GOT_NOTHING,             /* 52 - when this is a specific error */
+  CURLE_SSL_ENGINE_NOTFOUND,     /* 53 - SSL crypto engine not found */
+  CURLE_SSL_ENGINE_SETFAILED,    /* 54 - can not set SSL crypto engine as
+                                    default */
+  CURLE_SEND_ERROR,              /* 55 - failed sending network data */
+  CURLE_RECV_ERROR,              /* 56 - failure in receiving network data */
+  CURLE_SHARE_IN_USE,            /* 57 - share is in use */
+  CURLE_SSL_CERTPROBLEM,         /* 58 - problem with the local certificate */
+  CURLE_SSL_CIPHER,              /* 59 - couldn't use specified cipher */
+  CURLE_SSL_CACERT,              /* 60 - problem with the CA cert (path?) */
+  CURLE_BAD_CONTENT_ENCODING,    /* 61 - Unrecognized transfer encoding */
+
+  CURL_LAST /* never use! */
+} CURLcode;
+
+/* Make a spelling correction for the operation timed-out define */
+#define CURLE_OPERATION_TIMEDOUT CURLE_OPERATION_TIMEOUTED
+#define CURLE_HTTP_NOT_FOUND CURLE_HTTP_RETURNED_ERROR
+
+typedef enum {
+  CURLPROXY_HTTP = 0,
+  CURLPROXY_SOCKS4 = 4,
+  CURLPROXY_SOCKS5 = 5
+} curl_proxytype;
+
+/* this was the error code 50 in 7.7.3 and a few earlier versions, this
+   is no longer used by libcurl but is instead #defined here only to not
+   make programs break */
+#define CURLE_ALREADY_COMPLETE 99999
+
+/* This is just to make older programs not break: */
+#define CURLE_FTP_PARTIAL_FILE CURLE_PARTIAL_FILE
+#define CURLE_FTP_BAD_DOWNLOAD_RESUME CURLE_BAD_DOWNLOAD_RESUME
+
+#define CURL_ERROR_SIZE 256
+
+/* long may be 32 or 64 bits, but we should never depend on anything else
+   but 32 */
+#define CURLOPTTYPE_LONG          0
+#define CURLOPTTYPE_OBJECTPOINT   10000
+#define CURLOPTTYPE_FUNCTIONPOINT 20000
+
+/* name is uppercase CURLOPT_<name>,
+   type is one of the defined CURLOPTTYPE_<type>
+   number is unique identifier */
+#ifdef CINIT
+#undef CINIT
+#endif
+/*
+ * Figure out if we can use the ## operator, which is supported by ISO/ANSI C
+ * and C++. Some compilers support it without setting __STDC__ or __cplusplus
+ * so we need to carefully check for them too. We don't use configure-checks
+ * for these since we want these headers to remain generic and working for all
+ * platforms.
+ */
+#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \
+  defined(__HP_aCC) || defined(__BORLANDC__)
+  /* This compiler is believed to have an ISO compatible preprocessor */
+#define CURL_ISOCPP
+#else
+  /* This compiler is believed NOT to have an ISO compatible preprocessor */
+#undef CURL_ISOCPP
+#endif
+
+#ifdef CURL_ISOCPP
+#define CINIT(name,type,number) CURLOPT_ ## name = CURLOPTTYPE_ ## type + number
+#else
+/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
+#define LONG          CURLOPTTYPE_LONG
+#define OBJECTPOINT   CURLOPTTYPE_OBJECTPOINT
+#define FUNCTIONPOINT CURLOPTTYPE_FUNCTIONPOINT
+#define CINIT(name,type,number) CURLOPT_/**/name = type + number
+#endif
+
+typedef enum {
+  CINIT(NOTHING, LONG, 0), /********* the first one is unused ************/
+  
+  /* This is the FILE * or void * the regular output should be written to. */
+  CINIT(FILE, OBJECTPOINT, 1),
+
+  /* The full URL to get/put */
+  CINIT(URL,  OBJECTPOINT, 2),
+
+  /* Port number to connect to, if other than default. Specify the CONF_PORT
+     flag in the CURLOPT_FLAGS to activate this */
+  CINIT(PORT, LONG, 3),
+
+  /* Name of proxy to use. Specify the CONF_PROXY flag in the CURLOPT_FLAGS to
+     activate this */
+  CINIT(PROXY, OBJECTPOINT, 4),
+  
+  /* Name and password to use when fetching. Specify the CONF_USERPWD flag in
+     the CURLOPT_FLAGS to activate this */
+  CINIT(USERPWD, OBJECTPOINT, 5),
+
+  /* Name and password to use with Proxy. Specify the CONF_PROXYUSERPWD 
+     flag in the CURLOPT_FLAGS to activate this */
+  CINIT(PROXYUSERPWD, OBJECTPOINT, 6),
+
+  /* Range to get, specified as an ASCII string. Specify the CONF_RANGE flag
+     in the CURLOPT_FLAGS to activate this */
+  CINIT(RANGE, OBJECTPOINT, 7),
+
+  /* not used */
+
+  /* Specified file stream to upload from (use as input): */
+  CINIT(INFILE, OBJECTPOINT, 9),
+
+  /* Buffer to receive error messages in, must be at least CURL_ERROR_SIZE
+   * bytes big. If this is not used, error messages go to stderr instead: */
+  CINIT(ERRORBUFFER, OBJECTPOINT, 10),
+
+  /* Function that will be called to store the output (instead of fwrite). The
+   * parameters will use fwrite() syntax, make sure to follow them. */
+  CINIT(WRITEFUNCTION, FUNCTIONPOINT, 11),
+
+  /* Function that will be called to read the input (instead of fread). The
+   * parameters will use fread() syntax, make sure to follow them. */
+  CINIT(READFUNCTION, FUNCTIONPOINT, 12),
+
+  /* Time-out the read operation after this amount of seconds */
+  CINIT(TIMEOUT, LONG, 13),
+
+  /* If the CURLOPT_INFILE is used, this can be used to inform libcurl about
+   * how large the file being sent really is. That allows better error
+   * checking and better verifies that the upload was succcessful. -1 means
+   * unknown size. */
+  CINIT(INFILESIZE, LONG, 14),
+
+  /* POST input fields. */
+  CINIT(POSTFIELDS, OBJECTPOINT, 15),
+
+  /* Set the referer page (needed by some CGIs) */
+  CINIT(REFERER, OBJECTPOINT, 16),
+
+  /* Set the FTP PORT string (interface name, named or numerical IP address)
+     Use i.e '-' to use default address. */
+  CINIT(FTPPORT, OBJECTPOINT, 17),
+
+  /* Set the User-Agent string (examined by some CGIs) */
+  CINIT(USERAGENT, OBJECTPOINT, 18),
+
+  /* If the download receives less than "low speed limit" bytes/second
+   * during "low speed time" seconds, the operations is aborted.
+   * You could i.e if you have a pretty high speed connection, abort if
+   * it is less than 2000 bytes/sec during 20 seconds.   
+   */
+
+  /* Set the "low speed limit" */
+  CINIT(LOW_SPEED_LIMIT, LONG , 19),
+
+  /* Set the "low speed time" */
+  CINIT(LOW_SPEED_TIME, LONG, 20),
+
+  /* Set the continuation offset */
+  CINIT(RESUME_FROM, LONG, 21),
+
+  /* Set cookie in request: */
+  CINIT(COOKIE, OBJECTPOINT, 22),
+
+  /* This points to a linked list of headers, struct curl_slist kind */
+  CINIT(HTTPHEADER, OBJECTPOINT, 23),
+
+  /* This points to a linked list of post entries, struct HttpPost */
+  CINIT(HTTPPOST, OBJECTPOINT, 24),
+
+  /* name of the file keeping your private SSL-certificate */
+  CINIT(SSLCERT, OBJECTPOINT, 25),
+
+  /* password for the SSL-private key, keep this for compatibility */
+  CINIT(SSLCERTPASSWD, OBJECTPOINT, 26),
+  /* password for the SSL private key */
+  CINIT(SSLKEYPASSWD, OBJECTPOINT, 26),
+  
+  /* send TYPE parameter? */
+  CINIT(CRLF, LONG, 27),
+
+  /* send linked-list of QUOTE commands */
+  CINIT(QUOTE, OBJECTPOINT, 28),
+
+  /* send FILE * or void * to store headers to, if you use a callback it
+     is simply passed to the callback unmodified */
+  CINIT(WRITEHEADER, OBJECTPOINT, 29),
+
+  /* point to a file to read the initial cookies from, also enables
+     "cookie awareness" */
+  CINIT(COOKIEFILE, OBJECTPOINT, 31),
+
+  /* What version to specifly try to use.
+     See CURL_SSLVERSION defines below. */
+  CINIT(SSLVERSION, LONG, 32),
+
+  /* What kind of HTTP time condition to use, see defines */
+  CINIT(TIMECONDITION, LONG, 33),
+
+  /* Time to use with the above condition. Specified in number of seconds
+     since 1 Jan 1970 */
+  CINIT(TIMEVALUE, LONG, 34),
+
+  /* HTTP request, for odd commands like DELETE, TRACE and others */
+  /* OBSOLETE DEFINE, left for tradition only */
+  CINIT(HTTPREQUEST, OBJECTPOINT, 35),
+
+  /* Custom request, for customizing the get command like
+     HTTP: DELETE, TRACE and others
+     FTP: to use a different list command
+     */
+  CINIT(CUSTOMREQUEST, OBJECTPOINT, 36),
+
+  /* HTTP request, for odd commands like DELETE, TRACE and others */
+  CINIT(STDERR, OBJECTPOINT, 37),
+
+  /* 38 is not used */
+
+  /* send linked-list of post-transfer QUOTE commands */
+  CINIT(POSTQUOTE, OBJECTPOINT, 39),
+
+  /* Pass a pointer to string of the output using full variable-replacement
+     as described elsewhere. */
+  CINIT(WRITEINFO, OBJECTPOINT, 40),
+
+  /* Previous FLAG bits */
+  CINIT(VERBOSE, LONG, 41),      /* talk a lot */
+  CINIT(HEADER, LONG, 42),       /* throw the header out too */
+  CINIT(NOPROGRESS, LONG, 43),   /* shut off the progress meter */
+  CINIT(NOBODY, LONG, 44),       /* use HEAD to get http document */
+  CINIT(FAILONERROR, LONG, 45),  /* no output on http error codes >= 300 */
+  CINIT(UPLOAD, LONG, 46),       /* this is an upload */
+  CINIT(POST, LONG, 47),         /* HTTP POST method */
+  CINIT(FTPLISTONLY, LONG, 48),  /* Use NLST when listing ftp dir */
+
+  CINIT(FTPAPPEND, LONG, 50),    /* Append instead of overwrite on upload! */
+
+  /* Specify whether to read the user+password from the .netrc or the URL.
+   * This must be one of the CURL_NETRC_* enums below. */
+  CINIT(NETRC, LONG, 51),
+
+  CINIT(FOLLOWLOCATION, LONG, 52),  /* use Location: Luke! */
+
+  /* This FTPASCII name is now obsolete, to be removed, use the TRANSFERTEXT
+     instead. It goes for more protocols than just ftp... */
+  CINIT(FTPASCII, LONG, 53),     /* use TYPE A for transfer */
+
+  CINIT(TRANSFERTEXT, LONG, 53), /* transfer data in text/ASCII format */
+  CINIT(PUT, LONG, 54),          /* PUT the input file */
+
+  CINIT(MUTE, LONG, 55),         /* OBSOLETE OPTION, removed in 7.8 */
+
+  /* Function that will be called instead of the internal progress display
+   * function. This function should be defined as the curl_progress_callback
+   * prototype defines. */
+  CINIT(PROGRESSFUNCTION, FUNCTIONPOINT, 56),
+
+  /* Data passed to the progress callback */
+  CINIT(PROGRESSDATA, OBJECTPOINT, 57),
+
+  /* We want the referer field set automatically when following locations */
+  CINIT(AUTOREFERER, LONG, 58),
+
+  /* Port of the proxy, can be set in the proxy string as well with:
+     "[host]:[port]" */
+  CINIT(PROXYPORT, LONG, 59),
+
+  /* size of the POST input data, if strlen() is not good to use */
+  CINIT(POSTFIELDSIZE, LONG, 60),
+
+  /* tunnel non-http operations through a HTTP proxy */
+  CINIT(HTTPPROXYTUNNEL, LONG, 61),
+
+  /* Set the interface string to use as outgoing network interface */
+  CINIT(INTERFACE, OBJECTPOINT, 62),
+
+  /* Set the krb4 security level, this also enables krb4 awareness.  This is a
+   * string, 'clear', 'safe', 'confidential' or 'private'.  If the string is
+   * set but doesn't match one of these, 'private' will be used.  */
+  CINIT(KRB4LEVEL, OBJECTPOINT, 63),
+
+  /* Set if we should verify the peer in ssl handshake, set 1 to verify. */
+  CINIT(SSL_VERIFYPEER, LONG, 64),
+  
+  /* The CApath or CAfile used to validate the peer certificate
+     this option is used only if SSL_VERIFYPEER is true */
+  CINIT(CAINFO, OBJECTPOINT, 65),
+
+  /* Function pointer to replace the internal password prompt */
+  CINIT(PASSWDFUNCTION, FUNCTIONPOINT, 66),
+
+  /* Custom pointer that gets passed as first argument to the password
+     function */
+  CINIT(PASSWDDATA, OBJECTPOINT, 67),
+  
+  /* Maximum number of http redirects to follow */
+  CINIT(MAXREDIRS, LONG, 68),
+
+  /* Pass a pointer to a time_t to get a possible date of the requested
+     document! Pass a NULL to shut it off. */
+  CINIT(FILETIME, OBJECTPOINT, 69),
+
+  /* This points to a linked list of telnet options */
+  CINIT(TELNETOPTIONS, OBJECTPOINT, 70),
+
+  /* Max amount of cached alive connections */
+  CINIT(MAXCONNECTS, LONG, 71),
+
+  /* What policy to use when closing connections when the cache is filled
+     up */
+  CINIT(CLOSEPOLICY, LONG, 72),
+
+  /* Callback to use when CURLCLOSEPOLICY_CALLBACK is set */
+  CINIT(CLOSEFUNCTION, FUNCTIONPOINT, 73),
+
+  /* Set to explicitly use a new connection for the upcoming transfer.
+     Do not use this unless you're absolutely sure of this, as it makes the
+     operation slower and is less friendly for the network. */
+  CINIT(FRESH_CONNECT, LONG, 74),
+
+  /* Set to explicitly forbid the upcoming transfer's connection to be re-used
+     when done. Do not use this unless you're absolutely sure of this, as it
+     makes the operation slower and is less friendly for the network. */
+  CINIT(FORBID_REUSE, LONG, 75),
+
+  /* Set to a file name that contains random data for libcurl to use to
+     seed the random engine when doing SSL connects. */
+  CINIT(RANDOM_FILE, OBJECTPOINT, 76),
+
+  /* Set to the Entropy Gathering Daemon socket pathname */
+  CINIT(EGDSOCKET, OBJECTPOINT, 77),
+
+  /* Time-out connect operations after this amount of seconds, if connects
+     are OK within this time, then fine... This only aborts the connect
+     phase. [Only works on unix-style/SIGALRM operating systems] */
+  CINIT(CONNECTTIMEOUT, LONG, 78),
+
+  /* Function that will be called to store headers (instead of fwrite). The
+   * parameters will use fwrite() syntax, make sure to follow them. */
+  CINIT(HEADERFUNCTION, FUNCTIONPOINT, 79),
+
+  /* Set this to force the HTTP request to get back to GET. Only really usable
+     if POST, PUT or a custom request have been used first.
+   */
+  CINIT(HTTPGET, LONG, 80),
+
+  /* Set if we should verify the Common name from the peer certificate in ssl
+   * handshake, set 1 to check existence, 2 to ensure that it matches the
+   * provided hostname. */
+  CINIT(SSL_VERIFYHOST, LONG, 81),
+
+  /* Specify which file name to write all known cookies in after completed
+     operation. Set file name to "-" (dash) to make it go to stdout. */
+  CINIT(COOKIEJAR, OBJECTPOINT, 82),
+
+  /* Specify which SSL ciphers to use */
+  CINIT(SSL_CIPHER_LIST, OBJECTPOINT, 83),
+
+  /* Specify which HTTP version to use! This must be set to one of the
+     CURL_HTTP_VERSION* enums set below. */
+  CINIT(HTTP_VERSION, LONG, 84),
+
+  /* Specificly switch on or off the FTP engine's use of the EPSV command. By
+     default, that one will always be attempted before the more traditional
+     PASV command. */     
+  CINIT(FTP_USE_EPSV, LONG, 85),
+
+  /* type of the file keeping your SSL-certificate ("DER", "PEM", "ENG") */
+  CINIT(SSLCERTTYPE, OBJECTPOINT, 86),
+
+  /* name of the file keeping your private SSL-key */
+  CINIT(SSLKEY, OBJECTPOINT, 87),
+
+  /* type of the file keeping your private SSL-key ("DER", "PEM", "ENG") */
+  CINIT(SSLKEYTYPE, OBJECTPOINT, 88),
+
+  /* crypto engine for the SSL-sub system */
+  CINIT(SSLENGINE, OBJECTPOINT, 89),
+
+  /* set the crypto engine for the SSL-sub system as default
+     the param has no meaning...
+   */
+  CINIT(SSLENGINE_DEFAULT, LONG, 90),
+
+  /* Non-zero value means to use the global dns cache */
+  CINIT(DNS_USE_GLOBAL_CACHE, LONG, 91),
+
+  /* DNS cache timeout */
+  CINIT(DNS_CACHE_TIMEOUT, LONG, 92),
+
+  /* send linked-list of pre-transfer QUOTE commands (Wesley Laxton)*/
+  CINIT(PREQUOTE, OBJECTPOINT, 93),
+
+  /* set the debug function */
+  CINIT(DEBUGFUNCTION, FUNCTIONPOINT, 94),
+
+  /* set the data for the debug function */
+  CINIT(DEBUGDATA, OBJECTPOINT, 95),
+
+  /* mark this as start of a cookie session */
+  CINIT(COOKIESESSION, LONG, 96),
+
+  /* The CApath directory used to validate the peer certificate
+     this option is used only if SSL_VERIFYPEER is true */
+  CINIT(CAPATH, OBJECTPOINT, 97),
+
+  /* Instruct libcurl to use a smaller receive buffer */
+  CINIT(BUFFERSIZE, LONG, 98),
+
+  /* Instruct libcurl to not use any signal/alarm handlers, even when using
+     timeouts. This option is useful for multi-threaded applications.
+     See libcurl-the-guide for more background information. */
+  CINIT(NOSIGNAL, LONG, 99),
+  
+  /* Provide a CURLShare for mutexing non-ts data */
+  CINIT(SHARE, OBJECTPOINT, 100),
+
+  /* indicates type of proxy. accepted values are CURLPROXY_HTTP (default),
+     CURLPROXY_SOCKS4 and CURLPROXY_SOCKS5. */
+  CINIT(PROXYTYPE, LONG, 101),
+
+  /* Set the Accept-Encoding string. Use this to tell a server you would like
+     the response to be compressed. */
+  CINIT(ENCODING, OBJECTPOINT, 102),
+ 
+  /* Set pointer to private data */
+  CINIT(PRIVATE, OBJECTPOINT, 103),
+
+  /* Set aliases for HTTP 200 in the HTTP Response header */
+  CINIT(HTTP200ALIASES, OBJECTPOINT, 104),
+
+  /* Continue to send authentication (user+password) when following locations,
+     even when hostname changed. This can potentionally send off the name
+     and password to whatever host the server decides. */
+  CINIT(UNRESTRICTED_AUTH, LONG, 105),
+
+  /* Specificly switch on or off the FTP engine's use of the EPRT command ( it
+     also disables the LPRT attempt). By default, those ones will always be
+     attempted before the good old traditional PORT command. */     
+  CINIT(FTP_USE_EPRT, LONG, 106),
+
+  CURLOPT_LASTENTRY /* the last unused */
+} CURLoption;
+
+  /* two convenient "aliases" that follow the name scheme better */
+#define CURLOPT_WRITEDATA CURLOPT_FILE
+#define CURLOPT_READDATA  CURLOPT_INFILE 
+#define CURLOPT_HEADERDATA CURLOPT_WRITEHEADER
+
+
+  /* These enums are for use with the CURLOPT_HTTP_VERSION option. */
+enum {
+  CURL_HTTP_VERSION_NONE, /* setting this means we don't care, and that we'd
+                             like the library to choose the best possible
+                             for us! */
+  CURL_HTTP_VERSION_1_0,  /* please use HTTP 1.0 in the request */
+  CURL_HTTP_VERSION_1_1,  /* please use HTTP 1.1 in the request */
+  
+  CURL_HTTP_VERSION_LAST /* *ILLEGAL* http version */
+};
+
+  /* These enums are for use with the CURLOPT_NETRC option. */
+enum CURL_NETRC_OPTION {
+  CURL_NETRC_IGNORED,     /* The .netrc will never be read.
+                           * This is the default. */
+  CURL_NETRC_OPTIONAL,    /* A user:password in the URL will be preferred
+                           * to one in the .netrc. */
+  CURL_NETRC_REQUIRED,    /* A user:password in the URL will be ignored.
+                           * Unless one is set programmatically, the .netrc
+                           * will be queried. */
+  CURL_NETRC_LAST
+};
+
+enum {
+  CURL_SSLVERSION_DEFAULT,
+  CURL_SSLVERSION_TLSv1,
+  CURL_SSLVERSION_SSLv2,
+  CURL_SSLVERSION_SSLv3,
+
+  CURL_SSLVERSION_LAST /* never use, keep last */
+};
+
+
+typedef enum {
+  CURL_TIMECOND_NONE,
+
+  CURL_TIMECOND_IFMODSINCE,
+  CURL_TIMECOND_IFUNMODSINCE,
+  CURL_TIMECOND_LASTMOD,
+
+  CURL_TIMECOND_LAST
+} curl_TimeCond;
+
+/* for backwards compatibility */
+#ifndef TIMECOND_IFMODSINCE
+#define TIMECOND_IFMODSINCE CURL_TIMECOND_IFMODSINCE
+#endif
+#ifndef TIMECOND_IFUNMODSINCE
+#define TIMECOND_IFUNMODSINCE CURL_TIMECOND_IFUNMODSINCE
+#endif
+#ifndef TIMECOND_LASTMOD
+#define TIMECOND_LASTMOD CURL_TIMECOND_LASTMOD
+#endif
+
+#ifdef __BEOS__
+#include <support/SupportDefs.h>
+#endif
+
+
+/* These functions are in the libcurl, they're here for portable reasons and
+   they are used by the 'curl' client. They really should be moved to some kind
+   of "portability library" since it has nothing to do with file transfers and
+   might be usable to other programs...
+
+   NOTE: they return TRUE if the strings match *case insensitively*.
+ */
+extern int (curl_strequal)(const char *s1, const char *s2);
+extern int (curl_strnequal)(const char *s1, const char *s2, size_t n);
+
+/* DEPRECATED function to build formdata */
+int curl_formparse(char *, struct curl_httppost **,
+                   struct curl_httppost **_post);
+
+/* name is uppercase CURLFORM_<name> */
+#ifdef CFINIT
+#undef CFINIT
+#endif
+
+#ifdef CURL_ISOCPP
+#define CFINIT(name) CURLFORM_ ## name
+#else
+/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
+#define CFINIT(name) CURLFORM_/**/name
+#endif
+
+typedef enum {
+  CFINIT(NOTHING),        /********* the first one is unused ************/
+  
+  /*  */
+  CFINIT(COPYNAME),
+  CFINIT(PTRNAME),
+  CFINIT(NAMELENGTH),
+  CFINIT(COPYCONTENTS),
+  CFINIT(PTRCONTENTS),
+  CFINIT(CONTENTSLENGTH),
+  CFINIT(FILECONTENT),
+  CFINIT(ARRAY),
+  CFINIT(OBSOLETE),
+  CFINIT(FILE),
+
+  CFINIT(BUFFER),
+  CFINIT(BUFFERPTR),
+  CFINIT(BUFFERLENGTH),
+
+  CFINIT(CONTENTTYPE),
+  CFINIT(CONTENTHEADER),
+  CFINIT(FILENAME),
+  CFINIT(END),
+  CFINIT(OBSOLETE2),
+
+  CURLFORM_LASTENTRY /* the last unusued */
+} CURLformoption;
+
+#undef CFINIT /* done */
+
+/* structure to be used as parameter for CURLFORM_ARRAY */
+struct curl_forms {
+	CURLformoption		option;
+	const char		*value;
+};
+
+/* use this for multipart formpost building */
+/* Returns code for curl_formadd()
+ * 
+ * Returns:
+ * CURL_FORMADD_OK             on success
+ * CURL_FORMADD_MEMORY         if the FormInfo allocation fails
+ * CURL_FORMADD_OPTION_TWICE   if one option is given twice for one Form
+ * CURL_FORMADD_NULL           if a null pointer was given for a char
+ * CURL_FORMADD_MEMORY         if the allocation of a FormInfo struct failed
+ * CURL_FORMADD_UNKNOWN_OPTION if an unknown option was used
+ * CURL_FORMADD_INCOMPLETE     if the some FormInfo is not complete (or error)
+ * CURL_FORMADD_MEMORY         if a HttpPost struct cannot be allocated
+ * CURL_FORMADD_MEMORY         if some allocation for string copying failed.
+ * CURL_FORMADD_ILLEGAL_ARRAY  if an illegal option is used in an array
+ *
+ ***************************************************************************/
+typedef enum {
+  CURL_FORMADD_OK, /* first, no error */
+
+  CURL_FORMADD_MEMORY,
+  CURL_FORMADD_OPTION_TWICE,
+  CURL_FORMADD_NULL,
+  CURL_FORMADD_UNKNOWN_OPTION,
+  CURL_FORMADD_INCOMPLETE,
+  CURL_FORMADD_ILLEGAL_ARRAY,
+
+  CURL_FORMADD_LAST /* last */
+} CURLFORMcode;
+
+CURLFORMcode curl_formadd(struct curl_httppost **httppost,
+                 struct curl_httppost **last_post,
+                 ...);
+
+/* cleanup a form: */
+void curl_formfree(struct curl_httppost *form);
+
+/* Unix and Win32 getenv function call, this returns a malloc()'ed string that
+   MUST be free()ed after usage is complete. */
+char *curl_getenv(const char *variable);
+
+/* Returns a static ascii string of the libcurl version. */
+char *curl_version(void);
+
+/* Escape and unescape URL encoding in strings. The functions return a new
+ * allocated string or NULL if an error occurred.  */
+char *curl_escape(const char *string, int length);
+char *curl_unescape(const char *string, int length);
+/* 20020912 WJM. Provide for a de-allocation in the same translation unit
+   that did the allocation. Added in libcurl 7.10 */
+void curl_free(void *p);
+
+/* curl_global_init() should be invoked exactly once for each application that
+   uses libcurl */
+CURLcode curl_global_init(long flags);
+
+/* curl_global_cleanup() should be invoked exactly once for each application
+   that uses libcurl */
+void curl_global_cleanup(void);
+
+/* This is the version number */
+#define LIBCURL_VERSION "7.10.5"
+#define LIBCURL_VERSION_NUM 0x070a05
+
+/* linked-list structure for the CURLOPT_QUOTE option (and other) */
+struct curl_slist {
+	char			*data;
+	struct curl_slist	*next;
+};
+
+struct curl_slist *curl_slist_append(struct curl_slist *, const char *);
+void curl_slist_free_all(struct curl_slist *);
+
+/*
+ * NAME curl_getdate()
+ *
+ * DESCRIPTION
+ *
+ * Returns the time, in seconds since 1 Jan 1970 of the time string given in
+ * the first argument. The time argument in the second parameter is for cases
+ * where the specified time is relative now, like 'two weeks' or 'tomorrow'
+ * etc.
+ */
+time_t curl_getdate(const char *p, const time_t *now);
+
+
+#define CURLINFO_STRING   0x100000
+#define CURLINFO_LONG     0x200000
+#define CURLINFO_DOUBLE   0x300000
+#define CURLINFO_MASK     0x0fffff
+#define CURLINFO_TYPEMASK 0xf00000
+
+typedef enum {
+  CURLINFO_NONE, /* first, never use this */
+  CURLINFO_EFFECTIVE_URL    = CURLINFO_STRING + 1,
+  CURLINFO_HTTP_CODE        = CURLINFO_LONG   + 2,
+  CURLINFO_TOTAL_TIME       = CURLINFO_DOUBLE + 3,
+  CURLINFO_NAMELOOKUP_TIME  = CURLINFO_DOUBLE + 4,
+  CURLINFO_CONNECT_TIME     = CURLINFO_DOUBLE + 5,
+  CURLINFO_PRETRANSFER_TIME = CURLINFO_DOUBLE + 6,
+  CURLINFO_SIZE_UPLOAD      = CURLINFO_DOUBLE + 7,
+  CURLINFO_SIZE_DOWNLOAD    = CURLINFO_DOUBLE + 8,
+  CURLINFO_SPEED_DOWNLOAD   = CURLINFO_DOUBLE + 9,
+  CURLINFO_SPEED_UPLOAD     = CURLINFO_DOUBLE + 10,
+  CURLINFO_HEADER_SIZE      = CURLINFO_LONG   + 11,
+  CURLINFO_REQUEST_SIZE     = CURLINFO_LONG   + 12,
+  CURLINFO_SSL_VERIFYRESULT = CURLINFO_LONG   + 13,
+  CURLINFO_FILETIME         = CURLINFO_LONG   + 14,
+
+  CURLINFO_CONTENT_LENGTH_DOWNLOAD   = CURLINFO_DOUBLE + 15,
+  CURLINFO_CONTENT_LENGTH_UPLOAD     = CURLINFO_DOUBLE + 16,
+
+  CURLINFO_STARTTRANSFER_TIME = CURLINFO_DOUBLE + 17,
+
+  CURLINFO_CONTENT_TYPE = CURLINFO_STRING + 18,
+
+  CURLINFO_REDIRECT_TIME   = CURLINFO_DOUBLE + 19,
+  CURLINFO_REDIRECT_COUNT  = CURLINFO_LONG + 20,
+
+  CURLINFO_PRIVATE = CURLINFO_STRING + 21,
+
+  /* Fill in new entries here! */
+
+  CURLINFO_LASTONE          = 22
+} CURLINFO;
+
+typedef enum {
+  CURLCLOSEPOLICY_NONE, /* first, never use this */
+
+  CURLCLOSEPOLICY_OLDEST,
+  CURLCLOSEPOLICY_LEAST_RECENTLY_USED,
+  CURLCLOSEPOLICY_LEAST_TRAFFIC,
+  CURLCLOSEPOLICY_SLOWEST,
+  CURLCLOSEPOLICY_CALLBACK,
+ 
+  CURLCLOSEPOLICY_LAST /* last, never use this */
+} curl_closepolicy;
+
+#define CURL_GLOBAL_SSL (1<<0)
+#define CURL_GLOBAL_WIN32 (1<<1)
+#define CURL_GLOBAL_ALL (CURL_GLOBAL_SSL|CURL_GLOBAL_WIN32)
+#define CURL_GLOBAL_NOTHING 0
+#define CURL_GLOBAL_DEFAULT CURL_GLOBAL_ALL
+
+
+/*****************************************************************************
+ * Setup defines, protos etc for the sharing stuff.
+ */
+
+/* Different data locks for a single share */
+typedef enum {
+  CURL_LOCK_DATA_NONE = 0,
+  /*  CURL_LOCK_DATA_SHARE is used internaly to say that
+   *  the locking is just made to change the internal state of the share
+   *  itself.
+   */
+  CURL_LOCK_DATA_SHARE, 
+  CURL_LOCK_DATA_COOKIE,
+  CURL_LOCK_DATA_DNS,
+  CURL_LOCK_DATA_SSL_SESSION,
+  CURL_LOCK_DATA_CONNECT,
+  CURL_LOCK_DATA_LAST
+} curl_lock_data;
+
+/* Different lock access types */
+typedef enum {
+  CURL_LOCK_ACCESS_NONE = 0,   /* unspecified action */
+  CURL_LOCK_ACCESS_SHARED = 1, /* for read perhaps */
+  CURL_LOCK_ACCESS_SINGLE = 2, /* for write perhaps */
+  CURL_LOCK_ACCESS_LAST        /* never use */
+} curl_lock_access;
+
+typedef void (*curl_lock_function)(CURL *handle,
+                                   curl_lock_data data,
+                                   curl_lock_access access,
+                                   void *userptr);
+typedef void (*curl_unlock_function)(CURL *handle,
+                                     curl_lock_data data,
+                                     void *userptr);
+
+typedef void CURLSH;
+
+typedef enum {
+  CURLSHE_OK,  /* all is fine */
+  CURLSHE_BAD_OPTION, /* 1 */
+  CURLSHE_IN_USE,     /* 2 */
+  CURLSHE_INVALID,    /* 3 */
+  CURLSHE_LAST /* never use */
+} CURLSHcode;
+
+typedef enum {
+  CURLSHOPT_NONE,  /* don't use */
+  CURLSHOPT_SHARE,   /* specify a data type to share */
+  CURLSHOPT_UNSHARE, /* specify shich data type to stop sharing */
+  CURLSHOPT_LOCKFUNC,   /* pass in a 'curl_lock_function' pointer */
+  CURLSHOPT_UNLOCKFUNC, /* pass in a 'curl_unlock_function' pointer */
+  CURLSHOPT_USERDATA,   /* pass in a user data pointer used in the lock/unlock
+                           callback functions */
+  CURLSHOPT_LAST  /* never use */
+} CURLSHoption;
+
+CURLSH *curl_share_init(void);
+CURLSHcode curl_share_setopt(CURLSH *, CURLSHoption option, ...);
+CURLSHcode curl_share_cleanup(CURLSH *);
+
+/****************************************************************************
+ * Structures for querying information about the curl library at runtime.
+ */
+
+typedef enum {
+  CURLVERSION_FIRST,
+  CURLVERSION_LAST /* never actually use this */
+} CURLversion;
+
+/* The 'CURLVERSION_NOW' is the symbolic name meant to be used by
+   basicly all programs ever, that want to get version information. It is
+   meant to be a built-in version number for what kind of struct the caller
+   expects. If the struct ever changes, we redfine the NOW to another enum
+   from above. */
+#define CURLVERSION_NOW CURLVERSION_FIRST
+
+typedef struct {
+  CURLversion age;          /* age of the returned struct */
+  const char *version;      /* LIBCURL_VERSION */
+  unsigned int version_num; /* LIBCURL_VERSION_NUM */
+  const char *host;         /* OS/host/cpu/machine when configured */
+  int features;             /* bitmask, see defines below */
+  char *ssl_version;        /* human readable string */
+  long ssl_version_num;     /* number */
+  const char *libz_version;       /* human readable string */
+  /* protocols is terminated by an entry with a NULL protoname */
+  const char **protocols;
+} curl_version_info_data;
+
+#define CURL_VERSION_IPV6      (1<<0)
+#define CURL_VERSION_KERBEROS4 (1<<1)
+#define CURL_VERSION_SSL       (1<<2)
+#define CURL_VERSION_LIBZ      (1<<3)
+
+/* returns a pointer to a static copy of the version info struct */
+curl_version_info_data *curl_version_info(CURLversion);
+
+#ifdef  __cplusplus
+}
+#endif
+
+/* unfortunately, the easy.h and multi.h include files need options and info
+  stuff before they can be included! */
+#include "easy.h" /* nothing in curl is fun without the easy stuff */
+#include "multi.h"
+
+#endif /* __CURL_CURL_H */
diff --git a/main/source/curl/include/curl/easy.h b/main/source/curl/include/curl/easy.h
new file mode 100644
index 00000000..f8d4d613
--- /dev/null
+++ b/main/source/curl/include/curl/easy.h
@@ -0,0 +1,68 @@
+#ifndef __CURL_EASY_H
+#define __CURL_EASY_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: easy.h,v 1.8 2003/01/16 21:08:12 bagder Exp $
+ ***************************************************************************/
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+CURL *curl_easy_init(void);
+CURLcode curl_easy_setopt(CURL *curl, CURLoption option, ...);
+CURLcode curl_easy_perform(CURL *curl);
+void curl_easy_cleanup(CURL *curl);
+
+/*
+ * NAME curl_easy_getinfo()
+ *
+ * DESCRIPTION
+ *
+ * Request internal information from the curl session with this function.  The
+ * third argument MUST be a pointer to a long, a pointer to a char * or a
+ * pointer to a double (as the documentation describes elsewhere).  The data
+ * pointed to will be filled in accordingly and can be relied upon only if the
+ * function returns CURLE_OK.  This function is intended to get used *AFTER* a
+ * performed transfer, all results from this function are undefined until the
+ * transfer is completed.
+ */
+CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ...);
+
+
+/*
+ * NAME curl_easy_duphandle()
+ *
+ * DESCRIPTION
+ *
+ * Creates a new curl session handle with the same options set for the handle
+ * passed in. Duplicating a handle could only be a matter of cloning data and
+ * options, internal state info and things like persistant connections cannot
+ * be transfered. It is useful in multithreaded applications when you can run
+ * curl_easy_duphandle() for each new thread to avoid a series of identical
+ * curl_easy_setopt() invokes in every thread.
+ */
+CURL* curl_easy_duphandle(CURL *curl);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
diff --git a/main/source/curl/include/curl/mprintf.h b/main/source/curl/include/curl/mprintf.h
new file mode 100644
index 00000000..85bbce11
--- /dev/null
+++ b/main/source/curl/include/curl/mprintf.h
@@ -0,0 +1,54 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: mprintf.h,v 1.7 2003/01/16 21:08:12 bagder Exp $
+ ***************************************************************************/
+
+#ifndef H_MPRINTF
+#define H_MPRINTF
+
+#include <stdarg.h>
+#include <stdio.h> /* needed for FILE */
+
+int curl_mprintf(const char *format, ...);
+int curl_mfprintf(FILE *fd, const char *format, ...);
+int curl_msprintf(char *buffer, const char *format, ...);
+int curl_msnprintf(char *buffer, size_t maxlength, const char *format, ...);
+int curl_mvprintf(const char *format, va_list args);
+int curl_mvfprintf(FILE *fd, const char *format, va_list args);
+int curl_mvsprintf(char *buffer, const char *format, va_list args);
+int curl_mvsnprintf(char *buffer, size_t maxlength, const char *format, va_list args);
+char *curl_maprintf(const char *format, ...);
+char *curl_mvaprintf(const char *format, va_list args);
+
+#ifdef _MPRINTF_REPLACE
+# define printf curl_mprintf
+# define fprintf curl_mfprintf
+# define sprintf curl_msprintf
+# define snprintf curl_msnprintf
+# define vprintf curl_mvprintf
+# define vfprintf curl_mvfprintf
+# define vsprintf curl_mvsprintf
+# define vsnprintf curl_mvsnprintf
+# define aprintf curl_maprintf
+# define vaprintf curl_mvaprintf
+#endif
+
+#endif /* H_MPRINTF */
diff --git a/main/source/curl/include/curl/multi.h b/main/source/curl/include/curl/multi.h
new file mode 100644
index 00000000..75dbd85b
--- /dev/null
+++ b/main/source/curl/include/curl/multi.h
@@ -0,0 +1,198 @@
+#ifndef __CURL_MULTI_H
+#define __CURL_MULTI_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: multi.h,v 1.10 2003/05/09 07:37:27 bagder Exp $
+ ***************************************************************************/
+/*
+  This is meant to be the "external" header file. Don't give away any
+  internals here!
+
+  This document presents a mixture of ideas from at least:
+  - Daniel Stenberg
+  - Steve Dekorte
+  - Sterling Hughes
+  - Ben Greear
+
+  -------------------------------------------
+  GOALS
+
+  o Enable a "pull" interface. The application that uses libcurl decides where
+    and when to ask libcurl to get/send data.
+
+  o Enable multiple simultaneous transfers in the same thread without making it
+    complicated for the application.
+
+  o Enable the application to select() on its own file descriptors and curl's
+    file descriptors simultaneous easily.
+  
+*/
+
+#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
+#include <winsock.h>
+#else
+#include <sys/select.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#endif
+
+#include "curl.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+typedef void CURLM;
+
+typedef enum {
+  CURLM_CALL_MULTI_PERFORM=-1, /* please call curl_multi_perform() soon */
+  CURLM_OK,
+  CURLM_BAD_HANDLE,      /* the passed-in handle is not a valid CURLM handle */
+  CURLM_BAD_EASY_HANDLE, /* an easy handle was not good/valid */
+  CURLM_OUT_OF_MEMORY,   /* if you ever get this, you're in deep sh*t */
+  CURLM_INTERNAL_ERROR,  /* this is a libcurl bug */
+  CURLM_LAST
+} CURLMcode;
+
+typedef enum {
+  CURLMSG_NONE, /* first, not used */
+  CURLMSG_DONE, /* This easy handle has completed. 'result' contains
+                   the CURLcode of the transfer */
+  CURLMSG_LAST /* last, not used */
+} CURLMSG;
+
+struct CURLMsg {
+  CURLMSG msg;       /* what this message means */
+  CURL *easy_handle; /* the handle it concerns */
+  union {
+    void *whatever;    /* message-specific data */
+    CURLcode result;   /* return code for transfer */
+  } data;
+};
+typedef struct CURLMsg CURLMsg;
+
+/*
+ * Name:    curl_multi_init()
+ *
+ * Desc:    inititalize multi-style curl usage
+ * Returns: a new CURLM handle to use in all 'curl_multi' functions.
+ */
+CURLM *curl_multi_init(void);
+
+/*
+ * Name:    curl_multi_add_handle()
+ *
+ * Desc:    add a standard curl handle to the multi stack
+ * Returns: CURLMcode type, general multi error code.
+ */
+CURLMcode curl_multi_add_handle(CURLM *multi_handle,
+                                CURL *curl_handle);
+
+ /*
+  * Name:    curl_multi_remove_handle()
+  *
+  * Desc:    removes a curl handle from the multi stack again
+  * Returns: CURLMcode type, general multi error code.
+  */
+CURLMcode curl_multi_remove_handle(CURLM *multi_handle,
+                                   CURL *curl_handle);
+
+ /*
+  * Name:    curl_multi_fdset()
+  *
+  * Desc:    Ask curl for its fd_set sets. The app can use these to select() or
+  *          poll() on. We want curl_multi_perform() called as soon as one of
+  *          them are ready.
+  * Returns: CURLMcode type, general multi error code.
+  */
+CURLMcode curl_multi_fdset(CURLM *multi_handle,
+                           fd_set *read_fd_set,
+                           fd_set *write_fd_set,
+                           fd_set *exc_fd_set,
+                           int *max_fd);
+
+ /*
+  * Name:    curl_multi_perform()
+  *
+  * Desc:    When the app thinks there's data available for curl it calls this
+  *          function to read/write whatever there is right now. This returns
+  *          as soon as the reads and writes are done. This function does not
+  *          require that there actually is data available for reading or that
+  *          data can be written, it can be called just in case. It returns
+  *          the number of handles that still transfer data in the second
+  *          argument's integer-pointer.
+  *
+  * Returns: CURLMcode type, general multi error code. *NOTE* that this only
+  *          returns errors etc regarding the whole multi stack. There might
+  *          still have occurred problems on invidual transfers even when this
+  *          returns OK.
+  */
+CURLMcode curl_multi_perform(CURLM *multi_handle,
+                             int *running_handles);
+
+ /*
+  * Name:    curl_multi_cleanup()
+  *
+  * Desc:    Cleans up and removes a whole multi stack. It does not free or
+  *          touch any individual easy handles in any way. We need to define
+  *          in what state those handles will be if this function is called
+  *          in the middle of a transfer.
+  * Returns: CURLMcode type, general multi error code.
+  */
+CURLMcode curl_multi_cleanup(CURLM *multi_handle);
+
+/*
+ * Name:    curl_multi_info_read()
+ *
+ * Desc:    Ask the multi handle if there's any messages/informationals from
+ *          the individual transfers. Messages include informationals such as
+ *          error code from the transfer or just the fact that a transfer is
+ *          completed. More details on these should be written down as well.
+ *
+ *          Repeated calls to this function will return a new struct each
+ *          time, until a special "end of msgs" struct is returned as a signal
+ *          that there is no more to get at this point.
+ *
+ *          The data the returned pointer points to will not survive calling
+ *          curl_multi_cleanup().
+ *
+ *          The 'CURLMsg' struct is meant to be very simple and only contain
+ *          very basic informations. If more involved information is wanted,
+ *          we will provide the particular "transfer handle" in that struct
+ *          and that should/could/would be used in subsequent
+ *          curl_easy_getinfo() calls (or similar). The point being that we
+ *          must never expose complex structs to applications, as then we'll
+ *          undoubtably get backwards compatibility problems in the future.
+ *
+ * Returns: A pointer to a filled-in struct, or NULL if it failed or ran out
+ *          of structs. It also writes the number of messages left in the
+ *          queue (after this read) in the integer the second argument points
+ *          to.
+ */
+CURLMsg *curl_multi_info_read(CURLM *multi_handle,
+                              int *msgs_in_queue);
+
+#ifdef __cplusplus
+} /* end of extern "C" */
+#endif
+  
+#endif
diff --git a/main/source/curl/include/curl/stdcheaders.h b/main/source/curl/include/curl/stdcheaders.h
new file mode 100644
index 00000000..987e9452
--- /dev/null
+++ b/main/source/curl/include/curl/stdcheaders.h
@@ -0,0 +1,36 @@
+#ifndef __STDC_HEADERS_H
+#define __STDC_HEADERS_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: stdcheaders.h,v 1.6 2003/01/16 21:08:12 bagder Exp $
+ ***************************************************************************/
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+size_t fread (void *, size_t, size_t, FILE *);
+size_t fwrite (const void *, size_t, size_t, FILE *);
+
+int strcasecmp(const char *, const char *);
+int strncasecmp(const char *, const char *, size_t);
+
+#endif
diff --git a/main/source/curl/include/curl/types.h b/main/source/curl/include/curl/types.h
new file mode 100644
index 00000000..7b0d1265
--- /dev/null
+++ b/main/source/curl/include/curl/types.h
@@ -0,0 +1,28 @@
+#ifndef __CURL_TYPES_H
+#define __CURL_TYPES_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: types.h,v 1.6 2003/01/16 21:08:12 bagder Exp $
+ ***************************************************************************/
+typedef void CURL;
+typedef void CURLconnect;
+
+#endif /* __CURL_TYPES_H */
diff --git a/main/source/curl/install-sh b/main/source/curl/install-sh
new file mode 100644
index 00000000..082fd7c7
--- /dev/null
+++ b/main/source/curl/install-sh
@@ -0,0 +1,250 @@
+#!/bin/sh
+#
+# install - install a program, script, or datafile
+# This comes from X11R5 (mit/util/scripts/install.sh).
+#
+# Copyright 1991 by the Massachusetts Institute of Technology
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission.  M.I.T. makes no representations about the
+# suitability of this software for any purpose.  It is provided "as is"
+# without express or implied warranty.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+transformbasename=""
+transform_arg=""
+instcmd="$mvprog"
+chmodcmd="$chmodprog 0755"
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=""
+dst=""
+dir_arg=""
+
+while [ x"$1" != x ]; do
+    case $1 in
+	-c) instcmd="$cpprog"
+	    shift
+	    continue;;
+
+	-d) dir_arg=true
+	    shift
+	    continue;;
+
+	-m) chmodcmd="$chmodprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-o) chowncmd="$chownprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-g) chgrpcmd="$chgrpprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-s) stripcmd="$stripprog"
+	    shift
+	    continue;;
+
+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+	    shift
+	    continue;;
+
+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+	    shift
+	    continue;;
+
+	*)  if [ x"$src" = x ]
+	    then
+		src=$1
+	    else
+		# this colon is to work around a 386BSD /bin/sh bug
+		:
+		dst=$1
+	    fi
+	    shift
+	    continue;;
+    esac
+done
+
+if [ x"$src" = x ]
+then
+	echo "install:	no input file specified"
+	exit 1
+else
+	true
+fi
+
+if [ x"$dir_arg" != x ]; then
+	dst=$src
+	src=""
+	
+	if [ -d $dst ]; then
+		instcmd=:
+	else
+		instcmd=mkdir
+	fi
+else
+
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad 
+# if $src (and thus $dsttmp) contains '*'.
+
+	if [ -f $src -o -d $src ]
+	then
+		true
+	else
+		echo "install:  $src does not exist"
+		exit 1
+	fi
+	
+	if [ x"$dst" = x ]
+	then
+		echo "install:	no destination specified"
+		exit 1
+	else
+		true
+	fi
+
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+	if [ -d $dst ]
+	then
+		dst="$dst"/`basename $src`
+	else
+		true
+	fi
+fi
+
+## this sed command emulates the dirname command
+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+# Make sure that the destination directory exists.
+#  this part is taken from Noah Friedman's mkinstalldirs script
+
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
+defaultIFS='	
+'
+IFS="${IFS-${defaultIFS}}"
+
+oIFS="${IFS}"
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS="${oIFS}"
+
+pathcomp=''
+
+while [ $# -ne 0 ] ; do
+	pathcomp="${pathcomp}${1}"
+	shift
+
+	if [ ! -d "${pathcomp}" ] ;
+        then
+		$mkdirprog "${pathcomp}"
+	else
+		true
+	fi
+
+	pathcomp="${pathcomp}/"
+done
+fi
+
+if [ x"$dir_arg" != x ]
+then
+	$doit $instcmd $dst &&
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+else
+
+# If we're going to rename the final executable, determine the name now.
+
+	if [ x"$transformarg" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		dstfile=`basename $dst $transformbasename | 
+			sed $transformarg`$transformbasename
+	fi
+
+# don't allow the sed command to completely eliminate the filename
+
+	if [ x"$dstfile" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		true
+	fi
+
+# Make a temp file name in the proper directory.
+
+	dsttmp=$dstdir/#inst.$$#
+
+# Move or copy the file name to the temp name
+
+	$doit $instcmd $src $dsttmp &&
+
+	trap "rm -f ${dsttmp}" 0 &&
+
+# and set any options; do chmod last to preserve setuid bits
+
+# If any of these fail, we abort the whole thing.  If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+
+# Now rename the file to the real destination.
+
+	$doit $rmcmd -f $dstdir/$dstfile &&
+	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+
+fi &&
+
+
+exit 0
diff --git a/main/source/curl/install.sh b/main/source/curl/install.sh
new file mode 100644
index 00000000..082fd7c7
--- /dev/null
+++ b/main/source/curl/install.sh
@@ -0,0 +1,250 @@
+#!/bin/sh
+#
+# install - install a program, script, or datafile
+# This comes from X11R5 (mit/util/scripts/install.sh).
+#
+# Copyright 1991 by the Massachusetts Institute of Technology
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission.  M.I.T. makes no representations about the
+# suitability of this software for any purpose.  It is provided "as is"
+# without express or implied warranty.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+transformbasename=""
+transform_arg=""
+instcmd="$mvprog"
+chmodcmd="$chmodprog 0755"
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=""
+dst=""
+dir_arg=""
+
+while [ x"$1" != x ]; do
+    case $1 in
+	-c) instcmd="$cpprog"
+	    shift
+	    continue;;
+
+	-d) dir_arg=true
+	    shift
+	    continue;;
+
+	-m) chmodcmd="$chmodprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-o) chowncmd="$chownprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-g) chgrpcmd="$chgrpprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-s) stripcmd="$stripprog"
+	    shift
+	    continue;;
+
+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+	    shift
+	    continue;;
+
+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+	    shift
+	    continue;;
+
+	*)  if [ x"$src" = x ]
+	    then
+		src=$1
+	    else
+		# this colon is to work around a 386BSD /bin/sh bug
+		:
+		dst=$1
+	    fi
+	    shift
+	    continue;;
+    esac
+done
+
+if [ x"$src" = x ]
+then
+	echo "install:	no input file specified"
+	exit 1
+else
+	true
+fi
+
+if [ x"$dir_arg" != x ]; then
+	dst=$src
+	src=""
+	
+	if [ -d $dst ]; then
+		instcmd=:
+	else
+		instcmd=mkdir
+	fi
+else
+
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad 
+# if $src (and thus $dsttmp) contains '*'.
+
+	if [ -f $src -o -d $src ]
+	then
+		true
+	else
+		echo "install:  $src does not exist"
+		exit 1
+	fi
+	
+	if [ x"$dst" = x ]
+	then
+		echo "install:	no destination specified"
+		exit 1
+	else
+		true
+	fi
+
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+	if [ -d $dst ]
+	then
+		dst="$dst"/`basename $src`
+	else
+		true
+	fi
+fi
+
+## this sed command emulates the dirname command
+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+# Make sure that the destination directory exists.
+#  this part is taken from Noah Friedman's mkinstalldirs script
+
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
+defaultIFS='	
+'
+IFS="${IFS-${defaultIFS}}"
+
+oIFS="${IFS}"
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS="${oIFS}"
+
+pathcomp=''
+
+while [ $# -ne 0 ] ; do
+	pathcomp="${pathcomp}${1}"
+	shift
+
+	if [ ! -d "${pathcomp}" ] ;
+        then
+		$mkdirprog "${pathcomp}"
+	else
+		true
+	fi
+
+	pathcomp="${pathcomp}/"
+done
+fi
+
+if [ x"$dir_arg" != x ]
+then
+	$doit $instcmd $dst &&
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+else
+
+# If we're going to rename the final executable, determine the name now.
+
+	if [ x"$transformarg" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		dstfile=`basename $dst $transformbasename | 
+			sed $transformarg`$transformbasename
+	fi
+
+# don't allow the sed command to completely eliminate the filename
+
+	if [ x"$dstfile" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		true
+	fi
+
+# Make a temp file name in the proper directory.
+
+	dsttmp=$dstdir/#inst.$$#
+
+# Move or copy the file name to the temp name
+
+	$doit $instcmd $src $dsttmp &&
+
+	trap "rm -f ${dsttmp}" 0 &&
+
+# and set any options; do chmod last to preserve setuid bits
+
+# If any of these fail, we abort the whole thing.  If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+
+# Now rename the file to the real destination.
+
+	$doit $rmcmd -f $dstdir/$dstfile &&
+	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+
+fi &&
+
+
+exit 0
diff --git a/main/source/curl/lib/Makefile.am b/main/source/curl/lib/Makefile.am
new file mode 100644
index 00000000..c6861097
--- /dev/null
+++ b/main/source/curl/lib/Makefile.am
@@ -0,0 +1,88 @@
+#
+# $Id: Makefile.am,v 1.52 2003/02/04 23:48:46 jpbl Exp $
+#
+
+AUTOMAKE_OPTIONS = foreign nostdinc
+
+EXTRA_DIST = getdate.y Makefile.b32 Makefile.b32.resp Makefile.m32	    \
+       Makefile.vc6 Makefile.riscos libcurl.def curllib.dsp	    \
+       curllib.dsw config-vms.h config-win32.h config-riscos.h config-mac.h \
+       config.h.in ca-bundle.crt README.encoding README.memoryleak
+
+lib_LTLIBRARIES = libcurl.la
+
+# we use srcdir/include for the static global include files
+# we use builddir/lib for the generated lib/config.h file to get found
+# we use srcdir/lib for the lib-private header files
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/lib -I$(top_srcdir)/lib
+
+VERSION=-version-info 2:2:0
+
+# This flag accepts an argument of the form current[:revision[:age]]. So,
+# passing -version-info 3:12:1 sets current to 3, revision to 12, and age to
+# 1.
+#
+# If either revision or age are omitted, they default to 0. Also note that age
+# must be less than or equal to the current interface number.
+#
+# Here are a set of rules to help you update your library version information: 
+#
+# 1.Start with version information of 0:0:0 for each libtool library.
+#
+# 2.Update the version information only immediately before a public release of
+# your software. More frequent updates are unnecessary, and only guarantee
+# that the current interface number gets larger faster.
+#
+# 3.If the library source code has changed at all since the last update, then
+# increment revision (c:r:a becomes c:r+1:a).
+#
+# 4.If any interfaces have been added, removed, or changed since the last
+# update, increment current, and set revision to 0.
+#
+# 5.If any interfaces have been added since the last public release, then
+# increment age.
+#
+# 6.If any interfaces have been removed since the last public release, then
+# set age to 0.
+#
+
+if NO_UNDEFINED
+# The -no-undefined flag is CRUCIAL for this to build fine on Cygwin. If we
+# find a case in which we need to remove this flag, we should most likely
+# write a configure check that detects when this flag is needed and when its
+# not.
+libcurl_la_LDFLAGS = -no-undefined $(VERSION)
+else
+libcurl_la_LDFLAGS = $(VERSION)
+endif
+
+libcurl_la_SOURCES = arpa_telnet.h file.c getpass.h netrc.h timeval.c	\
+base64.c file.h hostip.c progress.c timeval.h base64.h formdata.c	\
+hostip.h progress.h cookie.c formdata.h http.c sendf.c cookie.h ftp.c	\
+http.h sendf.h url.c dict.c ftp.h if2ip.c speedcheck.c url.h dict.h	\
+getdate.c if2ip.h speedcheck.h urldata.h getdate.h ldap.c ssluse.c	\
+version.c getenv.c ldap.h ssluse.h escape.c mprintf.c telnet.c escape.h	\
+getpass.c netrc.c telnet.h getinfo.c getinfo.h transfer.c strequal.c	\
+strequal.h easy.c security.h security.c krb4.c krb4.h memdebug.c	\
+memdebug.h inet_ntoa_r.h http_chunks.c http_chunks.h strtok.c strtok.h	\
+connect.c connect.h llist.c llist.h hash.c hash.h multi.c		\
+content_encoding.c content_encoding.h share.c share.h
+
+noinst_HEADERS = setup.h transfer.h
+
+# Say $(srcdir), so GNU make does not report an ambiguity with the .y.c rule.
+$(srcdir)/getdate.c: getdate.y
+	cd $(srcdir) && \
+	  $(YACC) $(YFLAGS) getdate.y; \
+	  mv -f y.tab.c getdate.c
+
+install-data-hook:
+	@if test -n "@CURL_CA_BUNDLE@"; then \
+	  $(mkinstalldirs) `dirname $(DESTDIR)@CURL_CA_BUNDLE@`; \
+	  @INSTALL_DATA@ $(srcdir)/ca-bundle.crt $(DESTDIR)@CURL_CA_BUNDLE@; \
+        fi
+
+# this hook is mainly for non-unix systems to build even if configure
+# isn't run
+dist-hook:
+	cp $(srcdir)/ca-bundle.h.in $(distdir)/ca-bundle.h
diff --git a/main/source/curl/lib/Makefile.b32 b/main/source/curl/lib/Makefile.b32
new file mode 100644
index 00000000..4a5c2f83
--- /dev/null
+++ b/main/source/curl/lib/Makefile.b32
@@ -0,0 +1,84 @@
+############################################################
+# $Id: Makefile.b32,v 1.9 2003/03/03 22:39:34 bagder Exp $
+#
+#  Makefile.b32 - Borland's C++ Compiler 5.X
+#
+#  'lib' directory
+#
+#  Requires 'Makefile.b32.resp'
+#
+#  Written by Jaepil Kim, pit@paradise.net.nz
+############################################################
+
+# Setup environment
+CXX	   = bcc32
+RM	   = del
+LIB	   = tlib
+TOPDIR	   = ..
+CURNTDIR   = .
+CXXFLAGS   = -5 -O2 -w-aus -w-ccc -w-csu -w-par -w-pia -w-rch -w-inl -w-ngu -w-pro -tWM
+DEFINES    = -DLIBCURL_BIGENDIAN=0 -DNDEBUG -DWIN32 -DCONSOLE -DMBCS
+INCDIRS    = -I$(CURNTDIR);$(TOPDIR)/include/
+
+# 'BCCDIR' has to be set up in your c:\autoexec.bat
+# i.e. SET BCCDIR = c:\Borland\BCC55
+# where c:\Borland\BCC55 is the compiler is installed
+LINKLIB	   = $(BCCDIR)/lib/psdk/ws2_32.lib
+LIBCURLLIB = libcurl.lib
+
+.SUFFIXES: .c
+
+SOURCES	   = \
+	base64.c \
+	cookie.c \
+	transfer.c \
+	escape.c \
+	formdata.c \
+	ftp.c \
+	http.c \
+        http_chunks.c \
+	ldap.c \
+	dict.c \
+	telnet.c \
+	getdate.c \
+	getenv.c \
+	getpass.c \
+	hostip.c \
+	if2ip.c \
+	mprintf.c \
+	netrc.c \
+	progress.c \
+	sendf.c \
+	speedcheck.c \
+	ssluse.c \
+	timeval.c \
+	url.c \
+	file.c \
+	getinfo.c \
+	version.c \
+	easy.c \
+	strequal.c \
+	strtok.c \
+	connect.c \
+        hash.c \
+        share.c \
+        llist.c \
+        multi.c \
+        content_encoding.c
+
+OBJECTS = $(SOURCES:.c=.obj)
+
+.c.obj:
+	$(CXX) -c $(INCDIRS) $(CXXFLAGS) $(DEFINES) $<
+
+all:	$(LIBCURLLIB)
+
+clean:
+	-$(RM) $(LIBCURLLIB)
+        -$(RM) *.obj
+
+$(LIBCURLLIB):  $(LINKLIB) $(OBJECTS) Makefile.b32.resp
+	-$(RM) $(LIBCURLLIB)
+	$(LIB) $(LIBCURLLIB) @Makefile.b32.resp
+
+
diff --git a/main/source/curl/lib/Makefile.b32.resp b/main/source/curl/lib/Makefile.b32.resp
new file mode 100644
index 00000000..3d784fd4
--- /dev/null
+++ b/main/source/curl/lib/Makefile.b32.resp
@@ -0,0 +1,36 @@
++base64.obj &
++cookie.obj &
++transfer.obj &
++escape.obj &
++formdata.obj &
++ftp.obj &
++http.obj &
++http_chunks.obj &
++ldap.obj &
++dict.obj &
++telnet.obj &
++getdate.obj &
++getenv.obj &
++getpass.obj &
++hostip.obj &
++if2ip.obj &
++mprintf.obj &
++netrc.obj &
++progress.obj &
++sendf.obj &
++speedcheck.obj &
++ssluse.obj &
++timeval.obj &
++url.obj &
++file.obj &
++getinfo.obj &
++version.obj &
++easy.obj &
++strequal.obj &
++strtok.obj &
++connect.obj &
++hash.obj &
++share.obj &
++llist.obj &
++multi.obj &
++content_encoding.obj
diff --git a/main/source/curl/lib/Makefile.in b/main/source/curl/lib/Makefile.in
new file mode 100644
index 00000000..a5826249
--- /dev/null
+++ b/main/source/curl/lib/Makefile.in
@@ -0,0 +1,654 @@
+# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# $Id: Makefile.am,v 1.52 2003/02/04 23:48:46 jpbl Exp $
+#
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CA_BUNDLE = @CURL_CA_BUNDLE@
+CURL_DISABLE_DICT = @CURL_DISABLE_DICT@
+CURL_DISABLE_FILE = @CURL_DISABLE_FILE@
+CURL_DISABLE_FTP = @CURL_DISABLE_FTP@
+CURL_DISABLE_GOPHER = @CURL_DISABLE_GOPHER@
+CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@
+CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@
+CURL_DISABLE_TELNET = @CURL_DISABLE_TELNET@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_LIBZ = @HAVE_LIBZ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPV6_ENABLED = @IPV6_ENABLED@
+KRB4_ENABLED = @KRB4_ENABLED@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NO_UNDEFINED_FALSE = @NO_UNDEFINED_FALSE@
+NO_UNDEFINED_TRUE = @NO_UNDEFINED_TRUE@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_ENABLED = @OPENSSL_ENABLED@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKGADD_NAME = @PKGADD_NAME@
+PKGADD_PKG = @PKGADD_PKG@
+PKGADD_VENDOR = @PKGADD_VENDOR@
+PKGCONFIG = @PKGCONFIG@
+RANDOM_FILE = @RANDOM_FILE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+
+VERSION = -version-info 2:2:0
+VERSIONNUM = @VERSIONNUM@
+YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+
+AUTOMAKE_OPTIONS = foreign nostdinc
+
+EXTRA_DIST = getdate.y Makefile.b32 Makefile.b32.resp Makefile.m32	    \
+       Makefile.vc6 Makefile.riscos libcurl.def curllib.dsp	    \
+       curllib.dsw config-vms.h config-win32.h config-riscos.h config-mac.h \
+       config.h.in ca-bundle.crt README.encoding README.memoryleak
+
+
+lib_LTLIBRARIES = libcurl.la
+
+# we use srcdir/include for the static global include files
+# we use builddir/lib for the generated lib/config.h file to get found
+# we use srcdir/lib for the lib-private header files
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/lib -I$(top_srcdir)/lib
+@NO_UNDEFINED_FALSE@libcurl_la_LDFLAGS = $(VERSION)
+
+# This flag accepts an argument of the form current[:revision[:age]]. So,
+# passing -version-info 3:12:1 sets current to 3, revision to 12, and age to
+# 1.
+#
+# If either revision or age are omitted, they default to 0. Also note that age
+# must be less than or equal to the current interface number.
+#
+# Here are a set of rules to help you update your library version information: 
+#
+# 1.Start with version information of 0:0:0 for each libtool library.
+#
+# 2.Update the version information only immediately before a public release of
+# your software. More frequent updates are unnecessary, and only guarantee
+# that the current interface number gets larger faster.
+#
+# 3.If the library source code has changed at all since the last update, then
+# increment revision (c:r:a becomes c:r+1:a).
+#
+# 4.If any interfaces have been added, removed, or changed since the last
+# update, increment current, and set revision to 0.
+#
+# 5.If any interfaces have been added since the last public release, then
+# increment age.
+#
+# 6.If any interfaces have been removed since the last public release, then
+# set age to 0.
+#
+
+# The -no-undefined flag is CRUCIAL for this to build fine on Cygwin. If we
+# find a case in which we need to remove this flag, we should most likely
+# write a configure check that detects when this flag is needed and when its
+# not.
+@NO_UNDEFINED_TRUE@libcurl_la_LDFLAGS = -no-undefined $(VERSION)
+
+libcurl_la_SOURCES = arpa_telnet.h file.c getpass.h netrc.h timeval.c	\
+base64.c file.h hostip.c progress.c timeval.h base64.h formdata.c	\
+hostip.h progress.h cookie.c formdata.h http.c sendf.c cookie.h ftp.c	\
+http.h sendf.h url.c dict.c ftp.h if2ip.c speedcheck.c url.h dict.h	\
+getdate.c if2ip.h speedcheck.h urldata.h getdate.h ldap.c ssluse.c	\
+version.c getenv.c ldap.h ssluse.h escape.c mprintf.c telnet.c escape.h	\
+getpass.c netrc.c telnet.h getinfo.c getinfo.h transfer.c strequal.c	\
+strequal.h easy.c security.h security.c krb4.c krb4.h memdebug.c	\
+memdebug.h inet_ntoa_r.h http_chunks.c http_chunks.h strtok.c strtok.h	\
+connect.c connect.h llist.c llist.h hash.c hash.h multi.c		\
+content_encoding.c content_encoding.h share.c share.h
+
+
+noinst_HEADERS = setup.h transfer.h
+subdir = lib
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = config.h $(top_builddir)/src/config.h \
+	$(top_builddir)/tests/server/config.h ca-bundle.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(lib_LTLIBRARIES)
+
+libcurl_la_LIBADD =
+am_libcurl_la_OBJECTS = file.lo timeval.lo base64.lo hostip.lo \
+	progress.lo formdata.lo cookie.lo http.lo sendf.lo ftp.lo \
+	url.lo dict.lo if2ip.lo speedcheck.lo getdate.lo ldap.lo \
+	ssluse.lo version.lo getenv.lo escape.lo mprintf.lo telnet.lo \
+	getpass.lo netrc.lo getinfo.lo transfer.lo strequal.lo easy.lo \
+	security.lo krb4.lo memdebug.lo http_chunks.lo strtok.lo \
+	connect.lo llist.lo hash.lo multi.lo content_encoding.lo \
+	share.lo
+libcurl_la_OBJECTS = $(am_libcurl_la_OBJECTS)
+
+DEFAULT_INCLUDES = 
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/base64.Plo ./$(DEPDIR)/connect.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/content_encoding.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/cookie.Plo ./$(DEPDIR)/dict.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/easy.Plo ./$(DEPDIR)/escape.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/file.Plo ./$(DEPDIR)/formdata.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ftp.Plo ./$(DEPDIR)/getdate.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/getenv.Plo ./$(DEPDIR)/getinfo.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/getpass.Plo ./$(DEPDIR)/hash.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/hostip.Plo ./$(DEPDIR)/http.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/http_chunks.Plo ./$(DEPDIR)/if2ip.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/krb4.Plo ./$(DEPDIR)/ldap.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/llist.Plo ./$(DEPDIR)/memdebug.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/mprintf.Plo ./$(DEPDIR)/multi.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/netrc.Plo ./$(DEPDIR)/progress.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/security.Plo ./$(DEPDIR)/sendf.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/share.Plo ./$(DEPDIR)/speedcheck.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ssluse.Plo ./$(DEPDIR)/strequal.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/strtok.Plo ./$(DEPDIR)/telnet.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/timeval.Plo ./$(DEPDIR)/transfer.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/url.Plo ./$(DEPDIR)/version.Plo
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+DIST_SOURCES = $(libcurl_la_SOURCES)
+HEADERS = $(noinst_HEADERS)
+
+DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in ca-bundle.h.in \
+	config.h.in
+SOURCES = $(libcurl_la_SOURCES)
+
+all: config.h ca-bundle.h
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  lib/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+config.h: stamp-h1
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) stamp-h1; \
+	else :; fi
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status lib/config.h
+
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOHEADER)
+	touch $(srcdir)/config.h.in
+
+ca-bundle.h: stamp-h4
+	@if test ! -f $@; then \
+	  rm -f stamp-h4; \
+	  $(MAKE) stamp-h4; \
+	else :; fi
+
+stamp-h4: $(srcdir)/ca-bundle.h.in $(top_builddir)/config.status
+	@rm -f stamp-h4
+	cd $(top_builddir) && $(SHELL) ./config.status lib/ca-bundle.h
+
+$(srcdir)/ca-bundle.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOHEADER)
+	touch $(srcdir)/ca-bundle.h.in
+
+distclean-hdr:
+	-rm -f config.h stamp-h1 ca-bundle.h stamp-h4
+libLTLIBRARIES_INSTALL = $(INSTALL)
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+	  else :; fi; \
+	done
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
+	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" = "$$p" && dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libcurl.la: $(libcurl_la_OBJECTS) $(libcurl_la_DEPENDENCIES) 
+	$(LINK) -rpath $(libdir) $(libcurl_la_LDFLAGS) $(libcurl_la_OBJECTS) $(libcurl_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connect.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/content_encoding.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cookie.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dict.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/easy.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escape.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/formdata.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdate.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getenv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getinfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getpass.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hostip.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http_chunks.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/if2ip.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb4.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/llist.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memdebug.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mprintf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multi.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netrc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/progress.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/security.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/share.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/speedcheck.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssluse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strequal.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtok.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/telnet.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timeval.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transfer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Plo@am__quote@
+
+distclean-depend:
+	-rm -rf ./$(DEPDIR)
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ETAGS = etags
+ETAGSFLAGS =
+
+CTAGS = ctags
+CTAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS:  $(HEADERS) $(SOURCES) config.h.in ca-bundle.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) config.h.in ca-bundle.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES) config.h.in ca-bundle.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) config.h.in ca-bundle.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h ca-bundle.h
+
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-compile distclean-depend \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+install-exec-am: install-libLTLIBRARIES
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool ctags distclean \
+	distclean-compile distclean-depend distclean-generic \
+	distclean-hdr distclean-libtool distclean-tags distdir dvi \
+	dvi-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-libLTLIBRARIES install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
+	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \
+	uninstall-libLTLIBRARIES
+
+
+# Say $(srcdir), so GNU make does not report an ambiguity with the .y.c rule.
+$(srcdir)/getdate.c: getdate.y
+	cd $(srcdir) && \
+	  $(YACC) $(YFLAGS) getdate.y; \
+	  mv -f y.tab.c getdate.c
+
+install-data-hook:
+	@if test -n "@CURL_CA_BUNDLE@"; then \
+	  $(mkinstalldirs) `dirname $(DESTDIR)@CURL_CA_BUNDLE@`; \
+	  @INSTALL_DATA@ $(srcdir)/ca-bundle.crt $(DESTDIR)@CURL_CA_BUNDLE@; \
+        fi
+
+# this hook is mainly for non-unix systems to build even if configure
+# isn't run
+dist-hook:
+	cp $(srcdir)/ca-bundle.h.in $(distdir)/ca-bundle.h
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/main/source/curl/lib/Makefile.m32 b/main/source/curl/lib/Makefile.m32
new file mode 100644
index 00000000..e38be038
--- /dev/null
+++ b/main/source/curl/lib/Makefile.m32
@@ -0,0 +1,95 @@
+#############################################################
+#
+## Makefile for building libcurl.a with MingW32 (GCC-3.2) and
+## optionally OpenSSL (0.9.6)
+## Use: make -f Makefile.m32
+##
+## Comments to: Troy Engel <tengel@sonic.net> or
+##              Joern Hartroth <hartroth@acm.org>
+
+CC = gcc
+AR = ar
+RM = rm -f 
+RANLIB = ranlib
+STRIP = strip -g
+OPENSSL_PATH = ../../openssl-0.9.7a
+ZLIB_PATH = ../../zlib-1.1.4
+
+########################################################
+## Nothing more to do below this line!
+
+INCLUDES = -I. -I.. -I../include -I../src
+CFLAGS = -g -O2 -DMINGW32
+ifdef SSL
+  INCLUDES += -I"$(OPENSSL_PATH)/outinc" -I"$(OPENSSL_PATH)/outinc/openssl"
+  CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H
+  DLL_LIBS = -L$(OPENSSL_PATH)/out -leay32 -lssl32
+endif
+ifdef ZLIB
+	INCLUDES += -I"$(ZLIB_PATH)"
+	CFLAGS += -DHAVE_LIBZ -DHAVE_ZLIB_H
+	DLL_LIBS += -L$(ZLIB_PATH) -lz
+endif
+COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
+
+libcurl_a_LIBRARIES = libcurl.a
+
+libcurl_a_SOURCES = arpa_telnet.h file.c getpass.h netrc.h timeval.c base64.c \
+	file.h hostip.c progress.c timeval.h base64.h formdata.c hostip.h progress.h	\
+	cookie.c formdata.h http.c sendf.c cookie.h ftp.c http.h sendf.h url.c dict.c	\
+	ftp.h if2ip.c speedcheck.c url.h dict.h getdate.c if2ip.h speedcheck.h		\
+	urldata.h transfer.c getdate.h ldap.c ssluse.c version.c transfer.h getenv.c	\
+	ldap.h ssluse.h escape.c getenv.h mprintf.c telnet.c escape.h getpass.c netrc.c	\
+	telnet.h getinfo.c strequal.c strequal.h easy.c security.h		\
+	security.c krb4.h krb4.c memdebug.h memdebug.c inet_ntoa_r.h http_chunks.h http_chunks.c \
+	strtok.c connect.c hash.c llist.c multi.c share.c share.h\
+	content_encoding.h content_encoding.c
+
+libcurl_a_OBJECTS =  file.o timeval.o base64.o hostip.o progress.o \
+	formdata.o cookie.o http.o sendf.o ftp.o url.o dict.o if2ip.o \
+	speedcheck.o getdate.o transfer.o ldap.o ssluse.o version.o \
+	getenv.o escape.o mprintf.o telnet.o getpass.o netrc.o getinfo.o \
+	strequal.o easy.o security.o krb4.o memdebug.o http_chunks.o \
+	strtok.o connect.o hash.o llist.o multi.o share.o \
+	content_encoding.o
+
+LIBRARIES =  $(libcurl_a_LIBRARIES)
+SOURCES = $(libcurl_a_SOURCES)
+OBJECTS = $(libcurl_a_OBJECTS)
+
+
+all: libcurl.a libcurl.dll libcurldll.a
+
+libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
+	$(RM) libcurl.a
+	$(AR) cru libcurl.a $(libcurl_a_OBJECTS)
+	$(RANLIB) libcurl.a
+	$(STRIP) $@
+
+DLLINITOBJ =
+
+# remove the last line above to keep debug info
+
+libcurl.dll libcurldll.a: libcurl.a libcurl.def $(DLLINITOBJ)
+	$(RM) $@
+	dllwrap --dllname $@ --output-lib libcurldll.a --export-all --def libcurl.def $(libcurl_a_LIBRARIES) $(DLLINITOBJ) $(DLL_LIBS) -lwsock32 -lws2_32 -lwinmm
+	$(STRIP) $@
+
+# remove the last line above to keep debug info
+
+.c.o:
+	$(COMPILE) -c $<
+
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
+clean:
+	$(RM) $(libcurl_a_OBJECTS)
+
+distrib: clean
+
+	$(RM) $(libcurl_a_LIBRARIES)
+
diff --git a/main/source/curl/lib/Makefile.riscos b/main/source/curl/lib/Makefile.riscos
new file mode 100644
index 00000000..4b4b5f36
--- /dev/null
+++ b/main/source/curl/lib/Makefile.riscos
@@ -0,0 +1,128 @@
+# Makefile for project libcurl
+# Generated on Sun,13 Jan 2002.16:57:00 by EasyGCC (0.1.3 [beta 2] (3 Jan 2002))
+# Contact: easygcc@melotech.co.uk
+
+# Project objects:
+objs =	o.base64 o.connect o.cookie o.dict \
+	o.dllinit o.easy o.escape o.file \
+	o.formdata o.ftp o.getdate o.getenv \
+	o.getinfo o.getpass o.hostip o.http \
+	o.http_chunks o.if2ip o.krb4 o.ldap \
+	o.memdebug o.mprintf o.netrc o.progress \
+	o.security o.sendf o.speedcheck o.ssluse \
+	o.strequal o.strtok o.telnet o.timeval \
+	o.transfer o.url o.version 
+
+# Compile options:
+linkopts	= -o libcurl
+compileropts	= -mpoke-function-name -IUtilLib: -mthrowback 
+
+# Project target:
+libcurl:		$(objs)
+		makealf $(linkopts) $(objs)
+
+# Static dependancies:
+o.base64:	c.base64
+		gcc $(compileropts) -c -o base64.o c.base64
+
+o.connect:	c.connect
+		gcc $(compileropts) -c -o connect.o c.connect
+
+o.cookie:	c.cookie
+		gcc $(compileropts) -c -o cookie.o c.cookie
+
+o.dict:	c.dict
+		gcc $(compileropts) -c -o dict.o c.dict
+
+o.dllinit:	c.dllinit
+		gcc $(compileropts) -c -o dllinit.o c.dllinit
+
+o.easy:	c.easy
+		gcc $(compileropts) -c -o easy.o c.easy
+
+o.escape:	c.escape
+		gcc $(compileropts) -c -o escape.o c.escape
+
+o.file:	c.file
+		gcc $(compileropts) -c -o file.o c.file
+
+o.formdata:	c.formdata
+		gcc $(compileropts) -c -o formdata.o c.formdata
+
+o.ftp:	c.ftp
+		gcc $(compileropts) -c -o ftp.o c.ftp
+
+o.getdate:	c.getdate
+		gcc $(compileropts) -c -o getdate.o c.getdate
+
+o.getenv:	c.getenv
+		gcc $(compileropts) -c -o getenv.o c.getenv
+
+o.getinfo:	c.getinfo
+		gcc $(compileropts) -c -o getinfo.o c.getinfo
+
+o.getpass:	c.getpass
+		gcc $(compileropts) -c -o getpass.o c.getpass
+
+o.hostip:	c.hostip
+		gcc $(compileropts) -c -o hostip.o c.hostip
+
+o.http:	c.http
+		gcc $(compileropts) -c -o http.o c.http
+
+o.http_chunks:	c.http_chunks
+		gcc $(compileropts) -c -o http_chunks.o c.http_chunks
+
+o.if2ip:	c.if2ip
+		gcc $(compileropts) -c -o if2ip.o c.if2ip
+
+o.krb4:	c.krb4
+		gcc $(compileropts) -c -o krb4.o c.krb4
+
+o.ldap:	c.ldap
+		gcc $(compileropts) -IOpenLDAP: -c -o ldap.o c.ldap
+
+o.memdebug:	c.memdebug
+		gcc $(compileropts) -c -o memdebug.o c.memdebug
+
+o.mprintf:	c.mprintf
+		gcc $(compileropts) -c -o mprintf.o c.mprintf
+
+o.netrc:	c.netrc
+		gcc $(compileropts) -c -o netrc.o c.netrc
+
+o.progress:	c.progress
+		gcc $(compileropts) -c -o progress.o c.progress
+
+o.security:	c.security
+		gcc $(compileropts) -c -o security.o c.security
+
+o.sendf:	c.sendf
+		gcc $(compileropts) -c -o sendf.o c.sendf
+
+o.speedcheck:	c.speedcheck
+		gcc $(compileropts) -c -o speedcheck.o c.speedcheck
+
+o.ssluse:	c.ssluse
+		gcc $(compileropts) -c -o ssluse.o c.ssluse
+
+o.strequal:	c.strequal
+		gcc $(compileropts) -c -o strequal.o c.strequal
+
+o.strtok:	c.strtok
+		gcc $(compileropts) -c -o strtok.o c.strtok
+
+o.telnet:	c.telnet
+		gcc $(compileropts) -c -o telnet.o c.telnet
+
+o.timeval:	c.timeval
+		gcc $(compileropts) -c -o timeval.o c.timeval
+
+o.transfer:	c.transfer
+		gcc $(compileropts) -c -o transfer.o c.transfer
+
+o.url:	c.url
+		gcc $(compileropts) -c -o url.o c.url
+
+o.version:	c.version
+		gcc $(compileropts) -c -o version.o c.version
diff --git a/main/source/curl/lib/Makefile.vc6 b/main/source/curl/lib/Makefile.vc6
new file mode 100644
index 00000000..dfbd07a5
--- /dev/null
+++ b/main/source/curl/lib/Makefile.vc6
@@ -0,0 +1,226 @@
+#############################################################
+#
+# Makefile for building libcurl with MSVC6
+#
+# Usage: see usage message below
+#        Should be invoked from \lib directory
+#        Edit the paths and desired library name
+#        SSL path is only required if you intend compiling
+#        with SSL.
+#
+# This make file leaves the result either a .lib or .dll file
+# in the \lib directory. It should be called from the \lib
+# directory.
+#
+# An option would have been to allow the source directory to
+# be specified, but I saw no requirement.
+#
+# Another option would have been to leave the .lib and .dll
+# files in the "cfg" directory, but then the make file
+# in \src would need to be changed.
+#
+##############################################################
+# CHANGE LOG
+# ------------------------------------------------------------
+# 05.11.2001   John Lask   Initial Release
+# 02.05.2002   Miklos Nemeth OPENSSL_PATH environment; no need
+#              for OpenSSL libraries when creating a 
+#              static libcurl.lib
+#
+#
+##############################################################
+
+LIB_NAME       = libcurl
+LIB_NAME_DEBUG = libcurld
+!IFNDEF OPENSSL_PATH
+OPENSSL_PATH   = ../../openssl-0.9.7a
+!ENDIF
+
+#############################################################
+## Nothing more to do below this line!
+
+CCNODBG   = cl.exe /MD /O2 /D "NDEBUG"
+CCDEBUG   = cl.exe /MDd /Od /Gm /Zi  /D "_DEBUG" /GZ
+CFLAGSSSL = /D "USE_SSLEAY" /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
+CFLAGS = /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /YX /FD /c /D "MSDOS"
+
+LNKDLL    = link.exe /DLL  /def:libcurl.def
+LNKLIB    = link.exe -lib
+LFLAGS    = /nologo
+LINKLIBS  = ws2_32.lib winmm.lib
+SSLLIBS   = libeay32.lib ssleay32.lib
+#  RSAglue.lib was formerly needed in the SSLLIBS
+CFGSET    = FALSE
+
+######################
+# release
+
+!IF "$(CFG)" == "release"
+TARGET =$(LIB_NAME).lib
+DIROBJ =.\$(CFG)
+LNK    = $(LNKLIB) /out:$(TARGET)
+CC     = $(CCNODBG)
+CFGSET = TRUE
+!ENDIF
+
+######################
+# release-dll
+
+!IF "$(CFG)" == "release-dll"
+TARGET =$(LIB_NAME).dll
+DIROBJ =.\$(CFG)
+LNK    = $(LNKDLL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"
+CC     = $(CCNODBG)
+CFGSET = TRUE
+!ENDIF
+
+######################
+# release-ssl
+
+!IF "$(CFG)" == "release-ssl"
+TARGET   =$(LIB_NAME).lib
+DIROBJ   =.\$(CFG)
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32"
+LNK      = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)
+LINKLIBS = $(LINKLIBS)
+CC       = $(CCNODBG) $(CFLAGSSSL)
+CFGSET   = TRUE
+!ENDIF
+
+######################
+# release-ssl-dll
+
+!IF "$(CFG)" == "release-ssl-dll"
+TARGET   =$(LIB_NAME).dll
+DIROBJ   =.\$(CFG)
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
+LNK      = $(LNKDLL) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"
+LINKLIBS = $(LINKLIBS) $(SSLLIBS)
+CC       = $(CCNODBG)  $(CFLAGSSSL)
+CFGSET   = TRUE
+!ENDIF
+
+######################
+# debug
+
+!IF "$(CFG)" == "debug"
+TARGET =$(LIB_NAME_DEBUG).lib
+DIROBJ =.\$(CFG)
+LNK    = $(LNKLIB) /out:$(TARGET)
+CC     = $(CCDEBUG)
+CFGSET = TRUE
+!ENDIF
+
+######################
+# debug-dll
+
+!IF "$(CFG)" == "debug-dll"
+TARGET =$(LIB_NAME_DEBUG).dll
+DIROBJ =.\$(CFG)
+LNK    = $(LNKDLL) /DEBUG /out:$(TARGET) /IMPLIB:"$(LIB_NAME_DEBUG).lib" /PDB:"$(LIB_NAME_DEBUG).pdb"
+CC     = $(CCDEBUG)
+CFGSET = TRUE
+!ENDIF
+
+######################
+# debug-ssl
+#todo
+!IF "$(CFG)" == "debug-ssl"
+TARGET   = $(LIB_NAME_DEBUG).lib
+DIROBJ   =.\$(CFG)
+LNK      = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)
+LINKLIBS = $(LINKLIBS)
+CC       = $(CCDEBUG) $(CFLAGSSSL)
+CFGSET   = TRUE
+!ENDIF
+
+######################
+# debug-ssl-dll
+
+!IF "$(CFG)" == "debug-ssl-dll"
+TARGET   =$(LIB_NAME_DEBUG).dll
+DIROBJ   =.\$(CFG)
+LFLAGSSSL = /LIBPATH:$(OPENSSL_PATH)/out32dll
+LNK      = $(LNKDLL) $(LFLAGSSSL) /DEBUG /out:$(TARGET) /IMPLIB:"$(LIB_NAME_DEBUG).lib" /PDB:"$(LIB_NAME_DEBUG).pdb"
+LINKLIBS = $(LINKLIBS) $(SSLLIBS)
+CC       = $(CCDEBUG) $(CFLAGSSSL)
+CFGSET   = TRUE
+!ENDIF
+
+#######################
+# Usage
+#
+!IF "$(CFGSET)" == "FALSE"
+!MESSAGE Usage: nmake -f makefile.vc6 CFG=<config> <target>
+!MESSAGE where <config> is one of:
+!MESSAGE   release          - release static library
+!MESSAGE   release-dll      - release dll
+!MESSAGE   release-ssl      - release static library with ssl
+!MESSAGE   release-ssl-dll  - release dll library with ssl
+!MESSAGE   debug            - debug static library
+!MESSAGE   debug-dll        - debug dll
+!MESSAGE   debug-ssl        - debug static library with ssl
+!MESSAGE   debug-ssl-dll    - debug dll library with ssl
+!MESSAGE <target> can be left blank in which case all is assumed
+!ERROR please choose a valid configuration "$(CFG)"
+!ENDIF
+
+#######################
+#
+X_OBJS= \
+	$(DIROBJ)\base64.obj \
+	$(DIROBJ)\cookie.obj \
+	$(DIROBJ)\transfer.obj \
+	$(DIROBJ)\escape.obj \
+	$(DIROBJ)\formdata.obj \
+	$(DIROBJ)\ftp.obj \
+	$(DIROBJ)\http.obj \
+	$(DIROBJ)\http_chunks.obj \
+	$(DIROBJ)\ldap.obj \
+	$(DIROBJ)\dict.obj \
+	$(DIROBJ)\telnet.obj \
+	$(DIROBJ)\getdate.obj \
+	$(DIROBJ)\getenv.obj \
+	$(DIROBJ)\getpass.obj \
+	$(DIROBJ)\hostip.obj \
+	$(DIROBJ)\if2ip.obj \
+	$(DIROBJ)\mprintf.obj \
+	$(DIROBJ)\netrc.obj \
+	$(DIROBJ)\progress.obj \
+	$(DIROBJ)\sendf.obj \
+	$(DIROBJ)\speedcheck.obj \
+	$(DIROBJ)\ssluse.obj \
+	$(DIROBJ)\timeval.obj \
+	$(DIROBJ)\url.obj \
+	$(DIROBJ)\file.obj \
+	$(DIROBJ)\getinfo.obj \
+	$(DIROBJ)\version.obj \
+	$(DIROBJ)\easy.obj \
+	$(DIROBJ)\strequal.obj \
+	$(DIROBJ)\strtok.obj \
+	$(DIROBJ)\connect.obj \
+	$(DIROBJ)\hash.obj \
+	$(DIROBJ)\llist.obj \
+	$(DIROBJ)\share.obj \
+	$(DIROBJ)\multi.obj
+
+all : $(TARGET)
+
+
+$(TARGET): $(X_OBJS)
+	$(LNK) $(LFLAGS) $(LINKLIBS) $(X_OBJS)
+
+$(X_OBJS): $(DIROBJ)
+
+$(DIROBJ):
+	@if not exist "$(DIROBJ)" mkdir $(DIROBJ)
+
+.SUFFIXES: .c .obj
+
+{.\}.c{$(DIROBJ)\}.obj:
+	$(CC) $(CFLAGS) /Fo"$@"  $<
+
+clean:
+	-@erase $(DIROBJ)\*.obj
+	-@erase vc60.idb
+	-@erase vc60.pch
diff --git a/main/source/curl/lib/README.encoding b/main/source/curl/lib/README.encoding
new file mode 100644
index 00000000..c00a4203
--- /dev/null
+++ b/main/source/curl/lib/README.encoding
@@ -0,0 +1,60 @@
+
+		    Content Encoding Support for libcurl
+
+* About content encodings: 
+
+HTTP/1.1 [RFC 2616] specifies that a client may request that a server encode
+its response. This is usually used to compress a response using one of a set
+of commonly available compression techniques. These schemes are `deflate' (the
+zlib algorithm), `gzip' and `compress' [sec 3.5, RFC 2616]. A client requests
+that the sever perform an encoding by including an Accept-Encoding header in
+the request document. The value of the header should be one of the recognized
+tokens `deflate', ... (there's a way to register new schemes/tokens, see sec
+3.5 of the spec). A server MAY honor the client's encoding request. When a
+response is encoded, the server includes a Content-Encoding header in the
+response. The value of the Content-Encoding header indicates which scheme was
+used to encode the data.
+
+A client may tell a server that it can understand several different encoding
+schemes. In this case the server may choose any one of those and use it to
+encode the response (indicating which one using the Content-Encoding header).
+It's also possible for a client to attach priorities to different schemes so
+that the server knows which it prefers. See sec 14.3 of RFC 2616 for more
+information on the Accept-Encoding header.
+
+* Current support for content encoding:
+
+Support for the 'deflate' and 'gzip' content encoding are supported by
+libcurl. Both regular and chunked transfers should work fine.  The library
+zlib is required for this feature. 'deflate' support was added by James
+Gallagher, and support for the 'gzip' encoding was added by Dan Fandrich.
+
+* The libcurl interface:
+
+To cause libcurl to request a content encoding use: 
+
+    curl_easy_setopt(curl, CURLOPT_ENCODING, <string>) 
+
+where <string> is the intended value of the Accept-Encoding header.
+
+Currently, libcurl only understands how to process responses that use the
+"deflate" or "gzip" Content-Encoding, so the only values for CURLOPT_ENCODING
+that will work (besides "identity," which does nothing) are "deflate" and
+"gzip" If a response is encoded using the "compress" or methods, libcurl will
+return an error indicating that the response could not be decoded.  If
+<string> is NULL no Accept-Encoding header is generated.  If <string> is a
+zero-length string, then an Accept-Encoding header containing all supported
+encodings will be generated.
+
+The CURLOPT_ENCODING must be set to any non-NULL value for content to be
+automatically decoded.  If it is not set and the server still sends encoded
+content (despite not having been asked), the data is returned in its raw form
+and the Content-Encoding type is not checked.
+
+* The curl interface:
+
+Use the --compressed option with curl to cause it to ask servers to compress
+responses using deflate.
+
+James Gallagher <jgallagher@gso.uri.edu>
+Dan Fandrich <dan@coneharvesters.com>
diff --git a/main/source/curl/lib/README.memoryleak b/main/source/curl/lib/README.memoryleak
new file mode 100644
index 00000000..f1a72f77
--- /dev/null
+++ b/main/source/curl/lib/README.memoryleak
@@ -0,0 +1,56 @@
+$Id: README.memoryleak,v 1.2 2002/10/28 21:05:14 bagder Exp $
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+             How To Track Down Suspected Memory Leaks in libcurl
+             ===================================================
+
+Single-threaded
+
+  Please note that this memory leak system is not adjusted to work in more
+  than one thread. If you want/need to use it in a multi-threaded app. Please
+  adjust accordingly.
+
+
+Build
+
+  Rebuild libcurl with -DMALLOCDEBUG (usually, rerunning configure with
+  --enable-debug fixes this). 'make clean' first, then 'make' so that all
+  files actually are rebuilt properly. It will also make sense to build
+  libcurl with the debug option (usually -g to the compiler) so that debugging
+  it will be easier if you actually do find a leak in the library.
+
+  This will create a library that has memory debugging enabled.
+
+Modify Your Application
+
+  Add a line in your application code:
+
+       curl_memdebug("filename");
+
+  This will make the malloc debug system output a full trace of all resource
+  using functions to the given file name. Make sure you rebuild your program
+  and that you link with the same libcurl you built for this purpose as
+  described above.
+
+Run Your Application
+
+  Run your program as usual. Watch the specified memory trace file grow.
+
+  Make your program exit and use the proper libcurl cleanup functions etc. So
+  that all non-leaks are returned/freed properly.
+
+Analyze the Flow
+
+  Use the tests/memanalyze.pl perl script to analyze the memdump file:
+
+    tests/memanalyze.pl < memdump
+
+  This now outputs a report on what resources that were allocated but never
+  freed etc. This report is very fine for posting to the list!
+
+  If this doesn't produce any output, no leak was detected in libcurl. Then
+  the leak is mostly likely to be in your code.
diff --git a/main/source/curl/lib/arpa_telnet.h b/main/source/curl/lib/arpa_telnet.h
new file mode 100644
index 00000000..cdda55d0
--- /dev/null
+++ b/main/source/curl/lib/arpa_telnet.h
@@ -0,0 +1,101 @@
+#ifndef __ARPA_TELNET_H
+#define __ARPA_TELNET_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: arpa_telnet.h,v 1.10 2003/03/12 08:40:45 bagder Exp $
+ ***************************************************************************/
+#ifndef CURL_DISABLE_TELNET
+/*
+ * Telnet option defines. Add more here if in need.
+ */
+#define CURL_TELOPT_BINARY   0  /* binary 8bit data */
+#define CURL_TELOPT_SGA      3  /* Supress Go Ahead */
+#define CURL_TELOPT_EXOPL  255  /* EXtended OPtions List */
+#define CURL_TELOPT_TTYPE   24  /* Terminal TYPE */
+#define CURL_TELOPT_XDISPLOC 35 /* X DISPlay LOCation */
+
+#define CURL_TELOPT_NEW_ENVIRON 39  /* NEW ENVIRONment variables */
+#define CURL_NEW_ENV_VAR   0
+#define CURL_NEW_ENV_VALUE 1
+
+/*
+ * The telnet options represented as strings
+ */
+static const char *telnetoptions[]=
+{
+  "BINARY",      "ECHO",           "RCP",           "SUPPRESS GO AHEAD",
+  "NAME",        "STATUS",         "TIMING MARK",   "RCTE",
+  "NAOL",        "NAOP",           "NAOCRD",        "NAOHTS",
+  "NAOHTD",      "NAOFFD",         "NAOVTS",        "NAOVTD",
+  "NAOLFD",      "EXTEND ASCII",   "LOGOUT",        "BYTE MACRO",
+  "DE TERMINAL", "SUPDUP",         "SUPDUP OUTPUT", "SEND LOCATION",
+  "TERM TYPE",   "END OF RECORD",  "TACACS UID",    "OUTPUT MARKING",
+  "TTYLOC",      "3270 REGIME",    "X3 PAD",        "NAWS",
+  "TERM SPEED",  "LFLOW",          "LINEMODE",      "XDISPLOC",
+  "OLD-ENVIRON", "AUTHENTICATION", "ENCRYPT",       "NEW-ENVIRON"
+};
+
+#define CURL_TELOPT_MAXIMUM CURL_TELOPT_NEW_ENVIRON
+
+#define CURL_TELOPT_OK(x) ((x) <= CURL_TELOPT_MAXIMUM)
+#define CURL_TELOPT(x)    telnetoptions[x]
+
+#define CURL_NTELOPTS 40 
+
+/*
+ * First some defines
+ */
+#define CURL_xEOF 236 /* End Of File */ 
+#define CURL_SE   240 /* Sub negotiation End */
+#define CURL_NOP  241 /* No OPeration */
+#define CURL_DM   242 /* Data Mark */
+#define CURL_GA   249 /* Go Ahead, reverse the line */
+#define CURL_SB   250 /* SuBnegotiation */
+#define CURL_WILL 251 /* Our side WILL use this option */
+#define CURL_WONT 252 /* Our side WON'T use this option */
+#define CURL_DO   253 /* DO use this option! */
+#define CURL_DONT 254 /* DON'T use this option! */
+#define CURL_IAC  255 /* Interpret As Command */
+
+/*
+ * Then those numbers represented as strings:
+ */
+static const char *telnetcmds[]=
+{
+  "EOF",  "SUSP",  "ABORT", "EOR",  "SE",
+  "NOP",  "DMARK", "BRK",   "IP",   "AO",
+  "AYT",  "EC",    "EL",    "GA",   "SB",
+  "WILL", "WONT",  "DO",    "DONT", "IAC"
+};
+
+#define CURL_TELCMD_MINIMUM CURL_xEOF /* the first one */
+#define CURL_TELCMD_MAXIMUM CURL_IAC  /* surprise, 255 is the last one! ;-) */
+
+#define CURL_TELQUAL_IS   0
+#define CURL_TELQUAL_SEND 1
+#define CURL_TELQUAL_INFO 2
+#define CURL_TELQUAL_NAME 3
+
+#define CURL_TELCMD_OK(x) ( ((unsigned int)(x) >= CURL_TELCMD_MINIMUM) && \
+                       ((unsigned int)(x) <= CURL_TELCMD_MAXIMUM) )
+#define CURL_TELCMD(x)    telnetcmds[(x)-CURL_TELCMD_MINIMUM]
+#endif
+#endif
diff --git a/main/source/curl/lib/base64.c b/main/source/curl/lib/base64.c
new file mode 100644
index 00000000..dc6766b9
--- /dev/null
+++ b/main/source/curl/lib/base64.c
@@ -0,0 +1,268 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: base64.c,v 1.20 2003/02/13 18:30:10 bagder Exp $
+ ***************************************************************************/
+
+/* Base64 encoding/decoding
+ *
+ * Test harnesses down the bottom - compile with -DTEST_ENCODE for
+ * a program that will read in raw data from stdin and write out
+ * a base64-encoded version to stdout, and the length returned by the
+ * encoding function to stderr. Compile with -DTEST_DECODE for a program that
+ * will go the other way.
+ * 
+ * This code will break if int is smaller than 32 bits
+ */
+
+#include "setup.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+#include "base64.h"
+
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+static void decodeQuantum(unsigned char *dest, char *src)
+{
+  unsigned int x = 0;
+  int i;
+  for(i = 0; i < 4; i++) {
+    if(src[i] >= 'A' && src[i] <= 'Z')
+      x = (x << 6) + (unsigned int)(src[i] - 'A' + 0);
+    else if(src[i] >= 'a' && src[i] <= 'z')
+      x = (x << 6) + (unsigned int)(src[i] - 'a' + 26);
+    else if(src[i] >= '0' && src[i] <= '9') 
+      x = (x << 6) + (unsigned int)(src[i] - '0' + 52);
+    else if(src[i] == '+')
+      x = (x << 6) + 62;
+    else if(src[i] == '/')
+      x = (x << 6) + 63;
+    else if(src[i] == '=')
+      x = (x << 6);
+  }
+
+  dest[2] = (unsigned char)(x & 255); x >>= 8;
+  dest[1] = (unsigned char)(x & 255); x >>= 8;
+  dest[0] = (unsigned char)(x & 255); x >>= 8;
+}
+
+/* base64Decode
+ * Given a base64 string at src, decode it into the memory pointed
+ * to by dest. If rawLength points to a valid address (ie not NULL),
+ * store the length of the decoded data to it.
+ */
+static void base64Decode(unsigned char *dest, char *src, int *rawLength)
+{
+  int length = 0;
+  int equalsTerm = 0;
+  int i;
+  int numQuantums;
+  unsigned char lastQuantum[3];
+	
+  while((src[length] != '=') && src[length])
+    length++;
+  while(src[length+equalsTerm] == '=')
+    equalsTerm++;
+  
+  numQuantums = (length + equalsTerm) / 4;
+  if(rawLength)
+    *rawLength = (numQuantums * 3) - equalsTerm;
+  
+  for(i = 0; i < numQuantums - 1; i++) {
+    decodeQuantum(dest, src);
+    dest += 3; src += 4;
+  }
+
+  decodeQuantum(lastQuantum, src);
+  for(i = 0; i < 3 - equalsTerm; i++)
+    dest[i] = lastQuantum[i];
+	
+}
+
+/* ---- Base64 Encoding --- */
+static char table64[]=
+  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+  
+/*
+ * Curl_base64_encode()
+ *
+ * Returns the length of the newly created base64 string. The third argument
+ * is a pointer to an allocated area holding the base64 data. If something
+ * went wrong, -1 is returned.
+ *
+ */
+int Curl_base64_encode(const void *inp, int insize, char **outptr)
+{
+  unsigned char ibuf[3];
+  unsigned char obuf[4];
+  int i;
+  int inputparts;
+  char *output;
+  char *base64data;
+
+  char *indata = (char *)inp;
+
+  if(0 == insize)
+    insize = strlen(indata);
+
+  base64data = output = (char*)malloc(insize*4/3+4);
+  if(NULL == output)
+    return -1;
+
+  while(insize > 0) {
+    for (i = inputparts = 0; i < 3; i++) { 
+      if(insize > 0) {
+        inputparts++;
+        ibuf[i] = *indata;
+        indata++;
+        insize--;
+      }
+      else
+        ibuf[i] = 0;
+    }
+                       
+    obuf [0] = (ibuf [0] & 0xFC) >> 2;
+    obuf [1] = ((ibuf [0] & 0x03) << 4) | ((ibuf [1] & 0xF0) >> 4);
+    obuf [2] = ((ibuf [1] & 0x0F) << 2) | ((ibuf [2] & 0xC0) >> 6);
+    obuf [3] = ibuf [2] & 0x3F;
+
+    switch(inputparts) {
+    case 1: /* only one byte read */
+      sprintf(output, "%c%c==", 
+              table64[obuf[0]],
+              table64[obuf[1]]);
+      break;
+    case 2: /* two bytes read */
+      sprintf(output, "%c%c%c=", 
+              table64[obuf[0]],
+              table64[obuf[1]],
+              table64[obuf[2]]);
+      break;
+    default:
+      sprintf(output, "%c%c%c%c", 
+              table64[obuf[0]],
+              table64[obuf[1]],
+              table64[obuf[2]],
+              table64[obuf[3]] );
+      break;
+    }
+    output += 4;
+  }
+  *output=0;
+  *outptr = base64data; /* make it return the actual data memory */
+
+  return strlen(base64data); /* return the length of the new data */
+}
+/* ---- End of Base64 Encoding ---- */
+
+int Curl_base64_decode(const char *str, void *data)
+{
+  int ret;
+
+  base64Decode((unsigned char *)data, (char *)str, &ret);
+  return ret;
+}
+
+/************* TEST HARNESS STUFF ****************/
+
+
+#ifdef TEST_ENCODE
+/* encoding test harness. Read in standard input and write out the length
+ * returned by Curl_base64_encode, followed by the base64'd data itself
+ */
+#include <stdio.h>
+
+#define TEST_NEED_SUCK
+void *suck(int *);
+
+int main(int argc, char **argv, char **envp)
+{
+  char *base64;
+  int base64Len;
+  unsigned char *data;
+  int dataLen;
+	
+  data = (unsigned char *)suck(&dataLen);
+  base64Len = Curl_base64_encode(data, dataLen, &base64);
+
+  fprintf(stderr, "%d\n", base64Len);
+  fprintf(stdout, "%s",   base64);
+  
+  free(base64); free(data);
+  return 0;
+}
+#endif
+
+#ifdef TEST_DECODE
+/* decoding test harness. Read in a base64 string from stdin and write out the 
+ * length returned by Curl_base64_decode, followed by the decoded data itself
+ */
+#include <stdio.h>
+
+#define TEST_NEED_SUCK
+void *suck(int *);
+
+int main(int argc, char **argv, char **envp)
+{
+  char *base64;
+  int base64Len;
+  unsigned char *data;
+  int dataLen;
+	
+  base64 = (char *)suck(&base64Len);
+  data = (unsigned char *)malloc(base64Len * 3/4 + 8);
+  dataLen = Curl_base64_decode(base64, data);
+  
+  fprintf(stderr, "%d\n", dataLen);
+  fwrite(data,1,dataLen,stdout);
+  
+  free(base64); free(data);
+  return 0;
+}
+#endif
+
+#ifdef TEST_NEED_SUCK
+/* this function 'sucks' in as much as possible from stdin */
+void *suck(int *lenptr)
+{
+  int cursize = 8192;
+  unsigned char *buf = NULL;
+  int lastread;
+  int len = 0;
+	
+  do {
+    cursize *= 2;
+    buf = (unsigned char *)realloc(buf, cursize);
+    memset(buf + len, 0, cursize - len);
+    lastread = fread(buf + len, 1, cursize - len, stdin);
+    len += lastread;
+  } while(!feof(stdin));
+  
+  lenptr[0] = len;
+  return (void *)buf;
+}
+#endif
diff --git a/main/source/curl/lib/base64.h b/main/source/curl/lib/base64.h
new file mode 100644
index 00000000..0b27f014
--- /dev/null
+++ b/main/source/curl/lib/base64.h
@@ -0,0 +1,27 @@
+#ifndef __BASE64_H
+#define __BASE64_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: base64.h,v 1.10 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+int Curl_base64_encode(const void *data, int size, char **str);
+int Curl_base64_decode(const char *str, void *data);
+#endif
diff --git a/main/source/curl/lib/ca-bundle.crt b/main/source/curl/lib/ca-bundle.crt
new file mode 100644
index 00000000..1a807b24
--- /dev/null
+++ b/main/source/curl/lib/ca-bundle.crt
@@ -0,0 +1,4371 @@
+##
+## $Id: ca-bundle.crt,v 1.2 2003/03/24 11:06:57 bagder Exp $
+##
+##  ca-bundle.crt -- Bundle of CA Root Certificates
+##  Last Modified: Thu Mar  2 09:32:46 CET 2000
+##
+##  This is a bundle of X.509 certificates of public
+##  Certificate Authorities (CA). These were automatically
+##  extracted from Netscape Communicator 4.72's certificate database
+##  (the file `cert7.db'). It contains the certificates in both
+##  plain text and PEM format and therefore can be directly used
+##  with an Apache+mod_ssl webserver for SSL client authentication.
+##  Just configure this file as the SSLCACertificateFile.
+##
+##  (SKIPME)
+##
+
+ABAecom (sub., Am. Bankers Assn.) Root CA
+=========================================
+MD5 Fingerprint: 82:12:F7:89:E1:0B:91:60:A4:B6:22:9F:94:68:11:92
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIID+DCCAuCgAwIBAgIRANAeQJAAACdLAAAAAQAAAAQwDQYJKoZIhvcNAQEFBQAw
+gYwxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIEwRVdGFoMRcwFQYDVQQHEw5TYWx0IExh
+a2UgQ2l0eTEYMBYGA1UEChMPWGNlcnQgRVogYnkgRFNUMRgwFgYDVQQDEw9YY2Vy
+dCBFWiBieSBEU1QxITAfBgkqhkiG9w0BCQEWEmNhQGRpZ3NpZ3RydXN0LmNvbTAe
+Fw05OTA3MTQxNjE0MThaFw0wOTA3MTExNjE0MThaMIGMMQswCQYDVQQGEwJVUzEN
+MAsGA1UECBMEVXRhaDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkxGDAWBgNVBAoT
+D1hjZXJ0IEVaIGJ5IERTVDEYMBYGA1UEAxMPWGNlcnQgRVogYnkgRFNUMSEwHwYJ
+KoZIhvcNAQkBFhJjYUBkaWdzaWd0cnVzdC5jb20wggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCtVBjetL/3reh0qu2LfI/C1HUa1YS5tmL8ie/kl2GS+x24
+4VpHNJ6eBiL70+o4y7iLB/caoBd3B1owHNQpOCDXJ0DYUJNDv9IYoil2BXKqa7Zp
+mKt5Hhxl9WqL/MUWqqJy2mDtTm4ZJXoKHTDjUJtCPETrobAgHtsCfv49H7/QAIrb
+QHamGKUVp1e2UsIBF5h3j4qBxhq0airmr6nWAKzP2BVJfNsbof6B+of505DBAsD5
+0ELpkWglX8a/hznplQBgKL+DLMDnXrbXNhbnYId26OcnsiUNi3rlqh3lWc3OCw5v
+xsic4xDZhTnTt5v6xrp8dNJddVardKSiUb9SfO5xAgMBAAGjUzBRMA8GA1UdEwEB
+/wQFMAMBAf8wHwYDVR0jBBgwFoAUCCBsZuuBCmxc1bWmPEHdHJaRJ3cwHQYDVR0O
+BBYEFAggbGbrgQpsXNW1pjxB3RyWkSd3MA0GCSqGSIb3DQEBBQUAA4IBAQBah1iP
+Lat2IWtUDNnxQfZOzSue4x+boy1/2St9WMhnpCn16ezVvZY/o3P4xFs2fNBjLDQ5
+m0i4PW/2FMWeY+anNG7T6DOzxzwYbiOuQ5KZP5jFaTDxNjutuTCC1rZZFpYCCykS
+YbQRifcML5SQhZgonFNsfmPdc/QZ/0qB0bJSI/08SjTOWhvgUIrtT4GV2GDn5MQN
+u1g+WPdOaG8+Z8nLepcWJ+xCYRR2uwDF6wg9FX9LtiJdhzuQ9PPA/jez6dliDMDD
+Wa9gvR8N26E0HzDEPYutsB0Ek+1f1eS/IDAE9EjpMwHRLpAnUrOb3jocq6mXf5vr
+wo3CbezcE9NGxXl8
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            d0:1e:40:90:00:00:27:4b:00:00:00:01:00:00:00:04
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Utah, L=Salt Lake City, O=Xcert EZ by DST, CN=Xcert EZ by DST/Email=ca@digsigtrust.com
+        Validity
+            Not Before: Jul 14 16:14:18 1999 GMT
+            Not After : Jul 11 16:14:18 2009 GMT
+        Subject: C=US, ST=Utah, L=Salt Lake City, O=Xcert EZ by DST, CN=Xcert EZ by DST/Email=ca@digsigtrust.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:ad:54:18:de:b4:bf:f7:ad:e8:74:aa:ed:8b:7c:
+                    8f:c2:d4:75:1a:d5:84:b9:b6:62:fc:89:ef:e4:97:
+                    61:92:fb:1d:b8:e1:5a:47:34:9e:9e:06:22:fb:d3:
+                    ea:38:cb:b8:8b:07:f7:1a:a0:17:77:07:5a:30:1c:
+                    d4:29:38:20:d7:27:40:d8:50:93:43:bf:d2:18:a2:
+                    29:76:05:72:aa:6b:b6:69:98:ab:79:1e:1c:65:f5:
+                    6a:8b:fc:c5:16:aa:a2:72:da:60:ed:4e:6e:19:25:
+                    7a:0a:1d:30:e3:50:9b:42:3c:44:eb:a1:b0:20:1e:
+                    db:02:7e:fe:3d:1f:bf:d0:00:8a:db:40:76:a6:18:
+                    a5:15:a7:57:b6:52:c2:01:17:98:77:8f:8a:81:c6:
+                    1a:b4:6a:2a:e6:af:a9:d6:00:ac:cf:d8:15:49:7c:
+                    db:1b:a1:fe:81:fa:87:f9:d3:90:c1:02:c0:f9:d0:
+                    42:e9:91:68:25:5f:c6:bf:87:39:e9:95:00:60:28:
+                    bf:83:2c:c0:e7:5e:b6:d7:36:16:e7:60:87:76:e8:
+                    e7:27:b2:25:0d:8b:7a:e5:aa:1d:e5:59:cd:ce:0b:
+                    0e:6f:c6:c8:9c:e3:10:d9:85:39:d3:b7:9b:fa:c6:
+                    ba:7c:74:d2:5d:75:56:ab:74:a4:a2:51:bf:52:7c:
+                    ee:71
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Authority Key Identifier: 
+                keyid:08:20:6C:66:EB:81:0A:6C:5C:D5:B5:A6:3C:41:DD:1C:96:91:27:77
+
+            X509v3 Subject Key Identifier: 
+                08:20:6C:66:EB:81:0A:6C:5C:D5:B5:A6:3C:41:DD:1C:96:91:27:77
+    Signature Algorithm: sha1WithRSAEncryption
+        5a:87:58:8f:2d:ab:76:21:6b:54:0c:d9:f1:41:f6:4e:cd:2b:
+        9e:e3:1f:9b:a3:2d:7f:d9:2b:7d:58:c8:67:a4:29:f5:e9:ec:
+        d5:bd:96:3f:a3:73:f8:c4:5b:36:7c:d0:63:2c:34:39:9b:48:
+        b8:3d:6f:f6:14:c5:9e:63:e6:a7:34:6e:d3:e8:33:b3:c7:3c:
+        18:6e:23:ae:43:92:99:3f:98:c5:69:30:f1:36:3b:ad:b9:30:
+        82:d6:b6:59:16:96:02:0b:29:12:61:b4:11:89:f7:0c:2f:94:
+        90:85:98:28:9c:53:6c:7e:63:dd:73:f4:19:ff:4a:81:d1:b2:
+        52:23:fd:3c:4a:34:ce:5a:1b:e0:50:8a:ed:4f:81:95:d8:60:
+        e7:e4:c4:0d:bb:58:3e:58:f7:4e:68:6f:3e:67:c9:cb:7a:97:
+        16:27:ec:42:61:14:76:bb:00:c5:eb:08:3d:15:7f:4b:b6:22:
+        5d:87:3b:90:f4:f3:c0:fe:37:b3:e9:d9:62:0c:c0:c3:59:af:
+        60:bd:1f:0d:db:a1:34:1f:30:c4:3d:8b:ad:b0:1d:04:93:ed:
+        5f:d5:e4:bf:20:30:04:f4:48:e9:33:01:d1:2e:90:27:52:b3:
+        9b:de:3a:1c:ab:a9:97:7f:9b:eb:c2:8d:c2:6d:ec:dc:13:d3:
+        46:c5:79:7c
+
+ANX Network CA by DST
+=====================
+MD5 Fingerprint: A8:ED:DE:EB:93:88:66:D8:2F:C3:BD:1D:BE:45:BE:4D
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDTTCCAragAwIBAgIENm6ibzANBgkqhkiG9w0BAQUFADBSMQswCQYDVQQGEwJV
+UzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMR0wGwYDVQQL
+ExREU1QgKEFOWCBOZXR3b3JrKSBDQTAeFw05ODEyMDkxNTQ2NDhaFw0xODEyMDkx
+NjE2NDhaMFIxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVy
+ZSBUcnVzdCBDby4xHTAbBgNVBAsTFERTVCAoQU5YIE5ldHdvcmspIENBMIGdMA0G
+CSqGSIb3DQEBAQUAA4GLADCBhwKBgQC0SBGAWKDVpZkP9jcsRLZu0XzzKmueEbaI
+IwRccSWeahJ3EW6/aDllqPay9qIYsokVoGe3eowiSGv2hDQftsr3G3LL8ltI04ce
+InYTBLSsbJZ/5w4IyTJRMC3VgOghZ7rzXggkLAdZnZAa7kbJtaQelrRBkdR/0o04
+JrBvQ24JfQIBA6OCATAwggEsMBEGCWCGSAGG+EIBAQQEAwIABzB0BgNVHR8EbTBr
+MGmgZ6BlpGMwYTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0
+dXJlIFRydXN0IENvLjEdMBsGA1UECxMURFNUIChBTlggTmV0d29yaykgQ0ExDTAL
+BgNVBAMTBENSTDEwKwYDVR0QBCQwIoAPMTk5ODEyMDkxNTQ2NDhagQ8yMDE4MTIw
+OTE1NDY0OFowCwYDVR0PBAQDAgEGMB8GA1UdIwQYMBaAFIwWVXDMFgpTZMKlhKqz
+ZBdDP4I2MB0GA1UdDgQWBBSMFlVwzBYKU2TCpYSqs2QXQz+CNjAMBgNVHRMEBTAD
+AQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4GB
+AEklyWCxDF+pORDTxTRVfc95wynr3vnCQPnoVsXwL+z02exIUbhjOF6TbhiWhbnK
+UJykuOpmJmiThW9vTHHQvnoLPDG5975pnhDX0UDorBZxq66rOOFwscqSFuBdhaYY
+gAYAnOGmGEJRp2hoWe8mlF+tMQz+KR4XAYQ3W+gSMqNd
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 913220207 (0x366ea26f)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=Digital Signature Trust Co., OU=DST (ANX Network) CA
+        Validity
+            Not Before: Dec  9 15:46:48 1998 GMT
+            Not After : Dec  9 16:16:48 2018 GMT
+        Subject: C=US, O=Digital Signature Trust Co., OU=DST (ANX Network) CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:b4:48:11:80:58:a0:d5:a5:99:0f:f6:37:2c:44:
+                    b6:6e:d1:7c:f3:2a:6b:9e:11:b6:88:23:04:5c:71:
+                    25:9e:6a:12:77:11:6e:bf:68:39:65:a8:f6:b2:f6:
+                    a2:18:b2:89:15:a0:67:b7:7a:8c:22:48:6b:f6:84:
+                    34:1f:b6:ca:f7:1b:72:cb:f2:5b:48:d3:87:1e:22:
+                    76:13:04:b4:ac:6c:96:7f:e7:0e:08:c9:32:51:30:
+                    2d:d5:80:e8:21:67:ba:f3:5e:08:24:2c:07:59:9d:
+                    90:1a:ee:46:c9:b5:a4:1e:96:b4:41:91:d4:7f:d2:
+                    8d:38:26:b0:6f:43:6e:09:7d
+                Exponent: 3 (0x3)
+        X509v3 extensions:
+            Netscape Cert Type: 
+                SSL CA, S/MIME CA, Object Signing CA
+            X509v3 CRL Distribution Points: 
+                DirName:/C=US/O=Digital Signature Trust Co./OU=DST (ANX Network) CA/CN=CRL1
+
+            X509v3 Private Key Usage Period: 
+                Not Before: Dec  9 15:46:48 1998 GMT, Not After: Dec  9 15:46:48 2018 GMT
+            X509v3 Key Usage: 
+                Certificate Sign, CRL Sign
+            X509v3 Authority Key Identifier: 
+                keyid:8C:16:55:70:CC:16:0A:53:64:C2:A5:84:AA:B3:64:17:43:3F:82:36
+
+            X509v3 Subject Key Identifier: 
+                8C:16:55:70:CC:16:0A:53:64:C2:A5:84:AA:B3:64:17:43:3F:82:36
+            X509v3 Basic Constraints: 
+                CA:TRUE
+            1.2.840.113533.7.65.0: 
+                0
+..V4.0....
+    Signature Algorithm: sha1WithRSAEncryption
+        49:25:c9:60:b1:0c:5f:a9:39:10:d3:c5:34:55:7d:cf:79:c3:
+        29:eb:de:f9:c2:40:f9:e8:56:c5:f0:2f:ec:f4:d9:ec:48:51:
+        b8:63:38:5e:93:6e:18:96:85:b9:ca:50:9c:a4:b8:ea:66:26:
+        68:93:85:6f:6f:4c:71:d0:be:7a:0b:3c:31:b9:f7:be:69:9e:
+        10:d7:d1:40:e8:ac:16:71:ab:ae:ab:38:e1:70:b1:ca:92:16:
+        e0:5d:85:a6:18:80:06:00:9c:e1:a6:18:42:51:a7:68:68:59:
+        ef:26:94:5f:ad:31:0c:fe:29:1e:17:01:84:37:5b:e8:12:32:
+        a3:5d
+
+American Express CA
+===================
+MD5 Fingerprint: 1C:D5:8E:82:BE:70:55:8E:39:61:DF:AD:51:DB:6B:A0
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIICkDCCAfkCAgCNMA0GCSqGSIb3DQEBBAUAMIGPMQswCQYDVQQGEwJVUzEnMCUG
+A1UEChMeQW1lcmljYW4gRXhwcmVzcyBDb21wYW55LCBJbmMuMSYwJAYDVQQLEx1B
+bWVyaWNhbiBFeHByZXNzIFRlY2hub2xvZ2llczEvMC0GA1UEAxMmQW1lcmljYW4g
+RXhwcmVzcyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNOTgwODE0MjIwMTAwWhcN
+MDYwODE0MjM1OTAwWjCBjzELMAkGA1UEBhMCVVMxJzAlBgNVBAoTHkFtZXJpY2Fu
+IEV4cHJlc3MgQ29tcGFueSwgSW5jLjEmMCQGA1UECxMdQW1lcmljYW4gRXhwcmVz
+cyBUZWNobm9sb2dpZXMxLzAtBgNVBAMTJkFtZXJpY2FuIEV4cHJlc3MgQ2VydGlm
+aWNhdGUgQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJ8kmS
+hcr9FSm1BrZE7PyIo/KGzv8UTyQckvnCI8HOQ99dNMi4FOzVKnCRSZXXVs2U8amT
+0Ggi3E19oApyKkfqJfCFAF82VGHPC/k3Wmed6R/pZD9wlWGn0DAC3iYopGYDBOkw
++48zB/lvYYeictvzaHhjZlmpybdm4RWySDYs+QIDAQABMA0GCSqGSIb3DQEBBAUA
+A4GBAGgXYrhzi0xs60qlPqvlnS7SzYoHV/PGWZd2Fxf4Uo4nk9hY2Chs9KIEeorC
+diSxArTfKPL386infiNIYYj0EWiuJl32oUtTJWrYKhQCDuCHIG6eGVxzkAsj4jGX
+Iz/VIqLTBnvaN/XXtUFEF3pFAtmFRWbWjsfwegyZYiJpW+3S
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number: 141 (0x8d)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=US, O=American Express Company, Inc., OU=American Express Technologies, CN=American Express Certificate Authority
+        Validity
+            Not Before: Aug 14 22:01:00 1998 GMT
+            Not After : Aug 14 23:59:00 2006 GMT
+        Subject: C=US, O=American Express Company, Inc., OU=American Express Technologies, CN=American Express Certificate Authority
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:c9:f2:49:92:85:ca:fd:15:29:b5:06:b6:44:ec:
+                    fc:88:a3:f2:86:ce:ff:14:4f:24:1c:92:f9:c2:23:
+                    c1:ce:43:df:5d:34:c8:b8:14:ec:d5:2a:70:91:49:
+                    95:d7:56:cd:94:f1:a9:93:d0:68:22:dc:4d:7d:a0:
+                    0a:72:2a:47:ea:25:f0:85:00:5f:36:54:61:cf:0b:
+                    f9:37:5a:67:9d:e9:1f:e9:64:3f:70:95:61:a7:d0:
+                    30:02:de:26:28:a4:66:03:04:e9:30:fb:8f:33:07:
+                    f9:6f:61:87:a2:72:db:f3:68:78:63:66:59:a9:c9:
+                    b7:66:e1:15:b2:48:36:2c:f9
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: md5WithRSAEncryption
+        68:17:62:b8:73:8b:4c:6c:eb:4a:a5:3e:ab:e5:9d:2e:d2:cd:
+        8a:07:57:f3:c6:59:97:76:17:17:f8:52:8e:27:93:d8:58:d8:
+        28:6c:f4:a2:04:7a:8a:c2:76:24:b1:02:b4:df:28:f2:f7:f3:
+        a8:a7:7e:23:48:61:88:f4:11:68:ae:26:5d:f6:a1:4b:53:25:
+        6a:d8:2a:14:02:0e:e0:87:20:6e:9e:19:5c:73:90:0b:23:e2:
+        31:97:23:3f:d5:22:a2:d3:06:7b:da:37:f5:d7:b5:41:44:17:
+        7a:45:02:d9:85:45:66:d6:8e:c7:f0:7a:0c:99:62:22:69:5b:
+        ed:d2
+
+American Express Global CA
+==========================
+MD5 Fingerprint: 63:1B:66:93:8C:F3:66:CB:3C:79:57:DC:05:49:EA:DB
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIEBDCCAuygAwIBAgICAIUwDQYJKoZIhvcNAQEFBQAwgZYxCzAJBgNVBAYTAlVT
+MScwJQYDVQQKEx5BbWVyaWNhbiBFeHByZXNzIENvbXBhbnksIEluYy4xJjAkBgNV
+BAsTHUFtZXJpY2FuIEV4cHJlc3MgVGVjaG5vbG9naWVzMTYwNAYDVQQDEy1BbWVy
+aWNhbiBFeHByZXNzIEdsb2JhbCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNOTgw
+ODE0MTkwNjAwWhcNMTMwODE0MjM1OTAwWjCBljELMAkGA1UEBhMCVVMxJzAlBgNV
+BAoTHkFtZXJpY2FuIEV4cHJlc3MgQ29tcGFueSwgSW5jLjEmMCQGA1UECxMdQW1l
+cmljYW4gRXhwcmVzcyBUZWNobm9sb2dpZXMxNjA0BgNVBAMTLUFtZXJpY2FuIEV4
+cHJlc3MgR2xvYmFsIENlcnRpZmljYXRlIEF1dGhvcml0eTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAPAkJmYu++tKc3FTiUfLJjxTkpRMysKFtQ34w1e9
+Lyofahi3V68MABb6oLaQpvcaoS5mJsdoo4qTaWa1RlYtHYLqkAwKIsKJUI0F89Sr
+c0HwzxKsKLRvFJSWWUuekHWG3+JH6+HpT0N+h8onGGaetcFAZX38YW+tm3LPqV7Y
+8/nabpEQ+ky16n4g3qk5L/WI5IpvNcYgnCuGRjMK/DFVpWusFkDpzTVZbzIEw3u1
+D3t3cPNIuypSgs6vKW3xEW9t5gcAAe+a8yYNpnkTZ6/4qxx1rJG1a75AsN6cDLFp
+hRlxkRNFyt/R/eayypaDedvFuKpbepALeFY+xteflEgR9a0CAwEAAaNaMFgwEgYD
+VR0TAQH/BAgwBgEB/wIBBTAOBgNVHQ8BAf8EBAMCAQYwFwYDVR0gBBAwDjAMBgoq
+hkiG+Q8KAQUBMBkGA1UdDgQSBBBXRzV7NicRqAj8L0Yl6yRpMA0GCSqGSIb3DQEB
+BQUAA4IBAQDHYUWoinG5vjTpIXshzVYTmNUwY+kYqkuSFb8LHbvskmnFLsNhi+gw
+RcsQRsFzOFyLGdIr80DrfHKzLh4n43WVihybLsSVBYZy0FX0oZJSeVzb9Pjc5dcS
+sUDHPIbkMWVKyjfG3nZXGWlMRmn8Kq0WN3qTrPchSy3766lQy8HRQAjaA2mHpzde
+VcHF7cTjjgwml5tcV0ty4/IDBdACOyYDQJCevgtbSQx48dVMVSng9v1MA6lUAjLR
+V1qFrEPtWzsWX6C/NdtLnnvo/+cNPDuom0lBRvVzTv+SZSGDE1Vx60k8f4gawhIo
+JaFGS0E3l3/sjvHUoZbCILZerakcHhGg
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 133 (0x85)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=American Express Company, Inc., OU=American Express Technologies, CN=American Express Global Certificate Authority
+        Validity
+            Not Before: Aug 14 19:06:00 1998 GMT
+            Not After : Aug 14 23:59:00 2013 GMT
+        Subject: C=US, O=American Express Company, Inc., OU=American Express Technologies, CN=American Express Global Certificate Authority
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:f0:24:26:66:2e:fb:eb:4a:73:71:53:89:47:cb:
+                    26:3c:53:92:94:4c:ca:c2:85:b5:0d:f8:c3:57:bd:
+                    2f:2a:1f:6a:18:b7:57:af:0c:00:16:fa:a0:b6:90:
+                    a6:f7:1a:a1:2e:66:26:c7:68:a3:8a:93:69:66:b5:
+                    46:56:2d:1d:82:ea:90:0c:0a:22:c2:89:50:8d:05:
+                    f3:d4:ab:73:41:f0:cf:12:ac:28:b4:6f:14:94:96:
+                    59:4b:9e:90:75:86:df:e2:47:eb:e1:e9:4f:43:7e:
+                    87:ca:27:18:66:9e:b5:c1:40:65:7d:fc:61:6f:ad:
+                    9b:72:cf:a9:5e:d8:f3:f9:da:6e:91:10:fa:4c:b5:
+                    ea:7e:20:de:a9:39:2f:f5:88:e4:8a:6f:35:c6:20:
+                    9c:2b:86:46:33:0a:fc:31:55:a5:6b:ac:16:40:e9:
+                    cd:35:59:6f:32:04:c3:7b:b5:0f:7b:77:70:f3:48:
+                    bb:2a:52:82:ce:af:29:6d:f1:11:6f:6d:e6:07:00:
+                    01:ef:9a:f3:26:0d:a6:79:13:67:af:f8:ab:1c:75:
+                    ac:91:b5:6b:be:40:b0:de:9c:0c:b1:69:85:19:71:
+                    91:13:45:ca:df:d1:fd:e6:b2:ca:96:83:79:db:c5:
+                    b8:aa:5b:7a:90:0b:78:56:3e:c6:d7:9f:94:48:11:
+                    f5:ad
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE, pathlen:5
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Certificate Policies: 
+                Policy: 1.2.840.113807.10.1.5.1
+
+            X509v3 Subject Key Identifier: 
+                57:47:35:7B:36:27:11:A8:08:FC:2F:46:25:EB:24:69
+    Signature Algorithm: sha1WithRSAEncryption
+        c7:61:45:a8:8a:71:b9:be:34:e9:21:7b:21:cd:56:13:98:d5:
+        30:63:e9:18:aa:4b:92:15:bf:0b:1d:bb:ec:92:69:c5:2e:c3:
+        61:8b:e8:30:45:cb:10:46:c1:73:38:5c:8b:19:d2:2b:f3:40:
+        eb:7c:72:b3:2e:1e:27:e3:75:95:8a:1c:9b:2e:c4:95:05:86:
+        72:d0:55:f4:a1:92:52:79:5c:db:f4:f8:dc:e5:d7:12:b1:40:
+        c7:3c:86:e4:31:65:4a:ca:37:c6:de:76:57:19:69:4c:46:69:
+        fc:2a:ad:16:37:7a:93:ac:f7:21:4b:2d:fb:eb:a9:50:cb:c1:
+        d1:40:08:da:03:69:87:a7:37:5e:55:c1:c5:ed:c4:e3:8e:0c:
+        26:97:9b:5c:57:4b:72:e3:f2:03:05:d0:02:3b:26:03:40:90:
+        9e:be:0b:5b:49:0c:78:f1:d5:4c:55:29:e0:f6:fd:4c:03:a9:
+        54:02:32:d1:57:5a:85:ac:43:ed:5b:3b:16:5f:a0:bf:35:db:
+        4b:9e:7b:e8:ff:e7:0d:3c:3b:a8:9b:49:41:46:f5:73:4e:ff:
+        92:65:21:83:13:55:71:eb:49:3c:7f:88:1a:c2:12:28:25:a1:
+        46:4b:41:37:97:7f:ec:8e:f1:d4:a1:96:c2:20:b6:5e:ad:a9:
+        1c:1e:11:a0
+
+BelSign Object Publishing CA
+============================
+MD5 Fingerprint: 8A:02:F8:DF:B8:E1:84:9F:5A:C2:60:24:65:D1:73:FB
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDAzCCAmygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBuzELMAkGA1UEBhMCQkUx
+ETAPBgNVBAcTCEJydXNzZWxzMRMwEQYDVQQKEwpCZWxTaWduIE5WMTgwNgYDVQQL
+Ey9CZWxTaWduIE9iamVjdCBQdWJsaXNoaW5nIENlcnRpZmljYXRlIEF1dGhvcml0
+eTElMCMGA1UEAxMcQmVsU2lnbiBPYmplY3QgUHVibGlzaGluZyBDQTEjMCEGCSqG
+SIb3DQEJARYUd2VibWFzdGVyQGJlbHNpZ24uYmUwHhcNOTcwOTE5MjIwMzAwWhcN
+MDcwOTE5MjIwMzAwWjCBuzELMAkGA1UEBhMCQkUxETAPBgNVBAcTCEJydXNzZWxz
+MRMwEQYDVQQKEwpCZWxTaWduIE5WMTgwNgYDVQQLEy9CZWxTaWduIE9iamVjdCBQ
+dWJsaXNoaW5nIENlcnRpZmljYXRlIEF1dGhvcml0eTElMCMGA1UEAxMcQmVsU2ln
+biBPYmplY3QgUHVibGlzaGluZyBDQTEjMCEGCSqGSIb3DQEJARYUd2VibWFzdGVy
+QGJlbHNpZ24uYmUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMQuH7a/7oJA
+3fm3LkHVngWxWtAmfGJVA5v8y2HeS+/+6Jn+h7mIz5DaDwk8dt8Xl7bLPyVF/bS8
+WAC+sFq2FIeP7mdkrR2Ig7tnn2VhAFgIgFCfgMkx9iqQHC33SmwQ9iNDXTgJYIhX
+As0WbBj8zfuSKnfQnpOjXYhk0Mj4XVRRAgMBAAGjFTATMBEGCWCGSAGG+EIBAQQE
+AwIABzANBgkqhkiG9w0BAQQFAAOBgQBjdhd8lvBTpV0BHFPOKcJ+daxMDaIIc7Rq
+Mf0CBhSZ3FQEpL/IloafMUMyJVf2hfYluze+oXkjyVcGJXFrRU/49AJAFoIir1Tq
+Mij2De6ZuksIUQ9uhiMhTC0liIHELg7xEyw4ipUCJMM6lWPkk45IuwhHcl+u5jpa
+R9Zxxp6aUg==
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=BE, L=Brussels, O=BelSign NV, OU=BelSign Object Publishing Certificate Authority, CN=BelSign Object Publishing CA/Email=webmaster@belsign.be
+        Validity
+            Not Before: Sep 19 22:03:00 1997 GMT
+            Not After : Sep 19 22:03:00 2007 GMT
+        Subject: C=BE, L=Brussels, O=BelSign NV, OU=BelSign Object Publishing Certificate Authority, CN=BelSign Object Publishing CA/Email=webmaster@belsign.be
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:c4:2e:1f:b6:bf:ee:82:40:dd:f9:b7:2e:41:d5:
+                    9e:05:b1:5a:d0:26:7c:62:55:03:9b:fc:cb:61:de:
+                    4b:ef:fe:e8:99:fe:87:b9:88:cf:90:da:0f:09:3c:
+                    76:df:17:97:b6:cb:3f:25:45:fd:b4:bc:58:00:be:
+                    b0:5a:b6:14:87:8f:ee:67:64:ad:1d:88:83:bb:67:
+                    9f:65:61:00:58:08:80:50:9f:80:c9:31:f6:2a:90:
+                    1c:2d:f7:4a:6c:10:f6:23:43:5d:38:09:60:88:57:
+                    02:cd:16:6c:18:fc:cd:fb:92:2a:77:d0:9e:93:a3:
+                    5d:88:64:d0:c8:f8:5d:54:51
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            Netscape Cert Type: 
+                SSL CA, S/MIME CA, Object Signing CA
+    Signature Algorithm: md5WithRSAEncryption
+        63:76:17:7c:96:f0:53:a5:5d:01:1c:53:ce:29:c2:7e:75:ac:
+        4c:0d:a2:08:73:b4:6a:31:fd:02:06:14:99:dc:54:04:a4:bf:
+        c8:96:86:9f:31:43:32:25:57:f6:85:f6:25:bb:37:be:a1:79:
+        23:c9:57:06:25:71:6b:45:4f:f8:f4:02:40:16:82:22:af:54:
+        ea:32:28:f6:0d:ee:99:ba:4b:08:51:0f:6e:86:23:21:4c:2d:
+        25:88:81:c4:2e:0e:f1:13:2c:38:8a:95:02:24:c3:3a:95:63:
+        e4:93:8e:48:bb:08:47:72:5f:ae:e6:3a:5a:47:d6:71:c6:9e:
+        9a:52
+
+BelSign Secure Server CA
+========================
+MD5 Fingerprint: 3D:5E:82:C6:D9:AD:D9:8B:93:6B:0C:10:B9:49:0A:B1
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIC8zCCAlygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBszELMAkGA1UEBhMCQkUx
+ETAPBgNVBAcTCEJydXNzZWxzMRMwEQYDVQQKEwpCZWxTaWduIE5WMTQwMgYDVQQL
+EytCZWxTaWduIFNlY3VyZSBTZXJ2ZXIgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MSEw
+HwYDVQQDExhCZWxTaWduIFNlY3VyZSBTZXJ2ZXIgQ0ExIzAhBgkqhkiG9w0BCQEW
+FHdlYm1hc3RlckBiZWxzaWduLmJlMB4XDTk3MDcxNjIyMDA1NFoXDTA3MDcxNjIy
+MDA1NFowgbMxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczETMBEGA1UE
+ChMKQmVsU2lnbiBOVjE0MDIGA1UECxMrQmVsU2lnbiBTZWN1cmUgU2VydmVyIENl
+cnRpZmljYXRlIEF1dGhvcml0eTEhMB8GA1UEAxMYQmVsU2lnbiBTZWN1cmUgU2Vy
+dmVyIENBMSMwIQYJKoZIhvcNAQkBFhR3ZWJtYXN0ZXJAYmVsc2lnbi5iZTCBnzAN
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA1gESeJL4BEJ/yccig/x8R3AwK0kLPjZA
+kCjaIXODU/LE0RZAwFP/rqbGJLMnbaWzPTl3XagG9ubpvGMRTgZlcAqdk/miQIt/
+SoQOjRax1swIZBIM4ChLyKWEkBf7EUYu1qeFGMsYrmOasFgG9ADP+MQJGjUMofnu
+Sv1t3v4mpTsCAwEAAaMVMBMwEQYJYIZIAYb4QgEBBAQDAgCgMA0GCSqGSIb3DQEB
+BAUAA4GBAGw9mcMF4h3K5S2qaIWLQDEgZhNo5lg6idCNdbLFYth9go/32TKBd/Y1
+W4UpzmeyubwrGXjP84f9RvGVdbIJVwMwwXrNckdxgMp9ncllPEcRIn36BwsoeKGT
+6AVFSOIyMko96FMcELfHc4wHUOH5yStTQfWDjeUJOUqOA2KqQGOL
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=BE, L=Brussels, O=BelSign NV, OU=BelSign Secure Server Certificate Authority, CN=BelSign Secure Server CA/Email=webmaster@belsign.be
+        Validity
+            Not Before: Jul 16 22:00:54 1997 GMT
+            Not After : Jul 16 22:00:54 2007 GMT
+        Subject: C=BE, L=Brussels, O=BelSign NV, OU=BelSign Secure Server Certificate Authority, CN=BelSign Secure Server CA/Email=webmaster@belsign.be
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:d6:01:12:78:92:f8:04:42:7f:c9:c7:22:83:fc:
+                    7c:47:70:30:2b:49:0b:3e:36:40:90:28:da:21:73:
+                    83:53:f2:c4:d1:16:40:c0:53:ff:ae:a6:c6:24:b3:
+                    27:6d:a5:b3:3d:39:77:5d:a8:06:f6:e6:e9:bc:63:
+                    11:4e:06:65:70:0a:9d:93:f9:a2:40:8b:7f:4a:84:
+                    0e:8d:16:b1:d6:cc:08:64:12:0c:e0:28:4b:c8:a5:
+                    84:90:17:fb:11:46:2e:d6:a7:85:18:cb:18:ae:63:
+                    9a:b0:58:06:f4:00:cf:f8:c4:09:1a:35:0c:a1:f9:
+                    ee:4a:fd:6d:de:fe:26:a5:3b
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            Netscape Cert Type: 
+                SSL Client, S/MIME
+    Signature Algorithm: md5WithRSAEncryption
+        6c:3d:99:c3:05:e2:1d:ca:e5:2d:aa:68:85:8b:40:31:20:66:
+        13:68:e6:58:3a:89:d0:8d:75:b2:c5:62:d8:7d:82:8f:f7:d9:
+        32:81:77:f6:35:5b:85:29:ce:67:b2:b9:bc:2b:19:78:cf:f3:
+        87:fd:46:f1:95:75:b2:09:57:03:30:c1:7a:cd:72:47:71:80:
+        ca:7d:9d:c9:65:3c:47:11:22:7d:fa:07:0b:28:78:a1:93:e8:
+        05:45:48:e2:32:32:4a:3d:e8:53:1c:10:b7:c7:73:8c:07:50:
+        e1:f9:c9:2b:53:41:f5:83:8d:e5:09:39:4a:8e:03:62:aa:40:
+        63:8b
+
+Deutsche Telekom AG Root CA
+===========================
+MD5 Fingerprint: 77:DE:04:94:77:D0:0C:5F:A7:B1:F4:30:18:87:FB:55
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIICjjCCAfegAwIBAgIBBjANBgkqhkiG9w0BAQQFADBtMQswCQYDVQQGEwJERTEc
+MBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEdMBsGA1UECxMUVGVsZVNlYyBU
+cnVzdCBDZW50ZXIxITAfBgNVBAMTGERldXRzY2hlIFRlbGVrb20gUm9vdCBDQTAe
+Fw05ODEyMDkwOTExMDBaFw0wNDEyMDkyMzU5MDBaMG0xCzAJBgNVBAYTAkRFMRww
+GgYDVQQKExNEZXV0c2NoZSBUZWxla29tIEFHMR0wGwYDVQQLExRUZWxlU2VjIFRy
+dXN0IENlbnRlcjEhMB8GA1UEAxMYRGV1dHNjaGUgVGVsZWtvbSBSb290IENBMIGf
+MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdBSz5BbO5EtdpcffqVjAIVxRDe7sa
+nG0vV2HX4vVEa+42QZb2ZM7hwbK5pBQEmFDocPiONZp9ScFhHVmu2gYYlX2tzuyp
+vtEYD0CRdiqj5f3+iRX0V/fgVdp1rQD0LME1zLRDJlViRC4BJZyKW/DB0AA1eP41
+3pRAZHiDocw5iQIDAQABoz4wPDAPBgNVHRMECDAGAQH/AgEFMA4GA1UdDwEB/wQE
+AwIBBjAZBgNVHQ4EEgQQLIdZH4sTgLL5hp0+En5YljANBgkqhkiG9w0BAQQFAAOB
+gQAP/nO1B4hvoAuJ6spQH5TelCsLJ15P9RyVJtqMllStGZE3Q12ryYuzzW+YOT3t
+3TXjcbftE5OD6IblKTMTE7w1e/0oL3BZ1dO0jSgTWTvI1XT5RcIHYKq4GFT5pWj/
+1wXVj7YFMS5BSvQQH2BHGguLGU2SVyDS71AZ6M3QcLy8Ng==
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 6 (0x6)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=DE, O=Deutsche Telekom AG, OU=TeleSec Trust Center, CN=Deutsche Telekom Root CA
+        Validity
+            Not Before: Dec  9 09:11:00 1998 GMT
+            Not After : Dec  9 23:59:00 2004 GMT
+        Subject: C=DE, O=Deutsche Telekom AG, OU=TeleSec Trust Center, CN=Deutsche Telekom Root CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:dd:05:2c:f9:05:b3:b9:12:d7:69:71:f7:ea:56:
+                    30:08:57:14:43:7b:bb:1a:9c:6d:2f:57:61:d7:e2:
+                    f5:44:6b:ee:36:41:96:f6:64:ce:e1:c1:b2:b9:a4:
+                    14:04:98:50:e8:70:f8:8e:35:9a:7d:49:c1:61:1d:
+                    59:ae:da:06:18:95:7d:ad:ce:ec:a9:be:d1:18:0f:
+                    40:91:76:2a:a3:e5:fd:fe:89:15:f4:57:f7:e0:55:
+                    da:75:ad:00:f4:2c:c1:35:cc:b4:43:26:55:62:44:
+                    2e:01:25:9c:8a:5b:f0:c1:d0:00:35:78:fe:35:de:
+                    94:40:64:78:83:a1:cc:39:89
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:TRUE, pathlen:5
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Subject Key Identifier: 
+                2C:87:59:1F:8B:13:80:B2:F9:86:9D:3E:12:7E:58:96
+    Signature Algorithm: md5WithRSAEncryption
+        0f:fe:73:b5:07:88:6f:a0:0b:89:ea:ca:50:1f:94:de:94:2b:
+        0b:27:5e:4f:f5:1c:95:26:da:8c:96:54:ad:19:91:37:43:5d:
+        ab:c9:8b:b3:cd:6f:98:39:3d:ed:dd:35:e3:71:b7:ed:13:93:
+        83:e8:86:e5:29:33:13:13:bc:35:7b:fd:28:2f:70:59:d5:d3:
+        b4:8d:28:13:59:3b:c8:d5:74:f9:45:c2:07:60:aa:b8:18:54:
+        f9:a5:68:ff:d7:05:d5:8f:b6:05:31:2e:41:4a:f4:10:1f:60:
+        47:1a:0b:8b:19:4d:92:57:20:d2:ef:50:19:e8:cd:d0:70:bc:
+        bc:36
+
+Digital Signature Trust Co. Global CA 1
+=======================================
+MD5 Fingerprint: 25:7A:BA:83:2E:B6:A2:0B:DA:FE:F5:02:0F:08:D7:AD
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDKTCCApKgAwIBAgIENnAVljANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJV
+UzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQL
+EwhEU1RDQSBFMTAeFw05ODEyMTAxODEwMjNaFw0xODEyMTAxODQwMjNaMEYxCzAJ
+BgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4x
+ETAPBgNVBAsTCERTVENBIEUxMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQCg
+bIGpzzQeJN3+hijM3oMv+V7UQtLodGBmE5gGHKlREmlvMVW5SXIACH7TpWJENySZ
+j9mDSI+ZbZUTu0M7LklOiDfBu1h//uG9+LthzfNHwJmm8fOR6Hh8AMthyUQncWlV
+Sn5JTe2io74CTADKAqjuAQIxZA9SLRN0dja1erQtcQIBA6OCASQwggEgMBEGCWCG
+SAGG+EIBAQQEAwIABzBoBgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMx
+JDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjERMA8GA1UECxMI
+RFNUQ0EgRTExDTALBgNVBAMTBENSTDEwKwYDVR0QBCQwIoAPMTk5ODEyMTAxODEw
+MjNagQ8yMDE4MTIxMDE4MTAyM1owCwYDVR0PBAQDAgEGMB8GA1UdIwQYMBaAFGp5
+fpFpRhgTCgJ3pVlbYJglDqL4MB0GA1UdDgQWBBRqeX6RaUYYEwoCd6VZW2CYJQ6i
++DAMBgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqG
+SIb3DQEBBQUAA4GBACIS2Hod3IEGtgllsofIH160L+nEHvI8wbsEkBFKg05+k7lN
+QseSJqBcNJo4cvj9axY+IO6CizEqkzaFI4iKPANo08kJD038bKTaKHKTDomAsH3+
+gG9lbRgzl4vCa4nuYD3Im+9/KzJic5PLPON74nZ4RbyhkwS7hp86W0N6w4pl
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 913315222 (0x36701596)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=Digital Signature Trust Co., OU=DSTCA E1
+        Validity
+            Not Before: Dec 10 18:10:23 1998 GMT
+            Not After : Dec 10 18:40:23 2018 GMT
+        Subject: C=US, O=Digital Signature Trust Co., OU=DSTCA E1
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:a0:6c:81:a9:cf:34:1e:24:dd:fe:86:28:cc:de:
+                    83:2f:f9:5e:d4:42:d2:e8:74:60:66:13:98:06:1c:
+                    a9:51:12:69:6f:31:55:b9:49:72:00:08:7e:d3:a5:
+                    62:44:37:24:99:8f:d9:83:48:8f:99:6d:95:13:bb:
+                    43:3b:2e:49:4e:88:37:c1:bb:58:7f:fe:e1:bd:f8:
+                    bb:61:cd:f3:47:c0:99:a6:f1:f3:91:e8:78:7c:00:
+                    cb:61:c9:44:27:71:69:55:4a:7e:49:4d:ed:a2:a3:
+                    be:02:4c:00:ca:02:a8:ee:01:02:31:64:0f:52:2d:
+                    13:74:76:36:b5:7a:b4:2d:71
+                Exponent: 3 (0x3)
+        X509v3 extensions:
+            Netscape Cert Type: 
+                SSL CA, S/MIME CA, Object Signing CA
+            X509v3 CRL Distribution Points: 
+                DirName:/C=US/O=Digital Signature Trust Co./OU=DSTCA E1/CN=CRL1
+
+            X509v3 Private Key Usage Period: 
+                Not Before: Dec 10 18:10:23 1998 GMT, Not After: Dec 10 18:10:23 2018 GMT
+            X509v3 Key Usage: 
+                Certificate Sign, CRL Sign
+            X509v3 Authority Key Identifier: 
+                keyid:6A:79:7E:91:69:46:18:13:0A:02:77:A5:59:5B:60:98:25:0E:A2:F8
+
+            X509v3 Subject Key Identifier: 
+                6A:79:7E:91:69:46:18:13:0A:02:77:A5:59:5B:60:98:25:0E:A2:F8
+            X509v3 Basic Constraints: 
+                CA:TRUE
+            1.2.840.113533.7.65.0: 
+                0
+..V4.0....
+    Signature Algorithm: sha1WithRSAEncryption
+        22:12:d8:7a:1d:dc:81:06:b6:09:65:b2:87:c8:1f:5e:b4:2f:
+        e9:c4:1e:f2:3c:c1:bb:04:90:11:4a:83:4e:7e:93:b9:4d:42:
+        c7:92:26:a0:5c:34:9a:38:72:f8:fd:6b:16:3e:20:ee:82:8b:
+        31:2a:93:36:85:23:88:8a:3c:03:68:d3:c9:09:0f:4d:fc:6c:
+        a4:da:28:72:93:0e:89:80:b0:7d:fe:80:6f:65:6d:18:33:97:
+        8b:c2:6b:89:ee:60:3d:c8:9b:ef:7f:2b:32:62:73:93:cb:3c:
+        e3:7b:e2:76:78:45:bc:a1:93:04:bb:86:9f:3a:5b:43:7a:c3:
+        8a:65
+
+Digital Signature Trust Co. Global CA 2
+=======================================
+MD5 Fingerprint: 6C:C9:A7:6E:47:F1:0C:E3:53:3B:78:4C:4D:C2:6A:C5
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIID2DCCAsACEQDQHkCLAAACfAAAAAIAAAABMA0GCSqGSIb3DQEBBQUAMIGpMQsw
+CQYDVQQGEwJ1czENMAsGA1UECBMEVXRhaDEXMBUGA1UEBxMOU2FsdCBMYWtlIENp
+dHkxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjERMA8GA1UE
+CxMIRFNUQ0EgWDExFjAUBgNVBAMTDURTVCBSb290Q0EgWDExITAfBgkqhkiG9w0B
+CQEWEmNhQGRpZ3NpZ3RydXN0LmNvbTAeFw05ODEyMDExODE4NTVaFw0wODExMjgx
+ODE4NTVaMIGpMQswCQYDVQQGEwJ1czENMAsGA1UECBMEVXRhaDEXMBUGA1UEBxMO
+U2FsdCBMYWtlIENpdHkxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0
+IENvLjERMA8GA1UECxMIRFNUQ0EgWDExFjAUBgNVBAMTDURTVCBSb290Q0EgWDEx
+ITAfBgkqhkiG9w0BCQEWEmNhQGRpZ3NpZ3RydXN0LmNvbTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBANLGJrbnpT3BxGjVUG9TxW9JEwm4ryxIjRRqoxdf
+WvnTLnUv2Chi0ZMv/E3Uq4flCMeZ55I/db3rJbQVwZsZPdJEjdd0IG03Ao9pk1uK
+xBmd9LIO/BZsubEFkoPRhSxglD5FVaDZqwgh5mDoO3TymVBRaNADLbGAvqPYUrBE
+zUNKcI5YhZXhTizWLUFv1oTnyJhEykfbLCSlaSbPa7gnYsP0yXqSI+0TZ4KuRS5F
+5X5yP4WdlGIQ5jyRoa13AOAV7POEgHJ6jm5gl8ckWRA0g1vhpaRptlc1HHhZxtMv
+OnNn7pTKBBMFYgZwI7P0fO5F2WQLW0mqpEPOJsREEmy43XkCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEAojeyP2n714Z5VEkxlTMr89EJFEliYIalsBHiUMIdBlc+Legz
+ZL6bqq1fG03UmZWii5rJYnK1aerZWKs17RWiQ9a2vAd5ZWRzfdd5ynvVWlHG4VME
+lo04z6MXrDlxawHDi1M8Y+nuecDkvpIyZHqzH5eUYr3qsiAVlfuX8ngvYzZAOONG
+Dx3drJXK50uQe7FLqdTF65raqtWjlBRGjS0f8zrWkzr2Pnn86Oawde3uPclwx12q
+gUtGJRzHbBXjlU4PqjI3lAoXJJIThFjSY28r9+ZbYgsTF7ANUkz+/m9c4pFuHf2k
+Ytdo+o56T9II2pPc8JIRetDccpMMc5NihWjQ9A==
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number:
+            d0:1e:40:8b:00:00:02:7c:00:00:00:02:00:00:00:01
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=us, ST=Utah, L=Salt Lake City, O=Digital Signature Trust Co., OU=DSTCA X1, CN=DST RootCA X1/Email=ca@digsigtrust.com
+        Validity
+            Not Before: Dec  1 18:18:55 1998 GMT
+            Not After : Nov 28 18:18:55 2008 GMT
+        Subject: C=us, ST=Utah, L=Salt Lake City, O=Digital Signature Trust Co., OU=DSTCA X1, CN=DST RootCA X1/Email=ca@digsigtrust.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:d2:c6:26:b6:e7:a5:3d:c1:c4:68:d5:50:6f:53:
+                    c5:6f:49:13:09:b8:af:2c:48:8d:14:6a:a3:17:5f:
+                    5a:f9:d3:2e:75:2f:d8:28:62:d1:93:2f:fc:4d:d4:
+                    ab:87:e5:08:c7:99:e7:92:3f:75:bd:eb:25:b4:15:
+                    c1:9b:19:3d:d2:44:8d:d7:74:20:6d:37:02:8f:69:
+                    93:5b:8a:c4:19:9d:f4:b2:0e:fc:16:6c:b9:b1:05:
+                    92:83:d1:85:2c:60:94:3e:45:55:a0:d9:ab:08:21:
+                    e6:60:e8:3b:74:f2:99:50:51:68:d0:03:2d:b1:80:
+                    be:a3:d8:52:b0:44:cd:43:4a:70:8e:58:85:95:e1:
+                    4e:2c:d6:2d:41:6f:d6:84:e7:c8:98:44:ca:47:db:
+                    2c:24:a5:69:26:cf:6b:b8:27:62:c3:f4:c9:7a:92:
+                    23:ed:13:67:82:ae:45:2e:45:e5:7e:72:3f:85:9d:
+                    94:62:10:e6:3c:91:a1:ad:77:00:e0:15:ec:f3:84:
+                    80:72:7a:8e:6e:60:97:c7:24:59:10:34:83:5b:e1:
+                    a5:a4:69:b6:57:35:1c:78:59:c6:d3:2f:3a:73:67:
+                    ee:94:ca:04:13:05:62:06:70:23:b3:f4:7c:ee:45:
+                    d9:64:0b:5b:49:aa:a4:43:ce:26:c4:44:12:6c:b8:
+                    dd:79
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: sha1WithRSAEncryption
+        a2:37:b2:3f:69:fb:d7:86:79:54:49:31:95:33:2b:f3:d1:09:
+        14:49:62:60:86:a5:b0:11:e2:50:c2:1d:06:57:3e:2d:e8:33:
+        64:be:9b:aa:ad:5f:1b:4d:d4:99:95:a2:8b:9a:c9:62:72:b5:
+        69:ea:d9:58:ab:35:ed:15:a2:43:d6:b6:bc:07:79:65:64:73:
+        7d:d7:79:ca:7b:d5:5a:51:c6:e1:53:04:96:8d:38:cf:a3:17:
+        ac:39:71:6b:01:c3:8b:53:3c:63:e9:ee:79:c0:e4:be:92:32:
+        64:7a:b3:1f:97:94:62:bd:ea:b2:20:15:95:fb:97:f2:78:2f:
+        63:36:40:38:e3:46:0f:1d:dd:ac:95:ca:e7:4b:90:7b:b1:4b:
+        a9:d4:c5:eb:9a:da:aa:d5:a3:94:14:46:8d:2d:1f:f3:3a:d6:
+        93:3a:f6:3e:79:fc:e8:e6:b0:75:ed:ee:3d:c9:70:c7:5d:aa:
+        81:4b:46:25:1c:c7:6c:15:e3:95:4e:0f:aa:32:37:94:0a:17:
+        24:92:13:84:58:d2:63:6f:2b:f7:e6:5b:62:0b:13:17:b0:0d:
+        52:4c:fe:fe:6f:5c:e2:91:6e:1d:fd:a4:62:d7:68:fa:8e:7a:
+        4f:d2:08:da:93:dc:f0:92:11:7a:d0:dc:72:93:0c:73:93:62:
+        85:68:d0:f4
+
+Digital Signature Trust Co. Global CA 3
+=======================================
+MD5 Fingerprint: 93:C2:8E:11:7B:D4:F3:03:19:BD:28:75:13:4A:45:4A
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDKTCCApKgAwIBAgIENm7TzjANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJV
+UzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQL
+EwhEU1RDQSBFMjAeFw05ODEyMDkxOTE3MjZaFw0xODEyMDkxOTQ3MjZaMEYxCzAJ
+BgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4x
+ETAPBgNVBAsTCERTVENBIEUyMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQC/
+k48Xku8zExjrEH9OFr//Bo8qhbxe+SSmJIi2A7fBw18DW9Fvrn5C6mYjuGODVvso
+LeE4i7TuqAHhzhy2iCoiRoX7n6dwqUcUP87eZfCocfdPJmyMvMa1795JJ/9IKn3o
+TQPMx7JSxhcxEzu1TdvIxPbDDyQq2gyd55FbgM2UnQIBA6OCASQwggEgMBEGCWCG
+SAGG+EIBAQQEAwIABzBoBgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMx
+JDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjERMA8GA1UECxMI
+RFNUQ0EgRTIxDTALBgNVBAMTBENSTDEwKwYDVR0QBCQwIoAPMTk5ODEyMDkxOTE3
+MjZagQ8yMDE4MTIwOTE5MTcyNlowCwYDVR0PBAQDAgEGMB8GA1UdIwQYMBaAFB6C
+TShlgDzJQW6sNS5ay97u+DlbMB0GA1UdDgQWBBQegk0oZYA8yUFurDUuWsve7vg5
+WzAMBgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqG
+SIb3DQEBBQUAA4GBAEeNg61i8tuwnkUiBbmi1gMOOHLnnvx75pO2mqWilMg0HZHR
+xdf0CiUPPXiBng+xZ8SQTGPdXqfiup/1902lMXucKS1M/mQ+7LZT/uqb7YLbdHVL
+B3luHtgZg3Pe9T7Qtd7nS2h9Qy4qIOF+oHhEngj1mPnHfxsb1gYgAlihw6ID
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 913232846 (0x366ed3ce)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=Digital Signature Trust Co., OU=DSTCA E2
+        Validity
+            Not Before: Dec  9 19:17:26 1998 GMT
+            Not After : Dec  9 19:47:26 2018 GMT
+        Subject: C=US, O=Digital Signature Trust Co., OU=DSTCA E2
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:bf:93:8f:17:92:ef:33:13:18:eb:10:7f:4e:16:
+                    bf:ff:06:8f:2a:85:bc:5e:f9:24:a6:24:88:b6:03:
+                    b7:c1:c3:5f:03:5b:d1:6f:ae:7e:42:ea:66:23:b8:
+                    63:83:56:fb:28:2d:e1:38:8b:b4:ee:a8:01:e1:ce:
+                    1c:b6:88:2a:22:46:85:fb:9f:a7:70:a9:47:14:3f:
+                    ce:de:65:f0:a8:71:f7:4f:26:6c:8c:bc:c6:b5:ef:
+                    de:49:27:ff:48:2a:7d:e8:4d:03:cc:c7:b2:52:c6:
+                    17:31:13:3b:b5:4d:db:c8:c4:f6:c3:0f:24:2a:da:
+                    0c:9d:e7:91:5b:80:cd:94:9d
+                Exponent: 3 (0x3)
+        X509v3 extensions:
+            Netscape Cert Type: 
+                SSL CA, S/MIME CA, Object Signing CA
+            X509v3 CRL Distribution Points: 
+                DirName:/C=US/O=Digital Signature Trust Co./OU=DSTCA E2/CN=CRL1
+
+            X509v3 Private Key Usage Period: 
+                Not Before: Dec  9 19:17:26 1998 GMT, Not After: Dec  9 19:17:26 2018 GMT
+            X509v3 Key Usage: 
+                Certificate Sign, CRL Sign
+            X509v3 Authority Key Identifier: 
+                keyid:1E:82:4D:28:65:80:3C:C9:41:6E:AC:35:2E:5A:CB:DE:EE:F8:39:5B
+
+            X509v3 Subject Key Identifier: 
+                1E:82:4D:28:65:80:3C:C9:41:6E:AC:35:2E:5A:CB:DE:EE:F8:39:5B
+            X509v3 Basic Constraints: 
+                CA:TRUE
+            1.2.840.113533.7.65.0: 
+                0
+..V4.0....
+    Signature Algorithm: sha1WithRSAEncryption
+        47:8d:83:ad:62:f2:db:b0:9e:45:22:05:b9:a2:d6:03:0e:38:
+        72:e7:9e:fc:7b:e6:93:b6:9a:a5:a2:94:c8:34:1d:91:d1:c5:
+        d7:f4:0a:25:0f:3d:78:81:9e:0f:b1:67:c4:90:4c:63:dd:5e:
+        a7:e2:ba:9f:f5:f7:4d:a5:31:7b:9c:29:2d:4c:fe:64:3e:ec:
+        b6:53:fe:ea:9b:ed:82:db:74:75:4b:07:79:6e:1e:d8:19:83:
+        73:de:f5:3e:d0:b5:de:e7:4b:68:7d:43:2e:2a:20:e1:7e:a0:
+        78:44:9e:08:f5:98:f9:c7:7f:1b:1b:d6:06:20:02:58:a1:c3:
+        a2:03
+
+Digital Signature Trust Co. Global CA 4
+=======================================
+MD5 Fingerprint: CD:3B:3D:62:5B:09:B8:09:36:87:9E:12:2F:71:64:BA
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIID2DCCAsACEQDQHkCLAAB3bQAAAAEAAAAEMA0GCSqGSIb3DQEBBQUAMIGpMQsw
+CQYDVQQGEwJ1czENMAsGA1UECBMEVXRhaDEXMBUGA1UEBxMOU2FsdCBMYWtlIENp
+dHkxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjERMA8GA1UE
+CxMIRFNUQ0EgWDIxFjAUBgNVBAMTDURTVCBSb290Q0EgWDIxITAfBgkqhkiG9w0B
+CQEWEmNhQGRpZ3NpZ3RydXN0LmNvbTAeFw05ODExMzAyMjQ2MTZaFw0wODExMjcy
+MjQ2MTZaMIGpMQswCQYDVQQGEwJ1czENMAsGA1UECBMEVXRhaDEXMBUGA1UEBxMO
+U2FsdCBMYWtlIENpdHkxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0
+IENvLjERMA8GA1UECxMIRFNUQ0EgWDIxFjAUBgNVBAMTDURTVCBSb290Q0EgWDIx
+ITAfBgkqhkiG9w0BCQEWEmNhQGRpZ3NpZ3RydXN0LmNvbTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBANx18IzAdZaawGIfJvfE4Zrq4FZzW5nNAUSoCLbV
+p9oaBBg5kkp4o4HC9Xd6ULRw/5qrxsfKboNPQpj7Jgva3G3WqZlVUmfpKAOS3OWw
+BZoPFflrWXJW8vo5/Kpo7g8fEIMv/J36F5bdguPmRX3AS4BEH+0s4IT9kVySVGkl
+5WJp3OXuAFK9MwutdQKFp2RQLcUZGTDAJtvJ0/0uma1ZtQtN1EGuhUhDWdy3qOKi
+3sOP17ihYqZoUFLkzzGnlIXan0YyF1bl8utmPRL/Q9uY73fPy4GNNLHGUEom0eQ+
+QVCvbK4iNC7Va26Dunm4dmVI2gkpZGMiuftHdoWMhkTLCdsCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEAtTYOXeFhKFoRZcA/gwN5Tb4opgsHAlKFzfiR0BBstWogWxyQ
+2TA8xkieil5k+aFxd+8EJx8H6+Qm93N0yUQYGmbT4EOvkTvRyyzYdFQ6HE3K1GjN
+I3wdEJ5F6fYAbqbNGf9PLCmPV03Ed5K+4EwJ+11EhmYhqLkyolbV6YyDfFk/xPEL
+553snr2cGA4+wjl5KLcDDQjLxufZATdQEOzMYRZA1K8xdHv8PzGn0EdzMzkbzE5q
+10mDEQb+64JYMzJM8FasHpwvVpp7wUocpf1VNs78lk30sPDst2yC7S8xmUJMqbIN
+uBVd8d+6ybVK1GSYsyapMMj9puyrliGtf8J4tg==
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number:
+            d0:1e:40:8b:00:00:77:6d:00:00:00:01:00:00:00:04
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=us, ST=Utah, L=Salt Lake City, O=Digital Signature Trust Co., OU=DSTCA X2, CN=DST RootCA X2/Email=ca@digsigtrust.com
+        Validity
+            Not Before: Nov 30 22:46:16 1998 GMT
+            Not After : Nov 27 22:46:16 2008 GMT
+        Subject: C=us, ST=Utah, L=Salt Lake City, O=Digital Signature Trust Co., OU=DSTCA X2, CN=DST RootCA X2/Email=ca@digsigtrust.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:dc:75:f0:8c:c0:75:96:9a:c0:62:1f:26:f7:c4:
+                    e1:9a:ea:e0:56:73:5b:99:cd:01:44:a8:08:b6:d5:
+                    a7:da:1a:04:18:39:92:4a:78:a3:81:c2:f5:77:7a:
+                    50:b4:70:ff:9a:ab:c6:c7:ca:6e:83:4f:42:98:fb:
+                    26:0b:da:dc:6d:d6:a9:99:55:52:67:e9:28:03:92:
+                    dc:e5:b0:05:9a:0f:15:f9:6b:59:72:56:f2:fa:39:
+                    fc:aa:68:ee:0f:1f:10:83:2f:fc:9d:fa:17:96:dd:
+                    82:e3:e6:45:7d:c0:4b:80:44:1f:ed:2c:e0:84:fd:
+                    91:5c:92:54:69:25:e5:62:69:dc:e5:ee:00:52:bd:
+                    33:0b:ad:75:02:85:a7:64:50:2d:c5:19:19:30:c0:
+                    26:db:c9:d3:fd:2e:99:ad:59:b5:0b:4d:d4:41:ae:
+                    85:48:43:59:dc:b7:a8:e2:a2:de:c3:8f:d7:b8:a1:
+                    62:a6:68:50:52:e4:cf:31:a7:94:85:da:9f:46:32:
+                    17:56:e5:f2:eb:66:3d:12:ff:43:db:98:ef:77:cf:
+                    cb:81:8d:34:b1:c6:50:4a:26:d1:e4:3e:41:50:af:
+                    6c:ae:22:34:2e:d5:6b:6e:83:ba:79:b8:76:65:48:
+                    da:09:29:64:63:22:b9:fb:47:76:85:8c:86:44:cb:
+                    09:db
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: sha1WithRSAEncryption
+        b5:36:0e:5d:e1:61:28:5a:11:65:c0:3f:83:03:79:4d:be:28:
+        a6:0b:07:02:52:85:cd:f8:91:d0:10:6c:b5:6a:20:5b:1c:90:
+        d9:30:3c:c6:48:9e:8a:5e:64:f9:a1:71:77:ef:04:27:1f:07:
+        eb:e4:26:f7:73:74:c9:44:18:1a:66:d3:e0:43:af:91:3b:d1:
+        cb:2c:d8:74:54:3a:1c:4d:ca:d4:68:cd:23:7c:1d:10:9e:45:
+        e9:f6:00:6e:a6:cd:19:ff:4f:2c:29:8f:57:4d:c4:77:92:be:
+        e0:4c:09:fb:5d:44:86:66:21:a8:b9:32:a2:56:d5:e9:8c:83:
+        7c:59:3f:c4:f1:0b:e7:9d:ec:9e:bd:9c:18:0e:3e:c2:39:79:
+        28:b7:03:0d:08:cb:c6:e7:d9:01:37:50:10:ec:cc:61:16:40:
+        d4:af:31:74:7b:fc:3f:31:a7:d0:47:73:33:39:1b:cc:4e:6a:
+        d7:49:83:11:06:fe:eb:82:58:33:32:4c:f0:56:ac:1e:9c:2f:
+        56:9a:7b:c1:4a:1c:a5:fd:55:36:ce:fc:96:4d:f4:b0:f0:ec:
+        b7:6c:82:ed:2f:31:99:42:4c:a9:b2:0d:b8:15:5d:f1:df:ba:
+        c9:b5:4a:d4:64:98:b3:26:a9:30:c8:fd:a6:ec:ab:96:21:ad:
+        7f:c2:78:b6
+
+Entrust Worldwide by DST
+========================
+MD5 Fingerprint: B4:65:22:0A:7C:AD:DF:41:B7:D5:44:D5:AD:FA:9A:75
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDRzCCArCgAwIBAgIENm3FGDANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJV
+UzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRswGQYDVQQL
+ExJEU1QtRW50cnVzdCBHVEkgQ0EwHhcNOTgxMjA5MDAwMjI0WhcNMTgxMjA5MDAz
+MjI0WjBQMQswCQYDVQQGEwJVUzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUg
+VHJ1c3QgQ28uMRswGQYDVQQLExJEU1QtRW50cnVzdCBHVEkgQ0EwgZ0wDQYJKoZI
+hvcNAQEBBQADgYsAMIGHAoGBALYd90uNDxPjEvUJ/gYyDq9MQfV91Ec9KgrfgwXe
+3n3mAxb2UTrLRxpKrX7E/R20vnSKeN0Lg460hBPE+/htKa6h4Q8PQ+O1XmBp+oOU
+/Hnm3Hbt0UQrjv0Su/4XdxcMie2n71F9xO04wzujevviTaBgtfL9E2XTxuw/vjWc
+PSLvAgEDo4IBLjCCASowEQYJYIZIAYb4QgEBBAQDAgAHMHIGA1UdHwRrMGkwZ6Bl
+oGOkYTBfMQswCQYDVQQGEwJVUzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUg
+VHJ1c3QgQ28uMRswGQYDVQQLExJEU1QtRW50cnVzdCBHVEkgQ0ExDTALBgNVBAMT
+BENSTDEwKwYDVR0QBCQwIoAPMTk5ODEyMDkwMDAyMjRagQ8yMDE4MTIwOTAwMDIy
+NFowCwYDVR0PBAQDAgEGMB8GA1UdIwQYMBaAFJOaRMrQeFOAKUkE38evMz+ZdV+u
+MB0GA1UdDgQWBBSTmkTK0HhTgClJBN/HrzM/mXVfrjAMBgNVHRMEBTADAQH/MBkG
+CSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4GBAGSJzAOn
+3AryWCDn/RegKHLNh7DNmLUkR2MzMRAQsu+KV3KuTAPgZ5+sYEOEIsGpo+Wxp94J
+1M8NeEYjW49Je/4TIpeU6nJI4SwgeJbpZkUZywllY2E/0UmYsXYQVdVjSmZLpAdr
+3nt/ueaTWxoCW4AO3Y0Y1Iqjwmjxo+AY0U5M
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 913163544 (0x366dc518)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=Digital Signature Trust Co., OU=DST-Entrust GTI CA
+        Validity
+            Not Before: Dec  9 00:02:24 1998 GMT
+            Not After : Dec  9 00:32:24 2018 GMT
+        Subject: C=US, O=Digital Signature Trust Co., OU=DST-Entrust GTI CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:b6:1d:f7:4b:8d:0f:13:e3:12:f5:09:fe:06:32:
+                    0e:af:4c:41:f5:7d:d4:47:3d:2a:0a:df:83:05:de:
+                    de:7d:e6:03:16:f6:51:3a:cb:47:1a:4a:ad:7e:c4:
+                    fd:1d:b4:be:74:8a:78:dd:0b:83:8e:b4:84:13:c4:
+                    fb:f8:6d:29:ae:a1:e1:0f:0f:43:e3:b5:5e:60:69:
+                    fa:83:94:fc:79:e6:dc:76:ed:d1:44:2b:8e:fd:12:
+                    bb:fe:17:77:17:0c:89:ed:a7:ef:51:7d:c4:ed:38:
+                    c3:3b:a3:7a:fb:e2:4d:a0:60:b5:f2:fd:13:65:d3:
+                    c6:ec:3f:be:35:9c:3d:22:ef
+                Exponent: 3 (0x3)
+        X509v3 extensions:
+            Netscape Cert Type: 
+                SSL CA, S/MIME CA, Object Signing CA
+            X509v3 CRL Distribution Points: 
+                DirName:/C=US/O=Digital Signature Trust Co./OU=DST-Entrust GTI CA/CN=CRL1
+
+            X509v3 Private Key Usage Period: 
+                Not Before: Dec  9 00:02:24 1998 GMT, Not After: Dec  9 00:02:24 2018 GMT
+            X509v3 Key Usage: 
+                Certificate Sign, CRL Sign
+            X509v3 Authority Key Identifier: 
+                keyid:93:9A:44:CA:D0:78:53:80:29:49:04:DF:C7:AF:33:3F:99:75:5F:AE
+
+            X509v3 Subject Key Identifier: 
+                93:9A:44:CA:D0:78:53:80:29:49:04:DF:C7:AF:33:3F:99:75:5F:AE
+            X509v3 Basic Constraints: 
+                CA:TRUE
+            1.2.840.113533.7.65.0: 
+                0
+..V4.0....
+    Signature Algorithm: sha1WithRSAEncryption
+        64:89:cc:03:a7:dc:0a:f2:58:20:e7:fd:17:a0:28:72:cd:87:
+        b0:cd:98:b5:24:47:63:33:31:10:10:b2:ef:8a:57:72:ae:4c:
+        03:e0:67:9f:ac:60:43:84:22:c1:a9:a3:e5:b1:a7:de:09:d4:
+        cf:0d:78:46:23:5b:8f:49:7b:fe:13:22:97:94:ea:72:48:e1:
+        2c:20:78:96:e9:66:45:19:cb:09:65:63:61:3f:d1:49:98:b1:
+        76:10:55:d5:63:4a:66:4b:a4:07:6b:de:7b:7f:b9:e6:93:5b:
+        1a:02:5b:80:0e:dd:8d:18:d4:8a:a3:c2:68:f1:a3:e0:18:d1:
+        4e:4c
+
+Entrust.net Premium 2048 Secure Server CA
+=========================================
+MD5 Fingerprint: BA:21:EA:20:D6:DD:DB:8F:C1:57:8B:40:AD:A1:FC:FC
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIEXDCCA0SgAwIBAgIEOGO5ZjANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChML
+RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBp
+bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5
+IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQxNzUwNTFaFw0xOTEy
+MjQxODIwNTFaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3
+LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp
+YWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG
+A1UEAxMqRW50cnVzdC5uZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgp
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArU1LqRKGsuqjIAcVFmQq
+K0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOLGp18EzoOH1u3Hs/lJBQe
+sYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSrhRSGlVuX
+MlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVT
+XTzWnLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/
+HoZdenoVve8AjhUiVBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH
+4QIDAQABo3QwcjARBglghkgBhvhCAQEEBAMCAAcwHwYDVR0jBBgwFoAUVeSB0RGA
+vtiJuQijMfmhJAkWuXAwHQYDVR0OBBYEFFXkgdERgL7YibkIozH5oSQJFrlwMB0G
+CSqGSIb2fQdBAAQQMA4bCFY1LjA6NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEA
+WUesIYSKF8mciVMeuoCFGsY8Tj6xnLZ8xpJdGGQC49MGCBFhfGPjK50xA3B20qMo
+oPS7mmNz7W3lKtvtFKkrxjYR0CvrB4ul2p5cGZ1WEvVUKcgF7bISKo30Axv/55IQ
+h7A6tcOdBTcSo8f0FbnVpDkWm1M6I5HxqIKiaohowXkCIryqptau37AUX7iH0N18
+f3v/rxzP5tsHrV7bhZ3QKw0z2wTR5klAEyt2+z7pnIkPFc4YsIV4IU9rTw76NmfN
+B/L/CNDi3tm/Kq+4h4YhPATKt5Rof8886ZjXOP/swNlQ8C5LWK5Gb9Auw2DaclVy
+vUxFnmG6v4SBkgPR0ml8xQ==
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 946059622 (0x3863b966)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: O=Entrust.net, OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.), OU=(c) 1999 Entrust.net Limited, CN=Entrust.net Certification Authority (2048)
+        Validity
+            Not Before: Dec 24 17:50:51 1999 GMT
+            Not After : Dec 24 18:20:51 2019 GMT
+        Subject: O=Entrust.net, OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.), OU=(c) 1999 Entrust.net Limited, CN=Entrust.net Certification Authority (2048)
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:ad:4d:4b:a9:12:86:b2:ea:a3:20:07:15:16:64:
+                    2a:2b:4b:d1:bf:0b:4a:4d:8e:ed:80:76:a5:67:b7:
+                    78:40:c0:73:42:c8:68:c0:db:53:2b:dd:5e:b8:76:
+                    98:35:93:8b:1a:9d:7c:13:3a:0e:1f:5b:b7:1e:cf:
+                    e5:24:14:1e:b1:81:a9:8d:7d:b8:cc:6b:4b:03:f1:
+                    02:0c:dc:ab:a5:40:24:00:7f:74:94:a1:9d:08:29:
+                    b3:88:0b:f5:87:77:9d:55:cd:e4:c3:7e:d7:6a:64:
+                    ab:85:14:86:95:5b:97:32:50:6f:3d:c8:ba:66:0c:
+                    e3:fc:bd:b8:49:c1:76:89:49:19:fd:c0:a8:bd:89:
+                    a3:67:2f:c6:9f:bc:71:19:60:b8:2d:e9:2c:c9:90:
+                    76:66:7b:94:e2:af:78:d6:65:53:5d:3c:d6:9c:b2:
+                    cf:29:03:f9:2f:a4:50:b2:d4:48:ce:05:32:55:8a:
+                    fd:b2:64:4c:0e:e4:98:07:75:db:7f:df:b9:08:55:
+                    60:85:30:29:f9:7b:48:a4:69:86:e3:35:3f:1e:86:
+                    5d:7a:7a:15:bd:ef:00:8e:15:22:54:17:00:90:26:
+                    93:bc:0e:49:68:91:bf:f8:47:d3:9d:95:42:c1:0e:
+                    4d:df:6f:26:cf:c3:18:21:62:66:43:70:d6:d5:c0:
+                    07:e1
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            Netscape Cert Type: 
+                SSL CA, S/MIME CA, Object Signing CA
+            X509v3 Authority Key Identifier: 
+                keyid:55:E4:81:D1:11:80:BE:D8:89:B9:08:A3:31:F9:A1:24:09:16:B9:70
+
+            X509v3 Subject Key Identifier: 
+                55:E4:81:D1:11:80:BE:D8:89:B9:08:A3:31:F9:A1:24:09:16:B9:70
+            1.2.840.113533.7.65.0: 
+                0...V5.0:4.0....
+    Signature Algorithm: sha1WithRSAEncryption
+        59:47:ac:21:84:8a:17:c9:9c:89:53:1e:ba:80:85:1a:c6:3c:
+        4e:3e:b1:9c:b6:7c:c6:92:5d:18:64:02:e3:d3:06:08:11:61:
+        7c:63:e3:2b:9d:31:03:70:76:d2:a3:28:a0:f4:bb:9a:63:73:
+        ed:6d:e5:2a:db:ed:14:a9:2b:c6:36:11:d0:2b:eb:07:8b:a5:
+        da:9e:5c:19:9d:56:12:f5:54:29:c8:05:ed:b2:12:2a:8d:f4:
+        03:1b:ff:e7:92:10:87:b0:3a:b5:c3:9d:05:37:12:a3:c7:f4:
+        15:b9:d5:a4:39:16:9b:53:3a:23:91:f1:a8:82:a2:6a:88:68:
+        c1:79:02:22:bc:aa:a6:d6:ae:df:b0:14:5f:b8:87:d0:dd:7c:
+        7f:7b:ff:af:1c:cf:e6:db:07:ad:5e:db:85:9d:d0:2b:0d:33:
+        db:04:d1:e6:49:40:13:2b:76:fb:3e:e9:9c:89:0f:15:ce:18:
+        b0:85:78:21:4f:6b:4f:0e:fa:36:67:cd:07:f2:ff:08:d0:e2:
+        de:d9:bf:2a:af:b8:87:86:21:3c:04:ca:b7:94:68:7f:cf:3c:
+        e9:98:d7:38:ff:ec:c0:d9:50:f0:2e:4b:58:ae:46:6f:d0:2e:
+        c3:60:da:72:55:72:bd:4c:45:9e:61:ba:bf:84:81:92:03:d1:
+        d2:69:7c:c5
+
+Entrust.net Secure Personal CA
+==============================
+MD5 Fingerprint: 0C:41:2F:13:5B:A0:54:F5:96:66:2D:7E:CD:0E:03:F4
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIE7TCCBFagAwIBAgIEOAOR7jANBgkqhkiG9w0BAQQFADCByTELMAkGA1UEBhMC
+VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MUgwRgYDVQQLFD93d3cuZW50cnVzdC5u
+ZXQvQ2xpZW50X0NBX0luZm8vQ1BTIGluY29ycC4gYnkgcmVmLiBsaW1pdHMgbGlh
+Yi4xJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
+BAMTKkVudHJ1c3QubmV0IENsaWVudCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
+Fw05OTEwMTIxOTI0MzBaFw0xOTEwMTIxOTU0MzBaMIHJMQswCQYDVQQGEwJVUzEU
+MBIGA1UEChMLRW50cnVzdC5uZXQxSDBGBgNVBAsUP3d3dy5lbnRydXN0Lm5ldC9D
+bGllbnRfQ0FfSW5mby9DUFMgaW5jb3JwLiBieSByZWYuIGxpbWl0cyBsaWFiLjEl
+MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMq
+RW50cnVzdC5uZXQgQ2xpZW50IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0G
+CSqGSIb3DQEBAQUAA4GLADCBhwKBgQDIOpleMRffrCdvkHvkGf9FozTC28GoT/Bo
+6oT9n3V5z8GKUZSvx1cDR2SerYIbWtp/N3hHuzeYEpbOxhN979IMMFGpOZ5V+Pux
+5zDeg7K6PvHViTs7hbqqdCz+PzFur5GVbgbUB01LLFZHGARS2g4Qk79jkJvh34zm
+AqTmT173iwIBA6OCAeAwggHcMBEGCWCGSAGG+EIBAQQEAwIABzCCASIGA1UdHwSC
+ARkwggEVMIHkoIHhoIHepIHbMIHYMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50
+cnVzdC5uZXQxSDBGBgNVBAsUP3d3dy5lbnRydXN0Lm5ldC9DbGllbnRfQ0FfSW5m
+by9DUFMgaW5jb3JwLiBieSByZWYuIGxpbWl0cyBsaWFiLjElMCMGA1UECxMcKGMp
+IDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5uZXQg
+Q2xpZW50IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCyg
+KqAohiZodHRwOi8vd3d3LmVudHJ1c3QubmV0L0NSTC9DbGllbnQxLmNybDArBgNV
+HRAEJDAigA8xOTk5MTAxMjE5MjQzMFqBDzIwMTkxMDEyMTkyNDMwWjALBgNVHQ8E
+BAMCAQYwHwYDVR0jBBgwFoAUxPucKXuXzUyW/O5bs8qZdIuV6kwwHQYDVR0OBBYE
+FMT7nCl7l81MlvzuW7PKmXSLlepMMAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EA
+BAwwChsEVjQuMAMCBJAwDQYJKoZIhvcNAQEEBQADgYEAP66K8ddmAwWePvrqHEa7
+pFuPeJoSSJn59DXeDDYHAmsQOokUgZwxpnyyQbJq5wcBoUv5nyU7lsqZwz6hURzz
+wy5E97BnRqqS5TvaHBkUODDV4qIxJS7x7EU47fgGWANzYrAQMY9Av2TgXD7FTx/a
+EkP/TOYGJqibGapEPHayXOw=
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 939758062 (0x380391ee)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=US, O=Entrust.net, OU=www.entrust.net/Client_CA_Info/CPS incorp. by ref. limits liab., OU=(c) 1999 Entrust.net Limited, CN=Entrust.net Client Certification Authority
+        Validity
+            Not Before: Oct 12 19:24:30 1999 GMT
+            Not After : Oct 12 19:54:30 2019 GMT
+        Subject: C=US, O=Entrust.net, OU=www.entrust.net/Client_CA_Info/CPS incorp. by ref. limits liab., OU=(c) 1999 Entrust.net Limited, CN=Entrust.net Client Certification Authority
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:c8:3a:99:5e:31:17:df:ac:27:6f:90:7b:e4:19:
+                    ff:45:a3:34:c2:db:c1:a8:4f:f0:68:ea:84:fd:9f:
+                    75:79:cf:c1:8a:51:94:af:c7:57:03:47:64:9e:ad:
+                    82:1b:5a:da:7f:37:78:47:bb:37:98:12:96:ce:c6:
+                    13:7d:ef:d2:0c:30:51:a9:39:9e:55:f8:fb:b1:e7:
+                    30:de:83:b2:ba:3e:f1:d5:89:3b:3b:85:ba:aa:74:
+                    2c:fe:3f:31:6e:af:91:95:6e:06:d4:07:4d:4b:2c:
+                    56:47:18:04:52:da:0e:10:93:bf:63:90:9b:e1:df:
+                    8c:e6:02:a4:e6:4f:5e:f7:8b
+                Exponent: 3 (0x3)
+        X509v3 extensions:
+            Netscape Cert Type: 
+                SSL CA, S/MIME CA, Object Signing CA
+            X509v3 CRL Distribution Points: 
+                DirName:/C=US/O=Entrust.net/OU=www.entrust.net/Client_CA_Info/CPS incorp. by ref. limits liab./OU=(c) 1999 Entrust.net Limited/CN=Entrust.net Client Certification Authority/CN=CRL1
+                URI:http://www.entrust.net/CRL/Client1.crl
+
+            X509v3 Private Key Usage Period: 
+                Not Before: Oct 12 19:24:30 1999 GMT, Not After: Oct 12 19:24:30 2019 GMT
+            X509v3 Key Usage: 
+                Certificate Sign, CRL Sign
+            X509v3 Authority Key Identifier: 
+                keyid:C4:FB:9C:29:7B:97:CD:4C:96:FC:EE:5B:B3:CA:99:74:8B:95:EA:4C
+
+            X509v3 Subject Key Identifier: 
+                C4:FB:9C:29:7B:97:CD:4C:96:FC:EE:5B:B3:CA:99:74:8B:95:EA:4C
+            X509v3 Basic Constraints: 
+                CA:TRUE
+            1.2.840.113533.7.65.0: 
+                0
+..V4.0....
+    Signature Algorithm: md5WithRSAEncryption
+        3f:ae:8a:f1:d7:66:03:05:9e:3e:fa:ea:1c:46:bb:a4:5b:8f:
+        78:9a:12:48:99:f9:f4:35:de:0c:36:07:02:6b:10:3a:89:14:
+        81:9c:31:a6:7c:b2:41:b2:6a:e7:07:01:a1:4b:f9:9f:25:3b:
+        96:ca:99:c3:3e:a1:51:1c:f3:c3:2e:44:f7:b0:67:46:aa:92:
+        e5:3b:da:1c:19:14:38:30:d5:e2:a2:31:25:2e:f1:ec:45:38:
+        ed:f8:06:58:03:73:62:b0:10:31:8f:40:bf:64:e0:5c:3e:c5:
+        4f:1f:da:12:43:ff:4c:e6:06:26:a8:9b:19:aa:44:3c:76:b2:
+        5c:ec
+
+Entrust.net Secure Server CA
+============================
+MD5 Fingerprint: DF:F2:80:73:CC:F1:E6:61:73:FC:F5:42:E9:C5:7C:EE
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
+VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u
+ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc
+KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u
+ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05OTA1
+MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIGA1UE
+ChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5j
+b3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF
+bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUg
+U2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUA
+A4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQaO2f55M28Qpku0f1BBc/
+I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5gXpa0zf3
+wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OC
+AdcwggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHb
+oIHYpIHVMIHSMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5
+BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1p
+dHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1pdGVk
+MTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRp
+b24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu
+dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0
+MFqBDzIwMTkwNTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8Bdi
+E1U9s/8KAGv7UISX8+1i0BowHQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAa
+MAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZI
+hvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyNEwr75Ji174z4xRAN
+95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9n9cd
+2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 927650371 (0x374ad243)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=Entrust.net, OU=www.entrust.net/CPS incorp. by ref. (limits liab.), OU=(c) 1999 Entrust.net Limited, CN=Entrust.net Secure Server Certification Authority
+        Validity
+            Not Before: May 25 16:09:40 1999 GMT
+            Not After : May 25 16:39:40 2019 GMT
+        Subject: C=US, O=Entrust.net, OU=www.entrust.net/CPS incorp. by ref. (limits liab.), OU=(c) 1999 Entrust.net Limited, CN=Entrust.net Secure Server Certification Authority
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:cd:28:83:34:54:1b:89:f3:0f:af:37:91:31:ff:
+                    af:31:60:c9:a8:e8:b2:10:68:ed:9f:e7:93:36:f1:
+                    0a:64:bb:47:f5:04:17:3f:23:47:4d:c5:27:19:81:
+                    26:0c:54:72:0d:88:2d:d9:1f:9a:12:9f:bc:b3:71:
+                    d3:80:19:3f:47:66:7b:8c:35:28:d2:b9:0a:df:24:
+                    da:9c:d6:50:79:81:7a:5a:d3:37:f7:c2:4a:d8:29:
+                    92:26:64:d1:e4:98:6c:3a:00:8a:f5:34:9b:65:f8:
+                    ed:e3:10:ff:fd:b8:49:58:dc:a0:de:82:39:6b:81:
+                    b1:16:19:61:b9:54:b6:e6:43
+                Exponent: 3 (0x3)
+        X509v3 extensions:
+            Netscape Cert Type: 
+                SSL CA, S/MIME CA, Object Signing CA
+            X509v3 CRL Distribution Points: 
+                DirName:/C=US/O=Entrust.net/OU=www.entrust.net/CPS incorp. by ref. (limits liab.)/OU=(c) 1999 Entrust.net Limited/CN=Entrust.net Secure Server Certification Authority/CN=CRL1
+                URI:http://www.entrust.net/CRL/net1.crl
+
+            X509v3 Private Key Usage Period: 
+                Not Before: May 25 16:09:40 1999 GMT, Not After: May 25 16:09:40 2019 GMT
+            X509v3 Key Usage: 
+                Certificate Sign, CRL Sign
+            X509v3 Authority Key Identifier: 
+                keyid:F0:17:62:13:55:3D:B3:FF:0A:00:6B:FB:50:84:97:F3:ED:62:D0:1A
+
+            X509v3 Subject Key Identifier: 
+                F0:17:62:13:55:3D:B3:FF:0A:00:6B:FB:50:84:97:F3:ED:62:D0:1A
+            X509v3 Basic Constraints: 
+                CA:TRUE
+            1.2.840.113533.7.65.0: 
+                0
+..V4.0....
+    Signature Algorithm: sha1WithRSAEncryption
+        90:dc:30:02:fa:64:74:c2:a7:0a:a5:7c:21:8d:34:17:a8:fb:
+        47:0e:ff:25:7c:8d:13:0a:fb:e4:98:b5:ef:8c:f8:c5:10:0d:
+        f7:92:be:f1:c3:d5:d5:95:6a:04:bb:2c:ce:26:36:65:c8:31:
+        c6:e7:ee:3f:e3:57:75:84:7a:11:ef:46:4f:18:f4:d3:98:bb:
+        a8:87:32:ba:72:f6:3c:e2:3d:9f:d7:1d:d9:c3:60:43:8c:58:
+        0e:22:96:2f:62:a3:2c:1f:ba:ad:05:ef:ab:32:78:87:a0:54:
+        73:19:b5:5c:05:f9:52:3e:6d:2d:45:0b:f7:0a:93:ea:ed:06:
+        f9:b2
+
+Equifax Premium CA
+==================
+MD5 Fingerprint: A9:E9:A8:9D:0E:73:E3:B1:2F:37:0D:E8:48:3F:86:ED
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDIzCCAoygAwIBAgIENeHvHjANBgkqhkiG9w0BAQUFADBPMQswCQYDVQQGEwJV
+UzEQMA4GA1UEChMHRXF1aWZheDEuMCwGA1UECxMlRXF1aWZheCBQcmVtaXVtIENl
+cnRpZmljYXRlIEF1dGhvcml0eTAeFw05ODA4MjQyMjU0MjNaFw0xODA4MjQyMjU0
+MjNaME8xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFcXVpZmF4MS4wLAYDVQQLEyVF
+cXVpZmF4IFByZW1pdW0gQ2VydGlmaWNhdGUgQXV0aG9yaXR5MIGfMA0GCSqGSIb3
+DQEBAQUAA4GNADCBiQKBgQDOoQaOBswIC8GGqN4g1Q0O0Q3En+pq2bPCMkdAb4qI
+pAm9OCwd5svmpPM269rrvPxkswf2Lbyqzp8ZSGhK/PWiRX4JEPWPs0lcIwY56hOL
+uAvNkR12X9k3oUT7X5DyZ7PNGJlDH3YSawLylYM4Q8L2YjTKyXhdX9LYupr/vhBg
+WwIDAQABo4IBCjCCAQYwcQYDVR0fBGowaDBmoGSgYqRgMF4xCzAJBgNVBAYTAlVT
+MRAwDgYDVQQKEwdFcXVpZmF4MS4wLAYDVQQLEyVFcXVpZmF4IFByZW1pdW0gQ2Vy
+dGlmaWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIw
+MTgwODI0MjI1NDIzWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUFe6yKFmrbuX4
+z4uB9CThrj91G5gwHQYDVR0OBBYEFBXusihZq27l+M+LgfQk4a4/dRuYMAwGA1Ud
+EwQFMAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEB
+BQUAA4GBAL0LnCepA9so3JipS9DRjqeoGlqR4Jzx9xh8LiKeNh/JqLXNRkpu+jUH
+G4YI65/iqPmdQS06rlxctl80BOv8KmCw+3TkhellOJbuFcfGd2MSvYpoH6tsfdrK
+XBPO6snrCVzFc+cSAdXZUwee4A+W8Iu0u0VIn4bFGVWgy5bFA/xI
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 903999262 (0x35e1ef1e)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=Equifax, OU=Equifax Premium Certificate Authority
+        Validity
+            Not Before: Aug 24 22:54:23 1998 GMT
+            Not After : Aug 24 22:54:23 2018 GMT
+        Subject: C=US, O=Equifax, OU=Equifax Premium Certificate Authority
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:ce:a1:06:8e:06:cc:08:0b:c1:86:a8:de:20:d5:
+                    0d:0e:d1:0d:c4:9f:ea:6a:d9:b3:c2:32:47:40:6f:
+                    8a:88:a4:09:bd:38:2c:1d:e6:cb:e6:a4:f3:36:eb:
+                    da:eb:bc:fc:64:b3:07:f6:2d:bc:aa:ce:9f:19:48:
+                    68:4a:fc:f5:a2:45:7e:09:10:f5:8f:b3:49:5c:23:
+                    06:39:ea:13:8b:b8:0b:cd:91:1d:76:5f:d9:37:a1:
+                    44:fb:5f:90:f2:67:b3:cd:18:99:43:1f:76:12:6b:
+                    02:f2:95:83:38:43:c2:f6:62:34:ca:c9:78:5d:5f:
+                    d2:d8:ba:9a:ff:be:10:60:5b
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 CRL Distribution Points: 
+                DirName:/C=US/O=Equifax/OU=Equifax Premium Certificate Authority/CN=CRL1
+
+            X509v3 Private Key Usage Period: 
+                Not After: Aug 24 22:54:23 2018 GMT
+            X509v3 Key Usage: 
+                Certificate Sign, CRL Sign
+            X509v3 Authority Key Identifier: 
+                keyid:15:EE:B2:28:59:AB:6E:E5:F8:CF:8B:81:F4:24:E1:AE:3F:75:1B:98
+
+            X509v3 Subject Key Identifier: 
+                15:EE:B2:28:59:AB:6E:E5:F8:CF:8B:81:F4:24:E1:AE:3F:75:1B:98
+            X509v3 Basic Constraints: 
+                CA:TRUE
+            1.2.840.113533.7.65.0: 
+                0...V3.0c....
+    Signature Algorithm: sha1WithRSAEncryption
+        bd:0b:9c:27:a9:03:db:28:dc:98:a9:4b:d0:d1:8e:a7:a8:1a:
+        5a:91:e0:9c:f1:f7:18:7c:2e:22:9e:36:1f:c9:a8:b5:cd:46:
+        4a:6e:fa:35:07:1b:86:08:eb:9f:e2:a8:f9:9d:41:2d:3a:ae:
+        5c:5c:b6:5f:34:04:eb:fc:2a:60:b0:fb:74:e4:85:e9:65:38:
+        96:ee:15:c7:c6:77:63:12:bd:8a:68:1f:ab:6c:7d:da:ca:5c:
+        13:ce:ea:c9:eb:09:5c:c5:73:e7:12:01:d5:d9:53:07:9e:e0:
+        0f:96:f0:8b:b4:bb:45:48:9f:86:c5:19:55:a0:cb:96:c5:03:
+        fc:48
+
+Equifax Secure CA
+=================
+MD5 Fingerprint: 67:CB:9D:C0:13:24:8A:82:9B:B2:17:1E:D1:1B:EC:D4
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
+UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy
+dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1
+MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx
+dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f
+BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A
+cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC
+AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ
+MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm
+aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw
+ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj
+IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF
+MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
+A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
+7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh
+1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 903804111 (0x35def4cf)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=Equifax, OU=Equifax Secure Certificate Authority
+        Validity
+            Not Before: Aug 22 16:41:51 1998 GMT
+            Not After : Aug 22 16:41:51 2018 GMT
+        Subject: C=US, O=Equifax, OU=Equifax Secure Certificate Authority
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:c1:5d:b1:58:67:08:62:ee:a0:9a:2d:1f:08:6d:
+                    91:14:68:98:0a:1e:fe:da:04:6f:13:84:62:21:c3:
+                    d1:7c:ce:9f:05:e0:b8:01:f0:4e:34:ec:e2:8a:95:
+                    04:64:ac:f1:6b:53:5f:05:b3:cb:67:80:bf:42:02:
+                    8e:fe:dd:01:09:ec:e1:00:14:4f:fc:fb:f0:0c:dd:
+                    43:ba:5b:2b:e1:1f:80:70:99:15:57:93:16:f1:0f:
+                    97:6a:b7:c2:68:23:1c:cc:4d:59:30:ac:51:1e:3b:
+                    af:2b:d6:ee:63:45:7b:c5:d9:5f:50:d2:e3:50:0f:
+                    3a:88:e7:bf:14:fd:e0:c7:b9
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 CRL Distribution Points: 
+                DirName:/C=US/O=Equifax/OU=Equifax Secure Certificate Authority/CN=CRL1
+
+            X509v3 Private Key Usage Period: 
+                Not After: Aug 22 16:41:51 2018 GMT
+            X509v3 Key Usage: 
+                Certificate Sign, CRL Sign
+            X509v3 Authority Key Identifier: 
+                keyid:48:E6:68:F9:2B:D2:B2:95:D7:47:D8:23:20:10:4F:33:98:90:9F:D4
+
+            X509v3 Subject Key Identifier: 
+                48:E6:68:F9:2B:D2:B2:95:D7:47:D8:23:20:10:4F:33:98:90:9F:D4
+            X509v3 Basic Constraints: 
+                CA:TRUE
+            1.2.840.113533.7.65.0: 
+                0...V3.0c....
+    Signature Algorithm: sha1WithRSAEncryption
+        58:ce:29:ea:fc:f7:de:b5:ce:02:b9:17:b5:85:d1:b9:e3:e0:
+        95:cc:25:31:0d:00:a6:92:6e:7f:b6:92:63:9e:50:95:d1:9a:
+        6f:e4:11:de:63:85:6e:98:ee:a8:ff:5a:c8:d3:55:b2:66:71:
+        57:de:c0:21:eb:3d:2a:a7:23:49:01:04:86:42:7b:fc:ee:7f:
+        a2:16:52:b5:67:67:d3:40:db:3b:26:58:b2:28:77:3d:ae:14:
+        77:61:d6:fa:2a:66:27:a0:0d:fa:a7:73:5c:ea:70:f1:94:21:
+        65:44:5f:fa:fc:ef:29:68:a9:a2:87:79:ef:79:ef:4f:ac:07:
+        77:38
+
+GTE CyberTrust Global Root
+==========================
+MD5 Fingerprint: CA:3D:D3:68:F1:03:5C:D0:32:FA:B8:2B:59:E8:5A:DB
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYD
+VQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNv
+bHV0aW9ucywgSW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJv
+b3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEzMjM1OTAwWjB1MQswCQYDVQQGEwJV
+UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU
+cnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEds
+b2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrH
+iM3dFw4usJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTS
+r41tiGeA5u2ylc9yMcqlHHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X4
+04Wqk2kmhXBIgD8SFcd5tB8FLztimQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAG3r
+GwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMWM4ETCJ57NE7fQMh017l9
+3PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OFNMQkpw0P
+lZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number: 421 (0x1a5)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=US, O=GTE Corporation, OU=GTE CyberTrust Solutions, Inc., CN=GTE CyberTrust Global Root
+        Validity
+            Not Before: Aug 13 00:29:00 1998 GMT
+            Not After : Aug 13 23:59:00 2018 GMT
+        Subject: C=US, O=GTE Corporation, OU=GTE CyberTrust Solutions, Inc., CN=GTE CyberTrust Global Root
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:95:0f:a0:b6:f0:50:9c:e8:7a:c7:88:cd:dd:17:
+                    0e:2e:b0:94:d0:1b:3d:0e:f6:94:c0:8a:94:c7:06:
+                    c8:90:97:c8:b8:64:1a:7a:7e:6c:3c:53:e1:37:28:
+                    73:60:7f:b2:97:53:07:9f:53:f9:6d:58:94:d2:af:
+                    8d:6d:88:67:80:e6:ed:b2:95:cf:72:31:ca:a5:1c:
+                    72:ba:5c:02:e7:64:42:e7:f9:a9:2c:d6:3a:0d:ac:
+                    8d:42:aa:24:01:39:e6:9c:3f:01:85:57:0d:58:87:
+                    45:f8:d3:85:aa:93:69:26:85:70:48:80:3f:12:15:
+                    c7:79:b4:1f:05:2f:3b:62:99
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: md5WithRSAEncryption
+        6d:eb:1b:09:e9:5e:d9:51:db:67:22:61:a4:2a:3c:48:77:e3:
+        a0:7c:a6:de:73:a2:14:03:85:3d:fb:ab:0e:30:c5:83:16:33:
+        81:13:08:9e:7b:34:4e:df:40:c8:74:d7:b9:7d:dc:f4:76:55:
+        7d:9b:63:54:18:e9:f0:ea:f3:5c:b1:d9:8b:42:1e:b9:c0:95:
+        4e:ba:fa:d5:e2:7c:f5:68:61:bf:8e:ec:05:97:5f:5b:b0:d7:
+        a3:85:34:c4:24:a7:0d:0f:95:93:ef:cb:94:d8:9e:1f:9d:5c:
+        85:6d:c7:aa:ae:4f:1f:22:b5:cd:95:ad:ba:a7:cc:f9:ab:0b:
+        7a:7f
+
+GTE CyberTrust Japan Root CA
+============================
+MD5 Fingerprint: DE:AB:FF:43:2A:65:37:06:9B:28:B5:7A:E8:84:D3:8E
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIICETCCAXoCAU4wDQYJKoZIhvcNAQEEBQAwUTELMAkGA1UEBhMCSlAxHzAdBgNV
+BAoTFkN5YmVyVHJ1c3QgSmFwYW4sIEluYy4xITAfBgNVBAMTGEN5YmVyVHJ1c3Qg
+SkFQQU4gUm9vdCBDQTAeFw05ODA4MDQwNzU3MDBaFw0wMzA4MDQyMzU5MDBaMFEx
+CzAJBgNVBAYTAkpQMR8wHQYDVQQKExZDeWJlclRydXN0IEphcGFuLCBJbmMuMSEw
+HwYDVQQDExhDeWJlclRydXN0IEpBUEFOIFJvb3QgQ0EwgZ8wDQYJKoZIhvcNAQEB
+BQADgY0AMIGJAoGBALet/MpHEHaJ/Wes5HMGfIFLHda1fA5Hr+ymVHWoxP1lr+fI
+sbFsNDWN97lkVygLIVredP7ceC6GRhJMfxEf3JO9X75mmIa4t+xtSdOQ2eF5AFZo
+uq1sHyw7H8ksjEOwBELqgXOmzjN1RQ2KRXIvqldV5AfDQ+J1Og+8PNCEzrrvAgMB
+AAEwDQYJKoZIhvcNAQEEBQADgYEAt6ZkowyAPBzE2O5BO+WGpJ5gXdYBMqhqZC0g
+cEC6ck5m+gdlTgOOC/1W4K07IKcy+rISHoDfHuN6GMxX2+bJNGDvdesQFtCkLnDY
+JCO4pXdzQvkHOt0BbAiTBzUmECVgKf8J5WSfabkWSfNc3SRjRpMNsFM2dbxIILsZ
+to/QIv0=
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number: 78 (0x4e)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=JP, O=CyberTrust Japan, Inc., CN=CyberTrust JAPAN Root CA
+        Validity
+            Not Before: Aug  4 07:57:00 1998 GMT
+            Not After : Aug  4 23:59:00 2003 GMT
+        Subject: C=JP, O=CyberTrust Japan, Inc., CN=CyberTrust JAPAN Root CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:b7:ad:fc:ca:47:10:76:89:fd:67:ac:e4:73:06:
+                    7c:81:4b:1d:d6:b5:7c:0e:47:af:ec:a6:54:75:a8:
+                    c4:fd:65:af:e7:c8:b1:b1:6c:34:35:8d:f7:b9:64:
+                    57:28:0b:21:5a:de:74:fe:dc:78:2e:86:46:12:4c:
+                    7f:11:1f:dc:93:bd:5f:be:66:98:86:b8:b7:ec:6d:
+                    49:d3:90:d9:e1:79:00:56:68:ba:ad:6c:1f:2c:3b:
+                    1f:c9:2c:8c:43:b0:04:42:ea:81:73:a6:ce:33:75:
+                    45:0d:8a:45:72:2f:aa:57:55:e4:07:c3:43:e2:75:
+                    3a:0f:bc:3c:d0:84:ce:ba:ef
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: md5WithRSAEncryption
+        b7:a6:64:a3:0c:80:3c:1c:c4:d8:ee:41:3b:e5:86:a4:9e:60:
+        5d:d6:01:32:a8:6a:64:2d:20:70:40:ba:72:4e:66:fa:07:65:
+        4e:03:8e:0b:fd:56:e0:ad:3b:20:a7:32:fa:b2:12:1e:80:df:
+        1e:e3:7a:18:cc:57:db:e6:c9:34:60:ef:75:eb:10:16:d0:a4:
+        2e:70:d8:24:23:b8:a5:77:73:42:f9:07:3a:dd:01:6c:08:93:
+        07:35:26:10:25:60:29:ff:09:e5:64:9f:69:b9:16:49:f3:5c:
+        dd:24:63:46:93:0d:b0:53:36:75:bc:48:20:bb:19:b6:8f:d0:
+        22:fd
+
+GTE CyberTrust Japan Secure Server CA
+=====================================
+MD5 Fingerprint: DD:0D:0D:B4:78:4B:7D:CE:30:0A:A6:35:C6:AB:4C:88
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIICIzCCAYwCAU8wDQYJKoZIhvcNAQEEBQAwWjELMAkGA1UEBhMCSlAxHzAdBgNV
+BAoTFkN5YmVyVHJ1c3QgSmFwYW4sIEluYy4xKjAoBgNVBAMTIUN5YmVyVHJ1c3Qg
+SkFQQU4gU2VjdXJlIFNlcnZlciBDQTAeFw05ODA4MDQwODA2MzJaFw0wMzA4MDQy
+MzU5MDBaMFoxCzAJBgNVBAYTAkpQMR8wHQYDVQQKExZDeWJlclRydXN0IEphcGFu
+LCBJbmMuMSowKAYDVQQDEyFDeWJlclRydXN0IEpBUEFOIFNlY3VyZSBTZXJ2ZXIg
+Q0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKwmo6G4b2rALBL52zEFkuf9
++tSBtLjVKtWQ+vBDZfwSFcrs27lh3jNjN0+vADx/kjcbGHPlnzyI8RoTRP558sMm
+lQ8L8J4UByFsV8Jdw+JRsM2LX81fhjj4eZc57Oi/Ui6xXqqprozt7tfIty4xi7Q5
+kjt8gScHGgFEL0lzILbJAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAaB17Eu5aeSkx
+ygGsi1CpJ5ksAPw4Ghz/wtXwE/4bpzn1gBTrUfrAjXuEG1musTVRbqE+1xvsoJ7f
+4KWCluOxP9io8ct5gI738ESZfhT1I6MR42hLBTZuiOOrhqo4UwNCO9O5+eC/BenT
+X8NKp7b9t12QSfiasq1mpoIAk65g/yA=
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number: 79 (0x4f)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=JP, O=CyberTrust Japan, Inc., CN=CyberTrust JAPAN Secure Server CA
+        Validity
+            Not Before: Aug  4 08:06:32 1998 GMT
+            Not After : Aug  4 23:59:00 2003 GMT
+        Subject: C=JP, O=CyberTrust Japan, Inc., CN=CyberTrust JAPAN Secure Server CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:ac:26:a3:a1:b8:6f:6a:c0:2c:12:f9:db:31:05:
+                    92:e7:fd:fa:d4:81:b4:b8:d5:2a:d5:90:fa:f0:43:
+                    65:fc:12:15:ca:ec:db:b9:61:de:33:63:37:4f:af:
+                    00:3c:7f:92:37:1b:18:73:e5:9f:3c:88:f1:1a:13:
+                    44:fe:79:f2:c3:26:95:0f:0b:f0:9e:14:07:21:6c:
+                    57:c2:5d:c3:e2:51:b0:cd:8b:5f:cd:5f:86:38:f8:
+                    79:97:39:ec:e8:bf:52:2e:b1:5e:aa:a9:ae:8c:ed:
+                    ee:d7:c8:b7:2e:31:8b:b4:39:92:3b:7c:81:27:07:
+                    1a:01:44:2f:49:73:20:b6:c9
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: md5WithRSAEncryption
+        68:1d:7b:12:ee:5a:79:29:31:ca:01:ac:8b:50:a9:27:99:2c:
+        00:fc:38:1a:1c:ff:c2:d5:f0:13:fe:1b:a7:39:f5:80:14:eb:
+        51:fa:c0:8d:7b:84:1b:59:ae:b1:35:51:6e:a1:3e:d7:1b:ec:
+        a0:9e:df:e0:a5:82:96:e3:b1:3f:d8:a8:f1:cb:79:80:8e:f7:
+        f0:44:99:7e:14:f5:23:a3:11:e3:68:4b:05:36:6e:88:e3:ab:
+        86:aa:38:53:03:42:3b:d3:b9:f9:e0:bf:05:e9:d3:5f:c3:4a:
+        a7:b6:fd:b7:5d:90:49:f8:9a:b2:ad:66:a6:82:00:93:ae:60:
+        ff:20
+
+GTE CyberTrust Root 2
+=====================
+MD5 Fingerprint: BA:ED:17:57:9A:4B:FF:7C:F9:C9:1F:A2:CD:1A:D6:87
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIICUDCCAbkCAgGbMA0GCSqGSIb3DQEBBAUAMHAxCzAJBgNVBAYTAlVTMRgwFgYD
+VQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNv
+bHV0aW9ucywgSW5jLjEeMBwGA1UEAxMVR1RFIEN5YmVyVHJ1c3QgUm9vdCAyMB4X
+DTk4MDgxMTExMzUwN1oXDTA4MDgxMTExMjIxNlowcDELMAkGA1UEBhMCVVMxGDAW
+BgNVBAoTD0dURSBDb3Jwb3JhdGlvbjEnMCUGA1UECxMeR1RFIEN5YmVyVHJ1c3Qg
+U29sdXRpb25zLCBJbmMuMR4wHAYDVQQDExVHVEUgQ3liZXJUcnVzdCBSb290IDIw
+gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANksTE4vaRoj41a6886EwAnAefFE
+XzMfFZF/iogouCRFzI8YzR900bWPcUzWMfZzloSUQMWpg2Akfa9vNLdLTMIJgDtF
+BJ7EPMQndXsADKFkR7UUXYJLUTpYu0RMPdPlBjjoYVyYeLuAs5zacoJioN+cX+v5
+T3fCzGAYAGs0giWzAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAo2SRbxDt526iQkCU
+eM74FAjR+kOF60bNkhTQ7y4tNjkY2brJJ4gp6UgXb/jBqshhbS39QC11QzCXOfgU
+ZL1v72OoK0LfsloNJex7N9jOkSmCFvnoYqLhdsQCfd0li5jh9g1gjPZZkEBRRNHC
++xkkHhc5a3QhFTPWVdeCHnAsJ6g=
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number: 411 (0x19b)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=US, O=GTE Corporation, OU=GTE CyberTrust Solutions, Inc., CN=GTE CyberTrust Root 2
+        Validity
+            Not Before: Aug 11 11:35:07 1998 GMT
+            Not After : Aug 11 11:22:16 2008 GMT
+        Subject: C=US, O=GTE Corporation, OU=GTE CyberTrust Solutions, Inc., CN=GTE CyberTrust Root 2
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:d9:2c:4c:4e:2f:69:1a:23:e3:56:ba:f3:ce:84:
+                    c0:09:c0:79:f1:44:5f:33:1f:15:91:7f:8a:88:28:
+                    b8:24:45:cc:8f:18:cd:1f:74:d1:b5:8f:71:4c:d6:
+                    31:f6:73:96:84:94:40:c5:a9:83:60:24:7d:af:6f:
+                    34:b7:4b:4c:c2:09:80:3b:45:04:9e:c4:3c:c4:27:
+                    75:7b:00:0c:a1:64:47:b5:14:5d:82:4b:51:3a:58:
+                    bb:44:4c:3d:d3:e5:06:38:e8:61:5c:98:78:bb:80:
+                    b3:9c:da:72:82:62:a0:df:9c:5f:eb:f9:4f:77:c2:
+                    cc:60:18:00:6b:34:82:25:b3
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: md5WithRSAEncryption
+        a3:64:91:6f:10:ed:e7:6e:a2:42:40:94:78:ce:f8:14:08:d1:
+        fa:43:85:eb:46:cd:92:14:d0:ef:2e:2d:36:39:18:d9:ba:c9:
+        27:88:29:e9:48:17:6f:f8:c1:aa:c8:61:6d:2d:fd:40:2d:75:
+        43:30:97:39:f8:14:64:bd:6f:ef:63:a8:2b:42:df:b2:5a:0d:
+        25:ec:7b:37:d8:ce:91:29:82:16:f9:e8:62:a2:e1:76:c4:02:
+        7d:dd:25:8b:98:e1:f6:0d:60:8c:f6:59:90:40:51:44:d1:c2:
+        fb:19:24:1e:17:39:6b:74:21:15:33:d6:55:d7:82:1e:70:2c:
+        27:a8
+
+GTE CyberTrust Root 3
+=====================
+MD5 Fingerprint: DB:81:96:57:AE:64:61:EF:77:A7:83:C4:51:24:3C:87
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIICUDCCAbkCAgGXMA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNVBAYTAlVTMRgwFgYD
+VQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNv
+bHV0aW9ucywgSW5jLjEeMBwGA1UEAxMVR1RFIEN5YmVyVHJ1c3QgUm9vdCAzMB4X
+DTk4MDgxMDE5NTkwOFoXDTA4MDgxMDE5MzYzOVowcDELMAkGA1UEBhMCVVMxGDAW
+BgNVBAoTD0dURSBDb3Jwb3JhdGlvbjEnMCUGA1UECxMeR1RFIEN5YmVyVHJ1c3Qg
+U29sdXRpb25zLCBJbmMuMR4wHAYDVQQDExVHVEUgQ3liZXJUcnVzdCBSb290IDMw
+gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOHzsSsLztwU2TSXYlASVmOETFP6
+wIXP+sHdD955E39T+6oOYN3iYr/G7k6ZNKpoQzWZ+KP982O9AVRqnrI6lix7eCjG
+WrWNGhUY/eOMLqJQCVtx1g21GB8ZjgQpk5N4q18U53NC8gMMV6IbUDsLu1ngoDoD
+7icbWky5sAjKuRqJAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAheutlCAG6bKiazvy
+ZuvjS7gSJgXl9JGo3IfcmPSUwfRhvdWcbFFzlV7QvdfmRdw8z0aE1ee57ORnY24A
+KHdxXUoF6bl8hszCRLveKUja6t29F58dUQGo6BResVf3/9qPzpX+Le0yEnf/fGph
+la4xcgYI8PnzDY7i76hTXZEDg94=
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number: 407 (0x197)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=GTE Corporation, OU=GTE CyberTrust Solutions, Inc., CN=GTE CyberTrust Root 3
+        Validity
+            Not Before: Aug 10 19:59:08 1998 GMT
+            Not After : Aug 10 19:36:39 2008 GMT
+        Subject: C=US, O=GTE Corporation, OU=GTE CyberTrust Solutions, Inc., CN=GTE CyberTrust Root 3
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:e1:f3:b1:2b:0b:ce:dc:14:d9:34:97:62:50:12:
+                    56:63:84:4c:53:fa:c0:85:cf:fa:c1:dd:0f:de:79:
+                    13:7f:53:fb:aa:0e:60:dd:e2:62:bf:c6:ee:4e:99:
+                    34:aa:68:43:35:99:f8:a3:fd:f3:63:bd:01:54:6a:
+                    9e:b2:3a:96:2c:7b:78:28:c6:5a:b5:8d:1a:15:18:
+                    fd:e3:8c:2e:a2:50:09:5b:71:d6:0d:b5:18:1f:19:
+                    8e:04:29:93:93:78:ab:5f:14:e7:73:42:f2:03:0c:
+                    57:a2:1b:50:3b:0b:bb:59:e0:a0:3a:03:ee:27:1b:
+                    5a:4c:b9:b0:08:ca:b9:1a:89
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: sha1WithRSAEncryption
+        85:eb:ad:94:20:06:e9:b2:a2:6b:3b:f2:66:eb:e3:4b:b8:12:
+        26:05:e5:f4:91:a8:dc:87:dc:98:f4:94:c1:f4:61:bd:d5:9c:
+        6c:51:73:95:5e:d0:bd:d7:e6:45:dc:3c:cf:46:84:d5:e7:b9:
+        ec:e4:67:63:6e:00:28:77:71:5d:4a:05:e9:b9:7c:86:cc:c2:
+        44:bb:de:29:48:da:ea:dd:bd:17:9f:1d:51:01:a8:e8:14:5e:
+        b1:57:f7:ff:da:8f:ce:95:fe:2d:ed:32:12:77:ff:7c:6a:61:
+        95:ae:31:72:06:08:f0:f9:f3:0d:8e:e2:ef:a8:53:5d:91:03:
+        83:de
+
+GTE CyberTrust Root 4
+=====================
+MD5 Fingerprint: 33:43:02:B1:B9:E0:73:B1:B1:20:CA:CB:C7:84:03:50
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDVTCCAj0CAgGoMA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNVBAYTAlVTMRgwFgYD
+VQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNv
+bHV0aW9ucywgSW5jLjEeMBwGA1UEAxMVR1RFIEN5YmVyVHJ1c3QgUm9vdCA0MB4X
+DTk4MDgxMzEzNTEwMFoXDTEzMDgxMzIzNTkwMFowcDELMAkGA1UEBhMCVVMxGDAW
+BgNVBAoTD0dURSBDb3Jwb3JhdGlvbjEnMCUGA1UECxMeR1RFIEN5YmVyVHJ1c3Qg
+U29sdXRpb25zLCBJbmMuMR4wHAYDVQQDExVHVEUgQ3liZXJUcnVzdCBSb290IDQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6nSJuf9pmPDlCsaMqb9P3
+vK6sMVrXEZBHuZ0ZLvnzGyKgw+GnusT8XgqUS5haSybkH/Tc8/6OiNxsLXx3hyZQ
+wF5OqCih6hdpT03GAQ7amg0GViYVtqRdejWvje14Uob5OKuzAdPaBZaxtlCrwKGu
+F1P6QzkgcWUj223Etu2YRYPX0vbiqWv7+XXM78WrcZY16N+OkZuoEHUft84Tjmuz
+lneXGpEvxyxpmfAPKmgAmHZEG4wo0uuO9IO0f6QlXmw72cZo1WG41F4xB7VbkDVS
+V3sXIO0tuB6OiDk+Usvf8FyxZbulErSQY79xnTLB2r9QSpW+BjrEK+vNmHZETQvl
+AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEOvHIfJSbpliTRJPOoHO0eiedSgO5Bs
+3n+oVMPoTEAyvMjsHOXZrEC6/Iw/wnOc9GTq36ntTlvIAWDuOW1DJ/N/qgjS/k5v
+FDJNfeQ0gKU1xNZGULQ7oC1lH09lfjQoLcCndn0xyQ0zFvYgGSARULsDzHBtlrfv
+TKfaNhXPu03UltyITWyY7blz/ihXoO1k+AqBKXP29pcyhzm0ge/ZTRoHNPe6QjXe
+V9xc1vfF6wonDIGmwtBoTv2SW0iD9haKjzZb7TFsP0F6cfeSPzGkCkBM84biYcE8
+SYEtpbjvupcPvCsdm4ny0o4eTYbywqv2LZnAGyoNobZP+SxYTT19Nwo=
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number: 424 (0x1a8)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=GTE Corporation, OU=GTE CyberTrust Solutions, Inc., CN=GTE CyberTrust Root 4
+        Validity
+            Not Before: Aug 13 13:51:00 1998 GMT
+            Not After : Aug 13 23:59:00 2013 GMT
+        Subject: C=US, O=GTE Corporation, OU=GTE CyberTrust Solutions, Inc., CN=GTE CyberTrust Root 4
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:ba:9d:22:6e:7f:da:66:3c:39:42:b1:a3:2a:6f:
+                    d3:f7:bc:ae:ac:31:5a:d7:11:90:47:b9:9d:19:2e:
+                    f9:f3:1b:22:a0:c3:e1:a7:ba:c4:fc:5e:0a:94:4b:
+                    98:5a:4b:26:e4:1f:f4:dc:f3:fe:8e:88:dc:6c:2d:
+                    7c:77:87:26:50:c0:5e:4e:a8:28:a1:ea:17:69:4f:
+                    4d:c6:01:0e:da:9a:0d:06:56:26:15:b6:a4:5d:7a:
+                    35:af:8d:ed:78:52:86:f9:38:ab:b3:01:d3:da:05:
+                    96:b1:b6:50:ab:c0:a1:ae:17:53:fa:43:39:20:71:
+                    65:23:db:6d:c4:b6:ed:98:45:83:d7:d2:f6:e2:a9:
+                    6b:fb:f9:75:cc:ef:c5:ab:71:96:35:e8:df:8e:91:
+                    9b:a8:10:75:1f:b7:ce:13:8e:6b:b3:96:77:97:1a:
+                    91:2f:c7:2c:69:99:f0:0f:2a:68:00:98:76:44:1b:
+                    8c:28:d2:eb:8e:f4:83:b4:7f:a4:25:5e:6c:3b:d9:
+                    c6:68:d5:61:b8:d4:5e:31:07:b5:5b:90:35:52:57:
+                    7b:17:20:ed:2d:b8:1e:8e:88:39:3e:52:cb:df:f0:
+                    5c:b1:65:bb:a5:12:b4:90:63:bf:71:9d:32:c1:da:
+                    bf:50:4a:95:be:06:3a:c4:2b:eb:cd:98:76:44:4d:
+                    0b:e5
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: sha1WithRSAEncryption
+        43:af:1c:87:c9:49:ba:65:89:34:49:3c:ea:07:3b:47:a2:79:
+        d4:a0:3b:90:6c:de:7f:a8:54:c3:e8:4c:40:32:bc:c8:ec:1c:
+        e5:d9:ac:40:ba:fc:8c:3f:c2:73:9c:f4:64:ea:df:a9:ed:4e:
+        5b:c8:01:60:ee:39:6d:43:27:f3:7f:aa:08:d2:fe:4e:6f:14:
+        32:4d:7d:e4:34:80:a5:35:c4:d6:46:50:b4:3b:a0:2d:65:1f:
+        4f:65:7e:34:28:2d:c0:a7:76:7d:31:c9:0d:33:16:f6:20:19:
+        20:11:50:bb:03:cc:70:6d:96:b7:ef:4c:a7:da:36:15:cf:bb:
+        4d:d4:96:dc:88:4d:6c:98:ed:b9:73:fe:28:57:a0:ed:64:f8:
+        0a:81:29:73:f6:f6:97:32:87:39:b4:81:ef:d9:4d:1a:07:34:
+        f7:ba:42:35:de:57:dc:5c:d6:f7:c5:eb:0a:27:0c:81:a6:c2:
+        d0:68:4e:fd:92:5b:48:83:f6:16:8a:8f:36:5b:ed:31:6c:3f:
+        41:7a:71:f7:92:3f:31:a4:0a:40:4c:f3:86:e2:61:c1:3c:49:
+        81:2d:a5:b8:ef:ba:97:0f:bc:2b:1d:9b:89:f2:d2:8e:1e:4d:
+        86:f2:c2:ab:f6:2d:99:c0:1b:2a:0d:a1:b6:4f:f9:2c:58:4d:
+        3d:7d:37:0a
+
+GTE CyberTrust Root 5
+=====================
+MD5 Fingerprint: 7D:6C:86:E4:FC:4D:D1:0B:00:BA:22:BB:4E:7C:6A:8E
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDtjCCAp6gAwIBAgICAbYwDQYJKoZIhvcNAQEFBQAwcDELMAkGA1UEBhMCVVMx
+GDAWBgNVBAoTD0dURSBDb3Jwb3JhdGlvbjEnMCUGA1UECxMeR1RFIEN5YmVyVHJ1
+c3QgU29sdXRpb25zLCBJbmMuMR4wHAYDVQQDExVHVEUgQ3liZXJUcnVzdCBSb290
+IDUwHhcNOTgwODE0MTQ1MDAwWhcNMTMwODE0MjM1OTAwWjBwMQswCQYDVQQGEwJV
+UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU
+cnVzdCBTb2x1dGlvbnMsIEluYy4xHjAcBgNVBAMTFUdURSBDeWJlclRydXN0IFJv
+b3QgNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALwSbj+KfHqXAewe
+uzlaAvR4RKJIG457SVJ6uHtHs6+Um2+7lvoramVcuByUc76/iQoigO5X/IwFu3Cf
+lzkE2qOHXKjlyq/AM5rVN1xLrOSA0KYjYPv9ci6UncfOwgQy73hgXe2thw9FZR48
+mgqavl0dmezn8tHGehfZrZtUln/EfGC/haoVNR1A2hG87FQhKC0joajwzy3N3fx+
+D17hZQdWywe00lboXjHMGGPEhtIthc+Tkqtt/mg5+95zvYb45EZ66p8My/QZ/mO8
+0Sx7iDM29uThnAxTgWAc2i6rlqkWiBNQmbK9Vd8VMH7o5Zj7cH5stQf8/Ea30O03
+ln4y/iECAwEAAaNaMFgwEgYDVR0TAQH/BAgwBgEB/wIBBTAOBgNVHQ8BAf8EBAMC
+AQYwFwYDVR0gBBAwDjAMBgoqhkiG+GMBAgEDMBkGA1UdDgQSBBB2CkkhOEyf3vjE
+ScdxcZGdMA0GCSqGSIb3DQEBBQUAA4IBAQBBOtQYW9q43iEc4Y4J5fFoNP/elvQH
+9ac886xKsZv6kvqb7eYyIapKdsXcTzjl39WG5NXIdn2Y17HNj021kSNsi4rr6nzv
+FJTExvAfSi0ycWMrY5EmAgm2gB3t4sy4f9uHY8jh0GwmsTUdQGYQG82VVBgzYewT
+T9oT95mvPtDPjqZyorPDBZrJJ32SzH5SjbOrcG2eiZ9N6xp1wpiq1QIW1wyKvyXk
+6y28mOlYOBl8uTf+2+KZCHMGx5eDan0QAS8yuRcFSmXmL86+XlOmgumaUwqEdC2D
+ysiUFnZflGEo8IWnObvXi9moshMdVAk0JH0ggX1mfqKQdFwQxr3sqxvC
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 438 (0x1b6)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=GTE Corporation, OU=GTE CyberTrust Solutions, Inc., CN=GTE CyberTrust Root 5
+        Validity
+            Not Before: Aug 14 14:50:00 1998 GMT
+            Not After : Aug 14 23:59:00 2013 GMT
+        Subject: C=US, O=GTE Corporation, OU=GTE CyberTrust Solutions, Inc., CN=GTE CyberTrust Root 5
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:bc:12:6e:3f:8a:7c:7a:97:01:ec:1e:bb:39:5a:
+                    02:f4:78:44:a2:48:1b:8e:7b:49:52:7a:b8:7b:47:
+                    b3:af:94:9b:6f:bb:96:fa:2b:6a:65:5c:b8:1c:94:
+                    73:be:bf:89:0a:22:80:ee:57:fc:8c:05:bb:70:9f:
+                    97:39:04:da:a3:87:5c:a8:e5:ca:af:c0:33:9a:d5:
+                    37:5c:4b:ac:e4:80:d0:a6:23:60:fb:fd:72:2e:94:
+                    9d:c7:ce:c2:04:32:ef:78:60:5d:ed:ad:87:0f:45:
+                    65:1e:3c:9a:0a:9a:be:5d:1d:99:ec:e7:f2:d1:c6:
+                    7a:17:d9:ad:9b:54:96:7f:c4:7c:60:bf:85:aa:15:
+                    35:1d:40:da:11:bc:ec:54:21:28:2d:23:a1:a8:f0:
+                    cf:2d:cd:dd:fc:7e:0f:5e:e1:65:07:56:cb:07:b4:
+                    d2:56:e8:5e:31:cc:18:63:c4:86:d2:2d:85:cf:93:
+                    92:ab:6d:fe:68:39:fb:de:73:bd:86:f8:e4:46:7a:
+                    ea:9f:0c:cb:f4:19:fe:63:bc:d1:2c:7b:88:33:36:
+                    f6:e4:e1:9c:0c:53:81:60:1c:da:2e:ab:96:a9:16:
+                    88:13:50:99:b2:bd:55:df:15:30:7e:e8:e5:98:fb:
+                    70:7e:6c:b5:07:fc:fc:46:b7:d0:ed:37:96:7e:32:
+                    fe:21
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE, pathlen:5
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Certificate Policies: 
+                Policy: 1.2.840.113763.1.2.1.3
+
+            X509v3 Subject Key Identifier: 
+                76:0A:49:21:38:4C:9F:DE:F8:C4:49:C7:71:71:91:9D
+    Signature Algorithm: sha1WithRSAEncryption
+        41:3a:d4:18:5b:da:b8:de:21:1c:e1:8e:09:e5:f1:68:34:ff:
+        de:96:f4:07:f5:a7:3c:f3:ac:4a:b1:9b:fa:92:fa:9b:ed:e6:
+        32:21:aa:4a:76:c5:dc:4f:38:e5:df:d5:86:e4:d5:c8:76:7d:
+        98:d7:b1:cd:8f:4d:b5:91:23:6c:8b:8a:eb:ea:7c:ef:14:94:
+        c4:c6:f0:1f:4a:2d:32:71:63:2b:63:91:26:02:09:b6:80:1d:
+        ed:e2:cc:b8:7f:db:87:63:c8:e1:d0:6c:26:b1:35:1d:40:66:
+        10:1b:cd:95:54:18:33:61:ec:13:4f:da:13:f7:99:af:3e:d0:
+        cf:8e:a6:72:a2:b3:c3:05:9a:c9:27:7d:92:cc:7e:52:8d:b3:
+        ab:70:6d:9e:89:9f:4d:eb:1a:75:c2:98:aa:d5:02:16:d7:0c:
+        8a:bf:25:e4:eb:2d:bc:98:e9:58:38:19:7c:b9:37:fe:db:e2:
+        99:08:73:06:c7:97:83:6a:7d:10:01:2f:32:b9:17:05:4a:65:
+        e6:2f:ce:be:5e:53:a6:82:e9:9a:53:0a:84:74:2d:83:ca:c8:
+        94:16:76:5f:94:61:28:f0:85:a7:39:bb:d7:8b:d9:a8:b2:13:
+        1d:54:09:34:24:7d:20:81:7d:66:7e:a2:90:74:5c:10:c6:bd:
+        ec:ab:1b:c2
+
+GTE CyberTrust Root CA
+======================
+MD5 Fingerprint: C4:D7:F0:B2:A3:C5:7D:61:67:F0:04:CD:43:D3:BA:58
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIB+jCCAWMCAgGjMA0GCSqGSIb3DQEBBAUAMEUxCzAJBgNVBAYTAlVTMRgwFgYD
+VQQKEw9HVEUgQ29ycG9yYXRpb24xHDAaBgNVBAMTE0dURSBDeWJlclRydXN0IFJv
+b3QwHhcNOTYwMjIzMjMwMTAwWhcNMDYwMjIzMjM1OTAwWjBFMQswCQYDVQQGEwJV
+UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMRwwGgYDVQQDExNHVEUgQ3liZXJU
+cnVzdCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC45k+625h8cXyv
+RLfTD0bZZOWTwUKOx7pJjTUteueLveUFMVnGsS8KDPufpz+iCWaEVh43KRuH6X4M
+ypqfpX/1FZSj1aJGgthoTNE3FQZor734sLPwKfWVWgkWYXcKIiXUT0Wqx73llt/5
+1KiOQswkwB6RJ0q1bQaAYznEol44AwIDAQABMA0GCSqGSIb3DQEBBAUAA4GBABKz
+dcZfHeFhVYAA1IFLezEPI2PnPfMD+fQ2qLvZ46WXTeorKeDWanOB5sCJo9Px4KWl
+IjeaY8JIILTbcuPI9tl8vrGvU9oUtCG41tWW4/5ODFlitppK+ULdjG+BqXH/9Apy
+bW1EDp3zdHSo1TRJ6V6e6bR64eVaH4QwnNOfpSXY
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number: 419 (0x1a3)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=US, O=GTE Corporation, CN=GTE CyberTrust Root
+        Validity
+            Not Before: Feb 23 23:01:00 1996 GMT
+            Not After : Feb 23 23:59:00 2006 GMT
+        Subject: C=US, O=GTE Corporation, CN=GTE CyberTrust Root
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:b8:e6:4f:ba:db:98:7c:71:7c:af:44:b7:d3:0f:
+                    46:d9:64:e5:93:c1:42:8e:c7:ba:49:8d:35:2d:7a:
+                    e7:8b:bd:e5:05:31:59:c6:b1:2f:0a:0c:fb:9f:a7:
+                    3f:a2:09:66:84:56:1e:37:29:1b:87:e9:7e:0c:ca:
+                    9a:9f:a5:7f:f5:15:94:a3:d5:a2:46:82:d8:68:4c:
+                    d1:37:15:06:68:af:bd:f8:b0:b3:f0:29:f5:95:5a:
+                    09:16:61:77:0a:22:25:d4:4f:45:aa:c7:bd:e5:96:
+                    df:f9:d4:a8:8e:42:cc:24:c0:1e:91:27:4a:b5:6d:
+                    06:80:63:39:c4:a2:5e:38:03
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: md5WithRSAEncryption
+        12:b3:75:c6:5f:1d:e1:61:55:80:00:d4:81:4b:7b:31:0f:23:
+        63:e7:3d:f3:03:f9:f4:36:a8:bb:d9:e3:a5:97:4d:ea:2b:29:
+        e0:d6:6a:73:81:e6:c0:89:a3:d3:f1:e0:a5:a5:22:37:9a:63:
+        c2:48:20:b4:db:72:e3:c8:f6:d9:7c:be:b1:af:53:da:14:b4:
+        21:b8:d6:d5:96:e3:fe:4e:0c:59:62:b6:9a:4a:f9:42:dd:8c:
+        6f:81:a9:71:ff:f4:0a:72:6d:6d:44:0e:9d:f3:74:74:a8:d5:
+        34:49:e9:5e:9e:e9:b4:7a:e1:e5:5a:1f:84:30:9c:d3:9f:a5:
+        25:d8
+
+GlobalSign Partners CA
+======================
+MD5 Fingerprint: 3C:75:CD:4C:BD:A9:D0:8A:79:4F:50:16:37:84:F4:2B
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDnjCCAoagAwIBAgILAgAAAAAA1ni50a8wDQYJKoZIhvcNAQEEBQAwVzELMAkG
+A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
+b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05OTAxMjgxMjAw
+MDBaFw0wOTAxMjgxMjAwMDBaMF8xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
+YWxTaWduIG52LXNhMRQwEgYDVQQLEwtQYXJ0bmVycyBDQTEfMB0GA1UEAxMWR2xv
+YmFsU2lnbiBQYXJ0bmVycyBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBANIs+DKsShJ6N8gpkaWujG4eDsA0M4jlM3EWHHiEaMMYNFAuFj6xlIJPsZqf
+APjGETXGaXuYAq0ABohs50wzKACIJ0Yfh7NxdWO8MruI3mYYDlAGk7T2vBQ3MD0i
+3z3/dX7ZChrFn7P80KyzCHqJ0wHoAFznSgs9TXsmordiBovaRt2TFz8/WwJLC7aI
+IBGSAK27xy7U40Wu9YlafI2krYVkMsAnjMbyioCShiRWWY10aKKDQrOePVBBhm8g
+bvb9ztMZ4zLMj+2aXm0fKPVSrG4YXvg90ZLlumwBiEsK8i3eZTMFQqBMqjF2vv2/
+gXj5cRxGXi0VlS0wWY5MQdFiqz0CAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgAGMB0G
+A1UdDgQWBBRDJI1wFQhiVZxPDEAXXYZeD6JM+zAfBgNVHSMEGDAWgBRge2YaRQ2X
+yolQL30EzTSo//z9SzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IB
+AQBm7bSIaRGZgiGDrKFti5uErQ8tyB6Mynt+rarUjt4H1p5Fx6W4nAc5YCVVGsBP
+GeXPFylJiRg1ZuXrKEBOV8mvs+S4IAWjO5VQkUmUKX0s5YhBpUWIXp2CJ/fS71u1
+T5++/jVlLFVkn+FR2iJhd7pYTo/GeVlZbjCAok+QbiELrdBoOZAQm+0iZW8eETjm
+f4zS8zltR9Uh6Op1OkHRrfYWnV0LIb3zH2MGJR3BHzVxLOsgGdXBsOw95W/tAgc/
+E3tmktZEwZj3X1CLelvCb22w0fjldKBAN6MlD+Q9ymQxk5BcMHu5OTGaXkzNuUFP
+UOQ9OK7IZtnHO11RR6ybq/Kt
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            02:00:00:00:00:00:d6:78:b9:d1:af
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=BE, O=GlobalSign nv-sa, OU=Root CA, CN=GlobalSign Root CA
+        Validity
+            Not Before: Jan 28 12:00:00 1999 GMT
+            Not After : Jan 28 12:00:00 2009 GMT
+        Subject: C=BE, O=GlobalSign nv-sa, OU=Partners CA, CN=GlobalSign Partners CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:d2:2c:f8:32:ac:4a:12:7a:37:c8:29:91:a5:ae:
+                    8c:6e:1e:0e:c0:34:33:88:e5:33:71:16:1c:78:84:
+                    68:c3:18:34:50:2e:16:3e:b1:94:82:4f:b1:9a:9f:
+                    00:f8:c6:11:35:c6:69:7b:98:02:ad:00:06:88:6c:
+                    e7:4c:33:28:00:88:27:46:1f:87:b3:71:75:63:bc:
+                    32:bb:88:de:66:18:0e:50:06:93:b4:f6:bc:14:37:
+                    30:3d:22:df:3d:ff:75:7e:d9:0a:1a:c5:9f:b3:fc:
+                    d0:ac:b3:08:7a:89:d3:01:e8:00:5c:e7:4a:0b:3d:
+                    4d:7b:26:a2:b7:62:06:8b:da:46:dd:93:17:3f:3f:
+                    5b:02:4b:0b:b6:88:20:11:92:00:ad:bb:c7:2e:d4:
+                    e3:45:ae:f5:89:5a:7c:8d:a4:ad:85:64:32:c0:27:
+                    8c:c6:f2:8a:80:92:86:24:56:59:8d:74:68:a2:83:
+                    42:b3:9e:3d:50:41:86:6f:20:6e:f6:fd:ce:d3:19:
+                    e3:32:cc:8f:ed:9a:5e:6d:1f:28:f5:52:ac:6e:18:
+                    5e:f8:3d:d1:92:e5:ba:6c:01:88:4b:0a:f2:2d:de:
+                    65:33:05:42:a0:4c:aa:31:76:be:fd:bf:81:78:f9:
+                    71:1c:46:5e:2d:15:95:2d:30:59:8e:4c:41:d1:62:
+                    ab:3d
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Subject Key Identifier: 
+                43:24:8D:70:15:08:62:55:9C:4F:0C:40:17:5D:86:5E:0F:A2:4C:FB
+            X509v3 Authority Key Identifier: 
+                keyid:60:7B:66:1A:45:0D:97:CA:89:50:2F:7D:04:CD:34:A8:FF:FC:FD:4B
+
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: md5WithRSAEncryption
+        66:ed:b4:88:69:11:99:82:21:83:ac:a1:6d:8b:9b:84:ad:0f:
+        2d:c8:1e:8c:ca:7b:7e:ad:aa:d4:8e:de:07:d6:9e:45:c7:a5:
+        b8:9c:07:39:60:25:55:1a:c0:4f:19:e5:cf:17:29:49:89:18:
+        35:66:e5:eb:28:40:4e:57:c9:af:b3:e4:b8:20:05:a3:3b:95:
+        50:91:49:94:29:7d:2c:e5:88:41:a5:45:88:5e:9d:82:27:f7:
+        d2:ef:5b:b5:4f:9f:be:fe:35:65:2c:55:64:9f:e1:51:da:22:
+        61:77:ba:58:4e:8f:c6:79:59:59:6e:30:80:a2:4f:90:6e:21:
+        0b:ad:d0:68:39:90:10:9b:ed:22:65:6f:1e:11:38:e6:7f:8c:
+        d2:f3:39:6d:47:d5:21:e8:ea:75:3a:41:d1:ad:f6:16:9d:5d:
+        0b:21:bd:f3:1f:63:06:25:1d:c1:1f:35:71:2c:eb:20:19:d5:
+        c1:b0:ec:3d:e5:6f:ed:02:07:3f:13:7b:66:92:d6:44:c1:98:
+        f7:5f:50:8b:7a:5b:c2:6f:6d:b0:d1:f8:e5:74:a0:40:37:a3:
+        25:0f:e4:3d:ca:64:31:93:90:5c:30:7b:b9:39:31:9a:5e:4c:
+        cd:b9:41:4f:50:e4:3d:38:ae:c8:66:d9:c7:3b:5d:51:47:ac:
+        9b:ab:f2:ad
+
+GlobalSign Primary Class 1 CA
+=============================
+MD5 Fingerprint: 5C:AC:59:01:A4:86:53:CB:10:66:B5:D6:D6:71:FF:01
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDrDCCApSgAwIBAgILAgAAAAAA1ni4N88wDQYJKoZIhvcNAQEEBQAwVzELMAkG
+A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
+b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MTUxMjAw
+MDBaFw0wOTAxMjgxMjAwMDBaMG0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
+YWxTaWduIG52LXNhMRswGQYDVQQLExJQcmltYXJ5IENsYXNzIDEgQ0ExJjAkBgNV
+BAMTHUdsb2JhbFNpZ24gUHJpbWFyeSBDbGFzcyAxIENBMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAvSA1R9Eo1gijEjkjRw29cCFSDlcxlaY0V2vsfkN5
+wwZSSM28taGZvdgfMrzP125ybS53IpCCTkuPmgwBQprZcFm2nR/mY9EMrR1O+IWB
++a7vn6ZSYUR5GnVF4GFWRW1CjD1yy6akErea9dZg0GBQs46mpuy09BLNf6jO77Ph
+hTD+csTm53eznlhB1lGDiAfGtmlPNt7RC0g/vdafIXRkbycGPkv9Dqabv6RIV4yQ
+7okYCwKBGL5n/lNgiCe6o3M0S1pWtN5zBe2Yll3sSudA/EsJYuvQ4zFPhdF6q1ln
+K/uID+uqg701/WEn7GYOQlf3acIM7/xqwm5J2o9BOK5IqQIDAQABo2MwYTAOBgNV
+HQ8BAf8EBAMCAAYwHQYDVR0OBBYEFPzgZvZaNZnrQB7SuB5DvJiOH4rDMB8GA1Ud
+IwQYMBaAFGB7ZhpFDZfKiVAvfQTNNKj//P1LMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
+KoZIhvcNAQEEBQADggEBAJujCETO8pCdcfMyswVqterPKZjeVT6gFn0GekTWr9L6
+E1iM+BzHqx20G+9paJhcCDmP4Pf7SMwh57gz2wWqNCRsSuXpe2Deg7MfCr5BdfzM
+MEi3wSYdBDOqtnjtKsu6VpcybvcxlS5G8hTuJ8f3Yom5XFrTOIpk9Te08bM0ctXV
+IT1L13iT1zFmNR6j2EdJbxyt4YB/+JgkbHOsDsIadwKjJge3x2tdvILVKkgdY89Q
+Mqb7HBhHFQpbDFw4JJoEmKgISF98NIdjqy2NTAB3lBt2uvUWGKMVry+U9ikAdsEV
+F9PpN0121MtLKVkkrNpKoOpj3l9Usfrz0UXLxWS0cyE=
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            02:00:00:00:00:00:d6:78:b8:37:cf
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=BE, O=GlobalSign nv-sa, OU=Root CA, CN=GlobalSign Root CA
+        Validity
+            Not Before: Sep 15 12:00:00 1998 GMT
+            Not After : Jan 28 12:00:00 2009 GMT
+        Subject: C=BE, O=GlobalSign nv-sa, OU=Primary Class 1 CA, CN=GlobalSign Primary Class 1 CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:bd:20:35:47:d1:28:d6:08:a3:12:39:23:47:0d:
+                    bd:70:21:52:0e:57:31:95:a6:34:57:6b:ec:7e:43:
+                    79:c3:06:52:48:cd:bc:b5:a1:99:bd:d8:1f:32:bc:
+                    cf:d7:6e:72:6d:2e:77:22:90:82:4e:4b:8f:9a:0c:
+                    01:42:9a:d9:70:59:b6:9d:1f:e6:63:d1:0c:ad:1d:
+                    4e:f8:85:81:f9:ae:ef:9f:a6:52:61:44:79:1a:75:
+                    45:e0:61:56:45:6d:42:8c:3d:72:cb:a6:a4:12:b7:
+                    9a:f5:d6:60:d0:60:50:b3:8e:a6:a6:ec:b4:f4:12:
+                    cd:7f:a8:ce:ef:b3:e1:85:30:fe:72:c4:e6:e7:77:
+                    b3:9e:58:41:d6:51:83:88:07:c6:b6:69:4f:36:de:
+                    d1:0b:48:3f:bd:d6:9f:21:74:64:6f:27:06:3e:4b:
+                    fd:0e:a6:9b:bf:a4:48:57:8c:90:ee:89:18:0b:02:
+                    81:18:be:67:fe:53:60:88:27:ba:a3:73:34:4b:5a:
+                    56:b4:de:73:05:ed:98:96:5d:ec:4a:e7:40:fc:4b:
+                    09:62:eb:d0:e3:31:4f:85:d1:7a:ab:59:67:2b:fb:
+                    88:0f:eb:aa:83:bd:35:fd:61:27:ec:66:0e:42:57:
+                    f7:69:c2:0c:ef:fc:6a:c2:6e:49:da:8f:41:38:ae:
+                    48:a9
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Subject Key Identifier: 
+                FC:E0:66:F6:5A:35:99:EB:40:1E:D2:B8:1E:43:BC:98:8E:1F:8A:C3
+            X509v3 Authority Key Identifier: 
+                keyid:60:7B:66:1A:45:0D:97:CA:89:50:2F:7D:04:CD:34:A8:FF:FC:FD:4B
+
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: md5WithRSAEncryption
+        9b:a3:08:44:ce:f2:90:9d:71:f3:32:b3:05:6a:b5:ea:cf:29:
+        98:de:55:3e:a0:16:7d:06:7a:44:d6:af:d2:fa:13:58:8c:f8:
+        1c:c7:ab:1d:b4:1b:ef:69:68:98:5c:08:39:8f:e0:f7:fb:48:
+        cc:21:e7:b8:33:db:05:aa:34:24:6c:4a:e5:e9:7b:60:de:83:
+        b3:1f:0a:be:41:75:fc:cc:30:48:b7:c1:26:1d:04:33:aa:b6:
+        78:ed:2a:cb:ba:56:97:32:6e:f7:31:95:2e:46:f2:14:ee:27:
+        c7:f7:62:89:b9:5c:5a:d3:38:8a:64:f5:37:b4:f1:b3:34:72:
+        d5:d5:21:3d:4b:d7:78:93:d7:31:66:35:1e:a3:d8:47:49:6f:
+        1c:ad:e1:80:7f:f8:98:24:6c:73:ac:0e:c2:1a:77:02:a3:26:
+        07:b7:c7:6b:5d:bc:82:d5:2a:48:1d:63:cf:50:32:a6:fb:1c:
+        18:47:15:0a:5b:0c:5c:38:24:9a:04:98:a8:08:48:5f:7c:34:
+        87:63:ab:2d:8d:4c:00:77:94:1b:76:ba:f5:16:18:a3:15:af:
+        2f:94:f6:29:00:76:c1:15:17:d3:e9:37:4d:76:d4:cb:4b:29:
+        59:24:ac:da:4a:a0:ea:63:de:5f:54:b1:fa:f3:d1:45:cb:c5:
+        64:b4:73:21
+
+GlobalSign Primary Class 2 CA
+=============================
+MD5 Fingerprint: A9:A9:42:59:7E:BE:5A:94:E4:2C:C6:8B:1C:2A:44:B6
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDrDCCApSgAwIBAgILAgAAAAAA1ni4jY0wDQYJKoZIhvcNAQEEBQAwVzELMAkG
+A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
+b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05OTAxMjgxMjAw
+MDBaFw0wOTAxMjgxMjAwMDBaMG0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
+YWxTaWduIG52LXNhMRswGQYDVQQLExJQcmltYXJ5IENsYXNzIDIgQ0ExJjAkBgNV
+BAMTHUdsb2JhbFNpZ24gUHJpbWFyeSBDbGFzcyAyIENBMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAkoz+7/RFjhdBbvzYvyFvqwadUsEsAJ0/joW4f0qP
+vaBjKspJJ65agvR04lWS/8LRqnmitvrVnYIET8ayxl5jpzq62O7rim+ftrsoQcAi
++05IGgaS17/Xz7nZvThPOw1EblVB/vwJ29i/844h8egStfYTpdPGTJMisAL/7h0M
+xKhrT3VoVujcKBJQ96gknS4kOfsJBd7lo2RJIdBofnEwkbFg4Dn0UPh6TZgAa3x5
+uk7OSuK6Nh23xTYVlZxkQupfxLr1QAW+4TpZvYSnGbjeTVNQzgfR0lHT7w2BbObn
+bctdfD98zOxPgycl/3BQ9oNZdYQGZlgs3omNAKZJ+aVDdwIDAQABo2MwYTAOBgNV
+HQ8BAf8EBAMCAAYwHQYDVR0OBBYEFHznsrEs3rGna+l2DOGj/U5sx7n2MB8GA1Ud
+IwQYMBaAFGB7ZhpFDZfKiVAvfQTNNKj//P1LMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
+KoZIhvcNAQEEBQADggEBAGPdWc6KeaqYnU7FiWQ3foqTZy8Q6m8nw413bfJcVpQZ
+GmlgMEZdj/JtRTyONZd8L7hR4uiJvYjPJxwINFyIwWgk25GF5M/7+0ON6CUBG8QO
+9wBCSIYfJAhYWoyN8mtHLGiRsWlC/Q2NySbmkoamZG6Sxc4+PH1x4yOkq8fVqKnf
+gqc76IbVw08Y40TQ4NzzxWgu/qUvBYTIfkdCU2uHSv4y/14+cIy3qBXMF8L/RuzQ
+7C20bhIoqflA6evUZpdTqWlVwKmqsi7N0Wn0vvi7fGnuVKbbnvtapj7+mu+UUUt1
+7tjU4ZrxAlYTiQ6nQouWi4UMG4W+Jq6rppm8IvFz30I=
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            02:00:00:00:00:00:d6:78:b8:8d:8d
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=BE, O=GlobalSign nv-sa, OU=Root CA, CN=GlobalSign Root CA
+        Validity
+            Not Before: Jan 28 12:00:00 1999 GMT
+            Not After : Jan 28 12:00:00 2009 GMT
+        Subject: C=BE, O=GlobalSign nv-sa, OU=Primary Class 2 CA, CN=GlobalSign Primary Class 2 CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:92:8c:fe:ef:f4:45:8e:17:41:6e:fc:d8:bf:21:
+                    6f:ab:06:9d:52:c1:2c:00:9d:3f:8e:85:b8:7f:4a:
+                    8f:bd:a0:63:2a:ca:49:27:ae:5a:82:f4:74:e2:55:
+                    92:ff:c2:d1:aa:79:a2:b6:fa:d5:9d:82:04:4f:c6:
+                    b2:c6:5e:63:a7:3a:ba:d8:ee:eb:8a:6f:9f:b6:bb:
+                    28:41:c0:22:fb:4e:48:1a:06:92:d7:bf:d7:cf:b9:
+                    d9:bd:38:4f:3b:0d:44:6e:55:41:fe:fc:09:db:d8:
+                    bf:f3:8e:21:f1:e8:12:b5:f6:13:a5:d3:c6:4c:93:
+                    22:b0:02:ff:ee:1d:0c:c4:a8:6b:4f:75:68:56:e8:
+                    dc:28:12:50:f7:a8:24:9d:2e:24:39:fb:09:05:de:
+                    e5:a3:64:49:21:d0:68:7e:71:30:91:b1:60:e0:39:
+                    f4:50:f8:7a:4d:98:00:6b:7c:79:ba:4e:ce:4a:e2:
+                    ba:36:1d:b7:c5:36:15:95:9c:64:42:ea:5f:c4:ba:
+                    f5:40:05:be:e1:3a:59:bd:84:a7:19:b8:de:4d:53:
+                    50:ce:07:d1:d2:51:d3:ef:0d:81:6c:e6:e7:6d:cb:
+                    5d:7c:3f:7c:cc:ec:4f:83:27:25:ff:70:50:f6:83:
+                    59:75:84:06:66:58:2c:de:89:8d:00:a6:49:f9:a5:
+                    43:77
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Subject Key Identifier: 
+                7C:E7:B2:B1:2C:DE:B1:A7:6B:E9:76:0C:E1:A3:FD:4E:6C:C7:B9:F6
+            X509v3 Authority Key Identifier: 
+                keyid:60:7B:66:1A:45:0D:97:CA:89:50:2F:7D:04:CD:34:A8:FF:FC:FD:4B
+
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: md5WithRSAEncryption
+        63:dd:59:ce:8a:79:aa:98:9d:4e:c5:89:64:37:7e:8a:93:67:
+        2f:10:ea:6f:27:c3:8d:77:6d:f2:5c:56:94:19:1a:69:60:30:
+        46:5d:8f:f2:6d:45:3c:8e:35:97:7c:2f:b8:51:e2:e8:89:bd:
+        88:cf:27:1c:08:34:5c:88:c1:68:24:db:91:85:e4:cf:fb:fb:
+        43:8d:e8:25:01:1b:c4:0e:f7:00:42:48:86:1f:24:08:58:5a:
+        8c:8d:f2:6b:47:2c:68:91:b1:69:42:fd:0d:8d:c9:26:e6:92:
+        86:a6:64:6e:92:c5:ce:3e:3c:7d:71:e3:23:a4:ab:c7:d5:a8:
+        a9:df:82:a7:3b:e8:86:d5:c3:4f:18:e3:44:d0:e0:dc:f3:c5:
+        68:2e:fe:a5:2f:05:84:c8:7e:47:42:53:6b:87:4a:fe:32:ff:
+        5e:3e:70:8c:b7:a8:15:cc:17:c2:ff:46:ec:d0:ec:2d:b4:6e:
+        12:28:a9:f9:40:e9:eb:d4:66:97:53:a9:69:55:c0:a9:aa:b2:
+        2e:cd:d1:69:f4:be:f8:bb:7c:69:ee:54:a6:db:9e:fb:5a:a6:
+        3e:fe:9a:ef:94:51:4b:75:ee:d8:d4:e1:9a:f1:02:56:13:89:
+        0e:a7:42:8b:96:8b:85:0c:1b:85:be:26:ae:ab:a6:99:bc:22:
+        f1:73:df:42
+
+GlobalSign Primary Class 3 CA
+=============================
+MD5 Fingerprint: 98:12:A3:4B:95:A9:96:64:94:E7:50:8C:3E:E1:83:5A
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDrDCCApSgAwIBAgILAgAAAAAA1ni41sMwDQYJKoZIhvcNAQEEBQAwVzELMAkG
+A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
+b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05OTAxMjgxMjAw
+MDBaFw0wOTAxMjgxMjAwMDBaMG0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
+YWxTaWduIG52LXNhMRswGQYDVQQLExJQcmltYXJ5IENsYXNzIDMgQ0ExJjAkBgNV
+BAMTHUdsb2JhbFNpZ24gUHJpbWFyeSBDbGFzcyAzIENBMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAkV5WZdbAwAScv0fEXHt6MQH5WJaZ4xyEL9xWj631
+WYHVQ2ZdWpOMdcqp5xHBURAUYMks1HuvxneGq3onrm+VuQvKtkb7fhr0DRRt0slO
+sq7wVPZcQEw2SHToVIxlZhCnvSu3II0FSa14fdIkI1Dj8LR5mwE5/6870y3u4UmN
+jS88akFFL5vjPeES5JF1ns+gPjySgW+KLhjc4PKMjP2H2Qf0QJTJTk9D32dWb70D
+UHyZZ6S5PJFsAm6E1vxG98xvGD4X8O8LZBZX5qyG8UiqQ8HJJ3hzREXihX26/7Ph
++xsFpEs7mRIlAVAUaq9d6sgM7uTa7EuLXGgTldzDtTA61wIDAQABo2MwYTAOBgNV
+HQ8BAf8EBAMCAAYwHQYDVR0OBBYEFMw2zBe0RZEv7c87MEh3+7UUmb7jMB8GA1Ud
+IwQYMBaAFGB7ZhpFDZfKiVAvfQTNNKj//P1LMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
+KoZIhvcNAQEEBQADggEBAFeyVMy9lRdkYIm2U5EMRZLDPahsw8yyGPV4QXTYfaMn
+r3cNWT6UHWn6idMMvRoB9D/o4Hcagiha5mLXt+M2yQ6feuPC08xZiQzvFovwNnci
+yqS2t8FCZwFAY8znOGSHWxSWZnstFO69SW3/d9DiTlvTgMJND8q4nYGXpzRux+Oc
+SOW0qkX19mVMSPISwtKTjMIVJPMrUv/jCK64btYsEs85yxIq56l7X5g9o+HMpmOJ
+XH0xdfnV1l3y0NQ9355xqA7c5CCXeOZ/U6QNUU+OOwOuow1aTcN55zVYcELJXqFe
+tNkio0RTNaTQz3OAxc+fVph2+RRMd4eCydx+XTTVNnU=
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            02:00:00:00:00:00:d6:78:b8:d6:c3
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=BE, O=GlobalSign nv-sa, OU=Root CA, CN=GlobalSign Root CA
+        Validity
+            Not Before: Jan 28 12:00:00 1999 GMT
+            Not After : Jan 28 12:00:00 2009 GMT
+        Subject: C=BE, O=GlobalSign nv-sa, OU=Primary Class 3 CA, CN=GlobalSign Primary Class 3 CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:91:5e:56:65:d6:c0:c0:04:9c:bf:47:c4:5c:7b:
+                    7a:31:01:f9:58:96:99:e3:1c:84:2f:dc:56:8f:ad:
+                    f5:59:81:d5:43:66:5d:5a:93:8c:75:ca:a9:e7:11:
+                    c1:51:10:14:60:c9:2c:d4:7b:af:c6:77:86:ab:7a:
+                    27:ae:6f:95:b9:0b:ca:b6:46:fb:7e:1a:f4:0d:14:
+                    6d:d2:c9:4e:b2:ae:f0:54:f6:5c:40:4c:36:48:74:
+                    e8:54:8c:65:66:10:a7:bd:2b:b7:20:8d:05:49:ad:
+                    78:7d:d2:24:23:50:e3:f0:b4:79:9b:01:39:ff:af:
+                    3b:d3:2d:ee:e1:49:8d:8d:2f:3c:6a:41:45:2f:9b:
+                    e3:3d:e1:12:e4:91:75:9e:cf:a0:3e:3c:92:81:6f:
+                    8a:2e:18:dc:e0:f2:8c:8c:fd:87:d9:07:f4:40:94:
+                    c9:4e:4f:43:df:67:56:6f:bd:03:50:7c:99:67:a4:
+                    b9:3c:91:6c:02:6e:84:d6:fc:46:f7:cc:6f:18:3e:
+                    17:f0:ef:0b:64:16:57:e6:ac:86:f1:48:aa:43:c1:
+                    c9:27:78:73:44:45:e2:85:7d:ba:ff:b3:e1:fb:1b:
+                    05:a4:4b:3b:99:12:25:01:50:14:6a:af:5d:ea:c8:
+                    0c:ee:e4:da:ec:4b:8b:5c:68:13:95:dc:c3:b5:30:
+                    3a:d7
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Subject Key Identifier: 
+                CC:36:CC:17:B4:45:91:2F:ED:CF:3B:30:48:77:FB:B5:14:99:BE:E3
+            X509v3 Authority Key Identifier: 
+                keyid:60:7B:66:1A:45:0D:97:CA:89:50:2F:7D:04:CD:34:A8:FF:FC:FD:4B
+
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: md5WithRSAEncryption
+        57:b2:54:cc:bd:95:17:64:60:89:b6:53:91:0c:45:92:c3:3d:
+        a8:6c:c3:cc:b2:18:f5:78:41:74:d8:7d:a3:27:af:77:0d:59:
+        3e:94:1d:69:fa:89:d3:0c:bd:1a:01:f4:3f:e8:e0:77:1a:82:
+        28:5a:e6:62:d7:b7:e3:36:c9:0e:9f:7a:e3:c2:d3:cc:59:89:
+        0c:ef:16:8b:f0:36:77:22:ca:a4:b6:b7:c1:42:67:01:40:63:
+        cc:e7:38:64:87:5b:14:96:66:7b:2d:14:ee:bd:49:6d:ff:77:
+        d0:e2:4e:5b:d3:80:c2:4d:0f:ca:b8:9d:81:97:a7:34:6e:c7:
+        e3:9c:48:e5:b4:aa:45:f5:f6:65:4c:48:f2:12:c2:d2:93:8c:
+        c2:15:24:f3:2b:52:ff:e3:08:ae:b8:6e:d6:2c:12:cf:39:cb:
+        12:2a:e7:a9:7b:5f:98:3d:a3:e1:cc:a6:63:89:5c:7d:31:75:
+        f9:d5:d6:5d:f2:d0:d4:3d:df:9e:71:a8:0e:dc:e4:20:97:78:
+        e6:7f:53:a4:0d:51:4f:8e:3b:03:ae:a3:0d:5a:4d:c3:79:e7:
+        35:58:70:42:c9:5e:a1:5e:b4:d9:22:a3:44:53:35:a4:d0:cf:
+        73:80:c5:cf:9f:56:98:76:f9:14:4c:77:87:82:c9:dc:7e:5d:
+        34:d5:36:75
+
+GlobalSign Root CA
+==================
+MD5 Fingerprint: AB:BF:EA:E3:6B:29:A6:CC:A6:78:35:99:EF:AD:2B:80
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl2gAwIBAgILAgAAAAAA1ni3lAUwDQYJKoZIhvcNAQEEBQAwVzELMAkG
+A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
+b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw
+MDBaFw0xNDAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
+YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT
+aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ
+jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp
+xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp
+1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG
+snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ
+U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8
+9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIABjAdBgNVHQ4EFgQU
+YHtmGkUNl8qJUC99BM00qP/8/UswDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0B
+AQQFAAOCAQEArqqf/LfSyx9fOSkoGJ40yWxPbxrwZKJwSk8ThptgKJ7ogUmYfQq7
+5bCdPTbbjwVR/wkxKh/diXeeDy5slQTthsu0AD+EAk2AaioteAuubyuig0SDH81Q
+gkwkr733pbTIWg/050deSY43lv6aiAU62cDbKYfmGZZHpzqmjIs8d/5GY6dT2iHR
+rH5Jokvmw2dZL7OKDrssvamqQnw1wdh/1acxOk5jQzmvCLBhNIzTmKlDNPYPhyk7
+ncJWWJh3w/cbrPad+D6qp1RF8PX51TFl/mtYnHGzHtdS6jIX/EBgHcl5JLL2bP2o
+Zg6C3ZjL2sJETy6ge/L3ayx2EYRGinij4w==
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            02:00:00:00:00:00:d6:78:b7:94:05
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=BE, O=GlobalSign nv-sa, OU=Root CA, CN=GlobalSign Root CA
+        Validity
+            Not Before: Sep  1 12:00:00 1998 GMT
+            Not After : Jan 28 12:00:00 2014 GMT
+        Subject: C=BE, O=GlobalSign nv-sa, OU=Root CA, CN=GlobalSign Root CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:da:0e:e6:99:8d:ce:a3:e3:4f:8a:7e:fb:f1:8b:
+                    83:25:6b:ea:48:1f:f1:2a:b0:b9:95:11:04:bd:f0:
+                    63:d1:e2:67:66:cf:1c:dd:cf:1b:48:2b:ee:8d:89:
+                    8e:9a:af:29:80:65:ab:e9:c7:2d:12:cb:ab:1c:4c:
+                    70:07:a1:3d:0a:30:cd:15:8d:4f:f8:dd:d4:8c:50:
+                    15:1c:ef:50:ee:c4:2e:f7:fc:e9:52:f2:91:7d:e0:
+                    6d:d5:35:30:8e:5e:43:73:f2:41:e9:d5:6a:e3:b2:
+                    89:3a:56:39:38:6f:06:3c:88:69:5b:2a:4d:c5:a7:
+                    54:b8:6c:89:cc:9b:f9:3c:ca:e5:fd:89:f5:12:3c:
+                    92:78:96:d6:dc:74:6e:93:44:61:d1:8d:c7:46:b2:
+                    75:0e:86:e8:19:8a:d5:6d:6c:d5:78:16:95:a2:e9:
+                    c8:0a:38:eb:f2:24:13:4f:73:54:93:13:85:3a:1b:
+                    bc:1e:34:b5:8b:05:8c:b9:77:8b:b1:db:1f:20:91:
+                    ab:09:53:6e:90:ce:7b:37:74:b9:70:47:91:22:51:
+                    63:16:79:ae:b1:ae:41:26:08:c8:19:2b:d1:46:aa:
+                    48:d6:64:2a:d7:83:34:ff:2c:2a:c1:6c:19:43:4a:
+                    07:85:e7:d3:7c:f6:21:68:ef:ea:f2:52:9f:7f:93:
+                    90:cf
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Subject Key Identifier: 
+                60:7B:66:1A:45:0D:97:CA:89:50:2F:7D:04:CD:34:A8:FF:FC:FD:4B
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: md5WithRSAEncryption
+        ae:aa:9f:fc:b7:d2:cb:1f:5f:39:29:28:18:9e:34:c9:6c:4f:
+        6f:1a:f0:64:a2:70:4a:4f:13:86:9b:60:28:9e:e8:81:49:98:
+        7d:0a:bb:e5:b0:9d:3d:36:db:8f:05:51:ff:09:31:2a:1f:dd:
+        89:77:9e:0f:2e:6c:95:04:ed:86:cb:b4:00:3f:84:02:4d:80:
+        6a:2a:2d:78:0b:ae:6f:2b:a2:83:44:83:1f:cd:50:82:4c:24:
+        af:bd:f7:a5:b4:c8:5a:0f:f4:e7:47:5e:49:8e:37:96:fe:9a:
+        88:05:3a:d9:c0:db:29:87:e6:19:96:47:a7:3a:a6:8c:8b:3c:
+        77:fe:46:63:a7:53:da:21:d1:ac:7e:49:a2:4b:e6:c3:67:59:
+        2f:b3:8a:0e:bb:2c:bd:a9:aa:42:7c:35:c1:d8:7f:d5:a7:31:
+        3a:4e:63:43:39:af:08:b0:61:34:8c:d3:98:a9:43:34:f6:0f:
+        87:29:3b:9d:c2:56:58:98:77:c3:f7:1b:ac:f6:9d:f8:3e:aa:
+        a7:54:45:f0:f5:f9:d5:31:65:fe:6b:58:9c:71:b3:1e:d7:52:
+        ea:32:17:fc:40:60:1d:c9:79:24:b2:f6:6c:fd:a8:66:0e:82:
+        dd:98:cb:da:c2:44:4f:2e:a0:7b:f2:f7:6b:2c:76:11:84:46:
+        8a:78:a3:e3
+
+National Retail Federation by DST
+=================================
+MD5 Fingerprint: AD:8E:0F:9E:01:6B:A0:C5:74:D5:0C:D3:68:65:4F:1E
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIEAjCCAuoCEQDQHkCKAAACfAAAAAMAAAABMA0GCSqGSIb3DQEBBQUAMIG+MQsw
+CQYDVQQGEwJ1czENMAsGA1UECBMEVXRhaDEXMBUGA1UEBxMOU2FsdCBMYWtlIENp
+dHkxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjEjMCEGA1UE
+CxMaTmF0aW9uYWwgUmV0YWlsIEZlZGVyYXRpb24xGTAXBgNVBAMTEERTVCAoTlJG
+KSBSb290Q0ExITAfBgkqhkiG9w0BCQEWEmNhQGRpZ3NpZ3RydXN0LmNvbTAeFw05
+ODEyMTExNjE0MTZaFw0wODEyMDgxNjE0MTZaMIG+MQswCQYDVQQGEwJ1czENMAsG
+A1UECBMEVXRhaDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkxJDAiBgNVBAoTG0Rp
+Z2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjEjMCEGA1UECxMaTmF0aW9uYWwgUmV0
+YWlsIEZlZGVyYXRpb24xGTAXBgNVBAMTEERTVCAoTlJGKSBSb290Q0ExITAfBgkq
+hkiG9w0BCQEWEmNhQGRpZ3NpZ3RydXN0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBANmsm3f6UNPM3LlArLlyagCHI/wPliHQJq/k4rVf+tOmfSEw
+LswXgo+YdPxnpKbfiJeiQin1p9sRk/teIzDCqrwi50Eb5e0l3sg/295XRXhARoOy
+1Ro93w9FbdVjAnXYL8Zuq5WRdDcNy00JXNHUWzra3Q7Ia5nY1TnM34VVxJJTAqPh
+94DJcKPa3DPEf6JHCBw1lh+hAxwwg/TEzP+Yw7BGRKLAv63b0oH2TJgsp14k84bK
+Y9W6ffCawErQG1ju7Klnz2kCbCLAYCws0cgg6sgt+92cu8tRTNznVwQ7VJsRpTJ0
+7HQB85AVWy98LJNluWZntIGINeWekRh/gahByMsCAwEAATANBgkqhkiG9w0BAQUF
+AAOCAQEAhF4LO+ygjRyb0DwdcWnkGn9kvoFlYcWMatd8AHTgemJV7SR84GHj8t0U
+5hFugw7h6qmegK2aIL/gV37V0LWEYy3ZGOS9GzUsXq5hdqpnhTs44TGBHzF/5tf4
+W9K7Y3mGxIzF3gqu19H8AXT/trYNYoFnHLsm+CSA4Fxe2KSKOo99y/+So/18qTJp
+B1hYYUKZUgOxOD3GcW9s8uh9BqrBfFPLGi2IT8mpp6xpb/ekH9h0gfVKv7FVt9N3
+OKdvwkrI4nOJ01dy4UMvcjz2H7f4BEpuwemUF+SXF/QOE4ZvjavoXy20/2zWorQf
+7LmUaqoSTxrd9Xe1JYzyigrx/FJbWA==
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number:
+            d0:1e:40:8a:00:00:02:7c:00:00:00:03:00:00:00:01
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=us, ST=Utah, L=Salt Lake City, O=Digital Signature Trust Co., OU=National Retail Federation, CN=DST (NRF) RootCA/Email=ca@digsigtrust.com
+        Validity
+            Not Before: Dec 11 16:14:16 1998 GMT
+            Not After : Dec  8 16:14:16 2008 GMT
+        Subject: C=us, ST=Utah, L=Salt Lake City, O=Digital Signature Trust Co., OU=National Retail Federation, CN=DST (NRF) RootCA/Email=ca@digsigtrust.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:d9:ac:9b:77:fa:50:d3:cc:dc:b9:40:ac:b9:72:
+                    6a:00:87:23:fc:0f:96:21:d0:26:af:e4:e2:b5:5f:
+                    fa:d3:a6:7d:21:30:2e:cc:17:82:8f:98:74:fc:67:
+                    a4:a6:df:88:97:a2:42:29:f5:a7:db:11:93:fb:5e:
+                    23:30:c2:aa:bc:22:e7:41:1b:e5:ed:25:de:c8:3f:
+                    db:de:57:45:78:40:46:83:b2:d5:1a:3d:df:0f:45:
+                    6d:d5:63:02:75:d8:2f:c6:6e:ab:95:91:74:37:0d:
+                    cb:4d:09:5c:d1:d4:5b:3a:da:dd:0e:c8:6b:99:d8:
+                    d5:39:cc:df:85:55:c4:92:53:02:a3:e1:f7:80:c9:
+                    70:a3:da:dc:33:c4:7f:a2:47:08:1c:35:96:1f:a1:
+                    03:1c:30:83:f4:c4:cc:ff:98:c3:b0:46:44:a2:c0:
+                    bf:ad:db:d2:81:f6:4c:98:2c:a7:5e:24:f3:86:ca:
+                    63:d5:ba:7d:f0:9a:c0:4a:d0:1b:58:ee:ec:a9:67:
+                    cf:69:02:6c:22:c0:60:2c:2c:d1:c8:20:ea:c8:2d:
+                    fb:dd:9c:bb:cb:51:4c:dc:e7:57:04:3b:54:9b:11:
+                    a5:32:74:ec:74:01:f3:90:15:5b:2f:7c:2c:93:65:
+                    b9:66:67:b4:81:88:35:e5:9e:91:18:7f:81:a8:41:
+                    c8:cb
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: sha1WithRSAEncryption
+        84:5e:0b:3b:ec:a0:8d:1c:9b:d0:3c:1d:71:69:e4:1a:7f:64:
+        be:81:65:61:c5:8c:6a:d7:7c:00:74:e0:7a:62:55:ed:24:7c:
+        e0:61:e3:f2:dd:14:e6:11:6e:83:0e:e1:ea:a9:9e:80:ad:9a:
+        20:bf:e0:57:7e:d5:d0:b5:84:63:2d:d9:18:e4:bd:1b:35:2c:
+        5e:ae:61:76:aa:67:85:3b:38:e1:31:81:1f:31:7f:e6:d7:f8:
+        5b:d2:bb:63:79:86:c4:8c:c5:de:0a:ae:d7:d1:fc:01:74:ff:
+        b6:b6:0d:62:81:67:1c:bb:26:f8:24:80:e0:5c:5e:d8:a4:8a:
+        3a:8f:7d:cb:ff:92:a3:fd:7c:a9:32:69:07:58:58:61:42:99:
+        52:03:b1:38:3d:c6:71:6f:6c:f2:e8:7d:06:aa:c1:7c:53:cb:
+        1a:2d:88:4f:c9:a9:a7:ac:69:6f:f7:a4:1f:d8:74:81:f5:4a:
+        bf:b1:55:b7:d3:77:38:a7:6f:c2:4a:c8:e2:73:89:d3:57:72:
+        e1:43:2f:72:3c:f6:1f:b7:f8:04:4a:6e:c1:e9:94:17:e4:97:
+        17:f4:0e:13:86:6f:8d:ab:e8:5f:2d:b4:ff:6c:d6:a2:b4:1f:
+        ec:b9:94:6a:aa:12:4f:1a:dd:f5:77:b5:25:8c:f2:8a:0a:f1:
+        fc:52:5b:58
+
+TC TrustCenter, Germany, Class 1 CA
+===================================
+MD5 Fingerprint: 64:3F:F8:3E:52:14:4A:59:BA:93:56:04:0B:23:02:D1
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIENTCCA56gAwIBAgIBAjANBgkqhkiG9w0BAQQFADCBvDELMAkGA1UEBhMCREUx
+EDAOBgNVBAgTB0hhbWJ1cmcxEDAOBgNVBAcTB0hhbWJ1cmcxOjA4BgNVBAoTMVRD
+IFRydXN0Q2VudGVyIGZvciBTZWN1cml0eSBpbiBEYXRhIE5ldHdvcmtzIEdtYkgx
+IjAgBgNVBAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDEgQ0ExKTAnBgkqhkiG9w0B
+CQEWGmNlcnRpZmljYXRlQHRydXN0Y2VudGVyLmRlMB4XDTk4MDMwOTEzNTYzM1oX
+DTA1MTIzMTEzNTYzM1owgbwxCzAJBgNVBAYTAkRFMRAwDgYDVQQIEwdIYW1idXJn
+MRAwDgYDVQQHEwdIYW1idXJnMTowOAYDVQQKEzFUQyBUcnVzdENlbnRlciBmb3Ig
+U2VjdXJpdHkgaW4gRGF0YSBOZXR3b3JrcyBHbWJIMSIwIAYDVQQLExlUQyBUcnVz
+dENlbnRlciBDbGFzcyAxIENBMSkwJwYJKoZIhvcNAQkBFhpjZXJ0aWZpY2F0ZUB0
+cnVzdGNlbnRlci5kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsCnrtHaz
+rte2W7Re573jsZxJBFdboavZfxMb/bphq9jncd8tAJRdUUh9I+91YoSQPAofWRF0
+L46Apf0wAj0pUs1yGkkhnLzLUo5IoWOWyBCFMGlXdEXAWobG1T3gaFd9MWokjUWX
+PjF+aGYybiRt7DI2yUHK8DFEyKNhyhugNh8CAwEAAaOCAUMwggE/MEAGCWCGSAGG
++EIBAwQzFjFodHRwczovL3d3dy50cnVzdGNlbnRlci5kZS9jZ2ktYmluL2NoZWNr
+LXJldi5jZ2k/MEAGCWCGSAGG+EIBBAQzFjFodHRwczovL3d3dy50cnVzdGNlbnRl
+ci5kZS9jZ2ktYmluL2NoZWNrLXJldi5jZ2k/MDwGCWCGSAGG+EIBBwQvFi1odHRw
+czovL3d3dy50cnVzdGNlbnRlci5kZS9jZ2ktYmluL1JlbmV3LmNnaT8wPgYJYIZI
+AYb4QgEIBDEWL2h0dHA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvZ3VpZGVsaW5lcy9p
+bmRleC5odG1sMCgGCWCGSAGG+EIBDQQbFhlUQyBUcnVzdENlbnRlciBDbGFzcyAx
+IENBMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQQFAAOBgQAFQlImpAwn
+AUSsXCUowkRCVAi5HcU+bFlmxLNOUKf4+JZ1oZZ16BY4oM1dbvp5pxt7HR7DALlm
+vlrWYg/n8nu470zgwD9Zrjm3hAmeq/GpLmtp4q3M8up4CQUgOEJxGH7Hspfm1QIF
+BlajX/GqwsRP/vfvFg+d7KqFzz0pJPEEzQ==
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 2 (0x2)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=DE, ST=Hamburg, L=Hamburg, O=TC TrustCenter for Security in Data Networks GmbH, OU=TC TrustCenter Class 1 CA/Email=certificate@trustcenter.de
+        Validity
+            Not Before: Mar  9 13:56:33 1998 GMT
+            Not After : Dec 31 13:56:33 2005 GMT
+        Subject: C=DE, ST=Hamburg, L=Hamburg, O=TC TrustCenter for Security in Data Networks GmbH, OU=TC TrustCenter Class 1 CA/Email=certificate@trustcenter.de
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:b0:29:eb:b4:76:b3:ae:d7:b6:5b:b4:5e:e7:bd:
+                    e3:b1:9c:49:04:57:5b:a1:ab:d9:7f:13:1b:fd:ba:
+                    61:ab:d8:e7:71:df:2d:00:94:5d:51:48:7d:23:ef:
+                    75:62:84:90:3c:0a:1f:59:11:74:2f:8e:80:a5:fd:
+                    30:02:3d:29:52:cd:72:1a:49:21:9c:bc:cb:52:8e:
+                    48:a1:63:96:c8:10:85:30:69:57:74:45:c0:5a:86:
+                    c6:d5:3d:e0:68:57:7d:31:6a:24:8d:45:97:3e:31:
+                    7e:68:66:32:6e:24:6d:ec:32:36:c9:41:ca:f0:31:
+                    44:c8:a3:61:ca:1b:a0:36:1f
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            Netscape Revocation Url: 
+                https://www.trustcenter.de/cgi-bin/check-rev.cgi?
+            Netscape CA Revocation Url: 
+                https://www.trustcenter.de/cgi-bin/check-rev.cgi?
+            Netscape Renewal Url: 
+                https://www.trustcenter.de/cgi-bin/Renew.cgi?
+            Netscape CA Policy Url: 
+                http://www.trustcenter.de/guidelines/index.html
+            Netscape Comment: 
+                TC TrustCenter Class 1 CA
+            Netscape Cert Type: 
+                SSL CA, S/MIME CA, Object Signing CA
+    Signature Algorithm: md5WithRSAEncryption
+        05:42:52:26:a4:0c:27:01:44:ac:5c:25:28:c2:44:42:54:08:
+        b9:1d:c5:3e:6c:59:66:c4:b3:4e:50:a7:f8:f8:96:75:a1:96:
+        75:e8:16:38:a0:cd:5d:6e:fa:79:a7:1b:7b:1d:1e:c3:00:b9:
+        66:be:5a:d6:62:0f:e7:f2:7b:b8:ef:4c:e0:c0:3f:59:ae:39:
+        b7:84:09:9e:ab:f1:a9:2e:6b:69:e2:ad:cc:f2:ea:78:09:05:
+        20:38:42:71:18:7e:c7:b2:97:e6:d5:02:05:06:56:a3:5f:f1:
+        aa:c2:c4:4f:fe:f7:ef:16:0f:9d:ec:aa:85:cf:3d:29:24:f1:
+        04:cd
+
+TC TrustCenter, Germany, Class 2 CA
+===================================
+MD5 Fingerprint: E1:E9:96:53:77:E1:F0:38:A0:02:AB:94:C6:95:7B:FC
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIENTCCA56gAwIBAgIBAzANBgkqhkiG9w0BAQQFADCBvDELMAkGA1UEBhMCREUx
+EDAOBgNVBAgTB0hhbWJ1cmcxEDAOBgNVBAcTB0hhbWJ1cmcxOjA4BgNVBAoTMVRD
+IFRydXN0Q2VudGVyIGZvciBTZWN1cml0eSBpbiBEYXRhIE5ldHdvcmtzIEdtYkgx
+IjAgBgNVBAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0ExKTAnBgkqhkiG9w0B
+CQEWGmNlcnRpZmljYXRlQHRydXN0Y2VudGVyLmRlMB4XDTk4MDMwOTEzNTc0NFoX
+DTA1MTIzMTEzNTc0NFowgbwxCzAJBgNVBAYTAkRFMRAwDgYDVQQIEwdIYW1idXJn
+MRAwDgYDVQQHEwdIYW1idXJnMTowOAYDVQQKEzFUQyBUcnVzdENlbnRlciBmb3Ig
+U2VjdXJpdHkgaW4gRGF0YSBOZXR3b3JrcyBHbWJIMSIwIAYDVQQLExlUQyBUcnVz
+dENlbnRlciBDbGFzcyAyIENBMSkwJwYJKoZIhvcNAQkBFhpjZXJ0aWZpY2F0ZUB0
+cnVzdGNlbnRlci5kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2jjo7TIA
+KXGDAQ2/jAHc2satOaSpii/Vi1xoX1DGYvVmvcqRIuyqHVHXPbNRsoNOXctJsPBM
+VeVrLceFCzAckk6C1MoC7fdvvtzg4xS4BVPymvRWi1qehZPRtIJWrk27qEtXFrz+
++Fie+CmNsHvNeMlPrItnDPGc+/xXm1dcTw0CAwEAAaOCAUMwggE/MEAGCWCGSAGG
++EIBAwQzFjFodHRwczovL3d3dy50cnVzdGNlbnRlci5kZS9jZ2ktYmluL2NoZWNr
+LXJldi5jZ2k/MEAGCWCGSAGG+EIBBAQzFjFodHRwczovL3d3dy50cnVzdGNlbnRl
+ci5kZS9jZ2ktYmluL2NoZWNrLXJldi5jZ2k/MDwGCWCGSAGG+EIBBwQvFi1odHRw
+czovL3d3dy50cnVzdGNlbnRlci5kZS9jZ2ktYmluL1JlbmV3LmNnaT8wPgYJYIZI
+AYb4QgEIBDEWL2h0dHA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvZ3VpZGVsaW5lcy9p
+bmRleC5odG1sMCgGCWCGSAGG+EIBDQQbFhlUQyBUcnVzdENlbnRlciBDbGFzcyAy
+IENBMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQQFAAOBgQCJG/Tv6Tji
+bAz2zW9JzinM+6YP+Y0+lUbW/EcyibLIBmF60ucNEwKUC9mLVkf0u+fFX3v0Y0yu
+fDTqDaKpsyyF8+P+J1QQkrCPksGYQhhwSNtOLOsNJGjk0fe+Cakph7vo2tw+o4hC
+MfXR43+u2I4AWnSYsE/G/yN7XHMAeMnbTg==
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 3 (0x3)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=DE, ST=Hamburg, L=Hamburg, O=TC TrustCenter for Security in Data Networks GmbH, OU=TC TrustCenter Class 2 CA/Email=certificate@trustcenter.de
+        Validity
+            Not Before: Mar  9 13:57:44 1998 GMT
+            Not After : Dec 31 13:57:44 2005 GMT
+        Subject: C=DE, ST=Hamburg, L=Hamburg, O=TC TrustCenter for Security in Data Networks GmbH, OU=TC TrustCenter Class 2 CA/Email=certificate@trustcenter.de
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:da:38:e8:ed:32:00:29:71:83:01:0d:bf:8c:01:
+                    dc:da:c6:ad:39:a4:a9:8a:2f:d5:8b:5c:68:5f:50:
+                    c6:62:f5:66:bd:ca:91:22:ec:aa:1d:51:d7:3d:b3:
+                    51:b2:83:4e:5d:cb:49:b0:f0:4c:55:e5:6b:2d:c7:
+                    85:0b:30:1c:92:4e:82:d4:ca:02:ed:f7:6f:be:dc:
+                    e0:e3:14:b8:05:53:f2:9a:f4:56:8b:5a:9e:85:93:
+                    d1:b4:82:56:ae:4d:bb:a8:4b:57:16:bc:fe:f8:58:
+                    9e:f8:29:8d:b0:7b:cd:78:c9:4f:ac:8b:67:0c:f1:
+                    9c:fb:fc:57:9b:57:5c:4f:0d
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            Netscape Revocation Url: 
+                https://www.trustcenter.de/cgi-bin/check-rev.cgi?
+            Netscape CA Revocation Url: 
+                https://www.trustcenter.de/cgi-bin/check-rev.cgi?
+            Netscape Renewal Url: 
+                https://www.trustcenter.de/cgi-bin/Renew.cgi?
+            Netscape CA Policy Url: 
+                http://www.trustcenter.de/guidelines/index.html
+            Netscape Comment: 
+                TC TrustCenter Class 2 CA
+            Netscape Cert Type: 
+                SSL CA, S/MIME CA, Object Signing CA
+    Signature Algorithm: md5WithRSAEncryption
+        89:1b:f4:ef:e9:38:e2:6c:0c:f6:cd:6f:49:ce:29:cc:fb:a6:
+        0f:f9:8d:3e:95:46:d6:fc:47:32:89:b2:c8:06:61:7a:d2:e7:
+        0d:13:02:94:0b:d9:8b:56:47:f4:bb:e7:c5:5f:7b:f4:63:4c:
+        ae:7c:34:ea:0d:a2:a9:b3:2c:85:f3:e3:fe:27:54:10:92:b0:
+        8f:92:c1:98:42:18:70:48:db:4e:2c:eb:0d:24:68:e4:d1:f7:
+        be:09:a9:29:87:bb:e8:da:dc:3e:a3:88:42:31:f5:d1:e3:7f:
+        ae:d8:8e:00:5a:74:98:b0:4f:c6:ff:23:7b:5c:73:00:78:c9:
+        db:4e
+
+TC TrustCenter, Germany, Class 3 CA
+===================================
+MD5 Fingerprint: 62:AB:B6:15:4A:B4:B0:16:77:FF:AE:CF:16:16:2B:8C
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIENTCCA56gAwIBAgIBBDANBgkqhkiG9w0BAQQFADCBvDELMAkGA1UEBhMCREUx
+EDAOBgNVBAgTB0hhbWJ1cmcxEDAOBgNVBAcTB0hhbWJ1cmcxOjA4BgNVBAoTMVRD
+IFRydXN0Q2VudGVyIGZvciBTZWN1cml0eSBpbiBEYXRhIE5ldHdvcmtzIEdtYkgx
+IjAgBgNVBAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0ExKTAnBgkqhkiG9w0B
+CQEWGmNlcnRpZmljYXRlQHRydXN0Y2VudGVyLmRlMB4XDTk4MDMwOTEzNTg0OVoX
+DTA1MTIzMTEzNTg0OVowgbwxCzAJBgNVBAYTAkRFMRAwDgYDVQQIEwdIYW1idXJn
+MRAwDgYDVQQHEwdIYW1idXJnMTowOAYDVQQKEzFUQyBUcnVzdENlbnRlciBmb3Ig
+U2VjdXJpdHkgaW4gRGF0YSBOZXR3b3JrcyBHbWJIMSIwIAYDVQQLExlUQyBUcnVz
+dENlbnRlciBDbGFzcyAzIENBMSkwJwYJKoZIhvcNAQkBFhpjZXJ0aWZpY2F0ZUB0
+cnVzdGNlbnRlci5kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtrTBNQUu
+DY3soEBqHA4nplCSa1AbB94u53bM4Nr8hKhejGNqK03ZTgJ2EcEL8o15ygC28bAO
+1/ukFz2vq2l6lie/rzOhmipZqsS1NwjyEqUxtkP1MpZxKCirjSiG37vu4wx9MNbD
+UquPXSeca8Cj5wVrV0lEs27qZM/SjnpQd3cCAwEAAaOCAUMwggE/MEAGCWCGSAGG
++EIBAwQzFjFodHRwczovL3d3dy50cnVzdGNlbnRlci5kZS9jZ2ktYmluL2NoZWNr
+LXJldi5jZ2k/MEAGCWCGSAGG+EIBBAQzFjFodHRwczovL3d3dy50cnVzdGNlbnRl
+ci5kZS9jZ2ktYmluL2NoZWNrLXJldi5jZ2k/MDwGCWCGSAGG+EIBBwQvFi1odHRw
+czovL3d3dy50cnVzdGNlbnRlci5kZS9jZ2ktYmluL1JlbmV3LmNnaT8wPgYJYIZI
+AYb4QgEIBDEWL2h0dHA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvZ3VpZGVsaW5lcy9p
+bmRleC5odG1sMCgGCWCGSAGG+EIBDQQbFhlUQyBUcnVzdENlbnRlciBDbGFzcyAz
+IENBMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQQFAAOBgQCEhlBieaAn
+4SW6CbE0DxMJ7S3Ko+aV+TCszRelzj2Xnex8jyZ/wGHKIveR3Tw2WZqbdfe85Mjt
+7AK2IqfzLPHIknhttu7FKOyAIE+5awjnL6eGHn2xCJ9UuQA3PKDYGsiWHPQyFJw5
+lbfu8ENJwl7oy3lvU7/7SYos2EvZVfIScA==
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4 (0x4)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=DE, ST=Hamburg, L=Hamburg, O=TC TrustCenter for Security in Data Networks GmbH, OU=TC TrustCenter Class 3 CA/Email=certificate@trustcenter.de
+        Validity
+            Not Before: Mar  9 13:58:49 1998 GMT
+            Not After : Dec 31 13:58:49 2005 GMT
+        Subject: C=DE, ST=Hamburg, L=Hamburg, O=TC TrustCenter for Security in Data Networks GmbH, OU=TC TrustCenter Class 3 CA/Email=certificate@trustcenter.de
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:b6:b4:c1:35:05:2e:0d:8d:ec:a0:40:6a:1c:0e:
+                    27:a6:50:92:6b:50:1b:07:de:2e:e7:76:cc:e0:da:
+                    fc:84:a8:5e:8c:63:6a:2b:4d:d9:4e:02:76:11:c1:
+                    0b:f2:8d:79:ca:00:b6:f1:b0:0e:d7:fb:a4:17:3d:
+                    af:ab:69:7a:96:27:bf:af:33:a1:9a:2a:59:aa:c4:
+                    b5:37:08:f2:12:a5:31:b6:43:f5:32:96:71:28:28:
+                    ab:8d:28:86:df:bb:ee:e3:0c:7d:30:d6:c3:52:ab:
+                    8f:5d:27:9c:6b:c0:a3:e7:05:6b:57:49:44:b3:6e:
+                    ea:64:cf:d2:8e:7a:50:77:77
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            Netscape Revocation Url: 
+                https://www.trustcenter.de/cgi-bin/check-rev.cgi?
+            Netscape CA Revocation Url: 
+                https://www.trustcenter.de/cgi-bin/check-rev.cgi?
+            Netscape Renewal Url: 
+                https://www.trustcenter.de/cgi-bin/Renew.cgi?
+            Netscape CA Policy Url: 
+                http://www.trustcenter.de/guidelines/index.html
+            Netscape Comment: 
+                TC TrustCenter Class 3 CA
+            Netscape Cert Type: 
+                SSL CA, S/MIME CA, Object Signing CA
+    Signature Algorithm: md5WithRSAEncryption
+        84:86:50:62:79:a0:27:e1:25:ba:09:b1:34:0f:13:09:ed:2d:
+        ca:a3:e6:95:f9:30:ac:cd:17:a5:ce:3d:97:9d:ec:7c:8f:26:
+        7f:c0:61:ca:22:f7:91:dd:3c:36:59:9a:9b:75:f7:bc:e4:c8:
+        ed:ec:02:b6:22:a7:f3:2c:f1:c8:92:78:6d:b6:ee:c5:28:ec:
+        80:20:4f:b9:6b:08:e7:2f:a7:86:1e:7d:b1:08:9f:54:b9:00:
+        37:3c:a0:d8:1a:c8:96:1c:f4:32:14:9c:39:95:b7:ee:f0:43:
+        49:c2:5e:e8:cb:79:6f:53:bf:fb:49:8a:2c:d8:4b:d9:55:f2:
+        12:70
+
+TC TrustCenter, Germany, Class 4 CA
+===================================
+MD5 Fingerprint: BF:AF:EC:C4:DA:F9:30:F9:CA:35:CA:25:E4:3F:8D:89
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIENTCCA56gAwIBAgIBBTANBgkqhkiG9w0BAQQFADCBvDELMAkGA1UEBhMCREUx
+EDAOBgNVBAgTB0hhbWJ1cmcxEDAOBgNVBAcTB0hhbWJ1cmcxOjA4BgNVBAoTMVRD
+IFRydXN0Q2VudGVyIGZvciBTZWN1cml0eSBpbiBEYXRhIE5ldHdvcmtzIEdtYkgx
+IjAgBgNVBAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDQgQ0ExKTAnBgkqhkiG9w0B
+CQEWGmNlcnRpZmljYXRlQHRydXN0Y2VudGVyLmRlMB4XDTk4MDMwOTE0MDAyMFoX
+DTA1MTIzMTE0MDAyMFowgbwxCzAJBgNVBAYTAkRFMRAwDgYDVQQIEwdIYW1idXJn
+MRAwDgYDVQQHEwdIYW1idXJnMTowOAYDVQQKEzFUQyBUcnVzdENlbnRlciBmb3Ig
+U2VjdXJpdHkgaW4gRGF0YSBOZXR3b3JrcyBHbWJIMSIwIAYDVQQLExlUQyBUcnVz
+dENlbnRlciBDbGFzcyA0IENBMSkwJwYJKoZIhvcNAQkBFhpjZXJ0aWZpY2F0ZUB0
+cnVzdGNlbnRlci5kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvy9j1jZ7
+sg3TVfVkbOYlXca0yBS6JTiD61ZipVWpZaP0I5nCS7nQzVRnpqOgo6kzK3bkva13
+su1cEnTDxbYPUppyk0OQYmYVD0Wl3eDduG9AblfBeXKjYKq6dh0SiVNa/AK+4QkT
+xUov3D2LGa3XiyRF+0z0zVw1HSlMUfPybFUCAwEAAaOCAUMwggE/MEAGCWCGSAGG
++EIBAwQzFjFodHRwczovL3d3dy50cnVzdGNlbnRlci5kZS9jZ2ktYmluL2NoZWNr
+LXJldi5jZ2k/MEAGCWCGSAGG+EIBBAQzFjFodHRwczovL3d3dy50cnVzdGNlbnRl
+ci5kZS9jZ2ktYmluL2NoZWNrLXJldi5jZ2k/MDwGCWCGSAGG+EIBBwQvFi1odHRw
+czovL3d3dy50cnVzdGNlbnRlci5kZS9jZ2ktYmluL1JlbmV3LmNnaT8wPgYJYIZI
+AYb4QgEIBDEWL2h0dHA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvZ3VpZGVsaW5lcy9p
+bmRleC5odG1sMCgGCWCGSAGG+EIBDQQbFhlUQyBUcnVzdENlbnRlciBDbGFzcyA0
+IENBMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQQFAAOBgQCUaBQbJZ4p
+mbGyI9JEs5Wf0Z5VBN3jL4IzVZZ3GZ0rnmUc+orjx48l/LEeVUYPj/9PNy+kdlmm
+ZOvVFnC93ZUzDKQNJOtkULRDEfJDvg1xmCLsAa/s98dcccN1kVgZ6N2g9LTxvBBK
+85O0Bkm7H2bSvXRH4Zr569erbR+64R0s2g==
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 5 (0x5)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=DE, ST=Hamburg, L=Hamburg, O=TC TrustCenter for Security in Data Networks GmbH, OU=TC TrustCenter Class 4 CA/Email=certificate@trustcenter.de
+        Validity
+            Not Before: Mar  9 14:00:20 1998 GMT
+            Not After : Dec 31 14:00:20 2005 GMT
+        Subject: C=DE, ST=Hamburg, L=Hamburg, O=TC TrustCenter for Security in Data Networks GmbH, OU=TC TrustCenter Class 4 CA/Email=certificate@trustcenter.de
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:bf:2f:63:d6:36:7b:b2:0d:d3:55:f5:64:6c:e6:
+                    25:5d:c6:b4:c8:14:ba:25:38:83:eb:56:62:a5:55:
+                    a9:65:a3:f4:23:99:c2:4b:b9:d0:cd:54:67:a6:a3:
+                    a0:a3:a9:33:2b:76:e4:bd:ad:77:b2:ed:5c:12:74:
+                    c3:c5:b6:0f:52:9a:72:93:43:90:62:66:15:0f:45:
+                    a5:dd:e0:dd:b8:6f:40:6e:57:c1:79:72:a3:60:aa:
+                    ba:76:1d:12:89:53:5a:fc:02:be:e1:09:13:c5:4a:
+                    2f:dc:3d:8b:19:ad:d7:8b:24:45:fb:4c:f4:cd:5c:
+                    35:1d:29:4c:51:f3:f2:6c:55
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            Netscape Revocation Url: 
+                https://www.trustcenter.de/cgi-bin/check-rev.cgi?
+            Netscape CA Revocation Url: 
+                https://www.trustcenter.de/cgi-bin/check-rev.cgi?
+            Netscape Renewal Url: 
+                https://www.trustcenter.de/cgi-bin/Renew.cgi?
+            Netscape CA Policy Url: 
+                http://www.trustcenter.de/guidelines/index.html
+            Netscape Comment: 
+                TC TrustCenter Class 4 CA
+            Netscape Cert Type: 
+                SSL CA, S/MIME CA, Object Signing CA
+    Signature Algorithm: md5WithRSAEncryption
+        94:68:14:1b:25:9e:29:99:b1:b2:23:d2:44:b3:95:9f:d1:9e:
+        55:04:dd:e3:2f:82:33:55:96:77:19:9d:2b:9e:65:1c:fa:8a:
+        e3:c7:8f:25:fc:b1:1e:55:46:0f:8f:ff:4f:37:2f:a4:76:59:
+        a6:64:eb:d5:16:70:bd:dd:95:33:0c:a4:0d:24:eb:64:50:b4:
+        43:11:f2:43:be:0d:71:98:22:ec:01:af:ec:f7:c7:5c:71:c3:
+        75:91:58:19:e8:dd:a0:f4:b4:f1:bc:10:4a:f3:93:b4:06:49:
+        bb:1f:66:d2:bd:74:47:e1:9a:f9:eb:d7:ab:6d:1f:ba:e1:1d:
+        2c:da
+
+Thawte Personal Basic CA
+========================
+MD5 Fingerprint: E6:0B:D2:C9:CA:2D:88:DB:1A:71:0E:4B:78:EB:02:41
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDITCCAoqgAwIBAgIBADANBgkqhkiG9w0BAQQFADCByzELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYD
+VQQKExFUaGF3dGUgQ29uc3VsdGluZzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBT
+ZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFBlcnNvbmFsIEJhc2lj
+IENBMSgwJgYJKoZIhvcNAQkBFhlwZXJzb25hbC1iYXNpY0B0aGF3dGUuY29tMB4X
+DTk2MDEwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgcsxCzAJBgNVBAYTAlpBMRUw
+EwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEaMBgGA1UE
+ChMRVGhhd3RlIENvbnN1bHRpbmcxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2Vy
+dmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQZXJzb25hbCBCYXNpYyBD
+QTEoMCYGCSqGSIb3DQEJARYZcGVyc29uYWwtYmFzaWNAdGhhd3RlLmNvbTCBnzAN
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvLyTU23AUE+CFeZIlDWmWr5vQvoPR+53
+dXLdjUmbllegeNTKP1GzaQuRdhciB5dqxFGTS+CN7zeVoQxN2jSQHReJl+A1OFdK
+wPQIcOk8RHtQfmGakOMj04gRRif1CwcOu93RfyAKiLlWCy4cgNrx454p7xS9CkT7
+G1sY0b8jkyECAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQQF
+AAOBgQAt4plrsD16iddZopQBHyvdEktTwq1/qqcAXJFAVyVKOKqEcLnZgA+le1z7
+c8a914phXAPjLSeoF+CEhULcXpvGt7Jtu3Sv5D/Lp7ew4F2+eIMllNLbgQ95B21P
+9DkVWlIBe94y1k049hJcBlDfBVu9FEuh3ym6O0GN92NWod8isQ==
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 0 (0x0)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=ZA, ST=Western Cape, L=Cape Town, O=Thawte Consulting, OU=Certification Services Division, CN=Thawte Personal Basic CA/Email=personal-basic@thawte.com
+        Validity
+            Not Before: Jan  1 00:00:00 1996 GMT
+            Not After : Dec 31 23:59:59 2020 GMT
+        Subject: C=ZA, ST=Western Cape, L=Cape Town, O=Thawte Consulting, OU=Certification Services Division, CN=Thawte Personal Basic CA/Email=personal-basic@thawte.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:bc:bc:93:53:6d:c0:50:4f:82:15:e6:48:94:35:
+                    a6:5a:be:6f:42:fa:0f:47:ee:77:75:72:dd:8d:49:
+                    9b:96:57:a0:78:d4:ca:3f:51:b3:69:0b:91:76:17:
+                    22:07:97:6a:c4:51:93:4b:e0:8d:ef:37:95:a1:0c:
+                    4d:da:34:90:1d:17:89:97:e0:35:38:57:4a:c0:f4:
+                    08:70:e9:3c:44:7b:50:7e:61:9a:90:e3:23:d3:88:
+                    11:46:27:f5:0b:07:0e:bb:dd:d1:7f:20:0a:88:b9:
+                    56:0b:2e:1c:80:da:f1:e3:9e:29:ef:14:bd:0a:44:
+                    fb:1b:5b:18:d1:bf:23:93:21
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: md5WithRSAEncryption
+        2d:e2:99:6b:b0:3d:7a:89:d7:59:a2:94:01:1f:2b:dd:12:4b:
+        53:c2:ad:7f:aa:a7:00:5c:91:40:57:25:4a:38:aa:84:70:b9:
+        d9:80:0f:a5:7b:5c:fb:73:c6:bd:d7:8a:61:5c:03:e3:2d:27:
+        a8:17:e0:84:85:42:dc:5e:9b:c6:b7:b2:6d:bb:74:af:e4:3f:
+        cb:a7:b7:b0:e0:5d:be:78:83:25:94:d2:db:81:0f:79:07:6d:
+        4f:f4:39:15:5a:52:01:7b:de:32:d6:4d:38:f6:12:5c:06:50:
+        df:05:5b:bd:14:4b:a1:df:29:ba:3b:41:8d:f7:63:56:a1:df:
+        22:b1
+
+Thawte Personal Freemail CA
+===========================
+MD5 Fingerprint: 1E:74:C3:86:3C:0C:35:C5:3E:C2:7F:EF:3C:AA:3C:D9
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDLTCCApagAwIBAgIBADANBgkqhkiG9w0BAQQFADCB0TELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYD
+VQQKExFUaGF3dGUgQ29uc3VsdGluZzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBT
+ZXJ2aWNlcyBEaXZpc2lvbjEkMCIGA1UEAxMbVGhhd3RlIFBlcnNvbmFsIEZyZWVt
+YWlsIENBMSswKQYJKoZIhvcNAQkBFhxwZXJzb25hbC1mcmVlbWFpbEB0aGF3dGUu
+Y29tMB4XDTk2MDEwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgdExCzAJBgNVBAYT
+AlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEa
+MBgGA1UEChMRVGhhd3RlIENvbnN1bHRpbmcxKDAmBgNVBAsTH0NlcnRpZmljYXRp
+b24gU2VydmljZXMgRGl2aXNpb24xJDAiBgNVBAMTG1RoYXd0ZSBQZXJzb25hbCBG
+cmVlbWFpbCBDQTErMCkGCSqGSIb3DQEJARYccGVyc29uYWwtZnJlZW1haWxAdGhh
+d3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA1GnX1LCUZFtx6UfY
+DFG26nKRsIRefS0Nj3sS34UldSh0OkIsYyeflXtL734Zhx2G6qPduc6WZBrCFG5E
+rHzmj+hND3EfQDimAKOHePb5lIZererAXnbr2RSjXW56fAylS1V/Bhkpf56aJtVq
+uzgkCGqYx7Hao5iR/Xnb5VrEHLkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zAN
+BgkqhkiG9w0BAQQFAAOBgQDH7JJ+Tvj1lqVnYiqk8E0RYNBvjWBYYawmu1I1XAjP
+MPuoSpaKH2JCI4wXD/S6ZJwXrEcp352YXtJsYHFcoqzceePnbgBHH7UNKOgCneSa
+/RP0ptl8sfjcXyMmCZGAc9AUG95DqYMl8uacLxXK/qarigd1iwzdUYRr5PjRznei
+gQ==
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 0 (0x0)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=ZA, ST=Western Cape, L=Cape Town, O=Thawte Consulting, OU=Certification Services Division, CN=Thawte Personal Freemail CA/Email=personal-freemail@thawte.com
+        Validity
+            Not Before: Jan  1 00:00:00 1996 GMT
+            Not After : Dec 31 23:59:59 2020 GMT
+        Subject: C=ZA, ST=Western Cape, L=Cape Town, O=Thawte Consulting, OU=Certification Services Division, CN=Thawte Personal Freemail CA/Email=personal-freemail@thawte.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:d4:69:d7:d4:b0:94:64:5b:71:e9:47:d8:0c:51:
+                    b6:ea:72:91:b0:84:5e:7d:2d:0d:8f:7b:12:df:85:
+                    25:75:28:74:3a:42:2c:63:27:9f:95:7b:4b:ef:7e:
+                    19:87:1d:86:ea:a3:dd:b9:ce:96:64:1a:c2:14:6e:
+                    44:ac:7c:e6:8f:e8:4d:0f:71:1f:40:38:a6:00:a3:
+                    87:78:f6:f9:94:86:5e:ad:ea:c0:5e:76:eb:d9:14:
+                    a3:5d:6e:7a:7c:0c:a5:4b:55:7f:06:19:29:7f:9e:
+                    9a:26:d5:6a:bb:38:24:08:6a:98:c7:b1:da:a3:98:
+                    91:fd:79:db:e5:5a:c4:1c:b9
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: md5WithRSAEncryption
+        c7:ec:92:7e:4e:f8:f5:96:a5:67:62:2a:a4:f0:4d:11:60:d0:
+        6f:8d:60:58:61:ac:26:bb:52:35:5c:08:cf:30:fb:a8:4a:96:
+        8a:1f:62:42:23:8c:17:0f:f4:ba:64:9c:17:ac:47:29:df:9d:
+        98:5e:d2:6c:60:71:5c:a2:ac:dc:79:e3:e7:6e:00:47:1f:b5:
+        0d:28:e8:02:9d:e4:9a:fd:13:f4:a6:d9:7c:b1:f8:dc:5f:23:
+        26:09:91:80:73:d0:14:1b:de:43:a9:83:25:f2:e6:9c:2f:15:
+        ca:fe:a6:ab:8a:07:75:8b:0c:dd:51:84:6b:e4:f8:d1:ce:77:
+        a2:81
+
+Thawte Personal Premium CA
+==========================
+MD5 Fingerprint: 3A:B2:DE:22:9A:20:93:49:F9:ED:C8:D2:8A:E7:68:0D
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDKTCCApKgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBzzELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYD
+VQQKExFUaGF3dGUgQ29uc3VsdGluZzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBT
+ZXJ2aWNlcyBEaXZpc2lvbjEjMCEGA1UEAxMaVGhhd3RlIFBlcnNvbmFsIFByZW1p
+dW0gQ0ExKjAoBgkqhkiG9w0BCQEWG3BlcnNvbmFsLXByZW1pdW1AdGhhd3RlLmNv
+bTAeFw05NjAxMDEwMDAwMDBaFw0yMDEyMzEyMzU5NTlaMIHPMQswCQYDVQQGEwJa
+QTEVMBMGA1UECBMMV2VzdGVybiBDYXBlMRIwEAYDVQQHEwlDYXBlIFRvd24xGjAY
+BgNVBAoTEVRoYXd0ZSBDb25zdWx0aW5nMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9u
+IFNlcnZpY2VzIERpdmlzaW9uMSMwIQYDVQQDExpUaGF3dGUgUGVyc29uYWwgUHJl
+bWl1bSBDQTEqMCgGCSqGSIb3DQEJARYbcGVyc29uYWwtcHJlbWl1bUB0aGF3dGUu
+Y29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJZtn4B0TPuYwu8KHvE0Vs
+Bd/eJxZRNkERbGw77f4QfRKe5ZtCmv5gMcNmt3M6SK5O0DI3lIi1DbbZ8/JE2dWI
+Et12TfIa/G8jHnrx2JhFTgcQ7xZC0EN1bUre4qrJMf8fAHB8Zs8QJQi6+u4A6UYD
+ZicRFTuqW/KY3TZCstqIdQIDAQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
+SIb3DQEBBAUAA4GBAGk2ifc0KjNyL2071CKyuG+axTZmDhs8obF1Wub9NdP4qPIH
+b4Vnjt4rueIXsDqg8A6iAJrf8xQVbrvIhVqYgPn/vnQdPfP+MCXRNzRn+qVxeTBh
+KXLA4CxM+1bkOqhv5TJZUtt1KFBZDPgLGeSs2a+WjS9Q2wfD6h+rM+D1KzGJ
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 0 (0x0)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=ZA, ST=Western Cape, L=Cape Town, O=Thawte Consulting, OU=Certification Services Division, CN=Thawte Personal Premium CA/Email=personal-premium@thawte.com
+        Validity
+            Not Before: Jan  1 00:00:00 1996 GMT
+            Not After : Dec 31 23:59:59 2020 GMT
+        Subject: C=ZA, ST=Western Cape, L=Cape Town, O=Thawte Consulting, OU=Certification Services Division, CN=Thawte Personal Premium CA/Email=personal-premium@thawte.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:c9:66:d9:f8:07:44:cf:b9:8c:2e:f0:a1:ef:13:
+                    45:6c:05:df:de:27:16:51:36:41:11:6c:6c:3b:ed:
+                    fe:10:7d:12:9e:e5:9b:42:9a:fe:60:31:c3:66:b7:
+                    73:3a:48:ae:4e:d0:32:37:94:88:b5:0d:b6:d9:f3:
+                    f2:44:d9:d5:88:12:dd:76:4d:f2:1a:fc:6f:23:1e:
+                    7a:f1:d8:98:45:4e:07:10:ef:16:42:d0:43:75:6d:
+                    4a:de:e2:aa:c9:31:ff:1f:00:70:7c:66:cf:10:25:
+                    08:ba:fa:ee:00:e9:46:03:66:27:11:15:3b:aa:5b:
+                    f2:98:dd:36:42:b2:da:88:75
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: md5WithRSAEncryption
+        69:36:89:f7:34:2a:33:72:2f:6d:3b:d4:22:b2:b8:6f:9a:c5:
+        36:66:0e:1b:3c:a1:b1:75:5a:e6:fd:35:d3:f8:a8:f2:07:6f:
+        85:67:8e:de:2b:b9:e2:17:b0:3a:a0:f0:0e:a2:00:9a:df:f3:
+        14:15:6e:bb:c8:85:5a:98:80:f9:ff:be:74:1d:3d:f3:fe:30:
+        25:d1:37:34:67:fa:a5:71:79:30:61:29:72:c0:e0:2c:4c:fb:
+        56:e4:3a:a8:6f:e5:32:59:52:db:75:28:50:59:0c:f8:0b:19:
+        e4:ac:d9:af:96:8d:2f:50:db:07:c3:ea:1f:ab:33:e0:f5:2b:
+        31:89
+
+Thawte Premium Server CA
+========================
+MD5 Fingerprint: 06:9F:69:79:16:66:90:02:1B:8C:8C:A2:C3:07:6F:3A
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy
+dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t
+MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB
+MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG
+A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp
+b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl
+cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv
+bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE
+VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ
+ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR
+uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
+9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI
+hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM
+pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg==
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=ZA, ST=Western Cape, L=Cape Town, O=Thawte Consulting cc, OU=Certification Services Division, CN=Thawte Premium Server CA/Email=premium-server@thawte.com
+        Validity
+            Not Before: Aug  1 00:00:00 1996 GMT
+            Not After : Dec 31 23:59:59 2020 GMT
+        Subject: C=ZA, ST=Western Cape, L=Cape Town, O=Thawte Consulting cc, OU=Certification Services Division, CN=Thawte Premium Server CA/Email=premium-server@thawte.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:d2:36:36:6a:8b:d7:c2:5b:9e:da:81:41:62:8f:
+                    38:ee:49:04:55:d6:d0:ef:1c:1b:95:16:47:ef:18:
+                    48:35:3a:52:f4:2b:6a:06:8f:3b:2f:ea:56:e3:af:
+                    86:8d:9e:17:f7:9e:b4:65:75:02:4d:ef:cb:09:a2:
+                    21:51:d8:9b:d0:67:d0:ba:0d:92:06:14:73:d4:93:
+                    cb:97:2a:00:9c:5c:4e:0c:bc:fa:15:52:fc:f2:44:
+                    6e:da:11:4a:6e:08:9f:2f:2d:e3:f9:aa:3a:86:73:
+                    b6:46:53:58:c8:89:05:bd:83:11:b8:73:3f:aa:07:
+                    8d:f4:42:4d:e7:40:9d:1c:37
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: md5WithRSAEncryption
+        26:48:2c:16:c2:58:fa:e8:16:74:0c:aa:aa:5f:54:3f:f2:d7:
+        c9:78:60:5e:5e:6e:37:63:22:77:36:7e:b2:17:c4:34:b9:f5:
+        08:85:fc:c9:01:38:ff:4d:be:f2:16:42:43:e7:bb:5a:46:fb:
+        c1:c6:11:1f:f1:4a:b0:28:46:c9:c3:c4:42:7d:bc:fa:ab:59:
+        6e:d5:b7:51:88:11:e3:a4:85:19:6b:82:4c:a4:0c:12:ad:e9:
+        a4:ae:3f:f1:c3:49:65:9a:8c:c5:c8:3e:25:b7:94:99:bb:92:
+        32:71:07:f0:86:5e:ed:50:27:a6:0d:a6:23:f9:bb:cb:a6:07:
+        14:42
+
+Thawte Server CA
+================
+MD5 Fingerprint: C5:70:C4:A2:ED:53:78:0C:C8:10:53:81:64:CB:D0:1D
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEm
+MCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wHhcNOTYwODAx
+MDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT
+DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3
+dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNl
+cyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3
+DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD
+gY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl/Kj0R1HahbUgdJSGHg91
+yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg71CcEJRCX
+L+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGj
+EzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG
+7oWDTSEwjsrZqG9JGubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6e
+QNuozDJ0uW8NxuOzRAvZim+aKZuZGCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZ
+qdq5snUb9kLy78fyGPmJvKP/iiMucEc=
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=ZA, ST=Western Cape, L=Cape Town, O=Thawte Consulting cc, OU=Certification Services Division, CN=Thawte Server CA/Email=server-certs@thawte.com
+        Validity
+            Not Before: Aug  1 00:00:00 1996 GMT
+            Not After : Dec 31 23:59:59 2020 GMT
+        Subject: C=ZA, ST=Western Cape, L=Cape Town, O=Thawte Consulting cc, OU=Certification Services Division, CN=Thawte Server CA/Email=server-certs@thawte.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:d3:a4:50:6e:c8:ff:56:6b:e6:cf:5d:b6:ea:0c:
+                    68:75:47:a2:aa:c2:da:84:25:fc:a8:f4:47:51:da:
+                    85:b5:20:74:94:86:1e:0f:75:c9:e9:08:61:f5:06:
+                    6d:30:6e:15:19:02:e9:52:c0:62:db:4d:99:9e:e2:
+                    6a:0c:44:38:cd:fe:be:e3:64:09:70:c5:fe:b1:6b:
+                    29:b6:2f:49:c8:3b:d4:27:04:25:10:97:2f:e7:90:
+                    6d:c0:28:42:99:d7:4c:43:de:c3:f5:21:6d:54:9f:
+                    5d:c3:58:e1:c0:e4:d9:5b:b0:b8:dc:b4:7b:df:36:
+                    3a:c2:b5:66:22:12:d6:87:0d
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: md5WithRSAEncryption
+        07:fa:4c:69:5c:fb:95:cc:46:ee:85:83:4d:21:30:8e:ca:d9:
+        a8:6f:49:1a:e6:da:51:e3:60:70:6c:84:61:11:a1:1a:c8:48:
+        3e:59:43:7d:4f:95:3d:a1:8b:b7:0b:62:98:7a:75:8a:dd:88:
+        4e:4e:9e:40:db:a8:cc:32:74:b9:6f:0d:c6:e3:b3:44:0b:d9:
+        8a:6f:9a:29:9b:99:18:28:3b:d1:e3:40:28:9a:5a:3c:d5:b5:
+        e7:20:1b:8b:ca:a4:ab:8d:e9:51:d9:e2:4c:2c:59:a9:da:b9:
+        b2:75:1b:f6:42:f2:ef:c7:f2:18:f9:89:bc:a3:ff:8a:23:2e:
+        70:47
+
+Thawte Universal CA Root
+========================
+MD5 Fingerprint: 17:AF:71:16:52:7B:73:65:22:05:29:28:84:71:9D:13
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIRIjCCCQoCAQAwDQYJKoZIhvcNAQEFBQAwVzEPMA0GA1UEChMGVGhhd3RlMSEw
+HwYDVQQLExhUaGF3dGUgVW5pdmVyc2FsIENBIFJvb3QxITAfBgNVBAMTGFRoYXd0
+ZSBVbml2ZXJzYWwgQ0EgUm9vdDAeFw05OTEyMDUxMzU2MDVaFw0zNzA0MDMxMzU2
+MDVaMFcxDzANBgNVBAoTBlRoYXd0ZTEhMB8GA1UECxMYVGhhd3RlIFVuaXZlcnNh
+bCBDQSBSb290MSEwHwYDVQQDExhUaGF3dGUgVW5pdmVyc2FsIENBIFJvb3Qwgggi
+MA0GCSqGSIb3DQEBAQUAA4IIDwAwgggKAoIIAQDiiQVtw3+tpok6/7vHzZ03seHS
+IR6bYSoV53tXT1U80Lv52T0+przstK1TmhYC6wty/Yryj0QFxevT5b22RDnm+0e/
+ap4KlRjiaOLWltYhrYj99Rf109pCpZDtKZWWdTrah6HU9dOH3gVipuNmdJLPpby7
+32j/cXVWQVk16zNaZlHy0qMKwYzOc1wRby2MlYyRsf3P5a1WlcyFkoOQVUHJwnft
++aN0QgpoCPPQ0WX9Zyw0/yR/53nIBzslV92kDJg9vuDMGWXb8lSir0LUneKuhCMl
+CTMStWoedsSL2UkAbF66H/Ib2mfKJ6qjRCMbg4LO8qsz7VSk3MmrWWXROA7BPhtn
+j9Z1AeBVIt12d+yO3fTPeSJtuVcD9ZkIpzw+NPvEF64jWM0k8yPKagIolAGBNLRs
+a66LGsOj0gk8FlT1Nl8k459KoeJkxhbDpoF6JDZHjsFeDvv5FXgE1g5Z2Z1YZmLS
+lCkyMsh4uWb2tVbhbMYUS5ZSWZECJGpVR9c/tiMaYHeXLuJAr54EV56tEcXJQ3Dv
+SLRerBxpLi6C1VuLvoK+GRRe5w0ix1Eb/x6b8TCPcTEGszQnj196ZoJPii0Tq0LP
+IVael45mNg+Wm+Ur9AKpKmqMLMTDuHAsLSkeP1B3Hm0qVORVCpE4ocW1ZqJ2Wu4P
+v7Rn4ShuD+E2oYLRv9R34cRnMpN4yOdUU/4jeeZozCaQ9hBjXSpvkS2kczJRIfK7
+Fd+qJAhIBt6hnia/uoO/fKTIoIy90v+8hGknEyQYxEUYIyZeGBTKLoiHYqNT5iG3
+uIV7moW7FSZy+Ln3anQPST+SvqkFt5knv78JF0uZTK0REHzfdDH2jyZfqoiuOFfI
+VS3T+9gbUZm+JRs6usB9G+3O0km5z/PFfYmQgdhpSCAQo/jvklEYMosRGMA/G4VW
+zlfJ8oJkxt8CCS5KES+xJ203UvDwFmHxZ43fh3Kvh9rP+1CUbtSUheuKLOoh9ZZK
+RNXgzmp0RE3QBdOHFe020KSLZlVwk+5HBsF+LqUYeWfzKIXxcPcOg6R+VJ5adjLL
+ZRu4zfvIKAPSVJHRp8WFQwgXdqXmL2cI2KGigi0M+MGvY9RQd21rRkpBhdWQX3kt
+xOzXEYdAiuFo4mT4VTL7b5Ms2nfZIcEX5TYsTn6Qf6yUKzJnvjhQdriuQbnXIcUJ
+TGDIo1HENJtXN9/LyTNXi+v7dp8ZTcVqHypFrivtL42npQDLBPolYi50SBvKKoy6
+27Z+9rsCfKnD21h4ob/w/hoQVRHO6GlOlmXGFwPWB2iMVIKuHCJVP/H0CZcowEb3
+TgslHfcH1wkdOhhXODvoMwbnj3hGHlv1BrbsuKYN8boTS9YYIN1pM0ozFa64yJiK
+JyyTvC377jO/ZuZNurabBlVgl0u8RM1+9KHYqi/AAighFmJ42whU8vz0NOPGjxxD
+V86QGkvcLjsokYk/eto1HY4s7kns9DOtyVOojJ8EUz4kHFLJEvliV6O87izrQHwg
+I3ArlflzF4rRwRxpprc4mmf3cB16WgxAz2IPhTzCAk5+tfbFKimEsx83KuGqckLE
+7Wsaj5IcXb7R8lvyq6qp0vW4pEErK5FuEkjKmNg3jcjtADC1tgROfpzahOzA+nvl
+HYikU0awlORcG6ElLA9IUneXCWzsWxgzgwLlgn7NhSEwEf0nT8/kHuw/pVds6Sow
+GSqI5cNpOKtvOXF/hOFBw+HMKokgUi6DD2w5P0stFqwt8CSsAHP0m7MGPwW4FIUf
+q55cPJ5inQ5tO4AJ/ALqopd0ysf541bhw8qlpprAkOAkElPSwovavu0CQ15n4YmY
+ee7LqsrDG9znpUalfGsWh7ZaKNfbJzxepb22Ud0fQ887Jsg6jSVhwUn0PBvJROqv
+HMIrlAEqDjDRW4srR+XD0QQDmw45LNYn1OZwWtl1zyrYyQAF5BOI7MM5+4dhMDZD
+A8ienKIGwi/F/PCAY7FUBKBMqS7G9XZ62NDk1JQR5RW1eAbcuICPmakgMz0QhUxl
+Cco+WF5gk5qqYl3AUQYcXWCgDZxLQ/anFiGkh6rywS7ukjC4nt/fEAGLhglw2Gyo
+t1AeFpa092f9NTohkCoyxwB7TQcQCbkvc9gYfmeZBE8G/FDHhZudQJ2zljf6pdyy
+ck7vTgks/ZH9Tfe7pqE+q3uiA0CmqVUn4vr5Gc6HdarxdTbz87iR+JHDi3UTjkxl
+mhY5auU06HqWWX81sAD9W2n8Qyb69Shu/ofZfiT7tKCCblSi/66/YrT0cgHCy5hH
+mOFMtReAgM6PpijuHkVq+9/xHfxaO9bq9GwdYklXO4qPhurwUwTOnBZo/7q5/IgP
+R/cCRHJAuMo7LVOd3DxWjFl7aBosjXG7bADHGs5vQJKxoy8P2UTyo3Aunu4OrjLQ
+Oz6LB+rmebNcKeJ9a6he+Vox6AiWoowDmEbxuH2QVCbtdmL+numabl7JScdcNFMp
+VNns5EbhgDt12d/7edWH8bqe6xnOTFJz5luHriVPOXnMxrj5EHvs8JtxpAWg0ynT
+Tn8f9C0oeMxVlXsekS/MVhhzi7LbvGkH5tDYT+2i/1iFo23gSlO3Z32NDFxbe3co
+AjVEegTTKEPIazAXXTK4KTW6dto7FEp2GFik+JI8nk0zb0ZrCNkxSGjd9PskVjSy
+z2lmvkjSimYizfJpzcJTE0UpQSLWXZgftqSyo8LuAi9RG9yDpOxwJajUCGEyb+Sh
+gS58Y3L6KWW8cETPXQIDAQABMA0GCSqGSIb3DQEBBQUAA4IIAQBVmjRqIgZpCUUz
+x66pXMcJTpuGvEGQ1JRS9s0jKZRLIs3ovf6dzVLyve2rh8mrq0YEtL2iPyIwR1DA
+S4x2DwP1ktKxLcR6NZzJc4frpp/eD3ON03+Z2LqPb8Tzvhqui6KUNpDi5euNBfT8
+Zd+V8cSUTRdW1588j1A853e/lYYmZPtq/8ba6YyuQrtp5TPG2OkNxlUhScEMtKP5
+m0tc3oNPQQPOKnloOH3wVEkg9bYQ/wjcM2aWm/8G3gCe185WQ5pR/HDN9vBRo7fN
+tFyFYs1xt8YrIyvdw25AQvo3/zcc9npXlIeFI9fUycdfwU0vyQ3XXOycJe6eMIKR
+lnK4dR34CWhXl7ItS+4l7HokKe5y1JwT26vcAwrYShTJCFdEXaG1U4A08hSXz1Le
+og6KEOkU79BgvmGh8SVd1RhzP5MQypbus0DS26NVz1dapQ5PdUff6veQmm31cC4d
+FBw3ZARZULDccoZvnDc9XSivc1Xv0u4kdHQT79zbMUn7P2P10wg+M6XnnQreUyxR
+jmfbm0FlQVC91KSWbIe8EuCUx9PA5MtzWACD4awnhdadU51cvQo+A0OcDJH1bXv4
+QHJ1qxF2kSvhxqofcGl2cBUJ/pPQ1i23FWqbZ1y0aZ8lpn2K+30iqXHyzk6MuCEt
+3v5BcQ3/nexzprsHT4gOWEcufqnCx3jdunqeTuAwTmNvhdQgQen6/kNF5/uverLO
+pAUdIppYht/kzkyp/tgWpW/72M5We/XWIO/kR81jJP+5vvFIo8EBcua9wK3tJg3K
+NJ/8Ai0gTwUgriE9DMIgPD/wBITcz4n9uSWRjtBD5rMgq1wt1UCeoEvY9LLMffFY
+Co6H7YisNpbkVqARivKa0LNXozS7Gas44XRrIsQxzgHVGzbjHjhMM5PfQONZV06s
+bnseWj3FHVusyBCCNQIisvx16BCRjcR9eJNHnhydrGtiAliM1hwj1q94woCcpKok
+VBS1FJjG+CsaJMtxMgrimw5pa91+jGTRLmPvDn+xPohMnVXlyW4XBLdB/72KQcsl
+MW9Edz9HsfyBiAeOBUkgtxHZaQMqA525M4Sa399640Zzo9iijFMZiFVMdLj2RIQr
+0RQtTjkukmj/afyFYhvrVU/vJYRiRZnW2E5vP1MIfR0GlYGAf09OdDaYteKHcJjc
+1/XcUhXmxtZ5ljl/j5XPq4BTrRsLRUAO1Bi9LN6Kd3b98kRHxiHQ5HTw2BgFyHww
+csff8bv8AjCp9EImWQ2TBYKhc+005ThdzVCQ/pT8E7y9/KiiiKdzxLKo0V2IxAKi
+evEEyf6MdMnvHWRBn6welmdkrKsoQced98CYG24HwmR9WoNmVig2nOf7HHcOKKDE
+92t5OQQghMdXk7wboOq860LlqBH+/KxlzP34KIj0pZrlc1HgqJsNA3dO5eCYs4ja
+febGnnwUZsEuU0qSBzegfuk9CeQVfM/9uEGl755mncReBx2H+EGt6ucv0kFjGDf5
+FONN0OX3Q/0V4/k2cwYm3wFPqcNO3iBGd5i0eiQrO3UrTliNm12kxxagvDKIP6GD
+8wDI+NhY6WNdTCu18HJB2Kt3N9ZydK62NpzIpoNJS+DJVgspvgAwy93WyEKKANns
+FdE0cfJbZIf2J9K364awkL8p2yGeNozjIC+VI1FsG8Kk1ebYAkNnoP6bUANEf7vk
+ctXR5NqPkhRk+10UEBJKlQbJZQgpyiGjJjgRySffcGcE/cpIMn9jskV0MVBPh9kg
+cNIhcLHWEJ0zXXiDkW1Vguza5GJjx4FG1xllcipDGZC41yNNTBzgRKlmZ6zucXkn
+Jnhtcg71XUsjtXx8ZekXxjoLDd1eHlHDhrjsf8cnSqVG6GotGcGHo8uZk4dkolUU
+TLdDpZPX59JOeUDKZZlGPT96gHqIaswe5WszRvRQwNUfCbjNii6hJ+tdc6foawrl
+V4IqsPziVFJW8KupEsYjlgcknOC8RqW0IATaCZNj5dQuwn7FMe21FXSGF7mz8yaK
+HQJq2ho/6LrxBG2UUVTiWrRZgx1g0C1zzAe1Joz518aIke+Az10PoWDLRdRCItGx
+cB390LcwkDrGSG1n5TLaj9vjqOMdICWiHOFMuaT2xj9cWA27xrJ3ARaRnxcGDbdA
+PsyPjpxL4J1+mx4Fq4gi+tMoG1cUZEo+JCw4TSFpAHMu0FUtdPIV6JRDPkAqxsa5
+alveoswYUFRdTiqFbPaSiykZfufqSuAiKyW892bPd5pBdPI8FA10afVQg83NLyHb
+IkaK0PdRGpVX8gWLGhntO0XoNsJufvtXIgAfBlOprpPGj3EqMUWS545t5pkiwIP8
+79xXZndPojYx+6ETjeXKo5V9AQxkcDtTQmiAx7udqAA1aZgMqGfYQ+Wqz5XgUZWk
+Fz9CnbgEztN5ecjTihYykuDXou7XN0wvrLh7vkX28RgznHs3piTZvECrAOnDN4ur
+2LbzXoFOsBRrBz4f7ML2RCKVu7Pmb9b5cGW6CoNlqg4TL4MTI1OLQBb6zi/8TQT4
+69isxTbCFVdIOOxVs7Qeuq3SQgYXDXPIV6a+lk2p8sD7eiEc9clwqYKQtfEM1HkQ
+voGm6VxhnHd5mqTDNyZXN8lSLPoI/9BfxmHA9Ha+/N5Oz6tRmXHH33701s8GVhkT
+UwttdFlIGZtTBS2dMlTT5SxTi2Q+1GR744AJFMz+FkZja3Fp+PnLJ/aIVLxFs84C
+yJTuQFv5QgLC/7DYLOsof17JJgGZpw==
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number: 0 (0x0)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: O=Thawte, OU=Thawte Universal CA Root, CN=Thawte Universal CA Root
+        Validity
+            Not Before: Dec  5 13:56:05 1999 GMT
+            Not After : Apr  3 13:56:05 2037 GMT
+        Subject: O=Thawte, OU=Thawte Universal CA Root, CN=Thawte Universal CA Root
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (16384 bit)
+                Modulus (16384 bit):
+                    00:e2:89:05:6d:c3:7f:ad:a6:89:3a:ff:bb:c7:cd:
+                    9d:37:b1:e1:d2:21:1e:9b:61:2a:15:e7:7b:57:4f:
+                    55:3c:d0:bb:f9:d9:3d:3e:a6:bc:ec:b4:ad:53:9a:
+                    16:02:eb:0b:72:fd:8a:f2:8f:44:05:c5:eb:d3:e5:
+                    bd:b6:44:39:e6:fb:47:bf:6a:9e:0a:95:18:e2:68:
+                    e2:d6:96:d6:21:ad:88:fd:f5:17:f5:d3:da:42:a5:
+                    90:ed:29:95:96:75:3a:da:87:a1:d4:f5:d3:87:de:
+                    05:62:a6:e3:66:74:92:cf:a5:bc:bb:df:68:ff:71:
+                    75:56:41:59:35:eb:33:5a:66:51:f2:d2:a3:0a:c1:
+                    8c:ce:73:5c:11:6f:2d:8c:95:8c:91:b1:fd:cf:e5:
+                    ad:56:95:cc:85:92:83:90:55:41:c9:c2:77:ed:f9:
+                    a3:74:42:0a:68:08:f3:d0:d1:65:fd:67:2c:34:ff:
+                    24:7f:e7:79:c8:07:3b:25:57:dd:a4:0c:98:3d:be:
+                    e0:cc:19:65:db:f2:54:a2:af:42:d4:9d:e2:ae:84:
+                    23:25:09:33:12:b5:6a:1e:76:c4:8b:d9:49:00:6c:
+                    5e:ba:1f:f2:1b:da:67:ca:27:aa:a3:44:23:1b:83:
+                    82:ce:f2:ab:33:ed:54:a4:dc:c9:ab:59:65:d1:38:
+                    0e:c1:3e:1b:67:8f:d6:75:01:e0:55:22:dd:76:77:
+                    ec:8e:dd:f4:cf:79:22:6d:b9:57:03:f5:99:08:a7:
+                    3c:3e:34:fb:c4:17:ae:23:58:cd:24:f3:23:ca:6a:
+                    02:28:94:01:81:34:b4:6c:6b:ae:8b:1a:c3:a3:d2:
+                    09:3c:16:54:f5:36:5f:24:e3:9f:4a:a1:e2:64:c6:
+                    16:c3:a6:81:7a:24:36:47:8e:c1:5e:0e:fb:f9:15:
+                    78:04:d6:0e:59:d9:9d:58:66:62:d2:94:29:32:32:
+                    c8:78:b9:66:f6:b5:56:e1:6c:c6:14:4b:96:52:59:
+                    91:02:24:6a:55:47:d7:3f:b6:23:1a:60:77:97:2e:
+                    e2:40:af:9e:04:57:9e:ad:11:c5:c9:43:70:ef:48:
+                    b4:5e:ac:1c:69:2e:2e:82:d5:5b:8b:be:82:be:19:
+                    14:5e:e7:0d:22:c7:51:1b:ff:1e:9b:f1:30:8f:71:
+                    31:06:b3:34:27:8f:5f:7a:66:82:4f:8a:2d:13:ab:
+                    42:cf:21:56:9e:97:8e:66:36:0f:96:9b:e5:2b:f4:
+                    02:a9:2a:6a:8c:2c:c4:c3:b8:70:2c:2d:29:1e:3f:
+                    50:77:1e:6d:2a:54:e4:55:0a:91:38:a1:c5:b5:66:
+                    a2:76:5a:ee:0f:bf:b4:67:e1:28:6e:0f:e1:36:a1:
+                    82:d1:bf:d4:77:e1:c4:67:32:93:78:c8:e7:54:53:
+                    fe:23:79:e6:68:cc:26:90:f6:10:63:5d:2a:6f:91:
+                    2d:a4:73:32:51:21:f2:bb:15:df:aa:24:08:48:06:
+                    de:a1:9e:26:bf:ba:83:bf:7c:a4:c8:a0:8c:bd:d2:
+                    ff:bc:84:69:27:13:24:18:c4:45:18:23:26:5e:18:
+                    14:ca:2e:88:87:62:a3:53:e6:21:b7:b8:85:7b:9a:
+                    85:bb:15:26:72:f8:b9:f7:6a:74:0f:49:3f:92:be:
+                    a9:05:b7:99:27:bf:bf:09:17:4b:99:4c:ad:11:10:
+                    7c:df:74:31:f6:8f:26:5f:aa:88:ae:38:57:c8:55:
+                    2d:d3:fb:d8:1b:51:99:be:25:1b:3a:ba:c0:7d:1b:
+                    ed:ce:d2:49:b9:cf:f3:c5:7d:89:90:81:d8:69:48:
+                    20:10:a3:f8:ef:92:51:18:32:8b:11:18:c0:3f:1b:
+                    85:56:ce:57:c9:f2:82:64:c6:df:02:09:2e:4a:11:
+                    2f:b1:27:6d:37:52:f0:f0:16:61:f1:67:8d:df:87:
+                    72:af:87:da:cf:fb:50:94:6e:d4:94:85:eb:8a:2c:
+                    ea:21:f5:96:4a:44:d5:e0:ce:6a:74:44:4d:d0:05:
+                    d3:87:15:ed:36:d0:a4:8b:66:55:70:93:ee:47:06:
+                    c1:7e:2e:a5:18:79:67:f3:28:85:f1:70:f7:0e:83:
+                    a4:7e:54:9e:5a:76:32:cb:65:1b:b8:cd:fb:c8:28:
+                    03:d2:54:91:d1:a7:c5:85:43:08:17:76:a5:e6:2f:
+                    67:08:d8:a1:a2:82:2d:0c:f8:c1:af:63:d4:50:77:
+                    6d:6b:46:4a:41:85:d5:90:5f:79:2d:c4:ec:d7:11:
+                    87:40:8a:e1:68:e2:64:f8:55:32:fb:6f:93:2c:da:
+                    77:d9:21:c1:17:e5:36:2c:4e:7e:90:7f:ac:94:2b:
+                    32:67:be:38:50:76:b8:ae:41:b9:d7:21:c5:09:4c:
+                    60:c8:a3:51:c4:34:9b:57:37:df:cb:c9:33:57:8b:
+                    eb:fb:76:9f:19:4d:c5:6a:1f:2a:45:ae:2b:ed:2f:
+                    8d:a7:a5:00:cb:04:fa:25:62:2e:74:48:1b:ca:2a:
+                    8c:ba:db:b6:7e:f6:bb:02:7c:a9:c3:db:58:78:a1:
+                    bf:f0:fe:1a:10:55:11:ce:e8:69:4e:96:65:c6:17:
+                    03:d6:07:68:8c:54:82:ae:1c:22:55:3f:f1:f4:09:
+                    97:28:c0:46:f7:4e:0b:25:1d:f7:07:d7:09:1d:3a:
+                    18:57:38:3b:e8:33:06:e7:8f:78:46:1e:5b:f5:06:
+                    b6:ec:b8:a6:0d:f1:ba:13:4b:d6:18:20:dd:69:33:
+                    4a:33:15:ae:b8:c8:98:8a:27:2c:93:bc:2d:fb:ee:
+                    33:bf:66:e6:4d:ba:b6:9b:06:55:60:97:4b:bc:44:
+                    cd:7e:f4:a1:d8:aa:2f:c0:02:28:21:16:62:78:db:
+                    08:54:f2:fc:f4:34:e3:c6:8f:1c:43:57:ce:90:1a:
+                    4b:dc:2e:3b:28:91:89:3f:7a:da:35:1d:8e:2c:ee:
+                    49:ec:f4:33:ad:c9:53:a8:8c:9f:04:53:3e:24:1c:
+                    52:c9:12:f9:62:57:a3:bc:ee:2c:eb:40:7c:20:23:
+                    70:2b:95:f9:73:17:8a:d1:c1:1c:69:a6:b7:38:9a:
+                    67:f7:70:1d:7a:5a:0c:40:cf:62:0f:85:3c:c2:02:
+                    4e:7e:b5:f6:c5:2a:29:84:b3:1f:37:2a:e1:aa:72:
+                    42:c4:ed:6b:1a:8f:92:1c:5d:be:d1:f2:5b:f2:ab:
+                    aa:a9:d2:f5:b8:a4:41:2b:2b:91:6e:12:48:ca:98:
+                    d8:37:8d:c8:ed:00:30:b5:b6:04:4e:7e:9c:da:84:
+                    ec:c0:fa:7b:e5:1d:88:a4:53:46:b0:94:e4:5c:1b:
+                    a1:25:2c:0f:48:52:77:97:09:6c:ec:5b:18:33:83:
+                    02:e5:82:7e:cd:85:21:30:11:fd:27:4f:cf:e4:1e:
+                    ec:3f:a5:57:6c:e9:2a:30:19:2a:88:e5:c3:69:38:
+                    ab:6f:39:71:7f:84:e1:41:c3:e1:cc:2a:89:20:52:
+                    2e:83:0f:6c:39:3f:4b:2d:16:ac:2d:f0:24:ac:00:
+                    73:f4:9b:b3:06:3f:05:b8:14:85:1f:ab:9e:5c:3c:
+                    9e:62:9d:0e:6d:3b:80:09:fc:02:ea:a2:97:74:ca:
+                    c7:f9:e3:56:e1:c3:ca:a5:a6:9a:c0:90:e0:24:12:
+                    53:d2:c2:8b:da:be:ed:02:43:5e:67:e1:89:98:79:
+                    ee:cb:aa:ca:c3:1b:dc:e7:a5:46:a5:7c:6b:16:87:
+                    b6:5a:28:d7:db:27:3c:5e:a5:bd:b6:51:dd:1f:43:
+                    cf:3b:26:c8:3a:8d:25:61:c1:49:f4:3c:1b:c9:44:
+                    ea:af:1c:c2:2b:94:01:2a:0e:30:d1:5b:8b:2b:47:
+                    e5:c3:d1:04:03:9b:0e:39:2c:d6:27:d4:e6:70:5a:
+                    d9:75:cf:2a:d8:c9:00:05:e4:13:88:ec:c3:39:fb:
+                    87:61:30:36:43:03:c8:9e:9c:a2:06:c2:2f:c5:fc:
+                    f0:80:63:b1:54:04:a0:4c:a9:2e:c6:f5:76:7a:d8:
+                    d0:e4:d4:94:11:e5:15:b5:78:06:dc:b8:80:8f:99:
+                    a9:20:33:3d:10:85:4c:65:09:ca:3e:58:5e:60:93:
+                    9a:aa:62:5d:c0:51:06:1c:5d:60:a0:0d:9c:4b:43:
+                    f6:a7:16:21:a4:87:aa:f2:c1:2e:ee:92:30:b8:9e:
+                    df:df:10:01:8b:86:09:70:d8:6c:a8:b7:50:1e:16:
+                    96:b4:f7:67:fd:35:3a:21:90:2a:32:c7:00:7b:4d:
+                    07:10:09:b9:2f:73:d8:18:7e:67:99:04:4f:06:fc:
+                    50:c7:85:9b:9d:40:9d:b3:96:37:fa:a5:dc:b2:72:
+                    4e:ef:4e:09:2c:fd:91:fd:4d:f7:bb:a6:a1:3e:ab:
+                    7b:a2:03:40:a6:a9:55:27:e2:fa:f9:19:ce:87:75:
+                    aa:f1:75:36:f3:f3:b8:91:f8:91:c3:8b:75:13:8e:
+                    4c:65:9a:16:39:6a:e5:34:e8:7a:96:59:7f:35:b0:
+                    00:fd:5b:69:fc:43:26:fa:f5:28:6e:fe:87:d9:7e:
+                    24:fb:b4:a0:82:6e:54:a2:ff:ae:bf:62:b4:f4:72:
+                    01:c2:cb:98:47:98:e1:4c:b5:17:80:80:ce:8f:a6:
+                    28:ee:1e:45:6a:fb:df:f1:1d:fc:5a:3b:d6:ea:f4:
+                    6c:1d:62:49:57:3b:8a:8f:86:ea:f0:53:04:ce:9c:
+                    16:68:ff:ba:b9:fc:88:0f:47:f7:02:44:72:40:b8:
+                    ca:3b:2d:53:9d:dc:3c:56:8c:59:7b:68:1a:2c:8d:
+                    71:bb:6c:00:c7:1a:ce:6f:40:92:b1:a3:2f:0f:d9:
+                    44:f2:a3:70:2e:9e:ee:0e:ae:32:d0:3b:3e:8b:07:
+                    ea:e6:79:b3:5c:29:e2:7d:6b:a8:5e:f9:5a:31:e8:
+                    08:96:a2:8c:03:98:46:f1:b8:7d:90:54:26:ed:76:
+                    62:fe:9e:e9:9a:6e:5e:c9:49:c7:5c:34:53:29:54:
+                    d9:ec:e4:46:e1:80:3b:75:d9:df:fb:79:d5:87:f1:
+                    ba:9e:eb:19:ce:4c:52:73:e6:5b:87:ae:25:4f:39:
+                    79:cc:c6:b8:f9:10:7b:ec:f0:9b:71:a4:05:a0:d3:
+                    29:d3:4e:7f:1f:f4:2d:28:78:cc:55:95:7b:1e:91:
+                    2f:cc:56:18:73:8b:b2:db:bc:69:07:e6:d0:d8:4f:
+                    ed:a2:ff:58:85:a3:6d:e0:4a:53:b7:67:7d:8d:0c:
+                    5c:5b:7b:77:28:02:35:44:7a:04:d3:28:43:c8:6b:
+                    30:17:5d:32:b8:29:35:ba:76:da:3b:14:4a:76:18:
+                    58:a4:f8:92:3c:9e:4d:33:6f:46:6b:08:d9:31:48:
+                    68:dd:f4:fb:24:56:34:b2:cf:69:66:be:48:d2:8a:
+                    66:22:cd:f2:69:cd:c2:53:13:45:29:41:22:d6:5d:
+                    98:1f:b6:a4:b2:a3:c2:ee:02:2f:51:1b:dc:83:a4:
+                    ec:70:25:a8:d4:08:61:32:6f:e4:a1:81:2e:7c:63:
+                    72:fa:29:65:bc:70:44:cf:5d
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: sha1WithRSAEncryption
+        55:9a:34:6a:22:06:69:09:45:33:c7:ae:a9:5c:c7:09:4e:9b:
+        86:bc:41:90:d4:94:52:f6:cd:23:29:94:4b:22:cd:e8:bd:fe:
+        9d:cd:52:f2:bd:ed:ab:87:c9:ab:ab:46:04:b4:bd:a2:3f:22:
+        30:47:50:c0:4b:8c:76:0f:03:f5:92:d2:b1:2d:c4:7a:35:9c:
+        c9:73:87:eb:a6:9f:de:0f:73:8d:d3:7f:99:d8:ba:8f:6f:c4:
+        f3:be:1a:ae:8b:a2:94:36:90:e2:e5:eb:8d:05:f4:fc:65:df:
+        95:f1:c4:94:4d:17:56:d7:9f:3c:8f:50:3c:e7:77:bf:95:86:
+        26:64:fb:6a:ff:c6:da:e9:8c:ae:42:bb:69:e5:33:c6:d8:e9:
+        0d:c6:55:21:49:c1:0c:b4:a3:f9:9b:4b:5c:de:83:4f:41:03:
+        ce:2a:79:68:38:7d:f0:54:49:20:f5:b6:10:ff:08:dc:33:66:
+        96:9b:ff:06:de:00:9e:d7:ce:56:43:9a:51:fc:70:cd:f6:f0:
+        51:a3:b7:cd:b4:5c:85:62:cd:71:b7:c6:2b:23:2b:dd:c3:6e:
+        40:42:fa:37:ff:37:1c:f6:7a:57:94:87:85:23:d7:d4:c9:c7:
+        5f:c1:4d:2f:c9:0d:d7:5c:ec:9c:25:ee:9e:30:82:91:96:72:
+        b8:75:1d:f8:09:68:57:97:b2:2d:4b:ee:25:ec:7a:24:29:ee:
+        72:d4:9c:13:db:ab:dc:03:0a:d8:4a:14:c9:08:57:44:5d:a1:
+        b5:53:80:34:f2:14:97:cf:52:de:a2:0e:8a:10:e9:14:ef:d0:
+        60:be:61:a1:f1:25:5d:d5:18:73:3f:93:10:ca:96:ee:b3:40:
+        d2:db:a3:55:cf:57:5a:a5:0e:4f:75:47:df:ea:f7:90:9a:6d:
+        f5:70:2e:1d:14:1c:37:64:04:59:50:b0:dc:72:86:6f:9c:37:
+        3d:5d:28:af:73:55:ef:d2:ee:24:74:74:13:ef:dc:db:31:49:
+        fb:3f:63:f5:d3:08:3e:33:a5:e7:9d:0a:de:53:2c:51:8e:67:
+        db:9b:41:65:41:50:bd:d4:a4:96:6c:87:bc:12:e0:94:c7:d3:
+        c0:e4:cb:73:58:00:83:e1:ac:27:85:d6:9d:53:9d:5c:bd:0a:
+        3e:03:43:9c:0c:91:f5:6d:7b:f8:40:72:75:ab:11:76:91:2b:
+        e1:c6:aa:1f:70:69:76:70:15:09:fe:93:d0:d6:2d:b7:15:6a:
+        9b:67:5c:b4:69:9f:25:a6:7d:8a:fb:7d:22:a9:71:f2:ce:4e:
+        8c:b8:21:2d:de:fe:41:71:0d:ff:9d:ec:73:a6:bb:07:4f:88:
+        0e:58:47:2e:7e:a9:c2:c7:78:dd:ba:7a:9e:4e:e0:30:4e:63:
+        6f:85:d4:20:41:e9:fa:fe:43:45:e7:fb:af:7a:b2:ce:a4:05:
+        1d:22:9a:58:86:df:e4:ce:4c:a9:fe:d8:16:a5:6f:fb:d8:ce:
+        56:7b:f5:d6:20:ef:e4:47:cd:63:24:ff:b9:be:f1:48:a3:c1:
+        01:72:e6:bd:c0:ad:ed:26:0d:ca:34:9f:fc:02:2d:20:4f:05:
+        20:ae:21:3d:0c:c2:20:3c:3f:f0:04:84:dc:cf:89:fd:b9:25:
+        91:8e:d0:43:e6:b3:20:ab:5c:2d:d5:40:9e:a0:4b:d8:f4:b2:
+        cc:7d:f1:58:0a:8e:87:ed:88:ac:36:96:e4:56:a0:11:8a:f2:
+        9a:d0:b3:57:a3:34:bb:19:ab:38:e1:74:6b:22:c4:31:ce:01:
+        d5:1b:36:e3:1e:38:4c:33:93:df:40:e3:59:57:4e:ac:6e:7b:
+        1e:5a:3d:c5:1d:5b:ac:c8:10:82:35:02:22:b2:fc:75:e8:10:
+        91:8d:c4:7d:78:93:47:9e:1c:9d:ac:6b:62:02:58:8c:d6:1c:
+        23:d6:af:78:c2:80:9c:a4:aa:24:54:14:b5:14:98:c6:f8:2b:
+        1a:24:cb:71:32:0a:e2:9b:0e:69:6b:dd:7e:8c:64:d1:2e:63:
+        ef:0e:7f:b1:3e:88:4c:9d:55:e5:c9:6e:17:04:b7:41:ff:bd:
+        8a:41:cb:25:31:6f:44:77:3f:47:b1:fc:81:88:07:8e:05:49:
+        20:b7:11:d9:69:03:2a:03:9d:b9:33:84:9a:df:df:7a:e3:46:
+        73:a3:d8:a2:8c:53:19:88:55:4c:74:b8:f6:44:84:2b:d1:14:
+        2d:4e:39:2e:92:68:ff:69:fc:85:62:1b:eb:55:4f:ef:25:84:
+        62:45:99:d6:d8:4e:6f:3f:53:08:7d:1d:06:95:81:80:7f:4f:
+        4e:74:36:98:b5:e2:87:70:98:dc:d7:f5:dc:52:15:e6:c6:d6:
+        79:96:39:7f:8f:95:cf:ab:80:53:ad:1b:0b:45:40:0e:d4:18:
+        bd:2c:de:8a:77:76:fd:f2:44:47:c6:21:d0:e4:74:f0:d8:18:
+        05:c8:7c:30:72:c7:df:f1:bb:fc:02:30:a9:f4:42:26:59:0d:
+        93:05:82:a1:73:ed:34:e5:38:5d:cd:50:90:fe:94:fc:13:bc:
+        bd:fc:a8:a2:88:a7:73:c4:b2:a8:d1:5d:88:c4:02:a2:7a:f1:
+        04:c9:fe:8c:74:c9:ef:1d:64:41:9f:ac:1e:96:67:64:ac:ab:
+        28:41:c7:9d:f7:c0:98:1b:6e:07:c2:64:7d:5a:83:66:56:28:
+        36:9c:e7:fb:1c:77:0e:28:a0:c4:f7:6b:79:39:04:20:84:c7:
+        57:93:bc:1b:a0:ea:bc:eb:42:e5:a8:11:fe:fc:ac:65:cc:fd:
+        f8:28:88:f4:a5:9a:e5:73:51:e0:a8:9b:0d:03:77:4e:e5:e0:
+        98:b3:88:da:7d:e6:c6:9e:7c:14:66:c1:2e:53:4a:92:07:37:
+        a0:7e:e9:3d:09:e4:15:7c:cf:fd:b8:41:a5:ef:9e:66:9d:c4:
+        5e:07:1d:87:f8:41:ad:ea:e7:2f:d2:41:63:18:37:f9:14:e3:
+        4d:d0:e5:f7:43:fd:15:e3:f9:36:73:06:26:df:01:4f:a9:c3:
+        4e:de:20:46:77:98:b4:7a:24:2b:3b:75:2b:4e:58:8d:9b:5d:
+        a4:c7:16:a0:bc:32:88:3f:a1:83:f3:00:c8:f8:d8:58:e9:63:
+        5d:4c:2b:b5:f0:72:41:d8:ab:77:37:d6:72:74:ae:b6:36:9c:
+        c8:a6:83:49:4b:e0:c9:56:0b:29:be:00:30:cb:dd:d6:c8:42:
+        8a:00:d9:ec:15:d1:34:71:f2:5b:64:87:f6:27:d2:b7:eb:86:
+        b0:90:bf:29:db:21:9e:36:8c:e3:20:2f:95:23:51:6c:1b:c2:
+        a4:d5:e6:d8:02:43:67:a0:fe:9b:50:03:44:7f:bb:e4:72:d5:
+        d1:e4:da:8f:92:14:64:fb:5d:14:10:12:4a:95:06:c9:65:08:
+        29:ca:21:a3:26:38:11:c9:27:df:70:67:04:fd:ca:48:32:7f:
+        63:b2:45:74:31:50:4f:87:d9:20:70:d2:21:70:b1:d6:10:9d:
+        33:5d:78:83:91:6d:55:82:ec:da:e4:62:63:c7:81:46:d7:19:
+        65:72:2a:43:19:90:b8:d7:23:4d:4c:1c:e0:44:a9:66:67:ac:
+        ee:71:79:27:26:78:6d:72:0e:f5:5d:4b:23:b5:7c:7c:65:e9:
+        17:c6:3a:0b:0d:dd:5e:1e:51:c3:86:b8:ec:7f:c7:27:4a:a5:
+        46:e8:6a:2d:19:c1:87:a3:cb:99:93:87:64:a2:55:14:4c:b7:
+        43:a5:93:d7:e7:d2:4e:79:40:ca:65:99:46:3d:3f:7a:80:7a:
+        88:6a:cc:1e:e5:6b:33:46:f4:50:c0:d5:1f:09:b8:cd:8a:2e:
+        a1:27:eb:5d:73:a7:e8:6b:0a:e5:57:82:2a:b0:fc:e2:54:52:
+        56:f0:ab:a9:12:c6:23:96:07:24:9c:e0:bc:46:a5:b4:20:04:
+        da:09:93:63:e5:d4:2e:c2:7e:c5:31:ed:b5:15:74:86:17:b9:
+        b3:f3:26:8a:1d:02:6a:da:1a:3f:e8:ba:f1:04:6d:94:51:54:
+        e2:5a:b4:59:83:1d:60:d0:2d:73:cc:07:b5:26:8c:f9:d7:c6:
+        88:91:ef:80:cf:5d:0f:a1:60:cb:45:d4:42:22:d1:b1:70:1d:
+        fd:d0:b7:30:90:3a:c6:48:6d:67:e5:32:da:8f:db:e3:a8:e3:
+        1d:20:25:a2:1c:e1:4c:b9:a4:f6:c6:3f:5c:58:0d:bb:c6:b2:
+        77:01:16:91:9f:17:06:0d:b7:40:3e:cc:8f:8e:9c:4b:e0:9d:
+        7e:9b:1e:05:ab:88:22:fa:d3:28:1b:57:14:64:4a:3e:24:2c:
+        38:4d:21:69:00:73:2e:d0:55:2d:74:f2:15:e8:94:43:3e:40:
+        2a:c6:c6:b9:6a:5b:de:a2:cc:18:50:54:5d:4e:2a:85:6c:f6:
+        92:8b:29:19:7e:e7:ea:4a:e0:22:2b:25:bc:f7:66:cf:77:9a:
+        41:74:f2:3c:14:0d:74:69:f5:50:83:cd:cd:2f:21:db:22:46:
+        8a:d0:f7:51:1a:95:57:f2:05:8b:1a:19:ed:3b:45:e8:36:c2:
+        6e:7e:fb:57:22:00:1f:06:53:a9:ae:93:c6:8f:71:2a:31:45:
+        92:e7:8e:6d:e6:99:22:c0:83:fc:ef:dc:57:66:77:4f:a2:36:
+        31:fb:a1:13:8d:e5:ca:a3:95:7d:01:0c:64:70:3b:53:42:68:
+        80:c7:bb:9d:a8:00:35:69:98:0c:a8:67:d8:43:e5:aa:cf:95:
+        e0:51:95:a4:17:3f:42:9d:b8:04:ce:d3:79:79:c8:d3:8a:16:
+        32:92:e0:d7:a2:ee:d7:37:4c:2f:ac:b8:7b:be:45:f6:f1:18:
+        33:9c:7b:37:a6:24:d9:bc:40:ab:00:e9:c3:37:8b:ab:d8:b6:
+        f3:5e:81:4e:b0:14:6b:07:3e:1f:ec:c2:f6:44:22:95:bb:b3:
+        e6:6f:d6:f9:70:65:ba:0a:83:65:aa:0e:13:2f:83:13:23:53:
+        8b:40:16:fa:ce:2f:fc:4d:04:f8:eb:d8:ac:c5:36:c2:15:57:
+        48:38:ec:55:b3:b4:1e:ba:ad:d2:42:06:17:0d:73:c8:57:a6:
+        be:96:4d:a9:f2:c0:fb:7a:21:1c:f5:c9:70:a9:82:90:b5:f1:
+        0c:d4:79:10:be:81:a6:e9:5c:61:9c:77:79:9a:a4:c3:37:26:
+        57:37:c9:52:2c:fa:08:ff:d0:5f:c6:61:c0:f4:76:be:fc:de:
+        4e:cf:ab:51:99:71:c7:df:7e:f4:d6:cf:06:56:19:13:53:0b:
+        6d:74:59:48:19:9b:53:05:2d:9d:32:54:d3:e5:2c:53:8b:64:
+        3e:d4:64:7b:e3:80:09:14:cc:fe:16:46:63:6b:71:69:f8:f9:
+        cb:27:f6:88:54:bc:45:b3:ce:02:c8:94:ee:40:5b:f9:42:02:
+        c2:ff:b0:d8:2c:eb:28:7f:5e:c9:26:01:99:a7
+
+UPS Document Exchange by DST
+============================
+MD5 Fingerprint: 78:A5:FB:10:4B:E4:63:2E:D2:6B:FB:F2:B6:C2:4B:8E
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIID+DCCAuACEQDQHkCLAAACfAAAAAcAAAABMA0GCSqGSIb3DQEBBQUAMIG5MQsw
+CQYDVQQGEwJ1czENMAsGA1UECBMEVXRhaDEXMBUGA1UEBxMOU2FsdCBMYWtlIENp
+dHkxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjEeMBwGA1UE
+CxMVVW5pdGVkIFBhcmNlbCBTZXJ2aWNlMRkwFwYDVQQDExBEU1QgKFVQUykgUm9v
+dENBMSEwHwYJKoZIhvcNAQkBFhJjYUBkaWdzaWd0cnVzdC5jb20wHhcNOTgxMjEw
+MDAyNTQ2WhcNMDgxMjA3MDAyNTQ2WjCBuTELMAkGA1UEBhMCdXMxDTALBgNVBAgT
+BFV0YWgxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MSQwIgYDVQQKExtEaWdpdGFs
+IFNpZ25hdHVyZSBUcnVzdCBDby4xHjAcBgNVBAsTFVVuaXRlZCBQYXJjZWwgU2Vy
+dmljZTEZMBcGA1UEAxMQRFNUIChVUFMpIFJvb3RDQTEhMB8GCSqGSIb3DQEJARYS
+Y2FAZGlnc2lndHJ1c3QuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA7xfsrynm2SsnwNt7JJ9m9ASjwq0KyrDNhCuqN/OAoWDvQo/lXXdfV0JU3Svb
+YbJxXpN7b1/rJCvnpPLr8XOzC431Wdcy36yQjk4xuiVNtgym8eWvDOHlb1IDFcHf
+vn5KpqYYRnA/76dNqNz1dNlhekA8oZQo6sKUiMs3FQUZPJViuhwt+yiM0ciekjxb
+EVQ7eNlHO5stSuY+e2vf9PYFzyj2upg2AJ48N4UKnN63pIXFY/23YhRtFx7MioCF
+QjIRsCHinXfJgBZBnuvlFIl/t8O8T8Gfh5uW7GP2+ZBWDpWjIwqMZNqbuxx3sExd
+5sjo9X15LVckP8zjPSyYzxKfFwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQC7OI4E
+IiZYDiFEVsy9WXwpaMtcD8iGVD+BeKetj8xG9xxUuHktW3IFaugh0OwdHf6kNFG+
+7u3OzJwWaOJddXMIQzGRahArEMJLafjJrZio/bjv9qvwXyHvy4VrCe0vSGa1YHLA
+6KDHmNsO9xtzjTQICnvFd2KqMCObsB6LgJhU3AWHs6liWfyLtxWarETszzUa9w8u
+XZJLAch77qA37eQdgg2ZQUMXrdTVyuP5fReiAdAwD0C53LkEgmmDtvkP+gaS96j0
+1hcc8F5/xCnI5uHi/zZoIVGu/6m6hJKtinsz2JDSwXltMzM5dKwbOHGfLAeQ6h3g
+04lfy+8UjSdUpb1G
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number:
+            d0:1e:40:8b:00:00:02:7c:00:00:00:07:00:00:00:01
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=us, ST=Utah, L=Salt Lake City, O=Digital Signature Trust Co., OU=United Parcel Service, CN=DST (UPS) RootCA/Email=ca@digsigtrust.com
+        Validity
+            Not Before: Dec 10 00:25:46 1998 GMT
+            Not After : Dec  7 00:25:46 2008 GMT
+        Subject: C=us, ST=Utah, L=Salt Lake City, O=Digital Signature Trust Co., OU=United Parcel Service, CN=DST (UPS) RootCA/Email=ca@digsigtrust.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:ef:17:ec:af:29:e6:d9:2b:27:c0:db:7b:24:9f:
+                    66:f4:04:a3:c2:ad:0a:ca:b0:cd:84:2b:aa:37:f3:
+                    80:a1:60:ef:42:8f:e5:5d:77:5f:57:42:54:dd:2b:
+                    db:61:b2:71:5e:93:7b:6f:5f:eb:24:2b:e7:a4:f2:
+                    eb:f1:73:b3:0b:8d:f5:59:d7:32:df:ac:90:8e:4e:
+                    31:ba:25:4d:b6:0c:a6:f1:e5:af:0c:e1:e5:6f:52:
+                    03:15:c1:df:be:7e:4a:a6:a6:18:46:70:3f:ef:a7:
+                    4d:a8:dc:f5:74:d9:61:7a:40:3c:a1:94:28:ea:c2:
+                    94:88:cb:37:15:05:19:3c:95:62:ba:1c:2d:fb:28:
+                    8c:d1:c8:9e:92:3c:5b:11:54:3b:78:d9:47:3b:9b:
+                    2d:4a:e6:3e:7b:6b:df:f4:f6:05:cf:28:f6:ba:98:
+                    36:00:9e:3c:37:85:0a:9c:de:b7:a4:85:c5:63:fd:
+                    b7:62:14:6d:17:1e:cc:8a:80:85:42:32:11:b0:21:
+                    e2:9d:77:c9:80:16:41:9e:eb:e5:14:89:7f:b7:c3:
+                    bc:4f:c1:9f:87:9b:96:ec:63:f6:f9:90:56:0e:95:
+                    a3:23:0a:8c:64:da:9b:bb:1c:77:b0:4c:5d:e6:c8:
+                    e8:f5:7d:79:2d:57:24:3f:cc:e3:3d:2c:98:cf:12:
+                    9f:17
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: sha1WithRSAEncryption
+        bb:38:8e:04:22:26:58:0e:21:44:56:cc:bd:59:7c:29:68:cb:
+        5c:0f:c8:86:54:3f:81:78:a7:ad:8f:cc:46:f7:1c:54:b8:79:
+        2d:5b:72:05:6a:e8:21:d0:ec:1d:1d:fe:a4:34:51:be:ee:ed:
+        ce:cc:9c:16:68:e2:5d:75:73:08:43:31:91:6a:10:2b:10:c2:
+        4b:69:f8:c9:ad:98:a8:fd:b8:ef:f6:ab:f0:5f:21:ef:cb:85:
+        6b:09:ed:2f:48:66:b5:60:72:c0:e8:a0:c7:98:db:0e:f7:1b:
+        73:8d:34:08:0a:7b:c5:77:62:aa:30:23:9b:b0:1e:8b:80:98:
+        54:dc:05:87:b3:a9:62:59:fc:8b:b7:15:9a:ac:44:ec:cf:35:
+        1a:f7:0f:2e:5d:92:4b:01:c8:7b:ee:a0:37:ed:e4:1d:82:0d:
+        99:41:43:17:ad:d4:d5:ca:e3:f9:7d:17:a2:01:d0:30:0f:40:
+        b9:dc:b9:04:82:69:83:b6:f9:0f:fa:06:92:f7:a8:f4:d6:17:
+        1c:f0:5e:7f:c4:29:c8:e6:e1:e2:ff:36:68:21:51:ae:ff:a9:
+        ba:84:92:ad:8a:7b:33:d8:90:d2:c1:79:6d:33:33:39:74:ac:
+        1b:38:71:9f:2c:07:90:ea:1d:e0:d3:89:5f:cb:ef:14:8d:27:
+        54:a5:bd:46
+
+ValiCert Class 1 VA
+===================
+MD5 Fingerprint: 65:58:AB:15:AD:57:6C:1E:A8:A7:B5:69:AC:BF:FF:EB
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIyMjM0OFoXDTE5MDYy
+NTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9Y
+LqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIiGQj4/xEjm84H9b9pGib+
+TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCmDuJWBQ8Y
+TfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0
+LBwGlN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLW
+I8sogTLDAHkY7FkXicnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPw
+nXS3qT6gpf+2SQMT2iLM7XGCK5nPOrf1LXLI
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number: 1 (0x1)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: L=ValiCert Validation Network, O=ValiCert, Inc., OU=ValiCert Class 1 Policy Validation Authority, CN=http://www.valicert.com//Email=info@valicert.com
+        Validity
+            Not Before: Jun 25 22:23:48 1999 GMT
+            Not After : Jun 25 22:23:48 2019 GMT
+        Subject: L=ValiCert Validation Network, O=ValiCert, Inc., OU=ValiCert Class 1 Policy Validation Authority, CN=http://www.valicert.com//Email=info@valicert.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:d8:59:82:7a:89:b8:96:ba:a6:2f:68:6f:58:2e:
+                    a7:54:1c:06:6e:f4:ea:8d:48:bc:31:94:17:f0:f3:
+                    4e:bc:b2:b8:35:92:76:b0:d0:a5:a5:01:d7:00:03:
+                    12:22:19:08:f8:ff:11:23:9b:ce:07:f5:bf:69:1a:
+                    26:fe:4e:e9:d1:7f:9d:2c:40:1d:59:68:6e:a6:f8:
+                    58:b0:9d:1a:8f:d3:3f:f1:dc:19:06:81:a8:0e:e0:
+                    3a:dd:c8:53:45:09:06:e6:0f:70:c3:fa:40:a6:0e:
+                    e2:56:05:0f:18:4d:fc:20:82:d1:73:55:74:8d:76:
+                    72:a0:1d:9d:1d:c0:dd:3f:71
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: sha1WithRSAEncryption
+        50:68:3d:49:f4:2c:1c:06:94:df:95:60:7f:96:7b:17:fe:4f:
+        71:ad:64:c8:dd:77:d2:ef:59:55:e8:3f:e8:8e:05:2a:21:f2:
+        07:d2:b5:a7:52:fe:9c:b1:b6:e2:5b:77:17:40:ea:72:d6:23:
+        cb:28:81:32:c3:00:79:18:ec:59:17:89:c9:c6:6a:1e:71:c9:
+        fd:b7:74:a5:25:45:69:c5:48:ab:19:e1:45:8a:25:6b:19:ee:
+        e5:bb:12:f5:7f:f7:a6:8d:51:c3:f0:9d:74:b7:a9:3e:a0:a5:
+        ff:b6:49:03:13:da:22:cc:ed:71:82:2b:99:cf:3a:b7:f5:2d:
+        72:c8
+
+ValiCert Class 2 VA
+===================
+MD5 Fingerprint: A9:23:75:9B:BA:49:36:6E:31:C2:DB:F2:E7:66:BA:87
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy
+NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY
+dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9
+WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS
+v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v
+UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu
+IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC
+W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number: 1 (0x1)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: L=ValiCert Validation Network, O=ValiCert, Inc., OU=ValiCert Class 2 Policy Validation Authority, CN=http://www.valicert.com//Email=info@valicert.com
+        Validity
+            Not Before: Jun 26 00:19:54 1999 GMT
+            Not After : Jun 26 00:19:54 2019 GMT
+        Subject: L=ValiCert Validation Network, O=ValiCert, Inc., OU=ValiCert Class 2 Policy Validation Authority, CN=http://www.valicert.com//Email=info@valicert.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:ce:3a:71:ca:e5:ab:c8:59:92:55:d7:ab:d8:74:
+                    0e:f9:ee:d9:f6:55:47:59:65:47:0e:05:55:dc:eb:
+                    98:36:3c:5c:53:5d:d3:30:cf:38:ec:bd:41:89:ed:
+                    25:42:09:24:6b:0a:5e:b3:7c:dd:52:2d:4c:e6:d4:
+                    d6:7d:5a:59:a9:65:d4:49:13:2d:24:4d:1c:50:6f:
+                    b5:c1:85:54:3b:fe:71:e4:d3:5c:42:f9:80:e0:91:
+                    1a:0a:5b:39:36:67:f3:3f:55:7c:1b:3f:b4:5f:64:
+                    73:34:e3:b4:12:bf:87:64:f8:da:12:ff:37:27:c1:
+                    b3:43:bb:ef:7b:6e:2e:69:f7
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: sha1WithRSAEncryption
+        3b:7f:50:6f:6f:50:94:99:49:62:38:38:1f:4b:f8:a5:c8:3e:
+        a7:82:81:f6:2b:c7:e8:c5:ce:e8:3a:10:82:cb:18:00:8e:4d:
+        bd:a8:58:7f:a1:79:00:b5:bb:e9:8d:af:41:d9:0f:34:ee:21:
+        81:19:a0:32:49:28:f4:c4:8e:56:d5:52:33:fd:50:d5:7e:99:
+        6c:03:e4:c9:4c:fc:cb:6c:ab:66:b3:4a:21:8c:e5:b5:0c:32:
+        3e:10:b2:cc:6c:a1:dc:9a:98:4c:02:5b:f3:ce:b9:9e:a5:72:
+        0e:4a:b7:3f:3c:e6:16:68:f8:be:ed:74:4c:bc:5b:d5:62:1f:
+        43:dd
+
+ValiCert Class 3 VA
+===================
+MD5 Fingerprint: A2:6F:53:B7:EE:40:DB:4A:68:E7:FA:18:D9:10:4B:72
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMjIzM1oXDTE5MDYy
+NjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjmFGWHOjVsQaBalfD
+cnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td3zZxFJmP3MKS8edgkpfs
+2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89HBFx1cQqY
+JJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliE
+Zwgs3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJ
+n0WuPIqpsHEzXcjFV9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/A
+PhmcGcwTTYJBtYze4D1gCCAPRX5ron+jjBXu
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number: 1 (0x1)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: L=ValiCert Validation Network, O=ValiCert, Inc., OU=ValiCert Class 3 Policy Validation Authority, CN=http://www.valicert.com//Email=info@valicert.com
+        Validity
+            Not Before: Jun 26 00:22:33 1999 GMT
+            Not After : Jun 26 00:22:33 2019 GMT
+        Subject: L=ValiCert Validation Network, O=ValiCert, Inc., OU=ValiCert Class 3 Policy Validation Authority, CN=http://www.valicert.com//Email=info@valicert.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:e3:98:51:96:1c:e8:d5:b1:06:81:6a:57:c3:72:
+                    75:93:ab:cf:9e:a6:fc:f3:16:52:d6:2d:4d:9f:35:
+                    44:a8:2e:04:4d:07:49:8a:38:29:f5:77:37:e7:b7:
+                    ab:5d:df:36:71:14:99:8f:dc:c2:92:f1:e7:60:92:
+                    97:ec:d8:48:dc:bf:c1:02:20:c6:24:a4:28:4c:30:
+                    5a:76:6d:b1:5c:f3:dd:de:9e:10:71:a1:88:c7:5b:
+                    9b:41:6d:ca:b0:b8:8e:15:ee:ad:33:2b:cf:47:04:
+                    5c:75:71:0a:98:24:98:29:a7:49:59:a5:dd:f8:b7:
+                    43:62:61:f3:d3:e2:d0:55:3f
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: sha1WithRSAEncryption
+        56:bb:02:58:84:67:08:2c:df:1f:db:7b:49:33:f5:d3:67:9d:
+        f4:b4:0a:10:b3:c9:c5:2c:e2:92:6a:71:78:27:f2:70:83:42:
+        d3:3e:cf:a9:54:f4:f1:d8:92:16:8c:d1:04:cb:4b:ab:c9:9f:
+        45:ae:3c:8a:a9:b0:71:33:5d:c8:c5:57:df:af:a8:35:b3:7f:
+        89:87:e9:e8:25:92:b8:7f:85:7a:ae:d6:bc:1e:37:58:2a:67:
+        c9:91:cf:2a:81:3e:ed:c6:39:df:c0:3e:19:9c:19:cc:13:4d:
+        82:41:b5:8c:de:e0:3d:60:08:20:0f:45:7e:6b:a2:7f:a3:8c:
+        15:ee
+
+VeriSign Class 4 Primary CA
+===========================
+MD5 Fingerprint: 1B:D1:AD:17:8B:7F:22:13:24:F5:26:E2:5D:4E:B9:10
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIICMTCCAZoCBQKmAAABMA0GCSqGSIb3DQEBAgUAMF8xCzAJBgNVBAYTAlVTMRcw
+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgNCBQdWJsaWMg
+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05NjAxMjkwMDAwMDBa
+Fw05OTEyMzEyMzU5NTlaMF8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2ln
+biwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgNCBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZp
+Y2F0aW9uIEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0LJ1
+9njQrlpQ9OlQqZ+M1++RlHDo0iSQdomF1t+s5gEXMoDwnZNHvJplnR+Xrr/phnVj
+IIm9gFidBAydqMEk6QvlMXi9/C0MN2qeeIDpRnX57aP7E3vIwUzSo+/1PLBij0pd
+O92VZ48TucE81qcmm+zDO3rZTbxtm+gVAePwR6kCAwEAATANBgkqhkiG9w0BAQIF
+AAOBgQBT3dPwnCR+QKri/AAa19oM/DJhuBUNlvP6Vxt/M3yv6ZiaYch6s7f/sdyZ
+g9ysEvxwyR84Qu1E9oAuW2szaayc01znX1oYx7EteQSWQZGZQbE8DbqEOcY7l/Am
+yY7uvcxClf8exwI/VAx49byqYHwCaejcrOICdmHEPgPq0ook0Q==
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number:
+            02:a6:00:00:01
+        Signature Algorithm: md2WithRSAEncryption
+        Issuer: C=US, O=VeriSign, Inc., OU=Class 4 Public Primary Certification Authority
+        Validity
+            Not Before: Jan 29 00:00:00 1996 GMT
+            Not After : Dec 31 23:59:59 1999 GMT
+        Subject: C=US, O=VeriSign, Inc., OU=Class 4 Public Primary Certification Authority
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:d0:b2:75:f6:78:d0:ae:5a:50:f4:e9:50:a9:9f:
+                    8c:d7:ef:91:94:70:e8:d2:24:90:76:89:85:d6:df:
+                    ac:e6:01:17:32:80:f0:9d:93:47:bc:9a:65:9d:1f:
+                    97:ae:bf:e9:86:75:63:20:89:bd:80:58:9d:04:0c:
+                    9d:a8:c1:24:e9:0b:e5:31:78:bd:fc:2d:0c:37:6a:
+                    9e:78:80:e9:46:75:f9:ed:a3:fb:13:7b:c8:c1:4c:
+                    d2:a3:ef:f5:3c:b0:62:8f:4a:5d:3b:dd:95:67:8f:
+                    13:b9:c1:3c:d6:a7:26:9b:ec:c3:3b:7a:d9:4d:bc:
+                    6d:9b:e8:15:01:e3:f0:47:a9
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: md2WithRSAEncryption
+        53:dd:d3:f0:9c:24:7e:40:aa:e2:fc:00:1a:d7:da:0c:fc:32:
+        61:b8:15:0d:96:f3:fa:57:1b:7f:33:7c:af:e9:98:9a:61:c8:
+        7a:b3:b7:ff:b1:dc:99:83:dc:ac:12:fc:70:c9:1f:38:42:ed:
+        44:f6:80:2e:5b:6b:33:69:ac:9c:d3:5c:e7:5f:5a:18:c7:b1:
+        2d:79:04:96:41:91:99:41:b1:3c:0d:ba:84:39:c6:3b:97:f0:
+        26:c9:8e:ee:bd:cc:42:95:ff:1e:c7:02:3f:54:0c:78:f5:bc:
+        aa:60:7c:02:69:e8:dc:ac:e2:02:76:61:c4:3e:03:ea:d2:8a:
+        24:d1
+
+Verisign Class 1 Public Primary Certification Authority
+=======================================================
+MD5 Fingerprint: 97:60:E8:57:5F:D3:50:47:E5:43:0C:94:36:8A:B0:62
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIICPTCCAaYCEQDNun9W8N/kvFT+IqyzcqpVMA0GCSqGSIb3DQEBAgUAMF8xCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xh
+c3MgMSBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05
+NjAxMjkwMDAwMDBaFw0yODA4MDEyMzU5NTlaMF8xCzAJBgNVBAYTAlVTMRcwFQYD
+VQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgMSBQdWJsaWMgUHJp
+bWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOB
+jQAwgYkCgYEA5Rm/baNWYS2ZSHH2Z965jeu3noaACpEO+jglr0aIguVzqKCbJF0N
+H8xlbgyw0FaEGIeaBpsQoXPftFg5a27B9hXVqKg/qhIGjTGsf7A01480Z4gJzRQR
+4k5FVmkfeAKA2txHkSm7NsljXMXg1y2He6G3MrB7MLoqLzGq7qNn2tsCAwEAATAN
+BgkqhkiG9w0BAQIFAAOBgQBMP7iLxmjf7kMzDl3ppssHhE16M/+SG/Q2rdiVIjZo
+EWx8QszznC7EBz8UsA9P/5CSdvnivErpj82ggAr3xSnxgiJduLHdgSOjeyUVRjB5
+FvjqBUuUfx3CHMjjt/QQQDwTw18fU+hI5Ia0e6E1sHslurjTjqs/OJ0ANACY89Fx
+lA==
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number:
+            cd:ba:7f:56:f0:df:e4:bc:54:fe:22:ac:b3:72:aa:55
+        Signature Algorithm: md2WithRSAEncryption
+        Issuer: C=US, O=VeriSign, Inc., OU=Class 1 Public Primary Certification Authority
+        Validity
+            Not Before: Jan 29 00:00:00 1996 GMT
+            Not After : Aug  1 23:59:59 2028 GMT
+        Subject: C=US, O=VeriSign, Inc., OU=Class 1 Public Primary Certification Authority
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:e5:19:bf:6d:a3:56:61:2d:99:48:71:f6:67:de:
+                    b9:8d:eb:b7:9e:86:80:0a:91:0e:fa:38:25:af:46:
+                    88:82:e5:73:a8:a0:9b:24:5d:0d:1f:cc:65:6e:0c:
+                    b0:d0:56:84:18:87:9a:06:9b:10:a1:73:df:b4:58:
+                    39:6b:6e:c1:f6:15:d5:a8:a8:3f:aa:12:06:8d:31:
+                    ac:7f:b0:34:d7:8f:34:67:88:09:cd:14:11:e2:4e:
+                    45:56:69:1f:78:02:80:da:dc:47:91:29:bb:36:c9:
+                    63:5c:c5:e0:d7:2d:87:7b:a1:b7:32:b0:7b:30:ba:
+                    2a:2f:31:aa:ee:a3:67:da:db
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: md2WithRSAEncryption
+        4c:3f:b8:8b:c6:68:df:ee:43:33:0e:5d:e9:a6:cb:07:84:4d:
+        7a:33:ff:92:1b:f4:36:ad:d8:95:22:36:68:11:6c:7c:42:cc:
+        f3:9c:2e:c4:07:3f:14:b0:0f:4f:ff:90:92:76:f9:e2:bc:4a:
+        e9:8f:cd:a0:80:0a:f7:c5:29:f1:82:22:5d:b8:b1:dd:81:23:
+        a3:7b:25:15:46:30:79:16:f8:ea:05:4b:94:7f:1d:c2:1c:c8:
+        e3:b7:f4:10:40:3c:13:c3:5f:1f:53:e8:48:e4:86:b4:7b:a1:
+        35:b0:7b:25:ba:b8:d3:8e:ab:3f:38:9d:00:34:00:98:f3:d1:
+        71:94
+
+Verisign Class 1 Public Primary Certification Authority - G2
+============================================================
+MD5 Fingerprint: F2:7D:E9:54:E4:A3:22:0D:76:9F:E7:0B:BB:B3:24:2B
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAmsCEDnKVIn+UCIy/jLZ2/sbhBkwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
+c3MgMSBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
+MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
+emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
+DTk4MDUxODAwMDAwMFoXDTE4MDUxODIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMSBQdWJsaWMg
+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
+YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
+MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQCq0Lq+Fi24g9TK0g+8djHKlNgdk4xWArzZbxpvUjZudVYK
+VdPfQ4chEWWKfo+9Id5rMj8bhDSVBZ1BNeuS65bdqlk/AVNtmU/t5eIqWpDBucSm
+Fc/IReumXY6cPvBkJHalzasab7bYe1FhbqZ/h8jit+U03EGI6glAvnOSPWvndQID
+AQABMA0GCSqGSIb3DQEBBQUAA4GBAIv3GhDOdlwHq4OZ3BeAbzQ5XZg+a3Is4cei
+e0ApuXiIukzFo2penm574/ICQQxmvq37rqIUzpLzojSLtLK2JPLl1eDI5WJthHvL
+vrsDi3xXyvA3qZCviu4Dvh0onNkmdqDNxJ1O8K4HFtW+r1cIatCgQkJCHvQgzKV4
+gpUmOIpH
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number:
+            39:ca:54:89:fe:50:22:32:fe:32:d9:db:fb:1b:84:19
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=VeriSign, Inc., OU=Class 1 Public Primary Certification Authority - G2, OU=(c) 1998 VeriSign, Inc. - For authorized use only, OU=VeriSign Trust Network
+        Validity
+            Not Before: May 18 00:00:00 1998 GMT
+            Not After : May 18 23:59:59 2018 GMT
+        Subject: C=US, O=VeriSign, Inc., OU=Class 1 Public Primary Certification Authority - G2, OU=(c) 1998 VeriSign, Inc. - For authorized use only, OU=VeriSign Trust Network
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:aa:d0:ba:be:16:2d:b8:83:d4:ca:d2:0f:bc:76:
+                    31:ca:94:d8:1d:93:8c:56:02:bc:d9:6f:1a:6f:52:
+                    36:6e:75:56:0a:55:d3:df:43:87:21:11:65:8a:7e:
+                    8f:bd:21:de:6b:32:3f:1b:84:34:95:05:9d:41:35:
+                    eb:92:eb:96:dd:aa:59:3f:01:53:6d:99:4f:ed:e5:
+                    e2:2a:5a:90:c1:b9:c4:a6:15:cf:c8:45:eb:a6:5d:
+                    8e:9c:3e:f0:64:24:76:a5:cd:ab:1a:6f:b6:d8:7b:
+                    51:61:6e:a6:7f:87:c8:e2:b7:e5:34:dc:41:88:ea:
+                    09:40:be:73:92:3d:6b:e7:75
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: sha1WithRSAEncryption
+        8b:f7:1a:10:ce:76:5c:07:ab:83:99:dc:17:80:6f:34:39:5d:
+        98:3e:6b:72:2c:e1:c7:a2:7b:40:29:b9:78:88:ba:4c:c5:a3:
+        6a:5e:9e:6e:7b:e3:f2:02:41:0c:66:be:ad:fb:ae:a2:14:ce:
+        92:f3:a2:34:8b:b4:b2:b6:24:f2:e5:d5:e0:c8:e5:62:6d:84:
+        7b:cb:be:bb:03:8b:7c:57:ca:f0:37:a9:90:af:8a:ee:03:be:
+        1d:28:9c:d9:26:76:a0:cd:c4:9d:4e:f0:ae:07:16:d5:be:af:
+        57:08:6a:d0:a0:42:42:42:1e:f4:20:cc:a5:78:82:95:26:38:
+        8a:47
+
+Verisign Class 1 Public Primary Certification Authority - G3
+============================================================
+MD5 Fingerprint: B1:47:BC:18:57:D1:18:A0:78:2D:EC:71:E8:2A:95:73
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCLW3VWhFSFCwDPrzhIzrGkMA0GCSqGSIb3DQEBBQUAMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
+cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
+LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
+aWduIENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
+VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
+aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
+bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
+IENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN2E1Lm0+afY8wR4
+nN493GwTFtl63SRRZsDHJlkNrAYIwpTRMx/wgzUfbhvI3qpuFU5UJ+/EbRrsC+MO
+8ESlV8dAWB6jRx9x7GD2bZTIGDnt/kIYVt/kTEkQeE4BdjVjEjbdZrwBBDajVWjV
+ojYJrKshJlQGrT/KFOCsyq0GHZXi+J3x4GD/wn91K0zM2v6HmSHquv4+VNfSWXjb
+PG7PoBMAGrgnoeS+Z5bKoMWznN3JdZ7rMJpfo83ZrngZPyPpXNspva1VyBtUjGP2
+6KbqxzcSXKMpHgLZ2x87tNcPVkeBFQRKr4Mn0cVYiMHd9qqnoxjaaKptEVHhv2Vr
+n5Z20T0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAq2aN17O6x5q25lXQBfGfMY1a
+qtmqRiYPce2lrVNWYgFHKkTp/j90CxObufRNG7LRX7K20ohcs5/Ny9Sn2WCVhDr4
+wTcdYcrnsMXlkdpUpqwxga6X3s0IrLjAl4B/bnKk52kTlWUfxJM8/XmPBNQ+T+r3
+ns7NZ3xPZQL/kYVUc8f/NveGLezQXk//EZ9yBta4GvFMDSZl4kSAHsef493oCtrs
+pSCAaWihT37ha88HQfqDjrw43bAuEbFrskLMmrz5SCJ5ShkPshw+IHTZasO+8ih4
+E1Z5T21Q6huwtVexN2ZYI/PcD98Kh8TvhgXVOBRgmaNL3gaWcSzy27YfpO8/7g==
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number:
+            8b:5b:75:56:84:54:85:0b:00:cf:af:38:48:ce:b1:a4
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 1999 VeriSign, Inc. - For authorized use only, CN=VeriSign Class 1 Public Primary Certification Authority - G3
+        Validity
+            Not Before: Oct  1 00:00:00 1999 GMT
+            Not After : Jul 16 23:59:59 2036 GMT
+        Subject: C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 1999 VeriSign, Inc. - For authorized use only, CN=VeriSign Class 1 Public Primary Certification Authority - G3
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:dd:84:d4:b9:b4:f9:a7:d8:f3:04:78:9c:de:3d:
+                    dc:6c:13:16:d9:7a:dd:24:51:66:c0:c7:26:59:0d:
+                    ac:06:08:c2:94:d1:33:1f:f0:83:35:1f:6e:1b:c8:
+                    de:aa:6e:15:4e:54:27:ef:c4:6d:1a:ec:0b:e3:0e:
+                    f0:44:a5:57:c7:40:58:1e:a3:47:1f:71:ec:60:f6:
+                    6d:94:c8:18:39:ed:fe:42:18:56:df:e4:4c:49:10:
+                    78:4e:01:76:35:63:12:36:dd:66:bc:01:04:36:a3:
+                    55:68:d5:a2:36:09:ac:ab:21:26:54:06:ad:3f:ca:
+                    14:e0:ac:ca:ad:06:1d:95:e2:f8:9d:f1:e0:60:ff:
+                    c2:7f:75:2b:4c:cc:da:fe:87:99:21:ea:ba:fe:3e:
+                    54:d7:d2:59:78:db:3c:6e:cf:a0:13:00:1a:b8:27:
+                    a1:e4:be:67:96:ca:a0:c5:b3:9c:dd:c9:75:9e:eb:
+                    30:9a:5f:a3:cd:d9:ae:78:19:3f:23:e9:5c:db:29:
+                    bd:ad:55:c8:1b:54:8c:63:f6:e8:a6:ea:c7:37:12:
+                    5c:a3:29:1e:02:d9:db:1f:3b:b4:d7:0f:56:47:81:
+                    15:04:4a:af:83:27:d1:c5:58:88:c1:dd:f6:aa:a7:
+                    a3:18:da:68:aa:6d:11:51:e1:bf:65:6b:9f:96:76:
+                    d1:3d
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: sha1WithRSAEncryption
+        ab:66:8d:d7:b3:ba:c7:9a:b6:e6:55:d0:05:f1:9f:31:8d:5a:
+        aa:d9:aa:46:26:0f:71:ed:a5:ad:53:56:62:01:47:2a:44:e9:
+        fe:3f:74:0b:13:9b:b9:f4:4d:1b:b2:d1:5f:b2:b6:d2:88:5c:
+        b3:9f:cd:cb:d4:a7:d9:60:95:84:3a:f8:c1:37:1d:61:ca:e7:
+        b0:c5:e5:91:da:54:a6:ac:31:81:ae:97:de:cd:08:ac:b8:c0:
+        97:80:7f:6e:72:a4:e7:69:13:95:65:1f:c4:93:3c:fd:79:8f:
+        04:d4:3e:4f:ea:f7:9e:ce:cd:67:7c:4f:65:02:ff:91:85:54:
+        73:c7:ff:36:f7:86:2d:ec:d0:5e:4f:ff:11:9f:72:06:d6:b8:
+        1a:f1:4c:0d:26:65:e2:44:80:1e:c7:9f:e3:dd:e8:0a:da:ec:
+        a5:20:80:69:68:a1:4f:7e:e1:6b:cf:07:41:fa:83:8e:bc:38:
+        dd:b0:2e:11:b1:6b:b2:42:cc:9a:bc:f9:48:22:79:4a:19:0f:
+        b2:1c:3e:20:74:d9:6a:c3:be:f2:28:78:13:56:79:4f:6d:50:
+        ea:1b:b0:b5:57:b1:37:66:58:23:f3:dc:0f:df:0a:87:c4:ef:
+        86:05:d5:38:14:60:99:a3:4b:de:06:96:71:2c:f2:db:b6:1f:
+        a4:ef:3f:ee
+
+Verisign Class 2 Public Primary Certification Authority
+=======================================================
+MD5 Fingerprint: B3:9C:25:B1:C3:2E:32:53:80:15:30:9D:4D:02:77:3E
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEC0b/EoXjaOR6+f/9YtFvgswDQYJKoZIhvcNAQECBQAwXzELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
+cyAyIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
+MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAyIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQC2WoujDWojg4BrzzmH9CETMwZMJaLtVRKXxaeAufqDwSCg+i8VDXyh
+YGt+eSz6Bg86rvYbb7HS/y8oUl+DfUvEerf4Zh+AVPy3wo5ZShRXRtGak75BkQO7
+FYCTXOvnzAhsPz6zSvz/S2wj1VCCJkQZjiPDceoZJEcEnnW/yKYAHwIDAQABMA0G
+CSqGSIb3DQEBAgUAA4GBAIobK/o5wXTXXtgZZKJYSi034DNHD6zt96rbHuSLBlxg
+J8pFUs4W7z8GZOeUaHxgMxURaa+dYo2jA1Rrpr7l7gUYYAS/QoD90KioHgE796Nc
+r6Pc5iaAIzy4RHT3Cq5Ji2F4zCS/iIqnDupzGUH9TQPwiNHleI2lKk/2lw0Xd8rY
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number:
+            2d:1b:fc:4a:17:8d:a3:91:eb:e7:ff:f5:8b:45:be:0b
+        Signature Algorithm: md2WithRSAEncryption
+        Issuer: C=US, O=VeriSign, Inc., OU=Class 2 Public Primary Certification Authority
+        Validity
+            Not Before: Jan 29 00:00:00 1996 GMT
+            Not After : Aug  1 23:59:59 2028 GMT
+        Subject: C=US, O=VeriSign, Inc., OU=Class 2 Public Primary Certification Authority
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:b6:5a:8b:a3:0d:6a:23:83:80:6b:cf:39:87:f4:
+                    21:13:33:06:4c:25:a2:ed:55:12:97:c5:a7:80:b9:
+                    fa:83:c1:20:a0:fa:2f:15:0d:7c:a1:60:6b:7e:79:
+                    2c:fa:06:0f:3a:ae:f6:1b:6f:b1:d2:ff:2f:28:52:
+                    5f:83:7d:4b:c4:7a:b7:f8:66:1f:80:54:fc:b7:c2:
+                    8e:59:4a:14:57:46:d1:9a:93:be:41:91:03:bb:15:
+                    80:93:5c:eb:e7:cc:08:6c:3f:3e:b3:4a:fc:ff:4b:
+                    6c:23:d5:50:82:26:44:19:8e:23:c3:71:ea:19:24:
+                    47:04:9e:75:bf:c8:a6:00:1f
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: md2WithRSAEncryption
+        8a:1b:2b:fa:39:c1:74:d7:5e:d8:19:64:a2:58:4a:2d:37:e0:
+        33:47:0f:ac:ed:f7:aa:db:1e:e4:8b:06:5c:60:27:ca:45:52:
+        ce:16:ef:3f:06:64:e7:94:68:7c:60:33:15:11:69:af:9d:62:
+        8d:a3:03:54:6b:a6:be:e5:ee:05:18:60:04:bf:42:80:fd:d0:
+        a8:a8:1e:01:3b:f7:a3:5c:af:a3:dc:e6:26:80:23:3c:b8:44:
+        74:f7:0a:ae:49:8b:61:78:cc:24:bf:88:8a:a7:0e:ea:73:19:
+        41:fd:4d:03:f0:88:d1:e5:78:8d:a5:2a:4f:f6:97:0d:17:77:
+        ca:d8
+
+Verisign Class 2 Public Primary Certification Authority - G2
+============================================================
+MD5 Fingerprint: 2D:BB:E5:25:D3:D1:65:82:3A:B7:0E:FA:E6:EB:E2:E1
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDAzCCAmwCEQC5L2DMiJ+hekYJuFtwbIqvMA0GCSqGSIb3DQEBBQUAMIHBMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0Ns
+YXNzIDIgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
+MjE6MDgGA1UECxMxKGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9y
+aXplZCB1c2Ugb25seTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazAe
+Fw05ODA1MTgwMDAwMDBaFw0yODA4MDEyMzU5NTlaMIHBMQswCQYDVQQGEwJVUzEX
+MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0NsYXNzIDIgUHVibGlj
+IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjE6MDgGA1UECxMx
+KGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAp4gBIXQs5xoD8JjhlzwPIQjxnNuX6Zr8wgQGE75fUsjM
+HiwSViy4AWkszJkfrbCWrnkE8hM5wXuYuggs6MKEEyyqaekJ9MepAqRCwiNPStjw
+DqL7MWzJ5m+ZJwf15vRMeJ5t60aG+rmGyVTyssSv1EYcWskVMP8NbPUtDm3Of3cC
+AwEAATANBgkqhkiG9w0BAQUFAAOBgQByLvl/0fFx+8Se9sVeUYpAmLho+Jscg9ji
+nb3/7aHmZuovCfTK1+qlK5X2JGCGTUQug6XELaDTrnhpb3LabK4I8GOSN+a7xDAX
+rXfMSTWqz9iP0b63GJZHc2pUIjRkLbYWm1lbtFFZOrMLFPQS32eg9K0yZF6xRnIn
+jBJ7xUS0rg==
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number:
+            b9:2f:60:cc:88:9f:a1:7a:46:09:b8:5b:70:6c:8a:af
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=VeriSign, Inc., OU=Class 2 Public Primary Certification Authority - G2, OU=(c) 1998 VeriSign, Inc. - For authorized use only, OU=VeriSign Trust Network
+        Validity
+            Not Before: May 18 00:00:00 1998 GMT
+            Not After : Aug  1 23:59:59 2028 GMT
+        Subject: C=US, O=VeriSign, Inc., OU=Class 2 Public Primary Certification Authority - G2, OU=(c) 1998 VeriSign, Inc. - For authorized use only, OU=VeriSign Trust Network
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:a7:88:01:21:74:2c:e7:1a:03:f0:98:e1:97:3c:
+                    0f:21:08:f1:9c:db:97:e9:9a:fc:c2:04:06:13:be:
+                    5f:52:c8:cc:1e:2c:12:56:2c:b8:01:69:2c:cc:99:
+                    1f:ad:b0:96:ae:79:04:f2:13:39:c1:7b:98:ba:08:
+                    2c:e8:c2:84:13:2c:aa:69:e9:09:f4:c7:a9:02:a4:
+                    42:c2:23:4f:4a:d8:f0:0e:a2:fb:31:6c:c9:e6:6f:
+                    99:27:07:f5:e6:f4:4c:78:9e:6d:eb:46:86:fa:b9:
+                    86:c9:54:f2:b2:c4:af:d4:46:1c:5a:c9:15:30:ff:
+                    0d:6c:f5:2d:0e:6d:ce:7f:77
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: sha1WithRSAEncryption
+        72:2e:f9:7f:d1:f1:71:fb:c4:9e:f6:c5:5e:51:8a:40:98:b8:
+        68:f8:9b:1c:83:d8:e2:9d:bd:ff:ed:a1:e6:66:ea:2f:09:f4:
+        ca:d7:ea:a5:2b:95:f6:24:60:86:4d:44:2e:83:a5:c4:2d:a0:
+        d3:ae:78:69:6f:72:da:6c:ae:08:f0:63:92:37:e6:bb:c4:30:
+        17:ad:77:cc:49:35:aa:cf:d8:8f:d1:be:b7:18:96:47:73:6a:
+        54:22:34:64:2d:b6:16:9b:59:5b:b4:51:59:3a:b3:0b:14:f4:
+        12:df:67:a0:f4:ad:32:64:5e:b1:46:72:27:8c:12:7b:c5:44:
+        b4:ae
+
+Verisign Class 2 Public Primary Certification Authority - G3
+============================================================
+MD5 Fingerprint: F8:BE:C4:63:22:C9:A8:46:74:8B:B8:1D:1E:4A:2B:F6
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIEGTCCAwECEGFwy0mMX5hFKeewptlQW3owDQYJKoZIhvcNAQEFBQAwgcoxCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVy
+aVNpZ24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24s
+IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNp
+Z24gQ2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eSAtIEczMB4XDTk5MTAwMTAwMDAwMFoXDTM2MDcxNjIzNTk1OVowgcoxCzAJBgNV
+BAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNp
+Z24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24sIElu
+Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNpZ24g
+Q2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt
+IEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArwoNwtUs22e5LeWU
+J92lvuCwTY+zYVY81nzD9M0+hsuiiOLh2KRpxbXiv8GmR1BeRjmL1Za6tW8UvxDO
+JxOeBUebMXoT2B/Z0wI3i60sR/COgQanDTAM6/c8DyAd3HJG7qUCyFvDyVZpTMUY
+wZF7C9UTAJu878NIPkZgIIUq1ZC2zYugzDLdt/1AVbJQHFauzI13TccgTacxdu9o
+koqQHgiBVrKtaaNS0MscxCM9H5n+TOgWY47GCI72MfbS+uV23bUckqNJzc0BzWjN
+qWm6o+sdDZykIKbBoMXRRkwXbdKsZj+WjOCE1Db/IlnF+RFgqF8EffIa9iVCYQ/E
+Srg+iQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA0JhU8wI1NQ0kdvekhktdmnLfe
+xbjQ5F1fdiLAJvmEOjr5jLX77GDx6M4EsMjdpwOPMPOY36TmpDHf0xwLRtxyID+u
+7gU8pDM/CzmscHhzS5kr3zDCVLCoO1Wh/hYozUK9dG6A2ydEp85EXdQbkJgNHkKU
+sQAsBNB0owIFImNjzYO1+8FtYmtpdf1dcEG59b98377BMnMiIYtYgXsVkXq642RI
+sH/7NiXaldDxJBQX3RiAa0YjOVT1jmIJBB2UkKab5iXiQkWquJCtvgiPqQtCGJTP
+cjnhsUPgKM+351psE2tJs//jGHyJizNdrDPXp/naOlXJWBD5qu9ats9LS98q
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number:
+            61:70:cb:49:8c:5f:98:45:29:e7:b0:a6:d9:50:5b:7a
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 1999 VeriSign, Inc. - For authorized use only, CN=VeriSign Class 2 Public Primary Certification Authority - G3
+        Validity
+            Not Before: Oct  1 00:00:00 1999 GMT
+            Not After : Jul 16 23:59:59 2036 GMT
+        Subject: C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 1999 VeriSign, Inc. - For authorized use only, CN=VeriSign Class 2 Public Primary Certification Authority - G3
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:af:0a:0d:c2:d5:2c:db:67:b9:2d:e5:94:27:dd:
+                    a5:be:e0:b0:4d:8f:b3:61:56:3c:d6:7c:c3:f4:cd:
+                    3e:86:cb:a2:88:e2:e1:d8:a4:69:c5:b5:e2:bf:c1:
+                    a6:47:50:5e:46:39:8b:d5:96:ba:b5:6f:14:bf:10:
+                    ce:27:13:9e:05:47:9b:31:7a:13:d8:1f:d9:d3:02:
+                    37:8b:ad:2c:47:f0:8e:81:06:a7:0d:30:0c:eb:f7:
+                    3c:0f:20:1d:dc:72:46:ee:a5:02:c8:5b:c3:c9:56:
+                    69:4c:c5:18:c1:91:7b:0b:d5:13:00:9b:bc:ef:c3:
+                    48:3e:46:60:20:85:2a:d5:90:b6:cd:8b:a0:cc:32:
+                    dd:b7:fd:40:55:b2:50:1c:56:ae:cc:8d:77:4d:c7:
+                    20:4d:a7:31:76:ef:68:92:8a:90:1e:08:81:56:b2:
+                    ad:69:a3:52:d0:cb:1c:c4:23:3d:1f:99:fe:4c:e8:
+                    16:63:8e:c6:08:8e:f6:31:f6:d2:fa:e5:76:dd:b5:
+                    1c:92:a3:49:cd:cd:01:cd:68:cd:a9:69:ba:a3:eb:
+                    1d:0d:9c:a4:20:a6:c1:a0:c5:d1:46:4c:17:6d:d2:
+                    ac:66:3f:96:8c:e0:84:d4:36:ff:22:59:c5:f9:11:
+                    60:a8:5f:04:7d:f2:1a:f6:25:42:61:0f:c4:4a:b8:
+                    3e:89
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: sha1WithRSAEncryption
+        34:26:15:3c:c0:8d:4d:43:49:1d:bd:e9:21:92:d7:66:9c:b7:
+        de:c5:b8:d0:e4:5d:5f:76:22:c0:26:f9:84:3a:3a:f9:8c:b5:
+        fb:ec:60:f1:e8:ce:04:b0:c8:dd:a7:03:8f:30:f3:98:df:a4:
+        e6:a4:31:df:d3:1c:0b:46:dc:72:20:3f:ae:ee:05:3c:a4:33:
+        3f:0b:39:ac:70:78:73:4b:99:2b:df:30:c2:54:b0:a8:3b:55:
+        a1:fe:16:28:cd:42:bd:74:6e:80:db:27:44:a7:ce:44:5d:d4:
+        1b:90:98:0d:1e:42:94:b1:00:2c:04:d0:74:a3:02:05:22:63:
+        63:cd:83:b5:fb:c1:6d:62:6b:69:75:fd:5d:70:41:b9:f5:bf:
+        7c:df:be:c1:32:73:22:21:8b:58:81:7b:15:91:7a:ba:e3:64:
+        48:b0:7f:fb:36:25:da:95:d0:f1:24:14:17:dd:18:80:6b:46:
+        23:39:54:f5:8e:62:09:04:1d:94:90:a6:9b:e6:25:e2:42:45:
+        aa:b8:90:ad:be:08:8f:a9:0b:42:18:94:cf:72:39:e1:b1:43:
+        e0:28:cf:b7:e7:5a:6c:13:6b:49:b3:ff:e3:18:7c:89:8b:33:
+        5d:ac:33:d7:a7:f9:da:3a:55:c9:58:10:f9:aa:ef:5a:b6:cf:
+        4b:4b:df:2a
+
+Verisign Class 3 Public Primary Certification Authority
+=======================================================
+MD5 Fingerprint: 10:FC:63:5D:F6:26:3E:0D:F3:25:BE:5F:79:CD:67:67
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
+cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
+MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
+BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
+I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
+CSqGSIb3DQEBAgUAA4GBALtMEivPLCYATxQT3ab7/AoRhIzzKBxnki98tsX63/Do
+lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc
+AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number:
+            70:ba:e4:1d:10:d9:29:34:b6:38:ca:7b:03:cc:ba:bf
+        Signature Algorithm: md2WithRSAEncryption
+        Issuer: C=US, O=VeriSign, Inc., OU=Class 3 Public Primary Certification Authority
+        Validity
+            Not Before: Jan 29 00:00:00 1996 GMT
+            Not After : Aug  1 23:59:59 2028 GMT
+        Subject: C=US, O=VeriSign, Inc., OU=Class 3 Public Primary Certification Authority
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:c9:5c:59:9e:f2:1b:8a:01:14:b4:10:df:04:40:
+                    db:e3:57:af:6a:45:40:8f:84:0c:0b:d1:33:d9:d9:
+                    11:cf:ee:02:58:1f:25:f7:2a:a8:44:05:aa:ec:03:
+                    1f:78:7f:9e:93:b9:9a:00:aa:23:7d:d6:ac:85:a2:
+                    63:45:c7:72:27:cc:f4:4c:c6:75:71:d2:39:ef:4f:
+                    42:f0:75:df:0a:90:c6:8e:20:6f:98:0f:f8:ac:23:
+                    5f:70:29:36:a4:c9:86:e7:b1:9a:20:cb:53:a5:85:
+                    e7:3d:be:7d:9a:fe:24:45:33:dc:76:15:ed:0f:a2:
+                    71:64:4c:65:2e:81:68:45:a7
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: md2WithRSAEncryption
+        bb:4c:12:2b:cf:2c:26:00:4f:14:13:dd:a6:fb:fc:0a:11:84:
+        8c:f3:28:1c:67:92:2f:7c:b6:c5:fa:df:f0:e8:95:bc:1d:8f:
+        6c:2c:a8:51:cc:73:d8:a4:c0:53:f0:4e:d6:26:c0:76:01:57:
+        81:92:5e:21:f1:d1:b1:ff:e7:d0:21:58:cd:69:17:e3:44:1c:
+        9c:19:44:39:89:5c:dc:9c:00:0f:56:8d:02:99:ed:a2:90:45:
+        4c:e4:bb:10:a4:3d:f0:32:03:0e:f1:ce:f8:e8:c9:51:8c:e6:
+        62:9f:e6:9f:c0:7d:b7:72:9c:c9:36:3a:6b:9f:4e:a8:ff:64:
+        0d:64
+
+Verisign Class 3 Public Primary Certification Authority - G2
+============================================================
+MD5 Fingerprint: A2:33:9B:4C:74:78:73:D4:6C:E7:C1:F3:8D:CB:5C:E9
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
+c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
+MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
+emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
+DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg
+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
+YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
+MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4
+pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0
+13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID
+AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk
+U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i
+F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY
+oJ2daZH9
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number:
+            7d:d9:fe:07:cf:a8:1e:b7:10:79:67:fb:a7:89:34:c6
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=VeriSign, Inc., OU=Class 3 Public Primary Certification Authority - G2, OU=(c) 1998 VeriSign, Inc. - For authorized use only, OU=VeriSign Trust Network
+        Validity
+            Not Before: May 18 00:00:00 1998 GMT
+            Not After : Aug  1 23:59:59 2028 GMT
+        Subject: C=US, O=VeriSign, Inc., OU=Class 3 Public Primary Certification Authority - G2, OU=(c) 1998 VeriSign, Inc. - For authorized use only, OU=VeriSign Trust Network
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:cc:5e:d1:11:5d:5c:69:d0:ab:d3:b9:6a:4c:99:
+                    1f:59:98:30:8e:16:85:20:46:6d:47:3f:d4:85:20:
+                    84:e1:6d:b3:f8:a4:ed:0c:f1:17:0f:3b:f9:a7:f9:
+                    25:d7:c1:cf:84:63:f2:7c:63:cf:a2:47:f2:c6:5b:
+                    33:8e:64:40:04:68:c1:80:b9:64:1c:45:77:c7:d8:
+                    6e:f5:95:29:3c:50:e8:34:d7:78:1f:a8:ba:6d:43:
+                    91:95:8f:45:57:5e:7e:c5:fb:ca:a4:04:eb:ea:97:
+                    37:54:30:6f:bb:01:47:32:33:cd:dc:57:9b:64:69:
+                    61:f8:9b:1d:1c:89:4f:5c:67
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: sha1WithRSAEncryption
+        51:4d:cd:be:5c:cb:98:19:9c:15:b2:01:39:78:2e:4d:0f:67:
+        70:70:99:c6:10:5a:94:a4:53:4d:54:6d:2b:af:0d:5d:40:8b:
+        64:d3:d7:ee:de:56:61:92:5f:a6:c4:1d:10:61:36:d3:2c:27:
+        3c:e8:29:09:b9:11:64:74:cc:b5:73:9f:1c:48:a9:bc:61:01:
+        ee:e2:17:a6:0c:e3:40:08:3b:0e:e7:eb:44:73:2a:9a:f1:69:
+        92:ef:71:14:c3:39:ac:71:a7:91:09:6f:e4:71:06:b3:ba:59:
+        57:26:79:00:f6:f8:0d:a2:33:30:28:d4:aa:58:a0:9d:9d:69:
+        91:fd
+
+Verisign Class 3 Public Primary Certification Authority - G3
+============================================================
+MD5 Fingerprint: CD:68:B6:A7:C7:C4:CE:75:E0:1D:4F:57:44:61:92:09
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
+cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
+LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
+aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
+VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
+aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
+bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
+IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b
+N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t
+KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu
+kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm
+CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ
+Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu
+imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te
+2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe
+DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
+/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p
+F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt
+TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number:
+            9b:7e:06:49:a3:3e:62:b9:d5:ee:90:48:71:29:ef:57
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 1999 VeriSign, Inc. - For authorized use only, CN=VeriSign Class 3 Public Primary Certification Authority - G3
+        Validity
+            Not Before: Oct  1 00:00:00 1999 GMT
+            Not After : Jul 16 23:59:59 2036 GMT
+        Subject: C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 1999 VeriSign, Inc. - For authorized use only, CN=VeriSign Class 3 Public Primary Certification Authority - G3
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:cb:ba:9c:52:fc:78:1f:1a:1e:6f:1b:37:73:bd:
+                    f8:c9:6b:94:12:30:4f:f0:36:47:f5:d0:91:0a:f5:
+                    17:c8:a5:61:c1:16:40:4d:fb:8a:61:90:e5:76:20:
+                    c1:11:06:7d:ab:2c:6e:a6:f5:11:41:8e:fa:2d:ad:
+                    2a:61:59:a4:67:26:4c:d0:e8:bc:52:5b:70:20:04:
+                    58:d1:7a:c9:a4:69:bc:83:17:64:ad:05:8b:bc:d0:
+                    58:ce:8d:8c:f5:eb:f0:42:49:0b:9d:97:27:67:32:
+                    6e:e1:ae:93:15:1c:70:bc:20:4d:2f:18:de:92:88:
+                    e8:6c:85:57:11:1a:e9:7e:e3:26:11:54:a2:45:96:
+                    55:83:ca:30:89:e8:dc:d8:a3:ed:2a:80:3f:7f:79:
+                    65:57:3e:15:20:66:08:2f:95:93:bf:aa:47:2f:a8:
+                    46:97:f0:12:e2:fe:c2:0a:2b:51:e6:76:e6:b7:46:
+                    b7:e2:0d:a6:cc:a8:c3:4c:59:55:89:e6:e8:53:5c:
+                    1c:ea:9d:f0:62:16:0b:a7:c9:5f:0c:f0:de:c2:76:
+                    ce:af:f7:6a:f2:fa:41:a6:a2:33:14:c9:e5:7a:63:
+                    d3:9e:62:37:d5:85:65:9e:0e:e6:53:24:74:1b:5e:
+                    1d:12:53:5b:c7:2c:e7:83:49:3b:15:ae:8a:68:b9:
+                    57:97
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: sha1WithRSAEncryption
+        11:14:96:c1:ab:92:08:f7:3f:2f:c9:b2:fe:e4:5a:9f:64:de:
+        db:21:4f:86:99:34:76:36:57:dd:d0:15:2f:c5:ad:7f:15:1f:
+        37:62:73:3e:d4:e7:5f:ce:17:03:db:35:fa:2b:db:ae:60:09:
+        5f:1e:5f:8f:6e:bb:0b:3d:ea:5a:13:1e:0c:60:6f:b5:c0:b5:
+        23:22:2e:07:0b:cb:a9:74:cb:47:bb:1d:c1:d7:a5:6b:cc:2f:
+        d2:42:fd:49:dd:a7:89:cf:53:ba:da:00:5a:28:bf:82:df:f8:
+        ba:13:1d:50:86:82:fd:8e:30:8f:29:46:b0:1e:3d:35:da:38:
+        62:16:18:4a:ad:e6:b6:51:6c:de:af:62:eb:01:d0:1e:24:fe:
+        7a:8f:12:1a:12:68:b8:fb:66:99:14:14:45:5c:ae:e7:ae:69:
+        17:81:2b:5a:37:c9:5e:2a:f4:c6:e2:a1:5c:54:9b:a6:54:00:
+        cf:f0:f1:c1:c7:98:30:1a:3b:36:16:db:a3:6e:ea:fd:ad:b2:
+        c2:da:ef:02:47:13:8a:c0:f1:b3:31:ad:4f:1c:e1:4f:9c:af:
+        0f:0c:9d:f7:78:0d:d8:f4:35:56:80:da:b7:6d:17:8f:9d:1e:
+        81:64:e1:fe:c5:45:ba:ad:6b:b9:0a:7a:4e:4f:4b:84:ee:4b:
+        f1:7d:dd:11
+
+Verisign Class 4 Public Primary Certification Authority - G2
+============================================================
+MD5 Fingerprint: 26:6D:2C:19:98:B6:70:68:38:50:54:19:EC:90:34:60
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAmsCEDKIjprS9esTR/h/xCA3JfgwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
+c3MgNCBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
+MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
+emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
+DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgNCBQdWJsaWMg
+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
+YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
+MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQC68OTP+cSuhVS5B1f5j8V/aBH4xBewRNzjMHPVKmIquNDM
+HO0oW369atyzkSTKQWI8/AIBvxwWMZQFl3Zuoq29YRdsTjCG8FE3KlDHqGKB3FtK
+qsGgtG7rL+VXxbErQHDbWk2hjh+9Ax/YA9SPTJlxvOKCzFjomDqG04Y48wApHwID
+AQABMA0GCSqGSIb3DQEBBQUAA4GBAIWMEsGnuVAVess+rLhDityq3RS6iYF+ATwj
+cSGIL4LcY/oCRaxFWdcqWERbt5+BO5JoPeI3JPV7bI92NZYJqFmduc4jq3TWg/0y
+cyfYaT5DdPauxYma51N86Xv2S/PBZYPejYqcPIiNOVn8qj8ijaHBZlCBckztImRP
+T8qAkbYp
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number:
+            32:88:8e:9a:d2:f5:eb:13:47:f8:7f:c4:20:37:25:f8
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=VeriSign, Inc., OU=Class 4 Public Primary Certification Authority - G2, OU=(c) 1998 VeriSign, Inc. - For authorized use only, OU=VeriSign Trust Network
+        Validity
+            Not Before: May 18 00:00:00 1998 GMT
+            Not After : Aug  1 23:59:59 2028 GMT
+        Subject: C=US, O=VeriSign, Inc., OU=Class 4 Public Primary Certification Authority - G2, OU=(c) 1998 VeriSign, Inc. - For authorized use only, OU=VeriSign Trust Network
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:ba:f0:e4:cf:f9:c4:ae:85:54:b9:07:57:f9:8f:
+                    c5:7f:68:11:f8:c4:17:b0:44:dc:e3:30:73:d5:2a:
+                    62:2a:b8:d0:cc:1c:ed:28:5b:7e:bd:6a:dc:b3:91:
+                    24:ca:41:62:3c:fc:02:01:bf:1c:16:31:94:05:97:
+                    76:6e:a2:ad:bd:61:17:6c:4e:30:86:f0:51:37:2a:
+                    50:c7:a8:62:81:dc:5b:4a:aa:c1:a0:b4:6e:eb:2f:
+                    e5:57:c5:b1:2b:40:70:db:5a:4d:a1:8e:1f:bd:03:
+                    1f:d8:03:d4:8f:4c:99:71:bc:e2:82:cc:58:e8:98:
+                    3a:86:d3:86:38:f3:00:29:1f
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: sha1WithRSAEncryption
+        85:8c:12:c1:a7:b9:50:15:7a:cb:3e:ac:b8:43:8a:dc:aa:dd:
+        14:ba:89:81:7e:01:3c:23:71:21:88:2f:82:dc:63:fa:02:45:
+        ac:45:59:d7:2a:58:44:5b:b7:9f:81:3b:92:68:3d:e2:37:24:
+        f5:7b:6c:8f:76:35:96:09:a8:59:9d:b9:ce:23:ab:74:d6:83:
+        fd:32:73:27:d8:69:3e:43:74:f6:ae:c5:89:9a:e7:53:7c:e9:
+        7b:f6:4b:f3:c1:65:83:de:8d:8a:9c:3c:88:8d:39:59:fc:aa:
+        3f:22:8d:a1:c1:66:50:81:72:4c:ed:22:64:4f:4f:ca:80:91:
+        b6:29
+
+Verisign Class 4 Public Primary Certification Authority - G3
+============================================================
+MD5 Fingerprint: DB:C8:F2:27:2E:B1:EA:6A:29:23:5D:FE:56:3E:33:DF
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
+cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
+LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
+aWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
+VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
+aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
+bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
+IENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK3LpRFpxlmr8Y+1
+GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaStBO3IFsJ
++mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0Gbd
+U6LM8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLm
+NxdLMEYH5IBtptiWLugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XY
+ufTsgsbSPZUd5cBPhMnZo0QoBmrXRazwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/
+ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAj/ola09b5KROJ1WrIhVZPMq1
+CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXttmhwwjIDLk5Mq
+g6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm
+fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c
+2NU8Qh0XwRJdRTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/
+bLvSHgCwIe34QWKCudiyxLtGUPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg==
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number:
+            ec:a0:a7:8b:6e:75:6a:01:cf:c4:7c:cc:2f:94:5e:d7
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 1999 VeriSign, Inc. - For authorized use only, CN=VeriSign Class 4 Public Primary Certification Authority - G3
+        Validity
+            Not Before: Oct  1 00:00:00 1999 GMT
+            Not After : Jul 16 23:59:59 2036 GMT
+        Subject: C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 1999 VeriSign, Inc. - For authorized use only, CN=VeriSign Class 4 Public Primary Certification Authority - G3
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:ad:cb:a5:11:69:c6:59:ab:f1:8f:b5:19:0f:56:
+                    ce:cc:b5:1f:20:e4:9e:26:25:4b:e0:73:65:89:59:
+                    de:d0:83:e4:f5:0f:b5:bb:ad:f1:7c:e8:21:fc:e4:
+                    e8:0c:ee:7c:45:22:19:76:92:b4:13:b7:20:5b:09:
+                    fa:61:ae:a8:f2:a5:8d:85:c2:2a:d6:de:66:36:d2:
+                    9b:02:f4:a8:92:60:7c:9c:69:b4:8f:24:1e:d0:86:
+                    52:f6:32:9c:41:58:1e:22:bd:cd:45:62:95:08:6e:
+                    d0:66:dd:53:a2:cc:f0:10:dc:54:73:8b:04:a1:46:
+                    33:33:5c:17:40:b9:9e:4d:d3:f3:be:55:83:e8:b1:
+                    89:8e:5a:7c:9a:96:22:90:3b:88:25:f2:d2:53:88:
+                    02:0c:0b:78:f2:e6:37:17:4b:30:46:07:e4:80:6d:
+                    a6:d8:96:2e:e8:2c:f8:11:b3:38:0d:66:a6:9b:ea:
+                    c9:23:5b:db:8e:e2:f3:13:8e:1a:59:2d:aa:02:f0:
+                    ec:a4:87:66:dc:c1:3f:f5:d8:b9:f4:ec:82:c6:d2:
+                    3d:95:1d:e5:c0:4f:84:c9:d9:a3:44:28:06:6a:d7:
+                    45:ac:f0:6b:6a:ef:4e:5f:f8:11:82:1e:38:63:34:
+                    66:50:d4:3e:93:73:fa:30:c3:66:ad:ff:93:2d:97:
+                    ef:03
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: sha1WithRSAEncryption
+        8f:fa:25:6b:4f:5b:e4:a4:4e:27:55:ab:22:15:59:3c:ca:b5:
+        0a:d4:4a:db:ab:dd:a1:5f:53:c5:a0:57:39:c2:ce:47:2b:be:
+        3a:c8:56:bf:c2:d9:27:10:3a:b1:05:3c:c0:77:31:bb:3a:d3:
+        05:7b:6d:9a:1c:30:8c:80:cb:93:93:2a:83:ab:05:51:82:02:
+        00:11:67:6b:f3:88:61:47:5f:03:93:d5:5b:0d:e0:f1:d4:a1:
+        32:35:85:b2:3a:db:b0:82:ab:d1:cb:0a:bc:4f:8c:5b:c5:4b:
+        00:3b:1f:2a:82:a6:7e:36:85:dc:7e:3c:67:00:b5:e4:3b:52:
+        e0:a8:eb:5d:15:f9:c6:6d:f0:ad:1d:0e:85:b7:a9:9a:73:14:
+        5a:5b:8f:41:28:c0:d5:e8:2d:4d:a4:5e:cd:aa:d9:ed:ce:dc:
+        d8:d5:3c:42:1d:17:c1:12:5d:45:38:c3:38:f3:fc:85:2e:83:
+        46:48:b2:d7:20:5f:92:36:8f:e7:79:0f:98:5e:99:e8:f0:d0:
+        a4:bb:f5:53:bd:2a:ce:59:b0:af:6e:7f:6c:bb:d2:1e:00:b0:
+        21:ed:f8:41:62:82:b9:d8:b2:c4:bb:46:50:f3:31:c5:8f:01:
+        a8:74:eb:f5:78:27:da:e7:f7:66:43:f3:9e:83:3e:20:aa:c3:
+        35:60:91:ce
+
+Verisign/RSA Commercial CA
+==========================
+MD5 Fingerprint: 5A:0B:DD:42:9E:B2:B4:62:97:32:7F:7F:0A:AA:9A:39
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIICIzCCAZACBQJBAAAWMA0GCSqGSIb3DQEBAgUAMFwxCzAJBgNVBAYTAlVTMSAw
+HgYDVQQKExdSU0EgRGF0YSBTZWN1cml0eSwgSW5jLjErMCkGA1UECxMiQ29tbWVy
+Y2lhbCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05NDExMDQxODU4MzRaFw05
+OTExMDMxODU4MzRaMFwxCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdSU0EgRGF0YSBT
+ZWN1cml0eSwgSW5jLjErMCkGA1UECxMiQ29tbWVyY2lhbCBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eTCBmzANBgkqhkiG9w0BAQEFAAOBiQAwgYUCfgCk+4Fie84QJ93o
+975sbsZwmdu41QUDaSiCnHJ/lj+O7Kwpkj+KFPhCdr69XQO5kNTQvAayUTNfxMK/
+touPmbZiImDd298ggrTKoi8tUO2UMt7gVY3UaOLgTNLNBRYulWZcYVI4HlGogqHE
+7yXpCuaLK44xZtn42f29O2nZ6wIDAQABMA0GCSqGSIb3DQEBAgUAA34AdrW2EP4j
+9/dZYkuwX5zBaLxJu7NJbyFHXSudVMQAKD+YufKKg5tgf+tQx6sFEC097TgCwaVI
+0v5loMC86qYjFmZsGySp8+x5NRhPJsjjr1BKx6cxa9B8GJ1Qv6km+iYrRpwUqbtb
+MJhCKLVLU7tDCZJAuqiqWqTGtotXTcU=
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number:
+            02:41:00:00:16
+        Signature Algorithm: md2WithRSAEncryption
+        Issuer: C=US, O=RSA Data Security, Inc., OU=Commercial Certification Authority
+        Validity
+            Not Before: Nov  4 18:58:34 1994 GMT
+            Not After : Nov  3 18:58:34 1999 GMT
+        Subject: C=US, O=RSA Data Security, Inc., OU=Commercial Certification Authority
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1000 bit)
+                Modulus (1000 bit):
+                    00:a4:fb:81:62:7b:ce:10:27:dd:e8:f7:be:6c:6e:
+                    c6:70:99:db:b8:d5:05:03:69:28:82:9c:72:7f:96:
+                    3f:8e:ec:ac:29:92:3f:8a:14:f8:42:76:be:bd:5d:
+                    03:b9:90:d4:d0:bc:06:b2:51:33:5f:c4:c2:bf:b6:
+                    8b:8f:99:b6:62:22:60:dd:db:df:20:82:b4:ca:a2:
+                    2f:2d:50:ed:94:32:de:e0:55:8d:d4:68:e2:e0:4c:
+                    d2:cd:05:16:2e:95:66:5c:61:52:38:1e:51:a8:82:
+                    a1:c4:ef:25:e9:0a:e6:8b:2b:8e:31:66:d9:f8:d9:
+                    fd:bd:3b:69:d9:eb
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: md2WithRSAEncryption
+        76:b5:b6:10:fe:23:f7:f7:59:62:4b:b0:5f:9c:c1:68:bc:49:
+        bb:b3:49:6f:21:47:5d:2b:9d:54:c4:00:28:3f:98:b9:f2:8a:
+        83:9b:60:7f:eb:50:c7:ab:05:10:2d:3d:ed:38:02:c1:a5:48:
+        d2:fe:65:a0:c0:bc:ea:a6:23:16:66:6c:1b:24:a9:f3:ec:79:
+        35:18:4f:26:c8:e3:af:50:4a:c7:a7:31:6b:d0:7c:18:9d:50:
+        bf:a9:26:fa:26:2b:46:9c:14:a9:bb:5b:30:98:42:28:b5:4b:
+        53:bb:43:09:92:40:ba:a8:aa:5a:a4:c6:b6:8b:57:4d:c5
+
+Verisign/RSA Secure Server CA
+=============================
+MD5 Fingerprint: 74:7B:82:03:43:F0:00:9E:6B:B3:EC:47:BF:85:A5:93
+PEM Data:
+-----BEGIN CERTIFICATE-----
+MIICNDCCAaECEAKtZn5ORf5eV288mBle3cAwDQYJKoZIhvcNAQECBQAwXzELMAkG
+A1UEBhMCVVMxIDAeBgNVBAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYD
+VQQLEyVTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk0
+MTEwOTAwMDAwMFoXDTEwMDEwNzIzNTk1OVowXzELMAkGA1UEBhMCVVMxIDAeBgNV
+BAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYDVQQLEyVTZWN1cmUgU2Vy
+dmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGbMA0GCSqGSIb3DQEBAQUAA4GJ
+ADCBhQJ+AJLOesGugz5aqomDV6wlAXYMra6OLDfO6zV4ZFQD5YRAUcm/jwjiioII
+0haGN1XpsSECrXZogZoFokvJSyVmIlZsiAeP94FZbYQHZXATcXY+m3dM41CJVphI
+uR2nKRoTLkoRWZweFdVJVCxzOmmCsZc5nG1wZ0jl3S3WyB57AgMBAAEwDQYJKoZI
+hvcNAQECBQADfgBl3X7hsuyw4jrg7HFGmhkRuNPHoLQDQCYCPgmc4RKz0Vr2N6W3
+YQO2WxZpO8ZECAyIUwxrl0nHPjXcbLm7qt9cuzovk2C2qUtN8iD3zV9/ZHuO3ABc
+1/p3yjkWWW8O6tO1g39NTUJWdrTJXwT4OPjr0l91X817/OWOgHz8UA==
+-----END CERTIFICATE-----
+Certificate Ingredients:
+    Data:
+        Version: 1 (0x0)
+        Serial Number:
+            02:ad:66:7e:4e:45:fe:5e:57:6f:3c:98:19:5e:dd:c0
+        Signature Algorithm: md2WithRSAEncryption
+        Issuer: C=US, O=RSA Data Security, Inc., OU=Secure Server Certification Authority
+        Validity
+            Not Before: Nov  9 00:00:00 1994 GMT
+            Not After : Jan  7 23:59:59 2010 GMT
+        Subject: C=US, O=RSA Data Security, Inc., OU=Secure Server Certification Authority
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1000 bit)
+                Modulus (1000 bit):
+                    00:92:ce:7a:c1:ae:83:3e:5a:aa:89:83:57:ac:25:
+                    01:76:0c:ad:ae:8e:2c:37:ce:eb:35:78:64:54:03:
+                    e5:84:40:51:c9:bf:8f:08:e2:8a:82:08:d2:16:86:
+                    37:55:e9:b1:21:02:ad:76:68:81:9a:05:a2:4b:c9:
+                    4b:25:66:22:56:6c:88:07:8f:f7:81:59:6d:84:07:
+                    65:70:13:71:76:3e:9b:77:4c:e3:50:89:56:98:48:
+                    b9:1d:a7:29:1a:13:2e:4a:11:59:9c:1e:15:d5:49:
+                    54:2c:73:3a:69:82:b1:97:39:9c:6d:70:67:48:e5:
+                    dd:2d:d6:c8:1e:7b
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: md2WithRSAEncryption
+        65:dd:7e:e1:b2:ec:b0:e2:3a:e0:ec:71:46:9a:19:11:b8:d3:
+        c7:a0:b4:03:40:26:02:3e:09:9c:e1:12:b3:d1:5a:f6:37:a5:
+        b7:61:03:b6:5b:16:69:3b:c6:44:08:0c:88:53:0c:6b:97:49:
+        c7:3e:35:dc:6c:b9:bb:aa:df:5c:bb:3a:2f:93:60:b6:a9:4b:
+        4d:f2:20:f7:cd:5f:7f:64:7b:8e:dc:00:5c:d7:fa:77:ca:39:
+        16:59:6f:0e:ea:d3:b5:83:7f:4d:4d:42:56:76:b4:c9:5f:04:
+        f8:38:f8:eb:d2:5f:75:5f:cd:7b:fc:e5:8e:80:7c:fc:50
diff --git a/main/source/curl/lib/ca-bundle.h b/main/source/curl/lib/ca-bundle.h
new file mode 100644
index 00000000..4c726201
--- /dev/null
+++ b/main/source/curl/lib/ca-bundle.h
@@ -0,0 +1,32 @@
+/* lib/ca-bundle.h.  Generated by configure.  */
+#ifndef __CA_BUNDLE_H
+#define __CA_BUNDLE_H
+/*****************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2002, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * In order to be useful for every potential user, curl and libcurl are
+ * dual-licensed under the MPL and the MIT/X-derivate licenses.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the MPL or the MIT/X-derivate
+ * licenses. You may pick one of these licenses.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: ca-bundle.h.in,v 1.1 2002/08/30 07:50:59 bagder Exp $
+ *****************************************************************************/
+
+#ifndef CURL_CA_BUNDLE
+/* Set this to the full path file name of the ca cert bundle */
+/* #undef CURL_CA_BUNDLE */
+#endif
+
+#endif /* __CA_BUNDLE_H */
diff --git a/main/source/curl/lib/ca-bundle.h.in b/main/source/curl/lib/ca-bundle.h.in
new file mode 100644
index 00000000..69f95376
--- /dev/null
+++ b/main/source/curl/lib/ca-bundle.h.in
@@ -0,0 +1,31 @@
+#ifndef __CA_BUNDLE_H
+#define __CA_BUNDLE_H
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2002, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * In order to be useful for every potential user, curl and libcurl are
+ * dual-licensed under the MPL and the MIT/X-derivate licenses.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the MPL or the MIT/X-derivate
+ * licenses. You may pick one of these licenses.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: ca-bundle.h.in,v 1.1 2002/08/30 07:50:59 bagder Exp $
+ *****************************************************************************/
+
+#ifndef CURL_CA_BUNDLE
+/* Set this to the full path file name of the ca cert bundle */
+#undef CURL_CA_BUNDLE
+#endif
+
+#endif /* __CA_BUNDLE_H */
diff --git a/main/source/curl/lib/config-mac.h b/main/source/curl/lib/config-mac.h
new file mode 100644
index 00000000..f7101dc0
--- /dev/null
+++ b/main/source/curl/lib/config-mac.h
@@ -0,0 +1,45 @@
+#define OS "mac"
+
+#define HAVE_NETINET_IN_H	1
+#define HAVE_SYS_SOCKET_H	1
+#define HAVE_SYS_SELECT_H	1
+#define HAVE_NETDB_H		1
+#define HAVE_ARPA_INET_H	1
+#define HAVE_UNISTD_H		1
+#define HAVE_NET_IF_H		1
+#define HAVE_SYS_TYPES_H	1
+#define HAVE_GETTIMEOFDAY	1
+#define HAVE_FCNTL_H		1
+#define HAVE_SYS_STAT_H		1
+#define HAVE_ALLOCA_H		1
+#define HAVE_TIME_H			1
+#define HAVE_STDLIB_H		1
+#define HAVE_UTIME_H		1
+
+#define TIME_WITH_SYS_TIME	1
+
+#define HAVE_STRDUP			1
+#define HAVE_UTIME			1
+#define HAVE_INET_NTOA		1
+#define HAVE_SETVBUF		1
+#define HAVE_STRFTIME		1
+#define HAVE_INET_ADDR		1
+#define HAVE_MEMCPY			1
+#define HAVE_SELECT			1
+#define HAVE_SOCKET			1
+
+//#define HAVE_STRICMP		1
+#define HAVE_SIGACTION		1
+
+#ifdef MACOS_SSL_SUPPORT
+#	define USE_SSLEAY			1
+#	define USE_OPENSSL			1
+#endif
+
+#define HAVE_RAND_STATUS	1
+#define HAVE_RAND_EGD		1
+
+#define HAVE_FIONBIO        1
+
+#include <extra/stricmp.h>
+#include <extra/strdup.h>
diff --git a/main/source/curl/lib/config-riscos.h b/main/source/curl/lib/config-riscos.h
new file mode 100644
index 00000000..6840ef94
--- /dev/null
+++ b/main/source/curl/lib/config-riscos.h
@@ -0,0 +1,390 @@
+/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* Name of this package! */
+#undef PACKAGE
+
+/* Version number of this archive. */
+#undef VERSION
+
+/* Define if you have the getpass function.  */
+#undef HAVE_GETPASS
+
+/* Define cpu-machine-OS */
+#define OS "ARM-RISC OS"
+
+/* Define if you have the gethostbyaddr_r() function with 5 arguments */
+#undef HAVE_GETHOSTBYADDR_R_5
+
+/* Define if you have the gethostbyaddr_r() function with 7 arguments */
+#undef HAVE_GETHOSTBYADDR_R_7
+
+/* Define if you have the gethostbyaddr_r() function with 8 arguments */
+#undef HAVE_GETHOSTBYADDR_R_8
+
+/* Define if you have the gethostbyname_r() function with 3 arguments */
+#undef HAVE_GETHOSTBYNAME_R_3
+
+/* Define if you have the gethostbyname_r() function with 5 arguments */
+#undef HAVE_GETHOSTBYNAME_R_5
+
+/* Define if you have the gethostbyname_r() function with 6 arguments */
+#undef HAVE_GETHOSTBYNAME_R_6
+
+/* Define if you have the inet_ntoa_r function declared. */
+#undef HAVE_INET_NTOA_R_DECL
+
+/* Define if you need the _REENTRANT define for some functions */
+#undef NEED_REENTRANT
+
+/* Define if you have the Kerberos4 libraries (including -ldes) */
+#undef KRB4
+
+/* Define if you want to enable IPv6 support */
+#undef ENABLE_IPV6
+
+/* Define this to 'int' if ssize_t is not an available typedefed type */
+#undef ssize_t
+
+/* Define this to 'int' if socklen_t is not an available typedefed type */
+#undef socklen_t
+
+/* Define this as a suitable file to read random data from */
+#undef RANDOM_FILE
+
+/* Define this to your Entropy Gathering Daemon socket pathname */
+#undef EGD_SOCKET
+
+/* Define if you have a working OpenSSL installation */
+#undef OPENSSL_ENABLED
+
+/* Set to explicitly specify we don't want to use thread-safe functions */
+#define DISABLED_THREADSAFE
+
+/* Define if you want to enable IPv6 support */
+#undef ENABLE_IPV6
+
+/* Define if you have the <alloca.h> header file. */
+#define HAVE_ALLOCA_H
+
+/* Define if you have the <arpa/inet.h> header file. */
+#define HAVE_ARPA_INET_H
+
+/* Define if you have the `closesocket' function. */
+#undef HAVE_CLOSESOCKET
+
+/* Define if you have the <crypto.h> header file. */
+#undef HAVE_CRYPTO_H
+
+/* Define if you have the <des.h> header file. */
+#undef HAVE_DES_H
+
+/* Define if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define if you have the `dlopen' function. */
+#undef HAVE_DLOPEN
+
+/* Define if you have the <err.h> header file. */
+#undef HAVE_ERR_H
+
+/* Define if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H
+
+/* Define if getaddrinfo exists and works */
+#define HAVE_GETADDRINFO
+
+/* Define if you have the `geteuid' function. */
+#undef HAVE_GETEUID
+
+/* Define if you have the `gethostbyaddr' function. */
+#define HAVE_GETHOSTBYADDR
+
+/* Define if you have the `gethostbyaddr_r' function. */
+#undef HAVE_GETHOSTBYADDR_R
+
+/* Define if you have the `gethostbyname_r' function. */
+#undef HAVE_GETHOSTBYNAME_R
+
+/* Define if you have the `gethostname' function. */
+#define HAVE_GETHOSTNAME
+
+/* Define if you have the <getopt.h> header file. */
+#define HAVE_GETOPT_H
+
+/* Define if you have the `getpass_r' function. */
+#undef HAVE_GETPASS_R
+
+/* Define if you have the `getpwuid' function. */
+#undef HAVE_GETPWUID
+
+/* Define if you have the `getservbyname' function. */
+#undef HAVE_GETSERVBYNAME
+
+/* Define if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY
+
+/* Define if you have the `inet_addr' function. */
+#undef HAVE_INET_ADDR
+
+/* Define if you have the `inet_ntoa' function. */
+#undef HAVE_INET_NTOA
+
+/* Define if you have the `inet_ntoa_r' function. */
+#undef HAVE_INET_NTOA_R
+
+/* Define if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H
+
+/* Define if you have the <io.h> header file. */
+#define HAVE_IO_H
+
+/* Define if you have the `krb_get_our_ip_for_realm' function. */
+#undef HAVE_KRB_GET_OUR_IP_FOR_REALM
+
+/* Define if you have the <krb.h> header file. */
+#undef HAVE_KRB_H
+
+/* Define if you have the `crypto' library (-lcrypto). */
+#undef HAVE_LIBCRYPTO
+
+/* Define if you have the `dl' library (-ldl). */
+#undef HAVE_LIBDL
+
+/* Define if you have the `nsl' library (-lnsl). */
+#undef HAVE_LIBNSL
+
+/* Define if you have the `resolv' library (-lresolv). */
+#undef HAVE_LIBRESOLV
+
+/* Define if you have the `resolve' library (-lresolve). */
+#undef HAVE_LIBRESOLVE
+
+/* Define if you have the `socket' library (-lsocket). */
+#undef HAVE_LIBSOCKET
+
+/* Define if you have the `ssl' library (-lssl). */
+#undef HAVE_LIBSSL
+
+/* Define if you have the `ucb' library (-lucb). */
+#undef HAVE_LIBUCB
+
+/* Define if you have the `localtime_r' function. */
+#undef HAVE_LOCALTIME_R
+
+/* Define if you have the <malloc.h> header file. */
+#define HAVE_MALLOC_H
+
+/* Define if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define if you have the <netdb.h> header file. */
+#define HAVE_NETDB_H
+
+/* Define if you have the <netinet/if_ether.h> header file. */
+#undef HAVE_NETINET_IF_ETHER_H
+
+/* Define if you have the <netinet/in.h> header file. */
+#define HAVE_NETINET_IN_H
+
+/* Define if you have the <net/if.h> header file. */
+#define HAVE_NET_IF_H
+
+/* Define if you have the <openssl/crypto.h> header file. */
+#undef HAVE_OPENSSL_CRYPTO_H
+
+/* Define if you have the <openssl/err.h> header file. */
+#undef HAVE_OPENSSL_ERR_H
+
+/* Define if you have the <openssl/pem.h> header file. */
+#undef HAVE_OPENSSL_PEM_H
+
+/* Define if you have the <openssl/rsa.h> header file. */
+#undef HAVE_OPENSSL_RSA_H
+
+/* Define if you have the <openssl/ssl.h> header file. */
+#undef HAVE_OPENSSL_SSL_H
+
+/* Define if you have the <openssl/x509.h> header file. */
+#undef HAVE_OPENSSL_X509_H
+
+/* Define if you have the <pem.h> header file. */
+#undef HAVE_PEM_H
+
+/* Define if you have the `perror' function. */
+#undef HAVE_PERROR
+
+/* Define if you have the <pwd.h> header file. */
+#undef HAVE_PWD_H
+
+/* Define if you have the `RAND_egd' function. */
+#undef HAVE_RAND_EGD
+
+/* Define if you have the `RAND_screen' function. */
+#undef HAVE_RAND_SCREEN
+
+/* Define if you have the `RAND_status' function. */
+#undef HAVE_RAND_STATUS
+
+/* Define if you have the <rsa.h> header file. */
+#undef HAVE_RSA_H
+
+/* Define if you have the `select' function. */
+#define HAVE_SELECT
+
+/* Define if you have the `setvbuf' function. */
+#undef HAVE_SETVBUF
+
+/* Define if you have the <sgtty.h> header file. */
+#define HAVE_SGTTY_H
+
+/* Define if you have the `sigaction' function. */
+#undef HAVE_SIGACTION
+
+/* Define if you have the `signal' function. */
+#define HAVE_SIGNAL
+
+/* Define if you have the `socket' function. */
+#define HAVE_SOCKET
+
+/* Define if you have the <ssl.h> header file. */
+#undef HAVE_SSL_H
+
+/* Define if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H
+
+/* Define if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
+
+/* Define if you have the `strcmpi' function. */
+#undef HAVE_STRCMPI
+
+/* Define if you have the `strdup' function. */
+#define HAVE_STRDUP
+
+/* Define if you have the `strftime' function. */
+#define HAVE_STRFTIME
+
+/* Define if you have the `stricmp' function. */
+#define HAVE_STRICMP
+
+/* Define if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define if you have the <string.h> header file. */
+#define HAVE_STRING_H
+
+/* Define if you have the `strlcat' function. */
+#undef HAVE_STRLCAT
+
+/* Define if you have the `strlcpy' function. */
+#undef HAVE_STRLCPY
+
+/* Define if you have the `strstr' function. */
+#define HAVE_STRSTR
+
+/* Define if you have the `strtok_r' function. */
+#undef HAVE_STRTOK_R
+
+/* Define if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
+/* Define if you have the <sys/select.h> header file. */
+#undef HAVE_SYS_SELECT_H
+
+/* Define if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H
+
+/* Define if you have the <sys/sockio.h> header file. */
+#undef HAVE_SYS_SOCKIO_H
+
+/* Define if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H
+
+/* Define if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H
+
+/* Define if you have the `tcgetattr' function. */
+#define HAVE_TCGETATTR
+
+/* Define if you have the `tcsetattr' function. */
+#define HAVE_TCSETATTR
+
+/* Define if you have the <termios.h> header file. */
+#define HAVE_TERMIOS_H
+
+/* Define if you have the <termio.h> header file. */
+#undef HAVE_TERMIO_H
+
+/* Define if you have the <time.h> header file. */
+#undef HAVE_TIME_H
+
+/* Define if you have the `uname' function. */
+#define HAVE_UNAME
+
+/* Define if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H
+
+/* Define if you have the <winsock.h> header file. */
+#undef HAVE_WINSOCK_H
+
+/* Define if you have the <x509.h> header file. */
+#undef HAVE_X509_H
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* The size of a `long double', as computed by sizeof. */
+#undef SIZEOF_LONG_DOUBLE
+
+/* The size of a `long long', as computed by sizeof. */
+#undef SIZEOF_LONG_LONG
+
+/* Define if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define if you can safely include both <sys/time.h> and <time.h>. */
+#undef TIME_WITH_SYS_TIME
+
+/* Version number of package */
+#undef VERSION
+
+/* Define if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+#undef size_t
+
+/* type to use in place of socklen_t if not defined */
+#undef socklen_t
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef ssize_t
+
+/* this is a quick hack.  I hope it's correct. */
+#define ifr_dstaddr ifr_addr
+
+#define IOCTL_3_ARGS
+
+#define HAVE_FIONBIO
+
diff --git a/main/source/curl/lib/config-vms.h b/main/source/curl/lib/config-vms.h
new file mode 100644
index 00000000..a23a0560
--- /dev/null
+++ b/main/source/curl/lib/config-vms.h
@@ -0,0 +1,381 @@
+/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+
+/* Define if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
+#ifndef _ALL_SOURCE
+#undef _ALL_SOURCE
+#endif
+
+/* Define to empty if the keyword does not work.  */
+#undef const
+
+/* Define as the return type of signal handlers (int or void).  */
+#undef RETSIGTYPE
+
+/* Define to `unsigned' if <sys/types.h> doesn't define.  */
+#undef size_t
+
+/* Define if you have the ANSI C header files.  */
+#define STDC_HEADERS 1
+
+/* Define if you can safely include both <sys/time.h> and <time.h>.  */
+#define TIME_WITH_SYS_TIME 1
+
+/* Define cpu-machine-OS */
+#define OS "ALPHA-COMPAQ-VMS"
+
+/* Define if you have the gethostbyaddr_r() function with 5 arguments */
+#undef HAVE_GETHOSTBYADDR_R_5
+
+/* Define if you have the gethostbyaddr_r() function with 7 arguments */
+#undef HAVE_GETHOSTBYADDR_R_7
+
+/* Define if you have the gethostbyaddr_r() function with 8 arguments */
+#undef HAVE_GETHOSTBYADDR_R_8
+
+/* Define if you have the gethostbyname_r() function with 3 arguments */
+#undef HAVE_GETHOSTBYNAME_R_3
+
+/* Define if you have the gethostbyname_r() function with 5 arguments */
+#undef HAVE_GETHOSTBYNAME_R_5
+
+/* Define if you have the gethostbyname_r() function with 6 arguments */
+#undef HAVE_GETHOSTBYNAME_R_6
+
+/* Define if you have the inet_ntoa_r function declared. */
+#undef HAVE_INET_NTOA_R_DECL
+
+/* Define if you need the _REENTRANT define for some functions */
+#undef NEED_REENTRANT
+
+/* Define if you have the Kerberos4 libraries (including -ldes) */
+#undef KRB4
+
+/* Define this to 'int' if ssize_t is not an available typedefed type */
+#undef ssize_t
+
+/* Define this to 'int' if socklen_t is not an available typedefed type */
+#define socklen_t size_t
+
+/* Define this as a suitable file to read random data from */
+#undef RANDOM_FILE
+
+/* Define this to your Entropy Gathering Daemon socket pathname */
+#undef EGD_SOCKET
+
+/* The number of bytes in a long double.  */
+#define SIZEOF_LONG_DOUBLE 8
+
+/* The number of bytes in a long long.  */
+#define SIZEOF_LONG_LONG 8
+
+/* Define if you have the RAND_egd function.  */
+#undef HAVE_RAND_EGD
+
+/* Define if you have the RAND_screen function.  */
+#undef HAVE_RAND_SCREEN
+
+/* Define if you have the RAND_status function.  */
+#undef HAVE_RAND_STATUS
+
+/* Define if you have the closesocket function.  */
+#undef HAVE_CLOSESOCKET
+
+/* Define if you have the geteuid function.  */
+#define HAVE_GETEUID 1
+
+/* Define if you have the gethostbyaddr function.  */
+#define HAVE_GETHOSTBYADDR 1
+
+/* Define if you have the gethostbyaddr_r function.  */
+#undef HAVE_GETHOSTBYADDR_R
+
+/* Define if you have the gethostbyname_r function.  */
+#undef HAVE_GETHOSTBYNAME_R
+
+/* Define if you have the gethostname function.  */
+#define HAVE_GETHOSTNAME 1
+
+/* Define if you have the getpass_r function.  */
+#undef HAVE_GETPASS_R
+
+/* Define if you have the getpwuid function.  */
+#define HAVE_GETPWUID 1
+
+/* Define if you have the getservbyname function.  */
+#define HAVE_GETSERVBYNAME 1
+
+/* Define if you have the gettimeofday function.  */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Define if you have the inet_addr function.  */
+#define HAVE_INET_ADDR 1
+
+/* Define if you have the inet_ntoa function.  */
+#define HAVE_INET_NTOA 1
+
+/* Define if you have the inet_ntoa_r function.  */
+#undef HAVE_INET_NTOA_R
+
+/* Define if you have the krb_get_our_ip_for_realm function.  */
+#undef HAVE_KRB_GET_OUR_IP_FOR_REALM
+
+/* Define if you have the localtime_r function.  */
+#undef HAVE_LOCALTIME_R
+
+/* Define if you have the perror function.  */
+#define HAVE_PERROR 1
+
+/* Define if you have the select function.  */
+#define HAVE_SELECT 1
+
+/* Define if you have the setvbuf function.  */
+#undef HAVE_SETVBUF
+
+/* Define if you have the sigaction function.  */
+#define HAVE_SIGACTION 1
+
+/* Define if you have the signal function.  */
+#define HAVE_SIGNAL 1
+
+/* Define if you have the socket function.  */
+#define HAVE_SOCKET 1
+
+/* Define if you have the strcasecmp function.  */
+#define HAVE_STRCASECMP 1
+
+/* Define if you have the strcmpi function.  */
+#define HAVE_STRCMPI 1
+
+/* Define if you have the strdup function.  */
+#define HAVE_STRDUP 1
+
+/* Define if you have the strftime function.  */
+#define HAVE_STRFTIME 1
+
+/* Define if you have the stricmp function.  */
+#define HAVE_STRICMP 1
+
+/* Define if you have the strlcat function.  */
+#undef HAVE_STRLCAT
+
+/* Define if you have the strlcpy function.  */
+#undef HAVE_STRLCPY
+
+/* Define if you have the strstr function.  */
+#define  HAVE_STRSTR 1
+
+/* Define if you have the tcgetattr function.  */
+#undef HAVE_TCGETATTR
+
+/* Define if you have the tcsetattr function.  */
+#undef HAVE_TCSETATTR
+
+/* Define if you have the uname function.  */
+#define HAVE_UNAME 1
+
+/* Define if you have the <alloca.h> header file.  */
+#undef HAVE_ALLOCA_H
+
+/* Define if you have the <arpa/inet.h> header file.  */
+#undef HAVE_ARPA_INET_H
+
+/* Define if you have the <crypto.h> header file.  */
+#undef HAVE_CRYPTO_H
+
+/* Define if you have the <des.h> header file.  */
+#undef HAVE_DES_H
+
+/* Define if you have the <dlfcn.h> header file.  */
+#undef HAVE_DLFCN_H
+
+/* Define if you have the <err.h> header file.  */
+#define HAVE_ERR_H 1
+
+/* Define if you have the <fcntl.h> header file.  */
+#define HAVE_FCNTL_H 1
+
+/* Define if you have the <getopt.h> header file.  */
+#define HAVE_GETOPT_H 1
+
+/* Define if you have the <io.h> header file.  */
+#undef HAVE_IO_H
+
+/* Define if you have the <krb.h> header file.  */
+#undef HAVE_KRB_H
+
+/* Define if you have the <malloc.h> header file.  */
+#define HAVE_MALLOC_H 1
+
+/* Define if you have the <net/if.h> header file.  */
+#define HAVE_NET_IF_H 1
+
+/* Define if you have the <netdb.h> header file.  */
+#define HAVE_NETDB_H 1
+
+/* Define if you have the <netinet/if_ether.h> header file.  */
+#define HAVE_NETINET_IF_ETHER_H 1
+
+/* Define if you have the <netinet/in.h> header file.  */
+#define HAVE_NETINET_IN_H 1
+
+/* Define if you have the <openssl/crypto.h> header file.  */
+#define HAVE_OPENSSL_CRYPTO_H 1
+
+/* Define if you have the <openssl/err.h> header file.  */
+#define HAVE_OPENSSL_ERR_H	1
+
+/* Define if you have the <openssl/pem.h> header file.  */
+#define HAVE_OPENSSL_PEM_H	1
+
+/* Define if you have the <openssl/rsa.h> header file.  */
+#define HAVE_OPENSSL_RSA_H 1
+
+/* Define if you have the <openssl/ssl.h> header file.  */
+#define HAVE_OPENSSL_SSL_H	1
+
+/* Define if you have the <openssl/x509.h> header file.  */
+#define HAVE_OPENSSL_X509_H	1
+
+/* Define if you have the <pem.h> header file.  */
+#undef HAVE_PEM_H
+
+/* Define if you have the <pwd.h> header file.  */
+#define HAVE_PWD_H 1
+
+/* Define if you have the <rsa.h> header file.  */
+#undef HAVE_RSA_H
+
+/* Define if you have the <sgtty.h> header file.  */
+#define HAVE_SGTTY_H 1
+
+/* Define if you have the <ssl.h> header file.  */
+#undef HAVE_SSL_H
+
+/* Define if you have the <stdlib.h> header file.  */
+#define HAVE_STDLIB_H 1
+
+/* Define if you have the <sys/param.h> header file.  */
+#undef HAVE_SYS_PARAM_H
+
+/* Define if you have the <sys/select.h> header file.  */
+#undef HAVE_SYS_SELECT_H
+
+/* Define if you have the <sys/socket.h> header file.  */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define if you have the <sys/sockio.h> header file.  */
+#undef HAVE_SYS_SOCKIO_H
+
+/* Define if you have the <sys/stat.h> header file.  */
+#define HAVE_SYS_STAT_H 1
+
+/* Define if you have the <sys/time.h> header file.  */
+#define HAVE_SYS_TIME_H 1
+
+/* Define if you have the <sys/types.h> header file.  */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define if you have the <termio.h> header file.  */
+#undef HAVE_TERMIO_H
+
+/* Define if you have the <termios.h> header file.  */
+#define HAVE_TERMIOS_H 1
+
+/* Define if you have the <time.h> header file.  */
+#define HAVE_TIME_H 1
+
+/* Define if you have the <unistd.h> header file.  */
+#define HAVE_UNISTD_H 1
+
+/* Define if you have the <winsock.h> header file.  */
+#undef HAVE_WINSOCK_H
+
+/* Define if you have the <x509.h> header file.  */
+#undef HAVE_X509_H
+
+/* Define if you have the crypto library (-lcrypto).  */
+#define HAVE_LIBCRYPTO 1
+
+/* Define if you have the dl library (-ldl).  */
+#undef HAVE_LIBDL
+
+/* Define if you have the nsl library (-lnsl).  */
+#undef HAVE_LIBNSL
+
+/* Define if you have the resolv library (-lresolv).  */
+#define HAVE_LIBRESOLV 1
+
+/* Define if you have the resolve library (-lresolve).  */
+#undef HAVE_LIBRESOLVE
+
+/* Define if you have the socket library (-lsocket).  */
+#define HAVE_LIBSOCKET 1
+
+/* Define if you have the ssl library (-lssl).  */
+#define HAVE_LIBSSL	1
+
+/* Define if you have the ucb library (-lucb).  */
+#undef HAVE_LIBUCB
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define if getaddrinfo exists and works */
+#define HAVE_GETADDRINFO 1
+
+/* Define if you want to enable IPv6 support */
+#undef ENABLE_IPV6
+
+/* Set to explicitly specify we don't want to use thread-safe functions */
+#undef DISABLED_THREADSAFE
+
+#define	HAVE_TIMEVAL_H	1
+
+/* Name of this package! */
+#define PACKAGE "not-used"
+
+/* Version number of this archive. */
+#define VERSION "not-used"
+
+/* Define if you have the getpass function.  */
+#undef HAVE_GETPASS
+
+/* Define if you have a working OpenSSL installation */
+#define OPENSSL_ENABLED	1
+
+/* Define if you have the `dlopen' function. */
+#undef HAVE_DLOPEN
+
+/* Define if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define if you have the `strtok_r' function. */
+#undef HAVE_STRTOK_R
+
+#define HAVE_MEMORY_H   1
+
+#define HAVE_FIONBIO	1
+
+/* Define if you have the `sigsetjmp' function. */
+#define HAVE_SIGSETJMP 1
+
+/* Define to 1 if you have the <setjmp.h> header file. */
+#define HAVE_SETJMP_H 1
+
+/*
+ * This needs to be defined for OpenSSL 0.9.7 and other versions that have the
+ * ENGINE stuff supported. If an include of "openssl/engine.h" fails, then
+ * undefine the define below.
+*/
+#define HAVE_OPENSSL_ENGINE_H 1
diff --git a/main/source/curl/lib/config-win32.h b/main/source/curl/lib/config-win32.h
new file mode 100644
index 00000000..4f773b5a
--- /dev/null
+++ b/main/source/curl/lib/config-win32.h
@@ -0,0 +1,227 @@
+/* config.h.  Generated automatically by configure.  */
+/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+
+/* Define if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
+#ifndef _ALL_SOURCE
+/* #undef _ALL_SOURCE */
+#endif
+
+/* Define to empty if the keyword does not work.  */
+/* #undef const */
+
+/* Define if you don't have vprintf but do have _doprnt.  */
+/* #undef HAVE_DOPRNT */
+
+/* Define if you have the vprintf function.  */
+#define HAVE_VPRINTF 1
+
+/* Define as the return type of signal handlers (int or void).  */
+/*#define RETSIGTYPE void */
+
+/* Define to `unsigned' if <sys/types.h> doesn't define.  */
+/* #undef size_t */
+
+/* Define this to 'int' if ssize_t is not an available typedefed type */
+#define ssize_t int
+
+/* Define this to 'int' if socklen_t is not an available typedefed type */
+#define socklen_t int
+
+/* Define if you have the ANSI C header files.  */
+#define STDC_HEADERS 1
+
+/* Define if you can safely include both <sys/time.h> and <time.h>.  */
+/* #define TIME_WITH_SYS_TIME 1 */
+
+/* Define cpu-machine-OS */
+#define OS "win32"
+
+/* The number of bytes in a long double.  */
+#define SIZEOF_LONG_DOUBLE 16
+
+/* The number of bytes in a long long.  */
+/* #define SIZEOF_LONG_LONG 8 */
+
+/* Define if you have the gethostbyaddr function.  */
+#define HAVE_GETHOSTBYADDR 1
+
+/* Define if you have the gethostname function.  */
+#define HAVE_GETHOSTNAME 1
+
+/* Define if you have the getpass function.  */
+/*#define HAVE_GETPASS 1*/
+
+/* Define if you have the getservbyname function.  */
+#define HAVE_GETSERVBYNAME 1
+
+/* Define if you have the gettimeofday function.  */
+/*  #define HAVE_GETTIMEOFDAY 1 */
+
+/* Define if you have the inet_addr function.  */
+#define HAVE_INET_ADDR 1
+
+/* Define if you have the inet_ntoa function.  */
+#define HAVE_INET_NTOA 1
+
+/* Define if you have the perror function.  */
+#define HAVE_PERROR 1
+
+/* Define if you have the select function.  */
+#define HAVE_SELECT 1
+
+/* Define if you have the socket function.  */
+#define HAVE_SOCKET 1
+
+/* Define if you have the strcasecmp function.  */
+/*#define HAVE_STRCASECMP 1*/
+
+/* Define if you have the stricmp function.  */
+#define HAVE_STRICMP 1
+
+/* Define if you have the strdup function.  */
+#define HAVE_STRDUP 1
+
+/* Define if you have the strftime function.  */
+#define HAVE_STRFTIME 1
+
+/* Define if you have the strstr function.  */
+#define HAVE_STRSTR 1
+
+/* Define if you have the tcgetattr function.  */
+/*#define HAVE_TCGETATTR 1*/
+
+/* Define if you have the tcsetattr function.  */
+/*#define HAVE_TCSETATTR 1*/
+
+/* Define if you have the uname function.  */
+/*#define HAVE_UNAME 1*/
+
+/* Define if you have the <alloca.h> header file.  */
+/*#define HAVE_ALLOCA_H 1*/
+
+/* Define if you have the malloc.h file.  */
+#define HAVE_MALLOC_H 1
+
+/* Define if you have the <arpa/inet.h> header file.  */
+#define HAVE_ARPA_INET_H 1
+
+/* Define if you have the <crypto.h> header file.  */
+/* #undef HAVE_CRYPTO_H */
+
+/* Define if you have the <dlfcn.h> header file.  */
+/*#define HAVE_DLFCN_H 1*/
+
+/* Define if you have the <err.h> header file.  */
+/* #undef HAVE_ERR_H */
+
+/* Define if you have the <fcntl.h> header file.  */
+#define HAVE_FCNTL_H 1
+
+/* Define if you have the <getopt.h> header file.  */
+/* #undef HAVE_GETOPT_H */
+
+/* Define if you have the <netdb.h> header file.  */
+#define HAVE_NETDB_H 1
+
+/* Define if you have the <netinet/in.h> header file.  */
+/*#define HAVE_NETINET_IN_H 1*/
+
+/* Define if you have the <sgtty.h> header file.  */
+/*#define HAVE_SGTTY_H 1*/
+
+/* Define if you have the <ssl.h> header file.  */
+/* #undef HAVE_SSL_H */
+
+/* Define if you have the <sys/param.h> header file.  */
+/*#define HAVE_SYS_PARAM_H 1*/
+
+/* Define if you have the <sys/select.h> header file.  */
+/*  #define HAVE_SYS_SELECT_H 1 */
+
+/* Define if you have the <sys/socket.h> header file.  */
+/*#define HAVE_SYS_SOCKET_H 1*/
+
+/* Define if you have the <sys/sockio.h> header file.  */
+#define HAVE_SYS_SOCKIO_H 1
+
+/* Define if you have the <sys/stat.h> header file.  */
+#define HAVE_SYS_STAT_H 1
+
+/* Define if you have the <sys/types.h> header file.  */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define if you have the <termio.h> header file.  */
+#define HAVE_TERMIO_H 1
+
+/* Define if you have the <termios.h> header file.  */
+#define HAVE_TERMIOS_H 1
+
+/* Name of package */
+#define PACKAGE "curl"
+
+/* Define if you have the <io.h> header file.  */
+#define HAVE_IO_H 1
+
+/* Define if you have the <time.h> header file.  */
+#define HAVE_TIME_H 1
+
+/* Define if you have the <winsock.h> header file.  */
+#define HAVE_WINSOCK_H 1
+
+/* Define if you have the <stdlib.h> header file.  */
+#define HAVE_STDLIB_H 1
+
+/* Define if you have the closesocket function.  */
+#define HAVE_CLOSESOCKET 1
+
+/* Define if you have the setvbuf function.  */
+#define HAVE_SETVBUF 1
+
+/* Define if you have the RAND_screen function when using SSL  */
+#define HAVE_RAND_SCREEN 1
+
+/* Define if you have the `RAND_status' function. */
+#define HAVE_RAND_STATUS 1
+
+/* Define this to if in_addr_t is not an available typedefed type */
+#define in_addr_t unsigned long
+
+/*************************************************
+ * This section is for compiler specific defines.*
+ *************************************************/
+#ifdef MINGW32 /* Borland and MS don't have this */
+
+/* Define if you have the <unistd.h> header file.  */
+#define HAVE_UNISTD_H 1
+
+#endif
+
+/**************************************************
+ *This is to eliminate the warnings when compiled *
+ * using MS VC++ compiler	  			  *
+ **************************************************/
+#if 0
+
+#pragma warning (disable: 4244)	/* truncation from 'const int' to 'char' */
+#pragma warning (disable: 4127)	/* conditional expression is constant */
+#pragma warning (disable: 4706)	/* assignment within conditional expression */
+#pragma warning (disable: 4761)	/* integral size mismatch in argument */
+#pragma warning (disable: 4101)	/* unreferenced local variable */
+#pragma warning (disable: 4131)	/* uses old-style declarator */
+#pragma warning (disable: 4057)	/* const char *' differs in indirection to
+                                   slightly different base types from
+                                   'unsigned char [x] */
+#pragma warning (disable: 4100)	/* unreferenced formal parameter */
+#pragma warning (disable: 4055)	/* type cast' : from data pointer 'void *' to
+                                   function pointer
+                                   'void *(__cdecl *)(char *,int ) */
+#pragma warning (disable: 4701)	/* local variable may be used without having
+                                   been initialized */
+#pragma warning (disable: 4715)	/* ToHour' : not all control paths return a
+                                   value */
+#pragma warning (disable: 4115) /* warning C4115: '_RPC_ASYNC_STATE' : named
+                                   type definition in parentheses */
+#pragma warning (disable: 4206) /* this does what? */
+#endif
diff --git a/main/source/curl/lib/config.h.in b/main/source/curl/lib/config.h.in
new file mode 100644
index 00000000..a607621c
--- /dev/null
+++ b/main/source/curl/lib/config.h.in
@@ -0,0 +1,443 @@
+/* lib/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* CA bundle full path name */
+#undef CURL_CA_BUNDLE
+
+/* to disable DICT */
+#undef CURL_DISABLE_DICT
+
+/* to disable FILE */
+#undef CURL_DISABLE_FILE
+
+/* to disable FTP */
+#undef CURL_DISABLE_FTP
+
+/* to disable GOPHER */
+#undef CURL_DISABLE_GOPHER
+
+/* to disable HTTP */
+#undef CURL_DISABLE_HTTP
+
+/* to disable LDAP */
+#undef CURL_DISABLE_LDAP
+
+/* to disable TELNET */
+#undef CURL_DISABLE_TELNET
+
+/* Set to explicitly specify we don't want to use thread-safe functions */
+#undef DISABLED_THREADSAFE
+
+/* your Entropy Gathering Daemon socket pathname */
+#undef EGD_SOCKET
+
+/* Define if you want to enable IPv6 support */
+#undef ENABLE_IPV6
+
+/* Define to 1 if you have the <alloca.h> header file. */
+#undef HAVE_ALLOCA_H
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#undef HAVE_ARPA_INET_H
+
+/* Define to 1 if you have the `closesocket' function. */
+#undef HAVE_CLOSESOCKET
+
+/* Define to 1 if you have the <crypto.h> header file. */
+#undef HAVE_CRYPTO_H
+
+/* Define to 1 if you have the <des.h> header file. */
+#undef HAVE_DES_H
+
+/* disabled non-blocking sockets */
+#undef HAVE_DISABLED_NONBLOCKING
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the `dlopen' function. */
+#undef HAVE_DLOPEN
+
+/* Define to 1 if you have the <err.h> header file. */
+#undef HAVE_ERR_H
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
+/* use FIONBIO for non-blocking sockets */
+#undef HAVE_FIONBIO
+
+/* Define if getaddrinfo exists and works */
+#undef HAVE_GETADDRINFO
+
+/* Define to 1 if you have the `geteuid' function. */
+#undef HAVE_GETEUID
+
+/* Define to 1 if you have the `gethostbyaddr' function. */
+#undef HAVE_GETHOSTBYADDR
+
+/* Define to 1 if you have the `gethostbyaddr_r' function. */
+#undef HAVE_GETHOSTBYADDR_R
+
+/* gethostbyaddr_r() takes 5 args */
+#undef HAVE_GETHOSTBYADDR_R_5
+
+/* gethostbyaddr_r() takes 7 args */
+#undef HAVE_GETHOSTBYADDR_R_7
+
+/* gethostbyaddr_r() takes 8 args */
+#undef HAVE_GETHOSTBYADDR_R_8
+
+/* Define to 1 if you have the `gethostbyname_r' function. */
+#undef HAVE_GETHOSTBYNAME_R
+
+/* gethostbyname_r() takes 3 args */
+#undef HAVE_GETHOSTBYNAME_R_3
+
+/* gethostbyname_r() takes 5 args */
+#undef HAVE_GETHOSTBYNAME_R_5
+
+/* gethostbyname_r() takes 6 args */
+#undef HAVE_GETHOSTBYNAME_R_6
+
+/* Define to 1 if you have the `getpass_r' function. */
+#undef HAVE_GETPASS_R
+
+/* Define to 1 if you have the `getpwuid' function. */
+#undef HAVE_GETPWUID
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#undef HAVE_GETTIMEOFDAY
+
+/* Define to 1 if you have the `gmtime_r' function. */
+#undef HAVE_GMTIME_R
+
+/* Define to 1 if you have the `inet_addr' function. */
+#undef HAVE_INET_ADDR
+
+/* Define to 1 if you have the `inet_ntoa' function. */
+#undef HAVE_INET_NTOA
+
+/* Define to 1 if you have the `inet_ntoa_r' function. */
+#undef HAVE_INET_NTOA_R
+
+/* inet_ntoa_r() is declared */
+#undef HAVE_INET_NTOA_R_DECL
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* use ioctlsocket() for non-blocking sockets */
+#undef HAVE_IOCTLSOCKET
+
+/* use Ioctlsocket() for non-blocking sockets */
+#undef HAVE_IOCTLSOCKET_CASE
+
+/* Define to 1 if you have the <io.h> header file. */
+#undef HAVE_IO_H
+
+/* Define to 1 if you have the `krb_get_our_ip_for_realm' function. */
+#undef HAVE_KRB_GET_OUR_IP_FOR_REALM
+
+/* Define to 1 if you have the <krb.h> header file. */
+#undef HAVE_KRB_H
+
+/* Define to 1 if you have the `crypto' library (-lcrypto). */
+#undef HAVE_LIBCRYPTO
+
+/* Define to 1 if you have the `dl' library (-ldl). */
+#undef HAVE_LIBDL
+
+/* Define to 1 if you have the `nsl' library (-lnsl). */
+#undef HAVE_LIBNSL
+
+/* Define to 1 if you have the `resolv' library (-lresolv). */
+#undef HAVE_LIBRESOLV
+
+/* Define to 1 if you have the `resolve' library (-lresolve). */
+#undef HAVE_LIBRESOLVE
+
+/* Define to 1 if you have the `socket' library (-lsocket). */
+#undef HAVE_LIBSOCKET
+
+/* Define to 1 if you have the `ssl' library (-lssl). */
+#undef HAVE_LIBSSL
+
+/* If zlib is available */
+#undef HAVE_LIBZ
+
+/* Define to 1 if you have the `localtime_r' function. */
+#undef HAVE_LOCALTIME_R
+
+/* Define to 1 if you have the <malloc.h> header file. */
+#undef HAVE_MALLOC_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <netdb.h> header file. */
+#undef HAVE_NETDB_H
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#undef HAVE_NETINET_IN_H
+
+/* Define to 1 if you have the <net/if.h> header file. */
+#undef HAVE_NET_IF_H
+
+/* Define to 1 if you have the <openssl/crypto.h> header file. */
+#undef HAVE_OPENSSL_CRYPTO_H
+
+/* Define to 1 if you have the <openssl/engine.h> header file. */
+#undef HAVE_OPENSSL_ENGINE_H
+
+/* Define to 1 if you have the <openssl/err.h> header file. */
+#undef HAVE_OPENSSL_ERR_H
+
+/* Define to 1 if you have the <openssl/pem.h> header file. */
+#undef HAVE_OPENSSL_PEM_H
+
+/* Define to 1 if you have the <openssl/rsa.h> header file. */
+#undef HAVE_OPENSSL_RSA_H
+
+/* Define to 1 if you have the <openssl/ssl.h> header file. */
+#undef HAVE_OPENSSL_SSL_H
+
+/* Define to 1 if you have the <openssl/x509.h> header file. */
+#undef HAVE_OPENSSL_X509_H
+
+/* use O_NONBLOCK for non-blocking sockets */
+#undef HAVE_O_NONBLOCK
+
+/* Define to 1 if you have the <pem.h> header file. */
+#undef HAVE_PEM_H
+
+/* Define to 1 if you have the `perror' function. */
+#undef HAVE_PERROR
+
+/* Define to 1 if you have the `poll' function. */
+#undef HAVE_POLL
+
+/* Define to 1 if you have the <pwd.h> header file. */
+#undef HAVE_PWD_H
+
+/* Define to 1 if you have the `RAND_egd' function. */
+#undef HAVE_RAND_EGD
+
+/* Define to 1 if you have the `RAND_screen' function. */
+#undef HAVE_RAND_SCREEN
+
+/* Define to 1 if you have the `RAND_status' function. */
+#undef HAVE_RAND_STATUS
+
+/* Define to 1 if you have the <rsa.h> header file. */
+#undef HAVE_RSA_H
+
+/* Define to 1 if you have the `select' function. */
+#undef HAVE_SELECT
+
+/* Define to 1 if you have the <setjmp.h> header file. */
+#undef HAVE_SETJMP_H
+
+/* Define to 1 if you have the `setvbuf' function. */
+#undef HAVE_SETVBUF
+
+/* Define to 1 if you have the <sgtty.h> header file. */
+#undef HAVE_SGTTY_H
+
+/* Define to 1 if you have the `sigaction' function. */
+#undef HAVE_SIGACTION
+
+/* Define to 1 if you have the `signal' function. */
+#undef HAVE_SIGNAL
+
+/* If you have sigsetjmp */
+#undef HAVE_SIGSETJMP
+
+/* Define to 1 if you have the `socket' function. */
+#undef HAVE_SOCKET
+
+/* Define to 1 if you have the <ssl.h> header file. */
+#undef HAVE_SSL_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
+
+/* Define to 1 if you have the `strcmpi' function. */
+#undef HAVE_STRCMPI
+
+/* Define to 1 if you have the `strdup' function. */
+#undef HAVE_STRDUP
+
+/* Define to 1 if you have the `strftime' function. */
+#undef HAVE_STRFTIME
+
+/* Define to 1 if you have the `stricmp' function. */
+#undef HAVE_STRICMP
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strlcat' function. */
+#undef HAVE_STRLCAT
+
+/* Define to 1 if you have the `strlcpy' function. */
+#undef HAVE_STRLCPY
+
+/* Define to 1 if you have the `strstr' function. */
+#undef HAVE_STRSTR
+
+/* Define to 1 if you have the `strtok_r' function. */
+#undef HAVE_STRTOK_R
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
+/* Define to 1 if you have the <sys/poll.h> header file. */
+#undef HAVE_SYS_POLL_H
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#undef HAVE_SYS_SELECT_H
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#undef HAVE_SYS_SOCKET_H
+
+/* Define to 1 if you have the <sys/sockio.h> header file. */
+#undef HAVE_SYS_SOCKIO_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <sys/utime.h> header file. */
+#undef HAVE_SYS_UTIME_H
+
+/* Define to 1 if you have the `tcgetattr' function. */
+#undef HAVE_TCGETATTR
+
+/* Define to 1 if you have the `tcsetattr' function. */
+#undef HAVE_TCSETATTR
+
+/* Define to 1 if you have the <termios.h> header file. */
+#undef HAVE_TERMIOS_H
+
+/* Define to 1 if you have the <termio.h> header file. */
+#undef HAVE_TERMIO_H
+
+/* Define to 1 if you have the <time.h> header file. */
+#undef HAVE_TIME_H
+
+/* Define to 1 if you have the `uname' function. */
+#undef HAVE_UNAME
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `utime' function. */
+#undef HAVE_UTIME
+
+/* Define to 1 if you have the <utime.h> header file. */
+#undef HAVE_UTIME_H
+
+/* Define to 1 if you have the <winsock.h> header file. */
+#undef HAVE_WINSOCK_H
+
+/* Define this symbol if your OS supports changing the contents of argv */
+#undef HAVE_WRITABLE_ARGV
+
+/* Define to 1 if you have the <x509.h> header file. */
+#undef HAVE_X509_H
+
+/* if you have the zlib.h header file */
+#undef HAVE_ZLIB_H
+
+/* if you have the Kerberos4 libraries (including -ldes) */
+#undef KRB4
+
+/* need REENTRANT defined */
+#undef NEED_REENTRANT
+
+/* cpu-machine-OS */
+#undef OS
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* a suitable file to read random data from */
+#undef RANDOM_FILE
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#undef RETSIGTYPE
+
+/* Define to the type of arg 1 for `select'. */
+#undef SELECT_TYPE_ARG1
+
+/* Define to the type of args 2, 3 and 4 for `select'. */
+#undef SELECT_TYPE_ARG234
+
+/* Define to the type of arg 5 for `select'. */
+#undef SELECT_TYPE_ARG5
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#undef TIME_WITH_SYS_TIME
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to 1 if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* type to use in place of in_addr_t if not defined */
+#undef in_addr_t
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+#undef size_t
+
+/* type to use in place of socklen_t if not defined */
+#undef socklen_t
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef ssize_t
diff --git a/main/source/curl/lib/connect.c b/main/source/curl/lib/connect.c
new file mode 100644
index 00000000..26131a99
--- /dev/null
+++ b/main/source/curl/lib/connect.c
@@ -0,0 +1,728 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: connect.c,v 1.56 2003/05/13 12:12:17 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#ifndef WIN32
+/* headers for non-win32 */
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h> /* required for free() prototype, without it, this crashes
+                       on macos 68K */
+#endif
+#ifdef	VMS
+#include <in.h>
+#include <inet.h>
+#endif
+
+#endif
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+
+#ifndef TRUE
+#define TRUE 1
+#define FALSE 0
+#endif
+
+#ifdef WIN32
+#define HAVE_IOCTLSOCKET
+#include <windows.h>
+#include <winsock.h>
+#define EINPROGRESS WSAEINPROGRESS
+#define EWOULDBLOCK WSAEWOULDBLOCK
+#define EISCONN     WSAEISCONN
+#endif
+
+#include "urldata.h"
+#include "sendf.h"
+#include "if2ip.h"
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+int Curl_ourerrno(void)
+{
+#ifdef WIN32
+  return (int)GetLastError();
+#else
+  return errno;
+#endif
+}
+
+/*************************************************************************
+ * Curl_nonblock
+ *
+ * Description:
+ *  Set the socket to either blocking or non-blocking mode.
+ */
+
+int Curl_nonblock(int socket,    /* operate on this */
+                  int nonblock   /* TRUE or FALSE */)
+{
+#undef SETBLOCK
+#ifdef HAVE_O_NONBLOCK
+  int flags;
+
+  flags = fcntl(socket, F_GETFL, 0);
+  if (TRUE == nonblock)
+    return fcntl(socket, F_SETFL, flags | O_NONBLOCK);
+  else
+    return fcntl(socket, F_SETFL, flags & (~O_NONBLOCK));
+#define SETBLOCK 1
+#endif
+
+#ifdef HAVE_FIONBIO
+  int flags;
+
+  flags = nonblock;
+  return ioctl(socket, FIONBIO, &flags);
+#define SETBLOCK 2
+#endif
+
+#ifdef HAVE_IOCTLSOCKET
+  int flags;
+  flags = nonblock;
+  return ioctlsocket(socket, FIONBIO, &flags);
+#define SETBLOCK 3
+#endif
+
+#ifdef HAVE_IOCTLSOCKET_CASE
+  return IoctlSocket(socket, FIONBIO, (long)nonblock);
+#define SETBLOCK 4
+#endif
+
+#ifdef HAVE_DISABLED_NONBLOCKING
+  return 0; /* returns success */
+#define SETBLOCK 5
+#endif
+
+#ifndef SETBLOCK
+#error "no non-blocking method was found/used/set"
+#endif
+}
+
+/*
+ * waitconnect() returns:
+ * 0    fine connect
+ * -1   select() error
+ * 1    select() timeout
+ * 2    select() returned with an error condition
+ */
+static
+int waitconnect(int sockfd, /* socket */
+                int timeout_msec)
+{
+  fd_set fd;
+  fd_set errfd;
+  struct timeval interval;
+  int rc;
+
+  /* now select() until we get connect or timeout */
+  FD_ZERO(&fd);
+  FD_SET(sockfd, &fd);
+
+  FD_ZERO(&errfd);
+  FD_SET(sockfd, &errfd);
+
+  interval.tv_sec = timeout_msec/1000;
+  timeout_msec -= interval.tv_sec*1000;
+
+  interval.tv_usec = timeout_msec*1000;
+
+  rc = select(sockfd+1, NULL, &fd, &errfd, &interval);
+  if(-1 == rc)
+    /* error, no connect here, try next */
+    return -1;
+  
+  else if(0 == rc)
+    /* timeout, no connect today */
+    return 1;
+
+  if(FD_ISSET(sockfd, &errfd))
+    /* error condition caught */
+    return 2;
+
+  /* we have a connect! */
+  return 0;
+}
+
+static CURLcode bindlocal(struct connectdata *conn,
+                          int sockfd)
+{
+#if !defined(WIN32)||defined(__CYGWIN32__)
+  /* We don't generally like checking for OS-versions, we should make this
+     HAVE_XXXX based, although at the moment I don't have a decent test for
+     this! */
+
+#ifdef HAVE_INET_NTOA
+
+  struct SessionHandle *data = conn->data;
+
+  /*************************************************************
+   * Select device to bind socket to
+   *************************************************************/
+  if (strlen(data->set.device)<255) {
+    struct sockaddr_in sa;
+    struct Curl_dns_entry *h=NULL;
+    size_t size;
+    char myhost[256] = "";
+    in_addr_t in;
+
+    /* First check if the given name is an IP address */
+    in=inet_addr(data->set.device);
+      
+    if((in == CURL_INADDR_NONE) &&
+       Curl_if2ip(data->set.device, myhost, sizeof(myhost))) {
+      /*
+       * We now have the numerical IPv4-style x.y.z.w in the 'myhost' buffer
+       */
+      h = Curl_resolv(data, myhost, 0);
+    }
+    else {
+      if(strlen(data->set.device)>1) {
+        /*
+         * This was not an interface, resolve the name as a host name
+         * or IP number
+         */
+        h = Curl_resolv(data, data->set.device, 0);
+        if(h) {
+          /* we know data->set.device is shorter than the myhost array */
+          strcpy(myhost, data->set.device);
+        }
+      }
+    }
+
+    if(! *myhost) {
+      /* need to fix this
+         h=Curl_gethost(data,
+         getmyhost(*myhost,sizeof(myhost)),
+         hostent_buf,
+         sizeof(hostent_buf));
+      */
+      return CURLE_HTTP_PORT_FAILED;
+    }
+
+    infof(data, "We bind local end to %s\n", myhost);
+
+    in=inet_addr(myhost);
+    if (CURL_INADDR_NONE != in) {
+
+      if ( h ) {
+        Curl_addrinfo *addr = h->addr;
+
+        Curl_resolv_unlock(data, h);
+        /* we don't need it anymore after this function has returned */
+
+#ifdef ENABLE_IPV6
+        (void)sa; /* prevent compiler warning */
+        if( bind(sockfd, addr->ai_addr, addr->ai_addrlen) >= 0) {
+          /* we succeeded to bind */
+          struct sockaddr_in6 add;
+	
+          size = sizeof(add);
+          if(getsockname(sockfd, (struct sockaddr *) &add,
+                         (socklen_t *)&size)<0) {
+            failf(data, "getsockname() failed");
+            return CURLE_HTTP_PORT_FAILED;
+          }
+        }
+#else
+        memset((char *)&sa, 0, sizeof(sa));
+        memcpy((char *)&sa.sin_addr, addr->h_addr, addr->h_length);
+        sa.sin_family = AF_INET;
+        sa.sin_addr.s_addr = in;
+        sa.sin_port = 0; /* get any port */
+	
+        if( bind(sockfd, (struct sockaddr *)&sa, sizeof(sa)) >= 0) {
+          /* we succeeded to bind */
+          struct sockaddr_in add;
+	
+          size = sizeof(add);
+          if(getsockname(sockfd, (struct sockaddr *) &add,
+                         (socklen_t *)&size)<0) {
+            failf(data, "getsockname() failed");
+            return CURLE_HTTP_PORT_FAILED;
+          }
+        }
+#endif
+        else {
+          switch(errno) {
+          case EBADF:
+            failf(data, "Invalid descriptor: %d", errno);
+            break;
+          case EINVAL:
+            failf(data, "Invalid request: %d", errno);
+            break;
+          case EACCES:
+            failf(data, "Address is protected, user not superuser: %d", errno);
+            break;
+          case ENOTSOCK:
+            failf(data,
+                  "Argument is a descriptor for a file, not a socket: %d",
+                  errno);
+            break;
+          case EFAULT:
+            failf(data, "Inaccessable memory error: %d", errno);
+            break;
+          case ENAMETOOLONG:
+            failf(data, "Address too long: %d", errno);
+            break;
+          case ENOMEM:
+            failf(data, "Insufficient kernel memory was available: %d", errno);
+            break;
+          default:
+            failf(data, "errno %d", errno);
+            break;
+          } /* end of switch(errno) */
+	
+          return CURLE_HTTP_PORT_FAILED;
+        } /* end of else */
+	
+      } /* end of if  h */
+      else {
+	failf(data,"could't find my own IP address (%s)", myhost);
+	return CURLE_HTTP_PORT_FAILED;
+      }
+    } /* end of inet_addr */
+
+    else {
+      failf(data, "could't find my own IP address (%s)", myhost);
+      return CURLE_HTTP_PORT_FAILED;
+    }
+
+    return CURLE_OK;
+
+  } /* end of device selection support */
+#endif /* end of HAVE_INET_NTOA */
+#endif /* end of not WIN32 */
+
+  return CURLE_HTTP_PORT_FAILED;
+}
+
+
+static
+int socketerror(int sockfd)
+{
+  int err = 0;
+  socklen_t errSize = sizeof(err);
+
+  if( -1 == getsockopt(sockfd, SOL_SOCKET, SO_ERROR,
+                       (void *)&err, &errSize))
+    err = Curl_ourerrno();
+  
+  return err;
+}
+
+/*
+ * Curl_is_connected() is used from the multi interface to check if the
+ * firstsocket has connected.
+ */
+
+CURLcode Curl_is_connected(struct connectdata *conn,
+                           int sockfd,
+                           bool *connected)
+{
+  int rc;
+  struct SessionHandle *data = conn->data;
+
+  *connected = FALSE; /* a very negative world view is best */
+
+  if(data->set.timeout || data->set.connecttimeout) {
+    /* there is a timeout set */
+
+    /* Evaluate in milliseconds how much time that has passed */
+    long has_passed = Curl_tvdiff(Curl_tvnow(), data->progress.start);
+
+    /* subtract the most strict timeout of the ones */
+    if(data->set.timeout && data->set.connecttimeout) {
+      if (data->set.timeout < data->set.connecttimeout)
+        has_passed -= data->set.timeout*1000;
+      else 
+        has_passed -= data->set.connecttimeout*1000;
+    }
+    else if(data->set.timeout)
+      has_passed -= data->set.timeout*1000;
+    else
+      has_passed -= data->set.connecttimeout*1000;
+
+    if(has_passed > 0 ) {
+      /* time-out, bail out, go home */
+      failf(data, "Connection time-out");
+      return CURLE_OPERATION_TIMEOUTED;
+    }
+  }
+  if(conn->bits.tcpconnect) {
+    /* we are connected already! */
+    *connected = TRUE;
+    return CURLE_OK;
+  }
+
+  /* check for connect without timeout as we want to return immediately */
+  rc = waitconnect(sockfd, 0);
+
+  if(0 == rc) {
+    int err = socketerror(sockfd);
+    if ((0 == err) || (EISCONN == err)) {
+      /* we are connected, awesome! */
+      *connected = TRUE;
+      return CURLE_OK;
+    }
+    /* nope, not connected for real */
+    failf(data, "Connection failed, socket error: %d", err);
+    return CURLE_COULDNT_CONNECT;
+  }
+  else if(1 != rc) {
+    int error = Curl_ourerrno();
+    failf(data, "Failed connect to %s:%d, errno: %d",
+          conn->hostname, conn->port, error);
+    return CURLE_COULDNT_CONNECT;
+  }
+  /*
+   * If the connection phase is "done" here, we should attempt to connect
+   * to the "next address" in the Curl_hostaddr structure that we resolved
+   * before. But we don't have that struct around anymore and we can't just
+   * keep a pointer since the cache might in fact have gotten pruned by the
+   * time we want to read this... Alas, we don't do this yet.
+   */
+
+  return CURLE_OK;
+}
+
+
+/*
+ * TCP connect to the given host with timeout, proxy or remote doesn't matter.
+ * There might be more than one IP address to try out. Fill in the passed
+ * pointer with the connected socket.
+ */
+
+CURLcode Curl_connecthost(struct connectdata *conn,  /* context */
+                          struct Curl_dns_entry *remotehost, /* use this one */
+                          int port,                  /* connect to this */
+                          int *sockconn,             /* the connected socket */
+                          Curl_ipconnect **addr,     /* the one we used */
+                          bool *connected)           /* really connected? */
+{
+  struct SessionHandle *data = conn->data;
+  int rc;
+  int sockfd=-1;
+  int aliasindex=0;
+  char *hostname;
+
+  struct timeval after;
+  struct timeval before = Curl_tvnow();
+
+  /*************************************************************
+   * Figure out what maximum time we have left
+   *************************************************************/
+  long timeout_ms=300000; /* milliseconds, default to five minutes */
+
+  *connected = FALSE; /* default to not connected */
+
+  if(data->set.timeout || data->set.connecttimeout) {
+    double has_passed;
+
+    /* Evaluate in milliseconds how much time that has passed */
+    has_passed = Curl_tvdiff(Curl_tvnow(), data->progress.start);
+
+#ifndef min
+#define min(a, b)   ((a) < (b) ? (a) : (b))
+#endif
+
+    /* get the most strict timeout of the ones converted to milliseconds */
+    if(data->set.timeout && data->set.connecttimeout) {
+      if (data->set.timeout < data->set.connecttimeout)
+        timeout_ms = data->set.timeout*1000;
+      else 
+        timeout_ms = data->set.connecttimeout*1000;
+    }
+    else if(data->set.timeout)
+      timeout_ms = data->set.timeout*1000;
+    else
+      timeout_ms = data->set.connecttimeout*1000;
+
+    /* subtract the passed time */
+    timeout_ms -= (long)has_passed;
+
+    if(timeout_ms < 0) {
+      /* a precaution, no need to continue if time already is up */
+      failf(data, "Connection time-out");
+      return CURLE_OPERATION_TIMEOUTED;
+    }
+  }
+
+  hostname = data->change.proxy?conn->proxyhost:conn->hostname;
+  infof(data, "About to connect() to %s%s%s:%d\n",
+        conn->bits.ipv6_ip?"[":"",
+        hostname,
+        conn->bits.ipv6_ip?"]":"",
+        port);
+
+#ifdef ENABLE_IPV6
+  /*
+   * Connecting with IPv6 support is so much easier and cleanly done
+   */
+  {
+    struct addrinfo *ai;
+    port =0; /* prevent compiler warning */
+
+    for (ai = remotehost->addr; ai; ai = ai->ai_next, aliasindex++) {
+      sockfd = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+      if (sockfd < 0)
+        continue;
+
+      if(conn->data->set.device) {
+        /* user selected to bind the outgoing socket to a specified "device"
+           before doing connect */
+        CURLcode res = bindlocal(conn, sockfd);
+        if(res)
+          return res;
+      }
+
+      /* set socket non-blocking */
+      Curl_nonblock(sockfd, TRUE);
+
+      rc = connect(sockfd, ai->ai_addr, ai->ai_addrlen);
+
+      if(-1 == rc) {
+        int error=Curl_ourerrno();
+
+        switch (error) {
+        case EINPROGRESS:
+        case EWOULDBLOCK:
+#if defined(EAGAIN) && EAGAIN != EWOULDBLOCK
+          /* On some platforms EAGAIN and EWOULDBLOCK are the
+           * same value, and on others they are different, hence
+           * the odd #if
+           */
+        case EAGAIN:
+#endif
+        case EINTR:
+          /* asynchronous connect, wait for connect or timeout */
+          if(data->state.used_interface == Curl_if_multi)
+            /* don't hang when doing multi */
+            timeout_ms = 0;
+
+          rc = waitconnect(sockfd, timeout_ms);
+          break;
+        case ECONNREFUSED: /* no one listening */
+        default:
+          /* unknown error, fallthrough and try another address! */
+          failf(data, "Failed connect to %s: %d", hostname, error);
+          break;
+        }
+      }
+
+      if(0 == rc) {
+        /* we might be connected, if the socket says it is OK! Ask it! */
+        int err;
+
+        err = socketerror(sockfd);
+        if ((0 == err) || (EISCONN == err)) {
+          /* we are connected, awesome! */
+          *connected = TRUE; /* this is truly a connect */
+          break;
+	}
+        failf(data, "socket error: %d", err);
+        /* we are _not_ connected, it was a false alert, continue please */
+      }
+      else if(2 == rc)
+        /* waitconnect() returned error */
+        ;
+      else if(data->state.used_interface == Curl_if_multi) {
+        /* When running the multi interface, we bail out here */
+        rc = 0;
+        break;
+      }
+
+      /* connect failed or timed out */
+      sclose(sockfd);
+      sockfd = -1;
+
+      /* get a new timeout for next attempt */
+      after = Curl_tvnow();
+      timeout_ms -= Curl_tvdiff(after, before);
+      if(timeout_ms < 0) {
+        failf(data, "connect() timed out!");
+        return CURLE_OPERATION_TIMEOUTED;
+      }
+      before = after;
+      continue;
+    }
+    if (sockfd < 0)
+      return CURLE_COULDNT_CONNECT;
+
+    /* leave the socket in non-blocking mode */
+
+    if(addr)
+      *addr = ai; /* the address we ended up connected to */
+  }
+#else
+  /*
+   * Connecting with IPv4-only support
+   */
+  if(!remotehost->addr->h_addr_list[0]) {
+    /* If there is no addresses in the address list, then we return
+       error right away */
+    failf(data, "no address available");
+    return CURLE_COULDNT_CONNECT;
+  }
+  /* create an IPv4 TCP socket */
+  sockfd = socket(AF_INET, SOCK_STREAM, 0);
+  if(-1 == sockfd) {
+    failf(data, "couldn't create socket");
+    return CURLE_COULDNT_CONNECT; /* big time error */
+  }
+  
+  if(conn->data->set.device) {
+    /* user selected to bind the outgoing socket to a specified "device"
+       before doing connect */
+    CURLcode res = bindlocal(conn, sockfd);
+    if(res)
+      return res;
+  }
+
+  /* Convert socket to non-blocking type */
+  Curl_nonblock(sockfd, TRUE);
+
+  /* This is the loop that attempts to connect to all IP-addresses we
+     know for the given host. One by one. */
+  for(rc=-1, aliasindex=0;
+      rc && (struct in_addr *)remotehost->addr->h_addr_list[aliasindex];
+      aliasindex++) {
+    struct sockaddr_in serv_addr;
+
+    /* do this nasty work to do the connect */
+    memset((char *) &serv_addr, '\0', sizeof(serv_addr));
+    memcpy((char *)&(serv_addr.sin_addr),
+           (struct in_addr *)remotehost->addr->h_addr_list[aliasindex],
+           sizeof(struct in_addr));
+    serv_addr.sin_family = remotehost->addr->h_addrtype;
+    serv_addr.sin_port = htons((unsigned short)port);
+  
+    rc = connect(sockfd, (struct sockaddr *)&serv_addr,
+                 sizeof(serv_addr));
+
+    if(-1 == rc) {
+      int error=Curl_ourerrno();
+
+      switch (error) {
+      case EINPROGRESS:
+      case EWOULDBLOCK:
+#if defined(EAGAIN) && EAGAIN != EWOULDBLOCK
+        /* On some platforms EAGAIN and EWOULDBLOCK are the
+         * same value, and on others they are different, hence
+         * the odd #if
+         */
+      case EAGAIN:
+#endif
+        /* asynchronous connect, wait for connect or timeout */
+        if(data->state.used_interface == Curl_if_multi)
+          /* don't hang when doing multi */
+          timeout_ms = 0;
+
+        rc = waitconnect(sockfd, timeout_ms);
+        break;
+      default:
+        /* unknown error, fallthrough and try another address! */
+        failf(data, "Failed to connect to %s IP number %d: %d",
+              hostname, aliasindex+1, error);
+        break;
+      }
+    }
+
+    /* The '1 == rc' comes from the waitconnect(), and not from connect().
+       We can be sure of this since connect() cannot return 1. */
+    if((1 == rc) && (data->state.used_interface == Curl_if_multi)) {
+      /* Timeout when running the multi interface, we return here with a
+         CURLE_OK return code. */
+      rc = 0;
+      break;
+    }
+
+    if(0 == rc) {
+      int err = socketerror(sockfd);
+      if ((0 == err) || (EISCONN == err)) {
+        /* we are connected, awesome! */
+        *connected = TRUE; /* this is a true connect */
+        break;
+      }
+      /* nope, not connected for real */
+      rc = -1;
+    }
+
+    if(0 != rc) {
+      /* get a new timeout for next attempt */
+      after = Curl_tvnow();
+      timeout_ms -= Curl_tvdiff(after, before);
+      if(timeout_ms < 0) {
+        failf(data, "Connect timeout on IP number %d", aliasindex+1);
+        break;
+      }
+      before = after;
+      continue; /* try next address */
+    }
+    break;
+  }
+  if(0 != rc) {
+    /* no good connect was made */
+    sclose(sockfd);
+    *sockconn = -1;
+    failf(data, "Connect failed");
+    return CURLE_COULDNT_CONNECT;
+  }
+
+  /* leave the socket in non-blocking mode */
+
+  if(addr)
+    /* this is the address we've connected to */
+    *addr = (struct in_addr *)remotehost->addr->h_addr_list[aliasindex];
+#endif
+
+  /* allow NULL-pointers to get passed in */
+  if(sockconn)
+    *sockconn = sockfd;    /* the socket descriptor we've connected */
+
+  return CURLE_OK;
+}
+
diff --git a/main/source/curl/lib/connect.h b/main/source/curl/lib/connect.h
new file mode 100644
index 00000000..81e97f49
--- /dev/null
+++ b/main/source/curl/lib/connect.h
@@ -0,0 +1,42 @@
+#ifndef __CONNECT_H
+#define __CONNECT_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: connect.h,v 1.13 2003/05/01 13:37:05 bagder Exp $
+ ***************************************************************************/
+
+int Curl_nonblock(int socket,    /* operate on this */
+                  int nonblock   /* TRUE or FALSE */);
+
+CURLcode Curl_is_connected(struct connectdata *conn,
+                           int sockfd,
+                           bool *connected);
+
+CURLcode Curl_connecthost(struct connectdata *conn,
+                          struct Curl_dns_entry *host, /* connect to this */
+                          int port,       /* connect to this port number */
+                          int *sockconn,  /* not set if error is returned */
+                          Curl_ipconnect **addr, /* the one we used */
+                          bool *connected /* truly connected? */
+                          );
+
+int Curl_ourerrno(void);
+#endif
diff --git a/main/source/curl/lib/content_encoding.c b/main/source/curl/lib/content_encoding.c
new file mode 100644
index 00000000..7281646b
--- /dev/null
+++ b/main/source/curl/lib/content_encoding.c
@@ -0,0 +1,354 @@
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: content_encoding.c,v 1.7 2003/04/22 22:32:02 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#ifdef HAVE_LIBZ
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "urldata.h"
+#include <curl/curl.h>
+#include <curl/types.h>
+#include "sendf.h"
+
+#define DSIZ 0x10000             /* buffer size for decompressed data */
+
+#define GZIP_MAGIC_0 0x1f
+#define GZIP_MAGIC_1 0x8b
+
+/* gzip flag byte */
+#define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */
+#define HEAD_CRC     0x02 /* bit 1 set: header CRC present */
+#define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */
+#define ORIG_NAME    0x08 /* bit 3 set: original file name present */
+#define COMMENT      0x10 /* bit 4 set: file comment present */
+#define RESERVED     0xE0 /* bits 5..7: reserved */
+
+static CURLcode
+process_zlib_error(struct SessionHandle *data, z_stream *z)
+{
+  if (z->msg)
+    failf (data, "Error while processing content unencoding.\n%s",
+           z->msg);
+  else
+    failf (data, "Error while processing content unencoding.\n"
+           "Unknown failure within decompression software.");
+
+  return CURLE_BAD_CONTENT_ENCODING;
+}
+
+static CURLcode
+exit_zlib(z_stream *z, bool *zlib_init, CURLcode result)
+{
+  inflateEnd(z);
+  *zlib_init = 0;
+  return result;
+}
+
+CURLcode
+Curl_unencode_deflate_write(struct SessionHandle *data,
+                            struct Curl_transfer_keeper *k,
+                            ssize_t nread)
+{
+  int status;                   /* zlib status */
+  int result;                   /* Curl_client_write status */
+  char decomp[DSIZ];            /* Put the decompressed data here. */
+  z_stream *z = &k->z;          /* zlib state structure */
+
+  /* Initialize zlib? */
+  if (!k->zlib_init) {
+    z->zalloc = (alloc_func)Z_NULL;
+    z->zfree = (free_func)Z_NULL;
+    z->opaque = 0;              /* of dubious use 08/27/02 jhrg */
+    if (inflateInit(z) != Z_OK)
+      return process_zlib_error(data, z);
+    k->zlib_init = 1;
+  }
+
+  /* Set the compressed input when this function is called */
+  z->next_in = (Bytef *)k->str;
+  z->avail_in = nread;
+
+  /* because the buffer size is fixed, iteratively decompress
+     and transfer to the client via client_write. */
+  for (;;) {
+    /* (re)set buffer for decompressed output for every iteration */
+    z->next_out = (Bytef *)&decomp[0];
+    z->avail_out = DSIZ;
+
+    status = inflate(z, Z_SYNC_FLUSH);
+    if (status == Z_OK || status == Z_STREAM_END) {
+      if (DSIZ - z->avail_out) {
+        result = Curl_client_write(data, CLIENTWRITE_BODY, decomp,
+                                   DSIZ - z->avail_out);
+        /* if !CURLE_OK, clean up, return */
+        if (result)
+          return exit_zlib(z, &k->zlib_init, result);
+      }
+
+      /* Done?; clean up, return */
+      if (status == Z_STREAM_END) {
+        if (inflateEnd(z) == Z_OK)
+          return exit_zlib(z, &k->zlib_init, result);
+        else
+          return exit_zlib(z, &k->zlib_init, process_zlib_error(data, z));
+      }
+
+      /* Done with these bytes, exit */
+      if (status == Z_OK && z->avail_in == 0 && z->avail_out > 0)
+        return result;
+    }
+    else {                      /* Error; exit loop, handle below */
+      return exit_zlib(z, &k->zlib_init, process_zlib_error(data, z));
+    }
+  }
+}
+
+/* Skip over the gzip header */
+static enum {
+  GZIP_OK,
+  GZIP_BAD,
+  GZIP_UNDERFLOW
+} check_gzip_header(unsigned char const *data, ssize_t len, ssize_t *headerlen)
+{
+  int method, flags;
+  const ssize_t totallen = len;
+
+  /* The shortest header is 10 bytes */
+  if (len < 10)
+    return GZIP_UNDERFLOW;
+
+  if ((data[0] != GZIP_MAGIC_0) || (data[1] != GZIP_MAGIC_1))
+    return GZIP_BAD;
+
+  method = data[2];
+  flags = data[3];
+
+  if (method != Z_DEFLATED || (flags & RESERVED) != 0) {
+    /* Can't handle this compression method or unknown flag */
+    return GZIP_BAD;
+  }
+
+  /* Skip over time, xflags, OS code and all previous bytes */
+  len -= 10;
+  data += 10;
+
+  if (flags & EXTRA_FIELD) {
+    ssize_t extra_len;
+
+    if (len < 2)
+      return GZIP_UNDERFLOW;
+
+    extra_len = (data[1] << 8) | data[0];
+
+    if (len < (extra_len+2))
+      return GZIP_UNDERFLOW;
+
+    len -= (extra_len + 2);
+  }
+
+  if (flags & ORIG_NAME) {
+    /* Skip over NUL-terminated file name */
+    while (len && *data) {
+      --len;
+      ++data;
+    }
+    if (!len || *data)
+      return GZIP_UNDERFLOW;
+
+    /* Skip over the NUL */
+    --len;
+    ++data;
+  }
+
+  if (flags & COMMENT) {
+    /* Skip over NUL-terminated comment */
+    while (len && *data) {
+      --len;
+      ++data;
+    }
+    if (!len || *data)
+      return GZIP_UNDERFLOW;
+
+    /* Skip over the NUL */
+    --len;
+    ++data;
+  }
+
+  if (flags & HEAD_CRC) {
+    if (len < 2)
+      return GZIP_UNDERFLOW;
+
+    len -= 2;
+    data += 2;
+  }
+
+  *headerlen = totallen - len;
+  return GZIP_OK;
+}
+
+CURLcode
+Curl_unencode_gzip_write(struct SessionHandle *data,
+                         struct Curl_transfer_keeper *k,
+                         ssize_t nread)
+{
+  int status;                   /* zlib status */
+  int result;                   /* Curl_client_write status */
+  char decomp[DSIZ];            /* Put the decompressed data here. */
+  z_stream *z = &k->z;          /* zlib state structure */
+
+  /* Initialize zlib? */
+  if (!k->zlib_init) {
+    z->zalloc = (alloc_func)Z_NULL;
+    z->zfree = (free_func)Z_NULL;
+    z->opaque = 0;              /* of dubious use 08/27/02 jhrg */
+    if (inflateInit2(z, -MAX_WBITS) != Z_OK)
+      return process_zlib_error(data, z);
+    k->zlib_init = 1;   /* Initial call state */
+  }
+
+  /* This next mess is to get around the potential case where there isn't
+  enough data passed in to skip over the gzip header.  If that happens,
+  we malloc a block and copy what we have then wait for the next call.  If
+  there still isn't enough (this is definitely a worst-case scenario), we
+  make the block bigger, copy the next part in and keep waiting. */
+
+  /* Skip over gzip header? */
+  if (k->zlib_init == 1) {
+    /* Initial call state */
+    ssize_t hlen;
+
+    switch (check_gzip_header((unsigned char *)k->str, nread, &hlen)) {
+    case GZIP_OK:
+      z->next_in = (Bytef *)k->str + hlen;
+      z->avail_in = nread - hlen;
+      k->zlib_init = 3; /* Inflating stream state */
+      break;
+
+    case GZIP_UNDERFLOW:
+      /* We need more data so we can find the end of the gzip header.
+      It's possible that the memory block we malloc here will never be
+      freed if the transfer abruptly aborts after this point.  Since it's
+      unlikely that circumstances will be right for this code path to be
+      followed in the first place, and it's even more unlikely for a transfer
+      to fail immediately afterwards, it should seldom be a problem. */
+      z->avail_in = nread;
+      z->next_in = malloc(z->avail_in);
+      if (z->next_in == NULL) {
+        return exit_zlib(z, &k->zlib_init, CURLE_OUT_OF_MEMORY);
+      }
+      memcpy(z->next_in, k->str, z->avail_in);
+      k->zlib_init = 2;   /* Need more gzip header data state */
+      /* We don't have any data to inflate yet */
+      return CURLE_OK;
+
+    case GZIP_BAD:
+    default:
+      return exit_zlib(z, &k->zlib_init, process_zlib_error(data, z));
+    }
+
+  }
+  else if (k->zlib_init == 2) {
+    /* Need more gzip header data state */
+    ssize_t hlen;
+    unsigned char *oldblock = z->next_in;
+
+    z->avail_in += nread;
+    z->next_in = realloc(z->next_in, z->avail_in);
+    if (z->next_in == NULL) {
+      free(oldblock);
+      return exit_zlib(z, &k->zlib_init, CURLE_OUT_OF_MEMORY);
+    }
+    /* Append the new block of data to the previous one */
+    memcpy(z->next_in + z->avail_in - nread, k->str, nread);
+
+    switch (check_gzip_header(z->next_in, z->avail_in, &hlen)) {
+    case GZIP_OK:
+      /* This is the zlib stream data */
+      free(z->next_in);
+      /* Don't point into the malloced block since we just freed it */
+      z->next_in = (Bytef *)k->str + hlen + nread - z->avail_in;
+      z->avail_in = z->avail_in - hlen;
+      k->zlib_init = 3;   /* Inflating stream state */
+      break;
+
+    case GZIP_UNDERFLOW:
+      /* We still don't have any data to inflate! */
+      return CURLE_OK;
+
+    case GZIP_BAD:
+    default:
+      free(z->next_in);
+      return exit_zlib(z, &k->zlib_init, process_zlib_error(data, z));
+    }
+
+  }
+  else {
+    /* Inflating stream state */
+    z->next_in = (Bytef *)k->str;
+    z->avail_in = nread;
+  }
+
+  if (z->avail_in == 0) {
+    /* We don't have any data to inflate; wait until next time */
+    return CURLE_OK;
+  }
+
+  /* because the buffer size is fixed, iteratively decompress
+     and transfer to the client via client_write. */
+  for (;;) {
+    /* (re)set buffer for decompressed output for every iteration */
+    z->next_out = (Bytef *)&decomp[0];
+    z->avail_out = DSIZ;
+
+    status = inflate(z, Z_SYNC_FLUSH);
+    if (status == Z_OK || status == Z_STREAM_END) {
+      if(DSIZ - z->avail_out) {
+        result = Curl_client_write(data, CLIENTWRITE_BODY, decomp,
+                                   DSIZ - z->avail_out);
+        /* if !CURLE_OK, clean up, return */
+        if (result)
+          return exit_zlib(z, &k->zlib_init, result);
+      }
+
+      /* Done?; clean up, return */
+      /* We should really check the gzip CRC here */
+      if (status == Z_STREAM_END) {
+        if (inflateEnd(z) == Z_OK)
+          return exit_zlib(z, &k->zlib_init, result);
+        else
+          return exit_zlib(z, &k->zlib_init, process_zlib_error(data, z));
+      }
+
+      /* Done with these bytes, exit */
+      if (status == Z_OK && z->avail_in == 0 && z->avail_out > 0)
+        return result;
+    }
+    else {                      /* Error; exit loop, handle below */
+      return exit_zlib(z, &k->zlib_init, process_zlib_error(data, z));
+    }
+  }
+}
+#endif /* HAVE_LIBZ */
diff --git a/main/source/curl/lib/content_encoding.h b/main/source/curl/lib/content_encoding.h
new file mode 100644
index 00000000..762cfb49
--- /dev/null
+++ b/main/source/curl/lib/content_encoding.h
@@ -0,0 +1,41 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: content_encoding.h,v 1.6 2003/05/12 12:45:14 bagder Exp $
+ ***************************************************************************/
+#include "setup.h"
+
+/*
+ * Comma-separated list all supported Content-Encodings ('identity' is implied)
+ */
+#ifdef HAVE_LIBZ
+#define ALL_CONTENT_ENCODINGS "deflate, gzip"
+#else
+#define ALL_CONTENT_ENCODINGS "identity"
+#endif
+
+CURLcode Curl_unencode_deflate_write(struct SessionHandle *data, 
+                                     struct Curl_transfer_keeper *k, 
+                                     ssize_t nread);
+
+CURLcode
+Curl_unencode_gzip_write(struct SessionHandle *data, 
+                         struct Curl_transfer_keeper *k,
+                         ssize_t nread);
diff --git a/main/source/curl/lib/cookie.c b/main/source/curl/lib/cookie.c
new file mode 100644
index 00000000..69681982
--- /dev/null
+++ b/main/source/curl/lib/cookie.c
@@ -0,0 +1,850 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: cookie.c,v 1.44 2003/05/15 22:28:19 bagder Exp $
+ ***************************************************************************/
+
+/***
+
+
+RECEIVING COOKIE INFORMATION
+============================
+
+struct CookieInfo *cookie_init(char *file);
+	
+	Inits a cookie struct to store data in a local file. This is always
+	called before any cookies are set.
+
+int cookies_set(struct CookieInfo *cookie, char *cookie_line);
+
+	The 'cookie_line' parameter is a full "Set-cookie:" line as
+	received from a server.
+
+	The function need to replace previously stored lines that this new
+	line superceeds.
+
+	It may remove lines that are expired.
+
+	It should return an indication of success/error.
+
+
+SENDING COOKIE INFORMATION
+==========================
+
+struct Cookies *cookie_getlist(struct CookieInfo *cookie,
+                               char *host, char *path, bool secure);
+
+	For a given host and path, return a linked list of cookies that
+	the client should send to the server if used now. The secure
+	boolean informs the cookie if a secure connection is achieved or
+	not.
+
+	It shall only return cookies that haven't expired.
+
+    
+Example set of cookies:
+    
+    Set-cookie: PRODUCTINFO=webxpress; domain=.fidelity.com; path=/; secure
+    Set-cookie: PERSONALIZE=none;expires=Monday, 13-Jun-1988 03:04:55 GMT;
+    domain=.fidelity.com; path=/ftgw; secure
+    Set-cookie: FidHist=none;expires=Monday, 13-Jun-1988 03:04:55 GMT;
+    domain=.fidelity.com; path=/; secure
+    Set-cookie: FidOrder=none;expires=Monday, 13-Jun-1988 03:04:55 GMT;
+    domain=.fidelity.com; path=/; secure
+    Set-cookie: DisPend=none;expires=Monday, 13-Jun-1988 03:04:55 GMT;
+    domain=.fidelity.com; path=/; secure
+    Set-cookie: FidDis=none;expires=Monday, 13-Jun-1988 03:04:55 GMT;
+    domain=.fidelity.com; path=/; secure
+    Set-cookie:
+    Session_Key@6791a9e0-901a-11d0-a1c8-9b012c88aa77=none;expires=Monday,
+    13-Jun-1988 03:04:55 GMT; domain=.fidelity.com; path=/; secure
+****/
+
+
+#include "setup.h"
+
+#ifndef CURL_DISABLE_HTTP
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "cookie.h"
+#include "getdate.h"
+#include "strequal.h"
+#include "strtok.h"
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+static void
+free_cookiemess(struct Cookie *co)
+{
+  if(co->domain)
+    free(co->domain);
+  if(co->path)
+    free(co->path);
+  if(co->name)
+    free(co->name);
+  if(co->value)
+    free(co->value);
+
+  free(co);
+}
+
+static bool tailmatch(const char *little, const char *bigone)
+{
+  unsigned int littlelen = strlen(little);
+  unsigned int biglen = strlen(bigone);
+
+  if(littlelen > biglen)
+    return FALSE;
+
+  return strequal(little, bigone+biglen-littlelen);
+}
+
+/****************************************************************************
+ *
+ * Curl_cookie_add()
+ *
+ * Add a single cookie line to the cookie keeping object.
+ *
+ ***************************************************************************/
+
+struct Cookie *
+Curl_cookie_add(struct CookieInfo *c,
+                bool httpheader, /* TRUE if HTTP header-style line */
+                char *lineptr,   /* first character of the line */
+                char *domain,    /* default domain */
+                char *path)      /* full path used when this cookie is set,
+                                    used to get default path for the cookie
+                                    unless set */
+{
+  struct Cookie *clist;
+  char what[MAX_COOKIE_LINE];
+  char name[MAX_NAME];
+  char *ptr;
+  char *semiptr;
+  struct Cookie *co;
+  struct Cookie *lastc=NULL;
+  time_t now = time(NULL);
+  bool replace_old = FALSE;
+  bool badcookie = FALSE; /* cookies are good by default. mmmmm yummy */
+
+  /* First, alloc and init a new struct for it */
+  co = (struct Cookie *)malloc(sizeof(struct Cookie));
+  if(!co)
+    return NULL; /* bail out if we're this low on memory */
+
+  /* clear the whole struct first */
+  memset(co, 0, sizeof(struct Cookie));
+	    
+  if(httpheader) {
+    /* This line was read off a HTTP-header */
+    char *sep;
+    semiptr=strchr(lineptr, ';'); /* first, find a semicolon */
+
+    while(*lineptr && isspace((int)*lineptr))
+      lineptr++;
+
+    ptr = lineptr;
+    do {
+      /* we have a <what>=<this> pair or a 'secure' word here */
+      sep = strchr(ptr, '=');
+      if(sep && (!semiptr || (semiptr>sep)) ) {
+        /*
+         * There is a = sign and if there was a semicolon too, which make sure
+         * that the semicolon comes _after_ the equal sign.
+         */
+
+        name[0]=what[0]=0; /* init the buffers */
+        if(1 <= sscanf(ptr, "%" MAX_NAME_TXT "[^;=]=%"
+                       MAX_COOKIE_LINE_TXT "[^;\r\n]",
+                       name, what)) {
+          /* this is a <name>=<what> pair */
+
+          char *whatptr;
+
+          /* Strip off trailing whitespace from the 'what' */
+          int len=strlen(what);
+          while(len && isspace((int)what[len-1])) {
+            what[len-1]=0;
+            len--;
+          }
+
+          /* Skip leading whitespace from the 'what' */
+          whatptr=what;
+          while(isspace((int)*whatptr)) {
+            whatptr++;
+          }
+
+          if(strequal("path", name)) {
+            co->path=strdup(whatptr);
+          }
+          else if(strequal("domain", name)) {
+            /* note that this name may or may not have a preceeding dot, but
+               we don't care about that, we treat the names the same anyway */
+
+            char *ptr=whatptr;
+            int dotcount=1;
+            unsigned int i;
+
+            static const char *seventhree[]= {
+              "com", "edu", "net", "org", "gov", "mil", "int"
+            };
+
+            /* Count the dots, we need to make sure that there are THREE dots
+               in the normal domains, or TWO in the seventhree-domains. */
+
+            if('.' == whatptr[0])
+              /* don't count the initial dot, assume it */
+              ptr++;
+
+            do {
+              ptr = strchr(ptr, '.');
+              if(ptr) {
+                ptr++;
+                dotcount++;
+              }
+            } while(ptr);
+
+            for(i=0;
+                i<sizeof(seventhree)/sizeof(seventhree[0]); i++) {
+              if(tailmatch(seventhree[i], whatptr)) {
+                dotcount++; /* we allow one dot less for these */
+                break;
+              }
+            }
+            if(dotcount < 3) {
+              /* Received and skipped a cookie with a domain using too few
+                 dots. */
+              badcookie=TRUE; /* mark this as a bad cookie */
+            }
+            else {
+              /* Now, we make sure that our host is within the given domain,
+                 or the given domain is not valid and thus cannot be set. */
+
+              if(!domain || tailmatch(whatptr, domain)) {
+                char *ptr=whatptr;
+                if(ptr[0] == '.')
+                  ptr++;
+                co->domain=strdup(ptr); /* dont prefix with dots internally */
+                co->tailmatch=TRUE; /* we always do that if the domain name was
+                                       given */
+              }
+              else {
+                /* we did not get a tailmatch and then the attempted set domain
+                   is not a domain to which the current host belongs. Mark as
+                   bad. */
+                badcookie=TRUE;
+              }
+            }
+          }
+          else if(strequal("version", name)) {
+            co->version=strdup(whatptr);
+          }
+          else if(strequal("max-age", name)) {
+            /* Defined in RFC2109:
+
+               Optional.  The Max-Age attribute defines the lifetime of the
+               cookie, in seconds.  The delta-seconds value is a decimal non-
+               negative integer.  After delta-seconds seconds elapse, the
+               client should discard the cookie.  A value of zero means the
+               cookie should be discarded immediately.
+
+             */
+            co->maxage = strdup(whatptr);
+            co->expires =
+              atoi((*co->maxage=='\"')?&co->maxage[1]:&co->maxage[0]) + now;
+          }
+          else if(strequal("expires", name)) {
+            co->expirestr=strdup(whatptr);
+            co->expires = curl_getdate(what, &now);
+          }
+          else if(!co->name) {
+            co->name = strdup(name);
+            co->value = strdup(whatptr);
+          }
+          /*
+            else this is the second (or more) name we don't know
+            about! */
+        }
+        else {
+          /* this is an "illegal" <what>=<this> pair */
+        }
+      }
+      else {
+        if(sscanf(ptr, "%" MAX_COOKIE_LINE_TXT "[^;\r\n]",
+                  what)) {
+          if(strequal("secure", what))
+            co->secure = TRUE;
+          /* else,
+             unsupported keyword without assign! */
+
+        }
+      }
+      if(!semiptr || !*semiptr) {
+        /* we already know there are no more cookies */
+        semiptr = NULL;
+        continue;
+      }
+
+      ptr=semiptr+1;
+      while(ptr && *ptr && isspace((int)*ptr))
+        ptr++;
+      semiptr=strchr(ptr, ';'); /* now, find the next semicolon */
+
+      if(!semiptr && *ptr)
+        /* There are no more semicolons, but there's a final name=value pair
+           coming up */
+        semiptr=strchr(ptr, '\0');
+    } while(semiptr);
+
+    if(badcookie || (NULL == co->name)) {
+      /* we didn't get a cookie name or a bad one,
+         this is an illegal line, bail out */
+      if(co->expirestr)
+        free(co->expirestr);
+      if(co->domain)
+        free(co->domain);
+      if(co->path)
+        free(co->path);
+      if(co->name)
+        free(co->name);
+      if(co->value)
+        free(co->value);
+      free(co);
+      return NULL;
+    }
+
+    if(NULL == co->domain)
+      /* no domain was given in the header line, set the default now */
+      co->domain=domain?strdup(domain):NULL;
+    if((NULL == co->path) && path) {
+      /* no path was given in the header line, set the default now */
+      char *endslash = strrchr(path, '/');
+      if(endslash) {
+        int pathlen = endslash-path+1; /* include the ending slash */
+        co->path=malloc(pathlen+1); /* one extra for the zero byte */
+        if(co->path) {
+          memcpy(co->path, path, pathlen);
+          co->path[pathlen]=0; /* zero terminate */
+        }
+      }
+    }
+  }
+  else {
+    /* This line is NOT a HTTP header style line, we do offer support for
+       reading the odd netscape cookies-file format here */
+    char *firstptr;
+    char *tok_buf;
+    int fields;
+
+    if(lineptr[0]=='#') {
+      /* don't even try the comments */
+      free(co);
+      return NULL;
+    }
+    /* strip off the possible end-of-line characters */
+    ptr=strchr(lineptr, '\r');
+    if(ptr)
+      *ptr=0; /* clear it */
+    ptr=strchr(lineptr, '\n');
+    if(ptr)
+      *ptr=0; /* clear it */
+
+    firstptr=strtok_r(lineptr, "\t", &tok_buf); /* first tokenize it on the TAB */
+
+    /* Here's a quick check to eliminate normal HTTP-headers from this */
+    if(!firstptr || strchr(firstptr, ':')) {
+      free(co);
+      return NULL;
+    }
+
+    /* Now loop through the fields and init the struct we already have
+       allocated */
+    for(ptr=firstptr, fields=0; ptr;
+        ptr=strtok_r(NULL, "\t", &tok_buf), fields++) {
+      switch(fields) {
+      case 0:
+        if(ptr[0]=='.') /* skip preceeding dots */
+          ptr++;
+        co->domain = strdup(ptr);
+        break;
+      case 1:
+        /* This field got its explanation on the 23rd of May 2001 by
+           Andrés García:
+
+           flag: A TRUE/FALSE value indicating if all machines within a given
+           domain can access the variable. This value is set automatically by
+           the browser, depending on the value you set for the domain.
+
+           As far as I can see, it is set to true when the cookie says
+           .domain.com and to false when the domain is complete www.domain.com
+        */
+        co->tailmatch=strequal(ptr, "TRUE"); /* store information */
+        break;
+      case 2:
+        /* It turns out, that sometimes the file format allows the path
+           field to remain not filled in, we try to detect this and work
+           around it! Andrés García made us aware of this... */
+        if (strcmp("TRUE", ptr) && strcmp("FALSE", ptr)) {
+          /* only if the path doesn't look like a boolean option! */
+          co->path = strdup(ptr);
+          break;
+        }
+        /* this doesn't look like a path, make one up! */
+        co->path = strdup("/");
+        fields++; /* add a field and fall down to secure */
+        /* FALLTHROUGH */
+      case 3:
+        co->secure = strequal(ptr, "TRUE");
+        break;
+      case 4:
+        co->expires = atoi(ptr);
+        break;
+      case 5:
+        co->name = strdup(ptr);
+        break;
+      case 6:
+        co->value = strdup(ptr);
+        break;
+      }
+    }
+
+    if(7 != fields) {
+      /* we did not find the sufficient number of fields to recognize this
+         as a valid line, abort and go home */
+      free_cookiemess(co);
+      return NULL;
+    }
+
+  }
+
+  if(!c->running &&    /* read from a file */
+     c->newsession &&  /* clean session cookies */
+     !co->expires) {   /* this is a session cookie since it doesn't expire! */
+    free_cookiemess(co);
+    return NULL;
+  }
+
+  co->livecookie = c->running;
+
+  /* now, we have parsed the incoming line, we must now check if this
+     superceeds an already existing cookie, which it may if the previous have
+     the same domain and path as this */
+
+  clist = c->cookies;
+  replace_old = FALSE;
+  while(clist) {
+    if(strequal(clist->name, co->name)) {
+      /* the names are identical */
+
+      if(clist->domain && co->domain) {
+        if(strequal(clist->domain, co->domain))
+          /* The domains are identical */
+          replace_old=TRUE;
+      }
+      else if(!clist->domain && !co->domain)
+        replace_old = TRUE;
+
+      if(replace_old) {
+        /* the domains were identical */
+
+        if(clist->path && co->path) {
+          if(strequal(clist->path, co->path)) {
+            replace_old = TRUE;
+          }
+          else
+            replace_old = FALSE;
+        }
+        else if(!clist->path && !co->path)
+          replace_old = TRUE;
+        else
+          replace_old = FALSE;
+        
+      }
+
+      if(replace_old && !co->livecookie && clist->livecookie) {
+        /* Both cookies matched fine, except that the already present
+           cookie is "live", which means it was set from a header, while
+           the new one isn't "live" and thus only read from a file. We let
+           live cookies stay alive */
+
+        /* Free the newcomer and get out of here! */
+        if(co->domain)
+          free(co->domain);
+        if(co->path)
+          free(co->path);
+        if(co->name)
+          free(co->name);
+        if(co->value)
+          free(co->value);
+
+        free(co);
+        return NULL;
+      }
+
+      if(replace_old) {
+        co->next = clist->next; /* get the next-pointer first */
+
+        /* then free all the old pointers */
+        if(clist->name)
+          free(clist->name);
+        if(clist->value)
+          free(clist->value);
+        if(clist->domain)
+          free(clist->domain);
+        if(clist->path)
+          free(clist->path);
+        if(clist->expirestr)
+          free(clist->expirestr);
+
+        if(clist->version)
+          free(clist->version);
+        if(clist->maxage)
+          free(clist->maxage);
+
+        *clist = *co;  /* then store all the new data */
+
+        free(co);   /* free the newly alloced memory */
+        co = clist; /* point to the previous struct instead */
+
+        /* We have replaced a cookie, now skip the rest of the list but
+           make sure the 'lastc' pointer is properly set */
+        do {
+          lastc = clist;
+          clist = clist->next;
+        } while(clist);
+        break;
+      }
+    }
+    lastc = clist;
+    clist = clist->next;
+  }
+
+  if(!replace_old) {
+    /* then make the last item point on this new one */
+    if(lastc)
+      lastc->next = co;
+    else
+      c->cookies = co;
+  }
+
+  c->numcookies++; /* one more cookie in the jar */
+  return co;
+}
+
+/*****************************************************************************
+ *
+ * Curl_cookie_init()
+ *
+ * Inits a cookie struct to read data from a local file. This is always
+ * called before any cookies are set. File may be NULL.
+ *
+ * If 'newsession' is TRUE, discard all "session cookies" on read from file.
+ *
+ ****************************************************************************/
+struct CookieInfo *Curl_cookie_init(char *file,
+                                    struct CookieInfo *inc,
+                                    bool newsession)
+{
+  char line[MAX_COOKIE_LINE];
+  struct CookieInfo *c;
+  FILE *fp;
+  bool fromfile=TRUE;
+  
+  if(NULL == inc) {
+    /* we didn't get a struct, create one */
+    c = (struct CookieInfo *)malloc(sizeof(struct CookieInfo));
+    if(!c)
+      return NULL; /* failed to get memory */
+    memset(c, 0, sizeof(struct CookieInfo));
+    c->filename = strdup(file?file:"none"); /* copy the name just in case */
+  }
+  else {
+    /* we got an already existing one, use that */
+    c = inc;
+  }
+  c->running = FALSE; /* this is not running, this is init */
+
+  if(file && strequal(file, "-")) {
+    fp = stdin;
+    fromfile=FALSE;
+  }
+  else
+    fp = file?fopen(file, "r"):NULL;
+
+  c->newsession = newsession; /* new session? */
+
+  if(fp) {
+    char *lineptr;
+    bool headerline;
+    while(fgets(line, MAX_COOKIE_LINE, fp)) {
+      if(checkprefix("Set-Cookie:", line)) {
+        /* This is a cookie line, get it! */
+        lineptr=&line[11];
+        headerline=TRUE;
+      }
+      else {
+        lineptr=line;
+        headerline=FALSE;
+      }
+      while(*lineptr && isspace((int)*lineptr))
+        lineptr++;
+
+      Curl_cookie_add(c, headerline, lineptr, NULL, NULL);
+    }
+    if(fromfile)
+      fclose(fp);
+  }
+
+  c->running = TRUE;          /* now, we're running */
+
+  return c;
+}
+
+/*****************************************************************************
+ *
+ * Curl_cookie_getlist()
+ *
+ * For a given host and path, return a linked list of cookies that the
+ * client should send to the server if used now. The secure boolean informs
+ * the cookie if a secure connection is achieved or not.
+ *
+ * It shall only return cookies that haven't expired.
+ *
+ ****************************************************************************/
+
+struct Cookie *Curl_cookie_getlist(struct CookieInfo *c,
+                                   char *host, char *path, bool secure)
+{
+   struct Cookie *newco;
+   struct Cookie *co;
+   time_t now = time(NULL);
+   struct Cookie *mainco=NULL;
+
+   if(!c || !c->cookies)
+      return NULL; /* no cookie struct or no cookies in the struct */
+
+   co = c->cookies;
+
+   while(co) {
+     /* only process this cookie if it is not expired or had no expire
+        date AND that if the cookie requires we're secure we must only
+        continue if we are! */
+     if( (co->expires<=0 || (co->expires> now)) &&
+         (co->secure?secure:TRUE) ) {
+       
+       /* now check if the domain is correct */
+       if(!co->domain ||
+          (co->tailmatch && tailmatch(co->domain, host)) ||
+          (!co->tailmatch && strequal(host, co->domain)) ) {
+         /* the right part of the host matches the domain stuff in the
+            cookie data */
+         
+         /* now check the left part of the path with the cookies path
+            requirement */
+         if(!co->path ||
+            checkprefix(co->path, path) ) {
+
+           /* and now, we know this is a match and we should create an
+              entry for the return-linked-list */
+           
+           newco = (struct Cookie *)malloc(sizeof(struct Cookie));
+           if(newco) {
+             /* first, copy the whole source cookie: */
+             memcpy(newco, co, sizeof(struct Cookie));
+
+             /* then modify our next */
+             newco->next = mainco;
+             
+             /* point the main to us */
+             mainco = newco;
+           }
+         }
+       }
+     }
+     co = co->next;
+   }
+
+   return mainco; /* return the new list */
+}
+
+
+/*****************************************************************************
+ *
+ * Curl_cookie_freelist()
+ *
+ * Free a list of cookies previously returned by Curl_cookie_getlist();
+ *
+ ****************************************************************************/
+
+void Curl_cookie_freelist(struct Cookie *co)
+{
+   struct Cookie *next;
+   if(co) {
+      while(co) {
+	 next = co->next;
+	 free(co); /* we only free the struct since the "members" are all
+		      just copied! */
+	 co = next;
+      }
+   }
+}
+
+/*****************************************************************************
+ *
+ * Curl_cookie_cleanup()
+ *
+ * Free a "cookie object" previous created with cookie_init().
+ *
+ ****************************************************************************/
+void Curl_cookie_cleanup(struct CookieInfo *c)
+{
+   struct Cookie *co;
+   struct Cookie *next;
+   if(c) {
+      if(c->filename)
+	 free(c->filename);
+      co = c->cookies;
+
+      while(co) {
+	 if(co->name)
+	    free(co->name);
+	 if(co->value)
+	    free(co->value);
+	 if(co->domain)
+	    free(co->domain);
+	 if(co->path)
+	    free(co->path);
+	 if(co->expirestr)
+	    free(co->expirestr);
+
+	 if(co->version)
+	    free(co->version);
+	 if(co->maxage)
+	    free(co->maxage);
+
+	 next = co->next;
+	 free(co);
+	 co = next;
+      }
+      free(c); /* free the base struct as well */
+   }
+}
+
+/*
+ * Curl_cookie_output()
+ *
+ * Writes all internally known cookies to the specified file. Specify
+ * "-" as file name to write to stdout.
+ *
+ * The function returns non-zero on write failure.
+ */
+int Curl_cookie_output(struct CookieInfo *c, char *dumphere)
+{
+  struct Cookie *co;
+  FILE *out;
+  bool use_stdout=FALSE;
+
+  if((NULL == c) || (0 == c->numcookies))
+    /* If there are no known cookies, we don't write or even create any
+       destination file */
+    return 0;
+
+  if(strequal("-", dumphere)) {
+    /* use stdout */
+    out = stdout;
+    use_stdout=TRUE;
+  }
+  else {
+    out = fopen(dumphere, "w");
+    if(!out)
+      return 1; /* failure */
+  }
+
+  if(c) {
+    fputs("# Netscape HTTP Cookie File\n"
+          "# http://www.netscape.com/newsref/std/cookie_spec.html\n"
+          "# This file was generated by libcurl! Edit at your own risk.\n\n",
+          out);
+    co = c->cookies;
+     
+    while(co) {
+      fprintf(out,
+              "%s%s\t" /* domain */
+              "%s\t" /* tailmatch */
+              "%s\t" /* path */
+              "%s\t" /* secure */
+              "%u\t" /* expires */
+              "%s\t" /* name */
+              "%s\n", /* value */
+
+              /* Make sure all domains are prefixed with a dot if they allow
+                 tailmatching. This is Mozilla-style. */
+              (co->tailmatch && co->domain && co->domain[0] != '.')? ".":"",
+              co->domain?co->domain:"unknown",
+              co->tailmatch?"TRUE":"FALSE",
+              co->path?co->path:"/",
+              co->secure?"TRUE":"FALSE",
+              (unsigned int)co->expires,
+              co->name,
+              co->value?co->value:"");
+
+      co=co->next;
+    }
+  }
+
+  if(!use_stdout)
+    fclose(out);
+
+  return 0;
+}
+
+#ifdef CURL_COOKIE_DEBUG
+
+/*
+ * On my Solaris box, this command line builds this test program:
+ *
+ * gcc -g -o cooktest -DCURL_COOKIE_DEBUG -DHAVE_CONFIG_H -I.. -I../include cookie.c strequal.o getdate.o memdebug.o mprintf.o strtok.o -lnsl -lsocket
+ *
+ */
+
+int main(int argc, char **argv)
+{
+  struct CookieInfo *c=NULL;
+  if(argc>1) {
+    c = Curl_cookie_init(argv[1], c);
+    Curl_cookie_add(c, TRUE, "PERSONALIZE=none;expires=Monday, 13-Jun-1988 03:04:55 GMT; domain=.fidelity.com; path=/ftgw; secure");
+    Curl_cookie_add(c, TRUE, "foobar=yes; domain=.haxx.se; path=/looser;");
+    c = Curl_cookie_init(argv[1], c);
+
+    Curl_cookie_output(c);
+    Curl_cookie_cleanup(c);
+    return 0;
+  }
+  return 1;
+}
+
+#endif
+
+#endif /* CURL_DISABLE_HTTP */
diff --git a/main/source/curl/lib/cookie.h b/main/source/curl/lib/cookie.h
new file mode 100644
index 00000000..4399a398
--- /dev/null
+++ b/main/source/curl/lib/cookie.h
@@ -0,0 +1,84 @@
+#ifndef __COOKIE_H
+#define __COOKIE_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: cookie.h,v 1.13 2003/04/30 17:03:44 bagder Exp $
+ ***************************************************************************/
+
+#include <stdio.h>
+#ifdef WIN32
+#include <time.h>
+#else
+#include <sys/time.h>
+#endif
+
+#include <curl/curl.h>
+
+struct Cookie {
+  struct Cookie *next; /* next in the chain */
+  char *name;        /* <this> = value */
+  char *value;       /* name = <this> */
+  char *path;	      /* path = <this> */
+  char *domain;      /* domain = <this> */
+  long expires;    /* expires = <this> */
+  char *expirestr;   /* the plain text version */
+  bool tailmatch;    /* weather we do tail-matchning of the domain name */
+  
+  /* RFC 2109 keywords. Version=1 means 2109-compliant cookie sending */
+  char *version;     /* Version = <value> */
+  char *maxage;      /* Max-Age = <value> */
+  
+  bool secure;       /* whether the 'secure' keyword was used */
+  bool livecookie;   /* updated from a server, not a stored file */
+};
+
+struct CookieInfo {
+  /* linked list of cookies we know of */
+  struct Cookie *cookies;
+
+  char *filename;  /* file we read from/write to */
+  bool running;    /* state info, for cookie adding information */
+  long numcookies; /* number of cookies in the "jar" */
+  bool newsession; /* new session, discard session cookies on load */
+};
+
+/* This is the maximum line length we accept for a cookie line */
+#define MAX_COOKIE_LINE 2048
+#define MAX_COOKIE_LINE_TXT "2047"
+
+/* This is the maximum length of a cookie name we deal with: */
+#define MAX_NAME 256
+#define MAX_NAME_TXT "255"
+
+/*
+ * Add a cookie to the internal list of cookies. The domain and path arguments
+ * are only used if the header boolean is TRUE.
+ */
+struct Cookie *Curl_cookie_add(struct CookieInfo *, bool header, char *line,
+                               char *domain, char *path);
+
+struct CookieInfo *Curl_cookie_init(char *, struct CookieInfo *, bool);
+struct Cookie *Curl_cookie_getlist(struct CookieInfo *, char *, char *, bool);
+void Curl_cookie_freelist(struct Cookie *);
+void Curl_cookie_cleanup(struct CookieInfo *);
+int Curl_cookie_output(struct CookieInfo *, char *);
+
+#endif
diff --git a/main/source/curl/lib/curllib.vcproj b/main/source/curl/lib/curllib.vcproj
new file mode 100644
index 00000000..90836306
--- /dev/null
+++ b/main/source/curl/lib/curllib.vcproj
@@ -0,0 +1,1042 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="curllib"
+	SccProjectName=""
+	SccAuxPath=""
+	SccLocalPath=""
+	SccProvider="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)/"
+			IntermediateDirectory="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Release/curllib.pch"
+				AssemblerListingLocation="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ObjectFile="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ProgramDataBaseFileName="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(SolutionDir)\lib\$(ConfigurationName)\curl.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)/"
+			IntermediateDirectory="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\curllib___Win32_Debug/curllib.pch"
+				AssemblerListingLocation="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ObjectFile="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ProgramDataBaseFileName="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(SolutionDir)\lib\$(ConfigurationName)\curl.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="arpa_telnet.h">
+			</File>
+			<File
+				RelativePath="base64.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="base64.h">
+			</File>
+			<File
+				RelativePath="ca-bundle.h">
+			</File>
+			<File
+				RelativePath="config-mac.h">
+			</File>
+			<File
+				RelativePath="config-riscos.h">
+			</File>
+			<File
+				RelativePath="config-vms.h">
+			</File>
+			<File
+				RelativePath="config-win32.h">
+			</File>
+			<File
+				RelativePath="connect.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="connect.h">
+			</File>
+			<File
+				RelativePath="content_encoding.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="content_encoding.h">
+			</File>
+			<File
+				RelativePath="cookie.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="cookie.h">
+			</File>
+			<File
+				RelativePath="dict.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="dict.h">
+			</File>
+			<File
+				RelativePath="easy.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="escape.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="escape.h">
+			</File>
+			<File
+				RelativePath="file.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="file.h">
+			</File>
+			<File
+				RelativePath="formdata.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="formdata.h">
+			</File>
+			<File
+				RelativePath="ftp.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="ftp.h">
+			</File>
+			<File
+				RelativePath="getdate.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="getdate.h">
+			</File>
+			<File
+				RelativePath="getenv.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="getinfo.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="getinfo.h">
+			</File>
+			<File
+				RelativePath="getpass.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="getpass.h">
+			</File>
+			<File
+				RelativePath="hash.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="hash.h">
+			</File>
+			<File
+				RelativePath="hostip.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="hostip.h">
+			</File>
+			<File
+				RelativePath="http.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="http.h">
+			</File>
+			<File
+				RelativePath="http_chunks.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="http_chunks.h">
+			</File>
+			<File
+				RelativePath="if2ip.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="if2ip.h">
+			</File>
+			<File
+				RelativePath="inet_ntoa_r.h">
+			</File>
+			<File
+				RelativePath="krb4.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="krb4.h">
+			</File>
+			<File
+				RelativePath="ldap.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="ldap.h">
+			</File>
+			<File
+				RelativePath="llist.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="llist.h">
+			</File>
+			<File
+				RelativePath="memdebug.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="memdebug.h">
+			</File>
+			<File
+				RelativePath="mprintf.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="multi.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="netrc.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="netrc.h">
+			</File>
+			<File
+				RelativePath="progress.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="progress.h">
+			</File>
+			<File
+				RelativePath="security.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="security.h">
+			</File>
+			<File
+				RelativePath="sendf.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="sendf.h">
+			</File>
+			<File
+				RelativePath="setup.h">
+			</File>
+			<File
+				RelativePath="share.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="share.h">
+			</File>
+			<File
+				RelativePath="speedcheck.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="speedcheck.h">
+			</File>
+			<File
+				RelativePath="ssluse.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="ssluse.h">
+			</File>
+			<File
+				RelativePath="strequal.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="strequal.h">
+			</File>
+			<File
+				RelativePath="strtok.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="strtok.h">
+			</File>
+			<File
+				RelativePath="telnet.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="telnet.h">
+			</File>
+			<File
+				RelativePath="timeval.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="timeval.h">
+			</File>
+			<File
+				RelativePath="transfer.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="transfer.h">
+			</File>
+			<File
+				RelativePath="url.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="url.h">
+			</File>
+			<File
+				RelativePath="urldata.h">
+			</File>
+			<File
+				RelativePath="version.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/main/source/curl/lib/dict.c b/main/source/curl/lib/dict.c
new file mode 100644
index 00000000..bba8b42e
--- /dev/null
+++ b/main/source/curl/lib/dict.c
@@ -0,0 +1,232 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: dict.c,v 1.24 2003/01/29 10:14:20 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+/* -- WIN32 approved -- */
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <errno.h>
+
+#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
+#include <winsock.h>
+#include <time.h>
+#include <io.h>
+#else
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#include <netinet/in.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <netdb.h>
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NET_IF_H
+#include <net/if.h>
+#endif
+#include <sys/ioctl.h>
+#include <signal.h>
+
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+
+#endif
+
+#include "urldata.h"
+#include <curl/curl.h>
+#include "transfer.h"
+#include "sendf.h"
+
+#include "progress.h"
+#include "strequal.h"
+
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+CURLcode Curl_dict(struct connectdata *conn)
+{
+  int nth;
+  char *word;
+  char *ppath;
+  char *database = NULL;
+  char *strategy = NULL;
+  char *nthdef = NULL; /* This is not part of the protocol, but required
+                          by RFC 2229 */
+  CURLcode result=CURLE_OK;
+  struct SessionHandle *data=conn->data;
+
+  char *path = conn->path;
+  long *bytecount = &conn->bytecount;
+
+  if(conn->bits.user_passwd) {
+    /* AUTH is missing */
+  }
+
+  if (strnequal(path, DICT_MATCH, sizeof(DICT_MATCH)-1) ||
+      strnequal(path, DICT_MATCH2, sizeof(DICT_MATCH2)-1) ||
+      strnequal(path, DICT_MATCH3, sizeof(DICT_MATCH3)-1)) {
+      
+    word = strchr(path, ':');
+    if (word) {
+      word++;
+      database = strchr(word, ':');
+      if (database) {
+        *database++ = (char)0;
+        strategy = strchr(database, ':');
+        if (strategy) {
+          *strategy++ = (char)0;
+          nthdef = strchr(strategy, ':');
+          if (nthdef) {
+            *nthdef++ = (char)0;
+          }
+        }
+      }
+    }
+      
+    if ((word == NULL) || (*word == (char)0)) {
+      failf(data, "lookup word is missing");
+    }
+    if ((database == NULL) || (*database == (char)0)) {
+      database = (char *)"!";
+    }
+    if ((strategy == NULL) || (*strategy == (char)0)) {
+      strategy = (char *)".";
+    }
+    if ((nthdef == NULL) || (*nthdef == (char)0)) {
+      nth = 0;
+    }
+    else {
+      nth = atoi(nthdef);
+    }
+      
+    result = Curl_sendf(conn->firstsocket, conn,
+                        "CLIENT " LIBCURL_NAME " " LIBCURL_VERSION "\n"
+                        "MATCH "
+                        "%s "    /* database */
+                        "%s "    /* strategy */
+                        "%s\n"   /* word */
+                        "QUIT\n",
+                        
+                        database,
+                        strategy,
+                        word
+                        );
+    if(result)
+      failf(data, "Failed sending DICT request");
+    else
+      result = Curl_Transfer(conn, conn->firstsocket, -1, FALSE, bytecount,
+                             -1, NULL); /* no upload */      
+    if(result)
+      return result;
+  }
+  else if (strnequal(path, DICT_DEFINE, sizeof(DICT_DEFINE)-1) ||
+           strnequal(path, DICT_DEFINE2, sizeof(DICT_DEFINE2)-1) ||
+           strnequal(path, DICT_DEFINE3, sizeof(DICT_DEFINE3)-1)) {
+    
+    word = strchr(path, ':');
+    if (word) {
+      word++;
+      database = strchr(word, ':');
+      if (database) {
+        *database++ = (char)0;
+        nthdef = strchr(database, ':');
+        if (nthdef) {
+          *nthdef++ = (char)0;
+        }
+      }
+    }
+      
+    if ((word == NULL) || (*word == (char)0)) {
+      failf(data, "lookup word is missing");
+    }
+    if ((database == NULL) || (*database == (char)0)) {
+      database = (char *)"!";
+    }
+    if ((nthdef == NULL) || (*nthdef == (char)0)) {
+      nth = 0;
+    }
+    else {
+      nth = atoi(nthdef);
+    }
+      
+    result = Curl_sendf(conn->firstsocket, conn,
+                        "CLIENT " LIBCURL_NAME " " LIBCURL_VERSION "\n"
+                        "DEFINE "
+                        "%s "     /* database */
+                        "%s\n"    /* word */
+                        "QUIT\n",
+                        database,
+                        word);
+    if(result)
+      failf(data, "Failed sending DICT request");
+    else
+      result = Curl_Transfer(conn, conn->firstsocket, -1, FALSE, bytecount,
+                             -1, NULL); /* no upload */
+    
+    if(result)
+      return result;
+      
+  }
+  else {
+      
+    ppath = strchr(path, '/');
+    if (ppath) {
+      int i;
+	
+      ppath++;
+      for (i = 0; ppath[i]; i++) {
+        if (ppath[i] == ':')
+          ppath[i] = ' ';
+      }
+      result = Curl_sendf(conn->firstsocket, conn,
+                          "CLIENT " LIBCURL_NAME " " LIBCURL_VERSION "\n"
+                          "%s\n"
+                          "QUIT\n", ppath);
+      if(result)
+        failf(data, "Failed sending DICT request");
+      else
+        result = Curl_Transfer(conn, conn->firstsocket, -1, FALSE, bytecount,
+                               -1, NULL);
+      if(result)
+        return result;
+    }
+  }
+
+  return CURLE_OK;
+}
diff --git a/main/source/curl/lib/dict.h b/main/source/curl/lib/dict.h
new file mode 100644
index 00000000..79a794e2
--- /dev/null
+++ b/main/source/curl/lib/dict.h
@@ -0,0 +1,30 @@
+#ifndef __DICT_H
+#define __DICT_H
+
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: dict.h,v 1.10 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+#ifndef CURL_DISABLE_DICT
+CURLcode Curl_dict(struct connectdata *conn);
+CURLcode Curl_dict_done(struct connectdata *conn);
+#endif
+#endif
diff --git a/main/source/curl/lib/easy.c b/main/source/curl/lib/easy.c
new file mode 100644
index 00000000..8cad910b
--- /dev/null
+++ b/main/source/curl/lib/easy.c
@@ -0,0 +1,335 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: easy.c,v 1.37 2003/04/22 21:42:39 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+/* -- WIN32 approved -- */
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <errno.h>
+
+#include "strequal.h"
+
+#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
+#include <winsock.h>
+#include <time.h>
+#include <io.h>
+#else
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#include <netinet/in.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <netdb.h>
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NET_IF_H
+#include <net/if.h>
+#endif
+#include <sys/ioctl.h>
+#include <signal.h>
+
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+#endif
+
+#include "urldata.h"
+#include <curl/curl.h>
+#include "transfer.h"
+#include "ssluse.h"
+#include "url.h"
+#include "getinfo.h"
+#include "hostip.h"
+
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+
+/* Silly win32 socket initialization functions */
+
+#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
+static void win32_cleanup(void)
+{
+  WSACleanup();
+}
+
+static CURLcode win32_init(void)
+{
+  WORD wVersionRequested;  
+  WSADATA wsaData; 
+  int err; 
+  wVersionRequested = MAKEWORD(2, 0); 
+    
+  err = WSAStartup(wVersionRequested, &wsaData); 
+    
+  if (err != 0) 
+    /* Tell the user that we couldn't find a useable */ 
+    /* winsock.dll.     */ 
+    return CURLE_FAILED_INIT; 
+    
+  /* Confirm that the Windows Sockets DLL supports 2.0.*/ 
+  /* Note that if the DLL supports versions greater */ 
+  /* than 2.0 in addition to 2.0, it will still return */ 
+  /* 2.0 in wVersion since that is the version we */ 
+  /* requested. */ 
+    
+  if ( LOBYTE( wsaData.wVersion ) != 2 || 
+       HIBYTE( wsaData.wVersion ) != 0 ) { 
+    /* Tell the user that we couldn't find a useable */ 
+
+    /* winsock.dll. */ 
+    WSACleanup(); 
+    return CURLE_FAILED_INIT; 
+  }
+  return CURLE_OK;
+}
+/* The Windows Sockets DLL is acceptable. Proceed. */ 
+#else
+/* These functions exist merely to prevent compiler warnings */
+static CURLcode win32_init(void) { return CURLE_OK; }
+static void win32_cleanup(void) { }
+#endif
+
+
+/* true globals -- for curl_global_init() and curl_global_cleanup() */
+static unsigned int  initialized = 0;
+static long          init_flags  = 0;
+
+/**
+ * Globally initializes cURL given a bitwise set of 
+ * the different features to initialize.
+ */
+CURLcode curl_global_init(long flags)
+{
+  if (initialized)
+    return CURLE_OK;
+
+  if (flags & CURL_GLOBAL_SSL)
+    Curl_SSL_init();
+
+  if (flags & CURL_GLOBAL_WIN32)
+    if (win32_init() != CURLE_OK)
+      return CURLE_FAILED_INIT;
+
+  initialized = 1;
+  init_flags  = flags;
+  
+  return CURLE_OK;
+}
+
+/**
+ * Globally cleanup cURL, uses the value of "init_flags" to determine
+ * what needs to be cleaned up and what doesn't
+ */
+void curl_global_cleanup(void)
+{
+  if (!initialized)
+    return;
+
+  Curl_global_host_cache_dtor();
+
+  if (init_flags & CURL_GLOBAL_SSL)
+    Curl_SSL_cleanup();
+
+  if (init_flags & CURL_GLOBAL_WIN32)
+    win32_cleanup();
+
+  initialized = 0;
+  init_flags  = 0;
+}
+
+CURL *curl_easy_init(void)
+{
+  CURLcode res;
+  struct SessionHandle *data;
+
+  /* Make sure we inited the global SSL stuff */
+  if (!initialized)
+    curl_global_init(CURL_GLOBAL_DEFAULT);
+
+  /* We use curl_open() with undefined URL so far */
+  res = Curl_open(&data);
+  if(res != CURLE_OK)
+    return NULL;
+
+  return data;
+}
+
+typedef int (*func_T)(void);
+CURLcode curl_easy_setopt(CURL *curl, CURLoption tag, ...)
+{
+  va_list arg;
+  func_T param_func = (func_T)0;
+  long param_long = 0;
+  void *param_obj = NULL;
+  struct SessionHandle *data = curl;
+  CURLcode ret=CURLE_FAILED_INIT;
+
+  va_start(arg, tag);
+
+  /* PORTING NOTE:
+     Object pointers can't necessarily be casted to function pointers and
+     therefore we need to know what type it is and read the correct type
+     at once. This should also correct problems with different sizes of
+     the types.
+  */
+
+  if(tag < CURLOPTTYPE_OBJECTPOINT) {
+    /* This is a LONG type */
+    param_long = va_arg(arg, long);
+    ret = Curl_setopt(data, tag, param_long);
+  }
+  else if(tag < CURLOPTTYPE_FUNCTIONPOINT) {
+    /* This is a object pointer type */
+    param_obj = va_arg(arg, void *);
+    ret = Curl_setopt(data, tag, param_obj);
+  }
+  else {
+    param_func = va_arg(arg, func_T );
+    ret = Curl_setopt(data, tag, param_func);
+  }
+
+  va_end(arg);
+  return ret;
+}
+
+CURLcode curl_easy_perform(CURL *curl)
+{
+  struct SessionHandle *data = (struct SessionHandle *)curl;
+
+  if (Curl_global_host_cache_use(data) && data->hostcache != Curl_global_host_cache_get()) {
+    if (data->hostcache) {
+      Curl_hash_destroy(data->hostcache);
+    }
+    data->hostcache = Curl_global_host_cache_get();
+  }
+
+  if (!data->hostcache) {
+    data->hostcache = Curl_hash_alloc(7, Curl_freednsinfo);
+  }
+  
+  return Curl_perform(data);
+}
+
+void curl_easy_cleanup(CURL *curl)
+{
+  struct SessionHandle *data = (struct SessionHandle *)curl;
+  if (!Curl_global_host_cache_use(data)) {
+    Curl_hash_destroy(data->hostcache);
+  }
+  Curl_close(data);
+}
+
+CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ...)
+{
+  va_list arg;
+  void *paramp;
+  struct SessionHandle *data = (struct SessionHandle *)curl;
+
+  va_start(arg, info);
+  paramp = va_arg(arg, void *);
+
+  return Curl_getinfo(data, info, paramp);
+}
+
+CURL *curl_easy_duphandle(CURL *incurl)
+{
+  struct SessionHandle *data=(struct SessionHandle *)incurl;
+
+  struct SessionHandle *outcurl = (struct SessionHandle *)
+    malloc(sizeof(struct SessionHandle));
+
+  if(NULL == outcurl)
+    return NULL; /* failure */
+
+  /* start with clearing the entire new struct */
+  memset(outcurl, 0, sizeof(struct SessionHandle));
+
+  /*
+   * We setup a few buffers we need. We should probably make them
+   * get setup on-demand in the code, as that would probably decrease
+   * the likeliness of us forgetting to init a buffer here in the future.
+   */
+  outcurl->state.headerbuff=(char*)malloc(HEADERSIZE);
+  if(!outcurl->state.headerbuff) {
+    free(outcurl); /* free the memory again */
+    return NULL;
+  }
+  outcurl->state.headersize=HEADERSIZE;
+
+  /* copy all userdefined values */
+  outcurl->set = data->set;
+  outcurl->state.numconnects = data->state.numconnects;
+  outcurl->state.connects = (struct connectdata **)
+      malloc(sizeof(struct connectdata *) * outcurl->state.numconnects);
+
+  if(!outcurl->state.connects) {
+    free(outcurl->state.headerbuff);
+    free(outcurl);
+    return NULL;
+  }
+  memset(outcurl->state.connects, 0,
+         sizeof(struct connectdata *)*outcurl->state.numconnects);
+
+  outcurl->progress.flags    = data->progress.flags;
+  outcurl->progress.callback = data->progress.callback;
+
+  if(data->cookies)
+    /* If cookies are enabled in the parent handle, we enable them
+       in the clone as well! */
+    outcurl->cookies = Curl_cookie_init(data->cookies->filename,
+                                        outcurl->cookies,
+                                        data->set.cookiesession);
+
+  /* duplicate all values in 'change' */
+  if(data->change.url) {
+    outcurl->change.url = strdup(data->change.url);
+    outcurl->change.url_alloc = TRUE;
+  }
+  if(data->change.proxy) {
+    outcurl->change.proxy = strdup(data->change.proxy);
+    outcurl->change.proxy_alloc = TRUE;
+  }
+  if(data->change.referer) {
+    outcurl->change.referer = strdup(data->change.referer);
+    outcurl->change.referer_alloc = TRUE;
+  }
+
+  return outcurl;
+}
diff --git a/main/source/curl/lib/escape.c b/main/source/curl/lib/escape.c
new file mode 100644
index 00000000..a18a4a1d
--- /dev/null
+++ b/main/source/curl/lib/escape.c
@@ -0,0 +1,114 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: escape.c,v 1.25 2003/01/29 10:14:20 bagder Exp $
+ ***************************************************************************/
+
+/* Escape and unescape URL encoding in strings. The functions return a new
+ * allocated string or NULL if an error occurred.  */
+
+#include "setup.h"
+#include <curl/curl.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+char *curl_escape(const char *string, int length)
+{
+  int alloc = (length?length:(int)strlen(string))+1;  
+  char *ns = malloc(alloc);
+  char *testing_ptr = NULL;
+  unsigned char in;
+  int newlen = alloc;
+  int index=0;
+
+  length = alloc-1;
+  while(length--) {
+    in = *string;
+    if(!(in >= 'a' && in <= 'z') &&
+       !(in >= 'A' && in <= 'Z') &&
+       !(in >= '0' && in <= '9')) {
+      /* encode it */
+      newlen += 2; /* the size grows with two, since this'll become a %XX */
+      if(newlen > alloc) {
+        alloc *= 2;
+        testing_ptr = realloc(ns, alloc);
+        if(!testing_ptr) {
+          free( ns );
+          return NULL;
+        }
+        else {
+          ns = testing_ptr;
+        }
+      }
+      sprintf(&ns[index], "%%%02X", in);
+
+      index+=3;
+    }
+    else {
+      /* just copy this */
+      ns[index++]=in;
+    }
+    string++;
+  }
+  ns[index]=0; /* terminate it */
+  return ns;
+}
+
+char *curl_unescape(const char *string, int length)
+{
+  int alloc = (length?length:(int)strlen(string))+1;
+  char *ns = malloc(alloc);
+  unsigned char in;
+  int index=0;
+  unsigned int hex;
+ 
+  if( !ns ) {
+    return NULL;
+  }  
+  
+  while(--alloc > 0) {
+    in = *string;
+    if('%' == in) {
+      /* encoded part */
+      if(sscanf(string+1, "%02X", &hex)) {
+        in = hex;
+        string+=2;
+        alloc-=2;
+      }
+    }
+    
+    ns[index++] = in;
+    string++;
+  }
+  ns[index]=0; /* terminate it */
+  return ns;
+}
+
+void curl_free(void *p)
+{
+  free(p);
+}
diff --git a/main/source/curl/lib/escape.h b/main/source/curl/lib/escape.h
new file mode 100644
index 00000000..bfd70504
--- /dev/null
+++ b/main/source/curl/lib/escape.h
@@ -0,0 +1,32 @@
+#ifndef __ESCAPE_H
+#define __ESCAPE_H
+
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: escape.h,v 1.10 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+/* Escape and unescape URL encoding in strings. The functions return a new
+ * allocated string or NULL if an error occurred.  */
+
+char *curl_escape(const char *string, int length);
+char *curl_unescape(const char *string, int length);
+
+#endif
diff --git a/main/source/curl/lib/file.c b/main/source/curl/lib/file.c
new file mode 100644
index 00000000..c8506d10
--- /dev/null
+++ b/main/source/curl/lib/file.c
@@ -0,0 +1,213 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: file.c,v 1.29 2003/01/29 10:14:20 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#ifndef CURL_DISABLE_FILE
+/* -- WIN32 approved -- */
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <errno.h>
+
+#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
+#include <winsock.h>
+#include <time.h>
+#include <io.h>
+#include <fcntl.h>
+#else
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#include <sys/time.h>
+#include <sys/resource.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NET_IF_H
+#include <net/if.h>
+#endif
+#include <sys/ioctl.h>
+#include <signal.h>
+
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
+
+#endif
+
+#include "urldata.h"
+#include <curl/curl.h>
+#include "progress.h"
+#include "sendf.h"
+#include "escape.h"
+
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+/* Emulate a connect-then-transfer protocol. We connect to the file here */
+CURLcode Curl_file_connect(struct connectdata *conn)
+{
+  char *actual_path = curl_unescape(conn->path, 0);
+  struct FILE *file;
+  int fd;
+#if defined(WIN32) || defined(__EMX__)
+  int i;
+#endif
+
+  file = (struct FILE *)malloc(sizeof(struct FILE));
+  if(!file)
+    return CURLE_OUT_OF_MEMORY;
+
+  memset(file, 0, sizeof(struct FILE));
+  conn->proto.file = file;
+
+#if defined(WIN32) || defined(__EMX__)
+  /* change path separators from '/' to '\\' for Windows and OS/2 */
+  for (i=0; actual_path[i] != '\0'; ++i)
+    if (actual_path[i] == '/')
+      actual_path[i] = '\\';
+
+  fd = open(actual_path, O_RDONLY | O_BINARY);	/* no CR/LF translation! */
+#else
+  fd = open(actual_path, O_RDONLY);
+#endif
+  free(actual_path);
+
+  if(fd == -1) {
+    failf(conn->data, "Couldn't open file %s", conn->path);
+    return CURLE_FILE_COULDNT_READ_FILE;
+  }
+  file->fd = fd;
+
+  return CURLE_OK;
+}
+
+/* This is the do-phase, separated from the connect-phase above */
+
+CURLcode Curl_file(struct connectdata *conn)
+{
+  /* This implementation ignores the host name in conformance with 
+     RFC 1738. Only local files (reachable via the standard file system)
+     are supported. This means that files on remotely mounted directories
+     (via NFS, Samba, NT sharing) can be accessed through a file:// URL
+  */
+  CURLcode res = CURLE_OK;
+  struct stat statbuf;
+  double expected_size=-1;
+  ssize_t nread;
+  struct SessionHandle *data = conn->data;
+  char *buf = data->state.buffer;
+  int bytecount = 0;
+  struct timeval start = Curl_tvnow();
+  struct timeval now = start;
+  int fd;
+
+  /* get the fd from the connection phase */
+  fd = conn->proto.file->fd;
+
+/*VMS?? -- This only works reliable for STREAMLF files */
+  if( -1 != fstat(fd, &statbuf)) {
+    /* we could stat it, then read out the size */
+    expected_size = (double)statbuf.st_size;
+  }
+
+  /* Added by Dolbneff A.V & Spiridonoff A.V */
+  if (conn->resume_from <= expected_size)
+    expected_size -= conn->resume_from;
+  else
+    /* Is this error code suitable in such situation? */
+    return CURLE_FTP_BAD_DOWNLOAD_RESUME;
+
+  if (expected_size == 0)
+    return CURLE_OK;
+
+  /* The following is a shortcut implementation of file reading
+     this is both more efficient than the former call to download() and
+     it avoids problems with select() and recv() on file descriptors
+     in Winsock */
+  if(expected_size != -1)
+    Curl_pgrsSetDownloadSize(data, expected_size);
+
+  if(conn->resume_from)
+    /* Added by Dolbneff A.V & Spiridonoff A.V */
+    lseek(fd, conn->resume_from, SEEK_SET);
+
+  while (res == CURLE_OK) {
+    nread = read(fd, buf, BUFSIZE-1);
+
+    if ( nread > 0)
+      buf[nread] = 0;
+
+    if (nread <= 0)
+      break;
+
+    bytecount += nread;
+    /* NOTE: The following call to fwrite does CR/LF translation on
+       Windows systems if the target is stdout. Use -O or -o parameters
+       to prevent CR/LF translation (this then goes to a binary mode
+       file descriptor). */
+
+    res = Curl_client_write(data, CLIENTWRITE_BODY, buf, nread);
+    if(res)
+      return res;
+
+    now = Curl_tvnow();
+    if(Curl_pgrsUpdate(conn))
+      res = CURLE_ABORTED_BY_CALLBACK;
+  }
+  now = Curl_tvnow();
+  if(Curl_pgrsUpdate(conn))
+    res = CURLE_ABORTED_BY_CALLBACK;
+
+  close(fd);
+
+  return res;
+}
+#endif
diff --git a/main/source/curl/lib/file.h b/main/source/curl/lib/file.h
new file mode 100644
index 00000000..d2712d7d
--- /dev/null
+++ b/main/source/curl/lib/file.h
@@ -0,0 +1,30 @@
+#ifndef __FILE_H
+#define __FILE_H
+
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: file.h,v 1.10 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+#ifndef CURL_DISABLE_FILE
+CURLcode Curl_file(struct connectdata *conn);
+CURLcode Curl_file_connect(struct connectdata *conn);
+#endif
+#endif
diff --git a/main/source/curl/lib/formdata.c b/main/source/curl/lib/formdata.c
new file mode 100644
index 00000000..e11984b4
--- /dev/null
+++ b/main/source/curl/lib/formdata.c
@@ -0,0 +1,1596 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: formdata.c,v 1.48 2003/04/15 09:29:39 bagder Exp $
+ ***************************************************************************/
+
+/*
+  Debug the form generator stand-alone by compiling this source file with:
+
+  gcc -DHAVE_CONFIG_H -I../ -g -D_FORM_DEBUG -o formdata -I../include formdata.c strequal.c
+
+  run the 'formdata' executable the output should end with:
+  All Tests seem to have worked ...
+  and the following parts should be there:
+
+Content-Disposition: form-data; name="simple_COPYCONTENTS"
+value for simple COPYCONTENTS
+
+Content-Disposition: form-data; name="COPYCONTENTS_+_CONTENTTYPE"
+Content-Type: image/gif
+value for COPYCONTENTS + CONTENTTYPE
+
+Content-Disposition: form-data; name="PRNAME_+_NAMELENGTH_+_COPYNAME_+_CONTENTSLENGTH"
+vlue for PTRNAME + NAMELENGTH + COPYNAME + CONTENTSLENGTH
+(or you might see P^@RNAME and v^@lue at the start)
+
+Content-Disposition: form-data; name="simple_PTRCONTENTS"
+value for simple PTRCONTENTS
+
+Content-Disposition: form-data; name="PTRCONTENTS_+_CONTENTSLENGTH"
+vlue for PTRCONTENTS + CONTENTSLENGTH
+(or you might see v^@lue at the start)
+
+Content-Disposition: form-data; name="PTRCONTENTS_+_CONTENTSLENGTH_+_CONTENTTYPE"
+Content-Type: text/plain
+vlue for PTRCOTNENTS + CONTENTSLENGTH + CONTENTTYPE
+(or you might see v^@lue at the start)
+
+Content-Disposition: form-data; name="FILE1_+_CONTENTTYPE"; filename="inet_ntoa_r.h"
+Content-Type: text/html
+...
+
+Content-Disposition: form-data; name="FILE1_+_FILE2"
+Content-Type: multipart/mixed, boundary=curlz1s0dkticx49MV1KGcYP5cvfSsz
+...
+Content-Disposition: attachment; filename="inet_ntoa_r.h"
+Content-Type: text/plain
+...
+Content-Disposition: attachment; filename="Makefile.b32.resp"
+Content-Type: text/plain
+...
+
+Content-Disposition: form-data; name="FILE1_+_FILE2_+_FILE3"
+Content-Type: multipart/mixed, boundary=curlirkYPmPwu6FrJ1vJ1u1BmtIufh1
+...
+Content-Disposition: attachment; filename="inet_ntoa_r.h"
+Content-Type: text/plain
+...
+Content-Disposition: attachment; filename="Makefile.b32.resp"
+Content-Type: text/plain
+...
+Content-Disposition: attachment; filename="inet_ntoa_r.h"
+Content-Type: text/plain
+...
+
+
+Content-Disposition: form-data; name="ARRAY: FILE1_+_FILE2_+_FILE3"
+Content-Type: multipart/mixed, boundary=curlirkYPmPwu6FrJ1vJ1u1BmtIufh1
+...
+Content-Disposition: attachment; filename="inet_ntoa_r.h"
+Content-Type: text/plain
+...
+Content-Disposition: attachment; filename="Makefile.b32.resp"
+Content-Type: text/plain
+...
+Content-Disposition: attachment; filename="inet_ntoa_r.h"
+Content-Type: text/plain
+...
+
+Content-Disposition: form-data; name="FILECONTENT"
+...
+
+  For the old FormParse used by curl_formparse use:
+
+  gcc -DHAVE_CONFIG_H -I../ -g -D_OLD_FORM_DEBUG -o formdata -I../include formdata.c strequal.c
+
+  run the 'formdata' executable and make sure the output is ok!
+
+  try './formdata "name=Daniel" "poo=noo" "foo=bar"' and similarly
+
+ */
+
+#include "setup.h"
+
+#ifndef CURL_DISABLE_HTTP
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+
+#include <time.h>
+
+#include <curl/curl.h>
+#include "formdata.h"
+
+#include "strequal.h"
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+/* Length of the random boundary string. */
+#define BOUNDARY_LENGTH 40
+
+/* What kind of Content-Type to use on un-specified files with unrecognized
+   extensions. */
+#define HTTPPOST_CONTENTTYPE_DEFAULT "text/plain"
+
+/* This is a silly duplicate of the function in main.c to enable this source
+   to compile stand-alone for better debugging */
+static void GetStr(char **string,
+		   const char *value)
+{
+  if(*string)
+    free(*string);
+  *string = strdup(value);
+}
+
+/***************************************************************************
+ *
+ * FormParse()
+ *	
+ * Reads a 'name=value' paramter and builds the appropriate linked list.
+ *
+ * Specify files to upload with 'name=@filename'. Supports specified
+ * given Content-Type of the files. Such as ';type=<content-type>'.
+ *
+ * You may specify more than one file for a single name (field). Specify
+ * multiple files by writing it like:
+ *
+ * 'name=@filename,filename2,filename3'
+ *
+ * If you want content-types specified for each too, write them like:
+ *
+ * 'name=@filename;type=image/gif,filename2,filename3'
+ *
+ ***************************************************************************/
+
+#define FORM_FILE_SEPARATOR ','
+#define FORM_TYPE_SEPARATOR ';'
+
+static
+int FormParse(char *input,
+	      struct curl_httppost **httppost,
+	      struct curl_httppost **last_post)
+{
+  /* nextarg MUST be a string in the format 'name=contents' and we'll
+     build a linked list with the info */
+  char name[256];
+  char *contents;
+  char major[128];
+  char minor[128];
+  long flags = 0;
+  char *contp;
+  const char *type = NULL;
+  char *prevtype = NULL;
+  char *sep;
+  char *sep2;
+  struct curl_httppost *post;
+  struct curl_httppost *subpost; /* a sub-node */
+  unsigned int i;
+
+  /* Preallocate contents to the length of input to make sure we don't
+     overwrite anything. */
+  contents = malloc(strlen(input));
+  contents[0] = '\000';
+ 
+  if(1 <= sscanf(input, "%255[^=]=%[^\n]", name, contents)) {
+    /* the input was using the correct format */
+    contp = contents;
+
+    if('@' == contp[0]) {
+      /* we use the @-letter to indicate file name(s) */
+      
+      flags = HTTPPOST_FILENAME;
+      contp++;
+
+      post=NULL;
+
+      do {
+	/* since this was a file, it may have a content-type specifier
+	   at the end too */
+
+	sep=strchr(contp, FORM_TYPE_SEPARATOR);
+	sep2=strchr(contp, FORM_FILE_SEPARATOR);
+
+	/* pick the closest */
+	if(sep2 && (sep2 < sep)) {
+	  sep = sep2;
+
+	  /* no type was specified! */
+	}
+	if(sep) {
+
+	  /* if we got here on a comma, don't do much */
+	  if(FORM_FILE_SEPARATOR != *sep)
+	    type = strstr(sep+1, "type=");
+	  else
+	    type=NULL;
+
+	  *sep=0; /* terminate file name at separator */
+
+	  if(type) {
+	    type += strlen("type=");
+	    
+	    if(2 != sscanf(type, "%127[^/]/%127[^,\n]",
+			   major, minor)) {
+              free(contents);
+	      return 2; /* illegal content-type syntax! */
+	    }
+	    /* now point beyond the content-type specifier */
+	    sep = (char *)type + strlen(major)+strlen(minor)+1;
+
+	    /* find the following comma */
+	    sep=strchr(sep, FORM_FILE_SEPARATOR);
+	  }
+	}
+	else {
+	  type=NULL;
+	  sep=strchr(contp, FORM_FILE_SEPARATOR);
+	}
+	if(sep) {
+	  /* the next file name starts here */
+	  *sep =0;
+	  sep++;
+	}
+	if(!type) {
+	  /*
+	   * No type was specified, we scan through a few well-known
+	   * extensions and pick the first we match!
+	   */
+	  struct ContentType {
+	    const char *extension;
+	    const char *type;
+	  };
+          static struct ContentType ctts[]={
+	    {".gif",  "image/gif"},
+	    {".jpg",  "image/jpeg"},
+	    {".jpeg", "image/jpeg"},
+	    {".txt",  "text/plain"},
+	    {".html", "text/plain"}
+	  };
+
+	  if(prevtype)
+	    /* default to the previously set/used! */
+	    type = prevtype;
+	  else
+	    /* It seems RFC1867 defines no Content-Type to default to
+	       text/plain so we don't actually need to set this: */
+	    type = HTTPPOST_CONTENTTYPE_DEFAULT;
+
+	  for(i=0; i<sizeof(ctts)/sizeof(ctts[0]); i++) {
+	    if(strlen(contp) >= strlen(ctts[i].extension)) {
+	      if(strequal(contp +
+			  strlen(contp) - strlen(ctts[i].extension),
+			  ctts[i].extension)) {
+		type = ctts[i].type;
+		break;
+	      }	      
+	    }
+	  }
+	  /* we have a type by now */
+	}
+
+	if(NULL == post) {
+	  /* For the first file name, we allocate and initiate the main list
+	     node */
+
+	  post = (struct curl_httppost *)malloc(sizeof(struct curl_httppost));
+	  if(post) {
+	    memset(post, 0, sizeof(struct curl_httppost));
+	    GetStr(&post->name, name);      /* get the name */
+	    GetStr(&post->contents, contp); /* get the contents */
+            post->contentslength = 0;
+	    post->flags = flags;
+	    if(type) {
+	      GetStr(&post->contenttype, (char *)type); /* get type */
+	      prevtype=post->contenttype; /* point to the allocated string! */
+	    }
+	    /* make the previous point to this */
+	    if(*last_post)
+	      (*last_post)->next = post;
+	    else
+	      (*httppost) = post;
+
+	    (*last_post) = post;	  
+	  }
+
+	}
+	else {
+	  /* we add a file name to the previously allocated node, known as
+             'post' now */
+	  subpost =(struct curl_httppost *)
+            malloc(sizeof(struct curl_httppost));
+	  if(subpost) {
+	     memset(subpost, 0, sizeof(struct curl_httppost));
+	     GetStr(&subpost->name, name);      /* get the name */
+	     GetStr(&subpost->contents, contp); /* get the contents */
+             subpost->contentslength = 0;
+	     subpost->flags = flags;
+	     if(type) {
+	       GetStr(&subpost->contenttype, (char *)type); /* get type */
+	       prevtype=subpost->contenttype; /* point to allocated string! */
+	     }
+	     /* now, point our 'more' to the original 'more' */
+	     subpost->more = post->more;
+
+	     /* then move the original 'more' to point to ourselves */
+	     post->more = subpost;	     
+	  }
+	}
+	contp = sep; /* move the contents pointer to after the separator */
+      } while(sep && *sep); /* loop if there's another file name */
+    }
+    else {
+      post = (struct curl_httppost *)malloc(sizeof(struct curl_httppost));
+      if(post) {
+	memset(post, 0, sizeof(struct curl_httppost));
+	GetStr(&post->name, name);      /* get the name */
+	if( contp[0]=='<' ) {
+	  GetStr(&post->contents, contp+1); /* get the contents */
+          post->contentslength = 0;
+	  post->flags = HTTPPOST_READFILE;
+	}
+	else {
+	  GetStr(&post->contents, contp); /* get the contents */
+          post->contentslength = 0;
+	  post->flags = 0;
+	}
+
+	/* make the previous point to this */
+	if(*last_post)
+	  (*last_post)->next = post;
+	else
+	  (*httppost) = post;
+
+	(*last_post) = post;	  
+      }
+
+    }
+
+  }
+  else {
+    free(contents);
+    return 1;
+  }
+  free(contents);
+  return 0;
+}
+
+int curl_formparse(char *input,
+                   struct curl_httppost **httppost,
+                   struct curl_httppost **last_post)
+{
+  return FormParse(input, httppost, last_post);
+}
+
+/***************************************************************************
+ *
+ * AddHttpPost()
+ *	
+ * Adds a HttpPost structure to the list, if parent_post is given becomes
+ * a subpost of parent_post instead of a direct list element.
+ *
+ * Returns newly allocated HttpPost on success and NULL if malloc failed.
+ *
+ ***************************************************************************/
+static struct curl_httppost *
+AddHttpPost(char * name, long namelength,
+            char * value, long contentslength,
+
+            /* CMC: Added support for buffer uploads */
+            char * buffer, long bufferlength,
+
+            char *contenttype,
+            long flags,
+            struct curl_slist* contentHeader,
+            char *showfilename,
+            struct curl_httppost *parent_post,
+            struct curl_httppost **httppost,
+            struct curl_httppost **last_post)
+{
+  struct curl_httppost *post;
+  post = (struct curl_httppost *)malloc(sizeof(struct curl_httppost));
+  if(post) {
+    memset(post, 0, sizeof(struct curl_httppost));
+    post->name = name;
+    post->namelength = name?(namelength?namelength:(long)strlen(name)):0;
+    post->contents = value;
+    post->contentslength = contentslength;
+
+    /* CMC: Added support for buffer uploads */
+    post->buffer = buffer;
+    post->bufferlength = bufferlength;
+
+    post->contenttype = contenttype;
+    post->contentheader = contentHeader;
+    post->showfilename = showfilename;
+    post->flags = flags;
+  }
+  else
+    return NULL;
+  
+  if (parent_post) {
+    /* now, point our 'more' to the original 'more' */
+    post->more = parent_post->more;
+    
+    /* then move the original 'more' to point to ourselves */
+    parent_post->more = post;	         
+  }
+  else {
+    /* make the previous point to this */
+    if(*last_post)
+      (*last_post)->next = post;
+    else
+      (*httppost) = post;
+    
+    (*last_post) = post;  
+  }
+  return post;
+}
+
+/***************************************************************************
+ *
+ * AddFormInfo()
+ *	
+ * Adds a FormInfo structure to the list presented by parent_form_info.
+ *
+ * Returns newly allocated FormInfo on success and NULL if malloc failed/
+ * parent_form_info is NULL.
+ *
+ ***************************************************************************/
+static FormInfo * AddFormInfo(char *value,
+                              char *contenttype,
+                              FormInfo *parent_form_info)
+{
+  FormInfo *form_info;
+  form_info = (FormInfo *)malloc(sizeof(FormInfo));
+  if(form_info) {
+    memset(form_info, 0, sizeof(FormInfo));
+    if (value)
+      form_info->value = value;
+    if (contenttype)
+      form_info->contenttype = contenttype;
+    form_info->flags = HTTPPOST_FILENAME;
+  }
+  else
+    return NULL;
+  
+  if (parent_form_info) {
+    /* now, point our 'more' to the original 'more' */
+    form_info->more = parent_form_info->more;
+    
+    /* then move the original 'more' to point to ourselves */
+    parent_form_info->more = form_info;
+  }
+  else
+    return NULL;
+
+  return form_info;
+}
+
+/***************************************************************************
+ *
+ * ContentTypeForFilename()
+ *	
+ * Provides content type for filename if one of the known types (else
+ * (either the prevtype or the default is returned).
+ *
+ * Returns some valid contenttype for filename.
+ *
+ ***************************************************************************/
+static const char * ContentTypeForFilename (const char *filename,
+					    const char *prevtype)
+{
+  const char *contenttype = NULL;
+  unsigned int i;
+  /*
+   * No type was specified, we scan through a few well-known
+   * extensions and pick the first we match!
+   */
+  struct ContentType {
+    const char *extension;
+    const char *type;
+  };
+  static struct ContentType ctts[]={
+    {".gif",  "image/gif"},
+    {".jpg",  "image/jpeg"},
+    {".jpeg", "image/jpeg"},
+    {".txt",  "text/plain"},
+    {".html", "text/html"}
+  };
+  
+  if(prevtype)
+    /* default to the previously set/used! */
+    contenttype = prevtype;
+  else
+    /* It seems RFC1867 defines no Content-Type to default to
+       text/plain so we don't actually need to set this: */
+    contenttype = HTTPPOST_CONTENTTYPE_DEFAULT;
+  
+  for(i=0; i<sizeof(ctts)/sizeof(ctts[0]); i++) {
+    if(strlen(filename) >= strlen(ctts[i].extension)) {
+      if(strequal(filename +
+		  strlen(filename) - strlen(ctts[i].extension),
+		  ctts[i].extension)) {
+	contenttype = ctts[i].type;
+	break;
+      }	      
+    }
+  }
+  /* we have a contenttype by now */
+  return contenttype;
+}
+
+/***************************************************************************
+ *
+ * AllocAndCopy()
+ *	
+ * Copies the data currently available under *buffer using newly allocated
+ * buffer (that becomes *buffer). Uses buffer_length if not null, else
+ * uses strlen to determine the length of the buffer to be copied
+ *
+ * Returns 0 on success and 1 if the malloc failed.
+ *
+ ***************************************************************************/
+static int AllocAndCopy (char **buffer, int buffer_length)
+{
+  const char *src = *buffer;
+  int length, add = 0;
+  if (buffer_length)
+    length = buffer_length;
+  else {
+    length = strlen(*buffer);
+    add = 1;
+  }
+  *buffer = (char*)malloc(length+add);
+  if (!*buffer)
+    return 1;
+  memcpy(*buffer, src, length);
+  /* if length unknown do null termination */
+  if (add)
+    (*buffer)[length] = '\0';
+  return 0;
+}
+
+/***************************************************************************
+ *
+ * FormAdd()
+ *	
+ * Stores a 'name=value' formpost parameter and builds the appropriate
+ * linked list.
+ *
+ * Has two principal functionalities: using files and byte arrays as
+ * post parts. Byte arrays are either copied or just the pointer is stored
+ * (as the user requests) while for files only the filename and not the
+ * content is stored.
+ *
+ * While you may have only one byte array for each name, multiple filenames
+ * are allowed (and because of this feature CURLFORM_END is needed after
+ * using CURLFORM_FILE).
+ *
+ * Examples:
+ *
+ * Simple name/value pair with copied contents:
+ * curl_formadd (&post, &last, CURLFORM_COPYNAME, "name",
+ * CURLFORM_COPYCONTENTS, "value", CURLFORM_END);
+ *
+ * name/value pair where only the content pointer is remembered:
+ * curl_formadd (&post, &last, CURLFORM_COPYNAME, "name",
+ * CURLFORM_PTRCONTENTS, ptr, CURLFORM_CONTENTSLENGTH, 10, CURLFORM_END);
+ * (if CURLFORM_CONTENTSLENGTH is missing strlen () is used)
+ *
+ * storing a filename (CONTENTTYPE is optional!):
+ * curl_formadd (&post, &last, CURLFORM_COPYNAME, "name",
+ * CURLFORM_FILE, "filename1", CURLFORM_CONTENTTYPE, "plain/text",
+ * CURLFORM_END);
+ *
+ * storing multiple filenames:
+ * curl_formadd (&post, &last, CURLFORM_COPYNAME, "name",
+ * CURLFORM_FILE, "filename1", CURLFORM_FILE, "filename2", CURLFORM_END);
+ *
+ * Returns:
+ * CURL_FORMADD_OK             on success
+ * CURL_FORMADD_MEMORY         if the FormInfo allocation fails
+ * CURL_FORMADD_OPTION_TWICE   if one option is given twice for one Form
+ * CURL_FORMADD_NULL           if a null pointer was given for a char
+ * CURL_FORMADD_MEMORY         if the allocation of a FormInfo struct failed
+ * CURL_FORMADD_UNKNOWN_OPTION if an unknown option was used
+ * CURL_FORMADD_INCOMPLETE     if the some FormInfo is not complete (or an error)
+ * CURL_FORMADD_MEMORY         if a HttpPost struct cannot be allocated
+ * CURL_FORMADD_MEMORY         if some allocation for string copying failed.
+ * CURL_FORMADD_ILLEGAL_ARRAY  if an illegal option is used in an array
+ *
+ ***************************************************************************/
+
+static
+CURLFORMcode FormAdd(struct curl_httppost **httppost,
+                     struct curl_httppost **last_post,
+                     va_list params)
+{
+  FormInfo *first_form, *current_form, *form;
+  CURLFORMcode return_value = CURL_FORMADD_OK;
+  const char *prevtype = NULL;
+  struct curl_httppost *post = NULL;
+  CURLformoption option;
+  struct curl_forms *forms = NULL;
+  char *array_value=NULL; /* value read from an array */
+
+  /* This is a state variable, that if TRUE means that we're parsing an
+     array that we got passed to us. If FALSE we're parsing the input
+     va_list arguments. */
+  bool array_state = FALSE;
+
+  /*
+   * We need to allocate the first struct to fill in.
+   */
+  first_form = (FormInfo *)malloc(sizeof(struct FormInfo));
+  if(first_form) {
+    memset(first_form, 0, sizeof(FormInfo));
+    current_form = first_form;
+  }
+  else
+    return CURL_FORMADD_MEMORY;
+
+  /*
+   * Loop through all the options set.
+   */
+  while (1) {
+
+    /* break if we have an error to report */
+    if (return_value != CURL_FORMADD_OK)
+      break;
+
+    /* first see if we have more parts of the array param */
+    if ( array_state ) {
+      /* get the upcoming option from the given array */
+      option = forms->option;
+      array_value = (char *)forms->value;
+
+      forms++; /* advance this to next entry */
+      if (CURLFORM_END == option) {
+        /* end of array state */
+        array_state = FALSE;
+        continue;
+      }
+    }
+    else {
+      /* This is not array-state, get next option */
+      option = va_arg(params, CURLformoption);
+      if (CURLFORM_END == option)
+        break;
+    }
+
+    switch (option) {
+    case CURLFORM_ARRAY:
+      if(array_state)
+        /* we don't support an array from within an array */
+        return_value = CURL_FORMADD_ILLEGAL_ARRAY;
+      else {
+        forms = va_arg(params, struct curl_forms *);
+        if (forms)
+          array_state = TRUE;
+        else
+          return_value = CURL_FORMADD_NULL;
+      }
+      break;
+
+      /*
+       * Set the Name property.
+       */
+    case CURLFORM_PTRNAME:
+      current_form->flags |= HTTPPOST_PTRNAME; /* fall through */
+    case CURLFORM_COPYNAME:
+      if (current_form->name)
+        return_value = CURL_FORMADD_OPTION_TWICE;
+      else {
+        char *name = array_state?
+          array_value:va_arg(params, char *);
+        if (name)
+          current_form->name = name; /* store for the moment */
+        else
+          return_value = CURL_FORMADD_NULL;
+      }
+      break;
+    case CURLFORM_NAMELENGTH:
+      if (current_form->namelength)
+        return_value = CURL_FORMADD_OPTION_TWICE;
+      else
+        current_form->namelength =
+          array_state?(long)array_value:va_arg(params, long);
+      break;
+
+      /*
+       * Set the contents property.
+       */
+    case CURLFORM_PTRCONTENTS:
+      current_form->flags |= HTTPPOST_PTRCONTENTS; /* fall through */
+    case CURLFORM_COPYCONTENTS:
+      if (current_form->value)
+        return_value = CURL_FORMADD_OPTION_TWICE;
+      else {
+        char *value =
+          array_state?array_value:va_arg(params, char *);
+        if (value)
+          current_form->value = value; /* store for the moment */
+        else
+          return_value = CURL_FORMADD_NULL;
+      }
+      break;
+    case CURLFORM_CONTENTSLENGTH:
+      if (current_form->contentslength)
+        return_value = CURL_FORMADD_OPTION_TWICE;
+      else
+        current_form->contentslength =
+          array_state?(long)array_value:va_arg(params, long);
+      break;
+
+      /* Get contents from a given file name */
+    case CURLFORM_FILECONTENT:
+      if (current_form->flags != 0)
+        return_value = CURL_FORMADD_OPTION_TWICE;
+      else {
+        char *filename = array_state?
+          array_value:va_arg(params, char *);
+        if (filename) {
+          current_form->value = strdup(filename);
+          current_form->flags |= HTTPPOST_READFILE;
+        }
+        else
+          return_value = CURL_FORMADD_NULL;
+      }
+      break;
+
+      /* We upload a file */
+    case CURLFORM_FILE:
+      {
+        char *filename = array_state?array_value:
+          va_arg(params, char *);
+
+        if (current_form->value) {
+          if (current_form->flags & HTTPPOST_FILENAME) {
+            if (filename) {
+              if (!(current_form = AddFormInfo(strdup(filename),
+                                               NULL, current_form)))
+                return_value = CURL_FORMADD_MEMORY;
+            }
+            else
+              return_value = CURL_FORMADD_NULL;
+          }
+          else
+            return_value = CURL_FORMADD_OPTION_TWICE;
+        }
+        else {
+          if (filename)
+            current_form->value = strdup(filename);
+          else
+            return_value = CURL_FORMADD_NULL;
+          current_form->flags |= HTTPPOST_FILENAME;
+        }
+        break;
+      }
+
+    /* CMC: Added support for buffer uploads */
+    case CURLFORM_BUFFER:
+      {
+        char *filename = array_state?array_value:
+          va_arg(params, char *);
+
+        if (current_form->value) {
+          if (current_form->flags & HTTPPOST_BUFFER) {
+            if (filename) {
+              if (!(current_form = AddFormInfo(strdup(filename),
+                                               NULL, current_form)))
+                return_value = CURL_FORMADD_MEMORY;
+            }
+            else
+              return_value = CURL_FORMADD_NULL;
+          }
+          else
+            return_value = CURL_FORMADD_OPTION_TWICE;
+        }
+        else {
+          if (filename)
+            current_form->value = strdup(filename);
+          else
+            return_value = CURL_FORMADD_NULL;
+          current_form->flags |= HTTPPOST_BUFFER;
+        }
+        break;
+      }
+      
+    /* CMC: Added support for buffer uploads */
+    case CURLFORM_BUFFERPTR:
+        current_form->flags |= HTTPPOST_PTRBUFFER;
+      if (current_form->buffer)
+        return_value = CURL_FORMADD_OPTION_TWICE;
+      else {
+        char *buffer =
+          array_state?array_value:va_arg(params, char *);
+        if (buffer)
+          current_form->buffer = buffer; /* store for the moment */
+        else
+          return_value = CURL_FORMADD_NULL;
+      }
+      break;
+
+    /* CMC: Added support for buffer uploads */
+    case CURLFORM_BUFFERLENGTH:
+      if (current_form->bufferlength)
+        return_value = CURL_FORMADD_OPTION_TWICE;
+      else
+        current_form->bufferlength =
+          array_state?(long)array_value:va_arg(params, long);
+      break;
+
+    case CURLFORM_CONTENTTYPE:
+      {
+        char *contenttype =
+          array_state?array_value:va_arg(params, char *);
+        if (current_form->contenttype) {
+          if (current_form->flags & HTTPPOST_FILENAME) {
+            if (contenttype) {
+              if (!(current_form = AddFormInfo(NULL,
+                                               strdup(contenttype),
+                                               current_form)))
+                return_value = CURL_FORMADD_MEMORY;
+            }
+	    else
+	      return_value = CURL_FORMADD_NULL;
+          }
+          else
+            return_value = CURL_FORMADD_OPTION_TWICE;
+        }
+        else {
+	  if (contenttype)
+	    current_form->contenttype = strdup(contenttype);
+	  else
+	    return_value = CURL_FORMADD_NULL;
+	}
+        break;
+      }
+    case CURLFORM_CONTENTHEADER:
+      {
+        /* this "cast increases required alignment of target type" but
+           we consider it OK anyway */
+        struct curl_slist* list = array_state?
+          (struct curl_slist*)array_value:
+          va_arg(params, struct curl_slist*);
+        
+        if( current_form->contentheader )
+          return_value = CURL_FORMADD_OPTION_TWICE;
+        else
+          current_form->contentheader = list;
+        
+        break;
+      }
+    case CURLFORM_FILENAME:
+      {
+        char *filename = array_state?array_value:
+          va_arg(params, char *);
+        if( current_form->showfilename )
+          return_value = CURL_FORMADD_OPTION_TWICE;
+        else
+          current_form->showfilename = strdup(filename);
+        break;
+      }
+    default:
+      return_value = CURL_FORMADD_UNKNOWN_OPTION;
+    }
+  }
+
+  if(CURL_FORMADD_OK == return_value) {
+    /* go through the list, check for copleteness and if everything is
+     * alright add the HttpPost item otherwise set return_value accordingly */
+    
+    post = NULL;
+    for(form = first_form;
+        form != NULL;
+        form = form->more) {
+      if ( ((!form->name || !form->value) && !post) ||
+           ( (form->contentslength) &&
+             (form->flags & HTTPPOST_FILENAME) ) ||
+           ( (form->flags & HTTPPOST_FILENAME) &&
+             (form->flags & HTTPPOST_PTRCONTENTS) ) ||
+
+           /* CMC: Added support for buffer uploads */
+           ( (!form->buffer) &&
+             (form->flags & HTTPPOST_BUFFER) &&
+             (form->flags & HTTPPOST_PTRBUFFER) ) ||
+
+           ( (form->flags & HTTPPOST_READFILE) &&
+             (form->flags & HTTPPOST_PTRCONTENTS) )
+           ) {
+        return_value = CURL_FORMADD_INCOMPLETE;
+        break;
+      }
+      else {
+        if ( ((form->flags & HTTPPOST_FILENAME) ||
+              (form->flags & HTTPPOST_BUFFER)) &&
+             !form->contenttype ) {
+          /* our contenttype is missing */
+          form->contenttype
+            = strdup(ContentTypeForFilename(form->value, prevtype));
+        }
+        if ( !(form->flags & HTTPPOST_PTRNAME) &&
+             (form == first_form) ) {
+          /* copy name (without strdup; possibly contains null characters) */
+          if (AllocAndCopy(&form->name, form->namelength)) {
+            return_value = CURL_FORMADD_MEMORY;
+            break;
+          }
+        }
+        if ( !(form->flags & HTTPPOST_FILENAME) &&
+             !(form->flags & HTTPPOST_READFILE) && 
+             !(form->flags & HTTPPOST_PTRCONTENTS) &&
+
+             /* CMC: Added support for buffer uploads */
+             !(form->flags & HTTPPOST_PTRBUFFER) ) {
+
+          /* copy value (without strdup; possibly contains null characters) */
+          if (AllocAndCopy(&form->value, form->contentslength)) {
+            return_value = CURL_FORMADD_MEMORY;
+            break;
+          }
+        }
+        post = AddHttpPost(form->name, form->namelength,
+                           form->value, form->contentslength,
+
+                           /* CMC: Added support for buffer uploads */
+                           form->buffer, form->bufferlength,
+
+                           form->contenttype, form->flags,
+                           form->contentheader, form->showfilename,
+                           post, httppost,
+                           last_post);
+        
+        if(!post)
+          return_value = CURL_FORMADD_MEMORY;
+
+        if (form->contenttype)
+          prevtype = form->contenttype;
+      }
+    }
+  }
+
+  /* always delete the allocated memory before returning */
+  form = first_form;
+  while (form != NULL) {
+    FormInfo *delete_form;
+    
+    delete_form = form;
+    form = form->more;
+    free (delete_form);
+  }
+
+  return return_value;
+}
+
+CURLFORMcode curl_formadd(struct curl_httppost **httppost,
+                 struct curl_httppost **last_post,
+                 ...)
+{
+  va_list arg;
+  CURLFORMcode result;
+  va_start(arg, last_post);
+  result = FormAdd(httppost, last_post, arg);
+  va_end(arg);
+  return result;
+}
+
+static int AddFormData(struct FormData **formp,
+                       const void *line,
+                       long length)
+{
+  struct FormData *newform = (struct FormData *)
+    malloc(sizeof(struct FormData));
+  newform->next = NULL;
+
+  /* we make it easier for plain strings: */
+  if(!length)
+    length = strlen((char *)line);
+
+  newform->line = (char *)malloc(length+1);
+  memcpy(newform->line, line, length);
+  newform->length = length;
+  newform->line[length]=0; /* zero terminate for easier debugging */
+  
+  if(*formp) {
+    (*formp)->next = newform;
+    *formp = newform;
+  }
+  else
+    *formp = newform;
+
+  return length;
+}
+
+
+static int AddFormDataf(struct FormData **formp,
+                        const char *fmt, ...)
+{
+  char s[4096];
+  va_list ap;
+  va_start(ap, fmt);
+  vsprintf(s, fmt, ap);
+  va_end(ap);
+
+  return AddFormData(formp, s, 0);
+}
+
+
+char *Curl_FormBoundary(void)
+{
+  char *retstring;
+  static int randomizer=0; /* this is just so that two boundaries within
+			      the same form won't be identical */
+  int i;
+
+  static char table16[]="abcdef0123456789";
+
+  retstring = (char *)malloc(BOUNDARY_LENGTH+1);
+
+  if(!retstring)
+    return NULL; /* failed */
+
+  srand(time(NULL)+randomizer++); /* seed */
+
+  strcpy(retstring, "----------------------------");
+
+  for(i=strlen(retstring); i<BOUNDARY_LENGTH; i++)
+    retstring[i] = table16[rand()%16];
+
+  /* 28 dashes and 12 hexadecimal digits makes 12^16 (184884258895036416)
+     combinations */
+  retstring[BOUNDARY_LENGTH]=0; /* zero terminate */
+
+  return retstring;
+}
+
+/* Used from http.c, this cleans a built FormData linked list */ 
+void Curl_formclean(struct FormData *form)
+{
+  struct FormData *next;
+
+  do {
+    next=form->next;  /* the following form line */
+    free(form->line); /* free the line */
+    free(form);       /* free the struct */
+  
+  } while((form=next)); /* continue */
+}
+
+/* external function to free up a whole form post chain */
+void curl_formfree(struct curl_httppost *form)
+{
+  struct curl_httppost *next;
+
+  if(!form)
+    /* no form to free, just get out of this */
+    return;
+
+  do {
+    next=form->next;  /* the following form line */
+
+    /* recurse to sub-contents */
+    if(form->more)
+      curl_formfree(form->more);
+
+    if( !(form->flags & HTTPPOST_PTRNAME) && form->name)
+      free(form->name); /* free the name */
+    if( !(form->flags & HTTPPOST_PTRCONTENTS) && form->contents)
+      free(form->contents); /* free the contents */
+    if(form->contenttype)
+      free(form->contenttype); /* free the content type */
+    if(form->showfilename)
+      free(form->showfilename); /* free the faked file name */
+    free(form);       /* free the struct */
+
+  } while((form=next)); /* continue */
+}
+
+CURLcode Curl_getFormData(struct FormData **finalform,
+                          struct curl_httppost *post,
+                          int *sizep)
+{
+  struct FormData *form = NULL;
+  struct FormData *firstform;
+  struct curl_httppost *file;
+  CURLcode result = CURLE_OK;
+
+  int size =0;
+  char *boundary;
+  char *fileboundary=NULL;
+  struct curl_slist* curList;
+
+  *finalform=NULL; /* default form is empty */
+
+  if(!post)
+    return result; /* no input => no output! */
+
+  boundary = Curl_FormBoundary();
+  
+  /* Make the first line of the output */
+  AddFormDataf(&form,
+               "Content-Type: multipart/form-data;"
+               " boundary=%s\r\n",
+               boundary);
+  /* we DO NOT count that line since that'll be part of the header! */
+
+  firstform = form;
+  
+  do {
+
+    if(size)
+      size += AddFormDataf(&form, "\r\n");
+
+    /* boundary */
+    size += AddFormDataf(&form, "--%s\r\n", boundary);
+
+    size += AddFormData(&form,
+                        "Content-Disposition: form-data; name=\"", 0);
+
+    size += AddFormData(&form, post->name, post->namelength);
+
+    size += AddFormData(&form, "\"", 0);
+
+    if(post->more) {
+      /* If used, this is a link to more file names, we must then do
+         the magic to include several files with the same field name */
+
+      fileboundary = Curl_FormBoundary();
+
+      size += AddFormDataf(&form,
+                           "\r\nContent-Type: multipart/mixed,"
+                           " boundary=%s\r\n",
+                           fileboundary);
+    }
+
+    file = post;
+
+    do {
+
+      /* If 'showfilename' is set, that is a faked name passed on to us
+         to use to in the formpost. If that is not set, the actually used
+         local file name should be added. */
+
+      if(post->more) {
+        /* if multiple-file */
+        size += AddFormDataf(&form,
+                             "\r\n--%s\r\nContent-Disposition: "
+                             "attachment; filename=\"%s\"",
+                             fileboundary,
+                             (file->showfilename?file->showfilename:
+                              file->contents));
+      }
+      else if((post->flags & HTTPPOST_FILENAME) ||
+
+              /* CMC: Added support for buffer uploads */
+              (post->flags & HTTPPOST_BUFFER)) {
+
+        size += AddFormDataf(&form,
+                             "; filename=\"%s\"",
+                             (post->showfilename?post->showfilename:
+                              post->contents));
+      }
+      
+      if(file->contenttype) {
+        /* we have a specified type */
+        size += AddFormDataf(&form,
+                             "\r\nContent-Type: %s",
+                             file->contenttype);
+      }
+
+      curList = file->contentheader;
+      while( curList ) {
+        /* Process the additional headers specified for this form */
+        size += AddFormDataf( &form, "\r\n%s", curList->data );
+        curList = curList->next;
+      }
+
+#if 0
+      /* The header Content-Transfer-Encoding: seems to confuse some receivers
+       * (like the built-in PHP engine). While I can't see any reason why it
+       * should, I can just as well skip this to the benefit of the users who
+       * are using such confused receivers.
+       */
+      
+      if(file->contenttype &&
+         !checkprefix("text/", file->contenttype)) {
+        /* this is not a text content, mention our binary encoding */
+        size += AddFormData(&form, "\r\nContent-Transfer-Encoding: binary", 0);
+      }
+#endif
+
+      size += AddFormData(&form, "\r\n\r\n", 0);
+
+      if((post->flags & HTTPPOST_FILENAME) ||
+         (post->flags & HTTPPOST_READFILE)) {
+        /* we should include the contents from the specified file */
+        FILE *fileread;
+        char buffer[1024];
+        int nread;
+
+        fileread = strequal("-", file->contents)?stdin:
+          /* binary read for win32 crap */
+          /*VMS??*/ fopen(file->contents, "rb");  /* ONLY ALLOWS FOR STREAM FILES ON VMS */
+        /*VMS?? Stream files are OK, as are FIXED & VAR files WITHOUT implied CC */
+        /*VMS?? For implied CC, every record needs to have a \n appended & 1 added to SIZE */
+        if(fileread) {
+          while((nread = fread(buffer, 1, 1024, fileread)))
+            size += AddFormData(&form, buffer, nread);
+
+          if(fileread != stdin)
+            fclose(fileread);
+        }
+        else {
+#if 0
+          /* File wasn't found, add a nothing field! */
+          size += AddFormData(&form, "", 0);
+#endif
+          Curl_formclean(firstform);
+          free(boundary);
+          *finalform = NULL;
+          return CURLE_READ_ERROR;
+        }
+
+        /* CMC: Added support for buffer uploads */
+      } else if (post->flags & HTTPPOST_BUFFER) {
+          /* include contents of buffer */
+          size += AddFormData(&form, post->buffer, post->bufferlength);
+      }
+
+      else {
+        /* include the contents we got */
+        size += AddFormData(&form, post->contents, post->contentslength);
+      }
+    } while((file = file->more)); /* for each specified file for this field */
+
+    if(post->more) {
+      /* this was a multiple-file inclusion, make a termination file
+         boundary: */
+      size += AddFormDataf(&form,
+                           "\r\n--%s--",
+                           fileboundary);     
+      free(fileboundary);
+    }
+
+  } while((post=post->next)); /* for each field */
+
+  /* end-boundary for everything */
+  size += AddFormDataf(&form,
+                       "\r\n--%s--\r\n",
+                       boundary);
+
+  *sizep = size;
+
+  free(boundary);
+
+  *finalform=firstform;
+
+  return result;
+}
+
+int Curl_FormInit(struct Form *form, struct FormData *formdata )
+{
+  if(!formdata)
+    return 1; /* error */
+
+  form->data = formdata;
+  form->sent = 0;
+
+  return 0;
+}
+
+/* fread() emulation */
+int Curl_FormReader(char *buffer,
+                    size_t size,
+                    size_t nitems,
+                    FILE *mydata)
+{
+  struct Form *form;
+  int wantedsize;
+  int gotsize = 0;
+
+  form=(struct Form *)mydata;
+
+  wantedsize = size * nitems;
+
+  if(!form->data)
+    return 0; /* nothing, error, empty */
+
+  do {
+  
+    if( (form->data->length - form->sent ) > wantedsize - gotsize) {
+
+      memcpy(buffer + gotsize , form->data->line + form->sent,
+             wantedsize - gotsize);
+
+      form->sent += wantedsize-gotsize;
+
+      return wantedsize;
+    }
+
+    memcpy(buffer+gotsize,
+           form->data->line + form->sent,
+           (form->data->length - form->sent) );
+    gotsize += form->data->length - form->sent;
+    
+    form->sent = 0;
+
+    form->data = form->data->next; /* advance */
+
+  } while(form->data);
+  /* If we got an empty line and we have more data, we proceed to the next
+     line immediately to avoid returning zero before we've reached the end.
+     This is the bug reported November 22 1999 on curl 6.3. (Daniel) */
+
+  return gotsize;
+}
+
+/* possible (old) fread() emulation that copies at most one line */
+int Curl_FormReadOneLine(char *buffer,
+                         size_t size,
+                         size_t nitems,
+                         FILE *mydata)
+{
+  struct Form *form;
+  int wantedsize;
+  int gotsize;
+
+  form=(struct Form *)mydata;
+
+  wantedsize = size * nitems;
+
+  if(!form->data)
+    return -1; /* nothing, error, empty */
+
+  do {
+  
+    if( (form->data->length - form->sent ) > wantedsize ) {
+
+      memcpy(buffer, form->data->line + form->sent, wantedsize);
+
+      form->sent += wantedsize;
+
+      return wantedsize;
+    }
+
+    memcpy(buffer,
+           form->data->line + form->sent,
+           gotsize = (form->data->length - form->sent) );
+
+    form->sent = 0;
+
+    form->data = form->data->next; /* advance */
+
+  } while(!gotsize && form->data);
+  /* If we got an empty line and we have more data, we proceed to the next
+     line immediately to avoid returning zero before we've reached the end.
+     This is the bug reported November 22 1999 on curl 6.3. (Daniel) */
+
+  return gotsize;
+}
+
+
+#ifdef _FORM_DEBUG
+int FormAddTest(const char * errormsg,
+                 struct curl_httppost **httppost,
+                 struct curl_httppost **last_post,
+                 ...)
+{
+  int result;
+  va_list arg;
+  va_start(arg, last_post);
+  if ((result = FormAdd(httppost, last_post, arg)))
+    fprintf (stderr, "ERROR doing FormAdd ret: %d action: %s\n", result,
+             errormsg);
+  va_end(arg);
+  return result;
+}
+
+
+int main()
+{
+  char name1[] = "simple_COPYCONTENTS";
+  char name2[] = "COPYCONTENTS_+_CONTENTTYPE";
+  char name3[] = "PTRNAME_+_NAMELENGTH_+_COPYNAME_+_CONTENTSLENGTH";
+  char name4[] = "simple_PTRCONTENTS";
+  char name5[] = "PTRCONTENTS_+_CONTENTSLENGTH";
+  char name6[] = "PTRCONTENTS_+_CONTENTSLENGTH_+_CONTENTTYPE";
+  char name7[] = "FILE1_+_CONTENTTYPE";
+  char name8[] = "FILE1_+_FILE2";
+  char name9[] = "FILE1_+_FILE2_+_FILE3";
+  char name10[] = "ARRAY: FILE1_+_FILE2_+_FILE3";
+  char name11[] = "FILECONTENT";
+  char value1[] = "value for simple COPYCONTENTS";
+  char value2[] = "value for COPYCONTENTS + CONTENTTYPE";
+  char value3[] = "value for PTRNAME + NAMELENGTH + COPYNAME + CONTENTSLENGTH";
+  char value4[] = "value for simple PTRCONTENTS";
+  char value5[] = "value for PTRCONTENTS + CONTENTSLENGTH";
+  char value6[] = "value for PTRCOTNENTS + CONTENTSLENGTH + CONTENTTYPE";
+  char value7[] = "inet_ntoa_r.h";
+  char value8[] = "Makefile.b32.resp";
+  char type2[] = "image/gif";
+  char type6[] = "text/plain";
+  char type7[] = "text/html";
+  int name3length = strlen(name3);
+  int value3length = strlen(value3);
+  int value5length = strlen(value4);
+  int value6length = strlen(value5);
+  int errors = 0;
+  int size;
+  int nread;
+  char buffer[4096];
+  struct curl_httppost *httppost=NULL;
+  struct curl_httppost *last_post=NULL;
+  struct curl_forms forms[4];
+
+  struct FormData *form;
+  struct Form formread;
+
+  if (FormAddTest("simple COPYCONTENTS test", &httppost, &last_post,
+                  CURLFORM_COPYNAME, name1, CURLFORM_COPYCONTENTS, value1,
+                  CURLFORM_END))
+    ++errors;
+  if (FormAddTest("COPYCONTENTS  + CONTENTTYPE test", &httppost, &last_post,
+                  CURLFORM_COPYNAME, name2, CURLFORM_COPYCONTENTS, value2,
+                  CURLFORM_CONTENTTYPE, type2, CURLFORM_END))
+    ++errors;
+  /* make null character at start to check that contentslength works
+     correctly */
+  name3[1] = '\0';
+  value3[1] = '\0';
+  if (FormAddTest("PTRNAME + NAMELENGTH + COPYNAME + CONTENTSLENGTH test",
+		  &httppost, &last_post,
+                  CURLFORM_PTRNAME, name3, CURLFORM_COPYCONTENTS, value3,
+                  CURLFORM_CONTENTSLENGTH, value3length,
+		  CURLFORM_NAMELENGTH, name3length, CURLFORM_END))
+    ++errors;
+  if (FormAddTest("simple PTRCONTENTS test", &httppost, &last_post,
+                  CURLFORM_COPYNAME, name4, CURLFORM_PTRCONTENTS, value4,
+                  CURLFORM_END))
+    ++errors;
+  /* make null character at start to check that contentslength works
+     correctly */
+  value5[1] = '\0';
+  if (FormAddTest("PTRCONTENTS + CONTENTSLENGTH test", &httppost, &last_post,
+                  CURLFORM_COPYNAME, name5, CURLFORM_PTRCONTENTS, value5,
+                  CURLFORM_CONTENTSLENGTH, value5length, CURLFORM_END))
+    ++errors;
+  /* make null character at start to check that contentslength works
+     correctly */
+  value6[1] = '\0';
+  if (FormAddTest("PTRCONTENTS + CONTENTSLENGTH + CONTENTTYPE test",
+                  &httppost, &last_post,
+                  CURLFORM_COPYNAME, name6, CURLFORM_PTRCONTENTS, value6,
+                  CURLFORM_CONTENTSLENGTH, value6length,
+                  CURLFORM_CONTENTTYPE, type6, CURLFORM_END))
+    ++errors;
+  if (FormAddTest("FILE + CONTENTTYPE test", &httppost, &last_post,
+                  CURLFORM_COPYNAME, name7, CURLFORM_FILE, value7,
+                  CURLFORM_CONTENTTYPE, type7, CURLFORM_END))
+    ++errors;
+  if (FormAddTest("FILE1 + FILE2 test", &httppost, &last_post,
+                  CURLFORM_COPYNAME, name8, CURLFORM_FILE, value7,
+                  CURLFORM_FILE, value8, CURLFORM_END))
+    ++errors;
+  if (FormAddTest("FILE1 + FILE2 + FILE3 test", &httppost, &last_post,
+                  CURLFORM_COPYNAME, name9, CURLFORM_FILE, value7,
+                  CURLFORM_FILE, value8, CURLFORM_FILE, value7, CURLFORM_END))
+    ++errors;
+  forms[0].option = CURLFORM_FILE;
+  forms[0].value  = value7;
+  forms[1].option = CURLFORM_FILE;
+  forms[1].value  = value8;
+  forms[2].option = CURLFORM_FILE;
+  forms[2].value  = value7;
+  forms[3].option  = CURLFORM_END;
+  if (FormAddTest("FILE1 + FILE2 + FILE3 ARRAY test", &httppost, &last_post,
+                  CURLFORM_COPYNAME, name10, CURLFORM_ARRAY, forms,
+                  CURLFORM_END))
+    ++errors;
+  if (FormAddTest("FILECONTENT test", &httppost, &last_post,
+                  CURLFORM_COPYNAME, name11, CURLFORM_FILECONTENT, value7,
+                  CURLFORM_END))
+    ++errors;
+
+  form=Curl_getFormData(httppost, &size);
+
+  Curl_FormInit(&formread, form);
+
+  do {
+    nread = Curl_FormReader(buffer, 1, sizeof(buffer),
+                            (FILE *)&formread);
+
+    if(-1 == nread)
+      break;
+    fwrite(buffer, nread, 1, stdout);
+  } while(1);
+
+  fprintf(stdout, "size: %d\n", size);
+  if (errors)
+    fprintf(stdout, "\n==> %d Test(s) failed!\n", errors);
+  else
+    fprintf(stdout, "\nAll Tests seem to have worked (please check output)\n");
+
+  return 0;
+}
+
+#endif
+
+#ifdef _OLD_FORM_DEBUG
+
+int main(int argc, char **argv)
+{
+#if 0
+  char *testargs[]={
+    "name1 = data in number one",
+    "name2 = number two data",
+    "test = @upload"
+  };
+#endif
+  int i;
+  char *nextarg;
+  struct curl_httppost *httppost=NULL;
+  struct curl_httppost *last_post=NULL;
+  struct curl_httppost *post;
+  int size;
+  int nread;
+  char buffer[4096];
+
+  struct FormData *form;
+  struct Form formread;
+
+  for(i=1; i<argc; i++) {
+
+    if( FormParse( argv[i],
+		   &httppost,
+		   &last_post)) {
+      fprintf(stderr, "Illegally formatted input field: '%s'!\n",
+	      argv[i]);
+      return 1;
+    }
+  }
+
+  form=Curl_getFormData(httppost, &size);
+
+  Curl_FormInit(&formread, form);
+
+  do {
+    nread = Curl_FormReader(buffer, 1, sizeof(buffer),
+                            (FILE *)&formread);
+
+    if(-1 == nread)
+      break;
+    fwrite(buffer, nread, 1, stderr);
+  } while(1);
+
+  fprintf(stderr, "size: %d\n", size);
+
+  return 0;
+}
+
+#endif
+
+#endif /* CURL_DISABLE_HTTP */
diff --git a/main/source/curl/lib/formdata.h b/main/source/curl/lib/formdata.h
new file mode 100644
index 00000000..805a0568
--- /dev/null
+++ b/main/source/curl/lib/formdata.h
@@ -0,0 +1,82 @@
+#ifndef __FORMDATA_H
+#define __FORMDATA_H
+
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: formdata.h,v 1.15 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+/* plain and simple linked list with lines to send */
+struct FormData {
+  struct FormData *next;
+  char *line;
+  long length;
+};
+
+struct Form {
+  struct FormData *data; /* current form line to send */
+  int sent; /* number of bytes of the current line that has already
+	       been sent in a previous invoke */
+};
+
+/* used by FormAdd for temporary storage */
+typedef struct FormInfo {
+  char *name;
+  long namelength;
+  char *value;
+  long contentslength;
+  char *contenttype;
+  long flags;
+
+		/* CMC: Added support for buffer uploads */
+  char *buffer;      /* pointer to existing buffer used for file upload */
+	long bufferlength;   
+
+  char *showfilename; /* The file name to show. If not set, the actual
+                         file name will be used */
+  struct curl_slist* contentheader;
+  struct FormInfo *more;
+} FormInfo;
+
+int Curl_FormInit(struct Form *form, struct FormData *formdata );
+
+CURLcode
+Curl_getFormData(struct FormData **,
+                 struct HttpPost *post,
+                 int *size);
+
+/* fread() emulation */
+int Curl_FormReader(char *buffer,
+                    size_t size,
+                    size_t nitems,
+                    FILE *mydata);
+
+/* possible (old) fread() emulation that copies at most one line */
+int Curl_FormReadOneLine(char *buffer,
+                         size_t size,
+                         size_t nitems,
+                         FILE *mydata);
+
+char *Curl_FormBoundary(void);
+
+void Curl_formclean(struct FormData *);
+
+#endif
+
diff --git a/main/source/curl/lib/ftp.c b/main/source/curl/lib/ftp.c
new file mode 100644
index 00000000..1120aec3
--- /dev/null
+++ b/main/source/curl/lib/ftp.c
@@ -0,0 +1,2276 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: ftp.c,v 1.181 2003/05/14 06:31:00 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#ifndef CURL_DISABLE_FTP
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <errno.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
+#include <winsock.h>
+#else /* some kind of unix */
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#include <sys/types.h>
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#include <sys/utsname.h>
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#ifdef	VMS
+#include <in.h>
+#include <inet.h>
+#endif
+#endif
+
+#if defined(WIN32) && defined(__GNUC__) || defined(__MINGW32__)
+#include <errno.h>
+#endif
+
+#include <curl/curl.h>
+#include "urldata.h"
+#include "sendf.h"
+
+#include "if2ip.h"
+#include "hostip.h"
+#include "progress.h"
+#include "transfer.h"
+#include "escape.h"
+#include "http.h" /* for HTTP proxy tunnel stuff */
+#include "ftp.h"
+
+#ifdef KRB4
+#include "security.h"
+#include "krb4.h"
+#endif
+
+#include "strequal.h"
+#include "ssluse.h"
+#include "connect.h"
+
+#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
+#include "inet_ntoa_r.h"
+#endif
+
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+/* Local API functions */
+static CURLcode ftp_sendquote(struct connectdata *conn, struct curl_slist *quote);
+static CURLcode ftp_cwd(struct connectdata *conn, char *path);
+
+/* easy-to-use macro: */
+#define FTPSENDF(x,y,z) if((result = Curl_ftpsendf(x,y,z))) return result
+
+/***********************************************************************
+ *
+ * AllowServerConnect()
+ *
+ * When we've issue the PORT command, we have told the server to connect
+ * to us. This function will sit and wait here until the server has
+ * connected.
+ *
+ */
+static CURLcode AllowServerConnect(struct SessionHandle *data,
+                                   struct connectdata *conn,
+                                   int sock)
+{
+  fd_set rdset;
+  struct timeval dt;
+  
+  FD_ZERO(&rdset);
+
+  FD_SET(sock, &rdset);
+
+  /* we give the server 10 seconds to connect to us */
+  dt.tv_sec = 10;
+  dt.tv_usec = 0;
+
+  switch (select(sock+1, &rdset, NULL, NULL, &dt)) {
+  case -1: /* error */
+    /* let's die here */
+    failf(data, "Error while waiting for server connect");
+    return CURLE_FTP_PORT_FAILED;
+  case 0:  /* timeout */
+    /* let's die here */
+    failf(data, "Timeout while waiting for server connect");
+    return CURLE_FTP_PORT_FAILED;
+  default:
+    /* we have received data here */
+    {
+      int s;
+      size_t size = sizeof(struct sockaddr_in);
+      struct sockaddr_in add;
+
+      getsockname(sock, (struct sockaddr *) &add, (socklen_t *)&size);
+      s=accept(sock, (struct sockaddr *) &add, (socklen_t *)&size);
+
+      sclose(sock); /* close the first socket */
+
+      if (-1 == s) {
+        /* DIE! */
+        failf(data, "Error accept()ing server connect");
+      	return CURLE_FTP_PORT_FAILED;
+      }
+      infof(data, "Connection accepted from server\n");
+
+      conn->secondarysocket = s;
+      Curl_nonblock(s, TRUE); /* enable non-blocking */
+    }
+    break;
+  }
+  return CURLE_OK;
+}
+
+
+/* --- parse FTP server responses --- */
+
+/*
+ * Curl_GetFTPResponse() is supposed to be invoked after each command sent to
+ * a remote FTP server. This function will wait and read all lines of the
+ * response and extract the relevant return code for the invoking function.
+ */
+
+CURLcode Curl_GetFTPResponse(ssize_t *nreadp, /* return number of bytes read */
+                             struct connectdata *conn,
+                             int *ftpcode) /* return the ftp-code */
+{
+  /* Brand new implementation.
+   * We cannot read just one byte per read() and then go back to select()
+   * as it seems that the OpenSSL read() stuff doesn't grok that properly.
+   *
+   * Alas, read as much as possible, split up into lines, use the ending
+   * line in a response or continue reading.  */
+
+  int sockfd = conn->firstsocket;
+  int perline; /* count bytes per line */
+  bool keepon=TRUE;
+  ssize_t gotbytes;
+  char *ptr;
+  int timeout;              /* timeout in seconds */
+  struct timeval interval;
+  fd_set rkeepfd;
+  fd_set readfd;
+  struct SessionHandle *data = conn->data;
+  char *line_start;
+  int code=0; /* default ftp "error code" to return */
+  char *buf = data->state.buffer;
+  CURLcode result = CURLE_OK;
+  struct FTP *ftp = conn->proto.ftp;
+  struct timeval now = Curl_tvnow();
+
+  if (ftpcode)
+    *ftpcode = 0; /* 0 for errors */
+
+  FD_ZERO (&readfd);		/* clear it */
+  FD_SET (sockfd, &readfd);     /* read socket */
+
+  /* get this in a backup variable to be able to restore it on each lap in the
+     select() loop */
+  rkeepfd = readfd;
+
+  ptr=buf;
+  line_start = buf;
+
+  *nreadp=0;
+  perline=0;
+  keepon=TRUE;
+
+  while((*nreadp<BUFSIZE) && (keepon && !result)) {
+    /* check and reset timeout value every lap */
+    if(data->set.timeout)
+      /* if timeout is requested, find out how much remaining time we have */
+      timeout = data->set.timeout - /* timeout time */
+        Curl_tvdiff(Curl_tvnow(), conn->now)/1000; /* spent time */
+    else
+      /* Even without a requested timeout, we only wait response_time
+         seconds for the full response to arrive before we bail out */
+      timeout = ftp->response_time -
+        Curl_tvdiff(Curl_tvnow(), now)/1000; /* spent time */
+
+    if(timeout <=0 ) {
+      failf(data, "Transfer aborted due to timeout");
+      return CURLE_OPERATION_TIMEDOUT; /* already too little time */
+    }
+
+    if(!ftp->cache) {
+      readfd = rkeepfd;		   /* set every lap */
+      interval.tv_sec = 1; /* use 1 second timeout intervals */
+      interval.tv_usec = 0;
+
+      switch (select (sockfd+1, &readfd, NULL, NULL, &interval)) {
+      case -1: /* select() error, stop reading */
+        result = CURLE_RECV_ERROR;
+        failf(data, "Transfer aborted due to select() error: %d", errno);
+        break;
+      case 0: /* timeout */
+        if(Curl_pgrsUpdate(conn))
+          return CURLE_ABORTED_BY_CALLBACK;
+        continue; /* just continue in our loop for the timeout duration */
+
+      default:
+        break;
+      }
+    }
+    if(CURLE_OK == result) {
+      /*
+       * This code previously didn't use the kerberos sec_read() code
+       * to read, but when we use Curl_read() it may do so. Do confirm
+       * that this is still ok and then remove this comment!
+       */
+      if(ftp->cache) {
+        /* we had data in the "cache", copy that instead of doing an actual
+           read */
+        memcpy(ptr, ftp->cache, ftp->cache_size);
+        gotbytes = ftp->cache_size;
+        free(ftp->cache);    /* free the cache */
+        ftp->cache = NULL;   /* clear the pointer */
+        ftp->cache_size = 0; /* zero the size just in case */
+      }
+      else {
+        int res = Curl_read(conn, sockfd, ptr, BUFSIZE-*nreadp, &gotbytes);
+        if(res < 0)
+          /* EWOULDBLOCK */
+          continue; /* go looping again */
+
+        if(CURLE_OK != res)
+          keepon = FALSE;
+      }
+
+      if(!keepon)
+        ;
+      else if(gotbytes <= 0) {
+        keepon = FALSE;
+        result = CURLE_RECV_ERROR;
+        failf(data, "Connection aborted");
+      }
+      else {
+        /* we got a whole chunk of data, which can be anything from one
+         * byte to a set of lines and possible just a piece of the last
+         * line */
+        int i;
+
+        *nreadp += gotbytes;
+        for(i = 0; i < gotbytes; ptr++, i++) {
+          perline++;
+          if(*ptr=='\n') {
+            /* a newline is CRLF in ftp-talk, so the CR is ignored as
+               the line isn't really terminated until the LF comes */
+            CURLcode result;
+
+            /* output debug output if that is requested */
+            if(data->set.verbose)
+              Curl_debug(data, CURLINFO_HEADER_IN, line_start, perline);
+
+            /*
+             * We pass all response-lines to the callback function registered
+             * for "headers". The response lines can be seen as a kind of
+             * headers.
+             */
+            result = Curl_client_write(data, CLIENTWRITE_HEADER,
+                                       line_start, perline);
+            if(result)
+              return result;
+                                       
+#define lastline(line) (isdigit((int)line[0]) && isdigit((int)line[1]) && \
+			isdigit((int)line[2]) && (' ' == line[3]))
+
+            if(perline>3 && lastline(line_start)) {
+              /* This is the end of the last line, copy the last
+               * line to the start of the buffer and zero terminate,
+               * for old times sake (and krb4)! */
+              char *meow;
+              int n;
+              for(meow=line_start, n=0; meow<ptr; meow++, n++)
+                buf[n] = *meow;
+              *meow=0; /* zero terminate */
+              keepon=FALSE;
+              line_start = ptr+1; /* advance pointer */
+              i++; /* skip this before getting out */
+              break;
+            }
+            perline=0; /* line starts over here */
+            line_start = ptr+1;
+          }
+        }
+        if(!keepon && (i != gotbytes)) {
+          /* We found the end of the response lines, but we didn't parse the
+             full chunk of data we have read from the server. We therefore
+             need to store the rest of the data to be checked on the next
+             invoke as it may actually contain another end of response
+             already!  Cleverly figured out by Eric Lavigne in December
+             2001. */
+          ftp->cache_size = gotbytes - i;
+          ftp->cache = (char *)malloc(ftp->cache_size);
+          if(ftp->cache)
+            memcpy(ftp->cache, line_start, ftp->cache_size);
+          else
+            return CURLE_OUT_OF_MEMORY; /**BANG**/
+        }
+      } /* there was data */
+    } /* if(no error) */
+  } /* while there's buffer left and loop is requested */
+
+  if(!result)
+    code = atoi(buf);
+
+#ifdef KRB4
+  /* handle the security-oriented responses 6xx ***/
+  /* FIXME: some errorchecking perhaps... ***/
+  switch(code) {
+  case 631:
+    Curl_sec_read_msg(conn, buf, prot_safe);
+    break;
+  case 632:
+    Curl_sec_read_msg(conn, buf, prot_private);
+    break;
+  case 633:
+    Curl_sec_read_msg(conn, buf, prot_confidential);
+    break;
+  default:
+    /* normal ftp stuff we pass through! */
+    break;
+  }
+#endif
+
+  if(ftpcode)
+    *ftpcode=code; /* return the initial number like this */
+
+  return result;
+}
+
+/*
+ * Curl_ftp_connect() should do everything that is to be considered a part of
+ * the connection phase.
+ */
+CURLcode Curl_ftp_connect(struct connectdata *conn)
+{
+  /* this is FTP and no proxy */
+  ssize_t nread;
+  struct SessionHandle *data=conn->data;
+  char *buf = data->state.buffer; /* this is our buffer */
+  struct FTP *ftp;
+  CURLcode result;
+  int ftpcode;
+
+  ftp = (struct FTP *)malloc(sizeof(struct FTP));
+  if(!ftp)
+    return CURLE_OUT_OF_MEMORY;
+
+  memset(ftp, 0, sizeof(struct FTP));
+  conn->proto.ftp = ftp;
+
+  /* We always support persistant connections on ftp */
+  conn->bits.close = FALSE;
+
+  /* get some initial data into the ftp struct */
+  ftp->bytecountp = &conn->bytecount;
+
+  /* no need to duplicate them, the data struct won't change */
+  ftp->user = data->state.user;
+  ftp->passwd = data->state.passwd;
+  ftp->response_time = 3600; /* set default response time-out */
+
+  if (data->set.tunnel_thru_httpproxy) {
+    /* We want "seamless" FTP operations through HTTP proxy tunnel */
+    result = Curl_ConnectHTTPProxyTunnel(conn, conn->firstsocket,
+                                         conn->hostname, conn->remote_port);
+    if(CURLE_OK != result)
+      return result;
+  }
+
+  if(conn->protocol & PROT_FTPS) {
+    /* FTPS is simply ftp with SSL for the control channel */
+    /* now, perform the SSL initialization for this socket */
+    result = Curl_SSLConnect(conn);
+    if(result)
+      return result;
+  }
+
+
+  /* The first thing we do is wait for the "220*" line: */
+  result = Curl_GetFTPResponse(&nread, conn, &ftpcode);
+  if(result)
+    return result;
+
+  if(ftpcode != 220) {
+    failf(data, "This doesn't seem like a nice ftp-server response");
+    return CURLE_FTP_WEIRD_SERVER_REPLY;
+  }
+
+#ifdef KRB4
+  /* if not anonymous login, try a secure login */
+  if(data->set.krb4) {
+
+    /* request data protection level (default is 'clear') */
+    Curl_sec_request_prot(conn, "private");
+
+    /* We set private first as default, in case the line below fails to
+       set a valid level */
+    Curl_sec_request_prot(conn, data->set.krb4_level);
+
+    if(Curl_sec_login(conn) != 0)
+      infof(data, "Logging in with password in cleartext!\n");
+    else
+      infof(data, "Authentication successful\n");
+  }
+#endif
+  
+  /* send USER */
+  FTPSENDF(conn, "USER %s", ftp->user);
+
+  /* wait for feedback */
+  result = Curl_GetFTPResponse(&nread, conn, &ftpcode);
+  if(result)
+    return result;
+
+  if(ftpcode == 530) {
+    /* 530 User ... access denied
+       (the server denies to log the specified user) */
+    failf(data, "Access denied: %s", &buf[4]);
+    return CURLE_FTP_ACCESS_DENIED;
+  }
+  else if(ftpcode == 331) {
+    /* 331 Password required for ...
+       (the server requires to send the user's password too) */
+    FTPSENDF(conn, "PASS %s", ftp->passwd);
+    result = Curl_GetFTPResponse(&nread, conn, &ftpcode);
+    if(result)
+      return result;
+
+    if(ftpcode == 530) {
+      /* 530 Login incorrect.
+         (the username and/or the password are incorrect) */
+      failf(data, "the username and/or the password are incorrect");
+      return CURLE_FTP_USER_PASSWORD_INCORRECT;
+    }
+    else if(ftpcode == 230) {
+      /* 230 User ... logged in.
+         (user successfully logged in) */
+        
+      infof(data, "We have successfully logged in\n");
+    }
+    else {
+      failf(data, "Odd return code after PASS");
+      return CURLE_FTP_WEIRD_PASS_REPLY;
+    }
+  }
+  else if(buf[0] == '2') {
+    /* 230 User ... logged in.
+       (the user logged in without password) */
+    infof(data, "We have successfully logged in\n");
+#ifdef KRB4
+	/* we are logged in (with Kerberos)
+	 * now set the requested protection level
+	 */
+    if(conn->sec_complete)
+      Curl_sec_set_protection_level(conn);
+
+    /* we may need to issue a KAUTH here to have access to the files
+     * do it if user supplied a password
+     */
+    if(data->state.passwd && *data->state.passwd) {
+      result = Curl_krb_kauth(conn);
+      if(result)
+        return result;
+    }
+#endif
+  }
+  else {
+    failf(data, "Odd return code after USER");
+    return CURLE_FTP_WEIRD_USER_REPLY;
+  }
+
+  /* send PWD to discover our entry point */
+  FTPSENDF(conn, "PWD", NULL);
+
+  /* wait for feedback */
+  result = Curl_GetFTPResponse(&nread, conn, &ftpcode);
+  if(result)
+    return result;
+
+  if(ftpcode == 257) {
+    char *dir = (char *)malloc(nread+1);
+    char *store=dir;
+    char *ptr=&buf[4]; /* start on the first letter */
+    
+    /* Reply format is like
+       257<space>"<directory-name>"<space><commentary> and the RFC959 says
+
+       The directory name can contain any character; embedded double-quotes
+       should be escaped by double-quotes (the "quote-doubling" convention).
+    */
+    if(dir && ('\"' == *ptr)) {
+      /* it started good */
+      ptr++;
+      while(ptr && *ptr) {
+        if('\"' == *ptr) {
+          if('\"' == ptr[1]) {
+            /* "quote-doubling" */
+            *store = ptr[1];
+            ptr++;
+          }
+          else {
+            /* end of path */
+            *store = '\0'; /* zero terminate */
+            break; /* get out of this loop */
+          }
+        }
+        else
+          *store = *ptr;
+        store++;
+        ptr++;
+      }
+      ftp->entrypath =dir; /* remember this */
+      infof(data, "Entry path is '%s'\n", ftp->entrypath);
+    }
+    else {
+      /* couldn't get the path */
+      free(dir);
+      infof(data, "Failed to figure out path\n");
+    }
+
+  }
+  else {
+    /* We couldn't read the PWD response! */
+  }
+
+  return CURLE_OK;
+}
+
+/***********************************************************************
+ *
+ * Curl_ftp_done()
+ *
+ * The DONE function. This does what needs to be done after a single DO has
+ * performed.
+ *
+ * Input argument is already checked for validity.
+ */
+CURLcode Curl_ftp_done(struct connectdata *conn)
+{
+  struct SessionHandle *data = conn->data;
+  struct FTP *ftp = conn->proto.ftp;
+  ssize_t nread;
+  int ftpcode;
+  CURLcode result=CURLE_OK;
+
+  if(data->set.upload) {
+    if((-1 != data->set.infilesize) &&
+       (data->set.infilesize != *ftp->bytecountp) &&
+       !data->set.crlf) {
+      failf(data, "Uploaded unaligned file size (%d out of %d bytes)",
+            *ftp->bytecountp, data->set.infilesize);
+      return CURLE_PARTIAL_FILE;
+    }
+  }
+  else {
+    if((-1 != conn->size) && (conn->size != *ftp->bytecountp) &&
+       (conn->maxdownload != *ftp->bytecountp)) {
+      failf(data, "Received only partial file: %d bytes", *ftp->bytecountp);
+      return CURLE_PARTIAL_FILE;
+    }
+    else if(!ftp->dont_check &&
+            !*ftp->bytecountp &&
+            (conn->size>0)) {
+      /* We consider this an error, but there's no true FTP error received
+         why we need to continue to "read out" the server response too.
+         We don't want to leave a "waiting" server reply if we'll get told
+         to make a second request on this same connection! */
+      failf(data, "No data was received!");
+      result = CURLE_FTP_COULDNT_RETR_FILE;
+    }
+  }
+
+#ifdef KRB4
+  Curl_sec_fflush_fd(conn, conn->secondarysocket);
+#endif
+  /* shut down the socket to inform the server we're done */
+  sclose(conn->secondarysocket);
+  conn->secondarysocket = -1;
+
+  if(!ftp->no_transfer) {
+    /* Let's see what the server says about the transfer we just performed,
+       but lower the timeout as sometimes this connection has died while 
+       the data has been transfered. This happens when doing through NATs
+       etc that abandon old silent connections.
+    */
+    ftp->response_time = 60; /* give it only a minute for now */
+
+    result = Curl_GetFTPResponse(&nread, conn, &ftpcode);
+
+    ftp->response_time = 3600; /* set this back to one hour waits */
+  
+    if(!nread && (CURLE_OPERATION_TIMEDOUT == result)) {
+      failf(data, "control connection looks dead");
+      return result;
+    }
+
+    if(result)
+      return result;
+
+    if(!ftp->dont_check) {
+      /* 226 Transfer complete, 250 Requested file action okay, completed. */
+      if((ftpcode != 226) && (ftpcode != 250)) {
+        failf(data, "server did not report OK, got %d", ftpcode);
+        return CURLE_FTP_WRITE_ERROR;
+      }
+    }
+  }
+
+  /* clear these for next connection */
+  ftp->no_transfer = FALSE;
+  ftp->dont_check = FALSE; 
+
+  /* Send any post-transfer QUOTE strings? */
+  if(!result && data->set.postquote)
+    result = ftp_sendquote(conn, data->set.postquote);
+
+  return result;
+}
+
+/***********************************************************************
+ *
+ * ftp_sendquote()
+ *
+ * Where a 'quote' means a list of custom commands to send to the server.
+ * The quote list is passed as an argument.
+ */
+
+static 
+CURLcode ftp_sendquote(struct connectdata *conn, struct curl_slist *quote)
+{
+  struct curl_slist *item;
+  ssize_t nread;
+  int ftpcode;
+  CURLcode result;
+
+  item = quote;
+  while (item) {
+    if (item->data) {
+      FTPSENDF(conn, "%s", item->data);
+
+      result = Curl_GetFTPResponse(&nread, conn, &ftpcode);
+      if (result)
+        return result;
+
+      if (ftpcode >= 400) {
+        failf(conn->data, "QUOT string not accepted: %s", item->data);
+        return CURLE_FTP_QUOTE_ERROR;
+      }
+    }
+
+    item = item->next;
+  }
+
+  return CURLE_OK;
+}
+
+/***********************************************************************
+ *
+ * ftp_cwd()
+ *
+ * Send 'CWD' to the remote server to Change Working Directory.
+ * It is the ftp version of the unix 'cd' command.
+ */
+static 
+CURLcode ftp_cwd(struct connectdata *conn, char *path)
+{
+  ssize_t nread;
+  int     ftpcode;
+  CURLcode result;
+  
+  FTPSENDF(conn, "CWD %s", path);
+  result = Curl_GetFTPResponse(&nread, conn, &ftpcode);
+  if (result)
+    return result;
+
+  /* According to RFC959, CWD is supposed to return 250 on success, but
+     there seem to be non-compliant FTP servers out there that return 200,
+     so we accept any '2xy' code here. */
+  if (ftpcode/100 != 2) {
+    failf(conn->data, "Couldn't cd to %s", path);
+    return CURLE_FTP_ACCESS_DENIED;
+  }
+
+  return CURLE_OK;
+}
+
+/***********************************************************************
+ *
+ * ftp_getfiletime()
+ *
+ * Get the timestamp of the given file.
+ */
+static
+CURLcode ftp_getfiletime(struct connectdata *conn, char *file)
+{
+  CURLcode result=CURLE_OK;
+  int ftpcode; /* for ftp status */
+  ssize_t nread;
+  char *buf = conn->data->state.buffer;
+
+  /* we have requested to get the modified-time of the file, this is yet
+     again a grey area as the MDTM is not kosher RFC959 */
+  FTPSENDF(conn, "MDTM %s", file);
+
+  result = Curl_GetFTPResponse(&nread, conn, &ftpcode);
+  if(result)
+    return result;
+
+  switch(ftpcode) {
+  case 213:
+    {
+      /* we got a time. Format should be: "YYYYMMDDHHMMSS[.sss]" where the
+         last .sss part is optional and means fractions of a second */
+      int year, month, day, hour, minute, second;
+      if(6 == sscanf(buf+4, "%04d%02d%02d%02d%02d%02d",
+                     &year, &month, &day, &hour, &minute, &second)) {
+        /* we have a time, reformat it */
+        time_t secs=time(NULL);
+        sprintf(buf, "%04d%02d%02d %02d:%02d:%02d",
+                year, month, day, hour, minute, second);
+        /* now, convert this into a time() value: */
+        conn->data->info.filetime = curl_getdate(buf, &secs);
+      }
+    }
+    break;
+  default:
+    infof(conn->data, "unsupported MDTM reply format\n");
+    break;
+  case 550: /* "No such file or directory" */
+    failf(conn->data, "Given file does not exist");
+    result = CURLE_FTP_COULDNT_RETR_FILE;
+    break;
+  }
+  return  result;
+}
+
+/***********************************************************************
+ *
+ * ftp_transfertype()
+ *
+ * Set transfer type. We only deal with ASCII or BINARY so this function
+ * sets one of them.
+ */
+static CURLcode ftp_transfertype(struct connectdata *conn,
+                                  bool ascii)
+{
+  struct SessionHandle *data = conn->data;
+  int ftpcode;
+  ssize_t nread;
+  CURLcode result;
+
+  FTPSENDF(conn, "TYPE %s", ascii?"A":"I");
+
+  result = Curl_GetFTPResponse(&nread, conn, &ftpcode);
+  if(result)
+    return result;
+  
+  if(ftpcode != 200) {
+    failf(data, "Couldn't set %s mode",
+          ascii?"ASCII":"binary");
+    return ascii? CURLE_FTP_COULDNT_SET_ASCII:CURLE_FTP_COULDNT_SET_BINARY;
+  }
+
+  return CURLE_OK;
+}
+
+/***********************************************************************
+ *
+ * ftp_getsize()
+ *
+ * Returns the file size (in bytes) of the given remote file.
+ */
+
+static
+CURLcode ftp_getsize(struct connectdata *conn, char *file,
+                      ssize_t *size)
+{
+  struct SessionHandle *data = conn->data;
+  int ftpcode;
+  ssize_t nread;
+  char *buf=data->state.buffer;
+  CURLcode result;
+
+  FTPSENDF(conn, "SIZE %s", file);
+  result = Curl_GetFTPResponse(&nread, conn, &ftpcode);
+  if(result)
+    return result;
+
+  if(ftpcode == 213) {
+    /* get the size from the ascii string: */
+    *size = atoi(buf+4);
+  }
+  else
+    return CURLE_FTP_COULDNT_GET_SIZE;
+
+  return CURLE_OK;
+}
+
+/***************************************************************************
+ *
+ * ftp_pasv_verbose()
+ *
+ * This function only outputs some informationals about this second connection
+ * when we've issued a PASV command before and thus we have connected to a
+ * possibly new IP address.
+ *
+ */
+static void
+ftp_pasv_verbose(struct connectdata *conn,
+                 Curl_ipconnect *addr,
+                 char *newhost, /* ascii version */
+                 int port)
+{
+#ifndef ENABLE_IPV6
+  /*****************************************************************
+   *
+   * IPv4-only code section
+   */
+
+  struct in_addr in;
+  struct hostent * answer;
+
+#ifdef HAVE_INET_NTOA_R
+  char ntoa_buf[64];
+#endif
+  /* The array size trick below is to make this a large chunk of memory
+     suitably 8-byte aligned on 64-bit platforms. This was thoughtfully
+     suggested by Philip Gladstone. */
+  long bigbuf[9000 / sizeof(long)];
+
+#if defined(HAVE_INET_ADDR)
+  in_addr_t address;
+# if defined(HAVE_GETHOSTBYADDR_R)
+  int h_errnop;
+# endif
+  char *hostent_buf = (char *)bigbuf; /* get a char * to the buffer */
+
+  address = inet_addr(newhost);
+# ifdef HAVE_GETHOSTBYADDR_R
+
+#  ifdef HAVE_GETHOSTBYADDR_R_5
+  /* AIX, Digital Unix (OSF1, Tru64) style:
+     extern int gethostbyaddr_r(char *addr, size_t len, int type,
+     struct hostent *htent, struct hostent_data *ht_data); */
+
+  /* Fred Noz helped me try this out, now it at least compiles! */
+
+  /* Bjorn Reese (November 28 2001):
+     The Tru64 man page on gethostbyaddr_r() says that
+     the hostent struct must be filled with zeroes before the call to
+     gethostbyaddr_r(). 
+
+     ... as must be struct hostent_data Craig Markwardt 19 Sep 2002. */
+
+  memset(hostent_buf, 0, sizeof(struct hostent)+sizeof(struct hostent_data));
+
+  if(gethostbyaddr_r((char *) &address,
+                     sizeof(address), AF_INET,
+                     (struct hostent *)hostent_buf,
+                     (struct hostent_data *)(hostent_buf + sizeof(*answer))))
+    answer=NULL;
+  else
+    answer=(struct hostent *)hostent_buf;
+                           
+#  endif
+#  ifdef HAVE_GETHOSTBYADDR_R_7
+  /* Solaris and IRIX */
+  answer = gethostbyaddr_r((char *) &address, sizeof(address), AF_INET,
+                           (struct hostent *)bigbuf,
+                           hostent_buf + sizeof(*answer),
+                           sizeof(bigbuf) - sizeof(*answer),
+                           &h_errnop);
+#  endif
+#  ifdef HAVE_GETHOSTBYADDR_R_8
+  /* Linux style */
+  if(gethostbyaddr_r((char *) &address, sizeof(address), AF_INET,
+                     (struct hostent *)hostent_buf,
+                     hostent_buf + sizeof(*answer),
+                     sizeof(bigbuf) - sizeof(*answer),
+                     &answer,
+                     &h_errnop))
+    answer=NULL; /* error */
+#  endif
+        
+# else
+  (void)hostent_buf; /* avoid compiler warning */
+  answer = gethostbyaddr((char *) &address, sizeof(address), AF_INET);
+# endif
+#else
+  answer = NULL;
+#endif
+  (void) memcpy(&in.s_addr, addr, sizeof (Curl_ipconnect));
+  infof(conn->data, "Connecting to %s (%s) port %u\n",
+        answer?answer->h_name:newhost,
+#if defined(HAVE_INET_NTOA_R)
+        inet_ntoa_r(in, ntoa_buf, sizeof(ntoa_buf)),
+#else
+        inet_ntoa(in),
+#endif
+        port);
+
+#else
+  /*****************************************************************
+   *
+   * IPv6-only code section
+   */
+  char hbuf[NI_MAXHOST]; /* ~1KB */
+  char nbuf[NI_MAXHOST]; /* ~1KB */
+  char sbuf[NI_MAXSERV]; /* around 32 */
+#ifdef NI_WITHSCOPEID
+  const int niflags = NI_NUMERICHOST | NI_NUMERICSERV | NI_WITHSCOPEID;
+#else
+  const int niflags = NI_NUMERICHOST | NI_NUMERICSERV;
+#endif
+  (void)port; /* prevent compiler warning */
+  if (getnameinfo(addr->ai_addr, addr->ai_addrlen,
+                  nbuf, sizeof(nbuf), sbuf, sizeof(sbuf), niflags)) {
+    snprintf(nbuf, sizeof(nbuf), "?");
+    snprintf(sbuf, sizeof(sbuf), "?");
+  }
+        
+  if (getnameinfo(addr->ai_addr, addr->ai_addrlen,
+                  hbuf, sizeof(hbuf), NULL, 0, 0)) {
+    infof(conn->data, "Connecting to %s (%s) port %s\n", nbuf, newhost, sbuf);
+  }
+  else {
+    infof(conn->data, "Connecting to %s (%s) port %s\n", hbuf, nbuf, sbuf);
+  }
+#endif
+}
+
+/***********************************************************************
+ *
+ * ftp_use_port()
+ *
+ * Send the proper PORT command. PORT is the ftp client's way of telling the
+ * server that *WE* open a port that we listen on an awaits the server to
+ * connect to. This is the opposite of PASV.
+ */
+
+static
+CURLcode ftp_use_port(struct connectdata *conn)
+{
+  struct SessionHandle *data=conn->data;
+  int portsock=-1;
+  ssize_t nread;
+  int ftpcode; /* receive FTP response codes in this */
+  CURLcode result;
+
+#ifdef ENABLE_IPV6
+  /******************************************************************
+   *
+   * Here's a piece of IPv6-specific code coming up
+   *
+   */
+
+  struct addrinfo hints, *res, *ai;
+  struct sockaddr_storage ss;
+  socklen_t sslen;
+  char hbuf[NI_MAXHOST];
+
+  struct sockaddr *sa=(struct sockaddr *)&ss;
+#ifdef NI_WITHSCOPEID
+  const int niflags = NI_NUMERICHOST | NI_NUMERICSERV | NI_WITHSCOPEID;
+#else
+  const int niflags = NI_NUMERICHOST | NI_NUMERICSERV;
+#endif
+  unsigned char *ap;
+  unsigned char *pp;
+  char portmsgbuf[4096], tmp[4096];
+
+  const char *mode[] = { "EPRT", "LPRT", "PORT", NULL };
+  char **modep;
+
+  /*
+   * we should use Curl_if2ip?  given pickiness of recent ftpd,
+   * I believe we should use the same address as the control connection.
+   */
+  sslen = sizeof(ss);
+  if (getsockname(conn->firstsocket, (struct sockaddr *)&ss, &sslen) < 0)
+    return CURLE_FTP_PORT_FAILED;
+  
+  if (getnameinfo((struct sockaddr *)&ss, sslen, hbuf, sizeof(hbuf), NULL, 0,
+                  niflags))
+    return CURLE_FTP_PORT_FAILED;
+
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = sa->sa_family;
+  /*hints.ai_family = ss.ss_family;
+    this way can be used if sockaddr_storage is properly defined, as glibc 
+    2.1.X doesn't do*/
+  hints.ai_socktype = SOCK_STREAM;
+  hints.ai_flags = AI_PASSIVE;
+
+  if (getaddrinfo(hbuf, (char *)"0", &hints, &res))
+    return CURLE_FTP_PORT_FAILED;
+  
+  portsock = -1;
+  for (ai = res; ai; ai = ai->ai_next) {
+    portsock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+    if (portsock < 0)
+      continue;
+
+    if (bind(portsock, ai->ai_addr, ai->ai_addrlen) < 0) {
+      sclose(portsock);
+      portsock = -1;
+      continue;
+    }
+      
+    if (listen(portsock, 1) < 0) {
+      sclose(portsock);
+      portsock = -1;
+      continue;
+    }
+    
+    break;
+  }
+  freeaddrinfo(res);
+  if (portsock < 0) {
+    failf(data, "%s", strerror(errno));
+    return CURLE_FTP_PORT_FAILED;
+  }
+
+  sslen = sizeof(ss);
+  if (getsockname(portsock, sa, &sslen) < 0) {
+    failf(data, "%s", strerror(errno));
+    return CURLE_FTP_PORT_FAILED;
+  }
+
+  for (modep = (char **)(data->set.ftp_use_eprt?&mode[0]:&mode[2]);
+       modep && *modep; modep++) {
+    int lprtaf, eprtaf;
+    int alen=0, plen=0;
+    
+    switch (sa->sa_family) {
+    case AF_INET:
+      ap = (unsigned char *)&((struct sockaddr_in *)&ss)->sin_addr;
+      alen = sizeof(((struct sockaddr_in *)&ss)->sin_addr);
+      pp = (unsigned char *)&((struct sockaddr_in *)&ss)->sin_port;
+      plen = sizeof(((struct sockaddr_in *)&ss)->sin_port);
+      lprtaf = 4;
+      eprtaf = 1;
+      break;
+    case AF_INET6:
+      ap = (unsigned char *)&((struct sockaddr_in6 *)&ss)->sin6_addr;
+      alen = sizeof(((struct sockaddr_in6 *)&ss)->sin6_addr);
+      pp = (unsigned char *)&((struct sockaddr_in6 *)&ss)->sin6_port;
+      plen = sizeof(((struct sockaddr_in6 *)&ss)->sin6_port);
+      lprtaf = 6;
+      eprtaf = 2;
+      break;
+    default:
+      ap = pp = NULL;
+      lprtaf = eprtaf = -1;
+      break;
+    }
+
+    if (strcmp(*modep, "EPRT") == 0) {
+      if (eprtaf < 0)
+        continue;
+      if (getnameinfo((struct sockaddr *)&ss, sslen,
+                      portmsgbuf, sizeof(portmsgbuf), tmp, sizeof(tmp), niflags))
+        continue;
+
+      /* do not transmit IPv6 scope identifier to the wire */
+      if (sa->sa_family == AF_INET6) {
+        char *q = strchr(portmsgbuf, '%');
+          if (q)
+            *q = '\0';
+      }
+
+      result = Curl_ftpsendf(conn, "%s |%d|%s|%s|", *modep, eprtaf,
+                             portmsgbuf, tmp);
+      if(result)
+        return result;
+    } else if (strcmp(*modep, "LPRT") == 0 ||
+               strcmp(*modep, "PORT") == 0) {
+      int i;
+      
+      if (strcmp(*modep, "LPRT") == 0 && lprtaf < 0)
+        continue;
+      if (strcmp(*modep, "PORT") == 0 && sa->sa_family != AF_INET)
+        continue;
+
+      portmsgbuf[0] = '\0';
+      if (strcmp(*modep, "LPRT") == 0) {
+        snprintf(tmp, sizeof(tmp), "%d,%d", lprtaf, alen);
+        if (strlcat(portmsgbuf, tmp, sizeof(portmsgbuf)) >=
+            sizeof(portmsgbuf)) {
+          continue;
+        }
+      }
+
+      for (i = 0; i < alen; i++) {
+        if (portmsgbuf[0])
+          snprintf(tmp, sizeof(tmp), ",%u", ap[i]);
+        else
+          snprintf(tmp, sizeof(tmp), "%u", ap[i]);
+        
+        if (strlcat(portmsgbuf, tmp, sizeof(portmsgbuf)) >=
+            sizeof(portmsgbuf)) {
+          continue;
+        }
+      }
+      
+      if (strcmp(*modep, "LPRT") == 0) {
+        snprintf(tmp, sizeof(tmp), ",%d", plen);
+        
+        if (strlcat(portmsgbuf, tmp, sizeof(portmsgbuf)) >= sizeof(portmsgbuf))
+          continue;
+      }
+
+      for (i = 0; i < plen; i++) {
+        snprintf(tmp, sizeof(tmp), ",%u", pp[i]);
+        
+        if (strlcat(portmsgbuf, tmp, sizeof(portmsgbuf)) >=
+            sizeof(portmsgbuf)) {
+          continue;
+        }
+      }
+      
+      result = Curl_ftpsendf(conn, "%s %s", *modep, portmsgbuf);
+      if(result)
+        return result;
+    }
+    
+    result = Curl_GetFTPResponse(&nread, conn, &ftpcode);
+    if(result)
+      return result;
+    
+    if (ftpcode != 200) {
+      failf(data, "Server does not grok %s", *modep);
+      continue;
+    }
+    else
+      break;
+  }
+  
+  if (!*modep) {
+    sclose(portsock);
+    return CURLE_FTP_PORT_FAILED;
+  }
+  /* we set the secondary socket variable to this for now, it
+     is only so that the cleanup function will close it in case
+     we fail before the true secondary stuff is made */
+  conn->secondarysocket = portsock;
+  
+#else
+  /******************************************************************
+   *
+   * Here's a piece of IPv4-specific code coming up
+   *
+   */
+  struct sockaddr_in sa;
+  struct Curl_dns_entry *h=NULL;
+  unsigned short porttouse;
+  char myhost[256] = "";
+  bool sa_filled_in = FALSE;
+
+  if(data->set.ftpport) {
+    in_addr_t in;
+
+    /* First check if the given name is an IP address */
+    in=inet_addr(data->set.ftpport);
+
+    if((in == CURL_INADDR_NONE) &&
+       Curl_if2ip(data->set.ftpport, myhost, sizeof(myhost))) {
+      h = Curl_resolv(data, myhost, 0);
+    }
+    else {
+      int len = strlen(data->set.ftpport);
+      if(len>1)
+        h = Curl_resolv(data, data->set.ftpport, 0);
+      if(h)
+        strcpy(myhost, data->set.ftpport); /* buffer overflow risk */
+    }
+  }
+  if(! *myhost) {
+    /* pick a suitable default here */
+
+    socklen_t sslen;
+    
+    sslen = sizeof(sa);
+    if (getsockname(conn->firstsocket, (struct sockaddr *)&sa, &sslen) < 0) {
+      failf(data, "getsockname() failed");
+      return CURLE_FTP_PORT_FAILED;
+    }
+
+    sa_filled_in = TRUE; /* the sa struct is filled in */
+  }
+
+  if(h)
+    /* when we return from here, we can forget about this */
+    Curl_resolv_unlock(data, h);
+
+  if ( h || sa_filled_in) {
+    if( (portsock = socket(AF_INET, SOCK_STREAM, 0)) >= 0 ) {
+      int size;
+      
+      /* we set the secondary socket variable to this for now, it
+         is only so that the cleanup function will close it in case
+         we fail before the true secondary stuff is made */
+      conn->secondarysocket = portsock;
+
+      if(!sa_filled_in) {
+        memset((char *)&sa, 0, sizeof(sa));
+        memcpy((char *)&sa.sin_addr,
+               h->addr->h_addr,
+               h->addr->h_length);
+        sa.sin_family = AF_INET;
+        sa.sin_addr.s_addr = INADDR_ANY;
+      }
+
+      sa.sin_port = 0;
+      size = sizeof(sa);
+      
+      if(bind(portsock, (struct sockaddr *)&sa, size) >= 0) {
+        /* we succeeded to bind */
+        struct sockaddr_in add;
+        socklen_t socksize = sizeof(add);
+
+        if(getsockname(portsock, (struct sockaddr *) &add,
+                       &socksize)<0) {
+          failf(data, "getsockname() failed");
+          return CURLE_FTP_PORT_FAILED;
+        }
+        porttouse = ntohs(add.sin_port);
+        
+        if ( listen(portsock, 1) < 0 ) {
+          failf(data, "listen(2) failed on socket");
+          return CURLE_FTP_PORT_FAILED;
+        }
+      }
+      else {
+        failf(data, "bind(2) failed on socket");
+        return CURLE_FTP_PORT_FAILED;
+      }
+    }
+    else {
+      failf(data, "socket(2) failed (%s)");
+      return CURLE_FTP_PORT_FAILED;
+    }
+  }
+  else {
+    failf(data, "could't find my own IP address (%s)", myhost);
+    return CURLE_FTP_PORT_FAILED;
+  }
+  {
+#ifdef HAVE_INET_NTOA_R
+    char ntoa_buf[64];
+#endif
+    struct in_addr in;
+    unsigned short ip[5];
+    (void) memcpy(&in.s_addr,
+                  h?*h->addr->h_addr_list:(char *)&sa.sin_addr.s_addr,
+                  sizeof (in.s_addr));
+
+#ifdef HAVE_INET_NTOA_R
+    /* ignore the return code from inet_ntoa_r() as it is int or
+       char * depending on system */
+    inet_ntoa_r(in, ntoa_buf, sizeof(ntoa_buf));
+    sscanf( ntoa_buf, "%hu.%hu.%hu.%hu",
+            &ip[0], &ip[1], &ip[2], &ip[3]);
+#else
+    sscanf( inet_ntoa(in), "%hu.%hu.%hu.%hu",
+            &ip[0], &ip[1], &ip[2], &ip[3]);
+#endif
+    infof(data, "Telling server to connect to %d.%d.%d.%d:%d\n",
+          ip[0], ip[1], ip[2], ip[3], porttouse);
+  
+    result=Curl_ftpsendf(conn, "PORT %d,%d,%d,%d,%d,%d",
+                         ip[0], ip[1], ip[2], ip[3],
+                         porttouse >> 8,
+                         porttouse & 255);
+    if(result)
+      return result;
+  }
+
+  result = Curl_GetFTPResponse(&nread, conn, &ftpcode);
+  if(result)
+    return result;
+
+  if(ftpcode != 200) {
+    failf(data, "Server does not grok PORT, try without it!");
+    return CURLE_FTP_PORT_FAILED;
+  }
+#endif /* end of ipv4-specific code */
+
+  return CURLE_OK;
+}
+
+/***********************************************************************
+ *
+ * ftp_use_pasv()
+ *
+ * Send the PASV command. PASV is the ftp client's way of asking the server to
+ * open a second port that we can connect to (for the data transfer). This is
+ * the opposite of PORT.
+ */
+
+static
+CURLcode ftp_use_pasv(struct connectdata *conn,
+                      bool *connected)
+{
+  struct SessionHandle *data = conn->data;
+  ssize_t nread;
+  char *buf = data->state.buffer; /* this is our buffer */
+  int ftpcode; /* receive FTP response codes in this */
+  CURLcode result;
+  struct Curl_dns_entry *addr=NULL;
+  Curl_ipconnect *conninfo;
+
+  /*
+    Here's the excecutive summary on what to do:
+
+    PASV is RFC959, expect:
+    227 Entering Passive Mode (a1,a2,a3,a4,p1,p2)
+
+    LPSV is RFC1639, expect:
+    228 Entering Long Passive Mode (4,4,a1,a2,a3,a4,2,p1,p2)
+
+    EPSV is RFC2428, expect:
+    229 Entering Extended Passive Mode (|||port|)
+
+  */
+
+#if 1
+  const char *mode[] = { "EPSV", "PASV", NULL };
+  int results[] = { 229, 227, 0 };
+#else
+#if 0
+  char *mode[] = { "EPSV", "LPSV", "PASV", NULL };
+  int results[] = { 229, 228, 227, 0 };
+#else
+  const char *mode[] = { "PASV", NULL };
+  int results[] = { 227, 0 };
+#endif
+#endif
+  int modeoff;
+  unsigned short connectport; /* the local port connect() should use! */
+  unsigned short newport=0; /* remote port, not necessary the local one */
+  
+  /* newhost must be able to hold a full IP-style address in ASCII, which
+     in the IPv6 case means 5*8-1 = 39 letters */
+  char newhost[48];
+  char *newhostp=NULL;
+  
+  for (modeoff = (data->set.ftp_use_epsv?0:1);
+       mode[modeoff]; modeoff++) {
+    result = Curl_ftpsendf(conn, "%s", mode[modeoff]);
+    if(result)
+      return result;
+    result = Curl_GetFTPResponse(&nread, conn, &ftpcode);
+    if(result)
+      return result;
+    if (ftpcode == results[modeoff])
+      break;
+  }
+
+  if (!mode[modeoff]) {
+    failf(data, "Odd return code after PASV");
+    return CURLE_FTP_WEIRD_PASV_REPLY;
+  }
+  else if (227 == results[modeoff]) {
+    int ip[4];
+    int port[2];
+    char *str=buf;
+
+    /*
+     * New 227-parser June 3rd 1999.
+     * It now scans for a sequence of six comma-separated numbers and
+     * will take them as IP+port indicators.
+     *
+     * Found reply-strings include:
+     * "227 Entering Passive Mode (127,0,0,1,4,51)"
+     * "227 Data transfer will passively listen to 127,0,0,1,4,51"
+     * "227 Entering passive mode. 127,0,0,1,4,51"
+     */
+      
+    while(*str) {
+      if (6 == sscanf(str, "%d,%d,%d,%d,%d,%d",
+                      &ip[0], &ip[1], &ip[2], &ip[3],
+                      &port[0], &port[1]))
+        break;
+      str++;
+    }
+
+    if(!*str) {
+      failf(data, "Couldn't interpret this 227-reply: %s", buf);
+      return CURLE_FTP_WEIRD_227_FORMAT;
+    }
+
+    sprintf(newhost, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
+    newhostp = newhost;
+    newport = (port[0]<<8) + port[1];
+  }
+#if 1
+  else if (229 == results[modeoff]) {
+    char *ptr = strchr(buf, '(');
+    if(ptr) {
+      unsigned int num;
+      char separator[4];
+      ptr++;
+      if(5  == sscanf(ptr, "%c%c%c%u%c",
+                      &separator[0],
+                      &separator[1],
+                      &separator[2],
+                      &num,
+                      &separator[3])) {
+        /* the four separators should be identical */
+        newport = num;
+
+        /* we should use the same host we already are connected to */
+        newhostp = conn->name;
+      }                      
+      else
+        ptr=NULL;
+    }
+    if(!ptr) {
+      failf(data, "Weirdly formatted EPSV reply");
+      return CURLE_FTP_WEIRD_PASV_REPLY;
+    }
+  }
+#endif
+  else
+    return CURLE_FTP_CANT_RECONNECT;
+
+  if(data->change.proxy) {
+    /*
+     * This is a tunnel through a http proxy and we need to connect to the
+     * proxy again here.
+     *
+     * We don't want to rely on a former host lookup that might've expired
+     * now, instead we remake the lookup here and now!
+     */
+    addr = Curl_resolv(data, conn->proxyhost, conn->port);
+    connectport =
+      (unsigned short)conn->port; /* we connect to the proxy's port */    
+
+  }
+  else {
+    /* normal, direct, ftp connection */
+    addr = Curl_resolv(data, newhostp, newport);
+    if(!addr) {
+      failf(data, "Can't resolve new host %s:%d", newhostp, newport);
+      return CURLE_FTP_CANT_GET_HOST;
+    }
+    connectport = newport; /* we connect to the remote port */
+  }
+    
+  result = Curl_connecthost(conn,
+                            addr,
+                            connectport,
+                            &conn->secondarysocket,
+                            &conninfo,
+                            connected);
+
+  Curl_resolv_unlock(data, addr); /* we're done using this address */
+
+  /*
+   * When this is used from the multi interface, this might've returned with
+   * the 'connected' set to FALSE and thus we are now awaiting a non-blocking
+   * connect to connect and we should not be "hanging" here waiting.
+   */
+  
+  if((CURLE_OK == result) &&       
+     data->set.verbose)
+    /* this just dumps information about this second connection */
+    ftp_pasv_verbose(conn, conninfo, newhostp, connectport);
+  
+  if(CURLE_OK != result)
+    return result;
+
+  if (data->set.tunnel_thru_httpproxy) {
+    /* We want "seamless" FTP operations through HTTP proxy tunnel */
+    result = Curl_ConnectHTTPProxyTunnel(conn, conn->secondarysocket,
+                                         newhostp, newport);
+    if(CURLE_OK != result)
+      return result;
+  }
+
+  return CURLE_OK;
+}
+
+/*
+ * Curl_ftp_nextconnect()
+ *
+ * This function shall be called when the second FTP connection has been
+ * established and is confirmed connected.
+ */
+
+CURLcode Curl_ftp_nextconnect(struct connectdata *conn)
+{
+  struct SessionHandle *data=conn->data;
+  char *buf = data->state.buffer; /* this is our buffer */
+  CURLcode result;
+  ssize_t nread;
+  int ftpcode; /* for ftp status */
+
+  /* the ftp struct is already inited in Curl_ftp_connect() */
+  struct FTP *ftp = conn->proto.ftp;
+  long *bytecountp = ftp->bytecountp;
+
+  if(data->set.upload) {
+
+    /* Set type to binary (unless specified ASCII) */
+    result = ftp_transfertype(conn, data->set.ftp_ascii);
+    if(result)
+      return result;
+
+    /* Send any PREQUOTE strings after transfer type is set? (Wesley Laxton)*/
+    if(data->set.prequote) {
+      if ((result = ftp_sendquote(conn, data->set.prequote)) != CURLE_OK)
+        return result;
+    }
+
+    if(conn->resume_from) {
+      /* we're about to continue the uploading of a file */
+      /* 1. get already existing file's size. We use the SIZE
+         command for this which may not exist in the server!
+         The SIZE command is not in RFC959. */
+
+      /* 2. This used to set REST. But since we can do append, we
+         don't another ftp command. We just skip the source file
+         offset and then we APPEND the rest on the file instead */
+
+      /* 3. pass file-size number of bytes in the source file */
+      /* 4. lower the infilesize counter */
+      /* => transfer as usual */
+
+      if(conn->resume_from < 0 ) {
+        /* we could've got a specified offset from the command line,
+           but now we know we didn't */
+        ssize_t gottensize;
+
+        if(CURLE_OK != ftp_getsize(conn, ftp->file, &gottensize)) {
+          failf(data, "Couldn't get remote file size");
+          return CURLE_FTP_COULDNT_GET_SIZE;
+        }
+        conn->resume_from = gottensize;
+      }
+
+      if(conn->resume_from) {
+        /* do we still game? */
+        int passed=0;
+        /* enable append instead */
+        data->set.ftp_append = 1;
+
+        /* Now, let's read off the proper amount of bytes from the
+           input. If we knew it was a proper file we could've just
+           fseek()ed but we only have a stream here */
+        do {
+          int readthisamountnow = (conn->resume_from - passed);
+          int actuallyread;
+
+          if(readthisamountnow > BUFSIZE)
+            readthisamountnow = BUFSIZE;
+
+          actuallyread =
+            conn->fread(data->state.buffer, 1, readthisamountnow,
+                        conn->fread_in);
+
+          passed += actuallyread;
+          if(actuallyread != readthisamountnow) {
+            failf(data, "Could only read %d bytes from the input", passed);
+            return CURLE_FTP_COULDNT_USE_REST;
+          }
+        }
+        while(passed != conn->resume_from);
+
+        /* now, decrease the size of the read */
+        if(data->set.infilesize>0) {
+          data->set.infilesize -= conn->resume_from;
+
+          if(data->set.infilesize <= 0) {
+            infof(data, "File already completely uploaded\n");
+
+            /* no data to transfer */
+            result=Curl_Transfer(conn, -1, -1, FALSE, NULL, -1, NULL);
+            
+            /* Set no_transfer so that we won't get any error in
+             * Curl_ftp_done() because we didn't transfer anything! */
+            ftp->no_transfer = TRUE; 
+
+            return CURLE_OK;
+          }
+        }
+        /* we've passed, proceed as normal */
+      }
+    }
+
+    /* Send everything on data->state.in to the socket */
+    if(data->set.ftp_append) {
+      /* we append onto the file instead of rewriting it */
+      FTPSENDF(conn, "APPE %s", ftp->file);
+    }
+    else {
+      FTPSENDF(conn, "STOR %s", ftp->file);
+    }
+
+    result = Curl_GetFTPResponse(&nread, conn, &ftpcode);
+    if(result)
+      return result;
+
+    if(ftpcode>=400) {
+      failf(data, "Failed FTP upload:%s", buf+3);
+      /* oops, we never close the sockets! */
+      return CURLE_FTP_COULDNT_STOR_FILE;
+    }
+
+    if(data->set.ftp_use_port) {
+      /* PORT means we are now awaiting the server to connect to us. */
+      result = AllowServerConnect(data, conn, conn->secondarysocket);
+      if( result )
+        return result;
+    }
+
+    *bytecountp=0;
+
+    /* When we know we're uploading a specified file, we can get the file
+       size prior to the actual upload. */
+
+    Curl_pgrsSetUploadSize(data, data->set.infilesize);
+
+    result = Curl_Transfer(conn, -1, -1, FALSE, NULL, /* no download */
+                      conn->secondarysocket, bytecountp);
+    if(result)
+      return result;
+      
+  }
+  else if(!data->set.no_body) {
+    /* Retrieve file or directory */
+    bool dirlist=FALSE;
+    long downloadsize=-1;
+
+    if(conn->bits.use_range && conn->range) {
+      long from, to;
+      int totalsize=-1;
+      char *ptr;
+      char *ptr2;
+
+      from=strtol(conn->range, &ptr, 0);
+      while(ptr && *ptr && (isspace((int)*ptr) || (*ptr=='-')))
+        ptr++;
+      to=strtol(ptr, &ptr2, 0);
+      if(ptr == ptr2) {
+        /* we didn't get any digit */
+        to=-1;
+      }
+      if((-1 == to) && (from>=0)) {
+        /* X - */
+        conn->resume_from = from;
+        infof(data, "FTP RANGE %d to end of file\n", from);
+      }
+      else if(from < 0) {
+        /* -Y */
+        totalsize = -from;
+        conn->maxdownload = -from;
+        conn->resume_from = from;
+        infof(data, "FTP RANGE the last %d bytes\n", totalsize);
+      }
+      else {
+        /* X-Y */
+        totalsize = to-from;
+        conn->maxdownload = totalsize+1; /* include the last mentioned byte */
+        conn->resume_from = from;
+        infof(data, "FTP RANGE from %d getting %d bytes\n", from,
+              conn->maxdownload);
+      }
+      infof(data, "range-download from %d to %d, totally %d bytes\n",
+            from, to, totalsize);
+      ftp->dont_check = TRUE; /* dont check for successful transfer */
+    }
+
+    if((data->set.ftp_list_only) || !ftp->file) {
+      /* The specified path ends with a slash, and therefore we think this
+         is a directory that is requested, use LIST. But before that we
+         need to set ASCII transfer mode. */
+      dirlist = TRUE;
+
+      /* Set type to ASCII */
+      result = ftp_transfertype(conn, TRUE /* ASCII enforced */);
+      if(result)
+        return result;
+
+      /* if this output is to be machine-parsed, the NLST command will be
+         better used since the LIST command output is not specified or
+         standard in any way */
+
+      FTPSENDF(conn, "%s",
+            data->set.customrequest?data->set.customrequest:
+            (data->set.ftp_list_only?"NLST":"LIST"));
+    }
+    else {
+      ssize_t foundsize;
+
+      /* Set type to binary (unless specified ASCII) */
+      result = ftp_transfertype(conn, data->set.ftp_ascii);
+      if(result)
+        return result;
+
+      /* Send any PREQUOTE strings after transfer type is set? (Wesley Laxton)*/
+      if(data->set.prequote) {
+        if ((result = ftp_sendquote(conn, data->set.prequote)) != CURLE_OK)
+          return result;
+      }
+
+      /* Attempt to get the size, it'll be useful in some cases: for resumed
+         downloads and when talking to servers that don't give away the size
+         in the RETR response line. */
+      result = ftp_getsize(conn, ftp->file, &foundsize);
+      if(CURLE_OK == result)
+        downloadsize = foundsize;
+
+      if(conn->resume_from) {
+
+        /* Daniel: (August 4, 1999)
+         *
+         * We start with trying to use the SIZE command to figure out the size
+         * of the file we're gonna get. If we can get the size, this is by far
+         * the best way to know if we're trying to resume beyond the EOF.
+         *
+         * Daniel, November 28, 2001. We *always* get the size on downloads
+         * now, so it is done before this even when not doing resumes. I saved
+         * the comment above for nostalgical reasons! ;-)
+         */
+        if(CURLE_OK != result) {
+          infof(data, "ftp server doesn't support SIZE\n");
+          /* We couldn't get the size and therefore we can't know if there
+             really is a part of the file left to get, although the server
+             will just close the connection when we start the connection so it
+             won't cause us any harm, just not make us exit as nicely. */
+        }
+        else {
+          /* We got a file size report, so we check that there actually is a
+             part of the file left to get, or else we go home.  */
+          if(conn->resume_from< 0) {
+            /* We're supposed to download the last abs(from) bytes */
+            if(foundsize < -conn->resume_from) {
+              failf(data, "Offset (%d) was beyond file size (%d)",
+                    conn->resume_from, foundsize);
+              return CURLE_FTP_BAD_DOWNLOAD_RESUME;
+            }
+            /* convert to size to download */
+            downloadsize = -conn->resume_from;
+            /* download from where? */
+            conn->resume_from = foundsize - downloadsize;
+          }
+          else {
+            if(foundsize < conn->resume_from) {
+              failf(data, "Offset (%d) was beyond file size (%d)",
+                    conn->resume_from, foundsize);
+              return CURLE_FTP_BAD_DOWNLOAD_RESUME;
+            }
+            /* Now store the number of bytes we are expected to download */
+            downloadsize = foundsize-conn->resume_from;
+          }
+        }
+
+        if (downloadsize == 0) {
+          /* no data to transfer */
+          result=Curl_Transfer(conn, -1, -1, FALSE, NULL, -1, NULL);
+          infof(data, "File already completely downloaded\n");
+
+          /* Set no_transfer so that we won't get any error in Curl_ftp_done()
+           * because we didn't transfer the any file */
+          ftp->no_transfer = TRUE;
+          return CURLE_OK;
+        }
+	
+        /* Set resume file transfer offset */
+        infof(data, "Instructs server to resume from offset %d\n",
+              conn->resume_from);
+
+        FTPSENDF(conn, "REST %d", conn->resume_from);
+
+        result = Curl_GetFTPResponse(&nread, conn, &ftpcode);
+        if(result)
+          return result;
+
+        if(ftpcode != 350) {
+          failf(data, "Couldn't use REST: %s", buf+4);
+          return CURLE_FTP_COULDNT_USE_REST;
+        }
+      }
+
+      FTPSENDF(conn, "RETR %s", ftp->file);
+    }
+
+    result = Curl_GetFTPResponse(&nread, conn, &ftpcode);
+    if(result)
+      return result;
+
+    if((ftpcode == 150) || (ftpcode == 125)) {
+
+      /*
+        A;
+        150 Opening BINARY mode data connection for /etc/passwd (2241
+        bytes).  (ok, the file is being transfered)
+	
+        B:
+        150 Opening ASCII mode data connection for /bin/ls 
+
+        C:
+        150 ASCII data connection for /bin/ls (137.167.104.91,37445) (0 bytes).
+
+        D:
+        150 Opening ASCII mode data connection for /linux/fisk/kpanelrc (0.0.0.0,0) (545 bytes).
+          
+        E:
+        125 Data connection already open; Transfer starting. */
+
+      int size=-1; /* default unknown size */
+
+
+      /*
+       * It appears that there are FTP-servers that return size 0 for files
+       * when SIZE is used on the file while being in BINARY mode. To work
+       * around that (stupid) behavior, we attempt to parse the RETR response
+       * even if the SIZE returned size zero.
+       *
+       * Debugging help from Salvatore Sorrentino on February 26, 2003.
+       */
+
+      if(!dirlist &&
+         !data->set.ftp_ascii &&
+         (downloadsize < 1)) {
+        /*
+         * It seems directory listings either don't show the size or very
+         * often uses size 0 anyway. ASCII transfers may very well turn out
+         * that the transfered amount of data is not the same as this line
+         * tells, why using this number in those cases only confuses us.
+         *
+         * Example D above makes this parsing a little tricky */
+        char *bytes;
+        bytes=strstr(buf, " bytes");
+        if(bytes--) {
+          int index=bytes-buf;
+          /* this is a hint there is size information in there! ;-) */
+          while(--index) {
+            /* scan for the parenthesis and break there */
+            if('(' == *bytes)
+              break;
+            /* if only skip digits, or else we're in deep trouble */
+            if(!isdigit((int)*bytes)) {
+              bytes=NULL;
+              break;
+            }
+            /* one more estep backwards */
+            bytes--;
+          }
+          /* only if we have nothing but digits: */
+          if(bytes++) {
+            /* get the number! */
+            size = atoi(bytes);
+          }
+            
+        }
+      }
+      else if(downloadsize > -1)
+        size = downloadsize;
+
+      if(data->set.ftp_use_port) {
+        result = AllowServerConnect(data, conn, conn->secondarysocket);
+        if( result )
+          return result;
+      }
+
+      infof(data, "Getting file with size: %d\n", size);
+
+      /* FTP download: */
+      result=Curl_Transfer(conn, conn->secondarysocket, size, FALSE,
+                           bytecountp,
+                           -1, NULL); /* no upload here */
+      if(result)
+        return result;
+    }
+    else {
+      failf(data, "%s", buf+4);
+      return CURLE_FTP_COULDNT_RETR_FILE;
+    }
+	
+  }
+  /* end of transfer */
+
+  return CURLE_OK;
+}
+
+/***********************************************************************
+ *
+ * ftp_perform()
+ *
+ * This is the actual DO function for FTP. Get a file/directory according to
+ * the options previously setup.
+ */
+
+static
+CURLcode ftp_perform(struct connectdata *conn,
+                     bool *connected)  /* for the TCP connect status after
+                                          PASV / PORT */
+{
+  /* this is FTP and no proxy */
+  CURLcode result=CURLE_OK;
+  struct SessionHandle *data=conn->data;
+  char *buf = data->state.buffer; /* this is our buffer */
+
+  /* the ftp struct is already inited in Curl_ftp_connect() */
+  struct FTP *ftp = conn->proto.ftp;
+
+  /* Send any QUOTE strings? */
+  if(data->set.quote) {
+    if ((result = ftp_sendquote(conn, data->set.quote)) != CURLE_OK)
+      return result;
+  }
+    
+  /* This is a re-used connection. Since we change directory to where the
+     transfer is taking place, we must now get back to the original dir
+     where we ended up after login: */
+  if (conn->bits.reuse && ftp->entrypath) {
+    if ((result = ftp_cwd(conn, ftp->entrypath)) != CURLE_OK)
+      return result;
+  }
+
+  {
+    int i; /* counter for loop */
+    for (i=0; ftp->dirs[i]; i++) {
+      /* RFC 1738 says empty components should be respected too */
+      if ((result = ftp_cwd(conn, ftp->dirs[i])) != CURLE_OK)
+        return result;
+    }
+  }
+
+  /* Requested time of file or time-depended transfer? */
+  if((data->set.get_filetime || data->set.timecondition) &&
+     ftp->file) {
+    result = ftp_getfiletime(conn, ftp->file);
+    if(result)
+      return result;
+
+    if(data->set.timecondition) {
+      if((data->info.filetime > 0) && (data->set.timevalue > 0)) {
+        switch(data->set.timecondition) {
+        case TIMECOND_IFMODSINCE:
+        default:
+          if(data->info.filetime < data->set.timevalue) {
+            infof(data, "The requested document is not new enough\n");
+            ftp->no_transfer = TRUE; /* mark this to not transfer data */
+            return CURLE_OK;
+          }
+          break;
+        case TIMECOND_IFUNMODSINCE:
+          if(data->info.filetime > data->set.timevalue) {
+            infof(data, "The requested document is not old enough\n");
+            ftp->no_transfer = TRUE; /* mark this to not transfer data */
+            return CURLE_OK;
+          }
+          break;
+        } /* switch */
+      }
+      else {
+        infof(data, "Skipping time comparison\n");
+      }
+    }
+  }
+
+  /* If we have selected NOBODY and HEADER, it means that we only want file
+     information. Which in FTP can't be much more than the file size and
+     date. */
+  if(data->set.no_body && data->set.include_header && ftp->file) {
+    /* The SIZE command is _not_ RFC 959 specified, and therefor many servers
+       may not support it! It is however the only way we have to get a file's
+       size! */
+    ssize_t filesize;
+
+    ftp->no_transfer = TRUE; /* this means no actual transfer is made */
+    
+    /* Some servers return different sizes for different modes, and thus we
+       must set the proper type before we check the size */
+    result = ftp_transfertype(conn, data->set.ftp_ascii);
+    if(result)
+      return result;
+
+    /* failing to get size is not a serious error */
+    result = ftp_getsize(conn, ftp->file, &filesize);
+
+    if(CURLE_OK == result) {
+      sprintf(buf, "Content-Length: %d\r\n", filesize);
+      result = Curl_client_write(data, CLIENTWRITE_BOTH, buf, 0);
+      if(result)
+        return result;
+    }
+
+    /* If we asked for a time of the file and we actually got one as
+       well, we "emulate" a HTTP-style header in our output. */
+
+#ifdef HAVE_STRFTIME
+    if(data->set.get_filetime && (data->info.filetime>=0) ) {
+      struct tm *tm;
+#ifdef HAVE_LOCALTIME_R
+      struct tm buffer;
+      tm = (struct tm *)localtime_r(&data->info.filetime, &buffer);
+#else
+      tm = localtime((unsigned long *)&data->info.filetime);
+#endif
+      /* format: "Tue, 15 Nov 1994 12:45:26 GMT" */
+      strftime(buf, BUFSIZE-1, "Last-Modified: %a, %d %b %Y %H:%M:%S GMT\r\n",
+               tm);
+      result = Curl_client_write(data, CLIENTWRITE_BOTH, buf, 0);
+      if(result)
+        return result;
+    }
+#endif
+
+    return CURLE_OK;
+  }
+
+  if(data->set.no_body)
+    /* doesn't really transfer any data */
+    ftp->no_transfer = TRUE;
+  /* Get us a second connection up and connected */
+  else if(data->set.ftp_use_port) {
+    /* We have chosen to use the PORT command */
+    result = ftp_use_port(conn);
+    if(CURLE_OK == result) {
+      /* we have the data connection ready */
+      infof(data, "Ordered connect of the data stream with PORT!\n");
+      *connected = TRUE; /* mark us "still connected" */
+    }
+  }
+  else {
+    /* We have chosen (this is default) to use the PASV command */
+    result = ftp_use_pasv(conn, connected);
+    if(connected)
+      infof(data, "Connected the data stream with PASV!\n");
+  }
+  
+  return result;
+}
+
+/***********************************************************************
+ *
+ * Curl_ftp()
+ *
+ * This function is registered as 'curl_do' function. It decodes the path
+ * parts etc as a wrapper to the actual DO function (ftp_perform).
+ *
+ * The input argument is already checked for validity.
+ */
+CURLcode Curl_ftp(struct connectdata *conn)
+{
+  CURLcode retcode=CURLE_OK;
+  bool connected=0;
+
+  struct SessionHandle *data = conn->data;
+  struct FTP *ftp;
+
+  char *slash_pos;  /* position of the first '/' char in curpos */
+  char *cur_pos=conn->ppath; /* current position in ppath. point at the begin
+                                of next path component */
+  int path_part=0;/* current path component */
+
+  /* the ftp struct is already inited in ftp_connect() */
+  ftp = conn->proto.ftp;
+  conn->size = -1; /* make sure this is unknown at this point */
+
+  Curl_pgrsSetUploadCounter(data, 0);
+  Curl_pgrsSetDownloadCounter(data, 0);
+  Curl_pgrsSetUploadSize(data, 0);
+  Curl_pgrsSetDownloadSize(data, 0);
+
+  /*  fixed : initialize ftp->dirs[xxx] to NULL !
+      is done in Curl_ftp_connect() */
+
+  /* parse the URL path into separate path components */
+  while((slash_pos=strchr(cur_pos, '/'))) {
+    /* seek out the next path component */
+    if (0 == slash_pos-cur_pos)  /* empty path component, like "x//y" */
+      ftp->dirs[path_part] = strdup(""); /* empty string */
+    else
+      ftp->dirs[path_part] = curl_unescape(cur_pos,slash_pos-cur_pos);
+    
+    if (!ftp->dirs[path_part]) { /* run out of memory ... */
+      failf(data, "no memory");
+      retcode = CURLE_OUT_OF_MEMORY;
+    }
+    else {
+      cur_pos = slash_pos + 1; /* jump to the rest of the string */
+      if(++path_part >= (CURL_MAX_FTP_DIRDEPTH-1)) {
+        /* too deep, we need the last entry to be kept NULL at all
+           times to signal end of list */
+        failf(data, "too deep dir hierarchy");
+        retcode = CURLE_URL_MALFORMAT;
+      }
+    }
+    if (retcode) {
+      int i;
+      for (i=0;i<path_part;i++) { /* free previous parts */
+        free(ftp->dirs[i]);
+        ftp->dirs[i]=NULL;
+      }
+      return retcode; /* failure */
+    }
+  }
+
+  ftp->file = cur_pos;  /* the rest is the file name */
+
+  if(*ftp->file) {
+    ftp->file = curl_unescape(ftp->file, 0);
+    if(NULL == ftp->file) {
+      int i;
+      for (i=0;i<path_part;i++){
+        free(ftp->dirs[i]);
+        ftp->dirs[i]=NULL;
+      }
+      failf(data, "no memory");
+      return CURLE_OUT_OF_MEMORY;
+    }
+  }
+  else
+    ftp->file=NULL; /* instead of point to a zero byte, we make it a NULL
+                       pointer */
+  
+  retcode = ftp_perform(conn, &connected);
+
+  if(CURLE_OK == retcode) {
+    if(connected)
+      retcode = Curl_ftp_nextconnect(conn);
+    else {
+      if(ftp->no_transfer) {
+        /* no data to transfer */
+        retcode=Curl_Transfer(conn, -1, -1, FALSE, NULL, -1, NULL);        
+      }
+      else {
+        /* since we didn't connect now, we want do_more to get called */
+        conn->bits.do_more = TRUE;
+      }
+    }
+  }
+
+  return retcode;
+}
+
+/***********************************************************************
+ *
+ * Curl_ftpsendf()
+ *
+ * Sends the formated string as a ftp command to a ftp server
+ *
+ * NOTE: we build the command in a fixed-length buffer, which sets length
+ * restrictions on the command!
+ */
+CURLcode Curl_ftpsendf(struct connectdata *conn,
+                       const char *fmt, ...)
+{
+  ssize_t bytes_written;
+  char s[256];
+  ssize_t write_len;
+  char *sptr=s;
+  CURLcode res = CURLE_OK;
+
+  va_list ap;
+  va_start(ap, fmt);
+  vsnprintf(s, 250, fmt, ap);
+  va_end(ap);
+  
+  strcat(s, "\r\n"); /* append a trailing CRLF */
+
+  bytes_written=0;
+  write_len = strlen(s);
+
+  do {
+    res = Curl_write(conn, conn->firstsocket, sptr, write_len,
+                     &bytes_written);
+
+    if(CURLE_OK != res)
+      break;
+
+    if(conn->data->set.verbose)
+      Curl_debug(conn->data, CURLINFO_HEADER_OUT, sptr, bytes_written);
+
+    if(bytes_written != write_len) {
+      write_len -= bytes_written;
+      sptr += bytes_written;
+    }
+    else
+      break;
+  } while(1);
+
+  return res;
+}
+
+/***********************************************************************
+ *
+ * Curl_ftp_disconnect()
+ *
+ * Disconnect from an FTP server. Cleanup protocol-specific per-connection
+ * resources
+ */
+CURLcode Curl_ftp_disconnect(struct connectdata *conn)
+{
+  struct FTP *ftp= conn->proto.ftp;
+  int i;
+
+  /* The FTP session may or may not have been allocated/setup at this point! */
+  if(ftp) {
+    if(ftp->entrypath)
+      free(ftp->entrypath);
+    if(ftp->cache)
+      free(ftp->cache);
+    if(ftp->file)
+      free(ftp->file);
+    for (i=0;ftp->dirs[i];i++){
+      free(ftp->dirs[i]);
+      ftp->dirs[i]=NULL;
+    }
+
+    ftp->file = NULL; /* zero */
+  }
+  return CURLE_OK;
+}
+
+#endif /* CURL_DISABLE_FTP */
diff --git a/main/source/curl/lib/ftp.h b/main/source/curl/lib/ftp.h
new file mode 100644
index 00000000..bbf2f5c3
--- /dev/null
+++ b/main/source/curl/lib/ftp.h
@@ -0,0 +1,37 @@
+#ifndef __FTP_H
+#define __FTP_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: ftp.h,v 1.17 2003/03/11 18:58:22 bagder Exp $
+ ***************************************************************************/
+
+#ifndef CURL_DISABLE_FTP
+CURLcode Curl_ftp(struct connectdata *conn);
+CURLcode Curl_ftp_done(struct connectdata *conn);
+CURLcode Curl_ftp_connect(struct connectdata *conn);
+CURLcode Curl_ftp_disconnect(struct connectdata *conn);
+CURLcode Curl_ftpsendf(struct connectdata *, const char *fmt, ...);
+CURLcode Curl_GetFTPResponse(ssize_t *nread, struct connectdata *conn,
+                             int *ftpcode);
+CURLcode Curl_ftp_nextconnect(struct connectdata *conn);
+#endif
+
+#endif
diff --git a/main/source/curl/lib/getdate.c b/main/source/curl/lib/getdate.c
new file mode 100644
index 00000000..0ea463f8
--- /dev/null
+++ b/main/source/curl/lib/getdate.c
@@ -0,0 +1,2148 @@
+
+/*  A Bison parser, made from getdate.y
+    by GNU Bison version 1.28  */
+
+#define YYBISON 1  /* Identify Bison output.  */
+
+#define	tAGO	257
+#define	tDAY	258
+#define	tDAY_UNIT	259
+#define	tDAYZONE	260
+#define	tDST	261
+#define	tHOUR_UNIT	262
+#define	tID	263
+#define	tMERIDIAN	264
+#define	tMINUTE_UNIT	265
+#define	tMONTH	266
+#define	tMONTH_UNIT	267
+#define	tSEC_UNIT	268
+#define	tSNUMBER	269
+#define	tUNUMBER	270
+#define	tYEAR_UNIT	271
+#define	tZONE	272
+
+#line 1 "getdate.y"
+
+/*
+**  Originally written by Steven M. Bellovin <smb@research.att.com> while
+**  at the University of North Carolina at Chapel Hill.  Later tweaked by
+**  a couple of people on Usenet.  Completely overhauled by Rich $alz
+**  <rsalz@bbn.com> and Jim Berets <jberets@bbn.com> in August, 1990.
+**
+**  This code is in the public domain and has no copyright.
+*/
+
+#include "setup.h"
+
+# ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+# endif
+
+# ifdef HAVE_TIME_H
+#  include <time.h>
+# endif
+
+#ifndef YYDEBUG
+  /* to satisfy gcc -Wundef, we set this to 0 */
+#define YYDEBUG 0
+#endif
+
+/* Since the code of getdate.y is not included in the Emacs executable
+   itself, there is no need to #define static in this file.  Even if
+   the code were included in the Emacs executable, it probably
+   wouldn't do any harm to #undef it here; this will only cause
+   problems if we try to write to a static variable, which I don't
+   think this code needs to do.  */
+#ifdef emacs
+# undef static
+#endif
+
+#ifdef __APPLE__
+#include <sys/types.h>
+#include <sys/malloc.h>
+#else
+
+#endif
+#include <string.h>
+#include <stdio.h>
+
+#if HAVE_STDLIB_H
+# include <stdlib.h> /* for `free'; used by Bison 1.27 */
+#else
+
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
+
+#endif
+
+#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
+# define IN_CTYPE_DOMAIN(c) 1
+#else
+# define IN_CTYPE_DOMAIN(c) isascii(c)
+#endif
+
+#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c))
+#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (c))
+#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (c))
+#define ISDIGIT_LOCALE(c) (IN_CTYPE_DOMAIN (c) && isdigit (c))
+
+/* ISDIGIT differs from ISDIGIT_LOCALE, as follows:
+   - Its arg may be any int or unsigned int; it need not be an unsigned char.
+   - It's guaranteed to evaluate its argument exactly once.
+   - It's typically faster.
+   Posix 1003.2-1992 section 2.5.2.1 page 50 lines 1556-1558 says that
+   only '0' through '9' are digits.  Prefer ISDIGIT to ISDIGIT_LOCALE unless
+   it's important to use the locale's definition of `digit' even when the
+   host does not conform to Posix.  */
+#define ISDIGIT(c) ((unsigned) (c) - '0' <= 9)
+
+#if defined (STDC_HEADERS) || defined (USG)
+# include <string.h>
+#endif
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+# define __attribute__(x)
+#endif
+
+#ifndef ATTRIBUTE_UNUSED
+# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+#endif
+
+/* Some old versions of bison generate parsers that use bcopy.
+   That loses on systems that don't provide the function, so we have
+   to redefine it here.  */
+#if !defined (HAVE_BCOPY) && defined (HAVE_MEMCPY) && !defined (bcopy)
+# define bcopy(from, to, len) memcpy ((to), (from), (len))
+#endif
+
+/* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc),
+   as well as gratuitiously global symbol names, so we can have multiple
+   yacc generated parsers in the same program.  Note that these are only
+   the variables produced by yacc.  If other parser generators (bison,
+   byacc, etc) produce additional global names that conflict at link time,
+   then those parser generators need to be fixed instead of adding those
+   names to this list. */
+
+#define yymaxdepth Curl_gd_maxdepth
+#define yyparse Curl_gd_parse
+#define yylex   Curl_gd_lex
+#define yyerror Curl_gd_error
+#define yylval  Curl_gd_lval
+#define yychar  Curl_gd_char
+#define yydebug Curl_gd_debug
+#define yypact  Curl_gd_pact
+#define yyr1    Curl_gd_r1
+#define yyr2    Curl_gd_r2
+#define yydef   Curl_gd_def
+#define yychk   Curl_gd_chk
+#define yypgo   Curl_gd_pgo
+#define yyact   Curl_gd_act
+#define yyexca  Curl_gd_exca
+#define yyerrflag Curl_gd_errflag
+#define yynerrs Curl_gd_nerrs
+#define yyps    Curl_gd_ps
+#define yypv    Curl_gd_pv
+#define yys     Curl_gd_s
+#define yy_yys  Curl_gd_yys
+#define yystate Curl_gd_state
+#define yytmp   Curl_gd_tmp
+#define yyv     Curl_gd_v
+#define yy_yyv  Curl_gd_yyv
+#define yyval   Curl_gd_val
+#define yylloc  Curl_gd_lloc
+#define yyreds  Curl_gd_reds          /* With YYDEBUG defined */
+#define yytoks  Curl_gd_toks          /* With YYDEBUG defined */
+#define yylhs   Curl_gd_yylhs
+#define yylen   Curl_gd_yylen
+#define yydefred Curl_gd_yydefred
+#define yydgoto Curl_gd_yydgoto
+#define yysindex Curl_gd_yysindex
+#define yyrindex Curl_gd_yyrindex
+#define yygindex Curl_gd_yygindex
+#define yytable  Curl_gd_yytable
+#define yycheck  Curl_gd_yycheck
+
+static int yylex ();
+static int yyerror ();
+
+#define EPOCH		1970
+#define HOUR(x)		((x) * 60)
+
+#define MAX_BUFF_LEN    128   /* size of buffer to read the date into */
+
+/*
+**  An entry in the lexical lookup table.
+*/
+typedef struct _TABLE {
+    const char	*name;
+    int		type;
+    int		value;
+} TABLE;
+
+
+/*
+**  Meridian:  am, pm, or 24-hour style.
+*/
+typedef enum _MERIDIAN {
+    MERam, MERpm, MER24
+} MERIDIAN;
+
+/* parse results and input string */
+typedef struct _CURL_CONTEXT {
+    const char	*yyInput;
+    int		yyDayOrdinal;
+    int		yyDayNumber;
+    int		yyHaveDate;
+    int		yyHaveDay;
+    int		yyHaveRel;
+    int		yyHaveTime;
+    int		yyHaveZone;
+    int		yyTimezone;
+    int		yyDay;
+    int		yyHour;
+    int		yyMinutes;
+    int		yyMonth;
+    int		yySeconds;
+    int		yyYear;
+    MERIDIAN	yyMeridian;
+    int		yyRelDay;
+    int		yyRelHour;
+    int		yyRelMinutes;
+    int		yyRelMonth;
+    int		yyRelSeconds;
+    int		yyRelYear;
+} CURL_CONTEXT;
+
+/* enable use of extra argument to yyparse and yylex which can be used to pass
+**  in a user defined value (CURL_CONTEXT struct in our case)
+*/
+#define YYPARSE_PARAM cookie
+#define YYLEX_PARAM cookie
+#define context ((CURL_CONTEXT *) cookie)
+
+#line 215 "getdate.y"
+typedef union {
+    int			Number;
+    enum _MERIDIAN	Meridian;
+} YYSTYPE;
+#include <stdio.h>
+
+#ifndef __cplusplus
+#ifndef __STDC__
+#define const
+#endif
+#endif
+
+
+
+#define	YYFINAL		61
+#define	YYFLAG		-32768
+#define	YYNTBASE	22
+
+#define YYTRANSLATE(x) ((unsigned)(x) <= 272 ? yytranslate[x] : 32)
+
+static const char yytranslate[] = {     0,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,    20,     2,     2,    21,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,    19,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     1,     3,     4,     5,     6,
+     7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+    17,    18
+};
+
+#if YYDEBUG != 0
+static const short yyprhs[] = {     0,
+     0,     1,     4,     6,     8,    10,    12,    14,    16,    19,
+    24,    29,    36,    43,    45,    47,    50,    52,    55,    58,
+    62,    68,    72,    76,    79,    84,    87,    91,    94,    96,
+    99,   102,   104,   107,   110,   112,   115,   118,   120,   123,
+   126,   128,   131,   134,   136,   139,   142,   144,   146,   147
+};
+
+static const short yyrhs[] = {    -1,
+    22,    23,     0,    24,     0,    25,     0,    27,     0,    26,
+     0,    28,     0,    30,     0,    16,    10,     0,    16,    19,
+    16,    31,     0,    16,    19,    16,    15,     0,    16,    19,
+    16,    19,    16,    31,     0,    16,    19,    16,    19,    16,
+    15,     0,    18,     0,     6,     0,    18,     7,     0,     4,
+     0,     4,    20,     0,    16,     4,     0,    16,    21,    16,
+     0,    16,    21,    16,    21,    16,     0,    16,    15,    15,
+     0,    16,    12,    15,     0,    12,    16,     0,    12,    16,
+    20,    16,     0,    16,    12,     0,    16,    12,    16,     0,
+    29,     3,     0,    29,     0,    16,    17,     0,    15,    17,
+     0,    17,     0,    16,    13,     0,    15,    13,     0,    13,
+     0,    16,     5,     0,    15,     5,     0,     5,     0,    16,
+     8,     0,    15,     8,     0,     8,     0,    16,    11,     0,
+    15,    11,     0,    11,     0,    16,    14,     0,    15,    14,
+     0,    14,     0,    16,     0,     0,    10,     0
+};
+
+#endif
+
+#if YYDEBUG != 0
+static const short yyrline[] = { 0,
+   231,   232,   235,   238,   241,   244,   247,   250,   253,   259,
+   265,   274,   280,   292,   295,   298,   304,   308,   312,   318,
+   322,   340,   346,   352,   356,   361,   365,   372,   380,   383,
+   386,   389,   392,   395,   398,   401,   404,   407,   410,   413,
+   416,   419,   422,   425,   428,   431,   434,   439,   473,   477
+};
+#endif
+
+
+#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
+
+static const char * const yytname[] = {   "$","error","$undefined.","tAGO","tDAY",
+"tDAY_UNIT","tDAYZONE","tDST","tHOUR_UNIT","tID","tMERIDIAN","tMINUTE_UNIT",
+"tMONTH","tMONTH_UNIT","tSEC_UNIT","tSNUMBER","tUNUMBER","tYEAR_UNIT","tZONE",
+"':'","','","'/'","spec","item","time","zone","day","date","rel","relunit","number",
+"o_merid", NULL
+};
+#endif
+
+static const short yyr1[] = {     0,
+    22,    22,    23,    23,    23,    23,    23,    23,    24,    24,
+    24,    24,    24,    25,    25,    25,    26,    26,    26,    27,
+    27,    27,    27,    27,    27,    27,    27,    28,    28,    29,
+    29,    29,    29,    29,    29,    29,    29,    29,    29,    29,
+    29,    29,    29,    29,    29,    29,    29,    30,    31,    31
+};
+
+static const short yyr2[] = {     0,
+     0,     2,     1,     1,     1,     1,     1,     1,     2,     4,
+     4,     6,     6,     1,     1,     2,     1,     2,     2,     3,
+     5,     3,     3,     2,     4,     2,     3,     2,     1,     2,
+     2,     1,     2,     2,     1,     2,     2,     1,     2,     2,
+     1,     2,     2,     1,     2,     2,     1,     1,     0,     1
+};
+
+static const short yydefact[] = {     1,
+     0,    17,    38,    15,    41,    44,     0,    35,    47,     0,
+    48,    32,    14,     2,     3,     4,     6,     5,     7,    29,
+     8,    18,    24,    37,    40,    43,    34,    46,    31,    19,
+    36,    39,     9,    42,    26,    33,    45,     0,    30,     0,
+     0,    16,    28,     0,    23,    27,    22,    49,    20,    25,
+    50,    11,     0,    10,     0,    49,    21,    13,    12,     0,
+     0
+};
+
+static const short yydefgoto[] = {     1,
+    14,    15,    16,    17,    18,    19,    20,    21,    54
+};
+
+static const short yypact[] = {-32768,
+     0,   -19,-32768,-32768,-32768,-32768,   -13,-32768,-32768,    30,
+    15,-32768,    14,-32768,-32768,-32768,-32768,-32768,-32768,    19,
+-32768,-32768,     4,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,    -6,-32768,-32768,    16,-32768,    17,
+    23,-32768,-32768,    24,-32768,-32768,-32768,    27,    28,-32768,
+-32768,-32768,    29,-32768,    32,    -8,-32768,-32768,-32768,    50,
+-32768
+};
+
+static const short yypgoto[] = {-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,    -5
+};
+
+
+#define	YYLAST		51
+
+
+static const short yytable[] = {    60,
+    22,    51,    23,     2,     3,     4,    58,     5,    45,    46,
+     6,     7,     8,     9,    10,    11,    12,    13,    30,    31,
+    42,    43,    32,    44,    33,    34,    35,    36,    37,    38,
+    47,    39,    48,    40,    24,    41,    51,    25,    49,    50,
+    26,    52,    27,    28,    56,    53,    29,    57,    55,    61,
+    59
+};
+
+static const short yycheck[] = {     0,
+    20,    10,    16,     4,     5,     6,    15,     8,    15,    16,
+    11,    12,    13,    14,    15,    16,    17,    18,     4,     5,
+     7,     3,     8,    20,    10,    11,    12,    13,    14,    15,
+    15,    17,    16,    19,     5,    21,    10,     8,    16,    16,
+    11,    15,    13,    14,    16,    19,    17,    16,    21,     0,
+    56
+};
+#define YYPURE 1
+
+/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
+#line 3 "/usr/lib/bison.simple"
+/* This file comes from bison-1.28.  */
+
+/* Skeleton output parser for bison,
+   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
+
+/* This is the parser code that is written into each bison parser
+  when the %semantic_parser declaration is not specified in the grammar.
+  It was written by Richard Stallman by simplifying the hairy parser
+  used when %semantic_parser is specified.  */
+
+#ifndef YYSTACK_USE_ALLOCA
+#ifdef alloca
+#define YYSTACK_USE_ALLOCA
+#else /* alloca not defined */
+#ifdef __GNUC__
+#define YYSTACK_USE_ALLOCA
+#define alloca __builtin_alloca
+#else /* not GNU C.  */
+#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
+#define YYSTACK_USE_ALLOCA
+#include <alloca.h>
+#else /* not sparc */
+/* We think this test detects Watcom and Microsoft C.  */
+/* This used to test MSDOS, but that is a bad idea
+   since that symbol is in the user namespace.  */
+#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
+#if 0 /* No need for malloc.h, which pollutes the namespace;
+	 instead, just don't use alloca.  */
+#include <malloc.h>
+#endif
+#else /* not MSDOS, or __TURBOC__ */
+#if defined(_AIX)
+/* I don't know what this was needed for, but it pollutes the namespace.
+   So I turned it off.   rms, 2 May 1997.  */
+/* #include <malloc.h>  */
+ #pragma alloca
+#define YYSTACK_USE_ALLOCA
+#else /* not MSDOS, or __TURBOC__, or _AIX */
+#if 0
+#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
+		 and on HPUX 10.  Eventually we can turn this on.  */
+#define YYSTACK_USE_ALLOCA
+#define alloca __builtin_alloca
+#endif /* __hpux */
+#endif
+#endif /* not _AIX */
+#endif /* not MSDOS, or __TURBOC__ */
+#endif /* not sparc */
+#endif /* not GNU C */
+#endif /* alloca not defined */
+#endif /* YYSTACK_USE_ALLOCA not defined */
+
+#ifdef YYSTACK_USE_ALLOCA
+#define YYSTACK_ALLOC alloca
+#else
+#define YYSTACK_ALLOC malloc
+#endif
+
+/* Note: there must be only one dollar sign in this file.
+   It is replaced by the list of actions, each action
+   as one case of the switch.  */
+
+#define yyerrok		(yyerrstatus = 0)
+#define yyclearin	(yychar = YYEMPTY)
+#define YYEMPTY		-2
+#define YYEOF		0
+#define YYACCEPT	goto yyacceptlab
+#define YYABORT 	goto yyabortlab
+#define YYERROR		goto yyerrlab1
+/* Like YYERROR except do call yyerror.
+   This remains here temporarily to ease the
+   transition to the new meaning of YYERROR, for GCC.
+   Once GCC version 2 has supplanted version 1, this can go.  */
+#define YYFAIL		goto yyerrlab
+#define YYRECOVERING()  (!!yyerrstatus)
+#define YYBACKUP(token, value) \
+do								\
+  if (yychar == YYEMPTY && yylen == 1)				\
+    { yychar = (token), yylval = (value);			\
+      yychar1 = YYTRANSLATE (yychar);				\
+      YYPOPSTACK;						\
+      goto yybackup;						\
+    }								\
+  else								\
+    { yyerror ("syntax error: cannot back up"); YYERROR; }	\
+while (0)
+
+#define YYTERROR	1
+#define YYERRCODE	256
+
+#ifndef YYPURE
+#define YYLEX		yylex()
+#endif
+
+#ifdef YYPURE
+#ifdef YYLSP_NEEDED
+#ifdef YYLEX_PARAM
+#define YYLEX		yylex(&yylval, &yylloc, YYLEX_PARAM)
+#else
+#define YYLEX		yylex(&yylval, &yylloc)
+#endif
+#else /* not YYLSP_NEEDED */
+#ifdef YYLEX_PARAM
+#define YYLEX		yylex(&yylval, YYLEX_PARAM)
+#else
+#define YYLEX		yylex(&yylval)
+#endif
+#endif /* not YYLSP_NEEDED */
+#endif
+
+/* If nonreentrant, generate the variables here */
+
+#ifndef YYPURE
+
+int	yychar;			/*  the lookahead symbol		*/
+YYSTYPE	yylval;			/*  the semantic value of the		*/
+				/*  lookahead symbol			*/
+
+#ifdef YYLSP_NEEDED
+YYLTYPE yylloc;			/*  location data for the lookahead	*/
+				/*  symbol				*/
+#endif
+
+int yynerrs;			/*  number of parse errors so far       */
+#endif  /* not YYPURE */
+
+#if YYDEBUG != 0
+int yydebug;			/*  nonzero means print parse trace	*/
+/* Since this is uninitialized, it does not stop multiple parsers
+   from coexisting.  */
+#endif
+
+/*  YYINITDEPTH indicates the initial size of the parser's stacks	*/
+
+#ifndef	YYINITDEPTH
+#define YYINITDEPTH 200
+#endif
+
+/*  YYMAXDEPTH is the maximum size the stacks can grow to
+    (effective only if the built-in stack extension method is used).  */
+
+#if YYMAXDEPTH == 0
+#undef YYMAXDEPTH
+#endif
+
+#ifndef YYMAXDEPTH
+#define YYMAXDEPTH 10000
+#endif
+
+/* Define __yy_memcpy.  Note that the size argument
+   should be passed with type unsigned int, because that is what the non-GCC
+   definitions require.  With GCC, __builtin_memcpy takes an arg
+   of type size_t, but it can handle unsigned int.  */
+
+#if __GNUC__ > 1		/* GNU C and GNU C++ define this.  */
+#define __yy_memcpy(TO,FROM,COUNT)	__builtin_memcpy(TO,FROM,COUNT)
+#else				/* not GNU C or C++ */
+#ifndef __cplusplus
+
+/* This is the most reliable way to avoid incompatibilities
+   in available built-in functions on various systems.  */
+static void
+__yy_memcpy (to, from, count)
+     char *to;
+     char *from;
+     unsigned int count;
+{
+  register char *f = from;
+  register char *t = to;
+  register int i = count;
+
+  while (i-- > 0)
+    *t++ = *f++;
+}
+
+#else /* __cplusplus */
+
+/* This is the most reliable way to avoid incompatibilities
+   in available built-in functions on various systems.  */
+static void
+__yy_memcpy (char *to, char *from, unsigned int count)
+{
+  register char *t = to;
+  register char *f = from;
+  register int i = count;
+
+  while (i-- > 0)
+    *t++ = *f++;
+}
+
+#endif
+#endif
+
+#line 217 "/usr/lib/bison.simple"
+
+/* The user can define YYPARSE_PARAM as the name of an argument to be passed
+   into yyparse.  The argument should have type void *.
+   It should actually point to an object.
+   Grammar actions can access the variable by casting it
+   to the proper pointer type.  */
+
+#ifdef YYPARSE_PARAM
+#ifdef __cplusplus
+#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
+#define YYPARSE_PARAM_DECL
+#else /* not __cplusplus */
+#define YYPARSE_PARAM_ARG YYPARSE_PARAM
+#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
+#endif /* not __cplusplus */
+#else /* not YYPARSE_PARAM */
+#define YYPARSE_PARAM_ARG
+#define YYPARSE_PARAM_DECL
+#endif /* not YYPARSE_PARAM */
+
+/* Prevent warning if -Wstrict-prototypes.  */
+#ifdef __GNUC__
+#ifdef YYPARSE_PARAM
+int yyparse (void *);
+#else
+int yyparse (void);
+#endif
+#endif
+
+int
+yyparse(YYPARSE_PARAM_ARG)
+     YYPARSE_PARAM_DECL
+{
+  register int yystate;
+  register int yyn;
+  register short *yyssp;
+  register YYSTYPE *yyvsp;
+  int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
+  int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
+
+  short	yyssa[YYINITDEPTH];	/*  the state stack			*/
+  YYSTYPE yyvsa[YYINITDEPTH];	/*  the semantic value stack		*/
+
+  short *yyss = yyssa;		/*  refer to the stacks thru separate pointers */
+  YYSTYPE *yyvs = yyvsa;	/*  to allow yyoverflow to reallocate them elsewhere */
+
+#ifdef YYLSP_NEEDED
+  YYLTYPE yylsa[YYINITDEPTH];	/*  the location stack			*/
+  YYLTYPE *yyls = yylsa;
+  YYLTYPE *yylsp;
+
+#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
+#else
+#define YYPOPSTACK   (yyvsp--, yyssp--)
+#endif
+
+  int yystacksize = YYINITDEPTH;
+  int yyfree_stacks = 0;
+
+#ifdef YYPURE
+  int yychar;
+  YYSTYPE yylval;
+  int yynerrs;
+#ifdef YYLSP_NEEDED
+  YYLTYPE yylloc;
+#endif
+#endif
+
+  YYSTYPE yyval;		/*  the variable used to return		*/
+				/*  semantic values from the action	*/
+				/*  routines				*/
+
+  int yylen;
+
+#if YYDEBUG != 0
+  if (yydebug)
+    fprintf(stderr, "Starting parse\n");
+#endif
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY;		/* Cause a token to be read.  */
+
+  /* Initialize stack pointers.
+     Waste one element of value and location stack
+     so that they stay on the same level as the state stack.
+     The wasted elements are never initialized.  */
+
+  yyssp = yyss - 1;
+  yyvsp = yyvs;
+#ifdef YYLSP_NEEDED
+  yylsp = yyls;
+#endif
+
+/* Push a new state, which is found in  yystate  .  */
+/* In all cases, when you get here, the value and location stacks
+   have just been pushed. so pushing a state here evens the stacks.  */
+yynewstate:
+
+  *++yyssp = yystate;
+
+  if (yyssp >= yyss + yystacksize - 1)
+    {
+      /* Give user a chance to reallocate the stack */
+      /* Use copies of these so that the &'s don't force the real ones into memory. */
+      YYSTYPE *yyvs1 = yyvs;
+      short *yyss1 = yyss;
+#ifdef YYLSP_NEEDED
+      YYLTYPE *yyls1 = yyls;
+#endif
+
+      /* Get the current used size of the three stacks, in elements.  */
+      int size = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      /* Each stack pointer address is followed by the size of
+	 the data in use in that stack, in bytes.  */
+#ifdef YYLSP_NEEDED
+      /* This used to be a conditional around just the two extra args,
+	 but that might be undefined if yyoverflow is a macro.  */
+      yyoverflow("parser stack overflow",
+		 &yyss1, size * sizeof (*yyssp),
+		 &yyvs1, size * sizeof (*yyvsp),
+		 &yyls1, size * sizeof (*yylsp),
+		 &yystacksize);
+#else
+      yyoverflow("parser stack overflow",
+		 &yyss1, size * sizeof (*yyssp),
+		 &yyvs1, size * sizeof (*yyvsp),
+		 &yystacksize);
+#endif
+
+      yyss = yyss1; yyvs = yyvs1;
+#ifdef YYLSP_NEEDED
+      yyls = yyls1;
+#endif
+#else /* no yyoverflow */
+      /* Extend the stack our own way.  */
+      if (yystacksize >= YYMAXDEPTH)
+	{
+	  yyerror("parser stack overflow");
+	  if (yyfree_stacks)
+	    {
+	      free (yyss);
+	      free (yyvs);
+#ifdef YYLSP_NEEDED
+	      free (yyls);
+#endif
+	    }
+	  return 2;
+	}
+      yystacksize *= 2;
+      if (yystacksize > YYMAXDEPTH)
+	yystacksize = YYMAXDEPTH;
+#ifndef YYSTACK_USE_ALLOCA
+      yyfree_stacks = 1;
+#endif
+      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
+      __yy_memcpy ((char *)yyss, (char *)yyss1,
+		   size * (unsigned int) sizeof (*yyssp));
+      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
+      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
+		   size * (unsigned int) sizeof (*yyvsp));
+#ifdef YYLSP_NEEDED
+      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
+      __yy_memcpy ((char *)yyls, (char *)yyls1,
+		   size * (unsigned int) sizeof (*yylsp));
+#endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + size - 1;
+      yyvsp = yyvs + size - 1;
+#ifdef YYLSP_NEEDED
+      yylsp = yyls + size - 1;
+#endif
+
+#if YYDEBUG != 0
+      if (yydebug)
+	fprintf(stderr, "Stack size increased to %d\n", yystacksize);
+#endif
+
+      if (yyssp >= yyss + yystacksize - 1)
+	YYABORT;
+    }
+
+#if YYDEBUG != 0
+  if (yydebug)
+    fprintf(stderr, "Entering state %d\n", yystate);
+#endif
+
+  goto yybackup;
+ yybackup:
+
+/* Do appropriate processing given the current state.  */
+/* Read a lookahead token if we need one and don't already have one.  */
+/* yyresume: */
+
+  /* First try to decide what to do without reference to lookahead token.  */
+
+  yyn = yypact[yystate];
+  if (yyn == YYFLAG)
+    goto yydefault;
+
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* yychar is either YYEMPTY or YYEOF
+     or a valid token in external form.  */
+
+  if (yychar == YYEMPTY)
+    {
+#if YYDEBUG != 0
+      if (yydebug)
+	fprintf(stderr, "Reading a token: ");
+#endif
+      yychar = YYLEX;
+    }
+
+  /* Convert token to internal form (in yychar1) for indexing tables with */
+
+  if (yychar <= 0)		/* This means end of input. */
+    {
+      yychar1 = 0;
+      yychar = YYEOF;		/* Don't call YYLEX any more */
+
+#if YYDEBUG != 0
+      if (yydebug)
+	fprintf(stderr, "Now at end of input.\n");
+#endif
+    }
+  else
+    {
+      yychar1 = YYTRANSLATE(yychar);
+
+#if YYDEBUG != 0
+      if (yydebug)
+	{
+	  fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
+	  /* Give the individual parser a way to print the precise meaning
+	     of a token, for further debugging info.  */
+#ifdef YYPRINT
+	  YYPRINT (stderr, yychar, yylval);
+#endif
+	  fprintf (stderr, ")\n");
+	}
+#endif
+    }
+
+  yyn += yychar1;
+  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
+    goto yydefault;
+
+  yyn = yytable[yyn];
+
+  /* yyn is what to do for this token type in this state.
+     Negative => reduce, -yyn is rule number.
+     Positive => shift, yyn is new state.
+       New state is final state => don't bother to shift,
+       just return success.
+     0, or most negative number => error.  */
+
+  if (yyn < 0)
+    {
+      if (yyn == YYFLAG)
+	goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+  else if (yyn == 0)
+    goto yyerrlab;
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+  /* Shift the lookahead token.  */
+
+#if YYDEBUG != 0
+  if (yydebug)
+    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
+#endif
+
+  /* Discard the token being shifted unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
+
+  *++yyvsp = yylval;
+#ifdef YYLSP_NEEDED
+  *++yylsp = yylloc;
+#endif
+
+  /* count tokens shifted since error; after three, turn off error status.  */
+  if (yyerrstatus) yyerrstatus--;
+
+  yystate = yyn;
+  goto yynewstate;
+
+/* Do the default action for the current state.  */
+yydefault:
+
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+
+/* Do a reduction.  yyn is the number of a rule to reduce with.  */
+yyreduce:
+  yylen = yyr2[yyn];
+  if (yylen > 0)
+    yyval = yyvsp[1-yylen]; /* implement default value of the action */
+
+#if YYDEBUG != 0
+  if (yydebug)
+    {
+      int i;
+
+      fprintf (stderr, "Reducing via rule %d (line %d), ",
+	       yyn, yyrline[yyn]);
+
+      /* Print the symbols being reduced, and their result.  */
+      for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
+	fprintf (stderr, "%s ", yytname[yyrhs[i]]);
+      fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
+    }
+#endif
+
+
+  switch (yyn) {
+
+case 3:
+#line 235 "getdate.y"
+{
+	    context->yyHaveTime++;
+	;
+    break;}
+case 4:
+#line 238 "getdate.y"
+{
+	    context->yyHaveZone++;
+	;
+    break;}
+case 5:
+#line 241 "getdate.y"
+{
+	    context->yyHaveDate++;
+	;
+    break;}
+case 6:
+#line 244 "getdate.y"
+{
+	    context->yyHaveDay++;
+	;
+    break;}
+case 7:
+#line 247 "getdate.y"
+{
+	    context->yyHaveRel++;
+	;
+    break;}
+case 9:
+#line 253 "getdate.y"
+{
+	    context->yyHour = yyvsp[-1].Number;
+	    context->yyMinutes = 0;
+	    context->yySeconds = 0;
+	    context->yyMeridian = yyvsp[0].Meridian;
+	;
+    break;}
+case 10:
+#line 259 "getdate.y"
+{
+	    context->yyHour = yyvsp[-3].Number;
+	    context->yyMinutes = yyvsp[-1].Number;
+	    context->yySeconds = 0;
+	    context->yyMeridian = yyvsp[0].Meridian;
+	;
+    break;}
+case 11:
+#line 265 "getdate.y"
+{
+	    context->yyHour = yyvsp[-3].Number;
+	    context->yyMinutes = yyvsp[-1].Number;
+	    context->yyMeridian = MER24;
+	    context->yyHaveZone++;
+	    context->yyTimezone = (yyvsp[0].Number < 0
+				   ? -yyvsp[0].Number % 100 + (-yyvsp[0].Number / 100) * 60
+				   : - (yyvsp[0].Number % 100 + (yyvsp[0].Number / 100) * 60));
+	;
+    break;}
+case 12:
+#line 274 "getdate.y"
+{
+	    context->yyHour = yyvsp[-5].Number;
+	    context->yyMinutes = yyvsp[-3].Number;
+	    context->yySeconds = yyvsp[-1].Number;
+	    context->yyMeridian = yyvsp[0].Meridian;
+	;
+    break;}
+case 13:
+#line 280 "getdate.y"
+{
+	    context->yyHour = yyvsp[-5].Number;
+	    context->yyMinutes = yyvsp[-3].Number;
+	    context->yySeconds = yyvsp[-1].Number;
+	    context->yyMeridian = MER24;
+	    context->yyHaveZone++;
+	    context->yyTimezone = (yyvsp[0].Number < 0
+				   ? -yyvsp[0].Number % 100 + (-yyvsp[0].Number / 100) * 60
+				   : - (yyvsp[0].Number % 100 + (yyvsp[0].Number / 100) * 60));
+	;
+    break;}
+case 14:
+#line 292 "getdate.y"
+{
+	    context->yyTimezone = yyvsp[0].Number;
+	;
+    break;}
+case 15:
+#line 295 "getdate.y"
+{
+	    context->yyTimezone = yyvsp[0].Number - 60;
+	;
+    break;}
+case 16:
+#line 299 "getdate.y"
+{
+	    context->yyTimezone = yyvsp[-1].Number - 60;
+	;
+    break;}
+case 17:
+#line 304 "getdate.y"
+{
+	    context->yyDayOrdinal = 1;
+	    context->yyDayNumber = yyvsp[0].Number;
+	;
+    break;}
+case 18:
+#line 308 "getdate.y"
+{
+	    context->yyDayOrdinal = 1;
+	    context->yyDayNumber = yyvsp[-1].Number;
+	;
+    break;}
+case 19:
+#line 312 "getdate.y"
+{
+	    context->yyDayOrdinal = yyvsp[-1].Number;
+	    context->yyDayNumber = yyvsp[0].Number;
+	;
+    break;}
+case 20:
+#line 318 "getdate.y"
+{
+	    context->yyMonth = yyvsp[-2].Number;
+	    context->yyDay = yyvsp[0].Number;
+	;
+    break;}
+case 21:
+#line 322 "getdate.y"
+{
+	  /* Interpret as YYYY/MM/DD if $1 >= 1000, otherwise as MM/DD/YY.
+	     The goal in recognizing YYYY/MM/DD is solely to support legacy
+	     machine-generated dates like those in an RCS log listing.  If
+	     you want portability, use the ISO 8601 format.  */
+	  if (yyvsp[-4].Number >= 1000)
+	    {
+	      context->yyYear = yyvsp[-4].Number;
+	      context->yyMonth = yyvsp[-2].Number;
+	      context->yyDay = yyvsp[0].Number;
+	    }
+	  else
+	    {
+	      context->yyMonth = yyvsp[-4].Number;
+	      context->yyDay = yyvsp[-2].Number;
+	      context->yyYear = yyvsp[0].Number;
+	    }
+	;
+    break;}
+case 22:
+#line 340 "getdate.y"
+{
+	    /* ISO 8601 format.  yyyy-mm-dd.  */
+	    context->yyYear = yyvsp[-2].Number;
+	    context->yyMonth = -yyvsp[-1].Number;
+	    context->yyDay = -yyvsp[0].Number;
+	;
+    break;}
+case 23:
+#line 346 "getdate.y"
+{
+	    /* e.g. 17-JUN-1992.  */
+	    context->yyDay = yyvsp[-2].Number;
+	    context->yyMonth = yyvsp[-1].Number;
+	    context->yyYear = -yyvsp[0].Number;
+	;
+    break;}
+case 24:
+#line 352 "getdate.y"
+{
+	    context->yyMonth = yyvsp[-1].Number;
+	    context->yyDay = yyvsp[0].Number;
+	;
+    break;}
+case 25:
+#line 356 "getdate.y"
+{
+	    context->yyMonth = yyvsp[-3].Number;
+	    context->yyDay = yyvsp[-2].Number;
+	    context->yyYear = yyvsp[0].Number;
+	;
+    break;}
+case 26:
+#line 361 "getdate.y"
+{
+	    context->yyMonth = yyvsp[0].Number;
+	    context->yyDay = yyvsp[-1].Number;
+	;
+    break;}
+case 27:
+#line 365 "getdate.y"
+{
+	    context->yyMonth = yyvsp[-1].Number;
+	    context->yyDay = yyvsp[-2].Number;
+	    context->yyYear = yyvsp[0].Number;
+	;
+    break;}
+case 28:
+#line 372 "getdate.y"
+{
+	    context->yyRelSeconds = -context->yyRelSeconds;
+	    context->yyRelMinutes = -context->yyRelMinutes;
+	    context->yyRelHour = -context->yyRelHour;
+	    context->yyRelDay = -context->yyRelDay;
+	    context->yyRelMonth = -context->yyRelMonth;
+	    context->yyRelYear = -context->yyRelYear;
+	;
+    break;}
+case 30:
+#line 383 "getdate.y"
+{
+	    context->yyRelYear += yyvsp[-1].Number * yyvsp[0].Number;
+	;
+    break;}
+case 31:
+#line 386 "getdate.y"
+{
+	    context->yyRelYear += yyvsp[-1].Number * yyvsp[0].Number;
+	;
+    break;}
+case 32:
+#line 389 "getdate.y"
+{
+	    context->yyRelYear += yyvsp[0].Number;
+	;
+    break;}
+case 33:
+#line 392 "getdate.y"
+{
+	    context->yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number;
+	;
+    break;}
+case 34:
+#line 395 "getdate.y"
+{
+	    context->yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number;
+	;
+    break;}
+case 35:
+#line 398 "getdate.y"
+{
+	    context->yyRelMonth += yyvsp[0].Number;
+	;
+    break;}
+case 36:
+#line 401 "getdate.y"
+{
+	    context->yyRelDay += yyvsp[-1].Number * yyvsp[0].Number;
+	;
+    break;}
+case 37:
+#line 404 "getdate.y"
+{
+	    context->yyRelDay += yyvsp[-1].Number * yyvsp[0].Number;
+	;
+    break;}
+case 38:
+#line 407 "getdate.y"
+{
+	    context->yyRelDay += yyvsp[0].Number;
+	;
+    break;}
+case 39:
+#line 410 "getdate.y"
+{
+	    context->yyRelHour += yyvsp[-1].Number * yyvsp[0].Number;
+	;
+    break;}
+case 40:
+#line 413 "getdate.y"
+{
+	    context->yyRelHour += yyvsp[-1].Number * yyvsp[0].Number;
+	;
+    break;}
+case 41:
+#line 416 "getdate.y"
+{
+	    context->yyRelHour += yyvsp[0].Number;
+	;
+    break;}
+case 42:
+#line 419 "getdate.y"
+{
+	    context->yyRelMinutes += yyvsp[-1].Number * yyvsp[0].Number;
+	;
+    break;}
+case 43:
+#line 422 "getdate.y"
+{
+	    context->yyRelMinutes += yyvsp[-1].Number * yyvsp[0].Number;
+	;
+    break;}
+case 44:
+#line 425 "getdate.y"
+{
+	    context->yyRelMinutes += yyvsp[0].Number;
+	;
+    break;}
+case 45:
+#line 428 "getdate.y"
+{
+	    context->yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number;
+	;
+    break;}
+case 46:
+#line 431 "getdate.y"
+{
+	    context->yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number;
+	;
+    break;}
+case 47:
+#line 434 "getdate.y"
+{
+	    context->yyRelSeconds += yyvsp[0].Number;
+	;
+    break;}
+case 48:
+#line 440 "getdate.y"
+{
+	    if (context->yyHaveTime && context->yyHaveDate &&
+		!context->yyHaveRel)
+	      context->yyYear = yyvsp[0].Number;
+	    else
+	      {
+		if (yyvsp[0].Number>10000)
+		  {
+		    context->yyHaveDate++;
+		    context->yyDay= (yyvsp[0].Number)%100;
+		    context->yyMonth= (yyvsp[0].Number/100)%100;
+		    context->yyYear = yyvsp[0].Number/10000;
+		  }
+		else
+		  {
+		    context->yyHaveTime++;
+		    if (yyvsp[0].Number < 100)
+		      {
+			context->yyHour = yyvsp[0].Number;
+			context->yyMinutes = 0;
+		      }
+		    else
+		      {
+		    	context->yyHour = yyvsp[0].Number / 100;
+		    	context->yyMinutes = yyvsp[0].Number % 100;
+		      }
+		    context->yySeconds = 0;
+		    context->yyMeridian = MER24;
+		  }
+	      }
+	  ;
+    break;}
+case 49:
+#line 474 "getdate.y"
+{
+	    yyval.Meridian = MER24;
+	  ;
+    break;}
+case 50:
+#line 478 "getdate.y"
+{
+	    yyval.Meridian = yyvsp[0].Meridian;
+	  ;
+    break;}
+}
+   /* the action file gets copied in in place of this dollarsign */
+#line 543 "/usr/lib/bison.simple"
+
+  yyvsp -= yylen;
+  yyssp -= yylen;
+#ifdef YYLSP_NEEDED
+  yylsp -= yylen;
+#endif
+
+#if YYDEBUG != 0
+  if (yydebug)
+    {
+      short *ssp1 = yyss - 1;
+      fprintf (stderr, "state stack now");
+      while (ssp1 != yyssp)
+	fprintf (stderr, " %d", *++ssp1);
+      fprintf (stderr, "\n");
+    }
+#endif
+
+  *++yyvsp = yyval;
+
+#ifdef YYLSP_NEEDED
+  yylsp++;
+  if (yylen == 0)
+    {
+      yylsp->first_line = yylloc.first_line;
+      yylsp->first_column = yylloc.first_column;
+      yylsp->last_line = (yylsp-1)->last_line;
+      yylsp->last_column = (yylsp-1)->last_column;
+      yylsp->text = 0;
+    }
+  else
+    {
+      yylsp->last_line = (yylsp+yylen-1)->last_line;
+      yylsp->last_column = (yylsp+yylen-1)->last_column;
+    }
+#endif
+
+  /* Now "shift" the result of the reduction.
+     Determine what state that goes to,
+     based on the state we popped back to
+     and the rule number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
+  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTBASE];
+
+  goto yynewstate;
+
+yyerrlab:   /* here on detecting error */
+
+  if (! yyerrstatus)
+    /* If not already recovering from an error, report this error.  */
+    {
+      ++yynerrs;
+
+#ifdef YYERROR_VERBOSE
+      yyn = yypact[yystate];
+
+      if (yyn > YYFLAG && yyn < YYLAST)
+	{
+	  int size = 0;
+	  char *msg;
+	  int x, count;
+
+	  count = 0;
+	  /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
+	  for (x = (yyn < 0 ? -yyn : 0);
+	       x < (sizeof(yytname) / sizeof(char *)); x++)
+	    if (yycheck[x + yyn] == x)
+	      size += strlen(yytname[x]) + 15, count++;
+	  msg = (char *) malloc(size + 15);
+	  if (msg != 0)
+	    {
+	      strcpy(msg, "parse error");
+
+	      if (count < 5)
+		{
+		  count = 0;
+		  for (x = (yyn < 0 ? -yyn : 0);
+		       x < (sizeof(yytname) / sizeof(char *)); x++)
+		    if (yycheck[x + yyn] == x)
+		      {
+			strcat(msg, count == 0 ? ", expecting `" : " or `");
+			strcat(msg, yytname[x]);
+			strcat(msg, "'");
+			count++;
+		      }
+		}
+	      yyerror(msg);
+	      free(msg);
+	    }
+	  else
+	    yyerror ("parse error; also virtual memory exceeded");
+	}
+      else
+#endif /* YYERROR_VERBOSE */
+	yyerror("parse error");
+    }
+
+  goto yyerrlab1;
+yyerrlab1:   /* here on error raised explicitly by an action */
+
+  if (yyerrstatus == 3)
+    {
+      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
+
+      /* return failure if at end of input */
+      if (yychar == YYEOF)
+	YYABORT;
+
+#if YYDEBUG != 0
+      if (yydebug)
+	fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
+#endif
+
+      yychar = YYEMPTY;
+    }
+
+  /* Else will try to reuse lookahead token
+     after shifting the error token.  */
+
+  yyerrstatus = 3;		/* Each real token shifted decrements this */
+
+  goto yyerrhandle;
+
+yyerrdefault:  /* current state does not do anything special for the error token. */
+
+#if 0
+  /* This is wrong; only states that explicitly want error tokens
+     should shift them.  */
+  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
+  if (yyn) goto yydefault;
+#endif
+
+yyerrpop:   /* pop the current state because it cannot handle the error token */
+
+  if (yyssp == yyss) YYABORT;
+  yyvsp--;
+  yystate = *--yyssp;
+#ifdef YYLSP_NEEDED
+  yylsp--;
+#endif
+
+#if YYDEBUG != 0
+  if (yydebug)
+    {
+      short *ssp1 = yyss - 1;
+      fprintf (stderr, "Error: state stack now");
+      while (ssp1 != yyssp)
+	fprintf (stderr, " %d", *++ssp1);
+      fprintf (stderr, "\n");
+    }
+#endif
+
+yyerrhandle:
+
+  yyn = yypact[yystate];
+  if (yyn == YYFLAG)
+    goto yyerrdefault;
+
+  yyn += YYTERROR;
+  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
+    goto yyerrdefault;
+
+  yyn = yytable[yyn];
+  if (yyn < 0)
+    {
+      if (yyn == YYFLAG)
+	goto yyerrpop;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+  else if (yyn == 0)
+    goto yyerrpop;
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+#if YYDEBUG != 0
+  if (yydebug)
+    fprintf(stderr, "Shifting error token, ");
+#endif
+
+  *++yyvsp = yylval;
+#ifdef YYLSP_NEEDED
+  *++yylsp = yylloc;
+#endif
+
+  yystate = yyn;
+  goto yynewstate;
+
+ yyacceptlab:
+  /* YYACCEPT comes here.  */
+  if (yyfree_stacks)
+    {
+      free (yyss);
+      free (yyvs);
+#ifdef YYLSP_NEEDED
+      free (yyls);
+#endif
+    }
+  return 0;
+
+ yyabortlab:
+  /* YYABORT comes here.  */
+  if (yyfree_stacks)
+    {
+      free (yyss);
+      free (yyvs);
+#ifdef YYLSP_NEEDED
+      free (yyls);
+#endif
+    }
+  return 1;
+}
+#line 483 "getdate.y"
+
+
+/* Include this file down here because bison inserts code above which
+   may define-away `const'.  We want the prototype for get_date to have
+   the same signature as the function definition does. */
+#include "getdate.h"
+
+#ifndef WIN32 /* the windows dudes don't need these, does anyone really? */
+extern struct tm	*gmtime ();
+extern struct tm	*localtime ();
+extern time_t		mktime ();
+#endif
+
+/* Month and day table. */
+static TABLE const MonthDayTable[] = {
+    { "january",	tMONTH,  1 },
+    { "february",	tMONTH,  2 },
+    { "march",		tMONTH,  3 },
+    { "april",		tMONTH,  4 },
+    { "may",		tMONTH,  5 },
+    { "june",		tMONTH,  6 },
+    { "july",		tMONTH,  7 },
+    { "august",		tMONTH,  8 },
+    { "september",	tMONTH,  9 },
+    { "sept",		tMONTH,  9 },
+    { "october",	tMONTH, 10 },
+    { "november",	tMONTH, 11 },
+    { "december",	tMONTH, 12 },
+    { "sunday",		tDAY, 0 },
+    { "monday",		tDAY, 1 },
+    { "tuesday",	tDAY, 2 },
+    { "tues",		tDAY, 2 },
+    { "wednesday",	tDAY, 3 },
+    { "wednes",		tDAY, 3 },
+    { "thursday",	tDAY, 4 },
+    { "thur",		tDAY, 4 },
+    { "thurs",		tDAY, 4 },
+    { "friday",		tDAY, 5 },
+    { "saturday",	tDAY, 6 },
+    { NULL, 0, 0 }
+};
+
+/* Time units table. */
+static TABLE const UnitsTable[] = {
+    { "year",		tYEAR_UNIT,	1 },
+    { "month",		tMONTH_UNIT,	1 },
+    { "fortnight",	tDAY_UNIT,	14 },
+    { "week",		tDAY_UNIT,	7 },
+    { "day",		tDAY_UNIT,	1 },
+    { "hour",		tHOUR_UNIT,	1 },
+    { "minute",		tMINUTE_UNIT,	1 },
+    { "min",		tMINUTE_UNIT,	1 },
+    { "second",		tSEC_UNIT,	1 },
+    { "sec",		tSEC_UNIT,	1 },
+    { NULL, 0, 0 }
+};
+
+/* Assorted relative-time words. */
+static TABLE const OtherTable[] = {
+    { "tomorrow",	tMINUTE_UNIT,	1 * 24 * 60 },
+    { "yesterday",	tMINUTE_UNIT,	-1 * 24 * 60 },
+    { "today",		tMINUTE_UNIT,	0 },
+    { "now",		tMINUTE_UNIT,	0 },
+    { "last",		tUNUMBER,	-1 },
+    { "this",		tMINUTE_UNIT,	0 },
+    { "next",		tUNUMBER,	1 },
+    { "first",		tUNUMBER,	1 },
+/*  { "second",		tUNUMBER,	2 }, */
+    { "third",		tUNUMBER,	3 },
+    { "fourth",		tUNUMBER,	4 },
+    { "fifth",		tUNUMBER,	5 },
+    { "sixth",		tUNUMBER,	6 },
+    { "seventh",	tUNUMBER,	7 },
+    { "eighth",		tUNUMBER,	8 },
+    { "ninth",		tUNUMBER,	9 },
+    { "tenth",		tUNUMBER,	10 },
+    { "eleventh",	tUNUMBER,	11 },
+    { "twelfth",	tUNUMBER,	12 },
+    { "ago",		tAGO,	1 },
+    { NULL, 0, 0 }
+};
+
+/* The timezone table. */
+static TABLE const TimezoneTable[] = {
+    { "gmt",	tZONE,     HOUR ( 0) },	/* Greenwich Mean */
+    { "ut",	tZONE,     HOUR ( 0) },	/* Universal (Coordinated) */
+    { "utc",	tZONE,     HOUR ( 0) },
+    { "wet",	tZONE,     HOUR ( 0) },	/* Western European */
+    { "bst",	tDAYZONE,  HOUR ( 0) },	/* British Summer */
+    { "wat",	tZONE,     HOUR ( 1) },	/* West Africa */
+    { "at",	tZONE,     HOUR ( 2) },	/* Azores */
+#if	0
+    /* For completeness.  BST is also British Summer, and GST is
+     * also Guam Standard. */
+    { "bst",	tZONE,     HOUR ( 3) },	/* Brazil Standard */
+    { "gst",	tZONE,     HOUR ( 3) },	/* Greenland Standard */
+#endif
+#if 0
+    { "nft",	tZONE,     HOUR (3.5) },	/* Newfoundland */
+    { "nst",	tZONE,     HOUR (3.5) },	/* Newfoundland Standard */
+    { "ndt",	tDAYZONE,  HOUR (3.5) },	/* Newfoundland Daylight */
+#endif
+    { "ast",	tZONE,     HOUR ( 4) },	/* Atlantic Standard */
+    { "adt",	tDAYZONE,  HOUR ( 4) },	/* Atlantic Daylight */
+    { "est",	tZONE,     HOUR ( 5) },	/* Eastern Standard */
+    { "edt",	tDAYZONE,  HOUR ( 5) },	/* Eastern Daylight */
+    { "cst",	tZONE,     HOUR ( 6) },	/* Central Standard */
+    { "cdt",	tDAYZONE,  HOUR ( 6) },	/* Central Daylight */
+    { "mst",	tZONE,     HOUR ( 7) },	/* Mountain Standard */
+    { "mdt",	tDAYZONE,  HOUR ( 7) },	/* Mountain Daylight */
+    { "pst",	tZONE,     HOUR ( 8) },	/* Pacific Standard */
+    { "pdt",	tDAYZONE,  HOUR ( 8) },	/* Pacific Daylight */
+    { "yst",	tZONE,     HOUR ( 9) },	/* Yukon Standard */
+    { "ydt",	tDAYZONE,  HOUR ( 9) },	/* Yukon Daylight */
+    { "hst",	tZONE,     HOUR (10) },	/* Hawaii Standard */
+    { "hdt",	tDAYZONE,  HOUR (10) },	/* Hawaii Daylight */
+    { "cat",	tZONE,     HOUR (10) },	/* Central Alaska */
+    { "ahst",	tZONE,     HOUR (10) },	/* Alaska-Hawaii Standard */
+    { "nt",	tZONE,     HOUR (11) },	/* Nome */
+    { "idlw",	tZONE,     HOUR (12) },	/* International Date Line West */
+    { "cet",	tZONE,     -HOUR (1) },	/* Central European */
+    { "met",	tZONE,     -HOUR (1) },	/* Middle European */
+    { "mewt",	tZONE,     -HOUR (1) },	/* Middle European Winter */
+    { "mest",	tDAYZONE,  -HOUR (1) },	/* Middle European Summer */
+    { "mesz",	tDAYZONE,  -HOUR (1) },	/* Middle European Summer */
+    { "swt",	tZONE,     -HOUR (1) },	/* Swedish Winter */
+    { "sst",	tDAYZONE,  -HOUR (1) },	/* Swedish Summer */
+    { "fwt",	tZONE,     -HOUR (1) },	/* French Winter */
+    { "fst",	tDAYZONE,  -HOUR (1) },	/* French Summer */
+    { "eet",	tZONE,     -HOUR (2) },	/* Eastern Europe, USSR Zone 1 */
+    { "bt",	tZONE,     -HOUR (3) },	/* Baghdad, USSR Zone 2 */
+#if 0
+    { "it",	tZONE,     -HOUR (3.5) },/* Iran */
+#endif
+    { "zp4",	tZONE,     -HOUR (4) },	/* USSR Zone 3 */
+    { "zp5",	tZONE,     -HOUR (5) },	/* USSR Zone 4 */
+#if 0
+    { "ist",	tZONE,     -HOUR (5.5) },/* Indian Standard */
+#endif
+    { "zp6",	tZONE,     -HOUR (6) },	/* USSR Zone 5 */
+#if	0
+    /* For completeness.  NST is also Newfoundland Standard, and SST is
+     * also Swedish Summer. */
+    { "nst",	tZONE,     -HOUR (6.5) },/* North Sumatra */
+    { "sst",	tZONE,     -HOUR (7) },	/* South Sumatra, USSR Zone 6 */
+#endif	/* 0 */
+    { "wast",	tZONE,     -HOUR (7) },	/* West Australian Standard */
+    { "wadt",	tDAYZONE,  -HOUR (7) },	/* West Australian Daylight */
+#if 0
+    { "jt",	tZONE,     -HOUR (7.5) },/* Java (3pm in Cronusland!) */
+#endif
+    { "cct",	tZONE,     -HOUR (8) },	/* China Coast, USSR Zone 7 */
+    { "jst",	tZONE,     -HOUR (9) },	/* Japan Standard, USSR Zone 8 */
+#if 0
+    { "cast",	tZONE,     -HOUR (9.5) },/* Central Australian Standard */
+    { "cadt",	tDAYZONE,  -HOUR (9.5) },/* Central Australian Daylight */
+#endif
+    { "east",	tZONE,     -HOUR (10) },	/* Eastern Australian Standard */
+    { "eadt",	tDAYZONE,  -HOUR (10) },	/* Eastern Australian Daylight */
+    { "gst",	tZONE,     -HOUR (10) },	/* Guam Standard, USSR Zone 9 */
+    { "nzt",	tZONE,     -HOUR (12) },	/* New Zealand */
+    { "nzst",	tZONE,     -HOUR (12) },	/* New Zealand Standard */
+    { "nzdt",	tDAYZONE,  -HOUR (12) },	/* New Zealand Daylight */
+    { "idle",	tZONE,     -HOUR (12) },	/* International Date Line East */
+    {  NULL, 0, 0  }
+};
+
+/* Military timezone table. */
+static TABLE const MilitaryTable[] = {
+    { "a",	tZONE,	HOUR (  1) },
+    { "b",	tZONE,	HOUR (  2) },
+    { "c",	tZONE,	HOUR (  3) },
+    { "d",	tZONE,	HOUR (  4) },
+    { "e",	tZONE,	HOUR (  5) },
+    { "f",	tZONE,	HOUR (  6) },
+    { "g",	tZONE,	HOUR (  7) },
+    { "h",	tZONE,	HOUR (  8) },
+    { "i",	tZONE,	HOUR (  9) },
+    { "k",	tZONE,	HOUR ( 10) },
+    { "l",	tZONE,	HOUR ( 11) },
+    { "m",	tZONE,	HOUR ( 12) },
+    { "n",	tZONE,	HOUR (- 1) },
+    { "o",	tZONE,	HOUR (- 2) },
+    { "p",	tZONE,	HOUR (- 3) },
+    { "q",	tZONE,	HOUR (- 4) },
+    { "r",	tZONE,	HOUR (- 5) },
+    { "s",	tZONE,	HOUR (- 6) },
+    { "t",	tZONE,	HOUR (- 7) },
+    { "u",	tZONE,	HOUR (- 8) },
+    { "v",	tZONE,	HOUR (- 9) },
+    { "w",	tZONE,	HOUR (-10) },
+    { "x",	tZONE,	HOUR (-11) },
+    { "y",	tZONE,	HOUR (-12) },
+    { "z",	tZONE,	HOUR (  0) },
+    { NULL, 0, 0 }
+};
+
+
+
+
+/* ARGSUSED */
+static int
+yyerror (s)
+     char *s ATTRIBUTE_UNUSED;
+{
+  return 0;
+}
+
+static int
+ToHour (Hours, Meridian)
+     int Hours;
+     MERIDIAN Meridian;
+{
+  switch (Meridian)
+    {
+    case MER24:
+      if (Hours < 0 || Hours > 23)
+	return -1;
+      return Hours;
+    case MERam:
+      if (Hours < 1 || Hours > 12)
+	return -1;
+      if (Hours == 12)
+	Hours = 0;
+      return Hours;
+    case MERpm:
+      if (Hours < 1 || Hours > 12)
+	return -1;
+      if (Hours == 12)
+	Hours = 0;
+      return Hours + 12;
+    default:
+      abort ();
+    }
+  /* NOTREACHED */
+}
+
+static int
+ToYear (Year)
+     int Year;
+{
+  if (Year < 0)
+    Year = -Year;
+
+  /* XPG4 suggests that years 00-68 map to 2000-2068, and
+     years 69-99 map to 1969-1999.  */
+  if (Year < 69)
+    Year += 2000;
+  else if (Year < 100)
+    Year += 1900;
+
+  return Year;
+}
+
+static int
+LookupWord (yylval, buff)
+     YYSTYPE *yylval;
+     char *buff;
+{
+  register char *p;
+  register char *q;
+  register const TABLE *tp;
+  int i;
+  int abbrev;
+
+  /* Make it lowercase. */
+  for (p = buff; *p; p++)
+    if (ISUPPER ((unsigned char) *p))
+      *p = tolower (*p);
+
+  if (strcmp (buff, "am") == 0 || strcmp (buff, "a.m.") == 0)
+    {
+      yylval->Meridian = MERam;
+      return tMERIDIAN;
+    }
+  if (strcmp (buff, "pm") == 0 || strcmp (buff, "p.m.") == 0)
+    {
+      yylval->Meridian = MERpm;
+      return tMERIDIAN;
+    }
+
+  /* See if we have an abbreviation for a month. */
+  if (strlen (buff) == 3)
+    abbrev = 1;
+  else if (strlen (buff) == 4 && buff[3] == '.')
+    {
+      abbrev = 1;
+      buff[3] = '\0';
+    }
+  else
+    abbrev = 0;
+
+  for (tp = MonthDayTable; tp->name; tp++)
+    {
+      if (abbrev)
+	{
+	  if (strncmp (buff, tp->name, 3) == 0)
+	    {
+	      yylval->Number = tp->value;
+	      return tp->type;
+	    }
+	}
+      else if (strcmp (buff, tp->name) == 0)
+	{
+	  yylval->Number = tp->value;
+	  return tp->type;
+	}
+    }
+
+  for (tp = TimezoneTable; tp->name; tp++)
+    if (strcmp (buff, tp->name) == 0)
+      {
+	yylval->Number = tp->value;
+	return tp->type;
+      }
+
+  if (strcmp (buff, "dst") == 0)
+    return tDST;
+
+  for (tp = UnitsTable; tp->name; tp++)
+    if (strcmp (buff, tp->name) == 0)
+      {
+	yylval->Number = tp->value;
+	return tp->type;
+      }
+
+  /* Strip off any plural and try the units table again. */
+  i = strlen (buff) - 1;
+  if (buff[i] == 's')
+    {
+      buff[i] = '\0';
+      for (tp = UnitsTable; tp->name; tp++)
+	if (strcmp (buff, tp->name) == 0)
+	  {
+	    yylval->Number = tp->value;
+	    return tp->type;
+	  }
+      buff[i] = 's';		/* Put back for "this" in OtherTable. */
+    }
+
+  for (tp = OtherTable; tp->name; tp++)
+    if (strcmp (buff, tp->name) == 0)
+      {
+	yylval->Number = tp->value;
+	return tp->type;
+      }
+
+  /* Military timezones. */
+  if (buff[1] == '\0' && ISALPHA ((unsigned char) *buff))
+    {
+      for (tp = MilitaryTable; tp->name; tp++)
+	if (strcmp (buff, tp->name) == 0)
+	  {
+	    yylval->Number = tp->value;
+	    return tp->type;
+	  }
+    }
+
+  /* Drop out any periods and try the timezone table again. */
+  for (i = 0, p = q = buff; *q; q++)
+    if (*q != '.')
+      *p++ = *q;
+    else
+      i++;
+  *p = '\0';
+  if (i)
+    for (tp = TimezoneTable; tp->name; tp++)
+      if (strcmp (buff, tp->name) == 0)
+	{
+	  yylval->Number = tp->value;
+	  return tp->type;
+	}
+
+  return tID;
+}
+
+static int
+yylex (yylval, cookie)
+     YYSTYPE *yylval;
+     void *cookie;
+{
+  register unsigned char c;
+  register char *p;
+  char buff[20];
+  int Count;
+  int sign;
+
+  for (;;)
+    {
+      while (ISSPACE ((unsigned char) *context->yyInput))
+	context->yyInput++;
+
+      if (ISDIGIT (c = *context->yyInput) || c == '-' || c == '+')
+	{
+	  if (c == '-' || c == '+')
+	    {
+	      sign = c == '-' ? -1 : 1;
+	      if (!ISDIGIT (*++context->yyInput))
+		/* skip the '-' sign */
+		continue;
+	    }
+	  else
+	    sign = 0;
+	  for (yylval->Number = 0; ISDIGIT (c = *context->yyInput++);)
+	    yylval->Number = 10 * yylval->Number + c - '0';
+	  context->yyInput--;
+	  if (sign < 0)
+	    yylval->Number = -yylval->Number;
+	  return sign ? tSNUMBER : tUNUMBER;
+	}
+      if (ISALPHA (c))
+	{
+	  for (p = buff; (c = *context->yyInput++, ISALPHA (c)) || c == '.';)
+	    if (p < &buff[sizeof buff - 1])
+	      *p++ = c;
+	  *p = '\0';
+	  context->yyInput--;
+	  return LookupWord (yylval, buff);
+	}
+      if (c != '(')
+	return *context->yyInput++;
+      Count = 0;
+      do
+	{
+	  c = *context->yyInput++;
+	  if (c == '\0')
+	    return c;
+	  if (c == '(')
+	    Count++;
+	  else if (c == ')')
+	    Count--;
+	}
+      while (Count > 0);
+    }
+}
+
+#define TM_YEAR_ORIGIN 1900
+
+/* Yield A - B, measured in seconds.  */
+static long
+difftm (struct tm *a, struct tm *b)
+{
+  int ay = a->tm_year + (TM_YEAR_ORIGIN - 1);
+  int by = b->tm_year + (TM_YEAR_ORIGIN - 1);
+  long days = (
+  /* difference in day of year */
+		a->tm_yday - b->tm_yday
+  /* + intervening leap days */
+		+ ((ay >> 2) - (by >> 2))
+		- (ay / 100 - by / 100)
+		+ ((ay / 100 >> 2) - (by / 100 >> 2))
+  /* + difference in years * 365 */
+		+ (long) (ay - by) * 365
+  );
+  return (60 * (60 * (24 * days + (a->tm_hour - b->tm_hour))
+		+ (a->tm_min - b->tm_min))
+	  + (a->tm_sec - b->tm_sec));
+}
+
+time_t
+curl_getdate (const char *p, const time_t *now)
+{
+  struct tm tm, tm0, *tmp;
+  time_t Start;
+  CURL_CONTEXT cookie;
+#ifdef HAVE_LOCALTIME_R
+  struct tm keeptime;
+#endif
+  cookie.yyInput = p;
+  Start = now ? *now : time ((time_t *) NULL);
+#ifdef HAVE_LOCALTIME_R
+  tmp = (struct tm *)localtime_r(&Start, &keeptime);
+#else
+  tmp = localtime (&Start);
+#endif
+  if (!tmp)
+    return -1;
+  cookie.yyYear = tmp->tm_year + TM_YEAR_ORIGIN;
+  cookie.yyMonth = tmp->tm_mon + 1;
+  cookie.yyDay = tmp->tm_mday;
+  cookie.yyHour = tmp->tm_hour;
+  cookie.yyMinutes = tmp->tm_min;
+  cookie.yySeconds = tmp->tm_sec;
+  tm.tm_isdst = tmp->tm_isdst;
+  cookie.yyMeridian = MER24;
+  cookie.yyRelSeconds = 0;
+  cookie.yyRelMinutes = 0;
+  cookie.yyRelHour = 0;
+  cookie.yyRelDay = 0;
+  cookie.yyRelMonth = 0;
+  cookie.yyRelYear = 0;
+  cookie.yyHaveDate = 0;
+  cookie.yyHaveDay = 0;
+  cookie.yyHaveRel = 0;
+  cookie.yyHaveTime = 0;
+  cookie.yyHaveZone = 0;
+
+  if (yyparse (&cookie)
+      || cookie.yyHaveTime > 1 || cookie.yyHaveZone > 1 ||
+      cookie.yyHaveDate > 1 || cookie.yyHaveDay > 1)
+    return -1;
+
+  tm.tm_year = ToYear (cookie.yyYear) - TM_YEAR_ORIGIN + cookie.yyRelYear;
+  tm.tm_mon = cookie.yyMonth - 1 + cookie.yyRelMonth;
+  tm.tm_mday = cookie.yyDay + cookie.yyRelDay;
+  if (cookie.yyHaveTime ||
+      (cookie.yyHaveRel && !cookie.yyHaveDate && !cookie.yyHaveDay))
+    {
+      tm.tm_hour = ToHour (cookie.yyHour, cookie.yyMeridian);
+      if (tm.tm_hour < 0)
+	return -1;
+      tm.tm_min = cookie.yyMinutes;
+      tm.tm_sec = cookie.yySeconds;
+    }
+  else
+    {
+      tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
+    }
+  tm.tm_hour += cookie.yyRelHour;
+  tm.tm_min += cookie.yyRelMinutes;
+  tm.tm_sec += cookie.yyRelSeconds;
+
+  /* Let mktime deduce tm_isdst if we have an absolute timestamp,
+     or if the relative timestamp mentions days, months, or years.  */
+  if (cookie.yyHaveDate | cookie.yyHaveDay | cookie.yyHaveTime |
+      cookie.yyRelDay | cookie.yyRelMonth | cookie.yyRelYear)
+    tm.tm_isdst = -1;
+
+  tm0 = tm;
+
+  Start = mktime (&tm);
+
+  if (Start == (time_t) -1)
+    {
+
+      /* Guard against falsely reporting errors near the time_t boundaries
+         when parsing times in other time zones.  For example, if the min
+         time_t value is 1970-01-01 00:00:00 UTC and we are 8 hours ahead
+         of UTC, then the min localtime value is 1970-01-01 08:00:00; if
+         we apply mktime to 1970-01-01 00:00:00 we will get an error, so
+         we apply mktime to 1970-01-02 08:00:00 instead and adjust the time
+         zone by 24 hours to compensate.  This algorithm assumes that
+         there is no DST transition within a day of the time_t boundaries.  */
+      if (cookie.yyHaveZone)
+	{
+	  tm = tm0;
+	  if (tm.tm_year <= EPOCH - TM_YEAR_ORIGIN)
+	    {
+	      tm.tm_mday++;
+	      cookie.yyTimezone -= 24 * 60;
+	    }
+	  else
+	    {
+	      tm.tm_mday--;
+	      cookie.yyTimezone += 24 * 60;
+	    }
+	  Start = mktime (&tm);
+	}
+
+      if (Start == (time_t) -1)
+	return Start;
+    }
+
+  if (cookie.yyHaveDay && !cookie.yyHaveDate)
+    {
+      tm.tm_mday += ((cookie.yyDayNumber - tm.tm_wday + 7) % 7
+		     + 7 * (cookie.yyDayOrdinal - (0 < cookie.yyDayOrdinal)));
+      Start = mktime (&tm);
+      if (Start == (time_t) -1)
+	return Start;
+    }
+
+  if (cookie.yyHaveZone)
+    {
+      long delta;
+      struct tm *gmt;
+#ifdef HAVE_GMTIME_R
+      /* thread-safe version */
+      struct tm keeptime;
+      gmt = (struct tm *)gmtime_r(&Start, &keeptime);
+#else
+      gmt = gmtime(&Start);
+#endif
+      if (!gmt)
+	return -1;
+      delta = cookie.yyTimezone * 60L + difftm (&tm, gmt);
+      if ((Start + delta < Start) != (delta < 0))
+	return -1;		/* time_t overflow */
+      Start += delta;
+    }
+
+  return Start;
+}
+
+#if	defined (TEST)
+
+/* ARGSUSED */
+int
+main (ac, av)
+     int ac;
+     char *av[];
+{
+  char buff[MAX_BUFF_LEN + 1];
+  time_t d;
+
+  (void) printf ("Enter date, or blank line to exit.\n\t> ");
+  (void) fflush (stdout);
+
+  buff[MAX_BUFF_LEN] = 0;
+  while (fgets (buff, MAX_BUFF_LEN, stdin) && buff[0])
+    {
+      d = curl_getdate (buff, (time_t *) NULL);
+      if (d == -1)
+	(void) printf ("Bad format - couldn't convert.\n");
+      else
+	(void) printf ("%s", ctime (&d));
+      (void) printf ("\t> ");
+      (void) fflush (stdout);
+    }
+  exit (0);
+  /* NOTREACHED */
+}
+#endif /* defined (TEST) */
diff --git a/main/source/curl/lib/getdate.h b/main/source/curl/lib/getdate.h
new file mode 100644
index 00000000..e37bee8b
--- /dev/null
+++ b/main/source/curl/lib/getdate.h
@@ -0,0 +1,40 @@
+/*
+**  Originally written by Steven M. Bellovin <smb@research.att.com> while
+**  at the University of North Carolina at Chapel Hill.  Later tweaked by
+**  a couple of people on Usenet.  Completely overhauled by Rich $alz
+**  <rsalz@bbn.com> and Jim Berets <jberets@bbn.com> in August, 1990.
+**
+**  This code is in the public domain and has no copyright.
+*/
+
+# include "setup.h"
+#ifndef __linux__
+#include <ctype.h>
+#endif
+
+#ifndef PARAMS
+# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif
+#endif
+
+#ifdef vms
+# include <types.h>
+# include <time.h>
+#else
+# include <sys/types.h>
+# if TIME_WITH_SYS_TIME
+#  include <sys/time.h>
+#  include <time.h>
+# else
+#  if HAVE_SYS_TIME_H
+#   include <sys/time.h>
+#  else
+#   include <time.h>
+#  endif
+# endif
+#endif /* defined (vms) */
+
+time_t curl_getdate PARAMS ((const char *p, const time_t *now));
diff --git a/main/source/curl/lib/getdate.y b/main/source/curl/lib/getdate.y
new file mode 100644
index 00000000..32cf76b1
--- /dev/null
+++ b/main/source/curl/lib/getdate.y
@@ -0,0 +1,1105 @@
+%{
+/*
+**  Originally written by Steven M. Bellovin <smb@research.att.com> while
+**  at the University of North Carolina at Chapel Hill.  Later tweaked by
+**  a couple of people on Usenet.  Completely overhauled by Rich $alz
+**  <rsalz@bbn.com> and Jim Berets <jberets@bbn.com> in August, 1990.
+**
+**  This code is in the public domain and has no copyright.
+*/
+
+#include "setup.h"
+
+# ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+# endif
+
+# ifdef HAVE_TIME_H
+#  include <time.h>
+# endif
+
+#ifndef YYDEBUG
+  /* to satisfy gcc -Wundef, we set this to 0 */
+#define YYDEBUG 0
+#endif
+
+/* Since the code of getdate.y is not included in the Emacs executable
+   itself, there is no need to #define static in this file.  Even if
+   the code were included in the Emacs executable, it probably
+   wouldn't do any harm to #undef it here; this will only cause
+   problems if we try to write to a static variable, which I don't
+   think this code needs to do.  */
+#ifdef emacs
+# undef static
+#endif
+
+#ifdef __APPLE__
+#include <sys/types.h>
+#include <sys/malloc.h>
+#else
+
+#endif
+#include <string.h>
+#include <stdio.h>
+#include <ctype.h>
+
+#if HAVE_STDLIB_H
+# include <stdlib.h> /* for `free'; used by Bison 1.27 */
+#else
+
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
+
+#endif
+
+#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
+# define IN_CTYPE_DOMAIN(c) 1
+#else
+# define IN_CTYPE_DOMAIN(c) isascii(c)
+#endif
+
+#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c))
+#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (c))
+#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (c))
+#define ISDIGIT_LOCALE(c) (IN_CTYPE_DOMAIN (c) && isdigit (c))
+
+/* ISDIGIT differs from ISDIGIT_LOCALE, as follows:
+   - Its arg may be any int or unsigned int; it need not be an unsigned char.
+   - It's guaranteed to evaluate its argument exactly once.
+   - It's typically faster.
+   Posix 1003.2-1992 section 2.5.2.1 page 50 lines 1556-1558 says that
+   only '0' through '9' are digits.  Prefer ISDIGIT to ISDIGIT_LOCALE unless
+   it's important to use the locale's definition of `digit' even when the
+   host does not conform to Posix.  */
+#define ISDIGIT(c) ((unsigned) (c) - '0' <= 9)
+
+#if defined (STDC_HEADERS) || defined (USG)
+# include <string.h>
+#endif
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+# define __attribute__(x)
+#endif
+
+#ifndef ATTRIBUTE_UNUSED
+# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+#endif
+
+/* Some old versions of bison generate parsers that use bcopy.
+   That loses on systems that don't provide the function, so we have
+   to redefine it here.  */
+#if !defined (HAVE_BCOPY) && defined (HAVE_MEMCPY) && !defined (bcopy)
+# define bcopy(from, to, len) memcpy ((to), (from), (len))
+#endif
+
+/* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc),
+   as well as gratuitiously global symbol names, so we can have multiple
+   yacc generated parsers in the same program.  Note that these are only
+   the variables produced by yacc.  If other parser generators (bison,
+   byacc, etc) produce additional global names that conflict at link time,
+   then those parser generators need to be fixed instead of adding those
+   names to this list. */
+
+#define yymaxdepth Curl_gd_maxdepth
+#define yyparse Curl_gd_parse
+#define yylex   Curl_gd_lex
+#define yyerror Curl_gd_error
+#define yylval  Curl_gd_lval
+#define yychar  Curl_gd_char
+#define yydebug Curl_gd_debug
+#define yypact  Curl_gd_pact
+#define yyr1    Curl_gd_r1
+#define yyr2    Curl_gd_r2
+#define yydef   Curl_gd_def
+#define yychk   Curl_gd_chk
+#define yypgo   Curl_gd_pgo
+#define yyact   Curl_gd_act
+#define yyexca  Curl_gd_exca
+#define yyerrflag Curl_gd_errflag
+#define yynerrs Curl_gd_nerrs
+#define yyps    Curl_gd_ps
+#define yypv    Curl_gd_pv
+#define yys     Curl_gd_s
+#define yy_yys  Curl_gd_yys
+#define yystate Curl_gd_state
+#define yytmp   Curl_gd_tmp
+#define yyv     Curl_gd_v
+#define yy_yyv  Curl_gd_yyv
+#define yyval   Curl_gd_val
+#define yylloc  Curl_gd_lloc
+#define yyreds  Curl_gd_reds          /* With YYDEBUG defined */
+#define yytoks  Curl_gd_toks          /* With YYDEBUG defined */
+#define yylhs   Curl_gd_yylhs
+#define yylen   Curl_gd_yylen
+#define yydefred Curl_gd_yydefred
+#define yydgoto Curl_gd_yydgoto
+#define yysindex Curl_gd_yysindex
+#define yyrindex Curl_gd_yyrindex
+#define yygindex Curl_gd_yygindex
+#define yytable  Curl_gd_yytable
+#define yycheck  Curl_gd_yycheck
+
+static int yylex ();
+static int yyerror ();
+
+#define EPOCH		1970
+#define HOUR(x)		((x) * 60)
+
+#define MAX_BUFF_LEN    128   /* size of buffer to read the date into */
+
+/*
+**  An entry in the lexical lookup table.
+*/
+typedef struct _TABLE {
+    const char	*name;
+    int		type;
+    int		value;
+} TABLE;
+
+
+/*
+**  Meridian:  am, pm, or 24-hour style.
+*/
+typedef enum _MERIDIAN {
+    MERam, MERpm, MER24
+} MERIDIAN;
+
+/* parse results and input string */
+typedef struct _CURL_CONTEXT {
+    const char	*yyInput;
+    int		yyDayOrdinal;
+    int		yyDayNumber;
+    int		yyHaveDate;
+    int		yyHaveDay;
+    int		yyHaveRel;
+    int		yyHaveTime;
+    int		yyHaveZone;
+    int		yyTimezone;
+    int		yyDay;
+    int		yyHour;
+    int		yyMinutes;
+    int		yyMonth;
+    int		yySeconds;
+    int		yyYear;
+    MERIDIAN	yyMeridian;
+    int		yyRelDay;
+    int		yyRelHour;
+    int		yyRelMinutes;
+    int		yyRelMonth;
+    int		yyRelSeconds;
+    int		yyRelYear;
+} CURL_CONTEXT;
+
+/* enable use of extra argument to yyparse and yylex which can be used to pass
+**  in a user defined value (CURL_CONTEXT struct in our case)
+*/
+#define YYPARSE_PARAM cookie
+#define YYLEX_PARAM cookie
+#define context ((CURL_CONTEXT *) cookie)
+%}
+
+/* This grammar has 13 shift/reduce conflicts. */
+%expect 13
+
+/* turn global variables into locals, additionally enable extra arguments
+** for yylex (pointer to yylval and user defined value)
+*/
+%pure_parser
+
+%union {
+    int			Number;
+    enum _MERIDIAN	Meridian;
+}
+
+%token	tAGO tDAY tDAY_UNIT tDAYZONE tDST tHOUR_UNIT tID
+%token	tMERIDIAN tMINUTE_UNIT tMONTH tMONTH_UNIT
+%token	tSEC_UNIT tSNUMBER tUNUMBER tYEAR_UNIT tZONE
+
+%type	<Number>	tDAY tDAY_UNIT tDAYZONE tHOUR_UNIT tMINUTE_UNIT
+%type	<Number>	tMONTH tMONTH_UNIT
+%type	<Number>	tSEC_UNIT tSNUMBER tUNUMBER tYEAR_UNIT tZONE
+%type	<Meridian>	tMERIDIAN o_merid
+
+%%
+
+spec	: /* NULL */
+	| spec item
+	;
+
+item	: time {
+	    context->yyHaveTime++;
+	}
+	| zone {
+	    context->yyHaveZone++;
+	}
+	| date {
+	    context->yyHaveDate++;
+	}
+	| day {
+	    context->yyHaveDay++;
+	}
+	| rel {
+	    context->yyHaveRel++;
+	}
+	| number
+	;
+
+time	: tUNUMBER tMERIDIAN {
+	    context->yyHour = $1;
+	    context->yyMinutes = 0;
+	    context->yySeconds = 0;
+	    context->yyMeridian = $2;
+	}
+	| tUNUMBER ':' tUNUMBER o_merid {
+	    context->yyHour = $1;
+	    context->yyMinutes = $3;
+	    context->yySeconds = 0;
+	    context->yyMeridian = $4;
+	}
+	| tUNUMBER ':' tUNUMBER tSNUMBER {
+	    context->yyHour = $1;
+	    context->yyMinutes = $3;
+	    context->yyMeridian = MER24;
+	    context->yyHaveZone++;
+	    context->yyTimezone = ($4 < 0
+				   ? -$4 % 100 + (-$4 / 100) * 60
+				   : - ($4 % 100 + ($4 / 100) * 60));
+	}
+	| tUNUMBER ':' tUNUMBER ':' tUNUMBER o_merid {
+	    context->yyHour = $1;
+	    context->yyMinutes = $3;
+	    context->yySeconds = $5;
+	    context->yyMeridian = $6;
+	}
+	| tUNUMBER ':' tUNUMBER ':' tUNUMBER tSNUMBER {
+	    context->yyHour = $1;
+	    context->yyMinutes = $3;
+	    context->yySeconds = $5;
+	    context->yyMeridian = MER24;
+	    context->yyHaveZone++;
+	    context->yyTimezone = ($6 < 0
+				   ? -$6 % 100 + (-$6 / 100) * 60
+				   : - ($6 % 100 + ($6 / 100) * 60));
+	}
+	;
+
+zone	: tZONE {
+	    context->yyTimezone = $1;
+	}
+	| tDAYZONE {
+	    context->yyTimezone = $1 - 60;
+	}
+	|
+	  tZONE tDST {
+	    context->yyTimezone = $1 - 60;
+	}
+	;
+
+day	: tDAY {
+	    context->yyDayOrdinal = 1;
+	    context->yyDayNumber = $1;
+	}
+	| tDAY ',' {
+	    context->yyDayOrdinal = 1;
+	    context->yyDayNumber = $1;
+	}
+	| tUNUMBER tDAY {
+	    context->yyDayOrdinal = $1;
+	    context->yyDayNumber = $2;
+	}
+	;
+
+date	: tUNUMBER '/' tUNUMBER {
+	    context->yyMonth = $1;
+	    context->yyDay = $3;
+	}
+	| tUNUMBER '/' tUNUMBER '/' tUNUMBER {
+	  /* Interpret as YYYY/MM/DD if $1 >= 1000, otherwise as MM/DD/YY.
+	     The goal in recognizing YYYY/MM/DD is solely to support legacy
+	     machine-generated dates like those in an RCS log listing.  If
+	     you want portability, use the ISO 8601 format.  */
+	  if ($1 >= 1000)
+	    {
+	      context->yyYear = $1;
+	      context->yyMonth = $3;
+	      context->yyDay = $5;
+	    }
+	  else
+	    {
+	      context->yyMonth = $1;
+	      context->yyDay = $3;
+	      context->yyYear = $5;
+	    }
+	}
+	| tUNUMBER tSNUMBER tSNUMBER {
+	    /* ISO 8601 format.  yyyy-mm-dd.  */
+	    context->yyYear = $1;
+	    context->yyMonth = -$2;
+	    context->yyDay = -$3;
+	}
+	| tUNUMBER tMONTH tSNUMBER {
+	    /* e.g. 17-JUN-1992.  */
+	    context->yyDay = $1;
+	    context->yyMonth = $2;
+	    context->yyYear = -$3;
+	}
+	| tMONTH tUNUMBER {
+	    context->yyMonth = $1;
+	    context->yyDay = $2;
+	}
+	| tMONTH tUNUMBER ',' tUNUMBER {
+	    context->yyMonth = $1;
+	    context->yyDay = $2;
+	    context->yyYear = $4;
+	}
+	| tUNUMBER tMONTH {
+	    context->yyMonth = $2;
+	    context->yyDay = $1;
+	}
+	| tUNUMBER tMONTH tUNUMBER {
+	    context->yyMonth = $2;
+	    context->yyDay = $1;
+	    context->yyYear = $3;
+	}
+	;
+
+rel	: relunit tAGO {
+	    context->yyRelSeconds = -context->yyRelSeconds;
+	    context->yyRelMinutes = -context->yyRelMinutes;
+	    context->yyRelHour = -context->yyRelHour;
+	    context->yyRelDay = -context->yyRelDay;
+	    context->yyRelMonth = -context->yyRelMonth;
+	    context->yyRelYear = -context->yyRelYear;
+	}
+	| relunit
+	;
+
+relunit	: tUNUMBER tYEAR_UNIT {
+	    context->yyRelYear += $1 * $2;
+	}
+	| tSNUMBER tYEAR_UNIT {
+	    context->yyRelYear += $1 * $2;
+	}
+	| tYEAR_UNIT {
+	    context->yyRelYear += $1;
+	}
+	| tUNUMBER tMONTH_UNIT {
+	    context->yyRelMonth += $1 * $2;
+	}
+	| tSNUMBER tMONTH_UNIT {
+	    context->yyRelMonth += $1 * $2;
+	}
+	| tMONTH_UNIT {
+	    context->yyRelMonth += $1;
+	}
+	| tUNUMBER tDAY_UNIT {
+	    context->yyRelDay += $1 * $2;
+	}
+	| tSNUMBER tDAY_UNIT {
+	    context->yyRelDay += $1 * $2;
+	}
+	| tDAY_UNIT {
+	    context->yyRelDay += $1;
+	}
+	| tUNUMBER tHOUR_UNIT {
+	    context->yyRelHour += $1 * $2;
+	}
+	| tSNUMBER tHOUR_UNIT {
+	    context->yyRelHour += $1 * $2;
+	}
+	| tHOUR_UNIT {
+	    context->yyRelHour += $1;
+	}
+	| tUNUMBER tMINUTE_UNIT {
+	    context->yyRelMinutes += $1 * $2;
+	}
+	| tSNUMBER tMINUTE_UNIT {
+	    context->yyRelMinutes += $1 * $2;
+	}
+	| tMINUTE_UNIT {
+	    context->yyRelMinutes += $1;
+	}
+	| tUNUMBER tSEC_UNIT {
+	    context->yyRelSeconds += $1 * $2;
+	}
+	| tSNUMBER tSEC_UNIT {
+	    context->yyRelSeconds += $1 * $2;
+	}
+	| tSEC_UNIT {
+	    context->yyRelSeconds += $1;
+	}
+	;
+
+number	: tUNUMBER
+          {
+	    if (context->yyHaveTime && context->yyHaveDate &&
+		!context->yyHaveRel)
+	      context->yyYear = $1;
+	    else
+	      {
+		if ($1>10000)
+		  {
+		    context->yyHaveDate++;
+		    context->yyDay= ($1)%100;
+		    context->yyMonth= ($1/100)%100;
+		    context->yyYear = $1/10000;
+		  }
+		else
+		  {
+		    context->yyHaveTime++;
+		    if ($1 < 100)
+		      {
+			context->yyHour = $1;
+			context->yyMinutes = 0;
+		      }
+		    else
+		      {
+		    	context->yyHour = $1 / 100;
+		    	context->yyMinutes = $1 % 100;
+		      }
+		    context->yySeconds = 0;
+		    context->yyMeridian = MER24;
+		  }
+	      }
+	  }
+	;
+
+o_merid	: /* NULL */
+	  {
+	    $$ = MER24;
+	  }
+	| tMERIDIAN
+	  {
+	    $$ = $1;
+	  }
+	;
+
+%%
+
+/* Include this file down here because bison inserts code above which
+   may define-away `const'.  We want the prototype for get_date to have
+   the same signature as the function definition does. */
+#include "getdate.h"
+
+#ifndef WIN32 /* the windows dudes don't need these, does anyone really? */
+extern struct tm	*gmtime ();
+extern struct tm	*localtime ();
+extern time_t		mktime ();
+#endif
+
+/* Month and day table. */
+static TABLE const MonthDayTable[] = {
+    { "january",	tMONTH,  1 },
+    { "february",	tMONTH,  2 },
+    { "march",		tMONTH,  3 },
+    { "april",		tMONTH,  4 },
+    { "may",		tMONTH,  5 },
+    { "june",		tMONTH,  6 },
+    { "july",		tMONTH,  7 },
+    { "august",		tMONTH,  8 },
+    { "september",	tMONTH,  9 },
+    { "sept",		tMONTH,  9 },
+    { "october",	tMONTH, 10 },
+    { "november",	tMONTH, 11 },
+    { "december",	tMONTH, 12 },
+    { "sunday",		tDAY, 0 },
+    { "monday",		tDAY, 1 },
+    { "tuesday",	tDAY, 2 },
+    { "tues",		tDAY, 2 },
+    { "wednesday",	tDAY, 3 },
+    { "wednes",		tDAY, 3 },
+    { "thursday",	tDAY, 4 },
+    { "thur",		tDAY, 4 },
+    { "thurs",		tDAY, 4 },
+    { "friday",		tDAY, 5 },
+    { "saturday",	tDAY, 6 },
+    { NULL, 0, 0 }
+};
+
+/* Time units table. */
+static TABLE const UnitsTable[] = {
+    { "year",		tYEAR_UNIT,	1 },
+    { "month",		tMONTH_UNIT,	1 },
+    { "fortnight",	tDAY_UNIT,	14 },
+    { "week",		tDAY_UNIT,	7 },
+    { "day",		tDAY_UNIT,	1 },
+    { "hour",		tHOUR_UNIT,	1 },
+    { "minute",		tMINUTE_UNIT,	1 },
+    { "min",		tMINUTE_UNIT,	1 },
+    { "second",		tSEC_UNIT,	1 },
+    { "sec",		tSEC_UNIT,	1 },
+    { NULL, 0, 0 }
+};
+
+/* Assorted relative-time words. */
+static TABLE const OtherTable[] = {
+    { "tomorrow",	tMINUTE_UNIT,	1 * 24 * 60 },
+    { "yesterday",	tMINUTE_UNIT,	-1 * 24 * 60 },
+    { "today",		tMINUTE_UNIT,	0 },
+    { "now",		tMINUTE_UNIT,	0 },
+    { "last",		tUNUMBER,	-1 },
+    { "this",		tMINUTE_UNIT,	0 },
+    { "next",		tUNUMBER,	1 },
+    { "first",		tUNUMBER,	1 },
+/*  { "second",		tUNUMBER,	2 }, */
+    { "third",		tUNUMBER,	3 },
+    { "fourth",		tUNUMBER,	4 },
+    { "fifth",		tUNUMBER,	5 },
+    { "sixth",		tUNUMBER,	6 },
+    { "seventh",	tUNUMBER,	7 },
+    { "eighth",		tUNUMBER,	8 },
+    { "ninth",		tUNUMBER,	9 },
+    { "tenth",		tUNUMBER,	10 },
+    { "eleventh",	tUNUMBER,	11 },
+    { "twelfth",	tUNUMBER,	12 },
+    { "ago",		tAGO,	1 },
+    { NULL, 0, 0 }
+};
+
+/* The timezone table. */
+static TABLE const TimezoneTable[] = {
+    { "gmt",	tZONE,     HOUR ( 0) },	/* Greenwich Mean */
+    { "ut",	tZONE,     HOUR ( 0) },	/* Universal (Coordinated) */
+    { "utc",	tZONE,     HOUR ( 0) },
+    { "wet",	tZONE,     HOUR ( 0) },	/* Western European */
+    { "bst",	tDAYZONE,  HOUR ( 0) },	/* British Summer */
+    { "wat",	tZONE,     HOUR ( 1) },	/* West Africa */
+    { "at",	tZONE,     HOUR ( 2) },	/* Azores */
+#if	0
+    /* For completeness.  BST is also British Summer, and GST is
+     * also Guam Standard. */
+    { "bst",	tZONE,     HOUR ( 3) },	/* Brazil Standard */
+    { "gst",	tZONE,     HOUR ( 3) },	/* Greenland Standard */
+#endif
+#if 0
+    { "nft",	tZONE,     HOUR (3.5) },	/* Newfoundland */
+    { "nst",	tZONE,     HOUR (3.5) },	/* Newfoundland Standard */
+    { "ndt",	tDAYZONE,  HOUR (3.5) },	/* Newfoundland Daylight */
+#endif
+    { "ast",	tZONE,     HOUR ( 4) },	/* Atlantic Standard */
+    { "adt",	tDAYZONE,  HOUR ( 4) },	/* Atlantic Daylight */
+    { "est",	tZONE,     HOUR ( 5) },	/* Eastern Standard */
+    { "edt",	tDAYZONE,  HOUR ( 5) },	/* Eastern Daylight */
+    { "cst",	tZONE,     HOUR ( 6) },	/* Central Standard */
+    { "cdt",	tDAYZONE,  HOUR ( 6) },	/* Central Daylight */
+    { "mst",	tZONE,     HOUR ( 7) },	/* Mountain Standard */
+    { "mdt",	tDAYZONE,  HOUR ( 7) },	/* Mountain Daylight */
+    { "pst",	tZONE,     HOUR ( 8) },	/* Pacific Standard */
+    { "pdt",	tDAYZONE,  HOUR ( 8) },	/* Pacific Daylight */
+    { "yst",	tZONE,     HOUR ( 9) },	/* Yukon Standard */
+    { "ydt",	tDAYZONE,  HOUR ( 9) },	/* Yukon Daylight */
+    { "hst",	tZONE,     HOUR (10) },	/* Hawaii Standard */
+    { "hdt",	tDAYZONE,  HOUR (10) },	/* Hawaii Daylight */
+    { "cat",	tZONE,     HOUR (10) },	/* Central Alaska */
+    { "ahst",	tZONE,     HOUR (10) },	/* Alaska-Hawaii Standard */
+    { "nt",	tZONE,     HOUR (11) },	/* Nome */
+    { "idlw",	tZONE,     HOUR (12) },	/* International Date Line West */
+    { "cet",	tZONE,     -HOUR (1) },	/* Central European */
+    { "met",	tZONE,     -HOUR (1) },	/* Middle European */
+    { "mewt",	tZONE,     -HOUR (1) },	/* Middle European Winter */
+    { "mest",	tDAYZONE,  -HOUR (1) },	/* Middle European Summer */
+    { "mesz",	tDAYZONE,  -HOUR (1) },	/* Middle European Summer */
+    { "swt",	tZONE,     -HOUR (1) },	/* Swedish Winter */
+    { "sst",	tDAYZONE,  -HOUR (1) },	/* Swedish Summer */
+    { "fwt",	tZONE,     -HOUR (1) },	/* French Winter */
+    { "fst",	tDAYZONE,  -HOUR (1) },	/* French Summer */
+    { "eet",	tZONE,     -HOUR (2) },	/* Eastern Europe, USSR Zone 1 */
+    { "bt",	tZONE,     -HOUR (3) },	/* Baghdad, USSR Zone 2 */
+#if 0
+    { "it",	tZONE,     -HOUR (3.5) },/* Iran */
+#endif
+    { "zp4",	tZONE,     -HOUR (4) },	/* USSR Zone 3 */
+    { "zp5",	tZONE,     -HOUR (5) },	/* USSR Zone 4 */
+#if 0
+    { "ist",	tZONE,     -HOUR (5.5) },/* Indian Standard */
+#endif
+    { "zp6",	tZONE,     -HOUR (6) },	/* USSR Zone 5 */
+#if	0
+    /* For completeness.  NST is also Newfoundland Standard, and SST is
+     * also Swedish Summer. */
+    { "nst",	tZONE,     -HOUR (6.5) },/* North Sumatra */
+    { "sst",	tZONE,     -HOUR (7) },	/* South Sumatra, USSR Zone 6 */
+#endif	/* 0 */
+    { "wast",	tZONE,     -HOUR (7) },	/* West Australian Standard */
+    { "wadt",	tDAYZONE,  -HOUR (7) },	/* West Australian Daylight */
+#if 0
+    { "jt",	tZONE,     -HOUR (7.5) },/* Java (3pm in Cronusland!) */
+#endif
+    { "cct",	tZONE,     -HOUR (8) },	/* China Coast, USSR Zone 7 */
+    { "jst",	tZONE,     -HOUR (9) },	/* Japan Standard, USSR Zone 8 */
+#if 0
+    { "cast",	tZONE,     -HOUR (9.5) },/* Central Australian Standard */
+    { "cadt",	tDAYZONE,  -HOUR (9.5) },/* Central Australian Daylight */
+#endif
+    { "east",	tZONE,     -HOUR (10) },	/* Eastern Australian Standard */
+    { "eadt",	tDAYZONE,  -HOUR (10) },	/* Eastern Australian Daylight */
+    { "gst",	tZONE,     -HOUR (10) },	/* Guam Standard, USSR Zone 9 */
+    { "nzt",	tZONE,     -HOUR (12) },	/* New Zealand */
+    { "nzst",	tZONE,     -HOUR (12) },	/* New Zealand Standard */
+    { "nzdt",	tDAYZONE,  -HOUR (12) },	/* New Zealand Daylight */
+    { "idle",	tZONE,     -HOUR (12) },	/* International Date Line East */
+    {  NULL, 0, 0  }
+};
+
+/* Military timezone table. */
+static TABLE const MilitaryTable[] = {
+    { "a",	tZONE,	HOUR (  1) },
+    { "b",	tZONE,	HOUR (  2) },
+    { "c",	tZONE,	HOUR (  3) },
+    { "d",	tZONE,	HOUR (  4) },
+    { "e",	tZONE,	HOUR (  5) },
+    { "f",	tZONE,	HOUR (  6) },
+    { "g",	tZONE,	HOUR (  7) },
+    { "h",	tZONE,	HOUR (  8) },
+    { "i",	tZONE,	HOUR (  9) },
+    { "k",	tZONE,	HOUR ( 10) },
+    { "l",	tZONE,	HOUR ( 11) },
+    { "m",	tZONE,	HOUR ( 12) },
+    { "n",	tZONE,	HOUR (- 1) },
+    { "o",	tZONE,	HOUR (- 2) },
+    { "p",	tZONE,	HOUR (- 3) },
+    { "q",	tZONE,	HOUR (- 4) },
+    { "r",	tZONE,	HOUR (- 5) },
+    { "s",	tZONE,	HOUR (- 6) },
+    { "t",	tZONE,	HOUR (- 7) },
+    { "u",	tZONE,	HOUR (- 8) },
+    { "v",	tZONE,	HOUR (- 9) },
+    { "w",	tZONE,	HOUR (-10) },
+    { "x",	tZONE,	HOUR (-11) },
+    { "y",	tZONE,	HOUR (-12) },
+    { "z",	tZONE,	HOUR (  0) },
+    { NULL, 0, 0 }
+};
+
+
+
+
+/* ARGSUSED */
+static int
+yyerror (s)
+     char *s ATTRIBUTE_UNUSED;
+{
+  return 0;
+}
+
+static int
+ToHour (Hours, Meridian)
+     int Hours;
+     MERIDIAN Meridian;
+{
+  switch (Meridian)
+    {
+    case MER24:
+      if (Hours < 0 || Hours > 23)
+	return -1;
+      return Hours;
+    case MERam:
+      if (Hours < 1 || Hours > 12)
+	return -1;
+      if (Hours == 12)
+	Hours = 0;
+      return Hours;
+    case MERpm:
+      if (Hours < 1 || Hours > 12)
+	return -1;
+      if (Hours == 12)
+	Hours = 0;
+      return Hours + 12;
+    default:
+      abort ();
+    }
+  /* NOTREACHED */
+}
+
+static int
+ToYear (Year)
+     int Year;
+{
+  if (Year < 0)
+    Year = -Year;
+
+  /* XPG4 suggests that years 00-68 map to 2000-2068, and
+     years 69-99 map to 1969-1999.  */
+  if (Year < 69)
+    Year += 2000;
+  else if (Year < 100)
+    Year += 1900;
+
+  return Year;
+}
+
+static int
+LookupWord (yylval, buff)
+     YYSTYPE *yylval;
+     char *buff;
+{
+  register char *p;
+  register char *q;
+  register const TABLE *tp;
+  int i;
+  int abbrev;
+
+  /* Make it lowercase. */
+  for (p = buff; *p; p++)
+    if (ISUPPER ((unsigned char) *p))
+      *p = tolower (*p);
+
+  if (strcmp (buff, "am") == 0 || strcmp (buff, "a.m.") == 0)
+    {
+      yylval->Meridian = MERam;
+      return tMERIDIAN;
+    }
+  if (strcmp (buff, "pm") == 0 || strcmp (buff, "p.m.") == 0)
+    {
+      yylval->Meridian = MERpm;
+      return tMERIDIAN;
+    }
+
+  /* See if we have an abbreviation for a month. */
+  if (strlen (buff) == 3)
+    abbrev = 1;
+  else if (strlen (buff) == 4 && buff[3] == '.')
+    {
+      abbrev = 1;
+      buff[3] = '\0';
+    }
+  else
+    abbrev = 0;
+
+  for (tp = MonthDayTable; tp->name; tp++)
+    {
+      if (abbrev)
+	{
+	  if (strncmp (buff, tp->name, 3) == 0)
+	    {
+	      yylval->Number = tp->value;
+	      return tp->type;
+	    }
+	}
+      else if (strcmp (buff, tp->name) == 0)
+	{
+	  yylval->Number = tp->value;
+	  return tp->type;
+	}
+    }
+
+  for (tp = TimezoneTable; tp->name; tp++)
+    if (strcmp (buff, tp->name) == 0)
+      {
+	yylval->Number = tp->value;
+	return tp->type;
+      }
+
+  if (strcmp (buff, "dst") == 0)
+    return tDST;
+
+  for (tp = UnitsTable; tp->name; tp++)
+    if (strcmp (buff, tp->name) == 0)
+      {
+	yylval->Number = tp->value;
+	return tp->type;
+      }
+
+  /* Strip off any plural and try the units table again. */
+  i = strlen (buff) - 1;
+  if (buff[i] == 's')
+    {
+      buff[i] = '\0';
+      for (tp = UnitsTable; tp->name; tp++)
+	if (strcmp (buff, tp->name) == 0)
+	  {
+	    yylval->Number = tp->value;
+	    return tp->type;
+	  }
+      buff[i] = 's';		/* Put back for "this" in OtherTable. */
+    }
+
+  for (tp = OtherTable; tp->name; tp++)
+    if (strcmp (buff, tp->name) == 0)
+      {
+	yylval->Number = tp->value;
+	return tp->type;
+      }
+
+  /* Military timezones. */
+  if (buff[1] == '\0' && ISALPHA ((unsigned char) *buff))
+    {
+      for (tp = MilitaryTable; tp->name; tp++)
+	if (strcmp (buff, tp->name) == 0)
+	  {
+	    yylval->Number = tp->value;
+	    return tp->type;
+	  }
+    }
+
+  /* Drop out any periods and try the timezone table again. */
+  for (i = 0, p = q = buff; *q; q++)
+    if (*q != '.')
+      *p++ = *q;
+    else
+      i++;
+  *p = '\0';
+  if (i)
+    for (tp = TimezoneTable; tp->name; tp++)
+      if (strcmp (buff, tp->name) == 0)
+	{
+	  yylval->Number = tp->value;
+	  return tp->type;
+	}
+
+  return tID;
+}
+
+static int
+yylex (yylval, cookie)
+     YYSTYPE *yylval;
+     void *cookie;
+{
+  register unsigned char c;
+  register char *p;
+  char buff[20];
+  int Count;
+  int sign;
+
+  for (;;)
+    {
+      while (ISSPACE ((unsigned char) *context->yyInput))
+	context->yyInput++;
+
+      if (ISDIGIT (c = *context->yyInput) || c == '-' || c == '+')
+	{
+	  if (c == '-' || c == '+')
+	    {
+	      sign = c == '-' ? -1 : 1;
+	      if (!ISDIGIT (*++context->yyInput))
+		/* skip the '-' sign */
+		continue;
+	    }
+	  else
+	    sign = 0;
+	  for (yylval->Number = 0; ISDIGIT (c = *context->yyInput++);)
+	    yylval->Number = 10 * yylval->Number + c - '0';
+	  context->yyInput--;
+	  if (sign < 0)
+	    yylval->Number = -yylval->Number;
+	  return sign ? tSNUMBER : tUNUMBER;
+	}
+      if (ISALPHA (c))
+	{
+	  for (p = buff; (c = *context->yyInput++, ISALPHA (c)) || c == '.';)
+	    if (p < &buff[sizeof buff - 1])
+	      *p++ = c;
+	  *p = '\0';
+	  context->yyInput--;
+	  return LookupWord (yylval, buff);
+	}
+      if (c != '(')
+	return *context->yyInput++;
+      Count = 0;
+      do
+	{
+	  c = *context->yyInput++;
+	  if (c == '\0')
+	    return c;
+	  if (c == '(')
+	    Count++;
+	  else if (c == ')')
+	    Count--;
+	}
+      while (Count > 0);
+    }
+}
+
+#define TM_YEAR_ORIGIN 1900
+
+/* Yield A - B, measured in seconds.  */
+static long
+difftm (struct tm *a, struct tm *b)
+{
+  int ay = a->tm_year + (TM_YEAR_ORIGIN - 1);
+  int by = b->tm_year + (TM_YEAR_ORIGIN - 1);
+  long days = (
+  /* difference in day of year */
+		a->tm_yday - b->tm_yday
+  /* + intervening leap days */
+		+ ((ay >> 2) - (by >> 2))
+		- (ay / 100 - by / 100)
+		+ ((ay / 100 >> 2) - (by / 100 >> 2))
+  /* + difference in years * 365 */
+		+ (long) (ay - by) * 365
+  );
+  return (60 * (60 * (24 * days + (a->tm_hour - b->tm_hour))
+		+ (a->tm_min - b->tm_min))
+	  + (a->tm_sec - b->tm_sec));
+}
+
+time_t
+curl_getdate (const char *p, const time_t *now)
+{
+  struct tm tm, tm0, *tmp;
+  time_t Start;
+  CURL_CONTEXT cookie;
+#ifdef HAVE_LOCALTIME_R
+  struct tm keeptime;
+#endif
+  cookie.yyInput = p;
+  Start = now ? *now : time ((time_t *) NULL);
+#ifdef HAVE_LOCALTIME_R
+  tmp = (struct tm *)localtime_r(&Start, &keeptime);
+#else
+  tmp = localtime (&Start);
+#endif
+  if (!tmp)
+    return -1;
+  cookie.yyYear = tmp->tm_year + TM_YEAR_ORIGIN;
+  cookie.yyMonth = tmp->tm_mon + 1;
+  cookie.yyDay = tmp->tm_mday;
+  cookie.yyHour = tmp->tm_hour;
+  cookie.yyMinutes = tmp->tm_min;
+  cookie.yySeconds = tmp->tm_sec;
+  tm.tm_isdst = tmp->tm_isdst;
+  cookie.yyMeridian = MER24;
+  cookie.yyRelSeconds = 0;
+  cookie.yyRelMinutes = 0;
+  cookie.yyRelHour = 0;
+  cookie.yyRelDay = 0;
+  cookie.yyRelMonth = 0;
+  cookie.yyRelYear = 0;
+  cookie.yyHaveDate = 0;
+  cookie.yyHaveDay = 0;
+  cookie.yyHaveRel = 0;
+  cookie.yyHaveTime = 0;
+  cookie.yyHaveZone = 0;
+
+  if (yyparse (&cookie)
+      || cookie.yyHaveTime > 1 || cookie.yyHaveZone > 1 ||
+      cookie.yyHaveDate > 1 || cookie.yyHaveDay > 1)
+    return -1;
+
+  tm.tm_year = ToYear (cookie.yyYear) - TM_YEAR_ORIGIN + cookie.yyRelYear;
+  tm.tm_mon = cookie.yyMonth - 1 + cookie.yyRelMonth;
+  tm.tm_mday = cookie.yyDay + cookie.yyRelDay;
+  if (cookie.yyHaveTime ||
+      (cookie.yyHaveRel && !cookie.yyHaveDate && !cookie.yyHaveDay))
+    {
+      tm.tm_hour = ToHour (cookie.yyHour, cookie.yyMeridian);
+      if (tm.tm_hour < 0)
+	return -1;
+      tm.tm_min = cookie.yyMinutes;
+      tm.tm_sec = cookie.yySeconds;
+    }
+  else
+    {
+      tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
+    }
+  tm.tm_hour += cookie.yyRelHour;
+  tm.tm_min += cookie.yyRelMinutes;
+  tm.tm_sec += cookie.yyRelSeconds;
+
+  /* Let mktime deduce tm_isdst if we have an absolute timestamp,
+     or if the relative timestamp mentions days, months, or years.  */
+  if (cookie.yyHaveDate | cookie.yyHaveDay | cookie.yyHaveTime |
+      cookie.yyRelDay | cookie.yyRelMonth | cookie.yyRelYear)
+    tm.tm_isdst = -1;
+
+  tm0 = tm;
+
+  Start = mktime (&tm);
+
+  if (Start == (time_t) -1)
+    {
+
+      /* Guard against falsely reporting errors near the time_t boundaries
+         when parsing times in other time zones.  For example, if the min
+         time_t value is 1970-01-01 00:00:00 UTC and we are 8 hours ahead
+         of UTC, then the min localtime value is 1970-01-01 08:00:00; if
+         we apply mktime to 1970-01-01 00:00:00 we will get an error, so
+         we apply mktime to 1970-01-02 08:00:00 instead and adjust the time
+         zone by 24 hours to compensate.  This algorithm assumes that
+         there is no DST transition within a day of the time_t boundaries.  */
+      if (cookie.yyHaveZone)
+	{
+	  tm = tm0;
+	  if (tm.tm_year <= EPOCH - TM_YEAR_ORIGIN)
+	    {
+	      tm.tm_mday++;
+	      cookie.yyTimezone -= 24 * 60;
+	    }
+	  else
+	    {
+	      tm.tm_mday--;
+	      cookie.yyTimezone += 24 * 60;
+	    }
+	  Start = mktime (&tm);
+	}
+
+      if (Start == (time_t) -1)
+	return Start;
+    }
+
+  if (cookie.yyHaveDay && !cookie.yyHaveDate)
+    {
+      tm.tm_mday += ((cookie.yyDayNumber - tm.tm_wday + 7) % 7
+		     + 7 * (cookie.yyDayOrdinal - (0 < cookie.yyDayOrdinal)));
+      Start = mktime (&tm);
+      if (Start == (time_t) -1)
+	return Start;
+    }
+
+  if (cookie.yyHaveZone)
+    {
+      long delta;
+      struct tm *gmt;
+#ifdef HAVE_GMTIME_R
+      /* thread-safe version */
+      struct tm keeptime;
+      gmt = (struct tm *)gmtime_r(&Start, &keeptime);
+#else
+      gmt = gmtime(&Start);
+#endif
+      if (!gmt)
+	return -1;
+      delta = cookie.yyTimezone * 60L + difftm (&tm, gmt);
+      if ((Start + delta < Start) != (delta < 0))
+	return -1;		/* time_t overflow */
+      Start += delta;
+    }
+
+  return Start;
+}
+
+#if	defined (TEST)
+
+/* ARGSUSED */
+int
+main (ac, av)
+     int ac;
+     char *av[];
+{
+  char buff[MAX_BUFF_LEN + 1];
+  time_t d;
+
+  (void) printf ("Enter date, or blank line to exit.\n\t> ");
+  (void) fflush (stdout);
+
+  buff[MAX_BUFF_LEN] = 0;
+  while (fgets (buff, MAX_BUFF_LEN, stdin) && buff[0])
+    {
+      d = curl_getdate (buff, (time_t *) NULL);
+      if (d == -1)
+	(void) printf ("Bad format - couldn't convert.\n");
+      else
+	(void) printf ("%s", ctime (&d));
+      (void) printf ("\t> ");
+      (void) fflush (stdout);
+    }
+  exit (0);
+  /* NOTREACHED */
+}
+#endif /* defined (TEST) */
diff --git a/main/source/curl/lib/getenv.c b/main/source/curl/lib/getenv.c
new file mode 100644
index 00000000..02c1079a
--- /dev/null
+++ b/main/source/curl/lib/getenv.c
@@ -0,0 +1,69 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: getenv.c,v 1.20 2003/01/29 10:14:21 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef WIN32
+#include <windows.h>
+#endif
+
+#ifdef VMS
+#include <unixlib.h>
+#endif
+
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+static
+char *GetEnv(const char *variable)
+{
+#ifdef WIN32
+  /* This shit requires windows.h (HUGE) to be included */
+  char env[MAX_PATH]; /* MAX_PATH is from windef.h */
+  char *temp = getenv(variable);
+  env[0] = '\0';
+  if (temp != NULL)
+    ExpandEnvironmentStrings(temp, env, sizeof(env));
+#else
+#ifdef	VMS
+  char *env = getenv(variable);
+  if (env && strcmp("HOME",variable) == 0) {
+	env = decc$translate_vms(env);
+  }
+#else
+  /* no length control */
+  char *env = getenv(variable);
+#endif
+#endif
+  return (env && env[0])?strdup(env):NULL;
+}
+
+char *curl_getenv(const char *v)
+{
+  return GetEnv(v);
+}
diff --git a/main/source/curl/lib/getinfo.c b/main/source/curl/lib/getinfo.c
new file mode 100644
index 00000000..b424fa18
--- /dev/null
+++ b/main/source/curl/lib/getinfo.c
@@ -0,0 +1,170 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: getinfo.c,v 1.28 2003/05/01 13:37:36 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#include <curl/curl.h>
+
+#include "urldata.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+
+#ifdef	VMS
+#include	<stdlib.h>
+#endif
+
+/* Make this the last #include */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#else
+#include <stdlib.h>
+#endif
+
+/*
+ * This is supposed to be called in the beginning of a permform() session
+ * and should reset all session-info variables
+ */
+CURLcode Curl_initinfo(struct SessionHandle *data)
+{
+  struct Progress *pro = &data->progress;
+  struct PureInfo *info =&data->info;
+
+  pro->t_nslookup = 0;
+  pro->t_connect = 0;
+  pro->t_pretransfer = 0;
+  pro->t_starttransfer = 0;
+  pro->timespent = 0;
+  pro->t_redirect = 0;
+
+  info->httpcode = 0;
+  info->httpversion=0;
+  info->filetime=-1; /* -1 is an illegal time and thus means unknown */
+  
+  if (info->contenttype)
+    free(info->contenttype);
+  info->contenttype = NULL;
+
+  info->header_size = 0;
+  info->request_size = 0;
+  return CURLE_OK;
+}
+
+CURLcode Curl_getinfo(struct SessionHandle *data, CURLINFO info, ...)
+{
+  va_list arg;
+  long *param_longp=NULL;
+  double *param_doublep=NULL;
+  char **param_charp=NULL;
+  va_start(arg, info);
+
+  switch(info&CURLINFO_TYPEMASK) {
+  default:
+    return CURLE_BAD_FUNCTION_ARGUMENT;
+  case CURLINFO_STRING:
+    param_charp = va_arg(arg, char **);  
+    if(NULL == param_charp)
+      return CURLE_BAD_FUNCTION_ARGUMENT;
+    break;
+  case CURLINFO_LONG:
+    param_longp = va_arg(arg, long *);
+    if(NULL == param_longp)
+      return CURLE_BAD_FUNCTION_ARGUMENT;
+    break;
+  case CURLINFO_DOUBLE:
+    param_doublep = va_arg(arg, double *);
+    if(NULL == param_doublep)
+      return CURLE_BAD_FUNCTION_ARGUMENT;
+    break;
+  }
+  
+  switch(info) {
+  case CURLINFO_EFFECTIVE_URL:
+    *param_charp = data->change.url?data->change.url:(char *)"";
+    break;
+  case CURLINFO_HTTP_CODE:
+    *param_longp = data->info.httpcode;
+    break;
+  case CURLINFO_FILETIME:
+    *param_longp = data->info.filetime;
+    break;
+  case CURLINFO_HEADER_SIZE:
+    *param_longp = data->info.header_size;
+    break;
+  case CURLINFO_REQUEST_SIZE:
+    *param_longp = data->info.request_size;
+    break;
+  case CURLINFO_TOTAL_TIME:
+    *param_doublep = data->progress.timespent;
+    break;
+  case CURLINFO_NAMELOOKUP_TIME:
+    *param_doublep = data->progress.t_nslookup;
+    break;
+  case CURLINFO_CONNECT_TIME:
+    *param_doublep = data->progress.t_connect;
+    break;
+  case CURLINFO_PRETRANSFER_TIME:
+    *param_doublep =  data->progress.t_pretransfer;
+    break;
+  case CURLINFO_STARTTRANSFER_TIME:
+    *param_doublep = data->progress.t_starttransfer;
+    break;
+  case CURLINFO_SIZE_UPLOAD:
+    *param_doublep =  data->progress.uploaded;
+    break;
+  case CURLINFO_SIZE_DOWNLOAD:
+    *param_doublep = data->progress.downloaded;
+    break;
+  case CURLINFO_SPEED_DOWNLOAD:
+    *param_doublep =  data->progress.dlspeed;
+    break;
+  case CURLINFO_SPEED_UPLOAD:
+    *param_doublep = data->progress.ulspeed;
+    break;
+  case CURLINFO_SSL_VERIFYRESULT:
+    *param_longp = data->set.ssl.certverifyresult;
+    break;
+  case CURLINFO_CONTENT_LENGTH_DOWNLOAD:
+    *param_doublep = data->progress.size_dl;
+    break;
+  case CURLINFO_CONTENT_LENGTH_UPLOAD:
+    *param_doublep = data->progress.size_ul;
+    break;
+  case CURLINFO_REDIRECT_TIME:
+    *param_doublep =  data->progress.t_redirect;
+    break;
+  case CURLINFO_REDIRECT_COUNT:
+    *param_longp = data->set.followlocation;
+    break;
+  case CURLINFO_CONTENT_TYPE:
+    *param_charp = data->info.contenttype;
+    break;
+  case CURLINFO_PRIVATE:
+    *param_charp = data->set.private;
+    break;
+  default:
+    return CURLE_BAD_FUNCTION_ARGUMENT;
+  }
+  return CURLE_OK;
+}
diff --git a/main/source/curl/lib/getinfo.h b/main/source/curl/lib/getinfo.h
new file mode 100644
index 00000000..cb03c638
--- /dev/null
+++ b/main/source/curl/lib/getinfo.h
@@ -0,0 +1,28 @@
+#ifndef __GETINFO_H
+#define __GETINFO_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: getinfo.h,v 1.5 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+CURLcode Curl_getinfo(struct SessionHandle *data, CURLINFO info, ...);
+CURLcode Curl_initinfo(struct SessionHandle *data);
+
+#endif
diff --git a/main/source/curl/lib/getpass.c b/main/source/curl/lib/getpass.c
new file mode 100644
index 00000000..475f22b0
--- /dev/null
+++ b/main/source/curl/lib/getpass.c
@@ -0,0 +1,226 @@
+/* ============================================================================
+ * Copyright (C) 1998 - 2002, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * Redistribution and use are freely permitted provided that:
+ *
+ *   1) This header remain in tact.
+ *   2) The prototypes for getpass and getpass_r are not changed from:
+ *         char *getpass(const char *prompt)
+ *         char *getpass_r(const char *prompt, char* buffer, int buflen)
+ *   3) This source code is not used outside of this(getpass.c) file.
+ *   4) Any changes to this(getpass.c) source code are made publicly available.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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
+ * AUTHOR 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.
+ * ============================================================================
+ *
+ * $Id: getpass.c,v 1.19 2003/01/29 10:14:22 bagder Exp $
+ *
+ * The spirit of this license is to allow use of this source code in any
+ * project be it open or closed but still encourage the use of the open,
+ * library based equivilents.
+ *
+ * Author(s):
+ *   Angus Mackay <amackay@gus.ml.org>
+ *
+ * Contributor(s):
+ *   Daniel Stenberg <daniel@haxx.se>
+ */
+
+#include "setup.h" /* setup.h is required for read() prototype */
+
+#ifndef HAVE_GETPASS_R
+
+#ifndef WIN32
+#ifdef	VMS
+#include <stdio.h>
+#include <string.h>
+#include descrip
+#include starlet
+#include iodef
+#include iosbdef
+char *getpass_r(const char *prompt, char *buffer, size_t buflen)
+{
+	long sts;
+	short chan;
+	struct _iosb iosb;
+	$DESCRIPTOR(ttdesc, "TT");
+
+	buffer[0]='\0';
+	if ((sts = sys$assign(&ttdesc, &chan,0,0)) & 1) {
+		if (((sts = sys$qiow(0, chan, IO$_READPROMPT | IO$M_NOECHO, &iosb, 0, 0, buffer, buflen, 0, 0, prompt, strlen(prompt))) & 1) && (iosb.iosb$w_status&1)) {
+			buffer[iosb.iosb$w_bcnt] = '\0';
+		} 
+		sts = sys$dassgn(chan);
+	}
+	return buffer; /* we always return success */
+}
+#else /* VMS */
+#ifdef HAVE_TERMIOS_H
+#  if !defined(HAVE_TCGETATTR) && !defined(HAVE_TCSETATTR) 
+#    undef HAVE_TERMIOS_H
+#  endif
+#endif
+
+#ifndef RETSIGTYPE
+#  define RETSIGTYPE void
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <stdio.h>
+#include <signal.h>
+#ifdef HAVE_TERMIOS_H
+#  include <termios.h>
+#else
+#  ifdef HAVE_TERMIO_H
+#  include <termio.h>
+#  else
+#  endif
+#endif
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+char *getpass_r(const char *prompt, char *buffer, size_t buflen)
+{
+  FILE *infp;
+  char infp_fclose = 0;
+  FILE *outfp;
+  RETSIGTYPE (*sigint)();
+#ifndef __EMX__
+  RETSIGTYPE (*sigtstp)();
+#endif
+  size_t bytes_read;
+  int infd;
+  int outfd;
+#ifdef HAVE_TERMIOS_H
+  struct termios orig;
+  struct termios noecho;
+#else
+#  ifdef HAVE_TERMIO_H
+  struct termio orig;
+  struct termio noecho;  
+#  else
+#  endif
+#endif
+
+  sigint = signal(SIGINT, SIG_IGN);
+  /* 20000318 mgs
+   * this is needed by the emx system, SIGTSTP is not a supported signal */
+#ifndef __EMX__
+  sigtstp = signal(SIGTSTP, SIG_IGN);
+#endif
+
+  infp=fopen("/dev/tty", "r");
+  if( NULL == infp )
+    infp = stdin;
+  else
+    infp_fclose = 1;
+
+  outfp = stderr;
+
+  infd = fileno(infp);
+  outfd = fileno(outfp);
+
+  /* dissable echo */
+#ifdef HAVE_TERMIOS_H
+  tcgetattr(outfd, &orig);
+
+  noecho = orig;
+  noecho.c_lflag &= ~ECHO;
+  tcsetattr(outfd, TCSANOW, &noecho);
+#else
+#  ifdef HAVE_TERMIO_H
+  ioctl(outfd, TCGETA, &orig);
+  noecho = orig;
+  noecho.c_lflag &= ~ECHO;
+  ioctl(outfd, TCSETA, &noecho);
+#  else
+#  endif
+#endif
+
+  fputs(prompt, outfp);
+  fflush(outfp);
+
+  bytes_read=read(infd, buffer, buflen);
+  buffer[bytes_read > 0 ? (bytes_read -1) : 0] = '\0';
+
+  /* print a new line if needed */
+#ifdef HAVE_TERMIOS_H
+  fputs("\n", outfp);
+#else
+#  ifdef HAVE_TERMIO_H
+  fputs("\n", outfp);
+#  else
+#  endif
+#endif
+
+  /*
+   * reset term charectaristics, use TCSAFLUSH incase the
+   * user types more than buflen
+   */
+#ifdef HAVE_TERMIOS_H
+  tcsetattr(outfd, TCSAFLUSH, &orig);
+#else
+#  ifdef HAVE_TERMIO_H
+  ioctl(outfd, TCSETA, &orig);
+#  else
+#  endif
+#endif
+  
+  signal(SIGINT, sigint);
+#ifndef __EMX__
+  signal(SIGTSTP, sigtstp);
+#endif
+
+  if(infp_fclose)
+    fclose(infp);
+
+  return buffer; /* we always return success */
+}
+#endif /* VMS */
+#else /* WIN32 */
+#include <stdio.h>
+#include <conio.h>
+char *getpass_r(const char *prompt, char *buffer, int buflen)
+{
+  int i;
+  printf("%s", prompt);
+ 
+  for(i=0; i<buflen; i++) {
+    buffer[i] = getch();
+    if ( buffer[i] == '\r' ) {
+      buffer[i] = 0;
+      break;
+    }
+  }
+  /* if user didn't hit ENTER, terminate buffer */
+  if (i==buflen)
+    buffer[buflen-1]=0;
+
+  return buffer; /* we always return success */
+}
+#endif
+
+#endif /* ifndef HAVE_GETPASS_R */
+
+#if 0
+/* for consistensy, here's the old-style function: */
+char *getpass(const char *prompt)
+{
+  static char buf[256];
+  return getpass_r(prompt, buf, sizeof(buf));
+}
+#endif
diff --git a/main/source/curl/lib/getpass.h b/main/source/curl/lib/getpass.h
new file mode 100644
index 00000000..b77727a1
--- /dev/null
+++ b/main/source/curl/lib/getpass.h
@@ -0,0 +1,35 @@
+#ifndef __GETPASS_H
+#define __GETPASS_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: getpass.h,v 1.11 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+#ifndef HAVE_GETPASS_R
+/* If there's a system-provided function named like this, we trust it is
+   also found in one of the standard headers. */
+
+/*
+ * Returning NULL will abort the continued operation!
+ */
+char* getpass_r(const char *prompt, char* buffer, size_t buflen );
+#endif
+
+#endif
diff --git a/main/source/curl/lib/hash.c b/main/source/curl/lib/hash.c
new file mode 100644
index 00000000..f972eefb
--- /dev/null
+++ b/main/source/curl/lib/hash.c
@@ -0,0 +1,259 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: hash.c,v 1.14 2003/01/29 10:12:06 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+#include "hash.h"
+#include "llist.h"
+
+#ifdef MALLOCDEBUG
+/* this must be the last include file */
+#include "memdebug.h"
+#endif
+
+
+static unsigned long
+_hash_str (const char *key, size_t key_length)
+{
+  char *end = (char *) key + key_length;
+  unsigned long h = 5381;
+
+  while (key < end) {
+    h += h << 5;
+    h ^= (unsigned long) *key++;
+  }
+
+  return h;
+}
+
+static void 
+_hash_element_dtor (void *user, void *element)
+{
+  curl_hash         *h = (curl_hash *) user;
+  curl_hash_element *e = (curl_hash_element *) element;
+
+  if (e->key) {
+    free(e->key);
+  }
+
+  h->dtor(e->ptr);
+
+  free(e);
+}
+
+void 
+Curl_hash_init (curl_hash *h, int slots, curl_hash_dtor dtor)
+{
+  int i;
+
+  h->dtor = dtor;
+  h->size = 0;
+  h->slots = slots;  
+
+  h->table = (curl_llist **) malloc(slots * sizeof(curl_llist *));
+  for (i = 0; i < slots; ++i) {
+    h->table[i] = Curl_llist_alloc((curl_llist_dtor) _hash_element_dtor);
+  }
+}
+
+curl_hash *
+Curl_hash_alloc (int slots, curl_hash_dtor dtor)
+{
+  curl_hash *h;
+
+  h = (curl_hash *) malloc(sizeof(curl_hash));
+  if (NULL == h)
+    return NULL;
+
+  Curl_hash_init(h, slots, dtor);
+
+  return h;
+}
+
+static int 
+_hash_key_compare (char *key1, size_t key1_len, char *key2, size_t key2_len)
+{
+  if (key1_len == key2_len && 
+      *key1 == *key2 &&
+      memcmp(key1, key2, key1_len) == 0) {
+    return 1;
+  }
+
+  return 0;
+}
+
+static int
+_mk_hash_element (curl_hash_element **e, char *key, size_t key_len,
+                  const void *p)
+{
+  *e = (curl_hash_element *) malloc(sizeof(curl_hash_element));
+  (*e)->key = strdup(key);
+  (*e)->key_len = key_len;
+  (*e)->ptr = (void *) p;
+  return 0;
+}
+
+#define find_slot(__h, __k, __k_len) (_hash_str(__k, __k_len) % (__h)->slots)
+
+#define FETCH_LIST \
+  curl_llist *l = h->table[find_slot(h, key, key_len)]
+
+int 
+Curl_hash_add (curl_hash *h, char *key, size_t key_len, const void *p)
+{
+  curl_hash_element  *he;
+  curl_llist_element *le;
+  FETCH_LIST;
+
+  for (le = CURL_LLIST_HEAD(l);
+       le != NULL;
+       le = CURL_LLIST_NEXT(le)) {
+    he = (curl_hash_element *) CURL_LLIST_VALP(le);
+    if (_hash_key_compare(he->key, he->key_len, key, key_len)) {
+      h->dtor(he->ptr);
+      he->ptr = (void *) p;
+      return 1;
+    }
+  }
+
+  if (_mk_hash_element(&he, key, key_len, p) != 0) 
+    return 0;
+
+  if (Curl_llist_insert_next(l, CURL_LLIST_TAIL(l), he)) {
+    ++h->size;
+    return 1;
+  }
+
+  return 0;
+}
+
+int 
+Curl_hash_delete(curl_hash *h, char *key, size_t key_len)
+{
+  curl_hash_element  *he;
+  curl_llist_element *le;
+  FETCH_LIST;
+
+  for (le = CURL_LLIST_HEAD(l);
+       le != NULL;
+       le = CURL_LLIST_NEXT(le)) {
+    he = CURL_LLIST_VALP(le);
+    if (_hash_key_compare(he->key, he->key_len, key, key_len)) {
+      Curl_llist_remove(l, le, (void *) h);
+      --h->size;
+      return 1;
+    }
+  }
+
+  return 0;
+}
+
+void *
+Curl_hash_pick(curl_hash *h, char *key, size_t key_len)
+{
+  curl_llist_element *le;
+  curl_hash_element  *he;
+  FETCH_LIST;
+
+  for (le = CURL_LLIST_HEAD(l);
+       le != NULL;
+       le = CURL_LLIST_NEXT(le)) {
+    he = CURL_LLIST_VALP(le);
+    if (_hash_key_compare(he->key, he->key_len, key, key_len)) {
+      return he->ptr;
+    }
+  }
+
+  return NULL;
+}
+
+void 
+Curl_hash_apply(curl_hash *h, void *user,
+                void (*cb)(void *user, void *ptr))
+{
+  curl_llist_element  *le;
+  int                  i;
+
+  for (i = 0; i < h->slots; ++i) {
+    for (le = CURL_LLIST_HEAD(h->table[i]);
+         le != NULL;
+         le = CURL_LLIST_NEXT(le)) {
+      curl_hash_element *el = CURL_LLIST_VALP(le);
+      cb(user, el->ptr);
+    }
+  }
+}
+
+void
+Curl_hash_clean(curl_hash *h)
+{
+  int i;
+
+  for (i = 0; i < h->slots; ++i) {
+    Curl_llist_destroy(h->table[i], (void *) h);
+  }
+
+  free(h->table);
+}
+
+void
+Curl_hash_clean_with_criterium(curl_hash *h, void *user,
+                               int (*comp)(void *, void *))
+{
+  curl_llist_element *le;
+  curl_llist_element *lnext;
+  int i;
+
+  for (i = 0; i < h->slots; ++i) {
+    le = CURL_LLIST_HEAD(h->table[i]);
+    while(le != NULL)
+      if (comp(user, ((curl_hash_element *) CURL_LLIST_VALP(le))->ptr)) {
+        lnext = CURL_LLIST_NEXT(le);
+        Curl_llist_remove(h->table[i], le, (void *) h);
+        --h->size;
+        le = lnext;
+      }
+      else
+        le = CURL_LLIST_NEXT(le);
+  }
+}
+
+int
+Curl_hash_count(curl_hash *h)
+{
+  return h->size;
+}
+
+void 
+Curl_hash_destroy(curl_hash *h)
+{
+  if (!h)
+    return;
+
+  Curl_hash_clean(h);
+  free(h);
+}
+
diff --git a/main/source/curl/lib/hash.h b/main/source/curl/lib/hash.h
new file mode 100644
index 00000000..2b314245
--- /dev/null
+++ b/main/source/curl/lib/hash.h
@@ -0,0 +1,60 @@
+#ifndef __HASH_H
+#define __HASH_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: hash.h,v 1.12 2003/01/29 10:14:22 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#include <stddef.h>
+
+#include "llist.h"
+
+typedef void (*curl_hash_dtor)(void *);
+
+typedef struct _curl_hash {
+  curl_llist     **table;
+  curl_hash_dtor   dtor;
+  int              slots;
+  size_t           size;
+} curl_hash;
+
+typedef struct _curl_hash_element {
+  void   *ptr;
+  char   *key;
+  size_t key_len;
+} curl_hash_element;
+
+
+void Curl_hash_init(curl_hash *, int, curl_hash_dtor);
+curl_hash *Curl_hash_alloc(int, curl_hash_dtor);
+int Curl_hash_add(curl_hash *, char *, size_t, const void *);
+int Curl_hash_delete(curl_hash *h, char *key, size_t key_len);
+void *Curl_hash_pick(curl_hash *, char *, size_t);
+void Curl_hash_apply(curl_hash *h, void *user,
+                     void (*cb)(void *user, void *ptr));
+int Curl_hash_count(curl_hash *h);
+void Curl_hash_clean(curl_hash *h);
+void Curl_hash_clean_with_criterium(curl_hash *h, void *user, int (*comp)(void *, void *));
+void Curl_hash_destroy(curl_hash *h);
+
+#endif
diff --git a/main/source/curl/lib/hostip.c b/main/source/curl/lib/hostip.c
new file mode 100644
index 00000000..85408754
--- /dev/null
+++ b/main/source/curl/lib/hostip.c
@@ -0,0 +1,754 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: hostip.c,v 1.87 2003/05/13 12:12:17 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#include <string.h>
+#include <errno.h>
+
+#define _REENTRANT
+
+#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
+#include <winsock.h>
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>	/* required for free() prototypes */
+#endif
+#ifdef	VMS
+#include <in.h>
+#include <inet.h>
+#include <stdlib.h>
+#endif
+#endif
+
+#ifdef HAVE_SETJMP_H
+#include <setjmp.h>
+#endif
+
+#include "urldata.h"
+#include "sendf.h"
+#include "hostip.h"
+#include "hash.h"
+#include "share.h"
+
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
+#include "inet_ntoa_r.h"
+#endif
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+static curl_hash hostname_cache;
+static int host_cache_initialized;
+
+static Curl_addrinfo *my_getaddrinfo(struct SessionHandle *data,
+                                       char *hostname,
+                                       int port,
+                                       char **bufp);
+
+void Curl_global_host_cache_init(void)
+{
+  if (!host_cache_initialized) {
+    Curl_hash_init(&hostname_cache, 7, Curl_freednsinfo);
+    host_cache_initialized = 1;
+  }
+}
+
+curl_hash *Curl_global_host_cache_get(void)
+{
+  return &hostname_cache;
+}
+
+void Curl_global_host_cache_dtor(void)
+{
+  if (host_cache_initialized) {
+    Curl_hash_clean(&hostname_cache);
+    host_cache_initialized = 0;
+  }
+}
+
+/* count the number of characters that an integer takes up */
+static int _num_chars(int i)
+{
+  int chars = 0;
+
+  /* While the number divided by 10 is greater than one, 
+   * re-divide the number by 10, and increment the number of 
+   * characters by 1.
+   *
+   * this relies on the fact that for every multiple of 10, 
+   * a new digit is added onto every number
+   */
+  do {
+    chars++;
+
+    i = (int) i / 10;
+  } while (i >= 1);
+
+  return chars;
+}
+
+/* Create a hostcache id */
+static char *
+create_hostcache_id(char *server, int port, ssize_t *entry_len)
+{
+  char *id = NULL;
+
+  /* Get the length of the new entry id */
+  *entry_len = *entry_len +      /* Hostname length */
+               1 +               /* The ':' seperator */
+               _num_chars(port); /* The number of characters the port will take up */
+  
+  /* Allocate the new entry id */
+  id = malloc(*entry_len + 1);
+  if (!id) {
+    return NULL;
+  }
+
+  /* Create the new entry */
+  /* If sprintf() doesn't return the entry length, that signals failure */
+  if (sprintf(id, "%s:%d", server, port) != *entry_len) {
+    /* Free the allocated id, set length to zero and return NULL */
+    *entry_len = 0;
+    free(id);
+    return NULL;
+  }
+
+  return id;
+}
+
+struct hostcache_prune_data {
+  int cache_timeout;
+  int now;
+};
+
+static int
+hostcache_timestamp_remove(void *datap, void *hc)
+{
+  struct hostcache_prune_data *data = 
+    (struct hostcache_prune_data *) datap;
+  struct Curl_dns_entry *c = (struct Curl_dns_entry *) hc;
+  
+  if ((data->now - c->timestamp < data->cache_timeout) ||
+      c->inuse) {
+    /* please don't remove */
+    return 0;
+  }
+  
+  /* fine, remove */
+  return 1;
+}
+
+static void
+hostcache_prune(curl_hash *hostcache, int cache_timeout, int now)
+{
+  struct hostcache_prune_data user;
+
+  user.cache_timeout = cache_timeout;
+  user.now = now;
+  
+  Curl_hash_clean_with_criterium(hostcache, 
+                                 (void *) &user, 
+                                 hostcache_timestamp_remove);
+}
+
+#if defined(MALLOCDEBUG) && defined(AGGRESIVE_TEST)
+/* Called from Curl_done() to check that there's no DNS cache entry with
+   a non-zero counter left. */
+void Curl_scan_cache_used(void *user, void *ptr)
+{
+  struct Curl_dns_entry *e = ptr;
+  (void)user; /* prevent compiler warning */
+  if(e->inuse) {
+    fprintf(stderr, "*** WARNING: locked DNS cache entry detected: %s\n",
+            e->entry_id);
+    /* perform a segmentation fault to draw attention */
+    *(void **)0 = 0;
+  }
+}
+#endif
+
+/* Macro to save redundant free'ing of entry_id */
+#define HOSTCACHE_RETURN(dns) \
+{ \
+  free(entry_id); \
+  if(data->share) \
+  {               \
+    Curl_share_unlock(data, CURL_LOCK_DATA_DNS); \
+  }               \
+  return dns; \
+}
+
+#ifdef HAVE_SIGSETJMP
+/* Beware this is a global and unique instance */
+sigjmp_buf curl_jmpenv;
+#endif
+
+struct Curl_dns_entry *Curl_resolv(struct SessionHandle *data,
+                                   char *hostname,
+                                   int port)
+{
+  char *entry_id = NULL;
+  struct Curl_dns_entry *dns = NULL;
+  ssize_t entry_len;
+  time_t now;
+  char *bufp;
+
+#ifdef HAVE_SIGSETJMP
+  /* this allows us to time-out from the name resolver, as the timeout
+     will generate a signal and we will siglongjmp() from that here */
+  if(!data->set.no_signal && sigsetjmp(curl_jmpenv, 1)) {
+    /* this is coming from a siglongjmp() */
+    failf(data, "name lookup timed out");
+    return NULL;
+  }
+#endif
+
+  /* Create an entry id, based upon the hostname and port */
+  entry_len = strlen(hostname);
+  entry_id = create_hostcache_id(hostname, port, &entry_len);
+  /* If we can't create the entry id, fail */
+  if (!entry_id)
+    return NULL;
+
+  if(data->share)
+  {
+    Curl_share_lock(data, CURL_LOCK_DATA_DNS, CURL_LOCK_ACCESS_SINGLE);
+  }
+
+  /* See if its already in our dns cache */
+  dns = Curl_hash_pick(data->hostcache, entry_id, entry_len+1);
+
+  if (!dns) {
+    Curl_addrinfo *addr = my_getaddrinfo(data, hostname, port, &bufp);
+    
+    if (!addr) {
+      HOSTCACHE_RETURN(NULL);
+    }
+
+    /* Create a new cache entry */
+    dns = (struct Curl_dns_entry *) malloc(sizeof(struct Curl_dns_entry));
+    if (!dns) {
+      Curl_freeaddrinfo(addr);
+      HOSTCACHE_RETURN(NULL);
+    }
+
+    dns->inuse = 0;
+    dns->addr = addr;
+    /* Save it in our host cache */
+    Curl_hash_add(data->hostcache, entry_id, entry_len+1, (const void *) dns);
+  }
+  time(&now);
+
+  dns->timestamp = now;
+  dns->inuse++;         /* mark entry as in-use */
+#ifdef MALLOCDEBUG
+  dns->entry_id = entry_id;
+#endif
+
+  /* Remove outdated and unused entries from the hostcache */
+  hostcache_prune(data->hostcache, 
+                  data->set.dns_cache_timeout, 
+                  now);
+
+  HOSTCACHE_RETURN(dns);
+}
+
+void Curl_resolv_unlock(struct SessionHandle *data, struct Curl_dns_entry *dns)
+{
+  if(data->share)
+  {
+    Curl_share_lock(data, CURL_LOCK_DATA_DNS, CURL_LOCK_ACCESS_SINGLE);
+  }
+  dns->inuse--;
+  if(data->share)
+  {
+    Curl_share_unlock(data, CURL_LOCK_DATA_DNS);
+  }
+}
+
+/*
+ * This is a wrapper function for freeing name information in a protocol
+ * independent way. This takes care of using the appropriate underlaying
+ * function.
+ */
+void Curl_freeaddrinfo(Curl_addrinfo *p)
+{
+#ifdef ENABLE_IPV6
+  freeaddrinfo(p);
+#else
+  free(p);
+#endif
+}
+
+/*
+ * Free a cache dns entry.
+ */
+void Curl_freednsinfo(void *freethis)
+{
+  struct Curl_dns_entry *p = (struct Curl_dns_entry *) freethis;
+
+  Curl_freeaddrinfo(p->addr);
+
+  free(p);
+}
+
+/* --- resolve name or IP-number --- */
+
+#ifdef ENABLE_IPV6
+
+#ifdef MALLOCDEBUG
+/* These two are strictly for memory tracing and are using the same
+ * style as the family otherwise present in memdebug.c. I put these ones
+ * here since they require a bunch of struct types I didn't wanna include
+ * in memdebug.c
+ */
+int curl_getaddrinfo(char *hostname, char *service,
+                     struct addrinfo *hints,
+                     struct addrinfo **result,
+                     int line, const char *source)
+{
+  int res=(getaddrinfo)(hostname, service, hints, result);
+  if(0 == res) {
+    /* success */
+    if(logfile)
+      fprintf(logfile, "ADDR %s:%d getaddrinfo() = %p\n",
+              source, line, (void *)*result);
+  }
+  else {
+    if(logfile)
+      fprintf(logfile, "ADDR %s:%d getaddrinfo() failed\n",
+              source, line);
+  }
+  return res;
+}
+
+void curl_freeaddrinfo(struct addrinfo *freethis,
+                       int line, const char *source)
+{
+  (freeaddrinfo)(freethis);
+  if(logfile)
+    fprintf(logfile, "ADDR %s:%d freeaddrinfo(%p)\n",
+            source, line, (void *)freethis);
+}
+
+#endif
+
+/*
+ * Return name information about the given hostname and port number. If
+ * successful, the 'addrinfo' is returned and the forth argument will point to
+ * memory we need to free after use. That meory *MUST* be freed with
+ * Curl_freeaddrinfo(), nothing else.
+ */
+static Curl_addrinfo *my_getaddrinfo(struct SessionHandle *data,
+                                     char *hostname,
+                                     int port,
+                                     char **bufp)
+{
+  struct addrinfo hints, *res;
+  int error;
+  char sbuf[NI_MAXSERV];
+  int s, pf = PF_UNSPEC;
+
+  /* see if we have an IPv6 stack */
+  s = socket(PF_INET6, SOCK_DGRAM, 0);
+  if (s < 0)
+    /* Some non-IPv6 stacks have been found to make very slow name resolves
+     * when PF_UNSPEC is used, so thus we switch to a mere PF_INET lookup if
+     * the stack seems to be a non-ipv6 one. */
+    pf = PF_INET;
+  else
+    /* This seems to be an IPv6-capable stack, use PF_UNSPEC for the widest
+     * possible checks. And close the socket again.
+     */
+    sclose(s);
+ 
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = pf;
+  hints.ai_socktype = SOCK_STREAM;
+  hints.ai_flags = AI_CANONNAME;
+  snprintf(sbuf, sizeof(sbuf), "%d", port);
+  error = getaddrinfo(hostname, sbuf, &hints, &res);
+  if (error) {
+    infof(data, "getaddrinfo(3) failed for %s:%d\n", hostname, port);    
+    return NULL;
+  }
+  *bufp=(char *)res; /* make it point to the result struct */
+
+  return res;
+}
+#else /* following code is IPv4-only */
+
+#ifndef HAVE_GETHOSTBYNAME_R
+static void hostcache_fixoffset(struct hostent *h, int offset);
+/**
+ * Performs a "deep" copy of a hostent into a buffer (returns a pointer to the
+ * copy). Make absolutely sure the destination buffer is big enough!
+ *
+ * Keith McGuigan 
+ * 10/3/2001 */
+static struct hostent* pack_hostent(char** buf, struct hostent* orig)
+{
+  char *bufptr;
+  char *newbuf;
+  struct hostent* copy;
+
+  int i;
+  char *str;
+  int len;
+
+  bufptr = *buf;
+  copy = (struct hostent*)bufptr;
+
+  bufptr += sizeof(struct hostent);
+  copy->h_name = bufptr;
+  len = strlen(orig->h_name) + 1;
+  strncpy(bufptr, orig->h_name, len);
+  bufptr += len;
+
+  /* we align on even 64bit boundaries for safety */
+#define MEMALIGN(x) ((x)+(8-(((unsigned long)(x))&0x7)))
+
+  /* This must be aligned properly to work on many CPU architectures! */
+  bufptr = MEMALIGN(bufptr);
+  
+  copy->h_aliases = (char**)bufptr;
+
+  /* Figure out how many aliases there are */
+  for (i = 0; orig->h_aliases[i] != NULL; ++i);
+
+  /* Reserve room for the array */
+  bufptr += (i + 1) * sizeof(char*);
+
+  /* Clone all known aliases */
+  for(i = 0; (str = orig->h_aliases[i]); i++) {
+    len = strlen(str) + 1;
+    strncpy(bufptr, str, len);
+    copy->h_aliases[i] = bufptr;
+    bufptr += len;
+  }
+  /* Terminate the alias list with a NULL */
+  copy->h_aliases[i] = NULL;
+
+  copy->h_addrtype = orig->h_addrtype;
+  copy->h_length = orig->h_length;
+    
+  /* align it for (at least) 32bit accesses */
+  bufptr = MEMALIGN(bufptr);
+
+  copy->h_addr_list = (char**)bufptr;
+
+  /* Figure out how many addresses there are */
+  for (i = 0; orig->h_addr_list[i] != NULL; ++i);
+
+  /* Reserve room for the array */
+  bufptr += (i + 1) * sizeof(char*);
+
+  i = 0;
+  len = orig->h_length;
+  str = orig->h_addr_list[i];
+  while (str != NULL) {
+    memcpy(bufptr, str, len);
+    copy->h_addr_list[i] = bufptr;
+    bufptr += len;
+    str = orig->h_addr_list[++i];
+  }
+  copy->h_addr_list[i] = NULL;
+
+  /* now, shrink the allocated buffer to the size we actually need, which
+     most often is only a fraction of the original alloc */
+  newbuf=(char *)realloc(*buf, (int)bufptr-(int)(*buf));
+
+  /* if the alloc moved, we need to adjust things again */
+  if(newbuf != *buf)
+    hostcache_fixoffset((struct hostent*)newbuf, (int)newbuf-(int)*buf);
+
+  /* setup the return */
+  *buf = newbuf;
+  copy = (struct hostent*)newbuf;
+
+  return copy;
+}
+#endif
+
+static char *MakeIP(unsigned long num, char *addr, int addr_len)
+{
+#if defined(HAVE_INET_NTOA) || defined(HAVE_INET_NTOA_R)
+  struct in_addr in;
+  in.s_addr = htonl(num);
+
+#if defined(HAVE_INET_NTOA_R)
+  inet_ntoa_r(in,addr,addr_len);
+#else
+  strncpy(addr,inet_ntoa(in),addr_len);
+#endif
+#else
+  unsigned char *paddr;
+
+  num = htonl(num);  /* htonl() added to avoid endian probs */
+  paddr = (unsigned char *)&num;
+  sprintf(addr, "%u.%u.%u.%u", paddr[0], paddr[1], paddr[2], paddr[3]);
+#endif
+  return (addr);
+}
+
+static void hostcache_fixoffset(struct hostent *h, int offset)
+{
+  int i=0;
+  h->h_name=(char *)((long)h->h_name+offset);
+  h->h_aliases=(char **)((long)h->h_aliases+offset);
+  while(h->h_aliases[i]) {
+    h->h_aliases[i]=(char *)((long)h->h_aliases[i]+offset);
+    i++;
+  }
+  h->h_addr_list=(char **)((long)h->h_addr_list+offset);
+  i=0;
+  while(h->h_addr_list[i]) {
+    h->h_addr_list[i]=(char *)((long)h->h_addr_list[i]+offset);
+    i++;
+  }
+}
+
+/* The original code to this function was once stolen from the Dancer source
+   code, written by Bjorn Reese, it has since been patched and modified
+   considerably. */
+static Curl_addrinfo *my_getaddrinfo(struct SessionHandle *data,
+                                     char *hostname,
+                                     int port,
+                                     char **bufp)
+{
+  struct hostent *h = NULL;
+  in_addr_t in;
+  int ret; /* this variable is unused on several platforms but used on some */
+
+#define CURL_NAMELOOKUP_SIZE 9000
+  /* Allocate enough memory to hold the full name information structs and
+   * everything. OSF1 is known to require at least 8872 bytes. The buffer
+   * required for storing all possible aliases and IP numbers is according to
+   * Stevens' Unix Network Programming 2nd editor, p. 304: 8192 bytes! */
+  port=0; /* unused in IPv4 code */
+  ret = 0; /* to prevent the compiler warning */
+
+  in=inet_addr(hostname);
+  if (in != CURL_INADDR_NONE) {
+    struct in_addr *addrentry;
+    struct namebuf {
+        struct hostent hostentry;
+        char *h_addr_list[2];
+        struct in_addr addrentry;
+        char h_name[128];
+    } *buf = (struct namebuf *)malloc(sizeof(struct namebuf));
+    if(!buf)
+      return NULL; /* major failure */
+    *bufp = (char *)buf;
+
+    h = &buf->hostentry;
+    h->h_addr_list = &buf->h_addr_list[0];
+    addrentry = &buf->addrentry;
+    addrentry->s_addr = in;
+    h->h_addr_list[0] = (char*)addrentry;
+    h->h_addr_list[1] = NULL;
+    h->h_addrtype = AF_INET;
+    h->h_length = sizeof(*addrentry);
+    h->h_name = &buf->h_name[0];
+    MakeIP(ntohl(in), (char *)h->h_name, sizeof(buf->h_name));
+  }
+#if defined(HAVE_GETHOSTBYNAME_R)
+  else {
+    int h_errnop;
+    int res=ERANGE;
+    int step_size=200;
+    int *buf = (int *)malloc(CURL_NAMELOOKUP_SIZE);
+    if(!buf)
+      return NULL; /* major failure */
+    *bufp=(char *)buf;
+
+     /* Workaround for gethostbyname_r bug in qnx nto. It is also _required_
+        for some of these functions. */
+    memset(buf, 0, CURL_NAMELOOKUP_SIZE);
+#ifdef HAVE_GETHOSTBYNAME_R_5
+    /* Solaris, IRIX and more */
+    (void)res; /* prevent compiler warning */
+    while(!h) {
+      h = gethostbyname_r(hostname,
+                          (struct hostent *)buf,
+                          (char *)buf + sizeof(struct hostent),
+                          step_size - sizeof(struct hostent),
+                          &h_errnop);
+
+      /* If the buffer is too small, it returns NULL and sets errno to
+         ERANGE. The errno is thread safe if this is compiled with
+         -D_REENTRANT as then the 'errno' variable is a macro defined to
+         get used properly for threads. */
+
+      if(h || (errno != ERANGE))
+        break;
+      
+      step_size+=200;
+    }
+
+#ifdef MALLOCDEBUG
+    infof(data, "gethostbyname_r() uses %d bytes\n", step_size);
+#endif
+
+    if(h) {
+      int offset;
+      h=(struct hostent *)realloc(buf, step_size);
+      offset=(long)h-(long)buf;
+      hostcache_fixoffset(h, offset);
+      buf=(int *)h;
+      *bufp=(char *)buf;
+    }
+    else
+#endif
+#ifdef HAVE_GETHOSTBYNAME_R_6
+    /* Linux */
+    do {
+      res=gethostbyname_r(hostname,
+			  (struct hostent *)buf,
+			  (char *)buf + sizeof(struct hostent),
+			  step_size - sizeof(struct hostent),
+			  &h, /* DIFFERENCE */
+			  &h_errnop);
+      /* Redhat 8, using glibc 2.2.93 changed the behavior. Now all of a
+         sudden this function returns EAGAIN if the given buffer size is too
+         small. Previous versions are known to return ERANGE for the same
+         problem.
+
+         This wouldn't be such a big problem if older versions wouldn't
+         sometimes return EAGAIN on a common failure case. Alas, we can't
+         assume that EAGAIN *or* ERANGE means ERANGE for any given version of
+         glibc.
+
+         For now, we do that and thus we may call the function repeatedly and
+         fail for older glibc versions that return EAGAIN, until we run out
+         of buffer size (step_size grows beyond CURL_NAMELOOKUP_SIZE).
+
+         If anyone has a better fix, please tell us!
+      */
+
+      if((ERANGE == res) || (EAGAIN == res)) {
+	step_size+=200;
+	continue;
+      }
+      break;
+    } while(step_size <= CURL_NAMELOOKUP_SIZE);
+
+    if(!h) /* failure */
+      res=1;
+    
+#ifdef MALLOCDEBUG
+    infof(data, "gethostbyname_r() uses %d bytes\n", step_size);
+#endif
+    if(!res) {
+      int offset;
+      h=(struct hostent *)realloc(buf, step_size);
+      offset=(long)h-(long)buf;
+      hostcache_fixoffset(h, offset);
+      buf=(int *)h;
+      *bufp=(char *)buf;
+    }
+    else
+#endif
+#ifdef HAVE_GETHOSTBYNAME_R_3
+    /* AIX, Digital Unix, HPUX 10, more? */
+
+    /* For AIX 4.3 or later, we don't use gethostbyname_r() at all, because of
+       the plain fact that it does not return unique full buffers on each
+       call, but instead several of the pointers in the hostent structs will
+       point to the same actual data! This have the unfortunate down-side that
+       our caching system breaks down horribly. Luckily for us though, AIX 4.3
+       and more recent versions have a completely thread-safe libc where all
+       the data is stored in thread-specific memory areas making calls to the
+       plain old gethostbyname() work fine even for multi-threaded programs.
+       
+       This AIX 4.3 or later detection is all made in the configure script.
+
+       Troels Walsted Hansen helped us work this out on March 3rd, 2003. */
+
+    if(CURL_NAMELOOKUP_SIZE >=
+       (sizeof(struct hostent)+sizeof(struct hostent_data)))
+
+      /* August 22nd, 2000: Albert Chin-A-Young brought an updated version
+       * that should work! September 20: Richard Prescott worked on the buffer
+       * size dilemma. */
+
+      ret = gethostbyname_r(hostname,
+                            (struct hostent *)buf,
+                            (struct hostent_data *)((char *)buf +
+                                                    sizeof(struct hostent)));
+    else
+      ret = -1; /* failure, too smallish buffer size */
+    
+    /* result expected in h */
+    h = (struct hostent*)buf;
+    h_errnop= errno; /* we don't deal with this, but set it anyway */
+    if(ret)
+#endif
+      {
+      infof(data, "gethostbyname_r(2) failed for %s\n", hostname);
+      h = NULL; /* set return code to NULL */
+      free(buf);
+      *bufp=NULL;
+    }
+#else
+  else {
+    if ((h = gethostbyname(hostname)) == NULL ) {
+      infof(data, "gethostbyname(2) failed for %s\n", hostname);
+      *bufp=NULL;
+    }
+    else 
+    {
+      char *buf=(char *)malloc(CURL_NAMELOOKUP_SIZE);
+      /* we make a copy of the hostent right now, right here, as the
+         static one we got a pointer to might get removed when we don't
+         want/expect that */
+      h = pack_hostent(&buf, h);
+      *bufp=(char *)buf;
+    }
+#endif
+  }
+  return (h);
+}
+
+#endif /* end of IPv4-specific code */
diff --git a/main/source/curl/lib/hostip.h b/main/source/curl/lib/hostip.h
new file mode 100644
index 00000000..3ad450b7
--- /dev/null
+++ b/main/source/curl/lib/hostip.h
@@ -0,0 +1,89 @@
+#ifndef __HOSTIP_H
+#define __HOSTIP_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: hostip.h,v 1.23 2003/05/13 12:12:17 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+#include "hash.h"
+
+struct addrinfo;
+struct hostent;
+struct SessionHandle;
+
+void Curl_global_host_cache_init(void);
+void Curl_global_host_cache_dtor(void);
+curl_hash *Curl_global_host_cache_get(void);
+
+#define Curl_global_host_cache_use(__p) ((__p)->set.global_dns_cache)
+
+struct Curl_dns_entry {
+  Curl_addrinfo *addr;
+  time_t timestamp;
+  long inuse;      /* use-counter, make very sure you decrease this
+                      when you're done using the address you received */
+#ifdef MALLOCDEBUG
+  char *entry_id;
+#endif
+};
+
+/*
+ * Curl_resolv() returns an entry with the info for the specified host
+ * and port.
+ *
+ * The returned data *MUST* be "unlocked" with Curl_resolv_unlock() after
+ * use, or we'll leak memory!
+ */
+
+struct Curl_dns_entry *Curl_resolv(struct SessionHandle *data,
+                                   char *hostname,
+                                   int port);
+
+/* unlock a previously resolved dns entry */
+void Curl_resolv_unlock(struct SessionHandle *data, struct Curl_dns_entry *dns);
+
+/* for debugging purposes only: */
+void Curl_scan_cache_used(void *user, void *ptr);
+
+/* free name info */
+void Curl_freeaddrinfo(Curl_addrinfo *freeaddr);
+
+/* free cached name info */
+void Curl_freednsinfo(void *freethis);
+
+#ifdef MALLOCDEBUG
+void curl_freeaddrinfo(struct addrinfo *freethis,
+                       int line, const char *source);
+int curl_getaddrinfo(char *hostname, char *service,
+                     struct addrinfo *hints,
+                     struct addrinfo **result,
+                     int line, const char *source);
+#endif
+
+#ifndef INADDR_NONE
+#define CURL_INADDR_NONE (in_addr_t) ~0
+#else
+#define CURL_INADDR_NONE INADDR_NONE
+#endif
+
+
+#endif
diff --git a/main/source/curl/lib/http.c b/main/source/curl/lib/http.c
new file mode 100644
index 00000000..58572790
--- /dev/null
+++ b/main/source/curl/lib/http.c
@@ -0,0 +1,1212 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: http.c,v 1.128 2003/05/12 12:29:00 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#ifndef CURL_DISABLE_HTTP
+/* -- WIN32 approved -- */
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <errno.h>
+
+#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
+#include <winsock.h>
+#include <time.h>
+#include <io.h>
+#else
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#include <sys/time.h>
+
+#ifdef HAVE_TIME_H
+#ifdef TIME_WITH_SYS_TIME
+#include <time.h>
+#endif
+#endif
+
+#include <sys/resource.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <netdb.h>
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NET_IF_H
+#include <net/if.h>
+#endif
+#include <sys/ioctl.h>
+#include <signal.h>
+
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+
+#endif
+
+#include "urldata.h"
+#include <curl/curl.h>
+#include "transfer.h"
+#include "sendf.h"
+#include "formdata.h"
+#include "progress.h"
+#include "base64.h"
+#include "cookie.h"
+#include "strequal.h"
+#include "ssluse.h"
+
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+/* fread() emulation to provide POST and/or request data */
+static int readmoredata(char *buffer,
+                        size_t size,
+                        size_t nitems,
+                        void *userp)
+{
+  struct connectdata *conn = (struct connectdata *)userp;
+  struct HTTP *http = conn->proto.http;
+  int fullsize = size * nitems;
+
+  if(0 == http->postsize)
+    /* nothing to return */
+    return 0;
+  
+  /* make sure that a HTTP request is never sent away chunked! */
+  conn->bits.forbidchunk= (http->sending == HTTPSEND_REQUEST)?TRUE:FALSE;
+
+  if(http->postsize <= fullsize) {
+    memcpy(buffer, http->postdata, http->postsize);
+    fullsize = http->postsize;
+
+    if(http->backup.postsize) {
+      /* move backup data into focus and continue on that */
+      http->postdata = http->backup.postdata;
+      http->postsize = http->backup.postsize;
+      conn->fread =    http->backup.fread;
+      conn->fread_in = http->backup.fread_in;
+
+      http->sending++; /* move one step up */
+
+      http->backup.postsize=0;
+    }
+    else
+      http->postsize = 0;
+
+    return fullsize;
+  }
+
+  memcpy(buffer, http->postdata, fullsize);
+  http->postdata += fullsize;
+  http->postsize -= fullsize;
+
+  return fullsize;
+}
+
+/* ------------------------------------------------------------------------- */
+/*
+ * The add_buffer series of functions are used to build one large memory chunk
+ * from repeated function invokes. Used so that the entire HTTP request can
+ * be sent in one go.
+ */
+
+struct send_buffer {
+  char *buffer;
+  size_t size_max;
+  size_t size_used;
+};
+typedef struct send_buffer send_buffer;
+
+static CURLcode
+ add_buffer(send_buffer *in, const void *inptr, size_t size);
+
+/*
+ * add_buffer_init() returns a fine buffer struct
+ */
+static
+send_buffer *add_buffer_init(void)
+{
+  send_buffer *blonk;
+  blonk=(send_buffer *)malloc(sizeof(send_buffer));
+  if(blonk) {
+    memset(blonk, 0, sizeof(send_buffer));
+    return blonk;
+  }
+  return NULL; /* failed, go home */
+}
+
+/*
+ * add_buffer_send() sends a buffer and frees all associated memory.
+ */
+static
+CURLcode add_buffer_send(send_buffer *in,
+                         int sockfd,
+                         struct connectdata *conn,
+                         long *bytes_written) /* add the number of sent
+                                                 bytes to this counter */
+{
+  ssize_t amount;
+  CURLcode res;
+  char *ptr;
+  int size;
+  struct HTTP *http = conn->proto.http;
+
+  /* The looping below is required since we use non-blocking sockets, but due
+     to the circumstances we will just loop and try again and again etc */
+
+  ptr = in->buffer;
+  size = in->size_used;
+
+  res = Curl_write(conn, sockfd, ptr, size, &amount);
+
+  if(CURLE_OK == res) {
+
+    if(conn->data->set.verbose)
+      /* this data _may_ contain binary stuff */
+      Curl_debug(conn->data, CURLINFO_HEADER_OUT, ptr, amount);
+
+    *bytes_written += amount;
+    
+    if(amount != size) {
+      /* The whole request could not be sent in one system call. We must queue
+         it up and send it later when we get the chance. We must not loop here
+         and wait until it might work again. */
+
+      size -= amount;
+      ptr += amount;
+    
+      /* backup the currently set pointers */
+      http->backup.fread = conn->fread;
+      http->backup.fread_in = conn->fread_in;
+      http->backup.postdata = http->postdata;
+      http->backup.postsize = http->postsize;
+
+      /* set the new pointers for the request-sending */
+      conn->fread = (curl_read_callback)readmoredata;
+      conn->fread_in = (void *)conn;
+      http->postdata = ptr;
+      http->postsize = size;
+
+      http->send_buffer = in;
+      http->sending = HTTPSEND_REQUEST;
+      
+      return CURLE_OK;
+    }
+    http->sending = HTTPSEND_BODY;
+    /* the full buffer was sent, clean up and return */
+  }
+  if(in->buffer)
+    free(in->buffer);
+  free(in);
+
+  return res;
+}
+
+
+/* 
+ * add_bufferf() builds a buffer from the formatted input
+ */
+static
+CURLcode add_bufferf(send_buffer *in, const char *fmt, ...)
+{
+  CURLcode result = CURLE_OUT_OF_MEMORY;
+  char *s;
+  va_list ap;
+  va_start(ap, fmt);
+  s = vaprintf(fmt, ap); /* this allocs a new string to append */
+  va_end(ap);
+
+  if(s) {
+    result = add_buffer(in, s, strlen(s));
+    free(s);
+  }
+  return result;
+}
+
+/*
+ * add_buffer() appends a memory chunk to the existing one
+ */
+static
+CURLcode add_buffer(send_buffer *in, const void *inptr, size_t size)
+{
+  char *new_rb;
+  int new_size;
+
+  if(!in->buffer ||
+     ((in->size_used + size) > (in->size_max - 1))) {
+    new_size = (in->size_used+size)*2;
+    if(in->buffer)
+      /* we have a buffer, enlarge the existing one */
+      new_rb = (char *)realloc(in->buffer, new_size);
+    else
+      /* create a new buffer */
+      new_rb = (char *)malloc(new_size);
+
+    if(!new_rb)
+      return CURLE_OUT_OF_MEMORY;
+
+    in->buffer = new_rb;
+    in->size_max = new_size;
+  }
+  memcpy(&in->buffer[in->size_used], inptr, size);
+      
+  in->size_used += size;
+
+  return CURLE_OK;
+}
+
+/* end of the add_buffer functions */
+/* ------------------------------------------------------------------------- */
+
+/*
+ * Curl_compareheader()
+ *
+ * Returns TRUE if 'headerline' contains the 'header' with given 'content'.
+ * Pass headers WITH the colon.
+ */
+bool
+Curl_compareheader(char *headerline,    /* line to check */
+                   const char *header,  /* header keyword _with_ colon */
+                   const char *content) /* content string to find */
+{
+  /* RFC2616, section 4.2 says: "Each header field consists of a name followed
+   * by a colon (":") and the field value. Field names are case-insensitive.
+   * The field value MAY be preceded by any amount of LWS, though a single SP
+   * is preferred." */
+
+  size_t hlen = strlen(header);
+  size_t clen;
+  size_t len;
+  char *start;
+  char *end;
+
+  if(!strnequal(headerline, header, hlen))
+    return FALSE; /* doesn't start with header */
+
+  /* pass the header */
+  start = &headerline[hlen];
+
+  /* pass all white spaces */
+  while(*start && isspace((int)*start))
+    start++;
+
+  /* find the end of the header line */
+  end = strchr(start, '\r'); /* lines end with CRLF */
+  if(!end) {
+    /* in case there's a non-standard compliant line here */
+    end = strchr(start, '\n');
+
+    if(!end)
+      /* hm, there's no line ending here, use the zero byte! */
+      end = strchr(start, '\0');
+  }
+
+  len = end-start; /* length of the content part of the input line */
+  clen = strlen(content); /* length of the word to find */
+
+  /* find the content string in the rest of the line */
+  for(;len>=clen;len--, start++) {
+    if(strnequal(start, content, clen))
+      return TRUE; /* match! */
+  }
+
+  return FALSE; /* no match */
+}
+
+/*
+ * This function checks the linked list of custom HTTP headers for a particular
+ * header (prefix).
+ */
+static char *checkheaders(struct SessionHandle *data, const char *thisheader)
+{
+  struct curl_slist *head;
+  size_t thislen = strlen(thisheader);
+
+  for(head = data->set.headers; head; head=head->next) {
+    if(strnequal(head->data, thisheader, thislen))
+      return head->data;
+  }
+  return NULL;
+}
+
+/*
+ * ConnectHTTPProxyTunnel() requires that we're connected to a HTTP proxy. This
+ * function will issue the necessary commands to get a seamless tunnel through
+ * this proxy. After that, the socket can be used just as a normal socket.
+ */
+
+CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn,
+                                     int tunnelsocket,
+                                     char *hostname, int remote_port)
+{
+  int httperror=0;
+  int subversion=0;
+  struct SessionHandle *data=conn->data;
+  CURLcode result;
+  int res;
+
+  int nread;   /* total size read */
+  int perline; /* count bytes per line */
+  bool keepon=TRUE;
+  ssize_t gotbytes;
+  char *ptr;
+  int timeout = 3600; /* default timeout in seconds */
+  struct timeval interval;
+  fd_set rkeepfd;
+  fd_set readfd;
+  char *line_start;
+
+#define SELECT_OK      0
+#define SELECT_ERROR   1
+#define SELECT_TIMEOUT 2
+  int error = SELECT_OK;
+
+  infof(data, "Establish HTTP proxy tunnel to %s:%d\n", hostname, remote_port);
+
+  /* OK, now send the connect request to the proxy */
+  result =
+    Curl_sendf(tunnelsocket, conn,
+               "CONNECT %s:%d HTTP/1.0\015\012"
+               "%s"
+               "%s"
+               "\r\n",
+               hostname, remote_port,
+               (conn->bits.proxy_user_passwd)?conn->allocptr.proxyuserpwd:"",
+               (data->set.useragent?conn->allocptr.uagent:"")
+               );
+  if(result) {
+    failf(data, "Failed sending CONNECT to proxy");
+    return result;
+  }
+
+  /* Now, read the full reply we get from the proxy */
+
+
+  if(data->set.timeout) {
+    /* if timeout is requested, find out how much remaining time we have */
+    timeout = data->set.timeout - /* timeout time */
+      Curl_tvdiff(Curl_tvnow(), conn->now)/1000; /* spent time */
+    if(timeout <=0 ) {
+      failf(data, "Transfer aborted due to timeout");
+      return -SELECT_TIMEOUT; /* already too little time */
+    }
+  }
+
+  FD_ZERO (&readfd);		/* clear it */
+  FD_SET (tunnelsocket, &readfd);     /* read socket */
+
+  /* get this in a backup variable to be able to restore it on each lap in the
+     select() loop */
+  rkeepfd = readfd;
+
+  ptr=data->state.buffer;
+  line_start = ptr;
+
+  nread=0;
+  perline=0;
+  keepon=TRUE;
+
+  while((nread<BUFSIZE) && (keepon && !error)) {
+    readfd = rkeepfd;		   /* set every lap */
+    interval.tv_sec = timeout;
+    interval.tv_usec = 0;
+
+    switch (select (tunnelsocket+1, &readfd, NULL, NULL, &interval)) {
+    case -1: /* select() error, stop reading */
+      error = SELECT_ERROR;
+      failf(data, "Transfer aborted due to select() error");
+      break;
+    case 0: /* timeout */
+      error = SELECT_TIMEOUT;
+      failf(data, "Transfer aborted due to timeout");
+      break;
+    default:
+      /*
+       * This code previously didn't use the kerberos sec_read() code
+       * to read, but when we use Curl_read() it may do so. Do confirm
+       * that this is still ok and then remove this comment!
+       */
+      res= Curl_read(conn, tunnelsocket, ptr, BUFSIZE-nread,
+                     &gotbytes);
+      if(res< 0)
+        /* EWOULDBLOCK */
+        continue; /* go loop yourself */
+      else if(res)
+        keepon = FALSE;
+      else if(gotbytes <= 0) {
+        keepon = FALSE;
+        error = SELECT_ERROR;
+        failf(data, "Connection aborted");
+      }
+      else {
+        /* we got a whole chunk of data, which can be anything from one
+         * byte to a set of lines and possibly just a piece of the last
+         * line */
+        int i;
+
+        nread += gotbytes;
+        for(i = 0; i < gotbytes; ptr++, i++) {
+          perline++; /* amount of bytes in this line so far */
+          if(*ptr=='\n') {
+            /* a newline is CRLF in ftp-talk, so the CR is ignored as
+               the line isn't really terminated until the LF comes */
+
+            if('\r' == line_start[0]) {
+              /* end of headers */
+              keepon=FALSE;
+              break; /* breaks out of loop, not switch */
+            }
+
+            /* output debug output if that is requested */
+            if(data->set.verbose)
+              Curl_debug(data, CURLINFO_HEADER_IN, line_start, perline);
+
+            if(2 == sscanf(line_start, "HTTP/1.%d %d",
+                           &subversion,
+                           &httperror)) {
+              ;
+            }
+
+            perline=0; /* line starts over here */
+            line_start = ptr+1;
+          }
+        }
+      }
+      break;
+    } /* switch */
+  } /* while there's buffer left and loop is requested */
+
+  if(error)
+    return CURLE_RECV_ERROR;
+
+  if(200 != httperror) {
+    if(407 == httperror)
+      /* Added Nov 6 1998 */
+      failf(data, "Proxy requires authorization!");
+    else 
+      failf(data, "Received error code %d from proxy", httperror);
+    return CURLE_RECV_ERROR;
+  }
+
+  infof (data, "Proxy replied to CONNECT request\n");
+  return CURLE_OK;
+}
+
+/*
+ * HTTP stuff to do at connect-time.
+ */
+CURLcode Curl_http_connect(struct connectdata *conn)
+{
+  struct SessionHandle *data;
+  CURLcode result;
+
+  data=conn->data;
+
+  /* If we are not using a proxy and we want a secure connection,
+   * perform SSL initialization & connection now.
+   * If using a proxy with https, then we must tell the proxy to CONNECT
+   * us to the host we want to talk to.  Only after the connect
+   * has occured, can we start talking SSL
+   */
+
+  if(conn->bits.httpproxy &&
+     ((conn->protocol & PROT_HTTPS) || data->set.tunnel_thru_httpproxy)) {
+
+    /* either HTTPS over proxy, OR explicitly asked for a tunnel */
+    result = Curl_ConnectHTTPProxyTunnel(conn, conn->firstsocket,
+                                         conn->hostname, conn->remote_port);
+    if(CURLE_OK != result)
+      return result;
+  }    
+
+  if(conn->protocol & PROT_HTTPS) {
+    /* now, perform the SSL initialization for this socket */
+    result = Curl_SSLConnect(conn);
+    if(result)
+      return result;
+  }
+
+  if(conn->bits.user_passwd && !data->state.this_is_a_follow) {
+    /* Authorization: is requested, this is not a followed location, get the
+       original host name */
+    if (data->state.auth_host)
+      /* Free to avoid leaking memory on multiple requests*/
+      free(data->state.auth_host);
+
+    data->state.auth_host = strdup(conn->hostname);
+  }
+
+  return CURLE_OK;
+}
+
+CURLcode Curl_http_done(struct connectdata *conn)
+{
+  struct SessionHandle *data;
+  struct HTTP *http;
+
+  data=conn->data;
+  http=conn->proto.http;
+
+  /* set the proper values (possibly modified on POST) */
+  conn->fread = data->set.fread; /* restore */
+  conn->fread_in = data->set.in; /* restore */
+
+  if(http->send_buffer) {
+    send_buffer *buff = http->send_buffer;
+    
+    free(buff->buffer);
+    free(buff);
+  }
+
+  if(HTTPREQ_POST_FORM == data->set.httpreq) {
+    conn->bytecount = http->readbytecount + http->writebytecount;
+      
+    Curl_formclean(http->sendit); /* Now free that whole lot */
+  }
+  else if(HTTPREQ_PUT == data->set.httpreq)
+    conn->bytecount = http->readbytecount + http->writebytecount;
+
+  if(0 == (http->readbytecount + conn->headerbytecount)) {
+    /* nothing was read from the HTTP server, this can't be right
+       so we return an error here */
+    failf(data, "Empty reply from server");
+    return CURLE_GOT_NOTHING;
+  }
+
+  return CURLE_OK;
+}
+
+CURLcode Curl_http(struct connectdata *conn)
+{
+  struct SessionHandle *data=conn->data;
+  char *buf = data->state.buffer; /* this is a short cut to the buffer */
+  CURLcode result=CURLE_OK;
+  struct HTTP *http;
+  struct Cookie *co=NULL; /* no cookies from start */
+  char *ppath = conn->ppath; /* three previous function arguments */
+  char *host = conn->name;
+  const char *te = ""; /* tranfer-encoding */
+  char *ptr;
+
+  if(!conn->proto.http) {
+    /* Only allocate this struct if we don't already have it! */
+
+    http = (struct HTTP *)malloc(sizeof(struct HTTP));
+    if(!http)
+      return CURLE_OUT_OF_MEMORY;
+    memset(http, 0, sizeof(struct HTTP));
+    conn->proto.http = http;
+  }
+  else
+    http = conn->proto.http;
+
+  /* We default to persistant connections */
+  conn->bits.close = FALSE;
+
+  if ( (conn->protocol&(PROT_HTTP|PROT_FTP)) &&
+       data->set.upload) {
+    data->set.httpreq = HTTPREQ_PUT;
+  }
+  
+  /* The User-Agent string has been built in url.c already, because it might
+     have been used in the proxy connect, but if we have got a header with
+     the user-agent string specified, we erase the previously made string
+     here. */
+  if(checkheaders(data, "User-Agent:") && conn->allocptr.uagent) {
+    free(conn->allocptr.uagent);
+    conn->allocptr.uagent=NULL;
+  }
+
+  if((conn->bits.user_passwd) && !checkheaders(data, "Authorization:")) {
+    char *authorization;
+
+    /* To prevent the user+password to get sent to other than the original
+       host due to a location-follow, we do some weirdo checks here */
+    if(!data->state.this_is_a_follow ||
+       !data->state.auth_host ||
+       curl_strequal(data->state.auth_host, conn->hostname) ||
+       data->set.http_disable_hostname_check_before_authentication) {
+      sprintf(data->state.buffer, "%s:%s",
+              data->state.user, data->state.passwd);
+      if(Curl_base64_encode(data->state.buffer, strlen(data->state.buffer),
+                            &authorization) >= 0) {
+        if(conn->allocptr.userpwd)
+          free(conn->allocptr.userpwd);
+        conn->allocptr.userpwd = aprintf( "Authorization: Basic %s\015\012",
+                                          authorization);
+        free(authorization);
+      }
+    }
+  }
+  if((data->change.referer) && !checkheaders(data, "Referer:")) {
+    if(conn->allocptr.ref)
+      free(conn->allocptr.ref);
+    conn->allocptr.ref = aprintf("Referer: %s\015\012", data->change.referer);
+  }
+  if(data->set.cookie && !checkheaders(data, "Cookie:")) {
+    if(conn->allocptr.cookie)
+      free(conn->allocptr.cookie);
+    conn->allocptr.cookie = aprintf("Cookie: %s\015\012", data->set.cookie);
+  }
+
+  if(!conn->bits.upload_chunky && (data->set.httpreq != HTTPREQ_GET)) {
+    /* not a chunky transfer but data is to be sent */
+    char *ptr = checkheaders(data, "Transfer-Encoding:");
+    if(ptr) {
+      /* Some kind of TE is requested, check if 'chunked' is chosen */
+      if(Curl_compareheader(ptr, "Transfer-Encoding:", "chunked"))
+        /* we have been told explicitly to upload chunky so deal with it! */
+        conn->bits.upload_chunky = TRUE;
+    }
+  }
+
+  if(conn->bits.upload_chunky) {
+    /* RFC2616 section 4.4:
+       Messages MUST NOT include both a Content-Length header field and a
+       non-identity transfer-coding. If the message does include a non-
+       identity transfer-coding, the Content-Length MUST be ignored. */
+
+    if(!checkheaders(data, "Transfer-Encoding:")) {
+      te = "Transfer-Encoding: chunked\r\n";
+    }
+    else {
+      /* The "Transfer-Encoding:" header was already added. */
+      te = "";
+    }
+  }
+
+  ptr = checkheaders(data, "Host:");
+  if(ptr) {
+    /* If we have a given custom Host: header, we extract the host name
+       in order to possibly use it for cookie reasons later on. */
+    char *start = ptr+strlen("Host:");
+    char *ptr;
+    while(*start && isspace((int)*start ))
+      start++;
+    ptr = start; /* start host-scanning here */
+
+    /* scan through the string to find the end (space or colon) */
+    while(*ptr && !isspace((int)*ptr) && !(':'==*ptr))
+      ptr++;
+    
+    if(ptr != start) {
+      int len=ptr-start;
+      conn->allocptr.cookiehost = malloc(len+1);
+      if(!conn->allocptr.cookiehost)
+        return CURLE_OUT_OF_MEMORY;
+      memcpy(conn->allocptr.cookiehost, start, len);
+      conn->allocptr.cookiehost[len]=0;
+    }
+  }    
+  else {
+    /* if ptr_host is already set, it is almost OK since we only re-use
+       connections to the very same host and port, but when we use a HTTP
+       proxy we have a persistant connect and yet we must change the Host:
+       header! */
+
+    if(conn->allocptr.host)
+      free(conn->allocptr.host);
+
+    /* When building Host: headers, we must put the host name within
+       [brackets] if the host name is a plain IPv6-address. RFC2732-style. */
+       
+    if(((conn->protocol&PROT_HTTPS) && (conn->remote_port == PORT_HTTPS)) ||
+       (!(conn->protocol&PROT_HTTPS) && (conn->remote_port == PORT_HTTP)) )
+      /* If (HTTPS on port 443) OR (non-HTTPS on port 80) then don't include
+         the port number in the host string */
+      conn->allocptr.host = aprintf("Host: %s%s%s\r\n",
+                                    conn->bits.ipv6_ip?"[":"",
+                                    host,
+                                    conn->bits.ipv6_ip?"]":"");
+    else
+      conn->allocptr.host = aprintf("Host: %s%s%s:%d\r\n",
+                                    conn->bits.ipv6_ip?"[":"",
+                                    host,
+                                    conn->bits.ipv6_ip?"]":"",
+                                    conn->remote_port);
+  }
+
+  if(data->cookies) {
+    co = Curl_cookie_getlist(data->cookies,
+                             conn->allocptr.cookiehost?
+                             conn->allocptr.cookiehost:host, ppath,
+                             (bool)(conn->protocol&PROT_HTTPS?TRUE:FALSE));
+  }
+
+  if (data->change.proxy && *data->change.proxy &&
+      !data->set.tunnel_thru_httpproxy &&
+      !(conn->protocol&PROT_HTTPS))  {
+    /* The path sent to the proxy is in fact the entire URL */
+    ppath = data->change.url;
+  }
+  if(HTTPREQ_POST_FORM == data->set.httpreq) {
+    /* we must build the whole darned post sequence first, so that we have
+       a size of the whole shebang before we start to send it */
+     result = Curl_getFormData(&http->sendit, data->set.httppost,
+                               &http->postsize);
+     if(CURLE_OK != result) {
+       /* Curl_getFormData() doesn't use failf() */
+       failf(data, "failed creating formpost data");
+       return result;
+     }
+  }
+
+
+  if(!checkheaders(data, "Pragma:"))
+    http->p_pragma = "Pragma: no-cache\r\n";
+
+  if(!checkheaders(data, "Accept:"))
+    http->p_accept = "Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*\r\n";
+
+  if(( (HTTPREQ_POST == data->set.httpreq) ||
+       (HTTPREQ_POST_FORM == data->set.httpreq) ||
+       (HTTPREQ_PUT == data->set.httpreq) ) &&
+     conn->resume_from) {
+    /**********************************************************************
+     * Resuming upload in HTTP means that we PUT or POST and that we have
+     * got a resume_from value set. The resume value has already created
+     * a Range: header that will be passed along. We need to "fast forward"
+     * the file the given number of bytes and decrease the assume upload
+     * file size before we continue this venture in the dark lands of HTTP.
+     *********************************************************************/
+   
+    if(conn->resume_from < 0 ) {
+      /*
+       * This is meant to get the size of the present remote-file by itself.
+       * We don't support this now. Bail out!
+       */
+       conn->resume_from = 0;
+    }
+
+    if(conn->resume_from) {
+      /* do we still game? */
+      int passed=0;
+
+      /* Now, let's read off the proper amount of bytes from the
+         input. If we knew it was a proper file we could've just
+         fseek()ed but we only have a stream here */
+      do {
+        int readthisamountnow = (conn->resume_from - passed);
+        int actuallyread;
+
+        if(readthisamountnow > BUFSIZE)
+          readthisamountnow = BUFSIZE;
+
+        actuallyread =
+          data->set.fread(data->state.buffer, 1, readthisamountnow,
+                          data->set.in);
+
+        passed += actuallyread;
+        if(actuallyread != readthisamountnow) {
+          failf(data, "Could only read %d bytes from the input",
+                passed);
+          return CURLE_READ_ERROR;
+        }
+      } while(passed != conn->resume_from); /* loop until done */
+
+      /* now, decrease the size of the read */
+      if(data->set.infilesize>0) {
+        data->set.infilesize -= conn->resume_from;
+
+        if(data->set.infilesize <= 0) {
+          failf(data, "File already completely uploaded");
+          return CURLE_PARTIAL_FILE;
+        }
+      }
+      /* we've passed, proceed as normal */
+    }
+  }
+  if(conn->bits.use_range) {
+    /*
+     * A range is selected. We use different headers whether we're downloading
+     * or uploading and we always let customized headers override our internal
+     * ones if any such are specified.
+     */
+    if((data->set.httpreq == HTTPREQ_GET) &&
+       !checkheaders(data, "Range:")) {
+      /* if a line like this was already allocated, free the previous one */
+      if(conn->allocptr.rangeline)
+        free(conn->allocptr.rangeline);
+      conn->allocptr.rangeline = aprintf("Range: bytes=%s\r\n", conn->range);
+    }
+    else if((data->set.httpreq != HTTPREQ_GET) &&
+            !checkheaders(data, "Content-Range:")) {
+
+      if(conn->resume_from) {
+        /* This is because "resume" was selected */
+        long total_expected_size= conn->resume_from + data->set.infilesize;
+        conn->allocptr.rangeline = aprintf("Content-Range: bytes %s%ld/%ld\r\n",
+                                      conn->range, total_expected_size-1,
+                                      total_expected_size);
+      }
+      else {
+        /* Range was selected and then we just pass the incoming range and 
+           append total size */
+        conn->allocptr.rangeline = aprintf("Content-Range: bytes %s/%d\r\n",
+                                      conn->range, data->set.infilesize);
+      }
+    }
+  }
+
+  do {
+    /* Use 1.1 unless the use specificly asked for 1.0 */
+    const char *httpstring=
+      data->set.httpversion==CURL_HTTP_VERSION_1_0?"1.0":"1.1";
+
+    send_buffer *req_buffer;
+    struct curl_slist *headers=data->set.headers;
+
+    /* initialize a dynamic send-buffer */
+    req_buffer = add_buffer_init();
+
+    /* add the main request stuff */
+    add_bufferf(req_buffer,
+                "%s " /* GET/HEAD/POST/PUT */
+                "%s HTTP/%s\r\n" /* path */
+                "%s" /* proxyuserpwd */
+                "%s" /* userpwd */
+                "%s" /* range */
+                "%s" /* user agent */
+                "%s" /* cookie */
+                "%s" /* host */
+                "%s" /* pragma */
+                "%s" /* accept */
+                "%s" /* accept-encoding */
+                "%s" /* referer */
+                "%s",/* transfer-encoding */
+
+                data->set.customrequest?data->set.customrequest:
+                (data->set.no_body?"HEAD":
+                 ((HTTPREQ_POST == data->set.httpreq) ||
+                  (HTTPREQ_POST_FORM == data->set.httpreq))?"POST":
+                 (HTTPREQ_PUT == data->set.httpreq)?"PUT":"GET"),
+                ppath, httpstring,
+                (conn->bits.proxy_user_passwd &&
+                 conn->allocptr.proxyuserpwd)?conn->allocptr.proxyuserpwd:"",
+                (conn->bits.user_passwd && conn->allocptr.userpwd)?
+                conn->allocptr.userpwd:"",
+                (conn->bits.use_range && conn->allocptr.rangeline)?
+                conn->allocptr.rangeline:"",
+                (data->set.useragent && *data->set.useragent && conn->allocptr.uagent)?
+                conn->allocptr.uagent:"",
+                (conn->allocptr.cookie?conn->allocptr.cookie:""), /* Cookie: <data> */
+                (conn->allocptr.host?conn->allocptr.host:""), /* Host: host */
+                http->p_pragma?http->p_pragma:"",
+                http->p_accept?http->p_accept:"",
+                (data->set.encoding && *data->set.encoding && conn->allocptr.accept_encoding)?
+                conn->allocptr.accept_encoding:"", /* 08/28/02 jhrg */
+                (data->change.referer && conn->allocptr.ref)?conn->allocptr.ref:"" /* Referer: <data> <CRLF> */,
+                te
+                );
+
+    if(co) {
+      int count=0;
+      struct Cookie *store=co;
+      /* now loop through all cookies that matched */
+      while(co) {
+        if(co->value && strlen(co->value)) {
+          if(0 == count) {
+            add_bufferf(req_buffer, "Cookie: ");
+          }
+          add_bufferf(req_buffer,
+                      "%s%s=%s", count?"; ":"", co->name, co->value);
+          count++;
+        }
+        co = co->next; /* next cookie please */
+      }
+      if(count) {
+        add_buffer(req_buffer, "\r\n", 2);
+      }
+      Curl_cookie_freelist(store); /* free the cookie list */
+      co=NULL;
+    }
+
+    if(data->set.timecondition) {
+      struct tm *thistime;
+
+      /* Phil Karn (Fri, 13 Apr 2001) pointed out that the If-Modified-Since
+       * header family should have their times set in GMT as RFC2616 defines:
+       * "All HTTP date/time stamps MUST be represented in Greenwich Mean Time
+       * (GMT), without exception. For the purposes of HTTP, GMT is exactly
+       * equal to UTC (Coordinated Universal Time)." (see page 20 of RFC2616).
+       */
+
+#ifdef HAVE_GMTIME_R
+      /* thread-safe version */
+      struct tm keeptime;
+      thistime = (struct tm *)gmtime_r(&data->set.timevalue, &keeptime);
+#else
+      thistime = gmtime(&data->set.timevalue);
+#endif
+      if(NULL == thistime) {
+        failf(data, "localtime() failed!");
+        return CURLE_OUT_OF_MEMORY;
+      }
+
+#ifdef HAVE_STRFTIME
+      /* format: "Tue, 15 Nov 1994 12:45:26 GMT" */
+      strftime(buf, BUFSIZE-1, "%a, %d %b %Y %H:%M:%S GMT", thistime);
+#else
+      /* TODO: Right, we *could* write a replacement here */
+      strcpy(buf, "no strftime() support");
+#endif
+      switch(data->set.timecondition) {
+      case CURL_TIMECOND_IFMODSINCE:
+      default:
+        add_bufferf(req_buffer,
+                    "If-Modified-Since: %s\r\n", buf);
+        break;
+      case CURL_TIMECOND_IFUNMODSINCE:
+        add_bufferf(req_buffer,
+                    "If-Unmodified-Since: %s\r\n", buf);
+        break;
+      case CURL_TIMECOND_LASTMOD:
+        add_bufferf(req_buffer,
+                    "Last-Modified: %s\r\n", buf);
+        break;
+      }
+    }
+
+    while(headers) {
+      char *ptr = strchr(headers->data, ':');
+      if(ptr) {
+        /* we require a colon for this to be a true header */
+
+        ptr++; /* pass the colon */
+        while(*ptr && isspace((int)*ptr))
+          ptr++;
+
+        if(*ptr) {
+          /* only send this if the contents was non-blank */
+
+          add_bufferf(req_buffer, "%s\r\n", headers->data);
+        }
+      }
+      headers = headers->next;
+    }
+
+    http->postdata = NULL;  /* nothing to post at this point */
+    Curl_pgrsSetUploadSize(data, 0); /* upload size is 0 atm */
+
+    switch(data->set.httpreq) {
+
+    case HTTPREQ_POST_FORM:
+      if(Curl_FormInit(&http->form, http->sendit)) {
+        failf(data, "Internal HTTP POST error!");
+        return CURLE_HTTP_POST_ERROR;
+      }
+
+      /* set the read function to read from the generated form data */
+      conn->fread = (curl_read_callback)Curl_FormReader;
+      conn->fread_in = &http->form;
+
+      http->sending = HTTPSEND_BODY;
+
+      if(!conn->bits.upload_chunky)
+        /* only add Content-Length if not uploading chunked */
+        add_bufferf(req_buffer,
+                    "Content-Length: %d\r\n", http->postsize);
+
+      if(!checkheaders(data, "Expect:")) {
+        /* if not disabled explicitly we add a Expect: 100-continue
+           to the headers which actually speeds up post operations (as
+           there is one packet coming back from the web server) */
+        add_bufferf(req_buffer,
+                    "Expect: 100-continue\r\n");
+        data->set.expect100header = TRUE;
+      }
+
+      if(!checkheaders(data, "Content-Type:")) {
+        /* Get Content-Type: line from Curl_FormReadOneLine, which happens
+           to always be the first line. We can know this for sure since
+           we always build the formpost linked list the same way!
+
+           The Content-Type header line also contains the MIME boundary
+           string etc why disabling this header is likely to not make things
+           work, but we support it anyway.
+        */
+        char contentType[256];
+        int linelength=0;
+        linelength = Curl_FormReadOneLine (contentType,
+                                           sizeof(contentType),
+                                           1,
+                                           (FILE *)&http->form);
+        if(linelength == -1) {
+          failf(data, "Could not get Content-Type header line!");
+          return CURLE_HTTP_POST_ERROR;
+        }
+        add_buffer(req_buffer, contentType, linelength);
+      }
+
+      /* make the request end in a true CRLF */
+      add_buffer(req_buffer, "\r\n", 2);
+
+      /* set upload size to the progress meter */
+      Curl_pgrsSetUploadSize(data, http->postsize);
+
+      /* fire away the whole request to the server */
+      result = add_buffer_send(req_buffer, conn->firstsocket, conn, 
+                               &data->info.request_size);
+      if(result)
+        failf(data, "Failed sending POST request");
+      else
+        /* setup variables for the upcoming transfer */
+        result = Curl_Transfer(conn, conn->firstsocket, -1, TRUE,
+                               &http->readbytecount,
+                               conn->firstsocket,
+                               &http->writebytecount);
+      if(result) {
+        Curl_formclean(http->sendit); /* free that whole lot */
+        return result;
+      }
+      break;
+
+    case HTTPREQ_PUT: /* Let's PUT the data to the server! */
+
+      if((data->set.infilesize>0) && !conn->bits.upload_chunky)
+        /* only add Content-Length if not uploading chunked */
+        add_bufferf(req_buffer,
+                    "Content-Length: %d\r\n", /* file size */
+                    data->set.infilesize );
+
+      add_bufferf(req_buffer, "\r\n");
+
+      /* set the upload size to the progress meter */
+      Curl_pgrsSetUploadSize(data, data->set.infilesize);
+
+      /* this sends the buffer and frees all the buffer resources */
+      result = add_buffer_send(req_buffer, conn->firstsocket, conn,
+                               &data->info.request_size);
+      if(result)
+        failf(data, "Failed sending POST request");
+      else
+        /* prepare for transfer */
+        result = Curl_Transfer(conn, conn->firstsocket, -1, TRUE,
+                               &http->readbytecount,
+                               conn->firstsocket,
+                               &http->writebytecount);
+      if(result)
+        return result;
+      break;
+
+    case HTTPREQ_POST:
+      /* this is the simple POST, using x-www-form-urlencoded style */
+
+      if(!conn->bits.upload_chunky) {
+        /* We only set Content-Length and allow a custom Content-Length if
+           we don't upload data chunked, as RFC2616 forbids us to set both
+           kinds of headers (Transfer-Encoding: chunked and Content-Length) */
+
+        if(!checkheaders(data, "Content-Length:"))
+          /* we allow replacing this header, although it isn't very wise to
+             actually set your own */
+          add_bufferf(req_buffer,
+                      "Content-Length: %d\r\n",
+                      data->set.postfieldsize?
+                      data->set.postfieldsize:
+                      (data->set.postfields?strlen(data->set.postfields):0) );
+      }
+
+      if(!checkheaders(data, "Content-Type:"))
+        add_bufferf(req_buffer,
+                    "Content-Type: application/x-www-form-urlencoded\r\n");
+
+      add_buffer(req_buffer, "\r\n", 2);
+
+      /* and here we setup the pointers to the actual data */
+      if(data->set.postfields) {
+        if(data->set.postfieldsize)
+          http->postsize = data->set.postfieldsize;
+        else
+          http->postsize = strlen(data->set.postfields);
+        http->postdata = data->set.postfields;
+
+        http->sending = HTTPSEND_BODY;
+
+        conn->fread = (curl_read_callback)readmoredata;
+        conn->fread_in = (void *)conn;
+
+        /* set the upload size to the progress meter */
+        Curl_pgrsSetUploadSize(data, http->postsize);
+      }
+      else
+        /* set the upload size to the progress meter */
+        Curl_pgrsSetUploadSize(data, data->set.infilesize);
+
+      /* issue the request, headers-only */
+      result = add_buffer_send(req_buffer, conn->firstsocket, conn,
+                               &data->info.request_size);
+
+      if(result)
+        failf(data, "Failed sending HTTP POST request");
+      else
+        result =
+          Curl_Transfer(conn, conn->firstsocket, -1, TRUE,
+                        &http->readbytecount,
+                        conn->firstsocket,
+                        &http->writebytecount);
+      break;
+
+    default:
+      add_buffer(req_buffer, "\r\n", 2);
+      
+      /* issue the request */
+      result = add_buffer_send(req_buffer, conn->firstsocket, conn,
+                               &data->info.request_size);
+
+      if(result)
+        failf(data, "Failed sending HTTP request");
+      else
+        /* HTTP GET/HEAD download: */
+        result = Curl_Transfer(conn, conn->firstsocket, -1, TRUE,
+                               &http->readbytecount,
+                               http->postdata?conn->firstsocket:-1,
+                               http->postdata?&http->writebytecount:NULL);
+    }
+    if(result)
+      return result;
+  } while (0); /* this is just a left-over from the multiple document download
+                  attempts */
+
+  return CURLE_OK;
+}
+#endif
diff --git a/main/source/curl/lib/http.h b/main/source/curl/lib/http.h
new file mode 100644
index 00000000..bc28863f
--- /dev/null
+++ b/main/source/curl/lib/http.h
@@ -0,0 +1,46 @@
+#ifndef __HTTP_H
+#define __HTTP_H
+
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: http.h,v 1.17 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+#ifndef CURL_DISABLE_HTTP
+bool Curl_compareheader(char *headerline,     /* line to check */
+                        const char *header,   /* header keyword _with_ colon */
+                        const char *content); /* content string to find */
+
+/* ftp can use this as well */
+CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn,
+                                     int tunnelsocket,
+                                     char *hostname, int remote_port);
+
+/* protocol-specific functions set up to be called by the main engine */
+CURLcode Curl_http(struct connectdata *conn);
+CURLcode Curl_http_done(struct connectdata *conn);
+CURLcode Curl_http_connect(struct connectdata *conn);
+
+/* The following functions are defined in http_chunks.c */
+void Curl_httpchunk_init(struct connectdata *conn);
+CHUNKcode Curl_httpchunk_read(struct connectdata *conn, char *datap,
+                              ssize_t length, ssize_t *wrote);
+#endif
+#endif
diff --git a/main/source/curl/lib/http_chunks.c b/main/source/curl/lib/http_chunks.c
new file mode 100644
index 00000000..58770b12
--- /dev/null
+++ b/main/source/curl/lib/http_chunks.c
@@ -0,0 +1,257 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: http_chunks.c,v 1.18 2003/04/22 22:33:39 bagder Exp $
+ ***************************************************************************/
+#include "setup.h"
+
+#ifndef CURL_DISABLE_HTTP
+/* -- WIN32 approved -- */
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdlib.h>
+
+#include "urldata.h" /* it includes http_chunks.h */
+#include "sendf.h"   /* for the client write stuff */
+
+#include "content_encoding.h"   /* 08/29/02 jhrg */
+
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+/* 
+ * Chunk format (simplified):
+ *
+ * <HEX SIZE>[ chunk extension ] CRLF
+ * <DATA> CRLF
+ *
+ * Highlights from RFC2616 section 3.6 say:
+
+   The chunked encoding modifies the body of a message in order to
+   transfer it as a series of chunks, each with its own size indicator,
+   followed by an OPTIONAL trailer containing entity-header fields. This
+   allows dynamically produced content to be transferred along with the
+   information necessary for the recipient to verify that it has
+   received the full message.
+
+       Chunked-Body   = *chunk
+                        last-chunk
+                        trailer
+                        CRLF
+
+       chunk          = chunk-size [ chunk-extension ] CRLF
+                        chunk-data CRLF
+       chunk-size     = 1*HEX
+       last-chunk     = 1*("0") [ chunk-extension ] CRLF
+
+       chunk-extension= *( ";" chunk-ext-name [ "=" chunk-ext-val ] )
+       chunk-ext-name = token
+       chunk-ext-val  = token | quoted-string
+       chunk-data     = chunk-size(OCTET)
+       trailer        = *(entity-header CRLF)
+
+   The chunk-size field is a string of hex digits indicating the size of
+   the chunk. The chunked encoding is ended by any chunk whose size is
+   zero, followed by the trailer, which is terminated by an empty line.
+
+ */
+
+
+void Curl_httpchunk_init(struct connectdata *conn)
+{
+  struct Curl_chunker *chunk = &conn->proto.http->chunk;
+  chunk->hexindex=0; /* start at 0 */
+  chunk->dataleft=0; /* no data left yet! */
+  chunk->state = CHUNK_HEX; /* we get hex first! */
+}
+
+/*
+ * chunk_read() returns a OK for normal operations, or a positive return code
+ * for errors. STOP means this sequence of chunks is complete.  The 'wrote'
+ * argument is set to tell the caller how many bytes we actually passed to the
+ * client (for byte-counting and whatever).
+ *
+ * The states and the state-machine is further explained in the header file.
+ */
+CHUNKcode Curl_httpchunk_read(struct connectdata *conn,
+                              char *datap,
+                              size_t length,
+                              size_t *wrote)
+{
+  CURLcode result;
+  struct Curl_chunker *ch = &conn->proto.http->chunk;
+  int piece;
+  *wrote = 0; /* nothing yet */
+
+  while(length) {
+    switch(ch->state) {
+    case CHUNK_HEX:
+      if(isxdigit((int)*datap)) {
+        if(ch->hexindex < MAXNUM_SIZE) {
+          ch->hexbuffer[ch->hexindex] = *datap;
+          datap++;
+          length--;
+          ch->hexindex++;
+        }
+        else {
+          return CHUNKE_TOO_LONG_HEX; /* longer hex than we support */
+        }
+      }
+      else {
+        if(0 == ch->hexindex) {
+          /* This is illegal data, we received junk where we expected
+             a hexadecimal digit. */
+          return CHUNKE_ILLEGAL_HEX;
+        }
+        /* length and datap are unmodified */
+        ch->hexbuffer[ch->hexindex]=0;
+        ch->datasize=strtoul(ch->hexbuffer, NULL, 16);
+        ch->state = CHUNK_POSTHEX;
+      }
+      break;
+
+    case CHUNK_POSTHEX:
+      /* In this state, we're waiting for CRLF to arrive. We support
+         this to allow so called chunk-extensions to show up here
+         before the CRLF comes. */
+      if(*datap == '\r')
+        ch->state = CHUNK_CR;
+      length--;
+      datap++;
+      break;
+
+    case CHUNK_CR:
+      /* waiting for the LF */
+      if(*datap == '\n') {
+        /* we're now expecting data to come, unless size was zero! */
+        if(0 == ch->datasize) {
+          ch->state = CHUNK_STOP; /* stop reading! */
+          if(1 == length) {
+            /* This was the final byte, return right now */
+            return CHUNKE_STOP;
+          }
+        }
+        else
+          ch->state = CHUNK_DATA;
+      }
+      else
+        /* previously we got a fake CR, go back to CR waiting! */
+        ch->state = CHUNK_CR;
+      datap++;
+      length--;
+      break;
+
+    case CHUNK_DATA:
+      /* we get pure and fine data
+
+         We expect another 'datasize' of data. We have 'length' right now,
+         it can be more or less than 'datasize'. Get the smallest piece.
+      */
+      piece = (ch->datasize >= length)?length:ch->datasize;
+
+      /* Write the data portion available */
+      /* Added content-encoding here; untested but almost identical to the
+         tested code in transfer.c. 08/29/02 jhrg */
+#ifdef HAVE_LIBZ
+      switch (conn->keep.content_encoding) {
+        case IDENTITY:
+#endif
+          result = Curl_client_write(conn->data, CLIENTWRITE_BODY, datap,
+                                     piece);
+#ifdef HAVE_LIBZ
+          break;
+
+        case DEFLATE: 
+          /* update conn->keep.str to point to the chunk data. */
+          conn->keep.str = datap;
+          result = Curl_unencode_deflate_write(conn->data, &conn->keep, piece);
+          break;
+
+        case GZIP:
+          /* update conn->keep.str to point to the chunk data. */
+          conn->keep.str = datap;
+          result = Curl_unencode_gzip_write(conn->data, &conn->keep, piece);
+          break;
+
+        case COMPRESS:
+        default:
+          failf (conn->data,
+                 "Unrecognized content encoding type. "
+                 "libcurl understands `identity', `deflate' and `gzip' "
+                 "content encodings.");
+          return CHUNKE_BAD_ENCODING;
+      }
+#endif
+
+      if(result)
+        return CHUNKE_WRITE_ERROR;
+      *wrote += piece;
+
+      ch->datasize -= piece; /* decrease amount left to expect */
+      datap += piece;    /* move read pointer forward */
+      length -= piece;   /* decrease space left in this round */
+
+      if(0 == ch->datasize)
+        /* end of data this round, we now expect a trailing CRLF */
+        ch->state = CHUNK_POSTCR;
+      break;
+
+    case CHUNK_POSTCR:
+      if(*datap == '\r') {
+        ch->state = CHUNK_POSTLF;
+        datap++;
+        length--;
+      }
+      else
+        return CHUNKE_BAD_CHUNK;
+      break;
+
+    case CHUNK_POSTLF:
+      if(*datap == '\n') {
+        /*
+         * The last one before we go back to hex state and start all
+         * over.
+         */
+        Curl_httpchunk_init(conn);
+        datap++;
+        length--;
+      }
+      else
+        return CHUNKE_BAD_CHUNK;
+      break;
+
+    case CHUNK_STOP:
+      /* If we arrive here, there is data left in the end of the buffer
+         even if there's no more chunks to read */
+      ch->dataleft = length;
+      return CHUNKE_STOP; /* return stop */
+    default:
+      return CHUNKE_STATE_ERROR;
+    }
+  }
+  return CHUNKE_OK;
+}
+#endif /* CURL_DISABLE_HTTP */
diff --git a/main/source/curl/lib/http_chunks.h b/main/source/curl/lib/http_chunks.h
new file mode 100644
index 00000000..62e46b5c
--- /dev/null
+++ b/main/source/curl/lib/http_chunks.h
@@ -0,0 +1,88 @@
+#ifndef __HTTP_CHUNKS_H
+#define __HTTP_CHUNKS_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: http_chunks.h,v 1.8 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+/*
+ * The longest possible hexadecimal number we support in a chunked transfer.
+ * Weird enough, RFC2616 doesn't set a maximum size! Since we use strtoul()
+ * to convert it, we "only" support 2^32 bytes chunk data.
+ */
+#define MAXNUM_SIZE 16
+
+typedef enum {
+  CHUNK_FIRST, /* never use */
+
+  /* In this we await and buffer all hexadecimal digits until we get one
+     that isn't a hexadecimal digit. When done, we go POSTHEX */
+  CHUNK_HEX,
+
+  /* We have received the hexadecimal digit and we eat all characters until
+     we get a CRLF pair. When we see a CR we go to the CR state. */
+  CHUNK_POSTHEX,
+
+  /* A single CR has been found and we should get a LF right away in this
+     state or we go back to POSTHEX. When LF is received, we go to DATA.
+     If the size given was zero, we set state to STOP and return. */
+  CHUNK_CR,
+
+  /* We eat the amount of data specified. When done, we move on to the
+     POST_CR state. */
+  CHUNK_DATA,
+
+  /* POSTCR should get a CR and nothing else, then move to POSTLF */
+  CHUNK_POSTCR,
+
+  /* POSTLF should get a LF and nothing else, then move back to HEX as
+     the CRLF combination marks the end of a chunk */
+  CHUNK_POSTLF,
+
+  /* This is mainly used to really mark that we're out of the game.
+     NOTE: that there's a 'dataleft' field in the struct that will tell how
+     many bytes that were not passed to the client in the end of the last
+     buffer! */
+  CHUNK_STOP,
+
+  CHUNK_LAST /* never use */
+} ChunkyState;
+
+typedef enum {
+  CHUNKE_STOP = -1,
+  CHUNKE_OK = 0,
+  CHUNKE_TOO_LONG_HEX = 1,
+  CHUNKE_ILLEGAL_HEX,
+  CHUNKE_BAD_CHUNK,
+  CHUNKE_WRITE_ERROR,
+  CHUNKE_STATE_ERROR,
+  CHUNKE_BAD_ENCODING,
+  CHUNKE_LAST
+} CHUNKcode;
+
+struct Curl_chunker {
+  char hexbuffer[ MAXNUM_SIZE + 1];
+  int hexindex;
+  ChunkyState state;
+  size_t datasize;
+  size_t dataleft; /* untouched data amount at the end of the last buffer */
+};
+
+#endif
diff --git a/main/source/curl/lib/if2ip.c b/main/source/curl/lib/if2ip.c
new file mode 100644
index 00000000..1216b0da
--- /dev/null
+++ b/main/source/curl/lib/if2ip.c
@@ -0,0 +1,127 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: if2ip.c,v 1.24 2003/02/28 13:11:10 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#if ! defined(WIN32) && ! defined(__BEOS__) && !defined(__CYGWIN32__) && \
+    ! defined(__riscos__)
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
+#ifdef HAVE_SYS_TIME_H
+/* This must be before net/if.h for AIX 3.2 to enjoy life */
+#include <sys/time.h>
+#endif
+#ifdef HAVE_NET_IF_H
+#include <net/if.h>
+#endif
+#include <sys/ioctl.h>
+
+/* -- if2ip() -- */
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+
+#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL) 
+#include "inet_ntoa_r.h"
+#endif
+
+#ifdef	VMS
+#define	IOCTL_3_ARGS
+#include <inet.h>
+#endif
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+#define SYS_ERROR -1
+
+char *Curl_if2ip(char *interface, char *buf, int buf_size)
+{
+  int dummy;
+  char *ip=NULL;
+  
+  if(!interface)
+    return NULL;
+
+  dummy = socket(AF_INET, SOCK_STREAM, 0);
+  if (SYS_ERROR == dummy) {
+    return NULL;
+  }
+  else {
+    struct ifreq req;
+    memset(&req, 0, sizeof(req));
+    strcpy(req.ifr_name, interface);
+    req.ifr_addr.sa_family = AF_INET;
+#ifdef	IOCTL_3_ARGS
+    if (SYS_ERROR == ioctl(dummy, SIOCGIFADDR, &req)) {
+#else
+    if (SYS_ERROR == ioctl(dummy, SIOCGIFADDR, &req, sizeof(req))) {
+#endif
+      sclose(dummy);
+      return NULL;
+    }
+    else {
+      struct in_addr in;
+
+      struct sockaddr_in *s = (struct sockaddr_in *)&req.ifr_dstaddr;
+      memcpy(&in, &(s->sin_addr.s_addr), sizeof(in));
+#if defined(HAVE_INET_NTOA_R)
+      ip = inet_ntoa_r(in,buf,buf_size);
+#else
+      ip = strncpy(buf,inet_ntoa(in),buf_size);
+      ip[buf_size - 1] = 0;
+#endif
+    }
+    sclose(dummy);
+  }
+  return ip;
+}
+
+/* -- end of if2ip() -- */
+#else
+#define if2ip(x) NULL
+#endif
diff --git a/main/source/curl/lib/if2ip.h b/main/source/curl/lib/if2ip.h
new file mode 100644
index 00000000..0e71fed9
--- /dev/null
+++ b/main/source/curl/lib/if2ip.h
@@ -0,0 +1,69 @@
+#ifndef __IF2IP_H
+#define __IF2IP_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: if2ip.h,v 1.12 2003/02/28 13:11:10 bagder Exp $
+ ***************************************************************************/
+#include "setup.h"
+
+#if ! defined(WIN32) && ! defined(__BEOS__) && !defined(__CYGWIN32__) && \
+    ! defined(__riscos__)
+extern char *Curl_if2ip(char *interface, char *buf, int buf_size);
+#else
+#define Curl_if2ip(a,b,c) NULL
+#endif
+#ifdef __INTERIX
+/* Nedelcho Stanev's work-around for SFU 3.0 */
+struct ifreq {
+#define IFNAMSIZ 16
+#define IFHWADDRLEN 6
+  union {
+    char ifrn_name[IFNAMSIZ]; /* if name, e.g. "en0" */
+  } ifr_ifrn;
+
+ union {
+   struct sockaddr ifru_addr;
+   struct sockaddr ifru_broadaddr;
+   struct sockaddr ifru_netmask;
+   struct sockaddr ifru_hwaddr;
+   short ifru_flags;
+   int ifru_metric;
+   int ifru_mtu;
+ } ifr_ifru;
+};
+
+/* This define was added by Daniel to avoid an extra #ifdef INTERIX in the
+   C code. */
+#define ifr_dstaddr ifr_addr
+
+#define ifr_name ifr_ifrn.ifrn_name /* interface name */
+#define ifr_addr ifr_ifru.ifru_addr /* address */
+#define ifr_broadaddr ifr_ifru.ifru_broadaddr /* broadcast address */
+#define ifr_netmask ifr_ifru.ifru_netmask /* interface net mask */
+#define ifr_flags ifr_ifru.ifru_flags /* flags */
+#define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */
+#define ifr_metric ifr_ifru.ifru_metric /* metric */
+#define ifr_mtu ifr_ifru.ifru_mtu /* mtu */
+
+#define SIOCGIFADDR _IOW('s', 102, struct ifreq) /* Get if addr */ 
+#endif /* interix */
+
+#endif
diff --git a/main/source/curl/lib/inet_ntoa_r.h b/main/source/curl/lib/inet_ntoa_r.h
new file mode 100644
index 00000000..fe3ec3db
--- /dev/null
+++ b/main/source/curl/lib/inet_ntoa_r.h
@@ -0,0 +1,9 @@
+#ifndef __INET_NTOA_R_H
+#define __INET_NTOA_R_H
+/*
+ * My solaris 5.6 system running gcc 2.8.1 does *not* have this prototype
+ * in any system include file! Isn't that weird?
+ */
+char *inet_ntoa_r(const struct in_addr in, char *buffer, int buflen);
+
+#endif
diff --git a/main/source/curl/lib/krb4.c b/main/source/curl/lib/krb4.c
new file mode 100644
index 00000000..f213b2c8
--- /dev/null
+++ b/main/source/curl/lib/krb4.c
@@ -0,0 +1,406 @@
+/* This source code was modified by Martin Hedenfalk <mhe@stacken.kth.se> for
+ * use in Curl. His latest changes were done 2000-09-18.
+ *
+ * It has since been patched away like a madman by Daniel Stenberg
+ * <daniel@haxx.se> to make it better applied to curl conditions, and to make
+ * it not use globals, pollute name space and more. This source code awaits a
+ * rewrite to work around the paragraph 2 in the BSD licenses as explained
+ * below.
+ *
+ * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan
+ * (Royal Institute of Technology, Stockholm, Sweden).
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 
+ * 2. 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.
+ * 
+ * 3. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.  */
+
+#include "setup.h"
+
+#ifndef CURL_DISABLE_FTP
+#ifdef KRB4
+
+#include "security.h"
+#include "base64.h"
+#include <stdlib.h>
+#include <netdb.h>
+#include <syslog.h>
+#include <string.h>
+#include <krb.h>
+#include <des.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h> /* for getpid() */
+#endif
+
+#include "ftp.h"
+#include "sendf.h"
+
+#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
+#include "inet_ntoa_r.h"
+#endif
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+#define LOCAL_ADDR (&conn->local_addr)
+#define REMOTE_ADDR (&conn->serv_addr)
+#define myctladdr LOCAL_ADDR
+#define hisctladdr REMOTE_ADDR
+
+struct krb4_data {
+    des_cblock key;
+    des_key_schedule schedule;
+    char name[ANAME_SZ];
+    char instance[INST_SZ];
+    char realm[REALM_SZ];
+};
+
+#ifndef HAVE_STRLCPY
+/* if it ever goes non-static, make it Curl_ prefixed! */
+static size_t
+strlcpy (char *dst, const char *src, size_t dst_sz)
+{
+    size_t n;
+    char *p;
+
+    for (p = dst, n = 0;
+	 n + 1 < dst_sz && *src != '\0';
+	 ++p, ++src, ++n)
+	*p = *src;
+    *p = '\0';
+    if (*src == '\0')
+	return n;
+    else
+	return n + strlen (src);
+}
+#else
+size_t strlcpy (char *dst, const char *src, size_t dst_sz);
+#endif
+
+static int
+krb4_check_prot(void *app_data, int level)
+{
+  app_data = NULL; /* prevent compiler warning */
+  if(level == prot_confidential)
+    return -1;
+  return 0;
+}
+
+static int
+krb4_decode(void *app_data, void *buf, int len, int level,
+	    struct connectdata *conn)
+{
+    MSG_DAT m;
+    int e;
+    struct krb4_data *d = app_data;
+    
+    if(level == prot_safe)
+	e = krb_rd_safe(buf, len, &d->key,
+			(struct sockaddr_in *)REMOTE_ADDR,
+			(struct sockaddr_in *)LOCAL_ADDR, &m);
+    else
+	e = krb_rd_priv(buf, len, d->schedule, &d->key, 
+			(struct sockaddr_in *)REMOTE_ADDR,
+			(struct sockaddr_in *)LOCAL_ADDR, &m);
+    if(e){
+	syslog(LOG_ERR, "krb4_decode: %s", krb_get_err_text(e));
+	return -1;
+    }
+    memmove(buf, m.app_data, m.app_length);
+    return m.app_length;
+}
+
+static int
+krb4_overhead(void *app_data, int level, int len)
+{
+  /* no arguments are used, just init them to prevent compiler warnings */
+  app_data = NULL;
+  level = 0;
+  len = 0;
+  return 31;
+}
+
+static int
+krb4_encode(void *app_data, void *from, int length, int level, void **to,
+	    struct connectdata *conn)
+{
+    struct krb4_data *d = app_data;
+    *to = malloc(length + 31);
+    if(level == prot_safe)
+	return krb_mk_safe(from, *to, length, &d->key, 
+			   (struct sockaddr_in *)LOCAL_ADDR,
+			   (struct sockaddr_in *)REMOTE_ADDR);
+    else if(level == prot_private)
+	return krb_mk_priv(from, *to, length, d->schedule, &d->key, 
+			   (struct sockaddr_in *)LOCAL_ADDR,
+			   (struct sockaddr_in *)REMOTE_ADDR);
+    else
+	return -1;
+}
+
+static int
+mk_auth(struct krb4_data *d, KTEXT adat, 
+	const char *service, char *host, int checksum)
+{
+    int ret;
+    CREDENTIALS cred;
+    char sname[SNAME_SZ], inst[INST_SZ], realm[REALM_SZ];
+
+    strlcpy(sname, service, sizeof(sname));
+    strlcpy(inst, krb_get_phost(host), sizeof(inst));
+    strlcpy(realm, krb_realmofhost(host), sizeof(realm));
+    ret = krb_mk_req(adat, sname, inst, realm, checksum);
+    if(ret)
+	return ret;
+    strlcpy(sname, service, sizeof(sname));
+    strlcpy(inst, krb_get_phost(host), sizeof(inst));
+    strlcpy(realm, krb_realmofhost(host), sizeof(realm));
+    ret = krb_get_cred(sname, inst, realm, &cred);
+    memmove(&d->key, &cred.session, sizeof(des_cblock));
+    des_key_sched(&d->key, d->schedule);
+    memset(&cred, 0, sizeof(cred));
+    return ret;
+}
+
+#ifdef HAVE_KRB_GET_OUR_IP_FOR_REALM
+int krb_get_our_ip_for_realm(char *, struct in_addr *);
+#endif
+
+static int
+krb4_auth(void *app_data, struct connectdata *conn)
+{
+  int ret;
+  char *p;
+  int len;
+  KTEXT_ST adat;
+  MSG_DAT msg_data;
+  int checksum;
+  u_int32_t cs;
+  struct krb4_data *d = app_data;
+  char *host = conn->hostname;
+  ssize_t nread;
+  int l = sizeof(conn->local_addr);
+  struct SessionHandle *data = conn->data;
+  CURLcode result;
+
+  if(getsockname(conn->firstsocket,
+                 (struct sockaddr *)LOCAL_ADDR, &l) < 0)
+    perror("getsockname()");
+
+  checksum = getpid();
+  ret = mk_auth(d, &adat, "ftp", host, checksum);
+  if(ret == KDC_PR_UNKNOWN)
+    ret = mk_auth(d, &adat, "rcmd", host, checksum);
+  if(ret) {
+    Curl_infof(data, "%s\n", krb_get_err_text(ret));
+    return AUTH_CONTINUE;
+  }
+  
+#ifdef HAVE_KRB_GET_OUR_IP_FOR_REALM
+  if (krb_get_config_bool("nat_in_use")) {
+    struct sockaddr_in *localaddr  = (struct sockaddr_in *)LOCAL_ADDR;
+    struct in_addr natAddr;
+
+    if (krb_get_our_ip_for_realm(krb_realmofhost(host),
+                                 &natAddr) != KSUCCESS
+        && krb_get_our_ip_for_realm(NULL, &natAddr) != KSUCCESS)
+      Curl_infof(data, "Can't get address for realm %s\n",
+                 krb_realmofhost(host));
+    else {
+      if (natAddr.s_addr != localaddr->sin_addr.s_addr) {
+#ifdef HAVE_INET_NTOA_R
+        char ntoa_buf[64];
+        char *ip = (char *)inet_ntoa_r(natAddr, ntoa_buf, sizeof(ntoa_buf));
+#else
+        char *ip = (char *)inet_ntoa(natAddr);
+#endif
+        Curl_infof(data, "Using NAT IP address (%s) for kerberos 4\n", ip);
+        localaddr->sin_addr = natAddr;
+      }
+    }
+  }
+#endif
+
+  if(Curl_base64_encode(adat.dat, adat.length, &p) < 0) {
+    Curl_failf(data, "Out of memory base64-encoding");
+    return AUTH_CONTINUE;
+  }
+
+  result = Curl_ftpsendf(conn, "ADAT %s", p);
+
+  free(p);
+
+  if(result)
+    return -2;
+
+  if(Curl_GetFTPResponse(&nread, conn, NULL))
+    return -1;
+
+  if(data->state.buffer[0] != '2'){
+    Curl_failf(data, "Server didn't accept auth data");
+    return AUTH_ERROR;
+  }
+
+  p = strstr(data->state.buffer, "ADAT=");
+  if(!p) {
+    Curl_failf(data, "Remote host didn't send adat reply");
+    return AUTH_ERROR;
+  }
+  p += 5;
+  len = Curl_base64_decode(p, adat.dat);
+  if(len < 0) {
+    Curl_failf(data, "Failed to decode base64 from server");
+    return AUTH_ERROR;
+  }
+  adat.length = len;
+  ret = krb_rd_safe(adat.dat, adat.length, &d->key, 
+                    (struct sockaddr_in *)hisctladdr, 
+                    (struct sockaddr_in *)myctladdr, &msg_data);
+  if(ret) {
+    Curl_failf(data, "Error reading reply from server: %s", 
+               krb_get_err_text(ret));
+    return AUTH_ERROR;
+  }
+  krb_get_int(msg_data.app_data, &cs, 4, 0);
+  if(cs - checksum != 1) {
+    Curl_failf(data, "Bad checksum returned from server");
+    return AUTH_ERROR;
+  }
+  return AUTH_OK;
+}
+
+struct Curl_sec_client_mech Curl_krb4_client_mech = {
+    "KERBEROS_V4",
+    sizeof(struct krb4_data),
+    NULL, /* init */
+    krb4_auth,
+    NULL, /* end */
+    krb4_check_prot,
+    krb4_overhead,
+    krb4_encode,
+    krb4_decode
+};
+
+CURLcode Curl_krb_kauth(struct connectdata *conn)
+{
+  des_cblock key;
+  des_key_schedule schedule;
+  KTEXT_ST tkt, tktcopy;
+  char *name;
+  char *p;
+  char passwd[100];
+  int tmp;
+  ssize_t nread;
+  int save;
+  CURLcode result;
+
+  save = Curl_set_command_prot(conn, prot_private);
+
+  result = Curl_ftpsendf(conn, "SITE KAUTH %s", conn->data->state.user);
+
+  if(result)
+    return result;
+
+  result = Curl_GetFTPResponse(&nread, conn, NULL);
+  if(result)
+    return result;
+
+  if(conn->data->state.buffer[0] != '3'){
+    Curl_set_command_prot(conn, save);
+    return CURLE_FTP_WEIRD_SERVER_REPLY;
+  }
+
+  p = strstr(conn->data->state.buffer, "T=");
+  if(!p) {
+    Curl_failf(conn->data, "Bad reply from server");
+    Curl_set_command_prot(conn, save);
+    return CURLE_FTP_WEIRD_SERVER_REPLY;
+  }
+
+  p += 2;
+  tmp = Curl_base64_decode(p, &tkt.dat);
+  if(tmp < 0) {
+    Curl_failf(conn->data, "Failed to decode base64 in reply.\n");
+    Curl_set_command_prot(conn, save);
+    return CURLE_FTP_WEIRD_SERVER_REPLY;
+  }
+  tkt.length = tmp;
+  tktcopy.length = tkt.length;
+    
+  p = strstr(conn->data->state.buffer, "P=");
+  if(!p) {
+    Curl_failf(conn->data, "Bad reply from server");
+    Curl_set_command_prot(conn, save);
+    return CURLE_FTP_WEIRD_SERVER_REPLY;
+  }
+  name = p + 2;
+  for(; *p && *p != ' ' && *p != '\r' && *p != '\n'; p++);
+  *p = 0;
+
+  des_string_to_key (conn->data->state.passwd, &key);
+  des_key_sched(&key, schedule);
+    
+  des_pcbc_encrypt((void *)tkt.dat, (void *)tktcopy.dat,
+                   tkt.length,
+                   schedule, &key, DES_DECRYPT);
+  if (strcmp ((char*)tktcopy.dat + 8,
+              KRB_TICKET_GRANTING_TICKET) != 0) {
+    afs_string_to_key(passwd,
+                      krb_realmofhost(conn->hostname),
+                      &key);
+    des_key_sched(&key, schedule);
+    des_pcbc_encrypt((void *)tkt.dat, (void *)tktcopy.dat,
+                     tkt.length,
+                     schedule, &key, DES_DECRYPT);
+  }
+  memset(key, 0, sizeof(key));
+  memset(schedule, 0, sizeof(schedule));
+  memset(passwd, 0, sizeof(passwd));
+  if(Curl_base64_encode(tktcopy.dat, tktcopy.length, &p) < 0) {
+    failf(conn->data, "Out of memory base64-encoding.");
+    Curl_set_command_prot(conn, save);
+    return CURLE_OUT_OF_MEMORY;
+  }
+  memset (tktcopy.dat, 0, tktcopy.length);
+
+  result = Curl_ftpsendf(conn, "SITE KAUTH %s %s", name, p);
+  free(p);
+  if(result)
+    return result;
+
+  result = Curl_GetFTPResponse(&nread, conn, NULL);
+  if(result)
+    return result;
+  Curl_set_command_prot(conn, save);
+
+  return CURLE_OK;
+}
+
+#endif /* KRB4 */
+#endif /* CURL_DISABLE_FTP */
diff --git a/main/source/curl/lib/krb4.h b/main/source/curl/lib/krb4.h
new file mode 100644
index 00000000..8027efc5
--- /dev/null
+++ b/main/source/curl/lib/krb4.h
@@ -0,0 +1,27 @@
+#ifndef __KRB4_H
+#define __KRB4_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: krb4.h,v 1.7 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+CURLcode Curl_krb_kauth(struct connectdata *conn);
+
+#endif
diff --git a/main/source/curl/lib/ldap.c b/main/source/curl/lib/ldap.c
new file mode 100644
index 00000000..b188585b
--- /dev/null
+++ b/main/source/curl/lib/ldap.c
@@ -0,0 +1,224 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: ldap.c,v 1.25 2003/01/29 10:14:22 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#ifndef CURL_DISABLE_LDAP
+/* -- WIN32 approved -- */
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+
+#if defined(WIN32) && !defined(__GNUC__)
+#else
+# ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+# endif
+# ifdef HAVE_DLFCN_H
+#  include <dlfcn.h>
+# endif
+#endif
+
+#include "urldata.h"
+#include <curl/curl.h>
+#include "sendf.h"
+#include "escape.h"
+#include "transfer.h"
+
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+
+#define DYNA_GET_FUNCTION(type, fnc) \
+  (fnc) = (type)DynaGetFunction(#fnc); \
+  if ((fnc) == NULL) { \
+    return CURLE_FUNCTION_NOT_FOUND; \
+  } \
+
+/***********************************************************************
+ */
+static void *libldap = NULL;
+static void *liblber = NULL;
+
+static void DynaOpen(void)
+{
+#if defined(HAVE_DLOPEN) || defined(HAVE_LIBDL)
+  if (libldap == NULL) {
+    /*
+     * libldap.so should be able to resolve its dependency on
+     * liblber.so automatically, but since it does not we will
+     * handle it here by opening liblber.so as global.
+     */
+    dlopen("liblber.so",
+#ifdef RTLD_LAZY_GLOBAL /* It turns out some systems use this: */
+           RTLD_LAZY_GLOBAL
+#else
+#ifdef RTLD_GLOBAL
+           RTLD_LAZY | RTLD_GLOBAL
+#else
+           /* and some systems don't have the RTLD_GLOBAL symbol */
+           RTLD_LAZY
+#endif
+#endif
+           );
+    libldap = dlopen("libldap.so", RTLD_LAZY);
+  }
+#endif
+}
+
+static void DynaClose(void)
+{
+#if defined(HAVE_DLOPEN) || defined(HAVE_LIBDL)
+  if (libldap) {
+    dlclose(libldap);
+    libldap=NULL;
+  }
+  if (liblber) {
+    dlclose(liblber);
+    liblber=NULL;
+  }
+#endif
+}
+
+static void * DynaGetFunction(const char *name)
+{
+  void *func = NULL;
+
+#if defined(HAVE_DLOPEN) || defined(HAVE_LIBDL)
+  if (libldap) {
+    func = dlsym(libldap, name);
+  }
+#endif
+  
+  return func;
+}
+
+static int WriteProc(void *param, char *text, int len)
+{
+  struct SessionHandle *data = (struct SessionHandle *)param;
+  len = 0; /* prevent compiler warning */
+  Curl_client_write(data, CLIENTWRITE_BODY, text, 0);
+  return 0;
+}
+
+/***********************************************************************
+ */
+CURLcode Curl_ldap(struct connectdata *conn)
+{
+  CURLcode status = CURLE_OK;
+  int rc;
+  void *(*ldap_open)(char *, int);
+  int (*ldap_simple_bind_s)(void *, char *, char *);
+  int (*ldap_unbind_s)(void *);
+  int (*ldap_url_search_s)(void *, char *, int, void **);
+  void *(*ldap_first_entry)(void *, void *);
+  void *(*ldap_next_entry)(void *, void *);
+  char *(*ldap_err2string)(int);
+  int (*ldap_entry2text)(void *, char *, void *, void *, char **, char **, int (*)(void *, char *, int), void *, char *, int, unsigned long);
+  int (*ldap_entry2html)(void *, char *, void *, void *, char **, char **, int (*)(void *, char *, int), void *, char *, int, unsigned long, char *, char *);
+  void *server;
+  void *result;
+  void *entryIterator;
+
+  int ldaptext;
+  struct SessionHandle *data=conn->data;
+  
+  infof(data, "LDAP: %s\n", data->change.url);
+
+  DynaOpen();
+  if (libldap == NULL) {
+    failf(data, "The needed LDAP library/libraries couldn't be opened");
+    return CURLE_LIBRARY_NOT_FOUND;
+  }
+
+  ldaptext = data->set.ftp_ascii; /* This is a dirty hack */
+  
+  /* The types are needed because ANSI C distinguishes between
+   * pointer-to-object (data) and pointer-to-function.
+   */
+  DYNA_GET_FUNCTION(void *(*)(char *, int), ldap_open);
+  DYNA_GET_FUNCTION(int (*)(void *, char *, char *), ldap_simple_bind_s);
+  DYNA_GET_FUNCTION(int (*)(void *), ldap_unbind_s);
+  DYNA_GET_FUNCTION(int (*)(void *, char *, int, void **), ldap_url_search_s);
+  DYNA_GET_FUNCTION(void *(*)(void *, void *), ldap_first_entry);
+  DYNA_GET_FUNCTION(void *(*)(void *, void *), ldap_next_entry);
+  DYNA_GET_FUNCTION(char *(*)(int), ldap_err2string);
+  DYNA_GET_FUNCTION(int (*)(void *, char *, void *, void *, char **, char **, int (*)(void *, char *, int), void *, char *, int, unsigned long), ldap_entry2text);
+  DYNA_GET_FUNCTION(int (*)(void *, char *, void *, void *, char **, char **, int (*)(void *, char *, int), void *, char *, int, unsigned long, char *, char *), ldap_entry2html);
+  
+  server = ldap_open(conn->hostname, conn->port);
+  if (server == NULL) {
+    failf(data, "LDAP: Cannot connect to %s:%d",
+	  conn->hostname, conn->port);
+    status = CURLE_COULDNT_CONNECT;
+  } else {
+    rc = ldap_simple_bind_s(server,
+                            conn->bits.user_passwd?data->state.user:NULL,
+                            conn->bits.user_passwd?data->state.passwd:NULL);
+    if (rc != 0) {
+      failf(data, "LDAP: %s", ldap_err2string(rc));
+      status = CURLE_LDAP_CANNOT_BIND;
+    } else {
+      rc = ldap_url_search_s(server, data->change.url, 0, &result);
+      if (rc != 0) {
+	failf(data, "LDAP: %s", ldap_err2string(rc));
+	status = CURLE_LDAP_SEARCH_FAILED;
+      } else {
+	for (entryIterator = ldap_first_entry(server, result);
+	     entryIterator;
+	     entryIterator = ldap_next_entry(server, entryIterator))
+	  {
+	    if (ldaptext) {
+	      rc = ldap_entry2text(server, NULL, entryIterator, NULL,
+				   NULL, NULL, WriteProc, data,
+				   (char *)"", 0, 0);
+	      if (rc != 0) {
+		failf(data, "LDAP: %s", ldap_err2string(rc));
+		status = CURLE_LDAP_SEARCH_FAILED;
+	      }
+	    } else {
+	      rc = ldap_entry2html(server, NULL, entryIterator, NULL,
+				   NULL, NULL, WriteProc, data,
+				   (char *)"", 0, 0, NULL, NULL);
+	      if (rc != 0) {
+		failf(data, "LDAP: %s", ldap_err2string(rc));
+		status = CURLE_LDAP_SEARCH_FAILED;
+	      }
+	    }
+	  }
+      }
+      ldap_unbind_s(server);
+    }
+  }
+  DynaClose();
+
+  /* no data to transfer */
+  Curl_Transfer(conn, -1, -1, FALSE, NULL, -1, NULL);
+  
+  return status;
+}
+#endif
diff --git a/main/source/curl/lib/ldap.h b/main/source/curl/lib/ldap.h
new file mode 100644
index 00000000..bb9b4724
--- /dev/null
+++ b/main/source/curl/lib/ldap.h
@@ -0,0 +1,30 @@
+#ifndef __LDAP_H
+#define __LDAP_H
+
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: ldap.h,v 1.10 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+#ifndef CURL_DISABLE_LDAP
+CURLcode Curl_ldap(struct connectdata *conn);
+CURLcode Curl_ldap_done(struct connectdata *conn);
+#endif
+#endif /* __LDAP_H */
diff --git a/main/source/curl/lib/libcurl.def b/main/source/curl/lib/libcurl.def
new file mode 100644
index 00000000..532d106d
--- /dev/null
+++ b/main/source/curl/lib/libcurl.def
@@ -0,0 +1,44 @@
+;
+; Definition file for the DLL version of the LIBCURL library from curl
+;
+
+LIBRARY		LIBCURL
+
+DESCRIPTION	'curl libcurl - http://curl.haxx.se'
+
+EXPORTS
+	curl_easy_cleanup @ 1 ;
+	curl_easy_getinfo @ 2 ;
+	curl_easy_init @ 3 ;
+	curl_easy_perform @ 4 ;
+	curl_easy_setopt @ 5 ;
+	curl_escape @ 6 ;
+	curl_unescape @ 7;
+	curl_formparse @ 8 ;
+	curl_formfree @ 9 ;
+	curl_getdate @ 10 ;
+	curl_getenv @ 11 ;
+	curl_global_cleanup @ 12 ;
+	curl_global_init @ 13 ;
+	curl_slist_append @ 14 ;
+	curl_slist_free_all @ 15 ;
+	curl_version @ 16 ;
+	curl_maprintf @ 17 ;
+ 	curl_mfprintf @ 18 ;
+	curl_mprintf @ 19 ;
+ 	curl_msprintf @ 20 ;
+ 	curl_msnprintf @ 21 ;
+ 	curl_mvfprintf @ 22 ;
+	curl_strequal @ 23 ;
+	curl_strnequal @ 24 ;
+	curl_easy_duphandle @ 25 ;
+	curl_formadd @ 26 ;
+	curl_multi_init @ 27;
+	curl_multi_add_handle @ 28;
+	curl_multi_remove_handle @ 29;
+	curl_multi_fdset @ 30;
+	curl_multi_perform @ 31;
+	curl_multi_cleanup @ 32;
+	curl_multi_info_read @ 33;
+	curl_free @ 34;
+	curl_version_info @ 35;
diff --git a/main/source/curl/lib/llist.c b/main/source/curl/lib/llist.c
new file mode 100644
index 00000000..49e643c2
--- /dev/null
+++ b/main/source/curl/lib/llist.c
@@ -0,0 +1,168 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: llist.c,v 1.7 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+#include "llist.h"
+
+#ifdef MALLOCDEBUG
+/* this must be the last include file */
+#include "memdebug.h"
+#endif
+void 
+Curl_llist_init(curl_llist *l, curl_llist_dtor dtor)
+{
+  l->size = 0;
+  l->dtor = dtor;
+  l->head = NULL;
+  l->tail = NULL;
+}
+
+curl_llist *
+Curl_llist_alloc(curl_llist_dtor dtor)
+{
+  curl_llist *list;
+
+  list = (curl_llist *)malloc(sizeof(curl_llist));
+  if(NULL == list)
+    return NULL;
+
+  Curl_llist_init(list, dtor);
+
+  return list;
+}
+
+int
+Curl_llist_insert_next(curl_llist *list, curl_llist_element *e, const void *p)
+{
+  curl_llist_element  *ne;
+
+  ne = (curl_llist_element *) malloc(sizeof(curl_llist_element));
+  ne->ptr = (void *) p;
+  if (list->size == 0) {
+    list->head = ne;
+    list->head->prev = NULL;
+    list->head->next = NULL;
+    list->tail = ne;
+  } else {
+    ne->next = e->next;
+    ne->prev = e;
+    if (e->next) {
+      e->next->prev = ne;
+    } else {
+      list->tail = ne;
+    }
+    e->next = ne;
+  }
+
+  ++list->size;
+
+  return 1;
+}
+
+int 
+Curl_llist_insert_prev(curl_llist *list, curl_llist_element *e, const void *p)
+{
+  curl_llist_element *ne;
+
+  ne = (curl_llist_element *) malloc(sizeof(curl_llist_element));
+  ne->ptr = (void *) p;
+  if (list->size == 0) {
+    list->head = ne;
+    list->head->prev = NULL;
+    list->head->next = NULL;
+    list->tail = ne;
+  } else {
+    ne->next = e;
+    ne->prev = e->prev;
+    if (e->prev)
+      e->prev->next = ne;
+    else
+      list->head = ne;
+    e->prev = ne;
+  }
+
+  ++list->size;
+
+  return 1;
+}
+
+int 
+Curl_llist_remove(curl_llist *list, curl_llist_element *e, void *user)
+{
+  if (e == NULL || list->size == 0)
+    return 1;
+
+  if (e == list->head) {
+    list->head = e->next;
+
+    if (list->head == NULL)
+      list->tail = NULL;
+    else
+      e->next->prev = NULL;
+  } else {
+    e->prev->next = e->next;
+    if (!e->next)
+      list->tail = e->prev;
+    else
+      e->next->prev = e->prev;
+  }
+
+  list->dtor(user, e->ptr);
+  free(e);
+  --list->size;
+
+  return 1;
+}
+
+int 
+Curl_llist_remove_next(curl_llist *list, curl_llist_element *e, void *user)
+{
+  return Curl_llist_remove(list, e->next, user);
+}
+
+int 
+Curl_llist_remove_prev(curl_llist *list, curl_llist_element *e, void *user)
+{
+  return Curl_llist_remove(list, e->prev, user);
+}
+
+size_t 
+Curl_llist_count(curl_llist *list)
+{
+  return list->size;
+}
+
+void 
+Curl_llist_destroy(curl_llist *list, void *user)
+{
+  while (list->size > 0) {
+    Curl_llist_remove(list, CURL_LLIST_TAIL(list), user);
+  }
+
+  free(list);
+  list = NULL;
+}
diff --git a/main/source/curl/lib/llist.h b/main/source/curl/lib/llist.h
new file mode 100644
index 00000000..d21e8e93
--- /dev/null
+++ b/main/source/curl/lib/llist.h
@@ -0,0 +1,64 @@
+#ifndef __LLIST_H
+#define __LLIST_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: llist.h,v 1.5 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+#include <stddef.h>
+
+typedef void (*curl_llist_dtor)(void *, void *);
+
+typedef struct _curl_llist_element {
+  void *ptr;
+
+  struct _curl_llist_element *prev;
+  struct _curl_llist_element *next;
+} curl_llist_element;
+
+typedef struct _curl_llist {
+  curl_llist_element *head;
+  curl_llist_element *tail;
+
+  curl_llist_dtor dtor;
+
+  size_t size;
+} curl_llist;
+
+void Curl_llist_init(curl_llist *, curl_llist_dtor);
+curl_llist *Curl_llist_alloc(curl_llist_dtor);
+int Curl_llist_insert_next(curl_llist *, curl_llist_element *, const void *);
+int Curl_llist_insert_prev(curl_llist *, curl_llist_element *, const void *);
+int Curl_llist_remove(curl_llist *, curl_llist_element *, void *);
+int Curl_llist_remove_next(curl_llist *, curl_llist_element *, void *);
+size_t Curl_llist_count(curl_llist *);
+void Curl_llist_destroy(curl_llist *, void *);
+
+#define CURL_LLIST_HEAD(__l) ((__l)->head)
+#define CURL_LLIST_TAIL(__l) ((__l)->tail)
+#define CURL_LLIST_NEXT(__e) ((__e)->next)
+#define CURL_LLIST_PREV(__e) ((__e)->prev)
+#define CURL_LLIST_VALP(__e) ((__e)->ptr)
+#define CURL_LLIST_IS_TAIL(__e) ((__e)->next ? 0 : 1)
+#define CURL_LLIST_IS_HEAD(__e) ((__e)->prev ? 0 : 1)
+
+#endif
diff --git a/main/source/curl/lib/memdebug.c b/main/source/curl/lib/memdebug.c
new file mode 100644
index 00000000..9b8b452f
--- /dev/null
+++ b/main/source/curl/lib/memdebug.c
@@ -0,0 +1,223 @@
+#ifdef MALLOCDEBUG
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: memdebug.c,v 1.28 2003/01/29 10:14:22 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#include <curl/curl.h>
+
+#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
+#include <winsock.h>
+#else /* some kind of unix */
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#endif
+
+#define _MPRINTF_REPLACE
+#include <curl/mprintf.h>
+#include "urldata.h"
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+/* DONT include memdebug.h here! */
+
+struct memdebug {
+  int size;
+  double mem[1];
+  /* I'm hoping this is the thing with the strictest alignment
+   * requirements.  That also means we waste some space :-( */
+};
+
+/*
+ * Note that these debug functions are very simple and they are meant to
+ * remain so. For advanced analysis, record a log file and write perl scripts
+ * to analyze them!
+ *
+ * Don't use these with multithreaded test programs!
+ */
+
+FILE *logfile;
+
+/* this sets the log file name */
+void curl_memdebug(const char *logname)
+{
+  if(logname)
+    logfile = fopen(logname, "w");
+  else
+    logfile = stderr;
+}
+
+
+void *curl_domalloc(size_t wantedsize, int line, const char *source)
+{
+  struct memdebug *mem;
+  size_t size;
+
+  /* alloc at least 64 bytes */
+  size = sizeof(struct memdebug)+wantedsize;
+
+  mem=(struct memdebug *)(malloc)(size);
+  if(mem) {
+    /* fill memory with junk */
+    memset(mem->mem, 0xA5, wantedsize);
+    mem->size = wantedsize;
+  }
+
+  if(logfile && source)
+    fprintf(logfile, "MEM %s:%d malloc(%d) = %p\n",
+            source, line, wantedsize, mem->mem);
+  return mem->mem;
+}
+
+char *curl_dostrdup(const char *str, int line, const char *source)
+{
+  char *mem;
+  size_t len;
+  
+  if(NULL ==str) {
+    fprintf(stderr, "ILLEGAL strdup() on NULL at %s:%d\n",
+            source, line);
+    exit(2);
+  }
+
+  len=strlen(str)+1;
+
+  mem=curl_domalloc(len, 0, NULL); /* NULL prevents logging */
+  memcpy(mem, str, len);
+
+  if(logfile)
+    fprintf(logfile, "MEM %s:%d strdup(%p) (%d) = %p\n",
+            source, line, str, len, mem);
+
+  return mem;
+}
+
+void *curl_dorealloc(void *ptr, size_t wantedsize,
+                     int line, const char *source)
+{
+  struct memdebug *mem;
+
+  size_t size = sizeof(struct memdebug)+wantedsize;
+
+  mem = (struct memdebug *)((char *)ptr - offsetof(struct memdebug, mem));
+
+  mem=(struct memdebug *)(realloc)(mem, size);
+  if(logfile)
+    fprintf(logfile, "MEM %s:%d realloc(%p, %d) = %p\n",
+            source, line, ptr, wantedsize, mem?mem->mem:NULL);
+
+  if(mem) {
+    mem->size = wantedsize;
+    return mem->mem;
+  }
+
+  return NULL;
+}
+
+void curl_dofree(void *ptr, int line, const char *source)
+{
+  struct memdebug *mem;
+
+  if(NULL == ptr) {
+    fprintf(stderr, "ILLEGAL free() on NULL at %s:%d\n",
+            source, line);
+    exit(2);
+  }
+  mem = (struct memdebug *)((char *)ptr - offsetof(struct memdebug, mem));
+
+  /* destroy  */
+  memset(mem->mem, 0x13, mem->size);
+  
+  /* free for real */
+  (free)(mem);
+
+  if(logfile)
+    fprintf(logfile, "MEM %s:%d free(%p)\n", source, line, ptr);
+}
+
+int curl_socket(int domain, int type, int protocol, int line, char *source)
+{
+  int sockfd=(socket)(domain, type, protocol);
+  if(logfile)
+    fprintf(logfile, "FD %s:%d socket() = %d\n",
+            source, line, sockfd);
+  return sockfd;
+}
+
+int curl_accept(int s, struct sockaddr *addr, socklen_t *addrlen,
+                int line, const char *source)
+{
+  int sockfd=(accept)(s, addr, addrlen);
+  if(logfile)
+    fprintf(logfile, "FD %s:%d accept() = %d\n",
+            source, line, sockfd);
+  return sockfd;
+}
+
+/* this is our own defined way to close sockets on *ALL* platforms */
+int curl_sclose(int sockfd, int line, char *source)
+{
+  int res=sclose(sockfd);
+  if(logfile)
+    fprintf(logfile, "FD %s:%d sclose(%d)\n",
+            source, line, sockfd);
+  return res;
+}
+
+FILE *curl_fopen(const char *file, const char *mode,
+                 int line, const char *source)
+{
+  FILE *res=(fopen)(file, mode);
+  if(logfile)
+    fprintf(logfile, "FILE %s:%d fopen(\"%s\") = %p\n",
+            source, line, file, res);
+  return res;
+}
+
+int curl_fclose(FILE *file, int line, const char *source)
+{
+  int res;
+
+  if(NULL == file) {
+    fprintf(stderr, "ILLEGAL flose() on NULL at %s:%d\n",
+            source, line);
+    exit(2);
+  }
+
+  res=(fclose)(file);
+  if(logfile)
+    fprintf(logfile, "FILE %s:%d fclose(%p)\n",
+            source, line, file);
+  return res;
+}
+#else
+#ifdef VMS
+int VOID_VAR_MEMDEBUG;	
+#endif
+#endif /* MALLOCDEBUG */
diff --git a/main/source/curl/lib/memdebug.h b/main/source/curl/lib/memdebug.h
new file mode 100644
index 00000000..6bc9503c
--- /dev/null
+++ b/main/source/curl/lib/memdebug.h
@@ -0,0 +1,87 @@
+#ifdef MALLOCDEBUG
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: memdebug.h,v 1.16 2003/03/15 21:02:20 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef WIN32
+#include <winsock.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#include <stdio.h>
+#ifdef HAVE_MEMORY_H
+#include <memory.h>
+#endif
+
+extern FILE *logfile;
+
+/* memory functions */
+void *curl_domalloc(size_t size, int line, const char *source);
+void *curl_dorealloc(void *ptr, size_t size, int line, const char *source);
+void curl_dofree(void *ptr, int line, const char *source);
+char *curl_dostrdup(const char *str, int line, const char *source);
+void curl_memdebug(const char *logname);
+
+/* file descriptor manipulators */
+int curl_socket(int domain, int type, int protocol, int, const char *);
+int curl_sclose(int sockfd, int, const char *source);
+int curl_accept(int s, struct sockaddr *addr, socklen_t *addrlen,
+                int line, const char *source);
+
+/* FILE functions */
+FILE *curl_fopen(const char *file, const char *mode, int line,
+                 const char *source);
+int curl_fclose(FILE *file, int line, const char *source);
+
+/* Set this symbol on the command-line, recompile all lib-sources */
+#undef strdup
+#define strdup(ptr) curl_dostrdup(ptr, __LINE__, __FILE__)
+#define malloc(size) curl_domalloc(size, __LINE__, __FILE__)
+#define realloc(ptr,size) curl_dorealloc(ptr, size, __LINE__, __FILE__)
+#define free(ptr) curl_dofree(ptr, __LINE__, __FILE__)
+
+#define socket(domain,type,protocol)\
+ curl_socket(domain,type,protocol,__LINE__,__FILE__)
+#define accept(sock,addr,len)\
+ curl_accept(sock,addr,len,__LINE__,__FILE__)
+
+#define getaddrinfo(host,serv,hint,res) \
+  curl_getaddrinfo(host,serv,hint,res,__LINE__,__FILE__)
+#define freeaddrinfo(data) \
+  curl_freeaddrinfo(data,__LINE__,__FILE__)
+
+/* sclose is probably already defined, redefine it! */
+#undef sclose
+#define sclose(sockfd) curl_sclose(sockfd,__LINE__,__FILE__)
+
+#undef fopen
+#define fopen(file,mode) curl_fopen(file,mode,__LINE__,__FILE__)
+#define fclose(file) curl_fclose(file,__LINE__,__FILE__)
+
+#endif
diff --git a/main/source/curl/lib/mprintf.c b/main/source/curl/lib/mprintf.c
new file mode 100644
index 00000000..a923b453
--- /dev/null
+++ b/main/source/curl/lib/mprintf.c
@@ -0,0 +1,1184 @@
+/****************************************************************************
+ *
+ * $Id: mprintf.c,v 1.23 2003/01/29 10:14:23 bagder Exp $
+ *
+ *************************************************************************
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
+ * CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
+ *
+ * Purpose:
+ *  A merge of Bjorn Reese's format() function and Daniel's dsprintf()
+ *  1.0. A full blooded printf() clone with full support for <num>$
+ *  everywhere (parameters, widths and precisions) including variabled
+ *  sized parameters (like doubles, long longs, long doubles and even
+ *  void * in 64-bit architectures).
+ *
+ * Current restrictions:
+ * - Max 128 parameters
+ * - No 'long double' support.
+ *
+ * If you ever want truly portable and good *printf() clones, the project that
+ * took on from here is named 'Trio' and you find more details on the trio web
+ * page at http://daniel.haxx.se/trio/
+ */
+
+
+#include "setup.h"
+#include <sys/types.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+
+#ifndef SIZEOF_LONG_LONG
+/* prevents warnings on picky compilers */
+#define SIZEOF_LONG_LONG 0
+#endif
+#ifndef SIZEOF_LONG_DOUBLE
+#define SIZEOF_LONG_DOUBLE 0
+#endif
+
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+#define BUFFSIZE 256 /* buffer for long-to-str and float-to-str calcs */
+#define MAX_PARAMETERS 128 /* lame static limit */
+
+#undef TRUE
+#undef FALSE
+#undef BOOL
+#ifdef __cplusplus
+# define TRUE true
+# define FALSE false
+# define BOOL bool
+#else
+# define TRUE  ((char)(1 == 1))
+# define FALSE ((char)(0 == 1))
+# define BOOL char
+#endif
+
+#ifndef __linux__
+#include <ctype.h>
+#endif
+
+/* Lower-case digits.  */
+static const char lower_digits[] = "0123456789abcdefghijklmnopqrstuvwxyz";
+
+/* Upper-case digits.  */
+static const char upper_digits[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+#define	OUTCHAR(x) done+=(stream(x, (FILE *)data)==-1?0:1)
+
+/* Data type to read from the arglist */
+typedef enum  {
+  FORMAT_UNKNOWN = 0,
+  FORMAT_STRING,
+  FORMAT_PTR,
+  FORMAT_INT,
+  FORMAT_INTPTR,
+  FORMAT_LONG,
+  FORMAT_LONGLONG,
+  FORMAT_DOUBLE,
+  FORMAT_LONGDOUBLE,
+  FORMAT_WIDTH /* For internal use */
+} FormatType;
+
+/* convertion and display flags */
+enum {
+  FLAGS_NEW        = 0,
+  FLAGS_SPACE      = 1<<0,
+  FLAGS_SHOWSIGN   = 1<<1,
+  FLAGS_LEFT       = 1<<2,
+  FLAGS_ALT        = 1<<3,
+  FLAGS_SHORT      = 1<<4,
+  FLAGS_LONG       = 1<<5,
+  FLAGS_LONGLONG   = 1<<6,
+  FLAGS_LONGDOUBLE = 1<<7,
+  FLAGS_PAD_NIL    = 1<<8,
+  FLAGS_UNSIGNED   = 1<<9,
+  FLAGS_OCTAL      = 1<<10,
+  FLAGS_HEX        = 1<<11,
+  FLAGS_UPPER      = 1<<12,
+  FLAGS_WIDTH      = 1<<13, /* '*' or '*<num>$' used */
+  FLAGS_WIDTHPARAM = 1<<14, /* width PARAMETER was specified */
+  FLAGS_PREC       = 1<<15, /* precision was specified */
+  FLAGS_PRECPARAM  = 1<<16, /* precision PARAMETER was specified */
+  FLAGS_CHAR       = 1<<17, /* %c story */
+  FLAGS_FLOATE     = 1<<18, /* %e or %E */
+  FLAGS_FLOATG     = 1<<19  /* %g or %G */
+};
+
+typedef struct {
+  FormatType type;
+  int flags;
+  int width;     /* width OR width parameter number */
+  int precision; /* precision OR precision parameter number */
+  union {
+    char *str;
+    void *ptr;
+    long num;
+#if SIZEOF_LONG_LONG /* if this is non-zero */
+    long long lnum;
+#endif
+    double dnum;
+#if SIZEOF_LONG_DOUBLE
+    long double ldnum;
+#endif
+  } data;
+} va_stack_t;
+
+struct nsprintf {
+  char *buffer;
+  size_t length;
+  size_t max;
+};
+
+struct asprintf {
+  char *buffer; /* allocated buffer */
+  size_t len;   /* length of string */
+  size_t alloc; /* length of alloc */
+};
+
+int curl_msprintf(char *buffer, const char *format, ...);
+
+static int dprintf_DollarString(char *input, char **end)
+{
+  int number=0;
+  while(isdigit((int)*input)) {
+    number *= 10;
+    number += *input-'0';
+    input++;
+  }
+  if(number && ('$'==*input++)) {
+    *end = input;
+    return number;
+  }
+  return 0;
+}
+
+static BOOL dprintf_IsQualifierNoDollar(char c)
+{
+  switch (c) {
+  case '-': case '+': case ' ': case '#': case '.':
+  case '0': case '1': case '2': case '3': case '4':
+  case '5': case '6': case '7': case '8': case '9':
+  case 'h': case 'l': case 'L': case 'Z': case 'q':
+    return TRUE;
+  default:
+    return FALSE;
+  }
+}
+
+#ifdef DPRINTF_DEBUG2
+int dprintf_Pass1Report(va_stack_t *vto, int max)
+{
+  int i;
+  char buffer[128];
+  int bit;
+  int flags;
+
+  for(i=0; i<max; i++) {
+    char *type;
+    switch(vto[i].type) {
+    case FORMAT_UNKNOWN:
+      type = "unknown";
+      break;
+    case FORMAT_STRING:
+      type ="string";
+      break;
+    case FORMAT_PTR:
+      type ="pointer";
+      break;
+    case FORMAT_INT:
+      type = "int";
+      break;
+    case FORMAT_LONG:
+      type = "long";
+      break;
+    case FORMAT_LONGLONG:
+      type = "long long";
+      break;
+    case FORMAT_DOUBLE:
+      type = "double";
+      break;
+    case FORMAT_LONGDOUBLE:
+      type = "long double";
+      break;      
+    }
+
+
+    buffer[0]=0;
+
+    for(bit=0; bit<31; bit++) {
+      flags = vto[i].flags & (1<<bit);
+
+      if(flags & FLAGS_SPACE)
+	strcat(buffer, "space ");
+      else if(flags & FLAGS_SHOWSIGN)
+	strcat(buffer, "plus ");
+      else if(flags & FLAGS_LEFT)
+	strcat(buffer, "left ");
+      else if(flags & FLAGS_ALT)
+	strcat(buffer, "alt ");
+      else if(flags & FLAGS_SHORT)
+	strcat(buffer, "short ");
+      else if(flags & FLAGS_LONG)
+	strcat(buffer, "long ");
+      else if(flags & FLAGS_LONGLONG)
+	strcat(buffer, "longlong ");
+      else if(flags & FLAGS_LONGDOUBLE)
+	strcat(buffer, "longdouble ");
+      else if(flags & FLAGS_PAD_NIL)
+	strcat(buffer, "padnil ");
+      else if(flags & FLAGS_UNSIGNED)
+	strcat(buffer, "unsigned ");
+      else if(flags & FLAGS_OCTAL)
+	strcat(buffer, "octal ");
+      else if(flags & FLAGS_HEX)
+	strcat(buffer, "hex ");
+      else if(flags & FLAGS_UPPER)
+	strcat(buffer, "upper ");
+      else if(flags & FLAGS_WIDTH)
+	strcat(buffer, "width ");
+      else if(flags & FLAGS_WIDTHPARAM)
+	strcat(buffer, "widthparam ");
+      else if(flags & FLAGS_PREC)
+	strcat(buffer, "precision ");
+      else if(flags & FLAGS_PRECPARAM)
+	strcat(buffer, "precparam ");
+      else if(flags & FLAGS_CHAR)
+	strcat(buffer, "char ");
+      else if(flags & FLAGS_FLOATE)
+	strcat(buffer, "floate ");
+      else if(flags & FLAGS_FLOATG)
+	strcat(buffer, "floatg ");
+    }
+    printf("REPORT: %d. %s [%s]\n", i, type, buffer);
+
+  }
+
+
+}
+#endif
+
+/******************************************************************
+ *
+ * Pass 1:
+ * Create an index with the type of each parameter entry and its
+ * value (may vary in size)
+ *
+ ******************************************************************/
+
+static int dprintf_Pass1(char *format, va_stack_t *vto, char **endpos, va_list arglist)
+{
+  char *fmt = format;
+  int param_num = 0;
+  int this_param;
+  int width;
+  int precision;
+  int flags;
+  int max_param=0;
+  int i;
+
+  while (*fmt) {
+    if (*fmt++ == '%') {
+      if (*fmt == '%') {
+	fmt++;
+	continue; /* while */
+      }
+
+      flags = FLAGS_NEW;
+
+      /* Handle the positional case (N$) */
+
+      param_num++;
+      
+      this_param = dprintf_DollarString(fmt, &fmt);
+      if (0 == this_param)
+	/* we got no positional, get the next counter */
+	this_param = param_num;
+
+      if (this_param > max_param)
+	max_param = this_param;
+
+      /*
+       * The parameter with number 'i' should be used. Next, we need
+       * to get SIZE and TYPE of the parameter. Add the information
+       * to our array.
+       */
+
+      width = 0;
+      precision = 0;
+
+      /* Handle the flags */
+
+      while (dprintf_IsQualifierNoDollar(*fmt)) {
+	switch (*fmt++) {
+	case ' ':
+	  flags |= FLAGS_SPACE;
+	  break;
+	case '+':
+	  flags |= FLAGS_SHOWSIGN;
+	  break;
+	case '-':
+	  flags |= FLAGS_LEFT;
+	  flags &= ~FLAGS_PAD_NIL;
+	  break;
+	case '#':
+	  flags |= FLAGS_ALT;
+	  break;
+	case '.':
+	  flags |= FLAGS_PREC;
+	  if ('*' == *fmt) {
+	    /* The precision is picked from a specified parameter */
+
+	    flags |= FLAGS_PRECPARAM;
+	    fmt++;
+	    param_num++;
+
+	    i = dprintf_DollarString(fmt, &fmt);
+	    if (i)
+	      precision = i;
+	    else
+	      precision = param_num;
+
+	    if (precision > max_param)
+	      max_param = precision;
+       	  }
+	  else {
+	    flags |= FLAGS_PREC;
+	    precision = strtol(fmt, &fmt, 10);
+	  }
+	  break;
+	case 'h':
+	  flags |= FLAGS_SHORT;
+	  break;
+	case 'l':
+	  if (flags & FLAGS_LONG)
+	    flags |= FLAGS_LONGLONG;
+	  else
+	    flags |= FLAGS_LONG;
+	  break;
+	case 'L':
+	  flags |= FLAGS_LONGDOUBLE;
+	  break;
+	case 'q':
+	  flags |= FLAGS_LONGLONG;
+	  break;
+	case 'Z':
+	  if (sizeof(size_t) > sizeof(unsigned long int))
+	    flags |= FLAGS_LONGLONG;
+	  if (sizeof(size_t) > sizeof(unsigned int))
+	    flags |= FLAGS_LONG;
+	  break;
+	case '0':
+	  if (!(flags & FLAGS_LEFT))
+	    flags |= FLAGS_PAD_NIL;
+	  /* FALLTHROUGH */
+	case '1': case '2': case '3': case '4':
+	case '5': case '6': case '7': case '8': case '9':
+	  flags |= FLAGS_WIDTH;
+	  width = strtol(fmt-1, &fmt, 10);
+	  break;
+	case '*':  /* Special case */
+	  flags |= FLAGS_WIDTHPARAM;
+	  param_num++;
+	  
+	  i = dprintf_DollarString(fmt, &fmt);
+	  if(i)
+	    width = i;
+	  else
+	    width = param_num;
+	  if(width > max_param)
+	    max_param=width;
+	  break;
+	default:
+	  break;
+	}
+      } /* switch */
+
+      /* Handle the specifier */
+
+      i = this_param - 1;
+
+      switch (*fmt) {
+      case 'S':
+	flags |= FLAGS_ALT;
+	/* FALLTHROUGH */
+      case 's':
+	vto[i].type = FORMAT_STRING;
+	break;
+      case 'n':
+	vto[i].type = FORMAT_INTPTR;
+	break;
+      case 'p':
+	vto[i].type = FORMAT_PTR;
+	break;
+      case 'd': case 'i':
+	vto[i].type = FORMAT_INT;
+	break;
+      case 'u':
+	vto[i].type = FORMAT_INT;
+	flags |= FLAGS_UNSIGNED;
+	break;
+      case 'o':
+	vto[i].type = FORMAT_INT;
+	flags |= FLAGS_OCTAL;
+	break;
+      case 'x':
+	vto[i].type = FORMAT_INT;
+	flags |= FLAGS_HEX;
+	break;
+      case 'X':
+	vto[i].type = FORMAT_INT;
+	flags |= FLAGS_HEX|FLAGS_UPPER;
+	break;
+      case 'c':
+	vto[i].type = FORMAT_INT;
+	flags |= FLAGS_CHAR;
+	break;	
+      case 'f':
+	vto[i].type = FORMAT_DOUBLE;
+	break;
+      case 'e': case 'E':
+	vto[i].type = FORMAT_DOUBLE;
+	flags |= FLAGS_FLOATE| (('E' == *fmt)?FLAGS_UPPER:0);
+	break;
+      case 'g': case 'G':
+	vto[i].type = FORMAT_DOUBLE;
+	flags |= FLAGS_FLOATG| (('G' == *fmt)?FLAGS_UPPER:0);
+	break;	
+      default:
+	vto[i].type = FORMAT_UNKNOWN;
+	break;
+      } /* switch */
+
+      vto[i].flags = flags;
+      vto[i].width = width;
+      vto[i].precision = precision;
+      
+      if (flags & FLAGS_WIDTHPARAM) {
+	/* we have the width specified from a parameter, so we make that
+	   parameter's info setup properly */
+	vto[i].width = width - 1;
+	i = width - 1;
+	vto[i].type = FORMAT_WIDTH;
+	vto[i].flags = FLAGS_NEW;
+	vto[i].precision = vto[i].width = 0; /* can't use width or precision
+						of width! */	
+      }
+      if (flags & FLAGS_PRECPARAM) {
+	/* we have the precision specified from a parameter, so we make that
+	   parameter's info setup properly */
+	vto[i].precision = precision - 1;
+	i = precision - 1;
+	vto[i].type = FORMAT_WIDTH;
+	vto[i].flags = FLAGS_NEW;
+	vto[i].precision = vto[i].width = 0; /* can't use width or precision
+						of width! */
+      }
+      *endpos++ = fmt + 1; /* end of this sequence */
+    }
+  }
+
+#ifdef DPRINTF_DEBUG2
+  dprintf_Pass1Report(vto, max_param);
+#endif
+
+  /* Read the arg list parameters into our data list */
+  for (i=0; i<max_param; i++) {
+    if ((i + 1 < max_param) && (vto[i + 1].type == FORMAT_WIDTH))
+      {
+	/* Width/precision arguments must be read before the main argument
+	 * they are attached to
+	 */
+	vto[i + 1].data.num = va_arg(arglist, int);
+      }
+
+    switch (vto[i].type)
+      {
+      case FORMAT_STRING:
+	vto[i].data.str = va_arg(arglist, char *);
+	break;
+	
+      case FORMAT_INTPTR:
+      case FORMAT_UNKNOWN:
+      case FORMAT_PTR:
+	vto[i].data.ptr = va_arg(arglist, void *);
+	break;
+	
+      case FORMAT_INT:
+#if SIZEOF_LONG_LONG
+	if(vto[i].flags & FLAGS_LONGLONG)
+	  vto[i].data.lnum = va_arg(arglist, long long);
+	else
+#endif
+	  if(vto[i].flags & FLAGS_LONG)
+	    vto[i].data.num = va_arg(arglist, long);
+	else
+	  vto[i].data.num = va_arg(arglist, int);
+	break;
+	
+      case FORMAT_DOUBLE:
+#if SIZEOF_LONG_DOUBLE
+	if(vto[i].flags & FLAGS_LONG)
+	  vto[i].data.ldnum = va_arg(arglist, long double);
+	else
+#endif
+	  vto[i].data.dnum = va_arg(arglist, double);
+	break;
+	
+      case FORMAT_WIDTH:
+	/* Argument has been read. Silently convert it into an integer
+	 * for later use
+	 */
+	vto[i].type = FORMAT_INT;
+	break;
+	
+      default:
+	break;
+      }
+  }
+
+  return max_param;
+
+}
+
+static int dprintf_formatf(
+             void *data, /* untouched by format(), just sent to the
+                            stream() function in the first argument */
+	     int (*stream)(int, FILE *), /* function pointer called for each
+					    output character */
+	     const char *format,    /* %-formatted string */
+	     va_list ap_save) /* list of parameters */
+{
+  /* Base-36 digits for numbers.  */
+  const char *digits = lower_digits;
+
+  /* Pointer into the format string.  */
+  char *f;
+
+  /* Number of characters written.  */
+  register size_t done = 0;
+
+  long param; /* current parameter to read */
+  long param_num=0; /* parameter counter */
+
+  va_stack_t vto[MAX_PARAMETERS];
+  char *endpos[MAX_PARAMETERS];
+  char **end;
+
+  char work[BUFFSIZE];
+
+  va_stack_t *p;
+
+  /* Do the actual %-code parsing */
+  dprintf_Pass1((char *)format, vto, endpos, ap_save);
+
+  end = &endpos[0]; /* the initial end-position from the list dprintf_Pass1()
+                       created for us */
+  
+  f = (char *)format;
+  while (*f != '\0') {
+    /* Format spec modifiers.  */
+    char alt;
+    
+    /* Width of a field.  */
+    register long width;
+    /* Precision of a field.  */
+    long prec;
+    
+    /* Decimal integer is negative.  */
+    char is_neg;
+    
+    /* Base of a number to be written.  */
+    long base;
+
+    /* Integral values to be written.  */
+#if SIZEOF_LONG_LONG
+    unsigned long long num;
+#else
+    unsigned long num;
+#endif
+    long signed_num;
+    
+    if (*f != '%') {
+      /* This isn't a format spec, so write everything out until the next one
+	 OR end of string is reached.  */
+      do {
+	OUTCHAR(*f);
+      } while(*++f && ('%' != *f));
+      continue;
+    }
+    
+    ++f;
+    
+    /* Check for "%%".  Note that although the ANSI standard lists
+       '%' as a conversion specifier, it says "The complete format
+       specification shall be `%%'," so we can avoid all the width
+       and precision processing.  */
+    if (*f == '%') {
+      ++f;
+      OUTCHAR('%');
+      continue;
+    }
+
+    /* If this is a positional parameter, the position must follow imediately
+       after the %, thus create a %<num>$ sequence */
+    param=dprintf_DollarString(f, &f);
+
+    if(!param)
+      param = param_num;
+    else
+      --param;
+    
+    param_num++; /* increase this always to allow "%2$s %1$s %s" and then the
+		    third %s will pick the 3rd argument */
+
+    p = &vto[param];
+
+    /* pick up the specified width */
+    if(p->flags & FLAGS_WIDTHPARAM)
+      width = vto[p->width].data.num;
+    else
+      width = p->width;
+
+    /* pick up the specified precision */
+    if(p->flags & FLAGS_PRECPARAM)
+      prec = vto[p->precision].data.num;
+    else if(p->flags & FLAGS_PREC)
+      prec = p->precision;
+    else
+      prec = -1;
+
+    alt = p->flags & FLAGS_ALT;
+    
+    switch (p->type) {
+    case FORMAT_INT:
+      num = p->data.num;
+      if(p->flags & FLAGS_CHAR) {
+	/* Character.  */
+	if (!(p->flags & FLAGS_LEFT))
+	  while (--width > 0)
+	    OUTCHAR(' ');
+	OUTCHAR((char) num);
+	if (p->flags & FLAGS_LEFT)
+	  while (--width > 0)
+	    OUTCHAR(' ');
+	break;
+      }
+      if(p->flags & FLAGS_UNSIGNED) {
+	/* Decimal unsigned integer.  */
+	base = 10;
+	goto unsigned_number;
+      }
+      if(p->flags & FLAGS_OCTAL) {
+	/* Octal unsigned integer.  */
+	base = 8;
+	goto unsigned_number;
+      }
+      if(p->flags & FLAGS_HEX) {
+	/* Hexadecimal unsigned integer.  */
+
+	digits = (p->flags & FLAGS_UPPER)? upper_digits : lower_digits;
+	base = 16;
+	goto unsigned_number;
+      }
+
+      /* Decimal integer.  */
+      base = 10;
+
+#if SIZEOF_LONG_LONG
+      if(p->flags & FLAGS_LONGLONG) {
+	 /* long long */
+	is_neg = p->data.lnum < 0;
+	num = is_neg ? (- p->data.lnum) : p->data.lnum;
+      }
+      else
+#endif
+      {
+	signed_num = (long) num;
+      
+	is_neg = signed_num < 0;
+	num = is_neg ? (- signed_num) : signed_num;
+      }
+      goto number;
+      
+    unsigned_number:;
+      /* Unsigned number of base BASE.  */
+      is_neg = 0;
+      
+    number:;
+      /* Number of base BASE.  */
+      {
+	char *workend = &work[sizeof(work) - 1];
+	register char *w;
+	
+	/* Supply a default precision if none was given.  */
+	if (prec == -1)
+	  prec = 1;
+	
+	/* Put the number in WORK.  */
+	w = workend;
+	while (num > 0) {
+	  *w-- = digits[num % base];
+	  num /= base;
+	}
+	width -= workend - w;
+	prec -= workend - w;
+	
+	if (alt && base == 8 && prec <= 0) {
+	  *w-- = '0';
+	  --width;
+	}
+	
+	if (prec > 0) {
+	  width -= prec;
+	  while (prec-- > 0)
+	    *w-- = '0';
+	}
+	
+	if (alt && base == 16)
+	  width -= 2;
+	
+	if (is_neg || (p->flags & FLAGS_SHOWSIGN) || (p->flags & FLAGS_SPACE))
+	  --width;
+	
+	if (!(p->flags & FLAGS_LEFT) && !(p->flags & FLAGS_PAD_NIL))
+	  while (width-- > 0)
+	    OUTCHAR(' ');
+	
+	if (is_neg)
+	  OUTCHAR('-');
+	else if (p->flags & FLAGS_SHOWSIGN)
+	  OUTCHAR('+');
+	else if (p->flags & FLAGS_SPACE)
+	  OUTCHAR(' ');
+	
+	if (alt && base == 16) {
+	  OUTCHAR('0');
+	  if(p->flags & FLAGS_UPPER)
+	    OUTCHAR('X');
+	  else
+	    OUTCHAR('x');
+	}
+
+	if (!(p->flags & FLAGS_LEFT) && (p->flags & FLAGS_PAD_NIL))
+	  while (width-- > 0)
+	    OUTCHAR('0');
+	
+	/* Write the number.  */
+	while (++w <= workend) {
+	  OUTCHAR(*w);
+	}
+	
+	if (p->flags & FLAGS_LEFT)
+	  while (width-- > 0)
+	    OUTCHAR(' ');
+      }
+      break;
+      
+    case FORMAT_STRING:
+	    /* String.  */
+      {
+	static char null[] = "(nil)";
+	char *str;
+	size_t len;
+	
+	str = (char *) p->data.str;
+	if ( str == NULL) {
+	  /* Write null[] if there's space.  */
+	  if (prec == -1 || prec >= (long) sizeof(null) - 1) {
+	    str = null;
+	    len = sizeof(null) - 1;
+	    /* Disable quotes around (nil) */
+	    p->flags &= (~FLAGS_ALT);
+	  }
+	  else {
+	    str = (char *)"";
+	    len = 0;
+	  }
+	}
+	else
+	  len = strlen(str);
+	
+	if (prec != -1 && (size_t) prec < len)
+	  len = prec;
+	width -= len;
+
+	if (p->flags & FLAGS_ALT)
+	  OUTCHAR('"');
+
+	if (!(p->flags&FLAGS_LEFT))
+	  while (width-- > 0)
+	    OUTCHAR(' ');
+	
+	while (len-- > 0)
+	  OUTCHAR(*str++);
+	if (p->flags&FLAGS_LEFT)
+	  while (width-- > 0)
+	    OUTCHAR(' ');
+
+	if (p->flags & FLAGS_ALT)
+	  OUTCHAR('"');
+      }
+      break;
+      
+    case FORMAT_PTR:
+      /* Generic pointer.  */
+      {
+	void *ptr;
+	ptr = (void *) p->data.ptr;
+	if (ptr != NULL) {
+	  /* If the pointer is not NULL, write it as a %#x spec.  */
+	  base = 16;
+	  digits = (p->flags & FLAGS_UPPER)? upper_digits : lower_digits;
+	  alt = 1;
+	  num = (unsigned long) ptr;
+	  is_neg = 0;
+	  goto number;
+	}
+	else {
+	  /* Write "(nil)" for a nil pointer.  */
+	  static char strnil[] = "(nil)";
+	  register char *point;
+	  
+	  width -= sizeof(strnil) - 1;
+	  if (p->flags & FLAGS_LEFT)
+	    while (width-- > 0)
+	      OUTCHAR(' ');
+	  for (point = strnil; *point != '\0'; ++point)
+	    OUTCHAR(*point);
+	  if (! (p->flags & FLAGS_LEFT))
+	    while (width-- > 0)
+	      OUTCHAR(' ');
+	}
+      }
+      break;
+
+    case FORMAT_DOUBLE:
+      {
+	char formatbuf[32]="%";
+	char *fptr;
+	
+	width = -1;
+	if (p->flags & FLAGS_WIDTH)
+	  width = p->width;
+	else if (p->flags & FLAGS_WIDTHPARAM)
+	  width = vto[p->width].data.num;
+
+	prec = -1;
+	if (p->flags & FLAGS_PREC)
+	  prec = p->precision;
+	else if (p->flags & FLAGS_PRECPARAM)
+	  prec = vto[p->precision].data.num;
+
+	if (p->flags & FLAGS_LEFT)
+	  strcat(formatbuf, "-");
+	if (p->flags & FLAGS_SHOWSIGN)
+	  strcat(formatbuf, "+");
+	if (p->flags & FLAGS_SPACE)
+	  strcat(formatbuf, " ");
+	if (p->flags & FLAGS_ALT)
+	  strcat(formatbuf, "#");
+
+	fptr=&formatbuf[strlen(formatbuf)];
+
+	if(width >= 0) {
+	  /* RECURSIVE USAGE */
+	  fptr += curl_msprintf(fptr, "%d", width);
+	}
+	if(prec >= 0) {
+	  /* RECURSIVE USAGE */
+	  fptr += curl_msprintf(fptr, ".%d", prec);
+	}
+	if (p->flags & FLAGS_LONG)
+	  strcat(fptr, "l");
+
+	if (p->flags & FLAGS_FLOATE)
+	  strcat(fptr, p->flags&FLAGS_UPPER?"E":"e");
+	else if (p->flags & FLAGS_FLOATG)
+	  strcat(fptr, (p->flags & FLAGS_UPPER) ? "G" : "g");
+	else
+	  strcat(fptr, "f");
+
+	/* NOTE NOTE NOTE!! Not all sprintf() implementations returns number
+	   of output characters */
+#if SIZEOF_LONG_DOUBLE
+	if (p->flags & FLAGS_LONG)
+	  /* This is for support of the 'long double' type */
+	  (sprintf)(work, formatbuf, p->data.ldnum);
+	else
+#endif
+	  (sprintf)(work, formatbuf, p->data.dnum);
+
+	for(fptr=work; *fptr; fptr++)
+	  OUTCHAR(*fptr);
+      }
+      break;
+
+    case FORMAT_INTPTR:
+      /* Answer the count of characters written.  */
+#if SIZEOF_LONG_LONG
+      if (p->flags & FLAGS_LONGLONG)
+	*(long long int *) p->data.ptr = done;
+      else
+#endif
+	if (p->flags & FLAGS_LONG)
+	  *(long int *) p->data.ptr = done;
+      else if (!(p->flags & FLAGS_SHORT))
+	*(int *) p->data.ptr = done;
+      else
+	*(short int *) p->data.ptr = done;
+      break;
+
+    default:
+      break;
+    }
+    f = *end++; /* goto end of %-code */
+
+  }
+  return done;
+}
+
+/* fputc() look-alike */
+static int addbyter(int output, FILE *data)
+{
+  struct nsprintf *infop=(struct nsprintf *)data;
+ 
+  if(infop->length < infop->max) {
+    /* only do this if we haven't reached max length yet */
+    infop->buffer[0] = (char)output; /* store */
+    infop->buffer++; /* increase pointer */
+    infop->length++; /* we are now one byte larger */
+    return output; /* fputc() returns like this on success */
+  }
+  return -1;
+}
+
+int curl_msnprintf(char *buffer, size_t maxlength, const char *format, ...)
+{
+  va_list ap_save; /* argument pointer */
+  int retcode;
+  struct nsprintf info;
+
+  info.buffer = buffer;
+  info.length = 0;
+  info.max = maxlength;
+
+  va_start(ap_save, format);
+  retcode = dprintf_formatf(&info, addbyter, format, ap_save);
+  va_end(ap_save);
+  info.buffer[0] = 0; /* we terminate this with a zero byte */
+
+  /* we could even return things like */
+  
+  return retcode;
+}
+
+int curl_mvsnprintf(char *buffer, size_t maxlength, const char *format, va_list ap_save)
+{
+  int retcode;
+  struct nsprintf info;
+
+  info.buffer = buffer;
+  info.length = 0;
+  info.max = maxlength;
+
+  retcode = dprintf_formatf(&info, addbyter, format, ap_save);
+  info.buffer[0] = 0; /* we terminate this with a zero byte */
+  return retcode;
+}
+
+
+/* fputc() look-alike */
+static int alloc_addbyter(int output, FILE *data)
+{
+  struct asprintf *infop=(struct asprintf *)data;
+ 
+  if(!infop->buffer) {
+    infop->buffer=(char *)malloc(32);
+    if(!infop->buffer)
+      return -1; /* fail */
+    infop->alloc = 32;
+    infop->len =0;
+  }
+  else if(infop->len+1 >= infop->alloc) {
+    char *newptr;
+
+    newptr = (char *)realloc(infop->buffer, infop->alloc*2);
+
+    if(!newptr) {
+      return -1;
+    }
+    infop->buffer = newptr;
+    infop->alloc *= 2;
+  }
+
+  infop->buffer[ infop->len ] = output;
+
+  infop->len++;
+
+  return output; /* fputc() returns like this on success */
+}
+
+char *curl_maprintf(const char *format, ...)
+{
+  va_list ap_save; /* argument pointer */
+  int retcode;
+  struct asprintf info;
+
+  info.buffer = NULL;
+  info.len = 0;
+  info.alloc = 0;
+
+  va_start(ap_save, format);
+  retcode = dprintf_formatf(&info, alloc_addbyter, format, ap_save);
+  va_end(ap_save);
+  if(-1 == retcode) {
+    if(info.alloc)
+      free(info.buffer);
+    return NULL;
+  }
+  if(info.alloc) {
+    info.buffer[info.len] = 0; /* we terminate this with a zero byte */
+    return info.buffer;
+  }
+  else
+    return strdup("");
+}
+
+char *curl_mvaprintf(const char *format, va_list ap_save)
+{
+  int retcode;
+  struct asprintf info;
+
+  info.buffer = NULL;
+  info.len = 0;
+  info.alloc = 0;
+
+  retcode = dprintf_formatf(&info, alloc_addbyter, format, ap_save);
+  if(-1 == retcode) {
+    if(info.alloc)
+      free(info.buffer);
+    return NULL;
+  }
+
+  if(info.alloc) {
+    info.buffer[info.len] = 0; /* we terminate this with a zero byte */
+    return info.buffer;
+  }
+  else
+    return strdup("");
+}
+
+static int storebuffer(int output, FILE *data)
+{
+  char **buffer = (char **)data;
+  **buffer = (char)output;
+  (*buffer)++;
+  return output; /* act like fputc() ! */
+}
+
+int curl_msprintf(char *buffer, const char *format, ...)
+{
+  va_list ap_save; /* argument pointer */
+  int retcode;
+  va_start(ap_save, format);
+  retcode = dprintf_formatf(&buffer, storebuffer, format, ap_save);
+  va_end(ap_save);
+  *buffer=0; /* we terminate this with a zero byte */
+  return retcode;
+}
+
+#ifndef WIN32 /* not needed on win32 */
+extern int fputc(int, FILE *);
+#endif
+
+int curl_mprintf(const char *format, ...)
+{
+  int retcode;
+  va_list ap_save; /* argument pointer */
+  va_start(ap_save, format);
+  retcode = dprintf_formatf(stdout, fputc, format, ap_save);
+  va_end(ap_save);
+  return retcode;
+}
+
+int curl_mfprintf(FILE *whereto, const char *format, ...)
+{
+  int retcode;
+  va_list ap_save; /* argument pointer */
+  va_start(ap_save, format);
+  retcode = dprintf_formatf(whereto, fputc, format, ap_save);
+  va_end(ap_save);
+  return retcode;
+}
+
+int curl_mvsprintf(char *buffer, const char *format, va_list ap_save)
+{
+  int retcode;
+  retcode = dprintf_formatf(&buffer, storebuffer, format, ap_save);
+  *buffer=0; /* we terminate this with a zero byte */
+  return retcode;
+}
+
+int curl_mvprintf(const char *format, va_list ap_save)
+{
+  return dprintf_formatf(stdout, fputc, format, ap_save);
+}
+
+int curl_mvfprintf(FILE *whereto, const char *format, va_list ap_save)
+{
+  return dprintf_formatf(whereto, fputc, format, ap_save);
+}
+
+#ifdef DPRINTF_DEBUG
+int main()
+{
+  char buffer[129];
+  char *ptr;
+#if SIZEOF_LONG_LONG>0
+  long long hullo;
+  dprintf("%3$12s %1$s %2$qd %4$d\n", "daniel", hullo, "stenberg", 65);
+#endif
+
+  mprintf("%3d %5d\n", 10, 1998);
+  
+  ptr=maprintf("test this then baby %s%s%s%s%s%s %d %d %d loser baby get a hit in yer face now!", "", "pretty long string pretty long string pretty long string pretty long string pretty long string", "/", "/", "/", "pretty long string", 1998, 1999, 2001);
+
+  puts(ptr);
+
+  memset(ptr, 55, strlen(ptr)+1);
+
+  free(ptr);
+
+#if 1
+  mprintf(buffer, "%s %s %d", "daniel", "stenberg", 19988);
+  puts(buffer);
+
+  mfprintf(stderr, "%s %#08x\n", "dummy", 65);
+
+  printf("%s %#08x\n", "dummy", 65);
+  {
+    double tryout = 3.14156592;
+    mprintf(buffer, "%.2g %G %f %e %E", tryout, tryout, tryout, tryout, tryout);
+    puts(buffer);
+    printf("%.2g %G %f %e %E\n", tryout, tryout, tryout, tryout, tryout);
+  }
+#endif
+
+  return 0;
+}
+
+#endif
diff --git a/main/source/curl/lib/multi.c b/main/source/curl/lib/multi.c
new file mode 100644
index 00000000..f62a68a9
--- /dev/null
+++ b/main/source/curl/lib/multi.c
@@ -0,0 +1,570 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: multi.c,v 1.29 2003/04/29 18:03:30 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#include <curl/curl.h>
+
+#include "urldata.h"
+#include "transfer.h"
+#include "url.h"
+#include "connect.h"
+#include "progress.h"
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+struct Curl_message {
+  /* the 'CURLMsg' is the part that is visible to the external user */
+  struct CURLMsg extmsg;
+  struct Curl_message *next;
+};
+
+typedef enum {
+  CURLM_STATE_INIT,
+  CURLM_STATE_CONNECT,     /* connect has been sent off */
+  CURLM_STATE_WAITCONNECT, /* we're awaiting the connect to finalize */
+  CURLM_STATE_DO,          /* send off the request (part 1) */
+  CURLM_STATE_DO_MORE,     /* send off the request (part 2) */
+  CURLM_STATE_PERFORM,     /* transfer data */
+  CURLM_STATE_DONE,        /* post data transfer operation */
+  CURLM_STATE_COMPLETED,   /* operation complete */
+
+  CURLM_STATE_LAST /* not a true state, never use this */
+} CURLMstate;
+
+struct Curl_one_easy {
+  /* first, two fields for the linked list of these */
+  struct Curl_one_easy *next;
+  struct Curl_one_easy *prev;
+  
+  struct SessionHandle *easy_handle; /* the easy handle for this unit */
+  struct connectdata *easy_conn;     /* the "unit's" connection */
+
+  CURLMstate state;  /* the handle's state */
+  CURLcode result;   /* previous result */
+
+  struct Curl_message *msg; /* A pointer to one single posted message.
+                               Cleanup should be done on this pointer NOT on
+                               the linked list in Curl_multi.  This message
+                               will be deleted when this handle is removed
+                               from the multi-handle */
+  int msg_num; /* number of messages left in 'msg' to return */
+};
+
+
+#define CURL_MULTI_HANDLE 0x000bab1e
+
+#define GOOD_MULTI_HANDLE(x) ((x)&&(((struct Curl_multi *)x)->type == CURL_MULTI_HANDLE))
+#define GOOD_EASY_HANDLE(x) (x)
+
+/* This is the struct known as CURLM on the outside */
+struct Curl_multi {
+  /* First a simple identifier to easier detect if a user mix up
+     this multi handle with an easy handle. Set this to CURL_MULTI_HANDLE. */
+  long type;
+
+  /* We have a linked list with easy handles */
+  struct Curl_one_easy easy; 
+  /* This is the amount of entries in the linked list above. */
+  int num_easy;
+
+  int num_msgs; /* total amount of messages in the easy handles */
+
+  /* Hostname cache */
+  curl_hash *hostcache;
+};
+
+
+CURLM *curl_multi_init(void)
+{
+  struct Curl_multi *multi;
+
+  multi = (void *)malloc(sizeof(struct Curl_multi));
+
+  if(multi) {
+    memset(multi, 0, sizeof(struct Curl_multi));
+    multi->type = CURL_MULTI_HANDLE;
+  }
+  
+  return (CURLM *) multi;
+}
+
+CURLMcode curl_multi_add_handle(CURLM *multi_handle,
+                                CURL *easy_handle)
+{
+  struct Curl_multi *multi=(struct Curl_multi *)multi_handle;
+  struct Curl_one_easy *easy;
+
+  /* First, make some basic checks that the CURLM handle is a good handle */
+  if(!GOOD_MULTI_HANDLE(multi))
+    return CURLM_BAD_HANDLE;
+  
+  /* Verify that we got a somewhat good easy handle too */
+  if(!GOOD_EASY_HANDLE(easy_handle))
+    return CURLM_BAD_EASY_HANDLE;
+
+  /* Now, time to add an easy handle to the multi stack */
+  easy = (struct Curl_one_easy *)malloc(sizeof(struct Curl_one_easy));
+  if(!easy)
+    return CURLM_OUT_OF_MEMORY;
+  
+  /* clean it all first (just to be sure) */
+  memset(easy, 0, sizeof(struct Curl_one_easy));
+
+  /* set the easy handle */
+  easy->easy_handle = easy_handle;
+  easy->state = CURLM_STATE_INIT;
+  
+  /* We add this new entry first in the list. We make our 'next' point to the
+     previous next and our 'prev' point back to the 'first' struct */
+  easy->next = multi->easy.next;
+  easy->prev = &multi->easy; 
+
+  /* make 'easy' the first node in the chain */
+  multi->easy.next = easy;
+
+  /* if there was a next node, make sure its 'prev' pointer links back to
+     the new node */
+  if(easy->next)
+    easy->next->prev = easy;
+
+  /* increase the node-counter */
+  multi->num_easy++;
+
+  return CURLM_CALL_MULTI_PERFORM;
+}
+
+CURLMcode curl_multi_remove_handle(CURLM *multi_handle,
+                                   CURL *curl_handle)
+{
+  struct Curl_multi *multi=(struct Curl_multi *)multi_handle;
+  struct Curl_one_easy *easy;
+
+  /* First, make some basic checks that the CURLM handle is a good handle */
+  if(!GOOD_MULTI_HANDLE(multi))
+    return CURLM_BAD_HANDLE;
+  
+  /* Verify that we got a somewhat good easy handle too */
+  if(!GOOD_EASY_HANDLE(curl_handle))
+    return CURLM_BAD_EASY_HANDLE;
+
+  /* scan through the list and remove the 'curl_handle' */
+  easy = multi->easy.next;
+  while(easy) {
+    if(easy->easy_handle == curl_handle)
+      break;
+    easy=easy->next;
+  }
+  if(easy) {
+    /* If the 'state' is not INIT or COMPLETED, we might need to do something
+       nice to put the easy_handle in a good known state when this returns. */
+
+    /* clear out the usage of the shared DNS cache */
+    easy->easy_handle->hostcache = NULL;
+    
+    /* make the previous node point to our next */
+    if(easy->prev)
+      easy->prev->next = easy->next;
+    /* make our next point to our previous node */
+    if(easy->next)
+      easy->next->prev = easy->prev;
+    
+    /* NOTE NOTE NOTE
+       We do not touch the easy handle here! */
+    if (easy->msg)
+      free(easy->msg);
+    free(easy);
+
+    multi->num_easy--; /* one less to care about now */
+
+    return CURLM_OK;
+  }
+  else
+    return CURLM_BAD_EASY_HANDLE; /* twasn't found */
+}
+
+CURLMcode curl_multi_fdset(CURLM *multi_handle,
+                           fd_set *read_fd_set, fd_set *write_fd_set,
+                           fd_set *exc_fd_set, int *max_fd)
+{
+  /* Scan through all the easy handles to get the file descriptors set.
+     Some easy handles may not have connected to the remote host yet,
+     and then we must make sure that is done. */
+  struct Curl_multi *multi=(struct Curl_multi *)multi_handle;
+  struct Curl_one_easy *easy;
+  int this_max_fd=-1;
+
+  if(!GOOD_MULTI_HANDLE(multi))
+    return CURLM_BAD_HANDLE;
+
+  *max_fd = -1; /* so far none! */
+
+  easy=multi->easy.next;
+  while(easy) {
+    switch(easy->state) {
+    default:
+      break;
+    case CURLM_STATE_WAITCONNECT:
+    case CURLM_STATE_DO_MORE:
+      {
+        /* when we're waiting for a connect, we wait for the socket to
+           become writable */
+        struct connectdata *conn = easy->easy_conn;
+        int sockfd;
+
+        if(CURLM_STATE_WAITCONNECT == easy->state) {
+          sockfd = conn->firstsocket;
+          FD_SET(sockfd, write_fd_set);
+        }
+        else {
+          /* When in DO_MORE state, we could be either waiting for us
+             to connect to a remote site, or we could wait for that site
+             to connect to us. It makes a difference in the way: if we
+             connect to the site we wait for the socket to become writable, if 
+             the site connects to us we wait for it to become readable */
+          sockfd = conn->secondarysocket;
+          FD_SET(sockfd, write_fd_set);
+        }
+
+        if(sockfd > *max_fd)
+          *max_fd = sockfd;
+      }
+      break;
+    case CURLM_STATE_PERFORM:
+      /* This should have a set of file descriptors for us to set.  */
+      /* after the transfer is done, go DONE */
+
+      Curl_single_fdset(easy->easy_conn,
+                        read_fd_set, write_fd_set,
+                        exc_fd_set, &this_max_fd);
+
+      /* remember the maximum file descriptor */
+      if(this_max_fd > *max_fd)
+        *max_fd = this_max_fd;
+
+      break;
+    }
+    easy = easy->next; /* check next handle */
+  }
+
+  return CURLM_OK;
+}
+
+CURLMcode curl_multi_perform(CURLM *multi_handle, int *running_handles)
+{
+  struct Curl_multi *multi=(struct Curl_multi *)multi_handle;
+  struct Curl_one_easy *easy;
+  bool done;
+  CURLMcode result=CURLM_OK;
+  struct Curl_message *msg = NULL;
+  bool connected;
+
+  *running_handles = 0; /* bump this once for every living handle */
+
+  if(!GOOD_MULTI_HANDLE(multi))
+    return CURLM_BAD_HANDLE;
+
+  easy=multi->easy.next;
+  while(easy) {
+
+#ifdef MALLOCDEBUG
+    fprintf(stderr, "HANDLE %p: State: %x\n",
+            (char *)easy, easy->state);
+#endif
+
+    switch(easy->state) {
+    case CURLM_STATE_INIT:
+      /* init this transfer. */
+      easy->result=Curl_pretransfer(easy->easy_handle);
+
+      if(CURLE_OK == easy->result) {
+        /* after init, go CONNECT */
+        easy->state = CURLM_STATE_CONNECT;
+        result = CURLM_CALL_MULTI_PERFORM; 
+        
+        easy->easy_handle->state.used_interface = Curl_if_multi;
+      }
+      break;
+    case CURLM_STATE_CONNECT:
+      if (Curl_global_host_cache_use(easy->easy_handle)) {
+        easy->easy_handle->hostcache = Curl_global_host_cache_get();
+      }
+      else {
+        if (multi->hostcache == NULL)
+          multi->hostcache = Curl_hash_alloc(7, Curl_freednsinfo);
+
+        easy->easy_handle->hostcache = multi->hostcache;
+      }
+
+      /* Connect. We get a connection identifier filled in. */
+      Curl_pgrsTime(easy->easy_handle, TIMER_STARTSINGLE);
+      easy->result = Curl_connect(easy->easy_handle, &easy->easy_conn);
+
+      /* after the connect has been sent off, go WAITCONNECT */
+      if(CURLE_OK == easy->result) {
+        easy->state = CURLM_STATE_WAITCONNECT;
+        result = CURLM_CALL_MULTI_PERFORM; 
+      }
+      break;
+
+    case CURLM_STATE_WAITCONNECT:
+      {
+        bool connected;
+        easy->result = Curl_is_connected(easy->easy_conn,
+                                         easy->easy_conn->firstsocket,
+                                         &connected);
+        if(connected)
+          easy->result = Curl_protocol_connect(easy->easy_conn, NULL);
+
+        if(CURLE_OK != easy->result) {
+          /* failure detected */
+          Curl_disconnect(easy->easy_conn); /* close the connection */
+          easy->easy_conn = NULL;           /* no more connection */
+          break;
+        }
+
+        if(connected) {
+          /* after the connect has completed, go DO */
+          easy->state = CURLM_STATE_DO;
+          result = CURLM_CALL_MULTI_PERFORM; 
+        }
+      }
+      break;
+
+    case CURLM_STATE_DO:
+      /* Do the fetch or put request */
+      easy->result = Curl_do(&easy->easy_conn);
+      if(CURLE_OK == easy->result) {
+
+        /* after do, go PERFORM... or DO_MORE */
+        if(easy->easy_conn->bits.do_more) {
+          /* we're supposed to do more, but we need to sit down, relax
+             and wait a little while first */
+          easy->state = CURLM_STATE_DO_MORE;
+          result = CURLM_OK;
+        }
+        else {
+          /* we're done with the DO, now PERFORM */
+          easy->result = Curl_readwrite_init(easy->easy_conn);
+          if(CURLE_OK == easy->result) {
+            easy->state = CURLM_STATE_PERFORM;
+            result = CURLM_CALL_MULTI_PERFORM; 
+          }
+        }
+      }
+      break;
+
+    case CURLM_STATE_DO_MORE:
+      /*
+       * First, check if we really are ready to do more.
+       */
+      easy->result = Curl_is_connected(easy->easy_conn,
+                                       easy->easy_conn->secondarysocket,
+                                       &connected);
+      if(connected) {
+        /*
+         * When we are connected, DO MORE and then go PERFORM
+         */
+        easy->result = Curl_do_more(easy->easy_conn);
+
+        if(CURLE_OK == easy->result)
+          easy->result = Curl_readwrite_init(easy->easy_conn);
+
+        if(CURLE_OK == easy->result) {
+          easy->state = CURLM_STATE_PERFORM;
+          result = CURLM_CALL_MULTI_PERFORM; 
+        }
+      }
+      break;
+
+    case CURLM_STATE_PERFORM:
+      /* read/write data if it is ready to do so */
+      easy->result = Curl_readwrite(easy->easy_conn, &done);
+
+      if(easy->result)  {
+        /* The transfer phase returned error, we mark the connection to get
+         * closed to prevent being re-used. This is becasue we can't
+         * possibly know if the connection is in a good shape or not now. */
+        easy->easy_conn->bits.close = TRUE;
+
+        if(-1 !=easy->easy_conn->secondarysocket) {
+          /* if we failed anywhere, we must clean up the secondary socket if
+             it was used */
+          sclose(easy->easy_conn->secondarysocket);
+          easy->easy_conn->secondarysocket=-1;
+        }
+        Curl_posttransfer(easy->easy_handle);
+        Curl_done(easy->easy_conn);
+      }
+
+      /* after the transfer is done, go DONE */
+      else if(TRUE == done) {
+
+        /* call this even if the readwrite function returned error */
+        Curl_posttransfer(easy->easy_handle);
+
+        /* When we follow redirects, must to go back to the CONNECT state */
+        if(easy->easy_conn->newurl) {
+          easy->result = Curl_follow(easy->easy_handle,
+                                     strdup(easy->easy_conn->newurl));
+          if(CURLE_OK == easy->result) {
+            easy->state = CURLM_STATE_CONNECT;
+            result = CURLM_CALL_MULTI_PERFORM;
+          }
+        }
+        else {
+          easy->state = CURLM_STATE_DONE;
+          result = CURLM_CALL_MULTI_PERFORM; 
+        }
+      }
+      break;
+    case CURLM_STATE_DONE:
+      /* post-transfer command */
+      easy->result = Curl_done(easy->easy_conn);
+
+      /* after we have DONE what we're supposed to do, go COMPLETED, and
+         it doesn't matter what the Curl_done() returned! */
+      easy->state = CURLM_STATE_COMPLETED;
+      break;
+
+    case CURLM_STATE_COMPLETED:
+      /* this is a completed transfer, it is likely to still be connected */
+
+      /* This node should be delinked from the list now and we should post
+         an information message that we are complete. */
+      break;
+    default:
+      return CURLM_INTERNAL_ERROR;
+    }
+
+    if(CURLM_STATE_COMPLETED != easy->state) {
+      if(CURLE_OK != easy->result) {
+        /*
+         * If an error was returned, and we aren't in completed state now,
+         * then we go to completed and consider this transfer aborted.  */
+        easy->state = CURLM_STATE_COMPLETED;
+      }
+      else
+        /* this one still lives! */
+        (*running_handles)++;
+    }
+
+    if ((CURLM_STATE_COMPLETED == easy->state) && !easy->msg) {
+      /* clear out the usage of the shared DNS cache */
+      easy->easy_handle->hostcache = NULL;
+
+      /* now add a node to the Curl_message linked list with this info */
+      msg = (struct Curl_message *)malloc(sizeof(struct Curl_message));
+
+      if(!msg)
+        return CURLM_OUT_OF_MEMORY;
+
+      msg->extmsg.msg = CURLMSG_DONE;
+      msg->extmsg.easy_handle = easy->easy_handle;
+      msg->extmsg.data.result = easy->result;
+      msg->next=NULL;
+
+      easy->msg = msg;
+      easy->msg_num = 1; /* there is one unread message here */
+
+      multi->num_msgs++; /* increase message counter */
+    }
+
+    easy = easy->next; /* operate on next handle */
+  }
+
+  return result;
+}
+
+CURLMcode curl_multi_cleanup(CURLM *multi_handle)
+{
+  struct Curl_multi *multi=(struct Curl_multi *)multi_handle;
+  struct Curl_one_easy *easy;
+  struct Curl_one_easy *nexteasy;
+
+  if(GOOD_MULTI_HANDLE(multi)) {
+    multi->type = 0; /* not good anymore */
+    Curl_hash_destroy(multi->hostcache);
+
+    /* remove all easy handles */
+    easy = multi->easy.next;
+    while(easy) {
+      nexteasy=easy->next;
+      /* clear out the usage of the shared DNS cache */
+      easy->easy_handle->hostcache = NULL;
+
+      if (easy->msg)
+        free(easy->msg);
+      free(easy);
+      easy = nexteasy;
+    }
+
+    free(multi);
+
+    return CURLM_OK;
+  }
+  else
+    return CURLM_BAD_HANDLE;
+}
+
+CURLMsg *curl_multi_info_read(CURLM *multi_handle, int *msgs_in_queue)
+{
+  struct Curl_multi *multi=(struct Curl_multi *)multi_handle;
+
+  if(GOOD_MULTI_HANDLE(multi)) {
+    struct Curl_one_easy *easy;
+    
+    if(!multi->num_msgs)
+      return NULL; /* no messages left to return */
+
+    easy=multi->easy.next;
+    while(easy) {
+      if(easy->msg_num) {
+        easy->msg_num--;
+        break;
+      }
+      easy = easy->next;
+    }
+    if(!easy)
+      return NULL; /* this means internal count confusion really */
+
+    multi->num_msgs--;
+    *msgs_in_queue = multi->num_msgs;
+
+    return &easy->msg->extmsg;
+  }
+  else
+    return NULL;
+}
diff --git a/main/source/curl/lib/netrc.c b/main/source/curl/lib/netrc.c
new file mode 100644
index 00000000..8e63c81a
--- /dev/null
+++ b/main/source/curl/lib/netrc.c
@@ -0,0 +1,243 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: netrc.c,v 1.23 2003/01/29 10:14:23 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_PWD_H
+#include <pwd.h>
+#endif
+#ifdef VMS
+#include <unixlib.h>
+#endif
+
+#include <curl/curl.h>
+
+#include "strequal.h"
+#include "strtok.h"
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+/* Debug this single source file with:
+   'make netrc' then run './netrc'!
+
+   Oh, make sure you have a .netrc file too ;-)
+ */
+
+/* Get user and password from .netrc when given a machine name */
+
+enum {
+  NOTHING,
+  HOSTFOUND,    /* the 'machine' keyword was found */
+  HOSTCOMPLETE, /* the machine name following the keyword was found too */
+  HOSTVALID,    /* this is "our" machine! */
+
+  HOSTEND /* LAST enum */
+};
+
+/* make sure we have room for at least this size: */
+#define LOGINSIZE 64
+#define PASSWORDSIZE 64
+
+int Curl_parsenetrc(char *host,
+                    char *login,
+                    char *password)
+{
+  FILE *file;
+  char netrcbuffer[256];
+  int retcode=1;
+
+  int specific_login = (login[0] != 0);
+  
+  char *home = NULL; 
+  int state=NOTHING;
+
+  char state_login=0;      /* Found a login keyword */
+  char state_password=0;   /* Found a password keyword */
+  char state_our_login=0;  /* With specific_login, found *our* login name */
+
+#define NETRC DOT_CHAR "netrc"
+
+#if defined(HAVE_GETPWUID) && defined(HAVE_GETEUID)
+  struct passwd *pw;
+  pw= getpwuid(geteuid());
+  if (pw) {
+#ifdef	VMS
+    home = decc$translate_vms(pw->pw_dir);
+#else
+    home = pw->pw_dir;
+#endif
+  }
+#else
+  void *pw=NULL;
+#endif
+  
+  if(NULL == pw) {
+    home = curl_getenv("HOME"); /* portable environment reader */
+    if(!home) {
+      return -1;
+    }
+  }
+
+  if(strlen(home)>(sizeof(netrcbuffer)-strlen(NETRC))) {
+    if(NULL==pw)
+      free(home);
+    return -1;
+  }
+
+  sprintf(netrcbuffer, "%s%s%s", home, DIR_CHAR, NETRC);
+
+#ifdef MALLOCDEBUG
+  {
+    /* This is a hack to allow testing.
+     * If compiled with --enable-debug and CURL_DEBUG_NETRC is defined,
+     * then it's the path to a substitute .netrc for testing purposes *only* */
+
+    char *override = curl_getenv("CURL_DEBUG_NETRC");
+
+    if (override != NULL) {
+      printf("NETRC: overridden .netrc file: %s\n", home);
+
+      if (strlen(override)+1 > sizeof(netrcbuffer)) {
+        free(override);
+        if(NULL==pw)
+          free(home);
+
+        return -1;
+      }
+      strcpy(netrcbuffer, override);
+      free(override);
+    }
+  }
+#endif /* MALLOCDEBUG */
+
+  file = fopen(netrcbuffer, "r");
+  if(file) {
+    char *tok;
+	char *tok_buf;
+    while(fgets(netrcbuffer, sizeof(netrcbuffer), file)) {
+      tok=strtok_r(netrcbuffer, " \t\n", &tok_buf);
+      while(tok) {
+
+        if (login[0] && password[0])
+          goto done;
+
+	switch(state) {
+	case NOTHING:
+	  if(strequal("machine", tok)) {
+	    /* the next tok is the machine name, this is in itself the
+	       delimiter that starts the stuff entered for this machine,
+	       after this we need to search for 'login' and
+	       'password'. */
+	    state=HOSTFOUND;
+	  }
+	  break;
+	case HOSTFOUND:
+	  if(strequal(host, tok)) {
+	    /* and yes, this is our host! */
+	    state=HOSTVALID;
+#ifdef _NETRC_DEBUG
+	    printf("HOST: %s\n", tok);
+#endif
+	    retcode=0; /* we did find our host */
+	  }
+	  else
+	    /* not our host */
+	    state=NOTHING;
+	  break;
+	case HOSTVALID:
+	  /* we are now parsing sub-keywords concerning "our" host */
+	  if(state_login) {
+            if (specific_login) {
+              state_our_login = strequal(login, tok);
+            }else{
+              strncpy(login, tok, LOGINSIZE-1);
+#ifdef _NETRC_DEBUG
+	      printf("LOGIN: %s\n", login);
+#endif
+            }
+	    state_login=0;
+	  }
+	  else if(state_password) {
+            if (state_our_login || !specific_login) {
+              strncpy(password, tok, PASSWORDSIZE-1);
+#ifdef _NETRC_DEBUG
+              printf("PASSWORD: %s\n", password);
+#endif
+            }
+	    state_password=0;
+	  }
+	  else if(strequal("login", tok))
+	    state_login=1;
+	  else if(strequal("password", tok))
+	    state_password=1;
+	  else if(strequal("machine", tok)) {
+	    /* ok, there's machine here go => */
+	    state = HOSTFOUND;
+            state_our_login = 0;
+	  }
+	  break;
+	} /* switch (state) */
+
+	tok = strtok_r(NULL, " \t\n", &tok_buf);
+      } /* while (tok) */
+    } /* while fgets() */
+
+done:
+    fclose(file);
+  }
+
+  if(NULL==pw)
+    free(home);
+
+  return retcode;
+}
+
+#ifdef _NETRC_DEBUG
+int main(int argc, char **argv)
+{
+  char login[64]="";
+  char password[64]="";
+
+  if(argc<2)
+    return -1;
+
+  if(0 == ParseNetrc(argv[1], login, password)) {
+    printf("HOST: %s LOGIN: %s PASSWORD: %s\n",
+	   argv[1], login, password);
+  }
+}
+
+#endif
diff --git a/main/source/curl/lib/netrc.h b/main/source/curl/lib/netrc.h
new file mode 100644
index 00000000..936a61e2
--- /dev/null
+++ b/main/source/curl/lib/netrc.h
@@ -0,0 +1,33 @@
+#ifndef __NETRC_H
+#define __NETRC_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: netrc.h,v 1.9 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+int Curl_parsenetrc(char *host,
+                    char *login,
+                    char *password);
+  /* Assume: password[0]=0, host[0] != 0.
+   * If login[0] = 0, search for login and password within a machine section
+   * in the netrc.
+   * If login[0] != 0, search for password within machine and login.
+   */
+#endif
diff --git a/main/source/curl/lib/progress.c b/main/source/curl/lib/progress.c
new file mode 100644
index 00000000..9baef4b3
--- /dev/null
+++ b/main/source/curl/lib/progress.c
@@ -0,0 +1,395 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: progress.c,v 1.45 2003/05/14 06:31:00 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#include <string.h>
+
+#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
+#if defined(__MINGW32__)
+#include <winsock.h>
+#endif
+#include <time.h>
+#endif
+
+/* 20000318 mgs
+ * later we use _scrsize to determine the screen width, this emx library
+ * function needs stdlib.h to be included */
+#if defined(__EMX__)
+#include <stdlib.h>
+#endif
+
+#include <curl/curl.h>
+#include "urldata.h"
+#include "sendf.h"
+
+#include "progress.h"
+
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+
+static void time2str(char *r, int t)
+{
+  int h = (t/3600);
+  int m = (t-(h*3600))/60;
+  int s = (t-(h*3600)-(m*60));
+  sprintf(r,"%2d:%02d:%02d",h,m,s);
+}
+
+/* The point of this function would be to return a string of the input data,
+   but never longer than 5 columns. Add suffix k, M, G when suitable... */
+static char *max5data(double bytes, char *max5)
+{
+#define ONE_KILOBYTE 1024
+#define ONE_MEGABYTE (1024*1024)
+
+  if(bytes < 100000) {
+    sprintf(max5, "%5d", (int)bytes);
+    return max5;
+  }
+  if(bytes < (9999*ONE_KILOBYTE)) {
+    sprintf(max5, "%4dk", (int)bytes/ONE_KILOBYTE);
+    return max5;
+  }
+  if(bytes < (100*ONE_MEGABYTE)) {
+    /* 'XX.XM' is good as long as we're less than 100 megs */
+    sprintf(max5, "%4.1fM", bytes/ONE_MEGABYTE);
+    return max5;
+  }
+  sprintf(max5, "%4dM", (int)bytes/ONE_MEGABYTE);
+  return max5;
+}
+
+/* 
+
+   New proposed interface, 9th of February 2000:
+
+   pgrsStartNow() - sets start time
+   pgrsSetDownloadSize(x) - known expected download size
+   pgrsSetUploadSize(x) - known expected upload size
+   pgrsSetDownloadCounter() - amount of data currently downloaded
+   pgrsSetUploadCounter() - amount of data currently uploaded
+   pgrsUpdate() - show progress
+   pgrsDone() - transfer complete
+
+*/
+
+void Curl_pgrsDone(struct connectdata *conn)
+{
+  struct SessionHandle *data = conn->data;
+  if(!(data->progress.flags & PGRS_HIDE)) {
+    data->progress.lastshow=0;
+    Curl_pgrsUpdate(conn); /* the final (forced) update */
+    if(!data->progress.callback)
+      /* only output if we don't use progress callback */
+      fprintf(data->set.err, "\n");
+  }
+}
+
+/* reset all times except redirect */
+void Curl_pgrsResetTimes(struct SessionHandle *data)
+{
+  data->progress.t_nslookup = 0.0;
+  data->progress.t_connect = 0.0;
+  data->progress.t_pretransfer = 0.0;
+  data->progress.t_starttransfer = 0.0;
+}
+
+void Curl_pgrsTime(struct SessionHandle *data, timerid timer)
+{
+  switch(timer) {
+  default:
+  case TIMER_NONE:
+    /* mistake filter */
+    break;
+  case TIMER_STARTSINGLE:
+    /* This is set at the start of a single fetch */
+    data->progress.t_startsingle = Curl_tvnow();
+    break;
+
+  case TIMER_NAMELOOKUP:
+    data->progress.t_nslookup =
+      (double)Curl_tvdiff(Curl_tvnow(), data->progress.t_startsingle)/1000.0;
+    break;
+  case TIMER_CONNECT:
+    data->progress.t_connect =
+      (double)Curl_tvdiff(Curl_tvnow(), data->progress.t_startsingle)/1000.0;
+    break;
+  case TIMER_PRETRANSFER:
+    data->progress.t_pretransfer =
+      (double)Curl_tvdiff(Curl_tvnow(), data->progress.t_startsingle)/1000.0;
+    break;
+  case TIMER_STARTTRANSFER:
+    data->progress.t_starttransfer =
+      (double)Curl_tvdiff(Curl_tvnow(), data->progress.t_startsingle)/1000.0;
+    break;
+  case TIMER_POSTRANSFER:
+    /* this is the normal end-of-transfer thing */
+    break;
+  case TIMER_REDIRECT:
+    data->progress.t_redirect =
+      (double)Curl_tvdiff(Curl_tvnow(), data->progress.start)/1000.0;
+    break;
+  }
+}
+
+void Curl_pgrsStartNow(struct SessionHandle *data)
+{
+  data->progress.speeder_c = 0; /* reset the progress meter display */
+  data->progress.start = Curl_tvnow();
+}
+
+void Curl_pgrsSetDownloadCounter(struct SessionHandle *data, double size)
+{
+  data->progress.downloaded = size;
+}
+
+void Curl_pgrsSetUploadCounter(struct SessionHandle *data, double size)
+{
+  data->progress.uploaded = size;
+}
+
+void Curl_pgrsSetDownloadSize(struct SessionHandle *data, double size)
+{
+  data->progress.size_dl = size;
+  if(size > 0)
+    data->progress.flags |= PGRS_DL_SIZE_KNOWN;
+  else
+    data->progress.flags &= ~PGRS_DL_SIZE_KNOWN;
+}
+
+void Curl_pgrsSetUploadSize(struct SessionHandle *data, double size)
+{
+  data->progress.size_ul = size;
+  if(size > 0)
+    data->progress.flags |= PGRS_UL_SIZE_KNOWN;
+  else
+    data->progress.flags &= ~PGRS_UL_SIZE_KNOWN;
+}
+
+/* EXAMPLE OUTPUT to follow:
+
+  % Total    % Received % Xferd  Average Speed          Time             Curr.
+                                 Dload  Upload Total    Current  Left    Speed
+100 12345  100 12345  100 12345  12345  12345 12:12:12 12:12:12 12:12:12 12345
+
+ */
+
+int Curl_pgrsUpdate(struct connectdata *conn)
+{
+  struct timeval now;
+  int result;
+
+  char max5[6][10];
+  double dlpercen=0;
+  double ulpercen=0;
+  double total_percen=0;
+
+  double total_transfer;
+  double total_expected_transfer;
+  double timespent;
+
+  struct SessionHandle *data = conn->data;
+
+  int nowindex = data->progress.speeder_c% CURR_TIME;
+  int checkindex;
+
+  int countindex; /* amount of seconds stored in the speeder array */
+
+  char time_left[10];
+  char time_total[10];
+  char time_current[10];
+      
+  double ulestimate=0;
+  double dlestimate=0;
+  
+  double total_estimate;
+
+
+  if(data->progress.flags & PGRS_HIDE)
+    ; /* We do enter this function even if we don't wanna see anything, since
+         this is were lots of the calculations are being made that will be used
+         even when not displayed! */
+  else if(!(data->progress.flags & PGRS_HEADERS_OUT)) {
+    if (!data->progress.callback) {
+      if(conn->resume_from)
+        fprintf(data->set.err, "** Resuming transfer from byte position %d\n",
+                conn->resume_from);
+      fprintf(data->set.err,
+              "  %% Total    %% Received %% Xferd  Average Speed          Time             Curr.\n"
+              "                                 Dload  Upload Total    Current  Left    Speed\n");
+    }
+    data->progress.flags |= PGRS_HEADERS_OUT; /* headers are shown */
+  }
+
+  now = Curl_tvnow(); /* what time is it */
+
+  /* The exact time spent so far (from the start) */
+  timespent = (double)Curl_tvdiff (now, data->progress.start)/1000;
+
+  data->progress.timespent = timespent;
+
+  /* The average download speed this far */
+  data->progress.dlspeed =
+    data->progress.downloaded/(timespent>0.01?timespent:1);
+
+  /* The average upload speed this far */
+  data->progress.ulspeed =
+    data->progress.uploaded/(timespent>0.01?timespent:1);
+
+  if(data->progress.lastshow == Curl_tvlong(now))
+    return 0; /* never update this more than once a second if the end isn't 
+                 reached */
+  data->progress.lastshow = now.tv_sec;
+
+  /* Let's do the "current speed" thing, which should use the fastest
+     of the dl/ul speeds. Store the fasted speed at entry 'nowindex'. */
+  data->progress.speeder[ nowindex ] =
+    data->progress.downloaded>data->progress.uploaded?
+    data->progress.downloaded:data->progress.uploaded;
+
+  /* remember the exact time for this moment */
+  data->progress.speeder_time [ nowindex ] = now;
+
+  /* advance our speeder_c counter, which is increased every time we get
+     here and we expect it to never wrap as 2^32 is a lot of seconds! */
+  data->progress.speeder_c++;
+
+  /* figure out how many index entries of data we have stored in our speeder
+     array. With N_ENTRIES filled in, we have about N_ENTRIES-1 seconds of
+     transfer. Imagine, after one second we have filled in two entries,
+     after two seconds we've filled in three entries etc. */
+  countindex = ((data->progress.speeder_c>=CURR_TIME)?
+                CURR_TIME:data->progress.speeder_c) - 1;
+
+  /* first of all, we don't do this if there's no counted seconds yet */
+  if(countindex) {
+    long span_ms;
+
+    /* Get the index position to compare with the 'nowindex' position.
+       Get the oldest entry possible. While we have less than CURR_TIME
+       entries, the first entry will remain the oldest. */
+    checkindex = (data->progress.speeder_c>=CURR_TIME)?
+      data->progress.speeder_c%CURR_TIME:0;
+
+    /* Figure out the exact time for the time span */
+    span_ms = Curl_tvdiff(now,
+                          data->progress.speeder_time[checkindex]);
+    if(0 == span_ms)
+      span_ms=1; /* at least one millisecond MUST have passed */
+
+    /* Calculate the average speed the last 'countindex' seconds */
+    data->progress.current_speed =
+      (data->progress.speeder[nowindex]-
+       data->progress.speeder[checkindex])/((double)span_ms/1000);
+  }
+  else
+    /* the first second we use the main average */
+    data->progress.current_speed =
+      (data->progress.ulspeed>data->progress.dlspeed)?
+      data->progress.ulspeed:data->progress.dlspeed;
+
+  if(data->progress.flags & PGRS_HIDE)
+    return 0;
+
+  else if(data->set.fprogress) {
+    /* There's a callback set, so we call that instead of writing
+       anything ourselves. This really is the way to go. */
+    result= data->set.fprogress(data->set.progress_client,
+                                data->progress.size_dl,
+                                data->progress.downloaded,
+                                data->progress.size_ul,
+                                data->progress.uploaded);
+    if(result)
+      failf(data, "Callback aborted");
+    return result;
+  }
+
+  /* Figure out the estimated time of arrival for the upload */
+  if((data->progress.flags & PGRS_UL_SIZE_KNOWN) && data->progress.ulspeed){
+    ulestimate = data->progress.size_ul / data->progress.ulspeed;
+    ulpercen = (data->progress.uploaded / data->progress.size_ul)*100;
+  }
+
+  /* ... and the download */
+  if((data->progress.flags & PGRS_DL_SIZE_KNOWN) && data->progress.dlspeed) {
+    dlestimate = data->progress.size_dl / data->progress.dlspeed;
+    dlpercen = (data->progress.downloaded / data->progress.size_dl)*100;
+  }
+    
+  /* Now figure out which of them that is slower and use for the for
+     total estimate! */
+  total_estimate = ulestimate>dlestimate?ulestimate:dlestimate;
+
+
+  /* If we have a total estimate, we can display that and the expected
+     time left */
+  if(total_estimate) {
+    time2str(time_left, (int)(total_estimate - data->progress.timespent)); 
+    time2str(time_total, (int)total_estimate);
+  }
+  else {
+    /* otherwise we blank those times */
+    strcpy(time_left,  "--:--:--");
+    strcpy(time_total, "--:--:--");
+  }
+  /* The time spent so far is always known */
+  time2str(time_current, (int)data->progress.timespent);
+
+  /* Get the total amount of data expected to get transfered */
+  total_expected_transfer = 
+    (data->progress.flags & PGRS_UL_SIZE_KNOWN?
+     data->progress.size_ul:data->progress.uploaded)+
+    (data->progress.flags & PGRS_DL_SIZE_KNOWN?
+     data->progress.size_dl:data->progress.downloaded);
+      
+  /* We have transfered this much so far */
+  total_transfer = data->progress.downloaded + data->progress.uploaded;
+
+  /* Get the percentage of data transfered so far */
+  if(total_expected_transfer)
+    total_percen=(double)(total_transfer/total_expected_transfer)*100;
+
+  fprintf(data->set.err,
+          "\r%3d %s  %3d %s  %3d %s  %s  %s %s %s %s %s",
+          (int)total_percen,                            /* total % */
+          max5data(total_expected_transfer, max5[2]),   /* total size */
+          (int)dlpercen,                                /* rcvd % */
+          max5data(data->progress.downloaded, max5[0]), /* rcvd size */
+          (int)ulpercen,                                /* xfer % */
+          max5data(data->progress.uploaded, max5[1]),   /* xfer size */
+
+          max5data(data->progress.dlspeed, max5[3]), /* avrg dl speed */
+          max5data(data->progress.ulspeed, max5[4]), /* avrg ul speed */
+          time_total,                           /* total time */
+          time_current,                         /* current time */
+          time_left,                            /* time left */
+          max5data(data->progress.current_speed, max5[5]) /* current speed */
+          );
+
+  /* we flush the output stream to make it appear as soon as possible */
+  fflush(data->set.err);
+
+  return 0;
+}
diff --git a/main/source/curl/lib/progress.h b/main/source/curl/lib/progress.h
new file mode 100644
index 00000000..6f8a4ca4
--- /dev/null
+++ b/main/source/curl/lib/progress.h
@@ -0,0 +1,70 @@
+#ifndef __PROGRESS_H
+#define __PROGRESS_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: progress.h,v 1.18 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+
+#include "timeval.h"
+
+
+typedef enum {
+  TIMER_NONE,
+  TIMER_NAMELOOKUP,
+  TIMER_CONNECT,
+  TIMER_PRETRANSFER,
+  TIMER_STARTTRANSFER,
+  TIMER_POSTRANSFER,
+  TIMER_STARTSINGLE,
+  TIMER_REDIRECT,
+  TIMER_LAST /* must be last */
+} timerid;
+  
+void Curl_pgrsDone(struct connectdata *);
+void Curl_pgrsStartNow(struct SessionHandle *data);
+void Curl_pgrsSetDownloadSize(struct SessionHandle *data, double size);
+void Curl_pgrsSetUploadSize(struct SessionHandle *data, double size);
+void Curl_pgrsSetDownloadCounter(struct SessionHandle *data, double size);
+void Curl_pgrsSetUploadCounter(struct SessionHandle *data, double size);
+int Curl_pgrsUpdate(struct connectdata *);
+void Curl_pgrsResetTimes(struct SessionHandle *data);
+void Curl_pgrsTime(struct SessionHandle *data, timerid timer);
+
+
+/* Don't show progress for sizes smaller than: */
+#define LEAST_SIZE_PROGRESS BUFSIZE
+
+#define PROGRESS_DOWNLOAD (1<<0)
+#define PROGRESS_UPLOAD   (1<<1)
+#define PROGRESS_DOWN_AND_UP (PROGRESS_UPLOAD | PROGRESS_DOWNLOAD)
+
+#define PGRS_SHOW_DL (1<<0)
+#define PGRS_SHOW_UL (1<<1)
+#define PGRS_DONE_DL (1<<2)
+#define PGRS_DONE_UL (1<<3)
+#define PGRS_HIDE    (1<<4)
+#define PGRS_UL_SIZE_KNOWN (1<<5)
+#define PGRS_DL_SIZE_KNOWN (1<<6)
+
+#define PGRS_HEADERS_OUT (1<<7) /* set when the headers have been written */
+
+
+#endif /* __PROGRESS_H */
diff --git a/main/source/curl/lib/security.c b/main/source/curl/lib/security.c
new file mode 100644
index 00000000..d7a8f557
--- /dev/null
+++ b/main/source/curl/lib/security.c
@@ -0,0 +1,482 @@
+/* This source code was modified by Martin Hedenfalk <mhe@stacken.kth.se> for
+ * use in Curl. His latest changes were done 2000-09-18.
+ *
+ * It has since been patched and modified a lot by Daniel Stenberg
+ * <daniel@haxx.se> to make it better applied to curl conditions, and to make
+ * it not use globals, pollute name space and more. This source code awaits a
+ * rewrite to work around the paragraph 2 in the BSD licenses as explained
+ * below.
+ *
+ * Copyright (c) 1998, 1999 Kungliga Tekniska Högskolan
+ * (Royal Institute of Technology, Stockholm, Sweden).
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 
+ * 2. 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.
+ * 
+ * 3. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.  */
+
+#include "setup.h"
+
+#ifndef CURL_DISABLE_FTP
+#ifdef KRB4
+
+#define _MPRINTF_REPLACE /* we want curl-functions instead of native ones */
+#include <curl/mprintf.h>
+
+#include "security.h"
+#include <stdlib.h>
+#include <string.h>
+#include <netdb.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "base64.h"
+#include "sendf.h"
+#include "ftp.h"
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+#define min(a, b)   ((a) < (b) ? (a) : (b))
+
+static struct {
+    enum protection_level level;
+    const char *name;
+} level_names[] = {
+    { prot_clear, "clear" },
+    { prot_safe, "safe" },
+    { prot_confidential, "confidential" },
+    { prot_private, "private" }
+};
+
+static enum protection_level 
+name_to_level(const char *name)
+{
+  int i;
+  for(i = 0; i < (int)sizeof(level_names)/(int)sizeof(level_names[0]); i++)
+    if(!strncasecmp(level_names[i].name, name, strlen(name)))
+      return level_names[i].level;
+  return (enum protection_level)-1;
+}
+
+static struct Curl_sec_client_mech *mechs[] = {
+#ifdef KRB5
+  /* not supported */
+#endif
+#ifdef KRB4
+    &Curl_krb4_client_mech,
+#endif
+    NULL
+};
+
+int
+Curl_sec_getc(struct connectdata *conn, FILE *F)
+{
+  if(conn->sec_complete && conn->data_prot) {
+    char c;
+    if(Curl_sec_read(conn, fileno(F), &c, 1) <= 0)
+      return EOF;
+    return c;
+  }
+  else
+    return getc(F);
+}
+
+static int
+block_read(int fd, void *buf, size_t len)
+{
+  unsigned char *p = buf;
+  int b;
+  while(len) {
+    b = read(fd, p, len);
+    if (b == 0)
+      return 0;
+    else if (b < 0)
+      return -1;
+    len -= b;
+    p += b;
+  }
+  return p - (unsigned char*)buf;
+}
+
+static int
+block_write(int fd, void *buf, size_t len)
+{
+  unsigned char *p = buf;
+  int b;
+  while(len) {
+    b = write(fd, p, len);
+    if(b < 0)
+      return -1;
+    len -= b;
+    p += b;
+  }
+  return p - (unsigned char*)buf;
+}
+
+static int
+sec_get_data(struct connectdata *conn,
+             int fd, struct krb4buffer *buf)
+{
+  int len;
+  int b;
+  
+  b = block_read(fd, &len, sizeof(len));
+  if (b == 0)
+    return 0;
+  else if (b < 0)
+    return -1;
+  len = ntohl(len);
+  buf->data = realloc(buf->data, len);
+  b = block_read(fd, buf->data, len);
+  if (b == 0)
+    return 0;
+  else if (b < 0)
+    return -1;
+  buf->size = (conn->mech->decode)(conn->app_data, buf->data, len,
+                                   conn->data_prot, conn);
+  buf->index = 0;
+  return 0;
+}
+
+static size_t
+buffer_read(struct krb4buffer *buf, void *data, size_t len)
+{
+    len = min(len, buf->size - buf->index);
+    memcpy(data, (char*)buf->data + buf->index, len);
+    buf->index += len;
+    return len;
+}
+
+static size_t
+buffer_write(struct krb4buffer *buf, void *data, size_t len)
+{
+    if(buf->index + len > buf->size) {
+	void *tmp;
+	if(buf->data == NULL)
+	    tmp = malloc(1024);
+	else
+	    tmp = realloc(buf->data, buf->index + len);
+	if(tmp == NULL)
+	    return -1;
+	buf->data = tmp;
+	buf->size = buf->index + len;
+    }
+    memcpy((char*)buf->data + buf->index, data, len);
+    buf->index += len;
+    return len;
+}
+
+int
+Curl_sec_read(struct connectdata *conn, int fd, void *buffer, int length)
+{
+    size_t len;
+    int rx = 0;
+
+    if(conn->sec_complete == 0 || conn->data_prot == 0)
+      return read(fd, buffer, length);
+
+    if(conn->in_buffer.eof_flag){
+      conn->in_buffer.eof_flag = 0;
+      return 0;
+    }
+    
+    len = buffer_read(&conn->in_buffer, buffer, length);
+    length -= len;
+    rx += len;
+    buffer = (char*)buffer + len;
+    
+    while(length) {
+      if(sec_get_data(conn, fd, &conn->in_buffer) < 0)
+        return -1;
+      if(conn->in_buffer.size == 0) {
+        if(rx)
+          conn->in_buffer.eof_flag = 1;
+        return rx;
+      }
+      len = buffer_read(&conn->in_buffer, buffer, length);
+      length -= len;
+      rx += len;
+      buffer = (char*)buffer + len;
+    }
+    return rx;
+}
+
+static int
+sec_send(struct connectdata *conn, int fd, char *from, int length)
+{
+  int bytes;
+  void *buf;
+  bytes = (conn->mech->encode)(conn->app_data, from, length, conn->data_prot,
+                               &buf, conn);
+  bytes = htonl(bytes);
+  block_write(fd, &bytes, sizeof(bytes));
+  block_write(fd, buf, ntohl(bytes));
+  free(buf);
+  return length;
+}
+
+int
+Curl_sec_fflush_fd(struct connectdata *conn, int fd)
+{
+  if(conn->data_prot != prot_clear) {
+    if(conn->out_buffer.index > 0){
+      Curl_sec_write(conn, fd,
+                conn->out_buffer.data, conn->out_buffer.index);
+      conn->out_buffer.index = 0;
+    }
+    sec_send(conn, fd, NULL, 0);
+  }
+  return 0;
+}
+
+int
+Curl_sec_write(struct connectdata *conn, int fd, char *buffer, int length)
+{
+  int len = conn->buffer_size;
+  int tx = 0;
+      
+  if(conn->data_prot == prot_clear)
+    return write(fd, buffer, length);
+
+  len -= (conn->mech->overhead)(conn->app_data, conn->data_prot, len);
+  while(length){
+    if(length < len)
+      len = length;
+    sec_send(conn, fd, buffer, len);
+    length -= len;
+    buffer += len;
+    tx += len;
+  }
+  return tx;
+}
+
+int
+Curl_sec_putc(struct connectdata *conn, int c, FILE *F)
+{
+  char ch = c;
+  if(conn->data_prot == prot_clear)
+    return putc(c, F);
+    
+  buffer_write(&conn->out_buffer, &ch, 1);
+  if(c == '\n' || conn->out_buffer.index >= 1024 /* XXX */) {
+    Curl_sec_write(conn, fileno(F), conn->out_buffer.data,
+                   conn->out_buffer.index);
+    conn->out_buffer.index = 0;
+  }
+  return c;
+}
+
+int
+Curl_sec_read_msg(struct connectdata *conn, char *s, int level)
+{
+    int len;
+    char *buf;
+    int code;
+    
+    buf = malloc(strlen(s));
+    len = Curl_base64_decode(s + 4, buf); /* XXX */
+    
+    len = (conn->mech->decode)(conn->app_data, buf, len, level, conn);
+    if(len < 0)
+	return -1;
+    
+    buf[len] = '\0';
+
+    if(buf[3] == '-')
+	code = 0;
+    else
+	sscanf(buf, "%d", &code);
+    if(buf[len-1] == '\n')
+	buf[len-1] = '\0';
+    strcpy(s, buf);
+    free(buf);
+    return code;
+}
+
+enum protection_level
+Curl_set_command_prot(struct connectdata *conn, enum protection_level level)
+{
+    enum protection_level old = conn->command_prot;
+    conn->command_prot = level;
+    return old;
+}
+
+static int
+sec_prot_internal(struct connectdata *conn, int level)
+{
+  char *p;
+  unsigned int s = 1048576;
+  ssize_t nread;
+
+  if(!conn->sec_complete){
+    infof(conn->data, "No security data exchange has taken place.\n");
+    return -1;
+  }
+
+  if(level){
+    int code;
+    if(Curl_ftpsendf(conn, "PBSZ %u", s))
+      return -1;
+
+    if(Curl_GetFTPResponse(&nread, conn, &code))
+      return -1;
+
+    if(code/100 != '2'){
+      failf(conn->data, "Failed to set protection buffer size.");
+      return -1;
+    }
+    conn->buffer_size = s;
+
+    p = strstr(conn->data->state.buffer, "PBSZ=");
+    if(p)
+      sscanf(p, "PBSZ=%u", &s);
+    if(s < conn->buffer_size)
+      conn->buffer_size = s;
+  }
+
+  if(Curl_ftpsendf(conn, "PROT %c", level["CSEP"]))
+    return -1;
+
+  if(Curl_GetFTPResponse(&nread, conn, NULL))
+    return -1;
+
+  if(conn->data->state.buffer[0] != '2'){
+    failf(conn->data, "Failed to set protection level.");
+    return -1;
+  }
+    
+  conn->data_prot = (enum protection_level)level;
+  return 0;
+}
+
+void
+Curl_sec_set_protection_level(struct connectdata *conn)
+{
+  if(conn->sec_complete && conn->data_prot != conn->request_data_prot)
+    sec_prot_internal(conn, conn->request_data_prot);
+}
+
+
+int
+Curl_sec_request_prot(struct connectdata *conn, const char *level)
+{
+  int l = name_to_level(level);
+  if(l == -1)
+    return -1;
+  conn->request_data_prot = (enum protection_level)l;
+  return 0;
+}
+
+int
+Curl_sec_login(struct connectdata *conn)
+{
+  int ret;
+  struct Curl_sec_client_mech **m;
+  ssize_t nread;
+  struct SessionHandle *data=conn->data;
+  int ftpcode;
+
+  for(m = mechs; *m && (*m)->name; m++) {
+    void *tmp;
+
+    tmp = realloc(conn->app_data, (*m)->size);
+    if (tmp == NULL) {
+      failf (data, "realloc %u failed", (*m)->size);
+      return -1;
+    }
+    conn->app_data = tmp;
+	    
+    if((*m)->init && (*(*m)->init)(conn->app_data) != 0) {
+      infof(data, "Skipping %s...\n", (*m)->name);
+      continue;
+    }
+    infof(data, "Trying %s...\n", (*m)->name);
+
+    if(Curl_ftpsendf(conn, "AUTH %s", (*m)->name))
+      return -1;
+
+    if(Curl_GetFTPResponse(&nread, conn, &ftpcode))
+      return -1;
+
+    if(conn->data->state.buffer[0] != '3'){
+      switch(ftpcode) {
+      case 504:
+        infof(data,
+              "%s is not supported by the server.\n", (*m)->name);
+        break;
+      case 534:
+        infof(data, "%s rejected as security mechanism.\n", (*m)->name);
+        break;
+      default:
+        if(conn->data->state.buffer[0] == '5') {
+          infof(data, "The server doesn't support the FTP "
+                "security extensions.\n");
+          return -1;
+        }
+        break;
+      }
+      continue;
+    }
+
+    ret = (*(*m)->auth)(conn->app_data, conn);
+	
+    if(ret == AUTH_CONTINUE)
+      continue;
+    else if(ret != AUTH_OK){
+      /* mechanism is supposed to output error string */
+      return -1;
+    }
+    conn->mech = *m;
+    conn->sec_complete = 1;
+    conn->command_prot = prot_safe;
+    break;
+  }
+    
+  return *m == NULL;
+}
+
+void
+Curl_sec_end(struct connectdata *conn)
+{
+  if (conn->mech != NULL) {
+    if(conn->mech->end)
+      (conn->mech->end)(conn->app_data);
+    memset(conn->app_data, 0, conn->mech->size);
+    free(conn->app_data);
+    conn->app_data = NULL;
+  }
+  conn->sec_complete = 0;
+  conn->data_prot = (enum protection_level)0;
+  conn->mech=NULL;
+}
+
+#endif /* KRB4 */
+#endif /* CURL_DISABLE_FTP */
diff --git a/main/source/curl/lib/security.h b/main/source/curl/lib/security.h
new file mode 100644
index 00000000..a0006be6
--- /dev/null
+++ b/main/source/curl/lib/security.h
@@ -0,0 +1,72 @@
+#ifndef __SECURITY_H
+#define __SECURITY_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: security.h,v 1.8 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+
+/* this is a re-write */
+
+#include <stdarg.h>
+#include "urldata.h"  /* for struct connectdata * */
+
+struct Curl_sec_client_mech {
+  const char *name;
+  size_t size;
+  int (*init)(void *);
+  int (*auth)(void *, struct connectdata *);
+  void (*end)(void *);
+  int (*check_prot)(void *, int);
+  int (*overhead)(void *, int, int);
+  int (*encode)(void *, void*, int, int, void**, struct connectdata *);
+  int (*decode)(void *, void*, int, int, struct connectdata *);
+};
+
+
+#define AUTH_OK		0
+#define AUTH_CONTINUE	1
+#define AUTH_ERROR	2
+
+extern struct Curl_sec_client_mech Curl_krb4_client_mech;
+
+int Curl_sec_fflush_fd(struct connectdata *conn, int fd);
+int Curl_sec_fprintf (struct connectdata *, FILE *, const char *, ...);
+int Curl_sec_getc (struct connectdata *conn, FILE *);
+int Curl_sec_putc (struct connectdata *conn, int, FILE *);
+int Curl_sec_read (struct connectdata *conn, int, void *, int);
+int Curl_sec_read_msg (struct connectdata *conn, char *, int);
+
+int Curl_sec_vfprintf(struct connectdata *, FILE *, const char *, va_list);
+int Curl_sec_fprintf2(struct connectdata *conn, FILE *f, const char *fmt, ...);
+int Curl_sec_vfprintf2(struct connectdata *conn, FILE *, const char *, va_list);
+int Curl_sec_write (struct connectdata *conn, int, char *, int);
+
+void Curl_sec_end (struct connectdata *);
+int Curl_sec_login (struct connectdata *);
+void Curl_sec_prot (int, char **);
+int Curl_sec_request_prot (struct connectdata *conn, const char *level);
+void Curl_sec_set_protection_level(struct connectdata *conn);
+void Curl_sec_status (void);
+
+enum protection_level Curl_set_command_prot(struct connectdata *,
+                                            enum protection_level);
+
+#endif
diff --git a/main/source/curl/lib/sendf.c b/main/source/curl/lib/sendf.c
new file mode 100644
index 00000000..ce133e33
--- /dev/null
+++ b/main/source/curl/lib/sendf.c
@@ -0,0 +1,436 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: sendf.c,v 1.64 2003/05/06 08:19:36 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <errno.h>
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>	/* required for send() & recv() prototypes */
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
+#include <winsock.h>
+#endif
+
+#include <curl/curl.h>
+#include "urldata.h"
+#include "sendf.h"
+#include "connect.h" /* for the Curl_ourerrno() proto */
+
+#define _MPRINTF_REPLACE /* use the internal *printf() functions */
+#include <curl/mprintf.h>
+
+#ifdef KRB4
+#include "security.h"
+#endif
+#include <string.h>
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+/* returns last node in linked list */
+static struct curl_slist *slist_get_last(struct curl_slist *list)
+{
+  struct curl_slist	*item;
+
+  /* if caller passed us a NULL, return now */
+  if (!list)
+    return NULL;
+
+  /* loop through to find the last item */
+  item = list;
+  while (item->next) {
+    item = item->next;
+  }
+  return item;
+}
+
+/* append a struct to the linked list. It always retunrs the address of the
+ * first record, so that you can sure this function as an initialization
+ * function as well as an append function. If you find this bothersome,
+ * then simply create a separate _init function and call it appropriately from
+ * within the proram. */
+struct curl_slist *curl_slist_append(struct curl_slist *list,
+                                     const char *data)
+{
+  struct curl_slist	*last;
+  struct curl_slist	*new_item;
+
+  new_item = (struct curl_slist *) malloc(sizeof(struct curl_slist));
+  if (new_item) {
+    new_item->next = NULL;
+    new_item->data = strdup(data);
+  }
+  if (new_item == NULL || new_item->data == NULL) {
+    fprintf(stderr, "Cannot allocate memory for QUOTE list.\n");
+    return NULL;
+  }
+
+  if (list) {
+    last = slist_get_last(list);
+    last->next = new_item;
+    return list;
+  }
+
+  /* if this is the first item, then new_item *is* the list */
+  return new_item;
+}
+
+/* be nice and clean up resources */
+void curl_slist_free_all(struct curl_slist *list)
+{
+  struct curl_slist	*next;
+  struct curl_slist	*item;
+
+  if (!list)
+    return;
+
+  item = list;
+  do {
+    next = item->next;
+		
+    if (item->data) {
+      free(item->data);
+    }
+    free(item);
+    item = next;
+  } while (next);
+}
+
+/* Curl_infof() is for info message along the way */
+
+void Curl_infof(struct SessionHandle *data, const char *fmt, ...)
+{
+  va_list ap;
+  if(data->set.verbose) {
+    char print_buffer[1024 + 1];
+    va_start(ap, fmt);
+    vsnprintf(print_buffer, 1024, fmt, ap);
+    va_end(ap);
+    Curl_debug(data, CURLINFO_TEXT, print_buffer, strlen(print_buffer));
+  }
+}
+
+/* Curl_failf() is for messages stating why we failed.
+ * The message SHALL NOT include any LF or CR.
+ */
+
+void Curl_failf(struct SessionHandle *data, const char *fmt, ...)
+{
+  va_list ap;
+  va_start(ap, fmt);
+  if(data->set.errorbuffer && !data->state.errorbuf) {
+    vsnprintf(data->set.errorbuffer, CURL_ERROR_SIZE, fmt, ap);
+    data->state.errorbuf = TRUE; /* wrote error string */
+
+    if(data->set.verbose) {
+      int len = strlen(data->set.errorbuffer);
+      bool doneit=FALSE;
+      if(len < CURL_ERROR_SIZE) {
+        doneit = TRUE;
+        data->set.errorbuffer[len] = '\n';
+        data->set.errorbuffer[++len] = '\0';
+      }
+      Curl_debug(data, CURLINFO_TEXT, data->set.errorbuffer, len);
+      if(doneit)
+        /* cut off the newline again */
+        data->set.errorbuffer[--len]=0;
+    }
+  }
+  va_end(ap);
+}
+
+/* Curl_sendf() sends formated data to the server */
+CURLcode Curl_sendf(int sockfd, struct connectdata *conn,
+                    const char *fmt, ...)
+{
+  struct SessionHandle *data = conn->data;
+  ssize_t bytes_written;
+  ssize_t write_len;
+  CURLcode res;
+  char *s;
+  char *sptr;
+  va_list ap;
+  va_start(ap, fmt);
+  s = vaprintf(fmt, ap); /* returns an allocated string */
+  va_end(ap);
+  if(!s)
+    return CURLE_OUT_OF_MEMORY; /* failure */
+
+  bytes_written=0;
+  write_len = strlen(s);
+  sptr = s;
+
+  do {
+    /* Write the buffer to the socket */
+    res = Curl_write(conn, sockfd, sptr, write_len, &bytes_written);
+
+    if(CURLE_OK != res)
+      break;
+
+    if(data->set.verbose)
+      Curl_debug(data, CURLINFO_DATA_OUT, sptr, bytes_written);
+
+    if(bytes_written != write_len) {
+      /* if not all was written at once, we must advance the pointer, decrease
+         the size left and try again! */
+      write_len -= bytes_written;
+      sptr += bytes_written;
+    }
+    else
+      break;
+
+  } while(1);
+
+  free(s); /* free the output string */
+
+  return res;
+}
+
+/*
+ * Curl_write() is an internal write function that sends plain (binary) data
+ * to the server. Works with plain sockets, SSL or kerberos.
+ *
+ */
+CURLcode Curl_write(struct connectdata *conn, int sockfd,
+                    void *mem, size_t len,
+                    ssize_t *written)
+{
+  ssize_t bytes_written;
+  (void)conn;
+
+#ifdef USE_SSLEAY
+  /* SSL_write() is said to return 'int' while write() and send() returns
+     'size_t' */
+  if (conn->ssl.use) {
+    int err;
+    int rc = SSL_write(conn->ssl.handle, mem, len);
+
+    if(rc < 0) {
+      err = SSL_get_error(conn->ssl.handle, rc);
+    
+      switch(err) {
+      case SSL_ERROR_WANT_READ:
+      case SSL_ERROR_WANT_WRITE:
+        /* this is basicly the EWOULDBLOCK equivalent */
+        *written = 0;
+        return CURLE_OK;
+      case SSL_ERROR_SYSCALL:
+        failf(conn->data, "SSL_write() returned SYSCALL, errno = %d\n",
+              Curl_ourerrno());
+        return CURLE_SEND_ERROR;
+      }
+      /* a true error */
+      failf(conn->data, "SSL_write() return error %d\n", err);
+      return CURLE_SEND_ERROR;
+    }
+    bytes_written = rc;
+  }
+  else {
+#endif
+#ifdef KRB4
+    if(conn->sec_complete) {
+      bytes_written = Curl_sec_write(conn, sockfd, mem, len);
+    }
+    else
+#endif /* KRB4 */
+    {
+      bytes_written = swrite(sockfd, mem, len);
+    }
+    if(-1 == bytes_written) {
+      int err = Curl_ourerrno();
+#ifdef WIN32
+      if(WSAEWOULDBLOCK == err)
+#else
+      /* As pointed out by Christophe Demory on March 11 2003, errno
+         may be EWOULDBLOCK or on some systems EAGAIN when it returned
+         due to its inability to send off data without blocking. We
+         therefor treat both error codes the same here */
+      if((EWOULDBLOCK == err) || (EAGAIN == err) || (EINTR == err))
+#endif
+      {
+        /* this is just a case of EWOULDBLOCK */
+        *written=0;
+        return CURLE_OK;
+      }
+    }
+#ifdef USE_SSLEAY
+  }
+#endif
+
+  *written = bytes_written;
+  return (-1 != bytes_written)?CURLE_OK:CURLE_SEND_ERROR;
+}
+
+/* client_write() sends data to the write callback(s)
+
+   The bit pattern defines to what "streams" to write to. Body and/or header.
+   The defines are in sendf.h of course.
+ */
+CURLcode Curl_client_write(struct SessionHandle *data,
+                           int type,
+                           char *ptr,
+                           size_t len)
+{
+  size_t wrote;
+
+  if(0 == len)
+    len = strlen(ptr);
+
+  if(type & CLIENTWRITE_BODY) {
+    wrote = data->set.fwrite(ptr, 1, len, data->set.out);
+    if(wrote != len) {
+      failf (data, "Failed writing body");
+      return CURLE_WRITE_ERROR;
+    }
+  }
+  if((type & CLIENTWRITE_HEADER) &&
+     (data->set.fwrite_header || data->set.writeheader) ) {
+    /*
+     * Write headers to the same callback or to the especially setup
+     * header callback function (added after version 7.7.1).
+     */
+    curl_write_callback writeit=
+      data->set.fwrite_header?data->set.fwrite_header:data->set.fwrite;
+
+    wrote = writeit(ptr, 1, len, data->set.writeheader);
+    if(wrote != len) {
+      failf (data, "Failed writing header");
+      return CURLE_WRITE_ERROR;
+    }
+  }
+  
+  return CURLE_OK;
+}
+
+/*
+ * Internal read-from-socket function. This is meant to deal with plain
+ * sockets, SSL sockets and kerberos sockets.
+ *
+ * If the read would block (EWOULDBLOCK) we return -1. Otherwise we return
+ * a regular CURLcode value.
+ */
+int Curl_read(struct connectdata *conn,
+              int sockfd,
+              char *buf,
+              size_t buffersize,
+              ssize_t *n)
+{
+  ssize_t nread;
+  (void)conn;
+  *n=0; /* reset amount to zero */
+
+#ifdef USE_SSLEAY
+  if (conn->ssl.use) {
+    nread = SSL_read(conn->ssl.handle, buf, buffersize);
+
+    if(nread < 0) {
+      /* failed SSL_read */
+      int err = SSL_get_error(conn->ssl.handle, nread);
+
+      switch(err) {
+      case SSL_ERROR_NONE: /* this is not an error */
+      case SSL_ERROR_ZERO_RETURN: /* no more data */
+        break;
+      case SSL_ERROR_WANT_READ:
+      case SSL_ERROR_WANT_WRITE:
+        /* there's data pending, re-invoke SSL_read() */
+        return -1; /* basicly EWOULDBLOCK */
+      case SSL_ERROR_SYSCALL:
+        /* openssl/ssl.h says "look at error stack/return value/errno" */
+      {
+        char error_buffer[120]; /* OpenSSL documents that this must be at least
+                                   120 bytes long. */
+        int sslerror = ERR_get_error();
+        failf(conn->data, "SSL read: %s, errno %d",
+              ERR_error_string(sslerror, error_buffer),
+              Curl_ourerrno() );
+      }
+      return CURLE_RECV_ERROR;
+      default:
+        failf(conn->data, "SSL read error: %d", err);
+        return CURLE_RECV_ERROR;
+      }
+    }
+  }
+  else {
+#endif
+#ifdef KRB4
+    if(conn->sec_complete)
+      nread = Curl_sec_read(conn, sockfd, buf, buffersize);
+    else
+#endif
+      nread = sread (sockfd, buf, buffersize);
+
+    if(-1 == nread) {
+      int err = Curl_ourerrno();
+#ifdef WIN32
+      if(WSAEWOULDBLOCK == err)
+#else
+      if((EWOULDBLOCK == err) || (EAGAIN == err) || (EINTR == err))
+#endif
+        return -1;
+    }
+
+#ifdef USE_SSLEAY
+  }
+#endif /* USE_SSLEAY */
+  *n = nread;
+  return CURLE_OK;
+}
+
+/* return 0 on success */
+int Curl_debug(struct SessionHandle *data, curl_infotype type,
+               char *ptr, size_t size)
+{
+  static const char * const s_infotype[CURLINFO_END] = {
+    "* ", "< ", "> ", "{ ", "} " };
+
+  if(data->set.fdebug)
+    return (*data->set.fdebug)(data, type, ptr, size,
+                               data->set.debugdata);
+
+  switch(type) {
+  case CURLINFO_TEXT:
+  case CURLINFO_HEADER_OUT:
+  case CURLINFO_HEADER_IN:
+    fwrite(s_infotype[type], 2, 1, data->set.err);
+    fwrite(ptr, size, 1, data->set.err);
+    break;
+  default: /* nada */
+    break;
+  }
+  return 0;
+}
diff --git a/main/source/curl/lib/sendf.h b/main/source/curl/lib/sendf.h
new file mode 100644
index 00000000..993390ae
--- /dev/null
+++ b/main/source/curl/lib/sendf.h
@@ -0,0 +1,54 @@
+#ifndef __SENDF_H
+#define __SENDF_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: sendf.h,v 1.21 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+
+CURLcode Curl_sendf(int fd, struct connectdata *, const char *fmt, ...);
+void Curl_infof(struct SessionHandle *, const char *fmt, ...);
+void Curl_failf(struct SessionHandle *, const char *fmt, ...);
+
+#define infof Curl_infof
+#define failf Curl_failf
+
+#define CLIENTWRITE_BODY   1
+#define CLIENTWRITE_HEADER 2
+#define CLIENTWRITE_BOTH   (CLIENTWRITE_BODY|CLIENTWRITE_HEADER)
+
+CURLcode Curl_client_write(struct SessionHandle *data, int type, char *ptr,
+                           size_t len);
+
+/* internal read-function, does plain socket, SSL and krb4 */
+int Curl_read(struct connectdata *conn, int sockfd,
+              char *buf, size_t buffersize,
+              ssize_t *n);
+/* internal write-function, does plain socket, SSL and krb4 */
+CURLcode Curl_write(struct connectdata *conn, int sockfd,
+                    void *mem, size_t len,
+                    ssize_t *written);
+
+/* the function used to output verbose information */
+int Curl_debug(struct SessionHandle *handle, curl_infotype type,
+               char *data, size_t size);
+
+
+#endif
diff --git a/main/source/curl/lib/setup.h b/main/source/curl/lib/setup.h
new file mode 100644
index 00000000..cf939976
--- /dev/null
+++ b/main/source/curl/lib/setup.h
@@ -0,0 +1,178 @@
+#ifndef __SETUP_H
+#define __SETUP_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: setup.h,v 1.26 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+
+/* MN 06/07/02 */
+/* #define HTTP_ONLY
+*/
+#ifdef HTTP_ONLY
+#define CURL_DISABLE_FTP
+#define CURL_DISABLE_LDAP
+#define CURL_DISABLE_TELNET
+#define CURL_DISABLE_DICT
+#define CURL_DISABLE_FILE
+#define CURL_DISABLE_GOPHER
+#endif
+
+#if !defined(WIN32) && defined(__WIN32__)
+/* This should be a good Borland fix. Alexander J. Oss told us! */
+#define WIN32
+#endif
+
+#ifdef HAVE_CONFIG_H
+
+#ifdef VMS
+#include "config-vms.h"
+#else
+#include "config.h" /* the configure script results */
+#endif
+
+#else
+#ifdef WIN32
+/* hand-modified win32 config.h! */
+#include "config-win32.h"
+#endif
+#ifdef macintosh
+/* hand-modified MacOS config.h! */
+#include "config-mac.h"
+#endif
+
+#endif
+
+#ifndef __cplusplus        /* (rabe) */
+typedef unsigned char bool;
+#define typedef_bool
+#endif                     /* (rabe) */
+
+#ifdef NEED_REENTRANT
+/* Solaris machines needs _REENTRANT set for a few function prototypes and
+   things to appear in the #include files. We need to #define it before all
+   #include files */
+#define _REENTRANT
+#endif
+
+
+#include <stdio.h>
+#ifndef OS
+#ifdef WIN32
+#define OS "win32"
+#else
+#define OS "unknown"
+#endif
+#endif
+
+#if defined(HAVE_X509_H) && defined(HAVE_SSL_H) && defined(HAVE_RSA_H) && \
+defined(HAVE_PEM_H) && defined(HAVE_ERR_H) && defined(HAVE_CRYPTO_H) && \
+defined(HAVE_LIBSSL) && defined(HAVE_LIBCRYPTO)
+  /* the six important includes files all exist and so do both libs,
+     defined SSLeay usage */
+#define USE_SSLEAY 1
+#endif
+#if defined(HAVE_OPENSSL_X509_H) && defined(HAVE_OPENSSL_SSL_H) && \
+defined(HAVE_OPENSSL_RSA_H) && defined(HAVE_OPENSSL_PEM_H) && \
+defined(HAVE_OPENSSL_ERR_H) && defined(HAVE_OPENSSL_CRYPTO_H) && \
+defined(HAVE_LIBSSL) && defined(HAVE_LIBCRYPTO)
+  /* the six important includes files all exist and so do both libs,
+     defined SSLeay usage */
+#define USE_SSLEAY 1
+#define USE_OPENSSL 1
+#endif
+
+#ifndef STDC_HEADERS /* no standard C headers! */
+#ifdef	VMS
+#include "../include/curl/stdcheaders.h"
+#else
+#include <curl/stdcheaders.h>
+#endif
+
+#else
+#ifdef _AIX
+#include <curl/stdcheaders.h>
+#endif
+#endif
+
+/* Below we define four functions. They should
+   1. close a socket
+   2. read from a socket
+   3. write to a socket
+
+   4. set the SIGALRM signal timeout
+   5. set dir/file naming defines
+   */
+
+#ifdef WIN32
+#if !defined(__GNUC__) || defined(__MINGW32__)
+#define sclose(x) closesocket(x)
+#define sread(x,y,z) recv(x,y,z,0)
+#define swrite(x,y,z) (size_t)send(x,y,z,0)
+#undef HAVE_ALARM
+#else
+     /* gcc-for-win is still good :) */
+#define sclose(x) close(x)
+#define sread(x,y,z) recv(x,y,z,0)
+#define swrite(x,y,z) send(x,y,z,0)
+#define HAVE_ALARM
+#endif
+
+#define PATH_CHAR     ";"
+#define DIR_CHAR      "\\"
+#define DOT_CHAR      "_"
+
+#else
+#define sclose(x) close(x)
+#define sread(x,y,z) recv(x,y,z,0)
+#define swrite(x,y,z) send(x,y,z,0)
+#define HAVE_ALARM
+
+#define PATH_CHAR     ":"
+#define DIR_CHAR      "/"
+#define DOT_CHAR      "."
+
+#ifdef HAVE_STRCASECMP
+/* this is for "-ansi -Wall -pedantic" to stop complaining! */
+extern int (strcasecmp)(const char *s1, const char *s2);
+extern int (strncasecmp)(const char *s1, const char *s2, size_t n);
+#ifndef fileno /* sunos 4 have this as a macro! */
+int fileno( FILE *stream);
+#endif
+#endif
+
+#endif
+
+/*
+ * Curl_addrinfo MUST be used for name resolving information.
+ * Information regarding a single IP witin a Curl_addrinfo MUST be stored in
+ * a Curl_ipconnect struct.
+ */
+#ifdef ENABLE_IPV6
+typedef struct addrinfo Curl_addrinfo;
+typedef struct addrinfo Curl_ipconnect;
+#else
+typedef struct hostent Curl_addrinfo;
+typedef struct in_addr Curl_ipconnect;
+#endif
+
+
+
+#endif /* __CONFIG_H */
diff --git a/main/source/curl/lib/share.c b/main/source/curl/lib/share.c
new file mode 100644
index 00000000..3f01e659
--- /dev/null
+++ b/main/source/curl/lib/share.c
@@ -0,0 +1,181 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: share.c,v 1.8 2003/02/06 19:28:17 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+#include <stdarg.h>
+#include <stdlib.h>
+#include <curl/curl.h>
+#include "urldata.h"
+#include "share.h"
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+CURLSH *
+curl_share_init(void)
+{
+  struct Curl_share *share =
+    (struct Curl_share *)malloc(sizeof(struct Curl_share));
+  if (share)
+    memset (share, 0, sizeof(struct Curl_share));
+
+  return share;
+}
+
+CURLSHcode
+curl_share_setopt(CURLSH *sh, CURLSHoption option, ...)
+{
+  struct Curl_share *share = (struct Curl_share *)sh;
+  va_list param;
+  int type;
+  curl_lock_function lockfunc;
+  curl_unlock_function unlockfunc;
+  void *ptr;
+
+  if (share->dirty)
+    /* don't allow setting options while one or more handles are already
+       using this share */
+    return CURLSHE_IN_USE;
+
+  va_start(param, option);
+
+  switch(option) {
+  case CURLSHOPT_SHARE:
+    /* this is a type this share will share */
+    type = va_arg(param, int);
+    share->specifier |= (1<<type);
+    switch( type )
+    {
+      case CURL_LOCK_DATA_DNS:
+        if (!share->hostcache) {
+          share->hostcache = Curl_hash_alloc(7, Curl_freednsinfo);
+        }
+        break;
+
+      case CURL_LOCK_DATA_COOKIE:
+        break;
+
+      case CURL_LOCK_DATA_SSL_SESSION:
+        break;
+
+      case CURL_LOCK_DATA_CONNECT:
+        break;
+
+      default:
+        return CURLSHE_BAD_OPTION;
+    }
+    break;
+
+  case CURLSHOPT_UNSHARE:
+    /* this is a type this share will no longer share */
+    type = va_arg(param, int);
+    share->specifier &= ~(1<<type);
+    switch( type )
+    {
+      case CURL_LOCK_DATA_DNS:
+        if (share->hostcache) {
+          Curl_hash_destroy(share->hostcache);
+          share->hostcache = NULL;
+        }
+        break;
+
+      case CURL_LOCK_DATA_COOKIE:
+        break;
+
+      case CURL_LOCK_DATA_SSL_SESSION:
+        break;
+
+      case CURL_LOCK_DATA_CONNECT:
+        break;
+
+      default:
+        return CURLSHE_BAD_OPTION;
+    }
+    break;
+
+  case CURLSHOPT_LOCKFUNC:
+    lockfunc = va_arg(param, curl_lock_function);
+    share->lockfunc = lockfunc;
+    break;
+
+  case CURLSHOPT_UNLOCKFUNC:
+    unlockfunc = va_arg(param, curl_unlock_function);
+    share->unlockfunc = unlockfunc;    
+    break;
+
+  case CURLSHOPT_USERDATA:
+    ptr = va_arg(param, void *);
+    share->clientdata = ptr;
+    break;
+
+  default:
+    return CURLSHE_BAD_OPTION;
+  }
+
+  return CURLSHE_OK;
+}
+
+CURLSHcode curl_share_cleanup(CURLSH *sh)
+{
+  struct Curl_share *share = (struct Curl_share *)sh;
+  if (share->dirty)
+    return CURLSHE_IN_USE;
+
+  free (share);
+  
+  return CURLSHE_OK;
+}
+
+
+CURLSHcode
+Curl_share_lock(struct SessionHandle *data, curl_lock_data type, curl_lock_access access)
+{
+  struct Curl_share *share = data->share;
+
+  if (share == NULL)
+    return CURLSHE_INVALID;
+
+  if(share->specifier & (1<<type)) {
+    share->lockfunc (data, type, access, share->clientdata);
+  }
+  /* else if we don't share this, pretend successful lock */
+
+  return CURLSHE_OK;
+}
+
+CURLSHcode
+Curl_share_unlock(struct SessionHandle *data, curl_lock_data type)
+{
+  struct Curl_share *share = data->share;
+
+  if (share == NULL)
+    return CURLSHE_INVALID;
+
+  if(share->specifier & (1<<type)) {
+    share->unlockfunc (data, type, share->clientdata);
+  }
+
+  return CURLSHE_OK;
+}
diff --git a/main/source/curl/lib/share.h b/main/source/curl/lib/share.h
new file mode 100644
index 00000000..5c90e760
--- /dev/null
+++ b/main/source/curl/lib/share.h
@@ -0,0 +1,53 @@
+#ifndef __CURL_SHARE_H
+#define __CURL_SHARE_H
+
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: share.h,v 1.7 2003/02/04 23:48:47 jpbl Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+#include <curl/curl.h>
+
+/* this struct is libcurl-private, don't export details */
+struct Curl_share {
+  unsigned int specifier;
+  volatile unsigned int dirty;
+  
+  curl_lock_function lockfunc;
+  curl_unlock_function unlockfunc;
+  void *clientdata;
+
+  curl_hash *hostcache;
+};
+
+CURLSHcode Curl_share_lock (
+    struct SessionHandle *, 
+    curl_lock_data,
+    curl_lock_access
+    );
+
+CURLSHcode Curl_share_unlock (
+    struct SessionHandle *, 
+    curl_lock_data
+    );
+
+#endif /* __CURL_SHARE_H */
diff --git a/main/source/curl/lib/speedcheck.c b/main/source/curl/lib/speedcheck.c
new file mode 100644
index 00000000..a7f8c85b
--- /dev/null
+++ b/main/source/curl/lib/speedcheck.c
@@ -0,0 +1,70 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: speedcheck.c,v 1.17 2003/01/29 10:14:23 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#include <stdio.h>
+#include <string.h>
+#if defined(__MINGW32__)
+#include <winsock.h>
+#endif
+
+#include <curl/curl.h>
+#include "urldata.h"
+#include "sendf.h"
+#include "speedcheck.h"
+
+void Curl_speedinit(struct SessionHandle *data)
+{
+  memset(&data->state.keeps_speed, 0, sizeof(struct timeval));
+}
+
+CURLcode Curl_speedcheck(struct SessionHandle *data,
+                         struct timeval now)
+{
+  if((data->progress.current_speed >= 0) &&
+     data->set.low_speed_time &&
+     (Curl_tvlong(data->state.keeps_speed) != 0) &&
+     (data->progress.current_speed < data->set.low_speed_limit)) {
+
+    /* We are now below the "low speed limit". If we are below it
+       for "low speed time" seconds we consider that enough reason
+       to abort the download. */
+    
+    if( (Curl_tvdiff(now, data->state.keeps_speed)/1000) >
+        data->set.low_speed_time) {
+      /* we have been this slow for long enough, now die */
+      failf(data,
+	    "Operation too slow. "
+	    "Less than %d bytes/sec transfered the last %d seconds",
+	    data->set.low_speed_limit,
+	    data->set.low_speed_time);
+      return CURLE_OPERATION_TIMEOUTED;
+    }
+  }
+  else {
+    /* we keep up the required speed all right */
+    data->state.keeps_speed = now;
+  }
+  return CURLE_OK;
+}
diff --git a/main/source/curl/lib/speedcheck.h b/main/source/curl/lib/speedcheck.h
new file mode 100644
index 00000000..de703160
--- /dev/null
+++ b/main/source/curl/lib/speedcheck.h
@@ -0,0 +1,34 @@
+#ifndef __SPEEDCHECK_H
+#define __SPEEDCHECK_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: speedcheck.h,v 1.11 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#include "timeval.h"
+
+void Curl_speedinit(struct SessionHandle *data);
+CURLcode Curl_speedcheck(struct SessionHandle *data,
+                         struct timeval now);
+
+#endif
diff --git a/main/source/curl/lib/ssluse.c b/main/source/curl/lib/ssluse.c
new file mode 100644
index 00000000..5a0a2b42
--- /dev/null
+++ b/main/source/curl/lib/ssluse.c
@@ -0,0 +1,1055 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: ssluse.c,v 1.72 2003/05/01 13:37:36 bagder Exp $
+ ***************************************************************************/
+
+/*
+ * The original SSL code for curl was written by
+ * Linas Vepstas <linas@linas.org> and Sampo Kellomaki <sampo@iki.fi>
+ */
+
+#include "setup.h"
+
+#include <string.h>
+#include <stdlib.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#include "urldata.h"
+#include "sendf.h"
+#include "formdata.h" /* for the boundary function */
+#include "url.h" /* for the ssl config check function */
+
+#ifdef USE_SSLEAY
+#include <openssl/rand.h>
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+#if OPENSSL_VERSION_NUMBER >= 0x0090581fL
+#define HAVE_SSL_GET1_SESSION 1
+#else
+#undef HAVE_SSL_GET1_SESSION
+#endif
+
+#if OPENSSL_VERSION_NUMBER >= 0x00904100L
+#define HAVE_USERDATA_IN_PWD_CALLBACK 1
+#else
+#undef HAVE_USERDATA_IN_PWD_CALLBACK
+#endif
+
+#if OPENSSL_VERSION_NUMBER >= 0x00907001L
+/* ENGINE_load_private_key() takes four arguments */
+#define HAVE_ENGINE_LOAD_FOUR_ARGS
+#else
+/* ENGINE_load_private_key() takes three arguments */
+#undef HAVE_ENGINE_LOAD_FOUR_ARGS
+#endif
+
+
+#ifndef HAVE_USERDATA_IN_PWD_CALLBACK
+static char global_passwd[64];
+#endif
+
+static int passwd_callback(char *buf, int num, int verify
+#if HAVE_USERDATA_IN_PWD_CALLBACK
+                           /* This was introduced in 0.9.4, we can set this
+                              using SSL_CTX_set_default_passwd_cb_userdata()
+                              */
+                           , void *global_passwd
+#endif
+                           )
+{
+  if(verify)
+    fprintf(stderr, "%s\n", buf);
+  else {
+    if(num > (int)strlen((char *)global_passwd)) {
+      strcpy(buf, global_passwd);
+      return strlen(buf);
+    }
+  }  
+  return 0;
+}
+
+static
+bool seed_enough(int nread)
+{
+#ifdef HAVE_RAND_STATUS
+  nread = 0; /* to prevent compiler warnings */
+
+  /* only available in OpenSSL 0.9.5a and later */
+  if(RAND_status())
+    return TRUE;
+#else
+  if(nread > 500)
+    /* this is a very silly decision to make */
+    return TRUE;
+#endif
+  return FALSE; /* not enough */
+}
+
+static
+int random_the_seed(struct SessionHandle *data)
+{
+  char *buf = data->state.buffer; /* point to the big buffer */
+  int nread=0;
+
+  /* Q: should we add support for a random file name as a libcurl option?
+     A: Yes, it is here */
+
+#ifndef RANDOM_FILE
+  /* if RANDOM_FILE isn't defined, we only perform this if an option tells
+     us to! */
+  if(data->set.ssl.random_file)
+#define RANDOM_FILE "" /* doesn't matter won't be used */
+#endif
+  {
+    /* let the option override the define */
+    nread += RAND_load_file((data->set.ssl.random_file?
+                             data->set.ssl.random_file:RANDOM_FILE),
+                            16384);
+    if(seed_enough(nread))
+      return nread;
+  }
+
+#if defined(HAVE_RAND_EGD)
+  /* only available in OpenSSL 0.9.5 and later */
+  /* EGD_SOCKET is set at configure time or not at all */
+#ifndef EGD_SOCKET
+  /* If we don't have the define set, we only do this if the egd-option
+     is set */
+  if(data->set.ssl.egdsocket)
+#define EGD_SOCKET "" /* doesn't matter won't be used */
+#endif
+  {
+    /* If there's an option and a define, the option overrides the
+       define */
+    int ret = RAND_egd(data->set.ssl.egdsocket?
+                       data->set.ssl.egdsocket:EGD_SOCKET);
+    if(-1 != ret) {
+      nread += ret;
+      if(seed_enough(nread))
+        return nread;
+    }
+  }
+#endif
+
+  /* If we get here, it means we need to seed the PRNG using a "silly"
+     approach! */
+#ifdef HAVE_RAND_SCREEN
+  /* This one gets a random value by reading the currently shown screen */
+  RAND_screen();
+  nread = 100; /* just a value */
+#else
+  {
+    int len;
+    char *area;
+
+    /* Changed call to RAND_seed to use the underlying RAND_add implementation
+     * directly.  Do this in a loop, with the amount of additional entropy
+     * being dependent upon the algorithm used by Curl_FormBoundary(): N bytes
+     * of a 7-bit ascii set. -- Richard Gorton, March 11 2003.
+     */
+	
+    do {
+      area = Curl_FormBoundary();
+      if(!area)
+        return 3; /* out of memory */
+	
+      len = strlen(area);
+      RAND_add(area, len, (len >> 1));
+
+      free(area); /* now remove the random junk */
+    } while (!RAND_status());
+  }
+#endif
+
+  /* generates a default path for the random seed file */
+  buf[0]=0; /* blank it first */
+  RAND_file_name(buf, BUFSIZE);
+  if ( buf[0] ) {
+    /* we got a file name to try */
+    nread += RAND_load_file(buf, 16384);
+    if(seed_enough(nread))
+      return nread;
+  }
+
+  infof(data, "libcurl is now using a weak random seed!\n");
+  return nread;
+}
+
+#ifndef SSL_FILETYPE_ENGINE
+#define SSL_FILETYPE_ENGINE 42
+#endif
+static int do_file_type(const char *type)
+{
+  if (!type || !type[0])
+    return SSL_FILETYPE_PEM;
+  if (curl_strequal(type, "PEM"))
+    return SSL_FILETYPE_PEM;
+  if (curl_strequal(type, "DER"))
+    return SSL_FILETYPE_ASN1;
+  if (curl_strequal(type, "ENG"))
+    return SSL_FILETYPE_ENGINE;
+  return -1;
+}
+
+static
+int cert_stuff(struct connectdata *conn,
+               char *cert_file,
+               const char *cert_type,
+               char *key_file,
+               const char *key_type)
+{
+  struct SessionHandle *data = conn->data;
+  int file_type;
+
+  if (cert_file != NULL) {
+    SSL *ssl;
+    X509 *x509;
+
+    if(data->set.key_passwd) {
+#ifndef HAVE_USERDATA_IN_PWD_CALLBACK
+      /*
+       * If password has been given, we store that in the global
+       * area (*shudder*) for a while:
+       */
+      strcpy(global_passwd, data->set.key_passwd);
+#else
+      /*
+       * We set the password in the callback userdata
+       */
+      SSL_CTX_set_default_passwd_cb_userdata(conn->ssl.ctx,
+                                             data->set.key_passwd);
+#endif
+      /* Set passwd callback: */
+      SSL_CTX_set_default_passwd_cb(conn->ssl.ctx, passwd_callback);
+    }
+
+    file_type = do_file_type(cert_type);
+
+    switch(file_type) {
+    case SSL_FILETYPE_PEM:
+      /* SSL_CTX_use_certificate_chain_file() only works on PEM files */
+      if (SSL_CTX_use_certificate_chain_file(conn->ssl.ctx,
+                                             cert_file) != 1) {
+        failf(data, "unable to set certificate file (wrong password?)");
+        return 0;
+      }
+      break;
+
+    case SSL_FILETYPE_ASN1:
+      /* SSL_CTX_use_certificate_file() works with either PEM or ASN1, but
+         we use the case above for PEM so this can only be performed with
+         ASN1 files. */
+      if (SSL_CTX_use_certificate_file(conn->ssl.ctx,
+                                       cert_file,
+                                       file_type) != 1) {
+        failf(data, "unable to set certificate file (wrong password?)");
+        return 0;
+      }
+      break;
+    case SSL_FILETYPE_ENGINE:
+      failf(data, "file type ENG for certificate not implemented");
+      return 0;
+
+    default:
+      failf(data, "not supported file type '%s' for certificate", cert_type);
+      return 0;
+    }
+
+    file_type = do_file_type(key_type);
+
+    switch(file_type) {
+    case SSL_FILETYPE_PEM:
+      if (key_file == NULL)
+        /* cert & key can only be in PEM case in the same file */
+        key_file=cert_file;
+    case SSL_FILETYPE_ASN1:
+      if (SSL_CTX_use_PrivateKey_file(conn->ssl.ctx,
+                                      key_file,
+                                      file_type) != 1) {
+        failf(data, "unable to set private key file: '%s' type %s\n",
+              key_file, key_type?key_type:"PEM");
+        return 0;
+      }
+      break;
+    case SSL_FILETYPE_ENGINE:
+#ifdef HAVE_OPENSSL_ENGINE_H
+      {                         /* XXXX still needs some work */
+        EVP_PKEY *priv_key = NULL;
+        if (conn && conn->data && conn->data->engine) {
+#ifdef HAVE_ENGINE_LOAD_FOUR_ARGS
+          UI_METHOD *ui_method = UI_OpenSSL();
+#endif
+          if (!key_file || !key_file[0]) {
+            failf(data, "no key set to load from crypto engine\n");
+            return 0;
+          }
+          priv_key = ENGINE_load_private_key(conn->data->engine,key_file,
+#ifdef HAVE_ENGINE_LOAD_FOUR_ARGS
+                                             ui_method,
+#endif
+                                             data->set.key_passwd);
+          if (!priv_key) {
+            failf(data, "failed to load private key from crypto engine\n");
+            return 0;
+          }
+          if (SSL_CTX_use_PrivateKey(conn->ssl.ctx, priv_key) != 1) {
+            failf(data, "unable to set private key\n");
+            EVP_PKEY_free(priv_key);
+            return 0;
+          }
+          EVP_PKEY_free(priv_key);  /* we don't need the handle any more... */
+        }
+        else {
+          failf(data, "crypto engine not set, can't load private key\n");
+          return 0;
+        }
+      }
+#else
+      failf(data, "file type ENG for private key not supported\n");
+      return 0;
+#endif
+      break;
+    default:
+      failf(data, "not supported file type for private key\n");
+      return 0;
+    }
+
+    ssl=SSL_new(conn->ssl.ctx);
+    x509=SSL_get_certificate(ssl);
+
+    /* This version was provided by Evan Jordan and is supposed to not
+       leak memory as the previous version: */
+    if (x509 != NULL) {
+      EVP_PKEY *pktmp = X509_get_pubkey(x509);
+      EVP_PKEY_copy_parameters(pktmp,SSL_get_privatekey(ssl));
+      EVP_PKEY_free(pktmp);
+    }
+
+    SSL_free(ssl);
+
+    /* If we are using DSA, we can copy the parameters from
+     * the private key */
+		
+    
+    /* Now we know that a key and cert have been set against
+     * the SSL context */
+    if (!SSL_CTX_check_private_key(conn->ssl.ctx)) {
+      failf(data, "Private key does not match the certificate public key");
+      return(0);
+    }
+#ifndef HAVE_USERDATA_IN_PWD_CALLBACK    
+    /* erase it now */
+    memset(global_passwd, 0, sizeof(global_passwd));
+#endif
+  }
+  return(1);
+}
+
+static
+int cert_verify_callback(int ok, X509_STORE_CTX *ctx)
+{
+  X509 *err_cert;
+  char buf[256];
+
+  err_cert=X509_STORE_CTX_get_current_cert(ctx);
+  X509_NAME_oneline(X509_get_subject_name(err_cert),buf,256);
+
+  return ok;
+}
+
+#endif
+
+#ifdef USE_SSLEAY
+/* "global" init done? */
+static int init_ssl=0;
+
+/* we have the "SSL is seeded" boolean global for the application to
+   prevent multiple time-consuming seedings in vain */
+static bool ssl_seeded = FALSE;
+#endif
+
+/* Global init */
+void Curl_SSL_init(void)
+{
+#ifdef USE_SSLEAY
+  /* make sure this is only done once */
+  if(0 != init_ssl)
+    return;
+
+  init_ssl++; /* never again */
+
+#ifdef HAVE_ENGINE_LOAD_BUILTIN_ENGINES
+  ENGINE_load_builtin_engines();
+#endif
+
+  /* Lets get nice error messages */
+  SSL_load_error_strings();
+
+  /* Setup all the global SSL stuff */
+  SSLeay_add_ssl_algorithms();
+#else
+  /* SSL disabled, do nothing */
+#endif
+}
+
+/* Global cleanup */
+void Curl_SSL_cleanup(void)
+{
+#ifdef USE_SSLEAY
+  if(init_ssl) {
+    /* only cleanup if we did a previous init */
+
+    /* Free the SSL error strings */
+    ERR_free_strings();
+  
+    /* EVP_cleanup() removes all ciphers and digests from the
+       table. */
+    EVP_cleanup();
+
+#ifdef HAVE_ENGINE_cleanup
+    ENGINE_cleanup();
+#endif
+
+    init_ssl=0; /* not inited any more */
+  }
+#else
+  /* SSL disabled, do nothing */
+#endif
+}
+
+#ifdef USE_SSLEAY
+
+/*
+ * This function is called when an SSL connection is closed.
+ */
+void Curl_SSL_Close(struct connectdata *conn)
+{
+  if (conn->ssl.use) {
+    /*
+      ERR_remove_state() frees the error queue associated with
+      thread pid.  If pid == 0, the current thread will have its
+      error queue removed.
+
+      Since error queue data structures are allocated
+      automatically for new threads, they must be freed when
+      threads are terminated in oder to avoid memory leaks.
+    */
+    ERR_remove_state(0);
+
+    if(conn->ssl.handle) {
+      (void)SSL_shutdown(conn->ssl.handle);
+      SSL_set_connect_state(conn->ssl.handle);
+
+      SSL_free (conn->ssl.handle);
+      conn->ssl.handle = NULL;
+    }
+    if(conn->ssl.ctx) {
+      SSL_CTX_free (conn->ssl.ctx);
+      conn->ssl.ctx = NULL;
+    }
+    conn->ssl.use = FALSE; /* get back to ordinary socket usage */
+  }
+}
+
+
+/*
+ * This sets up a session cache to the specified size.
+ */
+CURLcode Curl_SSL_InitSessions(struct SessionHandle *data, long amount)
+{
+  struct curl_ssl_session *session;
+
+  if(data->state.session)
+    /* this is just a precaution to prevent multiple inits */
+    return CURLE_OK;
+
+  session = (struct curl_ssl_session *)
+    malloc(amount * sizeof(struct curl_ssl_session));
+  if(!session)
+    return CURLE_OUT_OF_MEMORY;
+
+  /* "blank out" the newly allocated memory */
+  memset(session, 0, amount * sizeof(struct curl_ssl_session));
+
+  /* store the info in the SSL section */
+  data->set.ssl.numsessions = amount;
+  data->state.session = session;
+  data->state.sessionage = 1; /* this is brand new */
+
+  return CURLE_OK;
+}
+
+/*
+ * Check if there's a session ID for the given connection in the cache,
+ * and if there's one suitable, it is returned.
+ */
+static int Get_SSL_Session(struct connectdata *conn,
+                           SSL_SESSION **ssl_sessionid)
+{
+  struct curl_ssl_session *check;
+  struct SessionHandle *data = conn->data;
+  long i;
+
+  for(i=0; i< data->set.ssl.numsessions; i++) {
+    check = &data->state.session[i];
+    if(!check->sessionid)
+      /* not session ID means blank entry */
+      continue;
+    if(curl_strequal(conn->name, check->name) &&
+       (conn->remote_port == check->remote_port) &&
+       Curl_ssl_config_matches(&conn->ssl_config, &check->ssl_config)) {
+      /* yes, we have a session ID! */
+      data->state.sessionage++;            /* increase general age */
+      check->age = data->state.sessionage; /* set this as used in this age */
+      *ssl_sessionid = check->sessionid;
+      return FALSE;
+    }
+  }
+  *ssl_sessionid = (SSL_SESSION *)NULL;
+  return TRUE;
+}
+
+/*
+ * Kill a single session ID entry in the cache.
+ */
+static int Kill_Single_Session(struct curl_ssl_session *session)
+{
+  if(session->sessionid) {
+    /* defensive check */
+
+    /* free the ID */
+    SSL_SESSION_free(session->sessionid);
+    session->sessionid=NULL;
+    session->age = 0; /* fresh */
+
+    Curl_free_ssl_config(&session->ssl_config);
+
+    free(session->name);
+    session->name = NULL; /* no name */
+
+    return 0; /* ok */
+  }
+  else
+    return 1;
+}
+
+/*
+ * This function is called when the 'data' struct is going away. Close
+ * down everything and free all resources!
+ */
+int Curl_SSL_Close_All(struct SessionHandle *data)
+{
+  int i;
+
+  if(data->state.session) {    
+    for(i=0; i< data->set.ssl.numsessions; i++)
+      /* the single-killer function handles empty table slots */
+      Kill_Single_Session(&data->state.session[i]);
+    
+    /* free the cache data */
+    free(data->state.session);
+  }
+#ifdef HAVE_OPENSSL_ENGINE_H
+  if (data->engine)
+  {
+    ENGINE_free(data->engine);
+    data->engine = NULL;
+  }
+#endif
+  return 0;
+}
+
+/*
+ * Extract the session id and store it in the session cache.
+ */
+static int Store_SSL_Session(struct connectdata *conn)
+{
+  SSL_SESSION *ssl_sessionid;
+  int i;
+  struct SessionHandle *data=conn->data; /* the mother of all structs */
+  struct curl_ssl_session *store = &data->state.session[0];
+  int oldest_age=data->state.session[0].age; /* zero if unused */
+
+  /* ask OpenSSL, say please */
+
+#ifdef HAVE_SSL_GET1_SESSION
+  ssl_sessionid = SSL_get1_session(conn->ssl.handle);
+
+  /* SSL_get1_session() will increment the reference
+     count and the session will stay in memory until explicitly freed with
+     SSL_SESSION_free(3), regardless of its state. 
+     This function was introduced in openssl 0.9.5a. */
+#else
+  ssl_sessionid = SSL_get_session(conn->ssl.handle);
+
+  /* if SSL_get1_session() is unavailable, use SSL_get_session().
+     This is an inferior option because the session can be flushed
+     at any time by openssl. It is included only so curl compiles
+     under versions of openssl < 0.9.5a.
+     
+     WARNING: How curl behaves if it's session is flushed is
+     untested. 
+  */
+#endif
+
+  /* Now we should add the session ID and the host name to the cache, (remove
+     the oldest if necessary) */
+
+  /* find an empty slot for us, or find the oldest */
+  for(i=1; (i<data->set.ssl.numsessions) &&
+        data->state.session[i].sessionid; i++) {
+    if(data->state.session[i].age < oldest_age) {
+      oldest_age = data->state.session[i].age;
+      store = &data->state.session[i];
+    }
+  }
+  if(i == data->set.ssl.numsessions)
+    /* cache is full, we must "kill" the oldest entry! */
+    Kill_Single_Session(store);
+  else
+    store = &data->state.session[i]; /* use this slot */
+  
+  /* now init the session struct wisely */
+  store->sessionid = ssl_sessionid;
+  store->age = data->state.sessionage;      /* set current age */
+  store->name = strdup(conn->name);       /* clone host name */
+  store->remote_port = conn->remote_port; /* port number */
+
+  Curl_clone_ssl_config(&conn->ssl_config, &store->ssl_config);
+
+  return 0;
+}
+
+static int Curl_ASN1_UTCTIME_output(struct connectdata *conn,
+                                    const char *prefix,
+                                    ASN1_UTCTIME *tm)
+{
+  char *asn1_string;
+  int gmt=FALSE;
+  int i;
+  int year=0,month=0,day=0,hour=0,minute=0,second=0;
+  struct SessionHandle *data = conn->data;
+
+  if(!data->set.verbose)
+    return 0;
+
+  i=tm->length;
+  asn1_string=(char *)tm->data;
+
+  if (i < 10)
+    return 1;
+  if (asn1_string[i-1] == 'Z')
+    gmt=TRUE;
+  for (i=0; i<10; i++)
+    if ((asn1_string[i] > '9') || (asn1_string[i] < '0'))
+      return 2;
+
+  year= (asn1_string[0]-'0')*10+(asn1_string[1]-'0');
+  if (year < 50)
+    year+=100;
+
+  month= (asn1_string[2]-'0')*10+(asn1_string[3]-'0');
+  if ((month > 12) || (month < 1))
+    return 3;
+
+  day= (asn1_string[4]-'0')*10+(asn1_string[5]-'0');
+  hour= (asn1_string[6]-'0')*10+(asn1_string[7]-'0');
+  minute=  (asn1_string[8]-'0')*10+(asn1_string[9]-'0');
+
+  if ( (asn1_string[10] >= '0') && (asn1_string[10] <= '9') &&
+       (asn1_string[11] >= '0') && (asn1_string[11] <= '9'))
+    second= (asn1_string[10]-'0')*10+(asn1_string[11]-'0');
+  
+  infof(data,
+        "%s%04d-%02d-%02d %02d:%02d:%02d %s\n",
+        prefix, year+1900, month, day, hour, minute, second, (gmt?"GMT":""));
+
+  return 0;
+}
+
+#endif  
+
+/* ====================================================== */
+#ifdef USE_SSLEAY
+static int
+cert_hostcheck(const char *certname, const char *hostname)
+{
+  char *tmp;
+  const char *certdomain;
+  
+  if(!certname ||
+     strlen(certname)<3 ||
+     !hostname ||
+     !strlen(hostname)) /* sanity check */
+    return 0;
+
+  if(curl_strequal(certname, hostname)) /* trivial case */
+    return 1;
+
+  certdomain = certname + 1;
+
+  if((certname[0] != '*') || (certdomain[0] != '.'))
+    return 0; /* not a wildcard certificate, check failed */
+  
+  if(!strchr(certdomain+1, '.'))
+    return 0; /* the certificate must have at least another dot in its name */
+
+  /* find 'certdomain' within 'hostname' */
+  tmp = strstr(hostname, certdomain);
+  if(tmp) {
+    /* ok the certname's domain matches the hostname, let's check that it's a
+       tail-match */
+    if(curl_strequal(tmp, certdomain))
+      /* looks like a match. Just check we havent swallowed a '.' */
+      return tmp == strchr(hostname, '.');
+    else
+      return 0;
+  }
+  return 0;
+}
+#endif
+
+/* ====================================================== */
+CURLcode
+Curl_SSLConnect(struct connectdata *conn)
+{
+  CURLcode retcode = CURLE_OK;
+
+#ifdef USE_SSLEAY
+  struct SessionHandle *data = conn->data;
+  int err;
+  int what;
+  char * str;
+  SSL_METHOD *req_method;
+  SSL_SESSION *ssl_sessionid=NULL;
+  ASN1_TIME *certdate;
+
+  /* mark this is being ssl enabled from here on out. */
+  conn->ssl.use = TRUE;
+
+  if(!ssl_seeded || data->set.ssl.random_file || data->set.ssl.egdsocket) {
+    /* Make funny stuff to get random input */
+    random_the_seed(data);
+
+    ssl_seeded = TRUE;
+  }
+
+  /* check to see if we've been told to use an explicit SSL/TLS version */
+  switch(data->set.ssl.version) {
+  default:
+  case CURL_SSLVERSION_DEFAULT:
+    /* we try to figure out version */
+    req_method = SSLv23_client_method();
+    break;
+  case CURL_SSLVERSION_TLSv1:
+    req_method = TLSv1_client_method();
+    break;
+  case CURL_SSLVERSION_SSLv2:
+    req_method = SSLv2_client_method();
+    break;
+  case CURL_SSLVERSION_SSLv3:
+    req_method = SSLv3_client_method();
+    break;
+  }
+    
+  conn->ssl.ctx = SSL_CTX_new(req_method);
+
+  if(!conn->ssl.ctx) {
+    failf(data, "SSL: couldn't create a context!");
+    return CURLE_OUT_OF_MEMORY;
+  }
+    
+  if(data->set.cert) {
+    if (!cert_stuff(conn,
+                    data->set.cert,
+                    data->set.cert_type,
+                    data->set.key,
+                    data->set.key_type)) {
+      /* failf() is already done in cert_stuff() */
+      return CURLE_SSL_CERTPROBLEM;
+    }
+  }
+
+  if(data->set.ssl.cipher_list) {
+    if (!SSL_CTX_set_cipher_list(conn->ssl.ctx,
+                                 data->set.ssl.cipher_list)) {
+      failf(data, "failed setting cipher list");
+      return CURLE_SSL_CIPHER;
+    }
+  }
+
+  if(data->set.ssl.verifypeer){
+    SSL_CTX_set_verify(conn->ssl.ctx,
+                       SSL_VERIFY_PEER|SSL_VERIFY_FAIL_IF_NO_PEER_CERT|
+                       SSL_VERIFY_CLIENT_ONCE,
+                       cert_verify_callback);
+    if ((data->set.ssl.CAfile || data->set.ssl.CApath) &&
+        !SSL_CTX_load_verify_locations(conn->ssl.ctx,
+                                       data->set.ssl.CAfile,
+                                       data->set.ssl.CApath)) {
+      failf(data,"error setting certificate verify locations");
+      return CURLE_SSL_CACERT;
+    }
+  }
+  else
+    SSL_CTX_set_verify(conn->ssl.ctx, SSL_VERIFY_NONE, cert_verify_callback);
+
+
+  /* Lets make an SSL structure */
+  conn->ssl.handle = SSL_new (conn->ssl.ctx);
+  SSL_set_connect_state (conn->ssl.handle);
+
+  conn->ssl.server_cert = 0x0;
+
+  if(!conn->bits.reuse) {
+    /* We're not re-using a connection, check if there's a cached ID we
+       can/should use here! */
+    if(!Get_SSL_Session(conn, &ssl_sessionid)) {
+      /* we got a session id, use it! */
+      SSL_set_session(conn->ssl.handle, ssl_sessionid);
+      /* Informational message */
+      infof (data, "SSL re-using session ID\n");
+    }
+  }
+
+  /* pass the raw socket into the SSL layers */
+  SSL_set_fd(conn->ssl.handle, conn->firstsocket);
+
+  do {
+    fd_set writefd;
+    fd_set readfd;
+    struct timeval interval;
+    long timeout_ms;
+
+    /* Find out if any timeout is set. If not, use 300 seconds.
+       Otherwise, figure out the most strict timeout of the two possible one
+       and then how much time that has elapsed to know how much time we
+       allow for the connect call */
+    if(data->set.timeout || data->set.connecttimeout) {
+      double has_passed;
+
+      /* Evaluate in milliseconds how much time that has passed */
+      has_passed = Curl_tvdiff(Curl_tvnow(), data->progress.start);
+
+#ifndef min
+#define min(a, b)   ((a) < (b) ? (a) : (b))
+#endif
+
+      /* get the most strict timeout of the ones converted to milliseconds */
+      if(data->set.timeout &&
+         (data->set.timeout>data->set.connecttimeout))
+        timeout_ms = data->set.timeout*1000;
+      else
+        timeout_ms = data->set.connecttimeout*1000;
+      
+      /* subtract the passed time */
+      timeout_ms -= (long)has_passed;
+      
+      if(timeout_ms < 0) {
+        /* a precaution, no need to continue if time already is up */
+        failf(data, "SSL connection timeout");
+        return CURLE_OPERATION_TIMEOUTED;
+      }
+    }
+    else
+      /* no particular time-out has been set */
+      timeout_ms=300000; /* milliseconds, default to five minutes */
+
+
+    FD_ZERO(&writefd);
+    FD_ZERO(&readfd);
+
+    err = SSL_connect(conn->ssl.handle);
+
+    /* 1  is fine
+       0  is "not successful but was shut down controlled"
+       <0 is "handshake was not successful, because a fatal error occurred" */
+    if(1 != err) {
+      int detail = SSL_get_error(conn->ssl.handle, err);
+
+      if(SSL_ERROR_WANT_READ == detail)
+        FD_SET(conn->firstsocket, &readfd);
+      else if(SSL_ERROR_WANT_WRITE == detail)
+        FD_SET(conn->firstsocket, &writefd);
+      else {
+        /* untreated error */
+        char error_buffer[120]; /* OpenSSL documents that this must be at least
+                                   120 bytes long. */
+
+        detail = ERR_get_error(); /* Gets the earliest error code from the
+                                     thread's error queue and removes the
+                                     entry. */
+
+        switch(detail) {
+        case 0x1407E086:
+          /* 1407E086:
+             SSL routines:
+             SSL2_SET_CERTIFICATE:
+             certificate verify failed */
+        case 0x14090086:
+          /* 14090086:
+             SSL routines:
+             SSL3_GET_SERVER_CERTIFICATE:
+             certificate verify failed */
+          failf(data,
+                "SSL certificate problem, verify that the CA cert is OK");
+          return CURLE_SSL_CACERT;
+        default:
+          /* detail is already set to the SSL error above */
+          failf(data, "SSL: %s", ERR_error_string(detail, error_buffer));
+          /* OpenSSL 0.9.6 and later has a function named
+             ERRO_error_string_n() that takes the size of the buffer as a third
+             argument, and we should possibly switch to using that one in the
+             future. */
+          return CURLE_SSL_CONNECT_ERROR;
+        }
+      }
+    }
+    else
+      /* we have been connected fine, get out of the connect loop */
+      break;
+
+    interval.tv_sec = timeout_ms/1000;
+    timeout_ms -= interval.tv_sec*1000;
+
+    interval.tv_usec = timeout_ms*1000;
+
+    what = select(conn->firstsocket+1, &readfd, &writefd, NULL, &interval);
+    if(what > 0)
+      /* reabable or writable, go loop yourself */
+      continue;
+    else if(0 == what) {
+      /* timeout */
+      failf(data, "SSL connection timeout");
+      return CURLE_OPERATION_TIMEOUTED;
+    }
+    else
+      break; /* get out of loop */
+  } while(1);
+
+  /* Informational message */
+  infof (data, "SSL connection using %s\n",
+         SSL_get_cipher(conn->ssl.handle));
+
+  if(!ssl_sessionid) {
+    /* Since this is not a cached session ID, then we want to stach this one
+       in the cache! */
+    Store_SSL_Session(conn);
+  }
+
+  
+  /* Get server's certificate (note: beware of dynamic allocation) - opt */
+  /* major serious hack alert -- we should check certificates
+   * to authenticate the server; otherwise we risk man-in-the-middle
+   * attack
+   */
+
+  conn->ssl.server_cert = SSL_get_peer_certificate (conn->ssl.handle);
+  if(!conn->ssl.server_cert) {
+    failf(data, "SSL: couldn't get peer certificate!");
+    return CURLE_SSL_PEER_CERTIFICATE;
+  }
+  infof (data, "Server certificate:\n");
+  
+  str = X509_NAME_oneline (X509_get_subject_name (conn->ssl.server_cert),
+                           NULL, 0);
+  if(!str) {
+    failf(data, "SSL: couldn't get X509-subject!");
+    X509_free(conn->ssl.server_cert);
+    return CURLE_SSL_CONNECT_ERROR;
+  }
+  infof(data, "\t subject: %s\n", str);
+  CRYPTO_free(str);
+
+  certdate = X509_get_notBefore(conn->ssl.server_cert);
+  Curl_ASN1_UTCTIME_output(conn, "\t start date: ", certdate);
+
+  certdate = X509_get_notAfter(conn->ssl.server_cert);
+  Curl_ASN1_UTCTIME_output(conn, "\t expire date: ", certdate);
+
+  if (data->set.ssl.verifyhost) {
+    char peer_CN[257];
+    if (X509_NAME_get_text_by_NID(X509_get_subject_name(conn->ssl.server_cert),
+                                  NID_commonName,
+                                  peer_CN,
+                                  sizeof(peer_CN)) < 0) {
+      failf(data, "SSL: unable to obtain common name from peer certificate");
+      X509_free(conn->ssl.server_cert);
+      return CURLE_SSL_PEER_CERTIFICATE;
+    }
+
+    if (!cert_hostcheck(peer_CN, conn->hostname)) {
+      if (data->set.ssl.verifyhost > 1) {
+        failf(data, "SSL: certificate subject name '%s' does not match "
+              "target host name '%s'",
+              peer_CN, conn->hostname);
+        X509_free(conn->ssl.server_cert);
+        return CURLE_SSL_PEER_CERTIFICATE;
+      }
+      else
+        infof(data,
+              "\t common name: %s (does not match '%s')\n",
+              peer_CN, conn->hostname);
+    }
+    else
+      infof(data, "\t common name: %s (matched)\n", peer_CN);
+  }
+
+  str = X509_NAME_oneline (X509_get_issuer_name  (conn->ssl.server_cert),
+                           NULL, 0);
+  if(!str) {
+    failf(data, "SSL: couldn't get X509-issuer name!");
+    X509_free(conn->ssl.server_cert);
+    return CURLE_SSL_CONNECT_ERROR;
+  }
+  infof(data, "\t issuer: %s\n", str);
+  CRYPTO_free(str);
+
+  /* We could do all sorts of certificate verification stuff here before
+     deallocating the certificate. */
+
+  if(data->set.ssl.verifypeer) {
+    data->set.ssl.certverifyresult=SSL_get_verify_result(conn->ssl.handle);
+    if (data->set.ssl.certverifyresult != X509_V_OK) {
+      failf(data, "SSL certificate verify result: %d",
+            data->set.ssl.certverifyresult);
+      retcode = CURLE_SSL_PEER_CERTIFICATE;
+    }
+  }
+  else
+    data->set.ssl.certverifyresult=0;
+
+  X509_free(conn->ssl.server_cert);
+#else /* USE_SSLEAY */
+  /* this is for "-ansi -Wall -pedantic" to stop complaining!   (rabe) */
+  (void) conn;
+#endif
+  return retcode;
+}
diff --git a/main/source/curl/lib/ssluse.h b/main/source/curl/lib/ssluse.h
new file mode 100644
index 00000000..ca3cf2a4
--- /dev/null
+++ b/main/source/curl/lib/ssluse.h
@@ -0,0 +1,38 @@
+#ifndef __SSLUSE_H
+#define __SSLUSE_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: ssluse.h,v 1.14 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+#include "urldata.h"
+CURLcode Curl_SSLConnect(struct connectdata *conn);
+
+void Curl_SSL_init(void);    /* Global SSL init */
+void Curl_SSL_cleanup(void); /* Global SSL cleanup */
+
+/* init the SSL session ID cache */
+CURLcode Curl_SSL_InitSessions(struct SessionHandle *, long);
+void Curl_SSL_Close(struct connectdata *conn); /* close a SSL connection */
+
+/* tell the SSL stuff to close down all open information regarding 
+   connections (and thus session ID caching etc) */
+int Curl_SSL_Close_All(struct SessionHandle *data);
+#endif
diff --git a/main/source/curl/lib/strequal.c b/main/source/curl/lib/strequal.c
new file mode 100644
index 00000000..a9cd6cb6
--- /dev/null
+++ b/main/source/curl/lib/strequal.c
@@ -0,0 +1,112 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: strequal.c,v 1.22 2003/01/29 10:14:24 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#include <string.h>
+
+int curl_strequal(const char *first, const char *second)
+{
+#if defined(HAVE_STRCASECMP)
+  return !(strcasecmp)(first, second);
+#elif defined(HAVE_STRCMPI)
+  return !(strcmpi)(first, second);
+#elif defined(HAVE_STRICMP)
+  return !(stricmp)(first, second);
+#else
+  while (*first && *second) {
+    if (toupper(*first) != toupper(*second)) {
+      break;
+    }
+    first++;
+    second++;
+  }
+  return toupper(*first) == toupper(*second);
+#endif
+}
+
+int curl_strnequal(const char *first, const char *second, size_t max)
+{
+#if defined(HAVE_STRCASECMP)
+  return !strncasecmp(first, second, max);
+#elif defined(HAVE_STRCMPI)
+  return !strncmpi(first, second, max);
+#elif defined(HAVE_STRICMP)
+  return !strnicmp(first, second, max);
+#else
+  while (*first && *second && max) {
+    if (toupper(*first) != toupper(*second)) {
+      break;
+    }
+    max--;
+    first++;
+    second++;
+  }
+  if(0 == max)
+    return 1; /* they are equal this far */
+
+  return toupper(*first) == toupper(*second);
+#endif
+}
+
+#ifndef HAVE_STRLCAT
+/*
+ * The strlcat() function appends the NUL-terminated string src to the end
+ * of dst. It will append at most size - strlen(dst) - 1 bytes, NUL-termi-
+ * nating the result.
+ *
+ * The strlcpy() and strlcat() functions return the total length of the
+ * string they tried to create.  For strlcpy() that means the length of src.
+ * For strlcat() that means the initial length of dst plus the length of
+ * src. While this may seem somewhat confusing it was done to make trunca-
+ * tion detection simple.
+ *
+ * 
+ */
+size_t Curl_strlcat(char *dst, const char *src, size_t siz)
+{
+  char *d = dst;
+  const char *s = src;
+  size_t n = siz;
+  size_t dlen;
+
+  /* Find the end of dst and adjust bytes left but don't go past end */
+  while (n-- != 0 && *d != '\0')
+    d++;
+  dlen = d - dst;
+  n = siz - dlen;
+
+  if (n == 0)
+    return(dlen + strlen(s));
+  while (*s != '\0') {
+    if (n != 1) {
+      *d++ = *s;
+      n--;
+    }
+    s++;
+  }
+  *d = '\0';
+
+  return(dlen + (s - src));	/* count does not include NUL */
+}
+#endif
diff --git a/main/source/curl/lib/strequal.h b/main/source/curl/lib/strequal.h
new file mode 100644
index 00000000..a4eda572
--- /dev/null
+++ b/main/source/curl/lib/strequal.h
@@ -0,0 +1,44 @@
+#ifndef __STREQUAL_H
+#define __STREQUAL_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: strequal.h,v 1.12 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+
+/*
+ * These two actually are public functions.
+ */
+int curl_strequal(const char *first, const char *second);
+int curl_strnequal(const char *first, const char *second, size_t max);
+
+#define strequal(a,b) curl_strequal(a,b)
+#define strnequal(a,b,c) curl_strnequal(a,b,c)
+
+/* checkprefix() is a shorter version of the above, used when the first
+   argument is zero-byte terminated */
+#define checkprefix(a,b)    strnequal(a,b,strlen(a))
+
+#ifndef HAVE_STRLCAT
+#define strlcat(x,y,z) Curl_strlcat(x,y,z)
+size_t Curl_strlcat(char *dst, const char *src, size_t siz);
+#endif
+
+#endif
diff --git a/main/source/curl/lib/strtok.c b/main/source/curl/lib/strtok.c
new file mode 100644
index 00000000..e6f21967
--- /dev/null
+++ b/main/source/curl/lib/strtok.c
@@ -0,0 +1,66 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: strtok.c,v 1.11 2003/01/29 10:14:24 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#ifndef HAVE_STRTOK_R
+#include <stddef.h>
+#include <string.h>
+
+char *
+Curl_strtok_r(char *ptr, const char *sep, char **end)
+{
+  if (!ptr)
+    /* we got NULL input so then we get our last position instead */
+    ptr = *end;
+
+  /* pass all letters that are including in the separator string */
+  while (*ptr && strchr(sep, *ptr))
+    ++ptr;
+
+  if (*ptr) {
+    /* so this is where the next piece of string starts */
+    char *start = ptr;
+
+    /* set the end pointer to the first byte after the start */
+    *end = start + 1;
+
+    /* scan through the string to find where it ends, it ends on a
+       null byte or a character that exists in the separator string */
+    while (**end && !strchr(sep, **end))
+      ++*end;
+
+    if (**end) {
+      /* the end is not a null byte */
+      **end = '\0';  /* zero terminate it! */
+      ++*end;        /* advance the last pointer to beyond the null byte */
+    }
+
+    return start; /* return the position where the string starts */
+  }
+
+  /* we ended up on a null byte, there are no more strings to find! */
+  return NULL;
+}
+
+#endif /* this was only compiled if strtok_r wasn't present */
diff --git a/main/source/curl/lib/strtok.h b/main/source/curl/lib/strtok.h
new file mode 100644
index 00000000..43dabe58
--- /dev/null
+++ b/main/source/curl/lib/strtok.h
@@ -0,0 +1,38 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: strtok.h,v 1.8 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+
+#ifndef _CURL_STRTOK_R_H
+#define _CURL_STRTOK_R_H
+
+#include "setup.h"
+#include <stddef.h>
+
+#ifndef HAVE_STRTOK_R
+char *Curl_strtok_r(char *s, const char *delim, char **last);
+#define strtok_r Curl_strtok_r
+#else
+#include <string.h>
+#endif
+
+#endif
+
diff --git a/main/source/curl/lib/telnet.c b/main/source/curl/lib/telnet.c
new file mode 100644
index 00000000..1fe4df7a
--- /dev/null
+++ b/main/source/curl/lib/telnet.c
@@ -0,0 +1,1224 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: telnet.c,v 1.40 2003/03/12 08:44:00 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#ifndef CURL_DISABLE_TELNET
+/* -- WIN32 approved -- */
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <errno.h>
+
+#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
+#include <winsock2.h>
+#include <time.h>
+#include <io.h>
+#else
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#include <netinet/in.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <netdb.h>
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NET_IF_H
+#include <net/if.h>
+#endif
+#include <sys/ioctl.h>
+#include <signal.h>
+
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+
+#endif
+
+#include "urldata.h"
+#include <curl/curl.h>
+#include "transfer.h"
+#include "sendf.h"
+
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+#define  TELOPTS
+#define  TELCMDS
+
+#include "arpa_telnet.h"
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+#define SUBBUFSIZE 512
+
+#define CURL_SB_CLEAR(x)  x->subpointer = x->subbuffer;
+#define CURL_SB_TERM(x)   { x->subend = x->subpointer; CURL_SB_CLEAR(x); }
+#define CURL_SB_ACCUM(x,c) \
+  if (x->subpointer < (x->subbuffer+sizeof x->subbuffer)) { \
+    *x->subpointer++ = (c); \
+  }
+
+#define  CURL_SB_GET(x) ((*x->subpointer++)&0xff)
+#define  CURL_SB_PEEK(x)   ((*x->subpointer)&0xff)
+#define  CURL_SB_EOF(x) (x->subpointer >= x->subend)
+#define  CURL_SB_LEN(x) (x->subend - x->subpointer)
+
+static
+void telrcv(struct connectdata *,
+	    unsigned char *inbuf,	/* Data received from socket */
+	    int count);			/* Number of bytes received */
+
+static void printoption(struct SessionHandle *data,
+			const char *direction,
+			int cmd, int option);
+
+static void negotiate(struct connectdata *);
+static void send_negotiation(struct connectdata *, int cmd, int option);
+static void set_local_option(struct connectdata *, int cmd, int option);
+static void set_remote_option(struct connectdata *, int cmd, int option);
+
+static void printsub(struct SessionHandle *data,
+		     int direction, unsigned char *pointer, int length);
+static void suboption(struct connectdata *);
+
+/* For negotiation compliant to RFC 1143 */
+#define CURL_NO	         0
+#define CURL_YES 	 1
+#define CURL_WANTYES	 2
+#define CURL_WANTNO	 3
+
+#define CURL_EMPTY	 0
+#define CURL_OPPOSITE    1
+
+/*
+ * Telnet receiver states for fsm
+ */
+typedef enum
+{
+   CURL_TS_DATA = 0,
+   CURL_TS_IAC,
+   CURL_TS_WILL,
+   CURL_TS_WONT,
+   CURL_TS_DO,
+   CURL_TS_DONT,
+   CURL_TS_CR,
+   CURL_TS_SB,   /* sub-option collection */
+   CURL_TS_SE   /* looking for sub-option end */
+} TelnetReceive;
+
+struct TELNET {
+  int please_negotiate;
+  int already_negotiated;
+  int us[256]; 
+  int usq[256]; 
+  int us_preferred[256]; 
+  int him[256]; 
+  int himq[256]; 
+  int him_preferred[256]; 
+  char subopt_ttype[32];             /* Set with suboption TTYPE */
+  char subopt_xdisploc[128];          /* Set with suboption XDISPLOC */
+  struct curl_slist *telnet_vars; /* Environment variables */
+
+  /* suboptions */
+  char subbuffer[SUBBUFSIZE];
+  char *subpointer, *subend;      /* buffer for sub-options */
+  
+  TelnetReceive telrcv_state;
+};
+
+static
+CURLcode init_telnet(struct connectdata *conn)
+{
+  struct TELNET *tn;
+
+  tn = (struct TELNET *)malloc(sizeof(struct TELNET));
+  if(!tn)
+    return CURLE_OUT_OF_MEMORY;
+  
+  conn->proto.telnet = (void *)tn; /* make us known */
+
+  memset(tn, 0, sizeof(struct TELNET));
+
+  tn->telrcv_state = CURL_TS_DATA;
+
+  /* Init suboptions */
+  CURL_SB_CLEAR(tn);
+
+  /* Set all options to NO */
+#if 0
+  /* NO is zero => default fill pattern */
+  memset(tn->us, CURL_NO, 256);
+  memset(tn->usq, CURL_NO, 256);
+  memset(tn->us_preferred, CURL_NO, 256);
+  memset(tn->him, CURL_NO, 256);
+  memset(tn->himq, CURL_NO, 256);
+  memset(tn->him_preferred, CURL_NO, 256);
+#endif
+  /* Set the options we want by default */
+  tn->us_preferred[CURL_TELOPT_BINARY] = CURL_YES;
+  tn->us_preferred[CURL_TELOPT_SGA] = CURL_YES;
+  tn->him_preferred[CURL_TELOPT_BINARY] = CURL_YES;
+  tn->him_preferred[CURL_TELOPT_SGA] = CURL_YES;
+
+  return CURLE_OK;
+}
+
+static void negotiate(struct connectdata *conn)
+{
+  int i;
+  struct TELNET *tn = (struct TELNET *)conn->proto.telnet;
+   
+  for(i = 0;i < CURL_NTELOPTS;i++)
+  {
+    if(tn->us_preferred[i] == CURL_YES)
+      set_local_option(conn, i, CURL_YES);
+      
+    if(tn->him_preferred[i] == CURL_YES)
+      set_remote_option(conn, i, CURL_YES);
+  }
+}
+
+static void printoption(struct SessionHandle *data,
+			const char *direction, int cmd, int option)
+{
+  const char *fmt;
+  const char *opt;
+   
+  if (data->set.verbose)
+  {
+    if (cmd == CURL_IAC)
+    {
+      if (CURL_TELCMD_OK(option))
+        Curl_infof(data, "%s IAC %s\n", direction, CURL_TELCMD(option));
+      else
+        Curl_infof(data, "%s IAC %d\n", direction, option);
+    }
+    else
+    {
+      fmt = (cmd == CURL_WILL) ? "WILL" : (cmd == CURL_WONT) ? "WONT" :
+        (cmd == CURL_DO) ? "DO" : (cmd == CURL_DONT) ? "DONT" : 0;
+      if (fmt)
+      {
+        if (CURL_TELOPT_OK(option))
+          opt = CURL_TELOPT(option);
+        else if (option == CURL_TELOPT_EXOPL)
+          opt = "EXOPL";
+        else
+          opt = NULL;
+
+        if(opt)
+          Curl_infof(data, "%s %s %s\n", direction, fmt, opt);
+        else
+          Curl_infof(data, "%s %s %d\n", direction, fmt, option);
+      }
+      else
+        Curl_infof(data, "%s %d %d\n", direction, cmd, option);
+    }
+  }
+}
+
+static void send_negotiation(struct connectdata *conn, int cmd, int option)
+{
+   unsigned char buf[3];
+
+   buf[0] = CURL_IAC;
+   buf[1] = cmd;
+   buf[2] = option;
+   
+   (void)swrite(conn->firstsocket, buf, 3);
+   
+   printoption(conn->data, "SENT", cmd, option);
+}
+
+static
+void set_remote_option(struct connectdata *conn, int option, int newstate)
+{
+  struct TELNET *tn = (struct TELNET *)conn->proto.telnet;
+  if(newstate == CURL_YES)
+  {
+    switch(tn->him[option])
+    {
+      case CURL_NO:
+        tn->him[option] = CURL_WANTYES;
+        send_negotiation(conn, CURL_DO, option);
+        break;
+	 
+      case CURL_YES:
+        /* Already enabled */
+        break;
+	 
+      case CURL_WANTNO:
+        switch(tn->himq[option])
+        {
+          case CURL_EMPTY:
+            /* Already negotiating for CURL_YES, queue the request */
+            tn->himq[option] = CURL_OPPOSITE;
+            break;
+          case CURL_OPPOSITE:
+            /* Error: already queued an enable request */
+            break;
+        }
+        break;
+	 
+      case CURL_WANTYES:
+        switch(tn->himq[option])
+        {
+          case CURL_EMPTY:
+            /* Error: already negotiating for enable */
+            break;
+          case CURL_OPPOSITE:
+            tn->himq[option] = CURL_EMPTY;
+            break;
+        }
+        break;
+    }
+  }
+  else /* NO */
+  {
+    switch(tn->him[option])
+    {
+      case CURL_NO:
+        /* Already disabled */
+        break;
+	 
+      case CURL_YES:
+        tn->him[option] = CURL_WANTNO;
+        send_negotiation(conn, CURL_DONT, option);
+        break;
+	 
+      case CURL_WANTNO:
+        switch(tn->himq[option])
+        {
+          case CURL_EMPTY:
+            /* Already negotiating for NO */
+            break;
+          case CURL_OPPOSITE:
+            tn->himq[option] = CURL_EMPTY;
+            break;
+        }
+        break;
+	 
+      case CURL_WANTYES:
+        switch(tn->himq[option])
+        {
+          case CURL_EMPTY:
+            tn->himq[option] = CURL_OPPOSITE;
+            break;
+          case CURL_OPPOSITE:
+            break;
+        }
+        break;
+    }
+  }
+}
+
+static
+void rec_will(struct connectdata *conn, int option)
+{
+  struct TELNET *tn = (struct TELNET *)conn->proto.telnet;
+  switch(tn->him[option])
+  {
+    case CURL_NO:
+      if(tn->him_preferred[option] == CURL_YES)
+      {
+        tn->him[option] = CURL_YES;
+        send_negotiation(conn, CURL_DO, option);
+      }
+      else
+      {
+        send_negotiation(conn, CURL_DONT, option);
+      }
+      break;
+	 
+    case CURL_YES:
+      /* Already enabled */
+      break;
+	 
+    case CURL_WANTNO:
+      switch(tn->himq[option])
+      {
+        case CURL_EMPTY:
+          /* Error: DONT answered by WILL */
+          tn->him[option] = CURL_NO;
+          break;
+        case CURL_OPPOSITE:
+          /* Error: DONT answered by WILL */
+          tn->him[option] = CURL_YES;
+          tn->himq[option] = CURL_EMPTY;
+          break;
+      }
+      break;
+	 
+    case CURL_WANTYES:
+      switch(tn->himq[option])
+      {
+        case CURL_EMPTY:
+          tn->him[option] = CURL_YES;
+          break;
+        case CURL_OPPOSITE:
+          tn->him[option] = CURL_WANTNO;
+          tn->himq[option] = CURL_EMPTY;
+          send_negotiation(conn, CURL_DONT, option);
+          break;
+      }
+      break;
+  }
+}
+   
+static
+void rec_wont(struct connectdata *conn, int option)
+{
+  struct TELNET *tn = (struct TELNET *)conn->proto.telnet;
+  switch(tn->him[option])
+  {
+    case CURL_NO:
+      /* Already disabled */
+      break;
+	 
+    case CURL_YES:
+      tn->him[option] = CURL_NO;
+      send_negotiation(conn, CURL_DONT, option);
+      break;
+	 
+    case CURL_WANTNO:
+      switch(tn->himq[option])
+      {
+        case CURL_EMPTY:
+          tn->him[option] = CURL_NO;
+          break;
+	 
+        case CURL_OPPOSITE:
+          tn->him[option] = CURL_WANTYES;
+          tn->himq[option] = CURL_EMPTY;
+          send_negotiation(conn, CURL_DO, option);
+          break;
+      }
+      break;
+	 
+    case CURL_WANTYES:
+      switch(tn->himq[option])
+      {
+        case CURL_EMPTY:
+          tn->him[option] = CURL_NO;
+          break;
+        case CURL_OPPOSITE:
+          tn->him[option] = CURL_NO;
+          tn->himq[option] = CURL_EMPTY;
+          break;
+      }
+      break;
+  }
+}
+   
+static void
+set_local_option(struct connectdata *conn, int option, int newstate)
+{
+  struct TELNET *tn = (struct TELNET *)conn->proto.telnet;
+  if(newstate == CURL_YES)
+  {
+    switch(tn->us[option])
+    {
+      case CURL_NO:
+        tn->us[option] = CURL_WANTYES;
+        send_negotiation(conn, CURL_WILL, option);
+        break;
+	 
+      case CURL_YES:
+        /* Already enabled */
+        break;
+	 
+      case CURL_WANTNO:
+        switch(tn->usq[option])
+        {
+          case CURL_EMPTY:
+            /* Already negotiating for CURL_YES, queue the request */
+            tn->usq[option] = CURL_OPPOSITE;
+            break;
+          case CURL_OPPOSITE:
+            /* Error: already queued an enable request */
+            break;
+        }
+        break;
+	 
+      case CURL_WANTYES:
+        switch(tn->usq[option])
+        {
+          case CURL_EMPTY:
+            /* Error: already negotiating for enable */
+            break;
+          case CURL_OPPOSITE:
+            tn->usq[option] = CURL_EMPTY;
+            break;
+        }
+        break;
+    }
+  }
+  else /* NO */
+  {
+    switch(tn->us[option])
+    {
+      case CURL_NO:
+        /* Already disabled */
+        break;
+	 
+      case CURL_YES:
+        tn->us[option] = CURL_WANTNO;
+        send_negotiation(conn, CURL_WONT, option);
+        break;
+	 
+      case CURL_WANTNO:
+        switch(tn->usq[option])
+        {
+          case CURL_EMPTY:
+            /* Already negotiating for NO */
+            break;
+          case CURL_OPPOSITE:
+            tn->usq[option] = CURL_EMPTY;
+            break;
+        }
+        break;
+	 
+      case CURL_WANTYES:
+        switch(tn->usq[option])
+        {
+          case CURL_EMPTY:
+            tn->usq[option] = CURL_OPPOSITE;
+            break;
+          case CURL_OPPOSITE:
+            break;
+        }
+        break;
+    }
+  }
+}
+
+static
+void rec_do(struct connectdata *conn, int option)
+{
+  struct TELNET *tn = (struct TELNET *)conn->proto.telnet;
+  switch(tn->us[option])
+  {
+    case CURL_NO:
+      if(tn->us_preferred[option] == CURL_YES)
+      {
+        tn->us[option] = CURL_YES;
+        send_negotiation(conn, CURL_WILL, option);
+      }
+      else
+      {
+        send_negotiation(conn, CURL_WONT, option);
+      }
+      break;
+	 
+    case CURL_YES:
+      /* Already enabled */
+      break;
+	 
+    case CURL_WANTNO:
+      switch(tn->usq[option])
+      {
+        case CURL_EMPTY:
+          /* Error: DONT answered by WILL */
+          tn->us[option] = CURL_NO;
+          break;
+        case CURL_OPPOSITE:
+          /* Error: DONT answered by WILL */
+          tn->us[option] = CURL_YES;
+          tn->usq[option] = CURL_EMPTY;
+          break;
+      }
+      break;
+	 
+    case CURL_WANTYES:
+      switch(tn->usq[option])
+      {
+        case CURL_EMPTY:
+          tn->us[option] = CURL_YES;
+          break;
+        case CURL_OPPOSITE:
+          tn->us[option] = CURL_WANTNO;
+          tn->himq[option] = CURL_EMPTY;
+          send_negotiation(conn, CURL_WONT, option);
+          break;
+      }
+      break;
+  }
+}
+
+static   
+void rec_dont(struct connectdata *conn, int option)
+{
+  struct TELNET *tn = (struct TELNET *)conn->proto.telnet;
+  switch(tn->us[option])
+  {
+    case CURL_NO:
+      /* Already disabled */
+      break;
+	 
+    case CURL_YES:
+      tn->us[option] = CURL_NO;
+      send_negotiation(conn, CURL_WONT, option);
+      break;
+	 
+    case CURL_WANTNO:
+      switch(tn->usq[option])
+      {
+        case CURL_EMPTY:
+          tn->us[option] = CURL_NO;
+          break;
+	 
+        case CURL_OPPOSITE:
+          tn->us[option] = CURL_WANTYES;
+          tn->usq[option] = CURL_EMPTY;
+          send_negotiation(conn, CURL_WILL, option);
+          break;
+      }
+      break;
+	 
+    case CURL_WANTYES:
+      switch(tn->usq[option])
+      {
+        case CURL_EMPTY:
+          tn->us[option] = CURL_NO;
+          break;
+        case CURL_OPPOSITE:
+          tn->us[option] = CURL_NO;
+          tn->usq[option] = CURL_EMPTY;
+          break;
+      }
+      break;
+  }
+}
+
+
+static void printsub(struct SessionHandle *data,
+		     int direction,		/* '<' or '>' */
+		     unsigned char *pointer,	/* where suboption data is */
+		     int length)		/* length of suboption data */
+{
+  int i = 0;
+
+  if (data->set.verbose)
+  {
+    if (direction)
+    {
+      Curl_infof(data, "%s IAC SB ", (direction == '<')? "RCVD":"SENT");
+      if (length >= 3)
+      {
+        int j;
+
+        i = pointer[length-2];
+        j = pointer[length-1];
+
+        if (i != CURL_IAC || j != CURL_SE)
+        {
+          Curl_infof(data, "(terminated by ");
+          if (CURL_TELOPT_OK(i))
+            Curl_infof(data, "%s ", CURL_TELOPT(i));
+          else if (CURL_TELCMD_OK(i))
+            Curl_infof(data, "%s ", CURL_TELCMD(i));
+          else
+            Curl_infof(data, "%d ", i);
+          if (CURL_TELOPT_OK(j))
+            Curl_infof(data, "%s", CURL_TELOPT(j));
+          else if (CURL_TELCMD_OK(j))
+            Curl_infof(data, "%s", CURL_TELCMD(j));
+          else
+            Curl_infof(data, "%d", j);
+          Curl_infof(data, ", not IAC SE!) ");
+        }
+      }
+      length -= 2;
+    }
+    if (length < 1)
+    {
+      Curl_infof(data, "(Empty suboption?)");
+      return;
+    }
+
+    if (CURL_TELOPT_OK(pointer[0])) {
+      switch(pointer[0]) {
+        case CURL_TELOPT_TTYPE:
+        case CURL_TELOPT_XDISPLOC:
+        case CURL_TELOPT_NEW_ENVIRON:
+          Curl_infof(data, "%s", CURL_TELOPT(pointer[0]));
+          break;
+        default:
+          Curl_infof(data, "%s (unsupported)", CURL_TELOPT(pointer[0]));
+          break;
+      }
+    }
+    else
+      Curl_infof(data, "%d (unknown)", pointer[i]);
+
+    switch(pointer[1]) {
+      case CURL_TELQUAL_IS:
+        Curl_infof(data, " IS");
+        break;
+      case CURL_TELQUAL_SEND:
+        Curl_infof(data, " SEND");
+        break;
+      case CURL_TELQUAL_INFO:
+        Curl_infof(data, " INFO/REPLY");
+        break;
+      case CURL_TELQUAL_NAME:
+        Curl_infof(data, " NAME");
+        break;
+    }
+      
+    switch(pointer[0]) {
+      case CURL_TELOPT_TTYPE:
+      case CURL_TELOPT_XDISPLOC:
+        pointer[length] = 0;
+        Curl_infof(data, " \"%s\"", &pointer[2]);
+        break;
+      case CURL_TELOPT_NEW_ENVIRON:
+        if(pointer[1] == CURL_TELQUAL_IS) {
+          Curl_infof(data, " ");
+          for(i = 3;i < length;i++) {
+            switch(pointer[i]) {
+              case CURL_NEW_ENV_VAR:
+                Curl_infof(data, ", ");
+                break;
+              case CURL_NEW_ENV_VALUE:
+                Curl_infof(data, " = ");
+                break;
+              default:
+                Curl_infof(data, "%c", pointer[i]);
+                break;
+            }
+          }
+        }
+        break;
+      default:
+        for (i = 2; i < length; i++)
+          Curl_infof(data, " %.2x", pointer[i]);
+        break;
+    }
+      
+    if (direction)
+    {
+      Curl_infof(data, "\n");
+    }
+  }
+}
+
+static int check_telnet_options(struct connectdata *conn)
+{
+  struct curl_slist *head;
+  char option_keyword[128];
+  char option_arg[256];
+  char *buf;
+  struct SessionHandle *data = conn->data;
+  struct TELNET *tn = (struct TELNET *)conn->proto.telnet;
+
+  /* Add the user name as an environment variable if it
+     was given on the command line */
+  if(conn->bits.user_passwd)
+  {
+    char *buf = malloc(256);
+    sprintf(buf, "USER,%s", data->state.user);
+    tn->telnet_vars = curl_slist_append(tn->telnet_vars, buf);
+
+    tn->us_preferred[CURL_TELOPT_NEW_ENVIRON] = CURL_YES;
+  }
+
+  for(head = data->set.telnet_options; head; head=head->next) {
+    if(sscanf(head->data, "%127[^= ]%*[ =]%255s",
+              option_keyword, option_arg) == 2) {
+
+      /* Terminal type */
+      if(curl_strequal(option_keyword, "TTYPE")) {
+        strncpy(tn->subopt_ttype, option_arg, 31);
+        tn->subopt_ttype[31] = 0; /* String termination */
+        tn->us_preferred[CURL_TELOPT_TTYPE] = CURL_YES;
+        continue;
+      }
+
+      /* Display variable */
+      if(curl_strequal(option_keyword, "XDISPLOC")) {
+        strncpy(tn->subopt_xdisploc, option_arg, 127);
+        tn->subopt_xdisploc[127] = 0; /* String termination */
+        tn->us_preferred[CURL_TELOPT_XDISPLOC] = CURL_YES;
+        continue;
+      }
+
+      /* Environment variable */
+      if(curl_strequal(option_keyword, "NEW_ENV")) {
+        buf = strdup(option_arg);
+        if(!buf)
+          return CURLE_OUT_OF_MEMORY;
+        tn->telnet_vars = curl_slist_append(tn->telnet_vars, buf);
+        tn->us_preferred[CURL_TELOPT_NEW_ENVIRON] = CURL_YES;
+        continue;
+      }
+
+      failf(data, "Unknown telnet option %s", head->data);
+      return CURLE_UNKNOWN_TELNET_OPTION;
+    } else {
+      failf(data, "Syntax error in telnet option: %s", head->data);
+      return CURLE_TELNET_OPTION_SYNTAX;
+    }
+  }
+
+  return CURLE_OK;
+}
+
+/*
+ * suboption()
+ *
+ * Look at the sub-option buffer, and try to be helpful to the other
+ * side.
+ */
+
+static void suboption(struct connectdata *conn)
+{
+  struct curl_slist *v;
+  unsigned char subchar;
+  unsigned char temp[2048];
+  int len;
+  int tmplen;
+  char varname[128];
+  char varval[128];
+  struct SessionHandle *data = conn->data;
+  struct TELNET *tn = (struct TELNET *)conn->proto.telnet;
+
+  printsub(data, '<', (unsigned char *)tn->subbuffer, CURL_SB_LEN(tn)+2);
+  switch (subchar = CURL_SB_GET(tn)) {
+    case CURL_TELOPT_TTYPE:
+      len = strlen(tn->subopt_ttype) + 4 + 2;
+      snprintf((char *)temp, sizeof(temp),
+               "%c%c%c%c%s%c%c", CURL_IAC, CURL_SB, CURL_TELOPT_TTYPE,
+               CURL_TELQUAL_IS, tn->subopt_ttype, CURL_IAC, CURL_SE);
+      (void)swrite(conn->firstsocket, temp, len);
+      printsub(data, '>', &temp[2], len-2);
+      break;
+    case CURL_TELOPT_XDISPLOC:
+      len = strlen(tn->subopt_xdisploc) + 4 + 2;
+      snprintf((char *)temp, sizeof(temp),
+               "%c%c%c%c%s%c%c", CURL_IAC, CURL_SB, CURL_TELOPT_XDISPLOC,
+               CURL_TELQUAL_IS, tn->subopt_xdisploc, CURL_IAC, CURL_SE);
+      (void)swrite(conn->firstsocket, temp, len);
+      printsub(data, '>', &temp[2], len-2);
+      break;
+    case CURL_TELOPT_NEW_ENVIRON:
+      snprintf((char *)temp, sizeof(temp),
+               "%c%c%c%c", CURL_IAC, CURL_SB, CURL_TELOPT_NEW_ENVIRON,
+               CURL_TELQUAL_IS);
+      len = 4;
+
+      for(v = tn->telnet_vars;v;v = v->next) {
+        tmplen = (strlen(v->data) + 1);
+        /* Add the variable only if it fits */
+        if(len + tmplen < (int)sizeof(temp)-6) {
+          sscanf(v->data, "%127[^,],%s", varname, varval);
+          snprintf((char *)&temp[len], sizeof(temp) - len,
+                   "%c%s%c%s", CURL_NEW_ENV_VAR, varname,
+                   CURL_NEW_ENV_VALUE, varval);
+          len += tmplen;
+        }
+      }
+      snprintf((char *)&temp[len], sizeof(temp) - len,
+               "%c%c", CURL_IAC, CURL_SE);
+      len += 2;
+      (void)swrite(conn->firstsocket, temp, len);
+      printsub(data, '>', &temp[2], len-2);
+      break;
+  }
+  return;
+}
+
+static
+void telrcv(struct connectdata *conn,
+            unsigned char *inbuf,	/* Data received from socket */
+            int count)			/* Number of bytes received */
+{
+  unsigned char c;
+  int index = 0;
+  struct SessionHandle *data = conn->data;
+  struct TELNET *tn = (struct TELNET *)conn->proto.telnet;
+
+  while(count--)
+  {
+    c = inbuf[index++];
+
+    switch (tn->telrcv_state)
+    {
+      case CURL_TS_CR:
+        tn->telrcv_state = CURL_TS_DATA;
+        if (c == '\0')
+        {
+          break;   /* Ignore \0 after CR */
+        }
+
+        Curl_client_write(data, CLIENTWRITE_BODY, (char *)&c, 1);
+        continue;
+
+      case CURL_TS_DATA:
+        if (c == CURL_IAC)
+        {
+          tn->telrcv_state = CURL_TS_IAC;
+          break;
+        }
+        else if(c == '\r')
+        {
+          tn->telrcv_state = CURL_TS_CR;
+        }
+
+        Curl_client_write(data, CLIENTWRITE_BODY, (char *)&c, 1);
+        continue;
+
+      case CURL_TS_IAC:
+      process_iac:
+      switch (c)
+      {
+        case CURL_WILL:
+          tn->telrcv_state = CURL_TS_WILL;
+          continue;
+        case CURL_WONT:
+          tn->telrcv_state = CURL_TS_WONT;
+          continue;
+        case CURL_DO:
+          tn->telrcv_state = CURL_TS_DO;
+          continue;
+        case CURL_DONT:
+          tn->telrcv_state = CURL_TS_DONT;
+          continue;
+        case CURL_SB:
+          CURL_SB_CLEAR(tn);
+          tn->telrcv_state = CURL_TS_SB;
+          continue;
+        case CURL_IAC:
+          Curl_client_write(data, CLIENTWRITE_BODY, (char *)&c, 1);
+          break;
+        case CURL_DM:
+        case CURL_NOP:
+        case CURL_GA:
+        default:
+          printoption(data, "RCVD", CURL_IAC, c);
+          break;
+      }
+      tn->telrcv_state = CURL_TS_DATA;
+      continue;
+
+      case CURL_TS_WILL:
+        printoption(data, "RCVD", CURL_WILL, c);
+        tn->please_negotiate = 1;
+        rec_will(conn, c);
+        tn->telrcv_state = CURL_TS_DATA;
+        continue;
+      
+      case CURL_TS_WONT:
+        printoption(data, "RCVD", CURL_WONT, c);
+        tn->please_negotiate = 1;
+        rec_wont(conn, c);
+        tn->telrcv_state = CURL_TS_DATA;
+        continue;
+      
+      case CURL_TS_DO:
+        printoption(data, "RCVD", CURL_DO, c);
+        tn->please_negotiate = 1;
+        rec_do(conn, c);
+        tn->telrcv_state = CURL_TS_DATA;
+        continue;
+      
+      case CURL_TS_DONT:
+        printoption(data, "RCVD", CURL_DONT, c);
+        tn->please_negotiate = 1;
+        rec_dont(conn, c);
+        tn->telrcv_state = CURL_TS_DATA;
+        continue;
+
+      case CURL_TS_SB:
+        if (c == CURL_IAC)
+        {
+          tn->telrcv_state = CURL_TS_SE;
+        }
+        else
+        {
+          CURL_SB_ACCUM(tn,c);
+        }
+        continue;
+
+      case CURL_TS_SE:
+        if (c != CURL_SE)
+        {
+          if (c != CURL_IAC)
+          {
+            /*
+             * This is an error.  We only expect to get
+             * "IAC IAC" or "IAC SE".  Several things may
+             * have happend.  An IAC was not doubled, the
+             * IAC SE was left off, or another option got
+             * inserted into the suboption are all possibilities.
+             * If we assume that the IAC was not doubled,
+             * and really the IAC SE was left off, we could
+             * get into an infinate loop here.  So, instead,
+             * we terminate the suboption, and process the
+             * partial suboption if we can.
+             */
+            CURL_SB_ACCUM(tn, (unsigned char)CURL_IAC);
+            CURL_SB_ACCUM(tn, c);
+            tn->subpointer -= 2;
+            CURL_SB_TERM(tn);
+	    
+            printoption(data, "In SUBOPTION processing, RCVD", CURL_IAC, c);
+            suboption(conn);   /* handle sub-option */
+            tn->telrcv_state = CURL_TS_IAC;
+            goto process_iac;
+          }
+          CURL_SB_ACCUM(tn,c);
+          tn->telrcv_state = CURL_TS_SB;
+        }
+        else
+        {
+          CURL_SB_ACCUM(tn, (unsigned char)CURL_IAC);
+          CURL_SB_ACCUM(tn, (unsigned char)CURL_SE);
+          tn->subpointer -= 2;
+          CURL_SB_TERM(tn);
+          suboption(conn);   /* handle sub-option */
+          tn->telrcv_state = CURL_TS_DATA;
+        }
+        break;
+    }
+  }
+}
+
+CURLcode Curl_telnet_done(struct connectdata *conn)
+{
+  struct TELNET *tn = (struct TELNET *)conn->proto.telnet;
+  curl_slist_free_all(tn->telnet_vars);
+
+  free(conn->proto.telnet);
+  conn->proto.telnet = NULL;
+
+  return CURLE_OK;
+}
+
+CURLcode Curl_telnet(struct connectdata *conn)
+{
+  CURLcode code;
+  struct SessionHandle *data = conn->data;
+  int sockfd = conn->firstsocket;
+#ifdef WIN32
+  WSAEVENT event_handle;
+  WSANETWORKEVENTS events;
+  HANDLE stdin_handle;
+  HANDLE objs[2];
+  DWORD waitret;
+#else
+  fd_set readfd;
+  fd_set keepfd;
+#endif
+  bool keepon = TRUE;
+  char *buf = data->state.buffer;
+  ssize_t nread;
+  struct TELNET *tn;
+
+  code = init_telnet(conn);
+  if(code)
+    return code;
+
+  tn = (struct TELNET *)conn->proto.telnet;
+
+  code = check_telnet_options(conn);
+  if(code)
+    return code;
+
+#ifdef WIN32
+  /* We want to wait for both stdin and the socket. Since
+  ** the select() function in winsock only works on sockets
+  ** we have to use the WaitForMultipleObjects() call.
+  */
+
+  /* First, create a sockets event object */
+  event_handle = WSACreateEvent();
+
+  /* The get the Windows file handle for stdin */
+  stdin_handle = GetStdHandle(STD_INPUT_HANDLE);
+
+  /* Create the list of objects to wait for */
+  objs[0] = stdin_handle;
+  objs[1] = event_handle;
+
+  /* Tell winsock what events we want to listen to */
+  if(WSAEventSelect(sockfd, event_handle, FD_READ|FD_CLOSE) == SOCKET_ERROR) {
+    return 0;
+  }
+
+  /* Keep on listening and act on events */
+  while(keepon) {
+    waitret = WaitForMultipleObjects(2, objs, FALSE, INFINITE);
+    switch(waitret - WAIT_OBJECT_0)
+    {
+      case 0:
+      {
+        unsigned char outbuf[2];
+        int out_count = 0;
+        ssize_t bytes_written;
+        char *buffer = buf;
+              
+        if(!ReadFile(stdin_handle, buf, 255, (LPDWORD)&nread, NULL)) {
+          keepon = FALSE;
+          break;
+        }
+        
+        while(nread--) {
+          outbuf[0] = *buffer++;
+          out_count = 1;
+          if(outbuf[0] == CURL_IAC)
+            outbuf[out_count++] = CURL_IAC;
+          
+          Curl_write(conn, conn->firstsocket, outbuf,
+                     out_count, &bytes_written);
+        }
+      }
+      break;
+      
+      case 1:
+        if(WSAEnumNetworkEvents(sockfd, event_handle, &events)
+           != SOCKET_ERROR)
+        {
+          if(events.lNetworkEvents & FD_READ)
+          {
+            /* This reallu OUGHT to check its return code. */
+            Curl_read(conn, sockfd, buf, BUFSIZE - 1, &nread);
+            
+            telrcv(conn, (unsigned char *)buf, nread);
+            
+            fflush(stdout);
+            
+            /* Negotiate if the peer has started negotiating,
+               otherwise don't. We don't want to speak telnet with
+               non-telnet servers, like POP or SMTP. */
+            if(tn->please_negotiate && !tn->already_negotiated) {
+              negotiate(conn);
+              tn->already_negotiated = 1;
+            }
+          }
+          
+          if(events.lNetworkEvents & FD_CLOSE)
+          {
+            keepon = FALSE;
+          }
+        }
+        break;
+    }
+  }
+#else
+  FD_ZERO (&readfd);		/* clear it */
+  FD_SET (sockfd, &readfd);
+  FD_SET (0, &readfd);
+
+  keepfd = readfd;
+
+  while (keepon) {
+    struct timeval interval;
+
+    readfd = keepfd;		/* set this every lap in the loop */
+    interval.tv_sec = 1;
+    interval.tv_usec = 0;
+
+    switch (select (sockfd + 1, &readfd, NULL, NULL, &interval)) {
+    case -1:			/* error, stop reading */
+      keepon = FALSE;
+      continue;
+    case 0:			/* timeout */
+      break;
+    default:			/* read! */
+      if(FD_ISSET(0, &readfd)) { /* read from stdin */
+        unsigned char outbuf[2];
+        int out_count = 0;
+        ssize_t bytes_written;
+        char *buffer = buf;
+        
+        nread = read(0, buf, 255);
+
+        while(nread--) {
+          outbuf[0] = *buffer++;
+          out_count = 1;
+          if(outbuf[0] == CURL_IAC)
+            outbuf[out_count++] = CURL_IAC;
+      
+          Curl_write(conn, conn->firstsocket, outbuf,
+                     out_count, &bytes_written);
+        }
+      }
+
+      if(FD_ISSET(sockfd, &readfd)) {
+        /* This OUGHT to check the return code... */
+        Curl_read(conn, sockfd, buf, BUFSIZE - 1, &nread);
+
+        /* if we receive 0 or less here, the server closed the connection and
+           we bail out from this! */
+        if (nread <= 0) {
+          keepon = FALSE;
+          break;
+        }
+
+        telrcv(conn, (unsigned char *)buf, nread);
+
+        /* Negotiate if the peer has started negotiating,
+           otherwise don't. We don't want to speak telnet with
+           non-telnet servers, like POP or SMTP. */
+        if(tn->please_negotiate && !tn->already_negotiated) {
+          negotiate(conn);
+          tn->already_negotiated = 1;
+        }
+      }
+    }
+    if(data->set.timeout) {
+      struct timeval now;           /* current time */
+      now = Curl_tvnow();
+      if(Curl_tvdiff(now, conn->created)/1000 >= data->set.timeout) {
+        failf(data, "Time-out");
+        code = CURLE_OPERATION_TIMEOUTED;
+        keepon = FALSE;
+      }
+    }
+  }
+#endif
+  /* mark this as "no further transfer wanted" */
+  Curl_Transfer(conn, -1, -1, FALSE, NULL, -1, NULL);
+
+  return code;
+}
+#endif
diff --git a/main/source/curl/lib/telnet.h b/main/source/curl/lib/telnet.h
new file mode 100644
index 00000000..2940743a
--- /dev/null
+++ b/main/source/curl/lib/telnet.h
@@ -0,0 +1,30 @@
+#ifndef __TELNET_H
+#define __TELNET_H
+
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: telnet.h,v 1.10 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+#ifndef CURL_DISABLE_TELNET
+CURLcode Curl_telnet(struct connectdata *conn);
+CURLcode Curl_telnet_done(struct connectdata *conn);
+#endif
+#endif
diff --git a/main/source/curl/lib/timeval.c b/main/source/curl/lib/timeval.c
new file mode 100644
index 00000000..36fe780f
--- /dev/null
+++ b/main/source/curl/lib/timeval.c
@@ -0,0 +1,99 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: timeval.c,v 1.17 2003/01/29 10:14:24 bagder Exp $
+ ***************************************************************************/
+
+#ifdef WIN32
+#include <windows.h>
+#endif
+#include "timeval.h"
+
+#ifndef HAVE_GETTIMEOFDAY
+
+#ifdef WIN32
+int
+gettimeofday (struct timeval *tp, void *nothing)
+{
+#ifdef WITHOUT_MM_LIB
+  SYSTEMTIME st;
+  time_t tt;
+  struct tm tmtm;
+  /* mktime converts local to UTC */
+  GetLocalTime (&st);
+  tmtm.tm_sec = st.wSecond;
+  tmtm.tm_min = st.wMinute;
+  tmtm.tm_hour = st.wHour;
+  tmtm.tm_mday = st.wDay;
+  tmtm.tm_mon = st.wMonth - 1;
+  tmtm.tm_year = st.wYear - 1900;
+  tmtm.tm_isdst = -1;
+  tt = mktime (&tmtm);
+  tp->tv_sec = tt;
+  tp->tv_usec = st.wMilliseconds * 1000;
+#else
+  /**
+   ** The earlier time calculations using GetLocalTime
+   ** had a time resolution of 10ms.The timeGetTime, part
+   ** of multimedia apis offer a better time resolution
+   ** of 1ms.Need to link against winmm.lib for this
+   **/
+  unsigned long Ticks = 0;
+  unsigned long Sec =0;
+  unsigned long Usec = 0;
+  Ticks = timeGetTime();
+
+  Sec = Ticks/1000;
+  Usec = (Ticks - (Sec*1000))*1000;
+  tp->tv_sec = Sec;
+  tp->tv_usec = Usec;
+#endif
+  return 1;
+}
+#define HAVE_GETTIMEOFDAY
+#endif
+#endif
+
+struct timeval Curl_tvnow (void)
+{
+ struct timeval now;
+#ifdef HAVE_GETTIMEOFDAY
+ gettimeofday (&now, NULL);
+#else
+ now.tv_sec = (long) time(NULL);
+ now.tv_usec = 0;
+#endif
+ return now;
+}
+
+/*
+ * Make sure that the first argument is the more recent time, as otherwise
+ * we'll get a weird negative time-diff back...
+ */
+long Curl_tvdiff (struct timeval newer, struct timeval older)
+{
+  return (newer.tv_sec-older.tv_sec)*1000+
+    (499+newer.tv_usec-older.tv_usec)/1000;
+}
+
+long Curl_tvlong (struct timeval t1)
+{
+ return t1.tv_sec;
+}
diff --git a/main/source/curl/lib/timeval.h b/main/source/curl/lib/timeval.h
new file mode 100644
index 00000000..8e025ff8
--- /dev/null
+++ b/main/source/curl/lib/timeval.h
@@ -0,0 +1,52 @@
+#ifndef __TIMEVAL_H
+#define __TIMEVAL_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: timeval.h,v 1.12 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
+#include <time.h>
+#include <winsock.h>
+#else
+#include <sys/time.h>
+#endif
+
+
+#ifndef HAVE_GETTIMEOFDAY
+#if !defined(_WINSOCKAPI_) && !defined(__MINGW32__)
+struct timeval {
+ long tv_sec;
+ long tv_usec;
+};
+#endif
+#endif
+
+struct timeval Curl_tvnow (void);
+
+/* the diff is from now on returned in number of milliseconds! */
+long Curl_tvdiff (struct timeval t1, struct timeval t2);
+
+long Curl_tvlong (struct timeval t1);
+
+#endif
diff --git a/main/source/curl/lib/transfer.c b/main/source/curl/lib/transfer.c
new file mode 100644
index 00000000..8278085e
--- /dev/null
+++ b/main/source/curl/lib/transfer.c
@@ -0,0 +1,1755 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: transfer.c,v 1.150 2003/05/12 12:45:14 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+/* -- WIN32 approved -- */
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <errno.h>
+
+#include "strequal.h"
+
+#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
+#include <winsock.h>
+#include <time.h>
+#include <io.h>
+#else
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#include <netinet/in.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <netdb.h>
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NET_IF_H
+#include <net/if.h>
+#endif
+#include <sys/ioctl.h>
+#include <signal.h>
+
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+#ifndef HAVE_SELECT
+#error "We can't compile without select() support!"
+#endif
+#ifndef HAVE_SOCKET
+#error "We can't compile without socket() support!"
+#endif
+
+#endif
+
+#include "urldata.h"
+#include <curl/curl.h>
+#include <curl/types.h>
+#include "netrc.h"
+
+#include "content_encoding.h"   /* content encoding support. 08/27/02 jhrg */
+
+#include "hostip.h"
+#include "transfer.h"
+#include "sendf.h"
+#include "speedcheck.h"
+#include "getpass.h"
+#include "progress.h"
+#include "getdate.h"
+#include "http.h"
+#include "url.h"
+#include "getinfo.h"
+#include "ssluse.h"
+
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+#ifndef min
+#define min(a, b)   ((a) < (b) ? (a) : (b))
+#endif
+
+#define CURL_TIMEOUT_EXPECT_100 1000 /* counting ms here */
+
+enum {
+  KEEP_NONE,
+  KEEP_READ,
+  KEEP_WRITE
+};
+
+/* We keep this static and global since this is read-only and NEVER
+   changed. It should just remain a blanked-out timeout value. */
+static struct timeval notimeout={0,0};
+
+/*
+ * This function will call the read callback to fill our buffer with data
+ * to upload.
+ */
+static int fillbuffer(struct connectdata *conn,
+                      int bytes)
+{
+  int buffersize = bytes;
+  int nread;
+
+  if(conn->bits.upload_chunky) {
+    /* if chunked Transfer-Encoding */
+    buffersize -= (8 + 2 + 2);   /* 32bit hex + CRLF + CRLF */
+    conn->upload_fromhere += 10; /* 32bit hex + CRLF */
+  }
+  
+  nread = conn->fread(conn->upload_fromhere, 1,
+                      buffersize, conn->fread_in);
+          
+  if(!conn->bits.forbidchunk && conn->bits.upload_chunky) {
+    /* if chunked Transfer-Encoding */
+    char hexbuffer[11];
+    int hexlen = snprintf(hexbuffer, sizeof(hexbuffer),
+                          "%x\r\n", nread);
+    /* move buffer pointer */
+    conn->upload_fromhere -= hexlen;
+    nread += hexlen;
+
+    /* copy the prefix to the buffer */
+    memcpy(conn->upload_fromhere, hexbuffer, hexlen);
+    if(nread>hexlen) {
+      /* append CRLF to the data */
+      memcpy(conn->upload_fromhere +
+             nread, "\r\n", 2);
+      nread+=2;
+    }
+    else {
+      /* mark this as done once this chunk is transfered */
+      conn->keep.upload_done = TRUE;
+    }
+  }
+  return nread;
+}
+
+/*
+ * checkhttpprefix()
+ *
+ * Returns TRUE if member of the list matches prefix of string
+ */
+static bool
+checkhttpprefix(struct SessionHandle *data,
+                const char *s)
+{
+  struct curl_slist *head = data->set.http200aliases;
+
+  while (head) {
+    if (checkprefix(head->data, s))
+      return TRUE;
+    head = head->next;
+  }
+
+  if(checkprefix("HTTP/", s))
+    return TRUE;
+
+  return FALSE;
+}
+
+CURLcode Curl_readwrite(struct connectdata *conn,
+                        bool *done)
+{
+  struct Curl_transfer_keeper *k = &conn->keep;
+  struct SessionHandle *data = conn->data;
+  int result;
+  ssize_t nread; /* number of bytes read */
+  int didwhat=0;
+  
+  /* These two are used only if no other select() or _fdset() have been
+     invoked before this. This typicly happens if you use the multi interface
+     and call curl_multi_perform() without calling curl_multi_fdset()
+     first. */
+  fd_set extrareadfd;
+  fd_set extrawritefd;
+
+  fd_set *readfdp = k->readfdp;
+  fd_set *writefdp = k->writefdp;
+  
+  if((k->keepon & KEEP_READ) && !readfdp) {
+    /* reading is requested, but no socket descriptor pointer was set */
+    FD_ZERO(&extrareadfd);
+    FD_SET(conn->sockfd, &extrareadfd);
+    readfdp = &extrareadfd;
+
+    /* no write, no exceptions, no timeout */
+    select(conn->sockfd+1, readfdp, NULL, NULL, &notimeout);
+  }
+  if((k->keepon & KEEP_WRITE) && !writefdp) {
+    /* writing is requested, but no socket descriptor pointer was set */
+    FD_ZERO(&extrawritefd);
+    FD_SET(conn->writesockfd, &extrawritefd);
+    writefdp = &extrawritefd;
+
+    /* no read, no exceptions, no timeout */
+    select(conn->writesockfd+1, NULL, writefdp, NULL, &notimeout);
+  }
+
+  do {
+    /* If we still have reading to do, we check if we have a readable
+       socket. Sometimes the reafdp is NULL, it no fd_set was done using
+       the multi interface and then we can do nothing but to attempt a
+       read to be sure. */
+    if((k->keepon & KEEP_READ) &&
+       (FD_ISSET(conn->sockfd, readfdp))) {
+
+      bool readdone = TRUE;
+
+      /* This is where we loop until we have read everything there is to
+         read or we get a EWOULDBLOCK */
+      do {
+        int buffersize = data->set.buffer_size?
+          data->set.buffer_size:BUFSIZE -1;
+
+        /* receive data from the network! */
+        result = Curl_read(conn, conn->sockfd, k->buf, buffersize, &nread);
+
+        if(0>result)
+          break; /* get out of loop */
+        if(result>0)
+          return result;
+
+        if ((k->bytecount == 0) && (k->writebytecount == 0)) {
+          Curl_pgrsTime(data, TIMER_STARTTRANSFER);
+          if(k->wait100_after_headers)
+            /* set time stamp to compare with when waiting for the 100 */
+            k->start100 = Curl_tvnow();
+        }
+
+        didwhat |= KEEP_READ;
+
+        /* NULL terminate, allowing string ops to be used */
+        if (0 < nread)
+          k->buf[nread] = 0;
+
+        /* if we receive 0 or less here, the server closed the connection and
+           we bail out from this! */
+        else if (0 >= nread) {
+          k->keepon &= ~KEEP_READ;
+          FD_ZERO(&k->rkeepfd);
+          readdone = TRUE;
+          break;
+        }
+
+        /* Default buffer to use when we write the buffer, it may be changed
+           in the flow below before the actual storing is done. */
+        k->str = k->buf;
+
+        /* Since this is a two-state thing, we check if we are parsing
+           headers at the moment or not. */          
+        if (k->header) {
+          /* we are in parse-the-header-mode */
+          bool stop_reading = FALSE;
+
+          /* header line within buffer loop */
+          do {
+            int hbufp_index;
+              
+            /* str_start is start of line within buf */
+            k->str_start = k->str;
+              
+            k->end_ptr = strchr (k->str_start, '\n');
+              
+            if (!k->end_ptr) {
+              /* Not a complete header line within buffer, append the data to
+                 the end of the headerbuff. */
+
+              if (k->hbuflen + nread >= data->state.headersize) {
+                /* We enlarge the header buffer as it is too small */
+                char *newbuff;
+                long newsize=MAX((k->hbuflen+nread)*3/2,
+                                 data->state.headersize*2);
+                hbufp_index = k->hbufp - data->state.headerbuff;
+                newbuff = (char *)realloc(data->state.headerbuff, newsize);
+                if(!newbuff) {
+                  failf (data, "Failed to alloc memory for big header!");
+                  return CURLE_OUT_OF_MEMORY;
+                }
+                data->state.headersize=newsize;
+                data->state.headerbuff = newbuff;
+                k->hbufp = data->state.headerbuff + hbufp_index;
+              }
+              memcpy(k->hbufp, k->str, nread);
+              k->hbufp += nread;
+              k->hbuflen += nread;
+              if (!k->headerline && (k->hbuflen>5)) {
+                /* make a first check that this looks like a HTTP header */
+                if(!checkhttpprefix(data, data->state.headerbuff)) {
+                  /* this is not the beginning of a HTTP first header line */
+                  k->header = FALSE;
+                  k->badheader = HEADER_ALLBAD;
+                  break;
+                }
+              }
+
+              break; /* read more and try again */
+            }
+
+            /* decrease the size of the remaining buffer */
+            nread -= (k->end_ptr - k->str)+1; 
+
+            k->str = k->end_ptr + 1; /* move past new line */
+
+            /*
+             * We're about to copy a chunk of data to the end of the
+             * already received header. We make sure that the full string
+             * fit in the allocated header buffer, or else we enlarge 
+             * it.
+             */
+            if (k->hbuflen + (k->str - k->str_start) >=
+                data->state.headersize) {
+              char *newbuff;
+              long newsize=MAX((k->hbuflen+
+                                (k->str-k->str_start))*3/2,
+                               data->state.headersize*2);
+              hbufp_index = k->hbufp - data->state.headerbuff;
+              newbuff = (char *)realloc(data->state.headerbuff, newsize);
+              if(!newbuff) {
+                failf (data, "Failed to alloc memory for big header!");
+                return CURLE_OUT_OF_MEMORY;
+              }
+              data->state.headersize= newsize;
+              data->state.headerbuff = newbuff;
+              k->hbufp = data->state.headerbuff + hbufp_index;
+            }
+
+            /* copy to end of line */
+            strncpy (k->hbufp, k->str_start, k->str - k->str_start);
+            k->hbufp += k->str - k->str_start;
+            k->hbuflen += k->str - k->str_start;
+            *k->hbufp = 0;
+              
+            k->p = data->state.headerbuff;
+              
+            /****
+             * We now have a FULL header line that p points to
+             *****/
+
+            if(!k->headerline) {
+              /* the first read header */
+              if((k->hbuflen>5) &&
+                 !checkhttpprefix(data, data->state.headerbuff)) {
+                /* this is not the beginning of a HTTP first header line */
+                k->header = FALSE;
+                k->badheader = HEADER_PARTHEADER;
+                break;
+              }
+            }
+
+            if (('\n' == *k->p) || ('\r' == *k->p)) {
+              int headerlen;
+              /* Zero-length header line means end of headers! */
+
+              if ('\r' == *k->p)
+                k->p++; /* pass the \r byte */
+              if ('\n' == *k->p)
+                k->p++; /* pass the \n byte */
+
+              if(100 == k->httpcode) {
+                /*
+                 * We have made a HTTP PUT or POST and this is 1.1-lingo
+                 * that tells us that the server is OK with this and ready
+                 * to receive the data.
+                 * However, we'll get more headers now so we must get
+                 * back into the header-parsing state!
+                 */
+                k->header = TRUE;
+                k->headerline = 0; /* restart the header line counter */
+                /* if we did wait for this do enable write now! */
+                if (k->write_after_100_header) {
+
+                  k->write_after_100_header = FALSE;
+                  FD_SET (conn->writesockfd, &k->writefd); /* write */
+                  k->keepon |= KEEP_WRITE;
+                  k->wkeepfd = k->writefd;
+                }
+              }
+              else
+                k->header = FALSE; /* no more header to parse! */
+
+              if (417 == k->httpcode) {
+                /*
+                 * we got: "417 Expectation Failed" this means:
+                 * we have made a HTTP call and our Expect Header
+                 * seems to cause a problem => abort the write operations
+                 * (or prevent them from starting).
+                 */
+                k->write_after_100_header = FALSE;
+                k->keepon &= ~KEEP_WRITE;
+                FD_ZERO(&k->wkeepfd);
+              }
+
+              /* now, only output this if the header AND body are requested:
+               */
+              k->writetype = CLIENTWRITE_HEADER;
+              if (data->set.http_include_header)
+                k->writetype |= CLIENTWRITE_BODY;
+
+              headerlen = k->p - data->state.headerbuff;
+
+              result = Curl_client_write(data, k->writetype,
+                                         data->state.headerbuff,
+                                         headerlen);
+              if(result)
+                return result;
+
+              data->info.header_size += headerlen;
+              conn->headerbytecount += headerlen;
+
+              if(!k->header) {
+                /*
+                 * really end-of-headers.
+                 *
+                 * If we requested a "no body", this is a good time to get
+                 * out and return home.
+                 */
+                if(data->set.no_body)
+                  stop_reading = TRUE;
+                else if(!conn->bits.close) {
+                  /* If this is not the last request before a close, we must
+                     set the maximum download size to the size of the
+                     expected document or else, we won't know when to stop
+                     reading! */
+                  if(-1 != conn->size)
+                    conn->maxdownload = conn->size;
+                }
+                /* If max download size is *zero* (nothing) we already
+                   have nothing and can safely return ok now! */
+                if(0 == conn->maxdownload)
+                  stop_reading = TRUE;
+                    
+                if(stop_reading) {
+                  /* we make sure that this socket isn't read more now */
+                  k->keepon &= ~KEEP_READ;
+                  FD_ZERO(&k->rkeepfd);
+                }
+
+                break;          /* exit header line loop */
+              }
+
+              /* We continue reading headers, so reset the line-based
+                 header parsing variables hbufp && hbuflen */
+              k->hbufp = data->state.headerbuff;
+              k->hbuflen = 0;
+              continue;
+            }
+
+            /*
+             * Checks for special headers coming up.
+             */
+              
+            if (!k->headerline++) {
+              /* This is the first header, it MUST be the error code line
+                 or else we consiser this to be the body right away! */
+              int httpversion_major;
+              int nc=sscanf (k->p, " HTTP/%d.%d %3d",
+                             &httpversion_major,
+                             &k->httpversion,
+                             &k->httpcode);
+              if (nc==3) {
+                k->httpversion += 10 * httpversion_major;
+              }
+              else {
+                /* this is the real world, not a Nirvana
+                   NCSA 1.5.x returns this crap when asked for HTTP/1.1
+                */
+                nc=sscanf (k->p, " HTTP %3d", &k->httpcode);
+                k->httpversion = 10;
+               
+               /* If user has set option HTTP200ALIASES,
+                  compare header line against list of aliases
+               */
+                if (!nc) {
+                  if (checkhttpprefix(data, k->p)) {
+                    nc = 1;
+                    k->httpcode = 200;
+                    k->httpversion =
+                      (data->set.httpversion==CURL_HTTP_VERSION_1_0)? 10 : 11;
+                  }
+                }
+              }
+
+              if (nc) {
+                data->info.httpcode = k->httpcode;
+                data->info.httpversion = k->httpversion;
+
+                /* 404 -> URL not found! */
+                if (data->set.http_fail_on_error &&
+                    (k->httpcode >= 400)) {
+                  /* If we have been told to fail hard on HTTP-errors,
+                     here is the check for that: */
+                  /* serious error, go home! */
+                  failf (data, "The requested file was not found");
+                  return CURLE_HTTP_RETURNED_ERROR;
+                }
+
+                if(k->httpversion == 10)
+                  /* Default action for HTTP/1.0 must be to close, unless
+                     we get one of those fancy headers that tell us the
+                     server keeps it open for us! */
+                  conn->bits.close = TRUE;
+
+                switch(k->httpcode) {
+                case 204:
+                  /* (quote from RFC2616, section 10.2.5): The server has
+                   * fulfilled the request but does not need to return an
+                   * entity-body ... The 204 response MUST NOT include a
+                   * message-body, and thus is always terminated by the first
+                   * empty line after the header fields. */
+                  /* FALLTHROUGH */
+                case 304:
+                  /* (quote from RFC2616, section 10.3.5): The 304 response MUST
+                   * NOT contain a message-body, and thus is always terminated
+                   * by the first empty line after the header fields.  */
+                  conn->size=0;
+                  conn->maxdownload=0;
+                  break;
+                default:
+                  /* nothing */
+                  break;
+                }
+              }
+              else {
+                k->header = FALSE;   /* this is not a header line */
+                break;
+              }
+            }
+
+            /* check for Content-Length: header lines to get size */
+            if (checkprefix("Content-Length:", k->p) &&
+                sscanf (k->p+15, " %ld", &k->contentlength)) {
+              conn->size = k->contentlength;
+              Curl_pgrsSetDownloadSize(data, k->contentlength);
+            }
+            /* check for Content-Type: header lines to get the mime-type */
+            else if (checkprefix("Content-Type:", k->p)) {
+              char *start;
+              char *end;
+              int len;
+              
+              /* Find the first non-space letter */
+              for(start=k->p+13;
+                  *start && isspace((int)*start);
+                  start++);
+
+              end = strchr(start, '\r');
+              if(!end)
+                end = strchr(start, '\n');
+
+              if(end) {
+                /* skip all trailing space letters */
+                for(; isspace((int)*end) && (end > start); end--);
+
+                /* get length of the type */
+                len = end-start+1;
+              
+                /* allocate memory of a cloned copy */
+                if(data->info.contenttype)
+                  free(data->info.contenttype);
+              
+                data->info.contenttype = malloc(len + 1);
+                if (NULL == data->info.contenttype)
+                  return CURLE_OUT_OF_MEMORY;
+
+                /* copy the content-type string */
+                memcpy(data->info.contenttype, start, len);
+                data->info.contenttype[len] = 0; /* zero terminate */
+              }
+            }
+            else if((k->httpversion == 10) &&
+                    conn->bits.httpproxy &&
+                    Curl_compareheader(k->p,
+                                       "Proxy-Connection:", "keep-alive")) {
+              /*
+               * When a HTTP/1.0 reply comes when using a proxy, the
+               * 'Proxy-Connection: keep-alive' line tells us the
+               * connection will be kept alive for our pleasure.
+               * Default action for 1.0 is to close.
+               */
+              conn->bits.close = FALSE; /* don't close when done */
+              infof(data, "HTTP/1.0 proxy connection set to keep alive!\n");
+            }
+            else if((k->httpversion == 10) &&
+                    Curl_compareheader(k->p, "Connection:", "keep-alive")) {
+              /*
+               * A HTTP/1.0 reply with the 'Connection: keep-alive' line
+               * tells us the connection will be kept alive for our
+               * pleasure.  Default action for 1.0 is to close.
+               *
+               * [RFC2068, section 19.7.1] */
+              conn->bits.close = FALSE; /* don't close when done */
+              infof(data, "HTTP/1.0 connection set to keep alive!\n");
+            }
+            else if (Curl_compareheader(k->p, "Connection:", "close")) {
+              /*
+               * [RFC 2616, section 8.1.2.1]
+               * "Connection: close" is HTTP/1.1 language and means that
+               * the connection will close when this request has been
+               * served.
+               */
+              conn->bits.close = TRUE; /* close when done */
+            }
+            else if (Curl_compareheader(k->p,
+                                        "Transfer-Encoding:", "chunked")) {
+              /*
+               * [RFC 2616, section 3.6.1] A 'chunked' transfer encoding
+               * means that the server will send a series of "chunks". Each
+               * chunk starts with line with info (including size of the
+               * coming block) (terminated with CRLF), then a block of data
+               * with the previously mentioned size. There can be any amount
+               * of chunks, and a chunk-data set to zero signals the
+               * end-of-chunks. */
+              conn->bits.chunk = TRUE; /* chunks coming our way */
+
+              /* init our chunky engine */
+              Curl_httpchunk_init(conn);
+            }
+            else if (checkprefix("Content-Encoding:", k->p) &&
+                     data->set.encoding) {
+              /*
+               * Process Content-Encoding. Look for the values: identity,
+               * gzip, deflate, compress, x-gzip and x-compress. x-gzip and
+               * x-compress are the same as gzip and compress. (Sec 3.5 RFC
+               * 2616). zlib cannot handle compress.  However, errors are
+               * handled further down when the response body is processed
+               */
+              char *start;
+
+              /* Find the first non-space letter */
+              for(start=k->p+17;
+                  *start && isspace((int)*start);
+                  start++);
+
+              /* Record the content-encoding for later use. 08/27/02 jhrg */
+              if (checkprefix("identity", start))
+                k->content_encoding = IDENTITY;
+              else if (checkprefix("deflate", start))
+                k->content_encoding = DEFLATE;
+              else if (checkprefix("gzip", start) 
+                       || checkprefix("x-gzip", start))
+                k->content_encoding = GZIP;
+              else if (checkprefix("compress", start) 
+                       || checkprefix("x-compress", start))
+                k->content_encoding = COMPRESS;
+            }
+            else if (checkprefix("Content-Range:", k->p)) {
+              if (sscanf (k->p+14, " bytes %d-", &k->offset) ||
+                  sscanf (k->p+14, " bytes: %d-", &k->offset)) {
+                /* This second format was added August 1st 2000 by Igor
+                   Khristophorov since Sun's webserver JavaWebServer/1.1.1
+                   obviously sends the header this way! :-( */
+                if (conn->resume_from == k->offset) {
+                  /* we asked for a resume and we got it */
+                  k->content_range = TRUE;
+                }
+              }
+            }
+            else if(data->cookies &&
+                    checkprefix("Set-Cookie:", k->p)) {
+              Curl_cookie_add(data->cookies, TRUE, k->p+11,
+                              /* If there is a custom-set Host: name, use it
+                                 here, or else use real peer host name. */
+                              conn->allocptr.cookiehost?
+                              conn->allocptr.cookiehost:conn->name,
+                              conn->ppath);
+            }
+            else if(checkprefix("Last-Modified:", k->p) &&
+                    (data->set.timecondition || data->set.get_filetime) ) {
+              time_t secs=time(NULL);
+              k->timeofdoc = curl_getdate(k->p+strlen("Last-Modified:"),
+                                          &secs);
+              if(data->set.get_filetime)
+                data->info.filetime = k->timeofdoc;
+            }
+            else if ((k->httpcode >= 300 && k->httpcode < 400) &&
+                     (data->set.http_follow_location) &&
+                     checkprefix("Location:", k->p)) {
+              /* this is the URL that the server advices us to get instead */
+              char *ptr;
+              char *start=k->p;
+              char backup;
+
+              start += 9; /* pass "Location:" */
+
+              /* Skip spaces and tabs. We do this to support multiple
+                 white spaces after the "Location:" keyword. */
+              while(*start && isspace((int)*start ))
+                start++;
+              ptr = start; /* start scanning here */
+
+              /* scan through the string to find the end */
+              while(*ptr && !isspace((int)*ptr))
+                ptr++;
+              backup = *ptr; /* store the ending letter */
+              if(ptr != start) {
+                *ptr = '\0';   /* zero terminate */
+                conn->newurl = strdup(start); /* clone string */
+                *ptr = backup; /* restore ending letter */
+              }
+            }
+
+            /*
+             * End of header-checks. Write them to the client.
+             */
+
+            k->writetype = CLIENTWRITE_HEADER;
+            if (data->set.http_include_header)
+              k->writetype |= CLIENTWRITE_BODY;
+
+            if(data->set.verbose)
+              Curl_debug(data, CURLINFO_HEADER_IN,
+                         k->p, k->hbuflen);
+
+            result = Curl_client_write(data, k->writetype, k->p,
+                                       k->hbuflen);
+            if(result)
+              return result;
+
+            data->info.header_size += k->hbuflen;
+            conn->headerbytecount += k->hbuflen;
+              
+            /* reset hbufp pointer && hbuflen */
+            k->hbufp = data->state.headerbuff;
+            k->hbuflen = 0;
+          }
+          while (!stop_reading && *k->str); /* header line within buffer */
+
+          if(stop_reading)
+            /* We've stopped dealing with input, get out of the do-while loop */
+            break;
+
+          /* We might have reached the end of the header part here, but
+             there might be a non-header part left in the end of the read
+             buffer. */
+
+        }                       /* end if header mode */
+
+        /* This is not an 'else if' since it may be a rest from the header
+           parsing, where the beginning of the buffer is headers and the end
+           is non-headers. */
+        if (k->str && !k->header && (nread > 0)) {
+            
+          if(0 == k->bodywrites) {
+            /* These checks are only made the first time we are about to
+               write a piece of the body */
+            if(conn->protocol&PROT_HTTP) {
+              /* HTTP-only checks */
+              if (conn->newurl) {
+                /* abort after the headers if "follow Location" is set */
+                infof (data, "Follow to new URL: %s\n", conn->newurl);
+                k->keepon &= ~KEEP_READ;
+                FD_ZERO(&k->rkeepfd);
+                *done = TRUE;
+                return CURLE_OK;
+              }
+              else if (conn->resume_from &&
+                       !k->content_range &&
+                       (data->set.httpreq==HTTPREQ_GET)) {
+                /* we wanted to resume a download, although the server
+                   doesn't seem to support this and we did this with a GET
+                   (if it wasn't a GET we did a POST or PUT resume) */
+                failf (data, "HTTP server doesn't seem to support "
+                       "byte ranges. Cannot resume.");
+                return CURLE_HTTP_RANGE_ERROR;
+              }
+              else if(data->set.timecondition && !conn->range) {
+                /* A time condition has been set AND no ranges have been
+                   requested. This seems to be what chapter 13.3.4 of
+                   RFC 2616 defines to be the correct action for a
+                   HTTP/1.1 client */
+                if((k->timeofdoc > 0) && (data->set.timevalue > 0)) {
+                  switch(data->set.timecondition) {
+                  case TIMECOND_IFMODSINCE:
+                  default:
+                    if(k->timeofdoc < data->set.timevalue) {
+                      infof(data,
+                            "The requested document is not new enough\n");
+                      *done = TRUE;
+                      return CURLE_OK;
+                    }
+                    break;
+                  case TIMECOND_IFUNMODSINCE:
+                    if(k->timeofdoc > data->set.timevalue) {
+                      infof(data,
+                            "The requested document is not old enough\n");
+                      *done = TRUE;
+                      return CURLE_OK;
+                    }
+                    break;
+                  } /* switch */
+                } /* two valid time strings */
+              } /* we have a time condition */
+
+            } /* this is HTTP */
+          } /* this is the first time we write a body part */
+          k->bodywrites++;
+
+          /* pass data to the debug function before it gets "dechunked" */
+          if(data->set.verbose) {
+            if(k->badheader) {
+              Curl_debug(data, CURLINFO_DATA_IN, data->state.headerbuff,
+                         k->hbuflen);
+              if(k->badheader == HEADER_PARTHEADER)
+                Curl_debug(data, CURLINFO_DATA_IN, k->str, nread);
+            }
+            else
+              Curl_debug(data, CURLINFO_DATA_IN, k->str, nread);
+          }
+
+          if(conn->bits.chunk) {
+            /*
+             * Bless me father for I have sinned. Here comes a chunked
+             * transfer flying and we need to decode this properly.  While
+             * the name says read, this function both reads and writes away
+             * the data. The returned 'nread' holds the number of actual
+             * data it wrote to the client.  */
+            CHUNKcode res =
+              Curl_httpchunk_read(conn, k->str, nread, &nread);
+
+            if(CHUNKE_OK < res) {
+              if(CHUNKE_WRITE_ERROR == res) {
+                failf(data, "Failed writing data");
+                return CURLE_WRITE_ERROR;
+              }
+              failf(data, "Received problem %d in the chunky parser", res);
+              return CURLE_RECV_ERROR;
+            }
+            else if(CHUNKE_STOP == res) {
+              /* we're done reading chunks! */
+              k->keepon &= ~KEEP_READ; /* read no more */
+              FD_ZERO(&k->rkeepfd);
+
+              /* There are now possibly N number of bytes at the end of the
+                 str buffer that weren't written to the client, but we don't
+                 care about them right now. */
+            }
+            /* If it returned OK, we just keep going */
+          }
+
+          if((-1 != conn->maxdownload) &&
+             (k->bytecount + nread >= conn->maxdownload)) {
+            nread = conn->maxdownload - k->bytecount;
+            if(nread < 0 ) /* this should be unusual */
+              nread = 0;
+
+            k->keepon &= ~KEEP_READ; /* we're done reading */
+            FD_ZERO(&k->rkeepfd);
+          }
+
+          k->bytecount += nread;
+
+          Curl_pgrsSetDownloadCounter(data, (double)k->bytecount);
+            
+          if(!conn->bits.chunk && (nread || k->badheader)) {
+            /* If this is chunky transfer, it was already written */
+
+            if(k->badheader) {
+              /* we parsed a piece of data wrongly assuming it was a header
+                 and now we output it as body instead */
+              result = Curl_client_write(data, CLIENTWRITE_BODY,
+                                         data->state.headerbuff,
+                                         k->hbuflen);
+            }
+            if(k->badheader < HEADER_ALLBAD) {
+              /* This switch handles various content encodings. If there's an
+                 error here, be sure to check over the almost identical code
+                 in http_chunks.c. 08/29/02 jhrg
+                 Make sure that ALL_CONTENT_ENCODINGS contains all the
+                 encodings handled here. */
+#ifdef HAVE_LIBZ
+              switch (k->content_encoding) {
+              case IDENTITY:
+#endif
+                /* This is the default when the server sends no
+                   Content-Encoding header. See Curl_readwrite_init; the
+                   memset() call initializes k->content_encoding to zero.
+                   08/28/02 jhrg */
+                result = Curl_client_write(data, CLIENTWRITE_BODY, k->str, 
+                                           nread);
+#ifdef HAVE_LIBZ
+                break;
+
+              case DEFLATE: 
+                /* Assume CLIENTWRITE_BODY; headers are not encoded. */
+                result = Curl_unencode_deflate_write(data, k, nread);
+                break;
+
+              case GZIP:
+                /* Assume CLIENTWRITE_BODY; headers are not encoded. */
+                result = Curl_unencode_gzip_write(data, k, nread);
+                break;
+
+              case COMPRESS:          /* FIXME 08/27/02 jhrg */
+              default:
+                failf (data, "Unrecognized content encoding type. "
+                       "libcurl understands `identity', `deflate' and `gzip' "
+                       "content encodings.");
+                result = CURLE_BAD_CONTENT_ENCODING;
+                break;
+              }
+#endif
+            }
+            k->badheader = HEADER_NORMAL; /* taken care of now */
+
+            if(result)
+              return result;
+          }
+
+        } /* if (! header and data to read ) */
+
+      } while(!readdone);
+
+    } /* if( read from socket ) */
+
+    /* If we still have writing to do, we check if we have a writable
+       socket. Sometimes the writefdp is NULL, it no fd_set was done using
+       the multi interface and then we can do nothing but to attempt a
+       write to be sure. */
+    if((k->keepon & KEEP_WRITE) &&
+       (FD_ISSET(conn->writesockfd, writefdp)) ) {
+      /* write */
+
+      int i, si;
+      ssize_t bytes_written;
+      bool writedone=TRUE;
+
+      if ((k->bytecount == 0) && (k->writebytecount == 0))
+        Curl_pgrsTime(data, TIMER_STARTTRANSFER);
+
+      didwhat |= KEEP_WRITE;
+
+      /*
+       * We loop here to do the READ and SEND loop until we run out of
+       * data to send or until we get EWOULDBLOCK back
+       */
+      do {
+        
+        /* only read more data if there's no upload data already
+           present in the upload buffer */
+        if(0 == conn->upload_present) {
+          /* init the "upload from here" pointer */
+          conn->upload_fromhere = k->uploadbuf;
+
+          if(!k->upload_done) {
+            /* HTTP pollution, this should be written nicer to become more
+               protocol agnostic. */
+
+            if(k->wait100_after_headers &&
+               (conn->proto.http->sending == HTTPSEND_BODY)) {
+              /* If this call is to send body data, we must take some action:
+                 We have sent off the full HTTP 1.1 request, and we shall now
+                 go into the Expect: 100 state and await such a header */
+              k->wait100_after_headers = FALSE; /* headers sent */
+              k->write_after_100_header = TRUE; /* wait for the header */
+              FD_ZERO (&k->writefd);            /* clear it */
+              k->wkeepfd = k->writefd;          /* set the keeper variable */
+              k->keepon &= ~KEEP_WRITE;         /* disable writing */
+              k->start100 = Curl_tvnow();       /* timeout count starts now */
+              didwhat &= ~KEEP_WRITE;  /* we didn't write anything actually */
+              break;
+            }
+
+            nread = fillbuffer(conn, BUFSIZE);
+          }
+          else
+            nread = 0; /* we're done uploading/reading */
+
+          /* the signed int typecase of nread of for systems that has
+             unsigned size_t */
+          if (nread<=0) {
+            /* done */
+            k->keepon &= ~KEEP_WRITE; /* we're done writing */
+            FD_ZERO(&k->wkeepfd);
+            writedone = TRUE;
+            break;
+          }
+
+          /* store number of bytes available for upload */
+          conn->upload_present = nread;
+
+          /* convert LF to CRLF if so asked */
+          if (data->set.crlf) {
+              if(data->state.scratch == NULL)
+                data->state.scratch = malloc(2*BUFSIZE);
+              if(data->state.scratch == NULL) {
+                failf (data, "Failed to alloc scratch buffer!");
+                return CURLE_OUT_OF_MEMORY;
+              }
+            for(i = 0, si = 0; i < nread; i++, si++) {
+              if (conn->upload_fromhere[i] == 0x0a) {
+                data->state.scratch[si++] = 0x0d;
+                data->state.scratch[si] = 0x0a;
+              }
+              else
+                data->state.scratch[si] = conn->upload_fromhere[i];
+            }
+            if(si != nread) {
+              /* only perform the special operation if we really did replace
+                 anything */
+              nread = si;
+
+              /* upload from the new (replaced) buffer instead */
+              conn->upload_fromhere = data->state.scratch;
+
+              /* set the new amount too */
+              conn->upload_present = nread;
+            }
+          }
+        }
+        else {
+          /* We have a partial buffer left from a previous "round". Use
+             that instead of reading more data */
+        }
+
+        /* write to socket (send away data) */
+        result = Curl_write(conn,
+                            conn->writesockfd,     /* socket to send to */
+                            conn->upload_fromhere, /* buffer pointer */
+                            conn->upload_present,  /* buffer size */
+                            &bytes_written);       /* actually send away */
+        if(result)
+          return result;
+
+        if(data->set.verbose)
+          /* show the data before we change the pointer upload_fromhere */
+          Curl_debug(data, CURLINFO_DATA_OUT, conn->upload_fromhere,
+                     bytes_written);
+      
+        if(conn->upload_present != bytes_written) {
+          /* we only wrote a part of the buffer (if anything), deal with it! */
+
+          /* store the amount of bytes left in the buffer to write */
+          conn->upload_present -= bytes_written;
+
+          /* advance the pointer where to find the buffer when the next send
+             is to happen */
+          conn->upload_fromhere += bytes_written;
+
+          writedone = TRUE; /* we are done, stop the loop */
+        }
+        else {
+          /* we've uploaded that buffer now */
+          conn->upload_fromhere = k->uploadbuf;
+          conn->upload_present = 0; /* no more bytes left */
+
+          if(k->upload_done) {
+            /* switch off writing, we're done! */
+            k->keepon &= ~KEEP_WRITE; /* we're done writing */
+            FD_ZERO(&k->wkeepfd);
+            writedone = TRUE;
+          }
+        }
+
+        k->writebytecount += bytes_written;
+        Curl_pgrsSetUploadCounter(data, (double)k->writebytecount);
+
+      } while(!writedone); /* loop until we're done writing! */
+      
+    }
+
+  } while(0); /* just to break out from! */
+
+  k->now = Curl_tvnow();
+  if(didwhat) {
+    /* Update read/write counters */
+    if(conn->bytecountp)
+      *conn->bytecountp = k->bytecount; /* read count */
+    if(conn->writebytecountp)
+      *conn->writebytecountp = k->writebytecount; /* write count */
+  }
+  else {
+    /* no read no write, this is a timeout? */
+    if (k->write_after_100_header) {
+      /* This should allow some time for the header to arrive, but only a
+         very short time as otherwise it'll be too much wasted times too
+         often. */
+
+      /* Quoting RFC2616, section "8.2.3 Use of the 100 (Continue) Status":
+         
+      Therefore, when a client sends this header field to an origin server
+      (possibly via a proxy) from which it has never seen a 100 (Continue)
+      status, the client SHOULD NOT wait for an indefinite period before
+      sending the request body.
+
+      */
+
+      int ms = Curl_tvdiff(k->now, k->start100);
+      if(ms > CURL_TIMEOUT_EXPECT_100) {
+        /* we've waited long enough, continue anyway */
+        k->write_after_100_header = FALSE;
+        FD_SET (conn->writesockfd, &k->writefd); /* write socket */
+        k->keepon |= KEEP_WRITE;
+        k->wkeepfd = k->writefd;
+      }
+    }    
+  }
+
+  if(Curl_pgrsUpdate(conn))
+    result = CURLE_ABORTED_BY_CALLBACK;
+  else
+    result = Curl_speedcheck (data, k->now);
+  if (result)
+    return result;
+    
+  if (data->set.timeout &&
+      ((Curl_tvdiff(k->now, k->start)/1000) >= data->set.timeout)) {
+    failf (data, "Operation timed out with %d out of %d bytes received",
+           k->bytecount, conn->size);
+    return CURLE_OPERATION_TIMEOUTED;
+  }
+
+  if(!k->keepon) {
+    /*
+     * The transfer has been performed. Just make some general checks before
+     * returning.
+     */
+
+    if(!(data->set.no_body) && k->contentlength &&
+       (k->bytecount != k->contentlength) &&
+       !conn->newurl) {
+      failf(data, "transfer closed with %d bytes remaining to read",
+            k->contentlength-k->bytecount);
+      return CURLE_PARTIAL_FILE;
+    }
+    else if(conn->bits.chunk && conn->proto.http->chunk.datasize) {
+      failf(data, "transfer closed with at least %d bytes remaining",
+            conn->proto.http->chunk.datasize);
+      return CURLE_PARTIAL_FILE;
+    }
+    if(Curl_pgrsUpdate(conn))
+      return CURLE_ABORTED_BY_CALLBACK;
+  }
+
+  /* Now update the "done" boolean we return */
+  *done = !k->keepon;
+
+  return CURLE_OK;
+}
+
+CURLcode Curl_readwrite_init(struct connectdata *conn)
+{
+  struct SessionHandle *data = conn->data;
+  struct Curl_transfer_keeper *k = &conn->keep;
+
+  /* NB: the content encoding software depends on this initialization of
+     Curl_transfer_keeper. 08/28/02 jhrg */
+  memset(k, 0, sizeof(struct Curl_transfer_keeper));
+
+  k->start = Curl_tvnow(); /* start time */
+  k->now = k->start;   /* current time is now */
+  k->header = TRUE; /* assume header */
+  k->httpversion = -1; /* unknown at this point */
+
+  data = conn->data; /* there's the root struct */
+  k->buf = data->state.buffer;
+  k->uploadbuf = data->state.uploadbuffer;
+  k->maxfd = (conn->sockfd>conn->writesockfd?
+              conn->sockfd:conn->writesockfd)+1;
+  k->hbufp = data->state.headerbuff;
+
+  Curl_pgrsTime(data, TIMER_PRETRANSFER);
+  Curl_speedinit(data);
+
+  Curl_pgrsSetUploadCounter(data, 0);
+  Curl_pgrsSetDownloadCounter(data, 0);
+
+  if (!conn->bits.getheader) {
+    k->header = FALSE;
+    if(conn->size > 0)
+      Curl_pgrsSetDownloadSize(data, conn->size);
+  }
+  /* we want header and/or body, if neither then don't do this! */
+  if(conn->bits.getheader || !data->set.no_body) {
+
+    FD_ZERO (&k->readfd);               /* clear it */
+    if(conn->sockfd != -1) {
+      FD_SET (conn->sockfd, &k->readfd); /* read socket */
+      k->keepon |= KEEP_READ;
+    }
+
+    FD_ZERO (&k->writefd);              /* clear it */
+    if(conn->writesockfd != -1) {
+      /* HTTP 1.1 magic:
+
+         Even if we require a 100-return code before uploading data, we might
+         need to write data before that since the REQUEST may not have been
+         finished sent off just yet.
+
+         Thus, we must check if the request has been sent before we set the
+         state info where we wait for the 100-return code
+      */
+      if (data->set.expect100header &&
+          (conn->proto.http->sending == HTTPSEND_BODY)) {
+        /* wait with write until we either got 100-continue or a timeout */
+        k->write_after_100_header = TRUE;
+        k->start100 = k->start;
+      }
+      else {
+        if(data->set.expect100header)
+          /* when we've sent off the rest of the headers, we must await a
+             100-continue */
+          k->wait100_after_headers = TRUE;
+        FD_SET (conn->writesockfd, &k->writefd); /* write socket */
+        k->keepon |= KEEP_WRITE;
+      }
+    }
+
+    /* get these in backup variables to be able to restore them on each lap in
+       the select() loop */
+    k->rkeepfd = k->readfd;
+    k->wkeepfd = k->writefd;
+
+  }
+
+  return CURLE_OK;
+}
+
+void Curl_single_fdset(struct connectdata *conn,
+                       fd_set *read_fd_set,
+                       fd_set *write_fd_set,
+                       fd_set *exc_fd_set,
+                       int *max_fd)
+{
+  *max_fd = -1; /* init */
+  if(conn->keep.keepon & KEEP_READ) {
+    FD_SET(conn->sockfd, read_fd_set);
+    *max_fd = conn->sockfd;
+    conn->keep.readfdp = read_fd_set; /* store the address of the set */
+  }
+  if(conn->keep.keepon & KEEP_WRITE) {
+    FD_SET(conn->writesockfd, write_fd_set);
+    if(conn->writesockfd > *max_fd)
+      *max_fd = conn->writesockfd;
+    conn->keep.writefdp = write_fd_set; /* store the address of the set */
+  }
+  /* we don't use exceptions, only touch that one to prevent compiler
+     warnings! */
+  *exc_fd_set = *exc_fd_set;
+}
+
+
+/*
+ * Transfer()
+ *
+ * This function is what performs the actual transfer. It is capable of
+ * doing both ways simultaneously.
+ * The transfer must already have been setup by a call to Curl_Transfer().
+ *
+ * Note that headers are created in a preallocated buffer of a default size.
+ * That buffer can be enlarged on demand, but it is never shrinken again.
+ *
+ * Parts of this function was once written by the friendly Mark Butler
+ * <butlerm@xmission.com>.
+ */
+
+static CURLcode
+Transfer(struct connectdata *conn)
+{
+  struct SessionHandle *data = conn->data;
+  CURLcode result;
+  struct Curl_transfer_keeper *k = &conn->keep;
+  bool done=FALSE;
+
+  Curl_readwrite_init(conn);
+
+  if((conn->sockfd == -1) && (conn->writesockfd == -1))
+    /* nothing to read, nothing to write, we're already OK! */
+    return CURLE_OK;
+
+  /* we want header and/or body, if neither then don't do this! */
+  if(!conn->bits.getheader && data->set.no_body)
+    return CURLE_OK;
+
+  k->writefdp = &k->writefd; /* store the address of the set */
+  k->readfdp = &k->readfd;   /* store the address of the set */
+
+  while (!done) {
+    struct timeval interval;
+    k->readfd = k->rkeepfd;  /* set these every lap in the loop */
+    k->writefd = k->wkeepfd;
+    interval.tv_sec = 1;
+    interval.tv_usec = 0;
+
+    switch (select (k->maxfd, k->readfdp, k->writefdp, NULL, &interval)) {
+    case -1: /* select() error, stop reading */
+#ifdef EINTR
+      /* The EINTR is not serious, and it seems you might get this more
+         ofen when using the lib in a multi-threaded environment! */
+      if(errno == EINTR)
+        ;
+      else
+#endif
+        done = TRUE; /* no more read or write */
+      continue;
+    case 0:  /* timeout */
+      result = Curl_readwrite(conn, &done);
+      break;
+
+    default: /* readable descriptors */
+      result = Curl_readwrite(conn, &done);
+      break;
+    }
+    if(result)
+      return result;
+    
+    /* "done" signals to us if the transfer(s) are ready */
+  }
+
+  return CURLE_OK;
+}
+
+CURLcode Curl_pretransfer(struct SessionHandle *data)
+{
+  if(!data->change.url)
+    /* we can't do anything wihout URL */
+    return CURLE_URL_MALFORMAT;
+
+#ifdef USE_SSLEAY
+  /* Init the SSL session ID cache here. We do it here since we want to
+     do it after the *_setopt() calls (that could change the size) but
+     before any transfer. */
+  Curl_SSL_InitSessions(data, data->set.ssl.numsessions);
+#endif
+
+  data->set.followlocation=0; /* reset the location-follow counter */
+  data->state.this_is_a_follow = FALSE; /* reset this */
+  data->state.errorbuf = FALSE; /* no error has occurred */
+
+  /* If there was a list of cookie files to read and we haven't done it before,
+     do it now! */
+  if(data->change.cookielist) {
+    struct curl_slist *list = data->change.cookielist;
+    while(list) {
+      data->cookies = Curl_cookie_init(list->data,
+                                       data->cookies,
+                                       data->set.cookiesession);
+      list = list->next;
+    }
+    curl_slist_free_all(data->change.cookielist); /* clean up list */
+    data->change.cookielist = NULL; /* don't do this again! */
+  }
+
+
+
+ /* Allow data->set.use_port to set which port to use. This needs to be
+  * disabled for example when we follow Location: headers to URLs using
+  * different ports! */
+  data->state.allow_port = TRUE;
+
+#if defined(HAVE_SIGNAL) && defined(SIGPIPE)
+  /*************************************************************
+   * Tell signal handler to ignore SIGPIPE
+   *************************************************************/
+  if(!data->set.no_signal)
+    data->state.prev_signal = signal(SIGPIPE, SIG_IGN);
+#endif  
+
+  Curl_initinfo(data); /* reset session-specific information "variables" */
+  Curl_pgrsStartNow(data);
+
+  return CURLE_OK;
+}
+
+CURLcode Curl_posttransfer(struct SessionHandle *data)
+{
+#if defined(HAVE_SIGNAL) && defined(SIGPIPE)
+  /* restore the signal handler for SIGPIPE before we get back */
+  if(!data->set.no_signal)
+    signal(SIGPIPE, data->state.prev_signal);
+#endif  
+
+  return CURLE_OK;
+}
+
+CURLcode Curl_follow(struct SessionHandle *data,
+                     char *newurl) /* this 'newurl' is the Location: string,
+                                      and it must be malloc()ed before passed
+                                      here */
+{
+  /* Location: redirect */
+  char prot[16]; /* URL protocol string storage */
+  char letter;   /* used for a silly sscanf */
+  
+  if (data->set.maxredirs &&
+      (data->set.followlocation >= data->set.maxredirs)) {
+    failf(data,"Maximum (%d) redirects followed", data->set.maxredirs);
+    return CURLE_TOO_MANY_REDIRECTS;
+  }
+
+  /* mark the next request as a followed location: */
+  data->state.this_is_a_follow = TRUE;
+
+  data->set.followlocation++; /* count location-followers */
+
+  if(data->set.http_auto_referer) {
+    /* We are asked to automatically set the previous URL as the
+       referer when we get the next URL. We pick the ->url field,
+       which may or may not be 100% correct */
+
+    if(data->change.referer_alloc)
+      /* If we already have an allocated referer, free this first */
+      free(data->change.referer);
+
+    data->change.referer = strdup(data->change.url);
+    data->change.referer_alloc = TRUE; /* yes, free this later */
+  }
+
+  if(2 != sscanf(newurl, "%15[^?&/:]://%c", prot, &letter)) {
+    /***
+     *DANG* this is an RFC 2068 violation. The URL is supposed
+     to be absolute and this doesn't seem to be that!
+     ***
+     Instead, we have to TRY to append this new path to the old URL
+     to the right of the host part. Oh crap, this is doomed to cause
+     problems in the future...
+    */
+    char *protsep;
+    char *pathsep;
+    char *newest;
+
+    char *useurl = newurl;
+
+    /* we must make our own copy of the URL to play with, as it may
+       point to read-only data */
+    char *url_clone=strdup(data->change.url);
+
+    if(!url_clone)
+      return CURLE_OUT_OF_MEMORY; /* skip out of this NOW */
+
+    /* protsep points to the start of the host name */
+    protsep=strstr(url_clone, "//");
+    if(!protsep)
+      protsep=url_clone;
+    else
+      protsep+=2; /* pass the slashes */
+
+    if('/' != newurl[0]) {
+      int level=0;
+
+      /* First we need to find out if there's a ?-letter in the URL,
+         and cut it and the right-side of that off */
+      pathsep = strrchr(protsep, '?');
+      if(pathsep)
+        *pathsep=0;
+      
+      /* we have a relative path to append to the last slash if
+         there's one available */
+      pathsep = strrchr(protsep, '/');
+      if(pathsep)
+        *pathsep=0;
+
+      /* Check if there's any slash after the host name, and if so,
+         remember that position instead */
+      pathsep = strchr(protsep, '/');
+      if(pathsep)
+        protsep = pathsep+1;
+      else
+        protsep = NULL;
+
+      /* now deal with one "./" or any amount of "../" in the newurl
+         and act accordingly */
+
+      if((useurl[0] == '.') && (useurl[1] == '/'))
+        useurl+=2; /* just skip the "./" */
+            
+      while((useurl[0] == '.') &&
+            (useurl[1] == '.') &&
+            (useurl[2] == '/')) {
+        level++; 
+        useurl+=3; /* pass the "../" */
+      }
+
+      if(protsep) {
+        while(level--) {
+          /* cut off one more level from the right of the original URL */
+          pathsep = strrchr(protsep, '/');
+          if(pathsep)
+            *pathsep=0;
+          else {
+            *protsep=0;
+            break;
+          }
+        }
+      }
+    }
+    else {
+      /* We got a new absolute path for this server, cut off from the
+         first slash */
+      pathsep = strchr(protsep, '/');
+      if(pathsep)
+        *pathsep=0;
+    }
+
+    newest=(char *)malloc( strlen(url_clone) +
+                           1 + /* possible slash */
+                           strlen(useurl) + 1/* zero byte */);
+    
+    if(!newest)
+      return CURLE_OUT_OF_MEMORY; /* go out from this */
+
+    sprintf(newest, "%s%s%s", url_clone,
+            (('/' == useurl[0]) || (protsep && !*protsep))?"":"/",
+            useurl);
+    free(newurl); /* newurl is the allocated pointer */
+    free(url_clone);
+    newurl = newest;
+  }
+  else
+    /* This is an absolute URL, don't allow the custom port number */
+    data->state.allow_port = FALSE;
+
+  if(data->change.url_alloc)
+    free(data->change.url);
+  else
+    data->change.url_alloc = TRUE; /* the URL is allocated */
+      
+  /* TBD: set the URL with curl_setopt() */
+  data->change.url = newurl;
+  newurl = NULL; /* don't free! */
+
+  infof(data, "Follows Location: to new URL: '%s'\n", data->change.url);
+
+  /*
+   * We get here when the HTTP code is 300-399. We need to perform
+   * differently based on exactly what return code there was.
+   * Discussed on the curl mailing list and posted about on the 26th
+   * of January 2001.
+   */
+  switch(data->info.httpcode) {
+  case 300: /* Multiple Choices */
+  case 306: /* Not used */
+  case 307: /* Temporary Redirect */
+  default:  /* for all unknown ones */
+    /* These are explicitly mention since I've checked RFC2616 and they
+     * seem to be OK to POST to.
+     */
+    break;
+  case 301: /* Moved Permanently */
+    /* (quote from RFC2616, section 10.3.2):
+     * 
+     *  Note: When automatically redirecting a POST request after
+     *  receiving a 301 status code, some existing HTTP/1.0 user agents
+     *  will erroneously change it into a GET request.
+     *
+     * ----
+     * Warning: Because most of importants user agents do this clear
+     * RFC2616 violation, many webservers expect this misbehavior. So
+     * these servers often answers to a POST request with an error page.
+     * To be sure that libcurl gets the page that most user agents
+     * would get, libcurl has to force GET:
+     */
+    if( data->set.httpreq == HTTPREQ_POST
+        || data->set.httpreq == HTTPREQ_POST_FORM) {
+      infof(data,
+            "Violate RFC 2616/10.3.2 and switch from POST to GET\n");
+      data->set.httpreq = HTTPREQ_GET;
+    }
+    break;
+  case 302: /* Found */
+    /* (From 10.3.3)
+       
+    Note: RFC 1945 and RFC 2068 specify that the client is not allowed
+    to change the method on the redirected request.  However, most
+    existing user agent implementations treat 302 as if it were a 303
+    response, performing a GET on the Location field-value regardless
+    of the original request method. The status codes 303 and 307 have
+    been added for servers that wish to make unambiguously clear which
+    kind of reaction is expected of the client.
+    
+    (From 10.3.4)
+    
+    Note: Many pre-HTTP/1.1 user agents do not understand the 303
+    status. When interoperability with such clients is a concern, the
+    302 status code may be used instead, since most user agents react
+    to a 302 response as described here for 303.             
+    */
+  case 303: /* See Other */
+    /* Disable both types of POSTs, since doing a second POST when
+     * following isn't what anyone would want! */
+    if(data->set.httpreq != HTTPREQ_GET) {
+      data->set.httpreq = HTTPREQ_GET; /* enforce GET request */
+      infof(data, "Disables POST, goes with %s\n",
+            data->set.no_body?"HEAD":"GET");
+    }
+    break;
+  case 304: /* Not Modified */
+    /* 304 means we did a conditional request and it was "Not modified".
+     * We shouldn't get any Location: header in this response!
+     */
+    break;
+  case 305: /* Use Proxy */
+    /* (quote from RFC2616, section 10.3.6):
+     * "The requested resource MUST be accessed through the proxy given
+     * by the Location field. The Location field gives the URI of the
+     * proxy.  The recipient is expected to repeat this single request
+     * via the proxy. 305 responses MUST only be generated by origin
+     * servers."
+     */
+    break;
+  }
+  Curl_pgrsTime(data, TIMER_REDIRECT);
+  Curl_pgrsResetTimes(data);
+
+  return CURLE_OK;
+}
+
+CURLcode Curl_perform(struct SessionHandle *data)
+{
+  CURLcode res;
+  CURLcode res2;
+  struct connectdata *conn=NULL;
+  char *newurl = NULL; /* possibly a new URL to follow to! */
+
+  data->state.used_interface = Curl_if_easy;
+
+  res = Curl_pretransfer(data);
+  if(res)
+    return res;
+
+  /*
+   * It is important that there is NO 'return' from this function at any other
+   * place than falling down to the end of the function! This is because we
+   * have cleanup stuff that must be done before we get back, and that is only
+   * performed after this do-while loop.
+   */
+
+  do {
+    Curl_pgrsTime(data, TIMER_STARTSINGLE);
+    res = Curl_connect(data, &conn);
+    if(res == CURLE_OK) {
+      res = Curl_do(&conn);
+
+      if(res == CURLE_OK) {
+        CURLcode res2; /* just a local extra result container */
+
+        if(conn->protocol&PROT_FTPS)
+          /* FTPS, disable ssl while transfering data */
+          conn->ssl.use = FALSE;
+        res = Transfer(conn); /* now fetch that URL please */
+        if(conn->protocol&PROT_FTPS)
+          /* FTPS, enable ssl again after havving transferred data */
+          conn->ssl.use = TRUE;
+
+        if(res == CURLE_OK)
+          /*
+           * We must duplicate the new URL here as the connection data
+           * may be free()ed in the Curl_done() function.
+           */
+          newurl = conn->newurl?strdup(conn->newurl):NULL;
+        else {
+          /* The transfer phase returned error, we mark the connection to get
+           * closed to prevent being re-used. This is becasue we can't
+           * possibly know if the connection is in a good shape or not now. */
+          conn->bits.close = TRUE;
+
+          if(-1 !=conn->secondarysocket) {
+            /* if we failed anywhere, we must clean up the secondary socket if
+               it was used */
+            sclose(conn->secondarysocket);
+            conn->secondarysocket=-1;
+          }
+        }
+
+        /* Always run Curl_done(), even if some of the previous calls
+           failed, but return the previous (original) error code */
+        res2 = Curl_done(conn);
+
+        if(CURLE_OK == res)
+          res = res2;
+      }
+
+      /*
+       * Important: 'conn' cannot be used here, since it may have been closed
+       * in 'Curl_done' or other functions.
+       */
+
+      if((res == CURLE_OK) && newurl) {
+        res = Curl_follow(data, newurl);
+        if(CURLE_OK == res) {
+          newurl = NULL;
+          continue;
+        }
+      }
+    }
+    break; /* it only reaches here when this shouldn't loop */
+
+  } while(1); /* loop if Location: */
+
+  if(newurl)
+    free(newurl);
+
+  /* run post-transfer uncondionally, but don't clobber the return code if
+     we already have an error code recorder */
+  res2 = Curl_posttransfer(data);
+  if(!res && res2)
+    res = res2;
+
+  return res;
+}
+
+CURLcode 
+Curl_Transfer(struct connectdata *c_conn, /* connection data */
+              int sockfd,       /* socket to read from or -1 */
+              int size,         /* -1 if unknown at this point */
+              bool getheader,   /* TRUE if header parsing is wanted */
+              long *bytecountp, /* return number of bytes read or NULL */
+              int writesockfd,  /* socket to write to, it may very well be
+                                   the same we read from. -1 disables */
+              long *writebytecountp /* return number of bytes written or
+                                       NULL */
+              )
+{
+  struct connectdata *conn = (struct connectdata *)c_conn;
+  if(!conn)
+    return CURLE_BAD_FUNCTION_ARGUMENT;
+
+  /* now copy all input parameters */
+  conn->sockfd = sockfd;
+  conn->size = size;
+  conn->bits.getheader = getheader;
+  conn->bytecountp = bytecountp;
+  conn->writesockfd = writesockfd;
+  conn->writebytecountp = writebytecountp;
+
+  return CURLE_OK;
+
+}
diff --git a/main/source/curl/lib/transfer.h b/main/source/curl/lib/transfer.h
new file mode 100644
index 00000000..978fe054
--- /dev/null
+++ b/main/source/curl/lib/transfer.h
@@ -0,0 +1,48 @@
+#ifndef __TRANSFER_H
+#define __TRANSFER_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: transfer.h,v 1.10 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+CURLcode Curl_perform(struct SessionHandle *data);
+CURLcode Curl_pretransfer(struct SessionHandle *data);
+CURLcode Curl_posttransfer(struct SessionHandle *data);
+CURLcode Curl_follow(struct SessionHandle *data, char *newurl);
+CURLcode Curl_readwrite(struct connectdata *conn, bool *done);
+void Curl_single_fdset(struct connectdata *conn, 
+                       fd_set *read_fd_set,
+                       fd_set *write_fd_set,
+                       fd_set *exc_fd_set,
+                       int *max_fd);
+CURLcode Curl_readwrite_init(struct connectdata *conn);
+
+/* This sets up a forthcoming transfer */
+CURLcode 
+Curl_Transfer (struct connectdata *data,
+               int sockfd,		/* socket to read from or -1 */
+               int size,		/* -1 if unknown at this point */
+               bool getheader,     	/* TRUE if header parsing is wanted */
+               long *bytecountp,	/* return number of bytes read */
+               int writesockfd,      /* socket to write to, it may very well be
+                                        the same we read from. -1 disables */
+               long *writebytecountp /* return number of bytes written */
+);
+#endif
diff --git a/main/source/curl/lib/url.c b/main/source/curl/lib/url.c
new file mode 100644
index 00000000..0bf6993a
--- /dev/null
+++ b/main/source/curl/lib/url.c
@@ -0,0 +1,3175 @@
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: url.c,v 1.275 2003/05/12 12:45:14 bagder Exp $
+ ***************************************************************************/
+
+/* -- WIN32 approved -- */
+
+#include "setup.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <errno.h>
+
+#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
+#include <winsock.h>
+#include <time.h>
+#include <io.h>
+#else
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#include <netinet/in.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <netdb.h>
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NET_IF_H
+#include <net/if.h>
+#endif
+#include <sys/ioctl.h>
+#include <signal.h>
+
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+#ifdef VMS
+#include <in.h>
+#include <inet.h>
+#endif
+
+#ifdef HAVE_SETJMP_H
+#include <setjmp.h>
+#endif
+
+#ifndef HAVE_SELECT
+#error "We can't compile without select() support!"
+#endif
+#ifndef HAVE_SOCKET
+#error "We can't compile without socket() support!"
+#endif
+
+
+#endif
+
+#ifdef HAVE_OPENSSL_ENGINE_H
+#include <openssl/engine.h>
+#endif
+#include "urldata.h"
+#include "netrc.h"
+
+#include "formdata.h"
+#include "base64.h"
+#include "ssluse.h"
+#include "hostip.h"
+#include "if2ip.h"
+#include "transfer.h"
+#include "sendf.h"
+#include "getpass.h"
+#include "progress.h"
+#include "cookie.h"
+#include "strequal.h"
+#include "escape.h"
+#include "strtok.h"
+#include "share.h"
+#include "content_encoding.h"
+
+/* And now for the protocols */
+#include "ftp.h"
+#include "dict.h"
+#include "telnet.h"
+#include "http.h"
+#include "file.h"
+#include "ldap.h"
+#include "url.h"
+#include "connect.h"
+#include "ca-bundle.h"
+
+#include <curl/types.h>
+
+#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
+#include "inet_ntoa_r.h"
+#endif
+
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+#ifdef KRB4
+#include "security.h"
+#endif
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
+/* Local static prototypes */
+static int ConnectionKillOne(struct SessionHandle *data);
+static bool ConnectionExists(struct SessionHandle *data,
+                             struct connectdata *needle,
+                             struct connectdata **usethis);
+static unsigned int ConnectionStore(struct SessionHandle *data,
+                                    struct connectdata *conn);
+static bool safe_strequal(char* str1, char* str2);
+
+#if !defined(WIN32)||defined(__CYGWIN32__)
+#ifndef RETSIGTYPE
+#define RETSIGTYPE void
+#endif
+#ifdef HAVE_SIGSETJMP
+extern sigjmp_buf curl_jmpenv;
+#endif
+static
+RETSIGTYPE alarmfunc(int signal)
+{
+  /* this is for "-ansi -Wall -pedantic" to stop complaining!   (rabe) */
+  (void)signal;
+#ifdef HAVE_SIGSETJMP
+  siglongjmp(curl_jmpenv, 1);
+#endif
+  return;
+}
+#endif
+
+
+/*
+ * This is the internal function curl_easy_cleanup() calls. This should
+ * cleanup and free all resources associated with this sessionhandle.
+ *
+ * NOTE: if we ever add something that attempts to write to a socket or
+ * similar here, we must ignore SIGPIPE first. It is currently only done
+ * when curl_easy_perform() is invoked.
+ */
+
+CURLcode Curl_close(struct SessionHandle *data)
+{
+  /* Loop through all open connections and kill them one by one */
+  while(-1 != ConnectionKillOne(data));
+
+#ifdef USE_SSLEAY
+  /* Close down all open SSL info and sessions */
+  Curl_SSL_Close_All(data);
+#endif
+
+  /* No longer a dirty share, if it exists */
+  if (data->share)
+    data->share->dirty--;
+
+  if(data->change.cookielist) /* clean up list if any */
+    curl_slist_free_all(data->change.cookielist);
+
+  if(data->state.auth_host)
+    free(data->state.auth_host);
+
+  if(data->state.scratch)
+    free(data->state.scratch);
+
+  if(data->change.proxy_alloc)
+    free(data->change.proxy);
+
+  if(data->change.referer_alloc)
+    free(data->change.referer);
+
+  if(data->change.url_alloc)
+    free(data->change.url);
+
+  if(data->state.headerbuff)
+    free(data->state.headerbuff);
+
+#ifndef CURL_DISABLE_HTTP
+  if(data->set.cookiejar) {
+    /* we have a "destination" for all the cookies to get dumped to */
+    if(Curl_cookie_output(data->cookies, data->set.cookiejar))
+      infof(data, "WARNING: failed to save cookies in given jar\n");
+  }
+
+  Curl_cookie_cleanup(data->cookies);
+#endif
+
+  /* free the connection cache */
+  free(data->state.connects);
+
+  if(data->info.contenttype)
+    free(data->info.contenttype);
+
+  free(data);
+  return CURLE_OK;
+}
+
+static
+int my_getpass(void *clientp, const char *prompt, char* buffer, int buflen )
+{
+  char *retbuf;
+  clientp=NULL; /* prevent compiler warning */
+
+  retbuf = getpass_r(prompt, buffer, buflen);
+  if(NULL == retbuf)
+    return 1;
+  else
+    return 0; /* success */
+}
+
+
+CURLcode Curl_open(struct SessionHandle **curl)
+{
+  /* We don't yet support specifying the URL at this point */
+  struct SessionHandle *data;
+  /* Very simple start-up: alloc the struct, init it with zeroes and return */
+  data = (struct SessionHandle *)malloc(sizeof(struct SessionHandle));
+  if(!data)
+    /* this is a very serious error */
+    return CURLE_OUT_OF_MEMORY;
+
+  memset(data, 0, sizeof(struct SessionHandle));
+
+  /* We do some initial setup here, all those fields that can't be just 0 */
+
+  data->state.headerbuff=(char*)malloc(HEADERSIZE);
+  if(!data->state.headerbuff) {
+    free(data); /* free the memory again */
+    return CURLE_OUT_OF_MEMORY;
+  }
+
+  data->state.headersize=HEADERSIZE;
+
+  data->set.out = stdout; /* default output to stdout */
+  data->set.in  = stdin;  /* default input from stdin */
+  data->set.err  = stderr;  /* default stderr to stderr */
+
+  /* use fwrite as default function to store output */
+  data->set.fwrite = (curl_write_callback)fwrite;
+
+  /* use fread as default function to read input */
+  data->set.fread = (curl_read_callback)fread;
+
+  /* set the default passwd function */
+  data->set.fpasswd = my_getpass;
+
+  data->set.infilesize = -1; /* we don't know any size */
+
+  data->state.current_speed = -1; /* init to negative == impossible */
+
+  data->set.httpreq = HTTPREQ_GET; /* Default HTTP request */
+  data->set.ftp_use_epsv = TRUE;   /* FTP defaults to EPSV operations */
+  data->set.ftp_use_eprt = TRUE;   /* FTP defaults to EPRT operations */
+
+  data->set.dns_cache_timeout = 60; /* Timeout every 60 seconds by default */
+
+  /* make libcurl quiet by default: */
+  data->set.hide_progress = TRUE;  /* CURLOPT_NOPROGRESS changes these */
+  data->progress.flags |= PGRS_HIDE;
+
+  /* Set the default size of the SSL session ID cache */
+  data->set.ssl.numsessions = 5;
+
+  data->set.proxyport = 1080;
+
+  data->set.proxytype = CURLPROXY_HTTP; /* defaults to HTTP proxy */
+
+  /* create an array with connection data struct pointers */
+  data->state.numconnects = 5; /* hard-coded right now */
+  data->state.connects = (struct connectdata **)
+    malloc(sizeof(struct connectdata *) * data->state.numconnects);
+
+  if(!data->state.connects) {
+    free(data);
+    return CURLE_OUT_OF_MEMORY;
+  }
+
+  /*
+   * libcurl 7.10 introduces SSL verification *by default*! This needs to be
+   * switched off unless wanted.
+   */
+  data->set.ssl.verifypeer = TRUE;
+  data->set.ssl.verifyhost = 2;
+#ifdef CURL_CA_BUNDLE
+  /* This is our prefered CA cert bundle since install time */
+  data->set.ssl.CAfile = (char *)CURL_CA_BUNDLE;
+#endif
+
+
+  memset(data->state.connects, 0,
+         sizeof(struct connectdata *)*data->state.numconnects);
+
+  *curl = data;
+  return CURLE_OK;
+}
+
+CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, ...)
+{
+  va_list param;
+  char *cookiefile;
+
+  va_start(param, option);
+
+  switch(option) {
+  case CURLOPT_DNS_CACHE_TIMEOUT:
+    data->set.dns_cache_timeout = va_arg(param, int);
+    break;
+  case CURLOPT_DNS_USE_GLOBAL_CACHE:
+    {
+      int use_cache = va_arg(param, int);
+      if (use_cache) {
+        Curl_global_host_cache_init();
+      }
+
+      data->set.global_dns_cache = use_cache;
+    }
+    break;
+  case CURLOPT_SSL_CIPHER_LIST:
+    /* set a list of cipher we want to use in the SSL connection */
+    data->set.ssl.cipher_list = va_arg(param, char *);
+    break;
+
+  case CURLOPT_RANDOM_FILE:
+    /*
+     * This is the path name to a file that contains random data to seed
+     * the random SSL stuff with. The file is only used for reading.
+     */
+    data->set.ssl.random_file = va_arg(param, char *);
+    break;
+  case CURLOPT_EGDSOCKET:
+    /*
+     * The Entropy Gathering Daemon socket pathname
+     */
+    data->set.ssl.egdsocket = va_arg(param, char *);
+    break;
+  case CURLOPT_MAXCONNECTS:
+    /*
+     * Set the absolute number of maximum simultaneous alive connection that
+     * libcurl is allowed to have.
+     */
+    {
+      long newconnects= va_arg(param, long);
+      struct connectdata **newptr;
+
+      if(newconnects < data->state.numconnects) {
+        /* Since this number is *decreased* from the existing number, we must
+           close the possibly open connections that live on the indexes that
+           are being removed! */
+        int i;
+        for(i=newconnects; i< data->state.numconnects; i++)
+          Curl_disconnect(data->state.connects[i]);
+      }
+      if(newconnects) {
+        int i;
+        newptr= (struct connectdata **)
+          realloc(data->state.connects,
+                  sizeof(struct connectdata *) * newconnects);
+        if(!newptr)
+          /* we closed a few connections in vain, but so what? */
+          return CURLE_OUT_OF_MEMORY;
+
+        /* nullify the newly added pointers */
+        for(i=data->state.numconnects; i<newconnects; i++) {
+          newptr[i] = NULL;
+        }
+
+        data->state.connects = newptr;
+        data->state.numconnects = newconnects;
+      }
+      else {
+        /* zero makes NO cache at all */
+        if(data->state.connects)
+          free(data->state.connects);
+        data->state.connects=NULL;
+        data->state.numconnects=0;
+      }
+    }
+    break;
+  case CURLOPT_FORBID_REUSE:
+    /*
+     * When this transfer is done, it must not be left to be reused by a
+     * subsequent transfer but shall be closed immediately.
+     */
+    data->set.reuse_forbid = va_arg(param, long)?TRUE:FALSE;
+    break;
+  case CURLOPT_FRESH_CONNECT:
+    /*
+     * This transfer shall not use a previously cached connection but
+     * should be made with a fresh new connect!
+     */
+    data->set.reuse_fresh = va_arg(param, long)?TRUE:FALSE;
+    break;
+  case CURLOPT_VERBOSE:
+    /*
+     * Verbose means infof() calls that give a lot of information about
+     * the connection and transfer procedures as well as internal choices.
+     */
+    data->set.verbose = va_arg(param, long)?TRUE:FALSE;
+    break;
+  case CURLOPT_HEADER:
+    /*
+     * Set to include the header in the general data output stream.
+     */
+    data->set.http_include_header = va_arg(param, long)?TRUE:FALSE;
+    break;
+  case CURLOPT_NOPROGRESS:
+    /*
+     * Shut off the internal supported progress meter
+     */
+    data->set.hide_progress = va_arg(param, long)?TRUE:FALSE;
+    if(data->set.hide_progress)
+      data->progress.flags |= PGRS_HIDE;
+    else
+      data->progress.flags &= ~PGRS_HIDE;
+    break;
+  case CURLOPT_NOBODY:
+    /*
+     * Do not include the body part in the output data stream.
+     */
+    data->set.no_body = va_arg(param, long)?TRUE:FALSE;
+    break;
+  case CURLOPT_FAILONERROR:
+    /*
+     * Don't output the >=300 error code HTML-page, but instead only
+     * return error.
+     */
+    data->set.http_fail_on_error = va_arg(param, long)?TRUE:FALSE;
+    break;
+  case CURLOPT_UPLOAD:
+    /*
+     * We want to sent data to the remote host
+     */
+    data->set.upload = va_arg(param, long)?TRUE:FALSE;
+    if(data->set.upload)
+      /* If this is HTTP, PUT is what's needed to "upload" */
+      data->set.httpreq = HTTPREQ_PUT;
+    break;
+  case CURLOPT_FILETIME:
+    /*
+     * Try to get the file time of the remote document. The time will
+     * later (possibly) become available using curl_easy_getinfo().
+     */
+    data->set.get_filetime = va_arg(param, long)?TRUE:FALSE;
+    break;
+  case CURLOPT_FTPLISTONLY:
+    /*
+     * An FTP option that changes the command to one that asks for a list
+     * only, no file info details.
+     */
+    data->set.ftp_list_only = va_arg(param, long)?TRUE:FALSE;
+    break;
+  case CURLOPT_FTPAPPEND:
+    /*
+     * We want to upload and append to an existing (FTP) file.
+     */
+    data->set.ftp_append = va_arg(param, long)?TRUE:FALSE;
+    break;
+  case CURLOPT_NETRC:
+    /*
+     * Parse the $HOME/.netrc file
+     */
+    data->set.use_netrc = va_arg(param, long);
+    break;
+  case CURLOPT_FOLLOWLOCATION:
+    /*
+     * Follow Location: header hints on a HTTP-server.
+     */
+    data->set.http_follow_location = va_arg(param, long)?TRUE:FALSE;
+    break;
+  case CURLOPT_UNRESTRICTED_AUTH:
+    /*
+     * Send authentication (user+password) when following locations, even when
+     * hostname changed.
+     */
+    data->set.http_disable_hostname_check_before_authentication =
+      va_arg(param, long)?TRUE:FALSE;
+    break;
+  case CURLOPT_HTTP_VERSION:
+    /*
+     * This sets a requested HTTP version to be used. The value is one of
+     * the listed enums in curl/curl.h.
+     */
+    data->set.httpversion = va_arg(param, long);
+    break;
+  case CURLOPT_TRANSFERTEXT:
+    /*
+     * This option was previously named 'FTPASCII'. Renamed to work with
+     * more protocols than merely FTP.
+     *
+     * Transfer using ASCII (instead of BINARY).
+     */
+    data->set.ftp_ascii = va_arg(param, long)?TRUE:FALSE;
+    break;
+  case CURLOPT_PUT:
+    /*
+     * Use the HTTP PUT request to transfer data if this is TRUE.  If this is
+     * FALSE, don't set the httpreq. We can't know what to revert it to!
+     */
+    if(va_arg(param, long))
+      data->set.httpreq = HTTPREQ_PUT;
+    break;
+  case CURLOPT_TIMECONDITION:
+    /*
+     * Set HTTP time condition. This must be one of the defines in the
+     * curl/curl.h header file.
+     */
+    data->set.timecondition = va_arg(param, long);
+    break;
+  case CURLOPT_TIMEVALUE:
+    /*
+     * This is the value to compare with the remote document with the
+     * method set with CURLOPT_TIMECONDITION
+     */
+    data->set.timevalue = va_arg(param, long);
+    break;
+  case CURLOPT_SSLVERSION:
+    /*
+     * Set explicit SSL version to try to connect with, as some SSL
+     * implementations are lame.
+     */
+    data->set.ssl.version = va_arg(param, long);
+    break;
+
+  case CURLOPT_COOKIESESSION:
+    /*
+     * Set this option to TRUE to start a new "cookie session". It will
+     * prevent the forthcoming read-cookies-from-file actions to accept
+     * cookies that are marked as being session cookies, as they belong to a
+     * previous session.
+     *
+     * In the original Netscape cookie spec, "session cookies" are cookies
+     * with no expire date set. RFC2109 describes the same action if no
+     * 'Max-Age' is set and RFC2965 includes the RFC2109 description and adds
+     * a 'Discard' action that can enforce the discard even for cookies that
+     * have a Max-Age.
+     *
+     * We run mostly with the original cookie spec, as hardly anyone implements
+     * anything else.
+     */
+    data->set.cookiesession = (bool)va_arg(param, long);
+    break;
+
+#ifndef CURL_DISABLE_HTTP
+  case CURLOPT_COOKIEFILE:
+    /*
+     * Set cookie file to read and parse. Can be used multiple times.
+     */
+    cookiefile = (char *)va_arg(param, void *);
+    if(cookiefile)
+      /* append the cookie file name to the list of file names, and deal with
+         them later */
+      data->change.cookielist =
+        curl_slist_append(data->change.cookielist, cookiefile);
+    break;
+
+  case CURLOPT_COOKIEJAR:
+    /*
+     * Set cookie file name to dump all cookies to when we're done.
+     */
+    data->set.cookiejar = (char *)va_arg(param, void *);
+
+    /*
+     * Activate the cookie parser. This may or may not already
+     * have been made.
+     */
+    data->cookies = Curl_cookie_init(NULL, data->cookies,
+                                     data->set.cookiesession);
+    break;
+#endif
+
+  case CURLOPT_WRITEHEADER:
+    /*
+     * Custom pointer to pass the header write callback function
+     */
+    data->set.writeheader = (void *)va_arg(param, void *);
+    break;
+  case CURLOPT_COOKIE:
+    /*
+     * Cookie string to send to the remote server in the request.
+     */
+    data->set.cookie = va_arg(param, char *);
+    break;
+  case CURLOPT_ERRORBUFFER:
+    /*
+     * Error buffer provided by the caller to get the human readable
+     * error string in.
+     */
+    data->set.errorbuffer = va_arg(param, char *);
+    break;
+  case CURLOPT_FILE:
+    /*
+     * FILE pointer to write to or include in the data write callback
+     */
+    data->set.out = va_arg(param, FILE *);
+    break;
+  case CURLOPT_FTPPORT:
+    /*
+     * Use FTP PORT, this also specifies which IP address to use
+     */
+    data->set.ftpport = va_arg(param, char *);
+    data->set.ftp_use_port = data->set.ftpport?1:0;
+    break;
+
+  case CURLOPT_FTP_USE_EPRT:
+    data->set.ftp_use_eprt = va_arg(param, long)?TRUE:FALSE;
+    break;
+
+  case CURLOPT_FTP_USE_EPSV:
+    data->set.ftp_use_epsv = va_arg(param, long)?TRUE:FALSE;
+    break;
+    
+  case CURLOPT_HTTPHEADER:
+    /*
+     * Set a list with HTTP headers to use (or replace internals with)
+     */
+    data->set.headers = va_arg(param, struct curl_slist *);
+    break;
+  case CURLOPT_CUSTOMREQUEST:
+    /*
+     * Set a custom string to use as request
+     */
+    data->set.customrequest = va_arg(param, char *);
+
+    /* we don't set
+       data->set.httpreq = HTTPREQ_CUSTOM;
+       here, we continue as if we were using the already set type
+       and this just changes the actual request keyword */
+    break;
+  case CURLOPT_HTTPPOST:
+    /*
+     * Set to make us do HTTP POST
+     */
+    data->set.httppost = va_arg(param, struct HttpPost *);
+    if(data->set.httppost)
+      data->set.httpreq = HTTPREQ_POST_FORM;
+    break;
+
+  case CURLOPT_HTTPGET:
+    /*
+     * Set to force us do HTTP GET
+     */
+    if(va_arg(param, long)) {
+      data->set.httpreq = HTTPREQ_GET;
+      data->set.upload = FALSE; /* switch off upload */
+    }
+    break;
+
+  case CURLOPT_INFILE:
+    /*
+     * FILE pointer to read the file to be uploaded from. Or possibly
+     * used as argument to the read callback.
+     */
+    data->set.in = va_arg(param, FILE *);
+    break;
+  case CURLOPT_INFILESIZE:
+    /*
+     * If known, this should inform curl about the file size of the
+     * to-be-uploaded file.
+     */
+    data->set.infilesize = va_arg(param, long);
+    break;
+  case CURLOPT_LOW_SPEED_LIMIT:
+    /*
+     * The low speed limit that if transfers are below this for
+     * CURLOPT_LOW_SPEED_TIME, the transfer is aborted.
+     */
+    data->set.low_speed_limit=va_arg(param, long);
+    break;
+  case CURLOPT_LOW_SPEED_TIME:
+    /*
+     * The low speed time that if transfers are below the set
+     * CURLOPT_LOW_SPEED_LIMIT during this time, the transfer is aborted.
+     */
+    data->set.low_speed_time=va_arg(param, long);
+    break;
+  case CURLOPT_URL:
+    /*
+     * The URL to fetch.
+     */
+    if(data->change.url_alloc) {
+      /* the already set URL is allocated, free it first! */
+      free(data->change.url);
+      data->change.url_alloc=FALSE;
+    }
+    data->set.set_url = va_arg(param, char *);
+    data->change.url = data->set.set_url;
+    break;
+  case CURLOPT_PORT:
+    /*
+     * The port number to use when getting the URL
+     */
+    data->set.use_port = va_arg(param, long);
+    break;
+  case CURLOPT_POST:
+    /* Does this option serve a purpose anymore? Yes it does, when
+       CURLOPT_POSTFIELDS isn't used and the POST data is read off the
+       callback! */
+    if(va_arg(param, long))
+      data->set.httpreq = HTTPREQ_POST;
+    break;
+  case CURLOPT_POSTFIELDS:
+    /*
+     * A string with POST data. Makes curl HTTP POST.
+     */
+    data->set.postfields = va_arg(param, char *);
+    if(data->set.postfields)
+      data->set.httpreq = HTTPREQ_POST;
+    break;
+  case CURLOPT_POSTFIELDSIZE:
+    /*
+     * The size of the POSTFIELD data, if curl should now do a strlen
+     * to find out. Enables binary posts.
+     */
+    data->set.postfieldsize = va_arg(param, long);
+    break;
+  case CURLOPT_REFERER:
+    /*
+     * String to set in the HTTP Referer: field.
+     */
+    if(data->change.referer_alloc) {
+      free(data->change.referer);
+      data->change.referer_alloc = FALSE;
+    }
+    data->set.set_referer = va_arg(param, char *);
+    data->change.referer = data->set.set_referer;
+    break;
+  case CURLOPT_AUTOREFERER:
+    /*
+     * Switch on automatic referer that gets set if curl follows locations.
+     */
+    data->set.http_auto_referer = va_arg(param, long)?1:0;
+    break;
+  case CURLOPT_PROXY:
+    /*
+     * Set proxy server:port to use as HTTP proxy.
+     *
+     * If the proxy is set to "" we explicitly say that we don't want to use a
+     * proxy (even though there might be environment variables saying so).
+     *
+     * Setting it to NULL, means no proxy but allows the environment variables
+     * to decide for us.
+     */
+    if(data->change.proxy_alloc) {
+      /*
+       * The already set string is allocated, free that first
+       */
+      data->change.proxy_alloc=FALSE;;
+      free(data->change.proxy);
+    }
+    data->set.set_proxy = va_arg(param, char *);
+    data->change.proxy = data->set.set_proxy;
+    break;
+  case CURLOPT_HTTPPROXYTUNNEL:
+    /*
+     * Tunnel operations through the proxy instead of normal proxy use
+     */
+    data->set.tunnel_thru_httpproxy = va_arg(param, long)?TRUE:FALSE;
+    break;
+  case CURLOPT_PROXYPORT:
+    /*
+     * Explicitly set HTTP proxy port number.
+     */
+    data->set.proxyport = va_arg(param, long);
+    break;
+  case CURLOPT_TIMEOUT:
+    /*
+     * The maximum time you allow curl to use for a single transfer
+     * operation.
+     */
+    data->set.timeout = va_arg(param, long);
+    break;
+  case CURLOPT_CONNECTTIMEOUT:
+    /*
+     * The maximum time you allow curl to use to connect.
+     */
+    data->set.connecttimeout = va_arg(param, long);
+    break;
+  case CURLOPT_MAXREDIRS:
+    /*
+     * The maximum amount of hops you allow curl to follow Location:
+     * headers. This should mostly be used to detect never-ending loops.
+     */
+    data->set.maxredirs = va_arg(param, long);
+    break;
+  case CURLOPT_USERAGENT:
+    /*
+     * String to use in the HTTP User-Agent field
+     */
+    data->set.useragent = va_arg(param, char *);
+    break;
+  case CURLOPT_ENCODING:
+    /*
+     * String to use at the value of Accept-Encoding header. 08/28/02 jhrg
+     *
+     * If the encoding is set to "" we use an Accept-Encoding header that
+     * encompasses all the encodings we support.
+     * If the encoding is set to NULL we don't send an Accept-Encoding header
+     * and ignore an received Content-Encoding header.
+     *
+     */
+    data->set.encoding = va_arg(param, char *);
+    if(data->set.encoding && !*data->set.encoding)
+      data->set.encoding = (char*)ALL_CONTENT_ENCODINGS;
+    break;
+
+  case CURLOPT_USERPWD:
+    /*
+     * user:password to use in the operation
+     */
+    data->set.userpwd = va_arg(param, char *);
+    break;
+  case CURLOPT_POSTQUOTE:
+    /*
+     * List of RAW FTP commands to use after a transfer
+     */
+    data->set.postquote = va_arg(param, struct curl_slist *);
+    break;
+  case CURLOPT_PREQUOTE:
+    /*
+     * List of RAW FTP commands to use prior to RETR (Wesley Laxton)
+     */
+    data->set.prequote = va_arg(param, struct curl_slist *);
+    break;
+  case CURLOPT_QUOTE:
+    /*
+     * List of RAW FTP commands to use before a transfer
+     */
+    data->set.quote = va_arg(param, struct curl_slist *);
+    break;
+  case CURLOPT_PROGRESSFUNCTION:
+    /*
+     * Progress callback function
+     */
+    data->set.fprogress = va_arg(param, curl_progress_callback);
+    if(data->set.fprogress)
+      data->progress.callback = TRUE; /* no longer internal */
+    else
+      data->progress.callback = FALSE; /* NULL enforces internal */
+
+    break;
+  case CURLOPT_PROGRESSDATA:
+    /*
+     * Custom client data to pass to the progress callback
+     */
+    data->set.progress_client = va_arg(param, void *);
+    break;
+  case CURLOPT_PASSWDFUNCTION:
+    /*
+     * Password prompt callback
+     */
+    data->set.fpasswd = va_arg(param, curl_passwd_callback);
+    /*
+     * if the callback provided is null, reset the default callback
+     */
+    if(!data->set.fpasswd)
+    {
+      data->set.fpasswd = my_getpass;
+    }
+    break;
+  case CURLOPT_PASSWDDATA:
+    /*
+     * Custom client data to pass to the password callback
+     */
+    data->set.passwd_client = va_arg(param, void *);
+    break;
+  case CURLOPT_PROXYUSERPWD:
+    /*
+     * user:password needed to use the proxy
+     */
+    data->set.proxyuserpwd = va_arg(param, char *);
+    break;
+  case CURLOPT_RANGE:
+    /*
+     * What range of the file you want to transfer
+     */
+    data->set.set_range = va_arg(param, char *);
+    break;
+  case CURLOPT_RESUME_FROM:
+    /*
+     * Resume transfer at the give file position
+     */
+    data->set.set_resume_from = va_arg(param, long);
+    break;
+  case CURLOPT_DEBUGFUNCTION:
+    /*
+     * stderr write callback.
+     */
+    data->set.fdebug = va_arg(param, curl_debug_callback);
+    /*
+     * if the callback provided is NULL, it'll use the default callback
+     */
+    break;
+  case CURLOPT_DEBUGDATA:
+    /*
+     * Set to a void * that should receive all error writes. This
+     * defaults to CURLOPT_STDERR for normal operations.
+     */
+    data->set.debugdata = va_arg(param, void *);
+    break;
+  case CURLOPT_STDERR:
+    /*
+     * Set to a FILE * that should receive all error writes. This
+     * defaults to stderr for normal operations.
+     */
+    data->set.err = va_arg(param, FILE *);
+    if(!data->set.err)
+      data->set.err = stderr;
+    break;
+  case CURLOPT_HEADERFUNCTION:
+    /*
+     * Set header write callback
+     */
+    data->set.fwrite_header = va_arg(param, curl_write_callback);
+    break;
+  case CURLOPT_WRITEFUNCTION:
+    /*
+     * Set data write callback
+     */
+    data->set.fwrite = va_arg(param, curl_write_callback);
+    break;
+  case CURLOPT_READFUNCTION:
+    /*
+     * Read data callback
+     */
+    data->set.fread = va_arg(param, curl_read_callback);
+    break;
+  case CURLOPT_SSLCERT:
+    /*
+     * String that holds file name of the SSL certificate to use
+     */
+    data->set.cert = va_arg(param, char *);
+    break;
+  case CURLOPT_SSLCERTTYPE:
+    /*
+     * String that holds file type of the SSL certificate to use
+     */
+    data->set.cert_type = va_arg(param, char *);
+    break;
+  case CURLOPT_SSLKEY:
+    /*
+     * String that holds file name of the SSL certificate to use
+     */
+    data->set.key = va_arg(param, char *);
+    break;
+  case CURLOPT_SSLKEYTYPE:
+    /*
+     * String that holds file type of the SSL certificate to use
+     */
+    data->set.key_type = va_arg(param, char *);
+    break;
+  case CURLOPT_SSLKEYPASSWD:
+    /*
+     * String that holds the SSL private key password.
+     */
+    data->set.key_passwd = va_arg(param, char *);
+    break;
+  case CURLOPT_SSLENGINE:
+    /*
+     * String that holds the SSL crypto engine.
+     */
+#ifdef HAVE_OPENSSL_ENGINE_H
+    {
+      const char *cpTemp = va_arg(param, char *);
+      ENGINE     *e;
+      if (cpTemp && cpTemp[0]) {
+        e = ENGINE_by_id(cpTemp);
+        if (e) {
+          if (data->engine) {
+            ENGINE_free(data->engine);
+          }
+          data->engine = e;
+        }
+        else {
+          failf(data, "SSL Engine '%s' not found", cpTemp);
+          return CURLE_SSL_ENGINE_NOTFOUND;
+        }
+      }
+    }
+#else
+    return CURLE_SSL_ENGINE_NOTFOUND;
+#endif
+    break;
+  case CURLOPT_SSLENGINE_DEFAULT:
+    /*
+     * flag to set engine as default.
+     */
+#ifdef HAVE_OPENSSL_ENGINE_H
+    if (data->engine) {
+      if (ENGINE_set_default(data->engine, ENGINE_METHOD_ALL) > 0) {
+#ifdef DEBUG
+        fprintf(stderr,"set default crypto engine\n");
+#endif
+      }
+      else {
+#ifdef DEBUG
+        failf(data, "set default crypto engine failed");
+#endif
+        return CURLE_SSL_ENGINE_SETFAILED;
+      }
+    }
+#endif
+    break;
+  case CURLOPT_CRLF:
+    /*
+     * Kludgy option to enable CRLF convertions. Subject for removal.
+     */
+    data->set.crlf = va_arg(param, long)?TRUE:FALSE;
+    break;
+  case CURLOPT_INTERFACE:
+    /*
+     * Set what interface to bind to when performing an operation and thus
+     * what from-IP your connection will use.
+     */
+    data->set.device = va_arg(param, char *);
+    break;
+  case CURLOPT_KRB4LEVEL:
+    /*
+     * A string that defines the krb4 security level.
+     */
+    data->set.krb4_level = va_arg(param, char *);
+    data->set.krb4=data->set.krb4_level?TRUE:FALSE;
+    break;
+  case CURLOPT_SSL_VERIFYPEER:
+    /*
+     * Enable peer SSL verifying.
+     */
+    data->set.ssl.verifypeer = va_arg(param, long);
+    break;
+  case CURLOPT_SSL_VERIFYHOST:
+    /*
+     * Enable verification of the CN contained in the peer certificate
+     */
+    data->set.ssl.verifyhost = va_arg(param, long);
+    break;
+  case CURLOPT_CAINFO:
+    /*
+     * Set CA info for SSL connection. Specify file name of the CA certificate
+     */
+    data->set.ssl.CAfile = va_arg(param, char *);
+    break;
+  case CURLOPT_CAPATH:
+    /*
+     * Set CA path info for SSL connection. Specify directory name of the CA
+     * certificates which have been prepared using openssl c_rehash utility.
+     */
+    /* This does not work on windows. */
+    data->set.ssl.CApath = va_arg(param, char *);
+    break;
+  case CURLOPT_TELNETOPTIONS:
+    /*
+     * Set a linked list of telnet options
+     */
+    data->set.telnet_options = va_arg(param, struct curl_slist *);
+    break;
+
+  case CURLOPT_BUFFERSIZE:
+    /*
+     * The application kindly asks for a differently sized receive buffer.
+     * If it seems reasonable, we'll use it.
+     */
+    data->set.buffer_size = va_arg(param, long);
+
+    if(data->set.buffer_size> (BUFSIZE -1 ))
+      data->set.buffer_size = 0; /* huge internal default */
+
+    break;
+
+  case CURLOPT_NOSIGNAL:
+    /*
+     * The application asks not to set any signal() or alarm() handlers,
+     * even when using a timeout.
+     */
+    data->set.no_signal = va_arg(param, long) ? TRUE : FALSE;
+    break;
+
+  case CURLOPT_SHARE:
+    {
+      struct Curl_share *set;
+      set = va_arg(param, struct Curl_share *);
+      if(data->share)
+      {
+        Curl_share_lock(data, CURL_LOCK_DATA_SHARE, CURL_LOCK_ACCESS_SINGLE);
+
+        /* checking the dns cache stuff */
+        if(data->share->hostcache == data->hostcache)
+        {
+          data->hostcache = NULL;
+        }
+
+        data->share->dirty--;
+
+        Curl_share_unlock(data, CURL_LOCK_DATA_SHARE);
+      }
+
+      data->share = set;
+
+      Curl_share_lock(data, CURL_LOCK_DATA_SHARE, CURL_LOCK_ACCESS_SINGLE);
+
+      data->share->dirty++;
+
+      if( data->hostcache )
+      {
+        Curl_hash_destroy(data->hostcache);
+        data->hostcache = data->share->hostcache;
+      }
+
+      Curl_share_unlock(data, CURL_LOCK_DATA_SHARE);
+    }
+    break;
+
+  case CURLOPT_PROXYTYPE:
+    /*
+     * Set proxy type. HTTP/SOCKS4/SOCKS5
+     */
+    data->set.proxytype = va_arg(param, long);
+    break;
+
+  case CURLOPT_PRIVATE:
+    /*
+     * Set private data pointer.
+     */
+    data->set.private = va_arg(param, char *);
+    break;
+
+  case CURLOPT_HTTP200ALIASES:
+    /*
+     * Set a list of aliases for HTTP 200 in response header
+     */
+    data->set.http200aliases = va_arg(param, struct curl_slist *);
+    break;
+
+  default:
+    /* unknown tag and its companion, just ignore: */
+    return CURLE_FAILED_INIT; /* correct this */
+  }
+  return CURLE_OK;
+}
+
+CURLcode Curl_disconnect(struct connectdata *conn)
+{
+  if(!conn)
+    return CURLE_OK; /* this is closed and fine already */
+
+  /*
+   * The range string is usually freed in curl_done(), but we might
+   * get here *instead* if we fail prematurely. Thus we need to be able
+   * to free this resource here as well.
+   */
+  if(conn->bits.rangestringalloc) {
+    free(conn->range);
+    conn->bits.rangestringalloc = FALSE;
+  }
+
+  if(-1 != conn->connectindex) {
+    /* unlink ourselves! */
+    infof(conn->data, "Closing connection #%d\n", conn->connectindex);
+    conn->data->state.connects[conn->connectindex] = NULL;
+  }
+
+  if(conn->curl_disconnect)
+    /* This is set if protocol-specific cleanups should be made */
+    conn->curl_disconnect(conn);
+
+  if(conn->proto.generic)
+    free(conn->proto.generic);
+
+  if(conn->newurl)
+    free(conn->newurl);
+
+  if(conn->path) /* the URL path part */
+    free(conn->path);
+
+#ifdef USE_SSLEAY
+  Curl_SSL_Close(conn);
+#endif /* USE_SSLEAY */
+
+  /* close possibly still open sockets */
+  if(-1 != conn->secondarysocket)
+    sclose(conn->secondarysocket);
+  if(-1 != conn->firstsocket)
+    sclose(conn->firstsocket);
+
+  if(conn->allocptr.proxyuserpwd)
+    free(conn->allocptr.proxyuserpwd);
+  if(conn->allocptr.uagent)
+    free(conn->allocptr.uagent);
+  if(conn->allocptr.userpwd)
+    free(conn->allocptr.userpwd);
+  if(conn->allocptr.accept_encoding)
+    free(conn->allocptr.accept_encoding);
+  if(conn->allocptr.rangeline)
+    free(conn->allocptr.rangeline);
+  if(conn->allocptr.ref)
+    free(conn->allocptr.ref);
+  if(conn->allocptr.cookie)
+    free(conn->allocptr.cookie);
+  if(conn->allocptr.host)
+    free(conn->allocptr.host);
+  if(conn->allocptr.cookiehost)
+    free(conn->allocptr.cookiehost);
+
+  if(conn->proxyhost)
+    free(conn->proxyhost);
+
+  Curl_free_ssl_config(&conn->ssl_config);
+
+  free(conn); /* free all the connection oriented data */
+
+  return CURLE_OK;
+}
+
+/*
+ * This function should return TRUE if the socket is to be assumed to
+ * be dead. Most commonly this happens when the server has closed the
+ * connection due to inactivity.
+ */
+static bool SocketIsDead(int sock)
+{
+  int sval;
+  bool ret_val = TRUE;
+  fd_set check_set;
+  struct timeval to;
+
+  FD_ZERO(&check_set);
+  FD_SET(sock,&check_set);
+
+  to.tv_sec = 0;
+  to.tv_usec = 0;
+
+  sval = select(sock + 1, &check_set, 0, 0, &to);
+  if(sval == 0)
+    /* timeout */
+    ret_val = FALSE;
+
+  return ret_val;
+}
+
+/*
+ * Given one filled in connection struct (named needle), this function should
+ * detect if there already is one that have all the significant details
+ * exactly the same and thus should be used instead.
+ */
+static bool
+ConnectionExists(struct SessionHandle *data,
+                 struct connectdata *needle,
+                 struct connectdata **usethis)
+{
+  long i;
+  struct connectdata *check;
+
+  for(i=0; i< data->state.numconnects; i++) {
+    bool match = FALSE;
+    /*
+     * Note that if we use a HTTP proxy, we check connections to that
+     * proxy and not to the actual remote server.
+     */
+    check = data->state.connects[i];
+    if(!check)
+      /* NULL pointer means not filled-in entry */
+      continue;
+
+    if((needle->protocol&PROT_SSL) != (check->protocol&PROT_SSL))
+      /* don't do mixed SSL and non-SSL connections */
+      continue;
+
+    if(!needle->bits.httpproxy || needle->protocol&PROT_SSL) {
+      /* The requested connection does not use a HTTP proxy or it
+         uses SSL. */
+
+      if(!(needle->protocol&PROT_SSL) && check->bits.httpproxy)
+        /* we don't do SSL but the cached connection has a proxy,
+           then don't match this */
+        continue;
+
+      if(strequal(needle->protostr, check->protostr) &&
+         strequal(needle->name, check->name) &&
+         (needle->remote_port == check->remote_port) ) {
+        if(needle->protocol & PROT_SSL) {
+          /* This is SSL, verify that we're using the same
+             ssl options as well */
+          if(!Curl_ssl_config_matches(&needle->ssl_config,
+                                      &check->ssl_config)) {
+            continue;
+          }
+        }
+        if(needle->protocol & PROT_FTP) {
+          /* This is FTP, verify that we're using the same name and
+             password as well */
+          if(!strequal(needle->data->state.user, check->proto.ftp->user) ||
+             !strequal(needle->data->state.passwd, check->proto.ftp->passwd)) {
+            /* one of them was different */
+            continue;
+          }
+        }
+        match = TRUE;
+      }
+    }
+    else { /* The requested needle connection is using a proxy,
+              is the checked one using the same? */
+      if(check->bits.httpproxy &&
+         strequal(needle->proxyhost, check->proxyhost) &&
+         needle->port == check->port) {
+        /* This is the same proxy connection, use it! */
+        match = TRUE;
+      }
+    }
+
+    if(match) {
+      bool dead = SocketIsDead(check->firstsocket);
+      if(dead) {
+        /*
+         */
+        infof(data, "Connection %d seems to be dead!\n", i);
+        Curl_disconnect(check); /* disconnect resources */
+        data->state.connects[i]=NULL; /* nothing here */
+
+        /* There's no need to continue searching, because we only store
+           one connection for each unique set of identifiers */
+        return FALSE;
+      }
+
+      *usethis = check;
+      return TRUE; /* yes, we found one to use! */
+    }
+  }
+  return FALSE; /* no matching connecting exists */
+}
+
+/*
+ * This function frees/closes a connection in the connection cache. This
+ * should take the previously set policy into account when deciding which
+ * of the connections to kill.
+ */
+static int
+ConnectionKillOne(struct SessionHandle *data)
+{
+  long i;
+  struct connectdata *conn;
+  int highscore=-1;
+  int connindex=-1;
+  int score;
+  CURLcode result;
+  struct timeval now;
+
+  now = Curl_tvnow();
+
+  for(i=0; i< data->state.numconnects; i++) {
+    conn = data->state.connects[i];
+
+    if(!conn)
+      continue;
+
+    /*
+     * By using the set policy, we score each connection.
+     */
+    switch(data->set.closepolicy) {
+    case CURLCLOSEPOLICY_LEAST_RECENTLY_USED:
+    default:
+      /*
+       * Set higher score for the age passed since the connection
+       * was used.
+       */
+      score = Curl_tvdiff(now, conn->now);
+      break;
+    case CURLCLOSEPOLICY_OLDEST:
+      /*
+       * Set higher score for the age passed since the connection
+       * was created.
+       */
+      score = Curl_tvdiff(now, conn->created);
+      break;
+    }
+
+    if(score > highscore) {
+      highscore = score;
+      connindex = i;
+    }
+  }
+  if(connindex >= 0) {
+
+    /* the winner gets the honour of being disconnected */
+    result = Curl_disconnect(data->state.connects[connindex]);
+
+    /* clean the array entry */
+    data->state.connects[connindex] = NULL;
+  }
+
+  return connindex; /* return the available index or -1 */
+}
+
+/*
+ * The given input connection struct pointer is to be stored. If the "cache"
+ * is already full, we must clean out the most suitable using the previously
+ * set policy.
+ *
+ * The given connection should be unique. That must've been checked prior to
+ * this call.
+ */
+static unsigned int
+ConnectionStore(struct SessionHandle *data,
+                struct connectdata *conn)
+{
+  long i;
+  for(i=0; i< data->state.numconnects; i++) {
+    if(!data->state.connects[i])
+      break;
+  }
+  if(i == data->state.numconnects) {
+    /* there was no room available, kill one */
+    i = ConnectionKillOne(data);
+    infof(data, "Connection (#%d) was killed to make room\n", i);
+  }
+
+  if(-1 != i) {
+    /* only do this if a true index was returned, if -1 was returned there
+       is no room in the cache for an unknown reason and we cannot store
+       this there. */
+    data->state.connects[i] = conn; /* fill in this */
+    conn->connectindex = i; /* make the child know where the pointer to this
+                               particular data is stored */
+  }
+  return i;
+}
+
+/*
+ * This function logs in to a SOCKS5 proxy and sends the specifies the final
+ * desitination server.
+ */
+static int handleSock5Proxy(
+    const char *proxy_name,
+    const char *proxy_password,
+    struct connectdata *conn,
+    int sock)
+{
+  unsigned char socksreq[600]; /* room for large user/pw (255 max each) */
+  ssize_t actualread;
+  ssize_t written;
+  CURLcode result;
+
+  Curl_nonblock(sock, FALSE);
+
+  socksreq[0] = 5; /* version */
+  socksreq[1] = (char)(proxy_name[0] ? 2 : 1); /* number of methods (below) */
+  socksreq[2] = 0; /* no authentication */
+  socksreq[3] = 2; /* username/password */
+
+  result = Curl_write(conn, sock, (char *)socksreq, (2 + (int)socksreq[1]),
+                      &written);
+  if ((result != CURLE_OK) || (written != (2 + (int)socksreq[1]))) {
+    failf(conn->data, "Unable to send initial SOCKS5 request.");
+    return 1;
+  }
+
+  result=Curl_read(conn, sock, (char *)socksreq, 2, &actualread);
+  if ((result != CURLE_OK) || (actualread != 2)) {
+    failf(conn->data, "Unable to receive initial SOCKS5 response.");
+    return 1;
+  }
+
+  if (socksreq[0] != 5) {
+    failf(conn->data, "Received invalid version in initial SOCKS5 response.");
+    return 1;
+  }
+  if (socksreq[1] == 0) {
+    /* Nothing to do, no authentication needed */
+    ;
+  }
+  else if (socksreq[1] == 2) {
+    /* Needs user name and password */
+    int userlen, pwlen, len;
+
+    userlen = strlen(proxy_name);
+    pwlen = strlen(proxy_password);
+
+    /*   username/password request looks like
+     * +----+------+----------+------+----------+
+     * |VER | ULEN |  UNAME   | PLEN |  PASSWD  |
+     * +----+------+----------+------+----------+
+     * | 1  |  1   | 1 to 255 |  1   | 1 to 255 |
+     * +----+------+----------+------+----------+
+     */
+    len = 0;
+    socksreq[len++] = 1;    /* username/pw subnegotiation version */
+    socksreq[len++] = (char) userlen;
+    memcpy(socksreq + len, proxy_name, (int) userlen);
+    len += userlen;
+    socksreq[len++] = (char) pwlen;
+    memcpy(socksreq + len, proxy_password, (int) pwlen);
+    len += pwlen;
+
+    result = Curl_write(conn, sock, (char *)socksreq, len, &written);
+    if ((result != CURLE_OK) || (len != written)) {
+      failf(conn->data, "Failed to send SOCKS5 sub-negotiation request.");
+      return 1;
+    }
+
+    result=Curl_read(conn, sock, (char *)socksreq, 2, &actualread);
+    if ((result != CURLE_OK) || (actualread != 2)) {
+      failf(conn->data, "Unable to receive SOCKS5 sub-negotiation response.");
+      return 1;
+    }
+
+    if ((socksreq[0] != 5) || /* version */
+        (socksreq[1] != 0)) { /* status */
+      failf(conn->data, "User was rejected by the SOCKS5 server (%d %d).",
+            socksreq[0], socksreq[1]);
+      return 1;
+    }
+
+    /* Everything is good so far, user was authenticated! */
+  }
+  else {
+    /* error */
+    if (socksreq[1] == 1) {
+      failf(conn->data,
+            "SOCKS5 GSSAPI per-message authentication is not supported.");
+      return 1;
+    }
+    else if (socksreq[1] == 255) {
+      if (proxy_name[0] == 0) {
+        failf(conn->data,
+              "No authentication method was acceptable. (It is quite likely"
+              " that the SOCKS5 server wanted a username/password, since none"
+              " was supplied to the server on this connection.)");
+      }
+      else {
+        failf(conn->data, "No authentication method was acceptable.");
+      }
+      return 1;
+    }
+    else {
+      failf(conn->data,
+            "Undocumented SOCKS5 mode attempted to be used by server.");
+      return 1;
+    }
+  }
+
+  /* Authentication is complete, now specify destination to the proxy */
+  socksreq[0] = 5; /* version (SOCKS5) */
+  socksreq[1] = 1; /* connect */
+  socksreq[2] = 0; /* must be zero */
+  socksreq[3] = 1; /* IPv4 = 1 */
+
+  {
+#ifndef ENABLE_IPV6
+    struct Curl_dns_entry *dns;
+    Curl_addrinfo *hp=NULL;
+    dns = Curl_resolv(conn->data, conn->hostname, conn->remote_port);
+    /*
+     * We cannot use 'hostent' as a struct that Curl_resolv() returns.  It
+     * returns a Curl_addrinfo pointer that may not always look the same.
+     */
+    if(dns)
+      hp=dns->addr;
+    if (hp && hp->h_addr_list[0]) {
+      socksreq[4] = ((char*)hp->h_addr_list[0])[0];
+      socksreq[5] = ((char*)hp->h_addr_list[0])[1];
+      socksreq[6] = ((char*)hp->h_addr_list[0])[2];
+      socksreq[7] = ((char*)hp->h_addr_list[0])[3];
+
+      Curl_resolv_unlock(conn->data, dns); /* not used anymore from now on */
+    }
+    else {
+      failf(conn->data, "Failed to resolve \"%s\" for SOCKS5 connect.",
+            conn->hostname);
+      return 1;
+    }
+#else
+    failf(conn->data,
+          "%s:%d has an internal error an needs to be fixed to work",
+          __FILE__, __LINE__);
+    return 1;
+#endif
+  }
+
+  *((unsigned short*)&socksreq[8]) = htons(conn->remote_port);
+
+  {
+    const int packetsize = 10;
+
+    result = Curl_write(conn, sock, (char *)socksreq, packetsize, &written);
+    if ((result != CURLE_OK) || (written != packetsize)) {
+      failf(conn->data, "Failed to send SOCKS5 connect request.");
+      return 1;
+    }
+
+    result = Curl_read(conn, sock, (char *)socksreq, packetsize, &actualread);
+    if ((result != CURLE_OK) || (actualread != packetsize)) {
+      failf(conn->data, "Failed to receive SOCKS5 connect request ack.");
+      return 1;
+    }
+
+    if (socksreq[0] != 5) { /* version */
+      failf(conn->data,
+            "SOCKS5 reply has wrong version, version should be 5.");
+      return 1;
+    }
+    if (socksreq[1] != 0) { /* Anything besides 0 is an error */
+        failf(conn->data,
+              "Can't complete SOCKS5 connection to %d.%d.%d.%d:%d. (%d)",
+              (unsigned char)socksreq[4], (unsigned char)socksreq[5],
+              (unsigned char)socksreq[6], (unsigned char)socksreq[7],
+              (unsigned int)ntohs(*(unsigned short*)(&socksreq[8])),
+              socksreq[1]);
+        return 1;
+    }
+  }
+
+  Curl_nonblock(sock, TRUE);
+  return 0; /* Proxy was successful! */
+}
+
+static CURLcode ConnectPlease(struct connectdata *conn,
+                              struct Curl_dns_entry *hostaddr,
+                              bool *connected)
+{
+  CURLcode result;
+  Curl_ipconnect *addr;
+
+  /*************************************************************
+   * Connect to server/proxy
+   *************************************************************/
+  result= Curl_connecthost(conn,
+                           hostaddr,
+                           conn->port,
+                           &conn->firstsocket,
+                           &addr,
+                           connected);
+  if(CURLE_OK == result) {
+    /* All is cool, then we store the current information from the hostaddr
+       struct to the serv_addr, as it might be needed later. The address
+       returned from the function above is crucial here. */
+    conn->connect_addr = hostaddr;
+
+#ifdef ENABLE_IPV6
+    conn->serv_addr = addr;
+#else
+    memset((char *) &conn->serv_addr, '\0', sizeof(conn->serv_addr));
+    memcpy((char *)&(conn->serv_addr.sin_addr),
+           (struct in_addr *)addr, sizeof(struct in_addr));
+    conn->serv_addr.sin_family = hostaddr->addr->h_addrtype;
+    conn->serv_addr.sin_port = htons((unsigned short)conn->port);
+#endif
+
+    if (conn->data->set.proxytype == CURLPROXY_SOCKS5) {
+      return handleSock5Proxy(conn->data->state.proxyuser,
+                              conn->data->state.proxypasswd,
+                              conn,
+                              conn->firstsocket) ?
+        CURLE_COULDNT_CONNECT : CURLE_OK;
+    }
+    else if (conn->data->set.proxytype == CURLPROXY_HTTP) {
+      /* do nothing here. handled later. */
+    }
+    else {
+      failf(conn->data, "unknown proxytype option given");
+      return CURLE_COULDNT_CONNECT;
+    }
+  }
+
+  return result;
+}
+
+/*
+ * ALERT! The 'dns' pointer being passed in here might be NULL at times.
+ */
+static void verboseconnect(struct connectdata *conn,
+                           struct Curl_dns_entry *dns)
+{
+#ifdef HAVE_INET_NTOA_R
+  char ntoa_buf[64];
+#endif
+  struct SessionHandle *data = conn->data;
+
+  /* Figure out the ip-number and display the first host name it shows: */
+#ifdef ENABLE_IPV6
+  (void)dns; /* not used in the IPv6 enabled version */
+  {
+    char hbuf[NI_MAXHOST];
+#ifdef NI_WITHSCOPEID
+    const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
+#else
+    const int niflags = NI_NUMERICHOST;
+#endif
+    struct addrinfo *ai = conn->serv_addr;
+
+    if (getnameinfo(ai->ai_addr, ai->ai_addrlen, hbuf, sizeof(hbuf), NULL, 0,
+	niflags)) {
+      snprintf(hbuf, sizeof(hbuf), "?");
+    }
+    if (ai->ai_canonname) {
+      infof(data, "Connected to %s (%s) port %d\n", ai->ai_canonname, hbuf,
+            conn->port);
+    } else {
+      infof(data, "Connected to %s port %d\n", hbuf, conn->port);
+    }
+  }
+#else
+  {
+    Curl_addrinfo *hostaddr=dns?dns->addr:NULL;
+    struct in_addr in;
+    (void) memcpy(&in.s_addr, &conn->serv_addr.sin_addr, sizeof (in.s_addr));
+    infof(data, "Connected to %s (%s) port %d\n",
+          hostaddr?hostaddr->h_name:"",
+#if defined(HAVE_INET_NTOA_R)
+          inet_ntoa_r(in, ntoa_buf, sizeof(ntoa_buf)),
+#else
+          inet_ntoa(in),
+#endif
+          conn->port);
+  }
+#endif
+}
+
+/*
+ * We have discovered that the TCP connection has been successful, we can now
+ * proceed with some action.
+ *
+ * If we're using the multi interface, this host address pointer is most
+ * likely NULL at this point as we can't keep the resolved info around. This
+ * may call for some reworking, like a reference counter in the struct or
+ * something. The hostaddr is not used for very much though, we have the
+ * 'serv_addr' field in the connectdata struct for most of it.
+ */
+CURLcode Curl_protocol_connect(struct connectdata *conn,
+                               struct Curl_dns_entry *hostaddr)
+{
+  struct SessionHandle *data = conn->data;
+  CURLcode result=CURLE_OK;
+
+  if(conn->bits.tcpconnect)
+    /* We already are connected, get back. This may happen when the connect
+       worked fine in the first call, like when we connect to a local server
+       or proxy. */
+    return CURLE_OK;
+
+  Curl_pgrsTime(data, TIMER_CONNECT); /* connect done */
+
+  if(data->set.verbose)
+    verboseconnect(conn, hostaddr);
+
+  if(conn->curl_connect) {
+    /* is there a protocol-specific connect() procedure? */
+
+    /* set start time here for timeout purposes in the
+     * connect procedure, it is later set again for the
+     * progress meter purpose */
+    conn->now = Curl_tvnow();
+
+    /* Call the protocol-specific connect function */
+    result = conn->curl_connect(conn);
+  }
+
+  return result; /* pass back status */
+}
+
+static CURLcode CreateConnection(struct SessionHandle *data,
+                                 struct connectdata **in_connect)
+{
+  char *tmp;
+  CURLcode result=CURLE_OK;
+  char resumerange[40]="";
+  struct connectdata *conn;
+  struct connectdata *conn_temp;
+  int urllen;
+  struct Curl_dns_entry *hostaddr;
+#ifdef HAVE_ALARM
+  unsigned int prev_alarm=0;
+#endif
+  char endbracket;
+
+#ifdef HAVE_SIGACTION
+  struct sigaction keep_sigact;   /* store the old struct here */
+  bool keep_copysig=FALSE;        /* did copy it? */
+#else
+#ifdef HAVE_SIGNAL
+  void *keep_sigact;              /* store the old handler here */
+#endif
+#endif
+
+  /*************************************************************
+   * Check input data
+   *************************************************************/
+
+  if(!data->change.url)
+    return CURLE_URL_MALFORMAT;
+
+  /* First, split up the current URL in parts so that we can use the
+     parts for checking against the already present connections. In order
+     to not have to modify everything at once, we allocate a temporary
+     connection data struct and fill in for comparison purposes. */
+
+  conn = (struct connectdata *)malloc(sizeof(struct connectdata));
+  if(!conn) {
+    *in_connect = NULL; /* clear the pointer */
+    return CURLE_OUT_OF_MEMORY;
+  }
+  /* We must set the return variable as soon as possible, so that our
+     parent can cleanup any possible allocs we may have done before
+     any failure */
+  *in_connect = conn;
+
+  /* we have to init the struct */
+  memset(conn, 0, sizeof(struct connectdata));
+
+  /* and we setup a few fields in case we end up actually using this struct */
+  conn->data = data;           /* remember our daddy */
+  conn->firstsocket = -1;     /* no file descriptor */
+  conn->secondarysocket = -1; /* no file descriptor */
+  conn->connectindex = -1;    /* no index */
+  conn->bits.httpproxy = (data->change.proxy && *data->change.proxy &&
+                          (data->set.proxytype == CURLPROXY_HTTP))?
+    TRUE:FALSE; /* http proxy or not */
+
+  /* Default protocol-independent behavior doesn't support persistant
+     connections, so we set this to force-close. Protocols that support
+     this need to set this to FALSE in their "curl_do" functions. */
+  conn->bits.close = TRUE;
+
+  /* maxdownload must be -1 on init, as 0 is a valid value! */
+  conn->maxdownload = -1;  /* might have been used previously! */
+
+  /* Store creation time to help future close decision making */
+  conn->created = Curl_tvnow();
+
+  conn->bits.use_range = data->set.set_range?TRUE:FALSE; /* range status */
+  conn->range = data->set.set_range;              /* clone the range setting */
+  conn->resume_from = data->set.set_resume_from;   /* inherite resume_from */
+
+  /* Set the start time temporary to this creation time to allow easier
+     timeout checks before the transfer has started for real. The start time
+     is later set "for real" using Curl_pgrsStartNow(). */
+  conn->data->progress.start = conn->created;
+
+  conn->bits.user_passwd = data->set.userpwd?1:0;
+  conn->bits.proxy_user_passwd = data->set.proxyuserpwd?1:0;
+
+  /* This initing continues below, see the comment "Continue connectdata
+   * initialization here" */
+
+  /***********************************************************
+   * We need to allocate memory to store the path in. We get the size of the
+   * full URL to be sure, and we need to make it at least 256 bytes since
+   * other parts of the code will rely on this fact
+   ***********************************************************/
+#define LEAST_PATH_ALLOC 256
+  urllen=strlen(data->change.url);
+  if(urllen < LEAST_PATH_ALLOC)
+    urllen=LEAST_PATH_ALLOC;
+
+  conn->path=(char *)malloc(urllen);
+  if(NULL == conn->path)
+    return CURLE_OUT_OF_MEMORY; /* really bad error */
+
+  /*************************************************************
+   * Parse the URL.
+   *
+   * We need to parse the url even when using the proxy, because we will need
+   * the hostname and port in case we are trying to SSL connect through the
+   * proxy -- and we don't know if we will need to use SSL until we parse the
+   * url ...
+   ************************************************************/
+  if((2 == sscanf(data->change.url, "%64[^:]://%[^\n]",
+                  conn->protostr,
+                  conn->path)) && strequal(conn->protostr, "file")) {
+    /*
+     * we deal with file://<host>/<path> differently since it supports no
+     * hostname other than "localhost" and "127.0.0.1", which is unique among
+     * the URL protocols specified in RFC 1738
+     */
+    if(conn->path[0] != '/') {
+      /* the URL included a host name, we ignore host names in file:// URLs
+         as the standards don't define what to do with them */
+      char *ptr=strchr(conn->path, '/');
+      if(ptr) {
+        /* there was a slash present
+
+           RFC1738 (section 3.1, page 5) says:
+
+           The rest of the locator consists of data specific to the scheme,
+           and is known as the "url-path". It supplies the details of how the
+           specified resource can be accessed. Note that the "/" between the
+           host (or port) and the url-path is NOT part of the url-path.
+
+           As most agents use file://localhost/foo to get '/foo' although the
+           slash preceeding foo is a separator and not a slash for the path,
+           a URL as file://localhost//foo must be valid as well, to refer to
+           the same file with an absolute path.
+        */
+
+        if(ptr[1] && ('/' == ptr[1]))
+          /* if there was two slashes, we skip the first one as that is then
+             used truly as a separator */
+          ptr++;
+
+        strcpy(conn->path, ptr);
+      }
+    }
+
+    strcpy(conn->protostr, "file"); /* store protocol string lowercase */
+  }
+  else {
+    /* Set default host and default path */
+    strcpy(conn->gname, "curl.haxx.se");
+    strcpy(conn->path, "/");
+    /* We need to search for '/' OR '?' - whichever comes first after host
+     * name but before the path. We need to change that to handle things like
+     * http://example.com?param= (notice the missing '/'). Later we'll insert
+     * that missing slash at the beginning of the path.
+     */
+    if (2 > sscanf(data->change.url,
+                   "%64[^\n:]://%512[^\n/?]%[^\n]",
+                   conn->protostr, conn->gname, conn->path)) {
+
+      /*
+       * The URL was badly formatted, let's try the browser-style _without_
+       * protocol specified like 'http://'.
+       */
+      if((1 > sscanf(data->change.url, "%512[^\n/?]%[^\n]",
+                     conn->gname, conn->path)) ) {
+        /*
+         * We couldn't even get this format.
+         */
+        failf(data, "<url> malformed");
+        return CURLE_URL_MALFORMAT;
+      }
+
+      /*
+       * Since there was no protocol part specified, we guess what protocol it
+       * is based on the first letters of the server name.
+       */
+
+      /* Note: if you add a new protocol, please update the list in
+       * lib/version.c too! */
+
+      if(checkprefix("FTP", conn->gname)) {
+        strcpy(conn->protostr, "ftp");
+      }
+      else if(checkprefix("GOPHER", conn->gname))
+        strcpy(conn->protostr, "gopher");
+#ifdef USE_SSLEAY
+      else if(checkprefix("HTTPS", conn->gname))
+        strcpy(conn->protostr, "https");
+      else if(checkprefix("FTPS", conn->gname))
+        strcpy(conn->protostr, "ftps");
+#endif /* USE_SSLEAY */
+      else if(checkprefix("TELNET", conn->gname))
+        strcpy(conn->protostr, "telnet");
+      else if (checkprefix("DICT", conn->gname))
+        strcpy(conn->protostr, "DICT");
+      else if (checkprefix("LDAP", conn->gname))
+        strcpy(conn->protostr, "LDAP");
+      else {
+        strcpy(conn->protostr, "http");
+      }
+
+      conn->protocol |= PROT_MISSING; /* not given in URL */
+    }
+  }
+
+  /* If the URL is malformatted (missing a '/' after hostname before path) we
+   * insert a slash here. The only letter except '/' we accept to start a path
+   * is '?'.
+   */
+  if(conn->path[0] == '?') {
+    /* We need this function to deal with overlapping memory areas. We know
+       that the memory area 'path' points to is 'urllen' bytes big and that
+       is bigger than the path. Use +1 to move the zero byte too. */
+    memmove(&conn->path[1], conn->path, strlen(conn->path)+1);
+    conn->path[0] = '/';
+  }
+
+  /*
+   * So if the URL was A://B/C,
+   *   conn->protostr is A
+   *   conn->gname is B
+   *   conn->path is /C
+   */
+
+  /*************************************************************
+   * Take care of proxy authentication stuff
+   *************************************************************/
+  if(conn->bits.proxy_user_passwd) {
+    data->state.proxyuser[0] =0;
+    data->state.proxypasswd[0]=0;
+
+    if(*data->set.proxyuserpwd != ':') {
+      /* the name is given, get user+password */
+      sscanf(data->set.proxyuserpwd, "%127[^:]:%127[^\n]",
+             data->state.proxyuser, data->state.proxypasswd);
+      }
+    else
+      /* no name given, get the password only */
+      sscanf(data->set.proxyuserpwd+1, "%127[^\n]", data->state.proxypasswd);
+
+    /* check for password, if no ask for one */
+    if( !data->state.proxypasswd[0] ) {
+      if(data->set.fpasswd( data->set.passwd_client,
+                            "proxy password:",
+                            data->state.proxypasswd,
+                            sizeof(data->state.proxypasswd))) {
+        failf(data, "Bad password from password callback");
+        return CURLE_BAD_PASSWORD_ENTERED;
+      }
+    }
+
+  }
+
+  /*************************************************************
+   * Set a few convenience pointers
+   *************************************************************/
+  conn->name = conn->gname;
+  conn->ppath = conn->path;
+  conn->hostname = conn->name;
+
+
+  /*************************************************************
+   * Detect what (if any) proxy to use
+   *************************************************************/
+  if(!data->change.proxy) {
+    /* If proxy was not specified, we check for default proxy environment
+     * variables, to enable i.e Lynx compliance:
+     *
+     * http_proxy=http://some.server.dom:port/
+     * https_proxy=http://some.server.dom:port/
+     * ftp_proxy=http://some.server.dom:port/
+     * gopher_proxy=http://some.server.dom:port/
+     * no_proxy=domain1.dom,host.domain2.dom
+     *   (a comma-separated list of hosts which should
+     *   not be proxied, or an asterisk to override
+     *   all proxy variables)
+     * all_proxy=http://some.server.dom:port/
+     *   (seems to exist for the CERN www lib. Probably
+     *   the first to check for.)
+     *
+     * For compatibility, the all-uppercase versions of these variables are
+     * checked if the lowercase versions don't exist.
+     */
+    char *no_proxy=NULL;
+    char *no_proxy_tok_buf;
+    char *proxy=NULL;
+    char proxy_env[128];
+
+    no_proxy=curl_getenv("no_proxy");
+    if(!no_proxy)
+      no_proxy=curl_getenv("NO_PROXY");
+
+    if(!no_proxy || !strequal("*", no_proxy)) {
+      /* NO_PROXY wasn't specified or it wasn't just an asterisk */
+      char *nope;
+
+      nope=no_proxy?strtok_r(no_proxy, ", ", &no_proxy_tok_buf):NULL;
+      while(nope) {
+        unsigned int namelen;
+        char *endptr = strchr(conn->name, ':');
+        if(endptr)
+          namelen=endptr-conn->name;
+        else
+          namelen=strlen(conn->name);
+
+        if(strlen(nope) <= namelen) {
+          char *checkn=
+            conn->name + namelen - strlen(nope);
+          if(checkprefix(nope, checkn)) {
+            /* no proxy for this host! */
+            break;
+          }
+        }
+	nope=strtok_r(NULL, ", ", &no_proxy_tok_buf);
+      }
+      if(!nope) {
+	/* It was not listed as without proxy */
+	char *protop = conn->protostr;
+	char *envp = proxy_env;
+	char *prox;
+
+	/* Now, build <protocol>_proxy and check for such a one to use */
+	while(*protop)
+	  *envp++ = tolower(*protop++);
+
+	/* append _proxy */
+	strcpy(envp, "_proxy");
+
+	/* read the protocol proxy: */
+	prox=curl_getenv(proxy_env);
+
+        /*
+         * We don't try the uppercase version of HTTP_PROXY because of
+         * security reasons:
+         *
+         * When curl is used in a webserver application
+         * environment (cgi or php), this environment variable can
+         * be controlled by the web server user by setting the
+         * http header 'Proxy:' to some value.
+         *
+         * This can cause 'internal' http/ftp requests to be
+         * arbitrarily redirected by any external attacker.
+         */
+	if(!prox && !strequal("http_proxy", proxy_env)) {
+          /* There was no lowercase variable, try the uppercase version: */
+	  for(envp = proxy_env; *envp; envp++)
+	    *envp = toupper(*envp);
+	  prox=curl_getenv(proxy_env);
+	}
+
+	if(prox && *prox) { /* don't count "" strings */
+	  proxy = prox; /* use this */
+	}
+	else {
+	  proxy = curl_getenv("all_proxy"); /* default proxy to use */
+	  if(!proxy)
+            proxy=curl_getenv("ALL_PROXY");
+	}
+
+        if(proxy && *proxy) {
+          /* we have a proxy here to set */
+          data->change.proxy = proxy;
+          data->change.proxy_alloc=TRUE; /* this needs to be freed later */
+          conn->bits.httpproxy = TRUE;
+        }
+      } /* if (!nope) - it wasn't specified non-proxy */
+    } /* NO_PROXY wasn't specified or '*' */
+    if(no_proxy)
+      free(no_proxy);
+  } /* if not using proxy */
+
+  /*************************************************************
+   * No protocol part in URL was used, add it!
+   *************************************************************/
+  if(conn->protocol&PROT_MISSING) {
+    /* We're guessing prefixes here and if we're told to use a proxy or if
+       we're gonna follow a Location: later or... then we need the protocol
+       part added so that we have a valid URL. */
+    char *reurl;
+
+    reurl = aprintf("%s://%s", conn->protostr, data->change.url);
+
+    if(!reurl)
+      return CURLE_OUT_OF_MEMORY;
+
+    data->change.url = reurl;
+    data->change.url_alloc = TRUE; /* free this later */
+    conn->protocol &= ~PROT_MISSING; /* switch that one off again */
+  }
+
+#ifndef CURL_DISABLE_HTTP
+  /************************************************************
+   * RESUME on a HTTP page is a tricky business. First, let's just check that
+   * 'range' isn't used, then set the range parameter and leave the resume as
+   * it is to inform about this situation for later use. We will then
+   * "attempt" to resume, and if we're talking to a HTTP/1.1 (or later)
+   * server, we will get the document resumed. If we talk to a HTTP/1.0
+   * server, we just fail since we can't rewind the file writing from within
+   * this function.
+   ***********************************************************/
+  if(conn->resume_from) {
+    if(!conn->bits.use_range) {
+      /* if it already was in use, we just skip this */
+      snprintf(resumerange, sizeof(resumerange), "%d-", conn->resume_from);
+      conn->range=strdup(resumerange); /* tell ourselves to fetch this range */
+      conn->bits.rangestringalloc = TRUE; /* mark as allocated */
+      conn->bits.use_range = 1; /* switch on range usage */
+    }
+  }
+#endif
+  /*************************************************************
+   * Setup internals depending on protocol
+   *************************************************************/
+
+  if (strequal(conn->protostr, "HTTP")) {
+#ifndef CURL_DISABLE_HTTP
+    conn->port = (data->set.use_port && data->state.allow_port)?
+      data->set.use_port:PORT_HTTP;
+    conn->remote_port = PORT_HTTP;
+    conn->protocol |= PROT_HTTP;
+    conn->curl_do = Curl_http;
+    conn->curl_do_more = NULL;
+    conn->curl_done = Curl_http_done;
+    conn->curl_connect = Curl_http_connect;
+#else
+    failf(data, LIBCURL_NAME
+          " was built with HTTP disabled, http: not supported!");
+    return CURLE_UNSUPPORTED_PROTOCOL;
+#endif
+  }
+  else if (strequal(conn->protostr, "HTTPS")) {
+#if defined(USE_SSLEAY) && !defined(CURL_DISABLE_HTTP)
+
+    conn->port = (data->set.use_port && data->state.allow_port)?
+      data->set.use_port:PORT_HTTPS;
+    conn->remote_port = PORT_HTTPS;
+    conn->protocol |= PROT_HTTP|PROT_HTTPS|PROT_SSL;
+
+    conn->curl_do = Curl_http;
+    conn->curl_do_more = NULL;
+    conn->curl_done = Curl_http_done;
+    conn->curl_connect = Curl_http_connect;
+
+#else /* USE_SSLEAY */
+    failf(data, LIBCURL_NAME
+          " was built with SSL disabled, https: not supported!");
+    return CURLE_UNSUPPORTED_PROTOCOL;
+#endif /* !USE_SSLEAY */
+  }
+  else if (strequal(conn->protostr, "GOPHER")) {
+#ifndef CURL_DISABLE_GOPHER
+    conn->port = (data->set.use_port && data->state.allow_port)?
+      data->set.use_port:PORT_GOPHER;
+    conn->remote_port = PORT_GOPHER;
+    /* Skip /<item-type>/ in path if present */
+    if (isdigit((int)conn->path[1])) {
+      conn->ppath = strchr(&conn->path[1], '/');
+      if (conn->ppath == NULL)
+	conn->ppath = conn->path;
+      }
+    conn->protocol |= PROT_GOPHER;
+    conn->curl_do = Curl_http;
+    conn->curl_do_more = NULL;
+    conn->curl_done = Curl_http_done;
+#else
+    failf(data, LIBCURL_NAME
+          " was built with GOPHER disabled, gopher: not supported!");
+#endif
+  }
+  else if(strequal(conn->protostr, "FTP") ||
+          strequal(conn->protostr, "FTPS")) {
+
+/* MN 06/07/02 */
+#ifndef CURL_DISABLE_FTP
+    char *type;
+
+    if(strequal(conn->protostr, "FTPS")) {
+#ifdef USE_SSLEAY
+      conn->protocol |= PROT_FTPS|PROT_SSL;
+#else
+      failf(data, LIBCURL_NAME
+            " was built with SSL disabled, ftps: not supported!");
+      return CURLE_UNSUPPORTED_PROTOCOL;
+#endif /* !USE_SSLEAY */
+    }
+
+    conn->port = (data->set.use_port && data->state.allow_port)?
+      data->set.use_port:PORT_FTP;
+    conn->remote_port = PORT_FTP;
+    conn->protocol |= PROT_FTP;
+
+    if(data->change.proxy &&
+       *data->change.proxy &&
+       !data->set.tunnel_thru_httpproxy) {
+      /* Unless we have asked to tunnel ftp operations through the proxy, we
+         switch and use HTTP operations only */
+      if(conn->protocol & PROT_FTPS) {
+        /* FTPS is a hacked protocol and does not work through your
+           ordinary http proxy! */
+        failf(data, "ftps does not work through http proxy!");
+        return CURLE_UNSUPPORTED_PROTOCOL;
+      }
+#ifndef CURL_DISABLE_HTTP
+      conn->curl_do = Curl_http;
+      conn->curl_done = Curl_http_done;
+#else
+      failf(data, "FTP over http proxy requires HTTP support built-in!");
+      return CURLE_UNSUPPORTED_PROTOCOL;
+#endif
+    }
+    else {
+      conn->curl_do = Curl_ftp;
+      conn->curl_do_more = Curl_ftp_nextconnect;
+      conn->curl_done = Curl_ftp_done;
+      conn->curl_connect = Curl_ftp_connect;
+      conn->curl_disconnect = Curl_ftp_disconnect;
+    }
+
+    conn->ppath++; /* don't include the initial slash */
+
+    /* FTP URLs support an extension like ";type=<typecode>" that
+     * we'll try to get now! */
+    type=strstr(conn->ppath, ";type=");
+    if(!type) {
+      type=strstr(conn->gname, ";type=");
+    }
+    if(type) {
+      char command;
+      *type=0;                     /* it was in the middle of the hostname */
+      command = toupper(type[6]);
+      switch(command) {
+      case 'A': /* ASCII mode */
+	data->set.ftp_ascii = 1;
+	break;
+      case 'D': /* directory mode */
+	data->set.ftp_list_only = 1;
+	break;
+      case 'I': /* binary mode */
+      default:
+	/* switch off ASCII */
+	data->set.ftp_ascii = 0;
+	break;
+      }
+    }
+
+/* MN 06/07/02 */
+#else /* CURL_DISABLE_FTP */
+    failf(data, LIBCURL_NAME
+          " was built with FTP disabled, ftp/ftps: not supported!");
+    return CURLE_UNSUPPORTED_PROTOCOL;
+#endif
+  }
+  else if(strequal(conn->protostr, "TELNET")) {
+#ifndef CURL_DISABLE_TELNET
+    /* telnet testing factory */
+    conn->protocol |= PROT_TELNET;
+
+    conn->port = (data->set.use_port && data->state.allow_port)?
+      data->set.use_port: PORT_TELNET;
+    conn->remote_port = PORT_TELNET;
+    conn->curl_do = Curl_telnet;
+    conn->curl_done = Curl_telnet_done;
+#else
+    failf(data, LIBCURL_NAME
+          " was built with TELNET disabled!");
+#endif
+  }
+  else if (strequal(conn->protostr, "DICT")) {
+#ifndef CURL_DISABLE_DICT
+    conn->protocol |= PROT_DICT;
+    conn->port = (data->set.use_port && data->state.allow_port)?
+      data->set.use_port:PORT_DICT;
+    conn->remote_port = PORT_DICT;
+    conn->curl_do = Curl_dict;
+    conn->curl_done = NULL; /* no DICT-specific done */
+#else
+    failf(data, LIBCURL_NAME
+          " was built with DICT disabled!");
+#endif
+  }
+  else if (strequal(conn->protostr, "LDAP")) {
+#ifndef CURL_DISABLE_LDAP
+    conn->protocol |= PROT_LDAP;
+    conn->port = (data->set.use_port && data->state.allow_port)?
+      data->set.use_port:PORT_LDAP;
+    conn->remote_port = PORT_LDAP;
+    conn->curl_do = Curl_ldap;
+    conn->curl_done = NULL; /* no LDAP-specific done */
+#else
+    failf(data, LIBCURL_NAME
+          " was built with LDAP disabled!");
+#endif
+  }
+  else if (strequal(conn->protostr, "FILE")) {
+#ifndef CURL_DISABLE_FILE
+    conn->protocol |= PROT_FILE;
+
+    conn->curl_do = Curl_file;
+    /* no done() function */
+
+    /* anyway, this is supposed to be the connect function so we better
+       at least check that the file is present here! */
+    result = Curl_file_connect(conn);
+
+    /* Setup a "faked" transfer that'll do nothing */
+    if(CURLE_OK == result) {
+      conn->bits.tcpconnect = TRUE; /* we are "connected */
+      result = Curl_Transfer(conn, -1, -1, FALSE, NULL, /* no download */
+                             -1, NULL); /* no upload */
+    }
+
+    return result;
+#else
+    failf(data, LIBCURL_NAME
+          " was built with FILE disabled!");
+#endif
+  }
+  else {
+    /* We fell through all checks and thus we don't support the specified
+       protocol */
+    failf(data, "Unsupported protocol: %s", conn->protostr);
+    return CURLE_UNSUPPORTED_PROTOCOL;
+  }
+
+  /*************************************************************
+   * Figure out the remote port number
+   *
+   * No matter if we use a proxy or not, we have to figure out the remote
+   * port number of various reasons.
+   *
+   * To be able to detect port number flawlessly, we must not confuse them
+   * IPv6-specified addresses in the [0::1] style. (RFC2732)
+   *
+   * The conn->name is currently [user:passwd@]host[:port] where host could
+   * be a hostname, IPv4 address or IPv6 address.
+   *************************************************************/
+  if((1 == sscanf(conn->name, "[%*39[0-9a-fA-F:.]%c", &endbracket)) &&
+     (']' == endbracket)) {
+    /* this is a RFC2732-style specified IP-address */
+    conn->bits.ipv6_ip = TRUE;
+
+    conn->name++; /* pass the starting bracket */
+    conn->hostname++;
+    tmp = strchr(conn->name, ']');
+    *tmp = 0; /* zero terminate */
+    tmp++; /* pass the ending bracket */
+    if(':' != *tmp)
+      tmp = NULL; /* no port number available */
+  }
+  else
+    tmp = strrchr(conn->name, ':');
+
+  if (tmp) {
+    char *rest;
+    unsigned long port;
+
+    port=strtoul(tmp+1, &rest, 10);  /* Port number must be decimal */
+
+    if (rest != (tmp+1) && *rest == '\0') {
+      /* The colon really did have only digits after it,
+       * so it is either a port number or a mistake */
+
+      if (port > 0xffff) {   /* Single unix standard says port numbers are
+                              * 16 bits long */
+        failf(data, "Port number too large: %lu", port);
+        return CURLE_URL_MALFORMAT;
+      }
+
+      *tmp = '\0'; /* cut off the name there */
+      conn->remote_port = (unsigned short)port;
+    }
+  }
+
+  if(data->change.proxy && *data->change.proxy) {
+    /* If this is supposed to use a proxy, we need to figure out the proxy
+       host name name, so that we can re-use an existing connection
+       that may exist registered to the same proxy host. */
+
+    char *prox_portno;
+    char *endofprot;
+
+    /* We need to make a duplicate of the proxy so that we can modify the
+       string safely. */
+    char *proxydup=strdup(data->change.proxy);
+
+    /* We use 'proxyptr' to point to the proxy name from now on... */
+    char *proxyptr=proxydup;
+
+    if(NULL == proxydup) {
+      failf(data, "memory shortage");
+      return CURLE_OUT_OF_MEMORY;
+    }
+
+    /* Daniel Dec 10, 1998:
+       We do the proxy host string parsing here. We want the host name and the
+       port name. Accept a protocol:// prefix, even though it should just be
+       ignored. */
+
+    /* 1. skip the protocol part if present */
+    endofprot=strstr(proxyptr, "://");
+    if(endofprot) {
+      proxyptr = endofprot+3;
+    }
+
+    /* allow user to specify proxy.server.com:1080 if desired */
+    prox_portno = strchr (proxyptr, ':');
+    if (prox_portno) {
+      *prox_portno = 0x0; /* cut off number from host name */
+      prox_portno ++;
+      /* now set the local port number */
+      conn->port = atoi(prox_portno);
+    }
+    else if(data->set.proxyport) {
+      /* None given in the proxy string, then get the default one if it is
+         given */
+      conn->port = data->set.proxyport;
+    }
+
+    /* now, clone the cleaned proxy host name */
+    conn->proxyhost = strdup(proxyptr);
+
+    free(proxydup); /* free the duplicate pointer and not the modified */
+  }
+
+  /*************************************************************
+   * Take care of user and password authentication stuff
+   *************************************************************/
+
+  /*
+   * Inputs: data->set.userpwd   (CURLOPT_USERPWD)
+   *         data->set.fpasswd   (CURLOPT_PASSWDFUNCTION)
+   *         data->set.use_netrc (CURLOPT_NETRC)
+   *         conn->hostname
+   *         netrc file
+   *         hard-coded defaults
+   *
+   * Outputs: (almost :- all currently undefined)
+   *          conn->bits.user_passwd  - non-zero if non-default passwords exist
+   *          conn->state.user        - non-zero length if defined
+   *          conn->state.passwd      -   ditto
+   *          conn->hostname          - remove user name and password
+   */
+
+  /* At this point, we're hoping all the other special cases have
+   * been taken care of, so conn->hostname is at most
+   *    [user[:password]]@]hostname
+   *
+   * We need somewhere to put the embedded details, so do that first.
+   */
+
+  data->state.user[0] =0;   /* to make everything well-defined */
+  data->state.passwd[0]=0;
+
+  if (conn->protocol & (PROT_FTP|PROT_HTTP)) {
+    /* This is a FTP or HTTP URL, we will now try to extract the possible
+     * user+password pair in a string like:
+     * ftp://user:password@ftp.my.site:8021/README */
+    char *ptr=strchr(conn->name, '@');
+    char *userpass = conn->name;
+    if(ptr != NULL) {
+      /* there's a user+password given here, to the left of the @ */
+
+      conn->name = conn->hostname = ++ptr;
+
+      /* So the hostname is sane.  Only bother interpreting the
+       * results if we could care.  It could still be wasted
+       * work because it might be overtaken by the programmatically
+       * set user/passwd, but doing that first adds more cases here :-(
+       */
+
+      if (data->set.use_netrc != CURL_NETRC_REQUIRED) {
+        /* We could use the one in the URL */
+
+        conn->bits.user_passwd = 1; /* enable user+password */
+
+        if(*userpass != ':') {
+          /* the name is given, get user+password */
+          sscanf(userpass, "%127[^:@]:%127[^@]",
+                 data->state.user, data->state.passwd);
+        }
+        else
+          /* no name given, get the password only */
+          sscanf(userpass, ":%127[^@]", data->state.passwd);
+
+        if(data->state.user[0]) {
+          char *newname=curl_unescape(data->state.user, 0);
+          if(strlen(newname) < sizeof(data->state.user)) {
+            strcpy(data->state.user, newname);
+          }
+          /* if the new name is longer than accepted, then just use
+             the unconverted name, it'll be wrong but what the heck */
+          free(newname);
+        }
+        if (data->state.passwd[0]) {
+          /* we have a password found in the URL, decode it! */
+          char *newpasswd=curl_unescape(data->state.passwd, 0);
+          if(strlen(newpasswd) < sizeof(data->state.passwd)) {
+            strcpy(data->state.passwd, newpasswd);
+          }
+          free(newpasswd);
+
+          /* we have set the password */
+          data->state.passwdgiven = TRUE;
+        }
+      }
+    }
+  }
+
+  /* Programmatically set password:
+   *   - always applies, if available
+   *   - takes precedence over the values we just set above
+   * so scribble it over the top.
+   * User-supplied passwords are assumed not to need unescaping.
+   *
+   * user_password is set in "inherite initial knowledge' above,
+   * so it doesn't have to be set in this block
+   */
+  if (data->set.userpwd != NULL) {
+    if(*data->set.userpwd != ':') {
+      /* the name is given, get user+password */
+      sscanf(data->set.userpwd, "%127[^:]:%127[^\n]",
+             data->state.user, data->state.passwd);
+      if(strchr(data->set.userpwd, ':'))
+        /* a colon means the password was given, even if blank */
+        data->state.passwdgiven = TRUE;
+    }
+    else
+      /* no name given, starts with a colon, get the password only */
+      sscanf(data->set.userpwd+1, "%127[^\n]", data->state.passwd);
+  }
+
+  if ((data->set.use_netrc != CURL_NETRC_IGNORED) &&
+      !data->state.passwdgiven) {  /* need passwd */
+    if(Curl_parsenetrc(conn->hostname,
+                       data->state.user,
+                       data->state.passwd)) {
+      infof(data, "Couldn't find host %s in the .netrc file, using defaults",
+            conn->hostname);
+    }
+    else {
+      conn->bits.user_passwd = 1; /* enable user+password */
+      data->state.passwdgiven = TRUE;
+    }
+  }
+
+  /* if we have a user but no password, ask for one */
+  if(conn->bits.user_passwd && !data->state.passwdgiven ) {
+    if(data->set.fpasswd(data->set.passwd_client,
+                         "password:", data->state.passwd,
+                         sizeof(data->state.passwd)))
+      return CURLE_BAD_PASSWORD_ENTERED;
+  }
+
+  /* So we could have a password but no user; that's just too bad. */
+
+  /* If our protocol needs a password and we have none, use the defaults */
+  if ( (conn->protocol & (PROT_FTP|PROT_HTTP)) &&
+       !conn->bits.user_passwd &&
+       !data->state.passwdgiven) {
+
+    strcpy(data->state.user, CURL_DEFAULT_USER);
+    strcpy(data->state.passwd, CURL_DEFAULT_PASSWORD);
+
+    /* This is the default password, so DON'T set conn->bits.user_passwd */
+  }
+
+  /*************************************************************
+   * Check the current list of connections to see if we can
+   * re-use an already existing one or if we have to create a
+   * new one.
+   *************************************************************/
+
+  /* get a cloned copy of the SSL config situation stored in the 
+     connection struct */
+  if(!Curl_clone_ssl_config(&data->set.ssl, &conn->ssl_config))
+    return CURLE_OUT_OF_MEMORY;
+
+  /* reuse_fresh is set TRUE if we are told to use a fresh connection
+     by force */
+  if(!data->set.reuse_fresh &&
+     ConnectionExists(data, conn, &conn_temp)) {
+    /*
+     * We already have a connection for this, we got the former connection
+     * in the conn_temp variable and thus we need to cleanup the one we
+     * just allocated before we can move along and use the previously
+     * existing one.
+     */
+    struct connectdata *old_conn = conn;
+    char *path = old_conn->path; /* setup the current path pointer properly */
+    char *ppath = old_conn->ppath; /* this is the modified path pointer */
+    if(old_conn->proxyhost)
+      free(old_conn->proxyhost);
+
+    /* free the SSL config struct from this connection struct as this was
+       allocated in vain and is targeted for destruction */
+    Curl_free_ssl_config(&conn->ssl_config);
+
+    conn = conn_temp;        /* use this connection from now on */
+
+    /* get the user+password information from the old_conn struct since it may
+     * be new for this request even when we re-use an existing connection */
+    conn->bits.user_passwd = old_conn->bits.user_passwd;
+    conn->bits.proxy_user_passwd = conn->bits.proxy_user_passwd;
+
+    /* If we speak over a proxy, we need to copy the host name too, as it
+       might be another remote host even when re-using a connection */
+    strcpy(conn->gname, old_conn->gname); /* safe strcpy() */
+
+    /* we need these pointers if we speak over a proxy */
+    conn->hostname = conn->gname;
+    conn->name = &conn->gname[old_conn->name - old_conn->gname];
+
+    free(conn->path);    /* free the previously allocated path pointer */
+
+    /* 'path' points to the allocated data, 'ppath' may have been advanced
+       to point somewhere within the 'path' area. */
+    conn->path = path;
+    conn->ppath = ppath;
+
+    /* re-use init */
+    conn->bits.reuse = TRUE; /* yes, we're re-using here */
+    conn->bits.chunk = FALSE; /* always assume not chunked unless told
+                                 otherwise */
+    conn->maxdownload = -1;  /* might have been used previously! */
+
+    free(old_conn);          /* we don't need this anymore */
+
+    /*
+     * If we're doing a resumed transfer, we need to setup our stuff
+     * properly.
+     */
+    conn->resume_from = data->set.set_resume_from;
+    if (conn->resume_from) {
+        snprintf(resumerange, sizeof(resumerange), "%d-", conn->resume_from);
+        if (conn->bits.rangestringalloc == TRUE)
+            free(conn->range);
+
+        /* tell ourselves to fetch this range */
+        conn->range = strdup(resumerange);
+        conn->bits.use_range = TRUE;        /* enable range download */
+        conn->bits.rangestringalloc = TRUE; /* mark range string allocated */
+    }
+    else if (data->set.set_range) {
+      /* There is a range, but is not a resume, useful for random ftp access */
+      conn->range = strdup(data->set.set_range);
+      conn->bits.rangestringalloc = TRUE; /* mark range string allocated */
+      conn->bits.use_range = TRUE;        /* enable range download */
+    }
+
+    *in_connect = conn;      /* return this instead! */
+
+    infof(data, "Re-using existing connection! (#%d)\n", conn->connectindex);
+  }
+  else {
+    /*
+     * This is a brand new connection, so let's store it in the connection
+     * cache of ours!
+     */
+    ConnectionStore(data, conn);
+  }
+
+  /* Continue connectdata initialization here.
+   *
+   * Inherit the proper values from the urldata struct AFTER we have arranged
+   * the persistant conncetion stuff */
+  conn->fread = data->set.fread;
+  conn->fread_in = data->set.in;
+
+  conn->bits.upload_chunky =
+    ((conn->protocol&PROT_HTTP) &&
+     data->set.upload &&
+     (data->set.infilesize == -1) &&
+     (data->set.httpversion != CURL_HTTP_VERSION_1_0))?
+    /* HTTP, upload, unknown file size and not HTTP 1.0 */
+    TRUE:
+  /* else, no chunky upload */
+  FALSE;
+
+  /*************************************************************
+   * Set timeout if that is being used
+   *************************************************************/
+  if((data->set.timeout || data->set.connecttimeout) && !data->set.no_signal) {
+    /*************************************************************
+     * Set signal handler to catch SIGALRM
+     * Store the old value to be able to set it back later!
+     *************************************************************/
+
+#ifdef HAVE_SIGACTION
+    struct sigaction sigact;
+    sigaction(SIGALRM, NULL, &sigact);
+    keep_sigact = sigact;
+    keep_copysig = TRUE; /* yes, we have a copy */
+    sigact.sa_handler = alarmfunc;
+#ifdef SA_RESTART
+    /* HPUX doesn't have SA_RESTART but defaults to that behaviour! */
+    sigact.sa_flags &= ~SA_RESTART;
+#endif
+    /* now set the new struct */
+    sigaction(SIGALRM, &sigact, NULL);
+#else
+    /* no sigaction(), revert to the much lamer signal() */
+#ifdef HAVE_SIGNAL
+    keep_sigact = signal(SIGALRM, alarmfunc);
+#endif
+#endif
+
+    /* We set the timeout on the name resolving phase first, separately from
+     * the download/upload part to allow a maximum time on everything. This is
+     * a signal-based timeout, why it won't work and shouldn't be used in
+     * multi-threaded environments. */
+
+#ifdef HAVE_ALARM
+    /* alarm() makes a signal get sent when the timeout fires off, and that
+       will abort system calls */
+    prev_alarm = alarm(data->set.connecttimeout?
+                       data->set.connecttimeout:
+                       data->set.timeout);
+    /* We can expect the conn->created time to be "now", as that was just
+       recently set in the beginning of this function and nothing slow
+       has been done since then until now. */
+#endif
+  }
+
+  /*************************************************************
+   * Resolve the name of the server or proxy
+   *************************************************************/
+  if(conn->bits.reuse) {
+    /* re-used connection, no resolving is necessary */
+    hostaddr = NULL;
+  }
+  else if(!data->change.proxy || !*data->change.proxy) {
+    /* If not connecting via a proxy, extract the port from the URL, if it is
+     * there, thus overriding any defaults that might have been set above. */
+    conn->port =  conn->remote_port; /* it is the same port */
+
+    /* Resolve target host right on */
+    hostaddr = Curl_resolv(data, conn->name, conn->port);
+
+    if(!hostaddr) {
+      failf(data, "Couldn't resolve host '%s'", conn->name);
+      result =  CURLE_COULDNT_RESOLVE_HOST;
+      /* don't return yet, we need to clean up the timeout first */
+    }
+  }
+  else {
+    /* This is a proxy that hasn't been resolved yet. */
+
+    /* resolve proxy */
+    hostaddr = Curl_resolv(data, conn->proxyhost, conn->port);
+
+    if(!hostaddr) {
+      failf(data, "Couldn't resolve proxy '%s'", conn->proxyhost);
+      result = CURLE_COULDNT_RESOLVE_PROXY;
+      /* don't return yet, we need to clean up the timeout first */
+    }
+  }
+  Curl_pgrsTime(data, TIMER_NAMELOOKUP);
+#ifdef HAVE_ALARM
+  if((data->set.timeout || data->set.connecttimeout) && !data->set.no_signal) {
+#ifdef HAVE_SIGACTION
+    if(keep_copysig) {
+      /* we got a struct as it looked before, now put that one back nice
+         and clean */
+      sigaction(SIGALRM, &keep_sigact, NULL); /* put it back */
+    }
+#else
+#ifdef HAVE_SIGNAL
+    /* restore the previous SIGALRM handler */
+    signal(SIGALRM, keep_sigact);
+#endif
+#endif
+    /* switch back the alarm() to either zero or to what it was before minus
+       the time we spent until now! */
+    if(prev_alarm) {
+      /* there was an alarm() set before us, now put it back */
+      long elapsed_ms = Curl_tvdiff(Curl_tvnow(), conn->created);
+      long alarm_set;
+
+      /* the alarm period is counted in even number of seconds */
+      alarm_set = prev_alarm - elapsed_ms/1000;
+
+      if(alarm_set<=0) {
+        /* if it turned negative, we should fire off a SIGALRM here, but we
+           won't, and zero would be to switch it off so we never set it to
+           less than 1! */
+        alarm(1);
+        result = CURLE_OPERATION_TIMEOUTED;
+        failf(data, "Previous alarm fired off!");
+      }
+      else
+        alarm(alarm_set);
+    }
+    else
+      alarm(0); /* just shut it off */
+  }
+#endif
+  if(result)
+    return result;
+
+  /*************************************************************
+   * Proxy authentication
+   *************************************************************/
+  if(conn->bits.proxy_user_passwd) {
+    char *authorization;
+    snprintf(data->state.buffer, BUFSIZE, "%s:%s",
+             data->state.proxyuser, data->state.proxypasswd);
+    if(Curl_base64_encode(data->state.buffer, strlen(data->state.buffer),
+                          &authorization) >= 0) {
+      if(conn->allocptr.proxyuserpwd)
+        free(conn->allocptr.proxyuserpwd);
+      conn->allocptr.proxyuserpwd =
+        aprintf("Proxy-authorization: Basic %s\015\012", authorization);
+      free(authorization);
+    }
+  }
+
+  /*************************************************************
+   * Send user-agent to HTTP proxies even if the target protocol
+   * isn't HTTP.
+   *************************************************************/
+  if((conn->protocol&PROT_HTTP) ||
+     (data->change.proxy && *data->change.proxy)) {
+    if(data->set.useragent) {
+      if(conn->allocptr.uagent)
+        free(conn->allocptr.uagent);
+      conn->allocptr.uagent =
+        aprintf("User-Agent: %s\015\012", data->set.useragent);
+    }
+  }
+
+  if(data->set.encoding) {
+    if(conn->allocptr.accept_encoding)
+      free(conn->allocptr.accept_encoding);
+    conn->allocptr.accept_encoding =
+      aprintf("Accept-Encoding: %s\015\012", data->set.encoding);
+  }
+
+  conn->bytecount = 0;
+  conn->headerbytecount = 0;
+
+  if(-1 == conn->firstsocket) {
+    bool connected;
+
+    /* Connect only if not already connected! */
+    result = ConnectPlease(conn, hostaddr, &connected);
+
+    if(connected) {
+      result = Curl_protocol_connect(conn, hostaddr);
+      if(CURLE_OK == result)
+        conn->bits.tcpconnect = TRUE;
+    }
+    else
+      conn->bits.tcpconnect = FALSE;
+
+
+    if(CURLE_OK != result)
+      return result;
+  }
+  else {
+    Curl_pgrsTime(data, TIMER_CONNECT); /* we're connected already */
+    conn->bits.tcpconnect = TRUE;
+    if(data->set.verbose)
+      verboseconnect(conn, hostaddr);
+  }
+
+  conn->now = Curl_tvnow(); /* time this *after* the connect is done, we
+                               set this here perhaps a second time */
+
+#ifdef __EMX__
+  /* 20000330 mgs
+   * the check is quite a hack...
+   * we're calling _fsetmode to fix the problem with fwrite converting newline
+   * characters (you get mangled text files, and corrupted binary files when
+   * you download to stdout and redirect it to a file). */
+
+  if ((data->set.out)->_handle == NULL) {
+    _fsetmode(stdout, "b");
+  }
+#endif
+
+  return CURLE_OK;
+}
+
+CURLcode Curl_connect(struct SessionHandle *data,
+                      struct connectdata **in_connect)
+{
+  CURLcode code;
+  struct connectdata *conn;
+
+  /* call the stuff that needs to be called */
+  code = CreateConnection(data, in_connect);
+
+  if(CURLE_OK != code) {
+    /* We're not allowed to return failure with memory left allocated
+       in the connectdata struct, free those here */
+    conn = (struct connectdata *)*in_connect;
+    if(conn) {
+      Curl_disconnect(conn);      /* close the connection */
+      *in_connect = NULL;         /* return a NULL */
+    }
+  }
+  return code;
+}
+
+CURLcode Curl_done(struct connectdata *conn)
+{
+  struct SessionHandle *data=conn->data;
+  CURLcode result;
+
+  /* cleanups done even if the connection is re-used */
+
+  if(conn->bits.rangestringalloc) {
+    free(conn->range);
+    conn->bits.rangestringalloc = FALSE;
+  }
+
+  /* Cleanup possible redirect junk */
+  if(conn->newurl) {
+    free(conn->newurl);
+    conn->newurl = NULL;
+  }
+
+  if(conn->connect_addr)
+    Curl_resolv_unlock(conn->data, conn->connect_addr); /* done with this */
+
+#if defined(MALLOCDEBUG) && defined(AGGRESIVE_TEST)
+  /* scan for DNS cache entries still marked as in use */
+  Curl_hash_apply(data->hostcache,
+                  NULL, Curl_scan_cache_used);
+#endif
+
+  /* this calls the protocol-specific function pointer previously set */
+  if(conn->curl_done)
+    result = conn->curl_done(conn);
+  else
+    result = CURLE_OK;
+
+  Curl_pgrsDone(conn); /* done with the operation */
+
+  /* if data->set.reuse_forbid is TRUE, it means the libcurl client has
+     forced us to close this no matter what we think.
+
+     if conn->bits.close is TRUE, it means that the connection should be
+     closed in spite of all our efforts to be nice, due to protocol
+     restrictions in our or the server's end */
+  if(data->set.reuse_forbid ||
+     ((CURLE_OK == result) && conn->bits.close))
+    result = Curl_disconnect(conn); /* close the connection */
+  else
+    infof(data, "Connection #%d left intact\n", conn->connectindex);
+
+  return result;
+}
+
+CURLcode Curl_do(struct connectdata **connp)
+{
+  CURLcode result=CURLE_OK;
+  struct connectdata *conn = *connp;
+  struct SessionHandle *data=conn->data;
+
+  conn->bits.do_more = FALSE; /* by default there's no curl_do_more() to use */
+
+  if(conn->curl_do) {
+    /* generic protocol-specific function pointer set in curl_connect() */
+    result = conn->curl_do(conn);
+
+    /* This was formerly done in transfer.c, but we better do it here */
+
+    if((CURLE_SEND_ERROR == result) && conn->bits.reuse) {
+      /* This was a re-use of a connection and we got a write error in the
+       * DO-phase. Then we DISCONNECT this connection and have another attempt
+       * to CONNECT and then DO again! The retry cannot possibly find another
+       * connection to re-use, since we only keep one possible connection for
+       * each.  */
+
+      infof(data, "Re-used connection seems dead, get a new one\n");
+
+      conn->bits.close = TRUE; /* enforce close of this connetion */
+      result = Curl_done(conn);   /* we are so done with this */
+      if(CURLE_OK == result) {
+        /* Now, redo the connect and get a new connection */
+        result = Curl_connect(data, connp);
+        if(CURLE_OK == result)
+          /* ... finally back to actually retry the DO phase */
+          result = conn->curl_do(*connp);
+      }
+    }
+  }
+  return result;
+}
+
+CURLcode Curl_do_more(struct connectdata *conn)
+{
+  CURLcode result=CURLE_OK;
+
+  if(conn->curl_do_more)
+    result = conn->curl_do_more(conn);
+
+  return result;
+}
+
+static bool safe_strequal(char* str1, char* str2)
+{
+  if(str1 && str2)
+    /* both pointers point to something then compare them */
+    return strequal(str1, str2);
+  else
+    /* if both pointers are NULL then treat them as equal */
+    return (!str1 && !str2);
+}
+
+bool
+Curl_ssl_config_matches(struct ssl_config_data* data,
+                        struct ssl_config_data* needle)
+{
+  if((data->version == needle->version) &&
+     (data->verifypeer == needle->verifypeer) &&
+     (data->verifyhost == needle->verifyhost) &&
+     safe_strequal(data->CApath, needle->CApath) &&
+     safe_strequal(data->CAfile, needle->CAfile) &&
+     safe_strequal(data->random_file, needle->random_file) &&
+     safe_strequal(data->egdsocket, needle->egdsocket) &&
+     safe_strequal(data->cipher_list, needle->cipher_list))
+    return TRUE;
+
+  return FALSE;
+}
+
+bool
+Curl_clone_ssl_config(struct ssl_config_data *source,
+                      struct ssl_config_data *dest)
+{
+  dest->verifyhost = source->verifyhost;
+  dest->verifypeer = source->verifypeer;
+  dest->version = source->version;
+
+  if(source->CAfile) {
+    dest->CAfile = strdup(source->CAfile);
+    if(!dest->CAfile)
+      return FALSE;
+  }
+
+  if(source->CApath) {
+    dest->CApath = strdup(source->CApath);
+    if(!dest->CApath)
+      return FALSE;
+  }
+
+  if(source->cipher_list) {
+    dest->cipher_list = strdup(source->cipher_list);
+    if(!dest->cipher_list)
+      return FALSE;
+  }
+
+  if(source->egdsocket) {
+    dest->egdsocket = strdup(source->egdsocket);
+    if(!dest->egdsocket)
+      return FALSE;
+  }
+
+  if(source->random_file) {
+    dest->random_file = strdup(source->random_file);
+    if(!dest->random_file)
+      return FALSE;
+  }
+
+  return TRUE;
+}
+
+void Curl_free_ssl_config(struct ssl_config_data* sslc)
+{
+  if(sslc->CAfile)
+    free(sslc->CAfile);
+
+  if(sslc->CApath)
+    free(sslc->CApath);
+
+  if(sslc->cipher_list)
+    free(sslc->cipher_list);
+
+  if(sslc->egdsocket)
+    free(sslc->egdsocket);
+
+  if(sslc->random_file)
+    free(sslc->random_file);
+}
diff --git a/main/source/curl/lib/url.h b/main/source/curl/lib/url.h
new file mode 100644
index 00000000..88231943
--- /dev/null
+++ b/main/source/curl/lib/url.h
@@ -0,0 +1,45 @@
+#ifndef __URL_H
+#define __URL_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: url.h,v 1.14 2003/03/31 05:13:26 bagder Exp $
+ ***************************************************************************/
+
+/*
+ * Prototypes for library-wide functions provided by url.c
+ */
+
+CURLcode Curl_open(struct SessionHandle **curl);
+CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, ...);
+CURLcode Curl_close(struct SessionHandle *data); /* opposite of curl_open() */
+CURLcode Curl_connect(struct SessionHandle *, struct connectdata **);
+CURLcode Curl_do(struct connectdata **);
+CURLcode Curl_do_more(struct connectdata *);
+CURLcode Curl_done(struct connectdata *);
+CURLcode Curl_disconnect(struct connectdata *);
+CURLcode Curl_protocol_connect(struct connectdata *conn,
+                               struct Curl_dns_entry *dns);
+bool Curl_ssl_config_matches(struct ssl_config_data* data,
+                             struct ssl_config_data* needle);
+bool Curl_clone_ssl_config(struct ssl_config_data* source,
+                           struct ssl_config_data* dest);
+void Curl_free_ssl_config(struct ssl_config_data* sslc);
+#endif
diff --git a/main/source/curl/lib/urldata.h b/main/source/curl/lib/urldata.h
new file mode 100644
index 00000000..fdc64681
--- /dev/null
+++ b/main/source/curl/lib/urldata.h
@@ -0,0 +1,797 @@
+#ifndef __URLDATA_H
+#define __URLDATA_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: urldata.h,v 1.152 2003/05/09 07:39:29 bagder Exp $
+ ***************************************************************************/
+
+/* This file is for lib internal stuff */
+
+#include "setup.h"
+
+#define PORT_FTP 21
+#define PORT_TELNET 23
+#define PORT_GOPHER 70
+#define PORT_HTTP 80
+#define PORT_HTTPS 443
+#define PORT_DICT 2628
+#define PORT_LDAP 389
+
+#define DICT_MATCH "/MATCH:"
+#define DICT_MATCH2 "/M:"
+#define DICT_MATCH3 "/FIND:"
+#define DICT_DEFINE "/DEFINE:"
+#define DICT_DEFINE2 "/D:"
+#define DICT_DEFINE3 "/LOOKUP:"
+
+#define CURL_DEFAULT_USER "anonymous"
+#define CURL_DEFAULT_PASSWORD "curl_by_daniel@haxx.se"
+
+#include "cookie.h"
+#include "formdata.h"
+    
+#ifdef USE_SSLEAY
+/* SSLeay stuff usually in /usr/local/ssl/include */
+#ifdef USE_OPENSSL
+#include "openssl/rsa.h"
+#include "openssl/crypto.h"
+#include "openssl/x509.h"
+#include "openssl/pem.h"
+#include "openssl/ssl.h"
+#include "openssl/err.h"
+#ifdef HAVE_OPENSSL_ENGINE_H
+#include <openssl/engine.h>
+#endif
+#else
+#include "rsa.h"
+#include "crypto.h"
+#include "x509.h"
+#include "pem.h"
+#include "ssl.h"
+#include "err.h"
+#endif
+#endif
+
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+
+#include "timeval.h"
+
+#include <curl/curl.h>
+
+#include "http_chunks.h" /* for the structs and enum stuff */
+#include "hostip.h"
+#include "hash.h"
+
+#ifdef HAVE_ZLIB_H
+#include <zlib.h> 		/* for content-encoding 08/28/02 jhrg */
+#endif
+
+/* Download buffer size, keep it fairly big for speed reasons */
+#define BUFSIZE CURL_MAX_WRITE_SIZE
+
+/* Initial size of the buffer to store headers in, it'll be enlarged in case
+   of need. */
+#define HEADERSIZE 256
+
+/* Maximum number of dirs supported by libcurl in a FTP dir hierarchy */
+#define CURL_MAX_FTP_DIRDEPTH 100
+
+/* Just a convenience macro to get the larger value out of two given */
+#ifndef MAX
+#define MAX(x,y) ((x)>(y)?(x):(y))
+#endif
+
+#ifdef KRB4
+/* Types needed for krb4-ftp connections */
+struct krb4buffer {
+  void *data;
+  size_t size;
+  size_t index;
+  int eof_flag;
+};
+enum protection_level { 
+    prot_clear, 
+    prot_safe, 
+    prot_confidential, 
+    prot_private 
+};
+#endif
+
+/* struct for data related to SSL and SSL connections */
+struct ssl_connect_data {
+  bool use;              /* use ssl encrypted communications TRUE/FALSE */
+#ifdef USE_SSLEAY
+  /* these ones requires specific SSL-types */
+  SSL_CTX* ctx;
+  SSL*     handle;
+  X509*    server_cert;
+#endif /* USE_SSLEAY */
+};
+
+struct ssl_config_data {
+  long version;          /* what version the client wants to use */
+  long certverifyresult; /* result from the certificate verification */
+  long verifypeer;       /* set TRUE if this is desired */
+  long verifyhost;       /* 0: no verify
+                            1: check that CN exists
+                            2: CN must match hostname */
+  char *CApath;          /* DOES NOT WORK ON WINDOWS */
+  char *CAfile;          /* cerficate to verify peer against */
+  char *random_file;     /* path to file containing "random" data */
+  char *egdsocket;       /* path to file containing the EGD daemon socket */
+  char *cipher_list;     /* list of ciphers to use */
+  long numsessions;      /* SSL session id cache size */
+};
+
+/* information stored about one single SSL session */
+struct curl_ssl_session {
+  char *name;       /* host name for which this ID was used */
+  void *sessionid;  /* as returned from the SSL layer */
+  long age;         /* just a number, the higher the more recent */
+  unsigned short remote_port; /* remote port to connect to */
+  struct ssl_config_data ssl_config; /* setup for this session */
+};
+
+
+/****************************************************************************
+ * HTTP unique setup
+ ***************************************************************************/
+struct HTTP {
+  struct FormData *sendit;
+  int postsize;
+  char *postdata;
+
+  const char *p_pragma;      /* Pragma: string */
+  const char *p_accept;      /* Accept: string */
+  long readbytecount; 
+  long writebytecount;
+
+  /* For FORM posting */
+  struct Form form;
+  struct Curl_chunker chunk;
+
+  struct back {
+    curl_read_callback fread; /* backup storage for fread pointer */
+    void *fread_in;           /* backup storage for fread_in pointer */
+    char *postdata;
+    int postsize;
+  } backup;
+
+  enum {
+    HTTPSEND_NADA,    /* init */
+    HTTPSEND_REQUEST, /* sending a request */
+    HTTPSEND_BODY,    /* sending body */
+    HTTPSEND_LAST     /* never use this */
+  } sending;
+
+  void *send_buffer; /* used if the request couldn't be sent in one chunk,
+                        points to an allocated send_buffer struct */
+};
+
+/****************************************************************************
+ * FTP unique setup
+ ***************************************************************************/
+struct FTP {
+  long *bytecountp;
+  char *user;    /* user name string */
+  char *passwd;  /* password string */
+  char *urlpath; /* the originally given path part of the URL */
+  char *dirs[CURL_MAX_FTP_DIRDEPTH]; /* path components */
+  char *file;    /* decoded file */
+
+  char *entrypath; /* the PWD reply when we logged on */
+
+  char *cache;       /* data cache between getresponse()-calls */
+  size_t cache_size; /* size of cache in bytes */
+  bool dont_check;  /* Set to TRUE to prevent the final (post-transfer)
+                       file size and 226/250 status check. It should still
+                       read the line, just ignore the result. */
+  bool no_transfer; /* nothing was transfered, (possibly because a resumed
+                       transfer already was complete) */
+  long response_time; /* When no timeout is given, this is the amount of
+                         seconds we await for an FTP response. Initialized
+                         in Curl_ftp_connect() */
+};
+
+/****************************************************************************
+ * FILE unique setup
+ ***************************************************************************/
+struct FILE {
+  int fd; /* open file descriptor to read from! */
+};
+
+/*
+ * Boolean values that concerns this connection.
+ */
+struct ConnectBits {
+  bool close; /* if set, we close the connection after this request */
+  bool reuse; /* if set, this is a re-used connection */
+  bool chunk; /* if set, this is a chunked transfer-encoding */
+  bool httpproxy;    /* if set, this transfer is done through a http proxy */
+  bool user_passwd;    /* do we use user+password for this connection? */
+  bool proxy_user_passwd; /* user+password for the proxy? */
+  bool ipv6_ip; /* we communicate with a remove site specified with pure IPv6
+                   IP address */
+  bool use_range;
+  bool rangestringalloc; /* the range string is malloc()'ed */
+
+  bool do_more; /* this is set TRUE if the ->curl_do_more() function is
+                   supposed to be called, after ->curl_do() */
+
+  bool upload_chunky; /* set TRUE if we are doing chunked transfer-encoding
+                         on upload */
+  bool getheader;     /* TRUE if header parsing is wanted */
+
+  bool forbidchunk;   /* used only to explicitly forbid chunk-upload for
+                         specific upload buffers. See readmoredata() in
+                         http.c for details. */
+  bool tcpconnect;    /* the tcp stream (or simimlar) is connected, this
+                         is set the first time on the first connect function
+                         call */
+};
+
+/*
+ * This struct is all the previously local variables from Curl_perform() moved
+ * to struct to allow the function to return and get re-invoked better without
+ * losing state.
+ */
+
+struct Curl_transfer_keeper {
+  int bytecount;                /* total number of bytes read */
+  int writebytecount;           /* number of bytes written */
+  long contentlength;           /* size of incoming data */
+  struct timeval start;         /* transfer started at this time */
+  struct timeval now;           /* current time */
+  bool header;	                /* incoming data has HTTP header */
+  enum {
+    HEADER_NORMAL,      /* no bad header at all */
+    HEADER_PARTHEADER,  /* part of the chunk is a bad header, the rest is
+                           normal data */
+    HEADER_ALLBAD       /* all was believed to be header */
+  } badheader;		        /* the header was deemed bad and will be
+                                   written as body */
+  int headerline;		/* counts header lines to better track the
+                                   first one */
+  char *hbufp;			/* points at *end* of header line */
+  int hbuflen;
+  char *str;			/* within buf */
+  char *str_start;		/* within buf */
+  char *end_ptr;		/* within buf */
+  char *p;			/* within headerbuff */
+  bool content_range;      	/* set TRUE if Content-Range: was found */
+  int offset;	                /* possible resume offset read from the
+                                   Content-Range: header */
+  int httpcode;		        /* error code from the 'HTTP/1.? XXX' line */
+  int httpversion;		/* the HTTP version*10 */
+  struct timeval start100;      /* time stamp to wait for the 100 code from */
+  bool write_after_100_header;  /* TRUE = we enable the write after we
+                                   received a 100-continue/timeout or
+                                   FALSE = directly */
+  bool wait100_after_headers;   /* TRUE = after the request-headers have been
+                                   sent off properly, we go into the wait100
+                                   state, FALSE = don't */
+  int content_encoding;  	/* What content encoding. sec 3.5, RFC2616. */
+
+#define IDENTITY 0		/* No encoding */
+#define DEFLATE 1		/* zlib delfate [RFC 1950 & 1951] */
+#define GZIP 2			/* gzip algorithm [RFC 1952] */
+#define COMPRESS 3		/* Not handled, added for completeness */
+
+#ifdef HAVE_LIBZ
+  bool zlib_init;		/* True if zlib already initialized;
+				   undefined if Content-Encoding header. */
+  z_stream z;			/* State structure for zlib. */
+#endif
+
+  /* for the low speed checks: */
+  time_t timeofdoc;
+  long bodywrites;
+  int writetype;
+
+  char *buf;
+  char *uploadbuf;
+  int maxfd;
+
+  /* pointers to the actual descriptors we check */
+  fd_set *readfdp;
+  fd_set *writefdp;
+
+  /* the file descriptors to play with */
+  fd_set readfd;
+  fd_set writefd;
+  fd_set rkeepfd;
+  fd_set wkeepfd;
+  int keepon;
+
+  bool upload_done; /* set to TRUE when doing chunked transfer-encoding upload
+                       and we're uploading the last chunk */
+};
+
+
+/*
+ * The connectdata struct contains all fields and variables that should be
+ * unique for an entire connection.
+ */
+struct connectdata {
+  /**** Fields set when inited and not modified again */
+  struct SessionHandle *data; /* link to the root CURL struct */
+  int connectindex; /* what index in the connects index this particular
+                       struct has */
+
+  long protocol; /* PROT_* flags concerning the protocol set */
+#define PROT_MISSING (1<<0)
+#define PROT_GOPHER  (1<<1)
+#define PROT_HTTP    (1<<2)
+#define PROT_HTTPS   (1<<3)
+#define PROT_FTP     (1<<4)
+#define PROT_TELNET  (1<<5)
+#define PROT_DICT    (1<<6)
+#define PROT_LDAP    (1<<7)
+#define PROT_FILE    (1<<8)
+#define PROT_FTPS    (1<<9)
+#define PROT_SSL     (1<<10) /* protocol requires SSL */
+
+  /* the particular host we use, in two different ways */
+  struct Curl_dns_entry *connect_addr;
+
+#ifdef ENABLE_IPV6
+  struct addrinfo *serv_addr;
+#else
+  struct sockaddr_in serv_addr;
+#endif
+  char protostr[64];  /* store the protocol string in this buffer */
+  char gname[513]; /* store the hostname in this buffer */
+  char *name;      /* host name pointer to fool around with */
+  char *path;      /* allocated buffer to store the URL's path part in */
+  char *hostname;  /* hostname to connect, as parsed from url */
+  long port;       /* which port to use locally */
+  unsigned short remote_port; /* what remote port to connect to,
+                                 not the proxy port! */
+  char *ppath;
+  long bytecount;
+  long headerbytecount;  /* only count received headers */
+
+  char *range; /* range, if used. See README for detailed specification on
+                  this syntax. */
+  ssize_t resume_from; /* continue [ftp] transfer from here */
+
+  char *proxyhost; /* name of the http proxy host */
+
+  struct timeval now;     /* "current" time */
+  struct timeval created; /* creation time */
+  int firstsocket;     /* the main socket to use */
+  int secondarysocket; /* for i.e ftp transfers */
+  long maxdownload; /* in bytes, the maximum amount of data to fetch, 0
+                       means unlimited */
+  
+  struct ssl_connect_data ssl; /* this is for ssl-stuff */
+  struct ssl_config_data ssl_config;
+
+  struct ConnectBits bits;    /* various state-flags for this connection */
+
+  /* These two functions MUST be set by the curl_connect() function to be
+     be protocol dependent */
+  CURLcode (*curl_do)(struct connectdata *connect);
+  CURLcode (*curl_done)(struct connectdata *connect);
+
+  /* If the curl_do() function is better made in two halves, this
+   * curl_do_more() function will be called afterwards, if set. For example
+   * for doing the FTP stuff after the PASV/PORT command.
+   */
+  CURLcode (*curl_do_more)(struct connectdata *connect);
+
+  /* This function *MAY* be set to a protocol-dependent function that is run
+   * after the connect() and everything is done, as a step in the connection.
+   */ 
+  CURLcode (*curl_connect)(struct connectdata *connect);
+
+  /* This function *MAY* be set to a protocol-dependent function that is run
+   * by the curl_disconnect(), as a step in the disconnection.
+   */ 
+  CURLcode (*curl_disconnect)(struct connectdata *connect);
+
+  /* This function *MAY* be set to a protocol-dependent function that is run
+   * in the curl_close() function if protocol-specific cleanups are required.
+   */ 
+  CURLcode (*curl_close)(struct connectdata *connect);
+
+  /**** curl_get() phase fields */
+
+  /* READ stuff */
+  int sockfd;		 /* socket to read from or -1 */
+  int size;		 /* -1 if unknown at this point */
+  long *bytecountp;	 /* return number of bytes read or NULL */
+          
+  /* WRITE stuff */
+  int writesockfd;       /* socket to write to, it may very well be
+                            the same we read from. -1 disables */
+  long *writebytecountp; /* return number of bytes written or NULL */
+
+  /** Dynamicly allocated strings, may need to be freed before this **/
+  /** struct is killed.                                             **/
+  struct dynamically_allocated_data {
+    char *proxyuserpwd; /* free later if not NULL! */
+    char *uagent; /* free later if not NULL! */
+    char *accept_encoding; /* free later if not NULL! 08/28/02 jhrg */
+    char *userpwd; /* free later if not NULL! */
+    char *rangeline; /* free later if not NULL! */
+    char *ref; /* free later if not NULL! */
+    char *cookie; /* free later if not NULL! */
+    char *host; /* free later if not NULL */
+    char *cookiehost; /* free later if not NULL */
+  } allocptr;
+
+  char *newurl; /* This can only be set if a Location: was in the
+		   document headers */
+
+#ifdef KRB4
+  enum protection_level command_prot;
+  enum protection_level data_prot;
+  enum protection_level request_data_prot;
+
+  size_t buffer_size;
+
+  struct krb4buffer in_buffer, out_buffer;
+  int sec_complete;
+  void *app_data;
+
+  struct Curl_sec_client_mech *mech;
+  struct sockaddr_in local_addr;
+
+#endif
+
+  /*************** Request - specific items ************/
+  /* previously this was in the urldata struct */
+  union {
+    struct HTTP *http;
+    struct HTTP *gopher; /* alias, just for the sake of being more readable */
+    struct HTTP *https;  /* alias, just for the sake of being more readable */
+    struct FTP *ftp;
+    struct FILE *file;
+    void *telnet;        /* private for telnet.c-eyes only */
+#if 0 /* no need for special ones for these: */
+    struct LDAP *ldap;
+    struct DICT *dict;
+#endif
+    void *generic;
+  } proto;
+
+  /* This struct is inited when needed */
+  struct Curl_transfer_keeper keep;
+
+  /* 'upload_present' is used to keep a byte counter of how much data there is
+     still left in the buffer, aimed for upload. */
+  int upload_present;
+
+   /* 'upload_fromhere' is used as a read-pointer when we uploaded parts of a
+      buffer, so the next read should read from where this pointer points to,
+      and the 'upload_present' contains the number of bytes available at this
+      position */
+  char *upload_fromhere;
+
+  curl_read_callback fread; /* function that reads the input */
+  void *fread_in;           /* pointer to pass to the fread() above */
+};
+
+/* The end of connectdata. 08/27/02 jhrg */
+
+/*
+ * Struct to keep statistical and informational data.
+ */
+struct PureInfo {
+  int httpcode;
+  int httpversion;
+  long filetime; /* If requested, this is might get set. Set to -1 if
+                    the time was unretrievable */
+  long header_size;  /* size of read header(s) in bytes */
+  long request_size; /* the amount of bytes sent in the request(s) */
+
+  char *contenttype; /* the content type of the object */
+};
+
+
+struct Progress {
+  long lastshow; /* time() of the last displayed progress meter or NULL to
+                    force redraw at next call */
+  double size_dl;
+  double size_ul;
+  double downloaded;
+  double uploaded;
+
+  double current_speed; /* uses the currently fastest transfer */
+
+  bool callback;  /* set when progress callback is used */
+  int width; /* screen width at download start */
+  int flags; /* see progress.h */
+
+  double timespent;
+
+  double dlspeed;
+  double ulspeed;
+
+  double t_nslookup;
+  double t_connect;
+  double t_pretransfer;
+  double t_starttransfer;
+  double t_redirect;
+
+  struct timeval start;
+  struct timeval t_startsingle;
+#define CURR_TIME (5+1) /* 6 entries for 5 seconds */
+
+  double speeder[ CURR_TIME ];
+  struct timeval speeder_time[ CURR_TIME ];
+  int speeder_c;
+};
+
+typedef enum {
+  HTTPREQ_NONE, /* first in list */
+  HTTPREQ_GET,
+  HTTPREQ_POST,
+  HTTPREQ_POST_FORM, /* we make a difference internally */
+  HTTPREQ_PUT,
+  HTTPREQ_CUSTOM,
+  HTTPREQ_LAST /* last in list */
+} Curl_HttpReq;
+
+/*
+ * Values that are generated, temporary or calculated internally for a
+ * "session handle" must be defined within the 'struct urlstate'.  This struct
+ * will be used within the SessionHandle struct. When the 'SessionHandle'
+ * struct is cloned, this data MUST NOT be copied.
+ *
+ * Remember that any "state" information goes globally for the curl handle.
+ * Session-data MUST be put in the connectdata struct and here.  */
+#define MAX_CURL_USER_LENGTH 256
+#define MAX_CURL_PASSWORD_LENGTH 256
+
+struct UrlState {
+  enum {
+    Curl_if_none,
+    Curl_if_easy,
+    Curl_if_multi
+  } used_interface;
+
+  /* buffers to store authentication data in, as parsed from input options */
+  char user[MAX_CURL_USER_LENGTH];
+  char passwd[MAX_CURL_PASSWORD_LENGTH];
+  char proxyuser[MAX_CURL_USER_LENGTH];
+  char proxypasswd[MAX_CURL_PASSWORD_LENGTH];
+
+  bool passwdgiven; /* set TRUE if an application-provided password has been
+                       set */
+
+  struct timeval keeps_speed; /* for the progress meter really */
+
+  /* 'connects' will be an allocated array with pointers. If the pointer is
+     set, it holds an allocated connection. */
+  struct connectdata **connects;
+  long numconnects; /* size of the 'connects' array */
+
+  char *headerbuff; /* allocated buffer to store headers in */
+  int headersize;   /* size of the allocation */
+
+  char buffer[BUFSIZE+1]; /* download buffer */
+  char uploadbuffer[BUFSIZE+1]; /* upload buffer */
+  double current_speed;  /* the ProgressShow() funcion sets this */
+
+  bool this_is_a_follow; /* this is a followed Location: request */
+
+  char *auth_host; /* if set, this should be the host name that we will
+                      sent authorization to, no else. Used to make Location:
+                      following not keep sending user+password... This is
+                      strdup() data.
+                    */
+
+  struct curl_ssl_session *session; /* array of 'numsessions' size */
+  long sessionage;                  /* number of the most recent session */
+
+  char *scratch; /* huge buffer[BUFSIZE*2] when doing upload CRLF replacing */
+  bool errorbuf; /* Set to TRUE if the error buffer is already filled in.
+                    This must be set to FALSE every time _easy_perform() is
+                    called. */
+
+#ifdef HAVE_SIGNAL
+  /* storage for the previous bag^H^H^HSIGPIPE signal handler :-) */
+  void (*prev_signal)(int sig);
+#endif
+  bool allow_port; /* Is set.use_port allowed to take effect or not. This
+                      is always set TRUE when curl_easy_perform() is called. */
+};
+
+
+/*
+ * This 'DynamicStatic' struct defines dynamic states that actually change
+ * values in the 'UserDefined' area, which MUST be taken into consideration
+ * if the UserDefined struct is cloned or similar. You can probably just
+ * copy these, but each one indicate a special action on other data.
+ */
+
+struct DynamicStatic {
+  char *url;        /* work URL, copied from UserDefined */
+  bool url_alloc;   /* URL string is malloc()'ed */
+  char *proxy;      /* work proxy, copied from UserDefined */
+  bool proxy_alloc; /* http proxy string is malloc()'ed */
+  char *referer;    /* referer string */
+  bool referer_alloc; /* referer sting is malloc()ed */
+  struct curl_slist *cookielist; /* list of cookie files set by
+                                    curl_easy_setopt(COOKIEFILE) calls */
+};
+
+/*
+ * This 'UserDefined' struct must only contain data that is set once to go
+ * for many (perhaps) independent connections. Values that are generated or
+ * calculated internally for the "session handle" MUST be defined within the
+ * 'struct urlstate' instead. The only exceptions MUST note the changes in
+ * the 'DynamicStatic' struct.
+ */
+
+struct UserDefined {
+  FILE *err;         /* the stderr user data goes here */
+  void *debugdata;   /* the data that will be passed to fdebug */
+  char *errorbuffer; /* store failure messages in here */
+  char *proxyuserpwd;  /* Proxy <user:password>, if used */
+  long proxyport; /* If non-zero, use this port number by default. If the
+                     proxy string features a ":[port]" that one will override
+                     this. */  
+  void *out;         /* the fetched file goes here */
+  void *in;          /* the uploaded file is read from here */
+  void *writeheader; /* write the header to this is non-NULL */
+  char *set_url;     /* what original URL to work on */
+  char *set_proxy;   /* proxy to use */
+  long use_port;     /* which port to use (when not using default) */
+  char *userpwd;     /* <user:password>, if used */
+  char *set_range;   /* range, if used. See README for detailed specification
+                        on this syntax. */
+  long followlocation; /* as in HTTP Location: */
+  long maxredirs;    /* maximum no. of http(s) redirects to follow */
+  char *set_referer; /* custom string */
+  bool free_referer; /* set TRUE if 'referer' points to a string we
+                        allocated */
+  char *useragent;   /* User-Agent string */
+  char *encoding;    /* Accept-Encoding string */
+  char *postfields;  /* if POST, set the fields' values here */
+  size_t postfieldsize; /* if POST, this might have a size to use instead of
+                           strlen(), and then the data *may* be binary (contain
+                           zero bytes) */
+  char *ftpport;     /* port to send with the FTP PORT command */
+  char *device;      /* network interface to use */
+  curl_write_callback fwrite;        /* function that stores the output */
+  curl_write_callback fwrite_header; /* function that stores headers */
+  curl_read_callback fread;          /* function that reads the input */
+  curl_progress_callback fprogress;  /* function for progress information */
+  curl_debug_callback fdebug;      /* function that write informational data */
+  void *progress_client; /* pointer to pass to the progress callback */
+  curl_passwd_callback fpasswd;      /* call for password */
+  void *passwd_client;               /* pass to the passwd callback */
+  long timeout;         /* in seconds, 0 means no timeout */
+  long connecttimeout;  /* in seconds, 0 means no timeout */
+  long infilesize;      /* size of file to upload, -1 means unknown */
+  long low_speed_limit; /* bytes/second */
+  long low_speed_time;  /* number of seconds */
+  int set_resume_from;  /* continue [ftp] transfer from here */
+  char *cookie;         /* HTTP cookie string to send */
+  struct curl_slist *headers; /* linked list of extra headers */
+  struct HttpPost *httppost;  /* linked list of POST data */
+  char *cert;           /* certificate */
+  char *cert_type;      /* format for certificate (default: PEM) */
+  char *key;            /* private key */
+  char *key_type;       /* format for private key (default: PEM) */
+  char *key_passwd;     /* plain text private key password */
+  char *crypto_engine;  /* name of the crypto engine to use */
+  char *cookiejar;      /* dump all cookies to this file */
+  bool cookiesession;   /* new cookie session? */
+  bool crlf;            /* convert crlf on ftp upload(?) */
+  struct curl_slist *quote;     /* after connection is established */
+  struct curl_slist *postquote; /* after the transfer */
+  struct curl_slist *prequote; /* before the transfer, after type (Wesley Laxton)*/
+  struct curl_slist *telnet_options; /* linked list of telnet options */
+  curl_TimeCond timecondition; /* kind of time/date comparison */
+  time_t timevalue;       /* what time to compare with */
+  curl_closepolicy closepolicy; /* connection cache close concept */
+  Curl_HttpReq httpreq;   /* what kind of HTTP request (if any) is this */
+  char *customrequest;    /* HTTP/FTP request to use */
+  long httpversion; /* when non-zero, a specific HTTP version requested to
+                       be used in the library's request(s) */
+  char *auth_host; /* if set, this is the allocated string to the host name
+                    * to which to send the authorization data to, and no other
+                    * host (which location-following otherwise could lead to)
+                    */
+  char *krb4_level; /* what security level */
+  struct ssl_config_data ssl;  /* user defined SSL stuff */
+
+  curl_proxytype proxytype; /* what kind of proxy that is in use */
+
+  int dns_cache_timeout; /* DNS cache timeout */
+  long buffer_size;      /* size of receive buffer to use */
+
+  char *private; /* Private data */
+
+  struct curl_slist *http200aliases; /* linked list of aliases for http200 */
+  
+/* Here follows boolean settings that define how to behave during
+   this session. They are STATIC, set by libcurl users or at least initially
+   and they don't change during operations. */
+
+  bool get_filetime;
+  bool tunnel_thru_httpproxy;
+  bool ftp_append;
+  bool ftp_ascii;
+  bool ftp_list_only;
+  bool ftp_use_port;
+  bool hide_progress;
+  bool http_fail_on_error;
+  bool http_follow_location;
+  bool http_disable_hostname_check_before_authentication;
+  bool include_header;
+#define http_include_header include_header /* former name */
+
+  bool http_set_referer;
+  bool http_auto_referer; /* set "correct" referer when following location: */
+  bool no_body;
+  bool set_port;
+  bool upload;
+  enum CURL_NETRC_OPTION
+       use_netrc;        /* defined in include/curl.h */
+  bool verbose;
+  bool krb4;             /* kerberos4 connection requested */
+  bool reuse_forbid;     /* forbidden to be reused, close after use */
+  bool reuse_fresh;      /* do not re-use an existing connection  */
+  bool expect100header;  /* TRUE if we added Expect: 100-continue */
+  bool ftp_use_epsv;     /* if EPSV is to be attempted or not */
+  bool ftp_use_eprt;     /* if EPRT is to be attempted or not */
+  bool no_signal;        /* do not use any signal/alarm handler */
+
+  bool global_dns_cache;
+};
+
+/*
+ * In August 2001, this struct was redesigned and is since stricter than
+ * before. The 'connectdata' struct MUST have all the connection oriented
+ * stuff as we may now have several simultaneous connections and connection
+ * structs in memory.
+ *
+ * From now on, the 'SessionHandle' must only contain data that is set once to
+ * go for many (perhaps) independent connections. Values that are generated or
+ * calculated internally for the "session handle" must be defined within the
+ * 'struct urlstate' instead.  */
+
+struct SessionHandle {
+  curl_hash *hostcache;
+  struct Curl_share *share;    /* Share, handles global variable mutexing */
+  struct UserDefined set;      /* values set by the libcurl user */
+  struct DynamicStatic change; /* possibly modified userdefined data */
+
+  struct CookieInfo *cookies;  /* the cookies, read from files and servers */
+  struct Progress progress;    /* for all the progress meter data */
+  struct UrlState state;       /* struct for fields used for state info and
+                                  other dynamic purposes */
+  struct PureInfo info;        /* stats, reports and info data */
+#if defined(USE_SSLEAY) && defined(HAVE_OPENSSL_ENGINE_H)
+  ENGINE*  engine;
+#endif /* USE_SSLEAY */
+};
+
+#define LIBCURL_NAME "libcurl"
+
+#endif
diff --git a/main/source/curl/lib/version.c b/main/source/curl/lib/version.c
new file mode 100644
index 00000000..45fd7de1
--- /dev/null
+++ b/main/source/curl/lib/version.c
@@ -0,0 +1,201 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: version.c,v 1.24 2003/01/29 10:14:25 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#include <string.h>
+#include <stdio.h>
+
+#include <curl/curl.h>
+#include "urldata.h"
+
+#ifdef USE_SSLEAY
+static void getssl_version(char *ptr, long *num)
+{
+
+#if (SSLEAY_VERSION_NUMBER >= 0x905000)
+  {
+    char sub[2];
+    unsigned long ssleay_value;
+    sub[1]='\0';
+    ssleay_value=SSLeay();
+    *num = ssleay_value;
+    if(ssleay_value < 0x906000) {
+      ssleay_value=SSLEAY_VERSION_NUMBER;
+      sub[0]='\0';
+    }
+    else {
+      if(ssleay_value&0xff0) {
+        sub[0]=((ssleay_value>>4)&0xff) + 'a' -1;
+      }
+      else
+        sub[0]='\0';
+    }
+
+    sprintf(ptr, " OpenSSL/%lx.%lx.%lx%s",
+            (ssleay_value>>28)&0xf,
+            (ssleay_value>>20)&0xff,
+            (ssleay_value>>12)&0xff,
+            sub);
+  }
+
+#else
+  *num = SSLEAY_VERSION_NUMBER;
+#if (SSLEAY_VERSION_NUMBER >= 0x900000)
+  sprintf(ptr, " OpenSSL/%lx.%lx.%lx",
+          (SSLEAY_VERSION_NUMBER>>28)&0xff,
+          (SSLEAY_VERSION_NUMBER>>20)&0xff,
+          (SSLEAY_VERSION_NUMBER>>12)&0xf);
+#else
+  {
+    char sub[2];
+    sub[1]='\0';
+    if(SSLEAY_VERSION_NUMBER&0x0f) {
+      sub[0]=(SSLEAY_VERSION_NUMBER&0x0f) + 'a' -1;
+    }
+    else
+      sub[0]='\0';
+
+    sprintf(ptr, " SSL/%x.%x.%x%s",
+            (SSLEAY_VERSION_NUMBER>>12)&0xff,
+            (SSLEAY_VERSION_NUMBER>>8)&0xf,
+            (SSLEAY_VERSION_NUMBER>>4)&0xf, sub);
+  }
+#endif
+#endif
+}
+
+#endif
+
+char *curl_version(void)
+{
+  static char version[200];
+  char *ptr;
+  long num;
+  strcpy(version, LIBCURL_NAME "/" LIBCURL_VERSION );
+  ptr=strchr(version, '\0');
+
+#ifdef USE_SSLEAY
+  getssl_version(ptr, &num);
+  ptr=strchr(version, '\0');
+#else
+  (void)num; /* no compiler warning please */
+#endif
+
+#ifdef KRB4
+  sprintf(ptr, " krb4");
+  ptr += strlen(ptr);
+#endif
+#ifdef ENABLE_IPV6
+  sprintf(ptr, " ipv6");
+  ptr += strlen(ptr);
+#endif
+#ifdef HAVE_LIBZ
+  sprintf(ptr, " zlib/%s", zlibVersion());
+  ptr += strlen(ptr);
+#endif
+
+  return version;
+}
+
+/* data for curl_version_info */
+
+static const char *protocols[] = {
+#ifndef CURL_DISABLE_FTP
+  "ftp",
+#endif
+#ifndef CURL_DISABLE_GOPHER
+  "gopher",
+#endif
+#ifndef CURL_DISABLE_TELNET
+  "telnet",
+#endif
+#ifndef CURL_DISABLE_DICT
+  "dict",
+#endif
+#ifndef CURL_DISABLE_LDAP
+  "ldap",
+#endif
+#ifndef CURL_DISABLE_HTTP
+  "http",
+#endif
+#ifndef CURL_DISABLE_FILE
+  "file",
+#endif
+
+#ifdef USE_SSLEAY
+#ifndef CURL_DISABLE_HTTP
+  "https",
+#endif
+#ifndef CURL_DISABLE_FTP
+  "ftps",
+#endif
+#endif
+  NULL
+};
+
+static curl_version_info_data version_info = {
+  CURLVERSION_FIRST,
+  LIBCURL_VERSION,
+  LIBCURL_VERSION_NUM,
+  OS, /* as found by configure or set by hand at build-time */
+  0 /* features is 0 by default */
+#ifdef ENABLE_IPV6
+  | CURL_VERSION_IPV6
+#endif
+#ifdef KRB4
+  | CURL_VERSION_KERBEROS4
+#endif
+#ifdef USE_SSLEAY
+  | CURL_VERSION_SSL
+#endif
+#ifdef HAVE_LIBZ
+  | CURL_VERSION_LIBZ
+#endif
+  ,
+  NULL, /* ssl_version */
+  0,    /* ssl_version_num */
+  NULL, /* zlib_version */
+  protocols
+};
+
+curl_version_info_data *curl_version_info(CURLversion stamp)
+{
+#ifdef USE_SSLEAY
+  static char ssl_buffer[80];
+  long num;
+  getssl_version(ssl_buffer, &num);
+
+  version_info.ssl_version = ssl_buffer;
+  version_info.ssl_version_num = num;
+  /* SSL stuff is left zero if undefined */
+#endif
+
+#ifdef HAVE_LIBZ
+  version_info.libz_version = zlibVersion();
+  /* libz left NULL if non-existing */
+#endif
+  (void)stamp; /* avoid compiler warnings, we don't use this */
+
+  return &version_info;
+}
diff --git a/main/source/curl/ltmain.sh b/main/source/curl/ltmain.sh
new file mode 100644
index 00000000..ce212bf5
--- /dev/null
+++ b/main/source/curl/ltmain.sh
@@ -0,0 +1,6290 @@
+# ltmain.sh - Provide generalized library-building support services.
+# NOTE: Changing this file will not affect anything until you rerun configure.
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
+# Free Software Foundation, Inc.
+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Check that we have a working $echo.
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell, and then maybe $echo will work.
+  exec $SHELL "$0" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+$*
+EOF
+  exit 0
+fi
+
+# The name of this program.
+progname=`$echo "$0" | ${SED} 's%^.*/%%'`
+modename="$progname"
+
+# Constants.
+PROGRAM=ltmain.sh
+PACKAGE=libtool
+VERSION=1.5
+TIMESTAMP=" (1.1220 2003/04/05 19:32:58)"
+
+default_mode=
+help="Try \`$progname --help' for more information."
+magic="%%%MAGIC variable%%%"
+mkdir="mkdir"
+mv="mv -f"
+rm="rm -f"
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+# test EBCDIC or ASCII
+case `echo A|od -x` in
+ *[Cc]1*) # EBCDIC based system
+  SP2NL="tr '\100' '\n'"
+  NL2SP="tr '\r\n' '\100\100'"
+  ;;
+ *) # Assume ASCII based system
+  SP2NL="tr '\040' '\012'"
+  NL2SP="tr '\015\012' '\040\040'"
+  ;;
+esac
+
+# NLS nuisances.
+# Only set LANG and LC_ALL to C if already set.
+# These must not be set unconditionally because not all systems understand
+# e.g. LANG=C (notably SCO).
+# We save the old values to restore during execute mode.
+if test "${LC_ALL+set}" = set; then
+  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+fi
+if test "${LANG+set}" = set; then
+  save_LANG="$LANG"; LANG=C; export LANG
+fi
+
+# Make sure IFS has a sensible default
+: ${IFS=" 	"}
+
+if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+  $echo "$modename: not configured to build any kind of library" 1>&2
+  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+  exit 1
+fi
+
+# Global variables.
+mode=$default_mode
+nonopt=
+prev=
+prevopt=
+run=
+show="$echo"
+show_help=
+execute_dlfiles=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+
+#####################################
+# Shell function definitions:
+# This seems to be the best place for them
+
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+win32_libid () {
+  win32_libid_type="unknown"
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+      grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+      win32_nmres=`eval $NM -f posix -A $1 | \
+	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
+      if test "X$win32_nmres" = "Ximport" ; then
+        win32_libid_type="x86 archive import"
+      else
+        win32_libid_type="x86 archive static"
+      fi
+    fi
+    ;;
+  *DLL*) 
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
+    ;;
+  esac
+  $echo $win32_libid_type
+}
+
+# End of Shell function definitions
+#####################################
+
+# Parse our command line options once, thoroughly.
+while test "$#" -gt 0
+do
+  arg="$1"
+  shift
+
+  case $arg in
+  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  # If the previous option needs an argument, assign it.
+  if test -n "$prev"; then
+    case $prev in
+    execute_dlfiles)
+      execute_dlfiles="$execute_dlfiles $arg"
+      ;;
+    tag)
+      tagname="$arg"
+
+      # Check whether tagname contains only valid characters
+      case $tagname in
+      *[!-_A-Za-z0-9,/]*)
+	$echo "$progname: invalid tag name: $tagname" 1>&2
+	exit 1
+	;;
+      esac
+
+      case $tagname in
+      CC)
+	# Don't test for the "default" C tag, as we know, it's there, but
+	# not specially marked.
+	;;
+      *)
+	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
+	  taglist="$taglist $tagname"
+	  # Evaluate the configuration.
+	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
+	else
+	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
+	fi
+	;;
+      esac
+      ;;
+    *)
+      eval "$prev=\$arg"
+      ;;
+    esac
+
+    prev=
+    prevopt=
+    continue
+  fi
+
+  # Have we seen a non-optional argument yet?
+  case $arg in
+  --help)
+    show_help=yes
+    ;;
+
+  --version)
+    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+    $echo
+    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
+    $echo "This is free software; see the source for copying conditions.  There is NO"
+    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+    exit 0
+    ;;
+
+  --config)
+    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
+    # Now print the configurations for the tags.
+    for tagname in $taglist; do
+      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
+    done
+    exit 0
+    ;;
+
+  --debug)
+    $echo "$progname: enabling shell trace mode"
+    set -x
+    ;;
+
+  --dry-run | -n)
+    run=:
+    ;;
+
+  --features)
+    $echo "host: $host"
+    if test "$build_libtool_libs" = yes; then
+      $echo "enable shared libraries"
+    else
+      $echo "disable shared libraries"
+    fi
+    if test "$build_old_libs" = yes; then
+      $echo "enable static libraries"
+    else
+      $echo "disable static libraries"
+    fi
+    exit 0
+    ;;
+
+  --finish) mode="finish" ;;
+
+  --mode) prevopt="--mode" prev=mode ;;
+  --mode=*) mode="$optarg" ;;
+
+  --preserve-dup-deps) duplicate_deps="yes" ;;
+
+  --quiet | --silent)
+    show=:
+    ;;
+
+  --tag) prevopt="--tag" prev=tag ;;
+  --tag=*)
+    set tag "$optarg" ${1+"$@"}
+    shift
+    prev=tag
+    ;;
+
+  -dlopen)
+    prevopt="-dlopen"
+    prev=execute_dlfiles
+    ;;
+
+  -*)
+    $echo "$modename: unrecognized option \`$arg'" 1>&2
+    $echo "$help" 1>&2
+    exit 1
+    ;;
+
+  *)
+    nonopt="$arg"
+    break
+    ;;
+  esac
+done
+
+if test -n "$prevopt"; then
+  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+  $echo "$help" 1>&2
+  exit 1
+fi
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+if test -z "$show_help"; then
+
+  # Infer the operation mode.
+  if test -z "$mode"; then
+    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
+    case $nonopt in
+    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+      mode=link
+      for arg
+      do
+	case $arg in
+	-c)
+	   mode=compile
+	   break
+	   ;;
+	esac
+      done
+      ;;
+    *db | *dbx | *strace | *truss)
+      mode=execute
+      ;;
+    *install*|cp|mv)
+      mode=install
+      ;;
+    *rm)
+      mode=uninstall
+      ;;
+    *)
+      # If we have no mode, but dlfiles were specified, then do execute mode.
+      test -n "$execute_dlfiles" && mode=execute
+
+      # Just use the default operation mode.
+      if test -z "$mode"; then
+	if test -n "$nonopt"; then
+	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
+	else
+	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
+	fi
+      fi
+      ;;
+    esac
+  fi
+
+  # Only execute mode is allowed to have -dlopen flags.
+  if test -n "$execute_dlfiles" && test "$mode" != execute; then
+    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+    $echo "$help" 1>&2
+    exit 1
+  fi
+
+  # Change the help message to a mode-specific one.
+  generic_help="$help"
+  help="Try \`$modename --help --mode=$mode' for more information."
+
+  # These modes are in order of execution frequency so that they run quickly.
+  case $mode in
+  # libtool compile mode
+  compile)
+    modename="$modename: compile"
+    # Get the compilation command and the source file.
+    base_compile=
+    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+    suppress_output=
+    arg_mode=normal
+    libobj=
+
+    for arg
+    do
+      case "$arg_mode" in
+      arg  )
+	# do not "continue".  Instead, add this to base_compile
+	lastarg="$arg"
+	arg_mode=normal
+	;;
+
+      target )
+	libobj="$arg"
+	arg_mode=normal
+	continue
+	;;
+
+      normal )
+	# Accept any command-line options.
+	case $arg in
+	-o)
+	  if test -n "$libobj" ; then
+	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+	    exit 1
+	  fi
+	  arg_mode=target
+	  continue
+	  ;;
+
+	-static)
+	  build_old_libs=yes
+	  continue
+	  ;;
+
+	-prefer-pic)
+	  pic_mode=yes
+	  continue
+	  ;;
+
+	-prefer-non-pic)
+	  pic_mode=no
+	  continue
+	  ;;
+
+	-Xcompiler)
+	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+	  continue      #  The current "srcfile" will either be retained or
+	  ;;            #  replaced later.  I would guess that would be a bug.
+
+	-Wc,*)
+	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+	  lastarg=
+	  save_ifs="$IFS"; IFS=','
+	  for arg in $args; do
+	    IFS="$save_ifs"
+
+	    # Double-quote args containing other shell metacharacters.
+	    # Many Bourne shells cannot handle close brackets correctly
+	    # in scan sets, so we specify it separately.
+	    case $arg in
+	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	      arg="\"$arg\""
+	      ;;
+	    esac
+	    lastarg="$lastarg $arg"
+	  done
+	  IFS="$save_ifs"
+	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+
+	  # Add the arguments to base_compile.
+	  base_compile="$base_compile $lastarg"
+	  continue
+	  ;;
+
+	* )
+	  # Accept the current argument as the source file.
+	  # The previous "srcfile" becomes the current argument.
+	  #
+	  lastarg="$srcfile"
+	  srcfile="$arg"
+	  ;;
+	esac  #  case $arg
+	;;
+      esac    #  case $arg_mode
+
+      # Aesthetically quote the previous argument.
+      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
+
+      case $lastarg in
+      # Double-quote args containing other shell metacharacters.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	lastarg="\"$lastarg\""
+	;;
+      esac
+
+      base_compile="$base_compile $lastarg"
+    done # for arg
+
+    case $arg_mode in
+    arg)
+      $echo "$modename: you must specify an argument for -Xcompile"
+      exit 1
+      ;;
+    target)
+      $echo "$modename: you must specify a target with \`-o'" 1>&2
+      exit 1
+      ;;
+    *)
+      # Get the name of the library object.
+      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+      ;;
+    esac
+
+    # Recognize several different file suffixes.
+    # If the user specifies -o file.o, it is replaced with file.lo
+    xform='[cCFSifmso]'
+    case $libobj in
+    *.ada) xform=ada ;;
+    *.adb) xform=adb ;;
+    *.ads) xform=ads ;;
+    *.asm) xform=asm ;;
+    *.c++) xform=c++ ;;
+    *.cc) xform=cc ;;
+    *.ii) xform=ii ;;
+    *.class) xform=class ;;
+    *.cpp) xform=cpp ;;
+    *.cxx) xform=cxx ;;
+    *.f90) xform=f90 ;;
+    *.for) xform=for ;;
+    *.java) xform=java ;;
+    esac
+
+    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+
+    case $libobj in
+    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+    *)
+      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+      exit 1
+      ;;
+    esac
+
+    # Infer tagged configuration to use if any are available and
+    # if one wasn't chosen via the "--tag" command line option.
+    # Only attempt this if the compiler in the base compile
+    # command doesn't match the default compiler.
+    if test -n "$available_tags" && test -z "$tagname"; then
+      case $base_compile in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+	    case "$base_compile " in
+	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  $echo "$modename: unable to infer tagged configuration"
+	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+	  exit 1
+#        else
+#          $echo "$modename: using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+
+    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+    if test "X$xdir" = "X$obj"; then
+      xdir=
+    else
+      xdir=$xdir/
+    fi
+    lobj=${xdir}$objdir/$objname
+
+    if test -z "$base_compile"; then
+      $echo "$modename: you must specify a compilation command" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    # Delete any leftover library objects.
+    if test "$build_old_libs" = yes; then
+      removelist="$obj $lobj $libobj ${libobj}T"
+    else
+      removelist="$lobj $libobj ${libobj}T"
+    fi
+
+    $run $rm $removelist
+    trap "$run $rm $removelist; exit 1" 1 2 15
+
+    # On Cygwin there's no "real" PIC flag so we must build both object types
+    case $host_os in
+    cygwin* | mingw* | pw32* | os2*)
+      pic_mode=default
+      ;;
+    esac
+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+      # non-PIC code in shared libraries is not supported
+      pic_mode=default
+    fi
+
+    # Calculate the filename of the output object if compiler does
+    # not support -o with -c
+    if test "$compiler_c_o" = no; then
+      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+      lockfile="$output_obj.lock"
+      removelist="$removelist $output_obj $lockfile"
+      trap "$run $rm $removelist; exit 1" 1 2 15
+    else
+      output_obj=
+      need_locks=no
+      lockfile=
+    fi
+
+    # Lock this critical section if it is needed
+    # We use this script file to make the link, it avoids creating a new file
+    if test "$need_locks" = yes; then
+      until $run ln "$0" "$lockfile" 2>/dev/null; do
+	$show "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    elif test "$need_locks" = warn; then
+      if test -f "$lockfile"; then
+	$echo "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$run $rm $removelist
+	exit 1
+      fi
+      $echo $srcfile > "$lockfile"
+    fi
+
+    if test -n "$fix_srcfile_path"; then
+      eval srcfile=\"$fix_srcfile_path\"
+    fi
+
+    $run $rm "$libobj" "${libobj}T"
+
+    # Create a libtool object file (analogous to a ".la" file),
+    # but don't create it if we're doing a dry run.
+    test -z "$run" && cat > ${libobj}T <<EOF
+# $libobj - a libtool object file
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+EOF
+
+    # Only build a PIC object if we are building libtool libraries.
+    if test "$build_libtool_libs" = yes; then
+      # Without this assignment, base_compile gets emptied.
+      fbsd_hideous_sh_bug=$base_compile
+
+      if test "$pic_mode" != no; then
+	command="$base_compile $srcfile $pic_flag"
+      else
+	# Don't build PIC code
+	command="$base_compile $srcfile"
+      fi
+
+      if test ! -d "${xdir}$objdir"; then
+	$show "$mkdir ${xdir}$objdir"
+	$run $mkdir ${xdir}$objdir
+	status=$?
+	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
+	  exit $status
+	fi
+      fi
+
+      if test -z "$output_obj"; then
+	# Place PIC objects in $objdir
+	command="$command -o $lobj"
+      fi
+
+      $run $rm "$lobj" "$output_obj"
+
+      $show "$command"
+      if $run eval "$command"; then :
+      else
+	test -n "$output_obj" && $run $rm $removelist
+	exit 1
+      fi
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$echo "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$run $rm $removelist
+	exit 1
+      fi
+
+      # Just move the object if needed, then go on to compile the next one
+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+	$show "$mv $output_obj $lobj"
+	if $run $mv $output_obj $lobj; then :
+	else
+	  error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
+      fi
+
+      # Append the name of the PIC object to the libtool object file.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+pic_object='$objdir/$objname'
+
+EOF
+
+      # Allow error messages only from the first compilation.
+      suppress_output=' >/dev/null 2>&1'
+    else
+      # No PIC object so indicate it doesn't exist in the libtool
+      # object file.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+pic_object=none
+
+EOF
+    fi
+
+    # Only build a position-dependent object if we build old libraries.
+    if test "$build_old_libs" = yes; then
+      if test "$pic_mode" != yes; then
+	# Don't build PIC code
+	command="$base_compile $srcfile"
+      else
+	command="$base_compile $srcfile $pic_flag"
+      fi
+      if test "$compiler_c_o" = yes; then
+	command="$command -o $obj"
+      fi
+
+      # Suppress compiler output if we already did a PIC compilation.
+      command="$command$suppress_output"
+      $run $rm "$obj" "$output_obj"
+      $show "$command"
+      if $run eval "$command"; then :
+      else
+	$run $rm $removelist
+	exit 1
+      fi
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$echo "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$run $rm $removelist
+	exit 1
+      fi
+
+      # Just move the object if needed
+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+	$show "$mv $output_obj $obj"
+	if $run $mv $output_obj $obj; then :
+	else
+	  error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
+      fi
+
+      # Append the name of the non-PIC object the libtool object file.
+      # Only append if the libtool object file exists.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+# Name of the non-PIC object.
+non_pic_object='$objname'
+
+EOF
+    else
+      # Append the name of the non-PIC object the libtool object file.
+      # Only append if the libtool object file exists.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+# Name of the non-PIC object.
+non_pic_object=none
+
+EOF
+    fi
+
+    $run $mv "${libobj}T" "${libobj}"
+
+    # Unlock the critical section if it was locked
+    if test "$need_locks" != no; then
+      $run $rm "$lockfile"
+    fi
+
+    exit 0
+    ;;
+
+  # libtool link mode
+  link | relink)
+    modename="$modename: link"
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+      # It is impossible to link a dll without this setting, and
+      # we shouldn't force the makefile maintainer to figure out
+      # which system we are compiling for in order to pass an extra
+      # flag for every libtool invocation.
+      # allow_undefined=no
+
+      # FIXME: Unfortunately, there are problems with the above when trying
+      # to make a dll which has undefined symbols, in which case not
+      # even a static library is built.  For now, we need to specify
+      # -no-undefined on the libtool link line when we can be certain
+      # that all symbols are satisfied, otherwise we get a static library.
+      allow_undefined=yes
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    libtool_args="$nonopt"
+    base_compile="$nonopt"
+    compile_command="$nonopt"
+    finalize_command="$nonopt"
+
+    compile_rpath=
+    finalize_rpath=
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+    inst_prefix_dir=
+
+    avoid_version=no
+    dlfiles=
+    dlprefiles=
+    dlself=no
+    export_dynamic=no
+    export_symbols=
+    export_symbols_regex=
+    generated=
+    libobjs=
+    ltlibs=
+    module=no
+    no_install=no
+    objs=
+    non_pic_objects=
+    prefer_static_libs=no
+    preload=no
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    thread_safe=no
+    vinfo=
+    vinfo_number=no
+
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case $arg in
+      -all-static | -static)
+	if test "X$arg" = "X-all-static"; then
+	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+	  fi
+	  if test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	else
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	fi
+	build_libtool_libs=no
+	build_old_libs=yes
+	prefer_static_libs=yes
+	break
+	;;
+      esac
+    done
+
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+    # Go through the arguments, transforming them on the way.
+    while test "$#" -gt 0; do
+      arg="$1"
+      base_compile="$base_compile $arg"
+      shift
+      case $arg in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
+	;;
+      *) qarg=$arg ;;
+      esac
+      libtool_args="$libtool_args $qarg"
+
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+	case $prev in
+	output)
+	  compile_command="$compile_command @OUTPUT@"
+	  finalize_command="$finalize_command @OUTPUT@"
+	  ;;
+	esac
+
+	case $prev in
+	dlfiles|dlprefiles)
+	  if test "$preload" = no; then
+	    # Add the symbol object into the linking commands.
+	    compile_command="$compile_command @SYMFILE@"
+	    finalize_command="$finalize_command @SYMFILE@"
+	    preload=yes
+	  fi
+	  case $arg in
+	  *.la | *.lo) ;;  # We handle these cases below.
+	  force)
+	    if test "$dlself" = no; then
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  self)
+	    if test "$prev" = dlprefiles; then
+	      dlself=yes
+	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+	      dlself=yes
+	    else
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  *)
+	    if test "$prev" = dlfiles; then
+	      dlfiles="$dlfiles $arg"
+	    else
+	      dlprefiles="$dlprefiles $arg"
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  esac
+	  ;;
+	expsyms)
+	  export_symbols="$arg"
+	  if test ! -f "$arg"; then
+	    $echo "$modename: symbol file \`$arg' does not exist"
+	    exit 1
+	  fi
+	  prev=
+	  continue
+	  ;;
+	expsyms_regex)
+	  export_symbols_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	inst_prefix)
+	  inst_prefix_dir="$arg"
+	  prev=
+	  continue
+	  ;;
+	release)
+	  release="-$arg"
+	  prev=
+	  continue
+	  ;;
+	objectlist)
+	  if test -f "$arg"; then
+	    save_arg=$arg
+	    moreargs=
+	    for fil in `cat $save_arg`
+	    do
+#	      moreargs="$moreargs $fil"
+	      arg=$fil
+	      # A libtool-controlled object.
+
+	      # Check to see that this really is a libtool object.
+	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+		pic_object=
+		non_pic_object=
+
+		# Read the .lo file
+		# If there is no directory component, then add one.
+		case $arg in
+		*/* | *\\*) . $arg ;;
+		*) . ./$arg ;;
+		esac
+
+		if test -z "$pic_object" || \
+		   test -z "$non_pic_object" ||
+		   test "$pic_object" = none && \
+		   test "$non_pic_object" = none; then
+		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+		  exit 1
+		fi
+
+		# Extract subdirectory from the argument.
+		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+		if test "X$xdir" = "X$arg"; then
+		  xdir=
+		else
+		  xdir="$xdir/"
+		fi
+
+		if test "$pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  pic_object="$xdir$pic_object"
+
+		  if test "$prev" = dlfiles; then
+		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		      dlfiles="$dlfiles $pic_object"
+		      prev=
+		      continue
+		    else
+		      # If libtool objects are unsupported, then we need to preload.
+		      prev=dlprefiles
+		    fi
+		  fi
+
+		  # CHECK ME:  I think I busted this.  -Ossama
+		  if test "$prev" = dlprefiles; then
+		    # Preload the old-style object.
+		    dlprefiles="$dlprefiles $pic_object"
+		    prev=
+		  fi
+
+		  # A PIC object.
+		  libobjs="$libobjs $pic_object"
+		  arg="$pic_object"
+		fi
+
+		# Non-PIC object.
+		if test "$non_pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  non_pic_object="$xdir$non_pic_object"
+
+		  # A standard non-PIC object
+		  non_pic_objects="$non_pic_objects $non_pic_object"
+		  if test -z "$pic_object" || test "$pic_object" = none ; then
+		    arg="$non_pic_object"
+		  fi
+		fi
+	      else
+		# Only an error if not doing a dry-run.
+		if test -z "$run"; then
+		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+		  exit 1
+		else
+		  # Dry-run case.
+
+		  # Extract subdirectory from the argument.
+		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+		  if test "X$xdir" = "X$arg"; then
+		    xdir=
+		  else
+		    xdir="$xdir/"
+		  fi
+
+		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+		  libobjs="$libobjs $pic_object"
+		  non_pic_objects="$non_pic_objects $non_pic_object"
+		fi
+	      fi
+	    done
+	  else
+	    $echo "$modename: link input file \`$save_arg' does not exist"
+	    exit 1
+	  fi
+	  arg=$save_arg
+	  prev=
+	  continue
+	  ;;
+	rpath | xrpath)
+	  # We need an absolute path.
+	  case $arg in
+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+	  *)
+	    $echo "$modename: only absolute run-paths are allowed" 1>&2
+	    exit 1
+	    ;;
+	  esac
+	  if test "$prev" = rpath; then
+	    case "$rpath " in
+	    *" $arg "*) ;;
+	    *) rpath="$rpath $arg" ;;
+	    esac
+	  else
+	    case "$xrpath " in
+	    *" $arg "*) ;;
+	    *) xrpath="$xrpath $arg" ;;
+	    esac
+	  fi
+	  prev=
+	  continue
+	  ;;
+	xcompiler)
+	  compiler_flags="$compiler_flags $qarg"
+	  prev=
+	  compile_command="$compile_command $qarg"
+	  finalize_command="$finalize_command $qarg"
+	  continue
+	  ;;
+	xlinker)
+	  linker_flags="$linker_flags $qarg"
+	  compiler_flags="$compiler_flags $wl$qarg"
+	  prev=
+	  compile_command="$compile_command $wl$qarg"
+	  finalize_command="$finalize_command $wl$qarg"
+	  continue
+	  ;;
+	xcclinker)
+	  linker_flags="$linker_flags $qarg"
+	  compiler_flags="$compiler_flags $qarg"
+	  prev=
+	  compile_command="$compile_command $qarg"
+	  finalize_command="$finalize_command $qarg"
+	  continue
+	  ;;
+	*)
+	  eval "$prev=\"\$arg\""
+	  prev=
+	  continue
+	  ;;
+	esac
+      fi # test -n "$prev"
+
+      prevarg="$arg"
+
+      case $arg in
+      -all-static)
+	if test -n "$link_static_flag"; then
+	  compile_command="$compile_command $link_static_flag"
+	  finalize_command="$finalize_command $link_static_flag"
+	fi
+	continue
+	;;
+
+      -allow-undefined)
+	# FIXME: remove this flag sometime in the future.
+	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
+	continue
+	;;
+
+      -avoid-version)
+	avoid_version=yes
+	continue
+	;;
+
+      -dlopen)
+	prev=dlfiles
+	continue
+	;;
+
+      -dlpreopen)
+	prev=dlprefiles
+	continue
+	;;
+
+      -export-dynamic)
+	export_dynamic=yes
+	continue
+	;;
+
+      -export-symbols | -export-symbols-regex)
+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	  $echo "$modename: more than one -exported-symbols argument is not allowed"
+	  exit 1
+	fi
+	if test "X$arg" = "X-export-symbols"; then
+	  prev=expsyms
+	else
+	  prev=expsyms_regex
+	fi
+	continue
+	;;
+
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+	case $with_gcc/$host in
+	no/*-*-irix* | /*-*-irix*)
+	  compile_command="$compile_command $arg"
+	  finalize_command="$finalize_command $arg"
+	  ;;
+	esac
+	continue
+	;;
+
+      -L*)
+	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  absdir=`cd "$dir" && pwd`
+	  if test -z "$absdir"; then
+	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+	    exit 1
+	  fi
+	  dir="$absdir"
+	  ;;
+	esac
+	case "$deplibs " in
+	*" -L$dir "*) ;;
+	*)
+	  deplibs="$deplibs -L$dir"
+	  lib_search_path="$lib_search_path $dir"
+	  ;;
+	esac
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	  case :$dllsearchpath: in
+	  *":$dir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$dir";;
+	  esac
+	  ;;
+	esac
+	continue
+	;;
+
+      -l*)
+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+	  case $host in
+	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
+	    # These systems don't actually have a C or math library (as such)
+	    continue
+	    ;;
+	  *-*-mingw* | *-*-os2*)
+	    # These systems don't actually have a C library (as such)
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-openbsd* | *-*-freebsd*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C and math libraries are in the System framework
+	    deplibs="$deplibs -framework System"
+	    continue
+	  esac
+	elif test "X$arg" = "X-lc_r"; then
+	 case $host in
+	 *-*-openbsd* | *-*-freebsd*)
+	   # Do not include libc_r directly, use -pthread flag.
+	   continue
+	   ;;
+	 esac
+	fi
+	deplibs="$deplibs $arg"
+	continue
+	;;
+
+      -module)
+	module=yes
+	continue
+	;;
+
+      # gcc -m* arguments should be passed to the linker via $compiler_flags
+      # in order to pass architecture information to the linker
+      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
+      # but this is not reliable with gcc because gcc may use -mfoo to
+      # select a different linker, different libraries, etc, while
+      # -Wl,-mfoo simply passes -mfoo to the linker.
+      -m*)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+	case $arg in
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
+	  ;;
+	esac
+        compile_command="$compile_command $arg"
+        finalize_command="$finalize_command $arg"
+        if test "$with_gcc" = "yes" ; then
+          compiler_flags="$compiler_flags $arg"
+        fi
+        continue
+        ;;
+
+      -shrext)
+	prev=shrext
+	continue
+	;;
+
+      -no-fast-install)
+	fast_install=no
+	continue
+	;;
+
+      -no-install)
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	  # The PATH hackery in wrapper scripts is required on Windows
+	  # in order for the loader to find any dlls it needs.
+	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
+	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+	  fast_install=no
+	  ;;
+	*) no_install=yes ;;
+	esac
+	continue
+	;;
+
+      -no-undefined)
+	allow_undefined=no
+	continue
+	;;
+
+      -objectlist)
+	prev=objectlist
+	continue
+	;;
+
+      -o) prev=output ;;
+
+      -release)
+	prev=release
+	continue
+	;;
+
+      -rpath)
+	prev=rpath
+	continue
+	;;
+
+      -R)
+	prev=xrpath
+	continue
+	;;
+
+      -R*)
+	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  $echo "$modename: only absolute run-paths are allowed" 1>&2
+	  exit 1
+	  ;;
+	esac
+	case "$xrpath " in
+	*" $dir "*) ;;
+	*) xrpath="$xrpath $dir" ;;
+	esac
+	continue
+	;;
+
+      -static)
+	# The effects of -static are defined in a previous loop.
+	# We used to do the same as -all-static on platforms that
+	# didn't have a PIC flag, but the assumption that the effects
+	# would be equivalent was wrong.  It would break on at least
+	# Digital Unix and AIX.
+	continue
+	;;
+
+      -thread-safe)
+	thread_safe=yes
+	continue
+	;;
+
+      -version-info)
+	prev=vinfo
+	continue
+	;;
+      -version-number)
+	prev=vinfo
+	vinfo_number=yes
+	continue
+	;;
+
+      -Wc,*)
+	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+	  case $flag in
+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	    flag="\"$flag\""
+	    ;;
+	  esac
+	  arg="$arg $wl$flag"
+	  compiler_flags="$compiler_flags $flag"
+	done
+	IFS="$save_ifs"
+	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+	;;
+
+      -Wl,*)
+	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+	  case $flag in
+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	    flag="\"$flag\""
+	    ;;
+	  esac
+	  arg="$arg $wl$flag"
+	  compiler_flags="$compiler_flags $wl$flag"
+	  linker_flags="$linker_flags $flag"
+	done
+	IFS="$save_ifs"
+	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+	;;
+
+      -Xcompiler)
+	prev=xcompiler
+	continue
+	;;
+
+      -Xlinker)
+	prev=xlinker
+	continue
+	;;
+
+      -XCClinker)
+	prev=xcclinker
+	continue
+	;;
+
+      # Some other compiler flag.
+      -* | +*)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+	case $arg in
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
+	  ;;
+	esac
+	;;
+
+      *.$objext)
+	# A standard object.
+	objs="$objs $arg"
+	;;
+
+      *.lo)
+	# A libtool-controlled object.
+
+	# Check to see that this really is a libtool object.
+	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	  pic_object=
+	  non_pic_object=
+
+	  # Read the .lo file
+	  # If there is no directory component, then add one.
+	  case $arg in
+	  */* | *\\*) . $arg ;;
+	  *) . ./$arg ;;
+	  esac
+
+	  if test -z "$pic_object" || \
+	     test -z "$non_pic_object" ||
+	     test "$pic_object" = none && \
+	     test "$non_pic_object" = none; then
+	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+	    exit 1
+	  fi
+
+	  # Extract subdirectory from the argument.
+	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+	  if test "X$xdir" = "X$arg"; then
+	    xdir=
+ 	  else
+	    xdir="$xdir/"
+	  fi
+
+	  if test "$pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    pic_object="$xdir$pic_object"
+
+	    if test "$prev" = dlfiles; then
+	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		dlfiles="$dlfiles $pic_object"
+		prev=
+		continue
+	      else
+		# If libtool objects are unsupported, then we need to preload.
+		prev=dlprefiles
+	      fi
+	    fi
+
+	    # CHECK ME:  I think I busted this.  -Ossama
+	    if test "$prev" = dlprefiles; then
+	      # Preload the old-style object.
+	      dlprefiles="$dlprefiles $pic_object"
+	      prev=
+	    fi
+
+	    # A PIC object.
+	    libobjs="$libobjs $pic_object"
+	    arg="$pic_object"
+	  fi
+
+	  # Non-PIC object.
+	  if test "$non_pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    non_pic_object="$xdir$non_pic_object"
+
+	    # A standard non-PIC object
+	    non_pic_objects="$non_pic_objects $non_pic_object"
+	    if test -z "$pic_object" || test "$pic_object" = none ; then
+	      arg="$non_pic_object"
+	    fi
+	  fi
+	else
+	  # Only an error if not doing a dry-run.
+	  if test -z "$run"; then
+	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+	    exit 1
+	  else
+	    # Dry-run case.
+
+	    # Extract subdirectory from the argument.
+	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+	    if test "X$xdir" = "X$arg"; then
+	      xdir=
+	    else
+	      xdir="$xdir/"
+	    fi
+
+	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+	    libobjs="$libobjs $pic_object"
+	    non_pic_objects="$non_pic_objects $non_pic_object"
+	  fi
+	fi
+	;;
+
+      *.$libext)
+	# An archive.
+	deplibs="$deplibs $arg"
+	old_deplibs="$old_deplibs $arg"
+	continue
+	;;
+
+      *.la)
+	# A libtool-controlled library.
+
+	if test "$prev" = dlfiles; then
+	  # This library was specified with -dlopen.
+	  dlfiles="$dlfiles $arg"
+	  prev=
+	elif test "$prev" = dlprefiles; then
+	  # The library was specified with -dlpreopen.
+	  dlprefiles="$dlprefiles $arg"
+	  prev=
+	else
+	  deplibs="$deplibs $arg"
+	fi
+	continue
+	;;
+
+      # Some other compiler argument.
+      *)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+	case $arg in
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
+	  ;;
+	esac
+	;;
+      esac # arg
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+	compile_command="$compile_command $arg"
+	finalize_command="$finalize_command $arg"
+      fi
+    done # argument parsing loop
+
+    if test -n "$prev"; then
+      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    # Infer tagged configuration to use if any are available and
+    # if one wasn't chosen via the "--tag" command line option.
+    # Only attempt this if the compiler in the base link
+    # command doesn't match the default compiler.
+    if test -n "$available_tags" && test -z "$tagname"; then
+      case $base_compile in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+	    case $base_compile in
+	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+	      # The compiler in $compile_command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  $echo "$modename: unable to infer tagged configuration"
+	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+	  exit 1
+#       else
+#         $echo "$modename: using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+
+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+      eval arg=\"$export_dynamic_flag_spec\"
+      compile_command="$compile_command $arg"
+      finalize_command="$finalize_command $arg"
+    fi
+
+    oldlibs=
+    # calculate the name of the file, without its directory
+    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
+    libobjs_save="$libobjs"
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+    else
+      shlib_search_path=
+    fi
+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
+    if test "X$output_objdir" = "X$output"; then
+      output_objdir="$objdir"
+    else
+      output_objdir="$output_objdir/$objdir"
+    fi
+    # Create the object directory.
+    if test ! -d "$output_objdir"; then
+      $show "$mkdir $output_objdir"
+      $run $mkdir $output_objdir
+      status=$?
+      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
+	exit $status
+      fi
+    fi
+
+    # Determine the type of output
+    case $output in
+    "")
+      $echo "$modename: you must specify an output file" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
+
+    case $host in
+    *cygwin* | *mingw* | *pw32*)
+      # don't eliminate duplcations in $postdeps and $predeps
+      duplicate_compiler_generated_deps=yes
+      ;;
+    *)
+      duplicate_compiler_generated_deps=$duplicate_deps
+      ;;
+    esac
+    specialdeplibs=
+
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if test "X$duplicate_deps" = "Xyes" ; then
+	case "$libs " in
+	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	esac
+      fi
+      libs="$libs $deplib"
+    done
+
+    if test "$linkmode" = lib; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
+	for pre_post_dep in $predeps $postdeps; do
+	  case "$pre_post_deps " in
+	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+	  esac
+	  pre_post_deps="$pre_post_deps $pre_post_dep"
+	done
+      fi
+      pre_post_deps=
+    fi
+
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    notinst_path= # paths that contain not-installed libtool libraries
+    case $linkmode in
+    lib)
+	passes="conv link"
+	for file in $dlfiles $dlprefiles; do
+	  case $file in
+	  *.la) ;;
+	  *)
+	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+	    exit 1
+	    ;;
+	  esac
+	done
+	;;
+    prog)
+	compile_deplibs=
+	finalize_deplibs=
+	alldeplibs=no
+	newdlfiles=
+	newdlprefiles=
+	passes="conv scan dlopen dlpreopen link"
+	;;
+    *)  passes="conv"
+	;;
+    esac
+    for pass in $passes; do
+      if test "$linkmode,$pass" = "lib,link" ||
+	 test "$linkmode,$pass" = "prog,scan"; then
+	libs="$deplibs"
+	deplibs=
+      fi
+      if test "$linkmode" = prog; then
+	case $pass in
+	dlopen) libs="$dlfiles" ;;
+	dlpreopen) libs="$dlprefiles" ;;
+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	esac
+      fi
+      if test "$pass" = dlopen; then
+	# Collect dlpreopened libraries
+	save_deplibs="$deplibs"
+	deplibs=
+      fi
+      for deplib in $libs; do
+	lib=
+	found=no
+	case $deplib in
+	-l*)
+	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+	    continue
+	  fi
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+	    # Search the libtool library
+	    lib="$searchdir/lib${name}.la"
+	    if test -f "$lib"; then
+	      found=yes
+	      break
+	    fi
+	  done
+	  if test "$found" != yes; then
+	    # deplib doesn't seem to be a libtool library
+	    if test "$linkmode,$pass" = "prog,link"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
+	  else # deplib is a libtool library
+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+	    # We need to do some special things here, and not later.
+	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      case " $predeps $postdeps " in
+	      *" $deplib "*)
+		if (${SED} -e '2q' $lib |
+                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+		  library_names=
+		  old_library=
+		  case $lib in
+		  */* | *\\*) . $lib ;;
+		  *) . ./$lib ;;
+		  esac
+		  for l in $old_library $library_names; do
+		    ll="$l"
+		  done
+		  if test "X$ll" = "X$old_library" ; then # only static version available
+		    found=no
+		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+		    test "X$ladir" = "X$lib" && ladir="."
+		    lib=$ladir/$old_library
+		    if test "$linkmode,$pass" = "prog,link"; then
+		      compile_deplibs="$deplib $compile_deplibs"
+		      finalize_deplibs="$deplib $finalize_deplibs"
+		    else
+		      deplibs="$deplib $deplibs"
+		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+		    fi
+		    continue
+		  fi
+		fi
+	        ;;
+	      *) ;;
+	      esac
+	    fi
+	  fi
+	  ;; # -l
+	-L*)
+	  case $linkmode in
+	  lib)
+	    deplibs="$deplib $deplibs"
+	    test "$pass" = conv && continue
+	    newdependency_libs="$deplib $newdependency_libs"
+	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+	    ;;
+	  prog)
+	    if test "$pass" = conv; then
+	      deplibs="$deplib $deplibs"
+	      continue
+	    fi
+	    if test "$pass" = scan; then
+	      deplibs="$deplib $deplibs"
+	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    ;;
+	  *)
+	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+	    ;;
+	  esac # linkmode
+	  continue
+	  ;; # -L
+	-R*)
+	  if test "$pass" = link; then
+	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+	    # Make sure the xrpath contains only unique directories.
+	    case "$xrpath " in
+	    *" $dir "*) ;;
+	    *) xrpath="$xrpath $dir" ;;
+	    esac
+	  fi
+	  deplibs="$deplib $deplibs"
+	  continue
+	  ;;
+	*.la) lib="$deplib" ;;
+	*.$libext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  case $linkmode in
+	  lib)
+	    if test "$deplibs_check_method" != pass_all; then
+	      $echo
+	      $echo "*** Warning: Trying to link with static lib archive $deplib."
+	      $echo "*** I have the capability to make that library automatically link in when"
+	      $echo "*** you link to this library.  But I can only do this if you have a"
+	      $echo "*** shared version of the library, which you do not appear to have"
+	      $echo "*** because the file extensions .$libext of this argument makes me believe"
+	      $echo "*** that it is just a static archive that I should not used here."
+	    else
+	      $echo
+	      $echo "*** Warning: Linking the shared library $output against the"
+	      $echo "*** static library $deplib is not portable!"
+	      deplibs="$deplib $deplibs"
+	    fi
+	    continue
+	    ;;
+	  prog)
+	    if test "$pass" != link; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    continue
+	    ;;
+	  esac # linkmode
+	  ;; # *.$libext
+	*.lo | *.$objext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	  elif test "$linkmode" = prog; then
+	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	      # If there is no dlopen support or we're linking statically,
+	      # we need to preload.
+	      newdlprefiles="$newdlprefiles $deplib"
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      newdlfiles="$newdlfiles $deplib"
+	    fi
+	  fi
+	  continue
+	  ;;
+	%DEPLIBS%)
+	  alldeplibs=yes
+	  continue
+	  ;;
+	esac # case $deplib
+	if test "$found" = yes || test -f "$lib"; then :
+	else
+	  $echo "$modename: cannot find the library \`$lib'" 1>&2
+	  exit 1
+	fi
+
+	# Check to see that this really is a libtool archive.
+	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	else
+	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+	  exit 1
+	fi
+
+	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+	test "X$ladir" = "X$lib" && ladir="."
+
+	dlname=
+	dlopen=
+	dlpreopen=
+	libdir=
+	library_names=
+	old_library=
+	# If the library was installed with an old release of libtool,
+	# it will not redefine variables installed, or shouldnotlink
+	installed=yes
+	shouldnotlink=no
+
+	# Read the .la file
+	case $lib in
+	*/* | *\\*) . $lib ;;
+	*) . ./$lib ;;
+	esac
+
+	if test "$linkmode,$pass" = "lib,link" ||
+	   test "$linkmode,$pass" = "prog,scan" ||
+	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+	fi
+
+	if test "$pass" = conv; then
+	  # Only check for convenience libraries
+	  deplibs="$lib $deplibs"
+	  if test -z "$libdir"; then
+	    if test -z "$old_library"; then
+	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+	      exit 1
+	    fi
+	    # It is a libtool convenience library, so add in its objects.
+	    convenience="$convenience $ladir/$objdir/$old_library"
+	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+	    tmp_libs=
+	    for deplib in $dependency_libs; do
+	      deplibs="$deplib $deplibs"
+              if test "X$duplicate_deps" = "Xyes" ; then
+	        case "$tmp_libs " in
+	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	        esac
+              fi
+	      tmp_libs="$tmp_libs $deplib"
+	    done
+	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
+	    exit 1
+	  fi
+	  continue
+	fi # $pass = conv
+
+    
+	# Get the name of the library we link against.
+	linklib=
+	for l in $old_library $library_names; do
+	  linklib="$l"
+	done
+	if test -z "$linklib"; then
+	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+	  exit 1
+	fi
+
+	# This library was specified with -dlopen.
+	if test "$pass" = dlopen; then
+	  if test -z "$libdir"; then
+	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+	    exit 1
+	  fi
+	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	    # If there is no dlname, no dlopen support or we're linking
+	    # statically, we need to preload.  We also need to preload any
+	    # dependent libraries so libltdl's deplib preloader doesn't
+	    # bomb out in the load deplibs phase.
+	    dlprefiles="$dlprefiles $lib $dependency_libs"
+	  else
+	    newdlfiles="$newdlfiles $lib"
+	  fi
+	  continue
+	fi # $pass = dlopen
+
+	# We need an absolute path.
+	case $ladir in
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+	*)
+	  abs_ladir=`cd "$ladir" && pwd`
+	  if test -z "$abs_ladir"; then
+	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
+	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
+	    abs_ladir="$ladir"
+	  fi
+	  ;;
+	esac
+	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+
+	# Find the relevant object directory and library name.
+	if test "X$installed" = Xyes; then
+	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    libdir="$abs_ladir"
+	  else
+	    dir="$libdir"
+	    absdir="$libdir"
+	  fi
+	else
+	  dir="$ladir/$objdir"
+	  absdir="$abs_ladir/$objdir"
+	  # Remove this search path later
+	  notinst_path="$notinst_path $abs_ladir"
+	fi # $installed = yes
+	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+
+	# This library was specified with -dlpreopen.
+	if test "$pass" = dlpreopen; then
+	  if test -z "$libdir"; then
+	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+	    exit 1
+	  fi
+	  # Prefer using a static library (so that no silly _DYNAMIC symbols
+	  # are required to link).
+	  if test -n "$old_library"; then
+	    newdlprefiles="$newdlprefiles $dir/$old_library"
+	  # Otherwise, use the dlname, so that lt_dlopen finds it.
+	  elif test -n "$dlname"; then
+	    newdlprefiles="$newdlprefiles $dir/$dlname"
+	  else
+	    newdlprefiles="$newdlprefiles $dir/$linklib"
+	  fi
+	fi # $pass = dlpreopen
+
+	if test -z "$libdir"; then
+	  # Link the convenience library
+	  if test "$linkmode" = lib; then
+	    deplibs="$dir/$old_library $deplibs"
+	  elif test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$dir/$old_library $compile_deplibs"
+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+	  else
+	    deplibs="$lib $deplibs" # used for prog,scan pass
+	  fi
+	  continue
+	fi
+
+    
+	if test "$linkmode" = prog && test "$pass" != link; then
+	  newlib_search_path="$newlib_search_path $ladir"
+	  deplibs="$lib $deplibs"
+
+	  linkalldeplibs=no
+	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
+	     test "$build_libtool_libs" = no; then
+	    linkalldeplibs=yes
+	  fi
+
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    case $deplib in
+	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+	    esac
+	    # Need to link against all dependency_libs?
+	    if test "$linkalldeplibs" = yes; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      # Need to hardcode shared library paths
+	      # or/and link against static libraries
+	      newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    if test "X$duplicate_deps" = "Xyes" ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done # for deplib
+	  continue
+	fi # $linkmode = prog...
+
+	if test "$linkmode,$pass" = "prog,link"; then
+	  if test -n "$library_names" &&
+	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+	    # We need to hardcode the library path
+	    if test -n "$shlibpath_var"; then
+	      # Make sure the rpath contains only unique directories.
+	      case "$temp_rpath " in
+	      *" $dir "*) ;;
+	      *" $absdir "*) ;;
+	      *) temp_rpath="$temp_rpath $dir" ;;
+	      esac
+	    fi
+
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) compile_rpath="$compile_rpath $absdir"
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) finalize_rpath="$finalize_rpath $libdir"
+	      esac
+	      ;;
+	    esac
+	  fi # $linkmode,$pass = prog,link...
+
+	  if test "$alldeplibs" = yes &&
+	     { test "$deplibs_check_method" = pass_all ||
+	       { test "$build_libtool_libs" = yes &&
+		 test -n "$library_names"; }; }; then
+	    # We only need to search for static libraries
+	    continue
+	  fi
+	fi
+
+	link_static=no # Whether the deplib will be linked statically
+	if test -n "$library_names" &&
+	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+	  if test "$installed" = no; then
+	    notinst_deplibs="$notinst_deplibs $lib"
+	    need_relink=yes
+	  fi
+	  # This is a shared library
+	
+      # Warn about portability, can't link against -module's on some systems (darwin)
+      if test "$shouldnotlink" = yes && test "$pass" = link ; then
+	    $echo
+	    if test "$linkmode" = prog; then
+	      $echo "*** Warning: Linking the executable $output against the loadable module"
+	    else
+	      $echo "*** Warning: Linking the shared library $output against the loadable module"
+	    fi
+	    $echo "*** $linklib is not portable!"    
+      fi	  
+	  if test "$linkmode" = lib &&
+	     test "$hardcode_into_libs" = yes; then
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) compile_rpath="$compile_rpath $absdir"
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) finalize_rpath="$finalize_rpath $libdir"
+	      esac
+	      ;;
+	    esac
+	  fi
+
+	  if test -n "$old_archive_from_expsyms_cmds"; then
+	    # figure out the soname
+	    set dummy $library_names
+	    realname="$2"
+	    shift; shift
+	    libname=`eval \\$echo \"$libname_spec\"`
+	    # use dlname if we got it. it's perfectly good, no?
+	    if test -n "$dlname"; then
+	      soname="$dlname"
+	    elif test -n "$soname_spec"; then
+	      # bleh windows
+	      case $host in
+	      *cygwin* | mingw*)
+		major=`expr $current - $age`
+		versuffix="-$major"
+		;;
+	      esac
+	      eval soname=\"$soname_spec\"
+	    else
+	      soname="$realname"
+	    fi
+
+	    # Make a new name for the extract_expsyms_cmds to use
+	    soroot="$soname"
+	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
+	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
+
+	    # If the library has no export list, then create one now
+	    if test -f "$output_objdir/$soname-def"; then :
+	    else
+	      $show "extracting exported symbol list from \`$soname'"
+	      save_ifs="$IFS"; IFS='~'
+	      eval cmds=\"$extract_expsyms_cmds\"
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		$show "$cmd"
+		$run eval "$cmd" || exit $?
+	      done
+	      IFS="$save_ifs"
+	    fi
+
+	    # Create $newlib
+	    if test -f "$output_objdir/$newlib"; then :; else
+	      $show "generating import library for \`$soname'"
+	      save_ifs="$IFS"; IFS='~'
+	      eval cmds=\"$old_archive_from_expsyms_cmds\"
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		$show "$cmd"
+		$run eval "$cmd" || exit $?
+	      done
+	      IFS="$save_ifs"
+	    fi
+	    # make sure the library variables are pointing to the new library
+	    dir=$output_objdir
+	    linklib=$newlib
+	  fi # test -n "$old_archive_from_expsyms_cmds"
+
+	  if test "$linkmode" = prog || test "$mode" != relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    lib_linked=yes
+	    case $hardcode_action in
+	    immediate | unsupported)
+	      if test "$hardcode_direct" = no; then
+		add="$dir/$linklib"
+		case $host in
+		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
+		  *-*-darwin* )
+		    # if the lib is a module then we can not link against it, someone
+		    # is ignoring the new warnings I added
+		    if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
+		      $echo "** Warning, lib $linklib is a module, not a shared library"
+		      if test -z "$old_library" ; then
+		        $echo
+		        $echo "** And there doesn't seem to be a static archive available"
+		        $echo "** The link will probably fail, sorry"
+		      else
+		        add="$dir/$old_library"
+		      fi 
+		    fi
+		esac
+	      elif test "$hardcode_minus_L" = no; then
+		case $host in
+		*-*-sunos*) add_shlibpath="$dir" ;;
+		esac
+		add_dir="-L$dir"
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = no; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    relink)
+	      if test "$hardcode_direct" = yes; then
+		add="$dir/$linklib"
+	      elif test "$hardcode_minus_L" = yes; then
+		add_dir="-L$dir"
+		# Try looking first in the location we're being installed to.
+		if test -n "$inst_prefix_dir"; then
+		  case "$libdir" in
+		    [\\/]*)
+		      add_dir="-L$inst_prefix_dir$libdir $add_dir"
+		      ;;
+		  esac
+		fi
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = yes; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    *) lib_linked=no ;;
+	    esac
+
+	    if test "$lib_linked" != yes; then
+	      $echo "$modename: configuration error: unsupported hardcode properties"
+	      exit 1
+	    fi
+
+	    if test -n "$add_shlibpath"; then
+	      case :$compile_shlibpath: in
+	      *":$add_shlibpath:"*) ;;
+	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+	      esac
+	    fi
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	      if test "$hardcode_direct" != yes && \
+		 test "$hardcode_minus_L" != yes && \
+		 test "$hardcode_shlibpath_var" = yes; then
+		case :$finalize_shlibpath: in
+		*":$libdir:"*) ;;
+		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+		esac
+	      fi
+	    fi
+	  fi
+
+	  if test "$linkmode" = prog || test "$mode" = relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    # Finalize command for both is simple: just hardcode it.
+	    if test "$hardcode_direct" = yes; then
+	      add="$libdir/$linklib"
+	    elif test "$hardcode_minus_L" = yes; then
+	      add_dir="-L$libdir"
+	      add="-l$name"
+	    elif test "$hardcode_shlibpath_var" = yes; then
+	      case :$finalize_shlibpath: in
+	      *":$libdir:"*) ;;
+	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+	      esac
+	      add="-l$name"
+	    elif test "$hardcode_automatic" = yes; then
+	      if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
+	        add="$inst_prefix_dir$libdir/$linklib"
+	      else
+	        add="$libdir/$linklib"
+	      fi
+	    else
+	      # We cannot seem to hardcode it, guess we'll fake it.
+	      add_dir="-L$libdir"
+	      # Try looking first in the location we're being installed to.
+	      if test -n "$inst_prefix_dir"; then
+		case "$libdir" in
+		  [\\/]*)
+		    add_dir="-L$inst_prefix_dir$libdir $add_dir"
+		    ;;
+		esac
+	      fi
+	      add="-l$name"
+	    fi
+
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	    fi
+	  fi
+	elif test "$linkmode" = prog; then
+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+	  # is not unsupported.  This is valid on all known static and
+	  # shared platforms.
+	  if test "$hardcode_direct" != unsupported; then
+	    test -n "$old_library" && linklib="$old_library"
+	    compile_deplibs="$dir/$linklib $compile_deplibs"
+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+	  else
+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+	  fi
+	elif test "$build_libtool_libs" = yes; then
+	  # Not a shared library
+	  if test "$deplibs_check_method" != pass_all; then
+	    # We're trying link a shared library against a static one
+	    # but the system doesn't support it.
+
+	    # Just print a warning and add the library to dependency_libs so
+	    # that the program can be linked against the static library.
+	    $echo
+	    $echo "*** Warning: This system can not link to static lib archive $lib."
+	    $echo "*** I have the capability to make that library automatically link in when"
+	    $echo "*** you link to this library.  But I can only do this if you have a"
+	    $echo "*** shared version of the library, which you do not appear to have."
+	    if test "$module" = yes; then
+	      $echo "*** But as you try to build a module library, libtool will still create "
+	      $echo "*** a static module, that should work as long as the dlopening application"
+	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      if test -z "$global_symbol_pipe"; then
+		$echo
+		$echo "*** However, this would only work if libtool was able to extract symbol"
+		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		$echo "*** not find such a program.  So, this module is probably useless."
+		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	      fi
+	      if test "$build_old_libs" = no; then
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  else
+	    convenience="$convenience $dir/$old_library"
+	    old_convenience="$old_convenience $dir/$old_library"
+	    deplibs="$dir/$old_library $deplibs"
+	    link_static=yes
+	  fi
+	fi # link shared/static library?
+
+	if test "$linkmode" = lib; then
+	  if test -n "$dependency_libs" &&
+	     { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
+	       test "$link_static" = yes; }; then
+	    # Extract -R from dependency_libs
+	    temp_deplibs=
+	    for libdir in $dependency_libs; do
+	      case $libdir in
+	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
+		   case " $xrpath " in
+		   *" $temp_xrpath "*) ;;
+		   *) xrpath="$xrpath $temp_xrpath";;
+		   esac;;
+	      *) temp_deplibs="$temp_deplibs $libdir";;
+	      esac
+	    done
+	    dependency_libs="$temp_deplibs"
+	  fi
+
+	  newlib_search_path="$newlib_search_path $absdir"
+	  # Link against this library
+	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  # ... and its dependency_libs
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    newdependency_libs="$deplib $newdependency_libs"
+	    if test "X$duplicate_deps" = "Xyes" ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done
+
+	  if test "$link_all_deplibs" != no; then
+	    # Add the search paths of all dependency libraries
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      -L*) path="$deplib" ;;
+	      *.la)
+		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
+		test "X$dir" = "X$deplib" && dir="."
+		# We need an absolute path.
+		case $dir in
+		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+		*)
+		  absdir=`cd "$dir" && pwd`
+		  if test -z "$absdir"; then
+		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
+		    absdir="$dir"
+		  fi
+		  ;;
+		esac
+		if grep "^installed=no" $deplib > /dev/null; then
+		  path="$absdir/$objdir"
+		else
+		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  if test -z "$libdir"; then
+		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+		    exit 1
+		  fi
+		  if test "$absdir" != "$libdir"; then
+		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+		  fi
+		  path="$absdir"
+		fi
+		depdepl=
+		case $host in
+		*-*-darwin*)
+		  # we do not want to link against static libs, but need to link against shared
+		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  if test -n "$deplibrary_names" ; then
+		    for tmp in $deplibrary_names ; do
+		      depdepl=$tmp
+		    done
+		    if test -f "$path/$depdepl" ; then
+		      depdepl="$path/$depdepl"
+		   fi
+		    newlib_search_path="$newlib_search_path $path"
+		    path=""
+		  fi
+		  ;;
+		*)
+		path="-L$path"
+		;;
+		esac 
+		
+		;;
+		  -l*)
+		case $host in
+		*-*-darwin*)
+		 # Again, we only want to link against shared libraries
+		 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+		 for tmp in $newlib_search_path ; do
+		     if test -f "$tmp/lib$tmp_libs.dylib" ; then
+		       eval depdepl="$tmp/lib$tmp_libs.dylib"
+		       break
+		     fi  
+         done
+         path=""
+		  ;;
+		*) continue ;;
+		esac  		  
+		;;
+	      *) continue ;;
+	      esac
+	      case " $deplibs " in
+	      *" $depdepl "*) ;;
+	      *) deplibs="$deplibs $depdepl" ;;
+	      esac	      
+	      case " $deplibs " in
+	      *" $path "*) ;;
+	      *) deplibs="$deplibs $path" ;;
+	      esac
+	    done
+	  fi # link_all_deplibs != no
+	fi # linkmode = lib
+      done # for deplib in $libs
+      dependency_libs="$newdependency_libs"
+      if test "$pass" = dlpreopen; then
+	# Link the dlpreopened libraries before other libraries
+	for deplib in $save_deplibs; do
+	  deplibs="$deplib $deplibs"
+	done
+      fi
+      if test "$pass" != dlopen; then
+	if test "$pass" != conv; then
+	  # Make sure lib_search_path contains only unique directories.
+	  lib_search_path=
+	  for dir in $newlib_search_path; do
+	    case "$lib_search_path " in
+	    *" $dir "*) ;;
+	    *) lib_search_path="$lib_search_path $dir" ;;
+	    esac
+	  done
+	  newlib_search_path=
+	fi
+
+	if test "$linkmode,$pass" != "prog,link"; then
+	  vars="deplibs"
+	else
+	  vars="compile_deplibs finalize_deplibs"
+	fi
+	for var in $vars dependency_libs; do
+	  # Add libraries to $var in reverse order
+	  eval tmp_libs=\"\$$var\"
+	  new_libs=
+	  for deplib in $tmp_libs; do
+	    # FIXME: Pedantically, this is the right thing to do, so
+	    #        that some nasty dependency loop isn't accidentally
+	    #        broken:
+	    #new_libs="$deplib $new_libs"
+	    # Pragmatically, this seems to cause very few problems in
+	    # practice:
+	    case $deplib in
+	    -L*) new_libs="$deplib $new_libs" ;;
+	    -R*) ;;
+	    *)
+	      # And here is the reason: when a library appears more
+	      # than once as an explicit dependence of a library, or
+	      # is implicitly linked in more than once by the
+	      # compiler, it is considered special, and multiple
+	      # occurrences thereof are not removed.  Compare this
+	      # with having the same library being listed as a
+	      # dependency of multiple other libraries: in this case,
+	      # we know (pedantically, we assume) the library does not
+	      # need to be listed more than once, so we keep only the
+	      # last copy.  This is not always right, but it is rare
+	      # enough that we require users that really mean to play
+	      # such unportable linking tricks to link the library
+	      # using -Wl,-lname, so that libtool does not consider it
+	      # for duplicate removal.
+	      case " $specialdeplibs " in
+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+	      *)
+		case " $new_libs " in
+		*" $deplib "*) ;;
+		*) new_libs="$deplib $new_libs" ;;
+		esac
+		;;
+	      esac
+	      ;;
+	    esac
+	  done
+	  tmp_libs=
+	  for deplib in $new_libs; do
+	    case $deplib in
+	    -L*)
+	      case " $tmp_libs " in
+	      *" $deplib "*) ;;
+	      *) tmp_libs="$tmp_libs $deplib" ;;
+	      esac
+	      ;;
+	    *) tmp_libs="$tmp_libs $deplib" ;;
+	    esac
+	  done
+	  eval $var=\"$tmp_libs\"
+	done # for var
+      fi
+      # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
+      tmp_libs=
+      for i in $dependency_libs ; do
+	case " $predeps $postdeps $compiler_lib_search_path " in
+	*" $i "*)
+	  i=""
+	  ;;
+	esac
+	if test -n "$i" ; then
+	  tmp_libs="$tmp_libs $i"
+	fi
+      done
+      dependency_libs=$tmp_libs
+    done # for pass
+    if test "$linkmode" = prog; then
+      dlfiles="$newdlfiles"
+      dlprefiles="$newdlprefiles"
+    fi
+
+    case $linkmode in
+    oldlib)
+      if test -n "$deplibs"; then
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
+      fi
+
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$rpath"; then
+	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$xrpath"; then
+	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$vinfo"; then
+	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$release"; then
+	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
+      fi
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs="$output"
+      objs="$objs$old_deplibs"
+      ;;
+
+    lib)
+      # Make sure we only generate libraries of the form `libNAME.la'.
+      case $outputname in
+      lib*)
+	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+	eval shared_ext=\"$shrext\"
+	eval libname=\"$libname_spec\"
+	;;
+      *)
+	if test "$module" = no; then
+	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+	  $echo "$help" 1>&2
+	  exit 1
+	fi
+	if test "$need_lib_prefix" != no; then
+	  # Add the "lib" prefix for modules if required
+	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+	  eval shared_ext=\"$shrext\"
+	  eval libname=\"$libname_spec\"
+	else
+	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+	fi
+	;;
+      esac
+
+      if test -n "$objs"; then
+	if test "$deplibs_check_method" != pass_all; then
+	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+	  exit 1
+	else
+	  $echo
+	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
+	  $echo "*** objects $objs is not portable!"
+	  libobjs="$libobjs $objs"
+	fi
+      fi
+
+      if test "$dlself" != no; then
+	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
+      fi
+
+      set dummy $rpath
+      if test "$#" -gt 2; then
+	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+      fi
+      install_libdir="$2"
+
+      oldlibs=
+      if test -z "$rpath"; then
+	if test "$build_libtool_libs" = yes; then
+	  # Building a libtool convenience library.
+	  # Some compilers have problems with a `.al' extension so
+	  # convenience libraries should have the same extension an
+	  # archive normally would.
+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+	  build_libtool_libs=convenience
+	  build_old_libs=yes
+	fi
+
+	if test -n "$vinfo"; then
+	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
+	fi
+
+	if test -n "$release"; then
+	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
+	fi
+      else
+
+	# Parse the version information argument.
+	save_ifs="$IFS"; IFS=':'
+	set dummy $vinfo 0 0 0
+	IFS="$save_ifs"
+
+	if test -n "$8"; then
+	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
+	  $echo "$help" 1>&2
+	  exit 1
+	fi
+
+	# convert absolute version numbers to libtool ages
+	# this retains compatibility with .la files and attempts
+	# to make the code below a bit more comprehensible
+	
+	case $vinfo_number in
+	yes)
+	  number_major="$2"
+	  number_minor="$3"
+	  number_revision="$4"
+	  #
+	  # There are really only two kinds -- those that
+	  # use the current revision as the major version
+	  # and those that subtract age and use age as
+	  # a minor version.  But, then there is irix
+	  # which has an extra 1 added just for fun
+	  #
+	  case $version_type in
+	  darwin|linux|osf|windows)
+	    current=`expr $number_major + $number_minor`
+	    age="$number_minor"
+	    revision="$number_revision"
+	    ;;
+	  freebsd-aout|freebsd-elf|sunos)
+	    current="$number_major"
+	    revision="$number_minor"
+	    age="0"
+	    ;;
+	  irix|nonstopux)
+	    current=`expr $number_major + $number_minor - 1`
+	    age="$number_minor"
+	    revision="$number_minor"
+	    ;;
+	  esac
+	  ;;
+	no)
+	  current="$2"
+	  revision="$3"
+	  age="$4"
+	  ;;
+	esac
+
+	# Check that each of the things are valid numbers.
+	case $current in
+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+	*)
+	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit 1
+	  ;;
+	esac
+
+	case $revision in
+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+	*)
+	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit 1
+	  ;;
+	esac
+
+	case $age in
+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+	*)
+	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit 1
+	  ;;
+	esac
+
+	if test "$age" -gt "$current"; then
+	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit 1
+	fi
+
+	# Calculate the version variables.
+	major=
+	versuffix=
+	verstring=
+	case $version_type in
+	none) ;;
+
+	darwin)
+	  # Like Linux, but with the current version available in
+	  # verstring for coding it into the library header
+	  major=.`expr $current - $age`
+	  versuffix="$major.$age.$revision"
+	  # Darwin ld doesn't like 0 for these options...
+	  minor_current=`expr $current + 1`
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+	  ;;
+
+	freebsd-aout)
+	  major=".$current"
+	  versuffix=".$current.$revision";
+	  ;;
+
+	freebsd-elf)
+	  major=".$current"
+	  versuffix=".$current";
+	  ;;
+
+	irix | nonstopux)
+	  major=`expr $current - $age + 1`
+
+	  case $version_type in
+	    nonstopux) verstring_prefix=nonstopux ;;
+	    *)         verstring_prefix=sgi ;;
+	  esac
+	  verstring="$verstring_prefix$major.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$revision
+	  while test "$loop" -ne 0; do
+	    iface=`expr $revision - $loop`
+	    loop=`expr $loop - 1`
+	    verstring="$verstring_prefix$major.$iface:$verstring"
+	  done
+
+	  # Before this point, $major must not contain `.'.
+	  major=.$major
+	  versuffix="$major.$revision"
+	  ;;
+
+	linux)
+	  major=.`expr $current - $age`
+	  versuffix="$major.$age.$revision"
+	  ;;
+
+	osf)
+	  major=.`expr $current - $age`
+	  versuffix=".$current.$age.$revision"
+	  verstring="$current.$age.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$age
+	  while test "$loop" -ne 0; do
+	    iface=`expr $current - $loop`
+	    loop=`expr $loop - 1`
+	    verstring="$verstring:${iface}.0"
+	  done
+
+	  # Make executables depend on our current version.
+	  verstring="$verstring:${current}.0"
+	  ;;
+
+	sunos)
+	  major=".$current"
+	  versuffix=".$current.$revision"
+	  ;;
+
+	windows)
+	  # Use '-' rather than '.', since we only want one
+	  # extension on DOS 8.3 filesystems.
+	  major=`expr $current - $age`
+	  versuffix="-$major"
+	  ;;
+
+	*)
+	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
+	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+	  exit 1
+	  ;;
+	esac
+
+	# Clear the version info if we defaulted, and they specified a release.
+	if test -z "$vinfo" && test -n "$release"; then
+	  major=
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=
+	    ;;
+	  *)
+	    verstring="0.0"
+	    ;;
+	  esac
+	  if test "$need_version" = no; then
+	    versuffix=
+	  else
+	    versuffix=".0.0"
+	  fi
+	fi
+
+	# Remove version info from name if versioning should be avoided
+	if test "$avoid_version" = yes && test "$need_version" = no; then
+	  major=
+	  versuffix=
+	  verstring=""
+	fi
+
+	# Check to see if the archive will have undefined symbols.
+	if test "$allow_undefined" = yes; then
+	  if test "$allow_undefined_flag" = unsupported; then
+	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+	    build_libtool_libs=no
+	    build_old_libs=yes
+	  fi
+	else
+	  # Don't allow undefined symbols.
+	  allow_undefined_flag="$no_undefined_flag"
+	fi
+      fi
+
+      if test "$mode" != relink; then
+	# Remove our outputs, but don't remove object files since they
+	# may have been created when compiling PIC objects.
+	removelist=
+	tempremovelist=`$echo "$output_objdir/*"`
+	for p in $tempremovelist; do
+	  case $p in
+	    *.$objext)
+	       ;;
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+	       removelist="$removelist $p"
+	       ;;
+	    *) ;;
+	  esac
+	done
+	if test -n "$removelist"; then
+	  $show "${rm}r $removelist"
+	  $run ${rm}r $removelist
+	fi
+      fi
+
+      # Now set the variables for building old libraries.
+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+
+	# Transform .lo files to .o files.
+	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+      fi
+
+      # Eliminate all temporary directories.
+      for path in $notinst_path; do
+	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
+	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
+	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
+      done
+
+      if test -n "$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	temp_xrpath=
+	for libdir in $xrpath; do
+	  temp_xrpath="$temp_xrpath -R$libdir"
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  esac
+	done
+	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+	  dependency_libs="$temp_xrpath $dependency_libs"
+	fi
+      fi
+
+      # Make sure dlfiles contains only unique files that won't be dlpreopened
+      old_dlfiles="$dlfiles"
+      dlfiles=
+      for lib in $old_dlfiles; do
+	case " $dlprefiles $dlfiles " in
+	*" $lib "*) ;;
+	*) dlfiles="$dlfiles $lib" ;;
+	esac
+      done
+
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles="$dlprefiles"
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+	case "$dlprefiles " in
+	*" $lib "*) ;;
+	*) dlprefiles="$dlprefiles $lib" ;;
+	esac
+      done
+
+      if test "$build_libtool_libs" = yes; then
+	if test -n "$rpath"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+	    # these systems don't actually have a c library (as such)!
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C library is in the System framework
+	    deplibs="$deplibs -framework System"
+	    ;;
+	  *-*-netbsd*)
+	    # Don't link with libc until the a.out ld.so is fixed.
+	    ;;
+	  *-*-openbsd* | *-*-freebsd*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+ 	  *)
+	    # Add libc to deplibs on all other systems if necessary.
+	    if test "$build_libtool_need_lc" = "yes"; then
+	      deplibs="$deplibs -lc"
+	    fi
+	    ;;
+	  esac
+	fi
+
+	# Transform deplibs into only deplibs that can be linked in shared.
+	name_save=$name
+	libname_save=$libname
+	release_save=$release
+	versuffix_save=$versuffix
+	major_save=$major
+	# I'm not sure if I'm treating the release correctly.  I think
+	# release should show up in the -l (ie -lgmp5) so we don't want to
+	# add it in twice.  Is that correct?
+	release=""
+	versuffix=""
+	major=""
+	newdeplibs=
+	droppeddeps=no
+	case $deplibs_check_method in
+	pass_all)
+	  # Don't check for shared/static.  Everything works.
+	  # This might be a little naive.  We might want to check
+	  # whether the library exists or not.  But this is on
+	  # osf3 & osf4 and I'm not really sure... Just
+	  # implementing what was already the behavior.
+	  newdeplibs=$deplibs
+	  ;;
+	test_compile)
+	  # This code stresses the "libraries are programs" paradigm to its
+	  # limits. Maybe even breaks it.  We compile a program, linking it
+	  # against the deplibs as a proxy for the library.  Then we can check
+	  # whether they linked in statically or dynamically with ldd.
+	  $rm conftest.c
+	  cat > conftest.c <<EOF
+	  int main() { return 0; }
+EOF
+	  $rm conftest
+	  $LTCC -o conftest conftest.c $deplibs
+	  if test "$?" -eq 0 ; then
+	    ldd_output=`ldd conftest`
+	    for i in $deplibs; do
+	      name="`expr $i : '-l\(.*\)'`"
+	      # If $name is empty we are operating on a -L argument.
+              if test "$name" != "" && test "$name" -ne "0"; then
+		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		  case " $predeps $postdeps " in
+		  *" $i "*)
+		    newdeplibs="$newdeplibs $i"
+		    i=""
+		    ;;
+		  esac
+	        fi
+		if test -n "$i" ; then
+		  libname=`eval \\$echo \"$libname_spec\"`
+		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
+		  set dummy $deplib_matches
+		  deplib_match=$2
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		    newdeplibs="$newdeplibs $i"
+		  else
+		    droppeddeps=yes
+		    $echo
+		    $echo "*** Warning: dynamic linker does not accept needed library $i."
+		    $echo "*** I have the capability to make that library automatically link in when"
+		    $echo "*** you link to this library.  But I can only do this if you have a"
+		    $echo "*** shared version of the library, which I believe you do not have"
+		    $echo "*** because a test_compile did reveal that the linker did not use it for"
+		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		  fi
+		fi
+	      else
+		newdeplibs="$newdeplibs $i"
+	      fi
+	    done
+	  else
+	    # Error occurred in the first compile.  Let's try to salvage
+	    # the situation: Compile a separate program for each library.
+	    for i in $deplibs; do
+	      name="`expr $i : '-l\(.*\)'`"
+	      # If $name is empty we are operating on a -L argument.
+              if test "$name" != "" && test "$name" != "0"; then
+		$rm conftest
+		$LTCC -o conftest conftest.c $i
+		# Did it work?
+		if test "$?" -eq 0 ; then
+		  ldd_output=`ldd conftest`
+		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		    case " $predeps $postdeps " in
+		    *" $i "*)
+		      newdeplibs="$newdeplibs $i"
+		      i=""
+		      ;;
+		    esac
+		  fi
+		  if test -n "$i" ; then
+		    libname=`eval \\$echo \"$libname_spec\"`
+		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
+		    set dummy $deplib_matches
+		    deplib_match=$2
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		      newdeplibs="$newdeplibs $i"
+		    else
+		      droppeddeps=yes
+		      $echo
+		      $echo "*** Warning: dynamic linker does not accept needed library $i."
+		      $echo "*** I have the capability to make that library automatically link in when"
+		      $echo "*** you link to this library.  But I can only do this if you have a"
+		      $echo "*** shared version of the library, which you do not appear to have"
+		      $echo "*** because a test_compile did reveal that the linker did not use this one"
+		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		    fi
+		  fi
+		else
+		  droppeddeps=yes
+		  $echo
+		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
+		  $echo "***  make it link in!  You will probably need to install it or some"
+		  $echo "*** library that it depends on before this library will be fully"
+		  $echo "*** functional.  Installing it before continuing would be even better."
+		fi
+	      else
+		newdeplibs="$newdeplibs $i"
+	      fi
+	    done
+	  fi
+	  ;;
+	file_magic*)
+	  set dummy $deplibs_check_method
+	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    name="`expr $a_deplib : '-l\(.*\)'`"
+	    # If $name is empty we are operating on a -L argument.
+            if test "$name" != "" && test  "$name" != "0"; then
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  newdeplibs="$newdeplibs $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval \\$echo \"$libname_spec\"`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		      # Follow soft links.
+		      if ls -lLd "$potent_lib" 2>/dev/null \
+			 | grep " -> " >/dev/null; then
+			continue
+		      fi
+		      # The statement above tries to avoid entering an
+		      # endless loop below, in case of cyclic links.
+		      # We might still enter an endless loop, since a link
+		      # loop can be closed while we follow links,
+		      # but so what?
+		      potlib="$potent_lib"
+		      while test -h "$potlib" 2>/dev/null; do
+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+			case $potliblink in
+			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+			esac
+		      done
+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
+			 | ${SED} 10q \
+			 | $EGREP "$file_magic_regex" > /dev/null; then
+			newdeplibs="$newdeplibs $a_deplib"
+			a_deplib=""
+			break 2
+		      fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		$echo
+		$echo "*** Warning: linker path does not have real file for library $a_deplib."
+		$echo "*** I have the capability to make that library automatically link in when"
+		$echo "*** you link to this library.  But I can only do this if you have a"
+		$echo "*** shared version of the library, which you do not appear to have"
+		$echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
+		else
+		  $echo "*** with $libname and none of the candidates passed a file format test"
+		  $echo "*** using a file magic. Last file checked: $potlib"
+		fi
+	      fi
+	    else
+	      # Add a -L argument.
+	      newdeplibs="$newdeplibs $a_deplib"
+	    fi
+	  done # Gone through all deplibs.
+	  ;;
+	match_pattern*)
+	  set dummy $deplibs_check_method
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    name="`expr $a_deplib : '-l\(.*\)'`"
+	    # If $name is empty we are operating on a -L argument.
+	    if test -n "$name" && test "$name" != "0"; then
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  newdeplibs="$newdeplibs $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval \\$echo \"$libname_spec\"`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		    potlib="$potent_lib" # see symlink-check above in file_magic test
+		    if eval $echo \"$potent_lib\" 2>/dev/null \
+		        | ${SED} 10q \
+		        | $EGREP "$match_pattern_regex" > /dev/null; then
+		      newdeplibs="$newdeplibs $a_deplib"
+		      a_deplib=""
+		      break 2
+		    fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		$echo
+		$echo "*** Warning: linker path does not have real file for library $a_deplib."
+		$echo "*** I have the capability to make that library automatically link in when"
+		$echo "*** you link to this library.  But I can only do this if you have a"
+		$echo "*** shared version of the library, which you do not appear to have"
+		$echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
+		else
+		  $echo "*** with $libname and none of the candidates passed a file format test"
+		  $echo "*** using a regex pattern. Last file checked: $potlib"
+		fi
+	      fi
+	    else
+	      # Add a -L argument.
+	      newdeplibs="$newdeplibs $a_deplib"
+	    fi
+	  done # Gone through all deplibs.
+	  ;;
+	none | unknown | *)
+	  newdeplibs=""
+	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
+	    -e 's/ -[LR][^ ]*//g'`
+	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	    for i in $predeps $postdeps ; do
+	      # can't use Xsed below, because $i might contain '/'
+	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
+	    done
+	  fi
+	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
+	    | grep . >/dev/null; then
+	    $echo
+	    if test "X$deplibs_check_method" = "Xnone"; then
+	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
+	    else
+	      $echo "*** Warning: inter-library dependencies are not known to be supported."
+	    fi
+	    $echo "*** All declared inter-library dependencies are being dropped."
+	    droppeddeps=yes
+	  fi
+	  ;;
+	esac
+	versuffix=$versuffix_save
+	major=$major_save
+	release=$release_save
+	libname=$libname_save
+	name=$name_save
+
+	case $host in
+	*-*-rhapsody* | *-*-darwin1.[012])
+	  # On Rhapsody replace the C library is the System framework
+	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	  ;;
+	esac
+
+	if test "$droppeddeps" = yes; then
+	  if test "$module" = yes; then
+	    $echo
+	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
+	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
+	    $echo "*** a static module, that should work as long as the dlopening"
+	    $echo "*** application is linked with the -dlopen flag."
+	    if test -z "$global_symbol_pipe"; then
+	      $echo
+	      $echo "*** However, this would only work if libtool was able to extract symbol"
+	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      $echo "*** not find such a program.  So, this module is probably useless."
+	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	    fi
+	    if test "$build_old_libs" = no; then
+	      oldlibs="$output_objdir/$libname.$libext"
+	      build_libtool_libs=module
+	      build_old_libs=yes
+	    else
+	      build_libtool_libs=no
+	    fi
+	  else
+	    $echo "*** The inter-library dependencies that have been dropped here will be"
+	    $echo "*** automatically added whenever a program is linked with this library"
+	    $echo "*** or is declared to -dlopen it."
+
+	    if test "$allow_undefined" = no; then
+	      $echo
+	      $echo "*** Since this library must not contain undefined symbols,"
+	      $echo "*** because either the platform does not support them or"
+	      $echo "*** it was explicitly requested with -no-undefined,"
+	      $echo "*** libtool will only create a static version of it."
+	      if test "$build_old_libs" = no; then
+		oldlibs="$output_objdir/$libname.$libext"
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  fi
+	fi
+	# Done checking deplibs!
+	deplibs=$newdeplibs
+      fi
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      # Test again, we may have decided not to build it any more
+      if test "$build_libtool_libs" = yes; then
+	if test "$hardcode_into_libs" = yes; then
+	  # Hardcode the library paths
+	  hardcode_libdirs=
+	  dep_rpath=
+	  rpath="$finalize_rpath"
+	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+	  for libdir in $rpath; do
+	    if test -n "$hardcode_libdir_flag_spec"; then
+	      if test -n "$hardcode_libdir_separator"; then
+		if test -z "$hardcode_libdirs"; then
+		  hardcode_libdirs="$libdir"
+		else
+		  # Just accumulate the unique libdirs.
+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		    ;;
+		  *)
+		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		    ;;
+		  esac
+		fi
+	      else
+		eval flag=\"$hardcode_libdir_flag_spec\"
+		dep_rpath="$dep_rpath $flag"
+	      fi
+	    elif test -n "$runpath_var"; then
+	      case "$perm_rpath " in
+	      *" $libdir "*) ;;
+	      *) perm_rpath="$perm_rpath $libdir" ;;
+	      esac
+	    fi
+	  done
+	  # Substitute the hardcoded libdirs into the rpath.
+	  if test -n "$hardcode_libdir_separator" &&
+	     test -n "$hardcode_libdirs"; then
+	    libdir="$hardcode_libdirs"
+	    if test -n "$hardcode_libdir_flag_spec_ld"; then
+	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+	    else
+	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+	    fi
+	  fi
+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+	    # We should set the runpath_var.
+	    rpath=
+	    for dir in $perm_rpath; do
+	      rpath="$rpath$dir:"
+	    done
+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+	  fi
+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+	fi
+
+	shlibpath="$finalize_shlibpath"
+	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	if test -n "$shlibpath"; then
+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+	fi
+
+	# Get the real and link names of the library.
+	eval shared_ext=\"$shrext\"
+	eval library_names=\"$library_names_spec\"
+	set dummy $library_names
+	realname="$2"
+	shift; shift
+
+	if test -n "$soname_spec"; then
+	  eval soname=\"$soname_spec\"
+	else
+	  soname="$realname"
+	fi
+	if test -z "$dlname"; then
+	  dlname=$soname
+	fi
+
+	lib="$output_objdir/$realname"
+	for link
+	do
+	  linknames="$linknames $link"
+	done
+
+	# Use standard objects if they are pic
+	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+
+	# Prepare the list of exported symbols
+	if test -z "$export_symbols"; then
+	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+	    $show "generating symbol list for \`$libname.la'"
+	    export_symbols="$output_objdir/$libname.exp"
+	    $run $rm $export_symbols
+	    eval cmds=\"$export_symbols_cmds\"
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd in $cmds; do
+	      IFS="$save_ifs"
+	      if len=`expr "X$cmd" : ".*"` &&
+	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	        $show "$cmd"
+	        $run eval "$cmd" || exit $?
+	        skipped_export=false
+	      else
+	        # The command line is too long to execute in one step.
+	        $show "using reloadable object file for export list..."
+	        skipped_export=:
+	      fi
+	    done
+	    IFS="$save_ifs"
+	    if test -n "$export_symbols_regex"; then
+	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
+	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
+	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+	fi
+
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
+	fi
+
+	tmp_deplibs=
+	for test_deplib in $deplibs; do
+		case " $convenience " in
+		*" $test_deplib "*) ;;
+		*) 
+			tmp_deplibs="$tmp_deplibs $test_deplib"
+			;;
+		esac
+	done
+	deplibs="$tmp_deplibs" 
+
+	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	  else
+	    gentop="$output_objdir/${outputname}x"
+	    $show "${rm}r $gentop"
+	    $run ${rm}r "$gentop"
+	    $show "$mkdir $gentop"
+	    $run $mkdir "$gentop"
+	    status=$?
+	    if test "$status" -ne 0 && test ! -d "$gentop"; then
+	      exit $status
+	    fi
+	    generated="$generated $gentop"
+
+	    for xlib in $convenience; do
+	      # Extract the objects.
+	      case $xlib in
+	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+	      *) xabs=`pwd`"/$xlib" ;;
+	      esac
+	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+	      xdir="$gentop/$xlib"
+
+	      $show "${rm}r $xdir"
+	      $run ${rm}r "$xdir"
+	      $show "$mkdir $xdir"
+	      $run $mkdir "$xdir"
+	      status=$?
+	      if test "$status" -ne 0 && test ! -d "$xdir"; then
+		exit $status
+	      fi
+	      # We will extract separately just the conflicting names and we will no
+	      # longer touch any unique names. It is faster to leave these extract
+	      # automatically by $AR in one run.
+	      $show "(cd $xdir && $AR x $xabs)"
+	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+		:
+	      else
+		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+		$AR t "$xabs" | sort | uniq -cd | while read -r count name
+		do
+		  i=1
+		  while test "$i" -le "$count"
+		  do
+		   # Put our $i before any first dot (extension)
+		   # Never overwrite any file
+		   name_to="$name"
+		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+		   do
+		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+		   done
+		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+		   i=`expr $i + 1`
+		  done
+		done
+	      fi
+
+	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+	    done
+	  fi
+	fi
+
+	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+	  eval flag=\"$thread_safe_flag_spec\"
+	  linker_flags="$linker_flags $flag"
+	fi
+
+	# Make a backup of the uninstalled library when relinking
+	if test "$mode" = relink; then
+	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+	fi
+
+	# Do each of the archive commands.
+	if test "$module" = yes && test -n "$module_cmds" ; then
+	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	    eval cmds=\"$module_expsym_cmds\"
+	  else
+	    eval cmds=\"$module_cmds\"
+	  fi
+	else
+	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	  eval cmds=\"$archive_expsym_cmds\"
+	else
+	  eval cmds=\"$archive_cmds\"
+	  fi
+	fi
+
+	if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
+	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  :
+	else
+	  # The command line is too long to link in one step, link piecewise.
+	  $echo "creating reloadable object files..."
+
+	  # Save the value of $output and $libobjs because we want to
+	  # use them later.  If we have whole_archive_flag_spec, we
+	  # want to use save_libobjs as it was before
+	  # whole_archive_flag_spec was expanded, because we can't
+	  # assume the linker understands whole_archive_flag_spec.
+	  # This may have to be revisited, in case too many
+	  # convenience libraries get linked in and end up exceeding
+	  # the spec.
+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	  fi
+	  save_output=$output
+
+	  # Clear the reloadable object creation command queue and
+	  # initialize k to one.
+	  test_cmds=
+	  concat_cmds=
+	  objlist=
+	  delfiles=
+	  last_robj=
+	  k=1
+	  output=$output_objdir/$save_output-${k}.$objext
+	  # Loop over the list of objects to be linked.
+	  for obj in $save_libobjs
+	  do
+	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+	    if test "X$objlist" = X ||
+	       { len=`expr "X$test_cmds" : ".*"` &&
+		 test "$len" -le "$max_cmd_len"; }; then
+	      objlist="$objlist $obj"
+	    else
+	      # The command $test_cmds is almost too long, add a
+	      # command to the queue.
+	      if test "$k" -eq 1 ; then
+		# The first file doesn't have a previous command to add.
+		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+	      else
+		# All subsequent reloadable object files will link in
+		# the last one created.
+		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+	      fi
+	      last_robj=$output_objdir/$save_output-${k}.$objext
+	      k=`expr $k + 1`
+	      output=$output_objdir/$save_output-${k}.$objext
+	      objlist=$obj
+	      len=1
+	    fi
+	  done
+	  # Handle the remaining objects by creating one last
+	  # reloadable object file.  All subsequent reloadable object
+	  # files will link in the last one created.
+	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+
+	  if ${skipped_export-false}; then
+	    $show "generating symbol list for \`$libname.la'"
+	    export_symbols="$output_objdir/$libname.exp"
+	    $run $rm $export_symbols
+	    libobjs=$output
+	    # Append the command to create the export file.
+	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+          fi
+
+	  # Set up a command to remove the reloadale object files
+	  # after they are used.
+	  i=0
+	  while test "$i" -lt "$k"
+	  do
+	    i=`expr $i + 1`
+	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
+	  done
+
+	  $echo "creating a temporary reloadable object file: $output"
+
+	  # Loop through the commands generated above and execute them.
+	  save_ifs="$IFS"; IFS='~'
+	  for cmd in $concat_cmds; do
+	    IFS="$save_ifs"
+	    $show "$cmd"
+	    $run eval "$cmd" || exit $?
+	  done
+	  IFS="$save_ifs"
+
+	  libobjs=$output
+	  # Restore the value of output.
+	  output=$save_output
+
+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	  fi
+	  # Expand the library linking commands again to reset the
+	  # value of $libobjs for piecewise linking.
+
+	  # Do each of the archive commands.
+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	    eval cmds=\"$archive_expsym_cmds\"
+	  else
+	    eval cmds=\"$archive_cmds\"
+	  fi
+
+	  # Append the command to remove the reloadable object files
+	  # to the just-reset $cmds.
+	  eval cmds=\"\$cmds~$rm $delfiles\"
+	fi
+	save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  $show "$cmd"
+	  $run eval "$cmd" || exit $?
+	done
+	IFS="$save_ifs"
+
+	# Restore the uninstalled library and exit
+	if test "$mode" = relink; then
+	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+	  exit 0
+	fi
+
+	# Create links to the real library.
+	for linkname in $linknames; do
+	  if test "$realname" != "$linkname"; then
+	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
+	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
+	  fi
+	done
+
+	# If -module or -export-dynamic was specified, set the dlname.
+	if test "$module" = yes || test "$export_dynamic" = yes; then
+	  # On all known operating systems, these are identical.
+	  dlname="$soname"
+	fi
+      fi
+      ;;
+
+    obj)
+      if test -n "$deplibs"; then
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
+      fi
+
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$rpath"; then
+	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$xrpath"; then
+	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$vinfo"; then
+	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$release"; then
+	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
+      fi
+
+      case $output in
+      *.lo)
+	if test -n "$objs$old_deplibs"; then
+	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+	  exit 1
+	fi
+	libobj="$output"
+	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+	;;
+      *)
+	libobj=
+	obj="$output"
+	;;
+      esac
+
+      # Delete the old objects.
+      $run $rm $obj $libobj
+
+      # Objects from convenience libraries.  This assumes
+      # single-version convenience libraries.  Whenever we create
+      # different ones for PIC/non-PIC, this we'll have to duplicate
+      # the extraction.
+      reload_conv_objs=
+      gentop=
+      # reload_cmds runs $LD directly, so let us get rid of
+      # -Wl from whole_archive_flag_spec
+      wl=
+
+      if test -n "$convenience"; then
+	if test -n "$whole_archive_flag_spec"; then
+	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+	else
+	  gentop="$output_objdir/${obj}x"
+	  $show "${rm}r $gentop"
+	  $run ${rm}r "$gentop"
+	  $show "$mkdir $gentop"
+	  $run $mkdir "$gentop"
+	  status=$?
+	  if test "$status" -ne 0 && test ! -d "$gentop"; then
+	    exit $status
+	  fi
+	  generated="$generated $gentop"
+
+	  for xlib in $convenience; do
+	    # Extract the objects.
+	    case $xlib in
+	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+	    *) xabs=`pwd`"/$xlib" ;;
+	    esac
+	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+	    xdir="$gentop/$xlib"
+
+	    $show "${rm}r $xdir"
+	    $run ${rm}r "$xdir"
+	    $show "$mkdir $xdir"
+	    $run $mkdir "$xdir"
+	    status=$?
+	    if test "$status" -ne 0 && test ! -d "$xdir"; then
+	      exit $status
+	    fi
+	    # We will extract separately just the conflicting names and we will no
+	    # longer touch any unique names. It is faster to leave these extract
+	    # automatically by $AR in one run.
+	    $show "(cd $xdir && $AR x $xabs)"
+	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+	      :
+	    else
+	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
+	      do
+		i=1
+		while test "$i" -le "$count"
+		do
+		 # Put our $i before any first dot (extension)
+		 # Never overwrite any file
+		 name_to="$name"
+		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+		 do
+		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+		 done
+		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+		 i=`expr $i + 1`
+		done
+	      done
+	    fi
+
+	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+	  done
+	fi
+      fi
+
+      # Create the old-style object.
+      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+
+      output="$obj"
+      eval cmds=\"$reload_cmds\"
+      save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+	IFS="$save_ifs"
+	$show "$cmd"
+	$run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+
+      # Exit if we aren't doing a library object file.
+      if test -z "$libobj"; then
+	if test -n "$gentop"; then
+	  $show "${rm}r $gentop"
+	  $run ${rm}r $gentop
+	fi
+
+	exit 0
+      fi
+
+      if test "$build_libtool_libs" != yes; then
+	if test -n "$gentop"; then
+	  $show "${rm}r $gentop"
+	  $run ${rm}r $gentop
+	fi
+
+	# Create an invalid libtool object if no PIC, so that we don't
+	# accidentally link it into a program.
+	# $show "echo timestamp > $libobj"
+	# $run eval "echo timestamp > $libobj" || exit $?
+	exit 0
+      fi
+
+      if test -n "$pic_flag" || test "$pic_mode" != default; then
+	# Only do commands if we really have different PIC objects.
+	reload_objs="$libobjs $reload_conv_objs"
+	output="$libobj"
+	eval cmds=\"$reload_cmds\"
+	save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  $show "$cmd"
+	  $run eval "$cmd" || exit $?
+	done
+	IFS="$save_ifs"
+      fi
+
+      if test -n "$gentop"; then
+	$show "${rm}r $gentop"
+	$run ${rm}r $gentop
+      fi
+
+      exit 0
+      ;;
+
+    prog)
+      case $host in
+	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
+      esac
+      if test -n "$vinfo"; then
+	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
+      fi
+
+      if test -n "$release"; then
+	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
+      fi
+
+      if test "$preload" = yes; then
+	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
+	   test "$dlopen_self_static" = unknown; then
+	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
+	fi
+      fi
+
+      case $host in
+      *-*-rhapsody* | *-*-darwin1.[012])
+	# On Rhapsody replace the C library is the System framework
+	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	;;
+      esac
+
+      case $host in
+      *darwin*)
+        # Don't allow lazy linking, it breaks C++ global constructors
+        if test "$tagname" = CXX ; then
+        compile_command="$compile_command ${wl}-bind_at_load"
+        finalize_command="$finalize_command ${wl}-bind_at_load"
+        fi
+        ;;
+      esac
+
+      compile_command="$compile_command $compile_deplibs"
+      finalize_command="$finalize_command $finalize_deplibs"
+
+      if test -n "$rpath$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	for libdir in $rpath $xrpath; do
+	  # This is the magic to use -rpath.
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  esac
+	done
+      fi
+
+      # Now hardcode the library paths
+      rpath=
+      hardcode_libdirs=
+      for libdir in $compile_rpath $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    rpath="$rpath $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) perm_rpath="$perm_rpath $libdir" ;;
+	  esac
+	fi
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	  case :$dllsearchpath: in
+	  *":$libdir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$libdir";;
+	  esac
+	  ;;
+	esac
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      compile_rpath="$rpath"
+
+      rpath=
+      hardcode_libdirs=
+      for libdir in $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    rpath="$rpath $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$finalize_perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+	  esac
+	fi
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      finalize_rpath="$rpath"
+
+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+	# Transform all the library objects into standard objects.
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+      fi
+
+      dlsyms=
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	  dlsyms="${outputname}S.c"
+	else
+	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
+	fi
+      fi
+
+      if test -n "$dlsyms"; then
+	case $dlsyms in
+	"") ;;
+	*.c)
+	  # Discover the nlist of each of the dlfiles.
+	  nlist="$output_objdir/${outputname}.nm"
+
+	  $show "$rm $nlist ${nlist}S ${nlist}T"
+	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
+
+	  # Parse the name list into a source file.
+	  $show "creating $output_objdir/$dlsyms"
+
+	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
+/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
+/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+/* Prevent the only kind of declaration conflicts we can make. */
+#define lt_preloaded_symbols some_other_symbol
+
+/* External symbol declarations for the compiler. */\
+"
+
+	  if test "$dlself" = yes; then
+	    $show "generating symbol list for \`$output'"
+
+	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
+
+	    # Add our own program objects to the symbol list.
+	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	    for arg in $progfiles; do
+	      $show "extracting global C symbols from \`$arg'"
+	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+	    done
+
+	    if test -n "$exclude_expsyms"; then
+	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+	      $run eval '$mv "$nlist"T "$nlist"'
+	    fi
+
+	    if test -n "$export_symbols_regex"; then
+	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      $run eval '$mv "$nlist"T "$nlist"'
+	    fi
+
+	    # Prepare the list of exported symbols
+	    if test -z "$export_symbols"; then
+	      export_symbols="$output_objdir/$output.exp"
+	      $run $rm $export_symbols
+	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	    else
+	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
+	      $run eval 'mv "$nlist"T "$nlist"'
+	    fi
+	  fi
+
+	  for arg in $dlprefiles; do
+	    $show "extracting global C symbols from \`$arg'"
+	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
+	    $run eval '$echo ": $name " >> "$nlist"'
+	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -z "$run"; then
+	    # Make sure we have at least an empty file.
+	    test -f "$nlist" || : > "$nlist"
+
+	    if test -n "$exclude_expsyms"; then
+	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	      $mv "$nlist"T "$nlist"
+	    fi
+
+	    # Try sorting and uniquifying the output.
+	    if grep -v "^: " < "$nlist" |
+		if sort -k 3 </dev/null >/dev/null 2>&1; then
+		  sort -k 3
+		else
+		  sort +2
+		fi |
+		uniq > "$nlist"S; then
+	      :
+	    else
+	      grep -v "^: " < "$nlist" > "$nlist"S
+	    fi
+
+	    if test -f "$nlist"S; then
+	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
+	    else
+	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
+	    fi
+
+	    $echo >> "$output_objdir/$dlsyms" "\
+
+#undef lt_preloaded_symbols
+
+#if defined (__STDC__) && __STDC__
+# define lt_ptr void *
+#else
+# define lt_ptr char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+  const char *name;
+  lt_ptr address;
+}
+lt_preloaded_symbols[] =
+{\
+"
+
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
+
+	    $echo >> "$output_objdir/$dlsyms" "\
+  {0, (lt_ptr) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	  fi
+
+	  pic_flag_for_symtable=
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    case "$compile_command " in
+	    *" -static "*) ;;
+	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
+	    esac;;
+	  *-*-hpux*)
+	    case "$compile_command " in
+	    *" -static "*) ;;
+	    *) pic_flag_for_symtable=" $pic_flag";;
+	    esac
+	  esac
+
+	  # Now compile the dynamic symbol file.
+	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+
+	  # Clean up the generated files.
+	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
+
+	  # Transform the symbol file into the correct name.
+	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+	  ;;
+	*)
+	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+	  exit 1
+	  ;;
+	esac
+      else
+	# We keep going just in case the user didn't refer to
+	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+	# really was required.
+
+	# Nullify the symbol file.
+	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+      fi
+
+      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+	# Replace the output file specification.
+	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	link_command="$compile_command$compile_rpath"
+
+	# We have no uninstalled library dependencies, so finalize right now.
+	$show "$link_command"
+	$run eval "$link_command"
+	status=$?
+
+	# Delete the generated files.
+	if test -n "$dlsyms"; then
+	  $show "$rm $output_objdir/${outputname}S.${objext}"
+	  $run $rm "$output_objdir/${outputname}S.${objext}"
+	fi
+
+	exit $status
+      fi
+
+      if test -n "$shlibpath_var"; then
+	# We should set the shlibpath_var
+	rpath=
+	for dir in $temp_rpath; do
+	  case $dir in
+	  [\\/]* | [A-Za-z]:[\\/]*)
+	    # Absolute path.
+	    rpath="$rpath$dir:"
+	    ;;
+	  *)
+	    # Relative path: add a thisdir entry.
+	    rpath="$rpath\$thisdir/$dir:"
+	    ;;
+	  esac
+	done
+	temp_rpath="$rpath"
+      fi
+
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
+
+      compile_var=
+      finalize_var=
+      if test -n "$runpath_var"; then
+	if test -n "$perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $perm_rpath; do
+	    rpath="$rpath$dir:"
+	  done
+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+	if test -n "$finalize_perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $finalize_perm_rpath; do
+	    rpath="$rpath$dir:"
+	  done
+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+      fi
+
+      if test "$no_install" = yes; then
+	# We don't need to create a wrapper script.
+	link_command="$compile_var$compile_command$compile_rpath"
+	# Replace the output file specification.
+	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	# Delete the old output file.
+	$run $rm $output
+	# Link the executable and exit
+	$show "$link_command"
+	$run eval "$link_command" || exit $?
+	exit 0
+      fi
+
+      if test "$hardcode_action" = relink; then
+	# Fast installation is not supported
+	link_command="$compile_var$compile_command$compile_rpath"
+	relink_command="$finalize_var$finalize_command$finalize_rpath"
+
+	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
+	$echo "$modename: \`$output' will be relinked during installation" 1>&2
+      else
+	if test "$fast_install" != no; then
+	  link_command="$finalize_var$compile_command$finalize_rpath"
+	  if test "$fast_install" = yes; then
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	  else
+	    # fast_install is set to needless
+	    relink_command=
+	  fi
+	else
+	  link_command="$compile_var$compile_command$compile_rpath"
+	  relink_command="$finalize_var$finalize_command$finalize_rpath"
+	fi
+      fi
+
+      # Replace the output file specification.
+      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+      # Delete the old output files.
+      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+      $show "$link_command"
+      $run eval "$link_command" || exit $?
+
+      # Now create the wrapper script.
+      $show "creating $output"
+
+      # Quote the relink command for shipping.
+      if test -n "$relink_command"; then
+	# Preserve any variables that may affect compiler behavior
+	for var in $variables_saved_for_relink; do
+	  if eval test -z \"\${$var+set}\"; then
+	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+	  elif eval var_value=\$$var; test -z "$var_value"; then
+	    relink_command="$var=; export $var; $relink_command"
+	  else
+	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
+	  fi
+	done
+	relink_command="(cd `pwd`; $relink_command)"
+	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      fi
+
+      # Quote $echo for shipping.
+      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
+	case $0 in
+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
+	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
+	esac
+	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+      else
+	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
+      fi
+
+      # Only actually do things if our run command is non-null.
+      if test -z "$run"; then
+	# win32 will think the script is a binary if it has
+	# a .exe suffix, so we strip it off here.
+	case $output in
+	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
+	esac
+	# test for cygwin because mv fails w/o .exe extensions
+	case $host in
+	  *cygwin*)
+	    exeext=.exe
+	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
+	  *) exeext= ;;
+	esac
+	case $host in
+	  *cygwin* | *mingw* )
+	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
+	    cwrapper=`$echo ${output}.exe`
+	    $rm $cwrappersource $cwrapper
+	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
+
+	    cat > $cwrappersource <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+   
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+
+   Currently, it simply execs the wrapper *script* "/bin/sh $output",
+   but could eventually absorb all of the scripts functionality and
+   exec $objdir/$outputname directly.
+*/
+EOF
+	    cat >> $cwrappersource<<"EOF"
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+
+#if defined(PATH_MAX)
+# define LT_PATHMAX PATH_MAX
+#elif defined(MAXPATHLEN)
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef DIR_SEPARATOR
+#define DIR_SEPARATOR '/'
+#endif
+
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+  defined (__OS2__)
+#define HAVE_DOS_BASED_FILE_SYSTEM
+#ifndef DIR_SEPARATOR_2 
+#define DIR_SEPARATOR_2 '\\'
+#endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free ((void *) stale); stale = 0; } \
+} while (0)
+
+const char *program_name = NULL;
+
+void * xmalloc (size_t num);
+char * xstrdup (const char *string);
+char * basename (const char *name);
+char * fnqualify(const char *path);
+char * strendzap(char *str, const char *pat);
+void lt_fatal (const char *message, ...);
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int i;
+  
+  program_name = (char *) xstrdup ((char *) basename (argv[0]));
+  newargz = XMALLOC(char *, argc+2);
+EOF
+
+	    cat >> $cwrappersource <<EOF
+  newargz[0] = "$SHELL";
+EOF
+
+	    cat >> $cwrappersource <<"EOF"
+  newargz[1] = fnqualify(argv[0]);
+  /* we know the script has the same name, without the .exe */
+  /* so make sure newargz[1] doesn't end in .exe */
+  strendzap(newargz[1],".exe"); 
+  for (i = 1; i < argc; i++)
+    newargz[i+1] = xstrdup(argv[i]);
+  newargz[argc+1] = NULL;
+EOF
+
+	    cat >> $cwrappersource <<EOF
+  execv("$SHELL",newargz);
+EOF
+
+	    cat >> $cwrappersource <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+  void * p = (void *) malloc (num);
+  if (!p)
+    lt_fatal ("Memory exhausted");
+
+  return p;
+}
+
+char * 
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
+;
+}
+
+char *
+basename (const char *name)
+{
+  const char *base;
+
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha (name[0]) && name[1] == ':') 
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return (char *) base;
+}
+
+char * 
+fnqualify(const char *path)
+{
+  size_t size;
+  char *p;
+  char tmp[LT_PATHMAX + 1];
+
+  assert(path != NULL);
+
+  /* Is it qualified already? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  if (isalpha (path[0]) && path[1] == ':')
+    return xstrdup (path);
+#endif
+  if (IS_DIR_SEPARATOR (path[0]))
+    return xstrdup (path);
+
+  /* prepend the current directory */
+  /* doesn't handle '~' */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal ("getcwd failed");
+  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
+  p = XMALLOC(char, size);
+  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
+  return p;
+}
+
+char *
+strendzap(char *str, const char *pat) 
+{
+  size_t len, patlen;
+
+  assert(str != NULL);
+  assert(pat != NULL);
+
+  len = strlen(str);
+  patlen = strlen(pat);
+
+  if (patlen <= len)
+  {
+    str += len - patlen;
+    if (strcmp(str, pat) == 0)
+      *str = '\0';
+  }
+  return str;
+}
+
+static void
+lt_error_core (int exit_status, const char * mode, 
+          const char * message, va_list ap)
+{
+  fprintf (stderr, "%s: %s: ", program_name, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+  va_end (ap);
+}
+EOF
+	  # we should really use a build-platform specific compiler
+	  # here, but OTOH, the wrappers (shell script and this C one)
+	  # are only useful if you want to execute the "real" binary.
+	  # Since the "real" binary is built for $host, then this
+	  # wrapper might as well be built for $host, too.
+	  $run $LTCC -s -o $cwrapper $cwrappersource
+	  ;;
+	esac
+	$rm $output
+	trap "$rm $output; exit 1" 1 2 15
+
+	$echo > $output "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='${SED} -e 1s/^X//'
+sed_quote_subst='$sed_quote_subst'
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variable:
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$echo are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    echo=\"$qecho\"
+    file=\"\$0\"
+    # Make sure echo works.
+    if test \"X\$1\" = X--no-reexec; then
+      # Discard the --no-reexec flag, and continue.
+      shift
+    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
+      # Yippee, \$echo works!
+      :
+    else
+      # Restart under the correct shell, and then maybe \$echo will work.
+      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+    fi
+  fi\
+"
+	$echo >> $output "\
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+  done
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+	if test "$fast_install" = yes; then
+	  $echo >> $output "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\" || \\
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $mkdir \"\$progdir\"
+    else
+      $rm \"\$progdir/\$file\"
+    fi"
+
+	  $echo >> $output "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+	$echo \"\$relink_command_output\" >&2
+	$rm \"\$progdir/\$file\"
+	exit 1
+      fi
+    fi
+
+    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $rm \"\$progdir/\$program\";
+      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $rm \"\$progdir/\$file\"
+  fi"
+	else
+	  $echo >> $output "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
+
+	$echo >> $output "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+	# Export our shlibpath_var if we have one.
+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $echo >> $output "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	# fixup the dll searchpath if we need to.
+	if test -n "$dllsearchpath"; then
+	  $echo >> $output "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	$echo >> $output "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+"
+	case $host in
+	# Backslashes separate directories on plain windows
+	*-*-mingw | *-*-os2*)
+	  $echo >> $output "\
+      exec \$progdir\\\\\$program \${1+\"\$@\"}
+"
+	  ;;
+
+	*)
+	  $echo >> $output "\
+      exec \$progdir/\$program \${1+\"\$@\"}
+"
+	  ;;
+	esac
+	$echo >> $output "\
+      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+      exit 1
+    fi
+  else
+    # The program doesn't exist.
+    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
+    \$echo \"This script is just a wrapper for \$program.\" 1>&2
+    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit 1
+  fi
+fi\
+"
+	chmod +x $output
+      fi
+      exit 0
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
+
+      if test "$build_libtool_libs" = convenience; then
+	oldobjs="$libobjs_save"
+	addlibs="$convenience"
+	build_libtool_libs=no
+      else
+	if test "$build_libtool_libs" = module; then
+	  oldobjs="$libobjs_save"
+	  build_libtool_libs=no
+	else
+	  oldobjs="$old_deplibs $non_pic_objects"
+	fi
+	addlibs="$old_convenience"
+      fi
+
+      if test -n "$addlibs"; then
+	gentop="$output_objdir/${outputname}x"
+	$show "${rm}r $gentop"
+	$run ${rm}r "$gentop"
+	$show "$mkdir $gentop"
+	$run $mkdir "$gentop"
+	status=$?
+	if test "$status" -ne 0 && test ! -d "$gentop"; then
+	  exit $status
+	fi
+	generated="$generated $gentop"
+
+	# Add in members from convenience archives.
+	for xlib in $addlibs; do
+	  # Extract the objects.
+	  case $xlib in
+	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+	  *) xabs=`pwd`"/$xlib" ;;
+	  esac
+	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+	  xdir="$gentop/$xlib"
+
+	  $show "${rm}r $xdir"
+	  $run ${rm}r "$xdir"
+	  $show "$mkdir $xdir"
+	  $run $mkdir "$xdir"
+	  status=$?
+	  if test "$status" -ne 0 && test ! -d "$xdir"; then
+	    exit $status
+	  fi
+	  # We will extract separately just the conflicting names and we will no
+	  # longer touch any unique names. It is faster to leave these extract
+	  # automatically by $AR in one run.
+	  $show "(cd $xdir && $AR x $xabs)"
+	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+	    :
+	  else
+	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
+	    do
+	      i=1
+	      while test "$i" -le "$count"
+	      do
+	       # Put our $i before any first dot (extension)
+	       # Never overwrite any file
+	       name_to="$name"
+	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+	       do
+		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+	       done
+	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+	       i=`expr $i + 1`
+	      done
+	    done
+	  fi
+
+	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+	done
+      fi
+
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+	eval cmds=\"$old_archive_from_new_cmds\"
+      else
+	eval cmds=\"$old_archive_cmds\"
+
+	if len=`expr "X$cmds" : ".*"` &&
+	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  :
+	else
+	  # the command line is too long to link in one step, link in parts
+	  $echo "using piecewise archive linking..."
+	  save_RANLIB=$RANLIB
+	  RANLIB=:
+	  objlist=
+	  concat_cmds=
+	  save_oldobjs=$oldobjs
+	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
+	  # encoded into archives.  This makes 'ar r' malfunction in
+	  # this piecewise linking case whenever conflicting object
+	  # names appear in distinct ar calls; check, warn and compensate.
+	    if (for obj in $save_oldobjs
+	    do
+	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	    :
+	  else
+	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
+	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
+	    AR_FLAGS=cq
+	  fi
+	  # Is there a better way of finding the last object in the list?
+	  for obj in $save_oldobjs
+	  do
+	    last_oldobj=$obj
+	  done  
+	  for obj in $save_oldobjs
+	  do
+	    oldobjs="$objlist $obj"
+	    objlist="$objlist $obj"
+	    eval test_cmds=\"$old_archive_cmds\"
+	    if len=`expr "X$test_cmds" : ".*"` &&
+	       test "$len" -le "$max_cmd_len"; then
+	      :
+	    else
+	      # the above command should be used before it gets too long
+	      oldobjs=$objlist
+	      if test "$obj" = "$last_oldobj" ; then
+	        RANLIB=$save_RANLIB
+	      fi  
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+	      objlist=
+	    fi
+	  done
+	  RANLIB=$save_RANLIB
+	  oldobjs=$objlist
+	  if test "X$oldobjs" = "X" ; then
+	    eval cmds=\"\$concat_cmds\"
+	  else
+	    eval cmds=\"\$concat_cmds~$old_archive_cmds\"
+	  fi
+	fi
+      fi
+      save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+	IFS="$save_ifs"
+	$show "$cmd"
+	$run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+    done
+
+    if test -n "$generated"; then
+      $show "${rm}r$generated"
+      $run ${rm}r$generated
+    fi
+
+    # Now create the libtool archive.
+    case $output in
+    *.la)
+      old_library=
+      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      $show "creating $output"
+
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+	if eval test -z \"\${$var+set}\"; then
+	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+	elif eval var_value=\$$var; test -z "$var_value"; then
+	  relink_command="$var=; export $var; $relink_command"
+	else
+	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
+	fi
+      done
+      # Quote the link command for shipping.
+      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+
+      # Only create the output if not a dry run.
+      if test -z "$run"; then
+	for installed in no yes; do
+	  if test "$installed" = yes; then
+	    if test -z "$install_libdir"; then
+	      break
+	    fi
+	    output="$output_objdir/$outputname"i
+	    # Replace all uninstalled libtool libraries with the installed ones
+	    newdependency_libs=
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      *.la)
+		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		if test -z "$libdir"; then
+		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+		  exit 1
+		fi
+		newdependency_libs="$newdependency_libs $libdir/$name"
+		;;
+	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+	      esac
+	    done
+	    dependency_libs="$newdependency_libs"
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+	      if test -z "$libdir"; then
+		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+		exit 1
+	      fi
+	      newdlfiles="$newdlfiles $libdir/$name"
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+	      if test -z "$libdir"; then
+		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+		exit 1
+	      fi
+	      newdlprefiles="$newdlprefiles $libdir/$name"
+	    done
+	    dlprefiles="$newdlprefiles"
+	  fi
+	  $rm $output
+	  # place dlname in correct position for cygwin
+	  tdlname=$dlname
+	  case $host,$output,$installed,$module,$dlname in
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+	  esac
+	  $echo > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+	  if test "$installed" = no && test "$need_relink" = yes; then
+	    $echo >> $output "\
+relink_command=\"$relink_command\""
+	  fi
+	done
+      fi
+
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
+      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+      ;;
+    esac
+    exit 0
+    ;;
+
+  # libtool install mode
+  install)
+    modename="$modename: install"
+
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+       # Allow the use of GNU shtool's install command.
+       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
+      # Aesthetically quote it.
+      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+      case $arg in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+	arg="\"$arg\""
+	;;
+      esac
+      install_prog="$arg "
+      arg="$1"
+      shift
+    else
+      install_prog=
+      arg="$nonopt"
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+    case $arg in
+    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+      arg="\"$arg\""
+      ;;
+    esac
+    install_prog="$install_prog$arg"
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=no
+    stripme=
+    for arg
+    do
+      if test -n "$dest"; then
+	files="$files $dest"
+	dest="$arg"
+	continue
+      fi
+
+      case $arg in
+      -d) isdir=yes ;;
+      -f) prev="-f" ;;
+      -g) prev="-g" ;;
+      -m) prev="-m" ;;
+      -o) prev="-o" ;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*) ;;
+
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  prev=
+	else
+	  dest="$arg"
+	  continue
+	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+      case $arg in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+	arg="\"$arg\""
+	;;
+      esac
+      install_prog="$install_prog $arg"
+    done
+
+    if test -z "$install_prog"; then
+      $echo "$modename: you must specify an install program" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    if test -n "$prev"; then
+      $echo "$modename: the \`$prev' option requires an argument" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	$echo "$modename: no file or destination specified" 1>&2
+      else
+	$echo "$modename: you must specify a destination" 1>&2
+      fi
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    # Strip any trailing slash from the destination.
+    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=yes
+    if test "$isdir" = yes; then
+      destdir="$dest"
+      destname=
+    else
+      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
+      test "X$destdir" = "X$dest" && destdir=.
+      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files
+      if test "$#" -gt 2; then
+	$echo "$modename: \`$dest' is not a directory" 1>&2
+	$echo "$help" 1>&2
+	exit 1
+      fi
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+	  $echo "$help" 1>&2
+	  exit 1
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	staticlibs="$staticlibs $file"
+	;;
+
+      *.la)
+	# Check to see that this really is a libtool archive.
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	else
+	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+	  $echo "$help" 1>&2
+	  exit 1
+	fi
+
+	library_names=
+	old_library=
+	relink_command=
+	# If there is no directory component, then add one.
+	case $file in
+	*/* | *\\*) . $file ;;
+	*) . ./$file ;;
+	esac
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) current_libdirs="$current_libdirs $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) future_libdirs="$future_libdirs $libdir" ;;
+	  esac
+	fi
+
+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
+	test "X$dir" = "X$file/" && dir=
+	dir="$dir$objdir"
+
+	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  # At present, this check doesn't affect windows .dll's that
+	  # are installed into $libdir/../bin (currently, that works fine)
+	  # but it's something to keep an eye on.
+	  if test "$inst_prefix_dir" = "$destdir"; then
+	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+	    exit 1
+	  fi
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	  fi
+
+	  $echo "$modename: warning: relinking \`$file'" 1>&2
+	  $show "$relink_command"
+	  if $run eval "$relink_command"; then :
+	  else
+	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+	    exit 1
+	  fi
+	fi
+
+	# See the names of the shared library.
+	set dummy $library_names
+	if test -n "$2"; then
+	  realname="$2"
+	  shift
+	  shift
+
+	  srcname="$realname"
+	  test -n "$relink_command" && srcname="$realname"T
+
+	  # Install the shared library and build the symlinks.
+	  $show "$install_prog $dir/$srcname $destdir/$realname"
+	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
+	  if test -n "$stripme" && test -n "$striplib"; then
+	    $show "$striplib $destdir/$realname"
+	    $run eval "$striplib $destdir/$realname" || exit $?
+	  fi
+
+	  if test "$#" -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    for linkname
+	    do
+	      if test "$linkname" != "$realname"; then
+		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+	      fi
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib="$destdir/$realname"
+	  eval cmds=\"$postinstall_cmds\"
+	  save_ifs="$IFS"; IFS='~'
+	  for cmd in $cmds; do
+	    IFS="$save_ifs"
+	    $show "$cmd"
+	    $run eval "$cmd" || exit $?
+	  done
+	  IFS="$save_ifs"
+	fi
+
+	# Install the pseudo-library for information purposes.
+	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	instname="$dir/$name"i
+	$show "$install_prog $instname $destdir/$name"
+	$run eval "$install_prog $instname $destdir/$name" || exit $?
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	  destfile="$destdir/$destfile"
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
+	  ;;
+	*.$objext)
+	  staticdest="$destfile"
+	  destfile=
+	  ;;
+	*)
+	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+	  $echo "$help" 1>&2
+	  exit 1
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	if test -n "$destfile"; then
+	  $show "$install_prog $file $destfile"
+	  $run eval "$install_prog $file $destfile" || exit $?
+	fi
+
+	# Install the old object if enabled.
+	if test "$build_old_libs" = yes; then
+	  # Deduce the name of the old-style object file.
+	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
+
+	  $show "$install_prog $staticobj $staticdest"
+	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+	fi
+	exit 0
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	  destfile="$destdir/$destfile"
+	fi
+
+	# If the file is missing, and there is a .exe on the end, strip it
+	# because it is most likely a libtool script we actually want to
+	# install
+	stripped_ext=""
+	case $file in
+	  *.exe)
+	    if test ! -f "$file"; then
+	      file=`$echo $file|${SED} 's,.exe$,,'`
+	      stripped_ext=".exe"
+	    fi
+	    ;;
+	esac
+
+	# Do a test to see if this is really a libtool program.
+	case $host in
+	*cygwin*|*mingw*)
+	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
+	esac
+	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  # To insure that "foo" is sourced, and not "foo.exe",
+	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
+	  # which disallows the automatic-append-.exe behavior.
+	  case $build in
+	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+	  *) wrapperdot=${wrapper} ;;
+	  esac
+	  # If there is no directory component, then add one.
+	  case $file in
+	  */* | *\\*) . ${wrapperdot} ;;
+	  *) . ./${wrapperdot} ;;
+	  esac
+
+	  # Check the variables that should have been set.
+	  if test -z "$notinst_deplibs"; then
+	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+	    exit 1
+	  fi
+
+	  finalize=yes
+	  for lib in $notinst_deplibs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      # If there is no directory component, then add one.
+	      case $lib in
+	      */* | *\\*) . $lib ;;
+	      *) . ./$lib ;;
+	      esac
+	    fi
+	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
+	      finalize=no
+	    fi
+	  done
+
+	  relink_command=
+	  # To insure that "foo" is sourced, and not "foo.exe",
+	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
+	  # which disallows the automatic-append-.exe behavior.
+	  case $build in
+	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+	  *) wrapperdot=${wrapper} ;;
+	  esac
+	  # If there is no directory component, then add one.
+	  case $file in
+	  */* | *\\*) . ${wrapperdot} ;;
+	  *) . ./${wrapperdot} ;;
+	  esac
+
+	  outputname=
+	  if test "$fast_install" = no && test -n "$relink_command"; then
+	    if test "$finalize" = yes && test -z "$run"; then
+	      tmpdir="/tmp"
+	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
+	      tmpdir="$tmpdir/libtool-$$"
+	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
+	      else
+		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+		continue
+	      fi
+	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+	      outputname="$tmpdir/$file"
+	      # Replace the output file specification.
+	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+
+	      $show "$relink_command"
+	      if $run eval "$relink_command"; then :
+	      else
+		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+		${rm}r "$tmpdir"
+		continue
+	      fi
+	      file="$outputname"
+	    else
+	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
+	    fi
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+	  fi
+	fi
+
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyways
+	case $install_prog,$host in
+	*/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
+	    ;;
+	  esac
+	  ;;
+	esac
+	$show "$install_prog$stripme $file $destfile"
+	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
+	test -n "$outputname" && ${rm}r "$tmpdir"
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+
+      # Set up the ranlib parameters.
+      oldlib="$destdir/$name"
+
+      $show "$install_prog $file $oldlib"
+      $run eval "$install_prog \$file \$oldlib" || exit $?
+
+      if test -n "$stripme" && test -n "$striplib"; then
+	$show "$old_striplib $oldlib"
+	$run eval "$old_striplib $oldlib" || exit $?
+      fi
+
+      # Do each command in the postinstall commands.
+      eval cmds=\"$old_postinstall_cmds\"
+      save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+	IFS="$save_ifs"
+	$show "$cmd"
+	$run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+    done
+
+    if test -n "$future_libdirs"; then
+      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
+    fi
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      test -n "$run" && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL $0 --finish$current_libdirs'
+    else
+      exit 0
+    fi
+    ;;
+
+  # libtool finish mode
+  finish)
+    modename="$modename: finish"
+    libdirs="$nonopt"
+    admincmds=
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for dir
+      do
+	libdirs="$libdirs $dir"
+      done
+
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  eval cmds=\"$finish_cmds\"
+	  save_ifs="$IFS"; IFS='~'
+	  for cmd in $cmds; do
+	    IFS="$save_ifs"
+	    $show "$cmd"
+	    $run eval "$cmd" || admincmds="$admincmds
+       $cmd"
+	  done
+	  IFS="$save_ifs"
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $run eval "$cmds" || admincmds="$admincmds
+       $cmds"
+	fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    test "$show" = : && exit 0
+
+    $echo "----------------------------------------------------------------------"
+    $echo "Libraries have been installed in:"
+    for libdir in $libdirs; do
+      $echo "   $libdir"
+    done
+    $echo
+    $echo "If you ever happen to want to link against installed libraries"
+    $echo "in a given directory, LIBDIR, you must either use libtool, and"
+    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+    $echo "flag during linking and do at least one of the following:"
+    if test -n "$shlibpath_var"; then
+      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+      $echo "     during execution"
+    fi
+    if test -n "$runpath_var"; then
+      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+      $echo "     during linking"
+    fi
+    if test -n "$hardcode_libdir_flag_spec"; then
+      libdir=LIBDIR
+      eval flag=\"$hardcode_libdir_flag_spec\"
+
+      $echo "   - use the \`$flag' linker flag"
+    fi
+    if test -n "$admincmds"; then
+      $echo "   - have your system administrator run these commands:$admincmds"
+    fi
+    if test -f /etc/ld.so.conf; then
+      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+    fi
+    $echo
+    $echo "See any operating system documentation about shared libraries for"
+    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
+    $echo "----------------------------------------------------------------------"
+    exit 0
+    ;;
+
+  # libtool execute mode
+  execute)
+    modename="$modename: execute"
+
+    # The first argument is the command name.
+    cmd="$nonopt"
+    if test -z "$cmd"; then
+      $echo "$modename: you must specify a COMMAND" 1>&2
+      $echo "$help"
+      exit 1
+    fi
+
+    # Handle -dlopen flags immediately.
+    for file in $execute_dlfiles; do
+      if test ! -f "$file"; then
+	$echo "$modename: \`$file' is not a file" 1>&2
+	$echo "$help" 1>&2
+	exit 1
+      fi
+
+      dir=
+      case $file in
+      *.la)
+	# Check to see that this really is a libtool archive.
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	else
+	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+	  $echo "$help" 1>&2
+	  exit 1
+	fi
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+
+	# If there is no directory component, then add one.
+	case $file in
+	*/* | *\\*) . $file ;;
+	*) . ./$file ;;
+	esac
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
+	  continue
+	fi
+
+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+	test "X$dir" = "X$file" && dir=.
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  dir="$dir/$objdir"
+	else
+	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+	  exit 1
+	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+	test "X$dir" = "X$file" && dir=.
+	;;
+
+      *)
+	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
+	continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir="$absdir"
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
+
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic="$magic"
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -*) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	  # If there is no directory component, then add one.
+	  case $file in
+	  */* | *\\*) . $file ;;
+	  *) . ./$file ;;
+	  esac
+
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
+      args="$args \"$file\""
+    done
+
+    if test -z "$run"; then
+      if test -n "$shlibpath_var"; then
+	# Export the shlibpath_var.
+	eval "export $shlibpath_var"
+      fi
+
+      # Restore saved environment variables
+      if test "${save_LC_ALL+set}" = set; then
+	LC_ALL="$save_LC_ALL"; export LC_ALL
+      fi
+      if test "${save_LANG+set}" = set; then
+	LANG="$save_LANG"; export LANG
+      fi
+
+      # Now prepare to actually exec the command.
+      exec_cmd="\$cmd$args"
+    else
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
+	$echo "export $shlibpath_var"
+      fi
+      $echo "$cmd$args"
+      exit 0
+    fi
+    ;;
+
+  # libtool clean and uninstall mode
+  clean | uninstall)
+    modename="$modename: $mode"
+    rm="$nonopt"
+    files=
+    rmforce=
+    exit_status=0
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    for arg
+    do
+      case $arg in
+      -f) rm="$rm $arg"; rmforce=yes ;;
+      -*) rm="$rm $arg" ;;
+      *) files="$files $arg" ;;
+      esac
+    done
+
+    if test -z "$rm"; then
+      $echo "$modename: you must specify an RM program" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    rmdirs=
+
+    origobjdir="$objdir"
+    for file in $files; do
+      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+      if test "X$dir" = "X$file"; then
+	dir=.
+	objdir="$origobjdir"
+      else
+	objdir="$dir/$origobjdir"
+      fi
+      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+      test "$mode" = uninstall && objdir="$dir"
+
+      # Remember objdir for removal later, being careful to avoid duplicates
+      if test "$mode" = clean; then
+	case " $rmdirs " in
+	  *" $objdir "*) ;;
+	  *) rmdirs="$rmdirs $objdir" ;;
+	esac
+      fi
+
+      # Don't error if the file doesn't exist and rm -f was used.
+      if (test -L "$file") >/dev/null 2>&1 \
+	|| (test -h "$file") >/dev/null 2>&1 \
+	|| test -f "$file"; then
+	:
+      elif test -d "$file"; then
+	exit_status=1
+	continue
+      elif test "$rmforce" = yes; then
+	continue
+      fi
+
+      rmfiles="$file"
+
+      case $name in
+      *.la)
+	# Possibly a libtool archive, so verify it.
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	  . $dir/$name
+
+	  # Delete the libtool libraries and symlinks.
+	  for n in $library_names; do
+	    rmfiles="$rmfiles $objdir/$n"
+	  done
+	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+
+	  if test "$mode" = uninstall; then
+	    if test -n "$library_names"; then
+	      # Do each command in the postuninstall commands.
+	      eval cmds=\"$postuninstall_cmds\"
+	      save_ifs="$IFS"; IFS='~'
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		$show "$cmd"
+		$run eval "$cmd"
+		if test "$?" -ne 0 && test "$rmforce" != yes; then
+		  exit_status=1
+		fi
+	      done
+	      IFS="$save_ifs"
+	    fi
+
+	    if test -n "$old_library"; then
+	      # Do each command in the old_postuninstall commands.
+	      eval cmds=\"$old_postuninstall_cmds\"
+	      save_ifs="$IFS"; IFS='~'
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		$show "$cmd"
+		$run eval "$cmd"
+		if test "$?" -ne 0 && test "$rmforce" != yes; then
+		  exit_status=1
+		fi
+	      done
+	      IFS="$save_ifs"
+	    fi
+	    # FIXME: should reinstall the best remaining shared library.
+	  fi
+	fi
+	;;
+
+      *.lo)
+	# Possibly a libtool object, so verify it.
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+
+	  # Read the .lo file
+	  . $dir/$name
+
+	  # Add PIC object to the list of files to remove.
+	  if test -n "$pic_object" \
+	     && test "$pic_object" != none; then
+	    rmfiles="$rmfiles $dir/$pic_object"
+	  fi
+
+	  # Add non-PIC object to the list of files to remove.
+	  if test -n "$non_pic_object" \
+	     && test "$non_pic_object" != none; then
+	    rmfiles="$rmfiles $dir/$non_pic_object"
+	  fi
+	fi
+	;;
+
+      *)
+	if test "$mode" = clean ; then
+	  noexename=$name
+	  case $file in
+	  *.exe) 
+	    file=`$echo $file|${SED} 's,.exe$,,'`
+	    noexename=`$echo $name|${SED} 's,.exe$,,'`
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    rmfiles="$rmfiles $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	    relink_command=
+	    . $dir/$noexename
+
+	    # note $name still contains .exe if it was in $file originally
+	    # as does the version of $file that was added into $rmfiles
+	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+	    if test "$fast_install" = yes && test -n "$relink_command"; then
+	      rmfiles="$rmfiles $objdir/lt-$name"
+	    fi
+	    if test "X$noexename" != "X$name" ; then
+	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+	    fi
+	  fi
+	fi
+	;;
+      esac
+      $show "$rm $rmfiles"
+      $run $rm $rmfiles || exit_status=1
+    done
+    objdir="$origobjdir"
+
+    # Try to remove the ${objdir}s in the directories where we deleted files
+    for dir in $rmdirs; do
+      if test -d "$dir"; then
+	$show "rmdir $dir"
+	$run rmdir $dir >/dev/null 2>&1
+      fi
+    done
+
+    exit $exit_status
+    ;;
+
+  "")
+    $echo "$modename: you must specify a MODE" 1>&2
+    $echo "$generic_help" 1>&2
+    exit 1
+    ;;
+  esac
+
+  if test -z "$exec_cmd"; then
+    $echo "$modename: invalid operation mode \`$mode'" 1>&2
+    $echo "$generic_help" 1>&2
+    exit 1
+  fi
+fi # test -z "$show_help"
+
+if test -n "$exec_cmd"; then
+  eval exec $exec_cmd
+  exit 1
+fi
+
+# We need to display help for each of the modes.
+case $mode in
+"") $echo \
+"Usage: $modename [OPTION]... [MODE-ARG]...
+
+Provide generalized library-building support services.
+
+    --config          show all configuration variables
+    --debug           enable verbose shell tracing
+-n, --dry-run         display commands without modifying any files
+    --features        display basic configuration information and exit
+    --finish          same as \`--mode=finish'
+    --help            display this help message and exit
+    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
+    --quiet           same as \`--silent'
+    --silent          don't print informational messages
+    --tag=TAG         use configuration variables from tag TAG
+    --version         print version information
+
+MODE must be one of the following:
+
+      clean           remove files from the build directory
+      compile         compile a source file into a libtool object
+      execute         automatically set library path, then run a program
+      finish          complete the installation of libtool libraries
+      install         install libraries or executables
+      link            create a library or an executable
+      uninstall       remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
+a more detailed description of MODE.
+
+Report bugs to <bug-libtool@gnu.org>."
+  exit 0
+  ;;
+
+clean)
+  $echo \
+"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+  ;;
+
+compile)
+  $echo \
+"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -prefer-pic       try to building PIC objects only
+  -prefer-non-pic   try to building non-PIC objects only
+  -static           always build a \`.o' file suitable for static linking
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+  ;;
+
+execute)
+  $echo \
+"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+  ;;
+
+finish)
+  $echo \
+"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the \`--dry-run' option if you just want to see what would be executed."
+  ;;
+
+install)
+  $echo \
+"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the \`install' or \`cp' program.
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+  ;;
+
+link)
+  $echo \
+"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+		    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+		    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -static           do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+		    specify library version info [each variable defaults to 0]
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+  ;;
+
+uninstall)
+  $echo \
+"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+  ;;
+
+*)
+  $echo "$modename: invalid operation mode \`$mode'" 1>&2
+  $echo "$help" 1>&2
+  exit 1
+  ;;
+esac
+
+$echo
+$echo "Try \`$modename --help' for more information about other modes."
+
+exit 0
+
+# The TAGs below are defined such that we never get into a situation
+# in which we disable both kinds of libraries.  Given conflicting
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
diff --git a/main/source/curl/maketgz b/main/source/curl/maketgz
new file mode 100644
index 00000000..c0c6122f
--- /dev/null
+++ b/main/source/curl/maketgz
@@ -0,0 +1,136 @@
+#! /bin/sh
+# Script to build release-archives with
+#
+
+echo "LIB version number?"
+read version
+
+libversion="$version"
+
+#
+# Now we have a section to get the major, minor and patch number from the
+# full version string. We create a single hexadecimal number from it '0xMMmmpp'
+#
+perl='$a=<STDIN>;@p=split("[\\.-]",$a);for(0..2){printf STDOUT ("%02x",$p[0+$_]);}';
+
+numeric=`echo $libversion | perl -e "$perl"`
+
+echo "CURL version number?"
+read curlversion
+
+HEADER=include/curl/curl.h
+CHEADER=src/version.h
+
+# Replace version number in header file:
+sed -e 's/^#define LIBCURL_VERSION .*/#define LIBCURL_VERSION "'$libversion'"/g' \
+    -e 's/^#define LIBCURL_VERSION_NUM .*/#define LIBCURL_VERSION_NUM 0x'$numeric'/g' \
+ $HEADER >$HEADER.new
+
+# Save old header file
+cp -p $HEADER $HEADER.old
+
+# Make new header:
+mv $HEADER.new $HEADER
+
+# Replace version number in header file:
+sed 's/#define CURL_VERSION.*/#define CURL_VERSION "'$curlversion'"/g' $CHEADER >$CHEADER.new
+
+echo "curl version $curlversion"
+echo "libcurl version $libversion"
+echo "libcurl numerical $numeric"
+
+# Save old header file
+cp -p $CHEADER $CHEADER.old
+
+# Make new header:
+mv $CHEADER.new $CHEADER
+
+findprog()
+{
+  file="$1"
+  for part in `echo $PATH| tr ':' ' '`; do
+    path="$part/$file"
+    if [ -x "$path" ]; then
+      # there it is!
+      return 1
+    fi
+  done
+
+  # no such executable
+  return 0
+}
+
+############################################################################
+#
+# Enforce a rerun of configure (updates the VERSION)
+#
+
+echo "Re-running config.status"
+./config.status --recheck >/dev/null
+
+############################################################################
+#
+# automake is needed to run to make a non-GNU Makefile.in if Makefile.am has
+# been modified.
+#
+
+if { findprog automake >/dev/null 2>/dev/null; } then
+  echo "- Could not find or run automake, I hope you know what you're doing!"
+else
+  echo "Runs automake --include-deps"
+  automake --include-deps Makefile >/dev/null
+fi
+
+############################################################################
+#
+# Make sure we have updated HTML versions of all man pages:
+#
+make html
+
+# And the PDF versions
+make pdf
+
+############################################################################
+#
+# Now run make dist to generate a tar.gz archive
+#
+
+targz="curl-$version.tar.gz"
+make dist
+
+############################################################################
+#
+# Now make a bz2 archive from the tar.gz original
+#
+
+bzip2="curl-$version.tar.bz2"
+echo "Generating $bzip2"
+gzip -dc $targz | bzip2 - > $bzip2
+
+############################################################################
+#
+# Now make a zip archive from the tar.gz original
+#
+makezip ()
+{
+  rm -rf $tempdir
+  mkdir $tempdir
+  cd $tempdir
+  gzip -dc ../$targz | tar -xf -
+  find . | zip $zip -@ >/dev/null
+  mv $zip ../
+  cd ..
+  rm -rf $tempdir
+}
+
+zip="curl-$version.zip"
+echo "Generating $zip"
+tempdir=".builddir"
+makezip
+
+echo "------------------"
+echo "maketgz report:"
+echo ""
+ls -l $targz $bzip2 $zip
+
+md5sum $targz $bzip2 $zip
diff --git a/main/source/curl/missing b/main/source/curl/missing
new file mode 100644
index 00000000..fc666729
--- /dev/null
+++ b/main/source/curl/missing
@@ -0,0 +1,283 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try \`$0 --help' for more information"
+  exit 1
+fi
+
+run=:
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+case "$1" in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  automake     touch all \`Makefile.in' files
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
+  lex          create \`lex.yy.c', if possible, from existing .c
+  makeinfo     touch the output file
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing 0.3 - GNU automake"
+    ;;
+
+  -*)
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
+    exit 1
+    ;;
+
+  aclocal)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+
+  autoconf)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`${configure_ac}'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+
+  autoheader)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case "$f" in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
+    ;;
+
+  automake)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
+    ;;
+
+  bison|yacc)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified a \`.y' file.  You may need the \`Bison' package
+         in order for those modifications to take effect.  You can get
+         \`Bison' from any GNU archive site."
+    rm -f y.tab.c y.tab.h
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.y)
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.c
+	    fi
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.h
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f y.tab.h ]; then
+	echo >y.tab.h
+    fi
+    if [ ! -f y.tab.c ]; then
+	echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+
+  lex|flex)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.l)
+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" lex.yy.c
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f lex.yy.c ]; then
+	echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+
+  help2man)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    fi
+    if [ -f "$file" ]; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit 1
+    fi
+    ;;
+
+  makeinfo)
+    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+       # We have makeinfo, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified a \`.texi' or \`.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy \`make' (AIX,
+         DU, IRIX).  You might want to install the \`Texinfo' package or
+         the \`GNU make' package.  Grab either from any GNU archive site."
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+    fi
+    touch $file
+    ;;
+
+  tar)
+    shift
+    if test -n "$run"; then
+      echo 1>&2 "ERROR: \`tar' requires --run"
+      exit 1
+    fi
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar ${1+"$@"} && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar ${1+"$@"} && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case "$firstarg" in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" ${1+"$@"} && exit 0
+	    ;;
+	esac
+	case "$firstarg" in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" ${1+"$@"} && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
+  *)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+         system.  You might have modified some files without having the
+         proper tools for further handling them.  Check the \`README' file,
+         it often tells you about the needed prerequirements for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing \`$1' program."
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/main/source/curl/mkinstalldirs b/main/source/curl/mkinstalldirs
new file mode 100644
index 00000000..f4c888d2
--- /dev/null
+++ b/main/source/curl/mkinstalldirs
@@ -0,0 +1,40 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain
+
+# $Id: mkinstalldirs,v 1.2 2000/01/10 23:36:14 bagder Exp $
+
+errstatus=0
+
+for file
+do
+   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+   shift
+
+   pathcomp=
+   for d
+   do
+     pathcomp="$pathcomp$d"
+     case "$pathcomp" in
+       -* ) pathcomp=./$pathcomp ;;
+     esac
+
+     if test ! -d "$pathcomp"; then
+        echo "mkdir $pathcomp" 1>&2
+
+        mkdir "$pathcomp" || lasterr=$?
+
+        if test ! -d "$pathcomp"; then
+  	  errstatus=$lasterr
+        fi
+     fi
+
+     pathcomp="$pathcomp/"
+   done
+done
+
+exit $errstatus
+
+# mkinstalldirs ends here
diff --git a/main/source/curl/packages/EPM/Makefile.am b/main/source/curl/packages/EPM/Makefile.am
new file mode 100644
index 00000000..bfee8c1b
--- /dev/null
+++ b/main/source/curl/packages/EPM/Makefile.am
@@ -0,0 +1,3 @@
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = README curl.list.in
diff --git a/main/source/curl/packages/EPM/Makefile.in b/main/source/curl/packages/EPM/Makefile.in
new file mode 100644
index 00000000..52bfdaa0
--- /dev/null
+++ b/main/source/curl/packages/EPM/Makefile.in
@@ -0,0 +1,320 @@
+# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CA_BUNDLE = @CURL_CA_BUNDLE@
+CURL_DISABLE_DICT = @CURL_DISABLE_DICT@
+CURL_DISABLE_FILE = @CURL_DISABLE_FILE@
+CURL_DISABLE_FTP = @CURL_DISABLE_FTP@
+CURL_DISABLE_GOPHER = @CURL_DISABLE_GOPHER@
+CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@
+CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@
+CURL_DISABLE_TELNET = @CURL_DISABLE_TELNET@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_LIBZ = @HAVE_LIBZ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPV6_ENABLED = @IPV6_ENABLED@
+KRB4_ENABLED = @KRB4_ENABLED@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NO_UNDEFINED_FALSE = @NO_UNDEFINED_FALSE@
+NO_UNDEFINED_TRUE = @NO_UNDEFINED_TRUE@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_ENABLED = @OPENSSL_ENABLED@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKGADD_NAME = @PKGADD_NAME@
+PKGADD_PKG = @PKGADD_PKG@
+PKGADD_VENDOR = @PKGADD_VENDOR@
+PKGCONFIG = @PKGCONFIG@
+RANDOM_FILE = @RANDOM_FILE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VERSIONNUM = @VERSIONNUM@
+YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = README curl.list.in
+subdir = packages/EPM
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/lib/config.h \
+	$(top_builddir)/src/config.h \
+	$(top_builddir)/tests/server/config.h \
+	$(top_builddir)/lib/ca-bundle.h
+CONFIG_CLEAN_FILES = curl.list
+DIST_SOURCES =
+DIST_COMMON = README Makefile.am Makefile.in curl.list.in
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  packages/EPM/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+curl.list: $(top_builddir)/config.status curl.list.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/main/source/curl/packages/EPM/README b/main/source/curl/packages/EPM/README
new file mode 100644
index 00000000..81fbc68e
--- /dev/null
+++ b/main/source/curl/packages/EPM/README
@@ -0,0 +1,12 @@
+EPM is a free UNIX software/file packaging program that generates distribution
+archives from a list of files. EPM Can:
+
+ * Generate portable script-based distribution packages complete with
+   installation and removal scripts.
+ * Generate vendor distributions in AIX, BSD, Compaq Tru64, Debian, HP-UX,
+   IRIX, Red Hat, and Solaris formats.
+ * Provide a complete, cross-platform software distribution solution for your
+   applications.
+
+http://www.easysw.com/epm/
+
diff --git a/main/source/curl/packages/EPM/curl.list.in b/main/source/curl/packages/EPM/curl.list.in
new file mode 100644
index 00000000..2554a4f9
--- /dev/null
+++ b/main/source/curl/packages/EPM/curl.list.in
@@ -0,0 +1,58 @@
+# Directories...
+$prefix=@prefix@
+$exec_prefix=@exec_prefix@
+$bindir=@bindir@
+$confdir=@sysconfdir@
+$docdir=@prefix@/doc
+$mandir=@mandir@
+$libdir=@libdir@
+$srcdir=@top_srcdir@
+$includedir=@includedir@
+
+# Product information
+%product curl
+%copyright 1998-2002 by Daniel Stenberg
+%vendor Daniel Stenberg, <daniel@haxx.se>
+%license ${srcdir}/MITX.txt
+%readme ${srcdir}/README
+%description Curl is a command line tool for transfering data specified
+%description with URL syntax
+%version @VERSION@
+%packager Giuseppe "Cowo" Corbelli <cowo@lugbs.linux.it>
+
+f 0644 cowo pppusers ${mandir}/man1/curl.1 ./docs/curl.1
+f 0644 cowo pppusers ${mandir}/man1/curl-config.1 ./docs/curl-config.1
+f 0644 cowo pppusers ${mandir}/man3/curl_easy_cleanup.3 ./docs/curl_easy_cleanup.3
+f 0644 cowo pppusers ${mandir}/man3/curl_easy_getinfo.3 ./docs/curl_easy_getinfo.3
+f 0644 cowo pppusers ${mandir}/man3/curl_easy_init.3 ./docs/curl_easy_init.3
+f 0644 cowo pppusers ${mandir}/man3/curl_easy_perform.3 ./docs/curl_easy_perform.3
+f 0644 cowo pppusers ${mandir}/man3/curl_easy_setopt.3 ./docs/curl_easy_setopt.3
+f 0644 cowo pppusers ${mandir}/man3/curl_easy_duphandle.3 ./docs/curl_easy_duphandle.3
+f 0644 cowo pppusers ${mandir}/man3/curl_formparse.3 ./docs/curl_formparse.3
+f 0644 cowo pppusers ${mandir}/man3/curl_formadd.3 ./docs/curl_formadd.3
+f 0644 cowo pppusers ${mandir}/man3/curl_formfree.3 ./docs/curl_formfree.3
+f 0644 cowo pppusers ${mandir}/man3/curl_getdate.3 ./docs/curl_getdate.3
+f 0644 cowo pppusers ${mandir}/man3/curl_getenv.3 ./docs/curl_getenv.3
+f 0644 cowo pppusers ${mandir}/man3/curl_slist_append.3 ./docs/curl_slist_append.3
+f 0644 cowo pppusers ${mandir}/man3/curl_slist_free_all.3 ./docs/curl_slist_free_all.3
+f 0644 cowo pppusers ${mandir}/man3/curl_version.3 ./docs/curl_version.3
+f 0644 cowo pppusers ${mandir}/man3/curl_escape.3 ./docs/curl_escape.3
+f 0644 cowo pppusers ${mandir}/man3/curl_unescape.3 ./docs/curl_unescape.3
+f 0644 cowo pppusers ${mandir}/man3/curl_strequal.3 ./docs/curl_strequal.3
+f 0644 cowo pppusers ${mandir}/man3/curl_strnequal.3 ./docs/curl_strnequal.3
+f 0644 cowo pppusers ${mandir}/man3/curl_mprintf.3 ./docs/curl_mprintf.3
+f 0644 cowo pppusers ${mandir}/man3/curl_global_init.3 ./docs/curl_global_init.3
+f 0644 cowo pppusers ${mandir}/man3/curl_global_cleanup.3 ./docs/curl_global_cleanup.3
+f 0644 cowo pppusers ${mandir}/man3/libcurl.3 ./docs/libcurl.3
+f 0755 cowo pppusers ${libdir}/libcurl.so.2.0.2 ./lib/.libs/libcurl.so.2.0.2
+f 0755 cowo pppusers ${libdir}/libcurl.la ./lib/libcurl.la
+f 0755 cowo pppusers ${libdir}/libcurl.la ./lib/.libs/libcurl.la
+f 0644 cowo pppusers ${libdir}/libcurl.a ./lib/.libs/libcurl.a
+f 0755 cowo pppusers ${bindir}/curl ./src/curl
+f 0755 cowo pppusers ${bindir}/curl ./src/.libs/curl
+f 0644 cowo pppusers ${includedir}/curl/curl.h ./include/curl/curl.h
+f 0644 cowo pppusers ${includedir}/curl/easy.h ./include/curl/easy.h
+f 0644 cowo pppusers ${includedir}/curl/mprintf.h ./include/curl/mprintf.h
+f 0644 cowo pppusers ${includedir}/curl/stdcheaders.h ./include/curl/stdcheaders.h
+f 0644 cowo pppusers ${includedir}/curl/types.h ./include/curl/types.h
+f 0755 cowo pppusers ${bindir}/curl-config ./curl-config
diff --git a/main/source/curl/packages/Linux/Makefile.am b/main/source/curl/packages/Linux/Makefile.am
new file mode 100644
index 00000000..b6daae34
--- /dev/null
+++ b/main/source/curl/packages/Linux/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = RPM
diff --git a/main/source/curl/packages/Linux/Makefile.in b/main/source/curl/packages/Linux/Makefile.in
new file mode 100644
index 00000000..c5a5851d
--- /dev/null
+++ b/main/source/curl/packages/Linux/Makefile.in
@@ -0,0 +1,458 @@
+# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CA_BUNDLE = @CURL_CA_BUNDLE@
+CURL_DISABLE_DICT = @CURL_DISABLE_DICT@
+CURL_DISABLE_FILE = @CURL_DISABLE_FILE@
+CURL_DISABLE_FTP = @CURL_DISABLE_FTP@
+CURL_DISABLE_GOPHER = @CURL_DISABLE_GOPHER@
+CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@
+CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@
+CURL_DISABLE_TELNET = @CURL_DISABLE_TELNET@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_LIBZ = @HAVE_LIBZ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPV6_ENABLED = @IPV6_ENABLED@
+KRB4_ENABLED = @KRB4_ENABLED@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NO_UNDEFINED_FALSE = @NO_UNDEFINED_FALSE@
+NO_UNDEFINED_TRUE = @NO_UNDEFINED_TRUE@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_ENABLED = @OPENSSL_ENABLED@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKGADD_NAME = @PKGADD_NAME@
+PKGADD_PKG = @PKGADD_PKG@
+PKGADD_VENDOR = @PKGADD_VENDOR@
+PKGCONFIG = @PKGCONFIG@
+RANDOM_FILE = @RANDOM_FILE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VERSIONNUM = @VERSIONNUM@
+YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+SUBDIRS = RPM
+subdir = packages/Linux
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/lib/config.h \
+	$(top_builddir)/src/config.h \
+	$(top_builddir)/tests/server/config.h \
+	$(top_builddir)/lib/ca-bundle.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+
+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+	ps-recursive install-info-recursive uninstall-info-recursive \
+	all-recursive install-data-recursive install-exec-recursive \
+	installdirs-recursive install-recursive uninstall-recursive \
+	check-recursive installcheck-recursive
+DIST_COMMON = Makefile.am Makefile.in
+DIST_SUBDIRS = $(SUBDIRS)
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  packages/Linux/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ETAGS = etags
+ETAGSFLAGS =
+
+CTAGS = ctags
+CTAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d $(distdir)/$$subdir \
+	    || mkdir $(distdir)/$$subdir \
+	    || exit 1; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$(top_distdir)" \
+	        distdir=../$(distdir)/$$subdir \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+
+distclean-am: clean-am distclean-generic distclean-libtool \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+	clean-generic clean-libtool clean-recursive ctags \
+	ctags-recursive distclean distclean-generic distclean-libtool \
+	distclean-recursive distclean-tags distdir dvi dvi-am \
+	dvi-recursive info info-am info-recursive install install-am \
+	install-data install-data-am install-data-recursive \
+	install-exec install-exec-am install-exec-recursive \
+	install-info install-info-am install-info-recursive install-man \
+	install-recursive install-strip installcheck installcheck-am \
+	installdirs installdirs-am installdirs-recursive \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+	uninstall uninstall-am uninstall-info-am \
+	uninstall-info-recursive uninstall-recursive
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/main/source/curl/packages/Linux/RPM/Makefile.am b/main/source/curl/packages/Linux/RPM/Makefile.am
new file mode 100644
index 00000000..fb8d67e2
--- /dev/null
+++ b/main/source/curl/packages/Linux/RPM/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST = README curl-ssl.spec.in curl.spec.in make_curl_rpm
+
diff --git a/main/source/curl/packages/Linux/RPM/Makefile.in b/main/source/curl/packages/Linux/RPM/Makefile.in
new file mode 100644
index 00000000..652ba59b
--- /dev/null
+++ b/main/source/curl/packages/Linux/RPM/Makefile.in
@@ -0,0 +1,321 @@
+# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CA_BUNDLE = @CURL_CA_BUNDLE@
+CURL_DISABLE_DICT = @CURL_DISABLE_DICT@
+CURL_DISABLE_FILE = @CURL_DISABLE_FILE@
+CURL_DISABLE_FTP = @CURL_DISABLE_FTP@
+CURL_DISABLE_GOPHER = @CURL_DISABLE_GOPHER@
+CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@
+CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@
+CURL_DISABLE_TELNET = @CURL_DISABLE_TELNET@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_LIBZ = @HAVE_LIBZ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPV6_ENABLED = @IPV6_ENABLED@
+KRB4_ENABLED = @KRB4_ENABLED@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NO_UNDEFINED_FALSE = @NO_UNDEFINED_FALSE@
+NO_UNDEFINED_TRUE = @NO_UNDEFINED_TRUE@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_ENABLED = @OPENSSL_ENABLED@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKGADD_NAME = @PKGADD_NAME@
+PKGADD_PKG = @PKGADD_PKG@
+PKGADD_VENDOR = @PKGADD_VENDOR@
+PKGCONFIG = @PKGCONFIG@
+RANDOM_FILE = @RANDOM_FILE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VERSIONNUM = @VERSIONNUM@
+YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+EXTRA_DIST = README curl-ssl.spec.in curl.spec.in make_curl_rpm
+subdir = packages/Linux/RPM
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/lib/config.h \
+	$(top_builddir)/src/config.h \
+	$(top_builddir)/tests/server/config.h \
+	$(top_builddir)/lib/ca-bundle.h
+CONFIG_CLEAN_FILES = curl.spec curl-ssl.spec
+DIST_SOURCES =
+DIST_COMMON = README Makefile.am Makefile.in curl-ssl.spec.in \
+	curl.spec.in
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  packages/Linux/RPM/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+curl.spec: $(top_builddir)/config.status curl.spec.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+curl-ssl.spec: $(top_builddir)/config.status curl-ssl.spec.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/main/source/curl/packages/Linux/RPM/README b/main/source/curl/packages/Linux/RPM/README
new file mode 100644
index 00000000..dcf5d245
--- /dev/null
+++ b/main/source/curl/packages/Linux/RPM/README
@@ -0,0 +1,5 @@
+Author: Daniel (I'm not trustworthy, replace this!)
+
+Paul Marquis's 'make_curl_rpm' script is a fine example on how to automate the
+jobs. You need to fill in your own name and email at least.
+
diff --git a/main/source/curl/packages/Linux/RPM/curl-ssl.spec.in b/main/source/curl/packages/Linux/RPM/curl-ssl.spec.in
new file mode 100644
index 00000000..e17f91eb
--- /dev/null
+++ b/main/source/curl/packages/Linux/RPM/curl-ssl.spec.in
@@ -0,0 +1,78 @@
+%define name curl-ssl
+%define tarball curl
+%define version @VERSION@
+%define release 1
+%define prefix /usr
+
+%define builddir $RPM_BUILD_DIR/%{tarball}-%{version}
+
+Summary: get a file from a FTP, GOPHER or HTTP server.
+Name: %{name}
+Version: %{version}
+Release: %{release}
+Copyright: MPL
+Vendor: Daniel Stenberg <Daniel.Stenberg@haxx.se>
+Packager: Loic Dachary <loic@senga.org>
+Group: Utilities/Console
+Source: %{tarball}-%{version}.tar.gz
+URL: http://curl.haxx.se/
+BuildRoot: /tmp/%{tarball}-%{version}-root
+Requires: openssl >= 0.9.5
+
+%description
+curl is a client to get documents/files from servers, using any of the
+supported protocols. The command is designed to work without user
+interaction or any kind of interactivity.
+
+curl offers a busload of useful tricks like proxy support, user
+authentication, ftp upload, HTTP post, file transfer resume and more.
+
+%package	devel
+Summary:	The includes, libs, and man pages to develop with libcurl
+Group:		Development/Libraries
+Requires:	openssl-devel >= 0.9.5
+
+%description devel
+libcurl is the core engine of curl; this packages contains all the libs,
+headers, and manual pages to develop applications using libcurl.
+
+%prep
+rm -rf %{builddir}
+
+%setup -n %{tarball}-%{version} 
+
+%build
+%configure --prefix=%{prefix} --with-ssl
+make 
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install-strip
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+rm -rf %{builddir}
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+%files
+%defattr(-,root,root)
+%attr(0755,root,root) %{_bindir}/curl
+%attr(0644,root,root) %{_mandir}/man1/*
+%{_libdir}/libcurl.so*
+%doc CHANGES LEGAL MITX.txt MPL-1.1.txt README docs/BUGS
+%doc docs/CONTRIBUTE docs/FAQ docs/FEATURES docs/INSTALL docs/INTERNALS
+%doc docs/LIBCURL docs/MANUAL docs/README* docs/RESOURCES docs/TODO
+%doc docs/TheArtOfHttpScripting
+
+%files devel
+%defattr(-,root,root)
+%attr(0644,root,root) %{_mandir}/man3/*
+%attr(0644,root,root) %{_includedir}/curl/*
+%{_libdir}/libcurl.a
+%{_libdir}/libcurl.la
+%doc docs/examples/*
diff --git a/main/source/curl/packages/Linux/RPM/curl.spec.in b/main/source/curl/packages/Linux/RPM/curl.spec.in
new file mode 100644
index 00000000..95eb8d49
--- /dev/null
+++ b/main/source/curl/packages/Linux/RPM/curl.spec.in
@@ -0,0 +1,84 @@
+%define name curl
+%define version @VERSION@
+%define release 1
+%define prefix /usr
+
+%define builddir $RPM_BUILD_DIR/%{name}-%{version}
+
+Summary: get a file from a FTP, GOPHER or HTTP server.
+Name: %{name}
+Version: %{version}
+Release: %{release}
+Copyright: MPL
+Vendor: Daniel Stenberg <Daniel.Stenberg@haxx.se>
+Packager: Loic Dachary <loic@senga.org>
+Group: Utilities/Console
+Source: %{name}-%{version}.tar.gz
+URL: http://curl.haxx.se/
+BuildRoot: /tmp/%{name}-%{version}-root
+
+%description
+curl is a client to get documents/files from servers, using any of the
+supported protocols. The command is designed to work without user
+interaction or any kind of interactivity.
+
+curl offers a busload of useful tricks like proxy support, user
+authentication, ftp upload, HTTP post, file transfer resume and more.
+
+Note: this version is compiled without SSL (https:) support.
+
+%package	devel
+Summary:	The includes, libs, and man pages to develop with libcurl
+Group:		Development/Libraries
+
+%description devel
+libcurl is the core engine of curl; this packages contains all the libs,
+headers, and manual pages to develop applications using libcurl.
+
+%prep
+rm -rf %{builddir}
+
+%setup
+
+%build
+%configure --without-ssl --prefix=%{prefix}
+make 
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install-strip
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+rm -rf %{builddir}
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+%files
+%defattr(-,root,root)
+%attr(0755,root,root) %{_bindir}/curl
+%attr(0644,root,root) %{_mandir}/man1/*
+%{prefix}/lib/libcurl.so*
+%doc CHANGES LEGAL MITX.txt MPL-1.1.txt README docs/BUGS
+%doc docs/CONTRIBUTE docs/FAQ docs/FEATURES docs/INSTALL docs/INTERNALS
+%doc docs/LIBCURL docs/MANUAL docs/README* docs/RESOURCES docs/TODO
+%doc docs/TheArtOfHttpScripting
+
+%files devel
+%defattr(-,root,root)
+%attr(0644,root,root) %{_mandir}/man3/*
+%attr(0644,root,root) %{_includedir}/curl/*
+%{prefix}/lib/libcurl.a
+%{prefix}/lib/libcurl.la
+%doc docs/examples/*
+
+%changelog
+* Sun Jan  7 2001 Loic Dachary  <loic@senga.org>
+
+        - use _mandir instead of prefix to locate man pages because
+	  _mandir is not always prefix/man/man?.
+
diff --git a/main/source/curl/packages/Linux/RPM/make_curl_rpm b/main/source/curl/packages/Linux/RPM/make_curl_rpm
new file mode 100644
index 00000000..a4efb65c
--- /dev/null
+++ b/main/source/curl/packages/Linux/RPM/make_curl_rpm
@@ -0,0 +1,62 @@
+#! /bin/sh
+# script to build curl RPM from src RPM (SSL and non-SSL versions)
+
+# initialize
+top_dir=/usr/src/redhat
+sources_dir=$top_dir/SOURCES
+specs_dir=$top_dir/SPECS
+rpms_dir=$top_dir/RPMS
+arch=`rpm --showrc | awk 'NF == 3 && $2 == "_arch" { print $3 }'`
+
+# fill in your own name and email here
+packager_name="Mr Joe Packager Person"
+packager_email='<Joe@packager.person>'
+
+# make sure we're running as root
+if test `id -u` -ne `id -u root`
+then
+   echo "you must build the RPM as root"
+   exit 1
+fi
+
+# get version and release number
+if test $# -lt 1
+then
+   echo "version number?"
+   read version
+else
+   version=$1
+fi
+
+if test $# -lt 2
+then
+   echo "release number?"
+   read release
+else
+   release=$2
+fi
+
+# build all the files
+targets="curl curl-ssl"
+for target in $targets
+do
+   # make sure src RPM exist
+   src_rpm="$target-$version-$release.src.rpm"
+   if test -f $src_rpm
+   then
+      rpm -ivh $src_rpm
+
+      # replace packager in spec file
+      sed -e 's/^Packager: .*/Packager: $packager_name $packager_email/' $specs_dir/$target.spec > $specs_dir/$target-$version-$arch.spec
+
+      # build it
+      if ! rpm -ba $specs_dir/$target-$version-$arch.spec
+      then
+         echo "error building $target for $arch -- check output above"
+      fi
+
+      echo "$target rpm is now in $rpms_dir/$arch"
+   else
+      echo $src_rpm does not exist
+   fi
+done
diff --git a/main/source/curl/packages/Makefile.am b/main/source/curl/packages/Makefile.am
new file mode 100644
index 00000000..6d0a439b
--- /dev/null
+++ b/main/source/curl/packages/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = Win32 Linux Solaris EPM
+
+EXTRA_DIST = README
diff --git a/main/source/curl/packages/Makefile.in b/main/source/curl/packages/Makefile.in
new file mode 100644
index 00000000..626cf458
--- /dev/null
+++ b/main/source/curl/packages/Makefile.in
@@ -0,0 +1,460 @@
+# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CA_BUNDLE = @CURL_CA_BUNDLE@
+CURL_DISABLE_DICT = @CURL_DISABLE_DICT@
+CURL_DISABLE_FILE = @CURL_DISABLE_FILE@
+CURL_DISABLE_FTP = @CURL_DISABLE_FTP@
+CURL_DISABLE_GOPHER = @CURL_DISABLE_GOPHER@
+CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@
+CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@
+CURL_DISABLE_TELNET = @CURL_DISABLE_TELNET@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_LIBZ = @HAVE_LIBZ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPV6_ENABLED = @IPV6_ENABLED@
+KRB4_ENABLED = @KRB4_ENABLED@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NO_UNDEFINED_FALSE = @NO_UNDEFINED_FALSE@
+NO_UNDEFINED_TRUE = @NO_UNDEFINED_TRUE@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_ENABLED = @OPENSSL_ENABLED@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKGADD_NAME = @PKGADD_NAME@
+PKGADD_PKG = @PKGADD_PKG@
+PKGADD_VENDOR = @PKGADD_VENDOR@
+PKGCONFIG = @PKGCONFIG@
+RANDOM_FILE = @RANDOM_FILE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VERSIONNUM = @VERSIONNUM@
+YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+SUBDIRS = Win32 Linux Solaris EPM
+
+EXTRA_DIST = README
+subdir = packages
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/lib/config.h \
+	$(top_builddir)/src/config.h \
+	$(top_builddir)/tests/server/config.h \
+	$(top_builddir)/lib/ca-bundle.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+
+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+	ps-recursive install-info-recursive uninstall-info-recursive \
+	all-recursive install-data-recursive install-exec-recursive \
+	installdirs-recursive install-recursive uninstall-recursive \
+	check-recursive installcheck-recursive
+DIST_COMMON = README Makefile.am Makefile.in
+DIST_SUBDIRS = $(SUBDIRS)
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  packages/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ETAGS = etags
+ETAGSFLAGS =
+
+CTAGS = ctags
+CTAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d $(distdir)/$$subdir \
+	    || mkdir $(distdir)/$$subdir \
+	    || exit 1; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$(top_distdir)" \
+	        distdir=../$(distdir)/$$subdir \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+
+distclean-am: clean-am distclean-generic distclean-libtool \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+	clean-generic clean-libtool clean-recursive ctags \
+	ctags-recursive distclean distclean-generic distclean-libtool \
+	distclean-recursive distclean-tags distdir dvi dvi-am \
+	dvi-recursive info info-am info-recursive install install-am \
+	install-data install-data-am install-data-recursive \
+	install-exec install-exec-am install-exec-recursive \
+	install-info install-info-am install-info-recursive install-man \
+	install-recursive install-strip installcheck installcheck-am \
+	installdirs installdirs-am installdirs-recursive \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+	uninstall uninstall-am uninstall-info-am \
+	uninstall-info-recursive uninstall-recursive
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/main/source/curl/packages/README b/main/source/curl/packages/README
new file mode 100644
index 00000000..cbe1270e
--- /dev/null
+++ b/main/source/curl/packages/README
@@ -0,0 +1,27 @@
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+PACKAGES
+
+ This directory and all its subdirectories are for special package
+information, template, scripts and docs. The files herein should be of use for
+those of you who want to package curl in a binary or source format using one
+of those custom formats.
+
+ The hierarchy for these directories is something like this:
+
+   packages/[OS]/[FORMAT]/
+ 
+ Currently, we have Win32 and Linux for [OS]. There might be different formats
+for the same OS so for Linux we have RPM as format.
+
+ We might need to add some differentiation for CPU as well, as there is
+Linux-RPMs for several CPUs. However, it might not be necessary since the
+packaging should be pretty much the same no matter what CPU that is used.
+    
+ For each unique OS-FORMAT pair, there's a directory to "fill"! I'd like to
+see a single README with as much details as possible, and then I'd like some
+template files for the package process.
diff --git a/main/source/curl/packages/Solaris/Makefile.am b/main/source/curl/packages/Solaris/Makefile.am
new file mode 100644
index 00000000..997e5649
--- /dev/null
+++ b/main/source/curl/packages/Solaris/Makefile.am
@@ -0,0 +1,39 @@
+#
+# $Id: Makefile.am,v 1.1 2001/05/30 04:31:33 crisb Exp $
+#
+
+PKGADD_PKG="@PKGADD_PKG@"
+PKGADD_NAME="@PACKAGE@-@VERSION@ - @PKGADD_NAME@"
+PKGADD_VENDOR="@PKGADD_VENDOR@"
+PKGADD_ARCH="@host_cpu@"
+PKGADD_DESC="@PACKAGE@-@VERSION@ - @PKGADD_NAME@"
+PKGADD_CLASSES=none
+PKGADD_BASEDIR=/
+
+PKGADD_FILE=${PKGADD_PKG}-@PACKAGE@-@VERSION@-@host@.pkg
+
+package:
+	if [ ! -f release ]; then echo 0 > release; fi
+	if [ `find root -newer release -print|wc -l` -gt 0 ]; then expr `cat release` + 1 > release; fi
+	echo PKG=${PKGADD_PKG} > pkginfo
+	echo NAME=${PKGADD_NAME} >> pkginfo
+	echo VENDOR=${PKGADD_VENDOR} >> pkginfo
+	echo ARCH=${PKGADD_ARCH} >> pkginfo
+	echo DESC=${PKGADD_DESC} >> pkginfo
+	echo CLASSES=${PKGADD_CLASSES} >> pkginfo
+	echo BASEDIR=${PKGADD_BASEDIR} >> pkginfo
+	echo CATEGORY=application >> pkginfo
+	echo VERSION=`cat ./release` >> pkginfo
+	echo > prototype
+	for subdir in opt var etc usr; \
+	do if [ -d root/$$subdir ]; then \
+		pkgproto root/$$subdir=$$subdir >> prototype;\
+	fi; done
+	for file in pkginfo preinstall postinstall copyright; \
+	do if [ -f $$file ]; then \
+		echo "i $$file=$$file" >> prototype; \
+	fi; done
+	rm -rf ./tmp
+	mkdir ./tmp
+	pkgmk -o -d ./tmp
+	pkgtrans -so ./tmp ${top_srcdir}/../${PKGADD_FILE} ${PKGADD_PKG}
diff --git a/main/source/curl/packages/Solaris/Makefile.in b/main/source/curl/packages/Solaris/Makefile.in
new file mode 100644
index 00000000..adbc0845
--- /dev/null
+++ b/main/source/curl/packages/Solaris/Makefile.in
@@ -0,0 +1,352 @@
+# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# $Id: Makefile.am,v 1.1 2001/05/30 04:31:33 crisb Exp $
+#
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CA_BUNDLE = @CURL_CA_BUNDLE@
+CURL_DISABLE_DICT = @CURL_DISABLE_DICT@
+CURL_DISABLE_FILE = @CURL_DISABLE_FILE@
+CURL_DISABLE_FTP = @CURL_DISABLE_FTP@
+CURL_DISABLE_GOPHER = @CURL_DISABLE_GOPHER@
+CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@
+CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@
+CURL_DISABLE_TELNET = @CURL_DISABLE_TELNET@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_LIBZ = @HAVE_LIBZ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPV6_ENABLED = @IPV6_ENABLED@
+KRB4_ENABLED = @KRB4_ENABLED@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NO_UNDEFINED_FALSE = @NO_UNDEFINED_FALSE@
+NO_UNDEFINED_TRUE = @NO_UNDEFINED_TRUE@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_ENABLED = @OPENSSL_ENABLED@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKGADD_NAME = "@PACKAGE@-@VERSION@ - @PKGADD_NAME@"
+
+PKGADD_PKG = "@PKGADD_PKG@"
+PKGADD_VENDOR = "@PKGADD_VENDOR@"
+PKGCONFIG = @PKGCONFIG@
+RANDOM_FILE = @RANDOM_FILE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VERSIONNUM = @VERSIONNUM@
+YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+PKGADD_ARCH = "@host_cpu@"
+PKGADD_DESC = "@PACKAGE@-@VERSION@ - @PKGADD_NAME@"
+PKGADD_CLASSES = none
+PKGADD_BASEDIR = /
+
+PKGADD_FILE = ${PKGADD_PKG}-@PACKAGE@-@VERSION@-@host@.pkg
+subdir = packages/Solaris
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/lib/config.h \
+	$(top_builddir)/src/config.h \
+	$(top_builddir)/tests/server/config.h \
+	$(top_builddir)/lib/ca-bundle.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  packages/Solaris/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
+
+
+package:
+	if [ ! -f release ]; then echo 0 > release; fi
+	if [ `find root -newer release -print|wc -l` -gt 0 ]; then expr `cat release` + 1 > release; fi
+	echo PKG=${PKGADD_PKG} > pkginfo
+	echo NAME=${PKGADD_NAME} >> pkginfo
+	echo VENDOR=${PKGADD_VENDOR} >> pkginfo
+	echo ARCH=${PKGADD_ARCH} >> pkginfo
+	echo DESC=${PKGADD_DESC} >> pkginfo
+	echo CLASSES=${PKGADD_CLASSES} >> pkginfo
+	echo BASEDIR=${PKGADD_BASEDIR} >> pkginfo
+	echo CATEGORY=application >> pkginfo
+	echo VERSION=`cat ./release` >> pkginfo
+	echo > prototype
+	for subdir in opt var etc usr; \
+	do if [ -d root/$$subdir ]; then \
+		pkgproto root/$$subdir=$$subdir >> prototype;\
+	fi; done
+	for file in pkginfo preinstall postinstall copyright; \
+	do if [ -f $$file ]; then \
+		echo "i $$file=$$file" >> prototype; \
+	fi; done
+	rm -rf ./tmp
+	mkdir ./tmp
+	pkgmk -o -d ./tmp
+	pkgtrans -so ./tmp ${top_srcdir}/../${PKGADD_FILE} ${PKGADD_PKG}
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/main/source/curl/packages/Win32/Makefile.am b/main/source/curl/packages/Win32/Makefile.am
new file mode 100644
index 00000000..4561da66
--- /dev/null
+++ b/main/source/curl/packages/Win32/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = cygwin
+
+EXTRA_DIST = README
diff --git a/main/source/curl/packages/Win32/Makefile.in b/main/source/curl/packages/Win32/Makefile.in
new file mode 100644
index 00000000..64ed2a40
--- /dev/null
+++ b/main/source/curl/packages/Win32/Makefile.in
@@ -0,0 +1,460 @@
+# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CA_BUNDLE = @CURL_CA_BUNDLE@
+CURL_DISABLE_DICT = @CURL_DISABLE_DICT@
+CURL_DISABLE_FILE = @CURL_DISABLE_FILE@
+CURL_DISABLE_FTP = @CURL_DISABLE_FTP@
+CURL_DISABLE_GOPHER = @CURL_DISABLE_GOPHER@
+CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@
+CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@
+CURL_DISABLE_TELNET = @CURL_DISABLE_TELNET@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_LIBZ = @HAVE_LIBZ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPV6_ENABLED = @IPV6_ENABLED@
+KRB4_ENABLED = @KRB4_ENABLED@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NO_UNDEFINED_FALSE = @NO_UNDEFINED_FALSE@
+NO_UNDEFINED_TRUE = @NO_UNDEFINED_TRUE@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_ENABLED = @OPENSSL_ENABLED@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKGADD_NAME = @PKGADD_NAME@
+PKGADD_PKG = @PKGADD_PKG@
+PKGADD_VENDOR = @PKGADD_VENDOR@
+PKGCONFIG = @PKGCONFIG@
+RANDOM_FILE = @RANDOM_FILE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VERSIONNUM = @VERSIONNUM@
+YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+SUBDIRS = cygwin
+
+EXTRA_DIST = README
+subdir = packages/Win32
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/lib/config.h \
+	$(top_builddir)/src/config.h \
+	$(top_builddir)/tests/server/config.h \
+	$(top_builddir)/lib/ca-bundle.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+
+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+	ps-recursive install-info-recursive uninstall-info-recursive \
+	all-recursive install-data-recursive install-exec-recursive \
+	installdirs-recursive install-recursive uninstall-recursive \
+	check-recursive installcheck-recursive
+DIST_COMMON = README Makefile.am Makefile.in
+DIST_SUBDIRS = $(SUBDIRS)
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  packages/Win32/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ETAGS = etags
+ETAGSFLAGS =
+
+CTAGS = ctags
+CTAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d $(distdir)/$$subdir \
+	    || mkdir $(distdir)/$$subdir \
+	    || exit 1; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$(top_distdir)" \
+	        distdir=../$(distdir)/$$subdir \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+
+distclean-am: clean-am distclean-generic distclean-libtool \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+	clean-generic clean-libtool clean-recursive ctags \
+	ctags-recursive distclean distclean-generic distclean-libtool \
+	distclean-recursive distclean-tags distdir dvi dvi-am \
+	dvi-recursive info info-am info-recursive install install-am \
+	install-data install-data-am install-data-recursive \
+	install-exec install-exec-am install-exec-recursive \
+	install-info install-info-am install-info-recursive install-man \
+	install-recursive install-strip installcheck installcheck-am \
+	installdirs installdirs-am installdirs-recursive \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+	uninstall uninstall-am uninstall-info-am \
+	uninstall-info-recursive uninstall-recursive
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/main/source/curl/packages/Win32/README b/main/source/curl/packages/Win32/README
new file mode 100644
index 00000000..8738d460
--- /dev/null
+++ b/main/source/curl/packages/Win32/README
@@ -0,0 +1,53 @@
+Author: Jörn Hartroth
+
+DESCRIPTION
+
+(If you're only looking for precompiled win32 binaries, go visit
+http://curl.haxx.se/download.html)
+
+Packaging of the curl binaries for Win32 should at this point in time be based
+on the InfoZip (zip/unzip) archiver family as the de-facto standard for
+Windows archives. A package should contain the main binary curl.exe along with
+the appropriate documentation and license information files. For development
+releases, you should also include the header directory and probably the
+compiled binaries of libcurl and the appropriate Makefiles/project definition
+files for the compiler used.
+
+A simple packaging mechanism can be based on a set of batch files which call
+zip.exe with the appropriate files from the curl distribution - see the
+samples included below (Long lines have been split with "\" as the split
+marker, you'll want to rejoin the pieces to be all on one line in the batch
+file). Call any of these batch files - after compiling the curl binaries -
+with a single parameter specifying the name of the archive file to be created.
+
+It is implicitely assumed that all of the binary files (curl.exe, libcurl.a,
+etc) have previously been copied to the main directory of the curl source
+package (the directory where the main README resides), because that is where
+they should end up in the zip archive. The archive should *not* be built with
+absolute path information because the user will want to locally extract the
+archive contents and shift the binaries to his executable directory.
+
+SCRIPT_TEMPLATES
+
+curlpkg.bat:
+	zip -9 %1 curl.exe CHANGES LEGAL MPL-1.0.txt README \
+	 docs/FAQ docs/FEATURES docs/README.curl docs/README.win32 docs/TODO
+
+curldevpkg.bat:
+	zip -9 %1 curl.exe include\README include\curl\*.h CHANGES docs\* \
+	  curl.spec curl-ssl.spec LEGAL lib/Makefile.m32 src/Makefile.m32 \
+	  libcurl.a libcurl.def libcurl.dll libcurldll.a MPL-1.0.txt README
+
+PROCEDURE_EXAMPLE
+
+A standard packaging routine (for MingW32) using the above batch files could
+go like this:
+(No SSL)					(With SSL)
+cd <curl-sourcedir>\lib			cd <curl-sourcedir>\lib
+make -f Makefile.m32			make -f Makefile.m32 SSL=1
+cd ..\src					cd ..\src
+make -f Makefile.m32			make -f Makefile.m32 SSL=1
+cd ..						cd ..
+copy lib\libcurl.a .			copy lib\libcurl.a .
+copy src\curl.exe .			copy src\curl.exe .
+curlpkg curl-win32-nossl.zip		curlpkg curl-win32-ssl.zip
diff --git a/main/source/curl/packages/Win32/cygwin/Makefile.am b/main/source/curl/packages/Win32/cygwin/Makefile.am
new file mode 100644
index 00000000..54c1576e
--- /dev/null
+++ b/main/source/curl/packages/Win32/cygwin/Makefile.am
@@ -0,0 +1,63 @@
+EXTRA_DIST = README
+
+#
+# Build a Cygwin binary tar ball
+#
+# Read the README file for details on using this Makefile
+#
+# NOTE: As I'm not particularly familiar with Makefiles, this was the
+#  best I could come up with. It should probably be enhanced someday 
+#  to actually use the correct target and pre-requisite names, etc...
+#  If anyone else wants to volunteer, feel free ;-)
+#
+
+# Cygwin build number (default to "1")
+CYGBUILD = 1
+
+# Cygwin tarball build dir (fully-qualified name, gets deleted when done)
+cygwintmp = $(CURDIR)/tmp_binbuild
+
+cygwinbin:
+	rm -rf $(cygwintmp)
+	rm -rf $(cygwintmp)-dev
+	$(MAKE) -C $(top_builddir) DESTDIR=$(cygwintmp) install-strip
+# $(STRIP) $(cygwintmp)/usr/bin/cygcurl-?.dll
+	$(mkinstalldirs) \
+	  $(cygwintmp)/usr/doc/Cygwin \
+	  $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION) \
+	  $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/libcurl \
+	  $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/examples \
+	  $(cygwintmp)-dev/usr/man
+#
+# copy some files into the binary install dir
+	cp $(srcdir)/README \
+	  $(cygwintmp)/usr/doc/Cygwin/$(PACKAGE)-$(VERSION)-$(CYGBUILD).README
+	cd $(top_srcdir) ; cp CHANGES COPYING README UPGRADE docs/* \
+	  $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION) ; pwd
+	cd $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION) ; rm *.1 Makefile*
+#
+# copy some files into the -dev install dir, remove some from binary
+	cp $(top_srcdir)/docs/libcurl/*.html \
+	  $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/libcurl
+	cp $(top_srcdir)/docs/examples/* \
+	  $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/examples
+	rm $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/examples/Makefile*
+	cp $(top_srcdir)/docs/examples/Makefile.example \
+	  $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/examples
+	mv $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION)/BINDINGS \
+	   $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)
+	mv $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION)/INTERNALS \
+	   $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)
+	mv $(cygwintmp)/usr/include $(cygwintmp)-dev/usr
+	mv $(cygwintmp)/usr/lib $(cygwintmp)-dev/usr
+	mv $(cygwintmp)/usr/man/man3 $(cygwintmp)-dev/usr/man
+#
+# create both tar files, and delete tmp folders
+	cd $(cygwintmp) ; tar cjf \
+	  $(PACKAGE)-$(VERSION)-$(CYGBUILD).tar.bz2 usr
+	mv $(cygwintmp)/*.tar.bz2 . && rm -rf $(cygwintmp)
+#
+	cd $(cygwintmp)-dev ; tar cjf \
+	  $(PACKAGE)-devel-$(VERSION)-$(CYGBUILD).tar.bz2 usr
+	mv $(cygwintmp)-dev/*.tar.bz2 . && rm -rf $(cygwintmp)-dev
+
diff --git a/main/source/curl/packages/Win32/cygwin/Makefile.in b/main/source/curl/packages/Win32/cygwin/Makefile.in
new file mode 100644
index 00000000..99f93b2b
--- /dev/null
+++ b/main/source/curl/packages/Win32/cygwin/Makefile.in
@@ -0,0 +1,377 @@
+# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CA_BUNDLE = @CURL_CA_BUNDLE@
+CURL_DISABLE_DICT = @CURL_DISABLE_DICT@
+CURL_DISABLE_FILE = @CURL_DISABLE_FILE@
+CURL_DISABLE_FTP = @CURL_DISABLE_FTP@
+CURL_DISABLE_GOPHER = @CURL_DISABLE_GOPHER@
+CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@
+CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@
+CURL_DISABLE_TELNET = @CURL_DISABLE_TELNET@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_LIBZ = @HAVE_LIBZ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPV6_ENABLED = @IPV6_ENABLED@
+KRB4_ENABLED = @KRB4_ENABLED@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NO_UNDEFINED_FALSE = @NO_UNDEFINED_FALSE@
+NO_UNDEFINED_TRUE = @NO_UNDEFINED_TRUE@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_ENABLED = @OPENSSL_ENABLED@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKGADD_NAME = @PKGADD_NAME@
+PKGADD_PKG = @PKGADD_PKG@
+PKGADD_VENDOR = @PKGADD_VENDOR@
+PKGCONFIG = @PKGCONFIG@
+RANDOM_FILE = @RANDOM_FILE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VERSIONNUM = @VERSIONNUM@
+YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+EXTRA_DIST = README
+
+#
+# Build a Cygwin binary tar ball
+#
+# Read the README file for details on using this Makefile
+#
+# NOTE: As I'm not particularly familiar with Makefiles, this was the
+#  best I could come up with. It should probably be enhanced someday 
+#  to actually use the correct target and pre-requisite names, etc...
+#  If anyone else wants to volunteer, feel free ;-)
+#
+
+# Cygwin build number (default to "1")
+CYGBUILD = 1
+
+# Cygwin tarball build dir (fully-qualified name, gets deleted when done)
+cygwintmp = $(CURDIR)/tmp_binbuild
+subdir = packages/Win32/cygwin
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/lib/config.h \
+	$(top_builddir)/src/config.h \
+	$(top_builddir)/tests/server/config.h \
+	$(top_builddir)/lib/ca-bundle.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = README Makefile.am Makefile.in
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  packages/Win32/cygwin/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
+
+
+cygwinbin:
+	rm -rf $(cygwintmp)
+	rm -rf $(cygwintmp)-dev
+	$(MAKE) -C $(top_builddir) DESTDIR=$(cygwintmp) install-strip
+# $(STRIP) $(cygwintmp)/usr/bin/cygcurl-?.dll
+	$(mkinstalldirs) \
+	  $(cygwintmp)/usr/doc/Cygwin \
+	  $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION) \
+	  $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/libcurl \
+	  $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/examples \
+	  $(cygwintmp)-dev/usr/man
+#
+# copy some files into the binary install dir
+	cp $(srcdir)/README \
+	  $(cygwintmp)/usr/doc/Cygwin/$(PACKAGE)-$(VERSION)-$(CYGBUILD).README
+	cd $(top_srcdir) ; cp CHANGES COPYING README UPGRADE docs/* \
+	  $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION) ; pwd
+	cd $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION) ; rm *.1 Makefile*
+#
+# copy some files into the -dev install dir, remove some from binary
+	cp $(top_srcdir)/docs/libcurl/*.html \
+	  $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/libcurl
+	cp $(top_srcdir)/docs/examples/* \
+	  $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/examples
+	rm $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/examples/Makefile*
+	cp $(top_srcdir)/docs/examples/Makefile.example \
+	  $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/examples
+	mv $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION)/BINDINGS \
+	   $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)
+	mv $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION)/INTERNALS \
+	   $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)
+	mv $(cygwintmp)/usr/include $(cygwintmp)-dev/usr
+	mv $(cygwintmp)/usr/lib $(cygwintmp)-dev/usr
+	mv $(cygwintmp)/usr/man/man3 $(cygwintmp)-dev/usr/man
+#
+# create both tar files, and delete tmp folders
+	cd $(cygwintmp) ; tar cjf \
+	  $(PACKAGE)-$(VERSION)-$(CYGBUILD).tar.bz2 usr
+	mv $(cygwintmp)/*.tar.bz2 . && rm -rf $(cygwintmp)
+#
+	cd $(cygwintmp)-dev ; tar cjf \
+	  $(PACKAGE)-devel-$(VERSION)-$(CYGBUILD).tar.bz2 usr
+	mv $(cygwintmp)-dev/*.tar.bz2 . && rm -rf $(cygwintmp)-dev
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/main/source/curl/packages/Win32/cygwin/README b/main/source/curl/packages/Win32/cygwin/README
new file mode 100644
index 00000000..98b3ae1c
--- /dev/null
+++ b/main/source/curl/packages/Win32/cygwin/README
@@ -0,0 +1,103 @@
+Curl is a tool for transferring files with URL syntax, supporting 
+  FTP, FTPS, HTTP, HTTPS, GOPHER, TELNET, DICT, FILE and LDAP.
+  Curl supports HTTPS certificates, HTTP POST, HTTP PUT, 
+  FTP uploading, kerberos, HTTP form based upload, proxies, 
+  cookies, user+password authentication, file transfer resume,
+  http proxy tunneling and a busload of other useful tricks.
+
+See /usr/doc/curl-$(VERSION)/FEATURES for more info.
+
+
+Dependencies:
+  - Cygwin
+  - OpenSSL 0.9.6b-2+ (*)
+
+  (*) cURL can be built without SSL support, see below for details
+
+
+Canonical Homepage and Downloads:
+  http://curl.haxx.se/
+  http://curl.haxx.se/download.html
+
+
+Cygwin specific source files (a .README template and a Makefile
+  for building binary tarballs) are maintained in the upstream
+  CVS at: <srctop>/packages/Win32/cygwin/
+
+
+Build Instructions (to recompile from the cygwin source tarball):
+  ---STANDARD (with SSL) RELEASE---
+  Download the source (either the official release or the cygwin version),
+  unpack it (done for you if using setup.exe), then:
+
+  $ ./configure --prefix=/usr 
+  $ make
+  $ make test    # optional
+  $ make install # (*)
+
+  (*) LibTool 1.4.2 had a bug related to cygwin's use of ".exe" extensions,
+      such that "make install" blew up at curl.exe. See this URL for details:
+        http://mail.gnu.org/pipermail/libtool/2001-September/005549.html
+      The copy of ltmain.sh that is distributed with cURL includes this patch.
+
+  As of curl 7.9.1, the official source compiles (under Cygwin) and tests 
+    100% cleanly OOTB (Out Of The Box)
+
+  ---NO SSL RELEASE---
+  Same as standard, except for the configure step, which changes to:
+
+  $ ./configure --prefix=/usr --without-ssl
+
+  NOTE: the standard release is what is available via Cygwin's setup.exe;
+    the no-ssl release is only available from the curl website
+
+
+Packaging Instructions:
+  ---BINARY---
+  Compile cleanly as described above, then:
+
+  $ make cygwinbin CYGBUILD=n
+
+  where n is the cygwin release number (e.g. the "1" in curl-7.9-1),
+  and "CYGBUILD=n" is optional (n defaults to 1 if not specified)
+  
+  Assuming everything worked, you'll find your binary tarballs in
+   $(buildtop)/packages/Win32/cygwin/
+
+  ---SOURCE---
+  1. download & unpack the pristine source
+  2. rename the source dir to add the "-$(REL)" suffix, e.g.:
+     $ mv curl-7.9 curl-7.9-1
+  3. unpack the pristine source once more, so you'll end up
+     with 2 directories: "curl-7.9" and "curl-7.9-1" in this example
+  3. add a CYGWIN-PATCHES directory, and add this readme to it
+     $ cd curl-7.9-1; mkdir CYGWIN-PATCHES
+     $ cp packages/Win32/cygwin/README CYGWIN-PATCHES/curl-7.9-1.README
+  4. if applicable, document any changes in the README file
+  5. create a patch which, when applied 
+     (using `patch -p1 < curl-7.9-$(REL).patch`) 
+     will remove any changes you've made to the pristine source:
+     $ cd ..
+     $ diff -Nrup curl-7.9-1 curl-7.9 > curl-7.9-1.patch
+     and then move it into the CYGWIN-PATCHES directory
+     $ mv curl-7.9-1.patch curl-7.9-1/CYGWIN-PATCHES
+  6. pack the new source dir into a tar.bz2 file:
+     $ tar cfj curl-7.9-1-src.tar.bz2 curl-7.9-1
+
+  ---SETUP.HINT---
+  sdesc: "a client that groks URLs"
+  ldesc: "Curl is a tool for transferring files with URL syntax,
+  supporting FTP, FTPS, HTTP, HTTPS, GOPHER, TELNET, DICT, FILE 
+  and LDAP. Curl supports HTTPS certificates, HTTP POST, HTTP PUT, 
+  FTP uploading, kerberos, HTTP form based upload, proxies, 
+  cookies, user+password authentication, file transfer resume,
+  http proxy tunneling and a busload of other useful tricks."
+  category: Web Libs
+  requires: cygwin openssl
+
+
+Cygwin port maintained by:
+  Kevin Roth <kproth @ users . sourceforge . net>
+  Questions about cURL should be directed to curl-users@lists.sourceforge.net.
+  Questions about this cygwin package go to cygwin@cygwin.com.
+
diff --git a/main/source/curl/reconf b/main/source/curl/reconf
new file mode 100644
index 00000000..5a1f963d
--- /dev/null
+++ b/main/source/curl/reconf
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# $Id: reconf,v 1.4 2001/05/30 07:59:47 bagder Exp $
+#
+# re autoconf/automake shell script
+#
+
+die(){
+	echo "$@" ; exit
+}
+
+aclocal -I . || die "The command 'aclocal -I .' failed"
+autoheader   || die "The command 'autoheader' failed"
+automake     || die "The command 'automake' failed"
+autoconf     || die "The command 'autoconf' failed"
diff --git a/main/source/curl/sample.emacs b/main/source/curl/sample.emacs
new file mode 100644
index 00000000..25bb8910
--- /dev/null
+++ b/main/source/curl/sample.emacs
@@ -0,0 +1,46 @@
+;; $Id: sample.emacs,v 1.1 2003/01/29 12:14:37 bagder Exp $ -*- emacs-lisp -*-
+
+;; This file was contributed by Mats Lidell
+
+;; Here's a sample .emacs file that might help you along the way.
+
+;; First comes a setup that is ideal when you are only working with curl. Just
+;; select the next few lines, paste it into your .emacs and change the path to
+;; the tools folder. (If you are using more than one style. Look further down
+;; the this file.)
+
+(load-file "<YOUR-PATH-TO-CURL>/tools/curl-style.el")
+(add-hook 'c-mode-common-hook 'curl-c-mode-common-hook)
+
+;; If you are using more than one style in maybe more than one project the
+;; example below might help out. It uses a predicate hook pair to select the
+;; right hook to use.
+
+(defvar my-style-selective-mode-hook nil
+  "Holds a list of predicate and hooks pairs. (list (PREDICATE . HOOK)
+...) It is used by my-mode-selective-mood-hook-function for choosing
+the right hook to run.")
+
+(defun my-style-selective-mode-hook-function ()
+  "Run each PREDICATE in `my-style-selective-mode-hook' to see if the 
+HOOK in the pair should be executed. If the PREDICATE evaluate to non
+nil HOOK is executed and the rest of the hooks are ignored."
+  (let ((h my-style-selective-mode-hook))
+    (while (not (eval (caar h)))
+      (setq h (cdr h)))
+    (funcall (cdar h))))
+
+;;; Example configuration.
+;; Add the selective hook to the c-mode-common-hook
+(add-hook 'c-mode-common-hook 'my-style-selective-mode-hook-function)
+
+;; Add your own hooks and predicates. The predicate should evaluate to
+;; non nil if the hook in the pair is supposed to be evaluated. In the
+;; example a part of the path is used to select what style to
+;; use. Choose what is appropriate for you.
+(add-hook 'my-style-selective-mode-hook 
+	  '((string-match "curl" (buffer-file-name)) . curl-c-mode-common-hook))
+(add-hook 'my-style-selective-mode-hook 
+	  '((string-match "other" (buffer-file-name)) . other-c-mode-common-hook))
+;; Make sure the default style is appended.
+(add-hook 'my-style-selective-mode-hook '(t . my-c-mode-common-hook) t)
diff --git a/main/source/curl/src/Makefile.am b/main/source/curl/src/Makefile.am
new file mode 100644
index 00000000..a7976f1b
--- /dev/null
+++ b/main/source/curl/src/Makefile.am
@@ -0,0 +1,41 @@
+#
+# $Id: Makefile.am,v 1.24 2002/09/04 13:10:37 bagder Exp $
+#
+
+AUTOMAKE_OPTIONS = foreign nostdinc
+
+# we use srcdir/include for the static global include files
+# we use builddir/src for the generated src/config.h file to get found
+# we use srcdir/lib for the client-private header files
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/src -I$(top_srcdir)/src
+
+bin_PROGRAMS = curl #memtest
+
+#memtest_SOURCES = memtest.c
+#memtest_LDADD = $(top_srcdir)/lib/libcurl.la
+
+curl_SOURCES = main.c hugehelp.c urlglob.c writeout.c setup.h \
+	config-win32.h config-mac.h config-vms.h config-riscos.h \
+	urlglob.h version.h writeout.h writeenv.c writeenv.h
+
+curl_LDADD = ../lib/libcurl.la
+curl_DEPENDENCIES = ../lib/libcurl.la
+BUILT_SOURCES = hugehelp.c
+CLEANFILES = hugehelp.c
+NROFF=@NROFF@
+
+EXTRA_DIST = mkhelp.pl curlmsg.msg \
+	Makefile.vc6 Makefile.b32 Makefile.m32 Makefile.riscos config.h.in \
+	macos/curl.mcp.xml.sit.hqx \
+	macos/MACINSTALL.TXT \
+	macos/src/curl_GUSIConfig.cpp \
+	macos/src/macos_main.cpp
+
+MANPAGE=$(top_srcdir)/docs/curl.1
+README=$(top_srcdir)/docs/MANUAL
+MKHELP=$(top_srcdir)/src/mkhelp.pl
+
+# This generates the hugehelp.c file
+hugehelp.c: $(README) $(MANPAGE)  mkhelp.pl
+	rm -f hugehelp.c
+	$(NROFF) -man $(MANPAGE) | $(PERL) $(MKHELP)  $(README) > hugehelp.c
diff --git a/main/source/curl/src/Makefile.b32 b/main/source/curl/src/Makefile.b32
new file mode 100644
index 00000000..56637bd3
--- /dev/null
+++ b/main/source/curl/src/Makefile.b32
@@ -0,0 +1,45 @@
+############################################################
+# $Id: Makefile.b32,v 1.2 2001/08/09 09:10:36 bagder Exp $
+#
+#  Makefile.b32 - Borland's C++ Compiler 5.X
+#
+#  'src' directory
+#
+#  Written by Jaepil Kim, pit@paradise.net.nz
+############################################################
+
+# Set program's name
+PROGNAME  = curl.exe
+
+# Setup environment
+CXX       = bcc32
+CXXFLAGS  = -5 -O2 -WC -w-par -w-csu -w-aus
+RM        = del
+TOPDIR    = ..
+DEFINES   = -DNDEBUG -DLIBCURL_BIGENDIAN=0 -DWIN32 -D_CONSOLE -D_MBCS
+LD	  = bcc32
+LDFLAGS	  = -lap -e$(PROGNAME)
+INCDIRS   = -I$(TOPDIR)/include
+LIBCURLLIB= $(TOPDIR)/lib/libcurl.lib
+
+# 'BCCDIR' has to be set up in your c:\autoexec.bat
+# i.e. SET BCCDIR = c:\Borland\BCC55
+# where c:\Borland\BCC55 is the compiler is installed
+LINKLIB   = $(BCCDIR)/lib/psdk/wsock32.lib
+
+
+PROGRAMS  = \
+	curl.exe 
+
+.c.obj:
+	$(CXX) -c $(INCDIRS) $(CXXFLAGS) $(DEFINES) $*.c
+
+all: $(PROGRAMS)
+
+curl.exe: $(LIBCURLLIB) $(LINKLIB) hugehelp.obj writeout.obj urlglob.obj main.obj
+	$(LD) $(LDFLAGS) hugehelp.obj writeout.obj urlglob.obj main.obj $(LIBCURLLIB) $(LINKLIB)
+
+clean:
+	$(RM) *.obj
+        $(RM) *.exe
+        $(RM) *.tds
diff --git a/main/source/curl/src/Makefile.in b/main/source/curl/src/Makefile.in
new file mode 100644
index 00000000..9660c875
--- /dev/null
+++ b/main/source/curl/src/Makefile.in
@@ -0,0 +1,538 @@
+# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# $Id: Makefile.am,v 1.24 2002/09/04 13:10:37 bagder Exp $
+#
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CA_BUNDLE = @CURL_CA_BUNDLE@
+CURL_DISABLE_DICT = @CURL_DISABLE_DICT@
+CURL_DISABLE_FILE = @CURL_DISABLE_FILE@
+CURL_DISABLE_FTP = @CURL_DISABLE_FTP@
+CURL_DISABLE_GOPHER = @CURL_DISABLE_GOPHER@
+CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@
+CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@
+CURL_DISABLE_TELNET = @CURL_DISABLE_TELNET@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_LIBZ = @HAVE_LIBZ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPV6_ENABLED = @IPV6_ENABLED@
+KRB4_ENABLED = @KRB4_ENABLED@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NO_UNDEFINED_FALSE = @NO_UNDEFINED_FALSE@
+NO_UNDEFINED_TRUE = @NO_UNDEFINED_TRUE@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_ENABLED = @OPENSSL_ENABLED@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKGADD_NAME = @PKGADD_NAME@
+PKGADD_PKG = @PKGADD_PKG@
+PKGADD_VENDOR = @PKGADD_VENDOR@
+PKGCONFIG = @PKGCONFIG@
+RANDOM_FILE = @RANDOM_FILE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VERSIONNUM = @VERSIONNUM@
+YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+
+AUTOMAKE_OPTIONS = foreign nostdinc
+
+# we use srcdir/include for the static global include files
+# we use builddir/src for the generated src/config.h file to get found
+# we use srcdir/lib for the client-private header files
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/src -I$(top_srcdir)/src
+
+bin_PROGRAMS = curl #memtest
+
+
+#memtest_SOURCES = memtest.c
+#memtest_LDADD = $(top_srcdir)/lib/libcurl.la
+curl_SOURCES = main.c hugehelp.c urlglob.c writeout.c setup.h \
+	config-win32.h config-mac.h config-vms.h config-riscos.h \
+	urlglob.h version.h writeout.h writeenv.c writeenv.h
+
+
+curl_LDADD = ../lib/libcurl.la
+curl_DEPENDENCIES = ../lib/libcurl.la
+BUILT_SOURCES = hugehelp.c
+CLEANFILES = hugehelp.c
+
+EXTRA_DIST = mkhelp.pl curlmsg.msg \
+	Makefile.vc6 Makefile.b32 Makefile.m32 Makefile.riscos config.h.in \
+	macos/curl.mcp.xml.sit.hqx \
+	macos/MACINSTALL.TXT \
+	macos/src/curl_GUSIConfig.cpp \
+	macos/src/macos_main.cpp
+
+
+MANPAGE = $(top_srcdir)/docs/curl.1
+README = $(top_srcdir)/docs/MANUAL
+MKHELP = $(top_srcdir)/src/mkhelp.pl
+subdir = src
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/lib/config.h config.h \
+	$(top_builddir)/tests/server/config.h \
+	$(top_builddir)/lib/ca-bundle.h
+CONFIG_CLEAN_FILES =
+bin_PROGRAMS = curl$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS)
+
+am_curl_OBJECTS = main.$(OBJEXT) hugehelp.$(OBJEXT) urlglob.$(OBJEXT) \
+	writeout.$(OBJEXT) writeenv.$(OBJEXT)
+curl_OBJECTS = $(am_curl_OBJECTS)
+curl_LDFLAGS =
+
+DEFAULT_INCLUDES = 
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/hugehelp.Po ./$(DEPDIR)/main.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/urlglob.Po ./$(DEPDIR)/writeenv.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/writeout.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+DIST_SOURCES = $(curl_SOURCES)
+DIST_COMMON = Makefile.am Makefile.in config.h.in
+SOURCES = $(curl_SOURCES)
+
+all: $(BUILT_SOURCES) config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  src/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+config.h: stamp-h2
+	@if test ! -f $@; then \
+	  rm -f stamp-h2; \
+	  $(MAKE) stamp-h2; \
+	else :; fi
+
+stamp-h2: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h2
+	cd $(top_builddir) && $(SHELL) ./config.status src/config.h
+
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOHEADER)
+	touch $(srcdir)/config.h.in
+
+distclean-hdr:
+	-rm -f config.h stamp-h2
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+	  rm -f $(DESTDIR)$(bindir)/$$f; \
+	done
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+curl$(EXEEXT): $(curl_OBJECTS) $(curl_DEPENDENCIES) 
+	@rm -f curl$(EXEEXT)
+	$(LINK) $(curl_LDFLAGS) $(curl_OBJECTS) $(curl_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hugehelp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/urlglob.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writeenv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writeout.Po@am__quote@
+
+distclean-depend:
+	-rm -rf ./$(DEPDIR)
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ETAGS = etags
+ETAGSFLAGS =
+
+CTAGS = ctags
+CTAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	$(mkinstalldirs) $(distdir)/macos $(distdir)/macos/src
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(PROGRAMS) config.h
+
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-compile distclean-depend \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libtool ctags distclean distclean-compile \
+	distclean-depend distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distdir dvi dvi-am info \
+	info-am install install-am install-binPROGRAMS install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-info-am
+
+
+# This generates the hugehelp.c file
+hugehelp.c: $(README) $(MANPAGE)  mkhelp.pl
+	rm -f hugehelp.c
+	$(NROFF) -man $(MANPAGE) | $(PERL) $(MKHELP)  $(README) > hugehelp.c
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/main/source/curl/src/Makefile.m32 b/main/source/curl/src/Makefile.m32
new file mode 100644
index 00000000..41c86640
--- /dev/null
+++ b/main/source/curl/src/Makefile.m32
@@ -0,0 +1,81 @@
+#############################################################
+# $Id: Makefile.m32,v 1.11 2003/02/28 15:49:33 bagder Exp $
+#
+## Makefile for building curl.exe with MingW32 (GCC-3.2) and
+## optionally OpenSSL (0.9.6)
+##
+## Use: make -f Makefile.m32 [SSL=1] [DYN=1]
+##
+## Comments to: Troy Engel <tengel@sonic.net> or
+##              Joern Hartroth <hartroth@acm.org>
+
+CC = gcc
+RM = rm -f
+STRIP = strip -s
+OPENSSL_PATH = ../../openssl-0.9.7a
+ZLIB_PATH = ../../zlib-1.1.4
+
+# We may need these someday
+# PERL = perl
+# NROFF = nroff
+
+########################################################
+## Nothing more to do below this line!
+
+INCLUDES = -I. -I.. -I../include
+CFLAGS = -g -O2 -DMINGW32
+ifdef SSL
+  CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H
+endif
+LDFLAGS = 
+COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
+LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+
+curl_PROGRAMS = curl.exe
+curl_OBJECTS = main.o hugehelp.o urlglob.o writeout.o
+curl_SOURCES = main.c hugehelp.c urlglob.c writeout.c
+ifdef DYN
+  curl_DEPENDENCIES = ../lib/libcurldll.a ../lib/libcurl.dll
+  curl_LDADD = -L../lib -lcurldll
+else
+  curl_DEPENDENCIES = ../lib/libcurl.a
+  curl_LDADD = -L../lib -lcurl
+endif
+curl_LDADD += -lwsock32 -lws2_32 -lwinmm
+ifdef SSL
+  curl_LDADD += -L$(OPENSSL_PATH)/out -leay32 -lssl32
+endif
+ifdef ZLIB
+  curl_LDADD += -L$(ZLIB_PATH) -lz
+endif
+
+PROGRAMS = $(curl_PROGRAMS)
+SOURCES = $(curl_SOURCES)
+OBJECTS = $(curl_OBJECTS)
+
+all: curl.exe
+
+curl.exe: $(curl_OBJECTS) $(curl_DEPENDENCIES)
+	$(RM) $@
+	$(LINK) $(curl_OBJECTS) $(curl_LDADD)
+	$(STRIP) $@
+
+# We don't have nroff normally under win32
+# hugehelp.c: ../README.curl ../curl.1 mkhelp.pl
+# 	$(RM) hugehelp.c
+# 	$(NROFF) -man ../curl.1 | $(PERL) mkhelp.pl ../README.curl > hugehelp.c
+
+.c.o:
+	$(COMPILE) -c $<
+
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
+clean:
+	$(RM) $(curl_OBJECTS) curl.exe
+
+distrib: clean
+	$(RM) $(curl_PROGRAMS)
diff --git a/main/source/curl/src/Makefile.riscos b/main/source/curl/src/Makefile.riscos
new file mode 100644
index 00000000..dc7f3858
--- /dev/null
+++ b/main/source/curl/src/Makefile.riscos
@@ -0,0 +1,48 @@
+# Makefile for project cURL
+# Generated on Sun,13 Jan 2002.17:11:10 by EasyGCC (0.1.3 [beta 2] (3 Jan 2002))
+# Contact: easygcc@melotech.co.uk
+
+# Project objects:
+objs =	o.hugehelp o.main o.urlglob o.writeout o.writeenv \
+	
+
+# Compile options:
+linkopts	= ../lib/libcurl openldap:libraries/libldap/libldap -o curl
+compileropts	= -mpoke-function-name -IUtilLib: -mthrowback 
+
+# Project target:
+curl:		$(objs)
+		gcc $(linkopts) $(objs)
+
+# Static dependancies:
+o.hugehelp:	c.hugehelp
+		gcc $(compileropts) -c -o hugehelp.o c.hugehelp
+
+o.main:	c.main
+		gcc $(compileropts) -c -o main.o c.main
+
+o.urlglob:	c.urlglob
+		gcc $(compileropts) -c -o urlglob.o c.urlglob
+
+o.writeout:	c.writeout
+		gcc $(compileropts) -c -o writeout.o c.writeout
+
+o.writeenv:	c.writeenv
+		gcc $(compileropts) -c -o writeenv.o c.writeenv
+
+# Dynamic dependancies:
+o.hugehelp:	c.hugehelp
+
+o.main:	c.main
+o.main:	h.setup
+o.main:	h.urlglob
+o.main:	h.writeout
+o.main:	h.version
+
+o.urlglob:	c.urlglob
+o.urlglob:	h.setup
+o.urlglob:	h.urlglob
+
+o.writeout:	c.writeout
+o.writeout:	h.writeout
+
diff --git a/main/source/curl/src/Makefile.vc6 b/main/source/curl/src/Makefile.vc6
new file mode 100644
index 00000000..9aea5d14
--- /dev/null
+++ b/main/source/curl/src/Makefile.vc6
@@ -0,0 +1,103 @@
+########################################################
+## Makefile for building curl.exe with MSVC6
+## Use: nmake -f makefile.vc6 [release | debug] [CFG=release-ssl]
+##      (default is release)
+## "nmake -f makefile.vc6 CFG=release-ssl" statically links OpenSSL
+## into curl.exe producing a standalone SSL-enabled executable.
+##
+## Comments to: Troy Engel <tengel@sonic.net>
+## Updated by: Craig Davison <cd@securityfocus.com>
+## release-ssl added by Miklos Nemeth <mnemeth@kfkisystems.com>
+## winmm.lib added by Miklos Nemeth <mnemeth@kfkisystems.com> to support
+## timeGetTime() in timeval.c
+
+PROGRAM_NAME = curl.exe
+
+########################################################
+## Nothing more to do below this line!
+
+## Release
+CCR = cl.exe /MD /O2 /D "NDEBUG"
+LINKR = link.exe /incremental:no /libpath:"../lib"
+
+## Debug
+CCD = cl.exe /MDd /Gm /ZI /Od /D "_DEBUG" /GZ
+LINKD = link.exe /incremental:yes /debug /libpath:"../lib"
+
+CFLAGS = /I "../include" /nologo /W3 /GX /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+LFLAGS = /nologo /out:$(PROGRAM_NAME) /subsystem:console /machine:I386
+LINKLIBS = ws2_32.lib libcurl.lib winmm.lib
+LINKLIBS_DEBUG = ws2_32.lib libcurld.lib winmm.lib
+
+RELEASE_OBJS= \
+	hugehelpr.obj \
+	writeoutr.obj \
+	urlglobr.obj \
+	mainr.obj
+
+DEBUG_OBJS= \
+	hugehelpd.obj \
+	writeoutd.obj \
+	urlglobd.obj \
+	maind.obj
+	
+LINK_OBJS= \
+	hugehelp.obj \
+	writeout.obj \
+	urlglob.obj \
+	main.obj
+
+ 
+######################
+# release-ssl
+ 
+!IF "$(CFG)" == "release-ssl"
+!IFNDEF OPENSSL_PATH
+OPENSSL_PATH   = ../../openssl-0.9.6
+!ENDIF
+LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32"
+SSLLIBS   = libeay32.lib ssleay32.lib RSAglue.lib gdi32.lib 
+LINKLIBS  = $(LINKLIBS) $(SSLLIBS)
+LFLAGS = $(LFLAGS) $(LFLAGSSSL)
+!ENDIF
+ 
+all : release
+
+release: $(RELEASE_OBJS)
+	$(LINKR) $(LFLAGS) $(LINKLIBS) $(LINK_OBJS)
+
+debug: $(DEBUG_OBJS)
+	$(LINKD) $(LFLAGS) $(LINKLIBS_DEBUG) $(LINK_OBJS)
+
+## Release
+hugehelpr.obj: hugehelp.c
+	$(CCR) $(CFLAGS) /Zm200 hugehelp.c
+writeoutr.obj: writeout.c
+	$(CCR) $(CFLAGS) writeout.c
+urlglobr.obj: urlglob.c
+	$(CCR) $(CFLAGS) urlglob.c
+mainr.obj: main.c
+	$(CCR) $(CFLAGS) main.c
+
+## Debug
+hugehelpd.obj: hugehelp.c
+	$(CCD) $(CFLAGS) /Zm200 hugehelp.c
+writeoutd.obj: writeout.c
+	$(CCD) $(CFLAGS) writeout.c
+urlglobd.obj: urlglob.c
+	$(CCD) $(CFLAGS) urlglob.c
+maind.obj: main.c
+	$(CCD) $(CFLAGS) main.c
+
+clean:
+	-@erase hugehelp.obj
+	-@erase main.obj
+	-@erase vc60.idb
+	-@erase vc60.pdb
+	-@erase vc60.pch
+	-@erase curl.ilk
+	-@erase curl.pdb
+
+distrib: clean
+	-@erase $(PROGRAM_NAME)
+
diff --git a/main/source/curl/src/config-mac.h b/main/source/curl/src/config-mac.h
new file mode 100644
index 00000000..addc8ace
--- /dev/null
+++ b/main/source/curl/src/config-mac.h
@@ -0,0 +1,12 @@
+#define HAVE_UNISTD_H		1
+#define HAVE_FCNTL_H		1
+#define HAVE_UTIME_H		1
+#define HAVE_SYS_UTIME_H	1
+
+#define HAVE_SETVBUF		1
+#define HAVE_UTIME			1
+
+#define main(x,y) curl_main(x,y)
+
+/* we provide our own strdup prototype */
+char *strdup(char *s1);
diff --git a/main/source/curl/src/config-riscos.h b/main/source/curl/src/config-riscos.h
new file mode 100644
index 00000000..f791b6df
--- /dev/null
+++ b/main/source/curl/src/config-riscos.h
@@ -0,0 +1,390 @@
+/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* Name of this package! */
+#undef PACKAGE
+
+/* Version number of this archive. */
+#undef VERSION
+
+/* Define if you have the getpass function.  */
+#undef HAVE_GETPASS
+
+/* Define cpu-machine-OS */
+#define OS "ARM-RISC OS"
+
+/* Define if you have the gethostbyaddr_r() function with 5 arguments */
+#undef HAVE_GETHOSTBYADDR_R_5
+
+/* Define if you have the gethostbyaddr_r() function with 7 arguments */
+#undef HAVE_GETHOSTBYADDR_R_7
+
+/* Define if you have the gethostbyaddr_r() function with 8 arguments */
+#undef HAVE_GETHOSTBYADDR_R_8
+
+/* Define if you have the gethostbyname_r() function with 3 arguments */
+#undef HAVE_GETHOSTBYNAME_R_3
+
+/* Define if you have the gethostbyname_r() function with 5 arguments */
+#undef HAVE_GETHOSTBYNAME_R_5
+
+/* Define if you have the gethostbyname_r() function with 6 arguments */
+#undef HAVE_GETHOSTBYNAME_R_6
+
+/* Define if you have the inet_ntoa_r function declared. */
+#undef HAVE_INET_NTOA_R_DECL
+
+/* Define if you need the _REENTRANT define for some functions */
+#undef NEED_REENTRANT
+
+/* Define if you have the Kerberos4 libraries (including -ldes) */
+#undef KRB4
+
+/* Define if you want to enable IPv6 support */
+#undef ENABLE_IPV6
+
+/* Define this to 'int' if ssize_t is not an available typedefed type */
+#undef ssize_t
+
+/* Define this to 'int' if socklen_t is not an available typedefed type */
+#undef socklen_t
+
+/* Define this as a suitable file to read random data from */
+#undef RANDOM_FILE
+
+/* Define this to your Entropy Gathering Daemon socket pathname */
+#undef EGD_SOCKET
+
+/* Define if you have a working OpenSSL installation */
+#undef OPENSSL_ENABLED
+
+/* Set to explicitly specify we don't want to use thread-safe functions */
+#define DISABLED_THREADSAFE
+
+/* Define if you want to enable IPv6 support */
+#undef ENABLE_IPV6
+
+/* Define if you have the <alloca.h> header file. */
+#define HAVE_ALLOCA_H
+
+/* Define if you have the <arpa/inet.h> header file. */
+#define HAVE_ARPA_INET_H
+
+/* Define if you have the `closesocket' function. */
+#undef HAVE_CLOSESOCKET
+
+/* Define if you have the <crypto.h> header file. */
+#undef HAVE_CRYPTO_H
+
+/* Define if you have the <des.h> header file. */
+#undef HAVE_DES_H
+
+/* Define if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define if you have the `dlopen' function. */
+#undef HAVE_DLOPEN
+
+/* Define if you have the <err.h> header file. */
+#undef HAVE_ERR_H
+
+/* Define if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H
+
+/* Define if getaddrinfo exists and works */
+#define HAVE_GETADDRINFO
+
+/* Define if you have the `geteuid' function. */
+#undef HAVE_GETEUID
+
+/* Define if you have the `gethostbyaddr' function. */
+#define HAVE_GETHOSTBYADDR
+
+/* Define if you have the `gethostbyaddr_r' function. */
+#undef HAVE_GETHOSTBYADDR_R
+
+/* Define if you have the `gethostbyname_r' function. */
+#undef HAVE_GETHOSTBYNAME_R
+
+/* Define if you have the `gethostname' function. */
+#define HAVE_GETHOSTNAME
+
+/* Define if you have the <getopt.h> header file. */
+#define HAVE_GETOPT_H
+
+/* Define if you have the `getpass_r' function. */
+#undef HAVE_GETPASS_R
+
+/* Define if you have the `getpwuid' function. */
+#undef HAVE_GETPWUID
+
+/* Define if you have the `getservbyname' function. */
+#undef HAVE_GETSERVBYNAME
+
+/* Define if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY
+
+/* Define if you have the `inet_addr' function. */
+#undef HAVE_INET_ADDR
+
+/* Define if you have the `inet_ntoa' function. */
+#undef HAVE_INET_NTOA
+
+/* Define if you have the `inet_ntoa_r' function. */
+#undef HAVE_INET_NTOA_R
+
+/* Define if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H
+
+/* Define if you have the <io.h> header file. */
+#undef HAVE_IO_H
+
+/* Define if you have the `krb_get_our_ip_for_realm' function. */
+#undef HAVE_KRB_GET_OUR_IP_FOR_REALM
+
+/* Define if you have the <krb.h> header file. */
+#undef HAVE_KRB_H
+
+/* Define if you have the `crypto' library (-lcrypto). */
+#undef HAVE_LIBCRYPTO
+
+/* Define if you have the `dl' library (-ldl). */
+#undef HAVE_LIBDL
+
+/* Define if you have the `nsl' library (-lnsl). */
+#undef HAVE_LIBNSL
+
+/* Define if you have the `resolv' library (-lresolv). */
+#undef HAVE_LIBRESOLV
+
+/* Define if you have the `resolve' library (-lresolve). */
+#undef HAVE_LIBRESOLVE
+
+/* Define if you have the `socket' library (-lsocket). */
+#undef HAVE_LIBSOCKET
+
+/* Define if you have the `ssl' library (-lssl). */
+#undef HAVE_LIBSSL
+
+/* Define if you have the `ucb' library (-lucb). */
+#undef HAVE_LIBUCB
+
+/* Define if you have the `localtime_r' function. */
+#undef HAVE_LOCALTIME_R
+
+/* Define if you have the <malloc.h> header file. */
+#define HAVE_MALLOC_H
+
+/* Define if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define if you have the <netdb.h> header file. */
+#define HAVE_NETDB_H
+
+/* Define if you have the <netinet/if_ether.h> header file. */
+#undef HAVE_NETINET_IF_ETHER_H
+
+/* Define if you have the <netinet/in.h> header file. */
+#define HAVE_NETINET_IN_H
+
+/* Define if you have the <net/if.h> header file. */
+#define HAVE_NET_IF_H
+
+/* Define if you have the <openssl/crypto.h> header file. */
+#undef HAVE_OPENSSL_CRYPTO_H
+
+/* Define if you have the <openssl/err.h> header file. */
+#undef HAVE_OPENSSL_ERR_H
+
+/* Define if you have the <openssl/pem.h> header file. */
+#undef HAVE_OPENSSL_PEM_H
+
+/* Define if you have the <openssl/rsa.h> header file. */
+#undef HAVE_OPENSSL_RSA_H
+
+/* Define if you have the <openssl/ssl.h> header file. */
+#undef HAVE_OPENSSL_SSL_H
+
+/* Define if you have the <openssl/x509.h> header file. */
+#undef HAVE_OPENSSL_X509_H
+
+/* Define if you have the <pem.h> header file. */
+#undef HAVE_PEM_H
+
+/* Define if you have the `perror' function. */
+#undef HAVE_PERROR
+
+/* Define if you have the <pwd.h> header file. */
+#undef HAVE_PWD_H
+
+/* Define if you have the `RAND_egd' function. */
+#undef HAVE_RAND_EGD
+
+/* Define if you have the `RAND_screen' function. */
+#undef HAVE_RAND_SCREEN
+
+/* Define if you have the `RAND_status' function. */
+#undef HAVE_RAND_STATUS
+
+/* Define if you have the <rsa.h> header file. */
+#undef HAVE_RSA_H
+
+/* Define if you have the `select' function. */
+#define HAVE_SELECT
+
+/* Define if you have the `setvbuf' function. */
+#undef HAVE_SETVBUF
+
+/* Define if you have the <sgtty.h> header file. */
+#define HAVE_SGTTY_H
+
+/* Define if you have the `sigaction' function. */
+#undef HAVE_SIGACTION
+
+/* Define if you have the `signal' function. */
+#define HAVE_SIGNAL
+
+/* Define if you have the `socket' function. */
+#define HAVE_SOCKET
+
+/* Define if you have the <ssl.h> header file. */
+#undef HAVE_SSL_H
+
+/* Define if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H
+
+/* Define if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
+
+/* Define if you have the `strcmpi' function. */
+#undef HAVE_STRCMPI
+
+/* Define if you have the `strdup' function. */
+#define HAVE_STRDUP
+
+/* Define if you have the `strftime' function. */
+#define HAVE_STRFTIME
+
+/* Define if you have the `stricmp' function. */
+#define HAVE_STRICMP
+
+/* Define if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define if you have the <string.h> header file. */
+#define HAVE_STRING_H
+
+/* Define if you have the `strlcat' function. */
+#undef HAVE_STRLCAT
+
+/* Define if you have the `strlcpy' function. */
+#undef HAVE_STRLCPY
+
+/* Define if you have the `strstr' function. */
+#define HAVE_STRSTR
+
+/* Define if you have the `strtok_r' function. */
+#undef HAVE_STRTOK_R
+
+/* Define if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
+/* Define if you have the <sys/select.h> header file. */
+#undef HAVE_SYS_SELECT_H
+
+/* Define if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H
+
+/* Define if you have the <sys/sockio.h> header file. */
+#undef HAVE_SYS_SOCKIO_H
+
+/* Define if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H
+
+/* Define if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H
+
+/* Define if you have the `tcgetattr' function. */
+#define HAVE_TCGETATTR
+
+/* Define if you have the `tcsetattr' function. */
+#define HAVE_TCSETATTR
+
+/* Define if you have the <termios.h> header file. */
+#define HAVE_TERMIOS_H
+
+/* Define if you have the <termio.h> header file. */
+#undef HAVE_TERMIO_H
+
+/* Define if you have the <time.h> header file. */
+#undef HAVE_TIME_H
+
+/* Define if you have the `uname' function. */
+#define HAVE_UNAME
+
+/* Define if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H
+
+/* Define if you have the <winsock.h> header file. */
+#undef HAVE_WINSOCK_H
+
+/* Define if you have the <x509.h> header file. */
+#undef HAVE_X509_H
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* The size of a `long double', as computed by sizeof. */
+#undef SIZEOF_LONG_DOUBLE
+
+/* The size of a `long long', as computed by sizeof. */
+#undef SIZEOF_LONG_LONG
+
+/* Define if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define if you can safely include both <sys/time.h> and <time.h>. */
+#undef TIME_WITH_SYS_TIME
+
+/* Version number of package */
+#undef VERSION
+
+/* Define if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+#undef size_t
+
+/* type to use in place of socklen_t if not defined */
+#undef socklen_t
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef ssize_t
+
+/* this is a quick hack.  I hope it's correct. */
+#define ifr_dstaddr ifr_addr
+
+#define IOCTL_3_ARGS
+
+#define HAVE_FIONBIO
+
diff --git a/main/source/curl/src/config-vms.h b/main/source/curl/src/config-vms.h
new file mode 100644
index 00000000..f8189d74
--- /dev/null
+++ b/main/source/curl/src/config-vms.h
@@ -0,0 +1,21 @@
+/* src/config.h.  Generated automatically by configure.  */
+/* Define cpu-machine-OS */
+#define OS "ALPHA-COMPAQ-VMS"
+
+/* Define if you have the <unistd.h> header file.  */
+#define HAVE_UNISTD_H 1
+
+/* Define if you have the <io.h> header file.  */
+#undef HAVE_IO_H
+
+/* Define if you have strdup() */
+#define HAVE_STRDUP 1
+
+/* Define if you have utime() */
+#undef HAVE_UTIME
+
+/* Define if you have the <utime.h> header file */
+#undef HAVE_UTIME_H
+
+/* Define if you have thhe <sys/utime.h> header file */
+#undef HAVE_SYS_UTIME_H
diff --git a/main/source/curl/src/config-win32.h b/main/source/curl/src/config-win32.h
new file mode 100644
index 00000000..9e4cc6e5
--- /dev/null
+++ b/main/source/curl/src/config-win32.h
@@ -0,0 +1,31 @@
+/* src/config-win32.h.  manually created to look like a config.h.  */
+/* Define if you have the stricmp function.  */
+#define HAVE_STRICMP 1
+
+/* Define cpu-machine-OS */
+#define OS "win32"
+
+/* Define if you have the <io.h> header file.  */
+#define HAVE_IO_H 1
+ 
+/* Define if you have the strdup function.  */
+#define HAVE_STRDUP 1
+
+/* Define if you have the <fcntl.h> header file.  */
+#define HAVE_FCNTL_H 1
+
+/* Define if you have utime() */
+#define HAVE_UTIME 1
+
+/* Define if you have the <sys/utime.h> header file */
+#define HAVE_SYS_UTIME_H 1
+
+/*************************************************
+ * This section is for compiler specific defines.*
+ *************************************************/
+#ifdef MINGW32 /* Borland and MS don't have this */
+
+/* Define if you have the <unistd.h> header file.  */
+#define HAVE_UNISTD_H 1
+
+#endif
diff --git a/main/source/curl/src/config.h.in b/main/source/curl/src/config.h.in
new file mode 100644
index 00000000..eaf42319
--- /dev/null
+++ b/main/source/curl/src/config.h.in
@@ -0,0 +1,40 @@
+/* src/config.h.  Generated automatically by configure.  */
+/* Define cpu-machine-OS */
+#undef OS
+
+/* Define if you have the <unistd.h> header file.  */
+#undef HAVE_UNISTD_H
+
+/* Define if you have the <io.h> header file.  */
+#undef HAVE_IO_H
+
+/* Define if you have strdup() */
+#undef HAVE_STRDUP
+
+/* Define if you have utime() */
+#undef HAVE_UTIME
+
+/* Define if you have the <utime.h> header file */
+#undef HAVE_UTIME_H
+
+/* Define if you have the <sys/utime.h> header file */
+#undef HAVE_SYS_UTIME_H
+
+/* Define if you have the <sys/types.h> header file */
+#undef HAVE_SYS_TYPES_H
+
+/* Define if you have the <sys/select.h> header file */
+#undef HAVE_SYS_SELECT_H
+
+/* Define if you have the <sys/poll.h> header file */
+#undef HAVE_SYS_POLL_H
+
+/* Define if you have the `setvbuf' function. */
+#undef HAVE_SETVBUF
+
+/* Define if you have the `poll' function. */
+#undef HAVE_POLL
+
+/* Define if you can write to argc[] strings */
+#undef HAVE_WRITABLE_ARGV
+
diff --git a/main/source/curl/src/curlmsg.msg b/main/source/curl/src/curlmsg.msg
new file mode 100644
index 00000000..d5e7f045
--- /dev/null
+++ b/main/source/curl/src/curlmsg.msg
@@ -0,0 +1,56 @@
+.TITLE		CURLMSG Message files
+.FACILITY	CURL,1793	/PREFIX=CURL_
+.SEVERITY	ERROR
+.BASE		1
+UNSUPPROTO		<Unsupported Protocol>				
+FAILINIT		<Failed Initialisation>				
+BADURLSYN		<Malformed URL Syntax>				
+BADURLUSER		<Malformed URL User-part>				
+BADPROXY		<Couldn't resolve proxy>			
+BADHOST			<Couldn't resolve host>				
+FAILHOST		<Couldn't connect to host>			
+FTPUNKREPLY		<FTP Unknown server reply>			
+FTPNOACC		<FTP Access denied>				
+FTPUSRPW		<FTP User/Password incorrect>			
+FTPBADPASS		<FTP unknown answer to PASS request>		
+FTPBADUSER		<FTP unknown answer to USER request>		
+FTPBADPASV		<FTP unknown answer to PASV request>		
+FTPBAD227		<FTP unknown 227 reply>				
+FTPBADHOST227		<FTP cannot resolve host from 227 reply>	
+FTPNORECONN		<FTP Unable to reconnect to 227 Host>		
+FTPNOBIN		<FTP Cannot select BINARY mode>			
+PARTIALFILE		<Only a part of the file was transferred>	
+FTPNORETR		<FTP Couldn't retrieve file>			
+FTPWRITERR		<FTP Server reported write problems>		
+FTPNOQUOTE		<FTP Quote command error>			
+HTTPPNF			<HTTP page not found>				
+WRITERR			<Local write error>				
+BADUSER			<Username badly specified>			
+FTPNOSTOR		<FTP STOR command failed>			
+READERR			<Local Read error>				
+OUTOFMEM		<Out of memory>					
+TIMEOUT			<Operation Timed out>				
+FTPNOASCII		<FTP Cannot select ASCII mode>			
+FTPNOPORT		<FTP PORT command failed>			
+FTPNOREST		<FTP REST command failed>			
+FTPNOSIZE		<FTP SIZE command failed>			
+HTTPRNGERR		<HTTP Range error>				
+HTTPPOSTERR		<HTTP Post error>				
+SSLNOCONN		<SSL Handshaking failed>			
+FTPBADRESUME		<FTP Download resume failed>			
+FILENOACC		<FILE couldn't open faile>			
+LDAPNOBIND		<LDAP Bind failed>				
+LDAPNOSRCH		<LDAP Search Failed>				
+LDAPNOLIB		<LDAP Library not found>			
+LDAPNOFUNC		<LDAP Function not found>			
+ABORTCB			<Callback aborted operation>			
+BADPARAM		<Internal Error, Bad parameter to function>	
+BADORDER		<Internal Error, Bad function calling order>	
+BADPWD			<Bad password entered>				
+MNYREDIR		<Too many redirects>				
+UNKTELNET		<Unknown TELNET option specified>
+UNKMSG			<Unknown message (50)>
+BADSSLCERT		<Remote peer's SSL certificate wasn't OK>
+SRVNOERR		<The Server didn't reply anything, which here is considered an error>
+MAXMSG			<This is the LAST KNOWN MESSAGE, appearantly more have been added>
+.END
diff --git a/main/source/curl/src/hugehelp.c b/main/source/curl/src/hugehelp.c
new file mode 100644
index 00000000..54ddf625
--- /dev/null
+++ b/main/source/curl/src/hugehelp.c
@@ -0,0 +1,2340 @@
+/* NEVER EVER edit this manually, fix the mkhelp script instead! */
+#include <stdio.h>
+void hugehelp(void)
+{
+puts (
+"                                  _   _ ____  _     \n"
+"  Project                     ___| | | |  _ \\| |    \n"
+"                             / __| | | | |_) | |    \n"
+"                            | (__| |_| |  _ <| |___ \n"
+"                             \\___|\\___/|_| \\_\\_____|\n"
+"NAME\n"
+"       curl − transfer a URL\n"
+"\n"
+"SYNOPSIS\n"
+"       curl [options] [URL...]\n"
+"\n"
+"DESCRIPTION\n"
+"       curl  is  a  client  to get documents/files from or send documents to a\n"
+);
+ puts(
+"       server, using any of the supported protocols (HTTP, HTTPS, FTP, GOPHER,\n"
+"       DICT,  TELNET,  LDAP  or FILE). The command is designed to work without\n"
+"       user interaction or any kind of interactivity.\n"
+"\n"
+"       curl offers a busload of useful tricks like proxy support, user authen�\n"
+"       tication,  ftp  upload,  HTTP  post, SSL (https:) connections, cookies,\n"
+"       file transfer resume and more.\n"
+"\n"
+"URL\n"
+);
+ puts(
+"       The URL syntax is protocol dependent. You’ll find a  detailed  descrip�\n"
+"       tion in RFC 2396.\n"
+"\n"
+"       You  can  specify  multiple  URLs or parts of URLs by writing part sets\n"
+"       within braces as in:\n"
+"\n"
+"        http://site.{one,two,three}.com\n"
+"\n"
+"       or you can get sequences of alphanumeric series by using [] as in:\n"
+"\n"
+"        ftp://ftp.numericals.com/file[1�100].txt\n"
+"        ftp://ftp.numericals.com/file[001�100].txt    (with leading zeros)\n"
+"        ftp://ftp.letters.com/file[a�z].txt\n"
+"\n"
+);
+ puts(
+"       It is possible to specify up to 9 sets or series  for  a  URL,  but  no\n"
+"       nesting is supported at the moment:\n"
+"\n"
+"        http://www.any.org/archive[1996�1999]/vol�\n"
+"       ume[1�4]part{a,b,c,index}.html\n"
+"\n"
+"       You can specify any amount of URLs on the command line.  They  will  be\n"
+"       fetched in a sequential manner in the specified order.\n"
+"\n"
+"       Curl will attempt to re�use connections for multiple file transfers, so\n"
+);
+ puts(
+"       that getting many files from the same server will not do multiple  con�\n"
+"       nects / handshakes. This improves speed. Of course this is only done on\n"
+"       files specified on a single command line and  cannot  be  used  between\n"
+"       separate curl invokes.\n"
+"\n"
+"OPTIONS\n"
+"       �a/��append\n"
+"              (FTP)  When  used in a ftp upload, this will tell curl to append\n"
+"              to the target file  instead  of  overwriting  it.  If  the  file\n"
+);
+ puts(
+"              doesn’t exist, it will be created.\n"
+"\n"
+"              If this option is used twice, the second one will disable append\n"
+"              mode again.\n"
+"\n"
+"       �A/��user�agent <agent string>\n"
+"              (HTTP) Specify the User�Agent string to send to the HTTP server.\n"
+"              Some  badly  done CGIs fail if its not set to \"Mozilla/4.0\".  To\n"
+"              encode blanks in the string, surround  the  string  with  single\n"
+);
+ puts(
+"              quote  marks.  This can also be set with the �H/��header flag of\n"
+"              course.\n"
+"\n"
+"              If this option is set more than once, the last one will  be  the\n"
+"              one that’s used.\n"
+"\n"
+"       �b/��cookie <name=data>\n"
+"              (HTTP)  Pass the data to the HTTP server as a cookie. It is sup�\n"
+"              posedly the data previously received from the server in a  \"Set�\n"
+"              Cookie:\"  line.  The data should be in the format \"NAME1=VALUE1;\n"
+);
+ puts(
+"              NAME2=VALUE2\".\n"
+"\n"
+"              If no ’=’ letter is used in the line, it is treated as  a  file�\n"
+"              name  to  use to read previously stored cookie lines from, which\n"
+"              should be used in this session if they match. Using this  method\n"
+"              also  activates  the \"cookie parser\" which will make curl record\n"
+"              incoming cookies too, which may be handy if you’re using this in\n"
+);
+ puts(
+"              combination  with  the  �L/��location option. The file format of\n"
+"              the file to read cookies from should be plain  HTTP  headers  or\n"
+"              the Netscape/Mozilla cookie file format.\n"
+"\n"
+"              NOTE  that  the  file specified with �b/��cookie is only used as\n"
+"              input. No cookies will be stored in the file. To store  cookies,\n"
+"              save the HTTP headers to a file using �D/��dump�header!\n"
+"\n"
+);
+ puts(
+"              If  this  option is set more than once, the last one will be the\n"
+"              one that’s used.\n"
+"\n"
+"       �B/��use�ascii\n"
+"              Use ASCII transfer when getting an FTP file or  LDAP  info.  For\n"
+"              FTP,  this  can  also be enforced by using an URL that ends with\n"
+"              \";type=A\". This option causes data sent to stdout to be in  text\n"
+"              mode for win32 systems.\n"
+"\n"
+"              If  this option is used twice, the second one will disable ASCII\n"
+);
+ puts(
+"              usage.\n"
+"\n"
+"       ��ciphers <list of ciphers>\n"
+"              (SSL) Specifies which ciphers to use in the connection. The list\n"
+"              of  ciphers  must  be using valid ciphers. Read up on SSL cipher\n"
+"              list          details           on           this           URL:\n"
+"              http://www.openssl.org/docs/apps/ciphers.html  (Option  added in\n"
+"              curl 7.9)\n"
+"\n"
+);
+ puts(
+"              If this option is used several times, the last one will override\n"
+"              the others.\n"
+"\n"
+"       ��compressed\n"
+"              (HTTP)  Request  a compressed response using the deflate or gzip\n"
+"              algorithms and return the uncompressed document.  If this option\n"
+"              is  used and the server sends an unsupported encoding, Curl will\n"
+"              report an error.\n"
+"\n"
+"       ��connect�timeout <seconds>\n"
+);
+ puts(
+"              Maximum time in seconds that you allow  the  connection  to  the\n"
+"              server  to  take.   This  only limits the connection phase, once\n"
+"              curl has connected this option is of no more use. See  also  the\n"
+"              ��max�time option.\n"
+"\n"
+"              If this option is used several times, the last one will be used.\n"
+"\n"
+"       �c/��cookie�jar <file name>\n"
+"              Specify to which file you want curl to write all cookies after a\n"
+);
+ puts(
+"              completed  operation.  Curl  writes  all cookies previously read\n"
+"              from a specified file as  well  as  all  cookies  received  from\n"
+"              remote server(s). If no cookies are known, no file will be writ�\n"
+"              ten. The file will be written using  the  Netscape  cookie  file\n"
+"              format.  If  you  set  the  file name to a single dash, \"�\", the\n"
+"              cookies will be written to stdout. (Option added in curl 7.9)\n"
+"\n"
+);
+ puts(
+"              NOTE If the cookie jar can’t be created or written to, the whole\n"
+"              curl operation won’t fail or even report an error clearly. Using\n"
+"              �v will get a warning displayed, but that is  the  only  visible\n"
+"              feedback you get about this possibly lethal situation.\n"
+"\n"
+"              If  this  option  is  used several times, the last specfied file\n"
+"              name will be used.\n"
+"\n"
+"       �C/��continue�at <offset>\n"
+);
+ puts(
+"              Continue/Resume a previous file transfer at  the  given  offset.\n"
+"              The  given  offset  is  the  exact  number of bytes that will be\n"
+"              skipped counted from the beginning of the source file before  it\n"
+"              is transfered to the destination.  If used with uploads, the ftp\n"
+"              server command SIZE will not be used by curl.\n"
+"\n"
+"              Use \"�C �\" to tell curl to automatically find out  where/how  to\n"
+);
+ puts(
+"              resume  the  transfer. It then uses the given output/input files\n"
+"              to figure that out.\n"
+"\n"
+"              If this option is used several times, the last one will be used.\n"
+"\n"
+"       ��create�dirs\n"
+"              When  used  in  conjunction with the �o option, curl will create\n"
+"              the necessary local directory hierarchy as needed.\n"
+"\n"
+"       ��crlf (FTP) Convert LF to CRLF in upload. Useful for MVS (OS/390).\n"
+"\n"
+);
+ puts(
+"              If this option is used twice, the second will again disable crlf\n"
+"              converting.\n"
+"\n"
+"       �d/��data <data>\n"
+"              (HTTP)  Sends  the  specified data in a POST request to the HTTP\n"
+"              server, in a way that can emulate as if a user has filled  in  a\n"
+"              HTML  form  and pressed the submit button. Note that the data is\n"
+"              sent exactly as specified with no  extra  processing  (with  all\n"
+);
+ puts(
+"              newlines  cut  off).   The data is expected to be \"url�encoded\".\n"
+"              This will cause curl to pass the data to the  server  using  the\n"
+"              content�type  application/x�www�form�urlencoded.  Compare to �F.\n"
+"              If more than one �d/��data option is used on  the  same  command\n"
+"              line,  the  data pieces specified will be merged together with a\n"
+"              separating &�letter. Thus, using ’�d name=daniel �d skill=lousy’\n"
+);
+ puts(
+"              would    generate    a    post    chunk    that    looks    like\n"
+"              ’name=daniel&skill=lousy’.\n"
+"\n"
+"              If you start the data with the letter @, the rest  should  be  a\n"
+"              file  name  to read the data from, or � if you want curl to read\n"
+"              the data from stdin.  The contents of the file must  already  be\n"
+"              url�encoded.  Multiple files can also be specified. Posting data\n"
+);
+ puts(
+"              from a file named ’foobar’ would thus be done with \"��data @foo�\n"
+"              bar\".\n"
+"\n"
+"              To  post  data purely binary, you should instead use the ��data�\n"
+"              binary option.\n"
+"\n"
+"              �d/��data is the same as ��data�ascii.\n"
+"\n"
+"              If this option is used several times,  the  ones  following  the\n"
+"              first will append data.\n"
+"\n"
+"       ��data�ascii <data>\n"
+"              (HTTP) This is an alias for the �d/��data option.\n"
+"\n"
+);
+ puts(
+"              If  this  option  is  used several times, the ones following the\n"
+"              first will append data.\n"
+"\n"
+"       ��data�binary <data>\n"
+"              (HTTP) This posts data in a similar manner as ��data�ascii does,\n"
+"              although when using this option the entire context of the posted\n"
+"              data is kept as�is. If you want to post a  binary  file  without\n"
+"              the  strip�newlines  feature of the ��data�ascii option, this is\n"
+"              for you.\n"
+"\n"
+);
+ puts(
+"              If this option is used several times,  the  ones  following  the\n"
+"              first will append data.\n"
+"\n"
+"       ��disable�epsv\n"
+"              (FTP)  Tell  curl  to  disable  the use of the EPSV command when\n"
+"              doing passive FTP downloads. Curl  will  normally  always  first\n"
+"              attempt  to  use EPSV before PASV, but with this option, it will\n"
+"              not try using EPSV.\n"
+"\n"
+"              If this option is used several times, each occurrence will  tog�\n"
+);
+ puts(
+"              gle this on/off.\n"
+"\n"
+"       �D/��dump�header <file>\n"
+"              Write the protocol headers to the specified file.\n"
+"\n"
+"              This  option  is handy to use when you want to store the cookies\n"
+"              that a HTTP site sends to you. The cookies could then be read in\n"
+"              a second curl invoke by using the �b/��cookie option!\n"
+"\n"
+"              When  used  on FTP, the ftp server response lines are considered\n"
+"              being \"headers\" and thus are saved there.\n"
+"\n"
+);
+ puts(
+"              If this option is used several times, the last one will be used.\n"
+"\n"
+"       �e/��referer <URL>\n"
+"              (HTTP)  Sends the \"Referer Page\" information to the HTTP server.\n"
+"              This can also be set with the �H/��header flag of course.   When\n"
+"              used  with  �L/��location  you can append \";auto\" to the referer\n"
+"              URL to make curl automatically set the previous URL when it fol�\n"
+);
+ puts(
+"              lows  a  Location: header. The \";auto\" string can be used alone,\n"
+"              even if you don’t set an initial referer.\n"
+"\n"
+"              If this option is used several times, the last one will be used.\n"
+"\n"
+"       ��environment\n"
+"              (RISC  OS ONLY) Sets a range of environment variables, using the\n"
+"              names the �w option supports, to easier allow extraction of use�\n"
+"              ful information after having run curl.\n"
+"\n"
+);
+ puts(
+"              If  this option is used several times, each occurrence will tog�\n"
+"              gle this on/off.\n"
+"\n"
+"       ��egd�file <file>\n"
+"              (HTTPS) Specify the path name to the  Entropy  Gathering  Daemon\n"
+"              socket.  The  socket  is  used to seed the random engine for SSL\n"
+"              connections. See also the ��random�file option.\n"
+"\n"
+"       �E/��cert <certificate[:password]>\n"
+"              (HTTPS) Tells curl to use the specified  certificate  file  when\n"
+);
+ puts(
+"              getting  a  file with HTTPS. The certificate must be in PEM for�\n"
+"              mat.  If the optional  password  isn’t  specified,  it  will  be\n"
+"              queried  for  on the terminal. Note that this certificate is the\n"
+"              private key and the private certificate concatenated!\n"
+"\n"
+"              If this option is used several times, the last one will be used.\n"
+"\n"
+"       ��cacert <CA certificate>\n"
+"              (HTTPS) Tells curl to use the specified certificate file to ver�\n"
+);
+ puts(
+"              ify the peer. The file may contain multiple CA certificates. The\n"
+"              certificate(s) must be in PEM format.\n"
+"\n"
+"              curl  recognizes the environment variable named ’CURL_CA_BUNDLE’\n"
+"              if that is set, and uses the given path as a path to a  CA  cert\n"
+"              bundle. This option overrides that variable.\n"
+"\n"
+"              The  windows  version  of  curl will automatically look for a CA\n"
+);
+ puts(
+"              certs file named ´curl�ca�bundle.crt´, either in the same direc�\n"
+"              tory as curl.exe, or in the Current Working Directory, or in any\n"
+"              folder along your PATH.\n"
+"\n"
+"              If this option is used several times, the last one will be used.\n"
+"\n"
+"       ��capath <CA certificate directory>\n"
+"              (HTTPS) Tells curl to use the specified certificate directory to\n"
+"              verify the peer. The certificates must be in PEM format, and the\n"
+);
+ puts(
+"              directory  must  have  been processed using the c_rehash utility\n"
+"              supplied with openssl. Using ��capath can  allow  curl  to  make\n"
+"              https  connections  much more efficiently than using ��cacert if\n"
+"              the ��cacert file contains many CA certificates.\n"
+"\n"
+"              If this option is used several times, the last one will be used.\n"
+"\n"
+"       �f/��fail\n"
+"              (HTTP)  Fail  silently (no output at all) on server errors. This\n"
+);
+ puts(
+"              is mostly done like this to better enable scripts etc to  better\n"
+"              deal  with  failed  attempts. In normal cases when a HTTP server\n"
+"              fails to deliver a document, it returns a HTML document  stating\n"
+"              so  (which  often  also  describes why and more). This flag will\n"
+"              prevent curl from outputting that and fail silently instead.\n"
+"\n"
+"              If this option is used twice,  the  second  will  again  disable\n"
+);
+ puts(
+"              silent failure.\n"
+"\n"
+"       �F/��form <name=content>\n"
+"              (HTTP)  This  lets curl emulate a filled in form in which a user\n"
+"              has pressed the submit button. This causes  curl  to  POST  data\n"
+"              using the content�type multipart/form�data according to RFC1867.\n"
+"              This enables uploading of binary files etc. To force  the  ’con�\n"
+"              tent’ part to be be a file, prefix the file name with an @ sign.\n"
+);
+ puts(
+"              To just get the content part from a file, prefix the  file  name\n"
+"              with the letter <. The difference between @ and < is then that @\n"
+"              makes a file get attached in the post as a  file  upload,  while\n"
+"              the < makes a text field and just get the contents for that text\n"
+"              field from a file.\n"
+"\n"
+"              Example, to send your password file to the server, where  ’pass�\n"
+);
+ puts(
+"              word’ is the name of the form�field to which /etc/passwd will be\n"
+"              the input:\n"
+"\n"
+"              curl �F password=@/etc/passwd www.mypasswords.com\n"
+"\n"
+"              To read the file’s content from stdin insted of a  file,  use  �\n"
+"              where  the  file name should’ve been. This goes for both @ and <\n"
+"              constructs.\n"
+"\n"
+"              You can also tell curl what Content�Type to  use  for  the  file\n"
+);
+ puts(
+"              upload part, by using ’type=’, in a manner similar to:\n"
+"\n"
+"              curl �F \"web=@index.html;type=text/html\" url.com\n"
+"\n"
+"              See further examples and details in the MANUAL.\n"
+"\n"
+"              This option can be used multiple times.\n"
+"\n"
+"       �g/��globoff\n"
+"              This option switches off the \"URL globbing parser\". When you set\n"
+"              this option, you can specify URLs that contain the letters  {}[]\n"
+);
+ puts(
+"              without  having them being interpreted by curl itself. Note that\n"
+"              these letters are not normal legal URL contents but they  should\n"
+"              be encoded according to the URI standard.\n"
+"\n"
+"       �G/��get\n"
+"              When  used,  this  option  will  make  all  data  specified with\n"
+"              �d/��data or ��data�binary to be used  in  a  HTTP  GET  request\n"
+"              instead  of  the  POST request that otherwise would be used. The\n"
+);
+ puts(
+"              data will be appended to the URL with a ’?’  separator.  (Option\n"
+"              added in curl 7.9)\n"
+"\n"
+"              If  used  in  combination with �I, the POST data will instead be\n"
+"              appended to the URL with a HEAD request.\n"
+"\n"
+"              If used multiple times, nothing special happens.\n"
+"\n"
+"       �h/��help\n"
+"              Usage help.\n"
+"\n"
+"       �H/��header <header>\n"
+"              (HTTP) Extra header to use when getting  a  web  page.  You  may\n"
+);
+ puts(
+"              specify any number of extra headers. Note that if you should add\n"
+"              a custom header that has the same name as one  of  the  internal\n"
+"              ones  curl  would  use,  your externally set header will be used\n"
+"              instead of the internal one. This allows you to make even trick�\n"
+"              ier  stuff  than  curl would normally do. You should not replace\n"
+"              internally set  headers  without  knowing  perfectly  well  what\n"
+);
+ puts(
+"              you’re doing. Replacing an internal header with one without con�\n"
+"              tent on the right side of the colon  will  prevent  that  header\n"
+"              from appearing.\n"
+"\n"
+"              This  option  can  be  used multiple times to add/replace/remove\n"
+"              multiple headers.\n"
+"\n"
+"       �i/��include\n"
+"              (HTTP) Include the HTTP�header in the  output.  The  HTTP�header\n"
+"              includes  things  like  server�name, date of the document, HTTP�\n"
+);
+ puts(
+"              version and more...\n"
+"\n"
+"              If this option is used twice,  the  second  will  again  disable\n"
+"              header include.\n"
+"\n"
+"       ��interface <name>\n"
+"              Perform  an operation using a specified interface. You can enter\n"
+"              interface name, IP address or host name. An example  could  look\n"
+"              like:\n"
+"\n"
+"              curl ��interface eth0:1 http://www.netscape.com/\n"
+"\n"
+);
+ puts(
+"              If this option is used several times, the last one will be used.\n"
+"\n"
+"       �I/��head\n"
+"              (HTTP/FTP) Fetch the HTTP�header only! HTTP�servers feature  the\n"
+"              command  HEAD which this uses to get nothing but the header of a\n"
+"              document. When used on a FTP file, curl displays the  file  size\n"
+"              only.\n"
+"\n"
+"              If  this  option  is  used  twice, the second will again disable\n"
+"              header only.\n"
+"\n"
+"       �j/��junk�session�cookies\n"
+);
+ puts(
+"              (HTTP) When curl is told to read cookies from a given file, this\n"
+"              option  will  make  it  discard all \"session cookies\". This will\n"
+"              basicly have the same effect as if a  new  session  is  started.\n"
+"              Typical  browsers  always  discard  session cookies when they’re\n"
+"              closed down. (Added in 7.9.7)\n"
+"\n"
+"              If this option is  used  several  times,  each  occurrence  will\n"
+"              toggle this on/off.\n"
+"\n"
+"       �k/��insecure\n"
+);
+ puts(
+"              (SSL)  This  option explicitly allows curl to perform \"insecure\"\n"
+"              SSL connections and transfers. Starting with curl 7.10, all  SSL\n"
+"              connections  will be attempted to be made secure by using the CA\n"
+"              certificate bundle installed by default. This makes all  connec�\n"
+"              tions  considered  \"insecure\"  to  fail  unless �k/��insecure is\n"
+"              used.\n"
+"\n"
+"              This option is ignored if ��cacert or ��capath is used!\n"
+"\n"
+);
+ puts(
+"              If this option is used twice, the second time will again disable\n"
+"              it.\n"
+"\n"
+"       ��krb4 <level>\n"
+"              (FTP) Enable kerberos4 authentication and use. The level must be\n"
+"              entered and should be one of ’clear’, ’safe’, ’confidential’  or\n"
+"              ’private’.  Should  you  use  a  level that is not one of these,\n"
+"              ’private’ will instead be used.\n"
+"\n"
+"              If this option is used several times, the last one will be used.\n"
+"\n"
+);
+ puts(
+"       �K/��config <config file>\n"
+"              Specify  which config file to read curl arguments from. The con�\n"
+"              fig file is a text file in which command line arguments  can  be\n"
+"              written  which  then will be used as if they were written on the\n"
+"              actual command line. Options and their parameters must be speci�\n"
+"              fied  on  the same config file line. If the parameter is to con�\n"
+);
+ puts(
+"              tain white spaces, the parameter must be inclosed within quotes.\n"
+"              If  the  first  column  of a config line is a ’#’ character, the\n"
+"              rest of the line will be treated as a comment.\n"
+"\n"
+"              Specify the filename as ’�’ to make  curl  read  the  file  from\n"
+"              stdin.\n"
+"\n"
+"              Note  that  to  be able to specify a URL in the config file, you\n"
+"              need to specify it using the ��url option,  and  not  by  simply\n"
+);
+ puts(
+"              writing  the  URL  on its own line. So, it could look similar to\n"
+"              this:\n"
+"\n"
+"              url = \"http://curl.haxx.se/docs/\"\n"
+"\n"
+"              This option can be used multiple times.\n"
+"\n"
+"       ��limit�rate <speed>\n"
+"              Specify the maximum transfer rate you want  curl  to  use.  This\n"
+"              feature is useful if you have a limited pipe and you’d like your\n"
+"              transfer not use your entire bandwidth.\n"
+"\n"
+);
+ puts(
+"              The given speed is measured in bytes/second, unless a suffix  is\n"
+"              appended.  Appending  ’k’  or ’K’ will count the number as kilo�\n"
+"              bytes, ’m’ or M’ makes it megabytes while ’g’ or  ’G’  makes  it\n"
+"              gigabytes. Examples: 200K, 3m and 1G.\n"
+"\n"
+"              This option was introduced in curl 7.10.\n"
+"\n"
+"              If this option is used several times, the last one will be used.\n"
+"\n"
+"       �l/��list�only\n"
+);
+ puts(
+"              (FTP) When listing an FTP directory, this switch forces a  name�\n"
+"              only  view.   Especially useful if you want to machine�parse the\n"
+"              contents of an FTP directory since  the  normal  directory  view\n"
+"              doesn’t use a standard look or format.\n"
+"\n"
+"              This  option  causes  an  FTP NLST command to be sent.  Some FTP\n"
+"              servers list only files in their response to NLST; they  do  not\n"
+);
+ puts(
+"              include subdirectories and symbolic links.\n"
+"\n"
+"              If this option is used twice, the second will again disable list\n"
+"              only.\n"
+"\n"
+"       �L/��location\n"
+"              (HTTP/HTTPS) If the server reports that the requested page has a\n"
+"              different  location  (indicated  with the header line Location:)\n"
+"              this flag will let curl attempt to reattempt the get on the  new\n"
+"              place.  If  used  together  with  �i  or  �I,  headers  from all\n"
+);
+ puts(
+"              requested pages will be shown. If this flag is used when  making\n"
+"              a  HTTP  POST,  curl  will automatically switch to GET after the\n"
+"              initial POST has been done.\n"
+"\n"
+"              If this option is used twice,  the  second  will  again  disable\n"
+"              location following.\n"
+"\n"
+"       �m/��max�time <seconds>\n"
+"              Maximum  time  in  seconds that you allow the whole operation to\n"
+);
+ puts(
+"              take.  This is useful for preventing your batch jobs from  hang�\n"
+"              ing  for  hours  due to slow networks or links going down.  This\n"
+"              doesn’t work fully in win32 systems.  See  also  the  ��connect�\n"
+"              timeout option.\n"
+"\n"
+"              If this option is used several times, the last one will be used.\n"
+"\n"
+"       �M/��manual\n"
+"              Manual. Display the huge help text.\n"
+"\n"
+"       �n/��netrc\n"
+);
+ puts(
+"              Makes curl scan the .netrc file in the user’s home directory for\n"
+"              login name and password. This is typically used for ftp on unix.\n"
+"              If used with http, curl will  enable  user  authentication.  See\n"
+"              netrc(4) or ftp(1) for details on the file format. Curl will not\n"
+"              complain if that file hasn’t the right  permissions  (it  should\n"
+);
+ puts(
+"              not  be  world  nor  group  readable).  The environment variable\n"
+"              \"HOME\" is used to find the home directory.\n"
+"\n"
+"              A quick and very simple example of how  to  setup  a  .netrc  to\n"
+"              allow  curl to ftp to the machine host.domain.com with user name\n"
+"              ’myself’ and password ’secret’ should look similar to:\n"
+"\n"
+"              machine host.domain.com login myself password secret\n"
+"\n"
+);
+ puts(
+"              If this option is used twice,  the  second  will  again  disable\n"
+"              netrc usage.\n"
+"\n"
+"       �N/��no�buffer\n"
+"              Disables the buffering of the output stream. In normal work sit�\n"
+"              uations, curl will use a standard buffered  output  stream  that\n"
+"              will have the effect that it will output the data in chunks, not\n"
+"              necessarily exactly when the data arrives.   Using  this  option\n"
+"              will disable that buffering.\n"
+"\n"
+);
+ puts(
+"              If  this  option  is used twice, the second will again switch on\n"
+"              buffering.\n"
+"\n"
+"       �o/��output <file>\n"
+"              Write output to <file> instead of stdout. If you are using {} or\n"
+"              []  to  fetch  multiple documents, you can use ’#’ followed by a\n"
+"              number in the <file> specifier. That variable will  be  replaced\n"
+"              with the current string for the URL being fetched. Like in:\n"
+"\n"
+);
+ puts(
+"                curl http://{one,two}.site.com �o \"file_#1.txt\"\n"
+"\n"
+"              or use several variables like:\n"
+"\n"
+"                curl http://{site,host}.host[1�5].com �o \"#1_#2\"\n"
+"\n"
+"              You  may  use  this  option  as many times as you have number of\n"
+"              URLs.\n"
+"\n"
+"              See also the ��create�dirs option to create the  local  directo�\n"
+"              ries dynamically.\n"
+"\n"
+"       �O/��remote�name\n"
+"              Write  output to a local file named like the remote file we get.\n"
+);
+ puts(
+"              (Only the file part of the remote file is used, the path is  cut\n"
+"              off.)\n"
+"\n"
+"              You  may  use  this  option  as many times as you have number of\n"
+"              URLs.\n"
+"\n"
+"       �p/��proxytunnel\n"
+"              When an HTTP proxy is used, this option will cause non�HTTP pro�\n"
+"              tocols  to attempt to tunnel through the proxy instead of merely\n"
+"              using it to do HTTP�like operations. The tunnel approach is made\n"
+);
+ puts(
+"              with  the HTTP proxy CONNECT request and requires that the proxy\n"
+"              allows direct connect to the remote port number  curl  wants  to\n"
+"              tunnel through to.\n"
+"\n"
+"              If  this  option  is  used  twice, the second will again disable\n"
+"              proxy tunnel.\n"
+"\n"
+"       �P/��ftpport <address>\n"
+"              (FTP) Reverses the initiator/listener roles when connecting with\n"
+"              ftp.  This  switch  makes  Curl  use the PORT command instead of\n"
+);
+ puts(
+"              PASV. In practice, PORT tells  the  server  to  connect  to  the\n"
+"              client’s  specified address and port, while PASV asks the server\n"
+"              for an ip address and port to connect to.  <address>  should  be\n"
+"              one of:\n"
+"\n"
+"              interface   i.e  \"eth0\"  to specify which interface’s IP address\n"
+"                          you want to use  (Unix only)\n"
+"\n"
+"              IP address  i.e \"192.168.10.1\" to specify exact IP number\n"
+"\n"
+);
+ puts(
+"              host name   i.e \"my.host.domain\" to specify machine\n"
+"\n"
+"              �           (any single�letter  string)  to  make  it  pick  the\n"
+"                          machine’s default\n"
+"\n"
+"       If this option is used several times, the last one will be used.\n"
+"\n"
+"       �q     If  used  as  the  first  parameter  on  the  command  line, the\n"
+"              $HOME/.curlrc file will not be read and used as a config file.\n"
+"\n"
+"       �Q/��quote <comand>\n"
+);
+ puts(
+"              (FTP) Send an arbitrary command to the  remote  FTP  server,  by\n"
+"              using  the  QUOTE command of the server. Not all servers support\n"
+"              this command, and the set of QUOTE commands are server specific!\n"
+"              Quote  commands are sent BEFORE the transfer is taking place. To\n"
+"              make commands take place after  a  successful  transfer,  prefix\n"
+"              them  with a dash ’�’. You may specify any amount of commands to\n"
+);
+ puts(
+"              be run before and after the  transfer.  If  the  server  returns\n"
+"              failure  for  one  of the commands, the entire operation will be\n"
+"              aborted.\n"
+"\n"
+"              This option can be used multiple times.\n"
+"\n"
+"       ��random�file <file>\n"
+"              (HTTPS) Specify the path name to file containing  what  will  be\n"
+"              considered  as  random data. The data is used to seed the random\n"
+);
+ puts(
+"              engine for SSL connections.  See also the ��edg�file option.\n"
+"\n"
+"       �r/��range <range>\n"
+"              (HTTP/FTP) Retrieve a byte range (i.e a partial document) from a\n"
+"              HTTP/1.1  or  FTP server. Ranges can be specified in a number of\n"
+"              ways.\n"
+"\n"
+"              0�499     specifies the first 500 bytes\n"
+"\n"
+"              500�999   specifies the second 500 bytes\n"
+"\n"
+"              �500      specifies the last 500 bytes\n"
+"\n"
+);
+ puts(
+"              9500      specifies the bytes from offset 9500 and forward\n"
+"\n"
+"              0�0,�1    specifies the first and last byte only(*)(H)\n"
+"\n"
+"              500�700,600�799\n"
+"                        specifies 300 bytes from offset 500(H)\n"
+"\n"
+"              100�199,500�599\n"
+"                        specifies two separate 100 bytes ranges(*)(H)\n"
+"\n"
+"       (*) = NOTE that this will cause the server to reply  with  a  multipart\n"
+"       response!\n"
+"\n"
+);
+ puts(
+"       You  should  also  be aware that many HTTP/1.1 servers do not have this\n"
+"       feature enabled, so that when  you  attempt  to  get  a  range,  you’ll\n"
+"       instead get the whole document.\n"
+"\n"
+"       FTP  range  downloads  only  support  the  simple  syntax  ’start�stop’\n"
+"       (optionally with one of the numbers omitted). It depends on the non�RFC\n"
+"       command SIZE.\n"
+"\n"
+"       If this option is used several times, the last one will be used.\n"
+"\n"
+"       �R/��remote�time\n"
+);
+ puts(
+"              When  used,  this  will  make  libcurl attempt to figure out the\n"
+"              timestamp of the remote file, and if that is available make  the\n"
+"              local file get that same timestamp.\n"
+"\n"
+"              If  this  option  is  used  twice, the second time disables this\n"
+"              again.\n"
+"\n"
+"       �s/��silent\n"
+"              Silent mode. Don’t show progress meter or error messages.  Makes\n"
+"              Curl mute.\n"
+"\n"
+);
+ puts(
+"              If  this  option  is  used  twice, the second will again disable\n"
+"              mute.\n"
+"\n"
+"       �S/��show�error\n"
+"              When used with �s it makes curl show error message if it  fails.\n"
+"\n"
+"              If this option is used twice, the second will again disable show\n"
+"              error.\n"
+"\n"
+"       ��stderr <file>\n"
+"              Redirect all writes to stderr to the specified file instead.  If\n"
+"              the  file  name is a plain ’�’, it is instead written to stdout.\n"
+);
+ puts(
+"              This option has no point when you’re using a shell  with  decent\n"
+"              redirecting capabilities.\n"
+"\n"
+"              If this option is used several times, the last one will be used.\n"
+"\n"
+"       �t/��telnet�option <OPT=val>\n"
+"              Pass options to the telnet protocol. Supported options are:\n"
+"\n"
+"              TTYPE=<term> Sets the terminal type.\n"
+"\n"
+"              XDISPLOC=<X display> Sets the X display location.\n"
+"\n"
+"              NEW_ENV=<var,val> Sets an environment variable.\n"
+"\n"
+);
+ puts(
+"       �T/��upload�file <file>\n"
+"              This transfers the specified local file to the  remote  URL.  If\n"
+"              there is no file part in the specified URL, Curl will append the\n"
+"              local file name. NOTE that you must use a trailing / on the last\n"
+"              directory  to really prove to Curl that there is no file name or\n"
+"              curl will think that your last directory name is the remote file\n"
+);
+ puts(
+"              name to use. That will most likely cause the upload operation to\n"
+"              fail. If this is used on a http(s) server, the PUT command  will\n"
+"              be used.\n"
+"\n"
+"              Use  the file name \"�\" (a single dash) to use stdin instead of a\n"
+"              given file.\n"
+"\n"
+"              If this option is used several times, the last one will be used.\n"
+"\n"
+"       ��trace <file>\n"
+"              Enables  a  full  trace  dump of all incoming and outgoing data,\n"
+);
+ puts(
+"              including descriptive information, to the given output file. Use\n"
+"              \"�\" as filename to have the output sent to stdout.\n"
+"\n"
+"              If this option is used several times, the last one will be used.\n"
+"              (Added in curl 7.9.7)\n"
+"\n"
+"       ��trace�ascii <file>\n"
+"              Enables a full trace dump of all  incoming  and  outgoing  data,\n"
+"              including descriptive information, to the given output file. Use\n"
+);
+ puts(
+"              \"�\" as filename to have the output sent to stdout.\n"
+"\n"
+"              This is very similar to ��trace, but leaves out the hex part and\n"
+"              only  shows  the ASCII part of the dump. It makes smaller output\n"
+"              that might be easier to read for untrained humans.\n"
+"\n"
+"              If this option is used several times, the last one will be used.\n"
+"              (Added in curl 7.9.7)\n"
+"\n"
+"       �u/��user <user:password>\n"
+);
+ puts(
+"              Specify  user and password to use when fetching. Read the MANUAL\n"
+"              for detailed examples of how to use  this.  If  no  password  is\n"
+"              specified, curl will ask for it interactively.\n"
+"\n"
+"              If this option is used several times, the last one will be used.\n"
+"\n"
+"       �U/��proxy�user <user:password>\n"
+"              Specify user and password to use for Proxy authentication. If no\n"
+"              password is specified, curl will ask for it interactively.\n"
+"\n"
+);
+ puts(
+"              If this option is used several times, the last one will be used.\n"
+"\n"
+"       ��url <URL>\n"
+"              Specify a URL to fetch. This option is  mostly  handy  when  you\n"
+"              want to specify URL(s) in a config file.\n"
+"\n"
+"              This  option  may  be used any number of times. To control where\n"
+"              this URL is written, use the �o or the �O options.\n"
+"\n"
+"       �v/��verbose\n"
+"              Makes the fetching more  verbose/talkative.  Mostly  usable  for\n"
+);
+ puts(
+"              debugging.  Lines starting with ’>’ means data sent by curl, ’<’\n"
+"              means data received by curl that is hidden in normal  cases  and\n"
+"              lines  starting with ’*’ means additional info provided by curl.\n"
+"\n"
+"              Note that if you  want  to  see  HTTP  headers  in  the  output,\n"
+"              �i/��include might be option you’re looking for.\n"
+"\n"
+"              If  you think this option still doesn’t give you enough details,\n"
+);
+ puts(
+"              consider using ��trace or ��trace�ascii instead.\n"
+"\n"
+"              If this option is used twice, the second will again disable ver�\n"
+"              bose.\n"
+"\n"
+"       �V/��version\n"
+"              Displays  the  full version of curl, libcurl and other 3rd party\n"
+"              libraries linked with the executable.\n"
+"\n"
+"       �w/��write�out <format>\n"
+"              Defines what to display after a completed and successful  opera�\n"
+);
+ puts(
+"              tion.  The  format is a string that may contain plain text mixed\n"
+"              with any number of variables. The string  can  be  specified  as\n"
+"              \"string\",  to  get  read  from  a particular file you specify it\n"
+"              \"@filename\" and to tell curl to read the format from  stdin  you\n"
+"              write \"@�\".\n"
+"\n"
+"              The  variables  present in the output format will be substituted\n"
+);
+ puts(
+"              by the value or text that curl thinks fit, as  described  below.\n"
+"              All  variables are specified like %{variable_name} and to output\n"
+"              a normal % you just write them like %%. You can output a newline\n"
+"              by  using \\n, a carriage return with \\r and a tab space with \\t.\n"
+"\n"
+"              NOTE: The %�letter is a special letter in the win32�environment,\n"
+"              where  all  occurrences  of  %  must  be doubled when using this\n"
+);
+ puts(
+"              option.\n"
+"\n"
+"              Available variables are at this point:\n"
+"\n"
+"              url_effective  The URL that was fetched  last.  This  is  mostly\n"
+"                             meaningful  if  you’ve  told curl to follow loca�\n"
+"                             tion: headers.\n"
+"\n"
+"              http_code      The numerical code that was  found  in  the  last\n"
+"                             retrieved HTTP(S) page.\n"
+"\n"
+);
+ puts(
+"              time_total     The  total time, in seconds, that the full opera�\n"
+"                             tion lasted. The time will be displayed with mil�\n"
+"                             lisecond resolution.\n"
+"\n"
+"              time_namelookup\n"
+"                             The  time,  in  seconds,  it  took from the start\n"
+"                             until the name resolving was completed.\n"
+"\n"
+"              time_connect   The time, in seconds,  it  took  from  the  start\n"
+);
+ puts(
+"                             until  the  connect to the remote host (or proxy)\n"
+"                             was completed.\n"
+"\n"
+"              time_pretransfer\n"
+"                             The time, in seconds,  it  took  from  the  start\n"
+"                             until  the  file transfer is just about to begin.\n"
+"                             This includes all pre�transfer commands and nego�\n"
+"                             tiations that are specific to the particular pro�\n"
+);
+ puts(
+"                             tocol(s) involved.\n"
+"\n"
+"              time_starttransfer\n"
+"                             The time, in seconds,  it  took  from  the  start\n"
+"                             until  the  first byte is just about to be trans�\n"
+"                             fered. This includes  time_pretransfer  and  also\n"
+"                             the  time  the  server  needs  to  calculate  the\n"
+"                             result.\n"
+"\n"
+);
+ puts(
+"              size_download  The total amount of bytes that were downloaded.\n"
+"\n"
+"              size_upload    The total amount of bytes that were uploaded.\n"
+"\n"
+"              size_header    The total amount of bytes of the downloaded head�\n"
+"                             ers.\n"
+"\n"
+"              size_request   The  total  amount of bytes that were sent in the\n"
+"                             HTTP request.\n"
+"\n"
+);
+ puts(
+"              speed_download The average download speed that curl measured for\n"
+"                             the complete download.\n"
+"\n"
+"              speed_upload   The  average  upload speed that curl measured for\n"
+"                             the complete upload.\n"
+"\n"
+"              content_type   The Content�Type of the  requested  document,  if\n"
+"                             there was any. (Added in 7.9.5)\n"
+"\n"
+);
+ puts(
+"       If this option is used several times, the last one will be used.\n"
+"\n"
+"       �x/��proxy <proxyhost[:port]>\n"
+"              Use  specified  HTTP proxy. If the port number is not specified,\n"
+"              it is assumed at port 1080.\n"
+"\n"
+"              This option overrides existing environment variables  that  sets\n"
+"              proxy  to  use.  If  there’s  an  environment variable setting a\n"
+"              proxy, you can set proxy to \"\" to override it.\n"
+"\n"
+);
+ puts(
+"              Note that all operations that are performed over  a  HTTP  proxy\n"
+"              will  transparantly  be converted to HTTP. It means that certain\n"
+"              protocol specific operations might not be available. This is not\n"
+"              the  case  if you can tunnel through the proxy, as done with the\n"
+"              �p/��proxytunnel option.\n"
+"\n"
+"              If this option is used several times, the last one will be used.\n"
+"\n"
+"       �X/��request <command>\n"
+);
+ puts(
+"              (HTTP) Specifies a custom request to use when communicating with\n"
+"              the HTTP server.  The specified request will be used instead  of\n"
+"              the  standard  GET.  Read the HTTP 1.1 specification for details\n"
+"              and explanations.\n"
+"\n"
+"              (FTP) Specifies a custom FTP command to use instead of LIST when\n"
+"              doing file lists with ftp.\n"
+"\n"
+"              If this option is used several times, the last one will be used.\n"
+"\n"
+);
+ puts(
+"       �y/��speed�time <time>\n"
+"              If a download is slower than speed�limit bytes per second during\n"
+"              a speed�time period, the download gets aborted. If speed�time is\n"
+"              used, the default speed�limit will be 1 unless set with �y.\n"
+"\n"
+"              This option controls transfers and thus  will  not  affect  slow\n"
+"              connects  etc.  If this is a concern for you, try the ��connect�\n"
+"              timeout option.\n"
+"\n"
+);
+ puts(
+"              If this option is used several times, the last one will be used.\n"
+"\n"
+"       �Y/��speed�limit <speed>\n"
+"              If a download is slower than this given speed, in bytes per sec�\n"
+"              ond, for speed�time seconds it gets aborted. speed�time  is  set\n"
+"              with �Y and is 30 if not set.\n"
+"\n"
+"              If this option is used several times, the last one will be used.\n"
+"\n"
+"       �z/��time�cond <date expression>\n"
+);
+ puts(
+"              (HTTP) Request to get a file that has been modified  later  than\n"
+"              the  given  time  and date, or one that has been modified before\n"
+"              that time. The date expression can be all sorts of date  strings\n"
+"              or  if  it  doesn’t match any internal ones, it tries to get the\n"
+"              time from a given file name instead!  See  the  GNU  date(1)  or\n"
+"              curl_getdate(3) man pages for date expression details.\n"
+"\n"
+);
+ puts(
+"              Start the date expression with a dash (�) to make it request for\n"
+"              a document that is older than the given date/time, default is  a\n"
+"              document that is newer than the specified date/time.\n"
+"\n"
+"              If this option is used several times, the last one will be used.\n"
+"\n"
+"       �Z/��max�redirs <num>\n"
+"              Set  maximum  number  of  redirection�followings   allowed.   If\n"
+"              �L/��location  is  used, this option can be used to prevent curl\n"
+);
+ puts(
+"              from following redirections \"in absurdum\".\n"
+"\n"
+"              If this option is used several times, the last one will be used.\n"
+"\n"
+"       �3/��sslv3\n"
+"              (HTTPS) Forces curl to use SSL version 3 when negotiating with a\n"
+"              remote SSL server.\n"
+"\n"
+"       �2/��sslv2\n"
+"              (HTTPS) Forces curl to use SSL version 2 when negotiating with a\n"
+"              remote SSL server.\n"
+"\n"
+"       �0/��http1.0\n"
+);
+ puts(
+"              (HTTP)  Forces curl to issue its requests using HTTP 1.0 instead\n"
+"              of using its internally preferred: HTTP 1.1.\n"
+"\n"
+"       �#/��progress�bar\n"
+"              Make curl display progress information as a progress bar instead\n"
+"              of the default statistics.\n"
+"\n"
+"              If  this option is used twice, the second will again disable the\n"
+"              progress bar.\n"
+"\n"
+"FILES\n"
+"       ~/.curlrc\n"
+"              Default config file.\n"
+"\n"
+"ENVIRONMENT\n"
+);
+ puts(
+"       http_proxy [protocol://]<host>[:port]\n"
+"              Sets proxy server to use for HTTP.\n"
+"\n"
+"       HTTPS_PROXY [protocol://]<host>[:port]\n"
+"              Sets proxy server to use for HTTPS.\n"
+"\n"
+"       FTP_PROXY [protocol://]<host>[:port]\n"
+"              Sets proxy server to use for FTP.\n"
+"\n"
+"       GOPHER_PROXY [protocol://]<host>[:port]\n"
+"              Sets proxy server to use for GOPHER.\n"
+"\n"
+"       ALL_PROXY [protocol://]<host>[:port]\n"
+);
+ puts(
+"              Sets proxy server to use if no protocol�specific proxy is set.\n"
+"\n"
+"       NO_PROXY <comma�separated list of hosts>\n"
+"              list of host names that shouldn’t go through any proxy.  If  set\n"
+"              to a asterisk\n"
+"\n"
+"EXIT CODES\n"
+"       There  exists  a bunch of different error codes and their corresponding\n"
+"       error messages that may appear during bad conditions. At  the  time  of\n"
+"       this writing, the exit codes are:\n"
+"\n"
+);
+ puts(
+"       1      Unsupported protocol. This build of curl has no support for this\n"
+"              protocol.\n"
+"\n"
+"       2      Failed to initialize.\n"
+"\n"
+"       3      URL malformat. The syntax was not correct.\n"
+"\n"
+"       4      URL user malformatted. The user�part of the URL syntax  was  not\n"
+"              correct.\n"
+"\n"
+"       5      Couldn’t  resolve  proxy.  The  given  proxy  host  could not be\n"
+"              resolved.\n"
+"\n"
+"       6      Couldn’t resolve host. The given remote host was not resolved.\n"
+"\n"
+);
+ puts(
+"       7      Failed to connect to host.\n"
+"\n"
+"       8      FTP weird server reply.  The  server  sent  data  curl  couldn’t\n"
+"              parse.\n"
+"\n"
+"       9      FTP access denied. The server denied login.\n"
+"\n"
+"       10     FTP  user/password  incorrect.  Either  one  or  both  were  not\n"
+"              accepted by the server.\n"
+"\n"
+"       11     FTP weird PASS reply. Curl couldn’t parse the reply sent to  the\n"
+"              PASS request.\n"
+"\n"
+);
+ puts(
+"       12     FTP  weird USER reply. Curl couldn’t parse the reply sent to the\n"
+"              USER request.\n"
+"\n"
+"       13     FTP weird PASV reply, Curl couldn’t parse the reply sent to  the\n"
+"              PASV request.\n"
+"\n"
+"       14     FTP  weird  227  format.  Curl  couldn’t  parse the 227�line the\n"
+"              server sent.\n"
+"\n"
+"       15     FTP can’t get host. Couldn’t resolve the host IP we got  in  the\n"
+"              227�line.\n"
+"\n"
+);
+ puts(
+"       16     FTP  can’t reconnect. Couldn’t connect to the host we got in the\n"
+"              227�line.\n"
+"\n"
+"       17     FTP couldn’t set binary.  Couldn’t  change  transfer  method  to\n"
+"              binary.\n"
+"\n"
+"       18     Partial file. Only a part of the file was transfered.\n"
+"\n"
+"       19     FTP  couldn’t download/access the given file, the RETR (or simi�\n"
+"              lar) command failed.\n"
+"\n"
+"       20     FTP write error. The transfer was reported bad by the server.\n"
+"\n"
+);
+ puts(
+"       21     FTP quote error. A quote command returned error from the server.\n"
+"\n"
+"       22     HTTP  page  not  retrieved.  The  requested url was not found or\n"
+"              returned another error with the HTTP error  code  being  400  or\n"
+"              above. This return code only appears if ��fail is used.\n"
+"\n"
+"       23     Write  error.  Curl couldn’t write data to a local filesystem or\n"
+"              similar.\n"
+"\n"
+"       24     Malformat user. User name badly specified.\n"
+"\n"
+);
+ puts(
+"       25     FTP couldn’t STOR file. The server denied the STOR operation.\n"
+"\n"
+"       26     Read error. Various reading problems.\n"
+"\n"
+"       27     Out of memory. A memory allocation request failed.\n"
+"\n"
+"       28     Operation timeout. The specified  time�out  period  was  reached\n"
+"              according to the conditions.\n"
+"\n"
+"       29     FTP couldn’t set ASCII. The server returned an unknown reply.\n"
+"\n"
+"       30     FTP PORT failed. The PORT command failed.\n"
+"\n"
+);
+ puts(
+"       31     FTP couldn’t use REST. The REST command failed.\n"
+"\n"
+"       32     FTP  couldn’t  use SIZE. The SIZE command failed. The command is\n"
+"              an extension to the original FTP spec RFC 959.\n"
+"\n"
+"       33     HTTP range error. The range \"command\" didn’t work.\n"
+"\n"
+"       34     HTTP post error. Internal post�request generation error.\n"
+"\n"
+"       35     SSL connect error. The SSL handshaking failed.\n"
+"\n"
+"       36     FTP bad download resume. Couldn’t continue  an  earlier  aborted\n"
+);
+ puts(
+"              download.\n"
+"\n"
+"       37     FILE couldn’t read file. Failed to open the file. Permissions?\n"
+"\n"
+"       38     LDAP cannot bind. LDAP bind operation failed.\n"
+"\n"
+"       39     LDAP search failed.\n"
+"\n"
+"       40     Library not found. The LDAP library was not found.\n"
+"\n"
+"       41     Function not found. A required LDAP function was not found.\n"
+"\n"
+"       42     Aborted by callback. An application told curl to abort the oper�\n"
+"              ation.\n"
+"\n"
+);
+ puts(
+"       43     Internal error. A function was called with a bad parameter.\n"
+"\n"
+"       44     Internal error. A function was called in a bad order.\n"
+"\n"
+"       45     Interface error. A specified outgoing  interface  could  not  be\n"
+"              used.\n"
+"\n"
+"       46     Bad  password  entered.  An error was signaled when the password\n"
+"              was entered.\n"
+"\n"
+"       47     Too many redirects. When following redirects, curl hit the maxi�\n"
+"              mum amount.\n"
+"\n"
+);
+ puts(
+"       48     Unknown TELNET option specified.\n"
+"\n"
+"       49     Malformed telnet option.\n"
+"\n"
+"       51     The remote peer’s SSL certificate wasn’t ok\n"
+"\n"
+"       52     The  server  didn’t  reply anything, which here is considered an\n"
+"              error.\n"
+"\n"
+"       53     SSL crypto engine not found\n"
+"\n"
+"       54     Cannot set SSL crypto engine as default\n"
+"\n"
+"       55     Failed sending network data\n"
+"\n"
+"       56     Failure in receiving network data\n"
+"\n"
+"       57     Share is in use (internal error)\n"
+"\n"
+);
+ puts(
+"       58     Problem with the local certificate\n"
+"\n"
+"       59     Couldn’t use specified SSL cipher\n"
+"\n"
+"       60     Problem with the CA cert (path? permission?)\n"
+"\n"
+"       61     Unrecognized transfer encoding\n"
+"\n"
+"       XX     There will appear more error codes here in future releases.  The\n"
+"              existing ones are meant to never change.\n"
+"\n"
+"BUGS\n"
+"       If you do find bugs, mail them to curl�bug@haxx.se.\n"
+"\n"
+"AUTHORS / CONTRIBUTORS\n"
+);
+ puts(
+"       Daniel  Stenberg is the main author, but the whole list of contributors\n"
+"       is found in the separate THANKS file.\n"
+"\n"
+"WWW\n"
+"       http://curl.haxx.se\n"
+"\n"
+"FTP\n"
+"       ftp://ftp.sunet.se/pub/www/utilities/curl/\n"
+"\n"
+"SEE ALSO\n"
+"       ftp(1), wget(1), snarf(1)\n"
+"\n"
+"LATEST VERSION
\n"
+"
\n"
+"  You always find news about what's going on as well as the latest versions
\n"
+"  from the curl web pages, located at:
\n"
+"
\n"
+"        http://curl.haxx.se
\n"
+"
\n"
+"SIMPLE USAGE
\n"
+"
\n"
+);
+ puts(
+"  Get the main page from netscape's web-server:
\n"
+"
\n"
+"        curl http://www.netscape.com/
\n"
+"
\n"
+"  Get the root README file from funet's ftp-server:
\n"
+"
\n"
+"        curl ftp://ftp.funet.fi/README
\n"
+"
\n"
+"  Get a web page from a server using port 8000:
\n"
+"
\n"
+"        curl http://www.weirdserver.com:8000/
\n"
+"
\n"
+"  Get a list of the root directory of an FTP site:
\n"
+"
\n"
+"        curl ftp://cool.haxx.se/
\n"
+"
\n"
+"  Get a gopher document from funet's gopher server:
\n"
+"
\n"
+"        curl gopher://gopher.funet.fi
\n"
+"
\n"
+);
+ puts(
+"  Get the definition of curl from a dictionary:
\n"
+"
\n"
+"        curl dict://dict.org/m:curl
\n"
+"
\n"
+"  Fetch two documents at once:
\n"
+"
\n"
+"        curl ftp://cool.haxx.se/ http://www.weirdserver.com:8000/
\n"
+"
\n"
+"DOWNLOAD TO A FILE
\n"
+"
\n"
+"  Get a web page and store in a local file:
\n"
+"
\n"
+"        curl -o thatpage.html http://www.netscape.com/
\n"
+"
\n"
+"  Get a web page and store in a local file, make the local file get the name
\n"
+"  of the remote document (if no file name part is specified in the URL, this
\n"
+"  will fail):
\n"
+"
\n"
+);
+ puts(
+"        curl -O http://www.netscape.com/index.html
\n"
+"
\n"
+"  Fetch two files and store them with their remote names:
\n"
+"
\n"
+"        curl -O www.haxx.se/index.html -O curl.haxx.se/download.html
\n"
+"
\n"
+"USING PASSWORDS
\n"
+"
\n"
+" FTP
\n"
+"
\n"
+"   To ftp files using name+passwd, include them in the URL like:
\n"
+"
\n"
+"        curl ftp://name:passwd@machine.domain:port/full/path/to/file
\n"
+"
\n"
+"   or specify them with the -u flag like
\n"
+"
\n"
+"        curl -u name:passwd ftp://machine.domain:port/full/path/to/file
\n"
+"
\n"
+" HTTP
\n"
+"
\n"
+);
+ puts(
+"   The HTTP URL doesn't support user and password in the URL string. Curl
\n"
+"   does support that anyway to provide a ftp-style interface and thus you can
\n"
+"   pick a file like:
\n"
+"
\n"
+"        curl http://name:passwd@machine.domain/full/path/to/file
\n"
+"
\n"
+"   or specify user and password separately like in
\n"
+"
\n"
+"        curl -u name:passwd http://machine.domain/full/path/to/file
\n"
+"
\n"
+"   NOTE! Since HTTP URLs don't support user and password, you can't use that
\n"
+);
+ puts(
+"   style when using Curl via a proxy. You _must_ use the -u style fetch
\n"
+"   during such circumstances.
\n"
+"
\n"
+" HTTPS
\n"
+"
\n"
+"   Probably most commonly used with private certificates, as explained below.
\n"
+"
\n"
+" GOPHER
\n"
+"
\n"
+"   Curl features no password support for gopher.
\n"
+"
\n"
+"PROXY
\n"
+"
\n"
+" Get an ftp file using a proxy named my-proxy that uses port 888:
\n"
+"
\n"
+"        curl -x my-proxy:888 ftp://ftp.leachsite.com/README
\n"
+"
\n"
+" Get a file from a HTTP server that requires user and password, using the
\n"
+" same proxy as above:
\n"
+);
+ puts(
+"
\n"
+"        curl -u user:passwd -x my-proxy:888 http://www.get.this/
\n"
+"
\n"
+" Some proxies require special authentication. Specify by using -U as above:
\n"
+"
\n"
+"        curl -U user:passwd -x my-proxy:888 http://www.get.this/
\n"
+"
\n"
+" See also the environment variables Curl support that offer further proxy
\n"
+" control.
\n"
+"
\n"
+"RANGES
\n"
+"
\n"
+"  With HTTP 1.1 byte-ranges were introduced. Using this, a client can request
\n"
+"  to get only one or more subparts of a specified document. Curl supports
\n"
+"  this with the -r flag.
\n"
+"
\n"
+);
+ puts(
+"  Get the first 100 bytes of a document:
\n"
+"
\n"
+"        curl -r 0-99 http://www.get.this/
\n"
+"
\n"
+"  Get the last 500 bytes of a document:
\n"
+"
\n"
+"        curl -r -500 http://www.get.this/
\n"
+"
\n"
+"  Curl also supports simple ranges for FTP files as well. Then you can only
\n"
+"  specify start and stop position.
\n"
+"
\n"
+"  Get the first 100 bytes of a document using FTP:
\n"
+"
\n"
+"        curl -r 0-99 ftp://www.get.this/README  
\n"
+"
\n"
+"UPLOADING
\n"
+"
\n"
+" FTP
\n"
+"
\n"
+"  Upload all data on stdin to a specified ftp site:
\n"
+"
\n"
+);
+ puts(
+"        curl -T - ftp://ftp.upload.com/myfile
\n"
+"
\n"
+"  Upload data from a specified file, login with user and password:
\n"
+"
\n"
+"        curl -T uploadfile -u user:passwd ftp://ftp.upload.com/myfile
\n"
+"
\n"
+"  Upload a local file to the remote site, and use the local file name remote
\n"
+"  too:
\n"
+" 
\n"
+"        curl -T uploadfile -u user:passwd ftp://ftp.upload.com/
\n"
+"
\n"
+"  Upload a local file to get appended to the remote file using ftp:
\n"
+"
\n"
+"        curl -T localfile -a ftp://ftp.upload.com/remotefile
\n"
+"
\n"
+);
+ puts(
+"  Curl also supports ftp upload through a proxy, but only if the proxy is
\n"
+"  configured to allow that kind of tunneling. If it does, you can run curl in
\n"
+"  a fashion similar to:
\n"
+"
\n"
+"        curl --proxytunnel -x proxy:port -T localfile ftp.upload.com
\n"
+"
\n"
+" HTTP
\n"
+"
\n"
+"  Upload all data on stdin to a specified http site:
\n"
+"
\n"
+"        curl -T - http://www.upload.com/myfile
\n"
+"
\n"
+"  Note that the http server must've been configured to accept PUT before this
\n"
+"  can be done successfully.
\n"
+"
\n"
+);
+ puts(
+"  For other ways to do http data upload, see the POST section below.
\n"
+"
\n"
+"VERBOSE / DEBUG
\n"
+"
\n"
+"  If curl fails where it isn't supposed to, if the servers don't let you in,
\n"
+"  if you can't understand the responses: use the -v flag to get verbose
\n"
+"  fetching. Curl will output lots of info and what it sends and receives in
\n"
+"  order to let the user see all client-server interaction (but it won't show
\n"
+"  you the actual data).
\n"
+"
\n"
+"        curl -v ftp://ftp.upload.com/
\n"
+"
\n"
+);
+ puts(
+"  To get even more details and information on what curl does, try using the
\n"
+"  --trace or --trace-ascii options with a given file name to log to, like
\n"
+"  this:
\n"
+"
\n"
+"        curl --trace trace.txt www.haxx.se
\n"
+" 
\n"
+"
\n"
+"DETAILED INFORMATION
\n"
+"
\n"
+"  Different protocols provide different ways of getting detailed information
\n"
+"  about specific files/documents. To get curl to show detailed information
\n"
+"  about a single file, you should use -I/--head option. It displays all
\n"
+);
+ puts(
+"  available info on a single file for HTTP and FTP. The HTTP information is a
\n"
+"  lot more extensive.
\n"
+"
\n"
+"  For HTTP, you can get the header information (the same as -I would show)
\n"
+"  shown before the data by using -i/--include. Curl understands the
\n"
+"  -D/--dump-header option when getting files from both FTP and HTTP, and it
\n"
+"  will then store the headers in the specified file.
\n"
+"
\n"
+"  Store the HTTP headers in a separate file (headers.txt in the example):
\n"
+"
\n"
+);
+ puts(
+"        curl --dump-header headers.txt curl.haxx.se
\n"
+"
\n"
+"  Note that headers stored in a separate file can be very useful at a later
\n"
+"  time if you want curl to use cookies sent by the server. More about that in
\n"
+"  the cookies section.
\n"
+"
\n"
+"POST (HTTP)
\n"
+"
\n"
+"  It's easy to post data using curl. This is done using the -d <data>
\n"
+"  option.  The post data must be urlencoded.
\n"
+"
\n"
+"  Post a simple \"name\" and \"phone\" guestbook.
\n"
+"
\n"
+"        curl -d \"name=Rafael%20Sagula&phone=3320780\" \\
\n"
+);
+ puts(
+"                http://www.where.com/guest.cgi
\n"
+"
\n"
+"  How to post a form with curl, lesson #1:
\n"
+"
\n"
+"  Dig out all the <input> tags in the form that you want to fill in. (There's
\n"
+"  a perl program called formfind.pl on the curl site that helps with this).
\n"
+"
\n"
+"  If there's a \"normal\" post, you use -d to post. -d takes a full \"post
\n"
+"  string\", which is in the format
\n"
+"
\n"
+"        <variable1>=<data1>&<variable2>=<data2>&...
\n"
+"
\n"
+"  The 'variable' names are the names set with \"name=\" in the <input> tags, and
\n"
+);
+ puts(
+"  the data is the contents you want to fill in for the inputs. The data *must*
\n"
+"  be properly URL encoded. That means you replace space with + and that you
\n"
+"  write weird letters with %XX where XX is the hexadecimal representation of
\n"
+"  the letter's ASCII code.
\n"
+"
\n"
+"  Example:
\n"
+"
\n"
+"  (page located at http://www.formpost.com/getthis/
\n"
+"
\n"
+"        <form action=\"post.cgi\" method=\"post\">
\n"
+"        <input name=user size=10>
\n"
+"        <input name=pass type=password size=10>
\n"
+);
+ puts(
+"        <input name=id type=hidden value=\"blablabla\">
\n"
+"        <input name=ding value=\"submit\">
\n"
+"        </form>
\n"
+"
\n"
+"  We want to enter user 'foobar' with password '12345'.
\n"
+"
\n"
+"  To post to this, you enter a curl command line like:
\n"
+"
\n"
+"        curl -d \"user=foobar&pass=12345&id=blablabla&dig=submit\"  (continues)
\n"
+"          http://www.formpost.com/getthis/post.cgi
\n"
+"
\n"
+"
\n"
+"  While -d uses the application/x-www-form-urlencoded mime-type, generally
\n"
+);
+ puts(
+"  understood by CGI's and similar, curl also supports the more capable
\n"
+"  multipart/form-data type. This latter type supports things like file upload.
\n"
+"
\n"
+"  -F accepts parameters like -F \"name=contents\". If you want the contents to
\n"
+"  be read from a file, use <@filename> as contents. When specifying a file,
\n"
+"  you can also specify the file content type by appending ';type=<mime type>'
\n"
+"  to the file name. You can also post the contents of several files in one
\n"
+);
+ puts(
+"  field.  For example, the field name 'coolfiles' is used to send three files,
\n"
+"  with different content types using the following syntax:
\n"
+"
\n"
+"        curl -F \"coolfiles=@fil1.gif;type=image/gif,fil2.txt,fil3.html\" \\
\n"
+"        http://www.post.com/postit.cgi
\n"
+"
\n"
+"  If the content-type is not specified, curl will try to guess from the file
\n"
+"  extension (it only knows a few), or use the previously specified type (from
\n"
+"  an earlier file if several files are specified in a list) or else it will
\n"
+);
+ puts(
+"  using the default type 'text/plain'.
\n"
+"
\n"
+"  Emulate a fill-in form with -F. Let's say you fill in three fields in a
\n"
+"  form. One field is a file name which to post, one field is your name and one
\n"
+"  field is a file description. We want to post the file we have written named
\n"
+"  \"cooltext.txt\". To let curl do the posting of this data instead of your
\n"
+"  favourite browser, you have to read the HTML source of the form page and
\n"
+);
+ puts(
+"  find the names of the input fields. In our example, the input field names
\n"
+"  are 'file', 'yourname' and 'filedescription'.
\n"
+"
\n"
+"        curl -F \"file=@cooltext.txt\" -F \"yourname=Daniel\" \\
\n"
+"             -F \"filedescription=Cool text file with cool text inside\" \\
\n"
+"             http://www.post.com/postit.cgi
\n"
+"
\n"
+"  To send two files in one post you can do it in two ways:
\n"
+"
\n"
+"  1. Send multiple files in a single \"field\" with a single field name:
\n"
+" 
\n"
+"        curl -F \"pictures=@dog.gif,cat.gif\" 
\n"
+" 
\n"
+);
+ puts(
+"  2. Send two fields with two field names: 
\n"
+"
\n"
+"        curl -F \"docpicture=@dog.gif\" -F \"catpicture=@cat.gif\" 
\n"
+"
\n"
+"REFERRER
\n"
+"
\n"
+"  A HTTP request has the option to include information about which address
\n"
+"  that referred to actual page.  Curl allows you to specify the
\n"
+"  referrer to be used on the command line. It is especially useful to
\n"
+"  fool or trick stupid servers or CGI scripts that rely on that information
\n"
+"  being available or contain certain data.
\n"
+"
\n"
+);
+ puts(
+"        curl -e www.coolsite.com http://www.showme.com/
\n"
+"
\n"
+"  NOTE: The referer field is defined in the HTTP spec to be a full URL.
\n"
+"
\n"
+"USER AGENT
\n"
+"
\n"
+"  A HTTP request has the option to include information about the browser
\n"
+"  that generated the request. Curl allows it to be specified on the command
\n"
+"  line. It is especially useful to fool or trick stupid servers or CGI
\n"
+"  scripts that only accept certain browsers.
\n"
+"
\n"
+"  Example:
\n"
+"
\n"
+"  curl -A 'Mozilla/3.0 (Win95; I)' http://www.nationsbank.com/
\n"
+"
\n"
+);
+ puts(
+"  Other common strings:
\n"
+"    'Mozilla/3.0 (Win95; I)'     Netscape Version 3 for Windows 95
\n"
+"    'Mozilla/3.04 (Win95; U)'    Netscape Version 3 for Windows 95
\n"
+"    'Mozilla/2.02 (OS/2; U)'     Netscape Version 2 for OS/2
\n"
+"    'Mozilla/4.04 [en] (X11; U; AIX 4.2; Nav)'           NS for AIX
\n"
+"    'Mozilla/4.05 [en] (X11; U; Linux 2.0.32 i586)'      NS for Linux
\n"
+"
\n"
+"  Note that Internet Explorer tries hard to be compatible in every way:
\n"
+);
+ puts(
+"    'Mozilla/4.0 (compatible; MSIE 4.01; Windows 95)'    MSIE for W95
\n"
+"
\n"
+"  Mozilla is not the only possible User-Agent name:
\n"
+"    'Konqueror/1.0'             KDE File Manager desktop client
\n"
+"    'Lynx/2.7.1 libwww-FM/2.14' Lynx command line browser
\n"
+"
\n"
+"COOKIES
\n"
+"
\n"
+"  Cookies are generally used by web servers to keep state information at the
\n"
+"  client's side. The server sets cookies by sending a response line in the
\n"
+"  headers that looks like 'Set-Cookie: <data>' where the data part then
\n"
+);
+ puts(
+"  typically contains a set of NAME=VALUE pairs (separated by semicolons ';'
\n"
+"  like \"NAME1=VALUE1; NAME2=VALUE2;\"). The server can also specify for what
\n"
+"  path the \"cookie\" should be used for (by specifying \"path=value\"), when the
\n"
+"  cookie should expire (\"expire=DATE\"), for what domain to use it
\n"
+"  (\"domain=NAME\") and if it should be used on secure connections only
\n"
+"  (\"secure\").
\n"
+"
\n"
+"  If you've received a page from a server that contains a header like:
\n"
+);
+ puts(
+"        Set-Cookie: sessionid=boo123; path=\"/foo\";
\n"
+"
\n"
+"  it means the server wants that first pair passed on when we get anything in
\n"
+"  a path beginning with \"/foo\".
\n"
+"
\n"
+"  Example, get a page that wants my name passed in a cookie:
\n"
+"
\n"
+"        curl -b \"name=Daniel\" www.sillypage.com
\n"
+"
\n"
+"  Curl also has the ability to use previously received cookies in following
\n"
+"  sessions. If you get cookies from a server and store them in a file in a
\n"
+"  manner similar to:
\n"
+"
\n"
+);
+ puts(
+"        curl --dump-header headers www.example.com
\n"
+"
\n"
+"  ... you can then in a second connect to that (or another) site, use the
\n"
+"  cookies from the 'headers' file like:
\n"
+"
\n"
+"        curl -b headers www.example.com
\n"
+"
\n"
+"  While saving headers to a file is a working way to store cookies, it is
\n"
+"  however error-prone and not the prefered way to do this. Instead, make curl
\n"
+"  save the incoming cookies using the well-known netscape cookie format like
\n"
+"  this:
\n"
+"
\n"
+);
+ puts(
+"        curl -c cookies.txt www.example.com
\n"
+"
\n"
+"  Note that by specifying -b you enable the \"cookie awareness\" and with -L
\n"
+"  you can make curl follow a location: (which often is used in combination
\n"
+"  with cookies). So that if a site sends cookies and a location, you can
\n"
+"  use a non-existing file to trigger the cookie awareness like:
\n"
+"
\n"
+"        curl -L -b empty.txt www.example.com
\n"
+"
\n"
+"  The file to read cookies from must be formatted using plain HTTP headers OR
\n"
+);
+ puts(
+"  as netscape's cookie file. Curl will determine what kind it is based on the
\n"
+"  file contents.  In the above command, curl will parse the header and store
\n"
+"  the cookies received from www.example.com.  curl will send to the server the
\n"
+"  stored cookies which match the request as it follows the location.  The
\n"
+"  file \"empty.txt\" may be a non-existant file.
\n"
+"
\n"
+"  Alas, to both read and write cookies from a netscape cookie file, you can
\n"
+"  set both -b and -c to use the same file:
\n"
+"
\n"
+);
+ puts(
+"        curl -b cookies.txt -c cookies.txt www.example.com
\n"
+"
\n"
+"PROGRESS METER
\n"
+"
\n"
+"  The progress meter exists to show a user that something actually is
\n"
+"  happening. The different fields in the output have the following meaning:
\n"
+"
\n"
+"  % Total    % Received % Xferd  Average Speed          Time             Curr.
\n"
+"                                 Dload  Upload Total    Current  Left    Speed
\n"
+"  0  151M    0 38608    0     0   9406      0  4:41:43  0:00:04  4:41:39  9287
\n"
+"
\n"
+"  From left-to-right:
\n"
+);
+ puts(
+"   %             - percentage completed of the whole transfer
\n"
+"   Total         - total size of the whole expected transfer
\n"
+"   %             - percentage completed of the download
\n"
+"   Received      - currently downloaded amount of bytes
\n"
+"   %             - percentage completed of the upload
\n"
+"   Xferd         - currently uploaded amount of bytes
\n"
+"   Average Speed
\n"
+"   Dload         - the average transfer speed of the download
\n"
+"   Average Speed
\n"
+);
+ puts(
+"   Upload        - the average transfer speed of the upload
\n"
+"   Time Total    - expected time to complete the operation
\n"
+"   Time Current  - time passed since the invoke
\n"
+"   Time Left     - expected time left to completetion
\n"
+"   Curr.Speed    - the average transfer speed the last 5 seconds (the first
\n"
+"                   5 seconds of a transfer is based on less time of course.)
\n"
+"
\n"
+"  The -# option will display a totally different progress bar that doesn't
\n"
+"  need much explanation!
\n"
+"
\n"
+"SPEED LIMIT
\n"
+);
+ puts(
+"
\n"
+"  Curl allows the user to set the transfer speed conditions that must be met
\n"
+"  to let the transfer keep going. By using the switch -y and -Y you
\n"
+"  can make curl abort transfers if the transfer speed is below the specified
\n"
+"  lowest limit for a specified time.
\n"
+"
\n"
+"  To have curl abort the download if the speed is slower than 3000 bytes per
\n"
+"  second for 1 minute, run:
\n"
+"
\n"
+"        curl -Y 3000 -y 60 www.far-away-site.com
\n"
+"
\n"
+);
+ puts(
+"  This can very well be used in combination with the overall time limit, so
\n"
+"  that the above operatioin must be completed in whole within 30 minutes:
\n"
+"
\n"
+"        curl -m 1800 -Y 3000 -y 60 www.far-away-site.com
\n"
+"
\n"
+"  Forcing curl not to transfer data faster than a given rate is also possible,
\n"
+"  which might be useful if you're using a limited bandwidth connection and you
\n"
+"  don't want your transfer to use all of it (sometimes referred to as
\n"
+"  \"bandwith throttle\").
\n"
+"
\n"
+);
+ puts(
+"  Make curl transfer data no faster than 10 kilobytes per second:
\n"
+"
\n"
+"        curl --limit-rate 10K www.far-away-site.com
\n"
+"
\n"
+"    or
\n"
+"
\n"
+"        curl --limit-rate 10240 www.far-away-site.com
\n"
+"
\n"
+"  Or prevent curl from uploading data faster than 1 megabyte per second:
\n"
+"
\n"
+"        curl -T upload --limit-rate 1M ftp://uploadshereplease.com
\n"
+"
\n"
+"  When using the --limit-rate option, the transfer rate is regulated on a
\n"
+"  per-second basis, which will cause the total transfer speed to become lower
\n"
+);
+ puts(
+"  than the given number. Sometimes of course substantially lower, if your
\n"
+"  transfer stalls during periods.
\n"
+"
\n"
+"CONFIG FILE
\n"
+"
\n"
+"  Curl automatically tries to read the .curlrc file (or _curlrc file on win32
\n"
+"  systems) from the user's home dir on startup.
\n"
+"
\n"
+"  The config file could be made up with normal command line switches, but you
\n"
+"  can also specify the long options without the dashes to make it more
\n"
+"  readable. You can separate the options and the parameter with spaces, or
\n"
+);
+ puts(
+"  with = or :. Comments can be used within the file. If the first letter on a
\n"
+"  line is a '#'-letter the rest of the line is treated as a comment.
\n"
+"
\n"
+"  If you want the parameter to contain spaces, you must inclose the entire
\n"
+"  parameter within double quotes (\"). Within those quotes, you specify a
\n"
+"  quote as \\\".
\n"
+"
\n"
+"  NOTE: You must specify options and their arguments on the same line.
\n"
+"
\n"
+"  Example, set default time out and proxy in a config file:
\n"
+"
\n"
+"        # We want a 30 minute timeout:
\n"
+);
+ puts(
+"        -m 1800
\n"
+"        # ... and we use a proxy for all accesses:
\n"
+"        proxy = proxy.our.domain.com:8080
\n"
+"
\n"
+"  White spaces ARE significant at the end of lines, but all white spaces
\n"
+"  leading up to the first characters of each line are ignored.
\n"
+"
\n"
+"  Prevent curl from reading the default file by using -q as the first command
\n"
+"  line parameter, like:
\n"
+"
\n"
+"        curl -q www.thatsite.com
\n"
+"
\n"
+"  Force curl to get and display a local help page in case it is invoked
\n"
+);
+ puts(
+"  without URL by making a config file similar to:
\n"
+"
\n"
+"        # default url to get
\n"
+"        url = \"http://help.with.curl.com/curlhelp.html\"
\n"
+"
\n"
+"  You can specify another config file to be read by using the -K/--config
\n"
+"  flag. If you set config file name to \"-\" it'll read the config from stdin,
\n"
+"  which can be handy if you want to hide options from being visible in process
\n"
+"  tables etc:
\n"
+"
\n"
+"        echo \"user = user:passwd\" | curl -K - http://that.secret.site.com
\n"
+"
\n"
+"EXTRA HEADERS
\n"
+"
\n"
+);
+ puts(
+"  When using curl in your own very special programs, you may end up needing
\n"
+"  to pass on your own custom headers when getting a web page. You can do
\n"
+"  this by using the -H flag.
\n"
+"
\n"
+"  Example, send the header \"X-you-and-me: yes\" to the server when getting a
\n"
+"  page:
\n"
+"
\n"
+"        curl -H \"X-you-and-me: yes\" www.love.com
\n"
+"
\n"
+"  This can also be useful in case you want curl to send a different text in a
\n"
+"  header than it normally does. The -H header you specify then replaces the
\n"
+);
+ puts(
+"  header curl would normally send. If you replace an internal header with an
\n"
+"  empty one, you prevent that header from being sent. To prevent the Host:
\n"
+"  header from being used:
\n"
+"
\n"
+"        curl -H \"Host:\" www.server.com
\n"
+"
\n"
+"FTP and PATH NAMES
\n"
+"
\n"
+"  Do note that when getting files with the ftp:// URL, the given path is
\n"
+"  relative the directory you enter. To get the file 'README' from your home
\n"
+"  directory at your ftp site, do:
\n"
+"
\n"
+"        curl ftp://user:passwd@my.site.com/README
\n"
+"
\n"
+);
+ puts(
+"  But if you want the README file from the root directory of that very same
\n"
+"  site, you need to specify the absolute file name:
\n"
+"
\n"
+"        curl ftp://user:passwd@my.site.com//README
\n"
+"
\n"
+"  (I.e with an extra slash in front of the file name.)
\n"
+"
\n"
+"FTP and firewalls
\n"
+"
\n"
+"  The FTP protocol requires one of the involved parties to open a second
\n"
+"  connction as soon as data is about to get transfered. There are two ways to
\n"
+"  do this.
\n"
+"
\n"
+);
+ puts(
+"  The default way for curl is to issue the PASV command which causes the
\n"
+"  server to open another port and await another connection performed by the
\n"
+"  client. This is good if the client is behind a firewall that don't allow
\n"
+"  incoming connections.
\n"
+"
\n"
+"        curl ftp.download.com
\n"
+"
\n"
+"  If the server for example, is behind a firewall that don't allow connections
\n"
+"  on other ports than 21 (or if it just doesn't support the PASV command), the
\n"
+);
+ puts(
+"  other way to do it is to use the PORT command and instruct the server to
\n"
+"  connect to the client on the given (as parameters to the PORT command) IP
\n"
+"  number and port.
\n"
+"
\n"
+"  The -P flag to curl supports a few different options. Your machine may have
\n"
+"  several IP-addresses and/or network interfaces and curl allows you to select
\n"
+"  which of them to use. Default address can also be used:
\n"
+"
\n"
+"        curl -P - ftp.download.com
\n"
+"
\n"
+);
+ puts(
+"  Download with PORT but use the IP address of our 'le0' interface (this does
\n"
+"  not work on windows):
\n"
+"
\n"
+"        curl -P le0 ftp.download.com
\n"
+"
\n"
+"  Download with PORT but use 192.168.0.10 as our IP address to use:
\n"
+"
\n"
+"        curl -P 192.168.0.10 ftp.download.com
\n"
+"
\n"
+"NETWORK INTERFACE
\n"
+"
\n"
+"  Get a web page from a server using a specified port for the interface:
\n"
+"
\n"
+"	curl --interface eth0:1 http://www.netscape.com/
\n"
+"
\n"
+"  or
\n"
+"
\n"
+"	curl --interface 192.168.1.10 http://www.netscape.com/
\n"
+"
\n"
+"HTTPS
\n"
+"
\n"
+);
+ puts(
+"  Secure HTTP requires SSL libraries to be installed and used when curl is
\n"
+"  built. If that is done, curl is capable of retrieving and posting documents
\n"
+"  using the HTTPS procotol.
\n"
+"
\n"
+"  Example:
\n"
+"
\n"
+"        curl https://www.secure-site.com
\n"
+"
\n"
+"  Curl is also capable of using your personal certificates to get/post files
\n"
+"  from sites that require valid certificates. The only drawback is that the
\n"
+"  certificate needs to be in PEM-format. PEM is a standard and open format to
\n"
+);
+ puts(
+"  store certificates with, but it is not used by the most commonly used
\n"
+"  browsers (Netscape and MSIE both use the so called PKCS#12 format). If you
\n"
+"  want curl to use the certificates you use with your (favourite) browser, you
\n"
+"  may need to download/compile a converter that can convert your browser's
\n"
+"  formatted certificates to PEM formatted ones. This kind of converter is
\n"
+"  included in recent versions of OpenSSL, and for older versions Dr Stephen
\n"
+);
+ puts(
+"  N. Henson has written a patch for SSLeay that adds this functionality. You
\n"
+"  can get his patch (that requires an SSLeay installation) from his site at:
\n"
+"  http://www.drh-consultancy.demon.co.uk/
\n"
+"
\n"
+"  Example on how to automatically retrieve a document using a certificate with
\n"
+"  a personal password:
\n"
+"
\n"
+"        curl -E /path/to/cert.pem:password https://secure.site.com/
\n"
+"
\n"
+"  If you neglect to specify the password on the command line, you will be
\n"
+);
+ puts(
+"  prompted for the correct password before any data can be received.
\n"
+"
\n"
+"  Many older SSL-servers have problems with SSLv3 or TLS, that newer versions
\n"
+"  of OpenSSL etc is using, therefore it is sometimes useful to specify what
\n"
+"  SSL-version curl should use. Use -3, -2 or -1 to specify that exact SSL
\n"
+"  version to use (for SSLv3, SSLv2 or TLSv1 respectively):
\n"
+"
\n"
+"        curl -2 https://secure.site.com/
\n"
+"
\n"
+"  Otherwise, curl will first attempt to use v3 and then v2.
\n"
+"
\n"
+);
+ puts(
+"  To use OpenSSL to convert your favourite browser's certificate into a PEM
\n"
+"  formatted one that curl can use, do something like this (assuming netscape,
\n"
+"  but IE is likely to work similarly):
\n"
+"
\n"
+"    You start with hitting the 'security' menu button in netscape. 
\n"
+"
\n"
+"    Select 'certificates->yours' and then pick a certificate in the list 
\n"
+"
\n"
+"    Press the 'export' button 
\n"
+"
\n"
+"    enter your PIN code for the certs 
\n"
+"
\n"
+"    select a proper place to save it 
\n"
+"
\n"
+);
+ puts(
+"    Run the 'openssl' application to convert the certificate. If you cd to the
\n"
+"    openssl installation, you can do it like:
\n"
+"
\n"
+"     # ./apps/openssl pkcs12 -in [file you saved] -clcerts -out [PEMfile]
\n"
+"
\n"
+"
\n"
+"RESUMING FILE TRANSFERS
\n"
+"
\n"
+" To continue a file transfer where it was previously aborted, curl supports
\n"
+" resume on http(s) downloads as well as ftp uploads and downloads.
\n"
+"
\n"
+" Continue downloading a document:
\n"
+"
\n"
+"        curl -C - -o file ftp://ftp.server.com/path/file
\n"
+"
\n"
+);
+ puts(
+" Continue uploading a document(*1):
\n"
+"
\n"
+"        curl -C - -T file ftp://ftp.server.com/path/file
\n"
+"
\n"
+" Continue downloading a document from a web server(*2):
\n"
+"
\n"
+"        curl -C - -o file http://www.server.com/
\n"
+"
\n"
+" (*1) = This requires that the ftp server supports the non-standard command
\n"
+"        SIZE. If it doesn't, curl will say so.
\n"
+"
\n"
+" (*2) = This requires that the web server supports at least HTTP/1.1. If it
\n"
+"        doesn't, curl will say so.
\n"
+"
\n"
+"TIME CONDITIONS
\n"
+"
\n"
+);
+ puts(
+" HTTP allows a client to specify a time condition for the document it
\n"
+" requests. It is If-Modified-Since or If-Unmodified-Since. Curl allow you to
\n"
+" specify them with the -z/--time-cond flag.
\n"
+"
\n"
+" For example, you can easily make a download that only gets performed if the
\n"
+" remote file is newer than a local copy. It would be made like:
\n"
+"
\n"
+"        curl -z local.html http://remote.server.com/remote.html
\n"
+"
\n"
+" Or you can download a file only if the local file is newer than the remote
\n"
+);
+ puts(
+" one. Do this by prepending the date string with a '-', as in:
\n"
+"
\n"
+"        curl -z -local.html http://remote.server.com/remote.html
\n"
+"
\n"
+" You can specify a \"free text\" date as condition. Tell curl to only download
\n"
+" the file if it was updated since yesterday:
\n"
+"
\n"
+"        curl -z yesterday http://remote.server.com/remote.html
\n"
+"
\n"
+" Curl will then accept a wide range of date formats. You always make the date
\n"
+" check the other way around by prepending it with a dash '-'.
\n"
+"
\n"
+"DICT
\n"
+"
\n"
+"  For fun try
\n"
+"
\n"
+);
+ puts(
+"        curl dict://dict.org/m:curl
\n"
+"        curl dict://dict.org/d:heisenbug:jargon
\n"
+"        curl dict://dict.org/d:daniel:web1913
\n"
+"
\n"
+"  Aliases for 'm' are 'match' and 'find', and aliases for 'd' are 'define'
\n"
+"  and 'lookup'. For example,
\n"
+"
\n"
+"        curl dict://dict.org/find:curl
\n"
+"
\n"
+"  Commands that break the URL description of the RFC (but not the DICT
\n"
+"  protocol) are
\n"
+"
\n"
+"        curl dict://dict.org/show:db
\n"
+"        curl dict://dict.org/show:strat
\n"
+"
\n"
+);
+ puts(
+"  Authentication is still missing (but this is not required by the RFC)
\n"
+"
\n"
+"LDAP
\n"
+"
\n"
+"  If you have installed the OpenLDAP library, curl can take advantage of it
\n"
+"  and offer ldap:// support.
\n"
+"
\n"
+"  LDAP is a complex thing and writing an LDAP query is not an easy task. I do
\n"
+"  advice you to dig up the syntax description for that elsewhere. Two places
\n"
+"  that might suit you are:
\n"
+"
\n"
+"  Netscape's \"Netscape Directory SDK 3.0 for C Programmer's Guide Chapter 10:
\n"
+"  Working with LDAP URLs\":
\n"
+);
+ puts(
+"  http://developer.netscape.com/docs/manuals/dirsdk/csdk30/url.htm
\n"
+"
\n"
+"  RFC 2255, \"The LDAP URL Format\" http://www.rfc-editor.org/rfc/rfc2255.txt
\n"
+"
\n"
+"  To show you an example, this is now I can get all people from my local LDAP
\n"
+"  server that has a certain sub-domain in their email address:
\n"
+"
\n"
+"        curl -B \"ldap://ldap.frontec.se/o=frontec??sub?mail=*sth.frontec.se\"
\n"
+"
\n"
+"  If I want the same info in HTML format, I can get it by not using the -B
\n"
+"  (enforce ASCII) flag.
\n"
+"
\n"
+"ENVIRONMENT VARIABLES
\n"
+);
+ puts(
+"
\n"
+"  Curl reads and understands the following environment variables:
\n"
+"
\n"
+"        http_proxy, HTTPS_PROXY, FTP_PROXY, GOPHER_PROXY
\n"
+"
\n"
+"  They should be set for protocol-specific proxies. General proxy should be
\n"
+"  set with
\n"
+"        
\n"
+"        ALL_PROXY
\n"
+"
\n"
+"  A comma-separated list of host names that shouldn't go through any proxy is
\n"
+"  set in (only an asterisk, '*' matches all hosts)
\n"
+"
\n"
+"        NO_PROXY
\n"
+"
\n"
+"  If a tail substring of the domain-path for a host matches one of these
\n"
+);
+ puts(
+"  strings, transactions with that node will not be proxied.
\n"
+"
\n"
+"
\n"
+"  The usage of the -x/--proxy flag overrides the environment variables.
\n"
+"
\n"
+"NETRC
\n"
+"
\n"
+"  Unix introduced the .netrc concept a long time ago. It is a way for a user
\n"
+"  to specify name and password for commonly visited ftp sites in a file so
\n"
+"  that you don't have to type them in each time you visit those sites. You
\n"
+"  realize this is a big security risk if someone else gets hold of your
\n"
+);
+ puts(
+"  passwords, so therefor most unix programs won't read this file unless it is
\n"
+"  only readable by yourself (curl doesn't care though).
\n"
+"
\n"
+"  Curl supports .netrc files if told so (using the -n/--netrc and
\n"
+"  --netrc-optional options). This is not restricted to only ftp,
\n"
+"  but curl can use it for all protocols where authentication is used.
\n"
+"
\n"
+"  A very simple .netrc file could look something like:
\n"
+"
\n"
+"        machine curl.haxx.se login iamdaniel password mysecret
\n"
+"
\n"
+"CUSTOM OUTPUT
\n"
+"
\n"
+);
+ puts(
+"  To better allow script programmers to get to know about the progress of
\n"
+"  curl, the -w/--write-out option was introduced. Using this, you can specify
\n"
+"  what information from the previous transfer you want to extract.
\n"
+"
\n"
+"  To display the amount of bytes downloaded together with some text and an
\n"
+"  ending newline:
\n"
+"
\n"
+"        curl -w 'We downloaded %{size_download} bytes\\n' www.download.com
\n"
+"
\n"
+"KERBEROS4 FTP TRANSFER
\n"
+"
\n"
+"  Curl supports kerberos4 for FTP transfers. You need the kerberos package
\n"
+);
+ puts(
+"  installed and used at curl build time for it to be used.
\n"
+"
\n"
+"  First, get the krb-ticket the normal way, like with the kauth tool. Then use
\n"
+"  curl in way similar to:
\n"
+"
\n"
+"        curl --krb4 private ftp://krb4site.com -u username:fakepwd
\n"
+"
\n"
+"  There's no use for a password on the -u switch, but a blank one will make
\n"
+"  curl ask for one and you already entered the real password to kauth.
\n"
+"
\n"
+"TELNET
\n"
+"
\n"
+"  The curl telnet support is basic and very easy to use. Curl passes all data
\n"
+);
+ puts(
+"  passed to it on stdin to the remote server. Connect to a remote telnet
\n"
+"  server using a command line similar to:
\n"
+"
\n"
+"        curl telnet://remote.server.com
\n"
+"
\n"
+"  And enter the data to pass to the server on stdin. The result will be sent
\n"
+"  to stdout or to the file you specify with -o.
\n"
+"
\n"
+"  You might want the -N/--no-buffer option to switch off the buffered output
\n"
+"  for slow connections or similar.
\n"
+"
\n"
+"  Pass options to the telnet protocol negotiation, by using the -t option. To
\n"
+);
+ puts(
+"  tell the server we use a vt100 terminal, try something like:
\n"
+"
\n"
+"        curl -tTTYPE=vt100 telnet://remote.server.com
\n"
+"
\n"
+"  Other interesting options for it -t include:
\n"
+"
\n"
+"   - XDISPLOC=<X display> Sets the X display location.
\n"
+"
\n"
+"   - NEW_ENV=<var,val> Sets an environment variable.
\n"
+"
\n"
+"  NOTE: the telnet protocol does not specify any way to login with a specified
\n"
+"  user and password so curl can't do that automatically. To do that, you need
\n"
+);
+ puts(
+"  to track when the login prompt is received and send the username and
\n"
+"  password accordingly.
\n"
+"
\n"
+"PERSISTANT CONNECTIONS
\n"
+"
\n"
+"  Specifying multiple files on a single command line will make curl transfer
\n"
+"  all of them, one after the other in the specified order.
\n"
+"
\n"
+"  libcurl will attempt to use persistant connections for the transfers so that
\n"
+"  the second transfer to the same host can use the same connection that was
\n"
+"  already initiated and was left open in the previous transfer. This greatly
\n"
+);
+ puts(
+"  decreases connection time for all but the first transfer and it makes a far
\n"
+"  better use of the network.
\n"
+"
\n"
+"  Note that curl cannot use persistant connections for transfers that are used
\n"
+"  in subsequence curl invokes. Try to stuff as many URLs as possible on the
\n"
+"  same command line if they are using the same host, as that'll make the
\n"
+"  transfers faster. If you use a http proxy for file transfers, practicly
\n"
+"  all transfers will be persistant.
\n"
+"
\n"
+);
+ puts(
+"  Persistant connections were introduced in curl 7.7.
\n"
+"
\n"
+"MAILING LISTS
\n"
+"
\n"
+"  For your convenience, we have several open mailing lists to discuss curl,
\n"
+"  its development and things relevant to this. Get all info at
\n"
+"  http://curl.haxx.se/mail/. The lists available are:
\n"
+"
\n"
+"  curl-users
\n"
+"
\n"
+"    Users of the command line tool. How to use it, what doesn't work, new
\n"
+"    features, related tools, questions, news, installations, compilations,
\n"
+"    running, porting etc.
\n"
+"
\n"
+"  curl-library
\n"
+"
\n"
+);
+ puts(
+"    Developers using or developing libcurl. Bugs, extensions, improvements.
\n"
+"
\n"
+"  curl-announce
\n"
+"
\n"
+"    Low-traffic. Only announcements of new public versions.
\n"
+"
\n"
+"  curl-and-PHP
\n"
+"
\n"
+"    Using the curl functions in PHP. Everything curl with a PHP angle. Or PHP
\n"
+"    with a curl angle.
\n"
+"
\n"
+"  curl-commits
\n"
+"
\n"
+"    Receives notifications on all CVS commits done to the curl source module.
\n"
+"    This can become quite a large amount of mails during intense development,
\n"
+);
+ puts(
+"    be aware. This is for us who like email...
\n"
+"
\n"
+"  curl-www-commits
\n"
+"
\n"
+"    Receives notifications on all CVS commits done to the curl www module
\n"
+"    (basicly the web site).  This can become quite a large amount of mails
\n"
+"    during intense changing, be aware. This is for us who like email...
\n"
+"
\n"
+"  Please direct curl questions, feature requests and trouble reports to one of
\n"
+"  these mailing lists instead of mailing any individual.
\n"
+ ) ;
+}
diff --git a/main/source/curl/src/main.c b/main/source/curl/src/main.c
new file mode 100644
index 00000000..246d2b7f
--- /dev/null
+++ b/main/source/curl/src/main.c
@@ -0,0 +1,3209 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: main.c,v 1.173 2003/05/12 12:45:57 bagder Exp $
+ ***************************************************************************/
+
+/* This is now designed to have its own local setup.h */
+#include "setup.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <ctype.h>
+#include <errno.h>
+
+#include <curl/curl.h>
+
+#define _MPRINTF_REPLACE /* we want curl-functions instead of native ones */
+#include <curl/mprintf.h>
+
+#include "urlglob.h"
+#include "writeout.h"
+#ifdef USE_ENVIRONMENT
+#include "writeenv.h"
+#endif
+
+#define CURLseparator	"--_curl_--"
+
+#if defined(WIN32)&&!defined(__CYGWIN32__)
+#include <winsock.h>
+#endif
+
+#include "version.h"
+
+#ifdef HAVE_IO_H /* typical win32 habit */
+#include <io.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
+#ifdef HAVE_UTIME_H
+#include <utime.h>
+#else
+#ifdef HAVE_SYS_UTIME_H
+#include <sys/utime.h>
+#endif
+
+#endif
+
+#ifdef HAVE_SYS_POLL_H
+#include <sys/poll.h>
+#endif
+
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+/* this is low-level hard-hacking memory leak tracking shit */
+#include "../lib/memdebug.h"
+#endif
+
+#define DEFAULT_MAXREDIRS  50L
+
+#ifndef __cplusplus        /* (rabe) */
+#ifndef typedef_bool
+typedef char bool;
+#endif
+#endif                     /* (rabe) */
+
+#define CURL_PROGRESS_STATS 0 /* default progress display */
+#define CURL_PROGRESS_BAR   1
+
+typedef enum {
+  HTTPREQ_UNSPEC,
+  HTTPREQ_GET,
+  HTTPREQ_HEAD,
+  HTTPREQ_POST,
+  HTTPREQ_SIMPLEPOST,
+  HTTPREQ_CUSTOM,
+  HTTPREQ_LAST
+} HttpReq;
+
+/* Just a set of bits */
+#define CONF_DEFAULT  0
+
+#define CONF_AUTO_REFERER (1<<4) /* the automatic referer-system please! */
+#define CONF_VERBOSE  (1<<5) /* talk a lot */
+#define CONF_HEADER   (1<<8) /* throw the header out too */
+#define CONF_NOPROGRESS (1<<10) /* shut off the progress meter */
+#define CONF_NOBODY   (1<<11) /* use HEAD to get http document */
+#define CONF_FAILONERROR (1<<12) /* no output on http error codes >= 300 */
+#define CONF_UPLOAD   (1<<14) /* this is an upload */
+#define CONF_FTPLISTONLY (1<<16) /* Use NLST when listing ftp dir */
+#define CONF_FTPAPPEND (1<<20) /* Append instead of overwrite on upload! */
+#define CONF_NETRC    (1<<22)  /* read user+password from .netrc */
+#define CONF_FOLLOWLOCATION (1<<23) /* use Location: Luke! */
+#define CONF_GETTEXT  (1<<24) /* use ASCII/text for transfer */
+#define CONF_HTTPPOST (1<<25) /* multipart/form-data HTTP POST */
+
+#define CONF_MUTE     (1<<28) /* force NOPROGRESS */
+
+#define CONF_NETRC_OPT (1<<29)  /* read user+password from either
+                                 * .netrc or URL*/
+#define CONF_UNRESTRICTED_AUTH (1<<30)
+/* Send authentication (user+password) when following
+ * locations, even when hostname changed */
+
+#ifndef HAVE_STRDUP
+/* Ultrix doesn't have strdup(), so make a quick clone: */
+char *strdup(char *str)
+{
+  int len;
+  char *newstr;
+
+  len = strlen(str);
+  newstr = (char *) malloc((len+1)*sizeof(char));
+  if (!newstr)
+    return (char *)NULL;
+
+  strcpy(newstr,str);
+
+  return newstr;
+
+}
+#endif 
+
+#ifdef WIN32
+#include <direct.h>
+#define F_OK 0
+#define mkdir(x,y) (mkdir)(x)
+#endif
+
+#ifdef	VMS
+int	vms_show = 0;
+#define	FAC_CURL	0xC01
+#define	FAC_SYSTEM	0
+#define	MSG_NORMAL	0
+#define	VMS_STS(c,f,e,s) (((c&0xF)<<28)|((f&0xFFF)<<16)|((e&0x1FFF)<3)|(s&7))
+#define	VMSSTS_HIDE	VMS_STS(1,0,0,0)
+#define	SEV_WARNING	0
+#define	SEV_SUCCESS	1
+#define	SEV_ERROR	2
+#define	SEV_INFO	3	/* success, with an extra hint */
+#define	SEV_FATAL	4
+globalvalue int  CURL_UNSUPPROTO;		/* these are from curlmsg.msg file..... */
+globalvalue int  CURL_FAILINIT;
+globalvalue int  CURL_BADURLSYN;
+globalvalue int  CURL_BADURLUSER;
+globalvalue int  CURL_BADPROXY;
+globalvalue int  CURL_BADHOST;
+globalvalue int  CURL_FAILHOST;
+globalvalue int  CURL_FTPUNKREPLY;
+globalvalue int  CURL_FTPNOACC;
+globalvalue int  CURL_FTPUSRPW;
+globalvalue int  CURL_FTPBADPASS;
+globalvalue int  CURL_FTPBADUSER;
+globalvalue int  CURL_FTPBADPASV;
+globalvalue int  CURL_FTPBAD227;
+globalvalue int  CURL_FTPBADHOST227;
+globalvalue int  CURL_FTPNORECONN;
+globalvalue int  CURL_FTPNOBIN;
+globalvalue int  CURL_PARTIALFILE;
+globalvalue int  CURL_FTPNORETR;
+globalvalue int  CURL_FTPWRITERR;
+globalvalue int  CURL_FTPNOQUOTE;
+globalvalue int  CURL_HTTPPNF;
+globalvalue int  CURL_WRITERR;
+globalvalue int  CURL_BADUSER;
+globalvalue int  CURL_FTPNOSTOR;
+globalvalue int  CURL_READERR;
+globalvalue int  CURL_OUTOFMEM;
+globalvalue int  CURL_TIMEOUT;
+globalvalue int  CURL_FTPNOASCII;
+globalvalue int  CURL_FTPNOPORT;
+globalvalue int  CURL_FTPNOREST;
+globalvalue int  CURL_FTPNOSIZE;
+globalvalue int  CURL_HTTPRNGERR;
+globalvalue int  CURL_HTTPPOSTERR;
+globalvalue int  CURL_SSLNOCONN;
+globalvalue int  CURL_FTPBADRESUME;
+globalvalue int  CURL_FILENOACC;
+globalvalue int  CURL_LDAPNOBIND;
+globalvalue int  CURL_LDAPNOSRCH;
+globalvalue int  CURL_LDAPNOLIB;
+globalvalue int  CURL_LDAPNOFUNC;
+globalvalue int  CURL_ABORTCB;
+globalvalue int  CURL_BADPARAM;
+globalvalue int  CURL_BADORDER;
+globalvalue int  CURL_BADPWD;
+globalvalue int  CURL_MNYREDIR;
+globalvalue int  CURL_UNKTELNET;
+globalvalue int  CURL_UNKMSG;
+globalvalue int  CURL_BADSSLCERT;
+globalvalue int  CURL_SRVNOERR;
+globalvalue int  CURL_MAXMSG;
+long	vms_cond[] = {
+	VMS_STS(1,FAC_SYSTEM,MSG_NORMAL,SEV_SUCCESS),
+	CURL_UNSUPPROTO,		/* these are from curlmsg.msg file..... */
+	CURL_FAILINIT,
+	CURL_BADURLSYN,
+	CURL_BADURLUSER,
+	CURL_BADPROXY,
+	CURL_BADHOST,
+	CURL_FAILHOST,
+	CURL_FTPUNKREPLY,
+	CURL_FTPNOACC,
+	CURL_FTPUSRPW,
+	CURL_FTPBADPASS,
+	CURL_FTPBADUSER,
+	CURL_FTPBADPASV,
+	CURL_FTPBAD227,
+	CURL_FTPBADHOST227,
+	CURL_FTPNORECONN,
+	CURL_FTPNOBIN,
+	CURL_PARTIALFILE,
+	CURL_FTPNORETR,
+	CURL_FTPWRITERR,
+	CURL_FTPNOQUOTE,
+	CURL_HTTPPNF,
+	CURL_WRITERR,
+	CURL_BADUSER,
+	CURL_FTPNOSTOR,
+	CURL_READERR,
+	CURL_OUTOFMEM,
+	CURL_TIMEOUT,
+	CURL_FTPNOASCII,
+	CURL_FTPNOPORT,
+	CURL_FTPNOREST,
+	CURL_FTPNOSIZE,
+	CURL_HTTPRNGERR,
+	CURL_HTTPPOSTERR,
+	CURL_SSLNOCONN,
+	CURL_FTPBADRESUME,
+	CURL_FILENOACC,
+	CURL_LDAPNOBIND,
+	CURL_LDAPNOSRCH,
+	CURL_LDAPNOLIB,
+	CURL_LDAPNOFUNC,
+	CURL_ABORTCB,
+	CURL_BADPARAM,
+	CURL_BADORDER,
+	CURL_BADPWD,
+	CURL_MNYREDIR,
+	CURL_UNKTELNET,
+	CURL_UNKMSG,
+	CURL_BADSSLCERT,
+	CURL_SRVNOERR,
+	CURL_MAXMSG
+};
+#endif
+
+extern void hugehelp(void);
+
+/*
+ * This is the main global constructor for the app. Call this before
+ * _any_ libcurl usage. If this fails, *NO* libcurl functions may be
+ * used, or havoc may be the result.
+ */
+CURLcode main_init(void)
+{
+  return curl_global_init(CURL_GLOBAL_DEFAULT);
+}
+
+/*
+ * This is the main global destructor for the app. Call this after
+ * _all_ libcurl usage is done.
+ */
+void main_free(void)
+{
+  curl_global_cleanup();
+}
+
+int SetHTTPrequest(HttpReq req, HttpReq *store)
+{
+  if((*store == HTTPREQ_UNSPEC) ||
+     (*store == req)) {
+    *store = req;
+    return 0;
+  }
+  fprintf(stderr, "You can only select one HTTP request!\n");
+  return 1;
+}
+
+static void helpf(const char *fmt, ...)
+{
+  va_list ap;
+  if(fmt) {
+    va_start(ap, fmt);
+    fputs("curl: ", stderr); /* prefix it */
+    vfprintf(stderr, fmt, ap);
+    va_end(ap);
+  }
+  fprintf(stderr, "curl: try 'curl --help' for more information\n");
+}
+
+/*
+ * A chain of these nodes contain URL to get and where to put the URL's
+ * contents.
+ */
+struct getout {
+  struct getout *next;
+  char *url;
+  char *outfile;
+  int flags;
+};
+#define GETOUT_OUTFILE (1<<0) /* set when outfile is deemed done */
+#define GETOUT_URL     (1<<1) /* set when URL is deemed done */
+#define GETOUT_USEREMOTE (1<<2) /* use remote file name locally */
+
+static void help(void)
+{
+  printf(CURL_ID "%s\n"
+       "Usage: curl [options...] <url>\n"
+       "Options: (H) means HTTP/HTTPS only, (F) means FTP only\n"
+       " -a/--append        Append to target file when uploading (F)\n"
+       " -A/--user-agent <string> User-Agent to send to server (H)\n"
+       " -b/--cookie <name=string/file> Cookie string or file to read cookies from (H)\n"
+       " -B/--use-ascii     Use ASCII/text transfer\n",
+         curl_version());
+  puts(" -c/--cookie-jar <file> Write all cookies to this file after operation (H)\n"
+       " -C/--continue-at <offset> Specify absolute resume offset\n"
+       " -d/--data <data>   HTTP POST data (H)\n"
+       "    --data-ascii <data>   HTTP POST ASCII data (H)\n"
+       "    --data-binary <data>  HTTP POST binary data (H)");
+  puts("    --disable-eprt  Prevents curl from using EPRT or LPRT (F)\n"
+       "    --disable-epsv  Prevents curl from using EPSV (F)\n"
+       " -D/--dump-header <file> Write the headers to this file\n"
+       "    --egd-file <file> EGD socket path for random data (SSL)\n"
+#ifdef USE_ENVIRONMENT
+       "    --environment   Write result codes to environment variables (RISC OS)\n"
+#endif
+       " -e/--referer       Referer page (H)");
+  puts(" -E/--cert <cert[:passwd]> Specifies your certificate file and password (HTTPS)\n"
+       "    --cert-type <type> Specifies certificate file type (DER/PEM/ENG) (HTTPS)\n"
+       "    --key <key>     Specifies private key file (HTTPS)\n"
+       "    --key-type <type> Specifies private key  file type (DER/PEM/ENG) (HTTPS)\n"
+       "    --pass  <pass>  Specifies passphrase for the private key (HTTPS)");
+  puts("    --engine <eng>  Specifies the crypto engine to use (HTTPS)\n"
+       "    --cacert <file> CA certificate to verify peer against (SSL)\n"
+       "    --capath <directory> CA directory (made using c_rehash) to verify\n"
+       "                    peer against (SSL)\n"
+       "    --ciphers <list> What SSL ciphers to use (SSL)\n"
+       "    --compressed    Request a compressed response (using deflate or gzip).");
+  puts("    --connect-timeout <seconds> Maximum time allowed for connection\n"
+       "    --create-dirs   Create the necessary local directory hierarchy\n"
+       "    --crlf          Convert LF to CRLF in upload. Useful for MVS (OS/390)\n"
+       " -f/--fail          Fail silently (no output at all) on errors (H)\n"
+       " -F/--form <name=content> Specify HTTP POST data (H)\n"
+       " -g/--globoff       Disable URL sequences and ranges using {} and []\n"
+       " -G/--get           Send the -d data with a HTTP GET (H)");
+  puts(" -h/--help          This help text\n"
+       " -H/--header <line> Custom header to pass to server. (H)\n"
+       " -i/--include       Include the HTTP-header in the output (H)\n"
+       " -I/--head          Fetch document info only (HTTP HEAD/FTP SIZE)");
+  puts(" -j/--junk-session-cookies Ignore session cookies read from file (H)\n"
+       "    --interface <interface> Specify the interface to be used\n"
+       "    --krb4 <level>  Enable krb4 with specified security level (F)\n"
+       " -k/--insecure      Allow curl to connect to SSL sites without certs (H)\n"
+       " -K/--config        Specify which config file to read\n"
+       " -l/--list-only     List only names of an FTP directory (F)\n"
+       "    --limit-rate <rate> Limit how fast transfers to allow");
+  puts(" -L/--location      Follow Location: hints (H)\n"
+       "    --location-trusted Same, and continue to send authentication when \n"
+       "                    following locations, even when hostname changed\n"
+       " -m/--max-time <seconds> Maximum time allowed for the transfer\n"
+       " -M/--manual        Display huge help text\n"
+       " -n/--netrc         Must read .netrc for user name and password\n"
+       "    --netrc-optional  Use either .netrc or URL; overrides -n\n"
+       " -N/--no-buffer     Disables the buffering of the output stream");
+  puts(" -o/--output <file> Write output to <file> instead of stdout\n"
+       " -O/--remote-name   Write output to a file named as the remote file\n"
+       " -p/--proxytunnel   Perform non-HTTP services through a HTTP proxy\n"
+       " -P/--ftpport <address> Use PORT with address instead of PASV when ftping (F)\n"
+       " -q                 When used as the first parameter disables .curlrc\n"
+       " -Q/--quote <cmd>   Send QUOTE command to FTP before file transfer (F)");
+  puts(" -r/--range <range> Retrieve a byte range from a HTTP/1.1 or FTP server\n"
+       " -R/--remote-time   Set the remote file's time on the local output\n"
+       " -s/--silent        Silent mode. Don't output anything\n"
+       " -S/--show-error    Show error. With -s, make curl show errors when they occur");
+  puts("    --stderr <file> Where to redirect stderr. - means stdout.\n"
+       " -t/--telnet-option <OPT=val> Set telnet option\n"
+       "    --trace <file>  Dump a network/debug trace to the given file\n"
+       "    --trace-ascii <file>  Like --trace but without the hex output\n"
+       " -T/--upload-file <file> Transfer/upload <file> to remote site\n"
+       "    --url <URL>     Another way to specify URL to work with");
+  puts(" -u/--user <user[:password]> Specify user and password to use\n"
+       "                    Overrides -n and --netrc-optional\n"
+       " -U/--proxy-user <user[:password]> Specify Proxy authentication\n"
+       " -v/--verbose       Makes the operation more talkative\n"
+       " -V/--version       Outputs version number then quits");
+  puts(" -w/--write-out [format] What to output after completion\n"
+       " -x/--proxy <host[:port]>  Use proxy. (Default port is 1080)\n"
+       "    --random-file <file> File to use for reading random data from (SSL)\n"
+       " -X/--request <command> Specific request command to use");
+  puts(" -y/--speed-time    Time needed to trig speed-limit abort. Defaults to 30\n"
+       " -Y/--speed-limit   Stop transfer if below speed-limit for 'speed-time' secs\n"
+       " -z/--time-cond <time> Includes a time condition to the server (H)\n"
+       " -Z/--max-redirs <num> Set maximum number of redirections allowed (H)\n"
+       " -0/--http1.0       Force usage of HTTP 1.0 (H)\n"
+       " -1/--tlsv1         Force usage of TLSv1 (H)\n"
+       " -2/--sslv2         Force usage of SSLv2 (H)\n"
+       " -3/--sslv3         Force usage of SSLv3 (H)");
+  puts(" -#/--progress-bar  Display transfer progress as a progress bar");
+}
+
+struct LongShort {
+  const char *letter;
+  const char *lname;
+  bool extraparam;
+};
+
+struct Configurable {
+  bool remote_time;
+  char *random_file;
+  char *egd_file;
+  char *useragent;
+  char *cookie;     /* single line with specified cookies */
+  char *cookiejar;  /* write to this file */
+  char *cookiefile; /* read from this file */
+  bool cookiesession; /* new session? */
+  bool encoding;    /* Accept-Encoding please */
+  bool use_resume;
+  bool resume_from_current;
+  bool disable_epsv;
+  bool disable_eprt;
+  int resume_from;
+  char *postfields;
+  long postfieldsize;
+  char *referer;
+  long timeout;
+  long connecttimeout;
+  long maxredirs;
+  char *headerfile;
+  char *ftpport;
+  char *iface;
+  unsigned short porttouse;
+  char *range;
+  int low_speed_limit;
+  int low_speed_time;
+  bool showerror;
+  char *infile;
+  char *userpwd;
+  char *proxyuserpwd;
+  char *proxy;
+  bool configread;
+  bool proxytunnel;
+  long conf;
+
+  struct getout *url_list; /* point to the first node */
+  struct getout *url_last; /* point to the last/current node */
+
+  struct getout *url_get;  /* point to the node to fill in URL */
+  struct getout *url_out;  /* point to the node to fill in outfile */
+
+  char *cipher_list;
+  char *cert;
+  char *cert_type;
+  char *cacert;
+  char *capath;
+  char *key;
+  char *key_type;
+  char *key_passwd;
+  char *engine;
+  bool crlf;
+  char *customrequest;
+  char *krb4level;
+  char *trace_dump; /* file to dump the network trace to, or NULL */
+  FILE *trace_stream;
+  bool trace_fopened;
+  bool trace_ascii;
+
+  long httpversion;
+  bool progressmode;
+  bool nobuffer;
+  bool globoff;
+  bool use_httpget;
+  bool insecure_ok; /* set TRUE to allow insecure SSL connects */
+  bool create_dirs;
+
+  char *writeout; /* %-styled format string to output */
+  bool writeenv; /* write results to environment, if available */
+
+  FILE *errors; /* if stderr redirect is requested */
+  bool errors_fopened;
+
+  struct curl_slist *quote;
+  struct curl_slist *postquote;
+  struct curl_slist *prequote;
+
+  long ssl_version;
+  curl_TimeCond timecond;
+  time_t condtime;
+
+  struct curl_slist *headers;
+
+  struct curl_httppost *httppost;
+  struct curl_httppost *last_post;
+
+  struct curl_slist *telnet_options;
+        
+  HttpReq httpreq;
+
+  /* for bandwidth limiting features: */
+
+  size_t sendpersecond; /* send to peer */
+  size_t recvpersecond; /* receive from peer */
+
+  time_t lastsendtime;
+  size_t lastsendsize;
+
+  time_t lastrecvtime;
+  size_t lastrecvsize;
+};
+
+static int parseconfig(const char *filename,
+		       struct Configurable *config);
+static char *my_get_line(FILE *fp);
+static int create_dir_hierarchy(char *outfile);
+
+static void GetStr(char **string,
+		   char *value)
+{
+  if(*string)
+    free(*string);
+  if(value)
+    *string = strdup(value);
+  else
+    *string = NULL;
+}
+
+static char *file2string(FILE *file)
+{
+  char buffer[256];
+  char *ptr;
+  char *string=NULL;
+  int len=0;
+  int stringlen;
+
+  if(file) {
+    while(fgets(buffer, sizeof(buffer), file)) {
+      ptr= strchr(buffer, '\r');
+      if(ptr)
+        *ptr=0;
+      ptr= strchr(buffer, '\n');
+      if(ptr)
+        *ptr=0;
+      stringlen=strlen(buffer);
+      if(string)
+        string = realloc(string, len+stringlen+1);
+      else
+        string = malloc(stringlen+1);
+
+      strcpy(string+len, buffer);
+
+      len+=stringlen;
+    }
+    return string;
+  }
+  else
+    return NULL; /* no string */
+}
+
+static char *file2memory(FILE *file, long *size)
+{
+  char buffer[1024];
+  char *string=NULL;
+  char *newstring=NULL;
+  long len=0;
+  long stringlen=0;
+
+  if(file) {
+    while((len = fread(buffer, 1, sizeof(buffer), file))) {
+      if(string) {
+        newstring = realloc(string, len+stringlen);
+        if(newstring)
+          string = newstring;
+        else
+          break; /* no more strings attached! :-) */
+      }
+      else
+        string = malloc(len);
+      memcpy(&string[stringlen], buffer, len);
+      stringlen+=len;
+    }
+    *size = stringlen;
+    return string;
+  }
+  else
+    return NULL; /* no string */
+}
+
+void clean_getout(struct Configurable *config)
+{
+  struct getout *node=config->url_list;
+  struct getout *next;
+
+  while(node) {
+    next = node->next;
+    if(node->url)
+      free(node->url);
+    if(node->outfile)
+      free(node->outfile);
+    free(node);
+
+    node = next; /* GOTO next */
+  }
+}
+
+struct getout *new_getout(struct Configurable *config)
+{
+  struct getout *node =malloc(sizeof(struct getout));
+  struct getout *last= config->url_last;
+  if(node) {
+    /* clear the struct */
+    memset(node, 0, sizeof(struct getout));
+        
+    /* append this new node last in the list */
+    if(last)
+      last->next = node;
+    else
+      config->url_list = node; /* first node */
+            
+    /* move the last pointer */
+    config->url_last = node;
+  }
+  return node;
+}
+
+/* Structure for storing the information needed to build a multiple files
+ * section
+*/
+struct multi_files {
+  struct curl_forms   form;
+  struct multi_files *next;
+};
+
+/* Add a new list entry possibly with a type_name
+ */
+static struct multi_files *
+AddMultiFiles (const char *file_name,
+               const char *type_name,
+               const char *show_filename,
+               struct multi_files **multi_start,
+               struct multi_files **multi_current)
+{
+  struct multi_files *multi;
+  struct multi_files *multi_type = NULL;
+  struct multi_files *multi_name = NULL;
+  multi = (struct multi_files *)malloc(sizeof(struct multi_files));
+  if (multi) {
+    memset(multi, 0, sizeof(struct multi_files));
+    multi->form.option = CURLFORM_FILE;
+    multi->form.value = file_name;
+  }
+  else
+    return NULL;
+
+  if (!*multi_start)
+    *multi_start = multi;
+
+  if (type_name) {
+    multi_type = (struct multi_files *)malloc(sizeof(struct multi_files));
+    if (multi_type) {
+      memset(multi_type, 0, sizeof(struct multi_files));
+      multi_type->form.option = CURLFORM_CONTENTTYPE;
+      multi_type->form.value = type_name;
+      multi->next = multi_type;
+
+      multi = multi_type;
+    }
+    else {
+      free (multi);
+      return NULL;
+    }
+  }
+  if (show_filename) {
+    multi_name = (struct multi_files *)malloc(sizeof(struct multi_files));
+    if (multi_name) {
+      memset(multi_name, 0, sizeof(struct multi_files));
+      multi_name->form.option = CURLFORM_FILENAME;
+      multi_name->form.value = show_filename;
+      multi->next = multi_name;
+
+      multi = multi_name;
+    }
+    else {
+      free (multi);
+      return NULL;
+    }
+  }
+
+  if (*multi_current)
+    (*multi_current)->next = multi;
+
+  *multi_current = multi;
+
+  return *multi_current;
+}
+
+/* Free the items of the list.
+ */
+static void FreeMultiInfo (struct multi_files *multi_start)
+{
+  struct multi_files *multi;
+  while (multi_start) {
+    multi = multi_start;
+    multi_start = multi_start->next;
+    free (multi);
+  }
+}
+
+/***************************************************************************
+ *
+ * formparse()
+ *	
+ * Reads a 'name=value' paramter and builds the appropriate linked list.
+ *
+ * Specify files to upload with 'name=@filename'. Supports specified
+ * given Content-Type of the files. Such as ';type=<content-type>'.
+ *
+ * You may specify more than one file for a single name (field). Specify
+ * multiple files by writing it like:
+ *
+ * 'name=@filename,filename2,filename3'
+ *
+ * If you want content-types specified for each too, write them like:
+ *
+ * 'name=@filename;type=image/gif,filename2,filename3'
+ *
+ * If you want custom headers added for a single part, write them in a separate
+ * file and do like this:
+ *
+ * 'name=foo;headers=@headerfile' or why not
+ * 'name=@filemame;headers=@headerfile'
+ *
+ * To upload a file, but to fake the file name that will be included in the
+ * formpost, do like this:
+ *
+ * 'name=@filename;filename=/dev/null'
+ *
+ * This function uses curl_formadd to fulfill it's job. Is heavily based on
+ * the old curl_formparse code.
+ *
+ ***************************************************************************/
+
+#define FORM_FILE_SEPARATOR ','
+#define FORM_TYPE_SEPARATOR ';'
+
+static int formparse(char *input,
+                     struct curl_httppost **httppost,
+                     struct curl_httppost **last_post)
+{
+  /* nextarg MUST be a string in the format 'name=contents' and we'll
+     build a linked list with the info */
+  char name[256];
+  char *contents;
+  char major[128];
+  char minor[128];
+  char *contp;
+  const char *type = NULL;
+  char *sep;
+  char *sep2;
+
+  /* Preallocate contents to the length of input to make sure we don't
+     overwrite anything. */
+  contents = malloc(strlen(input));
+  contents[0] = '\000';
+ 
+  if(1 <= sscanf(input, "%255[^=]=%[^\n]", name, contents)) {
+    /* the input was using the correct format */
+    contp = contents;
+
+    if('@' == contp[0]) {
+      struct multi_files *multi_start = NULL, *multi_current = NULL;
+      /* we use the @-letter to indicate file name(s) */
+      contp++;
+
+      multi_start = multi_current=NULL;
+
+      do {
+	/* since this was a file, it may have a content-type specifier
+	   at the end too, or a filename. Or both. */
+        char *ptr;
+        char *filename=NULL;
+
+	sep=strchr(contp, FORM_TYPE_SEPARATOR);
+	sep2=strchr(contp, FORM_FILE_SEPARATOR);
+
+	/* pick the closest */
+	if(sep2 && (sep2 < sep)) {
+	  sep = sep2;
+
+	  /* no type was specified! */
+	}
+
+        type = NULL;
+
+	if(sep) {
+
+	  /* if we got here on a comma, don't do much */
+	  if(FORM_FILE_SEPARATOR == *sep)
+	    ptr = NULL;
+	  else
+            ptr = sep+1;
+
+	  *sep=0; /* terminate file name at separator */
+
+	  while(ptr && (FORM_FILE_SEPARATOR!= *ptr)) {
+
+            /* pass all white spaces */
+            while(isspace((int)*ptr))
+              ptr++;
+
+            if(curl_strnequal("type=", ptr, 5)) {
+
+              /* set type pointer */
+              type = &ptr[5];
+	    
+              /* verify that this is a fine type specifier */
+              if(2 != sscanf(type, "%127[^/]/%127[^;,\n]",
+                             major, minor)) {
+                fprintf(stderr, "Illegally formatted content-type field!\n");
+                free(contents);
+                FreeMultiInfo (multi_start);
+                return 2; /* illegal content-type syntax! */
+              }
+              /* now point beyond the content-type specifier */
+              sep = (char *)type + strlen(major)+strlen(minor)+1;
+
+              *sep=0; /* zero terminate type string */
+
+              ptr=sep+1;
+            }
+            else if(curl_strnequal("filename=", ptr, 9)) {
+              filename = &ptr[9];
+              ptr=strchr(filename, FORM_TYPE_SEPARATOR);
+              if(!ptr) {
+                ptr=strchr(filename, FORM_FILE_SEPARATOR);
+              }
+              if(ptr) {
+                *ptr=0; /* zero terminate */
+                ptr++;
+              }
+            }
+            else
+              /* confusion, bail out of loop */
+              break;
+	  }
+          /* find the following comma */
+          if(ptr)
+            sep=strchr(ptr, FORM_FILE_SEPARATOR);
+          else
+            sep=NULL;
+	}
+	else {
+	  sep=strchr(contp, FORM_FILE_SEPARATOR);
+	}
+	if(sep) {
+	  /* the next file name starts here */
+	  *sep =0;
+	  sep++;
+	}
+        /* if type == NULL curl_formadd takes care of the problem */
+
+        if (!AddMultiFiles (contp, type, filename, &multi_start,
+                            &multi_current)) {
+          fprintf(stderr, "Error building form post!\n");
+          free(contents);
+          FreeMultiInfo (multi_start);
+          return 3;
+        }
+	contp = sep; /* move the contents pointer to after the separator */
+
+      } while(sep && *sep); /* loop if there's another file name */
+
+      /* now we add the multiple files section */
+      if (multi_start) {
+        struct curl_forms *forms = NULL;
+        struct multi_files *ptr = multi_start;
+        unsigned int i, count = 0;
+        while (ptr) {
+          ptr = ptr->next;
+          ++count;
+        }
+        forms =
+          (struct curl_forms *)malloc((count+1)*sizeof(struct curl_forms));
+        if (!forms)
+        {
+          fprintf(stderr, "Error building form post!\n");
+          free(contents);
+          FreeMultiInfo (multi_start);
+          return 4;
+        }
+        for (i = 0, ptr = multi_start; i < count; ++i, ptr = ptr->next)
+        {
+          forms[i].option = ptr->form.option;
+          forms[i].value = ptr->form.value;
+        }
+        forms[count].option = CURLFORM_END;
+        FreeMultiInfo (multi_start);
+        if (curl_formadd (httppost, last_post,
+                          CURLFORM_COPYNAME, name,
+                          CURLFORM_ARRAY, forms, CURLFORM_END) != 0) {
+          fprintf(stderr, "curl_formadd failed!\n");
+          free(forms);
+          free(contents);
+          return 5;
+        }
+        free(forms);
+      }
+    }
+    else {
+      if( contp[0]=='<' ) {
+        if (curl_formadd (httppost, last_post,
+                          CURLFORM_COPYNAME, name,
+                          CURLFORM_FILECONTENT, contp+1, CURLFORM_END) != 0) {
+          fprintf(stderr, "curl_formadd failed!\n");
+          free(contents);
+          return 6;
+        }
+      }
+      else {
+        if (curl_formadd (httppost, last_post,
+                          CURLFORM_COPYNAME, name,
+                          CURLFORM_COPYCONTENTS, contp, CURLFORM_END) != 0) {
+          fprintf(stderr, "curl_formadd failed!\n");
+          free(contents);
+          return 7;
+        }
+      }
+    }
+
+  }
+  else {
+    fprintf(stderr, "Illegally formatted input field!\n");
+    free(contents);
+    return 1;
+  }
+  free(contents);
+  return 0;
+}
+
+
+typedef enum {
+  PARAM_OK,
+  PARAM_OPTION_AMBIGUOUS,
+  PARAM_OPTION_UNKNOWN,
+  PARAM_REQUIRES_PARAMETER,  
+  PARAM_BAD_USE,
+  PARAM_HELP_REQUESTED,
+  PARAM_GOT_EXTRA_PARAMETER,
+
+  PARAM_LAST
+} ParameterError;
+
+static void cleanarg(char *str)
+{
+#ifdef HAVE_WRITABLE_ARGV
+  /* now that GetStr has copied the contents of nextarg, wipe the next
+   * argument out so that the username:password isn't displayed in the
+   * system process list */
+  if (str) {
+    size_t len = strlen(str);
+    memset(str, ' ', len);
+  }
+#else
+  (void)str;
+#endif
+}
+
+static ParameterError getparameter(char *flag, /* f or -long-flag */
+                                   char *nextarg, /* NULL if unset */
+                                   bool *usedarg, /* set to TRUE if the arg
+                                                     has been used */
+                                   struct Configurable *config)
+{
+  char letter;
+  char subletter=0; /* subletters can only occur on long options */
+
+  const char *parse=NULL;
+  int res;
+  unsigned int j;
+  time_t now;
+  int hit=-1;
+  bool longopt=FALSE;
+  bool singleopt=FALSE; /* when true means '-o foo' used '-ofoo' */
+
+
+  /* single-letter,
+     long-name,
+     boolean whether it takes an additional argument
+     */
+  struct LongShort aliases[]= {
+    {"9", "crlf",        FALSE},
+    {"8", "stderr",      TRUE},
+    {"7", "interface",   TRUE},
+    {"6", "krb4",        TRUE},
+    /* all these ones, starting with 5 as a short-option have *no* short
+       option to mention. */
+    {"5", "url",         TRUE},
+    {"5a", "random-file", TRUE},
+    {"5b", "egd-file",   TRUE},
+    {"5c", "connect-timeout", TRUE},
+    {"5d", "ciphers",    TRUE},
+    {"5e", "disable-epsv", FALSE},
+#ifdef USE_ENVIRONMENT
+    {"5f", "environment", FALSE},
+#endif
+    {"5g", "trace",      TRUE},
+    {"5h", "trace-ascii", TRUE},
+    {"5i", "limit-rate", TRUE},
+    {"5j", "compressed",  FALSE}, /* might take an arg someday */
+    {"0", "http1.0",     FALSE},
+    {"1", "tlsv1",       FALSE},
+    {"2", "sslv2",       FALSE},
+    {"3", "sslv3",       FALSE},
+    {"a", "append",      FALSE},
+    {"A", "user-agent",  TRUE},
+    {"b", "cookie",      TRUE},
+    {"B", "ftp-ascii",   FALSE}, /* this long format is OBSOLETE now! */
+    {"B", "use-ascii",   FALSE},
+    {"c", "cookie-jar",  TRUE},
+    {"C", "continue-at", TRUE},
+    {"d", "data",        TRUE},
+    {"da", "data-ascii", TRUE},
+    {"db", "data-binary", TRUE},
+    {"D", "dump-header", TRUE},
+    {"e", "referer",     TRUE},
+    {"E", "cert",        TRUE},
+    {"Ea", "cacert",     TRUE},
+    {"Eb","cert-type",   TRUE},
+    {"Ec","key",         TRUE},
+    {"Ed","key-type",    TRUE},
+    {"Ee","pass",        TRUE},
+    {"Ef","engine",      TRUE},
+    {"Eg","capath ",     TRUE},
+    {"f", "fail",        FALSE},
+    {"F", "form",        TRUE},
+    {"g", "globoff",     FALSE},
+    {"G", "get",         FALSE},
+    {"h", "help",        FALSE},
+    {"H", "header",      TRUE},
+    {"i", "include",     FALSE},
+    {"I", "head",        FALSE},
+    {"j", "junk-session-cookies", FALSE},
+    {"k", "insecure",    FALSE},
+    {"K", "config",      TRUE},
+    {"l", "list-only",   FALSE},
+    {"L", "location",    FALSE},
+    {"Lt", "location-trusted", FALSE},
+    {"m", "max-time",    TRUE},
+    {"M", "manual",      FALSE},
+    {"n", "netrc",       FALSE},
+    {"no", "netrc-optional", FALSE},
+    {"N", "no-buffer",   FALSE},
+    {"o", "output",      TRUE},
+    {"O", "remote-name", FALSE},
+    {"p", "proxytunnel", FALSE},
+    {"P", "ftpport",     TRUE},
+    {"q", "disable",     FALSE},
+    {"Q", "quote",       TRUE},
+    {"r", "range",       TRUE},
+    {"R", "remote-time", FALSE},
+    {"s", "silent",      FALSE},
+    {"S", "show-error",  FALSE},
+    {"t", "telnet-options", TRUE},
+    {"T", "upload-file", TRUE},
+    {"u", "user",        TRUE},
+    {"U", "proxy-user",  TRUE},
+    {"v", "verbose",     FALSE},
+    {"V", "version",     FALSE},
+    {"w", "write-out",   TRUE},
+    {"x", "proxy",       TRUE},
+    {"X", "request",     TRUE},
+    {"X", "http-request", TRUE}, /* OBSOLETE VERSION */
+    {"Y", "speed-limit",  TRUE},
+    {"y", "speed-time", TRUE},
+    {"z", "time-cond",   TRUE},
+    {"Z", "max-redirs",   TRUE},
+    {"#", "progress-bar",FALSE},
+    {"@", "create-dirs", FALSE},
+  };
+
+  if(('-' != flag[0]) ||
+     (('-' == flag[0]) && ('-' == flag[1]))) {
+    /* this should be a long name */
+    char *word=('-' == flag[0])?flag+2:flag;
+    int fnam=strlen(word);
+    int numhits=0;
+    for(j=0; j< sizeof(aliases)/sizeof(aliases[0]); j++) {
+      if(curl_strnequal(aliases[j].lname, word, fnam)) {
+        longopt = TRUE;
+        numhits++;
+        if(curl_strequal(aliases[j].lname, word)) {
+          parse = aliases[j].letter;
+          hit = j;
+          numhits = 1; /* a single unique hit */
+          break;
+        }
+	parse = aliases[j].letter;
+	hit = j;
+      }
+    }
+    if(numhits>1) {
+      /* this is at least the second match! */
+      return PARAM_OPTION_AMBIGUOUS;
+    }
+    if(hit < 0) {
+      return PARAM_OPTION_UNKNOWN;
+    }    
+  }
+  else {
+    flag++; /* prefixed with one dash, pass it */
+    hit=-1;
+    parse = flag;
+  }
+
+  do {
+    /* we can loop here if we have multiple single-letters */
+
+    if(!longopt)
+      letter = parse?*parse:'\0';
+    else {
+      letter = parse[0];
+      subletter = parse[1];
+    }
+    *usedarg = FALSE; /* default is that we don't use the arg */
+
+#if 0
+    fprintf(stderr, "OPTION: %c %s\n", letter, nextarg?nextarg:"<null>");
+#endif
+    if(hit < 0) {
+      for(j=0; j< sizeof(aliases)/sizeof(aliases[0]); j++) {
+	if(letter == aliases[j].letter[0]) {
+	  hit = j;
+	  break;
+	}
+      }
+      if(hit < 0) {
+	return PARAM_OPTION_UNKNOWN;
+      }
+    }
+    if(hit < 0) {
+      return PARAM_OPTION_UNKNOWN;
+    }    
+    if(!longopt && aliases[hit].extraparam && parse[1]) {
+      nextarg=(char *)&parse[1]; /* this is the actual extra parameter */
+      singleopt=TRUE;   /* don't loop anymore after this */
+    }
+    else if(!nextarg && aliases[hit].extraparam) {
+      return PARAM_REQUIRES_PARAMETER;
+    }
+    else if(nextarg && aliases[hit].extraparam)
+      *usedarg = TRUE; /* mark it as used */
+
+    switch(letter) {
+    case '9': /* there is no short letter for this */
+      /* LF -> CRLF conversinon? */
+      config->crlf = TRUE;
+      break;
+    case '8': /* there is no short letter for this */
+      if(strcmp(nextarg, "-")) {
+        config->errors = fopen(nextarg, "wt");
+        config->errors_fopened = TRUE;
+      }
+      else
+        config->errors = stdout;
+      break;
+    case '7': /* there is no short letter for this */
+      /* interface */
+      GetStr(&config->iface, nextarg);
+      break;
+    case '6': /* there is no short letter for this */
+      /* krb4 level string */
+      GetStr(&config->krb4level, nextarg);
+      break;
+    case '5':
+      switch(subletter) {
+      case 'a': /* random-file */
+        GetStr(&config->random_file, nextarg);
+        break;
+      case 'b': /* egd-file */
+        GetStr(&config->egd_file, nextarg);
+        break;
+      case 'c': /* connect-timeout */
+        config->connecttimeout=atoi(nextarg);
+        break;
+      case 'd': /* ciphers */
+        GetStr(&config->cipher_list, nextarg);
+        break;
+      case 'e': /* --disable-epsv */
+        config->disable_epsv ^= TRUE;
+        break;
+      case 'f': /* --disable-eprt */
+        config->disable_eprt ^= TRUE;
+        break;
+#ifdef USE_ENVIRONMENT
+      case 'f':
+        config->writeenv ^= TRUE;
+        break;
+#endif
+      case 'g': /* --trace */
+        GetStr(&config->trace_dump, nextarg);
+        break;
+      case 'h': /* --trace-ascii */
+        GetStr(&config->trace_dump, nextarg);
+        config->trace_ascii = TRUE;
+        break;
+      case 'i': /* --limit-rate */
+        {
+          /* We support G, M, K too */
+          char *unit;
+          unsigned long value = strtol(nextarg, &unit, 0);
+          switch(nextarg[strlen(nextarg)-1]) {
+          case 'G':
+          case 'g':
+            value *= 1024*1024*1024;
+            break;
+          case 'M':
+          case 'm':
+            value *= 1024*1024;
+            break;
+          case 'K':
+          case 'k':
+            value *= 1024;
+            break;
+          }
+          config->recvpersecond = value;
+          config->sendpersecond = value;
+        }
+        break;
+
+      case 'j': /* --compressed */
+ 	config->encoding ^= TRUE;
+ 	break;
+
+      default: /* the URL! */
+        {
+          struct getout *url;
+          if(config->url_get || (config->url_get=config->url_list)) {
+            /* there's a node here, if it already is filled-in continue to find
+               an "empty" node */
+            while(config->url_get && (config->url_get->flags&GETOUT_URL))
+              config->url_get = config->url_get->next;
+          }
+
+          /* now there might or might not be an available node to fill in! */
+
+          if(config->url_get)
+            /* existing node */
+            url = config->url_get;
+          else
+            /* there was no free node, create one! */
+            url=new_getout(config);
+          
+          if(url) {
+            /* fill in the URL */
+            GetStr(&url->url, nextarg);
+            url->flags |= GETOUT_URL;
+          }
+        }
+      }
+      break;
+    case '#': /* added 19990617 larsa */
+      config->progressmode ^= CURL_PROGRESS_BAR;
+      break;
+    case '0': 
+      /* HTTP version 1.0 */
+      config->httpversion = CURL_HTTP_VERSION_1_0;
+      break;
+    case '1':
+      /* TLS version 1 */
+      config->ssl_version = CURL_SSLVERSION_TLSv1;
+      break;
+    case '2': 
+      /* SSL version 2 */
+      config->ssl_version = CURL_SSLVERSION_SSLv2;
+      break;
+    case '3': 
+      /* SSL version 3 */
+      config->ssl_version = CURL_SSLVERSION_SSLv3;
+      break;
+    case 'a':
+      /* This makes the FTP sessions use APPE instead of STOR */
+      config->conf ^= CONF_FTPAPPEND;
+      break;
+    case 'A':
+      /* This specifies the User-Agent name */
+      GetStr(&config->useragent, nextarg);
+      break;
+    case 'b': /* cookie string coming up: */
+      if(nextarg[0] == '@') {
+        nextarg++;
+      }
+      else if(strchr(nextarg, '=')) {
+        /* A cookie string must have a =-letter */
+        GetStr(&config->cookie, nextarg);
+        break;
+      }
+      /* We have a cookie file to read from! */
+      GetStr(&config->cookiefile, nextarg);
+      break;
+    case 'B':
+      /* use ASCII/text when transfering */
+      config->conf ^= CONF_GETTEXT;
+      break;
+    case 'c':
+      /* get the file name to dump all cookies in */
+      GetStr(&config->cookiejar, nextarg);
+      break;
+    case 'C':
+      /* This makes us continue an ftp transfer at given position */
+      if(!curl_strequal(nextarg, "-")) {
+        config->resume_from= atoi(nextarg);
+        config->resume_from_current = FALSE;
+      }
+      else {
+        config->resume_from_current = TRUE;
+        config->resume_from = 0;
+      }
+      config->use_resume=TRUE;
+      break;
+    case 'd':
+      /* postfield data */
+      {
+        char *postdata=NULL;
+
+        if('@' == *nextarg) {
+          /* the data begins with a '@' letter, it means that a file name
+             or - (stdin) follows */
+          FILE *file;
+
+          nextarg++; /* pass the @ */
+
+          if(curl_strequal("-", nextarg))
+            file = stdin;
+          else 
+            file = fopen(nextarg, "rb");
+
+          if(subletter == 'b') /* forced binary */
+            postdata = file2memory(file, &config->postfieldsize);
+          else
+            postdata = file2string(file);
+          if(file && (file != stdin))
+            fclose(file);
+        }
+        else {
+          GetStr(&postdata, nextarg);
+        }
+
+        if(config->postfields) {
+          /* we already have a string, we append this one
+             with a separating &-letter */
+          char *oldpost=config->postfields;
+          config->postfields=aprintf("%s&%s", oldpost, postdata);
+          free(oldpost);
+          free(postdata);
+        }
+        else
+          config->postfields=postdata;
+      }
+      /*
+        We can't set the request type here, as this data might be used in
+        a simple GET if -G is used. Already or soon.
+
+        if(SetHTTPrequest(HTTPREQ_SIMPLEPOST, &config->httpreq))
+          return PARAM_BAD_USE;
+      */
+      break;
+    case 'D':
+      /* dump-header to given file name */
+      GetStr(&config->headerfile, nextarg);
+      break;
+    case 'e':
+      {
+        char *ptr = strstr(nextarg, ";auto");
+        if(ptr) {
+          /* Automatic referer requested, this may be combined with a
+             set initial one */
+          config->conf |= CONF_AUTO_REFERER;
+          *ptr = 0; /* zero terminate here */
+        }
+        GetStr(&config->referer, nextarg);
+      }
+      break;
+    case 'E':
+      switch(subletter) {
+      case 'a': /* CA info PEM file */
+        /* CA info PEM file */
+        GetStr(&config->cacert, nextarg);
+        break;
+      case 'b': /* cert file type */
+        GetStr(&config->cert_type, nextarg);
+        break;
+      case 'c': /* private key file */
+        GetStr(&config->key, nextarg);
+        break;
+      case 'd': /* private key file type */
+        GetStr(&config->key_type, nextarg);
+        break;
+      case 'e': /* private key passphrase */
+        GetStr(&config->key_passwd, nextarg);
+        cleanarg(nextarg);
+        break;
+      case 'f': /* crypto engine */
+        GetStr(&config->engine, nextarg);
+        break;
+      case 'g': /* CA info PEM file */
+        /* CA cert directory */
+        GetStr(&config->capath, nextarg);
+        break;
+      default: /* certificate file */
+        {
+          char *ptr = strchr(nextarg, ':');
+          /* Since we live in a world of weirdness and confusion, the win32
+             dudes can use : when using drive letters and thus
+             c:\file:password needs to work. In order not to break
+             compatibility, we still use : as separator, but we try to detect
+             when it is used for a file name! On windows. */
+#ifdef WIN32
+          if(ptr &&
+             (ptr == &nextarg[1]) &&
+             (nextarg[2] == '\\') &&
+             (isalpha((int)nextarg[0])) )
+             /* colon in the second column, followed by a backslash, and the
+                first character is an alphabetic letter:
+
+                this is a drive letter colon */
+            ptr = strchr(&nextarg[3], ':'); /* find the next one instead */
+#endif
+          if(ptr) {
+            /* we have a password too */
+            *ptr=0;
+            ptr++;
+            GetStr(&config->key_passwd, ptr);
+          }
+          GetStr(&config->cert, nextarg);
+          cleanarg(nextarg);
+        }
+      }
+      break;
+    case 'f':
+      /* fail hard on errors  */
+      config->conf ^= CONF_FAILONERROR;
+      break;
+    case 'F':
+      /* "form data" simulation, this is a little advanced so lets do our best
+	 to sort this out slowly and carefully */
+      if(formparse(nextarg,
+                   &config->httppost,
+                   &config->last_post))
+	return PARAM_BAD_USE;
+      if(SetHTTPrequest(HTTPREQ_POST, &config->httpreq))
+        return PARAM_BAD_USE;
+      break;
+
+    case 'g': /* g disables URLglobbing */
+      config->globoff ^= TRUE;
+      break;
+
+    case 'G': /* HTTP GET */
+      config->use_httpget = TRUE;
+      break;
+
+    case 'h': /* h for help */
+      help();
+      return PARAM_HELP_REQUESTED;
+    case 'H':
+      /* A custom header to append to a list */
+      config->headers = curl_slist_append(config->headers, nextarg);
+      break;
+    case 'i':
+      config->conf ^= CONF_HEADER; /* include the HTTP header as well */
+      break;
+    case 'j':
+      config->cookiesession ^= TRUE;
+      break;
+    case 'I':
+      /*
+       * This is a bit tricky. We either SET both bits, or we clear both
+       * bits. Let's not make any other outcomes from this.
+       */
+      if((CONF_HEADER|CONF_NOBODY) !=
+         (config->conf&(CONF_HEADER|CONF_NOBODY)) ) {
+        /* one of them weren't set, set both */
+        config->conf |= (CONF_HEADER|CONF_NOBODY);
+        if(SetHTTPrequest(HTTPREQ_HEAD, &config->httpreq))
+          return PARAM_BAD_USE;
+      }
+      else {
+        /* both were set, clear both */
+        config->conf &= ~(CONF_HEADER|CONF_NOBODY);
+        if(SetHTTPrequest(HTTPREQ_GET, &config->httpreq))
+          return PARAM_BAD_USE;
+      }
+      break;
+    case 'k': /* allow insecure SSL connects */
+      config->insecure_ok ^= TRUE;
+      break;
+    case 'K': /* parse config file */
+      res = parseconfig(nextarg, config);
+      config->configread = TRUE;
+      if(res)
+	return res;
+      break;
+    case 'l':
+      config->conf ^= CONF_FTPLISTONLY; /* only list the names of the FTP dir */
+      break;
+    case 'L':
+      config->conf ^= CONF_FOLLOWLOCATION; /* Follow Location: HTTP headers */
+      switch (subletter) {
+      case 't':
+        /* Continue to send authentication (user+password) when following
+         * locations, even when hostname changed */
+        config->conf ^= CONF_UNRESTRICTED_AUTH;
+        break;
+      }
+      break;
+    case 'm':
+      /* specified max time */
+      config->timeout = atoi(nextarg);
+      break;
+    case 'M': /* M for manual, huge help */
+      hugehelp();
+      return PARAM_HELP_REQUESTED;
+    case 'n':
+      switch(subletter) {
+      case 'o': /* CA info PEM file */
+        /* use .netrc or URL */
+        config->conf ^= CONF_NETRC_OPT;
+        break;
+      default:
+        /* pick info from .netrc, if this is used for http, curl will
+           automatically enfore user+password with the request */
+        config->conf ^= CONF_NETRC;
+        break;
+      }
+      break;
+    case 'N':
+      /* disable the output I/O buffering */
+      config->nobuffer ^= 1;
+      break;
+    case 'o':
+    case 'O':
+      /* output file */
+      {
+        struct getout *url;
+        if(config->url_out || (config->url_out=config->url_list)) {
+          /* there's a node here, if it already is filled-in continue to find
+             an "empty" node */
+          while(config->url_out && (config->url_out->flags&GETOUT_OUTFILE))
+            config->url_out = config->url_out->next;
+        }
+
+        /* now there might or might not be an available node to fill in! */
+
+        if(config->url_out)
+          /* existing node */
+          url = config->url_out;
+        else
+          /* there was no free node, create one! */
+          url=new_getout(config);
+
+        if(url) {
+          /* fill in the outfile */
+          if('o' == letter)
+            GetStr(&url->outfile, nextarg);
+          else {
+            url->outfile=NULL; /* leave it */
+            url->flags |= GETOUT_USEREMOTE;
+          }
+          url->flags |= GETOUT_OUTFILE;
+        }
+      }
+      break;
+    case 'P':
+      /* This makes the FTP sessions use PORT instead of PASV */
+      /* use <eth0> or <192.168.10.10> style addresses. Anything except
+	 this will make us try to get the "default" address.
+	 NOTE: this is a changed behaviour since the released 4.1!
+	 */
+      GetStr(&config->ftpport, nextarg);
+      break;
+    case 'p':
+      /* proxy tunnel for non-http protocols */
+      config->proxytunnel ^= TRUE;
+      break;
+
+    case 'q': /* if used first, already taken care of, we do it like
+		 this so we don't cause an error! */
+      break;
+    case 'Q':
+      /* QUOTE command to send to FTP server */
+      switch(nextarg[0]) {
+      case '-':
+        /* prefixed with a dash makes it a POST TRANSFER one */
+        nextarg++;
+        config->postquote = curl_slist_append(config->postquote, nextarg);
+        break;
+      case '+':
+        /* prefixed with a plus makes it a just-before-transfer one */
+        nextarg++;
+        config->prequote = curl_slist_append(config->prequote, nextarg);
+        break;
+      default:
+        config->quote = curl_slist_append(config->quote, nextarg);
+      }
+      break;
+    case 'r':
+      /* byte range requested */
+      GetStr(&config->range, nextarg);
+      break;
+    case 'R':
+      /* use remote file's time */
+      config->remote_time ^= TRUE;
+      break;
+    case 's':
+      /* don't show progress meter, don't show errors : */
+      config->conf |= (CONF_MUTE|CONF_NOPROGRESS);
+      config->showerror ^= TRUE; /* toggle off */
+      break;
+    case 'S':
+      /* show errors */
+      config->showerror ^= TRUE; /* toggle on if used with -s */
+      break;
+    case 't':
+      /* Telnet options */
+      config->telnet_options =
+        curl_slist_append(config->telnet_options, nextarg);
+      break;
+    case 'T':
+      /* we are uploading */
+      config->conf |= CONF_UPLOAD;
+      if(!curl_strequal("-", nextarg))
+        /* make - equal stdin */
+        GetStr(&config->infile, nextarg);
+      break;
+    case 'u':
+      /* user:password  */
+      GetStr(&config->userpwd, nextarg);
+      cleanarg(nextarg);
+      break;
+    case 'U':
+      /* Proxy user:password  */
+      GetStr(&config->proxyuserpwd, nextarg);
+      cleanarg(nextarg);
+      break;
+    case 'v':
+      config->conf ^= CONF_VERBOSE; /* talk a lot */
+      break;
+    case 'V':
+      printf(CURL_ID "%s\n", curl_version());
+      return PARAM_HELP_REQUESTED;
+    case 'w':
+      /* get the output string */
+      if('@' == *nextarg) {
+        /* the data begins with a '@' letter, it means that a file name
+           or - (stdin) follows */
+        FILE *file;
+        nextarg++; /* pass the @ */
+        if(curl_strequal("-", nextarg))
+          file = stdin;
+        else 
+          file = fopen(nextarg, "r");
+        config->writeout = file2string(file);
+        if(file && (file != stdin))
+          fclose(file);
+      }
+      else 
+        GetStr(&config->writeout, nextarg);
+      break;
+    case 'x':
+      /* proxy */
+      GetStr(&config->proxy, nextarg);
+      break;
+    case 'X':
+      /* set custom request */
+      GetStr(&config->customrequest, nextarg);
+      break;
+    case 'y':
+      /* low speed time */
+      config->low_speed_time = atoi(nextarg);
+      if(!config->low_speed_limit)
+	config->low_speed_limit = 1;
+      break;
+    case 'Y':
+      /* low speed limit */
+      config->low_speed_limit = atoi(nextarg);
+      if(!config->low_speed_time)
+	config->low_speed_time=30;
+      break;
+    case 'z': /* time condition coming up */
+      switch(*nextarg) {
+      case '+':
+        nextarg++;
+      default:
+        /* If-Modified-Since: (section 14.28 in RFC2068) */
+        config->timecond = CURL_TIMECOND_IFMODSINCE;
+        break;
+      case '-':
+        /* If-Unmodified-Since:  (section 14.24 in RFC2068) */
+        config->timecond = CURL_TIMECOND_IFUNMODSINCE;
+        nextarg++;
+        break;
+      case '=':
+        /* Last-Modified:  (section 14.29 in RFC2068) */
+        config->timecond = CURL_TIMECOND_LASTMOD;
+        nextarg++;
+        break;
+      }
+      now=time(NULL);
+      config->condtime=curl_getdate(nextarg, &now);
+      if(-1 == (int)config->condtime) {
+        /* now let's see if it is a file name to get the time from instead! */
+        struct stat statbuf;
+        if(-1 == stat(nextarg, &statbuf)) {
+          /* failed, remove time condition */
+          config->timecond = CURL_TIMECOND_NONE;
+        }
+        else {
+          /* pull the time out from the file */
+          config->condtime = statbuf.st_mtime;
+        }
+      }
+      break;
+    case 'Z':
+      /* specified max no of redirects (http(s)) */
+      config->maxredirs = atoi(nextarg);
+      break;
+
+    case '@':
+      config->create_dirs = TRUE;
+      break;
+
+    default: /* unknown flag */
+      return PARAM_OPTION_UNKNOWN;
+    }
+    hit = -1;
+
+  } while(!longopt && !singleopt && *++parse && !*usedarg);
+
+  return PARAM_OK;
+}
+
+
+static int parseconfig(const char *filename,
+		       struct Configurable *config)
+{
+  int res;
+  FILE *file;
+  char filebuffer[512];
+  bool usedarg;
+  char *home;
+  
+  if(!filename || !*filename) {
+    /* NULL or no file name attempts to load .curlrc from the homedir! */
+
+#define CURLRC DOT_CHAR "curlrc"
+
+    filename = CURLRC;          /* sensible default */
+    home = curl_getenv("HOME"); /* portable environment reader */
+    if(home) {
+      if(strlen(home)<(sizeof(filebuffer)-strlen(CURLRC))) {
+
+        snprintf(filebuffer, sizeof(filebuffer),
+                 "%s%s%s", home, DIR_CHAR, CURLRC);
+
+        filename = filebuffer;
+      }
+      free(home); /* we've used it, now free it */
+    }
+  }
+
+  if(strcmp(filename,"-"))
+    file = fopen(filename, "r");
+  else
+    file = stdin;
+  
+  if(file) {
+    char *line;
+    char *aline;
+    char *option;
+    char *param;
+    int lineno=0;
+    bool alloced_param;
+
+#define isseparator(x) (((x)=='=') || ((x) == ':'))
+
+    while (NULL != (aline = my_get_line(file))) {
+      lineno++;
+      line = aline;
+      alloced_param=FALSE;
+
+      /* lines with # in the fist column is a comment! */
+      while(isspace((int)*line))
+        line++;
+
+      switch(*line) {
+      case '#':
+      case '/':
+      case '\r':
+      case '\n':
+      case '*':
+      case '\0':
+        free(aline);
+        continue;
+      }
+
+      /* the option keywords starts here */
+      option = line;
+      while(*line && !isspace((int)*line) && !isseparator(*line))
+        line++;
+      /* ... and has ended here */
+
+      *line++=0; /* zero terminate, we have a local copy of the data */
+
+#ifdef DEBUG_CONFIG
+      fprintf(stderr, "GOT: %s\n", option);
+#endif
+
+      /* pass spaces and separator(s) */
+      while(isspace((int)*line) || isseparator(*line))
+        line++;
+      
+      /* the parameter starts here (unless quoted) */
+      if(*line == '\"') {
+        char *ptr;
+        /* quoted parameter, do the qoute dance */
+        line++;
+        param=strdup(line); /* parameter */
+        alloced_param=TRUE;
+
+        ptr=param;
+        while(*line && (*line != '\"')) {
+          if(*line == '\\') {
+            char out;
+            line++;
+
+            /* default is to output the letter after the backslah */
+            switch(out = *line) {
+            case '\0':
+              continue; /* this'll break out of the loop */
+            case 't':
+              out='\t';
+              break;
+            case 'n':
+              out='\n';
+              break;
+            case 'r':
+              out='\r';
+              break;
+            case 'v':
+              out='\v';
+              break;
+            }
+            *ptr++=out;
+            line++;
+          }
+          else
+            *ptr++=*line++;
+        }
+        *ptr=0; /* always zero terminate */
+
+      }
+      else {
+        param=line; /* parameter starts here */
+        while(*line && !isspace((int)*line))
+          line++;
+        *line=0; /* zero terminate */
+      }
+#ifdef DEBUG_CONFIG
+      fprintf(stderr, "PARAM: \"%s\"\n", param);
+#endif
+      res = getparameter(option, param, &usedarg, config);
+
+      if(*param && !usedarg)
+        /* we passed in a parameter that wasn't used! */
+        res = PARAM_GOT_EXTRA_PARAMETER;
+
+      if(res != PARAM_OK) {
+        /* the help request isn't really an error */
+        if(!strcmp(filename, "-")) {
+          filename=(char *)"<stdin>";
+        }
+        if(PARAM_HELP_REQUESTED != res) {
+          const char *reason;
+          switch(res) {
+          default:
+          case PARAM_GOT_EXTRA_PARAMETER:
+            reason = "had unsupported trailing garbage";
+            break;
+          case PARAM_OPTION_UNKNOWN:
+            reason = "is unknown";
+            break;
+          case PARAM_OPTION_AMBIGUOUS:
+            reason = "is ambiguous";
+            break;
+          case PARAM_REQUIRES_PARAMETER:
+            reason = "requires parameter";
+            break;
+          case PARAM_BAD_USE:
+            reason = "is badly used here";
+            break;
+          }
+          fprintf(stderr, "%s:%d: warning: '%s' %s\n",
+                  filename, lineno, option, reason);
+        }
+      }
+
+      if(alloced_param)
+        free(param);
+
+      free(aline);
+    }
+    if(file != stdin)
+      fclose(file);
+  }
+  return 0;
+}
+
+static void go_sleep(long ms)
+{
+#ifdef HAVE_POLL
+  /* portable subsecond "sleep" */
+  poll((void *)0, 0, ms);
+#else
+  /* systems without poll() need other solutions */
+
+#ifdef WIN32
+  /* Windows offers a millisecond sleep */
+  Sleep(ms);
+#else
+  /* Other systems must use select() for this */
+  struct timeval timeout;
+
+  timeout.tv_sec = 0;
+  timeout.tv_usec = ms * 1000;
+
+  select(0, NULL,  NULL, NULL, &timeout);
+#endif
+
+#endif
+}
+
+struct OutStruct {
+  char *filename;
+  FILE *stream;
+  struct Configurable *config;
+};
+
+int my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream)
+{
+  struct OutStruct *out=(struct OutStruct *)stream;
+  struct Configurable *config = out->config;
+  if(out && !out->stream) {
+    /* open file for writing */
+    out->stream=fopen(out->filename, "wb");
+    if(!out->stream)
+      return -1; /* failure */
+    if(config->nobuffer) {
+      /* disable output buffering */
+#ifdef HAVE_SETVBUF
+      setvbuf(out->stream, NULL, _IONBF, 0);
+#endif
+    }
+  }
+
+  if(config->recvpersecond) {
+    /*
+     * We know when we received data the previous time. We know how much data
+     * we get now. Make sure that this is not faster than we are told to run.
+     * If we're faster, sleep a while *before* doing the fwrite() here.
+     */
+
+    time_t timediff;
+    time_t now;
+
+    now = time(NULL);
+    timediff = now - config->lastrecvtime;
+    if( size*nmemb > config->recvpersecond*timediff) {
+      /* figure out how many milliseconds to rest */
+      go_sleep ( (size*nmemb)*1000/config->recvpersecond - timediff*1000 );
+      now = time(NULL);
+    }
+    config->lastrecvtime = now;
+  }
+
+  return fwrite(buffer, size, nmemb, out->stream);
+}
+
+struct InStruct {
+  FILE *stream;
+  struct Configurable *config;
+};
+
+int my_fread(void *buffer, size_t size, size_t nmemb, void *userp)
+{
+  struct InStruct *in=(struct InStruct *)userp;
+
+  struct Configurable *config = in->config;
+
+  if(config->sendpersecond) {
+    /*
+     * We know when we sent data the previous time. We know how much data
+     * we sent. Make sure that this was not faster than we are told to run.
+     * If we're faster, sleep a while *before* doing the fread() here.
+     * Also, make no larger fread() than should be sent this second!
+     */
+
+    time_t timediff;
+    time_t now;
+
+    now = time(NULL);
+    timediff = now - config->lastsendtime;
+    if( config->lastsendsize > config->sendpersecond*timediff) {
+      /* figure out how many milliseconds to rest */
+      go_sleep ( config->lastsendsize*1000/config->sendpersecond -
+                 timediff*1000 );
+      now = time(NULL);
+    }
+    config->lastsendtime = now;
+
+    if(size*nmemb > config->sendpersecond) {
+      /* lower the size to actually read */
+      nmemb = config->sendpersecond;
+      size = 1;
+    }
+    config->lastsendsize = size*nmemb;    
+  }
+
+
+  return fread(buffer, size, nmemb, in->stream);
+}
+
+struct ProgressData {
+  int calls;
+  double total;
+  double prev;
+  double point;
+  int width;
+  FILE *out; /* where to write everything to */
+};
+
+int myprogress (void *clientp,
+                double dltotal,
+                double dlnow,
+                double ultotal,
+                double ulnow)
+{
+  /* The original progress-bar source code was written for curl by Lars Aas,
+     and this new edition inherites some of his concepts. */
+  
+  char line[256];
+  char outline[256];
+  char format[40];
+  double frac;
+  double percent;
+  int barwidth;
+  int num;
+  int i;
+
+  struct ProgressData *bar = (struct ProgressData *)clientp;
+  double total = dltotal + ultotal;
+
+  bar->point = dlnow + ulnow; /* we've come this far */
+
+  bar->calls++; /* simply count invokes */
+
+  if(0 == total) {
+    int prevblock = (int)bar->prev / 1024;
+    int thisblock = (int)bar->point / 1024;
+    while ( thisblock > prevblock ) {
+      fprintf( bar->out, "#" );
+      prevblock++;
+    }
+  }
+  else {
+    frac = bar->point / total;
+    percent = frac * 100.0f;
+    barwidth = bar->width - 7;
+    num = (int) (((double)barwidth) * frac);
+    i = 0;
+    for ( i = 0; i < num; i++ ) {
+      line[i] = '#';
+    }
+    line[i] = '\0';
+    sprintf( format, "%%-%ds %%5.1f%%%%", barwidth );
+    sprintf( outline, format, line, percent );
+    fprintf( bar->out, "\r%s", outline );
+  }
+  bar->prev = bar->point;
+
+  return 0;
+}
+
+static
+void progressbarinit(struct ProgressData *bar,
+                     struct Configurable *config)
+{
+#ifdef __EMX__
+  /* 20000318 mgs */
+  int scr_size [2];
+#endif
+  char *colp;
+
+  memset(bar, 0, sizeof(struct ProgressData));
+
+/* TODO: get terminal width through ansi escapes or something similar.
+         try to update width when xterm is resized... - 19990617 larsa */
+#ifndef __EMX__
+  /* 20000318 mgs
+   * OS/2 users most likely won't have this env var set, and besides that
+   * we're using our own way to determine screen width */
+  colp = curl_getenv("COLUMNS");
+  if (colp != NULL) {
+    bar->width = atoi(colp);
+    free(colp);
+  }
+  else
+    bar->width = 79;
+#else
+  /* 20000318 mgs
+   * We use this emx library call to get the screen width, and subtract
+   * one from what we got in order to avoid a problem with the cursor
+   * advancing to the next line if we print a string that is as long as
+   * the screen is wide. */
+ 
+  _scrsize(scr_size);
+  bar->width = scr_size[0] - 1;
+#endif
+
+  bar->out = config->errors;
+}
+
+static
+void dump(const char *text,
+          FILE *stream, unsigned char *ptr, size_t size,
+          bool nohex)
+{
+  size_t i;
+  size_t c;
+
+  unsigned int width=0x10;
+
+  if(nohex)
+    /* without the hex output, we can fit more on screen */
+    width = 0x40;
+
+  fprintf(stream, "%s, %d bytes (0x%x)\n", text, size, size);
+
+  for(i=0; i<size; i+= width) {
+
+    fprintf(stream, "%04x: ", i);
+
+    if(!nohex) {
+      /* hex not disabled, show it */
+      for(c = 0; c < width; c++)
+        if(i+c < size)
+          fprintf(stream, "%02x ", ptr[i+c]);
+        else
+          fputs("   ", stream);
+    }
+
+    for(c = 0; (c < width) && (i+c < size); c++) {
+      /* check for 0D0A; if found, skip past and start a new line of output */
+      if (nohex && (i+c+1 < size) && ptr[i+c]==0x0D && ptr[i+c+1]==0x0A) {
+        i+=(c+2-width);
+        break;
+      }
+      fprintf(stream, "%c",
+              (ptr[i+c]>=0x20) && (ptr[i+c]<0x80)?ptr[i+c]:'.');
+      /* check again for 0D0A, to avoid an extra \n if it's at width */
+      if (nohex && (i+c+2 < size) && ptr[i+c+1]==0x0D && ptr[i+c+2]==0x0A) {
+        i+=(c+3-width);
+        break;
+      }
+    }
+    fputc('\n', stream); /* newline */
+  }
+  fflush(stream);
+}
+
+static
+int my_trace(CURL *handle, curl_infotype type,
+             unsigned char *data, size_t size,
+             void *userp)
+{
+  struct Configurable *config = (struct Configurable *)userp;
+  FILE *output=config->errors;
+  const char *text;
+
+  (void)handle; /* prevent compiler warning */
+
+  if(!config->trace_stream) {
+    /* open for append */
+    if(curl_strequal("-", config->trace_dump))
+      config->trace_stream = stdout;
+    else {
+      config->trace_stream = fopen(config->trace_dump, "w");
+      config->trace_fopened = TRUE;
+    }
+  }
+
+  if(config->trace_stream)
+    output = config->trace_stream;
+
+  switch (type) {
+  case CURLINFO_TEXT:
+    fprintf(output, "== Info: %s", data);
+  default: /* in case a new one is introduced to shock us */
+    return 0;
+
+  case CURLINFO_HEADER_OUT:
+    text = "=> Send header";
+    break;
+  case CURLINFO_DATA_OUT:
+    text = "=> Send data";
+    break;
+  case CURLINFO_HEADER_IN:
+    text = "<= Recv header";
+    break;
+  case CURLINFO_DATA_IN:
+    text = "<= Recv data";
+    break;
+  }
+
+  dump(text, output, data, size, config->trace_ascii);
+  return 0;
+}
+
+void free_config_fields(struct Configurable *config)
+{
+  if(config->random_file)
+    free(config->random_file);
+  if(config->egd_file)
+    free(config->egd_file);
+  if(config->userpwd)
+    free(config->userpwd);
+  if(config->postfields)
+    free(config->postfields);
+  if(config->proxy)
+    free(config->proxy);
+  if(config->proxyuserpwd)
+    free(config->proxyuserpwd);
+  if(config->cookie)
+    free(config->cookie);
+  if(config->cookiefile)
+    free(config->cookiefile);
+  if(config->krb4level)
+    free(config->krb4level);
+  if(config->headerfile)
+    free(config->headerfile);
+  if(config->ftpport)
+    free(config->ftpport);
+  if(config->infile)
+    free(config->infile);
+  if(config->range)
+    free(config->range);
+  if(config->customrequest)
+    free(config->customrequest);
+  if(config->writeout)
+    free(config->writeout);
+  if(config->httppost)
+    curl_formfree(config->httppost);
+  if(config->cacert)
+    free(config->cacert);
+  if(config->capath)
+    free(config->capath);
+  if(config->cookiejar)
+    free(config->cookiejar);
+
+  curl_slist_free_all(config->quote); /* checks for config->quote == NULL */
+  curl_slist_free_all(config->postquote); /*  */
+  curl_slist_free_all(config->headers); /*  */
+}
+
+#if defined(WIN32) && !defined(__CYGWIN32__)
+
+/* Function to find CACert bundle on a Win32 platform using SearchPath.
+ * (SearchPath is defined in windows.h, which is #included into libcurl)
+ * (Use the ASCII version instead of the unicode one!)
+ * The order of the directories it searches is:
+ *  1. application's directory
+ *  2. current working directory
+ *  3. Windows System directory (e.g. C:\windows\system32)
+ *  4. Windows Directory (e.g. C:\windows)
+ *  5. all directories along %PATH%
+ */
+static void FindWin32CACert(struct Configurable *config, 
+                            const char *bundle_file)
+{
+  curl_version_info_data *info;
+  info = curl_version_info(CURLVERSION_NOW);
+
+  /* only check for cert file if "we" support SSL */
+  if(info->features & CURL_VERSION_SSL) {
+    DWORD buflen;
+    char *ptr = NULL;
+    char *retval = (char *) malloc(sizeof (TCHAR) * (MAX_PATH + 1));
+    if (!retval)
+      return;
+    retval[0] = '\0';
+    buflen = SearchPathA(NULL, bundle_file, NULL, MAX_PATH+2, retval, &ptr);
+    if (buflen > 0) {
+      GetStr(&config->cacert, retval);
+    }
+    free(retval);
+  }
+}
+
+#endif
+
+static int 
+operate(struct Configurable *config, int argc, char *argv[])
+{
+  char errorbuffer[CURL_ERROR_SIZE];
+  char useragent[128]; /* buah, we don't want a larger default user agent */
+  struct ProgressData progressbar;
+  struct getout *urlnode;
+  struct getout *nextnode;
+
+  struct OutStruct outs;
+  struct OutStruct heads;
+  struct InStruct input;
+
+  char *url = NULL;
+
+  URLGlob *urls=NULL;
+  int urlnum;
+  char *outfiles;
+  int separator = 0;
+  
+  FILE *infd = stdin;
+  FILE *headerfilep = NULL;
+  char *urlbuffer=NULL;
+  int infilesize=-1; /* -1 means unknown */
+  bool stillflags=TRUE;
+
+  bool allocuseragent=FALSE;
+
+  char *httpgetfields=NULL;
+
+  CURL *curl;
+  int res = 0;
+  int i;
+
+  char *env;
+#ifdef MALLOCDEBUG
+  /* this sends all memory debug messages to a logfile named memdump */
+  env = curl_getenv("CURL_MEMDEBUG");
+  if(env) {
+    free(env);
+    curl_memdebug("memdump");
+  }
+#endif
+
+  errorbuffer[0]=0; /* prevent junk from being output */
+
+  main_init(); /* inits */
+
+  config->showerror=TRUE;
+  config->conf=CONF_DEFAULT;
+  config->use_httpget=FALSE;
+  config->create_dirs=FALSE;
+
+  if(argc>1 &&
+     (!curl_strnequal("--", argv[1], 2) && (argv[1][0] == '-')) &&
+     strchr(argv[1], 'q')) {
+    /*
+     * The first flag, that is not a verbose name, but a shortname
+     * and it includes the 'q' flag!
+     */
+    ;
+  }
+  else {
+    res = parseconfig(NULL, config);
+    if(res)
+      return res;
+  }
+
+  if ((argc < 2)  && !config->url_list) {
+    helpf(NULL);
+    return CURLE_FAILED_INIT;
+  }
+
+  /* Parse options */
+  for (i = 1; i < argc; i++) {
+    if(stillflags &&
+       ('-' == argv[i][0])) {
+      char *nextarg;
+      bool passarg;
+      char *origopt=argv[i];
+      
+      char *flag = argv[i];
+
+      if(curl_strequal("--", argv[i]))
+	/* this indicates the end of the flags and thus enables the
+	   following (URL) argument to start with -. */
+	stillflags=FALSE;
+      else {
+	nextarg= (i < argc - 1)? argv[i+1]: NULL;
+
+	res = getparameter(flag, nextarg, &passarg, config);
+	if(res) {
+          switch(res) {
+          case PARAM_OPTION_AMBIGUOUS:
+            helpf("option %s is ambiguous\n", origopt);
+            break;
+          case PARAM_OPTION_UNKNOWN:
+            helpf("option %s is unknown\n", origopt);
+            break;
+          case PARAM_REQUIRES_PARAMETER:
+            helpf("option %s requires an extra argument!\n", origopt);
+            break;
+          case PARAM_BAD_USE:
+            helpf("option %s was wrongly used!\n", origopt);
+            break;
+          case PARAM_HELP_REQUESTED:
+            /* no text */
+            break;
+          }
+          clean_getout(config);
+	  return CURLE_FAILED_INIT;
+        }
+
+	if(passarg) /* we're supposed to skip this */
+	  i++;
+      }
+    }
+    else {
+      bool used;
+      /* just add the URL please */
+      res = getparameter((char *)"--url", argv[i], &used, config);
+      if(res)
+        return res;
+    }
+  }
+
+  if(!config->url_list || !config->url_list->url) {
+    helpf("no URL specified!\n");
+    return CURLE_FAILED_INIT;
+  }
+  if(NULL == config->useragent) {
+    /* set non-zero default values: */
+    snprintf(useragent, sizeof(useragent),
+             CURL_NAME "/" CURL_VERSION " (" OS ") " "%s", curl_version());
+    config->useragent= useragent;
+  }
+  else
+    allocuseragent = TRUE;
+
+  /* On WIN32 (non-cygwin), we can't set the path to curl-ca-bundle.crt
+   * at compile time. So we look here for the file in two ways:
+   * 1: look at the environment variable CURL_CA_BUNDLE for a path
+   * 2: if #1 isn't found, use the windows API function SearchPath()
+   *    to find it along the app's path (includes app's dir and CWD)
+   *
+   * We support the environment variable thing for non-Windows platforms
+   * too. Just for the sake of it.
+   */
+  if (!config->cacert &&
+      !config->capath &&
+      !config->insecure_ok) {
+    env = curl_getenv("CURL_CA_BUNDLE");
+    if(env) {
+      GetStr(&config->cacert, env);
+      free(env);
+    }
+#if defined(WIN32) && !defined(__CYGWIN32__)
+    else
+      FindWin32CACert(config, "curl-ca-bundle.crt");
+#endif
+  }
+
+  if (config->postfields) {
+    if (config->use_httpget) {
+      /* Use the postfields data for a http get */
+      httpgetfields = strdup(config->postfields);
+      free(config->postfields);
+      config->postfields = NULL;
+      if(SetHTTPrequest((config->conf&CONF_NOBODY?HTTPREQ_HEAD:HTTPREQ_GET),
+                        &config->httpreq)) {
+        free(httpgetfields);
+        return PARAM_BAD_USE;
+      }
+    }
+    else {
+      if(SetHTTPrequest(HTTPREQ_SIMPLEPOST, &config->httpreq))
+        return PARAM_BAD_USE;
+    }
+  }
+
+  /*
+   * Get a curl handle to use for all forthcoming curl transfers.  Cleanup
+   * when all transfers are done. This is supported with libcurl 7.7 and
+   * should not be attempted on previous versions.
+   */
+  curl = curl_easy_init();
+  if(!curl)
+    return CURLE_FAILED_INIT;
+
+  urlnode = config->url_list;
+
+  if(config->headerfile) {
+    /* open file for output: */
+    if(strcmp(config->headerfile,"-")) {
+      heads.filename = config->headerfile;
+      headerfilep=NULL;
+    }
+    else
+      headerfilep=stdout;
+    heads.stream = headerfilep;
+    heads.config = config;
+  }
+
+  /* loop through the list of given URLs */
+  while(urlnode) {
+
+    /* get the full URL (it might be NULL) */
+    url=urlnode->url;
+
+    if(NULL == url) {
+      /* This node had no URL, skip it and continue to the next */
+      if(urlnode->outfile)
+        free(urlnode->outfile);
+    
+      /* move on to the next URL */
+      nextnode=urlnode->next;
+      free(urlnode); /* free the node */
+      urlnode = nextnode;
+      continue; /* next please */
+    }
+
+    /* default output stream is stdout */
+    outs.stream = stdout;
+    outs.config = config;
+
+    if(!config->globoff) {
+      /* Unless explicitly shut off, we expand '{...}' and '[...]' expressions
+         and return total number of URLs in pattern set */
+      res = glob_url(&urls, url, &urlnum);
+      if(res != CURLE_OK)
+        return res;
+    }
+
+
+    /* save outfile pattern before expansion */
+    outfiles = urlnode->outfile?strdup(urlnode->outfile):NULL;
+
+    if ((!outfiles || curl_strequal(outfiles, "-")) && urlnum > 1) {
+      /* multiple files extracted to stdout, insert separators! */
+      separator = 1;
+    }
+    for(i = 0;
+        (url = urls?next_url(urls):(i?NULL:strdup(url)));
+        i++) {
+      char *outfile;
+      outfile = outfiles?strdup(outfiles):NULL;
+ 
+      if((urlnode->flags&GETOUT_USEREMOTE) ||
+         (outfile && !curl_strequal("-", outfile)) ) {
+
+        /* 
+         * We have specified a file name to store the result in, or we have
+         * decided we want to use the remote file name.
+         */
+      
+        if(!outfile) {
+          /* Find and get the remote file name */
+          char * pc =strstr(url, "://");
+          if(pc)
+            pc+=3;
+          else
+            pc=url;
+          pc = strrchr(pc, '/');
+          outfile = (char *) NULL == pc ? NULL : strdup(pc+1) ;
+          if(!outfile) {
+            helpf("Remote file name has no length!\n");
+            return CURLE_WRITE_ERROR;
+          }
+        }
+        else if(urls) {
+          /* fill '#1' ... '#9' terms from URL pattern */
+          char *storefile = outfile;
+          outfile = match_url(storefile, urls);
+          free(storefile);
+        }
+      
+        /* Create the directory hierarchy, if not pre-existant to a multiple
+           file output call */
+        
+        if(config->create_dirs)
+          if (-1 == create_dir_hierarchy(outfile))
+            return CURLE_WRITE_ERROR;
+        
+        if(config->resume_from_current) {
+          /* We're told to continue from where we are now. Get the
+             size of the file as it is now and open it for append instead */
+          
+          struct stat fileinfo;
+
+          /*VMS?? -- Danger, the filesize is only valid for stream files */
+          if(0 == stat(outfile, &fileinfo))
+            /* set offset to current file size: */
+            config->resume_from = fileinfo.st_size;
+          else
+            /* let offset be 0 */
+            config->resume_from = 0;
+        }
+        
+        if(config->resume_from) {
+          /* open file for output: */
+          outs.stream=(FILE *) fopen(outfile, config->resume_from?"ab":"wb");
+          if (!outs.stream) {
+            helpf("Can't open '%s'!\n", outfile);
+            return CURLE_WRITE_ERROR;
+          }
+        }
+        else {
+          outs.filename = outfile;
+          outs.stream = NULL; /* open when needed */
+        }
+      }
+      if(config->infile) {
+        /*
+         * We have specified a file to upload
+         */
+        struct stat fileinfo;
+
+        /* If no file name part is given in the URL, we add this file name */
+        char *ptr=strstr(url, "://");
+        if(ptr)
+          ptr+=3;
+        else
+          ptr=url;
+        ptr = strrchr(ptr, '/');
+        if(!ptr || !strlen(++ptr)) {
+          /* The URL has no file name part, add the local file name. In order
+             to be able to do so, we have to create a new URL in another
+             buffer.*/
+
+          /* We only want the part of the local path that is on the right
+             side of the rightmost slash and backslash. */
+          char *filep = strrchr(config->infile, '/');
+          char *file2 = strrchr(filep?filep:config->infile, '\\');
+
+          if(file2)
+            filep = file2+1;
+          else if(filep)
+            filep++;
+          else
+            filep = config->infile;
+
+          /* URL encode the file name */
+          filep = curl_escape(filep, 0 /* use strlen */);
+
+          if(filep) {
+
+            urlbuffer=(char *)malloc(strlen(url) + strlen(filep) + 3);
+            if(!urlbuffer) {
+              helpf("out of memory\n");
+              return CURLE_OUT_OF_MEMORY;
+            }
+            if(ptr)
+              /* there is a trailing slash on the URL */
+              sprintf(urlbuffer, "%s%s", url, filep);
+            else
+              /* thers is no trailing slash on the URL */
+              sprintf(urlbuffer, "%s/%s", url, filep);
+            
+            curl_free(filep);
+
+            free(url);
+            url = urlbuffer; /* use our new URL instead! */
+          }
+        }
+/*VMS??-- Reading binary from files can be a problem... */
+/*VMS??   Only FIXED, VAR etc WITHOUT implied CC will work */
+/*VMS??   Others need a \n appended to a line */
+/*VMS??-- Stat gives a size but this is UNRELIABLE in VMS */
+/*VMS??   As a f.e. a fixed file with implied CC needs to have a byte added */
+/*VMS??   for every record processed, this can by derived from Filesize & recordsize */
+/*VMS??   for VARiable record files the records need to be counted! */
+/*VMS??   for every record add 1 for linefeed and subtract 2 for the record header */
+/*VMS??   for VARIABLE header files only the bare record data needs to be considered with one appended if implied CC */
+
+        infd=(FILE *) fopen(config->infile, "rb");
+        if (!infd || stat(config->infile, &fileinfo)) {
+          helpf("Can't open '%s'!\n", config->infile);
+          return CURLE_READ_ERROR;
+        }
+        infilesize=fileinfo.st_size;
+      
+      }
+      if((config->conf&CONF_UPLOAD) &&
+         config->resume_from_current) {
+        config->resume_from = -1; /* -1 will then force get-it-yourself */
+      }
+      if(outs.stream && isatty(fileno(outs.stream)) &&
+         !(config->conf&(CONF_UPLOAD|CONF_HTTPPOST)))
+        /* we send the output to a tty and it isn't an upload operation,
+           therefore we switch off the progress meter */
+        config->conf |= CONF_NOPROGRESS;
+    
+
+      if (urlnum > 1 && !(config->conf&CONF_MUTE)) {
+        fprintf(stderr, "\n[%d/%d]: %s --> %s\n",
+                i+1, urlnum, url, outfile ? outfile : "<stdout>");
+        if (separator)
+          printf("%s%s\n", CURLseparator, url);
+      }
+      if (httpgetfields) {
+        /* Find out whether the url contains a file name */
+        char *pc =strstr(url, "://");
+        char separator='?';
+        if(pc)
+          pc+=3;
+        else
+          pc=url;
+
+        pc = strrchr(pc, '/'); /* check for a slash */
+
+        if(pc) {
+          /* there is a slash present in the URL */
+
+          if(strchr(pc, '?'))
+          /* Ouch, there's already a question mark in the URL string, we
+             then appead the data with an amperand separator instead! */
+            separator='&';
+        }
+        /*
+         * Then append ? followed by the get fields to the url.
+         */
+        urlbuffer=(char *)malloc(strlen(url) + strlen(httpgetfields) + 2);
+        if(!urlbuffer) {
+          helpf("out of memory\n");
+          return CURLE_OUT_OF_MEMORY;
+        }
+        if (pc)
+          sprintf(urlbuffer, "%s%c%s", url, separator, httpgetfields);
+        else
+          /* Append  / before the ? to create a well-formed url
+             if the url contains a hostname only
+          */
+          sprintf(urlbuffer, "%s/?%s", url, httpgetfields);
+ 
+        free(url); /* free previous URL */
+        url = urlbuffer; /* use our new URL instead! */
+      }
+
+      if(!config->errors)
+        config->errors = stderr;
+
+#if defined(WIN32) && !defined(__CYGWIN32__)
+      if(!outfile && !(config->conf & CONF_GETTEXT)) {
+        /* We get the output to stdout and we have not got the ASCII/text flag,
+           then set stdout to be binary */
+        setmode( 1, O_BINARY );
+      }
+#endif
+
+      curl_easy_setopt(curl, CURLOPT_SSLENGINE, config->engine);
+      curl_easy_setopt(curl, CURLOPT_SSLENGINE_DEFAULT, 1);
+
+      /* where to store */
+      curl_easy_setopt(curl, CURLOPT_WRITEDATA, (FILE *)&outs);
+      /* what call to write */
+      curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, my_fwrite);
+
+      /* for uploads */
+      input.stream = infd;
+      input.config = config;
+      curl_easy_setopt(curl, CURLOPT_READDATA, &input);
+      /* what call to read */
+      curl_easy_setopt(curl, CURLOPT_READFUNCTION, my_fread);
+
+      if(config->recvpersecond) {
+        /* tell libcurl to use a smaller sized buffer as it allows us to
+           make better sleeps! 7.9.9 stuff! */
+        curl_easy_setopt(curl, CURLOPT_BUFFERSIZE, config->recvpersecond);
+      }
+
+      /* size of uploaded file: */
+      curl_easy_setopt(curl, CURLOPT_INFILESIZE, infilesize);
+      curl_easy_setopt(curl, CURLOPT_URL, url);     /* what to fetch */
+      curl_easy_setopt(curl, CURLOPT_PROXY, config->proxy); /* proxy to use */
+      curl_easy_setopt(curl, CURLOPT_HEADER, config->conf&CONF_HEADER);
+      curl_easy_setopt(curl, CURLOPT_NOPROGRESS, config->conf&CONF_NOPROGRESS);
+      curl_easy_setopt(curl, CURLOPT_NOBODY, config->conf&CONF_NOBODY);
+      curl_easy_setopt(curl, CURLOPT_FAILONERROR,
+                       config->conf&CONF_FAILONERROR);
+      curl_easy_setopt(curl, CURLOPT_UPLOAD, config->conf&CONF_UPLOAD);
+      curl_easy_setopt(curl, CURLOPT_FTPLISTONLY,
+                       config->conf&CONF_FTPLISTONLY);
+      curl_easy_setopt(curl, CURLOPT_FTPAPPEND, config->conf&CONF_FTPAPPEND);
+
+      if (config->conf&CONF_NETRC_OPT)
+        curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
+      else if (config->conf&CONF_NETRC)
+        curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_REQUIRED);
+      else
+        curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_IGNORED);
+
+      curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION,
+                       config->conf&CONF_FOLLOWLOCATION);
+      curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH,
+                       config->conf&CONF_UNRESTRICTED_AUTH);
+      curl_easy_setopt(curl, CURLOPT_TRANSFERTEXT, config->conf&CONF_GETTEXT);
+      curl_easy_setopt(curl, CURLOPT_MUTE, config->conf&CONF_MUTE);
+      curl_easy_setopt(curl, CURLOPT_USERPWD, config->userpwd);
+      curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, config->proxyuserpwd);
+      curl_easy_setopt(curl, CURLOPT_RANGE, config->range);
+      curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errorbuffer);
+      curl_easy_setopt(curl, CURLOPT_TIMEOUT, config->timeout);
+      curl_easy_setopt(curl, CURLOPT_POSTFIELDS, config->postfields);
+
+      /* new in libcurl 7.2: */
+      curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, config->postfieldsize);
+        
+      curl_easy_setopt(curl, CURLOPT_REFERER, config->referer);
+      curl_easy_setopt(curl, CURLOPT_AUTOREFERER,
+                       config->conf&CONF_AUTO_REFERER);
+      curl_easy_setopt(curl, CURLOPT_USERAGENT, config->useragent);
+      curl_easy_setopt(curl, CURLOPT_FTPPORT, config->ftpport);
+      curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, config->low_speed_limit);
+      curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, config->low_speed_time);
+      curl_easy_setopt(curl, CURLOPT_RESUME_FROM,
+                       config->use_resume?config->resume_from:0);
+      curl_easy_setopt(curl, CURLOPT_COOKIE, config->cookie);
+      curl_easy_setopt(curl, CURLOPT_HTTPHEADER, config->headers);
+      curl_easy_setopt(curl, CURLOPT_HTTPPOST, config->httppost);
+      curl_easy_setopt(curl, CURLOPT_SSLCERT, config->cert);
+      curl_easy_setopt(curl, CURLOPT_SSLCERTTYPE, config->cert_type);
+      curl_easy_setopt(curl, CURLOPT_SSLKEY, config->key);
+      curl_easy_setopt(curl, CURLOPT_SSLKEYTYPE, config->key_type);
+      curl_easy_setopt(curl, CURLOPT_SSLKEYPASSWD, config->key_passwd);
+
+      /* default to strict verifyhost */
+      curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 2);
+      if(config->cacert || config->capath) {
+        if (config->cacert)
+          curl_easy_setopt(curl, CURLOPT_CAINFO, config->cacert);
+
+        if (config->capath)
+          curl_easy_setopt(curl, CURLOPT_CAPATH, config->capath);
+        curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, TRUE);
+      }
+      else
+        if(config->insecure_ok) {
+          /* new stuff needed for libcurl 7.10 */
+          curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, FALSE);
+          curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 1);
+        }
+      
+      if((config->conf&CONF_NOBODY) ||
+         config->remote_time) {
+        /* no body or use remote time */
+        curl_easy_setopt(curl, CURLOPT_FILETIME, TRUE);
+      }
+      
+      if (config->maxredirs) 
+        curl_easy_setopt(curl, CURLOPT_MAXREDIRS, config->maxredirs); 
+      else 
+        curl_easy_setopt(curl, CURLOPT_MAXREDIRS, DEFAULT_MAXREDIRS); 
+ 
+      curl_easy_setopt(curl, CURLOPT_CRLF, config->crlf);
+      curl_easy_setopt(curl, CURLOPT_QUOTE, config->quote);
+      curl_easy_setopt(curl, CURLOPT_POSTQUOTE, config->postquote);
+      curl_easy_setopt(curl, CURLOPT_WRITEHEADER,
+                       config->headerfile?&heads:NULL);
+      curl_easy_setopt(curl, CURLOPT_COOKIEFILE, config->cookiefile);
+      /* cookie jar was added in 7.9 */
+      curl_easy_setopt(curl, CURLOPT_COOKIEJAR, config->cookiejar);
+      /* cookie session added in 7.9.7 */
+      curl_easy_setopt(curl, CURLOPT_COOKIESESSION, config->cookiesession);
+
+      curl_easy_setopt(curl, CURLOPT_SSLVERSION, config->ssl_version);
+      curl_easy_setopt(curl, CURLOPT_TIMECONDITION, config->timecond);
+      curl_easy_setopt(curl, CURLOPT_TIMEVALUE, config->condtime);
+      curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, config->customrequest);
+      curl_easy_setopt(curl, CURLOPT_STDERR, config->errors);
+      
+      /* three new ones in libcurl 7.3: */
+      curl_easy_setopt(curl, CURLOPT_HTTPPROXYTUNNEL, config->proxytunnel);
+      curl_easy_setopt(curl, CURLOPT_INTERFACE, config->iface);
+      curl_easy_setopt(curl, CURLOPT_KRB4LEVEL, config->krb4level);
+      
+      if((config->progressmode == CURL_PROGRESS_BAR) &&
+         !(config->conf&(CONF_NOPROGRESS|CONF_MUTE))) {
+        /* we want the alternative style, then we have to implement it
+           ourselves! */
+        progressbarinit(&progressbar, config);
+        curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, myprogress);
+        curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, &progressbar);
+      }
+        
+      /* new in libcurl 7.6.2: */
+      curl_easy_setopt(curl, CURLOPT_TELNETOPTIONS, config->telnet_options);
+
+      /* new in libcurl 7.7: */
+      curl_easy_setopt(curl, CURLOPT_RANDOM_FILE, config->random_file);
+      curl_easy_setopt(curl, CURLOPT_EGDSOCKET, config->egd_file);
+      curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, config->connecttimeout);
+
+      if(config->cipher_list)
+        curl_easy_setopt(curl, CURLOPT_SSL_CIPHER_LIST, config->cipher_list);
+
+      if(config->httpversion)
+        curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, config->httpversion);
+
+      /* new in libcurl 7.9.2: */
+      if(config->disable_epsv)
+        /* disable it */
+        curl_easy_setopt(curl, CURLOPT_FTP_USE_EPSV, FALSE);
+
+      /* new in libcurl 7.10.5 */
+      if(config->disable_eprt)
+        /* disable it */
+        curl_easy_setopt(curl, CURLOPT_FTP_USE_EPRT, FALSE);
+      
+      /* new in curl 7.9.7 */
+      if(config->trace_dump) {
+        curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, my_trace);
+        curl_easy_setopt(curl, CURLOPT_DEBUGDATA, config);
+        config->conf |= CONF_VERBOSE; /* force verbose */
+      }
+      curl_easy_setopt(curl, CURLOPT_VERBOSE, config->conf&CONF_VERBOSE);
+
+      /* new in curl 7.10 */
+      curl_easy_setopt(curl, CURLOPT_ENCODING, 
+                       (config->encoding) ? "" : NULL);
+
+      res = curl_easy_perform(curl);
+        
+      if((config->progressmode == CURL_PROGRESS_BAR) &&
+         progressbar.calls) {
+        /* if the custom progress bar has been displayed, we output a
+           newline here */
+        fputs("\n", progressbar.out);
+      }
+
+      if(config->writeout) {
+        ourWriteOut(curl, config->writeout);
+      }
+#ifdef USE_ENVIRONMENT
+      if (config->writeenv)
+        ourWriteEnv(curl);
+#endif
+
+#ifdef	VMS
+      if (!config->showerror)  {
+        vms_show = VMSSTS_HIDE;
+      }
+#else
+      if((res!=CURLE_OK) && config->showerror) {
+        if(CURLE_SSL_CACERT == res) {
+          fprintf(config->errors, "curl: (%d) %s\n\n", res, errorbuffer);
+#define CURL_CA_CERT_ERRORMSG1 \
+"More details here: http://curl.haxx.se/docs/sslcerts.html\n\n" \
+"curl performs SSL certificate verification by default, using a \"bundle\"\n" \
+" of Certificate Authority (CA) public keys (CA certs). The default\n" \
+" bundle is named curl-ca-bundle.crt; you can specify an alternate file\n" \
+" using the --cacert option.\n"
+
+#define CURL_CA_CERT_ERRORMSG2 \
+"If this HTTPS server uses a certificate signed by a CA represented in\n" \
+" the bundle, the certificate verification probably failed due to a\n" \
+" problem with the certificate (it might be expired, or the name might\n" \
+" not match the domain name in the URL).\n" \
+"If you'd like to turn off curl's verification of the certificate, use\n" \
+" the -k (or --insecure) option.\n"
+
+          fprintf(config->errors, "%s%s",
+                  CURL_CA_CERT_ERRORMSG1,
+                  CURL_CA_CERT_ERRORMSG2 );
+        }
+        else
+          fprintf(config->errors, "curl: (%d) %s\n", res, errorbuffer);
+      }
+#endif
+
+      if (outfile && !curl_strequal(outfile, "-") && outs.stream)
+        fclose(outs.stream);
+
+#ifdef HAVE_UTIME
+      /* Important that we set the time _after_ the file has been 
+         closed, as is done above here */
+      if(config->remote_time && outs.filename) {
+        /* as libcurl if we got a time. Pretty please */
+        long filetime;
+        curl_easy_getinfo(curl, CURLINFO_FILETIME, &filetime);
+        if(filetime >= 0) {
+          struct utimbuf times;
+          times.actime = filetime;
+          times.modtime = filetime;
+          utime(outs.filename, &times); /* set the time we got */
+        }
+      }
+#endif
+
+      if (config->infile)
+        fclose(infd);
+      if(headerfilep)
+        fclose(headerfilep);
+      
+      if (httpgetfields)
+        free(httpgetfields);
+
+      if(url)
+        free(url);
+
+      if(outfile)
+        free(outfile);
+    }
+    if(outfiles)
+      free(outfiles);
+
+    if(urls)
+      /* cleanup memory used for URL globbing patterns */
+      glob_cleanup(urls);
+
+    /* empty this urlnode struct */
+    if(urlnode->url)
+      free(urlnode->url);
+    if(urlnode->outfile)
+      free(urlnode->outfile);
+    
+    /* move on to the next URL */
+    nextnode=urlnode->next;
+    free(urlnode); /* free the node */
+    urlnode = nextnode;
+
+  } /* while-loop through all URLs */
+
+  if(config->headerfile && !headerfilep && heads.stream)
+    fclose(heads.stream);
+
+  if(config->trace_fopened)
+    fclose(config->trace_stream);
+
+  if(allocuseragent)
+    free(config->useragent);
+
+  /* cleanup the curl handle! */
+  curl_easy_cleanup(curl);
+
+  if(config->errors_fopened)
+    fclose(config->errors);
+
+  main_free(); /* cleanup */
+
+  return res;
+}
+
+
+int main(int argc, char *argv[])
+{
+  int res;
+  struct Configurable config;
+  memset(&config, 0, sizeof(struct Configurable));
+  
+  res = operate(&config, argc, argv);
+  free_config_fields(&config);
+
+#ifdef	VMS
+  if (res > 52) res = 53;		/* MAXMSG, porting helper */
+  return (vms_cond[res]|vms_show);
+#else
+  return res;
+#endif
+}
+
+static char *my_get_line(FILE *fp)
+{
+   char buf[4096];
+   char *nl = NULL;
+   char *retval = NULL;
+
+   do
+   {
+      if (NULL == fgets(buf, sizeof(buf), fp))
+         break;
+      if (NULL == retval)
+         retval = strdup(buf);
+      else
+      {
+         if (NULL == (retval = realloc(retval,
+                                       strlen(retval) + strlen(buf) + 1)))
+            break;
+         strcat(retval, buf);
+      }
+   }
+   while (NULL == (nl = strchr(retval, '\n')));
+
+   if (NULL != nl)
+     *nl = '\0';
+
+   return retval;
+}
+
+
+/* Create the needed directory hierarchy recursively in order to save
+   multi-GETs in file output, ie:
+   curl "http://my.site/dir[1-5]/file[1-5].txt" -o "dir#1/file#2.txt"
+   should create all the dir* automagically
+*/
+static int create_dir_hierarchy(char *outfile)
+{
+  char *tempdir;
+  char *tempdir2;
+  char *outdup;
+  char *dirbuildup;
+  int result=0;
+  
+  outdup = strdup(outfile);
+  dirbuildup = malloc(sizeof(char) * strlen(outfile));
+  if(!dirbuildup)
+    return -1;
+  dirbuildup[0] = '\0';
+
+  tempdir = strtok(outdup, DIR_CHAR);
+
+  while (tempdir != NULL) {
+    tempdir2 = strtok(NULL, DIR_CHAR);
+    /* since strtok returns a token for the last word even
+       if not ending with DIR_CHAR, we need to prune it */
+    if (tempdir2 != NULL) {
+      if (strlen(dirbuildup) > 0)
+        sprintf(dirbuildup,"%s%s%s",dirbuildup, DIR_CHAR, tempdir);
+      else {
+        if (0 != strncmp(outdup, DIR_CHAR, 1))
+          sprintf(dirbuildup,"%s",tempdir);
+        else
+          sprintf(dirbuildup,"%s%s", DIR_CHAR, tempdir);
+      }
+      if (access(dirbuildup, F_OK) == -1) {
+        result = mkdir(dirbuildup,(mode_t)0000750);
+        if (-1 == result) {
+          switch (errno) {
+#ifdef EACCES
+          case EACCES:
+            fprintf(stderr,"You don't have permission to create %s.\n",
+                    dirbuildup);
+            break;
+#endif
+#ifdef ENAMETOOLONG
+          case ENAMETOOLONG:
+            fprintf(stderr,"The directory name %s is too long.\n",
+                    dirbuildup);
+            break;
+#endif
+#ifdef EROFS
+          case EROFS:
+            fprintf(stderr,"%s resides on a read-only file system.\n",
+                    dirbuildup);
+            break;
+#endif
+#ifdef ENOSPC
+          case ENOSPC:
+            fprintf(stderr,"No space left on the file system that will "
+                    "contain the directory %s.\n", dirbuildup);
+            break;
+#endif
+#ifdef EDQUOT
+          case EDQUOT:
+            fprintf(stderr,"Cannot create directory %s because you "
+                    "exceeded your quota.\n", dirbuildup);
+            break;
+#endif
+          default :
+            fprintf(stderr,"Error creating directory %s.\n", dirbuildup);
+            break;
+          }
+          break; /* get out of loop */
+        }
+      }
+    }
+    tempdir = tempdir2;
+  }
+  free(dirbuildup);
+  free(outdup);
+
+  return result; /* 0 is fine, -1 is badness */
+}
+
diff --git a/main/source/curl/src/mkhelp.pl b/main/source/curl/src/mkhelp.pl
new file mode 100644
index 00000000..edc8d173
--- /dev/null
+++ b/main/source/curl/src/mkhelp.pl
@@ -0,0 +1,94 @@
+#!/usr/local/bin/perl
+
+# Yeah, I know, probably 1000 other persons already wrote a script like
+# this, but I'll tell ya:
+
+# THEY DON'T FIT ME :-)
+
+# Get readme file as parameter:
+$README = $ARGV[0];
+
+if($README eq "") {
+    print "usage: mkreadme.pl <README>\n";
+    exit;
+}
+
+
+push @out, "                                  _   _ ____  _     \n";
+push @out, "  Project                     ___| | | |  _ \\| |    \n";
+push @out, "                             / __| | | | |_) | |    \n";
+push @out, "                            | (__| |_| |  _ <| |___ \n";
+push @out, "                             \\___|\\___/|_| \\_\\_____|\n";
+
+$head=0;
+loop:
+while (<STDIN>) {
+    $line = $_;
+
+    # this kind should be removed first:
+    $line =~ s/_//g;
+
+    # then this:
+    $line =~ s/.//g;
+
+    if($line =~ /^curl/i) {
+	# cut off the page headers
+        $head=1;
+	next loop;
+    } 
+
+    if($line =~ /^[ \t]*\n/) {
+	$wline++;
+	# we only make one empty line max
+	next loop;
+    }
+    if($wline) {
+	$wline = 0;
+        if(!$head) {
+            push @out, "\n";
+        }
+        $head =0;
+    }
+    push @out, $line;
+}
+push @out, "\n"; # just an extra newline
+
+open(READ, "<$README") ||
+    die "couldn't read the README infile";
+
+while(<READ>) {
+    push @out, $_;
+}
+close(READ);
+
+
+print "/* NEVER EVER edit this manually, fix the mkhelp script instead! */\n"
+;
+print "#include <stdio.h>\n";
+print "void hugehelp(void)\n";
+print "{\n";
+print "puts (\n";
+
+$outsize=0;
+for(@out) {
+    chop;
+
+    $new = $_;
+
+    $outsize += length($new)+1; # one for the newline
+
+    $new =~ s/\\/\\\\/g;
+    $new =~ s/\"/\\\"/g;
+
+    # gcc 2.96 claims ISO C89 only is required to support 509 letter strings
+    if($outsize > 500) {
+        # terminate and make another puts() call here
+        print ");\n puts(\n";
+        $outsize=length($new)+1;
+    }
+    printf("\"%s\\n\"\n", $new);
+
+}
+
+print " ) ;\n}\n"
+    
diff --git a/main/source/curl/src/setup.h b/main/source/curl/src/setup.h
new file mode 100644
index 00000000..0b665e67
--- /dev/null
+++ b/main/source/curl/src/setup.h
@@ -0,0 +1,93 @@
+#ifndef __CLIENT_SETUP_H
+#define __CLIENT_SETUP_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: setup.h,v 1.17 2003/04/15 14:01:57 bagder Exp $
+ ***************************************************************************/
+
+#if !defined(WIN32) && defined(__WIN32__)
+/* Borland fix */
+#define WIN32
+#endif
+
+#ifdef HAVE_CONFIG_H
+#ifdef VMS
+#include "config-vms.h"
+#else
+#include "config.h" /* the configure script results */
+#endif
+#else
+#ifdef WIN32
+/* include the hand-modified win32 adjusted config.h! */
+#include "config-win32.h"
+#endif
+#ifdef macintosh
+/* this is not the same as Mac OS X */
+#include "config-mac.h"
+#endif
+#ifdef __riscos__
+#include "config-riscos.h"
+#endif
+#endif
+
+#ifdef MALLOCDEBUG
+/* This is an ugly hack for MALLOCDEBUG conditions only. We need to include
+   the file here, since it might set the _FILE_OFFSET_BITS define, which must
+   be set BEFORE all normal system headers. */
+#include "../lib/setup.h"
+#endif
+
+#include <stdio.h>
+
+#ifndef OS
+#define OS "unknown"
+#endif
+
+#if !defined(fileno) && !defined(WIN32) /* sunos 4 have this as a macro! */
+int fileno( FILE *stream);
+#endif
+
+#ifdef WIN32
+#define PATH_CHAR     ";"
+#define DIR_CHAR      "\\"
+#define DOT_CHAR      "_"
+#else
+#ifdef __EMX__
+/* 20000318 mgs
+ * OS/2 supports leading dots in filenames if the volume is formatted
+ * with JFS or HPFS. */
+#define PATH_CHAR     ";"
+#define DIR_CHAR      "\\"
+#define DOT_CHAR      "."
+#else
+
+#define PATH_CHAR     ":"
+#define DIR_CHAR      "/"
+#define DOT_CHAR      "."
+
+#endif
+#endif
+
+#ifdef __riscos__
+#define USE_ENVIRONMENT
+#endif
+
+#endif /* __SETUP_H */
diff --git a/main/source/curl/src/urlglob.c b/main/source/curl/src/urlglob.c
new file mode 100644
index 00000000..c67bdad0
--- /dev/null
+++ b/main/source/curl/src/urlglob.c
@@ -0,0 +1,471 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: urlglob.c,v 1.19 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+
+/* client-local setup.h */
+#include "setup.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <curl/curl.h>
+#include "urlglob.h"
+
+#ifdef MALLOCDEBUG
+#include "../lib/memdebug.h"
+#endif
+
+typedef enum {
+  GLOB_OK,
+  GLOB_ERROR
+} GlobCode;
+
+/*
+ * glob_word()
+ *
+ * Input a full globbed string, set the forth argument to the amount of
+ * strings we get out of this. Return GlobCode.
+ */
+GlobCode glob_word(URLGlob *, /* object anchor */
+                   char *,    /* globbed string */
+                   int,       /* position */
+                   int *);    /* returned number of strings */
+
+GlobCode glob_set(URLGlob *glob, char *pattern, int pos, int *amount)
+{
+  /* processes a set expression with the point behind the opening '{'
+     ','-separated elements are collected until the next closing '}'
+  */
+  char* buf = glob->glob_buffer;
+  URLPattern *pat;
+
+  pat = (URLPattern*)&glob->pattern[glob->size / 2];
+  /* patterns 0,1,2,... correspond to size=1,3,5,... */
+  pat->type = UPTSet;
+  pat->content.Set.size = 0;
+  pat->content.Set.ptr_s = 0;
+  pat->content.Set.elements = (char**)malloc(0);
+  ++glob->size;
+
+  while (1) {
+    switch (*pattern) {
+    case '\0':			/* URL ended while set was still open */
+      /*printf("error: unmatched brace at pos %d\n", pos);*/
+      return GLOB_ERROR;
+
+    case '{':
+    case '[':			/* no nested expressions at this time */
+      /*printf("error: nested braces not supported %d\n", pos);*/
+      return GLOB_ERROR;
+
+    case ',':
+    case '}':				/* set element completed */
+      *buf = '\0';
+      pat->content.Set.elements =
+        realloc(pat->content.Set.elements,
+                (pat->content.Set.size + 1) * sizeof(char*));
+      if (!pat->content.Set.elements) {
+	/*printf("out of memory in set pattern\n");*/
+        return GLOB_ERROR;
+      }
+      pat->content.Set.elements[pat->content.Set.size] =
+        strdup(glob->glob_buffer);
+      ++pat->content.Set.size;
+
+      if (*pattern == '}') {
+        /* entire set pattern completed */
+        int wordamount;
+
+	/* always check for a literal (may be "") between patterns */
+        if(GLOB_ERROR == glob_word(glob, ++pattern, ++pos, &wordamount))
+          wordamount=1;
+	*amount = pat->content.Set.size * wordamount;
+
+        return GLOB_OK;
+      }
+
+      buf = glob->glob_buffer;
+      ++pattern;
+      ++pos;
+      break;
+
+    case ']':				/* illegal closing bracket */
+      /*printf("error: illegal pattern at pos %d\n", pos);*/
+      return GLOB_ERROR;
+
+    case '\\':				/* escaped character, skip '\' */
+      if (*(buf+1) == '\0') {		/* but no escaping of '\0'! */
+	/*printf("error: illegal pattern at pos %d\n", pos); */
+	return GLOB_ERROR;
+      }
+      ++pattern;
+      ++pos;				/* intentional fallthrough */
+
+    default:
+      *buf++ = *pattern++;		/* copy character to set element */
+      ++pos;
+    }
+  }
+  return GLOB_ERROR;
+}
+
+GlobCode glob_range(URLGlob *glob, char *pattern, int pos, int *amount)
+{
+  /* processes a range expression with the point behind the opening '['
+     - char range: e.g. "a-z]", "B-Q]"
+     - num range: e.g. "0-9]", "17-2000]"
+     - num range with leading zeros: e.g. "001-999]"
+     expression is checked for well-formedness and collected until the next ']'
+  */
+  URLPattern *pat;
+  char *c;
+  int wordamount=1;
+  
+  pat = (URLPattern*)&glob->pattern[glob->size / 2];
+  /* patterns 0,1,2,... correspond to size=1,3,5,... */
+  ++glob->size;
+
+  if (isalpha((int)*pattern)) {		/* character range detected */
+    pat->type = UPTCharRange;
+    if (sscanf(pattern, "%c-%c]", &pat->content.CharRange.min_c,
+               &pat->content.CharRange.max_c) != 2 ||
+	pat->content.CharRange.min_c >= pat->content.CharRange.max_c ||
+	pat->content.CharRange.max_c - pat->content.CharRange.min_c > 'z' - 'a') {
+      /* the pattern is not well-formed */ 
+#if 0
+      printf("error: illegal pattern or range specification after pos %d\n",
+             pos);
+#endif
+      return GLOB_ERROR;
+    }
+    pat->content.CharRange.ptr_c = pat->content.CharRange.min_c;
+    /* always check for a literal (may be "") between patterns */
+
+    if(GLOB_ERROR == glob_word(glob, pattern + 4, pos + 4, &wordamount))
+      wordamount=1;
+
+    *amount = (pat->content.CharRange.max_c -
+               pat->content.CharRange.min_c + 1) *
+      wordamount;
+
+    return GLOB_OK;
+  }
+
+  if (isdigit((int)*pattern)) { /* numeric range detected */
+
+    pat->type = UPTNumRange;
+    pat->content.NumRange.padlength = 0;
+    if (sscanf(pattern, "%d-%d]",
+               &pat->content.NumRange.min_n,
+               &pat->content.NumRange.max_n) != 2 ||
+	pat->content.NumRange.min_n >= pat->content.NumRange.max_n) {
+      /* the pattern is not well-formed */ 
+#if 0
+      printf("error: illegal pattern or range specification after pos %d\n",
+             pos);
+#endif
+      return GLOB_ERROR;
+    }
+    if (*pattern == '0') {		/* leading zero specified */
+      c = pattern;  
+      while (isdigit((int)*c++))
+	++pat->content.NumRange.padlength; /* padding length is set for all
+                                              instances of this pattern */
+    }
+    pat->content.NumRange.ptr_n = pat->content.NumRange.min_n;
+    c = (char*)(strchr(pattern, ']') + 1);	/* continue after next ']' */
+
+    /* always check for a literal (may be "") between patterns */
+
+    if(GLOB_ERROR == glob_word(glob, c, pos + (c - pattern), &wordamount))
+      wordamount = 1;
+    
+    *amount = (pat->content.NumRange.max_n - 
+               pat->content.NumRange.min_n + 1) *
+      wordamount;
+
+    return GLOB_OK;
+  }
+  /*printf("error: illegal character in range specification at pos %d\n",
+    pos);*/
+  return GLOB_ERROR;
+}
+
+GlobCode glob_word(URLGlob *glob, char *pattern, int pos, int *amount)
+{
+  /* processes a literal string component of a URL
+     special characters '{' and '[' branch to set/range processing functions
+   */ 
+  char* buf = glob->glob_buffer;
+  int litindex;
+
+  *amount = 1; /* default is one single string */
+
+  while (*pattern != '\0' && *pattern != '{' && *pattern != '[') {
+    if (*pattern == '}' || *pattern == ']')
+      return GLOB_ERROR;
+
+    /* only allow \ to escape known "special letters" */
+    if (*pattern == '\\' &&
+        (*(pattern+1) == '{' || *(pattern+1) == '[' ||
+         *(pattern+1) == '}' || *(pattern+1) == ']') ) {
+
+      /* escape character, skip '\' */
+      ++pattern;
+      ++pos;
+      if (*pattern == '\0')		/* but no escaping of '\0'! */
+	return GLOB_ERROR;
+    }
+    *buf++ = *pattern++;		/* copy character to literal */
+    ++pos;
+  }
+  *buf = '\0';
+  litindex = glob->size / 2;
+  /* literals 0,1,2,... correspond to size=0,2,4,... */
+  glob->literal[litindex] = strdup(glob->glob_buffer);
+  ++glob->size;
+
+  switch (*pattern) {
+  case '\0':
+    return GLOB_OK;			/* singular URL processed  */
+
+  case '{':
+    /* process set pattern */
+    return glob_set(glob, ++pattern, ++pos, amount);
+
+  case '[':
+    /* process range pattern */
+    return glob_range(glob, ++pattern, ++pos, amount);
+  }
+
+  return GLOB_ERROR; /* something got wrong */
+}
+
+int glob_url(URLGlob** glob, char* url, int *urlnum)
+{
+  /*
+   * We can deal with any-size, just make a buffer with the same length
+   * as the specified URL!
+   */
+  URLGlob *glob_expand;
+  int amount;
+  char *glob_buffer=(char *)malloc(strlen(url)+1);
+
+  if(NULL == glob_buffer)
+    return CURLE_OUT_OF_MEMORY;
+
+  glob_expand = (URLGlob*)malloc(sizeof(URLGlob));
+  if(NULL == glob_expand) {
+    free(glob_buffer);
+    return CURLE_OUT_OF_MEMORY;
+  }
+  glob_expand->size = 0;
+  glob_expand->urllen = strlen(url);
+  glob_expand->glob_buffer = glob_buffer;
+  glob_expand->beenhere=0;
+  if(GLOB_OK == glob_word(glob_expand, url, 1, &amount))
+    *urlnum = amount;
+  else {
+    /* it failed, we cleanup */
+    free(glob_buffer);
+    free(glob_expand);
+    glob_expand = NULL;
+    *urlnum = 1;
+  }
+
+  *glob = glob_expand;
+  return CURLE_OK;
+}
+
+void glob_cleanup(URLGlob* glob)
+{
+  int i, elem;
+
+  for (i = glob->size - 1; i >= 0; --i) {
+    if (!(i & 1)) {	/* even indexes contain literals */
+      free(glob->literal[i/2]);
+    } else {		/* odd indexes contain sets or ranges */
+      if (glob->pattern[i/2].type == UPTSet) {
+	for (elem = glob->pattern[i/2].content.Set.size - 1; elem >= 0; --elem) {
+	  free(glob->pattern[i/2].content.Set.elements[elem]);
+	}
+	free(glob->pattern[i/2].content.Set.elements);
+      }
+    }
+  }
+  free(glob->glob_buffer);
+  free(glob);
+}
+
+char *next_url(URLGlob *glob)
+{
+  char *buf = glob->glob_buffer;
+  URLPattern *pat;
+  char *lit;
+  signed int i;
+  int carry;
+
+  if (!glob->beenhere)
+    glob->beenhere = 1;
+  else {
+    carry = 1;
+
+    /* implement a counter over the index ranges of all patterns,
+       starting with the rightmost pattern */
+    for (i = glob->size / 2 - 1; carry && i >= 0; --i) {
+      carry = 0;
+      pat = &glob->pattern[i];
+      switch (pat->type) {
+      case UPTSet:
+	if (++pat->content.Set.ptr_s == pat->content.Set.size) {
+	  pat->content.Set.ptr_s = 0;
+	  carry = 1;
+	}
+	break;
+      case UPTCharRange:
+	if (++pat->content.CharRange.ptr_c > pat->content.CharRange.max_c) {
+	  pat->content.CharRange.ptr_c = pat->content.CharRange.min_c;
+	  carry = 1;
+	}
+	break;
+      case UPTNumRange:
+	if (++pat->content.NumRange.ptr_n > pat->content.NumRange.max_n) {
+	  pat->content.NumRange.ptr_n = pat->content.NumRange.min_n;
+	  carry = 1;
+	}
+	break;
+      default:
+	printf("internal error: invalid pattern type (%d)\n", pat->type);
+	exit (CURLE_FAILED_INIT);
+      }
+    }
+    if (carry)		/* first pattern ptr has run into overflow, done! */
+      return NULL;
+  }
+
+  for (i = 0; i < glob->size; ++i) {
+    if (!(i % 2)) {			/* every other term (i even) is a literal */
+      lit = glob->literal[i/2];
+      strcpy(buf, lit);
+      buf += strlen(lit);
+    }
+    else {				/* the rest (i odd) are patterns */
+      pat = &glob->pattern[i/2];
+      switch(pat->type) {
+      case UPTSet:
+	strcpy(buf, pat->content.Set.elements[pat->content.Set.ptr_s]);
+	buf += strlen(pat->content.Set.elements[pat->content.Set.ptr_s]);
+	break;
+      case UPTCharRange:
+	*buf++ = pat->content.CharRange.ptr_c;
+	break;
+      case UPTNumRange:
+	sprintf(buf, "%0*d", pat->content.NumRange.padlength, pat->content.NumRange.ptr_n); 
+        buf += strlen(buf); /* make no sprint() return code assumptions */
+	break;
+      default:
+	printf("internal error: invalid pattern type (%d)\n", pat->type);
+	exit (CURLE_FAILED_INIT);
+      }
+    }
+  }
+  *buf = '\0';
+  return strdup(glob->glob_buffer);
+}
+
+char *match_url(char *filename, URLGlob *glob)
+{
+  char *target;
+  URLPattern pat;
+  int i;
+  int allocsize;
+  int stringlen=0;
+  char numbuf[18];
+  char *appendthis;
+  int appendlen;
+
+  /* We cannot use the glob_buffer for storage here since the filename may
+   * be longer than the URL we use. We allocate a good start size, then
+   * we need to realloc in case of need.
+   */
+  allocsize=strlen(filename);
+  target = malloc(allocsize);
+  if(NULL == target)
+    return NULL; /* major failure */
+
+  while (*filename != '\0') {
+    if (*filename == '#') {
+      if (!isdigit((int)*++filename) ||
+	  *filename == '0') {		/* only '#1' ... '#9' allowed */
+	/* printf("illegal matching expression\n");
+           exit(CURLE_URL_MALFORMAT);*/
+        continue;
+      }
+      i = *filename - '1';
+      if (i + 1 > glob->size / 2) {
+	/*printf("match against nonexisting pattern\n");
+          exit(CURLE_URL_MALFORMAT);*/
+        continue;
+      }
+      pat = glob->pattern[i];
+      switch (pat.type) {
+      case UPTSet:
+	appendthis = pat.content.Set.elements[pat.content.Set.ptr_s];
+	appendlen = (int)strlen(pat.content.Set.elements[pat.content.Set.ptr_s]);
+	break;
+      case UPTCharRange:
+        numbuf[0]=pat.content.CharRange.ptr_c;
+        numbuf[1]=0;
+        appendthis=numbuf;
+        appendlen=1;
+	break;
+      case UPTNumRange:
+	sprintf(numbuf, "%0*d", pat.content.NumRange.padlength, pat.content.NumRange.ptr_n);
+        appendthis = numbuf;
+        appendlen = (int)strlen(numbuf);
+	break;
+      default:
+	printf("internal error: invalid pattern type (%d)\n", pat.type);
+        return NULL;
+      }
+      ++filename;
+    }
+    else {
+      appendthis=filename++;
+      appendlen=1;
+    }
+    if(appendlen + stringlen >= allocsize) {
+      char *newstr;
+      allocsize = (appendlen + stringlen)*2;
+      newstr=realloc(target, allocsize);
+      if(NULL ==newstr) {
+        free(target);
+        return NULL;
+      }
+      target=newstr;
+    }
+    memcpy(&target[stringlen], appendthis, appendlen);
+    stringlen += appendlen;
+  }
+  target[stringlen]= '\0';
+  return target;
+}
diff --git a/main/source/curl/src/urlglob.h b/main/source/curl/src/urlglob.h
new file mode 100644
index 00000000..206b6e6a
--- /dev/null
+++ b/main/source/curl/src/urlglob.h
@@ -0,0 +1,61 @@
+#ifndef __URLGLOB_H
+#define __URLGLOB_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: urlglob.h,v 1.11 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+typedef enum {UPTSet=1,UPTCharRange,UPTNumRange} URLPatternType;
+
+typedef struct {
+  URLPatternType type;
+  union {
+    struct {
+      char **elements;
+      short size;
+      short ptr_s;
+    } Set;
+    struct {
+      char min_c, max_c;
+      char ptr_c;
+    } CharRange;
+    struct {
+      int min_n, max_n;
+      short padlength;
+      int ptr_n;
+    } NumRange ;
+  } content;
+} URLPattern;
+
+typedef struct {
+  char* literal[10];
+  URLPattern pattern[9];
+  int size;
+  int urllen;
+  char *glob_buffer;
+  char beenhere;
+} URLGlob;
+
+int glob_url(URLGlob**, char*, int *);
+char* next_url(URLGlob*);
+char* match_url(char*, URLGlob *); 
+void glob_cleanup(URLGlob* glob);
+
+#endif
diff --git a/main/source/curl/src/version.h b/main/source/curl/src/version.h
new file mode 100644
index 00000000..988e0989
--- /dev/null
+++ b/main/source/curl/src/version.h
@@ -0,0 +1,3 @@
+#define CURL_NAME "curl"
+#define CURL_VERSION "7.10.5"
+#define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") "
diff --git a/main/source/curl/src/writeenv.c b/main/source/curl/src/writeenv.c
new file mode 100644
index 00000000..ddec922a
--- /dev/null
+++ b/main/source/curl/src/writeenv.c
@@ -0,0 +1,109 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: writeenv.c,v 1.5 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#ifdef USE_ENVIRONMENT
+
+#include <curl/curl.h>
+
+#ifdef __riscos__
+#include <kernel.h>
+#endif
+
+struct
+{
+  const char * name;
+  CURLINFO id;
+  enum {
+    writeenv_NONE,
+    writeenv_DOUBLE,
+    writeenv_LONG,
+    writeenv_STRING
+  } type;
+} variables[14] =
+{
+  {"curl_url_effective", CURLINFO_EFFECTIVE_URL, writeenv_STRING},
+  {"curl_http_code", CURLINFO_HTTP_CODE, writeenv_LONG},
+  {"curl_time_total", CURLINFO_TOTAL_TIME, writeenv_DOUBLE},
+  {"curl_time_namelookup", CURLINFO_NAMELOOKUP_TIME, writeenv_DOUBLE},
+  {"curl_time_connect", CURLINFO_CONNECT_TIME, writeenv_DOUBLE},
+  {"curl_time_pretransfer", CURLINFO_PRETRANSFER_TIME, writeenv_DOUBLE},
+  {"curl_time_starttransfer", CURLINFO_STARTTRANSFER_TIME, writeenv_DOUBLE},
+  {"curl_size_header", CURLINFO_HEADER_SIZE, writeenv_LONG},
+  {"curl_size_request", CURLINFO_REQUEST_SIZE, writeenv_LONG},
+  {"curl_size_download", CURLINFO_SIZE_DOWNLOAD, writeenv_DOUBLE},
+  {"curl_size_upload", CURLINFO_SIZE_UPLOAD, writeenv_DOUBLE},
+  {"curl_speed_download", CURLINFO_SPEED_DOWNLOAD, writeenv_DOUBLE},
+  {"curl_speed_upload", CURLINFO_SPEED_UPLOAD, writeenv_DOUBLE},
+  {NULL, 0, writeenv_NONE}
+ };
+
+static void internalSetEnv(const char * name, char * value)
+{
+  /* Add your OS-specific code here. */
+#ifdef __riscos__
+  _kernel_setenv(name, value);
+#endif
+  return;
+}
+
+void ourWriteEnv(CURL *curl)
+{
+  unsigned int i;
+  char *string, numtext[10];
+  long longinfo;
+  double doubleinfo;
+  
+  for (i=0; variables[i].name; i++) {
+    switch (variables[i].type) {
+    case writeenv_STRING:
+      if (curl_easy_getinfo(curl, variables[i].id, &string) == CURLE_OK)
+        internalSetEnv(variables[i].name, string);
+      else
+        internalSetEnv(variables[i].name, NULL);
+      break;
+
+    case writeenv_LONG:
+      if (curl_easy_getinfo(curl, variables[i].id, &longinfo) == CURLE_OK) {
+        sprintf(numtext, "%5ld", longinfo);
+        internalSetEnv(variables[i].name, numtext);
+      }
+      else
+        internalSetEnv(variables[i].name, NULL);
+      break;
+    case writeenv_DOUBLE:
+      if (curl_easy_getinfo(curl, variables[i].id, &doubleinfo) == CURLE_OK) {
+        sprintf(numtext, "%6.2f", doubleinfo);
+        internalSetEnv(variables[i].name, numtext);
+      }
+      else
+        internalSetEnv(variables[i].name, NULL);
+      break;
+    }
+  }
+
+  return;
+}
+
+#endif
diff --git a/main/source/curl/src/writeenv.h b/main/source/curl/src/writeenv.h
new file mode 100644
index 00000000..e6cae3a8
--- /dev/null
+++ b/main/source/curl/src/writeenv.h
@@ -0,0 +1,28 @@
+#ifndef __WRITEENV_H
+#define __WRITEENV_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: writeenv.h,v 1.4 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+
+void ourWriteEnv(CURL *curl);
+
+#endif
diff --git a/main/source/curl/src/writeout.c b/main/source/curl/src/writeout.c
new file mode 100644
index 00000000..6c24045b
--- /dev/null
+++ b/main/source/curl/src/writeout.c
@@ -0,0 +1,228 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: writeout.c,v 1.16 2003/02/28 12:20:10 bagder Exp $
+ ***************************************************************************/
+
+#include "setup.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+#include <curl/curl.h>
+
+#define _MPRINTF_REPLACE /* we want curl-functions instead of native ones */
+#include <curl/mprintf.h>
+
+#include "writeout.h"
+
+typedef enum {
+  VAR_NONE,       /* must be the first */
+  VAR_TOTAL_TIME,
+  VAR_NAMELOOKUP_TIME,
+  VAR_CONNECT_TIME,
+  VAR_PRETRANSFER_TIME,
+  VAR_STARTTRANSFER_TIME,
+  VAR_SIZE_DOWNLOAD,
+  VAR_SIZE_UPLOAD,
+  VAR_SPEED_DOWNLOAD,
+  VAR_SPEED_UPLOAD,
+  VAR_HTTP_CODE,
+  VAR_HEADER_SIZE,
+  VAR_REQUEST_SIZE,
+  VAR_EFFECTIVE_URL,
+  VAR_CONTENT_TYPE,
+  VAR_NUM_OF_VARS /* must be the last */
+} replaceid;
+
+struct variable {
+  const char *name;
+  replaceid id;
+};
+
+
+static struct variable replacements[]={
+  {"url_effective", VAR_EFFECTIVE_URL},
+  {"http_code", VAR_HTTP_CODE},
+  {"time_total", VAR_TOTAL_TIME},
+  {"time_namelookup", VAR_NAMELOOKUP_TIME},
+  {"time_connect", VAR_CONNECT_TIME},
+  {"time_pretransfer", VAR_PRETRANSFER_TIME},
+  {"time_starttransfer", VAR_STARTTRANSFER_TIME},
+  {"size_header", VAR_HEADER_SIZE},
+  {"size_request", VAR_REQUEST_SIZE},
+  {"size_download", VAR_SIZE_DOWNLOAD},
+  {"size_upload", VAR_SIZE_UPLOAD},
+  {"speed_download", VAR_SPEED_DOWNLOAD},
+  {"speed_upload", VAR_SPEED_UPLOAD},
+  {"content_type", VAR_CONTENT_TYPE},
+  {NULL, 0}
+};
+
+void ourWriteOut(CURL *curl, char *writeinfo)
+{
+  FILE *stream = stdout;
+  char *ptr=writeinfo;
+  char *stringp;
+  long longinfo;
+  double doubleinfo;
+
+  while(*ptr) {
+    if('%' == *ptr) {
+      if('%' == ptr[1]) {
+        /* an escaped %-letter */
+        fputc('%', stream);
+        ptr+=2;
+      }
+      else {
+        /* this is meant as a variable to output */
+        char *end;
+        char keepit;
+        int i;
+        if(('{' == ptr[1]) && (end=strchr(ptr, '}'))) {
+          ptr+=2; /* pass the % and the { */
+          keepit=*end;
+          *end=0; /* zero terminate */
+          for(i=0; replacements[i].name; i++) {
+            if(curl_strequal(ptr, replacements[i].name)) {
+              switch(replacements[i].id) {
+              case VAR_EFFECTIVE_URL:
+                if((CURLE_OK ==
+                    curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &stringp))
+                   && stringp)
+                  fputs(stringp, stream);
+                break;
+              case VAR_HTTP_CODE:
+                if(CURLE_OK ==
+                   curl_easy_getinfo(curl, CURLINFO_HTTP_CODE, &longinfo))
+                  fprintf(stream, "%03d", longinfo);
+                break;
+              case VAR_HEADER_SIZE:
+                if(CURLE_OK ==
+                   curl_easy_getinfo(curl, CURLINFO_HEADER_SIZE, &longinfo))
+                  fprintf(stream, "%d", longinfo);
+                break;
+              case VAR_REQUEST_SIZE:
+                if(CURLE_OK ==
+                   curl_easy_getinfo(curl, CURLINFO_REQUEST_SIZE, &longinfo))
+                  fprintf(stream, "%d", longinfo);
+                break;
+              case VAR_TOTAL_TIME:
+                if(CURLE_OK ==
+                   curl_easy_getinfo(curl, CURLINFO_TOTAL_TIME, &doubleinfo))
+                  fprintf(stream, "%.3f", doubleinfo);
+                break;
+              case VAR_NAMELOOKUP_TIME:
+                if(CURLE_OK ==
+                   curl_easy_getinfo(curl, CURLINFO_NAMELOOKUP_TIME,
+                                     &doubleinfo))
+                  fprintf(stream, "%.3f", doubleinfo);
+                break;
+              case VAR_CONNECT_TIME:
+                if(CURLE_OK ==
+                   curl_easy_getinfo(curl, CURLINFO_CONNECT_TIME, &doubleinfo))
+                  fprintf(stream, "%.3f", doubleinfo);
+                break;
+              case VAR_PRETRANSFER_TIME:
+                if(CURLE_OK ==
+                   curl_easy_getinfo(curl, CURLINFO_PRETRANSFER_TIME, &doubleinfo))
+                  fprintf(stream, "%.3f", doubleinfo);
+                break;
+              case VAR_STARTTRANSFER_TIME:
+                if(CURLE_OK ==
+                   curl_easy_getinfo(curl, CURLINFO_STARTTRANSFER_TIME, &doubleinfo))
+                  fprintf(stream, "%.3f", doubleinfo);
+                break;
+              case VAR_SIZE_UPLOAD:
+                if(CURLE_OK ==
+                   curl_easy_getinfo(curl, CURLINFO_SIZE_UPLOAD, &doubleinfo))
+                  fprintf(stream, "%.0f", doubleinfo);
+                break;
+              case VAR_SIZE_DOWNLOAD:
+                if(CURLE_OK ==
+                   curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD, &doubleinfo))
+                  fprintf(stream, "%.0f", doubleinfo);
+                break;
+              case VAR_SPEED_DOWNLOAD:
+                if(CURLE_OK ==
+                   curl_easy_getinfo(curl, CURLINFO_SPEED_DOWNLOAD, &doubleinfo))
+                  fprintf(stream, "%.3f", doubleinfo);
+                break;
+              case VAR_SPEED_UPLOAD:
+                if(CURLE_OK ==
+                   curl_easy_getinfo(curl, CURLINFO_SPEED_UPLOAD, &doubleinfo))
+                  fprintf(stream, "%.3f", doubleinfo);
+                break;
+              case VAR_CONTENT_TYPE:
+                if((CURLE_OK ==
+                    curl_easy_getinfo(curl, CURLINFO_CONTENT_TYPE, &stringp))
+                   && stringp)
+                  fputs(stringp, stream);
+                break;
+              default:
+                break;
+              }
+              break;
+            }
+          }
+          ptr=end+1; /* pass the end */
+          *end = keepit;
+        }
+        else {
+          /* illegal syntax, then just output the characters that are used */
+          fputc('%', stream);
+          fputc(ptr[1], stream);
+          ptr+=2;
+        }
+      }
+    }
+    else if('\\' == *ptr) {
+      switch(ptr[1]) {
+      case 'r':
+        fputc('\r', stream);
+        break;
+      case 'n':
+        fputc('\n', stream);
+        break;
+      case 't':
+        fputc('\t', stream);
+        break;
+      default:
+        /* unknown, just output this */
+        fputc(*ptr, stream);
+        fputc(ptr[1], stream);
+        break;
+      }
+      ptr+=2;
+    }
+    else {
+      fputc(*ptr, stream);
+      ptr++;
+    }
+  }
+  
+}
diff --git a/main/source/curl/src/writeout.h b/main/source/curl/src/writeout.h
new file mode 100644
index 00000000..f6244533
--- /dev/null
+++ b/main/source/curl/src/writeout.h
@@ -0,0 +1,28 @@
+#ifndef __WRITEOUT_H
+#define __WRITEOUT_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: writeout.h,v 1.5 2003/01/16 21:08:13 bagder Exp $
+ ***************************************************************************/
+
+void ourWriteOut(CURL *curl, char *out);
+
+#endif
diff --git a/main/source/curl/testcurl.sh b/main/source/curl/testcurl.sh
new file mode 100644
index 00000000..b011911e
--- /dev/null
+++ b/main/source/curl/testcurl.sh
@@ -0,0 +1,194 @@
+#!/bin/sh
+###########################
+#  What is This Script?
+###########################
+
+# testcurl.sh is the master script to use for automatic testing of CVS-curl.
+# This is written for the purpose of being run from a crontab job or similar
+# at a regular interval. The output will be suitable to be mailed automaticly
+# to "curl-autocompile@haxx.se" to be dealt with automaticly.  The most
+# current build status (with a resonable backlog) will be published on the
+# curl site, at http://curl.haxx.se/auto/
+
+# USAGE:
+# testcurl.sh > output
+
+# version of this script
+version=1
+fixed=0
+
+LANG="C"
+
+export LANG
+
+die(){
+    echo "testcurl: ENDING HERE"
+    exit 1
+}
+
+if [ -f setup ]; then
+  . "./setup"
+  infixed="$fixed"
+fi
+
+if [ -z "$name" ]; then
+  echo "please enter your name"
+  read name
+  fixed="1"
+fi
+
+if [ -z "$email" ]; then
+  echo "please enter your contact email address"
+  read email
+  fixed="2"
+fi
+
+if [ -z "$desc" ]; then
+  echo "please enter a one line system desrciption"
+  read desc
+  fixed="3"
+fi
+
+if [ -z "$confopts" ]; then
+  if [ $infixed -lt 4 ]; then
+    echo "please enter your additional arguments to configure"
+    echo "examples: --with-ssl --enable-debug --enable-ipv6 --with-krb4"
+    read confopts
+    fixed="4"
+  fi
+fi
+
+
+if [ "$fixed" -gt "0" ]; then
+  echo "name='$name'" > setup
+  echo "email='$email'" >> setup
+  echo "desc='$desc'" >> setup
+  echo "confopts='$confopts'" >> setup
+  echo "fixed='$fixed'" >> setup
+fi
+
+echo "testcurl: STARTING HERE"
+echo "testcurl: NAME = $name"
+echo "testcurl: EMAIL = $email"
+echo "testcurl: DESC = $desc"
+echo "testcurl: CONFOPTS = $confopts"
+echo "testcurl: version = $version"
+echo "testcurl: date = `date -u`"
+
+# Make $pwd to become the path without newline. We'll use that in order to cut
+# off that path from all possible logs and error messages etc.
+ipwd=`pwd` 
+pwd=`echo $ipwd | sed -e 's/$//g'`
+
+if [ -d curl -a -d curl/CVS ]; then
+  echo "testcurl: curl is verified to be a fine source dir"
+else
+  echo "testcurl: curl is not a source dir checked out from CVS!"
+  die
+fi
+
+build="build-$$"
+
+# remove any previous left-overs
+rm -rf build-*
+
+# create a dir to build in
+mkdir $build
+
+if [ -d $build ]; then
+  echo "testcurl: build dir $build was created fine"
+else
+  echo "testcurl: failed to create dir $build"
+  die
+fi
+
+# get in the curl source tree root
+cd curl
+
+echo "testcurl: update from CVS"
+# update quietly to the latest CVS
+cvs -Q up -dP 2>&1
+
+cvsstat=$?
+echo "testcurl: cvs returned: $cvsstat"
+
+if [ "$cvsstat" -ne "0" ]; then
+  echo "testcurl: failed to update from CVS, exiting"
+  die
+fi
+
+# figure out the current collected CVS status
+newstat="../allcvs.log"
+oldstat="../oldcvs.log"
+find . -name Entries -exec cat {} \; > "$newstat"
+
+if [ -r "$oldstat" ]; then
+  # there is a previous cvs stat file to compare with
+  if { cmp "$oldstat" "$newstat"; } then
+    echo "testcurl: this is the same CVS status as before"
+    echo "testcurl: ALREADY TESTED THIS SETUP BEFORE"
+    #die
+  else
+    echo "testcurl: there has been a change in the CVS"
+  fi
+fi
+
+# remove possible left-overs from the past
+rm -f configure
+rm -rf autom4te.cache
+
+# generate the build files
+./buildconf 2>&1
+
+if [ -f configure ]; then
+  echo "testcurl: configure created"
+else
+  echo "testcurl: no configure created"
+  die
+fi
+
+# change to build dir
+cd "../$build"
+
+# run configure script
+../curl/configure $confopts 2>&1
+
+if [ -f lib/Makefile ]; then
+  echo "testcurl: configure seems to have finished fine"
+else
+  echo "testcurl: configure didn't work"
+  die
+fi
+
+echo "testcurl: display lib/config.h"
+grep "^ *#" lib/config.h
+
+echo "testcurl: now run make"
+make -i 2>&1 | sed -e "s:$pwd::g"
+
+if [ -f src/curl ]; then
+  echo "testcurl: src/curl was created fine"
+else
+  echo "testcurl: src/curl was not created"
+  die
+fi
+
+echo "testcurl: now run make test-full"
+make test-full 2>&1 | sed -e "s:$pwd::g" | tee build.log
+
+if { grep "^TESTFAIL:" build.log; } then
+  echo "testcurl: the tests were not successful"
+else
+  echo "testcurl: the tests were successful!"  
+fi
+
+# store the cvs status for the next time
+mv $newstat $oldstat
+
+# get out of dir
+cd ..
+
+# delete build dir
+rm -rf "$build"
+
+die
diff --git a/main/source/curl/tests/FILEFORMAT b/main/source/curl/tests/FILEFORMAT
new file mode 100644
index 00000000..135c47a6
--- /dev/null
+++ b/main/source/curl/tests/FILEFORMAT
@@ -0,0 +1,117 @@
+ The file format of the test suite is a very simple and extendable format. All
+data for a single test case resides in a single ASCII file. Labels mark the
+beginning and the end of all sections. Each label must be written in its own
+line and is resembling XML/HTML.
+
+ Each file is split up in three main sections: reply, client and verify. The
+reply section is used for the server to know what to send as a reply for the
+requests curl sends, the client section defines how the client should behave
+while the verify section defines how to verify that the data stored after a
+command has been run ended up correctly.
+
+ Each main section has a number of available subsections that can be
+specified, that will be checked/used if specified. This document includes all
+the subsections currently supported.
+
+<reply>
+<data [nocheck=1]>
+data to sent to the client on its request and later verified that it arrived
+safely. Set the nocheck=1 to prevent the test script to verify the arrival
+of this data.
+</data>
+<datacheck [nonewline=yes]>
+if the data is sent but this is what should be checked afterwards. If
+'nonewline' is set, we will cut off the trailing newline of this given data
+before comparing with the one actually received by the client
+</datacheck>
+<size>
+number to return on a ftp SIZE command (set to -1 to make this command fail)
+</size>
+<mdtm>
+what to send back if the client sends a (FTP) MDTM command, set to -1 to
+have it return that the file doesn't exist
+</mdtm>
+<cmd>
+special purpose server-command to control its behavior *before* the
+reply is sent
+</cmd>
+<postcmd>
+special purpose server-command to control its behavior *after* the
+reply is sent
+</postcmd>
+</reply>
+
+<client>
+
+<server>
+protocols as in 'http' 'ftp' etc. Give only one per line. Used for test cases
+500+ (at this point) to specify which servers the test case requires. In the
+future all test cases should use this. Makes us independent of the test
+case number.
+</server>
+
+<killserver>
+Using the same syntax as in <server> but when mentioned here these servers
+are explicitly KILLED when this test case is completed. Only use this if there
+is no other alternatives. Using this of course requires subsequent tests to
+restart servers.
+</killserver>
+
+<tool>
+Name of tool to use instead of "curl". This tool must be built and exist
+in the libtest/ directory.
+</tool>
+
+<name>
+test case description
+</name>
+
+<command [option=no-output]>
+command line to run, there's a bunch of %variables that get replaced
+accordingly. more about them elsewhere
+
+Set 'option=no-output' to prevent the test script to slap on the --output
+argument that directs the output to a file. The --output is also not added if
+the client/stdout section is used.
+
+Available substitute variables include:
+%HOSTIP    - IP address of the host running this test
+%HOSTPORT  - Port number of the HTTP server
+%HTTPSPORT - Port number of the HTTPS server
+%FTPPORT   - Port number of the FTP server
+%FTPSPORT  - Port number of the FTPS server
+%SRCDIR    - Full path to the source dir
+%PWD       - Current directory
+</command>
+
+<file name="log/filename">
+this creates the named file with this content before the test case is run
+which is useful if the test case needs a file to act on.
+</file>
+
+</client>
+
+<verify>
+<errorcode>
+numerical error code curl is supposed to return
+</errorcode>
+<strip>
+One regex per line that is removed from the protocol dumps before the
+comparison is made. This is very useful to remove dependencies on dynamicly
+changing protocol data such as port numbers or user-agent strings.
+</strip>
+<protocol [nonewline=yes]>
+the protocol dump curl should transmit, if 'nonewline' is set, we will cut
+off the trailing newline of this given data before comparing with the one
+actually sent by the client
+</protocol>
+<stdout>
+This verfies that this data was passed to stdout.
+</stdout>
+<file name="log/filename">
+the file's contents must be identical to this
+</file>
+<upload>
+the contents of the upload data curl should have sent
+</upload>
+</verify>
diff --git a/main/source/curl/tests/Makefile.am b/main/source/curl/tests/Makefile.am
new file mode 100644
index 00000000..87ceeb8e
--- /dev/null
+++ b/main/source/curl/tests/Makefile.am
@@ -0,0 +1,25 @@
+EXTRA_DIST = ftpserver.pl httpserver.pl httpsserver.pl runtests.pl \
+	     ftpsserver.pl stunnel.pm getpart.pm FILEFORMAT README \
+	     stunnel.pem memanalyze.pl
+
+SUBDIRS = data server libtest
+
+PERLFLAGS = -I$(srcdir)
+
+curl:
+	@(cd ..; make)
+
+test: server/sws
+	@cd data && exec $(MAKE) test
+	srcdir=$(srcdir) $(PERL) $(PERLFLAGS) $(srcdir)/runtests.pl
+
+quiet-test: server/sws
+	@cd data && exec $(MAKE) test
+	srcdir=$(srcdir) $(PERL) $(PERLFLAGS) $(srcdir)/runtests.pl -s -a
+
+full-test: server/sws
+	@cd data && exec $(MAKE) test
+	srcdir=$(srcdir) $(PERL) $(PERLFLAGS) $(srcdir)/runtests.pl -a
+
+server/sws:
+	cd server; make sws
diff --git a/main/source/curl/tests/Makefile.in b/main/source/curl/tests/Makefile.in
new file mode 100644
index 00000000..dc832f71
--- /dev/null
+++ b/main/source/curl/tests/Makefile.in
@@ -0,0 +1,483 @@
+# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CA_BUNDLE = @CURL_CA_BUNDLE@
+CURL_DISABLE_DICT = @CURL_DISABLE_DICT@
+CURL_DISABLE_FILE = @CURL_DISABLE_FILE@
+CURL_DISABLE_FTP = @CURL_DISABLE_FTP@
+CURL_DISABLE_GOPHER = @CURL_DISABLE_GOPHER@
+CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@
+CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@
+CURL_DISABLE_TELNET = @CURL_DISABLE_TELNET@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_LIBZ = @HAVE_LIBZ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPV6_ENABLED = @IPV6_ENABLED@
+KRB4_ENABLED = @KRB4_ENABLED@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NO_UNDEFINED_FALSE = @NO_UNDEFINED_FALSE@
+NO_UNDEFINED_TRUE = @NO_UNDEFINED_TRUE@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_ENABLED = @OPENSSL_ENABLED@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKGADD_NAME = @PKGADD_NAME@
+PKGADD_PKG = @PKGADD_PKG@
+PKGADD_VENDOR = @PKGADD_VENDOR@
+PKGCONFIG = @PKGCONFIG@
+RANDOM_FILE = @RANDOM_FILE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VERSIONNUM = @VERSIONNUM@
+YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+EXTRA_DIST = ftpserver.pl httpserver.pl httpsserver.pl runtests.pl \
+	     ftpsserver.pl stunnel.pm getpart.pm FILEFORMAT README \
+	     stunnel.pem memanalyze.pl
+
+
+SUBDIRS = data server libtest
+
+PERLFLAGS = -I$(srcdir)
+subdir = tests
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/lib/config.h \
+	$(top_builddir)/src/config.h \
+	$(top_builddir)/tests/server/config.h \
+	$(top_builddir)/lib/ca-bundle.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+
+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+	ps-recursive install-info-recursive uninstall-info-recursive \
+	all-recursive install-data-recursive install-exec-recursive \
+	installdirs-recursive install-recursive uninstall-recursive \
+	check-recursive installcheck-recursive
+DIST_COMMON = README Makefile.am Makefile.in
+DIST_SUBDIRS = $(SUBDIRS)
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  tests/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ETAGS = etags
+ETAGSFLAGS =
+
+CTAGS = ctags
+CTAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d $(distdir)/$$subdir \
+	    || mkdir $(distdir)/$$subdir \
+	    || exit 1; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$(top_distdir)" \
+	        distdir=../$(distdir)/$$subdir \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+
+distclean-am: clean-am distclean-generic distclean-libtool \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+	clean-generic clean-libtool clean-recursive ctags \
+	ctags-recursive distclean distclean-generic distclean-libtool \
+	distclean-recursive distclean-tags distdir dvi dvi-am \
+	dvi-recursive info info-am info-recursive install install-am \
+	install-data install-data-am install-data-recursive \
+	install-exec install-exec-am install-exec-recursive \
+	install-info install-info-am install-info-recursive install-man \
+	install-recursive install-strip installcheck installcheck-am \
+	installdirs installdirs-am installdirs-recursive \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+	uninstall uninstall-am uninstall-info-am \
+	uninstall-info-recursive uninstall-recursive
+
+
+curl:
+	@(cd ..; make)
+
+test: server/sws
+	@cd data && exec $(MAKE) test
+	srcdir=$(srcdir) $(PERL) $(PERLFLAGS) $(srcdir)/runtests.pl
+
+quiet-test: server/sws
+	@cd data && exec $(MAKE) test
+	srcdir=$(srcdir) $(PERL) $(PERLFLAGS) $(srcdir)/runtests.pl -s -a
+
+full-test: server/sws
+	@cd data && exec $(MAKE) test
+	srcdir=$(srcdir) $(PERL) $(PERLFLAGS) $(srcdir)/runtests.pl -a
+
+server/sws:
+	cd server; make sws
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/main/source/curl/tests/README b/main/source/curl/tests/README
new file mode 100644
index 00000000..3d8160f5
--- /dev/null
+++ b/main/source/curl/tests/README
@@ -0,0 +1,79 @@
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+The cURL Test Suite
+
+Requires:
+  perl (and a unix-style shell)
+  diff (when a test fail, a diff is shown)
+  stunnel (for HTTPS and FTPS tests)
+
+Run:
+  'make test'. This invokes the 'runtests.pl' perl script. Edit the top
+  variables of that script in case you have some specific needs.
+
+  The script breaks on the first test that doesn't do OK. Use -a to prevent
+  the script to abort on the first error. Run the script with -v for more
+  verbose output. Use -d to run the test servers with debug output enabled as
+  well.
+
+  Use -s for shorter output, or pass test numbers to run specific tests only
+  (like "./runtests.pl 3 4" to test 3 and 4 only). It also supports test case
+  ranges with 'to'. As in "./runtests 3 to 9" which runs the seven tests from
+  3 to 9.
+
+Memory:
+  The test script will check that all allocated memory is freed properly IF
+  curl has been built with the MALLOCDEBUG define set. The script will
+  automatically detect if that is the case, and it will use the ../memanalyze
+  script to analyze the memory debugging output.
+
+Debug:
+  If a test case fails, you can conveniently get the script to invoke the
+  debugger (gdb) for you with the server running and the exact same command
+  line parameters that failed. Just invoke 'runtests.pl <test number> -g' and
+  then just type 'run' in the debugger to perform the command through the
+  debugger.
+
+  If a test case causes a core dump, analyze it by running gdb like:
+
+          # gdb ../curl/src core
+
+  ... and get a stack trace with the gdb command:
+
+          (gdb) where
+
+Logs:
+  All logs are generated in the logs/ subdirctory (it is emtpied first
+  in the runtests.pl script). Use runtests.pl -k to make the temporary files
+  to be kept after the test run.
+
+Data:
+  All test-data are put in the data/ subdirctory. Each test is stored in the
+  file named according to the test number.
+
+  The test case file format is simply a way to store different sections within
+  the same physical file. The different sections are to be described here
+  within shortly.
+
+
+TEST CASE NUMBERS
+
+ So far, I've used this system:
+
+ 1   -  99   HTTP
+ 100 - 199   FTP
+ 200 - 299   FILE
+ 300 - 399   HTTPS
+ 400 - 499   FTPS
+
+ Since 30-apr-2003, there's nothing in the system that requires us to keep
+ within these number series. Each test case now specify their own server
+ requirements, independent of test number.
+
+TODO:
+
+  * Add persistant connection support and test cases
diff --git a/main/source/curl/tests/data/Makefile.am b/main/source/curl/tests/data/Makefile.am
new file mode 100644
index 00000000..cdda1112
--- /dev/null
+++ b/main/source/curl/tests/data/Makefile.am
@@ -0,0 +1,22 @@
+iall:
+install:
+
+test:
+	[ -f test1 ] || ln -s $(srcdir)/test* .
+
+EXTRA_DIST = \
+test1    test108  test117  test127  test20   test27   test34   test46 \
+test10   test109  test118  test13   test200  test28   test36   test47 \
+test100  test11   test119  test14   test201  test29   test37   test5 \
+test101  test110  test12   test15   test202  test3    test4    test6 \
+test102  test111  test120  test16   test21   test30   test400  test7 \
+test103  test112  test121  test17   test22   test300  test401  test8 \
+test104  test113  test122  test18   test23   test301  test402  test9 \
+test105  test114  test123  test19   test24   test302  test43   test31 \
+test106  test115  test124  test190  test25   test303  test44   test38 \
+test107  test116  test125  test2    test26   test33   test45   test126 \
+test304  test39   test32   test128  test48 test306 \
+test130  test131  test132  test133  test134 test135 test403 test305 \
+test49 test50 test51 test52 test53 test54 test55 test56 \
+test500 test501 test502 test503 test504 test136 test57 test137 test138 \
+test58 test139 test140 test141 test59 test60 test61 test142 test143 test62
diff --git a/main/source/curl/tests/data/Makefile.in b/main/source/curl/tests/data/Makefile.in
new file mode 100644
index 00000000..471014a7
--- /dev/null
+++ b/main/source/curl/tests/data/Makefile.in
@@ -0,0 +1,336 @@
+# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CA_BUNDLE = @CURL_CA_BUNDLE@
+CURL_DISABLE_DICT = @CURL_DISABLE_DICT@
+CURL_DISABLE_FILE = @CURL_DISABLE_FILE@
+CURL_DISABLE_FTP = @CURL_DISABLE_FTP@
+CURL_DISABLE_GOPHER = @CURL_DISABLE_GOPHER@
+CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@
+CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@
+CURL_DISABLE_TELNET = @CURL_DISABLE_TELNET@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_LIBZ = @HAVE_LIBZ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPV6_ENABLED = @IPV6_ENABLED@
+KRB4_ENABLED = @KRB4_ENABLED@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NO_UNDEFINED_FALSE = @NO_UNDEFINED_FALSE@
+NO_UNDEFINED_TRUE = @NO_UNDEFINED_TRUE@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_ENABLED = @OPENSSL_ENABLED@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKGADD_NAME = @PKGADD_NAME@
+PKGADD_PKG = @PKGADD_PKG@
+PKGADD_VENDOR = @PKGADD_VENDOR@
+PKGCONFIG = @PKGCONFIG@
+RANDOM_FILE = @RANDOM_FILE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VERSIONNUM = @VERSIONNUM@
+YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+
+EXTRA_DIST = \
+test1    test108  test117  test127  test20   test27   test34   test46 \
+test10   test109  test118  test13   test200  test28   test36   test47 \
+test100  test11   test119  test14   test201  test29   test37   test5 \
+test101  test110  test12   test15   test202  test3    test4    test6 \
+test102  test111  test120  test16   test21   test30   test400  test7 \
+test103  test112  test121  test17   test22   test300  test401  test8 \
+test104  test113  test122  test18   test23   test301  test402  test9 \
+test105  test114  test123  test19   test24   test302  test43   test31 \
+test106  test115  test124  test190  test25   test303  test44   test38 \
+test107  test116  test125  test2    test26   test33   test45   test126 \
+test304  test39   test32   test128  test48 test306 \
+test130  test131  test132  test133  test134 test135 test403 test305 \
+test49 test50 test51 test52 test53 test54 test55 test56 \
+test500 test501 test502 test503 test504 test136 test57 test137 test138 \
+test58 test139 test140 test141 test59 test60 test61 test142 test143 test62
+
+subdir = tests/data
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/lib/config.h \
+	$(top_builddir)/src/config.h \
+	$(top_builddir)/tests/server/config.h \
+	$(top_builddir)/lib/ca-bundle.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  tests/data/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+
+installdirs:
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
+
+iall:
+install:
+
+test:
+	[ -f test1 ] || ln -s $(srcdir)/test* .
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/main/source/curl/tests/data/test1 b/main/source/curl/tests/data/test1
new file mode 100644
index 00000000..516fc513
--- /dev/null
+++ b/main/source/curl/tests/data/test1
@@ -0,0 +1,47 @@
+#
+# Server-side
+<reply name="1">
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Funny-head: yesyes
+
+<foo>
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+simple HTTP GET
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/1
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /1 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test10 b/main/source/curl/tests/data/test10
new file mode 100644
index 00000000..c74775e4
--- /dev/null
+++ b/main/source/curl/tests/data/test10
@@ -0,0 +1,59 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.0 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+blablabla
+
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+simple HTTP PUT from file
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/want/10 -T log/test10.txt
+</command>
+<file name="log/test10.txt">
+Weird
+     file
+         to
+   upload
+for
+   testing
+the
+   PUT
+      feature
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+PUT /we/want/10 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Content-Length: 78
+
+Weird
+     file
+         to
+   upload
+for
+   testing
+the
+   PUT
+      feature
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test100 b/main/source/curl/tests/data/test100
new file mode 100644
index 00000000..dd845f88
--- /dev/null
+++ b/main/source/curl/tests/data/test100
@@ -0,0 +1,47 @@
+#
+# Server-side
+<reply name="1">
+<data>
+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP dir list PASV
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+filter off really nothing
+</strip>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+EPSV
+TYPE A
+LIST
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test101 b/main/source/curl/tests/data/test101
new file mode 100644
index 00000000..508209d7
--- /dev/null
+++ b/main/source/curl/tests/data/test101
@@ -0,0 +1,47 @@
+# Server-side
+<reply>
+<data>
+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP dir list, PORT with specified IP
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/ -P %HOSTIP
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+# strip all kinds of PORT, EPRT and LPRT curl can do
+<strip>
+^PORT 127,0,0,1,.*
+^EPRT.*
+^LPRT.*
+</strip>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+PORT 127,0,0,1,243,212
+TYPE A
+LIST
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test102 b/main/source/curl/tests/data/test102
new file mode 100644
index 00000000..3cfeb511
--- /dev/null
+++ b/main/source/curl/tests/data/test102
@@ -0,0 +1,42 @@
+# Server-side
+<reply>
+<data>
+data
+    to
+      see
+that FTP
+works
+  so does it?
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP RETR PASV
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/102
+</command>
+</test>
+<file name="log/ftpserver.cmd">
+REPLY EPSV 500 no such command
+</file>
+
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+EPSV
+PASV
+TYPE I
+SIZE 102
+RETR 102
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test103 b/main/source/curl/tests/data/test103
new file mode 100644
index 00000000..77eab707
--- /dev/null
+++ b/main/source/curl/tests/data/test103
@@ -0,0 +1,44 @@
+# Server-side
+<reply>
+<data>
+data
+    to
+      see
+that FTP
+works
+  so does it?
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP RETR PORT with CWD
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/a/path/103 -P -
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^PORT .*
+^EPRT.*
+^LPRT.*
+</strip>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+CWD a
+CWD path
+PORT 127,0,0,1,246,33
+TYPE I
+SIZE 103
+RETR 103
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test104 b/main/source/curl/tests/data/test104
new file mode 100644
index 00000000..ac6ece4a
--- /dev/null
+++ b/main/source/curl/tests/data/test104
@@ -0,0 +1,33 @@
+# Server-side
+<reply>
+<size>
+51
+</size>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP --head to get file size only
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/a/path/103 --head
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+CWD a
+CWD path
+MDTM 103
+TYPE I
+SIZE 103
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test105 b/main/source/curl/tests/data/test105
new file mode 100644
index 00000000..65c6f079
--- /dev/null
+++ b/main/source/curl/tests/data/test105
@@ -0,0 +1,42 @@
+# Server-side
+<reply>
+<data>
+data
+    to
+      see
+that FTP
+works
+  so does it?
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP user+password in URL and ASCII transfer
+ </name>
+ <command>
+ftp://userdude:passfellow@%HOSTIP:%FTPPORT/103 --use-ascii
+</command>
+<file name="log/ftpserver.cmd">
+REPLY EPSV 500 no such command
+REPLY SIZE 500 no such command
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER userdude
+PASS passfellow
+PWD
+EPSV
+PASV
+TYPE A
+SIZE 103
+RETR 103
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test106 b/main/source/curl/tests/data/test106
new file mode 100644
index 00000000..47065397
--- /dev/null
+++ b/main/source/curl/tests/data/test106
@@ -0,0 +1,40 @@
+# Server-side
+<reply>
+<data>
+data
+    to
+      see
+that FTP
+works
+  so does it?
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP GET with type=A style ASCII URL using %20 codes
+ </name>
+ <command>
+"ftp://%HOSTIP:%FTPPORT//path%20with%20%20spaces/and%20things2/106;type=A"
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+CWD 
+CWD path with  spaces
+CWD and things2
+EPSV
+TYPE A
+SIZE 106
+RETR 106
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test107 b/main/source/curl/tests/data/test107
new file mode 100644
index 00000000..f1696353
--- /dev/null
+++ b/main/source/curl/tests/data/test107
@@ -0,0 +1,41 @@
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP PASV upload file
+ </name>
+<file name="log/test107.txt">
+data
+    to
+      see
+that FTP
+works
+  so does it?
+</file>
+ <command>
+ftp://%HOSTIP:%FTPPORT/107 -T log/test107.txt
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<upload>
+data
+    to
+      see
+that FTP
+works
+  so does it?
+</upload>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+EPSV
+TYPE I
+STOR 107
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test108 b/main/source/curl/tests/data/test108
new file mode 100644
index 00000000..c3fe8da6
--- /dev/null
+++ b/main/source/curl/tests/data/test108
@@ -0,0 +1,46 @@
+# Server-side
+<reply>
+<data>
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP PORT upload with CWD
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/CWD/STOR/RETR/108 -T log/upload108 -P -
+</command>
+<file name="log/upload108">
+Moooooooooooo
+ upload this
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^PORT .*
+^EPRT .*
+^LPRT .*
+</strip>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+CWD CWD
+CWD STOR
+CWD RETR
+PORT 127,0,0,1,5,109
+TYPE I
+STOR 108
+</protocol>
+<upload>
+Moooooooooooo
+ upload this
+</upload>
+</verify>
diff --git a/main/source/curl/tests/data/test109 b/main/source/curl/tests/data/test109
new file mode 100644
index 00000000..400aed73
--- /dev/null
+++ b/main/source/curl/tests/data/test109
@@ -0,0 +1,40 @@
+# Server-side
+<reply>
+<data>
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP PASV upload append
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/109 -T log/upload109 --append
+</command>
+<file name="log/upload109">
+Moooooooooooo
+ upload this
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+</strip>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+EPSV
+TYPE I
+APPE 109
+</protocol>
+<upload>
+Moooooooooooo
+ upload this
+</upload>
+</verify>
diff --git a/main/source/curl/tests/data/test11 b/main/source/curl/tests/data/test11
new file mode 100644
index 00000000..5b58a045
--- /dev/null
+++ b/main/source/curl/tests/data/test11
@@ -0,0 +1,67 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 301 This is a weirdo text message
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Location: data/110002.txt?coolsite=yes
+Connection: close
+
+This server reply is for testing a simple Location: following
+
+</data>
+<data2>
+HTTP/1.1 200 Followed here fine
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+If this is received, the location following worked
+
+</data2>
+<datacheck>
+HTTP/1.1 301 This is a weirdo text message
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Location: data/110002.txt?coolsite=yes
+Connection: close
+
+HTTP/1.1 200 Followed here fine
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+If this is received, the location following worked
+
+</datacheck>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+simple HTTP Location: following
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/want/11 -L
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /want/11 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+GET /want/data/110002.txt?coolsite=yes HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test110 b/main/source/curl/tests/data/test110
new file mode 100644
index 00000000..9234d311
--- /dev/null
+++ b/main/source/curl/tests/data/test110
@@ -0,0 +1,43 @@
+# Server-side
+<reply>
+<data>
+expected to be a file without the first part
+but we emulate that
+</data>
+<size>
+85
+</size>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP download resume with set limit
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/110 -C 20
+</command>
+<file name="log/ftpserver.cmd">
+REPLY EPSV 500 no such command
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+</strip>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+EPSV
+PASV
+TYPE I
+SIZE 110
+REST 20
+RETR 110
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test111 b/main/source/curl/tests/data/test111
new file mode 100644
index 00000000..abc0953a
--- /dev/null
+++ b/main/source/curl/tests/data/test111
@@ -0,0 +1,36 @@
+# Server-side
+<reply>
+<size>
+85
+</size>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP download resume beyond file size
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/111 -C 2000
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+36
+</errorcode>
+<strip>
+</strip>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+EPSV
+TYPE I
+SIZE 111
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test112 b/main/source/curl/tests/data/test112
new file mode 100644
index 00000000..def0aa0c
--- /dev/null
+++ b/main/source/curl/tests/data/test112
@@ -0,0 +1,40 @@
+# Server-side
+<reply>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP PASV upload resume
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/112 -T log/upload112 -C 40
+</command>
+<file name="log/upload112">
+this is the *****crap******** that we're gonna upload
+
+worx?
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+</strip>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+EPSV
+TYPE I
+APPE 112
+</protocol>
+<upload>
+ gonna upload
+
+worx?
+</upload>
+</verify>
diff --git a/main/source/curl/tests/data/test113 b/main/source/curl/tests/data/test113
new file mode 100644
index 00000000..1e438b5b
--- /dev/null
+++ b/main/source/curl/tests/data/test113
@@ -0,0 +1,29 @@
+# Server-side
+<reply>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP download, failed login: USER not valid
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/113
+</command>
+<file name="log/ftpserver.cmd">
+REPLY USER 314 bluah you fewl!
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+12
+</errorcode>
+<protocol>
+USER anonymous
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test114 b/main/source/curl/tests/data/test114
new file mode 100644
index 00000000..a1067d66
--- /dev/null
+++ b/main/source/curl/tests/data/test114
@@ -0,0 +1,30 @@
+# Server-side
+<reply>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP download, failed login: PASS not valid
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/114
+</command>
+<file name="log/ftpserver.cmd">
+REPLY PASS 314 bluah you f00l!
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+11
+</errorcode>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test115 b/main/source/curl/tests/data/test115
new file mode 100644
index 00000000..28065520
--- /dev/null
+++ b/main/source/curl/tests/data/test115
@@ -0,0 +1,34 @@
+# Server-side
+<reply>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP download, failed PASV
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/115
+</command>
+<file name="log/ftpserver.cmd">
+REPLY PASV 314 bluah you f00l!
+REPLY EPSV 314 bluah you f00l!
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+13
+</errorcode>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+EPSV
+PASV
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test116 b/main/source/curl/tests/data/test116
new file mode 100644
index 00000000..fec7cb39
--- /dev/null
+++ b/main/source/curl/tests/data/test116
@@ -0,0 +1,36 @@
+# Server-side
+<reply>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP download, failed PORT
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/116 -P 127.0.0.1
+</command>
+<file name="log/ftpserver.cmd">
+REPLY PORT 314 bluah you f00l!
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+30
+</errorcode>
+<strip>
+^PORT 127,0,0,1,.*
+^EPRT .*
+^LPRT .*
+</strip>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test117 b/main/source/curl/tests/data/test117
new file mode 100644
index 00000000..16c96072
--- /dev/null
+++ b/main/source/curl/tests/data/test117
@@ -0,0 +1,35 @@
+# Server-side
+<reply>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP download, failed TYPE
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/117
+</command>
+<file name="log/ftpserver.cmd">
+REPLY EPSV 314 bluah you f00l!
+REPLY TYPE 314 bluah you f00l!
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+17
+</errorcode>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+EPSV
+PASV
+TYPE I
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test118 b/main/source/curl/tests/data/test118
new file mode 100644
index 00000000..f086728b
--- /dev/null
+++ b/main/source/curl/tests/data/test118
@@ -0,0 +1,37 @@
+# Server-side
+<reply>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP download, failed RETR
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/118
+</command>
+<file name="log/ftpserver.cmd">
+REPLY RETR 314 bluah you f00l!
+REPLY EPSV 314 bluah you f00l!
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+19
+</errorcode>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+EPSV
+PASV
+TYPE I
+SIZE 118
+RETR 118
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test119 b/main/source/curl/tests/data/test119
new file mode 100644
index 00000000..f952f4c3
--- /dev/null
+++ b/main/source/curl/tests/data/test119
@@ -0,0 +1,39 @@
+# Server-side
+<reply>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP download, failed RETR with PORT
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/119 -P -
+</command>
+<file name="log/ftpserver.cmd">
+REPLY RETR 314 bluah you f00l!
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+19
+</errorcode>
+<strip>
+^PORT.*
+^EPRT .*
+^LPRT .*
+</strip>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+TYPE I
+SIZE 119
+RETR 119
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test12 b/main/source/curl/tests/data/test12
new file mode 100644
index 00000000..627882d3
--- /dev/null
+++ b/main/source/curl/tests/data/test12
@@ -0,0 +1,47 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 206 Partial Content
+Date: Mon, 13 Nov 2000 13:41:09 GMT
+Server: Apache/1.3.11 (Unix) PHP/3.0.14
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 101
+Content-Range: bytes 100-200/3527
+Connection: close
+Content-Type: text/html
+
+ink="#ffffff" vlink="#cccccc">
+<table width=100% cellspacing=0 cellpadding=0 border=0>
+ <tr> 0123456
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP range support
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/want/12 -r 100-200
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /want/12 HTTP/1.1
+Range: bytes=100-200
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test120 b/main/source/curl/tests/data/test120
new file mode 100644
index 00000000..085455b3
--- /dev/null
+++ b/main/source/curl/tests/data/test120
@@ -0,0 +1,42 @@
+# Server-side
+<reply>
+<data>
+data
+    to
+      see
+that FTP
+works
+  so does it?
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+ftp download with post-quote delete operation
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/120 -Q "-DELE file"
+</command>
+<file name="log/ftpserver.cmd">
+REPLY EPSV 314 bluah you f00l!
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+EPSV
+PASV
+TYPE I
+SIZE 120
+RETR 120
+DELE file
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test121 b/main/source/curl/tests/data/test121
new file mode 100644
index 00000000..604a8560
--- /dev/null
+++ b/main/source/curl/tests/data/test121
@@ -0,0 +1,39 @@
+# Server-side
+<reply>
+<data>
+data
+    to
+      see
+that FTP
+works
+  so does it?
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+ftp download with post- and pre-transfer delete operations
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/121 -Q "-DELE after_transfer" -Q "DELE before_transfer"
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+DELE before_transfer
+EPSV
+TYPE I
+SIZE 121
+RETR 121
+DELE after_transfer
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test122 b/main/source/curl/tests/data/test122
new file mode 100644
index 00000000..1729fefa
--- /dev/null
+++ b/main/source/curl/tests/data/test122
@@ -0,0 +1,35 @@
+# Server-side
+<reply>
+<size>
+5
+</size>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP download resume with whole file already downloaded
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/122 -C 5
+</command>
+<file name="log/ftpserver.cmd">
+REPLY EPSV 500 no such command
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+EPSV
+PASV
+TYPE I
+SIZE 122
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test123 b/main/source/curl/tests/data/test123
new file mode 100644
index 00000000..db9db5ca
--- /dev/null
+++ b/main/source/curl/tests/data/test123
@@ -0,0 +1,30 @@
+# Server-side
+<reply>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP upload resume with whole file already downloaded
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/123 -T log/upload123 -C 51
+</command>
+<file name="log/upload123">
+--------------------------------------------------
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+EPSV
+TYPE I
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test124 b/main/source/curl/tests/data/test124
new file mode 100644
index 00000000..b8fdad00
--- /dev/null
+++ b/main/source/curl/tests/data/test124
@@ -0,0 +1,37 @@
+# Server-side
+<reply>
+<data>
+we can still send data even if pwd fails!
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP download, failed PWD
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/124
+</command>
+<file name="log/ftpserver.cmd">
+REPLY PWD 314 bluah you f00l!
+REPLY EPSV 314 bluah you f00l!
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+EPSV
+PASV
+TYPE I
+SIZE 124
+RETR 124
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test125 b/main/source/curl/tests/data/test125
new file mode 100644
index 00000000..4db0e551
--- /dev/null
+++ b/main/source/curl/tests/data/test125
@@ -0,0 +1,32 @@
+# Server-side
+<reply>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP download, failed CWD
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/path/to/file/125
+</command>
+<file name="log/ftpserver.cmd">
+REPLY CWD 314 bluah you f00l!
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+9
+</errorcode>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+CWD path
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test126 b/main/source/curl/tests/data/test126
new file mode 100644
index 00000000..b7f13bfd
--- /dev/null
+++ b/main/source/curl/tests/data/test126
@@ -0,0 +1,37 @@
+# Server-side
+<reply>
+<data>
+this is file contents
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP download with multiple replies at once in RETR
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/blalbla/lululul/126
+</command>
+<file name="log/ftpserver.cmd">
+RETRWEIRDO
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+CWD blalbla
+CWD lululul
+EPSV
+TYPE I
+SIZE 126
+RETR 126
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test127 b/main/source/curl/tests/data/test127
new file mode 100644
index 00000000..aadd6e63
--- /dev/null
+++ b/main/source/curl/tests/data/test127
@@ -0,0 +1,35 @@
+# Server-side
+<reply>
+<data>
+moooooooo
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP --disable-epsv
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/path/to/file/127 --disable-epsv
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+CWD path
+CWD to
+CWD file
+PASV
+TYPE I
+SIZE 127
+RETR 127
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test128 b/main/source/curl/tests/data/test128
new file mode 100644
index 00000000..51bcad67
--- /dev/null
+++ b/main/source/curl/tests/data/test128
@@ -0,0 +1,46 @@
+# Server-side
+<reply>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP upload with --crlf
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/128 -T log/upload128 --crlf
+</command>
+<file name="log/upload128">
+file
+with unix newlines
+meant to be
+converted
+with
+the
+--crlf option
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+EPSV
+TYPE I
+STOR 128
+</protocol>
+<upload>
+file
+with unix newlines
+meant to be
+converted
+with
+the
+--crlf option
+</upload>
+</verify>
diff --git a/main/source/curl/tests/data/test13 b/main/source/curl/tests/data/test13
new file mode 100644
index 00000000..323dc8ce
--- /dev/null
+++ b/main/source/curl/tests/data/test13
@@ -0,0 +1,37 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 Read you
+Deleted: suppose we got a header like this! ;-)
+
+blabla custom request result
+
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP custom request 'DELETE'
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/want/13 -X DELETE
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+DELETE /want/13 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test130 b/main/source/curl/tests/data/test130
new file mode 100644
index 00000000..172d0c01
--- /dev/null
+++ b/main/source/curl/tests/data/test130
@@ -0,0 +1,52 @@
+#
+# Server-side
+<reply name="1">
+<data>
+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</data>
+</reply>
+
+#
+# Client-side
+<client requires=netrc_debug>
+<server>
+ftp
+</server>
+ <name>
+FTP (optional .netrc; no user/pass) dir list PASV
+ </name>
+ <command>
+--netrc-optional ftp://%HOSTIP:%FTPPORT/
+</command>
+<file name="log/netrc" >
+# the following two lines were created while testing curl
+machine %HOSTIP login user1 password passwd1
+machine %HOSTIP login user2 password passwd2
+</file>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+filter off really nothing
+</strip>
+<protocol>
+USER user1
+PASS passwd1
+PWD
+EPSV
+TYPE A
+LIST
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test131 b/main/source/curl/tests/data/test131
new file mode 100644
index 00000000..fb384997
--- /dev/null
+++ b/main/source/curl/tests/data/test131
@@ -0,0 +1,52 @@
+#
+# Server-side
+<reply name="1">
+<data>
+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</data>
+</reply>
+
+#
+# Client-side
+<client requires=netrc_debug>
+<server>
+ftp
+</server>
+ <name>
+FTP (optional .netrc; user/no pass) dir list PASV
+ </name>
+ <command>
+--netrc-optional ftp://user2@%HOSTIP:%FTPPORT/
+</command>
+<file name="log/netrc" >
+# the following two lines were created while testing curl
+machine %HOSTIP login user1 password passwd1
+machine %HOSTIP login user2 password passwd2
+</file>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+filter off really nothing
+</strip>
+<protocol>
+USER user2
+PASS passwd2
+PWD
+EPSV
+TYPE A
+LIST
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test132 b/main/source/curl/tests/data/test132
new file mode 100644
index 00000000..fc191e27
--- /dev/null
+++ b/main/source/curl/tests/data/test132
@@ -0,0 +1,52 @@
+#
+# Server-side
+<reply name="1">
+<data>
+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</data>
+</reply>
+
+#
+# Client-side
+<client requires=netrc_debug>
+<server>
+ftp
+</server>
+ <name>
+FTP (optional .netrc; user/passwd supplied) dir list PASV
+ </name>
+ <command>
+--netrc-optional ftp://mary:mark@%HOSTIP:%FTPPORT/
+</command>
+<file name="log/netrc" >
+# the following two lines were created while testing curl
+machine %HOSTIP login user1 password passwd1
+machine %HOSTIP login user2 password passwd2
+</file>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+filter off really nothing
+</strip>
+<protocol>
+USER mary
+PASS mark
+PWD
+EPSV
+TYPE A
+LIST
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test133 b/main/source/curl/tests/data/test133
new file mode 100644
index 00000000..4de0180d
--- /dev/null
+++ b/main/source/curl/tests/data/test133
@@ -0,0 +1,52 @@
+#
+# Server-side
+<reply name="1">
+<data>
+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</data>
+</reply>
+
+#
+# Client-side
+<client requires=netrc_debug>
+<server>
+ftp
+</server>
+ <name>
+FTP (compulsory .netrc; ignored user/passwd) dir list PASV
+ </name>
+ <command>
+-n ftp://mary:mark@%HOSTIP:%FTPPORT/
+</command>
+<file name="log/netrc" >
+# the following two lines were created while testing curl
+machine %HOSTIP login user1 password passwd1
+machine %HOSTIP login user2 password passwd2
+</file>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+filter off really nothing
+</strip>
+<protocol>
+USER user1
+PASS passwd1
+PWD
+EPSV
+TYPE A
+LIST
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test134 b/main/source/curl/tests/data/test134
new file mode 100644
index 00000000..21d4a707
--- /dev/null
+++ b/main/source/curl/tests/data/test134
@@ -0,0 +1,52 @@
+#
+# Server-side
+<reply name="1">
+<data>
+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</data>
+</reply>
+
+#
+# Client-side
+<client requires=netrc_debug>
+<server>
+ftp
+</server>
+ <name>
+FTP (optional .netrc; programmatic user/passwd) dir list PASV
+ </name>
+ <command>
+--netrc-optional -u romulus:rhemus ftp://mary:mark@%HOSTIP:%FTPPORT/
+</command>
+<file name="log/netrc" >
+# the following two lines were created while testing curl
+machine %HOSTIP login user1 password passwd1
+machine %HOSTIP login user2 password passwd2
+</file>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+filter off really nothing
+</strip>
+<protocol>
+USER romulus
+PASS rhemus
+PWD
+EPSV
+TYPE A
+LIST
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test135 b/main/source/curl/tests/data/test135
new file mode 100644
index 00000000..87b79079
--- /dev/null
+++ b/main/source/curl/tests/data/test135
@@ -0,0 +1,42 @@
+# Server-side
+<reply>
+<data>
+0123456789abcdef
+0123456789abcdef
+0123456789abcdef
+0123456789abcdef
+</data>
+<datacheck nonewline=yes>
+0123456789abc
+</datacheck>
+<size>
+64
+</size>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP retrieve a byte-range
+ </name>
+ <command>
+-r 4-16 ftp://%HOSTIP:%FTPPORT/135
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+EPSV
+TYPE I
+SIZE 135
+REST 4
+RETR 135
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test136 b/main/source/curl/tests/data/test136
new file mode 100644
index 00000000..b71f37a1
--- /dev/null
+++ b/main/source/curl/tests/data/test136
@@ -0,0 +1,32 @@
+# Server-side
+<reply>
+<data>
+0123456789abcdef
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP with user and no password
+ </name>
+ <command>
+-u user: ftp://%HOSTIP:%FTPPORT/136
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER user
+PASS 
+PWD
+EPSV
+TYPE I
+SIZE 136
+RETR 136
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test137 b/main/source/curl/tests/data/test137
new file mode 100644
index 00000000..5c5f3d24
--- /dev/null
+++ b/main/source/curl/tests/data/test137
@@ -0,0 +1,37 @@
+# Server-side
+<reply>
+<data>
+this is file contents
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP download without size in RETR string
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/blalbla/lululul/137
+</command>
+<file name="log/ftpserver.cmd">
+RETRNOSIZE
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+CWD blalbla
+CWD lululul
+EPSV
+TYPE I
+SIZE 137
+RETR 137
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test138 b/main/source/curl/tests/data/test138
new file mode 100644
index 00000000..c2bf3800
--- /dev/null
+++ b/main/source/curl/tests/data/test138
@@ -0,0 +1,40 @@
+# Server-side
+<reply>
+<data>
+this is file contents
+</data>
+<size>
+-1
+</size>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP download without size in RETR string and no SIZE command
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/blalbla/lululul/138
+</command>
+<file name="log/ftpserver.cmd">
+RETRNOSIZE
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+CWD blalbla
+CWD lululul
+EPSV
+TYPE I
+SIZE 138
+RETR 138
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test139 b/main/source/curl/tests/data/test139
new file mode 100644
index 00000000..fbe993ed
--- /dev/null
+++ b/main/source/curl/tests/data/test139
@@ -0,0 +1,37 @@
+# Server-side
+<reply>
+<data>
+this is file contents
+</data>
+<mdtm>
+213 20030409102659
+</mdtm>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP download a newer file with -z
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/blalbla/139 -z "1 jan 1989"
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+CWD blalbla
+MDTM 139
+EPSV
+TYPE I
+SIZE 139
+RETR 139
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test14 b/main/source/curl/tests/data/test14
new file mode 100644
index 00000000..44e90f00
--- /dev/null
+++ b/main/source/curl/tests/data/test14
@@ -0,0 +1,37 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Server: thebest/1.0
+Connection: close
+
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP HEAD with Connection: close
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/want/14 -i --head
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+HEAD /want/14 HTTP/1.1
+User-Agent: curl/7.4.2-pre4 (sparc-sun-solaris2.7) libcurl 7.4.2-pre4
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test140 b/main/source/curl/tests/data/test140
new file mode 100644
index 00000000..957fa935
--- /dev/null
+++ b/main/source/curl/tests/data/test140
@@ -0,0 +1,32 @@
+# Server-side
+<reply>
+<data>
+</data>
+<mdtm>
+213 20030409102659
+</mdtm>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP download file with -z, expected to not transfer
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/blalbla/140 -z "1 jan 2004"
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+CWD blalbla
+MDTM 140
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test141 b/main/source/curl/tests/data/test141
new file mode 100644
index 00000000..bc5dc041
--- /dev/null
+++ b/main/source/curl/tests/data/test141
@@ -0,0 +1,37 @@
+# Server-side
+<reply>
+<data>
+</data>
+<mdtm>
+213 20030409102659
+</mdtm>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP download info with -I
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/blalbla/141 -I
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+CWD blalbla
+MDTM 141
+TYPE I
+SIZE 141
+</protocol>
+<stdout>
+Last-Modified: Wed, 09 Apr 2003 10:26:59 GMT
+</stdout>
+</verify>
diff --git a/main/source/curl/tests/data/test142 b/main/source/curl/tests/data/test142
new file mode 100644
index 00000000..6b6e1145
--- /dev/null
+++ b/main/source/curl/tests/data/test142
@@ -0,0 +1,30 @@
+# Server-side
+<reply>
+<data>
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP URL with too deep (100+) dir hierarchy
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/b
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+3
+</errorcode>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test143 b/main/source/curl/tests/data/test143
new file mode 100644
index 00000000..26d8f372
--- /dev/null
+++ b/main/source/curl/tests/data/test143
@@ -0,0 +1,34 @@
+# Server-side
+<reply>
+<data>
+bla bla bla
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP URL with type=a
+ </name>
+ <command>
+"ftp://%HOSTIP:%FTPPORT/%2ftmp/moo/143;type=a"
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+CWD /tmp
+CWD moo
+EPSV
+TYPE A
+SIZE 143
+RETR 143
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test15 b/main/source/curl/tests/data/test15
new file mode 100644
index 00000000..ec80e480
--- /dev/null
+++ b/main/source/curl/tests/data/test15
@@ -0,0 +1,47 @@
+# Server-side
+<reply>
+<data nocheck=true>
+HTTP/1.4 200 OK
+Fake: yes
+Fake: yes
+Fake: yes
+
+Repeated nonsense-headers
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+--write-out test
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/want/15 --write-out '%{url_effective} %{http_code} %{size_download}\n'
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<stdout>
+HTTP/1.4 200 OK
+Fake: yes
+Fake: yes
+Fake: yes
+
+Repeated nonsense-headers
+http://127.0.0.1:8999/want/15 200 26
+</stdout>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /want/15 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test16 b/main/source/curl/tests/data/test16
new file mode 100644
index 00000000..0084ec99
--- /dev/null
+++ b/main/source/curl/tests/data/test16
@@ -0,0 +1,40 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Type: text/html
+Funny-head: yesyes
+
+the content goes here
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP with proxy athorization
+ </name>
+ <command>
+ -U fake@user:§§§looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong -x %HOSTIP:%HOSTPORT http://we.want.that.site.com/16
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET http://we.want.that.site.com/16 HTTP/1.1
+Proxy-authorization: Basic ZmFrZUB1c2VyOqenp2xvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb28=
+Host: we.want.that.site.com
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test17 b/main/source/curl/tests/data/test17
new file mode 100644
index 00000000..463c6d8a
--- /dev/null
+++ b/main/source/curl/tests/data/test17
@@ -0,0 +1,45 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Funny-head: yesyes
+
+This is the proof it works
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP with config file on stdin
+ </name>
+ <stdin>
+#
+# Use a silly request without '--':
+request MOOO
+#
+# Set the user-agent using a short-option:
+-A "agent007 license to drill\t"
+#
+# long option *with* '--':
+--max-time 180
+ </stdin>
+ <command>
+-K - %HOSTIP:%HOSTPORT/that.site.com/17
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+MOOO /that.site.com/17 HTTP/1.1
+User-Agent: agent007 license to drill	
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test18 b/main/source/curl/tests/data/test18
new file mode 100644
index 00000000..63300647
--- /dev/null
+++ b/main/source/curl/tests/data/test18
@@ -0,0 +1,78 @@
+# Server-side
+<reply>
+<data nocheck=1>
+HTTP/1.1 200 OK
+Funny-head: yesyes
+
+moo
+</data>
+<data2>
+HTTP/1.1 200 OK
+Funny-head: yesyes
+
+foo
+</data2>
+<data3>
+HTTP/1.1 200 OK
+Funny-head: yesyes
+
+hoo
+</data3>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+multiple requests using {} in URL
+ </name>
+ <command>
+'%HOSTIP:%HOSTPORT/{18,180002,180003}'
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /18 HTTP/1.1
+User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+GET /180002 HTTP/1.1
+User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+GET /180003 HTTP/1.1
+User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+<stdout>
+--_curl_--127.0.0.1:8999/18
+HTTP/1.1 200 OK
+Funny-head: yesyes
+
+moo
+--_curl_--127.0.0.1:8999/180002
+HTTP/1.1 200 OK
+Funny-head: yesyes
+
+foo
+--_curl_--127.0.0.1:8999/180003
+HTTP/1.1 200 OK
+Funny-head: yesyes
+
+hoo
+</stdout>
+</verify>
diff --git a/main/source/curl/tests/data/test19 b/main/source/curl/tests/data/test19
new file mode 100644
index 00000000..ab73a2ca
--- /dev/null
+++ b/main/source/curl/tests/data/test19
@@ -0,0 +1,25 @@
+# Server-side
+<reply>
+<data>
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+none
+</server>
+ <name>
+attempt connect to non-listening socket
+ </name>
+ <command>
+%HOSTIP:60000
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+7
+</errorcode>
+</verify>
diff --git a/main/source/curl/tests/data/test190 b/main/source/curl/tests/data/test190
new file mode 100644
index 00000000..9c555a2e
--- /dev/null
+++ b/main/source/curl/tests/data/test190
@@ -0,0 +1,33 @@
+# Server-side
+<reply>
+moooooooo
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP download with strict timeout and slow CWD
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/path/to/file/126 -m 3
+</command>
+<file name="log/ftpserver.cmd">
+DELAY CWD 15
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+28
+</errorcode>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+CWD path
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test2 b/main/source/curl/tests/data/test2
new file mode 100644
index 00000000..db72d1e7
--- /dev/null
+++ b/main/source/curl/tests/data/test2
@@ -0,0 +1,45 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Type: text/html
+Funny-head: yesyes
+
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP GET with user and password
+ </name>
+ <command>
+ -u fake:user http://%HOSTIP:%HOSTPORT/2
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /2 HTTP/1.1
+Authorization: Basic ZmFrZTp1c2Vy
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+<data>
+[insert full protocol verifiction dump here]
+</data>
+</verify>
diff --git a/main/source/curl/tests/data/test20 b/main/source/curl/tests/data/test20
new file mode 100644
index 00000000..3bbfff80
--- /dev/null
+++ b/main/source/curl/tests/data/test20
@@ -0,0 +1,25 @@
+# Server-side
+<reply>
+<data>
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+attempt connect to non-existing host name
+ </name>
+ <command>
+non-existing-and-weeeeeeirdname
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+6
+</errorcode>
+</verify>
diff --git a/main/source/curl/tests/data/test200 b/main/source/curl/tests/data/test200
new file mode 100644
index 00000000..3ce7e472
--- /dev/null
+++ b/main/source/curl/tests/data/test200
@@ -0,0 +1,34 @@
+# Server-side
+<reply>
+<data>
+foo
+   bar
+bar
+   foo
+moo
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+none
+</server>
+ <name>
+basic file:// file
+ </name>
+ <command>
+file://localhost/%PWD/log/test200.txt
+</command>
+<file name="log/test200.txt">
+foo
+   bar
+bar
+   foo
+moo
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+</verify>
diff --git a/main/source/curl/tests/data/test201 b/main/source/curl/tests/data/test201
new file mode 100644
index 00000000..8661a50b
--- /dev/null
+++ b/main/source/curl/tests/data/test201
@@ -0,0 +1,25 @@
+# Server-side
+<reply>
+<data>
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+none
+</server>
+ <name>
+missing file:// file
+ </name>
+ <command>
+file://localhost/%PWD/log/non-existant-file.txt
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+37
+</errorcode>
+</verify>
diff --git a/main/source/curl/tests/data/test202 b/main/source/curl/tests/data/test202
new file mode 100644
index 00000000..bd2882d9
--- /dev/null
+++ b/main/source/curl/tests/data/test202
@@ -0,0 +1,29 @@
+# Server-side
+<reply>
+<data>
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+none
+</server>
+ <name>
+two file:// URLs to stdout
+ </name>
+ <command>
+file://localhost/%PWD/log/test202.txt file://localhost/%PWD/log/test202.txt
+</command>
+<file name="log/test202.txt">
+contents in a single file
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<stdout>
+contents in a single file
+contents in a single file
+</stdout>
+</verify>
diff --git a/main/source/curl/tests/data/test21 b/main/source/curl/tests/data/test21
new file mode 100644
index 00000000..c3d3d5ce
--- /dev/null
+++ b/main/source/curl/tests/data/test21
@@ -0,0 +1,25 @@
+# Server-side
+<reply>
+<data>
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+use curl with multiple request methods
+ </name>
+ <command>
+-I -d FOOO -F moo=moo localhost
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+2
+</errorcode>
+</verify>
diff --git a/main/source/curl/tests/data/test22 b/main/source/curl/tests/data/test22
new file mode 100644
index 00000000..d94280c9
--- /dev/null
+++ b/main/source/curl/tests/data/test22
@@ -0,0 +1,37 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Funny-head: yesyes
+
+This is the proof it works
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+get HTTP with URL > 10000 bytes
+ </name>
+ <command>
+%HOSTIP:%HOSTPORT/`perl -e 'print "a" x 10000;'`/22
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent: curl/.*
+</strip>
+<protocol>
+GET /aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/22 HTTP/1.1
+User-Agent: curl/7.4.2 (sparc-sun-solaris2.7) libcurl 7.4.2 (SSL 0.9.6)
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol
+</verify>
diff --git a/main/source/curl/tests/data/test23 b/main/source/curl/tests/data/test23
new file mode 100644
index 00000000..c953b258
--- /dev/null
+++ b/main/source/curl/tests/data/test23
@@ -0,0 +1,25 @@
+# Server-side
+<reply>
+<data>
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+unsupported protocol:// URL
+ </name>
+ <command>
+htfp://%HOSTIP:%HOSTPORT/none.htfml
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+1
+</errorcode>
+</verify>
diff --git a/main/source/curl/tests/data/test24 b/main/source/curl/tests/data/test24
new file mode 100644
index 00000000..771188ea
--- /dev/null
+++ b/main/source/curl/tests/data/test24
@@ -0,0 +1,40 @@
+# Server-side
+<reply>
+<data nocheck=1>
+HTTP/1.0 404 BAD BOY
+Content-Type: text/html
+
+This silly page doesn't reaaaaaly exist so you should not get it.
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP GET fail silently on HTTP error return
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/24 --fail
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent: curl/.*
+</strip>
+<protocol>
+GET /24 HTTP/1.1
+User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+<errorcode>
+22
+</errorcode>
+</verify>
diff --git a/main/source/curl/tests/data/test25 b/main/source/curl/tests/data/test25
new file mode 100644
index 00000000..a47758db
--- /dev/null
+++ b/main/source/curl/tests/data/test25
@@ -0,0 +1,112 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 301 This is a weirdo text message
+Server: test-server/fake
+Location: data/reply/25
+Content-Length: 32
+Connection: close
+
+Redirect to the same URL again!
+</data>
+<datacheck>
+HTTP/1.1 301 This is a weirdo text message
+Server: test-server/fake
+Location: data/reply/25
+Content-Length: 32
+Connection: close
+
+HTTP/1.1 301 This is a weirdo text message
+Server: test-server/fake
+Location: data/reply/25
+Content-Length: 32
+Connection: close
+
+HTTP/1.1 301 This is a weirdo text message
+Server: test-server/fake
+Location: data/reply/25
+Content-Length: 32
+Connection: close
+
+HTTP/1.1 301 This is a weirdo text message
+Server: test-server/fake
+Location: data/reply/25
+Content-Length: 32
+Connection: close
+
+HTTP/1.1 301 This is a weirdo text message
+Server: test-server/fake
+Location: data/reply/25
+Content-Length: 32
+Connection: close
+
+HTTP/1.1 301 This is a weirdo text message
+Server: test-server/fake
+Location: data/reply/25
+Content-Length: 32
+Connection: close
+
+</datacheck>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+looping HTTP Location: following with --max-redirs, no persistance
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/want/25 -L --max-redirs 5
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent: curl/.*
+</strip>
+<protocol>
+GET /want/25 HTTP/1.1
+User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+GET /want/data/reply/25 HTTP/1.1
+User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+GET /want/data/reply/data/reply/25 HTTP/1.1
+User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+GET /want/data/reply/data/reply/data/reply/25 HTTP/1.1
+User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+GET /want/data/reply/data/reply/data/reply/data/reply/25 HTTP/1.1
+User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+GET /want/data/reply/data/reply/data/reply/data/reply/data/reply/25 HTTP/1.1
+User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+
+<errorcode>
+47
+</errorcode>
+</verify>
diff --git a/main/source/curl/tests/data/test26 b/main/source/curl/tests/data/test26
new file mode 100644
index 00000000..df292bff
--- /dev/null
+++ b/main/source/curl/tests/data/test26
@@ -0,0 +1,38 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 Mooo
+Server: test-server/fake
+Connection: close
+
+*flopp*
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+specify more -o than URLs
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/want/26 -o - -o -
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent: curl.*
+</strip>
+<protocol>
+GET /want/26 HTTP/1.1
+User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test27 b/main/source/curl/tests/data/test27
new file mode 100644
index 00000000..65ea22e5
--- /dev/null
+++ b/main/source/curl/tests/data/test27
@@ -0,0 +1,49 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 Mooo
+Connection: close
+Set-Cookie: path=/; thewinneris=nowayyouwin;
+
+*flopp*
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+Get same cookie page several times
+ </name>
+ <command>
+'http://%HOSTIP:%HOSTPORT/want/{27,27,27}' -b none
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent: curl.*
+</strip>
+<protocol>
+GET /want/27 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+GET /want/27 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Cookie: thewinneris=nowayyouwin
+
+GET /want/27 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Cookie: thewinneris=nowayyouwin
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test28 b/main/source/curl/tests/data/test28
new file mode 100644
index 00000000..2c105735
--- /dev/null
+++ b/main/source/curl/tests/data/test28
@@ -0,0 +1,67 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 301 This is a weirdo text message
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Location:  /online/1,1795,Welcome,00.html/280002.txt?logout=TRUE
+Connection: close
+
+This server reply is for testing a simple Location: following
+
+</data>
+<data2>
+HTTP/1.1 200 Followed here fine
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+If this is received, the location following worked
+
+</data2>
+<datacheck>
+HTTP/1.1 301 This is a weirdo text message
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Location:  /online/1,1795,Welcome,00.html/280002.txt?logout=TRUE
+Connection: close
+
+HTTP/1.1 200 Followed here fine
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+If this is received, the location following worked
+
+</datacheck>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP Location: following with extra spaces in header
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/want/28 -L
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /want/28 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+GET /online/1,1795,Welcome,00.html/280002.txt?logout=TRUE HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test29 b/main/source/curl/tests/data/test29
new file mode 100644
index 00000000..398cf352
--- /dev/null
+++ b/main/source/curl/tests/data/test29
@@ -0,0 +1,43 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+<html>result</html>
+</data>
+<postcmd>
+wait 10
+</postcmd>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP with 2 secs timeout
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/want/29 -m 2
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /want/29 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+<errorcode>
+28
+</errorcode>
+</verify>
diff --git a/main/source/curl/tests/data/test3 b/main/source/curl/tests/data/test3
new file mode 100644
index 00000000..52b22643
--- /dev/null
+++ b/main/source/curl/tests/data/test3
@@ -0,0 +1,45 @@
+#
+# Server-side
+<reply name="1">
+<data>
+HTTP/1.0 200 OK
+Server: test-server/fake
+Content-Type: text/html
+Content-Length: 0
+
+this is data even though Content-Length is set to zero
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP POST with user and password
+ </name>
+ <command>
+ -d "fooo=mooo&pooo=clue&doo=%20%20%20++++" -u "fake:-user" http://%HOSTIP:%HOSTPORT/3
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol nonewline=yes>
+POST /3 HTTP/1.1
+Authorization: Basic ZmFrZTotdXNlcg==
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Content-Length: 37
+Content-Type: application/x-www-form-urlencoded
+
+fooo=mooo&pooo=clue&doo=%20%20%20++++
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test30 b/main/source/curl/tests/data/test30
new file mode 100644
index 00000000..60747d58
--- /dev/null
+++ b/main/source/curl/tests/data/test30
@@ -0,0 +1,35 @@
+# Server-side
+<reply>
+<data>
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP with no data in server reply
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/want/30
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /want/30 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+<errorcode>
+52
+</errorcode>
+</verify>
diff --git a/main/source/curl/tests/data/test300 b/main/source/curl/tests/data/test300
new file mode 100644
index 00000000..7cc44c93
--- /dev/null
+++ b/main/source/curl/tests/data/test300
@@ -0,0 +1,41 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 7
+
+MooMoo
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+https
+</server>
+ <name>
+simple HTTPS GET
+ </name>
+ <command>
+-k https://%HOSTIP:%HTTPSPORT/300
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /300 HTTP/1.1
+Host: 127.0.0.1:8433
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test301 b/main/source/curl/tests/data/test301
new file mode 100644
index 00000000..cf708a92
--- /dev/null
+++ b/main/source/curl/tests/data/test301
@@ -0,0 +1,45 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Type: text/html
+Funny-head: yesyes
+
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+https
+</server>
+ <name>
+HTTPS GET with user and password
+ </name>
+ <command>
+-k -u fake:user https://%HOSTIP:%HTTPSPORT/2
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /2 HTTP/1.1
+Authorization: Basic ZmFrZTp1c2Vy
+Host: 127.0.0.1:8433
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+<data>
+[insert full protocol verifiction dump here]
+</data>
+</verify>
diff --git a/main/source/curl/tests/data/test302 b/main/source/curl/tests/data/test302
new file mode 100644
index 00000000..7a744571
--- /dev/null
+++ b/main/source/curl/tests/data/test302
@@ -0,0 +1,35 @@
+#
+# Server-side
+<reply>
+MOOOOO
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+https
+</server>
+ <name>
+HTTPS GET over HTTP proxy fails
+ </name>
+ <command>
+-k -U fake:user -x %HOSTIP:%HOSTPORT https://bad.fakeurl-to.test/slash/302
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+56
+</errorcode>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+</protocol>
+<data>
+[insert full protocol verifiction dump here]
+</data>
+</verify>
diff --git a/main/source/curl/tests/data/test303 b/main/source/curl/tests/data/test303
new file mode 100644
index 00000000..26c3810b
--- /dev/null
+++ b/main/source/curl/tests/data/test303
@@ -0,0 +1,43 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+<html>result</html>
+</data>
+<postcmd>
+wait 10
+</postcmd>
+</reply>
+
+# Client-side
+<client>
+<server>
+https
+</server>
+ <name>
+HTTPS with 2 secs timeout
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/want/303 -m 2
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /want/303 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+<errorcode>
+28
+</errorcode>
+</verify>
diff --git a/main/source/curl/tests/data/test304 b/main/source/curl/tests/data/test304
new file mode 100644
index 00000000..093af60d
--- /dev/null
+++ b/main/source/curl/tests/data/test304
@@ -0,0 +1,61 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+blablabla
+
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+https
+</server>
+ <name>
+HTTPS multipart formpost
+ </name>
+ <command>
+-k https://%HOSTIP:%HTTPSPORT/we/want/304 -F name=daniel -F tool=curl -F file=@log/test304.txt
+</command>
+# We create this file before the command is invoked!
+<file name="log/test304.txt">
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^(User-Agent:|Content-Type: multipart/form-data;|------).*
+</strip>
+<protocol>
+POST /we/want/304 HTTP/1.1
+User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
+Host: 127.0.0.1:8433
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Content-Length: 1390
+Expect: 100-continue
+Content-Type: multipart/form-data; boundary=----------------------------c3b2ef7f0bb8
+
+------------------------------c3b2ef7f0bb8
+Content-Disposition: form-data; name="name"
+
+daniel
+------------------------------c3b2ef7f0bb8
+Content-Disposition: form-data; name="tool"
+
+curl
+------------------------------c3b2ef7f0bb8
+Content-Disposition: form-data; name="file"; filename="log/test304.txt"
+Content-Type: text/plain
+
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+
+------------------------------c3b2ef7f0bb8--
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test305 b/main/source/curl/tests/data/test305
new file mode 100644
index 00000000..30658b20
--- /dev/null
+++ b/main/source/curl/tests/data/test305
@@ -0,0 +1,30 @@
+# Server-side
+<reply>
+<data>
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+https
+</server>
+ <name>
+insecure HTTPS without permission
+ </name>
+ <command>
+https://%HOSTIP:%HOSTPORT/want/305 --cacert moooo
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+</protocol>
+<errorcode>
+60
+</errorcode>
+</verify>
diff --git a/main/source/curl/tests/data/test306 b/main/source/curl/tests/data/test306
new file mode 100644
index 00000000..75bb36fe
--- /dev/null
+++ b/main/source/curl/tests/data/test306
@@ -0,0 +1,54 @@
+#
+# Server-side
+<reply>
+<data>
+No headers at all, just data
+
+Let's get
+
+a little
+
+so that
+
+we
+
+have
+
+some
+
+test
+
+data to
+
+verify
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+https
+</server>
+ <name>
+HTTPS GET, receive no headers only data!
+ </name>
+ <command>
+-k https://%HOSTIP:%HTTPSPORT/306
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /306 HTTP/1.1
+Host: 127.0.0.1:8433
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test31 b/main/source/curl/tests/data/test31
new file mode 100644
index 00000000..73ff9ad5
--- /dev/null
+++ b/main/source/curl/tests/data/test31
@@ -0,0 +1,58 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Type: text/html
+Funny-head: yesyes
+Set-Cookie: foobar=name; domain=anything.com; path=/ ; secure
+Set-Cookie:ismatch=this  ; domain=127.0.0.1; path=/silly/
+Set-Cookie: partmatch=present; domain=127.0.0.1 ; path=/;
+Set-Cookie:eat=this; domain=moo.foo.moo;
+Set-Cookie: eat=this-too; domain=.foo.moo;
+Set-Cookie: nodomainnovalue
+Set-Cookie:   nodomain=value; expires=Tue Feb 1 11:56:27 MET 2014
+Set-Cookie: novalue; domain=reallysilly
+Set-Cookie: test=yes; domain=foo.com; expires=Tue Feb 1 11:56:27 MET 2007
+Set-Cookie: test2=yes; domain=se; expires=Tue Feb 1 11:56:27 MET 2007
+
+boo
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP with weirdly formatted cookies and cookiejar storage
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/want/31 -b none -c log/jar31.txt
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /we/want/31 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+<file name="log/jar31.txt">
+# Netscape HTTP Cookie File
+# http://www.netscape.com/newsref/std/cookie_spec.html
+# This file was generated by libcurl! Edit at your own risk.
+
+.127.0.0.1	TRUE	/silly/	FALSE	0	ismatch	this
+.127.0.0.1	TRUE	/	FALSE	0	partmatch	present
+127.0.0.1	FALSE	/we/want/	FALSE	1391252187	nodomain	value
+</file>
+</verify>
diff --git a/main/source/curl/tests/data/test32 b/main/source/curl/tests/data/test32
new file mode 100644
index 00000000..fb33efc6
--- /dev/null
+++ b/main/source/curl/tests/data/test32
@@ -0,0 +1,48 @@
+#
+# Server-side
+<reply name="1">
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Funny-head: yesyes
+
+<foo>
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP with -d and -G
+ </name>
+ <command>
+-d "foo=moo&moo=poo" http://%HOSTIP:%HOSTPORT/32 -G
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /32?foo=moo&moo=poo HTTP/1.1
+User-Agent: curl/7.9.5 (i686-pc-linux-gnu) libcurl 7.9.5-cvs (OpenSSL 0.9.5) (ipv6 enabled)
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test33 b/main/source/curl/tests/data/test33
new file mode 100644
index 00000000..a2b4f5d8
--- /dev/null
+++ b/main/source/curl/tests/data/test33
@@ -0,0 +1,53 @@
+# Server-side
+<reply>
+<data>
+
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP PUT with resume
+ </name>
+<file name="log/test33.txt">
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+</file>
+ <command>
+http://%HOSTIP:%HOSTPORT/33 -Tlog/test33.txt -C 50
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+PUT /33 HTTP/1.1
+Content-Range: bytes 50-99/100
+User-Agent: curl/7.6 (sparc-sun-solaris2.7) libcurl 7.6-pre4 (SSL 0.9.6) (krb4 enabled)
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Content-Length: 50
+
+012345678
+012345678
+012345678
+012345678
+012345678
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test34 b/main/source/curl/tests/data/test34
new file mode 100644
index 00000000..2d500dcf
--- /dev/null
+++ b/main/source/curl/tests/data/test34
@@ -0,0 +1,58 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 funky chunky!
+Server: fakeit/0.9 fakeitbad/1.0
+Transfer-Encoding: chunked
+Connection: mooo
+
+40
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+30
+bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+21;heresatest=moooo
+cccccccccccccccccccccccccccccccc
+
+0
+muuu
+</data>
+<datacheck>
+HTTP/1.1 200 funky chunky!
+Server: fakeit/0.9 fakeitbad/1.0
+Transfer-Encoding: chunked
+Connection: mooo
+
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccc
+</datacheck>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP GET with chunked Transfer-Encoding
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/34
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /34 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
+
diff --git a/main/source/curl/tests/data/test36 b/main/source/curl/tests/data/test36
new file mode 100644
index 00000000..ed3a30f0
--- /dev/null
+++ b/main/source/curl/tests/data/test36
@@ -0,0 +1,57 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 funky chunky!
+Server: fakeit/0.9 fakeitbad/1.0
+Transfer-Encoding: chunked
+Connection: mooo
+
+2
+a
+
+ILLEGAL
+bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+</data>
+<datacheck>
+HTTP/1.1 200 funky chunky!
+Server: fakeit/0.9 fakeitbad/1.0
+Transfer-Encoding: chunked
+Connection: mooo
+
+a
+</datacheck>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP GET with bad chunked Transfer-Encoding
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/36
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+56
+</errocode>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /36 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
+
diff --git a/main/source/curl/tests/data/test37 b/main/source/curl/tests/data/test37
new file mode 100644
index 00000000..f67c069c
--- /dev/null
+++ b/main/source/curl/tests/data/test37
@@ -0,0 +1,39 @@
+#
+# Server-side
+<reply>
+<data>
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP GET with nothing returned from server
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/37
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+52
+</errocode>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /37 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
+
diff --git a/main/source/curl/tests/data/test38 b/main/source/curl/tests/data/test38
new file mode 100644
index 00000000..1a8055de
--- /dev/null
+++ b/main/source/curl/tests/data/test38
@@ -0,0 +1,52 @@
+# Server-side
+<reply>
+<data nocheck=1>
+HTTP/1.0 200 Mooo
+Date: Mon, 13 Nov 2000 13:41:09 GMT
+Server: myown/1.0
+Connection: close
+
+todelooooo lalalala yada yada, we know nothing about ranges ;-)
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP resume request without server supporting it
+ </name>
+ <command option="no-output">
+http://%HOSTIP:%HOSTPORT/want/38 -C - -i -o log/fewl.txt
+</command>
+<file name="log/fewl.txt">
+This text is here to simulate a partly downloaded file to resume
+download on.
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+33
+</errorcode>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /want/38 HTTP/1.1
+Range: bytes=78-
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+
+# the download target file must remain untouched
+<file name="log/fewl.txt">
+This text is here to simulate a partly downloaded file to resume
+download on.
+</file>
+</verify>
diff --git a/main/source/curl/tests/data/test39 b/main/source/curl/tests/data/test39
new file mode 100644
index 00000000..56f8a3f1
--- /dev/null
+++ b/main/source/curl/tests/data/test39
@@ -0,0 +1,76 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+blablabla
+
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP RFC1867-type formposting with filename= and type=
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/want/39 -F name=daniel -F tool=curl -F "file=@log/test39.txt;filename=fakerfile;type=moo/foobar" -F file2=@log/test39.txt
+</command>
+# We create this file before the command is invoked!
+<file name="log/test39.txt">
+foo bar
+This is a bar foo
+bar
+foo
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^(User-Agent:|Content-Type: multipart/form-data;|-------).*
+</strip>
+<protocol>
+POST /we/want/39 HTTP/1.1
+User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Content-Length: 598
+Expect: 100-continue
+Content-Type: multipart/form-data; boundary=----------------------------24e78000bd32
+
+------------------------------24e78000bd32
+Content-Disposition: form-data; name="name"
+
+daniel
+------------------------------24e78000bd32
+Content-Disposition: form-data; name="tool"
+
+curl
+------------------------------24e78000bd32
+Content-Disposition: form-data; name="file"; filename="fakerfile"
+Content-Type: moo/foobar
+
+foo bar
+This is a bar foo
+bar
+foo
+
+------------------------------24e78000bd32
+Content-Disposition: form-data; name="file2"; filename="log/test39.txt"
+Content-Type: text/plain
+
+foo bar
+This is a bar foo
+bar
+foo
+
+------------------------------24e78000bd32--
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test4 b/main/source/curl/tests/data/test4
new file mode 100644
index 00000000..211b5594
--- /dev/null
+++ b/main/source/curl/tests/data/test4
@@ -0,0 +1,42 @@
+#
+# Server-side
+<reply name="1">
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Type: text/html
+Funny-head: yesyes
+
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+Replaced internal and added custom HTTP headers
+ </name>
+ <command>
+ -H "extra-header: here" -H "Accept: replaced" http://%HOSTIP:%HOSTPORT/4
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /4 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+extra-header: here
+Accept: replaced
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test400 b/main/source/curl/tests/data/test400
new file mode 100644
index 00000000..4b6e0c97
--- /dev/null
+++ b/main/source/curl/tests/data/test400
@@ -0,0 +1,51 @@
+#
+# Server-side
+<reply name="1">
+<data>
+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+ftps
+</server>
+ <name>
+FTPS dir list PASV
+ </name>
+ <command>
+-k ftps://%HOSTIP:%FTPSPORT/
+</command>
+<file name="log/ftpserver.cmd">
+REPLY EPSV 500 no such command
+</file>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+filter off really nothing
+</strip>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+EPSV
+PASV
+TYPE A
+LIST
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test401 b/main/source/curl/tests/data/test401
new file mode 100644
index 00000000..07b432bc
--- /dev/null
+++ b/main/source/curl/tests/data/test401
@@ -0,0 +1,33 @@
+# Server-side
+<reply>
+moooooooo
+</reply>
+
+# Client-side
+<client>
+<server>
+ftps
+</server>
+ <name>
+FTPS download with strict timeout and slow CWD
+ </name>
+ <command>
+-k ftps://%HOSTIP:%FTPSPORT/path/to/file/401 -m 4
+</command>
+<file name="log/ftpserver.cmd">
+DELAY CWD 15
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+28
+</errorcode>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+CWD path
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test402 b/main/source/curl/tests/data/test402
new file mode 100644
index 00000000..381bef0e
--- /dev/null
+++ b/main/source/curl/tests/data/test402
@@ -0,0 +1,27 @@
+# Server-side
+<reply>
+moooooooo
+</reply>
+
+# Client-side
+<client>
+<server>
+ftps
+</server>
+<killserver>
+ftp
+</killserver>
+ <name>
+FTPS operation to FTP port
+ </name>
+ <command>
+-k ftps://%HOSTIP:%FTPPORT/path/to/file/402
+</command>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+35
+</errorcode>
+</verify>
diff --git a/main/source/curl/tests/data/test403 b/main/source/curl/tests/data/test403
new file mode 100644
index 00000000..ec9e68f3
--- /dev/null
+++ b/main/source/curl/tests/data/test403
@@ -0,0 +1,33 @@
+#
+# Server-side
+<reply name="1">
+<data>
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+ftps
+</server>
+ <name>
+insecure FTPS without permission
+ </name>
+ <command>
+ ftps://%HOSTIP:%FTPSPORT/403 --cacert foo
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+filter off really nothing
+</strip>
+<errorcode>
+60
+</errorcode>
+<protocol>
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test43 b/main/source/curl/tests/data/test43
new file mode 100644
index 00000000..c34743f8
--- /dev/null
+++ b/main/source/curl/tests/data/test43
@@ -0,0 +1,67 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 301 This is a weirdo text message
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Location: data/110002.txt?coolsite=yes
+Connection: close
+
+This server reply is for testing a simple Location: following
+
+</data>
+<data2>
+HTTP/1.1 200 Followed here fine
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+If this is received, the location following worked
+
+</data2>
+<datacheck>
+HTTP/1.1 301 This is a weirdo text message
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Location: data/110002.txt?coolsite=yes
+Connection: close
+
+HTTP/1.1 200 Followed here fine
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+If this is received, the location following worked
+
+</datacheck>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP Location: following over HTTP proxy
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/want/11 -L -x %HOSTIP:%HOSTPORT
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET http://127.0.0.1:8999/want/11 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+GET http://127.0.0.1:8999/want/data/110002.txt?coolsite=yes HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test44 b/main/source/curl/tests/data/test44
new file mode 100644
index 00000000..269f17be
--- /dev/null
+++ b/main/source/curl/tests/data/test44
@@ -0,0 +1,64 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+blablabla
+
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP RFC1867-type formposting without Expect: header
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/want/44 -F name=daniel -F tool=curl -F file=@log/test44.txt -H 'Expect:'
+</command>
+# We create this file before the command is invoked!
+<file name="log/test44.txt">
+foo-
+This is a moo-
+bar
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^(User-Agent:|Content-Type: multipart/form-data;|------).*
+</strip>
+<protocol>
+POST /we/want/44 HTTP/1.1
+User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Content-Length: 412
+Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce
+
+------------------------------7c633d5c27ce
+Content-Disposition: form-data; name="name"
+
+daniel
+------------------------------7c633d5c27ce
+Content-Disposition: form-data; name="tool"
+
+curl
+------------------------------7c633d5c27ce
+Content-Disposition: form-data; name="file"; filename="log/test44.txt"
+Content-Type: text/plain
+
+foo-
+This is a moo-
+bar
+
+------------------------------7c633d5c27ce--
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test45 b/main/source/curl/tests/data/test45
new file mode 100644
index 00000000..60aa4d7e
--- /dev/null
+++ b/main/source/curl/tests/data/test45
@@ -0,0 +1,67 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 301 This is a weirdo text message
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Location: data.cgi?moo=http://&/110002
+Connection: close
+
+This server reply is for testing a simple Location: following
+
+</data>
+<data2>
+HTTP/1.1 200 Followed here fine
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+If this is received, the location following worked
+
+</data2>
+<datacheck>
+HTTP/1.1 301 This is a weirdo text message
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Location: data.cgi?moo=http://&/110002
+Connection: close
+
+HTTP/1.1 200 Followed here fine
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+If this is received, the location following worked
+
+</datacheck>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+simple HTTP Location: without protocol in initial URL
+ </name>
+ <command>
+%HOSTIP:%HOSTPORT/want/45 -L
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /want/45 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+GET /want/data.cgi?moo=http://&/110002 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test46 b/main/source/curl/tests/data/test46
new file mode 100644
index 00000000..b8891e85
--- /dev/null
+++ b/main/source/curl/tests/data/test46
@@ -0,0 +1,65 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Server: Microsoft-IIS/4.0
+Date: Tue, 25 Sep 2001 19:37:44 GMT
+Content-Type: text/html
+Set-Cookie: ckyPersistent=permanent; expires=Tue, 01-Jan-2010 05:00:00 GMT; path=/
+Set-Cookie: ckySession=temporary; path=/
+Set-Cookie: ASPSESSIONIDQGGQQSJJ=GKNBDIFAAOFDPDAIEAKDIBKE; path=/
+Cache-control: private
+
+This server reply is for testing a simple Location: following
+
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP, get cookies and store in cookie jar
+ </name>
+ <command>
+%HOSTIP:%HOSTPORT/want/46 -c log/jar46 -b log/injar46
+</command>
+<file name="log/injar46">
+# Netscape HTTP Cookie File
+# http://www.netscape.com/newsref/std/cookie_spec.html
+# This is generated by libcurl!  Do not edit.
+
+www.fake.come	FALSE	/	FALSE	1022144953	cookiecliente	si
+www.loser.com	FALSE	/	FALSE	1139150993	UID	99
+127.0.0.1	FALSE	/	FALSE	1139150993	mooo	indeed
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /want/46 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Cookie: mooo=indeed
+
+</protocol>
+<file name="log/jar46">
+# Netscape HTTP Cookie File
+# http://www.netscape.com/newsref/std/cookie_spec.html
+# This file was generated by libcurl! Edit at your own risk.
+
+www.fake.come	FALSE	/	FALSE	1022144953	cookiecliente	si
+www.loser.com	FALSE	/	FALSE	1139150993	UID	99
+127.0.0.1	FALSE	/	FALSE	1139150993	mooo	indeed
+127.0.0.1	FALSE	/	FALSE	1262322000	ckyPersistent	permanent
+127.0.0.1	FALSE	/	FALSE	0	ckySession	temporary
+127.0.0.1	FALSE	/	FALSE	0	ASPSESSIONIDQGGQQSJJ	GKNBDIFAAOFDPDAIEAKDIBKE
+</file>
+</verify>
diff --git a/main/source/curl/tests/data/test47 b/main/source/curl/tests/data/test47
new file mode 100644
index 00000000..602538cf
--- /dev/null
+++ b/main/source/curl/tests/data/test47
@@ -0,0 +1,41 @@
+#
+# Server-side
+<reply name="47">
+<data>
+HTTP/1.0 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+<foo> within foo </foo>
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+simple HTTP 1.0 GET
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/47 -0
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /47 HTTP/1.0
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
+
diff --git a/main/source/curl/tests/data/test48 b/main/source/curl/tests/data/test48
new file mode 100644
index 00000000..2bc7b17f
--- /dev/null
+++ b/main/source/curl/tests/data/test48
@@ -0,0 +1,39 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP with -d and -G and -I
+ </name>
+ <command>
+-d "foo=moo&moo=poo" http://%HOSTIP:%HOSTPORT/48 -G -I
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+HEAD /48?foo=moo&moo=poo HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test49 b/main/source/curl/tests/data/test49
new file mode 100644
index 00000000..d33e3271
--- /dev/null
+++ b/main/source/curl/tests/data/test49
@@ -0,0 +1,67 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 302 OK
+Location: ../moo.html/490002
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+</data>
+<data2>
+HTTP/1.1 200 OK
+Location: this should be ignored
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+body
+</data2>
+<datacheck>
+HTTP/1.1 302 OK
+Location: ../moo.html/490002
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+HTTP/1.1 200 OK
+Location: this should be ignored
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+body
+</datacheck>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP follow redirect with ../
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/are/all/twits/49 -L
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /we/are/all/twits/49 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+GET /we/are/all/moo.html/490002 HTTP/1.1
+User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test5 b/main/source/curl/tests/data/test5
new file mode 100644
index 00000000..55d1fa70
--- /dev/null
+++ b/main/source/curl/tests/data/test5
@@ -0,0 +1,41 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Type: text/html
+Funny-head: yesyes
+
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP over proxy
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/want/that/page/5 -x %HOSTIP:%HOSTPORT
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET http://127.0.0.1:8999/we/want/that/page/5 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test50 b/main/source/curl/tests/data/test50
new file mode 100644
index 00000000..8055330e
--- /dev/null
+++ b/main/source/curl/tests/data/test50
@@ -0,0 +1,67 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 302 OK
+Location: ../../moo.html/500002
+Date: Thu, 09 Nov 2010 14:50:00 GMT
+Connection: close
+
+</data>
+<data2>
+HTTP/1.1 200 OK
+Location: this should be ignored
+Date: Thu, 09 Nov 2010 14:50:00 GMT
+Connection: close
+
+body
+</data2>
+<datacheck>
+HTTP/1.1 302 OK
+Location: ../../moo.html/500002
+Date: Thu, 09 Nov 2010 14:50:00 GMT
+Connection: close
+
+HTTP/1.1 200 OK
+Location: this should be ignored
+Date: Thu, 09 Nov 2010 14:50:00 GMT
+Connection: close
+
+body
+</datacheck>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP follow redirect with ../../
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/are/all/twits/50 -L
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /we/are/all/twits/50 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+GET /we/are/moo.html/500002 HTTP/1.1
+User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test500 b/main/source/curl/tests/data/test500
new file mode 100644
index 00000000..1a1a7182
--- /dev/null
+++ b/main/source/curl/tests/data/test500
@@ -0,0 +1,48 @@
+#
+# Server-side
+<reply name="1">
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Funny-head: yesyes
+
+<foo>
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+# tool is what to use instead of 'curl'
+<tool>
+lib500
+</tool>
+
+ <name>
+simple libcurl HTTP GET tool
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/500
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+GET /500 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test501 b/main/source/curl/tests/data/test501
new file mode 100644
index 00000000..d79186d6
--- /dev/null
+++ b/main/source/curl/tests/data/test501
@@ -0,0 +1,30 @@
+#
+# Server-side
+<reply name="1">
+</reply>
+
+# Client-side
+<client>
+<server>
+file
+</server>
+# tool is what to use instead of 'curl'
+<tool>
+lib501
+</tool>
+
+ <name>
+simple libcurl attempt operation without URL set
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/501
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+3
+</errorcode>
+</verify>
diff --git a/main/source/curl/tests/data/test502 b/main/source/curl/tests/data/test502
new file mode 100644
index 00000000..ca15f074
--- /dev/null
+++ b/main/source/curl/tests/data/test502
@@ -0,0 +1,40 @@
+#
+# Server-side
+<reply>
+<data>
+foo
+   bar
+bar
+   foo
+moo
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+file
+</server>
+# tool is what to use instead of 'curl'
+<tool>
+lib502
+</tool>
+
+ <name>
+simple multi file:// get
+ </name>
+ <command>
+file://%PWD/log/test502.txt
+</command>
+<file name="log/test502.txt">
+foo
+   bar
+bar
+   foo
+moo
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+</verify>
diff --git a/main/source/curl/tests/data/test503 b/main/source/curl/tests/data/test503
new file mode 100644
index 00000000..84d2984e
--- /dev/null
+++ b/main/source/curl/tests/data/test503
@@ -0,0 +1,52 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+# tool is what to use instead of 'curl'
+<tool>
+lib503
+</tool>
+
+ <name>
+simple multi https:// through proxy with authentication info
+ </name>
+ <command>
+http://%HOSTIP:%HTTPSPORT/503 localhost:%HOSTPORT
+</command>
+<file name="log/test502.txt">
+foo
+   bar
+bar
+   foo
+moo
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+CONNECT 127.0.0.1:8433 HTTP/1.0
+Proxy-authorization: Basic dGVzdDppbmc=
+
+GET /503 HTTP/1.1
+Proxy-authorization: Basic dGVzdDppbmc=
+Authorization: Basic dGVzdDppbmc=
+Host: 127.0.0.1:8433
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test504 b/main/source/curl/tests/data/test504
new file mode 100644
index 00000000..8d329d03
--- /dev/null
+++ b/main/source/curl/tests/data/test504
@@ -0,0 +1,28 @@
+# Server-side
+<reply>
+</reply>
+
+# Client-side
+<client>
+<server>
+none
+</server>
+# tool is what to use instead of 'curl'
+<tool>
+lib504
+</tool>
+
+ <name>
+simple multi through local proxy without listener
+ </name>
+ <command>
+http://%HOSTIP:%HTTPSPORT/504 localhost:55555
+</command>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+100
+</errorcode>
+</verify>
diff --git a/main/source/curl/tests/data/test51 b/main/source/curl/tests/data/test51
new file mode 100644
index 00000000..30dd8260
--- /dev/null
+++ b/main/source/curl/tests/data/test51
@@ -0,0 +1,67 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 302 OK
+Location: ../../../../../../../510002
+Date: Thu, 09 Nov 2010 14:50:00 GMT
+Connection: close
+
+</data>
+<data2>
+HTTP/1.1 200 OK
+Location: this should be ignored
+Date: Thu, 09 Nov 2010 14:50:00 GMT
+Connection: close
+
+body
+</data2>
+<datacheck>
+HTTP/1.1 302 OK
+Location: ../../../../../../../510002
+Date: Thu, 09 Nov 2010 14:50:00 GMT
+Connection: close
+
+HTTP/1.1 200 OK
+Location: this should be ignored
+Date: Thu, 09 Nov 2010 14:50:00 GMT
+Connection: close
+
+body
+</datacheck>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP follow redirect with exessive ../
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/are/all/twits/51 -L
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /we/are/all/twits/51 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+GET /510002 HTTP/1.1
+User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test52 b/main/source/curl/tests/data/test52
new file mode 100644
index 00000000..3859c248
--- /dev/null
+++ b/main/source/curl/tests/data/test52
@@ -0,0 +1,67 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 302 OK
+Location: ./520002
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+</data>
+<data2>
+HTTP/1.1 200 OK
+Location: this should be ignored
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+body
+</data2>
+<datacheck>
+HTTP/1.1 302 OK
+Location: ./520002
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+HTTP/1.1 200 OK
+Location: this should be ignored
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+body
+</datacheck>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP follow redirect with ./-prefix
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/are/all/twits/52 -L
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /we/are/all/twits/52 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+GET /we/are/all/twits/520002 HTTP/1.1
+User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test53 b/main/source/curl/tests/data/test53
new file mode 100644
index 00000000..41caf7c0
--- /dev/null
+++ b/main/source/curl/tests/data/test53
@@ -0,0 +1,45 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Server: Microsoft-IIS/4.0
+Date: Tue, 25 Sep 2001 19:37:44 GMT
+Content-Type: text/html
+Connection: close
+
+This server says moo
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP, junk session cookies
+ </name>
+ <command>
+%HOSTIP:%HOSTPORT/want/53 -b log/injar53 -j
+</command>
+<file name="log/injar53">
+127.0.0.1	FALSE	/	FALSE	2139150993	mooo	indeed
+127.0.0.1	FALSE	/	FALSE	0		moo1	indeed
+127.0.0.1	FALSE	/	FALSE	1		moo2	indeed
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /want/53 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Cookie: mooo=indeed
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test54 b/main/source/curl/tests/data/test54
new file mode 100644
index 00000000..550e3b14
--- /dev/null
+++ b/main/source/curl/tests/data/test54
@@ -0,0 +1,37 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 302 This is a weirdo text message
+Connection: close
+Location:  
+
+This server reply is for testing
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP with blank Location:
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/want/54 -L
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /want/54 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test55 b/main/source/curl/tests/data/test55
new file mode 100644
index 00000000..6528db42
--- /dev/null
+++ b/main/source/curl/tests/data/test55
@@ -0,0 +1,59 @@
+<reply>
+<data>
+HTTP/1.1 302 OK
+Location: 550002
+Date: Thu, 09 Nov 2010 14:50:00 GMT
+Connection: close
+
+</data>
+<data2>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:50:00 GMT
+Connection: close
+
+body
+</data2>
+<datacheck>
+HTTP/1.1 302 OK
+Location: 550002
+Date: Thu, 09 Nov 2010 14:50:00 GMT
+Connection: close
+
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:50:00 GMT
+Connection: close
+
+body
+</datacheck>
+</reply>
+
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP follow redirect with single slash in path
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/55 -L
+</command>
+</client>
+
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /55 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+GET /550002 HTTP/1.1
+User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test56 b/main/source/curl/tests/data/test56
new file mode 100644
index 00000000..da5ccc77
--- /dev/null
+++ b/main/source/curl/tests/data/test56
@@ -0,0 +1,52 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Funny-head: yesyes
+
+This is the proof it works
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP POST with *HUGE* request and chunked transfer-encoding
+ </name>
+ <stdin>
+#
+data "we post this"
+#
+# enforce chunky post!
+header "Transfer-Encoding: chunked"
+#
+# Set the user-agent using a short-option:
+-A "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+#
+ </stdin>
+ <command>
+-K - %HOSTIP:%HOSTPORT/that.site.com/56
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+POST /that.site.com/56 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Transfer-Encoding: chunked
+Content-Type: application/x-www-form-urlencoded
+
+c
+we post this
+0
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test57 b/main/source/curl/tests/data/test57
new file mode 100644
index 00000000..fb1d9c38
--- /dev/null
+++ b/main/source/curl/tests/data/test57
@@ -0,0 +1,39 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Funny-head: yesyes
+Content-Type: text/html; charset=ISO-8859-4   
+
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP content-type with spaces in
+ </name>
+ <command>
+-w '%{content_type}\n' %HOSTIP:%HOSTPORT/57 -o log/out57
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<file name="log/out57">
+text/html; charset=ISO-8859-4
+</file>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /57 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test58 b/main/source/curl/tests/data/test58
new file mode 100644
index 00000000..89721d55
--- /dev/null
+++ b/main/source/curl/tests/data/test58
@@ -0,0 +1,43 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.0 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+blablabla
+
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+<name>
+HTTP PUT from file with weird letters
+</name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/want/ -T log/58te[]st.txt
+</command>
+<file name="log/58te[]st.txt">
+a few bytes
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+PUT /we/want/58te%5B%5Dst%2Etxt HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Content-Length: 12
+
+a few bytes
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test59 b/main/source/curl/tests/data/test59
new file mode 100644
index 00000000..4943a13b
--- /dev/null
+++ b/main/source/curl/tests/data/test59
@@ -0,0 +1,40 @@
+#
+# Server-side
+<reply name="1">
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+hej 
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP URL with slash but with "parameter"
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT?mooo/59
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /?mooo/59 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test6 b/main/source/curl/tests/data/test6
new file mode 100644
index 00000000..f81824d9
--- /dev/null
+++ b/main/source/curl/tests/data/test6
@@ -0,0 +1,39 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Type: text/html
+Funny-head: yesyes
+
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP with simple cookie send
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/want/that/page/6 -b "name=contents;name2=content2"
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /we/want/that/page/6 HTTP/1.1
+Cookie: name=contents;name2=content2
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test60 b/main/source/curl/tests/data/test60
new file mode 100644
index 00000000..ce53c97b
--- /dev/null
+++ b/main/source/curl/tests/data/test60
@@ -0,0 +1,47 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.0 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+blablabla
+
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+<name>
+HTTP PUT from stdin with wrong content-length
+</name>
+ <command>
+http://%HOSTIP:%HOSTPORT/bzz/60 -T - -H "Content-Length: 1" < log/60.txt
+</command>
+<file name="log/60.txt">
+more than one byte
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+PUT /bzz/60 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Transfer-Encoding: chunked
+Content-Length: 1
+
+13
+more than one byte
+
+0
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test61 b/main/source/curl/tests/data/test61
new file mode 100644
index 00000000..4d4e2255
--- /dev/null
+++ b/main/source/curl/tests/data/test61
@@ -0,0 +1,53 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Type: text/html
+Funny-head: yesyes
+Set-Cookie: test=yes; domain=foo.com; expires=Tue Feb 1 11:56:27 MET 2007
+Set-Cookie: test2=yes; domain=host.foo.com; expires=Tue Feb 1 11:56:27 MET 2007
+Set-Cookie: test3=maybe; domain=foo.com; path=/moo; secure
+Set-Cookie: test4=no; domain=nope.foo.com; path=/moo; secure
+Set-Cookie: test5=name; domain=anything.com; path=/ ; secure
+
+boo
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP with various cookies and custom Host:
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/want/61 -c log/jar61.txt -H "Host: www.host.foo.com"
+</command>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /we/want/61 HTTP/1.1
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Host: www.host.foo.com
+
+</protocol>
+<file name="log/jar61.txt">
+# Netscape HTTP Cookie File
+# http://www.netscape.com/newsref/std/cookie_spec.html
+# This file was generated by libcurl! Edit at your own risk.
+
+.foo.com	TRUE	/we/want/	FALSE	1170327387	test	yes
+.host.foo.com	TRUE	/we/want/	FALSE	1170327387	test2	yes
+.foo.com	TRUE	/moo	TRUE	0	test3	maybe
+</file>
+</verify>
diff --git a/main/source/curl/tests/data/test62 b/main/source/curl/tests/data/test62
new file mode 100644
index 00000000..43d5b735
--- /dev/null
+++ b/main/source/curl/tests/data/test62
@@ -0,0 +1,49 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Content-Type: text/html
+
+boo
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP, send cookies when using custom Host:
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/want/62 -b log/jar62.txt -H "Host: www.host.foo.com"
+</command>
+<file name="log/jar62.txt">
+# Netscape HTTP Cookie File
+# http://www.netscape.com/newsref/std/cookie_spec.html
+# This file was generated by libcurl! Edit at your own risk.
+
+.foo.com	TRUE	/we/want/	FALSE	1170327387	test	yes
+.host.foo.com	TRUE	/we/want/	FALSE	1170327387	test2	yes
+.fake.host.foo.com	TRUE	/we/want/	FALSE	1170327387	test4	yes
+
+.foo.com	TRUE	/moo	TRUE	0	test3	maybe
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /we/want/62 HTTP/1.1
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Cookie: test2=yes; test=yes
+Host: www.host.foo.com
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test7 b/main/source/curl/tests/data/test7
new file mode 100644
index 00000000..455d6013
--- /dev/null
+++ b/main/source/curl/tests/data/test7
@@ -0,0 +1,52 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Type: text/html
+Funny-head: yesyes
+Set-Cookie: foobar=name; domain=127.0.0.1; path=/;
+Set-Cookie: mismatch=this; domain=127.0.0.1; path="/silly/";
+Set-Cookie: partmatch=present; domain=.0.0.1; path=/;
+
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP with cookie parser and header recording
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/want/7 -b none -D log/heads7.txt
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /we/want/7 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+<file name="log/heads7.txt">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Type: text/html
+Funny-head: yesyes
+Set-Cookie: foobar=name; domain=127.0.0.1; path=/;
+Set-Cookie: mismatch=this; domain=127.0.0.1; path="/silly/";
+Set-Cookie: partmatch=present; domain=.0.0.1; path=/;
+
+</file>
+</verify>
diff --git a/main/source/curl/tests/data/test8 b/main/source/curl/tests/data/test8
new file mode 100644
index 00000000..9db0d528
--- /dev/null
+++ b/main/source/curl/tests/data/test8
@@ -0,0 +1,50 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP with cookie parsing from header file
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/want/8 -b log/heads8.txt
+</command>
+
+# We create this file before the command is invoked!
+<file name="log/heads8.txt">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Type: text/html
+Funny-head: yesyes
+Set-Cookie: foobar=name; domain=127.0.0.1; path=/;
+Set-Cookie: mismatch=this; domain=127.0.0.1; path="/silly/";
+Set-Cookie: partmatch=present; domain=.0.0.1; path=/;
+
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /we/want/8 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Cookie: partmatch=present; foobar=name
+
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/data/test9 b/main/source/curl/tests/data/test9
new file mode 100644
index 00000000..65dae83d
--- /dev/null
+++ b/main/source/curl/tests/data/test9
@@ -0,0 +1,65 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+blablabla
+
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP RFC1867-type formposting
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/want/9 -F name=daniel -F tool=curl -F file=@log/test9.txt
+</command>
+# We create this file before the command is invoked!
+<file name="log/test9.txt">
+foo-
+This is a moo-
+bar
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^(User-Agent:|Content-Type: multipart/form-data;|------------).*
+</strip>
+<protocol>
+POST /we/want/9 HTTP/1.1
+User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Content-Length: 411
+Expect: 100-continue
+Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763
+
+------------------------------9ef8d6205763
+Content-Disposition: form-data; name="name"
+
+daniel
+------------------------------9ef8d6205763
+Content-Disposition: form-data; name="tool"
+
+curl
+------------------------------9ef8d6205763
+Content-Disposition: form-data; name="file"; filename="log/test9.txt"
+Content-Type: text/plain
+
+foo-
+This is a moo-
+bar
+
+------------------------------9ef8d6205763--
+</protocol>
+</verify>
diff --git a/main/source/curl/tests/ftpserver.pl b/main/source/curl/tests/ftpserver.pl
new file mode 100644
index 00000000..973454da
--- /dev/null
+++ b/main/source/curl/tests/ftpserver.pl
@@ -0,0 +1,564 @@
+#!/usr/bin/perl
+#
+# $Id: ftpserver.pl,v 1.35 2003/04/09 12:02:06 bagder Exp $
+# This is the FTP server designed for the curl test suite.
+#
+# It is meant to exercise curl, it is not meant to be a fully working
+# or even very standard compliant server.
+#
+# You may optionally specify port on the command line, otherwise it'll
+# default to port 8921.
+#
+
+use Socket;
+use Carp;
+use FileHandle;
+
+use strict;
+
+require "getpart.pm";
+
+open(FTPLOG, ">log/ftpd.log") ||
+    print STDERR "failed to open log file, runs without logging\n";
+
+sub logmsg { print FTPLOG "$$: "; print FTPLOG @_; }
+
+sub ftpmsg {
+  # append to the server.input file
+  open(INPUT, ">>log/server.input") ||
+    logmsg "failed to open log/server.input\n";
+
+  INPUT->autoflush(1);
+  print INPUT @_;
+  close(INPUT);
+
+  # use this, open->print->close system only to make the file
+  # open as little as possible, to make the test suite run
+  # better on windows/cygwin
+}
+
+my $verbose=0; # set to 1 for debugging
+my $retrweirdo=0;
+my $retrnosize=0;
+
+my $port = 8921; # just a default
+do {
+    if($ARGV[0] eq "-v") {
+        $verbose=1;
+    }
+    elsif($ARGV[0] =~ /^(\d+)$/) {
+        $port = $1;
+    }
+} while(shift @ARGV);
+
+my $proto = getprotobyname('tcp') || 6;
+
+socket(Server, PF_INET, SOCK_STREAM, $proto)|| die "socket: $!";
+setsockopt(Server, SOL_SOCKET, SO_REUSEADDR,
+           pack("l", 1)) || die "setsockopt: $!";
+bind(Server, sockaddr_in($port, INADDR_ANY))|| die "bind: $!";
+listen(Server,SOMAXCONN) || die "listen: $!";
+
+#print "FTP server started on port $port\n";
+
+open(PID, ">.ftp.pid");
+print PID $$;
+close(PID);
+
+my $waitedpid = 0;
+my $paddr;
+
+sub REAPER {
+    $waitedpid = wait;
+    $SIG{CHLD} = \&REAPER;  # loathe sysV
+    logmsg "reaped $waitedpid" . ($? ? " with exit $?\n" : "\n");
+}
+
+# USER is ok in fresh state
+my %commandok = (
+                 'USER' => 'fresh',
+                 'PASS' => 'passwd',
+                 'PASV' => 'loggedin|twosock',
+                 'EPSV' => 'loggedin|twosock',
+                 'PORT' => 'loggedin|twosock',
+                 'TYPE' => 'loggedin|twosock',
+                 'LIST' => 'twosock',
+                 'NLST' => 'twosock',
+                 'RETR' => 'twosock',
+                 'STOR' => 'twosock',
+                 'APPE' => 'twosock',
+                 'REST' => 'twosock',
+                 'CWD'  => 'loggedin|twosock',
+                 'SYST' => 'loggedin',
+                 'SIZE' => 'loggedin|twosock',
+                 'PWD'  => 'loggedin|twosock',
+                 'QUIT'  => 'loggedin|twosock',
+                 'RNFR'  => 'loggedin|twosock',
+                 'RNTO'  => 'loggedin|twosock',
+                 'DELE' => 'loggedin|twosock',
+                 'MDTM' => 'loggedin|twosock',
+                 );
+
+# initially, we're in 'fresh' state
+my %statechange = ( 'USER' => 'passwd',    # USER goes to passwd state
+                    'PASS' => 'loggedin',  # PASS goes to loggedin state
+                    'PORT' => 'twosock',   # PORT goes to twosock
+                    'PASV' => 'twosock',   # PASV goes to twosock
+                    'EPSV' => 'twosock',   # EPSV goes to twosock
+                    );
+
+# this text is shown before the function specified below is run
+my %displaytext = ('USER' => '331 We are happy you popped in!',
+                   'PASS' => '230 Welcome you silly person',
+                   'PORT' => '200 You said PORT - I say FINE',
+                   'TYPE' => '200 I modify TYPE as you wanted',
+                   'LIST' => '150 here comes a directory',
+                   'NLST' => '150 here comes a directory',
+                   'CWD'  => '250 CWD command successful.',
+                   'SYST' => '215 UNIX Type: L8', # just fake something
+                   'QUIT' => '221 bye bye baby', # just reply something
+                   'PWD'  => '257 "/nowhere/anywhere" is current directory',
+                   'REST' => '350 Yeah yeah we set it there for you',
+                   'DELE' => '200 OK OK OK whatever you say',
+                   'RNFR' => '350 Received your order. Please provide more',
+                   'RNTO' => '250 Ok, thanks. File renaming completed.',
+                   );
+
+# callback functions for certain commands
+my %commandfunc = ( 'PORT' => \&PORT_command,
+                    'LIST' => \&LIST_command,
+                    'NLST' => \&NLST_command,
+                    'PASV' => \&PASV_command,
+                    'EPSV' => \&PASV_command,
+                    'RETR' => \&RETR_command,   
+                    'SIZE' => \&SIZE_command,
+                    'REST' => \&REST_command,
+                    'STOR' => \&STOR_command,
+                    'APPE' => \&STOR_command, # append looks like upload
+                    'MDTM' => \&MDTM_command,
+                    );
+
+my $rest=0;
+sub REST_command {
+    $rest = $_[0];
+    logmsg "Set REST position to $rest\n"
+}
+
+sub LIST_command {
+  #  print "150 ASCII data connection for /bin/ls (193.15.23.1,59196) (0 bytes)\r\n";
+
+# this is a built-in fake-dir ;-)
+my @ftpdir=("total 20\r\n",
+"drwxr-xr-x   8 98       98           512 Oct 22 13:06 .\r\n",
+"drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..\r\n",
+"drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT\r\n",
+"-r--r--r--   1 0        1             35 Jul 16  1996 README\r\n",
+"lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin\r\n",
+"dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev\r\n",
+"drwxrwxrwx   2 98       98           512 May 29 16:04 download.html\r\n",
+"dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc\r\n",
+"drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub\r\n",
+"dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr\r\n");
+
+    logmsg "$$: pass data to child pid\n";
+    for(@ftpdir) {
+        print SOCK $_;
+    }
+    close(SOCK);
+    logmsg "$$: done passing data to child pid\n";
+
+    print "226 ASCII transfer complete\r\n";
+    return 0;
+}
+
+sub NLST_command {
+    my @ftpdir=("file", "with space", "fake", "..", " ..", "funny", "README");
+    for(@ftpdir) {
+        print SOCK "$_\r\n";
+    }
+    close(SOCK);
+    print "226 ASCII transfer complete\r\n";
+    return 0;
+}
+
+sub MDTM_command {
+    my $testno = $_[0];
+
+    loadtest("data/test$testno");
+
+    logmsg "MDTM $testno\n";
+
+    my @data = getpart("reply", "mdtm");
+
+    my $reply = $data[0];
+    chomp $reply;
+
+    if($reply <0) {
+        print "550 $testno: no such file.\r\n";
+        logmsg "MDTM $testno: no such file\n";
+    }
+    elsif($reply) {
+        print "$reply\r\n";
+        logmsg "MDTM $testno returned $reply\n";
+    }
+    else {
+        print "500 MDTM: no such command.\r\n";
+        logmsg "MDTM: no such command\n";
+    }
+    return 0;
+}
+
+sub SIZE_command {
+    my $testno = $_[0];
+
+    loadtest("data/test$testno");
+
+    logmsg "SIZE number $testno\n";
+
+    my @data = getpart("reply", "size");
+
+    my $size = $data[0];
+
+    if($size) {
+        if($size > -1) {
+            print "213 $size\r\n";
+            logmsg "SIZE $testno returned $size\n";
+        }
+        else {
+            print "550 $testno: No such file or directory.\r\n";
+            logmsg "SIZE $testno: no such file\n";
+        }
+    }
+    else {
+        $size=0;
+        @data = getpart("reply", "data");
+        for(@data) {
+            $size += length($_);
+        }
+        if($size) {
+            print "213 $size\r\n";
+            logmsg "SIZE $testno returned $size\n";
+        }
+        else {
+            print "550 $testno: No such file or directory.\r\n";
+            logmsg "SIZE $testno: no such file\n";
+        }
+    }
+    return 0;
+}
+
+sub RETR_command {
+    my $testno = $_[0];
+
+    logmsg "RETR test number $testno\n";
+
+    if($testno =~ /^verifiedserver$/) {
+        # this is the secret command that verifies that this actually is
+        # the curl test server
+        print "150 Binary junk (10 bytes).\r\n";
+        print SOCK "WE ROOLZ: $$\r\n";
+        close(SOCK);
+        print "226 File transfer complete\r\n";
+        if($verbose) {
+            print STDERR "FTPD: We returned proof we are the test server\n";
+        }
+        logmsg "we returned proof that we are the test server\n";
+        return 0;
+    }
+
+    loadtest("data/test$testno");
+
+    my @data = getpart("reply", "data");
+
+    my $size=0;
+    for(@data) {
+        $size += length($_);
+    }
+
+    if($size) {
+    
+        if($rest) {
+            # move read pointer forward
+            $size -= $rest;
+            logmsg "REST $rest was removed from size, makes $size left\n";
+            $rest = 0; # reset REST offset again
+        }
+        if($retrweirdo) {
+            print "150 Binary data connection for $testno () ($size bytes).\r\n",
+            "226 File transfer complete\r\n";
+            logmsg "150+226 in one shot!\n";
+
+            for(@data) {
+                my $send = $_;
+                print SOCK $send;
+            }
+            close(SOCK);
+            $retrweirdo=0; # switch off the weirdo again!
+        }
+        else {
+            my $sz = "($size bytes)";
+            if($retrnosize) {
+                $sz = "size?";
+            }
+
+            print "150 Binary data connection for $testno () $sz.\r\n";
+            logmsg "150 Binary data connection for $testno () $sz.\n";
+
+            for(@data) {
+                my $send = $_;
+                print SOCK $send;
+            }
+            close(SOCK);
+
+            print "226 File transfer complete\r\n";
+        }
+    }
+    else {
+        print "550 $testno: No such file or directory.\r\n";
+        logmsg "550 $testno: no such file\n";
+    }
+    return 0;
+}
+
+sub STOR_command {
+    my $testno=$_[0];
+
+    my $filename = "log/upload.$testno";
+
+    logmsg "STOR test number $testno in $filename\n";
+
+    print "125 Gimme gimme gimme!\r\n";
+
+    open(FILE, ">$filename") ||
+        return 0; # failed to open output
+
+    my $line;
+    my $ulsize=0;
+    while (defined($line = <SOCK>)) {
+        $ulsize += length($line);
+        print FILE $line;
+    }
+    close(FILE);
+    close(SOCK);
+
+    logmsg "received $ulsize bytes upload\n";
+
+    print "226 File transfer complete\r\n";
+    return 0;
+}
+
+my $pasvport=9000;
+sub PASV_command {
+    my ($arg, $cmd)=@_;
+
+    socket(Server2, PF_INET, SOCK_STREAM, $proto) || die "socket: $!";
+    setsockopt(Server2, SOL_SOCKET, SO_REUSEADDR,
+               pack("l", 1)) || die "setsockopt: $!";
+
+    my $ok=0;
+
+    $pasvport++; # don't reuse the previous
+    for(1 .. 10) {
+        if($pasvport > 65535) {
+            $pasvport = 1025;
+        }
+        if(bind(Server2, sockaddr_in($pasvport, INADDR_ANY))) {
+            $ok=1;
+            last;
+        }
+        $pasvport+= 3; # try another port please
+    }
+    if(!$ok) {
+        print "500 no free ports!\r\n";
+        logmsg "couldn't find free port\n";
+        return 0;
+    }
+    listen(Server2,SOMAXCONN) || die "listen: $!";
+
+    if($cmd ne "EPSV") {
+        # PASV reply
+        logmsg "replying to a $cmd command\n";
+        printf("227 Entering Passive Mode (127,0,0,1,%d,%d)\n",
+               ($pasvport/256), ($pasvport%256));
+    }
+    else {
+        # EPSV reply
+        logmsg "replying to a $cmd command\n";
+        printf("229 Entering Passive Mode (|||%d|)\n", $pasvport);
+    }
+
+    my $paddr = accept(SOCK, Server2);
+    my($iport,$iaddr) = sockaddr_in($paddr);
+    my $name = gethostbyaddr($iaddr,AF_INET);
+
+    close(Server2); # close the listener when its served its purpose!
+
+    logmsg "$$: data connection from $name [", inet_ntoa($iaddr), "] at port $iport\n";
+
+    return;
+}
+
+
+sub PORT_command {
+    my $arg = $_[0];
+
+    if($arg !~ /(\d+),(\d+),(\d+),(\d+),(\d+),(\d+)/) {
+        logmsg "bad PORT-line: $arg\n";
+        print "500 silly you, go away\r\n";
+        return 0;
+    }
+    my $iaddr = inet_aton("$1.$2.$3.$4");
+
+    my $port = ($5<<8)+$6;
+
+    if(!$port || $port > 65535) {
+        print STDERR "very illegal PORT number: $port\n";
+        return 1;
+    }
+
+    my $paddr = sockaddr_in($port, $iaddr);
+    my $proto   = getprotobyname('tcp') || 6;
+
+    socket(SOCK, PF_INET, SOCK_STREAM, $proto) || die "major failure";
+    connect(SOCK, $paddr)    || return 1;
+
+    return \&SOCK;
+}
+
+$SIG{CHLD} = \&REAPER;
+
+my %customreply;
+my %delayreply;
+sub customize {
+    undef %customreply;
+    open(CUSTOM, "<log/ftpserver.cmd") ||
+        return 1;
+
+    logmsg "FTPD: Getting commands from log/ftpserver.cmd\n";
+
+    while(<CUSTOM>) {
+        if($_ =~ /REPLY ([A-Z]+) (.*)/) {
+            $customreply{$1}=$2;
+        }
+        elsif($_ =~ /DELAY ([A-Z]+) (\d*)/) {
+            $delayreply{$1}=$2;
+        }
+        elsif($_ =~ /RETRWEIRDO/) {
+            print "instructed to use RETRWEIRDO\n";
+            $retrweirdo=1;
+        }
+        elsif($_ =~ /RETRNOSIZE/) {
+            print "instructed to use RETRNOSIZE\n";
+            $retrnosize=1;
+        }
+    }
+    close(CUSTOM);
+}
+
+my @welcome=(
+            '220-        _   _ ____  _     '."\r\n",
+            '220-    ___| | | |  _ \| |    '."\r\n",
+            '220-   / __| | | | |_) | |    '."\r\n",
+            '220-  | (__| |_| |  _ <| |___ '."\r\n",
+            '220    \___|\___/|_| \_\_____|'."\r\n");
+
+for ( $waitedpid = 0;
+      ($paddr = accept(Client,Server)) || $waitedpid;
+        $waitedpid = 0, close Client)
+{
+    next if $waitedpid and not $paddr;
+    my($port,$iaddr) = sockaddr_in($paddr);
+    my $name = gethostbyaddr($iaddr,AF_INET);
+
+    # flush data:
+    $| = 1;
+        
+    logmsg "connection from $name [", inet_ntoa($iaddr), "] at port $port\n";
+    
+    open(STDIN,  "<&Client")   || die "can't dup client to stdin";
+    open(STDOUT, ">&Client")   || die "can't dup client to stdout";
+    
+    FTPLOG->autoflush(1);
+    &customize(); # read test control instructions
+
+    print @welcome;
+    if($verbose) {
+        for(@welcome) {
+            print STDERR "OUT: $_";
+        }
+    }
+    my $state="fresh";
+
+    while(1) {
+
+        last unless defined ($_ = <STDIN>);
+        
+        ftpmsg $_;
+        
+        # Remove trailing CRLF.
+        s/[\n\r]+$//;
+
+        unless (m/^([A-Z]{3,4})\s?(.*)/i) {
+            print "500 '$_': command not understood.\r\n";
+            logmsg "unknown crap received, bailing out hard\n";
+            last;
+        }
+        my $FTPCMD=$1;
+        my $FTPARG=$2;
+        my $full=$_;
+                 
+        logmsg "GOT: ($1) $_\n";
+
+        if($verbose) {
+            print STDERR "IN: $full\n";
+        }
+
+        my $ok = $commandok{$FTPCMD};
+        if($ok !~ /$state/) {
+            print "500 $FTPCMD not OK in state: $state!\r\n";
+            next;
+        }
+
+        my $newstate=$statechange{$FTPCMD};
+        if($newstate eq "") {
+            # remain in the same state
+        }
+        else {
+            $state = $newstate;
+        }
+
+        my $delay = $delayreply{$FTPCMD};
+        if($delay) {
+            # just go sleep this many seconds!
+            sleep($delay);
+        }
+
+        my $text;
+        $text = $customreply{$FTPCMD};
+        my $fake = $text;
+        if($text eq "") {
+            $text = $displaytext{$FTPCMD};
+        }
+        else {
+            logmsg "$FTPCMD made to send '$text'\n";
+        }
+        if($text) {
+            print "$text\r\n";
+        }
+
+        if($fake eq "") {
+            # only perform this if we're not faking a reply
+            # see if the new state is a function caller.
+            my $func = $commandfunc{$FTPCMD};
+            if($func) {
+                # it is!
+                \&$func($FTPARG, $FTPCMD);
+            }
+        }
+
+        logmsg "set to state $state\n";
+            
+    } # while(1)
+    close(Client);
+    close(Client2);
+}
diff --git a/main/source/curl/tests/ftpsserver.pl b/main/source/curl/tests/ftpsserver.pl
new file mode 100644
index 00000000..ca689224
--- /dev/null
+++ b/main/source/curl/tests/ftpsserver.pl
@@ -0,0 +1,86 @@
+#!/usr/bin/perl
+#
+# $Id: ftpsserver.pl,v 1.4 2003/01/21 10:29:06 bagder Exp $
+# This is the FTPS server designed for the curl test suite.
+#
+# It is actually just a layer that runs stunnel properly.
+
+use strict;
+
+use stunnel;
+
+my $stunnel = &checkstunnel;
+
+if(!$stunnel) {
+    exit;
+}
+
+#
+# -p pemfile
+# -P pid dir
+# -d listen port
+# -r target port
+
+my $verbose=0; # set to 1 for debugging
+
+my $port = 8821;		# just our default, weird enough
+my $remote_port = 8921;		# test ftp-server port
+
+my $path = `pwd`;
+chomp $path;
+
+my $srcdir=$path;
+
+do {
+    if($ARGV[0] eq "-v") {
+        $verbose=1;
+    }
+    elsif($ARGV[0] eq "-r") {
+        $remote_port=$ARGV[1];
+        shift @ARGV;
+    }
+    elsif($ARGV[0] eq "-d") {
+        $srcdir=$ARGV[1];
+        shift @ARGV;
+    }
+    elsif($ARGV[0] =~ /^(\d+)$/) {
+        $port = $1;
+    }
+} while(shift @ARGV);
+
+my $conffile="$path/stunnel.conf";	# stunnel configuration data
+my $certfile="$srcdir/stunnel.pem";	# stunnel server certificate
+my $pidfile="$path/.ftps.pid";		# stunnel process pid file
+
+open(CONF, ">$conffile") || return 1;
+print CONF "
+	CApath=$path
+	cert = $certfile
+	pid = $pidfile
+	debug = 0
+	output = /dev/null
+	foreground = yes
+
+	
+	[curltest]
+	accept = $port
+	connect = $remote_port
+";
+close CONF; 
+#system("chmod go-rwx $conffile $certfile");	# secure permissions
+
+		# works only with stunnel versions < 4.00
+my $cmd="$stunnel -p $certfile -P $pidfile -d $port -r $remote_port 2>/dev/null";
+
+# use some heuristics to determine stunnel version
+my $version_ge_4=system("$stunnel -V 2>&1|grep '^stunnel.* on '>/dev/null 2>&1");
+		# works only with stunnel versions >= 4.00
+if ($version_ge_4) { $cmd="$stunnel $conffile"; }
+
+if($verbose) {
+    print "FTPS server: $cmd\n";
+}
+
+system($cmd);
+
+unlink $conffile;
diff --git a/main/source/curl/tests/getpart.pm b/main/source/curl/tests/getpart.pm
new file mode 100644
index 00000000..8967ea75
--- /dev/null
+++ b/main/source/curl/tests/getpart.pm
@@ -0,0 +1,208 @@
+
+#use strict;
+
+my @xml;
+
+my $warning=0;
+my $trace=0;
+
+sub getpartattr {
+    # if $part is undefined (ie only one argument) then
+    # return the attributes of the section
+
+    my ($section, $part)=@_;
+
+    my %hash;
+    my $inside=0;
+
+ #   print "Section: $section, part: $part\n";
+
+    for(@xml) {
+ #       print "$inside: $_";
+        if(!$inside && ($_ =~ /^ *\<$section/)) {
+            $inside++;
+        }
+        if((1 ==$inside) && ( ($_ =~ /^ *\<$part([^>]*)/) ||
+                              !(defined($part)) )
+             ) {
+            $inside++;
+            my $attr=$1;
+            my @p=split("[ \t]", $attr);
+            my $assign;
+
+            foreach $assign (@p) {
+                # $assign is a 'name="contents"' pair
+
+                if($assign =~ / *([^=]*)=\"([^\"]*)\"/) {
+                    # *with* quotes
+                    $hash{$1}=$2;
+                }
+                elsif($assign =~ / *([^=]*)=([^\"]*)/) {
+                    # *without* quotes
+                    $hash{$1}=$2;
+                }
+            }
+            last;
+        }
+        elsif((2 ==$inside) && ($_ =~ /^ *\<\/$part/)) {
+            $inside--;
+        }
+    }
+    return %hash;
+}
+
+sub getpart {
+    my ($section, $part)=@_;
+
+    my @this;
+    my $inside=0;
+
+ #   print "Section: $section, part: $part\n";
+
+    for(@xml) {
+ #       print "$inside: $_";
+        if(!$inside && ($_ =~ /^ *\<$section/)) {
+            $inside++;
+        }
+        elsif((1 ==$inside) && ($_ =~ /^ *\<$part[ \>]/)) {
+            $inside++;
+        }
+        elsif((2 ==$inside) && ($_ =~ /^ *\<\/$part/)) {
+            $inside--;
+        }
+        elsif((1==$inside) && ($_ =~ /^ *\<\/$section/)) {
+            if($trace) {
+                print STDERR "*** getpart.pm: $section/$part returned data!\n";
+            }
+            if(!@this && $warning) {
+                print STDERR "*** getpart.pm: $section/$part returned empty!\n";
+            }
+            return @this;
+        }
+        elsif(2==$inside) {
+            push @this, $_;
+        }
+    }
+    if($warning) {
+        print STDERR "*** getpart.pm: $section/$part returned empty!\n";
+    }
+    return @this; #empty!
+}
+
+sub loadtest {
+    my ($file)=@_;
+
+    undef @xml;
+    open(XML, "<$file") ||
+        return 1; # failure!
+    binmode XML; # for crapage systems, use binary
+    while(<XML>) {
+        push @xml, $_;
+    }
+    close(XML);
+    return 0;
+}
+
+#
+# Strip off all lines that match the specified pattern and return
+# the new array.
+#
+
+sub striparray {
+    my ($pattern, $arrayref) = @_;
+
+    my @array;
+
+    for(@$arrayref) {
+        if($_ !~ /$pattern/) {
+            push @array, $_;
+        }
+    }
+    return @array;
+}
+
+#
+# pass array *REFERENCES* !
+#
+sub compareparts {
+ my ($firstref, $secondref)=@_;
+
+ my $sizefirst=scalar(@$firstref);
+ my $sizesecond=scalar(@$secondref);
+
+ if($sizefirst != $sizesecond) {
+     return -1;
+ }
+
+ for(1 .. $sizefirst) {
+     my $index = $_ - 1;
+     if($firstref->[$index] ne $secondref->[$index]) {
+         (my $aa = $firstref->[$index]) =~ s/\r+\n$/\n/;
+         (my $bb = $secondref->[$index]) =~ s/\r+\n$/\n/;
+         if($aa ne $bb) {
+             return 1+$index;
+         }
+     }
+ }
+ return 0;
+}
+
+#
+# Write a given array to the specified file
+#
+sub writearray {
+    my ($filename, $arrayref)=@_;
+
+    open(TEMP, ">$filename");
+    binmode(TEMP,":raw"); # cygwin fix by Kevin Roth
+    for(@$arrayref) {
+        print TEMP $_;
+    }
+    close(TEMP);
+}
+
+#
+# Load a specified file an return it as an array
+#
+sub loadarray {
+    my ($filename)=@_;
+    my @array;
+
+    open(TEMP, "<$filename");
+    while(<TEMP>) {
+        push @array, $_;
+    }
+    close(TEMP);
+    return @array;
+}
+
+#
+# Given two array references, this function will store them in two
+# temporary files, run 'diff' on them, store the result, remove the
+# temp files and return the diff output!
+# 
+sub showdiff {
+    my ($firstref, $secondref)=@_;
+
+    my $file1=".generated";
+    my $file2=".expected";
+    
+    open(TEMP, ">$file1");
+    for(@$firstref) {
+        print TEMP $_;
+    }
+    close(TEMP);
+
+    open(TEMP, ">$file2");
+    for(@$secondref) {
+        print TEMP $_;
+    }
+    close(TEMP);
+    my @out = `diff -u $file2 $file1`;
+
+    unlink $file1, $file2;
+    return @out;
+}
+
+
+1;
diff --git a/main/source/curl/tests/httpserver.pl b/main/source/curl/tests/httpserver.pl
new file mode 100644
index 00000000..afab4787
--- /dev/null
+++ b/main/source/curl/tests/httpserver.pl
@@ -0,0 +1,17 @@
+#!/usr/bin/env perl
+
+use strict;
+
+my $verbose=0; # set to 1 for debugging
+
+my $port = 8999; # just a default
+do {
+    if($ARGV[0] eq "-v") {
+        $verbose=1;
+    }
+    elsif($ARGV[0] =~ /^(\d+)$/) {
+        $port = $1;
+    }
+} while(shift @ARGV);
+
+exec("server/sws $port");
diff --git a/main/source/curl/tests/httpsserver.pl b/main/source/curl/tests/httpsserver.pl
new file mode 100644
index 00000000..f85493aa
--- /dev/null
+++ b/main/source/curl/tests/httpsserver.pl
@@ -0,0 +1,88 @@
+#!/usr/bin/perl
+#
+# $Id: httpsserver.pl,v 1.5 2003/01/21 15:09:20 bagder Exp $
+# This is the HTTPS server designed for the curl test suite.
+#
+# It is actually just a layer that runs stunnel properly.
+
+use strict;
+
+use stunnel;
+
+my $stunnel = &checkstunnel;
+
+if(!$stunnel) {
+    exit;
+}
+
+#
+# -p pemfile
+# -P pid dir
+# -d listen port
+# -r target port
+
+my $verbose=0; # set to 1 for debugging
+
+my $port = 8433; # just our default, weird enough
+my $target_port = 8999; # test http-server port
+
+my $path = `pwd`;
+chomp $path;
+
+my $srcdir=$path;
+
+do {
+    if($ARGV[0] eq "-v") {
+        $verbose=1;
+    }
+    if($ARGV[0] eq "-w") {
+        return 0; # return success, means we have stunnel working!
+    }
+    elsif($ARGV[0] eq "-r") {
+        $target_port=$ARGV[1];
+        shift @ARGV;
+    }
+    elsif($ARGV[0] eq "-d") {
+        $srcdir=$ARGV[1];
+        shift @ARGV;
+    }
+    elsif($ARGV[0] =~ /^(\d+)$/) {
+        $port = $1;
+    }
+} while(shift @ARGV);
+
+my $conffile="$path/stunnel.conf";	# stunnel configuration data
+my $certfile="$srcdir/stunnel.pem";	# stunnel server certificate
+my $pidfile="$path/.https.pid";		# stunnel process pid file
+
+open(CONF, ">$conffile") || return 1;
+print CONF "
+	CApath=$path
+	cert = $certfile
+	pid = $pidfile
+	debug = 0
+	output = /dev/null
+	foreground = yes
+	
+	[curltest]
+	accept = $port
+	connect = $target_port
+";
+close CONF; 
+#system("chmod go-rwx $conffile $certfile");	# secure permissions
+
+		# works only with stunnel versions < 4.00
+my $cmd="$stunnel -p $certfile -P $pidfile -d $port -r $target_port 2>/dev/null";
+
+# use some heuristics to determine stunnel version
+my $version_ge_4=system("$stunnel -V 2>&1|grep '^stunnel.* on '>/dev/null 2>&1");
+		# works only with stunnel versions >= 4.00
+if ($version_ge_4) { $cmd="$stunnel $conffile"; }
+
+if($verbose) {
+    print "HTTPS server: $cmd\n";
+}
+
+system($cmd);
+
+unlink $conffile;
diff --git a/main/source/curl/tests/libtest/Makefile.am b/main/source/curl/tests/libtest/Makefile.am
new file mode 100644
index 00000000..f3755fcf
--- /dev/null
+++ b/main/source/curl/tests/libtest/Makefile.am
@@ -0,0 +1,37 @@
+#
+# $Id: Makefile.am,v 1.11 2003/04/01 07:13:04 bagder Exp $
+#
+
+AUTOMAKE_OPTIONS = foreign nostdinc
+
+INCLUDES = -I$(top_srcdir)/include/curl -I$(top_builddir)/lib
+
+LIBDIR = ../../lib
+
+# here are all tools used for running libcurl tests
+noinst_PROGRAMS = lib500 lib501 lib502 lib503 lib504 lib505
+
+lib500_SOURCES = lib500.c first.c test.h
+lib500_LDADD = $(LIBDIR)/libcurl.la
+lib500_DEPENDENCIES = $(LIBDIR)/libcurl.la
+
+lib501_SOURCES = lib501.c first.c test.h
+lib501_LDADD = $(LIBDIR)/libcurl.la
+lib501_DEPENDENCIES = $(LIBDIR)/libcurl.la
+
+lib502_SOURCES = lib502.c first.c test.h
+lib502_LDADD = $(LIBDIR)/libcurl.la
+lib502_DEPENDENCIES = $(LIBDIR)/libcurl.la
+
+lib503_SOURCES = lib503.c first.c test.h
+lib503_LDADD = $(LIBDIR)/libcurl.la
+lib503_DEPENDENCIES = $(LIBDIR)/libcurl.la
+
+lib504_SOURCES = lib504.c first.c test.h
+lib504_LDADD = $(LIBDIR)/libcurl.la
+lib504_DEPENDENCIES = $(LIBDIR)/libcurl.la
+
+lib505_SOURCES = lib505.c first.c test.h
+lib505_LDADD = $(LIBDIR)/libcurl.la
+lib505_DEPENDENCIES = $(LIBDIR)/libcurl.la
+
diff --git a/main/source/curl/tests/libtest/Makefile.in b/main/source/curl/tests/libtest/Makefile.in
new file mode 100644
index 00000000..d7c82ed8
--- /dev/null
+++ b/main/source/curl/tests/libtest/Makefile.in
@@ -0,0 +1,521 @@
+# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# $Id: Makefile.am,v 1.11 2003/04/01 07:13:04 bagder Exp $
+#
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CA_BUNDLE = @CURL_CA_BUNDLE@
+CURL_DISABLE_DICT = @CURL_DISABLE_DICT@
+CURL_DISABLE_FILE = @CURL_DISABLE_FILE@
+CURL_DISABLE_FTP = @CURL_DISABLE_FTP@
+CURL_DISABLE_GOPHER = @CURL_DISABLE_GOPHER@
+CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@
+CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@
+CURL_DISABLE_TELNET = @CURL_DISABLE_TELNET@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_LIBZ = @HAVE_LIBZ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPV6_ENABLED = @IPV6_ENABLED@
+KRB4_ENABLED = @KRB4_ENABLED@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NO_UNDEFINED_FALSE = @NO_UNDEFINED_FALSE@
+NO_UNDEFINED_TRUE = @NO_UNDEFINED_TRUE@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_ENABLED = @OPENSSL_ENABLED@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKGADD_NAME = @PKGADD_NAME@
+PKGADD_PKG = @PKGADD_PKG@
+PKGADD_VENDOR = @PKGADD_VENDOR@
+PKGCONFIG = @PKGCONFIG@
+RANDOM_FILE = @RANDOM_FILE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VERSIONNUM = @VERSIONNUM@
+YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+
+AUTOMAKE_OPTIONS = foreign nostdinc
+
+INCLUDES = -I$(top_srcdir)/include/curl -I$(top_builddir)/lib
+
+LIBDIR = ../../lib
+
+# here are all tools used for running libcurl tests
+noinst_PROGRAMS = lib500 lib501 lib502 lib503 lib504 lib505
+
+lib500_SOURCES = lib500.c first.c test.h
+lib500_LDADD = $(LIBDIR)/libcurl.la
+lib500_DEPENDENCIES = $(LIBDIR)/libcurl.la
+
+lib501_SOURCES = lib501.c first.c test.h
+lib501_LDADD = $(LIBDIR)/libcurl.la
+lib501_DEPENDENCIES = $(LIBDIR)/libcurl.la
+
+lib502_SOURCES = lib502.c first.c test.h
+lib502_LDADD = $(LIBDIR)/libcurl.la
+lib502_DEPENDENCIES = $(LIBDIR)/libcurl.la
+
+lib503_SOURCES = lib503.c first.c test.h
+lib503_LDADD = $(LIBDIR)/libcurl.la
+lib503_DEPENDENCIES = $(LIBDIR)/libcurl.la
+
+lib504_SOURCES = lib504.c first.c test.h
+lib504_LDADD = $(LIBDIR)/libcurl.la
+lib504_DEPENDENCIES = $(LIBDIR)/libcurl.la
+
+lib505_SOURCES = lib505.c first.c test.h
+lib505_LDADD = $(LIBDIR)/libcurl.la
+lib505_DEPENDENCIES = $(LIBDIR)/libcurl.la
+subdir = tests/libtest
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/lib/config.h \
+	$(top_builddir)/src/config.h \
+	$(top_builddir)/tests/server/config.h \
+	$(top_builddir)/lib/ca-bundle.h
+CONFIG_CLEAN_FILES =
+noinst_PROGRAMS = lib500$(EXEEXT) lib501$(EXEEXT) lib502$(EXEEXT) \
+	lib503$(EXEEXT) lib504$(EXEEXT) lib505$(EXEEXT)
+PROGRAMS = $(noinst_PROGRAMS)
+
+am_lib500_OBJECTS = lib500.$(OBJEXT) first.$(OBJEXT)
+lib500_OBJECTS = $(am_lib500_OBJECTS)
+lib500_LDFLAGS =
+am_lib501_OBJECTS = lib501.$(OBJEXT) first.$(OBJEXT)
+lib501_OBJECTS = $(am_lib501_OBJECTS)
+lib501_LDFLAGS =
+am_lib502_OBJECTS = lib502.$(OBJEXT) first.$(OBJEXT)
+lib502_OBJECTS = $(am_lib502_OBJECTS)
+lib502_LDFLAGS =
+am_lib503_OBJECTS = lib503.$(OBJEXT) first.$(OBJEXT)
+lib503_OBJECTS = $(am_lib503_OBJECTS)
+lib503_LDFLAGS =
+am_lib504_OBJECTS = lib504.$(OBJEXT) first.$(OBJEXT)
+lib504_OBJECTS = $(am_lib504_OBJECTS)
+lib504_LDFLAGS =
+am_lib505_OBJECTS = lib505.$(OBJEXT) first.$(OBJEXT)
+lib505_OBJECTS = $(am_lib505_OBJECTS)
+lib505_LDFLAGS =
+
+DEFAULT_INCLUDES = 
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/first.Po ./$(DEPDIR)/lib500.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/lib501.Po ./$(DEPDIR)/lib502.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/lib503.Po ./$(DEPDIR)/lib504.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/lib505.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+DIST_SOURCES = $(lib500_SOURCES) $(lib501_SOURCES) $(lib502_SOURCES) \
+	$(lib503_SOURCES) $(lib504_SOURCES) $(lib505_SOURCES)
+DIST_COMMON = Makefile.am Makefile.in
+SOURCES = $(lib500_SOURCES) $(lib501_SOURCES) $(lib502_SOURCES) $(lib503_SOURCES) $(lib504_SOURCES) $(lib505_SOURCES)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  tests/libtest/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+lib500$(EXEEXT): $(lib500_OBJECTS) $(lib500_DEPENDENCIES) 
+	@rm -f lib500$(EXEEXT)
+	$(LINK) $(lib500_LDFLAGS) $(lib500_OBJECTS) $(lib500_LDADD) $(LIBS)
+lib501$(EXEEXT): $(lib501_OBJECTS) $(lib501_DEPENDENCIES) 
+	@rm -f lib501$(EXEEXT)
+	$(LINK) $(lib501_LDFLAGS) $(lib501_OBJECTS) $(lib501_LDADD) $(LIBS)
+lib502$(EXEEXT): $(lib502_OBJECTS) $(lib502_DEPENDENCIES) 
+	@rm -f lib502$(EXEEXT)
+	$(LINK) $(lib502_LDFLAGS) $(lib502_OBJECTS) $(lib502_LDADD) $(LIBS)
+lib503$(EXEEXT): $(lib503_OBJECTS) $(lib503_DEPENDENCIES) 
+	@rm -f lib503$(EXEEXT)
+	$(LINK) $(lib503_LDFLAGS) $(lib503_OBJECTS) $(lib503_LDADD) $(LIBS)
+lib504$(EXEEXT): $(lib504_OBJECTS) $(lib504_DEPENDENCIES) 
+	@rm -f lib504$(EXEEXT)
+	$(LINK) $(lib504_LDFLAGS) $(lib504_OBJECTS) $(lib504_LDADD) $(LIBS)
+lib505$(EXEEXT): $(lib505_OBJECTS) $(lib505_DEPENDENCIES) 
+	@rm -f lib505$(EXEEXT)
+	$(LINK) $(lib505_LDFLAGS) $(lib505_OBJECTS) $(lib505_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/first.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib500.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib501.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib502.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib503.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib504.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib505.Po@am__quote@
+
+distclean-depend:
+	-rm -rf ./$(DEPDIR)
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ETAGS = etags
+ETAGSFLAGS =
+
+CTAGS = ctags
+CTAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-compile distclean-depend \
+	distclean-generic distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstPROGRAMS ctags distclean \
+	distclean-compile distclean-depend distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am info \
+	info-am install install-am install-data install-data-am \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/main/source/curl/tests/libtest/first.c b/main/source/curl/tests/libtest/first.c
new file mode 100644
index 00000000..75118f02
--- /dev/null
+++ b/main/source/curl/tests/libtest/first.c
@@ -0,0 +1,31 @@
+#include "test.h"
+
+#ifdef MALLOCDEBUG
+/* provide a proto for this debug function */
+extern void curl_memdebug(const char *);
+#endif
+
+/* test is provided in the test code file */
+CURLcode test(char *url);
+
+char *arg2=NULL;
+
+int main(int argc, char **argv)
+{
+  char *URL;
+  if(argc< 2 ) {
+    fprintf(stderr, "Pass URL as argument please\n");
+    return 1;
+  }
+  if(argc>2)
+    arg2=argv[2];
+
+  URL = argv[1]; /* provide this to the rest */
+
+  fprintf(stderr, "URL: %s\n", URL);
+
+#ifdef MALLOCDEBUG
+  curl_memdebug("memdump");
+#endif
+  return test(URL);
+}
diff --git a/main/source/curl/tests/libtest/lib500.c b/main/source/curl/tests/libtest/lib500.c
new file mode 100644
index 00000000..9372b01c
--- /dev/null
+++ b/main/source/curl/tests/libtest/lib500.c
@@ -0,0 +1,13 @@
+#include "test.h"
+
+CURLcode test(char *URL)
+{
+  CURLcode res;
+  CURL *curl = curl_easy_init();
+  curl_easy_setopt(curl, CURLOPT_URL, URL);
+  curl_easy_setopt(curl, CURLOPT_HEADER, TRUE);
+  res = curl_easy_perform(curl);
+  curl_easy_cleanup(curl);  
+  return res;
+}
+
diff --git a/main/source/curl/tests/libtest/lib501.c b/main/source/curl/tests/libtest/lib501.c
new file mode 100644
index 00000000..21bd3e27
--- /dev/null
+++ b/main/source/curl/tests/libtest/lib501.c
@@ -0,0 +1,14 @@
+#include "test.h"
+
+CURLcode test(char *URL)
+{
+  CURLcode res;
+  CURL *curl = curl_easy_init();
+
+  (void)URL; /* we don't use this */
+  curl_easy_setopt(curl, CURLOPT_HEADER, TRUE);
+  res = curl_easy_perform(curl);
+  curl_easy_cleanup(curl);
+  return res;
+}
+
diff --git a/main/source/curl/tests/libtest/lib502.c b/main/source/curl/tests/libtest/lib502.c
new file mode 100644
index 00000000..dd536a48
--- /dev/null
+++ b/main/source/curl/tests/libtest/lib502.c
@@ -0,0 +1,33 @@
+#include "test.h"
+
+/*
+ * Get a single URL without select().
+ */
+
+CURLcode test(char *URL)
+{
+  CURL *c;
+  CURLM *m;
+  CURLMcode res;
+  int running=1;
+
+  curl_global_init(CURL_GLOBAL_ALL);
+  c = curl_easy_init();
+  curl_easy_setopt(c, CURLOPT_URL, URL);
+  m = curl_multi_init();
+
+  res = curl_multi_add_handle(m, c);
+  while (running) {
+    res = curl_multi_perform(m, &running);
+    if (running <= 0) {
+      fprintf(stderr, "nothing left running.\n");
+      break;
+    }
+  }
+  curl_multi_remove_handle(m, c);
+  curl_easy_cleanup(c);
+  curl_multi_cleanup(m);
+
+  return 0;
+}
+
diff --git a/main/source/curl/tests/libtest/lib503.c b/main/source/curl/tests/libtest/lib503.c
new file mode 100644
index 00000000..7a75a9d8
--- /dev/null
+++ b/main/source/curl/tests/libtest/lib503.c
@@ -0,0 +1,83 @@
+#include "test.h"
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#include <sys/time.h>
+#include <sys/types.h>
+
+/*
+ * Source code in here hugely as reported in bug report 651460 by
+ * Christopher R. Palmer.
+ *
+ * Use multi interface to get HTTPS document over proxy, and provide
+ * auth info.
+ */
+
+CURLcode test(char *URL)
+{
+  CURL *c;
+  CURLM *m;
+
+  curl_global_init(CURL_GLOBAL_ALL);
+  c = curl_easy_init();
+  curl_easy_setopt(c, CURLOPT_PROXY, arg2); /* set in first.c */
+  curl_easy_setopt(c, CURLOPT_URL, URL);
+  curl_easy_setopt(c, CURLOPT_USERPWD, "test:ing");
+  curl_easy_setopt(c, CURLOPT_PROXYUSERPWD, "test:ing");
+  curl_easy_setopt(c, CURLOPT_HTTPPROXYTUNNEL, 1);
+  curl_easy_setopt(c, CURLOPT_HEADER, 1);
+
+  {
+    CURLMcode res;
+    int running;
+    char done=FALSE;
+
+    m = curl_multi_init();
+
+    res = curl_multi_add_handle(m, c);
+
+    while(!done) {
+      fd_set rd, wr, exc;
+      int max_fd;
+
+      while (res == CURLM_CALL_MULTI_PERFORM) {
+        res = curl_multi_perform(m, &running);
+        if (running <= 0) {
+          done = TRUE;
+          break;
+        }
+      }
+      if(done)
+        break;
+      
+      if (res != CURLM_OK) {
+        fprintf(stderr, "not okay???\n");
+        return 80;
+      }
+
+      FD_ZERO(&rd);
+      FD_ZERO(&wr);
+      FD_ZERO(&exc);
+      max_fd = 0;
+
+      if (curl_multi_fdset(m, &rd, &wr, &exc, &max_fd) != CURLM_OK) {
+        fprintf(stderr, "unexpected failured of fdset.\n");
+        return 89;
+      }
+
+      if (select(max_fd+1, &rd, &wr, &exc, NULL) == -1) {
+        fprintf(stderr, "bad select??\n");
+        return 95;
+      }
+
+      res = CURLM_CALL_MULTI_PERFORM;
+    }
+  }
+  curl_multi_remove_handle(m, c);
+  curl_easy_cleanup(c);
+  curl_multi_cleanup(m);
+	
+  return 0;
+}
+
diff --git a/main/source/curl/tests/libtest/lib504.c b/main/source/curl/tests/libtest/lib504.c
new file mode 100644
index 00000000..5a4b4058
--- /dev/null
+++ b/main/source/curl/tests/libtest/lib504.c
@@ -0,0 +1,86 @@
+#include "test.h"
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#include <sys/time.h>
+#include <sys/types.h>
+
+/*
+ * Source code in here hugely as reported in bug report 651464 by
+ * Christopher R. Palmer.
+ *
+ * Use multi interface to get document over proxy with bad port number.
+ * This caused the interface to "hang" in libcurl 7.10.2.
+ */
+CURLcode test(char *URL)
+{
+  CURL *c;
+  CURLcode ret=CURLE_OK;
+  CURLM *m;
+  fd_set rd, wr, exc;
+  CURLMcode res;
+  int running;
+  int max_fd;
+
+  curl_global_init(CURL_GLOBAL_ALL);
+  c = curl_easy_init();
+
+  /* the point here being that there must not run anything on the given
+     proxy port */
+  curl_easy_setopt(c, CURLOPT_PROXY, arg2);
+  curl_easy_setopt(c, CURLOPT_URL, URL);
+  curl_easy_setopt(c, CURLOPT_VERBOSE, 1);
+
+  m = curl_multi_init();
+
+  res = curl_multi_add_handle(m, c);
+  if(res && (res != CURLM_CALL_MULTI_PERFORM))
+	 return 1; /* major failure */
+  do {
+    do {
+      res = curl_multi_perform(m, &running);
+	} while (res == CURLM_CALL_MULTI_PERFORM);
+    if(!running) {
+      /* This is where this code is expected to reach */
+      int numleft;
+      CURLMsg *msg = curl_multi_info_read(m, &numleft);
+      fprintf(stderr, "Not running\n");
+      if(msg && !numleft)
+        ret = 100; /* this is where we should be */
+      else
+        ret = 99; /* not correct */
+      break;
+    }
+	fprintf(stderr, "running %d res %d\n", running, res);
+
+    if (res != CURLM_OK) {
+      fprintf(stderr, "not okay???\n");
+      ret = 2;
+      break;
+    }
+
+    FD_ZERO(&rd);
+    FD_ZERO(&wr);
+    FD_ZERO(&exc);
+    max_fd = 0;
+
+	fprintf(stderr, "_fdset()\n");
+    if (curl_multi_fdset(m, &rd, &wr, &exc, &max_fd) != CURLM_OK) {
+      fprintf(stderr, "unexpected failured of fdset.\n");
+      ret = 3;
+      break;
+    }
+	fprintf(stderr, "select\n");
+    select(max_fd+1, &rd, &wr, &exc, NULL);
+
+    fprintf(stderr, "loop!\n");
+  } while(1);
+
+  curl_multi_remove_handle(m, c);
+  curl_easy_cleanup(c);
+  curl_multi_cleanup(m);
+
+  return ret;
+}
+
diff --git a/main/source/curl/tests/libtest/lib505.c b/main/source/curl/tests/libtest/lib505.c
new file mode 100644
index 00000000..7dfdfdd7
--- /dev/null
+++ b/main/source/curl/tests/libtest/lib505.c
@@ -0,0 +1,111 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id: lib505.c,v 1.2 2003/04/15 14:18:37 bagder Exp $
+ */
+
+#include "test.h"
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_TYPES_
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+/*
+ * This example shows an FTP upload, with a rename of the file just after
+ * a successful upload.
+ *
+ * Example based on source code provided by Erick Nuwendam. Thanks!
+ */
+
+CURLcode test(char *URL)
+{
+  CURL *curl;
+  CURLcode res;
+  FILE *hd_src ;
+  int hd ;
+  struct stat file_info;
+
+  struct curl_slist *headerlist=NULL;
+  const char *buf_1 = "RNFR 505";
+  const char *buf_2 = "RNTO 505-forreal";
+
+  /* get the file size of the local file */
+  hd = stat(arg2, &file_info);
+  if(hd == -1) {
+    /* can't open file, bail out */
+    return -1;
+  }
+
+  if(! file_info.st_size) {
+    fprintf(stderr, "WARNING: file %s has no size!\n", arg2);
+    return -4;
+  }
+
+  /* get a FILE * of the same file, could also be made with
+     fdopen() from the previous descriptor, but hey this is just 
+     an example! */
+  hd_src = fopen(arg2, "rb");
+  if(NULL == hd_src) {
+    return -2; /* if this happens things are major weird */
+  }
+
+  /* In windows, this will init the winsock stuff */
+  curl_global_init(CURL_GLOBAL_ALL);
+
+  /* get a curl handle */
+  curl = curl_easy_init();
+  if(curl) {
+    /* build a list of commands to pass to libcurl */
+    headerlist = curl_slist_append(headerlist, buf_1);
+    headerlist = curl_slist_append(headerlist, buf_2);
+
+    /* enable uploading */
+    curl_easy_setopt(curl, CURLOPT_UPLOAD, TRUE) ;
+
+    /* enable verbose */
+    curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE) ;
+
+    /* specify target */
+    curl_easy_setopt(curl,CURLOPT_URL, URL);
+
+    /* pass in that last of FTP commands to run after the transfer */
+    curl_easy_setopt(curl, CURLOPT_POSTQUOTE, headerlist);
+
+    /* now specify which file to upload */
+    curl_easy_setopt(curl, CURLOPT_INFILE, hd_src);
+
+    /* and give the size of the upload (optional) */
+    curl_easy_setopt(curl, CURLOPT_INFILESIZE,
+                     (long)file_info.st_size);
+
+    /* Now run off and do what you've been told! */
+    res = curl_easy_perform(curl);
+
+    /* clean up the FTP commands list */
+    curl_slist_free_all (headerlist);
+
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+  }
+  fclose(hd_src); /* close the local file */
+
+  curl_global_cleanup();
+  return res;
+}
diff --git a/main/source/curl/tests/libtest/test.h b/main/source/curl/tests/libtest/test.h
new file mode 100644
index 00000000..af203af7
--- /dev/null
+++ b/main/source/curl/tests/libtest/test.h
@@ -0,0 +1,12 @@
+#ifdef HAVE_CONFIG_H
+/* Now include the config.h file from libcurl's private libdir, so that we
+   get good in-depth knowledge about the system we're building this on */
+#include "config.h"
+#endif
+
+#include <curl.h>
+#include <stdio.h>
+#include <string.h>
+
+extern char *arg2; /* set by first.c to the argv[2] or NULL */
+
diff --git a/main/source/curl/tests/memanalyze.pl b/main/source/curl/tests/memanalyze.pl
new file mode 100644
index 00000000..ec7732a0
--- /dev/null
+++ b/main/source/curl/tests/memanalyze.pl
@@ -0,0 +1,285 @@
+#!/usr/bin/env perl
+#
+# Example input:
+#
+# MEM mprintf.c:1094 malloc(32) = e5718
+# MEM mprintf.c:1103 realloc(e5718, 64) = e6118
+# MEM sendf.c:232 free(f6520)
+
+while(1) {
+    if($ARGV[0] eq "-v") {
+        $verbose=1;
+        shift @ARGV;
+    }
+    elsif($ARGV[0] eq "-t") {
+        $trace=1;
+        shift @ARGV;
+    }
+    last;
+}
+
+my $maxmem;
+
+sub newtotal {
+    my ($newtot)=@_;
+    # count a max here
+
+    if($newtot > $maxmem) {
+        $maxmem= $newtot;
+    }
+}
+
+my $file = $ARGV[0];
+
+if(! -f $file) {
+    print "Usage: memanalyze.pl [options] <dump file>\n",
+    "Options:\n",
+    " -v  Verbose\n",
+    " -t  Trace\n";
+    exit;
+}
+
+open(FILE, "<$file");
+
+while(<FILE>) {
+    chomp $_;
+    $line = $_;
+
+    if($line =~ /^MEM ([^ ]*):(\d*) (.*)/) {
+        # generic match for the filename+linenumber
+        $source = $1;
+        $linenum = $2;
+        $function = $3;
+
+        if($function =~ /free\(0x([0-9a-f]*)/) {
+            $addr = $1;
+            if($sizeataddr{$addr} == 0) {
+                print "FREE ERROR: No memory allocated: $line\n";
+            }
+            elsif(-1 == $sizeataddr{$addr}) {
+                print "FREE ERROR: Memory freed twice: $line\n";
+                print "FREE ERROR: Previously freed at: ".$getmem{$addr}."\n";
+            }
+            else {
+                $totalmem -= $sizeataddr{$addr};
+                if($trace) {
+                    print "FREE: malloc at ".$getmem{$addr}." is freed again at $source:$linenum\n";
+                    printf("FREE: %d bytes freed, left allocated: $totalmem bytes\n", $sizeataddr{$addr});
+                }
+
+                newtotal($totalmem);
+                $frees++;
+
+                $sizeataddr{$addr}=-1; # set -1 to mark as freed
+                $getmem{$addr}="$source:$linenum";
+
+            }
+        }
+        elsif($function =~ /malloc\((\d*)\) = 0x([0-9a-f]*)/) {
+            $size = $1;
+            $addr = $2;
+
+            if($sizeataddr{$addr}>0) {
+                # this means weeeeeirdo
+                print "Fucked up debug compile, rebuild curl now\n";
+            }
+
+            $sizeataddr{$addr}=$size;
+            $totalmem += $size;
+
+            if($trace) {
+                print "MALLOC: malloc($size) at $source:$linenum",
+                " makes totally $totalmem bytes\n";
+            }
+
+            newtotal($totalmem);
+            $mallocs++;
+
+            $getmem{$addr}="$source:$linenum";
+        }
+        elsif($function =~ /realloc\(0x([0-9a-f]*), (\d*)\) = 0x([0-9a-f]*)/) {
+            $oldaddr = $1;
+            $newsize = $2;
+            $newaddr = $3;
+
+            $totalmem -= $sizeataddr{$oldaddr};
+            if($trace) {
+                printf("REALLOC: %d less bytes and ", $sizeataddr{$oldaddr});
+            }
+            $sizeataddr{$oldaddr}=0;
+
+            $totalmem += $newsize;
+            $sizeataddr{$newaddr}=$newsize;
+
+            if($trace) {
+                printf("%d more bytes ($source:$linenum)\n", $newsize);
+            }
+
+            newtotal($totalmem);
+            $reallocs++;
+            
+            $getmem{$oldaddr}="";
+            $getmem{$newaddr}="$source:$linenum";
+        }
+        elsif($function =~ /strdup\(0x([0-9a-f]*)\) \((\d*)\) = 0x([0-9a-f]*)/) {
+            # strdup(a5b50) (8) = df7c0
+
+            $dup = $1;
+            $size = $2;
+            $addr = $3;
+            $getmem{$addr}="$source:$linenum";
+            $sizeataddr{$addr}=$size;
+
+            $totalmem += $size;
+
+            if($trace) {
+                printf("STRDUP: $size bytes at %s, makes totally: %d bytes\n", 
+                       $getmem{$addr}, $totalmem);
+            }
+
+            newtotal($totalmem);
+            $strdups++;
+        }
+        else {
+            print "Not recognized input line: $function\n";
+        }        
+    }
+    # FD url.c:1282 socket() = 5
+    elsif($_ =~ /^FD ([^ ]*):(\d*) (.*)/) {
+        # generic match for the filename+linenumber
+        $source = $1;
+        $linenum = $2;
+        $function = $3;
+
+        if($function =~ /socket\(\) = (\d*)/) {
+            $filedes{$1}=1;
+            $getfile{$1}="$source:$linenum";
+            $openfile++;
+        }
+        elsif($function =~ /accept\(\) = (\d*)/) {
+            $filedes{$1}=1;
+            $getfile{$1}="$source:$linenum";
+            $openfile++;
+        }
+        elsif($function =~ /sclose\((\d*)\)/) {
+            if($filedes{$1} != 1) {
+                print "Close without open: $line\n";
+            }
+            else {
+                $filedes{$1}=0; # closed now
+                $openfile--;
+            }
+        }
+    }
+    # FILE url.c:1282 fopen("blabla") = 0x5ddd
+    elsif($_ =~ /^FILE ([^ ]*):(\d*) (.*)/) {
+        # generic match for the filename+linenumber
+        $source = $1;
+        $linenum = $2;
+        $function = $3;
+
+        if($function =~ /fopen\(\"([^\"]*)\"\) = (\(nil\)|0x([0-9a-f]*))/) {
+            if($2 eq "(nil)") {
+                ;
+            }
+            else {
+                $fopen{$3}=1;
+                $fopenfile{$3}="$source:$linenum";
+                $fopens++;
+            }
+        }
+        # fclose(0x1026c8)
+        elsif($function =~ /fclose\(0x([0-9a-f]*)\)/) {
+            if(!$fopen{$1}) {
+                print "fclose() without fopen(): $line\n";
+            }
+            else {
+                $fopen{$1}=0;
+                $fopens--;
+            }
+        }
+    }
+    # ADDR url.c:1282 getaddrinfo() = 0x5ddd
+    elsif($_ =~ /^ADDR ([^ ]*):(\d*) (.*)/) {
+        # generic match for the filename+linenumber
+        $source = $1;
+        $linenum = $2;
+        $function = $3;
+
+        if($function =~ /getaddrinfo\(\) = (\(nil\)|0x([0-9a-f]*))/) {
+            my $add = $2;
+            if($add eq "(nil)") {
+                ;
+            }
+            else {
+                $addrinfo{$add}=1;
+                $addrinfofile{$add}="$source:$linenum";
+                $addrinfos++;
+            }
+        }
+        # fclose(0x1026c8)
+        elsif($function =~ /freeaddrinfo\(0x([0-9a-f]*)\)/) {
+            if(!$addrinfo{$1}) {
+                print "freeaddrinfo() without getaddrinfo(): $line\n";
+            }
+            else {
+                $addrinfo{$1}=0;
+                $addrinfos--;
+            }
+        }
+
+        
+    }
+    else {
+        print "Not recognized prefix line: $line\n";
+    }
+}
+close(FILE);
+
+if($totalmem) {
+    print "Leak detected: memory still allocated: $totalmem bytes\n";
+
+    for(keys %sizeataddr) {
+        $addr = $_;
+        $size = $sizeataddr{$addr};
+        if($size > 0) {
+            print "At $addr, there's $size bytes.\n";
+            print " allocated by ".$getmem{$addr}."\n";
+        }
+    }
+}
+
+if($openfile) {
+    for(keys %filedes) {
+        if($filedes{$_} == 1) {
+            print "Open file descriptor created at ".$getfile{$_}."\n";
+        }
+    }
+}
+
+if($fopens) {
+    print "Open FILE handles left at:\n";
+    for(keys %fopen) {
+        if($fopen{$_} == 1) {
+            print "fopen() called at ".$fopenfile{$_}."\n";
+        }
+    }
+}
+
+if($addrinfos) {
+    print "IPv6-style name resolve data left at:\n";
+    for(keys %addrinfofile) {
+        if($addrinfo{$_} == 1) {
+            print "getaddrinfo() called at ".$addrinfofile{$_}."\n";
+        }
+    }
+}
+
+if($verbose) {
+    print "Mallocs: $mallocs\n",
+    "Reallocs: $reallocs\n",
+    "Strdups:  $strdups\n",
+    "Frees: $frees\n";
+
+    print "Maximum allocated: $maxmem\n";
+}
diff --git a/main/source/curl/tests/runtests.pl b/main/source/curl/tests/runtests.pl
new file mode 100644
index 00000000..2a23dd64
--- /dev/null
+++ b/main/source/curl/tests/runtests.pl
@@ -0,0 +1,1170 @@
+#!/usr/bin/env perl
+# $Id: runtests.pl,v 1.80 2003/04/30 20:28:49 bagder Exp $
+#
+# Main curl test script, in perl to run on more platforms
+#
+#######################################################################
+# These should be the only variables that might be needed to get edited:
+
+use strict;
+#use warnings;
+
+@INC=(@INC, $ENV{'srcdir'}, ".");
+
+require "stunnel.pm"; # stunnel functions
+require "getpart.pm"; # array functions
+
+my $srcdir = $ENV{'srcdir'} || '.';
+my $HOSTIP="127.0.0.1";
+my $HOSTPORT=8999; # bad name, but this is the HTTP server port
+my $HTTPSPORT=8433; # this is the HTTPS server port
+my $FTPPORT=8921;  # this is the FTP server port
+my $FTPSPORT=8821;  # this is the FTPS server port
+my $CURL="../src/curl"; # what curl executable to run on the tests
+my $DBGCURL=$CURL; #"../src/.libs/curl";  # alternative for debugging
+my $LOGDIR="log";
+my $TESTDIR="data";
+my $LIBDIR="./libtest";
+my $SERVERIN="$LOGDIR/server.input"; # what curl sent the server
+my $CURLLOG="$LOGDIR/curl.log"; # all command lines run
+my $FTPDCMD="$LOGDIR/ftpserver.cmd"; # copy ftp server instructions here
+
+# Normally, all test cases should be run, but at times it is handy to
+# simply run a particular one:
+my $TESTCASES="all";
+
+# To run specific test cases, set them like:
+# $TESTCASES="1 2 3 7 8";
+
+#######################################################################
+# No variables below this point should need to be modified
+#
+
+my $HTTPPIDFILE=".http.pid";
+my $HTTPSPIDFILE=".https.pid";
+my $FTPPIDFILE=".ftp.pid";
+my $FTPSPIDFILE=".ftps.pid";
+
+# invoke perl like this:
+my $perl="perl -I$srcdir";
+
+# this gets set if curl is compiled with memory debugging:
+my $memory_debug=0;
+
+# this gets set if curl is compiled with netrc debugging:
+# It has to be in the global symbol table because of the way 'requires' works
+$main::netrc_debug=0;
+my $netrc_debug = \$main::netrc_debug;
+
+# name of the file that the memory debugging creates:
+my $memdump="memdump";
+
+# the path to the script that analyzes the memory debug output file:
+my $memanalyze="./memanalyze.pl";
+
+my $checkstunnel = &checkstunnel;
+
+my $ssl_version; # set if libcurl is built with SSL support
+
+my $skipped=0;  # number of tests skipped; reported in main loop
+my $problems=0; # number of tests that didn't run due to run-time problems
+
+#######################################################################
+# variables the command line options may set
+#
+
+my $short;
+my $verbose;
+my $debugprotocol;
+my $anyway;
+my $gdbthis;      # run test case with gdb debugger
+my $keepoutfiles; # keep stdout and stderr files after tests
+my $listonly;     # only list the tests
+
+my $pwd;          # current working directory
+
+my %run;	  # running server
+
+chomp($pwd = `pwd`);
+
+# enable memory debugging if curl is compiled with it
+$ENV{'CURL_MEMDEBUG'} = 1;
+$ENV{'HOME'}=$pwd;
+
+#######################################################################
+# Return the pid of the server as found in the given pid file
+#
+sub serverpid {
+    my $PIDFILE = $_[0];
+    open(PFILE, "<$PIDFILE");
+    my $PID=0+<PFILE>;
+    close(PFILE);
+    return $PID;
+}
+
+#######################################################################
+# stop the given test server
+#
+sub stopserver {
+    my $PIDFILE = $_[0];
+    # check for pidfile
+    if ( -f $PIDFILE ) {
+        my $PID = serverpid($PIDFILE);
+
+        my $res = kill (9, $PID); # die!
+        unlink $PIDFILE; # server is killed
+
+        if($res && $verbose) {
+            print "RUN: Test server pid $PID signalled to die\n";
+        }
+        elsif($verbose) {
+            print "RUN: Test server pid $PID didn't exist\n";
+        }
+    }
+}
+
+#######################################################################
+# check the given test server if it is still alive
+#
+sub checkserver {
+    my ($pidfile)=@_;
+    my $RUNNING=0;
+    my $PID=0;
+
+    # check for pidfile
+    if ( -f $pidfile ) {
+        $PID=serverpid($pidfile);
+        if ($PID ne "" && kill(0, $PID)) {
+            $RUNNING=1;
+        }
+        else {
+            $RUNNING=0;
+            $PID = -$PID; # negative means dead process
+        }
+    }
+    else {
+        $RUNNING=0;
+    }
+    return $PID
+}
+
+#######################################################################
+# start the http server, or if it already runs, verify that it is our
+# test server on the test-port!
+#
+sub runhttpserver {
+    my $verbose = $_[0];
+    my $RUNNING;
+    my $pid;
+
+    $pid = checkserver ($HTTPPIDFILE);
+
+    # verify if our/any server is running on this port
+    my $cmd = "$CURL -o log/verifiedserver --silent -i $HOSTIP:$HOSTPORT/verifiedserver 2>/dev/null";
+    print "CMD; $cmd\n" if ($verbose);
+    my $res = system($cmd);
+
+    $res >>= 8; # rotate the result
+    my $data;
+
+    print "RUN: curl command returned $res\n" if ($verbose);
+
+    open(FILE, "<log/verifiedserver");
+    my @file=<FILE>;
+    close(FILE);
+    $data=$file[0]; # first line
+
+    if ( $data =~ /WE ROOLZ: (\d+)/ ) {
+        $pid = 0+$1;
+    }
+    elsif($data) {
+        print "RUN: Unknown HTTP server is running on port $HOSTPORT\n";
+        return 2;
+    }
+
+    if($pid > 0) {
+        my $res = kill (9, $pid); # die!
+        if(!$res) {
+            print "RUN: Failed to kill test HTTP server, do it manually and",
+            " restart the tests.\n";
+            exit;
+        }
+        sleep(1);
+    }
+
+    my $flag=$debugprotocol?"-v ":"";
+    my $cmd="$perl $srcdir/httpserver.pl $flag $HOSTPORT &";
+    system($cmd);
+    if($verbose) {
+        print "CMD: $cmd\n";
+    }
+
+    my $verified;
+    for(1 .. 5) {
+        # verify that our server is up and running:
+        my $data=`$CURL --silent -i $HOSTIP:$HOSTPORT/verifiedserver 2>/dev/null`;
+
+        if ( $data !~ /WE ROOLZ: (\d+)/ ) {
+            sleep(1);
+            next;
+        }
+        else {
+            $verified = 1;
+            last;
+        }
+    }
+    if(!$verified) {
+        print STDERR "RUN: failed to start our HTTP server\n";
+        return 1;
+    }
+
+    if($verbose) {
+        print "RUN: HTTP server is now verified to be our server\n";
+    }
+
+    return 0;
+}
+
+#######################################################################
+# start the https server (or rather, tunnel) if needed
+#
+sub runhttpsserver {
+    my $verbose = $_[0];
+    my $STATUS;
+    my $RUNNING;
+    my $PID=checkserver($HTTPSPIDFILE );
+
+    if($PID > 0) {
+        # kill previous stunnel!
+        if($verbose) {
+            print "RUN: kills off running stunnel at $PID\n";
+        }
+        stopserver($HTTPSPIDFILE);
+    }
+
+    my $flag=$debugprotocol?"-v ":"";
+    my $cmd="$perl $srcdir/httpsserver.pl $flag -d $srcdir -r $HOSTPORT $HTTPSPORT &";
+    system($cmd);
+    if($verbose) {
+        print "CMD: $cmd\n";
+    }
+    sleep(1);
+}
+
+#######################################################################
+# start the ftp server if needed
+#
+sub runftpserver {
+    my $verbose = $_[0];
+    my $STATUS;
+    my $RUNNING;
+    # check for pidfile
+    my $pid = checkserver ($FTPPIDFILE );
+
+    if ($pid <= 0) {
+        print "RUN: Check port $FTPPORT for our own FTP server\n"
+            if ($verbose);
+
+
+        my $time=time();
+        # check if this is our server running on this port:
+        my $data=`$CURL -m4 --silent -i ftp://$HOSTIP:$FTPPORT/verifiedserver 2>/dev/null`;
+
+        # if this took more than 2 secs, we assume it "hung" on a weird server
+        my $took = time()-$time;
+        
+        if ( $data =~ /WE ROOLZ: (\d+)/ ) {
+            # this is our test server with a known pid!
+            $pid = $1;
+        }
+        else {
+            if($data || ($took > 2)) {
+                # this is not a known server
+                print "RUN: Unknown server on our favourite port: $FTPPORT\n";
+                return 1;
+            }
+        }
+    }
+
+    if($pid > 0) {
+        print "RUN: Killing a previous server using pid $pid\n" if($verbose);
+        my $res = kill (9, $pid); # die!
+        if(!$res) {
+            print "RUN: Failed to kill our FTP test server, do it manually and",
+            " restart the tests.\n";
+            exit;
+        }
+        sleep(1);
+    }
+    
+    # now (re-)start our server:
+    my $flag=$debugprotocol?"-v ":"";
+    my $cmd="$perl $srcdir/ftpserver.pl $flag $FTPPORT &";
+    if($verbose) {
+        print "CMD: $cmd\n";
+    }
+    system($cmd);
+
+    my $verified;
+    for(1 .. 5) {
+        # verify that our server is up and running:
+        my $data=`$CURL --silent -i ftp://$HOSTIP:$FTPPORT/verifiedserver 2>/dev/null`;
+
+        if ( $data !~ /WE ROOLZ: (\d+)/ ) {
+            if($verbose) {
+                print STDERR "RUN: Retrying FTP server existance in 1 sec\n";
+            }
+            sleep(1);
+            next;
+        }
+        else {
+            $verified = 1;
+            last;
+        }
+    }
+    if(!$verified) {
+        die "RUN: failed to start our FTP server\n";
+    }
+
+    if($verbose) {
+        print "RUN: FTP server is now verified to be our server\n";
+    }
+
+    return 0;
+}
+
+#######################################################################
+# start the ftps server (or rather, tunnel) if needed
+#
+sub runftpsserver {
+    my $verbose = $_[0];
+    my $STATUS;
+    my $RUNNING;
+    my $PID=checkserver($FTPSPIDFILE );
+
+    if($PID > 0) {
+        # kill previous stunnel!
+        if($verbose) {
+            print "kills off running stunnel at $PID\n";
+        }
+        stopserver($FTPSPIDFILE);
+    }
+
+    my $flag=$debugprotocol?"-v ":"";
+    my $cmd="$perl $srcdir/ftpsserver.pl $flag -d $srcdir -r $FTPPORT $FTPSPORT &";
+    system($cmd);
+    if($verbose) {
+        print "CMD: $cmd\n";
+    }
+    sleep(1);
+}
+
+#######################################################################
+# Remove all files in the specified directory
+#
+sub cleardir {
+    my $dir = $_[0];
+    my $count;
+    my $file;
+
+    # Get all files
+    opendir(DIR, $dir) ||
+        return 0; # can't open dir
+    while($file = readdir(DIR)) {
+        if($file !~ /^\./) {
+            unlink("$dir/$file");
+            $count++;
+        }
+    }
+    closedir DIR;
+    return $count;
+}
+
+#######################################################################
+# filter out the specified pattern from the given input file and store the
+# results in the given output file
+#
+sub filteroff {
+    my $infile=$_[0];
+    my $filter=$_[1];
+    my $ofile=$_[2];
+
+    open(IN, "<$infile")
+        || return 1;
+
+    open(OUT, ">$ofile")
+        || return 1;
+
+    # print "FILTER: off $filter from $infile to $ofile\n";
+
+    while(<IN>) {
+        $_ =~ s/$filter//;
+        print OUT $_;
+    }
+    close(IN);
+    close(OUT);    
+    return 0;
+}
+
+#######################################################################
+# compare test results with the expected output, we might filter off
+# some pattern that is allowed to differ, output test results
+#
+
+sub compare {
+    # filter off patterns _before_ this comparison!
+    my ($subject, $firstref, $secondref)=@_;
+
+    my $result = compareparts($firstref, $secondref);
+
+    if($result) {
+        if(!$short) {
+            print "\n $subject FAILED:\n";
+            print showdiff($firstref, $secondref);
+        }
+        else {
+            print "FAILED\n";
+        }
+    }
+    return $result;
+}
+
+#######################################################################
+# display information about curl and the host the test suite runs on
+#
+sub displaydata {
+
+    unlink($memdump); # remove this if there was one left
+
+    my $version=`$CURL -V`;
+    chomp $version;
+
+    my $curl = $version;
+
+    $curl =~ s/^(.*)(libcurl.*)/$1/g;
+    my $libcurl = $2;
+
+    my $hostname=`hostname`;
+    my $hosttype=`uname -a`;
+
+    print "********* System characteristics ******** \n",
+    "* $curl\n",
+    "* $libcurl\n",
+    "* Host: $hostname",
+    "* System: $hosttype";
+
+    if($libcurl =~ /SSL/i) {
+        $ssl_version=1;
+    }
+
+    if( -r $memdump) {
+        # if this exists, curl was compiled with memory debugging
+        # enabled and we shall verify that no memory leaks exist
+        # after each and every test!
+        $memory_debug=1;
+
+        # there's only one debug control in the configure script
+        # so hope netrc debugging is enabled and set it up
+        $$netrc_debug = 1;
+        $ENV{'CURL_DEBUG_NETRC'} = 'log/netrc';
+    }
+    printf("* Memory debugging: %s\n", $memory_debug?"ON":"OFF");
+    printf("* Netrc debugging:  %s\n", $$netrc_debug?"ON":"OFF");
+    printf("* HTTPS server:     %s\n", $checkstunnel?"ON":"OFF");
+    printf("* FTPS server:      %s\n", $checkstunnel?"ON":"OFF");
+    printf("* libcurl SSL:      %s\n", $ssl_version?"ON":"OFF");
+    print "***************************************** \n";
+}
+
+#######################################################################
+# substitute the variable stuff into either a joined up file or 
+# a command, in either case passed by reference
+#
+sub subVariables {
+  my ($thing) = @_;
+  $$thing =~ s/%HOSTIP/$HOSTIP/g;
+  $$thing =~ s/%HOSTPORT/$HOSTPORT/g;
+  $$thing =~ s/%HTTPSPORT/$HTTPSPORT/g;
+  $$thing =~ s/%FTPPORT/$FTPPORT/g;
+  $$thing =~ s/%FTPSPORT/$FTPSPORT/g;
+  $$thing =~ s/%SRCDIR/$srcdir/g;
+  $$thing =~ s/%PWD/$pwd/g;
+}
+
+#######################################################################
+# Run a single specified test case
+#
+
+sub singletest {
+    my $testnum=$_[0];
+
+    # load the test case file definition
+    if(loadtest("${TESTDIR}/test${testnum}")) {
+        if($verbose) {
+            # this is not a test
+            print "RUN: $testnum doesn't look like a test case!\n";
+        }
+        return -1;
+    }
+
+    my $serverproblem = serverfortest($testnum);
+
+    if($serverproblem) {
+        # there's a problem with the server, don't run
+        # this particular server, but count it as "skipped"
+        if($serverproblem> 1) {
+            print "RUN: test case $testnum couldn't run!\n";
+            $problems++;
+        }
+        else {
+            $skipped++;
+        }
+        return -1;
+    }
+
+    {
+        my %hash = getpartattr("client");
+        my $requires = $hash{'requires'};
+
+        if (defined($requires)) {
+            no strict "refs";
+            my $value=${$requires};
+#            print "This test requires '$requires' with value '$value' \n";
+
+            if (${$requires}) {
+                # this test is OK
+                ;
+            }else {
+                print "$testnum requires $requires, which is not set; skipping\n";
+                $skipped++;
+                return -1;  # return test-not-run
+            }
+        }
+    }
+
+
+    # extract the reply data
+    my @reply = getpart("reply", "data");
+    my @replycheck = getpart("reply", "datacheck");
+
+    if (@replycheck) {
+        # we use this file instead to check the final output against
+
+        my %hash = getpartattr("reply", "datacheck");
+        if($hash{'nonewline'}) {
+            # Yes, we must cut off the final newline from the final line
+            # of the datacheck
+            chomp($replycheck[$#replycheck]);
+        }
+    
+        @reply=@replycheck;
+    }
+
+    # curl command to run
+    my @curlcmd= getpart("client", "command");
+
+    # this is the valid protocol blurb curl should generate
+    my @protocol= getpart("verify", "protocol");
+
+    # redirected stdout/stderr to these files
+    $STDOUT="$LOGDIR/stdout$testnum";
+    $STDERR="$LOGDIR/stderr$testnum";
+
+    # if this section exists, we verify that the stdout contained this:
+    my @validstdout = getpart("verify", "stdout");
+
+    # if this section exists, we verify upload
+    my @upload = getpart("verify", "upload");
+
+    # if this section exists, it is FTP server instructions:
+    my @ftpservercmd = getpart("server", "instruction");
+
+    my $CURLOUT="$LOGDIR/curl$testnum.out"; # curl output if not stdout
+
+    # name of the test
+    my @testname= getpart("client", "name");
+
+    printf("test %03d...", $testnum);
+    if(!$short) {
+        my $name = $testname[0];
+        $name =~ s/\n//g;
+        print "[$name]\n";
+    }
+
+    if($listonly) {
+        return 0; # look successful
+    }
+
+    my @codepieces = getpart("client", "tool");
+
+    my $tool="";
+    if(@codepieces) {
+        $tool = $codepieces[0];
+        chomp $tool;
+    }
+
+    # remove previous server output logfile
+    unlink($SERVERIN);
+
+    if(@ftpservercmd) {
+        # write the instructions to file
+        writearray($FTPDCMD, \@ftpservercmd);
+    }
+
+    # get the command line options to use
+    my ($cmd, @blaha)= getpart("client", "command");
+
+    # make some nice replace operations
+    $cmd =~ s/\n//g; # no newlines please
+
+    subVariables \$cmd;
+
+#    $cmd =~ s/%HOSTIP/$HOSTIP/g;
+#    $cmd =~ s/%HOSTPORT/$HOSTPORT/g;
+#    $cmd =~ s/%HTTPSPORT/$HTTPSPORT/g;
+#    $cmd =~ s/%FTPPORT/$FTPPORT/g;
+#    $cmd =~ s/%FTPSPORT/$FTPSPORT/g;
+#    $cmd =~ s/%SRCDIR/$srcdir/g;
+#    $cmd =~ s/%PWD/$pwd/g;
+
+    #$cmd =~ s/%HOSTNAME/$HOSTNAME/g;
+
+    if($memory_debug) {
+        unlink($memdump);
+    }
+
+    my @inputfile=getpart("client", "file");
+    if(@inputfile) {
+        # we need to generate a file before this test is invoked
+        my %hash = getpartattr("client", "file");
+
+        my $filename=$hash{'name'};
+
+        if(!$filename) {
+            print "ERROR: section client=>file has no name attribute!\n";
+            exit;
+        }
+        my $fileContent = join('', @inputfile);
+        subVariables \$fileContent;
+#        print "DEBUG: writing file " . $filename . "\n";
+        open OUTFILE, ">$filename";
+        binmode OUTFILE; # for crapage systems, use binary       
+        print OUTFILE $fileContent;
+        close OUTFILE;
+    }
+
+    my %cmdhash = getpartattr("client", "command");
+
+    my $out="";
+
+    if($cmdhash{'option'} eq "no-output") {
+        #print "*** We don't slap on --output\n";
+    }
+    else {
+        if (!@validstdout) {
+            $out=" --output $CURLOUT ";
+        }
+    }
+
+    my $cmdargs;
+    if(!$tool) {
+        # run curl, add -v for debug information output
+        $cmdargs ="$out --include -v $cmd";
+    }
+    else {
+        $cmdargs = " $cmd"; # $cmd is the command line for the test file
+        $CURLOUT = $STDOUT; # sends received data to stdout
+    }
+
+    my @stdintest = getpart("client", "stdin");
+
+    if(@stdintest) {
+        my $stdinfile="$LOGDIR/stdin-for-$testnum";
+        writearray($stdinfile, \@stdintest);
+
+        $cmdargs .= " <$stdinfile";
+    }
+    my $CMDLINE;
+
+    if(!$tool) {
+        $CMDLINE="$CURL";
+    }
+    else {
+        $CMDLINE="$LIBDIR/$tool";
+        $DBGCURL=$CMDLINE;
+    }
+
+    $CMDLINE .= "$cmdargs >$STDOUT 2>$STDERR";
+
+    if($verbose) {
+        print "$CMDLINE\n"; 
+   }
+
+    print CMDLOG "$CMDLINE\n";
+
+    my $res;
+    # run the command line we built
+    if($gdbthis) {
+        open(GDBCMD, ">log/gdbcmd");
+        print GDBCMD "set args $cmdargs\n";
+        print GDBCMD "show args\n";
+        close(GDBCMD);
+        system("gdb $DBGCURL -x log/gdbcmd");
+        $res =0; # makes it always continue after a debugged run
+    }
+    else {
+        $res = system("$CMDLINE");
+        $res /= 256;
+    }
+
+    # remove the special FTP command file after each test!
+    unlink($FTPDCMD);
+
+    my @err = getpart("verify", "errorcode");
+    my $errorcode = $err[0];
+
+    if($errorcode || $res) {
+        if($errorcode == $res) {
+            $errorcode =~ s/\n//;
+            if($verbose) {
+                print " received errorcode $errorcode OK";
+            }
+            elsif(!$short) {
+                print " error OK";
+            }
+        }
+        else {
+            if(!$short) {
+                print "curl returned $res, ".(0+$errorcode)." was expected\n";
+            }
+            print " error FAILED\n";
+            return 1;
+        }
+    }
+
+    if (@validstdout) {
+        # verify redirected stdout
+        my @actual = loadarray($STDOUT);
+
+        $res = compare("stdout", \@actual, \@validstdout);
+        if($res) {
+            return 1;
+        }
+        if(!$short) {
+            print " stdout OK";
+        }
+    }
+
+    my %replyattr = getpartattr("reply", "data");
+    if(!$replyattr{'nocheck'} && @reply) {
+        # verify the received data
+        my @out = loadarray($CURLOUT);
+        $res = compare("data", \@out, \@reply);
+        if ($res) {
+            return 1;
+        }
+        if(!$short) {
+            print " data OK";
+        }
+    }
+
+    if(@upload) {
+        # verify uploaded data
+        my @out = loadarray("$LOGDIR/upload.$testnum");
+        $res = compare("upload", \@out, \@upload);
+        if ($res) {
+            return 1;
+        }
+        if(!$short) {
+            print " upload OK";
+        }
+    }
+
+    if(@protocol) {
+        # verify the sent request
+        my @out = loadarray($SERVERIN);
+
+        # what to cut off from the live protocol sent by curl
+        my @strip = getpart("verify", "strip");
+
+        my @protstrip=@protocol;
+
+        # check if there's any attributes on the verify/protocol section
+        my %hash = getpartattr("verify", "protocol");
+
+        if($hash{'nonewline'}) {
+            # Yes, we must cut off the final newline from the final line
+            # of the protocol data
+            chomp($protstrip[$#protstrip]);
+        }
+
+        for(@strip) {
+            # strip all patterns from both arrays
+            @out = striparray( $_, \@out);
+            @protstrip= striparray( $_, \@protstrip);
+        }
+
+        $res = compare("protocol", \@out, \@protstrip);
+        if($res) {
+            return 1;
+        }
+        if(!$short) {
+            print " protocol OK";
+        }
+    }
+
+    my @outfile=getpart("verify", "file");
+    if(@outfile) {
+        # we're supposed to verify a dynamicly generated file!
+        my %hash = getpartattr("verify", "file");
+
+        my $filename=$hash{'name'};
+        if(!$filename) {
+            print "ERROR: section verify=>file has no name attribute!\n";
+            exit;
+        }
+        my @generated=loadarray($filename);
+
+        $res = compare("output", \@generated, \@outfile);
+        if($res) {
+            return 1;
+        }
+        if(!$short) {
+            print " output OK";
+        }        
+    }
+
+    if(!$keepoutfiles) {
+        # remove the stdout and stderr files
+        unlink($STDOUT);
+        unlink($STDERR);
+        unlink($CURLOUT); # remove the downloaded results
+
+        unlink("$LOGDIR/upload.$testnum");  # remove upload leftovers
+    }
+
+    unlink($FTPDCMD); # remove the instructions for this test
+
+    my @what = getpart("client", "killserver");
+    for(@what) {
+        my $serv = $_;
+        chomp $serv;
+        if($run{$serv}) {
+            stopserver($run{$serv}); # the pid file is in the hash table
+            $run{$serv}=""; # clear it
+        }
+        else {
+            print STDERR "RUN: The $serv server is not running\n";
+        }
+    }
+
+    if($memory_debug) {
+        if(! -f $memdump) {
+            print "\n** ALERT! memory debuggin without any output file?\n";
+        }
+        else {
+            my @memdata=`$memanalyze $memdump`;
+            my $leak=0;
+            for(@memdata) {
+                if($_ ne "") {
+                    # well it could be other memory problems as well, but
+                    # we call it leak for short here
+                    $leak=1;
+                }
+            }
+            if($leak) {
+                print "\n** MEMORY FAILURE\n";
+                print @memdata;
+                return 1;
+            }
+            else {
+                if(!$short) {
+                    print " memory OK";
+                }
+            }
+        }
+    }
+    if($short) {
+        print "OK";
+    }
+    print "\n";
+
+    return 0;
+}
+
+##############################################################################
+# This function makes sure the right set of server is running for the
+# specified test case. This is a useful design when we run single tests as not
+# all servers need to run then!
+
+sub serverfortest {
+    my ($testnum)=@_;
+
+    # load the test case file definition
+    if(loadtest("${TESTDIR}/test${testnum}")) {
+        if($verbose) {
+            # this is not a test
+            print "$testnum doesn't look like a test case!\n";
+        }
+        return 100;
+    }
+    my @what = getpart("client", "server");
+
+    if(!$what[0]) {
+        warn "Test case $testnum has no server(s) specified!";
+        return 100;
+    }
+
+    for(@what) {
+        my $what = lc($_);
+        $what =~ s/[^a-z]//g;
+        if($what eq "ftp") {
+            if(!$run{'ftp'}) {
+                if(runftpserver($verbose)) {
+                    return 2; # error starting it
+                }
+                $run{'ftp'}=$FTPPIDFILE;
+            }
+        }
+        elsif($what eq "http") {
+            if(!$run{'http'}) {
+                if(runhttpserver($verbose)) {
+                    return 2; # error starting
+                }
+                $run{'http'}=$HTTPPIDFILE;
+            }
+        }
+        elsif($what eq "ftps") {
+            if(!$checkstunnel || !$ssl_version) {
+                # we can't run https tests without stunnel
+                # or if libcurl is SSL-less
+                return 1;
+            }
+            if(!$run{'ftp'}) {
+                if(runftpserver($verbose)) {
+                    return 2; # error starting it
+                }
+                $run{'ftp'}=$FTPPIDFILE;
+            }
+            if(!$run{'ftps'}) {
+                runftpsserver($verbose);
+                $run{'ftps'}=$FTPSPIDFILE;
+            }
+        }
+        elsif($what eq "file") {
+            # we support it but have no server!
+        }
+        elsif($what eq "https") {
+            if(!$checkstunnel || !$ssl_version) {
+                # we can't run https tests without stunnel
+                # or if libcurl is SSL-less
+                return 1;
+            }
+            if(!$run{'http'}) {
+                if(runhttpserver($verbose)) {
+                    return 2; # problems starting server
+                }
+                $run{'http'}=$HTTPPIDFILE;
+            }
+            if(!$run{'https'}) {
+                runhttpsserver($verbose);
+                $run{'https'}=$HTTPSPIDFILE;
+            }
+        }
+        elsif($what eq "none") {
+        }
+        else {
+            warn "we don't support a server for $what";
+        }
+    }
+    return 0; # ok
+}
+
+#######################################################################
+# Check options to this test program
+#
+
+my $number=0;
+my $fromnum=-1;
+my @testthis;
+do {
+    if ($ARGV[0] eq "-v") {
+        # verbose output
+        $verbose=1;
+    }
+    elsif ($ARGV[0] eq "-c") {
+        # use this path to curl instead of default        
+        $CURL=$ARGV[1];
+        shift @ARGV;
+    }
+    elsif ($ARGV[0] eq "-d") {
+        # have the servers display protocol output 
+        $debugprotocol=1;
+    }
+    elsif ($ARGV[0] eq "-g") {
+        # run this test with gdb
+        $gdbthis=1;
+    }
+    elsif($ARGV[0] eq "-s") {
+        # short output
+        $short=1;
+    }
+    elsif($ARGV[0] eq "-a") {
+        # continue anyway, even if a test fail
+        $anyway=1;
+    }
+    elsif($ARGV[0] eq "-l") {
+        # lists the test case names only
+        $listonly=1;
+    }
+    elsif($ARGV[0] eq "-k") {
+        # keep stdout and stderr files after tests
+        $keepoutfiles=1;
+    }
+    elsif($ARGV[0] eq "-h") {
+        # show help text
+        print <<EOHELP
+Usage: runtests.pl [options]
+  -a       continue even if a test fails
+  -d       display server debug info
+  -g       run the test case with gdb
+  -h       this help text
+  -k       keep stdout and stderr files present after tests
+  -l       list all test case names/descriptions
+  -s       short output
+  -v       verbose output
+  [num]    like "5 6 9" or " 5 to 22 " to run those tests only
+EOHELP
+    ;
+        exit;
+    }
+    elsif($ARGV[0] =~ /^(\d+)/) {
+        $number = $1;
+        if($fromnum >= 0) {
+            for($fromnum .. $number) {
+                push @testthis, $_;
+            }
+            $fromnum = -1;
+        }
+        else {
+            push @testthis, $1;
+        }
+    }
+    elsif($ARGV[0] =~ /^to$/i) {
+        $fromnum = $number+1;
+    }
+} while(shift @ARGV);
+
+if($testthis[0] ne "") {
+    $TESTCASES=join(" ", @testthis);
+}
+
+#######################################################################
+# Output curl version and host info being tested
+#
+
+if(!$listonly) {
+    displaydata();
+}
+
+#######################################################################
+# clear and create logging directory:
+#
+cleardir($LOGDIR);
+mkdir($LOGDIR, 0777);
+
+#######################################################################
+# If 'all' tests are requested, find out all test numbers
+#
+
+if ( $TESTCASES eq "all") {
+    # Get all commands and find out their test numbers
+    opendir(DIR, $TESTDIR) || die "can't opendir $TESTDIR: $!";
+    my @cmds = grep { /^test([0-9]+)$/ && -f "$TESTDIR/$_" } readdir(DIR);
+    closedir DIR;
+
+    $TESTCASES=""; # start with no test cases
+
+    # cut off everything but the digits 
+    for(@cmds) {
+        $_ =~ s/[a-z\/\.]*//g;
+    }
+    # the the numbers from low to high
+    for(sort { $a <=> $b } @cmds) {
+        $TESTCASES .= " $_";
+    }
+}
+
+#######################################################################
+# Start the command line log
+#
+open(CMDLOG, ">$CURLLOG") ||
+    print "can't log command lines to $CURLLOG\n";
+
+#######################################################################
+# The main test-loop
+#
+
+my $failed;
+my $testnum;
+my $ok=0;
+my $total=0;
+
+foreach $testnum (split(" ", $TESTCASES)) {
+
+    my $error = singletest($testnum);
+    if(-1 == $error) {
+        # not a test we can run
+        next;
+    }
+
+    $total++; # number of tests we've run
+
+    if($error>0) {
+        $failed.= "$testnum ";
+        if(!$anyway) {
+            # a test failed, abort
+            print "\n - abort tests\n";
+            last;
+        }
+    }
+    elsif(!$error) {
+        $ok++; # successful test counter
+    }
+
+    # loop for next test
+}
+
+#######################################################################
+# Close command log
+#
+close(CMDLOG);
+
+#######################################################################
+# Tests done, stop the servers
+#
+
+for(keys %run) {
+    stopserver($run{$_}); # the pid file is in the hash table
+}
+
+if($total) {
+    printf("TESTDONE: $ok tests out of $total reported OK: %d%%\n",
+           $ok/$total*100);
+
+    if($ok != $total) {
+        print "TESTFAIL: These test cases failed: $failed\n";
+    }
+}
+else {
+    print "TESTFAIL: No tests were performed!\n";
+}
+if($skipped) {
+    print "TESTINFO: $skipped tests were skipped due to restraints\n";
+}
+if($problems) {
+    print "TESTINFO: $problems tests didn't run due to run-time problems\n";
+}
+if($total && ($ok != $total)) {
+    exit 1;
+}
diff --git a/main/source/curl/tests/server/Makefile.am b/main/source/curl/tests/server/Makefile.am
new file mode 100644
index 00000000..e70bd2bc
--- /dev/null
+++ b/main/source/curl/tests/server/Makefile.am
@@ -0,0 +1,12 @@
+# sws is the Silly Web Server
+#
+# Original http server code contributed by Georg Horn. Heavily modified since.
+#
+
+AUTOMAKE_OPTIONS = foreign
+
+noinst_PROGRAMS = sws
+
+sws_SOURCES= sws.c getpart.c
+
+extra_DIST = config.h.in
diff --git a/main/source/curl/tests/server/Makefile.in b/main/source/curl/tests/server/Makefile.in
new file mode 100644
index 00000000..dbd5d2b1
--- /dev/null
+++ b/main/source/curl/tests/server/Makefile.in
@@ -0,0 +1,477 @@
+# Makefile.in generated by automake 1.7.2 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# sws is the Silly Web Server
+#
+# Original http server code contributed by Georg Horn. Heavily modified since.
+#
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CA_BUNDLE = @CURL_CA_BUNDLE@
+CURL_DISABLE_DICT = @CURL_DISABLE_DICT@
+CURL_DISABLE_FILE = @CURL_DISABLE_FILE@
+CURL_DISABLE_FTP = @CURL_DISABLE_FTP@
+CURL_DISABLE_GOPHER = @CURL_DISABLE_GOPHER@
+CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@
+CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@
+CURL_DISABLE_TELNET = @CURL_DISABLE_TELNET@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_LIBZ = @HAVE_LIBZ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPV6_ENABLED = @IPV6_ENABLED@
+KRB4_ENABLED = @KRB4_ENABLED@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NO_UNDEFINED_FALSE = @NO_UNDEFINED_FALSE@
+NO_UNDEFINED_TRUE = @NO_UNDEFINED_TRUE@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_ENABLED = @OPENSSL_ENABLED@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKGADD_NAME = @PKGADD_NAME@
+PKGADD_PKG = @PKGADD_PKG@
+PKGADD_VENDOR = @PKGADD_VENDOR@
+PKGCONFIG = @PKGCONFIG@
+RANDOM_FILE = @RANDOM_FILE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VERSIONNUM = @VERSIONNUM@
+YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+
+AUTOMAKE_OPTIONS = foreign
+
+noinst_PROGRAMS = sws
+
+sws_SOURCES = sws.c getpart.c
+
+extra_DIST = config.h.in
+subdir = tests/server
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/lib/config.h \
+	$(top_builddir)/src/config.h config.h \
+	$(top_builddir)/lib/ca-bundle.h
+CONFIG_CLEAN_FILES =
+noinst_PROGRAMS = sws$(EXEEXT)
+PROGRAMS = $(noinst_PROGRAMS)
+
+am_sws_OBJECTS = sws.$(OBJEXT) getpart.$(OBJEXT)
+sws_OBJECTS = $(am_sws_OBJECTS)
+sws_LDADD = $(LDADD)
+sws_DEPENDENCIES =
+sws_LDFLAGS =
+
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/lib -I$(top_builddir)/src -I. -I$(top_builddir)/lib
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/getpart.Po ./$(DEPDIR)/sws.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+DIST_SOURCES = $(sws_SOURCES)
+DIST_COMMON = Makefile.am Makefile.in config.h.in
+SOURCES = $(sws_SOURCES)
+
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  tests/server/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+config.h: stamp-h3
+	@if test ! -f $@; then \
+	  rm -f stamp-h3; \
+	  $(MAKE) stamp-h3; \
+	else :; fi
+
+stamp-h3: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h3
+	cd $(top_builddir) && $(SHELL) ./config.status tests/server/config.h
+
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOHEADER)
+	touch $(srcdir)/config.h.in
+
+distclean-hdr:
+	-rm -f config.h stamp-h3
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+sws$(EXEEXT): $(sws_OBJECTS) $(sws_DEPENDENCIES) 
+	@rm -f sws$(EXEEXT)
+	$(LINK) $(sws_LDFLAGS) $(sws_OBJECTS) $(sws_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getpart.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sws.Po@am__quote@
+
+distclean-depend:
+	-rm -rf ./$(DEPDIR)
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ETAGS = etags
+ETAGSFLAGS =
+
+CTAGS = ctags
+CTAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) config.h
+
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-compile distclean-depend \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstPROGRAMS ctags distclean \
+	distclean-compile distclean-depend distclean-generic \
+	distclean-hdr distclean-libtool distclean-tags distdir dvi \
+	dvi-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/main/source/curl/tests/server/config.h.in b/main/source/curl/tests/server/config.h.in
new file mode 100644
index 00000000..5eb66ccd
--- /dev/null
+++ b/main/source/curl/tests/server/config.h.in
@@ -0,0 +1,2 @@
+
+#undef HAVE_SIGNAL
diff --git a/main/source/curl/tests/server/getpart.c b/main/source/curl/tests/server/getpart.c
new file mode 100644
index 00000000..c6d89194
--- /dev/null
+++ b/main/source/curl/tests/server/getpart.c
@@ -0,0 +1,154 @@
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#define EAT_SPACE(ptr) while( ptr && *ptr && isspace((int)*ptr) ) ptr++
+#define EAT_WORD(ptr) while( ptr && *ptr && !isspace((int)*ptr) && ('>' != *ptr)) ptr++
+
+#ifdef DEBUG
+#define show(x) printf x
+#else
+#define show(x)
+#endif
+
+static
+char *appendstring(char *string, /* original string */
+                   char *buffer, /* to append */
+                   int *stringlen, int *stralloc)
+{
+  int len = strlen(buffer);
+
+  if((len + *stringlen) > *stralloc) {
+    char *newptr= realloc(string, *stralloc*2);
+    if(newptr) {
+      string = newptr;
+      *stralloc *= 2;
+    }
+    else
+      return NULL;
+  }
+  strcpy(&string[*stringlen], buffer);
+  *stringlen += len;
+
+  return string;
+}
+
+char *spitout(FILE *stream, char *main, char *sub, int *size)
+{
+  char buffer[8192]; /* big enough for anything */
+  char cmain[128]=""; /* current main section */
+  char csub[128]="";  /* current sub section */
+  char *ptr;
+  char *end;
+  char display = 0;
+
+  char *string;
+  int stringlen=0;
+  int stralloc=256;
+
+  enum {
+    STATE_OUTSIDE,
+    STATE_INMAIN,
+    STATE_INSUB,
+    STATE_ILLEGAL
+  } state = STATE_OUTSIDE;
+
+  string = (char *)malloc(stralloc);
+  
+  while(fgets(buffer, sizeof(buffer), stream)) {
+
+    ptr = buffer;
+
+    /* pass white spaces */
+    EAT_SPACE(ptr);
+
+    if('<' != *ptr) {
+      if(display) {
+        show(("=> %s", buffer));
+        string = appendstring(string, buffer, &stringlen, &stralloc);
+        show(("* %s\n", buffer));
+      }
+      continue;
+    }
+
+    ptr++;
+    EAT_SPACE(ptr);
+
+    if('/' == *ptr) {
+      /* end of a section */
+      ptr++;
+      EAT_SPACE(ptr);
+
+      end = ptr;
+      EAT_WORD(end);
+      *end = 0;
+
+      if((state == STATE_INSUB) &&
+         !strcmp(csub, ptr)) {
+        /* this is the end of the currently read sub section */
+        state--;
+        csub[0]=0; /* no sub anymore */
+        display=0;
+      }
+      else if((state == STATE_INMAIN) &&
+              !strcmp(cmain, ptr)) {
+        /* this is the end of the currently read main section */
+        state--;
+        cmain[0]=0; /* no main anymore */
+        display=0;
+      }
+    }
+    else if(!display) {
+      /* this is the beginning of a section */
+      end = ptr;
+      EAT_WORD(end);
+      
+      *end = 0;
+      switch(state) {
+      case STATE_OUTSIDE:
+        strcpy(cmain, ptr);
+        state = STATE_INMAIN;
+        break;
+      case STATE_INMAIN:
+        strcpy(csub, ptr);
+        state = STATE_INSUB;
+        break;
+      default:
+        break;
+      }
+    }
+    if(display) {
+      string = appendstring(string, buffer, &stringlen, &stralloc);
+      show(("* %s\n", buffer));
+    }
+
+    if((STATE_INSUB == state) &&
+       !strcmp(cmain, main) &&
+       !strcmp(csub, sub)) {
+      show(("* (%d bytes) %s\n", stringlen, buffer));
+      display = 1; /* start displaying */
+    }
+    else {
+      show(("%d (%s/%s): %s\n", state, cmain, csub, buffer));
+      display = 0; /* no display */
+    }
+  }
+
+  *size = stringlen;
+  return string;
+}
+
+#ifdef TEST
+int main(int argc, char **argv)
+{
+  if(argc< 3) {
+    printf("./moo main sub\n");
+  }
+  else {
+    int size;
+    char *buffer = spitout(stdin, argv[1], argv[2], &size);
+  }
+  return 0;
+}
+#endif
diff --git a/main/source/curl/tests/server/sws.c b/main/source/curl/tests/server/sws.c
new file mode 100644
index 00000000..e8d44ed1
--- /dev/null
+++ b/main/source/curl/tests/server/sws.c
@@ -0,0 +1,539 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id: sws.c,v 1.28 2003/04/03 13:43:15 bagder Exp $
+ ***************************************************************************/
+
+/* sws.c: simple (silly?) web server
+
+   This code was originally graciously donated to the project by Juergen
+   Wilke. Thanks a bunch!
+
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#ifdef _XOPEN_SOURCE_EXTENDED
+/* This define is "almost" required to build on HPUX 11 */
+#include <arpa/inet.h> 
+#endif
+#include <netdb.h>
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+const char *
+spitout(FILE *stream,
+        const char *main,
+        const char *sub, int *size);
+
+#define DEFAULT_PORT 8999
+
+#ifndef DEFAULT_LOGFILE
+#define DEFAULT_LOGFILE "log/sws.log"
+#endif
+
+#define VERSION "cURL test suite HTTP server/0.1"
+
+#define REQUEST_DUMP  "log/server.input"
+#define RESPONSE_DUMP "log/server.response"
+
+#define TEST_DATA_PATH "data/test%d"
+
+enum {
+  DOCNUMBER_BADCONNECT = -5,
+  DOCNUMBER_INTERNAL= -4,
+  DOCNUMBER_CONNECT = -3,
+  DOCNUMBER_WERULEZ = -2,
+  DOCNUMBER_404     = -1
+};
+
+/* sent as reply to a CONNECT */
+static const char *docconnect =
+"HTTP/1.1 200 Mighty fine indeed\r\n"
+"\r\n";
+
+/* sent as reply to a "bad" CONNECT */
+static const char *docbadconnect =
+"HTTP/1.1 501 Forbidden you fool\r\n"
+"\r\n";
+
+/* send back this on 404 file not found */
+static const char *doc404 = "HTTP/1.1 404 Not Found\n"
+    "Server: " VERSION "\n"
+    "Connection: close\n"
+    "Content-Type: text/html\n"
+    "\n"
+    "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n"
+    "<HTML><HEAD>\n"
+    "<TITLE>404 Not Found</TITLE>\n"
+    "</HEAD><BODY>\n"
+    "<H1>Not Found</H1>\n"
+    "The requested URL was not found on this server.\n"
+    "<P><HR><ADDRESS>" VERSION "</ADDRESS>\n" "</BODY></HTML>\n";
+
+#ifdef HAVE_SIGNAL
+static volatile int sigpipe;
+#endif
+static FILE *logfp;
+
+
+static void logmsg(const char *msg)
+{
+    time_t t = time(NULL);
+    struct tm *curr_time = localtime(&t);
+    char loctime[80];
+
+    strcpy(loctime, asctime(curr_time));
+    loctime[strlen(loctime) - 1] = '\0';
+    fprintf(logfp, "%s: %d: %s\n", loctime, (int)getpid(), msg);
+    fflush(logfp);
+}
+
+
+#ifdef HAVE_SIGNAL
+static void sigpipe_handler(int sig)
+{
+  (void)sig; /* prevent warning */
+  sigpipe = 1;
+}
+#endif
+
+int ProcessRequest(char *request)
+{
+  char *line=request;
+  unsigned long contentlength=0;
+  char chunked=FALSE;
+
+#define END_OF_HEADERS "\r\n\r\n"
+
+  char *end;
+  end = strstr(request, END_OF_HEADERS);
+
+  if(!end)
+    /* we don't have a complete request yet! */
+    return 0;
+
+  /* **** Persistancy ****
+   *
+   * If the request is a HTTP/1.0 one, we close the connection unconditionally
+   * when we're done.
+   *
+   * If the request is a HTTP/1.1 one, we MUST check for a "Connection:"
+   * header that might say "close". If it does, we close a connection when
+   * this request is processed. Otherwise, we keep the connection alive for X
+   * seconds.
+   */
+
+  do {
+    if(!strncasecmp("Content-Length:", line, 15)) {
+      contentlength = strtol(line+15, &line, 10);
+      break;
+    }
+    else if(!strncasecmp("Transfer-Encoding: chunked", line,
+                         strlen("Transfer-Encoding: chunked"))) {
+      /* chunked data coming in */
+      chunked = TRUE;
+    }
+
+    if(chunked) {
+      if(strstr(request, "\r\n0\r\n"))
+        /* end of chunks reached */
+        return 1; /* done */
+      else
+        return 0; /* not done */
+    }
+
+    line = strchr(line, '\n');
+    if(line)
+      line++;
+  } while(line);
+
+  if(contentlength > 0 ) {
+    if(contentlength <= strlen(end+strlen(END_OF_HEADERS)))
+      return 1; /* done */
+    else
+      return 0; /* not complete yet */
+  }
+  return 1; /* done */
+}
+
+/* store the entire request in a file */
+void storerequest(char *reqbuf)
+{
+  FILE *dump;
+
+  dump = fopen(REQUEST_DUMP, "ab"); /* b is for windows-preparing */
+  if(dump) {
+    fwrite(reqbuf, 1, strlen(reqbuf), dump);
+
+    fclose(dump);
+    logmsg("Wrote request input to " REQUEST_DUMP);
+  }
+  else {
+    logmsg("Failed to write request input to " REQUEST_DUMP);
+  }
+}
+
+
+#define REQBUFSIZ 150000
+#define REQBUFSIZ_TXT "149999"
+
+/* very-big-path support */
+#define MAXDOCNAMELEN 140000
+#define MAXDOCNAMELEN_TXT "139999"
+
+#define REQUEST_KEYWORD_SIZE 256
+static int get_request(int sock, int *part)
+{
+  static char reqbuf[REQBUFSIZ], doc[MAXDOCNAMELEN];
+  static char request[REQUEST_KEYWORD_SIZE];
+  unsigned int offset = 0;
+  int prot_major, prot_minor;
+  char logbuf[256];
+
+  *part = 0; /* part zero equals none */
+
+  while (offset < REQBUFSIZ) {
+    int got = recv(sock, reqbuf + offset, REQBUFSIZ - offset, 0);
+    if (got <= 0) {
+      if (got < 0) {
+        perror("recv");
+        logmsg("recv() returned error");
+        return DOCNUMBER_INTERNAL;
+      }
+      logmsg("Connection closed by client");
+      return DOCNUMBER_INTERNAL;
+    }
+    offset += got;
+
+    reqbuf[offset] = 0;
+
+    if(ProcessRequest(reqbuf))
+      break;
+  }
+
+  if (offset >= REQBUFSIZ) {
+    logmsg("Request buffer overflow, closing connection");
+    return DOCNUMBER_INTERNAL;
+  }
+  reqbuf[offset]=0;
+  
+  /* dump the request to an external file */
+  storerequest(reqbuf);
+
+  if(sscanf(reqbuf, "%" REQBUFSIZ_TXT"s %" MAXDOCNAMELEN_TXT "s HTTP/%d.%d",
+            request,
+            doc,
+            &prot_major,
+            &prot_minor) == 4) {
+    char *ptr;
+    int test_no=0;
+
+    /* find the last slash */
+    ptr = strrchr(doc, '/');
+
+    /* get the number after it */
+    if(ptr) {
+
+      if((strlen(doc) + strlen(request)) < 200)
+        sprintf(logbuf, "Got request: %s %s HTTP/%d.%d",
+                request, doc, prot_major, prot_minor);
+      else
+        sprintf(logbuf, "Got a *HUGE* request HTTP/%d.%d",
+                prot_major, prot_minor);
+      logmsg(logbuf);
+      
+      if(!strncmp("/verifiedserver", ptr, 15)) {
+        logmsg("Are-we-friendly question received");
+        return DOCNUMBER_WERULEZ;
+      }
+
+      ptr++; /* skip the slash */
+
+      test_no = strtol(ptr, &ptr, 10);
+
+      if(test_no > 10000) {
+        *part = test_no % 10000;
+        test_no /= 10000;
+      }
+
+      sprintf(logbuf, "Found test number %d in path", test_no);
+      logmsg(logbuf);
+    }
+    else {
+      if(sscanf(reqbuf, "CONNECT %" MAXDOCNAMELEN_TXT "s HTTP/%d.%d",
+                doc,
+                &prot_major, &prot_minor) == 3) {
+        sprintf(logbuf, "Receiced a CONNECT %s HTTP/%d.%d request", 
+                doc, prot_major, prot_minor);
+        logmsg(logbuf);
+
+        if(!strncmp(doc, "bad", 3))
+          /* if the host name starts with bad, we fake an error here */
+          test_no = DOCNUMBER_BADCONNECT;
+        else
+          test_no = DOCNUMBER_CONNECT;
+      }
+      else {
+        logmsg("Did not find test number in PATH");
+        test_no = DOCNUMBER_404;
+      }
+    }
+
+    return test_no;
+  }
+  
+  logmsg("Got illegal request");
+  fprintf(stderr, "Got illegal request\n");
+  return DOCNUMBER_404;
+}
+
+
+static int send_doc(int sock, int doc, int part_no)
+{
+  int written;
+  int count;
+  const char *buffer;
+  char *ptr;
+  FILE *stream;
+  char *cmd=NULL;
+  int cmdsize=0;
+  FILE *dump;
+
+  static char weare[256];
+
+  char filename[256];
+  char partbuf[80]="data";
+
+  if(doc < 0) {
+    switch(doc) {
+    case DOCNUMBER_WERULEZ:
+      /* we got a "friends?" question, reply back that we sure are */
+      logmsg("Identifying ourselves as friends");
+      sprintf(weare, "HTTP/1.1 200 OK\r\n\r\nWE ROOLZ: %d\r\n",
+              (int)getpid());
+      buffer = weare;
+      break;
+    case DOCNUMBER_INTERNAL:
+      logmsg("Bailing out due to internal error");
+      return -1;
+    case DOCNUMBER_CONNECT:
+      logmsg("Replying to CONNECT");
+      buffer = docconnect;
+      break;
+    case DOCNUMBER_BADCONNECT:
+      logmsg("Replying to a bad CONNECT");
+      buffer = docbadconnect;
+      break;
+    case DOCNUMBER_404:
+    default:
+      logmsg("Replying to with a 404");
+      buffer = doc404;
+      break;
+    }
+    ptr = NULL;
+    stream=NULL;
+
+    count = strlen(buffer);
+  }
+  else {
+    logmsg("Fetch response data");
+
+    if(0 != part_no)
+      sprintf(partbuf, "data%d", part_no);
+
+    sprintf(filename, TEST_DATA_PATH, doc);
+
+    stream=fopen(filename, "rb");
+    if(!stream) {
+      logmsg("Couldn't open test file");
+      return 0;
+    }
+    else {
+      buffer = spitout(stream, "reply", partbuf, &count);
+      ptr = (char *)buffer;
+      fclose(stream);
+    }
+
+    /* re-open the same file again */
+    stream=fopen(filename, "rb");
+    if(!stream) {
+      logmsg("Couldn't open test file");
+      return 0;
+    }
+    else {    
+      /* get the custom server control "commands" */
+      cmd = (char *)spitout(stream, "reply", "postcmd", &cmdsize);
+      fclose(stream);
+    }
+  }
+
+  dump = fopen(RESPONSE_DUMP, "ab"); /* b is for windows-preparing */
+  if(!dump) {
+    logmsg("couldn't create logfile: " RESPONSE_DUMP);
+    return -1;
+  }
+
+  do {
+    written = send(sock, buffer, count, 0);
+    if (written < 0) {
+      logmsg("Sending response failed and we bailed out!");
+      return -1;
+    }
+    /* write to file as well */
+    fwrite(buffer, 1, written, dump);
+
+    count -= written;
+    buffer += written;
+  } while(count>0);
+
+  fclose(dump);
+
+  logmsg("Response sent!");
+
+  if(ptr)
+    free(ptr);
+
+  if(cmdsize > 0 ) {
+    char command[32];
+    int num;
+    char *ptr=cmd;
+    do {
+      if(2 == sscanf(ptr, "%31s %d", command, &num)) {
+        if(!strcmp("wait", command))
+          sleep(num); /* wait this many seconds */
+        else
+          logmsg("Unknown command in reply command section");
+      }
+      ptr = strchr(ptr, '\n');
+      if(ptr)
+        ptr++;
+      else
+        ptr = NULL;
+    } while(ptr && *ptr);
+  }
+  if(cmd)
+    free(cmd);
+
+  return 0;
+}
+
+int main(int argc, char *argv[])
+{
+  struct sockaddr_in me;
+  int sock, msgsock, flag;
+  unsigned short port = DEFAULT_PORT;
+  const char *logfile = DEFAULT_LOGFILE;
+  int part_no;
+  FILE *pidfile;
+  
+  if(argc>1)
+    port = atoi(argv[1]);
+
+  logfp = fopen(logfile, "a");
+  if (!logfp) {
+    perror(logfile);
+    exit(1);
+  }
+
+#ifdef HAVE_SIGNAL
+  signal(SIGPIPE, sigpipe_handler);
+  siginterrupt(SIGPIPE, 1);
+#endif
+
+  sock = socket(AF_INET, SOCK_STREAM, 0);
+  if (sock < 0) {
+    perror("opening stream socket");
+    fprintf(logfp, "Error opening socket -- aborting\n");
+    fclose(logfp);
+    exit(1);
+  }
+
+  flag = 1;
+  if (setsockopt
+      (sock, SOL_SOCKET, SO_REUSEADDR, (const void *) &flag,
+       sizeof(int)) < 0) {
+    perror("setsockopt(SO_REUSEADDR)");
+  }
+
+  me.sin_family = AF_INET;
+  me.sin_addr.s_addr = INADDR_ANY;
+  me.sin_port = htons(port);
+  if (bind(sock, (struct sockaddr *) &me, sizeof me) < 0) {
+    perror("binding stream socket");
+    fprintf(logfp, "Error binding socket -- aborting\n");
+    fclose(logfp);
+    exit(1);
+  }
+
+  pidfile = fopen(".http.pid", "w");
+  if(pidfile) {
+    fprintf(pidfile, "%d\n", (int)getpid());
+    fclose(pidfile);
+  }
+  else
+    fprintf(stderr, "Couldn't write pid file\n");
+
+  /* start accepting connections */
+  listen(sock, 5);
+
+  while (1) {
+    int doc;
+
+    msgsock = accept(sock, NULL, NULL);
+    
+    if (msgsock == -1)
+      continue;
+    
+    logmsg("New client connected");
+
+    do {
+
+      doc = get_request(msgsock, &part_no);
+      logmsg("Received request, now send response");
+      send_doc(msgsock, doc, part_no);
+
+      /* if we got a CONNECT, loop and get another request as well! */
+    } while(doc == DOCNUMBER_CONNECT);
+
+    logmsg("Closing client connection");
+    close(msgsock);
+  }
+  
+  close(sock);
+  fclose(logfp);
+  
+  return 0;
+}
+
diff --git a/main/source/curl/tests/stunnel.pem b/main/source/curl/tests/stunnel.pem
new file mode 100644
index 00000000..01e69fc7
--- /dev/null
+++ b/main/source/curl/tests/stunnel.pem
@@ -0,0 +1,31 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDQPvaAU+Pdd5B0XlR71lDw0LyMridewzGaN6H3T+vRKYkvxyZw
+nrxhYSLWn4g9wcu/EWcTN23A07Oa4HSZ/wHQ/yO+Yv01OmfGHylWZNN0eb/qemv8
+wp/bFRaubeuIGz9hl4r1HM5Mn3cNjhDjIjDqzGorObUItigCHY4ZDNHOOQIDAQAB
+AoGAfK4V3ANeHEznuiR4JKTOVUBEg14JyFzJp/HDEVVSdSqPLoHn6+m+E/eaajGd
+2ovbNwxuUD0Rgy+9Cu90IHdjV+8i7xo/ttnzg8UDUUhT0BMuOsbEPGGABqPxXEoM
++c58smG9r30K+5ToctRlsYuH4xQvHL3fc2DHRDEwPDD+KdkCQQD3kO9D6sV9/So3
+wWLamW0AFK/spK0i1MqSdPi/gnor37WNqOxBz2MVYDmTWeDWtq9HuG2QRKCNiqGB
+tAUyKSVjAkEA11ccOxGleOM+scugobGkktnCniyMJSxQijMpIDmO/S0DBH5SiTee
+BywwtcadjUWn4uQGJ0CQCJo2mjsmY13OswJBAKJgPJ7WWKyXJV6mh9kLMrQP3Yeg
+RzMGUMuYzyKFSO6H74O3nSZZCQsXLwxXsiICdpra+3nZmVjc6aux0Iqi9DMCQQCh
+DXaAux7t/c9q/CeEJy814YWL9TdPqggGhGLyxfmqYprKJowmMiGPrb40hXpaKUl6
+CR6NBt1ygZvq1+hLEuK/AkBYJ0ikl3YHkWqSFgiw/yDsVa3CDpChLGxjlheX5gop
+LKrKE8RO3rtT3CdWyI/IBWPyc0h+qCTEqUdqKW1vRYeS
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICcTCCAdqgAwIBAgIBADANBgkqhkiG9w0BAQQFADBzMQswCQYDVQQGEwJTRTEO
+MAwGA1UECBMFU29sbmExDTALBgNVBAcTBE1vb28xDTALBgNVBAoTBEhheHgxDjAM
+BgNVBAsTBUNvb2x4MRIwEAYDVQQDEwlzdG9yZWJyb3IxEjAQBgNVBAMTCWxvY2Fs
+aG9zdDAeFw0wMTA0MjAxODI2MjhaFw0wMjA0MjAxODI2MjhaMHMxCzAJBgNVBAYT
+AlNFMQ4wDAYDVQQIEwVTb2xuYTENMAsGA1UEBxMETW9vbzENMAsGA1UEChMESGF4
+eDEOMAwGA1UECxMFQ29vbHgxEjAQBgNVBAMTCXN0b3JlYnJvcjESMBAGA1UEAxMJ
+bG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDQPvaAU+Pdd5B0
+XlR71lDw0LyMridewzGaN6H3T+vRKYkvxyZwnrxhYSLWn4g9wcu/EWcTN23A07Oa
+4HSZ/wHQ/yO+Yv01OmfGHylWZNN0eb/qemv8wp/bFRaubeuIGz9hl4r1HM5Mn3cN
+jhDjIjDqzGorObUItigCHY4ZDNHOOQIDAQABoxUwEzARBglghkgBhvhCAQEEBAMC
+BkAwDQYJKoZIhvcNAQEEBQADgYEASTzH6Af6xmkpPGAdL/lecdkeuChfgb7tVkOE
+rTzgxE5fVcW9NK79HXZ3OND2uHyu9WMieIr7QKyzfK1uskxQcY6mPApn/Z+yD1vn
+TYBuyP8I+khaLKA69QzVv+5yVBR0xlAaXGwTKxNzBTXznSmshgvYt5nsmcMw2Xfg
+CMkSsOU=
+-----END CERTIFICATE-----
diff --git a/main/source/curl/tests/stunnel.pm b/main/source/curl/tests/stunnel.pm
new file mode 100644
index 00000000..1b76176f
--- /dev/null
+++ b/main/source/curl/tests/stunnel.pm
@@ -0,0 +1,11 @@
+sub checkstunnel {
+    my @paths=("/usr/sbin", "/usr/local/sbin", "/sbin", "/usr/bin",
+               "/usr/local/bin", split(":", $ENV{'PATH'}));
+    for(@paths) {
+        if( -x "$_/stunnel") {
+            return "$_/stunnel";
+        }
+    }
+}
+
+1;
diff --git a/main/source/dlls/AI_BaseNPC_Schedule.cpp b/main/source/dlls/AI_BaseNPC_Schedule.cpp
new file mode 100644
index 00000000..2b6058e4
--- /dev/null
+++ b/main/source/dlls/AI_BaseNPC_Schedule.cpp
@@ -0,0 +1,1514 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// schedule.cpp - functions and data pertaining to the 
+// monsters' AI scheduling system.
+//=========================================================
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "animation.h"
+#include "scripted.h"
+#include "nodes.h"
+#include "defaultai.h"
+#include "soundent.h"
+
+extern CGraph WorldGraph;
+
+//=========================================================
+// FHaveSchedule - Returns TRUE if monster's m_pSchedule
+// is anything other than NULL.
+//=========================================================
+BOOL CBaseMonster :: FHaveSchedule( void )
+{
+	if ( m_pSchedule == NULL )
+	{
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+//=========================================================
+// ClearSchedule - blanks out the caller's schedule pointer
+// and index.
+//=========================================================
+void CBaseMonster :: ClearSchedule( void )
+{
+	m_iTaskStatus = TASKSTATUS_NEW;
+	m_pSchedule = NULL;
+	m_iScheduleIndex = 0;
+}
+
+//=========================================================
+// FScheduleDone - Returns TRUE if the caller is on the
+// last task in the schedule
+//=========================================================
+BOOL CBaseMonster :: FScheduleDone ( void )
+{
+	ASSERT( m_pSchedule != NULL );
+	
+	if ( m_iScheduleIndex == m_pSchedule->cTasks )
+	{
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+//=========================================================
+// ChangeSchedule - replaces the monster's schedule pointer
+// with the passed pointer, and sets the ScheduleIndex back
+// to 0
+//=========================================================
+void CBaseMonster :: ChangeSchedule ( Schedule_t *pNewSchedule )
+{
+	ASSERT( pNewSchedule != NULL );
+
+	m_pSchedule			= pNewSchedule;
+	m_iScheduleIndex	= 0;
+	m_iTaskStatus		= TASKSTATUS_NEW;
+	m_afConditions		= 0;// clear all of the conditions
+	m_failSchedule		= SCHED_NONE;
+
+	if ( m_pSchedule->iInterruptMask & bits_COND_HEAR_SOUND && !(m_pSchedule->iSoundMask) )
+	{
+		ALERT ( at_aiconsole, "COND_HEAR_SOUND with no sound mask!\n" );
+	}
+	else if ( m_pSchedule->iSoundMask && !(m_pSchedule->iInterruptMask & bits_COND_HEAR_SOUND) )
+	{
+		ALERT ( at_aiconsole, "Sound mask without COND_HEAR_SOUND!\n" );
+	}
+
+#if _DEBUG
+	if ( !ScheduleFromName( pNewSchedule->pName ) )
+	{
+		ALERT( at_console, "Schedule %s not in table!!!\n", pNewSchedule->pName );
+	}
+#endif
+	
+// this is very useful code if you can isolate a test case in a level with a single monster. It will notify
+// you of every schedule selection the monster makes.
+#if 0
+	if ( FClassnameIs( pev, "monster_human_grunt" ) )
+	{
+		Task_t *pTask = GetTask();
+		
+		if ( pTask )
+		{
+			const char *pName = NULL;
+
+			if ( m_pSchedule )
+			{
+				pName = m_pSchedule->pName;
+			}
+			else
+			{
+				pName = "No Schedule";
+			}
+			
+			if ( !pName )
+			{
+				pName = "Unknown";
+			}
+
+			ALERT( at_aiconsole, "%s: picked schedule %s\n", STRING( pev->classname ), pName );
+		}
+	}
+#endif// 0
+
+}
+
+//=========================================================
+// NextScheduledTask - increments the ScheduleIndex
+//=========================================================
+void CBaseMonster :: NextScheduledTask ( void )
+{
+	ASSERT( m_pSchedule != NULL );
+
+	m_iTaskStatus = TASKSTATUS_NEW;
+	m_iScheduleIndex++;
+
+	if ( FScheduleDone() )
+	{
+		// just completed last task in schedule, so make it invalid by clearing it.
+		SetConditions( bits_COND_SCHEDULE_DONE );
+		//ClearSchedule();	
+	}
+}
+
+//=========================================================
+// IScheduleFlags - returns an integer with all Conditions
+// bits that are currently set and also set in the current
+// schedule's Interrupt mask.
+//=========================================================
+int CBaseMonster :: IScheduleFlags ( void )
+{
+	if( !m_pSchedule )
+	{
+		return 0;
+	}
+	
+	// strip off all bits excepts the ones capable of breaking this schedule.
+	return m_afConditions & m_pSchedule->iInterruptMask;
+}
+
+//=========================================================
+// FScheduleValid - returns TRUE as long as the current
+// schedule is still the proper schedule to be executing,
+// taking into account all conditions
+//=========================================================
+BOOL CBaseMonster :: FScheduleValid ( void )
+{
+	if ( m_pSchedule == NULL )
+	{
+		// schedule is empty, and therefore not valid.
+		return FALSE;
+	}
+
+	if ( HasConditions( m_pSchedule->iInterruptMask | bits_COND_SCHEDULE_DONE | bits_COND_TASK_FAILED ) )
+	{
+#ifdef DEBUG
+		if ( HasConditions ( bits_COND_TASK_FAILED ) && m_failSchedule == SCHED_NONE )
+		{
+			// fail! Send a visual indicator.
+			ALERT ( at_aiconsole, "Schedule: %s Failed\n", m_pSchedule->pName );
+
+			Vector tmp = pev->origin;
+			tmp.z = pev->absmax.z + 16;
+			UTIL_Sparks( tmp );
+		}
+#endif // DEBUG
+
+		// some condition has interrupted the schedule, or the schedule is done
+		return FALSE;
+	}
+	
+	return TRUE;
+}
+
+//=========================================================
+// MaintainSchedule - does all the per-think schedule maintenance.
+// ensures that the monster leaves this function with a valid
+// schedule!
+//=========================================================
+void CBaseMonster :: MaintainSchedule ( void )
+{
+	Schedule_t	*pNewSchedule;
+	int			i;
+
+	// UNDONE: Tune/fix this 10... This is just here so infinite loops are impossible
+	for ( i = 0; i < 10; i++ )
+	{
+		if ( m_pSchedule != NULL && TaskIsComplete() )
+		{
+			NextScheduledTask();                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
+		}
+
+	// validate existing schedule 
+		if ( !FScheduleValid() || m_MonsterState != m_IdealMonsterState )
+		{
+			// if we come into this block of code, the schedule is going to have to be changed.
+			// if the previous schedule was interrupted by a condition, GetIdealState will be 
+			// called. Else, a schedule finished normally.
+
+			// Notify the monster that his schedule is changing
+			ScheduleChange();
+
+			// Call GetIdealState if we're not dead and one or more of the following...
+			// - in COMBAT state with no enemy (it died?)
+			// - conditions bits (excluding SCHEDULE_DONE) indicate interruption,
+			// - schedule is done but schedule indicates it wants GetIdealState called
+			//   after successful completion (by setting bits_COND_SCHEDULE_DONE in iInterruptMask)
+			// DEAD & SCRIPT are not suggestions, they are commands!
+			if ( m_IdealMonsterState != MONSTERSTATE_DEAD && 
+				 (m_IdealMonsterState != MONSTERSTATE_SCRIPT || m_IdealMonsterState == m_MonsterState) )
+			{
+				if (	(m_afConditions && !HasConditions(bits_COND_SCHEDULE_DONE)) ||
+						(m_pSchedule && (m_pSchedule->iInterruptMask & bits_COND_SCHEDULE_DONE)) ||
+						((m_MonsterState == MONSTERSTATE_COMBAT) && (m_hEnemy == NULL))	)
+				{
+					GetIdealState();
+				}
+			}
+			if ( HasConditions( bits_COND_TASK_FAILED ) && m_MonsterState == m_IdealMonsterState )
+			{
+				if ( m_failSchedule != SCHED_NONE )
+					pNewSchedule = GetScheduleOfType( m_failSchedule );
+				else
+					pNewSchedule = GetScheduleOfType( SCHED_FAIL );
+				// schedule was invalid because the current task failed to start or complete
+				ALERT ( at_aiconsole, "Schedule Failed at %d!\n", m_iScheduleIndex );
+				ChangeSchedule( pNewSchedule );
+			}
+			else
+			{
+				SetState( m_IdealMonsterState );
+				if ( m_MonsterState == MONSTERSTATE_SCRIPT || m_MonsterState == MONSTERSTATE_DEAD )
+					pNewSchedule = CBaseMonster::GetSchedule();
+				else
+					pNewSchedule = GetSchedule();
+				ChangeSchedule( pNewSchedule );
+			}
+		}
+
+		if ( m_iTaskStatus == TASKSTATUS_NEW )
+		{	
+			Task_t *pTask = GetTask();
+			ASSERT( pTask != NULL );
+			TaskBegin();
+			StartTask( pTask );
+		}
+
+		// UNDONE: Twice?!!!
+		if ( m_Activity != m_IdealActivity )
+		{
+			SetActivity ( m_IdealActivity );
+		}
+		
+		if ( !TaskIsComplete() && m_iTaskStatus != TASKSTATUS_NEW )
+			break;
+	}
+
+	if ( TaskIsRunning() )
+	{
+		Task_t *pTask = GetTask();
+		ASSERT( pTask != NULL );
+		RunTask( pTask );
+	}
+
+	// UNDONE: We have to do this so that we have an animation set to blend to if RunTask changes the animation
+	// RunTask() will always change animations at the end of a script!
+	// Don't do this twice
+	if ( m_Activity != m_IdealActivity )
+	{
+		SetActivity ( m_IdealActivity );
+	}
+}
+
+//=========================================================
+// RunTask 
+//=========================================================
+void CBaseMonster :: RunTask ( Task_t *pTask )
+{
+	switch ( pTask->iTask )
+	{
+	case TASK_TURN_RIGHT:
+	case TASK_TURN_LEFT:
+		{
+			ChangeYaw( pev->yaw_speed );
+
+			if ( FacingIdeal() )
+			{
+				TaskComplete();
+			}
+			break;
+		}
+
+	case TASK_PLAY_SEQUENCE_FACE_ENEMY:
+	case TASK_PLAY_SEQUENCE_FACE_TARGET:
+		{
+			CBaseEntity *pTarget;
+
+			if ( pTask->iTask == TASK_PLAY_SEQUENCE_FACE_TARGET )
+				pTarget = m_hTargetEnt;
+			else
+				pTarget = m_hEnemy;
+			if ( pTarget )
+			{
+				pev->ideal_yaw = UTIL_VecToYaw( pTarget->pev->origin - pev->origin );
+				ChangeYaw( pev->yaw_speed );
+			}
+			if ( m_fSequenceFinished )
+				TaskComplete();
+		}
+		break;
+
+	case TASK_PLAY_SEQUENCE:
+	case TASK_PLAY_ACTIVE_IDLE:
+		{
+			if ( m_fSequenceFinished )
+			{
+				TaskComplete();
+			}
+			break;
+		}
+
+
+	case TASK_FACE_ENEMY:
+		{
+			MakeIdealYaw( m_vecEnemyLKP );
+
+			ChangeYaw( pev->yaw_speed );
+
+			if ( FacingIdeal() )
+			{
+				TaskComplete();
+			}
+			break;
+		}
+	case TASK_FACE_HINTNODE:
+	case TASK_FACE_LASTPOSITION:
+	case TASK_FACE_TARGET:
+	case TASK_FACE_IDEAL:
+	case TASK_FACE_ROUTE:
+		{
+			ChangeYaw( pev->yaw_speed );
+
+			if ( FacingIdeal() )
+			{
+				TaskComplete();
+			}
+			break;
+		}
+	case TASK_WAIT_PVS:
+		{
+			if ( !FNullEnt(FIND_CLIENT_IN_PVS(edict())) )
+			{
+				TaskComplete();
+			}
+			break;
+		}
+	case TASK_WAIT_INDEFINITE:
+		{
+			// don't do anything.
+			break;
+		}
+	case TASK_WAIT:
+	case TASK_WAIT_RANDOM:
+		{
+			if ( gpGlobals->time >= m_flWaitFinished )
+			{
+				TaskComplete();
+			}
+			break;
+		}
+	case TASK_WAIT_FACE_ENEMY:
+		{
+			MakeIdealYaw ( m_vecEnemyLKP );
+			ChangeYaw( pev->yaw_speed ); 
+
+			if ( gpGlobals->time >= m_flWaitFinished )
+			{
+				TaskComplete();
+			}
+			break;
+		}
+	case TASK_MOVE_TO_TARGET_RANGE:
+		{
+			float distance;
+
+			if ( m_hTargetEnt == NULL )
+				TaskFail();
+			else
+			{
+				distance = ( m_vecMoveGoal - pev->origin ).Length2D();
+				// Re-evaluate when you think your finished, or the target has moved too far
+				if ( (distance < pTask->flData) || (m_vecMoveGoal - m_hTargetEnt->pev->origin).Length() > pTask->flData * 0.5 )
+				{
+					m_vecMoveGoal = m_hTargetEnt->pev->origin;
+					distance = ( m_vecMoveGoal - pev->origin ).Length2D();
+					FRefreshRoute();
+				}
+
+				// Set the appropriate activity based on an overlapping range
+				// overlap the range to prevent oscillation
+				if ( distance < pTask->flData )
+				{
+					TaskComplete();
+					RouteClear();		// Stop moving
+				}
+				else if ( distance < 190 && m_movementActivity != ACT_WALK )
+					m_movementActivity = ACT_WALK;
+				else if ( distance >= 270 && m_movementActivity != ACT_RUN )
+					m_movementActivity = ACT_RUN;
+			}
+
+			break;
+		}
+	case TASK_WAIT_FOR_MOVEMENT:
+		{
+			if (MovementIsComplete())
+			{
+				TaskComplete();
+				RouteClear();		// Stop moving
+			}
+			break;
+		}
+	case TASK_DIE:
+		{
+			if ( m_fSequenceFinished && pev->frame >= 255 )
+			{
+				pev->deadflag = DEAD_DEAD;
+				
+				SetThink ( NULL );
+				StopAnimation();
+
+				if ( !BBoxFlat() )
+				{
+					// a bit of a hack. If a corpses' bbox is positioned such that being left solid so that it can be attacked will
+					// block the player on a slope or stairs, the corpse is made nonsolid. 
+//					pev->solid = SOLID_NOT;
+					UTIL_SetSize ( pev, Vector ( -4, -4, 0 ), Vector ( 4, 4, 1 ) );
+				}
+				else // !!!HACKHACK - put monster in a thin, wide bounding box until we fix the solid type/bounding volume problem
+					UTIL_SetSize ( pev, Vector ( pev->mins.x, pev->mins.y, pev->mins.z ), Vector ( pev->maxs.x, pev->maxs.y, pev->mins.z + 1 ) );
+
+				if ( ShouldFadeOnDeath() )
+				{
+					// this monster was created by a monstermaker... fade the corpse out.
+					SUB_StartFadeOut();
+				}
+				else
+				{
+					// body is gonna be around for a while, so have it stink for a bit.
+					CSoundEnt::InsertSound ( bits_SOUND_CARCASS, pev->origin, 384, 30 );
+				}
+			}
+			break;
+		}
+	case TASK_RANGE_ATTACK1_NOTURN:
+	case TASK_MELEE_ATTACK1_NOTURN:
+	case TASK_MELEE_ATTACK2_NOTURN:
+	case TASK_RANGE_ATTACK2_NOTURN:
+	case TASK_RELOAD_NOTURN:
+		{
+			if ( m_fSequenceFinished )
+			{
+				m_Activity = ACT_RESET;
+				TaskComplete();
+			}
+			break;
+		}
+	case TASK_RANGE_ATTACK1:
+	case TASK_MELEE_ATTACK1:
+	case TASK_MELEE_ATTACK2:
+	case TASK_RANGE_ATTACK2:
+	case TASK_SPECIAL_ATTACK1:
+	case TASK_SPECIAL_ATTACK2:
+	case TASK_RELOAD:
+		{
+			MakeIdealYaw ( m_vecEnemyLKP );
+			ChangeYaw ( pev->yaw_speed );
+
+			if ( m_fSequenceFinished )
+			{
+				m_Activity = ACT_RESET;
+				TaskComplete();
+			}
+			break;
+		}
+	case TASK_SMALL_FLINCH:
+		{
+			if ( m_fSequenceFinished )
+			{
+				TaskComplete();
+			}
+		}
+		break;
+	case TASK_WAIT_FOR_SCRIPT:
+		{
+			if ( m_pCine->m_iDelay <= 0 && gpGlobals->time >= m_pCine->m_startTime )
+			{
+				TaskComplete();
+				m_pCine->StartSequence( (CBaseMonster *)this, m_pCine->m_iszPlay, TRUE );
+				if ( m_fSequenceFinished )
+					ClearSchedule();
+				pev->framerate = 1.0;
+				//ALERT( at_aiconsole, "Script %s has begun for %s\n", STRING( m_pCine->m_iszPlay ), STRING(pev->classname) );
+			}
+			break;
+		}
+	case TASK_PLAY_SCRIPT:
+		{
+			if (m_fSequenceFinished)
+			{
+				m_pCine->SequenceDone( this );
+			}
+			break;
+		}
+	}
+}
+
+//=========================================================
+// SetTurnActivity - measures the difference between the way
+// the monster is facing and determines whether or not to
+// select one of the 180 turn animations.
+//=========================================================
+void CBaseMonster :: SetTurnActivity ( void )
+{
+	float flYD;
+	flYD = FlYawDiff();
+
+	if ( flYD <= -45 && LookupActivity ( ACT_TURN_RIGHT ) != ACTIVITY_NOT_AVAILABLE )
+	{// big right turn
+		m_IdealActivity = ACT_TURN_RIGHT;
+	}
+	else if ( flYD > 45 && LookupActivity ( ACT_TURN_LEFT ) != ACTIVITY_NOT_AVAILABLE )
+	{// big left turn
+		m_IdealActivity = ACT_TURN_LEFT;
+	}
+}
+
+//=========================================================
+// Start task - selects the correct activity and performs
+// any necessary calculations to start the next task on the
+// schedule. 
+//=========================================================
+void CBaseMonster :: StartTask ( Task_t *pTask )
+{
+	switch ( pTask->iTask )
+	{
+	case TASK_TURN_RIGHT:
+		{
+			float flCurrentYaw;
+			
+			flCurrentYaw = UTIL_AngleMod( pev->angles.y );
+			pev->ideal_yaw = UTIL_AngleMod( flCurrentYaw - pTask->flData );
+			SetTurnActivity();
+			break;
+		}
+	case TASK_TURN_LEFT:
+		{
+			float flCurrentYaw;
+			
+			flCurrentYaw = UTIL_AngleMod( pev->angles.y );
+			pev->ideal_yaw = UTIL_AngleMod( flCurrentYaw + pTask->flData );
+			SetTurnActivity();
+			break;
+		}
+	case TASK_REMEMBER:
+		{
+			Remember ( (int)pTask->flData );
+			TaskComplete();
+			break;
+		}
+	case TASK_FORGET:
+		{
+			Forget ( (int)pTask->flData );
+			TaskComplete();
+			break;
+		}
+	case TASK_FIND_HINTNODE:
+		{
+			m_iHintNode = FindHintNode();
+
+			if ( m_iHintNode != NO_NODE )
+			{
+				TaskComplete();
+			}
+			else
+			{
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_STORE_LASTPOSITION:
+		{
+			m_vecLastPosition = pev->origin;
+			TaskComplete();
+			break;
+		}
+	case TASK_CLEAR_LASTPOSITION:
+		{
+			m_vecLastPosition = g_vecZero;
+			TaskComplete();
+			break;
+		}
+	case TASK_CLEAR_HINTNODE:
+		{
+			m_iHintNode = NO_NODE;
+			TaskComplete();
+			break;
+		}
+	case TASK_STOP_MOVING:
+		{
+			if ( m_IdealActivity == m_movementActivity )
+			{
+				m_IdealActivity = GetStoppedActivity();
+			}
+
+			RouteClear();
+			TaskComplete();
+			break;
+		}
+	case TASK_PLAY_SEQUENCE_FACE_ENEMY:
+	case TASK_PLAY_SEQUENCE_FACE_TARGET:
+	case TASK_PLAY_SEQUENCE:
+		{
+			m_IdealActivity = ( Activity )( int )pTask->flData;
+			break;
+		}
+	case TASK_PLAY_ACTIVE_IDLE:
+		{
+			// monsters verify that they have a sequence for the node's activity BEFORE
+			// moving towards the node, so it's ok to just set the activity without checking here.
+			m_IdealActivity = ( Activity )WorldGraph.m_pNodes[ m_iHintNode ].m_sHintActivity;
+			break;
+		}
+	case TASK_SET_SCHEDULE:
+		{
+			Schedule_t *pNewSchedule;
+
+			pNewSchedule = GetScheduleOfType( (int)pTask->flData );
+			
+			if ( pNewSchedule )
+			{
+				ChangeSchedule( pNewSchedule );
+			}
+			else
+			{
+				TaskFail();
+			}
+
+			break;
+		}
+	case TASK_FIND_NEAR_NODE_COVER_FROM_ENEMY:
+		{
+			if ( m_hEnemy == NULL )
+			{
+				TaskFail();
+				return;
+			}
+
+			if ( FindCover( m_hEnemy->pev->origin, m_hEnemy->pev->view_ofs, 0, pTask->flData ) )
+			{
+				// try for cover farther than the FLData from the schedule.
+				TaskComplete();
+			}
+			else
+			{
+				// no coverwhatsoever.
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_FIND_FAR_NODE_COVER_FROM_ENEMY:
+		{
+			if ( m_hEnemy == NULL )
+			{
+				TaskFail();
+				return;
+			}
+
+			if ( FindCover( m_hEnemy->pev->origin, m_hEnemy->pev->view_ofs, pTask->flData, CoverRadius() ) )
+			{
+				// try for cover farther than the FLData from the schedule.
+				TaskComplete();
+			}
+			else
+			{
+				// no coverwhatsoever.
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_FIND_NODE_COVER_FROM_ENEMY:
+		{
+			if ( m_hEnemy == NULL )
+			{
+				TaskFail();
+				return;
+			}
+
+			if ( FindCover( m_hEnemy->pev->origin, m_hEnemy->pev->view_ofs, 0, CoverRadius() ) )
+			{
+				// try for cover farther than the FLData from the schedule.
+				TaskComplete();
+			}
+			else
+			{
+				// no coverwhatsoever.
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_FIND_COVER_FROM_ENEMY:
+		{
+			entvars_t *pevCover;
+
+			if ( m_hEnemy == NULL )
+			{
+				// Find cover from self if no enemy available
+				pevCover = pev;
+//				TaskFail();
+//				return;
+			}
+			else
+				pevCover = m_hEnemy->pev;
+
+			if ( FindLateralCover( pevCover->origin, pevCover->view_ofs ) )
+			{
+				// try lateral first
+				m_flMoveWaitFinished = gpGlobals->time + pTask->flData;
+				TaskComplete();
+			}
+			else if ( FindCover( pevCover->origin, pevCover->view_ofs, 0, CoverRadius() ) )
+			{
+				// then try for plain ole cover
+				m_flMoveWaitFinished = gpGlobals->time + pTask->flData;
+				TaskComplete();
+			}
+			else
+			{
+				// no coverwhatsoever.
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_FIND_COVER_FROM_ORIGIN:
+		{
+			if ( FindCover( pev->origin, pev->view_ofs, 0, CoverRadius() ) )
+			{
+				// then try for plain ole cover
+				m_flMoveWaitFinished = gpGlobals->time + pTask->flData;
+				TaskComplete();
+			}
+			else
+			{
+				// no cover!
+				TaskFail();
+			}
+		}
+		break;
+	case TASK_FIND_COVER_FROM_BEST_SOUND:
+		{
+			CSound *pBestSound;
+
+			pBestSound = PBestSound();
+
+			ASSERT( pBestSound != NULL );
+			/*
+			if ( pBestSound && FindLateralCover( pBestSound->m_vecOrigin, g_vecZero ) )
+			{
+				// try lateral first
+				m_flMoveWaitFinished = gpGlobals->time + pTask->flData;
+				TaskComplete();
+			}
+			*/
+
+			if ( pBestSound && FindCover( pBestSound->m_vecOrigin, g_vecZero, pBestSound->m_iVolume, CoverRadius() ) )
+			{
+				// then try for plain ole cover
+				m_flMoveWaitFinished = gpGlobals->time + pTask->flData;
+				TaskComplete();
+			}
+			else
+			{
+				// no coverwhatsoever. or no sound in list
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_FACE_HINTNODE:
+		{
+			pev->ideal_yaw = WorldGraph.m_pNodes[ m_iHintNode ].m_flHintYaw;
+			SetTurnActivity();
+			break;
+		}
+	
+	case TASK_FACE_LASTPOSITION:
+		MakeIdealYaw ( m_vecLastPosition );
+		SetTurnActivity(); 
+		break;
+
+	case TASK_FACE_TARGET:
+		if ( m_hTargetEnt != NULL )
+		{
+			MakeIdealYaw ( m_hTargetEnt->pev->origin );
+			SetTurnActivity(); 
+		}
+		else
+			TaskFail();
+		break;
+	case TASK_FACE_ENEMY:
+		{
+			MakeIdealYaw ( m_vecEnemyLKP );
+			SetTurnActivity(); 
+			break;
+		}
+	case TASK_FACE_IDEAL:
+		{
+			SetTurnActivity();
+			break;
+		}
+	case TASK_FACE_ROUTE:
+		{
+			if (FRouteClear())
+			{
+				ALERT(at_aiconsole, "No route to face!\n");
+				TaskFail();
+			}
+			else
+			{
+				MakeIdealYaw(m_Route[m_iRouteIndex].vecLocation);
+				SetTurnActivity();
+			}
+			break;
+		}
+	case TASK_WAIT_PVS:
+	case TASK_WAIT_INDEFINITE:
+		{
+			// don't do anything.
+			break;
+		}
+	case TASK_WAIT:
+	case TASK_WAIT_FACE_ENEMY:
+		{// set a future time that tells us when the wait is over.
+			m_flWaitFinished = gpGlobals->time + pTask->flData;	
+			break;
+		}
+	case TASK_WAIT_RANDOM:
+		{// set a future time that tells us when the wait is over.
+			m_flWaitFinished = gpGlobals->time + RANDOM_FLOAT( 0.1, pTask->flData );
+			break;
+		}
+	case TASK_MOVE_TO_TARGET_RANGE:
+		{
+			if ( (m_hTargetEnt->pev->origin - pev->origin).Length() < 1 )
+				TaskComplete();
+			else
+			{
+				m_vecMoveGoal = m_hTargetEnt->pev->origin;
+				if ( !MoveToTarget( ACT_WALK, 2 ) )
+					TaskFail();
+			}
+			break;
+		}
+	case TASK_RUN_TO_TARGET:
+	case TASK_WALK_TO_TARGET:
+		{
+			Activity newActivity;
+
+			if ( (m_hTargetEnt->pev->origin - pev->origin).Length() < 1 )
+				TaskComplete();
+			else
+			{
+				if ( pTask->iTask == TASK_WALK_TO_TARGET )
+					newActivity = ACT_WALK;
+				else
+					newActivity = ACT_RUN;
+				// This monster can't do this!
+				if ( LookupActivity( newActivity ) == ACTIVITY_NOT_AVAILABLE )
+					TaskComplete();
+				else 
+				{
+					if ( m_hTargetEnt == NULL || !MoveToTarget( newActivity, 2 ) )
+					{
+						TaskFail();
+						ALERT( at_aiconsole, "%s Failed to reach target!!!\n", STRING(pev->classname) );
+						RouteClear();
+					}
+				}
+			}
+			TaskComplete();
+			break;
+		}
+	case TASK_CLEAR_MOVE_WAIT:
+		{
+			m_flMoveWaitFinished = gpGlobals->time;
+			TaskComplete();
+			break;
+		}
+	case TASK_MELEE_ATTACK1_NOTURN:
+	case TASK_MELEE_ATTACK1:
+		{
+			m_IdealActivity = ACT_MELEE_ATTACK1;
+			break;
+		}
+	case TASK_MELEE_ATTACK2_NOTURN:
+	case TASK_MELEE_ATTACK2:
+		{
+			m_IdealActivity = ACT_MELEE_ATTACK2;
+			break;
+		}
+	case TASK_RANGE_ATTACK1_NOTURN:
+	case TASK_RANGE_ATTACK1:
+		{
+			m_IdealActivity = ACT_RANGE_ATTACK1;
+			break;
+		}
+	case TASK_RANGE_ATTACK2_NOTURN:
+	case TASK_RANGE_ATTACK2:
+		{
+			m_IdealActivity = ACT_RANGE_ATTACK2;
+			break;
+		}
+	case TASK_RELOAD_NOTURN:
+	case TASK_RELOAD:
+		{
+			m_IdealActivity = ACT_RELOAD;
+			break;
+		}
+	case TASK_SPECIAL_ATTACK1:
+		{
+			m_IdealActivity = ACT_SPECIAL_ATTACK1;
+			break;
+		}
+	case TASK_SPECIAL_ATTACK2:
+		{
+			m_IdealActivity = ACT_SPECIAL_ATTACK2;
+			break;
+		}
+	case TASK_SET_ACTIVITY:
+		{
+			m_IdealActivity = (Activity)(int)pTask->flData;
+			TaskComplete();
+			break;
+		}
+	case TASK_GET_PATH_TO_ENEMY_LKP:
+		{
+			if ( BuildRoute ( m_vecEnemyLKP, bits_MF_TO_LOCATION, NULL ) )
+			{
+				TaskComplete();
+			}
+			else if (BuildNearestRoute( m_vecEnemyLKP, pev->view_ofs, 0, (m_vecEnemyLKP - pev->origin).Length() ))
+			{
+				TaskComplete();
+			}
+			else
+			{
+				// no way to get there =(
+				ALERT ( at_aiconsole, "GetPathToEnemyLKP failed!!\n" );
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_GET_PATH_TO_ENEMY:
+		{
+			CBaseEntity *pEnemy = m_hEnemy;
+
+			if ( pEnemy == NULL )
+			{
+				TaskFail();
+				return;
+			}
+
+			if ( BuildRoute ( pEnemy->pev->origin, bits_MF_TO_ENEMY, pEnemy ) )
+			{
+				TaskComplete();
+			}
+			else if (BuildNearestRoute( pEnemy->pev->origin, pEnemy->pev->view_ofs, 0, (pEnemy->pev->origin - pev->origin).Length() ))
+			{
+				TaskComplete();
+			}
+			else
+			{
+				// no way to get there =(
+				ALERT ( at_aiconsole, "GetPathToEnemy failed!!\n" );
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_GET_PATH_TO_ENEMY_CORPSE:
+		{
+			UTIL_MakeVectors( pev->angles );
+			if ( BuildRoute ( m_vecEnemyLKP - gpGlobals->v_forward * 64, bits_MF_TO_LOCATION, NULL ) )
+			{
+				TaskComplete();
+			}
+			else
+			{
+				ALERT ( at_aiconsole, "GetPathToEnemyCorpse failed!!\n" );
+				TaskFail();
+			}
+		}
+		break;
+	case TASK_GET_PATH_TO_SPOT:
+		{
+			CBaseEntity *pPlayer = CBaseEntity::Instance( FIND_ENTITY_BY_CLASSNAME( NULL, "player" ) );
+			if ( BuildRoute ( m_vecMoveGoal, bits_MF_TO_LOCATION, pPlayer ) )
+			{
+				TaskComplete();
+			}
+			else
+			{
+				// no way to get there =(
+				ALERT ( at_aiconsole, "GetPathToSpot failed!!\n" );
+				TaskFail();
+			}
+			break;
+		}
+
+	case TASK_GET_PATH_TO_TARGET:
+		{
+			RouteClear();
+			if ( m_hTargetEnt != NULL && MoveToTarget( m_movementActivity, 1 ) )
+			{
+				TaskComplete();
+			}
+			else
+			{
+				// no way to get there =(
+				ALERT ( at_aiconsole, "GetPathToSpot failed!!\n" );
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_GET_PATH_TO_HINTNODE:// for active idles!
+		{
+			if ( MoveToLocation( m_movementActivity, 2, WorldGraph.m_pNodes[ m_iHintNode ].m_vecOrigin ) )
+			{
+				TaskComplete();
+			}
+			else
+			{
+				// no way to get there =(
+				ALERT ( at_aiconsole, "GetPathToHintNode failed!!\n" );
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_GET_PATH_TO_LASTPOSITION:
+		{
+			m_vecMoveGoal = m_vecLastPosition;
+
+			if ( MoveToLocation( m_movementActivity, 2, m_vecMoveGoal ) )
+			{
+				TaskComplete();
+			}
+			else
+			{
+				// no way to get there =(
+				ALERT ( at_aiconsole, "GetPathToLastPosition failed!!\n" );
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_GET_PATH_TO_BESTSOUND:
+		{
+			CSound *pSound;
+
+			pSound = PBestSound();
+
+			if ( pSound && MoveToLocation( m_movementActivity, 2, pSound->m_vecOrigin ) )
+			{
+				TaskComplete();
+			}
+			else
+			{
+				// no way to get there =(
+				ALERT ( at_aiconsole, "GetPathToBestSound failed!!\n" );
+				TaskFail();
+			}
+			break;
+		}
+case TASK_GET_PATH_TO_BESTSCENT:
+		{
+			CSound *pScent;
+
+			pScent = PBestScent();
+
+			if ( pScent && MoveToLocation( m_movementActivity, 2, pScent->m_vecOrigin ) )
+			{
+				TaskComplete();
+			}
+			else
+			{
+				// no way to get there =(
+				ALERT ( at_aiconsole, "GetPathToBestScent failed!!\n" );
+				
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_RUN_PATH:
+		{
+			// UNDONE: This is in some default AI and some monsters can't run? -- walk instead?
+			if ( LookupActivity( ACT_RUN ) != ACTIVITY_NOT_AVAILABLE )
+			{
+				m_movementActivity = ACT_RUN;
+			}
+			else
+			{
+				m_movementActivity = ACT_WALK;
+			}
+			TaskComplete();
+			break;
+		}
+	case TASK_WALK_PATH:
+		{
+			if ( pev->movetype == MOVETYPE_FLY )
+			{
+				m_movementActivity = ACT_FLY;
+			}
+			if ( LookupActivity( ACT_WALK ) != ACTIVITY_NOT_AVAILABLE )
+			{
+				m_movementActivity = ACT_WALK;
+			}
+			else
+			{
+				m_movementActivity = ACT_RUN;
+			}
+			TaskComplete();
+			break;
+		}
+	case TASK_STRAFE_PATH:
+		{
+			Vector2D	vec2DirToPoint; 
+			Vector2D	vec2RightSide;
+
+			// to start strafing, we have to first figure out if the target is on the left side or right side
+			UTIL_MakeVectors ( pev->angles );
+
+			vec2DirToPoint = ( m_Route[ 0 ].vecLocation - pev->origin ).Make2D().Normalize();
+			vec2RightSide = gpGlobals->v_right.Make2D().Normalize();
+
+			if ( DotProduct ( vec2DirToPoint, vec2RightSide ) > 0 )
+			{
+				// strafe right
+				m_movementActivity = ACT_STRAFE_RIGHT;
+			}
+			else
+			{
+				// strafe left
+				m_movementActivity = ACT_STRAFE_LEFT;
+			}
+			TaskComplete();
+			break;
+		}
+
+
+	case TASK_WAIT_FOR_MOVEMENT:
+		{
+			if (FRouteClear())
+			{
+				TaskComplete();
+			}
+			break;
+		}
+
+	case TASK_EAT:
+		{
+			Eat( pTask->flData );
+			TaskComplete();
+			break;
+		}
+	case TASK_SMALL_FLINCH:
+		{
+			m_IdealActivity = GetSmallFlinchActivity();
+			break;
+		}
+	case TASK_DIE:
+		{
+			RouteClear();	
+			
+			m_IdealActivity = GetDeathActivity();
+
+			pev->deadflag = DEAD_DYING;
+			break;
+		}
+	case TASK_SOUND_WAKE:
+		{
+			AlertSound();
+			TaskComplete();
+			break;
+		}
+	case TASK_SOUND_DIE:
+		{
+			DeathSound();
+			TaskComplete();
+			break;
+		}
+	case TASK_SOUND_IDLE:
+		{
+			IdleSound();
+			TaskComplete();
+			break;
+		}
+	case TASK_SOUND_PAIN:
+		{
+			PainSound();
+			TaskComplete();
+			break;
+		}
+	case TASK_SOUND_DEATH:
+		{
+			DeathSound();
+			TaskComplete();
+			break;
+		}
+	case TASK_SOUND_ANGRY:
+		{
+			// sounds are complete as soon as we get here, cause we've already played them.
+			ALERT ( at_aiconsole, "SOUND\n" );			
+			TaskComplete();
+			break;
+		}
+	case TASK_WAIT_FOR_SCRIPT:
+		{
+			if (m_pCine->m_iszIdle)
+			{
+				m_pCine->StartSequence( (CBaseMonster *)this, m_pCine->m_iszIdle, FALSE );
+				if (FStrEq( STRING(m_pCine->m_iszIdle), STRING(m_pCine->m_iszPlay)))
+				{
+					pev->framerate = 0;
+				}
+			}
+			else
+				m_IdealActivity = ACT_IDLE;
+
+			break;
+		}
+	case TASK_PLAY_SCRIPT:
+		{
+			pev->movetype = MOVETYPE_FLY;
+			ClearBits(pev->flags, FL_ONGROUND);
+			m_scriptState = SCRIPT_PLAYING;
+			break;
+		}
+	case TASK_ENABLE_SCRIPT:
+		{
+			m_pCine->DelayStart( 0 );
+			TaskComplete();
+			break;
+		}
+	case TASK_PLANT_ON_SCRIPT:
+		{
+			if ( m_hTargetEnt != NULL )
+			{
+				pev->origin = m_hTargetEnt->pev->origin;	// Plant on target
+			}
+
+			TaskComplete();
+			break;
+		}
+	case TASK_FACE_SCRIPT:
+		{
+			if ( m_hTargetEnt != NULL )
+			{
+				pev->ideal_yaw = UTIL_AngleMod( m_hTargetEnt->pev->angles.y );
+			}
+
+			TaskComplete();
+			m_IdealActivity = ACT_IDLE;
+			RouteClear();
+			break;
+		}
+
+	case TASK_SUGGEST_STATE:
+		{
+			m_IdealMonsterState = (MONSTERSTATE)(int)pTask->flData;
+			TaskComplete();
+			break;
+		}
+
+	case TASK_SET_FAIL_SCHEDULE:
+		m_failSchedule = (int)pTask->flData;
+		TaskComplete();
+		break;
+
+	case TASK_CLEAR_FAIL_SCHEDULE:
+		m_failSchedule = SCHED_NONE;
+		TaskComplete();
+		break;
+
+	default:
+		{
+			ALERT ( at_aiconsole, "No StartTask entry for %d\n", (SHARED_TASKS)pTask->iTask );
+			break;
+		}
+	}
+}
+
+//=========================================================
+// GetTask - returns a pointer to the current 
+// scheduled task. NULL if there's a problem.
+//=========================================================
+Task_t	*CBaseMonster :: GetTask ( void ) 
+{
+	if ( m_iScheduleIndex < 0 || m_iScheduleIndex >= m_pSchedule->cTasks )
+	{
+		// m_iScheduleIndex is not within valid range for the monster's current schedule.
+		return NULL;
+	}
+	else
+	{
+		return &m_pSchedule->pTasklist[ m_iScheduleIndex ];
+	}
+}
+
+//=========================================================
+// GetSchedule - Decides which type of schedule best suits
+// the monster's current state and conditions. Then calls
+// monster's member function to get a pointer to a schedule
+// of the proper type.
+//=========================================================
+Schedule_t *CBaseMonster :: GetSchedule ( void )
+{
+	switch	( m_MonsterState )
+	{
+	case MONSTERSTATE_PRONE:
+		{
+			return GetScheduleOfType( SCHED_BARNACLE_VICTIM_GRAB );
+			break;
+		}
+	case MONSTERSTATE_NONE:
+		{
+			ALERT ( at_aiconsole, "MONSTERSTATE IS NONE!\n" );
+			break;
+		}
+	case MONSTERSTATE_IDLE:
+		{
+			if ( HasConditions ( bits_COND_HEAR_SOUND ) )
+			{
+				return GetScheduleOfType( SCHED_ALERT_FACE );
+			}
+			else if ( FRouteClear() )
+			{
+				// no valid route!
+				return GetScheduleOfType( SCHED_IDLE_STAND );
+			}
+			else
+			{
+				// valid route. Get moving
+				return GetScheduleOfType( SCHED_IDLE_WALK );
+			}
+			break;
+		}
+	case MONSTERSTATE_ALERT:
+		{
+			if ( HasConditions( bits_COND_ENEMY_DEAD ) && LookupActivity( ACT_VICTORY_DANCE ) != ACTIVITY_NOT_AVAILABLE )
+			{
+				return GetScheduleOfType ( SCHED_VICTORY_DANCE );
+			}
+
+			if ( HasConditions(bits_COND_LIGHT_DAMAGE | bits_COND_HEAVY_DAMAGE) )
+			{
+				if ( fabs( FlYawDiff() ) < (1.0 - m_flFieldOfView) * 60 ) // roughly in the correct direction
+				{
+					return GetScheduleOfType( SCHED_TAKE_COVER_FROM_ORIGIN );
+				}
+				else
+				{
+					return GetScheduleOfType( SCHED_ALERT_SMALL_FLINCH );
+				}
+			}
+
+			else if ( HasConditions ( bits_COND_HEAR_SOUND ) )
+			{
+				return GetScheduleOfType( SCHED_ALERT_FACE );
+			}
+			else
+			{
+				return GetScheduleOfType( SCHED_ALERT_STAND );
+			}
+			break;
+		}
+	case MONSTERSTATE_COMBAT:
+		{
+			if ( HasConditions( bits_COND_ENEMY_DEAD ) )
+			{
+				// clear the current (dead) enemy and try to find another.
+				m_hEnemy = NULL;
+
+				if ( GetEnemy() )
+				{
+					ClearConditions( bits_COND_ENEMY_DEAD );
+					return GetSchedule();
+				}
+				else
+				{
+					SetState( MONSTERSTATE_ALERT );
+					return GetSchedule();
+				}
+			}
+
+			if ( HasConditions(bits_COND_NEW_ENEMY) )
+			{
+				return GetScheduleOfType ( SCHED_WAKE_ANGRY );
+			}
+			else if (HasConditions(bits_COND_LIGHT_DAMAGE) && !HasMemory( bits_MEMORY_FLINCHED) )
+			{
+				return GetScheduleOfType( SCHED_SMALL_FLINCH );
+			}
+			else if ( !HasConditions(bits_COND_SEE_ENEMY) )
+			{
+				// we can't see the enemy
+				if ( !HasConditions(bits_COND_ENEMY_OCCLUDED) )
+				{
+					// enemy is unseen, but not occluded!
+					// turn to face enemy
+					return GetScheduleOfType( SCHED_COMBAT_FACE );
+				}
+				else
+				{
+					// chase!
+					return GetScheduleOfType( SCHED_CHASE_ENEMY );
+				}
+			}
+			else  
+			{
+				// we can see the enemy
+				if ( HasConditions(bits_COND_CAN_RANGE_ATTACK1) )
+				{
+					return GetScheduleOfType( SCHED_RANGE_ATTACK1 );
+				}
+				if ( HasConditions(bits_COND_CAN_RANGE_ATTACK2) )
+				{
+					return GetScheduleOfType( SCHED_RANGE_ATTACK2 );
+				}
+				if ( HasConditions(bits_COND_CAN_MELEE_ATTACK1) )
+				{
+					return GetScheduleOfType( SCHED_MELEE_ATTACK1 );
+				}
+				if ( HasConditions(bits_COND_CAN_MELEE_ATTACK2) )
+				{
+					return GetScheduleOfType( SCHED_MELEE_ATTACK2 );
+				}
+				if ( !HasConditions(bits_COND_CAN_RANGE_ATTACK1 | bits_COND_CAN_MELEE_ATTACK1) )
+				{
+					// if we can see enemy but can't use either attack type, we must need to get closer to enemy
+					return GetScheduleOfType( SCHED_CHASE_ENEMY );
+				}
+				else if ( !FacingIdeal() )
+				{
+					//turn
+					return GetScheduleOfType( SCHED_COMBAT_FACE );
+				}
+				else
+				{
+					ALERT ( at_aiconsole, "No suitable combat schedule!\n" );
+				}
+			}
+			break;
+		}
+	case MONSTERSTATE_DEAD:
+		{
+			return GetScheduleOfType( SCHED_DIE );
+			break;
+		}
+	case MONSTERSTATE_SCRIPT:
+		{
+			ASSERT( m_pCine != NULL );
+			if ( !m_pCine )
+			{
+				ALERT( at_aiconsole, "Script failed for %s\n", STRING(pev->classname) );
+				CineCleanup();
+				return GetScheduleOfType( SCHED_IDLE_STAND );
+			}
+
+			return GetScheduleOfType( SCHED_AISCRIPT );
+		}
+	default:
+		{
+			ALERT ( at_aiconsole, "Invalid State for GetSchedule!\n" );
+			break;
+		}
+	}
+
+	return &slError[ 0 ];
+}
diff --git a/main/source/dlls/Wxdebug.cpp b/main/source/dlls/Wxdebug.cpp
new file mode 100644
index 00000000..d3902d6c
--- /dev/null
+++ b/main/source/dlls/Wxdebug.cpp
@@ -0,0 +1,395 @@
+//==========================================================================;
+//
+//  THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY
+//  KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+//  IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR
+//  PURPOSE.
+//
+//  Copyright (c) 1992 - 1997  Microsoft Corporation.  All Rights Reserved.
+//
+//--------------------------------------------------------------------------;
+
+
+// For every module and executable we store a debugging level and flags
+// for the types of output that are desired. Constants for the types are
+// defined in WXDEBUG.H and more can be added.
+// The keys are stored in the registry under the
+// HKEY_LOCAL_MACHINE\SOFTWARE\Debug\<Module Name>\Type and
+// HKEY_LOCAL_MACHINE\SOFTWARE\Debug\<Module Name>\Level key values
+//
+// There are also global values under SOFTWARE\Debug\Global which are loaded
+// after the module-specific values. The Types specified there are OR'ed with
+// the module specific types and m_dwLevel is set to the greater of the global
+// and the module specific settings.
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "extdll.h"
+#include "util.h"
+#include "wxdebug.h"
+
+#include <tchar.h>
+
+#ifdef _DEBUG
+
+void WINAPI DbgInitModuleName(void);
+void WINAPI DbgInitModuleSettings(void);
+void WINAPI DbgInitGlobalSettings(void);
+void WINAPI DbgInitLogTo(HKEY hKey);
+void WINAPI DbgInitKeyLevels(HKEY hKey, DWORD *pdwTypes, DWORD *pdwLevel);
+
+
+
+const INT iDEBUGINFO = 512;                 // Used to format strings
+
+HINSTANCE m_hInst;                          // Module instance handle
+TCHAR m_ModuleName[iDEBUGINFO];             // Cut down module name
+//CRITICAL_SECTION m_CSDebug;                 // Controls access to list
+BOOL m_bInit = FALSE;                       // Have we been initialised
+HANDLE m_hOutput = INVALID_HANDLE_VALUE;    // Optional output written here
+DWORD m_dwTypes = 0;
+DWORD m_dwLevel = 0;
+
+const TCHAR *m_pBaseKey = TEXT("SOFTWARE\\Debug");
+const TCHAR *m_pGlobalKey = TEXT("GLOBAL");
+TCHAR *pKeyNames[] =
+{
+    TEXT("Types"),
+    TEXT("Level")
+};
+
+
+// DbgInitialize
+// This sets the instance handle that the debug library uses to find
+// the module's file name from the Win32 GetModuleFileName function
+void WINAPI DbgInitialise(HINSTANCE hInst)
+{
+    if (!m_bInit)
+    {
+        //InitializeCriticalSection(&m_CSDebug);
+        m_bInit = TRUE;
+        m_hInst = hInst;
+        DbgInitModuleName();
+        DbgInitModuleSettings();
+        DbgInitGlobalSettings();
+    }
+}
+
+
+// DbgTerminate
+// This is called to clear up any resources the debug library uses - at the
+// moment we delete our critical section and the handle of the output file.
+void WINAPI DbgTerminate()
+{
+    if (m_bInit)
+    {
+        if (m_hOutput != INVALID_HANDLE_VALUE)
+        {
+            DBGASSERTEXECUTE(CloseHandle(m_hOutput));
+            m_hOutput = INVALID_HANDLE_VALUE;
+        }
+        //DeleteCriticalSection(&m_CSDebug);
+        m_bInit = FALSE;
+    }
+}
+
+
+// DbgInitModuleName
+// Initialise the module file name
+void WINAPI DbgInitModuleName()
+{
+    TCHAR FullName[iDEBUGINFO];     // Load the full path and module name
+    TCHAR *pName;                   // Searches from the end for a backslash
+
+    GetModuleFileName(m_hInst,FullName,iDEBUGINFO);
+    pName = _tcsrchr(FullName,'\\');
+    if (pName == NULL)
+    {
+        pName = FullName;
+    }
+    else
+    {
+        pName++;
+    }
+    lstrcpy(m_ModuleName,pName);
+}
+
+
+// DbgInitModuleSettings
+// Retrieve the module-specific settings
+void WINAPI DbgInitModuleSettings()
+{
+    LONG lReturn;               // Create key return value
+    TCHAR szInfo[iDEBUGINFO];   // Constructs key names
+    HKEY hModuleKey;            // Module key handle
+
+    // Construct the base key name
+    wsprintf(szInfo,TEXT("%s\\%s"),m_pBaseKey,m_ModuleName);
+
+    // Create or open the key for this module
+    lReturn = RegCreateKeyEx(HKEY_LOCAL_MACHINE,   // Handle of an open key
+                             szInfo,               // Address of subkey name
+                             (DWORD)0,             // Reserved value
+                             NULL,                 // Address of class name
+                             (DWORD)0,             // Special options flags
+                             KEY_ALL_ACCESS,       // Desired security access
+                             NULL,                 // Key security descriptor
+                             &hModuleKey,          // Opened handle buffer
+                             NULL);                // What really happened
+
+    if (lReturn != ERROR_SUCCESS)
+    {
+        DbgLogInfo(LOG_ERROR, 0, TEXT("Could not access module key"));
+        return;
+    }
+
+    DbgInitLogTo(hModuleKey);
+    DbgInitKeyLevels(hModuleKey, &m_dwTypes, &m_dwLevel);
+    RegCloseKey(hModuleKey);
+}
+
+
+// DbgInitGlobalSettings
+// This is called by DbgInitialize to read the global debug settings for
+// Level and Type from the registry. The Types are OR'ed together and m_dwLevel
+// is set to the greater of the global and module-specific values.
+void WINAPI DbgInitGlobalSettings()
+{
+    LONG lReturn;               // Create key return value
+    TCHAR szInfo[iDEBUGINFO];   // Constructs key names
+    HKEY hGlobalKey;            // Global override key
+    DWORD dwTypes = 0;
+    DWORD dwLevel = 0;
+
+    // Construct the global base key name
+    wsprintf(szInfo,TEXT("%s\\%s"),m_pBaseKey,m_pGlobalKey);
+
+    // Create or open the key for this module
+    lReturn = RegCreateKeyEx(HKEY_LOCAL_MACHINE,   // Handle of an open key
+                             szInfo,               // Address of subkey name
+                             (DWORD)0,             // Reserved value
+                             NULL,                 // Address of class name
+                             (DWORD)0,             // Special options flags
+                             KEY_ALL_ACCESS,       // Desired security access
+                             NULL,                 // Key security descriptor
+                             &hGlobalKey,          // Opened handle buffer
+                             NULL);                // What really happened
+
+    if (lReturn != ERROR_SUCCESS)
+    {
+        DbgLogInfo(LOG_ERROR, 0, TEXT("Could not access GLOBAL module key"));
+        return;
+    }
+
+    DbgInitKeyLevels(hGlobalKey, &dwTypes, &dwLevel);
+    RegCloseKey(hGlobalKey);
+
+    m_dwTypes |= dwTypes;
+    if (dwLevel > m_dwLevel)
+        m_dwLevel = dwLevel;
+}
+
+
+// DbgInitLogTo
+// Called by DbgInitModuleSettings to setup alternate logging destinations
+void WINAPI DbgInitLogTo(HKEY hKey)
+{
+    LONG  lReturn;
+    DWORD dwKeyType;
+    DWORD dwKeySize;
+    TCHAR szFile[MAX_PATH] = {0};
+    static const TCHAR cszKey[] = TEXT("LogToFile");
+
+    dwKeySize = MAX_PATH;
+    lReturn = RegQueryValueEx(
+        hKey,                       // Handle to an open key
+        cszKey,                     // Subkey name derivation
+        NULL,                       // Reserved field
+        &dwKeyType,                 // Returns the field type
+        (LPBYTE) szFile,            // Returns the field's value
+        &dwKeySize);                // Number of bytes transferred
+
+    // create an empty key if it does not already exist
+    if (lReturn != ERROR_SUCCESS || dwKeyType != REG_SZ)
+       {
+       dwKeySize = 1;
+       lReturn = RegSetValueEx(
+            hKey,                   // Handle of an open key
+            cszKey,                 // Address of subkey name
+            (DWORD) 0,              // Reserved field
+            REG_SZ,                 // Type of the key field
+            (PBYTE)szFile,          // Value for the field
+            dwKeySize);            // Size of the field buffer
+       }
+
+    // if an output-to was specified.  try to open it.
+    if (m_hOutput != INVALID_HANDLE_VALUE)
+    {
+       DBGASSERTEXECUTE(CloseHandle(m_hOutput));
+       m_hOutput = INVALID_HANDLE_VALUE;
+    }
+    if (szFile[0] != 0)
+    {
+        if (!lstrcmpi(szFile, TEXT("Console")))
+        {
+            m_hOutput = GetStdHandle(STD_OUTPUT_HANDLE);
+            if (m_hOutput == INVALID_HANDLE_VALUE)
+            {
+                AllocConsole();
+                m_hOutput = GetStdHandle(STD_OUTPUT_HANDLE);
+            }
+            SetConsoleTitle (TEXT("Valve Debug Output"));
+        } else if (szFile[0] &&
+            lstrcmpi(szFile, TEXT("Debug")) &&
+            lstrcmpi(szFile, TEXT("Debugger")) &&
+            lstrcmpi(szFile, TEXT("Deb")))
+        {
+            m_hOutput = CreateFile(szFile, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+            if (INVALID_HANDLE_VALUE != m_hOutput)
+            {
+                static const TCHAR cszBar[] = TEXT("\r\n\r\n=====DbgInitialize()=====\r\n\r\n");
+                SetFilePointer (m_hOutput, 0, NULL, FILE_END);
+                DbgOutString (cszBar);
+            }
+        }
+    }
+}
+
+
+// DbgInitKeyLevels
+// This is called by DbgInitModuleSettings and DbgInitGlobalSettings to read 
+// settings for Types and Level from the registry
+void WINAPI DbgInitKeyLevels(HKEY hKey, DWORD *pdwTypes, DWORD *pdwLevel)
+{
+    LONG lReturn;               // Create key return value
+    DWORD dwKeySize;            // Size of the key value
+    DWORD dwKeyType;            // Receives it's type
+
+    // Get the Types value
+    dwKeySize = sizeof(DWORD);
+    lReturn = RegQueryValueEx(
+        hKey,                   // Handle to an open key
+        pKeyNames[0],           // Subkey name derivation
+        NULL,                   // Reserved field
+        &dwKeyType,             // Returns the field type
+        (LPBYTE)pdwTypes,       // Returns the field's value
+        &dwKeySize );           // Number of bytes transferred
+
+    // If either the key was not available or it was not a DWORD value
+    // then we ensure only the high priority debug logging is output
+    //  but we try and update the field to a zero filled DWORD value
+
+    if (lReturn != ERROR_SUCCESS || dwKeyType != REG_DWORD)
+    {
+        *pdwTypes = 0;
+        lReturn = RegSetValueEx(
+            hKey,               // Handle of an open key
+            pKeyNames[0],       // Address of subkey name
+            (DWORD)0,           // Reserved field
+            REG_DWORD,          // Type of the key field
+            (PBYTE)pdwTypes,    // Value for the field
+            sizeof(DWORD));     // Size of the field buffer
+
+        if (lReturn != ERROR_SUCCESS)
+        {
+            DbgLogInfo(LOG_ERROR, 0, TEXT("Could not create subkey %s"),pKeyNames[0]);
+            *pdwTypes = 0;
+        }
+    }
+
+    // Get the Level value
+    dwKeySize = sizeof(DWORD);
+    lReturn = RegQueryValueEx(
+        hKey,                   // Handle to an open key
+        pKeyNames[1],           // Subkey name derivation
+        NULL,                   // Reserved field
+        &dwKeyType,             // Returns the field type
+        (LPBYTE)pdwLevel,       // Returns the field's value
+        &dwKeySize );           // Number of bytes transferred
+
+    // If either the key was not available or it was not a DWORD value
+    // then we ensure only the high priority debug logging is output
+    //  but we try and update the field to a zero filled DWORD value
+
+    if (lReturn != ERROR_SUCCESS || dwKeyType != REG_DWORD)
+    {
+        *pdwLevel = 0;
+        lReturn = RegSetValueEx(
+            hKey,               // Handle of an open key
+            pKeyNames[1],       // Address of subkey name
+            (DWORD)0,           // Reserved field
+            REG_DWORD,          // Type of the key field
+            (PBYTE)pdwLevel,   // Value for the field
+            sizeof(DWORD));     // Size of the field buffer
+
+        if (lReturn != ERROR_SUCCESS)
+        {
+            DbgLogInfo(LOG_ERROR, 0, TEXT("Could not create subkey %s"),pKeyNames[1]);
+            *pdwLevel = 0;
+        }
+    }
+}
+
+
+// DbgOutString
+void WINAPI DbgOutString(LPCTSTR psz)
+{
+    if (!m_bInit)
+        return;
+    if (m_hOutput != INVALID_HANDLE_VALUE) {
+        UINT  cb = lstrlen(psz);
+        DWORD dw;
+        WriteFile (m_hOutput, psz, cb, &dw, NULL);
+    } else {
+        OutputDebugString (psz);
+    }
+}
+
+
+// DbgLogInfo
+// Print a formatted string to the debugger prefixed with this module's name
+// Because the debug code is linked statically every module loaded will
+// have its own copy of this code. It therefore helps if the module name is
+// included on the output so that the offending code can be easily found
+void WINAPI DbgLogInfo(DWORD Type, DWORD Level, const TCHAR *pFormat,...)
+{
+    if (!m_bInit)
+        return;
+    // Check the current level for this type combination */
+    if (((Type & m_dwTypes) == 0) || (m_dwLevel < Level))
+        return;
+
+    TCHAR szInfo[2000];
+
+    // Format the variable length parameter list
+
+    va_list va;
+    va_start(va, pFormat);
+
+    //lstrcpy(szInfo, m_ModuleName);
+    //lstrcat(szInfo, TEXT(": "));
+    wvsprintf(szInfo /* + lstrlen(szInfo) */, pFormat, va);
+    //lstrcat(szInfo, TEXT("\r\n"));
+    DbgOutString(szInfo);
+
+    va_end(va);
+}
+
+
+// DbgKernelAssert
+// If we are executing as a pure kernel filter we cannot display message
+// boxes to the user, this provides an alternative which puts the error
+// condition on the debugger output with a suitable eye catching message
+void WINAPI DbgKernelAssert(const TCHAR *pCondition, const TCHAR *pFileName, INT iLine)
+{
+    if (!m_bInit)
+        return;
+	DbgLogInfo(LOG_ERROR, 0, TEXT(m_ModuleName));
+    DbgLogInfo(LOG_ERROR, 0, TEXT(": Assertion FAILED (%s) at line %d in file %s\r\n"), pCondition, iLine, pFileName);
+    DebugBreak();
+}
+
+#endif // _DEBUG
+
+
diff --git a/main/source/dlls/activity.h b/main/source/dlls/activity.h
new file mode 100644
index 00000000..fa90cab9
--- /dev/null
+++ b/main/source/dlls/activity.h
@@ -0,0 +1,113 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+#ifndef	ACTIVITY_H
+#define	ACTIVITY_H
+
+
+typedef enum {
+	ACT_RESET = 0,		// Set m_Activity to this invalid value to force a reset to m_IdealActivity
+	ACT_IDLE = 1,
+	ACT_GUARD,
+	ACT_WALK,
+	ACT_RUN,
+	ACT_FLY,				// Fly (and flap if appropriate)
+	ACT_SWIM,
+	ACT_HOP,				// vertical jump
+	ACT_LEAP,				// long forward jump
+	ACT_FALL,
+	ACT_LAND,
+	ACT_STRAFE_LEFT,
+	ACT_STRAFE_RIGHT,
+	ACT_ROLL_LEFT,			// tuck and roll, left
+	ACT_ROLL_RIGHT,			// tuck and roll, right
+	ACT_TURN_LEFT,			// turn quickly left (stationary)
+	ACT_TURN_RIGHT,			// turn quickly right (stationary)
+	ACT_CROUCH,				// the act of crouching down from a standing position
+	ACT_CROUCHIDLE,			// holding body in crouched position (loops)
+	ACT_STAND,				// the act of standing from a crouched position
+	ACT_USE,
+	ACT_SIGNAL1,
+	ACT_SIGNAL2,
+	ACT_SIGNAL3,
+	ACT_TWITCH,
+	ACT_COWER,
+	ACT_SMALL_FLINCH,
+	ACT_BIG_FLINCH,
+	ACT_RANGE_ATTACK1,
+	ACT_RANGE_ATTACK2,
+	ACT_MELEE_ATTACK1,
+	ACT_MELEE_ATTACK2,
+	ACT_RELOAD,
+	ACT_RELOAD_START,      // added by elven for multipart reload animations
+	ACT_RELOAD_INSERT,
+	ACT_RELOAD_END, 
+	ACT_ARM,				// pull out gun, for instance
+	ACT_DISARM,				// reholster gun
+	ACT_EAT,				// monster chowing on a large food item (loop)
+	ACT_DIESIMPLE,
+	ACT_DIEBACKWARD,
+	ACT_DIEFORWARD,
+	ACT_DIEVIOLENT,
+	ACT_BARNACLE_HIT,		// barnacle tongue hits a monster
+	ACT_BARNACLE_PULL,		// barnacle is lifting the monster ( loop )
+	ACT_BARNACLE_CHOMP,		// barnacle latches on to the monster
+	ACT_BARNACLE_CHEW,		// barnacle is holding the monster in its mouth ( loop )
+	ACT_SLEEP,
+	ACT_INSPECT_FLOOR,		// for active idles, look at something on or near the floor
+	ACT_INSPECT_WALL,		// for active idles, look at something directly ahead of you ( doesn't HAVE to be a wall or on a wall )
+	ACT_IDLE_ANGRY,			// alternate idle animation in which the monster is clearly agitated. (loop)
+	ACT_WALK_HURT,			// limp  (loop)
+	ACT_RUN_HURT,			// limp  (loop)
+	ACT_HOVER,				// Idle while in flight
+	ACT_GLIDE,				// Fly (don't flap)
+	ACT_FLY_LEFT,			// Turn left in flight
+	ACT_FLY_RIGHT,			// Turn right in flight
+	ACT_DETECT_SCENT,		// this means the monster smells a scent carried by the air
+	ACT_SNIFF,				// this is the act of actually sniffing an item in front of the monster
+	ACT_BITE,				// some large monsters can eat small things in one bite. This plays one time, EAT loops.
+	ACT_THREAT_DISPLAY,		// without attacking, monster demonstrates that it is angry. (Yell, stick out chest, etc )
+	ACT_FEAR_DISPLAY,		// monster just saw something that it is afraid of
+	ACT_EXCITED,			// for some reason, monster is excited. Sees something he really likes to eat, or whatever.
+	ACT_SPECIAL_ATTACK1,	// very monster specific special attacks.
+	ACT_SPECIAL_ATTACK2,	
+	ACT_COMBAT_IDLE,		// agitated idle.
+	ACT_WALK_SCARED,
+	ACT_RUN_SCARED,
+	ACT_VICTORY_DANCE,		// killed a player, do a victory dance.
+	ACT_DIE_HEADSHOT,		// die, hit in head. 
+	ACT_DIE_CHESTSHOT,		// die, hit in chest
+	ACT_DIE_GUTSHOT,		// die, hit in gut
+	ACT_DIE_BACKSHOT,		// die, hit in back
+	ACT_FLINCH_HEAD,
+	ACT_FLINCH_CHEST,
+	ACT_FLINCH_STOMACH,
+	ACT_FLINCH_LEFTARM,
+	ACT_FLINCH_RIGHTARM,
+	ACT_FLINCH_LEFTLEG,
+	ACT_FLINCH_RIGHTLEG,
+    ACT_RANGE_PRIME,        // Priming a ranged weapon
+} Activity;
+
+
+typedef struct {
+	int	type;
+	char *name;
+} activity_map_t;
+
+extern activity_map_t activity_map[];
+
+
+#endif	//ACTIVITY_H
diff --git a/main/source/dlls/activitymap.h b/main/source/dlls/activitymap.h
new file mode 100644
index 00000000..e4536b84
--- /dev/null
+++ b/main/source/dlls/activitymap.h
@@ -0,0 +1,101 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+#define _A( a ) { a, #a }
+
+activity_map_t activity_map[] =
+{
+_A( ACT_IDLE ),
+_A(	ACT_GUARD ),
+_A(	ACT_WALK ),
+_A(	ACT_RUN ),
+_A(	ACT_FLY ),
+_A(	ACT_SWIM ),
+_A(	ACT_HOP ),
+_A(	ACT_LEAP ),
+_A(	ACT_FALL ),
+_A(	ACT_LAND ),
+_A(	ACT_STRAFE_LEFT ),
+_A(	ACT_STRAFE_RIGHT ),
+_A(	ACT_ROLL_LEFT ),
+_A(	ACT_ROLL_RIGHT ),
+_A(	ACT_TURN_LEFT ),
+_A(	ACT_TURN_RIGHT ),
+_A(	ACT_CROUCH ),
+_A(	ACT_CROUCHIDLE ),
+_A(	ACT_STAND ),
+_A(	ACT_USE ),
+_A(	ACT_SIGNAL1 ),
+_A(	ACT_SIGNAL2 ),
+_A(	ACT_SIGNAL3 ),
+_A(	ACT_TWITCH ),
+_A(	ACT_COWER ),
+_A(	ACT_SMALL_FLINCH ),
+_A(	ACT_BIG_FLINCH ),
+_A(	ACT_RANGE_ATTACK1 ),
+_A(	ACT_RANGE_ATTACK2 ),
+_A(	ACT_MELEE_ATTACK1 ),
+_A(	ACT_MELEE_ATTACK2 ),
+_A(	ACT_RELOAD ),
+_A( ACT_RELOAD_START),   // added by elven
+_A( ACT_RELOAD_INSERT),
+_A( ACT_RELOAD_END),
+_A(	ACT_ARM ),
+_A(	ACT_DISARM ),
+_A(	ACT_EAT ),
+_A(	ACT_DIESIMPLE ),
+_A(	ACT_DIEBACKWARD ),
+_A(	ACT_DIEFORWARD ),
+_A(	ACT_DIEVIOLENT ),
+_A(	ACT_BARNACLE_HIT ),
+_A(	ACT_BARNACLE_PULL ),
+_A(	ACT_BARNACLE_CHOMP ),
+_A(	ACT_BARNACLE_CHEW ),
+_A(	ACT_SLEEP ),
+_A(	ACT_INSPECT_FLOOR ),
+_A(	ACT_INSPECT_WALL ),
+_A(	ACT_IDLE_ANGRY ),
+_A(	ACT_WALK_HURT ),
+_A(	ACT_RUN_HURT ),
+_A(	ACT_HOVER ),
+_A(	ACT_GLIDE ),
+_A(	ACT_FLY_LEFT ),
+_A(	ACT_FLY_RIGHT ),
+_A(	ACT_DETECT_SCENT ),
+_A(	ACT_SNIFF ),		
+_A(	ACT_BITE ),		
+_A(	ACT_THREAT_DISPLAY ),
+_A(	ACT_FEAR_DISPLAY ),
+_A(	ACT_EXCITED ),	
+_A( ACT_SPECIAL_ATTACK1 ),
+_A( ACT_SPECIAL_ATTACK2 ),
+_A( ACT_COMBAT_IDLE		),
+_A(	ACT_WALK_SCARED ),
+_A(	ACT_RUN_SCARED ),
+_A( ACT_VICTORY_DANCE ),
+_A( ACT_DIE_HEADSHOT ),
+_A( ACT_DIE_CHESTSHOT ),
+_A( ACT_DIE_GUTSHOT ),
+_A( ACT_DIE_BACKSHOT ),
+_A(	ACT_FLINCH_HEAD ),
+_A(	ACT_FLINCH_CHEST ),
+_A(	ACT_FLINCH_STOMACH ),
+_A(	ACT_FLINCH_LEFTARM ),
+_A(	ACT_FLINCH_RIGHTARM ),
+_A(	ACT_FLINCH_LEFTLEG ),
+_A(	ACT_FLINCH_RIGHTLEG ),
+_A(	ACT_RANGE_PRIME ),
+0, NULL
+};
diff --git a/main/source/dlls/aflock.cpp b/main/source/dlls/aflock.cpp
new file mode 100644
index 00000000..515482e6
--- /dev/null
+++ b/main/source/dlls/aflock.cpp
@@ -0,0 +1,910 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+//=========================================================
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"squadmonster.h"
+
+#define		AFLOCK_MAX_RECRUIT_RADIUS	1024
+#define		AFLOCK_FLY_SPEED			125
+#define		AFLOCK_TURN_RATE			75
+#define		AFLOCK_ACCELERATE			10
+#define		AFLOCK_CHECK_DIST			192
+#define		AFLOCK_TOO_CLOSE			100
+#define		AFLOCK_TOO_FAR				256
+
+//=========================================================
+//=========================================================
+class CFlockingFlyerFlock : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void KeyValue( KeyValueData *pkvd );
+	void SpawnFlock( void );
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	// Sounds are shared by the flock
+	static  void PrecacheFlockSounds( void );
+
+	int		m_cFlockSize;
+	float	m_flFlockRadius;
+};
+
+TYPEDESCRIPTION	CFlockingFlyerFlock::m_SaveData[] = 
+{
+	DEFINE_FIELD( CFlockingFlyerFlock, m_cFlockSize, FIELD_INTEGER ),
+	DEFINE_FIELD( CFlockingFlyerFlock, m_flFlockRadius, FIELD_FLOAT ),
+};
+
+IMPLEMENT_SAVERESTORE( CFlockingFlyerFlock, CBaseMonster );
+
+//=========================================================
+//=========================================================
+class CFlockingFlyer : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void SpawnCommonCode( void );
+	void EXPORT IdleThink( void );
+	void BoidAdvanceFrame( void );
+	void EXPORT FormFlock( void );
+	void EXPORT Start( void );
+	void EXPORT FlockLeaderThink( void );
+	void EXPORT FlockFollowerThink( void );
+	void EXPORT FallHack( void );
+	void MakeSound( void );
+	void AlertFlock( void );
+	void SpreadFlock( void );
+	void SpreadFlock2( void );
+	void Killed( entvars_t *pevAttacker, int iGib );
+	void Poop ( void );
+	BOOL FPathBlocked( void );
+	//void KeyValue( KeyValueData *pkvd );
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	int IsLeader( void ) { return m_pSquadLeader == this; }
+	int	InSquad( void ) { return m_pSquadLeader != NULL; }
+	int	SquadCount( void );
+	void SquadRemove( CFlockingFlyer *pRemove );
+	void SquadUnlink( void );
+	void SquadAdd( CFlockingFlyer *pAdd );
+	void SquadDisband( void );
+
+	CFlockingFlyer *m_pSquadLeader;
+	CFlockingFlyer *m_pSquadNext;
+	BOOL	m_fTurning;// is this boid turning?
+	BOOL	m_fCourseAdjust;// followers set this flag TRUE to override flocking while they avoid something
+	BOOL	m_fPathBlocked;// TRUE if there is an obstacle ahead
+	Vector	m_vecReferencePoint;// last place we saw leader
+	Vector	m_vecAdjustedVelocity;// adjusted velocity (used when fCourseAdjust is TRUE)
+	float	m_flGoalSpeed;
+	float	m_flLastBlockedTime;
+	float	m_flFakeBlockedTime;
+	float	m_flAlertTime;
+	float	m_flFlockNextSoundTime;
+};
+LINK_ENTITY_TO_CLASS( monster_flyer, CFlockingFlyer );
+LINK_ENTITY_TO_CLASS( monster_flyer_flock, CFlockingFlyerFlock );
+
+TYPEDESCRIPTION	CFlockingFlyer::m_SaveData[] = 
+{
+	DEFINE_FIELD( CFlockingFlyer, m_pSquadLeader, FIELD_CLASSPTR ),
+	DEFINE_FIELD( CFlockingFlyer, m_pSquadNext, FIELD_CLASSPTR ),
+	DEFINE_FIELD( CFlockingFlyer, m_fTurning, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CFlockingFlyer, m_fCourseAdjust, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CFlockingFlyer, m_fPathBlocked, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CFlockingFlyer, m_vecReferencePoint, FIELD_POSITION_VECTOR ),
+	DEFINE_FIELD( CFlockingFlyer, m_vecAdjustedVelocity, FIELD_VECTOR ),
+	DEFINE_FIELD( CFlockingFlyer, m_flGoalSpeed, FIELD_FLOAT ),
+	DEFINE_FIELD( CFlockingFlyer, m_flLastBlockedTime, FIELD_TIME ),
+	DEFINE_FIELD( CFlockingFlyer, m_flFakeBlockedTime, FIELD_TIME ),
+	DEFINE_FIELD( CFlockingFlyer, m_flAlertTime, FIELD_TIME ),
+//	DEFINE_FIELD( CFlockingFlyer, m_flFlockNextSoundTime, FIELD_TIME ),	// don't need to save
+};
+
+IMPLEMENT_SAVERESTORE( CFlockingFlyer, CBaseMonster );
+
+//=========================================================
+//=========================================================
+void CFlockingFlyerFlock :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "iFlockSize"))
+	{
+		m_cFlockSize = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "flFlockRadius"))
+	{
+		m_flFlockRadius = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+}
+
+//=========================================================
+//=========================================================
+void CFlockingFlyerFlock :: Spawn( )
+{
+	Precache( );
+	SpawnFlock();
+
+	REMOVE_ENTITY(ENT(pev));		// dump the spawn ent
+}
+
+//=========================================================
+//=========================================================
+void CFlockingFlyerFlock :: Precache( )
+{
+	//PRECACHE_MODEL("models/aflock.mdl");		
+	PRECACHE_MODEL("models/boid.mdl");		
+
+	PrecacheFlockSounds();
+}
+
+
+void CFlockingFlyerFlock :: PrecacheFlockSounds( void )
+{
+	PRECACHE_SOUND("boid/boid_alert1.wav" );
+	PRECACHE_SOUND("boid/boid_alert2.wav" );
+
+	PRECACHE_SOUND("boid/boid_idle1.wav" );
+	PRECACHE_SOUND("boid/boid_idle2.wav" );
+}
+
+//=========================================================
+//=========================================================
+void CFlockingFlyerFlock :: SpawnFlock( void )
+{
+	float R = m_flFlockRadius;
+	int iCount;
+	Vector vecSpot;
+	CFlockingFlyer *pBoid, *pLeader;
+
+	pLeader = pBoid = NULL;
+
+	for ( iCount = 0 ; iCount < m_cFlockSize ; iCount++ )
+	{
+		pBoid = GetClassPtr( (CFlockingFlyer *)NULL );
+
+		if ( !pLeader ) 
+		{
+			// make this guy the leader.
+			pLeader = pBoid;
+			
+			pLeader->m_pSquadLeader = pLeader;
+			pLeader->m_pSquadNext = NULL;
+		}
+
+		vecSpot.x = RANDOM_FLOAT( -R, R );
+		vecSpot.y = RANDOM_FLOAT( -R, R );
+		vecSpot.z = RANDOM_FLOAT( 0, 16 );
+		vecSpot = pev->origin + vecSpot;
+
+		UTIL_SetOrigin(pBoid->pev, vecSpot);
+		pBoid->pev->movetype = MOVETYPE_FLY;
+		pBoid->SpawnCommonCode();
+		pBoid->pev->flags &= ~FL_ONGROUND;
+		pBoid->pev->velocity = g_vecZero;
+		pBoid->pev->angles	 = pev->angles;
+		
+		pBoid->pev->frame = 0;
+		pBoid->pev->nextthink = gpGlobals->time + 0.2;
+		pBoid->SetThink( &CFlockingFlyer :: IdleThink );
+
+		if ( pBoid != pLeader ) 
+		{
+			pLeader->SquadAdd( pBoid );
+		}
+	}
+}
+
+//=========================================================
+//=========================================================
+void CFlockingFlyer :: Spawn( )
+{
+	Precache( );
+	SpawnCommonCode();
+	
+	pev->frame = 0;
+	pev->nextthink = gpGlobals->time + 0.1;
+	SetThink( &CFlockingFlyer::IdleThink );
+}
+
+//=========================================================
+//=========================================================
+void CFlockingFlyer :: Precache( )
+{
+	//PRECACHE_MODEL("models/aflock.mdl");
+	PRECACHE_MODEL("models/boid.mdl");
+	CFlockingFlyerFlock::PrecacheFlockSounds();
+}
+
+//=========================================================
+//=========================================================
+void CFlockingFlyer :: MakeSound( void )
+{
+	if ( m_flAlertTime > gpGlobals->time )
+	{
+		// make agitated sounds
+		switch ( RANDOM_LONG( 0, 1 ) )
+		{
+		case 0:	EMIT_SOUND( ENT(pev), CHAN_WEAPON, "boid/boid_alert1.wav", 1, ATTN_NORM );	break;
+		case 1:	EMIT_SOUND( ENT(pev), CHAN_WEAPON, "boid/boid_alert2.wav", 1, ATTN_NORM );	break;
+		}
+
+		return;
+	}
+
+	// make normal sound
+	switch ( RANDOM_LONG( 0, 1 ) )
+	{
+	case 0:	EMIT_SOUND( ENT(pev), CHAN_WEAPON, "boid/boid_idle1.wav", 1, ATTN_NORM );	break;
+	case 1:	EMIT_SOUND( ENT(pev), CHAN_WEAPON, "boid/boid_idle2.wav", 1, ATTN_NORM );	break;
+	}
+}
+
+//=========================================================
+//=========================================================
+void CFlockingFlyer :: Killed( entvars_t *pevAttacker, int iGib )
+{
+	CFlockingFlyer *pSquad;
+	
+	pSquad = (CFlockingFlyer *)m_pSquadLeader;
+
+	while ( pSquad )
+	{
+		pSquad->m_flAlertTime = gpGlobals->time + 15;
+		pSquad = (CFlockingFlyer *)pSquad->m_pSquadNext;
+	}
+
+	if ( m_pSquadLeader )
+	{
+		m_pSquadLeader->SquadRemove( this );
+	}
+
+	pev->deadflag = DEAD_DEAD;
+
+	pev->framerate = 0;
+	pev->effects = EF_NOINTERP;
+
+	UTIL_SetSize( pev, Vector(0,0,0), Vector(0,0,0) );
+	pev->movetype = MOVETYPE_TOSS;
+
+	SetThink ( &CFlockingFlyer::FallHack );
+	pev->nextthink = gpGlobals->time + 0.1;
+}
+
+void CFlockingFlyer :: FallHack( void )
+{
+	if ( pev->flags & FL_ONGROUND )
+	{
+		if ( !FClassnameIs ( pev->groundentity, "worldspawn" ) )
+		{
+			pev->flags &= ~FL_ONGROUND;
+			pev->nextthink = gpGlobals->time + 0.1;
+		}
+		else
+		{
+			pev->velocity = g_vecZero;
+			SetThink( NULL );
+		}
+	}
+}
+
+//=========================================================
+//=========================================================
+void CFlockingFlyer :: SpawnCommonCode( )
+{
+	pev->deadflag	= DEAD_NO;
+	pev->classname	= MAKE_STRING("monster_flyer");
+	pev->solid		= SOLID_SLIDEBOX;
+	pev->movetype	= MOVETYPE_FLY;
+	pev->takedamage	= DAMAGE_NO;
+	pev->health		= 1;
+
+	m_fPathBlocked	= FALSE;// obstacles will be detected
+	m_flFieldOfView	= 0.2;
+
+	//SET_MODEL(ENT(pev), "models/aflock.mdl");
+	SET_MODEL(ENT(pev), "models/boid.mdl");
+
+//	UTIL_SetSize(pev, Vector(0,0,0), Vector(0,0,0));
+	UTIL_SetSize(pev, Vector(-5,-5,0), Vector(5,5,2));
+}
+
+//=========================================================
+//=========================================================
+void CFlockingFlyer :: BoidAdvanceFrame ( )
+{
+	float flapspeed = (pev->speed - pev->armorvalue) / AFLOCK_ACCELERATE;
+	pev->armorvalue = pev->armorvalue * .8 + pev->speed * .2;
+
+	if (flapspeed < 0) flapspeed = -flapspeed;
+	if (flapspeed < 0.25) flapspeed = 0.25;
+	if (flapspeed > 1.9) flapspeed = 1.9;
+
+	pev->framerate = flapspeed;
+
+	// lean
+	pev->avelocity.x = - (pev->angles.x + flapspeed * 5);
+
+	// bank
+	pev->avelocity.z = - (pev->angles.z + pev->avelocity.y);
+
+	// pev->framerate		= flapspeed;
+	StudioFrameAdvance( 0.1 );
+}
+
+//=========================================================
+//=========================================================
+void CFlockingFlyer :: IdleThink( void )
+{
+	pev->nextthink = gpGlobals->time + 0.2;
+
+	// see if there's a client in the same pvs as the monster
+	if ( !FNullEnt( FIND_CLIENT_IN_PVS( edict() ) ) )
+	{
+		SetThink( &CFlockingFlyer::Start );
+		pev->nextthink = gpGlobals->time + 0.1;
+	}
+}
+
+//=========================================================
+// Start - player enters the pvs, so get things going.
+//=========================================================
+void CFlockingFlyer :: Start( void )
+{
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	if ( IsLeader() )
+	{
+		SetThink( &CFlockingFlyer::FlockLeaderThink );
+	}
+	else
+	{
+		SetThink( &CFlockingFlyer::FlockFollowerThink );
+	}
+
+/*
+	Vector	vecTakeOff;
+	vecTakeOff = Vector ( 0 , 0 , 0 );
+
+	vecTakeOff.z = 50 + RANDOM_FLOAT ( 0, 100 );
+	vecTakeOff.x = 20 - RANDOM_FLOAT ( 0, 40);
+	vecTakeOff.y = 20 - RANDOM_FLOAT ( 0, 40);
+
+	pev->velocity = vecTakeOff;
+
+
+	pev->speed = pev->velocity.Length();
+	pev->sequence = 0;
+*/
+	SetActivity ( ACT_FLY );
+	ResetSequenceInfo( );
+	BoidAdvanceFrame( );
+
+	pev->speed = AFLOCK_FLY_SPEED;// no delay!
+}
+
+//=========================================================
+// Leader boid calls this to form a flock from surrounding boids
+//=========================================================
+void CFlockingFlyer :: FormFlock( void )
+{
+	if ( !InSquad() )
+	{
+		// I am my own leader
+		m_pSquadLeader = this;
+		m_pSquadNext = NULL;
+		int squadCount = 1;
+
+		CBaseEntity *pEntity = NULL;
+		
+		while ((pEntity = UTIL_FindEntityInSphere( pEntity, pev->origin, AFLOCK_MAX_RECRUIT_RADIUS )) != NULL)
+		{
+			CBaseMonster *pRecruit = pEntity->MyMonsterPointer( );
+
+			if ( pRecruit && pRecruit != this && pRecruit->IsAlive() && !pRecruit->m_pCine )
+			{
+				// Can we recruit this guy?
+				if ( FClassnameIs ( pRecruit->pev, "monster_flyer" ) )
+				{
+					squadCount++;
+					SquadAdd( (CFlockingFlyer *)pRecruit );
+				}
+			}
+		}
+	}
+
+	SetThink( &CFlockingFlyer::IdleThink );// now that flock is formed, go to idle and wait for a player to come along.
+	pev->nextthink = gpGlobals->time;
+}
+ 
+//=========================================================
+// Searches for boids that are too close and pushes them away
+//=========================================================
+void CFlockingFlyer :: SpreadFlock( )
+{
+	Vector		vecDir;
+	float		flSpeed;// holds vector magnitude while we fiddle with the direction
+	
+	CFlockingFlyer *pList = m_pSquadLeader;
+	while ( pList )
+	{
+		if ( pList != this && ( pev->origin - pList->pev->origin ).Length() <= AFLOCK_TOO_CLOSE )
+		{
+			// push the other away
+			vecDir = ( pList->pev->origin - pev->origin );
+			vecDir = vecDir.Normalize();
+
+			// store the magnitude of the other boid's velocity, and normalize it so we
+			// can average in a course that points away from the leader.
+			flSpeed = pList->pev->velocity.Length();
+			pList->pev->velocity = pList->pev->velocity.Normalize();
+			pList->pev->velocity = ( pList->pev->velocity + vecDir ) * 0.5;
+			pList->pev->velocity = pList->pev->velocity * flSpeed;
+		}
+
+		pList = pList->m_pSquadNext;
+	}
+}
+
+//=========================================================
+// Alters the caller's course if he's too close to others 
+//
+// This function should **ONLY** be called when Caller's velocity is normalized!!
+//=========================================================
+void CFlockingFlyer :: SpreadFlock2 ( )
+{
+	Vector		vecDir;
+	
+	CFlockingFlyer *pList = m_pSquadLeader;
+	while ( pList )
+	{
+		if ( pList != this && ( pev->origin - pList->pev->origin ).Length() <= AFLOCK_TOO_CLOSE )
+		{
+			vecDir = ( pev->origin - pList->pev->origin );
+			vecDir = vecDir.Normalize();
+
+			pev->velocity = (pev->velocity + vecDir);
+		}
+
+		pList = pList->m_pSquadNext;
+	}
+}
+
+//=========================================================
+// FBoidPathBlocked - returns TRUE if there is an obstacle ahead
+//=========================================================
+BOOL CFlockingFlyer :: FPathBlocked( )
+{
+	TraceResult		tr;
+	Vector			vecDist;// used for general measurements
+	Vector			vecDir;// used for general measurements
+	BOOL			fBlocked;
+
+	if ( m_flFakeBlockedTime > gpGlobals->time )
+	{
+		m_flLastBlockedTime = gpGlobals->time;
+		return TRUE;
+	}
+
+	// use VELOCITY, not angles, not all boids point the direction they are flying
+	//vecDir = UTIL_VecToAngles( pevBoid->velocity );
+	UTIL_MakeVectors ( pev->angles );
+
+	fBlocked = FALSE;// assume the way ahead is clear
+
+	// check for obstacle ahead
+	UTIL_TraceLine(pev->origin, pev->origin + gpGlobals->v_forward * AFLOCK_CHECK_DIST, ignore_monsters, ENT(pev), &tr);
+	if (tr.flFraction != 1.0)
+	{
+		m_flLastBlockedTime = gpGlobals->time;
+		fBlocked = TRUE;
+	}
+
+	// extra wide checks
+	UTIL_TraceLine(pev->origin + gpGlobals->v_right * 12, pev->origin + gpGlobals->v_right * 12 + gpGlobals->v_forward * AFLOCK_CHECK_DIST, ignore_monsters, ENT(pev), &tr);
+	if (tr.flFraction != 1.0)
+	{
+		m_flLastBlockedTime = gpGlobals->time;
+		fBlocked = TRUE;
+	}
+
+	UTIL_TraceLine(pev->origin - gpGlobals->v_right * 12, pev->origin - gpGlobals->v_right * 12 + gpGlobals->v_forward * AFLOCK_CHECK_DIST, ignore_monsters, ENT(pev), &tr);
+	if (tr.flFraction != 1.0)
+	{
+		m_flLastBlockedTime = gpGlobals->time;
+		fBlocked = TRUE;
+	}
+
+	if ( !fBlocked && gpGlobals->time - m_flLastBlockedTime > 6 )
+	{
+		// not blocked, and it's been a few seconds since we've actually been blocked.
+		m_flFakeBlockedTime = gpGlobals->time + RANDOM_LONG(1, 3); 
+	}
+
+	return	fBlocked;
+}
+
+
+//=========================================================
+// Leader boids use this think every tenth
+//=========================================================
+void CFlockingFlyer :: FlockLeaderThink( void )
+{
+	TraceResult		tr;
+	Vector			vecDist;// used for general measurements
+	Vector			vecDir;// used for general measurements
+	int				cProcessed = 0;// keep track of how many other boids we've processed 
+	float			flLeftSide;
+	float			flRightSide;
+	
+
+	pev->nextthink = gpGlobals->time + 0.1;
+	
+	UTIL_MakeVectors ( pev->angles );
+
+	// is the way ahead clear?
+	if ( !FPathBlocked () )
+	{
+		// if the boid is turning, stop the trend.
+		if ( m_fTurning )
+		{
+			m_fTurning = FALSE;
+			pev->avelocity.y = 0;
+		}
+
+		m_fPathBlocked = FALSE;
+
+		if (pev->speed <= AFLOCK_FLY_SPEED )
+			pev->speed+= 5;
+
+		pev->velocity = gpGlobals->v_forward * pev->speed;
+
+		BoidAdvanceFrame( );
+
+		return;
+	}
+	
+	// IF we get this far in the function, the leader's path is blocked!
+	m_fPathBlocked = TRUE;
+
+	if ( !m_fTurning)// something in the way and boid is not already turning to avoid
+	{
+		// measure clearance on left and right to pick the best dir to turn
+		UTIL_TraceLine(pev->origin, pev->origin + gpGlobals->v_right * AFLOCK_CHECK_DIST, ignore_monsters, ENT(pev), &tr);
+		vecDist = (tr.vecEndPos - pev->origin);
+		flRightSide = vecDist.Length();
+
+		UTIL_TraceLine(pev->origin, pev->origin - gpGlobals->v_right * AFLOCK_CHECK_DIST, ignore_monsters, ENT(pev), &tr);
+		vecDist = (tr.vecEndPos - pev->origin);
+		flLeftSide = vecDist.Length();
+
+		// turn right if more clearance on right side
+		if ( flRightSide > flLeftSide )
+		{
+			pev->avelocity.y = -AFLOCK_TURN_RATE;
+			m_fTurning = TRUE;
+		}
+		// default to left turn :)
+		else if ( flLeftSide > flRightSide )
+		{
+			pev->avelocity.y = AFLOCK_TURN_RATE;
+			m_fTurning = TRUE;
+		}
+		else
+		{
+			// equidistant. Pick randomly between left and right.
+			m_fTurning = TRUE;
+
+			if ( RANDOM_LONG( 0, 1 ) == 0 )
+			{
+				pev->avelocity.y = AFLOCK_TURN_RATE;
+			}
+			else
+			{
+				pev->avelocity.y = -AFLOCK_TURN_RATE;
+			}
+		}
+	}
+	SpreadFlock( );
+
+	pev->velocity = gpGlobals->v_forward * pev->speed;
+	
+	// check and make sure we aren't about to plow into the ground, don't let it happen
+	UTIL_TraceLine(pev->origin, pev->origin - gpGlobals->v_up * 16, ignore_monsters, ENT(pev), &tr);
+	if (tr.flFraction != 1.0 && pev->velocity.z < 0 )
+		pev->velocity.z = 0;
+
+	// maybe it did, though.
+	if ( FBitSet (pev->flags, FL_ONGROUND) )
+	{
+		UTIL_SetOrigin (pev, pev->origin + Vector ( 0 , 0 , 1 ) );
+		pev->velocity.z = 0;
+	}
+
+	if ( m_flFlockNextSoundTime < gpGlobals->time )
+	{
+		MakeSound();
+		m_flFlockNextSoundTime = gpGlobals->time + RANDOM_FLOAT( 1, 3 );
+	}
+
+	BoidAdvanceFrame( );
+	
+	return;
+}
+
+//=========================================================
+// follower boids execute this code when flocking
+//=========================================================
+void CFlockingFlyer :: FlockFollowerThink( void )	
+{
+	TraceResult		tr;
+	Vector			vecDist;
+	Vector			vecDir;
+	Vector			vecDirToLeader;
+	float			flDistToLeader;
+
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	if ( IsLeader() || !InSquad() )
+	{
+		// the leader has been killed and this flyer suddenly finds himself the leader. 
+		SetThink ( &CFlockingFlyer::FlockLeaderThink );
+		return;
+	}
+
+	vecDirToLeader = ( m_pSquadLeader->pev->origin - pev->origin );
+	flDistToLeader = vecDirToLeader.Length();
+	
+	// match heading with leader
+	pev->angles = m_pSquadLeader->pev->angles;
+
+	//
+	// We can see the leader, so try to catch up to it
+	//
+	if ( FInViewCone ( m_pSquadLeader ) )
+	{
+		// if we're too far away, speed up
+		if ( flDistToLeader > AFLOCK_TOO_FAR )
+		{
+			m_flGoalSpeed = m_pSquadLeader->pev->velocity.Length() * 1.5;
+		}
+
+		// if we're too close, slow down
+		else if ( flDistToLeader < AFLOCK_TOO_CLOSE )
+		{
+			m_flGoalSpeed = m_pSquadLeader->pev->velocity.Length() * 0.5;
+		}
+	}
+	else
+	{
+		// wait up! the leader isn't out in front, so we slow down to let him pass
+		m_flGoalSpeed = m_pSquadLeader->pev->velocity.Length() * 0.5;
+	}
+
+	SpreadFlock2();
+
+	pev->speed = pev->velocity.Length();
+	pev->velocity = pev->velocity.Normalize();
+
+	// if we are too far from leader, average a vector towards it into our current velocity
+	if ( flDistToLeader > AFLOCK_TOO_FAR )
+	{
+		vecDirToLeader = vecDirToLeader.Normalize();
+		pev->velocity = (pev->velocity + vecDirToLeader) * 0.5; 	
+	}
+
+	// clamp speeds and handle acceleration
+	if ( m_flGoalSpeed > AFLOCK_FLY_SPEED * 2 )
+	{
+		m_flGoalSpeed  = AFLOCK_FLY_SPEED * 2;
+	}
+
+	if ( pev->speed < m_flGoalSpeed )
+	{
+		pev->speed += AFLOCK_ACCELERATE;
+	}
+	else if ( pev->speed > m_flGoalSpeed )
+	{
+		pev->speed -= AFLOCK_ACCELERATE;
+	}
+
+	pev->velocity = pev->velocity * pev->speed;
+
+	BoidAdvanceFrame( );
+}
+
+/*	
+	// Is this boid's course blocked?
+	if ( FBoidPathBlocked (pev) )
+	{
+		// course is still blocked from last time. Just keep flying along adjusted 
+		// velocity
+		if ( m_fCourseAdjust )
+		{
+			pev->velocity = m_vecAdjustedVelocity * pev->speed;
+			return;
+		}
+		else // set course adjust flag and calculate adjusted velocity
+		{
+			m_fCourseAdjust = TRUE;
+			
+			// use VELOCITY, not angles, not all boids point the direction they are flying
+			//vecDir = UTIL_VecToAngles( pev->velocity );
+			//UTIL_MakeVectors ( vecDir );
+
+			UTIL_MakeVectors ( pev->angles );
+
+			// measure clearance on left and right to pick the best dir to turn
+			UTIL_TraceLine(pev->origin, pev->origin + gpGlobals->v_right * AFLOCK_CHECK_DIST, ignore_monsters, ENT(pev), &tr);
+			vecDist = (tr.vecEndPos - pev->origin);
+			flRightSide = vecDist.Length();
+
+			UTIL_TraceLine(pev->origin, pev->origin - gpGlobals->v_right * AFLOCK_CHECK_DIST, ignore_monsters, ENT(pev), &tr);
+			vecDist = (tr.vecEndPos - pev->origin);
+			flLeftSide = vecDist.Length();
+
+			// slide right if more clearance on right side
+			if ( flRightSide > flLeftSide )
+			{
+				m_vecAdjustedVelocity = gpGlobals->v_right;
+			}
+			// else slide left
+			else
+			{
+				m_vecAdjustedVelocity = gpGlobals->v_right * -1;
+			}
+		}
+		return;
+	}
+
+	// if we make it this far, boids path is CLEAR!
+	m_fCourseAdjust = FALSE;
+*/
+	
+
+//=========================================================
+//
+// SquadUnlink(), Unlink the squad pointers.
+//
+//=========================================================
+void CFlockingFlyer :: SquadUnlink( void )
+{
+	m_pSquadLeader = NULL;
+	m_pSquadNext	= NULL;
+}
+
+//=========================================================
+//
+// SquadAdd(), add pAdd to my squad
+//
+//=========================================================
+void CFlockingFlyer :: SquadAdd( CFlockingFlyer *pAdd )
+{
+	ASSERT( pAdd!=NULL );
+	ASSERT( !pAdd->InSquad() );
+	ASSERT( this->IsLeader() );
+
+	pAdd->m_pSquadNext = m_pSquadNext;
+	m_pSquadNext = pAdd;
+	pAdd->m_pSquadLeader = this;
+}
+//=========================================================
+//
+// SquadRemove(), remove pRemove from my squad.
+// If I am pRemove, promote m_pSquadNext to leader
+//
+//=========================================================
+void CFlockingFlyer :: SquadRemove( CFlockingFlyer *pRemove )
+{
+	ASSERT( pRemove!=NULL );
+	ASSERT( this->IsLeader() );
+	ASSERT( pRemove->m_pSquadLeader == this );
+
+	if ( SquadCount() > 2 )
+	{
+		// Removing the leader, promote m_pSquadNext to leader
+		if ( pRemove == this )
+		{
+			CFlockingFlyer *pLeader = m_pSquadNext;
+			
+			// copy the enemy LKP to the new leader
+			pLeader->m_vecEnemyLKP = m_vecEnemyLKP;
+
+			if ( pLeader )
+			{
+				CFlockingFlyer *pList = pLeader;
+
+				while ( pList )
+				{
+					pList->m_pSquadLeader = pLeader;
+					pList = pList->m_pSquadNext;
+				}
+
+			}
+			SquadUnlink();
+		}
+		else	// removing a node
+		{
+			CFlockingFlyer *pList = this;
+
+			// Find the node before pRemove
+			while ( pList->m_pSquadNext != pRemove )
+			{
+				// assert to test valid list construction
+				ASSERT( pList->m_pSquadNext != NULL );
+				pList = pList->m_pSquadNext;
+			}
+			// List validity
+			ASSERT( pList->m_pSquadNext == pRemove );
+
+			// Relink without pRemove
+			pList->m_pSquadNext = pRemove->m_pSquadNext;
+
+			// Unlink pRemove
+			pRemove->SquadUnlink();
+		}
+	}
+	else
+		SquadDisband();
+}
+//=========================================================
+//
+// SquadCount(), return the number of members of this squad
+// callable from leaders & followers
+//
+//=========================================================
+int CFlockingFlyer :: SquadCount( void )
+{
+	CFlockingFlyer *pList = m_pSquadLeader;
+	int squadCount = 0;
+	while ( pList )
+	{
+		squadCount++;
+		pList = pList->m_pSquadNext;
+	}
+
+	return squadCount;
+}
+
+//=========================================================
+//
+// SquadDisband(), Unlink all squad members
+//
+//=========================================================
+void CFlockingFlyer :: SquadDisband( void )
+{
+	CFlockingFlyer *pList = m_pSquadLeader;
+	CFlockingFlyer *pNext;
+
+	while ( pList )
+	{
+		pNext = pList->m_pSquadNext;
+		pList->SquadUnlink();
+		pList = pNext;
+	}
+}
diff --git a/main/source/dlls/agrunt.cpp b/main/source/dlls/agrunt.cpp
new file mode 100644
index 00000000..5c60c459
--- /dev/null
+++ b/main/source/dlls/agrunt.cpp
@@ -0,0 +1,1177 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// Agrunt - Dominant, warlike alien grunt monster
+//=========================================================
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"schedule.h"
+#include	"squadmonster.h"
+#include	"weapons.h"
+#include	"soundent.h"
+#include	"hornet.h"
+
+//=========================================================
+// monster-specific schedule types
+//=========================================================
+enum
+{
+	SCHED_AGRUNT_SUPPRESS = LAST_COMMON_SCHEDULE + 1,
+	SCHED_AGRUNT_THREAT_DISPLAY,
+};
+
+//=========================================================
+// monster-specific tasks
+//=========================================================
+enum 
+{
+	TASK_AGRUNT_SETUP_HIDE_ATTACK = LAST_COMMON_TASK + 1,
+	TASK_AGRUNT_GET_PATH_TO_ENEMY_CORPSE,
+};
+
+int iAgruntMuzzleFlash;
+
+//=========================================================
+// Monster's Anim Events Go Here
+//=========================================================
+#define		AGRUNT_AE_HORNET1	( 1 )
+#define		AGRUNT_AE_HORNET2	( 2 )
+#define		AGRUNT_AE_HORNET3	( 3 )
+#define		AGRUNT_AE_HORNET4	( 4 )
+#define		AGRUNT_AE_HORNET5	( 5 )
+// some events are set up in the QC file that aren't recognized by the code yet.
+#define		AGRUNT_AE_PUNCH		( 6 )
+#define		AGRUNT_AE_BITE		( 7 )
+
+#define		AGRUNT_AE_LEFT_FOOT	 ( 10 )
+#define		AGRUNT_AE_RIGHT_FOOT ( 11 )
+
+#define		AGRUNT_AE_LEFT_PUNCH ( 12 )
+#define		AGRUNT_AE_RIGHT_PUNCH ( 13 )
+
+
+
+#define		AGRUNT_MELEE_DIST	100
+
+class CAGrunt : public CSquadMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void SetYawSpeed ( void );
+	int  Classify ( void );
+	int  ISoundMask ( void );
+	void HandleAnimEvent( MonsterEvent_t *pEvent );
+	void SetObjectCollisionBox( void )
+	{
+		pev->absmin = pev->origin + Vector( -32, -32, 0 );
+		pev->absmax = pev->origin + Vector( 32, 32, 85 );
+	}
+
+	Schedule_t* GetSchedule ( void );
+	Schedule_t* GetScheduleOfType ( int Type );
+	BOOL FCanCheckAttacks ( void );
+	BOOL CheckMeleeAttack1 ( float flDot, float flDist );
+	BOOL CheckRangeAttack1 ( float flDot, float flDist );
+	void StartTask ( Task_t *pTask );
+	void AlertSound( void );
+	void DeathSound ( void );
+	void PainSound ( void );
+	void AttackSound ( void );
+	void PrescheduleThink ( void );
+	void TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType);
+	int IRelationship( CBaseEntity *pTarget );
+	void StopTalking ( void );
+	BOOL ShouldSpeak( void );
+	CUSTOM_SCHEDULES;
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	static const char *pAttackHitSounds[];
+	static const char *pAttackMissSounds[];
+	static const char *pAttackSounds[];
+	static const char *pDieSounds[];
+	static const char *pPainSounds[];
+	static const char *pIdleSounds[];
+	static const char *pAlertSounds[];
+
+	BOOL	m_fCanHornetAttack;
+	float	m_flNextHornetAttackCheck;
+
+	float m_flNextPainTime;
+
+	// three hacky fields for speech stuff. These don't really need to be saved.
+	float	m_flNextSpeakTime;
+	float	m_flNextWordTime;
+	int		m_iLastWord;
+};
+LINK_ENTITY_TO_CLASS( monster_alien_grunt, CAGrunt );
+
+TYPEDESCRIPTION	CAGrunt::m_SaveData[] = 
+{
+	DEFINE_FIELD( CAGrunt, m_fCanHornetAttack, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CAGrunt, m_flNextHornetAttackCheck, FIELD_TIME ),
+	DEFINE_FIELD( CAGrunt, m_flNextPainTime, FIELD_TIME ),
+	DEFINE_FIELD( CAGrunt, m_flNextSpeakTime, FIELD_TIME ),
+	DEFINE_FIELD( CAGrunt, m_flNextWordTime, FIELD_TIME ),
+	DEFINE_FIELD( CAGrunt, m_iLastWord, FIELD_INTEGER ),
+};
+
+IMPLEMENT_SAVERESTORE( CAGrunt, CSquadMonster );
+
+const char *CAGrunt::pAttackHitSounds[] = 
+{
+	"zombie/claw_strike1.wav",
+	"zombie/claw_strike2.wav",
+	"zombie/claw_strike3.wav",
+};
+
+const char *CAGrunt::pAttackMissSounds[] = 
+{
+	"zombie/claw_miss1.wav",
+	"zombie/claw_miss2.wav",
+};
+
+const char *CAGrunt::pAttackSounds[] =
+{
+	"agrunt/ag_attack1.wav",
+	"agrunt/ag_attack2.wav",
+	"agrunt/ag_attack3.wav",
+};
+
+const char *CAGrunt::pDieSounds[] =
+{
+	"agrunt/ag_die1.wav",
+	"agrunt/ag_die4.wav",
+	"agrunt/ag_die5.wav",
+};
+
+const char *CAGrunt::pPainSounds[] =
+{
+	"agrunt/ag_pain1.wav",
+	"agrunt/ag_pain2.wav",
+	"agrunt/ag_pain3.wav",
+	"agrunt/ag_pain4.wav",
+	"agrunt/ag_pain5.wav",
+};
+
+const char *CAGrunt::pIdleSounds[] =
+{
+	"agrunt/ag_idle1.wav",
+	"agrunt/ag_idle2.wav",
+	"agrunt/ag_idle3.wav",
+	"agrunt/ag_idle4.wav",
+};
+
+const char *CAGrunt::pAlertSounds[] =
+{
+	"agrunt/ag_alert1.wav",
+	"agrunt/ag_alert3.wav",
+	"agrunt/ag_alert4.wav",
+	"agrunt/ag_alert5.wav",
+};
+
+//=========================================================
+// IRelationship - overridden because Human Grunts are 
+// Alien Grunt's nemesis.
+//=========================================================
+int CAGrunt::IRelationship ( CBaseEntity *pTarget )
+{
+	if ( FClassnameIs( pTarget->pev, "monster_human_grunt" ) )
+	{
+		return R_NM;
+	}
+
+	return CSquadMonster :: IRelationship( pTarget );
+}
+
+//=========================================================
+// ISoundMask 
+//=========================================================
+int CAGrunt :: ISoundMask ( void )
+{
+	return	bits_SOUND_WORLD	|
+			bits_SOUND_COMBAT	|
+			bits_SOUND_PLAYER	|
+			bits_SOUND_DANGER;
+}
+
+//=========================================================
+// TraceAttack
+//=========================================================
+void CAGrunt :: TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType)
+{
+	if ( ptr->iHitgroup == 10 && (bitsDamageType & (DMG_BULLET | DMG_SLASH | DMG_CLUB)))
+	{
+		// hit armor
+		if ( pev->dmgtime != gpGlobals->time || (RANDOM_LONG(0,10) < 1) )
+		{
+			UTIL_Ricochet( ptr->vecEndPos, RANDOM_FLOAT( 1, 2) );
+			pev->dmgtime = gpGlobals->time;
+		}
+
+		if ( RANDOM_LONG( 0, 1 ) == 0 )
+		{
+			Vector vecTracerDir = vecDir;
+
+			vecTracerDir.x += RANDOM_FLOAT( -0.3, 0.3 );
+			vecTracerDir.y += RANDOM_FLOAT( -0.3, 0.3 );
+			vecTracerDir.z += RANDOM_FLOAT( -0.3, 0.3 );
+
+			vecTracerDir = vecTracerDir * -512;
+
+			MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, ptr->vecEndPos );
+			WRITE_BYTE( TE_TRACER );
+				WRITE_COORD( ptr->vecEndPos.x );
+				WRITE_COORD( ptr->vecEndPos.y );
+				WRITE_COORD( ptr->vecEndPos.z );
+
+				WRITE_COORD( vecTracerDir.x );
+				WRITE_COORD( vecTracerDir.y );
+				WRITE_COORD( vecTracerDir.z );
+			MESSAGE_END();
+		}
+
+		flDamage -= 20;
+		if (flDamage <= 0)
+			flDamage = 0.1;// don't hurt the monster much, but allow bits_COND_LIGHT_DAMAGE to be generated
+	}
+	else
+	{
+		SpawnBlood(ptr->vecEndPos, BloodColor(), flDamage);// a little surface blood.
+		TraceBleed( flDamage, vecDir, ptr, bitsDamageType );
+	}
+
+	AddMultiDamage( pevAttacker, this, flDamage, bitsDamageType );
+}
+
+//=========================================================
+// StopTalking - won't speak again for 10-20 seconds.
+//=========================================================
+void CAGrunt::StopTalking( void )
+{
+	m_flNextWordTime = m_flNextSpeakTime = gpGlobals->time + 10 + RANDOM_LONG(0, 10);
+}
+
+//=========================================================
+// ShouldSpeak - Should this agrunt be talking?
+//=========================================================
+BOOL CAGrunt::ShouldSpeak( void )
+{
+	if ( m_flNextSpeakTime > gpGlobals->time )
+	{
+		// my time to talk is still in the future.
+		return FALSE;
+	}
+
+	if ( pev->spawnflags & SF_MONSTER_GAG )
+	{
+		if ( m_MonsterState != MONSTERSTATE_COMBAT )
+		{
+			// if gagged, don't talk outside of combat.
+			// if not going to talk because of this, put the talk time 
+			// into the future a bit, so we don't talk immediately after 
+			// going into combat
+			m_flNextSpeakTime = gpGlobals->time + 3;
+			return FALSE;
+		}
+	}
+
+	return TRUE;
+}
+
+//=========================================================
+// PrescheduleThink 
+//=========================================================
+void CAGrunt :: PrescheduleThink ( void )
+{
+	if ( ShouldSpeak() )
+	{
+		if ( m_flNextWordTime < gpGlobals->time )
+		{
+			int num = -1;
+
+			do
+			{
+				num = RANDOM_LONG(0,ARRAYSIZE(pIdleSounds)-1);
+			} while( num == m_iLastWord );
+
+			m_iLastWord = num;
+
+			// play a new sound
+			EMIT_SOUND ( ENT(pev), CHAN_VOICE, pIdleSounds[ num ], 1.0, ATTN_NORM );
+
+			// is this word our last?
+			if ( RANDOM_LONG( 1, 10 ) <= 1 )
+			{
+				// stop talking.
+				StopTalking();
+			}
+			else
+			{
+				m_flNextWordTime = gpGlobals->time + RANDOM_FLOAT( 0.5, 1 );
+			}
+		}
+	}
+}
+
+//=========================================================
+// DieSound
+//=========================================================
+void CAGrunt :: DeathSound ( void )
+{
+	StopTalking();
+
+	EMIT_SOUND ( ENT(pev), CHAN_VOICE, pDieSounds[RANDOM_LONG(0,ARRAYSIZE(pDieSounds)-1)], 1.0, ATTN_NORM );
+}
+
+//=========================================================
+// AlertSound
+//=========================================================
+void CAGrunt :: AlertSound ( void )
+{
+	StopTalking();
+
+	EMIT_SOUND ( ENT(pev), CHAN_VOICE, pAlertSounds[RANDOM_LONG(0,ARRAYSIZE(pAlertSounds)-1)], 1.0, ATTN_NORM );
+}
+
+//=========================================================
+// AttackSound
+//=========================================================
+void CAGrunt :: AttackSound ( void )
+{
+	StopTalking();
+
+	EMIT_SOUND ( ENT(pev), CHAN_VOICE, pAttackSounds[RANDOM_LONG(0,ARRAYSIZE(pAttackSounds)-1)], 1.0, ATTN_NORM );
+}
+
+//=========================================================
+// PainSound
+//=========================================================
+void CAGrunt :: PainSound ( void )
+{
+	if ( m_flNextPainTime > gpGlobals->time )
+	{
+		return;
+	}
+
+	m_flNextPainTime = gpGlobals->time + 0.6;
+
+	StopTalking();
+
+	EMIT_SOUND ( ENT(pev), CHAN_VOICE, pPainSounds[RANDOM_LONG(0,ARRAYSIZE(pPainSounds)-1)], 1.0, ATTN_NORM );
+}
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CAGrunt :: Classify ( void )
+{
+	return	CLASS_ALIEN_MILITARY;
+}
+
+//=========================================================
+// SetYawSpeed - allows each sequence to have a different
+// turn rate associated with it.
+//=========================================================
+void CAGrunt :: SetYawSpeed ( void )
+{
+	int ys;
+
+	switch ( m_Activity )
+	{
+	case ACT_TURN_LEFT:
+	case ACT_TURN_RIGHT:
+		ys = 110;
+		break;
+	default:			ys = 100;
+	}
+
+	pev->yaw_speed = ys;
+}
+
+//=========================================================
+// HandleAnimEvent - catches the monster-specific messages
+// that occur when tagged animation frames are played.
+//
+// Returns number of events handled, 0 if none.
+//=========================================================
+void CAGrunt :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	switch( pEvent->event )
+	{
+	case AGRUNT_AE_HORNET1:
+	case AGRUNT_AE_HORNET2:
+	case AGRUNT_AE_HORNET3:
+	case AGRUNT_AE_HORNET4:
+	case AGRUNT_AE_HORNET5:
+		{
+			// m_vecEnemyLKP should be center of enemy body
+			Vector vecArmPos, vecArmDir;
+			Vector vecDirToEnemy;
+			Vector angDir;
+
+			if (HasConditions( bits_COND_SEE_ENEMY))
+			{
+				vecDirToEnemy = ( ( m_vecEnemyLKP ) - pev->origin );
+				angDir = UTIL_VecToAngles( vecDirToEnemy );
+				vecDirToEnemy = vecDirToEnemy.Normalize();
+			}
+			else
+			{
+				angDir = pev->angles;
+				UTIL_MakeAimVectors( angDir );
+				vecDirToEnemy = gpGlobals->v_forward;
+			}
+
+			pev->effects = EF_MUZZLEFLASH;
+
+			// make angles +-180
+			if (angDir.x > 180)
+			{
+				angDir.x = angDir.x - 360;
+			}
+
+			SetBlending( 0, angDir.x );
+			GetAttachment( 0, vecArmPos, vecArmDir );
+
+			vecArmPos = vecArmPos + vecDirToEnemy * 32;
+			MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, vecArmPos );
+				WRITE_BYTE( TE_SPRITE );
+				WRITE_COORD( vecArmPos.x );	// pos
+				WRITE_COORD( vecArmPos.y );	
+				WRITE_COORD( vecArmPos.z );	
+				WRITE_SHORT( iAgruntMuzzleFlash );		// model
+				WRITE_BYTE( 6 );				// size * 10
+				WRITE_BYTE( 128 );			// brightness
+			MESSAGE_END();
+
+			CBaseEntity *pHornet = CBaseEntity::Create( "hornet", vecArmPos, UTIL_VecToAngles( vecDirToEnemy ), edict() );
+			UTIL_MakeVectors ( pHornet->pev->angles );
+			pHornet->pev->velocity = gpGlobals->v_forward * 300;
+
+			CBaseMonster *pHornetMonster = pHornet->MyMonsterPointer();
+
+			if ( pHornetMonster )
+			{
+				pHornetMonster->m_hEnemy = m_hEnemy;
+			}
+		}
+		break;
+
+	case AGRUNT_AE_LEFT_FOOT:
+		switch (RANDOM_LONG(0,1))
+		{
+		// left foot
+		case 0:	EMIT_SOUND_DYN ( ENT(pev), CHAN_BODY, "player/pl_ladder2.wav", 1, ATTN_NORM, 0, 70 );	break;
+		case 1:	EMIT_SOUND_DYN ( ENT(pev), CHAN_BODY, "player/pl_ladder4.wav", 1, ATTN_NORM, 0, 70 );	break;
+		}
+		break;
+	case AGRUNT_AE_RIGHT_FOOT:
+		// right foot
+		switch (RANDOM_LONG(0,1))
+		{
+		case 0:	EMIT_SOUND_DYN ( ENT(pev), CHAN_BODY, "player/pl_ladder1.wav", 1, ATTN_NORM, 0, 70 );	break;
+		case 1:	EMIT_SOUND_DYN ( ENT(pev), CHAN_BODY, "player/pl_ladder3.wav", 1, ATTN_NORM, 0 ,70);	break;
+		}
+		break;
+
+	case AGRUNT_AE_LEFT_PUNCH:
+		{
+			CBaseEntity *pHurt = CheckTraceHullAttack( AGRUNT_MELEE_DIST, gSkillData.agruntDmgPunch, DMG_CLUB );
+			
+			if ( pHurt )
+			{
+				pHurt->pev->punchangle.y = -25;
+				pHurt->pev->punchangle.x = 8;
+
+				// OK to use gpGlobals without calling MakeVectors, cause CheckTraceHullAttack called it above.
+				if ( pHurt->IsPlayer() )
+				{
+					// this is a player. Knock him around.
+					pHurt->pev->velocity = pHurt->pev->velocity + gpGlobals->v_right * 250;
+				}
+
+				EMIT_SOUND_DYN ( ENT(pev), CHAN_WEAPON, pAttackHitSounds[ RANDOM_LONG(0,ARRAYSIZE(pAttackHitSounds)-1) ], 1.0, ATTN_NORM, 0, 100 + RANDOM_LONG(-5,5) );
+
+				Vector vecArmPos, vecArmAng;
+				GetAttachment( 0, vecArmPos, vecArmAng );
+				SpawnBlood(vecArmPos, pHurt->BloodColor(), 25);// a little surface blood.
+			}
+			else
+			{
+				// Play a random attack miss sound
+				EMIT_SOUND_DYN ( ENT(pev), CHAN_WEAPON, pAttackMissSounds[ RANDOM_LONG(0,ARRAYSIZE(pAttackMissSounds)-1) ], 1.0, ATTN_NORM, 0, 100 + RANDOM_LONG(-5,5) );
+			}
+		}
+		break;
+
+	case AGRUNT_AE_RIGHT_PUNCH:
+		{
+			CBaseEntity *pHurt = CheckTraceHullAttack( AGRUNT_MELEE_DIST, gSkillData.agruntDmgPunch, DMG_CLUB );
+
+			if ( pHurt )
+			{
+				pHurt->pev->punchangle.y = 25;
+				pHurt->pev->punchangle.x = 8;
+
+				// OK to use gpGlobals without calling MakeVectors, cause CheckTraceHullAttack called it above.
+				if ( pHurt->IsPlayer() )
+				{
+					// this is a player. Knock him around.
+					pHurt->pev->velocity = pHurt->pev->velocity + gpGlobals->v_right * -250;
+				}
+
+				EMIT_SOUND_DYN ( ENT(pev), CHAN_WEAPON, pAttackHitSounds[ RANDOM_LONG(0,ARRAYSIZE(pAttackHitSounds)-1) ], 1.0, ATTN_NORM, 0, 100 + RANDOM_LONG(-5,5) );
+
+				Vector vecArmPos, vecArmAng;
+				GetAttachment( 0, vecArmPos, vecArmAng );
+				SpawnBlood(vecArmPos, pHurt->BloodColor(), 25);// a little surface blood.
+			}
+			else
+			{
+				// Play a random attack miss sound
+				EMIT_SOUND_DYN ( ENT(pev), CHAN_WEAPON, pAttackMissSounds[ RANDOM_LONG(0,ARRAYSIZE(pAttackMissSounds)-1) ], 1.0, ATTN_NORM, 0, 100 + RANDOM_LONG(-5,5) );
+			}
+		}
+		break;
+
+	default:
+		CSquadMonster::HandleAnimEvent( pEvent );
+		break;
+	}
+}
+
+//=========================================================
+// Spawn
+//=========================================================
+void CAGrunt :: Spawn()
+{
+	Precache( );
+
+	SET_MODEL(ENT(pev), "models/agrunt.mdl");
+	UTIL_SetSize(pev, Vector(-32, -32, 0), Vector(32, 32, 64));
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_STEP;
+	m_bloodColor		= BLOOD_COLOR_GREEN;
+	pev->effects		= 0;
+	pev->health			= gSkillData.agruntHealth;
+	m_flFieldOfView		= 0.2;// indicates the width of this monster's forward view cone ( as a dotproduct result )
+	m_MonsterState		= MONSTERSTATE_NONE;
+	m_afCapability		= 0;
+	m_afCapability		|= bits_CAP_SQUAD;
+
+	m_HackedGunPos		= Vector( 24, 64, 48 );
+
+	m_flNextSpeakTime	= m_flNextWordTime = gpGlobals->time + 10 + RANDOM_LONG(0, 10);
+
+
+	MonsterInit();
+}
+
+//=========================================================
+// Precache - precaches all resources this monster needs
+//=========================================================
+void CAGrunt :: Precache()
+{
+	int i;
+
+	PRECACHE_MODEL("models/agrunt.mdl");
+
+	for ( i = 0; i < ARRAYSIZE( pAttackHitSounds ); i++ )
+		PRECACHE_SOUND((char *)pAttackHitSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pAttackMissSounds ); i++ )
+		PRECACHE_SOUND((char *)pAttackMissSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pIdleSounds ); i++ )
+		PRECACHE_SOUND((char *)pIdleSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pDieSounds ); i++ )
+		PRECACHE_SOUND((char *)pDieSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pPainSounds ); i++ )
+		PRECACHE_SOUND((char *)pPainSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pAttackSounds ); i++ )
+		PRECACHE_SOUND((char *)pAttackSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pAlertSounds ); i++ )
+		PRECACHE_SOUND((char *)pAlertSounds[i]);
+
+
+	PRECACHE_SOUND( "hassault/hw_shoot1.wav" );
+
+	iAgruntMuzzleFlash = PRECACHE_MODEL( "sprites/muz4.spr" );
+
+	UTIL_PrecacheOther( "hornet" );
+}	
+	
+//=========================================================
+// AI Schedules Specific to this monster
+//=========================================================
+
+//=========================================================
+// Fail Schedule
+//=========================================================
+Task_t	tlAGruntFail[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE },
+	{ TASK_WAIT,				(float)2		},
+	{ TASK_WAIT_PVS,			(float)0		},
+};
+
+Schedule_t	slAGruntFail[] =
+{
+	{
+		tlAGruntFail,
+		ARRAYSIZE ( tlAGruntFail ),
+		bits_COND_CAN_RANGE_ATTACK1	|
+		bits_COND_CAN_MELEE_ATTACK1,
+		0,
+		"AGrunt Fail"
+	},
+};
+
+//=========================================================
+// Combat Fail Schedule
+//=========================================================
+Task_t	tlAGruntCombatFail[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE },
+	{ TASK_WAIT_FACE_ENEMY,		(float)2		},
+	{ TASK_WAIT_PVS,			(float)0		},
+};
+
+Schedule_t	slAGruntCombatFail[] =
+{
+	{
+		tlAGruntCombatFail,
+		ARRAYSIZE ( tlAGruntCombatFail ),
+		bits_COND_CAN_RANGE_ATTACK1	|
+		bits_COND_CAN_MELEE_ATTACK1,
+		0,
+		"AGrunt Combat Fail"
+	},
+};
+
+//=========================================================
+// Standoff schedule. Used in combat when a monster is 
+// hiding in cover or the enemy has moved out of sight. 
+// Should we look around in this schedule?
+//=========================================================
+Task_t	tlAGruntStandoff[] =
+{
+	{ TASK_STOP_MOVING,				(float)0					},
+	{ TASK_SET_ACTIVITY,			(float)ACT_IDLE				},
+	{ TASK_WAIT_FACE_ENEMY,			(float)2					},
+};
+
+Schedule_t slAGruntStandoff[] = 
+{
+	{
+		tlAGruntStandoff,
+		ARRAYSIZE ( tlAGruntStandoff ),
+		bits_COND_CAN_RANGE_ATTACK1		|
+		bits_COND_CAN_MELEE_ATTACK1		|
+		bits_COND_SEE_ENEMY				|
+		bits_COND_NEW_ENEMY				|
+		bits_COND_HEAR_SOUND,
+		
+		bits_SOUND_DANGER,
+		"Agrunt Standoff"
+	}
+};
+
+//=========================================================
+// Suppress
+//=========================================================
+Task_t	tlAGruntSuppressHornet[] =
+{
+	{ TASK_STOP_MOVING,		(float)0		},
+	{ TASK_RANGE_ATTACK1,	(float)0		},
+};
+
+Schedule_t slAGruntSuppress[] =
+{
+	{
+		tlAGruntSuppressHornet,
+		ARRAYSIZE ( tlAGruntSuppressHornet ),
+		0,
+		0,
+		"AGrunt Suppress Hornet",
+	},
+};
+
+//=========================================================
+// primary range attacks
+//=========================================================
+Task_t	tlAGruntRangeAttack1[] =
+{
+	{ TASK_STOP_MOVING,			(float)0		},
+	{ TASK_FACE_ENEMY,			(float)0		},
+	{ TASK_RANGE_ATTACK1,		(float)0		},
+};
+
+Schedule_t	slAGruntRangeAttack1[] =
+{
+	{ 
+		tlAGruntRangeAttack1,
+		ARRAYSIZE ( tlAGruntRangeAttack1 ), 
+		bits_COND_NEW_ENEMY			|
+		bits_COND_ENEMY_DEAD		|
+		bits_COND_HEAVY_DAMAGE,
+		
+		0,
+		"AGrunt Range Attack1"
+	},
+};
+
+
+Task_t	tlAGruntHiddenRangeAttack1[] =
+{
+	{ TASK_SET_FAIL_SCHEDULE,			(float)SCHED_STANDOFF },
+	{ TASK_AGRUNT_SETUP_HIDE_ATTACK,	0				},
+	{ TASK_STOP_MOVING,					0				},
+	{ TASK_FACE_IDEAL,					0				},
+	{ TASK_RANGE_ATTACK1_NOTURN,		(float)0		},
+};
+
+Schedule_t	slAGruntHiddenRangeAttack[] =
+{
+	{ 
+		tlAGruntHiddenRangeAttack1,
+		ARRAYSIZE ( tlAGruntHiddenRangeAttack1 ), 
+		bits_COND_NEW_ENEMY			|
+		bits_COND_HEAVY_DAMAGE		|
+		bits_COND_HEAR_SOUND,
+		
+		bits_SOUND_DANGER,
+		"AGrunt Hidden Range Attack1"
+	},
+};
+
+//=========================================================
+// Take cover from enemy! Tries lateral cover before node 
+// cover! 
+//=========================================================
+Task_t	tlAGruntTakeCoverFromEnemy[] =
+{
+	{ TASK_STOP_MOVING,				(float)0					},
+	{ TASK_WAIT,					(float)0.2					},
+	{ TASK_FIND_COVER_FROM_ENEMY,	(float)0					},
+	{ TASK_RUN_PATH,				(float)0					},
+	{ TASK_WAIT_FOR_MOVEMENT,		(float)0					},
+	{ TASK_REMEMBER,				(float)bits_MEMORY_INCOVER	},
+	{ TASK_FACE_ENEMY,				(float)0					},
+};
+
+Schedule_t	slAGruntTakeCoverFromEnemy[] =
+{
+	{ 
+		tlAGruntTakeCoverFromEnemy,
+		ARRAYSIZE ( tlAGruntTakeCoverFromEnemy ), 
+		bits_COND_NEW_ENEMY,
+		0,
+		"AGruntTakeCoverFromEnemy"
+	},
+};
+
+//=========================================================
+// Victory dance!
+//=========================================================
+Task_t	tlAGruntVictoryDance[] =
+{
+	{ TASK_STOP_MOVING,						(float)0					},
+	{ TASK_SET_FAIL_SCHEDULE,				(float)SCHED_AGRUNT_THREAT_DISPLAY	},
+	{ TASK_WAIT,							(float)0.2					},
+	{ TASK_AGRUNT_GET_PATH_TO_ENEMY_CORPSE,	(float)0					},
+	{ TASK_WALK_PATH,						(float)0					},
+	{ TASK_WAIT_FOR_MOVEMENT,				(float)0					},
+	{ TASK_FACE_ENEMY,						(float)0					},
+	{ TASK_PLAY_SEQUENCE,					(float)ACT_CROUCH			},
+	{ TASK_PLAY_SEQUENCE,					(float)ACT_VICTORY_DANCE	},
+	{ TASK_PLAY_SEQUENCE,					(float)ACT_VICTORY_DANCE	},
+	{ TASK_PLAY_SEQUENCE,					(float)ACT_STAND			},
+	{ TASK_PLAY_SEQUENCE,					(float)ACT_THREAT_DISPLAY	},
+	{ TASK_PLAY_SEQUENCE,					(float)ACT_CROUCH			},
+	{ TASK_PLAY_SEQUENCE,					(float)ACT_VICTORY_DANCE	},
+	{ TASK_PLAY_SEQUENCE,					(float)ACT_VICTORY_DANCE	},
+	{ TASK_PLAY_SEQUENCE,					(float)ACT_VICTORY_DANCE	},
+	{ TASK_PLAY_SEQUENCE,					(float)ACT_VICTORY_DANCE	},
+	{ TASK_PLAY_SEQUENCE,					(float)ACT_VICTORY_DANCE	},
+	{ TASK_PLAY_SEQUENCE,					(float)ACT_STAND			},
+};
+
+Schedule_t	slAGruntVictoryDance[] =
+{
+	{ 
+		tlAGruntVictoryDance,
+		ARRAYSIZE ( tlAGruntVictoryDance ), 
+		bits_COND_NEW_ENEMY		|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE,
+		0,
+		"AGruntVictoryDance"
+	},
+};
+
+//=========================================================
+//=========================================================
+Task_t	tlAGruntThreatDisplay[] =
+{
+	{ TASK_STOP_MOVING,			(float)0					},
+	{ TASK_FACE_ENEMY,			(float)0					},
+	{ TASK_PLAY_SEQUENCE,		(float)ACT_THREAT_DISPLAY	},
+};
+
+Schedule_t	slAGruntThreatDisplay[] =
+{
+	{ 
+		tlAGruntThreatDisplay,
+		ARRAYSIZE ( tlAGruntThreatDisplay ), 
+		bits_COND_NEW_ENEMY			|
+		bits_COND_LIGHT_DAMAGE		|
+		bits_COND_HEAVY_DAMAGE,
+		
+		bits_SOUND_PLAYER			|
+		bits_SOUND_COMBAT			|
+		bits_SOUND_WORLD,
+		"AGruntThreatDisplay"
+	},
+};
+
+DEFINE_CUSTOM_SCHEDULES( CAGrunt )
+{
+	slAGruntFail,
+	slAGruntCombatFail,
+	slAGruntStandoff,
+	slAGruntSuppress,
+	slAGruntRangeAttack1,
+	slAGruntHiddenRangeAttack,
+	slAGruntTakeCoverFromEnemy,
+	slAGruntVictoryDance,
+	slAGruntThreatDisplay,
+};
+
+IMPLEMENT_CUSTOM_SCHEDULES( CAGrunt, CSquadMonster );
+
+//=========================================================
+// FCanCheckAttacks - this is overridden for alien grunts
+// because they can use their smart weapons against unseen
+// enemies. Base class doesn't attack anyone it can't see.
+//=========================================================
+BOOL CAGrunt :: FCanCheckAttacks ( void )
+{
+	if ( !HasConditions( bits_COND_ENEMY_TOOFAR ) )
+	{
+		return TRUE;
+	}
+	else
+	{
+		return FALSE;
+	}
+}
+
+//=========================================================
+// CheckMeleeAttack1 - alien grunts zap the crap out of 
+// any enemy that gets too close. 
+//=========================================================
+BOOL CAGrunt :: CheckMeleeAttack1 ( float flDot, float flDist )
+{
+	if ( HasConditions ( bits_COND_SEE_ENEMY ) && flDist <= AGRUNT_MELEE_DIST && flDot >= 0.6 && m_hEnemy != NULL )
+	{
+		return TRUE;
+	}
+	return FALSE;
+}
+
+//=========================================================
+// CheckRangeAttack1 
+//
+// !!!LATER - we may want to load balance this. Several
+// tracelines are done, so we may not want to do this every
+// server frame. Definitely not while firing. 
+//=========================================================
+BOOL CAGrunt :: CheckRangeAttack1 ( float flDot, float flDist )
+{
+	if ( gpGlobals->time < m_flNextHornetAttackCheck )
+	{
+		return m_fCanHornetAttack;
+	}
+
+	if ( HasConditions( bits_COND_SEE_ENEMY ) && flDist >= AGRUNT_MELEE_DIST && flDist <= 1024 && flDot >= 0.5 && NoFriendlyFire() )
+	{
+		TraceResult	tr;
+		Vector	vecArmPos, vecArmDir;
+
+		// verify that a shot fired from the gun will hit the enemy before the world.
+		// !!!LATER - we may wish to do something different for projectile weapons as opposed to instant-hit
+		UTIL_MakeVectors( pev->angles );
+		GetAttachment( 0, vecArmPos, vecArmDir );
+//		UTIL_TraceLine( vecArmPos, vecArmPos + gpGlobals->v_forward * 256, ignore_monsters, ENT(pev), &tr);
+		UTIL_TraceLine( vecArmPos, m_hEnemy->BodyTarget(vecArmPos), dont_ignore_monsters, ENT(pev), &tr);
+
+		if ( tr.flFraction == 1.0 || tr.pHit == m_hEnemy->edict() )
+		{
+			m_flNextHornetAttackCheck = gpGlobals->time + RANDOM_FLOAT( 2, 5 );
+			m_fCanHornetAttack = TRUE;
+			return m_fCanHornetAttack;
+		}
+	}
+	
+	m_flNextHornetAttackCheck = gpGlobals->time + 0.2;// don't check for half second if this check wasn't successful
+	m_fCanHornetAttack = FALSE;
+	return m_fCanHornetAttack;
+}
+
+//=========================================================
+// StartTask
+//=========================================================
+void CAGrunt :: StartTask ( Task_t *pTask )
+{
+	switch ( pTask->iTask )
+	{
+	case TASK_AGRUNT_GET_PATH_TO_ENEMY_CORPSE:
+		{
+			UTIL_MakeVectors( pev->angles );
+			if ( BuildRoute ( m_vecEnemyLKP - gpGlobals->v_forward * 50, bits_MF_TO_LOCATION, NULL ) )
+			{
+				TaskComplete();
+			}
+			else
+			{
+				ALERT ( at_aiconsole, "AGruntGetPathToEnemyCorpse failed!!\n" );
+				TaskFail();
+			}
+		}
+		break;
+
+	case TASK_AGRUNT_SETUP_HIDE_ATTACK:
+		// alien grunt shoots hornets back out into the open from a concealed location. 
+		// try to find a spot to throw that gives the smart weapon a good chance of finding the enemy.
+		// ideally, this spot is along a line that is perpendicular to a line drawn from the agrunt to the enemy.
+
+		CBaseMonster	*pEnemyMonsterPtr;
+
+		pEnemyMonsterPtr = m_hEnemy->MyMonsterPointer();
+
+		if ( pEnemyMonsterPtr )
+		{
+			Vector		vecCenter;
+			TraceResult	tr;
+			BOOL		fSkip;
+
+			fSkip = FALSE;
+			vecCenter = Center();
+
+			UTIL_VecToAngles( m_vecEnemyLKP - pev->origin );
+
+			UTIL_TraceLine( Center() + gpGlobals->v_forward * 128, m_vecEnemyLKP, ignore_monsters, ENT(pev), &tr);
+			if ( tr.flFraction == 1.0 )
+			{
+				MakeIdealYaw ( pev->origin + gpGlobals->v_right * 128 );
+				fSkip = TRUE;
+				TaskComplete();
+			}
+			
+			if ( !fSkip )
+			{
+				UTIL_TraceLine( Center() - gpGlobals->v_forward * 128, m_vecEnemyLKP, ignore_monsters, ENT(pev), &tr);
+				if ( tr.flFraction == 1.0 )
+				{
+					MakeIdealYaw ( pev->origin - gpGlobals->v_right * 128 );
+					fSkip = TRUE;
+					TaskComplete();
+				}
+			}
+			
+			if ( !fSkip )
+			{
+				UTIL_TraceLine( Center() + gpGlobals->v_forward * 256, m_vecEnemyLKP, ignore_monsters, ENT(pev), &tr);
+				if ( tr.flFraction == 1.0 )
+				{
+					MakeIdealYaw ( pev->origin + gpGlobals->v_right * 256 );
+					fSkip = TRUE;
+					TaskComplete();
+				}
+			}
+			
+			if ( !fSkip )
+			{
+				UTIL_TraceLine( Center() - gpGlobals->v_forward * 256, m_vecEnemyLKP, ignore_monsters, ENT(pev), &tr);
+				if ( tr.flFraction == 1.0 )
+				{
+					MakeIdealYaw ( pev->origin - gpGlobals->v_right * 256 );
+					fSkip = TRUE;
+					TaskComplete();
+				}
+			}
+			
+			if ( !fSkip )
+			{
+				TaskFail();
+			}
+		}
+		else
+		{
+			ALERT ( at_aiconsole, "AGRunt - no enemy monster ptr!!!\n" );
+			TaskFail();
+		}
+		break;
+
+	default:
+		CSquadMonster :: StartTask ( pTask );
+		break;
+	}
+}
+
+//=========================================================
+// GetSchedule - Decides which type of schedule best suits
+// the monster's current state and conditions. Then calls
+// monster's member function to get a pointer to a schedule
+// of the proper type.
+//=========================================================
+Schedule_t *CAGrunt :: GetSchedule ( void )
+{
+	if ( HasConditions(bits_COND_HEAR_SOUND) )
+	{
+		CSound *pSound;
+		pSound = PBestSound();
+
+		ASSERT( pSound != NULL );
+		if ( pSound && (pSound->m_iType & bits_SOUND_DANGER) )
+		{
+			// dangerous sound nearby!
+			return GetScheduleOfType( SCHED_TAKE_COVER_FROM_BEST_SOUND );
+		}
+	}
+
+	switch	( m_MonsterState )
+	{
+	case MONSTERSTATE_COMBAT:
+		{
+// dead enemy
+			if ( HasConditions( bits_COND_ENEMY_DEAD ) )
+			{
+				// call base class, all code to handle dead enemies is centralized there.
+				return CBaseMonster :: GetSchedule();
+			}
+
+			if ( HasConditions(bits_COND_NEW_ENEMY) )
+			{
+				return GetScheduleOfType( SCHED_WAKE_ANGRY );
+			}
+
+	// zap player!
+			if ( HasConditions ( bits_COND_CAN_MELEE_ATTACK1 ) )
+			{
+				AttackSound();// this is a total hack. Should be parto f the schedule
+				return GetScheduleOfType ( SCHED_MELEE_ATTACK1 );
+			}
+
+			if ( HasConditions ( bits_COND_HEAVY_DAMAGE ) )
+			{
+				return GetScheduleOfType( SCHED_SMALL_FLINCH );
+			}
+
+	// can attack
+			if ( HasConditions ( bits_COND_CAN_RANGE_ATTACK1 ) && OccupySlot ( bits_SLOTS_AGRUNT_HORNET ) )
+			{
+				return GetScheduleOfType ( SCHED_RANGE_ATTACK1 );
+			}
+
+			if ( OccupySlot ( bits_SLOT_AGRUNT_CHASE ) )
+			{
+				return GetScheduleOfType ( SCHED_CHASE_ENEMY );
+			}
+
+			return GetScheduleOfType ( SCHED_STANDOFF );
+		}
+	}
+
+	return CSquadMonster :: GetSchedule();
+}
+
+//=========================================================
+//=========================================================
+Schedule_t* CAGrunt :: GetScheduleOfType ( int Type ) 
+{
+	switch	( Type )
+	{
+	case SCHED_TAKE_COVER_FROM_ENEMY:
+		return &slAGruntTakeCoverFromEnemy[ 0 ];
+		break;
+	
+	case SCHED_RANGE_ATTACK1:
+		if ( HasConditions( bits_COND_SEE_ENEMY ) )
+		{
+			//normal attack
+			return &slAGruntRangeAttack1[ 0 ];
+		}
+		else
+		{
+			// attack an unseen enemy
+			// return &slAGruntHiddenRangeAttack[ 0 ];
+			return &slAGruntRangeAttack1[ 0 ];
+		}
+		break;
+
+	case SCHED_AGRUNT_THREAT_DISPLAY:
+		return &slAGruntThreatDisplay[ 0 ];
+		break;
+
+	case SCHED_AGRUNT_SUPPRESS:
+		return &slAGruntSuppress[ 0 ];
+		break;
+
+	case SCHED_STANDOFF:
+		return &slAGruntStandoff[ 0 ];
+		break;
+
+	case SCHED_VICTORY_DANCE:
+		return &slAGruntVictoryDance[ 0 ];
+		break;
+
+	case SCHED_FAIL:
+		// no fail schedule specified, so pick a good generic one.
+		{
+			if ( m_hEnemy != NULL )
+			{
+				// I have an enemy
+				// !!!LATER - what if this enemy is really far away and i'm chasing him?
+				// this schedule will make me stop, face his last known position for 2 
+				// seconds, and then try to move again
+				return &slAGruntCombatFail[ 0 ];
+			}
+
+			return &slAGruntFail[ 0 ];
+		}
+		break;
+
+	}
+
+	return CSquadMonster :: GetScheduleOfType( Type );
+}
+
diff --git a/main/source/dlls/airtank.cpp b/main/source/dlls/airtank.cpp
new file mode 100644
index 00000000..5559222a
--- /dev/null
+++ b/main/source/dlls/airtank.cpp
@@ -0,0 +1,118 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "player.h"
+
+class CAirtank : public CGrenade
+{
+	void Spawn( void );
+	void Precache( void );
+	void EXPORT TankThink( void );
+	void EXPORT TankTouch( CBaseEntity *pOther );
+	int	 BloodColor( void ) { return DONT_BLEED; };
+	void Killed( entvars_t *pevAttacker, int iGib );
+
+	virtual int		Save( CSave &save ); 
+	virtual int		Restore( CRestore &restore );
+	
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	int	 m_state;
+};
+
+
+LINK_ENTITY_TO_CLASS( item_airtank, CAirtank );
+TYPEDESCRIPTION	CAirtank::m_SaveData[] = 
+{
+	DEFINE_FIELD( CAirtank, m_state, FIELD_INTEGER ),
+};
+
+IMPLEMENT_SAVERESTORE( CAirtank, CGrenade );
+
+
+void CAirtank :: Spawn( void )
+{
+	Precache( );
+	// motor
+	pev->movetype = MOVETYPE_FLY;
+	pev->solid = SOLID_BBOX;
+
+	SET_MODEL(ENT(pev), "models/w_oxygen.mdl");
+	UTIL_SetSize(pev, Vector( -16, -16, 0), Vector(16, 16, 36));
+	UTIL_SetOrigin( pev, pev->origin );
+
+	SetTouch( TankTouch );
+	SetThink( TankThink );
+
+	pev->flags |= FL_MONSTER;
+	pev->takedamage		= DAMAGE_YES;
+	pev->health			= 20;
+	pev->dmg			= 50;
+	m_state				= 1;
+}
+
+void CAirtank::Precache( void )
+{
+	PRECACHE_MODEL("models/w_oxygen.mdl");
+	PRECACHE_SOUND("doors/aliendoor3.wav");
+}
+
+
+void CAirtank :: Killed( entvars_t *pevAttacker, int iGib )
+{
+	pev->owner = ENT( pevAttacker );
+
+	// UNDONE: this should make a big bubble cloud, not an explosion
+
+	Explode( pev->origin, Vector( 0, 0, -1 ) );
+}
+
+
+void CAirtank::TankThink( void )
+{
+	// Fire trigger
+	m_state = 1;
+	SUB_UseTargets( this, USE_TOGGLE, 0 );
+}
+
+
+void CAirtank::TankTouch( CBaseEntity *pOther )
+{
+	if ( !pOther->IsPlayer() )
+		return;
+
+	if (!m_state)
+	{
+		// "no oxygen" sound
+		EMIT_SOUND( ENT(pev), CHAN_BODY, "player/pl_swim2.wav", 1.0, ATTN_NORM );
+		return;
+	}
+		
+	// give player 12 more seconds of air
+	pOther->pev->air_finished = gpGlobals->time + 12;
+
+	// suit recharge sound
+	EMIT_SOUND( ENT(pev), CHAN_VOICE, "doors/aliendoor3.wav", 1.0, ATTN_NORM );
+
+	// recharge airtank in 30 seconds
+	pev->nextthink = gpGlobals->time + 30;
+	m_state = 0;
+	SUB_UseTargets( this, USE_TOGGLE, 1 );
+}
diff --git a/main/source/dlls/animating.cpp b/main/source/dlls/animating.cpp
new file mode 100644
index 00000000..f3638a1d
--- /dev/null
+++ b/main/source/dlls/animating.cpp
@@ -0,0 +1,324 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/*
+
+===== monsters.cpp ========================================================
+
+  Monster-related utility code
+
+*/
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "animation.h"
+#include "saverestore.h"
+
+TYPEDESCRIPTION	CBaseAnimating::m_SaveData[] = 
+{
+	DEFINE_FIELD( CBaseMonster, m_flFrameRate, FIELD_FLOAT ),
+	DEFINE_FIELD( CBaseMonster, m_flGroundSpeed, FIELD_FLOAT ),
+	DEFINE_FIELD( CBaseMonster, m_flLastEventCheck, FIELD_TIME ),
+	DEFINE_FIELD( CBaseMonster, m_fSequenceFinished, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CBaseMonster, m_fSequenceLoops, FIELD_BOOLEAN ),
+};
+
+IMPLEMENT_SAVERESTORE( CBaseAnimating, CBaseDelay );
+
+
+//=========================================================
+// StudioFrameAdvance - advance the animation frame up to the current time
+// if an flInterval is passed in, only advance animation that number of seconds
+//=========================================================
+float CBaseAnimating :: StudioFrameAdvance ( float flInterval )
+{
+	if (flInterval == 0.0)
+	{
+		flInterval = (gpGlobals->time - pev->animtime);
+		if (flInterval <= 0.001)
+		{
+			pev->animtime = gpGlobals->time;
+			return 0.0;
+		}
+	}
+	if (! pev->animtime)
+		flInterval = 0.0;
+	
+	pev->frame += flInterval * m_flFrameRate * pev->framerate;
+	pev->animtime = gpGlobals->time;
+
+	if (pev->frame < 0.0 || pev->frame >= 256.0) 
+	{
+		if (m_fSequenceLoops)
+			pev->frame -= (int)(pev->frame / 256.0) * 256.0;
+		else
+			pev->frame = (pev->frame < 0.0) ? 0 : 255;
+		m_fSequenceFinished = TRUE;	// just in case it wasn't caught in GetEvents
+	}
+
+	return flInterval;
+}
+
+//=========================================================
+// LookupActivity
+//=========================================================
+int CBaseAnimating :: LookupActivity ( int activity )
+{
+	ASSERT( activity != 0 );
+	void *pmodel = GET_MODEL_PTR( ENT(pev) );
+
+	return ::LookupActivity( pmodel, pev, activity );
+}
+
+//=========================================================
+// LookupActivityHeaviest
+//
+// Get activity with highest 'weight'
+//
+//=========================================================
+int CBaseAnimating :: LookupActivityHeaviest ( int activity )
+{
+	void *pmodel = GET_MODEL_PTR( ENT(pev) );
+
+	return ::LookupActivityHeaviest( pmodel, pev, activity );
+}
+
+//=========================================================
+//=========================================================
+int CBaseAnimating :: LookupSequence ( const char *label )
+{
+	void *pmodel = GET_MODEL_PTR( ENT(pev) );
+
+	return ::LookupSequence( pmodel, label );
+}
+
+const char* CBaseAnimating::LookupSequence(int inSequence)
+{
+	void *pmodel = GET_MODEL_PTR( ENT(pev) );
+	
+	return ::LookupSequence( pmodel, inSequence);
+}
+
+//=========================================================
+//=========================================================
+void CBaseAnimating :: ResetSequenceInfo ( )
+{
+	void *pmodel = GET_MODEL_PTR( ENT(pev) );
+
+	GetSequenceInfo( pmodel, pev, &m_flFrameRate, &m_flGroundSpeed );
+	m_fSequenceLoops = ((GetSequenceFlags() & STUDIO_LOOPING) != 0);
+	pev->animtime = gpGlobals->time;
+	pev->framerate = 1.0;
+	m_fSequenceFinished = FALSE;
+	m_flLastEventCheck = gpGlobals->time;
+}
+
+
+
+//=========================================================
+//=========================================================
+BOOL CBaseAnimating :: GetSequenceFlags( )
+{
+	void *pmodel = GET_MODEL_PTR( ENT(pev) );
+
+	return ::GetSequenceFlags( pmodel, pev );
+}
+
+//=========================================================
+// DispatchAnimEvents
+//=========================================================
+void CBaseAnimating :: DispatchAnimEvents ( float flInterval )
+{
+	MonsterEvent_t	event;
+
+	void *pmodel = GET_MODEL_PTR( ENT(pev) );
+
+	if ( !pmodel )
+	{
+		ALERT( at_aiconsole, "Gibbed monster is thinking!\n" );
+		return;
+	}
+
+	// FIXME: I have to do this or some events get missed, and this is probably causing the problem below
+	flInterval = 0.1;
+
+	// FIX: this still sometimes hits events twice
+	float flStart = pev->frame + (m_flLastEventCheck - pev->animtime) * m_flFrameRate * pev->framerate;
+	float flEnd = pev->frame + flInterval * m_flFrameRate * pev->framerate;
+	m_flLastEventCheck = pev->animtime + flInterval;
+
+	m_fSequenceFinished = FALSE;
+	if (flEnd >= 256 || flEnd <= 0.0) 
+		m_fSequenceFinished = TRUE;
+
+	int index = 0;
+
+	while ( (index = GetAnimationEvent( pmodel, pev, &event, flStart, flEnd, index ) ) != 0 )
+	{
+		HandleAnimEvent( &event );
+	}
+}
+
+
+//=========================================================
+//=========================================================
+float CBaseAnimating :: SetBoneController ( int iController, float flValue )
+{
+	void *pmodel = GET_MODEL_PTR( ENT(pev) );
+
+	return SetController( pmodel, pev, iController, flValue );
+}
+
+//=========================================================
+//=========================================================
+void CBaseAnimating :: InitBoneControllers ( void )
+{
+	void *pmodel = GET_MODEL_PTR( ENT(pev) );
+
+	SetController( pmodel, pev, 0, 0.0 );
+	SetController( pmodel, pev, 1, 0.0 );
+	SetController( pmodel, pev, 2, 0.0 );
+	SetController( pmodel, pev, 3, 0.0 );
+}
+
+//=========================================================
+//=========================================================
+float CBaseAnimating :: SetBlending ( int iBlender, float flValue )
+{
+	void *pmodel = GET_MODEL_PTR( ENT(pev) );
+
+	return ::SetBlending( pmodel, pev, iBlender, flValue );
+}
+
+//=========================================================
+//=========================================================
+void CBaseAnimating :: GetBonePosition ( int iBone, Vector &origin, Vector &angles )
+{
+	GET_BONE_POSITION( ENT(pev), iBone, origin, angles );
+}
+
+//=========================================================
+//=========================================================
+void CBaseAnimating :: GetAttachment ( int iAttachment, Vector &origin, Vector &angles )
+{
+	GET_ATTACHMENT( ENT(pev), iAttachment, origin, angles );
+}
+
+//=========================================================
+//=========================================================
+int CBaseAnimating :: FindTransition( int iEndingSequence, int iGoalSequence, int *piDir )
+{
+	void *pmodel = GET_MODEL_PTR( ENT(pev) );
+	
+	if (piDir == NULL)
+	{
+		int iDir;
+		int sequence = ::FindTransition( pmodel, iEndingSequence, iGoalSequence, &iDir );
+		if (iDir != 1)
+			return -1;
+		else
+			return sequence;
+	}
+
+	return ::FindTransition( pmodel, iEndingSequence, iGoalSequence, piDir );
+}
+
+//=========================================================
+//=========================================================
+void CBaseAnimating :: GetAutomovement( Vector &origin, Vector &angles, float flInterval )
+{
+
+}
+
+void CBaseAnimating :: SetBodygroup( int iGroup, int iValue )
+{
+	::SetBodygroup( GET_MODEL_PTR( ENT(pev) ), pev, iGroup, iValue );
+}
+
+int CBaseAnimating :: GetBodygroup( int iGroup )
+{
+	return ::GetBodygroup( GET_MODEL_PTR( ENT(pev) ), pev, iGroup );
+}
+
+
+int CBaseAnimating :: ExtractBbox( int sequence, float *mins, float *maxs )
+{
+	return ::ExtractBbox( GET_MODEL_PTR( ENT(pev) ), sequence, mins, maxs );
+}
+
+//=========================================================
+//=========================================================
+
+void CBaseAnimating :: SetSequenceBox( void )
+{
+	Vector mins, maxs;
+
+	// Get sequence bbox
+	if ( ExtractBbox( pev->sequence, mins, maxs ) )
+	{
+		// expand box for rotation
+		// find min / max for rotations
+		float yaw = pev->angles.y * (M_PI / 180.0);
+		
+		Vector xvector, yvector;
+		xvector.x = cos(yaw);
+		xvector.y = sin(yaw);
+		yvector.x = -sin(yaw);
+		yvector.y = cos(yaw);
+		Vector bounds[2];
+
+		bounds[0] = mins;
+		bounds[1] = maxs;
+		
+		Vector rmin( 9999, 9999, 9999 );
+		Vector rmax( -9999, -9999, -9999 );
+		Vector base, transformed;
+
+		for (int i = 0; i <= 1; i++ )
+		{
+			base.x = bounds[i].x;
+			for ( int j = 0; j <= 1; j++ )
+			{
+				base.y = bounds[j].y;
+				for ( int k = 0; k <= 1; k++ )
+				{
+					base.z = bounds[k].z;
+					
+				// transform the point
+					transformed.x = xvector.x*base.x + yvector.x*base.y;
+					transformed.y = xvector.y*base.x + yvector.y*base.y;
+					transformed.z = base.z;
+					
+					if (transformed.x < rmin.x)
+						rmin.x = transformed.x;
+					if (transformed.x > rmax.x)
+						rmax.x = transformed.x;
+					if (transformed.y < rmin.y)
+						rmin.y = transformed.y;
+					if (transformed.y > rmax.y)
+						rmax.y = transformed.y;
+					if (transformed.z < rmin.z)
+						rmin.z = transformed.z;
+					if (transformed.z > rmax.z)
+						rmax.z = transformed.z;
+				}
+			}
+		}
+		rmin.z = 0;
+		rmax.z = rmin.z + 1;
+		UTIL_SetSize( pev, rmin, rmax );
+	}
+}
+
diff --git a/main/source/dlls/animation.cpp b/main/source/dlls/animation.cpp
new file mode 100644
index 00000000..3bdd3026
--- /dev/null
+++ b/main/source/dlls/animation.cpp
@@ -0,0 +1,575 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "../common/nowin.h"
+
+typedef int BOOL;
+#define TRUE	 1	
+#define FALSE	0
+
+// hack into header files that we can ship
+typedef int qboolean;
+typedef unsigned char byte;
+#include "utils/common/mathlib.h"
+#include "const.h"
+#include "progdefs.h"
+#include "edict.h"
+#include "eiface.h"
+
+#include "studio.h"
+
+#ifndef ACTIVITY_H
+#include "activity.h"
+#endif
+
+#include "activitymap.h"
+
+#ifndef ANIMATION_H
+#include "animation.h"
+#endif
+
+#ifndef SCRIPTEVENT_H
+#include "scriptevent.h"
+#endif
+
+#ifndef ENGINECALLBACK_H
+#include "enginecallback.h"
+#endif
+
+#include "mod/AvHServerVariables.h"
+
+extern globalvars_t				*gpGlobals;
+
+#pragma warning( disable : 4244 )
+
+
+int ExtractBbox( void *pmodel, int sequence, float *mins, float *maxs )
+{
+	studiohdr_t *pstudiohdr;
+	
+	pstudiohdr = (studiohdr_t *)pmodel;
+	if (! pstudiohdr)
+		return 0;
+
+	mstudioseqdesc_t	*pseqdesc;
+
+	pseqdesc = (mstudioseqdesc_t *)((byte *)pstudiohdr + pstudiohdr->seqindex);
+	
+	mins[0] = pseqdesc[ sequence ].bbmin[0];
+	mins[1] = pseqdesc[ sequence ].bbmin[1];
+	mins[2] = pseqdesc[ sequence ].bbmin[2];
+
+	maxs[0] = pseqdesc[ sequence ].bbmax[0];
+	maxs[1] = pseqdesc[ sequence ].bbmax[1];
+	maxs[2] = pseqdesc[ sequence ].bbmax[2];
+
+	return 1;
+}
+
+
+int LookupActivity( void *pmodel, entvars_t *pev, int activity )
+{
+	studiohdr_t *pstudiohdr;
+	
+	pstudiohdr = (studiohdr_t *)pmodel;
+	if (! pstudiohdr)
+		return 0;
+
+	mstudioseqdesc_t	*pseqdesc;
+
+	pseqdesc = (mstudioseqdesc_t *)((byte *)pstudiohdr + pstudiohdr->seqindex);
+
+	int weighttotal = 0;
+	int seq = ACTIVITY_NOT_AVAILABLE;
+	for (int i = 0; i < pstudiohdr->numseq; i++)
+	{
+		if (pseqdesc[i].activity == activity)
+		{
+			weighttotal += pseqdesc[i].actweight;
+			if (!weighttotal || RANDOM_LONG(0,weighttotal-1) < pseqdesc[i].actweight)
+				seq = i;
+		}
+	}
+
+	return seq;
+}
+
+
+int LookupActivityHeaviest( void *pmodel, entvars_t *pev, int activity )
+{
+	studiohdr_t *pstudiohdr;
+	
+	pstudiohdr = (studiohdr_t *)pmodel;
+	if ( !pstudiohdr )
+		return 0;
+
+	mstudioseqdesc_t	*pseqdesc;
+
+	pseqdesc = (mstudioseqdesc_t *)((byte *)pstudiohdr + pstudiohdr->seqindex);
+
+	int weight = 0;
+	int seq = ACTIVITY_NOT_AVAILABLE;
+	for (int i = 0; i < pstudiohdr->numseq; i++)
+	{
+		if (pseqdesc[i].activity == activity)
+		{
+			if ( pseqdesc[i].actweight > weight )
+			{
+				weight = pseqdesc[i].actweight;
+				seq = i;
+			}
+		}
+	}
+
+	return seq;
+}
+
+void GetEyePosition ( void *pmodel, float *vecEyePosition )
+{
+	studiohdr_t *pstudiohdr;
+	
+	pstudiohdr = (studiohdr_t *)pmodel;
+
+	if ( !pstudiohdr )
+	{
+		ALERT ( at_console, "GetEyePosition() Can't get pstudiohdr ptr!\n" );
+		return;
+	}
+
+	VectorCopy ( pstudiohdr->eyeposition, vecEyePosition );
+}
+
+int LookupSequence( void *pmodel, const char *label )
+{
+	studiohdr_t *pstudiohdr;
+	
+	pstudiohdr = (studiohdr_t *)pmodel;
+	if (! pstudiohdr)
+		return 0;
+
+	mstudioseqdesc_t	*pseqdesc;
+
+	pseqdesc = (mstudioseqdesc_t *)((byte *)pstudiohdr + pstudiohdr->seqindex);
+
+	for (int i = 0; i < pstudiohdr->numseq; i++)
+	{
+		if (stricmp( pseqdesc[i].label, label ) == 0)
+			return i;
+	}
+
+	//if(GetGameRules()->GetIsTesting())
+	if(CVAR_GET_FLOAT(kvTesting) > 0)
+	{
+		char theMessage[256];
+		sprintf(theMessage, "%s%s\n", "Couldn't find animation: ", label);
+		ALERT(at_console, theMessage);
+	}
+
+	return -1;
+}
+
+const char* LookupSequence( void *pmodel, int inSequence)
+{
+	const char* theSequenceName = NULL;
+
+	studiohdr_t *pstudiohdr;
+	
+	pstudiohdr = (studiohdr_t *)pmodel;
+	if (pstudiohdr)
+	{
+		mstudioseqdesc_t* pseqdesc = (mstudioseqdesc_t *)((byte *)pstudiohdr + pstudiohdr->seqindex);
+		
+		if((inSequence >= 0) && (inSequence < pstudiohdr->numseq))
+		{
+			theSequenceName = pseqdesc[inSequence].label;
+		}
+	}
+	
+	return theSequenceName;
+}
+
+int IsSoundEvent( int eventNumber )
+{
+	if ( eventNumber == SCRIPT_EVENT_SOUND || eventNumber == SCRIPT_EVENT_SOUND_VOICE )
+		return 1;
+	return 0;
+}
+
+
+void SequencePrecache( void *pmodel, const char *pSequenceName )
+{
+	int index = LookupSequence( pmodel, pSequenceName );
+	if ( index >= 0 )
+	{
+		studiohdr_t *pstudiohdr;
+	
+		pstudiohdr = (studiohdr_t *)pmodel;
+		if ( !pstudiohdr || index >= pstudiohdr->numseq )
+			return;
+
+		mstudioseqdesc_t	*pseqdesc;
+		mstudioevent_t		*pevent;
+
+		pseqdesc = (mstudioseqdesc_t *)((byte *)pstudiohdr + pstudiohdr->seqindex) + index;
+		pevent = (mstudioevent_t *)((byte *)pstudiohdr + pseqdesc->eventindex);
+
+		for (int i = 0; i < pseqdesc->numevents; i++)
+		{
+			// Don't send client-side events to the server AI
+			if ( pevent[i].event >= EVENT_CLIENT )
+				continue;
+
+			// UNDONE: Add a callback to check to see if a sound is precached yet and don't allocate a copy
+			// of it's name if it is.
+			if ( IsSoundEvent( pevent[i].event ) )
+			{
+				if ( !strlen(pevent[i].options) )
+				{
+					ALERT( at_error, "Bad sound event %d in sequence %s :: %s (sound is \"%s\")\n", pevent[i].event, pstudiohdr->name, pSequenceName, pevent[i].options );
+				}
+
+				PRECACHE_SOUND( (char *)(gpGlobals->pStringBase + ALLOC_STRING(pevent[i].options) ) );
+			}
+		}
+	}
+}
+
+float GetSequenceDuration( void *pmodel, entvars_t *pev)
+{
+	float theSequenceDuration = 0.0f;
+
+	studiohdr_t *pstudiohdr;
+	
+	pstudiohdr = (studiohdr_t *)pmodel;
+	if(pstudiohdr)
+	{
+		mstudioseqdesc_t	*pseqdesc;
+		
+		pseqdesc = (mstudioseqdesc_t *)((byte *)pstudiohdr + pstudiohdr->seqindex) + (int)pev->sequence;
+		
+		if(pseqdesc->fps > 0)
+		{
+			theSequenceDuration = (pseqdesc->numframes - 1)/pseqdesc->fps;
+		}
+	}
+	
+	return theSequenceDuration;
+}
+
+void GetSequenceInfo( void *pmodel, entvars_t *pev, float *pflFrameRate, float *pflGroundSpeed )
+{
+	studiohdr_t *pstudiohdr;
+	
+	pstudiohdr = (studiohdr_t *)pmodel;
+	if (! pstudiohdr)
+		return;
+
+	mstudioseqdesc_t	*pseqdesc;
+
+	if (pev->sequence >= pstudiohdr->numseq)
+	{
+		*pflFrameRate = 0.0;
+		*pflGroundSpeed = 0.0;
+		return;
+	}
+
+	pseqdesc = (mstudioseqdesc_t *)((byte *)pstudiohdr + pstudiohdr->seqindex) + (int)pev->sequence;
+
+	if (pseqdesc->numframes > 1)
+	{
+		*pflFrameRate = 256 * pseqdesc->fps / (pseqdesc->numframes - 1);
+		*pflGroundSpeed = sqrt( pseqdesc->linearmovement[0]*pseqdesc->linearmovement[0]+ pseqdesc->linearmovement[1]*pseqdesc->linearmovement[1]+ pseqdesc->linearmovement[2]*pseqdesc->linearmovement[2] );
+		*pflGroundSpeed = *pflGroundSpeed * pseqdesc->fps / (pseqdesc->numframes - 1);
+	}
+	else
+	{
+		*pflFrameRate = 256.0;
+		*pflGroundSpeed = 0.0;
+	}
+}
+
+
+int GetSequenceFlags( void *pmodel, entvars_t *pev )
+{
+	studiohdr_t *pstudiohdr;
+	
+	pstudiohdr = (studiohdr_t *)pmodel;
+	if ( !pstudiohdr || pev->sequence >= pstudiohdr->numseq )
+		return 0;
+
+	mstudioseqdesc_t	*pseqdesc;
+	pseqdesc = (mstudioseqdesc_t *)((byte *)pstudiohdr + pstudiohdr->seqindex) + (int)pev->sequence;
+
+	return pseqdesc->flags;
+}
+
+
+int GetAnimationEvent( void *pmodel, entvars_t *pev, MonsterEvent_t *pMonsterEvent, float flStart, float flEnd, int index )
+{
+	studiohdr_t *pstudiohdr;
+	
+	pstudiohdr = (studiohdr_t *)pmodel;
+	if ( !pstudiohdr || pev->sequence >= pstudiohdr->numseq || !pMonsterEvent )
+		return 0;
+
+	int events = 0;
+
+	mstudioseqdesc_t	*pseqdesc;
+	mstudioevent_t		*pevent;
+
+	pseqdesc = (mstudioseqdesc_t *)((byte *)pstudiohdr + pstudiohdr->seqindex) + (int)pev->sequence;
+	pevent = (mstudioevent_t *)((byte *)pstudiohdr + pseqdesc->eventindex);
+
+	if (pseqdesc->numevents == 0 || index > pseqdesc->numevents )
+		return 0;
+
+	if (pseqdesc->numframes > 1)
+	{
+		flStart *= (pseqdesc->numframes - 1) / 256.0;
+		flEnd *= (pseqdesc->numframes - 1) / 256.0;
+	}
+	else
+	{
+		flStart = 0;
+		flEnd = 1.0;
+	}
+
+	for (; index < pseqdesc->numevents; index++)
+	{
+		// Don't send client-side events to the server AI
+		if ( pevent[index].event >= EVENT_CLIENT )
+			continue;
+
+		if ( (pevent[index].frame >= flStart && pevent[index].frame < flEnd) || 
+			((pseqdesc->flags & STUDIO_LOOPING) && flEnd >= pseqdesc->numframes - 1 && pevent[index].frame < flEnd - pseqdesc->numframes + 1) )
+		{
+			pMonsterEvent->event = pevent[index].event;
+			pMonsterEvent->options = pevent[index].options;
+			return index + 1;
+		}
+	}
+	return 0;
+}
+
+float SetController( void *pmodel, entvars_t *pev, int iController, float flValue )
+{
+	studiohdr_t *pstudiohdr;
+	
+	pstudiohdr = (studiohdr_t *)pmodel;
+	if (! pstudiohdr)
+		return flValue;
+
+	mstudiobonecontroller_t	*pbonecontroller = (mstudiobonecontroller_t *)((byte *)pstudiohdr + pstudiohdr->bonecontrollerindex);
+
+	// find first controller that matches the index
+	for (int i = 0; i < pstudiohdr->numbonecontrollers; i++, pbonecontroller++)
+	{
+		if (pbonecontroller->index == iController)
+			break;
+	}
+	if (i >= pstudiohdr->numbonecontrollers)
+		return flValue;
+
+	// wrap 0..360 if it's a rotational controller
+
+	if (pbonecontroller->type & (STUDIO_XR | STUDIO_YR | STUDIO_ZR))
+	{
+		// ugly hack, invert value if end < start
+		if (pbonecontroller->end < pbonecontroller->start)
+			flValue = -flValue;
+
+		// does the controller not wrap?
+		if (pbonecontroller->start + 359.0 >= pbonecontroller->end)
+		{
+			if (flValue > ((pbonecontroller->start + pbonecontroller->end) / 2.0) + 180)
+				flValue = flValue - 360;
+			if (flValue < ((pbonecontroller->start + pbonecontroller->end) / 2.0) - 180)
+				flValue = flValue + 360;
+		}
+		else
+		{
+			if (flValue > 360)
+				flValue = flValue - (int)(flValue / 360.0) * 360.0;
+			else if (flValue < 0)
+				flValue = flValue + (int)((flValue / -360.0) + 1) * 360.0;
+		}
+	}
+
+	int setting = 255 * (flValue - pbonecontroller->start) / (pbonecontroller->end - pbonecontroller->start);
+
+	if (setting < 0) setting = 0;
+	if (setting > 255) setting = 255;
+	pev->controller[iController] = setting;
+
+	return setting * (1.0 / 255.0) * (pbonecontroller->end - pbonecontroller->start) + pbonecontroller->start;
+}
+
+
+float SetBlending( void *pmodel, entvars_t *pev, int iBlender, float flValue )
+{
+	studiohdr_t *pstudiohdr;
+	
+	pstudiohdr = (studiohdr_t *)pmodel;
+	if (! pstudiohdr)
+		return flValue;
+
+	mstudioseqdesc_t	*pseqdesc;
+
+	pseqdesc = (mstudioseqdesc_t *)((byte *)pstudiohdr + pstudiohdr->seqindex) + (int)pev->sequence;
+
+	if (pseqdesc->blendtype[iBlender] == 0)
+		return flValue;
+
+	if (pseqdesc->blendtype[iBlender] & (STUDIO_XR | STUDIO_YR | STUDIO_ZR))
+	{
+		// ugly hack, invert value if end < start
+		if (pseqdesc->blendend[iBlender] < pseqdesc->blendstart[iBlender])
+			flValue = -flValue;
+
+		// does the controller not wrap?
+		if (pseqdesc->blendstart[iBlender] + 359.0 >= pseqdesc->blendend[iBlender])
+		{
+			if (flValue > ((pseqdesc->blendstart[iBlender] + pseqdesc->blendend[iBlender]) / 2.0) + 180)
+				flValue = flValue - 360;
+			if (flValue < ((pseqdesc->blendstart[iBlender] + pseqdesc->blendend[iBlender]) / 2.0) - 180)
+				flValue = flValue + 360;
+		}
+	}
+
+	int setting = 255 * (flValue - pseqdesc->blendstart[iBlender]) / (pseqdesc->blendend[iBlender] - pseqdesc->blendstart[iBlender]);
+
+	if (setting < 0) setting = 0;
+	if (setting > 255) setting = 255;
+
+	pev->blending[iBlender] = setting;
+
+	return setting * (1.0 / 255.0) * (pseqdesc->blendend[iBlender] - pseqdesc->blendstart[iBlender]) + pseqdesc->blendstart[iBlender];
+}
+
+
+
+
+int FindTransition( void *pmodel, int iEndingAnim, int iGoalAnim, int *piDir )
+{
+	studiohdr_t *pstudiohdr;
+	
+	pstudiohdr = (studiohdr_t *)pmodel;
+	if (! pstudiohdr)
+		return iGoalAnim;
+
+	mstudioseqdesc_t	*pseqdesc;
+	pseqdesc = (mstudioseqdesc_t *)((byte *)pstudiohdr + pstudiohdr->seqindex);
+
+	// bail if we're going to or from a node 0
+	if (pseqdesc[iEndingAnim].entrynode == 0 || pseqdesc[iGoalAnim].entrynode == 0)
+	{
+		return iGoalAnim;
+	}
+
+	int	iEndNode;
+
+	// ALERT( at_console, "from %d to %d: ", pEndNode->iEndNode, pGoalNode->iStartNode );
+
+	if (*piDir > 0)
+	{
+		iEndNode = pseqdesc[iEndingAnim].exitnode;
+	}
+	else
+	{
+		iEndNode = pseqdesc[iEndingAnim].entrynode;
+	}
+
+	if (iEndNode == pseqdesc[iGoalAnim].entrynode)
+	{
+		*piDir = 1;
+		return iGoalAnim;
+	}
+
+	byte *pTransition = ((byte *)pstudiohdr + pstudiohdr->transitionindex);
+
+	int iInternNode = pTransition[(iEndNode-1)*pstudiohdr->numtransitions + (pseqdesc[iGoalAnim].entrynode-1)];
+
+	if (iInternNode == 0)
+		return iGoalAnim;
+
+	int i;
+
+	// look for someone going
+	for (i = 0; i < pstudiohdr->numseq; i++)
+	{
+		if (pseqdesc[i].entrynode == iEndNode && pseqdesc[i].exitnode == iInternNode)
+		{
+			*piDir = 1;
+			return i;
+		}
+		if (pseqdesc[i].nodeflags)
+		{
+			if (pseqdesc[i].exitnode == iEndNode && pseqdesc[i].entrynode == iInternNode)
+			{
+				*piDir = -1;
+				return i;
+			}
+		}
+	}
+
+	ALERT( at_console, "error in transition graph" );
+	return iGoalAnim;
+}
+
+void SetBodygroup( void *pmodel, entvars_t *pev, int iGroup, int iValue )
+{
+	studiohdr_t *pstudiohdr;
+	
+	pstudiohdr = (studiohdr_t *)pmodel;
+	if (! pstudiohdr)
+		return;
+
+	if (iGroup > pstudiohdr->numbodyparts)
+		return;
+
+	mstudiobodyparts_t *pbodypart = (mstudiobodyparts_t *)((byte *)pstudiohdr + pstudiohdr->bodypartindex) + iGroup;
+
+	if (iValue >= pbodypart->nummodels)
+		return;
+
+	int iCurrent = (pev->body / pbodypart->base) % pbodypart->nummodels;
+
+	pev->body = (pev->body - (iCurrent * pbodypart->base) + (iValue * pbodypart->base));
+}
+
+
+int GetBodygroup( void *pmodel, entvars_t *pev, int iGroup )
+{
+	studiohdr_t *pstudiohdr;
+	
+	pstudiohdr = (studiohdr_t *)pmodel;
+	if (! pstudiohdr)
+		return 0;
+
+	if (iGroup > pstudiohdr->numbodyparts)
+		return 0;
+
+	mstudiobodyparts_t *pbodypart = (mstudiobodyparts_t *)((byte *)pstudiohdr + pstudiohdr->bodypartindex) + iGroup;
+
+	if (pbodypart->nummodels <= 1)
+		return 0;
+
+	int iCurrent = (pev->body / pbodypart->base) % pbodypart->nummodels;
+
+	return iCurrent;
+}
\ No newline at end of file
diff --git a/main/source/dlls/animation.h b/main/source/dlls/animation.h
new file mode 100644
index 00000000..b5f1687f
--- /dev/null
+++ b/main/source/dlls/animation.h
@@ -0,0 +1,49 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef ANIMATION_H
+#define ANIMATION_H
+
+#define ACTIVITY_NOT_AVAILABLE		-1
+
+#ifndef MONSTEREVENT_H
+#include "monsterevent.h"
+#endif
+
+extern int IsSoundEvent( int eventNumber );
+
+int LookupActivity( void *pmodel, entvars_t *pev, int activity );
+int LookupActivityHeaviest( void *pmodel, entvars_t *pev, int activity );
+int LookupSequence( void *pmodel, const char *label );
+const char* LookupSequence( void *pmodel, int inSequence);
+float GetSequenceDuration( void *pmodel, entvars_t *pev );
+void GetSequenceInfo( void *pmodel, entvars_t *pev, float *pflFrameRate, float *pflGroundSpeed );
+int GetSequenceFlags( void *pmodel, entvars_t *pev );
+int LookupAnimationEvents( void *pmodel, entvars_t *pev, float flStart, float flEnd );
+float SetController( void *pmodel, entvars_t *pev, int iController, float flValue );
+float SetBlending( void *pmodel, entvars_t *pev, int iBlender, float flValue );
+void GetEyePosition( void *pmodel, float *vecEyePosition );
+void SequencePrecache( void *pmodel, const char *pSequenceName );
+int FindTransition( void *pmodel, int iEndingAnim, int iGoalAnim, int *piDir );
+void SetBodygroup( void *pmodel, entvars_t *pev, int iGroup, int iValue );
+int GetBodygroup( void *pmodel, entvars_t *pev, int iGroup );
+
+int GetAnimationEvent( void *pmodel, entvars_t *pev, MonsterEvent_t *pMonsterEvent, float flStart, float flEnd, int index );
+int ExtractBbox( void *pmodel, int sequence, float *mins, float *maxs );
+
+// From /engine/studio.h
+#define STUDIO_LOOPING		0x0001
+
+
+#endif	//ANIMATION_H
diff --git a/main/source/dlls/apache.cpp b/main/source/dlls/apache.cpp
new file mode 100644
index 00000000..86c82591
--- /dev/null
+++ b/main/source/dlls/apache.cpp
@@ -0,0 +1,1050 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+#ifndef OEM_BUILD
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "effects.h"
+
+extern DLL_GLOBAL int		g_iSkillLevel;
+
+#define SF_WAITFORTRIGGER	(0x04 | 0x40) // UNDONE: Fix!
+#define SF_NOWRECKAGE		0x08
+
+class CApache : public CBaseMonster
+{
+	int		Save( CSave &save );
+	int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	void Spawn( void );
+	void Precache( void );
+	int  Classify( void ) { return CLASS_HUMAN_MILITARY; };
+	int  BloodColor( void ) { return DONT_BLEED; }
+	void Killed( entvars_t *pevAttacker, int iGib );
+	void GibMonster( void );
+
+	void SetObjectCollisionBox( void )
+	{
+		pev->absmin = pev->origin + Vector( -300, -300, -172);
+		pev->absmax = pev->origin + Vector(300, 300, 8);
+	}
+
+	void EXPORT HuntThink( void );
+	void EXPORT FlyTouch( CBaseEntity *pOther );
+	void EXPORT CrashTouch( CBaseEntity *pOther );
+	void EXPORT DyingThink( void );
+	void EXPORT StartupUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void EXPORT NullThink( void );
+
+	void ShowDamage( void );
+	void Flight( void );
+	void FireRocket( void );
+	BOOL FireGun( void );
+	
+	int  TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType );
+	void TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType);
+
+	int m_iRockets;
+	float m_flForce;
+	float m_flNextRocket;
+
+	Vector m_vecTarget;
+	Vector m_posTarget;
+
+	Vector m_vecDesired;
+	Vector m_posDesired;
+
+	Vector m_vecGoal;
+
+	Vector m_angGun;
+	float m_flLastSeen;
+	float m_flPrevSeen;
+
+	int m_iSoundState; // don't save this
+
+	int m_iSpriteTexture;
+	int m_iExplode;
+	int m_iBodyGibs;
+
+	float m_flGoalSpeed;
+
+	int m_iDoSmokePuff;
+	CBeam *m_pBeam;
+};
+LINK_ENTITY_TO_CLASS( monster_apache, CApache );
+
+TYPEDESCRIPTION	CApache::m_SaveData[] = 
+{
+	DEFINE_FIELD( CApache, m_iRockets, FIELD_INTEGER ),
+	DEFINE_FIELD( CApache, m_flForce, FIELD_FLOAT ),
+	DEFINE_FIELD( CApache, m_flNextRocket, FIELD_TIME ),
+	DEFINE_FIELD( CApache, m_vecTarget, FIELD_VECTOR ),
+	DEFINE_FIELD( CApache, m_posTarget, FIELD_POSITION_VECTOR ),
+	DEFINE_FIELD( CApache, m_vecDesired, FIELD_VECTOR ),
+	DEFINE_FIELD( CApache, m_posDesired, FIELD_POSITION_VECTOR ),
+	DEFINE_FIELD( CApache, m_vecGoal, FIELD_VECTOR ),
+	DEFINE_FIELD( CApache, m_angGun, FIELD_VECTOR ),
+	DEFINE_FIELD( CApache, m_flLastSeen, FIELD_TIME ),
+	DEFINE_FIELD( CApache, m_flPrevSeen, FIELD_TIME ),
+//	DEFINE_FIELD( CApache, m_iSoundState, FIELD_INTEGER ),		// Don't save, precached
+//	DEFINE_FIELD( CApache, m_iSpriteTexture, FIELD_INTEGER ),
+//	DEFINE_FIELD( CApache, m_iExplode, FIELD_INTEGER ),
+//	DEFINE_FIELD( CApache, m_iBodyGibs, FIELD_INTEGER ),
+	DEFINE_FIELD( CApache, m_pBeam, FIELD_CLASSPTR ),
+	DEFINE_FIELD( CApache, m_flGoalSpeed, FIELD_FLOAT ),
+	DEFINE_FIELD( CApache, m_iDoSmokePuff, FIELD_INTEGER ),
+};
+IMPLEMENT_SAVERESTORE( CApache, CBaseMonster );
+
+
+void CApache :: Spawn( void )
+{
+	Precache( );
+	// motor
+	pev->movetype = MOVETYPE_FLY;
+	pev->solid = SOLID_BBOX;
+
+	SET_MODEL(ENT(pev), "models/apache.mdl");
+	UTIL_SetSize( pev, Vector( -32, -32, -64 ), Vector( 32, 32, 0 ) );
+	UTIL_SetOrigin( pev, pev->origin );
+
+	pev->flags |= FL_MONSTER;
+	pev->takedamage		= DAMAGE_AIM;
+	pev->health			= gSkillData.apacheHealth;
+
+	m_flFieldOfView = -0.707; // 270 degrees
+
+	pev->sequence = 0;
+	ResetSequenceInfo( );
+	pev->frame = RANDOM_LONG(0, 0xFF);
+
+	InitBoneControllers();
+
+	if (pev->spawnflags & SF_WAITFORTRIGGER)
+	{
+		SetUse( StartupUse );
+	}
+	else
+	{
+		SetThink( HuntThink );
+		SetTouch( FlyTouch );
+		pev->nextthink = gpGlobals->time + 1.0;
+	}
+
+	m_iRockets = 10;
+}
+
+
+void CApache::Precache( void )
+{
+	PRECACHE_MODEL("models/apache.mdl");
+
+	PRECACHE_SOUND("apache/ap_rotor1.wav");
+	PRECACHE_SOUND("apache/ap_rotor2.wav");
+	PRECACHE_SOUND("apache/ap_rotor3.wav");
+	PRECACHE_SOUND("apache/ap_whine1.wav");
+
+	PRECACHE_SOUND("weapons/mortarhit.wav");
+
+	m_iSpriteTexture = PRECACHE_MODEL( "sprites/white.spr" );
+
+	PRECACHE_SOUND("turret/tu_fire1.wav");
+
+	PRECACHE_MODEL("sprites/lgtning.spr");
+
+	m_iExplode	= PRECACHE_MODEL( "sprites/fexplo.spr" );
+	m_iBodyGibs = PRECACHE_MODEL( "models/metalplategibs_green.mdl" );
+
+	UTIL_PrecacheOther( "hvr_rocket" );
+}
+
+
+
+void CApache::NullThink( void )
+{
+	StudioFrameAdvance( );
+	pev->nextthink = gpGlobals->time + 0.5;
+}
+
+
+void CApache::StartupUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	SetThink( HuntThink );
+	SetTouch( FlyTouch );
+	pev->nextthink = gpGlobals->time + 0.1;
+	SetUse( NULL );
+}
+
+void CApache :: Killed( entvars_t *pevAttacker, int iGib )
+{
+	pev->movetype = MOVETYPE_TOSS;
+	pev->gravity = 0.3;
+
+	STOP_SOUND( ENT(pev), CHAN_STATIC, "apache/ap_rotor2.wav" );
+
+	UTIL_SetSize( pev, Vector( -32, -32, -64), Vector( 32, 32, 0) );
+	SetThink( DyingThink );
+	SetTouch( CrashTouch );
+	pev->nextthink = gpGlobals->time + 0.1;
+	pev->health = 0;
+	pev->takedamage = DAMAGE_NO;
+
+	if (pev->spawnflags & SF_NOWRECKAGE)
+	{
+		m_flNextRocket = gpGlobals->time + 4.0;
+	}
+	else
+	{
+		m_flNextRocket = gpGlobals->time + 15.0;
+	}
+}
+
+void CApache :: DyingThink( void )
+{
+	StudioFrameAdvance( );
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	pev->avelocity = pev->avelocity * 1.02;
+
+	// still falling?
+	if (m_flNextRocket > gpGlobals->time )
+	{
+		// random explosions
+		MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, pev->origin );
+			WRITE_BYTE( TE_EXPLOSION);		// This just makes a dynamic light now
+			WRITE_COORD( pev->origin.x + RANDOM_FLOAT( -150, 150 ));
+			WRITE_COORD( pev->origin.y + RANDOM_FLOAT( -150, 150 ));
+			WRITE_COORD( pev->origin.z + RANDOM_FLOAT( -150, -50 ));
+			WRITE_SHORT( g_sModelIndexFireball );
+			WRITE_BYTE( RANDOM_LONG(0,29) + 30  ); // scale * 10
+			WRITE_BYTE( 12  ); // framerate
+			WRITE_BYTE( TE_EXPLFLAG_NONE );
+		MESSAGE_END();
+
+		// lots of smoke
+		MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, pev->origin );
+			WRITE_BYTE( TE_SMOKE );
+			WRITE_COORD( pev->origin.x + RANDOM_FLOAT( -150, 150 ));
+			WRITE_COORD( pev->origin.y + RANDOM_FLOAT( -150, 150 ));
+			WRITE_COORD( pev->origin.z + RANDOM_FLOAT( -150, -50 ));
+			WRITE_SHORT( g_sModelIndexSmoke );
+			WRITE_BYTE( 100 ); // scale * 10
+			WRITE_BYTE( 10  ); // framerate
+		MESSAGE_END();
+
+		Vector vecSpot = pev->origin + (pev->mins + pev->maxs) * 0.5;
+		MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, vecSpot );
+			WRITE_BYTE( TE_BREAKMODEL);
+
+			// position
+			WRITE_COORD( vecSpot.x );
+			WRITE_COORD( vecSpot.y );
+			WRITE_COORD( vecSpot.z );
+
+			// size
+			WRITE_COORD( 400 );
+			WRITE_COORD( 400 );
+			WRITE_COORD( 132 );
+
+			// velocity
+			WRITE_COORD( pev->velocity.x ); 
+			WRITE_COORD( pev->velocity.y );
+			WRITE_COORD( pev->velocity.z );
+
+			// randomization
+			WRITE_BYTE( 50 ); 
+
+			// Model
+			WRITE_SHORT( m_iBodyGibs );	//model id#
+
+			// # of shards
+			WRITE_BYTE( 4 );	// let client decide
+
+			// duration
+			WRITE_BYTE( 30 );// 3.0 seconds
+
+			// flags
+
+			WRITE_BYTE( BREAK_METAL );
+		MESSAGE_END();
+
+		// don't stop it we touch a entity
+		pev->flags &= ~FL_ONGROUND;
+		pev->nextthink = gpGlobals->time + 0.2;
+		return;
+	}
+	else
+	{
+		Vector vecSpot = pev->origin + (pev->mins + pev->maxs) * 0.5;
+
+		/*
+		MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+			WRITE_BYTE( TE_EXPLOSION);		// This just makes a dynamic light now
+			WRITE_COORD( vecSpot.x );
+			WRITE_COORD( vecSpot.y );
+			WRITE_COORD( vecSpot.z + 300 );
+			WRITE_SHORT( g_sModelIndexFireball );
+			WRITE_BYTE( 250 ); // scale * 10
+			WRITE_BYTE( 8  ); // framerate
+		MESSAGE_END();
+		*/
+
+		// fireball
+		MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, vecSpot );
+			WRITE_BYTE( TE_SPRITE );
+			WRITE_COORD( vecSpot.x );
+			WRITE_COORD( vecSpot.y );
+			WRITE_COORD( vecSpot.z + 256 );
+			WRITE_SHORT( m_iExplode );
+			WRITE_BYTE( 120 ); // scale * 10
+			WRITE_BYTE( 255 ); // brightness
+		MESSAGE_END();
+		
+		// big smoke
+		MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, vecSpot );
+			WRITE_BYTE( TE_SMOKE );
+			WRITE_COORD( vecSpot.x );
+			WRITE_COORD( vecSpot.y );
+			WRITE_COORD( vecSpot.z + 512 );
+			WRITE_SHORT( g_sModelIndexSmoke );
+			WRITE_BYTE( 250 ); // scale * 10
+			WRITE_BYTE( 5  ); // framerate
+		MESSAGE_END();
+
+		// blast circle
+		MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, pev->origin );
+			WRITE_BYTE( TE_BEAMCYLINDER );
+			WRITE_COORD( pev->origin.x);
+			WRITE_COORD( pev->origin.y);
+			WRITE_COORD( pev->origin.z);
+			WRITE_COORD( pev->origin.x);
+			WRITE_COORD( pev->origin.y);
+			WRITE_COORD( pev->origin.z + 2000 ); // reach damage radius over .2 seconds
+			WRITE_SHORT( m_iSpriteTexture );
+			WRITE_BYTE( 0 ); // startframe
+			WRITE_BYTE( 0 ); // framerate
+			WRITE_BYTE( 4 ); // life
+			WRITE_BYTE( 32 );  // width
+			WRITE_BYTE( 0 );   // noise
+			WRITE_BYTE( 255 );   // r, g, b
+			WRITE_BYTE( 255 );   // r, g, b
+			WRITE_BYTE( 192 );   // r, g, b
+			WRITE_BYTE( 128 ); // brightness
+			WRITE_BYTE( 0 );		// speed
+		MESSAGE_END();
+
+		EMIT_SOUND(ENT(pev), CHAN_STATIC, "weapons/mortarhit.wav", 1.0, 0.3);
+
+		RadiusDamage( pev->origin, pev, pev, 300, CLASS_NONE, DMG_BLAST );
+
+		if (/*!(pev->spawnflags & SF_NOWRECKAGE) && */(pev->flags & FL_ONGROUND))
+		{
+			CBaseEntity *pWreckage = Create( "cycler_wreckage", pev->origin, pev->angles );
+			// SET_MODEL( ENT(pWreckage->pev), STRING(pev->model) );
+			UTIL_SetSize( pWreckage->pev, Vector( -200, -200, -128 ), Vector( 200, 200, -32 ) );
+			pWreckage->pev->frame = pev->frame;
+			pWreckage->pev->sequence = pev->sequence;
+			pWreckage->pev->framerate = 0;
+			pWreckage->pev->dmgtime = gpGlobals->time + 5;
+		}
+
+		// gibs
+		vecSpot = pev->origin + (pev->mins + pev->maxs) * 0.5;
+		MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, vecSpot );
+			WRITE_BYTE( TE_BREAKMODEL);
+
+			// position
+			WRITE_COORD( vecSpot.x );
+			WRITE_COORD( vecSpot.y );
+			WRITE_COORD( vecSpot.z + 64);
+
+			// size
+			WRITE_COORD( 400 );
+			WRITE_COORD( 400 );
+			WRITE_COORD( 128 );
+
+			// velocity
+			WRITE_COORD( 0 ); 
+			WRITE_COORD( 0 );
+			WRITE_COORD( 200 );
+
+			// randomization
+			WRITE_BYTE( 30 ); 
+
+			// Model
+			WRITE_SHORT( m_iBodyGibs );	//model id#
+
+			// # of shards
+			WRITE_BYTE( 200 );
+
+			// duration
+			WRITE_BYTE( 200 );// 10.0 seconds
+
+			// flags
+
+			WRITE_BYTE( BREAK_METAL );
+		MESSAGE_END();
+
+		SetThink( SUB_Remove );
+		pev->nextthink = gpGlobals->time + 0.1;
+	}
+}
+
+
+void CApache::FlyTouch( CBaseEntity *pOther )
+{
+	// bounce if we hit something solid
+	if ( pOther->pev->solid == SOLID_BSP) 
+	{
+		TraceResult tr = UTIL_GetGlobalTrace( );
+
+		// UNDONE, do a real bounce
+		pev->velocity = pev->velocity + tr.vecPlaneNormal * (pev->velocity.Length() + 200);
+	}
+}
+
+
+void CApache::CrashTouch( CBaseEntity *pOther )
+{
+	// only crash if we hit something solid
+	if ( pOther->pev->solid == SOLID_BSP) 
+	{
+		SetTouch( NULL );
+		m_flNextRocket = gpGlobals->time;
+		pev->nextthink = gpGlobals->time;
+	}
+}
+
+
+
+void CApache :: GibMonster( void )
+{
+	// EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "common/bodysplat.wav", 0.75, ATTN_NORM, 0, 200);		
+}
+
+
+void CApache :: HuntThink( void )
+{
+	StudioFrameAdvance( );
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	ShowDamage( );
+
+	if ( m_pGoalEnt == NULL && !FStringNull(pev->target) )// this monster has a target
+	{
+		m_pGoalEnt = UTIL_FindEntityByTargetname( NULL, STRING( pev->target ) );
+		if (m_pGoalEnt)
+		{
+			m_posDesired = m_pGoalEnt->pev->origin;
+			UTIL_MakeAimVectors( m_pGoalEnt->pev->angles );
+			m_vecGoal = gpGlobals->v_forward;
+		}
+	}
+
+	// if (m_hEnemy == NULL)
+	{
+		Look( 4092 );
+		m_hEnemy = BestVisibleEnemy( );
+	}
+
+	// generic speed up
+	if (m_flGoalSpeed < 800)
+		m_flGoalSpeed += 5;
+
+	if (m_hEnemy != NULL)
+	{
+		// ALERT( at_console, "%s\n", STRING( m_hEnemy->pev->classname ) );
+		if (FVisible( m_hEnemy ))
+		{
+			if (m_flLastSeen < gpGlobals->time - 5)
+				m_flPrevSeen = gpGlobals->time;
+			m_flLastSeen = gpGlobals->time;
+			m_posTarget = m_hEnemy->Center( );
+		}
+		else
+		{
+			m_hEnemy = NULL;
+		}
+	}
+
+	m_vecTarget = (m_posTarget - pev->origin).Normalize();
+
+	float flLength = (pev->origin - m_posDesired).Length();
+
+	if (m_pGoalEnt)
+	{
+		// ALERT( at_console, "%.0f\n", flLength );
+
+		if (flLength < 128)
+		{
+			m_pGoalEnt = UTIL_FindEntityByTargetname( NULL, STRING( m_pGoalEnt->pev->target ) );
+			if (m_pGoalEnt)
+			{
+				m_posDesired = m_pGoalEnt->pev->origin;
+				UTIL_MakeAimVectors( m_pGoalEnt->pev->angles );
+				m_vecGoal = gpGlobals->v_forward;
+				flLength = (pev->origin - m_posDesired).Length();
+			}
+		}
+	}
+	else
+	{
+		m_posDesired = pev->origin;
+	}
+
+	if (flLength > 250) // 500
+	{
+		// float flLength2 = (m_posTarget - pev->origin).Length() * (1.5 - DotProduct((m_posTarget - pev->origin).Normalize(), pev->velocity.Normalize() ));
+		// if (flLength2 < flLength)
+		if (m_flLastSeen + 90 > gpGlobals->time && DotProduct( (m_posTarget - pev->origin).Normalize(), (m_posDesired - pev->origin).Normalize( )) > 0.25)
+		{
+			m_vecDesired = (m_posTarget - pev->origin).Normalize( );
+		}
+		else
+		{
+			m_vecDesired = (m_posDesired - pev->origin).Normalize( );
+		}
+	}
+	else
+	{
+		m_vecDesired = m_vecGoal;
+	}
+
+	Flight( );
+
+	// ALERT( at_console, "%.0f %.0f %.0f\n", gpGlobals->time, m_flLastSeen, m_flPrevSeen );
+	if ((m_flLastSeen + 1 > gpGlobals->time) && (m_flPrevSeen + 2 < gpGlobals->time))
+	{
+		if (FireGun( ))
+		{
+			// slow down if we're fireing
+			if (m_flGoalSpeed > 400)
+				m_flGoalSpeed = 400;
+		}
+
+		// don't fire rockets and gun on easy mode
+		if (g_iSkillLevel == SKILL_EASY)
+			m_flNextRocket = gpGlobals->time + 10.0;
+	}
+
+	UTIL_MakeAimVectors( pev->angles );
+	Vector vecEst = (gpGlobals->v_forward * 800 + pev->velocity).Normalize( );
+	// ALERT( at_console, "%d %d %d %4.2f\n", pev->angles.x < 0, DotProduct( pev->velocity, gpGlobals->v_forward ) > -100, m_flNextRocket < gpGlobals->time, DotProduct( m_vecTarget, vecEst ) );
+
+	if ((m_iRockets % 2) == 1)
+	{
+		FireRocket( );
+		m_flNextRocket = gpGlobals->time + 0.5;
+		if (m_iRockets <= 0)
+		{
+			m_flNextRocket = gpGlobals->time + 10;
+			m_iRockets = 10;
+		}
+	}
+	else if (pev->angles.x < 0 && DotProduct( pev->velocity, gpGlobals->v_forward ) > -100 && m_flNextRocket < gpGlobals->time)
+	{
+		if (m_flLastSeen + 60 > gpGlobals->time)
+		{
+			if (m_hEnemy != NULL)
+			{
+				// make sure it's a good shot
+				if (DotProduct( m_vecTarget, vecEst) > .965)
+				{
+					TraceResult tr;
+					
+					UTIL_TraceLine( pev->origin, pev->origin + vecEst * 4096, ignore_monsters, edict(), &tr );
+					if ((tr.vecEndPos - m_posTarget).Length() < 512)
+						FireRocket( );
+				}
+			}
+			else
+			{
+				TraceResult tr;
+				
+				UTIL_TraceLine( pev->origin, pev->origin + vecEst * 4096, dont_ignore_monsters, edict(), &tr );
+				// just fire when close
+				if ((tr.vecEndPos - m_posTarget).Length() < 512)
+					FireRocket( );
+			}
+		}
+	}
+}
+
+
+void CApache :: Flight( void )
+{
+	// tilt model 5 degrees
+	Vector vecAdj = Vector( 5.0, 0, 0 );
+
+	// estimate where I'll be facing in one seconds
+	UTIL_MakeAimVectors( pev->angles + pev->avelocity * 2 + vecAdj);
+	// Vector vecEst1 = pev->origin + pev->velocity + gpGlobals->v_up * m_flForce - Vector( 0, 0, 384 );
+	// float flSide = DotProduct( m_posDesired - vecEst1, gpGlobals->v_right );
+	
+	float flSide = DotProduct( m_vecDesired, gpGlobals->v_right );
+
+	if (flSide < 0)
+	{
+		if (pev->avelocity.y < 60)
+		{
+			pev->avelocity.y += 8; // 9 * (3.0/2.0);
+		}
+	}
+	else
+	{
+		if (pev->avelocity.y > -60)
+		{
+			pev->avelocity.y -= 8; // 9 * (3.0/2.0);
+		}
+	}
+	pev->avelocity.y *= 0.98;
+
+	// estimate where I'll be in two seconds
+	UTIL_MakeAimVectors( pev->angles + pev->avelocity * 1 + vecAdj);
+	Vector vecEst = pev->origin + pev->velocity * 2.0 + gpGlobals->v_up * m_flForce * 20 - Vector( 0, 0, 384 * 2 );
+
+	// add immediate force
+	UTIL_MakeAimVectors( pev->angles + vecAdj);
+	pev->velocity.x += gpGlobals->v_up.x * m_flForce;
+	pev->velocity.y += gpGlobals->v_up.y * m_flForce;
+	pev->velocity.z += gpGlobals->v_up.z * m_flForce;
+	// add gravity
+	pev->velocity.z -= 38.4; // 32ft/sec
+
+
+	float flSpeed = pev->velocity.Length();
+	float flDir = DotProduct( Vector( gpGlobals->v_forward.x, gpGlobals->v_forward.y, 0 ), Vector( pev->velocity.x, pev->velocity.y, 0 ) );
+	if (flDir < 0)
+		flSpeed = -flSpeed;
+
+	float flDist = DotProduct( m_posDesired - vecEst, gpGlobals->v_forward );
+
+	// float flSlip = DotProduct( pev->velocity, gpGlobals->v_right );
+	float flSlip = -DotProduct( m_posDesired - vecEst, gpGlobals->v_right );
+
+	// fly sideways
+	if (flSlip > 0)
+	{
+		if (pev->angles.z > -30 && pev->avelocity.z > -15)
+			pev->avelocity.z -= 4;
+		else
+			pev->avelocity.z += 2;
+	}
+	else
+	{
+
+		if (pev->angles.z < 30 && pev->avelocity.z < 15)
+			pev->avelocity.z += 4;
+		else
+			pev->avelocity.z -= 2;
+	}
+
+	// sideways drag
+	pev->velocity.x = pev->velocity.x * (1.0 - fabs( gpGlobals->v_right.x ) * 0.05);
+	pev->velocity.y = pev->velocity.y * (1.0 - fabs( gpGlobals->v_right.y ) * 0.05);
+	pev->velocity.z = pev->velocity.z * (1.0 - fabs( gpGlobals->v_right.z ) * 0.05);
+
+	// general drag
+	pev->velocity = pev->velocity * 0.995;
+	
+	// apply power to stay correct height
+	if (m_flForce < 80 && vecEst.z < m_posDesired.z) 
+	{
+		m_flForce += 12;
+	}
+	else if (m_flForce > 30)
+	{
+		if (vecEst.z > m_posDesired.z) 
+			m_flForce -= 8;
+	}
+
+	// pitch forward or back to get to target
+	if (flDist > 0 && flSpeed < m_flGoalSpeed /* && flSpeed < flDist */ && pev->angles.x + pev->avelocity.x > -40)
+	{
+		// ALERT( at_console, "F " );
+		// lean forward
+		pev->avelocity.x -= 12.0;
+	}
+	else if (flDist < 0 && flSpeed > -50 && pev->angles.x + pev->avelocity.x  < 20)
+	{
+		// ALERT( at_console, "B " );
+		// lean backward
+		pev->avelocity.x += 12.0;
+	}
+	else if (pev->angles.x + pev->avelocity.x > 0)
+	{
+		// ALERT( at_console, "f " );
+		pev->avelocity.x -= 4.0;
+	}
+	else if (pev->angles.x + pev->avelocity.x < 0)
+	{
+		// ALERT( at_console, "b " );
+		pev->avelocity.x += 4.0;
+	}
+
+	// ALERT( at_console, "%.0f %.0f : %.0f %.0f : %.0f %.0f : %.0f\n", pev->origin.x, pev->velocity.x, flDist, flSpeed, pev->angles.x, pev->avelocity.x, m_flForce ); 
+	// ALERT( at_console, "%.0f %.0f : %.0f %0.f : %.0f\n", pev->origin.z, pev->velocity.z, vecEst.z, m_posDesired.z, m_flForce ); 
+
+	// make rotor, engine sounds
+	if (m_iSoundState == 0)
+	{
+		EMIT_SOUND_DYN(ENT(pev), CHAN_STATIC, "apache/ap_rotor2.wav", 1.0, 0.3, 0, 110 );
+		// EMIT_SOUND_DYN(ENT(pev), CHAN_STATIC, "apache/ap_whine1.wav", 0.5, 0.2, 0, 110 );
+
+		m_iSoundState = SND_CHANGE_PITCH; // hack for going through level transitions
+	}
+	else
+	{
+		CBaseEntity *pPlayer = NULL;
+
+		pPlayer = UTIL_FindEntityByClassname( NULL, "player" );
+		// UNDONE: this needs to send different sounds to every player for multiplayer.	
+		if (pPlayer)
+		{
+
+			float pitch = DotProduct( pev->velocity - pPlayer->pev->velocity, (pPlayer->pev->origin - pev->origin).Normalize() );
+
+			pitch = (int)(100 + pitch / 50.0);
+
+			if (pitch > 250) 
+				pitch = 250;
+			if (pitch < 50)
+				pitch = 50;
+			if (pitch == 100)
+				pitch = 101;
+
+			float flVol = (m_flForce / 100.0) + .1;
+			if (flVol > 1.0) 
+				flVol = 1.0;
+
+			EMIT_SOUND_DYN(ENT(pev), CHAN_STATIC, "apache/ap_rotor2.wav", 1.0, 0.3, SND_CHANGE_PITCH | SND_CHANGE_VOL, pitch);
+		}
+		// EMIT_SOUND_DYN(ENT(pev), CHAN_STATIC, "apache/ap_whine1.wav", flVol, 0.2, SND_CHANGE_PITCH | SND_CHANGE_VOL, pitch);
+	
+		// ALERT( at_console, "%.0f %.2f\n", pitch, flVol );
+	}
+}
+
+
+void CApache :: FireRocket( void )
+{
+	static float side = 1.0;
+	static int count;
+
+	if (m_iRockets <= 0)
+		return;
+
+	UTIL_MakeAimVectors( pev->angles );
+	Vector vecSrc = pev->origin + 1.5 * (gpGlobals->v_forward * 21 + gpGlobals->v_right * 70 * side + gpGlobals->v_up * -79);
+
+	switch( m_iRockets % 5)
+	{
+	case 0:	vecSrc = vecSrc + gpGlobals->v_right * 10; break;
+	case 1: vecSrc = vecSrc - gpGlobals->v_right * 10; break;
+	case 2: vecSrc = vecSrc + gpGlobals->v_up * 10; break;
+	case 3: vecSrc = vecSrc - gpGlobals->v_up * 10; break;
+	case 4: break;
+	}
+
+	MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, vecSrc );
+		WRITE_BYTE( TE_SMOKE );
+		WRITE_COORD( vecSrc.x );
+		WRITE_COORD( vecSrc.y );
+		WRITE_COORD( vecSrc.z );
+		WRITE_SHORT( g_sModelIndexSmoke );
+		WRITE_BYTE( 20 ); // scale * 10
+		WRITE_BYTE( 12 ); // framerate
+	MESSAGE_END();
+
+	CBaseEntity *pRocket = CBaseEntity::Create( "hvr_rocket", vecSrc, pev->angles, edict() );
+	if (pRocket)
+		pRocket->pev->velocity = pev->velocity + gpGlobals->v_forward * 100;
+
+	m_iRockets--;
+
+	side = - side;
+}
+
+
+
+BOOL CApache :: FireGun( )
+{
+	UTIL_MakeAimVectors( pev->angles );
+		
+	Vector posGun, angGun;
+	GetAttachment( 1, posGun, angGun );
+
+	Vector vecTarget = (m_posTarget - posGun).Normalize( );
+
+	Vector vecOut;
+
+	vecOut.x = DotProduct( gpGlobals->v_forward, vecTarget );
+	vecOut.y = -DotProduct( gpGlobals->v_right, vecTarget );
+	vecOut.z = DotProduct( gpGlobals->v_up, vecTarget );
+
+	Vector angles = UTIL_VecToAngles (vecOut);
+
+	angles.x = -angles.x;
+	if (angles.y > 180)
+		angles.y = angles.y - 360;
+	if (angles.y < -180)
+		angles.y = angles.y + 360;
+	if (angles.x > 180)
+		angles.x = angles.x - 360;
+	if (angles.x < -180)
+		angles.x = angles.x + 360;
+
+	if (angles.x > m_angGun.x)
+		m_angGun.x = min( angles.x, m_angGun.x + 12 );
+	if (angles.x < m_angGun.x)
+		m_angGun.x = max( angles.x, m_angGun.x - 12 );
+	if (angles.y > m_angGun.y)
+		m_angGun.y = min( angles.y, m_angGun.y + 12 );
+	if (angles.y < m_angGun.y)
+		m_angGun.y = max( angles.y, m_angGun.y - 12 );
+
+	m_angGun.y = SetBoneController( 0, m_angGun.y );
+	m_angGun.x = SetBoneController( 1, m_angGun.x );
+
+	Vector posBarrel, angBarrel;
+	GetAttachment( 0, posBarrel, angBarrel );
+	Vector vecGun = (posBarrel - posGun).Normalize( );
+
+	if (DotProduct( vecGun, vecTarget ) > 0.98)
+	{
+#if 1
+		FireBullets( 1, posGun, vecGun, VECTOR_CONE_4DEGREES, 8192, BULLET_MONSTER_12MM, 1 );
+		EMIT_SOUND(ENT(pev), CHAN_WEAPON, "turret/tu_fire1.wav", 1, 0.3);
+#else
+		static float flNext;
+		TraceResult tr;
+		UTIL_TraceLine( posGun, posGun + vecGun * 8192, dont_ignore_monsters, ENT( pev ), &tr );
+
+		if (!m_pBeam)
+		{
+			m_pBeam = CBeam::BeamCreate( "sprites/lgtning.spr", 80 );
+			m_pBeam->PointEntInit( pev->origin, entindex( ) );
+			m_pBeam->SetEndAttachment( 1 );
+			m_pBeam->SetColor( 255, 180, 96 );
+			m_pBeam->SetBrightness( 192 );
+		}
+
+		if (flNext < gpGlobals->time)
+		{
+			flNext = gpGlobals->time + 0.5;
+			m_pBeam->SetStartPos( tr.vecEndPos );
+		}
+#endif
+		return TRUE;
+	}
+	else
+	{
+		if (m_pBeam)
+		{
+			UTIL_Remove( m_pBeam );
+			m_pBeam = NULL;
+		}
+	}
+	return FALSE;
+}
+
+
+
+void CApache :: ShowDamage( void )
+{
+	if (m_iDoSmokePuff > 0 || RANDOM_LONG(0,99) > pev->health)
+	{
+		MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, pev->origin );
+			WRITE_BYTE( TE_SMOKE );
+			WRITE_COORD( pev->origin.x );
+			WRITE_COORD( pev->origin.y );
+			WRITE_COORD( pev->origin.z - 32 );
+			WRITE_SHORT( g_sModelIndexSmoke );
+			WRITE_BYTE( RANDOM_LONG(0,9) + 20 ); // scale * 10
+			WRITE_BYTE( 12 ); // framerate
+		MESSAGE_END();
+	}
+	if (m_iDoSmokePuff > 0)
+		m_iDoSmokePuff--;
+}
+
+
+int CApache :: TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType )
+{
+	if (pevInflictor->owner == edict())
+		return 0;
+
+	if (bitsDamageType & DMG_BLAST)
+	{
+		flDamage *= 2;
+	}
+
+	/*
+	if ( (bitsDamageType & DMG_BULLET) && flDamage > 50)
+	{
+		// clip bullet damage at 50
+		flDamage = 50;
+	}
+	*/
+
+	// ALERT( at_console, "%.0f\n", flDamage );
+	return CBaseEntity::TakeDamage(  pevInflictor, pevAttacker, flDamage, bitsDamageType );
+}
+
+
+
+void CApache::TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType)
+{
+	// ALERT( at_console, "%d %.0f\n", ptr->iHitgroup, flDamage );
+
+	// ignore blades
+	if (ptr->iHitgroup == 6 && (bitsDamageType & (DMG_ENERGYBEAM|DMG_BULLET|DMG_CLUB)))
+		return;
+
+	// hit hard, hits cockpit, hits engines
+	if (flDamage > 50 || ptr->iHitgroup == 1 || ptr->iHitgroup == 2)
+	{
+		// ALERT( at_console, "%.0f\n", flDamage );
+		AddMultiDamage( pevAttacker, this, flDamage, bitsDamageType );
+		m_iDoSmokePuff = 3 + (flDamage / 5.0);
+	}
+	else
+	{
+		// do half damage in the body
+		// AddMultiDamage( pevAttacker, this, flDamage / 2.0, bitsDamageType );
+		UTIL_Ricochet( ptr->vecEndPos, 2.0 );
+	}
+}
+
+
+
+
+
+class CApacheHVR : public CGrenade
+{
+	void Spawn( void );
+	void Precache( void );
+	void EXPORT IgniteThink( void );
+	void EXPORT AccelerateThink( void );
+
+	int		Save( CSave &save );
+	int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	int m_iTrail;
+	Vector m_vecForward;
+};
+LINK_ENTITY_TO_CLASS( hvr_rocket, CApacheHVR );
+
+TYPEDESCRIPTION	CApacheHVR::m_SaveData[] = 
+{
+//	DEFINE_FIELD( CApacheHVR, m_iTrail, FIELD_INTEGER ),	// Dont' save, precache
+	DEFINE_FIELD( CApacheHVR, m_vecForward, FIELD_VECTOR ),
+};
+
+IMPLEMENT_SAVERESTORE( CApacheHVR, CGrenade );
+
+void CApacheHVR :: Spawn( void )
+{
+	Precache( );
+	// motor
+	pev->movetype = MOVETYPE_FLY;
+	pev->solid = SOLID_BBOX;
+
+	SET_MODEL(ENT(pev), "models/HVR.mdl");
+	UTIL_SetSize(pev, Vector( 0, 0, 0), Vector(0, 0, 0));
+	UTIL_SetOrigin( pev, pev->origin );
+
+	SetThink( IgniteThink );
+	SetTouch( ExplodeTouch );
+
+	UTIL_MakeAimVectors( pev->angles );
+	m_vecForward = gpGlobals->v_forward;
+	pev->gravity = 0.5;
+
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	pev->dmg = 150;
+}
+
+
+void CApacheHVR :: Precache( void )
+{
+	PRECACHE_MODEL("models/HVR.mdl");
+	m_iTrail = PRECACHE_MODEL("sprites/smoke.spr");
+	PRECACHE_SOUND ("weapons/rocket1.wav");
+}
+
+
+void CApacheHVR :: IgniteThink( void  )
+{
+	// pev->movetype = MOVETYPE_TOSS;
+
+	// pev->movetype = MOVETYPE_FLY;
+	pev->effects |= EF_LIGHT;
+
+	// make rocket sound
+	EMIT_SOUND( ENT(pev), CHAN_VOICE, "weapons/rocket1.wav", 1, 0.5 );
+
+	// rocket trail
+	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+
+		WRITE_BYTE( TE_BEAMFOLLOW );
+		WRITE_SHORT(entindex());	// entity
+		WRITE_SHORT(m_iTrail );	// model
+		WRITE_BYTE( 15 ); // life
+		WRITE_BYTE( 5 );  // width
+		WRITE_BYTE( 224 );   // r, g, b
+		WRITE_BYTE( 224 );   // r, g, b
+		WRITE_BYTE( 255 );   // r, g, b
+		WRITE_BYTE( 255 );	// brightness
+
+	MESSAGE_END();  // move PHS/PVS data sending into here (SEND_ALL, SEND_PVS, SEND_PHS)
+
+	// set to accelerate
+	SetThink( AccelerateThink );
+	pev->nextthink = gpGlobals->time + 0.1;
+}
+
+
+void CApacheHVR :: AccelerateThink( void  )
+{
+	// check world boundaries
+	if (pev->origin.x < -4096 || pev->origin.x > 4096 || pev->origin.y < -4096 || pev->origin.y > 4096 || pev->origin.z < -4096 || pev->origin.z > 4096)
+	{
+		UTIL_Remove( this );
+		return;
+	}
+
+	// accelerate
+	float flSpeed = pev->velocity.Length();
+	if (flSpeed < 1800)
+	{
+		pev->velocity = pev->velocity + m_vecForward * 200;
+	}
+
+	// re-aim
+	pev->angles = UTIL_VecToAngles( pev->velocity );
+
+	pev->nextthink = gpGlobals->time + 0.1;
+}
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/barnacle.cpp b/main/source/dlls/barnacle.cpp
new file mode 100644
index 00000000..49ba76d1
--- /dev/null
+++ b/main/source/dlls/barnacle.cpp
@@ -0,0 +1,428 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// barnacle - stationary ceiling mounted 'fishing' monster
+//=========================================================
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"schedule.h"
+
+#define	BARNACLE_BODY_HEIGHT	44 // how 'tall' the barnacle's model is.
+#define BARNACLE_PULL_SPEED		8
+#define BARNACLE_KILL_VICTIM_DELAY	5 // how many seconds after pulling prey in to gib them. 
+
+//=========================================================
+// Monster's Anim Events Go Here
+//=========================================================
+#define	BARNACLE_AE_PUKEGIB	2
+
+class CBarnacle : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	CBaseEntity *TongueTouchEnt ( float *pflLength );
+	int  Classify ( void );
+	void HandleAnimEvent( MonsterEvent_t *pEvent );
+	void EXPORT BarnacleThink ( void );
+	void EXPORT WaitTillDead ( void );
+	void Killed( entvars_t *pevAttacker, int iGib );
+	int TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType );
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	float m_flAltitude;
+	float m_flKillVictimTime;
+	int	  m_cGibs;// barnacle loads up on gibs each time it kills something.
+	BOOL  m_fTongueExtended;
+	BOOL  m_fLiftingPrey;
+	float m_flTongueAdj;
+};
+LINK_ENTITY_TO_CLASS( monster_barnacle, CBarnacle );
+
+TYPEDESCRIPTION	CBarnacle::m_SaveData[] = 
+{
+	DEFINE_FIELD( CBarnacle, m_flAltitude, FIELD_FLOAT ),
+	DEFINE_FIELD( CBarnacle, m_flKillVictimTime, FIELD_TIME ),
+	DEFINE_FIELD( CBarnacle, m_cGibs, FIELD_INTEGER ),// barnacle loads up on gibs each time it kills something.
+	DEFINE_FIELD( CBarnacle, m_fTongueExtended, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CBarnacle, m_fLiftingPrey, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CBarnacle, m_flTongueAdj, FIELD_FLOAT ),
+};
+
+IMPLEMENT_SAVERESTORE( CBarnacle, CBaseMonster );
+
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CBarnacle :: Classify ( void )
+{
+	return	CLASS_ALIEN_MONSTER;
+}
+
+//=========================================================
+// HandleAnimEvent - catches the monster-specific messages
+// that occur when tagged animation frames are played.
+//
+// Returns number of events handled, 0 if none.
+//=========================================================
+void CBarnacle :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	switch( pEvent->event )
+	{
+	case BARNACLE_AE_PUKEGIB:
+		CGib::SpawnRandomGibs( pev, 1, 1 );	
+		break;
+	default:
+		CBaseMonster::HandleAnimEvent( pEvent );
+		break;
+	}
+}
+
+//=========================================================
+// Spawn
+//=========================================================
+void CBarnacle :: Spawn()
+{
+	Precache( );
+
+	SET_MODEL(ENT(pev), "models/barnacle.mdl");
+	UTIL_SetSize( pev, Vector(-16, -16, -32), Vector(16, 16, 0) );
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_NONE;
+	pev->takedamage		= DAMAGE_AIM;
+	m_bloodColor		= BLOOD_COLOR_RED;
+	pev->effects		= EF_INVLIGHT; // take light from the ceiling 
+	pev->health			= 25;
+	m_flFieldOfView		= 0.5;// indicates the width of this monster's forward view cone ( as a dotproduct result )
+	m_MonsterState		= MONSTERSTATE_NONE;
+	m_flKillVictimTime	= 0;
+	m_cGibs				= 0;
+	m_fLiftingPrey		= FALSE;
+	m_flTongueAdj		= -100;
+
+	InitBoneControllers();
+
+	SetActivity ( ACT_IDLE );
+
+	SetThink ( &CBarnacle::BarnacleThink );
+	pev->nextthink = gpGlobals->time + 0.5;
+
+	UTIL_SetOrigin ( pev, pev->origin );
+}
+
+int CBarnacle::TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType )
+{
+	if ( bitsDamageType & DMG_CLUB )
+	{
+		flDamage = pev->health;
+	}
+
+	return CBaseMonster::TakeDamage( pevInflictor, pevAttacker, flDamage, bitsDamageType );
+}
+
+//=========================================================
+//=========================================================
+void CBarnacle :: BarnacleThink ( void )
+{
+	CBaseEntity *pTouchEnt;
+	CBaseMonster *pVictim;
+	float flLength;
+
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	if ( m_hEnemy != NULL )
+	{
+// barnacle has prey.
+
+		if ( !m_hEnemy->IsAlive() )
+		{
+			// someone (maybe even the barnacle) killed the prey. Reset barnacle.
+			m_fLiftingPrey = FALSE;// indicate that we're not lifting prey.
+			m_hEnemy = NULL;
+			return;
+		}
+
+		if ( m_fLiftingPrey )
+		{
+			if ( m_hEnemy != NULL && m_hEnemy->pev->deadflag != DEAD_NO )
+			{
+				// crap, someone killed the prey on the way up.
+				m_hEnemy = NULL;
+				m_fLiftingPrey = FALSE;
+				return;
+			}
+
+	// still pulling prey.
+			Vector vecNewEnemyOrigin = m_hEnemy->pev->origin;
+			vecNewEnemyOrigin.x = pev->origin.x;
+			vecNewEnemyOrigin.y = pev->origin.y;
+
+			// guess as to where their neck is
+			vecNewEnemyOrigin.x -= 6 * cos(m_hEnemy->pev->angles.y * M_PI/180.0);	
+			vecNewEnemyOrigin.y -= 6 * sin(m_hEnemy->pev->angles.y * M_PI/180.0);
+
+			m_flAltitude -= BARNACLE_PULL_SPEED;
+			vecNewEnemyOrigin.z += BARNACLE_PULL_SPEED;
+
+			if ( fabs( pev->origin.z - ( vecNewEnemyOrigin.z + m_hEnemy->pev->view_ofs.z - 8 ) ) < BARNACLE_BODY_HEIGHT )
+			{
+		// prey has just been lifted into position ( if the victim origin + eye height + 8 is higher than the bottom of the barnacle, it is assumed that the head is within barnacle's body )
+				m_fLiftingPrey = FALSE;
+
+				EMIT_SOUND( ENT(pev), CHAN_WEAPON, "barnacle/bcl_bite3.wav", 1, ATTN_NORM );	
+
+				pVictim = m_hEnemy->MyMonsterPointer();
+
+				m_flKillVictimTime = gpGlobals->time + 10;// now that the victim is in place, the killing bite will be administered in 10 seconds.
+
+				if ( pVictim )
+				{
+					pVictim->BarnacleVictimBitten( pev );
+					SetActivity ( ACT_EAT );
+				}
+			}
+
+			UTIL_SetOrigin ( m_hEnemy->pev, vecNewEnemyOrigin );
+		}
+		else
+		{
+	// prey is lifted fully into feeding position and is dangling there.
+
+			pVictim = m_hEnemy->MyMonsterPointer();
+
+			if ( m_flKillVictimTime != -1 && gpGlobals->time > m_flKillVictimTime )
+			{
+				// kill!
+				if ( pVictim )
+				{
+					pVictim->TakeDamage ( pev, pev, pVictim->pev->health, DMG_SLASH | DMG_ALWAYSGIB );
+					m_cGibs = 3;
+				}
+
+				return;
+			}
+
+			// bite prey every once in a while
+			if ( pVictim && ( RANDOM_LONG(0,49) == 0 ) )
+			{
+				switch ( RANDOM_LONG(0,2) )
+				{
+				case 0:	EMIT_SOUND( ENT(pev), CHAN_WEAPON, "barnacle/bcl_chew1.wav", 1, ATTN_NORM );	break;
+				case 1:	EMIT_SOUND( ENT(pev), CHAN_WEAPON, "barnacle/bcl_chew2.wav", 1, ATTN_NORM );	break;
+				case 2:	EMIT_SOUND( ENT(pev), CHAN_WEAPON, "barnacle/bcl_chew3.wav", 1, ATTN_NORM );	break;
+				}
+
+				pVictim->BarnacleVictimBitten( pev );
+			}
+
+		}
+	}
+	else
+	{
+// barnacle has no prey right now, so just idle and check to see if anything is touching the tongue.
+
+		// If idle and no nearby client, don't think so often
+		if ( FNullEnt( FIND_CLIENT_IN_PVS( edict() ) ) )
+			pev->nextthink = gpGlobals->time + RANDOM_FLOAT(1,1.5);	// Stagger a bit to keep barnacles from thinking on the same frame
+
+		if ( m_fSequenceFinished )
+		{// this is done so barnacle will fidget.
+			SetActivity ( ACT_IDLE );
+			m_flTongueAdj = -100;
+		}
+
+		if ( m_cGibs && RANDOM_LONG(0,99) == 1 )
+		{
+			// cough up a gib.
+			CGib::SpawnRandomGibs( pev, 1, 1 );
+			m_cGibs--;
+
+			switch ( RANDOM_LONG(0,2) )
+			{
+			case 0:	EMIT_SOUND( ENT(pev), CHAN_WEAPON, "barnacle/bcl_chew1.wav", 1, ATTN_NORM );	break;
+			case 1:	EMIT_SOUND( ENT(pev), CHAN_WEAPON, "barnacle/bcl_chew2.wav", 1, ATTN_NORM );	break;
+			case 2:	EMIT_SOUND( ENT(pev), CHAN_WEAPON, "barnacle/bcl_chew3.wav", 1, ATTN_NORM );	break;
+			}
+		}
+
+		pTouchEnt = TongueTouchEnt( &flLength );
+
+		if ( pTouchEnt != NULL && m_fTongueExtended )
+		{
+			// tongue is fully extended, and is touching someone.
+			if ( pTouchEnt->FBecomeProne() )
+			{
+				EMIT_SOUND( ENT(pev), CHAN_WEAPON, "barnacle/bcl_alert2.wav", 1, ATTN_NORM );	
+
+				SetSequenceByName ( "attack1" );
+				m_flTongueAdj = -20;
+
+				m_hEnemy = pTouchEnt;
+
+				pTouchEnt->pev->movetype = MOVETYPE_FLY;
+				pTouchEnt->pev->velocity = g_vecZero;
+				pTouchEnt->pev->basevelocity = g_vecZero;
+				pTouchEnt->pev->origin.x = pev->origin.x;
+				pTouchEnt->pev->origin.y = pev->origin.y;
+
+				m_fLiftingPrey = TRUE;// indicate that we should be lifting prey.
+				m_flKillVictimTime = -1;// set this to a bogus time while the victim is lifted.
+
+				m_flAltitude = (pev->origin.z - pTouchEnt->EyePosition().z);
+			}
+		}
+		else
+		{
+			// calculate a new length for the tongue to be clear of anything else that moves under it. 
+			if ( m_flAltitude < flLength )
+			{
+				// if tongue is higher than is should be, lower it kind of slowly.
+				m_flAltitude += BARNACLE_PULL_SPEED;
+				m_fTongueExtended = FALSE;
+			}
+			else
+			{
+				m_flAltitude = flLength;
+				m_fTongueExtended = TRUE;
+			}
+
+		}
+
+	}
+
+	// ALERT( at_console, "tounge %f\n", m_flAltitude + m_flTongueAdj );
+	SetBoneController( 0, -(m_flAltitude + m_flTongueAdj) );
+	StudioFrameAdvance( 0.1 );
+}
+
+//=========================================================
+// Killed.
+//=========================================================
+void CBarnacle :: Killed( entvars_t *pevAttacker, int iGib )
+{
+	CBaseMonster *pVictim;
+
+	pev->solid = SOLID_NOT;
+	pev->takedamage = DAMAGE_NO;
+
+	if ( m_hEnemy != NULL )
+	{
+		pVictim = m_hEnemy->MyMonsterPointer();
+
+		if ( pVictim )
+		{
+			pVictim->BarnacleVictimReleased();
+		}
+	}
+
+//	CGib::SpawnRandomGibs( pev, 4, 1 );
+
+	switch ( RANDOM_LONG ( 0, 1 ) )
+	{
+	case 0:	EMIT_SOUND( ENT(pev), CHAN_WEAPON, "barnacle/bcl_die1.wav", 1, ATTN_NORM );	break;
+	case 1:	EMIT_SOUND( ENT(pev), CHAN_WEAPON, "barnacle/bcl_die3.wav", 1, ATTN_NORM );	break;
+	}
+	
+	SetActivity ( ACT_DIESIMPLE );
+	SetBoneController( 0, 0 );
+
+	StudioFrameAdvance( 0.1 );
+
+	pev->nextthink = gpGlobals->time + 0.1;
+	SetThink ( &CBarnacle::WaitTillDead );
+}
+
+//=========================================================
+//=========================================================
+void CBarnacle :: WaitTillDead ( void )
+{
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	float flInterval = StudioFrameAdvance( 0.1 );
+	DispatchAnimEvents ( flInterval );
+
+	if ( m_fSequenceFinished )
+	{
+		// death anim finished. 
+		StopAnimation();
+		SetThink ( NULL );
+	}
+}
+
+//=========================================================
+// Precache - precaches all resources this monster needs
+//=========================================================
+void CBarnacle :: Precache()
+{
+	PRECACHE_MODEL("models/barnacle.mdl");
+
+	PRECACHE_SOUND("barnacle/bcl_alert2.wav");//happy, lifting food up
+	PRECACHE_SOUND("barnacle/bcl_bite3.wav");//just got food to mouth
+	PRECACHE_SOUND("barnacle/bcl_chew1.wav");
+	PRECACHE_SOUND("barnacle/bcl_chew2.wav");
+	PRECACHE_SOUND("barnacle/bcl_chew3.wav");
+	PRECACHE_SOUND("barnacle/bcl_die1.wav" );
+	PRECACHE_SOUND("barnacle/bcl_die3.wav" );
+}	
+
+//=========================================================
+// TongueTouchEnt - does a trace along the barnacle's tongue
+// to see if any entity is touching it. Also stores the length
+// of the trace in the int pointer provided.
+//=========================================================
+#define BARNACLE_CHECK_SPACING	8
+CBaseEntity *CBarnacle :: TongueTouchEnt ( float *pflLength )
+{
+	TraceResult	tr;
+	float		length;
+
+	// trace once to hit architecture and see if the tongue needs to change position.
+	UTIL_TraceLine ( pev->origin, pev->origin - Vector ( 0 , 0 , 2048 ), ignore_monsters, ENT(pev), &tr );
+	length = fabs( pev->origin.z - tr.vecEndPos.z );
+	if ( pflLength )
+	{
+		*pflLength = length;
+	}
+
+	Vector delta = Vector( BARNACLE_CHECK_SPACING, BARNACLE_CHECK_SPACING, 0 );
+	Vector mins = pev->origin - delta;
+	Vector maxs = pev->origin + delta;
+	maxs.z = pev->origin.z;
+	mins.z -= length;
+
+	CBaseEntity *pList[10];
+	int count = UTIL_EntitiesInBox( pList, 10, mins, maxs, (FL_CLIENT|FL_MONSTER) );
+	if ( count )
+	{
+		for ( int i = 0; i < count; i++ )
+		{
+			// only clients and monsters
+			if ( pList[i] != this && IRelationship( pList[i] ) > R_NO && pList[ i ]->pev->deadflag == DEAD_NO )	// this ent is one of our enemies. Barnacle tries to eat it.
+			{
+				return pList[i];
+			}
+		}
+	}
+
+	return NULL;
+}
diff --git a/main/source/dlls/barney.cpp b/main/source/dlls/barney.cpp
new file mode 100644
index 00000000..8bc39c71
--- /dev/null
+++ b/main/source/dlls/barney.cpp
@@ -0,0 +1,842 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// monster template
+//=========================================================
+// UNDONE: Holster weapon?
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"talkmonster.h"
+#include	"schedule.h"
+#include	"defaultai.h"
+#include	"scripted.h"
+#include	"weapons.h"
+#include	"soundent.h"
+
+//=========================================================
+// Monster's Anim Events Go Here
+//=========================================================
+// first flag is barney dying for scripted sequences?
+#define		BARNEY_AE_DRAW		( 2 )
+#define		BARNEY_AE_SHOOT		( 3 )
+#define		BARNEY_AE_HOLSTER	( 4 )
+
+#define	BARNEY_BODY_GUNHOLSTERED	0
+#define	BARNEY_BODY_GUNDRAWN		1
+#define BARNEY_BODY_GUNGONE			2
+
+class CBarney : public CTalkMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void SetYawSpeed( void );
+	int  ISoundMask( void );
+	void BarneyFirePistol( void );
+	void AlertSound( void );
+	int  Classify ( void );
+	void HandleAnimEvent( MonsterEvent_t *pEvent );
+	
+	void RunTask( Task_t *pTask );
+	void StartTask( Task_t *pTask );
+	virtual int	ObjectCaps( void ) { return CTalkMonster :: ObjectCaps() | FCAP_IMPULSE_USE; }
+	int TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType);
+	BOOL CheckRangeAttack1 ( float flDot, float flDist );
+	
+	void DeclineFollowing( void );
+
+	// Override these to set behavior
+	Schedule_t *GetScheduleOfType ( int Type );
+	Schedule_t *GetSchedule ( void );
+	MONSTERSTATE GetIdealState ( void );
+
+	void DeathSound( void );
+	void PainSound( void );
+	
+	void TalkInit( void );
+
+	void TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType);
+	void Killed( entvars_t *pevAttacker, int iGib );
+	
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	BOOL	m_fGunDrawn;
+	float	m_painTime;
+	float	m_checkAttackTime;
+	BOOL	m_lastAttackCheck;
+
+	// UNDONE: What is this for?  It isn't used?
+	float	m_flPlayerDamage;// how much pain has the player inflicted on me?
+
+	CUSTOM_SCHEDULES;
+};
+
+LINK_ENTITY_TO_CLASS( monster_barney, CBarney );
+
+TYPEDESCRIPTION	CBarney::m_SaveData[] = 
+{
+	DEFINE_FIELD( CBarney, m_fGunDrawn, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CBarney, m_painTime, FIELD_TIME ),
+	DEFINE_FIELD( CBarney, m_checkAttackTime, FIELD_TIME ),
+	DEFINE_FIELD( CBarney, m_lastAttackCheck, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CBarney, m_flPlayerDamage, FIELD_FLOAT ),
+};
+
+IMPLEMENT_SAVERESTORE( CBarney, CTalkMonster );
+
+//=========================================================
+// AI Schedules Specific to this monster
+//=========================================================
+Task_t	tlBaFollow[] =
+{
+	{ TASK_MOVE_TO_TARGET_RANGE,(float)128		},	// Move within 128 of target ent (client)
+	{ TASK_SET_SCHEDULE,		(float)SCHED_TARGET_FACE },
+};
+
+Schedule_t	slBaFollow[] =
+{
+	{
+		tlBaFollow,
+		ARRAYSIZE ( tlBaFollow ),
+		bits_COND_NEW_ENEMY		|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE	|
+		bits_COND_HEAR_SOUND |
+		bits_COND_PROVOKED,
+		bits_SOUND_DANGER,
+		"Follow"
+	},
+};
+
+//=========================================================
+// BarneyDraw- much better looking draw schedule for when
+// barney knows who he's gonna attack.
+//=========================================================
+Task_t	tlBarneyEnemyDraw[] =
+{
+	{ TASK_STOP_MOVING,					0				},
+	{ TASK_FACE_ENEMY,					0				},
+	{ TASK_PLAY_SEQUENCE_FACE_ENEMY,	(float) ACT_ARM },
+};
+
+Schedule_t slBarneyEnemyDraw[] = 
+{
+	{
+		tlBarneyEnemyDraw,
+		ARRAYSIZE ( tlBarneyEnemyDraw ),
+		0,
+		0,
+		"Barney Enemy Draw"
+	}
+};
+
+Task_t	tlBaFaceTarget[] =
+{
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE },
+	{ TASK_FACE_TARGET,			(float)0		},
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE },
+	{ TASK_SET_SCHEDULE,		(float)SCHED_TARGET_CHASE },
+};
+
+Schedule_t	slBaFaceTarget[] =
+{
+	{
+		tlBaFaceTarget,
+		ARRAYSIZE ( tlBaFaceTarget ),
+		bits_COND_CLIENT_PUSH	|
+		bits_COND_NEW_ENEMY		|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE	|
+		bits_COND_HEAR_SOUND |
+		bits_COND_PROVOKED,
+		bits_SOUND_DANGER,
+		"FaceTarget"
+	},
+};
+
+
+Task_t	tlIdleBaStand[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE },
+	{ TASK_WAIT,				(float)2		}, // repick IDLESTAND every two seconds.
+	{ TASK_TLK_HEADRESET,		(float)0		}, // reset head position
+};
+
+Schedule_t	slIdleBaStand[] =
+{
+	{ 
+		tlIdleBaStand,
+		ARRAYSIZE ( tlIdleBaStand ), 
+		bits_COND_NEW_ENEMY		|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE	|
+		bits_COND_HEAR_SOUND	|
+		bits_COND_SMELL			|
+		bits_COND_PROVOKED,
+
+		bits_SOUND_COMBAT		|// sound flags - change these, and you'll break the talking code.
+		//bits_SOUND_PLAYER		|
+		//bits_SOUND_WORLD		|
+		
+		bits_SOUND_DANGER		|
+		bits_SOUND_MEAT			|// scents
+		bits_SOUND_CARCASS		|
+		bits_SOUND_GARBAGE,
+		"IdleStand"
+	},
+};
+
+DEFINE_CUSTOM_SCHEDULES( CBarney )
+{
+	slBaFollow,
+	slBarneyEnemyDraw,
+	slBaFaceTarget,
+	slIdleBaStand,
+};
+
+
+IMPLEMENT_CUSTOM_SCHEDULES( CBarney, CTalkMonster );
+
+void CBarney :: StartTask( Task_t *pTask )
+{
+	CTalkMonster::StartTask( pTask );	
+}
+
+void CBarney :: RunTask( Task_t *pTask )
+{
+	switch ( pTask->iTask )
+	{
+	case TASK_RANGE_ATTACK1:
+		if (m_hEnemy != NULL && (m_hEnemy->IsPlayer()))
+		{
+			pev->framerate = 1.5;
+		}
+		CTalkMonster::RunTask( pTask );
+		break;
+	default:
+		CTalkMonster::RunTask( pTask );
+		break;
+	}
+}
+
+
+
+
+//=========================================================
+// ISoundMask - returns a bit mask indicating which types
+// of sounds this monster regards. 
+//=========================================================
+int CBarney :: ISoundMask ( void) 
+{
+	return	bits_SOUND_WORLD	|
+			bits_SOUND_COMBAT	|
+			bits_SOUND_CARCASS	|
+			bits_SOUND_MEAT		|
+			bits_SOUND_GARBAGE	|
+			bits_SOUND_DANGER	|
+			bits_SOUND_PLAYER;
+}
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CBarney :: Classify ( void )
+{
+	return	CLASS_PLAYER_ALLY;
+}
+
+//=========================================================
+// ALertSound - barney says "Freeze!"
+//=========================================================
+void CBarney :: AlertSound( void )
+{
+	if ( m_hEnemy != NULL )
+	{
+		if ( FOkToSpeak() )
+		{
+			PlaySentence( "BA_ATTACK", RANDOM_FLOAT(2.8, 3.2), VOL_NORM, ATTN_IDLE );
+		}
+	}
+
+}
+//=========================================================
+// SetYawSpeed - allows each sequence to have a different
+// turn rate associated with it.
+//=========================================================
+void CBarney :: SetYawSpeed ( void )
+{
+	int ys;
+
+	ys = 0;
+
+	switch ( m_Activity )
+	{
+	case ACT_IDLE:		
+		ys = 70;
+		break;
+	case ACT_WALK:
+		ys = 70;
+		break;
+	case ACT_RUN:
+		ys = 90;
+		break;
+	default:
+		ys = 70;
+		break;
+	}
+
+	pev->yaw_speed = ys;
+}
+
+
+//=========================================================
+// CheckRangeAttack1
+//=========================================================
+BOOL CBarney :: CheckRangeAttack1 ( float flDot, float flDist )
+{
+	if ( flDist <= 1024 && flDot >= 0.5 )
+	{
+		if ( gpGlobals->time > m_checkAttackTime )
+		{
+			TraceResult tr;
+			
+			Vector shootOrigin = pev->origin + Vector( 0, 0, 55 );
+			CBaseEntity *pEnemy = m_hEnemy;
+			Vector shootTarget = ( (pEnemy->BodyTarget( shootOrigin ) - pEnemy->pev->origin) + m_vecEnemyLKP );
+			UTIL_TraceLine( shootOrigin, shootTarget, dont_ignore_monsters, ENT(pev), &tr );
+			m_checkAttackTime = gpGlobals->time + 1;
+			if ( tr.flFraction == 1.0 || (tr.pHit != NULL && CBaseEntity::Instance(tr.pHit) == pEnemy) )
+				m_lastAttackCheck = TRUE;
+			else
+				m_lastAttackCheck = FALSE;
+			m_checkAttackTime = gpGlobals->time + 1.5;
+		}
+		return m_lastAttackCheck;
+	}
+	return FALSE;
+}
+
+
+//=========================================================
+// BarneyFirePistol - shoots one round from the pistol at
+// the enemy barney is facing.
+//=========================================================
+void CBarney :: BarneyFirePistol ( void )
+{
+	Vector vecShootOrigin;
+
+	UTIL_MakeVectors(pev->angles);
+	vecShootOrigin = pev->origin + Vector( 0, 0, 55 );
+	Vector vecShootDir = ShootAtEnemy( vecShootOrigin );
+
+	Vector angDir = UTIL_VecToAngles( vecShootDir );
+	SetBlending( 0, angDir.x );
+	pev->effects = EF_MUZZLEFLASH;
+
+	FireBullets(1, vecShootOrigin, vecShootDir, VECTOR_CONE_2DEGREES, 1024, BULLET_MONSTER_9MM );
+	
+	int pitchShift = RANDOM_LONG( 0, 20 );
+	
+	// Only shift about half the time
+	if ( pitchShift > 10 )
+		pitchShift = 0;
+	else
+		pitchShift -= 5;
+	EMIT_SOUND_DYN( ENT(pev), CHAN_WEAPON, "barney/ba_attack2.wav", 1, ATTN_NORM, 0, 100 + pitchShift );
+
+	CSoundEnt::InsertSound ( bits_SOUND_COMBAT, pev->origin, 384, 0.3 );
+
+	// UNDONE: Reload?
+	m_cAmmoLoaded--;// take away a bullet!
+}
+		
+//=========================================================
+// HandleAnimEvent - catches the monster-specific messages
+// that occur when tagged animation frames are played.
+//
+// Returns number of events handled, 0 if none.
+//=========================================================
+void CBarney :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	switch( pEvent->event )
+	{
+	case BARNEY_AE_SHOOT:
+		BarneyFirePistol();
+		break;
+
+	case BARNEY_AE_DRAW:
+		// barney's bodygroup switches here so he can pull gun from holster
+		pev->body = BARNEY_BODY_GUNDRAWN;
+		m_fGunDrawn = TRUE;
+		break;
+
+	case BARNEY_AE_HOLSTER:
+		// change bodygroup to replace gun in holster
+		pev->body = BARNEY_BODY_GUNHOLSTERED;
+		m_fGunDrawn = FALSE;
+		break;
+
+	default:
+		CTalkMonster::HandleAnimEvent( pEvent );
+	}
+}
+
+//=========================================================
+// Spawn
+//=========================================================
+void CBarney :: Spawn()
+{
+	Precache( );
+
+	SET_MODEL(ENT(pev), "models/barney.mdl");
+	UTIL_SetSize(pev, VEC_HUMAN_HULL_MIN, VEC_HUMAN_HULL_MAX);
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_STEP;
+	m_bloodColor		= BLOOD_COLOR_RED;
+	pev->health			= gSkillData.barneyHealth;
+	pev->view_ofs		= Vector ( 0, 0, 50 );// position of the eyes relative to monster's origin.
+	m_flFieldOfView		= VIEW_FIELD_WIDE; // NOTE: we need a wide field of view so npc will notice player and say hello
+	m_MonsterState		= MONSTERSTATE_NONE;
+
+	pev->body			= 0; // gun in holster
+	m_fGunDrawn			= FALSE;
+
+	m_afCapability		= bits_CAP_HEAR | bits_CAP_TURN_HEAD | bits_CAP_DOORS_GROUP;
+
+	MonsterInit();
+	SetUse( &CBarney::FollowerUse );
+}
+
+//=========================================================
+// Precache - precaches all resources this monster needs
+//=========================================================
+void CBarney :: Precache()
+{
+	PRECACHE_MODEL("models/barney.mdl");
+
+	PRECACHE_SOUND("barney/ba_attack1.wav" );
+	PRECACHE_SOUND("barney/ba_attack2.wav" );
+
+	PRECACHE_SOUND("barney/ba_pain1.wav");
+	PRECACHE_SOUND("barney/ba_pain2.wav");
+	PRECACHE_SOUND("barney/ba_pain3.wav");
+
+	PRECACHE_SOUND("barney/ba_die1.wav");
+	PRECACHE_SOUND("barney/ba_die2.wav");
+	PRECACHE_SOUND("barney/ba_die3.wav");
+	
+	// every new barney must call this, otherwise
+	// when a level is loaded, nobody will talk (time is reset to 0)
+	TalkInit();
+	CTalkMonster::Precache();
+}	
+
+// Init talk data
+void CBarney :: TalkInit()
+{
+	
+	CTalkMonster::TalkInit();
+
+	// scientists speach group names (group names are in sentences.txt)
+
+	m_szGrp[TLK_ANSWER]  =	"BA_ANSWER";
+	m_szGrp[TLK_QUESTION] =	"BA_QUESTION";
+	m_szGrp[TLK_IDLE] =		"BA_IDLE";
+	m_szGrp[TLK_STARE] =		"BA_STARE";
+	m_szGrp[TLK_USE] =		"BA_OK";
+	m_szGrp[TLK_UNUSE] =	"BA_WAIT";
+	m_szGrp[TLK_STOP] =		"BA_STOP";
+
+	m_szGrp[TLK_NOSHOOT] =	"BA_SCARED";
+	m_szGrp[TLK_HELLO] =	"BA_HELLO";
+
+	m_szGrp[TLK_PLHURT1] =	"!BA_CUREA";
+	m_szGrp[TLK_PLHURT2] =	"!BA_CUREB"; 
+	m_szGrp[TLK_PLHURT3] =	"!BA_CUREC";
+
+	m_szGrp[TLK_PHELLO] =	NULL;	//"BA_PHELLO";		// UNDONE
+	m_szGrp[TLK_PIDLE] =	NULL;	//"BA_PIDLE";			// UNDONE
+	m_szGrp[TLK_PQUESTION] = "BA_PQUEST";		// UNDONE
+
+	m_szGrp[TLK_SMELL] =	"BA_SMELL";
+	
+	m_szGrp[TLK_WOUND] =	"BA_WOUND";
+	m_szGrp[TLK_MORTAL] =	"BA_MORTAL";
+
+	// get voice for head - just one barney voice for now
+	m_voicePitch = 100;
+}
+
+
+static BOOL IsFacing( entvars_t *pevTest, const Vector &reference )
+{
+	Vector vecDir = (reference - pevTest->origin);
+	vecDir.z = 0;
+	vecDir = vecDir.Normalize();
+	Vector forward, angle;
+	angle = pevTest->v_angle;
+	angle.x = 0;
+	UTIL_MakeVectorsPrivate( angle, forward, NULL, NULL );
+	// He's facing me, he meant it
+	if ( DotProduct( forward, vecDir ) > 0.96 )	// +/- 15 degrees or so
+	{
+		return TRUE;
+	}
+	return FALSE;
+}
+
+
+int CBarney :: TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType)
+{
+	// make sure friends talk about it if player hurts talkmonsters...
+	int ret = CTalkMonster::TakeDamage(pevInflictor, pevAttacker, flDamage, bitsDamageType);
+	if ( !IsAlive() || pev->deadflag == DEAD_DYING )
+		return ret;
+
+	if ( m_MonsterState != MONSTERSTATE_PRONE && (pevAttacker->flags & FL_CLIENT) )
+	{
+		m_flPlayerDamage += flDamage;
+
+		// This is a heurstic to determine if the player intended to harm me
+		// If I have an enemy, we can't establish intent (may just be crossfire)
+		if ( m_hEnemy == NULL )
+		{
+			// If the player was facing directly at me, or I'm already suspicious, get mad
+			if ( (m_afMemory & bits_MEMORY_SUSPICIOUS) || IsFacing( pevAttacker, pev->origin ) )
+			{
+				// Alright, now I'm pissed!
+				PlaySentence( "BA_MAD", 4, VOL_NORM, ATTN_NORM );
+
+				Remember( bits_MEMORY_PROVOKED );
+				StopFollowing( TRUE );
+			}
+			else
+			{
+				// Hey, be careful with that
+				PlaySentence( "BA_SHOT", 4, VOL_NORM, ATTN_NORM );
+				Remember( bits_MEMORY_SUSPICIOUS );
+			}
+		}
+		else if ( !(m_hEnemy->IsPlayer()) && pev->deadflag == DEAD_NO )
+		{
+			PlaySentence( "BA_SHOT", 4, VOL_NORM, ATTN_NORM );
+		}
+	}
+
+	return ret;
+}
+
+	
+//=========================================================
+// PainSound
+//=========================================================
+void CBarney :: PainSound ( void )
+{
+	if (gpGlobals->time < m_painTime)
+		return;
+	
+	m_painTime = gpGlobals->time + RANDOM_FLOAT(0.5, 0.75);
+
+	switch (RANDOM_LONG(0,2))
+	{
+	case 0: EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, "barney/ba_pain1.wav", 1, ATTN_NORM, 0, GetVoicePitch()); break;
+	case 1: EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, "barney/ba_pain2.wav", 1, ATTN_NORM, 0, GetVoicePitch()); break;
+	case 2: EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, "barney/ba_pain3.wav", 1, ATTN_NORM, 0, GetVoicePitch()); break;
+	}
+}
+
+//=========================================================
+// DeathSound 
+//=========================================================
+void CBarney :: DeathSound ( void )
+{
+	switch (RANDOM_LONG(0,2))
+	{
+	case 0: EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, "barney/ba_die1.wav", 1, ATTN_NORM, 0, GetVoicePitch()); break;
+	case 1: EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, "barney/ba_die2.wav", 1, ATTN_NORM, 0, GetVoicePitch()); break;
+	case 2: EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, "barney/ba_die3.wav", 1, ATTN_NORM, 0, GetVoicePitch()); break;
+	}
+}
+
+
+void CBarney::TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType)
+{
+	switch( ptr->iHitgroup)
+	{
+	case HITGROUP_CHEST:
+	case HITGROUP_STOMACH:
+		if (bitsDamageType & (DMG_BULLET | DMG_SLASH | DMG_BLAST))
+		{
+			flDamage = flDamage / 2;
+		}
+		break;
+	case 10:
+		if (bitsDamageType & (DMG_BULLET | DMG_SLASH | DMG_CLUB))
+		{
+			flDamage -= 20;
+			if (flDamage <= 0)
+			{
+				UTIL_Ricochet( ptr->vecEndPos, 1.0 );
+				flDamage = 0.01;
+			}
+		}
+		// always a head shot
+		ptr->iHitgroup = HITGROUP_HEAD;
+		break;
+	}
+
+	CTalkMonster::TraceAttack( pevAttacker, flDamage, vecDir, ptr, bitsDamageType );
+}
+
+
+void CBarney::Killed( entvars_t *pevAttacker, int iGib )
+{
+	if ( pev->body < BARNEY_BODY_GUNGONE )
+	{// drop the gun!
+		Vector vecGunPos;
+		Vector vecGunAngles;
+
+		pev->body = BARNEY_BODY_GUNGONE;
+
+		GetAttachment( 0, vecGunPos, vecGunAngles );
+
+		// Removed because AvH doesn't use this weapon		
+		//CBaseEntity *pGun = DropItem( "weapon_9mmhandgun", vecGunPos, vecGunAngles );
+	}
+
+	SetUse( NULL );	
+	CTalkMonster::Killed( pevAttacker, iGib );
+}
+
+//=========================================================
+// AI Schedules Specific to this monster
+//=========================================================
+
+Schedule_t* CBarney :: GetScheduleOfType ( int Type )
+{
+	Schedule_t *psched;
+
+	switch( Type )
+	{
+	case SCHED_ARM_WEAPON:
+		if ( m_hEnemy != NULL )
+		{
+			// face enemy, then draw.
+			return slBarneyEnemyDraw;
+		}
+		break;
+
+	// Hook these to make a looping schedule
+	case SCHED_TARGET_FACE:
+		// call base class default so that barney will talk
+		// when 'used' 
+		psched = CTalkMonster::GetScheduleOfType(Type);
+
+		if (psched == slIdleStand)
+			return slBaFaceTarget;	// override this for different target face behavior
+		else
+			return psched;
+
+	case SCHED_TARGET_CHASE:
+		return slBaFollow;
+
+	case SCHED_IDLE_STAND:
+		// call base class default so that scientist will talk
+		// when standing during idle
+		psched = CTalkMonster::GetScheduleOfType(Type);
+
+		if (psched == slIdleStand)
+		{
+			// just look straight ahead.
+			return slIdleBaStand;
+		}
+		else
+			return psched;	
+	}
+
+	return CTalkMonster::GetScheduleOfType( Type );
+}
+
+//=========================================================
+// GetSchedule - Decides which type of schedule best suits
+// the monster's current state and conditions. Then calls
+// monster's member function to get a pointer to a schedule
+// of the proper type.
+//=========================================================
+Schedule_t *CBarney :: GetSchedule ( void )
+{
+	if ( HasConditions( bits_COND_HEAR_SOUND ) )
+	{
+		CSound *pSound;
+		pSound = PBestSound();
+
+		ASSERT( pSound != NULL );
+		if ( pSound && (pSound->m_iType & bits_SOUND_DANGER) )
+			return GetScheduleOfType( SCHED_TAKE_COVER_FROM_BEST_SOUND );
+	}
+	if ( HasConditions( bits_COND_ENEMY_DEAD ) && FOkToSpeak() )
+	{
+		PlaySentence( "BA_KILL", 4, VOL_NORM, ATTN_NORM );
+	}
+
+	switch( m_MonsterState )
+	{
+	case MONSTERSTATE_COMBAT:
+		{
+// dead enemy
+			if ( HasConditions( bits_COND_ENEMY_DEAD ) )
+			{
+				// call base class, all code to handle dead enemies is centralized there.
+				return CBaseMonster :: GetSchedule();
+			}
+
+			// always act surprized with a new enemy
+			if ( HasConditions( bits_COND_NEW_ENEMY ) && HasConditions( bits_COND_LIGHT_DAMAGE) )
+				return GetScheduleOfType( SCHED_SMALL_FLINCH );
+				
+			// wait for one schedule to draw gun
+			if (!m_fGunDrawn )
+				return GetScheduleOfType( SCHED_ARM_WEAPON );
+
+			if ( HasConditions( bits_COND_HEAVY_DAMAGE ) )
+				return GetScheduleOfType( SCHED_TAKE_COVER_FROM_ENEMY );
+		}
+		break;
+
+	case MONSTERSTATE_ALERT:	
+	case MONSTERSTATE_IDLE:
+		if ( HasConditions(bits_COND_LIGHT_DAMAGE | bits_COND_HEAVY_DAMAGE))
+		{
+			// flinch if hurt
+			return GetScheduleOfType( SCHED_SMALL_FLINCH );
+		}
+
+		if ( m_hEnemy == NULL && IsFollowing() )
+		{
+			if ( !m_hTargetEnt->IsAlive() )
+			{
+				// UNDONE: Comment about the recently dead player here?
+				StopFollowing( FALSE );
+				break;
+			}
+			else
+			{
+				if ( HasConditions( bits_COND_CLIENT_PUSH ) )
+				{
+					return GetScheduleOfType( SCHED_MOVE_AWAY_FOLLOW );
+				}
+				return GetScheduleOfType( SCHED_TARGET_FACE );
+			}
+		}
+
+		if ( HasConditions( bits_COND_CLIENT_PUSH ) )
+		{
+			return GetScheduleOfType( SCHED_MOVE_AWAY );
+		}
+
+		// try to say something about smells
+		TrySmellTalk();
+		break;
+	}
+	
+	return CTalkMonster::GetSchedule();
+}
+
+MONSTERSTATE CBarney :: GetIdealState ( void )
+{
+	return CTalkMonster::GetIdealState();
+}
+
+
+
+void CBarney::DeclineFollowing( void )
+{
+	PlaySentence( "BA_POK", 2, VOL_NORM, ATTN_NORM );
+}
+
+
+
+
+
+//=========================================================
+// DEAD BARNEY PROP
+//
+// Designer selects a pose in worldcraft, 0 through num_poses-1
+// this value is added to what is selected as the 'first dead pose'
+// among the monster's normal animations. All dead poses must
+// appear sequentially in the model file. Be sure and set
+// the m_iFirstPose properly!
+//
+//=========================================================
+class CDeadBarney : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	int	Classify ( void ) { return	CLASS_PLAYER_ALLY; }
+
+	void KeyValue( KeyValueData *pkvd );
+
+	int	m_iPose;// which sequence to display	-- temporary, don't need to save
+	static char *m_szPoses[3];
+};
+
+char *CDeadBarney::m_szPoses[] = { "lying_on_back", "lying_on_side", "lying_on_stomach" };
+
+void CDeadBarney::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "pose"))
+	{
+		m_iPose = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else 
+		CBaseMonster::KeyValue( pkvd );
+}
+
+LINK_ENTITY_TO_CLASS( monster_barney_dead, CDeadBarney );
+
+//=========================================================
+// ********** DeadBarney SPAWN **********
+//=========================================================
+void CDeadBarney :: Spawn( )
+{
+	PRECACHE_MODEL("models/barney.mdl");
+	SET_MODEL(ENT(pev), "models/barney.mdl");
+
+	pev->effects		= 0;
+	pev->yaw_speed		= 8;
+	pev->sequence		= 0;
+	m_bloodColor		= BLOOD_COLOR_RED;
+
+	pev->sequence = LookupSequence( m_szPoses[m_iPose] );
+	if (pev->sequence == -1)
+	{
+		ALERT ( at_console, "Dead barney with bad pose\n" );
+	}
+	// Corpses have less health
+	pev->health			= 8;//gSkillData.barneyHealth;
+
+	MonsterInitDead();
+}
+
+
diff --git a/main/source/dlls/basemonster.h b/main/source/dlls/basemonster.h
new file mode 100644
index 00000000..d17db81d
--- /dev/null
+++ b/main/source/dlls/basemonster.h
@@ -0,0 +1,95 @@
+/***
+*
+*	Copyright (c) 1996-2002, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef BASEMONSTER_H
+#define BASEMONSTER_H
+
+class CBaseMonster : public CBaseToggle
+{
+public:
+	Activity			m_Activity;// what the monster is doing (animation)
+	Activity			m_IdealActivity;// monster should switch to this activity
+	int					m_LastHitGroup; // the last body region that took damage
+	int					m_bitsDamageType;	// what types of damage has monster (player) taken
+	BYTE				m_rgbTimeBasedDamage[CDMG_TIMEBASED];
+	MONSTERSTATE		m_MonsterState;// monster's current state
+	MONSTERSTATE		m_IdealMonsterState;// monster should change to this state
+	int					m_afConditions;
+	int					m_afMemory;
+	float				m_flNextAttack;		// cannot attack again until this time
+	EHANDLE				m_hEnemy;		 // the entity that the monster is fighting.
+	EHANDLE				m_hTargetEnt;	 // the entity that the monster is trying to reach
+	float				m_flFieldOfView;// width of monster's field of view ( dot product )
+	int					m_bloodColor;		// color of blood particless
+	Vector				m_HackedGunPos;	// HACK until we can query end of gun
+	Vector				m_vecEnemyLKP;// last known position of enemy. (enemy's origin)
+
+
+	void KeyValue( KeyValueData *pkvd );
+
+	void MakeIdealYaw( Vector vecTarget );
+	virtual float ChangeYaw ( int speed );
+	virtual BOOL HasHumanGibs( void );
+	virtual BOOL HasAlienGibs( void );
+	virtual void FadeMonster( void );	// Called instead of GibMonster() when gibs are disabled
+	virtual void GibMonster( void );
+	virtual Activity GetDeathActivity ( void );
+	Activity GetSmallFlinchActivity( void );
+	virtual void BecomeDead( void );
+	BOOL		 ShouldGibMonster( int iGib );
+	void		 CallGibMonster( void );
+	virtual BOOL	ShouldFadeOnDeath( void );
+	BOOL FCheckAITrigger( void );// checks and, if necessary, fires the monster's trigger target. 
+	virtual int IRelationship ( CBaseEntity *pTarget );
+	virtual int TakeHealth( float flHealth, int bitsDamageType );
+	virtual int TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType);
+	int			DeadTakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType );
+	float DamageForce( float damage );
+	virtual void Killed( entvars_t *pevAttacker, int iGib );
+	virtual void PainSound ( void ) { return; };
+
+	void RadiusDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int iClassIgnore, int bitsDamageType );
+	void RadiusDamage(Vector vecSrc, entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int iClassIgnore, int bitsDamageType );
+
+	inline void	SetConditions( int iConditions ) { m_afConditions |= iConditions; }
+	inline void	ClearConditions( int iConditions ) { m_afConditions &= ~iConditions; }
+	inline BOOL HasConditions( int iConditions ) { if ( m_afConditions & iConditions ) return TRUE; return FALSE; }
+	inline BOOL HasAllConditions( int iConditions ) { if ( (m_afConditions & iConditions) == iConditions ) return TRUE; return FALSE; }
+
+	inline void	Remember( int iMemory ) { m_afMemory |= iMemory; }
+	inline void	Forget( int iMemory ) { m_afMemory &= ~iMemory; }
+	inline BOOL HasMemory( int iMemory ) { if ( m_afMemory & iMemory ) return TRUE; return FALSE; }
+	inline BOOL HasAllMemories( int iMemory ) { if ( (m_afMemory & iMemory) == iMemory ) return TRUE; return FALSE; }
+
+	// This will stop animation until you call ResetSequenceInfo() at some point in the future
+	inline void StopAnimation( void ) { pev->framerate = 0; }
+
+	virtual void ReportAIState( void );
+	virtual void MonsterInitDead( void );	// Call after animation/pose is set up
+	void EXPORT CorpseFallThink( void );
+
+	virtual void Look ( int iDistance );// basic sight function for monsters
+	virtual CBaseEntity* BestVisibleEnemy ( void );// finds best visible enemy for attack
+	CBaseEntity *CheckTraceHullAttack( float flDist, float& ioDamage, int iDmgType );
+	virtual int	GetHull() const;
+	virtual BOOL FInViewCone ( CBaseEntity *pEntity );// see if pEntity is in monster's view cone
+	virtual BOOL FInViewCone ( Vector *pOrigin );// see if given location is in monster's view cone
+	void TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType);
+	void MakeDamageBloodDecal ( int cCount, float flNoise, TraceResult *ptr, const Vector &vecDir );
+	virtual BOOL	IsAlive( void ) { return (pev->deadflag != DEAD_DEAD); }
+
+};
+
+
+#endif
diff --git a/main/source/dlls/bigmomma.cpp b/main/source/dlls/bigmomma.cpp
new file mode 100644
index 00000000..f49e160b
--- /dev/null
+++ b/main/source/dlls/bigmomma.cpp
@@ -0,0 +1,1251 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD )
+
+//=========================================================
+// monster template
+//=========================================================
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"schedule.h"
+#include	"decals.h"
+#include	"weapons.h"
+#include	"game.h"
+
+#define SF_INFOBM_RUN		0x0001
+#define SF_INFOBM_WAIT		0x0002
+
+// AI Nodes for Big Momma
+class CInfoBM : public CPointEntity
+{
+public:
+	void Spawn( void );
+	void KeyValue( KeyValueData* pkvd );
+
+	// name in pev->targetname
+	// next in pev->target
+	// radius in pev->scale
+	// health in pev->health
+	// Reach target in pev->message
+	// Reach delay in pev->speed
+	// Reach sequence in pev->netname
+	
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	int		m_preSequence;
+};
+
+LINK_ENTITY_TO_CLASS( info_bigmomma, CInfoBM );
+
+TYPEDESCRIPTION	CInfoBM::m_SaveData[] = 
+{
+	DEFINE_FIELD( CInfoBM, m_preSequence, FIELD_STRING ),
+};
+
+IMPLEMENT_SAVERESTORE( CInfoBM, CPointEntity );
+
+void CInfoBM::Spawn( void )
+{
+}
+
+
+void CInfoBM::KeyValue( KeyValueData* pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "radius"))
+	{
+		pev->scale = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "reachdelay"))
+	{
+		pev->speed = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "reachtarget"))
+	{
+		pev->message = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "reachsequence"))
+	{
+		pev->netname = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "presequence"))
+	{
+		m_preSequence = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CPointEntity::KeyValue( pkvd );
+}
+
+//=========================================================
+// Mortar shot entity
+//=========================================================
+class CBMortar : public CBaseEntity
+{
+public:
+	void Spawn( void );
+
+	static CBMortar *Shoot( edict_t *pOwner, Vector vecStart, Vector vecVelocity );
+	void Touch( CBaseEntity *pOther );
+	void EXPORT Animate( void );
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	int  m_maxFrame;
+};
+
+LINK_ENTITY_TO_CLASS( bmortar, CBMortar );
+
+TYPEDESCRIPTION	CBMortar::m_SaveData[] = 
+{
+	DEFINE_FIELD( CBMortar, m_maxFrame, FIELD_INTEGER ),
+};
+
+IMPLEMENT_SAVERESTORE( CBMortar, CBaseEntity );
+
+
+//=========================================================
+// Monster's Anim Events Go Here
+//=========================================================
+#define	BIG_AE_STEP1				1		// Footstep left
+#define	BIG_AE_STEP2				2		// Footstep right
+#define	BIG_AE_STEP3				3		// Footstep back left
+#define	BIG_AE_STEP4				4		// Footstep back right
+#define BIG_AE_SACK					5		// Sack slosh
+#define BIG_AE_DEATHSOUND			6		// Death sound
+
+#define	BIG_AE_MELEE_ATTACKBR		8		// Leg attack
+#define	BIG_AE_MELEE_ATTACKBL		9		// Leg attack
+#define	BIG_AE_MELEE_ATTACK1		10		// Leg attack
+#define BIG_AE_MORTAR_ATTACK1		11		// Launch a mortar
+#define BIG_AE_LAY_CRAB				12		// Lay a headcrab
+#define BIG_AE_JUMP_FORWARD			13		// Jump up and forward
+#define BIG_AE_SCREAM				14		// alert sound
+#define BIG_AE_PAIN_SOUND			15		// pain sound
+#define BIG_AE_ATTACK_SOUND			16		// attack sound
+#define BIG_AE_BIRTH_SOUND			17		// birth sound
+#define BIG_AE_EARLY_TARGET			50		// Fire target early
+
+
+
+// User defined conditions
+#define bits_COND_NODE_SEQUENCE			( bits_COND_SPECIAL1 )		// pev->netname contains the name of a sequence to play
+
+// Attack distance constants
+#define	BIG_ATTACKDIST		170
+#define BIG_MORTARDIST		800
+#define BIG_MAXCHILDREN		20			// Max # of live headcrab children
+
+
+#define bits_MEMORY_CHILDPAIR		(bits_MEMORY_CUSTOM1)
+#define bits_MEMORY_ADVANCE_NODE	(bits_MEMORY_CUSTOM2)
+#define bits_MEMORY_COMPLETED_NODE	(bits_MEMORY_CUSTOM3)
+#define bits_MEMORY_FIRED_NODE		(bits_MEMORY_CUSTOM4)
+
+int gSpitSprite, gSpitDebrisSprite;
+Vector VecCheckSplatToss( entvars_t *pev, const Vector &vecSpot1, Vector vecSpot2, float maxHeight );
+void MortarSpray( const Vector &position, const Vector &direction, int spriteModel, int count );
+
+
+// UNDONE:	
+//
+#define BIG_CHILDCLASS		"monster_babycrab"
+
+class CBigMomma : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void KeyValue( KeyValueData *pkvd );
+	void Activate( void );
+	int TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType );
+
+	void		RunTask( Task_t *pTask );
+	void		StartTask( Task_t *pTask );
+	Schedule_t	*GetSchedule( void );
+	Schedule_t	*GetScheduleOfType( int Type );
+	void		TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType );
+
+	void NodeStart( int iszNextNode );
+	void NodeReach( void );
+	BOOL ShouldGoToNode( void );
+
+	void SetYawSpeed( void );
+	int  Classify ( void );
+	void HandleAnimEvent( MonsterEvent_t *pEvent );
+	void LayHeadcrab( void );
+
+	int GetNodeSequence( void )
+	{
+		CBaseEntity *pTarget = m_hTargetEnt;
+		if ( pTarget )
+		{
+			return pTarget->pev->netname;	// netname holds node sequence
+		}
+		return 0;
+	}
+
+
+	int GetNodePresequence( void )
+	{
+		CInfoBM *pTarget = (CInfoBM *)(CBaseEntity *)m_hTargetEnt;
+		if ( pTarget )
+		{
+			return pTarget->m_preSequence;
+		}
+		return 0;
+	}
+
+	float GetNodeDelay( void )
+	{
+		CBaseEntity *pTarget = m_hTargetEnt;
+		if ( pTarget )
+		{
+			return pTarget->pev->speed;	// Speed holds node delay
+		}
+		return 0;
+	}
+
+	float GetNodeRange( void )
+	{
+		CBaseEntity *pTarget = m_hTargetEnt;
+		if ( pTarget )
+		{
+			return pTarget->pev->scale;	// Scale holds node delay
+		}
+		return 1e6;
+	}
+
+	float GetNodeYaw( void )
+	{
+		CBaseEntity *pTarget = m_hTargetEnt;
+		if ( pTarget )
+		{
+			if ( pTarget->pev->angles.y != 0 )
+				return pTarget->pev->angles.y;
+		}
+		return pev->angles.y;
+	}
+	
+	// Restart the crab count on each new level
+	void OverrideReset( void )
+	{
+		m_crabCount = 0;
+	}
+
+	void DeathNotice( entvars_t *pevChild );
+
+	BOOL CanLayCrab( void ) 
+	{ 
+		if ( m_crabTime < gpGlobals->time && m_crabCount < BIG_MAXCHILDREN )
+		{
+			// Don't spawn crabs inside each other
+			Vector mins = pev->origin - Vector( 32, 32, 0 );
+			Vector maxs = pev->origin + Vector( 32, 32, 0 );
+
+			CBaseEntity *pList[2];
+			int count = UTIL_EntitiesInBox( pList, 2, mins, maxs, FL_MONSTER );
+			for ( int i = 0; i < count; i++ )
+			{
+				if ( pList[i] != this )	// Don't hurt yourself!
+					return FALSE;
+			}
+			return TRUE;
+		}
+
+		return FALSE;
+	}
+
+	void LaunchMortar( void );
+
+	void SetObjectCollisionBox( void )
+	{
+		pev->absmin = pev->origin + Vector( -95, -95, 0 );
+		pev->absmax = pev->origin + Vector( 95, 95, 190 );
+	}
+
+	BOOL CheckMeleeAttack1( float flDot, float flDist );	// Slash
+	BOOL CheckMeleeAttack2( float flDot, float flDist );	// Lay a crab
+	BOOL CheckRangeAttack1( float flDot, float flDist );	// Mortar launch
+
+	virtual int	Save( CSave &save );
+	virtual int	Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	static const char *pChildDieSounds[];
+	static const char *pSackSounds[];
+	static const char *pDeathSounds[];
+	static const char *pAttackSounds[];
+	static const char *pAttackHitSounds[];
+	static const char *pBirthSounds[];
+	static const char *pAlertSounds[];
+	static const char *pPainSounds[];
+	static const char *pFootSounds[];
+
+	CUSTOM_SCHEDULES;
+
+private:
+	float	m_nodeTime;
+	float	m_crabTime;
+	float	m_mortarTime;
+	float	m_painSoundTime;
+	int		m_crabCount;
+};
+LINK_ENTITY_TO_CLASS( monster_bigmomma, CBigMomma );
+
+TYPEDESCRIPTION	CBigMomma::m_SaveData[] = 
+{
+	DEFINE_FIELD( CBigMomma, m_nodeTime, FIELD_TIME ),
+	DEFINE_FIELD( CBigMomma, m_crabTime, FIELD_TIME ),
+	DEFINE_FIELD( CBigMomma, m_mortarTime, FIELD_TIME ),
+	DEFINE_FIELD( CBigMomma, m_painSoundTime, FIELD_TIME ),
+	DEFINE_FIELD( CBigMomma, m_crabCount, FIELD_INTEGER ),
+};
+
+IMPLEMENT_SAVERESTORE( CBigMomma, CBaseMonster );
+
+const char *CBigMomma::pChildDieSounds[] = 
+{
+	"gonarch/gon_childdie1.wav",
+	"gonarch/gon_childdie2.wav",
+	"gonarch/gon_childdie3.wav",
+};
+
+const char *CBigMomma::pSackSounds[] = 
+{
+	"gonarch/gon_sack1.wav",
+	"gonarch/gon_sack2.wav",
+	"gonarch/gon_sack3.wav",
+};
+
+const char *CBigMomma::pDeathSounds[] = 
+{
+	"gonarch/gon_die1.wav",
+};
+
+const char *CBigMomma::pAttackSounds[] = 
+{
+	"gonarch/gon_attack1.wav",
+	"gonarch/gon_attack2.wav",
+	"gonarch/gon_attack3.wav",
+};
+const char *CBigMomma::pAttackHitSounds[] = 
+{
+	"zombie/claw_strike1.wav",
+	"zombie/claw_strike2.wav",
+	"zombie/claw_strike3.wav",
+};
+
+const char *CBigMomma::pBirthSounds[] = 
+{
+	"gonarch/gon_birth1.wav",
+	"gonarch/gon_birth2.wav",
+	"gonarch/gon_birth3.wav",
+};
+
+const char *CBigMomma::pAlertSounds[] = 
+{
+	"gonarch/gon_alert1.wav",
+	"gonarch/gon_alert2.wav",
+	"gonarch/gon_alert3.wav",
+};
+
+const char *CBigMomma::pPainSounds[] = 
+{
+	"gonarch/gon_pain2.wav",
+	"gonarch/gon_pain4.wav",
+	"gonarch/gon_pain5.wav",
+};
+
+const char *CBigMomma::pFootSounds[] = 
+{
+	"gonarch/gon_step1.wav",
+	"gonarch/gon_step2.wav",
+	"gonarch/gon_step3.wav",
+};
+
+
+
+void CBigMomma :: KeyValue( KeyValueData *pkvd )
+{
+#if 0
+	if (FStrEq(pkvd->szKeyName, "volume"))
+	{
+		m_volume = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+#endif
+		CBaseMonster::KeyValue( pkvd );
+}
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CBigMomma :: Classify ( void )
+{
+	return	CLASS_ALIEN_MONSTER;
+}
+
+//=========================================================
+// SetYawSpeed - allows each sequence to have a different
+// turn rate associated with it.
+//=========================================================
+void CBigMomma :: SetYawSpeed ( void )
+{
+	int ys;
+
+	switch ( m_Activity )
+	{
+	case ACT_IDLE:
+		ys = 100;
+		break;
+	default:
+		ys = 90;
+	}
+	pev->yaw_speed = ys;
+}
+
+//=========================================================
+// HandleAnimEvent - catches the monster-specific messages
+// that occur when tagged animation frames are played.
+//
+// Returns number of events handled, 0 if none.
+//=========================================================
+void CBigMomma :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	switch( pEvent->event )
+	{
+		case BIG_AE_MELEE_ATTACKBR:
+		case BIG_AE_MELEE_ATTACKBL:
+		case BIG_AE_MELEE_ATTACK1:
+		{
+			Vector forward, right;
+
+			UTIL_MakeVectorsPrivate( pev->angles, forward, right, NULL );
+
+			Vector center = pev->origin + forward * 128;
+			Vector mins = center - Vector( 64, 64, 0 );
+			Vector maxs = center + Vector( 64, 64, 64 );
+
+			CBaseEntity *pList[8];
+			int count = UTIL_EntitiesInBox( pList, 8, mins, maxs, FL_MONSTER|FL_CLIENT );
+			CBaseEntity *pHurt = NULL;
+
+			for ( int i = 0; i < count && !pHurt; i++ )
+			{
+				if ( pList[i] != this )
+				{
+					if ( pList[i]->pev->owner != edict() )
+						pHurt = pList[i];
+				}
+			}
+					
+			if ( pHurt )
+			{
+				pHurt->TakeDamage( pev, pev, gSkillData.bigmommaDmgSlash, DMG_CRUSH | DMG_SLASH );
+				pHurt->pev->punchangle.x = 15;
+				switch( pEvent->event )
+				{
+					case BIG_AE_MELEE_ATTACKBR:
+						pHurt->pev->velocity = pHurt->pev->velocity + (forward * 150) + Vector(0,0,250) - (right * 200);
+					break;
+
+					case BIG_AE_MELEE_ATTACKBL:
+						pHurt->pev->velocity = pHurt->pev->velocity + (forward * 150) + Vector(0,0,250) + (right * 200);
+					break;
+
+					case BIG_AE_MELEE_ATTACK1:
+						pHurt->pev->velocity = pHurt->pev->velocity + (forward * 220) + Vector(0,0,200);
+					break;
+				}
+
+				pHurt->pev->flags &= ~FL_ONGROUND;
+				EMIT_SOUND_DYN( edict(), CHAN_WEAPON, RANDOM_SOUND_ARRAY(pAttackHitSounds), 1.0, ATTN_NORM, 0, 100 + RANDOM_LONG(-5,5) );
+			}
+		}
+		break;
+		
+		case BIG_AE_SCREAM:
+			EMIT_SOUND_ARRAY_DYN( CHAN_VOICE, pAlertSounds );
+			break;
+		
+		case BIG_AE_PAIN_SOUND:
+			EMIT_SOUND_ARRAY_DYN( CHAN_VOICE, pPainSounds );
+			break;
+		
+		case BIG_AE_ATTACK_SOUND:
+			EMIT_SOUND_ARRAY_DYN( CHAN_WEAPON, pAttackSounds );
+			break;
+
+		case BIG_AE_BIRTH_SOUND:
+			EMIT_SOUND_ARRAY_DYN( CHAN_BODY, pBirthSounds );
+			break;
+
+		case BIG_AE_SACK:
+			if ( RANDOM_LONG(0,100) < 30 )
+				EMIT_SOUND_ARRAY_DYN( CHAN_BODY, pSackSounds );
+			break;
+
+		case BIG_AE_DEATHSOUND:
+			EMIT_SOUND_ARRAY_DYN( CHAN_VOICE, pDeathSounds );
+			break;
+
+		case BIG_AE_STEP1:		// Footstep left
+		case BIG_AE_STEP3:		// Footstep back left
+			EMIT_SOUND_ARRAY_DYN( CHAN_ITEM, pFootSounds );
+			break;
+
+		case BIG_AE_STEP4:		// Footstep back right
+		case BIG_AE_STEP2:		// Footstep right
+			EMIT_SOUND_ARRAY_DYN( CHAN_BODY, pFootSounds );
+			break;
+
+		case BIG_AE_MORTAR_ATTACK1:
+			LaunchMortar();
+			break;
+
+		case BIG_AE_LAY_CRAB:
+			LayHeadcrab();
+			break;
+
+		case BIG_AE_JUMP_FORWARD:
+			ClearBits( pev->flags, FL_ONGROUND );
+
+			UTIL_SetOrigin (pev, pev->origin + Vector ( 0 , 0 , 1) );// take him off ground so engine doesn't instantly reset onground 
+			UTIL_MakeVectors ( pev->angles );
+
+			pev->velocity = (gpGlobals->v_forward * 200) + gpGlobals->v_up * 500;
+			break;
+
+		case BIG_AE_EARLY_TARGET:
+			{
+				CBaseEntity *pTarget = m_hTargetEnt;
+				if ( pTarget && pTarget->pev->message )
+					FireTargets( STRING(pTarget->pev->message), this, this, USE_TOGGLE, 0 );
+				Remember( bits_MEMORY_FIRED_NODE );
+			}
+			break;
+
+		default:
+			CBaseMonster::HandleAnimEvent( pEvent );
+			break;
+	}
+}
+
+void CBigMomma :: TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType )
+{
+	if ( ptr->iHitgroup != 1 )
+	{
+		// didn't hit the sack?
+		
+		if ( pev->dmgtime != gpGlobals->time || (RANDOM_LONG(0,10) < 1) )
+		{
+			UTIL_Ricochet( ptr->vecEndPos, RANDOM_FLOAT( 1, 2) );
+			pev->dmgtime = gpGlobals->time;
+		}
+
+		flDamage = 0.1;// don't hurt the monster much, but allow bits_COND_LIGHT_DAMAGE to be generated
+	}
+	else if ( gpGlobals->time > m_painSoundTime )
+	{
+		m_painSoundTime = gpGlobals->time + RANDOM_LONG(1, 3);
+		EMIT_SOUND_ARRAY_DYN( CHAN_VOICE, pPainSounds );
+	}
+
+
+	CBaseMonster::TraceAttack( pevAttacker, flDamage, vecDir, ptr, bitsDamageType );
+}
+
+
+int CBigMomma :: TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType )
+{
+	// Don't take any acid damage -- BigMomma's mortar is acid
+	if ( bitsDamageType & DMG_ACID )
+		flDamage = 0;
+
+	if ( !HasMemory(bits_MEMORY_PATH_FINISHED) )
+	{
+		if ( pev->health <= flDamage )
+		{
+			pev->health = flDamage + 1;
+			Remember( bits_MEMORY_ADVANCE_NODE | bits_MEMORY_COMPLETED_NODE );
+			ALERT( at_aiconsole, "BM: Finished node health!!!\n" );
+		}
+	}
+
+	return CBaseMonster::TakeDamage( pevInflictor, pevAttacker, flDamage, bitsDamageType );
+}
+
+void CBigMomma :: LayHeadcrab( void )
+{
+	CBaseEntity *pChild = CBaseEntity::Create( BIG_CHILDCLASS, pev->origin, pev->angles, edict() );
+
+	pChild->pev->spawnflags |= SF_MONSTER_FALL_TO_GROUND;
+
+	// Is this the second crab in a pair?
+	if ( HasMemory( bits_MEMORY_CHILDPAIR ) )
+	{
+		m_crabTime = gpGlobals->time + RANDOM_FLOAT( 5, 10 );
+		Forget( bits_MEMORY_CHILDPAIR );
+	}
+	else
+	{
+		m_crabTime = gpGlobals->time + RANDOM_FLOAT( 0.5, 2.5 );
+		Remember( bits_MEMORY_CHILDPAIR );
+	}
+
+	TraceResult tr;
+	UTIL_TraceLine( pev->origin, pev->origin - Vector(0,0,100), ignore_monsters, edict(), &tr);
+	UTIL_DecalTrace( &tr, DECAL_MOMMABIRTH );
+
+	EMIT_SOUND_DYN( edict(), CHAN_WEAPON, RANDOM_SOUND_ARRAY(pBirthSounds), 1.0, ATTN_NORM, 0, 100 + RANDOM_LONG(-5,5) );
+	m_crabCount++;
+}
+
+
+
+void CBigMomma::DeathNotice( entvars_t *pevChild )
+{
+	if ( m_crabCount > 0 )		// Some babies may cross a transition, but we reset the count then
+		m_crabCount--;
+	if ( IsAlive() )
+	{
+		// Make the "my baby's dead" noise!
+		EMIT_SOUND_ARRAY_DYN( CHAN_WEAPON, pChildDieSounds );
+	}
+}
+
+
+void CBigMomma::LaunchMortar( void )
+{
+	m_mortarTime = gpGlobals->time + RANDOM_FLOAT( 2, 15 );
+	
+	Vector startPos = pev->origin;
+	startPos.z += 180;
+
+	EMIT_SOUND_DYN( edict(), CHAN_WEAPON, RANDOM_SOUND_ARRAY(pSackSounds), 1.0, ATTN_NORM, 0, 100 + RANDOM_LONG(-5,5) );
+	CBMortar *pBomb = CBMortar::Shoot( edict(), startPos, pev->movedir );
+	pBomb->pev->gravity = 1.0;
+	MortarSpray( startPos, Vector(0,0,1), gSpitSprite, 24 );
+}
+
+//=========================================================
+// Spawn
+//=========================================================
+void CBigMomma :: Spawn()
+{
+	Precache( );
+
+	SET_MODEL(ENT(pev), "models/big_mom.mdl");
+	UTIL_SetSize( pev, Vector( -32, -32, 0 ), Vector( 32, 32, 64 ) );
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_STEP;
+	m_bloodColor		= BLOOD_COLOR_GREEN;
+	pev->health			= 150 * gSkillData.bigmommaHealthFactor;
+	pev->view_ofs		= Vector ( 0, 0, 128 );// position of the eyes relative to monster's origin.
+	m_flFieldOfView		= 0.3;// indicates the width of this monster's forward view cone ( as a dotproduct result )
+	m_MonsterState		= MONSTERSTATE_NONE;
+
+	MonsterInit();
+}
+
+//=========================================================
+// Precache - precaches all resources this monster needs
+//=========================================================
+void CBigMomma :: Precache()
+{
+	PRECACHE_MODEL("models/big_mom.mdl");
+
+	PRECACHE_SOUND_ARRAY( pChildDieSounds );
+	PRECACHE_SOUND_ARRAY( pSackSounds );
+	PRECACHE_SOUND_ARRAY( pDeathSounds );
+	PRECACHE_SOUND_ARRAY( pAttackSounds );
+	PRECACHE_SOUND_ARRAY( pAttackHitSounds );
+	PRECACHE_SOUND_ARRAY( pBirthSounds );
+	PRECACHE_SOUND_ARRAY( pAlertSounds );
+	PRECACHE_SOUND_ARRAY( pPainSounds );
+	PRECACHE_SOUND_ARRAY( pFootSounds );
+
+	UTIL_PrecacheOther( BIG_CHILDCLASS );
+
+	// TEMP: Squid
+	PRECACHE_MODEL("sprites/mommaspit.spr");// spit projectile.
+	gSpitSprite = PRECACHE_MODEL("sprites/mommaspout.spr");// client side spittle.
+	gSpitDebrisSprite = PRECACHE_MODEL("sprites/mommablob.spr" );
+
+	PRECACHE_SOUND( "bullchicken/bc_acid1.wav" );
+	PRECACHE_SOUND( "bullchicken/bc_spithit1.wav" );
+	PRECACHE_SOUND( "bullchicken/bc_spithit2.wav" );
+}	
+
+
+void CBigMomma::Activate( void )
+{
+	if ( m_hTargetEnt == NULL )
+		Remember( bits_MEMORY_ADVANCE_NODE );	// Start 'er up
+}
+
+
+void CBigMomma::NodeStart( int iszNextNode )
+{
+	pev->netname = iszNextNode;
+
+	CBaseEntity *pTarget = NULL;
+
+	if ( pev->netname )
+	{
+		edict_t *pentTarget = FIND_ENTITY_BY_TARGETNAME ( NULL, STRING(pev->netname) );
+
+		if ( !FNullEnt(pentTarget) )
+			pTarget = Instance( pentTarget );
+	}
+
+
+	if ( !pTarget )
+	{
+		ALERT( at_aiconsole, "BM: Finished the path!!\n" );
+		Remember( bits_MEMORY_PATH_FINISHED );
+		return;
+	}
+	Remember( bits_MEMORY_ON_PATH );
+	m_hTargetEnt = pTarget;
+}
+
+
+void CBigMomma::NodeReach( void )
+{
+	CBaseEntity *pTarget = m_hTargetEnt;
+
+	Forget( bits_MEMORY_ADVANCE_NODE );
+
+	if ( !pTarget )
+		return;
+
+	if ( pTarget->pev->health )
+		pev->max_health = pev->health = pTarget->pev->health * gSkillData.bigmommaHealthFactor;
+
+	if ( !HasMemory( bits_MEMORY_FIRED_NODE ) )
+	{
+		if ( pTarget->pev->message )
+			FireTargets( STRING(pTarget->pev->message), this, this, USE_TOGGLE, 0 );
+	}
+	Forget( bits_MEMORY_FIRED_NODE );
+
+	pev->netname = pTarget->pev->target;
+	if ( pTarget->pev->health == 0 )
+		Remember( bits_MEMORY_ADVANCE_NODE );	// Move on if no health at this node
+}
+
+
+	// Slash
+BOOL CBigMomma::CheckMeleeAttack1( float flDot, float flDist )
+{
+	if (flDot >= 0.7)
+	{
+		if ( flDist <= BIG_ATTACKDIST )
+			return TRUE;
+	}
+	return FALSE;
+}
+
+
+// Lay a crab
+BOOL CBigMomma::CheckMeleeAttack2( float flDot, float flDist )
+{
+	return CanLayCrab();
+}
+
+
+// Mortar launch
+BOOL CBigMomma::CheckRangeAttack1( float flDot, float flDist )
+{
+	if ( flDist <= BIG_MORTARDIST && m_mortarTime < gpGlobals->time )
+	{
+		CBaseEntity *pEnemy = m_hEnemy;
+
+		if ( pEnemy )
+		{
+			Vector startPos = pev->origin;
+			startPos.z += 180;
+			pev->movedir = VecCheckSplatToss( pev, startPos, pEnemy->BodyTarget( pev->origin ), RANDOM_FLOAT( 150, 500 ) );
+			if ( pev->movedir != g_vecZero )
+				return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+//=========================================================
+// AI Schedules Specific to this monster
+//=========================================================
+
+enum
+{
+	SCHED_BIG_NODE = LAST_COMMON_SCHEDULE + 1,
+	SCHED_NODE_FAIL,
+};
+
+enum
+{
+	TASK_MOVE_TO_NODE_RANGE = LAST_COMMON_TASK + 1,	// Move within node range
+	TASK_FIND_NODE,									// Find my next node
+	TASK_PLAY_NODE_PRESEQUENCE,						// Play node pre-script
+	TASK_PLAY_NODE_SEQUENCE,						// Play node script
+	TASK_PROCESS_NODE,								// Fire targets, etc.
+	TASK_WAIT_NODE,									// Wait at the node
+	TASK_NODE_DELAY,								// Delay walking toward node for a bit. You've failed to get there
+	TASK_NODE_YAW,									// Get the best facing direction for this node
+};
+
+
+Task_t	tlBigNode[] =
+{
+	{ TASK_SET_FAIL_SCHEDULE,	(float)SCHED_NODE_FAIL },
+	{ TASK_STOP_MOVING,			(float)0		},
+	{ TASK_FIND_NODE,			(float)0		},	// Find my next node
+	{ TASK_PLAY_NODE_PRESEQUENCE,(float)0		},	// Play the pre-approach sequence if any
+	{ TASK_MOVE_TO_NODE_RANGE,	(float)0		},	// Move within node range
+	{ TASK_STOP_MOVING,			(float)0		},
+	{ TASK_NODE_YAW,			(float)0		},
+	{ TASK_FACE_IDEAL,			(float)0		},
+	{ TASK_WAIT_NODE,			(float)0		},	// Wait for node delay
+	{ TASK_PLAY_NODE_SEQUENCE,	(float)0		},	// Play the sequence if one exists
+	{ TASK_PROCESS_NODE,		(float)0		},	// Fire targets, etc.
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE	},
+};
+
+Schedule_t	slBigNode[] =
+{
+	{ 
+		tlBigNode,
+		ARRAYSIZE ( tlBigNode ), 
+		0,
+		0,
+		"Big Node"
+	},
+};
+
+
+Task_t	tlNodeFail[] =
+{
+	{ TASK_NODE_DELAY,			(float)10		},	// Try to do something else for 10 seconds
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE	},
+};
+
+Schedule_t	slNodeFail[] =
+{
+	{ 
+		tlNodeFail,
+		ARRAYSIZE ( tlNodeFail ), 
+		0,
+		0,
+		"NodeFail"
+	},
+};
+
+DEFINE_CUSTOM_SCHEDULES( CBigMomma )
+{
+	slBigNode,
+	slNodeFail,
+};
+
+IMPLEMENT_CUSTOM_SCHEDULES( CBigMomma, CBaseMonster );
+
+
+
+
+Schedule_t *CBigMomma::GetScheduleOfType( int Type )
+{
+	switch( Type )
+	{
+		case SCHED_BIG_NODE:
+			return slBigNode;
+		break;
+
+		case SCHED_NODE_FAIL:
+			return slNodeFail;
+		break;
+	}
+
+	return CBaseMonster::GetScheduleOfType( Type );
+}
+
+
+BOOL CBigMomma::ShouldGoToNode( void )
+{
+	if ( HasMemory( bits_MEMORY_ADVANCE_NODE ) )
+	{
+		if ( m_nodeTime < gpGlobals->time )
+			return TRUE;
+	}
+	return FALSE;
+}
+
+
+
+Schedule_t *CBigMomma::GetSchedule( void )
+{
+	if ( ShouldGoToNode() )
+	{
+		return GetScheduleOfType( SCHED_BIG_NODE );
+	}
+
+	return CBaseMonster::GetSchedule();
+}
+
+
+void CBigMomma::StartTask( Task_t *pTask )
+{
+	switch ( pTask->iTask )
+	{
+	case TASK_FIND_NODE:
+		{
+			CBaseEntity *pTarget = m_hTargetEnt;
+			if ( !HasMemory( bits_MEMORY_ADVANCE_NODE ) )
+			{
+				if ( pTarget )
+					pev->netname = m_hTargetEnt->pev->target;
+			}
+			NodeStart( pev->netname );
+			TaskComplete();
+			ALERT( at_aiconsole, "BM: Found node %s\n", STRING(pev->netname) );
+		}
+		break;
+
+	case TASK_NODE_DELAY:
+		m_nodeTime = gpGlobals->time + pTask->flData;
+		TaskComplete();
+		ALERT( at_aiconsole, "BM: FAIL! Delay %.2f\n", pTask->flData );
+		break;
+
+	case TASK_PROCESS_NODE:
+		ALERT( at_aiconsole, "BM: Reached node %s\n", STRING(pev->netname) );
+		NodeReach();
+		TaskComplete();
+		break;
+
+	case TASK_PLAY_NODE_PRESEQUENCE:
+	case TASK_PLAY_NODE_SEQUENCE:
+		{
+			int sequence;
+			if ( pTask->iTask == TASK_PLAY_NODE_SEQUENCE )
+				sequence = GetNodeSequence();
+			else
+				sequence = GetNodePresequence();
+
+			ALERT( at_aiconsole, "BM: Playing node sequence %s\n", STRING(sequence) );
+			if ( sequence )
+			{
+				sequence = LookupSequence( STRING( sequence ) );
+				if ( sequence != -1 )
+				{
+					pev->sequence = sequence;
+					pev->frame = 0;
+					ResetSequenceInfo( );
+					ALERT( at_aiconsole, "BM: Sequence %s\n", STRING(GetNodeSequence()) );
+					return;
+				}
+			}
+			TaskComplete();
+		}
+		break;
+
+	case TASK_NODE_YAW:
+		pev->ideal_yaw = GetNodeYaw();
+		TaskComplete();
+		break;
+
+	case TASK_WAIT_NODE:
+		m_flWait = gpGlobals->time + GetNodeDelay();
+		if ( m_hTargetEnt->pev->spawnflags & SF_INFOBM_WAIT )
+			ALERT( at_aiconsole, "BM: Wait at node %s forever\n", STRING(pev->netname) );
+		else
+			ALERT( at_aiconsole, "BM: Wait at node %s for %.2f\n", STRING(pev->netname), GetNodeDelay() );
+		break;
+
+
+	case TASK_MOVE_TO_NODE_RANGE:
+		{
+			CBaseEntity *pTarget = m_hTargetEnt;
+			if ( !pTarget )
+				TaskFail();
+			else
+			{
+				if ( (pTarget->pev->origin - pev->origin).Length() < GetNodeRange() )
+					TaskComplete();
+				else
+				{
+					Activity act = ACT_WALK;
+					if ( pTarget->pev->spawnflags & SF_INFOBM_RUN )
+						act = ACT_RUN;
+
+					m_vecMoveGoal = pTarget->pev->origin;
+					if ( !MoveToTarget( act, 2 ) )
+					{
+						TaskFail();
+					}
+				}
+			}
+		}
+		ALERT( at_aiconsole, "BM: Moving to node %s\n", STRING(pev->netname) );
+
+		break;
+
+	case TASK_MELEE_ATTACK1:
+		// Play an attack sound here
+		EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, RANDOM_SOUND_ARRAY(pAttackSounds), 1.0, ATTN_NORM, 0, PITCH_NORM );
+		CBaseMonster::StartTask( pTask );
+		break;
+
+	default: 
+		CBaseMonster::StartTask( pTask );
+		break;
+	}
+}
+
+//=========================================================
+// RunTask
+//=========================================================
+void CBigMomma::RunTask( Task_t *pTask )
+{
+	switch ( pTask->iTask )
+	{
+	case TASK_MOVE_TO_NODE_RANGE:
+		{
+			float distance;
+
+			if ( m_hTargetEnt == NULL )
+				TaskFail();
+			else
+			{
+				distance = ( m_vecMoveGoal - pev->origin ).Length2D();
+				// Set the appropriate activity based on an overlapping range
+				// overlap the range to prevent oscillation
+				if ( (distance < GetNodeRange()) || MovementIsComplete() )
+				{
+					ALERT( at_aiconsole, "BM: Reached node!\n" );
+					TaskComplete();
+					RouteClear();		// Stop moving
+				}
+			}
+		}
+
+		break;
+
+	case TASK_WAIT_NODE:
+		if ( m_hTargetEnt != NULL && (m_hTargetEnt->pev->spawnflags & SF_INFOBM_WAIT) )
+			return;
+
+		if ( gpGlobals->time > m_flWaitFinished )
+			TaskComplete();
+		ALERT( at_aiconsole, "BM: The WAIT is over!\n" );
+		break;
+
+	case TASK_PLAY_NODE_PRESEQUENCE:
+	case TASK_PLAY_NODE_SEQUENCE:
+		if ( m_fSequenceFinished )
+		{
+			m_Activity = ACT_RESET;
+			TaskComplete();
+		}
+		break;
+
+	default:
+		CBaseMonster::RunTask( pTask );
+		break;
+	}
+}
+
+
+
+Vector VecCheckSplatToss( entvars_t *pev, const Vector &vecSpot1, Vector vecSpot2, float maxHeight )
+{
+	TraceResult		tr;
+	Vector			vecMidPoint;// halfway point between Spot1 and Spot2
+	Vector			vecApex;// highest point 
+	Vector			vecScale;
+	Vector			vecGrenadeVel;
+	Vector			vecTemp;
+	float			flGravity = g_psv_gravity->value;
+
+	// calculate the midpoint and apex of the 'triangle'
+	vecMidPoint = vecSpot1 + (vecSpot2 - vecSpot1) * 0.5;
+	UTIL_TraceLine(vecMidPoint, vecMidPoint + Vector((float)0, (float)0, (float)maxHeight), ignore_monsters, ENT(pev), &tr);
+	vecApex = tr.vecEndPos;
+
+	UTIL_TraceLine(vecSpot1, vecApex, dont_ignore_monsters, ENT(pev), &tr);
+	if (tr.flFraction != 1.0)
+	{
+		// fail!
+		return g_vecZero;
+	}
+
+	// Don't worry about actually hitting the target, this won't hurt us!
+
+	// How high should the grenade travel (subtract 15 so the grenade doesn't hit the ceiling)?
+	float height = (vecApex.z - vecSpot1.z) - 15;
+	// How fast does the grenade need to travel to reach that height given gravity?
+	float speed = sqrt( 2 * flGravity * height );
+	
+	// How much time does it take to get there?
+	float time = speed / flGravity;
+	vecGrenadeVel = (vecSpot2 - vecSpot1);
+	vecGrenadeVel.z = 0;
+	float distance = vecGrenadeVel.Length();
+	
+	// Travel half the distance to the target in that time (apex is at the midpoint)
+	vecGrenadeVel = vecGrenadeVel * ( 0.5 / time );
+	// Speed to offset gravity at the desired height
+	vecGrenadeVel.z = speed;
+
+	return vecGrenadeVel;
+}
+
+
+
+
+// ---------------------------------
+//
+// Mortar
+//
+// ---------------------------------
+void MortarSpray( const Vector &position, const Vector &direction, int spriteModel, int count )
+{
+	MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, position );
+		WRITE_BYTE( TE_SPRITE_SPRAY );
+		WRITE_COORD( position.x);	// pos
+		WRITE_COORD( position.y);	
+		WRITE_COORD( position.z);	
+		WRITE_COORD( direction.x);	// dir
+		WRITE_COORD( direction.y);	
+		WRITE_COORD( direction.z);	
+		WRITE_SHORT( spriteModel );	// model
+		WRITE_BYTE ( count );			// count
+		WRITE_BYTE ( 130 );			// speed
+		WRITE_BYTE ( 80 );			// noise ( client will divide by 100 )
+	MESSAGE_END();
+}
+
+
+// UNDONE: right now this is pretty much a copy of the squid spit with minor changes to the way it does damage
+void CBMortar:: Spawn( void )
+{
+	pev->movetype = MOVETYPE_TOSS;
+	pev->classname = MAKE_STRING( "bmortar" );
+	
+	pev->solid = SOLID_BBOX;
+	pev->rendermode = kRenderTransAlpha;
+	pev->renderamt = 255;
+
+	SET_MODEL(ENT(pev), "sprites/mommaspit.spr");
+	pev->frame = 0;
+	pev->scale = 0.5;
+
+	UTIL_SetSize( pev, Vector( 0, 0, 0), Vector(0, 0, 0) );
+
+	m_maxFrame = (float) MODEL_FRAMES( pev->modelindex ) - 1;
+	pev->dmgtime = gpGlobals->time + 0.4;
+}
+
+void CBMortar::Animate( void )
+{
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	if ( gpGlobals->time > pev->dmgtime )
+	{
+		pev->dmgtime = gpGlobals->time + 0.2;
+		MortarSpray( pev->origin, -pev->velocity.Normalize(), gSpitSprite, 3 );
+	}
+	if ( pev->frame++ )
+	{
+		if ( pev->frame > m_maxFrame )
+		{
+			pev->frame = 0;
+		}
+	}
+}
+
+CBMortar *CBMortar::Shoot( edict_t *pOwner, Vector vecStart, Vector vecVelocity )
+{
+	CBMortar *pSpit = GetClassPtr( (CBMortar *)NULL );
+	pSpit->Spawn();
+	
+	UTIL_SetOrigin( pSpit->pev, vecStart );
+	pSpit->pev->velocity = vecVelocity;
+	pSpit->pev->owner = pOwner;
+	pSpit->pev->scale = 2.5;
+	pSpit->SetThink ( Animate );
+	pSpit->pev->nextthink = gpGlobals->time + 0.1;
+
+	return pSpit;
+}
+
+
+void CBMortar::Touch( CBaseEntity *pOther )
+{
+	TraceResult tr;
+	int		iPitch;
+
+	// splat sound
+	iPitch = RANDOM_FLOAT( 90, 110 );
+
+	EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, "bullchicken/bc_acid1.wav", 1, ATTN_NORM, 0, iPitch );	
+
+	switch ( RANDOM_LONG( 0, 1 ) )
+	{
+	case 0:
+		EMIT_SOUND_DYN( ENT(pev), CHAN_WEAPON, "bullchicken/bc_spithit1.wav", 1, ATTN_NORM, 0, iPitch );	
+		break;
+	case 1:
+		EMIT_SOUND_DYN( ENT(pev), CHAN_WEAPON, "bullchicken/bc_spithit2.wav", 1, ATTN_NORM, 0, iPitch );	
+		break;
+	}
+
+	if ( pOther->IsBSPModel() )
+	{
+
+		// make a splat on the wall
+		UTIL_TraceLine( pev->origin, pev->origin + pev->velocity * 10, dont_ignore_monsters, ENT( pev ), &tr );
+		UTIL_DecalTrace(&tr, DECAL_MOMMASPLAT);
+	}
+	else
+	{
+		tr.vecEndPos = pev->origin;
+		tr.vecPlaneNormal = -1 * pev->velocity.Normalize();
+	}
+	// make some flecks
+	MortarSpray( tr.vecEndPos, tr.vecPlaneNormal, gSpitSprite, 24 );
+
+	entvars_t *pevOwner = NULL;
+	if ( pev->owner )
+		pevOwner = VARS(pev->owner);
+
+	RadiusDamage( pev->origin, pev, pevOwner, gSkillData.bigmommaDmgBlast, gSkillData.bigmommaRadiusBlast, CLASS_NONE, DMG_ACID );
+	UTIL_Remove( this );
+}
+
+#endif
diff --git a/main/source/dlls/bloater.cpp b/main/source/dlls/bloater.cpp
new file mode 100644
index 00000000..f5bc67e1
--- /dev/null
+++ b/main/source/dlls/bloater.cpp
@@ -0,0 +1,219 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// Bloater
+//=========================================================
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"schedule.h"
+
+
+//=========================================================
+// Monster's Anim Events Go Here
+//=========================================================
+#define	BLOATER_AE_ATTACK_MELEE1		0x01
+
+
+class CBloater : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void SetYawSpeed( void );
+	int  Classify ( void );
+	void HandleAnimEvent( MonsterEvent_t *pEvent );
+
+	void PainSound( void );
+	void AlertSound( void );
+	void IdleSound( void );
+	void AttackSnd( void );
+
+	// No range attacks
+	BOOL CheckRangeAttack1 ( float flDot, float flDist ) { return FALSE; }
+	BOOL CheckRangeAttack2 ( float flDot, float flDist ) { return FALSE; }
+	int TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType );
+};
+
+LINK_ENTITY_TO_CLASS( monster_bloater, CBloater );
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CBloater :: Classify ( void )
+{
+	return	CLASS_ALIEN_MONSTER;
+}
+
+//=========================================================
+// SetYawSpeed - allows each sequence to have a different
+// turn rate associated with it.
+//=========================================================
+void CBloater :: SetYawSpeed ( void )
+{
+	int ys;
+
+	ys = 120;
+
+#if 0
+	switch ( m_Activity )
+	{
+	}
+#endif
+
+	pev->yaw_speed = ys;
+}
+
+int CBloater :: TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType )
+{
+	PainSound();
+	return CBaseMonster::TakeDamage( pevInflictor, pevAttacker, flDamage, bitsDamageType );
+}
+
+void CBloater :: PainSound( void )
+{
+#if 0	
+	int pitch = 95 + RANDOM_LONG(0,9);
+
+	switch (RANDOM_LONG(0,5))
+	{
+	case 0: 
+		EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "zombie/zo_pain1.wav", 1.0, ATTN_NORM, 0, pitch);
+		break;
+	case 1:
+		EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "zombie/zo_pain2.wav", 1.0, ATTN_NORM, 0, pitch);
+		break;
+	default:
+		break;
+	}
+#endif
+}
+
+void CBloater :: AlertSound( void )
+{
+#if 0
+	int pitch = 95 + RANDOM_LONG(0,9);
+
+	switch (RANDOM_LONG(0,2))
+	{
+	case 0: 
+		EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "zombie/zo_alert10.wav", 1.0, ATTN_NORM, 0, pitch);
+		break;
+	case 1:
+		EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "zombie/zo_alert20.wav", 1.0, ATTN_NORM, 0, pitch);
+		break;
+	case 2:
+		EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "zombie/zo_alert30.wav", 1.0, ATTN_NORM, 0, pitch);
+		break;
+	}
+#endif
+}
+
+void CBloater :: IdleSound( void )
+{
+#if 0
+	int pitch = 95 + RANDOM_LONG(0,9);
+
+	switch (RANDOM_LONG(0,2))
+	{
+	case 0: 
+		EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "zombie/zo_idle1.wav", 1.0, ATTN_NORM, 0, pitch);
+		break;
+	case 1:
+		EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "zombie/zo_idle2.wav", 1.0, ATTN_NORM, 0, pitch);
+		break;
+	case 2:
+		EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "zombie/zo_idle3.wav", 1.0, ATTN_NORM, 0, pitch);
+		break;
+	}
+#endif
+}
+
+void CBloater :: AttackSnd( void )
+{
+#if 0
+	int pitch = 95 + RANDOM_LONG(0,9);
+
+	switch (RANDOM_LONG(0,1))
+	{
+	case 0: 
+		EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "zombie/zo_attack1.wav", 1.0, ATTN_NORM, 0, pitch);
+		break;
+	case 1:
+		EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "zombie/zo_attack2.wav", 1.0, ATTN_NORM, 0, pitch);
+		break;
+	}
+#endif
+}
+
+
+//=========================================================
+// HandleAnimEvent - catches the monster-specific messages
+// that occur when tagged animation frames are played.
+//=========================================================
+void CBloater :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	switch( pEvent->event )
+	{
+		case BLOATER_AE_ATTACK_MELEE1:
+		{
+			// do stuff for this event.
+			AttackSnd();
+		}
+		break;
+
+		default:
+			CBaseMonster::HandleAnimEvent( pEvent );
+			break;
+	}
+}
+
+//=========================================================
+// Spawn
+//=========================================================
+void CBloater :: Spawn()
+{
+	Precache( );
+
+	SET_MODEL(ENT(pev), "models/floater.mdl");
+	UTIL_SetSize( pev, VEC_HUMAN_HULL_MIN, VEC_HUMAN_HULL_MAX );
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_FLY;
+	pev->spawnflags		|= FL_FLY;
+	m_bloodColor		= BLOOD_COLOR_GREEN;
+	pev->health			= 40;
+	pev->view_ofs		= VEC_VIEW;// position of the eyes relative to monster's origin.
+	m_flFieldOfView		= 0.5;// indicates the width of this monster's forward view cone ( as a dotproduct result )
+	m_MonsterState		= MONSTERSTATE_NONE;
+
+	MonsterInit();
+}
+
+//=========================================================
+// Precache - precaches all resources this monster needs
+//=========================================================
+void CBloater :: Precache()
+{
+	PRECACHE_MODEL("models/floater.mdl");
+}	
+
+//=========================================================
+// AI Schedules Specific to this monster
+//=========================================================
+
diff --git a/main/source/dlls/bmodels.cpp b/main/source/dlls/bmodels.cpp
new file mode 100644
index 00000000..e97c53d5
--- /dev/null
+++ b/main/source/dlls/bmodels.cpp
@@ -0,0 +1,949 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/*
+
+===== bmodels.cpp ========================================================
+
+  spawn, think, and use functions for entities that use brush models
+
+*/
+#include <cmath>
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "doors.h"
+#include "mod/AvHSpecials.h"
+
+extern DLL_GLOBAL Vector		g_vecAttackDir;
+
+#define		SF_BRUSH_ACCDCC	16// brush should accelerate and decelerate when toggled
+#define		SF_BRUSH_HURT		32// rotating brush that inflicts pain based on rotation speed
+#define		SF_ROTATING_NOT_SOLID	64	// some special rotating objects are not solid.
+
+// covering cheesy noise1, noise2, & noise3 fields so they make more sense (for rotating fans)
+#define		noiseStart		noise1
+#define		noiseStop		noise2
+#define		noiseRunning	noise3
+
+#define		SF_PENDULUM_SWING		2	// spawnflag that makes a pendulum a rope swing.
+//
+// BModelOrigin - calculates origin of a bmodel from absmin/size because all bmodel origins are 0 0 0
+//
+Vector VecBModelOrigin( entvars_t* pevBModel )
+{
+	return pevBModel->absmin + ( pevBModel->size * 0.5 );
+}
+
+// =================== FUNC_WALL ==============================================
+
+#include "dlls/cfuncwall.h"
+
+LINK_ENTITY_TO_CLASS( func_wall, CFuncWall );
+
+void CFuncWall :: Spawn( void )
+{
+	pev->angles		= g_vecZero;
+	pev->movetype	= MOVETYPE_PUSH;  // so it doesn't get pushed by anything
+	pev->solid		= SOLID_BSP;
+	SET_MODEL( ENT(pev), STRING(pev->model) );
+	
+	// If it can't move/go away, it's really part of the world
+	pev->flags |= FL_WORLDBRUSH;
+}
+
+
+void CFuncWall :: Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( ShouldToggle( useType, (int)(pev->frame)) )
+		pev->frame = 1 - pev->frame;
+}
+
+
+#define SF_WALL_START_OFF		0x0001
+
+class CFuncWallToggle : public CFuncWall
+{
+public:
+	void	Spawn( void );
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void	TurnOff( void );
+	void	TurnOn( void );
+	BOOL	IsOn( void );
+};
+
+LINK_ENTITY_TO_CLASS( func_wall_toggle, CFuncWallToggle );
+
+void CFuncWallToggle :: Spawn( void )
+{
+	CFuncWall::Spawn();
+	if ( pev->spawnflags & SF_WALL_START_OFF )
+		TurnOff();
+}
+
+
+void CFuncWallToggle :: TurnOff( void )
+{
+	pev->solid = SOLID_NOT;
+	pev->effects |= EF_NODRAW;
+	UTIL_SetOrigin( pev, pev->origin );
+}
+
+
+void CFuncWallToggle :: TurnOn( void )
+{
+	pev->solid = SOLID_BSP;
+	pev->effects &= ~EF_NODRAW;
+	UTIL_SetOrigin( pev, pev->origin );
+}
+
+
+BOOL CFuncWallToggle :: IsOn( void )
+{
+	if ( pev->solid == SOLID_NOT )
+		return FALSE;
+	return TRUE;
+}
+
+
+void CFuncWallToggle :: Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	int status = IsOn();
+
+	if ( ShouldToggle( useType, status ) )
+	{
+		if ( status )
+			TurnOff();
+		else
+			TurnOn();
+	}
+}
+
+
+#define SF_CONVEYOR_VISUAL		0x0001
+#define SF_CONVEYOR_NOTSOLID	0x0002
+
+class CFuncConveyor : public CFuncWall
+{
+public:
+	void	Spawn( void );
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void	UpdateSpeed( float speed );
+};
+
+LINK_ENTITY_TO_CLASS( func_conveyor, CFuncConveyor );
+void CFuncConveyor :: Spawn( void )
+{
+	SetMovedir( pev );
+	CFuncWall::Spawn();
+
+	if ( !(pev->spawnflags & SF_CONVEYOR_VISUAL) )
+		SetBits( pev->flags, FL_CONVEYOR );
+
+	// HACKHACK - This is to allow for some special effects
+	if ( pev->spawnflags & SF_CONVEYOR_NOTSOLID )
+	{
+		pev->solid = SOLID_NOT;
+		pev->skin = 0;		// Don't want the engine thinking we've got special contents on this brush
+	}
+
+	if ( pev->speed == 0 )
+		pev->speed = 100;
+
+	UpdateSpeed( pev->speed );
+}
+
+
+// HACKHACK -- This is ugly, but encode the speed in the rendercolor to avoid adding more data to the network stream
+void CFuncConveyor :: UpdateSpeed( float speed )
+{
+	// Encode it as an integer with 4 fractional bits
+	int speedCode = (int)(fabs(speed) * 16.0);
+
+	if ( speed < 0 )
+		pev->rendercolor.x = 1;
+	else
+		pev->rendercolor.x = 0;
+
+	pev->rendercolor.y = (speedCode >> 8);
+	pev->rendercolor.z = (speedCode & 0xFF);
+}
+
+
+void CFuncConveyor :: Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+    pev->speed = -pev->speed;
+	UpdateSpeed( pev->speed );
+}
+
+
+
+// =================== FUNC_ILLUSIONARY ==============================================
+
+
+/*QUAKED func_illusionary (0 .5 .8) ?
+A simple entity that looks solid but lets you walk through it.
+*/
+class CFuncIllusionary : public CBaseToggle 
+{
+public:
+	void Spawn( void );
+	void EXPORT SloshTouch( CBaseEntity *pOther );
+	void KeyValue( KeyValueData *pkvd );
+	virtual int	ObjectCaps( void ) { return CBaseEntity :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+};
+
+LINK_ENTITY_TO_CLASS( func_illusionary, CFuncIllusionary );
+
+void CFuncIllusionary :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "skin"))//skin is used for content type
+	{
+		pev->skin = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseToggle::KeyValue( pkvd );
+}
+
+void CFuncIllusionary :: Spawn( void )
+{
+	pev->angles = g_vecZero;
+	pev->movetype = MOVETYPE_NONE;  
+	pev->solid = SOLID_NOT;// always solid_not 
+	SET_MODEL( ENT(pev), STRING(pev->model) );
+	pev->iuser3 = AVH_USER3_FUNC_ILLUSIONARY;
+	
+	// I'd rather eat the network bandwidth of this than figure out how to save/restore
+	// these entities after they have been moved to the client, or respawn them ala Quake
+	// Perhaps we can do this in deathmatch only.
+	//	MAKE_STATIC(ENT(pev));
+}
+
+
+// -------------------------------------------------------------------------------
+//
+// Monster only clip brush
+// 
+// This brush will be solid for any entity who has the FL_MONSTERCLIP flag set
+// in pev->flags
+//
+// otherwise it will be invisible and not solid.  This can be used to keep 
+// specific monsters out of certain areas
+//
+// -------------------------------------------------------------------------------
+class CFuncMonsterClip : public CFuncWall
+{
+public:
+	void	Spawn( void );
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value ) {}		// Clear out func_wall's use function
+};
+
+LINK_ENTITY_TO_CLASS( func_monsterclip, CFuncMonsterClip );
+
+void CFuncMonsterClip::Spawn( void )
+{
+	CFuncWall::Spawn();
+	if ( CVAR_GET_FLOAT("showtriggers") == 0 )
+		pev->effects = EF_NODRAW;
+	pev->flags |= FL_MONSTERCLIP;
+}
+
+
+// =================== FUNC_ROTATING ==============================================
+class CFuncRotating : public CBaseEntity
+{
+public:
+	// basic functions
+	void Spawn( void  );
+	void Precache( void  );
+	void EXPORT SpinUp ( void );
+	void EXPORT SpinDown ( void );
+	void KeyValue( KeyValueData* pkvd);
+	void EXPORT HurtTouch ( CBaseEntity *pOther );
+	void EXPORT RotatingUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void EXPORT Rotate( void );
+	void RampPitchVol (int fUp );
+	void Blocked( CBaseEntity *pOther );
+	virtual int	ObjectCaps( void ) { return CBaseEntity :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	float m_flFanFriction;
+	float m_flAttenuation;
+	float m_flVolume;
+	float m_pitch;
+	int	  m_sounds;
+};
+
+TYPEDESCRIPTION	CFuncRotating::m_SaveData[] = 
+{
+	DEFINE_FIELD( CFuncRotating, m_flFanFriction, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncRotating, m_flAttenuation, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncRotating, m_flVolume, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncRotating, m_pitch, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncRotating, m_sounds, FIELD_INTEGER )
+};
+
+IMPLEMENT_SAVERESTORE( CFuncRotating, CBaseEntity );
+
+
+LINK_ENTITY_TO_CLASS( func_rotating, CFuncRotating );
+
+void CFuncRotating :: KeyValue( KeyValueData* pkvd)
+{
+	if (FStrEq(pkvd->szKeyName, "fanfriction"))
+	{
+		m_flFanFriction = atof(pkvd->szValue)/100;
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "Volume"))
+	{
+		m_flVolume = atof(pkvd->szValue)/10.0;
+
+		if (m_flVolume > 1.0)
+			m_flVolume = 1.0;
+		if (m_flVolume < 0.0)
+			m_flVolume = 0.0;
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "spawnorigin"))
+	{
+		Vector tmp;
+		UTIL_StringToVector( (float *)tmp, pkvd->szValue );
+		if ( tmp != g_vecZero )
+			pev->origin = tmp;
+	}
+	else if (FStrEq(pkvd->szKeyName, "sounds"))
+	{
+		m_sounds = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else 
+		CBaseEntity::KeyValue( pkvd );
+}
+
+/*QUAKED func_rotating (0 .5 .8) ? START_ON REVERSE X_AXIS Y_AXIS
+You need to have an origin brush as part of this entity.  The  
+center of that brush will be
+the point around which it is rotated. It will rotate around the Z  
+axis by default.  You can
+check either the X_AXIS or Y_AXIS box to change that.
+
+"speed" determines how fast it moves; default value is 100.
+"dmg"	damage to inflict when blocked (2 default)
+
+REVERSE will cause the it to rotate in the opposite direction.
+*/
+
+
+void CFuncRotating :: Spawn( )
+{
+	// set final pitch.  Must not be PITCH_NORM, since we
+	// plan on pitch shifting later.
+
+	m_pitch = PITCH_NORM - 1;
+
+	// maintain compatibility with previous maps
+	if (m_flVolume == 0.0)
+		m_flVolume = 1.0;
+
+	// if the designer didn't set a sound attenuation, default to one.
+	m_flAttenuation = ATTN_NORM;
+	
+	if ( FBitSet ( pev->spawnflags, SF_BRUSH_ROTATE_SMALLRADIUS) )
+	{
+		m_flAttenuation = ATTN_IDLE;
+	}
+	else if ( FBitSet ( pev->spawnflags, SF_BRUSH_ROTATE_MEDIUMRADIUS) )
+	{
+		m_flAttenuation = ATTN_STATIC;
+	}
+	else if ( FBitSet ( pev->spawnflags, SF_BRUSH_ROTATE_LARGERADIUS) )
+	{
+		m_flAttenuation = ATTN_NORM;
+	}
+
+	// prevent divide by zero if level designer forgets friction!
+	if ( m_flFanFriction == 0 )
+	{
+		m_flFanFriction = 1;
+	}
+	
+	if ( FBitSet(pev->spawnflags, SF_BRUSH_ROTATE_Z_AXIS) )
+		pev->movedir = Vector(0,0,1);
+	else if ( FBitSet(pev->spawnflags, SF_BRUSH_ROTATE_X_AXIS) )
+		pev->movedir = Vector(1,0,0);
+	else 
+		pev->movedir = Vector(0,1,0);	// y-axis
+
+	// check for reverse rotation
+	if ( FBitSet(pev->spawnflags, SF_BRUSH_ROTATE_BACKWARDS) )
+		pev->movedir = pev->movedir * -1;
+
+	// some rotating objects like fake volumetric lights will not be solid.
+	if ( FBitSet(pev->spawnflags, SF_ROTATING_NOT_SOLID) )
+	{
+		pev->solid = SOLID_NOT;
+		pev->skin = CONTENTS_EMPTY;
+		pev->movetype	= MOVETYPE_PUSH;
+	}
+	else
+	{
+		pev->solid		= SOLID_BSP;
+		pev->movetype	= MOVETYPE_PUSH;
+	}
+
+	UTIL_SetOrigin(pev, pev->origin);
+	SET_MODEL( ENT(pev), STRING(pev->model) );
+
+	SetUse( &CFuncRotating::RotatingUse );
+	// did level designer forget to assign speed?
+	if (pev->speed <= 0)
+		pev->speed = 0;
+
+	// Removed this per level designers request.  -- JAY
+	//	if (pev->dmg == 0)
+	//		pev->dmg = 2;
+
+	// instant-use brush?
+	if ( FBitSet( pev->spawnflags, SF_BRUSH_ROTATE_INSTANT) )
+	{		
+		SetThink( &CFuncRotating::SUB_CallUseToggle );
+		pev->nextthink = pev->ltime + 1.5;	// leave a magic delay for client to start up
+	}	
+	// can this brush inflict pain?
+	if ( FBitSet (pev->spawnflags, SF_BRUSH_HURT) )
+	{
+		SetTouch( &CFuncRotating::HurtTouch );
+	}
+	
+	Precache( );
+}
+
+
+void CFuncRotating :: Precache( void )
+{
+	char* szSoundFile = (char*) STRING(pev->message);
+
+	// set up fan sounds
+
+	if (!FStringNull( pev->message ) && strlen( szSoundFile ) > 0)
+	{
+		// if a path is set for a wave, use it
+
+		PRECACHE_SOUND(szSoundFile);
+			
+		pev->noiseRunning = ALLOC_STRING(szSoundFile);
+	} else
+	{
+		// otherwise use preset sound
+		switch (m_sounds)
+		{
+		case 1:
+			PRECACHE_SOUND ("fans/fan1.wav");
+			pev->noiseRunning = ALLOC_STRING("fans/fan1.wav");
+			break;
+		case 2:
+			PRECACHE_SOUND ("fans/fan2.wav");
+			pev->noiseRunning = ALLOC_STRING("fans/fan2.wav");
+			break;
+		case 3:
+			PRECACHE_SOUND ("fans/fan3.wav");
+			pev->noiseRunning = ALLOC_STRING("fans/fan3.wav");
+			break;
+		case 4:
+			PRECACHE_SOUND ("fans/fan4.wav");
+			pev->noiseRunning = ALLOC_STRING("fans/fan4.wav");
+			break;
+		case 5:
+			PRECACHE_SOUND ("fans/fan5.wav");
+			pev->noiseRunning = ALLOC_STRING("fans/fan5.wav");
+			break;
+
+		case 0:
+		default:
+			if (!FStringNull( pev->message ) && strlen( szSoundFile ) > 0)
+			{
+				PRECACHE_SOUND(szSoundFile);
+				
+				pev->noiseRunning = ALLOC_STRING(szSoundFile);
+				break;
+			} else
+			{
+				pev->noiseRunning = ALLOC_STRING("common/null.wav");
+				break;
+			}
+		}
+	}
+	
+	if (pev->avelocity != g_vecZero )
+	{
+		// if fan was spinning, and we went through transition or save/restore,
+		// make sure we restart the sound.  1.5 sec delay is magic number. KDB
+
+		SetThink ( &CFuncRotating::SpinUp );
+		pev->nextthink = pev->ltime + 1.5;
+	}
+}
+
+
+
+//
+// Touch - will hurt others based on how fast the brush is spinning
+//
+void CFuncRotating :: HurtTouch ( CBaseEntity *pOther )
+{
+	entvars_t	*pevOther = pOther->pev;
+
+	// we can't hurt this thing, so we're not concerned with it
+	if ( !pevOther->takedamage )
+		return;
+
+	// calculate damage based on rotation speed
+	pev->dmg = pev->avelocity.Length() / 10;
+
+	pOther->TakeDamage( pev, pev, pev->dmg, DMG_CRUSH);
+	
+	pevOther->velocity = (pevOther->origin - VecBModelOrigin(pev) ).Normalize() * pev->dmg;
+}
+
+//
+// RampPitchVol - ramp pitch and volume up to final values, based on difference
+// between how fast we're going vs how fast we plan to go
+//
+#define FANPITCHMIN		30
+#define FANPITCHMAX		100
+
+void CFuncRotating :: RampPitchVol (int fUp)
+{
+
+	Vector vecAVel = pev->avelocity;
+	vec_t vecCur;
+	vec_t vecFinal;
+	float fpct;
+	float fvol;
+	float fpitch;
+	int pitch;
+	
+	// get current angular velocity
+
+	vecCur = abs(vecAVel.x != 0 ? vecAVel.x : (vecAVel.y != 0 ? vecAVel.y : vecAVel.z));
+	
+	// get target angular velocity
+
+	vecFinal = (pev->movedir.x != 0 ? pev->movedir.x : (pev->movedir.y != 0 ? pev->movedir.y : pev->movedir.z));
+	vecFinal *= pev->speed;
+	vecFinal = abs(vecFinal);
+
+	// calc volume and pitch as % of final vol and pitch
+
+	fpct = vecCur / vecFinal;
+//	if (fUp)
+//		fvol = m_flVolume * (0.5 + fpct/2.0); // spinup volume ramps up from 50% max vol
+//	else
+		fvol = m_flVolume * fpct;			  // slowdown volume ramps down to 0
+
+	fpitch = FANPITCHMIN + (FANPITCHMAX - FANPITCHMIN) * fpct;	
+	
+	pitch = (int) fpitch;
+	if (pitch == PITCH_NORM)
+		pitch = PITCH_NORM-1;
+
+	// change the fan's vol and pitch
+
+	EMIT_SOUND_DYN(ENT(pev), CHAN_STATIC, (char *)STRING(pev->noiseRunning), 
+		fvol, m_flAttenuation, SND_CHANGE_PITCH | SND_CHANGE_VOL, pitch);
+
+}
+
+//
+// SpinUp - accelerates a non-moving func_rotating up to it's speed
+//
+void CFuncRotating :: SpinUp( void )
+{
+	Vector	vecAVel;//rotational velocity
+
+	pev->nextthink = pev->ltime + 0.1;
+	pev->avelocity = pev->avelocity + ( pev->movedir * ( pev->speed * m_flFanFriction ) );
+
+	vecAVel = pev->avelocity;// cache entity's rotational velocity
+
+	// if we've met or exceeded target speed, set target speed and stop thinking
+	if (	abs(vecAVel.x) >= abs(pev->movedir.x * pev->speed)	&&
+			abs(vecAVel.y) >= abs(pev->movedir.y * pev->speed)	&&
+			abs(vecAVel.z) >= abs(pev->movedir.z * pev->speed) )
+	{
+		pev->avelocity = pev->movedir * pev->speed;// set speed in case we overshot
+		EMIT_SOUND_DYN(ENT(pev), CHAN_STATIC, (char *)STRING(pev->noiseRunning), 
+			m_flVolume, m_flAttenuation, SND_CHANGE_PITCH | SND_CHANGE_VOL, FANPITCHMAX);
+		
+		SetThink( &CFuncRotating::Rotate );
+		Rotate();
+	} 
+	else
+	{
+		RampPitchVol(TRUE);
+	}
+}
+
+//
+// SpinDown - decelerates a moving func_rotating to a standstill.
+//
+void CFuncRotating :: SpinDown( void )
+{
+	Vector	vecAVel;//rotational velocity
+	vec_t vecdir;
+
+	pev->nextthink = pev->ltime + 0.1;
+
+	pev->avelocity = pev->avelocity - ( pev->movedir * ( pev->speed * m_flFanFriction ) );//spin down slower than spinup
+
+	vecAVel = pev->avelocity;// cache entity's rotational velocity
+
+	if (pev->movedir.x != 0)
+		vecdir = pev->movedir.x;
+	else if (pev->movedir.y != 0)
+		vecdir = pev->movedir.y;
+	else
+		vecdir = pev->movedir.z;
+
+	// if we've met or exceeded target speed, set target speed and stop thinking
+	// (note: must check for movedir > 0 or < 0)
+	if (((vecdir > 0) && (vecAVel.x <= 0 && vecAVel.y <= 0 && vecAVel.z <= 0)) || 
+		((vecdir < 0) && (vecAVel.x >= 0 && vecAVel.y >= 0 && vecAVel.z >= 0)))
+	{
+		pev->avelocity = g_vecZero;// set speed in case we overshot
+		
+		// stop sound, we're done
+		EMIT_SOUND_DYN(ENT(pev), CHAN_STATIC, (char *)STRING(pev->noiseRunning /* Stop */), 
+				0, 0, SND_STOP, m_pitch);
+
+		SetThink( &CFuncRotating::Rotate );
+		Rotate();
+	} 
+	else
+	{
+		RampPitchVol(FALSE);
+	}
+}
+
+void CFuncRotating :: Rotate( void )
+{
+	pev->nextthink = pev->ltime + 10;
+}
+
+//=========================================================
+// Rotating Use - when a rotating brush is triggered
+//=========================================================
+void CFuncRotating :: RotatingUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	// is this a brush that should accelerate and decelerate when turned on/off (fan)?
+	if ( FBitSet ( pev->spawnflags, SF_BRUSH_ACCDCC ) )
+	{
+		// fan is spinning, so stop it.
+		if ( pev->avelocity != g_vecZero )
+		{
+			SetThink ( &CFuncRotating::SpinDown );
+			//EMIT_SOUND_DYN(ENT(pev), CHAN_WEAPON, (char *)STRING(pev->noiseStop), 
+			//	m_flVolume, m_flAttenuation, 0, m_pitch);
+
+			pev->nextthink = pev->ltime + 0.1;
+		}
+		else// fan is not moving, so start it
+		{
+			SetThink ( &CFuncRotating::SpinUp );
+			EMIT_SOUND_DYN(ENT(pev), CHAN_STATIC, (char *)STRING(pev->noiseRunning), 
+				0.01, m_flAttenuation, 0, FANPITCHMIN);
+
+			pev->nextthink = pev->ltime + 0.1;
+		}
+	}
+	else if ( !FBitSet ( pev->spawnflags, SF_BRUSH_ACCDCC ) )//this is a normal start/stop brush.
+	{
+		if ( pev->avelocity != g_vecZero )
+		{
+			// play stopping sound here
+			SetThink ( &CFuncRotating::SpinDown );
+
+			// EMIT_SOUND_DYN(ENT(pev), CHAN_WEAPON, (char *)STRING(pev->noiseStop), 
+			//	m_flVolume, m_flAttenuation, 0, m_pitch);
+			
+			pev->nextthink = pev->ltime + 0.1;
+			// pev->avelocity = g_vecZero;
+		}
+		else
+		{
+			EMIT_SOUND_DYN(ENT(pev), CHAN_STATIC, (char *)STRING(pev->noiseRunning), 
+				m_flVolume, m_flAttenuation, 0, FANPITCHMAX);
+			pev->avelocity = pev->movedir * pev->speed;
+
+			SetThink( &CFuncRotating::Rotate );
+			Rotate();
+		}
+	}
+}
+
+
+//
+// RotatingBlocked - An entity has blocked the brush
+//
+void CFuncRotating :: Blocked( CBaseEntity *pOther )
+
+{
+	pOther->TakeDamage( pev, pev, pev->dmg, DMG_CRUSH);
+}
+
+
+
+
+
+
+//#endif
+
+
+class CPendulum : public CBaseEntity
+{
+public:
+	void	Spawn ( void );
+	void	KeyValue( KeyValueData *pkvd );
+	void	EXPORT Swing( void );
+	void	EXPORT PendulumUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void	EXPORT Stop( void );
+	void	Touch( CBaseEntity *pOther );
+	void	EXPORT RopeTouch ( CBaseEntity *pOther );// this touch func makes the pendulum a rope
+	virtual int	ObjectCaps( void ) { return CBaseEntity :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	void	Blocked( CBaseEntity *pOther );
+
+	static	TYPEDESCRIPTION m_SaveData[];
+	
+	float	m_accel;			// Acceleration
+	float	m_distance;			// 
+	float	m_time;
+	float	m_damp;
+	float	m_maxSpeed;
+	float	m_dampSpeed;
+	vec3_t	m_center;
+	vec3_t	m_start;
+};
+
+LINK_ENTITY_TO_CLASS( func_pendulum, CPendulum );
+
+TYPEDESCRIPTION	CPendulum::m_SaveData[] = 
+{
+	DEFINE_FIELD( CPendulum, m_accel, FIELD_FLOAT ),
+	DEFINE_FIELD( CPendulum, m_distance, FIELD_FLOAT ),
+	DEFINE_FIELD( CPendulum, m_time, FIELD_TIME ),
+	DEFINE_FIELD( CPendulum, m_damp, FIELD_FLOAT ),
+	DEFINE_FIELD( CPendulum, m_maxSpeed, FIELD_FLOAT ),
+	DEFINE_FIELD( CPendulum, m_dampSpeed, FIELD_FLOAT ),
+	DEFINE_FIELD( CPendulum, m_center, FIELD_VECTOR ),
+	DEFINE_FIELD( CPendulum, m_start, FIELD_VECTOR ),
+};
+
+IMPLEMENT_SAVERESTORE( CPendulum, CBaseEntity );
+
+
+
+void CPendulum :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "distance"))
+	{
+		m_distance = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "damp"))
+	{
+		m_damp = atof(pkvd->szValue) * 0.001;
+		pkvd->fHandled = TRUE;
+	}
+	else 
+		CBaseEntity::KeyValue( pkvd );
+}
+
+
+void CPendulum :: Spawn( void )
+{
+	// set the axis of rotation
+	CBaseToggle :: AxisDir( pev );
+
+	if ( FBitSet (pev->spawnflags, SF_DOOR_PASSABLE) )
+		pev->solid		= SOLID_NOT;
+	else
+		pev->solid		= SOLID_BSP;
+	pev->movetype	= MOVETYPE_PUSH;
+	UTIL_SetOrigin(pev, pev->origin);
+	SET_MODEL(ENT(pev), STRING(pev->model) );
+
+	if ( m_distance == 0 )
+		return;
+
+	if (pev->speed == 0)
+		pev->speed = 100;
+
+	m_accel = (pev->speed * pev->speed) / (2 * fabs(m_distance));	// Calculate constant acceleration from speed and distance
+	m_maxSpeed = pev->speed;
+	m_start = pev->angles;
+	m_center = pev->angles + (m_distance * 0.5) * pev->movedir;
+
+	if ( FBitSet( pev->spawnflags, SF_BRUSH_ROTATE_INSTANT) )
+	{		
+		SetThink( &CPendulum::SUB_CallUseToggle );
+		pev->nextthink = gpGlobals->time + 0.1;
+	}
+	pev->speed = 0;
+	SetUse( &CPendulum::PendulumUse );
+
+	if ( FBitSet( pev->spawnflags, SF_PENDULUM_SWING ) )
+	{
+		SetTouch ( &CPendulum::RopeTouch );
+	}
+}
+
+
+void CPendulum :: PendulumUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( pev->speed )		// Pendulum is moving, stop it and auto-return if necessary
+	{
+		if ( FBitSet( pev->spawnflags, SF_PENDULUM_AUTO_RETURN ) )
+		{		
+			float	delta;
+
+			delta = CBaseToggle :: AxisDelta( pev->spawnflags, pev->angles, m_start );
+
+			pev->avelocity = m_maxSpeed * pev->movedir;
+			pev->nextthink = pev->ltime + (delta / m_maxSpeed);
+			SetThink( &CPendulum::Stop );
+		}
+		else
+		{
+			pev->speed = 0;		// Dead stop
+			SetThink( NULL );
+			pev->avelocity = g_vecZero;
+		}
+	}
+	else
+	{
+		pev->nextthink = pev->ltime + 0.1;		// Start the pendulum moving
+		m_time = gpGlobals->time;		// Save time to calculate dt
+		SetThink( &CPendulum::Swing );
+		m_dampSpeed = m_maxSpeed;
+	}
+}
+
+
+void CPendulum :: Stop( void )
+{
+	pev->angles = m_start;
+	pev->speed = 0;
+	SetThink( NULL );
+	pev->avelocity = g_vecZero;
+}
+
+
+void CPendulum::Blocked( CBaseEntity *pOther )
+{
+	m_time = gpGlobals->time;
+}
+
+
+void CPendulum :: Swing( void )
+{
+	float delta, dt;
+	
+	delta = CBaseToggle :: AxisDelta( pev->spawnflags, pev->angles, m_center );
+	dt = gpGlobals->time - m_time;	// How much time has passed?
+	m_time = gpGlobals->time;		// Remember the last time called
+
+	if ( delta > 0 && m_accel > 0 )
+		pev->speed -= m_accel * dt;	// Integrate velocity
+	else 
+		pev->speed += m_accel * dt;
+
+	if ( pev->speed > m_maxSpeed )
+		pev->speed = m_maxSpeed;
+	else if ( pev->speed < -m_maxSpeed )
+		pev->speed = -m_maxSpeed;
+	// scale the destdelta vector by the time spent traveling to get velocity
+	pev->avelocity = pev->speed * pev->movedir;
+
+	// Call this again
+	pev->nextthink = pev->ltime + 0.1;
+
+	if ( m_damp )
+	{
+		m_dampSpeed -= m_damp * m_dampSpeed * dt;
+		if ( m_dampSpeed < 30.0 )
+		{
+			pev->angles = m_center;
+			pev->speed = 0;
+			SetThink( NULL );
+			pev->avelocity = g_vecZero;
+		}
+		else if ( pev->speed > m_dampSpeed )
+			pev->speed = m_dampSpeed;
+		else if ( pev->speed < -m_dampSpeed )
+			pev->speed = -m_dampSpeed;
+
+	}
+}
+
+
+void CPendulum :: Touch ( CBaseEntity *pOther )
+{
+	entvars_t	*pevOther = pOther->pev;
+
+	if ( pev->dmg <= 0 )
+		return;
+
+	// we can't hurt this thing, so we're not concerned with it
+	if ( !pevOther->takedamage )
+		return;
+
+	// calculate damage based on rotation speed
+	float damage = pev->dmg * pev->speed * 0.01;
+
+	if ( damage < 0 )
+		damage = -damage;
+
+	pOther->TakeDamage( pev, pev, damage, DMG_CRUSH );
+	
+	pevOther->velocity = (pevOther->origin - VecBModelOrigin(pev) ).Normalize() * damage;
+}
+
+void CPendulum :: RopeTouch ( CBaseEntity *pOther )
+{
+	entvars_t	*pevOther = pOther->pev;
+
+	if ( !pOther->IsPlayer() )
+	{// not a player!
+		ALERT ( at_console, "Not a client\n" );
+		return;
+	}
+
+	if ( ENT(pevOther) == pev->enemy )
+	{// this player already on the rope.
+		return;
+	}
+
+	pev->enemy = pOther->edict();
+	pevOther->velocity = g_vecZero;
+	pevOther->movetype = MOVETYPE_NONE;
+}
+
+
diff --git a/main/source/dlls/bullsquid.cpp b/main/source/dlls/bullsquid.cpp
new file mode 100644
index 00000000..fad94582
--- /dev/null
+++ b/main/source/dlls/bullsquid.cpp
@@ -0,0 +1,1276 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// bullsquid - big, spotty tentacle-mouthed meanie.
+//=========================================================
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"schedule.h"
+#include	"nodes.h"
+#include	"effects.h"
+#include	"decals.h"
+#include	"soundent.h"
+#include	"game.h"
+
+#define		SQUID_SPRINT_DIST	256 // how close the squid has to get before starting to sprint and refusing to swerve
+
+int			   iSquidSpitSprite;
+	
+
+//=========================================================
+// monster-specific schedule types
+//=========================================================
+enum
+{
+	SCHED_SQUID_HURTHOP = LAST_COMMON_SCHEDULE + 1,
+	SCHED_SQUID_SMELLFOOD,
+	SCHED_SQUID_SEECRAB,
+	SCHED_SQUID_EAT,
+	SCHED_SQUID_SNIFF_AND_EAT,
+	SCHED_SQUID_WALLOW,
+};
+
+//=========================================================
+// monster-specific tasks
+//=========================================================
+enum 
+{
+	TASK_SQUID_HOPTURN = LAST_COMMON_TASK + 1,
+};
+
+//=========================================================
+// Bullsquid's spit projectile
+//=========================================================
+class CSquidSpit : public CBaseEntity
+{
+public:
+	void Spawn( void );
+
+	static void Shoot( entvars_t *pevOwner, Vector vecStart, Vector vecVelocity );
+	void Touch( CBaseEntity *pOther );
+	void EXPORT Animate( void );
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	int  m_maxFrame;
+};
+
+LINK_ENTITY_TO_CLASS( squidspit, CSquidSpit );
+
+TYPEDESCRIPTION	CSquidSpit::m_SaveData[] = 
+{
+	DEFINE_FIELD( CSquidSpit, m_maxFrame, FIELD_INTEGER ),
+};
+
+IMPLEMENT_SAVERESTORE( CSquidSpit, CBaseEntity );
+
+void CSquidSpit:: Spawn( void )
+{
+	pev->movetype = MOVETYPE_FLY;
+	pev->classname = MAKE_STRING( "squidspit" );
+	
+	pev->solid = SOLID_BBOX;
+	pev->rendermode = kRenderTransAlpha;
+	pev->renderamt = 255;
+
+	SET_MODEL(ENT(pev), "sprites/bigspit.spr");
+	pev->frame = 0;
+	pev->scale = 0.5;
+
+	UTIL_SetSize( pev, Vector( 0, 0, 0), Vector(0, 0, 0) );
+
+	m_maxFrame = (float) MODEL_FRAMES( pev->modelindex ) - 1;
+}
+
+void CSquidSpit::Animate( void )
+{
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	if ( pev->frame++ )
+	{
+		if ( pev->frame > m_maxFrame )
+		{
+			pev->frame = 0;
+		}
+	}
+}
+
+void CSquidSpit::Shoot( entvars_t *pevOwner, Vector vecStart, Vector vecVelocity )
+{
+	CSquidSpit *pSpit = GetClassPtr( (CSquidSpit *)NULL );
+	pSpit->Spawn();
+	
+	UTIL_SetOrigin( pSpit->pev, vecStart );
+	pSpit->pev->velocity = vecVelocity;
+	pSpit->pev->owner = ENT(pevOwner);
+
+	pSpit->SetThink ( &CSquidSpit::Animate );
+	pSpit->pev->nextthink = gpGlobals->time + 0.1;
+}
+
+void CSquidSpit :: Touch ( CBaseEntity *pOther )
+{
+	TraceResult tr;
+	int		iPitch;
+
+	// splat sound
+	iPitch = RANDOM_FLOAT( 90, 110 );
+
+	EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, "bullchicken/bc_acid1.wav", 1, ATTN_NORM, 0, iPitch );	
+
+	switch ( RANDOM_LONG( 0, 1 ) )
+	{
+	case 0:
+		EMIT_SOUND_DYN( ENT(pev), CHAN_WEAPON, "bullchicken/bc_spithit1.wav", 1, ATTN_NORM, 0, iPitch );	
+		break;
+	case 1:
+		EMIT_SOUND_DYN( ENT(pev), CHAN_WEAPON, "bullchicken/bc_spithit2.wav", 1, ATTN_NORM, 0, iPitch );	
+		break;
+	}
+
+	if ( !pOther->pev->takedamage )
+	{
+
+		// make a splat on the wall
+		UTIL_TraceLine( pev->origin, pev->origin + pev->velocity * 10, dont_ignore_monsters, ENT( pev ), &tr );
+		UTIL_DecalTrace(&tr, DECAL_SPIT1 + RANDOM_LONG(0,1));
+
+		// make some flecks
+		MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, tr.vecEndPos );
+			WRITE_BYTE( TE_SPRITE_SPRAY );
+			WRITE_COORD( tr.vecEndPos.x);	// pos
+			WRITE_COORD( tr.vecEndPos.y);	
+			WRITE_COORD( tr.vecEndPos.z);	
+			WRITE_COORD( tr.vecPlaneNormal.x);	// dir
+			WRITE_COORD( tr.vecPlaneNormal.y);	
+			WRITE_COORD( tr.vecPlaneNormal.z);	
+			WRITE_SHORT( iSquidSpitSprite );	// model
+			WRITE_BYTE ( 5 );			// count
+			WRITE_BYTE ( 30 );			// speed
+			WRITE_BYTE ( 80 );			// noise ( client will divide by 100 )
+		MESSAGE_END();
+	}
+	else
+	{
+		pOther->TakeDamage ( pev, pev, gSkillData.bullsquidDmgSpit, DMG_GENERIC );
+	}
+
+	SetThink ( &CSquidSpit::SUB_Remove );
+	pev->nextthink = gpGlobals->time;
+}
+
+//=========================================================
+// Monster's Anim Events Go Here
+//=========================================================
+#define		BSQUID_AE_SPIT		( 1 )
+#define		BSQUID_AE_BITE		( 2 )
+#define		BSQUID_AE_BLINK		( 3 )
+#define		BSQUID_AE_TAILWHIP	( 4 )
+#define		BSQUID_AE_HOP		( 5 )
+#define		BSQUID_AE_THROW		( 6 )
+
+class CBullsquid : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void SetYawSpeed( void );
+	int  ISoundMask( void );
+	int  Classify ( void );
+	void HandleAnimEvent( MonsterEvent_t *pEvent );
+	void IdleSound( void );
+	void PainSound( void );
+	void DeathSound( void );
+	void AlertSound ( void );
+	void AttackSound( void );
+	void StartTask ( Task_t *pTask );
+	void RunTask ( Task_t *pTask );
+	BOOL CheckMeleeAttack1 ( float flDot, float flDist );
+	BOOL CheckMeleeAttack2 ( float flDot, float flDist );
+	BOOL CheckRangeAttack1 ( float flDot, float flDist );
+	void RunAI( void );
+	BOOL FValidateHintType ( short sHint );
+	Schedule_t *GetSchedule( void );
+	Schedule_t *GetScheduleOfType ( int Type );
+	int TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType );
+	int IRelationship ( CBaseEntity *pTarget );
+	int IgnoreConditions ( void );
+	MONSTERSTATE GetIdealState ( void );
+
+	int	Save( CSave &save ); 
+	int Restore( CRestore &restore );
+
+	CUSTOM_SCHEDULES;
+	static TYPEDESCRIPTION m_SaveData[];
+
+	BOOL m_fCanThreatDisplay;// this is so the squid only does the "I see a headcrab!" dance one time. 
+
+	float m_flLastHurtTime;// we keep track of this, because if something hurts a squid, it will forget about its love of headcrabs for a while.
+	float m_flNextSpitTime;// last time the bullsquid used the spit attack.
+};
+LINK_ENTITY_TO_CLASS( monster_bullchicken, CBullsquid );
+
+TYPEDESCRIPTION	CBullsquid::m_SaveData[] = 
+{
+	DEFINE_FIELD( CBullsquid, m_fCanThreatDisplay, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CBullsquid, m_flLastHurtTime, FIELD_TIME ),
+	DEFINE_FIELD( CBullsquid, m_flNextSpitTime, FIELD_TIME ),
+};
+
+IMPLEMENT_SAVERESTORE( CBullsquid, CBaseMonster );
+
+//=========================================================
+// IgnoreConditions 
+//=========================================================
+int CBullsquid::IgnoreConditions ( void )
+{
+	int iIgnore = CBaseMonster::IgnoreConditions();
+
+	if ( gpGlobals->time - m_flLastHurtTime <= 20 )
+	{
+		// haven't been hurt in 20 seconds, so let the squid care about stink. 
+		iIgnore = bits_COND_SMELL | bits_COND_SMELL_FOOD;
+	}
+
+	if ( m_hEnemy != NULL )
+	{
+		if ( FClassnameIs( m_hEnemy->pev, "monster_headcrab" ) )
+		{
+			// (Unless after a tasty headcrab)
+			iIgnore = bits_COND_SMELL | bits_COND_SMELL_FOOD;
+		}
+	}
+
+
+	return iIgnore;
+}
+
+//=========================================================
+// IRelationship - overridden for bullsquid so that it can
+// be made to ignore its love of headcrabs for a while.
+//=========================================================
+int CBullsquid::IRelationship ( CBaseEntity *pTarget )
+{
+	if ( gpGlobals->time - m_flLastHurtTime < 5 && FClassnameIs ( pTarget->pev, "monster_headcrab" ) )
+	{
+		// if squid has been hurt in the last 5 seconds, and is getting relationship for a headcrab, 
+		// tell squid to disregard crab. 
+		return R_NO;
+	}
+
+	return CBaseMonster :: IRelationship ( pTarget );
+}
+
+//=========================================================
+// TakeDamage - overridden for bullsquid so we can keep track
+// of how much time has passed since it was last injured
+//=========================================================
+int CBullsquid :: TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType )
+{
+	float flDist;
+	Vector vecApex;
+
+	// if the squid is running, has an enemy, was hurt by the enemy, hasn't been hurt in the last 3 seconds, and isn't too close to the enemy,
+	// it will swerve. (whew).
+	if ( m_hEnemy != NULL && IsMoving() && pevAttacker == m_hEnemy->pev && gpGlobals->time - m_flLastHurtTime > 3 )
+	{
+		flDist = ( pev->origin - m_hEnemy->pev->origin ).Length2D();
+		
+		if ( flDist > SQUID_SPRINT_DIST )
+		{
+			flDist = ( pev->origin - m_Route[ m_iRouteIndex ].vecLocation ).Length2D();// reusing flDist. 
+
+			if ( FTriangulate( pev->origin, m_Route[ m_iRouteIndex ].vecLocation, flDist * 0.5, m_hEnemy, &vecApex ) )
+			{
+				InsertWaypoint( vecApex, bits_MF_TO_DETOUR | bits_MF_DONT_SIMPLIFY );
+			}
+		}
+	}
+
+	if ( !FClassnameIs ( pevAttacker, "monster_headcrab" ) )
+	{
+		// don't forget about headcrabs if it was a headcrab that hurt the squid.
+		m_flLastHurtTime = gpGlobals->time;
+	}
+
+	return CBaseMonster :: TakeDamage ( pevInflictor, pevAttacker, flDamage, bitsDamageType );
+}
+
+//=========================================================
+// CheckRangeAttack1
+//=========================================================
+BOOL CBullsquid :: CheckRangeAttack1 ( float flDot, float flDist )
+{
+	if ( IsMoving() && flDist >= 512 )
+	{
+		// squid will far too far behind if he stops running to spit at this distance from the enemy.
+		return FALSE;
+	}
+
+	if ( flDist > 64 && flDist <= 784 && flDot >= 0.5 && gpGlobals->time >= m_flNextSpitTime )
+	{
+		if ( m_hEnemy != NULL )
+		{
+			if ( fabs( pev->origin.z - m_hEnemy->pev->origin.z ) > 256 )
+			{
+				// don't try to spit at someone up really high or down really low.
+				return FALSE;
+			}
+		}
+
+		if ( IsMoving() )
+		{
+			// don't spit again for a long time, resume chasing enemy.
+			m_flNextSpitTime = gpGlobals->time + 5;
+		}
+		else
+		{
+			// not moving, so spit again pretty soon.
+			m_flNextSpitTime = gpGlobals->time + 0.5;
+		}
+
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+//=========================================================
+// CheckMeleeAttack1 - bullsquid is a big guy, so has a longer
+// melee range than most monsters. This is the tailwhip attack
+//=========================================================
+BOOL CBullsquid :: CheckMeleeAttack1 ( float flDot, float flDist )
+{
+	if ( m_hEnemy->pev->health <= gSkillData.bullsquidDmgWhip && flDist <= 85 && flDot >= 0.7 )
+	{
+		return TRUE;
+	}
+	return FALSE;
+}
+
+//=========================================================
+// CheckMeleeAttack2 - bullsquid is a big guy, so has a longer
+// melee range than most monsters. This is the bite attack.
+// this attack will not be performed if the tailwhip attack
+// is valid.
+//=========================================================
+BOOL CBullsquid :: CheckMeleeAttack2 ( float flDot, float flDist )
+{
+	if ( flDist <= 85 && flDot >= 0.7 && !HasConditions( bits_COND_CAN_MELEE_ATTACK1 ) )		// The player & bullsquid can be as much as their bboxes 
+	{										// apart (48 * sqrt(3)) and he can still attack (85 is a little more than 48*sqrt(3))
+		return TRUE;
+	}
+	return FALSE;
+}  
+
+//=========================================================
+//  FValidateHintType 
+//=========================================================
+BOOL CBullsquid :: FValidateHintType ( short sHint )
+{
+	int i;
+
+	static short sSquidHints[] =
+	{
+		HINT_WORLD_HUMAN_BLOOD,
+	};
+
+	for ( i = 0 ; i < ARRAYSIZE ( sSquidHints ) ; i++ )
+	{
+		if ( sSquidHints[ i ] == sHint )
+		{
+			return TRUE;
+		}
+	}
+
+	ALERT ( at_aiconsole, "Couldn't validate hint type" );
+	return FALSE;
+}
+
+//=========================================================
+// ISoundMask - returns a bit mask indicating which types
+// of sounds this monster regards. In the base class implementation,
+// monsters care about all sounds, but no scents.
+//=========================================================
+int CBullsquid :: ISoundMask ( void )
+{
+	return	bits_SOUND_WORLD	|
+			bits_SOUND_COMBAT	|
+			bits_SOUND_CARCASS	|
+			bits_SOUND_MEAT		|
+			bits_SOUND_GARBAGE	|
+			bits_SOUND_PLAYER;
+}
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CBullsquid :: Classify ( void )
+{
+	return	CLASS_ALIEN_PREDATOR;
+}
+
+//=========================================================
+// IdleSound 
+//=========================================================
+#define SQUID_ATTN_IDLE	(float)1.5
+void CBullsquid :: IdleSound ( void )
+{
+	switch ( RANDOM_LONG(0,4) )
+	{
+	case 0:	
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "bullchicken/bc_idle1.wav", 1, SQUID_ATTN_IDLE );	
+		break;
+	case 1:	
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "bullchicken/bc_idle2.wav", 1, SQUID_ATTN_IDLE );	
+		break;
+	case 2:	
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "bullchicken/bc_idle3.wav", 1, SQUID_ATTN_IDLE );	
+		break;
+	case 3:	
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "bullchicken/bc_idle4.wav", 1, SQUID_ATTN_IDLE );	
+		break;
+	case 4:	
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "bullchicken/bc_idle5.wav", 1, SQUID_ATTN_IDLE );	
+		break;
+	}
+}
+
+//=========================================================
+// PainSound 
+//=========================================================
+void CBullsquid :: PainSound ( void )
+{
+	int iPitch = RANDOM_LONG( 85, 120 );
+
+	switch ( RANDOM_LONG(0,3) )
+	{
+	case 0:	
+		EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, "bullchicken/bc_pain1.wav", 1, ATTN_NORM, 0, iPitch );	
+		break;
+	case 1:	
+		EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, "bullchicken/bc_pain2.wav", 1, ATTN_NORM, 0, iPitch );	
+		break;
+	case 2:	
+		EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, "bullchicken/bc_pain3.wav", 1, ATTN_NORM, 0, iPitch );	
+		break;
+	case 3:	
+		EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, "bullchicken/bc_pain4.wav", 1, ATTN_NORM, 0, iPitch );	
+		break;
+	}
+}
+
+//=========================================================
+// AlertSound
+//=========================================================
+void CBullsquid :: AlertSound ( void )
+{
+	int iPitch = RANDOM_LONG( 140, 160 );
+
+	switch ( RANDOM_LONG ( 0, 1  ) )
+	{
+	case 0:
+		EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, "bullchicken/bc_idle1.wav", 1, ATTN_NORM, 0, iPitch );	
+		break;
+	case 1:
+		EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, "bullchicken/bc_idle2.wav", 1, ATTN_NORM, 0, iPitch );	
+		break;
+	}
+}
+
+//=========================================================
+// SetYawSpeed - allows each sequence to have a different
+// turn rate associated with it.
+//=========================================================
+void CBullsquid :: SetYawSpeed ( void )
+{
+	int ys;
+
+	ys = 0;
+
+	switch ( m_Activity )
+	{
+	case	ACT_WALK:			ys = 90;	break;
+	case	ACT_RUN:			ys = 90;	break;
+	case	ACT_IDLE:			ys = 90;	break;
+	case	ACT_RANGE_ATTACK1:	ys = 90;	break;
+	default:
+		ys = 90;
+		break;
+	}
+
+	pev->yaw_speed = ys;
+}
+
+//=========================================================
+// HandleAnimEvent - catches the monster-specific messages
+// that occur when tagged animation frames are played.
+//=========================================================
+void CBullsquid :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	switch( pEvent->event )
+	{
+		case BSQUID_AE_SPIT:
+		{
+			Vector	vecSpitOffset;
+			Vector	vecSpitDir;
+
+			UTIL_MakeVectors ( pev->angles );
+
+			// !!!HACKHACK - the spot at which the spit originates (in front of the mouth) was measured in 3ds and hardcoded here.
+			// we should be able to read the position of bones at runtime for this info.
+			vecSpitOffset = ( gpGlobals->v_right * 8 + gpGlobals->v_forward * 37 + gpGlobals->v_up * 23 );		
+			vecSpitOffset = ( pev->origin + vecSpitOffset );
+			vecSpitDir = ( ( m_hEnemy->pev->origin + m_hEnemy->pev->view_ofs ) - vecSpitOffset ).Normalize();
+
+			vecSpitDir.x += RANDOM_FLOAT( -0.05, 0.05 );
+			vecSpitDir.y += RANDOM_FLOAT( -0.05, 0.05 );
+			vecSpitDir.z += RANDOM_FLOAT( -0.05, 0 );
+
+
+			// do stuff for this event.
+			AttackSound();
+
+			// spew the spittle temporary ents.
+			MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, vecSpitOffset );
+				WRITE_BYTE( TE_SPRITE_SPRAY );
+				WRITE_COORD( vecSpitOffset.x);	// pos
+				WRITE_COORD( vecSpitOffset.y);	
+				WRITE_COORD( vecSpitOffset.z);	
+				WRITE_COORD( vecSpitDir.x);	// dir
+				WRITE_COORD( vecSpitDir.y);	
+				WRITE_COORD( vecSpitDir.z);	
+				WRITE_SHORT( iSquidSpitSprite );	// model
+				WRITE_BYTE ( 15 );			// count
+				WRITE_BYTE ( 210 );			// speed
+				WRITE_BYTE ( 25 );			// noise ( client will divide by 100 )
+			MESSAGE_END();
+
+			CSquidSpit::Shoot( pev, vecSpitOffset, vecSpitDir * 900 );
+		}
+		break;
+
+		case BSQUID_AE_BITE:
+		{
+			// SOUND HERE!
+			CBaseEntity *pHurt = CheckTraceHullAttack( 70, gSkillData.bullsquidDmgBite, DMG_SLASH );
+			
+			if ( pHurt )
+			{
+				//pHurt->pev->punchangle.z = -15;
+				//pHurt->pev->punchangle.x = -45;
+				pHurt->pev->velocity = pHurt->pev->velocity - gpGlobals->v_forward * 100;
+				pHurt->pev->velocity = pHurt->pev->velocity + gpGlobals->v_up * 100;
+			}
+		}
+		break;
+
+		case BSQUID_AE_TAILWHIP:
+		{
+			CBaseEntity *pHurt = CheckTraceHullAttack( 70, gSkillData.bullsquidDmgWhip, DMG_CLUB | DMG_ALWAYSGIB );
+			if ( pHurt ) 
+			{
+				pHurt->pev->punchangle.z = -20;
+				pHurt->pev->punchangle.x = 20;
+				pHurt->pev->velocity = pHurt->pev->velocity + gpGlobals->v_right * 200;
+				pHurt->pev->velocity = pHurt->pev->velocity + gpGlobals->v_up * 100;
+			}
+		}
+		break;
+
+		case BSQUID_AE_BLINK:
+		{
+			// close eye. 
+			pev->skin = 1;
+		}
+		break;
+
+		case BSQUID_AE_HOP:
+		{
+			float flGravity = g_psv_gravity->value;
+
+			// throw the squid up into the air on this frame.
+			if ( FBitSet ( pev->flags, FL_ONGROUND ) )
+			{
+				pev->flags -= FL_ONGROUND;
+			}
+
+			// jump into air for 0.8 (24/30) seconds
+//			pev->velocity.z += (0.875 * flGravity) * 0.5;
+			pev->velocity.z += (0.625 * flGravity) * 0.5;
+		}
+		break;
+
+		case BSQUID_AE_THROW:
+			{
+				int iPitch;
+
+				// squid throws its prey IF the prey is a client. 
+				float theDamage = 0;
+				CBaseEntity *pHurt = CheckTraceHullAttack( 70, theDamage, 0 );
+
+
+				if ( pHurt )
+				{
+					// croonchy bite sound
+					iPitch = RANDOM_FLOAT( 90, 110 );
+					switch ( RANDOM_LONG( 0, 1 ) )
+					{
+					case 0:
+						EMIT_SOUND_DYN( ENT(pev), CHAN_WEAPON, "bullchicken/bc_bite2.wav", 1, ATTN_NORM, 0, iPitch );	
+						break;
+					case 1:
+						EMIT_SOUND_DYN( ENT(pev), CHAN_WEAPON, "bullchicken/bc_bite3.wav", 1, ATTN_NORM, 0, iPitch );	
+						break;
+					}
+
+					
+					//pHurt->pev->punchangle.x = RANDOM_LONG(0,34) - 5;
+					//pHurt->pev->punchangle.z = RANDOM_LONG(0,49) - 25;
+					//pHurt->pev->punchangle.y = RANDOM_LONG(0,89) - 45;
+		
+					// screeshake transforms the viewmodel as well as the viewangle. No problems with seeing the ends of the viewmodels.
+					UTIL_ScreenShake( pHurt->pev->origin, 25.0, 1.5, 0.7, 2 );
+
+					if ( pHurt->IsPlayer() )
+					{
+						UTIL_MakeVectors( pev->angles );
+						pHurt->pev->velocity = pHurt->pev->velocity + gpGlobals->v_forward * 300 + gpGlobals->v_up * 300;
+					}
+				}
+			}
+		break;
+
+		default:
+			CBaseMonster::HandleAnimEvent( pEvent );
+	}
+}
+
+//=========================================================
+// Spawn
+//=========================================================
+void CBullsquid :: Spawn()
+{
+	Precache( );
+
+	SET_MODEL(ENT(pev), "models/bullsquid.mdl");
+	UTIL_SetSize( pev, Vector( -32, -32, 0 ), Vector( 32, 32, 64 ) );
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_STEP;
+	m_bloodColor		= BLOOD_COLOR_GREEN;
+	pev->effects		= 0;
+	pev->health			= gSkillData.bullsquidHealth;
+	m_flFieldOfView		= 0.2;// indicates the width of this monster's forward view cone ( as a dotproduct result )
+	m_MonsterState		= MONSTERSTATE_NONE;
+
+	m_fCanThreatDisplay	= TRUE;
+	m_flNextSpitTime = gpGlobals->time;
+
+	MonsterInit();
+}
+
+//=========================================================
+// Precache - precaches all resources this monster needs
+//=========================================================
+void CBullsquid :: Precache()
+{
+	PRECACHE_MODEL("models/bullsquid.mdl");
+	
+	PRECACHE_MODEL("sprites/bigspit.spr");// spit projectile.
+	
+	iSquidSpitSprite = PRECACHE_MODEL("sprites/tinyspit.spr");// client side spittle.
+
+	PRECACHE_SOUND("zombie/claw_miss2.wav");// because we use the basemonster SWIPE animation event
+
+	PRECACHE_SOUND("bullchicken/bc_attack2.wav");
+	PRECACHE_SOUND("bullchicken/bc_attack3.wav");
+	
+	PRECACHE_SOUND("bullchicken/bc_die1.wav");
+	PRECACHE_SOUND("bullchicken/bc_die2.wav");
+	PRECACHE_SOUND("bullchicken/bc_die3.wav");
+	
+	PRECACHE_SOUND("bullchicken/bc_idle1.wav");
+	PRECACHE_SOUND("bullchicken/bc_idle2.wav");
+	PRECACHE_SOUND("bullchicken/bc_idle3.wav");
+	PRECACHE_SOUND("bullchicken/bc_idle4.wav");
+	PRECACHE_SOUND("bullchicken/bc_idle5.wav");
+	
+	PRECACHE_SOUND("bullchicken/bc_pain1.wav");
+	PRECACHE_SOUND("bullchicken/bc_pain2.wav");
+	PRECACHE_SOUND("bullchicken/bc_pain3.wav");
+	PRECACHE_SOUND("bullchicken/bc_pain4.wav");
+	
+	PRECACHE_SOUND("bullchicken/bc_attackgrowl.wav");
+	PRECACHE_SOUND("bullchicken/bc_attackgrowl2.wav");
+	PRECACHE_SOUND("bullchicken/bc_attackgrowl3.wav");
+
+	PRECACHE_SOUND("bullchicken/bc_acid1.wav");
+
+	PRECACHE_SOUND("bullchicken/bc_bite2.wav");
+	PRECACHE_SOUND("bullchicken/bc_bite3.wav");
+
+	PRECACHE_SOUND("bullchicken/bc_spithit1.wav");
+	PRECACHE_SOUND("bullchicken/bc_spithit2.wav");
+
+}	
+
+//=========================================================
+// DeathSound
+//=========================================================
+void CBullsquid :: DeathSound ( void )
+{
+	switch ( RANDOM_LONG(0,2) )
+	{
+	case 0:	
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "bullchicken/bc_die1.wav", 1, ATTN_NORM );	
+		break;
+	case 1:
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "bullchicken/bc_die2.wav", 1, ATTN_NORM );	
+		break;
+	case 2:
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "bullchicken/bc_die3.wav", 1, ATTN_NORM );	
+		break;
+	}
+}
+
+//=========================================================
+// AttackSound
+//=========================================================
+void CBullsquid :: AttackSound ( void )
+{
+	switch ( RANDOM_LONG(0,1) )
+	{
+	case 0:
+		EMIT_SOUND( ENT(pev), CHAN_WEAPON, "bullchicken/bc_attack2.wav", 1, ATTN_NORM );	
+		break;
+	case 1:
+		EMIT_SOUND( ENT(pev), CHAN_WEAPON, "bullchicken/bc_attack3.wav", 1, ATTN_NORM );	
+		break;
+	}
+}
+
+
+//========================================================
+// RunAI - overridden for bullsquid because there are things
+// that need to be checked every think.
+//========================================================
+void CBullsquid :: RunAI ( void )
+{
+	// first, do base class stuff
+	CBaseMonster :: RunAI();
+
+	if ( pev->skin != 0 )
+	{
+		// close eye if it was open.
+		pev->skin = 0; 
+	}
+
+	if ( RANDOM_LONG(0,39) == 0 )
+	{
+		pev->skin = 1;
+	}
+
+	if ( m_hEnemy != NULL && m_Activity == ACT_RUN )
+	{
+		// chasing enemy. Sprint for last bit
+		if ( (pev->origin - m_hEnemy->pev->origin).Length2D() < SQUID_SPRINT_DIST )
+		{
+			pev->framerate = 1.25;
+		}
+	}
+
+}
+
+//========================================================
+// AI Schedules Specific to this monster
+//=========================================================
+
+// primary range attack
+Task_t	tlSquidRangeAttack1[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_FACE_IDEAL,			(float)0		},
+	{ TASK_RANGE_ATTACK1,		(float)0		},
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE	},
+};
+
+Schedule_t	slSquidRangeAttack1[] =
+{
+	{ 
+		tlSquidRangeAttack1,
+		ARRAYSIZE ( tlSquidRangeAttack1 ), 
+		bits_COND_NEW_ENEMY			|
+		bits_COND_ENEMY_DEAD		|
+		bits_COND_HEAVY_DAMAGE		|
+		bits_COND_ENEMY_OCCLUDED	|
+		bits_COND_NO_AMMO_LOADED,
+		0,
+		"Squid Range Attack1"
+	},
+};
+
+// Chase enemy schedule
+Task_t tlSquidChaseEnemy1[] = 
+{
+	{ TASK_SET_FAIL_SCHEDULE,	(float)SCHED_RANGE_ATTACK1	},// !!!OEM - this will stop nasty squid oscillation.
+	{ TASK_GET_PATH_TO_ENEMY,	(float)0					},
+	{ TASK_RUN_PATH,			(float)0					},
+	{ TASK_WAIT_FOR_MOVEMENT,	(float)0					},
+};
+
+Schedule_t slSquidChaseEnemy[] =
+{
+	{ 
+		tlSquidChaseEnemy1,
+		ARRAYSIZE ( tlSquidChaseEnemy1 ),
+		bits_COND_NEW_ENEMY			|
+		bits_COND_ENEMY_DEAD		|
+		bits_COND_SMELL_FOOD		|
+		bits_COND_CAN_RANGE_ATTACK1	|
+		bits_COND_CAN_MELEE_ATTACK1	|
+		bits_COND_CAN_MELEE_ATTACK2	|
+		bits_COND_TASK_FAILED		|
+		bits_COND_HEAR_SOUND,
+		
+		bits_SOUND_DANGER			|
+		bits_SOUND_MEAT,
+		"Squid Chase Enemy"
+	},
+};
+
+Task_t tlSquidHurtHop[] =
+{
+	{ TASK_STOP_MOVING,			(float)0		},
+	{ TASK_SOUND_WAKE,			(float)0		},
+	{ TASK_SQUID_HOPTURN,		(float)0		},
+	{ TASK_FACE_ENEMY,			(float)0		},// in case squid didn't turn all the way in the air.
+};
+
+Schedule_t slSquidHurtHop[] =
+{
+	{
+		tlSquidHurtHop,
+		ARRAYSIZE ( tlSquidHurtHop ),
+		0,
+		0,
+		"SquidHurtHop"
+	}
+};
+
+Task_t tlSquidSeeCrab[] =
+{
+	{ TASK_STOP_MOVING,			(float)0		},
+	{ TASK_SOUND_WAKE,			(float)0			},
+	{ TASK_PLAY_SEQUENCE,		(float)ACT_EXCITED	},
+	{ TASK_FACE_ENEMY,			(float)0			},
+};
+
+Schedule_t slSquidSeeCrab[] =
+{
+	{
+		tlSquidSeeCrab,
+		ARRAYSIZE ( tlSquidSeeCrab ),
+		bits_COND_LIGHT_DAMAGE		|
+		bits_COND_HEAVY_DAMAGE,
+		0,
+		"SquidSeeCrab"
+	}
+};
+
+// squid walks to something tasty and eats it.
+Task_t tlSquidEat[] =
+{
+	{ TASK_STOP_MOVING,				(float)0				},
+	{ TASK_EAT,						(float)10				},// this is in case the squid can't get to the food
+	{ TASK_STORE_LASTPOSITION,		(float)0				},
+	{ TASK_GET_PATH_TO_BESTSCENT,	(float)0				},
+	{ TASK_WALK_PATH,				(float)0				},
+	{ TASK_WAIT_FOR_MOVEMENT,		(float)0				},
+	{ TASK_PLAY_SEQUENCE,			(float)ACT_EAT			},
+	{ TASK_PLAY_SEQUENCE,			(float)ACT_EAT			},
+	{ TASK_PLAY_SEQUENCE,			(float)ACT_EAT			},
+	{ TASK_EAT,						(float)50				},
+	{ TASK_GET_PATH_TO_LASTPOSITION,(float)0				},
+	{ TASK_WALK_PATH,				(float)0				},
+	{ TASK_WAIT_FOR_MOVEMENT,		(float)0				},
+	{ TASK_CLEAR_LASTPOSITION,		(float)0				},
+};
+
+Schedule_t slSquidEat[] =
+{
+	{
+		tlSquidEat,
+		ARRAYSIZE( tlSquidEat ),
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE	|
+		bits_COND_NEW_ENEMY	,
+		
+		// even though HEAR_SOUND/SMELL FOOD doesn't break this schedule, we need this mask
+		// here or the monster won't detect these sounds at ALL while running this schedule.
+		bits_SOUND_MEAT			|
+		bits_SOUND_CARCASS,
+		"SquidEat"
+	}
+};
+
+// this is a bit different than just Eat. We use this schedule when the food is far away, occluded, or behind
+// the squid. This schedule plays a sniff animation before going to the source of food.
+Task_t tlSquidSniffAndEat[] =
+{
+	{ TASK_STOP_MOVING,				(float)0				},
+	{ TASK_EAT,						(float)10				},// this is in case the squid can't get to the food
+	{ TASK_PLAY_SEQUENCE,			(float)ACT_DETECT_SCENT },
+	{ TASK_STORE_LASTPOSITION,		(float)0				},
+	{ TASK_GET_PATH_TO_BESTSCENT,	(float)0				},
+	{ TASK_WALK_PATH,				(float)0				},
+	{ TASK_WAIT_FOR_MOVEMENT,		(float)0				},
+	{ TASK_PLAY_SEQUENCE,			(float)ACT_EAT			},
+	{ TASK_PLAY_SEQUENCE,			(float)ACT_EAT			},
+	{ TASK_PLAY_SEQUENCE,			(float)ACT_EAT			},
+	{ TASK_EAT,						(float)50				},
+	{ TASK_GET_PATH_TO_LASTPOSITION,(float)0				},
+	{ TASK_WALK_PATH,				(float)0				},
+	{ TASK_WAIT_FOR_MOVEMENT,		(float)0				},
+	{ TASK_CLEAR_LASTPOSITION,		(float)0				},
+};
+
+Schedule_t slSquidSniffAndEat[] =
+{
+	{
+		tlSquidSniffAndEat,
+		ARRAYSIZE( tlSquidSniffAndEat ),
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE	|
+		bits_COND_NEW_ENEMY	,
+		
+		// even though HEAR_SOUND/SMELL FOOD doesn't break this schedule, we need this mask
+		// here or the monster won't detect these sounds at ALL while running this schedule.
+		bits_SOUND_MEAT			|
+		bits_SOUND_CARCASS,
+		"SquidSniffAndEat"
+	}
+};
+
+// squid does this to stinky things. 
+Task_t tlSquidWallow[] =
+{
+	{ TASK_STOP_MOVING,				(float)0				},
+	{ TASK_EAT,						(float)10				},// this is in case the squid can't get to the stinkiness
+	{ TASK_STORE_LASTPOSITION,		(float)0				},
+	{ TASK_GET_PATH_TO_BESTSCENT,	(float)0				},
+	{ TASK_WALK_PATH,				(float)0				},
+	{ TASK_WAIT_FOR_MOVEMENT,		(float)0				},
+	{ TASK_PLAY_SEQUENCE,			(float)ACT_INSPECT_FLOOR},
+	{ TASK_EAT,						(float)50				},// keeps squid from eating or sniffing anything else for a while.
+	{ TASK_GET_PATH_TO_LASTPOSITION,(float)0				},
+	{ TASK_WALK_PATH,				(float)0				},
+	{ TASK_WAIT_FOR_MOVEMENT,		(float)0				},
+	{ TASK_CLEAR_LASTPOSITION,		(float)0				},
+};
+
+Schedule_t slSquidWallow[] =
+{
+	{
+		tlSquidWallow,
+		ARRAYSIZE( tlSquidWallow ),
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE	|
+		bits_COND_NEW_ENEMY	,
+		
+		// even though HEAR_SOUND/SMELL FOOD doesn't break this schedule, we need this mask
+		// here or the monster won't detect these sounds at ALL while running this schedule.
+		bits_SOUND_GARBAGE,
+
+		"SquidWallow"
+	}
+};
+
+DEFINE_CUSTOM_SCHEDULES( CBullsquid ) 
+{
+	slSquidRangeAttack1,
+	slSquidChaseEnemy,
+	slSquidHurtHop,
+	slSquidSeeCrab,
+	slSquidEat,
+	slSquidSniffAndEat,
+	slSquidWallow
+};
+
+IMPLEMENT_CUSTOM_SCHEDULES( CBullsquid, CBaseMonster );
+
+//=========================================================
+// GetSchedule 
+//=========================================================
+Schedule_t *CBullsquid :: GetSchedule( void )
+{
+	switch	( m_MonsterState )
+	{
+	case MONSTERSTATE_ALERT:
+		{
+			if ( HasConditions(bits_COND_LIGHT_DAMAGE | bits_COND_HEAVY_DAMAGE) )
+			{
+				return GetScheduleOfType ( SCHED_SQUID_HURTHOP );
+			}
+
+			if ( HasConditions(bits_COND_SMELL_FOOD) )
+			{
+				CSound		*pSound;
+
+				pSound = PBestScent();
+				
+				if ( pSound && (!FInViewCone ( &pSound->m_vecOrigin ) || !FVisible ( pSound->m_vecOrigin )) )
+				{
+					// scent is behind or occluded
+					return GetScheduleOfType( SCHED_SQUID_SNIFF_AND_EAT );
+				}
+
+				// food is right out in the open. Just go get it.
+				return GetScheduleOfType( SCHED_SQUID_EAT );
+			}
+
+			if ( HasConditions(bits_COND_SMELL) )
+			{
+				// there's something stinky. 
+				CSound		*pSound;
+
+				pSound = PBestScent();
+				if ( pSound )
+					return GetScheduleOfType( SCHED_SQUID_WALLOW);
+			}
+
+			break;
+		}
+	case MONSTERSTATE_COMBAT:
+		{
+// dead enemy
+			if ( HasConditions( bits_COND_ENEMY_DEAD ) )
+			{
+				// call base class, all code to handle dead enemies is centralized there.
+				return CBaseMonster :: GetSchedule();
+			}
+
+			if ( HasConditions(bits_COND_NEW_ENEMY) )
+			{
+				if ( m_fCanThreatDisplay && IRelationship( m_hEnemy ) == R_HT )
+				{
+					// this means squid sees a headcrab!
+					m_fCanThreatDisplay = FALSE;// only do the headcrab dance once per lifetime.
+					return GetScheduleOfType ( SCHED_SQUID_SEECRAB );
+				}
+				else
+				{
+					return GetScheduleOfType ( SCHED_WAKE_ANGRY );
+				}
+			}
+
+			if ( HasConditions(bits_COND_SMELL_FOOD) )
+			{
+				CSound		*pSound;
+
+				pSound = PBestScent();
+				
+				if ( pSound && (!FInViewCone ( &pSound->m_vecOrigin ) || !FVisible ( pSound->m_vecOrigin )) )
+				{
+					// scent is behind or occluded
+					return GetScheduleOfType( SCHED_SQUID_SNIFF_AND_EAT );
+				}
+
+				// food is right out in the open. Just go get it.
+				return GetScheduleOfType( SCHED_SQUID_EAT );
+			}
+
+			if ( HasConditions( bits_COND_CAN_RANGE_ATTACK1 ) )
+			{
+				return GetScheduleOfType ( SCHED_RANGE_ATTACK1 );
+			}
+
+			if ( HasConditions( bits_COND_CAN_MELEE_ATTACK1 ) )
+			{
+				return GetScheduleOfType ( SCHED_MELEE_ATTACK1 );
+			}
+
+			if ( HasConditions( bits_COND_CAN_MELEE_ATTACK2 ) )
+			{
+				return GetScheduleOfType ( SCHED_MELEE_ATTACK2 );
+			}
+			
+			return GetScheduleOfType ( SCHED_CHASE_ENEMY );
+
+			break;
+		}
+	}
+
+	return CBaseMonster :: GetSchedule();
+}
+
+//=========================================================
+// GetScheduleOfType
+//=========================================================
+Schedule_t* CBullsquid :: GetScheduleOfType ( int Type ) 
+{
+	switch	( Type )
+	{
+	case SCHED_RANGE_ATTACK1:
+		return &slSquidRangeAttack1[ 0 ];
+		break;
+	case SCHED_SQUID_HURTHOP:
+		return &slSquidHurtHop[ 0 ];
+		break;
+	case SCHED_SQUID_SEECRAB:
+		return &slSquidSeeCrab[ 0 ];
+		break;
+	case SCHED_SQUID_EAT:
+		return &slSquidEat[ 0 ];
+		break;
+	case SCHED_SQUID_SNIFF_AND_EAT:
+		return &slSquidSniffAndEat[ 0 ];
+		break;
+	case SCHED_SQUID_WALLOW:
+		return &slSquidWallow[ 0 ];
+		break;
+	case SCHED_CHASE_ENEMY:
+		return &slSquidChaseEnemy[ 0 ];
+		break;
+	}
+
+	return CBaseMonster :: GetScheduleOfType ( Type );
+}
+
+//=========================================================
+// Start task - selects the correct activity and performs
+// any necessary calculations to start the next task on the
+// schedule.  OVERRIDDEN for bullsquid because it needs to
+// know explicitly when the last attempt to chase the enemy
+// failed, since that impacts its attack choices.
+//=========================================================
+void CBullsquid :: StartTask ( Task_t *pTask )
+{
+	m_iTaskStatus = TASKSTATUS_RUNNING;
+
+	switch ( pTask->iTask )
+	{
+	case TASK_MELEE_ATTACK2:
+		{
+			switch ( RANDOM_LONG ( 0, 2 ) )
+			{
+			case 0:	
+				EMIT_SOUND( ENT(pev), CHAN_VOICE, "bullchicken/bc_attackgrowl.wav", 1, ATTN_NORM );		
+				break;
+			case 1:	
+				EMIT_SOUND( ENT(pev), CHAN_VOICE, "bullchicken/bc_attackgrowl2.wav", 1, ATTN_NORM );	
+				break;
+			case 2:	
+				EMIT_SOUND( ENT(pev), CHAN_VOICE, "bullchicken/bc_attackgrowl3.wav", 1, ATTN_NORM );	
+				break;
+			}
+
+			CBaseMonster :: StartTask ( pTask );
+			break;
+		}
+	case TASK_SQUID_HOPTURN:
+		{
+			SetActivity ( ACT_HOP );
+			MakeIdealYaw ( m_vecEnemyLKP );
+			break;
+		}
+	case TASK_GET_PATH_TO_ENEMY:
+		{
+			if ( BuildRoute ( m_hEnemy->pev->origin, bits_MF_TO_ENEMY, m_hEnemy ) )
+			{
+				m_iTaskStatus = TASKSTATUS_COMPLETE;
+			}
+			else
+			{
+				ALERT ( at_aiconsole, "GetPathToEnemy failed!!\n" );
+				TaskFail();
+			}
+			break;
+		}
+	default:
+		{
+			CBaseMonster :: StartTask ( pTask );
+			break;
+		}
+	}
+}
+
+//=========================================================
+// RunTask
+//=========================================================
+void CBullsquid :: RunTask ( Task_t *pTask )
+{
+	switch ( pTask->iTask )
+	{
+	case TASK_SQUID_HOPTURN:
+		{
+			MakeIdealYaw( m_vecEnemyLKP );
+			ChangeYaw( pev->yaw_speed );
+
+			if ( m_fSequenceFinished )
+			{
+				m_iTaskStatus = TASKSTATUS_COMPLETE;
+			}
+			break;
+		}
+	default:
+		{
+			CBaseMonster :: RunTask( pTask );
+			break;
+		}
+	}
+}
+
+
+//=========================================================
+// GetIdealState - Overridden for Bullsquid to deal with
+// the feature that makes it lose interest in headcrabs for 
+// a while if something injures it. 
+//=========================================================
+MONSTERSTATE CBullsquid :: GetIdealState ( void )
+{
+	int	iConditions;
+
+	iConditions = IScheduleFlags();
+	
+	// If no schedule conditions, the new ideal state is probably the reason we're in here.
+	switch ( m_MonsterState )
+	{
+	case MONSTERSTATE_COMBAT:
+		/*
+		COMBAT goes to ALERT upon death of enemy
+		*/
+		{
+			if ( m_hEnemy != NULL && ( iConditions & bits_COND_LIGHT_DAMAGE || iConditions & bits_COND_HEAVY_DAMAGE ) && FClassnameIs( m_hEnemy->pev, "monster_headcrab" ) )
+			{
+				// if the squid has a headcrab enemy and something hurts it, it's going to forget about the crab for a while.
+				m_hEnemy = NULL;
+				m_IdealMonsterState = MONSTERSTATE_ALERT;
+			}
+			break;
+		}
+	}
+
+	m_IdealMonsterState = CBaseMonster :: GetIdealState();
+
+	return m_IdealMonsterState;
+}
+
diff --git a/main/source/dlls/buttons.cpp b/main/source/dlls/buttons.cpp
new file mode 100644
index 00000000..605e7bf4
--- /dev/null
+++ b/main/source/dlls/buttons.cpp
@@ -0,0 +1,1288 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/*
+
+===== buttons.cpp ========================================================
+
+  button-related code
+
+*/
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "saverestore.h"
+#include "doors.h"
+
+
+#define SF_BUTTON_DONTMOVE		1
+#define SF_ROTBUTTON_NOTSOLID	1
+#define	SF_BUTTON_TOGGLE		32	// button stays pushed until reactivated
+#define	SF_BUTTON_SPARK_IF_OFF	64	// button sparks in OFF state
+#define SF_BUTTON_TOUCH_ONLY	256	// button only fires as a result of USE key.
+
+#define SF_GLOBAL_SET			1	// Set global state to initial state on spawn
+
+class CEnvGlobal : public CPointEntity
+{
+public:
+	void	Spawn( void );
+	void	KeyValue( KeyValueData *pkvd );
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+
+	static	TYPEDESCRIPTION m_SaveData[];
+	
+	string_t	m_globalstate;
+	int			m_triggermode;
+	int			m_initialstate;
+};
+
+TYPEDESCRIPTION CEnvGlobal::m_SaveData[] =
+{
+	DEFINE_FIELD( CEnvGlobal, m_globalstate, FIELD_STRING ),
+	DEFINE_FIELD( CEnvGlobal, m_triggermode, FIELD_INTEGER ),
+	DEFINE_FIELD( CEnvGlobal, m_initialstate, FIELD_INTEGER ),
+};
+
+IMPLEMENT_SAVERESTORE( CEnvGlobal, CBaseEntity );
+
+LINK_ENTITY_TO_CLASS( env_global, CEnvGlobal );
+
+void CEnvGlobal::KeyValue( KeyValueData *pkvd )
+{
+	pkvd->fHandled = TRUE;
+
+	if ( FStrEq(pkvd->szKeyName, "globalstate") )		// State name
+		m_globalstate = ALLOC_STRING( pkvd->szValue );
+	else if ( FStrEq(pkvd->szKeyName, "triggermode") )
+		m_triggermode = atoi( pkvd->szValue );
+	else if ( FStrEq(pkvd->szKeyName, "initialstate") )
+		m_initialstate = atoi( pkvd->szValue );
+	else 
+		CPointEntity::KeyValue( pkvd );
+}
+
+void CEnvGlobal::Spawn( void )
+{
+	if ( !m_globalstate )
+	{
+		REMOVE_ENTITY( ENT(pev) );
+		return;
+	}
+	if ( FBitSet( pev->spawnflags, SF_GLOBAL_SET ) )
+	{
+		if ( !gGlobalState.EntityInTable( m_globalstate ) )
+			gGlobalState.EntityAdd( m_globalstate, gpGlobals->mapname, (GLOBALESTATE)m_initialstate );
+	}
+}
+
+
+void CEnvGlobal::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	GLOBALESTATE oldState = gGlobalState.EntityGetState( m_globalstate );
+	GLOBALESTATE newState;
+
+	switch( m_triggermode )
+	{
+	case 0:
+		newState = GLOBAL_OFF;
+		break;
+
+	case 1:
+		newState = GLOBAL_ON;
+		break;
+
+	case 2:
+		newState = GLOBAL_DEAD;
+		break;
+
+	default:
+	case 3:
+		if ( oldState == GLOBAL_ON )
+			newState = GLOBAL_OFF;
+		else if ( oldState == GLOBAL_OFF )
+			newState = GLOBAL_ON;
+		else
+			newState = oldState;
+	}
+
+	if ( gGlobalState.EntityInTable( m_globalstate ) )
+		gGlobalState.EntitySetState( m_globalstate, newState );
+	else
+		gGlobalState.EntityAdd( m_globalstate, gpGlobals->mapname, newState );
+}
+
+
+
+TYPEDESCRIPTION CMultiSource::m_SaveData[] =
+{
+	//!!!BUGBUG FIX
+	DEFINE_ARRAY( CMultiSource, m_rgEntities, FIELD_EHANDLE, MS_MAX_TARGETS ),
+	DEFINE_ARRAY( CMultiSource, m_rgTriggered, FIELD_INTEGER, MS_MAX_TARGETS ),
+	DEFINE_FIELD( CMultiSource, m_iTotal, FIELD_INTEGER ),
+	DEFINE_FIELD( CMultiSource, m_globalstate, FIELD_STRING ),
+};
+
+IMPLEMENT_SAVERESTORE( CMultiSource, CBaseEntity );
+
+LINK_ENTITY_TO_CLASS( multisource, CMultiSource );
+//
+// Cache user-entity-field values until spawn is called.
+//
+
+void CMultiSource::KeyValue( KeyValueData *pkvd )
+{
+	if (	FStrEq(pkvd->szKeyName, "style") ||
+				FStrEq(pkvd->szKeyName, "height") ||
+				FStrEq(pkvd->szKeyName, "killtarget") ||
+				FStrEq(pkvd->szKeyName, "value1") ||
+				FStrEq(pkvd->szKeyName, "value2") ||
+				FStrEq(pkvd->szKeyName, "value3"))
+		pkvd->fHandled = TRUE;
+	else if ( FStrEq(pkvd->szKeyName, "globalstate") )
+	{
+		m_globalstate = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else 
+		CPointEntity::KeyValue( pkvd );
+}
+
+#define SF_MULTI_INIT		1
+
+void CMultiSource::Spawn()
+{ 
+	// set up think for later registration
+
+	pev->solid = SOLID_NOT;
+	pev->movetype = MOVETYPE_NONE;
+	pev->nextthink = gpGlobals->time + 0.1;
+	pev->spawnflags |= SF_MULTI_INIT;	// Until it's initialized
+	SetThink(&CMultiSource::Register);
+}
+
+void CMultiSource::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{ 
+	int i = 0;
+
+	// Find the entity in our list
+	while (i < m_iTotal)
+		if ( m_rgEntities[i++] == pCaller )
+			break;
+
+	// if we didn't find it, report error and leave
+	if (i > m_iTotal)
+	{
+		ALERT(at_console, "MultiSrc:Used by non member %s.\n", STRING(pCaller->pev->classname));
+		return;	
+	}
+
+	// CONSIDER: a Use input to the multisource always toggles.  Could check useType for ON/OFF/TOGGLE
+
+	m_rgTriggered[i-1] ^= 1;
+
+	// 
+	if ( IsTriggered( pActivator ) )
+	{
+		ALERT( at_aiconsole, "Multisource %s enabled (%d inputs)\n", STRING(pev->targetname), m_iTotal );
+		USE_TYPE useType = USE_TOGGLE;
+		if ( m_globalstate )
+			useType = USE_ON;
+		SUB_UseTargets( NULL, useType, 0 );
+	}
+}
+
+
+BOOL CMultiSource::IsTriggered( CBaseEntity * )
+{
+	// Is everything triggered?
+	int i = 0;
+
+	// Still initializing?
+	if ( pev->spawnflags & SF_MULTI_INIT )
+		return 0;
+
+	while (i < m_iTotal)
+	{
+		if (m_rgTriggered[i] == 0)
+			break;
+		i++;
+	}
+
+	if (i == m_iTotal)
+	{
+		if ( !m_globalstate || gGlobalState.EntityGetState( m_globalstate ) == GLOBAL_ON )
+			return 1;
+	}
+	
+	return 0;
+}
+
+void CMultiSource::Register(void)
+{ 
+	edict_t *pentTarget	= NULL;
+
+	m_iTotal = 0;
+	memset( m_rgEntities, 0, MS_MAX_TARGETS * sizeof(EHANDLE) );
+
+	SetThink(&CMultiSource::SUB_DoNothing);
+
+	// search for all entities which target this multisource (pev->targetname)
+
+	pentTarget = FIND_ENTITY_BY_STRING(NULL, "target", STRING(pev->targetname));
+
+	while (!FNullEnt(pentTarget) && (m_iTotal < MS_MAX_TARGETS))
+	{
+		CBaseEntity *pTarget = CBaseEntity::Instance(pentTarget);
+		if ( pTarget )
+			m_rgEntities[m_iTotal++] = pTarget;
+
+		pentTarget = FIND_ENTITY_BY_STRING( pentTarget, "target", STRING(pev->targetname));
+	}
+
+	pentTarget = FIND_ENTITY_BY_STRING(NULL, "classname", "multi_manager");
+	while (!FNullEnt(pentTarget) && (m_iTotal < MS_MAX_TARGETS))
+	{
+		CBaseEntity *pTarget = CBaseEntity::Instance(pentTarget);
+		if ( pTarget && pTarget->HasTarget(pev->targetname) )
+			m_rgEntities[m_iTotal++] = pTarget;
+
+		pentTarget = FIND_ENTITY_BY_STRING( pentTarget, "classname", "multi_manager" );
+	}
+
+	pev->spawnflags &= ~SF_MULTI_INIT;
+}
+
+// CBaseButton
+TYPEDESCRIPTION CBaseButton::m_SaveData[] =
+{
+	DEFINE_FIELD( CBaseButton, m_fStayPushed, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CBaseButton, m_fRotating, FIELD_BOOLEAN ),
+
+	DEFINE_FIELD( CBaseButton, m_sounds, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseButton, m_bLockedSound, FIELD_CHARACTER ),
+	DEFINE_FIELD( CBaseButton, m_bLockedSentence, FIELD_CHARACTER ),
+	DEFINE_FIELD( CBaseButton, m_bUnlockedSound, FIELD_CHARACTER ),	
+	DEFINE_FIELD( CBaseButton, m_bUnlockedSentence, FIELD_CHARACTER ),
+	DEFINE_FIELD( CBaseButton, m_strChangeTarget, FIELD_STRING ),
+//	DEFINE_FIELD( CBaseButton, m_ls, FIELD_??? ),   // This is restored in Precache()
+};
+	
+
+IMPLEMENT_SAVERESTORE( CBaseButton, CBaseToggle );
+
+void CBaseButton::SaveDataForReset()
+{
+}
+
+void CBaseButton::ResetEntity()
+{
+}
+
+void CBaseButton::Precache( void )
+{
+	char *pszSound;
+
+	if ( FBitSet ( pev->spawnflags, SF_BUTTON_SPARK_IF_OFF ) )// this button should spark in OFF state
+	{
+		PRECACHE_SOUND ("buttons/spark1.wav");
+		PRECACHE_SOUND ("buttons/spark2.wav");
+		PRECACHE_SOUND ("buttons/spark3.wav");
+		PRECACHE_SOUND ("buttons/spark4.wav");
+		PRECACHE_SOUND ("buttons/spark5.wav");
+		PRECACHE_SOUND ("buttons/spark6.wav");
+	}
+
+	// get door button sounds, for doors which require buttons to open
+
+	if (m_bLockedSound)
+	{
+		pszSound = ButtonSound( (int)m_bLockedSound );
+		PRECACHE_SOUND(pszSound);
+		m_ls.sLockedSound = ALLOC_STRING(pszSound);
+	}
+
+	if (m_bUnlockedSound)
+	{
+		pszSound = ButtonSound( (int)m_bUnlockedSound );
+		PRECACHE_SOUND(pszSound);
+		m_ls.sUnlockedSound = ALLOC_STRING(pszSound);
+	}
+
+	// get sentence group names, for doors which are directly 'touched' to open
+
+	switch (m_bLockedSentence)
+	{
+		case 1: m_ls.sLockedSentence = MAKE_STRING("NA"); break; // access denied
+		case 2: m_ls.sLockedSentence = MAKE_STRING("ND"); break; // security lockout
+		case 3: m_ls.sLockedSentence = MAKE_STRING("NF"); break; // blast door
+		case 4: m_ls.sLockedSentence = MAKE_STRING("NFIRE"); break; // fire door
+		case 5: m_ls.sLockedSentence = MAKE_STRING("NCHEM"); break; // chemical door
+		case 6: m_ls.sLockedSentence = MAKE_STRING("NRAD"); break; // radiation door
+		case 7: m_ls.sLockedSentence = MAKE_STRING("NCON"); break; // gen containment
+		case 8: m_ls.sLockedSentence = MAKE_STRING("NH"); break; // maintenance door
+		case 9: m_ls.sLockedSentence = MAKE_STRING("NG"); break; // broken door
+		
+		default: m_ls.sLockedSentence = 0; break;
+	}
+
+	switch (m_bUnlockedSentence)
+	{
+		case 1: m_ls.sUnlockedSentence = MAKE_STRING("EA"); break; // access granted
+		case 2: m_ls.sUnlockedSentence = MAKE_STRING("ED"); break; // security door
+		case 3: m_ls.sUnlockedSentence = MAKE_STRING("EF"); break; // blast door
+		case 4: m_ls.sUnlockedSentence = MAKE_STRING("EFIRE"); break; // fire door
+		case 5: m_ls.sUnlockedSentence = MAKE_STRING("ECHEM"); break; // chemical door
+		case 6: m_ls.sUnlockedSentence = MAKE_STRING("ERAD"); break; // radiation door
+		case 7: m_ls.sUnlockedSentence = MAKE_STRING("ECON"); break; // gen containment
+		case 8: m_ls.sUnlockedSentence = MAKE_STRING("EH"); break; // maintenance door
+	
+		default: m_ls.sUnlockedSentence = 0; break;
+	}
+}
+
+//
+// Cache user-entity-field values until spawn is called.
+//
+
+void CBaseButton::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "changetarget"))
+	{
+		m_strChangeTarget = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}	
+	else if (FStrEq(pkvd->szKeyName, "locked_sound"))
+	{
+		m_bLockedSound = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "locked_sentence"))
+	{
+		m_bLockedSentence = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "unlocked_sound"))
+	{
+		m_bUnlockedSound = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "unlocked_sentence"))
+	{
+		m_bUnlockedSentence = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "sounds"))
+	{
+		m_sounds = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else 
+		CBaseToggle::KeyValue( pkvd );
+}
+
+//
+// ButtonShot
+//
+int CBaseButton::TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType )
+{
+	BUTTON_CODE code = ButtonResponseToTouch();
+	
+	if ( code == BUTTON_NOTHING )
+		return 0;
+	// Temporarily disable the touch function, until movement is finished.
+	SetTouch( NULL );
+
+	// Caused an ASSERT/crash when an offensive chamber spit hit the button at the bottom of the elevator in the bast start
+	if(pevAttacker == NULL)
+		return 0;
+
+	m_hActivator = CBaseEntity::Instance( pevAttacker );
+	if ( m_hActivator == NULL )
+		return 0;
+
+	if ( code == BUTTON_RETURN )
+	{
+		EMIT_SOUND(ENT(pev), CHAN_VOICE, (char*)STRING(pev->noise), 1, ATTN_NORM);
+
+		// Toggle buttons fire when they get back to their "home" position
+		if ( !(pev->spawnflags & SF_BUTTON_TOGGLE) )
+			SUB_UseTargets( m_hActivator, USE_TOGGLE, 0 );
+		ButtonReturn();
+	}
+	else // code == BUTTON_ACTIVATE
+		ButtonActivate( );
+
+	return 0;
+}
+
+/*QUAKED func_button (0 .5 .8) ?
+When a button is touched, it moves some distance in the direction of it's angle,
+triggers all of it's targets, waits some time, then returns to it's original position
+where it can be triggered again.
+
+"angle"		determines the opening direction
+"target"	all entities with a matching targetname will be used
+"speed"		override the default 40 speed
+"wait"		override the default 1 second wait (-1 = never return)
+"lip"		override the default 4 pixel lip remaining at end of move
+"health"	if set, the button must be killed instead of touched
+"sounds"
+0) steam metal
+1) wooden clunk
+2) metallic click
+3) in-out
+*/
+LINK_ENTITY_TO_CLASS( func_button, CBaseButton );
+
+
+void CBaseButton::Spawn( )
+{ 
+	char  *pszSound;
+
+	//----------------------------------------------------
+	//determine sounds for buttons
+	//a sound of 0 should not make a sound
+	//----------------------------------------------------
+	pszSound = ButtonSound( m_sounds );
+	PRECACHE_SOUND(pszSound);
+	pev->noise = ALLOC_STRING(pszSound);
+
+	Precache();
+
+	if ( FBitSet ( pev->spawnflags, SF_BUTTON_SPARK_IF_OFF ) )// this button should spark in OFF state
+	{
+		SetThink ( &CBaseButton::ButtonSpark );
+		pev->nextthink = gpGlobals->time + 0.5;// no hurry, make sure everything else spawns
+	}
+
+	SetMovedir(pev);
+
+	pev->movetype	= MOVETYPE_PUSH;
+	pev->solid		= SOLID_BSP;
+	SET_MODEL(ENT(pev), STRING(pev->model));
+	
+	if (pev->speed == 0)
+		pev->speed = 40;
+
+	if (pev->health > 0)
+	{
+		pev->takedamage = DAMAGE_YES;
+	}
+
+	if (m_flWait == 0)
+		m_flWait = 1;
+	if (m_flLip == 0)
+		m_flLip = 4;
+
+	m_toggle_state = TS_AT_BOTTOM;
+	m_vecPosition1 = pev->origin;
+	// Subtract 2 from size because the engine expands bboxes by 1 in all directions making the size too big
+	m_vecPosition2	= m_vecPosition1 + (pev->movedir * (fabs( pev->movedir.x * (pev->size.x-2) ) + fabs( pev->movedir.y * (pev->size.y-2) ) + fabs( pev->movedir.z * (pev->size.z-2) ) - m_flLip));
+
+
+	// Is this a non-moving button?
+	if ( ((m_vecPosition2 - m_vecPosition1).Length() < 1) || (pev->spawnflags & SF_BUTTON_DONTMOVE) )
+		m_vecPosition2 = m_vecPosition1;
+
+	m_fStayPushed = (m_flWait == -1 ? TRUE : FALSE);
+	m_fRotating = FALSE;
+
+	// if the button is flagged for USE button activation only, take away it's touch function and add a use function
+
+	if ( FBitSet ( pev->spawnflags, SF_BUTTON_TOUCH_ONLY ) ) // touchable button
+	{
+		SetTouch( &CBaseButton::ButtonTouch );
+	}
+	else 
+	{
+		SetTouch ( NULL );
+		SetUse	 ( &CBaseButton::ButtonUse );
+	}
+}
+
+
+// Button sound table. 
+// Also used by CBaseDoor to get 'touched' door lock/unlock sounds
+
+char *ButtonSound( int sound )
+{ 
+	char *pszSound;
+
+	switch ( sound )
+	{
+		case 0: pszSound = "common/null.wav";        break;
+		case 1: pszSound = "buttons/button1.wav";	break;
+		case 2: pszSound = "buttons/button2.wav";	break;
+		case 3: pszSound = "buttons/button3.wav";	break;
+		case 4: pszSound = "buttons/button4.wav";	break;
+		case 5: pszSound = "buttons/button5.wav";	break;
+		case 6: pszSound = "buttons/button6.wav";	break;
+		case 7: pszSound = "buttons/button7.wav";	break;
+		case 8: pszSound = "buttons/button8.wav";	break;
+		case 9: pszSound = "buttons/button9.wav";	break;
+		case 10: pszSound = "buttons/button10.wav";	break;
+		case 11: pszSound = "buttons/button11.wav";	break;
+		case 12: pszSound = "buttons/latchlocked1.wav";	break;
+		case 13: pszSound = "buttons/latchunlocked1.wav";	break;
+		case 14: pszSound = "buttons/lightswitch2.wav";break;
+
+// next 6 slots reserved for any additional sliding button sounds we may add
+		
+		case 21: pszSound = "buttons/lever1.wav";	break;
+		case 22: pszSound = "buttons/lever2.wav";	break;
+		case 23: pszSound = "buttons/lever3.wav";	break;
+		case 24: pszSound = "buttons/lever4.wav";	break;
+		case 25: pszSound = "buttons/lever5.wav";	break;
+
+		default:pszSound = "buttons/button9.wav";	break;
+	}
+
+	return pszSound;
+}
+
+//
+// Makes flagged buttons spark when turned off
+//
+
+void DoSpark(entvars_t *pev, const Vector &location )
+{
+	Vector tmp = location + pev->size * 0.5;
+	UTIL_Sparks( tmp );
+
+	float flVolume = RANDOM_FLOAT ( 0.25 , 0.75 ) * 0.4;//random volume range
+	switch ( (int)(RANDOM_FLOAT(0,1) * 6) )
+	{
+		case 0: EMIT_SOUND(ENT(pev), CHAN_VOICE, "buttons/spark1.wav", flVolume, ATTN_NORM);	break;
+		case 1: EMIT_SOUND(ENT(pev), CHAN_VOICE, "buttons/spark2.wav", flVolume, ATTN_NORM);	break;
+		case 2: EMIT_SOUND(ENT(pev), CHAN_VOICE, "buttons/spark3.wav", flVolume, ATTN_NORM);	break;
+		case 3: EMIT_SOUND(ENT(pev), CHAN_VOICE, "buttons/spark4.wav", flVolume, ATTN_NORM);	break;
+		case 4: EMIT_SOUND(ENT(pev), CHAN_VOICE, "buttons/spark5.wav", flVolume, ATTN_NORM);	break;
+		case 5: EMIT_SOUND(ENT(pev), CHAN_VOICE, "buttons/spark6.wav", flVolume, ATTN_NORM);	break;
+	}
+}
+
+void CBaseButton::ButtonSpark ( void )
+{
+	SetThink ( &CBaseButton::ButtonSpark );
+	pev->nextthink = gpGlobals->time + ( 0.1 + RANDOM_FLOAT ( 0, 1.5 ) );// spark again at random interval
+
+	DoSpark( pev, pev->mins );
+}
+
+
+//
+// Button's Use function
+//
+void CBaseButton::ButtonUse ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	// Ignore touches if button is moving, or pushed-in and waiting to auto-come-out.
+	// UNDONE: Should this use ButtonResponseToTouch() too?
+	if (m_toggle_state == TS_GOING_UP || m_toggle_state == TS_GOING_DOWN )
+		return;		
+
+	m_hActivator = pActivator;
+	if ( m_toggle_state == TS_AT_TOP)
+	{
+		if (!m_fStayPushed && FBitSet(pev->spawnflags, SF_BUTTON_TOGGLE))
+		{
+			EMIT_SOUND(ENT(pev), CHAN_VOICE, (char*)STRING(pev->noise), 1, ATTN_NORM);
+			
+			//SUB_UseTargets( m_eoActivator );
+			ButtonReturn();
+		}
+	}
+	else
+		ButtonActivate( );
+}
+
+
+CBaseButton::BUTTON_CODE CBaseButton::ButtonResponseToTouch( void )
+{
+	// Ignore touches if button is moving, or pushed-in and waiting to auto-come-out.
+	if (m_toggle_state == TS_GOING_UP ||
+		m_toggle_state == TS_GOING_DOWN ||
+		(m_toggle_state == TS_AT_TOP && !m_fStayPushed && !FBitSet(pev->spawnflags, SF_BUTTON_TOGGLE) ) )
+		return BUTTON_NOTHING;
+
+	if (m_toggle_state == TS_AT_TOP)
+	{
+		if((FBitSet(pev->spawnflags, SF_BUTTON_TOGGLE) ) && !m_fStayPushed)
+		{
+			return BUTTON_RETURN;
+		}
+	}
+	else
+		return BUTTON_ACTIVATE;
+
+	return BUTTON_NOTHING;
+}
+
+
+//
+// Touching a button simply "activates" it.
+//
+void CBaseButton:: ButtonTouch( CBaseEntity *pOther )
+{
+	// Ignore touches by anything but players
+	if (!FClassnameIs(pOther->pev, "player"))
+		return;
+
+	m_hActivator = pOther;
+
+	BUTTON_CODE code = ButtonResponseToTouch();
+
+	if ( code == BUTTON_NOTHING )
+		return;
+
+	if (!UTIL_IsMasterTriggered(m_sMaster, pOther))
+	{
+		// play button locked sound
+		PlayLockSounds(pev, &m_ls, TRUE, TRUE);
+		return;
+	}
+
+	// Temporarily disable the touch function, until movement is finished.
+	SetTouch( NULL );
+
+	if ( code == BUTTON_RETURN )
+	{
+		EMIT_SOUND(ENT(pev), CHAN_VOICE, (char*)STRING(pev->noise), 1, ATTN_NORM);
+		SUB_UseTargets( m_hActivator, USE_TOGGLE, 0 );
+		ButtonReturn();
+	}
+	else	// code == BUTTON_ACTIVATE
+		ButtonActivate( );
+}
+
+//
+// Starts the button moving "in/up".
+//
+void CBaseButton::ButtonActivate( )
+{
+	EMIT_SOUND(ENT(pev), CHAN_VOICE, (char*)STRING(pev->noise), 1, ATTN_NORM);
+	
+	if (!UTIL_IsMasterTriggered(m_sMaster, m_hActivator))
+	{
+		// button is locked, play locked sound
+		PlayLockSounds(pev, &m_ls, TRUE, TRUE);
+		return;
+	}
+	else
+	{
+		// button is unlocked, play unlocked sound
+		PlayLockSounds(pev, &m_ls, FALSE, TRUE);
+	}
+
+	ASSERT(m_toggle_state == TS_AT_BOTTOM);
+	m_toggle_state = TS_GOING_UP;
+	
+	SetMoveDone( &CBaseButton::TriggerAndWait );
+	if (!m_fRotating)
+		LinearMove( m_vecPosition2, pev->speed);
+	else
+		AngularMove( m_vecAngle2, pev->speed);
+}
+
+//
+// Button has reached the "in/up" position.  Activate its "targets", and pause before "popping out".
+//
+void CBaseButton::TriggerAndWait( void )
+{
+	ASSERT(m_toggle_state == TS_GOING_UP);
+
+	if (!UTIL_IsMasterTriggered(m_sMaster, m_hActivator))
+		return;
+
+	m_toggle_state = TS_AT_TOP;
+	
+	// If button automatically comes back out, start it moving out.
+	// Else re-instate touch method
+	if (m_fStayPushed || FBitSet ( pev->spawnflags, SF_BUTTON_TOGGLE ) )
+	{
+		if ( !FBitSet ( pev->spawnflags, SF_BUTTON_TOUCH_ONLY ) ) // this button only works if USED, not touched!
+		{
+		// ALL buttons are now use only
+		SetTouch ( NULL );
+		}
+		else
+			SetTouch( &CBaseButton::ButtonTouch );
+	}
+	else
+	{
+		pev->nextthink = pev->ltime + m_flWait;
+		SetThink( &CBaseButton::ButtonReturn );
+	}
+	
+	pev->frame = 1;			// use alternate textures
+
+
+	SUB_UseTargets( m_hActivator, USE_TOGGLE, 0 );
+}
+
+
+//
+// Starts the button moving "out/down".
+//
+void CBaseButton::ButtonReturn( void )
+{
+	ASSERT(m_toggle_state == TS_AT_TOP);
+	m_toggle_state = TS_GOING_DOWN;
+	
+	SetMoveDone( &CBaseButton::ButtonBackHome );
+	if (!m_fRotating)
+		LinearMove( m_vecPosition1, pev->speed);
+	else
+		AngularMove( m_vecAngle1, pev->speed);
+
+	pev->frame = 0;			// use normal textures
+}
+
+
+//
+// Button has returned to start state.  Quiesce it.
+//
+void CBaseButton::ButtonBackHome( void )
+{
+	ASSERT(m_toggle_state == TS_GOING_DOWN);
+	m_toggle_state = TS_AT_BOTTOM;
+
+	if ( FBitSet(pev->spawnflags, SF_BUTTON_TOGGLE) )
+	{
+		//EMIT_SOUND(ENT(pev), CHAN_VOICE, (char*)STRING(pev->noise), 1, ATTN_NORM);
+		
+		SUB_UseTargets( m_hActivator, USE_TOGGLE, 0 );
+	}
+
+
+	if (!FStringNull(pev->target))
+	{
+		edict_t* pentTarget	= NULL;
+		for (;;)
+		{
+			pentTarget = FIND_ENTITY_BY_TARGETNAME(pentTarget, STRING(pev->target));
+
+			if (FNullEnt(pentTarget))
+				break;
+
+			if (!FClassnameIs(pentTarget, "multisource"))
+				continue;
+			CBaseEntity *pTarget = CBaseEntity::Instance( pentTarget );
+
+			if ( pTarget )
+				pTarget->Use( m_hActivator, this, USE_TOGGLE, 0 );
+		}
+	}
+
+// Re-instate touch method, movement cycle is complete.
+	if ( !FBitSet ( pev->spawnflags, SF_BUTTON_TOUCH_ONLY ) ) // this button only works if USED, not touched!
+	{
+	// All buttons are now use only	
+		SetTouch ( NULL );
+	}
+	else
+		SetTouch( &CBaseButton::ButtonTouch );
+
+// reset think for a sparking button
+	if ( FBitSet ( pev->spawnflags, SF_BUTTON_SPARK_IF_OFF ) )
+	{
+		SetThink ( &CBaseButton::ButtonSpark );
+		pev->nextthink = gpGlobals->time + 0.5;// no hurry.
+	}
+}
+
+
+
+//
+// Rotating button (aka "lever")
+//
+class CRotButton : public CBaseButton
+{
+public:
+	void Spawn( void );
+};
+
+LINK_ENTITY_TO_CLASS( func_rot_button, CRotButton );
+
+void CRotButton::Spawn( void )
+{
+	char *pszSound;
+	//----------------------------------------------------
+	//determine sounds for buttons
+	//a sound of 0 should not make a sound
+	//----------------------------------------------------
+	pszSound = ButtonSound( m_sounds );
+	PRECACHE_SOUND(pszSound);
+	pev->noise = ALLOC_STRING(pszSound);
+
+	// set the axis of rotation
+	CBaseToggle::AxisDir( pev );
+
+	// check for clockwise rotation
+	if ( FBitSet (pev->spawnflags, SF_DOOR_ROTATE_BACKWARDS) )
+		pev->movedir = pev->movedir * -1;
+
+	pev->movetype	= MOVETYPE_PUSH;
+	
+	if ( pev->spawnflags & SF_ROTBUTTON_NOTSOLID )
+		pev->solid		= SOLID_NOT;
+	else
+		pev->solid		= SOLID_BSP;
+
+	SET_MODEL(ENT(pev), STRING(pev->model));
+	
+	if (pev->speed == 0)
+		pev->speed = 40;
+
+	if (m_flWait == 0)
+		m_flWait = 1;
+
+	if (pev->health > 0)
+	{
+		pev->takedamage = DAMAGE_YES;
+	}
+
+	m_toggle_state = TS_AT_BOTTOM;
+	m_vecAngle1	= pev->angles;
+	m_vecAngle2	= pev->angles + pev->movedir * m_flMoveDistance;
+	ASSERTSZ(m_vecAngle1 != m_vecAngle2, "rotating button start/end positions are equal");
+
+	m_fStayPushed = (m_flWait == -1 ? TRUE : FALSE);
+	m_fRotating = TRUE;
+
+	// if the button is flagged for USE button activation only, take away it's touch function and add a use function
+	if ( !FBitSet ( pev->spawnflags, SF_BUTTON_TOUCH_ONLY ) )
+	{
+		SetTouch ( NULL );
+		SetUse	 ( &CRotButton::ButtonUse );
+	}
+	else // touchable button
+		SetTouch( &CRotButton::ButtonTouch );
+
+	//SetTouch( ButtonTouch );
+}
+
+
+// Make this button behave like a door (HACKHACK)
+// This will disable use and make the button solid
+// rotating buttons were made SOLID_NOT by default since their were some
+// collision problems with them...
+#define SF_MOMENTARY_DOOR		0x0001
+
+class CMomentaryRotButton : public CBaseToggle
+{
+public:
+	void	Spawn ( void );
+	void	KeyValue( KeyValueData *pkvd );
+	virtual int	ObjectCaps( void ) 
+	{ 
+		int flags = CBaseToggle :: ObjectCaps() & (~FCAP_ACROSS_TRANSITION); 
+		if ( pev->spawnflags & SF_MOMENTARY_DOOR )
+			return flags;
+		return flags | FCAP_CONTINUOUS_USE;
+	}
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void	EXPORT Off( void );
+	void	EXPORT Return( void );
+	void	UpdateSelf( float value );
+	void	UpdateSelfReturn( float value );
+	void	UpdateAllButtons( float value, int start );
+
+	void	PlaySound( void );
+	void	UpdateTarget( float value );
+
+	static CMomentaryRotButton *Instance( edict_t *pent ) { return (CMomentaryRotButton *)GET_PRIVATE(pent);};
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	int		m_lastUsed;
+	int		m_direction;
+	float	m_returnSpeed;
+	vec3_t	m_start;
+	vec3_t	m_end;
+	int		m_sounds;
+};
+TYPEDESCRIPTION CMomentaryRotButton::m_SaveData[] =
+{
+	DEFINE_FIELD( CMomentaryRotButton, m_lastUsed, FIELD_INTEGER ),
+	DEFINE_FIELD( CMomentaryRotButton, m_direction, FIELD_INTEGER ),
+	DEFINE_FIELD( CMomentaryRotButton, m_returnSpeed, FIELD_FLOAT ),
+	DEFINE_FIELD( CMomentaryRotButton, m_start, FIELD_VECTOR ),
+	DEFINE_FIELD( CMomentaryRotButton, m_end, FIELD_VECTOR ),
+	DEFINE_FIELD( CMomentaryRotButton, m_sounds, FIELD_INTEGER ),
+};
+
+IMPLEMENT_SAVERESTORE( CMomentaryRotButton, CBaseToggle );
+
+LINK_ENTITY_TO_CLASS( momentary_rot_button, CMomentaryRotButton );
+
+void CMomentaryRotButton::Spawn( void )
+{
+	CBaseToggle::AxisDir( pev );
+
+	if ( pev->speed == 0 )
+		pev->speed = 100;
+
+	if ( m_flMoveDistance < 0 ) 
+	{
+		m_start = pev->angles + pev->movedir * m_flMoveDistance;
+		m_end = pev->angles;
+		m_direction = 1;		// This will toggle to -1 on the first use()
+		m_flMoveDistance = -m_flMoveDistance;
+	}
+	else
+	{
+		m_start = pev->angles;
+		m_end = pev->angles + pev->movedir * m_flMoveDistance;
+		m_direction = -1;		// This will toggle to +1 on the first use()
+	}
+
+	if ( pev->spawnflags & SF_MOMENTARY_DOOR )
+		pev->solid		= SOLID_BSP;
+	else
+		pev->solid		= SOLID_NOT;
+
+	pev->movetype	= MOVETYPE_PUSH;
+	UTIL_SetOrigin(pev, pev->origin);
+	SET_MODEL(ENT(pev), STRING(pev->model) );
+
+	char *pszSound = ButtonSound( m_sounds );
+	PRECACHE_SOUND(pszSound);
+	pev->noise = ALLOC_STRING(pszSound);
+	m_lastUsed = 0;
+}
+
+void CMomentaryRotButton::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "returnspeed"))
+	{
+		m_returnSpeed = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "sounds"))
+	{
+		m_sounds = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseToggle::KeyValue( pkvd );
+}
+
+void CMomentaryRotButton::PlaySound( void )
+{
+	EMIT_SOUND(ENT(pev), CHAN_VOICE, (char*)STRING(pev->noise), 1, ATTN_NORM);
+}
+
+// BUGBUG: This design causes a latentcy.  When the button is retriggered, the first impulse
+// will send the target in the wrong direction because the parameter is calculated based on the
+// current, not future position.
+void CMomentaryRotButton::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	pev->ideal_yaw = CBaseToggle::AxisDelta( pev->spawnflags, pev->angles, m_start ) / m_flMoveDistance;
+
+	UpdateAllButtons( pev->ideal_yaw, 1 );
+	UpdateTarget( pev->ideal_yaw );
+}
+
+void CMomentaryRotButton::UpdateAllButtons( float value, int start )
+{
+	// Update all rot buttons attached to the same target
+	edict_t *pentTarget = NULL;
+	for (;;)
+	{
+
+		pentTarget = FIND_ENTITY_BY_STRING(pentTarget, "target", STRING(pev->target));
+		if (FNullEnt(pentTarget))
+			break;
+
+		if ( FClassnameIs( VARS(pentTarget), "momentary_rot_button" ) )
+		{
+			CMomentaryRotButton *pEntity = CMomentaryRotButton::Instance(pentTarget);
+			if ( pEntity )
+			{
+				if ( start )
+					pEntity->UpdateSelf( value );
+				else
+					pEntity->UpdateSelfReturn( value );
+			}
+		}
+	}
+}
+
+void CMomentaryRotButton::UpdateSelf( float value )
+{
+	BOOL fplaysound = FALSE;
+
+	if ( !m_lastUsed )
+	{
+		fplaysound = TRUE;
+		m_direction = -m_direction;
+	}
+	m_lastUsed = 1;
+
+	pev->nextthink = pev->ltime + 0.1;
+	if ( m_direction > 0 && value >= 1.0 )
+	{
+		pev->avelocity = g_vecZero;
+		pev->angles = m_end;
+		return;
+	}
+	else if ( m_direction < 0 && value <= 0 )
+	{
+		pev->avelocity = g_vecZero;
+		pev->angles = m_start;
+		return;
+	}
+	
+	if (fplaysound)
+		PlaySound();
+
+	// HACKHACK -- If we're going slow, we'll get multiple player packets per frame, bump nexthink on each one to avoid stalling
+	if ( pev->nextthink < pev->ltime )
+		pev->nextthink = pev->ltime + 0.1;
+	else
+		pev->nextthink += 0.1;
+	
+	pev->avelocity = (m_direction * pev->speed) * pev->movedir;
+	SetThink( &CMomentaryRotButton::Off );
+}
+
+void CMomentaryRotButton::UpdateTarget( float value )
+{
+	if (!FStringNull(pev->target))
+	{
+		edict_t* pentTarget	= NULL;
+		for (;;)
+		{
+			pentTarget = FIND_ENTITY_BY_TARGETNAME(pentTarget, STRING(pev->target));
+			if (FNullEnt(pentTarget))
+				break;
+			CBaseEntity *pEntity = CBaseEntity::Instance(pentTarget);
+			if ( pEntity )
+			{
+				pEntity->Use( this, this, USE_SET, value );
+			}
+		}
+	}
+}
+
+void CMomentaryRotButton::Off( void )
+{
+	pev->avelocity = g_vecZero;
+	m_lastUsed = 0;
+	if ( FBitSet( pev->spawnflags, SF_PENDULUM_AUTO_RETURN ) && m_returnSpeed > 0 )
+	{
+		SetThink( &CMomentaryRotButton::Return );
+		pev->nextthink = pev->ltime + 0.1;
+		m_direction = -1;
+	}
+	else
+		SetThink( NULL );
+}
+
+void CMomentaryRotButton::Return( void )
+{
+	float value = CBaseToggle::AxisDelta( pev->spawnflags, pev->angles, m_start ) / m_flMoveDistance;
+
+	UpdateAllButtons( value, 0 );	// This will end up calling UpdateSelfReturn() n times, but it still works right
+	if ( value > 0 )
+		UpdateTarget( value );
+}
+
+
+void CMomentaryRotButton::UpdateSelfReturn( float value )
+{
+	if ( value <= 0 )
+	{
+		pev->avelocity = g_vecZero;
+		pev->angles = m_start;
+		pev->nextthink = -1;
+		SetThink( NULL );
+	}
+	else
+	{
+		pev->avelocity = -m_returnSpeed * pev->movedir;
+		pev->nextthink = pev->ltime + 0.1;
+	}
+}
+
+
+//----------------------------------------------------------------
+// Spark
+//----------------------------------------------------------------
+
+class CEnvSpark : public CBaseEntity
+{
+public:
+	void	Spawn(void);
+	void	Precache(void);
+	void	EXPORT SparkThink(void);
+	void	EXPORT SparkStart(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void	EXPORT SparkStop(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void	KeyValue(KeyValueData *pkvd);
+	
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	float	m_flDelay;
+};
+
+
+TYPEDESCRIPTION CEnvSpark::m_SaveData[] =
+{
+	DEFINE_FIELD( CEnvSpark, m_flDelay, FIELD_FLOAT),
+};
+
+IMPLEMENT_SAVERESTORE( CEnvSpark, CBaseEntity );
+
+LINK_ENTITY_TO_CLASS(env_spark, CEnvSpark);
+LINK_ENTITY_TO_CLASS(env_debris, CEnvSpark);
+
+void CEnvSpark::Spawn(void)
+{
+	SetThink( NULL );
+	SetUse( NULL );
+
+	if (FBitSet(pev->spawnflags, 32)) // Use for on/off
+	{
+		if (FBitSet(pev->spawnflags, 64)) // Start on
+		{
+			SetThink(&CEnvSpark::SparkThink);	// start sparking
+			SetUse(&CEnvSpark::SparkStop);		// set up +USE to stop sparking
+		}
+		else
+			SetUse(&CEnvSpark::SparkStart);
+	}
+	else
+		SetThink(&CEnvSpark::SparkThink);
+		
+	pev->nextthink = gpGlobals->time + ( 0.1 + RANDOM_FLOAT ( 0, 1.5 ) );
+
+	if (m_flDelay <= 0)
+		m_flDelay = 1.5;
+
+	Precache( );
+}
+
+
+void CEnvSpark::Precache(void)
+{
+	PRECACHE_SOUND( "buttons/spark1.wav" );
+	PRECACHE_SOUND( "buttons/spark2.wav" );
+	PRECACHE_SOUND( "buttons/spark3.wav" );
+	PRECACHE_SOUND( "buttons/spark4.wav" );
+	PRECACHE_SOUND( "buttons/spark5.wav" );
+	PRECACHE_SOUND( "buttons/spark6.wav" );
+}
+
+void CEnvSpark::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "MaxDelay"))
+	{
+		m_flDelay = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;	
+	}
+	else if (	FStrEq(pkvd->szKeyName, "style") ||
+				FStrEq(pkvd->szKeyName, "height") ||
+				FStrEq(pkvd->szKeyName, "killtarget") ||
+				FStrEq(pkvd->szKeyName, "value1") ||
+				FStrEq(pkvd->szKeyName, "value2") ||
+				FStrEq(pkvd->szKeyName, "value3"))
+		pkvd->fHandled = TRUE;
+	else
+		CBaseEntity::KeyValue( pkvd );
+}
+
+void EXPORT CEnvSpark::SparkThink(void)
+{
+	pev->nextthink = gpGlobals->time + 0.1 + RANDOM_FLOAT (0, m_flDelay);
+	DoSpark( pev, pev->origin );
+}
+
+void EXPORT CEnvSpark::SparkStart(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	SetUse(&CEnvSpark::SparkStop);
+	SetThink(&CEnvSpark::SparkThink);
+	pev->nextthink = gpGlobals->time + (0.1 + RANDOM_FLOAT ( 0, m_flDelay));
+}
+
+void EXPORT CEnvSpark::SparkStop(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	SetUse(&CEnvSpark::SparkStart);
+	SetThink(NULL);
+}
+
+#define SF_BTARGET_USE		0x0001
+#define SF_BTARGET_ON		0x0002
+
+class CButtonTarget : public CBaseEntity
+{
+public:
+	void Spawn( void );
+	void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	int TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType );
+	int	ObjectCaps( void );
+	
+};
+
+LINK_ENTITY_TO_CLASS( button_target, CButtonTarget );
+
+void CButtonTarget::Spawn( void )
+{
+	pev->movetype	= MOVETYPE_PUSH;
+	pev->solid		= SOLID_BSP;
+	SET_MODEL(ENT(pev), STRING(pev->model));
+	pev->takedamage = DAMAGE_YES;
+
+	if ( FBitSet( pev->spawnflags, SF_BTARGET_ON ) )
+		pev->frame = 1;
+}
+
+void CButtonTarget::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( !ShouldToggle( useType, (int)pev->frame ) )
+		return;
+	pev->frame = 1-pev->frame;
+	if ( pev->frame )
+		SUB_UseTargets( pActivator, USE_ON, 0 );
+	else
+		SUB_UseTargets( pActivator, USE_OFF, 0 );
+}
+
+
+int	CButtonTarget :: ObjectCaps( void )
+{
+	int caps = CBaseEntity::ObjectCaps() & ~FCAP_ACROSS_TRANSITION;
+
+	if ( FBitSet(pev->spawnflags, SF_BTARGET_USE) )
+		return caps | FCAP_IMPULSE_USE;
+	else
+		return caps;
+}
+
+
+int CButtonTarget::TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType )
+{
+	Use( Instance(pevAttacker), this, USE_TOGGLE, 0 );
+
+	return 1;
+}
diff --git a/main/source/dlls/cbase.cpp b/main/source/dlls/cbase.cpp
new file mode 100644
index 00000000..9c57e773
--- /dev/null
+++ b/main/source/dlls/cbase.cpp
@@ -0,0 +1,835 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"saverestore.h"
+#include	"client.h"
+#include	"decals.h"
+#include	"gamerules.h"
+#include	"game.h"
+
+//extern "C" void PM_Move ( struct playermove_s *ppmove, int server );
+//extern "C" void PM_Init ( struct playermove_s *ppmove  );
+//extern "C" char PM_FindTextureType( char *name );
+
+void PM_Move ( struct playermove_s *ppmove, int server );
+void PM_Init ( struct playermove_s *ppmove  );
+char PM_FindTextureType( char *name );
+
+void EntvarsKeyvalue( entvars_t *pev, KeyValueData *pkvd );
+
+extern Vector VecBModelOrigin( entvars_t* pevBModel );
+extern DLL_GLOBAL Vector		g_vecAttackDir;
+extern DLL_GLOBAL int			g_iSkillLevel;
+
+static DLL_FUNCTIONS gFunctionTable = 
+{
+	GameDLLInit,				//pfnGameInit
+	DispatchSpawn,				//pfnSpawn
+	DispatchThink,				//pfnThink
+	DispatchUse,				//pfnUse
+	DispatchTouch,				//pfnTouch
+	DispatchBlocked,			//pfnBlocked
+	DispatchKeyValue,			//pfnKeyValue
+	DispatchSave,				//pfnSave
+	DispatchRestore,			//pfnRestore
+	DispatchObjectCollsionBox,	//pfnAbsBox
+
+	SaveWriteFields,			//pfnSaveWriteFields
+	SaveReadFields,				//pfnSaveReadFields
+
+	SaveGlobalState,			//pfnSaveGlobalState
+	RestoreGlobalState,			//pfnRestoreGlobalState
+	ResetGlobalState,			//pfnResetGlobalState
+
+	ClientConnect,				//pfnClientConnect
+	ClientDisconnect,			//pfnClientDisconnect
+	ClientKill,					//pfnClientKill
+	ClientPutInServer,			//pfnClientPutInServer
+	ClientCommand,				//pfnClientCommand
+	ClientUserInfoChanged,		//pfnClientUserInfoChanged
+	ServerActivate,				//pfnServerActivate
+	ServerDeactivate,			//pfnServerDeactivate
+
+	PlayerPreThink,				//pfnPlayerPreThink
+	PlayerPostThink,			//pfnPlayerPostThink
+
+	StartFrame,					//pfnStartFrame
+	ParmsNewLevel,				//pfnParmsNewLevel
+	ParmsChangeLevel,			//pfnParmsChangeLevel
+
+	GetGameDescription,         //pfnGetGameDescription    Returns string describing current .dll game.
+	PlayerCustomization,        //pfnPlayerCustomization   Notifies .dll of new customization for player.
+
+	SpectatorConnect,			//pfnSpectatorConnect      Called when spectator joins server
+	SpectatorDisconnect,        //pfnSpectatorDisconnect   Called when spectator leaves the server
+	SpectatorThink,				//pfnSpectatorThink        Called when spectator sends a command packet (usercmd_t)
+
+	Sys_Error,					//pfnSys_Error				Called when engine has encountered an error
+
+	PM_Move,					//pfnPM_Move
+	PM_Init,					//pfnPM_Init				Server version of player movement initialization
+	PM_FindTextureType,			//pfnPM_FindTextureType
+	
+	SetupVisibility,			//pfnSetupVisibility        Set up PVS and PAS for networking for this client
+	UpdateClientData,			//pfnUpdateClientData       Set up data sent only to specific client
+	AddToFullPack,				//pfnAddToFullPack
+	CreateBaseline,				//pfnCreateBaseline			Tweak entity baseline for network encoding, allows setup of player baselines, too.
+	RegisterEncoders,			//pfnRegisterEncoders		Callbacks for network encoding
+	GetWeaponData,				//pfnGetWeaponData
+	CmdStart,					//pfnCmdStart
+	CmdEnd,						//pfnCmdEnd
+	ConnectionlessPacket,		//pfnConnectionlessPacket
+	GetHullBounds,				//pfnGetHullBounds
+	CreateInstancedBaselines,   //pfnCreateInstancedBaselines
+	InconsistentFile,			//pfnInconsistentFile
+	AllowLagCompensation,		//pfnAllowLagCompensation
+};
+
+static void SetObjectCollisionBox( entvars_t *pev );
+
+#ifndef _WIN32
+extern "C" {
+#endif
+int GetEntityAPI( DLL_FUNCTIONS *pFunctionTable, int interfaceVersion )
+{
+	if ( !pFunctionTable || interfaceVersion != INTERFACE_VERSION )
+	{
+		return FALSE;
+	}
+	
+	memcpy( pFunctionTable, &gFunctionTable, sizeof( DLL_FUNCTIONS ) );
+	return TRUE;
+}
+
+int GetEntityAPI2( DLL_FUNCTIONS *pFunctionTable, int *interfaceVersion )
+{
+	if ( !pFunctionTable || *interfaceVersion != INTERFACE_VERSION )
+	{
+		// Tell engine what version we had, so it can figure out who is out of date.
+		*interfaceVersion = INTERFACE_VERSION;
+		return FALSE;
+	}
+	
+	memcpy( pFunctionTable, &gFunctionTable, sizeof( DLL_FUNCTIONS ) );
+	return TRUE;
+}
+
+#ifndef _WIN32
+}
+#endif
+
+
+int DispatchSpawn( edict_t *pent )
+{
+	CBaseEntity *pEntity = (CBaseEntity *)GET_PRIVATE(pent);
+
+	if (pEntity)
+	{
+		// Initialize these or entities who don't link to the world won't have anything in here
+		pEntity->pev->absmin = pEntity->pev->origin - Vector(1,1,1);
+		pEntity->pev->absmax = pEntity->pev->origin + Vector(1,1,1);
+
+		pEntity->Spawn();
+
+		// Try to get the pointer again, in case the spawn function deleted the entity.
+		// UNDONE: Spawn() should really return a code to ask that the entity be deleted, but
+		// that would touch too much code for me to do that right now.
+		pEntity = (CBaseEntity *)GET_PRIVATE(pent);
+
+		if ( pEntity )
+		{
+			if ( g_pGameRules && !g_pGameRules->IsAllowedToSpawn( pEntity ) )
+				return -1;	// return that this entity should be deleted
+			if ( pEntity->pev->flags & FL_KILLME )
+				return -1;
+		}
+
+
+		// Handle global stuff here
+		if ( pEntity && pEntity->pev->globalname ) 
+		{
+			const globalentity_t *pGlobal = gGlobalState.EntityFromTable( pEntity->pev->globalname );
+			if ( pGlobal )
+			{
+				// Already dead? delete
+				if ( pGlobal->state == GLOBAL_DEAD )
+					return -1;
+				else if ( !FStrEq( STRING(gpGlobals->mapname), pGlobal->levelName ) )
+					pEntity->MakeDormant();	// Hasn't been moved to this level yet, wait but stay alive
+				// In this level & not dead, continue on as normal
+			}
+			else
+			{
+				// Spawned entities default to 'On'
+				gGlobalState.EntityAdd( pEntity->pev->globalname, gpGlobals->mapname, GLOBAL_ON );
+//				ALERT( at_console, "Added global entity %s (%s)\n", STRING(pEntity->pev->classname), STRING(pEntity->pev->globalname) );
+			}
+		}
+
+	}
+
+	return 0;
+}
+
+void DispatchKeyValue( edict_t *pentKeyvalue, KeyValueData *pkvd )
+{
+	if ( !pkvd || !pentKeyvalue )
+		return;
+
+	EntvarsKeyvalue( VARS(pentKeyvalue), pkvd );
+
+	// If the key was an entity variable, or there's no class set yet, don't look for the object, it may
+	// not exist yet.
+	if ( pkvd->fHandled || pkvd->szClassName == NULL )
+		return;
+
+	// Get the actualy entity object
+	CBaseEntity *pEntity = (CBaseEntity *)GET_PRIVATE(pentKeyvalue);
+
+	if ( !pEntity )
+		return;
+
+	pEntity->KeyValue( pkvd );
+}
+
+
+// HACKHACK -- this is a hack to keep the node graph entity from "touching" things (like triggers)
+// while it builds the graph
+BOOL gTouchDisabled = FALSE;
+void DispatchTouch( edict_t *pentTouched, edict_t *pentOther )
+{
+	if ( gTouchDisabled )
+		return;
+
+	CBaseEntity *pEntity = (CBaseEntity *)GET_PRIVATE(pentTouched);
+	CBaseEntity *pOther = (CBaseEntity *)GET_PRIVATE( pentOther );
+
+	if ( pEntity && pOther && ! ((pEntity->pev->flags | pOther->pev->flags) & FL_KILLME) )
+		pEntity->Touch( pOther );
+}
+
+
+void DispatchUse( edict_t *pentUsed, edict_t *pentOther )
+{
+	CBaseEntity *pEntity = (CBaseEntity *)GET_PRIVATE(pentUsed);
+	CBaseEntity *pOther = (CBaseEntity *)GET_PRIVATE(pentOther);
+
+	if (pEntity && !(pEntity->pev->flags & FL_KILLME) )
+		pEntity->Use( pOther, pOther, USE_TOGGLE, 0 );
+}
+
+void DispatchThink( edict_t *pent )
+{
+	CBaseEntity *pEntity = (CBaseEntity *)GET_PRIVATE(pent);
+	if (pEntity)
+	{
+		if ( FBitSet( pEntity->pev->flags, FL_DORMANT ) )
+			ALERT( at_error, "Dormant entity %s is thinking!!\n", STRING(pEntity->pev->classname) );
+				
+		pEntity->Think();
+	}
+}
+
+void DispatchBlocked( edict_t *pentBlocked, edict_t *pentOther )
+{
+	CBaseEntity *pEntity = (CBaseEntity *)GET_PRIVATE( pentBlocked );
+	CBaseEntity *pOther = (CBaseEntity *)GET_PRIVATE( pentOther );
+
+	if (pEntity)
+		pEntity->Blocked( pOther );
+}
+
+void DispatchSave( edict_t *pent, SAVERESTOREDATA *pSaveData )
+{
+	CBaseEntity *pEntity = (CBaseEntity *)GET_PRIVATE(pent);
+	
+	if ( pEntity && pSaveData )
+	{
+		ENTITYTABLE *pTable = &pSaveData->pTable[ pSaveData->currentIndex ];
+
+		if ( pTable->pent != pent )
+			ALERT( at_error, "ENTITY TABLE OR INDEX IS WRONG!!!!\n" );
+
+		if ( pEntity->ObjectCaps() & FCAP_DONT_SAVE )
+			return;
+
+		// These don't use ltime & nextthink as times really, but we'll fudge around it.
+		if ( pEntity->pev->movetype == MOVETYPE_PUSH )
+		{
+			float delta = pEntity->pev->nextthink - pEntity->pev->ltime;
+			pEntity->pev->ltime = gpGlobals->time;
+			pEntity->pev->nextthink = pEntity->pev->ltime + delta;
+		}
+
+		pTable->location = pSaveData->size;		// Remember entity position for file I/O
+		pTable->classname = pEntity->pev->classname;	// Remember entity class for respawn
+
+		CSave saveHelper( pSaveData );
+		pEntity->Save( saveHelper );
+
+		pTable->size = pSaveData->size - pTable->location;	// Size of entity block is data size written to block
+	}
+}
+
+
+// Find the matching global entity.  Spit out an error if the designer made entities of
+// different classes with the same global name
+CBaseEntity *FindGlobalEntity( string_t classname, string_t globalname )
+{
+	edict_t *pent = FIND_ENTITY_BY_STRING( NULL, "globalname", STRING(globalname) );
+	CBaseEntity *pReturn = CBaseEntity::Instance( pent );
+	if ( pReturn )
+	{
+		if ( !FClassnameIs( pReturn->pev, STRING(classname) ) )
+		{
+			ALERT( at_console, "Global entity found %s, wrong class %s\n", STRING(globalname), STRING(pReturn->pev->classname) );
+			pReturn = NULL;
+		}
+	}
+
+	return pReturn;
+}
+
+
+int DispatchRestore( edict_t *pent, SAVERESTOREDATA *pSaveData, int globalEntity )
+{
+	CBaseEntity *pEntity = (CBaseEntity *)GET_PRIVATE(pent);
+
+	if ( pEntity && pSaveData )
+	{
+		entvars_t tmpVars;
+		Vector oldOffset;
+
+		CRestore restoreHelper( pSaveData );
+		if ( globalEntity )
+		{
+			CRestore tmpRestore( pSaveData );
+			tmpRestore.PrecacheMode( 0 );
+			tmpRestore.ReadEntVars( "ENTVARS", &tmpVars );
+
+			// HACKHACK - reset the save pointers, we're going to restore for real this time
+			pSaveData->size = pSaveData->pTable[pSaveData->currentIndex].location;
+			pSaveData->pCurrentData = pSaveData->pBaseData + pSaveData->size;
+			// -------------------
+
+
+			const globalentity_t *pGlobal = gGlobalState.EntityFromTable( tmpVars.globalname );
+			
+			// Don't overlay any instance of the global that isn't the latest
+			// pSaveData->szCurrentMapName is the level this entity is coming from
+			// pGlobla->levelName is the last level the global entity was active in.
+			// If they aren't the same, then this global update is out of date.
+			if ( !FStrEq( pSaveData->szCurrentMapName, pGlobal->levelName ) )
+				return 0;
+
+			// Compute the new global offset
+			oldOffset = pSaveData->vecLandmarkOffset;
+			CBaseEntity *pNewEntity = FindGlobalEntity( tmpVars.classname, tmpVars.globalname );
+			if ( pNewEntity )
+			{
+//				ALERT( at_console, "Overlay %s with %s\n", STRING(pNewEntity->pev->classname), STRING(tmpVars.classname) );
+				// Tell the restore code we're overlaying a global entity from another level
+				restoreHelper.SetGlobalMode( 1 );	// Don't overwrite global fields
+				pSaveData->vecLandmarkOffset = (pSaveData->vecLandmarkOffset - pNewEntity->pev->mins) + tmpVars.mins;
+				pEntity = pNewEntity;// we're going to restore this data OVER the old entity
+				pent = ENT( pEntity->pev );
+				// Update the global table to say that the global definition of this entity should come from this level
+				gGlobalState.EntityUpdate( pEntity->pev->globalname, gpGlobals->mapname );
+			}
+			else
+			{
+				// This entity will be freed automatically by the engine.  If we don't do a restore on a matching entity (below)
+				// or call EntityUpdate() to move it to this level, we haven't changed global state at all.
+				return 0;
+			}
+
+		}
+
+		if ( pEntity->ObjectCaps() & FCAP_MUST_SPAWN )
+		{
+			pEntity->Restore( restoreHelper );
+			pEntity->Spawn();
+		}
+		else
+		{
+			pEntity->Restore( restoreHelper );
+			pEntity->Precache( );
+		}
+
+		// Again, could be deleted, get the pointer again.
+		pEntity = (CBaseEntity *)GET_PRIVATE(pent);
+
+#if 0
+		if ( pEntity && pEntity->pev->globalname && globalEntity ) 
+		{
+			ALERT( at_console, "Global %s is %s\n", STRING(pEntity->pev->globalname), STRING(pEntity->pev->model) );
+		}
+#endif
+
+		// Is this an overriding global entity (coming over the transition), or one restoring in a level
+		if ( globalEntity )
+		{
+//			ALERT( at_console, "After: %f %f %f %s\n", pEntity->pev->origin.x, pEntity->pev->origin.y, pEntity->pev->origin.z, STRING(pEntity->pev->model) );
+			pSaveData->vecLandmarkOffset = oldOffset;
+			if ( pEntity )
+			{
+				UTIL_SetOrigin( pEntity->pev, pEntity->pev->origin );
+				pEntity->OverrideReset();
+			}
+		}
+		else if ( pEntity && pEntity->pev->globalname ) 
+		{
+			const globalentity_t *pGlobal = gGlobalState.EntityFromTable( pEntity->pev->globalname );
+			if ( pGlobal )
+			{
+				// Already dead? delete
+				if ( pGlobal->state == GLOBAL_DEAD )
+					return -1;
+				else if ( !FStrEq( STRING(gpGlobals->mapname), pGlobal->levelName ) )
+				{
+					pEntity->MakeDormant();	// Hasn't been moved to this level yet, wait but stay alive
+				}
+				// In this level & not dead, continue on as normal
+			}
+			else
+			{
+				ALERT( at_error, "Global Entity %s (%s) not in table!!!\n", STRING(pEntity->pev->globalname), STRING(pEntity->pev->classname) );
+				// Spawned entities default to 'On'
+				gGlobalState.EntityAdd( pEntity->pev->globalname, gpGlobals->mapname, GLOBAL_ON );
+			}
+		}
+	}
+	return 0;
+}
+
+
+void DispatchObjectCollsionBox( edict_t *pent )
+{
+	CBaseEntity *pEntity = (CBaseEntity *)GET_PRIVATE(pent);
+	if (pEntity)
+	{
+		pEntity->SetObjectCollisionBox();
+	}
+	else
+		SetObjectCollisionBox( &pent->v );
+}
+
+
+void SaveWriteFields( SAVERESTOREDATA *pSaveData, const char *pname, void *pBaseData, TYPEDESCRIPTION *pFields, int fieldCount )
+{
+	CSave saveHelper( pSaveData );
+	saveHelper.WriteFields( pname, pBaseData, pFields, fieldCount );
+}
+
+
+void SaveReadFields( SAVERESTOREDATA *pSaveData, const char *pname, void *pBaseData, TYPEDESCRIPTION *pFields, int fieldCount )
+{
+	CRestore restoreHelper( pSaveData );
+	restoreHelper.ReadFields( pname, pBaseData, pFields, fieldCount );
+}
+
+
+edict_t * EHANDLE::Get( void ) 
+{ 
+	if (m_pent)
+	{
+		if (m_pent->serialnumber == m_serialnumber) 
+			return m_pent; 
+		else
+			return NULL;
+	}
+	return NULL; 
+};
+
+edict_t * EHANDLE::Set( edict_t *pent ) 
+{ 
+	m_pent = pent;  
+	if (pent) 
+		m_serialnumber = m_pent->serialnumber; 
+	return pent; 
+};
+
+
+EHANDLE :: operator CBaseEntity *() 
+{ 
+	return (CBaseEntity *)GET_PRIVATE( Get( ) ); 
+};
+
+
+CBaseEntity * EHANDLE :: operator = (CBaseEntity *pEntity)
+{
+	if (pEntity)
+	{
+		m_pent = ENT( pEntity->pev );
+		if (m_pent)
+			m_serialnumber = m_pent->serialnumber;
+	}
+	else
+	{
+		m_pent = NULL;
+		m_serialnumber = 0;
+	}
+	return pEntity;
+}
+
+EHANDLE :: operator int ()
+{
+	return Get() != NULL;
+}
+
+CBaseEntity * EHANDLE :: operator -> ()
+{
+	return (CBaseEntity *)GET_PRIVATE( Get( ) ); 
+}
+
+
+// give health
+int CBaseEntity :: TakeHealth( float flHealth, int bitsDamageType )
+{
+	if (!pev->takedamage)
+		return 0;
+
+// heal
+	if ( pev->health >= pev->max_health )
+		return 0;
+
+	pev->health += flHealth;
+
+	if (pev->health > pev->max_health)
+		pev->health = pev->max_health;
+
+	return 1;
+}
+
+// inflict damage on this entity.  bitsDamageType indicates type of damage inflicted, ie: DMG_CRUSH
+
+int CBaseEntity :: TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType )
+{
+	Vector			vecTemp;
+
+	if (!pev->takedamage)
+		return 0;
+
+	// UNDONE: some entity types may be immune or resistant to some bitsDamageType
+    if((bitsDamageType == NS_DMG_ORGANIC) && !this->IsPlayer())
+    {
+        return 0;
+    }
+	
+	// if Attacker == Inflictor, the attack was a melee or other instant-hit attack.
+	// (that is, no actual entity projectile was involved in the attack so use the shooter's origin). 
+	if ( pevAttacker == pevInflictor )	
+	{
+		vecTemp = pevInflictor->origin - ( VecBModelOrigin(pev) );
+	}
+	else
+	// an actual missile was involved.
+	{
+		vecTemp = pevInflictor->origin - ( VecBModelOrigin(pev) );
+	}
+
+// this global is still used for glass and other non-monster killables, along with decals.
+	g_vecAttackDir = vecTemp.Normalize();
+
+	// When players take damage, don't move target at all
+
+// save damage based on the target's armor level
+
+// figure momentum add (don't let hurt brushes or other triggers move player)
+	if ((!FNullEnt(pevInflictor)) && (pev->movetype == MOVETYPE_WALK || pev->movetype == MOVETYPE_STEP) && (pevAttacker->solid != SOLID_TRIGGER) && !this->IsPlayer())
+	{
+		Vector vecDir = pev->origin - (pevInflictor->absmin + pevInflictor->absmax) * 0.5;
+		vecDir = vecDir.Normalize();
+
+		float flForce = flDamage * ((32 * 32 * 72.0) / (pev->size.x * pev->size.y * pev->size.z)) * 5;
+		
+		if (flForce > 1000.0) 
+			flForce = 1000.0;
+		pev->velocity = pev->velocity + vecDir * flForce;
+	}
+
+// do the damage
+	pev->health -= flDamage;
+
+	// Killed when health cast to an int is 0
+	if((int)(pev->health) <= 0)
+	{
+		this->pev->health = 0.0f;
+	}
+
+	if (pev->health <= 0)
+	{
+		Killed( pevAttacker, GIB_NORMAL );
+		return 0;
+	}
+
+	return 1;
+}
+
+
+void CBaseEntity :: Killed( entvars_t *pevAttacker, int iGib )
+{
+	pev->takedamage = DAMAGE_NO;
+	pev->deadflag = DEAD_DEAD;
+	UTIL_Remove( this );
+}
+
+
+CBaseEntity *CBaseEntity::GetNextTarget( void )
+{
+	if ( FStringNull( pev->target ) )
+		return NULL;
+	edict_t *pTarget = FIND_ENTITY_BY_TARGETNAME ( NULL, STRING(pev->target) );
+	if ( FNullEnt(pTarget) )
+		return NULL;
+
+	return Instance( pTarget );
+}
+
+// Global Savedata for Delay
+TYPEDESCRIPTION	CBaseEntity::m_SaveData[] = 
+{
+	DEFINE_FIELD( CBaseEntity, m_pGoalEnt, FIELD_CLASSPTR ),
+
+	DEFINE_FIELD( CBaseEntity, m_pfnThink, FIELD_FUNCTION ),		// UNDONE: Build table of these!!!
+	DEFINE_FIELD( CBaseEntity, m_pfnTouch, FIELD_FUNCTION ),
+	DEFINE_FIELD( CBaseEntity, m_pfnUse, FIELD_FUNCTION ),
+	DEFINE_FIELD( CBaseEntity, m_pfnBlocked, FIELD_FUNCTION ),
+};
+
+
+int CBaseEntity::Save( CSave &save )
+{
+	if ( save.WriteEntVars( "ENTVARS", pev ) )
+		return save.WriteFields( "BASE", this, m_SaveData, ARRAYSIZE(m_SaveData) );
+
+	return 0;
+}
+
+int CBaseEntity::Restore( CRestore &restore )
+{
+	int status;
+
+	status = restore.ReadEntVars( "ENTVARS", pev );
+	if ( status )
+		status = restore.ReadFields( "BASE", this, m_SaveData, ARRAYSIZE(m_SaveData) );
+
+    if ( pev->modelindex != 0 && !FStringNull(pev->model) )
+	{
+		Vector mins, maxs;
+		mins = pev->mins;	// Set model is about to destroy these
+		maxs = pev->maxs;
+
+
+		PRECACHE_MODEL( (char *)STRING(pev->model) );
+		SET_MODEL(ENT(pev), STRING(pev->model));
+		UTIL_SetSize(pev, mins, maxs);	// Reset them
+	}
+
+	return status;
+}
+
+
+// Initialize absmin & absmax to the appropriate box
+void SetObjectCollisionBox( entvars_t *pev )
+{
+	if ( (pev->solid == SOLID_BSP) && 
+		 (pev->angles.x || pev->angles.y|| pev->angles.z) )
+	{	// expand for rotation
+		float		max, v;
+		int			i;
+
+		max = 0;
+		for (i=0 ; i<3 ; i++)
+		{
+			v = fabs( ((float *)pev->mins)[i]);
+			if (v > max)
+				max = v;
+			v = fabs( ((float *)pev->maxs)[i]);
+			if (v > max)
+				max = v;
+		}
+		for (i=0 ; i<3 ; i++)
+		{
+			((float *)pev->absmin)[i] = ((float *)pev->origin)[i] - max;
+			((float *)pev->absmax)[i] = ((float *)pev->origin)[i] + max;
+		}
+	}
+	else
+	{
+		pev->absmin = pev->origin + pev->mins;
+		pev->absmax = pev->origin + pev->maxs;
+	}
+
+	pev->absmin.x -= 1;
+	pev->absmin.y -= 1;
+	pev->absmin.z -= 1;
+	pev->absmax.x += 1;
+	pev->absmax.y += 1;
+	pev->absmax.z += 1;
+}
+
+
+void CBaseEntity::SetObjectCollisionBox( void )
+{
+	::SetObjectCollisionBox( pev );
+}
+
+
+int	CBaseEntity :: Intersects( CBaseEntity *pOther )
+{
+	if ( pOther->pev->absmin.x > pev->absmax.x ||
+		 pOther->pev->absmin.y > pev->absmax.y ||
+		 pOther->pev->absmin.z > pev->absmax.z ||
+		 pOther->pev->absmax.x < pev->absmin.x ||
+		 pOther->pev->absmax.y < pev->absmin.y ||
+		 pOther->pev->absmax.z < pev->absmin.z )
+		 return 0;
+	return 1;
+}
+
+void CBaseEntity :: MakeDormant( void )
+{
+	SetBits( pev->flags, FL_DORMANT );
+	
+	// Don't touch
+	pev->solid = SOLID_NOT;
+	// Don't move
+	pev->movetype = MOVETYPE_NONE;
+	// Don't draw
+	SetBits( pev->effects, EF_NODRAW );
+	// Don't think
+	pev->nextthink = 0;
+	// Relink
+	UTIL_SetOrigin( pev, pev->origin );
+}
+
+int CBaseEntity :: IsDormant( void )
+{
+	return FBitSet( pev->flags, FL_DORMANT );
+}
+
+BOOL CBaseEntity :: IsInWorld( void )
+{
+	// position 
+	if (pev->origin.x >= 4096) return FALSE;
+	if (pev->origin.y >= 4096) return FALSE;
+	if (pev->origin.z >= 4096) return FALSE;
+	if (pev->origin.x <= -4096) return FALSE;
+	if (pev->origin.y <= -4096) return FALSE;
+	if (pev->origin.z <= -4096) return FALSE;
+	// speed
+	if (pev->velocity.x >= 2000) return FALSE;
+	if (pev->velocity.y >= 2000) return FALSE;
+	if (pev->velocity.z >= 2000) return FALSE;
+	if (pev->velocity.x <= -2000) return FALSE;
+	if (pev->velocity.y <= -2000) return FALSE;
+	if (pev->velocity.z <= -2000) return FALSE;
+
+	return TRUE;
+}
+
+int CBaseEntity::ShouldToggle( USE_TYPE useType, BOOL currentState )
+{
+	if ( useType != USE_TOGGLE && useType != USE_SET )
+	{
+		if ( (currentState && useType == USE_ON) || (!currentState && useType == USE_OFF) )
+			return 0;
+	}
+	return 1;
+}
+
+
+int	CBaseEntity :: DamageDecal( int bitsDamageType )
+{
+	if ( pev->rendermode == kRenderTransAlpha )
+		return -1;
+
+	if ( pev->rendermode != kRenderNormal )
+		return DECAL_BPROOF1;
+
+	return DECAL_GUNSHOT1 + RANDOM_LONG(0,4);
+}
+
+
+
+// NOTE: szName must be a pointer to constant memory, e.g. "monster_class" because the entity
+// will keep a pointer to it after this call.
+CBaseEntity * CBaseEntity::Create( const char *szName, const Vector &vecOrigin, const Vector &vecAngles, edict_t *pentOwner )
+{
+	edict_t	*pent;
+	CBaseEntity *pEntity;
+
+	pent = CREATE_NAMED_ENTITY( MAKE_STRING( szName ));
+	if ( FNullEnt( pent ) )
+	{
+		ALERT ( at_console, "NULL Ent in Create!\n" );
+		return NULL;
+	}
+	pEntity = Instance( pent );
+	if(pEntity)
+	{
+		pEntity->pev->owner = pentOwner;
+		pEntity->pev->origin = vecOrigin;
+		pEntity->pev->angles = vecAngles;
+		DispatchSpawn( pEntity->edict() );
+	}
+	else
+	{
+		ALERT(at_console, "NULL CBaseEntity after non-null edict_t in CBaseEntity::Create!\n");
+		REMOVE_ENTITY(ENT(pent));
+	}
+
+	return pEntity;
+}
+
+// Compute checksum of entity for testing purposes
+void CBaseEntity::AddChecksum(Checksum& inChecksum)
+{
+	if(this->pev)
+	{
+		// Entity index
+		int theEntityIndex = this->entindex();
+		inChecksum.AddChecksum("CBaseEntity::EntIndexChecksum", theEntityIndex);
+
+		// Take into account entity pos, angle
+		int thePositionChecksum = 5*((this->pev->origin.x + this->pev->origin.y + this->pev->origin.z)/.1f);
+		thePositionChecksum += 11*((this->pev->angles.x + this->pev->angles.y + this->pev->angles.z)/.1f);
+		inChecksum.AddChecksum("CBaseEntity::PositionChecksum", thePositionChecksum);
+		
+		// Take into account user vars
+		int theUserVarsChecksum = this->pev->iuser1 + 5*this->pev->iuser2 + 7*this->pev->iuser3 + 11*this->pev->iuser4;
+		inChecksum.AddChecksum("CBaseEntity::UserVarsChecksum", theUserVarsChecksum);
+		
+		// Take into account model?	 
+
+		// Classname?
+		//int theClassNameChecksum = this->pev
+		
+		// Take into account rendermode, renderamt
+		int theRenderChecksum = this->pev->renderamt + 3*this->pev->rendermode;
+		inChecksum.AddChecksum("CBaseEntity::RenderChecksum", theRenderChecksum);
+		
+		// Health, takedamage
+		int theHealthChecksum = this->pev->takedamage + 3*this->pev->health + 7*this->pev->armorvalue;
+		inChecksum.AddChecksum("CBaseEntity::HealthChecksum", theHealthChecksum);
+	}
+	else
+	{
+		inChecksum.AddChecksum("CBaseEntity::NullPEV", 0);
+	}
+}
diff --git a/main/source/dlls/cbase.h b/main/source/dlls/cbase.h
new file mode 100644
index 00000000..dfff62a0
--- /dev/null
+++ b/main/source/dlls/cbase.h
@@ -0,0 +1,821 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/*
+
+Class Hierachy
+
+CBaseEntity
+	CBaseDelay
+		CBaseToggle
+			CBaseItem
+			CBaseMonster
+				CBaseCycler
+				CBasePlayer
+				CBaseGroup
+*/
+#ifndef CBASE_H
+#define CBASE_H
+
+#include "common/damagetypes.h"
+#include "util/Checksum.h"
+#include "types.h"
+
+#define		MAX_PATH_SIZE	10 // max number of nodes available for a path.
+
+// These are caps bits to indicate what an object's capabilities (currently used for save/restore and level transitions)
+#define		FCAP_CUSTOMSAVE				0x00000001
+#define		FCAP_ACROSS_TRANSITION		0x00000002		// should transfer between transitions
+#define		FCAP_MUST_SPAWN				0x00000004		// Spawn after restore
+#define		FCAP_DONT_SAVE				0x80000000		// Don't save this
+#define		FCAP_IMPULSE_USE			0x00000008		// can be used by the player
+#define		FCAP_CONTINUOUS_USE			0x00000010		// can be used by the player
+#define		FCAP_ONOFF_USE				0x00000020		// can be used by the player
+#define		FCAP_DIRECTIONAL_USE		0x00000040		// Player sends +/- 1 when using (currently only tracktrains)
+#define		FCAP_MASTER					0x00000080		// Can be used to "master" other entities (like multisource)
+
+// UNDONE: This will ignore transition volumes (trigger_transition), but not the PVS!!!
+#define		FCAP_FORCE_TRANSITION		0x00000080		// ALWAYS goes across transitions
+
+#include "saverestore.h"
+#include "schedule.h"
+
+#ifndef MONSTEREVENT_H
+#include "monsterevent.h"
+#endif
+
+// C functions for external declarations that call the appropriate C++ methods
+
+#ifdef _WIN32
+#define EXPORT	_declspec( dllexport )
+#else
+#define EXPORT	/* */
+#endif
+
+extern "C" EXPORT int GetEntityAPI( DLL_FUNCTIONS *pFunctionTable, int interfaceVersion );
+extern "C" EXPORT int GetEntityAPI2( DLL_FUNCTIONS *pFunctionTable, int *interfaceVersion );
+
+extern int DispatchSpawn( edict_t *pent );
+extern void DispatchKeyValue( edict_t *pentKeyvalue, KeyValueData *pkvd );
+extern void DispatchTouch( edict_t *pentTouched, edict_t *pentOther );
+extern void DispatchUse( edict_t *pentUsed, edict_t *pentOther );
+extern void DispatchThink( edict_t *pent );
+extern void DispatchBlocked( edict_t *pentBlocked, edict_t *pentOther );
+extern void DispatchSave( edict_t *pent, SAVERESTOREDATA *pSaveData );
+extern int  DispatchRestore( edict_t *pent, SAVERESTOREDATA *pSaveData, int globalEntity );
+extern void	DispatchObjectCollsionBox( edict_t *pent );
+extern void SaveWriteFields( SAVERESTOREDATA *pSaveData, const char *pname, void *pBaseData, TYPEDESCRIPTION *pFields, int fieldCount );
+extern void SaveReadFields( SAVERESTOREDATA *pSaveData, const char *pname, void *pBaseData, TYPEDESCRIPTION *pFields, int fieldCount );
+extern void SaveGlobalState( SAVERESTOREDATA *pSaveData );
+extern void RestoreGlobalState( SAVERESTOREDATA *pSaveData );
+extern void ResetGlobalState( void );
+
+typedef enum { USE_OFF = 0, USE_ON = 1, USE_SET = 2, USE_TOGGLE = 3 } USE_TYPE;
+
+extern void FireTargets( const char *targetName, CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+typedef void (CBaseEntity::*BASEPTR)(void);
+typedef void (CBaseEntity::*ENTITYFUNCPTR)(CBaseEntity *pOther );
+typedef void (CBaseEntity::*USEPTR)( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+// For CLASSIFY
+#define	CLASS_NONE				0
+#define CLASS_MACHINE			1
+#define CLASS_PLAYER			2
+#define	CLASS_HUMAN_PASSIVE		3
+#define CLASS_HUMAN_MILITARY	4
+#define CLASS_ALIEN_MILITARY	5
+#define CLASS_ALIEN_PASSIVE		6
+#define CLASS_ALIEN_MONSTER		7
+#define CLASS_ALIEN_PREY		8
+#define CLASS_ALIEN_PREDATOR	9
+#define CLASS_INSECT			10
+#define CLASS_PLAYER_ALLY		11
+#define CLASS_PLAYER_BIOWEAPON	12 // hornets and snarks.launched by players
+#define CLASS_ALIEN_BIOWEAPON	13 // hornets and snarks.launched by the alien menace
+#define	CLASS_BARNACLE			99 // special because no one pays attention to it, and it eats a wide cross-section of creatures.
+
+class CBaseEntity;
+class CBaseMonster;
+class CBasePlayerItem;
+class CSquadMonster;
+
+
+#define	SF_NORESPAWN	( 1 << 30 )// !!!set this bit on guns and stuff that should never respawn.
+
+//
+// EHANDLE. Safe way to point to CBaseEntities who may die between frames
+//
+class EHANDLE
+{
+private:
+	edict_t *m_pent;
+	int		m_serialnumber;
+public:
+	edict_t *Get( void );
+	edict_t *Set( edict_t *pent );
+
+	operator int ();
+
+	operator CBaseEntity *();
+
+	CBaseEntity * operator = (CBaseEntity *pEntity);
+	CBaseEntity * operator ->();
+};
+
+
+//
+// Base Entity.  All entity types derive from this
+//
+class CBaseEntity 
+{
+public:
+	// Constructor.  Set engine to use C/C++ callback functions
+	// pointers to engine data
+	entvars_t *pev;		// Don't need to save/restore this pointer, the engine resets it
+
+	// path corners
+	CBaseEntity			*m_pGoalEnt;// path corner we are heading towards
+	CBaseEntity			*m_pLink;// used for temporary link-list operations. 
+
+	// initialization functions
+	virtual void	Spawn( void ) { return; }
+	virtual void	Precache( void ) { return; }
+	virtual void	KeyValue( KeyValueData* pkvd) { pkvd->fHandled = FALSE; }
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	virtual int		ObjectCaps( void ) { return FCAP_ACROSS_TRANSITION; }
+	virtual void	Activate( void ) {}
+	
+	// Setup the object->object collision box (pev->mins / pev->maxs is the object->world collision box)
+	virtual void	SetObjectCollisionBox( void );
+
+// Classify - returns the type of group (i.e, "houndeye", or "human military" so that monsters with different classnames
+// still realize that they are teammates. (overridden for monsters that form groups)
+	virtual int Classify ( void ) { return CLASS_NONE; };
+	virtual void DeathNotice ( entvars_t *pevChild ) {}// monster maker children use this to tell the monster maker that they have died.
+
+
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	virtual void	TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType);
+	virtual int		TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType );
+	virtual int		TakeHealth( float flHealth, int bitsDamageType );
+	virtual int		GetPointValue(void) const { return 0; }
+	virtual void	Killed( entvars_t *pevAttacker, int iGib );
+	virtual void	AwardKill( entvars_t* pevTarget) {}
+	virtual int		BloodColor( void ) { return DONT_BLEED; }
+	virtual void	TraceBleed( float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType );
+	virtual BOOL    IsTriggered( CBaseEntity *pActivator ) {return TRUE;}
+	virtual CBaseMonster *MyMonsterPointer( void ) { return NULL;}
+	virtual CSquadMonster *MySquadMonsterPointer( void ) { return NULL;}
+	virtual	int		GetToggleState( void ) { return TS_AT_TOP; }
+	virtual void	AddPoints( int score, BOOL bAllowNegativeScore ) {}
+	virtual void	AddPointsToTeam( int score, BOOL bAllowNegativeScore ) {}
+	virtual BOOL	AddPlayerItem( CBasePlayerItem *pItem ) { return 0; }
+	virtual BOOL	RemovePlayerItem( CBasePlayerItem *pItem ) { return 0; }
+	virtual int 	GiveAmmo( int iAmount, char *szName, int iMax ) { return -1; };
+	virtual float	GetDelay( void ) { return 0; }
+	virtual int		IsMoving( void ) { return pev->velocity != g_vecZero; }
+	virtual void	OverrideReset( void ) {}
+	virtual int		DamageDecal( int bitsDamageType );
+	// This is ONLY used by the node graph to test movement through a door
+	virtual void	SetToggleState( int state ) {}
+	virtual void    StartSneaking( void ) {}
+	virtual void    StopSneaking( void ) {}
+	virtual BOOL	OnControls( entvars_t *pev ) { return FALSE; }
+	virtual BOOL    IsSneaking( void ) { return FALSE; }
+	virtual BOOL	IsAlive( void ) const { return (pev->deadflag == DEAD_NO) && pev->health > 0; }
+	virtual BOOL	IsBSPModel( void ) { return pev->solid == SOLID_BSP || pev->movetype == MOVETYPE_PUSHSTEP; }
+	virtual BOOL	ReflectGauss( void ) { return ( IsBSPModel() && !pev->takedamage ); }
+	virtual BOOL	HasTarget( string_t targetname ) { return FStrEq(STRING(targetname), STRING(pev->targetname) ); }
+	virtual BOOL    IsInWorld( void );
+	virtual	BOOL	IsPlayer( void ) { return FALSE; }
+	virtual BOOL	IsNetClient( void ) { return FALSE; }
+	virtual char*	TeamID( void ) { return ""; }
+
+	// Added to allow resetting of entities when a game starts
+	virtual void	AddChecksum(Checksum& inChecksum);
+	virtual void	ResetEntity(void) {}
+	
+//	virtual void	SetActivator( CBaseEntity *pActivator ) {}
+	virtual CBaseEntity *GetNextTarget( void );
+	
+	// fundamental callbacks
+	void (CBaseEntity ::*m_pfnThink)(void);
+	void (CBaseEntity ::*m_pfnTouch)( CBaseEntity *pOther );
+	void (CBaseEntity ::*m_pfnUse)( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void (CBaseEntity ::*m_pfnBlocked)( CBaseEntity *pOther );
+
+	virtual void Think( void ) { if (m_pfnThink) (this->*m_pfnThink)(); };
+	virtual void Touch( CBaseEntity *pOther ) { if (m_pfnTouch) (this->*m_pfnTouch)( pOther ); };
+	virtual void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value ) 
+	{ 
+		if (m_pfnUse) 
+			(this->*m_pfnUse)( pActivator, pCaller, useType, value );
+	}
+	virtual void Blocked( CBaseEntity *pOther ) { if (m_pfnBlocked) (this->*m_pfnBlocked)( pOther ); };
+
+	// allow engine to allocate instance data
+    void *operator new( size_t stAllocateBlock, entvars_t *pev )
+	{
+		return (void *)ALLOC_PRIVATE(ENT(pev), stAllocateBlock);
+	};
+
+	// don't use this.
+#if _MSC_VER >= 1200 // only build this code if MSVC++ 6.0 or higher
+	void operator delete(void *pMem, entvars_t *pev)
+	{
+		pev->flags |= FL_KILLME;
+	};
+#endif
+
+	virtual void UpdateOnRemove( void );
+
+	// common member functions
+	void EXPORT SUB_Remove( void );
+	void EXPORT SUB_DoNothing( void );
+	void EXPORT SUB_StartFadeOut ( void );
+	void EXPORT SUB_FadeOut ( void );
+	void EXPORT SUB_CallUseToggle( void ) { this->Use( this, this, USE_TOGGLE, 0 ); }
+	int			ShouldToggle( USE_TYPE useType, BOOL currentState );
+	void		FireBullets( ULONG	cShots, Vector  vecSrc, Vector	vecDirShooting,	Vector	vecSpread, float flDistance, int iBulletType, int iTracerFreq = 4, int iDamage = 0, entvars_t *pevAttacker = NULL, int inDamageType = DMG_BULLET | DMG_NEVERGIB);
+	Vector		FireBulletsPlayer( ULONG	cShots, Vector  vecSrc, Vector	vecDirShooting,	Vector	vecSpread, float flDistance, int iBulletType, int iTracerFreq = 4, int iDamage = 0, entvars_t *pevAttacker = NULL, int shared_rand = 0 );
+
+	virtual CBaseEntity *Respawn( void ) { return NULL; }
+
+	void SUB_UseTargets( CBaseEntity *pActivator, USE_TYPE useType, float value );
+	// Do the bounding boxes of these two intersect?
+	int		Intersects( CBaseEntity *pOther );
+	void	MakeDormant( void );
+	int		IsDormant( void );
+	BOOL    IsLockedByMaster( void ) { return FALSE; }
+
+	static CBaseEntity *Instance( edict_t *pent )
+	{ 
+		if ( !pent )
+			pent = ENT(0);
+		CBaseEntity *pEnt = (CBaseEntity *)GET_PRIVATE(pent); 
+		return pEnt; 
+	}
+
+	static CBaseEntity *Instance( entvars_t *pev ) { return Instance( ENT( pev ) ); }
+	static CBaseEntity *Instance( int eoffset) { return Instance( ENT( eoffset) ); }
+
+	CBaseMonster *GetMonsterPointer( entvars_t *pevMonster ) 
+	{ 
+		CBaseEntity *pEntity = Instance( pevMonster );
+		if ( pEntity )
+			return pEntity->MyMonsterPointer();
+		return NULL;
+	}
+	CBaseMonster *GetMonsterPointer( edict_t *pentMonster ) 
+	{ 
+		CBaseEntity *pEntity = Instance( pentMonster );
+		if ( pEntity )
+			return pEntity->MyMonsterPointer();
+		return NULL;
+	}
+
+
+	// Ugly code to lookup all functions to make sure they are exported when set.
+#ifdef _DEBUG
+	void FunctionCheck( void *pFunction, char *name ) 
+	{ 
+//#ifdef _WIN32
+//		if (pFunction && !NAME_FOR_FUNCTION((unsigned long)(pFunction)) )
+//			ALERT( at_error, "No EXPORT: %s:%s (%08lx)\n", STRING(pev->classname), name, (unsigned long)pFunction );
+//#endif // _WIN32
+	}
+
+	BASEPTR	ThinkSet( BASEPTR func, char *name ) 
+	{ 
+		m_pfnThink = func; 
+		FunctionCheck( (void *)*((int *)((char *)this + ( offsetof(CBaseEntity,m_pfnThink)))), name ); 
+		return func;
+	}
+	ENTITYFUNCPTR TouchSet( ENTITYFUNCPTR func, char *name ) 
+	{ 
+		m_pfnTouch = func; 
+		FunctionCheck( (void *)*((int *)((char *)this + ( offsetof(CBaseEntity,m_pfnTouch)))), name ); 
+		return func;
+	}
+	USEPTR	UseSet( USEPTR func, char *name ) 
+	{ 
+		m_pfnUse = func; 
+		FunctionCheck( (void *)*((int *)((char *)this + ( offsetof(CBaseEntity,m_pfnUse)))), name ); 
+		return func;
+	}
+	ENTITYFUNCPTR	BlockedSet( ENTITYFUNCPTR func, char *name ) 
+	{ 
+		m_pfnBlocked = func; 
+		FunctionCheck( (void *)*((int *)((char *)this + ( offsetof(CBaseEntity,m_pfnBlocked)))), name ); 
+		return func;
+	}
+
+#endif
+
+
+	// virtual functions used by a few classes
+	
+	// used by monsters that are created by the MonsterMaker
+	virtual	void UpdateOwner( void ) { return; };
+
+
+	//
+	static CBaseEntity *Create( const char *szName, const Vector &vecOrigin, const Vector &vecAngles, edict_t *pentOwner = NULL );
+
+	virtual BOOL FBecomeProne( void ) {return FALSE;};
+	edict_t *edict() { return ENT( pev ); };
+	EOFFSET eoffset( ) { return OFFSET( pev ); };
+	int	  entindex( ) { return ENTINDEX( edict() ); };
+
+	virtual Vector Center( ) { return (pev->absmax + pev->absmin) * 0.5; }; // center point of entity
+	virtual Vector EyePosition( ) { return pev->origin + pev->view_ofs; };			// position of eyes
+	virtual Vector EarPosition( ) { return pev->origin + pev->view_ofs; };			// position of ears
+	virtual Vector BodyTarget( const Vector &posSrc ) { return Center( ); };		// position to shoot at
+
+	virtual int Illumination( ) { return GETENTITYILLUM( ENT( pev ) ); };
+
+	virtual	BOOL FVisible ( CBaseEntity *pEntity );
+	virtual	BOOL FVisible ( const Vector &vecOrigin );
+
+	//We use this variables to store each ammo count.
+	int ammo_9mm;
+	int ammo_357;
+	int ammo_bolts;
+	int ammo_buckshot;
+	int ammo_rockets;
+	int ammo_uranium;
+	int ammo_hornets;
+	int ammo_argrens;
+	//Special stuff for grenades and satchels.
+	float m_flStartThrow;
+	float m_flReleaseThrow;
+	int m_chargeReady;
+	int m_fInAttack;
+
+	enum EGON_FIRESTATE { FIRE_OFF, FIRE_CHARGE };
+	int m_fireState;
+};
+
+
+
+// Ugly technique to override base member functions
+// Normally it's illegal to cast a pointer to a member function of a derived class to a pointer to a 
+// member function of a base class.  static_cast is a sleezy way around that problem.
+
+#ifdef _DEBUG
+
+#define SetThink( a ) ThinkSet( static_cast <void (CBaseEntity::*)(void)> (a), #a )
+#define SetTouch( a ) TouchSet( static_cast <void (CBaseEntity::*)(CBaseEntity *)> (a), #a )
+#define SetUse( a ) UseSet( static_cast <void (CBaseEntity::*)(	CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )> (a), #a )
+#define SetBlocked( a ) BlockedSet( static_cast <void (CBaseEntity::*)(CBaseEntity *)> (a), #a )
+
+#else
+
+#define SetThink( a ) m_pfnThink = static_cast <void (CBaseEntity::*)(void)> (a)
+#define SetTouch( a ) m_pfnTouch = static_cast <void (CBaseEntity::*)(CBaseEntity *)> (a)
+#define SetUse( a ) m_pfnUse = static_cast <void (CBaseEntity::*)( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )> (a)
+#define SetBlocked( a ) m_pfnBlocked = static_cast <void (CBaseEntity::*)(CBaseEntity *)> (a)
+
+#endif
+
+
+class CPointEntity : public CBaseEntity
+{
+public:
+	void	Spawn( void );
+	virtual int	ObjectCaps( void ) { return CBaseEntity :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+private:
+};
+
+
+typedef struct locksounds			// sounds that doors and buttons make when locked/unlocked
+{
+	string_t	sLockedSound;		// sound a door makes when it's locked
+	string_t	sLockedSentence;	// sentence group played when door is locked
+	string_t	sUnlockedSound;		// sound a door makes when it's unlocked
+	string_t	sUnlockedSentence;	// sentence group played when door is unlocked
+
+	int		iLockedSentence;		// which sentence in sentence group to play next
+	int		iUnlockedSentence;		// which sentence in sentence group to play next
+
+	float	flwaitSound;			// time delay between playing consecutive 'locked/unlocked' sounds
+	float	flwaitSentence;			// time delay between playing consecutive sentences
+	BYTE	bEOFLocked;				// true if hit end of list of locked sentences
+	BYTE	bEOFUnlocked;			// true if hit end of list of unlocked sentences
+} locksound_t;
+
+void PlayLockSounds(entvars_t *pev, locksound_t *pls, int flocked, int fbutton);
+
+//
+// MultiSouce
+//
+
+#define MAX_MULTI_TARGETS	16 // maximum number of targets a single multi_manager entity may be assigned.
+#define MS_MAX_TARGETS 32
+
+class CMultiSource : public CPointEntity
+{
+public:
+	void Spawn( );
+	void KeyValue( KeyValueData *pkvd );
+	void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	int	ObjectCaps( void ) { return (CPointEntity::ObjectCaps() | FCAP_MASTER); }
+	BOOL IsTriggered( CBaseEntity *pActivator );
+	void EXPORT Register( void );
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	EHANDLE		m_rgEntities[MS_MAX_TARGETS];
+	int			m_rgTriggered[MS_MAX_TARGETS];
+
+	int			m_iTotal;
+	string_t	m_globalstate;
+};
+
+
+//
+// generic Delay entity.
+//
+class CBaseDelay : public CBaseEntity
+{
+public:
+	float		m_flDelay;
+	int			m_iszKillTarget;
+
+	virtual void	KeyValue( KeyValueData* pkvd);
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	
+	static	TYPEDESCRIPTION m_SaveData[];
+	// common member functions
+	void SUB_UseTargets( CBaseEntity *pActivator, USE_TYPE useType, float value );
+	void EXPORT DelayThink( void );
+};
+
+
+class CBaseAnimating : public CBaseDelay
+{
+public:
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	// Basic Monster Animation functions
+	float StudioFrameAdvance( float flInterval = 0.0 ); // accumulate animation frame time from last time called until now
+	int	 GetSequenceFlags( void );
+	int  LookupActivity ( int activity );
+	int  LookupActivityHeaviest ( int activity );
+	int  LookupSequence ( const char *label );
+	const char* LookupSequence(int inSequence);
+	void ResetSequenceInfo ( );
+	void DispatchAnimEvents ( float flFutureInterval = 0.1 ); // Handle events that have happend since last time called up until X seconds into the future
+	virtual void HandleAnimEvent( MonsterEvent_t *pEvent ) { return; };
+	virtual float SetBoneController ( int iController, float flValue );
+	void InitBoneControllers ( void );
+	float SetBlending ( int iBlender, float flValue );
+	void GetBonePosition ( int iBone, Vector &origin, Vector &angles );
+	void GetAutomovement( Vector &origin, Vector &angles, float flInterval = 0.1 );
+	int  FindTransition( int iEndingSequence, int iGoalSequence, int *piDir );
+	void GetAttachment ( int iAttachment, Vector &origin, Vector &angles );
+	void SetBodygroup( int iGroup, int iValue );
+	int GetBodygroup( int iGroup );
+	int ExtractBbox( int sequence, float *mins, float *maxs );
+	void SetSequenceBox( void );
+
+	// animation needs
+	float				m_flFrameRate;		// computed FPS for current sequence
+	float				m_flGroundSpeed;	// computed linear movement rate for current sequence
+	float				m_flLastEventCheck;	// last time the event list was checked
+	BOOL				m_fSequenceFinished;// flag set when StudioAdvanceFrame moves across a frame boundry
+	BOOL				m_fSequenceLoops;	// true if the sequence loops
+};
+
+
+//
+// generic Toggle entity.
+//
+#define	SF_ITEM_USE_ONLY	256 //  ITEM_USE_ONLY = BUTTON_USE_ONLY = DOOR_USE_ONLY!!! 
+
+class CBaseToggle : public CBaseAnimating
+{
+public:
+	void				KeyValue( KeyValueData *pkvd );
+
+	TOGGLE_STATE		m_toggle_state;
+	float				m_flActivateFinished;//like attack_finished, but for doors
+	float				m_flMoveDistance;// how far a door should slide or rotate
+	float				m_flWait;
+	float				m_flLip;
+	float				m_flTWidth;// for plats
+	float				m_flTLength;// for plats
+
+	Vector				m_vecPosition1;
+	Vector				m_vecPosition2;
+	Vector				m_vecAngle1;
+	Vector				m_vecAngle2;
+
+	int					m_cTriggersLeft;		// trigger_counter only, # of activations remaining
+	float				m_flHeight;
+	EHANDLE				m_hActivator;
+	void (CBaseToggle::*m_pfnCallWhenMoveDone)(void);
+	Vector				m_vecFinalDest;
+	Vector				m_vecFinalAngle;
+
+	int					m_bitsDamageInflict;	// DMG_ damage type that the door or tigger does
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	virtual int		GetToggleState( void ) { return m_toggle_state; }
+	virtual float	GetDelay( void ) { return m_flWait; }
+
+	// common member functions
+	void LinearMove( Vector	vecDest, float flSpeed );
+	void EXPORT LinearMoveDone( void );
+	void AngularMove( Vector vecDestAngle, float flSpeed );
+	void EXPORT AngularMoveDone( void );
+	BOOL IsLockedByMaster( void );
+
+	virtual void		SaveDataForReset();
+	virtual void		ResetEntity();
+
+	static float		AxisValue( int flags, const Vector &angles );
+	static void			AxisDir( entvars_t *pev );
+	static float		AxisDelta( int flags, const Vector &angle1, const Vector &angle2 );
+
+	string_t m_sMaster;		// If this button has a master switch, this is the targetname.
+							// A master switch must be of the multisource type. If all 
+							// of the switches in the multisource have been triggered, then
+							// the button will be allowed to operate. Otherwise, it will be
+							// deactivated.
+private:
+	vec3_t			mSavedOrigin;
+	float			mSavedWait;
+	float			mSavedLip;
+};
+#define SetMoveDone( a ) m_pfnCallWhenMoveDone = static_cast <void (CBaseToggle::*)(void)> (a)
+
+
+// people gib if their health is <= this at the time of death
+#define	GIB_HEALTH_VALUE	-30
+
+#define	ROUTE_SIZE			8 // how many waypoints a monster can store at one time
+#define MAX_OLD_ENEMIES		4 // how many old enemies to remember
+
+#define	bits_CAP_DUCK			( 1 << 0 )// crouch
+#define	bits_CAP_JUMP			( 1 << 1 )// jump/leap
+#define bits_CAP_STRAFE			( 1 << 2 )// strafe ( walk/run sideways)
+#define bits_CAP_SQUAD			( 1 << 3 )// can form squads
+#define	bits_CAP_SWIM			( 1 << 4 )// proficiently navigate in water
+#define bits_CAP_CLIMB			( 1 << 5 )// climb ladders/ropes
+#define bits_CAP_USE			( 1 << 6 )// open doors/push buttons/pull levers
+#define bits_CAP_HEAR			( 1 << 7 )// can hear forced sounds
+#define bits_CAP_AUTO_DOORS		( 1 << 8 )// can trigger auto doors
+#define bits_CAP_OPEN_DOORS		( 1 << 9 )// can open manual doors
+#define bits_CAP_TURN_HEAD		( 1 << 10)// can turn head, always bone controller 0
+
+#define bits_CAP_RANGE_ATTACK1	( 1 << 11)// can do a range attack 1
+#define bits_CAP_RANGE_ATTACK2	( 1 << 12)// can do a range attack 2
+#define bits_CAP_MELEE_ATTACK1	( 1 << 13)// can do a melee attack 1
+#define bits_CAP_MELEE_ATTACK2	( 1 << 14)// can do a melee attack 2
+
+#define bits_CAP_FLY			( 1 << 15)// can fly, move all around
+
+#define bits_CAP_DOORS_GROUP    (bits_CAP_USE | bits_CAP_AUTO_DOORS | bits_CAP_OPEN_DOORS)
+
+// used by suit voice to indicate damage sustained and repaired type to player
+
+// instant damage
+
+// time-based damage
+//#define DMG_TIMEBASED		(~(0x3fff))	// mask for time-based damage
+#include "common/damagetypes.h"
+
+#define DMG_PARALYZE		(1 << 15)	// slows affected creature down
+#define DMG_NERVEGAS		(1 << 16)	// nerve toxins, very bad
+#define DMG_POISON			(1 << 17)	// blood poisioning
+#define DMG_RADIATION		(1 << 18)	// radiation exposure
+#define DMG_DROWNRECOVER	(1 << 19)	// drowning recovery
+#define DMG_ACID			(1 << 20)	// toxic chemicals or acid burns
+#define DMG_SLOWBURN		(1 << 21)	// in an oven
+#define DMG_SLOWFREEZE		(1 << 22)	// in a subzero freezer
+#define DMG_MORTAR			(1 << 23)	// Hit by air raid (done to distinguish grenade from mortar)
+
+// these are the damage types that are allowed to gib corpses
+#define DMG_GIB_CORPSE		( DMG_CRUSH | DMG_FALL | DMG_BLAST | DMG_SONIC | DMG_CLUB )
+
+// these are the damage types that have client hud art
+#define DMG_SHOWNHUD		(DMG_POISON | /*DMG_ACID |*/ DMG_FREEZE | DMG_SLOWFREEZE /*| DMG_DROWN*/ | DMG_BURN | DMG_SLOWBURN | DMG_NERVEGAS | DMG_RADIATION /*| DMG_SHOCK*/)
+
+// NOTE: tweak these values based on gameplay feedback:
+
+#define PARALYZE_DURATION	2		// number of 2 second intervals to take damage
+#define PARALYZE_DAMAGE		1.0		// damage to take each 2 second interval
+
+#define NERVEGAS_DURATION	2
+#define NERVEGAS_DAMAGE		5.0
+
+#define POISON_DURATION		5
+#define POISON_DAMAGE		2.0
+
+#define RADIATION_DURATION	2
+#define RADIATION_DAMAGE	1.0
+
+#define ACID_DURATION		2
+#define ACID_DAMAGE			5.0
+
+#define SLOWBURN_DURATION	2
+#define SLOWBURN_DAMAGE		1.0
+
+#define SLOWFREEZE_DURATION	2
+#define SLOWFREEZE_DAMAGE	1.0
+
+
+#define	itbd_Paralyze		0		
+#define	itbd_NerveGas		1
+#define	itbd_Poison			2
+#define	itbd_Radiation		3
+#define	itbd_DrownRecover	4
+#define	itbd_Acid			5
+#define	itbd_SlowBurn		6
+#define	itbd_SlowFreeze		7
+#define CDMG_TIMEBASED		8
+
+// when calling KILLED(), a value that governs gib behavior is expected to be 
+// one of these three values
+#define GIB_NORMAL			0// gib if entity was overkilled
+#define GIB_NEVER			1// never gib, no matter how much death damage is done ( freezing, etc )
+#define GIB_ALWAYS			2// always gib ( Houndeye Shock, Barnacle Bite )
+
+class CBaseMonster;
+class CCineMonster;
+class CSound;
+
+#include "basemonster.h"
+
+
+char *ButtonSound( int sound );				// get string of button sound number
+
+
+//
+// Generic Button
+//
+class CBaseButton : public CBaseToggle
+{
+public:
+	void Spawn( void );
+	virtual void Precache( void );
+	void RotSpawn( void );
+	virtual void KeyValue( KeyValueData* pkvd);
+
+	void ButtonActivate( );
+	void SparkSoundCache( void );
+
+	void EXPORT ButtonShot( void );
+	void EXPORT ButtonTouch( CBaseEntity *pOther );
+	void EXPORT ButtonSpark ( void );
+	void EXPORT TriggerAndWait( void );
+	void EXPORT ButtonReturn( void );
+	void EXPORT ButtonBackHome( void );
+	void EXPORT ButtonUse ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	virtual int		TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType );
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+
+	virtual void	SaveDataForReset();
+	virtual void	ResetEntity();
+	
+	enum BUTTON_CODE { BUTTON_NOTHING, BUTTON_ACTIVATE, BUTTON_RETURN };
+	BUTTON_CODE	ButtonResponseToTouch( void );
+	
+	static	TYPEDESCRIPTION m_SaveData[];
+	// Buttons that don't take damage can be IMPULSE used
+	virtual int	ObjectCaps( void ) { return (CBaseToggle:: ObjectCaps() & ~FCAP_ACROSS_TRANSITION) | (pev->takedamage?0:FCAP_IMPULSE_USE); }
+
+	BOOL	m_fStayPushed;	// button stays pushed in until touched again?
+	BOOL	m_fRotating;		// a rotating button?  default is a sliding button.
+
+	string_t m_strChangeTarget;	// if this field is not null, this is an index into the engine string array.
+							// when this button is touched, it's target entity's TARGET field will be set
+							// to the button's ChangeTarget. This allows you to make a func_train switch paths, etc.
+
+	locksound_t m_ls;			// door lock sounds
+	
+	BYTE	m_bLockedSound;		// ordinals from entity selection
+	BYTE	m_bLockedSentence;	
+	BYTE	m_bUnlockedSound;	
+	BYTE	m_bUnlockedSentence;
+	int		m_sounds;
+
+private:
+	float			mSavedSpeed;
+	float			mSavedHealth;
+	vec3_t			mSavedMoveDir;
+	int				mSavedSpawnFlags;
+	BOOL			mSavedStayPushed;
+	float			mSavedRotation;
+	int				mSavedFrame;
+	int				mSavedSkin;
+};
+
+//
+// Weapons 
+//
+
+#define	BAD_WEAPON 0x00007FFF
+
+//
+// Converts a entvars_t * to a class pointer
+// It will allocate the class and entity if necessary
+//
+template <class T> T * GetClassPtr( T *a )
+{
+	entvars_t *pev = (entvars_t *)a;
+
+	// allocate entity if necessary
+	if (pev == NULL)
+		pev = VARS(CREATE_ENTITY());
+
+	// get the private data
+	a = (T *)GET_PRIVATE(ENT(pev));
+
+	if (a == NULL) 
+	{
+		// allocate private data 
+		a = new(pev) T;
+		a->pev = pev;
+	}
+	return a;
+}
+
+
+/*
+bit_PUSHBRUSH_DATA | bit_TOGGLE_DATA
+bit_MONSTER_DATA
+bit_DELAY_DATA
+bit_TOGGLE_DATA | bit_DELAY_DATA | bit_MONSTER_DATA
+bit_PLAYER_DATA | bit_MONSTER_DATA
+bit_MONSTER_DATA | CYCLER_DATA
+bit_LIGHT_DATA
+path_corner_data
+bit_MONSTER_DATA | wildcard_data
+bit_MONSTER_DATA | bit_GROUP_DATA
+boid_flock_data
+boid_data
+CYCLER_DATA
+bit_ITEM_DATA
+bit_ITEM_DATA | func_hud_data
+bit_TOGGLE_DATA | bit_ITEM_DATA
+EOFFSET
+env_sound_data
+env_sound_data
+push_trigger_data
+*/
+
+#define TRACER_FREQ		4			// Tracers fire every 4 bullets
+
+typedef struct _SelAmmo
+{
+	BYTE	Ammo1Type;
+	BYTE	Ammo1;
+	BYTE	Ammo2Type;
+	BYTE	Ammo2;
+} SelAmmo;
+
+
+// this moved here from world.cpp, to allow classes to be derived from it
+//=======================
+// CWorld
+//
+// This spawns first when each level begins.
+//=======================
+class CWorld : public CBaseEntity
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void KeyValue( KeyValueData *pkvd );
+};
+
+typedef vector<CBaseEntity*>		BaseEntityListType;
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/cbasedoor.h b/main/source/dlls/cbasedoor.h
new file mode 100644
index 00000000..c47da00f
--- /dev/null
+++ b/main/source/dlls/cbasedoor.h
@@ -0,0 +1,104 @@
+#ifndef CBASE_DOOR_H
+#define CBASE_DOOR_H
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "doors.h"
+
+class CBaseDoor : public CBaseToggle
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	virtual void KeyValue( KeyValueData *pkvd );
+	virtual void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	virtual void Blocked( CBaseEntity *pOther );
+
+
+	virtual int	ObjectCaps( void ) 
+	{ 
+		if (pev->spawnflags & SF_ITEM_USE_ONLY)
+			return (CBaseToggle::ObjectCaps() & ~FCAP_ACROSS_TRANSITION) | FCAP_IMPULSE_USE;
+		else
+			return (CBaseToggle::ObjectCaps() & ~FCAP_ACROSS_TRANSITION);
+	};
+	virtual int	Save( CSave &save );
+	virtual int	Restore( CRestore &restore );
+
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	virtual void ResetEntity();
+	virtual void SetToggleState( int state );
+
+	// used to selectivly override defaults
+	void EXPORT DoorTouch( CBaseEntity *pOther );
+
+	// local functions
+	int DoorActivate( );
+	void EXPORT DoorGoUp( void );
+	void EXPORT DoorGoDown( void );
+	void EXPORT DoorHitTop( void );
+	void EXPORT DoorHitBottom( void );
+	
+	BYTE	m_bHealthValue;// some doors are medi-kit doors, they give players health
+	
+	BYTE	m_bMoveSnd;			// sound a door makes while moving
+	BYTE	m_bStopSnd;			// sound a door makes when it stops
+
+	locksound_t m_ls;			// door lock sounds
+	
+	BYTE	m_bLockedSound;		// ordinals from entity selection
+	BYTE	m_bLockedSentence;	
+	BYTE	m_bUnlockedSound;	
+	BYTE	m_bUnlockedSentence;
+
+};
+
+/*QUAKED FuncRotDoorSpawn (0 .5 .8) ? START_OPEN REVERSE  
+DOOR_DONT_LINK TOGGLE X_AXIS Y_AXIS
+if two doors touch, they are assumed to be connected and operate as  
+a unit.
+
+TOGGLE causes the door to wait in both the start and end states for  
+a trigger event.
+
+START_OPEN causes the door to move to its destination when spawned,  
+and operate in reverse.  It is used to temporarily or permanently  
+close off an area when triggered (not usefull for touch or  
+takedamage doors).
+
+You need to have an origin brush as part of this entity.  The  
+center of that brush will be
+the point around which it is rotated. It will rotate around the Z  
+axis by default.  You can
+check either the X_AXIS or Y_AXIS box to change that.
+
+"distance" is how many degrees the door will be rotated.
+"speed" determines how fast the door moves; default value is 100.
+
+REVERSE will cause the door to rotate in the opposite direction.
+
+"angle"		determines the opening direction
+"targetname" if set, no touch field will be spawned and a remote  
+button or trigger field activates the door.
+"health"	if set, door must be shot open
+"speed"		movement speed (100 default)
+"wait"		wait before returning (3 default, -1 = never return)
+"dmg"		damage to inflict when blocked (2 default)
+"sounds"
+0)	no sound
+1)	stone
+2)	base
+3)	stone chain
+4)	screechy metal
+*/
+class CRotDoor : public CBaseDoor
+{
+public:
+	void Spawn( void );
+	virtual void SetToggleState( int state );
+};
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/cdll_dll.h b/main/source/dlls/cdll_dll.h
new file mode 100644
index 00000000..00ef5231
--- /dev/null
+++ b/main/source/dlls/cdll_dll.h
@@ -0,0 +1,47 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+//  cdll_dll.h
+
+// this file is included by both the game-dll and the client-dll,
+
+#ifndef CDLL_DLL_H
+#define CDLL_DLL_H
+
+#define MAX_WEAPONS				32		// ???
+
+#define MAX_WEAPON_SLOTS		4	// hud item selection slots
+#define MAX_ITEM_TYPES			6	// hud item selection slots
+
+#define MAX_ITEMS				5	// hard coded item types
+
+#define	HIDEHUD_WEAPONS			( 1<<0 )
+#define	HIDEHUD_FLASHLIGHT		( 1<<1 )
+#define	HIDEHUD_ALL				( 1<<2 )
+#define HIDEHUD_HEALTH			( 1<<3 )
+#define HIDEHUD_CHAT			( 1<<4 )
+
+#define	MAX_AMMO_TYPES			32		// ???
+#define MAX_AMMO_SLOTS			32		// not really slots
+
+#define HUD_PRINTNOTIFY			1
+#define HUD_PRINTCONSOLE		2
+#define HUD_PRINTTALK			3
+#define HUD_PRINTCENTER			4
+								
+								
+#define WEAPON_SUIT				31
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/cfuncwall.h b/main/source/dlls/cfuncwall.h
new file mode 100644
index 00000000..a8e4d2dd
--- /dev/null
+++ b/main/source/dlls/cfuncwall.h
@@ -0,0 +1,22 @@
+#ifndef CFUNC_WALL_H
+#define CFUNC_WALL_H
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "doors.h"
+
+/*QUAKED func_wall (0 .5 .8) ?
+This is just a solid wall if not inhibited
+*/
+class CFuncWall : public CBaseEntity
+{
+public:
+	void	Spawn( void );
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+	// Bmodels don't go across transitions
+	virtual int	ObjectCaps( void ) { return CBaseEntity :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/client.cpp b/main/source/dlls/client.cpp
new file mode 100644
index 00000000..d44421cd
--- /dev/null
+++ b/main/source/dlls/client.cpp
@@ -0,0 +1,2954 @@
+//	
+//	Copyright (c) 1999, Valve LLC. All rights reserved.
+//	
+//	This product contains software technology licensed from Id 
+//	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+//	All Rights Reserved.
+//	
+//	Use, distribution, and modification of this source code and/or resulting
+//	object code is restricted to non-commercial enhancements to products from
+//	Valve LLC.  All other use, distribution, or modification is prohibited
+//	without written permission from Valve LLC.
+//	
+// Robin, 4-22-98: Moved set_suicide_frame() here from player.cpp to allow us to 
+//				   have one without a hardcoded player.mdl in tf_client.cpp
+//
+//===== client.cpp ========================================================
+//
+//  client/server game specific stuff
+//
+// $Workfile: client.cpp $
+// $Date: 2002/11/22 21:09:09 $
+//
+//-------------------------------------------------------------------------------
+// $Log: client.cpp,v $
+// Revision 1.69  2002/11/22 21:09:09  Flayra
+// - Added "lastinv" command back in
+// - mp_consistency changes
+//
+// Revision 1.68  2002/11/15 23:31:01  Flayra
+// - Added "ready" verification for tourny mode
+//
+// Revision 1.67  2002/11/15 05:08:31  Flayra
+// - Little tweak for refinery
+//
+// Revision 1.66  2002/11/15 04:48:40  Flayra
+// - Oops
+//
+// Revision 1.65  2002/11/15 04:41:32  Flayra
+// - Big performance improvements for AddToFullPack (whew)
+//
+// Revision 1.64  2002/11/12 02:17:48  Flayra
+// - Renamed "avhplayer" to "player"
+// - Tweaked enhanced sight to actually be useful at lower levels
+//
+// Revision 1.63  2002/11/03 04:53:20  Flayra
+// - AddToFullPack optimizations and cleanup
+//
+// Revision 1.62  2002/10/25 21:50:01  Flayra
+// - New attempted fix for overflows.  Propagate skin and playerclass in new way, so entities outside the ready room aren't propagated to all clients that go back to the ready room immediately on game end.
+//
+// Revision 1.61  2002/10/24 21:16:10  Flayra
+// - Log Sys_Errors
+// - Allow players to change their name before they first leave the ready room
+//
+// Revision 1.60  2002/10/20 17:25:04  Flayra
+// - Redid performance improvement (agh)
+//
+// Revision 1.59  2002/10/20 16:34:09  Flayra
+// - Returned code back to normal
+//
+// Revision 1.58  2002/10/19 22:33:48  Flayra
+// - Various server optimizations
+//
+// Revision 1.57  2002/10/18 22:14:23  Flayra
+// - Server optimizations (untested though, may need backing out)
+//
+// Revision 1.56  2002/10/16 00:38:50  Flayra
+// - Queue up name change until end of game
+// - Removed precaching of unneeded sounds
+// - Optimized AvHDetermineVisibility (being called 1000s of times per tick)
+//
+// Revision 1.55  2002/10/03 18:27:39  Flayra
+// - Moved order completion sounds into HUD sounds
+//
+// Revision 1.54  2002/09/25 20:37:53  Flayra
+// - Precache more sayings
+//
+// Revision 1.53  2002/09/23 22:01:02  Flayra
+// - Propagate skin
+// - Don't treat unclaimed hives at world objects (even though team is 0) for visibility purposes
+// - Added heavy model
+// - Removed old mapper build preprocessor directives
+//
+// Revision 1.52  2002/08/31 18:01:17  Flayra
+// - Work at VALVe
+//
+// Revision 1.51  2002/08/16 02:24:31  Flayra
+// - Removed "give" cheat
+//
+// Revision 1.50  2002/08/09 00:15:46  Flayra
+// - Removed behavior where "drop" would drop alien weapons in a disconcerting manner
+//
+// Revision 1.49  2002/07/25 16:50:15  flayra
+// - Linux build changes
+//
+// Revision 1.48  2002/07/24 18:46:19  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.47  2002/07/23 16:46:38  Flayra
+// - Added power-armor drawing, tweaked invul drawing
+//
+// Revision 1.46  2002/07/10 14:36:21  Flayra
+// - .mp3 and particle fixes
+//
+// Revision 1.45  2002/07/08 16:38:57  Flayra
+// - Draw invulnerable players differently
+//
+//===============================================================================
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "saverestore.h"
+#include "player.h"
+#include "spectator.h"
+#include "client.h"
+#include "soundent.h"
+#include "gamerules.h"
+#include "game.h"
+#include "customentity.h"
+#include "weapons.h"
+#include "weaponinfo.h"
+#include "usercmd.h"
+#include "netadr.h"
+#include "util/nowarnings.h"
+#include "mod/AvHPlayer.h"
+#include "mod/AvHSoundListManager.h"
+#include "game.h"
+#include "mod/AvHParticleTemplateServer.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "mod/AvHSpecials.h"
+#include "util/Zassert.h"
+#include "dlls/cbasedoor.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHMovementUtil.h"
+#include "mod/AvHSoundConstants.h"
+#include "mod/AvHHulls.h"
+#include "mod/AvHServerVariables.h"
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHAlienEquipmentConstants.h"
+#include "dlls/triggers.h"
+#include "util/MathUtil.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHCloakable.h"
+#include "mod/AvHAlienAbilityConstants.h"
+#include "mod/UPPUtil.h"
+
+#include "voice_gamemgr.h"
+extern CVoiceGameMgr	g_VoiceGameMgr;
+
+extern AvHSoundListManager				gSoundListManager;
+//edict_t *EntSelectSpawnPoint( CBaseEntity *pPlayer );
+extern int gmsgSetParticleTemplates;
+//extern int gServerTick;
+//extern int gUpdateEntitiesTick;
+
+
+extern DLL_GLOBAL ULONG		g_ulModelIndexPlayer;
+extern DLL_GLOBAL BOOL		g_fGameOver;
+extern DLL_GLOBAL int		g_iSkillLevel;
+extern DLL_GLOBAL ULONG		g_ulFrameCount;
+
+extern void CopyToBodyQue(entvars_t* pev);
+extern int giPrecacheGrunt;
+extern int gmsgShowMenu;
+extern int g_teamplay;
+
+void LinkUserMessages( void );
+
+/*
+ * used by kill command and disconnect command
+ * ROBIN: Moved here from player.cpp, to allow multiple player models
+ */
+void set_suicide_frame(entvars_t* pev)
+{       
+	if (!FStrEq(STRING(pev->model), "models/player.mdl"))
+		return; // allready gibbed
+
+//	pev->frame		= $deatha11;
+	pev->solid		= SOLID_NOT;
+	pev->movetype	= MOVETYPE_TOSS;
+	pev->deadflag	= DEAD_DEAD;
+	pev->nextthink	= -1;
+}
+
+
+/*
+===========
+ClientConnect
+
+called when a player connects to a server
+============
+*/
+BOOL ClientConnect( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[ 128 ]  )
+{
+	return g_pGameRules->ClientConnected( pEntity, pszName, pszAddress, szRejectReason );
+	
+	// a client connecting during an intermission can cause problems
+	//	if (intermission_running)
+	//		ExitIntermission ();
+	
+}
+
+
+/*
+===========
+ClientDisconnect
+
+  called when a player disconnects from a server
+  
+	GLOBALS ASSUMED SET:  g_fGameOver
+	============
+*/
+void ClientDisconnect( edict_t *pEntity )
+{
+	if (g_fGameOver)
+		return;
+	
+	char text[256];
+	sprintf( text, "- %s has left the game\n", STRING(pEntity->v.netname) );
+
+	CBaseEntity* theBaseEntity = CBaseEntity::Instance(ENT(pEntity));
+	UTIL_SayTextAll(text, theBaseEntity);
+	
+	CSound *pSound;
+	pSound = CSoundEnt::SoundPointerForIndex( CSoundEnt::ClientSoundIndex( pEntity ) );
+	{
+		// since this client isn't around to think anymore, reset their sound. 
+		if ( pSound )
+		{
+			pSound->Reset();
+		}
+	}
+	
+	// since the edict doesn't get deleted, fix it so it doesn't interfere.
+	pEntity->v.takedamage = DAMAGE_NO;// don't attract autoaim
+	pEntity->v.solid = SOLID_NOT;// nonsolid
+	UTIL_SetOrigin ( &pEntity->v, pEntity->v.origin );
+	
+	g_pGameRules->ClientDisconnected( pEntity );
+
+	//voogru: If this isnt set, clients around this player will crash.
+	pEntity->v.effects |= EF_NODRAW;
+
+//	CBaseEntity* theEntity = CBaseEntity::Instance(ENT(pEntity));
+//	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntity);
+//	if(thePlayer)
+//	{
+//		thePlayer->SetLeftServer();
+//	}
+	//UTIL_Remove(theEntity);
+}
+
+
+// called by ClientKill and DeadThink
+void respawn(entvars_t* pev, BOOL fCopyCorpse)
+{
+	// AVH isn't dm, coop or single-player.
+	//if (gpGlobals->coop || gpGlobals->deathmatch)
+	//{
+		if ( fCopyCorpse )
+		{
+			// make a copy of the dead body for appearances sake
+			CopyToBodyQue(pev);
+		}
+
+		// respawn player
+		GetClassPtr( (AvHPlayer *)pev)->Spawn( );
+	//}
+	//else
+	//{       // restart the entire server
+	//	SERVER_COMMAND("reload\n");
+	//}
+}
+
+/*
+============
+ClientKill
+
+Player entered the suicide command
+
+GLOBALS ASSUMED SET:  g_ulModelIndexPlayer
+============
+*/
+void ClientKill( edict_t *pEntity )
+{
+	entvars_t *pev = &pEntity->v;
+
+	CBasePlayer *pl = (CBasePlayer*) CBasePlayer::Instance( pev );
+
+	//if(GetGameRules()->GetCheatsEnabled())
+	//{
+		if ( pl->m_fNextSuicideTime > gpGlobals->time )
+			return;  // prevent suiciding too ofter
+
+		pl->m_fNextSuicideTime = gpGlobals->time + 1;  // don't let them suicide for 5 seconds after suiciding
+		
+        bool theIsCombatModeForSuicide = GetGameRules()->GetIsCombatMode();
+        
+        #ifdef DEBUG
+        if(GetGameRules()->GetIsCombatMode())
+        {
+            theIsCombatModeForSuicide = false;
+        }
+        #endif
+        
+        bool theCanSuicide = GetGameRules()->CanPlayerBeKilled(pl) && !theIsCombatModeForSuicide;
+
+		if(theCanSuicide)
+		{
+			pl->Suicide();
+
+			//	pev->modelindex = g_ulModelIndexPlayer;
+			//	pev->frags -= 2;		// extra penalty
+			//	respawn( pev );
+		}
+	//}
+}
+
+/*
+===========
+ClientPutInServer
+
+called each time a player is spawned
+============
+*/
+void ClientPutInServer( edict_t *pEntity )
+{
+	//CBasePlayer *pPlayer;
+	AvHPlayer *pPlayer;
+
+	entvars_t *pev = &pEntity->v;
+
+	if(pev->flags & FL_PROXY)
+	{
+		ALERT(at_logged, "Player with FL_PROXY put in server.\n");
+	}
+
+	if(pev->flags & FL_PROXY)
+	{
+		pev->flags |= FL_PROXY;
+	}
+
+	pPlayer = GetClassPtr((AvHPlayer *)pev);
+	pPlayer->SetCustomDecalFrames(-1); // Assume none;
+
+	// Allocate a CBasePlayer for pev, and call spawn
+	pPlayer->SetPlayMode(PLAYMODE_READYROOM);
+	//pPlayer->Spawn();
+
+	// Reset interpolation during first frame
+	pPlayer->pev->effects |= EF_NOINTERP;
+}
+
+//// HOST_SAY
+// String comes in as
+// say blah blah blah
+// or as
+// blah blah blah
+//
+void Host_Say( edict_t *pEntity, int teamonly )
+{
+	AvHPlayer*	client;
+	AvHPlayer*	theTalkingPlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(pEntity));
+	int			j;
+	char*		p;
+	char		text[256];
+	char		szTemp[256];
+	const char*	cpSay = "say";
+	const char*	cpSayTeam = "say_team";
+	const char*	pcmd = CMD_ARGV(0);
+	bool		theTalkerInReadyRoom = theTalkingPlayer->GetInReadyRoom();
+	//bool		theTalkerIsObserver = (theTalkingPlayer->GetPlayMode() == PLAYMODE_OBSERVER) || (theTalkingPlayer->GetPlayMode() == PLAYMODE_AWAITINGREINFORCEMENT);
+
+	// We can get a raw string now, without the "say " prepended
+	if ( CMD_ARGC() == 0 )
+		return;
+
+	//Not yet.
+	if ( theTalkingPlayer->m_flNextChatTime > gpGlobals->time )
+		 return;
+
+	if ( !stricmp( pcmd, cpSay) || !stricmp( pcmd, cpSayTeam ) )
+	{
+		if ( CMD_ARGC() >= 2 )
+		{
+			p = (char *)CMD_ARGS();
+
+			if(GetGameRules()->GetIsTournamentMode())
+			{
+				if(!GetGameRules()->GetGameStarted())
+				{
+					if(!strcmp(CMD_ARGV(1), kReadyNotification))
+					{
+						// Team is ready
+						AvHTeam* theTeam = GetGameRules()->GetTeam((AvHTeamNumber)(pEntity->v.team));
+						if(theTeam && !theTeam->GetIsReady())
+						{
+							theTeam->SetIsReady();
+						}
+					}
+					else if (!strcmp(CMD_ARGV(1), kNotReadyNotification))
+					{
+						// Team is no longer ready
+						AvHTeam* theTeam = GetGameRules()->GetTeam((AvHTeamNumber)(pEntity->v.team));
+						if(theTeam && theTeam->GetIsReady())
+						{
+							theTeam->SetIsReady(false);
+						}
+					}
+				}
+			}
+		}
+		else
+		{
+			// say with a blank message, nothing to do
+			return;
+		}
+	}
+	else  // Raw text, need to prepend argv[0]
+	{
+		if ( CMD_ARGC() >= 2 )
+		{
+			sprintf( szTemp, "%s %s", ( char * )pcmd, (char *)CMD_ARGS() );
+		}
+		else
+		{
+			// Just a one word command, use the first word...sigh
+			sprintf( szTemp, "%s", ( char * )pcmd );
+		}
+		p = szTemp;
+	}
+
+// remove quotes if present
+	if (*p == '"')
+	{
+		p++;
+		p[strlen(p)-1] = 0;
+	}
+
+// make sure the text has content
+	for ( char *pc = p; pc != NULL && *pc != 0; pc++ )
+	{
+		if ( isprint( *pc ) && !isspace( *pc ) )
+		{
+			pc = NULL;	// we've found an alphanumeric character,  so text is valid
+			break;
+		}
+	}
+	if ( pc != NULL )
+		return;  // no character found, so say nothing
+
+// turn on color set 2  (color on,  no sound)
+	if ( teamonly )
+		sprintf( text, "%c(TEAM) %s: ", 2, STRING( pEntity->v.netname ) );
+	else
+		sprintf( text, "%c%s: ", 2, STRING( pEntity->v.netname ) );
+
+	j = sizeof(text) - 2 - strlen(text);  // -2 for /n and null terminator
+	if ( (int)strlen(p) > j )
+		p[j] = 0;
+
+	strcat( text, p );
+	strcat( text, "\n" );
+
+	theTalkingPlayer->m_flNextChatTime = gpGlobals->time + CHAT_INTERVAL;
+	// loop through all players
+	// Start with the first player.
+	// This may return the world in single player if the client types something between levels or during spawn
+	// so check it, or it will infinite loop
+
+	client = NULL;
+	while ( ((client = (AvHPlayer*)UTIL_FindEntityByClassname( client, "player" )) != NULL) && (!FNullEnt(client->edict())) ) 
+	{
+		if ( !client->pev )
+			continue;
+		
+		if ( client->edict() == pEntity )
+			continue;
+
+		if ( !(client->IsNetClient()) )	// Not a client ? (should never be true)
+			continue;
+
+	    // can the receiver hear the sender? or has he muted him?
+	    if ( g_VoiceGameMgr.PlayerHasBlockedPlayer( client, theTalkingPlayer ) )
+		    continue;
+    
+		// Don't differentiate between team and non-team when not playing
+		bool theTalkingPlayerIsPlaying = ((theTalkingPlayer->GetPlayMode() == PLAYMODE_PLAYING) || (theTalkingPlayer->GetPlayMode() == PLAYMODE_AWAITINGREINFORCEMENT) || (theTalkingPlayer->GetPlayMode() == PLAYMODE_REINFORCING));
+		bool theClientIsPlaying = ((client->GetPlayMode() == PLAYMODE_PLAYING) || (client->GetPlayMode() == PLAYMODE_AWAITINGREINFORCEMENT) || (client->GetPlayMode() == PLAYMODE_REINFORCING));
+		bool theTalkerIsObserver = theTalkingPlayer->IsObserver();
+		bool theClientIsObserver = client->IsObserver();
+
+        bool theClientInReadyRoom = client->GetInReadyRoom();
+
+        if (theClientInReadyRoom != theTalkerInReadyRoom)
+        {
+            continue;
+        }
+
+        if (!theClientIsObserver || theClientIsPlaying) // Non-playing Observers hear everything.
+        {
+
+		    if ( theTalkingPlayerIsPlaying && teamonly && g_pGameRules->PlayerRelationship(client, CBaseEntity::Instance(pEntity)) != GR_TEAMMATE )
+			    continue;
+
+		    // chat can never go between play area and non-play area
+		    if(theTalkingPlayerIsPlaying != theClientIsPlaying)
+			    continue;
+
+		    // chat of any kind doesn't go from ready room to play area in tournament mode
+		    if(theTalkerInReadyRoom && GetGameRules()->GetIsTournamentMode() && theClientIsPlaying)
+			    continue;
+        
+        }
+
+		UTIL_SayText(text, client, ENTINDEX(pEntity));
+
+	}
+
+	// print to the sending client
+	UTIL_SayText(text, CBaseEntity::Instance(ENT(pEntity)));
+
+	// echo to server console
+	g_engfuncs.pfnServerPrint( text );
+
+	char * temp;
+	if ( teamonly )
+		temp = "say_team";
+	else
+		temp = "say";
+	
+	// team match?
+	if ( g_teamplay )
+	{
+		UTIL_LogPrintf( "\"%s<%i><%s><%s>\" %s \"%s\"\n", 
+			STRING( pEntity->v.netname ), 
+			GETPLAYERUSERID( pEntity ),
+#ifdef USE_UPP
+			UPPUtil_GetNetworkID(pEntity).c_str(),
+#else
+			AvHSUGetPlayerAuthIDString( pEntity ).c_str(),
+#endif
+			//g_engfuncs.pfnInfoKeyValue( g_engfuncs.pfnGetInfoKeyBuffer( pEntity ), "model" ),
+			AvHSUGetTeamName(pEntity->v.team),
+			temp,
+			p );
+	}
+	else
+	{
+		UTIL_LogPrintf( "\"%s<%i><%s><%i>\" %s \"%s\"\n", 
+			STRING( pEntity->v.netname ), 
+			GETPLAYERUSERID( pEntity ),
+#ifdef USE_UPP
+			UPPUtil_GetNetworkID(pEntity).c_str(),
+#else
+			AvHSUGetPlayerAuthIDString( pEntity ).c_str(),
+#endif
+			GETPLAYERUSERID( pEntity ),
+			temp,
+			p );
+	}
+}
+
+
+/*
+===========
+ClientCommand
+called each time a player uses a "cmd" command
+============
+*/
+
+// Use CMD_ARGV,  CMD_ARGV, and CMD_ARGC to get pointers the character string command.
+void ClientCommand( edict_t *pEntity )
+{
+	const char *pcmd = CMD_ARGV(0);
+	const char *pstr;
+
+	// Is the client spawned yet?
+	if ( !pEntity->pvPrivateData )
+		return;
+
+	entvars_t *pev = &pEntity->v;
+
+	AvHPlayer* thePlayer = GetClassPtr((AvHPlayer *)pev);
+	bool thePlayerCanAct = thePlayer->GetIsAbleToAct();
+
+	if ( FStrEq(pcmd, "say" ) )
+	{
+		Host_Say( pEntity, 0 );
+	}
+	else if ( FStrEq(pcmd, "say_team" ) )
+	{
+		Host_Say( pEntity, 1 );
+	}
+	else if ( FStrEq(pcmd, "fullupdate" ) )
+	{
+		GetClassPtr((CBasePlayer *)pev)->ForceClientDllUpdate(); 
+	}
+	else if ( FStrEq(pcmd, "give" ) )
+	{
+		if(GetGameRules()->GetCheatsEnabled())
+		{
+			int iszItem = ALLOC_STRING( CMD_ARGV(1) );	// Make a copy of the classname
+			GetClassPtr((CBasePlayer *)pev)->GiveNamedItem( STRING(iszItem) );
+		}
+	}
+
+	else if ( FStrEq(pcmd, "drop" ))
+	{
+        if (thePlayerCanAct)
+        {
+		    // player is dropping an item. 
+		    GetClassPtr((AvHPlayer *)pev)->DropItem((char *)CMD_ARGV(1));
+        }
+	}
+	else if ( FStrEq(pcmd, "fov" ) )
+	{
+		if (GetGameRules()->GetCheatsEnabled() && (CMD_ARGC() > 1))
+		{
+			GetClassPtr((CBasePlayer *)pev)->m_iFOV = atoi( CMD_ARGV(1) );
+		}
+		else
+		{
+			CLIENT_PRINTF( pEntity, print_console, UTIL_VarArgs( "\"fov\" is \"%d\"\n", (int)GetClassPtr((CBasePlayer *)pev)->m_iFOV ) );
+		}
+	}
+	else if ( FStrEq(pcmd, "use" ))
+	{
+        if (thePlayerCanAct)
+        {
+		    GetClassPtr((CBasePlayer *)pev)->SelectItem((char *)CMD_ARGV(1));
+        }
+	}
+	else if (((pstr = strstr(pcmd, "weapon_")) != NULL)  && (pstr == pcmd))
+	{
+        if (thePlayerCanAct)
+        {
+		    GetClassPtr((CBasePlayer *)pev)->SelectItem(pcmd);
+        }
+	}
+//	else if (FStrEq(pcmd, "lastinv" ))
+//	{
+//      if (thePlayerCanAct)
+//      {
+//		    GetClassPtr((CBasePlayer *)pev)->SelectLastItem();
+//      }
+//	}
+//	else if ( FStrEq( pcmd, "spectate" ) && (pev->flags & FL_PROXY) )	// added for proxy support
+//	{
+//		CBasePlayer * pPlayer = GetClassPtr((CBasePlayer *)pev);
+//
+//		edict_t *pentSpawnSpot = g_pGameRules->GetPlayerSpawnSpot( pPlayer );
+//		pPlayer->StartObserver( pev->origin, VARS(pentSpawnSpot)->angles);
+//	}
+	else if ( g_pGameRules->ClientCommand( GetClassPtr((CBasePlayer *)pev), pcmd ) )
+	{
+		// MenuSelect returns true only if the command is properly handled,  so don't print a warning
+	}
+	else if ( FStrEq( pcmd, "specmode" )  )	// new spectator mode
+	{
+		CBasePlayer * pPlayer = GetClassPtr((CBasePlayer *)pev);
+		if ( pPlayer->IsObserver() )
+		{
+            int theMode = atoi(CMD_ARGV(1));
+			pPlayer->Observer_SetMode(theMode);
+			pPlayer->SetDefaultSpectatingSettings(pPlayer->pev->iuser1, pPlayer->pev->iuser2);
+		}
+	}
+    else if (FStrEq( pcmd, "follow")) // follow a specific player
+    {
+		CBasePlayer * pPlayer = GetClassPtr((CBasePlayer *)pev);
+		if ( pPlayer->IsObserver() )
+		{
+			pPlayer->Observer_SpectatePlayer(atoi( CMD_ARGV(1) ));
+			pPlayer->SetDefaultSpectatingSettings(pPlayer->pev->iuser1, pPlayer->pev->iuser2);
+		}
+    }
+	else if ( FStrEq( pcmd, "follownext" )  )	// follow next player
+	{
+		CBasePlayer * pPlayer = GetClassPtr((CBasePlayer *)pev);
+		if ( pPlayer->IsObserver() )
+		{
+			pPlayer->Observer_FindNextPlayer(atoi( CMD_ARGV(1) ));
+			pPlayer->SetDefaultSpectatingSettings(pPlayer->pev->iuser1, pPlayer->pev->iuser2);
+		}
+	}
+	else
+	{
+		// tell the user they entered an unknown command
+		char command[128];
+
+		// check the length of the command (prevents crash)
+		// max total length is 192 ...and we're adding a string below ("Unknown command: %s\n")
+		strncpy( command, pcmd, 127 );
+		command[127] = '\0';
+
+		// tell the user they entered an unknown command
+		ClientPrint( &pEntity->v, HUD_PRINTCONSOLE, UTIL_VarArgs( "Unknown command: %s\n", command ) );
+	}
+    //else if(!AvHClientCommand(pEntity))
+    //{
+	//	// tell the user they entered an unknown command
+	//	ClientPrint( &pEntity->v, HUD_PRINTCONSOLE, UTIL_VarArgs( "Unknown command: %s\n", pcmd ) );
+	//}
+}
+
+//bool AvHClientCommand( edict_t *pEntity )
+//{
+//}
+
+/*
+========================
+ClientUserInfoChanged
+
+called after the player changes
+userinfo - gives dll a chance to modify it before
+it gets sent into the rest of the engine.
+========================
+*/
+void ClientUserInfoChanged( edict_t *pEntity, char *infobuffer )
+{
+	// Is the client spawned yet?
+	if ( !pEntity->pvPrivateData )
+		return;
+
+	const char* theCurrentNetName = STRING(pEntity->v.netname);
+	const char* theNameKeyValue = g_engfuncs.pfnInfoKeyValue(infobuffer, "name");
+	
+	// msg everyone if someone changes their name,  and it isn't the first time (changing no name to current name)
+	if ( pEntity->v.netname && STRING(pEntity->v.netname)[0] != 0 && !FStrEq(theCurrentNetName, theNameKeyValue) )
+	{
+		AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(pEntity));
+		
+		// Don't change player info after match has started unless player hasn't left ready room
+		if(!GetGameRules()->GetArePlayersAllowedToJoinImmediately() && thePlayer && theNameKeyValue && thePlayer->GetHasLeftReadyRoom())
+		{
+			thePlayer->SetDesiredNetName(string(theNameKeyValue));
+			
+			char text[256];
+			sprintf( text, "* Name will be changed to %s next game.\n", theNameKeyValue);
+			UTIL_SayText(text, CBaseEntity::Instance(ENT(pEntity)));
+			
+			// Restore name key value changed by engine
+			char theName[256];
+			strcpy(theName, theCurrentNetName);
+			g_engfuncs.pfnSetClientKeyValue( ENTINDEX(pEntity), infobuffer, "name", theName);
+		}
+		else
+		{
+			char sName[256];
+			char *pName = g_engfuncs.pfnInfoKeyValue( infobuffer, "name" );
+			strncpy( sName, pName, sizeof(sName) - 1 );
+			sName[ sizeof(sName) - 1 ] = '\0';
+			
+			// First parse the name and remove any %'s
+			for ( char *pApersand = sName; pApersand != NULL && *pApersand != 0; pApersand++ )
+			{
+				// Replace it with a space
+				if ( *pApersand == '%' )
+					*pApersand = ' ';
+			}
+			
+			// Set the name
+			g_engfuncs.pfnSetClientKeyValue( ENTINDEX(pEntity), infobuffer, "name", sName );
+			//thePlayer->SetDesiredNetName(MAKE_STRING(sName));
+			
+			char text[256];
+			sprintf( text, "* %s changed name to %s\n", STRING(pEntity->v.netname), g_engfuncs.pfnInfoKeyValue( infobuffer, "name" ) );
+
+			UTIL_SayTextAll(text, CBaseEntity::Instance(ENT(pEntity)));
+			
+			// team match?
+			if ( g_teamplay )
+			{
+				UTIL_LogPrintf( "\"%s<%i><%s><%s>\" changed name to \"%s\"\n", 
+					STRING( pEntity->v.netname ), 
+					GETPLAYERUSERID( pEntity ), 
+#ifdef USE_UPP
+					UPPUtil_GetNetworkID(pEntity).c_str(),
+#else
+					AvHSUGetPlayerAuthIDString( pEntity ).c_str(),
+#endif
+					g_engfuncs.pfnInfoKeyValue( infobuffer, "model" ), 
+					g_engfuncs.pfnInfoKeyValue( infobuffer, "name" ) );
+			}
+			else
+			{
+				UTIL_LogPrintf( "\"%s<%i><%s><%i>\" changed name to \"%s\"\n", 
+					STRING( pEntity->v.netname ), 
+					GETPLAYERUSERID( pEntity ), 
+#ifdef USE_UPP
+					UPPUtil_GetNetworkID(pEntity).c_str(),
+#else
+					AvHSUGetPlayerAuthIDString( pEntity ).c_str(),
+#endif
+					GETPLAYERUSERID( pEntity ), 
+					g_engfuncs.pfnInfoKeyValue( infobuffer, "name" ) );
+			}
+		}
+	}
+
+	g_pGameRules->ClientUserInfoChanged( GetClassPtr((CBasePlayer *)&pEntity->v), infobuffer );
+}
+
+static int g_serveractive = 0;
+
+void ServerDeactivate( void )
+{
+	// It's possible that the engine will call this function more times than is necessary
+	//  Therefore, only run it one time for each call to ServerActivate 
+	if ( g_serveractive != 1 )
+	{
+		return;
+	}
+
+	g_serveractive = 0;
+
+	// Peform any shutdown operations here...
+	//
+}
+
+void ServerActivate( edict_t *pEdictList, int edictCount, int clientMax )
+{
+	int				i;
+	CBaseEntity		*pClass;
+
+	// Every call to ServerActivate should be matched by a call to ServerDeactivate
+	g_serveractive = 1;
+
+	// Clients have not been initialized yet
+	for ( i = 0; i < edictCount; i++ )
+	{
+		if ( pEdictList[i].free )
+			continue;
+		
+		// Clients aren't necessarily initialized until ClientPutInServer()
+		if ( i < clientMax || !pEdictList[i].pvPrivateData )
+			continue;
+
+		pClass = CBaseEntity::Instance( &pEdictList[i] );
+		// Activate this entity if it's got a class & isn't dormant
+		if ( pClass && !(pClass->pev->flags & FL_DORMANT) )
+		{
+			pClass->Activate();
+		}
+		else
+		{
+			ALERT( at_console, "Can't instance %s\n", STRING(pEdictList[i].v.classname) );
+		}
+	}
+
+	// Link user messages here to make sure first client can get them...
+	LinkUserMessages();
+}
+
+
+/*
+================
+PlayerPreThink
+
+Called every frame before physics are run
+================
+*/
+void PlayerPreThink( edict_t *pEntity )
+{
+	entvars_t *pev = &pEntity->v;
+	CBasePlayer *pPlayer = (CBasePlayer *)GET_PRIVATE(pEntity);
+
+	if (pPlayer)
+		pPlayer->PreThink( );
+}
+
+/*
+================
+PlayerPostThink
+
+Called every frame after physics are run
+================
+*/
+void PlayerPostThink( edict_t *pEntity )
+{
+	entvars_t *pev = &pEntity->v;
+	CBasePlayer *pPlayer = (CBasePlayer *)GET_PRIVATE(pEntity);
+
+	if (pPlayer)
+		pPlayer->PostThink( );
+}
+
+
+
+void ParmsNewLevel( void )
+{
+}
+
+
+void ParmsChangeLevel( void )
+{
+	// retrieve the pointer to the save data
+	SAVERESTOREDATA *pSaveData = (SAVERESTOREDATA *)gpGlobals->pSaveData;
+
+	if ( pSaveData )
+		pSaveData->connectionCount = BuildChangeList( pSaveData->levelList, MAX_LEVEL_CONNECTIONS );
+}
+
+void ShowMenu(entvars_s *pev, int ValidSlots, int DisplayTime, BOOL ShowLater, char Menu[500])
+{
+	MESSAGE_BEGIN(MSG_ONE, gmsgShowMenu, NULL, pev);	// Begin our message to the client dll
+		WRITE_SHORT(ValidSlots);	// Which are the valid slots
+		WRITE_CHAR(DisplayTime);	// For how long? (0 = until selection)
+		WRITE_BYTE(ShowLater);	// Show later? (TRUE or FALSE)
+		WRITE_STRING(Menu);	// And our menu
+	MESSAGE_END();	// End the message
+}
+
+//
+// GLOBALS ASSUMED SET:  g_ulFrameCount
+//
+void StartFrame( void )
+{
+	if ( g_pGameRules )
+		g_pGameRules->Think();
+
+	if ( g_fGameOver )
+		return;
+
+// New SDK changes
+//	gpGlobals->teamplay = CVAR_GET_FLOAT("teamplay");
+//	gpGlobals->deathmatch = CVAR_GET_FLOAT("deathmatch");
+//	g_iSkillLevel = CVAR_GET_FLOAT("skill");
+	gpGlobals->teamplay = teamplay.value;
+
+	g_ulFrameCount++;
+}
+
+//void PrecacheFootsteps(const char* inBaseName, int inNumber, bool inPrecacheAlienAlso = true)
+//{
+//	string theBaseString = kFootstepDirectory + kConcreteBaseName;
+//
+//	for(int i = 1; i <= inNumber; i++)
+//	{
+//		char theFilename[128];
+//		sprintf(theFilename, "%s%d.wav", theBaseString.c_str(), i);
+//
+//	}
+//	//PRECACHE_SOUND("player/pl_step1.wav");		// walk on concrete
+//	
+//}
+
+void ClientPrecache( void )
+{
+	// Precache sound lists for all player types
+	gSoundListManager.Clear();
+
+	#ifndef AVH_MAPPER_BUILD
+	for(int i = ((int)AVH_USER3_NONE + 1); i < (int)AVH_USER3_ALIEN_EMBRYO; i++)
+	{
+		char theSoundListName[256];
+		bool theIsAlien = (i > 3);
+		AvHUser3 theUser3 = (AvHUser3)(i);
+
+		bool theLoadSounds = false;
+
+		// No squad leader and commander sounds
+		switch(theUser3)
+		{
+		case AVH_USER3_MARINE_PLAYER:
+		case AVH_USER3_ALIEN_PLAYER1:
+		case AVH_USER3_ALIEN_PLAYER2:
+		case AVH_USER3_ALIEN_PLAYER3:
+		case AVH_USER3_ALIEN_PLAYER4:
+		case AVH_USER3_ALIEN_PLAYER5:
+			theLoadSounds = true;
+		}
+
+		if(theLoadSounds)
+		{
+			// Die sounds
+			sprintf(theSoundListName, kPlayerLevelDieSoundList, i);
+			gSoundListManager.PrecacheSoundList(theSoundListName);
+			
+			// Spawn sounds
+			sprintf(theSoundListName, kPlayerLevelSpawnSoundList, i);
+			gSoundListManager.PrecacheSoundList(theSoundListName);
+			
+			// Pain sounds
+			sprintf(theSoundListName, kPlayerLevelPainSoundList, i);
+			gSoundListManager.PrecacheSoundList(theSoundListName);
+			
+			// Wound sounds
+			sprintf(theSoundListName, kPlayerLevelWoundSoundList, i);
+			gSoundListManager.PrecacheSoundList(theSoundListName);
+			
+			// Attack sounds (aliens only)
+			if(theIsAlien)
+			{
+				sprintf(theSoundListName, kPlayerLevelAttackSoundList, i);
+				gSoundListManager.PrecacheSoundList(theSoundListName);
+				
+				// Idle sounds
+				sprintf(theSoundListName, kPlayerLevelIdleSoundList, i);
+				gSoundListManager.PrecacheSoundList(theSoundListName);
+				
+				// Movement sounds
+				sprintf(theSoundListName, kPlayerLevelMoveSoundList, i);
+				gSoundListManager.PrecacheSoundList(theSoundListName);
+			}
+		}
+	}
+
+	// Precache misc. alien sounds
+	//PRECACHE_SOUND(kAdrenalineSound);
+	PRECACHE_UNMODIFIED_SOUND(kGestationSound);
+	PRECACHE_UNMODIFIED_SOUND(kEggDestroyedSound);
+	PRECACHE_UNMODIFIED_SOUND(kEggIdleSound);
+	PRECACHE_UNMODIFIED_SOUND(kPrimalScreamResponseSound);
+	
+	// Preacache sayings sound list
+	for(i = 1; i <= 9; i++)
+	{
+		char theSoundListName[256];
+
+		sprintf(theSoundListName, kSoldierSayingList, i);
+		gSoundListManager.PrecacheSoundList(theSoundListName);
+
+		sprintf(theSoundListName, kCommanderSayingList, i);
+		gSoundListManager.PrecacheSoundList(theSoundListName);
+		
+		sprintf(theSoundListName, kAlienSayingList, i);
+		gSoundListManager.PrecacheSoundList(theSoundListName);
+	}
+
+	// Precache order sounds
+	gSoundListManager.PrecacheSoundList(kSoldierOrderRequestList);
+	gSoundListManager.PrecacheSoundList(kSoldierOrderAckList);
+
+	// Precache other sound lists
+	gSoundListManager.PrecacheSoundList(kResourceTowerSoundList);
+	gSoundListManager.PrecacheSoundList(kAlienResourceTowerSoundList);
+	gSoundListManager.PrecacheSoundList(kHiveWoundSoundList);
+	gSoundListManager.PrecacheSoundList(kMarineConstructionSoundList);
+	gSoundListManager.PrecacheSoundList(kElectricSparkSoundList);
+	gSoundListManager.PrecacheSoundList(kAlienConstructionSoundList);
+
+	// Other equipment and effect sounds
+	PRECACHE_UNMODIFIED_SOUND(kMarineBuildingDeploy);
+	PRECACHE_UNMODIFIED_SOUND(kJetpackSound);
+	PRECACHE_UNMODIFIED_SOUND(kWeldingSound);
+	PRECACHE_UNMODIFIED_SOUND(kWeldingHitSound);
+	//PRECACHE_UNMODIFIED_SOUND(kOverwatchStartSound);
+	//PRECACHE_UNMODIFIED_SOUND(kOverwatchEndSound);
+	PRECACHE_UNMODIFIED_SOUND(kRegenerationSound);
+	PRECACHE_UNMODIFIED_SOUND(kStartCloakSound);
+	PRECACHE_UNMODIFIED_SOUND(kEndCloakSound);
+	//PRECACHE_UNMODIFIED_SOUND(kWallJumpSound);
+	PRECACHE_UNMODIFIED_SOUND(kWingFlapSound1);
+	PRECACHE_UNMODIFIED_SOUND(kWingFlapSound2);
+	PRECACHE_UNMODIFIED_SOUND(kWingFlapSound3);
+	PRECACHE_UNMODIFIED_SOUND(kSiegeHitSound1);
+	PRECACHE_UNMODIFIED_SOUND(kSiegeHitSound2);
+	#endif
+	
+	// setup precaches always needed
+	PRECACHE_UNMODIFIED_SOUND("player/sprayer.wav");			// spray paint sound for PreAlpha
+	
+	// PRECACHE_SOUND("player/pl_jumpland2.wav");		// UNDONE: play 2x step sound
+
+	// Alien step sounds
+	PRECACHE_UNMODIFIED_SOUND("player/pl_step1-a.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_step2-a.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_step3-a.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_step4-a.wav");
+
+	PRECACHE_UNMODIFIED_SOUND("player/pl_step1-a1.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_step2-a1.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_step3-a1.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_step4-a1.wav");
+
+	PRECACHE_UNMODIFIED_SOUND("player/pl_step1-a5.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_step2-a5.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_step3-a5.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_step4-a5.wav");
+
+	PRECACHE_UNMODIFIED_SOUND("player/pl_step1-h.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_step2-h.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_step3-h.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_step4-h.wav");
+
+	// Marine step sounds
+	PRECACHE_UNMODIFIED_SOUND("player/pl_fallpain3-1.wav");		
+	PRECACHE_UNMODIFIED_SOUND("player/pl_fallpain3-2.wav");		
+	PRECACHE_UNMODIFIED_SOUND("player/pl_fallpain3-3.wav");		
+	PRECACHE_UNMODIFIED_SOUND("player/pl_fallpain3-4.wav");		
+	PRECACHE_UNMODIFIED_SOUND("player/pl_fallpain3-5.wav");		
+	PRECACHE_UNMODIFIED_SOUND("player/pl_fallpain3-6.wav");		
+	PRECACHE_UNMODIFIED_SOUND("player/pl_fallpain3-7.wav");		
+	PRECACHE_UNMODIFIED_SOUND("player/pl_fallpain3-8.wav");		
+	PRECACHE_UNMODIFIED_SOUND(kDigestingSound);
+
+	PRECACHE_UNMODIFIED_SOUND("player/pl_step1.wav");		// walk on concrete
+	PRECACHE_UNMODIFIED_SOUND("player/pl_step2.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_step3.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_step4.wav");
+
+	PRECACHE_SOUND("common/npc_step1.wav");		// NPC walk on concrete
+	PRECACHE_SOUND("common/npc_step2.wav");
+	PRECACHE_SOUND("common/npc_step3.wav");
+	PRECACHE_SOUND("common/npc_step4.wav");
+
+	PRECACHE_UNMODIFIED_SOUND("player/pl_metal1.wav");		// walk on metal
+	PRECACHE_UNMODIFIED_SOUND("player/pl_metal2.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_metal3.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_metal4.wav");
+
+	PRECACHE_UNMODIFIED_SOUND("player/pl_dirt1.wav");		// walk on dirt
+	PRECACHE_UNMODIFIED_SOUND("player/pl_dirt2.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_dirt3.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_dirt4.wav");
+
+	PRECACHE_UNMODIFIED_SOUND("player/pl_duct1.wav");		// walk in duct
+	PRECACHE_UNMODIFIED_SOUND("player/pl_duct2.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_duct3.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_duct4.wav");
+
+	PRECACHE_UNMODIFIED_SOUND("player/pl_grate1.wav");		// walk on grate
+	PRECACHE_UNMODIFIED_SOUND("player/pl_grate2.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_grate3.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_grate4.wav");
+
+	PRECACHE_UNMODIFIED_SOUND("player/pl_slosh1.wav");		// walk in shallow water
+	PRECACHE_UNMODIFIED_SOUND("player/pl_slosh2.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_slosh3.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_slosh4.wav");
+
+	PRECACHE_UNMODIFIED_SOUND("player/pl_tile1.wav");		// walk on tile
+	PRECACHE_UNMODIFIED_SOUND("player/pl_tile2.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_tile3.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_tile4.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_tile5.wav");
+
+	PRECACHE_UNMODIFIED_SOUND("player/pl_swim1.wav");		// breathe bubbles
+	PRECACHE_UNMODIFIED_SOUND("player/pl_swim2.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_swim3.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_swim4.wav");
+
+	PRECACHE_UNMODIFIED_SOUND("player/pl_ladder1.wav");	// climb ladder rung
+	PRECACHE_UNMODIFIED_SOUND("player/pl_ladder2.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_ladder3.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_ladder4.wav");
+
+	PRECACHE_UNMODIFIED_SOUND("player/pl_wade1.wav");		// wade in water
+	PRECACHE_UNMODIFIED_SOUND("player/pl_wade2.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_wade3.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_wade4.wav");
+
+	PRECACHE_SOUND("debris/wood1.wav");			// hit wood texture
+	PRECACHE_SOUND("debris/wood2.wav");
+	PRECACHE_SOUND("debris/wood3.wav");
+
+	PRECACHE_UNMODIFIED_SOUND("plats/train_use1.wav");		// use a train
+
+	PRECACHE_UNMODIFIED_SOUND("buttons/spark5.wav");		// hit computer texture
+	PRECACHE_UNMODIFIED_SOUND("buttons/spark6.wav");
+	PRECACHE_SOUND("debris/glass1.wav");
+	PRECACHE_SOUND("debris/glass2.wav");
+	PRECACHE_SOUND("debris/glass3.wav");
+
+	PRECACHE_UNMODIFIED_SOUND( SOUND_FLASHLIGHT_ON );
+	PRECACHE_UNMODIFIED_SOUND( SOUND_FLASHLIGHT_OFF );
+
+// player gib sounds
+	PRECACHE_SOUND("common/bodysplat.wav");		               
+
+// player pain sounds
+	PRECACHE_UNMODIFIED_SOUND("player/pl_pain2.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_pain4.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_pain5.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_pain6.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/pl_pain7.wav");
+
+	PRECACHE_UNMODIFIED_MODEL("models/player.mdl");
+	PRECACHE_UNMODIFIED_MODEL(kReadyRoomModel);
+
+	PRECACHE_UNMODIFIED_MODEL(kMarineSoldierModel);
+	PRECACHE_UNMODIFIED_MODEL(kHeavySoldierModel);
+	PRECACHE_UNMODIFIED_MODEL(kAlienLevelOneModel);
+
+	PRECACHE_UNMODIFIED_MODEL(kAlienLevelTwoModel);
+	PRECACHE_UNMODIFIED_MODEL(kAlienLevelThreeModel);
+	PRECACHE_UNMODIFIED_MODEL(kAlienLevelFourModel);
+	PRECACHE_UNMODIFIED_MODEL(kAlienLevelFiveModel);
+
+    PRECACHE_UNMODIFIED_MODEL(kMarineCommanderModel);
+    PRECACHE_UNMODIFIED_MODEL(kAlienGestateModel);
+
+
+	// hud sounds, for marines and aliens (change AvHSharedUtil::AvHSHUGetCommonSoundName if these sound names change)
+	PRECACHE_UNMODIFIED_SOUND("common/wpn_hudoff.wav");
+	PRECACHE_UNMODIFIED_SOUND("common/wpn_hudon.wav");
+	PRECACHE_UNMODIFIED_SOUND("common/wpn_moveselect.wav");
+	PRECACHE_UNMODIFIED_SOUND("common/wpn_select.wav");
+	PRECACHE_UNMODIFIED_SOUND("common/wpn_denyselect.wav");
+
+	PRECACHE_UNMODIFIED_SOUND("common/wpn_hudoff-a.wav");
+	PRECACHE_UNMODIFIED_SOUND("common/wpn_hudon-a.wav");
+	PRECACHE_UNMODIFIED_SOUND("common/wpn_moveselect-a.wav");
+
+	PRECACHE_UNMODIFIED_SOUND("common/wpn_select-a.wav");
+	PRECACHE_UNMODIFIED_SOUND("common/wpn_denyselect-a.wav");
+	
+	// geiger sounds
+	PRECACHE_UNMODIFIED_SOUND("player/geiger6.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/geiger5.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/geiger4.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/geiger3.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/geiger2.wav");
+	PRECACHE_UNMODIFIED_SOUND("player/geiger1.wav");
+
+	PRECACHE_UNMODIFIED_MODEL("sprites/muzzleflash1.spr");
+	PRECACHE_UNMODIFIED_MODEL("sprites/muzzleflash2.spr"); 
+	PRECACHE_UNMODIFIED_MODEL("sprites/muzzleflash3.spr"); 
+	PRECACHE_UNMODIFIED_MODEL("sprites/digesting.spr"); 
+	PRECACHE_UNMODIFIED_MODEL("sprites/membrane.spr"); 
+	PRECACHE_UNMODIFIED_MODEL("sprites/hera_fog.spr"); 
+	PRECACHE_UNMODIFIED_MODEL("sprites/spore.spr"); 
+	PRECACHE_UNMODIFIED_MODEL("sprites/spore2.spr"); 
+	PRECACHE_UNMODIFIED_MODEL("sprites/umbra.spr"); 
+	PRECACHE_UNMODIFIED_MODEL("sprites/umbra2.spr"); 
+	PRECACHE_UNMODIFIED_MODEL("sprites/webstrand.spr"); 
+	
+	if (giPrecacheGrunt)
+		UTIL_PrecacheOther("monster_human_grunt");
+
+}
+
+/*
+================
+Sys_Error
+
+  Engine is going to shut down, allows setting a breakpoint in game .dll to catch that occasion
+  ================
+  */
+  void Sys_Error( const char *error_string )
+  {
+#ifdef DEBUG	  
+#ifdef WIN32
+		// Default case, do nothing.  MOD AUTHORS:  Add code ( e.g., _asm { int 3 }; here to cause a breakpoint for debugging your game .dlls
+		_asm { int 3 };
+#endif
+#else
+		char theDebugString[2056];
+		sprintf(theDebugString, "Sys_Error: %s\n", error_string);
+		ALERT(at_error, theDebugString); 
+#endif
+
+}
+
+/*
+===============
+GetGameDescription
+
+Returns the descriptive name of this .dll.  E.g., Half-Life, or Team Fortress 2
+===============
+*/
+const char *GetGameDescription()
+{
+	if ( g_pGameRules ) // this function may be called before the world has spawned, and the game rules initialized
+		return g_pGameRules->GetGameDescription();
+	else
+		return "Half-Life";
+}
+
+/*
+================
+PlayerCustomization
+
+A new player customization has been registered on the server
+UNDONE:  This only sets the # of frames of the spray can logo
+animation right now.
+================
+*/
+void PlayerCustomization( edict_t *pEntity, customization_t *pCust )
+{
+	entvars_t *pev = &pEntity->v;
+	CBasePlayer *pPlayer = (CBasePlayer *)GET_PRIVATE(pEntity);
+
+	if (!pPlayer)
+	{
+		ALERT(at_console, "PlayerCustomization:  Couldn't get player!\n");
+		return;
+	}
+
+	if (!pCust)
+	{
+		ALERT(at_console, "PlayerCustomization:  NULL customization!\n");
+		return;
+	}
+
+	switch (pCust->resource.type)
+	{
+	case t_decal:
+		pPlayer->SetCustomDecalFrames(pCust->nUserData2); // Second int is max # of frames.
+		break;
+	case t_sound:
+	case t_skin:
+	case t_model:
+		// Ignore for now.
+		break;
+	default:
+		ALERT(at_console, "PlayerCustomization:  Unknown customization type!\n");
+		break;
+	}
+}
+
+/*
+================
+SpectatorConnect
+
+A spectator has joined the game
+================
+*/
+void SpectatorConnect( edict_t *pEntity )
+{
+	entvars_t *pev = &pEntity->v;
+	CBaseSpectator *pPlayer = (CBaseSpectator *)GET_PRIVATE(pEntity);
+
+	if (pPlayer)
+		pPlayer->SpectatorConnect( );
+}
+
+/*
+================
+SpectatorConnect
+
+A spectator has left the game
+================
+*/
+void SpectatorDisconnect( edict_t *pEntity )
+{
+	entvars_t *pev = &pEntity->v;
+	CBaseSpectator *pPlayer = (CBaseSpectator *)GET_PRIVATE(pEntity);
+
+	if (pPlayer)
+		pPlayer->SpectatorDisconnect( );
+}
+
+/*
+================
+SpectatorConnect
+
+A spectator has sent a usercmd
+================
+*/
+void SpectatorThink( edict_t *pEntity )
+{
+	entvars_t *pev = &pEntity->v;
+	CBaseSpectator *pPlayer = (CBaseSpectator *)GET_PRIVATE(pEntity);
+
+	if (pPlayer)
+		pPlayer->SpectatorThink( );
+}
+
+////////////////////////////////////////////////////////
+// PAS and PVS routines for client messaging
+//
+
+/*
+================
+SetupVisibility
+
+A client can have a separate "view entity" indicating that his/her view should depend on the origin of that
+view entity.  If that's the case, then pViewEntity will be non-NULL and will be used.  Otherwise, the current
+entity's origin is used.  Either is offset by the view_ofs to get the eye position.
+
+From the eye position, we set up the PAS and PVS to use for filtering network messages to the client.  At this point, we could
+ override the actual PAS or PVS values, or use a different origin.
+
+NOTE:  Do not cache the values of pas and pvs, as they depend on reusable memory in the engine, they are only good for this one frame
+================
+*/
+void SetupVisibility( edict_t *pViewEntity, edict_t *pClient, unsigned char **pvs, unsigned char **pas )
+{
+	Vector org;
+	edict_t *pView = pClient;
+	bool theUseSpecialPASOrigin = false;
+	Vector theSpecialPASOrigin;
+
+	// Find the client's PVS
+	if ( pViewEntity )
+	{
+		pView = pViewEntity;
+	}
+
+	// Proxy sees and hears all
+	if ( (pClient->v.flags & FL_PROXY) || GetGameRules()->GetIsCheatEnabled(kcViewAll))
+	{
+		//ALERT(at_logged, "Setting PVS and PAS to NULL for FL_PROXY\n");
+		*pvs = NULL;	// the spectator proxy sees
+		*pas = NULL;	// and hears everything
+		return;
+	}
+
+	// Tracking Spectators use the visibility of their target
+	CBasePlayer *pPlayer = (CBasePlayer *)CBaseEntity::Instance( pClient );
+	if ( (pPlayer->pev->iuser2 != 0) && (pPlayer->m_hObserverTarget != NULL) &&  (pPlayer->m_afPhysicsFlags & PFLAG_OBSERVER) && pPlayer->IsAlive())
+	{
+		pView = pPlayer->m_hObserverTarget->edict();
+		UTIL_SetOrigin( pPlayer->pev, pPlayer->m_hObserverTarget->pev->origin );
+	}
+
+	// Tracking Spectators use the visibility of their target
+//	AvHPlayer *thePlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(pClient));
+
+	// cgc - something could be wrong here, crashing from Robin's spectator code...did I do something wrong?
+//	if(thePlayer)
+//	{
+//		if ( (thePlayer->pev->iuser2 != 0) && (thePlayer->m_hObserverTarget != NULL) )
+//		{
+//			pView = thePlayer->m_hObserverTarget->edict();
+//		}
+//
+//		if(thePlayer->GetRole() == ROLE_COMMANDER)
+//		{
+//			thePlayer->GetSpecialPASOrigin(theSpecialPASOrigin);
+//			theUseSpecialPASOrigin = true;
+//		}
+//	}
+
+	org = pView->v.origin + pView->v.view_ofs;
+	if ( pView->v.flags & FL_DUCKING )
+	{
+		org = org + ( VEC_HULL_MIN - VEC_DUCK_HULL_MIN );
+	}
+
+	*pvs = ENGINE_SET_PVS ( (float *)&org );
+
+	if(theUseSpecialPASOrigin)
+	{
+		*pas = ENGINE_SET_PAS ( (float *)&theSpecialPASOrigin );
+	}
+	else
+	{
+		*pas = ENGINE_SET_PAS ( (float *)&org );
+	}
+}
+
+#include "entity_state.h"
+
+//CachedEntity	gCachedEntities[kMaxPlayers][kMaxEntities];
+//
+//void ResetCachedEntities()
+//{
+//	for(int i = 0; i < kMaxPlayers; i++)
+//	{
+//		for(int j = 0; j < kMaxEntities; j++)
+//		{
+//			gCachedEntities[i][j].ResetCachedEntity();
+//		}
+//	}
+//}
+
+
+
+// Array sizes ( memory is 5624 * 32 = 179968 bytes )
+#define MAX_CLIENTS  ( 32 )
+#define MAX_ENTITIES ( 900 + MAX_CLIENTS * 15 )
+
+// Re-check entities only this often once they are found to be in the PVS
+// NOTE:  We could have a separate timeout for players if we wanted to tweak the coherency time for them ( you'd have
+//  to check the entitynum against 1 to gpGlobals->maxclients ), etc.
+//#define PVS_COHERENCY_TIME 1.0f
+
+extern float kPVSCoherencyTime;
+
+typedef struct
+{
+	bool	mLastVisibility;
+	float	m_fTimeEnteredPVS;
+} ENTITYPVSSTATUS;
+
+typedef struct
+{
+	ENTITYPVSSTATUS m_Status[ MAX_ENTITIES ];
+	
+	// Remember player leaf data so we can invalidate pvs history when leaf changes
+	int   headnode;   // -1 to use normal leaf check
+	int   num_leafs;
+	short  leafnums[ MAX_ENT_LEAFS ];
+	
+} PLAYERPVSSTATUS;
+
+static PLAYERPVSSTATUS g_PVSStatus[ MAX_CLIENTS ];
+
+void ResetPlayerPVS( edict_t *client, int clientnum )
+{
+	ASSERT( clientnum >=0 && clientnum < MAX_CLIENTS );
+	
+	PLAYERPVSSTATUS *pvs = &g_PVSStatus[ clientnum ];
+	
+	memset( pvs, 0, sizeof( PLAYERPVSSTATUS ) );
+	
+	// Copy leaf data in right away
+	pvs->headnode = client->headnode;
+	pvs->num_leafs = client->num_leafs;
+	memcpy( pvs->leafnums, client->leafnums, sizeof( pvs->leafnums ) );
+}
+
+bool TimeToResetPVS( edict_t *client, int clientnum )
+{
+	ASSERT( clientnum >=0 && clientnum < MAX_CLIENTS );
+	
+	PLAYERPVSSTATUS *pvs = &g_PVSStatus[ clientnum ];
+	
+	if ( (pvs->headnode != client->headnode) || (pvs->num_leafs != client->num_leafs))
+		return true;
+	
+	if ( client->num_leafs > 0 )
+	{
+		for ( int i = 0; i < client->num_leafs; i++ )
+		{
+			if ( client->leafnums[ i ] != pvs->leafnums[ i ] )
+			{
+				return true;
+			}
+		}
+	}
+	
+	// Still the same
+	return false;
+}
+
+void MarkEntityInPVS( int clientnum, int entitynum, float time, bool inpvs )
+{
+	ASSERT( clientnum >=0 && clientnum < MAX_CLIENTS );
+	ASSERT( entitynum >= 0 && entitynum < MAX_ENTITIES );
+	
+	PLAYERPVSSTATUS *pvs = &g_PVSStatus[ clientnum ];
+	ENTITYPVSSTATUS *es  = &pvs->m_Status[ entitynum ];
+	
+	es->m_fTimeEnteredPVS = time;
+	es->mLastVisibility = inpvs;
+}
+
+bool GetTimeToRecompute( int clientnum, int entitynum, float currenttime, bool& outCachedVisibility)
+{
+	ASSERT( clientnum >=0 && clientnum < MAX_CLIENTS );
+	ASSERT( entitynum >= 0 && entitynum < MAX_ENTITIES );
+	
+	PLAYERPVSSTATUS *pvs = &g_PVSStatus[ clientnum ];
+	ENTITYPVSSTATUS *es = &pvs->m_Status[ entitynum ];
+
+	bool theTimeToRecompute = false;
+
+	int theUseCaching = BALANCE_IVAR(kDebugServerCaching);
+	if(theUseCaching)
+	{
+		// Always recompute players?
+		if((entitynum > 0) && (entitynum < MAX_CLIENTS))
+		{
+			theTimeToRecompute = true;
+		}
+		// If we haven't computed for awhile, or our PVS has been reset
+		else if((currenttime > (es->m_fTimeEnteredPVS + kPVSCoherencyTime)) || (es->m_fTimeEnteredPVS == 0.0f))
+		{
+			theTimeToRecompute = true;
+		}
+		else
+		{
+			outCachedVisibility = es->mLastVisibility; 
+		}
+	}
+	else
+	{
+		theTimeToRecompute = true;
+	}
+
+	return theTimeToRecompute;
+}
+
+bool CheckEntityRecentlyInPVS( int clientnum, int entitynum, float currenttime )
+{
+	ASSERT( clientnum >=0 && clientnum < MAX_CLIENTS );
+	ASSERT( entitynum >= 0 && entitynum < MAX_ENTITIES );
+	
+	PLAYERPVSSTATUS *pvs = &g_PVSStatus[ clientnum ];
+	ENTITYPVSSTATUS *es = &pvs->m_Status[ entitynum ];
+ 
+	int theUseCaching = BALANCE_IVAR(kDebugServerCaching);
+	if(!theUseCaching)
+	{
+		return false;
+	}
+	
+	// Wasn't in pvs before, sigh...
+	if ( es->m_fTimeEnteredPVS == 0.0f )
+	{
+		return false;
+	}
+	
+	// If we've been saying yes for kPVSCoherencyTime, say no now instead so that we'll do a full check
+	if ( es->m_fTimeEnteredPVS + kPVSCoherencyTime < currenttime )
+	{
+		return false;
+	}
+	
+	// Keep assuming it's in the pvs for a bit of time (trivial inclusion)
+	return true;
+}
+
+
+int kNumReturn0 = 0;
+int kNumReturn1 = 0;
+int kNumCached = 0;
+int kNumComputed = 0;
+int kMaxE = 0;
+int kNumEntsProcessedForPlayerOne = 0;
+int kMaxEProcessedForPlayerOne = 0;
+extern int kServerFrameRate;
+
+// ENGINE_CHECK_VISIBILITY, from Yahn, with his comments:
+// 
+// Here's the engine code.  You'll note a slow path if the ent leaf cache is missed, which causes a recomputation via the much more expensive 
+// CM_HeadnodeVisible call.  That does change the cache data on the entity, so that's likely your problem with blinking if you are doing some 
+// kind of memcpy operation on the old data.
+//#ifdef 0
+//int DLL_CALLBACK SV_CheckVisibility( const struct edict_s *entity, unsigned char *pset )
+//{
+// int i;
+// qboolean visible;
+// edict_t *e;
+// 
+// if ( !pset )
+//	 return 1;
+// 
+// if ( entity->headnode >= 0 )   //
+// {
+//	 // we use num_leafs as a cache/counter, it will circle around, but so what
+//	 //  if we don't find the leaf we want here, we'll end up doing the full test anyway
+//	 int leaf;
+//	 i = 0; 
+//	 
+//	 do
+//	 {
+//		 leaf = entity->leafnums[i];
+//		 // Cache is all -1 to start...
+//		 if ( leaf == -1 )
+//			 break;
+//		 
+//		 if ( pset[ leaf >> 3 ] & (1 << (leaf & 7 ) ) )
+//		 {
+//			 return 1;
+//		 }
+//		 
+//		 i++;
+//		 if ( i >= MAX_ENT_LEAFS )
+//			 break;
+//		 
+//	 } while ( 1 );
+//	 
+//	 // Didn't find it in "cache"
+//	 
+//	 visible = CM_HeadnodeVisible( sv.worldmodel->nodes + entity->headnode, pset, &leaf );
+//	 if ( !visible )
+//	 {
+//		 return 0;
+//	 }
+//	 
+//	 // Cache leaf that was visible
+//	 //
+//	 e = ( edict_t * )entity;
+//	 
+//	 e->leafnums[ entity->num_leafs ] = (short)leaf;
+//	 e->num_leafs = ( entity->num_leafs + 1 ) % MAX_ENT_LEAFS;
+//	 
+//	 return 2;
+// }
+// else
+// {
+//	 for (i=0 ; i < entity->num_leafs ; i++)
+//	 {
+//		 if ( pset[entity->leafnums[i] >> 3] & (1 << (entity->leafnums[i]&7) ))
+//			 break;
+//	 }
+//	 
+//	 visible = ( i < entity->num_leafs );
+//	 if ( !visible )
+//	 {
+//		 return 0;
+//	 }
+// }
+// 
+// return 1;
+//}
+//#endif
+
+// defaults for clientinfo messages
+#define	DEFAULT_VIEWHEIGHT	28
+
+/*
+===================
+CreateBaseline
+
+Creates baselines used for network encoding, especially for player data since players are not spawned until connect time.
+===================
+*/
+void CreateBaseline( int player, int eindex, struct entity_state_s *baseline, struct edict_s *entity, int playermodelindex, vec3_t player_mins, vec3_t player_maxs )
+{
+	baseline->origin		= entity->v.origin;
+	baseline->angles		= entity->v.angles;
+	baseline->frame			= entity->v.frame;
+	baseline->skin			= (short)entity->v.skin;
+
+	// render information
+	baseline->rendermode	= (byte)entity->v.rendermode;
+	baseline->renderamt		= (byte)entity->v.renderamt;
+	baseline->rendercolor.r	= (byte)entity->v.rendercolor.x;
+	baseline->rendercolor.g	= (byte)entity->v.rendercolor.y;
+	baseline->rendercolor.b	= (byte)entity->v.rendercolor.z;
+	baseline->renderfx		= (byte)entity->v.renderfx;
+
+	if ( player )
+	{
+		baseline->mins			= player_mins;
+		baseline->maxs			= player_maxs;
+
+		baseline->colormap		= eindex;
+		baseline->modelindex	= playermodelindex;
+		baseline->friction		= 1.0;
+		baseline->movetype		= MOVETYPE_WALK;
+
+		baseline->scale			= entity->v.scale;
+		baseline->solid			= SOLID_SLIDEBOX;
+		baseline->framerate		= 1.0;
+		baseline->gravity		= 1.0;
+
+	}
+	else
+	{
+		baseline->mins			= entity->v.mins;
+		baseline->maxs			= entity->v.maxs;
+
+		baseline->colormap		= 0;
+		baseline->modelindex	= entity->v.modelindex;//SV_ModelIndex(pr_strings + entity->v.model);
+		baseline->movetype		= entity->v.movetype;
+
+		baseline->scale			= entity->v.scale;
+		baseline->solid			= entity->v.solid;
+		baseline->framerate		= entity->v.framerate;
+		baseline->gravity		= entity->v.gravity;
+	}
+}
+
+typedef struct
+{
+	char name[32];
+	int	 field;
+} entity_field_alias_t;
+
+#define FIELD_ORIGIN0			0
+#define FIELD_ORIGIN1			1
+#define FIELD_ORIGIN2			2
+#define FIELD_ANGLES0			3
+#define FIELD_ANGLES1			4
+#define FIELD_ANGLES2			5
+
+static entity_field_alias_t entity_field_alias[]=
+{
+	{ "origin[0]",			0 },
+	{ "origin[1]",			0 },
+	{ "origin[2]",			0 },
+	{ "angles[0]",			0 },
+	{ "angles[1]",			0 },
+	{ "angles[2]",			0 },
+};
+
+void Entity_FieldInit( struct delta_s *pFields )
+{
+	entity_field_alias[ FIELD_ORIGIN0 ].field		= DELTA_FINDFIELD( pFields, entity_field_alias[ FIELD_ORIGIN0 ].name );
+	entity_field_alias[ FIELD_ORIGIN1 ].field		= DELTA_FINDFIELD( pFields, entity_field_alias[ FIELD_ORIGIN1 ].name );
+	entity_field_alias[ FIELD_ORIGIN2 ].field		= DELTA_FINDFIELD( pFields, entity_field_alias[ FIELD_ORIGIN2 ].name );
+	entity_field_alias[ FIELD_ANGLES0 ].field		= DELTA_FINDFIELD( pFields, entity_field_alias[ FIELD_ANGLES0 ].name );
+	entity_field_alias[ FIELD_ANGLES1 ].field		= DELTA_FINDFIELD( pFields, entity_field_alias[ FIELD_ANGLES1 ].name );
+	entity_field_alias[ FIELD_ANGLES2 ].field		= DELTA_FINDFIELD( pFields, entity_field_alias[ FIELD_ANGLES2 ].name );
+}
+
+/*
+==================
+Entity_Encode
+
+Callback for sending entity_state_t info over network. 
+FIXME:  Move to script
+==================
+*/
+void Entity_Encode( struct delta_s *pFields, const unsigned char *from, const unsigned char *to )
+{
+	entity_state_t *f, *t;
+	int localplayer = 0;
+	static int initialized = 0;
+
+	if ( !initialized )
+	{
+		Entity_FieldInit( pFields );
+		initialized = 1;
+	}
+
+	f = (entity_state_t *)from;
+	t = (entity_state_t *)to;
+
+	// Never send origin to local player, it's sent with more resolution in clientdata_t structure
+	localplayer =  ( t->number - 1 ) == ENGINE_CURRENT_PLAYER();
+	if ( localplayer )
+	{
+		DELTA_UNSETBYINDEX( pFields, entity_field_alias[ FIELD_ORIGIN0 ].field );
+		DELTA_UNSETBYINDEX( pFields, entity_field_alias[ FIELD_ORIGIN1 ].field );
+		DELTA_UNSETBYINDEX( pFields, entity_field_alias[ FIELD_ORIGIN2 ].field );
+	}
+
+	if ( ( t->impacttime != 0 ) && ( t->starttime != 0 ) )
+	{
+		DELTA_UNSETBYINDEX( pFields, entity_field_alias[ FIELD_ORIGIN0 ].field );
+		DELTA_UNSETBYINDEX( pFields, entity_field_alias[ FIELD_ORIGIN1 ].field );
+		DELTA_UNSETBYINDEX( pFields, entity_field_alias[ FIELD_ORIGIN2 ].field );
+
+		DELTA_UNSETBYINDEX( pFields, entity_field_alias[ FIELD_ANGLES0 ].field );
+		DELTA_UNSETBYINDEX( pFields, entity_field_alias[ FIELD_ANGLES1 ].field );
+		DELTA_UNSETBYINDEX( pFields, entity_field_alias[ FIELD_ANGLES2 ].field );
+	}
+
+	if ( ( t->movetype == MOVETYPE_FOLLOW ) &&
+		 ( t->aiment != 0 ) )
+	{
+		DELTA_UNSETBYINDEX( pFields, entity_field_alias[ FIELD_ORIGIN0 ].field );
+		DELTA_UNSETBYINDEX( pFields, entity_field_alias[ FIELD_ORIGIN1 ].field );
+		DELTA_UNSETBYINDEX( pFields, entity_field_alias[ FIELD_ORIGIN2 ].field );
+	}
+	else if ( t->aiment != f->aiment )
+	{
+		DELTA_SETBYINDEX( pFields, entity_field_alias[ FIELD_ORIGIN0 ].field );
+		DELTA_SETBYINDEX( pFields, entity_field_alias[ FIELD_ORIGIN1 ].field );
+		DELTA_SETBYINDEX( pFields, entity_field_alias[ FIELD_ORIGIN2 ].field );
+	}
+}
+
+static entity_field_alias_t player_field_alias[]=
+{
+	{ "origin[0]",			0 },
+	{ "origin[1]",			0 },
+	{ "origin[2]",			0 },
+};
+
+void Player_FieldInit( struct delta_s *pFields )
+{
+	player_field_alias[ FIELD_ORIGIN0 ].field		= DELTA_FINDFIELD( pFields, player_field_alias[ FIELD_ORIGIN0 ].name );
+	player_field_alias[ FIELD_ORIGIN1 ].field		= DELTA_FINDFIELD( pFields, player_field_alias[ FIELD_ORIGIN1 ].name );
+	player_field_alias[ FIELD_ORIGIN2 ].field		= DELTA_FINDFIELD( pFields, player_field_alias[ FIELD_ORIGIN2 ].name );
+}
+
+/*
+==================
+Player_Encode
+
+Callback for sending entity_state_t for players info over network. 
+==================
+*/
+void Player_Encode( struct delta_s *pFields, const unsigned char *from, const unsigned char *to )
+{
+	entity_state_t *f, *t;
+	int localplayer = 0;
+	static int initialized = 0;
+
+	if ( !initialized )
+	{
+		Player_FieldInit( pFields );
+		initialized = 1;
+	}
+
+	f = (entity_state_t *)from;
+	t = (entity_state_t *)to;
+
+	// Never send origin to local player, it's sent with more resolution in clientdata_t structure
+	localplayer =  ( t->number - 1 ) == ENGINE_CURRENT_PLAYER();
+	if ( localplayer )
+	{
+		DELTA_UNSETBYINDEX( pFields, entity_field_alias[ FIELD_ORIGIN0 ].field );
+		DELTA_UNSETBYINDEX( pFields, entity_field_alias[ FIELD_ORIGIN1 ].field );
+		DELTA_UNSETBYINDEX( pFields, entity_field_alias[ FIELD_ORIGIN2 ].field );
+	}
+
+	if ( ( t->movetype == MOVETYPE_FOLLOW ) &&
+		 ( t->aiment != 0 ) )
+	{
+		DELTA_UNSETBYINDEX( pFields, entity_field_alias[ FIELD_ORIGIN0 ].field );
+		DELTA_UNSETBYINDEX( pFields, entity_field_alias[ FIELD_ORIGIN1 ].field );
+		DELTA_UNSETBYINDEX( pFields, entity_field_alias[ FIELD_ORIGIN2 ].field );
+	}
+	else if ( t->aiment != f->aiment )
+	{
+		DELTA_SETBYINDEX( pFields, entity_field_alias[ FIELD_ORIGIN0 ].field );
+		DELTA_SETBYINDEX( pFields, entity_field_alias[ FIELD_ORIGIN1 ].field );
+		DELTA_SETBYINDEX( pFields, entity_field_alias[ FIELD_ORIGIN2 ].field );
+	}
+}
+
+#define CUSTOMFIELD_ORIGIN0			0
+#define CUSTOMFIELD_ORIGIN1			1
+#define CUSTOMFIELD_ORIGIN2			2
+#define CUSTOMFIELD_ANGLES0			3
+#define CUSTOMFIELD_ANGLES1			4
+#define CUSTOMFIELD_ANGLES2			5
+#define CUSTOMFIELD_SKIN			6
+#define CUSTOMFIELD_SEQUENCE		7
+#define CUSTOMFIELD_ANIMTIME		8
+
+entity_field_alias_t custom_entity_field_alias[]=
+{
+	{ "origin[0]",			0 },
+	{ "origin[1]",			0 },
+	{ "origin[2]",			0 },
+	{ "angles[0]",			0 },
+	{ "angles[1]",			0 },
+	{ "angles[2]",			0 },
+	{ "skin",				0 },
+	{ "sequence",			0 },
+	{ "animtime",			0 },
+};
+
+void Custom_Entity_FieldInit( struct delta_s *pFields )
+{
+	custom_entity_field_alias[ CUSTOMFIELD_ORIGIN0 ].field	= DELTA_FINDFIELD( pFields, custom_entity_field_alias[ CUSTOMFIELD_ORIGIN0 ].name );
+	custom_entity_field_alias[ CUSTOMFIELD_ORIGIN1 ].field	= DELTA_FINDFIELD( pFields, custom_entity_field_alias[ CUSTOMFIELD_ORIGIN1 ].name );
+	custom_entity_field_alias[ CUSTOMFIELD_ORIGIN2 ].field	= DELTA_FINDFIELD( pFields, custom_entity_field_alias[ CUSTOMFIELD_ORIGIN2 ].name );
+	custom_entity_field_alias[ CUSTOMFIELD_ANGLES0 ].field	= DELTA_FINDFIELD( pFields, custom_entity_field_alias[ CUSTOMFIELD_ANGLES0 ].name );
+	custom_entity_field_alias[ CUSTOMFIELD_ANGLES1 ].field	= DELTA_FINDFIELD( pFields, custom_entity_field_alias[ CUSTOMFIELD_ANGLES1 ].name );
+	custom_entity_field_alias[ CUSTOMFIELD_ANGLES2 ].field	= DELTA_FINDFIELD( pFields, custom_entity_field_alias[ CUSTOMFIELD_ANGLES2 ].name );
+	custom_entity_field_alias[ CUSTOMFIELD_SKIN ].field	= DELTA_FINDFIELD( pFields, custom_entity_field_alias[ CUSTOMFIELD_SKIN ].name );
+	custom_entity_field_alias[ CUSTOMFIELD_SEQUENCE ].field= DELTA_FINDFIELD( pFields, custom_entity_field_alias[ CUSTOMFIELD_SEQUENCE ].name );
+	custom_entity_field_alias[ CUSTOMFIELD_ANIMTIME ].field= DELTA_FINDFIELD( pFields, custom_entity_field_alias[ CUSTOMFIELD_ANIMTIME ].name );
+}
+
+/*
+==================
+Custom_Encode
+
+Callback for sending entity_state_t info ( for custom entities ) over network. 
+FIXME:  Move to script
+==================
+*/
+void Custom_Encode( struct delta_s *pFields, const unsigned char *from, const unsigned char *to )
+{
+	entity_state_t *f, *t;
+	int beamType;
+	static int initialized = 0;
+
+	if ( !initialized )
+	{
+		Custom_Entity_FieldInit( pFields );
+		initialized = 1;
+	}
+
+	f = (entity_state_t *)from;
+	t = (entity_state_t *)to;
+
+	beamType = t->rendermode & 0x0f;
+		
+	if ( beamType != BEAM_POINTS && beamType != BEAM_ENTPOINT )
+	{
+		DELTA_UNSETBYINDEX( pFields, custom_entity_field_alias[ CUSTOMFIELD_ORIGIN0 ].field );
+		DELTA_UNSETBYINDEX( pFields, custom_entity_field_alias[ CUSTOMFIELD_ORIGIN1 ].field );
+		DELTA_UNSETBYINDEX( pFields, custom_entity_field_alias[ CUSTOMFIELD_ORIGIN2 ].field );
+	}
+
+	if ( beamType != BEAM_POINTS )
+	{
+		DELTA_UNSETBYINDEX( pFields, custom_entity_field_alias[ CUSTOMFIELD_ANGLES0 ].field );
+		DELTA_UNSETBYINDEX( pFields, custom_entity_field_alias[ CUSTOMFIELD_ANGLES1 ].field );
+		DELTA_UNSETBYINDEX( pFields, custom_entity_field_alias[ CUSTOMFIELD_ANGLES2 ].field );
+	}
+
+	if ( beamType != BEAM_ENTS && beamType != BEAM_ENTPOINT )
+	{
+		DELTA_UNSETBYINDEX( pFields, custom_entity_field_alias[ CUSTOMFIELD_SKIN ].field );
+		DELTA_UNSETBYINDEX( pFields, custom_entity_field_alias[ CUSTOMFIELD_SEQUENCE ].field );
+	}
+
+	// animtime is compared by rounding first
+	// see if we really shouldn't actually send it
+	if ( (int)f->animtime == (int)t->animtime )
+	{
+		DELTA_UNSETBYINDEX( pFields, custom_entity_field_alias[ CUSTOMFIELD_ANIMTIME ].field );
+	}
+}
+
+/*
+=================
+RegisterEncoders
+
+Allows game .dll to override network encoding of certain types of entities and tweak values, etc.
+=================
+*/
+void RegisterEncoders( void )
+{
+	DELTA_ADDENCODER( "Entity_Encode", Entity_Encode );
+	DELTA_ADDENCODER( "Custom_Encode", Custom_Encode );
+	DELTA_ADDENCODER( "Player_Encode", Player_Encode );
+}
+
+int GetWeaponData( struct edict_s *player, struct weapon_data_s *info )
+{
+#if defined( CLIENT_WEAPONS )
+	int i;
+	weapon_data_t *item;
+	entvars_t *pev = &player->v;
+	CBasePlayer *pl = ( CBasePlayer *) CBasePlayer::Instance( pev );
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(pl);
+	CBasePlayerWeapon *gun;
+	
+	ItemInfo II;
+
+	memset( info, 0, 32 * sizeof( weapon_data_t ) );
+
+	if ( !pl )
+		return 1;
+
+	// go through all of the weapons and make a list of the ones to pack
+	for ( i = 0 ; i < MAX_ITEM_TYPES ; i++ )
+	{
+		if ( pl->m_rgpPlayerItems[ i ] )
+		{
+			// there's a weapon here. Should I pack it?
+			CBasePlayerItem *pPlayerItem = pl->m_rgpPlayerItems[ i ];
+
+			while ( pPlayerItem )
+			{
+				gun = (CBasePlayerWeapon *)pPlayerItem->GetWeaponPtr();
+				if ( gun && gun->UseDecrement() )
+				{
+					// Get The ID.
+					memset( &II, 0, sizeof( II ) );
+					gun->GetItemInfo( &II );
+
+					ASSERT((II.iId >= 0) && (II.iId < 32));
+
+					if ( II.iId >= 0 && II.iId < 32 )
+					{
+						item = &info[ II.iId ];
+					 	
+						item->m_iId						= II.iId;
+						item->m_iClip					= gun->m_iClip;
+
+						item->m_flTimeWeaponIdle		= max( gun->m_flTimeWeaponIdle, -0.001 );
+						item->m_flNextPrimaryAttack		= max( gun->m_flNextPrimaryAttack, -0.001 );
+						item->m_flNextSecondaryAttack	= max( gun->m_flNextSecondaryAttack, -0.001 );
+						item->m_fInReload				= gun->m_fInReload;
+
+						//thePlayer->SetDebugCSP(item);
+
+						//item->m_fInSpecialReload		= gun->m_fInSpecialReload;
+						//item->fuser1					= max( gun->pev->fuser1, -0.001 );
+						item->fuser2					= gun->m_flStartThrow;
+						item->fuser3					= gun->m_flReleaseThrow;
+						//item->iuser1					= gun->m_chargeReady;
+						//item->iuser2					= gun->m_fInAttack;
+
+						// Pass along enabled state in iuser3 (for when hives and ensnare enable and disable weapons)
+						item->iuser3					= gun->pev->iuser3;
+						
+						//item->m_flPumpTime				= max( gun->m_flPumpTime, -0.001 );
+					}
+				}
+				pPlayerItem = pPlayerItem->m_pNext;
+			}
+		}
+	}
+#else
+	memset( info, 0, 32 * sizeof( weapon_data_t ) );
+#endif
+	return 1;
+}
+
+/*
+=================
+UpdateClientData
+
+Data sent to current client only
+engine sets cd to 0 before calling.
+=================
+*/
+void UpdateClientData ( const struct edict_s *ent, int sendweapons, struct clientdata_s *cd )
+{
+	cd->flags			= ent->v.flags;
+	cd->health			= ent->v.health;
+
+	cd->viewmodel		= MODEL_INDEX( STRING( ent->v.viewmodel ) );
+
+	cd->waterlevel		= ent->v.waterlevel;
+	cd->watertype		= ent->v.watertype;
+	cd->weapons			= ent->v.weapons;
+
+	// Vectors
+	cd->origin			= ent->v.origin;
+	cd->velocity		= ent->v.velocity;
+	cd->view_ofs		= ent->v.view_ofs;
+	cd->punchangle		= ent->v.punchangle;
+
+	cd->bInDuck			= ent->v.bInDuck;
+	cd->flTimeStepSound = ent->v.flTimeStepSound;
+	cd->flDuckTime		= ent->v.flDuckTime;
+	cd->flSwimTime		= ent->v.flSwimTime;
+	cd->waterjumptime	= ent->v.teleport_time;
+
+	strcpy( cd->physinfo, ENGINE_GETPHYSINFO( ent ) );
+
+	cd->maxspeed		= ent->v.maxspeed;
+	cd->fov				= ent->v.fov;
+	cd->weaponanim		= ent->v.weaponanim;
+
+	cd->pushmsec		= ent->v.pushmsec;
+
+	// Spectator
+	cd->iuser1			= ent->v.iuser1;
+	cd->iuser2			= ent->v.iuser2;
+
+	// AvH specials
+	cd->iuser3			= ent->v.iuser3;
+	cd->iuser4			= ent->v.iuser4;
+	cd->fuser1			= ent->v.fuser1;
+	cd->fuser2			= ent->v.fuser2;
+	cd->fuser3			= ent->v.fuser3;
+
+	// Added by mmcguire for oriented skulk player models.
+	cd->vuser1          = ent->v.vuser1;
+
+	// Added for extra player info for first-person spectating
+	cd->vuser4          = ent->v.vuser4;
+
+#if defined( CLIENT_WEAPONS )
+	if ( sendweapons )
+	{
+		entvars_t *pev = (entvars_t *)&ent->v;
+		CBasePlayer *pl = ( CBasePlayer *) CBasePlayer::Instance( pev );
+
+		if ( pl )
+		{
+			cd->m_flNextAttack	= pl->m_flNextAttack;
+			//cd->fuser2			= pl->m_flNextAmmoBurn;
+			//cd->fuser3			= pl->m_flAmmoStartCharge;
+			//cd->vuser1.x		= pl->ammo_9mm;
+			//cd->vuser1.y		= pl->ammo_357;
+			//cd->vuser1.z		= pl->ammo_argrens;
+			//cd->ammo_nails		= pl->ammo_bolts;
+			//cd->ammo_shells		= pl->ammo_buckshot;
+			//cd->ammo_rockets	= pl->ammo_rockets;
+			//cd->ammo_cells		= pl->ammo_uranium;
+			//cd->vuser2.x		= pl->ammo_hornets;
+
+			if ( pl->m_pActiveItem )
+			{
+				CBasePlayerWeapon *gun;
+				gun = (CBasePlayerWeapon *)pl->m_pActiveItem->GetWeaponPtr();
+				if ( gun && gun->UseDecrement() )
+				{
+					ItemInfo II;
+					memset( &II, 0, sizeof( II ) );
+					gun->GetItemInfo( &II );
+
+					cd->m_iId = II.iId;
+
+//					cd->vuser3.z	= gun->m_iSecondaryAmmoType;
+//					cd->vuser4.x	= gun->m_iPrimaryAmmoType;
+//					cd->vuser4.y	= pl->m_rgAmmo[gun->m_iPrimaryAmmoType];
+//					cd->vuser4.z	= pl->m_rgAmmo[gun->m_iSecondaryAmmoType];
+//					
+//					if ( pl->m_pActiveItem->m_iId == WEAPON_RPG )
+//					{
+//						cd->vuser2.y = ( ( CRpg * )pl->m_pActiveItem)->m_fSpotActive;
+//						cd->vuser2.z = ( ( CRpg * )pl->m_pActiveItem)->m_cActiveRockets;
+//					}
+				}
+			}
+		}
+	}
+#endif
+}
+
+/*
+=================
+CmdStart
+
+We're about to run this usercmd for the specified player.  We can set up groupinfo and masking here, etc.
+This is the time to examine the usercmd for anything extra.  This call happens even if think does not.
+=================
+*/
+void CmdStart( const edict_t *player, const struct usercmd_s *cmd, unsigned int random_seed )
+{
+	entvars_t *pev = (entvars_t *)&player->v;
+	AvHPlayer *pl = ( AvHPlayer *) CBasePlayer::Instance( pev );
+
+	if( !pl )
+		return;
+
+	pl->SetCurrentCommand(cmd);
+
+	pl->SetSizeForUser3();
+
+	if ( pl->pev->groupinfo != 0 )
+	{
+		UTIL_SetGroupTrace( pl->pev->groupinfo, GROUP_OP_AND );
+	}
+
+	pl->random_seed = random_seed;
+}
+
+/*
+=================
+CmdEnd
+
+Each cmdstart is exactly matched with a cmd end, clean up any group trace flags, etc. here
+=================
+*/
+void CmdEnd ( const edict_t *player )
+{
+	entvars_t *pev = (entvars_t *)&player->v;
+	AvHPlayer *pl = ( AvHPlayer *) CBasePlayer::Instance( pev );
+	
+	if( !pl )
+		return;
+
+	pl->SetSizeForUser3();
+	
+	if ( pl->pev->groupinfo != 0 )
+	{
+		UTIL_UnsetGroupTrace();
+	}
+}
+
+/*
+================================
+ConnectionlessPacket
+
+ Return 1 if the packet is valid.  Set response_buffer_size if you want to send a response packet.  Incoming, it holds the max
+  size of the response_buffer, so you must zero it out if you choose not to respond.
+================================
+*/
+int	ConnectionlessPacket( const struct netadr_s *net_from, const char *args, char *response_buffer, int *response_buffer_size )
+{
+	// Parse stuff from args
+	int max_buffer_size = *response_buffer_size;
+
+	// Zero it out since we aren't going to respond.
+	// If we wanted to response, we'd write data into response_buffer
+	*response_buffer_size = 0;
+
+	// Since we don't listen for anything here, just respond that it's a bogus message
+	// If we didn't reject the message, we'd return 1 for success instead.
+	return 0;
+}
+
+/*
+================================
+GetHullBounds
+
+  Engine calls this to enumerate player collision hulls, for prediction.  Return 0 if the hullnumber doesn't exist.
+================================
+*/
+int GetHullBounds( int hullnumber, float *mins, float *maxs )
+{
+	int iret = 0;
+
+	switch ( hullnumber )
+	{
+	case 0:
+		HULL0_MIN.CopyToArray(mins);
+		HULL0_MAX.CopyToArray(maxs);
+		iret = 1;
+		break;
+
+	case 1:
+		HULL1_MIN.CopyToArray(mins);
+		HULL1_MAX.CopyToArray(maxs);
+		iret = 1;
+		break;
+
+	case 2:
+		HULL2_MIN.CopyToArray(mins);
+		HULL2_MAX.CopyToArray(maxs);
+		iret = 1;
+		break;
+
+	case 3:
+		HULL3_MIN.CopyToArray(mins);
+		HULL3_MAX.CopyToArray(maxs);
+		iret = 1;
+		break;
+	}
+
+	return iret;
+}
+
+/*
+================================
+CreateInstancedBaselines
+
+Create pseudo-baselines for items that aren't placed in the map at spawn time, but which are likely
+to be created during play ( e.g., grenades, ammo packs, projectiles, corpses, etc. )
+================================
+*/
+void CreateInstancedBaselines ( void )
+{
+	int iret = 0;
+	entity_state_t state;
+
+	memset( &state, 0, sizeof( state ) );
+
+	// Create any additional baselines here for things like grendates, etc.
+	// iret = ENGINE_INSTANCE_BASELINE( pc->pev->classname, &state );
+
+	// Destroy objects.
+	//UTIL_Remove( pc );
+}
+
+/*
+================================
+InconsistentFile
+
+One of the ENGINE_FORCE_UNMODIFIED files failed the consistency check for the specified player
+ Return 0 to allow the client to continue, 1 to force immediate disconnection ( with an optional disconnect message of up to 256 characters )
+================================
+*/
+int	InconsistentFile( const edict_t *player, const char *filename, char *disconnect_message )
+{
+	// Server doesn't care?
+	if ( CVAR_GET_FLOAT( "mp_consistency" ) != 1 )
+		return 0;
+
+	// Default behavior is to kick the player
+	sprintf( disconnect_message, "Server is enforcing file consistency for %s\n", filename );
+
+	// Kick now with specified disconnect message.
+	return 1;
+}
+
+/*
+================================
+AllowLagCompensation
+
+ The game .dll should return 1 if lag compensation should be allowed ( could also just set
+  the sv_unlag cvar.
+ Most games right now should return 0, until client-side weapon prediction code is written
+  and tested for them ( note you can predict weapons, but not do lag compensation, too, 
+  if you want.
+================================
+*/
+int AllowLagCompensation( void )
+{
+	return 1;
+}
+
+inline bool AvHDetermineVisibility(struct entity_state_s *state, int e, edict_t *ent, edict_t *host, unsigned char *pSet, bool& outIsParticleSystemEntity, bool& outIsParticleSystemEntityVisible)
+{
+	bool theIsVisible = false;
+	bool theIsParticleSystemEntity = (ent->v.classname == MAKE_STRING(kesParticlesCustom));
+	outIsParticleSystemEntity = theIsParticleSystemEntity;
+	outIsParticleSystemEntityVisible = false;
+	
+	// Always propagate ourself
+	if(ent != host)
+	{
+		//if(GET_RUN_CODE(256))
+
+		bool theEntityIsAWeldable = ent->v.iuser3 == AVH_USER3_WELD;//(ent->v.classname == MAKE_STRING(kesWeldable));
+		bool theIsNoBuild = ent->v.iuser3 == AVH_USER3_NOBUILD;//(ent->v.classname == MAKE_STRING(kesNoBuild));
+		
+		// Don't send if EF_NODRAW objects that aren't the host (with some exceptions)
+		// This is a little convoluted because of performance (this function gets called many thousands of time per server tick)
+
+		// Elven - edited out the !(ent->v.effects & EF_NODRAW) because it will always evaluate to true.
+		// Reasoning:  if (v.effects & EF_NODRAW) and (ent!=host) were ever true, there would have been a return call in 
+		// AddToFullPack before this function was called. 
+		// Therefore, (ent->v.effects & EF_NODRAW) will always be false and !false will always be true.
+		// puzl - undid this change as it was causing problems in comm mode. Structures, players etc. were not visible to the comm.  
+		if(!(ent->v.effects & EF_NODRAW) ||  theEntityIsAWeldable || theIsNoBuild || (ent->v.classname == MAKE_STRING(kesMP3Audio)))
+		{
+			// This is duplicated from the above line for possible efficiency
+			bool theIsMp3Entity = (ent->v.classname == MAKE_STRING(kesMP3Audio));
+
+			// Ignore ents without valid / visible models
+			// ...but don't cull out particle systems ever.
+			// This should use an approximate bounding radius and cull it with the PVS normally but
+			// I can't figure out how to make it work.  This would only cause more net traffic if
+			// the particle system entity was out of sight and moving around due to map triggers, not
+			// through normal operation
+			if(ent->v.modelindex || STRING(ent->v.model) || theIsParticleSystemEntity || theIsMp3Entity)
+			{
+				if(theIsMp3Entity)
+				{
+					CBaseEntity* theEntity = CBaseEntity::Instance(ent);
+					AvHMP3Audio* theMP3Audio = dynamic_cast<AvHMP3Audio*>(theEntity);
+					if(theMP3Audio)
+					{
+						float theDistanceToEntity = VectorDistance(host->v.origin, ent->v.origin);
+						int theFadeDistance = theMP3Audio->GetFadeDistance();
+						if((theFadeDistance <= 0) || (theDistanceToEntity <= theFadeDistance))
+						{
+							theIsVisible = true;
+						}
+					}
+				}
+				
+				// If we're in top down
+				bool thePlayerInTopDown = (host->v.iuser4 & MASK_TOPDOWN);
+				if(thePlayerInTopDown)
+				{
+					// Possible visible entities are world entities, sighted enemy entities, or entities on our team
+					bool theEntityIsWorldEntity = (ent->v.team == 0) && (ent->v.iuser3 != AVH_USER3_HIVE);
+					bool theIsSighted = (ent->v.iuser4 & MASK_VIS_SIGHTED);
+					bool theOnSameTeam = (host->v.team == ent->v.team);
+					
+					if(theEntityIsWorldEntity || theIsSighted || theOnSameTeam)
+					{
+						CBaseEntity* theEntity = CBaseEntity::Instance(ent);
+						bool theIsDoor = (dynamic_cast<CBaseDoor*>(theEntity) != NULL);
+						
+						// If entity is in front of the player and within visibility range
+						vec3_t theEntityOrigin = ent->v.origin;
+						float theMagnitude = theEntityOrigin.x + theEntityOrigin.y + theEntityOrigin.z;
+						if((theMagnitude < 5.0f) || theIsDoor)
+						{
+							theEntityOrigin.x = (ent->v.absmin.x + ent->v.absmax.x)/2.0f;
+							theEntityOrigin.y = (ent->v.absmin.y + ent->v.absmax.y)/2.0f;
+							theEntityOrigin.z = (ent->v.absmin.z + ent->v.absmax.z)/2.0f;
+						}
+						bool theIsRelevantForTopDownPlayer = AvHSUGetIsRelevantForTopDownPlayer(host->v.origin, theEntityOrigin);
+						if(!theIsRelevantForTopDownPlayer)
+						{
+							AvHPlayer* theReceivingPlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(host));
+
+							// If the entity is selected, it's relevant
+							if(theEntity && theReceivingPlayer && theReceivingPlayer->GetIsSelected(theEntity->entindex()))
+							{
+								theIsRelevantForTopDownPlayer = true;
+							}
+						}
+						if(theIsRelevantForTopDownPlayer)
+						{
+							theIsVisible = true;
+							if(theIsParticleSystemEntity)
+							{
+								outIsParticleSystemEntityVisible = true;
+							}
+						}
+					}
+				}
+//				else
+//				{
+//					// Check visibility with the engine
+//					if(ENGINE_CHECK_VISIBILITY((const struct edict_s *)ent, pSet))
+//					{
+//						theIsVisible = true;
+//				
+//						// If it's a particle system entity, save visibility for it
+//						if(theIsParticleSystemEntity)
+//						{
+//							outIsParticleSystemEntityVisible = true;
+//						}
+//					}
+//					else if(theIsParticleSystemEntity)
+//					{
+//						outIsParticleSystemEntityVisible = false;
+//					}
+//				}
+			}
+		}
+	}
+	else
+	{
+		theIsVisible = true;
+	}
+
+	return theIsVisible;
+}
+
+/*
+AddToFullPack
+ 
+Return 1 if the entity state has been filled in for the ent and the entity will be propagated to the client, 0 otherwise
+ 
+state is the server maintained copy of the state info that is transmitted to the client
+a MOD could alter values copied into state to send the "host" a different look for a particular entity update, etc.
+e and ent are the entity that is being added to the update, if 1 is returned
+host is the player's edict of the player whom we are sending the update to
+player is 1 if the ent/e is a player and 0 otherwise
+pSet is either the PAS or PVS that we previous set up.  We can use it to ask the engine to filter the entity against the PAS or PVS.
+we could also use the pas/ pvs that we set in SetupVisibility, if we wanted to.  Caching the value is valid in that case, but still only for the current frame
+*/
+int AddToFullPack( struct entity_state_s *state, int e, edict_t *ent, edict_t *host, int hostflags, int player, unsigned char *pSet )
+{ 
+	int     i;
+
+    if(e > kMaxEProcessedForPlayerOne)
+    {
+        kNumEntsProcessedForPlayerOne++;
+        kMaxEProcessedForPlayerOne = e;
+    }
+
+	if((ent != host) && !(GET_RUN_CODE(512)))
+	{
+		kNumReturn0++;
+		return 0;
+	}
+
+	// This is a common case
+	// Ignore ents without valid / visible models
+	if ( !ent->v.modelindex || !STRING( ent->v.model ) )
+	{
+		kNumReturn0++;
+		return 0;
+	}
+
+	// don't send if flagged for NODRAW and it's not the host getting the message
+	if ( ( ent->v.effects & EF_NODRAW ) &&
+	  ( ent != host ) )
+	{
+		kNumReturn0++;
+		return 0;
+	}
+	
+	// Don't send spectators to other players
+	if ( ( ent->v.flags & FL_SPECTATOR ) && ( ent != host ) )
+	{
+		kNumReturn0++;
+		return 0;
+	}
+
+	AvHUser3 theUser3 = (AvHUser3)ent->v.iuser3;
+	bool theCanBeTargetted = ent->v.targetname != 0;
+	
+	//if(!strcmp(theEntNameString, "func_illusionary"))
+	if(theUser3 == AVH_USER3_FUNC_ILLUSIONARY)
+	{
+		// Check invisibility flags
+		if(host->v.iuser4 & MASK_TOPDOWN)
+		{
+			if(FBitSet(ent->v.spawnflags, 1))
+			{
+				if(pSet != NULL)
+				{
+					kNumReturn0++;
+					return 0;
+				}
+			}
+		}
+		// If we're not commander, and "invisible for player" is set
+		else
+		{
+			if(FBitSet(ent->v.spawnflags, 2))
+			{
+				if(pSet != NULL)
+				{
+					kNumReturn0++;
+					return 0;
+				}
+			}
+		}
+	}
+
+
+	// Some entities can be determined to be visible without the engine check
+	bool theIsParticleSystemEntity = false;
+	bool theIsParticleSystemEntityVisible = false;
+	bool theIsVisible = AvHDetermineVisibility(state, e, ent, host, pSet, theIsParticleSystemEntity, theIsParticleSystemEntityVisible);
+	if(!theIsVisible)
+	{
+		// Check to see if the player has left their previous leaf.  If so, reset player's PVS info.
+		int hostnum = ENTINDEX( host ) - 1;
+		if ( TimeToResetPVS( host, hostnum ) )
+		{
+			ResetPlayerPVS( host, hostnum );
+		}
+		
+		// Ignore if not the host and not touching a PVS/PAS leaf
+		// If pSet is NULL, then the test will always succeed and the entity will be added to the update
+		if ( ent != host )
+		{
+			if(GetTimeToRecompute( hostnum, e, gpGlobals->time, theIsVisible))
+			{
+				// Do time consuming check 
+				theIsVisible = ENGINE_CHECK_VISIBILITY( (const struct edict_s *)ent, pSet );
+
+				MarkEntityInPVS( hostnum, e, gpGlobals->time, theIsVisible);
+
+				kNumComputed++;
+			}
+
+			if(!theIsVisible)
+			{
+				kNumReturn0++;
+				return 0;
+			}
+		}
+		
+		// Don't send entity to local client if the client says it's predicting the entity itself.
+		if ( ent->v.flags & FL_SKIPLOCALHOST )
+		{
+			if ( ( hostflags & 1 ) && ( ent->v.owner == host ) )
+			{
+				kNumReturn0++;
+				return 0;
+			}
+		}
+		
+		if ( host->v.groupinfo )
+		{
+			UTIL_SetGroupTrace( host->v.groupinfo, GROUP_OP_AND );
+		
+			// Should always be set, of course
+			if ( ent->v.groupinfo )
+			{
+				if ( g_groupop == GROUP_OP_AND )
+				{
+					if ( !(ent->v.groupinfo & host->v.groupinfo ) )
+					{
+						kNumReturn0++;
+						return 0;
+					}
+				}
+				else if ( g_groupop == GROUP_OP_NAND )
+				{
+					if ( ent->v.groupinfo & host->v.groupinfo )
+					{
+						kNumReturn0++;
+						return 0;
+					}
+				}
+			}
+	
+			UTIL_UnsetGroupTrace();
+		}
+	}
+
+	memset( state, 0, sizeof( *state ) );
+	
+	// Assign index so we can track this entity from frame to frame and
+	//  delta from it.
+	state->number   = e;
+	state->entityType = ENTITY_NORMAL;
+	
+	// Flag custom entities.
+	if ( ent->v.flags & FL_CUSTOMENTITY )
+	{
+		state->entityType = ENTITY_BEAM;
+	}
+	
+	// 
+	// Copy state data
+	//
+	
+	// Round animtime to nearest millisecond
+	state->animtime   = (int)(1000.0 * ent->v.animtime ) / 1000.0;
+	
+	//memcpy( state->origin, ent->v.origin, 3 * sizeof( float ) );
+	state->origin = ent->v.origin;
+	
+	//memcpy( state->angles, ent->v.angles, 3 * sizeof( float ) );
+	state->angles = ent->v.angles;
+	
+	//memcpy( state->mins, ent->v.mins, 3 * sizeof( float ) );
+	state->mins = ent->v.mins;
+	
+	//memcpy( state->maxs, ent->v.maxs, 3 * sizeof( float ) );
+	state->maxs = ent->v.maxs;
+	
+	//memcpy( state->startpos, ent->v.startpos, 3 * sizeof( float ) );
+	state->startpos = ent->v.startpos;
+	
+	//memcpy( state->endpos, ent->v.endpos, 3 * sizeof( float ) );
+	state->endpos = ent->v.endpos;
+	
+	state->impacttime = ent->v.impacttime;
+	state->starttime = ent->v.starttime;
+	
+	state->modelindex = ent->v.modelindex;
+	 
+	state->frame      = ent->v.frame;
+	
+	state->skin       = ent->v.skin;
+	state->effects    = ent->v.effects;
+	
+	// This non-player entity is being moved by the game .dll and not the physics simulation system
+	//  make sure that we interpolate it's position on the client if it moves
+	if ( !player &&
+		ent->v.animtime &&
+		ent->v.velocity[ 0 ] == 0 && 
+		ent->v.velocity[ 1 ] == 0 && 
+		ent->v.velocity[ 2 ] == 0 )
+	{
+		state->eflags |= EFLAG_SLERP;
+	}
+	
+	state->scale   = ent->v.scale;
+	state->solid   = ent->v.solid;
+	state->colormap   = ent->v.colormap;
+	state->movetype   = ent->v.movetype;
+	state->sequence   = ent->v.sequence;
+	state->framerate  = ent->v.framerate;
+	state->body       = ent->v.body;
+	
+	for (i = 0; i < 4; i++)
+	{
+		state->controller[i] = ent->v.controller[i];
+	}
+	
+	for (i = 0; i < 2; i++)
+	{
+		state->blending[i]   = ent->v.blending[i];
+	}
+	
+	state->rendermode    = ent->v.rendermode;
+	state->renderamt     = ent->v.renderamt; 
+	state->renderfx      = ent->v.renderfx;
+	state->rendercolor.r = ent->v.rendercolor[0];
+	state->rendercolor.g = ent->v.rendercolor[1];
+	state->rendercolor.b = ent->v.rendercolor[2];
+
+
+    // If classname indicates an entity that fades depending on viewing player role
+	const char* theEntNameString = STRING(ent->v.classname);
+
+    if(!player && AvHSSUGetIsClassNameFadeable(theEntNameString))
+	{
+		CBaseEntity* theSeethrough = CBaseEntity::Instance(ent);
+		ASSERT(theSeethrough);
+	
+		// Default to player is full visibility
+		state->rendermode = kRenderNormal;
+	
+		int theAlphaValue = theSeethrough->pev->fuser2;
+		if(host->v.iuser4 & MASK_TOPDOWN)
+		{
+			 theAlphaValue = theSeethrough->pev->fuser1;
+		}
+
+		if(theAlphaValue != 255)
+		{
+			//state->rendermode = kRenderTransAdd;
+			state->rendermode = kRenderTransTexture;
+			state->renderamt = theAlphaValue;
+			if(state->renderamt == 0)
+			{
+				state->effects |= EF_NODRAW;
+			}
+            
+            if(host->v.iuser4 & MASK_TOPDOWN)
+            {
+                state->solid = SOLID_NOT;
+            }
+
+		}
+
+	}
+	
+	// Inactive hives should be drawn for players on their team
+	if((ent->v.iuser3 == AVH_USER3_HIVE) && (!GetHasUpgrade(ent->v.iuser4, MASK_BUILDABLE)))
+	{
+		// Assumes that aliens of both teams can build on the same hive location
+		AvHPlayer* theReceivingPlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(host));
+		if(theReceivingPlayer && theReceivingPlayer->GetIsAlien())
+		{
+			state->renderamt = 128;
+		}
+	}
+
+	// Handle cloakables here
+	if(!AvHSUGetIsExternalClassName(theEntNameString))
+	{
+		AvHCloakable* theCloakable = dynamic_cast<AvHCloakable*>(CBaseEntity::Instance(ent));
+		if(theCloakable)
+		{
+			// Now updated in gamerules
+			theCloakable->Update();
+
+			float theOpacityScalar = theCloakable->GetOpacity();
+			if(theOpacityScalar < 1.0f)
+			{
+				int theBaseOpacity = kAlienStructureCloakAmount;
+				int theOpacityRange = 255 - kAlienStructureCloakAmount;
+
+				// Allow spectators to see cloaked entities as if they are the player they are following, or as if they are on the same team as the alien otherwise
+				bool theCanSeeCloaked = (host->v.team == ent->v.team);
+				if(!theCanSeeCloaked)
+				{
+					int theHostIUserOne = host->v.iuser1;
+					if((theHostIUserOne == OBS_CHASE_LOCKED) || (theHostIUserOne == OBS_CHASE_FREE) || (theHostIUserOne == OBS_IN_EYE) )
+					{
+						// View entities as player we're tracking
+						int theHostIUserTwo = host->v.iuser2;
+						CBaseEntity* theSpectatingEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theHostIUserTwo));
+						if(theSpectatingEntity)
+						{
+							int theSpectatingEntityTeamNumber = theSpectatingEntity->pev->team;
+							if((theSpectatingEntityTeamNumber == ent->v.team) || (host->v.team == TEAM_IND))
+							{
+								theCanSeeCloaked = true;
+							}
+						}
+					}
+				}
+
+				if(theCanSeeCloaked)
+				{
+					theBaseOpacity = kAlienSelfCloakingBaseOpacity;
+					theOpacityRange = 255 - theBaseOpacity;
+				}
+
+				int theOpacity = theBaseOpacity + theOpacityScalar*theOpacityRange;
+				theOpacity = max(min(255, theOpacity), 0);
+
+				state->rendermode = kRenderTransTexture;
+				state->renderamt = theOpacity;
+			}
+		}
+	}
+	
+	// Spectator
+	state->iuser1 = ent->v.iuser1;
+	state->iuser2 = ent->v.iuser2;
+	
+	// AvH specials
+	state->iuser3 = ent->v.iuser3;
+	state->iuser4 = ent->v.iuser4;
+
+	// Slightly different processing for particle system entities
+//	if(theIsParticleSystemEntity)
+//	{
+//		// propagate weapon model as custom data)
+//		state->weaponmodel = ent->v.weaponmodel;
+//	}
+	
+	state->fuser1 = ent->v.fuser1;
+	state->fuser2 = ent->v.fuser2;
+	state->fuser3 = ent->v.fuser3;
+	state->vuser4 = ent->v.vuser4;
+
+
+
+
+
+	
+	state->aiment = 0;
+	if ( ent->v.aiment )
+	{
+	 state->aiment = ENTINDEX( ent->v.aiment );
+	}
+	
+	state->owner = 0;
+	if ( ent->v.owner )
+	{
+	 int owner = ENTINDEX( ent->v.owner );
+	 
+	 // Only care if owned by a player
+	 if ( owner >= 1 && owner <= gpGlobals->maxClients )
+	 {
+	  state->owner = owner; 
+	 }
+	}
+	
+	// HACK:  Somewhat...
+	// Class is overridden for non-players to signify a breakable glass object ( sort of a class? )
+	if ( !player )
+	{
+		state->playerclass  = ent->v.playerclass;
+	}
+
+	// Propagate team for all entities (mainly needed for client-side lasso selection)
+	state->team			= ent->v.team;
+	
+	// Check special vision mode
+	AvHPlayer* theReceivingPlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(host));
+	if(theReceivingPlayer && (theReceivingPlayer->GetIsAlienSightActive()))
+	{
+		bool marineGlow = false;
+		if (player) 
+		{
+			// Uncomment below to enable range for the alien flashlight
+			// vec3_t theDistanceVec;
+			// VectorSubtract(theReceivingPlayer->pev->origin, ent->v.origin, theDistanceVec);
+
+			// int theDistance = theDistanceVec[0] * theDistanceVec[0] + theDistanceVec[1] * theDistanceVec[1] + theDistanceVec[2] * theDistanceVec[2];
+			// int theRange = BALANCE_IVAR(kAlienFlashlightRange);
+			// marineGlow = (theDistance < ( theRange * theRange));
+			marineGlow = true;
+		}
+
+		if(( marineGlow || (ent->v.team == theReceivingPlayer->pev->team)) && (ent != theReceivingPlayer->edict()) && (ent->v.team != 0))
+		{
+			state->rendermode = kRenderTransAdd;
+			state->renderamt = 150;
+		}
+	}
+	
+	// Special stuff for players only
+	if(player)
+	{
+		state->basevelocity = ent->v.basevelocity;
+		
+		state->weaponmodel  = MODEL_INDEX( STRING( ent->v.weaponmodel ) );
+		state->gaitsequence = ent->v.gaitsequence;
+		state->spectator = ent->v.flags & FL_SPECTATOR;
+		state->friction     = ent->v.friction;
+		
+		state->gravity      = ent->v.gravity;
+		
+		// New SDK doesn't propagate team for a reason?
+		//state->playerclass  = ent->v.playerclass;
+		//state->team			= ent->v.team;
+		
+		bool theIsDucking = ent->v.flags & FL_DUCKING;
+		state->usehull = AvHMUGetHull(theIsDucking, ent->v.iuser3);
+		
+		// Propagate "energy level"
+		state->fuser3 = ent->v.fuser3;
+		
+		// For skulk oriented player model
+		state->vuser1 = ent->v.vuser1;
+		
+		// For weapons
+		state->vuser4 = ent->v.vuser4;
+		
+		//state->skin = theTargetPlayer->GetSkin();
+		state->skin = ent->v.skin;
+		state->playerclass = ent->v.playerclass;
+		//		state->armorvalue = ent->v.armorvalue;
+
+		AvHPlayer* thePlayerEntity = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(ent));
+		if(thePlayerEntity && thePlayerEntity->GetIsTemporarilyInvulnerable())
+		{
+			int theTeamIndex = ent->v.team;
+			ASSERT(theTeamIndex >= 0);
+			ASSERT(theTeamIndex < iNumberOfTeamColors);
+
+			state->renderfx = kRenderFxGlowShell;
+			state->rendercolor.r = kTeamColors[theTeamIndex][0];
+			state->rendercolor.g = kTeamColors[theTeamIndex][1];
+			state->rendercolor.b = kTeamColors[theTeamIndex][2];
+			state->renderamt = kInvulShellRenderAmount;
+		}
+	}
+	
+	state->health		= ent->v.health;
+
+	kNumReturn1++;
+
+	return 1;
+}
+ 
diff --git a/main/source/dlls/client.h b/main/source/dlls/client.h
new file mode 100644
index 00000000..ccf69c1f
--- /dev/null
+++ b/main/source/dlls/client.h
@@ -0,0 +1,68 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef CLIENT_H
+#define CLIENT_H
+
+extern void respawn( entvars_t* pev, BOOL fCopyCorpse );
+extern BOOL ClientConnect( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[ 128 ] );
+extern void ClientDisconnect( edict_t *pEntity );
+extern void ClientKill( edict_t *pEntity );
+extern void ClientPutInServer( edict_t *pEntity );
+extern void ClientCommand( edict_t *pEntity );
+extern void ClientUserInfoChanged( edict_t *pEntity, char *infobuffer );
+extern void ServerActivate( edict_t *pEdictList, int edictCount, int clientMax );
+extern void ServerDeactivate( void );
+extern void StartFrame( void );
+extern void PlayerPostThink( edict_t *pEntity );
+extern void PlayerPreThink( edict_t *pEntity );
+extern void ParmsNewLevel( void );
+extern void ParmsChangeLevel( void );
+
+extern void ClientPrecache( void );
+
+extern const char *GetGameDescription( void );
+extern void PlayerCustomization( edict_t *pEntity, customization_t *pCust );
+
+extern void ShowMenu(entvars_s *pev, int ValidSlots, int DisplayTime, BOOL ShowLater, char Menu[500]);
+extern void SpectatorConnect ( edict_t *pEntity );
+extern void SpectatorDisconnect ( edict_t *pEntity );
+extern void SpectatorThink ( edict_t *pEntity );
+
+extern void Sys_Error( const char *error_string );
+
+extern void SetupVisibility( edict_t *pViewEntity, edict_t *pClient, unsigned char **pvs, unsigned char **pas );
+extern void	UpdateClientData ( const struct edict_s *ent, int sendweapons, struct clientdata_s *cd );
+extern int AddToFullPack( struct entity_state_s *state, int e, edict_t *ent, edict_t *host, int hostflags, int player, unsigned char *pSet );
+extern void CreateBaseline( int player, int eindex, struct entity_state_s *baseline, struct edict_s *entity, int playermodelindex, vec3_t player_mins, vec3_t player_maxs );
+extern void RegisterEncoders( void );
+
+extern int GetWeaponData( struct edict_s *player, struct weapon_data_s *info );
+
+extern void	CmdStart( const edict_t *player, const struct usercmd_s *cmd, unsigned int random_seed );
+extern void	CmdEnd ( const edict_t *player );
+
+extern int	ConnectionlessPacket( const struct netadr_s *net_from, const char *args, char *response_buffer, int *response_buffer_size );
+
+extern int GetHullBounds( int hullnumber, float *mins, float *maxs );
+
+extern void	CreateInstancedBaselines ( void );
+
+extern int	InconsistentFile( const edict_t *player, const char *filename, char *disconnect_message );
+
+extern int AllowLagCompensation( void );
+
+//extern bool AvHClientCommand( edict_t *pEntity );
+
+#endif		// CLIENT_H
diff --git a/main/source/dlls/combat.cpp b/main/source/dlls/combat.cpp
new file mode 100644
index 00000000..bd3ffbcd
--- /dev/null
+++ b/main/source/dlls/combat.cpp
@@ -0,0 +1,1880 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/*
+
+===== combat.cpp ========================================================
+
+  functions dealing with damage infliction & death
+
+*/
+//
+// $Workfile: combat.cpp $
+// $Date: 2002/11/22 23:26:35 $
+//
+//-------------------------------------------------------------------------------
+// $Log: combat.cpp,v $
+// Revision 1.19  2002/11/22 23:26:35  Flayra
+// - Skulks had to aim too high to hit structures, so trying this approach to fixing the melee in vents bug
+//
+// Revision 1.18  2002/11/22 21:09:50  Flayra
+// - Explosion fixes (oops!)
+// - Fix melee when in vents (I think)
+//
+// Revision 1.17  2002/11/13 01:49:33  Flayra
+// - Proper death message logging for Psychostats
+//
+// Revision 1.16  2002/11/12 02:18:08  Flayra
+// - Pass on inflictor properly for standard logging
+//
+// Revision 1.15  2002/11/06 01:36:16  Flayra
+// - Allow scalar to apply to damage from gamerules (used for friendly fire)
+//
+// Revision 1.14  2002/10/03 18:26:36  Flayra
+// - Removed all pushback and forces when doing damage to players
+//
+// Revision 1.13  2002/08/16 02:25:21  Flayra
+// - New damage types
+//
+// Revision 1.12  2002/07/10 14:36:13  Flayra
+// - Removed major cause of lag: redundant server-side decals.  Also removed duplicate texture sound.
+//
+// Revision 1.11  2002/07/08 16:40:05  Flayra
+// - Fix bug where melee attacks couldn't aim up or down, reworked bullet firing to add random spread (bug #236)
+//
+//===============================================================================
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "soundent.h"
+#include "decals.h"
+#include "animation.h"
+#include "weapons.h"
+#include "func_break.h"
+#include "mod/AvHPlayer.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHTurret.h"
+//#include "mod/AvHMovementUtil.h"
+
+extern DLL_GLOBAL Vector		g_vecAttackDir;
+extern DLL_GLOBAL int			g_iSkillLevel;
+
+extern Vector VecBModelOrigin( entvars_t* pevBModel );
+extern entvars_t *g_pevLastInflictor;
+
+#define GERMAN_GIB_COUNT		4
+#define	HUMAN_GIB_COUNT			6
+#define ALIEN_GIB_COUNT			4
+
+
+// HACKHACK -- The gib velocity equations don't work
+void CGib :: LimitVelocity( void )
+{
+	float length = pev->velocity.Length();
+
+	// ceiling at 1500.  The gib velocity equation is not bounded properly.  Rather than tune it
+	// in 3 separate places again, I'll just limit it here.
+	if ( length > 1500.0 )
+		pev->velocity = pev->velocity.Normalize() * 1500;		// This should really be sv_maxvelocity * 0.75 or something
+}
+
+
+void CGib :: SpawnStickyGibs( entvars_t *pevVictim, Vector vecOrigin, int cGibs )
+{
+	int i;
+
+	if ( g_Language == LANGUAGE_GERMAN )
+	{
+		// no sticky gibs in germany right now!
+		return; 
+	}
+
+	for ( i = 0 ; i < cGibs ; i++ )
+	{
+		CGib *pGib = GetClassPtr( (CGib *)NULL );
+
+		pGib->Spawn( "models/stickygib.mdl" );
+		pGib->pev->body = RANDOM_LONG(0,2);
+
+		if ( pevVictim )
+		{
+			pGib->pev->origin.x = vecOrigin.x + RANDOM_FLOAT( -3, 3 );
+			pGib->pev->origin.y = vecOrigin.y + RANDOM_FLOAT( -3, 3 );
+			pGib->pev->origin.z = vecOrigin.z + RANDOM_FLOAT( -3, 3 );
+
+			/*
+			pGib->pev->origin.x = pevVictim->absmin.x + pevVictim->size.x * (RANDOM_FLOAT ( 0 , 1 ) );
+			pGib->pev->origin.y = pevVictim->absmin.y + pevVictim->size.y * (RANDOM_FLOAT ( 0 , 1 ) );
+			pGib->pev->origin.z = pevVictim->absmin.z + pevVictim->size.z * (RANDOM_FLOAT ( 0 , 1 ) );
+			*/
+
+			// make the gib fly away from the attack vector
+			pGib->pev->velocity = g_vecAttackDir * -1;
+
+			// mix in some noise
+			pGib->pev->velocity.x += RANDOM_FLOAT ( -0.15, 0.15 );
+			pGib->pev->velocity.y += RANDOM_FLOAT ( -0.15, 0.15 );
+			pGib->pev->velocity.z += RANDOM_FLOAT ( -0.15, 0.15 );
+
+			pGib->pev->velocity = pGib->pev->velocity * 900;
+
+			pGib->pev->avelocity.x = RANDOM_FLOAT ( 250, 400 );
+			pGib->pev->avelocity.y = RANDOM_FLOAT ( 250, 400 );
+
+			// copy owner's blood color
+			pGib->m_bloodColor = (CBaseEntity::Instance(pevVictim))->BloodColor();
+		
+			if ( pevVictim->health > -50)
+			{
+				pGib->pev->velocity = pGib->pev->velocity * 0.7;
+			}
+			else if ( pevVictim->health > -200)
+			{
+				pGib->pev->velocity = pGib->pev->velocity * 2;
+			}
+			else
+			{
+				pGib->pev->velocity = pGib->pev->velocity * 4;
+			}
+
+			
+			pGib->pev->movetype = MOVETYPE_TOSS;
+			pGib->pev->solid = SOLID_BBOX;
+			UTIL_SetSize ( pGib->pev, Vector ( 0, 0 ,0 ), Vector ( 0, 0, 0 ) );
+			pGib->SetTouch ( &CGib::StickyGibTouch );
+			pGib->SetThink (NULL);
+		}
+		pGib->LimitVelocity();
+	}
+}
+
+void CGib :: SpawnHeadGib( entvars_t *pevVictim )
+{
+	CGib *pGib = GetClassPtr( (CGib *)NULL );
+
+	if ( g_Language == LANGUAGE_GERMAN )
+	{
+		pGib->Spawn( "models/germangibs.mdl" );// throw one head
+		pGib->pev->body = 0;
+	}
+	else
+	{
+		pGib->Spawn( "models/hgibs.mdl" );// throw one head
+		pGib->pev->body = 0;
+	}
+
+	if ( pevVictim )
+	{
+		pGib->pev->origin = pevVictim->origin + pevVictim->view_ofs;
+		
+		edict_t		*pentPlayer = FIND_CLIENT_IN_PVS( pGib->edict() );
+		
+		if ( RANDOM_LONG ( 0, 100 ) <= 5 && pentPlayer )
+		{
+			// 5% chance head will be thrown at player's face.
+			entvars_t	*pevPlayer;
+
+			pevPlayer = VARS( pentPlayer );
+			pGib->pev->velocity = ( ( pevPlayer->origin + pevPlayer->view_ofs ) - pGib->pev->origin ).Normalize() * 300;
+			pGib->pev->velocity.z += 100;
+		}
+		else
+		{
+			pGib->pev->velocity = Vector (RANDOM_FLOAT(-100,100), RANDOM_FLOAT(-100,100), RANDOM_FLOAT(200,300));
+		}
+
+
+		pGib->pev->avelocity.x = RANDOM_FLOAT ( 100, 200 );
+		pGib->pev->avelocity.y = RANDOM_FLOAT ( 100, 300 );
+
+		// copy owner's blood color
+		pGib->m_bloodColor = (CBaseEntity::Instance(pevVictim))->BloodColor();
+	
+		if ( pevVictim->health > -50)
+		{
+			pGib->pev->velocity = pGib->pev->velocity * 0.7;
+		}
+		else if ( pevVictim->health > -200)
+		{
+			pGib->pev->velocity = pGib->pev->velocity * 2;
+		}
+		else
+		{
+			pGib->pev->velocity = pGib->pev->velocity * 4;
+		}
+	}
+	pGib->LimitVelocity();
+}
+
+void CGib :: SpawnRandomGibs( entvars_t *pevVictim, int cGibs, int human )
+{
+	int cSplat;
+
+	for ( cSplat = 0 ; cSplat < cGibs ; cSplat++ )
+	{
+		CGib *pGib = GetClassPtr( (CGib *)NULL );
+
+		if ( g_Language == LANGUAGE_GERMAN )
+		{
+			pGib->Spawn( "models/germangibs.mdl" );
+			pGib->pev->body = RANDOM_LONG(0,GERMAN_GIB_COUNT-1);
+		}
+		else
+		{
+			if ( human )
+			{
+				// human pieces
+				pGib->Spawn( "models/hgibs.mdl" );
+				pGib->pev->body = RANDOM_LONG(1,HUMAN_GIB_COUNT-1);// start at one to avoid throwing random amounts of skulls (0th gib)
+			}
+			else
+			{
+				// aliens
+				pGib->Spawn( "models/agibs.mdl" );
+				pGib->pev->body = RANDOM_LONG(0,ALIEN_GIB_COUNT-1);
+			}
+		}
+
+		if ( pevVictim )
+		{
+			// spawn the gib somewhere in the monster's bounding volume
+			pGib->pev->origin.x = pevVictim->absmin.x + pevVictim->size.x * (RANDOM_FLOAT ( 0 , 1 ) );
+			pGib->pev->origin.y = pevVictim->absmin.y + pevVictim->size.y * (RANDOM_FLOAT ( 0 , 1 ) );
+			pGib->pev->origin.z = pevVictim->absmin.z + pevVictim->size.z * (RANDOM_FLOAT ( 0 , 1 ) ) + 1;	// absmin.z is in the floor because the engine subtracts 1 to enlarge the box
+
+			// make the gib fly away from the attack vector
+			pGib->pev->velocity = g_vecAttackDir * -1;
+
+			// mix in some noise
+			pGib->pev->velocity.x += RANDOM_FLOAT ( -0.25, 0.25 );
+			pGib->pev->velocity.y += RANDOM_FLOAT ( -0.25, 0.25 );
+			pGib->pev->velocity.z += RANDOM_FLOAT ( -0.25, 0.25 );
+
+			pGib->pev->velocity = pGib->pev->velocity * RANDOM_FLOAT ( 300, 400 );
+
+			pGib->pev->avelocity.x = RANDOM_FLOAT ( 100, 200 );
+			pGib->pev->avelocity.y = RANDOM_FLOAT ( 100, 300 );
+
+			// copy owner's blood color
+			pGib->m_bloodColor = (CBaseEntity::Instance(pevVictim))->BloodColor();
+			
+			if ( pevVictim->health > -50)
+			{
+				pGib->pev->velocity = pGib->pev->velocity * 0.7;
+			}
+			else if ( pevVictim->health > -200)
+			{
+				pGib->pev->velocity = pGib->pev->velocity * 2;
+			}
+			else
+			{
+				pGib->pev->velocity = pGib->pev->velocity * 4;
+			}
+
+			pGib->pev->solid = SOLID_BBOX;
+			UTIL_SetSize ( pGib->pev, Vector( 0 , 0 , 0 ), Vector ( 0, 0, 0 ) );
+		}
+		pGib->LimitVelocity();
+	}
+}
+
+
+BOOL CBaseMonster :: HasHumanGibs( void )
+{
+	int myClass = Classify();
+
+	if ( myClass == CLASS_HUMAN_MILITARY ||
+		 myClass == CLASS_PLAYER_ALLY	||
+		 myClass == CLASS_HUMAN_PASSIVE  ||
+		 myClass == CLASS_PLAYER )
+
+		 return TRUE;
+
+	return FALSE;
+}
+
+
+BOOL CBaseMonster :: HasAlienGibs( void )
+{
+	int myClass = Classify();
+
+	if ( myClass == CLASS_ALIEN_MILITARY ||
+		 myClass == CLASS_ALIEN_MONSTER	||
+		 myClass == CLASS_ALIEN_PASSIVE  ||
+		 myClass == CLASS_INSECT  ||
+		 myClass == CLASS_ALIEN_PREDATOR  ||
+		 myClass == CLASS_ALIEN_PREY )
+
+		 return TRUE;
+
+	return FALSE;
+}
+
+
+void CBaseMonster::FadeMonster( void )
+{
+	StopAnimation();
+	pev->velocity = g_vecZero;
+	pev->movetype = MOVETYPE_NONE;
+	pev->avelocity = g_vecZero;
+	pev->animtime = gpGlobals->time;
+	pev->effects |= EF_NOINTERP;
+	SUB_StartFadeOut();
+}
+
+//=========================================================
+// GibMonster - create some gore and get rid of a monster's
+// model.
+//=========================================================
+void CBaseMonster :: GibMonster( void )
+{
+	TraceResult	tr;
+	BOOL		gibbed = FALSE;
+
+	EMIT_SOUND(ENT(pev), CHAN_WEAPON, "common/bodysplat.wav", 1, ATTN_NORM);		
+
+	// only humans throw skulls !!!UNDONE - eventually monsters will have their own sets of gibs
+	if ( HasHumanGibs() )
+	{
+		if ( CVAR_GET_FLOAT("violence_hgibs") != 0 )	// Only the player will ever get here
+		{
+			CGib::SpawnHeadGib( pev );
+			CGib::SpawnRandomGibs( pev, 4, 1 );	// throw some human gibs.
+		}
+		gibbed = TRUE;
+	}
+	else if ( HasAlienGibs() )
+	{
+		if ( CVAR_GET_FLOAT("violence_agibs") != 0 )	// Should never get here, but someone might call it directly
+		{
+			CGib::SpawnRandomGibs( pev, 4, 0 );	// Throw alien gibs
+		}
+		gibbed = TRUE;
+	}
+
+	if ( !IsPlayer() )
+	{
+		if ( gibbed )
+		{
+			// don't remove players!
+			SetThink ( &CBaseMonster::SUB_Remove );
+			pev->nextthink = gpGlobals->time;
+		}
+		else
+		{
+			FadeMonster();
+		}
+	}
+}
+
+//=========================================================
+// GetDeathActivity - determines the best type of death
+// anim to play.
+//=========================================================
+Activity CBaseMonster :: GetDeathActivity ( void )
+{
+	Activity	deathActivity;
+	BOOL		fTriedDirection;
+	float		flDot;
+	TraceResult	tr;
+	Vector		vecSrc;
+
+	if ( pev->deadflag != DEAD_NO )
+	{
+		// don't run this while dying.
+		return m_IdealActivity;
+	}
+
+	vecSrc = Center();
+
+	fTriedDirection = FALSE;
+	deathActivity = ACT_DIESIMPLE;// in case we can't find any special deaths to do.
+
+	UTIL_MakeVectors ( pev->angles );
+	flDot = DotProduct ( gpGlobals->v_forward, g_vecAttackDir * -1 );
+
+	switch ( m_LastHitGroup )
+	{
+		// try to pick a region-specific death.
+	case HITGROUP_HEAD:
+		deathActivity = ACT_DIE_HEADSHOT;
+		break;
+
+	case HITGROUP_STOMACH:
+		deathActivity = ACT_DIE_GUTSHOT;
+		break;
+
+	case HITGROUP_GENERIC:
+		// try to pick a death based on attack direction
+		fTriedDirection = TRUE;
+
+		if ( flDot > 0.3 )
+		{
+			deathActivity = ACT_DIEFORWARD;
+		}
+		else if ( flDot <= -0.3 )
+		{
+			deathActivity = ACT_DIEBACKWARD;
+		}
+		break;
+
+	default:
+		// try to pick a death based on attack direction
+		fTriedDirection = TRUE;
+
+		if ( flDot > 0.3 )
+		{
+			deathActivity = ACT_DIEFORWARD;
+		}
+		else if ( flDot <= -0.3 )
+		{
+			deathActivity = ACT_DIEBACKWARD;
+		}
+		break;
+	}
+
+
+	// can we perform the prescribed death?
+	if ( LookupActivity ( deathActivity ) == ACTIVITY_NOT_AVAILABLE )
+	{
+		// no! did we fail to perform a directional death? 
+		if ( fTriedDirection )
+		{
+			// if yes, we're out of options. Go simple.
+			deathActivity = ACT_DIESIMPLE;
+		}
+		else
+		{
+			// cannot perform the ideal region-specific death, so try a direction.
+			if ( flDot > 0.3 )
+			{
+				deathActivity = ACT_DIEFORWARD;
+			}
+			else if ( flDot <= -0.3 )
+			{
+				deathActivity = ACT_DIEBACKWARD;
+			}
+		}
+	}
+
+	if ( LookupActivity ( deathActivity ) == ACTIVITY_NOT_AVAILABLE )
+	{
+		// if we're still invalid, simple is our only option.
+		deathActivity = ACT_DIESIMPLE;
+	}
+
+	if ( deathActivity == ACT_DIEFORWARD )
+	{
+			// make sure there's room to fall forward
+			UTIL_TraceHull ( vecSrc, vecSrc + gpGlobals->v_forward * 64, dont_ignore_monsters, head_hull, edict(), &tr );
+
+			if ( tr.flFraction != 1.0 )
+			{
+				deathActivity = ACT_DIESIMPLE;
+			}
+	}
+
+	if ( deathActivity == ACT_DIEBACKWARD )
+	{
+			// make sure there's room to fall backward
+			UTIL_TraceHull ( vecSrc, vecSrc - gpGlobals->v_forward * 64, dont_ignore_monsters, head_hull, edict(), &tr );
+
+			if ( tr.flFraction != 1.0 )
+			{
+				deathActivity = ACT_DIESIMPLE;
+			}
+	}
+
+	return deathActivity;
+}
+
+//=========================================================
+// GetSmallFlinchActivity - determines the best type of flinch
+// anim to play.
+//=========================================================
+Activity CBaseMonster :: GetSmallFlinchActivity ( void )
+{
+	Activity	flinchActivity;
+	BOOL		fTriedDirection;
+	float		flDot;
+
+	fTriedDirection = FALSE;
+	UTIL_MakeVectors ( pev->angles );
+	flDot = DotProduct ( gpGlobals->v_forward, g_vecAttackDir * -1 );
+	
+	switch ( m_LastHitGroup )
+	{
+		// pick a region-specific flinch
+	case HITGROUP_HEAD:
+		flinchActivity = ACT_FLINCH_HEAD;
+		break;
+	case HITGROUP_STOMACH:
+		flinchActivity = ACT_FLINCH_STOMACH;
+		break;
+	case HITGROUP_LEFTARM:
+		flinchActivity = ACT_FLINCH_LEFTARM;
+		break;
+	case HITGROUP_RIGHTARM:
+		flinchActivity = ACT_FLINCH_RIGHTARM;
+		break;
+	case HITGROUP_LEFTLEG:
+		flinchActivity = ACT_FLINCH_LEFTLEG;
+		break;
+	case HITGROUP_RIGHTLEG:
+		flinchActivity = ACT_FLINCH_RIGHTLEG;
+		break;
+	case HITGROUP_GENERIC:
+	default:
+		// just get a generic flinch.
+		flinchActivity = ACT_SMALL_FLINCH;
+		break;
+	}
+
+
+	// do we have a sequence for the ideal activity?
+	if ( LookupActivity ( flinchActivity ) == ACTIVITY_NOT_AVAILABLE )
+	{
+		flinchActivity = ACT_SMALL_FLINCH;
+	}
+
+	return flinchActivity;
+}
+
+
+void CBaseMonster::BecomeDead( void )
+{
+	pev->takedamage = DAMAGE_YES;// don't let autoaim aim at corpses.
+	
+	// give the corpse half of the monster's original maximum health. 
+	pev->health = pev->max_health / 2;
+	pev->max_health = 5; // max_health now becomes a counter for how many blood decals the corpse can place.
+
+	// make the corpse fly away from the attack vector
+	pev->movetype = MOVETYPE_TOSS;
+	//pev->flags &= ~FL_ONGROUND;
+	//pev->origin.z += 2;
+	//pev->velocity = g_vecAttackDir * -1;
+	//pev->velocity = pev->velocity * RANDOM_FLOAT( 300, 400 );
+}
+
+
+BOOL CBaseMonster::ShouldGibMonster( int iGib )
+{
+	if ( ( iGib == GIB_NORMAL && pev->health < GIB_HEALTH_VALUE ) || ( iGib == GIB_ALWAYS ) )
+		return TRUE;
+	
+	return FALSE;
+}
+
+
+void CBaseMonster::CallGibMonster( void )
+{
+	BOOL fade = FALSE;
+
+	if ( HasHumanGibs() )
+	{
+		if ( CVAR_GET_FLOAT("violence_hgibs") == 0 )
+			fade = TRUE;
+	}
+	else if ( HasAlienGibs() )
+	{
+		if ( CVAR_GET_FLOAT("violence_agibs") == 0 )
+			fade = TRUE;
+	}
+
+	pev->takedamage = DAMAGE_NO;
+	pev->solid = SOLID_NOT;// do something with the body. while monster blows up
+
+	if ( fade )
+	{
+		FadeMonster();
+	}
+	else
+	{
+		pev->effects = EF_NODRAW; // make the model invisible.
+		GibMonster();
+	}
+
+	pev->deadflag = DEAD_DEAD;
+	FCheckAITrigger();
+
+	// don't let the status bar glitch for players.with <0 health.
+	if (pev->health < -99)
+	{
+		pev->health = 0;
+	}
+	
+	if ( ShouldFadeOnDeath() && !fade )
+		UTIL_Remove(this);
+}
+
+
+/*
+============
+Killed
+============
+*/
+void CBaseMonster :: Killed( entvars_t *pevAttacker, int iGib )
+{
+	unsigned int	cCount = 0;
+	BOOL			fDone = FALSE;
+
+	CBaseEntity* theBaseEntity = CBaseEntity::Instance(pevAttacker->owner);
+	if(!theBaseEntity)
+	{
+		theBaseEntity = CBaseEntity::Instance(pevAttacker);
+	}
+	ASSERT(theBaseEntity);
+	theBaseEntity->AwardKill(this->pev);
+	
+	if ( HasMemory( bits_MEMORY_KILLED ) )
+	{
+		if ( ShouldGibMonster( iGib ) )
+			CallGibMonster();
+		return;
+	}
+
+	Remember( bits_MEMORY_KILLED );
+
+	// clear the deceased's sound channels.(may have been firing or reloading when killed)
+	EMIT_SOUND(ENT(pev), CHAN_WEAPON, "common/null.wav", 1, ATTN_NORM);
+	m_IdealMonsterState = MONSTERSTATE_DEAD;
+	// Make sure this condition is fired too (TakeDamage breaks out before this happens on death)
+	SetConditions( bits_COND_LIGHT_DAMAGE );
+	
+	// tell owner ( if any ) that we're dead.This is mostly for MonsterMaker functionality.
+	CBaseEntity *pOwner = CBaseEntity::Instance(pev->owner);
+	if ( pOwner )
+	{
+		pOwner->DeathNotice( pev );
+	}
+
+	if	( ShouldGibMonster( iGib ) )
+	{
+		CallGibMonster();
+		return;
+	}
+	else if ( pev->flags & FL_MONSTER )
+	{
+		SetTouch( NULL );
+		BecomeDead();
+	}
+	
+	// don't let the status bar glitch for players.with <0 health.
+	if (pev->health < -99)
+	{
+		pev->health = 0;
+	}
+	
+	//pev->enemy = ENT( pevAttacker );//why? (sjb)
+	
+	m_IdealMonsterState = MONSTERSTATE_DEAD;
+
+}
+
+//
+// fade out - slowly fades a entity out, then removes it.
+//
+// DON'T USE ME FOR GIBS AND STUFF IN MULTIPLAYER! 
+// SET A FUTURE THINK AND A RENDERMODE!!
+void CBaseEntity :: SUB_StartFadeOut ( void )
+{
+	if (pev->rendermode == kRenderNormal)
+	{
+		pev->renderamt = 255;
+		pev->rendermode = kRenderTransTexture;
+	}
+
+	pev->solid = SOLID_NOT;
+	pev->avelocity = g_vecZero;
+
+	pev->nextthink = gpGlobals->time + 0.1;
+	SetThink ( &CBaseEntity::SUB_FadeOut );
+}
+
+void CBaseEntity :: SUB_FadeOut ( void  )
+{
+	if ( pev->renderamt > 7 )
+	{
+		pev->renderamt -= 7;
+		pev->nextthink = gpGlobals->time + 0.1;
+	}
+	else 
+	{
+		pev->renderamt = 0;
+		pev->nextthink = gpGlobals->time + 0.2;
+		SetThink ( &CBaseEntity::SUB_Remove );
+	}
+}
+
+//=========================================================
+// WaitTillLand - in order to emit their meaty scent from
+// the proper location, gibs should wait until they stop 
+// bouncing to emit their scent. That's what this function
+// does.
+//=========================================================
+void CGib :: WaitTillLand ( void )
+{
+	if (!IsInWorld())
+	{
+		UTIL_Remove( this );
+		return;
+	}
+
+	if ( pev->velocity == g_vecZero )
+	{
+		SetThink (&CGib::SUB_StartFadeOut);
+		pev->nextthink = gpGlobals->time + m_lifeTime;
+
+		// If you bleed, you stink!
+		if ( m_bloodColor != DONT_BLEED )
+		{
+			// ok, start stinkin!
+			CSoundEnt::InsertSound ( bits_SOUND_MEAT, pev->origin, 384, 25 );
+		}
+	}
+	else
+	{
+		// wait and check again in another half second.
+		pev->nextthink = gpGlobals->time + 0.5;
+	}
+}
+
+//
+// Gib bounces on the ground or wall, sponges some blood down, too!
+//
+void CGib :: BounceGibTouch ( CBaseEntity *pOther )
+{
+	Vector	vecSpot;
+	TraceResult	tr;
+	
+	//if ( RANDOM_LONG(0,1) )
+	//	return;// don't bleed everytime
+
+	if (pev->flags & FL_ONGROUND)
+	{
+		pev->velocity = pev->velocity * 0.9;
+		pev->angles.x = 0;
+		pev->angles.z = 0;
+		pev->avelocity.x = 0;
+		pev->avelocity.z = 0;
+	}
+	else
+	{
+		if ( g_Language != LANGUAGE_GERMAN && m_cBloodDecals > 0 && m_bloodColor != DONT_BLEED )
+		{
+			vecSpot = pev->origin + Vector ( 0 , 0 , 8 );//move up a bit, and trace down.
+			UTIL_TraceLine ( vecSpot, vecSpot + Vector ( 0, 0, -24 ),  ignore_monsters, ENT(pev), & tr);
+
+			UTIL_BloodDecalTrace( &tr, m_bloodColor );
+
+			m_cBloodDecals--; 
+		}
+
+		if ( m_material != matNone && RANDOM_LONG(0,2) == 0 )
+		{
+			float volume;
+			float zvel = fabs(pev->velocity.z);
+		
+			volume = 0.8 * min(1.0, ((float)zvel) / 450.0);
+
+			CBreakable::MaterialSoundRandom( edict(), (Materials)m_material, volume );
+		}
+	}
+}
+
+//
+// Sticky gib puts blood on the wall and stays put. 
+//
+void CGib :: StickyGibTouch ( CBaseEntity *pOther )
+{
+	Vector	vecSpot;
+	TraceResult	tr;
+	
+	SetThink ( &CBaseEntity::SUB_Remove );
+	pev->nextthink = gpGlobals->time + 10;
+
+	if ( !FClassnameIs( pOther->pev, "worldspawn" ) )
+	{
+		pev->nextthink = gpGlobals->time;
+		return;
+	}
+
+	UTIL_TraceLine ( pev->origin, pev->origin + pev->velocity * 32,  ignore_monsters, ENT(pev), & tr);
+
+	UTIL_BloodDecalTrace( &tr, m_bloodColor );
+
+	pev->velocity = tr.vecPlaneNormal * -1;
+	pev->angles = UTIL_VecToAngles ( pev->velocity );
+	pev->velocity = g_vecZero; 
+	pev->avelocity = g_vecZero;
+	pev->movetype = MOVETYPE_NONE;
+}
+
+//
+// Throw a chunk
+//
+void CGib :: Spawn( const char *szGibModel )
+{
+	pev->movetype = MOVETYPE_BOUNCE;
+	pev->friction = 0.55; // deading the bounce a bit
+	
+	// sometimes an entity inherits the edict from a former piece of glass,
+	// and will spawn using the same render FX or rendermode! bad!
+	pev->renderamt = 255;
+	pev->rendermode = kRenderNormal;
+	pev->renderfx = kRenderFxNone;
+	pev->solid = SOLID_SLIDEBOX;/// hopefully this will fix the VELOCITY TOO LOW crap
+	pev->classname = MAKE_STRING("gib");
+
+	SET_MODEL(ENT(pev), szGibModel);
+	UTIL_SetSize(pev, Vector( 0, 0, 0), Vector(0, 0, 0));
+
+	pev->nextthink = gpGlobals->time + 4;
+	m_lifeTime = 25;
+	SetThink ( &CGib::WaitTillLand );
+	SetTouch ( &CGib::BounceGibTouch );
+
+	m_material = matNone;
+	m_cBloodDecals = 5;// how many blood decals this gib can place (1 per bounce until none remain). 
+}
+
+// take health
+int CBaseMonster :: TakeHealth (float flHealth, int bitsDamageType)
+{
+	if (!pev->takedamage)
+		return 0;
+
+	// clear out any damage types we healed.
+	// UNDONE: generic health should not heal any
+	// UNDONE: time-based damage
+
+	m_bitsDamageType &= ~(bitsDamageType & ~DMG_TIMEBASED);
+	
+	return CBaseEntity::TakeHealth(flHealth, bitsDamageType);
+}
+
+/*
+============
+TakeDamage
+
+The damage is coming from inflictor, but get mad at attacker
+This should be the only function that ever reduces health.
+bitsDamageType indicates the type of damage sustained, ie: DMG_SHOCK
+
+Time-based damage: only occurs while the monster is within the trigger_hurt.
+When a monster is poisoned via an arrow etc it takes all the poison damage at once.
+
+
+
+GLOBALS ASSUMED SET:  g_iSkillLevel
+============
+*/
+int CBaseMonster :: TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType )
+{
+	float	flTake;
+	Vector	vecDir;
+
+	if (!pev->takedamage)
+		return 0;
+
+	if ( !IsAlive() )
+	{
+		return DeadTakeDamage( pevInflictor, pevAttacker, flDamage, bitsDamageType );
+	}
+
+	if ( pev->deadflag == DEAD_NO )
+	{
+		// no pain sound during death animation.
+		PainSound();// "Ouch!"
+	}
+
+	//!!!LATER - make armor consideration here!
+	flTake = flDamage;
+
+	// set damage type sustained
+	m_bitsDamageType |= bitsDamageType;
+
+	// grab the vector of the incoming attack. ( pretend that the inflictor is a little lower than it really is, so the body will tend to fly upward a bit).
+	vecDir = Vector( 0, 0, 0 );
+	if (!FNullEnt( pevInflictor ))
+	{
+		CBaseEntity *pInflictor = CBaseEntity :: Instance( pevInflictor );
+		if (pInflictor)
+		{
+			vecDir = ( pInflictor->Center() - Vector ( 0, 0, 10 ) - Center() ).Normalize();
+			vecDir = g_vecAttackDir = vecDir.Normalize();
+		}
+	}
+
+	// add to the damage total for clients, which will be sent as a single
+	// message at the end of the frame
+	// todo: remove after combining shotgun blasts?
+	if ( IsPlayer() )
+	{
+		if ( pevInflictor )
+			pev->dmg_inflictor = ENT(pevInflictor);
+
+		pev->dmg_take += flTake;
+
+		// check for godmode or invincibility
+		if ( pev->flags & FL_GODMODE )
+		{
+			return 0;
+		}
+	}
+
+	// HL: if this is a player, move him around!
+	// NS: Don't move players
+	if ( ( !FNullEnt( pevInflictor ) ) && (pev->movetype == MOVETYPE_WALK) && (!pevAttacker || pevAttacker->solid != SOLID_TRIGGER) && !IsPlayer())
+	{
+		pev->velocity = pev->velocity + vecDir * -DamageForce( flDamage );
+	}
+
+	// do the damage
+	pev->health -= flTake;
+
+	
+	// HACKHACK Don't kill monsters in a script.  Let them break their scripts first
+	if ( m_MonsterState == MONSTERSTATE_SCRIPT )
+	{
+		SetConditions( bits_COND_LIGHT_DAMAGE );
+		return 0;
+	}
+
+	if ( (int)(pev->health) <= 0 )
+	{
+		g_pevLastInflictor = pevInflictor;
+
+// Removed gibbing, as death animations weren't playing with gibs off
+//		if ( bitsDamageType & DMG_ALWAYSGIB )
+//		{
+//			Killed( pevAttacker, GIB_ALWAYS );
+//		}
+//		else if ( bitsDamageType & DMG_NEVERGIB )
+//		{
+			Killed( pevAttacker, GIB_NEVER );
+//		}
+//		else
+//		{
+//			Killed( pevAttacker, GIB_NORMAL );
+//		}
+
+		// Trigger log message if needed
+//		AvHPlayer* theDeadPlayer = dynamic_cast<AvHPlayer*>(this);
+//		AvHPlayer* theAttackingPlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(ENT(pevAttacker)));
+//		const char* inWeaponName = STRING(pevInflictor->classname);
+//		if(theDeadPlayer && theAttackingPlayer && inWeaponName)
+//		{
+//			theDeadPlayer->LogPlayerKilledPlayer(theAttackingPlayer, inWeaponName);
+//		}
+
+		g_pevLastInflictor = NULL;
+
+		return 0;
+	}
+
+	// react to the damage (get mad)
+	if ( (pev->flags & FL_MONSTER) && !FNullEnt(pevAttacker) )
+	{
+		if ( pevAttacker->flags & (FL_MONSTER | FL_CLIENT) )
+		{// only if the attack was a monster or client!
+			
+			// enemy's last known position is somewhere down the vector that the attack came from.
+			if (pevInflictor)
+			{
+				if (m_hEnemy == NULL || pevInflictor == m_hEnemy->pev || !HasConditions(bits_COND_SEE_ENEMY))
+				{
+					m_vecEnemyLKP = pevInflictor->origin;
+				}
+			}
+			else
+			{
+				m_vecEnemyLKP = pev->origin + ( g_vecAttackDir * 64 ); 
+			}
+
+			MakeIdealYaw( m_vecEnemyLKP );
+
+			// add pain to the conditions 
+			// !!!HACKHACK - fudged for now. Do we want to have a virtual function to determine what is light and 
+			// heavy damage per monster class?
+			if ( flDamage > 0 )
+			{
+				SetConditions(bits_COND_LIGHT_DAMAGE);
+			}
+
+			if ( flDamage >= 20 )
+			{
+				SetConditions(bits_COND_HEAVY_DAMAGE);
+			}
+		}
+	}
+
+	return 1;
+}
+
+//=========================================================
+// DeadTakeDamage - takedamage function called when a monster's
+// corpse is damaged.
+//=========================================================
+int CBaseMonster :: DeadTakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType )
+{
+	Vector			vecDir;
+
+	// grab the vector of the incoming attack. ( pretend that the inflictor is a little lower than it really is, so the body will tend to fly upward a bit).
+	vecDir = Vector( 0, 0, 0 );
+	if (!FNullEnt( pevInflictor ))
+	{
+		CBaseEntity *pInflictor = CBaseEntity :: Instance( pevInflictor );
+		if (pInflictor)
+		{
+			vecDir = ( pInflictor->Center() - Vector ( 0, 0, 10 ) - Center() ).Normalize();
+			vecDir = g_vecAttackDir = vecDir.Normalize();
+		}
+	}
+
+#if 0// turn this back on when the bounding box issues are resolved.
+
+	pev->flags &= ~FL_ONGROUND;
+	pev->origin.z += 1;
+	
+	// let the damage scoot the corpse around a bit.
+	if ( !FNullEnt(pevInflictor) && (pevAttacker->solid != SOLID_TRIGGER) )
+	{
+		pev->velocity = pev->velocity + vecDir * -DamageForce( flDamage );
+	}
+
+#endif
+
+	// kill the corpse if enough damage was done to destroy the corpse and the damage is of a type that is allowed to destroy the corpse.
+	if ( bitsDamageType & DMG_GIB_CORPSE )
+	{
+		if ( pev->health <= flDamage )
+		{
+			pev->health = -50;
+			Killed( pevAttacker, GIB_ALWAYS );
+			return 0;
+		}
+		// Accumulate corpse gibbing damage, so you can gib with multiple hits
+		pev->health -= flDamage * 0.1;
+	}
+	
+	return 1;
+}
+
+
+float CBaseMonster :: DamageForce( float damage )
+{ 
+	float force = damage * ((32 * 32 * 72.0) / (pev->size.x * pev->size.y * pev->size.z)) * 5;
+	
+	if ( force > 1000.0) 
+	{
+		force = 1000.0;
+	}
+
+	return force;
+}
+
+//
+// RadiusDamage - this entity is exploding, or otherwise needs to inflict damage upon entities within a certain range.
+// 
+// only damage ents that can clearly be seen by the explosion!
+
+	
+void RadiusDamage( Vector vecSrc, entvars_t *pevInflictor, entvars_t *pevAttacker, float inDamage, float flRadius, int iClassIgnore, int bitsDamageType )
+{
+	CBaseEntity *pEntity = NULL;
+	TraceResult	tr;
+	float		flAdjustedDamage, falloff;
+	Vector		vecSpot;
+
+	if ( flRadius )
+		falloff = inDamage / flRadius;
+	else
+		falloff = 1.0;
+
+	int bInWater = (UTIL_PointContents ( vecSrc ) == CONTENTS_WATER);
+
+	vecSrc.z += 1;// in case grenade is lying on the ground
+
+	if ( !pevAttacker )
+		pevAttacker = pevInflictor;
+
+	// iterate on all entities in the vicinity.
+	while ((pEntity = UTIL_FindEntityInSphere( pEntity, vecSrc, flRadius )) != NULL)
+	{
+		// NOTE: Should this be inflictor or attacker?
+		CBaseEntity* theInflictingEntity = CBaseEntity::Instance(pevInflictor);
+		CBaseEntity* theAttackingEntity = CBaseEntity::Instance(pevAttacker);
+		float theScalar = 1.0f;
+		bool aCanDamage=GetGameRules()->CanEntityDoDamageTo(theAttackingEntity, pEntity, &theScalar) || theInflictingEntity->pev->classname == MAKE_STRING(kwsDeployedMine);;
+		bool iCanDamage=GetGameRules()->CanEntityDoDamageTo(theInflictingEntity, pEntity, &theScalar);
+
+		if(pEntity && ( aCanDamage && iCanDamage ))
+		{
+			// Multiply damage by scalar for tourny mode, etc.
+			float theDamage = inDamage*theScalar;
+
+			if ( pEntity->pev->takedamage != DAMAGE_NO )
+			{
+
+				// UNDONE: this should check a damage mask, not an ignore
+				if ( iClassIgnore != CLASS_NONE && pEntity->Classify() == iClassIgnore )
+				{// houndeyes don't hurt other houndeyes with their attack
+					continue;
+				}
+			
+				// blast's don't tavel into or out of water
+				if (bInWater && pEntity->pev->waterlevel == 0)
+					continue;
+				if (!bInWater && pEntity->pev->waterlevel == 3)
+					continue;
+			
+				vecSpot = pEntity->BodyTarget( vecSrc );
+
+				// Clear pevInflictor's owner temporarily so it can apply damage to it
+				edict_t* theInflictorOwner = pevInflictor->owner;
+				pevInflictor->owner = NULL;
+				
+				UTIL_TraceLine ( vecSrc, vecSpot, dont_ignore_monsters, ENT(pevInflictor), &tr );
+
+				// Restore owner
+				pevInflictor->owner = theInflictorOwner;
+				
+                if (tr.flFraction == 1.0 || tr.pHit == pEntity->edict() )
+				{// the explosion can 'see' this entity, so hurt them!
+					if (tr.fStartSolid)
+					{
+						// if we're stuck inside them, fixup the position and distance
+						tr.vecEndPos = vecSrc;
+						tr.flFraction = 0.0;
+					}
+					
+					// decrease damage for an ent that's farther from the bomb.
+					flAdjustedDamage = ( vecSrc - tr.vecEndPos ).Length() * falloff;
+					flAdjustedDamage = theDamage - flAdjustedDamage;
+				
+					if ( flAdjustedDamage > 0 )
+					{
+						pEntity->TakeDamage ( pevInflictor, pevAttacker, flAdjustedDamage, bitsDamageType );
+					}
+				}
+			}
+		}
+	}
+}
+
+
+void CBaseMonster :: RadiusDamage(entvars_t* pevInflictor, entvars_t*	pevAttacker, float flDamage, int iClassIgnore, int bitsDamageType )
+{
+	::RadiusDamage( pev->origin, pevInflictor, pevAttacker, flDamage, flDamage * 2.5, iClassIgnore, bitsDamageType );
+}
+
+
+void CBaseMonster :: RadiusDamage( Vector vecSrc, entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int iClassIgnore, int bitsDamageType )
+{
+	::RadiusDamage( vecSrc, pevInflictor, pevAttacker, flDamage, flDamage * 2.5, iClassIgnore, bitsDamageType );
+}
+
+int CBaseMonster::GetHull() const
+{
+	return head_hull;
+}
+
+//=========================================================
+// CheckTraceHullAttack - expects a length to trace, amount 
+// of damage to do, and damage type. Returns a pointer to
+// the damaged entity in case the monster wishes to do
+// other stuff to the victim (punchangle, etc)
+//
+// Used for many contact-range melee attacks. Bites, claws, etc.
+//=========================================================
+CBaseEntity* CBaseMonster :: CheckTraceHullAttack( float flDist, float& ioDamage, int iDmgType )
+{
+	Vector vecStart = pev->origin;
+	
+	if(this->IsPlayer())
+	{
+		// Melee attacks always originate where the view is
+		vecStart.x += this->pev->view_ofs.x;
+		vecStart.y += this->pev->view_ofs.y;
+		vecStart.z += this->pev->view_ofs.z;
+	}
+	
+	if (IsPlayer())
+		UTIL_MakeVectors( pev->v_angle );
+	else
+		UTIL_MakeAimVectors( pev->angles );
+	
+	//AvHSUPlayParticleEvent("JetpackEffect", this->edict(), vecStart);
+
+	// First do a tracehull.  If that misses, try three tracelines (dead-on center, then randomly left and randomly right).
+	bool theHitTarget = false;
+	for(int i = 0; (i < 4) && !theHitTarget; i++)
+	{
+		const float kAmount = 0.4f;
+		float theXAmount = 0.0f;
+		
+		if(i == 2)
+		{
+			theXAmount = kAmount;
+		}
+		else if(i == 3)
+		{
+			theXAmount = -kAmount;
+		}
+
+		Vector vecDir = gpGlobals->v_forward + theXAmount*gpGlobals->v_right;
+		vecDir.Normalize();
+
+		Vector vecEnd = vecStart + (vecDir * flDist );
+		TraceResult tr;
+
+		if(i == 0)
+		{
+			int theOurHull = this->GetHull();
+			int theHull = AvHSUGetValveHull(theOurHull);
+			UTIL_TraceHull(vecStart, vecEnd, dont_ignore_monsters, theHull, this->edict(), &tr);
+		}
+		else
+		{
+			//AvHSUPlayParticleEvent("JetpackEffect", this->edict(), vecEnd);
+
+			UTIL_TraceLine(vecStart, vecEnd, dont_ignore_monsters, dont_ignore_glass, ENT(this->pev), &tr);
+		}
+		
+		if ( tr.pHit )
+		{
+			CBaseEntity *pEntity = CBaseEntity::Instance( tr.pHit );
+			
+			if ( ioDamage > 0 )
+			{
+				float theScalar = 1.0f;
+				if(GetGameRules()->CanEntityDoDamageTo(this, pEntity, &theScalar))
+				{
+					theHitTarget = true;
+
+					// Multiply damage by scalar for tourny mode, etc.
+					ioDamage *= theScalar;
+					
+					entvars_t* theInflictor = this->pev;
+					AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this);
+					if(thePlayer)
+					{
+						AvHBasePlayerWeapon* theBasePlayerWeapon = dynamic_cast<AvHBasePlayerWeapon*>(thePlayer->m_pActiveItem);
+						if(theBasePlayerWeapon)
+						{
+							theInflictor = theBasePlayerWeapon->pev;
+						}
+					}
+					
+					pEntity->TakeDamage(theInflictor, pev, ioDamage, iDmgType );
+
+					// Spawn blood
+					if(ioDamage > 0.0f)
+					{
+						// a little surface blood.
+						SpawnBlood(tr.vecEndPos, pEntity->BloodColor(), ioDamage);
+
+						// on the wall/floor (don't play because blood decal is green)
+						//TraceBleed(ioDamage, vecDir, &tr, iDmgType);
+					}
+		
+					return pEntity;
+				}
+			}
+		}
+	}
+
+	return NULL;
+}
+
+
+//=========================================================
+// FInViewCone - returns true is the passed ent is in
+// the caller's forward view cone. The dot product is performed
+// in 2d, making the view cone infinitely tall. 
+//=========================================================
+BOOL CBaseMonster :: FInViewCone ( CBaseEntity *pEntity )
+{
+	Vector2D	vec2LOS;
+	float	flDot;
+
+	UTIL_MakeVectors ( pev->angles );
+	
+	vec2LOS = ( pEntity->pev->origin - pev->origin ).Make2D();
+	vec2LOS = vec2LOS.Normalize();
+
+	flDot = DotProduct (vec2LOS , gpGlobals->v_forward.Make2D() );
+
+	if ( flDot > m_flFieldOfView )
+	{
+		return TRUE;
+	}
+	else
+	{
+		return FALSE;
+	}
+}
+
+//=========================================================
+// FInViewCone - returns true is the passed vector is in
+// the caller's forward view cone. The dot product is performed
+// in 2d, making the view cone infinitely tall. 
+//=========================================================
+BOOL CBaseMonster :: FInViewCone ( Vector *pOrigin )
+{
+	Vector2D	vec2LOS;
+	float		flDot;
+
+	UTIL_MakeVectors ( pev->angles );
+	
+	vec2LOS = ( *pOrigin - pev->origin ).Make2D();
+	vec2LOS = vec2LOS.Normalize();
+
+	flDot = DotProduct (vec2LOS , gpGlobals->v_forward.Make2D() );
+
+	if ( flDot > m_flFieldOfView )
+	{
+		return TRUE;
+	}
+	else
+	{
+		return FALSE;
+	}
+}
+
+//=========================================================
+// FVisible - returns true if a line can be traced from
+// the caller's eyes to the target
+//=========================================================
+BOOL CBaseEntity :: FVisible ( CBaseEntity *pEntity )
+{
+	TraceResult tr;
+	Vector		vecLookerOrigin;
+	Vector		vecTargetOrigin;
+	
+	if (FBitSet( pEntity->pev->flags, FL_NOTARGET ))
+		return FALSE;
+
+	// don't look through water  //edit by Elven Thief to prevent bug #728
+    //  if ((pev->waterlevel != 3 && pEntity->pev->waterlevel == 3) 
+	//	|| (pev->waterlevel == 3 && pEntity->pev->waterlevel == 0))
+	//	return FALSE;
+
+	vecLookerOrigin = pev->origin + pev->view_ofs;//look through the caller's 'eyes'
+	vecTargetOrigin = pEntity->EyePosition();
+
+	return AvHCheckLineOfSight(vecLookerOrigin, vecTargetOrigin, ENT(pev));
+
+}
+
+//=========================================================
+// FVisible - returns true if a line can be traced from
+// the caller's eyes to the target vector
+//=========================================================
+BOOL CBaseEntity :: FVisible ( const Vector &vecOrigin )
+{
+	TraceResult tr;
+	Vector		vecLookerOrigin;
+	
+	vecLookerOrigin = EyePosition();//look through the caller's 'eyes'
+
+    return AvHCheckLineOfSight(vecLookerOrigin, vecOrigin, ENT(pev));
+
+}
+
+/*
+================
+TraceAttack
+================
+*/
+void CBaseEntity::TraceAttack(entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType)
+{
+	Vector vecOrigin = ptr->vecEndPos - vecDir * 4;
+
+	if ( pev->takedamage )
+	{
+		AddMultiDamage( pevAttacker, this, flDamage, bitsDamageType );
+
+		int blood = BloodColor();
+		
+		if ( blood != DONT_BLEED )
+		{
+			SpawnBlood(vecOrigin, blood, flDamage);// a little surface blood.
+			TraceBleed( flDamage, vecDir, ptr, bitsDamageType );
+		}
+	}
+}
+
+
+/*
+//=========================================================
+// TraceAttack
+//=========================================================
+void CBaseMonster::TraceAttack(entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType)
+{
+	Vector vecOrigin = ptr->vecEndPos - vecDir * 4;
+
+	ALERT ( at_console, "%d\n", ptr->iHitgroup );
+
+
+	if ( pev->takedamage )
+	{
+		AddMultiDamage( pevAttacker, this, flDamage, bitsDamageType );
+
+		int blood = BloodColor();
+		
+		if ( blood != DONT_BLEED )
+		{
+			SpawnBlood(vecOrigin, blood, flDamage);// a little surface blood.
+		}
+	}
+}
+*/
+
+//=========================================================
+// TraceAttack
+//=========================================================
+void CBaseMonster :: TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType)
+{
+	if ( pev->takedamage )
+	{
+		m_LastHitGroup = ptr->iHitgroup;
+
+		switch ( ptr->iHitgroup )
+		{
+		case HITGROUP_GENERIC:
+			break;
+		case HITGROUP_HEAD:
+			flDamage *= gSkillData.monHead;
+			break;
+		case HITGROUP_CHEST:
+			flDamage *= gSkillData.monChest;
+			break;
+		case HITGROUP_STOMACH:
+			flDamage *= gSkillData.monStomach;
+			break;
+		case HITGROUP_LEFTARM:
+		case HITGROUP_RIGHTARM:
+			flDamage *= gSkillData.monArm;
+			break;
+		case HITGROUP_LEFTLEG:
+		case HITGROUP_RIGHTLEG:
+			flDamage *= gSkillData.monLeg;
+			break;
+		default:
+			break;
+		}
+
+		SpawnBlood(ptr->vecEndPos, BloodColor(), flDamage);// a little surface blood.
+		TraceBleed( flDamage, vecDir, ptr, bitsDamageType );
+		AddMultiDamage( pevAttacker, this, flDamage, bitsDamageType );
+	}
+}
+
+/*
+================
+FireBullets
+
+Go to the trouble of combining multiple pellets into a single damage call.
+
+This version is used by Monsters.
+================
+*/
+void CBaseEntity::FireBullets(ULONG cShots, Vector vecSrc, Vector vecDirShooting, Vector vecSpread, float flDistance, int iBulletType, int iTracerFreq, int iDamage, entvars_t *pevAttacker, int inDamageType)
+{
+	static int tracerCount;
+	int tracer;
+	TraceResult tr;
+	Vector vecRight = gpGlobals->v_right;
+	Vector vecUp = gpGlobals->v_up;
+
+	if ( pevAttacker == NULL )
+		pevAttacker = pev;  // the default attacker is ourselves
+
+	ClearMultiDamage();
+	gMultiDamage.type = inDamageType;
+
+	for (ULONG iShot = 1; iShot <= cShots; iShot++)
+	{
+		// get circular gaussian spread
+		float x, y, z;
+		do {
+			x = RANDOM_FLOAT(-0.5,0.5) + RANDOM_FLOAT(-0.5,0.5);
+			y = RANDOM_FLOAT(-0.5,0.5) + RANDOM_FLOAT(-0.5,0.5);
+			z = x*x+y*y;
+		} while (z > 1);
+
+		Vector vecDir = vecDirShooting +
+						x * vecSpread.x * vecRight +
+						y * vecSpread.y * vecUp;
+		Vector vecEnd;
+
+		vecEnd = vecSrc + vecDir * flDistance;
+		//UTIL_TraceLine(vecSrc, vecEnd, dont_ignore_monsters, ENT(pev)/*pentIgnore*/, &tr);
+		bool theProtected = false;
+		AvHSUServerTraceBullets(vecSrc, vecEnd, dont_ignore_monsters, ENT(pev), tr, theProtected);
+		CBaseEntity* theEntityHit = CBaseEntity::Instance(tr.pHit);
+
+		if(theProtected && theEntityHit)
+		{	
+			// joev: experiment
+			EMIT_SOUND(theEntityHit->edict(), CHAN_AUTO, kUmbraBlockedSound, 1.0f, ATTN_NORM);
+			// :joev
+		}
+		else
+		{
+			tracer = 0;
+			if (iTracerFreq != 0 && (tracerCount++ % iTracerFreq) == 0)
+			{
+				Vector vecTracerSrc;
+			
+				if ( IsPlayer() )
+				{// adjust tracer position for player
+					vecTracerSrc = vecSrc + Vector ( 0 , 0 , -4 ) + gpGlobals->v_right * 2 + gpGlobals->v_forward * 16;
+				}
+				else
+				{
+					vecTracerSrc = vecSrc;
+				}
+				
+				if ( iTracerFreq != 1 )		// guns that always trace also always decal
+					tracer = 1;
+				switch( iBulletType )
+				{
+				case BULLET_MONSTER_MP5:
+				case BULLET_MONSTER_9MM:
+				case BULLET_MONSTER_12MM:
+				default:
+					MESSAGE_BEGIN( MSG_PAS, SVC_TEMPENTITY, vecTracerSrc );
+						WRITE_BYTE( TE_TRACER );
+						WRITE_COORD( vecTracerSrc.x );
+						WRITE_COORD( vecTracerSrc.y );
+						WRITE_COORD( vecTracerSrc.z );
+						WRITE_COORD( tr.vecEndPos.x );
+						WRITE_COORD( tr.vecEndPos.y );
+						WRITE_COORD( tr.vecEndPos.z );
+					MESSAGE_END();
+					break;
+				}
+			}
+			// do damage, paint decals
+			if (tr.flFraction != 1.0)
+			{
+				float theScalar = 1.0f;
+				if(theEntityHit && GetGameRules()->CanEntityDoDamageTo(this, theEntityHit, &theScalar))
+				{
+					// Multiply damage by scalar for tourny mode, etc.
+					iDamage *= theScalar;
+
+					if ( iDamage )
+					{
+						theEntityHit->TraceAttack(pevAttacker, iDamage, vecDir, &tr, DMG_BULLET | ((iDamage > 16) ? DMG_ALWAYSGIB : DMG_NEVERGIB) );
+						
+						TEXTURETYPE_PlaySound(&tr, vecSrc, vecEnd, iBulletType);
+						DecalGunshot( &tr, iBulletType );
+						//DecalGunshot( &tr, 0 );
+					} 
+					else switch(iBulletType)
+					{
+					default:
+					case BULLET_MONSTER_9MM:
+						theEntityHit->TraceAttack(pevAttacker, gSkillData.monDmg9MM, vecDir, &tr, DMG_BULLET);
+						
+						TEXTURETYPE_PlaySound(&tr, vecSrc, vecEnd, iBulletType);
+						DecalGunshot( &tr, iBulletType );
+					
+						break;
+					
+					case BULLET_MONSTER_MP5:
+						theEntityHit->TraceAttack(pevAttacker, gSkillData.monDmgMP5, vecDir, &tr, DMG_BULLET);
+						
+						TEXTURETYPE_PlaySound(&tr, vecSrc, vecEnd, iBulletType);
+						DecalGunshot( &tr, iBulletType );
+					
+						break;
+					
+					case BULLET_MONSTER_12MM:		
+						theEntityHit->TraceAttack(pevAttacker, gSkillData.monDmg12MM, vecDir, &tr, DMG_BULLET); 
+						if ( !tracer )
+						{
+							TEXTURETYPE_PlaySound(&tr, vecSrc, vecEnd, iBulletType);
+							DecalGunshot( &tr, iBulletType );
+						}
+						break;
+					
+					case BULLET_NONE: // FIX 
+						theEntityHit->TraceAttack(pevAttacker, 50, vecDir, &tr, DMG_CLUB);
+						TEXTURETYPE_PlaySound(&tr, vecSrc, vecEnd, iBulletType);
+						// only decal glass
+						if ( !FNullEnt(tr.pHit) && VARS(tr.pHit)->rendermode != 0)
+						{
+							UTIL_DecalTrace( &tr, DECAL_GLASSBREAK1 + RANDOM_LONG(0,2) );
+						}
+					
+						break;
+					}
+				}
+			}
+			// make bullet trails
+			UTIL_BubbleTrail( vecSrc, tr.vecEndPos, (flDistance * tr.flFraction) / 64.0 );
+		}
+	}
+	ApplyMultiDamage(pev, pevAttacker);
+}
+
+
+/*
+================
+FireBullets
+
+Go to the trouble of combining multiple pellets into a single damage call.
+ 
+This version is used by Players, uses the random seed generator to sync client and server side shots.
+================
+*/
+Vector CBaseEntity::FireBulletsPlayer ( ULONG cShots, Vector vecSrc, Vector vecDirShooting, Vector vecSpread, float flDistance, int iBulletType, int iTracerFreq, int iDamage, entvars_t *pevAttacker, int shared_rand )
+{
+	static int tracerCount;
+	TraceResult tr;
+	Vector vecRight = gpGlobals->v_right;
+	Vector vecUp = gpGlobals->v_up;
+	entvars_t* theInflictor = this->pev;
+	//float x, y, z;
+	
+	if ( pevAttacker == NULL )
+		pevAttacker = pev;  // the default attacker is ourselves
+	
+	int theDamageType = DMG_BULLET;
+	bool isShotgun=false;
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this);
+	if(thePlayer && thePlayer->m_pActiveItem)
+	{
+		AvHBasePlayerWeapon* theBasePlayerWeapon = dynamic_cast<AvHBasePlayerWeapon*>(thePlayer->m_pActiveItem);
+		if(theBasePlayerWeapon)
+		{
+			theDamageType = theBasePlayerWeapon->GetDamageType();
+			theInflictor = theBasePlayerWeapon->pev;
+		}
+		AvHSonicGun* theSonicGun = dynamic_cast<AvHSonicGun*>(thePlayer->m_pActiveItem);
+		if ( theSonicGun ) 
+		{
+			isShotgun=true;
+		}
+	}	
+	else
+	{
+		AvHTurret* theTurret = dynamic_cast<AvHTurret*>(this);
+		if(theTurret)
+		{
+			theDamageType = theTurret->GetDamageType();
+		}
+	}
+
+	ClearMultiDamage();
+	gMultiDamage.type = theDamageType;
+
+	for ( ULONG iShot = 1; iShot <= cShots; iShot++ )
+	{
+		//Use player's random seed.
+		// get circular gaussian spread
+		//x = UTIL_SharedRandomFloat( shared_rand + iShot, -0.5, 0.5 ) + UTIL_SharedRandomFloat( shared_rand + ( 1 + iShot ) , -0.5, 0.5 );
+		//y = UTIL_SharedRandomFloat( shared_rand + ( 2 + iShot ), -0.5, 0.5 ) + UTIL_SharedRandomFloat( shared_rand + ( 3 + iShot ), -0.5, 0.5 );
+		//z = x * x + y * y;
+		//
+		//Vector vecDir = vecDirShooting +
+		//				x * vecSpread.x * vecRight +
+		//				y * vecSpread.y * vecUp;
+
+		Vector vecDir = UTIL_GetRandomSpreadDir(shared_rand, iShot, vecDirShooting, vecRight, vecUp, vecSpread);
+		Vector vecEnd;
+
+		vecEnd = vecSrc + vecDir * flDistance;
+		//UTIL_TraceLine(vecSrc, vecEnd, dont_ignore_monsters, ENT(pev)/*pentIgnore*/, &tr);
+		bool theProtected = false;
+		AvHSUServerTraceBullets(vecSrc, vecEnd, dont_ignore_monsters, ENT(pev), tr, theProtected);
+		CBaseEntity* theEntityHit = CBaseEntity::Instance(tr.pHit);
+
+		if(theProtected)
+		{
+			// joev: experiment
+			EMIT_SOUND(theEntityHit->edict(), CHAN_AUTO, kUmbraBlockedSound, 1.0f, ATTN_NORM);
+			// :joev
+		}
+		else
+		{
+		
+			// do damage, paint decals
+			if (tr.flFraction != 1.0)
+			{
+				float theScalar = 1.0f;
+				if(GetGameRules()->CanEntityDoDamageTo(thePlayer, theEntityHit, &theScalar))
+				{
+					int theAdjustedDamage = iDamage*theScalar;
+
+					if(theAdjustedDamage)
+					{
+						if ( isShotgun && !( theEntityHit->pev->iuser3 & AVH_USER3_BREAKABLE) ) 
+						{
+							float distance=fabs((vecSrc - theEntityHit->pev->origin).Length());
+							if ( distance > BALANCE_FVAR(kShotgunDamageRange) )
+							{
+								float fallOffDistance=distance-BALANCE_FVAR(kShotgunDamageRange);
+								float fallOff=max(0.0, 1.0f-(fallOffDistance/(kSGRange/2)));
+								theAdjustedDamage*=fallOff;
+							}
+						}
+						if ( theAdjustedDamage ) {
+							theEntityHit->TraceAttack(pevAttacker, theAdjustedDamage, vecDir, &tr, theDamageType | ((theAdjustedDamage > 16) ? DMG_ALWAYSGIB : DMG_NEVERGIB) );
+						}
+
+//						TEXTURETYPE_PlaySound(&tr, vecSrc, vecEnd, iBulletType);
+//						DecalGunshot( &tr, iBulletType );
+					} 
+				}
+			}
+			// make bullet trails
+			UTIL_BubbleTrail( vecSrc, tr.vecEndPos, (flDistance * tr.flFraction) / 64.0 );
+		}
+	}
+	ApplyMultiDamage(theInflictor, pevAttacker);
+
+	//return Vector( (float)(x * vecSpread.x), (float)(y * vecSpread.y), 0.0f );
+	return vecSpread;
+}
+
+void CBaseEntity :: TraceBleed( float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType )
+{
+	if (BloodColor() == DONT_BLEED)
+		return;
+	
+	if (flDamage == 0)
+		return;
+
+	if (! (bitsDamageType & (DMG_CRUSH | DMG_BULLET | DMG_SLASH | DMG_BLAST | DMG_CLUB /*| DMG_MORTAR*/ )))
+		return;
+	
+	// make blood decal on the wall! 
+	TraceResult Bloodtr;
+	Vector vecTraceDir; 
+	float flNoise;
+	int cCount;
+	int i;
+
+/*
+	if ( !IsAlive() )
+	{
+		// dealing with a dead monster. 
+		if ( pev->max_health <= 0 )
+		{
+			// no blood decal for a monster that has already decalled its limit.
+			return; 
+		}
+		else
+		{
+			pev->max_health--;
+		}
+	}
+*/
+
+	if (flDamage < 10)
+	{
+		flNoise = 0.1;
+		cCount = 1;
+	}
+	else if (flDamage < 25)
+	{
+		flNoise = 0.2;
+		cCount = 2;
+	}
+	else
+	{
+		flNoise = 0.3;
+		cCount = 4;
+	}
+
+	for ( i = 0 ; i < cCount ; i++ )
+	{
+		vecTraceDir = vecDir * -1;// trace in the opposite direction the shot came from (the direction the shot is going)
+
+		vecTraceDir.x += RANDOM_FLOAT( -flNoise, flNoise );
+		vecTraceDir.y += RANDOM_FLOAT( -flNoise, flNoise );
+		vecTraceDir.z += RANDOM_FLOAT( -flNoise, flNoise );
+
+		UTIL_TraceLine( ptr->vecEndPos, ptr->vecEndPos + vecTraceDir * -172, ignore_monsters, ENT(pev), &Bloodtr);
+
+		if ( Bloodtr.flFraction != 1.0 )
+		{
+			UTIL_BloodDecalTrace( &Bloodtr, BloodColor() );
+		}
+	}
+}
+
+//=========================================================
+//=========================================================
+void CBaseMonster :: MakeDamageBloodDecal ( int cCount, float flNoise, TraceResult *ptr, const Vector &vecDir )
+{
+	// make blood decal on the wall! 
+	TraceResult Bloodtr;
+	Vector vecTraceDir; 
+	int i;
+
+	if ( !IsAlive() )
+	{
+		// dealing with a dead monster. 
+		if ( pev->max_health <= 0 )
+		{
+			// no blood decal for a monster that has already decalled its limit.
+			return; 
+		}
+		else
+		{
+			pev->max_health--;
+		}
+	}
+
+	for ( i = 0 ; i < cCount ; i++ )
+	{
+		vecTraceDir = vecDir;
+
+		vecTraceDir.x += RANDOM_FLOAT( -flNoise, flNoise );
+		vecTraceDir.y += RANDOM_FLOAT( -flNoise, flNoise );
+		vecTraceDir.z += RANDOM_FLOAT( -flNoise, flNoise );
+
+		UTIL_TraceLine( ptr->vecEndPos, ptr->vecEndPos + vecTraceDir * 172, ignore_monsters, ENT(pev), &Bloodtr);
+
+/*
+		MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+			WRITE_BYTE( TE_SHOWLINE);
+			WRITE_COORD( ptr->vecEndPos.x );
+			WRITE_COORD( ptr->vecEndPos.y );
+			WRITE_COORD( ptr->vecEndPos.z );
+			
+			WRITE_COORD( Bloodtr.vecEndPos.x );
+			WRITE_COORD( Bloodtr.vecEndPos.y );
+			WRITE_COORD( Bloodtr.vecEndPos.z );
+		MESSAGE_END();
+*/
+
+		if ( Bloodtr.flFraction != 1.0 )
+		{
+			UTIL_BloodDecalTrace( &Bloodtr, BloodColor() );
+		}
+	}
+}
diff --git a/main/source/dlls/controller.cpp b/main/source/dlls/controller.cpp
new file mode 100644
index 00000000..b3074852
--- /dev/null
+++ b/main/source/dlls/controller.cpp
@@ -0,0 +1,1427 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD )
+
+//=========================================================
+// CONTROLLER
+//=========================================================
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"effects.h"
+#include	"schedule.h"
+#include	"weapons.h"
+#include	"squadmonster.h"
+
+//=========================================================
+// Monster's Anim Events Go Here
+//=========================================================
+#define	CONTROLLER_AE_HEAD_OPEN		1
+#define	CONTROLLER_AE_BALL_SHOOT	2
+#define	CONTROLLER_AE_SMALL_SHOOT	3
+#define CONTROLLER_AE_POWERUP_FULL	4
+#define CONTROLLER_AE_POWERUP_HALF	5
+
+#define CONTROLLER_FLINCH_DELAY			2		// at most one flinch every n secs
+
+class CController : public CSquadMonster
+{
+public:
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	void Spawn( void );
+	void Precache( void );
+	void SetYawSpeed( void );
+	int  Classify ( void );
+	void HandleAnimEvent( MonsterEvent_t *pEvent );
+
+	void RunAI( void );
+	BOOL CheckRangeAttack1 ( float flDot, float flDist );	// balls
+	BOOL CheckRangeAttack2 ( float flDot, float flDist );	// head
+	BOOL CheckMeleeAttack1 ( float flDot, float flDist );	// block, throw
+	Schedule_t* GetSchedule ( void );
+	Schedule_t* GetScheduleOfType ( int Type );
+	void StartTask ( Task_t *pTask );
+	void RunTask ( Task_t *pTask );
+	CUSTOM_SCHEDULES;
+
+	void Stop( void );
+	void Move ( float flInterval );
+	int  CheckLocalMove ( const Vector &vecStart, const Vector &vecEnd, CBaseEntity *pTarget, float *pflDist );
+	void MoveExecute( CBaseEntity *pTargetEnt, const Vector &vecDir, float flInterval );
+	void SetActivity ( Activity NewActivity );
+	BOOL ShouldAdvanceRoute( float flWaypointDist );
+	int LookupFloat( );
+
+	float m_flNextFlinch;
+
+	float m_flShootTime;
+	float m_flShootEnd;
+
+	void PainSound( void );
+	void AlertSound( void );
+	void IdleSound( void );
+	void AttackSound( void );
+	void DeathSound( void );
+
+	static const char *pAttackSounds[];
+	static const char *pIdleSounds[];
+	static const char *pAlertSounds[];
+	static const char *pPainSounds[];
+	static const char *pDeathSounds[];
+
+	int TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType );
+	void Killed( entvars_t *pevAttacker, int iGib );
+	void GibMonster( void );
+
+	CSprite *m_pBall[2];	// hand balls
+	int m_iBall[2];			// how bright it should be
+	float m_iBallTime[2];	// when it should be that color
+	int m_iBallCurrent[2];	// current brightness
+
+	Vector m_vecEstVelocity;
+
+	Vector m_velocity;
+	int m_fInCombat;
+};
+
+LINK_ENTITY_TO_CLASS( monster_alien_controller, CController );
+
+TYPEDESCRIPTION	CController::m_SaveData[] = 
+{
+	DEFINE_ARRAY( CController, m_pBall, FIELD_CLASSPTR, 2 ),
+	DEFINE_ARRAY( CController, m_iBall, FIELD_INTEGER, 2 ),
+	DEFINE_ARRAY( CController, m_iBallTime, FIELD_TIME, 2 ),
+	DEFINE_ARRAY( CController, m_iBallCurrent, FIELD_INTEGER, 2 ),
+	DEFINE_FIELD( CController, m_vecEstVelocity, FIELD_VECTOR ),
+};
+IMPLEMENT_SAVERESTORE( CController, CSquadMonster );
+
+
+const char *CController::pAttackSounds[] = 
+{
+	"controller/con_attack1.wav",
+	"controller/con_attack2.wav",
+	"controller/con_attack3.wav",
+};
+
+const char *CController::pIdleSounds[] = 
+{
+	"controller/con_idle1.wav",
+	"controller/con_idle2.wav",
+	"controller/con_idle3.wav",
+	"controller/con_idle4.wav",
+	"controller/con_idle5.wav",
+};
+
+const char *CController::pAlertSounds[] = 
+{
+	"controller/con_alert1.wav",
+	"controller/con_alert2.wav",
+	"controller/con_alert3.wav",
+};
+
+const char *CController::pPainSounds[] = 
+{
+	"controller/con_pain1.wav",
+	"controller/con_pain2.wav",
+	"controller/con_pain3.wav",
+};
+
+const char *CController::pDeathSounds[] = 
+{
+	"controller/con_die1.wav",
+	"controller/con_die2.wav",
+};
+
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CController :: Classify ( void )
+{
+	return	CLASS_ALIEN_MILITARY;
+}
+
+//=========================================================
+// SetYawSpeed - allows each sequence to have a different
+// turn rate associated with it.
+//=========================================================
+void CController :: SetYawSpeed ( void )
+{
+	int ys;
+
+	ys = 120;
+
+#if 0
+	switch ( m_Activity )
+	{
+	}
+#endif
+
+	pev->yaw_speed = ys;
+}
+
+int CController :: TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType )
+{
+	// HACK HACK -- until we fix this.
+	if ( IsAlive() )
+		PainSound();
+	return CBaseMonster::TakeDamage( pevInflictor, pevAttacker, flDamage, bitsDamageType );
+}
+
+
+void CController::Killed( entvars_t *pevAttacker, int iGib )
+{
+	// shut off balls
+	/*
+	m_iBall[0] = 0;
+	m_iBallTime[0] = gpGlobals->time + 4.0;
+	m_iBall[1] = 0;
+	m_iBallTime[1] = gpGlobals->time + 4.0;
+	*/
+
+	// fade balls
+	if (m_pBall[0])
+	{
+		m_pBall[0]->SUB_StartFadeOut();
+		m_pBall[0] = NULL;
+	}
+	if (m_pBall[1])
+	{
+		m_pBall[1]->SUB_StartFadeOut();
+		m_pBall[1] = NULL;
+	}
+
+	CSquadMonster::Killed( pevAttacker, iGib );
+}
+
+
+void CController::GibMonster( void )
+{
+	// delete balls
+	if (m_pBall[0])
+	{
+		UTIL_Remove( m_pBall[0] );
+		m_pBall[0] = NULL;
+	}
+	if (m_pBall[1])
+	{
+		UTIL_Remove( m_pBall[1] );
+		m_pBall[1] = NULL;
+	}
+	CSquadMonster::GibMonster( );
+}
+
+
+
+
+void CController :: PainSound( void )
+{
+	if (RANDOM_LONG(0,5) < 2)
+		EMIT_SOUND_ARRAY_DYN( CHAN_VOICE, pPainSounds ); 
+}	
+
+void CController :: AlertSound( void )
+{
+	EMIT_SOUND_ARRAY_DYN( CHAN_VOICE, pAlertSounds ); 
+}
+
+void CController :: IdleSound( void )
+{
+	EMIT_SOUND_ARRAY_DYN( CHAN_VOICE, pIdleSounds ); 
+}
+
+void CController :: AttackSound( void )
+{
+	EMIT_SOUND_ARRAY_DYN( CHAN_VOICE, pAttackSounds ); 
+}
+
+void CController :: DeathSound( void )
+{
+	EMIT_SOUND_ARRAY_DYN( CHAN_VOICE, pDeathSounds ); 
+}
+
+//=========================================================
+// HandleAnimEvent - catches the monster-specific messages
+// that occur when tagged animation frames are played.
+//=========================================================
+void CController :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	switch( pEvent->event )
+	{
+		case CONTROLLER_AE_HEAD_OPEN:
+		{
+			Vector vecStart, angleGun;
+			
+			GetAttachment( 0, vecStart, angleGun );
+			
+			MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+				WRITE_BYTE( TE_ELIGHT );
+				WRITE_SHORT( entindex( ) + 0x1000 );		// entity, attachment
+				WRITE_COORD( vecStart.x );		// origin
+				WRITE_COORD( vecStart.y );
+				WRITE_COORD( vecStart.z );
+				WRITE_COORD( 1 );	// radius
+				WRITE_BYTE( 255 );	// R
+				WRITE_BYTE( 192 );	// G
+				WRITE_BYTE( 64 );	// B
+				WRITE_BYTE( 20 );	// life * 10
+				WRITE_COORD( -32 ); // decay
+			MESSAGE_END();
+
+			m_iBall[0] = 192;
+			m_iBallTime[0] = gpGlobals->time + atoi( pEvent->options ) / 15.0;
+			m_iBall[1] = 255;
+			m_iBallTime[1] = gpGlobals->time + atoi( pEvent->options ) / 15.0;
+
+		}
+		break;
+
+		case CONTROLLER_AE_BALL_SHOOT:
+		{
+			Vector vecStart, angleGun;
+			
+			GetAttachment( 0, vecStart, angleGun );
+
+			MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+				WRITE_BYTE( TE_ELIGHT );
+				WRITE_SHORT( entindex( ) + 0x1000 );		// entity, attachment
+				WRITE_COORD( 0 );		// origin
+				WRITE_COORD( 0 );
+				WRITE_COORD( 0 );
+				WRITE_COORD( 32 );	// radius
+				WRITE_BYTE( 255 );	// R
+				WRITE_BYTE( 192 );	// G
+				WRITE_BYTE( 64 );	// B
+				WRITE_BYTE( 10 );	// life * 10
+				WRITE_COORD( 32 ); // decay
+			MESSAGE_END();
+
+			CBaseMonster *pBall = (CBaseMonster*)Create( "controller_head_ball", vecStart, pev->angles, edict() );
+
+			pBall->pev->velocity = Vector( 0, 0, 32 );
+			pBall->m_hEnemy = m_hEnemy;
+
+			m_iBall[0] = 0;
+			m_iBall[1] = 0;
+		}
+		break;
+
+		case CONTROLLER_AE_SMALL_SHOOT:
+		{
+			AttackSound( );
+			m_flShootTime = gpGlobals->time;
+			m_flShootEnd = m_flShootTime + atoi( pEvent->options ) / 15.0;
+		}
+		break;
+		case CONTROLLER_AE_POWERUP_FULL:
+		{
+			m_iBall[0] = 255;
+			m_iBallTime[0] = gpGlobals->time + atoi( pEvent->options ) / 15.0;
+			m_iBall[1] = 255;
+			m_iBallTime[1] = gpGlobals->time + atoi( pEvent->options ) / 15.0;
+		}
+		break;
+		case CONTROLLER_AE_POWERUP_HALF:
+		{
+			m_iBall[0] = 192;
+			m_iBallTime[0] = gpGlobals->time + atoi( pEvent->options ) / 15.0;
+			m_iBall[1] = 192;
+			m_iBallTime[1] = gpGlobals->time + atoi( pEvent->options ) / 15.0;
+		}
+		break;
+		default:
+			CBaseMonster::HandleAnimEvent( pEvent );
+			break;
+	}
+}
+
+//=========================================================
+// Spawn
+//=========================================================
+void CController :: Spawn()
+{
+	Precache( );
+
+	SET_MODEL(ENT(pev), "models/controller.mdl");
+	UTIL_SetSize( pev, Vector( -32, -32, 0 ), Vector( 32, 32, 64 ));
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_FLY;
+	pev->flags			|= FL_FLY;
+	m_bloodColor		= BLOOD_COLOR_GREEN;
+	pev->health			= gSkillData.controllerHealth;
+	pev->view_ofs		= Vector( 0, 0, -2 );// position of the eyes relative to monster's origin.
+	m_flFieldOfView		= VIEW_FIELD_FULL;// indicates the width of this monster's forward view cone ( as a dotproduct result )
+	m_MonsterState		= MONSTERSTATE_NONE;
+
+	MonsterInit();
+}
+
+//=========================================================
+// Precache - precaches all resources this monster needs
+//=========================================================
+void CController :: Precache()
+{
+	PRECACHE_MODEL("models/controller.mdl");
+
+	PRECACHE_SOUND_ARRAY( pAttackSounds );
+	PRECACHE_SOUND_ARRAY( pIdleSounds );
+	PRECACHE_SOUND_ARRAY( pAlertSounds );
+	PRECACHE_SOUND_ARRAY( pPainSounds );
+	PRECACHE_SOUND_ARRAY( pDeathSounds );
+
+	PRECACHE_MODEL( "sprites/xspark4.spr");
+
+	UTIL_PrecacheOther( "controller_energy_ball" );
+	UTIL_PrecacheOther( "controller_head_ball" );
+}	
+
+//=========================================================
+// AI Schedules Specific to this monster
+//=========================================================
+
+
+// Chase enemy schedule
+Task_t tlControllerChaseEnemy[] = 
+{
+	{ TASK_GET_PATH_TO_ENEMY,	(float)128		},
+	{ TASK_WAIT_FOR_MOVEMENT,	(float)0		},
+
+};
+
+Schedule_t slControllerChaseEnemy[] =
+{
+	{ 
+		tlControllerChaseEnemy,
+		ARRAYSIZE ( tlControllerChaseEnemy ),
+		bits_COND_NEW_ENEMY			|
+		bits_COND_TASK_FAILED,
+		0,
+		"ControllerChaseEnemy"
+	},
+};
+
+
+
+Task_t	tlControllerStrafe[] =
+{
+	{ TASK_WAIT,					(float)0.2					},
+	{ TASK_GET_PATH_TO_ENEMY,		(float)128					},
+	{ TASK_WAIT_FOR_MOVEMENT,		(float)0					},
+	{ TASK_WAIT,					(float)1					},
+};
+
+Schedule_t	slControllerStrafe[] =
+{
+	{ 
+		tlControllerStrafe,
+		ARRAYSIZE ( tlControllerStrafe ), 
+		bits_COND_NEW_ENEMY,
+		0,
+		"ControllerStrafe"
+	},
+};
+
+
+Task_t	tlControllerTakeCover[] =
+{
+	{ TASK_WAIT,					(float)0.2					},
+	{ TASK_FIND_COVER_FROM_ENEMY,	(float)0					},
+	{ TASK_WAIT_FOR_MOVEMENT,		(float)0					},
+	{ TASK_WAIT,					(float)1					},
+};
+
+Schedule_t	slControllerTakeCover[] =
+{
+	{ 
+		tlControllerTakeCover,
+		ARRAYSIZE ( tlControllerTakeCover ), 
+		bits_COND_NEW_ENEMY,
+		0,
+		"ControllerTakeCover"
+	},
+};
+
+
+Task_t	tlControllerFail[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE },
+	{ TASK_WAIT,				(float)2		},
+	{ TASK_WAIT_PVS,			(float)0		},
+};
+
+Schedule_t	slControllerFail[] =
+{
+	{
+		tlControllerFail,
+		ARRAYSIZE ( tlControllerFail ),
+		0,
+		0,
+		"ControllerFail"
+	},
+};
+
+
+
+DEFINE_CUSTOM_SCHEDULES( CController )
+{
+	slControllerChaseEnemy,
+	slControllerStrafe,
+	slControllerTakeCover,
+	slControllerFail,
+};
+
+IMPLEMENT_CUSTOM_SCHEDULES( CController, CSquadMonster );
+
+
+
+//=========================================================
+// StartTask
+//=========================================================
+void CController :: StartTask ( Task_t *pTask )
+{
+	switch ( pTask->iTask )
+	{
+	case TASK_RANGE_ATTACK1:
+		CSquadMonster :: StartTask ( pTask );
+		break;
+	case TASK_GET_PATH_TO_ENEMY_LKP:
+		{
+			if (BuildNearestRoute( m_vecEnemyLKP, pev->view_ofs, pTask->flData, (m_vecEnemyLKP - pev->origin).Length() + 1024 ))
+			{
+				TaskComplete();
+			}
+			else
+			{
+				// no way to get there =(
+				ALERT ( at_aiconsole, "GetPathToEnemyLKP failed!!\n" );
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_GET_PATH_TO_ENEMY:
+		{
+			CBaseEntity *pEnemy = m_hEnemy;
+
+			if ( pEnemy == NULL )
+			{
+				TaskFail();
+				return;
+			}
+
+			if (BuildNearestRoute( pEnemy->pev->origin, pEnemy->pev->view_ofs, pTask->flData, (pEnemy->pev->origin - pev->origin).Length() + 1024 ))
+			{
+				TaskComplete();
+			}
+			else
+			{
+				// no way to get there =(
+				ALERT ( at_aiconsole, "GetPathToEnemy failed!!\n" );
+				TaskFail();
+			}
+			break;
+		}
+	default:
+		CSquadMonster :: StartTask ( pTask );
+		break;
+	}
+}
+
+
+Vector Intersect( Vector vecSrc, Vector vecDst, Vector vecMove, float flSpeed )
+{
+	Vector vecTo = vecDst - vecSrc;
+
+	float a = DotProduct( vecMove, vecMove ) - flSpeed * flSpeed;
+	float b = 0 * DotProduct(vecTo, vecMove); // why does this work?
+	float c = DotProduct( vecTo, vecTo );
+
+	float t;
+	if (a == 0)
+	{
+		t = c / (flSpeed * flSpeed);
+	}
+	else
+	{
+		t = b * b - 4 * a * c;
+		t = sqrt( t ) / (2.0 * a);
+		float t1 = -b +t;
+		float t2 = -b -t;
+
+		if (t1 < 0 || t2 < t1)
+			t = t2;
+		else
+			t = t1;
+	}
+
+	// ALERT( at_console, "Intersect %f\n", t );
+
+	if (t < 0.1)
+		t = 0.1;
+	if (t > 10.0)
+		t = 10.0;
+
+	Vector vecHit = vecTo + vecMove * t;
+	return vecHit.Normalize( ) * flSpeed;
+}
+
+
+int CController::LookupFloat( )
+{
+	if (m_velocity.Length( ) < 32.0)
+	{
+		return LookupSequence( "up" );
+	}
+
+	UTIL_MakeAimVectors( pev->angles );
+	float x = DotProduct( gpGlobals->v_forward, m_velocity );
+	float y = DotProduct( gpGlobals->v_right, m_velocity );
+	float z = DotProduct( gpGlobals->v_up, m_velocity );
+
+	if (fabs(x) > fabs(y) && fabs(x) > fabs(z))
+	{
+		if (x > 0)
+			return LookupSequence( "forward");
+		else
+			return LookupSequence( "backward");
+	}
+	else if (fabs(y) > fabs(z))
+	{
+		if (y > 0)
+			return LookupSequence( "right");
+		else
+			return LookupSequence( "left");
+	}
+	else
+	{
+		if (z > 0)
+			return LookupSequence( "up");
+		else
+			return LookupSequence( "down");
+	}
+}
+
+
+//=========================================================
+// RunTask 
+//=========================================================
+void CController :: RunTask ( Task_t *pTask )
+{
+
+	if (m_flShootEnd > gpGlobals->time)
+	{
+		Vector vecHand, vecAngle;
+		
+		GetAttachment( 2, vecHand, vecAngle );
+	
+		while (m_flShootTime < m_flShootEnd && m_flShootTime < gpGlobals->time)
+		{
+			Vector vecSrc = vecHand + pev->velocity * (m_flShootTime - gpGlobals->time);
+			Vector vecDir;
+			
+			if (m_hEnemy != NULL)
+			{
+				if (HasConditions( bits_COND_SEE_ENEMY ))
+				{
+					m_vecEstVelocity = m_vecEstVelocity * 0.5 + m_hEnemy->pev->velocity * 0.5;
+				}
+				else
+				{
+					m_vecEstVelocity = m_vecEstVelocity * 0.8;
+				}
+				vecDir = Intersect( vecSrc, m_hEnemy->BodyTarget( pev->origin ), m_vecEstVelocity, gSkillData.controllerSpeedBall );
+				float delta = 0.03490; // +-2 degree
+				vecDir = vecDir + Vector( RANDOM_FLOAT( -delta, delta ), RANDOM_FLOAT( -delta, delta ), RANDOM_FLOAT( -delta, delta ) ) * gSkillData.controllerSpeedBall;
+
+				vecSrc = vecSrc + vecDir * (gpGlobals->time - m_flShootTime);
+				CBaseMonster *pBall = (CBaseMonster*)Create( "controller_energy_ball", vecSrc, pev->angles, edict() );
+				pBall->pev->velocity = vecDir;
+			}
+			m_flShootTime += 0.2;
+		}
+
+		if (m_flShootTime > m_flShootEnd)
+		{
+			m_iBall[0] = 64;
+			m_iBallTime[0] = m_flShootEnd;
+			m_iBall[1] = 64;
+			m_iBallTime[1] = m_flShootEnd;
+			m_fInCombat = FALSE;
+		}
+	}
+
+	switch ( pTask->iTask )
+	{
+	case TASK_WAIT_FOR_MOVEMENT:
+	case TASK_WAIT:
+	case TASK_WAIT_FACE_ENEMY:
+	case TASK_WAIT_PVS:
+		MakeIdealYaw( m_vecEnemyLKP );
+		ChangeYaw( pev->yaw_speed );
+
+		if (m_fSequenceFinished)
+		{
+			m_fInCombat = FALSE;
+		}
+
+		CSquadMonster :: RunTask ( pTask );
+
+		if (!m_fInCombat)
+		{
+			if (HasConditions ( bits_COND_CAN_RANGE_ATTACK1 ))
+			{
+				pev->sequence = LookupActivity( ACT_RANGE_ATTACK1 );
+				pev->frame = 0;
+				ResetSequenceInfo( );
+				m_fInCombat = TRUE;
+			}
+			else if (HasConditions ( bits_COND_CAN_RANGE_ATTACK2 ))
+			{
+				pev->sequence = LookupActivity( ACT_RANGE_ATTACK2 );
+				pev->frame = 0;
+				ResetSequenceInfo( );
+				m_fInCombat = TRUE;
+			}
+			else
+			{
+				int iFloat = LookupFloat( );
+				if (m_fSequenceFinished || iFloat != pev->sequence)
+				{
+					pev->sequence = iFloat;
+					pev->frame = 0;
+					ResetSequenceInfo( );
+				}
+			}
+		}
+		break;
+	default: 
+		CSquadMonster :: RunTask ( pTask );
+		break;
+	}
+}
+
+
+//=========================================================
+// GetSchedule - Decides which type of schedule best suits
+// the monster's current state and conditions. Then calls
+// monster's member function to get a pointer to a schedule
+// of the proper type.
+//=========================================================
+Schedule_t *CController :: GetSchedule ( void )
+{
+	switch	( m_MonsterState )
+	{
+	case MONSTERSTATE_IDLE:
+		break;
+
+	case MONSTERSTATE_ALERT:
+		break;
+
+	case MONSTERSTATE_COMBAT:
+		{
+			Vector vecTmp = Intersect( Vector( 0, 0, 0 ), Vector( 100, 4, 7 ), Vector( 2, 10, -3 ), 20.0 );
+
+			// dead enemy
+			if ( HasConditions ( bits_COND_LIGHT_DAMAGE ) )
+			{
+				// m_iFrustration++;
+			}
+			if ( HasConditions ( bits_COND_HEAVY_DAMAGE ) )
+			{
+				// m_iFrustration++;
+			}
+		}
+		break;
+	}
+
+	return CSquadMonster :: GetSchedule();
+}
+
+
+
+//=========================================================
+//=========================================================
+Schedule_t* CController :: GetScheduleOfType ( int Type ) 
+{
+	// ALERT( at_console, "%d\n", m_iFrustration );
+	switch	( Type )
+	{
+	case SCHED_CHASE_ENEMY:
+		return slControllerChaseEnemy;
+	case SCHED_RANGE_ATTACK1:
+		return slControllerStrafe;
+	case SCHED_RANGE_ATTACK2:
+	case SCHED_MELEE_ATTACK1:
+	case SCHED_MELEE_ATTACK2:
+	case SCHED_TAKE_COVER_FROM_ENEMY:
+		return slControllerTakeCover;
+	case SCHED_FAIL:
+		return slControllerFail;
+	}
+
+	return CBaseMonster :: GetScheduleOfType( Type );
+}
+
+
+
+
+
+//=========================================================
+// CheckRangeAttack1  - shoot a bigass energy ball out of their head
+//
+//=========================================================
+BOOL CController :: CheckRangeAttack1 ( float flDot, float flDist )
+{
+	if ( flDot > 0.5 && flDist > 256 && flDist <= 2048 )
+	{
+		return TRUE;
+	}
+	return FALSE;
+}
+
+
+BOOL CController :: CheckRangeAttack2 ( float flDot, float flDist )
+{
+	if ( flDot > 0.5 && flDist > 64 && flDist <= 2048 )
+	{
+		return TRUE;
+	}
+	return FALSE;
+}
+
+
+BOOL CController :: CheckMeleeAttack1 ( float flDot, float flDist )
+{
+	return FALSE;
+}
+
+
+void CController :: SetActivity ( Activity NewActivity )
+{
+	CBaseMonster::SetActivity( NewActivity );
+
+	switch ( m_Activity)
+	{
+	case ACT_WALK:
+		m_flGroundSpeed = 100;
+		break;
+	default:
+		m_flGroundSpeed = 100;
+		break;
+	}
+}
+
+
+
+//=========================================================
+// RunAI
+//=========================================================
+void CController :: RunAI( void )
+{
+	CBaseMonster :: RunAI();
+	Vector vecStart, angleGun;
+
+	if ( HasMemory( bits_MEMORY_KILLED ) )
+		return;
+
+	for (int i = 0; i < 2; i++)
+	{
+		if (m_pBall[i] == NULL)
+		{
+			m_pBall[i] = CSprite::SpriteCreate( "sprites/xspark4.spr", pev->origin, TRUE );
+			m_pBall[i]->SetTransparency( kRenderGlow, 255, 255, 255, 255, kRenderFxNoDissipation );
+			m_pBall[i]->SetAttachment( edict(), (i + 3) );
+			m_pBall[i]->SetScale( 1.0 );
+		}
+
+		float t = m_iBallTime[i] - gpGlobals->time;
+		if (t > 0.1)
+			t = 0.1 / t;
+		else
+			t = 1.0;
+
+		m_iBallCurrent[i] += (m_iBall[i] - m_iBallCurrent[i]) * t;
+
+		m_pBall[i]->SetBrightness( m_iBallCurrent[i] );
+
+		GetAttachment( i + 2, vecStart, angleGun );
+		UTIL_SetOrigin( m_pBall[i]->pev, vecStart );
+		
+		MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+			WRITE_BYTE( TE_ELIGHT );
+			WRITE_SHORT( entindex( ) + 0x1000 * (i + 3) );		// entity, attachment
+			WRITE_COORD( vecStart.x );		// origin
+			WRITE_COORD( vecStart.y );
+			WRITE_COORD( vecStart.z );
+			WRITE_COORD( m_iBallCurrent[i] / 8 );	// radius
+			WRITE_BYTE( 255 );	// R
+			WRITE_BYTE( 192 );	// G
+			WRITE_BYTE( 64 );	// B
+			WRITE_BYTE( 5 );	// life * 10
+			WRITE_COORD( 0 ); // decay
+		MESSAGE_END();
+	}
+}
+
+
+extern void DrawRoute( entvars_t *pev, WayPoint_t *m_Route, int m_iRouteIndex, int r, int g, int b );
+
+void CController::Stop( void ) 
+{ 
+	m_IdealActivity = GetStoppedActivity(); 
+}
+
+
+#define DIST_TO_CHECK	200
+void CController :: Move ( float flInterval ) 
+{
+	float		flWaypointDist;
+	float		flCheckDist;
+	float		flDist;// how far the lookahead check got before hitting an object.
+	float		flMoveDist;
+	Vector		vecDir;
+	Vector		vecApex;
+	CBaseEntity	*pTargetEnt;
+
+	// Don't move if no valid route
+	if ( FRouteClear() )
+	{
+		ALERT( at_aiconsole, "Tried to move with no route!\n" );
+		TaskFail();
+		return;
+	}
+	
+	if ( m_flMoveWaitFinished > gpGlobals->time )
+		return;
+
+// Debug, test movement code
+#if 0
+//	if ( CVAR_GET_FLOAT("stopmove" ) != 0 )
+	{
+		if ( m_movementGoal == MOVEGOAL_ENEMY )
+			RouteSimplify( m_hEnemy );
+		else
+			RouteSimplify( m_hTargetEnt );
+		FRefreshRoute();
+		return;
+	}
+#else
+// Debug, draw the route
+//	DrawRoute( pev, m_Route, m_iRouteIndex, 0, 0, 255 );
+#endif
+
+	// if the monster is moving directly towards an entity (enemy for instance), we'll set this pointer
+	// to that entity for the CheckLocalMove and Triangulate functions.
+	pTargetEnt = NULL;
+
+	if (m_flGroundSpeed == 0)
+	{
+		m_flGroundSpeed = 100;
+		// TaskFail( );
+		// return;
+	}
+
+	flMoveDist = m_flGroundSpeed * flInterval;
+
+	do 
+	{
+		// local move to waypoint.
+		vecDir = ( m_Route[ m_iRouteIndex ].vecLocation - pev->origin ).Normalize();
+		flWaypointDist = ( m_Route[ m_iRouteIndex ].vecLocation - pev->origin ).Length();
+		
+		// MakeIdealYaw ( m_Route[ m_iRouteIndex ].vecLocation );
+		// ChangeYaw ( pev->yaw_speed );
+
+		// if the waypoint is closer than CheckDist, CheckDist is the dist to waypoint
+		if ( flWaypointDist < DIST_TO_CHECK )
+		{
+			flCheckDist = flWaypointDist;
+		}
+		else
+		{
+			flCheckDist = DIST_TO_CHECK;
+		}
+		
+		if ( (m_Route[ m_iRouteIndex ].iType & (~bits_MF_NOT_TO_MASK)) == bits_MF_TO_ENEMY )
+		{
+			// only on a PURE move to enemy ( i.e., ONLY MF_TO_ENEMY set, not MF_TO_ENEMY and DETOUR )
+			pTargetEnt = m_hEnemy;
+		}
+		else if ( (m_Route[ m_iRouteIndex ].iType & ~bits_MF_NOT_TO_MASK) == bits_MF_TO_TARGETENT )
+		{
+			pTargetEnt = m_hTargetEnt;
+		}
+
+		// !!!BUGBUG - CheckDist should be derived from ground speed.
+		// If this fails, it should be because of some dynamic entity blocking this guy.
+		// We've already checked this path, so we should wait and time out if the entity doesn't move
+		flDist = 0;
+		if ( CheckLocalMove ( pev->origin, pev->origin + vecDir * flCheckDist, pTargetEnt, &flDist ) != LOCALMOVE_VALID )
+		{
+			CBaseEntity *pBlocker;
+
+			// Can't move, stop
+			Stop();
+			// Blocking entity is in global trace_ent
+			pBlocker = CBaseEntity::Instance( gpGlobals->trace_ent );
+			if (pBlocker)
+			{
+				DispatchBlocked( edict(), pBlocker->edict() );
+			}
+			if ( pBlocker && m_moveWaitTime > 0 && pBlocker->IsMoving() && !pBlocker->IsPlayer() && (gpGlobals->time-m_flMoveWaitFinished) > 3.0 )
+			{
+				// Can we still move toward our target?
+				if ( flDist < m_flGroundSpeed )
+				{
+					// Wait for a second
+					m_flMoveWaitFinished = gpGlobals->time + m_moveWaitTime;
+	//				ALERT( at_aiconsole, "Move %s!!!\n", STRING( pBlocker->pev->classname ) );
+					return;
+				}
+			}
+			else 
+			{
+				// try to triangulate around whatever is in the way.
+				if ( FTriangulate( pev->origin, m_Route[ m_iRouteIndex ].vecLocation, flDist, pTargetEnt, &vecApex ) )
+				{
+					InsertWaypoint( vecApex, bits_MF_TO_DETOUR );
+					RouteSimplify( pTargetEnt );
+				}
+				else
+				{
+	 			    ALERT ( at_aiconsole, "Couldn't Triangulate\n" );
+					Stop();
+					if ( m_moveWaitTime > 0 )
+					{
+						FRefreshRoute();
+						m_flMoveWaitFinished = gpGlobals->time + m_moveWaitTime * 0.5;
+					}
+					else
+					{
+						TaskFail();
+						ALERT( at_aiconsole, "Failed to move!\n" );
+						//ALERT( at_aiconsole, "%f, %f, %f\n", pev->origin.z, (pev->origin + (vecDir * flCheckDist)).z, m_Route[m_iRouteIndex].vecLocation.z );
+					}
+					return;
+				}
+			}
+		}
+
+		// UNDONE: this is a hack to quit moving farther than it has looked ahead.
+		if (flCheckDist < flMoveDist)
+		{
+			MoveExecute( pTargetEnt, vecDir, flCheckDist / m_flGroundSpeed );
+
+			// ALERT( at_console, "%.02f\n", flInterval );
+			AdvanceRoute( flWaypointDist );
+			flMoveDist -= flCheckDist;
+		}
+		else
+		{
+			MoveExecute( pTargetEnt, vecDir, flMoveDist / m_flGroundSpeed );
+
+			if ( ShouldAdvanceRoute( flWaypointDist - flMoveDist ) )
+			{
+				AdvanceRoute( flWaypointDist );
+			}
+			flMoveDist = 0;
+		}
+
+		if ( MovementIsComplete() )
+		{
+			Stop();
+			RouteClear();
+		}
+	} while (flMoveDist > 0 && flCheckDist > 0);
+
+	// cut corner?
+	if (flWaypointDist < 128)
+	{
+		if ( m_movementGoal == MOVEGOAL_ENEMY )
+			RouteSimplify( m_hEnemy );
+		else
+			RouteSimplify( m_hTargetEnt );
+		FRefreshRoute();
+
+		if (m_flGroundSpeed > 100)
+			m_flGroundSpeed -= 40;
+	}
+	else
+	{
+		if (m_flGroundSpeed < 400)
+			m_flGroundSpeed += 10;
+	}
+}
+
+
+
+BOOL CController:: ShouldAdvanceRoute( float flWaypointDist )
+{
+	if ( flWaypointDist <= 32  )
+	{
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+
+int CController :: CheckLocalMove ( const Vector &vecStart, const Vector &vecEnd, CBaseEntity *pTarget, float *pflDist )
+{
+	TraceResult tr;
+
+	UTIL_TraceHull( vecStart + Vector( 0, 0, 32), vecEnd + Vector( 0, 0, 32), dont_ignore_monsters, large_hull, edict(), &tr );
+
+	// ALERT( at_console, "%.0f %.0f %.0f : ", vecStart.x, vecStart.y, vecStart.z );
+	// ALERT( at_console, "%.0f %.0f %.0f\n", vecEnd.x, vecEnd.y, vecEnd.z );
+
+	if (pflDist)
+	{
+		*pflDist = ( (tr.vecEndPos - Vector( 0, 0, 32 )) - vecStart ).Length();// get the distance.
+	}
+
+	// ALERT( at_console, "check %d %d %f\n", tr.fStartSolid, tr.fAllSolid, tr.flFraction );
+	if (tr.fStartSolid || tr.flFraction < 1.0)
+	{
+		if ( pTarget && pTarget->edict() == gpGlobals->trace_ent )
+			return LOCALMOVE_VALID;
+		return LOCALMOVE_INVALID;
+	}
+
+	return LOCALMOVE_VALID;
+}
+
+
+void CController::MoveExecute( CBaseEntity *pTargetEnt, const Vector &vecDir, float flInterval )
+{
+	if ( m_IdealActivity != m_movementActivity )
+		m_IdealActivity = m_movementActivity;
+
+	// ALERT( at_console, "move %.4f %.4f %.4f : %f\n", vecDir.x, vecDir.y, vecDir.z, flInterval );
+
+	// float flTotal = m_flGroundSpeed * pev->framerate * flInterval;
+	// UTIL_MoveToOrigin ( ENT(pev), m_Route[ m_iRouteIndex ].vecLocation, flTotal, MOVE_STRAFE );
+
+	m_velocity = m_velocity * 0.8 + m_flGroundSpeed * vecDir * 0.2;
+
+	UTIL_MoveToOrigin ( ENT(pev), pev->origin + m_velocity, m_velocity.Length() * flInterval, MOVE_STRAFE );
+	
+}
+
+
+
+
+//=========================================================
+// Controller bouncy ball attack
+//=========================================================
+class CControllerHeadBall : public CBaseMonster
+{
+	void Spawn( void );
+	void Precache( void );
+	void EXPORT HuntThink( void );
+	void EXPORT DieThink( void );
+	void EXPORT BounceTouch( CBaseEntity *pOther );
+	void MovetoTarget( Vector vecTarget );
+	void Crawl( void );
+	int m_iTrail;
+	int m_flNextAttack;
+	Vector m_vecIdeal;
+	EHANDLE m_hOwner;
+};
+LINK_ENTITY_TO_CLASS( controller_head_ball, CControllerHeadBall );
+
+
+
+void CControllerHeadBall :: Spawn( void )
+{
+	Precache( );
+	// motor
+	pev->movetype = MOVETYPE_FLY;
+	pev->solid = SOLID_BBOX;
+
+	SET_MODEL(ENT(pev), "sprites/xspark4.spr");
+	pev->rendermode = kRenderTransAdd;
+	pev->rendercolor.x = 255;
+	pev->rendercolor.y = 255;
+	pev->rendercolor.z = 255;
+	pev->renderamt = 255;
+	pev->scale = 2.0;
+
+	UTIL_SetSize(pev, Vector( 0, 0, 0), Vector(0, 0, 0));
+	UTIL_SetOrigin( pev, pev->origin );
+
+	SetThink( &CControllerHeadBall::HuntThink );
+	SetTouch( &CControllerHeadBall::BounceTouch );
+
+	m_vecIdeal = Vector( 0, 0, 0 );
+
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	m_hOwner = Instance( pev->owner );
+	pev->dmgtime = gpGlobals->time;
+}
+
+
+void CControllerHeadBall :: Precache( void )
+{
+	PRECACHE_MODEL("sprites/xspark1.spr");
+	PRECACHE_SOUND("debris/zap4.wav");
+	PRECACHE_SOUND("weapons/electro4.wav");
+}
+
+
+void CControllerHeadBall :: HuntThink( void  )
+{
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	pev->renderamt -= 5;
+
+	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+		WRITE_BYTE( TE_ELIGHT );
+		WRITE_SHORT( entindex( ) );		// entity, attachment
+		WRITE_COORD( pev->origin.x );		// origin
+		WRITE_COORD( pev->origin.y );
+		WRITE_COORD( pev->origin.z );
+		WRITE_COORD( pev->renderamt / 16 );	// radius
+		WRITE_BYTE( 255 );	// R
+		WRITE_BYTE( 255 );	// G
+		WRITE_BYTE( 255 );	// B
+		WRITE_BYTE( 2 );	// life * 10
+		WRITE_COORD( 0 ); // decay
+	MESSAGE_END();
+
+	// check world boundaries
+	if (gpGlobals->time - pev->dmgtime > 5 || pev->renderamt < 64 || m_hEnemy == NULL || m_hOwner == NULL || pev->origin.x < -4096 || pev->origin.x > 4096 || pev->origin.y < -4096 || pev->origin.y > 4096 || pev->origin.z < -4096 || pev->origin.z > 4096)
+	{
+		SetTouch( NULL );
+		UTIL_Remove( this );
+		return;
+	}
+
+	MovetoTarget( m_hEnemy->Center( ) );
+
+	if ((m_hEnemy->Center() - pev->origin).Length() < 64)
+	{
+		TraceResult tr;
+
+		UTIL_TraceLine( pev->origin, m_hEnemy->Center(), dont_ignore_monsters, ENT(pev), &tr );
+
+		CBaseEntity *pEntity = CBaseEntity::Instance(tr.pHit);
+		if (pEntity != NULL && pEntity->pev->takedamage)
+		{
+			ClearMultiDamage( );
+			pEntity->TraceAttack( m_hOwner->pev, gSkillData.controllerDmgZap, pev->velocity, &tr, DMG_SHOCK );
+			ApplyMultiDamage( pev, m_hOwner->pev );
+		}
+
+		MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+			WRITE_BYTE( TE_BEAMENTPOINT );
+			WRITE_SHORT( entindex() );
+			WRITE_COORD( tr.vecEndPos.x );
+			WRITE_COORD( tr.vecEndPos.y );
+			WRITE_COORD( tr.vecEndPos.z );
+			WRITE_SHORT( g_sModelIndexLaser );
+			WRITE_BYTE( 0 ); // frame start
+			WRITE_BYTE( 10 ); // framerate
+			WRITE_BYTE( 3 ); // life
+			WRITE_BYTE( 20 );  // width
+			WRITE_BYTE( 0 );   // noise
+			WRITE_BYTE( 255 );   // r, g, b
+			WRITE_BYTE( 255 );   // r, g, b
+			WRITE_BYTE( 255 );   // r, g, b
+			WRITE_BYTE( 255 );	// brightness
+			WRITE_BYTE( 10 );		// speed
+		MESSAGE_END();
+
+		UTIL_EmitAmbientSound( ENT(pev), tr.vecEndPos, "weapons/electro4.wav", 0.5, ATTN_NORM, 0, RANDOM_LONG( 140, 160 ) );
+
+		m_flNextAttack = gpGlobals->time + 3.0;
+
+		SetThink( &CControllerHeadBall::DieThink );
+		pev->nextthink = gpGlobals->time + 0.3;
+	}
+
+	// Crawl( );
+}
+
+
+void CControllerHeadBall :: DieThink( void  )
+{
+	UTIL_Remove( this );
+}
+
+
+void CControllerHeadBall :: MovetoTarget( Vector vecTarget )
+{
+	// accelerate
+	float flSpeed = m_vecIdeal.Length();
+	if (flSpeed == 0)
+	{
+		m_vecIdeal = pev->velocity;
+		flSpeed = m_vecIdeal.Length();
+	}
+
+	if (flSpeed > 400)
+	{
+		m_vecIdeal = m_vecIdeal.Normalize( ) * 400;
+	}
+	m_vecIdeal = m_vecIdeal + (vecTarget - pev->origin).Normalize() * 100;
+	pev->velocity = m_vecIdeal;
+}
+
+
+
+void CControllerHeadBall :: Crawl( void  )
+{
+
+	Vector vecAim = Vector( RANDOM_FLOAT( -1, 1 ), RANDOM_FLOAT( -1, 1 ), RANDOM_FLOAT( -1, 1 ) ).Normalize( );
+	Vector vecPnt = pev->origin + pev->velocity * 0.3 + vecAim * 64;
+
+	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+		WRITE_BYTE( TE_BEAMENTPOINT );
+		WRITE_SHORT( entindex() );
+		WRITE_COORD( vecPnt.x);
+		WRITE_COORD( vecPnt.y);
+		WRITE_COORD( vecPnt.z);
+		WRITE_SHORT( g_sModelIndexLaser );
+		WRITE_BYTE( 0 ); // frame start
+		WRITE_BYTE( 10 ); // framerate
+		WRITE_BYTE( 3 ); // life
+		WRITE_BYTE( 20 );  // width
+		WRITE_BYTE( 0 );   // noise
+		WRITE_BYTE( 255 );   // r, g, b
+		WRITE_BYTE( 255 );   // r, g, b
+		WRITE_BYTE( 255 );   // r, g, b
+		WRITE_BYTE( 255 );	// brightness
+		WRITE_BYTE( 10 );		// speed
+	MESSAGE_END();
+}
+
+
+void CControllerHeadBall::BounceTouch( CBaseEntity *pOther )
+{
+	Vector vecDir = m_vecIdeal.Normalize( );
+
+	TraceResult tr = UTIL_GetGlobalTrace( );
+
+	float n = -DotProduct(tr.vecPlaneNormal, vecDir);
+
+	vecDir = 2.0 * tr.vecPlaneNormal * n + vecDir;
+
+	m_vecIdeal = vecDir * m_vecIdeal.Length();
+}
+
+
+
+
+class CControllerZapBall : public CBaseMonster
+{
+	void Spawn( void );
+	void Precache( void );
+	void EXPORT AnimateThink( void );
+	void EXPORT ExplodeTouch( CBaseEntity *pOther );
+
+	EHANDLE m_hOwner;
+};
+LINK_ENTITY_TO_CLASS( controller_energy_ball, CControllerZapBall );
+
+
+void CControllerZapBall :: Spawn( void )
+{
+	Precache( );
+	// motor
+	pev->movetype = MOVETYPE_FLY;
+	pev->solid = SOLID_BBOX;
+
+	SET_MODEL(ENT(pev), "sprites/xspark4.spr");
+	pev->rendermode = kRenderTransAdd;
+	pev->rendercolor.x = 255;
+	pev->rendercolor.y = 255;
+	pev->rendercolor.z = 255;
+	pev->renderamt = 255;
+	pev->scale = 0.5;
+
+	UTIL_SetSize(pev, Vector( 0, 0, 0), Vector(0, 0, 0));
+	UTIL_SetOrigin( pev, pev->origin );
+
+	SetThink( &CControllerZapBall::AnimateThink );
+	SetTouch( &CControllerZapBall::ExplodeTouch );
+
+	m_hOwner = Instance( pev->owner );
+	pev->dmgtime = gpGlobals->time; // keep track of when ball spawned
+	pev->nextthink = gpGlobals->time + 0.1;
+}
+
+
+void CControllerZapBall :: Precache( void )
+{
+	PRECACHE_MODEL("sprites/xspark4.spr");
+	// PRECACHE_SOUND("debris/zap4.wav");
+	// PRECACHE_SOUND("weapons/electro4.wav");
+}
+
+
+void CControllerZapBall :: AnimateThink( void  )
+{
+	pev->nextthink = gpGlobals->time + 0.1;
+	
+	pev->frame = ((int)pev->frame + 1) % 11;
+
+	if (gpGlobals->time - pev->dmgtime > 5 || pev->velocity.Length() < 10)
+	{
+		SetTouch( NULL );
+		UTIL_Remove( this );
+	}
+}
+
+
+void CControllerZapBall::ExplodeTouch( CBaseEntity *pOther )
+{
+	if (pOther->pev->takedamage)
+	{
+		TraceResult tr = UTIL_GetGlobalTrace( );
+
+		entvars_t	*pevOwner;
+		if (m_hOwner != NULL)
+		{
+			pevOwner = m_hOwner->pev;
+		}
+		else
+		{
+			pevOwner = pev;
+		}
+
+		ClearMultiDamage( );
+		pOther->TraceAttack(pevOwner, gSkillData.controllerDmgBall, pev->velocity.Normalize(), &tr, DMG_ENERGYBEAM ); 
+		ApplyMultiDamage( pevOwner, pevOwner );
+
+		UTIL_EmitAmbientSound( ENT(pev), tr.vecEndPos, "weapons/electro4.wav", 0.3, ATTN_NORM, 0, RANDOM_LONG( 90, 99 ) );
+
+	}
+
+	UTIL_Remove( this );
+}
+
+
+
+#endif		// !OEM && !HLDEMO
diff --git a/main/source/dlls/cpushable.h b/main/source/dlls/cpushable.h
new file mode 100644
index 00000000..9bba5a2d
--- /dev/null
+++ b/main/source/dlls/cpushable.h
@@ -0,0 +1,33 @@
+#ifndef CPUSHABLE_H
+#define CPUSHABLE_H
+
+class CPushable : public CBreakable
+{
+public:
+	void	Spawn ( void );
+	void	Precache( void );
+	void	Touch ( CBaseEntity *pOther );
+	void	Move( CBaseEntity *pMover, int push );
+	void	KeyValue( KeyValueData *pkvd );
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void	EXPORT StopSound( void );
+//	virtual void	SetActivator( CBaseEntity *pActivator ) { m_pPusher = pActivator; }
+
+	virtual int	ObjectCaps( void ) { return (CBaseEntity :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION) | FCAP_CONTINUOUS_USE; }
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+
+	inline float MaxSpeed( void ) { return m_maxSpeed; }
+	
+	// breakables use an overridden takedamage
+	virtual int TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType );
+	
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	static char *m_soundNames[3];
+	int		m_lastSound;	// no need to save/restore, just keeps the same sound from playing twice in a row
+	float	m_maxSpeed;
+	float	m_soundTime;
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/crossbow.cpp b/main/source/dlls/crossbow.cpp
new file mode 100644
index 00000000..6feaec3b
--- /dev/null
+++ b/main/source/dlls/crossbow.cpp
@@ -0,0 +1,548 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD )
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "player.h"
+#include "gamerules.h"
+
+#ifndef CLIENT_DLL
+#define BOLT_AIR_VELOCITY	2000
+#define BOLT_WATER_VELOCITY	1000
+
+// UNDONE: Save/restore this?  Don't forget to set classname and LINK_ENTITY_TO_CLASS()
+// 
+// OVERLOADS SOME ENTVARS:
+//
+// speed - the ideal magnitude of my velocity
+class CCrossbowBolt : public CBaseEntity
+{
+	void Spawn( void );
+	void Precache( void );
+	int  Classify ( void );
+	void EXPORT BubbleThink( void );
+	void EXPORT BoltTouch( CBaseEntity *pOther );
+	void EXPORT ExplodeThink( void );
+
+	int m_iTrail;
+
+public:
+	static CCrossbowBolt *BoltCreate( void );
+};
+LINK_ENTITY_TO_CLASS( crossbow_bolt, CCrossbowBolt );
+
+CCrossbowBolt *CCrossbowBolt::BoltCreate( void )
+{
+	// Create a new entity with CCrossbowBolt private data
+	CCrossbowBolt *pBolt = GetClassPtr( (CCrossbowBolt *)NULL );
+	pBolt->pev->classname = MAKE_STRING("bolt");
+	pBolt->Spawn();
+
+	return pBolt;
+}
+
+void CCrossbowBolt::Spawn( )
+{
+	Precache( );
+	pev->movetype = MOVETYPE_FLY;
+	pev->solid = SOLID_BBOX;
+
+	pev->gravity = 0.5;
+
+	SET_MODEL(ENT(pev), "models/crossbow_bolt.mdl");
+
+	UTIL_SetOrigin( pev, pev->origin );
+	UTIL_SetSize(pev, Vector(0, 0, 0), Vector(0, 0, 0));
+
+	SetTouch( &CCrossbowBolt::BoltTouch );
+	SetThink( &CCrossbowBolt::BubbleThink );
+	pev->nextthink = gpGlobals->time + 0.2;
+}
+
+
+void CCrossbowBolt::Precache( )
+{
+	PRECACHE_MODEL ("models/crossbow_bolt.mdl");
+	PRECACHE_SOUND("weapons/xbow_hitbod1.wav");
+	PRECACHE_SOUND("weapons/xbow_hitbod2.wav");
+	PRECACHE_SOUND("weapons/xbow_fly1.wav");
+	PRECACHE_SOUND("weapons/xbow_hit1.wav");
+	PRECACHE_SOUND("fvox/beep.wav");
+	m_iTrail = PRECACHE_MODEL("sprites/streak.spr");
+}
+
+
+int	CCrossbowBolt :: Classify ( void )
+{
+	return	CLASS_NONE;
+}
+
+void CCrossbowBolt::BoltTouch( CBaseEntity *pOther )
+{
+	SetTouch( NULL );
+	SetThink( NULL );
+
+	if (pOther->pev->takedamage)
+	{
+		TraceResult tr = UTIL_GetGlobalTrace( );
+		entvars_t	*pevOwner;
+
+		pevOwner = VARS( pev->owner );
+
+		// UNDONE: this needs to call TraceAttack instead
+		ClearMultiDamage( );
+
+		if ( pOther->IsPlayer() )
+		{
+			pOther->TraceAttack(pevOwner, gSkillData.plrDmgCrossbowClient, pev->velocity.Normalize(), &tr, DMG_NEVERGIB ); 
+		}
+		else
+		{
+			pOther->TraceAttack(pevOwner, gSkillData.plrDmgCrossbowMonster, pev->velocity.Normalize(), &tr, DMG_BULLET | DMG_NEVERGIB ); 
+		}
+
+		ApplyMultiDamage( pev, pevOwner );
+
+		pev->velocity = Vector( 0, 0, 0 );
+		// play body "thwack" sound
+		switch( RANDOM_LONG(0,1) )
+		{
+		case 0:
+			EMIT_SOUND(ENT(pev), CHAN_BODY, "weapons/xbow_hitbod1.wav", 1, ATTN_NORM); break;
+		case 1:
+			EMIT_SOUND(ENT(pev), CHAN_BODY, "weapons/xbow_hitbod2.wav", 1, ATTN_NORM); break;
+		}
+
+		if ( !g_pGameRules->IsMultiplayer() )
+		{
+			Killed( pev, GIB_NEVER );
+		}
+	}
+	else
+	{
+		EMIT_SOUND_DYN(ENT(pev), CHAN_BODY, "weapons/xbow_hit1.wav", RANDOM_FLOAT(0.95, 1.0), ATTN_NORM, 0, 98 + RANDOM_LONG(0,7));
+
+		SetThink( &CCrossbowBolt::SUB_Remove );
+		pev->nextthink = gpGlobals->time;// this will get changed below if the bolt is allowed to stick in what it hit.
+
+		if ( FClassnameIs( pOther->pev, "worldspawn" ) )
+		{
+			// if what we hit is static architecture, can stay around for a while.
+			Vector vecDir = pev->velocity.Normalize( );
+			UTIL_SetOrigin( pev, pev->origin - vecDir * 12 );
+			pev->angles = UTIL_VecToAngles( vecDir );
+			pev->solid = SOLID_NOT;
+			pev->movetype = MOVETYPE_FLY;
+			pev->velocity = Vector( 0, 0, 0 );
+			pev->avelocity.z = 0;
+			pev->angles.z = RANDOM_LONG(0,360);
+			pev->nextthink = gpGlobals->time + 10.0;
+		}
+
+		if (UTIL_PointContents(pev->origin) != CONTENTS_WATER)
+		{
+			UTIL_Sparks( pev->origin );
+		}
+	}
+
+	if ( g_pGameRules->IsMultiplayer() )
+	{
+		SetThink( &CCrossbowBolt::ExplodeThink );
+		pev->nextthink = gpGlobals->time + 0.1;
+	}
+}
+
+void CCrossbowBolt::BubbleThink( void )
+{
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	if (pev->waterlevel == 0)
+		return;
+
+	UTIL_BubbleTrail( pev->origin - pev->velocity * 0.1, pev->origin, 1 );
+}
+
+void CCrossbowBolt::ExplodeThink( void )
+{
+	int iContents = UTIL_PointContents ( pev->origin );
+	int iScale;
+	
+	pev->dmg = 40;
+	iScale = 10;
+
+	MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, pev->origin );
+		WRITE_BYTE( TE_EXPLOSION);		
+		WRITE_COORD( pev->origin.x );
+		WRITE_COORD( pev->origin.y );
+		WRITE_COORD( pev->origin.z );
+		if (iContents != CONTENTS_WATER)
+		{
+			WRITE_SHORT( g_sModelIndexFireball );
+		}
+		else
+		{
+			WRITE_SHORT( g_sModelIndexWExplosion );
+		}
+		WRITE_BYTE( iScale  ); // scale * 10
+		WRITE_BYTE( 15  ); // framerate
+		WRITE_BYTE( TE_EXPLFLAG_NONE );
+	MESSAGE_END();
+
+	entvars_t *pevOwner;
+
+	if ( pev->owner )
+		pevOwner = VARS( pev->owner );
+	else
+		pevOwner = NULL;
+
+	pev->owner = NULL; // can't traceline attack owner if this is set
+
+	::RadiusDamage( pev->origin, pev, pevOwner, pev->dmg, 128, CLASS_NONE, DMG_BLAST | DMG_ALWAYSGIB );
+
+	UTIL_Remove(this);
+}
+#endif
+
+enum crossbow_e {
+	CROSSBOW_IDLE1 = 0,	// full
+	CROSSBOW_IDLE2,		// empty
+	CROSSBOW_FIDGET1,	// full
+	CROSSBOW_FIDGET2,	// empty
+	CROSSBOW_FIRE1,		// full
+	CROSSBOW_FIRE2,		// reload
+	CROSSBOW_FIRE3,		// empty
+	CROSSBOW_RELOAD,	// from empty
+	CROSSBOW_DRAW1,		// full
+	CROSSBOW_DRAW2,		// empty
+	CROSSBOW_HOLSTER1,	// full
+	CROSSBOW_HOLSTER2,	// empty
+};
+
+LINK_ENTITY_TO_CLASS( weapon_crossbow, CCrossbow );
+
+void CCrossbow::Spawn( )
+{
+	Precache( );
+	m_iId = WEAPON_CROSSBOW;
+	SET_MODEL(ENT(pev), "models/w_crossbow.mdl");
+
+	m_iDefaultAmmo = CROSSBOW_DEFAULT_GIVE;
+
+	FallInit();// get ready to fall down.
+}
+
+int CCrossbow::AddToPlayer( CBasePlayer *pPlayer )
+{
+	if ( CBasePlayerWeapon::AddToPlayer( pPlayer ) )
+	{
+		MESSAGE_BEGIN( MSG_ONE, gmsgWeapPickup, NULL, pPlayer->pev );
+			WRITE_BYTE( m_iId );
+		MESSAGE_END();
+		return TRUE;
+	}
+	return FALSE;
+}
+
+void CCrossbow::Precache( void )
+{
+	PRECACHE_MODEL("models/w_crossbow.mdl");
+	PRECACHE_MODEL("models/v_crossbow.mdl");
+	PRECACHE_MODEL("models/p_crossbow.mdl");
+
+	PRECACHE_SOUND("weapons/xbow_fire1.wav");
+	PRECACHE_SOUND("weapons/xbow_reload1.wav");
+
+	UTIL_PrecacheOther( "crossbow_bolt" );
+
+	m_usCrossbow = PRECACHE_EVENT( 1, "events/crossbow1.sc" );
+	m_usCrossbow2 = PRECACHE_EVENT( 1, "events/crossbow2.sc" );
+}
+
+
+int CCrossbow::GetItemInfo(ItemInfo *p)
+{
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = "bolts";
+	p->iMaxAmmo1 = BOLT_MAX_CARRY;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = -1;
+	p->iMaxClip = CROSSBOW_MAX_CLIP;
+	p->iSlot = 2;
+	p->iPosition = 2;
+	p->iId = WEAPON_CROSSBOW;
+	p->iFlags = 0;
+	p->iWeight = CROSSBOW_WEIGHT;
+	return 1;
+}
+
+
+BOOL CCrossbow::Deploy( )
+{
+	if (m_iClip)
+		return DefaultDeploy( "models/v_crossbow.mdl", "models/p_crossbow.mdl", CROSSBOW_DRAW1, "bow" );
+	return DefaultDeploy( "models/v_crossbow.mdl", "models/p_crossbow.mdl", CROSSBOW_DRAW2, "bow" );
+}
+
+void CCrossbow::Holster( int skiplocal /* = 0 */ )
+{
+	m_fInReload = FALSE;// cancel any reload in progress.
+
+	if ( m_fInZoom )
+	{
+		SecondaryAttack( );
+	}
+
+	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 0.5;
+	if (m_iClip)
+		SendWeaponAnim( CROSSBOW_HOLSTER1 );
+	else
+		SendWeaponAnim( CROSSBOW_HOLSTER2 );
+}
+
+void CCrossbow::PrimaryAttack( void )
+{
+
+#ifdef CLIENT_DLL
+	if ( m_fInZoom && bIsMultiplayer() )
+#else
+	if ( m_fInZoom && g_pGameRules->IsMultiplayer() )
+#endif
+	{
+		FireSniperBolt();
+		return;
+	}
+
+	FireBolt();
+}
+
+// this function only gets called in multiplayer
+void CCrossbow::FireSniperBolt()
+{
+	m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.75;
+
+	if (m_iClip == 0)
+	{
+		PlayEmptySound( );
+		return;
+	}
+
+	TraceResult tr;
+
+	m_pPlayer->m_iWeaponVolume = QUIET_GUN_VOLUME;
+	m_iClip--;
+
+	int flags;
+#if defined( CLIENT_WEAPONS )
+	flags = FEV_NOTHOST;
+#else
+	flags = 0;
+#endif
+
+	PLAYBACK_EVENT_FULL( flags, m_pPlayer->edict(), m_usCrossbow2, 0.0, (float *)&g_vecZero, (float *)&g_vecZero, 0, 0, m_iClip, m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType], 0, 0 );
+
+	// player "shoot" animation
+	m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
+	
+	Vector anglesAim = m_pPlayer->pev->v_angle + m_pPlayer->pev->punchangle;
+	UTIL_MakeVectors( anglesAim );
+	Vector vecSrc = m_pPlayer->GetGunPosition( ) - gpGlobals->v_up * 2;
+	Vector vecDir = gpGlobals->v_forward;
+
+	UTIL_TraceLine(vecSrc, vecSrc + vecDir * 8192, dont_ignore_monsters, m_pPlayer->edict(), &tr);
+
+#ifndef CLIENT_DLL
+	if ( tr.pHit->v.takedamage )
+	{
+		ClearMultiDamage( );
+		CBaseEntity::Instance(tr.pHit)->TraceAttack(m_pPlayer->pev, 120, vecDir, &tr, DMG_BULLET | DMG_NEVERGIB ); 
+		ApplyMultiDamage( pev, m_pPlayer->pev );
+	}
+#endif
+}
+
+void CCrossbow::FireBolt()
+{
+	TraceResult tr;
+
+	if (m_iClip == 0)
+	{
+		PlayEmptySound( );
+		return;
+	}
+
+	m_pPlayer->m_iWeaponVolume = QUIET_GUN_VOLUME;
+
+	m_iClip--;
+
+	int flags;
+#if defined( CLIENT_WEAPONS )
+	flags = FEV_NOTHOST;
+#else
+	flags = 0;
+#endif
+
+	PLAYBACK_EVENT_FULL( flags, m_pPlayer->edict(), m_usCrossbow, 0.0, (float *)&g_vecZero, (float *)&g_vecZero, 0, 0, m_iClip, m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType], 0, 0 );
+
+	// player "shoot" animation
+	m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
+
+	Vector anglesAim = m_pPlayer->pev->v_angle + m_pPlayer->pev->punchangle;
+	UTIL_MakeVectors( anglesAim );
+	
+	anglesAim.x		= -anglesAim.x;
+	Vector vecSrc	 = m_pPlayer->GetGunPosition( ) - gpGlobals->v_up * 2;
+	Vector vecDir	 = gpGlobals->v_forward;
+
+#ifndef CLIENT_DLL
+	CCrossbowBolt *pBolt = CCrossbowBolt::BoltCreate();
+	pBolt->pev->origin = vecSrc;
+	pBolt->pev->angles = anglesAim;
+	pBolt->pev->owner = m_pPlayer->edict();
+
+	if (m_pPlayer->pev->waterlevel == 3)
+	{
+		pBolt->pev->velocity = vecDir * BOLT_WATER_VELOCITY;
+		pBolt->pev->speed = BOLT_WATER_VELOCITY;
+	}
+	else
+	{
+		pBolt->pev->velocity = vecDir * BOLT_AIR_VELOCITY;
+		pBolt->pev->speed = BOLT_AIR_VELOCITY;
+	}
+	pBolt->pev->avelocity.z = 10;
+#endif
+
+	if (!m_iClip && m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] <= 0)
+		// HEV suit - indicate out of ammo condition
+		m_pPlayer->SetSuitUpdate("!HEV_AMO0", FALSE, 0);
+
+	m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.75;
+
+	m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 0.75;
+
+	if (m_iClip != 0)
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 5.0;
+	else
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 0.75;
+}
+
+
+void CCrossbow::SecondaryAttack()
+{
+	if ( m_pPlayer->pev->fov != 0 )
+	{
+		m_pPlayer->pev->fov = m_pPlayer->m_iFOV = 0; // 0 means reset to default fov
+		m_fInZoom = 0;
+	}
+	else if ( m_pPlayer->pev->fov != 20 )
+	{
+		m_pPlayer->pev->fov = m_pPlayer->m_iFOV = 20;
+		m_fInZoom = 1;
+	}
+	
+	pev->nextthink = UTIL_WeaponTimeBase() + 0.1;
+	m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 1.0;
+}
+
+
+void CCrossbow::Reload( void )
+{
+	if ( m_pPlayer->ammo_bolts <= 0 )
+		return;
+
+	if ( m_pPlayer->pev->fov != 0 )
+	{
+		SecondaryAttack();
+	}
+
+	if ( DefaultReload( 5, CROSSBOW_RELOAD, 4.5 ) )
+	{
+		EMIT_SOUND_DYN(ENT(m_pPlayer->pev), CHAN_ITEM, "weapons/xbow_reload1.wav", RANDOM_FLOAT(0.95, 1.0), ATTN_NORM, 0, 93 + RANDOM_LONG(0,0xF));
+	}
+}
+
+
+void CCrossbow::WeaponIdle( void )
+{
+	m_pPlayer->GetAutoaimVector( AUTOAIM_2DEGREES );  // get the autoaim vector but ignore it;  used for autoaim crosshair in DM
+
+	ResetEmptySound( );
+	
+	if ( m_flTimeWeaponIdle < UTIL_WeaponTimeBase() )
+	{
+		float flRand = UTIL_SharedRandomFloat( m_pPlayer->random_seed, 0, 1 );
+		if (flRand <= 0.75)
+		{
+			if (m_iClip)
+			{
+				SendWeaponAnim( CROSSBOW_IDLE1 );
+			}
+			else
+			{
+				SendWeaponAnim( CROSSBOW_IDLE2 );
+			}
+			m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
+		}
+		else
+		{
+			if (m_iClip)
+			{
+				SendWeaponAnim( CROSSBOW_FIDGET1 );
+				m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 90.0 / 30.0;
+			}
+			else
+			{
+				SendWeaponAnim( CROSSBOW_FIDGET2 );
+				m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 80.0 / 30.0;
+			}
+		}
+	}
+}
+
+
+
+class CCrossbowAmmo : public CBasePlayerAmmo
+{
+	void Spawn( void )
+	{ 
+		Precache( );
+		SET_MODEL(ENT(pev), "models/w_crossbow_clip.mdl");
+		CBasePlayerAmmo::Spawn( );
+	}
+	void Precache( void )
+	{
+		PRECACHE_MODEL ("models/w_crossbow_clip.mdl");
+		PRECACHE_SOUND("items/9mmclip1.wav");
+	}
+	BOOL AddAmmo( CBaseEntity *pOther ) 
+	{ 
+		if (pOther->GiveAmmo( AMMO_CROSSBOWCLIP_GIVE, "bolts", BOLT_MAX_CARRY ) != -1)
+		{
+			EMIT_SOUND(ENT(pev), CHAN_ITEM, "items/9mmclip1.wav", 1, ATTN_NORM);
+			return TRUE;
+		}
+		return FALSE;
+	}
+};
+LINK_ENTITY_TO_CLASS( ammo_crossbow, CCrossbowAmmo );
+
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/crowbar.cpp b/main/source/dlls/crowbar.cpp
new file mode 100644
index 00000000..e4f008c8
--- /dev/null
+++ b/main/source/dlls/crowbar.cpp
@@ -0,0 +1,334 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "player.h"
+#include "gamerules.h"
+
+
+#define	CROWBAR_BODYHIT_VOLUME 128
+#define	CROWBAR_WALLHIT_VOLUME 512
+
+//class CCrowbar : public CBasePlayerWeapon
+//{
+//public:
+//	void Spawn( void );
+//	void Precache( void );
+//	int iItemSlot( void ) { return 1; }
+//	void EXPORT SwingAgain( void );
+//	void EXPORT Smack( void );
+//	int GetItemInfo(ItemInfo *p);
+//
+//	void PrimaryAttack( void );
+//	int Swing( int fFirst );
+//	BOOL Deploy( void );
+//	void Holster( int skiplocal = 0 );
+//	int m_iSwing;
+//	TraceResult m_trHit;
+//};
+//LINK_ENTITY_TO_CLASS( weapon_rowbar, CCrowbar );
+LINK_ENTITY_TO_CLASS( weapon_crowbar, CCrowbar );
+
+enum gauss_e {
+	CROWBAR_IDLE = 0,
+	CROWBAR_DRAW,
+	CROWBAR_HOLSTER,
+	CROWBAR_ATTACK1HIT,
+	CROWBAR_ATTACK1MISS,
+	CROWBAR_ATTACK2MISS,
+	CROWBAR_ATTACK2HIT,
+	CROWBAR_ATTACK3MISS,
+	CROWBAR_ATTACK3HIT
+};
+
+
+void CCrowbar::Spawn( )
+{
+	Precache( );
+	m_iId = WEAPON_CROWBAR;
+	SET_MODEL(ENT(pev), "models/w_crowbar.mdl");
+	m_iClip = -1;
+
+	FallInit();// get ready to fall down.
+}
+
+
+void CCrowbar::Precache( void )
+{
+	PRECACHE_MODEL("models/v_crowbar.mdl");
+	PRECACHE_MODEL("models/w_crowbar.mdl");
+	PRECACHE_MODEL("models/p_crowbar.mdl");
+	PRECACHE_SOUND("weapons/cbar_hit1.wav");
+	PRECACHE_SOUND("weapons/cbar_hit2.wav");
+	PRECACHE_SOUND("weapons/cbar_hitbod1.wav");
+	PRECACHE_SOUND("weapons/cbar_hitbod2.wav");
+	PRECACHE_SOUND("weapons/cbar_hitbod3.wav");
+	PRECACHE_SOUND("weapons/cbar_miss1.wav");
+
+	m_usCrowbar = PRECACHE_EVENT ( 1, "events/crowbar.sc" );
+}
+
+int CCrowbar::GetItemInfo(ItemInfo *p)
+{
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;
+	p->iMaxAmmo1 = -1;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = -1;
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iSlot = 0;
+	p->iPosition = 0;
+	p->iId = WEAPON_CROWBAR;
+	p->iWeight = CROWBAR_WEIGHT;
+	return 1;
+}
+
+
+
+BOOL CCrowbar::Deploy( )
+{
+	return DefaultDeploy( "models/v_crowbar.mdl", "models/p_crowbar.mdl", CROWBAR_DRAW, "crowbar" );
+}
+
+void CCrowbar::Holster( int skiplocal /* = 0 */ )
+{
+	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 0.5;
+	SendWeaponAnim( CROWBAR_HOLSTER );
+}
+
+
+void FindHullIntersection( const Vector &vecSrc, TraceResult &tr, float *mins, float *maxs, edict_t *pEntity )
+{
+	int			i, j, k;
+	float		distance;
+	float		*minmaxs[2] = {mins, maxs};
+	TraceResult tmpTrace;
+	Vector		vecHullEnd = tr.vecEndPos;
+	Vector		vecEnd;
+
+	distance = 1e6f;
+
+	vecHullEnd = vecSrc + ((vecHullEnd - vecSrc)*2);
+	UTIL_TraceLine( vecSrc, vecHullEnd, dont_ignore_monsters, pEntity, &tmpTrace );
+	if ( tmpTrace.flFraction < 1.0 )
+	{
+		tr = tmpTrace;
+		return;
+	}
+
+	for ( i = 0; i < 2; i++ )
+	{
+		for ( j = 0; j < 2; j++ )
+		{
+			for ( k = 0; k < 2; k++ )
+			{
+				vecEnd.x = vecHullEnd.x + minmaxs[i][0];
+				vecEnd.y = vecHullEnd.y + minmaxs[j][1];
+				vecEnd.z = vecHullEnd.z + minmaxs[k][2];
+
+				UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, pEntity, &tmpTrace );
+				if ( tmpTrace.flFraction < 1.0 )
+				{
+					float thisDistance = (tmpTrace.vecEndPos - vecSrc).Length();
+					if ( thisDistance < distance )
+					{
+						tr = tmpTrace;
+						distance = thisDistance;
+					}
+				}
+			}
+		}
+	}
+}
+
+
+void CCrowbar::PrimaryAttack()
+{
+	if (! Swing( 1 ))
+	{
+		SetThink( &CCrowbar::SwingAgain );
+		pev->nextthink = gpGlobals->time + 0.1;
+	}
+}
+
+
+void CCrowbar::Smack( )
+{
+	DecalGunshot( &m_trHit, BULLET_PLAYER_CROWBAR );
+}
+
+
+void CCrowbar::SwingAgain( void )
+{
+	Swing( 0 );
+}
+
+
+int CCrowbar::Swing( int fFirst )
+{
+	int fDidHit = FALSE;
+
+	TraceResult tr;
+
+	UTIL_MakeVectors (m_pPlayer->pev->v_angle);
+	Vector vecSrc	= m_pPlayer->GetGunPosition( );
+	Vector vecEnd	= vecSrc + gpGlobals->v_forward * 32;
+
+	UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr );
+
+#ifndef CLIENT_DLL
+	if ( tr.flFraction >= 1.0 )
+	{
+		UTIL_TraceHull( vecSrc, vecEnd, dont_ignore_monsters, head_hull, ENT( m_pPlayer->pev ), &tr );
+		if ( tr.flFraction < 1.0 )
+		{
+			// Calculate the point of intersection of the line (or hull) and the object we hit
+			// This is and approximation of the "best" intersection
+			CBaseEntity *pHit = CBaseEntity::Instance( tr.pHit );
+			if ( !pHit || pHit->IsBSPModel() )
+				FindHullIntersection( vecSrc, tr, VEC_DUCK_HULL_MIN, VEC_DUCK_HULL_MAX, m_pPlayer->edict() );
+			vecEnd = tr.vecEndPos;	// This is the point on the actual surface (the hull could have hit space)
+		}
+	}
+#endif
+
+	PLAYBACK_EVENT_FULL( FEV_NOTHOST, m_pPlayer->edict(), m_usCrowbar, 
+	0.0, (float *)&g_vecZero, (float *)&g_vecZero, 0, 0, 0,
+	0.0, 0, 0.0 );
+
+
+	if ( tr.flFraction >= 1.0 )
+	{
+		if (fFirst)
+		{
+			// miss
+			m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.5;
+			
+			// player "shoot" animation
+			m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
+		}
+	}
+	else
+	{
+		switch( ((m_iSwing++) % 2) + 1 )
+		{
+		case 0:
+			SendWeaponAnim( CROWBAR_ATTACK1HIT ); break;
+		case 1:
+			SendWeaponAnim( CROWBAR_ATTACK2HIT ); break;
+		case 2:
+			SendWeaponAnim( CROWBAR_ATTACK3HIT ); break;
+		}
+
+		// player "shoot" animation
+		m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
+		
+#ifndef CLIENT_DLL
+
+		// hit
+		fDidHit = TRUE;
+		CBaseEntity *pEntity = CBaseEntity::Instance(tr.pHit);
+
+		ClearMultiDamage( );
+
+		if ( (m_flNextPrimaryAttack + 1 < UTIL_WeaponTimeBase() ) || g_pGameRules->IsMultiplayer() )
+		{
+			// first swing does full damage
+			pEntity->TraceAttack(m_pPlayer->pev, gSkillData.plrDmgCrowbar, gpGlobals->v_forward, &tr, DMG_CLUB ); 
+		}
+		else
+		{
+			// subsequent swings do half
+			pEntity->TraceAttack(m_pPlayer->pev, gSkillData.plrDmgCrowbar / 2, gpGlobals->v_forward, &tr, DMG_CLUB ); 
+		}	
+		ApplyMultiDamage( m_pPlayer->pev, m_pPlayer->pev );
+
+		// play thwack, smack, or dong sound
+		float flVol = 1.0;
+		int fHitWorld = TRUE;
+
+		if (pEntity)
+		{
+			if (pEntity->Classify() != CLASS_NONE && pEntity->Classify() != CLASS_MACHINE)
+			{
+				// play thwack or smack sound
+				switch( RANDOM_LONG(0,2) )
+				{
+				case 0:
+					EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_ITEM, "weapons/cbar_hitbod1.wav", 1, ATTN_NORM); break;
+				case 1:
+					EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_ITEM, "weapons/cbar_hitbod2.wav", 1, ATTN_NORM); break;
+				case 2:
+					EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_ITEM, "weapons/cbar_hitbod3.wav", 1, ATTN_NORM); break;
+				}
+				m_pPlayer->m_iWeaponVolume = CROWBAR_BODYHIT_VOLUME;
+				if (!pEntity->IsAlive() )
+					return TRUE;
+				else
+					flVol = 0.1;
+
+				fHitWorld = FALSE;
+			}
+		}
+
+		// play texture hit sound
+		// UNDONE: Calculate the correct point of intersection when we hit with the hull instead of the line
+
+		if (fHitWorld)
+		{
+			float fvolbar = TEXTURETYPE_PlaySound(&tr, vecSrc, vecSrc + (vecEnd-vecSrc)*2, BULLET_PLAYER_CROWBAR);
+
+			if ( g_pGameRules->IsMultiplayer() )
+			{
+				// override the volume here, cause we don't play texture sounds in multiplayer, 
+				// and fvolbar is going to be 0 from the above call.
+
+				fvolbar = 1;
+			}
+
+			// also play crowbar strike
+			switch( RANDOM_LONG(0,1) )
+			{
+			case 0:
+				EMIT_SOUND_DYN(ENT(m_pPlayer->pev), CHAN_ITEM, "weapons/cbar_hit1.wav", fvolbar, ATTN_NORM, 0, 98 + RANDOM_LONG(0,3)); 
+				break;
+			case 1:
+				EMIT_SOUND_DYN(ENT(m_pPlayer->pev), CHAN_ITEM, "weapons/cbar_hit2.wav", fvolbar, ATTN_NORM, 0, 98 + RANDOM_LONG(0,3)); 
+				break;
+			}
+
+			// delay the decal a bit
+			m_trHit = tr;
+		}
+
+		m_pPlayer->m_iWeaponVolume = flVol * CROWBAR_WALLHIT_VOLUME;
+#endif
+		m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.25;
+		
+		SetThink( &CCrowbar::Smack );
+		pev->nextthink = UTIL_WeaponTimeBase() + 0.2;
+
+		
+	}
+	return fDidHit;
+}
+
+
+
diff --git a/main/source/dlls/ctripmine.h b/main/source/dlls/ctripmine.h
new file mode 100644
index 00000000..2109d6f2
--- /dev/null
+++ b/main/source/dlls/ctripmine.h
@@ -0,0 +1,47 @@
+#ifndef CTRIPMINE_H
+#define CTRIPMINE_H
+
+#include "mod/AvHBasePlayerWeapon.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+
+////class CTripmine : public CBasePlayerWeapon
+//class CTripmine : public AvHBasePlayerWeapon
+//{
+//public:
+//
+//	int	GetBarrelLength() const
+//	{
+//		return kMineBarrellLength;
+//	}
+//
+//	void Spawn( void );
+//	void Precache( void );
+//	int iItemSlot( void ) { return 5; }
+//	int GetItemInfo(ItemInfo *p);
+//	void SetObjectCollisionBox( void )
+//	{
+//		//!!!BUGBUG - fix the model!
+//		pev->absmin = pev->origin + Vector(-16, -16, -5);
+//		pev->absmax = pev->origin + Vector(16, 16, 28); 
+//	}
+//
+//	void PrimaryAttack( void );
+//	BOOL Deploy( void );
+//	void Holster( int skiplocal = 0 );
+//	void WeaponIdle( void );
+//
+//	virtual BOOL UseDecrement( void )
+//	{ 
+//#if defined( CLIENT_WEAPONS )
+//		return TRUE;
+//#else
+//		return FALSE;
+//#endif
+//	}
+//
+//private:
+//	unsigned short m_usTripFire;
+//
+//};
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/decals.h b/main/source/dlls/decals.h
new file mode 100644
index 00000000..bfb3ed59
--- /dev/null
+++ b/main/source/dlls/decals.h
@@ -0,0 +1,75 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef DECALS_H
+#define DECALS_H
+
+//
+// Dynamic Decals
+//
+enum decal_e 
+{	
+	DECAL_GUNSHOT1 = 0, 
+	DECAL_GUNSHOT2,
+	DECAL_GUNSHOT3,
+	DECAL_GUNSHOT4,
+	DECAL_GUNSHOT5,
+	DECAL_LAMBDA1,
+	DECAL_LAMBDA2,
+	DECAL_LAMBDA3,
+	DECAL_LAMBDA4,
+	DECAL_LAMBDA5,
+	DECAL_LAMBDA6,
+	DECAL_SCORCH1,
+	DECAL_SCORCH2,
+	DECAL_BLOOD1, 
+	DECAL_BLOOD2, 
+	DECAL_BLOOD3, 
+	DECAL_BLOOD4, 
+	DECAL_BLOOD5, 
+	DECAL_BLOOD6, 
+	DECAL_YBLOOD1, 
+	DECAL_YBLOOD2, 
+	DECAL_YBLOOD3, 
+	DECAL_YBLOOD4, 
+	DECAL_YBLOOD5, 
+	DECAL_YBLOOD6, 
+	DECAL_GLASSBREAK1,
+	DECAL_GLASSBREAK2,
+	DECAL_GLASSBREAK3,
+	DECAL_BIGSHOT1,
+	DECAL_BIGSHOT2,
+	DECAL_BIGSHOT3,
+	DECAL_BIGSHOT4,
+	DECAL_BIGSHOT5,
+	DECAL_SPIT1,
+	DECAL_SPIT2,
+	DECAL_BPROOF1,		// Bulletproof glass decal
+	DECAL_GARGSTOMP1,	// Gargantua stomp crack
+	DECAL_SMALLSCORCH1,	// Small scorch mark
+	DECAL_SMALLSCORCH2,	// Small scorch mark
+	DECAL_SMALLSCORCH3,	// Small scorch mark
+	DECAL_MOMMABIRTH,	// Big momma birth splatter
+	DECAL_MOMMASPLAT,
+};
+
+typedef struct 
+{
+	char	*name;
+	int		index;
+} DLL_DECALLIST;
+
+extern DLL_DECALLIST gDecals[];
+
+#endif	// DECALS_H
diff --git a/main/source/dlls/defaultai.cpp b/main/source/dlls/defaultai.cpp
new file mode 100644
index 00000000..fd74789d
--- /dev/null
+++ b/main/source/dlls/defaultai.cpp
@@ -0,0 +1,1232 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// Default behaviors.
+//=========================================================
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"schedule.h"
+#include	"defaultai.h"
+#include	"soundent.h"
+#include	"nodes.h"
+#include	"scripted.h"
+
+//=========================================================
+// Fail
+//=========================================================
+Task_t	tlFail[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE },
+	{ TASK_WAIT,				(float)2		},
+	{ TASK_WAIT_PVS,			(float)0		},
+};
+
+Schedule_t	slFail[] =
+{
+	{
+		tlFail,
+		ARRAYSIZE ( tlFail ),
+		bits_COND_CAN_ATTACK,
+		0,
+		"Fail"
+	},
+};
+
+//=========================================================
+//	Idle Schedules
+//=========================================================
+Task_t	tlIdleStand1[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE },
+	{ TASK_WAIT,				(float)5		},// repick IDLESTAND every five seconds. gives us a chance to pick an active idle, fidget, etc.
+};
+
+Schedule_t	slIdleStand[] =
+{
+	{ 
+		tlIdleStand1,
+		ARRAYSIZE ( tlIdleStand1 ), 
+		bits_COND_NEW_ENEMY		|
+		bits_COND_SEE_FEAR		|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE	|
+		bits_COND_HEAR_SOUND	|
+		bits_COND_SMELL_FOOD	|
+		bits_COND_SMELL			|
+		bits_COND_PROVOKED,
+
+		bits_SOUND_COMBAT		|// sound flags
+		bits_SOUND_WORLD		|
+		bits_SOUND_PLAYER		|
+		bits_SOUND_DANGER		|
+
+		bits_SOUND_MEAT			|// scents
+		bits_SOUND_CARCASS		|
+		bits_SOUND_GARBAGE,
+		"IdleStand"
+	},
+};
+
+Schedule_t	slIdleTrigger[] =
+{
+	{ 
+		tlIdleStand1,
+		ARRAYSIZE ( tlIdleStand1 ), 
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE,
+		0,
+		"Idle Trigger"
+	},
+};
+
+
+Task_t	tlIdleWalk1[] =
+{
+	{ TASK_WALK_PATH,			(float)9999 },
+	{ TASK_WAIT_FOR_MOVEMENT,	(float)0	},
+};
+
+Schedule_t	slIdleWalk[] =
+{
+	{ 
+		tlIdleWalk1,
+		ARRAYSIZE ( tlIdleWalk1 ), 
+		bits_COND_NEW_ENEMY		|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE	|
+		bits_COND_HEAR_SOUND	|
+		bits_COND_SMELL_FOOD	|
+		bits_COND_SMELL			|
+		bits_COND_PROVOKED,
+
+		bits_SOUND_COMBAT		|// sound flags
+
+		bits_SOUND_MEAT			|// scents
+		bits_SOUND_CARCASS		|
+		bits_SOUND_GARBAGE,
+		"Idle Walk"
+	},
+};
+
+//=========================================================
+// Ambush - monster stands in place and waits for a new 
+// enemy, or chance to attack an existing enemy.
+//=========================================================
+Task_t	tlAmbush[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE },
+	{ TASK_WAIT_INDEFINITE,		(float)0		},
+};
+
+Schedule_t	slAmbush[] =
+{
+	{ 
+		tlAmbush,
+		ARRAYSIZE ( tlAmbush ), 
+		bits_COND_NEW_ENEMY		|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE	|
+		bits_COND_PROVOKED,
+
+		0,
+		"Ambush"
+	},
+};
+
+//=========================================================
+// ActiveIdle schedule - !!!BUGBUG - if this schedule doesn't
+// complete on its own, the monster's HintNode will not be 
+// cleared, and the rest of the monster's group will avoid
+// that node because they think the group member that was 
+// previously interrupted is still using that node to active
+// idle.
+///=========================================================
+Task_t tlActiveIdle[] =
+{
+	{ TASK_FIND_HINTNODE,			(float)0	},
+	{ TASK_GET_PATH_TO_HINTNODE,	(float)0	},
+	{ TASK_STORE_LASTPOSITION,		(float)0	},
+	{ TASK_WALK_PATH,				(float)0	},
+	{ TASK_WAIT_FOR_MOVEMENT,		(float)0	},
+	{ TASK_FACE_HINTNODE,			(float)0	},
+	{ TASK_PLAY_ACTIVE_IDLE,		(float)0	},
+	{ TASK_GET_PATH_TO_LASTPOSITION,(float)0	},
+	{ TASK_WALK_PATH,				(float)0	},
+	{ TASK_WAIT_FOR_MOVEMENT,		(float)0	},
+	{ TASK_CLEAR_LASTPOSITION,		(float)0	},
+	{ TASK_CLEAR_HINTNODE,			(float)0	},
+};
+
+Schedule_t slActiveIdle[] =
+{
+	{
+		tlActiveIdle,
+		ARRAYSIZE( tlActiveIdle ),
+		bits_COND_NEW_ENEMY		|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE	|
+		bits_COND_PROVOKED		|
+		bits_COND_HEAR_SOUND,
+
+		bits_SOUND_COMBAT		|
+		bits_SOUND_WORLD		|
+		bits_SOUND_PLAYER		|
+		bits_SOUND_DANGER,
+		"Active Idle"
+	}
+};
+
+//=========================================================
+//	Wake Schedules
+//=========================================================
+Task_t tlWakeAngry1[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE },
+	{ TASK_SOUND_WAKE,			(float)0	},
+	{ TASK_FACE_IDEAL,			(float)0	},
+};
+
+Schedule_t slWakeAngry[] =
+{
+	{
+		tlWakeAngry1,
+		ARRAYSIZE ( tlWakeAngry1 ),
+		0,
+		0,
+		"Wake Angry"
+	}
+};
+
+//=========================================================
+// AlertFace Schedules
+//=========================================================
+Task_t	tlAlertFace1[] =
+{
+	{ TASK_STOP_MOVING,				0				},
+	{ TASK_SET_ACTIVITY,			(float)ACT_IDLE	},
+	{ TASK_FACE_IDEAL,				(float)0		},
+};
+
+Schedule_t	slAlertFace[] =
+{
+	{ 
+		tlAlertFace1,
+		ARRAYSIZE ( tlAlertFace1 ),
+		bits_COND_NEW_ENEMY		|
+		bits_COND_SEE_FEAR		|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE	|
+		bits_COND_PROVOKED,
+		0,
+		"Alert Face"
+	},
+};
+
+//=========================================================
+// AlertSmallFlinch Schedule - shot, but didn't see attacker,
+// flinch then face
+//=========================================================
+Task_t	tlAlertSmallFlinch[] =
+{
+	{ TASK_STOP_MOVING,				0						},
+	{ TASK_REMEMBER,				(float)bits_MEMORY_FLINCHED },
+	{ TASK_SMALL_FLINCH,			(float)0				},
+	{ TASK_SET_SCHEDULE,			(float)SCHED_ALERT_FACE	},
+};
+
+Schedule_t	slAlertSmallFlinch[] =
+{
+	{ 
+		tlAlertSmallFlinch,
+		ARRAYSIZE ( tlAlertSmallFlinch ),
+		0,
+		0,
+		"Alert Small Flinch"
+	},
+};
+
+//=========================================================
+// AlertIdle Schedules
+//=========================================================
+Task_t	tlAlertStand1[] =
+{
+	{ TASK_STOP_MOVING,			0						 },
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE			 },
+	{ TASK_WAIT,				(float)20				 },
+	{ TASK_SUGGEST_STATE,		(float)MONSTERSTATE_IDLE },
+};
+
+Schedule_t	slAlertStand[] =
+{
+	{ 
+		tlAlertStand1,
+		ARRAYSIZE ( tlAlertStand1 ), 
+		bits_COND_NEW_ENEMY				|
+		bits_COND_SEE_ENEMY				|
+		bits_COND_SEE_FEAR				|
+		bits_COND_LIGHT_DAMAGE			|
+		bits_COND_HEAVY_DAMAGE			|
+		bits_COND_PROVOKED				|
+		bits_COND_SMELL					|
+		bits_COND_SMELL_FOOD			|
+		bits_COND_HEAR_SOUND,
+
+		bits_SOUND_COMBAT		|// sound flags
+		bits_SOUND_WORLD		|
+		bits_SOUND_PLAYER		|
+		bits_SOUND_DANGER		|
+
+		bits_SOUND_MEAT			|// scent flags
+		bits_SOUND_CARCASS		|
+		bits_SOUND_GARBAGE,
+		"Alert Stand"
+	},
+};
+
+//=========================================================
+// InvestigateSound - sends a monster to the location of the
+// sound that was just heard, to check things out. 
+//=========================================================
+Task_t tlInvestigateSound[] =
+{
+	{ TASK_STOP_MOVING,				(float)0				},
+	{ TASK_STORE_LASTPOSITION,		(float)0				},
+	{ TASK_GET_PATH_TO_BESTSOUND,	(float)0				},
+	{ TASK_FACE_IDEAL,				(float)0				},
+	{ TASK_WALK_PATH,				(float)0				},
+	{ TASK_WAIT_FOR_MOVEMENT,		(float)0				},
+	{ TASK_PLAY_SEQUENCE,			(float)ACT_IDLE			},
+	{ TASK_WAIT,					(float)10				},
+	{ TASK_GET_PATH_TO_LASTPOSITION,(float)0				},
+	{ TASK_WALK_PATH,				(float)0				},
+	{ TASK_WAIT_FOR_MOVEMENT,		(float)0				},
+	{ TASK_CLEAR_LASTPOSITION,		(float)0				},
+};
+
+Schedule_t	slInvestigateSound[] =
+{
+	{ 
+		tlInvestigateSound,
+		ARRAYSIZE ( tlInvestigateSound ), 
+		bits_COND_NEW_ENEMY			|
+		bits_COND_SEE_FEAR			|
+		bits_COND_LIGHT_DAMAGE		|
+		bits_COND_HEAVY_DAMAGE		|
+		bits_COND_HEAR_SOUND,
+		
+		bits_SOUND_DANGER,
+		"InvestigateSound"
+	},
+};
+
+//=========================================================
+// CombatIdle Schedule
+//=========================================================
+Task_t	tlCombatStand1[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE },
+	{ TASK_WAIT_INDEFINITE,		(float)0		},
+};
+
+Schedule_t	slCombatStand[] =
+{
+	{ 
+		tlCombatStand1,
+		ARRAYSIZE ( tlCombatStand1 ), 
+		bits_COND_NEW_ENEMY			|
+		bits_COND_ENEMY_DEAD		|
+		bits_COND_LIGHT_DAMAGE		|
+		bits_COND_HEAVY_DAMAGE		|
+		bits_COND_CAN_ATTACK, 
+		0,
+		"Combat Stand"
+	},
+};
+
+//=========================================================
+// CombatFace Schedule
+//=========================================================
+Task_t	tlCombatFace1[] =
+{
+	{ TASK_STOP_MOVING,				0				},
+	{ TASK_SET_ACTIVITY,			(float)ACT_IDLE	},
+	{ TASK_FACE_ENEMY,				(float)0		},
+};
+
+Schedule_t	slCombatFace[] =
+{
+	{ 
+		tlCombatFace1,
+		ARRAYSIZE ( tlCombatFace1 ), 
+		bits_COND_CAN_ATTACK			|
+		bits_COND_NEW_ENEMY				|
+		bits_COND_ENEMY_DEAD,
+		0,
+		"Combat Face"
+	},
+};
+
+//=========================================================
+// Standoff schedule. Used in combat when a monster is 
+// hiding in cover or the enemy has moved out of sight. 
+// Should we look around in this schedule?
+//=========================================================
+Task_t	tlStandoff[] =
+{
+	{ TASK_STOP_MOVING,				(float)0					},
+	{ TASK_SET_ACTIVITY,			(float)ACT_IDLE				},
+	{ TASK_WAIT_FACE_ENEMY,			(float)2					},
+};
+
+Schedule_t slStandoff[] = 
+{
+	{
+		tlStandoff,
+		ARRAYSIZE ( tlStandoff ),
+		bits_COND_CAN_RANGE_ATTACK1		|
+		bits_COND_CAN_RANGE_ATTACK2		|
+		bits_COND_ENEMY_DEAD			|
+		bits_COND_NEW_ENEMY				|
+		bits_COND_HEAR_SOUND,
+		
+		bits_SOUND_DANGER,
+		"Standoff"
+	}
+};
+
+//=========================================================
+// Arm weapon (draw gun)
+//=========================================================
+Task_t	tlArmWeapon[] =
+{
+	{ TASK_STOP_MOVING,		0				},
+	{ TASK_PLAY_SEQUENCE,	(float) ACT_ARM }
+};
+
+Schedule_t slArmWeapon[] = 
+{
+	{
+		tlArmWeapon,
+		ARRAYSIZE ( tlArmWeapon ),
+		0,
+		0,
+		"Arm Weapon"
+	}
+};
+
+//=========================================================
+// reload schedule
+//=========================================================
+Task_t	tlReload[] =
+{
+	{ TASK_STOP_MOVING,			0					},
+	{ TASK_PLAY_SEQUENCE,		float(ACT_RELOAD)	},
+};
+
+Schedule_t slReload[] = 
+{
+	{
+		tlReload,
+		ARRAYSIZE ( tlReload ),
+		bits_COND_HEAVY_DAMAGE,
+		0,
+		"Reload"
+	}
+};
+
+//=========================================================
+//	Attack Schedules
+//=========================================================
+
+// primary range attack
+Task_t	tlRangeAttack1[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_FACE_ENEMY,			(float)0		},
+	{ TASK_RANGE_ATTACK1,		(float)0		},
+};
+
+Schedule_t	slRangeAttack1[] =
+{
+	{ 
+		tlRangeAttack1,
+		ARRAYSIZE ( tlRangeAttack1 ), 
+		bits_COND_NEW_ENEMY			|
+		bits_COND_ENEMY_DEAD		|
+		bits_COND_LIGHT_DAMAGE		|
+		bits_COND_HEAVY_DAMAGE		|
+		bits_COND_ENEMY_OCCLUDED	|
+		bits_COND_NO_AMMO_LOADED	|
+		bits_COND_HEAR_SOUND,
+		
+		bits_SOUND_DANGER,
+		"Range Attack1"
+	},
+};
+
+// secondary range attack
+Task_t	tlRangeAttack2[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_FACE_ENEMY,			(float)0		},
+	{ TASK_RANGE_ATTACK2,		(float)0		},
+};
+
+Schedule_t	slRangeAttack2[] =
+{
+	{ 
+		tlRangeAttack2,
+		ARRAYSIZE ( tlRangeAttack2 ), 
+		bits_COND_NEW_ENEMY			|
+		bits_COND_ENEMY_DEAD		|
+		bits_COND_LIGHT_DAMAGE		|
+		bits_COND_HEAVY_DAMAGE		|
+		bits_COND_ENEMY_OCCLUDED	|
+		bits_COND_HEAR_SOUND,
+		
+		bits_SOUND_DANGER,
+		"Range Attack2"
+	},
+};
+
+// primary melee attack
+Task_t	tlPrimaryMeleeAttack1[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_FACE_ENEMY,			(float)0		},
+	{ TASK_MELEE_ATTACK1,		(float)0		},
+};
+
+Schedule_t	slPrimaryMeleeAttack[] =
+{
+	{ 
+		tlPrimaryMeleeAttack1,
+		ARRAYSIZE ( tlPrimaryMeleeAttack1 ), 
+		bits_COND_NEW_ENEMY			|
+		bits_COND_ENEMY_DEAD		|
+		bits_COND_LIGHT_DAMAGE		|
+		bits_COND_HEAVY_DAMAGE		|
+		bits_COND_ENEMY_OCCLUDED,
+		0,
+		"Primary Melee Attack"
+	},
+};
+
+// secondary melee attack
+Task_t	tlSecondaryMeleeAttack1[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_FACE_ENEMY,			(float)0		},
+	{ TASK_MELEE_ATTACK2,		(float)0		},
+};
+
+Schedule_t	slSecondaryMeleeAttack[] =
+{
+	{ 
+		tlSecondaryMeleeAttack1,
+		ARRAYSIZE ( tlSecondaryMeleeAttack1 ), 
+		bits_COND_NEW_ENEMY			|
+		bits_COND_ENEMY_DEAD		|
+		bits_COND_LIGHT_DAMAGE		|
+		bits_COND_HEAVY_DAMAGE		|
+		bits_COND_ENEMY_OCCLUDED,
+		0,
+		"Secondary Melee Attack"
+	},
+};
+
+// special attack1
+Task_t	tlSpecialAttack1[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_FACE_ENEMY,			(float)0		},
+	{ TASK_SPECIAL_ATTACK1,		(float)0		},
+};
+
+Schedule_t	slSpecialAttack1[] =
+{
+	{ 
+		tlSpecialAttack1,
+		ARRAYSIZE ( tlSpecialAttack1 ), 
+		bits_COND_NEW_ENEMY			|
+		bits_COND_ENEMY_DEAD		|
+		bits_COND_LIGHT_DAMAGE		|
+		bits_COND_HEAVY_DAMAGE		|
+		bits_COND_ENEMY_OCCLUDED	|
+		bits_COND_NO_AMMO_LOADED	|
+		bits_COND_HEAR_SOUND,
+		
+		bits_SOUND_DANGER,
+		"Special Attack1"
+	},
+};
+
+// special attack2
+Task_t	tlSpecialAttack2[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_FACE_ENEMY,			(float)0		},
+	{ TASK_SPECIAL_ATTACK2,		(float)0		},
+};
+
+Schedule_t	slSpecialAttack2[] =
+{
+	{ 
+		tlSpecialAttack2,
+		ARRAYSIZE ( tlSpecialAttack2 ), 
+		bits_COND_NEW_ENEMY			|
+		bits_COND_ENEMY_DEAD		|
+		bits_COND_LIGHT_DAMAGE		|
+		bits_COND_HEAVY_DAMAGE		|
+		bits_COND_ENEMY_OCCLUDED	|
+		bits_COND_NO_AMMO_LOADED	|
+		bits_COND_HEAR_SOUND,
+		
+		bits_SOUND_DANGER,
+		"Special Attack2"
+	},
+};
+
+// Chase enemy schedule
+Task_t tlChaseEnemy1[] = 
+{
+	{ TASK_SET_FAIL_SCHEDULE,	(float)SCHED_CHASE_ENEMY_FAILED	},
+	{ TASK_GET_PATH_TO_ENEMY,	(float)0		},
+	{ TASK_RUN_PATH,			(float)0		},
+	{ TASK_WAIT_FOR_MOVEMENT,	(float)0		},
+};
+
+Schedule_t slChaseEnemy[] =
+{
+	{ 
+		tlChaseEnemy1,
+		ARRAYSIZE ( tlChaseEnemy1 ),
+		bits_COND_NEW_ENEMY			|
+		bits_COND_CAN_RANGE_ATTACK1	|
+		bits_COND_CAN_MELEE_ATTACK1	|
+		bits_COND_CAN_RANGE_ATTACK2	|
+		bits_COND_CAN_MELEE_ATTACK2	|
+		bits_COND_TASK_FAILED		|
+		bits_COND_HEAR_SOUND,
+		
+		bits_SOUND_DANGER,
+		"Chase Enemy"
+	},
+};
+
+
+// Chase enemy failure schedule
+Task_t	tlChaseEnemyFailed[] =
+{
+	{ TASK_STOP_MOVING,				(float)0					},
+	{ TASK_WAIT,					(float)0.2					},
+	{ TASK_FIND_COVER_FROM_ENEMY,	(float)0					},
+	{ TASK_RUN_PATH,				(float)0					},
+	{ TASK_WAIT_FOR_MOVEMENT,		(float)0					},
+	{ TASK_REMEMBER,				(float)bits_MEMORY_INCOVER	},
+//	{ TASK_TURN_LEFT,				(float)179					},
+	{ TASK_FACE_ENEMY,				(float)0					},
+	{ TASK_WAIT,					(float)1					},
+};
+
+Schedule_t	slChaseEnemyFailed[] =
+{
+	{ 
+		tlChaseEnemyFailed,
+		ARRAYSIZE ( tlChaseEnemyFailed ), 
+		bits_COND_NEW_ENEMY			|
+		bits_COND_CAN_RANGE_ATTACK1	|
+		bits_COND_CAN_MELEE_ATTACK1	|
+		bits_COND_CAN_RANGE_ATTACK2	|
+		bits_COND_CAN_MELEE_ATTACK2	|
+		bits_COND_HEAR_SOUND,
+
+		bits_SOUND_DANGER,
+		"tlChaseEnemyFailed"
+	},
+};
+
+
+//=========================================================
+// small flinch, played when minor damage is taken.
+//=========================================================
+Task_t tlSmallFlinch[] =
+{
+	{ TASK_REMEMBER,			(float)bits_MEMORY_FLINCHED },
+	{ TASK_STOP_MOVING,			0	},
+	{ TASK_SMALL_FLINCH,		0	},
+};
+
+Schedule_t slSmallFlinch[] =
+{
+	{
+		tlSmallFlinch,
+		ARRAYSIZE ( tlSmallFlinch ),
+		0,
+		0,
+		"Small Flinch"
+	},
+};
+
+//=========================================================
+// Die!
+//=========================================================
+Task_t tlDie1[] =
+{
+	{ TASK_STOP_MOVING,			0				 },
+	{ TASK_SOUND_DIE,		(float)0			 },
+	{ TASK_DIE,				(float)0			 },
+};
+
+Schedule_t slDie[] =
+{
+	{
+		tlDie1,
+		ARRAYSIZE( tlDie1 ),
+		0,
+		0,
+		"Die"
+	},
+};
+
+//=========================================================
+// Victory Dance
+//=========================================================
+Task_t tlVictoryDance[] =
+{
+	{ TASK_STOP_MOVING,			0							},
+	{ TASK_PLAY_SEQUENCE,		(float)ACT_VICTORY_DANCE	},
+	{ TASK_WAIT,				(float)0					},
+};
+
+Schedule_t slVictoryDance[] =
+{
+	{
+		tlVictoryDance,
+		ARRAYSIZE( tlVictoryDance ),
+		0,
+		0,
+		"Victory Dance"
+	},
+};
+
+//=========================================================
+// BarnacleVictimGrab - barnacle tongue just hit the monster,
+// so play a hit animation, then play a cycling pull animation
+// as the creature is hoisting the monster.
+//=========================================================
+Task_t	tlBarnacleVictimGrab[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_PLAY_SEQUENCE,	(float)ACT_BARNACLE_HIT	 },
+	{ TASK_SET_ACTIVITY,	(float)ACT_BARNACLE_PULL },
+	{ TASK_WAIT_INDEFINITE,	(float)0				 },// just cycle barnacle pull anim while barnacle hoists. 
+};
+
+Schedule_t slBarnacleVictimGrab[] =
+{
+	{
+		tlBarnacleVictimGrab,
+		ARRAYSIZE ( tlBarnacleVictimGrab ),
+		0,
+		0,
+		"Barnacle Victim"
+	}
+};
+
+//=========================================================
+// BarnacleVictimChomp - barnacle has pulled the prey to its
+// mouth. Victim should play the BARNCLE_CHOMP animation 
+// once, then loop the BARNACLE_CHEW animation indefinitely
+//=========================================================
+Task_t	tlBarnacleVictimChomp[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_PLAY_SEQUENCE,	(float)ACT_BARNACLE_CHOMP },
+	{ TASK_SET_ACTIVITY,	(float)ACT_BARNACLE_CHEW  },
+	{ TASK_WAIT_INDEFINITE,	(float)0				  },// just cycle barnacle pull anim while barnacle hoists. 
+};
+
+Schedule_t slBarnacleVictimChomp[] =
+{
+	{
+		tlBarnacleVictimChomp,
+		ARRAYSIZE ( tlBarnacleVictimChomp ),
+		0,
+		0,
+		"Barnacle Chomp"
+	}
+};
+
+
+//	Universal Error Schedule
+Task_t	tlError[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_WAIT_INDEFINITE,				(float)0 },
+};
+
+Schedule_t	slError[] =
+{
+	{ 
+		tlError,
+		ARRAYSIZE ( tlError ), 
+		0,
+		0,
+		"Error"
+	},
+};
+
+Task_t tlScriptedWalk[] = 
+{
+	{ TASK_WALK_TO_TARGET,		(float)TARGET_MOVE_SCRIPTED },
+	{ TASK_WAIT_FOR_MOVEMENT,	(float)0		},
+	{ TASK_PLANT_ON_SCRIPT,		(float)0		},
+	{ TASK_FACE_SCRIPT,			(float)0		},
+	{ TASK_FACE_IDEAL,			(float)0		},
+	{ TASK_ENABLE_SCRIPT,		(float)0		},
+	{ TASK_WAIT_FOR_SCRIPT,		(float)0		},
+	{ TASK_PLAY_SCRIPT,			(float)0		},
+};
+
+Schedule_t slWalkToScript[] =
+{
+	{ 
+		tlScriptedWalk,
+		ARRAYSIZE ( tlScriptedWalk ),
+		SCRIPT_BREAK_CONDITIONS,
+		0,
+		"WalkToScript"
+	},
+};
+
+
+Task_t tlScriptedRun[] = 
+{
+	{ TASK_RUN_TO_TARGET,		(float)TARGET_MOVE_SCRIPTED },
+	{ TASK_WAIT_FOR_MOVEMENT,	(float)0		},
+	{ TASK_PLANT_ON_SCRIPT,		(float)0		},
+	{ TASK_FACE_SCRIPT,			(float)0		},
+	{ TASK_FACE_IDEAL,			(float)0		},
+	{ TASK_ENABLE_SCRIPT,		(float)0		},
+	{ TASK_WAIT_FOR_SCRIPT,		(float)0		},
+	{ TASK_PLAY_SCRIPT,			(float)0		},
+};
+
+Schedule_t slRunToScript[] =
+{
+	{ 
+		tlScriptedRun,
+		ARRAYSIZE ( tlScriptedRun ),
+		SCRIPT_BREAK_CONDITIONS,
+		0,
+		"RunToScript"
+	},
+};
+
+Task_t tlScriptedWait[] = 
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_WAIT_FOR_SCRIPT,		(float)0		},
+	{ TASK_PLAY_SCRIPT,			(float)0		},
+};
+
+Schedule_t slWaitScript[] =
+{
+	{ 
+		tlScriptedWait,
+		ARRAYSIZE ( tlScriptedWait ),
+		SCRIPT_BREAK_CONDITIONS,
+		0,
+		"WaitForScript"
+	},
+};
+
+Task_t tlScriptedFace[] = 
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_FACE_SCRIPT,			(float)0		},
+	{ TASK_FACE_IDEAL,			(float)0		},
+	{ TASK_WAIT_FOR_SCRIPT,		(float)0		},
+	{ TASK_PLAY_SCRIPT,			(float)0		},
+};
+
+Schedule_t slFaceScript[] =
+{
+	{ 
+		tlScriptedFace,
+		ARRAYSIZE ( tlScriptedFace ),
+		SCRIPT_BREAK_CONDITIONS,
+		0,
+		"FaceScript"
+	},
+};
+
+//=========================================================
+// Cower - this is what is usually done when attempts
+// to escape danger fail.
+//=========================================================
+Task_t	tlCower[] =
+{
+	{ TASK_STOP_MOVING,			0					},
+	{ TASK_PLAY_SEQUENCE,		(float)ACT_COWER	},
+};
+
+Schedule_t	slCower[] =
+{
+	{
+		tlCower,
+		ARRAYSIZE ( tlCower ),
+		0,
+		0,
+		"Cower"
+	},
+};
+
+//=========================================================
+// move away from where you're currently standing. 
+//=========================================================
+Task_t	tlTakeCoverFromOrigin[] =
+{
+	{ TASK_STOP_MOVING,					(float)0					},
+	{ TASK_FIND_COVER_FROM_ORIGIN,		(float)0					},
+	{ TASK_RUN_PATH,					(float)0					},
+	{ TASK_WAIT_FOR_MOVEMENT,			(float)0					},
+	{ TASK_REMEMBER,					(float)bits_MEMORY_INCOVER	},
+	{ TASK_TURN_LEFT,					(float)179					},
+};
+
+Schedule_t	slTakeCoverFromOrigin[] =
+{
+	{ 
+		tlTakeCoverFromOrigin,
+		ARRAYSIZE ( tlTakeCoverFromOrigin ), 
+		bits_COND_NEW_ENEMY,
+		0,
+		"TakeCoverFromOrigin"
+	},
+};
+
+//=========================================================
+// hide from the loudest sound source
+//=========================================================
+Task_t	tlTakeCoverFromBestSound[] =
+{
+	{ TASK_STOP_MOVING,					(float)0					},
+	{ TASK_FIND_COVER_FROM_BEST_SOUND,	(float)0					},
+	{ TASK_RUN_PATH,					(float)0					},
+	{ TASK_WAIT_FOR_MOVEMENT,			(float)0					},
+	{ TASK_REMEMBER,					(float)bits_MEMORY_INCOVER	},
+	{ TASK_TURN_LEFT,					(float)179					},
+};
+
+Schedule_t	slTakeCoverFromBestSound[] =
+{
+	{ 
+		tlTakeCoverFromBestSound,
+		ARRAYSIZE ( tlTakeCoverFromBestSound ), 
+		bits_COND_NEW_ENEMY,
+		0,
+		"TakeCoverFromBestSound"
+	},
+};
+
+//=========================================================
+// Take cover from enemy! Tries lateral cover before node 
+// cover! 
+//=========================================================
+Task_t	tlTakeCoverFromEnemy[] =
+{
+	{ TASK_STOP_MOVING,				(float)0					},
+	{ TASK_WAIT,					(float)0.2					},
+	{ TASK_FIND_COVER_FROM_ENEMY,	(float)0					},
+	{ TASK_RUN_PATH,				(float)0					},
+	{ TASK_WAIT_FOR_MOVEMENT,		(float)0					},
+	{ TASK_REMEMBER,				(float)bits_MEMORY_INCOVER	},
+//	{ TASK_TURN_LEFT,				(float)179					},
+	{ TASK_FACE_ENEMY,				(float)0					},
+	{ TASK_WAIT,					(float)1					},
+};
+
+Schedule_t	slTakeCoverFromEnemy[] =
+{
+	{ 
+		tlTakeCoverFromEnemy,
+		ARRAYSIZE ( tlTakeCoverFromEnemy ), 
+		bits_COND_NEW_ENEMY,
+		0,
+		"tlTakeCoverFromEnemy"
+	},
+};
+
+Schedule_t *CBaseMonster::m_scheduleList[] = 
+{
+	slIdleStand,
+	slIdleTrigger,
+	slIdleWalk,
+	slAmbush,
+	slActiveIdle,
+	slWakeAngry,
+	slAlertFace,
+	slAlertSmallFlinch,
+	slAlertStand,
+	slInvestigateSound,
+	slCombatStand,
+	slCombatFace,
+	slStandoff,
+	slArmWeapon,
+	slReload,
+	slRangeAttack1,
+	slRangeAttack2,
+	slPrimaryMeleeAttack,
+	slSecondaryMeleeAttack,
+	slSpecialAttack1,
+	slSpecialAttack2,
+	slChaseEnemy,
+	slChaseEnemyFailed,
+	slSmallFlinch,
+	slDie,
+	slVictoryDance,
+	slBarnacleVictimGrab,
+	slBarnacleVictimChomp,
+	slError,
+	slWalkToScript,
+	slRunToScript,
+	slWaitScript,
+	slFaceScript,
+	slCower,
+	slTakeCoverFromOrigin,
+	slTakeCoverFromBestSound,
+	slTakeCoverFromEnemy,
+	slFail
+};
+
+Schedule_t *CBaseMonster::ScheduleFromName( const char *pName )
+{
+	return ScheduleInList( pName, m_scheduleList, ARRAYSIZE(m_scheduleList) );
+}
+
+
+Schedule_t *CBaseMonster :: ScheduleInList( const char *pName, Schedule_t **pList, int listCount )
+{
+	int i;
+	
+	if ( !pName )
+	{
+		ALERT( at_console, "%s set to unnamed schedule!\n", STRING(pev->classname) );
+		return NULL;
+	}
+
+
+	for ( i = 0; i < listCount; i++ )
+	{
+		if ( !pList[i]->pName )
+		{
+			ALERT( at_console, "Unnamed schedule!\n" );
+			continue;
+		}
+		if ( stricmp( pName, pList[i]->pName ) == 0 )
+			return pList[i];
+	}
+	return NULL;
+}
+
+//=========================================================
+// GetScheduleOfType - returns a pointer to one of the 
+// monster's available schedules of the indicated type.
+//=========================================================
+Schedule_t* CBaseMonster :: GetScheduleOfType ( int Type ) 
+{
+//	ALERT ( at_console, "Sched Type:%d\n", Type );
+	switch	( Type )
+	{
+	// This is the schedule for scripted sequences AND scripted AI
+	case SCHED_AISCRIPT:
+		{
+			ASSERT( m_pCine != NULL );
+			if ( !m_pCine )
+			{
+				ALERT( at_aiconsole, "Script failed for %s\n", STRING(pev->classname) );
+				CineCleanup();
+				return GetScheduleOfType( SCHED_IDLE_STAND );
+			}
+//			else
+//				ALERT( at_aiconsole, "Starting script %s for %s\n", STRING( m_pCine->m_iszPlay ), STRING(pev->classname) );
+
+			switch ( m_pCine->m_fMoveTo )
+			{
+				case 0: 
+				case 4: 
+					return slWaitScript;
+				case 1: 
+					return slWalkToScript;
+				case 2: 
+					return slRunToScript;
+				case 5:
+					return slFaceScript;
+			}
+			break;
+		}
+	case SCHED_IDLE_STAND:
+		{
+			if ( RANDOM_LONG(0,14) == 0 && FCanActiveIdle() )
+			{
+				return &slActiveIdle[ 0 ];
+			}
+
+			return &slIdleStand[ 0 ];
+		}
+	case SCHED_IDLE_WALK:
+		{
+			return &slIdleWalk[ 0 ];
+		}
+	case SCHED_WAIT_TRIGGER:
+		{
+			return &slIdleTrigger[ 0 ];
+		}
+	case SCHED_WAKE_ANGRY:
+		{
+			return &slWakeAngry[ 0 ];
+		}
+	case SCHED_ALERT_FACE:
+		{
+			return &slAlertFace[ 0 ];
+		}
+	case SCHED_ALERT_STAND:
+		{
+			return &slAlertStand[ 0 ];
+		}
+	case SCHED_COMBAT_STAND:
+		{
+			return &slCombatStand[ 0 ];
+		}
+	case SCHED_COMBAT_FACE:
+		{
+			return &slCombatFace[ 0 ];
+		}
+	case SCHED_CHASE_ENEMY:
+		{
+			return &slChaseEnemy[ 0 ];
+		}
+	case SCHED_CHASE_ENEMY_FAILED:
+		{
+			return &slFail[ 0 ];
+		}
+	case SCHED_SMALL_FLINCH:
+		{
+			return &slSmallFlinch[ 0 ];
+		}
+	case SCHED_ALERT_SMALL_FLINCH:
+		{
+			return &slAlertSmallFlinch[ 0 ];
+		}
+	case SCHED_RELOAD:
+		{
+			return &slReload[ 0 ];
+		}
+	case SCHED_ARM_WEAPON:
+		{
+			return &slArmWeapon[ 0 ];
+		}
+	case SCHED_STANDOFF:
+		{
+			return &slStandoff[ 0 ];
+		}
+	case SCHED_RANGE_ATTACK1:
+		{
+			return &slRangeAttack1[ 0 ];
+		}
+	case SCHED_RANGE_ATTACK2:
+		{
+			return &slRangeAttack2[ 0 ];
+		}
+	case SCHED_MELEE_ATTACK1:
+		{
+			return &slPrimaryMeleeAttack[ 0 ];
+		}
+	case SCHED_MELEE_ATTACK2:
+		{
+			return &slSecondaryMeleeAttack[ 0 ];
+		}
+	case SCHED_SPECIAL_ATTACK1:
+		{
+			return &slSpecialAttack1[ 0 ];
+		}
+	case SCHED_SPECIAL_ATTACK2:
+		{
+			return &slSpecialAttack2[ 0 ];
+		}
+	case SCHED_TAKE_COVER_FROM_BEST_SOUND:
+		{
+			return &slTakeCoverFromBestSound[ 0 ];
+		}
+	case SCHED_TAKE_COVER_FROM_ENEMY:
+		{
+			return &slTakeCoverFromEnemy[ 0 ];
+		}
+	case SCHED_COWER:
+		{
+			return &slCower[ 0 ];
+		}
+	case SCHED_AMBUSH:
+		{
+			return &slAmbush[ 0 ];
+		}
+	case SCHED_BARNACLE_VICTIM_GRAB:
+		{
+			return &slBarnacleVictimGrab[ 0 ];
+		}
+	case SCHED_BARNACLE_VICTIM_CHOMP:
+		{
+			return &slBarnacleVictimChomp[ 0 ];
+		}
+	case SCHED_INVESTIGATE_SOUND:
+		{
+			return &slInvestigateSound[ 0 ];
+		}
+	case SCHED_DIE:
+		{
+			return &slDie[ 0 ];
+		}
+	case SCHED_TAKE_COVER_FROM_ORIGIN:
+		{
+			return &slTakeCoverFromOrigin[ 0 ];
+		}
+	case SCHED_VICTORY_DANCE:
+		{
+			return &slVictoryDance[ 0 ];
+		}
+	case SCHED_FAIL:
+		{
+			return slFail;
+		}
+	default:
+		{
+			ALERT ( at_console, "GetScheduleOfType()\nNo CASE for Schedule Type %d!\n", Type );
+
+			return &slIdleStand[ 0 ];
+			break;
+		}
+	}
+
+	return NULL;
+}
diff --git a/main/source/dlls/defaultai.h b/main/source/dlls/defaultai.h
new file mode 100644
index 00000000..23754e64
--- /dev/null
+++ b/main/source/dlls/defaultai.h
@@ -0,0 +1,98 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+#ifndef DEFAULTAI_H
+#define DEFAULTAI_H
+
+//=========================================================
+// Failed
+//=========================================================
+extern Schedule_t	slFail[];
+
+//=========================================================
+//	Idle Schedules
+//=========================================================
+extern Schedule_t	slIdleStand[];
+extern Schedule_t	slIdleTrigger[];
+extern Schedule_t	slIdleWalk[];
+
+//=========================================================
+//	Wake Schedules
+//=========================================================
+extern Schedule_t slWakeAngry[];
+
+//=========================================================
+// AlertTurn Schedules
+//=========================================================
+extern Schedule_t	slAlertFace[];
+
+//=========================================================
+// AlertIdle Schedules
+//=========================================================
+extern Schedule_t	slAlertStand[];
+
+//=========================================================
+// CombatIdle Schedule
+//=========================================================
+extern Schedule_t	slCombatStand[];
+
+//=========================================================
+// CombatFace Schedule
+//=========================================================
+extern Schedule_t	slCombatFace[];
+
+//=========================================================
+// reload schedule
+//=========================================================
+extern Schedule_t slReload[];
+
+//=========================================================
+//	Attack Schedules
+//=========================================================
+
+extern Schedule_t	slRangeAttack1[];
+extern Schedule_t	slRangeAttack2[];
+
+extern Schedule_t	slTakeCoverFromBestSound[];
+
+// primary melee attack
+extern Schedule_t	slMeleeAttack[];
+
+// Chase enemy schedule
+extern Schedule_t slChaseEnemy[];
+
+//=========================================================
+// small flinch, used when a relatively minor bit of damage
+// is inflicted.
+//=========================================================
+extern Schedule_t slSmallFlinch[];
+
+//=========================================================
+// Die!
+//=========================================================
+extern Schedule_t slDie[];
+
+//=========================================================
+//	Universal Error Schedule
+//=========================================================
+extern Schedule_t slError[];
+
+//=========================================================
+//	Scripted sequences
+//=========================================================
+extern Schedule_t slWalkToScript[];
+extern Schedule_t slRunToScript[];
+extern Schedule_t slWaitScript[];
+
+#endif		// DEFAULTAI_H
diff --git a/main/source/dlls/doors.cpp b/main/source/dlls/doors.cpp
new file mode 100644
index 00000000..b4c89ac3
--- /dev/null
+++ b/main/source/dlls/doors.cpp
@@ -0,0 +1,962 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/*
+
+===== doors.cpp ========================================================
+
+*/
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "doors.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHMarineEquipment.h"
+
+extern void SetMovedir(entvars_t* ev);
+
+#define noiseMoving noise1
+#define noiseArrived noise2
+
+#include "cbasedoor.h"
+
+TYPEDESCRIPTION	CBaseDoor::m_SaveData[] = 
+{
+	DEFINE_FIELD( CBaseDoor, m_bHealthValue, FIELD_CHARACTER ),
+	DEFINE_FIELD( CBaseDoor, m_bMoveSnd, FIELD_CHARACTER ),
+	DEFINE_FIELD( CBaseDoor, m_bStopSnd, FIELD_CHARACTER ),
+	
+	DEFINE_FIELD( CBaseDoor, m_bLockedSound, FIELD_CHARACTER ),
+	DEFINE_FIELD( CBaseDoor, m_bLockedSentence, FIELD_CHARACTER ),
+	DEFINE_FIELD( CBaseDoor, m_bUnlockedSound, FIELD_CHARACTER ),	
+	DEFINE_FIELD( CBaseDoor, m_bUnlockedSentence, FIELD_CHARACTER ),	
+
+};
+
+IMPLEMENT_SAVERESTORE( CBaseDoor, CBaseToggle );
+
+
+#define DOOR_SENTENCEWAIT	6
+#define DOOR_SOUNDWAIT		3
+#define BUTTON_SOUNDWAIT	0.5
+
+// play door or button locked or unlocked sounds. 
+// pass in pointer to valid locksound struct. 
+// if flocked is true, play 'door is locked' sound,
+// otherwise play 'door is unlocked' sound
+// NOTE: this routine is shared by doors and buttons
+
+void PlayLockSounds(entvars_t *pev, locksound_t *pls, int flocked, int fbutton)
+{
+	// LOCKED SOUND
+	
+	// CONSIDER: consolidate the locksound_t struct (all entries are duplicates for lock/unlock)
+	// CONSIDER: and condense this code.
+	float flsoundwait;
+
+	if (fbutton)
+		flsoundwait = BUTTON_SOUNDWAIT;
+	else
+		flsoundwait = DOOR_SOUNDWAIT;
+
+	if (flocked)
+	{
+		int fplaysound = (pls->sLockedSound && gpGlobals->time > pls->flwaitSound);
+		int fplaysentence = (pls->sLockedSentence && !pls->bEOFLocked && gpGlobals->time > pls->flwaitSentence);
+		float fvol;
+
+		if (fplaysound && fplaysentence)
+			fvol = 0.25;
+		else
+			fvol = 1.0;
+
+		// if there is a locked sound, and we've debounced, play sound
+		if (fplaysound)
+		{
+			// play 'door locked' sound
+			EMIT_SOUND(ENT(pev), CHAN_ITEM, (char*)STRING(pls->sLockedSound), fvol, ATTN_NORM);
+			pls->flwaitSound = gpGlobals->time + flsoundwait;
+		}
+
+		// if there is a sentence, we've not played all in list, and we've debounced, play sound
+		if (fplaysentence)
+		{
+			// play next 'door locked' sentence in group
+			int iprev = pls->iLockedSentence;
+			
+			pls->iLockedSentence = SENTENCEG_PlaySequentialSz(ENT(pev), STRING(pls->sLockedSentence), 
+					  0.85, ATTN_NORM, 0, 100, pls->iLockedSentence, FALSE);
+			pls->iUnlockedSentence = 0;
+
+			// make sure we don't keep calling last sentence in list
+			pls->bEOFLocked = (iprev == pls->iLockedSentence);
+		
+			pls->flwaitSentence = gpGlobals->time + DOOR_SENTENCEWAIT;
+		}
+	}
+	else
+	{
+		// UNLOCKED SOUND
+
+		int fplaysound = (pls->sUnlockedSound && gpGlobals->time > pls->flwaitSound);
+		int fplaysentence = (pls->sUnlockedSentence && !pls->bEOFUnlocked && gpGlobals->time > pls->flwaitSentence);
+		float fvol;
+
+		// if playing both sentence and sound, lower sound volume so we hear sentence
+		if (fplaysound && fplaysentence)
+			fvol = 0.25;
+		else
+			fvol = 1.0;
+
+		// play 'door unlocked' sound if set
+		if (fplaysound)
+		{
+			EMIT_SOUND(ENT(pev), CHAN_ITEM, (char*)STRING(pls->sUnlockedSound), fvol, ATTN_NORM);
+			pls->flwaitSound = gpGlobals->time + flsoundwait;
+		}
+
+		// play next 'door unlocked' sentence in group
+		if (fplaysentence)
+		{
+			int iprev = pls->iUnlockedSentence;
+			
+			pls->iUnlockedSentence = SENTENCEG_PlaySequentialSz(ENT(pev), STRING(pls->sUnlockedSentence), 
+					  0.85, ATTN_NORM, 0, 100, pls->iUnlockedSentence, FALSE);
+			pls->iLockedSentence = 0;
+
+			// make sure we don't keep calling last sentence in list
+			pls->bEOFUnlocked = (iprev == pls->iUnlockedSentence);
+			pls->flwaitSentence = gpGlobals->time + DOOR_SENTENCEWAIT;
+		}
+	}
+}
+
+//
+// Cache user-entity-field values until spawn is called.
+//
+
+void CBaseDoor::KeyValue( KeyValueData *pkvd )
+{
+
+	if (FStrEq(pkvd->szKeyName, "skin"))//skin is used for content type
+	{
+		pev->skin = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "movesnd"))
+	{
+		m_bMoveSnd = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "stopsnd"))
+	{
+		m_bStopSnd = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "healthvalue"))
+	{
+		m_bHealthValue = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "locked_sound"))
+	{
+		m_bLockedSound = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "locked_sentence"))
+	{
+		m_bLockedSentence = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "unlocked_sound"))
+	{
+		m_bUnlockedSound = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "unlocked_sentence"))
+	{
+		m_bUnlockedSentence = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "WaveHeight"))
+	{
+		pev->scale = atof(pkvd->szValue) * (1.0/8.0);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseToggle::KeyValue( pkvd );
+}
+
+/*QUAKED func_door (0 .5 .8) ? START_OPEN x DOOR_DONT_LINK TOGGLE
+if two doors touch, they are assumed to be connected and operate as a unit.
+
+TOGGLE causes the door to wait in both the start and end states for a trigger event.
+
+START_OPEN causes the door to move to its destination when spawned, and operate in reverse.
+It is used to temporarily or permanently close off an area when triggered (not usefull for
+touch or takedamage doors).
+
+"angle"         determines the opening direction
+"targetname"	if set, no touch field will be spawned and a remote button or trigger
+				field activates the door.
+"health"        if set, door must be shot open
+"speed"         movement speed (100 default)
+"wait"          wait before returning (3 default, -1 = never return)
+"lip"           lip remaining at end of move (8 default)
+"dmg"           damage to inflict when blocked (2 default)
+"sounds"
+0)      no sound
+1)      stone
+2)      base
+3)      stone chain
+4)      screechy metal
+*/
+
+LINK_ENTITY_TO_CLASS( func_door, CBaseDoor );
+//
+// func_water - same as a door. 
+//
+LINK_ENTITY_TO_CLASS( func_water, CBaseDoor );
+
+void CBaseDoor::ResetEntity()
+{
+	this->SetToggleState(TS_AT_BOTTOM);
+}
+
+void CBaseDoor::Spawn( )
+{
+	Precache();
+	SetMovedir (pev);
+
+	if ( pev->skin == 0 )
+	{//normal door
+		if ( FBitSet (pev->spawnflags, SF_DOOR_PASSABLE) )
+			pev->solid		= SOLID_NOT;
+		else
+			pev->solid		= SOLID_BSP;
+	}
+	else
+	{// special contents
+		pev->solid		= SOLID_NOT;
+		SetBits( pev->spawnflags, SF_DOOR_SILENT );	// water is silent for now
+	}
+
+	pev->movetype	= MOVETYPE_PUSH;
+	UTIL_SetOrigin(pev, pev->origin);
+	SET_MODEL( ENT(pev), STRING(pev->model) );
+	
+	if (pev->speed == 0)
+		pev->speed = 100;
+	
+	m_vecPosition1	= pev->origin;
+	// Subtract 2 from size because the engine expands bboxes by 1 in all directions making the size too big
+	m_vecPosition2	= m_vecPosition1 + (pev->movedir * (fabs( pev->movedir.x * (pev->size.x-2) ) + fabs( pev->movedir.y * (pev->size.y-2) ) + fabs( pev->movedir.z * (pev->size.z-2) ) - m_flLip));
+	ASSERTSZ(m_vecPosition1 != m_vecPosition2, "door start/end positions are equal");
+	if ( FBitSet (pev->spawnflags, SF_DOOR_START_OPEN) )
+	{	// swap pos1 and pos2, put door at pos2
+		UTIL_SetOrigin(pev, m_vecPosition2);
+		m_vecPosition2 = m_vecPosition1;
+		m_vecPosition1 = pev->origin;
+	}
+
+	m_toggle_state = TS_AT_BOTTOM;
+	
+	// if the door is flagged for USE button activation only, use NULL touch function
+	if ( FBitSet ( pev->spawnflags, SF_DOOR_USE_ONLY ) )
+	{
+		SetTouch ( NULL );
+	}
+	else // touchable button
+		SetTouch(&CBaseDoor::DoorTouch );
+}
+ 
+
+void CBaseDoor :: SetToggleState( int state )
+{
+	if ( state == TS_AT_TOP )
+		UTIL_SetOrigin( pev, m_vecPosition2 );
+	else
+		UTIL_SetOrigin( pev, m_vecPosition1 );
+
+	this->m_toggle_state = (TOGGLE_STATE)state;
+}
+
+
+void CBaseDoor::Precache( void )
+{
+	char *pszSound;
+
+// set the door's "in-motion" sound
+	switch (m_bMoveSnd)
+	{
+	case	0:
+		pev->noiseMoving = ALLOC_STRING("common/null.wav");
+		break;
+	case	1:
+		PRECACHE_SOUND ("doors/doormove1.wav");
+		pev->noiseMoving = ALLOC_STRING("doors/doormove1.wav");
+		break;
+	case	2:
+		PRECACHE_SOUND ("doors/doormove2.wav");
+		pev->noiseMoving = ALLOC_STRING("doors/doormove2.wav");
+		break;
+	case	3:
+		PRECACHE_SOUND ("doors/doormove3.wav");
+		pev->noiseMoving = ALLOC_STRING("doors/doormove3.wav");
+		break;
+	case	4:
+		PRECACHE_SOUND ("doors/doormove4.wav");
+		pev->noiseMoving = ALLOC_STRING("doors/doormove4.wav");
+		break;
+	case	5:
+		PRECACHE_SOUND ("doors/doormove5.wav");
+		pev->noiseMoving = ALLOC_STRING("doors/doormove5.wav");
+		break;
+	case	6:
+		PRECACHE_SOUND ("doors/doormove6.wav");
+		pev->noiseMoving = ALLOC_STRING("doors/doormove6.wav");
+		break;
+	case	7:
+		PRECACHE_SOUND ("doors/doormove7.wav");
+		pev->noiseMoving = ALLOC_STRING("doors/doormove7.wav");
+		break;
+	case	8:
+		PRECACHE_SOUND ("doors/doormove8.wav");
+		pev->noiseMoving = ALLOC_STRING("doors/doormove8.wav");
+		break;
+	case	9:
+		PRECACHE_SOUND ("doors/doormove9.wav");
+		pev->noiseMoving = ALLOC_STRING("doors/doormove9.wav");
+		break;
+	case	10:
+		PRECACHE_SOUND ("doors/doormove10.wav");
+		pev->noiseMoving = ALLOC_STRING("doors/doormove10.wav");
+		break;
+	default:
+		pev->noiseMoving = ALLOC_STRING("common/null.wav");
+		break;
+	}
+
+// set the door's 'reached destination' stop sound
+	switch (m_bStopSnd)
+	{
+	case	0:
+		pev->noiseArrived = ALLOC_STRING("common/null.wav");
+		break;
+	case	1:
+		PRECACHE_SOUND ("doors/doorstop1.wav");
+		pev->noiseArrived = ALLOC_STRING("doors/doorstop1.wav");
+		break;
+	case	2:
+		PRECACHE_SOUND ("doors/doorstop2.wav");
+		pev->noiseArrived = ALLOC_STRING("doors/doorstop2.wav");
+		break;
+	case	3:
+		PRECACHE_SOUND ("doors/doorstop3.wav");
+		pev->noiseArrived = ALLOC_STRING("doors/doorstop3.wav");
+		break;
+	case	4:
+		PRECACHE_SOUND ("doors/doorstop4.wav");
+		pev->noiseArrived = ALLOC_STRING("doors/doorstop4.wav");
+		break;
+	case	5:
+		PRECACHE_SOUND ("doors/doorstop5.wav");
+		pev->noiseArrived = ALLOC_STRING("doors/doorstop5.wav");
+		break;
+	case	6:
+		PRECACHE_SOUND ("doors/doorstop6.wav");
+		pev->noiseArrived = ALLOC_STRING("doors/doorstop6.wav");
+		break;
+	case	7:
+		PRECACHE_SOUND ("doors/doorstop7.wav");
+		pev->noiseArrived = ALLOC_STRING("doors/doorstop7.wav");
+		break;
+	case	8:
+		PRECACHE_SOUND ("doors/doorstop8.wav");
+		pev->noiseArrived = ALLOC_STRING("doors/doorstop8.wav");
+		break;
+	default:
+		pev->noiseArrived = ALLOC_STRING("common/null.wav");
+		break;
+	}
+
+	// get door button sounds, for doors which are directly 'touched' to open
+
+	if (m_bLockedSound)
+	{
+		pszSound = ButtonSound( (int)m_bLockedSound );
+		PRECACHE_SOUND(pszSound);
+		m_ls.sLockedSound = ALLOC_STRING(pszSound);
+	}
+
+	if (m_bUnlockedSound)
+	{
+		pszSound = ButtonSound( (int)m_bUnlockedSound );
+		PRECACHE_SOUND(pszSound);
+		m_ls.sUnlockedSound = ALLOC_STRING(pszSound);
+	}
+
+	// get sentence group names, for doors which are directly 'touched' to open
+
+	switch (m_bLockedSentence)
+	{
+		case 1: m_ls.sLockedSentence = ALLOC_STRING("NA"); break; // access denied
+		case 2: m_ls.sLockedSentence = ALLOC_STRING("ND"); break; // security lockout
+		case 3: m_ls.sLockedSentence = ALLOC_STRING("NF"); break; // blast door
+		case 4: m_ls.sLockedSentence = ALLOC_STRING("NFIRE"); break; // fire door
+		case 5: m_ls.sLockedSentence = ALLOC_STRING("NCHEM"); break; // chemical door
+		case 6: m_ls.sLockedSentence = ALLOC_STRING("NRAD"); break; // radiation door
+		case 7: m_ls.sLockedSentence = ALLOC_STRING("NCON"); break; // gen containment
+		case 8: m_ls.sLockedSentence = ALLOC_STRING("NH"); break; // maintenance door
+		case 9: m_ls.sLockedSentence = ALLOC_STRING("NG"); break; // broken door
+		
+		default: m_ls.sLockedSentence = 0; break;
+	}
+
+	switch (m_bUnlockedSentence)
+	{
+		case 1: m_ls.sUnlockedSentence = ALLOC_STRING("EA"); break; // access granted
+		case 2: m_ls.sUnlockedSentence = ALLOC_STRING("ED"); break; // security door
+		case 3: m_ls.sUnlockedSentence = ALLOC_STRING("EF"); break; // blast door
+		case 4: m_ls.sUnlockedSentence = ALLOC_STRING("EFIRE"); break; // fire door
+		case 5: m_ls.sUnlockedSentence = ALLOC_STRING("ECHEM"); break; // chemical door
+		case 6: m_ls.sUnlockedSentence = ALLOC_STRING("ERAD"); break; // radiation door
+		case 7: m_ls.sUnlockedSentence = ALLOC_STRING("ECON"); break; // gen containment
+		case 8: m_ls.sUnlockedSentence = ALLOC_STRING("EH"); break; // maintenance door
+		
+		default: m_ls.sUnlockedSentence = 0; break;
+	}
+}
+
+//
+// Doors not tied to anything (e.g. button, another door) can be touched, to make them activate.
+//
+void CBaseDoor::DoorTouch( CBaseEntity *pOther )
+{
+	entvars_t*	pevToucher = pOther->pev;
+	
+	// Ignore touches by anything but players
+	if (!FClassnameIs(pevToucher, "player"))
+		return;
+
+	// If door has master, and it's not ready to trigger, 
+	// play 'locked' sound
+
+	if (m_sMaster && !UTIL_IsMasterTriggered(m_sMaster, pOther))
+		PlayLockSounds(pev, &m_ls, TRUE, FALSE);
+	
+	// If door is somebody's target, then touching does nothing.
+	// You have to activate the owner (e.g. button).
+	
+	if (!FStringNull(pev->targetname))
+	{
+		// play locked sound
+		PlayLockSounds(pev, &m_ls, TRUE, FALSE);
+		return; 
+	}
+
+	m_hActivator = pOther;// remember who activated the door
+
+	if (DoorActivate( ))
+		SetTouch( NULL ); // Temporarily disable the touch function, until movement is finished.
+}
+
+
+//
+// Used by SUB_UseTargets, when a door is the target of a button.
+//
+void CBaseDoor::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	m_hActivator = pActivator;
+	// if not ready to be used, ignore "use" command.
+	if (m_toggle_state == TS_AT_BOTTOM || FBitSet(pev->spawnflags, SF_DOOR_NO_AUTO_RETURN) && m_toggle_state == TS_AT_TOP)
+		DoorActivate();
+}
+
+//
+// Causes the door to "do its thing", i.e. start moving, and cascade activation.
+//
+int CBaseDoor::DoorActivate( )
+{
+	if (!UTIL_IsMasterTriggered(m_sMaster, m_hActivator))
+		return 0;
+
+	if (FBitSet(pev->spawnflags, SF_DOOR_NO_AUTO_RETURN) && m_toggle_state == TS_AT_TOP)
+	{// door should close
+		DoorGoDown();
+	}
+	else
+	{// door should open
+
+		if ( m_hActivator != NULL && m_hActivator->IsPlayer() )
+		{// give health if player opened the door (medikit)
+		// VARS( m_eoActivator )->health += m_bHealthValue;
+	
+			m_hActivator->TakeHealth( m_bHealthValue, DMG_GENERIC );
+
+		}
+
+		// play door unlock sounds
+		PlayLockSounds(pev, &m_ls, FALSE, FALSE);
+		
+		DoorGoUp();
+	}
+
+	return 1;
+}
+
+extern Vector VecBModelOrigin( entvars_t* pevBModel );
+
+//
+// Starts the door going to its "up" position (simply ToggleData->vecPosition2).
+//
+void CBaseDoor::DoorGoUp( void )
+{
+	entvars_t	*pevActivator;
+
+	// It could be going-down, if blocked.
+	ASSERT(m_toggle_state == TS_AT_BOTTOM || m_toggle_state == TS_GOING_DOWN);
+
+	// emit door moving and stop sounds on CHAN_STATIC so that the multicast doesn't
+	// filter them out and leave a client stuck with looping door sounds!
+	if ( !FBitSet( pev->spawnflags, SF_DOOR_SILENT ) )
+		EMIT_SOUND(ENT(pev), CHAN_STATIC, (char*)STRING(pev->noiseMoving), 1, ATTN_NORM);
+
+	m_toggle_state = TS_GOING_UP;
+	
+	SetMoveDone( &CBaseDoor::DoorHitTop );
+	if ( FClassnameIs(pev, "func_door_rotating"))		// !!! BUGBUG Triggered doors don't work with this yet
+	{
+		float	sign = 1.0;
+
+		if ( m_hActivator != NULL )
+		{
+			pevActivator = m_hActivator->pev;
+			
+			if ( !FBitSet( pev->spawnflags, SF_DOOR_ONEWAY ) && pev->movedir.y ) 		// Y axis rotation, move away from the player
+			{
+				Vector vec = pevActivator->origin - pev->origin;
+				Vector angles = pevActivator->angles;
+				angles.x = 0;
+				angles.z = 0;
+				UTIL_MakeVectors (angles);
+	//			Vector vnext = (pevToucher->origin + (pevToucher->velocity * 10)) - pev->origin;
+				UTIL_MakeVectors ( pevActivator->angles );
+				Vector vnext = (pevActivator->origin + (gpGlobals->v_forward * 10)) - pev->origin;
+				if ( (vec.x*vnext.y - vec.y*vnext.x) < 0 )
+					sign = -1.0;
+			}
+		}
+		AngularMove(m_vecAngle2*sign, pev->speed);
+	}
+	else
+		LinearMove(m_vecPosition2, pev->speed);
+}
+
+
+//
+// The door has reached the "up" position.  Either go back down, or wait for another activation.
+//
+void CBaseDoor::DoorHitTop( void )
+{
+	if ( !FBitSet( pev->spawnflags, SF_DOOR_SILENT ) )
+	{
+		STOP_SOUND(ENT(pev), CHAN_STATIC, (char*)STRING(pev->noiseMoving) );
+		EMIT_SOUND(ENT(pev), CHAN_STATIC, (char*)STRING(pev->noiseArrived), 1, ATTN_NORM);
+	}
+
+	// This line is crashing...fix it?  I think it's because doors are being manually reset
+	//ASSERT(m_toggle_state == TS_GOING_UP);
+	m_toggle_state = TS_AT_TOP;
+	
+	// toggle-doors don't come down automatically, they wait for refire.
+	if (FBitSet(pev->spawnflags, SF_DOOR_NO_AUTO_RETURN))
+	{
+		// Re-instate touch method, movement is complete
+		if ( !FBitSet ( pev->spawnflags, SF_DOOR_USE_ONLY ) )
+			SetTouch(&CBaseDoor::DoorTouch );
+	}
+	else
+	{
+		// In flWait seconds, DoorGoDown will fire, unless wait is -1, then door stays open
+		pev->nextthink = pev->ltime + m_flWait;
+		SetThink(&CBaseDoor::DoorGoDown );
+
+		if ( m_flWait == -1 )
+		{
+			pev->nextthink = -1;
+		}
+	}
+
+	// Fire the close target (if startopen is set, then "top" is closed) - netname is the close target
+	if ( pev->netname && (pev->spawnflags & SF_DOOR_START_OPEN) )
+		FireTargets( STRING(pev->netname), m_hActivator, this, USE_TOGGLE, 0 );
+
+	SUB_UseTargets( m_hActivator, USE_TOGGLE, 0 ); // this isn't finished
+}
+
+
+//
+// Starts the door going to its "down" position (simply ToggleData->vecPosition1).
+//
+void CBaseDoor::DoorGoDown( void )
+{
+	if ( !FBitSet( pev->spawnflags, SF_DOOR_SILENT ) )
+		EMIT_SOUND(ENT(pev), CHAN_STATIC, (char*)STRING(pev->noiseMoving), 1, ATTN_NORM);
+	
+#ifdef DOOR_ASSERT
+	ASSERT(m_toggle_state == TS_AT_TOP);
+#endif // DOOR_ASSERT
+	m_toggle_state = TS_GOING_DOWN;
+
+	SetMoveDone( &CBaseDoor::DoorHitBottom );
+	if ( FClassnameIs(pev, "func_door_rotating"))//rotating door
+		AngularMove( m_vecAngle1, pev->speed);
+	else
+		LinearMove( m_vecPosition1, pev->speed);
+}
+
+//
+// The door has reached the "down" position.  Back to quiescence.
+//
+void CBaseDoor::DoorHitBottom( void )
+{
+	if ( !FBitSet( pev->spawnflags, SF_DOOR_SILENT ) )
+	{
+		STOP_SOUND(ENT(pev), CHAN_STATIC, (char*)STRING(pev->noiseMoving) );
+		EMIT_SOUND(ENT(pev), CHAN_STATIC, (char*)STRING(pev->noiseArrived), 1, ATTN_NORM);
+	}
+
+	ASSERT((m_toggle_state == TS_GOING_DOWN) || (m_toggle_state == TS_AT_BOTTOM));
+	m_toggle_state = TS_AT_BOTTOM;
+
+	// Re-instate touch method, cycle is complete
+	if ( FBitSet ( pev->spawnflags, SF_DOOR_USE_ONLY ) )
+	{// use only door
+		SetTouch ( NULL );
+	}
+	else // touchable door
+		SetTouch(&CBaseDoor::DoorTouch );
+
+	SUB_UseTargets( m_hActivator, USE_TOGGLE, 0 ); // this isn't finished
+
+	// Fire the close target (if startopen is set, then "top" is closed) - netname is the close target
+	if ( pev->netname && !(pev->spawnflags & SF_DOOR_START_OPEN) )
+		FireTargets( STRING(pev->netname), m_hActivator, this, USE_TOGGLE, 0 );
+}
+
+void CBaseDoor::Blocked( CBaseEntity *pOther )
+{
+	edict_t	*pentTarget = NULL;
+	CBaseDoor	*pDoor		= NULL;
+
+
+	// Hurt the blocker a little.
+	if ( pev->dmg )
+		pOther->TakeDamage( pev, pev, pev->dmg, DMG_CRUSH );
+
+	// if a door has a negative wait, it would never come back if blocked,
+	// so let it just squash the object to death real fast
+	if (m_flWait >= 0)
+	{
+
+//		Valve fix for super-loud doors!
+//		if (m_flWait >= 0)
+//		{
+//		if (m_toggle_state == TS_GOING_DOWN)
+
+		if(!FBitSet( pev->spawnflags, SF_DOOR_SILENT))
+		{
+			STOP_SOUND(ENT(pev), CHAN_STATIC, (char*)STRING(pev->noiseMoving) );
+		}
+
+		if (m_toggle_state == TS_GOING_DOWN)
+		{
+			DoorGoUp();
+		}
+		else
+		{
+			DoorGoDown();
+		}
+	}
+
+	if(!AvHSUGetIsExternalClassName(STRING(pOther->pev->classname)))
+	{
+		AvHDeployedMine* theMine = dynamic_cast<AvHDeployedMine*>(pOther);
+		if(theMine)
+		{
+			theMine->Detonate();
+		}
+	}
+
+	// Block all door pieces with the same targetname here.
+	if ( !FStringNull ( pev->targetname ) )
+	{
+		for (;;)
+		{
+			pentTarget = FIND_ENTITY_BY_TARGETNAME(pentTarget, STRING(pev->targetname));
+
+			if ( VARS( pentTarget ) != pev )
+			{
+				if (FNullEnt(pentTarget))
+					break;
+
+				if ( FClassnameIs ( pentTarget, "func_door" ) || FClassnameIs ( pentTarget, "func_door_rotating" ) )
+				{
+				
+					pDoor = GetClassPtr( (CBaseDoor *) VARS(pentTarget) );
+
+					if ( pDoor->m_flWait >= 0)
+					{
+						if (pDoor->pev->velocity == pev->velocity && pDoor->pev->avelocity == pev->velocity)
+						{
+							// this is the most hacked, evil, bastardized thing I've ever seen. kjb
+							if ( FClassnameIs ( pentTarget, kesFuncDoor ) )
+							{// set origin to realign normal doors
+								pDoor->pev->origin = pev->origin;
+								pDoor->pev->velocity = g_vecZero;// stop!
+							}
+							else
+							{// set angles to realign rotating doors
+								pDoor->pev->angles = pev->angles;
+								pDoor->pev->avelocity = g_vecZero;
+							}
+						}
+
+						if ( pDoor->m_toggle_state == TS_GOING_DOWN)
+							pDoor->DoorGoUp();
+						else
+							pDoor->DoorGoDown();
+					}
+				}
+			}
+		}
+	}
+}
+
+LINK_ENTITY_TO_CLASS( func_door_rotating, CRotDoor );
+
+
+void CRotDoor::Spawn( void )
+{
+	Precache();
+	// set the axis of rotation
+	CBaseToggle::AxisDir( pev );
+
+	// check for clockwise rotation
+	if ( FBitSet (pev->spawnflags, SF_DOOR_ROTATE_BACKWARDS) )
+		pev->movedir = pev->movedir * -1;
+	
+	//m_flWait			= 2; who the hell did this? (sjb)
+	m_vecAngle1	= pev->angles;
+	m_vecAngle2	= pev->angles + pev->movedir * m_flMoveDistance;
+
+	ASSERTSZ(m_vecAngle1 != m_vecAngle2, "rotating door start/end positions are equal");
+	
+	if ( FBitSet (pev->spawnflags, SF_DOOR_PASSABLE) )
+		pev->solid		= SOLID_NOT;
+	else
+		pev->solid		= SOLID_BSP;
+
+	pev->movetype	= MOVETYPE_PUSH;
+	UTIL_SetOrigin(pev, pev->origin);
+	SET_MODEL(ENT(pev), STRING(pev->model) );
+
+	if (pev->speed == 0)
+		pev->speed = 100;
+	
+// DOOR_START_OPEN is to allow an entity to be lighted in the closed position
+// but spawn in the open position
+	if ( FBitSet (pev->spawnflags, SF_DOOR_START_OPEN) )
+	{	// swap pos1 and pos2, put door at pos2, invert movement direction
+		pev->angles = m_vecAngle2;
+		Vector vecSav = m_vecAngle1;
+		m_vecAngle2 = m_vecAngle1;
+		m_vecAngle1 = vecSav;
+		pev->movedir = pev->movedir * -1;
+	}
+
+	m_toggle_state = TS_AT_BOTTOM;
+
+	if ( FBitSet ( pev->spawnflags, SF_DOOR_USE_ONLY ) )
+	{
+		SetTouch ( NULL );
+	}
+	else // touchable button
+		SetTouch(&CRotDoor::DoorTouch );
+}
+
+
+void CRotDoor :: SetToggleState( int state )
+{
+	if ( state == TS_AT_TOP )
+		pev->angles = m_vecAngle2;
+	else
+		pev->angles = m_vecAngle1;
+
+	UTIL_SetOrigin( pev, pev->origin );
+}
+
+
+class CMomentaryDoor : public CBaseToggle
+{
+public:
+	void	Spawn( void );
+	void Precache( void );
+
+	void	KeyValue( KeyValueData *pkvd );
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	virtual int	ObjectCaps( void ) { return CBaseToggle :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+
+	virtual int	Save( CSave &save );
+	virtual int	Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	BYTE	m_bMoveSnd;			// sound a door makes while moving	
+};
+
+LINK_ENTITY_TO_CLASS( momentary_door, CMomentaryDoor );
+
+TYPEDESCRIPTION	CMomentaryDoor::m_SaveData[] = 
+{
+	DEFINE_FIELD( CMomentaryDoor, m_bMoveSnd, FIELD_CHARACTER ),
+};
+
+IMPLEMENT_SAVERESTORE( CMomentaryDoor, CBaseToggle );
+
+void CMomentaryDoor::Spawn( void )
+{
+	SetMovedir (pev);
+
+	pev->solid		= SOLID_BSP;
+	pev->movetype	= MOVETYPE_PUSH;
+
+	UTIL_SetOrigin(pev, pev->origin);
+	SET_MODEL( ENT(pev), STRING(pev->model) );
+	
+	if (pev->speed == 0)
+		pev->speed = 100;
+	if (pev->dmg == 0)
+		pev->dmg = 2;
+	
+	m_vecPosition1	= pev->origin;
+	// Subtract 2 from size because the engine expands bboxes by 1 in all directions making the size too big
+	m_vecPosition2	= m_vecPosition1 + (pev->movedir * (fabs( pev->movedir.x * (pev->size.x-2) ) + fabs( pev->movedir.y * (pev->size.y-2) ) + fabs( pev->movedir.z * (pev->size.z-2) ) - m_flLip));
+	ASSERTSZ(m_vecPosition1 != m_vecPosition2, "door start/end positions are equal");
+
+	if ( FBitSet (pev->spawnflags, SF_DOOR_START_OPEN) )
+	{	// swap pos1 and pos2, put door at pos2
+		UTIL_SetOrigin(pev, m_vecPosition2);
+		m_vecPosition2 = m_vecPosition1;
+		m_vecPosition1 = pev->origin;
+	}
+	SetTouch( NULL );
+	
+	Precache();
+}
+	
+void CMomentaryDoor::Precache( void )
+{
+
+// set the door's "in-motion" sound
+	switch (m_bMoveSnd)
+	{
+	case	0:
+		pev->noiseMoving = ALLOC_STRING("common/null.wav");
+		break;
+	case	1:
+		PRECACHE_SOUND ("doors/doormove1.wav");
+		pev->noiseMoving = ALLOC_STRING("doors/doormove1.wav");
+		break;
+	case	2:
+		PRECACHE_SOUND ("doors/doormove2.wav");
+		pev->noiseMoving = ALLOC_STRING("doors/doormove2.wav");
+		break;
+	case	3:
+		PRECACHE_SOUND ("doors/doormove3.wav");
+		pev->noiseMoving = ALLOC_STRING("doors/doormove3.wav");
+		break;
+	case	4:
+		PRECACHE_SOUND ("doors/doormove4.wav");
+		pev->noiseMoving = ALLOC_STRING("doors/doormove4.wav");
+		break;
+	case	5:
+		PRECACHE_SOUND ("doors/doormove5.wav");
+		pev->noiseMoving = ALLOC_STRING("doors/doormove5.wav");
+		break;
+	case	6:
+		PRECACHE_SOUND ("doors/doormove6.wav");
+		pev->noiseMoving = ALLOC_STRING("doors/doormove6.wav");
+		break;
+	case	7:
+		PRECACHE_SOUND ("doors/doormove7.wav");
+		pev->noiseMoving = ALLOC_STRING("doors/doormove7.wav");
+		break;
+	case	8:
+		PRECACHE_SOUND ("doors/doormove8.wav");
+		pev->noiseMoving = ALLOC_STRING("doors/doormove8.wav");
+		break;
+	default:
+		pev->noiseMoving = ALLOC_STRING("common/null.wav");
+		break;
+	}
+}
+
+void CMomentaryDoor::KeyValue( KeyValueData *pkvd )
+{
+
+	if (FStrEq(pkvd->szKeyName, "movesnd"))
+	{
+		m_bMoveSnd = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "stopsnd"))
+	{
+//		m_bStopSnd = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "healthvalue"))
+	{
+//		m_bHealthValue = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseToggle::KeyValue( pkvd );
+}
+
+void CMomentaryDoor::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( useType != USE_SET )		// Momentary buttons will pass down a float in here
+		return;
+
+	if ( value > 1.0 )
+		value = 1.0;
+	Vector move = m_vecPosition1 + (value * (m_vecPosition2 - m_vecPosition1));
+	
+	Vector delta = move - pev->origin;
+	float speed = delta.Length() * 10;
+
+	if ( speed != 0 )
+	{
+		// This entity only thinks when it moves, so if it's thinking, it's in the process of moving
+		// play the sound when it starts moving
+		if ( pev->nextthink < pev->ltime || pev->nextthink == 0 )
+			EMIT_SOUND(ENT(pev), CHAN_STATIC, (char*)STRING(pev->noiseMoving), 1, ATTN_NORM);
+
+		LinearMove( move, speed );
+	}
+
+}
diff --git a/main/source/dlls/doors.h b/main/source/dlls/doors.h
new file mode 100644
index 00000000..724ad577
--- /dev/null
+++ b/main/source/dlls/doors.h
@@ -0,0 +1,33 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef DOORS_H
+#define DOORS_H
+
+// doors
+#define SF_DOOR_ROTATE_Y			0
+#define	SF_DOOR_START_OPEN			1
+#define SF_DOOR_ROTATE_BACKWARDS	2
+#define SF_DOOR_PASSABLE			8
+#define SF_DOOR_ONEWAY				16
+#define	SF_DOOR_NO_AUTO_RETURN		32
+#define SF_DOOR_ROTATE_Z			64
+#define SF_DOOR_ROTATE_X			128
+#define SF_DOOR_USE_ONLY			256		// door must be opened by player's use button.
+#define SF_DOOR_NOMONSTERS			512		// Monster can't open
+#define SF_DOOR_SILENT				0x80000000
+
+
+
+#endif		//DOORS_H
diff --git a/main/source/dlls/effects.cpp b/main/source/dlls/effects.cpp
new file mode 100644
index 00000000..c3438f47
--- /dev/null
+++ b/main/source/dlls/effects.cpp
@@ -0,0 +1,2268 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "customentity.h"
+#include "effects.h"
+#include "weapons.h"
+#include "decals.h"
+#include "func_break.h"
+#include "shake.h"
+
+#define	SF_GIBSHOOTER_REPEATABLE	1 // allows a gibshooter to be refired
+
+#define SF_FUNNEL_REVERSE			1 // funnel effect repels particles instead of attracting them.
+
+
+// Lightning target, just alias landmark
+LINK_ENTITY_TO_CLASS( info_target, CPointEntity );
+
+
+class CBubbling : public CBaseEntity
+{
+public:
+	void	Spawn( void );
+	void	Precache( void );
+	void	KeyValue( KeyValueData *pkvd );
+	
+	void	EXPORT FizzThink( void );
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	virtual int		ObjectCaps( void ) { return CBaseEntity::ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	int		m_density;
+	int		m_frequency;
+	int		m_bubbleModel;
+	int		m_state;
+};
+
+LINK_ENTITY_TO_CLASS( env_bubbles, CBubbling );
+
+TYPEDESCRIPTION	CBubbling::m_SaveData[] = 
+{
+	DEFINE_FIELD( CBubbling, m_density, FIELD_INTEGER ),
+	DEFINE_FIELD( CBubbling, m_frequency, FIELD_INTEGER ),
+	DEFINE_FIELD( CBubbling, m_state, FIELD_INTEGER ),
+	// Let spawn restore this!
+	//	DEFINE_FIELD( CBubbling, m_bubbleModel, FIELD_INTEGER ),
+};
+
+IMPLEMENT_SAVERESTORE( CBubbling, CBaseEntity );
+
+
+#define SF_BUBBLES_STARTOFF		0x0001
+
+void CBubbling::Spawn( void )
+{
+	Precache( );
+	SET_MODEL( ENT(pev), STRING(pev->model) );		// Set size
+
+	pev->solid = SOLID_NOT;							// Remove model & collisions
+	pev->renderamt = 0;								// The engine won't draw this model if this is set to 0 and blending is on
+	pev->rendermode = kRenderTransTexture;
+	int speed = pev->speed > 0 ? pev->speed : -pev->speed;
+
+	// HACKHACK!!! - Speed in rendercolor
+	pev->rendercolor.x = speed >> 8;
+	pev->rendercolor.y = speed & 255;
+	pev->rendercolor.z = (pev->speed < 0) ? 1 : 0;
+
+
+	if ( !(pev->spawnflags & SF_BUBBLES_STARTOFF) )
+	{
+		SetThink( &CBubbling::FizzThink );
+		pev->nextthink = gpGlobals->time + 2.0;
+		m_state = 1;
+	}
+	else 
+		m_state = 0;
+}
+
+void CBubbling::Precache( void )
+{
+	m_bubbleModel = PRECACHE_MODEL("sprites/bubble2.spr");			// Precache bubble sprite
+}
+
+
+void CBubbling::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( ShouldToggle( useType, m_state ) )
+		m_state = !m_state;
+
+	if ( m_state )
+	{
+		SetThink( &CBubbling::FizzThink );
+		pev->nextthink = gpGlobals->time + 0.1;
+	}
+	else
+	{
+		SetThink( NULL );
+		pev->nextthink = 0;
+	}
+}
+
+
+void CBubbling::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "density"))
+	{
+		m_density = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "frequency"))
+	{
+		m_frequency = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "current"))
+	{
+		pev->speed = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseEntity::KeyValue( pkvd );
+}
+
+
+void CBubbling::FizzThink( void )
+{
+	MESSAGE_BEGIN( MSG_PAS, SVC_TEMPENTITY, VecBModelOrigin(pev) );
+		WRITE_BYTE( TE_FIZZ );
+		WRITE_SHORT( (short)ENTINDEX( edict() ) );
+		WRITE_SHORT( (short)m_bubbleModel );
+		WRITE_BYTE( m_density );
+	MESSAGE_END();
+
+	if ( m_frequency > 19 )
+		pev->nextthink = gpGlobals->time + 0.5;
+	else
+		pev->nextthink = gpGlobals->time + 2.5 - (0.1 * m_frequency);
+}
+
+// --------------------------------------------------
+// 
+// Beams
+//
+// --------------------------------------------------
+
+LINK_ENTITY_TO_CLASS( beam, CBeam );
+
+void CBeam::Spawn( void )
+{
+	pev->solid = SOLID_NOT;							// Remove model & collisions
+	Precache( );
+}
+
+void CBeam::Precache( void )
+{
+	if ( pev->owner )
+		SetStartEntity( ENTINDEX( pev->owner ) );
+	if ( pev->aiment )
+		SetEndEntity( ENTINDEX( pev->aiment ) );
+}
+
+void CBeam::SetStartEntity( int entityIndex ) 
+{ 
+	pev->sequence = (entityIndex & 0x0FFF) | ((pev->sequence&0xF000)<<12); 
+	pev->owner = g_engfuncs.pfnPEntityOfEntIndex( entityIndex );
+}
+
+void CBeam::SetEndEntity( int entityIndex ) 
+{ 
+	pev->skin = (entityIndex & 0x0FFF) | ((pev->skin&0xF000)<<12); 
+	pev->aiment = g_engfuncs.pfnPEntityOfEntIndex( entityIndex );
+}
+
+
+// These don't take attachments into account
+const Vector &CBeam::GetStartPos( void )
+{
+	if ( GetType() == BEAM_ENTS )
+	{
+		edict_t *pent =  g_engfuncs.pfnPEntityOfEntIndex( GetStartEntity() );
+		return pent->v.origin;
+	}
+	return pev->origin;
+}
+
+
+const Vector &CBeam::GetEndPos( void )
+{
+	int type = GetType();
+	if ( type == BEAM_POINTS || type == BEAM_HOSE )
+	{
+		return pev->angles;
+	}
+
+	edict_t *pent =  g_engfuncs.pfnPEntityOfEntIndex( GetEndEntity() );
+	if ( pent )
+		return pent->v.origin;
+	return pev->angles;
+}
+
+
+CBeam *CBeam::BeamCreate( const char *pSpriteName, int width )
+{
+	// Create a new entity with CBeam private data
+	CBeam *pBeam = GetClassPtr( (CBeam *)NULL );
+	pBeam->pev->classname = MAKE_STRING("beam");
+
+	pBeam->BeamInit( pSpriteName, width );
+
+	return pBeam;
+}
+
+
+void CBeam::BeamInit( const char *pSpriteName, int width )
+{
+	pev->flags |= FL_CUSTOMENTITY;
+	SetColor( 255, 255, 255 );
+	SetBrightness( 255 );
+	SetNoise( 0 );
+	SetFrame( 0 );
+	SetScrollRate( 0 );
+	pev->model = MAKE_STRING( pSpriteName );
+	SetTexture( PRECACHE_MODEL( (char *)pSpriteName ) );
+	SetWidth( width );
+	pev->skin = 0;
+	pev->sequence = 0;
+	pev->rendermode = 0;
+}
+
+
+void CBeam::PointsInit( const Vector &start, const Vector &end )
+{
+	SetType( BEAM_POINTS );
+	SetStartPos( start );
+	SetEndPos( end );
+	SetStartAttachment( 0 );
+	SetEndAttachment( 0 );
+	RelinkBeam();
+}
+
+
+void CBeam::HoseInit( const Vector &start, const Vector &direction )
+{
+	SetType( BEAM_HOSE );
+	SetStartPos( start );
+	SetEndPos( direction );
+	SetStartAttachment( 0 );
+	SetEndAttachment( 0 );
+	RelinkBeam();
+}
+
+
+void CBeam::PointEntInit( const Vector &start, int endIndex )
+{
+	SetType( BEAM_ENTPOINT );
+	SetStartPos( start );
+	SetEndEntity( endIndex );
+	SetStartAttachment( 0 );
+	SetEndAttachment( 0 );
+	RelinkBeam();
+}
+
+void CBeam::EntsInit( int startIndex, int endIndex )
+{
+	SetType( BEAM_ENTS );
+	SetStartEntity( startIndex );
+	SetEndEntity( endIndex );
+	SetStartAttachment( 0 );
+	SetEndAttachment( 0 );
+	RelinkBeam();
+}
+
+
+void CBeam::RelinkBeam( void )
+{
+	const Vector &startPos = GetStartPos(), &endPos = GetEndPos();
+
+	pev->mins.x = min( startPos.x, endPos.x );
+	pev->mins.y = min( startPos.y, endPos.y );
+	pev->mins.z = min( startPos.z, endPos.z );
+	pev->maxs.x = max( startPos.x, endPos.x );
+	pev->maxs.y = max( startPos.y, endPos.y );
+	pev->maxs.z = max( startPos.z, endPos.z );
+	pev->mins = pev->mins - pev->origin;
+	pev->maxs = pev->maxs - pev->origin;
+
+	UTIL_SetSize( pev, pev->mins, pev->maxs );
+	UTIL_SetOrigin( pev, pev->origin );
+}
+
+#if 0
+void CBeam::SetObjectCollisionBox( void )
+{
+	const Vector &startPos = GetStartPos(), &endPos = GetEndPos();
+
+	pev->absmin.x = min( startPos.x, endPos.x );
+	pev->absmin.y = min( startPos.y, endPos.y );
+	pev->absmin.z = min( startPos.z, endPos.z );
+	pev->absmax.x = max( startPos.x, endPos.x );
+	pev->absmax.y = max( startPos.y, endPos.y );
+	pev->absmax.z = max( startPos.z, endPos.z );
+}
+#endif
+
+
+void CBeam::TriggerTouch( CBaseEntity *pOther )
+{
+	if ( pOther->pev->flags & (FL_CLIENT | FL_MONSTER) )
+	{
+		if ( pev->owner )
+		{
+			CBaseEntity *pOwner = CBaseEntity::Instance(pev->owner);
+			pOwner->Use( pOther, this, USE_TOGGLE, 0 );
+		}
+		ALERT( at_console, "Firing targets!!!\n" );
+	}
+}
+
+
+CBaseEntity *CBeam::RandomTargetname( const char *szName )
+{
+	int total = 0;
+
+	CBaseEntity *pEntity = NULL;
+	CBaseEntity *pNewEntity = NULL;
+	while ((pNewEntity = UTIL_FindEntityByTargetname( pNewEntity, szName )) != NULL)
+	{
+		total++;
+		if (RANDOM_LONG(0,total-1) < 1)
+			pEntity = pNewEntity;
+	}
+	return pEntity;
+}
+
+
+void CBeam::DoSparks( const Vector &start, const Vector &end )
+{
+	if ( pev->spawnflags & (SF_BEAM_SPARKSTART|SF_BEAM_SPARKEND) )
+	{
+		if ( pev->spawnflags & SF_BEAM_SPARKSTART )
+		{
+			UTIL_Sparks( start );
+		}
+		if ( pev->spawnflags & SF_BEAM_SPARKEND )
+		{
+			UTIL_Sparks( end );
+		}
+	}
+}
+
+
+class CLightning : public CBeam
+{
+public:
+	void	Spawn( void );
+	void	Precache( void );
+	void	KeyValue( KeyValueData *pkvd );
+	void	Activate( void );
+
+	void	EXPORT StrikeThink( void );
+	void	EXPORT DamageThink( void );
+	void	RandomArea( void );
+	void	RandomPoint( Vector &vecSrc );
+	void	Zap( const Vector &vecSrc, const Vector &vecDest );
+	void	EXPORT StrikeUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void	EXPORT ToggleUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	
+	inline BOOL ServerSide( void )
+	{
+		if ( m_life == 0 && !(pev->spawnflags & SF_BEAM_RING) )
+			return TRUE;
+		return FALSE;
+	}
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	void	BeamUpdateVars( void );
+
+	int		m_active;
+	int		m_iszStartEntity;
+	int		m_iszEndEntity;
+	float	m_life;
+	int		m_boltWidth;
+	int		m_noiseAmplitude;
+	int		m_brightness;
+	int		m_speed;
+	float	m_restrike;
+	int		m_spriteTexture;
+	int		m_iszSpriteName;
+	int		m_frameStart;
+
+	float	m_radius;
+};
+
+LINK_ENTITY_TO_CLASS( env_lightning, CLightning );
+LINK_ENTITY_TO_CLASS( env_beam, CLightning );
+
+// UNDONE: Jay -- This is only a test
+#if _DEBUG
+class CTripBeam : public CLightning
+{
+	void Spawn( void );
+};
+LINK_ENTITY_TO_CLASS( trip_beam, CTripBeam );
+
+void CTripBeam::Spawn( void )
+{
+	CLightning::Spawn();
+	SetTouch( &CTripBeam::TriggerTouch );
+	pev->solid = SOLID_TRIGGER;
+	RelinkBeam();
+}
+#endif
+
+
+
+TYPEDESCRIPTION	CLightning::m_SaveData[] = 
+{
+	DEFINE_FIELD( CLightning, m_active, FIELD_INTEGER ),
+	DEFINE_FIELD( CLightning, m_iszStartEntity, FIELD_STRING ),
+	DEFINE_FIELD( CLightning, m_iszEndEntity, FIELD_STRING ),
+	DEFINE_FIELD( CLightning, m_life, FIELD_FLOAT ),
+	DEFINE_FIELD( CLightning, m_boltWidth, FIELD_INTEGER ),
+	DEFINE_FIELD( CLightning, m_noiseAmplitude, FIELD_INTEGER ),
+	DEFINE_FIELD( CLightning, m_brightness, FIELD_INTEGER ),
+	DEFINE_FIELD( CLightning, m_speed, FIELD_INTEGER ),
+	DEFINE_FIELD( CLightning, m_restrike, FIELD_FLOAT ),
+	DEFINE_FIELD( CLightning, m_spriteTexture, FIELD_INTEGER ),
+	DEFINE_FIELD( CLightning, m_iszSpriteName, FIELD_STRING ),
+	DEFINE_FIELD( CLightning, m_frameStart, FIELD_INTEGER ),
+	DEFINE_FIELD( CLightning, m_radius, FIELD_FLOAT ),
+};
+
+IMPLEMENT_SAVERESTORE( CLightning, CBeam );
+
+
+void CLightning::Spawn( void )
+{
+	if ( FStringNull( m_iszSpriteName ) )
+	{
+		SetThink( &CLightning::SUB_Remove );
+		return;
+	}
+	pev->solid = SOLID_NOT;							// Remove model & collisions
+	Precache( );
+
+	pev->dmgtime = gpGlobals->time;
+
+	if ( ServerSide() )
+	{
+		SetThink( NULL );
+		if ( pev->dmg > 0 )
+		{
+			SetThink( &CLightning::DamageThink );
+			pev->nextthink = gpGlobals->time + 0.1;
+		}
+		if ( pev->targetname )
+		{
+			if ( !(pev->spawnflags & SF_BEAM_STARTON) )
+			{
+				pev->effects = EF_NODRAW;
+				m_active = 0;
+				pev->nextthink = 0;
+			}
+			else
+				m_active = 1;
+		
+			SetUse( &CLightning::ToggleUse );
+		}
+	}
+	else
+	{
+		m_active = 0;
+		if ( !FStringNull(pev->targetname) )
+		{
+			SetUse( &CLightning::StrikeUse );
+		}
+		if ( FStringNull(pev->targetname) || FBitSet(pev->spawnflags, SF_BEAM_STARTON) )
+		{
+			SetThink( &CLightning::StrikeThink );
+			pev->nextthink = gpGlobals->time + 1.0;
+		}
+	}
+}
+
+void CLightning::Precache( void )
+{
+	m_spriteTexture = PRECACHE_MODEL( (char *)STRING(m_iszSpriteName) );
+	CBeam::Precache();
+}
+
+
+void CLightning::Activate( void )
+{
+	if ( ServerSide() )
+		BeamUpdateVars();
+}
+
+
+void CLightning::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "LightningStart"))
+	{
+		m_iszStartEntity = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "LightningEnd"))
+	{
+		m_iszEndEntity = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "life"))
+	{
+		m_life = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "BoltWidth"))
+	{
+		m_boltWidth = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "NoiseAmplitude"))
+	{
+		m_noiseAmplitude = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "TextureScroll"))
+	{
+		m_speed = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "StrikeTime"))
+	{
+		m_restrike = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "texture"))
+	{
+		m_iszSpriteName = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "framestart"))
+	{
+		m_frameStart = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "Radius"))
+	{
+		m_radius = atof( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "damage"))
+	{
+		pev->dmg = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBeam::KeyValue( pkvd );
+}
+
+
+void CLightning::ToggleUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( !ShouldToggle( useType, m_active ) )
+		return;
+	if ( m_active )
+	{
+		m_active = 0;
+		pev->effects |= EF_NODRAW;
+		pev->nextthink = 0;
+	}
+	else
+	{
+		m_active = 1;
+		pev->effects &= ~EF_NODRAW;
+		DoSparks( GetStartPos(), GetEndPos() );
+		if ( pev->dmg > 0 )
+		{
+			pev->nextthink = gpGlobals->time;
+			pev->dmgtime = gpGlobals->time;
+		}
+	}
+}
+
+
+void CLightning::StrikeUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( !ShouldToggle( useType, m_active ) )
+		return;
+
+	if ( m_active )
+	{
+		m_active = 0;
+		SetThink( NULL );
+	}
+	else
+	{
+		SetThink( &CLightning::StrikeThink );
+		pev->nextthink = gpGlobals->time + 0.1;
+	}
+
+	if ( !FBitSet( pev->spawnflags, SF_BEAM_TOGGLE ) )
+		SetUse( NULL );
+}
+
+
+int IsPointEntity( CBaseEntity *pEnt )
+{
+	if ( !pEnt->pev->modelindex )
+		return 1;
+	if ( FClassnameIs( pEnt->pev, "info_target" ) || FClassnameIs( pEnt->pev, "info_landmark" ) || FClassnameIs( pEnt->pev, "path_corner" ) )
+		return 1;
+
+	return 0;
+}
+
+
+void CLightning::StrikeThink( void )
+{
+	if ( m_life != 0 )
+	{
+		if ( pev->spawnflags & SF_BEAM_RANDOM )
+			pev->nextthink = gpGlobals->time + m_life + RANDOM_FLOAT( 0, m_restrike );
+		else
+			pev->nextthink = gpGlobals->time + m_life + m_restrike;
+	}
+	m_active = 1;
+
+	if (FStringNull(m_iszEndEntity))
+	{
+		if (FStringNull(m_iszStartEntity))
+		{
+			RandomArea( );
+		}
+		else
+		{
+			CBaseEntity *pStart = RandomTargetname( STRING(m_iszStartEntity) );
+			if (pStart != NULL)
+				RandomPoint( pStart->pev->origin );
+			else
+				ALERT( at_console, "env_beam: unknown entity \"%s\"\n", STRING(m_iszStartEntity) );
+		}
+		return;
+	}
+
+	CBaseEntity *pStart = RandomTargetname( STRING(m_iszStartEntity) );
+	CBaseEntity *pEnd = RandomTargetname( STRING(m_iszEndEntity) );
+
+	if ( pStart != NULL && pEnd != NULL )
+	{
+		if ( IsPointEntity( pStart ) || IsPointEntity( pEnd ) )
+		{
+			if ( pev->spawnflags & SF_BEAM_RING)
+			{
+				// don't work
+				return;
+			}
+		}
+
+		MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+			if ( IsPointEntity( pStart ) || IsPointEntity( pEnd ) )
+			{
+				if ( !IsPointEntity( pEnd ) )	// One point entity must be in pEnd
+				{
+					CBaseEntity *pTemp;
+					pTemp = pStart;
+					pStart = pEnd;
+					pEnd = pTemp;
+				}
+				if ( !IsPointEntity( pStart ) )	// One sided
+				{
+					WRITE_BYTE( TE_BEAMENTPOINT );
+					WRITE_SHORT( pStart->entindex() );
+					WRITE_COORD( pEnd->pev->origin.x);
+					WRITE_COORD( pEnd->pev->origin.y);
+					WRITE_COORD( pEnd->pev->origin.z);
+				}
+				else
+				{
+					WRITE_BYTE( TE_BEAMPOINTS);
+					WRITE_COORD( pStart->pev->origin.x);
+					WRITE_COORD( pStart->pev->origin.y);
+					WRITE_COORD( pStart->pev->origin.z);
+					WRITE_COORD( pEnd->pev->origin.x);
+					WRITE_COORD( pEnd->pev->origin.y);
+					WRITE_COORD( pEnd->pev->origin.z);
+				}
+
+
+			}
+			else
+			{
+				if ( pev->spawnflags & SF_BEAM_RING)
+					WRITE_BYTE( TE_BEAMRING );
+				else
+					WRITE_BYTE( TE_BEAMENTS );
+				WRITE_SHORT( pStart->entindex() );
+				WRITE_SHORT( pEnd->entindex() );
+			}
+
+			WRITE_SHORT( m_spriteTexture );
+			WRITE_BYTE( m_frameStart ); // framestart
+			WRITE_BYTE( (int)pev->framerate); // framerate
+			WRITE_BYTE( (int)(m_life*10.0) ); // life
+			WRITE_BYTE( m_boltWidth );  // width
+			WRITE_BYTE( m_noiseAmplitude );   // noise
+			WRITE_BYTE( (int)pev->rendercolor.x );   // r, g, b
+			WRITE_BYTE( (int)pev->rendercolor.y );   // r, g, b
+			WRITE_BYTE( (int)pev->rendercolor.z );   // r, g, b
+			WRITE_BYTE( pev->renderamt );	// brightness
+			WRITE_BYTE( m_speed );		// speed
+		MESSAGE_END();
+		DoSparks( pStart->pev->origin, pEnd->pev->origin );
+		if ( pev->dmg > 0 )
+		{
+			TraceResult tr;
+			UTIL_TraceLine( pStart->pev->origin, pEnd->pev->origin, dont_ignore_monsters, NULL, &tr );
+			BeamDamageInstant( &tr, pev->dmg );
+		}
+	}
+}
+
+
+void CBeam::BeamDamage( TraceResult *ptr )
+{
+	RelinkBeam();
+	if ( ptr->flFraction != 1.0 && ptr->pHit != NULL )
+	{
+		CBaseEntity *pHit = CBaseEntity::Instance(ptr->pHit);
+		if ( pHit )
+		{
+			ClearMultiDamage();
+			pHit->TraceAttack( pev, pev->dmg * (gpGlobals->time - pev->dmgtime), (ptr->vecEndPos - pev->origin).Normalize(), ptr, DMG_ENERGYBEAM );
+			ApplyMultiDamage( pev, pev );
+			if ( pev->spawnflags & SF_BEAM_DECALS )
+			{
+				if ( pHit->IsBSPModel() )
+					UTIL_DecalTrace( ptr, DECAL_BIGSHOT1 + RANDOM_LONG(0,4) );
+			}
+		}
+	}
+	pev->dmgtime = gpGlobals->time;
+}
+
+
+void CLightning::DamageThink( void )
+{
+	pev->nextthink = gpGlobals->time + 0.1;
+	TraceResult tr;
+	UTIL_TraceLine( GetStartPos(), GetEndPos(), dont_ignore_monsters, NULL, &tr );
+	BeamDamage( &tr );
+}
+
+
+
+void CLightning::Zap( const Vector &vecSrc, const Vector &vecDest )
+{
+#if 1
+	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+		WRITE_BYTE( TE_BEAMPOINTS);
+		WRITE_COORD(vecSrc.x);
+		WRITE_COORD(vecSrc.y);
+		WRITE_COORD(vecSrc.z);
+		WRITE_COORD(vecDest.x);
+		WRITE_COORD(vecDest.y);
+		WRITE_COORD(vecDest.z);
+		WRITE_SHORT( m_spriteTexture );
+		WRITE_BYTE( m_frameStart ); // framestart
+		WRITE_BYTE( (int)pev->framerate); // framerate
+		WRITE_BYTE( (int)(m_life*10.0) ); // life
+		WRITE_BYTE( m_boltWidth );  // width
+		WRITE_BYTE( m_noiseAmplitude );   // noise
+		WRITE_BYTE( (int)pev->rendercolor.x );   // r, g, b
+		WRITE_BYTE( (int)pev->rendercolor.y );   // r, g, b
+		WRITE_BYTE( (int)pev->rendercolor.z );   // r, g, b
+		WRITE_BYTE( pev->renderamt );	// brightness
+		WRITE_BYTE( m_speed );		// speed
+	MESSAGE_END();
+#else
+	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+		WRITE_BYTE(TE_LIGHTNING);
+		WRITE_COORD(vecSrc.x);
+		WRITE_COORD(vecSrc.y);
+		WRITE_COORD(vecSrc.z);
+		WRITE_COORD(vecDest.x);
+		WRITE_COORD(vecDest.y);
+		WRITE_COORD(vecDest.z);
+		WRITE_BYTE(10);
+		WRITE_BYTE(50);
+		WRITE_BYTE(40);
+		WRITE_SHORT(m_spriteTexture);
+	MESSAGE_END();
+#endif
+	DoSparks( vecSrc, vecDest );
+}
+
+void CLightning::RandomArea( void )
+{
+	int iLoops = 0;
+
+	for (iLoops = 0; iLoops < 10; iLoops++)
+	{
+		Vector vecSrc = pev->origin;
+
+		Vector vecDir1 = Vector( RANDOM_FLOAT( -1.0, 1.0 ), RANDOM_FLOAT( -1.0, 1.0 ),RANDOM_FLOAT( -1.0, 1.0 ) );
+		vecDir1 = vecDir1.Normalize();
+		TraceResult		tr1;
+		UTIL_TraceLine( vecSrc, vecSrc + vecDir1 * m_radius, ignore_monsters, ENT(pev), &tr1 );
+
+		if (tr1.flFraction == 1.0)
+			continue;
+
+		Vector vecDir2;
+		do {
+			vecDir2 = Vector( RANDOM_FLOAT( -1.0, 1.0 ), RANDOM_FLOAT( -1.0, 1.0 ),RANDOM_FLOAT( -1.0, 1.0 ) );
+		} while (DotProduct(vecDir1, vecDir2 ) > 0);
+		vecDir2 = vecDir2.Normalize();
+		TraceResult		tr2;
+		UTIL_TraceLine( vecSrc, vecSrc + vecDir2 * m_radius, ignore_monsters, ENT(pev), &tr2 );
+
+		if (tr2.flFraction == 1.0)
+			continue;
+
+		if ((tr1.vecEndPos - tr2.vecEndPos).Length() < m_radius * 0.1)
+			continue;
+
+		UTIL_TraceLine( tr1.vecEndPos, tr2.vecEndPos, ignore_monsters, ENT(pev), &tr2 );
+
+		if (tr2.flFraction != 1.0)
+			continue;
+
+		Zap( tr1.vecEndPos, tr2.vecEndPos );
+
+		break;
+	}
+}
+
+
+void CLightning::RandomPoint( Vector &vecSrc )
+{
+	int iLoops = 0;
+
+	for (iLoops = 0; iLoops < 10; iLoops++)
+	{
+		Vector vecDir1 = Vector( RANDOM_FLOAT( -1.0, 1.0 ), RANDOM_FLOAT( -1.0, 1.0 ),RANDOM_FLOAT( -1.0, 1.0 ) );
+		vecDir1 = vecDir1.Normalize();
+		TraceResult		tr1;
+		UTIL_TraceLine( vecSrc, vecSrc + vecDir1 * m_radius, ignore_monsters, ENT(pev), &tr1 );
+
+		if ((tr1.vecEndPos - vecSrc).Length() < m_radius * 0.1)
+			continue;
+
+		if (tr1.flFraction == 1.0)
+			continue;
+
+		Zap( vecSrc, tr1.vecEndPos );
+		break;
+	}
+}
+
+
+
+void CLightning::BeamUpdateVars( void )
+{
+	int beamType;
+	int pointStart, pointEnd;
+
+	edict_t *pStart = FIND_ENTITY_BY_TARGETNAME ( NULL, STRING(m_iszStartEntity) );
+	edict_t *pEnd = FIND_ENTITY_BY_TARGETNAME ( NULL, STRING(m_iszEndEntity) );
+	pointStart = IsPointEntity( CBaseEntity::Instance(pStart) );
+	pointEnd = IsPointEntity( CBaseEntity::Instance(pEnd) );
+
+	pev->skin = 0;
+	pev->sequence = 0;
+	pev->rendermode = 0;
+	pev->flags |= FL_CUSTOMENTITY;
+	pev->model = m_iszSpriteName;
+	SetTexture( m_spriteTexture );
+
+	beamType = BEAM_ENTS;
+	if ( pointStart || pointEnd )
+	{
+		if ( !pointStart )	// One point entity must be in pStart
+		{
+			edict_t *pTemp;
+			// Swap start & end
+			pTemp = pStart;
+			pStart = pEnd;
+			pEnd = pTemp;
+			int swap = pointStart;
+			pointStart = pointEnd;
+			pointEnd = swap;
+		}
+		if ( !pointEnd )
+			beamType = BEAM_ENTPOINT;
+		else
+			beamType = BEAM_POINTS;
+	}
+
+	SetType( beamType );
+	if ( beamType == BEAM_POINTS || beamType == BEAM_ENTPOINT || beamType == BEAM_HOSE )
+	{
+		SetStartPos( pStart->v.origin );
+		if ( beamType == BEAM_POINTS || beamType == BEAM_HOSE )
+			SetEndPos( pEnd->v.origin );
+		else
+			SetEndEntity( ENTINDEX(pEnd) );
+	}
+	else
+	{
+		SetStartEntity( ENTINDEX(pStart) );
+		SetEndEntity( ENTINDEX(pEnd) );
+	}
+
+	RelinkBeam();
+
+	SetWidth( m_boltWidth );
+	SetNoise( m_noiseAmplitude );
+	SetFrame( m_frameStart );
+	SetScrollRate( m_speed );
+	if ( pev->spawnflags & SF_BEAM_SHADEIN )
+		SetFlags( BEAM_FSHADEIN );
+	else if ( pev->spawnflags & SF_BEAM_SHADEOUT )
+		SetFlags( BEAM_FSHADEOUT );
+}
+
+
+LINK_ENTITY_TO_CLASS( env_laser, CLaser );
+
+TYPEDESCRIPTION	CLaser::m_SaveData[] = 
+{
+	DEFINE_FIELD( CLaser, m_pSprite, FIELD_CLASSPTR ),
+	DEFINE_FIELD( CLaser, m_iszSpriteName, FIELD_STRING ),
+	DEFINE_FIELD( CLaser, m_firePosition, FIELD_POSITION_VECTOR ),
+};
+
+IMPLEMENT_SAVERESTORE( CLaser, CBeam );
+
+void CLaser::Spawn( void )
+{
+	if ( FStringNull( pev->model ) )
+	{
+		SetThink( &CLaser::SUB_Remove );
+		return;
+	}
+	pev->solid = SOLID_NOT;							// Remove model & collisions
+	Precache( );
+
+	SetThink( &CLaser::StrikeThink );
+	pev->flags |= FL_CUSTOMENTITY;
+
+	PointsInit( pev->origin, pev->origin );
+
+	if ( !m_pSprite && m_iszSpriteName )
+		m_pSprite = CSprite::SpriteCreate( STRING(m_iszSpriteName), pev->origin, TRUE );
+	else
+		m_pSprite = NULL;
+
+	if ( m_pSprite )
+		m_pSprite->SetTransparency( kRenderGlow, pev->rendercolor.x, pev->rendercolor.y, pev->rendercolor.z, pev->renderamt, pev->renderfx );
+
+	if ( pev->targetname && !(pev->spawnflags & SF_BEAM_STARTON) )
+		TurnOff();
+	else
+		TurnOn();
+}
+
+void CLaser::Precache( void )
+{
+	pev->modelindex = PRECACHE_MODEL( (char *)STRING(pev->model) );
+	if ( m_iszSpriteName )
+		PRECACHE_MODEL( (char *)STRING(m_iszSpriteName) );
+}
+
+
+void CLaser::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "LaserTarget"))
+	{
+		pev->message = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "width"))
+	{
+		SetWidth( atof(pkvd->szValue) );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "NoiseAmplitude"))
+	{
+		SetNoise( atoi(pkvd->szValue) );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "TextureScroll"))
+	{
+		SetScrollRate( atoi(pkvd->szValue) );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "texture"))
+	{
+		pev->model = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "EndSprite"))
+	{
+		m_iszSpriteName = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "framestart"))
+	{
+		pev->frame = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "damage"))
+	{
+		pev->dmg = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBeam::KeyValue( pkvd );
+}
+
+
+int CLaser::IsOn( void )
+{
+	if (pev->effects & EF_NODRAW)
+		return 0;
+	return 1;
+}
+
+
+void CLaser::TurnOff( void )
+{
+	pev->effects |= EF_NODRAW;
+	pev->nextthink = 0;
+	if ( m_pSprite )
+		m_pSprite->TurnOff();
+}
+
+
+void CLaser::TurnOn( void )
+{
+	pev->effects &= ~EF_NODRAW;
+	if ( m_pSprite )
+		m_pSprite->TurnOn();
+	pev->dmgtime = gpGlobals->time;
+	pev->nextthink = gpGlobals->time;
+}
+
+
+void CLaser::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	int active = IsOn();
+
+	if ( !ShouldToggle( useType, active ) )
+		return;
+	if ( active )
+	{
+		TurnOff();
+	}
+	else
+	{
+		TurnOn();
+	}
+}
+
+
+void CLaser::FireAtPoint( TraceResult &tr )
+{
+	SetEndPos( tr.vecEndPos );
+	if ( m_pSprite )
+		UTIL_SetOrigin( m_pSprite->pev, tr.vecEndPos );
+
+	BeamDamage( &tr );
+	DoSparks( GetStartPos(), tr.vecEndPos );
+}
+
+void CLaser::StrikeThink( void )
+{
+	CBaseEntity *pEnd = RandomTargetname( STRING(pev->message) );
+
+	if ( pEnd )
+		m_firePosition = pEnd->pev->origin;
+
+	TraceResult tr;
+
+	UTIL_TraceLine( pev->origin, m_firePosition, dont_ignore_monsters, NULL, &tr );
+	FireAtPoint( tr );
+	pev->nextthink = gpGlobals->time + 0.1;
+}
+
+
+
+class CGlow : public CPointEntity
+{
+public:
+	void Spawn( void );
+	void Think( void );
+	void Animate( float frames );
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	float		m_lastTime;
+	float		m_maxFrame;
+};
+
+LINK_ENTITY_TO_CLASS( env_glow, CGlow );
+
+TYPEDESCRIPTION	CGlow::m_SaveData[] = 
+{
+	DEFINE_FIELD( CGlow, m_lastTime, FIELD_TIME ),
+	DEFINE_FIELD( CGlow, m_maxFrame, FIELD_FLOAT ),
+};
+
+IMPLEMENT_SAVERESTORE( CGlow, CPointEntity );
+
+void CGlow::Spawn( void )
+{
+	pev->solid			= SOLID_NOT;
+	pev->movetype		= MOVETYPE_NONE;
+	pev->effects		= 0;
+	pev->frame			= 0;
+
+	PRECACHE_MODEL( (char *)STRING(pev->model) );
+	SET_MODEL( ENT(pev), STRING(pev->model) );
+
+	m_maxFrame = (float) MODEL_FRAMES( pev->modelindex ) - 1;
+	if ( m_maxFrame > 1.0 && pev->framerate != 0 )
+		pev->nextthink	= gpGlobals->time + 0.1;
+
+	m_lastTime = gpGlobals->time;
+}
+
+
+void CGlow::Think( void )
+{
+	Animate( pev->framerate * (gpGlobals->time - m_lastTime) );
+
+	pev->nextthink		= gpGlobals->time + 0.1;
+	m_lastTime			= gpGlobals->time;
+}
+
+
+void CGlow::Animate( float frames )
+{ 
+	if ( m_maxFrame > 0 )
+		pev->frame = fmod( pev->frame + frames, m_maxFrame );
+}
+
+
+LINK_ENTITY_TO_CLASS( env_sprite, CSprite );
+
+TYPEDESCRIPTION	CSprite::m_SaveData[] = 
+{
+	DEFINE_FIELD( CSprite, m_lastTime, FIELD_TIME ),
+	DEFINE_FIELD( CSprite, m_maxFrame, FIELD_FLOAT ),
+};
+
+IMPLEMENT_SAVERESTORE( CSprite, CPointEntity );
+
+void CSprite::Spawn( void )
+{
+	pev->solid			= SOLID_NOT;
+	pev->movetype		= MOVETYPE_NONE;
+	pev->effects		= 0;
+	pev->frame			= 0;
+
+	Precache();
+	SET_MODEL( ENT(pev), STRING(pev->model) );
+
+	m_maxFrame = (float) MODEL_FRAMES( pev->modelindex ) - 1;
+	if ( pev->targetname && !(pev->spawnflags & SF_SPRITE_STARTON) )
+		TurnOff();
+	else
+		TurnOn();
+	
+	// Worldcraft only sets y rotation, copy to Z
+	if ( pev->angles.y != 0 && pev->angles.z == 0 )
+	{
+		pev->angles.z = pev->angles.y;
+		pev->angles.y = 0;
+	}
+}
+
+
+void CSprite::Precache( void )
+{
+	PRECACHE_MODEL( (char *)STRING(pev->model) );
+
+	// Reset attachment after save/restore
+	if ( pev->aiment )
+		SetAttachment( pev->aiment, pev->body );
+	else
+	{
+		// Clear attachment
+		pev->skin = 0;
+		pev->body = 0;
+	}
+}
+
+
+void CSprite::SpriteInit( const char *pSpriteName, const Vector &origin )
+{
+	pev->model = MAKE_STRING(pSpriteName);
+	pev->origin = origin;
+	Spawn();
+}
+
+CSprite *CSprite::SpriteCreate( const char *pSpriteName, const Vector &origin, BOOL animate )
+{
+	CSprite *pSprite = GetClassPtr( (CSprite *)NULL );
+	pSprite->SpriteInit( pSpriteName, origin );
+	pSprite->pev->classname = MAKE_STRING("env_sprite");
+	pSprite->pev->solid = SOLID_NOT;
+	pSprite->pev->movetype = MOVETYPE_NOCLIP;
+	if ( animate )
+		pSprite->TurnOn();
+
+	return pSprite;
+}
+
+
+void CSprite::AnimateThink( void )
+{
+	Animate( pev->framerate * (gpGlobals->time - m_lastTime) );
+
+	pev->nextthink		= gpGlobals->time + 0.1;
+	m_lastTime			= gpGlobals->time;
+}
+
+void CSprite::AnimateUntilDead( void )
+{
+	if ( gpGlobals->time > pev->dmgtime )
+		UTIL_Remove(this);
+	else
+	{
+		AnimateThink();
+		pev->nextthink = gpGlobals->time;
+	}
+}
+
+void CSprite::Expand( float scaleSpeed, float fadeSpeed )
+{
+	pev->speed = scaleSpeed;
+	pev->health = fadeSpeed;
+	SetThink( &CSprite::ExpandThink );
+
+	pev->nextthink	= gpGlobals->time;
+	m_lastTime		= gpGlobals->time;
+}
+
+
+void CSprite::ExpandThink( void )
+{
+	float frametime = gpGlobals->time - m_lastTime;
+	pev->scale += pev->speed * frametime;
+	pev->renderamt -= pev->health * frametime;
+	if ( pev->renderamt <= 0 )
+	{
+		pev->renderamt = 0;
+		UTIL_Remove( this );
+	}
+	else
+	{
+		pev->nextthink		= gpGlobals->time + 0.1;
+		m_lastTime			= gpGlobals->time;
+	}
+}
+
+
+void CSprite::Animate( float frames )
+{ 
+	pev->frame += frames;
+	if ( pev->frame > m_maxFrame )
+	{
+		if ( pev->spawnflags & SF_SPRITE_ONCE )
+		{
+			TurnOff();
+		}
+		else
+		{
+			if ( m_maxFrame > 0 )
+				pev->frame = fmod( pev->frame, m_maxFrame );
+		}
+	}
+}
+
+
+void CSprite::TurnOff( void )
+{
+	pev->effects = EF_NODRAW;
+	pev->nextthink = 0;
+}
+
+
+void CSprite::TurnOn( void )
+{
+	pev->effects = 0;
+	if ( (pev->framerate && m_maxFrame > 1.0) || (pev->spawnflags & SF_SPRITE_ONCE) )
+	{
+		SetThink( &CSprite::AnimateThink );
+		pev->nextthink = gpGlobals->time;
+		m_lastTime = gpGlobals->time;
+	}
+	pev->frame = 0;
+}
+
+
+void CSprite::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	int on = pev->effects != EF_NODRAW;
+	if ( ShouldToggle( useType, on ) )
+	{
+		if ( on )
+		{
+			TurnOff();
+		}
+		else
+		{
+			TurnOn();
+		}
+	}
+}
+
+
+class CGibShooter : public CBaseDelay
+{
+public:
+	void	Spawn( void );
+	void	Precache( void );
+	void	KeyValue( KeyValueData *pkvd );
+	void EXPORT ShootThink( void );
+	void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+	virtual CGib *CreateGib( void );
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	int	m_iGibs;
+	int m_iGibCapacity;
+	int m_iGibMaterial;
+	int m_iGibModelIndex;
+	float m_flGibVelocity;
+	float m_flVariance;
+	float m_flGibLife;
+};
+
+TYPEDESCRIPTION CGibShooter::m_SaveData[] =
+{
+	DEFINE_FIELD( CGibShooter, m_iGibs, FIELD_INTEGER ),
+	DEFINE_FIELD( CGibShooter, m_iGibCapacity, FIELD_INTEGER ),
+	DEFINE_FIELD( CGibShooter, m_iGibMaterial, FIELD_INTEGER ),
+	DEFINE_FIELD( CGibShooter, m_iGibModelIndex, FIELD_INTEGER ),
+	DEFINE_FIELD( CGibShooter, m_flGibVelocity, FIELD_FLOAT ),
+	DEFINE_FIELD( CGibShooter, m_flVariance, FIELD_FLOAT ),
+	DEFINE_FIELD( CGibShooter, m_flGibLife, FIELD_FLOAT ),
+};
+
+IMPLEMENT_SAVERESTORE( CGibShooter, CBaseDelay );
+LINK_ENTITY_TO_CLASS( gibshooter, CGibShooter );
+
+
+void CGibShooter :: Precache ( void )
+{
+	if ( g_Language == LANGUAGE_GERMAN )
+	{
+		m_iGibModelIndex = PRECACHE_MODEL ("models/germanygibs.mdl");
+	}
+	else
+	{
+		m_iGibModelIndex = PRECACHE_MODEL ("models/hgibs.mdl");
+	}
+}
+
+
+void CGibShooter::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "m_iGibs"))
+	{
+		m_iGibs = m_iGibCapacity = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "m_flVelocity"))
+	{
+		m_flGibVelocity = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "m_flVariance"))
+	{
+		m_flVariance = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "m_flGibLife"))
+	{
+		m_flGibLife = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+	{
+		CBaseDelay::KeyValue( pkvd );
+	}
+}
+
+void CGibShooter::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	SetThink( &CGibShooter::ShootThink );
+	pev->nextthink = gpGlobals->time;
+}
+
+void CGibShooter::Spawn( void )
+{
+	Precache();
+
+	pev->solid = SOLID_NOT;
+	pev->effects = EF_NODRAW;
+
+	if ( m_flDelay == 0 )
+	{
+		m_flDelay = 0.1;
+	}
+
+	if ( m_flGibLife == 0 )
+	{
+		m_flGibLife = 25;
+	}
+
+	SetMovedir ( pev );
+	pev->body = MODEL_FRAMES( m_iGibModelIndex );
+}
+
+
+CGib *CGibShooter :: CreateGib ( void )
+{
+	if ( CVAR_GET_FLOAT("violence_hgibs") == 0 )
+		return NULL;
+
+	CGib *pGib = GetClassPtr( (CGib *)NULL );
+	pGib->Spawn( "models/hgibs.mdl" );
+	pGib->m_bloodColor = BLOOD_COLOR_RED;
+
+	if ( pev->body <= 1 )
+	{
+		ALERT ( at_aiconsole, "GibShooter Body is <= 1!\n" );
+	}
+
+	pGib->pev->body = RANDOM_LONG ( 1, pev->body - 1 );// avoid throwing random amounts of the 0th gib. (skull).
+
+	return pGib;
+}
+
+
+void CGibShooter :: ShootThink ( void )
+{
+	pev->nextthink = gpGlobals->time + m_flDelay;
+
+	Vector vecShootDir;
+
+	vecShootDir = pev->movedir;
+
+	vecShootDir = vecShootDir + gpGlobals->v_right * RANDOM_FLOAT( -1, 1) * m_flVariance;;
+	vecShootDir = vecShootDir + gpGlobals->v_forward * RANDOM_FLOAT( -1, 1) * m_flVariance;;
+	vecShootDir = vecShootDir + gpGlobals->v_up * RANDOM_FLOAT( -1, 1) * m_flVariance;;
+
+	vecShootDir = vecShootDir.Normalize();
+	CGib *pGib = CreateGib();
+	
+	if ( pGib )
+	{
+		pGib->pev->origin = pev->origin;
+		pGib->pev->velocity = vecShootDir * m_flGibVelocity;
+	
+		pGib->pev->avelocity.x = RANDOM_FLOAT ( 100, 200 );
+		pGib->pev->avelocity.y = RANDOM_FLOAT ( 100, 300 );
+
+		float thinkTime = pGib->pev->nextthink - gpGlobals->time;
+
+		pGib->m_lifeTime = (m_flGibLife * RANDOM_FLOAT( 0.95, 1.05 ));	// +/- 5%
+		if ( pGib->m_lifeTime < thinkTime )
+		{
+			pGib->pev->nextthink = gpGlobals->time + pGib->m_lifeTime;
+			pGib->m_lifeTime = 0;
+		}
+		
+	}
+
+	if ( --m_iGibs <= 0 )
+	{
+		if ( pev->spawnflags & SF_GIBSHOOTER_REPEATABLE )
+		{
+			m_iGibs = m_iGibCapacity;
+			SetThink ( NULL );
+			pev->nextthink = gpGlobals->time;
+		}
+		else
+		{
+			SetThink ( &CGibShooter::SUB_Remove );
+			pev->nextthink = gpGlobals->time;
+		}
+	}
+}
+
+
+class CEnvShooter : public CGibShooter
+{
+	void		Precache( void );
+	void		KeyValue( KeyValueData *pkvd );
+
+	CGib		*CreateGib( void );
+};
+
+LINK_ENTITY_TO_CLASS( env_shooter, CEnvShooter );
+
+void CEnvShooter :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "shootmodel"))
+	{
+		pev->model = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "shootsounds"))
+	{
+		int iNoise = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+		switch( iNoise )
+		{
+		case 0:
+			m_iGibMaterial = matGlass;
+			break;
+		case 1:
+			m_iGibMaterial = matWood;
+			break;
+		case 2:
+			m_iGibMaterial = matMetal;
+			break;
+		case 3:
+			m_iGibMaterial = matFlesh;
+			break;
+		case 4:
+			m_iGibMaterial = matRocks;
+			break;
+		
+		default:
+		case -1:
+			m_iGibMaterial = matNone;
+			break;
+		}
+	}
+	else
+	{
+		CGibShooter::KeyValue( pkvd );
+	}
+}
+
+
+void CEnvShooter :: Precache ( void )
+{
+	m_iGibModelIndex = PRECACHE_MODEL( (char *)STRING(pev->model) );
+	CBreakable::MaterialSoundPrecache( (Materials)m_iGibMaterial );
+}
+
+
+CGib *CEnvShooter :: CreateGib ( void )
+{
+	CGib *pGib = GetClassPtr( (CGib *)NULL );
+
+	pGib->Spawn( STRING(pev->model) );
+	
+	int bodyPart = 0;
+
+	if ( pev->body > 1 )
+		bodyPart = RANDOM_LONG( 0, pev->body-1 );
+
+	pGib->pev->body = bodyPart;
+	pGib->m_bloodColor = DONT_BLEED;
+	pGib->m_material = m_iGibMaterial;
+
+	pGib->pev->rendermode = pev->rendermode;
+	pGib->pev->renderamt = pev->renderamt;
+	pGib->pev->rendercolor = pev->rendercolor;
+	pGib->pev->renderfx = pev->renderfx;
+	pGib->pev->scale = pev->scale;
+	pGib->pev->skin = pev->skin;
+
+	return pGib;
+}
+
+
+
+
+class CTestEffect : public CBaseDelay
+{
+public:
+	void	Spawn( void );
+	void	Precache( void );
+	// void	KeyValue( KeyValueData *pkvd );
+	void EXPORT TestThink( void );
+	void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+	int		m_iLoop;
+	int		m_iBeam;
+	CBeam	*m_pBeam[24];
+	float	m_flBeamTime[24];
+	float	m_flStartTime;
+};
+
+
+LINK_ENTITY_TO_CLASS( test_effect, CTestEffect );
+
+void CTestEffect::Spawn( void )
+{
+	Precache( );
+}
+
+void CTestEffect::Precache( void )
+{
+	PRECACHE_MODEL( "sprites/lgtning.spr" );
+}
+
+void CTestEffect::TestThink( void )
+{
+	int i;
+	float t = (gpGlobals->time - m_flStartTime);
+
+	if (m_iBeam < 24)
+	{
+		CBeam *pbeam = CBeam::BeamCreate( "sprites/lgtning.spr", 100 );
+
+		TraceResult		tr;
+
+		Vector vecSrc = pev->origin;
+		Vector vecDir = Vector( RANDOM_FLOAT( -1.0, 1.0 ), RANDOM_FLOAT( -1.0, 1.0 ),RANDOM_FLOAT( -1.0, 1.0 ) );
+		vecDir = vecDir.Normalize();
+		UTIL_TraceLine( vecSrc, vecSrc + vecDir * 128, ignore_monsters, ENT(pev), &tr);
+
+		pbeam->PointsInit( vecSrc, tr.vecEndPos );
+		// pbeam->SetColor( 80, 100, 255 );
+		pbeam->SetColor( 255, 180, 100 );
+		pbeam->SetWidth( 100 );
+		pbeam->SetScrollRate( 12 );
+		
+		m_flBeamTime[m_iBeam] = gpGlobals->time;
+		m_pBeam[m_iBeam] = pbeam;
+		m_iBeam++;
+
+#if 0
+		Vector vecMid = (vecSrc + tr.vecEndPos) * 0.5;
+		MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+			WRITE_BYTE(TE_DLIGHT);
+			WRITE_COORD(vecMid.x);	// X
+			WRITE_COORD(vecMid.y);	// Y
+			WRITE_COORD(vecMid.z);	// Z
+			WRITE_BYTE( 20 );		// radius * 0.1
+			WRITE_BYTE( 255 );		// r
+			WRITE_BYTE( 180 );		// g
+			WRITE_BYTE( 100 );		// b
+			WRITE_BYTE( 20 );		// time * 10
+			WRITE_BYTE( 0 );		// decay * 0.1
+		MESSAGE_END( );
+#endif
+	}
+
+	if (t < 3.0)
+	{
+		for (i = 0; i < m_iBeam; i++)
+		{
+			t = (gpGlobals->time - m_flBeamTime[i]) / ( 3 + m_flStartTime - m_flBeamTime[i]);
+			m_pBeam[i]->SetBrightness( 255 * t );
+			// m_pBeam[i]->SetScrollRate( 20 * t );
+		}
+		pev->nextthink = gpGlobals->time + 0.1;
+	}
+	else
+	{
+		for (i = 0; i < m_iBeam; i++)
+		{
+			UTIL_Remove( m_pBeam[i] );
+		}
+		m_flStartTime = gpGlobals->time;
+		m_iBeam = 0;
+		// pev->nextthink = gpGlobals->time;
+		SetThink( NULL );
+	}
+}
+
+
+void CTestEffect::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	SetThink( &CTestEffect::TestThink );
+	pev->nextthink = gpGlobals->time + 0.1;
+	m_flStartTime = gpGlobals->time;
+}
+
+
+
+// Blood effects
+class CBlood : public CPointEntity
+{
+public:
+	void	Spawn( void );
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void	KeyValue( KeyValueData *pkvd );
+
+	inline	int		Color( void ) { return pev->impulse; }
+	inline	float 	BloodAmount( void ) { return pev->dmg; }
+
+	inline	void SetColor( int color ) { pev->impulse = color; }
+	inline	void SetBloodAmount( float amount ) { pev->dmg = amount; }
+	
+	Vector	Direction( void );
+	Vector	BloodPosition( CBaseEntity *pActivator );
+
+private:
+};
+
+LINK_ENTITY_TO_CLASS( env_blood, CBlood );
+
+
+
+#define SF_BLOOD_RANDOM		0x0001
+#define SF_BLOOD_STREAM		0x0002
+#define SF_BLOOD_PLAYER		0x0004
+#define SF_BLOOD_DECAL		0x0008
+
+void CBlood::Spawn( void )
+{
+	pev->solid			= SOLID_NOT;
+	pev->movetype		= MOVETYPE_NONE;
+	pev->effects		= 0;
+	pev->frame			= 0;
+	SetMovedir( pev );
+}
+
+
+void CBlood::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "color"))
+	{
+		int color = atoi(pkvd->szValue);
+		switch( color )
+		{
+		case 1:
+			SetColor( BLOOD_COLOR_YELLOW );
+			break;
+		default:
+			SetColor( BLOOD_COLOR_RED );
+			break;
+		}
+
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "amount"))
+	{
+		SetBloodAmount( atof(pkvd->szValue) );
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CPointEntity::KeyValue( pkvd );
+}
+
+
+Vector CBlood::Direction( void )
+{
+	if ( pev->spawnflags & SF_BLOOD_RANDOM )
+		return UTIL_RandomBloodVector();
+	
+	return pev->movedir;
+}
+
+
+Vector CBlood::BloodPosition( CBaseEntity *pActivator )
+{
+	if ( pev->spawnflags & SF_BLOOD_PLAYER )
+	{
+		edict_t *pPlayer;
+
+		if ( pActivator && pActivator->IsPlayer() )
+		{
+			pPlayer = pActivator->edict();
+		}
+		else
+			pPlayer = g_engfuncs.pfnPEntityOfEntIndex( 1 );
+		if ( pPlayer )
+			return (pPlayer->v.origin + pPlayer->v.view_ofs) + Vector( RANDOM_FLOAT(-10,10), RANDOM_FLOAT(-10,10), RANDOM_FLOAT(-10,10) );
+	}
+
+	return pev->origin;
+}
+
+
+void CBlood::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( pev->spawnflags & SF_BLOOD_STREAM )
+		UTIL_BloodStream( BloodPosition(pActivator), Direction(), (Color() == BLOOD_COLOR_RED) ? 70 : Color(), BloodAmount() );
+	else
+		UTIL_BloodDrips( BloodPosition(pActivator), Direction(), Color(), BloodAmount() );
+
+	if ( pev->spawnflags & SF_BLOOD_DECAL )
+	{
+		Vector forward = Direction();
+		Vector start = BloodPosition( pActivator );
+		TraceResult tr;
+
+		UTIL_TraceLine( start, start + forward * BloodAmount() * 2, ignore_monsters, NULL, &tr );
+		if ( tr.flFraction != 1.0 )
+			UTIL_BloodDecalTrace( &tr, Color() );
+	}
+}
+
+
+
+// Screen shake
+class CShake : public CPointEntity
+{
+public:
+	void	Spawn( void );
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void	KeyValue( KeyValueData *pkvd );
+
+	inline	float	Amplitude( void ) { return pev->scale; }
+	inline	float	Frequency( void ) { return pev->dmg_save; }
+	inline	float	Duration( void ) { return pev->dmg_take; }
+	inline	float	Radius( void ) { return pev->dmg; }
+
+	inline	void	SetAmplitude( float amplitude ) { pev->scale = amplitude; }
+	inline	void	SetFrequency( float frequency ) { pev->dmg_save = frequency; }
+	inline	void	SetDuration( float duration ) { pev->dmg_take = duration; }
+	inline	void	SetRadius( float radius ) { pev->dmg = radius; }
+private:
+};
+
+LINK_ENTITY_TO_CLASS( env_shake, CShake );
+
+// pev->scale is amplitude
+// pev->dmg_save is frequency
+// pev->dmg_take is duration
+// pev->dmg is radius
+// radius of 0 means all players
+// NOTE: UTIL_ScreenShake() will only shake players who are on the ground
+
+#define SF_SHAKE_EVERYONE	0x0001		// Don't check radius
+// UNDONE: These don't work yet
+#define SF_SHAKE_DISRUPT	0x0002		// Disrupt controls
+#define SF_SHAKE_INAIR		0x0004		// Shake players in air
+
+void CShake::Spawn( void )
+{
+	pev->solid			= SOLID_NOT;
+	pev->movetype		= MOVETYPE_NONE;
+	pev->effects		= 0;
+	pev->frame			= 0;
+	
+	if ( pev->spawnflags & SF_SHAKE_EVERYONE )
+		pev->dmg = 0;
+}
+
+
+void CShake::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "amplitude"))
+	{
+		SetAmplitude( atof(pkvd->szValue) );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "frequency"))
+	{
+		SetFrequency( atof(pkvd->szValue) );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "duration"))
+	{
+		SetDuration( atof(pkvd->szValue) );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "radius"))
+	{
+		SetRadius( atof(pkvd->szValue) );
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CPointEntity::KeyValue( pkvd );
+}
+
+
+void CShake::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	UTIL_ScreenShake( pev->origin, Amplitude(), Frequency(), Duration(), Radius() );
+}
+
+
+class CFade : public CPointEntity
+{
+public:
+	void	Spawn( void );
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void	KeyValue( KeyValueData *pkvd );
+
+	inline	float	Duration( void ) { return pev->dmg_take; }
+	inline	float	HoldTime( void ) { return pev->dmg_save; }
+
+	inline	void	SetDuration( float duration ) { pev->dmg_take = duration; }
+	inline	void	SetHoldTime( float hold ) { pev->dmg_save = hold; }
+private:
+};
+
+LINK_ENTITY_TO_CLASS( env_fade, CFade );
+
+// pev->dmg_take is duration
+// pev->dmg_save is hold duration
+#define SF_FADE_IN				0x0001		// Fade in, not out
+#define SF_FADE_MODULATE		0x0002		// Modulate, don't blend
+#define SF_FADE_ONLYONE			0x0004
+
+void CFade::Spawn( void )
+{
+	pev->solid			= SOLID_NOT;
+	pev->movetype		= MOVETYPE_NONE;
+	pev->effects		= 0;
+	pev->frame			= 0;
+}
+
+
+void CFade::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "duration"))
+	{
+		SetDuration( atof(pkvd->szValue) );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "holdtime"))
+	{
+		SetHoldTime( atof(pkvd->szValue) );
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CPointEntity::KeyValue( pkvd );
+}
+
+
+void CFade::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	int fadeFlags = 0;
+	
+	if ( !(pev->spawnflags & SF_FADE_IN) )
+		fadeFlags |= FFADE_OUT;
+
+	if ( pev->spawnflags & SF_FADE_MODULATE )
+		fadeFlags |= FFADE_MODULATE;
+
+	if ( pev->spawnflags & SF_FADE_ONLYONE )
+	{
+		if ( pActivator->IsNetClient() )
+		{
+			UTIL_ScreenFade( pActivator, pev->rendercolor, Duration(), HoldTime(), pev->renderamt, fadeFlags );
+		}
+	}
+	else
+	{
+		UTIL_ScreenFadeAll( pev->rendercolor, Duration(), HoldTime(), pev->renderamt, fadeFlags );
+	}
+	SUB_UseTargets( this, USE_TOGGLE, 0 );
+}
+
+
+class CMessage : public CPointEntity
+{
+public:
+	void	Spawn( void );
+	void	Precache( void );
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void	KeyValue( KeyValueData *pkvd );
+private:
+};
+
+LINK_ENTITY_TO_CLASS( env_message, CMessage );
+
+
+void CMessage::Spawn( void )
+{
+	Precache();
+
+	pev->solid			= SOLID_NOT;
+	pev->movetype		= MOVETYPE_NONE;
+
+	switch( pev->impulse )
+	{
+	case 1: // Medium radius
+		pev->speed = ATTN_STATIC;
+		break;
+	
+	case 2:	// Large radius
+		pev->speed = ATTN_NORM;
+		break;
+
+	case 3:	//EVERYWHERE
+		pev->speed = ATTN_NONE;
+		break;
+	
+	default:
+	case 0: // Small radius
+		pev->speed = ATTN_IDLE;
+		break;
+	}
+	pev->impulse = 0;
+
+	// No volume, use normal
+	if ( pev->scale <= 0 )
+		pev->scale = 1.0;
+}
+
+
+void CMessage::Precache( void )
+{
+	if ( pev->noise )
+		PRECACHE_SOUND( (char *)STRING(pev->noise) );
+}
+
+void CMessage::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "messagesound"))
+	{
+		pev->noise = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "messagevolume"))
+	{
+		pev->scale = atof(pkvd->szValue) * 0.1;
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "messageattenuation"))
+	{
+		pev->impulse = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CPointEntity::KeyValue( pkvd );
+}
+
+
+void CMessage::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	CBaseEntity *pPlayer = NULL;
+
+	if ( pev->spawnflags & SF_MESSAGE_ALL )
+		UTIL_ShowMessageAll( STRING(pev->message) );
+	else
+	{
+		if ( pActivator && pActivator->IsPlayer() )
+			pPlayer = pActivator;
+		else
+		{
+			pPlayer = CBaseEntity::Instance( g_engfuncs.pfnPEntityOfEntIndex( 1 ) );
+		}
+		if ( pPlayer )
+			UTIL_ShowMessage( STRING(pev->message), pPlayer );
+	}
+	if ( pev->noise )
+	{
+		EMIT_SOUND( edict(), CHAN_BODY, STRING(pev->noise), pev->scale, pev->speed );
+	}
+	if ( pev->spawnflags & SF_MESSAGE_ONCE )
+		UTIL_Remove( this );
+
+	SUB_UseTargets( this, USE_TOGGLE, 0 );
+}
+
+
+
+//=========================================================
+// FunnelEffect
+//=========================================================
+class CEnvFunnel : public CBaseDelay
+{
+public:
+	void	Spawn( void );
+	void	Precache( void );
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+	int		m_iSprite;	// Don't save, precache
+};
+
+void CEnvFunnel :: Precache ( void )
+{
+	m_iSprite = PRECACHE_MODEL ( "sprites/flare6.spr" );
+}
+
+LINK_ENTITY_TO_CLASS( env_funnel, CEnvFunnel );
+
+void CEnvFunnel::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+		WRITE_BYTE( TE_LARGEFUNNEL );
+		WRITE_COORD( pev->origin.x );
+		WRITE_COORD( pev->origin.y );
+		WRITE_COORD( pev->origin.z );
+		WRITE_SHORT( m_iSprite );
+
+		if ( pev->spawnflags & SF_FUNNEL_REVERSE )// funnel flows in reverse?
+		{
+			WRITE_SHORT( 1 );
+		}
+		else
+		{
+			WRITE_SHORT( 0 );
+		}
+
+
+	MESSAGE_END();
+
+	SetThink( &CEnvFunnel::SUB_Remove );
+	pev->nextthink = gpGlobals->time;
+}
+
+void CEnvFunnel::Spawn( void )
+{
+	Precache();
+	pev->solid = SOLID_NOT;
+	pev->effects = EF_NODRAW;
+}
+
+//=========================================================
+// Beverage Dispenser
+// overloaded pev->frags, is now a flag for whether or not a can is stuck in the dispenser. 
+// overloaded pev->health, is now how many cans remain in the machine.
+//=========================================================
+class CEnvBeverage : public CBaseDelay
+{
+public:
+	void	Spawn( void );
+	void	Precache( void );
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+};
+
+void CEnvBeverage :: Precache ( void )
+{
+	PRECACHE_MODEL( "models/can.mdl" );
+	PRECACHE_SOUND( "weapons/g_bounce3.wav" );
+}
+
+LINK_ENTITY_TO_CLASS( env_beverage, CEnvBeverage );
+
+void CEnvBeverage::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( pev->frags != 0 || pev->health <= 0 )
+	{
+		// no more cans while one is waiting in the dispenser, or if I'm out of cans.
+		return;
+	}
+
+	CBaseEntity *pCan = CBaseEntity::Create( "item_sodacan", pev->origin, pev->angles, edict() );	
+
+	if ( pev->skin == 6 )
+	{
+		// random
+		pCan->pev->skin = RANDOM_LONG( 0, 5 );
+	}
+	else
+	{
+		pCan->pev->skin = pev->skin;
+	}
+
+	pev->frags = 1;
+	pev->health--;
+
+	//SetThink (SUB_Remove);
+	//pev->nextthink = gpGlobals->time;
+}
+
+void CEnvBeverage::Spawn( void )
+{
+	Precache();
+	pev->solid = SOLID_NOT;
+	pev->effects = EF_NODRAW;
+	pev->frags = 0;
+
+	if ( pev->health == 0 )
+	{
+		pev->health = 10;
+	}
+}
+
+//=========================================================
+// Soda can
+//=========================================================
+class CItemSoda : public CBaseEntity
+{
+public:
+	void	Spawn( void );
+	void	Precache( void );
+	void	EXPORT CanThink ( void );
+	void	EXPORT CanTouch ( CBaseEntity *pOther );
+};
+
+void CItemSoda :: Precache ( void )
+{
+}
+
+LINK_ENTITY_TO_CLASS( item_sodacan, CItemSoda );
+
+void CItemSoda::Spawn( void )
+{
+	Precache();
+	pev->solid = SOLID_NOT;
+	pev->movetype = MOVETYPE_TOSS;
+
+	SET_MODEL ( ENT(pev), "models/can.mdl" );
+	UTIL_SetSize ( pev, Vector ( 0, 0, 0 ), Vector ( 0, 0, 0 ) );
+	
+	SetThink (&CItemSoda::CanThink);
+	pev->nextthink = gpGlobals->time + 0.5;
+}
+
+void CItemSoda::CanThink ( void )
+{
+	EMIT_SOUND (ENT(pev), CHAN_WEAPON, "weapons/g_bounce3.wav", 1, ATTN_NORM );
+
+	pev->solid = SOLID_TRIGGER;
+	UTIL_SetSize ( pev, Vector ( -8, -8, 0 ), Vector ( 8, 8, 8 ) );
+	SetThink ( NULL );
+	SetTouch ( &CItemSoda::CanTouch );
+}
+
+void CItemSoda::CanTouch ( CBaseEntity *pOther )
+{
+	if ( !pOther->IsPlayer() )
+	{
+		return;
+	}
+
+	// spoit sound here
+
+	pOther->TakeHealth( 1, DMG_GENERIC );// a bit of health.
+
+	if ( !FNullEnt( pev->owner ) )
+	{
+		// tell the machine the can was taken
+		pev->owner->v.frags = 0;
+	}
+
+	pev->solid = SOLID_NOT;
+	pev->movetype = MOVETYPE_NONE;
+	pev->effects = EF_NODRAW;
+	SetTouch ( NULL );
+	SetThink ( &CItemSoda::SUB_Remove );
+	pev->nextthink = gpGlobals->time;
+}
diff --git a/main/source/dlls/effects.h b/main/source/dlls/effects.h
new file mode 100644
index 00000000..99104234
--- /dev/null
+++ b/main/source/dlls/effects.h
@@ -0,0 +1,209 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef EFFECTS_H
+#define EFFECTS_H
+
+#define SF_BEAM_STARTON			0x0001
+#define SF_BEAM_TOGGLE			0x0002
+#define SF_BEAM_RANDOM			0x0004
+#define SF_BEAM_RING			0x0008
+#define SF_BEAM_SPARKSTART		0x0010
+#define SF_BEAM_SPARKEND		0x0020
+#define SF_BEAM_DECALS			0x0040
+#define SF_BEAM_SHADEIN			0x0080
+#define SF_BEAM_SHADEOUT		0x0100
+#define SF_BEAM_TEMPORARY		0x8000
+
+#define SF_SPRITE_STARTON		0x0001
+#define SF_SPRITE_ONCE			0x0002
+#define SF_SPRITE_TEMPORARY		0x8000
+
+class CSprite : public CPointEntity
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+
+	int		ObjectCaps( void )
+	{ 
+		int flags = 0;
+		if ( pev->spawnflags & SF_SPRITE_TEMPORARY )
+			flags = FCAP_DONT_SAVE;
+		return (CBaseEntity :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION) | flags; 
+	}
+	void EXPORT AnimateThink( void );
+	void EXPORT ExpandThink( void );
+	void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void Animate( float frames );
+	void Expand( float scaleSpeed, float fadeSpeed );
+	void SpriteInit( const char *pSpriteName, const Vector &origin );
+
+	inline void SetAttachment( edict_t *pEntity, int attachment )
+	{
+		if ( pEntity )
+		{
+			pev->skin = ENTINDEX(pEntity);
+			pev->body = attachment;
+			pev->aiment = pEntity;
+			pev->movetype = MOVETYPE_FOLLOW;
+		}
+	}
+	void TurnOff( void );
+	void TurnOn( void );
+	inline float Frames( void ) { return m_maxFrame; }
+	inline void SetTransparency( int rendermode, int r, int g, int b, int a, int fx )
+	{
+		pev->rendermode = rendermode;
+		pev->rendercolor.x = r;
+		pev->rendercolor.y = g;
+		pev->rendercolor.z = b;
+		pev->renderamt = a;
+		pev->renderfx = fx;
+	}
+	inline void SetTexture( int spriteIndex ) { pev->modelindex = spriteIndex; }
+	inline void SetScale( float scale ) { pev->scale = scale; }
+	inline void SetColor( int r, int g, int b ) { pev->rendercolor.x = r; pev->rendercolor.y = g; pev->rendercolor.z = b; }
+	inline void SetBrightness( int brightness ) { pev->renderamt = brightness; }
+
+	inline void AnimateAndDie( float framerate ) 
+	{ 
+		SetThink(&CSprite::AnimateUntilDead); 
+		pev->framerate = framerate;
+		pev->dmgtime = gpGlobals->time + (m_maxFrame / framerate); 
+		pev->nextthink = gpGlobals->time; 
+	}
+
+	void EXPORT AnimateUntilDead( void );
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+	static CSprite *SpriteCreate( const char *pSpriteName, const Vector &origin, BOOL animate );
+
+private:
+
+	float		m_lastTime;
+	float		m_maxFrame;
+};
+
+
+class CBeam : public CBaseEntity
+{
+public:
+	void	Spawn( void );
+	void	Precache( void );
+	int		ObjectCaps( void )
+	{ 
+		int flags = 0;
+		if ( pev->spawnflags & SF_BEAM_TEMPORARY )
+			flags = FCAP_DONT_SAVE;
+		return (CBaseEntity :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION) | flags; 
+	}
+
+	void EXPORT TriggerTouch( CBaseEntity *pOther );
+
+	// These functions are here to show the way beams are encoded as entities.
+	// Encoding beams as entities simplifies their management in the client/server architecture
+	inline void	SetType( int type ) { pev->rendermode = (pev->rendermode & 0xF0) | (type&0x0F); }
+	inline void	SetFlags( int flags ) { pev->rendermode = (pev->rendermode & 0x0F) | (flags&0xF0); }
+	inline void SetStartPos( const Vector& pos ) { pev->origin = pos; }
+	inline void SetEndPos( const Vector& pos ) { pev->angles = pos; }
+	void SetStartEntity( int entityIndex );
+	void SetEndEntity( int entityIndex );
+
+	inline void SetStartAttachment( int attachment ) { pev->sequence = (pev->sequence & 0x0FFF) | ((attachment&0xF)<<12); }
+	inline void SetEndAttachment( int attachment ) { pev->skin = (pev->skin & 0x0FFF) | ((attachment&0xF)<<12); }
+
+	inline void SetTexture( int spriteIndex ) { pev->modelindex = spriteIndex; }
+	inline void SetWidth( int width ) { pev->scale = width; }
+	inline void SetNoise( int amplitude ) { pev->body = amplitude; }
+	inline void SetColor( int r, int g, int b ) { pev->rendercolor.x = r; pev->rendercolor.y = g; pev->rendercolor.z = b; }
+	inline void SetBrightness( int brightness ) { pev->renderamt = brightness; }
+	inline void SetFrame( float frame ) { pev->frame = frame; }
+	inline void SetScrollRate( int speed ) { pev->animtime = speed; }
+
+	inline int	GetType( void ) { return pev->rendermode & 0x0F; }
+	inline int	GetFlags( void ) { return pev->rendermode & 0xF0; }
+	inline int	GetStartEntity( void ) { return pev->sequence & 0xFFF; }
+	inline int	GetEndEntity( void ) { return pev->skin & 0xFFF; }
+
+	const Vector &GetStartPos( void );
+	const Vector &GetEndPos( void );
+
+	Vector Center( void ) { return (GetStartPos() + GetEndPos()) * 0.5; }; // center point of beam
+
+	inline int  GetTexture( void ) { return pev->modelindex; }
+	inline int  GetWidth( void ) { return pev->scale; }
+	inline int  GetNoise( void ) { return pev->body; }
+	// inline void GetColor( int r, int g, int b ) { pev->rendercolor.x = r; pev->rendercolor.y = g; pev->rendercolor.z = b; }
+	inline int  GetBrightness( void ) { return pev->renderamt; }
+	inline int  GetFrame( void ) { return pev->frame; }
+	inline int  GetScrollRate( void ) { return pev->animtime; }
+
+	// Call after you change start/end positions
+	void		RelinkBeam( void );
+//	void		SetObjectCollisionBox( void );
+
+	void		DoSparks( const Vector &start, const Vector &end );
+	CBaseEntity *RandomTargetname( const char *szName );
+	void		BeamDamage( TraceResult *ptr );
+	// Init after BeamCreate()
+	void		BeamInit( const char *pSpriteName, int width );
+	void		PointsInit( const Vector &start, const Vector &end );
+	void		PointEntInit( const Vector &start, int endIndex );
+	void		EntsInit( int startIndex, int endIndex );
+	void		HoseInit( const Vector &start, const Vector &direction );
+
+	static CBeam *BeamCreate( const char *pSpriteName, int width );
+
+	inline void LiveForTime( float time ) { SetThink(&CBeam::SUB_Remove); pev->nextthink = gpGlobals->time + time; }
+	inline void	BeamDamageInstant( TraceResult *ptr, float damage ) 
+	{ 
+		pev->dmg = damage; 
+		pev->dmgtime = gpGlobals->time - 1;
+		BeamDamage(ptr); 
+	}
+};
+
+
+#define SF_MESSAGE_ONCE			0x0001		// Fade in, not out
+#define SF_MESSAGE_ALL			0x0002		// Send to all clients
+
+
+class CLaser : public CBeam
+{
+public:
+	void	Spawn( void );
+	void	Precache( void );
+	void	KeyValue( KeyValueData *pkvd );
+
+	void	TurnOn( void );
+	void	TurnOff( void );
+	int		IsOn( void );
+
+	void	FireAtPoint( TraceResult &point );
+
+	void	EXPORT StrikeThink( void );
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	CSprite	*m_pSprite;
+	int		m_iszSpriteName;
+	Vector  m_firePosition;
+};
+
+#endif		//EFFECTS_H
diff --git a/main/source/dlls/egon.cpp b/main/source/dlls/egon.cpp
new file mode 100644
index 00000000..24244e25
--- /dev/null
+++ b/main/source/dlls/egon.cpp
@@ -0,0 +1,568 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD )
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "player.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "effects.h"
+#include "customentity.h"
+#include "gamerules.h"
+
+#define	EGON_PRIMARY_VOLUME		450
+#define EGON_BEAM_SPRITE		"sprites/xbeam1.spr"
+#define EGON_FLARE_SPRITE		"sprites/XSpark1.spr"
+#define EGON_SOUND_OFF			"weapons/egon_off1.wav"
+#define EGON_SOUND_RUN			"weapons/egon_run3.wav"
+#define EGON_SOUND_STARTUP		"weapons/egon_windup2.wav"
+
+#define EGON_SWITCH_NARROW_TIME			0.75			// Time it takes to switch fire modes
+#define EGON_SWITCH_WIDE_TIME			1.5
+
+enum egon_e {
+	EGON_IDLE1 = 0,
+	EGON_FIDGET1,
+	EGON_ALTFIREON,
+	EGON_ALTFIRECYCLE,
+	EGON_ALTFIREOFF,
+	EGON_FIRE1,
+	EGON_FIRE2,
+	EGON_FIRE3,
+	EGON_FIRE4,
+	EGON_DRAW,
+	EGON_HOLSTER
+};
+
+LINK_ENTITY_TO_CLASS( weapon_egon, CEgon );
+
+void CEgon::Spawn( )
+{
+	Precache( );
+	m_iId = WEAPON_EGON;
+	SET_MODEL(ENT(pev), "models/w_egon.mdl");
+
+	m_iDefaultAmmo = EGON_DEFAULT_GIVE;
+
+	FallInit();// get ready to fall down.
+}
+
+
+void CEgon::Precache( void )
+{
+	PRECACHE_MODEL("models/w_egon.mdl");
+	PRECACHE_MODEL("models/v_egon.mdl");
+	PRECACHE_MODEL("models/p_egon.mdl");
+
+	PRECACHE_MODEL("models/w_9mmclip.mdl");
+	PRECACHE_SOUND("items/9mmclip1.wav");
+
+	PRECACHE_SOUND( EGON_SOUND_OFF );
+	PRECACHE_SOUND( EGON_SOUND_RUN );
+	PRECACHE_SOUND( EGON_SOUND_STARTUP );
+
+	PRECACHE_MODEL( EGON_BEAM_SPRITE );
+	PRECACHE_MODEL( EGON_FLARE_SPRITE );
+
+	PRECACHE_SOUND ("weapons/357_cock1.wav");
+
+	m_usEgonFire = PRECACHE_EVENT ( 1, "events/egon_fire.sc" );
+	m_usEgonStop = PRECACHE_EVENT ( 1, "events/egon_stop.sc" );
+}
+
+
+BOOL CEgon::Deploy( void )
+{
+	m_deployed = FALSE;
+	m_fireState = FIRE_OFF;
+	return DefaultDeploy( "models/v_egon.mdl", "models/p_egon.mdl", EGON_DRAW, "egon" );
+}
+
+int CEgon::AddToPlayer( CBasePlayer *pPlayer )
+{
+	if ( CBasePlayerWeapon::AddToPlayer( pPlayer ) )
+	{
+		MESSAGE_BEGIN( MSG_ONE, gmsgWeapPickup, NULL, pPlayer->pev );
+			WRITE_BYTE( m_iId );
+		MESSAGE_END();
+		return TRUE;
+	}
+	return FALSE;
+}
+
+
+
+void CEgon::Holster( int skiplocal /* = 0 */ )
+{
+	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 0.5;
+	SendWeaponAnim( EGON_HOLSTER );
+
+    EndAttack();
+}
+
+int CEgon::GetItemInfo(ItemInfo *p)
+{
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = "uranium";
+	p->iMaxAmmo1 = URANIUM_MAX_CARRY;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = -1;
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iSlot = 3;
+	p->iPosition = 2;
+	p->iId = m_iId = WEAPON_EGON;
+	p->iFlags = 0;
+	p->iWeight = EGON_WEIGHT;
+
+	return 1;
+}
+
+#define EGON_PULSE_INTERVAL			0.1
+#define EGON_DISCHARGE_INTERVAL		0.1
+
+float CEgon::GetPulseInterval( void )
+{
+	return EGON_PULSE_INTERVAL;
+}
+
+float CEgon::GetDischargeInterval( void )
+{
+	return EGON_DISCHARGE_INTERVAL;
+}
+
+BOOL CEgon::HasAmmo( void )
+{
+	if ( m_pPlayer->ammo_uranium <= 0 )
+		return FALSE;
+
+	return TRUE;
+}
+
+void CEgon::UseAmmo( int count )
+{
+	if ( m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] >= count )
+		m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] -= count;
+	else
+		m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] = 0;
+}
+
+void CEgon::Attack( void )
+{
+	// don't fire underwater
+	if ( m_pPlayer->pev->waterlevel == 3 )
+	{
+		
+		if ( m_fireState != FIRE_OFF || m_pBeam )
+		{
+			EndAttack();
+		}
+		else
+		{
+			PlayEmptySound( );
+		}
+		return;
+	}
+
+	UTIL_MakeVectors( m_pPlayer->pev->v_angle + m_pPlayer->pev->punchangle );
+	Vector vecAiming = gpGlobals->v_forward;
+	Vector vecSrc	 = m_pPlayer->GetGunPosition( );
+
+	int flags;
+#if defined( CLIENT_WEAPONS )
+	flags = FEV_NOTHOST;
+#else
+	flags = 0;
+#endif
+
+	switch( m_fireState )
+	{
+		case FIRE_OFF:
+		{
+			if ( !HasAmmo() )
+			{
+				m_flNextPrimaryAttack = m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 0.25;
+				PlayEmptySound( );
+				return;
+			}
+
+			m_flAmmoUseTime = gpGlobals->time;// start using ammo ASAP.
+
+			PLAYBACK_EVENT_FULL( flags, m_pPlayer->edict(), m_usEgonFire, 0.0, (float *)&g_vecZero, (float *)&g_vecZero, 0.0, 0.0, m_fireState, m_fireMode, 1, 0 );
+						
+			m_shakeTime = 0;
+
+			m_pPlayer->m_iWeaponVolume = EGON_PRIMARY_VOLUME;
+			m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 0.1;
+			pev->fuser1	= UTIL_WeaponTimeBase() + 2;
+
+			pev->dmgtime = gpGlobals->time + GetPulseInterval();
+			m_fireState = FIRE_CHARGE;
+		}
+		break;
+
+		case FIRE_CHARGE:
+		{
+			Fire( vecSrc, vecAiming );
+			m_pPlayer->m_iWeaponVolume = EGON_PRIMARY_VOLUME;
+		
+			if ( pev->fuser1 <= UTIL_WeaponTimeBase() )
+			{
+				PLAYBACK_EVENT_FULL( flags, m_pPlayer->edict(), m_usEgonFire, 0, (float *)&g_vecZero, (float *)&g_vecZero, 0.0, 0.0, m_fireState, m_fireMode, 0, 0 );
+				pev->fuser1 = 1000;
+			}
+
+			if ( !HasAmmo() )
+			{
+				EndAttack();
+				m_flNextPrimaryAttack = m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 1.0;
+			}
+
+		}
+		break;
+	}
+}
+
+void CEgon::PrimaryAttack( void )
+{
+	m_fireMode = FIRE_WIDE;
+	Attack();
+
+}
+
+void CEgon::Fire( const Vector &vecOrigSrc, const Vector &vecDir )
+{
+	Vector vecDest = vecOrigSrc + vecDir * 2048;
+	edict_t		*pentIgnore;
+	TraceResult tr;
+
+	pentIgnore = m_pPlayer->edict();
+	Vector tmpSrc = vecOrigSrc + gpGlobals->v_up * -8 + gpGlobals->v_right * 3;
+
+	// ALERT( at_console, "." );
+	
+	UTIL_TraceLine( vecOrigSrc, vecDest, dont_ignore_monsters, pentIgnore, &tr );
+
+	if (tr.fAllSolid)
+		return;
+
+#ifndef CLIENT_DLL
+	CBaseEntity *pEntity = CBaseEntity::Instance(tr.pHit);
+
+	if (pEntity == NULL)
+		return;
+
+	if ( g_pGameRules->IsMultiplayer() )
+	{
+		if ( m_pSprite && pEntity->pev->takedamage )
+		{
+			m_pSprite->pev->effects &= ~EF_NODRAW;
+		}
+		else if ( m_pSprite )
+		{
+			m_pSprite->pev->effects |= EF_NODRAW;
+		}
+	}
+
+
+#endif
+
+	float timedist;
+
+	switch ( m_fireMode )
+	{
+	case FIRE_NARROW:
+#ifndef CLIENT_DLL
+		if ( pev->dmgtime < gpGlobals->time )
+		{
+			// Narrow mode only does damage to the entity it hits
+			ClearMultiDamage();
+			if (pEntity->pev->takedamage)
+			{
+				pEntity->TraceAttack( m_pPlayer->pev, gSkillData.plrDmgEgonNarrow, vecDir, &tr, DMG_ENERGYBEAM );
+			}
+			ApplyMultiDamage(m_pPlayer->pev, m_pPlayer->pev);
+
+			if ( g_pGameRules->IsMultiplayer() )
+			{
+				// multiplayer uses 1 ammo every 1/10th second
+				if ( gpGlobals->time >= m_flAmmoUseTime )
+				{
+					UseAmmo( 1 );
+					m_flAmmoUseTime = gpGlobals->time + 0.1;
+				}
+			}
+			else
+			{
+				// single player, use 3 ammo/second
+				if ( gpGlobals->time >= m_flAmmoUseTime )
+				{
+					UseAmmo( 1 );
+					m_flAmmoUseTime = gpGlobals->time + 0.166;
+				}
+			}
+
+			pev->dmgtime = gpGlobals->time + GetPulseInterval();
+		}
+#endif
+		timedist = ( pev->dmgtime - gpGlobals->time ) / GetPulseInterval();
+		break;
+	
+	case FIRE_WIDE:
+#ifndef CLIENT_DLL
+		if ( pev->dmgtime < gpGlobals->time )
+		{
+			// wide mode does damage to the ent, and radius damage
+			ClearMultiDamage();
+			if (pEntity->pev->takedamage)
+			{
+				pEntity->TraceAttack( m_pPlayer->pev, gSkillData.plrDmgEgonWide, vecDir, &tr, DMG_ENERGYBEAM | DMG_ALWAYSGIB);
+			}
+			ApplyMultiDamage(m_pPlayer->pev, m_pPlayer->pev);
+
+			if ( g_pGameRules->IsMultiplayer() )
+			{
+				// radius damage a little more potent in multiplayer.
+				::RadiusDamage( tr.vecEndPos, pev, m_pPlayer->pev, gSkillData.plrDmgEgonWide/4, 128, CLASS_NONE, DMG_ENERGYBEAM | DMG_BLAST | DMG_ALWAYSGIB );
+			}
+
+			if ( !m_pPlayer->IsAlive() )
+				return;
+
+			if ( g_pGameRules->IsMultiplayer() )
+			{
+				//multiplayer uses 5 ammo/second
+				if ( gpGlobals->time >= m_flAmmoUseTime )
+				{
+					UseAmmo( 1 );
+					m_flAmmoUseTime = gpGlobals->time + 0.2;
+				}
+			}
+			else
+			{
+				// Wide mode uses 10 charges per second in single player
+				if ( gpGlobals->time >= m_flAmmoUseTime )
+				{
+					UseAmmo( 1 );
+					m_flAmmoUseTime = gpGlobals->time + 0.1;
+				}
+			}
+
+			pev->dmgtime = gpGlobals->time + GetDischargeInterval();
+			if ( m_shakeTime < gpGlobals->time )
+			{
+				UTIL_ScreenShake( tr.vecEndPos, 5.0, 150.0, 0.75, 250.0 );
+				m_shakeTime = gpGlobals->time + 1.5;
+			}
+		}
+#endif
+		timedist = ( pev->dmgtime - gpGlobals->time ) / GetDischargeInterval();
+		break;
+	}
+
+	if ( timedist < 0 )
+		timedist = 0;
+	else if ( timedist > 1 )
+		timedist = 1;
+	timedist = 1-timedist;
+
+	UpdateEffect( tmpSrc, tr.vecEndPos, timedist );
+}
+
+
+void CEgon::UpdateEffect( const Vector &startPoint, const Vector &endPoint, float timeBlend )
+{
+#ifndef CLIENT_DLL
+	if ( !m_pBeam )
+	{
+		CreateEffect();
+	}
+
+	m_pBeam->SetStartPos( endPoint );
+	m_pBeam->SetBrightness( 255 - (timeBlend*180) );
+	m_pBeam->SetWidth( 40 - (timeBlend*20) );
+
+	if ( m_fireMode == FIRE_WIDE )
+		m_pBeam->SetColor( 30 + (25*timeBlend), 30 + (30*timeBlend), 64 + 80*fabs(sin(gpGlobals->time*10)) );
+	else
+		m_pBeam->SetColor( 60 + (25*timeBlend), 120 + (30*timeBlend), 64 + 80*fabs(sin(gpGlobals->time*10)) );
+
+
+	UTIL_SetOrigin( m_pSprite->pev, endPoint );
+	m_pSprite->pev->frame += 8 * gpGlobals->frametime;
+	if ( m_pSprite->pev->frame > m_pSprite->Frames() )
+		m_pSprite->pev->frame = 0;
+
+	m_pNoise->SetStartPos( endPoint );
+
+#endif
+
+}
+
+void CEgon::CreateEffect( void )
+{
+
+#ifndef CLIENT_DLL
+	DestroyEffect();
+
+	m_pBeam = CBeam::BeamCreate( EGON_BEAM_SPRITE, 40 );
+	m_pBeam->PointEntInit( pev->origin, m_pPlayer->entindex() );
+	m_pBeam->SetFlags( BEAM_FSINE );
+	m_pBeam->SetEndAttachment( 1 );
+	m_pBeam->pev->spawnflags |= SF_BEAM_TEMPORARY;	// Flag these to be destroyed on save/restore or level transition
+	m_pBeam->pev->flags |= FL_SKIPLOCALHOST;
+	m_pBeam->pev->owner = m_pPlayer->edict();
+
+	m_pNoise = CBeam::BeamCreate( EGON_BEAM_SPRITE, 55 );
+	m_pNoise->PointEntInit( pev->origin, m_pPlayer->entindex() );
+	m_pNoise->SetScrollRate( 25 );
+	m_pNoise->SetBrightness( 100 );
+	m_pNoise->SetEndAttachment( 1 );
+	m_pNoise->pev->spawnflags |= SF_BEAM_TEMPORARY;
+	m_pNoise->pev->flags |= FL_SKIPLOCALHOST;
+	m_pNoise->pev->owner = m_pPlayer->edict();
+
+	m_pSprite = CSprite::SpriteCreate( EGON_FLARE_SPRITE, pev->origin, FALSE );
+	m_pSprite->pev->scale = 1.0;
+	m_pSprite->SetTransparency( kRenderGlow, 255, 255, 255, 255, kRenderFxNoDissipation );
+	m_pSprite->pev->spawnflags |= SF_SPRITE_TEMPORARY;
+	m_pSprite->pev->flags |= FL_SKIPLOCALHOST;
+	m_pSprite->pev->owner = m_pPlayer->edict();
+
+	if ( m_fireMode == FIRE_WIDE )
+	{
+		m_pBeam->SetScrollRate( 50 );
+		m_pBeam->SetNoise( 20 );
+		m_pNoise->SetColor( 50, 50, 255 );
+		m_pNoise->SetNoise( 8 );
+	}
+	else
+	{
+		m_pBeam->SetScrollRate( 110 );
+		m_pBeam->SetNoise( 5 );
+		m_pNoise->SetColor( 80, 120, 255 );
+		m_pNoise->SetNoise( 2 );
+	}
+#endif
+
+}
+
+
+void CEgon::DestroyEffect( void )
+{
+
+#ifndef CLIENT_DLL
+	if ( m_pBeam )
+	{
+		UTIL_Remove( m_pBeam );
+		m_pBeam = NULL;
+	}
+	if ( m_pNoise )
+	{
+		UTIL_Remove( m_pNoise );
+		m_pNoise = NULL;
+	}
+	if ( m_pSprite )
+	{
+		if ( m_fireMode == FIRE_WIDE )
+			m_pSprite->Expand( 10, 500 );
+		else
+			UTIL_Remove( m_pSprite );
+		m_pSprite = NULL;
+	}
+#endif
+
+}
+
+
+
+void CEgon::WeaponIdle( void )
+{
+	ResetEmptySound( );
+
+	if ( m_flTimeWeaponIdle > gpGlobals->time )
+		return;
+
+	if ( m_fireState != FIRE_OFF )
+		 EndAttack();
+	
+	int iAnim;
+
+	float flRand = RANDOM_FLOAT(0,1);
+
+	if ( flRand <= 0.5 )
+	{
+		iAnim = EGON_IDLE1;
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
+	}
+	else 
+	{
+		iAnim = EGON_FIDGET1;
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 3;
+	}
+
+	SendWeaponAnim( iAnim );
+	m_deployed = TRUE;
+}
+
+
+
+void CEgon::EndAttack( void )
+{
+	bool bMakeNoise = false;
+		
+	if ( m_fireState != FIRE_OFF ) //Checking the button just in case!.
+		 bMakeNoise = true;
+
+	PLAYBACK_EVENT_FULL( FEV_GLOBAL | FEV_RELIABLE, m_pPlayer->edict(), m_usEgonStop, 0, (float *)&m_pPlayer->pev->origin, (float *)&m_pPlayer->pev->angles, 0.0, 0.0, bMakeNoise, 0, 0, 0 );
+
+	m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 2.0;
+	m_flNextPrimaryAttack = m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 0.5;
+
+	m_fireState = FIRE_OFF;
+
+	DestroyEffect();
+}
+
+
+
+class CEgonAmmo : public CBasePlayerAmmo
+{
+	void Spawn( void )
+	{ 
+		Precache( );
+		SET_MODEL(ENT(pev), "models/w_chainammo.mdl");
+		CBasePlayerAmmo::Spawn( );
+	}
+	void Precache( void )
+	{
+		PRECACHE_MODEL ("models/w_chainammo.mdl");
+		PRECACHE_SOUND("items/9mmclip1.wav");
+	}
+	BOOL AddAmmo( CBaseEntity *pOther ) 
+	{ 
+		if (pOther->GiveAmmo( AMMO_URANIUMBOX_GIVE, "uranium", URANIUM_MAX_CARRY ) != -1)
+		{
+			EMIT_SOUND(ENT(pev), CHAN_ITEM, "items/9mmclip1.wav", 1, ATTN_NORM);
+			return TRUE;
+		}
+		return FALSE;
+	}
+};
+LINK_ENTITY_TO_CLASS( ammo_egonclip, CEgonAmmo );
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/enginecallback.h b/main/source/dlls/enginecallback.h
new file mode 100644
index 00000000..b99b3409
--- /dev/null
+++ b/main/source/dlls/enginecallback.h
@@ -0,0 +1,188 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef ENGINECALLBACK_H
+#define ENGINECALLBACK_H
+
+#pragma once
+
+#include "build.h"
+#include "common/event_flags.h"
+
+// Must be provided by user of this code
+extern enginefuncs_t g_engfuncs;
+
+// The actual engine callbacks
+#define GETPLAYERUSERID (*g_engfuncs.pfnGetPlayerUserId)
+#define PRECACHE_MODEL	(*g_engfuncs.pfnPrecacheModel)
+#define PRECACHE_SOUND	(*g_engfuncs.pfnPrecacheSound)
+#define PRECACHE_GENERIC	(*g_engfuncs.pfnPrecacheGeneric)
+#define SET_MODEL		(*g_engfuncs.pfnSetModel)
+#define MODEL_INDEX		(*g_engfuncs.pfnModelIndex)
+#define MODEL_FRAMES	(*g_engfuncs.pfnModelFrames)
+#define SET_SIZE		(*g_engfuncs.pfnSetSize)
+#define CHANGE_LEVEL	(*g_engfuncs.pfnChangeLevel)
+#define GET_SPAWN_PARMS	(*g_engfuncs.pfnGetSpawnParms)
+#define SAVE_SPAWN_PARMS (*g_engfuncs.pfnSaveSpawnParms)
+#define VEC_TO_YAW		(*g_engfuncs.pfnVecToYaw)
+#define VEC_TO_ANGLES	(*g_engfuncs.pfnVecToAngles)
+#define MOVE_TO_ORIGIN  (*g_engfuncs.pfnMoveToOrigin)
+#define oldCHANGE_YAW		(*g_engfuncs.pfnChangeYaw)
+#define CHANGE_PITCH	(*g_engfuncs.pfnChangePitch)
+#define MAKE_VECTORS	(*g_engfuncs.pfnMakeVectors)
+#define CREATE_ENTITY	(*g_engfuncs.pfnCreateEntity)
+#define REMOVE_ENTITY	(*g_engfuncs.pfnRemoveEntity)
+#define CREATE_NAMED_ENTITY		(*g_engfuncs.pfnCreateNamedEntity)
+#define MAKE_STATIC		(*g_engfuncs.pfnMakeStatic)
+#define ENT_IS_ON_FLOOR	(*g_engfuncs.pfnEntIsOnFloor)
+#define DROP_TO_FLOOR	(*g_engfuncs.pfnDropToFloor)
+#define WALK_MOVE		(*g_engfuncs.pfnWalkMove)
+#define SET_ORIGIN		(*g_engfuncs.pfnSetOrigin)
+#define EMIT_SOUND_DYN2 (*g_engfuncs.pfnEmitSound)
+#define BUILD_SOUND_MSG (*g_engfuncs.pfnBuildSoundMsg)
+#define TRACE_LINE		(*g_engfuncs.pfnTraceLine)
+#define TRACE_TOSS		(*g_engfuncs.pfnTraceToss)
+#define TRACE_MONSTER_HULL		(*g_engfuncs.pfnTraceMonsterHull)
+#define TRACE_HULL		(*g_engfuncs.pfnTraceHull)
+#define GET_AIM_VECTOR	(*g_engfuncs.pfnGetAimVector)
+#define SERVER_COMMAND	(*g_engfuncs.pfnServerCommand)
+#define SERVER_EXECUTE	(*g_engfuncs.pfnServerExecute)
+#define CLIENT_COMMAND	(*g_engfuncs.pfnClientCommand)
+#define PARTICLE_EFFECT	(*g_engfuncs.pfnParticleEffect)
+#define LIGHT_STYLE		(*g_engfuncs.pfnLightStyle)
+#define DECAL_INDEX		(*g_engfuncs.pfnDecalIndex)
+#define POINT_CONTENTS	(*g_engfuncs.pfnPointContents)
+#define CRC32_INIT           (*g_engfuncs.pfnCRC32_Init)
+#define CRC32_PROCESS_BUFFER (*g_engfuncs.pfnCRC32_ProcessBuffer)
+#define CRC32_PROCESS_BYTE   (*g_engfuncs.pfnCRC32_ProcessByte)
+#define CRC32_FINAL          (*g_engfuncs.pfnCRC32_Final)
+#define RANDOM_LONG		(*g_engfuncs.pfnRandomLong)
+#define RANDOM_FLOAT	(*g_engfuncs.pfnRandomFloat)
+
+// Note: Use AvHSUGetPlayerAuthIDString instead
+//#define GETPLAYERAUTHID	(*g_engfuncs.pfnGetPlayerAuthId)
+//#define GETPLAYERAUTHID		(*g_engfuncs.pfnGetPlayerWONId)
+
+#ifdef AVH_SERVER
+#define PRECACHE_UNMODIFIED_MODEL(s)	\
+(*g_engfuncs.pfnPrecacheModel)(s); \
+ENGINE_FORCE_UNMODIFIED(force_exactfile, NULL, NULL, s);
+#else
+#define PRECACHE_UNMODIFIED_MODEL(s)	\
+(*g_engfuncs.pfnPrecacheModel)(s);
+#endif
+
+#ifdef AVH_SERVER
+#define PRECACHE_UNMODIFIED_SOUND(s) \
+(*g_engfuncs.pfnPrecacheSound)(s); \
+ENGINE_FORCE_UNMODIFIED(force_exactfile, NULL, NULL, s);
+#else
+#define PRECACHE_UNMODIFIED_SOUND(s) \
+(*g_engfuncs.pfnPrecacheSound)(s);
+#endif
+
+// Functions now defined in NetworkMeter.cpp
+void MESSAGE_END();
+void WRITE_BYTE(int inData);
+void WRITE_CHAR(int inData);
+void WRITE_SHORT(int inData);
+void WRITE_LONG(int inData);
+void WRITE_ANGLE(float inData);
+void WRITE_COORD(float inData);
+void WRITE_STRING(const char* inData);
+
+#ifdef AVH_SERVER
+
+#define WRITE_ENTITY	(*g_engfuncs.pfnWriteEntity)
+#define CVAR_REGISTER	(*g_engfuncs.pfnCVarRegister)
+#define CVAR_GET_FLOAT	(*g_engfuncs.pfnCVarGetFloat)
+#define CVAR_GET_STRING	(*g_engfuncs.pfnCVarGetString)
+#define CVAR_SET_FLOAT	(*g_engfuncs.pfnCVarSetFloat)
+#define CVAR_SET_STRING	(*g_engfuncs.pfnCVarSetString)
+#define CVAR_GET_POINTER (*g_engfuncs.pfnCVarGetPointer)
+
+#endif		// AVH_SERVER
+
+#define ALERT			(*g_engfuncs.pfnAlertMessage)
+#define ENGINE_FPRINTF	(*g_engfuncs.pfnEngineFprintf)
+#define ALLOC_PRIVATE	(*g_engfuncs.pfnPvAllocEntPrivateData)
+inline void *GET_PRIVATE( edict_t *pent )
+{
+	if ( pent )
+		return pent->pvPrivateData;
+	return NULL;
+}
+
+#define FREE_PRIVATE	(*g_engfuncs.pfnFreeEntPrivateData)
+//#define STRING			(*g_engfuncs.pfnSzFromIndex)
+#define ALLOC_STRING	(*g_engfuncs.pfnAllocString)
+#define FIND_ENTITY_BY_STRING	(*g_engfuncs.pfnFindEntityByString)
+#define GETENTITYILLUM	(*g_engfuncs.pfnGetEntityIllum)
+#define FIND_ENTITY_IN_SPHERE		(*g_engfuncs.pfnFindEntityInSphere)
+#define FIND_CLIENT_IN_PVS			(*g_engfuncs.pfnFindClientInPVS)
+#define EMIT_AMBIENT_SOUND			(*g_engfuncs.pfnEmitAmbientSound)
+#define GET_MODEL_PTR				(*g_engfuncs.pfnGetModelPtr)
+
+//#define REG_USER_MSG				(*g_engfuncs.pfnRegUserMsg)
+int REG_USER_MSG(const char* inMessageName, int inMessageSize);
+
+#define GET_BONE_POSITION			(*g_engfuncs.pfnGetBonePosition)
+#define FUNCTION_FROM_NAME			(*g_engfuncs.pfnFunctionFromName)
+#define NAME_FOR_FUNCTION			(*g_engfuncs.pfnNameForFunction)
+#define TRACE_TEXTURE				(*g_engfuncs.pfnTraceTexture)
+#define CLIENT_PRINTF				(*g_engfuncs.pfnClientPrintf)
+#define CMD_ARGS					(*g_engfuncs.pfnCmd_Args)
+#define CMD_ARGC					(*g_engfuncs.pfnCmd_Argc)
+#define CMD_ARGV					(*g_engfuncs.pfnCmd_Argv)
+#define GET_ATTACHMENT			(*g_engfuncs.pfnGetAttachment)
+#define SET_VIEW				(*g_engfuncs.pfnSetView)
+#define SET_CROSSHAIRANGLE		(*g_engfuncs.pfnCrosshairAngle)
+#define LOAD_FILE_FOR_ME		(*g_engfuncs.pfnLoadFileForMe)
+#define FREE_FILE				(*g_engfuncs.pfnFreeFile)
+#define COMPARE_FILE_TIME		(*g_engfuncs.pfnCompareFileTime)
+#define GET_GAME_DIR			(*g_engfuncs.pfnGetGameDir)
+#define IS_MAP_VALID			(*g_engfuncs.pfnIsMapValid)
+#define NUMBER_OF_ENTITIES		(*g_engfuncs.pfnNumberOfEntities)
+#define IS_DEDICATED_SERVER		(*g_engfuncs.pfnIsDedicatedServer)
+
+#define PRECACHE_EVENT			(*g_engfuncs.pfnPrecacheEvent)
+#define PLAYBACK_EVENT_FULL		(*g_engfuncs.pfnPlaybackEvent)
+
+#define ENGINE_SET_PVS			(*g_engfuncs.pfnSetFatPVS)
+#define ENGINE_SET_PAS			(*g_engfuncs.pfnSetFatPAS)
+
+#define ENGINE_CHECK_VISIBILITY (*g_engfuncs.pfnCheckVisibility)
+
+#define DELTA_SET				( *g_engfuncs.pfnDeltaSetField )
+#define DELTA_UNSET				( *g_engfuncs.pfnDeltaUnsetField )
+#define DELTA_ADDENCODER		( *g_engfuncs.pfnDeltaAddEncoder )
+#define ENGINE_CURRENT_PLAYER   ( *g_engfuncs.pfnGetCurrentPlayer )
+
+#define	ENGINE_CANSKIP			( *g_engfuncs.pfnCanSkipPlayer )
+
+#define DELTA_FINDFIELD			( *g_engfuncs.pfnDeltaFindField )
+#define DELTA_SETBYINDEX		( *g_engfuncs.pfnDeltaSetFieldByIndex )
+#define DELTA_UNSETBYINDEX		( *g_engfuncs.pfnDeltaUnsetFieldByIndex )
+
+#define ENGINE_GETPHYSINFO		( *g_engfuncs.pfnGetPhysicsInfoString )
+
+#define ENGINE_SETGROUPMASK		( *g_engfuncs.pfnSetGroupMask )
+
+#define ENGINE_INSTANCE_BASELINE ( *g_engfuncs.pfnCreateInstancedBaseline )
+
+#define ENGINE_FORCE_UNMODIFIED	( *g_engfuncs.pfnForceUnmodified )
+
+#define PLAYER_CNX_STATS		( *g_engfuncs.pfnGetPlayerStats )
+
+#endif		//ENGINECALLBACK_H
\ No newline at end of file
diff --git a/main/source/dlls/explode.cpp b/main/source/dlls/explode.cpp
new file mode 100644
index 00000000..402908f7
--- /dev/null
+++ b/main/source/dlls/explode.cpp
@@ -0,0 +1,277 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/*
+
+===== explode.cpp ========================================================
+
+  Explosion-related code
+
+*/
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "decals.h"
+#include "explode.h"
+
+// Spark Shower
+class CShower : public CBaseEntity
+{
+	void Spawn( void );
+	void Think( void );
+	void Touch( CBaseEntity *pOther );
+	int ObjectCaps( void ) { return FCAP_DONT_SAVE; }
+};
+
+LINK_ENTITY_TO_CLASS( spark_shower, CShower );
+
+void CShower::Spawn( void )
+{
+	pev->velocity = RANDOM_FLOAT( 200, 300 ) * pev->angles;
+	pev->velocity.x += RANDOM_FLOAT(-100.f,100.f);
+	pev->velocity.y += RANDOM_FLOAT(-100.f,100.f);
+	if ( pev->velocity.z >= 0 )
+		pev->velocity.z += 200;
+	else
+		pev->velocity.z -= 200;
+	pev->movetype = MOVETYPE_BOUNCE;
+	pev->gravity = 0.5;
+	pev->nextthink = gpGlobals->time + 0.1;
+	pev->solid = SOLID_NOT;
+	SET_MODEL( edict(), "models/grenade.mdl");	// Need a model, just use the grenade, we don't draw it anyway
+	UTIL_SetSize(pev, g_vecZero, g_vecZero );
+	pev->effects |= EF_NODRAW;
+	pev->speed = RANDOM_FLOAT( 0.5, 1.5 );
+
+	pev->angles = g_vecZero;
+}
+
+
+void CShower::Think( void )
+{
+	UTIL_Sparks( pev->origin );
+
+	pev->speed -= 0.1;
+	if ( pev->speed > 0 )
+		pev->nextthink = gpGlobals->time + 0.1;
+	else
+		UTIL_Remove( this );
+	pev->flags &= ~FL_ONGROUND;
+}
+
+void CShower::Touch( CBaseEntity *pOther )
+{
+	if ( pev->flags & FL_ONGROUND )
+		pev->velocity = pev->velocity * 0.1;
+	else
+		pev->velocity = pev->velocity * 0.6;
+
+	if ( (pev->velocity.x*pev->velocity.x+pev->velocity.y*pev->velocity.y) < 10.0 )
+		pev->speed = 0;
+}
+
+class CEnvExplosion : public CBaseMonster
+{
+public:
+	void Spawn( );
+	void EXPORT Smoke ( void );
+	void KeyValue( KeyValueData *pkvd );
+	void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	int m_iMagnitude;// how large is the fireball? how much damage?
+	int m_spriteScale; // what's the exact fireball sprite scale? 
+};
+
+TYPEDESCRIPTION	CEnvExplosion::m_SaveData[] = 
+{
+	DEFINE_FIELD( CEnvExplosion, m_iMagnitude, FIELD_INTEGER ),
+	DEFINE_FIELD( CEnvExplosion, m_spriteScale, FIELD_INTEGER ),
+};
+
+IMPLEMENT_SAVERESTORE( CEnvExplosion, CBaseMonster );
+LINK_ENTITY_TO_CLASS( env_explosion, CEnvExplosion );
+
+void CEnvExplosion::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "iMagnitude"))
+	{
+		m_iMagnitude = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseEntity::KeyValue( pkvd );
+}
+
+void CEnvExplosion::Spawn( void )
+{ 
+	pev->solid = SOLID_NOT;
+	pev->effects = EF_NODRAW;
+
+	pev->movetype = MOVETYPE_NONE;
+	/*
+	if ( m_iMagnitude > 250 )
+	{
+		m_iMagnitude = 250;
+	}
+	*/
+
+	float flSpriteScale;
+	flSpriteScale = ( m_iMagnitude - 50) * 0.6;
+
+	/*
+	if ( flSpriteScale > 50 )
+	{
+		flSpriteScale = 50;
+	}
+	*/
+	if ( flSpriteScale < 10 )
+	{
+		flSpriteScale = 10;
+	}
+
+	m_spriteScale = (int)flSpriteScale;
+}
+
+void CEnvExplosion::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{ 
+	TraceResult tr;
+
+	pev->model = iStringNull;//invisible
+	pev->solid = SOLID_NOT;// intangible
+
+	Vector		vecSpot;// trace starts here!
+
+	vecSpot = pev->origin + Vector ( 0 , 0 , 8 );
+	
+	UTIL_TraceLine ( vecSpot, vecSpot + Vector ( 0, 0, -40 ),  ignore_monsters, ENT(pev), & tr);
+	
+	// Pull out of the wall a bit
+	if ( tr.flFraction != 1.0 )
+	{
+		pev->origin = tr.vecEndPos + (tr.vecPlaneNormal * (m_iMagnitude - 24) * 0.6);
+	}
+	else
+	{
+		pev->origin = pev->origin;
+	}
+
+	// draw decal
+	if (! ( pev->spawnflags & SF_ENVEXPLOSION_NODECAL))
+	{
+		if ( RANDOM_FLOAT( 0 , 1 ) < 0.5 )
+		{
+			UTIL_DecalTrace( &tr, DECAL_SCORCH1 );
+		}
+		else
+		{
+			UTIL_DecalTrace( &tr, DECAL_SCORCH2 );
+		}
+	}
+
+	// draw fireball
+	if ( !( pev->spawnflags & SF_ENVEXPLOSION_NOFIREBALL ) )
+	{
+		MESSAGE_BEGIN( MSG_PAS, SVC_TEMPENTITY, pev->origin );
+			WRITE_BYTE( TE_EXPLOSION);
+			WRITE_COORD( pev->origin.x );
+			WRITE_COORD( pev->origin.y );
+			WRITE_COORD( pev->origin.z );
+			WRITE_SHORT( g_sModelIndexFireball );
+			WRITE_BYTE( (BYTE)m_spriteScale ); // scale * 10
+			WRITE_BYTE( 15  ); // framerate
+			WRITE_BYTE( TE_EXPLFLAG_NONE );
+		MESSAGE_END();
+	}
+	else
+	{
+		MESSAGE_BEGIN( MSG_PAS, SVC_TEMPENTITY, pev->origin );
+			WRITE_BYTE( TE_EXPLOSION);
+			WRITE_COORD( pev->origin.x );
+			WRITE_COORD( pev->origin.y );
+			WRITE_COORD( pev->origin.z );
+			WRITE_SHORT( g_sModelIndexFireball );
+			WRITE_BYTE( 0 ); // no sprite
+			WRITE_BYTE( 15  ); // framerate
+			WRITE_BYTE( TE_EXPLFLAG_NONE );
+		MESSAGE_END();
+	}
+
+	// do damage
+	if ( !( pev->spawnflags & SF_ENVEXPLOSION_NODAMAGE ) )
+	{
+		RadiusDamage ( pev, pev, m_iMagnitude, CLASS_NONE, DMG_BLAST );
+	}
+
+	SetThink( &CEnvExplosion::Smoke );
+	pev->nextthink = gpGlobals->time + 0.3;
+
+	// draw sparks
+	if ( !( pev->spawnflags & SF_ENVEXPLOSION_NOSPARKS ) )
+	{
+		int sparkCount = RANDOM_LONG(0,3);
+
+		for ( int i = 0; i < sparkCount; i++ )
+		{
+			Create( "spark_shower", pev->origin, tr.vecPlaneNormal, NULL );
+		}
+	}
+}
+
+void CEnvExplosion::Smoke( void )
+{
+	if ( !( pev->spawnflags & SF_ENVEXPLOSION_NOSMOKE ) )
+	{
+		MESSAGE_BEGIN( MSG_PAS, SVC_TEMPENTITY, pev->origin );
+			WRITE_BYTE( TE_SMOKE );
+			WRITE_COORD( pev->origin.x );
+			WRITE_COORD( pev->origin.y );
+			WRITE_COORD( pev->origin.z );
+			WRITE_SHORT( g_sModelIndexSmoke );
+			WRITE_BYTE( (BYTE)m_spriteScale ); // scale * 10
+			WRITE_BYTE( 12  ); // framerate
+		MESSAGE_END();
+	}
+	
+	if ( !(pev->spawnflags & SF_ENVEXPLOSION_REPEATABLE) )
+	{
+		UTIL_Remove( this );
+	}
+}
+
+
+// HACKHACK -- create one of these and fake a keyvalue to get the right explosion setup
+void ExplosionCreate( const Vector &center, const Vector &angles, edict_t *pOwner, int magnitude, BOOL doDamage, int inExplosionTeam)
+{
+	KeyValueData	kvd;
+	char			buf[128];
+
+	CBaseEntity *pExplosion = CBaseEntity::Create( "env_explosion", center, angles, pOwner );
+	CEnvExplosion* theExplosion = dynamic_cast<CEnvExplosion*>(pExplosion);
+	ASSERT(theExplosion);
+
+	pExplosion->pev->team = inExplosionTeam;
+	sprintf( buf, "%3d", magnitude );
+	kvd.szKeyName = "iMagnitude";
+	kvd.szValue = buf;
+	pExplosion->KeyValue( &kvd );
+	if ( !doDamage )
+		pExplosion->pev->spawnflags |= SF_ENVEXPLOSION_NODAMAGE;
+
+	pExplosion->Spawn();
+	pExplosion->Use( NULL, NULL, USE_TOGGLE, 0 );
+}
diff --git a/main/source/dlls/explode.h b/main/source/dlls/explode.h
new file mode 100644
index 00000000..598401ba
--- /dev/null
+++ b/main/source/dlls/explode.h
@@ -0,0 +1,32 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef EXPLODE_H
+#define EXPLODE_H
+
+
+#define	SF_ENVEXPLOSION_NODAMAGE	( 1 << 0 ) // when set, ENV_EXPLOSION will not actually inflict damage
+#define	SF_ENVEXPLOSION_REPEATABLE	( 1 << 1 ) // can this entity be refired?
+#define SF_ENVEXPLOSION_NOFIREBALL	( 1 << 2 ) // don't draw the fireball
+#define SF_ENVEXPLOSION_NOSMOKE		( 1 << 3 ) // don't draw the smoke
+#define SF_ENVEXPLOSION_NODECAL		( 1 << 4 ) // don't make a scorch mark
+#define SF_ENVEXPLOSION_NOSPARKS	( 1 << 5 ) // don't make a scorch mark
+
+extern DLL_GLOBAL	short	g_sModelIndexFireball;
+extern DLL_GLOBAL	short	g_sModelIndexSmoke;
+
+
+extern void ExplosionCreate( const Vector &center, const Vector &angles, edict_t *pOwner, int magnitude, BOOL doDamage, int inExplosionTeam = 0);
+
+#endif			//EXPLODE_H
diff --git a/main/source/dlls/extdll.h b/main/source/dlls/extdll.h
new file mode 100644
index 00000000..71a8594f
--- /dev/null
+++ b/main/source/dlls/extdll.h
@@ -0,0 +1,92 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef EXTDLL_H
+#define EXTDLL_H
+
+
+//
+// Global header file for extension DLLs
+//
+
+// Allow "DEBUG" in addition to default "_DEBUG"
+#ifdef _DEBUG
+#define DEBUG 1
+#endif
+
+// Silence certain warnings
+#pragma warning(disable : 4244)		// int or float down-conversion
+#pragma warning(disable : 4305)		// int or float data truncation
+#pragma warning(disable : 4201)		// nameless struct/union
+#pragma warning(disable : 4514)		// unreferenced inline function removed
+#pragma warning(disable : 4100)		// unreferenced formal parameter
+
+// Prevent tons of unused windows definitions
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#define NOWINRES
+#define NOSERVICE
+#define NOMCX
+#define NOIME
+#include "windows.h"
+#else // _WIN32
+#define FALSE 0
+#define TRUE (!FALSE)
+typedef unsigned long ULONG;
+typedef unsigned char BYTE;
+typedef int BOOL;
+#define MAX_PATH PATH_MAX
+#include <limits.h>
+#include <stdarg.h>
+#ifndef min
+#define min(a,b)  (((a) < (b)) ? (a) : (b))
+#endif
+#ifndef max
+#define max(a,b)  (((a) > (b)) ? (a) : (b))
+#define _vsnprintf(a,b,c,d) vsnprintf(a,b,c,d)
+#define _snprintf(a,b,c,d,e)
+#endif
+#endif //_WIN32
+
+// Misc C-runtime library headers
+#include "stdio.h"
+#include "stdlib.h"
+#include "math.h"
+
+// Header file containing definition of globalvars_t and entvars_t
+typedef int	func_t;					//
+typedef int	string_t;				// from engine's pr_comp.h;
+typedef float vec_t;				// needed before including progdefs.h
+
+// Vector class
+#include "vector.h"
+
+// Defining it as a (bogus) struct helps enforce type-checking
+#ifndef THEVECTOR3T
+#define THEVECTOR3T
+#define vec3_t Vector
+#endif
+
+// Shared engine/DLL constants
+#include "common/const.h"
+#include "engine/progdefs.h"
+#include "engine/edict.h"
+
+// Shared header describing protocol between engine and DLLs
+#include "engine/eiface.h"
+
+// Shared header between the client DLL and the game DLLs
+#include "dlls/cdll_dll.h"
+
+#endif //EXTDLL_H
diff --git a/main/source/dlls/flyingmonster.cpp b/main/source/dlls/flyingmonster.cpp
new file mode 100644
index 00000000..892418ee
--- /dev/null
+++ b/main/source/dlls/flyingmonster.cpp
@@ -0,0 +1,281 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"schedule.h"
+#include	"flyingmonster.h"
+
+#define FLYING_AE_FLAP		(8)
+#define FLYING_AE_FLAPSOUND	(9)
+
+
+extern DLL_GLOBAL edict_t		*g_pBodyQueueHead;
+
+int CFlyingMonster :: CheckLocalMove ( const Vector &vecStart, const Vector &vecEnd, CBaseEntity *pTarget, float *pflDist )
+{
+	// UNDONE: need to check more than the endpoint
+	if (FBitSet(pev->flags, FL_SWIM) && (UTIL_PointContents(vecEnd) != CONTENTS_WATER))
+	{
+		// ALERT(at_aiconsole, "can't swim out of water\n");
+		return FALSE;
+	}
+
+	TraceResult tr;
+
+	UTIL_TraceHull( vecStart + Vector( 0, 0, 32 ), vecEnd + Vector( 0, 0, 32 ), dont_ignore_monsters, large_hull, edict(), &tr );
+
+	// ALERT( at_console, "%.0f %.0f %.0f : ", vecStart.x, vecStart.y, vecStart.z );
+	// ALERT( at_console, "%.0f %.0f %.0f\n", vecEnd.x, vecEnd.y, vecEnd.z );
+
+	if (pflDist)
+	{
+		*pflDist = ( (tr.vecEndPos - Vector( 0, 0, 32 )) - vecStart ).Length();// get the distance.
+	}
+
+	// ALERT( at_console, "check %d %d %f\n", tr.fStartSolid, tr.fAllSolid, tr.flFraction );
+	if (tr.fStartSolid || tr.flFraction < 1.0)
+	{
+		if ( pTarget && pTarget->edict() == gpGlobals->trace_ent )
+			return LOCALMOVE_VALID;
+		return LOCALMOVE_INVALID;
+	}
+
+	return LOCALMOVE_VALID;
+}
+
+
+BOOL CFlyingMonster :: FTriangulate ( const Vector &vecStart , const Vector &vecEnd, float flDist, CBaseEntity *pTargetEnt, Vector *pApex )
+{
+	return CBaseMonster::FTriangulate( vecStart, vecEnd, flDist, pTargetEnt, pApex );
+}
+
+
+Activity CFlyingMonster :: GetStoppedActivity( void )
+{ 
+	if ( pev->movetype != MOVETYPE_FLY )		// UNDONE: Ground idle here, IDLE may be something else
+		return ACT_IDLE;
+
+	return ACT_HOVER; 
+}
+
+
+void CFlyingMonster :: Stop( void ) 
+{ 
+	Activity stopped = GetStoppedActivity();
+	if ( m_IdealActivity != stopped )
+	{
+		m_flightSpeed = 0;
+		m_IdealActivity = stopped;
+	}
+	pev->angles.z = 0;
+	pev->angles.x = 0;
+	m_vecTravel = g_vecZero;
+}
+
+
+float CFlyingMonster :: ChangeYaw( int speed )
+{
+	if ( pev->movetype == MOVETYPE_FLY )
+	{
+		float diff = FlYawDiff();
+		float target = 0;
+
+		if ( m_IdealActivity != GetStoppedActivity() )
+		{
+			if ( diff < -20 )
+				target = 90;
+			else if ( diff > 20 )
+				target = -90;
+		}
+		pev->angles.z = UTIL_Approach( target, pev->angles.z, 220.0 * gpGlobals->frametime );
+	}
+	return CBaseMonster::ChangeYaw( speed );
+}
+
+
+void CFlyingMonster :: Killed( entvars_t *pevAttacker, int iGib )
+{
+	pev->movetype = MOVETYPE_STEP;
+	ClearBits( pev->flags, FL_ONGROUND );
+	pev->angles.z = 0;
+	pev->angles.x = 0;
+	CBaseMonster::Killed( pevAttacker, iGib );
+}
+
+
+void CFlyingMonster :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	switch( pEvent->event )
+	{
+	case FLYING_AE_FLAP:
+		m_flightSpeed = 400;
+		break;
+
+	case FLYING_AE_FLAPSOUND:
+		if ( m_pFlapSound )
+			EMIT_SOUND( edict(), CHAN_BODY, m_pFlapSound, 1, ATTN_NORM );	
+		break;
+
+	default:
+		CBaseMonster::HandleAnimEvent( pEvent );
+		break;
+	}
+}
+
+
+void CFlyingMonster :: Move( float flInterval )
+{
+	if ( pev->movetype == MOVETYPE_FLY )
+		m_flGroundSpeed = m_flightSpeed;
+	CBaseMonster::Move( flInterval );
+}
+
+
+BOOL CFlyingMonster:: ShouldAdvanceRoute( float flWaypointDist )
+{
+	// Get true 3D distance to the goal so we actually reach the correct height
+	if ( m_Route[ m_iRouteIndex ].iType & bits_MF_IS_GOAL )
+		flWaypointDist = ( m_Route[ m_iRouteIndex ].vecLocation - pev->origin ).Length();
+
+	if ( flWaypointDist <= 64 + (m_flGroundSpeed * gpGlobals->frametime) )
+		return TRUE;
+
+	return FALSE;
+}
+
+
+void CFlyingMonster::MoveExecute( CBaseEntity *pTargetEnt, const Vector &vecDir, float flInterval )
+{
+	if ( pev->movetype == MOVETYPE_FLY )
+	{
+		if ( gpGlobals->time - m_stopTime > 1.0 )
+		{
+			if ( m_IdealActivity != m_movementActivity )
+			{
+				m_IdealActivity = m_movementActivity;
+				m_flGroundSpeed = m_flightSpeed = 200;
+			}
+		}
+		Vector vecMove = pev->origin + (( vecDir + (m_vecTravel * m_momentum) ).Normalize() * (m_flGroundSpeed * flInterval));
+
+		if ( m_IdealActivity != m_movementActivity )
+		{
+			m_flightSpeed = UTIL_Approach( 100, m_flightSpeed, 75 * gpGlobals->frametime );
+			if ( m_flightSpeed < 100 )
+				m_stopTime = gpGlobals->time;
+		}
+		else
+			m_flightSpeed = UTIL_Approach( 20, m_flightSpeed, 300 * gpGlobals->frametime );
+		
+		if ( CheckLocalMove ( pev->origin, vecMove, pTargetEnt, NULL ) )
+		{
+			m_vecTravel = (vecMove - pev->origin);
+			m_vecTravel = m_vecTravel.Normalize();
+			UTIL_MoveToOrigin(ENT(pev), vecMove, (m_flGroundSpeed * flInterval), MOVE_STRAFE);
+		}
+		else
+		{
+			m_IdealActivity = GetStoppedActivity();
+			m_stopTime = gpGlobals->time;
+			m_vecTravel = g_vecZero;
+		}
+	}
+	else
+		CBaseMonster::MoveExecute( pTargetEnt, vecDir, flInterval );
+}
+
+
+float CFlyingMonster::CeilingZ( const Vector &position )
+{
+	TraceResult tr;
+
+	Vector minUp = position;
+	Vector maxUp = position;
+	maxUp.z += 4096.0;
+
+	UTIL_TraceLine(position, maxUp, ignore_monsters, NULL, &tr);
+	if (tr.flFraction != 1.0)
+		maxUp.z = tr.vecEndPos.z;
+
+	if ((pev->flags) & FL_SWIM)
+	{
+		return UTIL_WaterLevel( position, minUp.z, maxUp.z );
+	}
+	return maxUp.z;
+}
+
+BOOL CFlyingMonster::ProbeZ( const Vector &position, const Vector &probe, float *pFraction)
+{
+	int conPosition = UTIL_PointContents(position);
+	if ( (((pev->flags) & FL_SWIM) == FL_SWIM) ^ (conPosition == CONTENTS_WATER))
+	{
+		//    SWIMING & !WATER
+		// or FLYING  & WATER
+		//
+		*pFraction = 0.0;
+		return TRUE; // We hit a water boundary because we are where we don't belong.
+	}
+	int conProbe = UTIL_PointContents(probe);
+	if (conProbe == conPosition)
+	{
+		// The probe is either entirely inside the water (for fish) or entirely
+		// outside the water (for birds).
+		//
+		*pFraction = 1.0;
+		return FALSE;
+	}
+
+	Vector ProbeUnit = (probe-position).Normalize();
+	float ProbeLength = (probe-position).Length();
+	float maxProbeLength = ProbeLength;
+	float minProbeLength = 0;
+
+	float diff = maxProbeLength - minProbeLength;
+	while (diff > 1.0)
+	{
+		float midProbeLength = minProbeLength + diff/2.0;
+		Vector midProbeVec = midProbeLength * ProbeUnit;
+		if (UTIL_PointContents(position+midProbeVec) == conPosition)
+		{
+			minProbeLength = midProbeLength;
+		}
+		else
+		{
+			maxProbeLength = midProbeLength;
+		}
+		diff = maxProbeLength - minProbeLength;
+	}
+	*pFraction = minProbeLength/ProbeLength;
+
+	return TRUE;
+}
+
+float CFlyingMonster::FloorZ( const Vector &position )
+{
+	TraceResult tr;
+
+	Vector down = position;
+	down.z -= 2048;
+
+	UTIL_TraceLine( position, down, ignore_monsters, NULL, &tr );
+
+	if ( tr.flFraction != 1.0 )
+		return tr.vecEndPos.z;
+
+	return down.z;
+}
+
diff --git a/main/source/dlls/flyingmonster.h b/main/source/dlls/flyingmonster.h
new file mode 100644
index 00000000..7c1f12e9
--- /dev/null
+++ b/main/source/dlls/flyingmonster.h
@@ -0,0 +1,53 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+// Base class for flying monsters.  This overrides the movement test & execution code from CBaseMonster
+
+#ifndef FLYINGMONSTER_H
+#define FLYINGMONSTER_H
+
+class CFlyingMonster : public CBaseMonster
+{
+public:
+	int 		CheckLocalMove ( const Vector &vecStart, const Vector &vecEnd, CBaseEntity *pTarget, float *pflDist );// check validity of a straight move through space
+	BOOL		FTriangulate ( const Vector &vecStart , const Vector &vecEnd, float flDist, CBaseEntity *pTargetEnt, Vector *pApex );
+	Activity	GetStoppedActivity( void );
+	void		Killed( entvars_t *pevAttacker, int iGib );
+	void		Stop( void );
+	float		ChangeYaw( int speed );
+	void		HandleAnimEvent( MonsterEvent_t *pEvent );
+	void		MoveExecute( CBaseEntity *pTargetEnt, const Vector &vecDir, float flInterval );
+	void		Move( float flInterval = 0.1 );
+	BOOL		ShouldAdvanceRoute( float flWaypointDist );
+
+	inline void	SetFlyingMomentum( float momentum ) { m_momentum = momentum; }
+	inline void	SetFlyingFlapSound( const char *pFlapSound ) { m_pFlapSound = pFlapSound; }
+	inline void	SetFlyingSpeed( float speed ) { m_flightSpeed = speed; }
+	float		CeilingZ( const Vector &position );
+	float		FloorZ( const Vector &position );
+	BOOL		ProbeZ( const Vector &position, const Vector &probe, float *pFraction );
+	
+	
+	// UNDONE:  Save/restore this stuff!!!
+protected:
+	Vector		m_vecTravel;		// Current direction
+	float		m_flightSpeed;		// Current flight speed (decays when not flapping or gliding)
+	float		m_stopTime;			// Last time we stopped (to avoid switching states too soon)
+	float		m_momentum;			// Weight for desired vs. momentum velocity
+	const char	*m_pFlapSound;
+};
+
+
+#endif		//FLYINGMONSTER_H
+
diff --git a/main/source/dlls/func_break.cpp b/main/source/dlls/func_break.cpp
new file mode 100644
index 00000000..c9422a65
--- /dev/null
+++ b/main/source/dlls/func_break.cpp
@@ -0,0 +1,1054 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/*
+
+===== bmodels.cpp ========================================================
+
+  spawn, think, and use functions for entities that use brush models
+
+*/
+#include <cmath>
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "saverestore.h"
+#include "func_break.h"
+#include "decals.h"
+#include "explode.h"
+#include "mod/AvHSpecials.h"
+
+extern DLL_GLOBAL Vector		g_vecAttackDir;
+
+// =================== FUNC_Breakable ==============================================
+
+// Just add more items to the bottom of this array and they will automagically be supported
+// This is done instead of just a classname in the FGD so we can control which entities can
+// be spawned, and still remain fairly flexible
+const char *CBreakable::pSpawnObjects[] =
+{
+	NULL,				// 0
+	"item_battery",		// 1
+	"item_healthkit",	// 2
+	"weapon_9mmhandgun",// 3
+	"ammo_9mmclip",		// 4
+	"weapon_9mmAR",		// 5
+	"ammo_9mmAR",		// 6
+	"ammo_ARgrenades",	// 7
+	"weapon_shotgun",	// 8
+	"ammo_buckshot",	// 9
+	"weapon_crossbow",	// 10
+	"ammo_crossbow",	// 11
+	"weapon_357",		// 12
+	"ammo_357",			// 13
+	"weapon_rpg",		// 14
+	"ammo_rpgclip",		// 15
+	"ammo_gaussclip",	// 16
+	"weapon_handgrenade",// 17
+	"weapon_tripmine",	// 18
+	"weapon_satchel",	// 19
+	"weapon_snark",		// 20
+	"weapon_hornetgun",	// 21
+};
+
+CBreakable::~CBreakable()
+{
+}
+
+void CBreakable::KeyValue( KeyValueData* pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "strength"))
+	{
+	}
+	else
+		
+	// UNDONE_WC: explicitly ignoring these fields, but they shouldn't be in the map file!
+	if (FStrEq(pkvd->szKeyName, "explosion"))
+	{
+		if (!stricmp(pkvd->szValue, "directed"))
+			m_Explosion = expDirected;
+		else if (!stricmp(pkvd->szValue, "random"))
+			m_Explosion = expRandom;
+		else
+			m_Explosion = expRandom;
+
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "material"))
+	{
+		int i = atoi( pkvd->szValue);
+
+		// 0:glass, 1:metal, 2:flesh, 3:wood
+
+		if ((i < 0) || (i >= matLastMaterial))
+			m_Material = matWood;
+		else
+			m_Material = (Materials)i;
+
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "deadmodel"))
+	{
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "shards"))
+	{
+//			m_iShards = atof(pkvd->szValue);
+			pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "gibmodel") )
+	{
+		m_iszGibModel = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "spawnobject") )
+	{
+		int object = atoi( pkvd->szValue );
+		if ( object > 0 && object < ARRAYSIZE(pSpawnObjects) )
+			m_iszSpawnObject = MAKE_STRING( pSpawnObjects[object] );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "explodemagnitude") )
+	{
+		ExplosionSetMagnitude( atoi( pkvd->szValue ) );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "lip") )
+		pkvd->fHandled = TRUE;
+	else
+		CBaseDelay::KeyValue( pkvd );
+}
+
+
+//
+// func_breakable - bmodel that breaks into pieces after taking damage
+//
+LINK_ENTITY_TO_CLASS( func_breakable, CBreakable );
+TYPEDESCRIPTION CBreakable::m_SaveData[] =
+{
+	DEFINE_FIELD( CBreakable, m_Material, FIELD_INTEGER ),
+	DEFINE_FIELD( CBreakable, m_Explosion, FIELD_INTEGER ),
+
+// Don't need to save/restore these because we precache after restore
+//	DEFINE_FIELD( CBreakable, m_idShard, FIELD_INTEGER ),
+
+	DEFINE_FIELD( CBreakable, m_angle, FIELD_FLOAT ),
+	DEFINE_FIELD( CBreakable, m_iszGibModel, FIELD_STRING ),
+	DEFINE_FIELD( CBreakable, m_iszSpawnObject, FIELD_STRING ),
+
+	// Explosion magnitude is stored in pev->impulse
+};
+
+IMPLEMENT_SAVERESTORE( CBreakable, CBaseEntity );
+
+void CBreakable::SetMaterial(Materials inMaterial)
+{
+	this->m_Material = inMaterial;
+}
+
+void CBreakable::Spawn( void )
+{
+    Precache( );    
+
+	if ( FBitSet( pev->spawnflags, SF_BREAK_TRIGGER_ONLY ) )
+		pev->takedamage	= DAMAGE_NO;
+	else
+		pev->takedamage	= DAMAGE_YES;
+  
+	pev->solid		= SOLID_BSP;
+    pev->movetype	= MOVETYPE_PUSH;
+    m_angle			= pev->angles.y;
+	pev->angles.y	= 0;
+
+	// HACK:  matGlass can receive decals, we need the client to know about this
+	//  so use class to store the material flag
+	if ( m_Material == matGlass )
+	{
+		pev->playerclass = 1;
+	}
+
+	SET_MODEL(ENT(pev), STRING(pev->model) );//set size and link into world.
+
+	SetTouch( &CBreakable::BreakTouch );
+	if ( FBitSet( pev->spawnflags, SF_BREAK_TRIGGER_ONLY ) )		// Only break on trigger
+		SetTouch( NULL );
+
+	// << cgc >> Save max_health so we can reset the entity
+	this->pev->max_health = this->pev->health;
+
+	// Flag unbreakable glass as "worldbrush" so it will block ALL tracelines
+	if ( !IsBreakable() && pev->rendermode != kRenderNormal )
+		pev->flags |= FL_WORLDBRUSH;
+
+	this->pev->iuser3 = AVH_USER3_BREAKABLE;
+}
+
+
+const char *CBreakable::pSoundsWood[] = 
+{
+	"debris/wood1.wav",
+	"debris/wood2.wav",
+	"debris/wood3.wav",
+};
+
+const char *CBreakable::pSoundsFlesh[] = 
+{
+	"debris/flesh1.wav",
+	"debris/flesh2.wav",
+	"debris/flesh3.wav",
+	"debris/flesh5.wav",
+	"debris/flesh6.wav",
+	"debris/flesh7.wav",
+};
+
+const char *CBreakable::pSoundsMetal[] = 
+{
+	"debris/metal1.wav",
+	"debris/metal2.wav",
+	"debris/metal3.wav",
+};
+
+const char *CBreakable::pSoundsConcrete[] = 
+{
+	"debris/concrete1.wav",
+	"debris/concrete2.wav",
+	"debris/concrete3.wav",
+};
+
+
+const char *CBreakable::pSoundsGlass[] = 
+{
+	"debris/glass1.wav",
+	"debris/glass2.wav",
+	"debris/glass3.wav",
+};
+
+const char **CBreakable::MaterialSoundList( Materials precacheMaterial, int &soundCount )
+{
+	const char	**pSoundList = NULL;
+
+    switch ( precacheMaterial ) 
+	{
+	case matWood:
+		pSoundList = pSoundsWood;
+		soundCount = ARRAYSIZE(pSoundsWood);
+		break;
+	case matFlesh:
+		pSoundList = pSoundsFlesh;
+		soundCount = ARRAYSIZE(pSoundsFlesh);
+		break;
+	case matComputer:
+	case matUnbreakableGlass:
+	case matGlass:
+		pSoundList = pSoundsGlass;
+		soundCount = ARRAYSIZE(pSoundsGlass);
+		break;
+
+	case matMetal:
+		pSoundList = pSoundsMetal;
+		soundCount = ARRAYSIZE(pSoundsMetal);
+		break;
+
+	case matCinderBlock:
+	case matRocks:
+		pSoundList = pSoundsConcrete;
+		soundCount = ARRAYSIZE(pSoundsConcrete);
+		break;
+	
+	
+	case matCeilingTile:
+	case matNone:
+	default:
+		soundCount = 0;
+		break;
+	}
+
+	return pSoundList;
+}
+
+void CBreakable::MaterialSoundPrecache( Materials precacheMaterial )
+{
+	const char	**pSoundList;
+	int			i, soundCount = 0;
+
+	pSoundList = MaterialSoundList( precacheMaterial, soundCount );
+
+	for ( i = 0; i < soundCount; i++ )
+	{
+		PRECACHE_SOUND( (char *)pSoundList[i] );
+	}
+}
+
+void CBreakable::MaterialSoundRandom( edict_t *pEdict, Materials soundMaterial, float volume )
+{
+	const char	**pSoundList;
+	int			soundCount = 0;
+
+	pSoundList = MaterialSoundList( soundMaterial, soundCount );
+
+	if ( soundCount )
+		EMIT_SOUND( pEdict, CHAN_BODY, pSoundList[ RANDOM_LONG(0,soundCount-1) ], volume, 1.0 );
+}
+
+
+void CBreakable::Precache( void )
+{
+	const char *pGibName;
+
+    switch (m_Material) 
+	{
+	case matWood:
+		pGibName = "models/woodgibs.mdl";
+		
+		PRECACHE_SOUND("debris/bustcrate1.wav");
+		PRECACHE_SOUND("debris/bustcrate2.wav");
+		break;
+	case matFlesh:
+		pGibName = "models/fleshgibs.mdl";
+		
+		PRECACHE_SOUND("debris/bustflesh1.wav");
+		PRECACHE_SOUND("debris/bustflesh2.wav");
+		break;
+	case matComputer:
+		PRECACHE_SOUND("buttons/spark5.wav");
+		PRECACHE_SOUND("buttons/spark6.wav");
+		pGibName = "models/computergibs.mdl";
+		
+		PRECACHE_SOUND("debris/bustmetal1.wav");
+		PRECACHE_SOUND("debris/bustmetal2.wav");
+		break;
+
+	case matUnbreakableGlass:
+	case matGlass:
+		pGibName = "models/glassgibs.mdl";
+		
+		PRECACHE_SOUND("debris/bustglass1.wav");
+		PRECACHE_SOUND("debris/bustglass2.wav");
+		break;
+	case matMetal:
+		pGibName = "models/metalplategibs.mdl";
+		
+		PRECACHE_SOUND("debris/bustmetal1.wav");
+		PRECACHE_SOUND("debris/bustmetal2.wav");
+		break;
+	case matCinderBlock:
+		pGibName = "models/cindergibs.mdl";
+		
+		PRECACHE_SOUND("debris/bustconcrete1.wav");
+		PRECACHE_SOUND("debris/bustconcrete2.wav");
+		break;
+	case matRocks:
+		pGibName = "models/rockgibs.mdl";
+		
+		PRECACHE_SOUND("debris/bustconcrete1.wav");
+		PRECACHE_SOUND("debris/bustconcrete2.wav");
+		break;
+	case matCeilingTile:
+		pGibName = "models/ceilinggibs.mdl";
+		
+		PRECACHE_SOUND ("debris/bustceiling.wav");  
+		break;
+	}
+	MaterialSoundPrecache( m_Material );
+	if ( m_iszGibModel )
+		pGibName = STRING(m_iszGibModel);
+
+	m_idShard = PRECACHE_MODEL( (char *)pGibName );
+
+	// Precache the spawn item's data
+	if ( m_iszSpawnObject )
+		UTIL_PrecacheOther( (char *)STRING( m_iszSpawnObject ) );
+}
+
+// play shard sound when func_breakable takes damage.
+// the more damage, the louder the shard sound.
+
+
+void CBreakable::DamageSound( void )
+{
+	int pitch;
+	float fvol;
+	char *rgpsz[6];
+	int i;
+	int material = m_Material;
+
+//	if (RANDOM_LONG(0,1))
+//		return;
+
+	if (RANDOM_LONG(0,2))
+		pitch = PITCH_NORM;
+	else
+		pitch = 95 + RANDOM_LONG(0,34);
+
+	fvol = RANDOM_FLOAT(0.75, 1.0);
+
+	if (material == matComputer && RANDOM_LONG(0,1))
+		material = matMetal;
+
+	switch (material)
+	{
+	case matComputer:
+	case matGlass:
+	case matUnbreakableGlass:
+		rgpsz[0] = "debris/glass1.wav";
+		rgpsz[1] = "debris/glass2.wav";
+		rgpsz[2] = "debris/glass3.wav";
+		i = 3;
+		break;
+
+	case matWood:
+		rgpsz[0] = "debris/wood1.wav";
+		rgpsz[1] = "debris/wood2.wav";
+		rgpsz[2] = "debris/wood3.wav";
+		i = 3;
+		break;
+
+	case matMetal:
+		rgpsz[0] = "debris/metal1.wav";
+		rgpsz[1] = "debris/metal3.wav";
+		rgpsz[2] = "debris/metal2.wav";
+		i = 2;
+		break;
+
+	case matFlesh:
+		rgpsz[0] = "debris/flesh1.wav";
+		rgpsz[1] = "debris/flesh2.wav";
+		rgpsz[2] = "debris/flesh3.wav";
+		rgpsz[3] = "debris/flesh5.wav";
+		rgpsz[4] = "debris/flesh6.wav";
+		rgpsz[5] = "debris/flesh7.wav";
+		i = 6;
+		break;
+
+	case matRocks:
+	case matCinderBlock:
+		rgpsz[0] = "debris/concrete1.wav";
+		rgpsz[1] = "debris/concrete2.wav";
+		rgpsz[2] = "debris/concrete3.wav";
+		i = 3;
+		break;
+
+	case matCeilingTile:
+		// UNDONE: no ceiling tile shard sound yet
+		i = 0;
+		break;
+	}
+
+	if (i)
+		EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, rgpsz[RANDOM_LONG(0,i-1)], fvol, ATTN_NORM, 0, pitch);
+}
+
+void CBreakable::BreakTouch( CBaseEntity *pOther )
+{
+	float flDamage;
+	entvars_t*	pevToucher = pOther->pev;
+	
+	// only players can break these right now
+	if ( !pOther->IsPlayer() || !IsBreakable() )
+	{
+        return;
+	}
+
+	if ( FBitSet ( pev->spawnflags, SF_BREAK_TOUCH ) )
+	{// can be broken when run into 
+		flDamage = pevToucher->velocity.Length() * 0.01;
+
+		if (flDamage >= pev->health)
+		{
+			SetTouch( NULL );
+			TakeDamage(pevToucher, pevToucher, flDamage, DMG_CRUSH);
+
+			// do a little damage to player if we broke glass or computer
+			pOther->TakeDamage( pev, pev, flDamage/4, DMG_SLASH );
+		}
+	}
+
+	if ( FBitSet ( pev->spawnflags, SF_BREAK_PRESSURE ) && pevToucher->absmin.z >= pev->maxs.z - 2 )
+	{// can be broken when stood upon
+		
+		// play creaking sound here.
+		DamageSound();
+
+		SetThink ( &CBreakable::Die );
+		SetTouch( NULL );
+		
+		if ( m_flDelay == 0 )
+		{// !!!BUGBUG - why doesn't zero delay work?
+			m_flDelay = 0.1;
+		}
+
+		pev->nextthink = pev->ltime + m_flDelay;
+
+	}
+
+}
+
+
+//
+// Smash the our breakable object
+//
+
+// Break when triggered
+void CBreakable::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( IsBreakable() )
+	{
+		pev->angles.y = m_angle;
+		UTIL_MakeVectors(pev->angles);
+		g_vecAttackDir = gpGlobals->v_forward;
+
+		Die();
+	}
+}
+
+
+void CBreakable::TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType )
+{
+	// random spark if this is a 'computer' object
+	if (RANDOM_LONG(0,1) )
+	{
+		switch( m_Material )
+		{
+			case matComputer:
+			{
+				UTIL_Sparks( ptr->vecEndPos );
+
+				float flVolume = RANDOM_FLOAT ( 0.7 , 1.0 );//random volume range
+				switch ( RANDOM_LONG(0,1) )
+				{
+					case 0: EMIT_SOUND(ENT(pev), CHAN_VOICE, "buttons/spark5.wav", flVolume, ATTN_NORM);	break;
+					case 1: EMIT_SOUND(ENT(pev), CHAN_VOICE, "buttons/spark6.wav", flVolume, ATTN_NORM);	break;
+				}
+			}
+			break;
+			
+			case matUnbreakableGlass:
+				UTIL_Ricochet( ptr->vecEndPos, RANDOM_FLOAT(0.5,1.5) );
+			break;
+		}
+	}
+
+	CBaseDelay::TraceAttack( pevAttacker, flDamage, vecDir, ptr, bitsDamageType );
+}
+
+//=========================================================
+// Special takedamage for func_breakable. Allows us to make
+// exceptions that are breakable-specific
+// bitsDamageType indicates the type of damage sustained ie: DMG_CRUSH
+//=========================================================
+int CBreakable :: TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType )
+{
+	Vector	vecTemp;
+
+	// if Attacker == Inflictor, the attack was a melee or other instant-hit attack.
+	// (that is, no actual entity projectile was involved in the attack so use the shooter's origin). 
+	if ( pevAttacker == pevInflictor )	
+	{
+		vecTemp = pevInflictor->origin - ( pev->absmin + ( pev->size * 0.5 ) );
+		
+		// if a client hit the breakable with a crowbar, and breakable is crowbar-sensitive, break it now.
+		if ( FBitSet ( pevAttacker->flags, FL_CLIENT ) &&
+				 FBitSet ( pev->spawnflags, SF_BREAK_CROWBAR ) && (bitsDamageType & DMG_CLUB))
+			flDamage = pev->health;
+	}
+	else
+	// an actual missile was involved.
+	{
+		vecTemp = pevInflictor->origin - ( pev->absmin + ( pev->size * 0.5 ) );
+	}
+	
+	if (!IsBreakable())
+		return 0;
+
+	// Breakables take double damage from the crowbar
+	if ( bitsDamageType & DMG_CLUB )
+		flDamage *= 2;
+
+	// Boxes / glass / etc. don't take much poison damage, just the impact of the dart - consider that 10%
+	if ( bitsDamageType & DMG_POISON )
+		flDamage *= 0.1;
+
+// this global is still used for glass and other non-monster killables, along with decals.
+	g_vecAttackDir = vecTemp.Normalize();
+		
+// do the damage
+	pev->health -= flDamage;
+	if (pev->health <= 0)
+	{
+		//Killed( pevAttacker, GIB_NORMAL );
+		pev->takedamage = DAMAGE_NO;
+		pev->deadflag = DEAD_DEAD; 
+		pev->effects = EF_NODRAW;
+		Die();
+		return 0;
+	}
+
+	// Make a shard noise each time func breakable is hit.
+	// Don't play shard noise if cbreakable actually died.
+
+	DamageSound();
+
+	return 1;
+}
+
+
+void CBreakable::Die( void )
+{
+	Vector vecSpot;// shard origin
+	Vector vecVelocity;// shard velocity
+	CBaseEntity *pEntity = NULL;
+	char cFlag = 0;
+	int pitch;
+	float fvol;
+	
+	pitch = 95 + RANDOM_LONG(0,29);
+
+	if (pitch > 97 && pitch < 103)
+		pitch = 100;
+
+	// The more negative pev->health, the louder
+	// the sound should be.
+
+	fvol = RANDOM_FLOAT(0.85, 1.0) + (abs(pev->health) / 100.0);
+
+	if (fvol > 1.0)
+		fvol = 1.0;
+
+
+	switch (m_Material)
+	{
+	case matGlass:
+		switch ( RANDOM_LONG(0,1) )
+		{
+		case 0:	EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "debris/bustglass1.wav", fvol, ATTN_NORM, 0, pitch);	
+			break;
+		case 1:	EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "debris/bustglass2.wav", fvol, ATTN_NORM, 0, pitch);	
+			break;
+		}
+		cFlag = BREAK_GLASS;
+		break;
+
+	case matWood:
+		switch ( RANDOM_LONG(0,1) )
+		{
+		case 0:	EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "debris/bustcrate1.wav", fvol, ATTN_NORM, 0, pitch);	
+			break;
+		case 1:	EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "debris/bustcrate2.wav", fvol, ATTN_NORM, 0, pitch);	
+			break;
+		}
+		cFlag = BREAK_WOOD;
+		break;
+
+	case matComputer:
+	case matMetal:
+		switch ( RANDOM_LONG(0,1) )
+		{
+		case 0:	EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "debris/bustmetal1.wav", fvol, ATTN_NORM, 0, pitch);	
+			break;
+		case 1:	EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "debris/bustmetal2.wav", fvol, ATTN_NORM, 0, pitch);	
+			break;
+		}
+		cFlag = BREAK_METAL;
+		break;
+
+	case matFlesh:
+		switch ( RANDOM_LONG(0,1) )
+		{
+		case 0:	EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "debris/bustflesh1.wav", fvol, ATTN_NORM, 0, pitch);	
+			break;
+		case 1:	EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "debris/bustflesh2.wav", fvol, ATTN_NORM, 0, pitch);	
+			break;
+		}
+		cFlag = BREAK_FLESH;
+		break;
+
+	case matRocks:
+	case matCinderBlock:
+		switch ( RANDOM_LONG(0,1) )
+		{
+		case 0:	EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "debris/bustconcrete1.wav", fvol, ATTN_NORM, 0, pitch);	
+			break;
+		case 1:	EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "debris/bustconcrete2.wav", fvol, ATTN_NORM, 0, pitch);	
+			break;
+		}
+		cFlag = BREAK_CONCRETE;
+		break;
+
+	case matCeilingTile:
+		EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "debris/bustceiling.wav", fvol, ATTN_NORM, 0, pitch);
+		break;
+	}
+    
+		
+	if (m_Explosion == expDirected)
+		vecVelocity = g_vecAttackDir * 200;
+	else
+	{
+		vecVelocity.x = 0;
+		vecVelocity.y = 0;
+		vecVelocity.z = 0;
+	}
+
+	vecSpot = pev->origin + (pev->mins + pev->maxs) * 0.5;
+	MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, vecSpot );
+		WRITE_BYTE( TE_BREAKMODEL);
+
+		// position
+		WRITE_COORD( vecSpot.x );
+		WRITE_COORD( vecSpot.y );
+		WRITE_COORD( vecSpot.z );
+
+		// size
+		WRITE_COORD( pev->size.x);
+		WRITE_COORD( pev->size.y);
+		WRITE_COORD( pev->size.z);
+
+		// velocity
+		WRITE_COORD( vecVelocity.x ); 
+		WRITE_COORD( vecVelocity.y );
+		WRITE_COORD( vecVelocity.z );
+
+		// randomization
+		WRITE_BYTE( 10 ); 
+
+		// Model
+		WRITE_SHORT( m_idShard );	//model id#
+
+		// # of shards
+		WRITE_BYTE( 0 );	// let client decide
+
+		// duration
+		WRITE_BYTE( 25 );// 2.5 seconds
+
+		// flags
+		WRITE_BYTE( cFlag );
+	MESSAGE_END();
+
+	float size = pev->size.x;
+	if ( size < pev->size.y )
+		size = pev->size.y;
+	if ( size < pev->size.z )
+		size = pev->size.z;
+
+	// !!! HACK  This should work!
+	// Build a box above the entity that looks like an 8 pixel high sheet
+	Vector mins = pev->absmin;
+	Vector maxs = pev->absmax;
+	mins.z = pev->absmax.z;
+	maxs.z += 8;
+
+	// BUGBUG -- can only find 256 entities on a breakable -- should be enough
+	CBaseEntity *pList[256];
+	int count = UTIL_EntitiesInBox( pList, 256, mins, maxs, FL_ONGROUND );
+	if ( count )
+	{
+		for ( int i = 0; i < count; i++ )
+		{
+			ClearBits( pList[i]->pev->flags, FL_ONGROUND );
+			pList[i]->pev->groundentity = NULL;
+		}
+	}
+
+	// Don't fire something that could fire myself
+	pev->targetname = 0;
+
+	pev->solid = SOLID_NOT;
+
+	// Fire targets on break
+	SUB_UseTargets( NULL, USE_TOGGLE, 0 );
+
+	// << cgc >> Don't remove entity on death, we need to be able to reset it
+	//SetThink( SUB_Remove );
+	//pev->nextthink = pev->ltime + 0.1;
+	this->pev->effects = EF_NODRAW;
+	
+	if ( m_iszSpawnObject )
+		CBaseEntity::Create( (char *)STRING(m_iszSpawnObject), VecBModelOrigin(pev), pev->angles, edict() );
+
+
+	if ( Explodable() )
+	{
+		ExplosionCreate( Center(), pev->angles, edict(), ExplosionMagnitude(), TRUE );
+	}
+}
+
+
+void CBreakable::ResetEntity()
+{
+	this->mHasBeenBroken = false;
+
+	this->pev->effects &= ~EF_NODRAW;
+	this->pev->solid = SOLID_BSP;
+	this->pev->movetype = MOVETYPE_PUSH;
+	this->pev->takedamage = DAMAGE_YES;
+	
+	// Set health again
+	this->pev->health = this->pev->max_health;
+}
+
+BOOL CBreakable::IsBreakable( void ) 
+{ 
+	return (m_Material != matUnbreakableGlass) && (!this->mHasBeenBroken);
+}
+
+
+int	CBreakable :: DamageDecal( int bitsDamageType )
+{
+	if ( m_Material == matGlass  )
+		return DECAL_GLASSBREAK1 + RANDOM_LONG(0,2);
+
+	if ( m_Material == matUnbreakableGlass )
+		return DECAL_BPROOF1;
+
+	return CBaseEntity::DamageDecal( bitsDamageType );
+}
+
+void CBreakable::PrecacheAll()
+{
+	PRECACHE_SOUND("debris/bustcrate1.wav");
+	PRECACHE_SOUND("debris/bustcrate2.wav");
+	PRECACHE_MODEL("models/fleshgibs.mdl");
+	PRECACHE_SOUND("debris/bustflesh1.wav");
+	PRECACHE_SOUND("debris/bustflesh2.wav");
+	PRECACHE_SOUND("buttons/spark5.wav");
+	PRECACHE_SOUND("buttons/spark6.wav");
+	PRECACHE_MODEL("models/computergibs.mdl");
+	PRECACHE_SOUND("debris/bustmetal1.wav");
+	PRECACHE_SOUND("debris/bustmetal2.wav");
+	PRECACHE_MODEL("models/glassgibs.mdl");
+	PRECACHE_SOUND("debris/bustglass1.wav");
+	PRECACHE_SOUND("debris/bustglass2.wav");
+	PRECACHE_MODEL("models/metalplategibs.mdl");
+	PRECACHE_SOUND("debris/bustmetal1.wav");
+	PRECACHE_SOUND("debris/bustmetal2.wav");
+	PRECACHE_MODEL("models/cindergibs.mdl");
+	PRECACHE_SOUND("debris/bustconcrete1.wav");
+	PRECACHE_SOUND("debris/bustconcrete2.wav");
+	PRECACHE_MODEL("models/rockgibs.mdl");
+	PRECACHE_SOUND("debris/bustconcrete1.wav");
+	PRECACHE_SOUND("debris/bustconcrete2.wav");
+	PRECACHE_MODEL("models/ceilinggibs.mdl");
+	PRECACHE_SOUND("debris/bustceiling.wav");  
+	PRECACHE_SOUND("debris/wood1.wav");
+	PRECACHE_SOUND("debris/wood2.wav");
+	PRECACHE_SOUND("debris/wood3.wav");
+	PRECACHE_MODEL("models/woodgibs.mdl");
+	
+	for(int i = matGlass; i < matNone; i++)
+	{
+		Materials theMaterial = (Materials)(i);
+		MaterialSoundPrecache(theMaterial);
+	}
+}
+
+#include "dlls/cpushable.h"
+
+TYPEDESCRIPTION	CPushable::m_SaveData[] = 
+{
+	DEFINE_FIELD( CPushable, m_maxSpeed, FIELD_FLOAT ),
+	DEFINE_FIELD( CPushable, m_soundTime, FIELD_TIME ),
+};
+
+IMPLEMENT_SAVERESTORE( CPushable, CBreakable );
+
+LINK_ENTITY_TO_CLASS( func_pushable, CPushable );
+
+char *CPushable :: m_soundNames[3] = { "debris/pushbox1.wav", "debris/pushbox2.wav", "debris/pushbox3.wav" };
+
+
+void CPushable :: Spawn( void )
+{
+	if ( pev->spawnflags & SF_PUSH_BREAKABLE )
+		CBreakable::Spawn();
+	else
+		Precache( );
+
+	pev->movetype	= MOVETYPE_PUSHSTEP;
+	pev->solid		= SOLID_BBOX;
+	SET_MODEL( ENT(pev), STRING(pev->model) );
+
+	if ( pev->friction > 399 )
+		pev->friction = 399;
+
+	m_maxSpeed = 400 - pev->friction;
+	SetBits( pev->flags, FL_FLOAT );
+	pev->friction = 0;
+	
+	pev->origin.z += 1;	// Pick up off of the floor
+	UTIL_SetOrigin( pev, pev->origin );
+
+	// Multiply by area of the box's cross-section (assume 1000 units^3 standard volume)
+	pev->skin = ( pev->skin * (pev->maxs.x - pev->mins.x) * (pev->maxs.y - pev->mins.y) ) * 0.0005;
+	m_soundTime = 0;
+}
+
+
+void CPushable :: Precache( void )
+{
+	for ( int i = 0; i < 3; i++ )
+		PRECACHE_SOUND( m_soundNames[i] );
+
+	if ( pev->spawnflags & SF_PUSH_BREAKABLE )
+		CBreakable::Precache( );
+}
+
+
+void CPushable :: KeyValue( KeyValueData *pkvd )
+{
+	if ( FStrEq(pkvd->szKeyName, "size") )
+	{
+		int bbox = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+
+		switch( bbox )
+		{
+		case 0:	// Point
+			UTIL_SetSize(pev, Vector(-8, -8, -8), Vector(8, 8, 8));
+			break;
+
+		case 2: // Big Hull!?!?	!!!BUGBUG Figure out what this hull really is
+			UTIL_SetSize(pev, VEC_DUCK_HULL_MIN*2, VEC_DUCK_HULL_MAX*2);
+			break;
+
+		case 3: // Player duck
+			UTIL_SetSize(pev, VEC_DUCK_HULL_MIN, VEC_DUCK_HULL_MAX);
+			break;
+
+		default:
+		case 1: // Player
+			UTIL_SetSize(pev, VEC_HULL_MIN, VEC_HULL_MAX);
+			break;
+		}
+
+	}
+	else if ( FStrEq(pkvd->szKeyName, "buoyancy") )
+	{
+		pev->skin = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBreakable::KeyValue( pkvd );
+}
+
+
+// Pull the func_pushable
+void CPushable :: Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( !pActivator || !pActivator->IsPlayer() )
+	{
+		if ( pev->spawnflags & SF_PUSH_BREAKABLE )
+			this->CBreakable::Use( pActivator, pCaller, useType, value );
+		return;
+	}
+
+	if ( pActivator->pev->velocity != g_vecZero )
+		Move( pActivator, 0 );
+}
+
+
+void CPushable :: Touch( CBaseEntity *pOther )
+{
+	if ( FClassnameIs( pOther->pev, "worldspawn" ) )
+		return;
+
+	Move( pOther, 1 );
+}
+
+
+void CPushable :: Move( CBaseEntity *pOther, int push )
+{
+	entvars_t*	pevToucher = pOther->pev;
+	int playerTouch = 0;
+
+	// Is entity standing on this pushable ?
+	if ( FBitSet(pevToucher->flags,FL_ONGROUND) && pevToucher->groundentity && VARS(pevToucher->groundentity) == pev )
+	{
+		// Only push if floating
+		if ( pev->waterlevel > 0 )
+			pev->velocity.z += pevToucher->velocity.z * 0.1;
+
+		return;
+	}
+
+
+	if ( pOther->IsPlayer() )
+	{
+		if ( push && !(pevToucher->button & (IN_FORWARD|IN_USE)) )	// Don't push unless the player is pushing forward and NOT use (pull)
+			return;
+		playerTouch = 1;
+	}
+
+	float factor;
+
+	if ( playerTouch )
+	{
+		if ( !(pevToucher->flags & FL_ONGROUND) )	// Don't push away from jumping/falling players unless in water
+		{
+			if ( pev->waterlevel < 1 )
+				return;
+			else 
+				factor = 0.1;
+		}
+		else
+			factor = 1;
+	}
+	else 
+		factor = 0.25;
+
+	pev->velocity.x += pevToucher->velocity.x * factor;
+	pev->velocity.y += pevToucher->velocity.y * factor;
+
+	float length = sqrt( pev->velocity.x * pev->velocity.x + pev->velocity.y * pev->velocity.y );
+	if ( push && (length > MaxSpeed()) )
+	{
+		pev->velocity.x = (pev->velocity.x * MaxSpeed() / length );
+		pev->velocity.y = (pev->velocity.y * MaxSpeed() / length );
+	}
+	if ( playerTouch )
+	{
+		pevToucher->velocity.x = pev->velocity.x;
+		pevToucher->velocity.y = pev->velocity.y;
+		if ( (gpGlobals->time - m_soundTime) > 0.7 )
+		{
+			m_soundTime = gpGlobals->time;
+			if ( length > 0 && FBitSet(pev->flags,FL_ONGROUND) )
+			{
+				m_lastSound = RANDOM_LONG(0,2);
+				EMIT_SOUND(ENT(pev), CHAN_WEAPON, m_soundNames[m_lastSound], 0.5, ATTN_NORM);
+	//			SetThink( StopSound );
+	//			pev->nextthink = pev->ltime + 0.1;
+			}
+			else
+				STOP_SOUND( ENT(pev), CHAN_WEAPON, m_soundNames[m_lastSound] );
+		}
+	}
+}
+
+#if 0
+void CPushable::StopSound( void )
+{
+	Vector dist = pev->oldorigin - pev->origin;
+	if ( dist.Length() <= 0 )
+		STOP_SOUND( ENT(pev), CHAN_WEAPON, m_soundNames[m_lastSound] );
+}
+#endif
+
+int CPushable::TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType )
+{
+	if ( pev->spawnflags & SF_PUSH_BREAKABLE )
+		return CBreakable::TakeDamage( pevInflictor, pevAttacker, flDamage, bitsDamageType );
+
+	return 1;
+}
+
diff --git a/main/source/dlls/func_break.h b/main/source/dlls/func_break.h
new file mode 100644
index 00000000..23fb6cda
--- /dev/null
+++ b/main/source/dlls/func_break.h
@@ -0,0 +1,80 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef FUNC_BREAK_H
+#define FUNC_BREAK_H
+
+typedef enum { expRandom, expDirected} Explosions;
+typedef enum { matGlass = 0, matWood, matMetal, matFlesh, matCinderBlock, matCeilingTile, matComputer, matUnbreakableGlass, matRocks, matNone, matLastMaterial } Materials;
+
+#define	NUM_SHARDS 6 // this many shards spawned when breakable objects break;
+
+class CBreakable : public CBaseDelay
+{
+public:
+	// basic functions
+	void SetMaterial(Materials inMaterial);
+	void Spawn( void );
+	void Precache( void );
+	void KeyValue( KeyValueData* pkvd);
+	void EXPORT BreakTouch( CBaseEntity *pOther );
+	void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void DamageSound( void );
+	virtual void ResetEntity();
+	static void PrecacheAll();
+	~CBreakable();
+
+	// breakables use an overridden takedamage
+	virtual int TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType );
+	// To spark when hit
+	void TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType );
+
+	BOOL IsBreakable( void );
+	BOOL SparkWhenHit( void );
+
+	int	 DamageDecal( int bitsDamageType );
+
+	void EXPORT		Die( void );
+	virtual int		ObjectCaps( void ) { return (CBaseEntity :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION); }
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+
+	inline BOOL		Explodable( void ) { return ExplosionMagnitude() > 0; }
+	inline int		ExplosionMagnitude( void ) { return pev->impulse; }
+	inline void		ExplosionSetMagnitude( int magnitude ) { pev->impulse = magnitude; }
+
+	static void MaterialSoundPrecache( Materials precacheMaterial );
+	static void MaterialSoundRandom( edict_t *pEdict, Materials soundMaterial, float volume );
+	static const char **MaterialSoundList( Materials precacheMaterial, int &soundCount );
+
+	static const char *pSoundsWood[];
+	static const char *pSoundsFlesh[];
+	static const char *pSoundsGlass[];
+	static const char *pSoundsMetal[];
+	static const char *pSoundsConcrete[];
+	static const char *pSpawnObjects[];
+
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	Materials	m_Material;
+	Explosions	m_Explosion;
+	int			m_idShard;
+	float		m_angle;
+	int			m_iszGibModel;
+	int			m_iszSpawnObject;
+
+	bool		mHasBeenBroken;
+};
+
+#endif	// FUNC_BREAK_H
diff --git a/main/source/dlls/func_tank.cpp b/main/source/dlls/func_tank.cpp
new file mode 100644
index 00000000..648f8309
--- /dev/null
+++ b/main/source/dlls/func_tank.cpp
@@ -0,0 +1,1039 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "effects.h"
+#include "weapons.h"
+#include "explode.h"
+
+#include "player.h"
+
+
+#define SF_TANK_ACTIVE			0x0001
+#define SF_TANK_PLAYER			0x0002
+#define SF_TANK_HUMANS			0x0004
+#define SF_TANK_ALIENS			0x0008
+#define SF_TANK_LINEOFSIGHT		0x0010
+#define SF_TANK_CANCONTROL		0x0020
+#define SF_TANK_SOUNDON			0x8000
+
+enum TANKBULLET
+{
+	TANK_BULLET_NONE = 0,
+	TANK_BULLET_9MM = 1,
+	TANK_BULLET_MP5 = 2,
+	TANK_BULLET_12MM = 3,
+};
+
+//			Custom damage
+//			env_laser (duration is 0.5 rate of fire)
+//			rockets
+//			explosion?
+
+class CFuncTank : public CBaseEntity
+{
+public:
+	void	Spawn( void );
+	void	Precache( void );
+	void	KeyValue( KeyValueData *pkvd );
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void	Think( void );
+	void	TrackTarget( void );
+
+	virtual void Fire( const Vector &barrelEnd, const Vector &forward, entvars_t *pevAttacker );
+	virtual Vector UpdateTargetPosition( CBaseEntity *pTarget )
+	{
+		return pTarget->BodyTarget( pev->origin );
+	}
+
+	void	StartRotSound( void );
+	void	StopRotSound( void );
+
+	// Bmodels don't go across transitions
+	virtual int	ObjectCaps( void ) { return CBaseEntity :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+
+	inline BOOL IsActive( void ) { return (pev->spawnflags & SF_TANK_ACTIVE)?TRUE:FALSE; }
+	inline void TankActivate( void ) { pev->spawnflags |= SF_TANK_ACTIVE; pev->nextthink = pev->ltime + 0.1; m_fireLast = 0; }
+	inline void TankDeactivate( void ) { pev->spawnflags &= ~SF_TANK_ACTIVE; m_fireLast = 0; StopRotSound(); }
+	inline BOOL CanFire( void ) { return (gpGlobals->time - m_lastSightTime) < m_persist; }
+	BOOL		InRange( float range );
+
+	// Acquire a target.  pPlayer is a player in the PVS
+	edict_t		*FindTarget( edict_t *pPlayer );
+
+	void		TankTrace( const Vector &vecStart, const Vector &vecForward, const Vector &vecSpread, TraceResult &tr );
+
+	Vector		BarrelPosition( void )
+	{
+		Vector forward, right, up;
+		UTIL_MakeVectorsPrivate( pev->angles, forward, right, up );
+		return pev->origin + (forward * m_barrelPos.x) + (right * m_barrelPos.y) + (up * m_barrelPos.z);
+	}
+
+	void		AdjustAnglesForBarrel( Vector &angles, float distance );
+
+	virtual int	Save( CSave &save );
+	virtual int	Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	BOOL OnControls( entvars_t *pevTest );
+	BOOL StartControl( CBasePlayer* pController );
+	void StopControl( void );
+	void ControllerPostFrame( void );
+
+
+protected:
+	CBasePlayer* m_pController;
+	float		m_flNextAttack;
+	Vector		m_vecControllerUsePos;
+	
+	float		m_yawCenter;	// "Center" yaw
+	float		m_yawRate;		// Max turn rate to track targets
+	float		m_yawRange;		// Range of turning motion (one-sided: 30 is +/- 30 degress from center)
+								// Zero is full rotation
+	float		m_yawTolerance;	// Tolerance angle
+
+	float		m_pitchCenter;	// "Center" pitch
+	float		m_pitchRate;	// Max turn rate on pitch
+	float		m_pitchRange;	// Range of pitch motion as above
+	float		m_pitchTolerance;	// Tolerance angle
+
+	float		m_fireLast;		// Last time I fired
+	float		m_fireRate;		// How many rounds/second
+	float		m_lastSightTime;// Last time I saw target
+	float		m_persist;		// Persistence of firing (how long do I shoot when I can't see)
+	float		m_minRange;		// Minimum range to aim/track
+	float		m_maxRange;		// Max range to aim/track
+
+	Vector		m_barrelPos;	// Length of the freakin barrel
+	float		m_spriteScale;	// Scale of any sprites we shoot
+	int			m_iszSpriteSmoke;
+	int			m_iszSpriteFlash;
+	TANKBULLET	m_bulletType;	// Bullet type
+	int			m_iBulletDamage; // 0 means use Bullet type's default damage
+	
+	Vector		m_sightOrigin;	// Last sight of target
+	int			m_spread;		// firing spread
+	int			m_iszMaster;	// Master entity (game_team_master or multisource)
+};
+
+
+TYPEDESCRIPTION	CFuncTank::m_SaveData[] = 
+{
+	DEFINE_FIELD( CFuncTank, m_yawCenter, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncTank, m_yawRate, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncTank, m_yawRange, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncTank, m_yawTolerance, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncTank, m_pitchCenter, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncTank, m_pitchRate, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncTank, m_pitchRange, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncTank, m_pitchTolerance, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncTank, m_fireLast, FIELD_TIME ),
+	DEFINE_FIELD( CFuncTank, m_fireRate, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncTank, m_lastSightTime, FIELD_TIME ),
+	DEFINE_FIELD( CFuncTank, m_persist, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncTank, m_minRange, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncTank, m_maxRange, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncTank, m_barrelPos, FIELD_VECTOR ),
+	DEFINE_FIELD( CFuncTank, m_spriteScale, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncTank, m_iszSpriteSmoke, FIELD_STRING ),
+	DEFINE_FIELD( CFuncTank, m_iszSpriteFlash, FIELD_STRING ),
+	DEFINE_FIELD( CFuncTank, m_bulletType, FIELD_INTEGER ),
+	DEFINE_FIELD( CFuncTank, m_sightOrigin, FIELD_VECTOR ),
+	DEFINE_FIELD( CFuncTank, m_spread, FIELD_INTEGER ),
+	DEFINE_FIELD( CFuncTank, m_pController, FIELD_CLASSPTR ),
+	DEFINE_FIELD( CFuncTank, m_vecControllerUsePos, FIELD_VECTOR ),
+	DEFINE_FIELD( CFuncTank, m_flNextAttack, FIELD_TIME ),
+	DEFINE_FIELD( CFuncTank, m_iBulletDamage, FIELD_INTEGER ),
+	DEFINE_FIELD( CFuncTank, m_iszMaster, FIELD_STRING ),
+};
+
+IMPLEMENT_SAVERESTORE( CFuncTank, CBaseEntity );
+
+static Vector gTankSpread[] =
+{
+	Vector( 0, 0, 0 ),		// perfect
+	Vector( 0.025, 0.025, 0.025 ),	// small cone
+	Vector( 0.05, 0.05, 0.05 ),  // medium cone
+	Vector( 0.1, 0.1, 0.1 ),	// large cone
+	Vector( 0.25, 0.25, 0.25 ),	// extra-large cone
+};
+#define MAX_FIRING_SPREADS ARRAYSIZE(gTankSpread)
+
+
+void CFuncTank :: Spawn( void )
+{
+	Precache();
+
+	pev->movetype	= MOVETYPE_PUSH;  // so it doesn't get pushed by anything
+	pev->solid		= SOLID_BSP;
+	SET_MODEL( ENT(pev), STRING(pev->model) );
+
+	m_yawCenter = pev->angles.y;
+	m_pitchCenter = pev->angles.x;
+
+	if ( IsActive() )
+		pev->nextthink = pev->ltime + 1.0;
+
+	m_sightOrigin = BarrelPosition(); // Point at the end of the barrel
+
+	if ( m_fireRate <= 0 )
+		m_fireRate = 1;
+	if ( m_spread > MAX_FIRING_SPREADS )
+		m_spread = 0;
+
+	pev->oldorigin = pev->origin;
+}
+
+
+void CFuncTank :: Precache( void )
+{
+	if ( m_iszSpriteSmoke )
+		PRECACHE_MODEL( (char *)STRING(m_iszSpriteSmoke) );
+	if ( m_iszSpriteFlash )
+		PRECACHE_MODEL( (char *)STRING(m_iszSpriteFlash) );
+
+	if ( pev->noise )
+		PRECACHE_SOUND( (char *)STRING(pev->noise) );
+}
+
+
+void CFuncTank :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "yawrate"))
+	{
+		m_yawRate = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "yawrange"))
+	{
+		m_yawRange = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "yawtolerance"))
+	{
+		m_yawTolerance = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "pitchrange"))
+	{
+		m_pitchRange = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "pitchrate"))
+	{
+		m_pitchRate = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "pitchtolerance"))
+	{
+		m_pitchTolerance = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "firerate"))
+	{
+		m_fireRate = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "barrel"))
+	{
+		m_barrelPos.x = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "barrely"))
+	{
+		m_barrelPos.y = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "barrelz"))
+	{
+		m_barrelPos.z = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "spritescale"))
+	{
+		m_spriteScale = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "spritesmoke"))
+	{
+		m_iszSpriteSmoke = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "spriteflash"))
+	{
+		m_iszSpriteFlash = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "rotatesound"))
+	{
+		pev->noise = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "persistence"))
+	{
+		m_persist = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "bullet"))
+	{
+		m_bulletType = (TANKBULLET)atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if ( FStrEq(pkvd->szKeyName, "bullet_damage" )) 
+	{
+		m_iBulletDamage = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "firespread"))
+	{
+		m_spread = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "minRange"))
+	{
+		m_minRange = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "maxRange"))
+	{
+		m_maxRange = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "master"))
+	{
+		m_iszMaster = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseEntity::KeyValue( pkvd );
+}
+
+////////////// START NEW STUFF //////////////
+
+//==================================================================================
+// TANK CONTROLLING
+BOOL CFuncTank :: OnControls( entvars_t *pevTest )
+{
+	if ( !(pev->spawnflags & SF_TANK_CANCONTROL) )
+		return FALSE;
+
+	Vector offset = pevTest->origin - pev->origin;
+
+	if ( (m_vecControllerUsePos - pevTest->origin).Length() < 30 )
+		return TRUE;
+
+	return FALSE;
+}
+
+BOOL CFuncTank :: StartControl( CBasePlayer *pController )
+{
+	if ( m_pController != NULL )
+		return FALSE;
+
+	// Team only or disabled?
+	if ( m_iszMaster )
+	{
+		if ( !UTIL_IsMasterTriggered( m_iszMaster, pController ) )
+			return FALSE;
+	}
+
+	ALERT( at_console, "using TANK!\n");
+
+	m_pController = pController;
+	if ( m_pController->m_pActiveItem )
+	{
+		m_pController->m_pActiveItem->Holster();
+		m_pController->pev->weaponmodel = 0;
+		m_pController->pev->viewmodel = 0; 
+
+	}
+
+	m_pController->m_iHideHUD |= HIDEHUD_WEAPONS;
+	m_vecControllerUsePos = m_pController->pev->origin;
+	
+	pev->nextthink = pev->ltime + 0.1;
+	
+	return TRUE;
+}
+
+void CFuncTank :: StopControl()
+{
+	// TODO: bring back the controllers current weapon
+	if ( !m_pController )
+		return;
+
+	if ( m_pController->m_pActiveItem )
+		m_pController->m_pActiveItem->Deploy();
+
+	ALERT( at_console, "stopped using TANK\n");
+
+	m_pController->m_iHideHUD &= ~HIDEHUD_WEAPONS;
+
+	pev->nextthink = 0;
+	m_pController = NULL;
+
+	if ( IsActive() )
+		pev->nextthink = pev->ltime + 1.0;
+}
+
+// Called each frame by the player's ItemPostFrame
+void CFuncTank :: ControllerPostFrame( void )
+{
+	ASSERT(m_pController != NULL);
+
+	if ( gpGlobals->time < m_flNextAttack )
+		return;
+
+	if ( m_pController->pev->button & IN_ATTACK )
+	{
+		Vector vecForward;
+		UTIL_MakeVectorsPrivate( pev->angles, vecForward, NULL, NULL );
+
+		m_fireLast = gpGlobals->time - (1/m_fireRate) - 0.01;  // to make sure the gun doesn't fire too many bullets
+
+		Fire( BarrelPosition(), vecForward, m_pController->pev );
+		
+		// HACKHACK -- make some noise (that the AI can hear)
+		if ( m_pController && m_pController->IsPlayer() )
+			((CBasePlayer *)m_pController)->m_iWeaponVolume = LOUD_GUN_VOLUME;
+
+		m_flNextAttack = gpGlobals->time + (1/m_fireRate);
+	}
+}
+////////////// END NEW STUFF //////////////
+
+
+void CFuncTank :: Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( pev->spawnflags & SF_TANK_CANCONTROL )
+	{  // player controlled turret
+
+		if ( pActivator->Classify() != CLASS_PLAYER )
+			return;
+
+		if ( value == 2 && useType == USE_SET )
+		{
+			ControllerPostFrame();
+		}
+		else if ( !m_pController && useType != USE_OFF )
+		{
+			((CBasePlayer*)pActivator)->m_pTank = this;
+			StartControl( (CBasePlayer*)pActivator );
+		}
+		else
+		{
+			StopControl();
+		}
+	}
+	else
+	{
+		if ( !ShouldToggle( useType, IsActive() ) )
+			return;
+
+		if ( IsActive() )
+			TankDeactivate();
+		else
+			TankActivate();
+	}
+}
+
+
+edict_t *CFuncTank :: FindTarget( edict_t *pPlayer )
+{
+	return pPlayer;
+}
+
+
+
+BOOL CFuncTank :: InRange( float range )
+{
+	if ( range < m_minRange )
+		return FALSE;
+	if ( m_maxRange > 0 && range > m_maxRange )
+		return FALSE;
+
+	return TRUE;
+}
+
+
+void CFuncTank :: Think( void )
+{
+	pev->avelocity = g_vecZero;
+	TrackTarget();
+
+	if ( fabs(pev->avelocity.x) > 1 || fabs(pev->avelocity.y) > 1 )
+		StartRotSound();
+	else
+		StopRotSound();
+}
+
+void CFuncTank::TrackTarget( void )
+{
+	TraceResult tr;
+	edict_t *pPlayer = FIND_CLIENT_IN_PVS( edict() );
+	BOOL updateTime = FALSE, lineOfSight;
+	Vector angles, direction, targetPosition, barrelEnd;
+	edict_t *pTarget;
+
+	// Get a position to aim for
+	if (m_pController)
+	{
+		// Tanks attempt to mirror the player's angles
+		angles = m_pController->pev->v_angle;
+		angles[0] = 0 - angles[0];
+		pev->nextthink = pev->ltime + 0.05;
+	}
+	else
+	{
+		if ( IsActive() )
+			pev->nextthink = pev->ltime + 0.1;
+		else
+			return;
+
+		if ( FNullEnt( pPlayer ) )
+		{
+			if ( IsActive() )
+				pev->nextthink = pev->ltime + 2;	// Wait 2 secs
+			return;
+		}
+		pTarget = FindTarget( pPlayer );
+		if ( !pTarget )
+			return;
+
+		// Calculate angle needed to aim at target
+		barrelEnd = BarrelPosition();
+		targetPosition = pTarget->v.origin + pTarget->v.view_ofs;
+		float range = (targetPosition - barrelEnd).Length();
+		
+		if ( !InRange( range ) )
+			return;
+
+		UTIL_TraceLine( barrelEnd, targetPosition, dont_ignore_monsters, edict(), &tr );
+		
+		lineOfSight = FALSE;
+		// No line of sight, don't track
+		if ( tr.flFraction == 1.0 || tr.pHit == pTarget )
+		{
+			lineOfSight = TRUE;
+
+			CBaseEntity *pInstance = CBaseEntity::Instance(pTarget);
+			if ( InRange( range ) && pInstance && pInstance->IsAlive() )
+			{
+				updateTime = TRUE;
+				m_sightOrigin = UpdateTargetPosition( pInstance );
+			}
+		}
+
+		// Track sight origin
+
+// !!! I'm not sure what i changed
+		direction = m_sightOrigin - pev->origin;
+//		direction = m_sightOrigin - barrelEnd;
+		angles = UTIL_VecToAngles( direction );
+
+		// Calculate the additional rotation to point the end of the barrel at the target (not the gun's center) 
+		AdjustAnglesForBarrel( angles, direction.Length() );
+	}
+
+	angles.x = -angles.x;
+
+	// Force the angles to be relative to the center position
+	angles.y = m_yawCenter + UTIL_AngleDistance( angles.y, m_yawCenter );
+	angles.x = m_pitchCenter + UTIL_AngleDistance( angles.x, m_pitchCenter );
+
+	// Limit against range in y
+	if ( angles.y > m_yawCenter + m_yawRange )
+	{
+		angles.y = m_yawCenter + m_yawRange;
+		updateTime = FALSE;	// Don't update if you saw the player, but out of range
+	}
+	else if ( angles.y < (m_yawCenter - m_yawRange) )
+	{
+		angles.y = (m_yawCenter - m_yawRange);
+		updateTime = FALSE; // Don't update if you saw the player, but out of range
+	}
+
+	if ( updateTime )
+		m_lastSightTime = gpGlobals->time;
+
+	// Move toward target at rate or less
+	float distY = UTIL_AngleDistance( angles.y, pev->angles.y );
+	pev->avelocity.y = distY * 10;
+	if ( pev->avelocity.y > m_yawRate )
+		pev->avelocity.y = m_yawRate;
+	else if ( pev->avelocity.y < -m_yawRate )
+		pev->avelocity.y = -m_yawRate;
+
+	// Limit against range in x
+	if ( angles.x > m_pitchCenter + m_pitchRange )
+		angles.x = m_pitchCenter + m_pitchRange;
+	else if ( angles.x < m_pitchCenter - m_pitchRange )
+		angles.x = m_pitchCenter - m_pitchRange;
+
+	// Move toward target at rate or less
+	float distX = UTIL_AngleDistance( angles.x, pev->angles.x );
+	pev->avelocity.x = distX  * 10;
+
+	if ( pev->avelocity.x > m_pitchRate )
+		pev->avelocity.x = m_pitchRate;
+	else if ( pev->avelocity.x < -m_pitchRate )
+		pev->avelocity.x = -m_pitchRate;
+
+	if ( m_pController )
+		return;
+
+	if ( CanFire() && ( (fabs(distX) < m_pitchTolerance && fabs(distY) < m_yawTolerance) || (pev->spawnflags & SF_TANK_LINEOFSIGHT) ) )
+	{
+		BOOL fire = FALSE;
+		Vector forward;
+		UTIL_MakeVectorsPrivate( pev->angles, forward, NULL, NULL );
+
+		if ( pev->spawnflags & SF_TANK_LINEOFSIGHT )
+		{
+			float length = direction.Length();
+			UTIL_TraceLine( barrelEnd, barrelEnd + forward * length, dont_ignore_monsters, edict(), &tr );
+			if ( tr.pHit == pTarget )
+				fire = TRUE;
+		}
+		else
+			fire = TRUE;
+
+		if ( fire )
+		{
+			Fire( BarrelPosition(), forward, pev );
+		}
+		else
+			m_fireLast = 0;
+	}
+	else
+		m_fireLast = 0;
+}
+
+
+// If barrel is offset, add in additional rotation
+void CFuncTank::AdjustAnglesForBarrel( Vector &angles, float distance )
+{
+	float r2, d2;
+
+
+	if ( m_barrelPos.y != 0 || m_barrelPos.z != 0 )
+	{
+		distance -= m_barrelPos.z;
+		d2 = distance * distance;
+		if ( m_barrelPos.y )
+		{
+			r2 = m_barrelPos.y * m_barrelPos.y;
+			angles.y += (180.0 / M_PI) * atan2( m_barrelPos.y, sqrt( d2 - r2 ) );
+		}
+		if ( m_barrelPos.z )
+		{
+			r2 = m_barrelPos.z * m_barrelPos.z;
+			angles.x += (180.0 / M_PI) * atan2( -m_barrelPos.z, sqrt( d2 - r2 ) );
+		}
+	}
+}
+
+
+// Fire targets and spawn sprites
+void CFuncTank::Fire( const Vector &barrelEnd, const Vector &forward, entvars_t *pevAttacker )
+{
+	if ( m_fireLast != 0 )
+	{
+		if ( m_iszSpriteSmoke )
+		{
+			CSprite *pSprite = CSprite::SpriteCreate( STRING(m_iszSpriteSmoke), barrelEnd, TRUE );
+			pSprite->AnimateAndDie( RANDOM_FLOAT( 15.0, 20.0 ) );
+			pSprite->SetTransparency( kRenderTransAlpha, pev->rendercolor.x, pev->rendercolor.y, pev->rendercolor.z, 255, kRenderFxNone );
+			pSprite->pev->velocity.z = RANDOM_FLOAT(40, 80);
+			pSprite->SetScale( m_spriteScale );
+		}
+		if ( m_iszSpriteFlash )
+		{
+			CSprite *pSprite = CSprite::SpriteCreate( STRING(m_iszSpriteFlash), barrelEnd, TRUE );
+			pSprite->AnimateAndDie( 60 );
+			pSprite->SetTransparency( kRenderTransAdd, 255, 255, 255, 255, kRenderFxNoDissipation );
+			pSprite->SetScale( m_spriteScale );
+
+			// Hack Hack, make it stick around for at least 100 ms.
+			pSprite->pev->nextthink += 0.1;
+		}
+		SUB_UseTargets( this, USE_TOGGLE, 0 );
+	}
+	m_fireLast = gpGlobals->time;
+}
+
+
+void CFuncTank::TankTrace( const Vector &vecStart, const Vector &vecForward, const Vector &vecSpread, TraceResult &tr )
+{
+	// get circular gaussian spread
+	float x, y, z;
+	do {
+		x = RANDOM_FLOAT(-0.5,0.5) + RANDOM_FLOAT(-0.5,0.5);
+		y = RANDOM_FLOAT(-0.5,0.5) + RANDOM_FLOAT(-0.5,0.5);
+		z = x*x+y*y;
+	} while (z > 1);
+	Vector vecDir = vecForward +
+		x * vecSpread.x * gpGlobals->v_right +
+		y * vecSpread.y * gpGlobals->v_up;
+	Vector vecEnd;
+	
+	vecEnd = vecStart + vecDir * 4096;
+	UTIL_TraceLine( vecStart, vecEnd, dont_ignore_monsters, edict(), &tr );
+}
+
+	
+void CFuncTank::StartRotSound( void )
+{
+	if ( !pev->noise || (pev->spawnflags & SF_TANK_SOUNDON) )
+		return;
+	pev->spawnflags |= SF_TANK_SOUNDON;
+	EMIT_SOUND( edict(), CHAN_STATIC, (char*)STRING(pev->noise), 0.85, ATTN_NORM);
+}
+
+
+void CFuncTank::StopRotSound( void )
+{
+	if ( pev->spawnflags & SF_TANK_SOUNDON )
+		STOP_SOUND( edict(), CHAN_STATIC, (char*)STRING(pev->noise) );
+	pev->spawnflags &= ~SF_TANK_SOUNDON;
+}
+
+class CFuncTankGun : public CFuncTank
+{
+public:
+	void Fire( const Vector &barrelEnd, const Vector &forward, entvars_t *pevAttacker );
+};
+LINK_ENTITY_TO_CLASS( func_tank, CFuncTankGun );
+
+void CFuncTankGun::Fire( const Vector &barrelEnd, const Vector &forward, entvars_t *pevAttacker )
+{
+	int i;
+
+	if ( m_fireLast != 0 )
+	{
+		// FireBullets needs gpGlobals->v_up, etc.
+		UTIL_MakeAimVectors(pev->angles);
+
+		int bulletCount = (gpGlobals->time - m_fireLast) * m_fireRate;
+		if ( bulletCount > 0 )
+		{
+			for ( i = 0; i < bulletCount; i++ )
+			{
+				switch( m_bulletType )
+				{
+				case TANK_BULLET_9MM:
+					FireBullets( 1, barrelEnd, forward, gTankSpread[m_spread], 4096, BULLET_MONSTER_9MM, 1, m_iBulletDamage, pevAttacker );
+					break;
+
+				case TANK_BULLET_MP5:
+					FireBullets( 1, barrelEnd, forward, gTankSpread[m_spread], 4096, BULLET_MONSTER_MP5, 1, m_iBulletDamage, pevAttacker );
+					break;
+
+				case TANK_BULLET_12MM:
+					FireBullets( 1, barrelEnd, forward, gTankSpread[m_spread], 4096, BULLET_MONSTER_12MM, 1, m_iBulletDamage, pevAttacker );
+					break;
+
+				default:
+				case TANK_BULLET_NONE:
+					break;
+				}
+			}
+			CFuncTank::Fire( barrelEnd, forward, pevAttacker );
+		}
+	}
+	else
+		CFuncTank::Fire( barrelEnd, forward, pevAttacker );
+}
+
+
+
+class CFuncTankLaser : public CFuncTank
+{
+public:
+	void	Activate( void );
+	void	KeyValue( KeyValueData *pkvd );
+	void	Fire( const Vector &barrelEnd, const Vector &forward, entvars_t *pevAttacker );
+	void	Think( void );
+	CLaser *GetLaser( void );
+
+	virtual int	Save( CSave &save );
+	virtual int	Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+private:
+	CLaser	*m_pLaser;
+	float	m_laserTime;
+};
+LINK_ENTITY_TO_CLASS( func_tanklaser, CFuncTankLaser );
+
+TYPEDESCRIPTION	CFuncTankLaser::m_SaveData[] = 
+{
+	DEFINE_FIELD( CFuncTankLaser, m_pLaser, FIELD_CLASSPTR ),
+	DEFINE_FIELD( CFuncTankLaser, m_laserTime, FIELD_TIME ),
+};
+
+IMPLEMENT_SAVERESTORE( CFuncTankLaser, CFuncTank );
+
+void CFuncTankLaser::Activate( void )
+{
+	if ( !GetLaser() )
+	{
+		UTIL_Remove(this);
+		ALERT( at_error, "Laser tank with no env_laser!\n" );
+	}
+	else
+	{
+		m_pLaser->TurnOff();
+	}
+}
+
+
+void CFuncTankLaser::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "laserentity"))
+	{
+		pev->message = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CFuncTank::KeyValue( pkvd );
+}
+
+
+CLaser *CFuncTankLaser::GetLaser( void )
+{
+	if ( m_pLaser )
+		return m_pLaser;
+
+	edict_t	*pentLaser;
+
+	pentLaser = FIND_ENTITY_BY_TARGETNAME( NULL, STRING(pev->message) );
+	while ( !FNullEnt( pentLaser ) )
+	{
+		// Found the landmark
+		if ( FClassnameIs( pentLaser, "env_laser" ) )
+		{
+			m_pLaser = (CLaser *)CBaseEntity::Instance(pentLaser);
+			break;
+		}
+		else
+			pentLaser = FIND_ENTITY_BY_TARGETNAME( pentLaser, STRING(pev->message) );
+	}
+
+	return m_pLaser;
+}
+
+
+void CFuncTankLaser::Think( void )
+{
+	if ( m_pLaser && (gpGlobals->time > m_laserTime) )
+		m_pLaser->TurnOff();
+
+	CFuncTank::Think();
+}
+
+
+void CFuncTankLaser::Fire( const Vector &barrelEnd, const Vector &forward, entvars_t *pevAttacker )
+{
+	int i;
+	TraceResult tr;
+
+	if ( m_fireLast != 0 && GetLaser() )
+	{
+		// TankTrace needs gpGlobals->v_up, etc.
+		UTIL_MakeAimVectors(pev->angles);
+
+		int bulletCount = (gpGlobals->time - m_fireLast) * m_fireRate;
+		if ( bulletCount )
+		{
+			for ( i = 0; i < bulletCount; i++ )
+			{
+				m_pLaser->pev->origin = barrelEnd;
+				TankTrace( barrelEnd, forward, gTankSpread[m_spread], tr );
+				
+				m_laserTime = gpGlobals->time;
+				m_pLaser->TurnOn();
+				m_pLaser->pev->dmgtime = gpGlobals->time - 1.0;
+				m_pLaser->FireAtPoint( tr );
+				m_pLaser->pev->nextthink = 0;
+			}
+			CFuncTank::Fire( barrelEnd, forward, pev );
+		}
+	}
+	else
+	{
+		CFuncTank::Fire( barrelEnd, forward, pev );
+	}
+}
+
+class CFuncTankRocket : public CFuncTank
+{
+public:
+	void Precache( void );
+	void Fire( const Vector &barrelEnd, const Vector &forward, entvars_t *pevAttacker );
+};
+LINK_ENTITY_TO_CLASS( func_tankrocket, CFuncTankRocket );
+
+void CFuncTankRocket::Precache( void )
+{
+	UTIL_PrecacheOther( "rpg_rocket" );
+	CFuncTank::Precache();
+}
+
+
+
+void CFuncTankRocket::Fire( const Vector &barrelEnd, const Vector &forward, entvars_t *pevAttacker )
+{
+	int i;
+
+	if ( m_fireLast != 0 )
+	{
+		int bulletCount = (gpGlobals->time - m_fireLast) * m_fireRate;
+		if ( bulletCount > 0 )
+		{
+			for ( i = 0; i < bulletCount; i++ )
+			{
+				CBaseEntity *pRocket = CBaseEntity::Create( "rpg_rocket", barrelEnd, pev->angles, edict() );
+			}
+			CFuncTank::Fire( barrelEnd, forward, pev );
+		}
+	}
+	else
+		CFuncTank::Fire( barrelEnd, forward, pev );
+}
+
+
+class CFuncTankMortar : public CFuncTank
+{
+public:
+	void KeyValue( KeyValueData *pkvd );
+	void Fire( const Vector &barrelEnd, const Vector &forward, entvars_t *pevAttacker );
+};
+LINK_ENTITY_TO_CLASS( func_tankmortar, CFuncTankMortar );
+
+
+void CFuncTankMortar::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "iMagnitude"))
+	{
+		pev->impulse = atoi( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CFuncTank::KeyValue( pkvd );
+}
+
+
+void CFuncTankMortar::Fire( const Vector &barrelEnd, const Vector &forward, entvars_t *pevAttacker )
+{
+	if ( m_fireLast != 0 )
+	{
+		int bulletCount = (gpGlobals->time - m_fireLast) * m_fireRate;
+		// Only create 1 explosion
+		if ( bulletCount > 0 )
+		{
+			TraceResult tr;
+
+			// TankTrace needs gpGlobals->v_up, etc.
+			UTIL_MakeAimVectors(pev->angles);
+
+			TankTrace( barrelEnd, forward, gTankSpread[m_spread], tr );
+
+			ExplosionCreate( tr.vecEndPos, pev->angles, edict(), pev->impulse, TRUE );
+
+			CFuncTank::Fire( barrelEnd, forward, pev );
+		}
+	}
+	else
+		CFuncTank::Fire( barrelEnd, forward, pev );
+}
+
+
+
+//============================================================================
+// FUNC TANK CONTROLS
+//============================================================================
+class CFuncTankControls : public CBaseEntity
+{
+public:
+	virtual int	ObjectCaps( void );
+	void Spawn( void );
+	void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void Think( void );
+
+	virtual int	Save( CSave &save );
+	virtual int	Restore( CRestore &restore );
+	static TYPEDESCRIPTION m_SaveData[];
+
+	CFuncTank *m_pTank;
+};
+LINK_ENTITY_TO_CLASS( func_tankcontrols, CFuncTankControls );
+
+TYPEDESCRIPTION	CFuncTankControls::m_SaveData[] = 
+{
+	DEFINE_FIELD( CFuncTankControls, m_pTank, FIELD_CLASSPTR ),
+};
+
+IMPLEMENT_SAVERESTORE( CFuncTankControls, CBaseEntity );
+
+int	CFuncTankControls :: ObjectCaps( void ) 
+{ 
+	return (CBaseEntity::ObjectCaps() & ~FCAP_ACROSS_TRANSITION) | FCAP_IMPULSE_USE; 
+}
+
+
+void CFuncTankControls :: Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{ // pass the Use command onto the controls
+	if ( m_pTank )
+		m_pTank->Use( pActivator, pCaller, useType, value );
+
+	ASSERT( m_pTank != NULL );	// if this fails,  most likely means save/restore hasn't worked properly
+}
+
+
+void CFuncTankControls :: Think( void )
+{
+	edict_t *pTarget = NULL;
+
+	do 
+	{
+		pTarget = FIND_ENTITY_BY_TARGETNAME( pTarget, STRING(pev->target) );
+	} while ( !FNullEnt(pTarget) && strncmp( STRING(pTarget->v.classname), "func_tank", 9 ) );
+
+	if ( FNullEnt( pTarget ) )
+	{
+		ALERT( at_console, "No tank %s\n", STRING(pev->target) );
+		return;
+	}
+
+	m_pTank = (CFuncTank*)Instance(pTarget);
+}
+
+void CFuncTankControls::Spawn( void )
+{
+	pev->solid = SOLID_TRIGGER;
+	pev->movetype = MOVETYPE_NONE;
+	pev->effects |= EF_NODRAW;
+	SET_MODEL( ENT(pev), STRING(pev->model) );
+
+	UTIL_SetSize( pev, pev->mins, pev->maxs );
+	UTIL_SetOrigin( pev, pev->origin );
+	
+	pev->nextthink = gpGlobals->time + 0.3;	// After all the func_tank's have spawned
+
+	CBaseEntity::Spawn();
+}
diff --git a/main/source/dlls/furniture.h b/main/source/dlls/furniture.h
new file mode 100644
index 00000000..ce34a6b6
--- /dev/null
+++ b/main/source/dlls/furniture.h
@@ -0,0 +1,16 @@
+#ifndef CFURNITURE_H
+#define CFURNITURE_H
+
+//=========================================================
+// Furniture - this is the cool comment I cut-and-pasted
+//=========================================================
+class CFurniture : public CBaseMonster
+{
+public:
+	void Spawn ( void );
+	void Die( void );
+	int	 Classify ( void );
+	virtual int	ObjectCaps( void ) { return (CBaseMonster :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION); }
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/game.cpp b/main/source/dlls/game.cpp
new file mode 100644
index 00000000..84d33d10
--- /dev/null
+++ b/main/source/dlls/game.cpp
@@ -0,0 +1,1041 @@
+//
+//  Copyright (c) 1999, Valve LLC. All rights reserved.
+//  
+//  This product contains software technology licensed from Id 
+//  Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+//  All Rights Reserved.
+//
+//  Use, distribution, and modification of this source code and/or resulting
+//  object code is restricted to non-commercial enhancements to products from
+//  Valve LLC.  All other use, distribution, or modification is prohibited
+//  without written permission from Valve LLC.
+//
+//
+// $Workfile: game.cpp $
+// $Date: 2002/11/22 21:11:38 $
+//
+//-------------------------------------------------------------------------------
+// $Log: game.cpp,v $
+// Revision 1.37  2002/11/22 21:11:38  Flayra
+// - Changed default timelimit to 60
+// - Added mp_version for All-Seeing Eye
+//
+// Revision 1.36  2002/11/15 04:30:08  Flayra
+// - Changed mp_authicons default to 1
+//
+// Revision 1.35  2002/11/12 18:52:32  Flayra
+// - Added mp_logdetail
+//
+// Revision 1.34  2002/11/03 04:53:59  Flayra
+// - Removed variables, hard-coded instead
+//
+// Revision 1.33  2002/10/24 21:17:02  Flayra
+// - Added authicons variable
+//
+// Revision 1.32  2002/10/18 22:15:24  Flayra
+// - Added easter eggs
+//
+// Revision 1.31  2002/10/16 00:39:09  Flayra
+// - Removed demoing variable, added serverops variable
+//
+// Revision 1.30  2002/10/04 18:02:52  Flayra
+// - Regular update
+//
+// Revision 1.29  2002/10/03 18:26:19  Flayra
+// - Made voting percentage and min votes server variables (mp_votepercentneeded and mp_minvotesneeded)
+//
+// Revision 1.28  2002/09/23 22:01:23  Flayra
+// - Regular update
+//
+// Revision 1.27  2002/09/09 19:44:16  Flayra
+// - Added marine respawn time back in
+// - Added vote time variable
+//
+// Revision 1.26  2002/08/09 00:15:54  Flayra
+// - Regular update
+//
+// Revision 1.25  2002/07/26 23:00:53  Flayra
+// - Added mp_drawdamage variable
+//
+// Revision 1.24  2002/07/24 18:46:19  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.23  2002/07/23 16:46:57  Flayra
+// - Regular update
+//
+// Revision 1.22  2002/07/08 16:27:57  Flayra
+// - Regular update, added document header
+//
+//===============================================================================
+#include "extdll.h"
+#include "eiface.h"
+#include "util.h"
+#include "game.h"
+#include "mod/AvHServerVariables.h"
+#include "mod/AvHServerUtil.h"
+
+cvar_t	displaysoundlist = {"displaysoundlist","0"};
+
+// multiplayer server rules
+cvar_t	fragsleft	= {"mp_fragsleft","0", FCVAR_SERVER | FCVAR_UNLOGGED };	  // Don't spam console/log files/users with this changing
+cvar_t	timeleft	= {"mp_timeleft","0" , FCVAR_SERVER | FCVAR_UNLOGGED };	  // "      "
+cvar_t  allow_spectators = { "mp_allowspectators", "1.0", FCVAR_SERVER };		// 0 prevents players from being spectators
+
+// multiplayer server rules
+cvar_t	teamplay	= {"mp_teamplay","0", FCVAR_SERVER };
+cvar_t	fraglimit	= {"mp_fraglimit","0", FCVAR_SERVER };
+cvar_t	timelimit	= {"mp_timelimit","60", FCVAR_SERVER };
+cvar_t	friendlyfire= {"mp_friendlyfire","0", FCVAR_SERVER };
+cvar_t	falldamage	= {"mp_falldamage","1", FCVAR_SERVER };
+cvar_t	weaponstay	= {"mp_weaponstay",".5", FCVAR_SERVER };
+cvar_t	forcerespawn= {"mp_forcerespawn","1", FCVAR_SERVER };
+cvar_t	flashlight	= {"mp_flashlight","0", FCVAR_SERVER };
+cvar_t	aimcrosshair= {"mp_autocrosshair","0", FCVAR_SERVER };
+cvar_t	decalfrequency = {"decalfrequency","30", FCVAR_SERVER };
+cvar_t	teamlist = {"mp_teamlist","marine1;alien2", FCVAR_SERVER };
+cvar_t	teamoverride = {"mp_teamoverride","1" };
+cvar_t	defaultteam = {"mp_defaultteam","0" };
+cvar_t	allowmonsters={"mp_allowmonsters","0", FCVAR_SERVER };
+cvar_t  mp_chattime = {"mp_chattime","10", FCVAR_SERVER };
+
+// AvH server variables
+cvar_t	avh_drawdamage				= {kvDrawDamage, "0", FCVAR_SERVER };
+cvar_t	avh_tournamentmode			= {kvTournamentMode,"0", FCVAR_SERVER };
+cvar_t	avh_deathmatchmode			= {kvDeathMatchMode, "0", FCVAR_SERVER };
+cvar_t	avh_countdowntime			= {kvCountDownTime, ".2", FCVAR_SERVER };
+cvar_t	avh_latejointime			= {kvLateJoinTime, "1", FCVAR_SERVER};
+cvar_t	avh_logdetail				= {kvLogDetail, "0", FCVAR_SERVER};
+//cvar_t	avh_teamsizehandicapping	= {kvTeamSizeHandicapping, "0", FCVAR_SERVER};
+cvar_t	avh_team1damagepercent      = {kvTeam1DamagePercent, "100", FCVAR_SERVER};
+cvar_t	avh_team2damagepercent      = {kvTeam2DamagePercent, "100", FCVAR_SERVER};
+cvar_t	avh_votecasttime			= {kvVoteCastTime, "2", FCVAR_SERVER};
+cvar_t	avh_votedowntime			= {kvVoteDownTime, "180", FCVAR_SERVER};
+cvar_t	avh_minvotesneeded			= {kvMinVotesNeeded, "2", FCVAR_SERVER};
+cvar_t	avh_serverops				= {kvServerOps, "", FCVAR_PROTECTED};
+cvar_t  avh_limitteams				= {kvLimitTeams, "2", FCVAR_PROTECTED};
+cvar_t	avh_votepercentneeded		= {kvVotePercentNeeded, ".3", FCVAR_SERVER};
+cvar_t	avh_autoconcede				= {kvAutoConcede, "4", FCVAR_SERVER};
+cvar_t	avh_combattime				= {kvCombatTime, "10", FCVAR_SERVER};
+cvar_t  avh_mapvoteratio            = {kvMapVoteRatio, ".6", FCVAR_SERVER};
+cvar_t  avh_blockscripts            = {kvBlockScripts, "1", FCVAR_SERVER};
+
+// TODO: Remove
+cvar_t	avh_ironman					= {kvIronMan, "0", FCVAR_SERVER};
+cvar_t	avh_ironmantime				= {kvIronManTime, "2", FCVAR_SERVER};
+
+#ifdef DEBUG
+cvar_t	avh_spawninvulnerabletime	= {kvSpawnInvulnerableTime, "0", FCVAR_SERVER};
+cvar_t	avh_trainingmode			= {kvTrainingMode,"0", FCVAR_SERVER };
+cvar_t	avh_assert					= {kvAssert, "1", FCVAR_SERVER };
+cvar_t	avh_bulletcam				= {kvBulletCam, "0", FCVAR_SERVER };
+cvar_t	avh_testing					= {kvTesting, "0", FCVAR_SERVER };
+cvar_t	avh_drawinvisible			= {kvDrawInvisible, "0", FCVAR_SERVER };
+cvar_t	avh_serverscripts			= {kvServerScripts, "0", FCVAR_SERVER};
+#endif
+
+#ifdef USE_NETWORK_METERING
+cvar_t	avh_networkdebug			= {kvNetworkDebug, "0", FCVAR_SERVER };
+cvar_t	avh_networkmeterrate		= {kvNetworkMeterRate, "3000", FCVAR_SERVER };
+#endif
+
+#ifdef PROFILE_BUILD
+cvar_t	avh_performance				= {kvPerformance,"8191", FCVAR_SERVER};
+#endif
+
+// Other constants
+cvar_t	avh_eastereggchance			= {kvEasterEggChance, "5", FCVAR_SERVER};
+cvar_t	avh_uplink					= {kvUplink, "0", FCVAR_SERVER};
+cvar_t	avh_killdelay				= {kvKillDelay, "0", FCVAR_SERVER};
+
+// Engine Cvars
+cvar_t 	*g_psv_gravity = NULL;
+cvar_t	*g_psv_aim = NULL;
+cvar_t	*g_footsteps = NULL;
+
+//CVARS FOR SKILL LEVEL SETTINGS
+// Agrunt
+cvar_t	sk_agrunt_health1 = {"sk_agrunt_health1","0"};
+cvar_t	sk_agrunt_health2 = {"sk_agrunt_health2","0"};
+cvar_t	sk_agrunt_health3 = {"sk_agrunt_health3","0"};
+
+cvar_t	sk_agrunt_dmg_punch1 = {"sk_agrunt_dmg_punch1","0"};
+cvar_t	sk_agrunt_dmg_punch2 = {"sk_agrunt_dmg_punch2","0"};
+cvar_t	sk_agrunt_dmg_punch3 = {"sk_agrunt_dmg_punch3","0"};
+
+// Apache
+cvar_t	sk_apache_health1	= {"sk_apache_health1","0"};
+cvar_t	sk_apache_health2	= {"sk_apache_health2","0"};
+cvar_t	sk_apache_health3	= {"sk_apache_health3","0"};
+
+// Barney
+cvar_t	sk_barney_health1	= {"sk_barney_health1","0"};
+cvar_t	sk_barney_health2	= {"sk_barney_health2","0"};
+cvar_t	sk_barney_health3	= {"sk_barney_health3","0"};
+
+// Bullsquid
+cvar_t	sk_bullsquid_health1 = {"sk_bullsquid_health1","0"};
+cvar_t	sk_bullsquid_health2 = {"sk_bullsquid_health2","0"};
+cvar_t	sk_bullsquid_health3 = {"sk_bullsquid_health3","0"};
+
+cvar_t	sk_bullsquid_dmg_bite1 = {"sk_bullsquid_dmg_bite1","0"};
+cvar_t	sk_bullsquid_dmg_bite2 = {"sk_bullsquid_dmg_bite2","0"};
+cvar_t	sk_bullsquid_dmg_bite3 = {"sk_bullsquid_dmg_bite3","0"};
+
+cvar_t	sk_bullsquid_dmg_whip1 = {"sk_bullsquid_dmg_whip1","0"};
+cvar_t	sk_bullsquid_dmg_whip2 = {"sk_bullsquid_dmg_whip2","0"};
+cvar_t	sk_bullsquid_dmg_whip3 = {"sk_bullsquid_dmg_whip3","0"};
+
+cvar_t	sk_bullsquid_dmg_spit1 = {"sk_bullsquid_dmg_spit1","0"};
+cvar_t	sk_bullsquid_dmg_spit2 = {"sk_bullsquid_dmg_spit2","0"};
+cvar_t	sk_bullsquid_dmg_spit3 = {"sk_bullsquid_dmg_spit3","0"};
+
+
+// Big Momma
+cvar_t	sk_bigmomma_health_factor1 = {"sk_bigmomma_health_factor1","1.0"};
+cvar_t	sk_bigmomma_health_factor2 = {"sk_bigmomma_health_factor2","1.0"};
+cvar_t	sk_bigmomma_health_factor3 = {"sk_bigmomma_health_factor3","1.0"};
+
+cvar_t	sk_bigmomma_dmg_slash1 = {"sk_bigmomma_dmg_slash1","50"};
+cvar_t	sk_bigmomma_dmg_slash2 = {"sk_bigmomma_dmg_slash2","50"};
+cvar_t	sk_bigmomma_dmg_slash3 = {"sk_bigmomma_dmg_slash3","50"};
+
+cvar_t	sk_bigmomma_dmg_blast1 = {"sk_bigmomma_dmg_blast1","100"};
+cvar_t	sk_bigmomma_dmg_blast2 = {"sk_bigmomma_dmg_blast2","100"};
+cvar_t	sk_bigmomma_dmg_blast3 = {"sk_bigmomma_dmg_blast3","100"};
+
+cvar_t	sk_bigmomma_radius_blast1 = {"sk_bigmomma_radius_blast1","250"};
+cvar_t	sk_bigmomma_radius_blast2 = {"sk_bigmomma_radius_blast2","250"};
+cvar_t	sk_bigmomma_radius_blast3 = {"sk_bigmomma_radius_blast3","250"};
+
+// Gargantua
+cvar_t	sk_gargantua_health1 = {"sk_gargantua_health1","0"};
+cvar_t	sk_gargantua_health2 = {"sk_gargantua_health2","0"};
+cvar_t	sk_gargantua_health3 = {"sk_gargantua_health3","0"};
+
+cvar_t	sk_gargantua_dmg_slash1	= {"sk_gargantua_dmg_slash1","0"};
+cvar_t	sk_gargantua_dmg_slash2	= {"sk_gargantua_dmg_slash2","0"};
+cvar_t	sk_gargantua_dmg_slash3	= {"sk_gargantua_dmg_slash3","0"};
+
+cvar_t	sk_gargantua_dmg_fire1 = {"sk_gargantua_dmg_fire1","0"};
+cvar_t	sk_gargantua_dmg_fire2 = {"sk_gargantua_dmg_fire2","0"};
+cvar_t	sk_gargantua_dmg_fire3 = {"sk_gargantua_dmg_fire3","0"};
+
+cvar_t	sk_gargantua_dmg_stomp1	= {"sk_gargantua_dmg_stomp1","0"};
+cvar_t	sk_gargantua_dmg_stomp2	= {"sk_gargantua_dmg_stomp2","0"};
+cvar_t	sk_gargantua_dmg_stomp3	= {"sk_gargantua_dmg_stomp3","0"};
+
+
+// Hassassin
+cvar_t	sk_hassassin_health1 = {"sk_hassassin_health1","0"};
+cvar_t	sk_hassassin_health2 = {"sk_hassassin_health2","0"};
+cvar_t	sk_hassassin_health3 = {"sk_hassassin_health3","0"};
+
+
+// Headcrab
+cvar_t	sk_headcrab_health1 = {"sk_headcrab_health1","0"};
+cvar_t	sk_headcrab_health2 = {"sk_headcrab_health2","0"};
+cvar_t	sk_headcrab_health3 = {"sk_headcrab_health3","0"};
+
+cvar_t	sk_headcrab_dmg_bite1 = {"sk_headcrab_dmg_bite1","0"};
+cvar_t	sk_headcrab_dmg_bite2 = {"sk_headcrab_dmg_bite2","0"};
+cvar_t	sk_headcrab_dmg_bite3 = {"sk_headcrab_dmg_bite3","0"};
+
+
+// Hgrunt 
+cvar_t	sk_hgrunt_health1 = {"sk_hgrunt_health1","0"};
+cvar_t	sk_hgrunt_health2 = {"sk_hgrunt_health2","0"};
+cvar_t	sk_hgrunt_health3 = {"sk_hgrunt_health3","0"};
+
+cvar_t	sk_hgrunt_kick1 = {"sk_hgrunt_kick1","0"};
+cvar_t	sk_hgrunt_kick2 = {"sk_hgrunt_kick2","0"};
+cvar_t	sk_hgrunt_kick3 = {"sk_hgrunt_kick3","0"};
+
+cvar_t	sk_hgrunt_pellets1 = {"sk_hgrunt_pellets1","0"};
+cvar_t	sk_hgrunt_pellets2 = {"sk_hgrunt_pellets2","0"};
+cvar_t	sk_hgrunt_pellets3 = {"sk_hgrunt_pellets3","0"};
+
+cvar_t	sk_hgrunt_gspeed1 = {"sk_hgrunt_gspeed1","0"};
+cvar_t	sk_hgrunt_gspeed2 = {"sk_hgrunt_gspeed2","0"};
+cvar_t	sk_hgrunt_gspeed3 = {"sk_hgrunt_gspeed3","0"};
+
+// Houndeye
+cvar_t	sk_houndeye_health1 = {"sk_houndeye_health1","0"};
+cvar_t	sk_houndeye_health2 = {"sk_houndeye_health2","0"};
+cvar_t	sk_houndeye_health3 = {"sk_houndeye_health3","0"};
+
+cvar_t	sk_houndeye_dmg_blast1 = {"sk_houndeye_dmg_blast1","0"};
+cvar_t	sk_houndeye_dmg_blast2 = {"sk_houndeye_dmg_blast2","0"};
+cvar_t	sk_houndeye_dmg_blast3 = {"sk_houndeye_dmg_blast3","0"};
+
+
+// ISlave
+cvar_t	sk_islave_health1 = {"sk_islave_health1","0"};
+cvar_t	sk_islave_health2 = {"sk_islave_health2","0"};
+cvar_t	sk_islave_health3 = {"sk_islave_health3","0"};
+
+cvar_t	sk_islave_dmg_claw1 = {"sk_islave_dmg_claw1","0"};
+cvar_t	sk_islave_dmg_claw2 = {"sk_islave_dmg_claw2","0"};
+cvar_t	sk_islave_dmg_claw3 = {"sk_islave_dmg_claw3","0"};
+
+cvar_t	sk_islave_dmg_clawrake1	= {"sk_islave_dmg_clawrake1","0"};
+cvar_t	sk_islave_dmg_clawrake2	= {"sk_islave_dmg_clawrake2","0"};
+cvar_t	sk_islave_dmg_clawrake3	= {"sk_islave_dmg_clawrake3","0"};
+	
+cvar_t	sk_islave_dmg_zap1 = {"sk_islave_dmg_zap1","0"};
+cvar_t	sk_islave_dmg_zap2 = {"sk_islave_dmg_zap2","0"};
+cvar_t	sk_islave_dmg_zap3 = {"sk_islave_dmg_zap3","0"};
+
+
+// Icthyosaur
+cvar_t	sk_ichthyosaur_health1	= {"sk_ichthyosaur_health1","0"};
+cvar_t	sk_ichthyosaur_health2	= {"sk_ichthyosaur_health2","0"};
+cvar_t	sk_ichthyosaur_health3	= {"sk_ichthyosaur_health3","0"};
+
+cvar_t	sk_ichthyosaur_shake1	= {"sk_ichthyosaur_shake1","0"};
+cvar_t	sk_ichthyosaur_shake2	= {"sk_ichthyosaur_shake2","0"};
+cvar_t	sk_ichthyosaur_shake3	= {"sk_ichthyosaur_shake3","0"};
+
+
+// Leech
+cvar_t	sk_leech_health1 = {"sk_leech_health1","0"};
+cvar_t	sk_leech_health2 = {"sk_leech_health2","0"};
+cvar_t	sk_leech_health3 = {"sk_leech_health3","0"};
+
+cvar_t	sk_leech_dmg_bite1 = {"sk_leech_dmg_bite1","0"};
+cvar_t	sk_leech_dmg_bite2 = {"sk_leech_dmg_bite2","0"};
+cvar_t	sk_leech_dmg_bite3 = {"sk_leech_dmg_bite3","0"};
+
+// Controller
+cvar_t	sk_controller_health1 = {"sk_controller_health1","0"};
+cvar_t	sk_controller_health2 = {"sk_controller_health2","0"};
+cvar_t	sk_controller_health3 = {"sk_controller_health3","0"};
+
+cvar_t	sk_controller_dmgzap1 = {"sk_controller_dmgzap1","0"};
+cvar_t	sk_controller_dmgzap2 = {"sk_controller_dmgzap2","0"};
+cvar_t	sk_controller_dmgzap3 = {"sk_controller_dmgzap3","0"};
+
+cvar_t	sk_controller_speedball1 = {"sk_controller_speedball1","0"};
+cvar_t	sk_controller_speedball2 = {"sk_controller_speedball2","0"};
+cvar_t	sk_controller_speedball3 = {"sk_controller_speedball3","0"};
+
+cvar_t	sk_controller_dmgball1 = {"sk_controller_dmgball1","0"};
+cvar_t	sk_controller_dmgball2 = {"sk_controller_dmgball2","0"};
+cvar_t	sk_controller_dmgball3 = {"sk_controller_dmgball3","0"};
+
+// Nihilanth
+cvar_t	sk_nihilanth_health1 = {"sk_nihilanth_health1","0"};
+cvar_t	sk_nihilanth_health2 = {"sk_nihilanth_health2","0"};
+cvar_t	sk_nihilanth_health3 = {"sk_nihilanth_health3","0"};
+
+cvar_t	sk_nihilanth_zap1 = {"sk_nihilanth_zap1","0"};
+cvar_t	sk_nihilanth_zap2 = {"sk_nihilanth_zap2","0"};
+cvar_t	sk_nihilanth_zap3 = {"sk_nihilanth_zap3","0"};
+
+// Scientist
+cvar_t	sk_scientist_health1 = {"sk_scientist_health1","0"};
+cvar_t	sk_scientist_health2 = {"sk_scientist_health2","0"};
+cvar_t	sk_scientist_health3 = {"sk_scientist_health3","0"};
+
+
+// Snark
+cvar_t	sk_snark_health1 = {"sk_snark_health1","0"};
+cvar_t	sk_snark_health2 = {"sk_snark_health2","0"};
+cvar_t	sk_snark_health3 = {"sk_snark_health3","0"};
+
+cvar_t	sk_snark_dmg_bite1 = {"sk_snark_dmg_bite1","0"};
+cvar_t	sk_snark_dmg_bite2 = {"sk_snark_dmg_bite2","0"};
+cvar_t	sk_snark_dmg_bite3 = {"sk_snark_dmg_bite3","0"};
+
+cvar_t	sk_snark_dmg_pop1 = {"sk_snark_dmg_pop1","0"};
+cvar_t	sk_snark_dmg_pop2 = {"sk_snark_dmg_pop2","0"};
+cvar_t	sk_snark_dmg_pop3 = {"sk_snark_dmg_pop3","0"};
+
+
+
+// Zombie
+cvar_t	sk_zombie_health1 = {"sk_zombie_health1","0"};
+cvar_t	sk_zombie_health2 = {"sk_zombie_health2","0"};
+cvar_t	sk_zombie_health3 = {"sk_zombie_health3","0"};
+
+cvar_t	sk_zombie_dmg_one_slash1 = {"sk_zombie_dmg_one_slash1","0"};
+cvar_t	sk_zombie_dmg_one_slash2 = {"sk_zombie_dmg_one_slash2","0"};
+cvar_t	sk_zombie_dmg_one_slash3 = {"sk_zombie_dmg_one_slash3","0"};
+
+cvar_t	sk_zombie_dmg_both_slash1 = {"sk_zombie_dmg_both_slash1","0"};
+cvar_t	sk_zombie_dmg_both_slash2 = {"sk_zombie_dmg_both_slash2","0"};
+cvar_t	sk_zombie_dmg_both_slash3 = {"sk_zombie_dmg_both_slash3","0"};
+
+
+//Turret
+cvar_t	sk_turret_health1 = {"sk_turret_health1","0"};
+cvar_t	sk_turret_health2 = {"sk_turret_health2","0"};
+cvar_t	sk_turret_health3 = {"sk_turret_health3","0"};
+
+
+// MiniTurret
+cvar_t	sk_miniturret_health1 = {"sk_miniturret_health1","0"};
+cvar_t	sk_miniturret_health2 = {"sk_miniturret_health2","0"};
+cvar_t	sk_miniturret_health3 = {"sk_miniturret_health3","0"};
+
+
+// Sentry Turret
+cvar_t	sk_sentry_health1 = {"sk_sentry_health1","0"};
+cvar_t	sk_sentry_health2 = {"sk_sentry_health2","0"};
+cvar_t	sk_sentry_health3 = {"sk_sentry_health3","0"};
+
+
+// PLAYER WEAPONS
+
+// Crowbar whack
+cvar_t	sk_plr_crowbar1 = {"sk_plr_crowbar1","0"};
+cvar_t	sk_plr_crowbar2 = {"sk_plr_crowbar2","0"};
+cvar_t	sk_plr_crowbar3 = {"sk_plr_crowbar3","0"};
+
+// Glock Round
+cvar_t	sk_plr_9mm_bullet1 = {"sk_plr_9mm_bullet1","0"};
+cvar_t	sk_plr_9mm_bullet2 = {"sk_plr_9mm_bullet2","0"};
+cvar_t	sk_plr_9mm_bullet3 = {"sk_plr_9mm_bullet3","0"};
+
+// 357 Round
+cvar_t	sk_plr_357_bullet1 = {"sk_plr_357_bullet1","0"};
+cvar_t	sk_plr_357_bullet2 = {"sk_plr_357_bullet2","0"};
+cvar_t	sk_plr_357_bullet3 = {"sk_plr_357_bullet3","0"};
+
+// MP5 Round
+cvar_t	sk_plr_9mmAR_bullet1 = {"sk_plr_9mmAR_bullet1","0"};
+cvar_t	sk_plr_9mmAR_bullet2 = {"sk_plr_9mmAR_bullet2","0"};
+cvar_t	sk_plr_9mmAR_bullet3 = {"sk_plr_9mmAR_bullet3","0"};
+
+
+// M203 grenade
+cvar_t	sk_plr_9mmAR_grenade1 = {"sk_plr_9mmAR_grenade1","0"};
+cvar_t	sk_plr_9mmAR_grenade2 = {"sk_plr_9mmAR_grenade2","0"};
+cvar_t	sk_plr_9mmAR_grenade3 = {"sk_plr_9mmAR_grenade3","0"};
+
+
+// Shotgun buckshot
+cvar_t	sk_plr_buckshot1 = {"sk_plr_buckshot1","0"};
+cvar_t	sk_plr_buckshot2 = {"sk_plr_buckshot2","0"};
+cvar_t	sk_plr_buckshot3 = {"sk_plr_buckshot3","0"};
+
+
+// Crossbow
+cvar_t	sk_plr_xbow_bolt_client1 = {"sk_plr_xbow_bolt_client1","0"};
+cvar_t	sk_plr_xbow_bolt_client2 = {"sk_plr_xbow_bolt_client2","0"};
+cvar_t	sk_plr_xbow_bolt_client3 = {"sk_plr_xbow_bolt_client3","0"};
+
+cvar_t	sk_plr_xbow_bolt_monster1 = {"sk_plr_xbow_bolt_monster1","0"};
+cvar_t	sk_plr_xbow_bolt_monster2 = {"sk_plr_xbow_bolt_monster2","0"};
+cvar_t	sk_plr_xbow_bolt_monster3 = {"sk_plr_xbow_bolt_monster3","0"};
+
+
+// RPG
+cvar_t	sk_plr_rpg1 = {"sk_plr_rpg1","0"};
+cvar_t	sk_plr_rpg2 = {"sk_plr_rpg2","0"};
+cvar_t	sk_plr_rpg3 = {"sk_plr_rpg3","0"};
+
+
+// Zero Point Generator
+cvar_t	sk_plr_gauss1 = {"sk_plr_gauss1","0"};
+cvar_t	sk_plr_gauss2 = {"sk_plr_gauss2","0"};
+cvar_t	sk_plr_gauss3 = {"sk_plr_gauss3","0"};
+
+
+// Tau Cannon
+cvar_t	sk_plr_egon_narrow1 = {"sk_plr_egon_narrow1","0"};
+cvar_t	sk_plr_egon_narrow2 = {"sk_plr_egon_narrow2","0"};
+cvar_t	sk_plr_egon_narrow3 = {"sk_plr_egon_narrow3","0"};
+
+cvar_t	sk_plr_egon_wide1 = {"sk_plr_egon_wide1","0"};
+cvar_t	sk_plr_egon_wide2 = {"sk_plr_egon_wide2","0"};
+cvar_t	sk_plr_egon_wide3 = {"sk_plr_egon_wide3","0"};
+
+
+// Hand Grendade
+cvar_t	sk_plr_hand_grenade1 = {"sk_plr_hand_grenade1","0"};
+cvar_t	sk_plr_hand_grenade2 = {"sk_plr_hand_grenade2","0"};
+cvar_t	sk_plr_hand_grenade3 = {"sk_plr_hand_grenade3","0"};
+
+
+// Satchel Charge
+cvar_t	sk_plr_satchel1	= {"sk_plr_satchel1","0"};
+cvar_t	sk_plr_satchel2	= {"sk_plr_satchel2","0"};
+cvar_t	sk_plr_satchel3	= {"sk_plr_satchel3","0"};
+
+
+// Tripmine
+cvar_t	sk_plr_tripmine1 = {"sk_plr_tripmine1","0"};
+cvar_t	sk_plr_tripmine2 = {"sk_plr_tripmine2","0"};
+cvar_t	sk_plr_tripmine3 = {"sk_plr_tripmine3","0"};
+
+
+// WORLD WEAPONS
+cvar_t	sk_12mm_bullet1 = {"sk_12mm_bullet1","0"};
+cvar_t	sk_12mm_bullet2 = {"sk_12mm_bullet2","0"};
+cvar_t	sk_12mm_bullet3 = {"sk_12mm_bullet3","0"};
+
+cvar_t	sk_9mmAR_bullet1 = {"sk_9mmAR_bullet1","0"};
+cvar_t	sk_9mmAR_bullet2 = {"sk_9mmAR_bullet2","0"};
+cvar_t	sk_9mmAR_bullet3 = {"sk_9mmAR_bullet3","0"};
+
+cvar_t	sk_9mm_bullet1 = {"sk_9mm_bullet1","0"};
+cvar_t	sk_9mm_bullet2 = {"sk_9mm_bullet2","0"};
+cvar_t	sk_9mm_bullet3 = {"sk_9mm_bullet3","0"};
+
+
+// HORNET
+cvar_t	sk_hornet_dmg1 = {"sk_hornet_dmg1","0"};
+cvar_t	sk_hornet_dmg2 = {"sk_hornet_dmg2","0"};
+cvar_t	sk_hornet_dmg3 = {"sk_hornet_dmg3","0"};
+
+// HEALTH/CHARGE
+cvar_t	sk_suitcharger1	= { "sk_suitcharger1","0" };
+cvar_t	sk_suitcharger2	= { "sk_suitcharger2","0" };		
+cvar_t	sk_suitcharger3	= { "sk_suitcharger3","0" };		
+
+cvar_t	sk_battery1	= { "sk_battery1","0" };			
+cvar_t	sk_battery2	= { "sk_battery2","0" };			
+cvar_t	sk_battery3	= { "sk_battery3","0" };			
+
+cvar_t	sk_healthcharger1	= { "sk_healthcharger1","0" };		
+cvar_t	sk_healthcharger2	= { "sk_healthcharger2","0" };		
+cvar_t	sk_healthcharger3	= { "sk_healthcharger3","0" };		
+
+cvar_t	sk_healthkit1	= { "sk_healthkit1","0" };		
+cvar_t	sk_healthkit2	= { "sk_healthkit2","0" };		
+cvar_t	sk_healthkit3	= { "sk_healthkit3","0" };		
+
+cvar_t	sk_scientist_heal1	= { "sk_scientist_heal1","0" };	
+cvar_t	sk_scientist_heal2	= { "sk_scientist_heal2","0" };	
+cvar_t	sk_scientist_heal3	= { "sk_scientist_heal3","0" };	
+
+
+// monster damage adjusters
+cvar_t	sk_monster_head1	= { "sk_monster_head1","2" };
+cvar_t	sk_monster_head2	= { "sk_monster_head2","2" };
+cvar_t	sk_monster_head3	= { "sk_monster_head3","2" };
+
+cvar_t	sk_monster_chest1	= { "sk_monster_chest1","1" };
+cvar_t	sk_monster_chest2	= { "sk_monster_chest2","1" };
+cvar_t	sk_monster_chest3	= { "sk_monster_chest3","1" };
+
+cvar_t	sk_monster_stomach1	= { "sk_monster_stomach1","1" };
+cvar_t	sk_monster_stomach2	= { "sk_monster_stomach2","1" };
+cvar_t	sk_monster_stomach3	= { "sk_monster_stomach3","1" };
+
+cvar_t	sk_monster_arm1	= { "sk_monster_arm1","1" };
+cvar_t	sk_monster_arm2	= { "sk_monster_arm2","1" };
+cvar_t	sk_monster_arm3	= { "sk_monster_arm3","1" };
+
+cvar_t	sk_monster_leg1	= { "sk_monster_leg1","1" };
+cvar_t	sk_monster_leg2	= { "sk_monster_leg2","1" };
+cvar_t	sk_monster_leg3	= { "sk_monster_leg3","1" };
+
+// player damage adjusters
+cvar_t	sk_player_head1	= { "sk_player_head1","2" };
+cvar_t	sk_player_head2	= { "sk_player_head2","2" };
+cvar_t	sk_player_head3	= { "sk_player_head3","2" };
+
+cvar_t	sk_player_chest1	= { "sk_player_chest1","1" };
+cvar_t	sk_player_chest2	= { "sk_player_chest2","1" };
+cvar_t	sk_player_chest3	= { "sk_player_chest3","1" };
+
+cvar_t	sk_player_stomach1	= { "sk_player_stomach1","1" };
+cvar_t	sk_player_stomach2	= { "sk_player_stomach2","1" };
+cvar_t	sk_player_stomach3	= { "sk_player_stomach3","1" };
+
+cvar_t	sk_player_arm1	= { "sk_player_arm1","1" };
+cvar_t	sk_player_arm2	= { "sk_player_arm2","1" };
+cvar_t	sk_player_arm3	= { "sk_player_arm3","1" };
+
+cvar_t	sk_player_leg1	= { "sk_player_leg1","1" };
+cvar_t	sk_player_leg2	= { "sk_player_leg2","1" };
+cvar_t	sk_player_leg3	= { "sk_player_leg3","1" };
+
+// END Cvars for Skill Level settings
+
+// Register your console variables here
+// This gets called one time when the game is initialied
+void GameDLLInit( void )
+{
+	// Register cvars here:
+
+	g_psv_gravity = CVAR_GET_POINTER( "sv_gravity" );
+	g_psv_aim = CVAR_GET_POINTER( "sv_aim" );
+	g_footsteps = CVAR_GET_POINTER( "mp_footsteps" );
+
+	CVAR_REGISTER (&displaysoundlist);
+
+	CVAR_REGISTER (&teamplay);
+	CVAR_REGISTER (&fraglimit);
+	CVAR_REGISTER (&timelimit);
+
+	CVAR_REGISTER (&fragsleft);
+	CVAR_REGISTER (&timeleft);
+	CVAR_REGISTER (&allow_spectators);
+
+	CVAR_REGISTER (&friendlyfire);
+	CVAR_REGISTER (&falldamage);
+	CVAR_REGISTER (&weaponstay);
+	CVAR_REGISTER (&forcerespawn);
+	CVAR_REGISTER (&flashlight);
+	CVAR_REGISTER (&aimcrosshair);
+	CVAR_REGISTER (&decalfrequency);
+	CVAR_REGISTER (&teamlist);
+	CVAR_REGISTER (&teamoverride);
+	CVAR_REGISTER (&defaultteam);
+	CVAR_REGISTER (&allowmonsters);
+	CVAR_REGISTER (&mp_chattime);
+	
+	// Register AvH variables
+	CVAR_REGISTER (&avh_drawdamage);
+	CVAR_REGISTER (&avh_tournamentmode);
+	CVAR_REGISTER (&avh_deathmatchmode);
+	CVAR_REGISTER (&avh_countdowntime);
+
+	CVAR_REGISTER (&avh_latejointime);
+	CVAR_REGISTER (&avh_logdetail);
+	//CVAR_REGISTER (&avh_teamsizehandicapping);
+	CVAR_REGISTER (&avh_team1damagepercent);
+	CVAR_REGISTER (&avh_team2damagepercent);
+	CVAR_REGISTER (&avh_votecasttime);
+	CVAR_REGISTER (&avh_votedowntime);
+	CVAR_REGISTER (&avh_minvotesneeded);
+	CVAR_REGISTER (&avh_serverops);
+	CVAR_REGISTER (&avh_limitteams);
+	CVAR_REGISTER (&avh_votepercentneeded);
+	CVAR_REGISTER (&avh_autoconcede);
+	CVAR_REGISTER (&avh_combattime);
+    CVAR_REGISTER (&avh_mapvoteratio);
+    CVAR_REGISTER (&avh_blockscripts);
+
+    // TODO: Remove
+    CVAR_REGISTER (&avh_ironman);
+	CVAR_REGISTER (&avh_ironmantime);
+
+#ifdef DEBUG
+    CVAR_REGISTER (&avh_spawninvulnerabletime);
+    CVAR_REGISTER (&avh_trainingmode);
+    CVAR_REGISTER (&avh_assert);
+    CVAR_REGISTER (&avh_bulletcam);
+	CVAR_REGISTER (&avh_testing);
+    CVAR_REGISTER (&avh_serverscripts);
+#endif
+
+#ifdef USE_NETWORK_METERING
+	CVAR_REGISTER (&avh_networkdebug);
+    CVAR_REGISTER (&avh_drawinvisible);
+#endif
+
+#ifdef PROFILE_BUILD
+	CVAR_REGISTER (&avh_performance);
+#endif
+
+	CVAR_REGISTER (&avh_eastereggchance);
+	CVAR_REGISTER (&avh_uplink);
+	CVAR_REGISTER (&avh_killdelay);
+
+// REGISTER CVARS FOR SKILL LEVEL STUFF
+	// Agrunt
+	CVAR_REGISTER ( &sk_agrunt_health1 );// {"sk_agrunt_health1","0"};
+	CVAR_REGISTER ( &sk_agrunt_health2 );// {"sk_agrunt_health2","0"};
+	CVAR_REGISTER ( &sk_agrunt_health3 );// {"sk_agrunt_health3","0"};
+
+	CVAR_REGISTER ( &sk_agrunt_dmg_punch1 );// {"sk_agrunt_dmg_punch1","0"};
+	CVAR_REGISTER ( &sk_agrunt_dmg_punch2 );// {"sk_agrunt_dmg_punch2","0"};
+	CVAR_REGISTER ( &sk_agrunt_dmg_punch3 );// {"sk_agrunt_dmg_punch3","0"};
+
+	// Apache
+	CVAR_REGISTER ( &sk_apache_health1 );// {"sk_apache_health1","0"};
+	CVAR_REGISTER ( &sk_apache_health2 );// {"sk_apache_health2","0"};
+	CVAR_REGISTER ( &sk_apache_health3 );// {"sk_apache_health3","0"};
+
+	// Barney
+	CVAR_REGISTER ( &sk_barney_health1 );// {"sk_barney_health1","0"};
+	CVAR_REGISTER ( &sk_barney_health2 );// {"sk_barney_health2","0"};
+	CVAR_REGISTER ( &sk_barney_health3 );// {"sk_barney_health3","0"};
+
+	// Bullsquid
+	CVAR_REGISTER ( &sk_bullsquid_health1 );// {"sk_bullsquid_health1","0"};
+	CVAR_REGISTER ( &sk_bullsquid_health2 );// {"sk_bullsquid_health2","0"};
+	CVAR_REGISTER ( &sk_bullsquid_health3 );// {"sk_bullsquid_health3","0"};
+
+	CVAR_REGISTER ( &sk_bullsquid_dmg_bite1 );// {"sk_bullsquid_dmg_bite1","0"};
+	CVAR_REGISTER ( &sk_bullsquid_dmg_bite2 );// {"sk_bullsquid_dmg_bite2","0"};
+	CVAR_REGISTER ( &sk_bullsquid_dmg_bite3 );// {"sk_bullsquid_dmg_bite3","0"};
+
+	CVAR_REGISTER ( &sk_bullsquid_dmg_whip1 );// {"sk_bullsquid_dmg_whip1","0"};
+	CVAR_REGISTER ( &sk_bullsquid_dmg_whip2 );// {"sk_bullsquid_dmg_whip2","0"};
+	CVAR_REGISTER ( &sk_bullsquid_dmg_whip3 );// {"sk_bullsquid_dmg_whip3","0"};
+
+	CVAR_REGISTER ( &sk_bullsquid_dmg_spit1 );// {"sk_bullsquid_dmg_spit1","0"};
+	CVAR_REGISTER ( &sk_bullsquid_dmg_spit2 );// {"sk_bullsquid_dmg_spit2","0"};
+	CVAR_REGISTER ( &sk_bullsquid_dmg_spit3 );// {"sk_bullsquid_dmg_spit3","0"};
+
+
+	CVAR_REGISTER ( &sk_bigmomma_health_factor1 );// {"sk_bigmomma_health_factor1","1.0"};
+	CVAR_REGISTER ( &sk_bigmomma_health_factor2 );// {"sk_bigmomma_health_factor2","1.0"};
+	CVAR_REGISTER ( &sk_bigmomma_health_factor3 );// {"sk_bigmomma_health_factor3","1.0"};
+
+	CVAR_REGISTER ( &sk_bigmomma_dmg_slash1 );// {"sk_bigmomma_dmg_slash1","50"};
+	CVAR_REGISTER ( &sk_bigmomma_dmg_slash2 );// {"sk_bigmomma_dmg_slash2","50"};
+	CVAR_REGISTER ( &sk_bigmomma_dmg_slash3 );// {"sk_bigmomma_dmg_slash3","50"};
+
+	CVAR_REGISTER ( &sk_bigmomma_dmg_blast1 );// {"sk_bigmomma_dmg_blast1","100"};
+	CVAR_REGISTER ( &sk_bigmomma_dmg_blast2 );// {"sk_bigmomma_dmg_blast2","100"};
+	CVAR_REGISTER ( &sk_bigmomma_dmg_blast3 );// {"sk_bigmomma_dmg_blast3","100"};
+
+	CVAR_REGISTER ( &sk_bigmomma_radius_blast1 );// {"sk_bigmomma_radius_blast1","250"};
+	CVAR_REGISTER ( &sk_bigmomma_radius_blast2 );// {"sk_bigmomma_radius_blast2","250"};
+	CVAR_REGISTER ( &sk_bigmomma_radius_blast3 );// {"sk_bigmomma_radius_blast3","250"};
+
+	// Gargantua
+	CVAR_REGISTER ( &sk_gargantua_health1 );// {"sk_gargantua_health1","0"};
+	CVAR_REGISTER ( &sk_gargantua_health2 );// {"sk_gargantua_health2","0"};
+	CVAR_REGISTER ( &sk_gargantua_health3 );// {"sk_gargantua_health3","0"};
+
+	CVAR_REGISTER ( &sk_gargantua_dmg_slash1 );// {"sk_gargantua_dmg_slash1","0"};
+	CVAR_REGISTER ( &sk_gargantua_dmg_slash2 );// {"sk_gargantua_dmg_slash2","0"};
+	CVAR_REGISTER ( &sk_gargantua_dmg_slash3 );// {"sk_gargantua_dmg_slash3","0"};
+
+	CVAR_REGISTER ( &sk_gargantua_dmg_fire1 );// {"sk_gargantua_dmg_fire1","0"};
+	CVAR_REGISTER ( &sk_gargantua_dmg_fire2 );// {"sk_gargantua_dmg_fire2","0"};
+	CVAR_REGISTER ( &sk_gargantua_dmg_fire3 );// {"sk_gargantua_dmg_fire3","0"};
+
+	CVAR_REGISTER ( &sk_gargantua_dmg_stomp1 );// {"sk_gargantua_dmg_stomp1","0"};
+	CVAR_REGISTER ( &sk_gargantua_dmg_stomp2 );// {"sk_gargantua_dmg_stomp2","0"};
+	CVAR_REGISTER ( &sk_gargantua_dmg_stomp3	);// {"sk_gargantua_dmg_stomp3","0"};
+
+
+	// Hassassin
+	CVAR_REGISTER ( &sk_hassassin_health1 );// {"sk_hassassin_health1","0"};
+	CVAR_REGISTER ( &sk_hassassin_health2 );// {"sk_hassassin_health2","0"};
+	CVAR_REGISTER ( &sk_hassassin_health3 );// {"sk_hassassin_health3","0"};
+
+
+	// Headcrab
+	CVAR_REGISTER ( &sk_headcrab_health1 );// {"sk_headcrab_health1","0"};
+	CVAR_REGISTER ( &sk_headcrab_health2 );// {"sk_headcrab_health2","0"};
+	CVAR_REGISTER ( &sk_headcrab_health3 );// {"sk_headcrab_health3","0"};
+
+	CVAR_REGISTER ( &sk_headcrab_dmg_bite1 );// {"sk_headcrab_dmg_bite1","0"};
+	CVAR_REGISTER ( &sk_headcrab_dmg_bite2 );// {"sk_headcrab_dmg_bite2","0"};
+	CVAR_REGISTER ( &sk_headcrab_dmg_bite3 );// {"sk_headcrab_dmg_bite3","0"};
+
+
+	// Hgrunt 
+	CVAR_REGISTER ( &sk_hgrunt_health1 );// {"sk_hgrunt_health1","0"};
+	CVAR_REGISTER ( &sk_hgrunt_health2 );// {"sk_hgrunt_health2","0"};
+	CVAR_REGISTER ( &sk_hgrunt_health3 );// {"sk_hgrunt_health3","0"};
+
+	CVAR_REGISTER ( &sk_hgrunt_kick1 );// {"sk_hgrunt_kick1","0"};
+	CVAR_REGISTER ( &sk_hgrunt_kick2 );// {"sk_hgrunt_kick2","0"};
+	CVAR_REGISTER ( &sk_hgrunt_kick3 );// {"sk_hgrunt_kick3","0"};
+
+	CVAR_REGISTER ( &sk_hgrunt_pellets1 );
+	CVAR_REGISTER ( &sk_hgrunt_pellets2 );
+	CVAR_REGISTER ( &sk_hgrunt_pellets3 );
+
+	CVAR_REGISTER ( &sk_hgrunt_gspeed1 );
+	CVAR_REGISTER ( &sk_hgrunt_gspeed2 );
+	CVAR_REGISTER ( &sk_hgrunt_gspeed3 );
+
+	// Houndeye
+	CVAR_REGISTER ( &sk_houndeye_health1 );// {"sk_houndeye_health1","0"};
+	CVAR_REGISTER ( &sk_houndeye_health2 );// {"sk_houndeye_health2","0"};
+	CVAR_REGISTER ( &sk_houndeye_health3 );// {"sk_houndeye_health3","0"};
+
+	CVAR_REGISTER ( &sk_houndeye_dmg_blast1 );// {"sk_houndeye_dmg_blast1","0"};
+	CVAR_REGISTER ( &sk_houndeye_dmg_blast2 );// {"sk_houndeye_dmg_blast2","0"};
+	CVAR_REGISTER ( &sk_houndeye_dmg_blast3 );// {"sk_houndeye_dmg_blast3","0"};
+
+
+	// ISlave
+	CVAR_REGISTER ( &sk_islave_health1 );// {"sk_islave_health1","0"};
+	CVAR_REGISTER ( &sk_islave_health2 );// {"sk_islave_health2","0"};
+	CVAR_REGISTER ( &sk_islave_health3 );// {"sk_islave_health3","0"};
+
+	CVAR_REGISTER ( &sk_islave_dmg_claw1 );// {"sk_islave_dmg_claw1","0"};
+	CVAR_REGISTER ( &sk_islave_dmg_claw2 );// {"sk_islave_dmg_claw2","0"};
+	CVAR_REGISTER ( &sk_islave_dmg_claw3 );// {"sk_islave_dmg_claw3","0"};
+
+	CVAR_REGISTER ( &sk_islave_dmg_clawrake1	);// {"sk_islave_dmg_clawrake1","0"};
+	CVAR_REGISTER ( &sk_islave_dmg_clawrake2	);// {"sk_islave_dmg_clawrake2","0"};
+	CVAR_REGISTER ( &sk_islave_dmg_clawrake3	);// {"sk_islave_dmg_clawrake3","0"};
+		
+	CVAR_REGISTER ( &sk_islave_dmg_zap1 );// {"sk_islave_dmg_zap1","0"};
+	CVAR_REGISTER ( &sk_islave_dmg_zap2 );// {"sk_islave_dmg_zap2","0"};
+	CVAR_REGISTER ( &sk_islave_dmg_zap3 );// {"sk_islave_dmg_zap3","0"};
+
+
+	// Icthyosaur
+	CVAR_REGISTER ( &sk_ichthyosaur_health1	);// {"sk_ichthyosaur_health1","0"};
+	CVAR_REGISTER ( &sk_ichthyosaur_health2	);// {"sk_ichthyosaur_health2","0"};
+	CVAR_REGISTER ( &sk_ichthyosaur_health3	);// {"sk_ichthyosaur_health3","0"};
+
+	CVAR_REGISTER ( &sk_ichthyosaur_shake1	);// {"sk_ichthyosaur_health3","0"};
+	CVAR_REGISTER ( &sk_ichthyosaur_shake2	);// {"sk_ichthyosaur_health3","0"};
+	CVAR_REGISTER ( &sk_ichthyosaur_shake3	);// {"sk_ichthyosaur_health3","0"};
+
+
+
+	// Leech
+	CVAR_REGISTER ( &sk_leech_health1 );// {"sk_leech_health1","0"};
+	CVAR_REGISTER ( &sk_leech_health2 );// {"sk_leech_health2","0"};
+	CVAR_REGISTER ( &sk_leech_health3 );// {"sk_leech_health3","0"};
+
+	CVAR_REGISTER ( &sk_leech_dmg_bite1 );// {"sk_leech_dmg_bite1","0"};
+	CVAR_REGISTER ( &sk_leech_dmg_bite2 );// {"sk_leech_dmg_bite2","0"};
+	CVAR_REGISTER ( &sk_leech_dmg_bite3 );// {"sk_leech_dmg_bite3","0"};
+
+
+	// Controller
+	CVAR_REGISTER ( &sk_controller_health1 );
+	CVAR_REGISTER ( &sk_controller_health2 );
+	CVAR_REGISTER ( &sk_controller_health3 );
+
+	CVAR_REGISTER ( &sk_controller_dmgzap1 );
+	CVAR_REGISTER ( &sk_controller_dmgzap2 );
+	CVAR_REGISTER ( &sk_controller_dmgzap3 );
+
+	CVAR_REGISTER ( &sk_controller_speedball1 );
+	CVAR_REGISTER ( &sk_controller_speedball2 );
+	CVAR_REGISTER ( &sk_controller_speedball3 );
+
+	CVAR_REGISTER ( &sk_controller_dmgball1 );
+	CVAR_REGISTER ( &sk_controller_dmgball2 );
+	CVAR_REGISTER ( &sk_controller_dmgball3 );
+
+	// Nihilanth
+	CVAR_REGISTER ( &sk_nihilanth_health1 );// {"sk_nihilanth_health1","0"};
+	CVAR_REGISTER ( &sk_nihilanth_health2 );// {"sk_nihilanth_health2","0"};
+	CVAR_REGISTER ( &sk_nihilanth_health3 );// {"sk_nihilanth_health3","0"};
+
+	CVAR_REGISTER ( &sk_nihilanth_zap1 );
+	CVAR_REGISTER ( &sk_nihilanth_zap2 );
+	CVAR_REGISTER ( &sk_nihilanth_zap3 );
+
+	// Scientist
+	CVAR_REGISTER ( &sk_scientist_health1 );// {"sk_scientist_health1","0"};
+	CVAR_REGISTER ( &sk_scientist_health2 );// {"sk_scientist_health2","0"};
+	CVAR_REGISTER ( &sk_scientist_health3 );// {"sk_scientist_health3","0"};
+
+
+	// Snark
+	CVAR_REGISTER ( &sk_snark_health1 );// {"sk_snark_health1","0"};
+	CVAR_REGISTER ( &sk_snark_health2 );// {"sk_snark_health2","0"};
+	CVAR_REGISTER ( &sk_snark_health3 );// {"sk_snark_health3","0"};
+
+	CVAR_REGISTER ( &sk_snark_dmg_bite1 );// {"sk_snark_dmg_bite1","0"};
+	CVAR_REGISTER ( &sk_snark_dmg_bite2 );// {"sk_snark_dmg_bite2","0"};
+	CVAR_REGISTER ( &sk_snark_dmg_bite3 );// {"sk_snark_dmg_bite3","0"};
+
+	CVAR_REGISTER ( &sk_snark_dmg_pop1 );// {"sk_snark_dmg_pop1","0"};
+	CVAR_REGISTER ( &sk_snark_dmg_pop2 );// {"sk_snark_dmg_pop2","0"};
+	CVAR_REGISTER ( &sk_snark_dmg_pop3 );// {"sk_snark_dmg_pop3","0"};
+
+
+
+	// Zombie
+	CVAR_REGISTER ( &sk_zombie_health1 );// {"sk_zombie_health1","0"};
+	CVAR_REGISTER ( &sk_zombie_health2 );// {"sk_zombie_health3","0"};
+	CVAR_REGISTER ( &sk_zombie_health3 );// {"sk_zombie_health3","0"};
+
+	CVAR_REGISTER ( &sk_zombie_dmg_one_slash1 );// {"sk_zombie_dmg_one_slash1","0"};
+	CVAR_REGISTER ( &sk_zombie_dmg_one_slash2 );// {"sk_zombie_dmg_one_slash2","0"};
+	CVAR_REGISTER ( &sk_zombie_dmg_one_slash3 );// {"sk_zombie_dmg_one_slash3","0"};
+
+	CVAR_REGISTER ( &sk_zombie_dmg_both_slash1 );// {"sk_zombie_dmg_both_slash1","0"};
+	CVAR_REGISTER ( &sk_zombie_dmg_both_slash2 );// {"sk_zombie_dmg_both_slash2","0"};
+	CVAR_REGISTER ( &sk_zombie_dmg_both_slash3 );// {"sk_zombie_dmg_both_slash3","0"};
+
+
+	//Turret
+	CVAR_REGISTER ( &sk_turret_health1 );// {"sk_turret_health1","0"};
+	CVAR_REGISTER ( &sk_turret_health2 );// {"sk_turret_health2","0"};
+	CVAR_REGISTER ( &sk_turret_health3 );// {"sk_turret_health3","0"};
+
+
+	// MiniTurret
+	CVAR_REGISTER ( &sk_miniturret_health1 );// {"sk_miniturret_health1","0"};
+	CVAR_REGISTER ( &sk_miniturret_health2 );// {"sk_miniturret_health2","0"};
+	CVAR_REGISTER ( &sk_miniturret_health3 );// {"sk_miniturret_health3","0"};
+
+
+	// Sentry Turret
+	CVAR_REGISTER ( &sk_sentry_health1 );// {"sk_sentry_health1","0"};
+	CVAR_REGISTER ( &sk_sentry_health2 );// {"sk_sentry_health2","0"};
+	CVAR_REGISTER ( &sk_sentry_health3 );// {"sk_sentry_health3","0"};
+
+
+	// PLAYER WEAPONS
+
+	// Crowbar whack
+	CVAR_REGISTER ( &sk_plr_crowbar1 );// {"sk_plr_crowbar1","0"};
+	CVAR_REGISTER ( &sk_plr_crowbar2 );// {"sk_plr_crowbar2","0"};
+	CVAR_REGISTER ( &sk_plr_crowbar3 );// {"sk_plr_crowbar3","0"};
+
+	// Glock Round
+	CVAR_REGISTER ( &sk_plr_9mm_bullet1 );// {"sk_plr_9mm_bullet1","0"};
+	CVAR_REGISTER ( &sk_plr_9mm_bullet2 );// {"sk_plr_9mm_bullet2","0"};
+	CVAR_REGISTER ( &sk_plr_9mm_bullet3 );// {"sk_plr_9mm_bullet3","0"};
+
+	// 357 Round
+	CVAR_REGISTER ( &sk_plr_357_bullet1 );// {"sk_plr_357_bullet1","0"};
+	CVAR_REGISTER ( &sk_plr_357_bullet2 );// {"sk_plr_357_bullet2","0"};
+	CVAR_REGISTER ( &sk_plr_357_bullet3 );// {"sk_plr_357_bullet3","0"};
+
+	// MP5 Round
+	CVAR_REGISTER ( &sk_plr_9mmAR_bullet1 );// {"sk_plr_9mmAR_bullet1","0"};
+	CVAR_REGISTER ( &sk_plr_9mmAR_bullet2 );// {"sk_plr_9mmAR_bullet2","0"};
+	CVAR_REGISTER ( &sk_plr_9mmAR_bullet3 );// {"sk_plr_9mmAR_bullet3","0"};
+
+
+	// M203 grenade
+	CVAR_REGISTER ( &sk_plr_9mmAR_grenade1 );// {"sk_plr_9mmAR_grenade1","0"};
+	CVAR_REGISTER ( &sk_plr_9mmAR_grenade2 );// {"sk_plr_9mmAR_grenade2","0"};
+	CVAR_REGISTER ( &sk_plr_9mmAR_grenade3 );// {"sk_plr_9mmAR_grenade3","0"};
+
+
+	// Shotgun buckshot
+	CVAR_REGISTER ( &sk_plr_buckshot1 );// {"sk_plr_buckshot1","0"};
+	CVAR_REGISTER ( &sk_plr_buckshot2 );// {"sk_plr_buckshot2","0"};
+	CVAR_REGISTER ( &sk_plr_buckshot3 );// {"sk_plr_buckshot3","0"};
+
+
+	// Crossbow
+	CVAR_REGISTER ( &sk_plr_xbow_bolt_monster1 );// {"sk_plr_xbow_bolt1","0"};
+	CVAR_REGISTER ( &sk_plr_xbow_bolt_monster2 );// {"sk_plr_xbow_bolt2","0"};
+	CVAR_REGISTER ( &sk_plr_xbow_bolt_monster3 );// {"sk_plr_xbow_bolt3","0"};
+
+	CVAR_REGISTER ( &sk_plr_xbow_bolt_client1 );// {"sk_plr_xbow_bolt1","0"};
+	CVAR_REGISTER ( &sk_plr_xbow_bolt_client2 );// {"sk_plr_xbow_bolt2","0"};
+	CVAR_REGISTER ( &sk_plr_xbow_bolt_client3 );// {"sk_plr_xbow_bolt3","0"};
+
+
+	// RPG
+	CVAR_REGISTER ( &sk_plr_rpg1 );// {"sk_plr_rpg1","0"};
+	CVAR_REGISTER ( &sk_plr_rpg2 );// {"sk_plr_rpg2","0"};
+	CVAR_REGISTER ( &sk_plr_rpg3 );// {"sk_plr_rpg3","0"};
+
+
+	// Gauss Gun
+	CVAR_REGISTER ( &sk_plr_gauss1 );// {"sk_plr_gauss1","0"};
+	CVAR_REGISTER ( &sk_plr_gauss2 );// {"sk_plr_gauss2","0"};
+	CVAR_REGISTER ( &sk_plr_gauss3 );// {"sk_plr_gauss3","0"};
+
+
+	// Egon Gun
+	CVAR_REGISTER ( &sk_plr_egon_narrow1 );// {"sk_plr_egon_narrow1","0"};
+	CVAR_REGISTER ( &sk_plr_egon_narrow2 );// {"sk_plr_egon_narrow2","0"};
+	CVAR_REGISTER ( &sk_plr_egon_narrow3 );// {"sk_plr_egon_narrow3","0"};
+
+	CVAR_REGISTER ( &sk_plr_egon_wide1 );// {"sk_plr_egon_wide1","0"};
+	CVAR_REGISTER ( &sk_plr_egon_wide2 );// {"sk_plr_egon_wide2","0"};
+	CVAR_REGISTER ( &sk_plr_egon_wide3 );// {"sk_plr_egon_wide3","0"};
+
+
+	// Hand Grendade
+	CVAR_REGISTER ( &sk_plr_hand_grenade1 );// {"sk_plr_hand_grenade1","0"};
+	CVAR_REGISTER ( &sk_plr_hand_grenade2 );// {"sk_plr_hand_grenade2","0"};
+	CVAR_REGISTER ( &sk_plr_hand_grenade3 );// {"sk_plr_hand_grenade3","0"};
+
+
+	// Satchel Charge
+	CVAR_REGISTER ( &sk_plr_satchel1 );// {"sk_plr_satchel1","0"};
+	CVAR_REGISTER ( &sk_plr_satchel2 );// {"sk_plr_satchel2","0"};
+	CVAR_REGISTER ( &sk_plr_satchel3 );// {"sk_plr_satchel3","0"};
+
+
+	// Tripmine
+	CVAR_REGISTER ( &sk_plr_tripmine1 );// {"sk_plr_tripmine1","0"};
+	CVAR_REGISTER ( &sk_plr_tripmine2 );// {"sk_plr_tripmine2","0"};
+	CVAR_REGISTER ( &sk_plr_tripmine3 );// {"sk_plr_tripmine3","0"};
+
+
+	// WORLD WEAPONS
+	CVAR_REGISTER ( &sk_12mm_bullet1 );// {"sk_12mm_bullet1","0"};
+	CVAR_REGISTER ( &sk_12mm_bullet2 );// {"sk_12mm_bullet2","0"};
+	CVAR_REGISTER ( &sk_12mm_bullet3 );// {"sk_12mm_bullet3","0"};
+
+	CVAR_REGISTER ( &sk_9mmAR_bullet1 );// {"sk_9mm_bullet1","0"};
+	CVAR_REGISTER ( &sk_9mmAR_bullet2 );// {"sk_9mm_bullet1","0"};
+	CVAR_REGISTER ( &sk_9mmAR_bullet3 );// {"sk_9mm_bullet1","0"};
+
+	CVAR_REGISTER ( &sk_9mm_bullet1 );// {"sk_9mm_bullet1","0"};
+	CVAR_REGISTER ( &sk_9mm_bullet2 );// {"sk_9mm_bullet2","0"};
+	CVAR_REGISTER ( &sk_9mm_bullet3 );// {"sk_9mm_bullet3","0"};
+
+
+	// HORNET
+	CVAR_REGISTER ( &sk_hornet_dmg1 );// {"sk_hornet_dmg1","0"};
+	CVAR_REGISTER ( &sk_hornet_dmg2 );// {"sk_hornet_dmg2","0"};
+	CVAR_REGISTER ( &sk_hornet_dmg3 );// {"sk_hornet_dmg3","0"};
+
+	// HEALTH/SUIT CHARGE DISTRIBUTION
+	CVAR_REGISTER ( &sk_suitcharger1 );
+	CVAR_REGISTER ( &sk_suitcharger2 );
+	CVAR_REGISTER ( &sk_suitcharger3 );
+
+	CVAR_REGISTER ( &sk_battery1 );
+	CVAR_REGISTER ( &sk_battery2 );
+	CVAR_REGISTER ( &sk_battery3 );
+
+	CVAR_REGISTER ( &sk_healthcharger1 );
+	CVAR_REGISTER ( &sk_healthcharger2 );
+	CVAR_REGISTER ( &sk_healthcharger3 );
+
+	CVAR_REGISTER ( &sk_healthkit1 );
+	CVAR_REGISTER ( &sk_healthkit2 );
+	CVAR_REGISTER ( &sk_healthkit3 );
+
+	CVAR_REGISTER ( &sk_scientist_heal1 );
+	CVAR_REGISTER ( &sk_scientist_heal2 );
+	CVAR_REGISTER ( &sk_scientist_heal3 );
+
+// monster damage adjusters
+	CVAR_REGISTER ( &sk_monster_head1 );
+	CVAR_REGISTER ( &sk_monster_head2 );
+	CVAR_REGISTER ( &sk_monster_head3 );
+
+	CVAR_REGISTER ( &sk_monster_chest1 );
+	CVAR_REGISTER ( &sk_monster_chest2 );
+	CVAR_REGISTER ( &sk_monster_chest3 );
+
+	CVAR_REGISTER ( &sk_monster_stomach1 );
+	CVAR_REGISTER ( &sk_monster_stomach2 );
+	CVAR_REGISTER ( &sk_monster_stomach3 );
+
+	CVAR_REGISTER ( &sk_monster_arm1 );
+	CVAR_REGISTER ( &sk_monster_arm2 );
+	CVAR_REGISTER ( &sk_monster_arm3 );
+
+	CVAR_REGISTER ( &sk_monster_leg1 );
+	CVAR_REGISTER ( &sk_monster_leg2 );
+	CVAR_REGISTER ( &sk_monster_leg3 );
+
+// player damage adjusters
+	CVAR_REGISTER ( &sk_player_head1 );
+	CVAR_REGISTER ( &sk_player_head2 );
+	CVAR_REGISTER ( &sk_player_head3 );
+
+	CVAR_REGISTER ( &sk_player_chest1 );
+	CVAR_REGISTER ( &sk_player_chest2 );
+	CVAR_REGISTER ( &sk_player_chest3 );
+
+	CVAR_REGISTER ( &sk_player_stomach1 );
+	CVAR_REGISTER ( &sk_player_stomach2 );
+	CVAR_REGISTER ( &sk_player_stomach3 );
+
+	CVAR_REGISTER ( &sk_player_arm1 );
+	CVAR_REGISTER ( &sk_player_arm2 );
+	CVAR_REGISTER ( &sk_player_arm3 );
+
+	CVAR_REGISTER ( &sk_player_leg1 );
+	CVAR_REGISTER ( &sk_player_leg2 );
+	CVAR_REGISTER ( &sk_player_leg3 );
+// END REGISTER CVARS FOR SKILL LEVEL STUFF
+
+	SERVER_COMMAND( "exec skill.cfg\n" );
+}
+
diff --git a/main/source/dlls/game.h b/main/source/dlls/game.h
new file mode 100644
index 00000000..2536b025
--- /dev/null
+++ b/main/source/dlls/game.h
@@ -0,0 +1,45 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+#ifndef GAME_H
+#define GAME_H
+
+extern void GameDLLInit( void );
+
+
+extern cvar_t	displaysoundlist;
+
+// multiplayer server rules
+extern cvar_t	teamplay;
+extern cvar_t	fraglimit;
+extern cvar_t	timelimit;
+extern cvar_t	friendlyfire;
+extern cvar_t	falldamage;
+extern cvar_t	weaponstay;
+extern cvar_t	forcerespawn;
+extern cvar_t	flashlight;
+extern cvar_t	aimcrosshair;
+extern cvar_t	decalfrequency;
+extern cvar_t	teamlist;
+extern cvar_t	teamoverride;
+extern cvar_t	defaultteam;
+extern cvar_t	allowmonsters;
+
+// Engine Cvars
+extern cvar_t	*g_psv_gravity;
+extern cvar_t	*g_psv_aim;
+extern cvar_t	*g_footsteps;
+
+#endif		// GAME_H
diff --git a/main/source/dlls/gamerules.cpp b/main/source/dlls/gamerules.cpp
new file mode 100644
index 00000000..0cf1ef17
--- /dev/null
+++ b/main/source/dlls/gamerules.cpp
@@ -0,0 +1,346 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//=========================================================
+// GameRules.cpp
+//=========================================================
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"player.h"
+#include	"weapons.h"
+#include	"gamerules.h"
+#include	"teamplay_gamerules.h"
+#include	"skill.h"
+#include	"game.h"
+#include	"mod/AvHSpecials.h"
+#include	"mod/AvHHulls.h"
+//extern edict_t *EntSelectSpawnPoint( CBaseEntity *pPlayer );
+
+DLL_GLOBAL CGameRules*	g_pGameRules = NULL;
+extern DLL_GLOBAL BOOL	g_fGameOver;
+extern int gmsgDeathMsg;	// client dll messages
+extern int gmsgMOTD;
+
+int g_teamplay = 1;
+
+//=========================================================
+//=========================================================
+BOOL CGameRules::CanHaveAmmo( CBasePlayer *pPlayer, const char *pszAmmoName, int iMaxCarry )
+{
+	int iAmmoIndex;
+
+	if ( pszAmmoName )
+	{
+		iAmmoIndex = pPlayer->GetAmmoIndex( pszAmmoName );
+
+		if ( iAmmoIndex > -1 )
+		{
+			if ( pPlayer->AmmoInventory( iAmmoIndex ) < iMaxCarry )
+			{
+				// player has room for more of this type of ammo
+				return TRUE;
+			}
+		}
+	}
+
+	return FALSE;
+}
+
+//=========================================================
+//=========================================================
+edict_t *CGameRules :: GetPlayerSpawnSpot( CBasePlayer *pPlayer )
+{
+//	edict_t *pentSpawnSpot = EntSelectSpawnPoint( pPlayer );
+//
+//	pPlayer->InitPlayerFromSpawn(pentSpawnSpot);
+//	
+//	return pentSpawnSpot;
+
+	ASSERT(FALSE);
+
+	return NULL;
+}
+
+//=========================================================
+//=========================================================
+BOOL CGameRules::CanHavePlayerItem( CBasePlayer *pPlayer, CBasePlayerItem *pWeapon )
+{
+	// only living players can have items
+	if ( pPlayer->pev->deadflag != DEAD_NO )
+		return FALSE;
+
+	if ( pWeapon->pszAmmo1() )
+	{
+		if ( !CanHaveAmmo( pPlayer, pWeapon->pszAmmo1(), pWeapon->iMaxAmmo1() ) )
+		{
+			// we can't carry anymore ammo for this gun. We can only 
+			// have the gun if we aren't already carrying one of this type
+			if ( pPlayer->HasPlayerItem( pWeapon ) )
+			{
+				return FALSE;
+			}
+		}
+	}
+	else
+	{
+		// weapon doesn't use ammo, don't take another if you already have it.
+		if ( pPlayer->HasPlayerItem( pWeapon ) )
+		{
+			return FALSE;
+		}
+	}
+
+	// note: will fall through to here if GetItemInfo doesn't fill the struct!
+	return TRUE;
+}
+
+//=========================================================
+// load the SkillData struct with the proper values based on the skill level.
+//=========================================================
+void CGameRules::RefreshSkillData ( void )
+{
+	int	iSkill;
+
+	iSkill = (int)CVAR_GET_FLOAT("skill");
+	g_iSkillLevel = iSkill;
+
+	if ( iSkill < 1 )
+	{
+		iSkill = 1;
+	}
+	else if ( iSkill > 3 )
+	{
+		iSkill = 3; 
+	}
+
+	gSkillData.iSkillLevel = iSkill;
+
+	ALERT ( at_console, "\nGAME SKILL LEVEL:%d\n",iSkill );
+
+	//Agrunt		
+	gSkillData.agruntHealth = GetSkillCvar( "sk_agrunt_health" );
+	gSkillData.agruntDmgPunch = GetSkillCvar( "sk_agrunt_dmg_punch");
+
+	// Apache 
+	gSkillData.apacheHealth = GetSkillCvar( "sk_apache_health");
+
+	// Barney
+	gSkillData.barneyHealth = GetSkillCvar( "sk_barney_health");
+
+	// Big Momma
+	gSkillData.bigmommaHealthFactor = GetSkillCvar( "sk_bigmomma_health_factor" );
+	gSkillData.bigmommaDmgSlash = GetSkillCvar( "sk_bigmomma_dmg_slash" );
+	gSkillData.bigmommaDmgBlast = GetSkillCvar( "sk_bigmomma_dmg_blast" );
+	gSkillData.bigmommaRadiusBlast = GetSkillCvar( "sk_bigmomma_radius_blast" );
+
+	// Bullsquid
+	gSkillData.bullsquidHealth = GetSkillCvar( "sk_bullsquid_health");
+	gSkillData.bullsquidDmgBite = GetSkillCvar( "sk_bullsquid_dmg_bite");
+	gSkillData.bullsquidDmgWhip = GetSkillCvar( "sk_bullsquid_dmg_whip");
+	gSkillData.bullsquidDmgSpit = GetSkillCvar( "sk_bullsquid_dmg_spit");
+
+	// Gargantua
+	gSkillData.gargantuaHealth = GetSkillCvar( "sk_gargantua_health");
+	gSkillData.gargantuaDmgSlash = GetSkillCvar( "sk_gargantua_dmg_slash");
+	gSkillData.gargantuaDmgFire = GetSkillCvar( "sk_gargantua_dmg_fire");
+	gSkillData.gargantuaDmgStomp = GetSkillCvar( "sk_gargantua_dmg_stomp");
+
+	// Hassassin
+	gSkillData.hassassinHealth = GetSkillCvar( "sk_hassassin_health");
+
+	// Headcrab
+	gSkillData.headcrabHealth = GetSkillCvar( "sk_headcrab_health");
+	gSkillData.headcrabDmgBite = GetSkillCvar( "sk_headcrab_dmg_bite");
+
+	// Hgrunt 
+	gSkillData.hgruntHealth = GetSkillCvar( "sk_hgrunt_health");
+	gSkillData.hgruntDmgKick = GetSkillCvar( "sk_hgrunt_kick");
+	gSkillData.hgruntShotgunPellets = GetSkillCvar( "sk_hgrunt_pellets");
+	gSkillData.hgruntGrenadeSpeed = GetSkillCvar( "sk_hgrunt_gspeed");
+
+	// Houndeye
+	gSkillData.houndeyeHealth = GetSkillCvar( "sk_houndeye_health");
+	gSkillData.houndeyeDmgBlast = GetSkillCvar( "sk_houndeye_dmg_blast");
+
+	// ISlave
+	gSkillData.slaveHealth = GetSkillCvar( "sk_islave_health");
+	gSkillData.slaveDmgClaw = GetSkillCvar( "sk_islave_dmg_claw");
+	gSkillData.slaveDmgClawrake = GetSkillCvar( "sk_islave_dmg_clawrake");
+	gSkillData.slaveDmgZap = GetSkillCvar( "sk_islave_dmg_zap");
+
+	// Icthyosaur
+	gSkillData.ichthyosaurHealth = GetSkillCvar( "sk_ichthyosaur_health");
+	gSkillData.ichthyosaurDmgShake = GetSkillCvar( "sk_ichthyosaur_shake");
+
+	// Leech
+	gSkillData.leechHealth = GetSkillCvar( "sk_leech_health");
+
+	gSkillData.leechDmgBite = GetSkillCvar( "sk_leech_dmg_bite");
+
+	// Controller
+	gSkillData.controllerHealth = GetSkillCvar( "sk_controller_health");
+	gSkillData.controllerDmgZap = GetSkillCvar( "sk_controller_dmgzap");
+	gSkillData.controllerSpeedBall = GetSkillCvar( "sk_controller_speedball");
+	gSkillData.controllerDmgBall = GetSkillCvar( "sk_controller_dmgball");
+
+	// Nihilanth
+	gSkillData.nihilanthHealth = GetSkillCvar( "sk_nihilanth_health");
+	gSkillData.nihilanthZap = GetSkillCvar( "sk_nihilanth_zap");
+
+	// Scientist
+	gSkillData.scientistHealth = GetSkillCvar( "sk_scientist_health");
+
+	// Snark
+	gSkillData.snarkHealth = GetSkillCvar( "sk_snark_health");
+	gSkillData.snarkDmgBite = GetSkillCvar( "sk_snark_dmg_bite");
+	gSkillData.snarkDmgPop = GetSkillCvar( "sk_snark_dmg_pop");
+
+	// Zombie
+	gSkillData.zombieHealth = GetSkillCvar( "sk_zombie_health");
+	gSkillData.zombieDmgOneSlash = GetSkillCvar( "sk_zombie_dmg_one_slash");
+	gSkillData.zombieDmgBothSlash = GetSkillCvar( "sk_zombie_dmg_both_slash");
+
+	//Turret
+	gSkillData.turretHealth = GetSkillCvar( "sk_turret_health");
+
+	// MiniTurret
+	gSkillData.miniturretHealth = GetSkillCvar( "sk_miniturret_health");
+	
+	// Sentry Turret
+	gSkillData.sentryHealth = GetSkillCvar( "sk_sentry_health");
+
+// PLAYER WEAPONS
+
+	// Crowbar whack
+	gSkillData.plrDmgCrowbar = GetSkillCvar( "sk_plr_crowbar");
+
+	// Glock Round
+	gSkillData.plrDmg9MM = GetSkillCvar( "sk_plr_9mm_bullet");
+
+	// 357 Round
+	gSkillData.plrDmg357 = GetSkillCvar( "sk_plr_357_bullet");
+
+	// MP5 Round
+	gSkillData.plrDmgMP5 = GetSkillCvar( "sk_plr_9mmAR_bullet");
+
+	// M203 grenade
+	gSkillData.plrDmgM203Grenade = GetSkillCvar( "sk_plr_9mmAR_grenade");
+
+	// Shotgun buckshot
+	gSkillData.plrDmgBuckshot = GetSkillCvar( "sk_plr_buckshot");
+
+	// Crossbow
+	gSkillData.plrDmgCrossbowClient = GetSkillCvar( "sk_plr_xbow_bolt_client");
+	gSkillData.plrDmgCrossbowMonster = GetSkillCvar( "sk_plr_xbow_bolt_monster");
+
+	// RPG
+	gSkillData.plrDmgRPG = GetSkillCvar( "sk_plr_rpg");
+
+	// Gauss gun
+	gSkillData.plrDmgGauss = GetSkillCvar( "sk_plr_gauss");
+
+	// Egon Gun
+	gSkillData.plrDmgEgonNarrow = GetSkillCvar( "sk_plr_egon_narrow");
+	gSkillData.plrDmgEgonWide = GetSkillCvar( "sk_plr_egon_wide");
+
+	// Hand Grendade
+	gSkillData.plrDmgHandGrenade = GetSkillCvar( "sk_plr_hand_grenade");
+
+	// Satchel Charge
+	gSkillData.plrDmgSatchel = GetSkillCvar( "sk_plr_satchel");
+
+	// Tripmine
+	gSkillData.plrDmgTripmine = GetSkillCvar( "sk_plr_tripmine");
+
+	// MONSTER WEAPONS
+	gSkillData.monDmg12MM = GetSkillCvar( "sk_12mm_bullet");
+	gSkillData.monDmgMP5 = GetSkillCvar ("sk_9mmAR_bullet" );
+	gSkillData.monDmg9MM = GetSkillCvar( "sk_9mm_bullet");
+
+	// MONSTER HORNET
+	gSkillData.monDmgHornet = GetSkillCvar( "sk_hornet_dmg");
+
+	// PLAYER HORNET
+// Up to this point, player hornet damage and monster hornet damage were both using
+// monDmgHornet to determine how much damage to do. In tuning the hivehand, we now need
+// to separate player damage and monster hivehand damage. Since it's so late in the project, we've
+// added plrDmgHornet to the SKILLDATA struct, but not to the engine CVar list, so it's inaccesible
+// via SKILLS.CFG. Any player hivehand tuning must take place in the code. (sjb)
+	gSkillData.plrDmgHornet = 7;
+
+
+	// HEALTH/CHARGE
+	gSkillData.suitchargerCapacity = GetSkillCvar( "sk_suitcharger" );
+	gSkillData.batteryCapacity = GetSkillCvar( "sk_battery" );
+	gSkillData.healthchargerCapacity = GetSkillCvar ( "sk_healthcharger" );
+	gSkillData.healthkitCapacity = GetSkillCvar ( "sk_healthkit" );
+	gSkillData.scientistHeal = GetSkillCvar ( "sk_scientist_heal" );
+
+	// monster damage adj
+	gSkillData.monHead = GetSkillCvar( "sk_monster_head" );
+	gSkillData.monChest = GetSkillCvar( "sk_monster_chest" );
+	gSkillData.monStomach = GetSkillCvar( "sk_monster_stomach" );
+	gSkillData.monLeg = GetSkillCvar( "sk_monster_leg" );
+	gSkillData.monArm = GetSkillCvar( "sk_monster_arm" );
+
+	// player damage adj
+	gSkillData.plrHead = GetSkillCvar( "sk_player_head" );
+	gSkillData.plrChest = GetSkillCvar( "sk_player_chest" );
+	gSkillData.plrStomach = GetSkillCvar( "sk_player_stomach" );
+	gSkillData.plrLeg = GetSkillCvar( "sk_player_leg" );
+	gSkillData.plrArm = GetSkillCvar( "sk_player_arm" );
+}
+
+//=========================================================
+// instantiate the proper game rules object
+//=========================================================
+//CGameRules *InstallGameRules( void )
+//{
+//	SERVER_COMMAND( "exec game.cfg\n" );
+//	SERVER_EXECUTE( );
+//
+//	if ( !gpGlobals->deathmatch )
+//	{
+//		// generic half-life
+//		g_teamplay = 0;
+//		return new CHalfLifeRules;
+//	}
+//	else
+//	{
+//		if ( teamplay.value > 0 )
+//		{
+//			// teamplay
+//
+//			g_teamplay = 1;
+//			return new CHalfLifeTeamplay;
+//		}
+//		if ((int)gpGlobals->deathmatch == 1)
+//		{
+//			// vanilla deathmatch
+//			g_teamplay = 0;
+//			return new CHalfLifeMultiplay;
+//		}
+//		else
+//		{
+//			// vanilla deathmatch??
+//			g_teamplay = 0;
+//			return new CHalfLifeMultiplay;
+//		}
+//	}
+//}
+
+
+
diff --git a/main/source/dlls/gamerules.h b/main/source/dlls/gamerules.h
new file mode 100644
index 00000000..9ab91b8d
--- /dev/null
+++ b/main/source/dlls/gamerules.h
@@ -0,0 +1,369 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+#ifndef GAMERULES_H
+#define GAMERULES_H
+
+//=========================================================
+// GameRules
+//=========================================================
+
+//#include "weapons.h"
+//#include "items.h"
+class CBasePlayerItem;
+class CBasePlayer;
+class CItem;
+class CBasePlayerAmmo;
+
+// weapon respawning return codes
+enum
+{	
+	GR_NONE = 0,
+	
+	GR_WEAPON_RESPAWN_YES,
+	GR_WEAPON_RESPAWN_NO,
+	
+	GR_AMMO_RESPAWN_YES,
+	GR_AMMO_RESPAWN_NO,
+	
+	GR_ITEM_RESPAWN_YES,
+	GR_ITEM_RESPAWN_NO,
+
+	GR_PLR_DROP_GUN_ALL,
+	GR_PLR_DROP_GUN_ACTIVE,
+	GR_PLR_DROP_GUN_NO,
+
+	GR_PLR_DROP_AMMO_ALL,
+	GR_PLR_DROP_AMMO_ACTIVE,
+	GR_PLR_DROP_AMMO_NO,
+};
+
+// Player relationship return codes
+enum
+{
+	GR_NOTTEAMMATE = 0,
+	GR_TEAMMATE,
+	GR_ENEMY,
+	GR_ALLY,
+	GR_NEUTRAL,
+};
+
+class CGameRules
+{
+public:
+	virtual ~CGameRules() {}
+
+	virtual void RefreshSkillData( void );// fill skill data struct with proper values
+	virtual void Think( void ) = 0;// GR_Think - runs every server frame, should handle any timer tasks, periodic events, etc.
+	virtual BOOL IsAllowedToSpawn( CBaseEntity *pEntity ) = 0;  // Can this item spawn (eg monsters don't spawn in deathmatch).
+
+	virtual BOOL FAllowFlashlight( void ) = 0;// Are players allowed to switch on their flashlight?
+	virtual BOOL FShouldSwitchWeapon( CBasePlayer *pPlayer, CBasePlayerItem *pWeapon ) = 0;// should the player switch to this weapon?
+	virtual BOOL GetNextBestWeapon( CBasePlayer *pPlayer, CBasePlayerItem *pCurrentWeapon ) = 0;// I can't use this weapon anymore, get me the next best one.
+
+// Functions to verify the single/multiplayer status of a game
+	virtual BOOL IsMultiplayer( void ) = 0;// is this a multiplayer game? (either coop or deathmatch)
+	virtual BOOL IsDeathmatch( void ) = 0;//is this a deathmatch game?
+	virtual BOOL IsTeamplay( void ) { return FALSE; };// is this deathmatch game being played with team rules?
+	virtual BOOL IsCoOp( void ) = 0;// is this a coop game?
+	virtual const char *GetGameDescription( void ) { return "Half-Life"; }  // this is the game name that gets seen in the server browser
+	
+// Client connection/disconnection
+	virtual BOOL ClientConnected( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[ 128 ] ) = 0;// a client just connected to the server (player hasn't spawned yet)
+	virtual void InitHUD( CBasePlayer *pl ) = 0;		// the client dll is ready for updating
+	virtual void ClientDisconnected( edict_t *pClient ) = 0;// a client just disconnected from the server
+	virtual void UpdateGameMode( CBasePlayer *pPlayer ) {}  // the client needs to be informed of the current game mode
+
+// Client damage rules
+	virtual float FlPlayerFallDamage( CBasePlayer *pPlayer ) = 0;// this client just hit the ground after a fall. How much damage?
+	virtual BOOL  FPlayerCanTakeDamage( CBasePlayer *pPlayer, CBaseEntity *pAttacker ) {return TRUE;};// can this player take damage from this attacker?
+	virtual BOOL ShouldAutoAim( CBasePlayer *pPlayer, edict_t *target ) { return TRUE; }
+
+// Client spawn/respawn control
+	virtual void PlayerSpawn( CBasePlayer *pPlayer ) = 0;// called by CBasePlayer::Spawn just before releasing player into the game
+	virtual void PlayerThink( CBasePlayer *pPlayer ) = 0; // called by CBasePlayer::PreThink every frame, before physics are run and after keys are accepted
+	virtual BOOL FPlayerCanRespawn( CBasePlayer *pPlayer ) = 0;// is this player allowed to respawn now?
+	virtual float FlPlayerSpawnTime( CBasePlayer *pPlayer ) = 0;// When in the future will this player be able to spawn?
+	virtual edict_t *GetPlayerSpawnSpot( CBasePlayer *pPlayer );// Place this player on their spawnspot and face them the proper direction.
+
+	virtual BOOL AllowAutoTargetCrosshair( void ) { return TRUE; };
+	virtual BOOL ClientCommand( CBasePlayer *pPlayer, const char *pcmd ) { return FALSE; };  // handles the user commands;  returns TRUE if command handled properly
+	virtual void ClientUserInfoChanged( CBasePlayer *pPlayer, char *infobuffer ) {}		// the player has changed userinfo;  can change it now
+
+// Client kills/scoring
+	virtual int IPointsForKill( CBasePlayer *pAttacker, CBasePlayer *pKilled ) = 0;// how many points do I award whoever kills this player?
+	virtual void PlayerKilled( CBasePlayer *pVictim, entvars_t *pKiller, entvars_t *pInflictor ) = 0;// Called each time a player dies
+	virtual void DeathNotice( CBasePlayer *pVictim, entvars_t *pKiller, entvars_t *pInflictor )=  0;// Call this from within a GameRules class to report an obituary.
+	virtual bool CanPlayerBeKilled(CBasePlayer* inPlayer) { return true; }
+// Weapon retrieval
+	virtual BOOL CanHavePlayerItem( CBasePlayer *pPlayer, CBasePlayerItem *pWeapon );// The player is touching an CBasePlayerItem, do I give it to him?
+	virtual void PlayerGotWeapon( CBasePlayer *pPlayer, CBasePlayerItem *pWeapon ) = 0;// Called each time a player picks up a weapon from the ground
+
+// Weapon spawn/respawn control
+	virtual int WeaponShouldRespawn( CBasePlayerItem *pWeapon ) = 0;// should this weapon respawn?
+	virtual float FlWeaponRespawnTime( CBasePlayerItem *pWeapon ) = 0;// when may this weapon respawn?
+	virtual float FlWeaponTryRespawn( CBasePlayerItem *pWeapon ) = 0; // can i respawn now,  and if not, when should i try again?
+	virtual Vector VecWeaponRespawnSpot( CBasePlayerItem *pWeapon ) = 0;// where in the world should this weapon respawn?
+
+// Item retrieval
+	virtual BOOL CanHaveItem( CBasePlayer *pPlayer, CItem *pItem ) = 0;// is this player allowed to take this item?
+	virtual void PlayerGotItem( CBasePlayer *pPlayer, CItem *pItem ) = 0;// call each time a player picks up an item (battery, healthkit, longjump)
+
+// Item spawn/respawn control
+	virtual int ItemShouldRespawn( CItem *pItem ) = 0;// Should this item respawn?
+	virtual float FlItemRespawnTime( CItem *pItem ) = 0;// when may this item respawn?
+	virtual Vector VecItemRespawnSpot( CItem *pItem ) = 0;// where in the world should this item respawn?
+
+// Ammo retrieval
+	virtual BOOL CanHaveAmmo( CBasePlayer *pPlayer, const char *pszAmmoName, int iMaxCarry );// can this player take more of this ammo?
+	virtual void PlayerGotAmmo( CBasePlayer *pPlayer, char *szName, int iCount ) = 0;// called each time a player picks up some ammo in the world
+
+// Ammo spawn/respawn control
+	virtual int AmmoShouldRespawn( CBasePlayerAmmo *pAmmo ) = 0;// should this ammo item respawn?
+	virtual float FlAmmoRespawnTime( CBasePlayerAmmo *pAmmo ) = 0;// when should this ammo item respawn?
+	virtual Vector VecAmmoRespawnSpot( CBasePlayerAmmo *pAmmo ) = 0;// where in the world should this ammo item respawn?
+																			// by default, everything spawns
+
+// Healthcharger respawn control
+	virtual float FlHealthChargerRechargeTime( void ) = 0;// how long until a depleted HealthCharger recharges itself?
+	virtual float FlHEVChargerRechargeTime( void ) { return 0; }// how long until a depleted HealthCharger recharges itself?
+
+// What happens to a dead player's weapons
+	virtual int DeadPlayerWeapons( CBasePlayer *pPlayer ) = 0;// what do I do with a player's weapons when he's killed?
+
+// What happens to a dead player's ammo	
+	virtual int DeadPlayerAmmo( CBasePlayer *pPlayer ) = 0;// Do I drop ammo when the player dies? How much?
+
+// Teamplay stuff
+	virtual const char *GetTeamID( CBaseEntity *pEntity ) = 0;// what team is this entity on?
+	virtual int PlayerRelationship( CBaseEntity *pPlayer, CBaseEntity *pTarget ) = 0;// What is the player's relationship with this entity?
+	virtual int GetTeamIndex( const char *pTeamName ) { return -1; }
+	virtual const char *GetIndexedTeamName( int teamIndex ) { return ""; }
+	virtual BOOL IsValidTeam( const char *pTeamName ) { return TRUE; }
+	virtual void ChangePlayerTeam( CBasePlayer *pPlayer, const char *pTeamName, BOOL bKill, BOOL bGib ) {}
+	virtual const char *SetDefaultPlayerTeam( CBasePlayer *pPlayer ) { return ""; }
+
+// Sounds
+	virtual BOOL PlayTextureSounds( void ) { return TRUE; }
+	virtual BOOL PlayFootstepSounds( CBasePlayer *pl, float fvol ) { return TRUE; }
+
+// Monsters
+	virtual BOOL FAllowMonsters( void ) = 0;//are monsters allowed
+
+	// Immediately end a multiplayer game
+	virtual void EndMultiplayerGame( void ) {}
+};
+
+extern void InstallGameRules( void );
+
+
+//=========================================================
+// CHalfLifeRules - rules for the single player Half-Life 
+// game.
+//=========================================================
+class CHalfLifeRules : public CGameRules
+{
+public:
+	CHalfLifeRules ( void );
+
+// GR_Think
+	virtual void Think( void );
+	virtual BOOL IsAllowedToSpawn( CBaseEntity *pEntity );
+	virtual BOOL FAllowFlashlight( void ) { return TRUE; };
+
+	virtual BOOL FShouldSwitchWeapon( CBasePlayer *pPlayer, CBasePlayerItem *pWeapon );
+	virtual BOOL GetNextBestWeapon( CBasePlayer *pPlayer, CBasePlayerItem *pCurrentWeapon );
+	
+// Functions to verify the single/multiplayer status of a game
+	virtual BOOL IsMultiplayer( void );
+	virtual BOOL IsDeathmatch( void );
+	virtual BOOL IsCoOp( void );
+
+// Client connection/disconnection
+	virtual BOOL ClientConnected( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[ 128 ] );
+	virtual void InitHUD( CBasePlayer *pl );		// the client dll is ready for updating
+	virtual void ClientDisconnected( edict_t *pClient );
+
+// Client damage rules
+	virtual float FlPlayerFallDamage( CBasePlayer *pPlayer );
+	
+// Client spawn/respawn control
+	virtual void PlayerSpawn( CBasePlayer *pPlayer );
+	virtual void PlayerThink( CBasePlayer *pPlayer );
+	virtual BOOL FPlayerCanRespawn( CBasePlayer *pPlayer );
+	virtual float FlPlayerSpawnTime( CBasePlayer *pPlayer );
+
+	virtual BOOL AllowAutoTargetCrosshair( void );
+
+// Client kills/scoring
+	virtual int IPointsForKill( CBasePlayer *pAttacker, CBasePlayer *pKilled );
+	virtual void PlayerKilled( CBasePlayer *pVictim, entvars_t *pKiller, entvars_t *pInflictor );
+	virtual void DeathNotice( CBasePlayer *pVictim, entvars_t *pKiller, entvars_t *pInflictor );
+
+// Weapon retrieval
+	virtual void PlayerGotWeapon( CBasePlayer *pPlayer, CBasePlayerItem *pWeapon );
+
+// Weapon spawn/respawn control
+	virtual int WeaponShouldRespawn( CBasePlayerItem *pWeapon );
+	virtual float FlWeaponRespawnTime( CBasePlayerItem *pWeapon );
+	virtual float FlWeaponTryRespawn( CBasePlayerItem *pWeapon );
+	virtual Vector VecWeaponRespawnSpot( CBasePlayerItem *pWeapon );
+
+// Item retrieval
+	virtual BOOL CanHaveItem( CBasePlayer *pPlayer, CItem *pItem );
+	virtual void PlayerGotItem( CBasePlayer *pPlayer, CItem *pItem );
+
+// Item spawn/respawn control
+	virtual int ItemShouldRespawn( CItem *pItem );
+	virtual float FlItemRespawnTime( CItem *pItem );
+	virtual Vector VecItemRespawnSpot( CItem *pItem );
+
+// Ammo retrieval
+	virtual void PlayerGotAmmo( CBasePlayer *pPlayer, char *szName, int iCount );
+
+// Ammo spawn/respawn control
+	virtual int AmmoShouldRespawn( CBasePlayerAmmo *pAmmo );
+	virtual float FlAmmoRespawnTime( CBasePlayerAmmo *pAmmo );
+	virtual Vector VecAmmoRespawnSpot( CBasePlayerAmmo *pAmmo );
+
+// Healthcharger respawn control
+	virtual float FlHealthChargerRechargeTime( void );
+
+// What happens to a dead player's weapons
+	virtual int DeadPlayerWeapons( CBasePlayer *pPlayer );
+
+// What happens to a dead player's ammo	
+	virtual int DeadPlayerAmmo( CBasePlayer *pPlayer );
+
+// Monsters
+	virtual BOOL FAllowMonsters( void );
+
+// Teamplay stuff	
+	virtual const char *GetTeamID( CBaseEntity *pEntity ) {return "";};
+	virtual int PlayerRelationship( CBaseEntity *pPlayer, CBaseEntity *pTarget );
+};
+
+//=========================================================
+// CHalfLifeMultiplay - rules for the basic half life multiplayer
+// competition
+//=========================================================
+class CHalfLifeMultiplay : public CGameRules
+{
+public:
+	CHalfLifeMultiplay();
+
+// GR_Think
+	virtual void Think( void );
+	virtual void RefreshSkillData( void );
+	virtual BOOL IsAllowedToSpawn( CBaseEntity *pEntity );
+	virtual BOOL FAllowFlashlight( void );
+
+	virtual BOOL FShouldSwitchWeapon( CBasePlayer *pPlayer, CBasePlayerItem *pWeapon );
+	virtual BOOL GetNextBestWeapon( CBasePlayer *pPlayer, CBasePlayerItem *pCurrentWeapon );
+
+// Functions to verify the single/multiplayer status of a game
+	virtual BOOL IsMultiplayer( void );
+	virtual BOOL IsDeathmatch( void );
+	virtual BOOL IsCoOp( void );
+
+// Client connection/disconnection
+	// If ClientConnected returns FALSE, the connection is rejected and the user is provided the reason specified in
+	//  svRejectReason
+	// Only the client's name and remote address are provided to the dll for verification.
+	virtual BOOL ClientConnected( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[ 128 ] );
+	virtual void InitHUD( CBasePlayer *pl );		// the client dll is ready for updating
+	virtual void ClientDisconnected( edict_t *pClient );
+	virtual void UpdateGameMode( CBasePlayer *pPlayer );  // the client needs to be informed of the current game mode
+
+// Client damage rules
+	virtual float FlPlayerFallDamage( CBasePlayer *pPlayer );
+	virtual BOOL  FPlayerCanTakeDamage( CBasePlayer *pPlayer, CBaseEntity *pAttacker );
+
+// Client spawn/respawn control
+	virtual void PlayerSpawn( CBasePlayer *pPlayer );
+	virtual void PlayerThink( CBasePlayer *pPlayer );
+	virtual BOOL FPlayerCanRespawn( CBasePlayer *pPlayer );
+	virtual float FlPlayerSpawnTime( CBasePlayer *pPlayer );
+	virtual edict_t *GetPlayerSpawnSpot( CBasePlayer *pPlayer );
+
+	virtual BOOL AllowAutoTargetCrosshair( void );
+	virtual BOOL ClientCommand( CBasePlayer *pPlayer, const char *pcmd );
+
+// Client kills/scoring
+	virtual int IPointsForKill( CBasePlayer *pAttacker, CBasePlayer *pKilled );
+	virtual void PlayerKilled( CBasePlayer *pVictim, entvars_t *pKiller, entvars_t *pInflictor );
+	virtual void DeathNotice( CBasePlayer *pVictim, entvars_t *pKiller, entvars_t *pInflictor );
+
+// Weapon retrieval
+	virtual void PlayerGotWeapon( CBasePlayer *pPlayer, CBasePlayerItem *pWeapon );
+	virtual BOOL CanHavePlayerItem( CBasePlayer *pPlayer, CBasePlayerItem *pWeapon );// The player is touching an CBasePlayerItem, do I give it to him?
+
+// Weapon spawn/respawn control
+	virtual int WeaponShouldRespawn( CBasePlayerItem *pWeapon );
+	virtual float FlWeaponRespawnTime( CBasePlayerItem *pWeapon );
+	virtual float FlWeaponTryRespawn( CBasePlayerItem *pWeapon );
+	virtual Vector VecWeaponRespawnSpot( CBasePlayerItem *pWeapon );
+
+// Item retrieval
+	virtual BOOL CanHaveItem( CBasePlayer *pPlayer, CItem *pItem );
+	virtual void PlayerGotItem( CBasePlayer *pPlayer, CItem *pItem );
+
+// Item spawn/respawn control
+	virtual int ItemShouldRespawn( CItem *pItem );
+	virtual float FlItemRespawnTime( CItem *pItem );
+	virtual Vector VecItemRespawnSpot( CItem *pItem );
+
+// Ammo retrieval
+	virtual void PlayerGotAmmo( CBasePlayer *pPlayer, char *szName, int iCount );
+
+// Ammo spawn/respawn control
+	virtual int AmmoShouldRespawn( CBasePlayerAmmo *pAmmo );
+	virtual float FlAmmoRespawnTime( CBasePlayerAmmo *pAmmo );
+	virtual Vector VecAmmoRespawnSpot( CBasePlayerAmmo *pAmmo );
+
+// Healthcharger respawn control
+	virtual float FlHealthChargerRechargeTime( void );
+	virtual float FlHEVChargerRechargeTime( void );
+
+// What happens to a dead player's weapons
+	virtual int DeadPlayerWeapons( CBasePlayer *pPlayer );
+
+// What happens to a dead player's ammo	
+	virtual int DeadPlayerAmmo( CBasePlayer *pPlayer );
+
+// Teamplay stuff	
+	virtual const char *GetTeamID( CBaseEntity *pEntity ) {return "";}
+	virtual int PlayerRelationship( CBaseEntity *pPlayer, CBaseEntity *pTarget );
+
+	virtual BOOL PlayTextureSounds( void ) { return FALSE; }
+	virtual BOOL PlayFootstepSounds( CBasePlayer *pl, float fvol );
+
+// Monsters
+	virtual BOOL FAllowMonsters( void );
+
+	// Immediately end a multiplayer game
+	virtual void EndMultiplayerGame( void ) { GoToIntermission(); }
+
+protected:
+	virtual void ChangeLevel( void );
+	virtual void GoToIntermission( void );
+	float m_flIntermissionEndTime;
+	BOOL m_iEndIntermissionButtonHit;
+	virtual void SendMOTDToClient( edict_t *client );
+};
+
+extern DLL_GLOBAL CGameRules*	g_pGameRules;
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/gargantua.cpp b/main/source/dlls/gargantua.cpp
new file mode 100644
index 00000000..3a77d743
--- /dev/null
+++ b/main/source/dlls/gargantua.cpp
@@ -0,0 +1,1368 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+#ifndef OEM_BUILD
+
+//=========================================================
+// Gargantua
+//=========================================================
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"nodes.h"
+#include	"monsters.h"
+#include	"schedule.h"
+#include	"customentity.h"
+#include	"weapons.h"
+#include	"effects.h"
+#include	"soundent.h"
+#include	"decals.h"
+#include	"explode.h"
+#include	"func_break.h"
+
+//=========================================================
+// Gargantua Monster
+//=========================================================
+const float GARG_ATTACKDIST = 80.0;
+
+// Garg animation events
+#define GARG_AE_SLASH_LEFT			1
+//#define GARG_AE_BEAM_ATTACK_RIGHT	2		// No longer used
+#define GARG_AE_LEFT_FOOT			3
+#define GARG_AE_RIGHT_FOOT			4
+#define GARG_AE_STOMP				5
+#define GARG_AE_BREATHE				6
+
+
+// Gargantua is immune to any damage but this
+#define GARG_DAMAGE					(DMG_ENERGYBEAM|DMG_CRUSH|DMG_MORTAR|DMG_BLAST)
+#define GARG_EYE_SPRITE_NAME		"sprites/gargeye1.spr"
+#define GARG_BEAM_SPRITE_NAME		"sprites/xbeam3.spr"
+#define GARG_BEAM_SPRITE2			"sprites/xbeam3.spr"
+#define GARG_STOMP_SPRITE_NAME		"sprites/gargeye1.spr"
+#define GARG_STOMP_BUZZ_SOUND		"weapons/mine_charge.wav"
+#define GARG_FLAME_LENGTH			330
+#define GARG_GIB_MODEL				"models/metalplategibs.mdl"
+
+#define ATTN_GARG					(ATTN_NORM)
+
+#define STOMP_SPRITE_COUNT			10
+
+int gStompSprite = 0, gGargGibModel = 0;
+void SpawnExplosion( Vector center, float randomRange, float time, int magnitude );
+
+class CSmoker;
+
+// Spiral Effect
+class CSpiral : public CBaseEntity
+{
+public:
+	void Spawn( void );
+	void Think( void );
+	int ObjectCaps( void ) { return FCAP_DONT_SAVE; }
+	static CSpiral *Create( const Vector &origin, float height, float radius, float duration );
+};
+LINK_ENTITY_TO_CLASS( streak_spiral, CSpiral );
+
+
+class CStomp : public CBaseEntity
+{
+public:
+	void Spawn( void );
+	void Think( void );
+	static CStomp *StompCreate( const Vector &origin, const Vector &end, float speed );
+
+private:
+// UNDONE: re-use this sprite list instead of creating new ones all the time
+//	CSprite		*m_pSprites[ STOMP_SPRITE_COUNT ];
+};
+
+LINK_ENTITY_TO_CLASS( garg_stomp, CStomp );
+CStomp *CStomp::StompCreate( const Vector &origin, const Vector &end, float speed )
+{
+	CStomp *pStomp = GetClassPtr( (CStomp *)NULL );
+	
+	pStomp->pev->origin = origin;
+	Vector dir = (end - origin);
+	pStomp->pev->scale = dir.Length();
+	pStomp->pev->movedir = dir.Normalize();
+	pStomp->pev->speed = speed;
+	pStomp->Spawn();
+	
+	return pStomp;
+}
+
+void CStomp::Spawn( void )
+{
+	pev->nextthink = gpGlobals->time;
+	pev->classname = MAKE_STRING("garg_stomp");
+	pev->dmgtime = gpGlobals->time;
+
+	pev->framerate = 30;
+	pev->model = MAKE_STRING(GARG_STOMP_SPRITE_NAME);
+	pev->rendermode = kRenderTransTexture;
+	pev->renderamt = 0;
+	EMIT_SOUND_DYN( edict(), CHAN_BODY, GARG_STOMP_BUZZ_SOUND, 1, ATTN_NORM, 0, PITCH_NORM * 0.55);
+}
+
+
+#define	STOMP_INTERVAL		0.025
+
+void CStomp::Think( void )
+{
+	TraceResult tr;
+
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	// Do damage for this frame
+	Vector vecStart = pev->origin;
+	vecStart.z += 30;
+	Vector vecEnd = vecStart + (pev->movedir * pev->speed * gpGlobals->frametime);
+
+	UTIL_TraceHull( vecStart, vecEnd, dont_ignore_monsters, head_hull, ENT(pev), &tr );
+	
+	if ( tr.pHit && tr.pHit != pev->owner )
+	{
+		CBaseEntity *pEntity = CBaseEntity::Instance( tr.pHit );
+		entvars_t *pevOwner = pev;
+		if ( pev->owner )
+			pevOwner = VARS(pev->owner);
+
+		if ( pEntity )
+			pEntity->TakeDamage( pev, pevOwner, gSkillData.gargantuaDmgStomp, DMG_SONIC );
+	}
+	
+	// Accelerate the effect
+	pev->speed = pev->speed + (gpGlobals->frametime) * pev->framerate;
+	pev->framerate = pev->framerate + (gpGlobals->frametime) * 1500;
+	
+	// Move and spawn trails
+	while ( gpGlobals->time - pev->dmgtime > STOMP_INTERVAL )
+	{
+		pev->origin = pev->origin + pev->movedir * pev->speed * STOMP_INTERVAL;
+		for ( int i = 0; i < 2; i++ )
+		{
+			CSprite *pSprite = CSprite::SpriteCreate( GARG_STOMP_SPRITE_NAME, pev->origin, TRUE );
+			if ( pSprite )
+			{
+				UTIL_TraceLine( pev->origin, pev->origin - Vector(0,0,500), ignore_monsters, edict(), &tr );
+				pSprite->pev->origin = tr.vecEndPos;
+				pSprite->pev->velocity = Vector(RANDOM_FLOAT(-200,200),RANDOM_FLOAT(-200,200),175);
+				// pSprite->AnimateAndDie( RANDOM_FLOAT( 8.0, 12.0 ) );
+				pSprite->pev->nextthink = gpGlobals->time + 0.3;
+				pSprite->SetThink( &CStomp::SUB_Remove );
+				pSprite->SetTransparency( kRenderTransAdd, 255, 255, 255, 255, kRenderFxFadeFast );
+			}
+		}
+		pev->dmgtime += STOMP_INTERVAL;
+		// Scale has the "life" of this effect
+		pev->scale -= STOMP_INTERVAL * pev->speed;
+		if ( pev->scale <= 0 )
+		{
+			// Life has run out
+			UTIL_Remove(this);
+			STOP_SOUND( edict(), CHAN_BODY, GARG_STOMP_BUZZ_SOUND );
+		}
+
+	}
+}
+
+
+void StreakSplash( const Vector &origin, const Vector &direction, int color, int count, int speed, int velocityRange )
+{
+	MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, origin );
+		WRITE_BYTE( TE_STREAK_SPLASH );
+		WRITE_COORD( origin.x );		// origin
+		WRITE_COORD( origin.y );
+		WRITE_COORD( origin.z );
+		WRITE_COORD( direction.x );	// direction
+		WRITE_COORD( direction.y );
+		WRITE_COORD( direction.z );
+		WRITE_BYTE( color );	// Streak color 6
+		WRITE_SHORT( count );	// count
+		WRITE_SHORT( speed );
+		WRITE_SHORT( velocityRange );	// Random velocity modifier
+	MESSAGE_END();
+}
+
+
+class CGargantua : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void SetYawSpeed( void );
+	int  Classify ( void );
+	int TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType );
+	void TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType );
+	void HandleAnimEvent( MonsterEvent_t *pEvent );
+
+	BOOL CheckMeleeAttack1( float flDot, float flDist );		// Swipe
+	BOOL CheckMeleeAttack2( float flDot, float flDist );		// Flames
+	BOOL CheckRangeAttack1( float flDot, float flDist );		// Stomp attack
+	void SetObjectCollisionBox( void )
+	{
+		pev->absmin = pev->origin + Vector( -80, -80, 0 );
+		pev->absmax = pev->origin + Vector( 80, 80, 214 );
+	}
+
+	Schedule_t *GetScheduleOfType( int Type );
+	void StartTask( Task_t *pTask );
+	void RunTask( Task_t *pTask );
+
+	void PrescheduleThink( void );
+
+	void Killed( entvars_t *pevAttacker, int iGib );
+	void DeathEffect( void );
+
+	void EyeOff( void );
+	void EyeOn( int level );
+	void EyeUpdate( void );
+	void Leap( void );
+	void StompAttack( void );
+	void FlameCreate( void );
+	void FlameUpdate( void );
+	void FlameControls( float angleX, float angleY );
+	void FlameDestroy( void );
+	inline BOOL FlameIsOn( void ) { return m_pFlame[0] != NULL; }
+
+	void FlameDamage( Vector vecStart, Vector vecEnd, entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int iClassIgnore, int bitsDamageType );
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	CUSTOM_SCHEDULES;
+
+private:
+	static const char *pAttackHitSounds[];
+	static const char *pBeamAttackSounds[];
+	static const char *pAttackMissSounds[];
+	static const char *pRicSounds[];
+	static const char *pFootSounds[];
+	static const char *pIdleSounds[];
+	static const char *pAlertSounds[];
+	static const char *pPainSounds[];
+	static const char *pAttackSounds[];
+	static const char *pStompSounds[];
+	static const char *pBreatheSounds[];
+
+	CBaseEntity* GargantuaCheckTraceHullAttack(float flDist, int iDamage, int iDmgType);
+
+	CSprite		*m_pEyeGlow;		// Glow around the eyes
+	CBeam		*m_pFlame[4];		// Flame beams
+
+	int			m_eyeBrightness;	// Brightness target
+	float		m_seeTime;			// Time to attack (when I see the enemy, I set this)
+	float		m_flameTime;		// Time of next flame attack
+	float		m_painSoundTime;	// Time of next pain sound
+	float		m_streakTime;		// streak timer (don't send too many)
+	float		m_flameX;			// Flame thrower aim
+	float		m_flameY;			
+};
+
+LINK_ENTITY_TO_CLASS( monster_gargantua, CGargantua );
+
+TYPEDESCRIPTION	CGargantua::m_SaveData[] = 
+{
+	DEFINE_FIELD( CGargantua, m_pEyeGlow, FIELD_CLASSPTR ),
+	DEFINE_FIELD( CGargantua, m_eyeBrightness, FIELD_INTEGER ),
+	DEFINE_FIELD( CGargantua, m_seeTime, FIELD_TIME ),
+	DEFINE_FIELD( CGargantua, m_flameTime, FIELD_TIME ),
+	DEFINE_FIELD( CGargantua, m_streakTime, FIELD_TIME ),
+	DEFINE_FIELD( CGargantua, m_painSoundTime, FIELD_TIME ),
+	DEFINE_ARRAY( CGargantua, m_pFlame, FIELD_CLASSPTR, 4 ),
+	DEFINE_FIELD( CGargantua, m_flameX, FIELD_FLOAT ),
+	DEFINE_FIELD( CGargantua, m_flameY, FIELD_FLOAT ),
+};
+
+IMPLEMENT_SAVERESTORE( CGargantua, CBaseMonster );
+
+const char *CGargantua::pAttackHitSounds[] = 
+{
+	"zombie/claw_strike1.wav",
+	"zombie/claw_strike2.wav",
+	"zombie/claw_strike3.wav",
+};
+
+const char *CGargantua::pBeamAttackSounds[] = 
+{
+	"garg/gar_flameoff1.wav",
+	"garg/gar_flameon1.wav",
+	"garg/gar_flamerun1.wav",
+};
+
+
+const char *CGargantua::pAttackMissSounds[] = 
+{
+	"zombie/claw_miss1.wav",
+	"zombie/claw_miss2.wav",
+};
+
+const char *CGargantua::pRicSounds[] = 
+{
+#if 0
+	"weapons/ric1.wav",
+	"weapons/ric2.wav",
+	"weapons/ric3.wav",
+	"weapons/ric4.wav",
+	"weapons/ric5.wav",
+#else
+	"debris/metal4.wav",
+	"debris/metal6.wav",
+	"weapons/ric4.wav",
+	"weapons/ric5.wav",
+#endif
+};
+
+const char *CGargantua::pFootSounds[] = 
+{
+	"garg/gar_step1.wav",
+	"garg/gar_step2.wav",
+};
+
+
+const char *CGargantua::pIdleSounds[] = 
+{
+	"garg/gar_idle1.wav",
+	"garg/gar_idle2.wav",
+	"garg/gar_idle3.wav",
+	"garg/gar_idle4.wav",
+	"garg/gar_idle5.wav",
+};
+
+
+const char *CGargantua::pAttackSounds[] = 
+{
+	"garg/gar_attack1.wav",
+	"garg/gar_attack2.wav",
+	"garg/gar_attack3.wav",
+};
+
+const char *CGargantua::pAlertSounds[] = 
+{
+	"garg/gar_alert1.wav",
+	"garg/gar_alert2.wav",
+	"garg/gar_alert3.wav",
+};
+
+const char *CGargantua::pPainSounds[] = 
+{
+	"garg/gar_pain1.wav",
+	"garg/gar_pain2.wav",
+	"garg/gar_pain3.wav",
+};
+
+const char *CGargantua::pStompSounds[] = 
+{
+	"garg/gar_stomp1.wav",
+};
+
+const char *CGargantua::pBreatheSounds[] = 
+{
+	"garg/gar_breathe1.wav",
+	"garg/gar_breathe2.wav",
+	"garg/gar_breathe3.wav",
+};
+//=========================================================
+// AI Schedules Specific to this monster
+//=========================================================
+#if 0
+enum
+{
+	SCHED_ = LAST_COMMON_SCHEDULE + 1,
+};
+#endif
+
+enum
+{
+	TASK_SOUND_ATTACK = LAST_COMMON_TASK + 1,
+	TASK_FLAME_SWEEP,
+};
+
+Task_t	tlGargFlame[] =
+{
+	{ TASK_STOP_MOVING,			(float)0		},
+	{ TASK_FACE_ENEMY,			(float)0		},
+	{ TASK_SOUND_ATTACK,		(float)0		},
+	// { TASK_PLAY_SEQUENCE,		(float)ACT_SIGNAL1	},
+	{ TASK_SET_ACTIVITY,		(float)ACT_MELEE_ATTACK2 },
+	{ TASK_FLAME_SWEEP,			(float)4.5		},
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE	},
+};
+
+Schedule_t	slGargFlame[] =
+{
+	{ 
+		tlGargFlame,
+		ARRAYSIZE ( tlGargFlame ), 
+		0,
+		0,
+		"GargFlame"
+	},
+};
+
+
+// primary melee attack
+Task_t	tlGargSwipe[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_FACE_ENEMY,			(float)0		},
+	{ TASK_MELEE_ATTACK1,		(float)0		},
+};
+
+Schedule_t	slGargSwipe[] =
+{
+	{ 
+		tlGargSwipe,
+		ARRAYSIZE ( tlGargSwipe ), 
+		bits_COND_CAN_MELEE_ATTACK2,
+		0,
+		"GargSwipe"
+	},
+};
+
+
+DEFINE_CUSTOM_SCHEDULES( CGargantua )
+{
+	slGargFlame,
+	slGargSwipe,
+};
+
+IMPLEMENT_CUSTOM_SCHEDULES( CGargantua, CBaseMonster );
+
+
+void CGargantua::EyeOn( int level )
+{
+	m_eyeBrightness = level;	
+}
+
+
+void CGargantua::EyeOff( void )
+{
+	m_eyeBrightness = 0;
+}
+
+
+void CGargantua::EyeUpdate( void )
+{
+	if ( m_pEyeGlow )
+	{
+		m_pEyeGlow->pev->renderamt = UTIL_Approach( m_eyeBrightness, m_pEyeGlow->pev->renderamt, 26 );
+		if ( m_pEyeGlow->pev->renderamt == 0 )
+			m_pEyeGlow->pev->effects |= EF_NODRAW;
+		else
+			m_pEyeGlow->pev->effects &= ~EF_NODRAW;
+		UTIL_SetOrigin( m_pEyeGlow->pev, pev->origin );
+	}
+}
+
+
+void CGargantua::StompAttack( void )
+{
+	TraceResult trace;
+
+	UTIL_MakeVectors( pev->angles );
+	Vector vecStart = pev->origin + Vector(0,0,60) + 35 * gpGlobals->v_forward;
+	Vector vecAim = ShootAtEnemy( vecStart );
+	Vector vecEnd = (vecAim * 1024) + vecStart;
+
+	UTIL_TraceLine( vecStart, vecEnd, ignore_monsters, edict(), &trace );
+	CStomp::StompCreate( vecStart, trace.vecEndPos, 0 );
+	UTIL_ScreenShake( pev->origin, 12.0, 100.0, 2.0, 1000 );
+	EMIT_SOUND_DYN ( edict(), CHAN_WEAPON, pStompSounds[ RANDOM_LONG(0,ARRAYSIZE(pStompSounds)-1) ], 1.0, ATTN_GARG, 0, PITCH_NORM + RANDOM_LONG(-10,10) );
+
+	UTIL_TraceLine( pev->origin, pev->origin - Vector(0,0,20), ignore_monsters, edict(), &trace );
+	if ( trace.flFraction < 1.0 )
+		UTIL_DecalTrace( &trace, DECAL_GARGSTOMP1 );
+}
+
+
+void CGargantua :: FlameCreate( void )
+{
+	int			i;
+	Vector		posGun, angleGun;
+	TraceResult trace;
+
+	UTIL_MakeVectors( pev->angles );
+	
+	for ( i = 0; i < 4; i++ )
+	{
+		if ( i < 2 )
+			m_pFlame[i] = CBeam::BeamCreate( GARG_BEAM_SPRITE_NAME, 240 );
+		else
+			m_pFlame[i] = CBeam::BeamCreate( GARG_BEAM_SPRITE2, 140 );
+		if ( m_pFlame[i] )
+		{
+			int attach = i%2;
+			// attachment is 0 based in GetAttachment
+			GetAttachment( attach+1, posGun, angleGun );
+
+			Vector vecEnd = (gpGlobals->v_forward * GARG_FLAME_LENGTH) + posGun;
+			UTIL_TraceLine( posGun, vecEnd, dont_ignore_monsters, edict(), &trace );
+
+			m_pFlame[i]->PointEntInit( trace.vecEndPos, entindex() );
+			if ( i < 2 )
+				m_pFlame[i]->SetColor( 255, 130, 90 );
+			else
+				m_pFlame[i]->SetColor( 0, 120, 255 );
+			m_pFlame[i]->SetBrightness( 190 );
+			m_pFlame[i]->SetFlags( BEAM_FSHADEIN );
+			m_pFlame[i]->SetScrollRate( 20 );
+			// attachment is 1 based in SetEndAttachment
+			m_pFlame[i]->SetEndAttachment( attach + 2 );
+			CSoundEnt::InsertSound( bits_SOUND_COMBAT, posGun, 384, 0.3 );
+		}
+	}
+	EMIT_SOUND_DYN ( edict(), CHAN_BODY, pBeamAttackSounds[ 1 ], 1.0, ATTN_NORM, 0, PITCH_NORM );
+	EMIT_SOUND_DYN ( edict(), CHAN_WEAPON, pBeamAttackSounds[ 2 ], 1.0, ATTN_NORM, 0, PITCH_NORM );
+}
+
+
+void CGargantua :: FlameControls( float angleX, float angleY )
+{
+	if ( angleY < -180 )
+		angleY += 360;
+	else if ( angleY > 180 )
+		angleY -= 360;
+
+	if ( angleY < -45 )
+		angleY = -45;
+	else if ( angleY > 45 )
+		angleY = 45;
+
+	m_flameX = UTIL_ApproachAngle( angleX, m_flameX, 4 );
+	m_flameY = UTIL_ApproachAngle( angleY, m_flameY, 8 );
+	SetBoneController( 0, m_flameY );
+	SetBoneController( 1, m_flameX );
+}
+
+
+void CGargantua :: FlameUpdate( void )
+{
+	int				i;
+	static float	offset[2] = { 60, -60 };
+	TraceResult		trace;
+	Vector			vecStart, angleGun;
+	BOOL			streaks = FALSE;
+
+	for ( i = 0; i < 2; i++ )
+	{
+		if ( m_pFlame[i] )
+		{
+			Vector vecAim = pev->angles;
+			vecAim.x += m_flameX;
+			vecAim.y += m_flameY;
+
+			UTIL_MakeVectors( vecAim );
+
+			GetAttachment( i+1, vecStart, angleGun );
+			Vector vecEnd = vecStart + (gpGlobals->v_forward * GARG_FLAME_LENGTH); //  - offset[i] * gpGlobals->v_right;
+
+			UTIL_TraceLine( vecStart, vecEnd, dont_ignore_monsters, edict(), &trace );
+
+			m_pFlame[i]->SetStartPos( trace.vecEndPos );
+			m_pFlame[i+2]->SetStartPos( (vecStart * 0.6) + (trace.vecEndPos * 0.4) );
+
+			if ( trace.flFraction != 1.0 && gpGlobals->time > m_streakTime )
+			{
+				StreakSplash( trace.vecEndPos, trace.vecPlaneNormal, 6, 20, 50, 400 );
+				streaks = TRUE;
+				UTIL_DecalTrace( &trace, DECAL_SMALLSCORCH1 + RANDOM_LONG(0,2) );
+			}
+			// RadiusDamage( trace.vecEndPos, pev, pev, gSkillData.gargantuaDmgFire, CLASS_ALIEN_MONSTER, DMG_BURN );
+			FlameDamage( vecStart, trace.vecEndPos, pev, pev, gSkillData.gargantuaDmgFire, CLASS_ALIEN_MONSTER, DMG_BURN );
+
+			MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+				WRITE_BYTE( TE_ELIGHT );
+				WRITE_SHORT( entindex( ) + 0x1000 * (i + 2) );		// entity, attachment
+				WRITE_COORD( vecStart.x );		// origin
+				WRITE_COORD( vecStart.y );
+				WRITE_COORD( vecStart.z );
+				WRITE_COORD( RANDOM_FLOAT( 32, 48 ) );	// radius
+				WRITE_BYTE( 255 );	// R
+				WRITE_BYTE( 255 );	// G
+				WRITE_BYTE( 255 );	// B
+				WRITE_BYTE( 2 );	// life * 10
+				WRITE_COORD( 0 ); // decay
+			MESSAGE_END();
+		}
+	}
+	if ( streaks )
+		m_streakTime = gpGlobals->time;
+}
+
+
+
+void CGargantua :: FlameDamage( Vector vecStart, Vector vecEnd, entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int iClassIgnore, int bitsDamageType )
+{
+	CBaseEntity *pEntity = NULL;
+	TraceResult	tr;
+	float		flAdjustedDamage;
+	Vector		vecSpot;
+
+	Vector vecMid = (vecStart + vecEnd) * 0.5;
+
+	float searchRadius = (vecStart - vecMid).Length();
+
+	Vector vecAim = (vecEnd - vecStart).Normalize( );
+
+	// iterate on all entities in the vicinity.
+	while ((pEntity = UTIL_FindEntityInSphere( pEntity, vecMid, searchRadius )) != NULL)
+	{
+		if ( pEntity->pev->takedamage != DAMAGE_NO )
+		{
+			// UNDONE: this should check a damage mask, not an ignore
+			if ( iClassIgnore != CLASS_NONE && pEntity->Classify() == iClassIgnore )
+			{// houndeyes don't hurt other houndeyes with their attack
+				continue;
+			}
+			
+			vecSpot = pEntity->BodyTarget( vecMid );
+		
+			float dist = DotProduct( vecAim, vecSpot - vecMid );
+			if (dist > searchRadius)
+				dist = searchRadius;
+			else if (dist < -searchRadius)
+				dist = searchRadius;
+			
+			Vector vecSrc = vecMid + dist * vecAim;
+
+			UTIL_TraceLine ( vecSrc, vecSpot, dont_ignore_monsters, ENT(pev), &tr );
+
+			if ( tr.flFraction == 1.0 || tr.pHit == pEntity->edict() )
+			{// the explosion can 'see' this entity, so hurt them!
+				// decrease damage for an ent that's farther from the flame.
+				dist = ( vecSrc - tr.vecEndPos ).Length();
+
+				if (dist > 64)
+				{
+					flAdjustedDamage = flDamage - (dist - 64) * 0.4;
+					if (flAdjustedDamage <= 0)
+						continue;
+				}
+				else
+				{
+					flAdjustedDamage = flDamage;
+				}
+
+				// ALERT( at_console, "hit %s\n", STRING( pEntity->pev->classname ) );
+				if (tr.flFraction != 1.0)
+				{
+					ClearMultiDamage( );
+					pEntity->TraceAttack( pevInflictor, flAdjustedDamage, (tr.vecEndPos - vecSrc).Normalize( ), &tr, bitsDamageType );
+					ApplyMultiDamage( pevInflictor, pevAttacker );
+				}
+				else
+				{
+					pEntity->TakeDamage ( pevInflictor, pevAttacker, flAdjustedDamage, bitsDamageType );
+				}
+			}
+		}
+	}
+}
+
+
+void CGargantua :: FlameDestroy( void )
+{
+	int i;
+
+	EMIT_SOUND_DYN ( edict(), CHAN_WEAPON, pBeamAttackSounds[ 0 ], 1.0, ATTN_NORM, 0, PITCH_NORM );
+	for ( i = 0; i < 4; i++ )
+	{
+		if ( m_pFlame[i] )
+		{
+			UTIL_Remove( m_pFlame[i] );
+			m_pFlame[i] = NULL;
+		}
+	}
+}
+
+
+void CGargantua :: PrescheduleThink( void )
+{
+	if ( !HasConditions( bits_COND_SEE_ENEMY ) )
+	{
+		m_seeTime = gpGlobals->time + 5;
+		EyeOff();
+	}
+	else
+		EyeOn( 200 );
+	
+	EyeUpdate();
+}
+
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CGargantua :: Classify ( void )
+{
+	return	CLASS_ALIEN_MONSTER;
+}
+
+//=========================================================
+// SetYawSpeed - allows each sequence to have a different
+// turn rate associated with it.
+//=========================================================
+void CGargantua :: SetYawSpeed ( void )
+{
+	int ys;
+
+	switch ( m_Activity )
+	{
+	case ACT_IDLE:
+		ys = 60;
+		break;
+	case ACT_TURN_LEFT:
+	case ACT_TURN_RIGHT:
+		ys = 180;
+		break;
+	case ACT_WALK:
+	case ACT_RUN:
+		ys = 60;
+		break;
+
+	default:
+		ys = 60;
+		break;
+	}
+
+	pev->yaw_speed = ys;
+}
+
+
+//=========================================================
+// Spawn
+//=========================================================
+void CGargantua :: Spawn()
+{
+	Precache( );
+
+	SET_MODEL(ENT(pev), "models/garg.mdl");
+	UTIL_SetSize( pev, Vector( -32, -32, 0 ), Vector( 32, 32, 64 ) );
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_STEP;
+	m_bloodColor		= BLOOD_COLOR_GREEN;
+	pev->health			= gSkillData.gargantuaHealth;
+	//pev->view_ofs		= Vector ( 0, 0, 96 );// taken from mdl file
+	m_flFieldOfView		= -0.2;// width of forward view cone ( as a dotproduct result )
+	m_MonsterState		= MONSTERSTATE_NONE;
+
+	MonsterInit();
+
+	m_pEyeGlow = CSprite::SpriteCreate( GARG_EYE_SPRITE_NAME, pev->origin, FALSE );
+	m_pEyeGlow->SetTransparency( kRenderGlow, 255, 255, 255, 0, kRenderFxNoDissipation );
+	m_pEyeGlow->SetAttachment( edict(), 1 );
+	EyeOff();
+	m_seeTime = gpGlobals->time + 5;
+	m_flameTime = gpGlobals->time + 2;
+}
+
+
+//=========================================================
+// Precache - precaches all resources this monster needs
+//=========================================================
+void CGargantua :: Precache()
+{
+	int i;
+
+	PRECACHE_MODEL("models/garg.mdl");
+	PRECACHE_MODEL( GARG_EYE_SPRITE_NAME );
+	PRECACHE_MODEL( GARG_BEAM_SPRITE_NAME );
+	PRECACHE_MODEL( GARG_BEAM_SPRITE2 );
+	gStompSprite = PRECACHE_MODEL( GARG_STOMP_SPRITE_NAME );
+	gGargGibModel = PRECACHE_MODEL( GARG_GIB_MODEL );
+	PRECACHE_SOUND( GARG_STOMP_BUZZ_SOUND );
+
+	for ( i = 0; i < ARRAYSIZE( pAttackHitSounds ); i++ )
+		PRECACHE_SOUND((char *)pAttackHitSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pBeamAttackSounds ); i++ )
+		PRECACHE_SOUND((char *)pBeamAttackSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pAttackMissSounds ); i++ )
+		PRECACHE_SOUND((char *)pAttackMissSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pRicSounds ); i++ )
+		PRECACHE_SOUND((char *)pRicSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pFootSounds ); i++ )
+		PRECACHE_SOUND((char *)pFootSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pIdleSounds ); i++ )
+		PRECACHE_SOUND((char *)pIdleSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pAlertSounds ); i++ )
+		PRECACHE_SOUND((char *)pAlertSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pPainSounds ); i++ )
+		PRECACHE_SOUND((char *)pPainSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pAttackSounds ); i++ )
+		PRECACHE_SOUND((char *)pAttackSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pStompSounds ); i++ )
+		PRECACHE_SOUND((char *)pStompSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pBreatheSounds ); i++ )
+		PRECACHE_SOUND((char *)pBreatheSounds[i]);
+}	
+
+
+void CGargantua::TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType )
+{
+	ALERT( at_aiconsole, "CGargantua::TraceAttack\n");
+
+	if ( !IsAlive() )
+	{
+		CBaseMonster::TraceAttack( pevAttacker, flDamage, vecDir, ptr, bitsDamageType );
+		return;
+	}
+
+	// UNDONE: Hit group specific damage?
+	if ( bitsDamageType & (GARG_DAMAGE|DMG_BLAST) )
+	{
+		if ( m_painSoundTime < gpGlobals->time )
+		{
+			EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, pPainSounds[ RANDOM_LONG(0,ARRAYSIZE(pPainSounds)-1) ], 1.0, ATTN_GARG, 0, PITCH_NORM );
+			m_painSoundTime = gpGlobals->time + RANDOM_FLOAT( 2.5, 4 );
+		}
+	}
+
+	bitsDamageType &= GARG_DAMAGE;
+
+	if ( bitsDamageType == 0)
+	{
+		if ( pev->dmgtime != gpGlobals->time || (RANDOM_LONG(0,100) < 20) )
+		{
+			UTIL_Ricochet( ptr->vecEndPos, RANDOM_FLOAT(0.5,1.5) );
+			pev->dmgtime = gpGlobals->time;
+//			if ( RANDOM_LONG(0,100) < 25 )
+//				EMIT_SOUND_DYN( ENT(pev), CHAN_BODY, pRicSounds[ RANDOM_LONG(0,ARRAYSIZE(pRicSounds)-1) ], 1.0, ATTN_NORM, 0, PITCH_NORM );
+		}
+		flDamage = 0;
+	}
+
+	CBaseMonster::TraceAttack( pevAttacker, flDamage, vecDir, ptr, bitsDamageType );
+
+}
+
+
+
+int CGargantua::TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType )
+{
+	ALERT( at_aiconsole, "CGargantua::TakeDamage\n");
+
+	if ( IsAlive() )
+	{
+		if ( !(bitsDamageType & GARG_DAMAGE) )
+			flDamage *= 0.01;
+		if ( bitsDamageType & DMG_BLAST )
+			SetConditions( bits_COND_LIGHT_DAMAGE );
+	}
+
+	return CBaseMonster::TakeDamage( pevInflictor, pevAttacker, flDamage, bitsDamageType );
+}
+
+
+void CGargantua::DeathEffect( void )
+{
+	int i;
+	UTIL_MakeVectors(pev->angles);
+	Vector deathPos = pev->origin + gpGlobals->v_forward * 100;
+
+	// Create a spiral of streaks
+	CSpiral::Create( deathPos, (pev->absmax.z - pev->absmin.z) * 0.6, 125, 1.5 );
+
+	Vector position = pev->origin;
+	position.z += 32;
+	for ( i = 0; i < 7; i+=2 )
+	{
+		SpawnExplosion( position, 70, (i * 0.3), 60 + (i*20) );
+		position.z += 15;
+	}
+
+	CBaseEntity *pSmoker = CBaseEntity::Create( "env_smoker", pev->origin, g_vecZero, NULL );
+	pSmoker->pev->health = 1;	// 1 smoke balls
+	pSmoker->pev->scale = 46;	// 4.6X normal size
+	pSmoker->pev->dmg = 0;		// 0 radial distribution
+	pSmoker->pev->nextthink = gpGlobals->time + 2.5;	// Start in 2.5 seconds
+}
+
+
+void CGargantua::Killed( entvars_t *pevAttacker, int iGib )
+{
+	EyeOff();
+	UTIL_Remove( m_pEyeGlow );
+	m_pEyeGlow = NULL;
+	CBaseMonster::Killed( pevAttacker, GIB_NEVER );
+}
+
+//=========================================================
+// CheckMeleeAttack1
+// Garg swipe attack
+// 
+//=========================================================
+BOOL CGargantua::CheckMeleeAttack1( float flDot, float flDist )
+{
+//	ALERT(at_aiconsole, "CheckMelee(%f, %f)\n", flDot, flDist);
+
+	if (flDot >= 0.7)
+	{
+		if (flDist <= GARG_ATTACKDIST)
+			return TRUE;
+	}
+	return FALSE;
+}
+
+
+// Flame thrower madness!
+BOOL CGargantua::CheckMeleeAttack2( float flDot, float flDist )
+{
+//	ALERT(at_aiconsole, "CheckMelee(%f, %f)\n", flDot, flDist);
+
+	if ( gpGlobals->time > m_flameTime )
+	{
+		if (flDot >= 0.8 && flDist > GARG_ATTACKDIST)
+		{
+			if ( flDist <= GARG_FLAME_LENGTH )
+				return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+
+//=========================================================
+// CheckRangeAttack1
+// flDot is the cos of the angle of the cone within which
+// the attack can occur.
+//=========================================================
+//
+// Stomp attack
+//
+//=========================================================
+BOOL CGargantua::CheckRangeAttack1( float flDot, float flDist )
+{
+	if ( gpGlobals->time > m_seeTime )
+	{
+		if (flDot >= 0.7 && flDist > GARG_ATTACKDIST)
+		{
+				return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+
+
+
+//=========================================================
+// HandleAnimEvent - catches the monster-specific messages
+// that occur when tagged animation frames are played.
+//=========================================================
+void CGargantua::HandleAnimEvent(MonsterEvent_t *pEvent)
+{
+	switch( pEvent->event )
+	{
+	case GARG_AE_SLASH_LEFT:
+		{
+			// HACKHACK!!!
+			CBaseEntity *pHurt = GargantuaCheckTraceHullAttack( GARG_ATTACKDIST + 10.0, gSkillData.gargantuaDmgSlash, DMG_SLASH );
+			if (pHurt)
+			{
+				if ( pHurt->pev->flags & (FL_MONSTER|FL_CLIENT) )
+				{
+					pHurt->pev->punchangle.x = -30; // pitch
+					pHurt->pev->punchangle.y = -30;	// yaw
+					pHurt->pev->punchangle.z = 30;	// roll
+					//UTIL_MakeVectors(pev->angles);	// called by CheckTraceHullAttack
+					pHurt->pev->velocity = pHurt->pev->velocity - gpGlobals->v_right * 100;
+				}
+				EMIT_SOUND_DYN ( edict(), CHAN_WEAPON, pAttackHitSounds[ RANDOM_LONG(0,ARRAYSIZE(pAttackHitSounds)-1) ], 1.0, ATTN_NORM, 0, 50 + RANDOM_LONG(0,15) );
+			}
+			else // Play a random attack miss sound
+				EMIT_SOUND_DYN ( edict(), CHAN_WEAPON, pAttackMissSounds[ RANDOM_LONG(0,ARRAYSIZE(pAttackMissSounds)-1) ], 1.0, ATTN_NORM, 0, 50 + RANDOM_LONG(0,15) );
+
+			Vector forward;
+			UTIL_MakeVectorsPrivate( pev->angles, forward, NULL, NULL );
+		}
+		break;
+
+	case GARG_AE_RIGHT_FOOT:
+	case GARG_AE_LEFT_FOOT:
+		UTIL_ScreenShake( pev->origin, 4.0, 3.0, 1.0, 750 );
+		EMIT_SOUND_DYN ( edict(), CHAN_BODY, pFootSounds[ RANDOM_LONG(0,ARRAYSIZE(pFootSounds)-1) ], 1.0, ATTN_GARG, 0, PITCH_NORM + RANDOM_LONG(-10,10) );
+		break;
+
+	case GARG_AE_STOMP:
+		StompAttack();
+		m_seeTime = gpGlobals->time + 12;
+		break;
+
+	case GARG_AE_BREATHE:
+		EMIT_SOUND_DYN ( edict(), CHAN_VOICE, pBreatheSounds[ RANDOM_LONG(0,ARRAYSIZE(pBreatheSounds)-1) ], 1.0, ATTN_GARG, 0, PITCH_NORM + RANDOM_LONG(-10,10) );
+		break;
+
+	default:
+		CBaseMonster::HandleAnimEvent(pEvent);
+		break;
+	}
+}
+
+
+//=========================================================
+// CheckTraceHullAttack - expects a length to trace, amount 
+// of damage to do, and damage type. Returns a pointer to
+// the damaged entity in case the monster wishes to do
+// other stuff to the victim (punchangle, etc)
+// Used for many contact-range melee attacks. Bites, claws, etc.
+
+// Overridden for Gargantua because his swing starts lower as
+// a percentage of his height (otherwise he swings over the
+// players head)
+//=========================================================
+CBaseEntity* CGargantua::GargantuaCheckTraceHullAttack(float flDist, int iDamage, int iDmgType)
+{
+	TraceResult tr;
+
+	UTIL_MakeVectors( pev->angles );
+	Vector vecStart = pev->origin;
+	vecStart.z += 64;
+	Vector vecEnd = vecStart + (gpGlobals->v_forward * flDist) - (gpGlobals->v_up * flDist * 0.3);
+
+	UTIL_TraceHull( vecStart, vecEnd, dont_ignore_monsters, head_hull, ENT(pev), &tr );
+	
+	if ( tr.pHit )
+	{
+		CBaseEntity *pEntity = CBaseEntity::Instance( tr.pHit );
+
+		if ( iDamage > 0 )
+		{
+			pEntity->TakeDamage( pev, pev, iDamage, iDmgType );
+		}
+
+		return pEntity;
+	}
+
+	return NULL;
+}
+
+
+Schedule_t *CGargantua::GetScheduleOfType( int Type )
+{
+	// HACKHACK - turn off the flames if they are on and garg goes scripted / dead
+	if ( FlameIsOn() )
+		FlameDestroy();
+
+	switch( Type )
+	{
+		case SCHED_MELEE_ATTACK2:
+			return slGargFlame;
+		case SCHED_MELEE_ATTACK1:
+			return slGargSwipe;
+		break;
+	}
+
+	return CBaseMonster::GetScheduleOfType( Type );
+}
+
+
+void CGargantua::StartTask( Task_t *pTask )
+{
+	switch ( pTask->iTask )
+	{
+	case TASK_FLAME_SWEEP:
+		FlameCreate();
+		m_flWaitFinished = gpGlobals->time + pTask->flData;
+		m_flameTime = gpGlobals->time + 6;
+		m_flameX = 0;
+		m_flameY = 0;
+		break;
+
+	case TASK_SOUND_ATTACK:
+		if ( RANDOM_LONG(0,100) < 30 )
+			EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, pAttackSounds[ RANDOM_LONG(0,ARRAYSIZE(pAttackSounds)-1) ], 1.0, ATTN_GARG, 0, PITCH_NORM );
+		TaskComplete();
+		break;
+	
+	case TASK_DIE:
+		m_flWaitFinished = gpGlobals->time + 1.6;
+		DeathEffect();
+		// FALL THROUGH
+	default: 
+		CBaseMonster::StartTask( pTask );
+		break;
+	}
+}
+
+//=========================================================
+// RunTask
+//=========================================================
+void CGargantua::RunTask( Task_t *pTask )
+{
+	switch ( pTask->iTask )
+	{
+	case TASK_DIE:
+		if ( gpGlobals->time > m_flWaitFinished )
+		{
+			pev->renderfx = kRenderFxExplode;
+			pev->rendercolor.x = 255;
+			pev->rendercolor.y = 0;
+			pev->rendercolor.z = 0;
+			StopAnimation();
+			pev->nextthink = gpGlobals->time + 0.15;
+			SetThink( &CGargantua::SUB_Remove );
+			int i;
+			int parts = MODEL_FRAMES( gGargGibModel );
+			for ( i = 0; i < 10; i++ )
+			{
+				CGib *pGib = GetClassPtr( (CGib *)NULL );
+
+				pGib->Spawn( GARG_GIB_MODEL );
+				
+				int bodyPart = 0;
+				if ( parts > 1 )
+					bodyPart = RANDOM_LONG( 0, pev->body-1 );
+
+				pGib->pev->body = bodyPart;
+				pGib->m_bloodColor = BLOOD_COLOR_YELLOW;
+				pGib->m_material = matNone;
+				pGib->pev->origin = pev->origin;
+				pGib->pev->velocity = UTIL_RandomBloodVector() * RANDOM_FLOAT( 300, 500 );
+				pGib->pev->nextthink = gpGlobals->time + 1.25;
+				pGib->SetThink( &CGargantua::SUB_FadeOut );
+			}
+			MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, pev->origin );
+				WRITE_BYTE( TE_BREAKMODEL);
+
+				// position
+				WRITE_COORD( pev->origin.x );
+				WRITE_COORD( pev->origin.y );
+				WRITE_COORD( pev->origin.z );
+
+				// size
+				WRITE_COORD( 200 );
+				WRITE_COORD( 200 );
+				WRITE_COORD( 128 );
+
+				// velocity
+				WRITE_COORD( 0 ); 
+				WRITE_COORD( 0 );
+				WRITE_COORD( 0 );
+
+				// randomization
+				WRITE_BYTE( 200 ); 
+
+				// Model
+				WRITE_SHORT( gGargGibModel );	//model id#
+
+				// # of shards
+				WRITE_BYTE( 50 );
+
+				// duration
+				WRITE_BYTE( 20 );// 3.0 seconds
+
+				// flags
+
+				WRITE_BYTE( BREAK_FLESH );
+			MESSAGE_END();
+
+			return;
+		}
+		else
+			CBaseMonster::RunTask(pTask);
+		break;
+
+	case TASK_FLAME_SWEEP:
+		if ( gpGlobals->time > m_flWaitFinished )
+		{
+			FlameDestroy();
+			TaskComplete();
+			FlameControls( 0, 0 );
+			SetBoneController( 0, 0 );
+			SetBoneController( 1, 0 );
+		}
+		else
+		{
+			BOOL cancel = FALSE;
+
+			Vector angles = g_vecZero;
+
+			FlameUpdate();
+			CBaseEntity *pEnemy = m_hEnemy;
+			if ( pEnemy )
+			{
+				Vector org = pev->origin;
+				org.z += 64;
+				Vector dir = pEnemy->BodyTarget(org) - org;
+				angles = UTIL_VecToAngles( dir );
+				angles.x = -angles.x;
+				angles.y -= pev->angles.y;
+				if ( dir.Length() > 400 )
+					cancel = TRUE;
+			}
+			if ( fabs(angles.y) > 60 )
+				cancel = TRUE;
+			
+			if ( cancel )
+			{
+				m_flWaitFinished -= 0.5;
+				m_flameTime -= 0.5;
+			}
+			// FlameControls( angles.x + 2 * sin(gpGlobals->time*8), angles.y + 28 * sin(gpGlobals->time*8.5) );
+			FlameControls( angles.x, angles.y );
+		}
+		break;
+
+	default:
+		CBaseMonster::RunTask( pTask );
+		break;
+	}
+}
+
+
+class CSmoker : public CBaseEntity
+{
+public:
+	void Spawn( void );
+	void Think( void );
+};
+
+LINK_ENTITY_TO_CLASS( env_smoker, CSmoker );
+
+void CSmoker::Spawn( void )
+{
+	pev->movetype = MOVETYPE_NONE;
+	pev->nextthink = gpGlobals->time;
+	pev->solid = SOLID_NOT;
+	UTIL_SetSize(pev, g_vecZero, g_vecZero );
+	pev->effects |= EF_NODRAW;
+	pev->angles = g_vecZero;
+}
+
+
+void CSmoker::Think( void )
+{
+	// lots of smoke
+	MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, pev->origin );
+		WRITE_BYTE( TE_SMOKE );
+		WRITE_COORD( pev->origin.x + RANDOM_FLOAT( -pev->dmg, pev->dmg ));
+		WRITE_COORD( pev->origin.y + RANDOM_FLOAT( -pev->dmg, pev->dmg ));
+		WRITE_COORD( pev->origin.z);
+		WRITE_SHORT( g_sModelIndexSmoke );
+		WRITE_BYTE( RANDOM_LONG(pev->scale, pev->scale * 1.1) );
+		WRITE_BYTE( RANDOM_LONG(8,14)  ); // framerate
+	MESSAGE_END();
+
+	pev->health--;
+	if ( pev->health > 0 )
+		pev->nextthink = gpGlobals->time + RANDOM_FLOAT(0.1, 0.2);
+	else
+		UTIL_Remove( this );
+}
+
+
+void CSpiral::Spawn( void )
+{
+	pev->movetype = MOVETYPE_NONE;
+	pev->nextthink = gpGlobals->time;
+	pev->solid = SOLID_NOT;
+	UTIL_SetSize(pev, g_vecZero, g_vecZero );
+	pev->effects |= EF_NODRAW;
+	pev->angles = g_vecZero;
+}
+
+
+CSpiral *CSpiral::Create( const Vector &origin, float height, float radius, float duration )
+{
+	if ( duration <= 0 )
+		return NULL;
+
+	CSpiral *pSpiral = GetClassPtr( (CSpiral *)NULL );
+	pSpiral->Spawn();
+	pSpiral->pev->dmgtime = pSpiral->pev->nextthink;
+	pSpiral->pev->origin = origin;
+	pSpiral->pev->scale = radius;
+	pSpiral->pev->dmg = height;
+	pSpiral->pev->speed = duration;
+	pSpiral->pev->health = 0;
+	pSpiral->pev->angles = g_vecZero;
+
+	return pSpiral;
+}
+
+#define SPIRAL_INTERVAL		0.1 //025
+
+void CSpiral::Think( void )
+{
+	float time = gpGlobals->time - pev->dmgtime;
+
+	while ( time > SPIRAL_INTERVAL )
+	{
+		Vector position = pev->origin;
+		Vector direction = Vector(0,0,1);
+		
+		float fraction = 1.0 / pev->speed;
+
+		float radius = (pev->scale * pev->health) * fraction;
+
+		position.z += (pev->health * pev->dmg) * fraction;
+		pev->angles.y = (pev->health * 360 * 8) * fraction;
+		UTIL_MakeVectors( pev->angles );
+		position = position + gpGlobals->v_forward * radius;
+		direction = (direction + gpGlobals->v_forward).Normalize();
+
+		StreakSplash( position, Vector(0,0,1), RANDOM_LONG(8,11), 20, RANDOM_LONG(50,150), 400 );
+
+		// Jeez, how many counters should this take ? :)
+		pev->dmgtime += SPIRAL_INTERVAL;
+		pev->health += SPIRAL_INTERVAL;
+		time -= SPIRAL_INTERVAL;
+	}
+
+	pev->nextthink = gpGlobals->time;
+
+	if ( pev->health >= pev->speed )
+		UTIL_Remove( this );
+}
+
+
+// HACKHACK Cut and pasted from explode.cpp
+void SpawnExplosion( Vector center, float randomRange, float time, int magnitude )
+{
+	KeyValueData	kvd;
+	char			buf[128];
+
+	center.x += RANDOM_FLOAT( -randomRange, randomRange );
+	center.y += RANDOM_FLOAT( -randomRange, randomRange );
+
+	CBaseEntity *pExplosion = CBaseEntity::Create( "env_explosion", center, g_vecZero, NULL );
+	sprintf( buf, "%3d", magnitude );
+	kvd.szKeyName = "iMagnitude";
+	kvd.szValue = buf;
+	pExplosion->KeyValue( &kvd );
+	pExplosion->pev->spawnflags |= SF_ENVEXPLOSION_NODAMAGE;
+
+	pExplosion->Spawn();
+	pExplosion->SetThink( CBaseEntity::SUB_CallUseToggle );
+	pExplosion->pev->nextthink = gpGlobals->time + time;
+}
+
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/gauss.cpp b/main/source/dlls/gauss.cpp
new file mode 100644
index 00000000..09b798fa
--- /dev/null
+++ b/main/source/dlls/gauss.cpp
@@ -0,0 +1,614 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD )
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "player.h"
+#include "soundent.h"
+#include "shake.h"
+#include "gamerules.h"
+
+
+#define	GAUSS_PRIMARY_CHARGE_VOLUME	256// how loud gauss is while charging
+#define GAUSS_PRIMARY_FIRE_VOLUME	450// how loud gauss is when discharged
+
+enum gauss_e {
+	GAUSS_IDLE = 0,
+	GAUSS_IDLE2,
+	GAUSS_FIDGET,
+	GAUSS_SPINUP,
+	GAUSS_SPIN,
+	GAUSS_FIRE,
+	GAUSS_FIRE2,
+	GAUSS_HOLSTER,
+	GAUSS_DRAW
+};
+
+LINK_ENTITY_TO_CLASS( weapon_gauss, CGauss );
+
+float CGauss::GetFullChargeTime( void )
+{
+#ifdef CLIENT_DLL
+	if ( bIsMultiplayer() )
+#else
+	if ( g_pGameRules->IsMultiplayer() )
+#endif
+	{
+		return 1.5;
+	}
+
+	return 4;
+}
+
+void CGauss::Spawn( )
+{
+	Precache( );
+	m_iId = WEAPON_GAUSS;
+	SET_MODEL(ENT(pev), "models/w_gauss.mdl");
+
+	m_iDefaultAmmo = GAUSS_DEFAULT_GIVE;
+
+	FallInit();// get ready to fall down.
+}
+
+
+void CGauss::Precache( void )
+{
+	PRECACHE_MODEL("models/w_gauss.mdl");
+	PRECACHE_MODEL("models/v_gauss.mdl");
+	PRECACHE_MODEL("models/p_gauss.mdl");
+
+	PRECACHE_SOUND("items/9mmclip1.wav");
+
+	PRECACHE_SOUND("weapons/gauss2.wav");
+	PRECACHE_SOUND("weapons/electro4.wav");
+	PRECACHE_SOUND("weapons/electro5.wav");
+	PRECACHE_SOUND("weapons/electro6.wav");
+	PRECACHE_SOUND("ambience/pulsemachine.wav");
+	
+	m_iGlow = PRECACHE_MODEL( "sprites/hotglow.spr" );
+	m_iBalls = PRECACHE_MODEL( "sprites/hotglow.spr" );
+	m_iBeam = PRECACHE_MODEL( "sprites/smoke.spr" );
+
+	m_usGaussFire = PRECACHE_EVENT( 1, "events/gauss.sc" );
+	m_usGaussSpin = PRECACHE_EVENT( 1, "events/gaussspin.sc" );
+}
+
+int CGauss::AddToPlayer( CBasePlayer *pPlayer )
+{
+	if ( CBasePlayerWeapon::AddToPlayer( pPlayer ) )
+	{
+		MESSAGE_BEGIN( MSG_ONE, gmsgWeapPickup, NULL, pPlayer->pev );
+			WRITE_BYTE( m_iId );
+		MESSAGE_END();
+		return TRUE;
+	}
+	return FALSE;
+}
+
+int CGauss::GetItemInfo(ItemInfo *p)
+{
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = "uranium";
+	p->iMaxAmmo1 = URANIUM_MAX_CARRY;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = -1;
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iSlot = 3;
+	p->iPosition = 1;
+	p->iId = m_iId = WEAPON_GAUSS;
+	p->iFlags = 0;
+	p->iWeight = GAUSS_WEIGHT;
+
+	return 1;
+}
+
+BOOL CGauss::Deploy( )
+{
+	m_pPlayer->m_flPlayAftershock = 0.0;
+	return DefaultDeploy( "models/v_gauss.mdl", "models/p_gauss.mdl", GAUSS_DRAW, "gauss" );
+}
+
+void CGauss::Holster( int skiplocal /* = 0 */ )
+{
+	PLAYBACK_EVENT_FULL( FEV_NOTHOST | FEV_RELIABLE, m_pPlayer->edict(), m_usGaussFire, 0.01, (float *)&m_pPlayer->pev->origin, (float *)&m_pPlayer->pev->angles, 0.0, 0.0, 0, 0, 0, 1 );
+	
+	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 0.5;
+	
+	SendWeaponAnim( GAUSS_HOLSTER );
+	m_fInAttack = 0;
+}
+
+
+void CGauss::PrimaryAttack()
+{
+	// don't fire underwater
+	if ( m_pPlayer->pev->waterlevel == 3 )
+	{
+		PlayEmptySound( );
+		m_flNextSecondaryAttack = m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15;
+		return;
+	}
+
+	if ( m_pPlayer->m_rgAmmo[ m_iPrimaryAmmoType ] < 2 )
+	{
+		PlayEmptySound( );
+		m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 0.5;
+		return;
+	}
+
+	m_pPlayer->m_iWeaponVolume = GAUSS_PRIMARY_FIRE_VOLUME;
+	m_fPrimaryFire = TRUE;
+
+	m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] -= 2;
+
+	StartFire();
+	m_fInAttack = 0;
+	m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 1.0;
+	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 0.2;
+}
+
+void CGauss::SecondaryAttack()
+{
+	// don't fire underwater
+	if ( m_pPlayer->pev->waterlevel == 3 )
+	{
+		if ( m_fInAttack != 0 )
+		{
+			EMIT_SOUND_DYN(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/electro4.wav", 1.0, ATTN_NORM, 0, 80 + RANDOM_LONG(0,0x3f));
+			SendWeaponAnim( GAUSS_IDLE );
+			m_fInAttack = 0;
+		}
+		else
+		{
+			PlayEmptySound( );
+		}
+
+		m_flNextSecondaryAttack = m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.5;
+		return;
+	}
+
+	if ( m_fInAttack == 0 )
+	{
+		if ( m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] <= 0 )
+		{
+			EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/357_cock1.wav", 0.8, ATTN_NORM);
+			m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 0.5;
+			return;
+		}
+
+		m_fPrimaryFire = FALSE;
+
+		m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType]--;// take one ammo just to start the spin
+		m_pPlayer->m_flNextAmmoBurn = UTIL_WeaponTimeBase();
+
+		// spin up
+		m_pPlayer->m_iWeaponVolume = GAUSS_PRIMARY_CHARGE_VOLUME;
+		
+		SendWeaponAnim( GAUSS_SPINUP );
+		m_fInAttack = 1;
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 0.5;
+		m_pPlayer->m_flStartCharge = gpGlobals->time;
+		m_pPlayer->m_flAmmoStartCharge = UTIL_WeaponTimeBase() + GetFullChargeTime();
+
+		PLAYBACK_EVENT_FULL( FEV_NOTHOST, m_pPlayer->edict(), m_usGaussSpin, 0.0, (float *)&g_vecZero, (float *)&g_vecZero, 0.0, 0.0, 110, 0, 0, 0 );
+
+		m_iSoundState = SND_CHANGE_PITCH;
+	}
+	else if (m_fInAttack == 1)
+	{
+		if (m_flTimeWeaponIdle < UTIL_WeaponTimeBase())
+		{
+			SendWeaponAnim( GAUSS_SPIN );
+			m_fInAttack = 2;
+		}
+	}
+	else
+	{
+		// during the charging process, eat one bit of ammo every once in a while
+		if ( UTIL_WeaponTimeBase() >= m_pPlayer->m_flNextAmmoBurn && m_pPlayer->m_flNextAmmoBurn != 1000 )
+		{
+#ifdef CLIENT_DLL
+	if ( bIsMultiplayer() )
+#else
+	if ( g_pGameRules->IsMultiplayer() )
+#endif
+			{
+				m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType]--;
+				m_pPlayer->m_flNextAmmoBurn = UTIL_WeaponTimeBase() + 0.1;
+			}
+			else
+			{
+				m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType]--;
+				m_pPlayer->m_flNextAmmoBurn = UTIL_WeaponTimeBase() + 0.3;
+			}
+		}
+
+		if ( m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] <= 0 )
+		{
+			// out of ammo! force the gun to fire
+			StartFire();
+			m_fInAttack = 0;
+			m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 1.0;
+			m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 1;
+			return;
+		}
+		
+		if ( UTIL_WeaponTimeBase() >= m_pPlayer->m_flAmmoStartCharge )
+		{
+			// don't eat any more ammo after gun is fully charged.
+			m_pPlayer->m_flNextAmmoBurn = 1000;
+		}
+
+		int pitch = ( gpGlobals->time - m_pPlayer->m_flStartCharge ) * ( 150 / GetFullChargeTime() ) + 100;
+		if ( pitch > 250 ) 
+			 pitch = 250;
+		
+		// ALERT( at_console, "%d %d %d\n", m_fInAttack, m_iSoundState, pitch );
+
+		if ( m_iSoundState == 0 )
+			ALERT( at_console, "sound state %d\n", m_iSoundState );
+
+		PLAYBACK_EVENT_FULL( FEV_NOTHOST, m_pPlayer->edict(), m_usGaussSpin, 0.0, (float *)&g_vecZero, (float *)&g_vecZero, 0.0, 0.0, pitch, 0, ( m_iSoundState == SND_CHANGE_PITCH ) ? 1 : 0, 0 );
+
+		m_iSoundState = SND_CHANGE_PITCH; // hack for going through level transitions
+
+		m_pPlayer->m_iWeaponVolume = GAUSS_PRIMARY_CHARGE_VOLUME;
+		
+		// m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 0.1;
+		if ( m_pPlayer->m_flStartCharge < gpGlobals->time - 10 )
+		{
+			// Player charged up too long. Zap him.
+			EMIT_SOUND_DYN(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/electro4.wav", 1.0, ATTN_NORM, 0, 80 + RANDOM_LONG(0,0x3f));
+			EMIT_SOUND_DYN(ENT(m_pPlayer->pev), CHAN_ITEM,   "weapons/electro6.wav", 1.0, ATTN_NORM, 0, 75 + RANDOM_LONG(0,0x3f));
+			
+			m_fInAttack = 0;
+			m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 1.0;
+			m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 1.0;
+				
+#ifndef CLIENT_DLL
+			m_pPlayer->TakeDamage( VARS(eoNullEntity), VARS(eoNullEntity), 50, DMG_SHOCK );
+			UTIL_ScreenFade( m_pPlayer, Vector(255,128,0), 2, 0.5, 128, FFADE_IN );
+#endif
+			SendWeaponAnim( GAUSS_IDLE );
+			
+			// Player may have been killed and this weapon dropped, don't execute any more code after this!
+			return;
+		}
+	}
+}
+
+//=========================================================
+// StartFire- since all of this code has to run and then 
+// call Fire(), it was easier at this point to rip it out 
+// of weaponidle() and make its own function then to try to
+// merge this into Fire(), which has some identical variable names 
+//=========================================================
+void CGauss::StartFire( void )
+{
+	float flDamage;
+	
+	UTIL_MakeVectors( m_pPlayer->pev->v_angle + m_pPlayer->pev->punchangle );
+	Vector vecAiming = gpGlobals->v_forward;
+	Vector vecSrc = m_pPlayer->GetGunPosition( ); // + gpGlobals->v_up * -8 + gpGlobals->v_right * 8;
+	
+	if ( gpGlobals->time - m_pPlayer->m_flStartCharge > GetFullChargeTime() )
+	{
+		flDamage = 200;
+	}
+	else
+	{
+		flDamage = 200 * (( gpGlobals->time - m_pPlayer->m_flStartCharge) / GetFullChargeTime() );
+	}
+
+	if ( m_fPrimaryFire )
+	{
+		// fixed damage on primary attack
+#ifdef CLIENT_DLL
+		flDamage = 20;
+#else 
+		flDamage = gSkillData.plrDmgGauss;
+#endif
+	}
+
+	if (m_fInAttack != 3)
+	{
+		//ALERT ( at_console, "Time:%f Damage:%f\n", gpGlobals->time - m_pPlayer->m_flStartCharge, flDamage );
+
+#ifndef CLIENT_DLL
+		float flZVel = m_pPlayer->pev->velocity.z;
+
+		if ( !m_fPrimaryFire )
+		{
+			m_pPlayer->pev->velocity = m_pPlayer->pev->velocity - gpGlobals->v_forward * flDamage * 5;
+		}
+
+		if ( !g_pGameRules->IsMultiplayer() )
+
+		{
+			// in deathmatch, gauss can pop you up into the air. Not in single play.
+			m_pPlayer->pev->velocity.z = flZVel;
+		}
+#endif
+		// player "shoot" animation
+		m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
+	}
+
+	// time until aftershock 'static discharge' sound
+	m_pPlayer->m_flPlayAftershock = gpGlobals->time + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 0.3, 0.8 );
+
+	Fire( vecSrc, vecAiming, flDamage );
+}
+
+void CGauss::Fire( Vector vecOrigSrc, Vector vecDir, float flDamage )
+{
+	m_pPlayer->m_iWeaponVolume = GAUSS_PRIMARY_FIRE_VOLUME;
+
+	Vector vecSrc = vecOrigSrc;
+	Vector vecDest = vecSrc + vecDir * 8192;
+	edict_t		*pentIgnore;
+	TraceResult tr, beam_tr;
+	float flMaxFrac = 1.0;
+	int	nTotal = 0;
+	int fHasPunched = 0;
+	int fFirstBeam = 1;
+	int	nMaxHits = 10;
+
+	pentIgnore = ENT( m_pPlayer->pev );
+
+	// The main firing event is sent unreliably so it won't be delayed.
+	PLAYBACK_EVENT_FULL( FEV_NOTHOST, m_pPlayer->edict(), m_usGaussFire, 0.0, (float *)&m_pPlayer->pev->origin, (float *)&m_pPlayer->pev->angles, flDamage, 0.0, 0, 0, m_fPrimaryFire ? 1 : 0, 0 );
+
+	// This reliable event is used to stop the spinning sound
+	// It's delayed by a fraction of second to make sure it is delayed by 1 frame on the client
+	// It's sent reliably anyway, which could lead to other delays
+
+	PLAYBACK_EVENT_FULL( FEV_NOTHOST | FEV_RELIABLE, m_pPlayer->edict(), m_usGaussFire, 0.01, (float *)&m_pPlayer->pev->origin, (float *)&m_pPlayer->pev->angles, 0.0, 0.0, 0, 0, 0, 1 );
+
+	
+	/*ALERT( at_console, "%f %f %f\n%f %f %f\n", 
+		vecSrc.x, vecSrc.y, vecSrc.z, 
+		vecDest.x, vecDest.y, vecDest.z );*/
+	
+
+//	ALERT( at_console, "%f %f\n", tr.flFraction, flMaxFrac );
+
+#ifndef CLIENT_DLL
+	while (flDamage > 10 && nMaxHits > 0)
+	{
+		nMaxHits--;
+
+		// ALERT( at_console, "." );
+		UTIL_TraceLine(vecSrc, vecDest, dont_ignore_monsters, pentIgnore, &tr);
+
+		if (tr.fAllSolid)
+			break;
+
+		CBaseEntity *pEntity = CBaseEntity::Instance(tr.pHit);
+
+		if (pEntity == NULL)
+			break;
+
+		if ( fFirstBeam )
+		{
+			m_pPlayer->pev->effects |= EF_MUZZLEFLASH;
+			fFirstBeam = 0;
+	
+			nTotal += 26;
+		}
+		
+		if (pEntity->pev->takedamage)
+		{
+			ClearMultiDamage();
+			pEntity->TraceAttack( m_pPlayer->pev, flDamage, vecDir, &tr, DMG_BULLET );
+			ApplyMultiDamage(m_pPlayer->pev, m_pPlayer->pev);
+		}
+
+		if ( pEntity->ReflectGauss() )
+		{
+			float n;
+
+			pentIgnore = NULL;
+
+			n = -DotProduct(tr.vecPlaneNormal, vecDir);
+
+			if (n < 0.5) // 60 degrees
+			{
+				// ALERT( at_console, "reflect %f\n", n );
+				// reflect
+				Vector r;
+			
+				r = 2.0 * tr.vecPlaneNormal * n + vecDir;
+				flMaxFrac = flMaxFrac - tr.flFraction;
+				vecDir = r;
+				vecSrc = tr.vecEndPos + vecDir * 8;
+				vecDest = vecSrc + vecDir * 8192;
+
+				// explode a bit
+				m_pPlayer->RadiusDamage( tr.vecEndPos, pev, m_pPlayer->pev, flDamage * n, CLASS_NONE, DMG_BLAST );
+
+				nTotal += 34;
+				
+				// lose energy
+				if (n == 0) n = 0.1;
+				flDamage = flDamage * (1 - n);
+			}
+			else
+			{
+				nTotal += 13;
+
+				// limit it to one hole punch
+				if (fHasPunched)
+					break;
+				fHasPunched = 1;
+
+				// try punching through wall if secondary attack (primary is incapable of breaking through)
+				if ( !m_fPrimaryFire )
+				{
+					UTIL_TraceLine( tr.vecEndPos + vecDir * 8, vecDest, dont_ignore_monsters, pentIgnore, &beam_tr);
+					if (!beam_tr.fAllSolid)
+					{
+						// trace backwards to find exit point
+						UTIL_TraceLine( beam_tr.vecEndPos, tr.vecEndPos, dont_ignore_monsters, pentIgnore, &beam_tr);
+
+						float n = (beam_tr.vecEndPos - tr.vecEndPos).Length( );
+
+						if (n < flDamage)
+						{
+							if (n == 0) n = 1;
+							flDamage -= n;
+
+							// ALERT( at_console, "punch %f\n", n );
+							nTotal += 21;
+
+							// exit blast damage
+							//m_pPlayer->RadiusDamage( beam_tr.vecEndPos + vecDir * 8, pev, m_pPlayer->pev, flDamage, CLASS_NONE, DMG_BLAST );
+							float damage_radius;
+							
+
+							if ( g_pGameRules->IsMultiplayer() )
+							{
+								damage_radius = flDamage * 1.75;  // Old code == 2.5
+							}
+							else
+							{
+								damage_radius = flDamage * 2.5;
+							}
+
+							::RadiusDamage( beam_tr.vecEndPos + vecDir * 8, pev, m_pPlayer->pev, flDamage, damage_radius, CLASS_NONE, DMG_BLAST );
+
+							CSoundEnt::InsertSound ( bits_SOUND_COMBAT, pev->origin, NORMAL_EXPLOSION_VOLUME, 3.0 );
+
+							nTotal += 53;
+
+							vecSrc = beam_tr.vecEndPos + vecDir;
+						}
+					}
+					else
+					{
+						 //ALERT( at_console, "blocked %f\n", n );
+						flDamage = 0;
+					}
+				}
+				else
+				{
+					//ALERT( at_console, "blocked solid\n" );
+					
+					flDamage = 0;
+				}
+
+			}
+		}
+		else
+		{
+			vecSrc = tr.vecEndPos + vecDir;
+			pentIgnore = ENT( pEntity->pev );
+		}
+	}
+#endif
+	// ALERT( at_console, "%d bytes\n", nTotal );
+}
+
+
+
+
+void CGauss::WeaponIdle( void )
+{
+	ResetEmptySound( );
+
+	// play aftershock static discharge
+	if ( m_pPlayer->m_flPlayAftershock && m_pPlayer->m_flPlayAftershock < gpGlobals->time )
+	{
+		switch (RANDOM_LONG(0,3))
+		{
+		case 0:	EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/electro4.wav", RANDOM_FLOAT(0.7, 0.8), ATTN_NORM); break;
+		case 1:	EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/electro5.wav", RANDOM_FLOAT(0.7, 0.8), ATTN_NORM); break;
+		case 2:	EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/electro6.wav", RANDOM_FLOAT(0.7, 0.8), ATTN_NORM); break;
+		case 3:	break; // no sound
+		}
+		m_pPlayer->m_flPlayAftershock = 0.0;
+	}
+
+	if (m_flTimeWeaponIdle > UTIL_WeaponTimeBase())
+		return;
+
+	if (m_fInAttack != 0)
+	{
+		StartFire();
+		m_fInAttack = 0;
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 2.0;
+	}
+	else
+	{
+		int iAnim;
+		float flRand = RANDOM_FLOAT(0, 1);
+		if (flRand <= 0.5)
+		{
+			iAnim = GAUSS_IDLE;
+			m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
+		}
+		else if (flRand <= 0.75)
+		{
+			iAnim = GAUSS_IDLE2;
+			m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
+		}
+		else
+		{
+			iAnim = GAUSS_FIDGET;
+			m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 3;
+		}
+
+		return;
+		SendWeaponAnim( iAnim );
+		
+	}
+}
+
+
+
+
+
+
+class CGaussAmmo : public CBasePlayerAmmo
+{
+	void Spawn( void )
+	{ 
+		Precache( );
+		SET_MODEL(ENT(pev), "models/w_gaussammo.mdl");
+		CBasePlayerAmmo::Spawn( );
+	}
+	void Precache( void )
+	{
+		PRECACHE_MODEL ("models/w_gaussammo.mdl");
+		PRECACHE_SOUND("items/9mmclip1.wav");
+	}
+	BOOL AddAmmo( CBaseEntity *pOther ) 
+	{ 
+		if (pOther->GiveAmmo( AMMO_URANIUMBOX_GIVE, "uranium", URANIUM_MAX_CARRY ) != -1)
+		{
+			EMIT_SOUND(ENT(pev), CHAN_ITEM, "items/9mmclip1.wav", 1, ATTN_NORM);
+			return TRUE;
+		}
+		return FALSE;
+	}
+};
+LINK_ENTITY_TO_CLASS( ammo_gaussclip, CGaussAmmo );
+
+#endif
diff --git a/main/source/dlls/genericmonster.cpp b/main/source/dlls/genericmonster.cpp
new file mode 100644
index 00000000..1c8c6eea
--- /dev/null
+++ b/main/source/dlls/genericmonster.cpp
@@ -0,0 +1,140 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// Generic Monster - purely for scripted sequence work.
+//=========================================================
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"schedule.h"
+
+// For holograms, make them not solid so the player can walk through them
+#define	SF_GENERICMONSTER_NOTSOLID					4 
+
+//=========================================================
+// Monster's Anim Events Go Here
+//=========================================================
+
+class CGenericMonster : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void SetYawSpeed( void );
+	int  Classify ( void );
+	void HandleAnimEvent( MonsterEvent_t *pEvent );
+	int ISoundMask ( void );
+};
+LINK_ENTITY_TO_CLASS( monster_generic, CGenericMonster );
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CGenericMonster :: Classify ( void )
+{
+	return	CLASS_PLAYER_ALLY;
+}
+
+//=========================================================
+// SetYawSpeed - allows each sequence to have a different
+// turn rate associated with it.
+//=========================================================
+void CGenericMonster :: SetYawSpeed ( void )
+{
+	int ys;
+
+	switch ( m_Activity )
+	{
+	case ACT_IDLE:
+	default:
+		ys = 90;
+	}
+
+	pev->yaw_speed = ys;
+}
+
+//=========================================================
+// HandleAnimEvent - catches the monster-specific messages
+// that occur when tagged animation frames are played.
+//=========================================================
+void CGenericMonster :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	switch( pEvent->event )
+	{
+	case 0:
+	default:
+		CBaseMonster::HandleAnimEvent( pEvent );
+		break;
+	}
+}
+
+//=========================================================
+// ISoundMask - generic monster can't hear.
+//=========================================================
+int CGenericMonster :: ISoundMask ( void )
+{
+	return	NULL;
+}
+
+//=========================================================
+// Spawn
+//=========================================================
+void CGenericMonster :: Spawn()
+{
+	Precache();
+
+	SET_MODEL( ENT(pev), STRING(pev->model) );
+
+/*
+	if ( FStrEq( STRING(pev->model), "models/player.mdl" ) )
+		UTIL_SetSize(pev, VEC_HUMAN_HULL_MIN, VEC_HUMAN_HULL_MAX);
+	else
+		UTIL_SetSize(pev, VEC_HULL_MIN, VEC_HULL_MAX);
+*/
+
+	if ( FStrEq( STRING(pev->model), "models/player.mdl" ) || FStrEq( STRING(pev->model), "models/holo.mdl" ) )
+		UTIL_SetSize(pev, VEC_HULL_MIN, VEC_HULL_MAX);
+	else
+		UTIL_SetSize(pev, VEC_HUMAN_HULL_MIN, VEC_HUMAN_HULL_MAX);
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_STEP;
+	m_bloodColor		= BLOOD_COLOR_RED;
+	pev->health			= 8;
+	m_flFieldOfView		= 0.5;// indicates the width of this monster's forward view cone ( as a dotproduct result )
+	m_MonsterState		= MONSTERSTATE_NONE;
+
+	MonsterInit();
+
+	if ( pev->spawnflags & SF_GENERICMONSTER_NOTSOLID )
+	{
+		pev->solid = SOLID_NOT;
+		pev->takedamage = DAMAGE_NO;
+	}
+}
+
+//=========================================================
+// Precache - precaches all resources this monster needs
+//=========================================================
+void CGenericMonster :: Precache()
+{
+	PRECACHE_MODEL( (char *)STRING(pev->model) );
+}	
+
+//=========================================================
+// AI Schedules Specific to this monster
+//=========================================================
diff --git a/main/source/dlls/ggrenade.cpp b/main/source/dlls/ggrenade.cpp
new file mode 100644
index 00000000..ec598660
--- /dev/null
+++ b/main/source/dlls/ggrenade.cpp
@@ -0,0 +1,602 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/*
+
+===== generic grenade.cpp ========================================================
+
+*/
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "soundent.h"
+#include "decals.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHServerVariables.h"
+#include "mod/AvHMarineWeaponConstants.h"
+#include "mod/AvHBalance.h"
+#include "mod/AvHGamerules.h"
+#include "util/MathUtil.h"
+#include "common/vec_op.h"
+
+//===================grenade
+
+
+LINK_ENTITY_TO_CLASS( grenade, CGrenade );
+
+// Grenades flagged with this will be triggered when the owner calls detonateSatchelCharges
+#define SF_DETONATE		0x0001
+
+//
+// Grenade Explode
+//
+void CGrenade::Explode( Vector vecSrc, Vector vecAim )
+{
+	TraceResult tr;
+	UTIL_TraceLine ( pev->origin, pev->origin + Vector ( 0, 0, -32 ),  ignore_monsters, ENT(pev), & tr);
+
+	Explode( &tr, NS_DMG_BLAST);
+}
+
+// UNDONE: temporary scorching for PreAlpha - find a less sleazy permenant solution.
+void CGrenade::Explode( TraceResult *pTrace, int bitsDamageType )
+{
+	float		flRndSound;// sound randomizer
+	
+	pev->model = iStringNull;//invisible
+	pev->solid = SOLID_NOT;// intangible
+	
+	float theDamageModifier;
+	int theUpgradeLevel = AvHPlayerUpgrade::GetWeaponUpgrade(this->pev->iuser3, this->pev->iuser4, &theDamageModifier);
+	int theDamage = this->pev->dmg*theDamageModifier;
+
+	pev->takedamage = DAMAGE_NO;
+
+	// TODO: Look at upgrade and mark up damage
+
+	// Pull out of the wall a bit
+	if ( pTrace->flFraction != 1.0 )
+	{
+		Vector theCollisionPoint = pTrace->vecEndPos;
+		Vector theDesiredPoint = theCollisionPoint + (pTrace->vecPlaneNormal * (theDamage - 24) * 0.6);
+		UTIL_TraceLine(theCollisionPoint,theDesiredPoint,ignore_monsters,ENT(pev),pTrace);
+		if(pTrace->flFraction != 1.0) //hit a ceiling of some sort
+		{
+			//go halfway between floor and ceiling
+			theDesiredPoint = theCollisionPoint + (pTrace->vecEndPos - theCollisionPoint) * 0.5;
+		}
+		pev->origin = theDesiredPoint;
+	}
+
+	int iContents = UTIL_PointContents ( pev->origin );
+	
+	MESSAGE_BEGIN( MSG_PAS, SVC_TEMPENTITY, pev->origin );
+		WRITE_BYTE( TE_EXPLOSION );		// This makes a dynamic light and the explosion sprites/sound
+		WRITE_COORD( pev->origin.x );	// Send to PAS because of the sound
+		WRITE_COORD( pev->origin.y );
+		WRITE_COORD( pev->origin.z );
+		if (iContents != CONTENTS_WATER)
+		{
+			WRITE_SHORT( g_sModelIndexFireball );
+		}
+		else
+		{
+			WRITE_SHORT( g_sModelIndexWExplosion );
+		}
+		WRITE_BYTE( (theDamage - 50) * .60  ); // scale * 10
+		WRITE_BYTE( 15  ); // framerate
+		WRITE_BYTE( TE_EXPLFLAG_NONE );
+	MESSAGE_END();
+
+	CSoundEnt::InsertSound ( bits_SOUND_COMBAT, pev->origin, NORMAL_EXPLOSION_VOLUME, 3.0 );
+
+	entvars_t *pevOwner;
+	if ( pev->owner )
+		pevOwner = VARS( pev->owner );
+	else
+		pevOwner = NULL;
+
+//	pev->owner = NULL; // can't traceline attack owner if this is set
+
+	// Current radius = 2.5*140 = 350
+	float theRadius = BALANCE_IVAR(kGrenadeRadius);
+	::RadiusDamage(this->pev->origin, this->pev, pevOwner, theDamage, theRadius, CLASS_NONE, bitsDamageType);
+
+	// Play view shake here
+	float theShakeAmplitude = 80;
+	float theShakeFrequency = 100;
+	float theShakeDuration = 1.0f;
+	float theShakeRadius = 700;
+	UTIL_ScreenShake(this->pev->origin, theShakeAmplitude, theShakeFrequency, theShakeDuration, theShakeRadius);
+
+	if ( RANDOM_FLOAT( 0 , 1 ) < 0.5 )
+	{
+		UTIL_DecalTrace( pTrace, DECAL_SCORCH1 );
+	}
+	else
+	{
+		UTIL_DecalTrace( pTrace, DECAL_SCORCH2 );
+	}
+
+	flRndSound = RANDOM_FLOAT( 0 , 1 );
+
+	switch ( RANDOM_LONG( 0, 2 ) )
+	{
+		case 0:	EMIT_SOUND(ENT(pev), CHAN_VOICE, "weapons/debris1.wav", 0.55, ATTN_NORM);	break;
+		case 1:	EMIT_SOUND(ENT(pev), CHAN_VOICE, "weapons/debris2.wav", 0.55, ATTN_NORM);	break;
+		case 2:	EMIT_SOUND(ENT(pev), CHAN_VOICE, "weapons/debris3.wav", 0.55, ATTN_NORM);	break;
+	}
+
+	pev->effects |= EF_NODRAW;
+	SetThink( &CGrenade::Smoke );
+	pev->velocity = g_vecZero;
+	pev->nextthink = gpGlobals->time + 0.3;
+
+	if (iContents != CONTENTS_WATER)
+	{
+		int sparkCount = RANDOM_LONG(0,3);
+		for ( int i = 0; i < sparkCount; i++ )
+			Create( "spark_shower", pev->origin, pTrace->vecPlaneNormal, NULL );
+	}
+}
+
+
+void CGrenade::Smoke( void )
+{
+	if (UTIL_PointContents ( pev->origin ) == CONTENTS_WATER)
+	{
+		UTIL_Bubbles( pev->origin - Vector( 64, 64, 64 ), pev->origin + Vector( 64, 64, 64 ), 100 );
+	}
+	else
+	{
+		float theDamageModifier;
+		int theUpgradeLevel = AvHPlayerUpgrade::GetWeaponUpgrade(this->pev->iuser3, this->pev->iuser4, &theDamageModifier);
+		int theDamage = this->pev->dmg*theDamageModifier;
+		
+		MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, pev->origin );
+			WRITE_BYTE( TE_SMOKE );
+			WRITE_COORD( pev->origin.x );
+			WRITE_COORD( pev->origin.y );
+			WRITE_COORD( pev->origin.z );
+			WRITE_SHORT( g_sModelIndexSmoke );
+			WRITE_BYTE( (theDamage - 50) * 0.80 ); // scale * 10
+			WRITE_BYTE( 12  ); // framerate
+		MESSAGE_END();
+	}
+	UTIL_Remove( this );
+}
+
+void CGrenade::Killed( entvars_t *pevAttacker, int iGib )
+{
+	Detonate( );
+}
+
+
+// Timed grenade, this think is called when time runs out.
+void CGrenade::DetonateUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	SetThink( &CGrenade::Detonate );
+	pev->nextthink = gpGlobals->time;
+}
+
+void CGrenade::PreDetonate( void )
+{
+	CSoundEnt::InsertSound ( bits_SOUND_DANGER, pev->origin, 400, 0.3 );
+
+	SetThink( &CGrenade::Detonate );
+	pev->nextthink = gpGlobals->time + 1;
+}
+
+
+void CGrenade::Detonate( void )
+{
+	TraceResult tr;
+	Vector		vecSpot;// trace starts here!
+
+	if(CVAR_GET_FLOAT(kvBulletCam))
+	{
+		SET_VIEW(this->pev->owner, this->pev->owner);
+	}
+
+	vecSpot = pev->origin + Vector ( 0 , 0 , 8 );
+	UTIL_TraceLine ( vecSpot, vecSpot + Vector ( 0, 0, -40 ),  ignore_monsters, ENT(pev), & tr);
+
+	Explode( &tr, NS_DMG_BLAST);
+}
+
+//
+// Contact grenade, explode when it touches something
+// 
+void CGrenade::ExplosiveBounceTouch( CBaseEntity *pOther )
+{
+	if(pOther)
+	{
+		bool theCanHurtEntity = GetGameRules()->CanEntityDoDamageTo(this, pOther);
+		if(theCanHurtEntity)
+		{
+			// If we hit an enemy, explode
+			ExplodeTouch(pOther);
+		}
+		// Otherwise, bounce
+		else
+		{
+			BounceTouch(pOther);
+		}
+	}
+}
+
+//
+// Contact grenade, explode when it touches something
+// 
+void CGrenade::ExplodeTouch( CBaseEntity *pOther )
+{
+	TraceResult tr;
+	Vector		vecSpot;// trace starts here!
+
+	pev->enemy = pOther->edict();
+
+	vecSpot = pev->origin - pev->velocity.Normalize() * 32;
+	UTIL_TraceLine( vecSpot, vecSpot + pev->velocity.Normalize() * 64, ignore_monsters, ENT(pev), &tr );
+
+	Explode( &tr, NS_DMG_BLAST);
+}
+
+
+void CGrenade::DangerSoundThink( void )
+{
+	if (!IsInWorld())
+	{
+		UTIL_Remove( this );
+		return;
+	}
+
+	CSoundEnt::InsertSound ( bits_SOUND_DANGER, pev->origin + pev->velocity * 0.5, pev->velocity.Length( ), 0.2 );
+	pev->nextthink = gpGlobals->time + 0.2;
+	
+	if (pev->waterlevel != 0)
+	{
+		pev->velocity = pev->velocity * 0.5;
+	}
+}
+
+
+void CGrenade::BounceTouch( CBaseEntity *pOther )
+{
+	// don't hit the guy that launched this grenade
+	if ( pOther->edict() == pev->owner )
+		return;
+	
+    
+    // Grenades to tend to get "stuck" on sloped surfaces due to the HL physics
+    // system, so move it away from whatever we're colliding with.
+
+    // Get the surface normal.
+
+
+
+    Vector theVelocityDirection;
+    VectorCopy(pev->velocity, theVelocityDirection);
+    VectorNormalize(theVelocityDirection);
+
+    Vector theTraceStart;
+    Vector theTraceEnd;
+
+    VectorMA(pev->origin, -10, theVelocityDirection, theTraceStart);
+    VectorMA(pev->origin,  10, theVelocityDirection, theTraceEnd);
+
+    TraceResult tr;
+    UTIL_TraceLine(theTraceStart, theTraceEnd, dont_ignore_monsters, dont_ignore_glass, ENT(pev), &tr);
+
+    if (tr.flFraction < 1) // Should always be the case.
+    {
+        VectorMA(pev->origin, 2, tr.vecPlaneNormal, pev->origin);
+        UTIL_SetOrigin(pev, pev->origin);
+    }
+
+	// only do damage if we're moving fairly fast
+	if (m_flNextAttack < gpGlobals->time && pev->velocity.Length() > 100)
+	{
+		entvars_t *pevOwner = VARS( pev->owner );
+		if (pevOwner)
+		{
+			TraceResult tr = UTIL_GetGlobalTrace( );
+			ClearMultiDamage( );
+			pOther->TraceAttack(pevOwner, 1, gpGlobals->v_forward, &tr, NS_DMG_BLAST); 
+			ApplyMultiDamage( pev, pevOwner);
+		}
+		m_flNextAttack = gpGlobals->time + 1.0; // debounce
+	}
+	
+	Vector vecTestVelocity;
+	// pev->avelocity = Vector (300, 300, 300);
+	
+	float theDamageModifier;
+	int theUpgradeLevel = AvHPlayerUpgrade::GetWeaponUpgrade(this->pev->iuser3, this->pev->iuser4, &theDamageModifier);
+	int theDamage = this->pev->dmg*theDamageModifier;
+
+	// this is my heuristic for modulating the grenade velocity because grenades dropped purely vertical
+	// or thrown very far tend to slow down too quickly for me to always catch just by testing velocity. 
+	// trimming the Z velocity a bit seems to help quite a bit.
+	vecTestVelocity = pev->velocity; 
+	vecTestVelocity.z *= 0.45;
+
+	if ( !m_fRegisteredSound && vecTestVelocity.Length() <= 60 )
+	{
+		//ALERT( at_console, "Grenade Registered!: %f\n", vecTestVelocity.Length() );
+
+		// grenade is moving really slow. It's probably very close to where it will ultimately stop moving. 
+		// go ahead and emit the danger sound.
+		
+		// register a radius louder than the explosion, so we make sure everyone gets out of the way
+		CSoundEnt::InsertSound ( bits_SOUND_DANGER, pev->origin, theDamage / 0.4, 0.3 );
+		m_fRegisteredSound = TRUE;
+	}
+
+	if (pev->flags & FL_ONGROUND)
+	{
+		// add a bit of static friction
+		pev->velocity = pev->velocity * 0.8;
+
+		pev->sequence = 0;//RANDOM_LONG( 1, 1 );
+	}
+	else
+	{
+		// play bounce sound
+		BounceSound();
+	}
+	pev->framerate = pev->velocity.Length() / 200.0;
+	if (pev->framerate > 1.0)
+		pev->framerate = 1;
+	else if (pev->framerate < 0.5)
+		pev->framerate = 0;
+
+    pev->velocity = pev->velocity * 0.8;
+
+}
+
+
+
+void CGrenade::SlideTouch( CBaseEntity *pOther )
+{
+	// don't hit the guy that launched this grenade
+	if ( pOther->edict() == pev->owner )
+		return;
+
+	// pev->avelocity = Vector (300, 300, 300);
+
+	if (pev->flags & FL_ONGROUND)
+	{
+		// add a bit of static friction
+		pev->velocity = pev->velocity * 0.95;
+
+		if (pev->velocity.x != 0 || pev->velocity.y != 0)
+		{
+			// maintain sliding sound
+		}
+	}
+	else
+	{
+		BounceSound();
+	}
+}
+
+void CGrenade :: BounceSound( void )
+{
+    // Play different sounds for contact or timed grenade
+    if(this->m_pfnTouch == static_cast <void (CBaseEntity::*)(CBaseEntity *)>(&CGrenade::ExplosiveBounceTouch))
+    {
+        switch ( RANDOM_LONG( 0, 2 ) )
+        {
+        case 0:	EMIT_SOUND(ENT(pev), CHAN_VOICE, kGrenadeBounceSound1, 0.25, ATTN_NORM);	break;
+        case 1:	EMIT_SOUND(ENT(pev), CHAN_VOICE, kGrenadeBounceSound2, 0.25, ATTN_NORM);	break;
+        case 2:	EMIT_SOUND(ENT(pev), CHAN_VOICE, kGrenadeBounceSound3, 0.25, ATTN_NORM);	break;
+        }
+    }
+    else
+    {
+        EMIT_SOUND(ENT(pev), CHAN_VOICE, kGRHitSound, 0.5, ATTN_NORM);
+    }
+    
+}
+
+void CGrenade :: TumbleThink( void )
+{
+	if (!IsInWorld())
+	{
+		UTIL_Remove( this );
+		return;
+	}
+
+	StudioFrameAdvance( );
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	if (pev->dmgtime - 1 < gpGlobals->time)
+	{
+		CSoundEnt::InsertSound ( bits_SOUND_DANGER, pev->origin + pev->velocity * (pev->dmgtime - gpGlobals->time), 400, 0.1 );
+	}
+
+	if (pev->dmgtime <= gpGlobals->time)
+	{
+		SetThink( &CGrenade::Detonate );
+	}
+	if (pev->waterlevel != 0)
+	{
+		pev->velocity = pev->velocity * 0.5;
+		pev->framerate = 0.2;
+	}
+}
+
+
+void CGrenade:: Spawn( void )
+{
+	pev->movetype = MOVETYPE_BOUNCE;
+	pev->classname = MAKE_STRING( "grenade" );
+	
+	pev->solid = SOLID_BBOX;
+
+	SET_MODEL(ENT(pev), "models/grenade.mdl");
+	UTIL_SetSize(pev, Vector( 0, 0, 0), Vector(0, 0, 0));
+
+	m_fRegisteredSound = FALSE;
+}
+
+
+CGrenade *CGrenade::ShootContact( entvars_t *pevOwner, Vector vecStart, Vector vecVelocity )
+{
+	CGrenade *pGrenade = GetClassPtr( (CGrenade *)NULL );
+	pGrenade->Spawn();
+	// contact grenades arc lower
+	pGrenade->pev->gravity = 0.5;// lower gravity since grenade is aerodynamic and engine doesn't know it.
+	UTIL_SetOrigin( pGrenade->pev, vecStart );
+	pGrenade->pev->velocity = vecVelocity;
+	pGrenade->pev->angles = UTIL_VecToAngles (pGrenade->pev->velocity);
+	pGrenade->pev->owner = ENT(pevOwner);
+	
+	// make monsters afaid of it while in the air
+	pGrenade->SetThink( &CGrenade::DangerSoundThink );
+	pGrenade->pev->nextthink = gpGlobals->time;
+	
+	// Tumble in air
+	pGrenade->pev->avelocity.x = RANDOM_FLOAT ( -100, -500 );
+	
+	// Explode on contact
+	pGrenade->SetTouch( &CGrenade::ExplodeTouch );
+
+	pGrenade->pev->dmg = gSkillData.plrDmgM203Grenade;
+
+	return pGrenade;
+}
+
+CGrenade* CGrenade::ShootExplosiveTimed( entvars_t *pevOwner, Vector vecStart, Vector vecVelocity, float time )
+{
+	CGrenade *pGrenade = CGrenade::ShootTimed(pevOwner, vecStart, vecVelocity, time);
+	pGrenade->SetTouch(&CGrenade::ExplosiveBounceTouch);
+	return pGrenade;
+}
+
+
+CGrenade * CGrenade:: ShootTimed( entvars_t *pevOwner, Vector vecStart, Vector vecVelocity, float time )
+{
+	CGrenade *pGrenade = GetClassPtr( (CGrenade *)NULL );
+	pGrenade->Spawn();
+	UTIL_SetOrigin( pGrenade->pev, vecStart );
+	pGrenade->pev->velocity = vecVelocity;
+	pGrenade->pev->angles = UTIL_VecToAngles(pGrenade->pev->velocity);
+	pGrenade->pev->owner = ENT(pevOwner);
+	
+	pGrenade->SetTouch( &CGrenade::BounceTouch );	// Bounce if touched
+
+	if(CVAR_GET_FLOAT(kvBulletCam))
+	{
+		SET_VIEW(ENT(pevOwner), ENT(pGrenade->pev));
+	}
+	
+	// Take one second off of the desired detonation time and set the think to PreDetonate. PreDetonate
+	// will insert a DANGER sound into the world sound list and delay detonation for one second so that 
+	// the grenade explodes after the exact amount of time specified in the call to ShootTimed(). 
+
+	pGrenade->pev->dmgtime = gpGlobals->time + time;
+	pGrenade->SetThink( &CGrenade::TumbleThink );
+	pGrenade->pev->nextthink = gpGlobals->time + 0.1;
+	if (time < 0.1)
+	{
+		pGrenade->pev->nextthink = gpGlobals->time;
+		pGrenade->pev->velocity = Vector( 0, 0, 0 );
+	}
+		
+	pGrenade->pev->sequence = 0;//RANDOM_LONG( 3, 6 );
+	pGrenade->pev->framerate = 1.0;
+
+	// Tumble through the air
+    pGrenade->pev->avelocity.x = RANDOM_LONG(-800, -300);
+
+	// Also explode on contact
+	//pGrenade->SetTouch( ExplodeTouch );
+
+	pGrenade->pev->gravity = 0.5;
+	pGrenade->pev->friction = 0.8;
+
+	SET_MODEL(ENT(pGrenade->pev), "models/w_grenade.mdl");
+
+	return pGrenade;
+}
+
+
+CGrenade * CGrenade :: ShootSatchelCharge( entvars_t *pevOwner, Vector vecStart, Vector vecVelocity )
+{
+	CGrenade *pGrenade = GetClassPtr( (CGrenade *)NULL );
+	pGrenade->pev->movetype = MOVETYPE_BOUNCE;
+	pGrenade->pev->classname = MAKE_STRING( "grenade" );
+	
+	pGrenade->pev->solid = SOLID_BBOX;
+
+	SET_MODEL(ENT(pGrenade->pev), "models/grenade.mdl");	// Change this to satchel charge model
+
+	UTIL_SetSize(pGrenade->pev, Vector( 0, 0, 0), Vector(0, 0, 0));
+
+	pGrenade->pev->dmg = 200;
+	UTIL_SetOrigin( pGrenade->pev, vecStart );
+	pGrenade->pev->velocity = vecVelocity;
+	pGrenade->pev->angles = g_vecZero;
+	pGrenade->pev->owner = ENT(pevOwner);
+	
+	// Detonate in "time" seconds
+	pGrenade->SetThink( &CGrenade::SUB_DoNothing );
+	pGrenade->SetUse( &CGrenade::DetonateUse );
+	pGrenade->SetTouch( &CGrenade::SlideTouch );
+	pGrenade->pev->spawnflags = SF_DETONATE;
+
+	pGrenade->pev->friction = 0.9;
+
+	return pGrenade;
+}
+
+
+
+void CGrenade :: UseSatchelCharges( entvars_t *pevOwner, SATCHELCODE code )
+{
+	edict_t *pentFind;
+	edict_t *pentOwner;
+
+	if ( !pevOwner )
+		return;
+
+	CBaseEntity	*pOwner = CBaseEntity::Instance( pevOwner );
+
+	pentOwner = pOwner->edict();
+
+	pentFind = FIND_ENTITY_BY_CLASSNAME( NULL, "grenade" );
+	while ( !FNullEnt( pentFind ) )
+	{
+		CBaseEntity *pEnt = Instance( pentFind );
+		if ( pEnt )
+		{
+			if ( FBitSet( pEnt->pev->spawnflags, SF_DETONATE ) && pEnt->pev->owner == pentOwner )
+			{
+				if ( code == SATCHEL_DETONATE )
+					pEnt->Use( pOwner, pOwner, USE_ON, 0 );
+				else	// SATCHEL_RELEASE
+					pEnt->pev->owner = NULL;
+			}
+		}
+		pentFind = FIND_ENTITY_BY_CLASSNAME( pentFind, "grenade" );
+	}
+}
+
+//======================end grenade
+
diff --git a/main/source/dlls/globals.cpp b/main/source/dlls/globals.cpp
new file mode 100644
index 00000000..b5c734b5
--- /dev/null
+++ b/main/source/dlls/globals.cpp
@@ -0,0 +1,39 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/*
+
+===== globals.cpp ========================================================
+
+  DLL-wide global variable definitions.
+  They're all defined here, for convenient centralization.
+  Source files that need them should "extern ..." declare each
+  variable, to better document what globals they care about.
+
+*/
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "soundent.h"
+
+DLL_GLOBAL ULONG		g_ulFrameCount;
+DLL_GLOBAL ULONG		g_ulModelIndexEyes;
+DLL_GLOBAL ULONG		g_ulModelIndexPlayer;
+DLL_GLOBAL Vector		g_vecAttackDir;
+DLL_GLOBAL int			g_iSkillLevel;
+DLL_GLOBAL int			gDisplayTitle;
+DLL_GLOBAL BOOL			g_fGameOver;
+DLL_GLOBAL const Vector	g_vecZero = Vector(0,0,0);
+DLL_GLOBAL int			g_Language;
diff --git a/main/source/dlls/glock.cpp b/main/source/dlls/glock.cpp
new file mode 100644
index 00000000..ae2485b1
--- /dev/null
+++ b/main/source/dlls/glock.cpp
@@ -0,0 +1,325 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "player.h"
+
+enum glock_e {
+	GLOCK_IDLE1 = 0,
+	GLOCK_IDLE2,
+	GLOCK_IDLE3,
+	GLOCK_SHOOT,
+	GLOCK_SHOOT_EMPTY,
+	GLOCK_RELOAD,
+	GLOCK_RELOAD_NOT_EMPTY,
+	GLOCK_DRAW,
+	GLOCK_HOLSTER,
+	GLOCK_ADD_SILENCER
+};
+
+class CGlock : public CBasePlayerWeapon
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	int iItemSlot( void ) { return 2; }
+	int GetItemInfo(ItemInfo *p);
+
+	void PrimaryAttack( void );
+	void SecondaryAttack( void );
+	void GlockFire( float flSpread, float flCycleTime, BOOL fUseAutoAim );
+	BOOL Deploy( void );
+	void Reload( void );
+	void WeaponIdle( void );
+
+private:
+	int m_iShell;
+	
+
+	unsigned short m_usFireGlock1;
+	unsigned short m_usFireGlock2;
+};
+LINK_ENTITY_TO_CLASS( weapon_glock, CGlock );
+LINK_ENTITY_TO_CLASS( weapon_9mmhandgun, CGlock );
+
+
+void CGlock::Spawn( )
+{
+	pev->classname = MAKE_STRING("weapon_9mmhandgun"); // hack to allow for old names
+	Precache( );
+	m_iId = WEAPON_GLOCK;
+	SET_MODEL(ENT(pev), "models/w_9mmhandgun.mdl");
+
+	m_iDefaultAmmo = GLOCK_DEFAULT_GIVE;
+
+	FallInit();// get ready to fall down.
+}
+
+
+void CGlock::Precache( void )
+{
+	PRECACHE_MODEL("models/v_9mmhandgun.mdl");
+	PRECACHE_MODEL("models/w_9mmhandgun.mdl");
+	PRECACHE_MODEL("models/p_9mmhandgun.mdl");
+
+	m_iShell = PRECACHE_MODEL ("models/shell.mdl");// brass shell
+
+	PRECACHE_SOUND("items/9mmclip1.wav");
+	PRECACHE_SOUND("items/9mmclip2.wav");
+
+	PRECACHE_SOUND ("weapons/pl_gun1.wav");//silenced handgun
+	PRECACHE_SOUND ("weapons/pl_gun2.wav");//silenced handgun
+	PRECACHE_SOUND ("weapons/pl_gun3.wav");//handgun
+
+	m_usFireGlock1 = PRECACHE_EVENT( 1, "events/glock1.sc" );
+	m_usFireGlock2 = PRECACHE_EVENT( 1, "events/glock2.sc" );
+}
+
+int CGlock::GetItemInfo(ItemInfo *p)
+{
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = "9mm";
+	p->iMaxAmmo1 = _9MM_MAX_CARRY;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = -1;
+	p->iMaxClip = GLOCK_MAX_CLIP;
+	p->iSlot = 1;
+	p->iPosition = 0;
+	p->iFlags = 0;
+	p->iId = m_iId = WEAPON_GLOCK;
+	p->iWeight = GLOCK_WEIGHT;
+
+	return 1;
+}
+
+BOOL CGlock::Deploy( )
+{
+	// pev->body = 1;
+	return DefaultDeploy( "models/v_9mmhandgun.mdl", "models/p_9mmhandgun.mdl", GLOCK_DRAW, "onehanded" );
+}
+
+void CGlock::SecondaryAttack( void )
+{
+	GlockFire( 0.1, 0.2, FALSE );
+}
+
+void CGlock::PrimaryAttack( void )
+{
+	GlockFire( 0.01, 0.3, TRUE );
+}
+
+void CGlock::GlockFire( float flSpread , float flCycleTime, BOOL fUseAutoAim )
+{
+	if (m_iClip <= 0)
+	{
+		if (m_fFireOnEmpty)
+		{
+			PlayEmptySound();
+			m_flNextPrimaryAttack = gpGlobals->time + 0.2;
+		}
+
+		return;
+	}
+
+	m_iClip--;
+
+	m_pPlayer->pev->effects = (int)(m_pPlayer->pev->effects) | EF_MUZZLEFLASH;
+
+#if defined ( OLD_WEAPONS )
+	if (m_iClip != 0)
+		SendWeaponAnim( GLOCK_SHOOT );
+	else
+		SendWeaponAnim( GLOCK_SHOOT_EMPTY );
+#endif
+
+	if ( fUseAutoAim )
+	{
+		PLAYBACK_EVENT_FULL( 0, m_pPlayer->edict(), m_usFireGlock1, 0.0, (float *)&g_vecZero, (float *)&g_vecZero, 0.0, 0.0, 0, 0, ( m_iClip == 0 ) ? 1 : 0, 0 );
+	}
+	else
+	{
+		PLAYBACK_EVENT_FULL( 0, m_pPlayer->edict(), m_usFireGlock2, 0.0, (float *)&g_vecZero, (float *)&g_vecZero, 0.0, 0.0, 0, 0, ( m_iClip == 0 ) ? 1 : 0, 0 );
+	}
+
+	// player "shoot" animation
+	m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
+
+#if defined ( OLD_WEAPONS )
+	UTIL_MakeVectors( m_pPlayer->pev->v_angle + m_pPlayer->pev->punchangle );
+		
+	Vector	vecShellVelocity = m_pPlayer->pev->velocity 
+							 + gpGlobals->v_right * RANDOM_FLOAT(50,70) 
+							 + gpGlobals->v_up * RANDOM_FLOAT(100,150) 
+							 + gpGlobals->v_forward * 25;
+	EjectBrass ( pev->origin + m_pPlayer->pev->view_ofs + gpGlobals->v_up * -12 + gpGlobals->v_forward * 32 + gpGlobals->v_right * 6 , vecShellVelocity, pev->angles.y, m_iShell, TE_BOUNCE_SHELL ); 
+#endif
+
+	// silenced
+	if (pev->body == 1)
+	{
+		m_pPlayer->m_iWeaponVolume = QUIET_GUN_VOLUME;
+		m_pPlayer->m_iWeaponFlash = DIM_GUN_FLASH;
+#if defined ( OLD_WEAPONS )
+		switch(RANDOM_LONG(0,1))
+		{
+		case 0:
+			EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/pl_gun1.wav", RANDOM_FLOAT(0.9, 1.0), ATTN_NORM);
+			break;
+		case 1:
+			EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/pl_gun2.wav", RANDOM_FLOAT(0.9, 1.0), ATTN_NORM);
+			break;
+		}
+#endif
+	}
+	else
+	{
+		// non-silenced
+		m_pPlayer->m_iWeaponVolume = NORMAL_GUN_VOLUME;
+		m_pPlayer->m_iWeaponFlash = NORMAL_GUN_FLASH;
+#if defined ( OLD_WEAPONS )
+		EMIT_SOUND_DYN(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/pl_gun3.wav", RANDOM_FLOAT(0.92, 1.0), ATTN_NORM, 0, 98 + RANDOM_LONG(0,3));
+#endif
+	}
+
+	Vector vecSrc	 = m_pPlayer->GetGunPosition( );
+	Vector vecAiming;
+	
+	if ( fUseAutoAim )
+	{
+		vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_10DEGREES );
+	}
+	else
+	{
+		vecAiming = gpGlobals->v_forward;
+	}
+
+	m_pPlayer->FireBullets( 1, vecSrc, vecAiming, Vector( flSpread, flSpread, flSpread ), 8192, BULLET_PLAYER_9MM, 0 );
+
+	m_flNextPrimaryAttack = m_flNextSecondaryAttack = gpGlobals->time + flCycleTime;
+
+	if (!m_iClip && m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] <= 0)
+		// HEV suit - indicate out of ammo condition
+		m_pPlayer->SetSuitUpdate("!HEV_AMO0", FALSE, 0);
+
+	m_flTimeWeaponIdle = gpGlobals->time + RANDOM_FLOAT ( 10, 15 );
+
+#if defined ( OLD_WEAPONS )
+	m_pPlayer->pev->punchangle.x -= 2;
+#endif
+}
+
+
+void CGlock::Reload( void )
+{
+	int iResult;
+
+	if (m_iClip == 0)
+		iResult = DefaultReload( 17, GLOCK_RELOAD, 1.5 );
+	else
+		iResult = DefaultReload( 18, GLOCK_RELOAD_NOT_EMPTY, 1.5 );
+
+	if (iResult)
+	{
+		m_flTimeWeaponIdle = gpGlobals->time + RANDOM_FLOAT ( 10, 15 );
+	}
+}
+
+
+
+void CGlock::WeaponIdle( void )
+{
+	ResetEmptySound( );
+
+	m_pPlayer->GetAutoaimVector( AUTOAIM_10DEGREES );
+
+	if (m_flTimeWeaponIdle > gpGlobals->time)
+		return;
+
+	// only idle if the slid isn't back
+	if (m_iClip != 0)
+	{
+		int iAnim;
+		float flRand = RANDOM_FLOAT(0, 1);
+		if (flRand <= 0.3 + 0 * 0.75)
+		{
+			iAnim = GLOCK_IDLE3;
+			m_flTimeWeaponIdle = gpGlobals->time + 49.0 / 16;
+		}
+		else if (flRand <= 0.6 + 0 * 0.875)
+		{
+			iAnim = GLOCK_IDLE1;
+			m_flTimeWeaponIdle = gpGlobals->time + 60.0 / 16.0;
+		}
+		else
+		{
+			iAnim = GLOCK_IDLE2;
+			m_flTimeWeaponIdle = gpGlobals->time + 40.0 / 16.0;
+		}
+		SendWeaponAnim( iAnim );
+	}
+}
+
+
+
+
+
+
+
+
+class CGlockAmmo : public CBasePlayerAmmo
+{
+	void Spawn( void )
+	{ 
+		Precache( );
+		SET_MODEL(ENT(pev), "models/w_9mmclip.mdl");
+		CBasePlayerAmmo::Spawn( );
+	}
+	void Precache( void )
+	{
+		PRECACHE_MODEL ("models/w_9mmclip.mdl");
+		PRECACHE_SOUND("items/9mmclip1.wav");
+	}
+	BOOL AddAmmo( CBaseEntity *pOther ) 
+	{ 
+		if (pOther->GiveAmmo( AMMO_GLOCKCLIP_GIVE, "9mm", _9MM_MAX_CARRY ) != -1)
+		{
+			EMIT_SOUND(ENT(pev), CHAN_ITEM, "items/9mmclip1.wav", 1, ATTN_NORM);
+			return TRUE;
+		}
+		return FALSE;
+	}
+};
+LINK_ENTITY_TO_CLASS( ammo_glockclip, CGlockAmmo );
+LINK_ENTITY_TO_CLASS( ammo_9mmclip, CGlockAmmo );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/main/source/dlls/gman.cpp b/main/source/dlls/gman.cpp
new file mode 100644
index 00000000..a45d6a4a
--- /dev/null
+++ b/main/source/dlls/gman.cpp
@@ -0,0 +1,237 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// GMan - misunderstood servant of the people
+//=========================================================
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"schedule.h"
+#include	"weapons.h"
+
+//=========================================================
+// Monster's Anim Events Go Here
+//=========================================================
+
+class CGMan : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void SetYawSpeed( void );
+	int  Classify ( void );
+	void HandleAnimEvent( MonsterEvent_t *pEvent );
+	int ISoundMask ( void );
+
+	int	Save( CSave &save ); 
+	int Restore( CRestore &restore );
+	static TYPEDESCRIPTION m_SaveData[];
+
+	void StartTask( Task_t *pTask );
+	void RunTask( Task_t *pTask );
+	int  TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType );
+	void TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType);
+
+	void PlayScriptedSentence( const char *pszSentence, float duration, float volume, float attenuation, BOOL bConcurrent, CBaseEntity *pListener );
+
+	EHANDLE m_hPlayer;
+	EHANDLE m_hTalkTarget;
+	float m_flTalkTime;
+};
+LINK_ENTITY_TO_CLASS( monster_gman, CGMan );
+
+
+TYPEDESCRIPTION	CGMan::m_SaveData[] = 
+{
+	DEFINE_FIELD( CGMan, m_hTalkTarget, FIELD_EHANDLE ),
+	DEFINE_FIELD( CGMan, m_flTalkTime, FIELD_TIME ),
+};
+IMPLEMENT_SAVERESTORE( CGMan, CBaseMonster );
+
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CGMan :: Classify ( void )
+{
+	return	CLASS_NONE;
+}
+
+//=========================================================
+// SetYawSpeed - allows each sequence to have a different
+// turn rate associated with it.
+//=========================================================
+void CGMan :: SetYawSpeed ( void )
+{
+	int ys;
+
+	switch ( m_Activity )
+	{
+	case ACT_IDLE:
+	default:
+		ys = 90;
+	}
+
+	pev->yaw_speed = ys;
+}
+
+//=========================================================
+// HandleAnimEvent - catches the monster-specific messages
+// that occur when tagged animation frames are played.
+//=========================================================
+void CGMan :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	switch( pEvent->event )
+	{
+	case 0:
+	default:
+		CBaseMonster::HandleAnimEvent( pEvent );
+		break;
+	}
+}
+
+//=========================================================
+// ISoundMask - generic monster can't hear.
+//=========================================================
+int CGMan :: ISoundMask ( void )
+{
+	return	NULL;
+}
+
+//=========================================================
+// Spawn
+//=========================================================
+void CGMan :: Spawn()
+{
+	Precache();
+
+	SET_MODEL( ENT(pev), "models/gman.mdl" );
+	UTIL_SetSize(pev, VEC_HUMAN_HULL_MIN, VEC_HUMAN_HULL_MAX);
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_STEP;
+	m_bloodColor		= DONT_BLEED;
+	pev->health			= 100;
+	m_flFieldOfView		= 0.5;// indicates the width of this monster's forward view cone ( as a dotproduct result )
+	m_MonsterState		= MONSTERSTATE_NONE;
+
+	MonsterInit();
+}
+
+//=========================================================
+// Precache - precaches all resources this monster needs
+//=========================================================
+void CGMan :: Precache()
+{
+	PRECACHE_MODEL( "models/gman.mdl" );
+}	
+
+
+//=========================================================
+// AI Schedules Specific to this monster
+//=========================================================
+
+
+void CGMan :: StartTask( Task_t *pTask )
+{
+	switch( pTask->iTask )
+	{
+	case TASK_WAIT:
+		if (m_hPlayer == NULL)
+		{
+			m_hPlayer = UTIL_FindEntityByClassname( NULL, "player" );
+		}
+		break;
+	}
+	CBaseMonster::StartTask( pTask );
+}
+
+void CGMan :: RunTask( Task_t *pTask )
+{
+	switch( pTask->iTask )
+	{
+	case TASK_WAIT:
+		// look at who I'm talking to
+		if (m_flTalkTime > gpGlobals->time && m_hTalkTarget != NULL)
+		{
+			float yaw = VecToYaw(m_hTalkTarget->pev->origin - pev->origin) - pev->angles.y;
+
+			if (yaw > 180) yaw -= 360;
+			if (yaw < -180) yaw += 360;
+
+			// turn towards vector
+			SetBoneController( 0, yaw );
+		}
+		// look at player, but only if playing a "safe" idle animation
+		else if (m_hPlayer != NULL && pev->sequence == 0)
+		{
+			float yaw = VecToYaw(m_hPlayer->pev->origin - pev->origin) - pev->angles.y;
+
+			if (yaw > 180) yaw -= 360;
+			if (yaw < -180) yaw += 360;
+
+			// turn towards vector
+			SetBoneController( 0, yaw );
+		}
+		else 
+		{
+			SetBoneController( 0, 0 );
+		}
+		CBaseMonster::RunTask( pTask );
+		break;
+	default:
+		SetBoneController( 0, 0 );
+		CBaseMonster::RunTask( pTask );
+		break;
+	}
+}
+
+
+//=========================================================
+// Override all damage
+//=========================================================
+int CGMan :: TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType )
+{
+	pev->health = pev->max_health / 2; // always trigger the 50% damage aitrigger
+
+	if ( flDamage > 0 )
+	{
+		SetConditions(bits_COND_LIGHT_DAMAGE);
+	}
+
+	if ( flDamage >= 20 )
+	{
+		SetConditions(bits_COND_HEAVY_DAMAGE);
+	}
+	return TRUE;
+}
+
+
+void CGMan::TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType)
+{
+	UTIL_Ricochet( ptr->vecEndPos, 1.0 );
+	AddMultiDamage( pevAttacker, this, flDamage, bitsDamageType );
+}
+
+
+void CGMan::PlayScriptedSentence( const char *pszSentence, float duration, float volume, float attenuation, BOOL bConcurrent, CBaseEntity *pListener )
+{
+	CBaseMonster::PlayScriptedSentence( pszSentence, duration, volume, attenuation, bConcurrent, pListener );
+
+	m_flTalkTime = gpGlobals->time + duration;
+	m_hTalkTarget = pListener;
+}
diff --git a/main/source/dlls/h_ai.cpp b/main/source/dlls/h_ai.cpp
new file mode 100644
index 00000000..e64ad3f0
--- /dev/null
+++ b/main/source/dlls/h_ai.cpp
@@ -0,0 +1,200 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/*
+
+  h_ai.cpp - halflife specific ai code
+
+*/
+
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"game.h"
+	
+#define		NUM_LATERAL_CHECKS		13  // how many checks are made on each side of a monster looking for lateral cover
+#define		NUM_LATERAL_LOS_CHECKS		6  // how many checks are made on each side of a monster looking for lateral cover
+
+//float flRandom = RANDOM_FLOAT(0,1);
+
+DLL_GLOBAL	BOOL	g_fDrawLines = FALSE;
+
+//=========================================================
+// 
+// AI UTILITY FUNCTIONS
+//
+// !!!UNDONE - move CBaseMonster functions to monsters.cpp
+//=========================================================
+
+//=========================================================
+// FBoxVisible - a more accurate ( and slower ) version
+// of FVisible. 
+//
+// !!!UNDONE - make this CBaseMonster?
+//=========================================================
+BOOL FBoxVisible ( entvars_t *pevLooker, entvars_t *pevTarget, Vector &vecTargetOrigin, float flSize )
+{
+	// don't look through water //OR SHOULD WE? Changed by Elven Thief - kills bug #728
+	/*
+	if ((pevLooker->waterlevel != 3 && pevTarget->waterlevel == 3) 
+		|| (pevLooker->waterlevel == 3 && pevTarget->waterlevel == 0))
+		return FALSE;
+    */
+	TraceResult tr;
+	Vector	vecLookerOrigin = pevLooker->origin + pevLooker->view_ofs;//look through the monster's 'eyes'
+	for (int i = 0; i < 5; i++)
+	{
+		Vector vecTarget = pevTarget->origin;
+		vecTarget.x += RANDOM_FLOAT( pevTarget->mins.x + flSize, pevTarget->maxs.x - flSize);
+		vecTarget.y += RANDOM_FLOAT( pevTarget->mins.y + flSize, pevTarget->maxs.y - flSize);
+		vecTarget.z += RANDOM_FLOAT( pevTarget->mins.z + flSize, pevTarget->maxs.z - flSize);
+
+		UTIL_TraceLine(vecLookerOrigin, vecTarget, ignore_monsters, ignore_glass, ENT(pevLooker)/*pentIgnore*/, &tr);
+		
+		if (tr.flFraction == 1.0)
+		{
+			vecTargetOrigin = vecTarget;
+			return TRUE;// line of sight is valid.
+		}
+	}
+	return FALSE;// Line of sight is not established
+}
+
+//
+// VecCheckToss - returns the velocity at which an object should be lobbed from vecspot1 to land near vecspot2.
+// returns g_vecZero if toss is not feasible.
+// 
+Vector VecCheckToss ( entvars_t *pev, const Vector &vecSpot1, Vector vecSpot2, float flGravityAdj )
+{
+	TraceResult		tr;
+	Vector			vecMidPoint;// halfway point between Spot1 and Spot2
+	Vector			vecApex;// highest point 
+	Vector			vecScale;
+	Vector			vecGrenadeVel;
+	Vector			vecTemp;
+	float			flGravity = g_psv_gravity->value * flGravityAdj;
+
+	if (vecSpot2.z - vecSpot1.z > 500)
+	{
+		// to high, fail
+		return g_vecZero;
+	}
+
+	UTIL_MakeVectors (pev->angles);
+
+	// toss a little bit to the left or right, not right down on the enemy's bean (head). 
+	vecSpot2 = vecSpot2 + gpGlobals->v_right * ( RANDOM_FLOAT(-8,8) + RANDOM_FLOAT(-16,16) );
+	vecSpot2 = vecSpot2 + gpGlobals->v_forward * ( RANDOM_FLOAT(-8,8) + RANDOM_FLOAT(-16,16) );
+	
+	// calculate the midpoint and apex of the 'triangle'
+	// UNDONE: normalize any Z position differences between spot1 and spot2 so that triangle is always RIGHT
+
+	// How much time does it take to get there?
+
+	// get a rough idea of how high it can be thrown
+	vecMidPoint = vecSpot1 + (vecSpot2 - vecSpot1) * 0.5;
+	UTIL_TraceLine(vecMidPoint, vecMidPoint + Vector(0,0,500), ignore_monsters, ENT(pev), &tr);
+	vecMidPoint = tr.vecEndPos;
+	// (subtract 15 so the grenade doesn't hit the ceiling)
+	vecMidPoint.z -= 15;
+
+	if (vecMidPoint.z < vecSpot1.z || vecMidPoint.z < vecSpot2.z)
+	{
+		// to not enough space, fail
+		return g_vecZero;
+	}
+
+	// How high should the grenade travel to reach the apex
+	float distance1 = (vecMidPoint.z - vecSpot1.z);
+	float distance2 = (vecMidPoint.z - vecSpot2.z);
+
+	// How long will it take for the grenade to travel this distance
+	float time1 = sqrt( distance1 / (0.5 * flGravity) );
+	float time2 = sqrt( distance2 / (0.5 * flGravity) );
+
+	if (time1 < 0.1)
+	{
+		// too close
+		return g_vecZero;
+	}
+
+	// how hard to throw sideways to get there in time.
+	vecGrenadeVel = (vecSpot2 - vecSpot1) / (time1 + time2);
+	// how hard upwards to reach the apex at the right time.
+	vecGrenadeVel.z = flGravity * time1;
+
+	// find the apex
+	vecApex  = vecSpot1 + vecGrenadeVel * time1;
+	vecApex.z = vecMidPoint.z;
+
+	UTIL_TraceLine(vecSpot1, vecApex, dont_ignore_monsters, ENT(pev), &tr);
+	if (tr.flFraction != 1.0)
+	{
+		// fail!
+		return g_vecZero;
+	}
+
+	// UNDONE: either ignore monsters or change it to not care if we hit our enemy
+	UTIL_TraceLine(vecSpot2, vecApex, ignore_monsters, ENT(pev), &tr); 
+	if (tr.flFraction != 1.0)
+	{
+		// fail!
+		return g_vecZero;
+	}
+	
+	return vecGrenadeVel;
+}
+
+
+//
+// VecCheckThrow - returns the velocity vector at which an object should be thrown from vecspot1 to hit vecspot2.
+// returns g_vecZero if throw is not feasible.
+// 
+Vector VecCheckThrow ( entvars_t *pev, const Vector &vecSpot1, Vector vecSpot2, float flSpeed, float flGravityAdj )
+{
+	float			flGravity = g_psv_gravity->value * flGravityAdj;
+
+	Vector vecGrenadeVel = (vecSpot2 - vecSpot1);
+
+	// throw at a constant time
+	float time = vecGrenadeVel.Length( ) / flSpeed;
+	vecGrenadeVel = vecGrenadeVel * (1.0 / time);
+
+	// adjust upward toss to compensate for gravity loss
+	vecGrenadeVel.z += flGravity * time * 0.5;
+
+	Vector vecApex = vecSpot1 + (vecSpot2 - vecSpot1) * 0.5;
+	vecApex.z += 0.5 * flGravity * (time * 0.5) * (time * 0.5);
+	
+	TraceResult tr;
+	UTIL_TraceLine(vecSpot1, vecApex, dont_ignore_monsters, ENT(pev), &tr);
+	if (tr.flFraction != 1.0)
+	{
+		// fail!
+		return g_vecZero;
+	}
+
+	UTIL_TraceLine(vecSpot2, vecApex, ignore_monsters, ENT(pev), &tr);
+	if (tr.flFraction != 1.0)
+	{
+		// fail!
+		return g_vecZero;
+	}
+
+	return vecGrenadeVel;
+}
+
+
diff --git a/main/source/dlls/h_battery.cpp b/main/source/dlls/h_battery.cpp
new file mode 100644
index 00000000..09ca89da
--- /dev/null
+++ b/main/source/dlls/h_battery.cpp
@@ -0,0 +1,200 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/*
+
+===== h_battery.cpp ========================================================
+
+  battery-related code
+
+*/
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "saverestore.h"
+#include "skill.h"
+#include "gamerules.h"
+
+class CRecharge : public CBaseToggle
+{
+public:
+	void Spawn( );
+	void Precache( void );
+	void EXPORT Off(void);
+	void EXPORT Recharge(void);
+	void KeyValue( KeyValueData *pkvd );
+	void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	virtual int	ObjectCaps( void ) { return (CBaseToggle :: ObjectCaps() | FCAP_CONTINUOUS_USE) & ~FCAP_ACROSS_TRANSITION; }
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	float m_flNextCharge; 
+	int		m_iReactivate ; // DeathMatch Delay until reactvated
+	int		m_iJuice;
+	int		m_iOn;			// 0 = off, 1 = startup, 2 = going
+	float   m_flSoundTime;
+};
+
+TYPEDESCRIPTION CRecharge::m_SaveData[] =
+{
+	DEFINE_FIELD( CRecharge, m_flNextCharge, FIELD_TIME ),
+	DEFINE_FIELD( CRecharge, m_iReactivate, FIELD_INTEGER),
+	DEFINE_FIELD( CRecharge, m_iJuice, FIELD_INTEGER),
+	DEFINE_FIELD( CRecharge, m_iOn, FIELD_INTEGER),
+	DEFINE_FIELD( CRecharge, m_flSoundTime, FIELD_TIME ),
+};
+
+IMPLEMENT_SAVERESTORE( CRecharge, CBaseEntity );
+
+LINK_ENTITY_TO_CLASS(func_recharge, CRecharge);
+
+
+void CRecharge::KeyValue( KeyValueData *pkvd )
+{
+	if (	FStrEq(pkvd->szKeyName, "style") ||
+				FStrEq(pkvd->szKeyName, "height") ||
+				FStrEq(pkvd->szKeyName, "value1") ||
+				FStrEq(pkvd->szKeyName, "value2") ||
+				FStrEq(pkvd->szKeyName, "value3"))
+	{
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "dmdelay"))
+	{
+		m_iReactivate = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseToggle::KeyValue( pkvd );
+}
+
+void CRecharge::Spawn()
+{
+	Precache( );
+
+	pev->solid		= SOLID_BSP;
+	pev->movetype	= MOVETYPE_PUSH;
+
+	UTIL_SetOrigin(pev, pev->origin);		// set size and link into world
+	UTIL_SetSize(pev, pev->mins, pev->maxs);
+	SET_MODEL(ENT(pev), STRING(pev->model) );
+	m_iJuice = gSkillData.suitchargerCapacity;
+	pev->frame = 0;			
+}
+
+void CRecharge::Precache()
+{
+	PRECACHE_SOUND("items/suitcharge1.wav");
+	PRECACHE_SOUND("items/suitchargeno1.wav");
+	PRECACHE_SOUND("items/suitchargeok1.wav");
+}
+
+
+void CRecharge::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{ 
+	// if it's not a player, ignore
+	if (!FClassnameIs(pActivator->pev, "player"))
+		return;
+
+	// if there is no juice left, turn it off
+	if (m_iJuice <= 0)
+	{
+		pev->frame = 1;			
+		Off();
+	}
+
+	// if the player doesn't have the suit, or there is no juice left, make the deny noise
+	if ((m_iJuice <= 0) || (!(pActivator->pev->weapons & (1<<WEAPON_SUIT))))
+	{
+		if (m_flSoundTime <= gpGlobals->time)
+		{
+			m_flSoundTime = gpGlobals->time + 0.62;
+			EMIT_SOUND(ENT(pev), CHAN_ITEM, "items/suitchargeno1.wav", 0.85, ATTN_NORM );
+		}
+		return;
+	}
+
+	pev->nextthink = pev->ltime + 0.25;
+	SetThink(&CRecharge::Off);
+
+	// Time to recharge yet?
+
+	if (m_flNextCharge >= gpGlobals->time)
+		return;
+
+	// Make sure that we have a caller
+	if (!pActivator)
+		return;
+
+	m_hActivator = pActivator;
+
+	//only recharge the player
+
+	if (!m_hActivator->IsPlayer() )
+		return;
+	
+	// Play the on sound or the looping charging sound
+	if (!m_iOn)
+	{
+		m_iOn++;
+		EMIT_SOUND(ENT(pev), CHAN_ITEM, "items/suitchargeok1.wav", 0.85, ATTN_NORM );
+		m_flSoundTime = 0.56 + gpGlobals->time;
+	}
+	if ((m_iOn == 1) && (m_flSoundTime <= gpGlobals->time))
+	{
+		m_iOn++;
+		EMIT_SOUND(ENT(pev), CHAN_STATIC, "items/suitcharge1.wav", 0.85, ATTN_NORM );
+	}
+
+
+	// charge the player
+	if (m_hActivator->pev->armorvalue < 100)
+	{
+		m_iJuice--;
+		m_hActivator->pev->armorvalue += 1;
+
+		if (m_hActivator->pev->armorvalue > 100)
+			m_hActivator->pev->armorvalue = 100;
+	}
+
+	// govern the rate of charge
+	m_flNextCharge = gpGlobals->time + 0.1;
+}
+
+void CRecharge::Recharge(void)
+{
+	m_iJuice = gSkillData.suitchargerCapacity;
+	pev->frame = 0;			
+	SetThink( &CRecharge::SUB_DoNothing );
+}
+
+void CRecharge::Off(void)
+{
+	// Stop looping sound.
+	if (m_iOn > 1)
+		STOP_SOUND( ENT(pev), CHAN_STATIC, "items/suitcharge1.wav" );
+
+	m_iOn = 0;
+
+	if ((!m_iJuice) &&  ( ( m_iReactivate = g_pGameRules->FlHEVChargerRechargeTime() ) > 0) )
+	{
+		pev->nextthink = pev->ltime + m_iReactivate;
+		SetThink(&CRecharge::Recharge);
+	}
+	else
+		SetThink( &CRecharge::SUB_DoNothing );
+}
\ No newline at end of file
diff --git a/main/source/dlls/h_cine.cpp b/main/source/dlls/h_cine.cpp
new file mode 100644
index 00000000..798d8f75
--- /dev/null
+++ b/main/source/dlls/h_cine.cpp
@@ -0,0 +1,241 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+/*
+
+===== h_cine.cpp ========================================================
+
+  The Halflife hard coded "scripted sequence".
+
+  I'm pretty sure all this code is obsolete
+
+*/
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"decals.h"
+
+
+class CLegacyCineMonster : public CBaseMonster
+{
+public:
+	void CineSpawn( char *szModel );
+	void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void EXPORT CineThink( void );
+	void Pain( void );
+	void Die( void );
+};
+
+class CCineScientist : public CLegacyCineMonster
+{
+public:
+	void Spawn( void ) { CineSpawn("models/cine-scientist.mdl"); }
+};
+class CCine2Scientist : public CLegacyCineMonster
+{
+public:
+	void Spawn( void ) { CineSpawn("models/cine2-scientist.mdl"); }
+};
+class CCinePanther : public CLegacyCineMonster
+{
+public:
+	void Spawn( void ) { CineSpawn("models/cine-panther.mdl"); }
+};
+
+class CCineBarney : public CLegacyCineMonster
+{
+public:
+	void Spawn( void ) { CineSpawn("models/cine-barney.mdl"); }
+};
+
+class CCine2HeavyWeapons : public CLegacyCineMonster
+{
+public:
+	void Spawn( void ) { CineSpawn("models/cine2_hvyweapons.mdl"); }
+};
+
+class CCine2Slave : public CLegacyCineMonster
+{
+public:
+	void Spawn( void ) { CineSpawn("models/cine2_slave.mdl"); }
+};
+
+class CCine3Scientist : public CLegacyCineMonster
+{
+public:
+	void Spawn( void ) { CineSpawn("models/cine3-scientist.mdl"); }
+};
+
+class CCine3Barney : public CLegacyCineMonster
+{
+public:
+	void Spawn( void ) { CineSpawn("models/cine3-barney.mdl"); }
+};
+
+//
+// ********** Scientist SPAWN **********
+//
+
+LINK_ENTITY_TO_CLASS( monster_cine_scientist, CCineScientist );
+LINK_ENTITY_TO_CLASS( monster_cine_panther, CCinePanther );
+LINK_ENTITY_TO_CLASS( monster_cine_barney, CCineBarney );
+LINK_ENTITY_TO_CLASS( monster_cine2_scientist, CCine2Scientist );
+LINK_ENTITY_TO_CLASS( monster_cine2_hvyweapons, CCine2HeavyWeapons );
+LINK_ENTITY_TO_CLASS( monster_cine2_slave, CCine2Slave );
+LINK_ENTITY_TO_CLASS( monster_cine3_scientist, CCine3Scientist );
+LINK_ENTITY_TO_CLASS( monster_cine3_barney, CCine3Barney );
+
+//
+// ********** Scientist SPAWN **********
+//
+
+void CLegacyCineMonster :: CineSpawn( char *szModel )
+{
+	PRECACHE_MODEL(szModel);
+	SET_MODEL(ENT(pev), szModel);
+	UTIL_SetSize(pev, Vector(-16, -16, 0), Vector(16, 16, 64));
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_STEP;
+	pev->effects		= 0;
+	pev->health			= 1;
+	pev->yaw_speed		= 10;
+	
+	// ugly alpha hack, can't set ints from the bsp.	
+	pev->sequence		= (int)pev->impulse;
+	ResetSequenceInfo( );
+	pev->framerate = 0.0;
+
+	m_bloodColor = BLOOD_COLOR_RED;
+
+	// if no targetname, start now
+	if ( FStringNull(pev->targetname) )	
+	{
+		SetThink( &CLegacyCineMonster::CineThink );
+		pev->nextthink += 1.0;
+	}
+}
+
+
+//
+// CineStart
+//
+void CLegacyCineMonster :: Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	pev->animtime = 0;	// reset the sequence
+	SetThink( &CLegacyCineMonster::CineThink );
+	pev->nextthink = gpGlobals->time;
+}
+
+//
+// ********** Scientist DIE **********
+//
+void CLegacyCineMonster :: Die( void )
+{
+	SetThink( &CLegacyCineMonster::SUB_Remove );
+}
+
+//
+// ********** Scientist PAIN **********
+//
+void CLegacyCineMonster :: Pain( void )
+{
+	EMIT_SOUND(ENT(pev), CHAN_VOICE, "player/pain3.wav", 1, ATTN_NORM);
+}
+
+void CLegacyCineMonster :: CineThink( void )
+{
+	// DBG_CheckMonsterData(pev);
+	
+	// Emit particles from origin (double check animator's placement of model)
+	// THIS is a test feature
+	//UTIL_ParticleEffect(pev->origin, g_vecZero, 255, 20);
+
+	if (!pev->animtime)
+		ResetSequenceInfo( );
+
+	pev->nextthink = gpGlobals->time + 1.0;
+
+	if (pev->spawnflags != 0 && m_fSequenceFinished)
+	{
+		Die();
+		return;
+	}
+
+	StudioFrameAdvance ( );
+}
+
+//
+// cine_blood
+//
+// e3/prealpha only. 
+class CCineBlood : public CBaseEntity
+{
+public:
+	void Spawn( void );
+	void EXPORT BloodStart ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void EXPORT BloodGush ( void );
+};
+
+LINK_ENTITY_TO_CLASS( cine_blood, CCineBlood );
+
+
+void CCineBlood :: BloodGush ( void )
+{
+	Vector	vecSplatDir;
+	TraceResult	tr;
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	UTIL_MakeVectors(pev->angles);
+	if ( pev->health-- < 0 )
+		REMOVE_ENTITY(ENT(pev));
+// CHANGE_METHOD ( ENT(pev), em_think, SUB_Remove );
+
+	if ( RANDOM_FLOAT ( 0 , 1 ) < 0.7 )// larger chance of globs
+	{
+		UTIL_BloodDrips( pev->origin, UTIL_RandomBloodVector(), BLOOD_COLOR_RED, 10 );
+	}
+	else// slim chance of geyser
+	{
+		UTIL_BloodStream( pev->origin, UTIL_RandomBloodVector(), BLOOD_COLOR_RED, RANDOM_LONG(50, 150) );
+	}
+
+	if ( RANDOM_FLOAT ( 0, 1 ) < 0.75 )
+	{// decals the floor with blood.
+		vecSplatDir = Vector ( 0 , 0 , -1 );
+		vecSplatDir = vecSplatDir + (RANDOM_FLOAT(-1,1) * 0.6 * gpGlobals->v_right) + (RANDOM_FLOAT(-1,1) * 0.6 * gpGlobals->v_forward);// randomize a bit
+		UTIL_TraceLine( pev->origin + Vector ( 0, 0 , 64) , pev->origin + vecSplatDir * 256, ignore_monsters, ENT(pev), &tr);
+		if ( tr.flFraction != 1.0 )
+		{
+			// Decal with a bloodsplat
+			UTIL_BloodDecalTrace( &tr, BLOOD_COLOR_RED );
+		}
+	}
+}
+
+void CCineBlood :: BloodStart ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	SetThink( &CCineBlood::BloodGush );
+	pev->nextthink = gpGlobals->time;// now!
+}
+
+void CCineBlood :: Spawn ( void )
+{
+	pev->solid = SOLID_NOT;
+	SetUse ( &CCineBlood::BloodStart );
+	pev->health = 20;//hacked health to count iterations
+}
+
diff --git a/main/source/dlls/h_cycler.cpp b/main/source/dlls/h_cycler.cpp
new file mode 100644
index 00000000..d9c95b99
--- /dev/null
+++ b/main/source/dlls/h_cycler.cpp
@@ -0,0 +1,471 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/*
+
+===== h_cycler.cpp ========================================================
+
+  The Halflife Cycler Monsters
+
+*/
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "animation.h"
+#include "weapons.h"
+#include "player.h"
+
+
+#define TEMP_FOR_SCREEN_SHOTS
+#ifdef TEMP_FOR_SCREEN_SHOTS //===================================================
+
+class CCycler : public CBaseMonster
+{
+public:
+	void GenericCyclerSpawn(char *szModel, Vector vecMin, Vector vecMax);
+	virtual int	ObjectCaps( void ) { return (CBaseEntity :: ObjectCaps() | FCAP_IMPULSE_USE); }
+	int TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType );
+	void Spawn( void );
+	void Think( void );
+	//void Pain( float flDamage );
+	void Use ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+	// Don't treat as a live target
+	virtual BOOL IsAlive( void ) const { return FALSE; }
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	int			m_animate;
+};
+
+TYPEDESCRIPTION	CCycler::m_SaveData[] = 
+{
+	DEFINE_FIELD( CCycler, m_animate, FIELD_INTEGER ),
+};
+
+IMPLEMENT_SAVERESTORE( CCycler, CBaseMonster );
+
+
+//
+// we should get rid of all the other cyclers and replace them with this.
+//
+class CGenericCycler : public CCycler
+{
+public:
+	void Spawn( void ) { GenericCyclerSpawn( (char *)STRING(pev->model), Vector(-16, -16, 0), Vector(16, 16, 72) ); }
+};
+LINK_ENTITY_TO_CLASS( cycler, CGenericCycler );
+
+
+
+// Probe droid imported for tech demo compatibility
+//
+// PROBE DROID
+//
+class CCyclerProbe : public CCycler
+{
+public:	
+	void Spawn( void );
+};
+LINK_ENTITY_TO_CLASS( cycler_prdroid, CCyclerProbe );
+void CCyclerProbe :: Spawn( void )
+{
+	pev->origin = pev->origin + Vector ( 0, 0, 16 );
+	GenericCyclerSpawn( "models/prdroid.mdl", Vector(-16,-16,-16), Vector(16,16,16));
+}
+
+
+
+// Cycler member functions
+
+void CCycler :: GenericCyclerSpawn(char *szModel, Vector vecMin, Vector vecMax)
+{
+	if (!szModel || !*szModel)
+	{
+		ALERT(at_error, "cycler at %.0f %.0f %0.f missing modelname", pev->origin.x, pev->origin.y, pev->origin.z );
+		REMOVE_ENTITY(ENT(pev));
+		return;
+	}
+
+	pev->classname		= MAKE_STRING("cycler");
+	PRECACHE_MODEL( szModel );
+	SET_MODEL(ENT(pev),	szModel);
+
+	CCycler::Spawn( );
+
+	UTIL_SetSize(pev, vecMin, vecMax);
+}
+
+
+void CCycler :: Spawn( )
+{
+	InitBoneControllers();
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_NONE;
+	pev->takedamage		= DAMAGE_YES;
+	pev->effects		= 0;
+	pev->health			= 80000;// no cycler should die
+	pev->yaw_speed		= 5;
+	pev->ideal_yaw		= pev->angles.y;
+	ChangeYaw( 360 );
+	
+	m_flFrameRate		= 75;
+	m_flGroundSpeed		= 0;
+
+	pev->nextthink		+= 1.0;
+
+	ResetSequenceInfo( );
+
+	if (pev->sequence != 0 || pev->frame != 0)
+	{
+		m_animate = 0;
+		pev->framerate = 0;
+	}
+	else
+	{
+		m_animate = 1;
+	}
+}
+
+
+
+
+//
+// cycler think
+//
+void CCycler :: Think( void )
+{
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	if (m_animate)
+	{
+		StudioFrameAdvance ( );
+	}
+	if (m_fSequenceFinished && !m_fSequenceLoops)
+	{
+		// ResetSequenceInfo();
+		// hack to avoid reloading model every frame
+		pev->animtime = gpGlobals->time;
+		pev->framerate = 1.0;
+		m_fSequenceFinished = FALSE;
+		m_flLastEventCheck = gpGlobals->time;
+		pev->frame = 0;
+		if (!m_animate)
+			pev->framerate = 0.0;	// FIX: don't reset framerate
+	}
+}
+
+//
+// CyclerUse - starts a rotation trend
+//
+void CCycler :: Use ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	m_animate = !m_animate;
+	if (m_animate)
+		pev->framerate = 1.0;
+	else
+		pev->framerate = 0.0;
+}
+
+//
+// CyclerPain , changes sequences when shot
+//
+//void CCycler :: Pain( float flDamage )
+int CCycler :: TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType )
+{
+	if (m_animate)
+	{
+		pev->sequence++;
+
+		ResetSequenceInfo( );
+
+		if (m_flFrameRate == 0.0)
+		{
+			pev->sequence = 0;
+			ResetSequenceInfo( );
+		}
+		pev->frame = 0;
+	}
+	else
+	{
+		pev->framerate = 1.0;
+		StudioFrameAdvance ( 0.1 );
+		pev->framerate = 0;
+		ALERT( at_console, "sequence: %d, frame %.0f\n", pev->sequence, pev->frame );
+	}
+
+	return 0;
+}
+
+#endif
+
+
+class CCyclerSprite : public CBaseEntity
+{
+public:
+	void Spawn( void );
+	void Think( void );
+	void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	virtual int	ObjectCaps( void ) { return (CBaseEntity :: ObjectCaps() | FCAP_DONT_SAVE | FCAP_IMPULSE_USE); }
+	virtual int	TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType );
+	void	Animate( float frames );
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	inline int		ShouldAnimate( void ) { return m_animate && m_maxFrame > 1.0; }
+	int			m_animate;
+	float		m_lastTime;
+	float		m_maxFrame;
+};
+
+LINK_ENTITY_TO_CLASS( cycler_sprite, CCyclerSprite );
+
+TYPEDESCRIPTION	CCyclerSprite::m_SaveData[] = 
+{
+	DEFINE_FIELD( CCyclerSprite, m_animate, FIELD_INTEGER ),
+	DEFINE_FIELD( CCyclerSprite, m_lastTime, FIELD_TIME ),
+	DEFINE_FIELD( CCyclerSprite, m_maxFrame, FIELD_FLOAT ),
+};
+
+IMPLEMENT_SAVERESTORE( CCyclerSprite, CBaseEntity );
+
+
+void CCyclerSprite::Spawn( void )
+{
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_NONE;
+	pev->takedamage		= DAMAGE_YES;
+	pev->effects		= 0;
+
+	pev->frame			= 0;
+	pev->nextthink		= gpGlobals->time + 0.1;
+	m_animate			= 1;
+	m_lastTime			= gpGlobals->time;
+
+	PRECACHE_MODEL( (char *)STRING(pev->model) );
+	SET_MODEL( ENT(pev), STRING(pev->model) );
+
+	m_maxFrame = (float) MODEL_FRAMES( pev->modelindex ) - 1;
+}
+
+
+void CCyclerSprite::Think( void )
+{
+	if ( ShouldAnimate() )
+		Animate( pev->framerate * (gpGlobals->time - m_lastTime) );
+
+	pev->nextthink		= gpGlobals->time + 0.1;
+	m_lastTime = gpGlobals->time;
+}
+
+
+void CCyclerSprite::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	m_animate = !m_animate;
+	ALERT( at_console, "Sprite: %s\n", STRING(pev->model) );
+}
+
+
+int	CCyclerSprite::TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType )
+{
+	if ( m_maxFrame > 1.0 )
+	{
+		Animate( 1.0 );
+	}
+	return 1;
+}
+
+void CCyclerSprite::Animate( float frames )
+{ 
+	pev->frame += frames;
+	if ( m_maxFrame > 0 )
+		pev->frame = fmod( pev->frame, m_maxFrame );
+}
+
+
+
+
+
+
+
+class CWeaponCycler : public CBasePlayerWeapon
+{
+public:
+	void Spawn( void );
+	int iItemSlot( void ) { return 1; }
+	int GetItemInfo(ItemInfo *p) {return 0; }
+
+	void PrimaryAttack( void );
+	void SecondaryAttack( void );
+	BOOL Deploy( void );
+	void Holster( int skiplocal = 0 );
+	int m_iszModel;
+	int m_iModel;
+};
+LINK_ENTITY_TO_CLASS( cycler_weapon, CWeaponCycler );
+
+
+void CWeaponCycler::Spawn( )
+{
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_NONE;
+
+	PRECACHE_MODEL( (char *)STRING(pev->model) );
+	SET_MODEL( ENT(pev), STRING(pev->model) );
+	m_iszModel = pev->model;
+	m_iModel = pev->modelindex;
+
+	UTIL_SetOrigin( pev, pev->origin );
+	UTIL_SetSize(pev, Vector(-16, -16, 0), Vector(16, 16, 16));
+	SetTouch( &CWeaponCycler::DefaultTouch );
+}
+
+
+
+BOOL CWeaponCycler::Deploy( )
+{
+	m_pPlayer->pev->viewmodel = m_iszModel;
+	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 1.0;
+	SendWeaponAnim( 0 );
+	m_iClip = 0;
+	return TRUE;
+}
+
+
+void CWeaponCycler::Holster( int skiplocal /* = 0 */ )
+{
+	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 0.5;
+}
+
+
+void CWeaponCycler::PrimaryAttack()
+{
+
+	SendWeaponAnim( pev->sequence );
+
+	m_flNextPrimaryAttack = gpGlobals->time + 0.3;
+}
+
+
+void CWeaponCycler::SecondaryAttack( void )
+{
+	float flFrameRate, flGroundSpeed;
+
+	pev->sequence = (pev->sequence + 1) % 8;
+
+	pev->modelindex = m_iModel;
+	void *pmodel = GET_MODEL_PTR( ENT(pev) );
+	GetSequenceInfo( pmodel, pev, &flFrameRate, &flGroundSpeed );
+	pev->modelindex = 0;
+
+	if (flFrameRate == 0.0)
+	{
+		pev->sequence = 0;
+	}
+
+	SendWeaponAnim( pev->sequence );
+
+	m_flNextSecondaryAttack = gpGlobals->time + 0.3;
+}
+
+
+
+// Flaming Wreakage
+class CWreckage : public CBaseMonster
+{
+	int		Save( CSave &save );
+	int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	void Spawn( void );
+	void Precache( void );
+	void Think( void );
+
+	int m_flStartTime;
+};
+TYPEDESCRIPTION	CWreckage::m_SaveData[] = 
+{
+	DEFINE_FIELD( CWreckage, m_flStartTime, FIELD_TIME ),
+};
+IMPLEMENT_SAVERESTORE( CWreckage, CBaseMonster );
+
+
+LINK_ENTITY_TO_CLASS( cycler_wreckage, CWreckage );
+
+void CWreckage::Spawn( void )
+{
+	pev->solid			= SOLID_NOT;
+	pev->movetype		= MOVETYPE_NONE;
+	pev->takedamage		= 0;
+	pev->effects		= 0;
+
+	pev->frame			= 0;
+	pev->nextthink		= gpGlobals->time + 0.1;
+
+	if (pev->model)
+	{
+		PRECACHE_MODEL( (char *)STRING(pev->model) );
+		SET_MODEL( ENT(pev), STRING(pev->model) );
+	}
+	// pev->scale = 5.0;
+
+	m_flStartTime		= gpGlobals->time;
+}
+
+void CWreckage::Precache( )
+{
+	if ( pev->model )
+		PRECACHE_MODEL( (char *)STRING(pev->model) );
+}
+
+void CWreckage::Think( void )
+{
+	StudioFrameAdvance( );
+	pev->nextthink = gpGlobals->time + 0.2;
+
+	if (pev->dmgtime)
+	{
+		if (pev->dmgtime < gpGlobals->time)
+		{
+			UTIL_Remove( this );
+			return;
+		}
+		else if (RANDOM_FLOAT( 0, pev->dmgtime - m_flStartTime ) > pev->dmgtime - gpGlobals->time)
+		{
+			return;
+		}
+	}
+	
+	Vector VecSrc;
+	
+	VecSrc.x = RANDOM_FLOAT( pev->absmin.x, pev->absmax.x );
+	VecSrc.y = RANDOM_FLOAT( pev->absmin.y, pev->absmax.y );
+	VecSrc.z = RANDOM_FLOAT( pev->absmin.z, pev->absmax.z );
+
+	MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, VecSrc );
+		WRITE_BYTE( TE_SMOKE );
+		WRITE_COORD( VecSrc.x );
+		WRITE_COORD( VecSrc.y );
+		WRITE_COORD( VecSrc.z );
+		WRITE_SHORT( g_sModelIndexSmoke );
+		WRITE_BYTE( RANDOM_LONG(0,49) + 50 ); // scale * 10
+		WRITE_BYTE( RANDOM_LONG(0, 3) + 8  ); // framerate
+	MESSAGE_END();
+}
diff --git a/main/source/dlls/h_export.cpp b/main/source/dlls/h_export.cpp
new file mode 100644
index 00000000..f7bb3f98
--- /dev/null
+++ b/main/source/dlls/h_export.cpp
@@ -0,0 +1,69 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/*
+
+===== h_export.cpp ========================================================
+
+  Entity classes exported by Halflife.
+
+*/
+
+#include "extdll.h"
+#include "util.h"
+
+#include "cbase.h"
+
+// Holds engine functionality callbacks
+enginefuncs_t g_engfuncs;
+globalvars_t  *gpGlobals;
+
+
+#ifdef _WIN32
+
+// Required DLL entry point
+BOOL WINAPI DllMain(
+   HINSTANCE hinstDLL,
+   DWORD fdwReason,
+   LPVOID lpvReserved)
+{
+	if      (fdwReason == DLL_PROCESS_ATTACH)
+    {
+    }
+	else if (fdwReason == DLL_PROCESS_DETACH)
+    {
+    }
+	return TRUE;
+}
+
+void DLLEXPORT GiveFnptrsToDll(	enginefuncs_t* pengfuncsFromEngine, globalvars_t *pGlobals )
+{
+	memcpy(&g_engfuncs, pengfuncsFromEngine, sizeof(enginefuncs_t));
+	gpGlobals = pGlobals;
+}
+
+
+#else
+
+extern "C" {
+
+void GiveFnptrsToDll(	enginefuncs_t* pengfuncsFromEngine, globalvars_t *pGlobals )
+{
+	memcpy(&g_engfuncs, pengfuncsFromEngine, sizeof(enginefuncs_t));
+	gpGlobals = pGlobals;
+}
+
+}
+
+#endif
diff --git a/main/source/dlls/handgrenade.cpp b/main/source/dlls/handgrenade.cpp
new file mode 100644
index 00000000..7f81319f
--- /dev/null
+++ b/main/source/dlls/handgrenade.cpp
@@ -0,0 +1,233 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "player.h"
+
+
+#define	HANDGRENADE_PRIMARY_VOLUME		450
+
+enum handgrenade_e {
+	HANDGRENADE_IDLE = 0,
+	HANDGRENADE_FIDGET,
+	HANDGRENADE_PINPULL,
+	HANDGRENADE_THROW1,	// toss
+	HANDGRENADE_THROW2,	// medium
+	HANDGRENADE_THROW3,	// hard
+	HANDGRENADE_HOLSTER,
+	HANDGRENADE_DRAW
+};
+
+
+LINK_ENTITY_TO_CLASS( weapon_handgrenade, CHandGrenade );
+
+
+void CHandGrenade::Spawn( )
+{
+	Precache( );
+	m_iId = WEAPON_HANDGRENADE;
+	SET_MODEL(ENT(pev), "models/w_grenade.mdl");
+
+#ifndef CLIENT_DLL
+	pev->dmg = gSkillData.plrDmgHandGrenade;
+#endif
+
+	m_iDefaultAmmo = HANDGRENADE_DEFAULT_GIVE;
+
+	FallInit();// get ready to fall down.
+}
+
+
+void CHandGrenade::Precache( void )
+{
+	PRECACHE_MODEL("models/w_grenade.mdl");
+	PRECACHE_MODEL("models/v_grenade.mdl");
+	PRECACHE_MODEL("models/p_grenade.mdl");
+}
+
+int CHandGrenade::GetItemInfo(ItemInfo *p)
+{
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = "Hand Grenade";
+	p->iMaxAmmo1 = HANDGRENADE_MAX_CARRY;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = -1;
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iSlot = 4;
+	p->iPosition = 0;
+	p->iId = m_iId = WEAPON_HANDGRENADE;
+	p->iWeight = HANDGRENADE_WEIGHT;
+	p->iFlags = ITEM_FLAG_LIMITINWORLD | ITEM_FLAG_EXHAUSTIBLE;
+
+	return 1;
+}
+
+
+BOOL CHandGrenade::Deploy( )
+{
+	m_flReleaseThrow = -1;
+	return DefaultDeploy( "models/v_grenade.mdl", "models/p_grenade.mdl", HANDGRENADE_DRAW, "crowbar" );
+}
+
+BOOL CHandGrenade::CanHolster( void )
+{
+	// can only holster hand grenades when not primed!
+	return ( m_flStartThrow == 0 );
+}
+
+void CHandGrenade::Holster( int skiplocal /* = 0 */ )
+{
+	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 0.5;
+
+	if ( m_pPlayer->m_rgAmmo[ m_iPrimaryAmmoType ] )
+	{
+		SendWeaponAnim( HANDGRENADE_HOLSTER );
+	}
+	else
+	{
+		// no more grenades!
+		m_pPlayer->pev->weapons &= ~(1<<WEAPON_HANDGRENADE);
+		SetThink( &CHandGrenade::DestroyItem );
+		pev->nextthink = gpGlobals->time + 0.1;
+	}
+
+	EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "common/null.wav", 1.0, ATTN_NORM);
+}
+
+void CHandGrenade::PrimaryAttack()
+{
+	if ( !m_flStartThrow && m_pPlayer->m_rgAmmo[ m_iPrimaryAmmoType ] > 0 )
+	{
+		m_flStartThrow = gpGlobals->time;
+		m_flReleaseThrow = 0;
+
+		SendWeaponAnim( HANDGRENADE_PINPULL );
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 0.5;
+	}
+}
+
+
+void CHandGrenade::WeaponIdle( void )
+{
+	if ( m_flReleaseThrow == 0 && m_flStartThrow )
+		 m_flReleaseThrow = gpGlobals->time;
+
+	if ( m_flTimeWeaponIdle > UTIL_WeaponTimeBase() )
+		return;
+
+	if ( m_flStartThrow )
+	{
+		Vector angThrow = m_pPlayer->pev->v_angle + m_pPlayer->pev->punchangle;
+
+		if ( angThrow.x < 0 )
+			angThrow.x = -10 + angThrow.x * ( ( 90 - 10 ) / 90.0 );
+		else
+			angThrow.x = -10 + angThrow.x * ( ( 90 + 10 ) / 90.0 );
+
+		float flVel = ( 90 - angThrow.x ) * 4;
+		if ( flVel > 500 )
+			flVel = 500;
+
+		UTIL_MakeVectors( angThrow );
+
+		Vector vecSrc = m_pPlayer->pev->origin + m_pPlayer->pev->view_ofs + gpGlobals->v_forward * 16;
+
+		Vector vecThrow = gpGlobals->v_forward * flVel + m_pPlayer->pev->velocity;
+
+		// alway explode 3 seconds after the pin was pulled
+		float time = m_flStartThrow - gpGlobals->time + 3.0;
+		if (time < 0)
+			time = 0;
+
+		CGrenade::ShootTimed( m_pPlayer->pev, vecSrc, vecThrow, time );
+
+		if ( flVel < 500 )
+		{
+			SendWeaponAnim( HANDGRENADE_THROW1 );
+		}
+		else if ( flVel < 1000 )
+		{
+			SendWeaponAnim( HANDGRENADE_THROW2 );
+		}
+		else
+		{
+			SendWeaponAnim( HANDGRENADE_THROW3 );
+		}
+
+		// player "shoot" animation
+		m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
+
+		m_flReleaseThrow = 0;
+		m_flStartThrow = 0;
+		m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.5;
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 0.5;
+
+		m_pPlayer->m_rgAmmo[ m_iPrimaryAmmoType ]--;
+
+		if ( !m_pPlayer->m_rgAmmo[ m_iPrimaryAmmoType ] )
+		{
+			// just threw last grenade
+			// set attack times in the future, and weapon idle in the future so we can see the whole throw
+			// animation, weapon idle will automatically retire the weapon for us.
+			m_flTimeWeaponIdle = m_flNextSecondaryAttack = m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.5;// ensure that the animation can finish playing
+		}
+		return;
+	}
+	else if ( m_flReleaseThrow > 0 )
+	{
+		// we've finished the throw, restart.
+		m_flStartThrow = 0;
+
+		if ( m_pPlayer->m_rgAmmo[ m_iPrimaryAmmoType ] )
+		{
+			SendWeaponAnim( HANDGRENADE_DRAW );
+		}
+		else
+		{
+			RetireWeapon();
+			return;
+		}
+
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
+		m_flReleaseThrow = -1;
+		return;
+	}
+
+	if ( m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] )
+	{
+		int iAnim;
+		float flRand = UTIL_SharedRandomFloat( m_pPlayer->random_seed, 0, 1 );
+		if (flRand <= 0.75)
+		{
+			iAnim = HANDGRENADE_IDLE;
+			m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );// how long till we do this again.
+		}
+		else 
+		{
+			iAnim = HANDGRENADE_FIDGET;
+			m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 75.0 / 30.0;
+		}
+
+		SendWeaponAnim( iAnim );
+	}
+}
+
+
+
+
diff --git a/main/source/dlls/hassassin.cpp b/main/source/dlls/hassassin.cpp
new file mode 100644
index 00000000..cf62d508
--- /dev/null
+++ b/main/source/dlls/hassassin.cpp
@@ -0,0 +1,1015 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD )
+
+//=========================================================
+// hassassin - Human assassin, fast and stealthy
+//=========================================================
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"schedule.h"
+#include	"squadmonster.h"
+#include	"weapons.h"
+#include	"soundent.h"
+#include	"game.h"
+
+extern DLL_GLOBAL int  g_iSkillLevel;
+
+//=========================================================
+// monster-specific schedule types
+//=========================================================
+enum
+{
+	SCHED_ASSASSIN_EXPOSED = LAST_COMMON_SCHEDULE + 1,// cover was blown.
+	SCHED_ASSASSIN_JUMP,	// fly through the air
+	SCHED_ASSASSIN_JUMP_ATTACK,	// fly through the air and shoot
+	SCHED_ASSASSIN_JUMP_LAND, // hit and run away
+};
+
+//=========================================================
+// monster-specific tasks
+//=========================================================
+
+enum
+{
+	TASK_ASSASSIN_FALL_TO_GROUND = LAST_COMMON_TASK + 1, // falling and waiting to hit ground
+};
+
+
+//=========================================================
+// Monster's Anim Events Go Here
+//=========================================================
+#define		ASSASSIN_AE_SHOOT1	1
+#define		ASSASSIN_AE_TOSS1	2
+#define		ASSASSIN_AE_JUMP	3
+
+
+#define bits_MEMORY_BADJUMP		(bits_MEMORY_CUSTOM1)
+
+class CHAssassin : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void SetYawSpeed ( void );
+	int  Classify ( void );
+	int  ISoundMask ( void);
+	void Shoot( void );
+	void HandleAnimEvent( MonsterEvent_t *pEvent );
+	Schedule_t* GetSchedule ( void );
+	Schedule_t* GetScheduleOfType ( int Type );
+	BOOL CheckMeleeAttack1 ( float flDot, float flDist );	// jump
+	// BOOL CheckMeleeAttack2 ( float flDot, float flDist );
+	BOOL CheckRangeAttack1 ( float flDot, float flDist );	// shoot
+	BOOL CheckRangeAttack2 ( float flDot, float flDist );	// throw grenade
+	void StartTask ( Task_t *pTask );
+	void RunAI( void );
+	void RunTask ( Task_t *pTask );
+	void DeathSound ( void );
+	void IdleSound ( void );
+	CUSTOM_SCHEDULES;
+
+	int	Save( CSave &save ); 
+	int Restore( CRestore &restore );
+	static TYPEDESCRIPTION m_SaveData[];
+
+	float m_flLastShot;
+	float m_flDiviation;
+
+	float m_flNextJump;
+	Vector m_vecJumpVelocity;
+
+	float m_flNextGrenadeCheck;
+	Vector	m_vecTossVelocity;
+	BOOL	m_fThrowGrenade;
+
+	int		m_iTargetRanderamt;
+
+	int		m_iFrustration;
+
+	int		m_iShell;
+};
+LINK_ENTITY_TO_CLASS( monster_human_assassin, CHAssassin );
+
+
+TYPEDESCRIPTION	CHAssassin::m_SaveData[] = 
+{
+	DEFINE_FIELD( CHAssassin, m_flLastShot, FIELD_TIME ),
+	DEFINE_FIELD( CHAssassin, m_flDiviation, FIELD_FLOAT ),
+
+	DEFINE_FIELD( CHAssassin, m_flNextJump, FIELD_TIME ),
+	DEFINE_FIELD( CHAssassin, m_vecJumpVelocity, FIELD_VECTOR ),
+
+	DEFINE_FIELD( CHAssassin, m_flNextGrenadeCheck, FIELD_TIME ),
+	DEFINE_FIELD( CHAssassin, m_vecTossVelocity, FIELD_VECTOR ),
+	DEFINE_FIELD( CHAssassin, m_fThrowGrenade, FIELD_BOOLEAN ),
+
+	DEFINE_FIELD( CHAssassin, m_iTargetRanderamt, FIELD_INTEGER ),
+	DEFINE_FIELD( CHAssassin, m_iFrustration, FIELD_INTEGER ),
+};
+
+IMPLEMENT_SAVERESTORE( CHAssassin, CBaseMonster );
+
+
+//=========================================================
+// DieSound
+//=========================================================
+void CHAssassin :: DeathSound ( void )
+{
+}
+
+//=========================================================
+// IdleSound
+//=========================================================
+void CHAssassin :: IdleSound ( void )
+{
+}
+
+//=========================================================
+// ISoundMask - returns a bit mask indicating which types
+// of sounds this monster regards. 
+//=========================================================
+int CHAssassin :: ISoundMask ( void) 
+{
+	return	bits_SOUND_WORLD	|
+			bits_SOUND_COMBAT	|
+			bits_SOUND_DANGER	|
+			bits_SOUND_PLAYER;
+}
+
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CHAssassin :: Classify ( void )
+{
+	return	CLASS_HUMAN_MILITARY;
+}
+
+//=========================================================
+// SetYawSpeed - allows each sequence to have a different
+// turn rate associated with it.
+//=========================================================
+void CHAssassin :: SetYawSpeed ( void )
+{
+	int ys;
+
+	switch ( m_Activity )
+	{
+	case ACT_TURN_LEFT:
+	case ACT_TURN_RIGHT:
+		ys = 360;
+		break;
+	default:			
+		ys = 360;
+		break;
+	}
+
+	pev->yaw_speed = ys;
+}
+
+
+//=========================================================
+// Shoot
+//=========================================================
+void CHAssassin :: Shoot ( void )
+{
+	if (m_hEnemy == NULL)
+	{
+		return;
+	}
+
+	Vector vecShootOrigin = GetGunPosition();
+	Vector vecShootDir = ShootAtEnemy( vecShootOrigin );
+
+	if (m_flLastShot + 2 < gpGlobals->time)
+	{
+		m_flDiviation = 0.10;
+	}
+	else
+	{
+		m_flDiviation -= 0.01;
+		if (m_flDiviation < 0.02)
+			m_flDiviation = 0.02;
+	}
+	m_flLastShot = gpGlobals->time;
+
+	UTIL_MakeVectors ( pev->angles );
+
+	Vector	vecShellVelocity = gpGlobals->v_right * RANDOM_FLOAT(40,90) + gpGlobals->v_up * RANDOM_FLOAT(75,200) + gpGlobals->v_forward * RANDOM_FLOAT(-40, 40);
+	EjectBrass ( pev->origin + gpGlobals->v_up * 32 + gpGlobals->v_forward * 12, vecShellVelocity, pev->angles.y, m_iShell, TE_BOUNCE_SHELL); 
+	FireBullets(1, vecShootOrigin, vecShootDir, Vector( m_flDiviation, m_flDiviation, m_flDiviation ), 2048, BULLET_MONSTER_9MM ); // shoot +-8 degrees
+
+	switch(RANDOM_LONG(0,1))
+	{
+	case 0:
+		EMIT_SOUND(ENT(pev), CHAN_WEAPON, "weapons/pl_gun1.wav", RANDOM_FLOAT(0.6, 0.8), ATTN_NORM);
+		break;
+	case 1:
+		EMIT_SOUND(ENT(pev), CHAN_WEAPON, "weapons/pl_gun2.wav", RANDOM_FLOAT(0.6, 0.8), ATTN_NORM);
+		break;
+	}
+
+	pev->effects |= EF_MUZZLEFLASH;
+
+	Vector angDir = UTIL_VecToAngles( vecShootDir );
+	SetBlending( 0, angDir.x );
+
+	m_cAmmoLoaded--;
+}
+
+
+//=========================================================
+// HandleAnimEvent - catches the monster-specific messages
+// that occur when tagged animation frames are played.
+//
+// Returns number of events handled, 0 if none.
+//=========================================================
+void CHAssassin :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	switch( pEvent->event )
+	{
+	case ASSASSIN_AE_SHOOT1:
+		Shoot( );
+		break;
+	case ASSASSIN_AE_TOSS1:
+		{
+			UTIL_MakeVectors( pev->angles );
+			CGrenade::ShootTimed( pev, pev->origin + gpGlobals->v_forward * 34 + Vector (0, 0, 32), m_vecTossVelocity, 2.0 );
+
+			m_flNextGrenadeCheck = gpGlobals->time + 6;// wait six seconds before even looking again to see if a grenade can be thrown.
+			m_fThrowGrenade = FALSE;
+			// !!!LATER - when in a group, only try to throw grenade if ordered.
+		}
+		break;
+	case ASSASSIN_AE_JUMP:
+		{
+			// ALERT( at_console, "jumping");
+			UTIL_MakeAimVectors( pev->angles );
+			pev->movetype = MOVETYPE_TOSS;
+			pev->flags &= ~FL_ONGROUND;
+			pev->velocity = m_vecJumpVelocity;
+			m_flNextJump = gpGlobals->time + 3.0;
+		}
+		return;
+	default:
+		CBaseMonster::HandleAnimEvent( pEvent );
+		break;
+	}
+}
+
+//=========================================================
+// Spawn
+//=========================================================
+void CHAssassin :: Spawn()
+{
+	Precache( );
+
+	SET_MODEL(ENT(pev), "models/hassassin.mdl");
+	UTIL_SetSize(pev, VEC_HUMAN_HULL_MIN, VEC_HUMAN_HULL_MAX);
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_STEP;
+	m_bloodColor		= BLOOD_COLOR_RED;
+	pev->effects		= 0;
+	pev->health			= gSkillData.hassassinHealth;
+	m_flFieldOfView		= VIEW_FIELD_WIDE; // indicates the width of this monster's forward view cone ( as a dotproduct result )
+	m_MonsterState		= MONSTERSTATE_NONE;
+	m_afCapability		= bits_CAP_MELEE_ATTACK1 | bits_CAP_DOORS_GROUP;
+	pev->friction		= 1;
+
+	m_HackedGunPos		= Vector( 0, 24, 48 );
+
+	m_iTargetRanderamt	= 20;
+	pev->renderamt		= 20;
+	pev->rendermode		= kRenderTransTexture;
+
+	MonsterInit();
+}
+
+//=========================================================
+// Precache - precaches all resources this monster needs
+//=========================================================
+void CHAssassin :: Precache()
+{
+	PRECACHE_MODEL("models/hassassin.mdl");
+
+	PRECACHE_SOUND("weapons/pl_gun1.wav");
+	PRECACHE_SOUND("weapons/pl_gun2.wav");
+
+	PRECACHE_SOUND("debris/beamstart1.wav");
+
+	m_iShell = PRECACHE_MODEL ("models/shell.mdl");// brass shell
+}	
+	
+
+
+//=========================================================
+// AI Schedules Specific to this monster
+//=========================================================
+
+//=========================================================
+// Fail Schedule
+//=========================================================
+Task_t	tlAssassinFail[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE },
+	{ TASK_WAIT_FACE_ENEMY,		(float)2		},
+	// { TASK_WAIT_PVS,			(float)0		},
+	{ TASK_SET_SCHEDULE,		(float)SCHED_CHASE_ENEMY },
+};
+
+Schedule_t	slAssassinFail[] =
+{
+	{
+		tlAssassinFail,
+		ARRAYSIZE ( tlAssassinFail ),
+		bits_COND_LIGHT_DAMAGE		|
+		bits_COND_HEAVY_DAMAGE		|
+		bits_COND_PROVOKED			|
+		bits_COND_CAN_RANGE_ATTACK1 |
+		bits_COND_CAN_RANGE_ATTACK2 |
+		bits_COND_CAN_MELEE_ATTACK1 |
+		bits_COND_HEAR_SOUND,
+	
+		bits_SOUND_DANGER |
+		bits_SOUND_PLAYER,
+		"AssassinFail"
+	},
+};
+
+
+//=========================================================
+// Enemy exposed Agrunt's cover
+//=========================================================
+Task_t	tlAssassinExposed[] =
+{
+	{ TASK_STOP_MOVING,			(float)0							},
+	{ TASK_RANGE_ATTACK1,		(float)0							},
+	{ TASK_SET_FAIL_SCHEDULE,	(float)SCHED_ASSASSIN_JUMP			},
+	{ TASK_SET_SCHEDULE,		(float)SCHED_TAKE_COVER_FROM_ENEMY	},
+};
+
+Schedule_t slAssassinExposed[] =
+{
+	{
+		tlAssassinExposed,
+		ARRAYSIZE ( tlAssassinExposed ),
+		bits_COND_CAN_MELEE_ATTACK1,
+		0,
+		"AssassinExposed",
+	},
+};
+
+
+//=========================================================
+// Take cover from enemy! Tries lateral cover before node 
+// cover! 
+//=========================================================
+Task_t	tlAssassinTakeCoverFromEnemy[] =
+{
+	{ TASK_STOP_MOVING,				(float)0					},
+	{ TASK_WAIT,					(float)0.2					},
+	{ TASK_SET_FAIL_SCHEDULE,		(float)SCHED_RANGE_ATTACK1	},
+	{ TASK_FIND_COVER_FROM_ENEMY,	(float)0					},
+	{ TASK_RUN_PATH,				(float)0					},
+	{ TASK_WAIT_FOR_MOVEMENT,		(float)0					},
+	{ TASK_REMEMBER,				(float)bits_MEMORY_INCOVER	},
+	{ TASK_FACE_ENEMY,				(float)0					},
+};
+
+Schedule_t	slAssassinTakeCoverFromEnemy[] =
+{
+	{ 
+		tlAssassinTakeCoverFromEnemy,
+		ARRAYSIZE ( tlAssassinTakeCoverFromEnemy ), 
+		bits_COND_NEW_ENEMY |
+		bits_COND_CAN_MELEE_ATTACK1		|
+		bits_COND_HEAR_SOUND,
+		
+		bits_SOUND_DANGER,
+		"AssassinTakeCoverFromEnemy"
+	},
+};
+
+
+//=========================================================
+// Take cover from enemy! Tries lateral cover before node 
+// cover! 
+//=========================================================
+Task_t	tlAssassinTakeCoverFromEnemy2[] =
+{
+	{ TASK_STOP_MOVING,				(float)0					},
+	{ TASK_WAIT,					(float)0.2					},
+	{ TASK_FACE_ENEMY,				(float)0					},
+	{ TASK_RANGE_ATTACK1,			(float)0					},
+	{ TASK_SET_FAIL_SCHEDULE,		(float)SCHED_RANGE_ATTACK2	},
+	{ TASK_FIND_FAR_NODE_COVER_FROM_ENEMY,	(float)384			},
+	{ TASK_RUN_PATH,				(float)0					},
+	{ TASK_WAIT_FOR_MOVEMENT,		(float)0					},
+	{ TASK_REMEMBER,				(float)bits_MEMORY_INCOVER	},
+	{ TASK_FACE_ENEMY,				(float)0					},
+};
+
+Schedule_t	slAssassinTakeCoverFromEnemy2[] =
+{
+	{ 
+		tlAssassinTakeCoverFromEnemy2,
+		ARRAYSIZE ( tlAssassinTakeCoverFromEnemy2 ), 
+		bits_COND_NEW_ENEMY |
+		bits_COND_CAN_MELEE_ATTACK2		|
+		bits_COND_HEAR_SOUND,
+		
+		bits_SOUND_DANGER,
+		"AssassinTakeCoverFromEnemy2"
+	},
+};
+
+
+//=========================================================
+// hide from the loudest sound source
+//=========================================================
+Task_t	tlAssassinTakeCoverFromBestSound[] =
+{
+	{ TASK_SET_FAIL_SCHEDULE,			(float)SCHED_MELEE_ATTACK1	},
+	{ TASK_STOP_MOVING,					(float)0					},
+	{ TASK_FIND_COVER_FROM_BEST_SOUND,	(float)0					},
+	{ TASK_RUN_PATH,					(float)0					},
+	{ TASK_WAIT_FOR_MOVEMENT,			(float)0					},
+	{ TASK_REMEMBER,					(float)bits_MEMORY_INCOVER	},
+	{ TASK_TURN_LEFT,					(float)179					},
+};
+
+Schedule_t	slAssassinTakeCoverFromBestSound[] =
+{
+	{ 
+		tlAssassinTakeCoverFromBestSound,
+		ARRAYSIZE ( tlAssassinTakeCoverFromBestSound ), 
+		bits_COND_NEW_ENEMY,
+		0,
+		"AssassinTakeCoverFromBestSound"
+	},
+};
+
+
+
+
+
+//=========================================================
+// AlertIdle Schedules
+//=========================================================
+Task_t	tlAssassinHide[] =
+{
+	{ TASK_STOP_MOVING,			0						 },
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE			 },
+	{ TASK_WAIT,				(float)2				 },
+	{ TASK_SET_SCHEDULE,		(float)SCHED_CHASE_ENEMY },
+};
+
+Schedule_t	slAssassinHide[] =
+{
+	{ 
+		tlAssassinHide,
+		ARRAYSIZE ( tlAssassinHide ), 
+		bits_COND_NEW_ENEMY				|
+		bits_COND_SEE_ENEMY				|
+		bits_COND_SEE_FEAR				|
+		bits_COND_LIGHT_DAMAGE			|
+		bits_COND_HEAVY_DAMAGE			|
+		bits_COND_PROVOKED		|
+		bits_COND_HEAR_SOUND,
+		
+		bits_SOUND_DANGER,
+		"AssassinHide"
+	},
+};
+
+
+
+//=========================================================
+// HUNT Schedules
+//=========================================================
+Task_t tlAssassinHunt[] = 
+{
+	{ TASK_GET_PATH_TO_ENEMY,	(float)0		},
+	{ TASK_RUN_PATH,			(float)0		},
+	{ TASK_WAIT_FOR_MOVEMENT,	(float)0		},
+};
+
+Schedule_t slAssassinHunt[] =
+{
+	{ 
+		tlAssassinHunt,
+		ARRAYSIZE ( tlAssassinHunt ),
+		bits_COND_NEW_ENEMY			|
+		// bits_COND_SEE_ENEMY			|
+		bits_COND_CAN_RANGE_ATTACK1	|
+		bits_COND_HEAR_SOUND,
+		
+		bits_SOUND_DANGER,
+		"AssassinHunt"
+	},
+};
+
+
+//=========================================================
+// Jumping Schedules
+//=========================================================
+Task_t	tlAssassinJump[] =
+{
+	{ TASK_STOP_MOVING,			(float)0		},
+	{ TASK_PLAY_SEQUENCE,		(float)ACT_HOP	},
+	{ TASK_SET_SCHEDULE,		(float)SCHED_ASSASSIN_JUMP_ATTACK },
+};
+
+Schedule_t	slAssassinJump[] =
+{
+	{ 
+		tlAssassinJump,
+		ARRAYSIZE ( tlAssassinJump ), 
+		0, 
+		0, 
+		"AssassinJump"
+	},
+};
+
+
+//=========================================================
+// repel 
+//=========================================================
+Task_t	tlAssassinJumpAttack[] =
+{
+	{ TASK_SET_FAIL_SCHEDULE,	(float)SCHED_ASSASSIN_JUMP_LAND	},
+	// { TASK_SET_ACTIVITY,		(float)ACT_FLY	},
+	{ TASK_ASSASSIN_FALL_TO_GROUND, (float)0		},
+};
+
+
+Schedule_t	slAssassinJumpAttack[] =
+{
+	{ 
+		tlAssassinJumpAttack,
+		ARRAYSIZE ( tlAssassinJumpAttack ), 
+		0, 
+		0,
+		"AssassinJumpAttack"
+	},
+};
+
+
+//=========================================================
+// repel 
+//=========================================================
+Task_t	tlAssassinJumpLand[] =
+{
+	{ TASK_SET_FAIL_SCHEDULE,		(float)SCHED_ASSASSIN_EXPOSED	},
+	// { TASK_SET_FAIL_SCHEDULE,		(float)SCHED_MELEE_ATTACK1	},
+	{ TASK_SET_ACTIVITY,			(float)ACT_IDLE				},
+	{ TASK_REMEMBER,				(float)bits_MEMORY_BADJUMP	},
+	{ TASK_FIND_NODE_COVER_FROM_ENEMY,	(float)0					},
+	{ TASK_RUN_PATH,				(float)0					},
+	{ TASK_FORGET,					(float)bits_MEMORY_BADJUMP	},
+	{ TASK_WAIT_FOR_MOVEMENT,		(float)0					},
+	{ TASK_REMEMBER,				(float)bits_MEMORY_INCOVER	},
+	{ TASK_FACE_ENEMY,				(float)0					},
+	{ TASK_SET_FAIL_SCHEDULE,		(float)SCHED_RANGE_ATTACK1	},
+};
+
+Schedule_t	slAssassinJumpLand[] =
+{
+	{ 
+		tlAssassinJumpLand,
+		ARRAYSIZE ( tlAssassinJumpLand ), 
+		0, 
+		0,
+		"AssassinJumpLand"
+	},
+};
+
+DEFINE_CUSTOM_SCHEDULES( CHAssassin )
+{
+	slAssassinFail,
+	slAssassinExposed,
+	slAssassinTakeCoverFromEnemy,
+	slAssassinTakeCoverFromEnemy2,
+	slAssassinTakeCoverFromBestSound,
+	slAssassinHide,
+	slAssassinHunt,
+	slAssassinJump,
+	slAssassinJumpAttack,
+	slAssassinJumpLand,
+};
+
+IMPLEMENT_CUSTOM_SCHEDULES( CHAssassin, CBaseMonster );
+
+
+//=========================================================
+// CheckMeleeAttack1 - jump like crazy if the enemy gets too close. 
+//=========================================================
+BOOL CHAssassin :: CheckMeleeAttack1 ( float flDot, float flDist )
+{
+	if ( m_flNextJump < gpGlobals->time && (flDist <= 128 || HasMemory( bits_MEMORY_BADJUMP )) && m_hEnemy != NULL )
+	{
+		TraceResult	tr;
+
+		Vector vecDest = pev->origin + Vector( RANDOM_FLOAT( -64, 64), RANDOM_FLOAT( -64, 64 ), 160 );
+
+		UTIL_TraceHull( pev->origin + Vector( 0, 0, 36 ), vecDest + Vector( 0, 0, 36 ), dont_ignore_monsters, human_hull, ENT(pev), &tr);
+
+		if ( tr.fStartSolid || tr.flFraction < 1.0)
+		{
+			return FALSE;
+		}
+
+		float flGravity = g_psv_gravity->value;
+
+		float time = sqrt( 160 / (0.5 * flGravity));
+		float speed = flGravity * time / 160;
+		m_vecJumpVelocity = (vecDest - pev->origin) * speed;
+
+		return TRUE;
+	}
+	return FALSE;
+}
+
+//=========================================================
+// CheckRangeAttack1  - drop a cap in their ass
+//
+//=========================================================
+BOOL CHAssassin :: CheckRangeAttack1 ( float flDot, float flDist )
+{
+	if ( !HasConditions( bits_COND_ENEMY_OCCLUDED ) && flDist > 64 && flDist <= 2048 /* && flDot >= 0.5 */ /* && NoFriendlyFire() */ )
+	{
+		TraceResult	tr;
+
+		Vector vecSrc = GetGunPosition();
+
+		// verify that a bullet fired from the gun will hit the enemy before the world.
+		UTIL_TraceLine( vecSrc, m_hEnemy->BodyTarget(vecSrc), dont_ignore_monsters, ENT(pev), &tr);
+
+		if ( tr.flFraction == 1 || tr.pHit == m_hEnemy->edict() )
+		{
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+//=========================================================
+// CheckRangeAttack2 - toss grenade is enemy gets in the way and is too close. 
+//=========================================================
+BOOL CHAssassin :: CheckRangeAttack2 ( float flDot, float flDist )
+{
+	m_fThrowGrenade = FALSE;
+	if ( !FBitSet ( m_hEnemy->pev->flags, FL_ONGROUND ) )
+	{
+		// don't throw grenades at anything that isn't on the ground!
+		return FALSE;
+	}
+
+	// don't get grenade happy unless the player starts to piss you off
+	if ( m_iFrustration <= 2)
+		return FALSE;
+
+	if ( m_flNextGrenadeCheck < gpGlobals->time && !HasConditions( bits_COND_ENEMY_OCCLUDED ) && flDist <= 512 /* && flDot >= 0.5 */ /* && NoFriendlyFire() */ )
+	{
+		Vector vecToss = VecCheckThrow( pev, GetGunPosition( ), m_hEnemy->Center(), flDist, 0.5 ); // use dist as speed to get there in 1 second
+
+		if ( vecToss != g_vecZero )
+		{
+			m_vecTossVelocity = vecToss;
+
+			// throw a hand grenade
+			m_fThrowGrenade = TRUE;
+
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+
+//=========================================================
+// RunAI
+//=========================================================
+void CHAssassin :: RunAI( void )
+{
+	CBaseMonster :: RunAI();
+
+	// always visible if moving
+	// always visible is not on hard
+	if (g_iSkillLevel != SKILL_HARD || m_hEnemy == NULL || pev->deadflag != DEAD_NO || m_Activity == ACT_RUN || m_Activity == ACT_WALK || !(pev->flags & FL_ONGROUND))
+		m_iTargetRanderamt = 255;
+	else
+		m_iTargetRanderamt = 20;
+
+	if (pev->renderamt > m_iTargetRanderamt)
+	{
+		if (pev->renderamt == 255)
+		{
+			EMIT_SOUND (ENT(pev), CHAN_BODY, "debris/beamstart1.wav", 0.2, ATTN_NORM );
+		}
+
+		pev->renderamt = max( pev->renderamt - 50, m_iTargetRanderamt );
+		pev->rendermode = kRenderTransTexture;
+	}
+	else if (pev->renderamt < m_iTargetRanderamt)
+	{
+		pev->renderamt = min( pev->renderamt + 50, m_iTargetRanderamt );
+		if (pev->renderamt == 255)
+			pev->rendermode = kRenderNormal;
+	}
+
+	if (m_Activity == ACT_RUN || m_Activity == ACT_WALK)
+	{
+		static int iStep = 0;
+		iStep = ! iStep;
+		if (iStep)
+		{
+			switch( RANDOM_LONG( 0, 3 ) )
+			{
+			case 0:	EMIT_SOUND( ENT(pev), CHAN_BODY, "player/pl_step1.wav", 0.5, ATTN_NORM);	break;
+			case 1:	EMIT_SOUND( ENT(pev), CHAN_BODY, "player/pl_step3.wav", 0.5, ATTN_NORM);	break;
+			case 2:	EMIT_SOUND( ENT(pev), CHAN_BODY, "player/pl_step2.wav", 0.5, ATTN_NORM);	break;
+			case 3:	EMIT_SOUND( ENT(pev), CHAN_BODY, "player/pl_step4.wav", 0.5, ATTN_NORM);	break;
+			}
+		}
+	}
+}
+
+
+//=========================================================
+// StartTask
+//=========================================================
+void CHAssassin :: StartTask ( Task_t *pTask )
+{
+	switch ( pTask->iTask )
+	{
+	case TASK_RANGE_ATTACK2:
+		if (!m_fThrowGrenade)
+		{
+			TaskComplete( );
+		}
+		else
+		{
+			CBaseMonster :: StartTask ( pTask );
+		}
+		break;
+	case TASK_ASSASSIN_FALL_TO_GROUND:
+		break;
+	default:
+		CBaseMonster :: StartTask ( pTask );
+		break;
+	}
+}
+
+
+//=========================================================
+// RunTask 
+//=========================================================
+void CHAssassin :: RunTask ( Task_t *pTask )
+{
+	switch ( pTask->iTask )
+	{
+	case TASK_ASSASSIN_FALL_TO_GROUND:
+		MakeIdealYaw( m_vecEnemyLKP );
+		ChangeYaw( pev->yaw_speed );
+
+		if (m_fSequenceFinished)
+		{
+			if (pev->velocity.z > 0)
+			{
+				pev->sequence = LookupSequence( "fly_up" );
+			}
+			else if (HasConditions ( bits_COND_SEE_ENEMY ))
+			{
+				pev->sequence = LookupSequence( "fly_attack" );
+				pev->frame = 0;
+			}
+			else
+			{
+				pev->sequence = LookupSequence( "fly_down" );
+				pev->frame = 0;
+			}
+			
+			ResetSequenceInfo( );
+			SetYawSpeed();
+		}
+		if (pev->flags & FL_ONGROUND)
+		{
+			// ALERT( at_console, "on ground\n");
+			TaskComplete( );
+		}
+		break;
+	default: 
+		CBaseMonster :: RunTask ( pTask );
+		break;
+	}
+}
+
+//=========================================================
+// GetSchedule - Decides which type of schedule best suits
+// the monster's current state and conditions. Then calls
+// monster's member function to get a pointer to a schedule
+// of the proper type.
+//=========================================================
+Schedule_t *CHAssassin :: GetSchedule ( void )
+{
+	switch	( m_MonsterState )
+	{
+	case MONSTERSTATE_IDLE:
+	case MONSTERSTATE_ALERT:
+		{
+			if ( HasConditions ( bits_COND_HEAR_SOUND ))
+			{
+				CSound *pSound;
+				pSound = PBestSound();
+
+				ASSERT( pSound != NULL );
+				if ( pSound && (pSound->m_iType & bits_SOUND_DANGER) )
+				{
+					return GetScheduleOfType( SCHED_TAKE_COVER_FROM_BEST_SOUND );
+				}
+				if ( pSound && (pSound->m_iType & bits_SOUND_COMBAT) )
+				{
+					return GetScheduleOfType( SCHED_INVESTIGATE_SOUND );
+				}
+			}
+		}
+		break;
+
+	case MONSTERSTATE_COMBAT:
+		{
+// dead enemy
+			if ( HasConditions( bits_COND_ENEMY_DEAD ) )
+			{
+				// call base class, all code to handle dead enemies is centralized there.
+				return CBaseMonster :: GetSchedule();
+			}
+
+			// flying?
+			if ( pev->movetype == MOVETYPE_TOSS)
+			{
+				if (pev->flags & FL_ONGROUND)
+				{
+					// ALERT( at_console, "landed\n");
+					// just landed
+					pev->movetype = MOVETYPE_STEP;
+					return GetScheduleOfType ( SCHED_ASSASSIN_JUMP_LAND );
+				}
+				else
+				{
+					// ALERT( at_console, "jump\n");
+					// jump or jump/shoot
+					if ( m_MonsterState == MONSTERSTATE_COMBAT )
+						return GetScheduleOfType ( SCHED_ASSASSIN_JUMP );
+					else
+						return GetScheduleOfType ( SCHED_ASSASSIN_JUMP_ATTACK );
+				}
+			}
+
+			if ( HasConditions ( bits_COND_HEAR_SOUND ))
+			{
+				CSound *pSound;
+				pSound = PBestSound();
+
+				ASSERT( pSound != NULL );
+				if ( pSound && (pSound->m_iType & bits_SOUND_DANGER) )
+				{
+					return GetScheduleOfType( SCHED_TAKE_COVER_FROM_BEST_SOUND );
+				}
+			}
+
+			if ( HasConditions ( bits_COND_LIGHT_DAMAGE ) )
+			{
+				m_iFrustration++;
+			}
+			if ( HasConditions ( bits_COND_HEAVY_DAMAGE ) )
+			{
+				m_iFrustration++;
+			}
+
+		// jump player!
+			if ( HasConditions ( bits_COND_CAN_MELEE_ATTACK1 ) )
+			{
+				// ALERT( at_console, "melee attack 1\n");
+				return GetScheduleOfType ( SCHED_MELEE_ATTACK1 );
+			}
+
+		// throw grenade
+			if ( HasConditions ( bits_COND_CAN_RANGE_ATTACK2 ) )
+			{
+				// ALERT( at_console, "range attack 2\n");
+				return GetScheduleOfType ( SCHED_RANGE_ATTACK2 );
+			}
+
+		// spotted
+			if ( HasConditions ( bits_COND_SEE_ENEMY ) && HasConditions ( bits_COND_ENEMY_FACING_ME ) )
+			{
+				// ALERT( at_console, "exposed\n");
+				m_iFrustration++;
+				return GetScheduleOfType ( SCHED_ASSASSIN_EXPOSED );
+			}
+
+		// can attack
+			if ( HasConditions ( bits_COND_CAN_RANGE_ATTACK1 ) )
+			{
+				// ALERT( at_console, "range attack 1\n");
+				m_iFrustration = 0;
+				return GetScheduleOfType ( SCHED_RANGE_ATTACK1 );
+			}
+
+			if ( HasConditions ( bits_COND_SEE_ENEMY ) )
+			{
+				// ALERT( at_console, "face\n");
+				return GetScheduleOfType ( SCHED_COMBAT_FACE );
+			}
+
+		// new enemy
+			if ( HasConditions ( bits_COND_NEW_ENEMY ) )
+			{
+				// ALERT( at_console, "take cover\n");
+				return GetScheduleOfType ( SCHED_TAKE_COVER_FROM_ENEMY );
+			}
+
+			// ALERT( at_console, "stand\n");
+			return GetScheduleOfType ( SCHED_ALERT_STAND );
+		}
+		break;
+	}
+
+	return CBaseMonster :: GetSchedule();
+}
+
+//=========================================================
+//=========================================================
+Schedule_t* CHAssassin :: GetScheduleOfType ( int Type ) 
+{
+	// ALERT( at_console, "%d\n", m_iFrustration );
+	switch	( Type )
+	{
+	case SCHED_TAKE_COVER_FROM_ENEMY:
+		if (pev->health > 30)
+			return slAssassinTakeCoverFromEnemy;
+		else
+			return slAssassinTakeCoverFromEnemy2;
+	case SCHED_TAKE_COVER_FROM_BEST_SOUND:
+		return slAssassinTakeCoverFromBestSound;
+	case SCHED_ASSASSIN_EXPOSED:
+		return slAssassinExposed;
+	case SCHED_FAIL:
+		if (m_MonsterState == MONSTERSTATE_COMBAT)
+			return slAssassinFail;
+		break;
+	case SCHED_ALERT_STAND:
+		if (m_MonsterState == MONSTERSTATE_COMBAT)
+			return slAssassinHide;
+		break;
+	case SCHED_CHASE_ENEMY:
+		return slAssassinHunt;
+	case SCHED_MELEE_ATTACK1:
+		if (pev->flags & FL_ONGROUND)
+		{
+			if (m_flNextJump > gpGlobals->time)
+			{
+				// can't jump yet, go ahead and fail
+				return slAssassinFail;
+			}
+			else
+			{
+				return slAssassinJump;
+			}
+		}
+		else
+		{
+			return slAssassinJumpAttack;
+		}
+	case SCHED_ASSASSIN_JUMP:
+	case SCHED_ASSASSIN_JUMP_ATTACK:
+		return slAssassinJumpAttack;
+	case SCHED_ASSASSIN_JUMP_LAND:
+		return slAssassinJumpLand;
+	}
+
+	return CBaseMonster :: GetScheduleOfType( Type );
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/headcrab.cpp b/main/source/dlls/headcrab.cpp
new file mode 100644
index 00000000..1a426027
--- /dev/null
+++ b/main/source/dlls/headcrab.cpp
@@ -0,0 +1,555 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// headcrab.cpp - tiny, jumpy alien parasite
+//=========================================================
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"schedule.h"
+#include	"game.h"
+
+//=========================================================
+// Monster's Anim Events Go Here
+//=========================================================
+#define		HC_AE_JUMPATTACK	( 2 )
+
+Task_t	tlHCRangeAttack1[] =
+{
+	{ TASK_STOP_MOVING,			(float)0		},
+	{ TASK_FACE_IDEAL,			(float)0		},
+	{ TASK_RANGE_ATTACK1,		(float)0		},
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE	},
+	{ TASK_FACE_IDEAL,			(float)0		},
+	{ TASK_WAIT_RANDOM,			(float)0.5		},
+};
+
+Schedule_t	slHCRangeAttack1[] =
+{
+	{ 
+		tlHCRangeAttack1,
+		ARRAYSIZE ( tlHCRangeAttack1 ), 
+		bits_COND_ENEMY_OCCLUDED	|
+		bits_COND_NO_AMMO_LOADED,
+		0,
+		"HCRangeAttack1"
+	},
+};
+
+Task_t	tlHCRangeAttack1Fast[] =
+{
+	{ TASK_STOP_MOVING,			(float)0		},
+	{ TASK_FACE_IDEAL,			(float)0		},
+	{ TASK_RANGE_ATTACK1,		(float)0		},
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE	},
+};
+
+Schedule_t	slHCRangeAttack1Fast[] =
+{
+	{ 
+		tlHCRangeAttack1Fast,
+		ARRAYSIZE ( tlHCRangeAttack1Fast ), 
+		bits_COND_ENEMY_OCCLUDED	|
+		bits_COND_NO_AMMO_LOADED,
+		0,
+		"HCRAFast"
+	},
+};
+
+class CHeadCrab : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void RunTask ( Task_t *pTask );
+	void StartTask ( Task_t *pTask );
+	void SetYawSpeed ( void );
+	void EXPORT LeapTouch ( CBaseEntity *pOther );
+	Vector Center( void );
+	Vector BodyTarget( const Vector &posSrc );
+	void PainSound( void );
+	void DeathSound( void );
+	void IdleSound( void );
+	void AlertSound( void );
+	void PrescheduleThink( void );
+	int  Classify ( void );
+	void HandleAnimEvent( MonsterEvent_t *pEvent );
+	BOOL CheckRangeAttack1 ( float flDot, float flDist );
+	BOOL CheckRangeAttack2 ( float flDot, float flDist );
+	int TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType );
+
+	virtual float GetDamageAmount( void ) { return gSkillData.headcrabDmgBite; }
+	virtual int GetVoicePitch( void ) { return 100; }
+	virtual float GetSoundVolue( void ) { return 1.0; }
+	Schedule_t* GetScheduleOfType ( int Type );
+
+	CUSTOM_SCHEDULES;
+
+	static const char *pIdleSounds[];
+	static const char *pAlertSounds[];
+	static const char *pPainSounds[];
+	static const char *pAttackSounds[];
+	static const char *pDeathSounds[];
+	static const char *pBiteSounds[];
+};
+LINK_ENTITY_TO_CLASS( monster_headcrab, CHeadCrab );
+
+DEFINE_CUSTOM_SCHEDULES( CHeadCrab )
+{
+	slHCRangeAttack1,
+	slHCRangeAttack1Fast,
+};
+
+IMPLEMENT_CUSTOM_SCHEDULES( CHeadCrab, CBaseMonster );
+
+const char *CHeadCrab::pIdleSounds[] = 
+{
+	"headcrab/hc_idle1.wav",
+	"headcrab/hc_idle2.wav",
+	"headcrab/hc_idle3.wav",
+};
+const char *CHeadCrab::pAlertSounds[] = 
+{
+	"headcrab/hc_alert1.wav",
+};
+const char *CHeadCrab::pPainSounds[] = 
+{
+	"headcrab/hc_pain1.wav",
+	"headcrab/hc_pain2.wav",
+	"headcrab/hc_pain3.wav",
+};
+const char *CHeadCrab::pAttackSounds[] = 
+{
+	"headcrab/hc_attack1.wav",
+	"headcrab/hc_attack2.wav",
+	"headcrab/hc_attack3.wav",
+};
+
+const char *CHeadCrab::pDeathSounds[] = 
+{
+	"headcrab/hc_die1.wav",
+	"headcrab/hc_die2.wav",
+};
+
+const char *CHeadCrab::pBiteSounds[] = 
+{
+	"headcrab/hc_headbite.wav",
+};
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CHeadCrab :: Classify ( void )
+{
+	return	CLASS_ALIEN_PREY;
+}
+
+//=========================================================
+// Center - returns the real center of the headcrab.  The 
+// bounding box is much larger than the actual creature so 
+// this is needed for targeting
+//=========================================================
+Vector CHeadCrab :: Center ( void )
+{
+	return Vector( pev->origin.x, pev->origin.y, pev->origin.z + 6 );
+}
+
+
+Vector CHeadCrab :: BodyTarget( const Vector &posSrc ) 
+{ 
+	return Center( );
+}
+
+//=========================================================
+// SetYawSpeed - allows each sequence to have a different
+// turn rate associated with it.
+//=========================================================
+void CHeadCrab :: SetYawSpeed ( void )
+{
+	int ys;
+
+	switch ( m_Activity )
+	{
+	case ACT_IDLE:			
+		ys = 30;
+		break;
+	case ACT_RUN:			
+	case ACT_WALK:			
+		ys = 20;
+		break;
+	case ACT_TURN_LEFT:
+	case ACT_TURN_RIGHT:
+		ys = 60;
+		break;
+	case ACT_RANGE_ATTACK1:	
+		ys = 30;
+		break;
+	default:
+		ys = 30;
+		break;
+	}
+
+	pev->yaw_speed = ys;
+}
+
+//=========================================================
+// HandleAnimEvent - catches the monster-specific messages
+// that occur when tagged animation frames are played.
+//=========================================================
+void CHeadCrab :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	switch( pEvent->event )
+	{
+		case HC_AE_JUMPATTACK:
+		{
+			ClearBits( pev->flags, FL_ONGROUND );
+
+			UTIL_SetOrigin (pev, pev->origin + Vector ( 0 , 0 , 1) );// take him off ground so engine doesn't instantly reset onground 
+			UTIL_MakeVectors ( pev->angles );
+
+			Vector vecJumpDir;
+			if (m_hEnemy != NULL)
+			{
+				float gravity = g_psv_gravity->value;
+				if (gravity <= 1)
+					gravity = 1;
+
+				// How fast does the headcrab need to travel to reach that height given gravity?
+				float height = (m_hEnemy->pev->origin.z + m_hEnemy->pev->view_ofs.z - pev->origin.z);
+				if (height < 16)
+					height = 16;
+				float speed = sqrt( 2 * gravity * height );
+				float time = speed / gravity;
+
+				// Scale the sideways velocity to get there at the right time
+				vecJumpDir = (m_hEnemy->pev->origin + m_hEnemy->pev->view_ofs - pev->origin);
+				vecJumpDir = vecJumpDir * ( 1.0 / time );
+
+				// Speed to offset gravity at the desired height
+				vecJumpDir.z = speed;
+
+				// Don't jump too far/fast
+				float distance = vecJumpDir.Length();
+				
+				if (distance > 650)
+				{
+					vecJumpDir = vecJumpDir * ( 650.0 / distance );
+				}
+			}
+			else
+			{
+				// jump hop, don't care where
+				vecJumpDir = Vector( gpGlobals->v_forward.x, gpGlobals->v_forward.y, gpGlobals->v_up.z ) * 350;
+			}
+
+			int iSound = RANDOM_LONG(0,2);
+			if ( iSound != 0 )
+				EMIT_SOUND_DYN( edict(), CHAN_VOICE, pAttackSounds[iSound], GetSoundVolue(), ATTN_IDLE, 0, GetVoicePitch() );
+
+			pev->velocity = vecJumpDir;
+			m_flNextAttack = gpGlobals->time + 2;
+		}
+		break;
+
+		default:
+			CBaseMonster::HandleAnimEvent( pEvent );
+			break;
+	}
+}
+
+//=========================================================
+// Spawn
+//=========================================================
+void CHeadCrab :: Spawn()
+{
+	Precache( );
+
+	SET_MODEL(ENT(pev), "models/headcrab.mdl");
+	UTIL_SetSize(pev, Vector(-12, -12, 0), Vector(12, 12, 24));
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_STEP;
+	m_bloodColor		= BLOOD_COLOR_GREEN;
+	pev->effects		= 0;
+	pev->health			= gSkillData.headcrabHealth;
+	pev->view_ofs		= Vector ( 0, 0, 20 );// position of the eyes relative to monster's origin.
+	pev->yaw_speed		= 5;//!!! should we put this in the monster's changeanim function since turn rates may vary with state/anim?
+	m_flFieldOfView		= 0.5;// indicates the width of this monster's forward view cone ( as a dotproduct result )
+	m_MonsterState		= MONSTERSTATE_NONE;
+
+	MonsterInit();
+}
+
+//=========================================================
+// Precache - precaches all resources this monster needs
+//=========================================================
+void CHeadCrab :: Precache()
+{
+	PRECACHE_SOUND_ARRAY(pIdleSounds);
+	PRECACHE_SOUND_ARRAY(pAlertSounds);
+	PRECACHE_SOUND_ARRAY(pPainSounds);
+	PRECACHE_SOUND_ARRAY(pAttackSounds);
+	PRECACHE_SOUND_ARRAY(pDeathSounds);
+	PRECACHE_SOUND_ARRAY(pBiteSounds);
+
+	PRECACHE_MODEL("models/headcrab.mdl");
+}	
+
+
+//=========================================================
+// RunTask 
+//=========================================================
+void CHeadCrab :: RunTask ( Task_t *pTask )
+{
+	switch ( pTask->iTask )
+	{
+	case TASK_RANGE_ATTACK1:
+	case TASK_RANGE_ATTACK2:
+		{
+			if ( m_fSequenceFinished )
+			{
+				TaskComplete();
+				SetTouch( NULL );
+				m_IdealActivity = ACT_IDLE;
+			}
+			break;
+		}
+	default:
+		{
+			CBaseMonster :: RunTask(pTask);
+		}
+	}
+}
+
+//=========================================================
+// LeapTouch - this is the headcrab's touch function when it
+// is in the air
+//=========================================================
+void CHeadCrab :: LeapTouch ( CBaseEntity *pOther )
+{
+	if ( !pOther->pev->takedamage )
+	{
+		return;
+	}
+
+	if ( pOther->Classify() == Classify() )
+	{
+		return;
+	}
+
+	// Don't hit if back on ground
+	if ( !FBitSet( pev->flags, FL_ONGROUND ) )
+	{
+		EMIT_SOUND_DYN( edict(), CHAN_WEAPON, RANDOM_SOUND_ARRAY(pBiteSounds), GetSoundVolue(), ATTN_IDLE, 0, GetVoicePitch() );
+		
+		pOther->TakeDamage( pev, pev, GetDamageAmount(), DMG_SLASH );
+	}
+
+	SetTouch( NULL );
+}
+
+//=========================================================
+// PrescheduleThink
+//=========================================================
+void CHeadCrab :: PrescheduleThink ( void )
+{
+	// make the crab coo a little bit in combat state
+	if ( m_MonsterState == MONSTERSTATE_COMBAT && RANDOM_FLOAT( 0, 5 ) < 0.1 )
+	{
+		IdleSound();
+	}
+}
+
+void CHeadCrab :: StartTask ( Task_t *pTask )
+{
+	m_iTaskStatus = TASKSTATUS_RUNNING;
+
+	switch ( pTask->iTask )
+	{
+	case TASK_RANGE_ATTACK1:
+		{
+			EMIT_SOUND_DYN( edict(), CHAN_WEAPON, pAttackSounds[0], GetSoundVolue(), ATTN_IDLE, 0, GetVoicePitch() );
+			m_IdealActivity = ACT_RANGE_ATTACK1;
+			SetTouch ( LeapTouch );
+			break;
+		}
+	default:
+		{
+			CBaseMonster :: StartTask( pTask );
+		}
+	}
+}
+
+
+//=========================================================
+// CheckRangeAttack1
+//=========================================================
+BOOL CHeadCrab :: CheckRangeAttack1 ( float flDot, float flDist )
+{
+	if ( FBitSet( pev->flags, FL_ONGROUND ) && flDist <= 256 && flDot >= 0.65 )
+	{
+		return TRUE;
+	}
+	return FALSE;
+}
+
+//=========================================================
+// CheckRangeAttack2
+//=========================================================
+BOOL CHeadCrab :: CheckRangeAttack2 ( float flDot, float flDist )
+{
+	return FALSE;
+	// BUGBUG: Why is this code here?  There is no ACT_RANGE_ATTACK2 animation.  I've disabled it for now.
+#if 0
+	if ( FBitSet( pev->flags, FL_ONGROUND ) && flDist > 64 && flDist <= 256 && flDot >= 0.5 )
+	{
+		return TRUE;
+	}
+	return FALSE;
+#endif
+}
+
+int CHeadCrab :: TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType )
+{
+	// Don't take any acid damage -- BigMomma's mortar is acid
+	if ( bitsDamageType & DMG_ACID )
+		flDamage = 0;
+
+	return CBaseMonster::TakeDamage( pevInflictor, pevAttacker, flDamage, bitsDamageType );
+}
+
+//=========================================================
+// IdleSound
+//=========================================================
+#define CRAB_ATTN_IDLE (float)1.5
+void CHeadCrab :: IdleSound ( void )
+{
+	EMIT_SOUND_DYN( edict(), CHAN_VOICE, RANDOM_SOUND_ARRAY(pIdleSounds), GetSoundVolue(), ATTN_IDLE, 0, GetVoicePitch() );
+}
+
+//=========================================================
+// AlertSound 
+//=========================================================
+void CHeadCrab :: AlertSound ( void )
+{
+	EMIT_SOUND_DYN( edict(), CHAN_VOICE, RANDOM_SOUND_ARRAY(pAlertSounds), GetSoundVolue(), ATTN_IDLE, 0, GetVoicePitch() );
+}
+
+//=========================================================
+// AlertSound 
+//=========================================================
+void CHeadCrab :: PainSound ( void )
+{
+	EMIT_SOUND_DYN( edict(), CHAN_VOICE, RANDOM_SOUND_ARRAY(pPainSounds), GetSoundVolue(), ATTN_IDLE, 0, GetVoicePitch() );
+}
+
+//=========================================================
+// DeathSound 
+//=========================================================
+void CHeadCrab :: DeathSound ( void )
+{
+	EMIT_SOUND_DYN( edict(), CHAN_VOICE, RANDOM_SOUND_ARRAY(pDeathSounds), GetSoundVolue(), ATTN_IDLE, 0, GetVoicePitch() );
+}
+
+Schedule_t* CHeadCrab :: GetScheduleOfType ( int Type )
+{
+	switch	( Type )
+	{
+		case SCHED_RANGE_ATTACK1:
+		{
+			return &slHCRangeAttack1[ 0 ];
+		}
+		break;
+	}
+
+	return CBaseMonster::GetScheduleOfType( Type );
+}
+
+
+class CBabyCrab : public CHeadCrab
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void SetYawSpeed ( void );
+	float GetDamageAmount( void ) { return gSkillData.headcrabDmgBite * 0.3; }
+	BOOL CheckRangeAttack1 ( float flDot, float flDist );
+	Schedule_t* GetScheduleOfType ( int Type );
+	virtual int GetVoicePitch( void ) { return PITCH_NORM + RANDOM_LONG(40,50); }
+	virtual float GetSoundVolue( void ) { return 0.8; }
+};
+LINK_ENTITY_TO_CLASS( monster_babycrab, CBabyCrab );
+
+void CBabyCrab :: Spawn( void )
+{
+	CHeadCrab::Spawn();
+	SET_MODEL(ENT(pev), "models/baby_headcrab.mdl");
+	pev->rendermode = kRenderTransTexture;
+	pev->renderamt = 192;
+	UTIL_SetSize(pev, Vector(-12, -12, 0), Vector(12, 12, 24));
+	
+	pev->health	= gSkillData.headcrabHealth * 0.25;	// less health than full grown
+}
+
+void CBabyCrab :: Precache( void )
+{
+	PRECACHE_MODEL( "models/baby_headcrab.mdl" );
+	CHeadCrab::Precache();
+}
+
+
+void CBabyCrab :: SetYawSpeed ( void )
+{
+	pev->yaw_speed = 120;
+}
+
+
+BOOL CBabyCrab :: CheckRangeAttack1( float flDot, float flDist )
+{
+	if ( pev->flags & FL_ONGROUND )
+	{
+		if ( pev->groundentity && (pev->groundentity->v.flags & (FL_CLIENT|FL_MONSTER)) )
+			return TRUE;
+
+		// A little less accurate, but jump from closer
+		if ( flDist <= 180 && flDot >= 0.55 )
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
+
+Schedule_t* CBabyCrab :: GetScheduleOfType ( int Type )
+{
+	switch( Type )
+	{
+		case SCHED_FAIL:	// If you fail, try to jump!
+			if ( m_hEnemy != NULL )
+				return slHCRangeAttack1Fast;
+		break;
+
+		case SCHED_RANGE_ATTACK1:
+		{
+			return slHCRangeAttack1Fast;
+		}
+		break;
+	}
+
+	return CHeadCrab::GetScheduleOfType( Type );
+}
diff --git a/main/source/dlls/healthkit.cpp b/main/source/dlls/healthkit.cpp
new file mode 100644
index 00000000..645b5765
--- /dev/null
+++ b/main/source/dlls/healthkit.cpp
@@ -0,0 +1,264 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "player.h"
+#include "items.h"
+#include "gamerules.h"
+
+extern int gmsgItemPickup;
+
+class CHealthKit : public CItem
+{
+	void Spawn( void );
+	void Precache( void );
+	BOOL MyTouch( CBasePlayer *pPlayer );
+
+/*
+	virtual int		Save( CSave &save ); 
+	virtual int		Restore( CRestore &restore );
+	
+	static	TYPEDESCRIPTION m_SaveData[];
+*/
+
+};
+
+
+LINK_ENTITY_TO_CLASS( item_healthkit, CHealthKit );
+
+/*
+TYPEDESCRIPTION	CHealthKit::m_SaveData[] = 
+{
+
+};
+
+
+IMPLEMENT_SAVERESTORE( CHealthKit, CItem);
+*/
+
+void CHealthKit :: Spawn( void )
+{
+	Precache( );
+	SET_MODEL(ENT(pev), "models/w_medkit.mdl");
+
+	CItem::Spawn();
+}
+
+void CHealthKit::Precache( void )
+{
+	PRECACHE_MODEL("models/w_medkit.mdl");
+	PRECACHE_SOUND("items/smallmedkit1.wav");
+}
+
+BOOL CHealthKit::MyTouch( CBasePlayer *pPlayer )
+{
+	if ( pPlayer->pev->deadflag != DEAD_NO )
+	{
+		return FALSE;
+	}
+
+	if ( pPlayer->TakeHealth( gSkillData.healthkitCapacity, DMG_GENERIC ) )
+	{
+		MESSAGE_BEGIN( MSG_ONE, gmsgItemPickup, NULL, pPlayer->pev );
+			WRITE_STRING( STRING(pev->classname) );
+		MESSAGE_END();
+
+		EMIT_SOUND(ENT(pPlayer->pev), CHAN_ITEM, "items/smallmedkit1.wav", 1, ATTN_NORM);
+
+		if ( g_pGameRules->ItemShouldRespawn( this ) )
+		{
+			Respawn();
+		}
+		else
+		{
+			UTIL_Remove(this);	
+		}
+
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+
+
+//-------------------------------------------------------------
+// Wall mounted health kit
+//-------------------------------------------------------------
+class CWallHealth : public CBaseToggle
+{
+public:
+	void Spawn( );
+	void Precache( void );
+	void EXPORT Off(void);
+	void EXPORT Recharge(void);
+	void KeyValue( KeyValueData *pkvd );
+	void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	virtual int	ObjectCaps( void ) { return (CBaseToggle :: ObjectCaps() | FCAP_CONTINUOUS_USE) & ~FCAP_ACROSS_TRANSITION; }
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	float m_flNextCharge; 
+	int		m_iReactivate ; // DeathMatch Delay until reactvated
+	int		m_iJuice;
+	int		m_iOn;			// 0 = off, 1 = startup, 2 = going
+	float   m_flSoundTime;
+};
+
+TYPEDESCRIPTION CWallHealth::m_SaveData[] =
+{
+	DEFINE_FIELD( CWallHealth, m_flNextCharge, FIELD_TIME),
+	DEFINE_FIELD( CWallHealth, m_iReactivate, FIELD_INTEGER),
+	DEFINE_FIELD( CWallHealth, m_iJuice, FIELD_INTEGER),
+	DEFINE_FIELD( CWallHealth, m_iOn, FIELD_INTEGER),
+	DEFINE_FIELD( CWallHealth, m_flSoundTime, FIELD_TIME),
+};
+
+IMPLEMENT_SAVERESTORE( CWallHealth, CBaseEntity );
+
+LINK_ENTITY_TO_CLASS(func_healthcharger, CWallHealth);
+
+
+void CWallHealth::KeyValue( KeyValueData *pkvd )
+{
+	if (	FStrEq(pkvd->szKeyName, "style") ||
+				FStrEq(pkvd->szKeyName, "height") ||
+				FStrEq(pkvd->szKeyName, "value1") ||
+				FStrEq(pkvd->szKeyName, "value2") ||
+				FStrEq(pkvd->szKeyName, "value3"))
+	{
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "dmdelay"))
+	{
+		m_iReactivate = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseToggle::KeyValue( pkvd );
+}
+
+void CWallHealth::Spawn()
+{
+	Precache( );
+
+	pev->solid		= SOLID_BSP;
+	pev->movetype	= MOVETYPE_PUSH;
+
+	UTIL_SetOrigin(pev, pev->origin);		// set size and link into world
+	UTIL_SetSize(pev, pev->mins, pev->maxs);
+	SET_MODEL(ENT(pev), STRING(pev->model) );
+	m_iJuice = gSkillData.healthchargerCapacity;
+	pev->frame = 0;			
+
+}
+
+void CWallHealth::Precache()
+{
+	PRECACHE_SOUND("items/medshot4.wav");
+	PRECACHE_SOUND("items/medshotno1.wav");
+	PRECACHE_SOUND("items/medcharge4.wav");
+}
+
+
+void CWallHealth::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{ 
+	// Make sure that we have a caller
+	if (!pActivator)
+		return;
+	// if it's not a player, ignore
+	if ( !pActivator->IsPlayer() )
+		return;
+
+	// if there is no juice left, turn it off
+	if (m_iJuice <= 0)
+	{
+		pev->frame = 1;			
+		Off();
+	}
+
+	// if the player doesn't have the suit, or there is no juice left, make the deny noise
+	if ((m_iJuice <= 0) || (!(pActivator->pev->weapons & (1<<WEAPON_SUIT))))
+	{
+		if (m_flSoundTime <= gpGlobals->time)
+		{
+			m_flSoundTime = gpGlobals->time + 0.62;
+			EMIT_SOUND(ENT(pev), CHAN_ITEM, "items/medshotno1.wav", 1.0, ATTN_NORM );
+		}
+		return;
+	}
+
+	pev->nextthink = pev->ltime + 0.25;
+	SetThink(&CWallHealth::Off);
+
+	// Time to recharge yet?
+
+	if (m_flNextCharge >= gpGlobals->time)
+		return;
+
+	// Play the on sound or the looping charging sound
+	if (!m_iOn)
+	{
+		m_iOn++;
+		EMIT_SOUND(ENT(pev), CHAN_ITEM, "items/medshot4.wav", 1.0, ATTN_NORM );
+		m_flSoundTime = 0.56 + gpGlobals->time;
+	}
+	if ((m_iOn == 1) && (m_flSoundTime <= gpGlobals->time))
+	{
+		m_iOn++;
+		EMIT_SOUND(ENT(pev), CHAN_STATIC, "items/medcharge4.wav", 1.0, ATTN_NORM );
+	}
+
+
+	// charge the player
+	if ( pActivator->TakeHealth( 1, DMG_GENERIC ) )
+	{
+		m_iJuice--;
+	}
+
+	// govern the rate of charge
+	m_flNextCharge = gpGlobals->time + 0.1;
+}
+
+void CWallHealth::Recharge(void)
+{
+		EMIT_SOUND(ENT(pev), CHAN_ITEM, "items/medshot4.wav", 1.0, ATTN_NORM );
+	m_iJuice = gSkillData.healthchargerCapacity;
+	pev->frame = 0;			
+	SetThink( &CWallHealth::SUB_DoNothing );
+}
+
+void CWallHealth::Off(void)
+{
+	// Stop looping sound.
+	if (m_iOn > 1)
+		STOP_SOUND( ENT(pev), CHAN_STATIC, "items/medcharge4.wav" );
+
+	m_iOn = 0;
+
+	if ((!m_iJuice) &&  ( ( m_iReactivate = g_pGameRules->FlHealthChargerRechargeTime() ) > 0) )
+	{
+		pev->nextthink = pev->ltime + m_iReactivate;
+		SetThink(&CWallHealth::Recharge);
+	}
+	else
+		SetThink( &CWallHealth::SUB_DoNothing );
+}
\ No newline at end of file
diff --git a/main/source/dlls/hgrunt.cpp b/main/source/dlls/hgrunt.cpp
new file mode 100644
index 00000000..38867823
--- /dev/null
+++ b/main/source/dlls/hgrunt.cpp
@@ -0,0 +1,2517 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// hgrunt
+//=========================================================
+
+//=========================================================
+// Hit groups!	
+//=========================================================
+/*
+
+  1 - Head
+  2 - Stomach
+  3 - Gun
+
+*/
+
+
+#include	"extdll.h"
+#include	"plane.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"schedule.h"
+#include	"animation.h"
+#include	"squadmonster.h"
+#include	"weapons.h"
+#include	"talkmonster.h"
+#include	"soundent.h"
+#include	"effects.h"
+#include	"customentity.h"
+
+int g_fGruntQuestion;				// true if an idle grunt asked a question. Cleared when someone answers.
+
+extern DLL_GLOBAL int		g_iSkillLevel;
+
+//=========================================================
+// monster-specific DEFINE's
+//=========================================================
+#define	GRUNT_CLIP_SIZE					36 // how many bullets in a clip? - NOTE: 3 round burst sound, so keep as 3 * x!
+#define GRUNT_VOL						0.35		// volume of grunt sounds
+#define GRUNT_ATTN						ATTN_NORM	// attenutation of grunt sentences
+#define HGRUNT_LIMP_HEALTH				20
+#define HGRUNT_DMG_HEADSHOT				( DMG_BULLET | DMG_CLUB )	// damage types that can kill a grunt with a single headshot.
+#define HGRUNT_NUM_HEADS				2 // how many grunt heads are there? 
+#define HGRUNT_MINIMUM_HEADSHOT_DAMAGE	15 // must do at least this much damage in one shot to head to score a headshot kill
+#define	HGRUNT_SENTENCE_VOLUME			(float)0.35 // volume of grunt sentences
+
+#define HGRUNT_9MMAR				( 1 << 0)
+#define HGRUNT_HANDGRENADE			( 1 << 1)
+#define HGRUNT_GRENADELAUNCHER		( 1 << 2)
+#define HGRUNT_SHOTGUN				( 1 << 3)
+
+#define HEAD_GROUP					1
+#define HEAD_GRUNT					0
+#define HEAD_COMMANDER				1
+#define HEAD_SHOTGUN				2
+#define HEAD_M203					3
+#define GUN_GROUP					2
+#define GUN_MP5						0
+#define GUN_SHOTGUN					1
+#define GUN_NONE					2
+
+//=========================================================
+// Monster's Anim Events Go Here
+//=========================================================
+#define		HGRUNT_AE_RELOAD		( 2 )
+#define		HGRUNT_AE_KICK			( 3 )
+#define		HGRUNT_AE_BURST1		( 4 )
+#define		HGRUNT_AE_BURST2		( 5 ) 
+#define		HGRUNT_AE_BURST3		( 6 ) 
+#define		HGRUNT_AE_GREN_TOSS		( 7 )
+#define		HGRUNT_AE_GREN_LAUNCH	( 8 )
+#define		HGRUNT_AE_GREN_DROP		( 9 )
+#define		HGRUNT_AE_CAUGHT_ENEMY	( 10) // grunt established sight with an enemy (player only) that had previously eluded the squad.
+#define		HGRUNT_AE_DROP_GUN		( 11) // grunt (probably dead) is dropping his mp5.
+
+//=========================================================
+// monster-specific schedule types
+//=========================================================
+enum
+{
+	SCHED_GRUNT_SUPPRESS = LAST_COMMON_SCHEDULE + 1,
+	SCHED_GRUNT_ESTABLISH_LINE_OF_FIRE,// move to a location to set up an attack against the enemy. (usually when a friendly is in the way).
+	SCHED_GRUNT_COVER_AND_RELOAD,
+	SCHED_GRUNT_SWEEP,
+	SCHED_GRUNT_FOUND_ENEMY,
+	SCHED_GRUNT_REPEL,
+	SCHED_GRUNT_REPEL_ATTACK,
+	SCHED_GRUNT_REPEL_LAND,
+	SCHED_GRUNT_WAIT_FACE_ENEMY,
+	SCHED_GRUNT_TAKECOVER_FAILED,// special schedule type that forces analysis of conditions and picks the best possible schedule to recover from this type of failure.
+	SCHED_GRUNT_ELOF_FAIL,
+};
+
+//=========================================================
+// monster-specific tasks
+//=========================================================
+enum 
+{
+	TASK_GRUNT_FACE_TOSS_DIR = LAST_COMMON_TASK + 1,
+	TASK_GRUNT_SPEAK_SENTENCE,
+	TASK_GRUNT_CHECK_FIRE,
+};
+
+//=========================================================
+// monster-specific conditions
+//=========================================================
+#define bits_COND_GRUNT_NOFIRE	( bits_COND_SPECIAL1 )
+
+class CHGrunt : public CSquadMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void SetYawSpeed ( void );
+	int  Classify ( void );
+	int ISoundMask ( void );
+	void HandleAnimEvent( MonsterEvent_t *pEvent );
+	BOOL FCanCheckAttacks ( void );
+	BOOL CheckMeleeAttack1 ( float flDot, float flDist );
+	BOOL CheckRangeAttack1 ( float flDot, float flDist );
+	BOOL CheckRangeAttack2 ( float flDot, float flDist );
+	void CheckAmmo ( void );
+	void SetActivity ( Activity NewActivity );
+	void StartTask ( Task_t *pTask );
+	void RunTask ( Task_t *pTask );
+	void DeathSound( void );
+	void PainSound( void );
+	void IdleSound ( void );
+	Vector GetGunPosition( void );
+	void Shoot ( void );
+	void Shotgun ( void );
+	void PrescheduleThink ( void );
+	void GibMonster( void );
+	void SpeakSentence( void );
+
+	int	Save( CSave &save ); 
+	int Restore( CRestore &restore );
+	
+	CBaseEntity	*Kick( void );
+	Schedule_t	*GetSchedule( void );
+	Schedule_t  *GetScheduleOfType ( int Type );
+	void TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType);
+	int TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType );
+
+	int IRelationship ( CBaseEntity *pTarget );
+
+	BOOL FOkToSpeak( void );
+	void JustSpoke( void );
+
+	CUSTOM_SCHEDULES;
+	static TYPEDESCRIPTION m_SaveData[];
+
+	// checking the feasibility of a grenade toss is kind of costly, so we do it every couple of seconds,
+	// not every server frame.
+	float m_flNextGrenadeCheck;
+	float m_flNextPainTime;
+	float m_flLastEnemySightTime;
+
+	Vector	m_vecTossVelocity;
+
+	BOOL	m_fThrowGrenade;
+	BOOL	m_fStanding;
+	BOOL	m_fFirstEncounter;// only put on the handsign show in the squad's first encounter.
+	int		m_cClipSize;
+
+	int m_voicePitch;
+
+	int		m_iBrassShell;
+	int		m_iShotgunShell;
+
+	int		m_iSentence;
+
+	static const char *pGruntSentences[];
+};
+
+LINK_ENTITY_TO_CLASS( monster_human_grunt, CHGrunt );
+
+TYPEDESCRIPTION	CHGrunt::m_SaveData[] = 
+{
+	DEFINE_FIELD( CHGrunt, m_flNextGrenadeCheck, FIELD_TIME ),
+	DEFINE_FIELD( CHGrunt, m_flNextPainTime, FIELD_TIME ),
+//	DEFINE_FIELD( CHGrunt, m_flLastEnemySightTime, FIELD_TIME ), // don't save, go to zero
+	DEFINE_FIELD( CHGrunt, m_vecTossVelocity, FIELD_VECTOR ),
+	DEFINE_FIELD( CHGrunt, m_fThrowGrenade, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CHGrunt, m_fStanding, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CHGrunt, m_fFirstEncounter, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CHGrunt, m_cClipSize, FIELD_INTEGER ),
+	DEFINE_FIELD( CHGrunt, m_voicePitch, FIELD_INTEGER ),
+//  DEFINE_FIELD( CShotgun, m_iBrassShell, FIELD_INTEGER ),
+//  DEFINE_FIELD( CShotgun, m_iShotgunShell, FIELD_INTEGER ),
+	DEFINE_FIELD( CHGrunt, m_iSentence, FIELD_INTEGER ),
+};
+
+IMPLEMENT_SAVERESTORE( CHGrunt, CSquadMonster );
+
+const char *CHGrunt::pGruntSentences[] = 
+{
+	"HG_GREN", // grenade scared grunt
+	"HG_ALERT", // sees player
+	"HG_MONSTER", // sees monster
+	"HG_COVER", // running to cover
+	"HG_THROW", // about to throw grenade
+	"HG_CHARGE",  // running out to get the enemy
+	"HG_TAUNT", // say rude things
+};
+
+enum
+{
+	HGRUNT_SENT_NONE = -1,
+	HGRUNT_SENT_GREN = 0,
+	HGRUNT_SENT_ALERT,
+	HGRUNT_SENT_MONSTER,
+	HGRUNT_SENT_COVER,
+	HGRUNT_SENT_THROW,
+	HGRUNT_SENT_CHARGE,
+	HGRUNT_SENT_TAUNT,
+} HGRUNT_SENTENCE_TYPES;
+
+//=========================================================
+// Speak Sentence - say your cued up sentence.
+//
+// Some grunt sentences (take cover and charge) rely on actually
+// being able to execute the intended action. It's really lame
+// when a grunt says 'COVER ME' and then doesn't move. The problem
+// is that the sentences were played when the decision to TRY
+// to move to cover was made. Now the sentence is played after 
+// we know for sure that there is a valid path. The schedule
+// may still fail but in most cases, well after the grunt has 
+// started moving.
+//=========================================================
+void CHGrunt :: SpeakSentence( void )
+{
+	if ( m_iSentence == HGRUNT_SENT_NONE )
+	{
+		// no sentence cued up.
+		return; 
+	}
+
+	if (FOkToSpeak())
+	{
+		SENTENCEG_PlayRndSz( ENT(pev), pGruntSentences[ m_iSentence ], HGRUNT_SENTENCE_VOLUME, GRUNT_ATTN, 0, m_voicePitch);
+		JustSpoke();
+	}
+}
+
+//=========================================================
+// IRelationship - overridden because Alien Grunts are 
+// Human Grunt's nemesis.
+//=========================================================
+int CHGrunt::IRelationship ( CBaseEntity *pTarget )
+{
+	if ( FClassnameIs( pTarget->pev, "monster_alien_grunt" ) || ( FClassnameIs( pTarget->pev,  "monster_gargantua" ) ) )
+	{
+		return R_NM;
+	}
+
+	return CSquadMonster::IRelationship( pTarget );
+}
+
+//=========================================================
+// GibMonster - make gun fly through the air.
+//=========================================================
+void CHGrunt :: GibMonster ( void )
+{
+	Vector	vecGunPos;
+	Vector	vecGunAngles;
+
+	if ( GetBodygroup( 2 ) != 2 )
+	{// throw a gun if the grunt has one
+		GetAttachment( 0, vecGunPos, vecGunAngles );
+		
+		CBaseEntity *pGun;
+		if (FBitSet( pev->weapons, HGRUNT_SHOTGUN ))
+		{
+			pGun = DropItem( "weapon_shotgun", vecGunPos, vecGunAngles );
+		}
+		else
+		{
+			pGun = DropItem( "weapon_9mmAR", vecGunPos, vecGunAngles );
+		}
+		if ( pGun )
+		{
+			pGun->pev->velocity = Vector (RANDOM_FLOAT(-100,100), RANDOM_FLOAT(-100,100), RANDOM_FLOAT(200,300));
+			pGun->pev->avelocity = Vector ( (float)0, (float)RANDOM_FLOAT( 200, 400 ), (float)0 );
+		}
+	
+		if (FBitSet( pev->weapons, HGRUNT_GRENADELAUNCHER ))
+		{
+			pGun = DropItem( "ammo_ARgrenades", vecGunPos, vecGunAngles );
+			if ( pGun )
+			{
+				pGun->pev->velocity = Vector (RANDOM_FLOAT(-100,100), RANDOM_FLOAT(-100,100), RANDOM_FLOAT(200,300));
+				pGun->pev->avelocity = Vector ( (float)0, (float)RANDOM_FLOAT( 200, 400 ), (float)0 );
+			}
+		}
+	}
+
+	CBaseMonster :: GibMonster();
+}
+
+//=========================================================
+// ISoundMask - Overidden for human grunts because they 
+// hear the DANGER sound that is made by hand grenades and
+// other dangerous items.
+//=========================================================
+int CHGrunt :: ISoundMask ( void )
+{
+	return	bits_SOUND_WORLD	|
+			bits_SOUND_COMBAT	|
+			bits_SOUND_PLAYER	|
+			bits_SOUND_DANGER;
+}
+
+//=========================================================
+// someone else is talking - don't speak
+//=========================================================
+BOOL CHGrunt :: FOkToSpeak( void )
+{
+// if someone else is talking, don't speak
+	if (gpGlobals->time <= CTalkMonster::g_talkWaitTime)
+		return FALSE;
+
+	if ( pev->spawnflags & SF_MONSTER_GAG )
+	{
+		if ( m_MonsterState != MONSTERSTATE_COMBAT )
+		{
+			// no talking outside of combat if gagged.
+			return FALSE;
+		}
+	}
+
+	// if player is not in pvs, don't speak
+//	if (FNullEnt(FIND_CLIENT_IN_PVS(edict())))
+//		return FALSE;
+	
+	return TRUE;
+}
+
+//=========================================================
+//=========================================================
+void CHGrunt :: JustSpoke( void )
+{
+	CTalkMonster::g_talkWaitTime = gpGlobals->time + RANDOM_FLOAT(1.5, 2.0);
+	m_iSentence = HGRUNT_SENT_NONE;
+}
+
+//=========================================================
+// PrescheduleThink - this function runs after conditions
+// are collected and before scheduling code is run.
+//=========================================================
+void CHGrunt :: PrescheduleThink ( void )
+{
+	if ( InSquad() && m_hEnemy != NULL )
+	{
+		if ( HasConditions ( bits_COND_SEE_ENEMY ) )
+		{
+			// update the squad's last enemy sighting time.
+			MySquadLeader()->m_flLastEnemySightTime = gpGlobals->time;
+		}
+		else
+		{
+			if ( gpGlobals->time - MySquadLeader()->m_flLastEnemySightTime > 5 )
+			{
+				// been a while since we've seen the enemy
+				MySquadLeader()->m_fEnemyEluded = TRUE;
+			}
+		}
+	}
+}
+
+//=========================================================
+// FCanCheckAttacks - this is overridden for human grunts
+// because they can throw/shoot grenades when they can't see their
+// target and the base class doesn't check attacks if the monster
+// cannot see its enemy.
+//
+// !!!BUGBUG - this gets called before a 3-round burst is fired
+// which means that a friendly can still be hit with up to 2 rounds. 
+// ALSO, grenades will not be tossed if there is a friendly in front,
+// this is a bad bug. Friendly machine gun fire avoidance
+// will unecessarily prevent the throwing of a grenade as well.
+//=========================================================
+BOOL CHGrunt :: FCanCheckAttacks ( void )
+{
+	if ( !HasConditions( bits_COND_ENEMY_TOOFAR ) )
+	{
+		return TRUE;
+	}
+	else
+	{
+		return FALSE;
+	}
+}
+
+
+//=========================================================
+// CheckMeleeAttack1
+//=========================================================
+BOOL CHGrunt :: CheckMeleeAttack1 ( float flDot, float flDist )
+{
+	CBaseMonster *pEnemy;
+
+	if ( m_hEnemy != NULL )
+	{
+		pEnemy = m_hEnemy->MyMonsterPointer();
+
+		if ( !pEnemy )
+		{
+			return FALSE;
+		}
+	}
+
+	if ( flDist <= 64 && flDot >= 0.7	&& 
+		 pEnemy->Classify() != CLASS_ALIEN_BIOWEAPON &&
+		 pEnemy->Classify() != CLASS_PLAYER_BIOWEAPON )
+	{
+		return TRUE;
+	}
+	return FALSE;
+}
+
+//=========================================================
+// CheckRangeAttack1 - overridden for HGrunt, cause 
+// FCanCheckAttacks() doesn't disqualify all attacks based
+// on whether or not the enemy is occluded because unlike
+// the base class, the HGrunt can attack when the enemy is
+// occluded (throw grenade over wall, etc). We must 
+// disqualify the machine gun attack if the enemy is occluded.
+//=========================================================
+BOOL CHGrunt :: CheckRangeAttack1 ( float flDot, float flDist )
+{
+	if ( !HasConditions( bits_COND_ENEMY_OCCLUDED ) && flDist <= 2048 && flDot >= 0.5 && NoFriendlyFire() )
+	{
+		TraceResult	tr;
+
+		if ( !m_hEnemy->IsPlayer() && flDist <= 64 )
+		{
+			// kick nonclients, but don't shoot at them.
+			return FALSE;
+		}
+
+		Vector vecSrc = GetGunPosition();
+
+		// verify that a bullet fired from the gun will hit the enemy before the world.
+		UTIL_TraceLine( vecSrc, m_hEnemy->BodyTarget(vecSrc), ignore_monsters, ignore_glass, ENT(pev), &tr);
+
+		if ( tr.flFraction == 1.0 )
+		{
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+//=========================================================
+// CheckRangeAttack2 - this checks the Grunt's grenade
+// attack. 
+//=========================================================
+BOOL CHGrunt :: CheckRangeAttack2 ( float flDot, float flDist )
+{
+	if (! FBitSet(pev->weapons, (HGRUNT_HANDGRENADE | HGRUNT_GRENADELAUNCHER)))
+	{
+		return FALSE;
+	}
+	
+	// if the grunt isn't moving, it's ok to check.
+	if ( m_flGroundSpeed != 0 )
+	{
+		m_fThrowGrenade = FALSE;
+		return m_fThrowGrenade;
+	}
+
+	// assume things haven't changed too much since last time
+	if (gpGlobals->time < m_flNextGrenadeCheck )
+	{
+		return m_fThrowGrenade;
+	}
+
+	if ( !FBitSet ( m_hEnemy->pev->flags, FL_ONGROUND ) && m_hEnemy->pev->waterlevel == 0 && m_vecEnemyLKP.z > pev->absmax.z  )
+	{
+		//!!!BUGBUG - we should make this check movetype and make sure it isn't FLY? Players who jump a lot are unlikely to 
+		// be grenaded.
+		// don't throw grenades at anything that isn't on the ground!
+		m_fThrowGrenade = FALSE;
+		return m_fThrowGrenade;
+	}
+	
+	Vector vecTarget;
+
+	if (FBitSet( pev->weapons, HGRUNT_HANDGRENADE))
+	{
+		// find feet
+		if (RANDOM_LONG(0,1))
+		{
+			// magically know where they are
+			vecTarget = Vector( m_hEnemy->pev->origin.x, m_hEnemy->pev->origin.y, m_hEnemy->pev->absmin.z );
+		}
+		else
+		{
+			// toss it to where you last saw them
+			vecTarget = m_vecEnemyLKP;
+		}
+		// vecTarget = m_vecEnemyLKP + (m_hEnemy->BodyTarget( pev->origin ) - m_hEnemy->pev->origin);
+		// estimate position
+		// vecTarget = vecTarget + m_hEnemy->pev->velocity * 2;
+	}
+	else
+	{
+		// find target
+		// vecTarget = m_hEnemy->BodyTarget( pev->origin );
+		vecTarget = m_vecEnemyLKP + (m_hEnemy->BodyTarget( pev->origin ) - m_hEnemy->pev->origin);
+		// estimate position
+		if (HasConditions( bits_COND_SEE_ENEMY))
+			vecTarget = vecTarget + ((vecTarget - pev->origin).Length() / gSkillData.hgruntGrenadeSpeed) * m_hEnemy->pev->velocity;
+	}
+
+	// are any of my squad members near the intended grenade impact area?
+	if ( InSquad() )
+	{
+		if (SquadMemberInRange( vecTarget, 256 ))
+		{
+			// crap, I might blow my own guy up. Don't throw a grenade and don't check again for a while.
+			m_flNextGrenadeCheck = gpGlobals->time + 1; // one full second.
+			m_fThrowGrenade = FALSE;
+		}
+	}
+	
+	if ( ( vecTarget - pev->origin ).Length2D() <= 256 )
+	{
+		// crap, I don't want to blow myself up
+		m_flNextGrenadeCheck = gpGlobals->time + 1; // one full second.
+		m_fThrowGrenade = FALSE;
+		return m_fThrowGrenade;
+	}
+
+		
+	if (FBitSet( pev->weapons, HGRUNT_HANDGRENADE))
+	{
+		Vector vecToss = VecCheckToss( pev, GetGunPosition(), vecTarget, 0.5 );
+
+		if ( vecToss != g_vecZero )
+		{
+			m_vecTossVelocity = vecToss;
+
+			// throw a hand grenade
+			m_fThrowGrenade = TRUE;
+			// don't check again for a while.
+			m_flNextGrenadeCheck = gpGlobals->time; // 1/3 second.
+		}
+		else
+		{
+			// don't throw
+			m_fThrowGrenade = FALSE;
+			// don't check again for a while.
+			m_flNextGrenadeCheck = gpGlobals->time + 1; // one full second.
+		}
+	}
+	else
+	{
+		Vector vecToss = VecCheckThrow( pev, GetGunPosition(), vecTarget, gSkillData.hgruntGrenadeSpeed, 0.5 );
+
+		if ( vecToss != g_vecZero )
+		{
+			m_vecTossVelocity = vecToss;
+
+			// throw a hand grenade
+			m_fThrowGrenade = TRUE;
+			// don't check again for a while.
+			m_flNextGrenadeCheck = gpGlobals->time + 0.3; // 1/3 second.
+		}
+		else
+		{
+			// don't throw
+			m_fThrowGrenade = FALSE;
+			// don't check again for a while.
+			m_flNextGrenadeCheck = gpGlobals->time + 1; // one full second.
+		}
+	}
+
+	
+
+	return m_fThrowGrenade;
+}
+
+
+//=========================================================
+// TraceAttack - make sure we're not taking it in the helmet
+//=========================================================
+void CHGrunt :: TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType)
+{
+	// check for helmet shot
+	if (ptr->iHitgroup == 11)
+	{
+		// make sure we're wearing one
+		if (GetBodygroup( 1 ) == HEAD_GRUNT && (bitsDamageType & (DMG_BULLET | DMG_SLASH | DMG_BLAST | DMG_CLUB)))
+		{
+			// absorb damage
+			flDamage -= 20;
+			if (flDamage <= 0)
+			{
+				UTIL_Ricochet( ptr->vecEndPos, 1.0 );
+				flDamage = 0.01;
+			}
+		}
+		// it's head shot anyways
+		ptr->iHitgroup = HITGROUP_HEAD;
+	}
+	CSquadMonster::TraceAttack( pevAttacker, flDamage, vecDir, ptr, bitsDamageType );
+}
+
+
+//=========================================================
+// TakeDamage - overridden for the grunt because the grunt
+// needs to forget that he is in cover if he's hurt. (Obviously
+// not in a safe place anymore).
+//=========================================================
+int CHGrunt :: TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType )
+{
+	Forget( bits_MEMORY_INCOVER );
+
+	return CSquadMonster :: TakeDamage ( pevInflictor, pevAttacker, flDamage, bitsDamageType );
+}
+
+//=========================================================
+// SetYawSpeed - allows each sequence to have a different
+// turn rate associated with it.
+//=========================================================
+void CHGrunt :: SetYawSpeed ( void )
+{
+	int ys;
+
+	switch ( m_Activity )
+	{
+	case ACT_IDLE:	
+		ys = 150;		
+		break;
+	case ACT_RUN:	
+		ys = 150;	
+		break;
+	case ACT_WALK:	
+		ys = 180;		
+		break;
+	case ACT_RANGE_ATTACK1:	
+		ys = 120;	
+		break;
+	case ACT_RANGE_ATTACK2:	
+		ys = 120;	
+		break;
+	case ACT_MELEE_ATTACK1:	
+		ys = 120;	
+		break;
+	case ACT_MELEE_ATTACK2:	
+		ys = 120;	
+		break;
+	case ACT_TURN_LEFT:
+	case ACT_TURN_RIGHT:	
+		ys = 180;
+		break;
+	case ACT_GLIDE:
+	case ACT_FLY:
+		ys = 30;
+		break;
+	default:
+		ys = 90;
+		break;
+	}
+
+	pev->yaw_speed = ys;
+}
+
+void CHGrunt :: IdleSound( void )
+{
+	if (FOkToSpeak() && (g_fGruntQuestion || RANDOM_LONG(0,1)))
+	{
+		if (!g_fGruntQuestion)
+		{
+			// ask question or make statement
+			switch (RANDOM_LONG(0,2))
+			{
+			case 0: // check in
+				SENTENCEG_PlayRndSz(ENT(pev), "HG_CHECK", HGRUNT_SENTENCE_VOLUME, ATTN_NORM, 0, m_voicePitch);
+				g_fGruntQuestion = 1;
+				break;
+			case 1: // question
+				SENTENCEG_PlayRndSz(ENT(pev), "HG_QUEST", HGRUNT_SENTENCE_VOLUME, ATTN_NORM, 0, m_voicePitch);
+				g_fGruntQuestion = 2;
+				break;
+			case 2: // statement
+				SENTENCEG_PlayRndSz(ENT(pev), "HG_IDLE", HGRUNT_SENTENCE_VOLUME, ATTN_NORM, 0, m_voicePitch);
+				break;
+			}
+		}
+		else
+		{
+			switch (g_fGruntQuestion)
+			{
+			case 1: // check in
+				SENTENCEG_PlayRndSz(ENT(pev), "HG_CLEAR", HGRUNT_SENTENCE_VOLUME, ATTN_NORM, 0, m_voicePitch);
+				break;
+			case 2: // question 
+				SENTENCEG_PlayRndSz(ENT(pev), "HG_ANSWER", HGRUNT_SENTENCE_VOLUME, ATTN_NORM, 0, m_voicePitch);
+				break;
+			}
+			g_fGruntQuestion = 0;
+		}
+		JustSpoke();
+	}
+}
+
+//=========================================================
+// CheckAmmo - overridden for the grunt because he actually
+// uses ammo! (base class doesn't)
+//=========================================================
+void CHGrunt :: CheckAmmo ( void )
+{
+	if ( m_cAmmoLoaded <= 0 )
+	{
+		SetConditions(bits_COND_NO_AMMO_LOADED);
+	}
+}
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CHGrunt :: Classify ( void )
+{
+	return	CLASS_HUMAN_MILITARY;
+}
+
+//=========================================================
+//=========================================================
+CBaseEntity *CHGrunt :: Kick( void )
+{
+	TraceResult tr;
+
+	UTIL_MakeVectors( pev->angles );
+	Vector vecStart = pev->origin;
+	vecStart.z += pev->size.z * 0.5;
+	Vector vecEnd = vecStart + (gpGlobals->v_forward * 70);
+
+	UTIL_TraceHull( vecStart, vecEnd, dont_ignore_monsters, head_hull, ENT(pev), &tr );
+	
+	if ( tr.pHit )
+	{
+		CBaseEntity *pEntity = CBaseEntity::Instance( tr.pHit );
+		return pEntity;
+	}
+
+	return NULL;
+}
+
+//=========================================================
+// GetGunPosition	return the end of the barrel
+//=========================================================
+
+Vector CHGrunt :: GetGunPosition( )
+{
+	if (m_fStanding )
+	{
+		return pev->origin + Vector( 0, 0, 60 );
+	}
+	else
+	{
+		return pev->origin + Vector( 0, 0, 48 );
+	}
+}
+
+//=========================================================
+// Shoot
+//=========================================================
+void CHGrunt :: Shoot ( void )
+{
+	if (m_hEnemy == NULL)
+	{
+		return;
+	}
+
+	Vector vecShootOrigin = GetGunPosition();
+	Vector vecShootDir = ShootAtEnemy( vecShootOrigin );
+
+	UTIL_MakeVectors ( pev->angles );
+
+	Vector	vecShellVelocity = gpGlobals->v_right * RANDOM_FLOAT(40,90) + gpGlobals->v_up * RANDOM_FLOAT(75,200) + gpGlobals->v_forward * RANDOM_FLOAT(-40, 40);
+	EjectBrass ( vecShootOrigin - vecShootDir * 24, vecShellVelocity, pev->angles.y, m_iBrassShell, TE_BOUNCE_SHELL); 
+	FireBullets(1, vecShootOrigin, vecShootDir, VECTOR_CONE_10DEGREES, 2048, BULLET_MONSTER_MP5 ); // shoot +-5 degrees
+
+	pev->effects |= EF_MUZZLEFLASH;
+	
+	m_cAmmoLoaded--;// take away a bullet!
+
+	Vector angDir = UTIL_VecToAngles( vecShootDir );
+	SetBlending( 0, angDir.x );
+}
+
+//=========================================================
+// Shoot
+//=========================================================
+void CHGrunt :: Shotgun ( void )
+{
+	if (m_hEnemy == NULL)
+	{
+		return;
+	}
+
+	Vector vecShootOrigin = GetGunPosition();
+	Vector vecShootDir = ShootAtEnemy( vecShootOrigin );
+
+	UTIL_MakeVectors ( pev->angles );
+
+	Vector	vecShellVelocity = gpGlobals->v_right * RANDOM_FLOAT(40,90) + gpGlobals->v_up * RANDOM_FLOAT(75,200) + gpGlobals->v_forward * RANDOM_FLOAT(-40, 40);
+	EjectBrass ( vecShootOrigin - vecShootDir * 24, vecShellVelocity, pev->angles.y, m_iShotgunShell, TE_BOUNCE_SHOTSHELL); 
+	FireBullets(gSkillData.hgruntShotgunPellets, vecShootOrigin, vecShootDir, VECTOR_CONE_15DEGREES, 2048, BULLET_PLAYER_BUCKSHOT, 0 ); // shoot +-7.5 degrees
+
+	pev->effects |= EF_MUZZLEFLASH;
+	
+	m_cAmmoLoaded--;// take away a bullet!
+
+	Vector angDir = UTIL_VecToAngles( vecShootDir );
+	SetBlending( 0, angDir.x );
+}
+
+//=========================================================
+// HandleAnimEvent - catches the monster-specific messages
+// that occur when tagged animation frames are played.
+//=========================================================
+void CHGrunt :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	Vector	vecShootDir;
+	Vector	vecShootOrigin;
+
+	switch( pEvent->event )
+	{
+		case HGRUNT_AE_DROP_GUN:
+			{
+			Vector	vecGunPos;
+			Vector	vecGunAngles;
+
+			GetAttachment( 0, vecGunPos, vecGunAngles );
+
+			// switch to body group with no gun.
+			SetBodygroup( GUN_GROUP, GUN_NONE );
+
+			// now spawn a gun.
+			if (FBitSet( pev->weapons, HGRUNT_SHOTGUN ))
+			{
+				 DropItem( "weapon_shotgun", vecGunPos, vecGunAngles );
+			}
+			else
+			{
+				 DropItem( "weapon_9mmAR", vecGunPos, vecGunAngles );
+			}
+			if (FBitSet( pev->weapons, HGRUNT_GRENADELAUNCHER ))
+			{
+				DropItem( "ammo_ARgrenades", BodyTarget( pev->origin ), vecGunAngles );
+			}
+
+			}
+			break;
+
+		case HGRUNT_AE_RELOAD:
+			EMIT_SOUND( ENT(pev), CHAN_WEAPON, "hgrunt/gr_reload1.wav", 1, ATTN_NORM );
+			m_cAmmoLoaded = m_cClipSize;
+			ClearConditions(bits_COND_NO_AMMO_LOADED);
+			break;
+
+		case HGRUNT_AE_GREN_TOSS:
+		{
+			UTIL_MakeVectors( pev->angles );
+			// CGrenade::ShootTimed( pev, pev->origin + gpGlobals->v_forward * 34 + Vector (0, 0, 32), m_vecTossVelocity, 3.5 );
+			CGrenade::ShootTimed( pev, GetGunPosition(), m_vecTossVelocity, 3.5 );
+
+			m_fThrowGrenade = FALSE;
+			m_flNextGrenadeCheck = gpGlobals->time + 6;// wait six seconds before even looking again to see if a grenade can be thrown.
+			// !!!LATER - when in a group, only try to throw grenade if ordered.
+		}
+		break;
+
+		case HGRUNT_AE_GREN_LAUNCH:
+		{
+			EMIT_SOUND(ENT(pev), CHAN_WEAPON, "weapons/glauncher.wav", 0.8, ATTN_NORM);
+			CGrenade::ShootContact( pev, GetGunPosition(), m_vecTossVelocity );
+			m_fThrowGrenade = FALSE;
+			if (g_iSkillLevel == SKILL_HARD)
+				m_flNextGrenadeCheck = gpGlobals->time + RANDOM_FLOAT( 2, 5 );// wait a random amount of time before shooting again
+			else
+				m_flNextGrenadeCheck = gpGlobals->time + 6;// wait six seconds before even looking again to see if a grenade can be thrown.
+		}
+		break;
+
+		case HGRUNT_AE_GREN_DROP:
+		{
+			UTIL_MakeVectors( pev->angles );
+			CGrenade::ShootTimed( pev, pev->origin + gpGlobals->v_forward * 17 - gpGlobals->v_right * 27 + gpGlobals->v_up * 6, g_vecZero, 3 );
+		}
+		break;
+
+		case HGRUNT_AE_BURST1:
+		{
+			if ( FBitSet( pev->weapons, HGRUNT_9MMAR ))
+			{
+				Shoot();
+
+				// the first round of the three round burst plays the sound and puts a sound in the world sound list.
+				if ( RANDOM_LONG(0,1) )
+				{
+					EMIT_SOUND( ENT(pev), CHAN_WEAPON, "hgrunt/gr_mgun1.wav", 1, ATTN_NORM );
+				}
+				else
+				{
+					EMIT_SOUND( ENT(pev), CHAN_WEAPON, "hgrunt/gr_mgun2.wav", 1, ATTN_NORM );
+				}
+			}
+			else
+			{
+				Shotgun( );
+
+				EMIT_SOUND(ENT(pev), CHAN_WEAPON, "weapons/sbarrel1.wav", 1, ATTN_NORM );
+			}
+		
+			CSoundEnt::InsertSound ( bits_SOUND_COMBAT, pev->origin, 384, 0.3 );
+		}
+		break;
+
+		case HGRUNT_AE_BURST2:
+		case HGRUNT_AE_BURST3:
+			Shoot();
+			break;
+
+		case HGRUNT_AE_KICK:
+		{
+			CBaseEntity *pHurt = Kick();
+
+			if ( pHurt )
+			{
+				// SOUND HERE!
+				UTIL_MakeVectors( pev->angles );
+				pHurt->pev->punchangle.x = 15;
+				pHurt->pev->velocity = pHurt->pev->velocity + gpGlobals->v_forward * 100 + gpGlobals->v_up * 50;
+				pHurt->TakeDamage( pev, pev, gSkillData.hgruntDmgKick, DMG_CLUB );
+			}
+		}
+		break;
+
+		case HGRUNT_AE_CAUGHT_ENEMY:
+		{
+			if ( FOkToSpeak() )
+			{
+				SENTENCEG_PlayRndSz(ENT(pev), "HG_ALERT", HGRUNT_SENTENCE_VOLUME, GRUNT_ATTN, 0, m_voicePitch);
+				 JustSpoke();
+			}
+
+		}
+
+		default:
+			CSquadMonster::HandleAnimEvent( pEvent );
+			break;
+	}
+}
+
+//=========================================================
+// Spawn
+//=========================================================
+void CHGrunt :: Spawn()
+{
+	Precache( );
+
+	SET_MODEL(ENT(pev), "models/hgrunt.mdl");
+	UTIL_SetSize(pev, VEC_HUMAN_HULL_MIN, VEC_HUMAN_HULL_MAX);
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_STEP;
+	m_bloodColor		= BLOOD_COLOR_RED;
+	pev->effects		= 0;
+	pev->health			= gSkillData.hgruntHealth;
+	m_flFieldOfView		= 0.2;// indicates the width of this monster's forward view cone ( as a dotproduct result )
+	m_MonsterState		= MONSTERSTATE_NONE;
+	m_flNextGrenadeCheck = gpGlobals->time + 1;
+	m_flNextPainTime	= gpGlobals->time;
+	m_iSentence			= HGRUNT_SENT_NONE;
+
+	m_afCapability		= bits_CAP_SQUAD | bits_CAP_TURN_HEAD | bits_CAP_DOORS_GROUP;
+
+	m_fEnemyEluded		= FALSE;
+	m_fFirstEncounter	= TRUE;// this is true when the grunt spawns, because he hasn't encountered an enemy yet.
+
+	m_HackedGunPos = Vector ( 0, 0, 55 );
+
+	if (pev->weapons == 0)
+	{
+		// initialize to original values
+		pev->weapons = HGRUNT_9MMAR | HGRUNT_HANDGRENADE;
+		// pev->weapons = HGRUNT_SHOTGUN;
+		// pev->weapons = HGRUNT_9MMAR | HGRUNT_GRENADELAUNCHER;
+	}
+
+	if (FBitSet( pev->weapons, HGRUNT_SHOTGUN ))
+	{
+		SetBodygroup( GUN_GROUP, GUN_SHOTGUN );
+		m_cClipSize		= 8;
+	}
+	else
+	{
+		m_cClipSize		= GRUNT_CLIP_SIZE;
+	}
+	m_cAmmoLoaded		= m_cClipSize;
+
+	if (RANDOM_LONG( 0, 99 ) < 80)
+		pev->skin = 0;	// light skin
+	else
+		pev->skin = 1;	// dark skin
+
+	if (FBitSet( pev->weapons, HGRUNT_SHOTGUN ))
+	{
+		SetBodygroup( HEAD_GROUP, HEAD_SHOTGUN);
+	}
+	else if (FBitSet( pev->weapons, HGRUNT_GRENADELAUNCHER ))
+	{
+		SetBodygroup( HEAD_GROUP, HEAD_M203 );
+		pev->skin = 1; // alway dark skin
+	}
+
+	CTalkMonster::g_talkWaitTime = 0;
+
+	MonsterInit();
+}
+
+//=========================================================
+// Precache - precaches all resources this monster needs
+//=========================================================
+void CHGrunt :: Precache()
+{
+	PRECACHE_MODEL("models/hgrunt.mdl");
+
+	PRECACHE_SOUND( "hgrunt/gr_mgun1.wav" );
+	PRECACHE_SOUND( "hgrunt/gr_mgun2.wav" );
+	
+	PRECACHE_SOUND( "hgrunt/gr_die1.wav" );
+	PRECACHE_SOUND( "hgrunt/gr_die2.wav" );
+	PRECACHE_SOUND( "hgrunt/gr_die3.wav" );
+
+	PRECACHE_SOUND( "hgrunt/gr_pain1.wav" );
+	PRECACHE_SOUND( "hgrunt/gr_pain2.wav" );
+	PRECACHE_SOUND( "hgrunt/gr_pain3.wav" );
+	PRECACHE_SOUND( "hgrunt/gr_pain4.wav" );
+	PRECACHE_SOUND( "hgrunt/gr_pain5.wav" );
+
+	PRECACHE_SOUND( "hgrunt/gr_reload1.wav" );
+
+	PRECACHE_SOUND( "weapons/glauncher.wav" );
+
+	PRECACHE_SOUND( "weapons/sbarrel1.wav" );
+
+	PRECACHE_SOUND("zombie/claw_miss2.wav");// because we use the basemonster SWIPE animation event
+
+	// get voice pitch
+	if (RANDOM_LONG(0,1))
+		m_voicePitch = 109 + RANDOM_LONG(0,7);
+	else
+		m_voicePitch = 100;
+
+	m_iBrassShell = PRECACHE_MODEL ("models/shell.mdl");// brass shell
+	m_iShotgunShell = PRECACHE_MODEL ("models/shotgunshell.mdl");
+}	
+
+//=========================================================
+// start task
+//=========================================================
+void CHGrunt :: StartTask ( Task_t *pTask )
+{
+	m_iTaskStatus = TASKSTATUS_RUNNING;
+
+	switch ( pTask->iTask )
+	{
+	case TASK_GRUNT_CHECK_FIRE:
+		if ( !NoFriendlyFire() )
+		{
+			SetConditions( bits_COND_GRUNT_NOFIRE );
+		}
+		TaskComplete();
+		break;
+
+	case TASK_GRUNT_SPEAK_SENTENCE:
+		SpeakSentence();
+		TaskComplete();
+		break;
+	
+	case TASK_WALK_PATH:
+	case TASK_RUN_PATH:
+		// grunt no longer assumes he is covered if he moves
+		Forget( bits_MEMORY_INCOVER );
+		CSquadMonster ::StartTask( pTask );
+		break;
+
+	case TASK_RELOAD:
+		m_IdealActivity = ACT_RELOAD;
+		break;
+
+	case TASK_GRUNT_FACE_TOSS_DIR:
+		break;
+
+	case TASK_FACE_IDEAL:
+	case TASK_FACE_ENEMY:
+		CSquadMonster :: StartTask( pTask );
+		if (pev->movetype == MOVETYPE_FLY)
+		{
+			m_IdealActivity = ACT_GLIDE;
+		}
+		break;
+
+	default: 
+		CSquadMonster :: StartTask( pTask );
+		break;
+	}
+}
+
+//=========================================================
+// RunTask
+//=========================================================
+void CHGrunt :: RunTask ( Task_t *pTask )
+{
+	switch ( pTask->iTask )
+	{
+	case TASK_GRUNT_FACE_TOSS_DIR:
+		{
+			// project a point along the toss vector and turn to face that point.
+			MakeIdealYaw( pev->origin + m_vecTossVelocity * 64 );
+			ChangeYaw( pev->yaw_speed );
+
+			if ( FacingIdeal() )
+			{
+				m_iTaskStatus = TASKSTATUS_COMPLETE;
+			}
+			break;
+		}
+	default:
+		{
+			CSquadMonster :: RunTask( pTask );
+			break;
+		}
+	}
+}
+
+//=========================================================
+// PainSound
+//=========================================================
+void CHGrunt :: PainSound ( void )
+{
+	if ( gpGlobals->time > m_flNextPainTime )
+	{
+#if 0
+		if ( RANDOM_LONG(0,99) < 5 )
+		{
+			// pain sentences are rare
+			if (FOkToSpeak())
+			{
+				SENTENCEG_PlayRndSz(ENT(pev), "HG_PAIN", HGRUNT_SENTENCE_VOLUME, ATTN_NORM, 0, PITCH_NORM);
+				JustSpoke();
+				return;
+			}
+		}
+#endif 
+		switch ( RANDOM_LONG(0,6) )
+		{
+		case 0:	
+			EMIT_SOUND( ENT(pev), CHAN_VOICE, "hgrunt/gr_pain3.wav", 1, ATTN_NORM );	
+			break;
+		case 1:
+			EMIT_SOUND( ENT(pev), CHAN_VOICE, "hgrunt/gr_pain4.wav", 1, ATTN_NORM );	
+			break;
+		case 2:
+			EMIT_SOUND( ENT(pev), CHAN_VOICE, "hgrunt/gr_pain5.wav", 1, ATTN_NORM );	
+			break;
+		case 3:
+			EMIT_SOUND( ENT(pev), CHAN_VOICE, "hgrunt/gr_pain1.wav", 1, ATTN_NORM );	
+			break;
+		case 4:
+			EMIT_SOUND( ENT(pev), CHAN_VOICE, "hgrunt/gr_pain2.wav", 1, ATTN_NORM );	
+			break;
+		}
+
+		m_flNextPainTime = gpGlobals->time + 1;
+	}
+}
+
+//=========================================================
+// DeathSound 
+//=========================================================
+void CHGrunt :: DeathSound ( void )
+{
+	switch ( RANDOM_LONG(0,2) )
+	{
+	case 0:	
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "hgrunt/gr_die1.wav", 1, ATTN_IDLE );	
+		break;
+	case 1:
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "hgrunt/gr_die2.wav", 1, ATTN_IDLE );	
+		break;
+	case 2:
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "hgrunt/gr_die3.wav", 1, ATTN_IDLE );	
+		break;
+	}
+}
+
+//=========================================================
+// AI Schedules Specific to this monster
+//=========================================================
+
+//=========================================================
+// GruntFail
+//=========================================================
+Task_t	tlGruntFail[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE },
+	{ TASK_WAIT,				(float)2		},
+	{ TASK_WAIT_PVS,			(float)0		},
+};
+
+Schedule_t	slGruntFail[] =
+{
+	{
+		tlGruntFail,
+		ARRAYSIZE ( tlGruntFail ),
+		bits_COND_CAN_RANGE_ATTACK1 |
+		bits_COND_CAN_RANGE_ATTACK2 |
+		bits_COND_CAN_MELEE_ATTACK1 |
+		bits_COND_CAN_MELEE_ATTACK2,
+		0,
+		"Grunt Fail"
+	},
+};
+
+//=========================================================
+// Grunt Combat Fail
+//=========================================================
+Task_t	tlGruntCombatFail[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE },
+	{ TASK_WAIT_FACE_ENEMY,		(float)2		},
+	{ TASK_WAIT_PVS,			(float)0		},
+};
+
+Schedule_t	slGruntCombatFail[] =
+{
+	{
+		tlGruntCombatFail,
+		ARRAYSIZE ( tlGruntCombatFail ),
+		bits_COND_CAN_RANGE_ATTACK1	|
+		bits_COND_CAN_RANGE_ATTACK2,
+		0,
+		"Grunt Combat Fail"
+	},
+};
+
+//=========================================================
+// Victory dance!
+//=========================================================
+Task_t	tlGruntVictoryDance[] =
+{
+	{ TASK_STOP_MOVING,						(float)0					},
+	{ TASK_FACE_ENEMY,						(float)0					},
+	{ TASK_WAIT,							(float)1.5					},
+	{ TASK_GET_PATH_TO_ENEMY_CORPSE,		(float)0					},
+	{ TASK_WALK_PATH,						(float)0					},
+	{ TASK_WAIT_FOR_MOVEMENT,				(float)0					},
+	{ TASK_FACE_ENEMY,						(float)0					},
+	{ TASK_PLAY_SEQUENCE,					(float)ACT_VICTORY_DANCE	},
+};
+
+Schedule_t	slGruntVictoryDance[] =
+{
+	{ 
+		tlGruntVictoryDance,
+		ARRAYSIZE ( tlGruntVictoryDance ), 
+		bits_COND_NEW_ENEMY		|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE,
+		0,
+		"GruntVictoryDance"
+	},
+};
+
+//=========================================================
+// Establish line of fire - move to a position that allows
+// the grunt to attack.
+//=========================================================
+Task_t tlGruntEstablishLineOfFire[] = 
+{
+	{ TASK_SET_FAIL_SCHEDULE,	(float)SCHED_GRUNT_ELOF_FAIL	},
+	{ TASK_GET_PATH_TO_ENEMY,	(float)0						},
+	{ TASK_GRUNT_SPEAK_SENTENCE,(float)0						},
+	{ TASK_RUN_PATH,			(float)0						},
+	{ TASK_WAIT_FOR_MOVEMENT,	(float)0						},
+};
+
+Schedule_t slGruntEstablishLineOfFire[] =
+{
+	{ 
+		tlGruntEstablishLineOfFire,
+		ARRAYSIZE ( tlGruntEstablishLineOfFire ),
+		bits_COND_NEW_ENEMY			|
+		bits_COND_ENEMY_DEAD		|
+		bits_COND_CAN_RANGE_ATTACK1	|
+		bits_COND_CAN_MELEE_ATTACK1	|
+		bits_COND_CAN_RANGE_ATTACK2	|
+		bits_COND_CAN_MELEE_ATTACK2	|
+		bits_COND_HEAR_SOUND,
+		
+		bits_SOUND_DANGER,
+		"GruntEstablishLineOfFire"
+	},
+};
+
+//=========================================================
+// GruntFoundEnemy - grunt established sight with an enemy
+// that was hiding from the squad.
+//=========================================================
+Task_t	tlGruntFoundEnemy[] =
+{
+	{ TASK_STOP_MOVING,				0							},
+	{ TASK_FACE_ENEMY,				(float)0					},
+	{ TASK_PLAY_SEQUENCE_FACE_ENEMY,(float)ACT_SIGNAL1			},
+};
+
+Schedule_t	slGruntFoundEnemy[] =
+{
+	{ 
+		tlGruntFoundEnemy,
+		ARRAYSIZE ( tlGruntFoundEnemy ), 
+		bits_COND_HEAR_SOUND,
+		
+		bits_SOUND_DANGER,
+		"GruntFoundEnemy"
+	},
+};
+
+//=========================================================
+// GruntCombatFace Schedule
+//=========================================================
+Task_t	tlGruntCombatFace1[] =
+{
+	{ TASK_STOP_MOVING,				0							},
+	{ TASK_SET_ACTIVITY,			(float)ACT_IDLE				},
+	{ TASK_FACE_ENEMY,				(float)0					},
+	{ TASK_WAIT,					(float)1.5					},
+	{ TASK_SET_SCHEDULE,			(float)SCHED_GRUNT_SWEEP	},
+};
+
+Schedule_t	slGruntCombatFace[] =
+{
+	{ 
+		tlGruntCombatFace1,
+		ARRAYSIZE ( tlGruntCombatFace1 ), 
+		bits_COND_NEW_ENEMY				|
+		bits_COND_ENEMY_DEAD			|
+		bits_COND_CAN_RANGE_ATTACK1		|
+		bits_COND_CAN_RANGE_ATTACK2,
+		0,
+		"Combat Face"
+	},
+};
+
+//=========================================================
+// Suppressing fire - don't stop shooting until the clip is
+// empty or grunt gets hurt.
+//=========================================================
+Task_t	tlGruntSignalSuppress[] =
+{
+	{ TASK_STOP_MOVING,					0						},
+	{ TASK_FACE_IDEAL,					(float)0				},
+	{ TASK_PLAY_SEQUENCE_FACE_ENEMY,	(float)ACT_SIGNAL2		},
+	{ TASK_FACE_ENEMY,					(float)0				},
+	{ TASK_GRUNT_CHECK_FIRE,			(float)0				},
+	{ TASK_RANGE_ATTACK1,				(float)0				},
+	{ TASK_FACE_ENEMY,					(float)0				},
+	{ TASK_GRUNT_CHECK_FIRE,			(float)0				},
+	{ TASK_RANGE_ATTACK1,				(float)0				},
+	{ TASK_FACE_ENEMY,					(float)0				},
+	{ TASK_GRUNT_CHECK_FIRE,			(float)0				},
+	{ TASK_RANGE_ATTACK1,				(float)0				},
+	{ TASK_FACE_ENEMY,					(float)0				},
+	{ TASK_GRUNT_CHECK_FIRE,			(float)0				},
+	{ TASK_RANGE_ATTACK1,				(float)0				},
+	{ TASK_FACE_ENEMY,					(float)0				},
+	{ TASK_GRUNT_CHECK_FIRE,			(float)0				},
+	{ TASK_RANGE_ATTACK1,				(float)0				},
+};
+
+Schedule_t	slGruntSignalSuppress[] =
+{
+	{ 
+		tlGruntSignalSuppress,
+		ARRAYSIZE ( tlGruntSignalSuppress ), 
+		bits_COND_ENEMY_DEAD		|
+		bits_COND_LIGHT_DAMAGE		|
+		bits_COND_HEAVY_DAMAGE		|
+		bits_COND_HEAR_SOUND		|
+		bits_COND_GRUNT_NOFIRE		|
+		bits_COND_NO_AMMO_LOADED,
+
+		bits_SOUND_DANGER,
+		"SignalSuppress"
+	},
+};
+
+Task_t	tlGruntSuppress[] =
+{
+	{ TASK_STOP_MOVING,			0							},
+	{ TASK_FACE_ENEMY,			(float)0					},
+	{ TASK_GRUNT_CHECK_FIRE,	(float)0					},
+	{ TASK_RANGE_ATTACK1,		(float)0					},
+	{ TASK_FACE_ENEMY,			(float)0					},
+	{ TASK_GRUNT_CHECK_FIRE,	(float)0					},
+	{ TASK_RANGE_ATTACK1,		(float)0					},
+	{ TASK_FACE_ENEMY,			(float)0					},
+	{ TASK_GRUNT_CHECK_FIRE,	(float)0					},
+	{ TASK_RANGE_ATTACK1,		(float)0					},
+	{ TASK_FACE_ENEMY,			(float)0					},
+	{ TASK_GRUNT_CHECK_FIRE,	(float)0					},
+	{ TASK_RANGE_ATTACK1,		(float)0					},
+	{ TASK_FACE_ENEMY,			(float)0					},
+	{ TASK_GRUNT_CHECK_FIRE,	(float)0					},
+	{ TASK_RANGE_ATTACK1,		(float)0					},
+};
+
+Schedule_t	slGruntSuppress[] =
+{
+	{ 
+		tlGruntSuppress,
+		ARRAYSIZE ( tlGruntSuppress ), 
+		bits_COND_ENEMY_DEAD		|
+		bits_COND_LIGHT_DAMAGE		|
+		bits_COND_HEAVY_DAMAGE		|
+		bits_COND_HEAR_SOUND		|
+		bits_COND_GRUNT_NOFIRE		|
+		bits_COND_NO_AMMO_LOADED,
+
+		bits_SOUND_DANGER,
+		"Suppress"
+	},
+};
+
+
+//=========================================================
+// grunt wait in cover - we don't allow danger or the ability
+// to attack to break a grunt's run to cover schedule, but
+// when a grunt is in cover, we do want them to attack if they can.
+//=========================================================
+Task_t	tlGruntWaitInCover[] =
+{
+	{ TASK_STOP_MOVING,				(float)0					},
+	{ TASK_SET_ACTIVITY,			(float)ACT_IDLE				},
+	{ TASK_WAIT_FACE_ENEMY,			(float)1					},
+};
+
+Schedule_t	slGruntWaitInCover[] =
+{
+	{ 
+		tlGruntWaitInCover,
+		ARRAYSIZE ( tlGruntWaitInCover ), 
+		bits_COND_NEW_ENEMY			|
+		bits_COND_HEAR_SOUND		|
+		bits_COND_CAN_RANGE_ATTACK1	|
+		bits_COND_CAN_RANGE_ATTACK2	|
+		bits_COND_CAN_MELEE_ATTACK1	|
+		bits_COND_CAN_MELEE_ATTACK2,
+
+		bits_SOUND_DANGER,
+		"GruntWaitInCover"
+	},
+};
+
+//=========================================================
+// run to cover.
+// !!!BUGBUG - set a decent fail schedule here.
+//=========================================================
+Task_t	tlGruntTakeCover1[] =
+{
+	{ TASK_STOP_MOVING,				(float)0							},
+	{ TASK_SET_FAIL_SCHEDULE,		(float)SCHED_GRUNT_TAKECOVER_FAILED	},
+	{ TASK_WAIT,					(float)0.2							},
+	{ TASK_FIND_COVER_FROM_ENEMY,	(float)0							},
+	{ TASK_GRUNT_SPEAK_SENTENCE,	(float)0							},
+	{ TASK_RUN_PATH,				(float)0							},
+	{ TASK_WAIT_FOR_MOVEMENT,		(float)0							},
+	{ TASK_REMEMBER,				(float)bits_MEMORY_INCOVER			},
+	{ TASK_SET_SCHEDULE,			(float)SCHED_GRUNT_WAIT_FACE_ENEMY	},
+};
+
+Schedule_t	slGruntTakeCover[] =
+{
+	{ 
+		tlGruntTakeCover1,
+		ARRAYSIZE ( tlGruntTakeCover1 ), 
+		0,
+		0,
+		"TakeCover"
+	},
+};
+
+//=========================================================
+// drop grenade then run to cover.
+//=========================================================
+Task_t	tlGruntGrenadeCover1[] =
+{
+	{ TASK_STOP_MOVING,						(float)0							},
+	{ TASK_FIND_COVER_FROM_ENEMY,			(float)99							},
+	{ TASK_FIND_FAR_NODE_COVER_FROM_ENEMY,	(float)384							},
+	{ TASK_PLAY_SEQUENCE,					(float)ACT_SPECIAL_ATTACK1			},
+	{ TASK_CLEAR_MOVE_WAIT,					(float)0							},
+	{ TASK_RUN_PATH,						(float)0							},
+	{ TASK_WAIT_FOR_MOVEMENT,				(float)0							},
+	{ TASK_SET_SCHEDULE,					(float)SCHED_GRUNT_WAIT_FACE_ENEMY	},
+};
+
+Schedule_t	slGruntGrenadeCover[] =
+{
+	{ 
+		tlGruntGrenadeCover1,
+		ARRAYSIZE ( tlGruntGrenadeCover1 ), 
+		0,
+		0,
+		"GrenadeCover"
+	},
+};
+
+
+//=========================================================
+// drop grenade then run to cover.
+//=========================================================
+Task_t	tlGruntTossGrenadeCover1[] =
+{
+	{ TASK_FACE_ENEMY,						(float)0							},
+	{ TASK_RANGE_ATTACK2, 					(float)0							},
+	{ TASK_SET_SCHEDULE,					(float)SCHED_TAKE_COVER_FROM_ENEMY	},
+};
+
+Schedule_t	slGruntTossGrenadeCover[] =
+{
+	{ 
+		tlGruntTossGrenadeCover1,
+		ARRAYSIZE ( tlGruntTossGrenadeCover1 ), 
+		0,
+		0,
+		"TossGrenadeCover"
+	},
+};
+
+//=========================================================
+// hide from the loudest sound source (to run from grenade)
+//=========================================================
+Task_t	tlGruntTakeCoverFromBestSound[] =
+{
+	{ TASK_SET_FAIL_SCHEDULE,			(float)SCHED_COWER			},// duck and cover if cannot move from explosion
+	{ TASK_STOP_MOVING,					(float)0					},
+	{ TASK_FIND_COVER_FROM_BEST_SOUND,	(float)0					},
+	{ TASK_RUN_PATH,					(float)0					},
+	{ TASK_WAIT_FOR_MOVEMENT,			(float)0					},
+	{ TASK_REMEMBER,					(float)bits_MEMORY_INCOVER	},
+	{ TASK_TURN_LEFT,					(float)179					},
+};
+
+Schedule_t	slGruntTakeCoverFromBestSound[] =
+{
+	{ 
+		tlGruntTakeCoverFromBestSound,
+		ARRAYSIZE ( tlGruntTakeCoverFromBestSound ), 
+		0,
+		0,
+		"GruntTakeCoverFromBestSound"
+	},
+};
+
+//=========================================================
+// Grunt reload schedule
+//=========================================================
+Task_t	tlGruntHideReload[] =
+{
+	{ TASK_STOP_MOVING,				(float)0					},
+	{ TASK_SET_FAIL_SCHEDULE,		(float)SCHED_RELOAD			},
+	{ TASK_FIND_COVER_FROM_ENEMY,	(float)0					},
+	{ TASK_RUN_PATH,				(float)0					},
+	{ TASK_WAIT_FOR_MOVEMENT,		(float)0					},
+	{ TASK_REMEMBER,				(float)bits_MEMORY_INCOVER	},
+	{ TASK_FACE_ENEMY,				(float)0					},
+	{ TASK_PLAY_SEQUENCE,			(float)ACT_RELOAD			},
+};
+
+Schedule_t slGruntHideReload[] = 
+{
+	{
+		tlGruntHideReload,
+		ARRAYSIZE ( tlGruntHideReload ),
+		bits_COND_HEAVY_DAMAGE	|
+		bits_COND_HEAR_SOUND,
+
+		bits_SOUND_DANGER,
+		"GruntHideReload"
+	}
+};
+
+//=========================================================
+// Do a turning sweep of the area
+//=========================================================
+Task_t	tlGruntSweep[] =
+{
+	{ TASK_TURN_LEFT,			(float)179	},
+	{ TASK_WAIT,				(float)1	},
+	{ TASK_TURN_LEFT,			(float)179	},
+	{ TASK_WAIT,				(float)1	},
+};
+
+Schedule_t	slGruntSweep[] =
+{
+	{ 
+		tlGruntSweep,
+		ARRAYSIZE ( tlGruntSweep ), 
+		
+		bits_COND_NEW_ENEMY		|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE	|
+		bits_COND_CAN_RANGE_ATTACK1	|
+		bits_COND_CAN_RANGE_ATTACK2	|
+		bits_COND_HEAR_SOUND,
+
+		bits_SOUND_WORLD		|// sound flags
+		bits_SOUND_DANGER		|
+		bits_SOUND_PLAYER,
+
+		"Grunt Sweep"
+	},
+};
+
+//=========================================================
+// primary range attack. Overriden because base class stops attacking when the enemy is occluded.
+// grunt's grenade toss requires the enemy be occluded.
+//=========================================================
+Task_t	tlGruntRangeAttack1A[] =
+{
+	{ TASK_STOP_MOVING,			(float)0		},
+	{ TASK_PLAY_SEQUENCE_FACE_ENEMY,		(float)ACT_CROUCH },
+	{ TASK_GRUNT_CHECK_FIRE,	(float)0		},
+	{ TASK_RANGE_ATTACK1,		(float)0		},
+	{ TASK_FACE_ENEMY,			(float)0		},
+	{ TASK_GRUNT_CHECK_FIRE,	(float)0		},
+	{ TASK_RANGE_ATTACK1,		(float)0		},
+	{ TASK_FACE_ENEMY,			(float)0		},
+	{ TASK_GRUNT_CHECK_FIRE,	(float)0		},
+	{ TASK_RANGE_ATTACK1,		(float)0		},
+	{ TASK_FACE_ENEMY,			(float)0		},
+	{ TASK_GRUNT_CHECK_FIRE,	(float)0		},
+	{ TASK_RANGE_ATTACK1,		(float)0		},
+};
+
+Schedule_t	slGruntRangeAttack1A[] =
+{
+	{ 
+		tlGruntRangeAttack1A,
+		ARRAYSIZE ( tlGruntRangeAttack1A ), 
+		bits_COND_NEW_ENEMY			|
+		bits_COND_ENEMY_DEAD		|
+		bits_COND_HEAVY_DAMAGE		|
+		bits_COND_ENEMY_OCCLUDED	|
+		bits_COND_HEAR_SOUND		|
+		bits_COND_GRUNT_NOFIRE		|
+		bits_COND_NO_AMMO_LOADED,
+		
+		bits_SOUND_DANGER,
+		"Range Attack1A"
+	},
+};
+
+
+//=========================================================
+// primary range attack. Overriden because base class stops attacking when the enemy is occluded.
+// grunt's grenade toss requires the enemy be occluded.
+//=========================================================
+Task_t	tlGruntRangeAttack1B[] =
+{
+	{ TASK_STOP_MOVING,				(float)0		},
+	{ TASK_PLAY_SEQUENCE_FACE_ENEMY,(float)ACT_IDLE_ANGRY  },
+	{ TASK_GRUNT_CHECK_FIRE,	(float)0		},
+	{ TASK_RANGE_ATTACK1,		(float)0		},
+	{ TASK_FACE_ENEMY,			(float)0		},
+	{ TASK_GRUNT_CHECK_FIRE,	(float)0		},
+	{ TASK_RANGE_ATTACK1,		(float)0		},
+	{ TASK_FACE_ENEMY,			(float)0		},
+	{ TASK_GRUNT_CHECK_FIRE,	(float)0		},
+	{ TASK_RANGE_ATTACK1,		(float)0		},
+	{ TASK_FACE_ENEMY,			(float)0		},
+	{ TASK_GRUNT_CHECK_FIRE,	(float)0		},
+	{ TASK_RANGE_ATTACK1,		(float)0		},
+};
+
+Schedule_t	slGruntRangeAttack1B[] =
+{
+	{ 
+		tlGruntRangeAttack1B,
+		ARRAYSIZE ( tlGruntRangeAttack1B ), 
+		bits_COND_NEW_ENEMY			|
+		bits_COND_ENEMY_DEAD		|
+		bits_COND_HEAVY_DAMAGE		|
+		bits_COND_ENEMY_OCCLUDED	|
+		bits_COND_NO_AMMO_LOADED	|
+		bits_COND_GRUNT_NOFIRE		|
+		bits_COND_HEAR_SOUND,
+		
+		bits_SOUND_DANGER,
+		"Range Attack1B"
+	},
+};
+
+//=========================================================
+// secondary range attack. Overriden because base class stops attacking when the enemy is occluded.
+// grunt's grenade toss requires the enemy be occluded.
+//=========================================================
+Task_t	tlGruntRangeAttack2[] =
+{
+	{ TASK_STOP_MOVING,				(float)0					},
+	{ TASK_GRUNT_FACE_TOSS_DIR,		(float)0					},
+	{ TASK_PLAY_SEQUENCE,			(float)ACT_RANGE_ATTACK2	},
+	{ TASK_SET_SCHEDULE,			(float)SCHED_GRUNT_WAIT_FACE_ENEMY	},// don't run immediately after throwing grenade.
+};
+
+Schedule_t	slGruntRangeAttack2[] =
+{
+	{ 
+		tlGruntRangeAttack2,
+		ARRAYSIZE ( tlGruntRangeAttack2 ), 
+		0,
+		0,
+		"RangeAttack2"
+	},
+};
+
+
+//=========================================================
+// repel 
+//=========================================================
+Task_t	tlGruntRepel[] =
+{
+	{ TASK_STOP_MOVING,			(float)0		},
+	{ TASK_FACE_IDEAL,			(float)0		},
+	{ TASK_PLAY_SEQUENCE,		(float)ACT_GLIDE 	},
+};
+
+Schedule_t	slGruntRepel[] =
+{
+	{ 
+		tlGruntRepel,
+		ARRAYSIZE ( tlGruntRepel ), 
+		bits_COND_SEE_ENEMY			|
+		bits_COND_NEW_ENEMY			|
+		bits_COND_LIGHT_DAMAGE		|
+		bits_COND_HEAVY_DAMAGE		|
+		bits_COND_HEAR_SOUND,
+		
+		bits_SOUND_DANGER			|
+		bits_SOUND_COMBAT			|
+		bits_SOUND_PLAYER, 
+		"Repel"
+	},
+};
+
+
+//=========================================================
+// repel 
+//=========================================================
+Task_t	tlGruntRepelAttack[] =
+{
+	{ TASK_STOP_MOVING,			(float)0		},
+	{ TASK_FACE_ENEMY,			(float)0		},
+	{ TASK_PLAY_SEQUENCE,		(float)ACT_FLY 	},
+};
+
+Schedule_t	slGruntRepelAttack[] =
+{
+	{ 
+		tlGruntRepelAttack,
+		ARRAYSIZE ( tlGruntRepelAttack ), 
+		bits_COND_ENEMY_OCCLUDED,
+		0,
+		"Repel Attack"
+	},
+};
+
+//=========================================================
+// repel land
+//=========================================================
+Task_t	tlGruntRepelLand[] =
+{
+	{ TASK_STOP_MOVING,			(float)0		},
+	{ TASK_PLAY_SEQUENCE,		(float)ACT_LAND	},
+	{ TASK_GET_PATH_TO_LASTPOSITION,(float)0				},
+	{ TASK_RUN_PATH,				(float)0				},
+	{ TASK_WAIT_FOR_MOVEMENT,		(float)0				},
+	{ TASK_CLEAR_LASTPOSITION,		(float)0				},
+};
+
+Schedule_t	slGruntRepelLand[] =
+{
+	{ 
+		tlGruntRepelLand,
+		ARRAYSIZE ( tlGruntRepelLand ), 
+		bits_COND_SEE_ENEMY			|
+		bits_COND_NEW_ENEMY			|
+		bits_COND_LIGHT_DAMAGE		|
+		bits_COND_HEAVY_DAMAGE		|
+		bits_COND_HEAR_SOUND,
+		
+		bits_SOUND_DANGER			|
+		bits_SOUND_COMBAT			|
+		bits_SOUND_PLAYER, 
+		"Repel Land"
+	},
+};
+
+
+DEFINE_CUSTOM_SCHEDULES( CHGrunt )
+{
+	slGruntFail,
+	slGruntCombatFail,
+	slGruntVictoryDance,
+	slGruntEstablishLineOfFire,
+	slGruntFoundEnemy,
+	slGruntCombatFace,
+	slGruntSignalSuppress,
+	slGruntSuppress,
+	slGruntWaitInCover,
+	slGruntTakeCover,
+	slGruntGrenadeCover,
+	slGruntTossGrenadeCover,
+	slGruntTakeCoverFromBestSound,
+	slGruntHideReload,
+	slGruntSweep,
+	slGruntRangeAttack1A,
+	slGruntRangeAttack1B,
+	slGruntRangeAttack2,
+	slGruntRepel,
+	slGruntRepelAttack,
+	slGruntRepelLand,
+};
+
+IMPLEMENT_CUSTOM_SCHEDULES( CHGrunt, CSquadMonster );
+
+//=========================================================
+// SetActivity 
+//=========================================================
+void CHGrunt :: SetActivity ( Activity NewActivity )
+{
+	int	iSequence = ACTIVITY_NOT_AVAILABLE;
+	void *pmodel = GET_MODEL_PTR( ENT(pev) );
+
+	switch ( NewActivity)
+	{
+	case ACT_RANGE_ATTACK1:
+		// grunt is either shooting standing or shooting crouched
+		if (FBitSet( pev->weapons, HGRUNT_9MMAR))
+		{
+			if ( m_fStanding )
+			{
+				// get aimable sequence
+				iSequence = LookupSequence( "standing_mp5" );
+			}
+			else
+			{
+				// get crouching shoot
+				iSequence = LookupSequence( "crouching_mp5" );
+			}
+		}
+		else
+		{
+			if ( m_fStanding )
+			{
+				// get aimable sequence
+				iSequence = LookupSequence( "standing_shotgun" );
+			}
+			else
+			{
+				// get crouching shoot
+				iSequence = LookupSequence( "crouching_shotgun" );
+			}
+		}
+		break;
+	case ACT_RANGE_ATTACK2:
+		// grunt is going to a secondary long range attack. This may be a thrown 
+		// grenade or fired grenade, we must determine which and pick proper sequence
+		if ( pev->weapons & HGRUNT_HANDGRENADE )
+		{
+			// get toss anim
+			iSequence = LookupSequence( "throwgrenade" );
+		}
+		else
+		{
+			// get launch anim
+			iSequence = LookupSequence( "launchgrenade" );
+		}
+		break;
+	case ACT_RUN:
+		if ( pev->health <= HGRUNT_LIMP_HEALTH )
+		{
+			// limp!
+			iSequence = LookupActivity ( ACT_RUN_HURT );
+		}
+		else
+		{
+			iSequence = LookupActivity ( NewActivity );
+		}
+		break;
+	case ACT_WALK:
+		if ( pev->health <= HGRUNT_LIMP_HEALTH )
+		{
+			// limp!
+			iSequence = LookupActivity ( ACT_WALK_HURT );
+		}
+		else
+		{
+			iSequence = LookupActivity ( NewActivity );
+		}
+		break;
+	case ACT_IDLE:
+		if ( m_MonsterState == MONSTERSTATE_COMBAT )
+		{
+			NewActivity = ACT_IDLE_ANGRY;
+		}
+		iSequence = LookupActivity ( NewActivity );
+		break;
+	default:
+		iSequence = LookupActivity ( NewActivity );
+		break;
+	}
+	
+	m_Activity = NewActivity; // Go ahead and set this so it doesn't keep trying when the anim is not present
+
+	// Set to the desired anim, or default anim if the desired is not present
+	if ( iSequence > ACTIVITY_NOT_AVAILABLE )
+	{
+		if ( pev->sequence != iSequence || !m_fSequenceLoops )
+		{
+			pev->frame = 0;
+		}
+
+		pev->sequence		= iSequence;	// Set to the reset anim (if it's there)
+		ResetSequenceInfo( );
+		SetYawSpeed();
+	}
+	else
+	{
+		// Not available try to get default anim
+		ALERT ( at_console, "%s has no sequence for act:%d\n", STRING(pev->classname), NewActivity );
+		pev->sequence		= 0;	// Set to the reset anim (if it's there)
+	}
+}
+
+//=========================================================
+// Get Schedule!
+//=========================================================
+Schedule_t *CHGrunt :: GetSchedule( void )
+{
+
+	// clear old sentence
+	m_iSentence = HGRUNT_SENT_NONE;
+
+	// flying? If PRONE, barnacle has me. IF not, it's assumed I am rapelling. 
+	if ( pev->movetype == MOVETYPE_FLY && m_MonsterState != MONSTERSTATE_PRONE )
+	{
+		if (pev->flags & FL_ONGROUND)
+		{
+			// just landed
+			pev->movetype = MOVETYPE_STEP;
+			return GetScheduleOfType ( SCHED_GRUNT_REPEL_LAND );
+		}
+		else
+		{
+			// repel down a rope, 
+			if ( m_MonsterState == MONSTERSTATE_COMBAT )
+				return GetScheduleOfType ( SCHED_GRUNT_REPEL_ATTACK );
+			else
+				return GetScheduleOfType ( SCHED_GRUNT_REPEL );
+		}
+	}
+
+	// grunts place HIGH priority on running away from danger sounds.
+	if ( HasConditions(bits_COND_HEAR_SOUND) )
+	{
+		CSound *pSound;
+		pSound = PBestSound();
+
+		ASSERT( pSound != NULL );
+		if ( pSound)
+		{
+			if (pSound->m_iType & bits_SOUND_DANGER)
+			{
+				// dangerous sound nearby!
+				
+				//!!!KELLY - currently, this is the grunt's signal that a grenade has landed nearby,
+				// and the grunt should find cover from the blast
+				// good place for "SHIT!" or some other colorful verbal indicator of dismay.
+				// It's not safe to play a verbal order here "Scatter", etc cause 
+				// this may only affect a single individual in a squad. 
+				
+				if (FOkToSpeak())
+				{
+					SENTENCEG_PlayRndSz( ENT(pev), "HG_GREN", HGRUNT_SENTENCE_VOLUME, GRUNT_ATTN, 0, m_voicePitch);
+					JustSpoke();
+				}
+				return GetScheduleOfType( SCHED_TAKE_COVER_FROM_BEST_SOUND );
+			}
+			/*
+			if (!HasConditions( bits_COND_SEE_ENEMY ) && ( pSound->m_iType & (bits_SOUND_PLAYER | bits_SOUND_COMBAT) ))
+			{
+				MakeIdealYaw( pSound->m_vecOrigin );
+			}
+			*/
+		}
+	}
+	switch	( m_MonsterState )
+	{
+	case MONSTERSTATE_COMBAT:
+		{
+// dead enemy
+			if ( HasConditions( bits_COND_ENEMY_DEAD ) )
+			{
+				// call base class, all code to handle dead enemies is centralized there.
+				return CBaseMonster :: GetSchedule();
+			}
+
+// new enemy
+			if ( HasConditions(bits_COND_NEW_ENEMY) )
+			{
+				if ( InSquad() )
+				{
+					MySquadLeader()->m_fEnemyEluded = FALSE;
+
+					if ( !IsLeader() )
+					{
+						return GetScheduleOfType ( SCHED_TAKE_COVER_FROM_ENEMY );
+					}
+					else 
+					{
+						//!!!KELLY - the leader of a squad of grunts has just seen the player or a 
+						// monster and has made it the squad's enemy. You
+						// can check pev->flags for FL_CLIENT to determine whether this is the player
+						// or a monster. He's going to immediately start
+						// firing, though. If you'd like, we can make an alternate "first sight" 
+						// schedule where the leader plays a handsign anim
+						// that gives us enough time to hear a short sentence or spoken command
+						// before he starts pluggin away.
+						if (FOkToSpeak())// && RANDOM_LONG(0,1))
+						{
+							if ((m_hEnemy != NULL) && m_hEnemy->IsPlayer())
+								// player
+								SENTENCEG_PlayRndSz( ENT(pev), "HG_ALERT", HGRUNT_SENTENCE_VOLUME, GRUNT_ATTN, 0, m_voicePitch);
+							else if ((m_hEnemy != NULL) &&
+									(m_hEnemy->Classify() != CLASS_PLAYER_ALLY) && 
+									(m_hEnemy->Classify() != CLASS_HUMAN_PASSIVE) && 
+									(m_hEnemy->Classify() != CLASS_MACHINE))
+								// monster
+								SENTENCEG_PlayRndSz( ENT(pev), "HG_MONST", HGRUNT_SENTENCE_VOLUME, GRUNT_ATTN, 0, m_voicePitch);
+
+							JustSpoke();
+						}
+						
+						if ( HasConditions ( bits_COND_CAN_RANGE_ATTACK1 ) )
+						{
+							return GetScheduleOfType ( SCHED_GRUNT_SUPPRESS );
+						}
+						else
+						{
+							return GetScheduleOfType ( SCHED_GRUNT_ESTABLISH_LINE_OF_FIRE );
+						}
+					}
+				}
+			}
+// no ammo
+			else if ( HasConditions ( bits_COND_NO_AMMO_LOADED ) )
+			{
+				//!!!KELLY - this individual just realized he's out of bullet ammo. 
+				// He's going to try to find cover to run to and reload, but rarely, if 
+				// none is available, he'll drop and reload in the open here. 
+				return GetScheduleOfType ( SCHED_GRUNT_COVER_AND_RELOAD );
+			}
+			
+// damaged just a little
+			else if ( HasConditions( bits_COND_LIGHT_DAMAGE ) )
+			{
+				// if hurt:
+				// 90% chance of taking cover
+				// 10% chance of flinch.
+				int iPercent = RANDOM_LONG(0,99);
+
+				if ( iPercent <= 90 && m_hEnemy != NULL )
+				{
+					// only try to take cover if we actually have an enemy!
+
+					//!!!KELLY - this grunt was hit and is going to run to cover.
+					if (FOkToSpeak()) // && RANDOM_LONG(0,1))
+					{
+						//SENTENCEG_PlayRndSz( ENT(pev), "HG_COVER", HGRUNT_SENTENCE_VOLUME, GRUNT_ATTN, 0, m_voicePitch);
+						m_iSentence = HGRUNT_SENT_COVER;
+						//JustSpoke();
+					}
+					return GetScheduleOfType( SCHED_TAKE_COVER_FROM_ENEMY );
+				}
+				else
+				{
+					return GetScheduleOfType( SCHED_SMALL_FLINCH );
+				}
+			}
+// can kick
+			else if ( HasConditions ( bits_COND_CAN_MELEE_ATTACK1 ) )
+			{
+				return GetScheduleOfType ( SCHED_MELEE_ATTACK1 );
+			}
+// can grenade launch
+
+			else if ( FBitSet( pev->weapons, HGRUNT_GRENADELAUNCHER) && HasConditions ( bits_COND_CAN_RANGE_ATTACK2 ) && OccupySlot( bits_SLOTS_HGRUNT_GRENADE ) )
+			{
+				// shoot a grenade if you can
+				return GetScheduleOfType( SCHED_RANGE_ATTACK2 );
+			}
+// can shoot
+			else if ( HasConditions ( bits_COND_CAN_RANGE_ATTACK1 ) )
+			{
+				if ( InSquad() )
+				{
+					// if the enemy has eluded the squad and a squad member has just located the enemy
+					// and the enemy does not see the squad member, issue a call to the squad to waste a 
+					// little time and give the player a chance to turn.
+					if ( MySquadLeader()->m_fEnemyEluded && !HasConditions ( bits_COND_ENEMY_FACING_ME ) )
+					{
+						MySquadLeader()->m_fEnemyEluded = FALSE;
+						return GetScheduleOfType ( SCHED_GRUNT_FOUND_ENEMY );
+					}
+				}
+
+				if ( OccupySlot ( bits_SLOTS_HGRUNT_ENGAGE ) )
+				{
+					// try to take an available ENGAGE slot
+					return GetScheduleOfType( SCHED_RANGE_ATTACK1 );
+				}
+				else if ( HasConditions ( bits_COND_CAN_RANGE_ATTACK2 ) && OccupySlot( bits_SLOTS_HGRUNT_GRENADE ) )
+				{
+					// throw a grenade if can and no engage slots are available
+					return GetScheduleOfType( SCHED_RANGE_ATTACK2 );
+				}
+				else
+				{
+					// hide!
+					return GetScheduleOfType( SCHED_TAKE_COVER_FROM_ENEMY );
+				}
+			}
+// can't see enemy
+			else if ( HasConditions( bits_COND_ENEMY_OCCLUDED ) )
+			{
+				if ( HasConditions( bits_COND_CAN_RANGE_ATTACK2 ) && OccupySlot( bits_SLOTS_HGRUNT_GRENADE ) )
+				{
+					//!!!KELLY - this grunt is about to throw or fire a grenade at the player. Great place for "fire in the hole"  "frag out" etc
+					if (FOkToSpeak())
+					{
+						SENTENCEG_PlayRndSz( ENT(pev), "HG_THROW", HGRUNT_SENTENCE_VOLUME, GRUNT_ATTN, 0, m_voicePitch);
+						JustSpoke();
+					}
+					return GetScheduleOfType( SCHED_RANGE_ATTACK2 );
+				}
+				else if ( OccupySlot( bits_SLOTS_HGRUNT_ENGAGE ) )
+				{
+					//!!!KELLY - grunt cannot see the enemy and has just decided to 
+					// charge the enemy's position. 
+					if (FOkToSpeak())// && RANDOM_LONG(0,1))
+					{
+						//SENTENCEG_PlayRndSz( ENT(pev), "HG_CHARGE", HGRUNT_SENTENCE_VOLUME, GRUNT_ATTN, 0, m_voicePitch);
+						m_iSentence = HGRUNT_SENT_CHARGE;
+						//JustSpoke();
+					}
+
+					return GetScheduleOfType( SCHED_GRUNT_ESTABLISH_LINE_OF_FIRE );
+				}
+				else
+				{
+					//!!!KELLY - grunt is going to stay put for a couple seconds to see if
+					// the enemy wanders back out into the open, or approaches the
+					// grunt's covered position. Good place for a taunt, I guess?
+					if (FOkToSpeak() && RANDOM_LONG(0,1))
+					{
+						SENTENCEG_PlayRndSz( ENT(pev), "HG_TAUNT", HGRUNT_SENTENCE_VOLUME, GRUNT_ATTN, 0, m_voicePitch);
+						JustSpoke();
+					}
+					return GetScheduleOfType( SCHED_STANDOFF );
+				}
+			}
+			
+			if ( HasConditions( bits_COND_SEE_ENEMY ) && !HasConditions ( bits_COND_CAN_RANGE_ATTACK1 ) )
+			{
+				return GetScheduleOfType ( SCHED_GRUNT_ESTABLISH_LINE_OF_FIRE );
+			}
+		}
+	}
+	
+	// no special cases here, call the base class
+	return CSquadMonster :: GetSchedule();
+}
+
+//=========================================================
+//=========================================================
+Schedule_t* CHGrunt :: GetScheduleOfType ( int Type ) 
+{
+	switch	( Type )
+	{
+	case SCHED_TAKE_COVER_FROM_ENEMY:
+		{
+			if ( InSquad() )
+			{
+				if ( g_iSkillLevel == SKILL_HARD && HasConditions( bits_COND_CAN_RANGE_ATTACK2 ) && OccupySlot( bits_SLOTS_HGRUNT_GRENADE ) )
+				{
+					if (FOkToSpeak())
+					{
+						SENTENCEG_PlayRndSz( ENT(pev), "HG_THROW", HGRUNT_SENTENCE_VOLUME, GRUNT_ATTN, 0, m_voicePitch);
+						JustSpoke();
+					}
+					return slGruntTossGrenadeCover;
+				}
+				else
+				{
+					return &slGruntTakeCover[ 0 ];
+				}
+			}
+			else
+			{
+				if ( RANDOM_LONG(0,1) )
+				{
+					return &slGruntTakeCover[ 0 ];
+				}
+				else
+				{
+					return &slGruntGrenadeCover[ 0 ];
+				}
+			}
+		}
+	case SCHED_TAKE_COVER_FROM_BEST_SOUND:
+		{
+			return &slGruntTakeCoverFromBestSound[ 0 ];
+		}
+	case SCHED_GRUNT_TAKECOVER_FAILED:
+		{
+			if ( HasConditions( bits_COND_CAN_RANGE_ATTACK1 ) && OccupySlot( bits_SLOTS_HGRUNT_ENGAGE ) )
+			{
+				return GetScheduleOfType( SCHED_RANGE_ATTACK1 );
+			}
+
+			return GetScheduleOfType ( SCHED_FAIL );
+		}
+		break;
+	case SCHED_GRUNT_ELOF_FAIL:
+		{
+			// human grunt is unable to move to a position that allows him to attack the enemy.
+			return GetScheduleOfType ( SCHED_TAKE_COVER_FROM_ENEMY );
+		}
+		break;
+	case SCHED_GRUNT_ESTABLISH_LINE_OF_FIRE:
+		{
+			return &slGruntEstablishLineOfFire[ 0 ];
+		}
+		break;
+	case SCHED_RANGE_ATTACK1:
+		{
+			// randomly stand or crouch
+			if (RANDOM_LONG(0,9) == 0)
+				m_fStanding = RANDOM_LONG(0,1);
+		 
+			if (m_fStanding)
+				return &slGruntRangeAttack1B[ 0 ];
+			else
+				return &slGruntRangeAttack1A[ 0 ];
+		}
+	case SCHED_RANGE_ATTACK2:
+		{
+			return &slGruntRangeAttack2[ 0 ];
+		}
+	case SCHED_COMBAT_FACE:
+		{
+			return &slGruntCombatFace[ 0 ];
+		}
+	case SCHED_GRUNT_WAIT_FACE_ENEMY:
+		{
+			return &slGruntWaitInCover[ 0 ];
+		}
+	case SCHED_GRUNT_SWEEP:
+		{
+			return &slGruntSweep[ 0 ];
+		}
+	case SCHED_GRUNT_COVER_AND_RELOAD:
+		{
+			return &slGruntHideReload[ 0 ];
+		}
+	case SCHED_GRUNT_FOUND_ENEMY:
+		{
+			return &slGruntFoundEnemy[ 0 ];
+		}
+	case SCHED_VICTORY_DANCE:
+		{
+			if ( InSquad() )
+			{
+				if ( !IsLeader() )
+				{
+					return &slGruntFail[ 0 ];
+				}
+			}
+
+			return &slGruntVictoryDance[ 0 ];
+		}
+	case SCHED_GRUNT_SUPPRESS:
+		{
+			if ( m_hEnemy->IsPlayer() && m_fFirstEncounter )
+			{
+				m_fFirstEncounter = FALSE;// after first encounter, leader won't issue handsigns anymore when he has a new enemy
+				return &slGruntSignalSuppress[ 0 ];
+			}
+			else
+			{
+				return &slGruntSuppress[ 0 ];
+			}
+		}
+	case SCHED_FAIL:
+		{
+			if ( m_hEnemy != NULL )
+			{
+				// grunt has an enemy, so pick a different default fail schedule most likely to help recover.
+				return &slGruntCombatFail[ 0 ];
+			}
+
+			return &slGruntFail[ 0 ];
+		}
+	case SCHED_GRUNT_REPEL:
+		{
+			if (pev->velocity.z > -128)
+				pev->velocity.z -= 32;
+			return &slGruntRepel[ 0 ];
+		}
+	case SCHED_GRUNT_REPEL_ATTACK:
+		{
+			if (pev->velocity.z > -128)
+				pev->velocity.z -= 32;
+			return &slGruntRepelAttack[ 0 ];
+		}
+	case SCHED_GRUNT_REPEL_LAND:
+		{
+			return &slGruntRepelLand[ 0 ];
+		}
+	default:
+		{
+			return CSquadMonster :: GetScheduleOfType ( Type );
+		}
+	}
+}
+
+
+//=========================================================
+// CHGruntRepel - when triggered, spawns a monster_human_grunt
+// repelling down a line.
+//=========================================================
+
+class CHGruntRepel : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void EXPORT RepelUse ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	int m_iSpriteTexture;	// Don't save, precache
+};
+
+LINK_ENTITY_TO_CLASS( monster_grunt_repel, CHGruntRepel );
+
+void CHGruntRepel::Spawn( void )
+{
+	Precache( );
+	pev->solid = SOLID_NOT;
+
+	SetUse( &CHGruntRepel::RepelUse );
+}
+
+void CHGruntRepel::Precache( void )
+{
+	UTIL_PrecacheOther( "monster_human_grunt" );
+	m_iSpriteTexture = PRECACHE_MODEL( "sprites/rope.spr" );
+}
+
+void CHGruntRepel::RepelUse ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	TraceResult tr;
+	UTIL_TraceLine( pev->origin, pev->origin + Vector( (int)0, (int)0, (int)-4096.0), dont_ignore_monsters, ENT(pev), &tr);
+	/*
+	if ( tr.pHit && Instance( tr.pHit )->pev->solid != SOLID_BSP) 
+		return NULL;
+	*/
+
+	CBaseEntity *pEntity = Create( "monster_human_grunt", pev->origin, pev->angles );
+	CBaseMonster *pGrunt = pEntity->MyMonsterPointer( );
+	pGrunt->pev->movetype = MOVETYPE_FLY;
+	pGrunt->pev->velocity = Vector( (float)0, (float)0, (float)RANDOM_FLOAT( -196, -128 ) );
+	pGrunt->SetActivity( ACT_GLIDE );
+	// UNDONE: position?
+	pGrunt->m_vecLastPosition = tr.vecEndPos;
+
+	CBeam *pBeam = CBeam::BeamCreate( "sprites/rope.spr", 10 );
+	pBeam->PointEntInit( pev->origin + Vector(0,0,112), pGrunt->entindex() );
+	pBeam->SetFlags( BEAM_FSOLID );
+	pBeam->SetColor( 255, 255, 255 );
+	pBeam->SetThink( &CHGruntRepel::SUB_Remove );
+	pBeam->pev->nextthink = gpGlobals->time + -4096.0 * tr.flFraction / pGrunt->pev->velocity.z + 0.5;
+
+	UTIL_Remove( this );
+}
+
+
+
+//=========================================================
+// DEAD HGRUNT PROP
+//=========================================================
+class CDeadHGrunt : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	int	Classify ( void ) { return	CLASS_HUMAN_MILITARY; }
+
+	void KeyValue( KeyValueData *pkvd );
+
+	int	m_iPose;// which sequence to display	-- temporary, don't need to save
+	static char *m_szPoses[3];
+};
+
+char *CDeadHGrunt::m_szPoses[] = { "deadstomach", "deadside", "deadsitting" };
+
+void CDeadHGrunt::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "pose"))
+	{
+		m_iPose = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else 
+		CBaseMonster::KeyValue( pkvd );
+}
+
+LINK_ENTITY_TO_CLASS( monster_hgrunt_dead, CDeadHGrunt );
+
+//=========================================================
+// ********** DeadHGrunt SPAWN **********
+//=========================================================
+void CDeadHGrunt :: Spawn( void )
+{
+	PRECACHE_MODEL("models/hgrunt.mdl");
+	SET_MODEL(ENT(pev), "models/hgrunt.mdl");
+
+	pev->effects		= 0;
+	pev->yaw_speed		= 8;
+	pev->sequence		= 0;
+	m_bloodColor		= BLOOD_COLOR_RED;
+
+	pev->sequence = LookupSequence( m_szPoses[m_iPose] );
+
+	if (pev->sequence == -1)
+	{
+		ALERT ( at_console, "Dead hgrunt with bad pose\n" );
+	}
+
+	// Corpses have less health
+	pev->health			= 8;
+
+	// map old bodies onto new bodies
+	switch( pev->body )
+	{
+	case 0: // Grunt with Gun
+		pev->body = 0;
+		pev->skin = 0;
+		SetBodygroup( HEAD_GROUP, HEAD_GRUNT );
+		SetBodygroup( GUN_GROUP, GUN_MP5 );
+		break;
+	case 1: // Commander with Gun
+		pev->body = 0;
+		pev->skin = 0;
+		SetBodygroup( HEAD_GROUP, HEAD_COMMANDER );
+		SetBodygroup( GUN_GROUP, GUN_MP5 );
+		break;
+	case 2: // Grunt no Gun
+		pev->body = 0;
+		pev->skin = 0;
+		SetBodygroup( HEAD_GROUP, HEAD_GRUNT );
+		SetBodygroup( GUN_GROUP, GUN_NONE );
+		break;
+	case 3: // Commander no Gun
+		pev->body = 0;
+		pev->skin = 0;
+		SetBodygroup( HEAD_GROUP, HEAD_COMMANDER );
+		SetBodygroup( GUN_GROUP, GUN_NONE );
+		break;
+	}
+
+	MonsterInitDead();
+}
diff --git a/main/source/dlls/hl.def b/main/source/dlls/hl.def
new file mode 100644
index 00000000..2ed4893a
--- /dev/null
+++ b/main/source/dlls/hl.def
@@ -0,0 +1,5 @@
+LIBRARY ns
+EXPORTS
+	GiveFnptrsToDll			@1
+SECTIONS
+	.data READ WRITE
diff --git a/main/source/dlls/hl.vcproj b/main/source/dlls/hl.vcproj
new file mode 100644
index 00000000..08fcf44c
--- /dev/null
+++ b/main/source/dlls/hl.vcproj
@@ -0,0 +1,2920 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="hl"
+	RootNamespace="hl"
+	SccProjectName=""
+	SccAuxPath=""
+	SccLocalPath=""
+	SccProvider="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+			IntermediateDirectory="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="$(SolutionDir);$(SolutionDir)\dlls;$(SolutionDir)\engine;$(SolutionDir)\common;$(SolutionDir)\pm_shared;$(SolutionDir)\game_shared;$(SolutionDir)\lua\include"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;AVH_SERVER;$(NOINHERIT)"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Releasehl/hl.pch"
+				AssemblerListingLocation="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ObjectFile="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ProgramDataBaseFileName="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="3"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib ws2_32.lib curl.lib particles.lib textrep.lib util.lib"
+				OutputFile="$(SolutionDir)\..\dlls\ns.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="$(SolutionDir)\lib\$(ConfigurationName)"
+				IgnoreDefaultLibraryNames=""
+				ModuleDefinitionFile=".\hl.def"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=""
+				SubSystem="2"
+				ImportLibrary="$(SolutionDir)\temp\$(ProjectName)\$(ConfigurationName)/ns.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Releasehl/hl.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\engine"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+			IntermediateDirectory="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				OptimizeForProcessor="1"
+				AdditionalIncludeDirectories="$(SolutionDir);$(SolutionDir)\dlls;$(SolutionDir)\engine;$(SolutionDir)\common;$(SolutionDir)\pm_shared;$(SolutionDir)\game_shared;$(SolutionDir)\lua\include"
+				PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;AVH_SERVER;$(NOINHERIT)"
+				RuntimeLibrary="1"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\debughl/hl.pch"
+				AssemblerListingLocation="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ObjectFile="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ProgramDataBaseFileName="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib ws2_32.lib curl.lib particles.lib textrep.lib util.lib"
+				OutputFile="$(SolutionDir)..\dlls\ns.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="$(SolutionDir)lib\$(ConfigurationName)"
+				IgnoreDefaultLibraryNames="libcmt.lib"
+				ModuleDefinitionFile=".\hl.def"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(SolutionDir)..\dlls/ns.pdb"
+				SubSystem="2"
+				ImportLibrary="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/ns.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\debughl/hl.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\engine"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90">
+			<File
+				RelativePath="animating.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="animation.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="bmodels.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="buttons.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="cbase.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="client.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="combat.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="doors.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="effects.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="egon.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="explode.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="func_break.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="func_tank.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="game.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="gamerules.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="gauss.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="globals.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="h_ai.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="h_battery.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="h_cycler.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="h_export.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="items.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="lights.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="maprules.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="mpstubb.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="multiplay_gamerules.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="observer.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="pathcorner.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="plane.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="plats.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="player.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\pm_shared\pm_debug.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\pm_shared\pm_math.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\pm_shared\pm_shared.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="satchel.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="shotgun.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="singleplay_gamerules.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="skill.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="sound.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="soundent.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="spectator.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="squeakgrenade.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="subs.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="teamplay_gamerules.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="triggers.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="turret.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="util.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\game_shared\voice_banmgr.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\game_shared\voice_gamemgr.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="weapons.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="world.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="xen.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;fi;fd">
+			<File
+				RelativePath="activity.h">
+			</File>
+			<File
+				RelativePath="activitymap.h">
+			</File>
+			<File
+				RelativePath="animation.h">
+			</File>
+			<File
+				RelativePath="basemonster.h">
+			</File>
+			<File
+				RelativePath="cbase.h">
+			</File>
+			<File
+				RelativePath="cdll_dll.h">
+			</File>
+			<File
+				RelativePath="client.h">
+			</File>
+			<File
+				RelativePath="decals.h">
+			</File>
+			<File
+				RelativePath="defaultai.h">
+			</File>
+			<File
+				RelativePath="doors.h">
+			</File>
+			<File
+				RelativePath="effects.h">
+			</File>
+			<File
+				RelativePath="..\engine\eiface.h">
+			</File>
+			<File
+				RelativePath="enginecallback.h">
+			</File>
+			<File
+				RelativePath="explode.h">
+			</File>
+			<File
+				RelativePath="extdll.h">
+			</File>
+			<File
+				RelativePath="flyingmonster.h">
+			</File>
+			<File
+				RelativePath="func_break.h">
+			</File>
+			<File
+				RelativePath="gamerules.h">
+			</File>
+			<File
+				RelativePath="hornet.h">
+			</File>
+			<File
+				RelativePath="items.h">
+			</File>
+			<File
+				RelativePath="monsterevent.h">
+			</File>
+			<File
+				RelativePath="monsters.h">
+			</File>
+			<File
+				RelativePath="nodes.h">
+			</File>
+			<File
+				RelativePath="plane.h">
+			</File>
+			<File
+				RelativePath="player.h">
+			</File>
+			<File
+				RelativePath="..\pm_shared\pm_debug.h">
+			</File>
+			<File
+				RelativePath="..\pm_shared\pm_defs.h">
+			</File>
+			<File
+				RelativePath="..\pm_shared\pm_info.h">
+			</File>
+			<File
+				RelativePath="..\pm_shared\pm_materials.h">
+			</File>
+			<File
+				RelativePath="..\pm_shared\pm_movevars.h">
+			</File>
+			<File
+				RelativePath="..\pm_shared\pm_shared.h">
+			</File>
+			<File
+				RelativePath="saverestore.h">
+			</File>
+			<File
+				RelativePath="schedule.h">
+			</File>
+			<File
+				RelativePath="scripted.h">
+			</File>
+			<File
+				RelativePath="scriptevent.h">
+			</File>
+			<File
+				RelativePath="skill.h">
+			</File>
+			<File
+				RelativePath="soundent.h">
+			</File>
+			<File
+				RelativePath="spectator.h">
+			</File>
+			<File
+				RelativePath="squadmonster.h">
+			</File>
+			<File
+				RelativePath="talkmonster.h">
+			</File>
+			<File
+				RelativePath="teamplay_gamerules.h">
+			</File>
+			<File
+				RelativePath="trains.h">
+			</File>
+			<File
+				RelativePath="util.h">
+			</File>
+			<File
+				RelativePath="vector.h">
+			</File>
+			<File
+				RelativePath="weapons.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="mod"
+			Filter="">
+			<File
+				RelativePath="..\mod\AnimationUtil.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AnimationUtil.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHAlienEquipment.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHAlienEquipment.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHAlienEquipmentConstants.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHAlienTurret.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHAlienTurret.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHAlienWeapon.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHAlienWeapon.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHAssert.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHBalance.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHBaseBuildable.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHBaseBuildable.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHBaseInfoLocation.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHBaseInfoLocation.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHBuildable.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHBuildable.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHCloakable.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHCloakable.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHCombat.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHCommandConstants.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHConsoleCommands.cpp">
+			</File>
+			<File
+				RelativePath="..\mod\AvHConstants.cpp">
+			</File>
+			<File
+				RelativePath="..\mod\AvHConstants.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHCurl.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHEntities.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHEntities.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHEntityHierarchy.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHEntityHierarchy.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHGamerules.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHGamerules.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHHive.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHHive.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHMapExtents.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHMapExtents.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHMarineEquipment.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHMarineEquipment.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHMarineTurret.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHMarineTurret.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHMarineWeapon.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHMarineWeapon.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHMiniMap.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHMinimap.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHMovementUtil.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHMovementUtil.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHOrder.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHOrder.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHPlayer.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHPlayer.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHPlayerUpgrade.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHPlayerUpgrade.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHPushableBuildable.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHPushableBuildable.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHReinforceable.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHReinforceable.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHResearchManager.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHResearchManager.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHScriptManager.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHScriptManager.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHScriptServer.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHScriptShared.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHSelectionHelper.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHSelectionHelper.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHServerPlayerData.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHServerPlayerData.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHServerUtil.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHServerUtil.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHServerVariables.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHSharedMovementInfo.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHSharedMovementInfo.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHSharedUtil.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHSharedUtil.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHSiegeTurret.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHSiegeTurret.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHSoundListManager.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHSoundListManager.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHSpawn.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHSpawn.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHSpecials.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHTeam.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHTeam.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHTechNodes.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHTechNodes.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHTechSlotManager.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHTechSlotManager.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHTurret.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHTurret.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHVisibleBlipList.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHVisibleBlipList.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHVoiceHelper.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHVoiceHelper.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHWeldable.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\AvHWeldable.h">
+			</File>
+			<File
+				RelativePath="..\mod\AvHWorldUpdate.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\CollisionChecker.cpp">
+			</File>
+			<File
+				RelativePath="..\mod\CollisionChecker.h">
+			</File>
+			<File
+				RelativePath="..\mod\CollisionChecker_ServerOnly.cpp">
+			</File>
+			<File
+				RelativePath="..\mod\CollisionUtil.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\CollisionUtil.h">
+			</File>
+			<File
+				RelativePath="..\mod\NetworkMeter.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\NetworkMeter.h">
+			</File>
+			<File
+				RelativePath="..\mod\UPP.h">
+			</File>
+			<File
+				RelativePath="..\mod\UPPUtil.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mod\UPPUtil.h">
+			</File>
+			<Filter
+				Name="weapons"
+				Filter="">
+				<File
+					RelativePath="..\mod\AvHAcidRocketGun.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHAlienAbilities.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHAlienAbilities.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHAlienWeaponConstants.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHAlienWeapons.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHBasePlayerWeapon.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHBasePlayerWeapon.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHBileBombGun.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHBite.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHBite2.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHBlink.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHBuildingGun.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHClaws.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHDevour.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHDivineWind.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHGrenade.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHGrenadeGun.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHHealingSpray.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHHeavyMachineGun.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHItemInfo.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHKnife.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHMachineGun.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHMarineEquipmentConstants.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHMarineWeaponConstants.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHMarineWeapons.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHMetabolize.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHMine.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHParasiteGun.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHPistol.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHPrimalScream.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHSonicGun.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHSpikeGun.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHSpitGun.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHSpores.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHStomp.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHSwipe.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHUmbraGun.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHWebSpinner.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHWelder.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="ggrenade.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+			<Filter
+				Name="particles"
+				Filter="">
+				<File
+					RelativePath="..\mod\AvHParticleConstants.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHParticleSystem.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHParticleSystem.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHParticleSystemEntity.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHParticleSystemEntity.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHParticleSystemManager.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHParticleSystemManager.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHParticleTemplate.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHParticleTemplate.h">
+				</File>
+				<File
+					RelativePath="..\mod\AvHParticleTemplateServer.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\mod\AvHParticleTemplateServer.h">
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/main/source/dlls/hornet.cpp b/main/source/dlls/hornet.cpp
new file mode 100644
index 00000000..8517b974
--- /dev/null
+++ b/main/source/dlls/hornet.cpp
@@ -0,0 +1,419 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//=========================================================
+// Hornets
+//=========================================================
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"weapons.h"
+#include	"soundent.h"
+#include	"hornet.h"
+#include	"gamerules.h"
+
+
+int iHornetTrail;
+int iHornetPuff;
+
+LINK_ENTITY_TO_CLASS( hornet, CHornet );
+
+//=========================================================
+// Save/Restore
+//=========================================================
+TYPEDESCRIPTION	CHornet::m_SaveData[] = 
+{
+	DEFINE_FIELD( CHornet, m_flStopAttack, FIELD_TIME ),
+	DEFINE_FIELD( CHornet, m_iHornetType, FIELD_INTEGER ),
+	DEFINE_FIELD( CHornet, m_flFlySpeed, FIELD_FLOAT ),
+};
+
+IMPLEMENT_SAVERESTORE( CHornet, CBaseMonster );
+
+//=========================================================
+// don't let hornets gib, ever.
+//=========================================================
+int CHornet :: TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType )
+{
+	// filter these bits a little.
+	bitsDamageType &= ~ ( DMG_ALWAYSGIB );
+	bitsDamageType |= DMG_NEVERGIB;
+
+	return CBaseMonster :: TakeDamage ( pevInflictor, pevAttacker, flDamage, bitsDamageType );
+}
+
+//=========================================================
+//=========================================================
+void CHornet :: Spawn( void )
+{
+	Precache();
+
+	pev->movetype	= MOVETYPE_FLY;
+	pev->solid		= SOLID_BBOX;
+	pev->takedamage = DAMAGE_YES;
+	pev->flags		|= FL_MONSTER;
+	pev->health		= 1;// weak!
+	
+	if ( g_pGameRules->IsMultiplayer() )
+	{
+		// hornets don't live as long in multiplayer
+		m_flStopAttack = gpGlobals->time + 3.5;
+	}
+	else
+	{
+		m_flStopAttack	= gpGlobals->time + 5.0;
+	}
+
+	m_flFieldOfView = 0.9; // +- 25 degrees
+
+	if ( RANDOM_LONG ( 1, 5 ) <= 2 )
+	{
+		m_iHornetType = HORNET_TYPE_RED;
+		m_flFlySpeed = HORNET_RED_SPEED;
+	}
+	else
+	{
+		m_iHornetType = HORNET_TYPE_ORANGE;
+		m_flFlySpeed = HORNET_ORANGE_SPEED;
+	}
+
+	SET_MODEL(ENT( pev ), "models/hornet.mdl");
+	UTIL_SetSize( pev, Vector( -4, -4, -4 ), Vector( 4, 4, 4 ) );
+
+	SetTouch( &CHornet::DieTouch );
+	SetThink( &CHornet::StartTrack );
+
+	edict_t *pSoundEnt = pev->owner;
+	if ( !pSoundEnt )
+		pSoundEnt = edict();
+
+	if ( !FNullEnt(pev->owner) && (pev->owner->v.flags & FL_CLIENT) )
+	{
+		pev->dmg = gSkillData.plrDmgHornet;
+	}
+	else
+	{
+		// no real owner, or owner isn't a client. 
+		pev->dmg = gSkillData.monDmgHornet;
+	}
+	
+	pev->nextthink = gpGlobals->time + 0.1;
+	ResetSequenceInfo( );
+}
+
+
+void CHornet :: Precache()
+{
+	PRECACHE_MODEL("models/hornet.mdl");
+
+	PRECACHE_SOUND( "agrunt/ag_fire1.wav" );
+	PRECACHE_SOUND( "agrunt/ag_fire2.wav" );
+	PRECACHE_SOUND( "agrunt/ag_fire3.wav" );
+
+	PRECACHE_SOUND( "hornet/ag_buzz1.wav" );
+	PRECACHE_SOUND( "hornet/ag_buzz2.wav" );
+	PRECACHE_SOUND( "hornet/ag_buzz3.wav" );
+
+	PRECACHE_SOUND( "hornet/ag_hornethit1.wav" );
+	PRECACHE_SOUND( "hornet/ag_hornethit2.wav" );
+	PRECACHE_SOUND( "hornet/ag_hornethit3.wav" );
+
+	iHornetPuff = PRECACHE_MODEL( "sprites/muz1.spr" );
+	iHornetTrail = PRECACHE_MODEL("sprites/laserbeam.spr");
+}	
+
+//=========================================================
+// hornets will never get mad at each other, no matter who the owner is.
+//=========================================================
+int CHornet::IRelationship ( CBaseEntity *pTarget )
+{
+	if ( pTarget->pev->modelindex == pev->modelindex )
+	{
+		return R_NO;
+	}
+
+	return CBaseMonster :: IRelationship( pTarget );
+}
+
+//=========================================================
+// ID's Hornet as their owner
+//=========================================================
+int CHornet::Classify ( void )
+{
+
+	if ( pev->owner && pev->owner->v.flags & FL_CLIENT)
+	{
+		return CLASS_PLAYER_BIOWEAPON;
+	}
+
+	return	CLASS_ALIEN_BIOWEAPON;
+}
+
+//=========================================================
+// StartTrack - starts a hornet out tracking its target
+//=========================================================
+void CHornet :: StartTrack ( void )
+{
+	IgniteTrail();
+
+	SetTouch( &CHornet::TrackTouch );
+	SetThink( &CHornet::TrackTarget );
+
+	pev->nextthink = gpGlobals->time + 0.1;
+}
+
+//=========================================================
+// StartDart - starts a hornet out just flying straight.
+//=========================================================
+void CHornet :: StartDart ( void )
+{
+	IgniteTrail();
+
+	SetTouch( &CHornet::DartTouch );
+
+	SetThink( &CHornet::SUB_Remove );
+	pev->nextthink = gpGlobals->time + 4;
+}
+
+void CHornet::IgniteTrail( void )
+{
+/*
+
+  ted's suggested trail colors:
+
+r161
+g25
+b97
+
+r173
+g39
+b14
+
+old colors
+		case HORNET_TYPE_RED:
+			WRITE_BYTE( 255 );   // r, g, b
+			WRITE_BYTE( 128 );   // r, g, b
+			WRITE_BYTE( 0 );   // r, g, b
+			break;
+		case HORNET_TYPE_ORANGE:
+			WRITE_BYTE( 0   );   // r, g, b
+			WRITE_BYTE( 100 );   // r, g, b
+			WRITE_BYTE( 255 );   // r, g, b
+			break;
+	
+*/
+
+	// trail
+	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+		WRITE_BYTE(  TE_BEAMFOLLOW );
+		WRITE_SHORT( entindex() );	// entity
+		WRITE_SHORT( iHornetTrail );	// model
+		WRITE_BYTE( 10 ); // life
+		WRITE_BYTE( 2 );  // width
+		
+		switch ( m_iHornetType )
+		{
+		case HORNET_TYPE_RED:
+			WRITE_BYTE( 179 );   // r, g, b
+			WRITE_BYTE( 39 );   // r, g, b
+			WRITE_BYTE( 14 );   // r, g, b
+			break;
+		case HORNET_TYPE_ORANGE:
+			WRITE_BYTE( 255 );   // r, g, b
+			WRITE_BYTE( 128 );   // r, g, b
+			WRITE_BYTE( 0 );   // r, g, b
+			break;
+		}
+
+		WRITE_BYTE( 128 );	// brightness
+
+	MESSAGE_END();
+}
+
+//=========================================================
+// Hornet is flying, gently tracking target
+//=========================================================
+void CHornet :: TrackTarget ( void )
+{
+	Vector	vecFlightDir;
+	Vector	vecDirToEnemy;
+	float	flDelta;
+
+	StudioFrameAdvance( );
+
+	if (gpGlobals->time > m_flStopAttack)
+	{
+		SetTouch( NULL );
+		SetThink( &CHornet::SUB_Remove );
+		pev->nextthink = gpGlobals->time + 0.1;
+		return;
+	}
+
+	// UNDONE: The player pointer should come back after returning from another level
+	if ( m_hEnemy == NULL )
+	{// enemy is dead.
+		Look( 512 );
+		m_hEnemy = BestVisibleEnemy( );
+	}
+	
+	if ( m_hEnemy != NULL && FVisible( m_hEnemy ))
+	{
+		m_vecEnemyLKP = m_hEnemy->BodyTarget( pev->origin );
+	}
+	else
+	{
+		m_vecEnemyLKP = m_vecEnemyLKP + pev->velocity * m_flFlySpeed * 0.1;
+	}
+
+	vecDirToEnemy = ( m_vecEnemyLKP - pev->origin ).Normalize();
+
+	if (pev->velocity.Length() < 0.1)
+		vecFlightDir = vecDirToEnemy;
+	else 
+		vecFlightDir = pev->velocity.Normalize();
+
+	// measure how far the turn is, the wider the turn, the slow we'll go this time.
+	flDelta = DotProduct ( vecFlightDir, vecDirToEnemy );
+	
+	if ( flDelta < 0.5 )
+	{// hafta turn wide again. play sound
+		switch (RANDOM_LONG(0,2))
+		{
+		case 0:	EMIT_SOUND( ENT(pev), CHAN_VOICE, "hornet/ag_buzz1.wav", HORNET_BUZZ_VOLUME, ATTN_NORM);	break;
+		case 1:	EMIT_SOUND( ENT(pev), CHAN_VOICE, "hornet/ag_buzz2.wav", HORNET_BUZZ_VOLUME, ATTN_NORM);	break;
+		case 2:	EMIT_SOUND( ENT(pev), CHAN_VOICE, "hornet/ag_buzz3.wav", HORNET_BUZZ_VOLUME, ATTN_NORM);	break;
+		}
+	}
+
+	if ( flDelta <= 0 && m_iHornetType == HORNET_TYPE_RED )
+	{// no flying backwards, but we don't want to invert this, cause we'd go fast when we have to turn REAL far.
+		flDelta = 0.25;
+	}
+
+	pev->velocity = ( vecFlightDir + vecDirToEnemy).Normalize();
+
+	if ( pev->owner && (pev->owner->v.flags & FL_MONSTER) )
+	{
+		// random pattern only applies to hornets fired by monsters, not players. 
+
+		pev->velocity.x += RANDOM_FLOAT ( -0.10, 0.10 );// scramble the flight dir a bit.
+		pev->velocity.y += RANDOM_FLOAT ( -0.10, 0.10 );
+		pev->velocity.z += RANDOM_FLOAT ( -0.10, 0.10 );
+	}
+	
+	switch ( m_iHornetType )
+	{
+		case HORNET_TYPE_RED:
+			pev->velocity = pev->velocity * ( m_flFlySpeed * flDelta );// scale the dir by the ( speed * width of turn )
+			pev->nextthink = gpGlobals->time + RANDOM_FLOAT( 0.1, 0.3 );
+			break;
+		case HORNET_TYPE_ORANGE:
+			pev->velocity = pev->velocity * m_flFlySpeed;// do not have to slow down to turn.
+			pev->nextthink = gpGlobals->time + 0.1;// fixed think time
+			break;
+	}
+
+	pev->angles = UTIL_VecToAngles (pev->velocity);
+
+	pev->solid = SOLID_BBOX;
+
+	// if hornet is close to the enemy, jet in a straight line for a half second.
+	// (only in the single player game)
+	if ( m_hEnemy != NULL && !g_pGameRules->IsMultiplayer() )
+	{
+		if ( flDelta >= 0.4 && ( pev->origin - m_vecEnemyLKP ).Length() <= 300 )
+		{
+			MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, pev->origin );
+				WRITE_BYTE( TE_SPRITE );
+				WRITE_COORD( pev->origin.x);	// pos
+				WRITE_COORD( pev->origin.y);
+				WRITE_COORD( pev->origin.z);
+				WRITE_SHORT( iHornetPuff );		// model
+				// WRITE_BYTE( 0 );				// life * 10
+				WRITE_BYTE( 2 );				// size * 10
+				WRITE_BYTE( 128 );			// brightness
+			MESSAGE_END();
+
+			switch (RANDOM_LONG(0,2))
+			{
+			case 0:	EMIT_SOUND( ENT(pev), CHAN_VOICE, "hornet/ag_buzz1.wav", HORNET_BUZZ_VOLUME, ATTN_NORM);	break;
+			case 1:	EMIT_SOUND( ENT(pev), CHAN_VOICE, "hornet/ag_buzz2.wav", HORNET_BUZZ_VOLUME, ATTN_NORM);	break;
+			case 2:	EMIT_SOUND( ENT(pev), CHAN_VOICE, "hornet/ag_buzz3.wav", HORNET_BUZZ_VOLUME, ATTN_NORM);	break;
+			}
+			pev->velocity = pev->velocity * 2;
+			pev->nextthink = gpGlobals->time + 1.0;
+			// don't attack again
+			m_flStopAttack = gpGlobals->time;
+		}
+	}
+}
+
+//=========================================================
+// Tracking Hornet hit something
+//=========================================================
+void CHornet :: TrackTouch ( CBaseEntity *pOther )
+{
+	if ( pOther->edict() == pev->owner || pOther->pev->modelindex == pev->modelindex )
+	{// bumped into the guy that shot it.
+		pev->solid = SOLID_NOT;
+		return;
+	}
+
+	if ( IRelationship( pOther ) <= R_NO )
+	{
+		// hit something we don't want to hurt, so turn around.
+
+		pev->velocity = pev->velocity.Normalize();
+
+		pev->velocity.x *= -1;
+		pev->velocity.y *= -1;
+
+		pev->origin = pev->origin + pev->velocity * 4; // bounce the hornet off a bit.
+		pev->velocity = pev->velocity * m_flFlySpeed;
+
+		return;
+	}
+
+	DieTouch( pOther );
+}
+
+void CHornet::DartTouch( CBaseEntity *pOther )
+{
+	DieTouch( pOther );
+}
+
+void CHornet::DieTouch ( CBaseEntity *pOther )
+{
+	if ( pOther && pOther->pev->takedamage )
+	{// do the damage
+
+		switch (RANDOM_LONG(0,2))
+		{// buzz when you plug someone
+			case 0:	EMIT_SOUND( ENT(pev), CHAN_VOICE, "hornet/ag_hornethit1.wav", 1, ATTN_NORM);	break;
+			case 1:	EMIT_SOUND( ENT(pev), CHAN_VOICE, "hornet/ag_hornethit2.wav", 1, ATTN_NORM);	break;
+			case 2:	EMIT_SOUND( ENT(pev), CHAN_VOICE, "hornet/ag_hornethit3.wav", 1, ATTN_NORM);	break;
+		}
+			
+		pOther->TakeDamage( pev, VARS( pev->owner ), pev->dmg, DMG_BULLET );
+	}
+
+	pev->modelindex = 0;// so will disappear for the 0.1 secs we wait until NEXTTHINK gets rid
+	pev->solid = SOLID_NOT;
+
+	SetThink &CHornet::( SUB_Remove );
+	pev->nextthink = gpGlobals->time + 1;// stick around long enough for the sound to finish!
+}
+
diff --git a/main/source/dlls/hornet.h b/main/source/dlls/hornet.h
new file mode 100644
index 00000000..2145c76f
--- /dev/null
+++ b/main/source/dlls/hornet.h
@@ -0,0 +1,58 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//=========================================================
+// Hornets
+//=========================================================
+
+//=========================================================
+// Hornet Defines
+//=========================================================
+#define HORNET_TYPE_RED			0
+#define HORNET_TYPE_ORANGE		1
+#define HORNET_RED_SPEED		(float)600
+#define HORNET_ORANGE_SPEED		(float)800
+#define	HORNET_BUZZ_VOLUME		(float)0.8
+
+extern int iHornetPuff;
+
+//=========================================================
+// Hornet - this is the projectile that the Alien Grunt fires.
+//=========================================================
+class CHornet : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	int	 Classify ( void );
+	int  IRelationship ( CBaseEntity *pTarget );
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	void IgniteTrail( void );
+	void EXPORT StartTrack ( void );
+	void EXPORT StartDart ( void );
+	void EXPORT TrackTarget ( void );
+	void EXPORT TrackTouch ( CBaseEntity *pOther );
+	void EXPORT DartTouch( CBaseEntity *pOther );
+	void EXPORT DieTouch ( CBaseEntity *pOther );
+	
+	int TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType );
+
+	float			m_flStopAttack;
+	int				m_iHornetType;
+	float			m_flFlySpeed;
+};
+
diff --git a/main/source/dlls/hornetgun.cpp b/main/source/dlls/hornetgun.cpp
new file mode 100644
index 00000000..d56e4916
--- /dev/null
+++ b/main/source/dlls/hornetgun.cpp
@@ -0,0 +1,305 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD )
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "player.h"
+#include "hornet.h"
+#include "gamerules.h"
+
+
+enum hgun_e {
+	HGUN_IDLE1 = 0,
+	HGUN_FIDGETSWAY,
+	HGUN_FIDGETSHAKE,
+	HGUN_DOWN,
+	HGUN_UP,
+	HGUN_SHOOT
+};
+
+enum firemode_e
+{
+	FIREMODE_TRACK = 0,
+	FIREMODE_FAST
+};
+
+
+LINK_ENTITY_TO_CLASS( weapon_hornetgun, CHgun );
+
+BOOL CHgun::IsUseable( void )
+{
+	return TRUE;
+}
+
+void CHgun::Spawn( )
+{
+	Precache( );
+	m_iId = WEAPON_HORNETGUN;
+	SET_MODEL(ENT(pev), "models/w_hgun.mdl");
+
+	m_iDefaultAmmo = HIVEHAND_DEFAULT_GIVE;
+	m_iFirePhase = 0;
+
+	FallInit();// get ready to fall down.
+}
+
+
+void CHgun::Precache( void )
+{
+	PRECACHE_MODEL("models/v_hgun.mdl");
+	PRECACHE_MODEL("models/w_hgun.mdl");
+	PRECACHE_MODEL("models/p_hgun.mdl");
+
+	m_usHornetFire = PRECACHE_EVENT ( 1, "events/firehornet.sc" );
+
+	UTIL_PrecacheOther("hornet");
+}
+
+int CHgun::AddToPlayer( CBasePlayer *pPlayer )
+{
+	if ( CBasePlayerWeapon::AddToPlayer( pPlayer ) )
+	{
+
+#ifndef CLIENT_DLL
+		if ( g_pGameRules->IsMultiplayer() )
+		{
+			// in multiplayer, all hivehands come full. 
+			pPlayer->m_rgAmmo[ PrimaryAmmoIndex() ] = HORNET_MAX_CARRY;
+		}
+#endif
+
+		MESSAGE_BEGIN( MSG_ONE, gmsgWeapPickup, NULL, pPlayer->pev );
+			WRITE_BYTE( m_iId );
+		MESSAGE_END();
+		return TRUE;
+	}
+	return FALSE;
+}
+
+int CHgun::GetItemInfo(ItemInfo *p)
+{
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = "Hornets";
+	p->iMaxAmmo1 = HORNET_MAX_CARRY;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = -1;
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iSlot = 3;
+	p->iPosition = 3;
+	p->iId = m_iId = WEAPON_HORNETGUN;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD;
+	p->iWeight = HORNETGUN_WEIGHT;
+
+	return 1;
+}
+
+
+BOOL CHgun::Deploy( )
+{
+	return DefaultDeploy( "models/v_hgun.mdl", "models/p_hgun.mdl", HGUN_UP, "hive" );
+}
+
+void CHgun::Holster( int skiplocal /* = 0 */ )
+{
+	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 0.5;
+	SendWeaponAnim( HGUN_DOWN );
+
+	//!!!HACKHACK - can't select hornetgun if it's empty! no way to get ammo for it, either.
+	if ( !m_pPlayer->m_rgAmmo[ PrimaryAmmoIndex() ] )
+	{
+		m_pPlayer->m_rgAmmo[ PrimaryAmmoIndex() ] = 1;
+	}
+}
+
+
+void CHgun::PrimaryAttack()
+{
+	Reload( );
+
+	if (m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] <= 0)
+	{
+		return;
+	}
+
+#ifndef CLIENT_DLL
+	UTIL_MakeVectors( m_pPlayer->pev->v_angle );
+
+	CBaseEntity *pHornet = CBaseEntity::Create( "hornet", m_pPlayer->GetGunPosition( ) + gpGlobals->v_forward * 16 + gpGlobals->v_right * 8 + gpGlobals->v_up * -12, m_pPlayer->pev->v_angle, m_pPlayer->edict() );
+	pHornet->pev->velocity = gpGlobals->v_forward * 300;
+
+	m_flRechargeTime = gpGlobals->time + 0.5;
+#endif
+	
+	m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType]--;
+	
+
+	m_pPlayer->m_iWeaponVolume = QUIET_GUN_VOLUME;
+	m_pPlayer->m_iWeaponFlash = DIM_GUN_FLASH;
+
+	int flags;
+#if defined( CLIENT_WEAPONS )
+	flags = FEV_NOTHOST;
+#else
+	flags = 0;
+#endif
+
+	PLAYBACK_EVENT_FULL( flags, m_pPlayer->edict(), m_usHornetFire, 0.0, (float *)&g_vecZero, (float *)&g_vecZero, 0.0, 0.0, FIREMODE_TRACK, 0, 0, 0 );
+
+	
+
+	// player "shoot" animation
+	m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
+
+	m_flNextPrimaryAttack = m_flNextPrimaryAttack + 0.25;
+
+	if (m_flNextPrimaryAttack < UTIL_WeaponTimeBase() )
+	{
+		m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.25;
+	}
+
+	m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
+}
+
+
+
+void CHgun::SecondaryAttack( void )
+{
+	Reload();
+
+	if (m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] <= 0)
+	{
+		return;
+	}
+
+	//Wouldn't be a bad idea to completely predict these, since they fly so fast...
+#ifndef CLIENT_DLL
+	CBaseEntity *pHornet;
+	Vector vecSrc;
+
+	UTIL_MakeVectors( m_pPlayer->pev->v_angle );
+
+	vecSrc = m_pPlayer->GetGunPosition( ) + gpGlobals->v_forward * 16 + gpGlobals->v_right * 8 + gpGlobals->v_up * -12;
+
+	m_iFirePhase++;
+	switch ( m_iFirePhase )
+	{
+	case 1:
+		vecSrc = vecSrc + gpGlobals->v_up * 8;
+		break;
+	case 2:
+		vecSrc = vecSrc + gpGlobals->v_up * 8;
+		vecSrc = vecSrc + gpGlobals->v_right * 8;
+		break;
+	case 3:
+		vecSrc = vecSrc + gpGlobals->v_right * 8;
+		break;
+	case 4:
+		vecSrc = vecSrc + gpGlobals->v_up * -8;
+		vecSrc = vecSrc + gpGlobals->v_right * 8;
+		break;
+	case 5:
+		vecSrc = vecSrc + gpGlobals->v_up * -8;
+		break;
+	case 6:
+		vecSrc = vecSrc + gpGlobals->v_up * -8;
+		vecSrc = vecSrc + gpGlobals->v_right * -8;
+		break;
+	case 7:
+		vecSrc = vecSrc + gpGlobals->v_right * -8;
+		break;
+	case 8:
+		vecSrc = vecSrc + gpGlobals->v_up * 8;
+		vecSrc = vecSrc + gpGlobals->v_right * -8;
+		m_iFirePhase = 0;
+		break;
+	}
+
+	pHornet = CBaseEntity::Create( "hornet", vecSrc, m_pPlayer->pev->v_angle, m_pPlayer->edict() );
+	pHornet->pev->velocity = gpGlobals->v_forward * 1200;
+	pHornet->pev->angles = UTIL_VecToAngles( pHornet->pev->velocity );
+
+	pHornet->SetThink( &CHornet::StartDart );
+
+	m_flRechargeTime = gpGlobals->time + 0.5;
+#endif
+
+	int flags;
+#if defined( CLIENT_WEAPONS )
+	flags = FEV_NOTHOST;
+#else
+	flags = 0;
+#endif
+
+	PLAYBACK_EVENT_FULL( flags, m_pPlayer->edict(), m_usHornetFire, 0.0, (float *)&g_vecZero, (float *)&g_vecZero, 0.0, 0.0, FIREMODE_FAST, 0, 0, 0 );
+
+
+	m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType]--;
+	m_pPlayer->m_iWeaponVolume = NORMAL_GUN_VOLUME;
+	m_pPlayer->m_iWeaponFlash = DIM_GUN_FLASH;
+
+		// player "shoot" animation
+	m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
+
+	m_flNextPrimaryAttack = m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 0.1;
+	m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
+}
+
+
+void CHgun::Reload( void )
+{
+	if (m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] >= HORNET_MAX_CARRY)
+		return;
+
+	while (m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] < HORNET_MAX_CARRY && m_flRechargeTime < gpGlobals->time)
+	{
+		m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType]++;
+		m_flRechargeTime += 0.5;
+	}
+}
+
+
+void CHgun::WeaponIdle( void )
+{
+	Reload( );
+
+	if (m_flTimeWeaponIdle > UTIL_WeaponTimeBase())
+		return;
+
+	int iAnim;
+	float flRand = UTIL_SharedRandomFloat( m_pPlayer->random_seed, 0, 1 );
+	if (flRand <= 0.75)
+	{
+		iAnim = HGUN_IDLE1;
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 30.0 / 16 * (2);
+	}
+	else if (flRand <= 0.875)
+	{
+		iAnim = HGUN_FIDGETSWAY;
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 40.0 / 16.0;
+	}
+	else
+	{
+		iAnim = HGUN_FIDGETSHAKE;
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 35.0 / 16.0;
+	}
+	SendWeaponAnim( iAnim );
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/houndeye.cpp b/main/source/dlls/houndeye.cpp
new file mode 100644
index 00000000..ae5c9ec8
--- /dev/null
+++ b/main/source/dlls/houndeye.cpp
@@ -0,0 +1,1304 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// Houndeye - spooky sonic dog. 
+//=========================================================
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"schedule.h"
+#include	"animation.h"
+#include	"nodes.h"
+#include	"squadmonster.h"
+#include	"soundent.h"
+#include	"game.h"
+
+extern CGraph WorldGraph;
+
+// houndeye does 20 points of damage spread over a sphere 384 units in diameter, and each additional 
+// squad member increases the BASE damage by 110%, per the spec.
+#define HOUNDEYE_MAX_SQUAD_SIZE			4
+#define	HOUNDEYE_MAX_ATTACK_RADIUS		384
+#define	HOUNDEYE_SQUAD_BONUS			(float)1.1
+
+#define HOUNDEYE_EYE_FRAMES 4 // how many different switchable maps for the eye
+
+#define HOUNDEYE_SOUND_STARTLE_VOLUME	128 // how loud a sound has to be to badly scare a sleeping houndeye
+
+//=========================================================
+// monster-specific tasks
+//=========================================================
+enum
+{
+	TASK_HOUND_CLOSE_EYE = LAST_COMMON_TASK + 1,
+	TASK_HOUND_OPEN_EYE,
+	TASK_HOUND_THREAT_DISPLAY,
+	TASK_HOUND_FALL_ASLEEP,
+	TASK_HOUND_WAKE_UP,
+	TASK_HOUND_HOP_BACK
+};
+
+//=========================================================
+// monster-specific schedule types
+//=========================================================
+enum
+{
+	SCHED_HOUND_AGITATED = LAST_COMMON_SCHEDULE + 1,
+	SCHED_HOUND_HOP_RETREAT,
+	SCHED_HOUND_FAIL,
+};
+
+//=========================================================
+// Monster's Anim Events Go Here
+//=========================================================
+#define		HOUND_AE_WARN			1
+#define		HOUND_AE_STARTATTACK	2
+#define		HOUND_AE_THUMP			3
+#define		HOUND_AE_ANGERSOUND1	4
+#define		HOUND_AE_ANGERSOUND2	5
+#define		HOUND_AE_HOPBACK		6
+#define		HOUND_AE_CLOSE_EYE		7
+
+class CHoundeye : public CSquadMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	int  Classify ( void );
+	void HandleAnimEvent( MonsterEvent_t *pEvent );
+	void SetYawSpeed ( void );
+	void WarmUpSound ( void );
+	void AlertSound( void );
+	void DeathSound( void );
+	void WarnSound( void );
+	void PainSound( void );
+	void IdleSound( void );
+	void StartTask( Task_t *pTask );
+	void RunTask ( Task_t *pTask );
+	void SonicAttack( void );
+	void PrescheduleThink( void );
+	void SetActivity ( Activity NewActivity );
+	void WriteBeamColor ( void );
+	BOOL CheckRangeAttack1 ( float flDot, float flDist );
+	BOOL FValidateHintType ( short sHint );
+	BOOL FCanActiveIdle ( void );
+	Schedule_t *GetScheduleOfType ( int Type );
+	Schedule_t *CHoundeye :: GetSchedule( void );
+
+	int	Save( CSave &save ); 
+	int Restore( CRestore &restore );
+
+	CUSTOM_SCHEDULES;
+	static TYPEDESCRIPTION m_SaveData[];
+
+	int m_iSpriteTexture;
+	BOOL m_fAsleep;// some houndeyes sleep in idle mode if this is set, the houndeye is lying down
+	BOOL m_fDontBlink;// don't try to open/close eye if this bit is set!
+	Vector	m_vecPackCenter; // the center of the pack. The leader maintains this by averaging the origins of all pack members.
+};
+LINK_ENTITY_TO_CLASS( monster_houndeye, CHoundeye );
+
+TYPEDESCRIPTION	CHoundeye::m_SaveData[] = 
+{
+	DEFINE_FIELD( CHoundeye, m_iSpriteTexture, FIELD_INTEGER ),
+	DEFINE_FIELD( CHoundeye, m_fAsleep, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CHoundeye, m_fDontBlink, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CHoundeye, m_vecPackCenter, FIELD_POSITION_VECTOR ),
+};
+
+IMPLEMENT_SAVERESTORE( CHoundeye, CSquadMonster );
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CHoundeye :: Classify ( void )
+{
+	return	CLASS_ALIEN_MONSTER;
+}
+
+//=========================================================
+//  FValidateHintType 
+//=========================================================
+BOOL CHoundeye :: FValidateHintType ( short sHint )
+{
+	int i;
+
+	static short sHoundHints[] =
+	{
+		HINT_WORLD_MACHINERY,
+		HINT_WORLD_BLINKING_LIGHT,
+		HINT_WORLD_HUMAN_BLOOD,
+		HINT_WORLD_ALIEN_BLOOD,
+	};
+
+	for ( i = 0 ; i < ARRAYSIZE ( sHoundHints ) ; i++ )
+	{
+		if ( sHoundHints[ i ] == sHint )
+		{
+			return TRUE;
+		}
+	}
+
+	ALERT ( at_aiconsole, "Couldn't validate hint type" );
+	return FALSE;
+}
+
+
+//=========================================================
+// FCanActiveIdle
+//=========================================================
+BOOL CHoundeye :: FCanActiveIdle ( void )
+{
+	if ( InSquad() )
+	{
+		CSquadMonster *pSquadLeader = MySquadLeader();
+
+		for (int i = 0; i < MAX_SQUAD_MEMBERS;i++)
+		{
+			CSquadMonster *pMember = pSquadLeader->MySquadMember(i);
+			 
+			if ( pMember != NULL && pMember != this && pMember->m_iHintNode != NO_NODE )
+			{
+				// someone else in the group is active idling right now!
+				return FALSE;
+			}
+		}
+
+		return TRUE;
+	}
+
+	return TRUE;
+}
+
+
+//=========================================================
+// CheckRangeAttack1 - overridden for houndeyes so that they
+// try to get within half of their max attack radius before
+// attacking, so as to increase their chances of doing damage.
+//=========================================================
+BOOL CHoundeye :: CheckRangeAttack1 ( float flDot, float flDist )
+{
+	if ( flDist <= ( HOUNDEYE_MAX_ATTACK_RADIUS * 0.5 ) && flDot >= 0.3 )
+	{
+		return TRUE;
+	}
+	return FALSE;
+}
+
+//=========================================================
+// SetYawSpeed - allows each sequence to have a different
+// turn rate associated with it.
+//=========================================================
+void CHoundeye :: SetYawSpeed ( void )
+{
+	int ys;
+
+	ys = 90;
+
+	switch ( m_Activity )
+	{
+	case ACT_CROUCHIDLE://sleeping!
+		ys = 0;
+		break;
+	case ACT_IDLE:	
+		ys = 60;
+		break;
+	case ACT_WALK:
+		ys = 90;
+		break;
+	case ACT_RUN:	
+		ys = 90;
+		break;
+	case ACT_TURN_LEFT:
+	case ACT_TURN_RIGHT:
+		ys = 90;
+		break;
+	}
+
+	pev->yaw_speed = ys;
+}
+
+//=========================================================
+// SetActivity 
+//=========================================================
+void CHoundeye :: SetActivity ( Activity NewActivity )
+{
+	int	iSequence;
+
+	if ( NewActivity == m_Activity )
+		return;
+
+	if ( m_MonsterState == MONSTERSTATE_COMBAT && NewActivity == ACT_IDLE && RANDOM_LONG(0,1) )
+	{
+		// play pissed idle.
+		iSequence = LookupSequence( "madidle" );
+
+		m_Activity = NewActivity; // Go ahead and set this so it doesn't keep trying when the anim is not present
+	
+		// In case someone calls this with something other than the ideal activity
+		m_IdealActivity = m_Activity;
+
+		// Set to the desired anim, or default anim if the desired is not present
+		if ( iSequence > ACTIVITY_NOT_AVAILABLE )
+		{
+			pev->sequence		= iSequence;	// Set to the reset anim (if it's there)
+			pev->frame			= 0;		// FIX: frame counter shouldn't be reset when its the same activity as before
+			ResetSequenceInfo();
+			SetYawSpeed();
+		}
+	}
+	else
+	{
+		CSquadMonster :: SetActivity ( NewActivity );
+	}
+}
+
+//=========================================================
+// HandleAnimEvent - catches the monster-specific messages
+// that occur when tagged animation frames are played.
+//=========================================================
+void CHoundeye :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	switch ( pEvent->event )
+	{
+		case HOUND_AE_WARN:
+			// do stuff for this event.
+			WarnSound();
+			break;
+
+		case HOUND_AE_STARTATTACK:
+			WarmUpSound();
+			break;
+
+		case HOUND_AE_HOPBACK:
+			{
+				float flGravity = g_psv_gravity->value;
+
+				pev->flags &= ~FL_ONGROUND;
+
+				pev->velocity = gpGlobals->v_forward * -200;
+				pev->velocity.z += (0.6 * flGravity) * 0.5;
+
+				break;
+			}
+
+		case HOUND_AE_THUMP:
+			// emit the shockwaves
+			SonicAttack();
+			break;
+
+		case HOUND_AE_ANGERSOUND1:
+			EMIT_SOUND(ENT(pev), CHAN_VOICE, "houndeye/he_pain3.wav", 1, ATTN_NORM);	
+			break;
+
+		case HOUND_AE_ANGERSOUND2:
+			EMIT_SOUND(ENT(pev), CHAN_VOICE, "houndeye/he_pain1.wav", 1, ATTN_NORM);	
+			break;
+
+		case HOUND_AE_CLOSE_EYE:
+			if ( !m_fDontBlink )
+			{
+				pev->skin = HOUNDEYE_EYE_FRAMES - 1;
+			}
+			break;
+
+		default:
+			CSquadMonster::HandleAnimEvent( pEvent );
+			break;
+	}
+}
+
+//=========================================================
+// Spawn
+//=========================================================
+void CHoundeye :: Spawn()
+{
+	Precache( );
+
+	SET_MODEL(ENT(pev), "models/houndeye.mdl");
+	UTIL_SetSize(pev, Vector ( -16, -16, 0 ), Vector ( 16, 16, 36 ) );
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_STEP;
+	m_bloodColor		= BLOOD_COLOR_YELLOW;
+	pev->effects		= 0;
+	pev->health			= gSkillData.houndeyeHealth;
+	pev->yaw_speed		= 5;//!!! should we put this in the monster's changeanim function since turn rates may vary with state/anim?
+	m_flFieldOfView		= 0.5;// indicates the width of this monster's forward view cone ( as a dotproduct result )
+	m_MonsterState		= MONSTERSTATE_NONE;
+	m_fAsleep			= FALSE; // everyone spawns awake
+	m_fDontBlink		= FALSE;
+	m_afCapability		|= bits_CAP_SQUAD;
+
+	MonsterInit();
+}
+
+//=========================================================
+// Precache - precaches all resources this monster needs
+//=========================================================
+void CHoundeye :: Precache()
+{
+	PRECACHE_MODEL("models/houndeye.mdl");
+
+	PRECACHE_SOUND("houndeye/he_alert1.wav");
+	PRECACHE_SOUND("houndeye/he_alert2.wav");
+	PRECACHE_SOUND("houndeye/he_alert3.wav");
+
+	PRECACHE_SOUND("houndeye/he_die1.wav");
+	PRECACHE_SOUND("houndeye/he_die2.wav");
+	PRECACHE_SOUND("houndeye/he_die3.wav");
+
+	PRECACHE_SOUND("houndeye/he_idle1.wav");
+	PRECACHE_SOUND("houndeye/he_idle2.wav");
+	PRECACHE_SOUND("houndeye/he_idle3.wav");
+
+	PRECACHE_SOUND("houndeye/he_hunt1.wav");
+	PRECACHE_SOUND("houndeye/he_hunt2.wav");
+	PRECACHE_SOUND("houndeye/he_hunt3.wav");
+
+	PRECACHE_SOUND("houndeye/he_pain1.wav");
+	PRECACHE_SOUND("houndeye/he_pain3.wav");
+	PRECACHE_SOUND("houndeye/he_pain4.wav");
+	PRECACHE_SOUND("houndeye/he_pain5.wav");
+
+	PRECACHE_SOUND("houndeye/he_attack1.wav");
+	PRECACHE_SOUND("houndeye/he_attack3.wav");
+
+	PRECACHE_SOUND("houndeye/he_blast1.wav");
+	PRECACHE_SOUND("houndeye/he_blast2.wav");
+	PRECACHE_SOUND("houndeye/he_blast3.wav");
+
+	m_iSpriteTexture = PRECACHE_MODEL( "sprites/shockwave.spr" );
+}	
+
+//=========================================================
+// IdleSound
+//=========================================================
+void CHoundeye :: IdleSound ( void )
+{
+	switch ( RANDOM_LONG(0,2) )
+	{
+	case 0:
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "houndeye/he_idle1.wav", 1, ATTN_NORM );	
+		break;
+	case 1:
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "houndeye/he_idle2.wav", 1, ATTN_NORM );	
+		break;
+	case 2:
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "houndeye/he_idle3.wav", 1, ATTN_NORM );	
+		break;
+	}
+}
+
+//=========================================================
+// IdleSound
+//=========================================================
+void CHoundeye :: WarmUpSound ( void )
+{
+	switch ( RANDOM_LONG(0,1) )
+	{
+	case 0:
+		EMIT_SOUND( ENT(pev), CHAN_WEAPON, "houndeye/he_attack1.wav", 0.7, ATTN_NORM );	
+		break;
+	case 1:
+		EMIT_SOUND( ENT(pev), CHAN_WEAPON, "houndeye/he_attack3.wav", 0.7, ATTN_NORM );	
+		break;
+	}
+}
+
+//=========================================================
+// WarnSound 
+//=========================================================
+void CHoundeye :: WarnSound ( void )
+{
+	switch ( RANDOM_LONG(0,2) )
+	{
+	case 0:
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "houndeye/he_hunt1.wav", 1, ATTN_NORM );	
+		break;
+	case 1:
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "houndeye/he_hunt2.wav", 1, ATTN_NORM );	
+		break;
+	case 2:
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "houndeye/he_hunt3.wav", 1, ATTN_NORM );	
+		break;
+	}
+}
+
+//=========================================================
+// AlertSound 
+//=========================================================
+void CHoundeye :: AlertSound ( void )
+{
+
+	if ( InSquad() && !IsLeader() )
+	{
+		return; // only leader makes ALERT sound.
+	}
+
+	switch ( RANDOM_LONG(0,2) )
+	{
+	case 0:	
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "houndeye/he_alert1.wav", 1, ATTN_NORM );	
+		break;
+	case 1:	
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "houndeye/he_alert2.wav", 1, ATTN_NORM );	
+		break;
+	case 2:	
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "houndeye/he_alert3.wav", 1, ATTN_NORM );	
+		break;
+	}
+}
+
+//=========================================================
+// DeathSound 
+//=========================================================
+void CHoundeye :: DeathSound ( void )
+{
+	switch ( RANDOM_LONG(0,2) )
+	{
+	case 0:	
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "houndeye/he_die1.wav", 1, ATTN_NORM );	
+		break;
+	case 1:
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "houndeye/he_die2.wav", 1, ATTN_NORM );	
+		break;
+	case 2:
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "houndeye/he_die3.wav", 1, ATTN_NORM );	
+		break;
+	}
+}
+
+//=========================================================
+// PainSound 
+//=========================================================
+void CHoundeye :: PainSound ( void )
+{
+	switch ( RANDOM_LONG(0,2) )
+	{
+	case 0:	
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "houndeye/he_pain3.wav", 1, ATTN_NORM );	
+		break;
+	case 1:	
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "houndeye/he_pain4.wav", 1, ATTN_NORM );	
+		break;
+	case 2:	
+		EMIT_SOUND( ENT(pev), CHAN_VOICE, "houndeye/he_pain5.wav", 1, ATTN_NORM );	
+		break;
+	}
+}
+
+//=========================================================
+// WriteBeamColor - writes a color vector to the network 
+// based on the size of the group. 
+//=========================================================
+void CHoundeye :: WriteBeamColor ( void )
+{
+	BYTE	bRed, bGreen, bBlue;
+
+	if ( InSquad() )
+	{
+		switch ( SquadCount() )
+		{
+		case 2:
+			// no case for 0 or 1, cause those are impossible for monsters in Squads.
+			bRed	= 101;
+			bGreen	= 133;
+			bBlue	= 221;
+			break;
+		case 3:
+			bRed	= 67;
+			bGreen	= 85;
+			bBlue	= 255;
+			break;
+		case 4:
+			bRed	= 62;
+			bGreen	= 33;
+			bBlue	= 211;
+			break;
+		default:
+			ALERT ( at_aiconsole, "Unsupported Houndeye SquadSize!\n" );
+			bRed	= 188;
+			bGreen	= 220;
+			bBlue	= 255;
+			break;
+		}
+	}
+	else
+	{
+		// solo houndeye - weakest beam
+		bRed	= 188;
+		bGreen	= 220;
+		bBlue	= 255;
+	}
+	
+	WRITE_BYTE( bRed   );
+	WRITE_BYTE( bGreen );
+	WRITE_BYTE( bBlue  );
+}
+		
+
+//=========================================================
+// SonicAttack
+//=========================================================
+void CHoundeye :: SonicAttack ( void )
+{
+	float		flAdjustedDamage;
+	float		flDist;
+
+	switch ( RANDOM_LONG( 0, 2 ) )
+	{
+	case 0:	EMIT_SOUND(ENT(pev), CHAN_WEAPON, "houndeye/he_blast1.wav", 1, ATTN_NORM);	break;
+	case 1:	EMIT_SOUND(ENT(pev), CHAN_WEAPON, "houndeye/he_blast2.wav", 1, ATTN_NORM);	break;
+	case 2:	EMIT_SOUND(ENT(pev), CHAN_WEAPON, "houndeye/he_blast3.wav", 1, ATTN_NORM);	break;
+	}
+
+	// blast circles
+	MESSAGE_BEGIN( MSG_PAS, SVC_TEMPENTITY, pev->origin );
+		WRITE_BYTE( TE_BEAMCYLINDER );
+		WRITE_COORD( pev->origin.x);
+		WRITE_COORD( pev->origin.y);
+		WRITE_COORD( pev->origin.z + 16);
+		WRITE_COORD( pev->origin.x);
+		WRITE_COORD( pev->origin.y);
+		WRITE_COORD( pev->origin.z + 16 + HOUNDEYE_MAX_ATTACK_RADIUS / .2); // reach damage radius over .3 seconds
+		WRITE_SHORT( m_iSpriteTexture );
+		WRITE_BYTE( 0 ); // startframe
+		WRITE_BYTE( 0 ); // framerate
+		WRITE_BYTE( 2 ); // life
+		WRITE_BYTE( 16 );  // width
+		WRITE_BYTE( 0 );   // noise
+
+		WriteBeamColor();
+
+		WRITE_BYTE( 255 ); //brightness
+		WRITE_BYTE( 0 );		// speed
+	MESSAGE_END();
+
+	MESSAGE_BEGIN( MSG_PAS, SVC_TEMPENTITY, pev->origin );
+		WRITE_BYTE( TE_BEAMCYLINDER );
+		WRITE_COORD( pev->origin.x);
+		WRITE_COORD( pev->origin.y);
+		WRITE_COORD( pev->origin.z + 16);
+		WRITE_COORD( pev->origin.x);
+		WRITE_COORD( pev->origin.y);
+		WRITE_COORD( pev->origin.z + 16 + ( HOUNDEYE_MAX_ATTACK_RADIUS / 2 ) / .2); // reach damage radius over .3 seconds
+		WRITE_SHORT( m_iSpriteTexture );
+		WRITE_BYTE( 0 ); // startframe
+		WRITE_BYTE( 0 ); // framerate
+		WRITE_BYTE( 2 ); // life
+		WRITE_BYTE( 16 );  // width
+		WRITE_BYTE( 0 );   // noise
+
+		WriteBeamColor();
+		
+		WRITE_BYTE( 255 ); //brightness
+		WRITE_BYTE( 0 );		// speed
+	MESSAGE_END();
+
+
+	CBaseEntity *pEntity = NULL;
+	// iterate on all entities in the vicinity.
+	while ((pEntity = UTIL_FindEntityInSphere( pEntity, pev->origin, HOUNDEYE_MAX_ATTACK_RADIUS )) != NULL)
+	{
+		if ( pEntity->pev->takedamage != DAMAGE_NO )
+		{
+			if ( !FClassnameIs(pEntity->pev, "monster_houndeye") )
+			{// houndeyes don't hurt other houndeyes with their attack
+
+				// houndeyes do FULL damage if the ent in question is visible. Half damage otherwise.
+				// This means that you must get out of the houndeye's attack range entirely to avoid damage.
+				// Calculate full damage first
+
+				if ( SquadCount() > 1 )
+				{
+					// squad gets attack bonus.
+					flAdjustedDamage = gSkillData.houndeyeDmgBlast + gSkillData.houndeyeDmgBlast * ( HOUNDEYE_SQUAD_BONUS * ( SquadCount() - 1 ) );
+				}
+				else
+				{
+					// solo
+					flAdjustedDamage = gSkillData.houndeyeDmgBlast;
+				}
+
+				flDist = (pEntity->Center() - pev->origin).Length();
+
+				flAdjustedDamage -= ( flDist / HOUNDEYE_MAX_ATTACK_RADIUS ) * flAdjustedDamage;
+
+				if ( !FVisible( pEntity ) )
+				{
+					if ( pEntity->IsPlayer() )
+					{
+						// if this entity is a client, and is not in full view, inflict half damage. We do this so that players still 
+						// take the residual damage if they don't totally leave the houndeye's effective radius. We restrict it to clients
+						// so that monsters in other parts of the level don't take the damage and get pissed.
+						flAdjustedDamage *= 0.5;
+					}
+					else if ( !FClassnameIs( pEntity->pev, "func_breakable" ) && !FClassnameIs( pEntity->pev, "func_pushable" ) ) 
+					{
+						// do not hurt nonclients through walls, but allow damage to be done to breakables
+						flAdjustedDamage = 0;
+					}
+				}
+
+				//ALERT ( at_aiconsole, "Damage: %f\n", flAdjustedDamage );
+
+				if (flAdjustedDamage > 0 )
+				{
+					pEntity->TakeDamage ( pev, pev, flAdjustedDamage, DMG_SONIC | DMG_ALWAYSGIB );
+				}
+			}
+		}
+	}
+}
+		
+//=========================================================
+// start task
+//=========================================================
+void CHoundeye :: StartTask ( Task_t *pTask )
+{
+	m_iTaskStatus = TASKSTATUS_RUNNING;
+
+	switch ( pTask->iTask )
+	{
+	case TASK_HOUND_FALL_ASLEEP:
+		{
+			m_fAsleep = TRUE; // signal that hound is lying down (must stand again before doing anything else!)
+			m_iTaskStatus = TASKSTATUS_COMPLETE;
+			break;
+		}
+	case TASK_HOUND_WAKE_UP:
+		{
+			m_fAsleep = FALSE; // signal that hound is standing again
+			m_iTaskStatus = TASKSTATUS_COMPLETE;
+			break;
+		}
+	case TASK_HOUND_OPEN_EYE:
+		{
+			m_fDontBlink = FALSE; // turn blinking back on and that code will automatically open the eye
+			m_iTaskStatus = TASKSTATUS_COMPLETE;
+			break;
+		}
+	case TASK_HOUND_CLOSE_EYE:
+		{
+			pev->skin = 0;
+			m_fDontBlink = TRUE; // tell blink code to leave the eye alone.
+			break;
+		}
+	case TASK_HOUND_THREAT_DISPLAY:
+		{
+			m_IdealActivity = ACT_IDLE_ANGRY;
+			break;
+		}
+	case TASK_HOUND_HOP_BACK:
+		{
+			m_IdealActivity = ACT_LEAP;
+			break;
+		}
+	case TASK_RANGE_ATTACK1:
+		{
+			m_IdealActivity = ACT_RANGE_ATTACK1;
+
+/*
+			if ( InSquad() )
+			{
+				// see if there is a battery to connect to. 
+				CSquadMonster *pSquad = m_pSquadLeader;
+
+				while ( pSquad )
+				{
+					if ( pSquad->m_iMySlot == bits_SLOT_HOUND_BATTERY )
+					{
+						// draw a beam.
+						MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+							WRITE_BYTE( TE_BEAMENTS );
+							WRITE_SHORT( ENTINDEX( this->edict() ) );
+							WRITE_SHORT( ENTINDEX( pSquad->edict() ) );
+							WRITE_SHORT( m_iSpriteTexture );
+							WRITE_BYTE( 0 ); // framestart
+							WRITE_BYTE( 0 ); // framerate
+							WRITE_BYTE( 10 ); // life
+							WRITE_BYTE( 40 );  // width
+							WRITE_BYTE( 10 );   // noise
+							WRITE_BYTE( 0  );   // r, g, b
+							WRITE_BYTE( 50 );   // r, g, b
+							WRITE_BYTE( 250);   // r, g, b
+							WRITE_BYTE( 255 );	// brightness
+							WRITE_BYTE( 30 );		// speed
+						MESSAGE_END();
+						break;
+					}
+
+					pSquad = pSquad->m_pSquadNext;
+				}
+			}
+*/
+
+			break;
+		}
+	case TASK_SPECIAL_ATTACK1:
+		{
+			m_IdealActivity = ACT_SPECIAL_ATTACK1;
+			break;
+		}
+	case TASK_GUARD:
+		{
+			m_IdealActivity = ACT_GUARD;
+			break;
+		}
+	default: 
+		{
+			CSquadMonster :: StartTask(pTask);
+			break;
+		}
+	}
+}
+
+//=========================================================
+// RunTask 
+//=========================================================
+void CHoundeye :: RunTask ( Task_t *pTask )
+{
+	switch ( pTask->iTask )
+	{
+	case TASK_HOUND_THREAT_DISPLAY:
+		{
+			MakeIdealYaw ( m_vecEnemyLKP );
+			ChangeYaw ( pev->yaw_speed );
+
+			if ( m_fSequenceFinished )
+			{
+				TaskComplete();
+			}
+			
+			break;
+		}
+	case TASK_HOUND_CLOSE_EYE:
+		{
+			if ( pev->skin < HOUNDEYE_EYE_FRAMES - 1 )
+			{
+				pev->skin++;
+			}
+			break;
+		}
+	case TASK_HOUND_HOP_BACK:
+		{
+			if ( m_fSequenceFinished )
+			{
+				TaskComplete();
+			}
+			break;
+		}
+	case TASK_SPECIAL_ATTACK1:
+		{
+			pev->skin = RANDOM_LONG(0, HOUNDEYE_EYE_FRAMES - 1);
+
+			MakeIdealYaw ( m_vecEnemyLKP );
+			ChangeYaw ( pev->yaw_speed );
+			
+			float life;
+			life = ((255 - pev->frame) / (pev->framerate * m_flFrameRate));
+			if (life < 0.1) life = 0.1;
+
+			MESSAGE_BEGIN( MSG_PAS, SVC_TEMPENTITY, pev->origin );
+				WRITE_BYTE(  TE_IMPLOSION);
+				WRITE_COORD( pev->origin.x);
+				WRITE_COORD( pev->origin.y);
+				WRITE_COORD( pev->origin.z + 16);
+				WRITE_BYTE( 50 * life + 100);  // radius
+				WRITE_BYTE( pev->frame / 25.0 ); // count
+				WRITE_BYTE( life * 10 ); // life
+			MESSAGE_END();
+			
+			if ( m_fSequenceFinished )
+			{
+				SonicAttack(); 
+				TaskComplete();
+			}
+
+			break;
+		}
+	default:
+		{
+			CSquadMonster :: RunTask(pTask);
+			break;
+		}
+	}
+}
+
+//=========================================================
+// PrescheduleThink
+//=========================================================
+void CHoundeye::PrescheduleThink ( void )
+{
+	// if the hound is mad and is running, make hunt noises.
+	if ( m_MonsterState == MONSTERSTATE_COMBAT && m_Activity == ACT_RUN && RANDOM_FLOAT( 0, 1 ) < 0.2 )
+	{
+		WarnSound();
+	}
+
+	// at random, initiate a blink if not already blinking or sleeping
+	if ( !m_fDontBlink )
+	{
+		if ( ( pev->skin == 0 ) && RANDOM_LONG(0,0x7F) == 0 )
+		{// start blinking!
+			pev->skin = HOUNDEYE_EYE_FRAMES - 1;
+		}
+		else if ( pev->skin != 0 )
+		{// already blinking
+			pev->skin--;
+		}
+	}
+
+	// if you are the leader, average the origins of each pack member to get an approximate center.
+	if ( IsLeader() )
+	{
+		CSquadMonster *pSquadMember;
+		int iSquadCount = 0;
+
+		for (int i = 0; i < MAX_SQUAD_MEMBERS; i++)
+		{
+			pSquadMember = MySquadMember(i);
+
+			if (pSquadMember)
+			{
+				iSquadCount++;
+				m_vecPackCenter = m_vecPackCenter + pSquadMember->pev->origin;
+			}
+		}
+
+		m_vecPackCenter = m_vecPackCenter / iSquadCount;
+	}
+}
+
+//=========================================================
+// AI Schedules Specific to this monster
+//=========================================================
+Task_t	tlHoundGuardPack[] =
+{
+	{ TASK_STOP_MOVING,			(float)0		},
+	{ TASK_GUARD,				(float)0		},
+};
+
+Schedule_t	slHoundGuardPack[] =
+{
+	{ 
+		tlHoundGuardPack,
+		ARRAYSIZE ( tlHoundGuardPack ), 
+		bits_COND_SEE_HATE		|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE	|
+		bits_COND_PROVOKED		|
+		bits_COND_HEAR_SOUND,
+
+		bits_SOUND_COMBAT		|// sound flags
+		bits_SOUND_WORLD		|
+		bits_SOUND_MEAT			|
+		bits_SOUND_PLAYER,
+		"GuardPack"
+	},
+};
+
+// primary range attack
+Task_t	tlHoundYell1[] =
+{
+	{ TASK_STOP_MOVING,			(float)0					},
+	{ TASK_FACE_IDEAL,			(float)0					},
+	{ TASK_RANGE_ATTACK1,		(float)0					},
+	{ TASK_SET_SCHEDULE,		(float)SCHED_HOUND_AGITATED	},
+};
+
+Task_t	tlHoundYell2[] =
+{
+	{ TASK_STOP_MOVING,			(float)0					},
+	{ TASK_FACE_IDEAL,			(float)0					},
+	{ TASK_RANGE_ATTACK1,		(float)0					},
+};
+
+Schedule_t	slHoundRangeAttack[] =
+{
+	{ 
+		tlHoundYell1,
+		ARRAYSIZE ( tlHoundYell1 ), 
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE,
+		0,
+		"HoundRangeAttack1"
+	},
+	{ 
+		tlHoundYell2,
+		ARRAYSIZE ( tlHoundYell2 ), 
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE,
+		0,
+		"HoundRangeAttack2"
+	},
+};
+
+// lie down and fall asleep
+Task_t	tlHoundSleep[] =
+{
+	{ TASK_STOP_MOVING,			(float)0		},
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE			},
+	{ TASK_WAIT_RANDOM,			(float)5				},
+	{ TASK_PLAY_SEQUENCE,		(float)ACT_CROUCH		},
+	{ TASK_SET_ACTIVITY,		(float)ACT_CROUCHIDLE	},
+	{ TASK_HOUND_FALL_ASLEEP,	(float)0				},
+	{ TASK_WAIT_RANDOM,			(float)25				},
+	{ TASK_HOUND_CLOSE_EYE,		(float)0				},
+	//{ TASK_WAIT,				(float)10				},
+	//{ TASK_WAIT_RANDOM,			(float)10				},
+};
+
+Schedule_t	slHoundSleep[] =
+{
+	{ 
+		tlHoundSleep,
+		ARRAYSIZE ( tlHoundSleep ), 
+		bits_COND_HEAR_SOUND	|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE	|
+		bits_COND_NEW_ENEMY,
+
+		bits_SOUND_COMBAT		|
+		bits_SOUND_PLAYER		|
+		bits_SOUND_WORLD,
+		"Hound Sleep"
+	},
+};
+
+// wake and stand up lazily
+Task_t	tlHoundWakeLazy[] =
+{
+	{ TASK_STOP_MOVING,			(float)0			},
+	{ TASK_HOUND_OPEN_EYE,		(float)0			},
+	{ TASK_WAIT_RANDOM,			(float)2.5			},
+	{ TASK_PLAY_SEQUENCE,		(float)ACT_STAND	},
+	{ TASK_HOUND_WAKE_UP,		(float)0			},
+};
+
+Schedule_t	slHoundWakeLazy[] =
+{
+	{
+		tlHoundWakeLazy,
+		ARRAYSIZE ( tlHoundWakeLazy ),
+		0,
+		0,
+		"WakeLazy"
+	},
+};
+
+// wake and stand up with great urgency!
+Task_t	tlHoundWakeUrgent[] =
+{
+	{ TASK_HOUND_OPEN_EYE,		(float)0			},
+	{ TASK_PLAY_SEQUENCE,		(float)ACT_HOP		},
+	{ TASK_FACE_IDEAL,			(float)0			},
+	{ TASK_HOUND_WAKE_UP,		(float)0			},
+};
+
+Schedule_t	slHoundWakeUrgent[] =
+{
+	{
+		tlHoundWakeUrgent,
+		ARRAYSIZE ( tlHoundWakeUrgent ),
+		0,
+		0,
+		"WakeUrgent"
+	},
+};
+
+
+Task_t	tlHoundSpecialAttack1[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_FACE_IDEAL,			(float)0		},
+	{ TASK_SPECIAL_ATTACK1,		(float)0		},
+	{ TASK_PLAY_SEQUENCE,		(float)ACT_IDLE_ANGRY },
+};
+
+Schedule_t	slHoundSpecialAttack1[] =
+{
+	{ 
+		tlHoundSpecialAttack1,
+		ARRAYSIZE ( tlHoundSpecialAttack1 ), 
+		bits_COND_NEW_ENEMY			|
+		bits_COND_LIGHT_DAMAGE		|
+		bits_COND_HEAVY_DAMAGE		|
+		bits_COND_ENEMY_OCCLUDED,
+		
+		0,
+		"Hound Special Attack1"
+	},
+};
+
+Task_t	tlHoundAgitated[] =
+{
+	{ TASK_STOP_MOVING,				0		},
+	{ TASK_HOUND_THREAT_DISPLAY,	0		},
+};
+
+Schedule_t	slHoundAgitated[] =
+{
+	{ 
+		tlHoundAgitated,
+		ARRAYSIZE ( tlHoundAgitated ), 
+		bits_COND_NEW_ENEMY			|
+		bits_COND_LIGHT_DAMAGE		|
+		bits_COND_HEAVY_DAMAGE,
+		0,
+		"Hound Agitated"
+	},
+};
+
+Task_t	tlHoundHopRetreat[] =
+{
+	{ TASK_STOP_MOVING,				0											},
+	{ TASK_HOUND_HOP_BACK,			0											},
+	{ TASK_SET_SCHEDULE,			(float)SCHED_TAKE_COVER_FROM_ENEMY	},
+};
+
+Schedule_t	slHoundHopRetreat[] =
+{
+	{ 
+		tlHoundHopRetreat,
+		ARRAYSIZE ( tlHoundHopRetreat ), 
+		0,
+		0,
+		"Hound Hop Retreat"
+	},
+};
+
+// hound fails in combat with client in the PVS
+Task_t	tlHoundCombatFailPVS[] =
+{
+	{ TASK_STOP_MOVING,				0			},
+	{ TASK_HOUND_THREAT_DISPLAY,	0			},
+	{ TASK_WAIT_FACE_ENEMY,			(float)1	},
+};
+
+Schedule_t	slHoundCombatFailPVS[] =
+{
+	{ 
+		tlHoundCombatFailPVS,
+		ARRAYSIZE ( tlHoundCombatFailPVS ), 
+		bits_COND_NEW_ENEMY			|
+		bits_COND_LIGHT_DAMAGE		|
+		bits_COND_HEAVY_DAMAGE,
+		0,
+		"HoundCombatFailPVS"
+	},
+};
+
+// hound fails in combat with no client in the PVS. Don't keep peeping!
+Task_t	tlHoundCombatFailNoPVS[] =
+{
+	{ TASK_STOP_MOVING,				0				},
+	{ TASK_HOUND_THREAT_DISPLAY,	0				},
+	{ TASK_WAIT_FACE_ENEMY,			(float)2		},
+	{ TASK_SET_ACTIVITY,			(float)ACT_IDLE	},
+	{ TASK_WAIT_PVS,				0				},
+};
+
+Schedule_t	slHoundCombatFailNoPVS[] =
+{
+	{ 
+		tlHoundCombatFailNoPVS,
+		ARRAYSIZE ( tlHoundCombatFailNoPVS ), 
+		bits_COND_NEW_ENEMY			|
+		bits_COND_LIGHT_DAMAGE		|
+		bits_COND_HEAVY_DAMAGE,
+		0,
+		"HoundCombatFailNoPVS"
+	},
+};
+
+DEFINE_CUSTOM_SCHEDULES( CHoundeye )
+{
+	slHoundGuardPack,
+	slHoundRangeAttack,
+	&slHoundRangeAttack[ 1 ],
+	slHoundSleep,
+	slHoundWakeLazy,
+	slHoundWakeUrgent,
+	slHoundSpecialAttack1,
+	slHoundAgitated,
+	slHoundHopRetreat,
+	slHoundCombatFailPVS,
+	slHoundCombatFailNoPVS,
+};
+
+IMPLEMENT_CUSTOM_SCHEDULES( CHoundeye, CSquadMonster );
+
+//=========================================================
+// GetScheduleOfType 
+//=========================================================
+Schedule_t* CHoundeye :: GetScheduleOfType ( int Type ) 
+{
+	if ( m_fAsleep )
+	{
+		// if the hound is sleeping, must wake and stand!
+		if ( HasConditions( bits_COND_HEAR_SOUND ) )
+		{
+			CSound *pWakeSound;
+
+			pWakeSound = PBestSound();
+			ASSERT( pWakeSound != NULL );
+			if ( pWakeSound )
+			{
+				MakeIdealYaw ( pWakeSound->m_vecOrigin );
+
+				if ( FLSoundVolume ( pWakeSound ) >= HOUNDEYE_SOUND_STARTLE_VOLUME )
+				{
+					// awakened by a loud sound
+					return &slHoundWakeUrgent[ 0 ];
+				}
+			}
+			// sound was not loud enough to scare the bejesus out of houndeye
+			return &slHoundWakeLazy[ 0 ];
+		}
+		else if ( HasConditions( bits_COND_NEW_ENEMY ) )
+		{
+			// get up fast, to fight.
+			return &slHoundWakeUrgent[ 0 ];
+		}
+
+		else
+		{
+			// hound is waking up on its own
+			return &slHoundWakeLazy[ 0 ];
+		}
+	}
+	switch	( Type )
+	{
+	case SCHED_IDLE_STAND:
+		{
+			// we may want to sleep instead of stand!
+			if ( InSquad() && !IsLeader() && !m_fAsleep && RANDOM_LONG(0,29) < 1 )
+			{
+				return &slHoundSleep[ 0 ];
+			}
+			else
+			{
+				return CSquadMonster :: GetScheduleOfType( Type );
+			}
+		}
+	case SCHED_RANGE_ATTACK1:
+		{
+			return &slHoundRangeAttack[ 0 ];
+/*
+			if ( InSquad() )
+			{
+				return &slHoundRangeAttack[ RANDOM_LONG( 0, 1 ) ];
+			}
+
+			return &slHoundRangeAttack[ 1 ];
+*/
+		}
+	case SCHED_SPECIAL_ATTACK1:
+		{
+			return &slHoundSpecialAttack1[ 0 ];
+		}
+	case SCHED_GUARD:
+		{
+			return &slHoundGuardPack[ 0 ];
+		}
+	case SCHED_HOUND_AGITATED:
+		{
+			return &slHoundAgitated[ 0 ];
+		}
+	case SCHED_HOUND_HOP_RETREAT:
+		{
+			return &slHoundHopRetreat[ 0 ];
+		}
+	case SCHED_FAIL:
+		{
+			if ( m_MonsterState == MONSTERSTATE_COMBAT )
+			{
+				if ( !FNullEnt( FIND_CLIENT_IN_PVS( edict() ) ) )
+				{
+					// client in PVS
+					return &slHoundCombatFailPVS[ 0 ];
+				}
+				else
+				{
+					// client has taken off! 
+					return &slHoundCombatFailNoPVS[ 0 ];
+				}
+			}
+			else
+			{
+				return CSquadMonster :: GetScheduleOfType ( Type );
+			}
+		}
+	default:
+		{
+			return CSquadMonster :: GetScheduleOfType ( Type );
+		}
+	}
+}
+
+//=========================================================
+// GetSchedule 
+//=========================================================
+Schedule_t *CHoundeye :: GetSchedule( void )
+{
+	switch	( m_MonsterState )
+	{
+	case MONSTERSTATE_COMBAT:
+		{
+// dead enemy
+			if ( HasConditions( bits_COND_ENEMY_DEAD ) )
+			{
+				// call base class, all code to handle dead enemies is centralized there.
+				return CBaseMonster :: GetSchedule();
+			}
+
+			if ( HasConditions( bits_COND_LIGHT_DAMAGE | bits_COND_HEAVY_DAMAGE ) )
+			{
+				if ( RANDOM_FLOAT( 0 , 1 ) <= 0.4 )
+				{
+					TraceResult tr;
+					UTIL_MakeVectors( pev->angles );
+					UTIL_TraceHull( pev->origin, pev->origin + gpGlobals->v_forward * -128, dont_ignore_monsters, head_hull, ENT( pev ), &tr );
+
+					if ( tr.flFraction == 1.0 )
+					{
+						// it's clear behind, so the hound will jump
+						return GetScheduleOfType ( SCHED_HOUND_HOP_RETREAT );
+					}
+				}
+
+				return GetScheduleOfType ( SCHED_TAKE_COVER_FROM_ENEMY );
+			}
+
+			if ( HasConditions( bits_COND_CAN_RANGE_ATTACK1 ) )
+			{
+				if ( OccupySlot ( bits_SLOTS_HOUND_ATTACK ) )
+				{
+					return GetScheduleOfType ( SCHED_RANGE_ATTACK1 );
+				}
+
+				return GetScheduleOfType ( SCHED_HOUND_AGITATED );
+			}
+			break;
+		}
+	}
+
+	return CSquadMonster :: GetSchedule();
+}
diff --git a/main/source/dlls/ichthyosaur.cpp b/main/source/dlls/ichthyosaur.cpp
new file mode 100644
index 00000000..e793c7f6
--- /dev/null
+++ b/main/source/dlls/ichthyosaur.cpp
@@ -0,0 +1,1108 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD )
+
+//=========================================================
+// icthyosaur - evin, satan fish monster
+//=========================================================
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"schedule.h"
+#include    "flyingmonster.h"
+#include	"nodes.h"
+#include	"soundent.h"
+#include	"animation.h"
+#include	"effects.h"
+#include	"weapons.h"
+
+#define SEARCH_RETRY	16
+
+#define ICHTHYOSAUR_SPEED 150
+
+extern CGraph WorldGraph;
+
+#define EYE_MAD		0
+#define EYE_BASE	1
+#define EYE_CLOSED	2
+#define EYE_BACK	3
+#define EYE_LOOK	4
+
+
+
+//=========================================================
+// Monster's Anim Events Go Here
+//=========================================================
+
+// UNDONE: Save/restore here
+class CIchthyosaur : public CFlyingMonster
+{
+public:
+	void  Spawn( void );
+	void  Precache( void );
+	void  SetYawSpeed( void );
+	int   Classify( void );
+	void  HandleAnimEvent( MonsterEvent_t *pEvent );
+	CUSTOM_SCHEDULES;
+
+	int	Save( CSave &save ); 
+	int Restore( CRestore &restore );
+	static TYPEDESCRIPTION m_SaveData[];
+
+	Schedule_t *GetSchedule( void );
+	Schedule_t *GetScheduleOfType ( int Type );
+
+	void Killed( entvars_t *pevAttacker, int iGib );
+	void BecomeDead( void );
+
+	void EXPORT CombatUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void EXPORT BiteTouch( CBaseEntity *pOther );
+
+	void  StartTask( Task_t *pTask );
+	void  RunTask( Task_t *pTask );
+
+	BOOL  CheckMeleeAttack1 ( float flDot, float flDist );
+	BOOL  CheckRangeAttack1 ( float flDot, float flDist );
+
+	float ChangeYaw( int speed );
+	Activity GetStoppedActivity( void );
+
+	void  Move( float flInterval );
+	void  MoveExecute( CBaseEntity *pTargetEnt, const Vector &vecDir, float flInterval );
+	void  MonsterThink( void );
+	void  Stop( void );
+	void  Swim( void );
+	Vector DoProbe(const Vector &Probe);
+
+	float VectorToPitch( const Vector &vec);
+	float FlPitchDiff( void );
+	float ChangePitch( int speed );
+
+	Vector m_SaveVelocity;
+	float m_idealDist;
+
+	float m_flBlink;
+
+	float m_flEnemyTouched;
+	BOOL  m_bOnAttack;
+
+	float m_flMaxSpeed;
+	float m_flMinSpeed;
+	float m_flMaxDist;
+
+	CBeam *m_pBeam;
+
+	float m_flNextAlert;
+
+	static const char *pIdleSounds[];
+	static const char *pAlertSounds[];
+	static const char *pAttackSounds[];
+	static const char *pBiteSounds[];
+	static const char *pDieSounds[];
+	static const char *pPainSounds[];
+
+	void IdleSound( void );
+	void AlertSound( void );
+	void AttackSound( void );
+	void BiteSound( void );
+	void DeathSound( void );
+	void PainSound( void );
+};
+
+LINK_ENTITY_TO_CLASS( monster_ichthyosaur, CIchthyosaur );
+
+TYPEDESCRIPTION	CIchthyosaur::m_SaveData[] = 
+{
+	DEFINE_FIELD( CIchthyosaur, m_SaveVelocity, FIELD_VECTOR ),
+	DEFINE_FIELD( CIchthyosaur, m_idealDist, FIELD_FLOAT ),
+	DEFINE_FIELD( CIchthyosaur, m_flBlink, FIELD_FLOAT ),
+	DEFINE_FIELD( CIchthyosaur, m_flEnemyTouched, FIELD_FLOAT ),
+	DEFINE_FIELD( CIchthyosaur, m_bOnAttack, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CIchthyosaur, m_flMaxSpeed, FIELD_FLOAT ),
+	DEFINE_FIELD( CIchthyosaur, m_flMinSpeed, FIELD_FLOAT ),
+	DEFINE_FIELD( CIchthyosaur, m_flMaxDist, FIELD_FLOAT ),
+	DEFINE_FIELD( CIchthyosaur, m_flNextAlert, FIELD_TIME ),
+};
+
+IMPLEMENT_SAVERESTORE( CIchthyosaur, CFlyingMonster );
+
+
+const char *CIchthyosaur::pIdleSounds[] = 
+{
+	"ichy/ichy_idle1.wav",
+	"ichy/ichy_idle2.wav",
+	"ichy/ichy_idle3.wav",
+	"ichy/ichy_idle4.wav",
+};
+
+const char *CIchthyosaur::pAlertSounds[] = 
+{
+	"ichy/ichy_alert2.wav",
+	"ichy/ichy_alert3.wav",
+};
+
+const char *CIchthyosaur::pAttackSounds[] = 
+{
+	"ichy/ichy_attack1.wav",
+	"ichy/ichy_attack2.wav",
+};
+
+const char *CIchthyosaur::pBiteSounds[] = 
+{
+	"ichy/ichy_bite1.wav",
+	"ichy/ichy_bite2.wav",
+};
+
+const char *CIchthyosaur::pPainSounds[] = 
+{
+	"ichy/ichy_pain2.wav",
+	"ichy/ichy_pain3.wav",
+	"ichy/ichy_pain5.wav",
+};
+
+const char *CIchthyosaur::pDieSounds[] = 
+{
+	"ichy/ichy_die2.wav",
+	"ichy/ichy_die4.wav",
+};
+
+#define EMIT_ICKY_SOUND( chan, array ) \
+	EMIT_SOUND_DYN ( ENT(pev), chan , array [ RANDOM_LONG(0,ARRAYSIZE( array )-1) ], 1.0, 0.6, 0, RANDOM_LONG(95,105) ); 
+
+
+void CIchthyosaur :: IdleSound( void )	
+{ 
+	EMIT_ICKY_SOUND( CHAN_VOICE, pIdleSounds ); 
+}
+
+void CIchthyosaur :: AlertSound( void ) 
+{ 
+	EMIT_ICKY_SOUND( CHAN_VOICE, pAlertSounds ); 
+}
+
+void CIchthyosaur :: AttackSound( void ) 
+{ 
+	EMIT_ICKY_SOUND( CHAN_VOICE, pAttackSounds );
+}
+
+void CIchthyosaur :: BiteSound( void ) 
+{ 
+	EMIT_ICKY_SOUND( CHAN_WEAPON, pBiteSounds );
+}
+
+void CIchthyosaur :: DeathSound( void ) 
+{ 
+	EMIT_ICKY_SOUND( CHAN_VOICE, pDieSounds ); 
+}
+
+void CIchthyosaur :: PainSound( void )	
+{ 
+	EMIT_ICKY_SOUND( CHAN_VOICE, pPainSounds ); 
+}
+
+//=========================================================
+// monster-specific tasks and states
+//=========================================================
+enum 
+{
+	TASK_ICHTHYOSAUR_CIRCLE_ENEMY = LAST_COMMON_TASK + 1,
+	TASK_ICHTHYOSAUR_SWIM,
+	TASK_ICHTHYOSAUR_FLOAT,
+};
+
+//=========================================================
+// AI Schedules Specific to this monster
+//=========================================================
+
+static Task_t	tlSwimAround[] =
+{
+	{ TASK_SET_ACTIVITY,			(float)ACT_WALK },
+	{ TASK_ICHTHYOSAUR_SWIM,		0.0 },
+};
+
+static Schedule_t	slSwimAround[] =
+{
+	{ 
+		tlSwimAround,
+		ARRAYSIZE(tlSwimAround), 
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE	|
+		bits_COND_SEE_ENEMY		|
+		bits_COND_NEW_ENEMY		|
+		bits_COND_HEAR_SOUND,
+		bits_SOUND_PLAYER |
+		bits_SOUND_COMBAT,
+		"SwimAround"
+	},
+};
+
+static Task_t	tlSwimAgitated[] =
+{
+	{ TASK_STOP_MOVING,				(float) 0 },
+	{ TASK_SET_ACTIVITY,			(float)ACT_RUN },
+	{ TASK_WAIT,					(float)2.0 },
+};
+
+static Schedule_t	slSwimAgitated[] =
+{
+	{ 
+		tlSwimAgitated,
+		ARRAYSIZE(tlSwimAgitated), 
+		0, 
+		0, 
+		"SwimAgitated"
+	},
+};
+
+
+static Task_t	tlCircleEnemy[] =
+{
+	{ TASK_SET_ACTIVITY,			(float)ACT_WALK },
+	{ TASK_ICHTHYOSAUR_CIRCLE_ENEMY, 0.0 },
+};
+
+static Schedule_t	slCircleEnemy[] =
+{
+	{ 
+		tlCircleEnemy,
+		ARRAYSIZE(tlCircleEnemy), 
+		bits_COND_NEW_ENEMY		|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE	|
+		bits_COND_CAN_MELEE_ATTACK1 |
+		bits_COND_CAN_RANGE_ATTACK1,
+		0,
+		"CircleEnemy"
+	},
+};
+
+
+Task_t tlTwitchDie[] =
+{
+	{ TASK_STOP_MOVING,			0		 },
+	{ TASK_SOUND_DIE,			(float)0 },
+	{ TASK_DIE,					(float)0 },
+	{ TASK_ICHTHYOSAUR_FLOAT,	(float)0 },
+};
+
+Schedule_t slTwitchDie[] =
+{
+	{
+		tlTwitchDie,
+		ARRAYSIZE( tlTwitchDie ),
+		0,
+		0,
+		"Die"
+	},
+};
+
+
+DEFINE_CUSTOM_SCHEDULES(CIchthyosaur)
+{
+    slSwimAround,
+	slSwimAgitated,
+	slCircleEnemy,
+	slTwitchDie,
+};
+IMPLEMENT_CUSTOM_SCHEDULES(CIchthyosaur, CFlyingMonster);
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CIchthyosaur :: Classify ( void )
+{
+	return	CLASS_ALIEN_MONSTER;
+}
+
+
+//=========================================================
+// CheckMeleeAttack1
+//=========================================================
+BOOL CIchthyosaur :: CheckMeleeAttack1 ( float flDot, float flDist )
+{
+	if ( flDot >= 0.7 && m_flEnemyTouched > gpGlobals->time - 0.2 )
+	{
+		return TRUE;
+	}
+	return FALSE;
+}
+
+void CIchthyosaur::BiteTouch( CBaseEntity *pOther )
+{
+	// bite if we hit who we want to eat
+	if ( pOther == m_hEnemy ) 
+	{
+		m_flEnemyTouched = gpGlobals->time;
+		m_bOnAttack = TRUE;
+	}
+}
+
+void CIchthyosaur::CombatUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( !ShouldToggle( useType, m_bOnAttack ) )
+		return;
+
+	if (m_bOnAttack)
+	{
+		m_bOnAttack = 0;
+	}
+	else
+	{
+		m_bOnAttack = 1;
+	}
+}
+
+//=========================================================
+// CheckRangeAttack1  - swim in for a chomp
+//
+//=========================================================
+BOOL CIchthyosaur :: CheckRangeAttack1 ( float flDot, float flDist )
+{
+	if ( flDot > -0.7 && (m_bOnAttack || ( flDist <= 192 && m_idealDist <= 192)))
+	{
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+//=========================================================
+// SetYawSpeed - allows each sequence to have a different
+// turn rate associated with it.
+//=========================================================
+void CIchthyosaur :: SetYawSpeed ( void )
+{
+	pev->yaw_speed = 100;
+}
+
+
+
+//=========================================================
+// Killed - overrides CFlyingMonster.
+//
+void CIchthyosaur :: Killed( entvars_t *pevAttacker, int iGib )
+{
+	CBaseMonster::Killed( pevAttacker, iGib );
+	pev->velocity = Vector( 0, 0, 0 );
+}
+
+void CIchthyosaur::BecomeDead( void )
+{
+	pev->takedamage = DAMAGE_YES;// don't let autoaim aim at corpses.
+
+	// give the corpse half of the monster's original maximum health. 
+	pev->health = pev->max_health / 2;
+	pev->max_health = 5; // max_health now becomes a counter for how many blood decals the corpse can place.
+}
+
+#define ICHTHYOSAUR_AE_SHAKE_RIGHT 1
+#define ICHTHYOSAUR_AE_SHAKE_LEFT  2
+
+
+//=========================================================
+// HandleAnimEvent - catches the monster-specific messages
+// that occur when tagged animation frames are played.
+//=========================================================
+void CIchthyosaur :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	int bDidAttack = FALSE;
+	switch( pEvent->event )
+	{
+	case ICHTHYOSAUR_AE_SHAKE_RIGHT:
+	case ICHTHYOSAUR_AE_SHAKE_LEFT:
+		{
+			if (m_hEnemy != NULL && FVisible( m_hEnemy ))
+			{
+				CBaseEntity *pHurt = m_hEnemy;
+
+				if (m_flEnemyTouched < gpGlobals->time - 0.2 && (m_hEnemy->BodyTarget( pev->origin ) - pev->origin).Length() > (32+16+32))
+					break;
+
+				Vector vecShootDir = ShootAtEnemy( pev->origin );
+				UTIL_MakeAimVectors ( pev->angles );
+
+				if (DotProduct( vecShootDir, gpGlobals->v_forward ) > 0.707)
+				{
+					m_bOnAttack = TRUE;
+					pHurt->pev->punchangle.z = -18;
+					pHurt->pev->punchangle.x = 5;
+					pHurt->pev->velocity = pHurt->pev->velocity - gpGlobals->v_right * 300;
+					if (pHurt->IsPlayer())
+					{
+						pHurt->pev->angles.x += RANDOM_FLOAT( -35, 35 );
+						pHurt->pev->angles.y += RANDOM_FLOAT( -90, 90 );
+						pHurt->pev->angles.z = 0;
+						pHurt->pev->fixangle = TRUE;
+					}
+					pHurt->TakeDamage( pev, pev, gSkillData.ichthyosaurDmgShake, DMG_SLASH );
+				}
+			}
+			BiteSound();
+
+			bDidAttack = TRUE;
+		}
+		break;
+	default:
+		CFlyingMonster::HandleAnimEvent( pEvent );
+		break;
+	}
+
+	if (bDidAttack)
+	{
+		Vector vecSrc = pev->origin + gpGlobals->v_forward * 32;
+		UTIL_Bubbles( vecSrc - Vector( 8, 8, 8 ), vecSrc + Vector( 8, 8, 8 ), 16 );
+	}
+}
+
+//=========================================================
+// Spawn
+//=========================================================
+void CIchthyosaur :: Spawn()
+{
+	Precache( );
+
+	SET_MODEL(ENT(pev), "models/icky.mdl");
+	UTIL_SetSize( pev, Vector( -32, -32, -32 ), Vector( 32, 32, 32 ) );
+
+	pev->solid			= SOLID_BBOX;
+	pev->movetype		= MOVETYPE_FLY;
+	m_bloodColor		= BLOOD_COLOR_GREEN;
+	pev->health			= gSkillData.ichthyosaurHealth;
+	pev->view_ofs		= Vector ( 0, 0, 16 );
+	m_flFieldOfView		= VIEW_FIELD_WIDE;
+	m_MonsterState		= MONSTERSTATE_NONE;
+	SetBits(pev->flags, FL_SWIM);
+	SetFlyingSpeed( ICHTHYOSAUR_SPEED );
+	SetFlyingMomentum( 2.5 );	// Set momentum constant
+
+	m_afCapability		= bits_CAP_RANGE_ATTACK1 | bits_CAP_SWIM;
+
+	MonsterInit();
+
+	SetTouch( BiteTouch );
+	SetUse( CombatUse );
+
+	m_idealDist = 384;
+	m_flMinSpeed = 80;
+	m_flMaxSpeed = 300;
+	m_flMaxDist = 384;
+
+	Vector Forward;
+	UTIL_MakeVectorsPrivate(pev->angles, Forward, 0, 0);
+	pev->velocity = m_flightSpeed * Forward.Normalize();
+	m_SaveVelocity = pev->velocity;
+}
+
+//=========================================================
+// Precache - precaches all resources this monster needs
+//=========================================================
+void CIchthyosaur :: Precache()
+{
+	PRECACHE_MODEL("models/icky.mdl");
+
+	PRECACHE_SOUND_ARRAY( pIdleSounds );
+	PRECACHE_SOUND_ARRAY( pAlertSounds );
+	PRECACHE_SOUND_ARRAY( pAttackSounds );
+	PRECACHE_SOUND_ARRAY( pBiteSounds );
+	PRECACHE_SOUND_ARRAY( pDieSounds );
+	PRECACHE_SOUND_ARRAY( pPainSounds );
+}
+
+//=========================================================
+// GetSchedule
+//=========================================================
+Schedule_t* CIchthyosaur::GetSchedule()
+{
+	// ALERT( at_console, "GetSchedule( )\n" );
+	switch(m_MonsterState)
+	{
+	case MONSTERSTATE_IDLE:
+		m_flightSpeed = 80;
+		return GetScheduleOfType( SCHED_IDLE_WALK );
+
+	case MONSTERSTATE_ALERT:
+		m_flightSpeed = 150;
+		return GetScheduleOfType( SCHED_IDLE_WALK );
+
+	case MONSTERSTATE_COMBAT:
+		m_flMaxSpeed = 400;
+		// eat them
+		if ( HasConditions( bits_COND_CAN_MELEE_ATTACK1 ) )
+		{
+			return GetScheduleOfType( SCHED_MELEE_ATTACK1 );
+		}
+		// chase them down and eat them
+		if ( HasConditions( bits_COND_CAN_RANGE_ATTACK1 ) )
+		{
+			return GetScheduleOfType( SCHED_CHASE_ENEMY );
+		}
+		if ( HasConditions( bits_COND_HEAVY_DAMAGE ) )
+		{
+			m_bOnAttack = TRUE;
+		}
+		if ( pev->health < pev->max_health - 20 )
+		{
+			m_bOnAttack = TRUE;
+		}
+
+		return GetScheduleOfType( SCHED_STANDOFF );
+	}
+
+	return CFlyingMonster :: GetSchedule();
+}
+
+
+//=========================================================
+//=========================================================
+Schedule_t* CIchthyosaur :: GetScheduleOfType ( int Type ) 
+{
+	// ALERT( at_console, "GetScheduleOfType( %d ) %d\n", Type, m_bOnAttack );
+	switch	( Type )
+	{
+	case SCHED_IDLE_WALK:
+		return slSwimAround;
+	case SCHED_STANDOFF:
+		return slCircleEnemy;
+	case SCHED_FAIL:
+		return slSwimAgitated;
+	case SCHED_DIE:
+		return slTwitchDie;
+	case SCHED_CHASE_ENEMY:
+		AttackSound( );
+	}
+
+	return CBaseMonster :: GetScheduleOfType( Type );
+}
+
+
+
+//=========================================================
+// Start task - selects the correct activity and performs
+// any necessary calculations to start the next task on the
+// schedule.
+//=========================================================
+void CIchthyosaur::StartTask(Task_t *pTask)
+{
+	switch (pTask->iTask)
+	{
+	case TASK_ICHTHYOSAUR_CIRCLE_ENEMY:
+		break;
+	case TASK_ICHTHYOSAUR_SWIM:
+		break;
+	case TASK_SMALL_FLINCH:
+		if (m_idealDist > 128)
+		{
+			m_flMaxDist = 512;
+			m_idealDist = 512;
+		}
+		else
+		{
+			m_bOnAttack = TRUE;
+		}
+		CFlyingMonster::StartTask(pTask);
+		break;
+
+	case TASK_ICHTHYOSAUR_FLOAT:
+		pev->skin = EYE_BASE;
+		SetSequenceByName( "bellyup" );
+		break;
+
+	default:
+		CFlyingMonster::StartTask(pTask);
+		break;
+	}
+}
+
+void CIchthyosaur :: RunTask ( Task_t *pTask )
+{
+	switch ( pTask->iTask )
+	{
+	case TASK_ICHTHYOSAUR_CIRCLE_ENEMY:
+		if (m_hEnemy == NULL)
+		{
+			TaskComplete( );
+		}
+		else if (FVisible( m_hEnemy ))
+		{
+			Vector vecFrom = m_hEnemy->EyePosition( );
+
+			Vector vecDelta = (pev->origin - vecFrom).Normalize( );
+			Vector vecSwim = CrossProduct( vecDelta, Vector( 0, 0, 1 ) ).Normalize( );
+			
+			if (DotProduct( vecSwim, m_SaveVelocity ) < 0)
+				vecSwim = vecSwim * -1.0;
+
+			Vector vecPos = vecFrom + vecDelta * m_idealDist + vecSwim * 32;
+
+			// ALERT( at_console, "vecPos %.0f %.0f %.0f\n", vecPos.x, vecPos.y, vecPos.z );
+
+			TraceResult tr;
+		
+			UTIL_TraceHull( vecFrom, vecPos, ignore_monsters, large_hull, m_hEnemy->edict(), &tr );
+
+			if (tr.flFraction > 0.5)
+				vecPos = tr.vecEndPos;
+
+			m_SaveVelocity = m_SaveVelocity * 0.8 + 0.2 * (vecPos - pev->origin).Normalize() * m_flightSpeed;
+
+			// ALERT( at_console, "m_SaveVelocity %.2f %.2f %.2f\n", m_SaveVelocity.x, m_SaveVelocity.y, m_SaveVelocity.z );
+
+			if (HasConditions( bits_COND_ENEMY_FACING_ME ) && m_hEnemy->FVisible( this ))
+			{
+				m_flNextAlert -= 0.1;
+
+				if (m_idealDist < m_flMaxDist)
+				{
+					m_idealDist += 4;
+				}
+				if (m_flightSpeed > m_flMinSpeed)
+				{
+					m_flightSpeed -= 2;
+				}
+				else if (m_flightSpeed < m_flMinSpeed)
+				{
+					m_flightSpeed += 2;
+				}
+				if (m_flMinSpeed < m_flMaxSpeed)
+				{
+					m_flMinSpeed += 0.5;
+				}
+			}
+			else 
+			{
+				m_flNextAlert += 0.1;
+
+				if (m_idealDist > 128)
+				{
+					m_idealDist -= 4;
+				}
+				if (m_flightSpeed < m_flMaxSpeed)
+				{
+					m_flightSpeed += 4;
+				}
+			}
+			// ALERT( at_console, "%.0f\n", m_idealDist );
+		}
+		else
+		{
+			m_flNextAlert = gpGlobals->time + 0.2;
+		}
+
+		if (m_flNextAlert < gpGlobals->time)
+		{
+			// ALERT( at_console, "AlertSound()\n");
+			AlertSound( );
+			m_flNextAlert = gpGlobals->time + RANDOM_FLOAT( 3, 5 );
+		}
+
+		break;
+	case TASK_ICHTHYOSAUR_SWIM:
+		if (m_fSequenceFinished)
+		{
+			TaskComplete( );
+		}
+		break;
+	case TASK_DIE:
+		if ( m_fSequenceFinished )
+		{
+			pev->deadflag = DEAD_DEAD;
+
+			TaskComplete( );
+		}
+		break;
+
+	case TASK_ICHTHYOSAUR_FLOAT:
+		pev->angles.x = UTIL_ApproachAngle( 0, pev->angles.x, 20 );
+		pev->velocity = pev->velocity * 0.8;
+		if (pev->waterlevel > 1 && pev->velocity.z < 64)
+		{
+			pev->velocity.z += 8;
+		}
+		else 
+		{
+			pev->velocity.z -= 8;
+		}
+		// ALERT( at_console, "%f\n", pev->velocity.z );
+		break;
+
+	default: 
+		CFlyingMonster :: RunTask ( pTask );
+		break;
+	}
+}
+
+
+
+float CIchthyosaur::VectorToPitch( const Vector &vec )
+{
+	float pitch;
+	if (vec.z == 0 && vec.x == 0)
+		pitch = 0;
+	else
+	{
+		pitch = (int) (atan2(vec.z, sqrt(vec.x*vec.x+vec.y*vec.y)) * 180 / M_PI);
+		if (pitch < 0)
+			pitch += 360;
+	}
+	return pitch;
+}
+
+//=========================================================
+void CIchthyosaur::Move(float flInterval)
+{
+	CFlyingMonster::Move( flInterval );
+}
+
+float CIchthyosaur::FlPitchDiff( void )
+{
+	float	flPitchDiff;
+	float	flCurrentPitch;
+
+	flCurrentPitch = UTIL_AngleMod( pev->angles.z );
+
+	if ( flCurrentPitch == pev->idealpitch )
+	{
+		return 0;
+	}
+
+	flPitchDiff = pev->idealpitch - flCurrentPitch;
+
+	if ( pev->idealpitch > flCurrentPitch )
+	{
+		if (flPitchDiff >= 180)
+			flPitchDiff = flPitchDiff - 360;
+	}
+	else 
+	{
+		if (flPitchDiff <= -180)
+			flPitchDiff = flPitchDiff + 360;
+	}
+	return flPitchDiff;
+}
+
+float CIchthyosaur :: ChangePitch( int speed )
+{
+	if ( pev->movetype == MOVETYPE_FLY )
+	{
+		float diff = FlPitchDiff();
+		float target = 0;
+		if ( m_IdealActivity != GetStoppedActivity() )
+		{
+			if (diff < -20)
+				target = 45;
+			else if (diff > 20)
+				target = -45;
+		}
+		pev->angles.x = UTIL_Approach(target, pev->angles.x, 220.0 * 0.1 );
+	}
+	return 0;
+}
+
+float CIchthyosaur::ChangeYaw( int speed )
+{
+	if ( pev->movetype == MOVETYPE_FLY )
+	{
+		float diff = FlYawDiff();
+		float target = 0;
+
+		if ( m_IdealActivity != GetStoppedActivity() )
+		{
+			if ( diff < -20 )
+				target = 20;
+			else if ( diff > 20 )
+				target = -20;
+		}
+		pev->angles.z = UTIL_Approach( target, pev->angles.z, 220.0 * 0.1 );
+	}
+	return CFlyingMonster::ChangeYaw( speed );
+}
+
+
+Activity CIchthyosaur:: GetStoppedActivity( void )
+{ 
+	if ( pev->movetype != MOVETYPE_FLY )		// UNDONE: Ground idle here, IDLE may be something else
+		return ACT_IDLE;
+	return ACT_WALK;
+}
+
+void CIchthyosaur::MoveExecute( CBaseEntity *pTargetEnt, const Vector &vecDir, float flInterval )
+{
+	m_SaveVelocity = vecDir * m_flightSpeed;
+}
+
+
+void CIchthyosaur::MonsterThink ( void )
+{
+	CFlyingMonster::MonsterThink( );
+
+	if (pev->deadflag == DEAD_NO)
+	{
+		if (m_MonsterState != MONSTERSTATE_SCRIPT)
+		{
+			Swim( );
+
+			// blink the eye
+			if (m_flBlink < gpGlobals->time)
+			{
+				pev->skin = EYE_CLOSED;
+				if (m_flBlink + 0.2 < gpGlobals->time)
+				{
+					m_flBlink = gpGlobals->time + RANDOM_FLOAT( 3, 4 );
+					if (m_bOnAttack)
+						pev->skin = EYE_MAD;
+					else
+						pev->skin = EYE_BASE;
+				}
+			}
+		}
+	}
+}
+
+void CIchthyosaur :: Stop( void ) 
+{
+	if (!m_bOnAttack)
+		m_flightSpeed = 80.0;
+}
+
+void CIchthyosaur::Swim( )
+{
+	int retValue = 0;
+
+	Vector start = pev->origin;
+
+	Vector Angles;
+	Vector Forward, Right, Up;
+
+	if (FBitSet( pev->flags, FL_ONGROUND))
+	{
+		pev->angles.x = 0;
+		pev->angles.y += RANDOM_FLOAT( -45, 45 );
+		ClearBits( pev->flags, FL_ONGROUND );
+
+		Angles = Vector( -pev->angles.x, pev->angles.y, pev->angles.z );
+		UTIL_MakeVectorsPrivate(Angles, Forward, Right, Up);
+
+		pev->velocity = Forward * 200 + Up * 200;
+
+		return;
+	}
+
+	if (m_bOnAttack && m_flightSpeed < m_flMaxSpeed)
+	{
+		m_flightSpeed += 40;
+	}
+	if (m_flightSpeed < 180)
+	{
+		if (m_IdealActivity == ACT_RUN)
+			SetActivity( ACT_WALK );
+		if (m_IdealActivity == ACT_WALK)
+			pev->framerate = m_flightSpeed / 150.0;
+		// ALERT( at_console, "walk %.2f\n", pev->framerate );
+	}
+	else
+	{
+		if (m_IdealActivity == ACT_WALK)
+			SetActivity( ACT_RUN );
+		if (m_IdealActivity == ACT_RUN)
+			pev->framerate = m_flightSpeed / 150.0;
+		// ALERT( at_console, "run  %.2f\n", pev->framerate );
+	}
+
+/*
+	if (!m_pBeam)
+	{
+		m_pBeam = CBeam::BeamCreate( "sprites/laserbeam.spr", 80 );
+		m_pBeam->PointEntInit( pev->origin + m_SaveVelocity, entindex( ) );
+		m_pBeam->SetEndAttachment( 1 );
+		m_pBeam->SetColor( 255, 180, 96 );
+		m_pBeam->SetBrightness( 192 );
+	}
+*/
+#define PROBE_LENGTH 150
+	Angles = UTIL_VecToAngles( m_SaveVelocity );
+	Angles.x = -Angles.x;
+	UTIL_MakeVectorsPrivate(Angles, Forward, Right, Up);
+
+	Vector f, u, l, r, d;
+	f = DoProbe(start + PROBE_LENGTH   * Forward);
+	r = DoProbe(start + PROBE_LENGTH/3 * Forward+Right);
+	l = DoProbe(start + PROBE_LENGTH/3 * Forward-Right);
+	u = DoProbe(start + PROBE_LENGTH/3 * Forward+Up);
+	d = DoProbe(start + PROBE_LENGTH/3 * Forward-Up);
+
+	Vector SteeringVector = f+r+l+u+d;
+	m_SaveVelocity = (m_SaveVelocity + SteeringVector/2).Normalize();
+
+	Angles = Vector( -pev->angles.x, pev->angles.y, pev->angles.z );
+	UTIL_MakeVectorsPrivate(Angles, Forward, Right, Up);
+	// ALERT( at_console, "%f : %f\n", Angles.x, Forward.z );
+
+	float flDot = DotProduct( Forward, m_SaveVelocity );
+	if (flDot > 0.5)
+		pev->velocity = m_SaveVelocity = m_SaveVelocity * m_flightSpeed;
+	else if (flDot > 0)
+		pev->velocity = m_SaveVelocity = m_SaveVelocity * m_flightSpeed * (flDot + 0.5);
+	else
+		pev->velocity = m_SaveVelocity = m_SaveVelocity * 80;
+
+	// ALERT( at_console, "%.0f %.0f\n", m_flightSpeed, pev->velocity.Length() );
+
+
+	// ALERT( at_console, "Steer %f %f %f\n", SteeringVector.x, SteeringVector.y, SteeringVector.z );
+
+/*
+	m_pBeam->SetStartPos( pev->origin + pev->velocity );
+	m_pBeam->RelinkBeam( );
+*/
+
+	// ALERT( at_console, "speed %f\n", m_flightSpeed );
+	
+	Angles = UTIL_VecToAngles( m_SaveVelocity );
+
+	// Smooth Pitch
+	//
+	if (Angles.x > 180)
+		Angles.x = Angles.x - 360;
+	pev->angles.x = UTIL_Approach(Angles.x, pev->angles.x, 50 * 0.1 );
+	if (pev->angles.x < -80) pev->angles.x = -80;
+	if (pev->angles.x >  80) pev->angles.x =  80;
+
+	// Smooth Yaw and generate Roll
+	//
+	float turn = 360;
+	// ALERT( at_console, "Y %.0f %.0f\n", Angles.y, pev->angles.y );
+
+	if (fabs(Angles.y - pev->angles.y) < fabs(turn))
+	{
+		turn = Angles.y - pev->angles.y;
+	}
+	if (fabs(Angles.y - pev->angles.y + 360) < fabs(turn))
+	{
+		turn = Angles.y - pev->angles.y + 360;
+	}
+	if (fabs(Angles.y - pev->angles.y - 360) < fabs(turn))
+	{
+		turn = Angles.y - pev->angles.y - 360;
+	}
+
+	float speed = m_flightSpeed * 0.1;
+
+	// ALERT( at_console, "speed %.0f %f\n", turn, speed );
+	if (fabs(turn) > speed)
+	{
+		if (turn < 0.0)
+		{
+			turn = -speed;
+		}
+		else
+		{
+			turn = speed;
+		}
+	}
+	pev->angles.y += turn;
+	pev->angles.z -= turn;
+	pev->angles.y = fmod((pev->angles.y + 360.0), 360.0);
+
+	static float yaw_adj;
+
+	yaw_adj = yaw_adj * 0.8 + turn;
+
+	// ALERT( at_console, "yaw %f : %f\n", turn, yaw_adj );
+
+	SetBoneController( 0, -yaw_adj / 4.0 );
+
+	// Roll Smoothing
+	//
+	turn = 360;
+	if (fabs(Angles.z - pev->angles.z) < fabs(turn))
+	{
+		turn = Angles.z - pev->angles.z;
+	}
+	if (fabs(Angles.z - pev->angles.z + 360) < fabs(turn))
+	{
+		turn = Angles.z - pev->angles.z + 360;
+	}
+	if (fabs(Angles.z - pev->angles.z - 360) < fabs(turn))
+	{
+		turn = Angles.z - pev->angles.z - 360;
+	}
+	speed = m_flightSpeed/2 * 0.1;
+	if (fabs(turn) < speed)
+	{
+		pev->angles.z += turn;
+	}
+	else
+	{
+		if (turn < 0.0)
+		{
+			pev->angles.z -= speed;
+		}
+		else
+		{
+			pev->angles.z += speed;
+		}
+	}
+	if (pev->angles.z < -20) pev->angles.z = -20;
+	if (pev->angles.z >  20) pev->angles.z =  20;
+
+	UTIL_MakeVectorsPrivate( Vector( -Angles.x, Angles.y, Angles.z ), Forward, Right, Up);
+
+	// UTIL_MoveToOrigin ( ENT(pev), pev->origin + Forward * speed, speed, MOVE_STRAFE );
+}
+
+
+Vector CIchthyosaur::DoProbe(const Vector &Probe)
+{
+	Vector WallNormal = Vector(0,0,-1); // WATER normal is Straight Down for fish.
+	float frac;
+	BOOL bBumpedSomething = ProbeZ(pev->origin, Probe, &frac);
+
+	TraceResult tr;
+	TRACE_MONSTER_HULL(edict(), pev->origin, Probe, dont_ignore_monsters, edict(), &tr);
+	if ( tr.fAllSolid || tr.flFraction < 0.99 )
+	{
+		if (tr.flFraction < 0.0) tr.flFraction = 0.0;
+		if (tr.flFraction > 1.0) tr.flFraction = 1.0;
+		if (tr.flFraction < frac)
+		{
+			frac = tr.flFraction;
+			bBumpedSomething = TRUE;
+			WallNormal = tr.vecPlaneNormal;
+		}
+	}
+
+	if (bBumpedSomething && (m_hEnemy == NULL || tr.pHit != m_hEnemy->edict()))
+	{
+		Vector ProbeDir = Probe - pev->origin;
+
+		Vector NormalToProbeAndWallNormal = CrossProduct(ProbeDir, WallNormal);
+		Vector SteeringVector = CrossProduct( NormalToProbeAndWallNormal, ProbeDir);
+
+		float SteeringForce = m_flightSpeed * (1-frac) * (DotProduct(WallNormal.Normalize(), m_SaveVelocity.Normalize()));
+		if (SteeringForce < 0.0)
+		{
+			SteeringForce = -SteeringForce;
+		}
+		SteeringVector = SteeringForce * SteeringVector.Normalize();
+		
+		return SteeringVector;
+	}
+	return Vector(0, 0, 0);
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/islave.cpp b/main/source/dlls/islave.cpp
new file mode 100644
index 00000000..a42ece21
--- /dev/null
+++ b/main/source/dlls/islave.cpp
@@ -0,0 +1,866 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// Alien slave monster
+//=========================================================
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"squadmonster.h"
+#include	"schedule.h"
+#include	"effects.h"
+#include	"weapons.h"
+#include	"soundent.h"
+
+extern DLL_GLOBAL int		g_iSkillLevel;
+
+//=========================================================
+// Monster's Anim Events Go Here
+//=========================================================
+#define		ISLAVE_AE_CLAW		( 1 )
+#define		ISLAVE_AE_CLAWRAKE	( 2 )
+#define		ISLAVE_AE_ZAP_POWERUP	( 3 )
+#define		ISLAVE_AE_ZAP_SHOOT		( 4 )
+#define		ISLAVE_AE_ZAP_DONE		( 5 )
+
+#define		ISLAVE_MAX_BEAMS	8
+
+class CISlave : public CSquadMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void SetYawSpeed( void );
+	int	 ISoundMask( void );
+	int  Classify ( void );
+	int  IRelationship( CBaseEntity *pTarget );
+	void HandleAnimEvent( MonsterEvent_t *pEvent );
+	BOOL CheckRangeAttack1 ( float flDot, float flDist );
+	BOOL CheckRangeAttack2 ( float flDot, float flDist );
+	void CallForHelp( char *szClassname, float flDist, EHANDLE hEnemy, Vector &vecLocation );
+	void TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType);
+	int TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType);
+
+	void DeathSound( void );
+	void PainSound( void );
+	void AlertSound( void );
+	void IdleSound( void );
+
+	void Killed( entvars_t *pevAttacker, int iGib );
+
+    void StartTask ( Task_t *pTask );
+	Schedule_t *GetSchedule( void );
+	Schedule_t *GetScheduleOfType ( int Type );
+	CUSTOM_SCHEDULES;
+
+	int	Save( CSave &save ); 
+	int Restore( CRestore &restore );
+	static TYPEDESCRIPTION m_SaveData[];
+
+	void ClearBeams( );
+	void ArmBeam( int side );
+	void WackBeam( int side, CBaseEntity *pEntity );
+	void ZapBeam( int side );
+	void BeamGlow( void );
+
+	int m_iBravery;
+
+	CBeam *m_pBeam[ISLAVE_MAX_BEAMS];
+
+	int m_iBeams;
+	float m_flNextAttack;
+
+	int	m_voicePitch;
+
+	EHANDLE m_hDead;
+
+	static const char *pAttackHitSounds[];
+	static const char *pAttackMissSounds[];
+	static const char *pPainSounds[];
+	static const char *pDeathSounds[];
+};
+LINK_ENTITY_TO_CLASS( monster_alien_slave, CISlave );
+LINK_ENTITY_TO_CLASS( monster_vortigaunt, CISlave );
+
+
+TYPEDESCRIPTION	CISlave::m_SaveData[] = 
+{
+	DEFINE_FIELD( CISlave, m_iBravery, FIELD_INTEGER ),
+
+	DEFINE_ARRAY( CISlave, m_pBeam, FIELD_CLASSPTR, ISLAVE_MAX_BEAMS ),
+	DEFINE_FIELD( CISlave, m_iBeams, FIELD_INTEGER ),
+	DEFINE_FIELD( CISlave, m_flNextAttack, FIELD_TIME ),
+
+	DEFINE_FIELD( CISlave, m_voicePitch, FIELD_INTEGER ),
+
+	DEFINE_FIELD( CISlave, m_hDead, FIELD_EHANDLE ),
+
+};
+
+IMPLEMENT_SAVERESTORE( CISlave, CSquadMonster );
+
+
+
+
+const char *CISlave::pAttackHitSounds[] = 
+{
+	"zombie/claw_strike1.wav",
+	"zombie/claw_strike2.wav",
+	"zombie/claw_strike3.wav",
+};
+
+const char *CISlave::pAttackMissSounds[] = 
+{
+	"zombie/claw_miss1.wav",
+	"zombie/claw_miss2.wav",
+};
+
+const char *CISlave::pPainSounds[] = 
+{
+	"aslave/slv_pain1.wav",
+	"aslave/slv_pain2.wav",
+};
+
+const char *CISlave::pDeathSounds[] = 
+{
+	"aslave/slv_die1.wav",
+	"aslave/slv_die2.wav",
+};
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CISlave :: Classify ( void )
+{
+	return	CLASS_ALIEN_MILITARY;
+}
+
+
+int CISlave::IRelationship( CBaseEntity *pTarget )
+{
+	if ( (pTarget->IsPlayer()) )
+		if ( (pev->spawnflags & SF_MONSTER_WAIT_UNTIL_PROVOKED ) && ! (m_afMemory & bits_MEMORY_PROVOKED ))
+			return R_NO;
+	return CBaseMonster::IRelationship( pTarget );
+}
+
+
+void CISlave :: CallForHelp( char *szClassname, float flDist, EHANDLE hEnemy, Vector &vecLocation )
+{
+	// ALERT( at_aiconsole, "help " );
+
+	// skip ones not on my netname
+	if ( FStringNull( pev->netname ))
+		return;
+
+	CBaseEntity *pEntity = NULL;
+
+	while ((pEntity = UTIL_FindEntityByString( pEntity, "netname", STRING( pev->netname ))) != NULL)
+	{
+		float d = (pev->origin - pEntity->pev->origin).Length();
+		if (d < flDist)
+		{
+			CBaseMonster *pMonster = pEntity->MyMonsterPointer( );
+			if (pMonster)
+			{
+				pMonster->m_afMemory |= bits_MEMORY_PROVOKED;
+				pMonster->PushEnemy( hEnemy, vecLocation );
+			}
+		}
+	}
+}
+
+
+//=========================================================
+// ALertSound - scream
+//=========================================================
+void CISlave :: AlertSound( void )
+{
+	if ( m_hEnemy != NULL )
+	{
+		SENTENCEG_PlayRndSz(ENT(pev), "SLV_ALERT", 0.85, ATTN_NORM, 0, m_voicePitch);
+
+		CallForHelp( "monster_alien_slave", 512, m_hEnemy, m_vecEnemyLKP );
+	}
+}
+
+//=========================================================
+// IdleSound
+//=========================================================
+void CISlave :: IdleSound( void )
+{
+	if (RANDOM_LONG( 0, 2 ) == 0)
+	{
+		SENTENCEG_PlayRndSz(ENT(pev), "SLV_IDLE", 0.85, ATTN_NORM, 0, m_voicePitch);
+	}
+
+#if 0
+	int side = RANDOM_LONG( 0, 1 ) * 2 - 1;
+
+	ClearBeams( );
+	ArmBeam( side );
+
+	UTIL_MakeAimVectors( pev->angles );
+	Vector vecSrc = pev->origin + gpGlobals->v_right * 2 * side;
+	MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, vecSrc );
+		WRITE_BYTE(TE_DLIGHT);
+		WRITE_COORD(vecSrc.x);	// X
+		WRITE_COORD(vecSrc.y);	// Y
+		WRITE_COORD(vecSrc.z);	// Z
+		WRITE_BYTE( 8 );		// radius * 0.1
+		WRITE_BYTE( 255 );		// r
+		WRITE_BYTE( 180 );		// g
+		WRITE_BYTE( 96 );		// b
+		WRITE_BYTE( 10 );		// time * 10
+		WRITE_BYTE( 0 );		// decay * 0.1
+	MESSAGE_END( );
+
+	EMIT_SOUND_DYN( ENT(pev), CHAN_WEAPON, "debris/zap1.wav", 1, ATTN_NORM, 0, 100 );
+#endif
+}
+
+//=========================================================
+// PainSound
+//=========================================================
+void CISlave :: PainSound( void )
+{
+	if (RANDOM_LONG( 0, 2 ) == 0)
+	{
+		EMIT_SOUND_DYN ( ENT(pev), CHAN_WEAPON, pPainSounds[ RANDOM_LONG(0,ARRAYSIZE(pPainSounds)-1) ], 1.0, ATTN_NORM, 0, m_voicePitch );
+	}
+}
+
+//=========================================================
+// DieSound
+//=========================================================
+
+void CISlave :: DeathSound( void )
+{
+	EMIT_SOUND_DYN ( ENT(pev), CHAN_WEAPON, pDeathSounds[ RANDOM_LONG(0,ARRAYSIZE(pDeathSounds)-1) ], 1.0, ATTN_NORM, 0, m_voicePitch );
+}
+
+
+//=========================================================
+// ISoundMask - returns a bit mask indicating which types
+// of sounds this monster regards. 
+//=========================================================
+int CISlave :: ISoundMask ( void) 
+{
+	return	bits_SOUND_WORLD	|
+			bits_SOUND_COMBAT	|
+			bits_SOUND_DANGER	|
+			bits_SOUND_PLAYER;
+}
+
+
+void CISlave::Killed( entvars_t *pevAttacker, int iGib )
+{
+	ClearBeams( );
+	CSquadMonster::Killed( pevAttacker, iGib );
+}
+
+//=========================================================
+// SetYawSpeed - allows each sequence to have a different
+// turn rate associated with it.
+//=========================================================
+void CISlave :: SetYawSpeed ( void )
+{
+	int ys;
+
+	switch ( m_Activity )
+	{
+	case ACT_WALK:		
+		ys = 50;	
+		break;
+	case ACT_RUN:		
+		ys = 70;
+		break;
+	case ACT_IDLE:		
+		ys = 50;
+		break;
+	default:
+		ys = 90;
+		break;
+	}
+
+	pev->yaw_speed = ys;
+}
+
+//=========================================================
+// HandleAnimEvent - catches the monster-specific messages
+// that occur when tagged animation frames are played.
+//
+// Returns number of events handled, 0 if none.
+//=========================================================
+void CISlave :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	// ALERT( at_console, "event %d : %f\n", pEvent->event, pev->frame );
+	switch( pEvent->event )
+	{
+		case ISLAVE_AE_CLAW:
+		{
+			// SOUND HERE!
+			CBaseEntity *pHurt = CheckTraceHullAttack( 70, gSkillData.slaveDmgClaw, DMG_SLASH );
+			if ( pHurt )
+			{
+				if ( pHurt->pev->flags & (FL_MONSTER|FL_CLIENT) )
+				{
+					pHurt->pev->punchangle.z = -18;
+					pHurt->pev->punchangle.x = 5;
+				}
+				// Play a random attack hit sound
+				EMIT_SOUND_DYN ( ENT(pev), CHAN_WEAPON, pAttackHitSounds[ RANDOM_LONG(0,ARRAYSIZE(pAttackHitSounds)-1) ], 1.0, ATTN_NORM, 0, m_voicePitch );
+			}
+			else
+			{
+				// Play a random attack miss sound
+				EMIT_SOUND_DYN ( ENT(pev), CHAN_WEAPON, pAttackMissSounds[ RANDOM_LONG(0,ARRAYSIZE(pAttackMissSounds)-1) ], 1.0, ATTN_NORM, 0, m_voicePitch );
+			}
+		}
+		break;
+
+		case ISLAVE_AE_CLAWRAKE:
+		{
+			CBaseEntity *pHurt = CheckTraceHullAttack( 70, gSkillData.slaveDmgClawrake, DMG_SLASH );
+			if ( pHurt )
+			{
+				if ( pHurt->pev->flags & (FL_MONSTER|FL_CLIENT) )
+				{
+					pHurt->pev->punchangle.z = -18;
+					pHurt->pev->punchangle.x = 5;
+				}
+				EMIT_SOUND_DYN ( ENT(pev), CHAN_WEAPON, pAttackHitSounds[ RANDOM_LONG(0,ARRAYSIZE(pAttackHitSounds)-1) ], 1.0, ATTN_NORM, 0, m_voicePitch );
+			}
+			else
+			{
+				EMIT_SOUND_DYN ( ENT(pev), CHAN_WEAPON, pAttackMissSounds[ RANDOM_LONG(0,ARRAYSIZE(pAttackMissSounds)-1) ], 1.0, ATTN_NORM, 0, m_voicePitch );
+			}
+		}
+		break;
+
+		case ISLAVE_AE_ZAP_POWERUP:
+		{
+			// speed up attack when on hard
+			if (g_iSkillLevel == SKILL_HARD)
+				pev->framerate = 1.5;
+
+			UTIL_MakeAimVectors( pev->angles );
+
+			if (m_iBeams == 0)
+			{
+				Vector vecSrc = pev->origin + gpGlobals->v_forward * 2;
+				MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, vecSrc );
+					WRITE_BYTE(TE_DLIGHT);
+					WRITE_COORD(vecSrc.x);	// X
+					WRITE_COORD(vecSrc.y);	// Y
+					WRITE_COORD(vecSrc.z);	// Z
+					WRITE_BYTE( 12 );		// radius * 0.1
+					WRITE_BYTE( 255 );		// r
+					WRITE_BYTE( 180 );		// g
+					WRITE_BYTE( 96 );		// b
+					WRITE_BYTE( 20 / pev->framerate );		// time * 10
+					WRITE_BYTE( 0 );		// decay * 0.1
+				MESSAGE_END( );
+
+			}
+			if (m_hDead != NULL)
+			{
+				WackBeam( -1, m_hDead );
+				WackBeam( 1, m_hDead );
+			}
+			else
+			{
+				ArmBeam( -1 );
+				ArmBeam( 1 );
+				BeamGlow( );
+			}
+
+			EMIT_SOUND_DYN( ENT(pev), CHAN_WEAPON, "debris/zap4.wav", 1, ATTN_NORM, 0, 100 + m_iBeams * 10 );
+			pev->skin = m_iBeams / 2;
+		}
+		break;
+
+		case ISLAVE_AE_ZAP_SHOOT:
+		{
+			ClearBeams( );
+
+			if (m_hDead != NULL)
+			{
+				Vector vecDest = m_hDead->pev->origin + Vector( 0, 0, 38 );
+				TraceResult trace;
+				UTIL_TraceHull( vecDest, vecDest, dont_ignore_monsters, human_hull, m_hDead->edict(), &trace );
+
+				if ( !trace.fStartSolid )
+				{
+					CBaseEntity *pNew = Create( "monster_alien_slave", m_hDead->pev->origin, m_hDead->pev->angles );
+					CBaseMonster *pNewMonster = pNew->MyMonsterPointer( );
+					pNew->pev->spawnflags |= 1;
+					WackBeam( -1, pNew );
+					WackBeam( 1, pNew );
+					UTIL_Remove( m_hDead );
+					EMIT_SOUND_DYN( ENT(pev), CHAN_WEAPON, "hassault/hw_shoot1.wav", 1, ATTN_NORM, 0, RANDOM_LONG( 130, 160 ) );
+
+					/*
+					CBaseEntity *pEffect = Create( "test_effect", pNew->Center(), pev->angles );
+					pEffect->Use( this, this, USE_ON, 1 );
+					*/
+					break;
+				}
+			}
+			ClearMultiDamage();
+
+			UTIL_MakeAimVectors( pev->angles );
+
+			ZapBeam( -1 );
+			ZapBeam( 1 );
+
+			EMIT_SOUND_DYN( ENT(pev), CHAN_WEAPON, "hassault/hw_shoot1.wav", 1, ATTN_NORM, 0, RANDOM_LONG( 130, 160 ) );
+			// STOP_SOUND( ENT(pev), CHAN_WEAPON, "debris/zap4.wav" );
+			ApplyMultiDamage(pev, pev);
+
+			m_flNextAttack = gpGlobals->time + RANDOM_FLOAT( 0.5, 4.0 );
+		}
+		break;
+
+		case ISLAVE_AE_ZAP_DONE:
+		{
+			ClearBeams( );
+		}
+		break;
+
+		default:
+			CSquadMonster::HandleAnimEvent( pEvent );
+			break;
+	}
+}
+
+//=========================================================
+// CheckRangeAttack1 - normal beam attack 
+//=========================================================
+BOOL CISlave :: CheckRangeAttack1 ( float flDot, float flDist )
+{
+	if (m_flNextAttack > gpGlobals->time)
+	{
+		return FALSE;
+	}
+
+	return CSquadMonster::CheckRangeAttack1( flDot, flDist );
+}
+
+//=========================================================
+// CheckRangeAttack2 - check bravery and try to resurect dead comrades
+//=========================================================
+BOOL CISlave :: CheckRangeAttack2 ( float flDot, float flDist )
+{
+	return FALSE;
+
+	if (m_flNextAttack > gpGlobals->time)
+	{
+		return FALSE;
+	}
+
+	m_hDead = NULL;
+	m_iBravery = 0;
+
+	CBaseEntity *pEntity = NULL;
+	while ((pEntity = UTIL_FindEntityByClassname( pEntity, "monster_alien_slave" )) != NULL)
+	{
+		TraceResult tr;
+
+		UTIL_TraceLine( EyePosition( ), pEntity->EyePosition( ), ignore_monsters, ENT(pev), &tr );
+		if (tr.flFraction == 1.0 || tr.pHit == pEntity->edict())
+		{
+			if (pEntity->pev->deadflag == DEAD_DEAD)
+			{
+				float d = (pev->origin - pEntity->pev->origin).Length();
+				if (d < flDist)
+				{
+					m_hDead = pEntity;
+					flDist = d;
+				}
+				m_iBravery--;
+			}
+			else
+			{
+				m_iBravery++;
+			}
+		}
+	}
+	if (m_hDead != NULL)
+		return TRUE;
+	else
+		return FALSE;
+}
+
+
+//=========================================================
+// StartTask
+//=========================================================
+void CISlave :: StartTask ( Task_t *pTask )
+{
+	ClearBeams( );
+
+	CSquadMonster :: StartTask ( pTask );
+}
+
+
+//=========================================================
+// Spawn
+//=========================================================
+void CISlave :: Spawn()
+{
+	Precache( );
+
+	SET_MODEL(ENT(pev), "models/islave.mdl");
+	UTIL_SetSize(pev, VEC_HUMAN_HULL_MIN, VEC_HUMAN_HULL_MAX);
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_STEP;
+	m_bloodColor		= BLOOD_COLOR_GREEN;
+	pev->effects		= 0;
+	pev->health			= gSkillData.slaveHealth;
+	pev->view_ofs		= Vector ( 0, 0, 64 );// position of the eyes relative to monster's origin.
+	m_flFieldOfView		= VIEW_FIELD_WIDE; // NOTE: we need a wide field of view so npc will notice player and say hello
+	m_MonsterState		= MONSTERSTATE_NONE;
+	m_afCapability		= bits_CAP_HEAR | bits_CAP_TURN_HEAD | bits_CAP_RANGE_ATTACK2 | bits_CAP_DOORS_GROUP;
+
+	m_voicePitch		= RANDOM_LONG( 85, 110 );
+
+	MonsterInit();
+}
+
+//=========================================================
+// Precache - precaches all resources this monster needs
+//=========================================================
+void CISlave :: Precache()
+{
+	int i;
+
+	PRECACHE_MODEL("models/islave.mdl");
+	PRECACHE_MODEL("sprites/lgtning.spr");
+	PRECACHE_SOUND("debris/zap1.wav");
+	PRECACHE_SOUND("debris/zap4.wav");
+	PRECACHE_SOUND("weapons/electro4.wav");
+	PRECACHE_SOUND("hassault/hw_shoot1.wav");
+	PRECACHE_SOUND("zombie/zo_pain2.wav");
+	PRECACHE_SOUND("headcrab/hc_headbite.wav");
+	PRECACHE_SOUND("weapons/cbar_miss1.wav");
+
+	for ( i = 0; i < ARRAYSIZE( pAttackHitSounds ); i++ )
+		PRECACHE_SOUND((char *)pAttackHitSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pAttackMissSounds ); i++ )
+		PRECACHE_SOUND((char *)pAttackMissSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pPainSounds ); i++ )
+		PRECACHE_SOUND((char *)pPainSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pDeathSounds ); i++ )
+		PRECACHE_SOUND((char *)pDeathSounds[i]);
+
+	UTIL_PrecacheOther( "test_effect" );
+}	
+
+
+//=========================================================
+// TakeDamage - get provoked when injured
+//=========================================================
+
+int CISlave :: TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType)
+{
+	// don't slash one of your own
+	if ((bitsDamageType & DMG_SLASH) && pevAttacker && IRelationship( Instance(pevAttacker) ) < R_DL)
+		return 0;
+
+	m_afMemory |= bits_MEMORY_PROVOKED;
+	return CSquadMonster::TakeDamage(pevInflictor, pevAttacker, flDamage, bitsDamageType);
+}
+
+
+void CISlave::TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType)
+{
+	if (bitsDamageType & DMG_SHOCK)
+		return;
+
+	CSquadMonster::TraceAttack( pevAttacker, flDamage, vecDir, ptr, bitsDamageType );
+}
+
+
+//=========================================================
+// AI Schedules Specific to this monster
+//=========================================================
+
+
+
+// primary range attack
+Task_t	tlSlaveAttack1[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_FACE_IDEAL,			(float)0		},
+	{ TASK_RANGE_ATTACK1,		(float)0		},
+};
+
+Schedule_t	slSlaveAttack1[] =
+{
+	{ 
+		tlSlaveAttack1,
+		ARRAYSIZE ( tlSlaveAttack1 ), 
+		bits_COND_CAN_MELEE_ATTACK1 |
+		bits_COND_HEAR_SOUND |
+		bits_COND_HEAVY_DAMAGE, 
+
+		bits_SOUND_DANGER,
+		"Slave Range Attack1"
+	},
+};
+
+
+DEFINE_CUSTOM_SCHEDULES( CISlave )
+{
+	slSlaveAttack1,
+};
+
+IMPLEMENT_CUSTOM_SCHEDULES( CISlave, CSquadMonster );
+
+
+//=========================================================
+//=========================================================
+Schedule_t *CISlave :: GetSchedule( void )
+{
+	ClearBeams( );
+
+/*
+	if (pev->spawnflags)
+	{
+		pev->spawnflags = 0;
+		return GetScheduleOfType( SCHED_RELOAD );
+	}
+*/
+
+	if ( HasConditions( bits_COND_HEAR_SOUND ) )
+	{
+		CSound *pSound;
+		pSound = PBestSound();
+
+		ASSERT( pSound != NULL );
+
+		if ( pSound && (pSound->m_iType & bits_SOUND_DANGER) )
+			return GetScheduleOfType( SCHED_TAKE_COVER_FROM_BEST_SOUND );
+		if ( pSound->m_iType & bits_SOUND_COMBAT )
+			m_afMemory |= bits_MEMORY_PROVOKED;
+	}
+
+	switch (m_MonsterState)
+	{
+	case MONSTERSTATE_COMBAT:
+// dead enemy
+		if ( HasConditions( bits_COND_ENEMY_DEAD ) )
+		{
+			// call base class, all code to handle dead enemies is centralized there.
+			return CBaseMonster :: GetSchedule();
+		}
+
+		if (pev->health < 20 || m_iBravery < 0)
+		{
+			if (!HasConditions( bits_COND_CAN_MELEE_ATTACK1 ))
+			{
+				m_failSchedule = SCHED_CHASE_ENEMY;
+				if (HasConditions( bits_COND_LIGHT_DAMAGE | bits_COND_HEAVY_DAMAGE))
+				{
+					return GetScheduleOfType( SCHED_TAKE_COVER_FROM_ENEMY );
+				}
+				if ( HasConditions ( bits_COND_SEE_ENEMY ) && HasConditions ( bits_COND_ENEMY_FACING_ME ) )
+				{
+					// ALERT( at_console, "exposed\n");
+					return GetScheduleOfType( SCHED_TAKE_COVER_FROM_ENEMY );
+				}
+			}
+		}
+		break;
+	}
+	return CSquadMonster::GetSchedule( );
+}
+
+
+Schedule_t *CISlave :: GetScheduleOfType ( int Type ) 
+{
+	switch	( Type )
+	{
+	case SCHED_FAIL:
+		if (HasConditions( bits_COND_CAN_MELEE_ATTACK1 ))
+		{
+			return CSquadMonster :: GetScheduleOfType( SCHED_MELEE_ATTACK1 ); ;
+		}
+		break;
+	case SCHED_RANGE_ATTACK1:
+		return slSlaveAttack1;
+	case SCHED_RANGE_ATTACK2:
+		return slSlaveAttack1;
+	}
+	return CSquadMonster :: GetScheduleOfType( Type );
+}
+
+
+//=========================================================
+// ArmBeam - small beam from arm to nearby geometry
+//=========================================================
+
+void CISlave :: ArmBeam( int side )
+{
+	TraceResult tr;
+	float flDist = 1.0;
+	
+	if (m_iBeams >= ISLAVE_MAX_BEAMS)
+		return;
+
+	UTIL_MakeAimVectors( pev->angles );
+	Vector vecSrc = pev->origin + gpGlobals->v_up * 36 + gpGlobals->v_right * side * 16 + gpGlobals->v_forward * 32;
+
+	for (int i = 0; i < 3; i++)
+	{
+		Vector vecAim = gpGlobals->v_right * side * RANDOM_FLOAT( 0, 1 ) + gpGlobals->v_up * RANDOM_FLOAT( -1, 1 );
+		TraceResult tr1;
+		UTIL_TraceLine ( vecSrc, vecSrc + vecAim * 512, dont_ignore_monsters, ENT( pev ), &tr1);
+		if (flDist > tr1.flFraction)
+		{
+			tr = tr1;
+			flDist = tr.flFraction;
+		}
+	}
+
+	// Couldn't find anything close enough
+	if ( flDist == 1.0 )
+		return;
+
+	DecalGunshot( &tr, BULLET_PLAYER_CROWBAR );
+
+	m_pBeam[m_iBeams] = CBeam::BeamCreate( "sprites/lgtning.spr", 30 );
+	if (!m_pBeam[m_iBeams])
+		return;
+
+	m_pBeam[m_iBeams]->PointEntInit( tr.vecEndPos, entindex( ) );
+	m_pBeam[m_iBeams]->SetEndAttachment( side < 0 ? 2 : 1 );
+	// m_pBeam[m_iBeams]->SetColor( 180, 255, 96 );
+	m_pBeam[m_iBeams]->SetColor( 96, 128, 16 );
+	m_pBeam[m_iBeams]->SetBrightness( 64 );
+	m_pBeam[m_iBeams]->SetNoise( 80 );
+	m_iBeams++;
+}
+
+
+//=========================================================
+// BeamGlow - brighten all beams
+//=========================================================
+void CISlave :: BeamGlow( )
+{
+	int b = m_iBeams * 32;
+	if (b > 255)
+		b = 255;
+
+	for (int i = 0; i < m_iBeams; i++)
+	{
+		if (m_pBeam[i]->GetBrightness() != 255) 
+		{
+			m_pBeam[i]->SetBrightness( b );
+		}
+	}
+}
+
+
+//=========================================================
+// WackBeam - regenerate dead colleagues
+//=========================================================
+void CISlave :: WackBeam( int side, CBaseEntity *pEntity )
+{
+	Vector vecDest;
+	float flDist = 1.0;
+	
+	if (m_iBeams >= ISLAVE_MAX_BEAMS)
+		return;
+
+	if (pEntity == NULL)
+		return;
+
+	m_pBeam[m_iBeams] = CBeam::BeamCreate( "sprites/lgtning.spr", 30 );
+	if (!m_pBeam[m_iBeams])
+		return;
+
+	m_pBeam[m_iBeams]->PointEntInit( pEntity->Center(), entindex( ) );
+	m_pBeam[m_iBeams]->SetEndAttachment( side < 0 ? 2 : 1 );
+	m_pBeam[m_iBeams]->SetColor( 180, 255, 96 );
+	m_pBeam[m_iBeams]->SetBrightness( 255 );
+	m_pBeam[m_iBeams]->SetNoise( 80 );
+	m_iBeams++;
+}
+
+//=========================================================
+// ZapBeam - heavy damage directly forward
+//=========================================================
+void CISlave :: ZapBeam( int side )
+{
+	Vector vecSrc, vecAim;
+	TraceResult tr;
+	CBaseEntity *pEntity;
+
+	if (m_iBeams >= ISLAVE_MAX_BEAMS)
+		return;
+
+	vecSrc = pev->origin + gpGlobals->v_up * 36;
+	vecAim = ShootAtEnemy( vecSrc );
+	float deflection = 0.01;
+	vecAim = vecAim + side * gpGlobals->v_right * RANDOM_FLOAT( 0, deflection ) + gpGlobals->v_up * RANDOM_FLOAT( -deflection, deflection );
+	UTIL_TraceLine ( vecSrc, vecSrc + vecAim * 1024, dont_ignore_monsters, ENT( pev ), &tr);
+
+	m_pBeam[m_iBeams] = CBeam::BeamCreate( "sprites/lgtning.spr", 50 );
+	if (!m_pBeam[m_iBeams])
+		return;
+
+	m_pBeam[m_iBeams]->PointEntInit( tr.vecEndPos, entindex( ) );
+	m_pBeam[m_iBeams]->SetEndAttachment( side < 0 ? 2 : 1 );
+	m_pBeam[m_iBeams]->SetColor( 180, 255, 96 );
+	m_pBeam[m_iBeams]->SetBrightness( 255 );
+	m_pBeam[m_iBeams]->SetNoise( 20 );
+	m_iBeams++;
+
+	pEntity = CBaseEntity::Instance(tr.pHit);
+	if (pEntity != NULL && pEntity->pev->takedamage)
+	{
+		pEntity->TraceAttack( pev, gSkillData.slaveDmgZap, vecAim, &tr, DMG_SHOCK );
+	}
+	UTIL_EmitAmbientSound( ENT(pev), tr.vecEndPos, "weapons/electro4.wav", 0.5, ATTN_NORM, 0, RANDOM_LONG( 140, 160 ) );
+}
+
+
+//=========================================================
+// ClearBeams - remove all beams
+//=========================================================
+void CISlave :: ClearBeams( )
+{
+	for (int i = 0; i < ISLAVE_MAX_BEAMS; i++)
+	{
+		if (m_pBeam[i])
+		{
+			UTIL_Remove( m_pBeam[i] );
+			m_pBeam[i] = NULL;
+		}
+	}
+	m_iBeams = 0;
+	pev->skin = 0;
+
+	STOP_SOUND( ENT(pev), CHAN_WEAPON, "debris/zap4.wav" );
+}
diff --git a/main/source/dlls/items.cpp b/main/source/dlls/items.cpp
new file mode 100644
index 00000000..d28e7768
--- /dev/null
+++ b/main/source/dlls/items.cpp
@@ -0,0 +1,342 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/*
+
+===== items.cpp ========================================================
+
+  functions governing the selection/use of weapons for players
+
+*/
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "weapons.h"
+#include "player.h"
+#include "skill.h"
+#include "items.h"
+#include "gamerules.h"
+
+extern int gmsgItemPickup;
+
+class CWorldItem : public CBaseEntity
+{
+public:
+	void	KeyValue(KeyValueData *pkvd ); 
+	void	Spawn( void );
+	int		m_iType;
+};
+
+LINK_ENTITY_TO_CLASS(world_items, CWorldItem);
+
+void CWorldItem::KeyValue(KeyValueData *pkvd)
+{
+	if (FStrEq(pkvd->szKeyName, "type"))
+	{
+		m_iType = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseEntity::KeyValue( pkvd );
+}
+
+void CWorldItem::Spawn( void )
+{
+	CBaseEntity *pEntity = NULL;
+
+	switch (m_iType) 
+	{
+	case 44: // ITEM_BATTERY:
+		pEntity = CBaseEntity::Create( "item_battery", pev->origin, pev->angles );
+		break;
+	case 42: // ITEM_ANTIDOTE:
+		pEntity = CBaseEntity::Create( "item_antidote", pev->origin, pev->angles );
+		break;
+	case 43: // ITEM_SECURITY:
+		pEntity = CBaseEntity::Create( "item_security", pev->origin, pev->angles );
+		break;
+	case 45: // ITEM_SUIT:
+		pEntity = CBaseEntity::Create( "item_suit", pev->origin, pev->angles );
+		break;
+	}
+
+	if (!pEntity)
+	{
+		ALERT( at_console, "unable to create world_item %d\n", m_iType );
+	}
+	else
+	{
+		pEntity->pev->target = pev->target;
+		pEntity->pev->targetname = pev->targetname;
+		pEntity->pev->spawnflags = pev->spawnflags;
+	}
+
+	REMOVE_ENTITY(edict());
+}
+
+
+void CItem::Spawn( void )
+{
+	pev->movetype = MOVETYPE_TOSS;
+	pev->solid = SOLID_TRIGGER;
+	UTIL_SetOrigin( pev, pev->origin );
+	UTIL_SetSize(pev, Vector(-16, -16, 0), Vector(16, 16, 16));
+	SetTouch(&CItem::ItemTouch);
+
+	if (DROP_TO_FLOOR(ENT(pev)) == 0)
+	{
+		ALERT(at_error, "Item %s fell out of level at %f,%f,%f", STRING( pev->classname ), pev->origin.x, pev->origin.y, pev->origin.z);
+		UTIL_Remove( this );
+		return;
+	}
+}
+
+extern int gEvilImpulse101;
+
+void CItem::ItemTouch( CBaseEntity *pOther )
+{
+	// if it's not a player, ignore
+	if ( !pOther->IsPlayer() )
+	{
+		return;
+	}
+
+	CBasePlayer *pPlayer = (CBasePlayer *)pOther;
+
+	// ok, a player is touching this item, but can he have it?
+	if ( !g_pGameRules->CanHaveItem( pPlayer, this ) )
+	{
+		// no? Ignore the touch.
+		return;
+	}
+
+	if (MyTouch( pPlayer ))
+	{
+		SUB_UseTargets( pOther, USE_TOGGLE, 0 );
+		SetTouch( NULL );
+		
+		// player grabbed the item. 
+		g_pGameRules->PlayerGotItem( pPlayer, this );
+		if ( g_pGameRules->ItemShouldRespawn( this ) == GR_ITEM_RESPAWN_YES )
+		{
+			Respawn(); 
+		}
+		else
+		{
+			UTIL_Remove( this );
+		}
+	}
+	else if (gEvilImpulse101)
+	{
+		UTIL_Remove( this );
+	}
+}
+
+CBaseEntity* CItem::Respawn( void )
+{
+	SetTouch( NULL );
+	pev->effects |= EF_NODRAW;
+
+	UTIL_SetOrigin( pev, g_pGameRules->VecItemRespawnSpot( this ) );// blip to whereever you should respawn.
+
+	SetThink ( &CItem::Materialize );
+	pev->nextthink = g_pGameRules->FlItemRespawnTime( this ); 
+	return this;
+}
+
+void CItem::Materialize( void )
+{
+	if ( pev->effects & EF_NODRAW )
+	{
+		// changing from invisible state to visible.
+		EMIT_SOUND_DYN( ENT(pev), CHAN_WEAPON, "items/suitchargeok1.wav", 1, ATTN_NORM, 0, 150 );
+		pev->effects &= ~EF_NODRAW;
+		pev->effects |= EF_MUZZLEFLASH;
+	}
+
+	SetTouch( &CItem::ItemTouch );
+}
+
+#define SF_SUIT_SHORTLOGON		0x0001
+
+class CItemSuit : public CItem
+{
+	void Spawn( void )
+	{ 
+		Precache( );
+		SET_MODEL(ENT(pev), "models/w_suit.mdl");
+		CItem::Spawn( );
+	}
+	void Precache( void )
+	{
+		PRECACHE_MODEL ("models/w_suit.mdl");
+	}
+	BOOL MyTouch( CBasePlayer *pPlayer )
+	{
+		if ( pPlayer->pev->weapons & (1<<WEAPON_SUIT) )
+			return FALSE;
+
+		if ( pev->spawnflags & SF_SUIT_SHORTLOGON )
+			EMIT_SOUND_SUIT(pPlayer->edict(), "!HEV_A0");		// short version of suit logon,
+		else
+			EMIT_SOUND_SUIT(pPlayer->edict(), "!HEV_AAx");	// long version of suit logon
+
+		pPlayer->pev->weapons |= (1<<WEAPON_SUIT);
+		return TRUE;
+	}
+};
+
+LINK_ENTITY_TO_CLASS(item_suit, CItemSuit);
+
+
+
+class CItemBattery : public CItem
+{
+	void Spawn( void )
+	{ 
+		Precache( );
+		SET_MODEL(ENT(pev), "models/w_battery.mdl");
+		CItem::Spawn( );
+	}
+	void Precache( void )
+	{
+		PRECACHE_MODEL ("models/w_battery.mdl");
+		PRECACHE_SOUND( "items/gunpickup2.wav" );
+	}
+	BOOL MyTouch( CBasePlayer *pPlayer )
+	{
+		if ( pPlayer->pev->deadflag != DEAD_NO )
+		{
+			return FALSE;
+		}
+
+		if ((pPlayer->pev->armorvalue < MAX_NORMAL_BATTERY) &&
+			(pPlayer->pev->weapons & (1<<WEAPON_SUIT)))
+		{
+			int pct;
+			char szcharge[64];
+
+			pPlayer->pev->armorvalue += gSkillData.batteryCapacity;
+			pPlayer->pev->armorvalue = min(pPlayer->pev->armorvalue, MAX_NORMAL_BATTERY);
+
+			EMIT_SOUND( pPlayer->edict(), CHAN_ITEM, "items/gunpickup2.wav", 1, ATTN_NORM );
+
+			MESSAGE_BEGIN( MSG_ONE, gmsgItemPickup, NULL, pPlayer->pev );
+				WRITE_STRING( STRING(pev->classname) );
+			MESSAGE_END();
+
+			
+			// Suit reports new power level
+			// For some reason this wasn't working in release build -- round it.
+			pct = (int)( (float)(pPlayer->pev->armorvalue * 100.0) * (1.0/MAX_NORMAL_BATTERY) + 0.5);
+			pct = (pct / 5);
+			if (pct > 0)
+				pct--;
+		
+			sprintf( szcharge,"!HEV_%1dP", pct );
+			
+			//EMIT_SOUND_SUIT(ENT(pev), szcharge);
+			pPlayer->SetSuitUpdate(szcharge, FALSE, SUIT_NEXT_IN_30SEC);
+			return TRUE;		
+		}
+		return FALSE;
+	}
+};
+
+LINK_ENTITY_TO_CLASS(item_battery, CItemBattery);
+
+
+class CItemAntidote : public CItem
+{
+	void Spawn( void )
+	{ 
+		Precache( );
+		SET_MODEL(ENT(pev), "models/w_antidote.mdl");
+		CItem::Spawn( );
+	}
+	void Precache( void )
+	{
+		PRECACHE_MODEL ("models/w_antidote.mdl");
+	}
+	BOOL MyTouch( CBasePlayer *pPlayer )
+	{
+		pPlayer->SetSuitUpdate("!HEV_DET4", FALSE, SUIT_NEXT_IN_1MIN);
+		
+		pPlayer->m_rgItems[ITEM_ANTIDOTE] += 1;
+		return TRUE;
+	}
+};
+
+LINK_ENTITY_TO_CLASS(item_antidote, CItemAntidote);
+
+
+class CItemSecurity : public CItem
+{
+	void Spawn( void )
+	{ 
+		Precache( );
+		SET_MODEL(ENT(pev), "models/w_security.mdl");
+		CItem::Spawn( );
+	}
+	void Precache( void )
+	{
+		PRECACHE_MODEL ("models/w_security.mdl");
+	}
+	BOOL MyTouch( CBasePlayer *pPlayer )
+	{
+		pPlayer->m_rgItems[ITEM_SECURITY] += 1;
+		return TRUE;
+	}
+};
+
+LINK_ENTITY_TO_CLASS(item_security, CItemSecurity);
+
+class CItemLongJump : public CItem
+{
+	void Spawn( void )
+	{ 
+		Precache( );
+		SET_MODEL(ENT(pev), "models/w_longjump.mdl");
+		CItem::Spawn( );
+	}
+	void Precache( void )
+	{
+		PRECACHE_MODEL ("models/w_longjump.mdl");
+	}
+	BOOL MyTouch( CBasePlayer *pPlayer )
+	{
+		if ( pPlayer->m_fLongJump )
+		{
+			return FALSE;
+		}
+
+		if ( ( pPlayer->pev->weapons & (1<<WEAPON_SUIT) ) )
+		{
+			pPlayer->m_fLongJump = TRUE;// player now has longjump module
+
+			g_engfuncs.pfnSetPhysicsKeyValue( pPlayer->edict(), "slj", "1" );
+
+			MESSAGE_BEGIN( MSG_ONE, gmsgItemPickup, NULL, pPlayer->pev );
+				WRITE_STRING( STRING(pev->classname) );
+			MESSAGE_END();
+
+			EMIT_SOUND_SUIT( pPlayer->edict(), "!HEV_A1" );	// Play the longjump sound UNDONE: Kelly? correct sound?
+			return TRUE;		
+		}
+		return FALSE;
+	}
+};
+
+LINK_ENTITY_TO_CLASS( item_longjump, CItemLongJump );
diff --git a/main/source/dlls/items.h b/main/source/dlls/items.h
new file mode 100644
index 00000000..d4c00e8b
--- /dev/null
+++ b/main/source/dlls/items.h
@@ -0,0 +1,29 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef ITEMS_H
+#define ITEMS_H
+
+
+class CItem : public CBaseEntity
+{
+public:
+	void	Spawn( void );
+	CBaseEntity*	Respawn( void );
+	void	EXPORT ItemTouch( CBaseEntity *pOther );
+	void	EXPORT Materialize( void );
+	virtual BOOL MyTouch( CBasePlayer *pPlayer ) { return FALSE; };
+};
+
+#endif // ITEMS_H
diff --git a/main/source/dlls/leech.cpp b/main/source/dlls/leech.cpp
new file mode 100644
index 00000000..ff465ba0
--- /dev/null
+++ b/main/source/dlls/leech.cpp
@@ -0,0 +1,723 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// leech - basic little swimming monster
+//=========================================================
+//
+// UNDONE:
+// DONE:Steering force model for attack
+// DONE:Attack animation control / damage
+// DONE:Establish range of up/down motion and steer around vertical obstacles
+// DONE:Re-evaluate height periodically
+// DONE:Fall (MOVETYPE_TOSS) and play different anim if out of water
+// Test in complex room (c2a3?)
+// DONE:Sounds? - Kelly will fix
+// Blood cloud? Hurt effect?
+// Group behavior?
+// DONE:Save/restore
+// Flop animation - just bind to ACT_TWITCH
+// Fix fatal push into wall case
+//
+// Try this on a bird
+// Try this on a model with hulls/tracehull?
+//
+
+
+#include	"float.h"
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+
+
+
+
+// Animation events
+#define LEECH_AE_ATTACK		1
+#define LEECH_AE_FLOP		2
+
+
+// Movement constants
+
+#define		LEECH_ACCELERATE		10
+#define		LEECH_CHECK_DIST		45
+#define		LEECH_SWIM_SPEED		50
+#define		LEECH_SWIM_ACCEL		80
+#define		LEECH_SWIM_DECEL		10
+#define		LEECH_TURN_RATE			90
+#define		LEECH_SIZEX				10
+#define		LEECH_FRAMETIME			0.1
+
+
+
+#define DEBUG_BEAMS		0
+
+#if DEBUG_BEAMS
+#include "effects.h"
+#endif
+
+
+class CLeech : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+
+	void EXPORT SwimThink( void );
+	void EXPORT DeadThink( void );
+	void Touch( CBaseEntity *pOther )
+	{
+		if ( pOther->IsPlayer() )
+		{
+			// If the client is pushing me, give me some base velocity
+			if ( gpGlobals->trace_ent && gpGlobals->trace_ent == edict() )
+			{
+				pev->basevelocity = pOther->pev->velocity;
+				pev->flags |= FL_BASEVELOCITY;
+			}
+		}
+	}
+
+	void SetObjectCollisionBox( void )
+	{
+		pev->absmin = pev->origin + Vector(-8,-8,0);
+		pev->absmax = pev->origin + Vector(8,8,2);
+	}
+
+	void AttackSound( void );
+	void AlertSound( void );
+	void UpdateMotion( void );
+	float ObstacleDistance( CBaseEntity *pTarget );
+	void MakeVectors( void );
+	void RecalculateWaterlevel( void );
+	void SwitchLeechState( void );
+	
+	// Base entity functions
+	void HandleAnimEvent( MonsterEvent_t *pEvent );
+	int	BloodColor( void ) { return DONT_BLEED; }
+	void Killed( entvars_t *pevAttacker, int iGib );
+	void Activate( void );
+	int TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType );
+	int	Classify( void ) { return CLASS_INSECT; }
+	int IRelationship( CBaseEntity *pTarget );
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	static const char *pAttackSounds[];
+	static const char *pAlertSounds[];
+
+private:
+	// UNDONE: Remove unused boid vars, do group behavior
+	float	m_flTurning;// is this boid turning?
+	BOOL	m_fPathBlocked;// TRUE if there is an obstacle ahead
+	float	m_flAccelerate;
+	float	m_obstacle;
+	float	m_top;
+	float	m_bottom;
+	float	m_height;
+	float	m_waterTime;
+	float	m_sideTime;		// Timer to randomly check clearance on sides
+	float	m_zTime;
+	float	m_stateTime;
+	float	m_attackSoundTime;
+
+#if DEBUG_BEAMS
+	CBeam	*m_pb;
+	CBeam	*m_pt;
+#endif
+};
+
+
+
+LINK_ENTITY_TO_CLASS( monster_leech, CLeech );
+
+TYPEDESCRIPTION	CLeech::m_SaveData[] = 
+{
+	DEFINE_FIELD( CLeech, m_flTurning, FIELD_FLOAT ),
+	DEFINE_FIELD( CLeech, m_fPathBlocked, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CLeech, m_flAccelerate, FIELD_FLOAT ),
+	DEFINE_FIELD( CLeech, m_obstacle, FIELD_FLOAT ),
+	DEFINE_FIELD( CLeech, m_top, FIELD_FLOAT ),
+	DEFINE_FIELD( CLeech, m_bottom, FIELD_FLOAT ),
+	DEFINE_FIELD( CLeech, m_height, FIELD_FLOAT ),
+	DEFINE_FIELD( CLeech, m_waterTime, FIELD_TIME ),
+	DEFINE_FIELD( CLeech, m_sideTime, FIELD_TIME ),
+	DEFINE_FIELD( CLeech, m_zTime, FIELD_TIME ),
+	DEFINE_FIELD( CLeech, m_stateTime, FIELD_TIME ),
+	DEFINE_FIELD( CLeech, m_attackSoundTime, FIELD_TIME ),
+};
+
+IMPLEMENT_SAVERESTORE( CLeech, CBaseMonster );
+
+
+const char *CLeech::pAttackSounds[] =
+{
+	"leech/leech_bite1.wav",
+	"leech/leech_bite2.wav",
+	"leech/leech_bite3.wav",
+};
+
+const char *CLeech::pAlertSounds[] =
+{
+	"leech/leech_alert1.wav",
+	"leech/leech_alert2.wav",
+};
+
+
+void CLeech::Spawn( void )
+{
+	Precache();
+	SET_MODEL(ENT(pev), "models/leech.mdl");
+	// Just for fun
+	//	SET_MODEL(ENT(pev), "models/icky.mdl");
+	
+//	UTIL_SetSize( pev, g_vecZero, g_vecZero );
+	UTIL_SetSize( pev, Vector(-1,-1,0), Vector(1,1,2));
+	// Don't push the minz down too much or the water check will fail because this entity is really point-sized
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_FLY;
+	SetBits(pev->flags, FL_SWIM);
+	pev->health			= gSkillData.leechHealth;
+
+	m_flFieldOfView		= -0.5;	// 180 degree FOV
+	m_flDistLook		= 750;
+	MonsterInit();
+	SetThink( &CLeech::SwimThink );
+	SetUse( NULL );
+	SetTouch( NULL );
+	pev->view_ofs = g_vecZero;
+
+	m_flTurning = 0;
+	m_fPathBlocked = FALSE;
+	SetActivity( ACT_SWIM );
+	SetState( MONSTERSTATE_IDLE );
+	m_stateTime = gpGlobals->time + RANDOM_FLOAT( 1, 5 );
+}
+
+
+void CLeech::Activate( void )
+{
+	RecalculateWaterlevel();
+}
+
+
+
+void CLeech::RecalculateWaterlevel( void )
+{
+	// Calculate boundaries
+	Vector vecTest = pev->origin - Vector(0,0,400);
+
+	TraceResult tr;
+
+	UTIL_TraceLine(pev->origin, vecTest, missile, edict(), &tr);
+	if ( tr.flFraction != 1.0 )
+		m_bottom = tr.vecEndPos.z + 1;
+	else
+		m_bottom = vecTest.z;
+
+	m_top = UTIL_WaterLevel( pev->origin, pev->origin.z, pev->origin.z + 400 ) - 1;
+
+	// Chop off 20% of the outside range
+	float newBottom = m_bottom * 0.8 + m_top * 0.2;
+	m_top = m_bottom * 0.2 + m_top * 0.8;
+	m_bottom = newBottom;
+	m_height = RANDOM_FLOAT( m_bottom, m_top );
+	m_waterTime = gpGlobals->time + RANDOM_FLOAT( 5, 7 );
+}
+
+
+void CLeech::SwitchLeechState( void )
+{
+	m_stateTime = gpGlobals->time + RANDOM_FLOAT( 3, 6 );
+	if ( m_MonsterState == MONSTERSTATE_COMBAT )
+	{
+		m_hEnemy = NULL;
+		SetState( MONSTERSTATE_IDLE );
+		// We may be up against the player, so redo the side checks
+		m_sideTime = 0;
+	}
+	else
+	{
+		Look( m_flDistLook );
+		CBaseEntity *pEnemy = BestVisibleEnemy();
+		if ( pEnemy && pEnemy->pev->waterlevel != 0 )
+		{
+			m_hEnemy = pEnemy;
+			SetState( MONSTERSTATE_COMBAT );
+			m_stateTime = gpGlobals->time + RANDOM_FLOAT( 18, 25 );
+			AlertSound();
+		}
+	}
+}
+
+
+int CLeech::IRelationship( CBaseEntity *pTarget )
+{
+	if ( pTarget->IsPlayer() )
+		return R_DL;
+	return CBaseMonster::IRelationship( pTarget );
+}
+
+
+
+void CLeech::AttackSound( void )
+{
+	if ( gpGlobals->time > m_attackSoundTime )
+	{
+		EMIT_SOUND_DYN ( ENT(pev), CHAN_VOICE, pAttackSounds[ RANDOM_LONG(0,ARRAYSIZE(pAttackSounds)-1) ], 1.0, ATTN_NORM, 0, PITCH_NORM );
+		m_attackSoundTime = gpGlobals->time + 0.5;
+	}
+}
+
+
+void CLeech::AlertSound( void )
+{
+	EMIT_SOUND_DYN ( ENT(pev), CHAN_VOICE, pAlertSounds[ RANDOM_LONG(0,ARRAYSIZE(pAlertSounds)-1) ], 1.0, ATTN_NORM * 0.5, 0, PITCH_NORM );
+}
+
+
+void CLeech::Precache( void )
+{
+	int i;
+
+	//PRECACHE_MODEL("models/icky.mdl");
+	PRECACHE_MODEL("models/leech.mdl");
+
+	for ( i = 0; i < ARRAYSIZE( pAttackSounds ); i++ )
+		PRECACHE_SOUND((char *)pAttackSounds[i]);
+	for ( i = 0; i < ARRAYSIZE( pAlertSounds ); i++ )
+		PRECACHE_SOUND((char *)pAlertSounds[i]);
+}
+
+
+int CLeech::TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType )
+{
+	pev->velocity = g_vecZero;
+
+	// Nudge the leech away from the damage
+	if ( pevInflictor )
+	{
+		pev->velocity = (pev->origin - pevInflictor->origin).Normalize() * 25;
+	}
+
+	return CBaseMonster::TakeDamage( pevInflictor, pevAttacker, flDamage, bitsDamageType );
+}
+
+
+void CLeech::HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	switch( pEvent->event )
+	{
+	case LEECH_AE_ATTACK:
+		AttackSound();
+		CBaseEntity *pEnemy;
+
+		pEnemy = m_hEnemy;
+		if ( pEnemy != NULL )
+		{
+			Vector dir, face;
+
+			UTIL_MakeVectorsPrivate( pev->angles, face, NULL, NULL );
+			face.z = 0;
+			dir = (pEnemy->pev->origin - pev->origin);
+			dir.z = 0;
+			dir = dir.Normalize();
+			face = face.Normalize();
+
+			
+			if ( DotProduct(dir, face) > 0.9 )		// Only take damage if the leech is facing the prey
+				pEnemy->TakeDamage( pev, pev, gSkillData.leechDmgBite, DMG_SLASH );
+		}
+		m_stateTime -= 2;
+		break;
+	
+	case LEECH_AE_FLOP:
+		// Play flop sound
+		break;
+	
+	default:
+		CBaseMonster::HandleAnimEvent( pEvent );
+		break;
+	}
+}
+
+
+void CLeech::MakeVectors( void )
+{
+	Vector tmp = pev->angles;
+	tmp.x = -tmp.x;
+	UTIL_MakeVectors ( tmp );
+}
+
+
+//
+// ObstacleDistance - returns normalized distance to obstacle
+//
+float CLeech::ObstacleDistance( CBaseEntity *pTarget )
+{
+	TraceResult		tr;
+	Vector			vecTest;
+
+	// use VELOCITY, not angles, not all boids point the direction they are flying
+	//Vector vecDir = UTIL_VecToAngles( pev->velocity );
+	MakeVectors();
+
+	// check for obstacle ahead
+	vecTest = pev->origin + gpGlobals->v_forward * LEECH_CHECK_DIST;
+	UTIL_TraceLine(pev->origin, vecTest, missile, edict(), &tr);
+
+	if ( tr.fStartSolid )
+	{
+		pev->speed = -LEECH_SWIM_SPEED * 0.5;
+//		ALERT( at_console, "Stuck from (%f %f %f) to (%f %f %f)\n", pev->oldorigin.x, pev->oldorigin.y, pev->oldorigin.z, pev->origin.x, pev->origin.y, pev->origin.z );
+//		UTIL_SetOrigin( pev, pev->oldorigin );
+	}
+
+	if ( tr.flFraction != 1.0 )
+	{
+		if ( (pTarget == NULL || tr.pHit != pTarget->edict()) )
+		{
+			return tr.flFraction;
+		}
+		else
+		{
+			if ( fabs(m_height - pev->origin.z) > 10 )
+				return tr.flFraction;
+		}
+	}
+
+	if ( m_sideTime < gpGlobals->time )
+	{
+		// extra wide checks
+		vecTest = pev->origin + gpGlobals->v_right * LEECH_SIZEX * 2 + gpGlobals->v_forward * LEECH_CHECK_DIST;
+		UTIL_TraceLine(pev->origin, vecTest, missile, edict(), &tr);
+		if (tr.flFraction != 1.0)
+			return tr.flFraction;
+
+		vecTest = pev->origin - gpGlobals->v_right * LEECH_SIZEX * 2 + gpGlobals->v_forward * LEECH_CHECK_DIST;
+		UTIL_TraceLine(pev->origin, vecTest, missile, edict(), &tr);
+		if (tr.flFraction != 1.0)
+			return tr.flFraction;
+
+		// Didn't hit either side, so stop testing for another 0.5 - 1 seconds
+		m_sideTime = gpGlobals->time + RANDOM_FLOAT(0.5,1);
+	}
+	return 1.0;
+}
+
+
+void CLeech::DeadThink( void )
+{
+	if ( m_fSequenceFinished )
+	{
+		if ( m_Activity == ACT_DIEFORWARD )
+		{
+			SetThink( NULL );
+			StopAnimation();
+			return;
+		}
+		else if ( pev->flags & FL_ONGROUND )
+		{
+			pev->solid = SOLID_NOT;
+			SetActivity(ACT_DIEFORWARD);
+		}
+	}
+	StudioFrameAdvance();
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	// Apply damage velocity, but keep out of the walls
+	if ( pev->velocity.x != 0 || pev->velocity.y != 0 )
+	{
+		TraceResult tr;
+
+		// Look 0.5 seconds ahead
+		UTIL_TraceLine(pev->origin, pev->origin + pev->velocity * 0.5, missile, edict(), &tr);
+		if (tr.flFraction != 1.0)
+		{
+			pev->velocity.x = 0;
+			pev->velocity.y = 0;
+		}
+	}
+}
+
+
+
+void CLeech::UpdateMotion( void )
+{
+	float flapspeed = (pev->speed - m_flAccelerate) / LEECH_ACCELERATE;
+	m_flAccelerate = m_flAccelerate * 0.8 + pev->speed * 0.2;
+
+	if (flapspeed < 0) 
+		flapspeed = -flapspeed;
+	flapspeed += 1.0;
+	if (flapspeed < 0.5) 
+		flapspeed = 0.5;
+	if (flapspeed > 1.9) 
+		flapspeed = 1.9;
+
+	pev->framerate = flapspeed;
+
+	if ( !m_fPathBlocked )
+		pev->avelocity.y = pev->ideal_yaw;
+	else
+		pev->avelocity.y = pev->ideal_yaw * m_obstacle;
+
+	if ( pev->avelocity.y > 150 )
+		m_IdealActivity = ACT_TURN_LEFT;
+	else if ( pev->avelocity.y < -150 )
+		m_IdealActivity = ACT_TURN_RIGHT;
+	else
+		m_IdealActivity = ACT_SWIM;
+
+	// lean
+	float targetPitch, delta;
+	delta = m_height - pev->origin.z;
+
+	if ( delta < -10 )
+		targetPitch = -30;
+	else if ( delta > 10 )
+		targetPitch = 30;
+	else
+		targetPitch = 0;
+
+	pev->angles.x = UTIL_Approach( targetPitch, pev->angles.x, 60 * LEECH_FRAMETIME );
+
+	// bank
+	pev->avelocity.z = - (pev->angles.z + (pev->avelocity.y * 0.25));
+
+	if ( m_MonsterState == MONSTERSTATE_COMBAT && HasConditions( bits_COND_CAN_MELEE_ATTACK1 ) )
+		m_IdealActivity = ACT_MELEE_ATTACK1;
+
+	// Out of water check
+	if ( !pev->waterlevel )
+	{
+		pev->movetype = MOVETYPE_TOSS;
+		m_IdealActivity = ACT_TWITCH;
+		pev->velocity = g_vecZero;
+
+		// Animation will intersect the floor if either of these is non-zero
+		pev->angles.z = 0;
+		pev->angles.x = 0;
+
+		if ( pev->framerate < 1.0 )
+			pev->framerate = 1.0;
+	}
+	else if ( pev->movetype == MOVETYPE_TOSS )
+	{
+		pev->movetype = MOVETYPE_FLY;
+		pev->flags &= ~FL_ONGROUND;
+		RecalculateWaterlevel();
+		m_waterTime = gpGlobals->time + 2;	// Recalc again soon, water may be rising
+	}
+
+	if ( m_Activity != m_IdealActivity )
+	{
+		SetActivity ( m_IdealActivity );
+	}
+	float flInterval = StudioFrameAdvance();
+	DispatchAnimEvents ( flInterval );
+
+#if DEBUG_BEAMS
+	if ( !m_pb )
+		m_pb = CBeam::BeamCreate( "sprites/laserbeam.spr", 5 );
+	if ( !m_pt )
+		m_pt = CBeam::BeamCreate( "sprites/laserbeam.spr", 5 );
+	m_pb->PointsInit( pev->origin, pev->origin + gpGlobals->v_forward * LEECH_CHECK_DIST );
+	m_pt->PointsInit( pev->origin, pev->origin - gpGlobals->v_right * (pev->avelocity.y*0.25) );
+	if ( m_fPathBlocked )
+	{
+		float color = m_obstacle * 30;
+		if ( m_obstacle == 1.0 )
+			color = 0;
+		if ( color > 255 )
+			color = 255;
+		m_pb->SetColor( 255, (int)color, (int)color );
+	}
+	else
+		m_pb->SetColor( 255, 255, 0 );
+	m_pt->SetColor( 0, 0, 255 );
+#endif
+}
+
+
+void CLeech::SwimThink( void )
+{
+	TraceResult		tr;
+	float			flLeftSide;
+	float			flRightSide;
+	float			targetSpeed;
+	float			targetYaw = 0;
+	CBaseEntity		*pTarget;
+
+	if ( FNullEnt( FIND_CLIENT_IN_PVS( edict() ) ) )
+	{
+		pev->nextthink = gpGlobals->time + RANDOM_FLOAT(1,1.5);
+		pev->velocity = g_vecZero;
+		return;
+	}
+	else
+		pev->nextthink = gpGlobals->time + 0.1;
+
+	targetSpeed = LEECH_SWIM_SPEED;
+
+	if ( m_waterTime < gpGlobals->time )
+		RecalculateWaterlevel();
+
+	if ( m_stateTime < gpGlobals->time )
+		SwitchLeechState();
+
+	ClearConditions( bits_COND_CAN_MELEE_ATTACK1 );
+	switch( m_MonsterState )
+	{
+	case MONSTERSTATE_COMBAT:
+		pTarget = m_hEnemy;
+		if ( !pTarget )
+			SwitchLeechState();
+		else
+		{
+			// Chase the enemy's eyes
+			m_height = pTarget->pev->origin.z + pTarget->pev->view_ofs.z - 5;
+			// Clip to viable water area
+			if ( m_height < m_bottom )
+				m_height = m_bottom;
+			else if ( m_height > m_top )
+				m_height = m_top;
+			Vector location = pTarget->pev->origin - pev->origin;
+			location.z += (pTarget->pev->view_ofs.z);
+			if ( location.Length() < 40 )
+				SetConditions( bits_COND_CAN_MELEE_ATTACK1 );
+			// Turn towards target ent
+			targetYaw = UTIL_VecToYaw( location );
+
+			targetYaw = UTIL_AngleDiff( targetYaw, UTIL_AngleMod( pev->angles.y ) );
+
+			if ( targetYaw < (-LEECH_TURN_RATE*0.75) )
+				targetYaw = (-LEECH_TURN_RATE*0.75);
+			else if ( targetYaw > (LEECH_TURN_RATE*0.75) )
+				targetYaw = (LEECH_TURN_RATE*0.75);
+			else
+				targetSpeed *= 2;
+		}
+
+		break;
+
+	default:
+		if ( m_zTime < gpGlobals->time )
+		{
+			float newHeight = RANDOM_FLOAT( m_bottom, m_top );
+			m_height = 0.5 * m_height + 0.5 * newHeight;
+			m_zTime = gpGlobals->time + RANDOM_FLOAT( 1, 4 );
+		}
+		if ( RANDOM_LONG( 0, 100 ) < 10 )
+			targetYaw = RANDOM_LONG( -30, 30 );
+		pTarget = NULL;
+		// oldorigin test
+		if ( (pev->origin - pev->oldorigin).Length() < 1 )
+		{
+			// If leech didn't move, there must be something blocking it, so try to turn
+			m_sideTime = 0;
+		}
+
+		break;
+	}
+
+	m_obstacle = ObstacleDistance( pTarget );
+	pev->oldorigin = pev->origin;
+	if ( m_obstacle < 0.1 )
+		m_obstacle = 0.1;
+
+	// is the way ahead clear?
+	if ( m_obstacle == 1.0 )
+	{
+		// if the leech is turning, stop the trend.
+		if ( m_flTurning != 0 )
+		{
+			m_flTurning = 0;
+		}
+
+		m_fPathBlocked = FALSE;
+		pev->speed = UTIL_Approach( targetSpeed, pev->speed, LEECH_SWIM_ACCEL * LEECH_FRAMETIME );
+		pev->velocity = gpGlobals->v_forward * pev->speed;
+
+	}
+	else
+	{
+		m_obstacle = 1.0 / m_obstacle;
+		// IF we get this far in the function, the leader's path is blocked!
+		m_fPathBlocked = TRUE;
+
+		if ( m_flTurning == 0 )// something in the way and leech is not already turning to avoid
+		{
+			Vector vecTest;
+			// measure clearance on left and right to pick the best dir to turn
+			vecTest = pev->origin + (gpGlobals->v_right * LEECH_SIZEX) + (gpGlobals->v_forward * LEECH_CHECK_DIST);
+			UTIL_TraceLine(pev->origin, vecTest, missile, edict(), &tr);
+			flRightSide = tr.flFraction;
+
+			vecTest = pev->origin + (gpGlobals->v_right * -LEECH_SIZEX) + (gpGlobals->v_forward * LEECH_CHECK_DIST);
+			UTIL_TraceLine(pev->origin, vecTest, missile, edict(), &tr);
+			flLeftSide = tr.flFraction;
+
+			// turn left, right or random depending on clearance ratio
+			float delta = (flRightSide - flLeftSide);
+			if ( delta > 0.1 || (delta > -0.1 && RANDOM_LONG(0,100)<50) )
+				m_flTurning = -LEECH_TURN_RATE;
+			else
+				m_flTurning = LEECH_TURN_RATE;
+		}
+		pev->speed = UTIL_Approach( -(LEECH_SWIM_SPEED*0.5), pev->speed, LEECH_SWIM_DECEL * LEECH_FRAMETIME * m_obstacle );
+		pev->velocity = gpGlobals->v_forward * pev->speed;
+	}
+	pev->ideal_yaw = m_flTurning + targetYaw;
+	UpdateMotion();
+}
+
+
+void CLeech::Killed(entvars_t *pevAttacker, int iGib)
+{
+	Vector			vecSplatDir;
+	TraceResult		tr;
+
+	//ALERT(at_aiconsole, "Leech: killed\n");
+	// tell owner ( if any ) that we're dead.This is mostly for MonsterMaker functionality.
+	CBaseEntity *pOwner = CBaseEntity::Instance(pev->owner);
+	if (pOwner)
+		pOwner->DeathNotice(pev);
+
+	// When we hit the ground, play the "death_end" activity
+	if ( pev->waterlevel )
+	{
+		pev->angles.z = 0;
+		pev->angles.x = 0;
+		pev->origin.z += 1;
+		pev->avelocity = g_vecZero;
+		if ( RANDOM_LONG( 0, 99 ) < 70 )
+			pev->avelocity.y = RANDOM_LONG( -720, 720 );
+
+		pev->gravity = 0.02;
+		ClearBits(pev->flags, FL_ONGROUND);
+		SetActivity( ACT_DIESIMPLE );
+	}
+	else
+		SetActivity( ACT_DIEFORWARD );
+	
+	pev->movetype = MOVETYPE_TOSS;
+	pev->takedamage = DAMAGE_NO;
+	SetThink( &CLeech::DeadThink );
+}
+
+
diff --git a/main/source/dlls/lights.cpp b/main/source/dlls/lights.cpp
new file mode 100644
index 00000000..3aec4054
--- /dev/null
+++ b/main/source/dlls/lights.cpp
@@ -0,0 +1,222 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/*
+
+===== lights.cpp ========================================================
+
+  spawn and think functions for editor-placed lights
+
+*/
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+
+
+
+class CLight : public CPointEntity
+{
+public:
+	virtual void	KeyValue( KeyValueData* pkvd ); 
+	virtual void	Spawn( void );
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+	virtual void	SaveDataForReset();
+	virtual void	ResetEntity();
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	
+	static	TYPEDESCRIPTION m_SaveData[];
+
+private:
+	int		m_iStyle;
+	int		m_iszPattern;
+
+	int		mSavedSpawnFlags;
+	int		mSavedStyle;
+	int		mSavedPattern;
+
+};
+LINK_ENTITY_TO_CLASS( light, CLight );
+
+TYPEDESCRIPTION	CLight::m_SaveData[] = 
+{
+	DEFINE_FIELD( CLight, m_iStyle, FIELD_INTEGER ),
+	DEFINE_FIELD( CLight, m_iszPattern, FIELD_STRING ),
+};
+
+IMPLEMENT_SAVERESTORE( CLight, CPointEntity );
+
+
+//
+// Cache user-entity-field values until spawn is called.
+//
+void CLight :: KeyValue( KeyValueData* pkvd)
+{
+	if (FStrEq(pkvd->szKeyName, "style"))
+	{
+		m_iStyle = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "pitch"))
+	{
+		pev->angles.x = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "pattern"))
+	{
+		m_iszPattern = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else
+	{
+		CPointEntity::KeyValue( pkvd );
+	}
+}
+
+/*QUAKED light (0 1 0) (-8 -8 -8) (8 8 8) LIGHT_START_OFF
+Non-displayed light.
+Default light value is 300
+Default style is 0
+If targeted, it will toggle between on or off.
+*/
+
+void CLight :: Spawn( void )
+{
+	if (FStringNull(pev->targetname))
+	{       // inert light
+		REMOVE_ENTITY(ENT(pev));
+		return;
+	}
+
+	this->SaveDataForReset();
+}
+
+void CLight::SaveDataForReset()
+{
+	this->mSavedSpawnFlags = this->pev->spawnflags;
+	this->mSavedStyle = this->m_iStyle;
+	this->mSavedPattern = this->m_iszPattern;
+}
+
+void CLight::ResetEntity()
+{
+	this->pev->spawnflags = this->mSavedSpawnFlags;
+	this->m_iStyle = this->mSavedStyle;
+	this->m_iszPattern = this->mSavedPattern;
+
+	if (m_iStyle >= 32)
+	{
+		//		CHANGE_METHOD(ENT(pev), em_use, light_use);
+		if (FBitSet(pev->spawnflags, SF_LIGHT_START_OFF))
+			LIGHT_STYLE(m_iStyle, "a");
+		else if (m_iszPattern)
+			LIGHT_STYLE(m_iStyle, (char *)STRING( m_iszPattern ));
+		else
+			LIGHT_STYLE(m_iStyle, "m");
+	}
+}
+
+void CLight :: Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if (m_iStyle >= 32)
+	{
+		if ( !ShouldToggle( useType, !FBitSet(pev->spawnflags, SF_LIGHT_START_OFF) ) )
+			return;
+
+		if (FBitSet(pev->spawnflags, SF_LIGHT_START_OFF))
+		{
+			if (m_iszPattern)
+				LIGHT_STYLE(m_iStyle, (char *)STRING( m_iszPattern ));
+			else
+				LIGHT_STYLE(m_iStyle, "m");
+			ClearBits(pev->spawnflags, SF_LIGHT_START_OFF);
+		}
+		else
+		{
+			LIGHT_STYLE(m_iStyle, "a");
+			SetBits(pev->spawnflags, SF_LIGHT_START_OFF);
+		}
+	}
+}
+
+//
+// shut up spawn functions for new spotlights
+//
+LINK_ENTITY_TO_CLASS( light_spot, CLight );
+
+
+class CEnvLight : public CLight
+{
+public:
+	void	KeyValue( KeyValueData* pkvd ); 
+	void	Spawn( void );
+};
+
+LINK_ENTITY_TO_CLASS( light_environment, CEnvLight );
+
+void CEnvLight::KeyValue( KeyValueData* pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "_light"))
+	{
+		int r, g, b, v, j;
+		char szColor[64];
+		j = sscanf( pkvd->szValue, "%d %d %d %d\n", &r, &g, &b, &v );
+		if (j == 1)
+		{
+			g = b = r;
+		}
+		else if (j == 4)
+		{
+			r = r * (v / 255.0);
+			g = g * (v / 255.0);
+			b = b * (v / 255.0);
+		}
+
+		// simulate qrad direct, ambient,and gamma adjustments, as well as engine scaling
+		r = pow( r / 114.0, 0.6 ) * 264;
+		g = pow( g / 114.0, 0.6 ) * 264;
+		b = pow( b / 114.0, 0.6 ) * 264;
+
+		pkvd->fHandled = TRUE;
+		sprintf( szColor, "%d", r );
+		CVAR_SET_STRING( "sv_skycolor_r", szColor );
+		sprintf( szColor, "%d", g );
+		CVAR_SET_STRING( "sv_skycolor_g", szColor );
+		sprintf( szColor, "%d", b );
+		CVAR_SET_STRING( "sv_skycolor_b", szColor );
+	}
+	else
+	{
+		CLight::KeyValue( pkvd );
+	}
+}
+
+
+void CEnvLight :: Spawn( void )
+{
+	char szVector[64];
+	UTIL_MakeAimVectors( pev->angles );
+
+	sprintf( szVector, "%f", gpGlobals->v_forward.x );
+	CVAR_SET_STRING( "sv_skyvec_x", szVector );
+	sprintf( szVector, "%f", gpGlobals->v_forward.y );
+	CVAR_SET_STRING( "sv_skyvec_y", szVector );
+	sprintf( szVector, "%f", gpGlobals->v_forward.z );
+	CVAR_SET_STRING( "sv_skyvec_z", szVector );
+
+	CLight::Spawn( );
+}
diff --git a/main/source/dlls/maprules.cpp b/main/source/dlls/maprules.cpp
new file mode 100644
index 00000000..03ab2759
--- /dev/null
+++ b/main/source/dlls/maprules.cpp
@@ -0,0 +1,918 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+//	-------------------------------------------
+//
+//	maprules.cpp
+//
+//	This module contains entities for implementing/changing game
+//	rules dynamically within each map (.BSP)
+//
+//	-------------------------------------------
+
+#include "extdll.h"
+#include "eiface.h"
+#include "util.h"
+#include "gamerules.h"
+#include "maprules.h"
+#include "cbase.h"
+#include "player.h"
+
+class CRuleEntity : public CBaseEntity
+{
+public:
+	void	Spawn( void );
+	void	KeyValue( KeyValueData *pkvd );
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	void	SetMaster( int iszMaster ) { m_iszMaster = iszMaster; }
+
+protected:
+	BOOL	CanFireForActivator( CBaseEntity *pActivator );
+
+private:
+	string_t	m_iszMaster;
+};
+
+TYPEDESCRIPTION	CRuleEntity::m_SaveData[] = 
+{
+	DEFINE_FIELD( CRuleEntity, m_iszMaster, FIELD_STRING),
+};
+
+IMPLEMENT_SAVERESTORE( CRuleEntity, CBaseEntity );
+
+
+void CRuleEntity::Spawn( void )
+{
+	pev->solid			= SOLID_NOT;
+	pev->movetype		= MOVETYPE_NONE;
+	pev->effects		= EF_NODRAW;
+}
+
+
+void CRuleEntity::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "master"))
+	{
+		SetMaster( ALLOC_STRING(pkvd->szValue) );
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseEntity::KeyValue( pkvd );
+}
+
+BOOL CRuleEntity::CanFireForActivator( CBaseEntity *pActivator )
+{
+	if ( m_iszMaster )
+	{
+		if ( UTIL_IsMasterTriggered( m_iszMaster, pActivator ) )
+			return TRUE;
+		else
+			return FALSE;
+	}
+	
+	return TRUE;
+}
+
+// 
+// CRulePointEntity -- base class for all rule "point" entities (not brushes)
+//
+class CRulePointEntity : public CRuleEntity
+{
+public:
+	void		Spawn( void );
+};
+
+void CRulePointEntity::Spawn( void )
+{
+	CRuleEntity::Spawn();
+	pev->frame			= 0;
+	pev->model			= 0;
+}
+
+// 
+// CRuleBrushEntity -- base class for all rule "brush" entities (not brushes)
+// Default behavior is to set up like a trigger, invisible, but keep the model for volume testing
+//
+class CRuleBrushEntity : public CRuleEntity
+{
+public:
+	void		Spawn( void );
+
+private:
+};
+
+void CRuleBrushEntity::Spawn( void )
+{
+	SET_MODEL( edict(), STRING(pev->model) );
+	CRuleEntity::Spawn();
+}
+
+
+// CGameScore / game_score	-- award points to player / team 
+//	Points +/- total
+//	Flag: Allow negative scores					SF_SCORE_NEGATIVE
+//	Flag: Award points to team in teamplay		SF_SCORE_TEAM
+
+#define SF_SCORE_NEGATIVE			0x0001
+#define SF_SCORE_TEAM				0x0002
+
+class CGameScore : public CRulePointEntity
+{
+public:
+	void	Spawn( void );
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void	KeyValue( KeyValueData *pkvd );
+
+	inline	int		Points( void ) { return pev->frags; }
+	inline	BOOL	AllowNegativeScore( void ) { return pev->spawnflags & SF_SCORE_NEGATIVE; }
+	inline	BOOL	AwardToTeam( void ) { return pev->spawnflags & SF_SCORE_TEAM; }
+
+	inline	void	SetPoints( int points ) { pev->frags = points; }
+
+private:
+};
+
+LINK_ENTITY_TO_CLASS( game_score, CGameScore );
+
+
+void CGameScore::Spawn( void )
+{
+	CRulePointEntity::Spawn();
+}
+
+
+void CGameScore::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "points"))
+	{
+		SetPoints( atoi(pkvd->szValue) );
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CRulePointEntity::KeyValue( pkvd );
+}
+
+
+
+void CGameScore::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( !CanFireForActivator( pActivator ) )
+		return;
+
+	// Only players can use this
+	if ( pActivator->IsPlayer() )
+	{
+		if ( AwardToTeam() )
+		{
+			pActivator->AddPointsToTeam( Points(), AllowNegativeScore() );
+		}
+		else
+		{
+			pActivator->AddPoints( Points(), AllowNegativeScore() );
+		}
+	}
+}
+
+
+// CGameEnd / game_end	-- Ends the game in MP
+
+class CGameEnd : public CRulePointEntity
+{
+public:
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+private:
+};
+
+LINK_ENTITY_TO_CLASS( game_end, CGameEnd );
+
+
+void CGameEnd::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( !CanFireForActivator( pActivator ) )
+		return;
+
+	g_pGameRules->EndMultiplayerGame();
+}
+
+
+//
+// CGameText / game_text	-- NON-Localized HUD Message (use env_message to display a titles.txt message)
+//	Flag: All players					SF_ENVTEXT_ALLPLAYERS
+//
+
+
+#define SF_ENVTEXT_ALLPLAYERS			0x0001
+
+
+class CGameText : public CRulePointEntity
+{
+public:
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void	KeyValue( KeyValueData *pkvd );
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	inline	BOOL	MessageToAll( void ) { return (pev->spawnflags & SF_ENVTEXT_ALLPLAYERS); }
+	inline	void	MessageSet( const char *pMessage ) { pev->message = ALLOC_STRING(pMessage); }
+	inline	const char *MessageGet( void )	{ return STRING(pev->message); }
+
+private:
+
+	hudtextparms_t	m_textParms;
+};
+
+LINK_ENTITY_TO_CLASS( game_text, CGameText );
+
+// Save parms as a block.  Will break save/restore if the structure changes, but this entity didn't ship with Half-Life, so
+// it can't impact saved Half-Life games.
+TYPEDESCRIPTION	CGameText::m_SaveData[] = 
+{
+	DEFINE_ARRAY( CGameText, m_textParms, FIELD_CHARACTER, sizeof(hudtextparms_t) ),
+};
+
+IMPLEMENT_SAVERESTORE( CGameText, CRulePointEntity );
+
+
+void CGameText::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "channel"))
+	{
+		m_textParms.channel = atoi( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "x"))
+	{
+		m_textParms.x = atof( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "y"))
+	{
+		m_textParms.y = atof( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "effect"))
+	{
+		m_textParms.effect = atoi( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "color"))
+	{
+		int color[4];
+		UTIL_StringToIntArray( color, 4, pkvd->szValue );
+		m_textParms.r1 = color[0];
+		m_textParms.g1 = color[1];
+		m_textParms.b1 = color[2];
+		m_textParms.a1 = color[3];
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "color2"))
+	{
+		int color[4];
+		UTIL_StringToIntArray( color, 4, pkvd->szValue );
+		m_textParms.r2 = color[0];
+		m_textParms.g2 = color[1];
+		m_textParms.b2 = color[2];
+		m_textParms.a2 = color[3];
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "fadein"))
+	{
+		m_textParms.fadeinTime = atof( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "fadeout"))
+	{
+		m_textParms.fadeoutTime = atof( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "holdtime"))
+	{
+		m_textParms.holdTime = atof( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "fxtime"))
+	{
+		m_textParms.fxTime = atof( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CRulePointEntity::KeyValue( pkvd );
+}
+
+
+void CGameText::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( !CanFireForActivator( pActivator ) )
+		return;
+
+	if ( MessageToAll() )
+	{
+		UTIL_HudMessageAll( m_textParms, MessageGet() );
+	}
+	else
+	{
+		if ( pActivator->IsNetClient() )
+		{
+			UTIL_HudMessage( pActivator, m_textParms, MessageGet() );
+		}
+	}
+}
+
+
+//
+// CGameTeamMaster / game_team_master	-- "Masters" like multisource, but based on the team of the activator
+// Only allows mastered entity to fire if the team matches my team
+//
+// team index (pulled from server team list "mp_teamlist"
+// Flag: Remove on Fire
+// Flag: Any team until set?		-- Any team can use this until the team is set (otherwise no teams can use it)
+//
+
+#define SF_TEAMMASTER_FIREONCE			0x0001
+#define SF_TEAMMASTER_ANYTEAM			0x0002
+
+class CGameTeamMaster : public CRulePointEntity
+{
+public:
+	void		KeyValue( KeyValueData *pkvd );
+	void		Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	int			ObjectCaps( void ) { return CRulePointEntity:: ObjectCaps() | FCAP_MASTER; }
+
+	BOOL		IsTriggered( CBaseEntity *pActivator );
+	char*		TeamID( void );
+	inline BOOL RemoveOnFire( void ) { return (pev->spawnflags & SF_TEAMMASTER_FIREONCE) ? TRUE : FALSE; }
+	inline BOOL AnyTeam( void ) { return (pev->spawnflags & SF_TEAMMASTER_ANYTEAM) ? TRUE : FALSE; }
+
+private:
+	BOOL		TeamMatch( CBaseEntity *pActivator );
+
+	int			m_teamIndex;
+	USE_TYPE	triggerType;
+};
+
+LINK_ENTITY_TO_CLASS( game_team_master, CGameTeamMaster );
+
+void CGameTeamMaster::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "teamindex"))
+	{
+		m_teamIndex = atoi( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "triggerstate"))
+	{
+		int type = atoi( pkvd->szValue );
+		switch( type )
+		{
+		case 0:
+			triggerType = USE_OFF;
+			break;
+		case 2:
+			triggerType = USE_TOGGLE;
+			break;
+		default:
+			triggerType = USE_ON;
+			break;
+		}
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CRulePointEntity::KeyValue( pkvd );
+}
+
+
+void CGameTeamMaster::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( !CanFireForActivator( pActivator ) )
+		return;
+
+	if ( useType == USE_SET )
+	{
+		if ( value < 0 )
+		{
+			m_teamIndex = -1;
+		}
+		else
+		{
+			m_teamIndex = g_pGameRules->GetTeamIndex( pActivator->TeamID() );
+		}
+		return;
+	}
+
+	if ( TeamMatch( pActivator ) )
+	{
+		SUB_UseTargets( pActivator, triggerType, value );
+		if ( RemoveOnFire() )
+			UTIL_Remove( this );
+	}
+}
+
+
+BOOL CGameTeamMaster::IsTriggered( CBaseEntity *pActivator )
+{
+	return TeamMatch( pActivator );
+}
+
+
+char *CGameTeamMaster::TeamID( void )
+{
+	if ( m_teamIndex < 0 )		// Currently set to "no team"
+		return "";
+
+	return const_cast<char*>(g_pGameRules->GetIndexedTeamName( m_teamIndex ));		// UNDONE: Fill this in with the team from the "teamlist"
+}
+
+
+BOOL CGameTeamMaster::TeamMatch( CBaseEntity *pActivator )
+{
+	if ( m_teamIndex < 0 && AnyTeam() )
+		return TRUE;
+
+	if ( !pActivator )
+		return FALSE;
+
+	return UTIL_TeamsMatch( pActivator->TeamID(), TeamID() );
+}
+
+
+//
+// CGameTeamSet / game_team_set	-- Changes the team of the entity it targets to the activator's team
+// Flag: Fire once
+// Flag: Clear team				-- Sets the team to "NONE" instead of activator
+
+#define SF_TEAMSET_FIREONCE			0x0001
+#define SF_TEAMSET_CLEARTEAM		0x0002
+
+class CGameTeamSet : public CRulePointEntity
+{
+public:
+	void		Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	inline BOOL RemoveOnFire( void ) { return (pev->spawnflags & SF_TEAMSET_FIREONCE) ? TRUE : FALSE; }
+	inline BOOL ShouldClearTeam( void ) { return (pev->spawnflags & SF_TEAMSET_CLEARTEAM) ? TRUE : FALSE; }
+
+private:
+};
+
+LINK_ENTITY_TO_CLASS( game_team_set, CGameTeamSet );
+
+
+void CGameTeamSet::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( !CanFireForActivator( pActivator ) )
+		return;
+
+	if ( ShouldClearTeam() )
+	{
+		SUB_UseTargets( pActivator, USE_SET, -1 );
+	}
+	else
+	{
+		SUB_UseTargets( pActivator, USE_SET, 0 );
+	}
+
+	if ( RemoveOnFire() )
+	{
+		UTIL_Remove( this );
+	}
+}
+
+
+//
+// CGamePlayerZone / game_player_zone -- players in the zone fire my target when I'm fired
+//
+// Needs master?
+class CGamePlayerZone : public CRuleBrushEntity
+{
+public:
+	void		KeyValue( KeyValueData *pkvd );
+	void		Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+private:
+	string_t	m_iszInTarget;
+	string_t	m_iszOutTarget;
+	string_t	m_iszInCount;
+	string_t	m_iszOutCount;
+};
+
+LINK_ENTITY_TO_CLASS( game_zone_player, CGamePlayerZone );
+TYPEDESCRIPTION	CGamePlayerZone::m_SaveData[] = 
+{
+	DEFINE_FIELD( CGamePlayerZone, m_iszInTarget, FIELD_STRING ),
+	DEFINE_FIELD( CGamePlayerZone, m_iszOutTarget, FIELD_STRING ),
+	DEFINE_FIELD( CGamePlayerZone, m_iszInCount, FIELD_STRING ),
+	DEFINE_FIELD( CGamePlayerZone, m_iszOutCount, FIELD_STRING ),
+};
+
+IMPLEMENT_SAVERESTORE( CGamePlayerZone, CRuleBrushEntity );
+
+void CGamePlayerZone::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "intarget"))
+	{
+		m_iszInTarget = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "outtarget"))
+	{
+		m_iszOutTarget = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "incount"))
+	{
+		m_iszInCount = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "outcount"))
+	{
+		m_iszOutCount = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CRuleBrushEntity::KeyValue( pkvd );
+}
+
+void CGamePlayerZone::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	int playersInCount = 0;
+	int playersOutCount = 0;
+
+	if ( !CanFireForActivator( pActivator ) )
+		return;
+
+	CBaseEntity *pPlayer = NULL;
+
+	for ( int i = 1; i <= gpGlobals->maxClients; i++ )
+	{
+		pPlayer = UTIL_PlayerByIndex( i );
+		if ( pPlayer )
+		{
+			TraceResult trace;
+			int			hullNumber;
+
+			hullNumber = human_hull;
+			if ( pPlayer->pev->flags & FL_DUCKING )
+			{
+				hullNumber = head_hull;
+			}
+
+			UTIL_TraceModel( pPlayer->pev->origin, pPlayer->pev->origin, hullNumber, edict(), &trace );
+
+			if ( trace.fStartSolid )
+			{
+				playersInCount++;
+				if ( m_iszInTarget )
+				{
+					FireTargets( STRING(m_iszInTarget), pPlayer, pActivator, useType, value );
+				}
+			}
+			else
+			{
+				playersOutCount++;
+				if ( m_iszOutTarget )
+				{
+					FireTargets( STRING(m_iszOutTarget), pPlayer, pActivator, useType, value );
+				}
+			}
+		}
+	}
+
+	if ( m_iszInCount )
+	{
+		FireTargets( STRING(m_iszInCount), pActivator, this, USE_SET, playersInCount );
+	}
+
+	if ( m_iszOutCount )
+	{
+		FireTargets( STRING(m_iszOutCount), pActivator, this, USE_SET, playersOutCount );
+	}
+}
+
+
+
+//
+// CGamePlayerHurt / game_player_hurt	-- Damages the player who fires it
+// Flag: Fire once
+
+#define SF_PKILL_FIREONCE			0x0001
+class CGamePlayerHurt : public CRulePointEntity
+{
+public:
+	void		Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	inline BOOL RemoveOnFire( void ) { return (pev->spawnflags & SF_PKILL_FIREONCE) ? TRUE : FALSE; }
+
+private:
+};
+
+LINK_ENTITY_TO_CLASS( game_player_hurt, CGamePlayerHurt );
+
+
+void CGamePlayerHurt::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( !CanFireForActivator( pActivator ) )
+		return;
+
+	if ( pActivator->IsPlayer() )
+	{
+		if ( pev->dmg < 0 )
+			pActivator->TakeHealth( -pev->dmg, DMG_GENERIC );
+		else
+			pActivator->TakeDamage( pev, pev, pev->dmg, DMG_GENERIC );
+	}
+	
+	SUB_UseTargets( pActivator, useType, value );
+
+	if ( RemoveOnFire() )
+	{
+		UTIL_Remove( this );
+	}
+}
+
+
+
+//
+// CGameCounter / game_counter	-- Counts events and fires target
+// Flag: Fire once
+// Flag: Reset on Fire
+
+#define SF_GAMECOUNT_FIREONCE			0x0001
+#define SF_GAMECOUNT_RESET				0x0002
+
+class CGameCounter : public CRulePointEntity
+{
+public:
+	void		Spawn( void );
+	void		Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	inline BOOL RemoveOnFire( void ) { return (pev->spawnflags & SF_GAMECOUNT_FIREONCE) ? TRUE : FALSE; }
+	inline BOOL ResetOnFire( void ) { return (pev->spawnflags & SF_GAMECOUNT_RESET) ? TRUE : FALSE; }
+
+	inline void CountUp( void ) { pev->frags++; }
+	inline void CountDown( void ) { pev->frags--; }
+	inline void ResetCount( void ) { pev->frags = pev->dmg; }
+	inline int  CountValue( void ) { return pev->frags; }
+	inline int	LimitValue( void ) { return pev->health; }
+	
+	inline BOOL HitLimit( void ) { return CountValue() == LimitValue(); }
+
+private:
+
+	inline void SetCountValue( int value ) { pev->frags = value; }
+	inline void SetInitialValue( int value ) { pev->dmg = value; }
+};
+
+LINK_ENTITY_TO_CLASS( game_counter, CGameCounter );
+
+void CGameCounter::Spawn( void )
+{
+	// Save off the initial count
+	SetInitialValue( CountValue() );
+	CRulePointEntity::Spawn();
+}
+
+
+void CGameCounter::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( !CanFireForActivator( pActivator ) )
+		return;
+
+	switch( useType )
+	{
+	case USE_ON:
+	case USE_TOGGLE:
+		CountUp();
+		break;
+	
+	case USE_OFF:
+		CountDown();
+		break;
+
+	case USE_SET:
+		SetCountValue( (int)value );
+		break;
+	}
+	
+	if ( HitLimit() )
+	{
+		SUB_UseTargets( pActivator, USE_TOGGLE, 0 );
+		if ( RemoveOnFire() )
+		{
+			UTIL_Remove( this );
+		}
+		
+		if ( ResetOnFire() )
+		{
+			ResetCount();
+		}
+	}
+}
+
+
+
+//
+// CGameCounterSet / game_counter_set	-- Sets the counter's value
+// Flag: Fire once
+
+#define SF_GAMECOUNTSET_FIREONCE			0x0001
+
+class CGameCounterSet : public CRulePointEntity
+{
+public:
+	void		Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	inline BOOL RemoveOnFire( void ) { return (pev->spawnflags & SF_GAMECOUNTSET_FIREONCE) ? TRUE : FALSE; }
+
+private:
+};
+
+LINK_ENTITY_TO_CLASS( game_counter_set, CGameCounterSet );
+
+
+void CGameCounterSet::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( !CanFireForActivator( pActivator ) )
+		return;
+
+	SUB_UseTargets( pActivator, USE_SET, pev->frags );
+
+	if ( RemoveOnFire() )
+	{
+		UTIL_Remove( this );
+	}
+}
+
+
+//
+// CGamePlayerEquip / game_playerequip	-- Sets the default player equipment
+// Flag: USE Only
+
+#define SF_PLAYEREQUIP_USEONLY			0x0001
+#define MAX_EQUIP		32
+
+class CGamePlayerEquip : public CRulePointEntity
+{
+public:
+	void		KeyValue( KeyValueData *pkvd );
+	void		Touch( CBaseEntity *pOther );
+	void		Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+	inline BOOL	UseOnly( void ) { return (pev->spawnflags & SF_PLAYEREQUIP_USEONLY) ? TRUE : FALSE; }
+
+private:
+
+	void		EquipPlayer( CBaseEntity *pPlayer );
+
+	string_t	m_weaponNames[MAX_EQUIP];
+	int			m_weaponCount[MAX_EQUIP];
+};
+
+LINK_ENTITY_TO_CLASS( game_player_equip, CGamePlayerEquip );
+
+
+void CGamePlayerEquip::KeyValue( KeyValueData *pkvd )
+{
+	CRulePointEntity::KeyValue( pkvd );
+
+	if ( !pkvd->fHandled )
+	{
+		for ( int i = 0; i < MAX_EQUIP; i++ )
+		{
+			if ( !m_weaponNames[i] )
+			{
+				char tmp[128];
+
+				UTIL_StripToken( pkvd->szKeyName, tmp );
+
+				m_weaponNames[i] = ALLOC_STRING(tmp);
+				m_weaponCount[i] = atoi(pkvd->szValue);
+				m_weaponCount[i] = max(1,m_weaponCount[i]);
+				pkvd->fHandled = TRUE;
+				break;
+			}
+		}
+	}
+}
+
+
+void CGamePlayerEquip::Touch( CBaseEntity *pOther )
+{
+	if ( !CanFireForActivator( pOther ) )
+		return;
+
+	if ( UseOnly() )
+		return;
+
+	EquipPlayer( pOther );
+}
+
+void CGamePlayerEquip::EquipPlayer( CBaseEntity *pEntity )
+{
+	CBasePlayer *pPlayer = NULL;
+
+	if ( pEntity->IsPlayer() )
+	{
+		pPlayer = (CBasePlayer *)pEntity;
+	}
+
+	if ( !pPlayer )
+		return;
+
+	for ( int i = 0; i < MAX_EQUIP; i++ )
+	{
+		if ( !m_weaponNames[i] )
+			break;
+		for ( int j = 0; j < m_weaponCount[i]; j++ )
+		{
+ 			pPlayer->GiveNamedItem( STRING(m_weaponNames[i]) );
+		}
+	}
+}
+
+
+void CGamePlayerEquip::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	EquipPlayer( pActivator );
+}
+
+
+//
+// CGamePlayerTeam / game_player_team	-- Changes the team of the player who fired it
+// Flag: Fire once
+// Flag: Kill Player
+// Flag: Gib Player
+
+#define SF_PTEAM_FIREONCE			0x0001
+#define SF_PTEAM_KILL    			0x0002
+#define SF_PTEAM_GIB     			0x0004
+
+class CGamePlayerTeam : public CRulePointEntity
+{
+public:
+	void		Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+private:
+
+	inline BOOL RemoveOnFire( void ) { return (pev->spawnflags & SF_PTEAM_FIREONCE) ? TRUE : FALSE; }
+	inline BOOL ShouldKillPlayer( void ) { return (pev->spawnflags & SF_PTEAM_KILL) ? TRUE : FALSE; }
+	inline BOOL ShouldGibPlayer( void ) { return (pev->spawnflags & SF_PTEAM_GIB) ? TRUE : FALSE; }
+	
+	const char *TargetTeamName( const char *pszTargetName );
+};
+
+LINK_ENTITY_TO_CLASS( game_player_team, CGamePlayerTeam );
+
+
+const char *CGamePlayerTeam::TargetTeamName( const char *pszTargetName )
+{
+	CBaseEntity *pTeamEntity = NULL;
+
+	while ((pTeamEntity = UTIL_FindEntityByTargetname( pTeamEntity, pszTargetName )) != NULL)
+	{
+		if ( FClassnameIs( pTeamEntity->pev, "game_team_master" ) )
+			return pTeamEntity->TeamID();
+	}
+
+	return NULL;
+}
+
+
+void CGamePlayerTeam::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( !CanFireForActivator( pActivator ) )
+		return;
+
+	if ( pActivator->IsPlayer() )
+	{
+		const char *pszTargetTeam = TargetTeamName( STRING(pev->target) );
+		if ( pszTargetTeam )
+		{
+			CBasePlayer *pPlayer = (CBasePlayer *)pActivator;
+			g_pGameRules->ChangePlayerTeam( pPlayer, pszTargetTeam, ShouldKillPlayer(), ShouldGibPlayer() );
+		}
+	}
+	
+	if ( RemoveOnFire() )
+	{
+		UTIL_Remove( this );
+	}
+}
+
+
diff --git a/main/source/dlls/maprules.h b/main/source/dlls/maprules.h
new file mode 100644
index 00000000..8b4867c6
--- /dev/null
+++ b/main/source/dlls/maprules.h
@@ -0,0 +1,22 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+#ifndef MAPRULES_H
+#define MAPRULES_H
+
+
+
+#endif		// MAPRULES_H
+
diff --git a/main/source/dlls/monsterevent.h b/main/source/dlls/monsterevent.h
new file mode 100644
index 00000000..34de4467
--- /dev/null
+++ b/main/source/dlls/monsterevent.h
@@ -0,0 +1,34 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef MONSTEREVENT_H
+#define MONSTEREVENT_H
+
+typedef struct
+{
+	int			event;
+	char		*options;
+} MonsterEvent_t;
+
+#define EVENT_SPECIFIC			0
+#define EVENT_SCRIPTED			1000
+#define EVENT_SHARED			2000
+#define EVENT_CLIENT			5000
+
+#define MONSTER_EVENT_BODYDROP_LIGHT	2001
+#define MONSTER_EVENT_BODYDROP_HEAVY	2002
+
+#define MONSTER_EVENT_SWISHSOUND		2010
+
+#endif		// MONSTEREVENT_H
diff --git a/main/source/dlls/monstermaker.cpp b/main/source/dlls/monstermaker.cpp
new file mode 100644
index 00000000..dd53e23d
--- /dev/null
+++ b/main/source/dlls/monstermaker.cpp
@@ -0,0 +1,292 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//=========================================================
+// Monster Maker - this is an entity that creates monsters
+// in the game.
+//=========================================================
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "saverestore.h"
+
+// Monstermaker spawnflags
+#define	SF_MONSTERMAKER_START_ON	1 // start active ( if has targetname )
+#define	SF_MONSTERMAKER_CYCLIC		4 // drop one monster every time fired.
+#define SF_MONSTERMAKER_MONSTERCLIP	8 // Children are blocked by monsterclip
+
+//=========================================================
+// MonsterMaker - this ent creates monsters during the game.
+//=========================================================
+class CMonsterMaker : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void KeyValue( KeyValueData* pkvd);
+	void EXPORT ToggleUse ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void EXPORT CyclicUse ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void EXPORT MakerThink ( void );
+	void DeathNotice ( entvars_t *pevChild );// monster maker children use this to tell the monster maker that they have died.
+	void MakeMonster( void );
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+
+	static	TYPEDESCRIPTION m_SaveData[];
+	
+	string_t m_iszMonsterClassname;// classname of the monster(s) that will be created.
+	
+	int	 m_cNumMonsters;// max number of monsters this ent can create
+
+	
+	int  m_cLiveChildren;// how many monsters made by this monster maker that are currently alive
+	int	 m_iMaxLiveChildren;// max number of monsters that this maker may have out at one time.
+
+	float m_flGround; // z coord of the ground under me, used to make sure no monsters are under the maker when it drops a new child
+
+	BOOL m_fActive;
+	BOOL m_fFadeChildren;// should we make the children fadeout?
+};
+
+LINK_ENTITY_TO_CLASS( monstermaker, CMonsterMaker );
+
+TYPEDESCRIPTION	CMonsterMaker::m_SaveData[] = 
+{
+	DEFINE_FIELD( CMonsterMaker, m_iszMonsterClassname, FIELD_STRING ),
+	DEFINE_FIELD( CMonsterMaker, m_cNumMonsters, FIELD_INTEGER ),
+	DEFINE_FIELD( CMonsterMaker, m_cLiveChildren, FIELD_INTEGER ),
+	DEFINE_FIELD( CMonsterMaker, m_flGround, FIELD_FLOAT ),
+	DEFINE_FIELD( CMonsterMaker, m_iMaxLiveChildren, FIELD_INTEGER ),
+	DEFINE_FIELD( CMonsterMaker, m_fActive, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CMonsterMaker, m_fFadeChildren, FIELD_BOOLEAN ),
+};
+
+
+IMPLEMENT_SAVERESTORE( CMonsterMaker, CBaseMonster );
+
+void CMonsterMaker :: KeyValue( KeyValueData *pkvd )
+{
+	
+	if ( FStrEq(pkvd->szKeyName, "monstercount") )
+	{
+		m_cNumMonsters = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if ( FStrEq(pkvd->szKeyName, "m_imaxlivechildren") )
+	{
+		m_iMaxLiveChildren = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if ( FStrEq(pkvd->szKeyName, "monstertype") )
+	{
+		m_iszMonsterClassname = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseMonster::KeyValue( pkvd );
+}
+
+
+void CMonsterMaker :: Spawn( )
+{
+	pev->solid = SOLID_NOT;
+
+	m_cLiveChildren = 0;
+	Precache();
+	if ( !FStringNull ( pev->targetname ) )
+	{
+		if ( pev->spawnflags & SF_MONSTERMAKER_CYCLIC )
+		{
+			SetUse ( &CMonsterMaker::CyclicUse );// drop one monster each time we fire
+		}
+		else
+		{
+			SetUse ( &CMonsterMaker::ToggleUse );// so can be turned on/off
+		}
+
+		if ( FBitSet ( pev->spawnflags, SF_MONSTERMAKER_START_ON ) )
+		{// start making monsters as soon as monstermaker spawns
+			m_fActive = TRUE;
+			SetThink ( &CMonsterMaker::MakerThink );
+		}
+		else
+		{// wait to be activated.
+			m_fActive = FALSE;
+			SetThink ( &CMonsterMaker::SUB_DoNothing );
+		}
+	}
+	else
+	{// no targetname, just start.
+			pev->nextthink = gpGlobals->time + m_flDelay;
+			m_fActive = TRUE;
+			SetThink ( &CMonsterMaker::MakerThink );
+	}
+
+	if ( m_cNumMonsters == 1 )
+	{
+		m_fFadeChildren = FALSE;
+	}
+	else
+	{
+		m_fFadeChildren = TRUE;
+	}
+
+	m_flGround = 0;
+}
+
+void CMonsterMaker :: Precache( void )
+{
+	CBaseMonster::Precache();
+
+	UTIL_PrecacheOther( STRING( m_iszMonsterClassname ) );
+}
+
+//=========================================================
+// MakeMonster-  this is the code that drops the monster
+//=========================================================
+void CMonsterMaker::MakeMonster( void )
+{
+	edict_t	*pent;
+	entvars_t		*pevCreate;
+
+	if ( m_iMaxLiveChildren > 0 && m_cLiveChildren >= m_iMaxLiveChildren )
+	{// not allowed to make a new one yet. Too many live ones out right now.
+		return;
+	}
+
+	if ( !m_flGround )
+	{
+		// set altitude. Now that I'm activated, any breakables, etc should be out from under me. 
+		TraceResult tr;
+
+		UTIL_TraceLine ( pev->origin, pev->origin - Vector ( 0, 0, 2048 ), ignore_monsters, ENT(pev), &tr );
+		m_flGround = tr.vecEndPos.z;
+	}
+
+	Vector mins = pev->origin - Vector( 34, 34, 0 );
+	Vector maxs = pev->origin + Vector( 34, 34, 0 );
+	maxs.z = pev->origin.z;
+	mins.z = m_flGround;
+
+	CBaseEntity *pList[2];
+	int count = UTIL_EntitiesInBox( pList, 2, mins, maxs, FL_CLIENT|FL_MONSTER );
+	if ( count )
+	{
+		// don't build a stack of monsters!
+		return;
+	}
+
+	pent = CREATE_NAMED_ENTITY( m_iszMonsterClassname );
+
+	if ( FNullEnt( pent ) )
+	{
+		ALERT ( at_console, "NULL Ent in MonsterMaker!\n" );
+		return;
+	}
+	
+	// If I have a target, fire!
+	if ( !FStringNull ( pev->target ) )
+	{
+		// delay already overloaded for this entity, so can't call SUB_UseTargets()
+		FireTargets( STRING(pev->target), this, this, USE_TOGGLE, 0 );
+	}
+
+	pevCreate = VARS( pent );
+	pevCreate->origin = pev->origin;
+	pevCreate->angles = pev->angles;
+	SetBits( pevCreate->spawnflags, SF_MONSTER_FALL_TO_GROUND );
+
+	// Children hit monsterclip brushes
+	if ( pev->spawnflags & SF_MONSTERMAKER_MONSTERCLIP )
+		SetBits( pevCreate->spawnflags, SF_MONSTER_HITMONSTERCLIP );
+
+	DispatchSpawn( ENT( pevCreate ) );
+	pevCreate->owner = edict();
+
+	if ( !FStringNull( pev->netname ) )
+	{
+		// if I have a netname (overloaded), give the child monster that name as a targetname
+		pevCreate->targetname = pev->netname;
+	}
+
+	m_cLiveChildren++;// count this monster
+	m_cNumMonsters--;
+
+	if ( m_cNumMonsters == 0 )
+	{
+		// Disable this forever.  Don't kill it because it still gets death notices
+		SetThink( NULL );
+		SetUse( NULL );
+	}
+}
+
+//=========================================================
+// CyclicUse - drops one monster from the monstermaker
+// each time we call this.
+//=========================================================
+void CMonsterMaker::CyclicUse ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	MakeMonster();
+}
+
+//=========================================================
+// ToggleUse - activates/deactivates the monster maker
+//=========================================================
+void CMonsterMaker :: ToggleUse ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( !ShouldToggle( useType, m_fActive ) )
+		return;
+
+	if ( m_fActive )
+	{
+		m_fActive = FALSE;
+		SetThink ( NULL );
+	}
+	else
+	{
+		m_fActive = TRUE;
+		SetThink ( &CMonsterMaker::MakerThink );
+	}
+
+	pev->nextthink = gpGlobals->time;
+}
+
+//=========================================================
+// MakerThink - creates a new monster every so often
+//=========================================================
+void CMonsterMaker :: MakerThink ( void )
+{
+	pev->nextthink = gpGlobals->time + m_flDelay;
+
+	MakeMonster();
+}
+
+
+//=========================================================
+//=========================================================
+void CMonsterMaker :: DeathNotice ( entvars_t *pevChild )
+{
+	// ok, we've gotten the deathnotice from our child, now clear out its owner if we don't want it to fade.
+	m_cLiveChildren--;
+
+	if ( !m_fFadeChildren )
+	{
+		pevChild->owner = NULL;
+	}
+}
+
+
diff --git a/main/source/dlls/monsters.cpp b/main/source/dlls/monsters.cpp
new file mode 100644
index 00000000..5f8ae7ed
--- /dev/null
+++ b/main/source/dlls/monsters.cpp
@@ -0,0 +1,3448 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+/*
+
+===== monsters.cpp ========================================================
+
+  Monster-related utility code
+
+*/
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "nodes.h"
+#include "monsters.h"
+#include "animation.h"
+#include "saverestore.h"
+#include "weapons.h"
+#include "scripted.h"
+#include "squadmonster.h"
+#include "decals.h"
+#include "soundent.h"
+#include "gamerules.h"
+
+#define MONSTER_CUT_CORNER_DIST		8 // 8 means the monster's bounding box is contained without the box of the node in WC
+
+
+Vector VecBModelOrigin( entvars_t* pevBModel );
+
+extern DLL_GLOBAL	BOOL	g_fDrawLines;
+extern DLL_GLOBAL	short	g_sModelIndexLaser;// holds the index for the laser beam
+extern DLL_GLOBAL	short	g_sModelIndexLaserDot;// holds the index for the laser beam dot
+
+extern CGraph WorldGraph;// the world node graph
+
+
+
+// Global Savedata for monster
+// UNDONE: Save schedule data?  Can this be done?  We may
+// lose our enemy pointer or other data (goal ent, target, etc)
+// that make the current schedule invalid, perhaps it's best
+// to just pick a new one when we start up again.
+TYPEDESCRIPTION	CBaseMonster::m_SaveData[] = 
+{
+	DEFINE_FIELD( CBaseMonster, m_hEnemy, FIELD_EHANDLE ),
+	DEFINE_FIELD( CBaseMonster, m_hTargetEnt, FIELD_EHANDLE ),
+	DEFINE_ARRAY( CBaseMonster, m_hOldEnemy, FIELD_EHANDLE, MAX_OLD_ENEMIES ),
+	DEFINE_ARRAY( CBaseMonster, m_vecOldEnemy, FIELD_POSITION_VECTOR, MAX_OLD_ENEMIES ),
+	DEFINE_FIELD( CBaseMonster, m_flFieldOfView, FIELD_FLOAT ),
+	DEFINE_FIELD( CBaseMonster, m_flWaitFinished, FIELD_TIME ),
+	DEFINE_FIELD( CBaseMonster, m_flMoveWaitFinished, FIELD_TIME ),
+
+	DEFINE_FIELD( CBaseMonster, m_Activity, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseMonster, m_IdealActivity, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseMonster, m_LastHitGroup, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseMonster, m_MonsterState, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseMonster, m_IdealMonsterState, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseMonster, m_iTaskStatus, FIELD_INTEGER ),
+
+	//Schedule_t			*m_pSchedule;
+
+	DEFINE_FIELD( CBaseMonster, m_iScheduleIndex, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseMonster, m_afConditions, FIELD_INTEGER ),
+	//WayPoint_t			m_Route[ ROUTE_SIZE ];
+//	DEFINE_FIELD( CBaseMonster, m_movementGoal, FIELD_INTEGER ),
+//	DEFINE_FIELD( CBaseMonster, m_iRouteIndex, FIELD_INTEGER ),
+//	DEFINE_FIELD( CBaseMonster, m_moveWaitTime, FIELD_FLOAT ),
+
+	DEFINE_FIELD( CBaseMonster, m_vecMoveGoal, FIELD_POSITION_VECTOR ),
+	DEFINE_FIELD( CBaseMonster, m_movementActivity, FIELD_INTEGER ),
+
+	//		int					m_iAudibleList; // first index of a linked list of sounds that the monster can hear.
+//	DEFINE_FIELD( CBaseMonster, m_afSoundTypes, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseMonster, m_vecLastPosition, FIELD_POSITION_VECTOR ),
+	DEFINE_FIELD( CBaseMonster, m_iHintNode, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseMonster, m_afMemory, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseMonster, m_iMaxHealth, FIELD_INTEGER ),
+
+	DEFINE_FIELD( CBaseMonster, m_vecEnemyLKP, FIELD_POSITION_VECTOR ),
+	DEFINE_FIELD( CBaseMonster, m_cAmmoLoaded, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseMonster, m_afCapability, FIELD_INTEGER ),
+
+	DEFINE_FIELD( CBaseMonster, m_flNextAttack, FIELD_TIME ),
+	DEFINE_FIELD( CBaseMonster, m_bitsDamageType, FIELD_INTEGER ),
+	DEFINE_ARRAY( CBaseMonster, m_rgbTimeBasedDamage, FIELD_CHARACTER, CDMG_TIMEBASED ),
+	DEFINE_FIELD( CBaseMonster, m_bloodColor, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseMonster, m_failSchedule, FIELD_INTEGER ),
+
+	DEFINE_FIELD( CBaseMonster, m_flHungryTime, FIELD_TIME ),
+	DEFINE_FIELD( CBaseMonster, m_flDistTooFar, FIELD_FLOAT ),
+	DEFINE_FIELD( CBaseMonster, m_flDistLook, FIELD_FLOAT ),
+	DEFINE_FIELD( CBaseMonster, m_iTriggerCondition, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseMonster, m_iszTriggerTarget, FIELD_STRING ),
+
+	DEFINE_FIELD( CBaseMonster, m_HackedGunPos, FIELD_VECTOR ),
+
+	DEFINE_FIELD( CBaseMonster, m_scriptState, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseMonster, m_pCine, FIELD_CLASSPTR ),
+};
+
+//IMPLEMENT_SAVERESTORE( CBaseMonster, CBaseToggle );
+int CBaseMonster::Save( CSave &save )
+{
+	if ( !CBaseToggle::Save(save) )
+		return 0;
+	return save.WriteFields( "CBaseMonster", this, m_SaveData, ARRAYSIZE(m_SaveData) );
+}
+
+int CBaseMonster::Restore( CRestore &restore )
+{
+	if ( !CBaseToggle::Restore(restore) )
+		return 0;
+	int status = restore.ReadFields( "CBaseMonster", this, m_SaveData, ARRAYSIZE(m_SaveData) );
+	
+	// We don't save/restore routes yet
+	RouteClear();
+
+	// We don't save/restore schedules yet
+	m_pSchedule = NULL;
+	m_iTaskStatus = TASKSTATUS_NEW;
+	
+	// Reset animation
+	m_Activity = ACT_RESET;
+
+	// If we don't have an enemy, clear conditions like see enemy, etc.
+	if ( m_hEnemy == NULL )
+		m_afConditions = 0;
+
+	return status;
+}
+
+
+//=========================================================
+// Eat - makes a monster full for a little while.
+//=========================================================
+void CBaseMonster :: Eat ( float flFullDuration )
+{
+	m_flHungryTime = gpGlobals->time + flFullDuration;
+}
+
+//=========================================================
+// FShouldEat - returns true if a monster is hungry.
+//=========================================================
+BOOL CBaseMonster :: FShouldEat ( void )
+{
+	if ( m_flHungryTime > gpGlobals->time )
+	{
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+//=========================================================
+// BarnacleVictimBitten - called
+// by Barnacle victims when the barnacle pulls their head
+// into its mouth
+//=========================================================
+void CBaseMonster :: BarnacleVictimBitten ( entvars_t *pevBarnacle )
+{
+	Schedule_t	*pNewSchedule;
+
+	pNewSchedule = GetScheduleOfType( SCHED_BARNACLE_VICTIM_CHOMP );
+
+	if ( pNewSchedule )
+	{
+		ChangeSchedule( pNewSchedule );
+	}
+}
+
+//=========================================================
+// BarnacleVictimReleased - called by barnacle victims when
+// the host barnacle is killed.
+//=========================================================
+void CBaseMonster :: BarnacleVictimReleased ( void )
+{
+	m_IdealMonsterState = MONSTERSTATE_IDLE;
+
+	pev->velocity = g_vecZero;
+	pev->movetype = MOVETYPE_STEP;
+}
+
+//=========================================================
+// Listen - monsters dig through the active sound list for
+// any sounds that may interest them. (smells, too!)
+//=========================================================
+void CBaseMonster :: Listen ( void )
+{
+	int		iSound;
+	int		iMySounds;
+	float	hearingSensitivity;
+	CSound	*pCurrentSound;
+
+	m_iAudibleList = SOUNDLIST_EMPTY; 
+	ClearConditions(bits_COND_HEAR_SOUND | bits_COND_SMELL | bits_COND_SMELL_FOOD);
+	m_afSoundTypes = 0;
+
+	iMySounds = ISoundMask();
+
+	if ( m_pSchedule )
+	{
+		//!!!WATCH THIS SPOT IF YOU ARE HAVING SOUND RELATED BUGS!
+		// Make sure your schedule AND personal sound masks agree!
+		iMySounds &= m_pSchedule->iSoundMask;
+	}
+
+	iSound = CSoundEnt::ActiveList();
+
+	// UNDONE: Clear these here?
+	ClearConditions( bits_COND_HEAR_SOUND | bits_COND_SMELL_FOOD | bits_COND_SMELL );
+	hearingSensitivity = HearingSensitivity( );
+
+	while ( iSound != SOUNDLIST_EMPTY )
+	{
+		pCurrentSound = CSoundEnt::SoundPointerForIndex( iSound );
+
+		if ( pCurrentSound	&& 
+			 ( pCurrentSound->m_iType & iMySounds )	&& 
+			 ( pCurrentSound->m_vecOrigin - EarPosition() ).Length() <= pCurrentSound->m_iVolume * hearingSensitivity )
+
+		//if ( ( g_pSoundEnt->m_SoundPool[ iSound ].m_iType & iMySounds ) && ( g_pSoundEnt->m_SoundPool[ iSound ].m_vecOrigin - EarPosition()).Length () <= g_pSoundEnt->m_SoundPool[ iSound ].m_iVolume * hearingSensitivity ) 
+		{
+ 			// the monster cares about this sound, and it's close enough to hear.
+			//g_pSoundEnt->m_SoundPool[ iSound ].m_iNextAudible = m_iAudibleList;
+			pCurrentSound->m_iNextAudible = m_iAudibleList;
+			
+			if ( pCurrentSound->FIsSound() )
+			{
+				// this is an audible sound.
+				SetConditions( bits_COND_HEAR_SOUND );
+			}
+			else
+			{
+				// if not a sound, must be a smell - determine if it's just a scent, or if it's a food scent
+//				if ( g_pSoundEnt->m_SoundPool[ iSound ].m_iType & ( bits_SOUND_MEAT | bits_SOUND_CARCASS ) )
+				if ( pCurrentSound->m_iType & ( bits_SOUND_MEAT | bits_SOUND_CARCASS ) )
+				{
+					// the detected scent is a food item, so set both conditions.
+					// !!!BUGBUG - maybe a virtual function to determine whether or not the scent is food?
+					SetConditions( bits_COND_SMELL_FOOD );
+					SetConditions( bits_COND_SMELL );
+				}
+				else
+				{
+					// just a normal scent. 
+					SetConditions( bits_COND_SMELL );
+				}
+			}
+
+//			m_afSoundTypes |= g_pSoundEnt->m_SoundPool[ iSound ].m_iType;
+			m_afSoundTypes |= pCurrentSound->m_iType;
+
+			m_iAudibleList = iSound;
+		}
+
+//		iSound = g_pSoundEnt->m_SoundPool[ iSound ].m_iNext;
+		iSound = pCurrentSound->m_iNext;
+	}
+}
+
+//=========================================================
+// FLSoundVolume - subtracts the volume of the given sound
+// from the distance the sound source is from the caller, 
+// and returns that value, which is considered to be the 'local' 
+// volume of the sound. 
+//=========================================================
+float CBaseMonster :: FLSoundVolume ( CSound *pSound )
+{
+	return ( pSound->m_iVolume - ( ( pSound->m_vecOrigin - pev->origin ).Length() ) );
+}
+
+//=========================================================
+// FValidateHintType - tells use whether or not the monster cares
+// about the type of Hint Node given
+//=========================================================
+BOOL CBaseMonster :: FValidateHintType ( short sHint )
+{
+	return FALSE;
+}
+
+//=========================================================
+// Look - Base class monster function to find enemies or 
+// food by sight. iDistance is distance ( in units ) that the 
+// monster can see.
+//
+// Sets the sight bits of the m_afConditions mask to indicate
+// which types of entities were sighted.
+// Function also sets the Looker's m_pLink 
+// to the head of a link list that contains all visible ents.
+// (linked via each ent's m_pLink field)
+//
+//=========================================================
+void CBaseMonster :: Look ( int iDistance )
+{
+	int	iSighted = 0;
+
+	// DON'T let visibility information from last frame sit around!
+	ClearConditions(bits_COND_SEE_HATE | bits_COND_SEE_DISLIKE | bits_COND_SEE_ENEMY | bits_COND_SEE_FEAR | bits_COND_SEE_NEMESIS | bits_COND_SEE_CLIENT);
+
+	m_pLink = NULL;
+
+	CBaseEntity	*pSightEnt = NULL;// the current visible entity that we're dealing with
+
+	// See no evil if prisoner is set
+	if ( !FBitSet( pev->spawnflags, SF_MONSTER_PRISONER ) )
+	{
+		CBaseEntity *pList[100];
+
+		Vector delta = Vector( iDistance, iDistance, iDistance );
+
+		// Find only monsters/clients in box, NOT limited to PVS
+		int count = UTIL_EntitiesInBox( pList, 100, pev->origin - delta, pev->origin + delta, FL_CLIENT|FL_MONSTER );
+		for ( int i = 0; i < count; i++ )
+		{
+			pSightEnt = pList[i];
+			// !!!temporarily only considering other monsters and clients, don't see prisoners
+			if ( pSightEnt != this												&& 
+				 !FBitSet( pSightEnt->pev->spawnflags, SF_MONSTER_PRISONER )	&& 
+				 pSightEnt->pev->health > 0 )
+			{
+				// the looker will want to consider this entity
+				// don't check anything else about an entity that can't be seen, or an entity that you don't care about.
+				if ( IRelationship( pSightEnt ) != R_NO && FInViewCone( pSightEnt ) && !FBitSet( pSightEnt->pev->flags, FL_NOTARGET ) && FVisible( pSightEnt ) )
+				{
+					if ( pSightEnt->IsPlayer() )
+					{
+						if ( pev->spawnflags & SF_MONSTER_WAIT_TILL_SEEN )
+						{
+							CBaseMonster *pClient;
+
+							pClient = pSightEnt->MyMonsterPointer();
+							// don't link this client in the list if the monster is wait till seen and the player isn't facing the monster
+							if ( pSightEnt && !pClient->FInViewCone( this ) )
+							{
+								// we're not in the player's view cone. 
+								continue;
+							}
+							else
+							{
+								// player sees us, become normal now.
+								pev->spawnflags &= ~SF_MONSTER_WAIT_TILL_SEEN;
+							}
+						}
+
+						// if we see a client, remember that (mostly for scripted AI)
+						iSighted |= bits_COND_SEE_CLIENT;
+					}
+
+					pSightEnt->m_pLink = m_pLink;
+					m_pLink = pSightEnt;
+
+					if ( pSightEnt == m_hEnemy )
+					{
+						// we know this ent is visible, so if it also happens to be our enemy, store that now.
+						iSighted |= bits_COND_SEE_ENEMY;
+					}
+
+					// don't add the Enemy's relationship to the conditions. We only want to worry about conditions when
+					// we see monsters other than the Enemy.
+					switch ( IRelationship ( pSightEnt ) )
+					{
+					case	R_NM:
+						iSighted |= bits_COND_SEE_NEMESIS;		
+						break;
+					case	R_HT:		
+						iSighted |= bits_COND_SEE_HATE;		
+						break;
+					case	R_DL:
+						iSighted |= bits_COND_SEE_DISLIKE;
+						break;
+					case	R_FR:
+						iSighted |= bits_COND_SEE_FEAR;
+						break;
+					case    R_AL:
+						break;
+					default:
+						ALERT ( at_aiconsole, "%s can't assess %s\n", STRING(pev->classname), STRING(pSightEnt->pev->classname ) );
+						break;
+					}
+				}
+			}
+		}
+	}
+	
+	SetConditions( iSighted );
+}
+
+//=========================================================
+// ISoundMask - returns a bit mask indicating which types
+// of sounds this monster regards. In the base class implementation,
+// monsters care about all sounds, but no scents.
+//=========================================================
+int CBaseMonster :: ISoundMask ( void )
+{
+	return	bits_SOUND_WORLD	|
+			bits_SOUND_COMBAT	|
+			bits_SOUND_PLAYER;
+}
+
+//=========================================================
+// PBestSound - returns a pointer to the sound the monster 
+// should react to. Right now responds only to nearest sound.
+//=========================================================
+CSound* CBaseMonster :: PBestSound ( void )
+{	
+	int iThisSound; 
+	int	iBestSound = -1;
+	float flBestDist = 8192;// so first nearby sound will become best so far.
+	float flDist;
+	CSound *pSound;
+
+	iThisSound = m_iAudibleList; 
+
+	if ( iThisSound == SOUNDLIST_EMPTY )
+	{
+		ALERT ( at_aiconsole, "ERROR! monster %s has no audible sounds!\n", STRING(pev->classname) );
+#if _DEBUG
+		ALERT( at_error, "NULL Return from PBestSound\n" );
+#endif
+		return NULL;
+	}
+
+	while ( iThisSound != SOUNDLIST_EMPTY )
+	{
+		pSound = CSoundEnt::SoundPointerForIndex( iThisSound );
+
+		if ( pSound && pSound->FIsSound() )
+		{
+			flDist = ( pSound->m_vecOrigin - EarPosition()).Length();
+
+			if ( flDist < flBestDist )
+			{
+				iBestSound = iThisSound;
+				flBestDist = flDist;
+			}
+		}
+
+		iThisSound = pSound->m_iNextAudible;
+	}
+	if ( iBestSound >= 0 )
+	{
+		pSound = CSoundEnt::SoundPointerForIndex( iBestSound );
+		return pSound;
+	}
+#if _DEBUG
+	ALERT( at_error, "NULL Return from PBestSound\n" );
+#endif
+	return NULL;
+}
+
+//=========================================================
+// PBestScent - returns a pointer to the scent the monster 
+// should react to. Right now responds only to nearest scent
+//=========================================================
+CSound* CBaseMonster :: PBestScent ( void )
+{	
+	int iThisScent; 
+	int	iBestScent = -1;
+	float flBestDist = 8192;// so first nearby smell will become best so far.
+	float flDist;
+	CSound *pSound;
+
+	iThisScent = m_iAudibleList;// smells are in the sound list.
+
+	if ( iThisScent == SOUNDLIST_EMPTY )
+	{
+		ALERT ( at_aiconsole, "ERROR! PBestScent() has empty soundlist!\n" );
+#if _DEBUG
+		ALERT( at_error, "NULL Return from PBestSound\n" );
+#endif
+		return NULL;
+	}
+
+	while ( iThisScent != SOUNDLIST_EMPTY )
+	{
+		pSound = CSoundEnt::SoundPointerForIndex( iThisScent );
+
+		if ( pSound->FIsScent() )
+		{
+			flDist = ( pSound->m_vecOrigin - pev->origin ).Length();
+
+			if ( flDist < flBestDist )
+			{
+				iBestScent = iThisScent;
+				flBestDist = flDist;
+			}
+		}
+
+		iThisScent = pSound->m_iNextAudible;
+	}
+	if ( iBestScent >= 0 )
+	{
+		pSound = CSoundEnt::SoundPointerForIndex( iBestScent );
+
+		return pSound;
+	}
+#if _DEBUG
+	ALERT( at_error, "NULL Return from PBestScent\n" );
+#endif
+	return NULL;
+}
+
+
+
+//=========================================================
+// Monster Think - calls out to core AI functions and handles this
+// monster's specific animation events
+//=========================================================
+void CBaseMonster :: MonsterThink ( void )
+{
+	pev->nextthink = gpGlobals->time + 0.1;// keep monster thinking.
+
+
+	RunAI();
+
+	float flInterval = StudioFrameAdvance( ); // animate
+// start or end a fidget
+// This needs a better home -- switching animations over time should be encapsulated on a per-activity basis
+// perhaps MaintainActivity() or a ShiftAnimationOverTime() or something.
+	if ( m_MonsterState != MONSTERSTATE_SCRIPT && m_MonsterState != MONSTERSTATE_DEAD && m_Activity == ACT_IDLE && m_fSequenceFinished )
+	{
+		int iSequence;
+
+		if ( m_fSequenceLoops )
+		{
+			// animation does loop, which means we're playing subtle idle. Might need to 
+			// fidget.
+			iSequence = LookupActivity ( m_Activity );
+		}
+		else
+		{
+			// animation that just ended doesn't loop! That means we just finished a fidget
+			// and should return to our heaviest weighted idle (the subtle one)
+			iSequence = LookupActivityHeaviest ( m_Activity );
+		}
+		if ( iSequence != ACTIVITY_NOT_AVAILABLE )
+		{
+			pev->sequence = iSequence;	// Set to new anim (if it's there)
+			ResetSequenceInfo( );
+		}
+	}
+
+	DispatchAnimEvents( flInterval );
+
+	if ( !MovementIsComplete() )
+	{
+		Move( flInterval );
+	}
+#if _DEBUG	
+	else 
+	{
+		if ( !TaskIsRunning() && !TaskIsComplete() )
+			ALERT( at_error, "Schedule stalled!!\n" );
+	}
+#endif
+}
+
+//=========================================================
+// CBaseMonster - USE - will make a monster angry at whomever
+// activated it.
+//=========================================================
+void CBaseMonster :: MonsterUse ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	m_IdealMonsterState = MONSTERSTATE_ALERT;
+}
+
+//=========================================================
+// Ignore conditions - before a set of conditions is allowed
+// to interrupt a monster's schedule, this function removes
+// conditions that we have flagged to interrupt the current
+// schedule, but may not want to interrupt the schedule every
+// time. (Pain, for instance)
+//=========================================================
+int CBaseMonster :: IgnoreConditions ( void )
+{
+	int iIgnoreConditions = 0;
+
+	if ( !FShouldEat() )
+	{
+		// not hungry? Ignore food smell.
+		iIgnoreConditions |= bits_COND_SMELL_FOOD;
+	}
+
+	if ( m_MonsterState == MONSTERSTATE_SCRIPT && m_pCine )
+		iIgnoreConditions |= m_pCine->IgnoreConditions();
+
+	return iIgnoreConditions;
+}
+
+//=========================================================
+// 	RouteClear - zeroes out the monster's route array and goal
+//=========================================================
+void CBaseMonster :: RouteClear ( void )
+{
+	RouteNew();
+	m_movementGoal = MOVEGOAL_NONE;
+	m_movementActivity = ACT_IDLE;
+	Forget( bits_MEMORY_MOVE_FAILED );
+}
+
+//=========================================================
+// Route New - clears out a route to be changed, but keeps
+//				goal intact.
+//=========================================================
+void CBaseMonster :: RouteNew ( void )
+{
+	m_Route[ 0 ].iType		= 0;
+	m_iRouteIndex			= 0;
+}
+
+//=========================================================
+// FRouteClear - returns TRUE is the Route is cleared out
+// ( invalid )
+//=========================================================
+BOOL CBaseMonster :: FRouteClear ( void )
+{
+	if ( m_Route[ m_iRouteIndex ].iType == 0 || m_movementGoal == MOVEGOAL_NONE )
+		return TRUE;
+
+	return FALSE;
+}
+
+//=========================================================
+// FRefreshRoute - after calculating a path to the monster's
+// target, this function copies as many waypoints as possible
+// from that path to the monster's Route array
+//=========================================================
+BOOL CBaseMonster :: FRefreshRoute ( void )
+{
+	CBaseEntity	*pPathCorner;
+	int			i;
+	BOOL		returnCode;
+
+	RouteNew();
+
+	returnCode = FALSE;
+
+	switch( m_movementGoal )
+	{
+		case MOVEGOAL_PATHCORNER:
+			{
+				// monster is on a path_corner loop
+				pPathCorner = m_pGoalEnt;
+				i = 0;
+
+				while ( pPathCorner && i < ROUTE_SIZE )
+				{
+					m_Route[ i ].iType = bits_MF_TO_PATHCORNER;
+					m_Route[ i ].vecLocation = pPathCorner->pev->origin;
+
+					pPathCorner = pPathCorner->GetNextTarget();
+
+					// Last path_corner in list?
+					if ( !pPathCorner )
+						m_Route[i].iType |= bits_MF_IS_GOAL;
+					
+					i++;
+				}
+			}
+			returnCode = TRUE;
+			break;
+
+		case MOVEGOAL_ENEMY:
+			returnCode = BuildRoute( m_vecEnemyLKP, bits_MF_TO_ENEMY, m_hEnemy );
+			break;
+
+		case MOVEGOAL_LOCATION:
+			returnCode = BuildRoute( m_vecMoveGoal, bits_MF_TO_LOCATION, NULL );
+			break;
+
+		case MOVEGOAL_TARGETENT:
+			if (m_hTargetEnt != NULL)
+			{
+				returnCode = BuildRoute( m_hTargetEnt->pev->origin, bits_MF_TO_TARGETENT, m_hTargetEnt );
+			}
+			break;
+
+		case MOVEGOAL_NODE:
+			returnCode = FGetNodeRoute( m_vecMoveGoal );
+//			if ( returnCode )
+//				RouteSimplify( NULL );
+			break;
+	}
+
+	return returnCode;
+}
+
+
+BOOL CBaseMonster::MoveToEnemy( Activity movementAct, float waitTime )
+{
+	m_movementActivity = movementAct;
+	m_moveWaitTime = waitTime;
+	
+	m_movementGoal = MOVEGOAL_ENEMY;
+	return FRefreshRoute();
+}
+
+
+BOOL CBaseMonster::MoveToLocation( Activity movementAct, float waitTime, const Vector &goal )
+{
+	m_movementActivity = movementAct;
+	m_moveWaitTime = waitTime;
+	
+	m_movementGoal = MOVEGOAL_LOCATION;
+	m_vecMoveGoal = goal;
+	return FRefreshRoute();
+}
+
+
+BOOL CBaseMonster::MoveToTarget( Activity movementAct, float waitTime )
+{
+	m_movementActivity = movementAct;
+	m_moveWaitTime = waitTime;
+	
+	m_movementGoal = MOVEGOAL_TARGETENT;
+	return FRefreshRoute();
+}
+
+
+BOOL CBaseMonster::MoveToNode( Activity movementAct, float waitTime, const Vector &goal )
+{
+	m_movementActivity = movementAct;
+	m_moveWaitTime = waitTime;
+
+	m_movementGoal = MOVEGOAL_NODE;
+	m_vecMoveGoal = goal;
+	return FRefreshRoute();
+}
+
+
+#ifdef _DEBUG
+void DrawRoute( entvars_t *pev, WayPoint_t *m_Route, int m_iRouteIndex, int r, int g, int b )
+{
+	int			i;
+
+	if ( m_Route[m_iRouteIndex].iType == 0 )
+	{
+		ALERT( at_aiconsole, "Can't draw route!\n" );
+		return;
+	}
+
+//	UTIL_ParticleEffect ( m_Route[ m_iRouteIndex ].vecLocation, g_vecZero, 255, 25 );
+
+	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+		WRITE_BYTE( TE_BEAMPOINTS);
+		WRITE_COORD( pev->origin.x );
+		WRITE_COORD( pev->origin.y );
+		WRITE_COORD( pev->origin.z );
+		WRITE_COORD( m_Route[ m_iRouteIndex ].vecLocation.x );
+		WRITE_COORD( m_Route[ m_iRouteIndex ].vecLocation.y );
+		WRITE_COORD( m_Route[ m_iRouteIndex ].vecLocation.z );
+
+		WRITE_SHORT( g_sModelIndexLaser );
+		WRITE_BYTE( 0 ); // frame start
+		WRITE_BYTE( 10 ); // framerate
+		WRITE_BYTE( 1 ); // life
+		WRITE_BYTE( 16 );  // width
+		WRITE_BYTE( 0 );   // noise
+		WRITE_BYTE( r );   // r, g, b
+		WRITE_BYTE( g );   // r, g, b
+		WRITE_BYTE( b );   // r, g, b
+		WRITE_BYTE( 255 );	// brightness
+		WRITE_BYTE( 10 );		// speed
+	MESSAGE_END();
+
+	for ( i = m_iRouteIndex ; i < ROUTE_SIZE - 1; i++ )
+	{
+		if ( (m_Route[ i ].iType & bits_MF_IS_GOAL) || (m_Route[ i+1 ].iType == 0) )
+			break;
+
+		
+		MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+			WRITE_BYTE( TE_BEAMPOINTS );
+			WRITE_COORD( m_Route[ i ].vecLocation.x );
+			WRITE_COORD( m_Route[ i ].vecLocation.y );
+			WRITE_COORD( m_Route[ i ].vecLocation.z );
+			WRITE_COORD( m_Route[ i + 1 ].vecLocation.x );
+			WRITE_COORD( m_Route[ i + 1 ].vecLocation.y );
+			WRITE_COORD( m_Route[ i + 1 ].vecLocation.z );
+			WRITE_SHORT( g_sModelIndexLaser );
+			WRITE_BYTE( 0 ); // frame start
+			WRITE_BYTE( 10 ); // framerate
+			WRITE_BYTE( 1 ); // life
+			WRITE_BYTE( 8 );  // width
+			WRITE_BYTE( 0 );   // noise
+			WRITE_BYTE( r );   // r, g, b
+			WRITE_BYTE( g );   // r, g, b
+			WRITE_BYTE( b );   // r, g, b
+			WRITE_BYTE( 255 );	// brightness
+			WRITE_BYTE( 10 );		// speed
+		MESSAGE_END();
+
+//		UTIL_ParticleEffect ( m_Route[ i ].vecLocation, g_vecZero, 255, 25 );
+	}
+}
+#endif
+
+
+int ShouldSimplify( int routeType )
+{
+	routeType &= ~bits_MF_IS_GOAL;
+
+	if ( (routeType == bits_MF_TO_PATHCORNER) || (routeType & bits_MF_DONT_SIMPLIFY) )
+		return FALSE;
+	return TRUE;
+}
+
+//=========================================================
+// RouteSimplify
+//
+// Attempts to make the route more direct by cutting out
+// unnecessary nodes & cutting corners.
+//
+//=========================================================
+void CBaseMonster :: RouteSimplify( CBaseEntity *pTargetEnt )
+{
+	// BUGBUG: this doesn't work 100% yet
+	int			i, count, outCount;
+	Vector		vecStart;
+	WayPoint_t	outRoute[ ROUTE_SIZE * 2 ];	// Any points except the ends can turn into 2 points in the simplified route
+
+	count = 0;
+
+	for ( i = m_iRouteIndex; i < ROUTE_SIZE; i++ )
+	{
+		if ( !m_Route[i].iType )
+			break;
+		else
+			count++;
+		if ( m_Route[i].iType & bits_MF_IS_GOAL )
+			break;
+	}
+	// Can't simplify a direct route!
+	if ( count < 2 )
+	{
+//		DrawRoute( pev, m_Route, m_iRouteIndex, 0, 0, 255 );
+		return;
+	}
+
+	outCount = 0;
+	vecStart = pev->origin;
+	for ( i = 0; i < count-1; i++ )
+	{
+		// Don't eliminate path_corners
+		if ( !ShouldSimplify( m_Route[m_iRouteIndex+i].iType ) )
+		{
+			outRoute[outCount] = m_Route[ m_iRouteIndex + i ];
+			outCount++;
+		}
+		else if ( CheckLocalMove ( vecStart, m_Route[m_iRouteIndex+i+1].vecLocation, pTargetEnt, NULL ) == LOCALMOVE_VALID )
+		{
+			// Skip vert
+			continue;
+		}
+		else
+		{
+			Vector vecTest, vecSplit;
+
+			// Halfway between this and next
+			vecTest = (m_Route[m_iRouteIndex+i+1].vecLocation + m_Route[m_iRouteIndex+i].vecLocation) * 0.5;
+
+			// Halfway between this and previous
+			vecSplit = (m_Route[m_iRouteIndex+i].vecLocation + vecStart) * 0.5;
+
+			int iType = (m_Route[m_iRouteIndex+i].iType | bits_MF_TO_DETOUR) & ~bits_MF_NOT_TO_MASK;
+			if ( CheckLocalMove ( vecStart, vecTest, pTargetEnt, NULL ) == LOCALMOVE_VALID )
+			{
+				outRoute[outCount].iType = iType;
+				outRoute[outCount].vecLocation = vecTest;
+			}
+			else if ( CheckLocalMove ( vecSplit, vecTest, pTargetEnt, NULL ) == LOCALMOVE_VALID )
+			{
+				outRoute[outCount].iType = iType;
+				outRoute[outCount].vecLocation = vecSplit;
+				outRoute[outCount+1].iType = iType;
+				outRoute[outCount+1].vecLocation = vecTest;
+				outCount++; // Adding an extra point
+			}
+			else
+			{
+				outRoute[outCount] = m_Route[ m_iRouteIndex + i ];
+			}
+		}
+		// Get last point
+		vecStart = outRoute[ outCount ].vecLocation;
+		outCount++;
+	}
+	ASSERT( i < count );
+	outRoute[outCount] = m_Route[ m_iRouteIndex + i ];
+	outCount++;
+	
+	// Terminate
+	outRoute[outCount].iType = 0;
+	ASSERT( outCount < (ROUTE_SIZE*2) );
+
+// Copy the simplified route, disable for testing
+	m_iRouteIndex = 0;
+	for ( i = 0; i < ROUTE_SIZE && i < outCount; i++ )
+	{
+		m_Route[i] = outRoute[i];
+	}
+
+	// Terminate route
+	if ( i < ROUTE_SIZE )
+		m_Route[i].iType = 0;
+
+// Debug, test movement code
+#if 0
+//	if ( CVAR_GET_FLOAT( "simplify" ) != 0 )
+		DrawRoute( pev, outRoute, 0, 255, 0, 0 );
+//	else
+		DrawRoute( pev, m_Route, m_iRouteIndex, 0, 255, 0 );
+#endif
+}
+
+//=========================================================
+// FBecomeProne - tries to send a monster into PRONE state.
+// right now only used when a barnacle snatches someone, so 
+// may have some special case stuff for that.
+//=========================================================
+BOOL CBaseMonster :: FBecomeProne ( void )
+{
+	if ( FBitSet ( pev->flags, FL_ONGROUND ) )
+	{
+		pev->flags -= FL_ONGROUND;
+	}
+
+	m_IdealMonsterState = MONSTERSTATE_PRONE;
+	return TRUE;
+}
+
+//=========================================================
+// CheckRangeAttack1
+//=========================================================
+BOOL CBaseMonster :: CheckRangeAttack1 ( float flDot, float flDist )
+{
+	if ( flDist > 64 && flDist <= 784 && flDot >= 0.5 )
+	{
+		return TRUE;
+	}
+	return FALSE;
+}
+
+//=========================================================
+// CheckRangeAttack2
+//=========================================================
+BOOL CBaseMonster :: CheckRangeAttack2 ( float flDot, float flDist )
+{
+	if ( flDist > 64 && flDist <= 512 && flDot >= 0.5 )
+	{
+		return TRUE;
+	}
+	return FALSE;
+}
+
+//=========================================================
+// CheckMeleeAttack1
+//=========================================================
+BOOL CBaseMonster :: CheckMeleeAttack1 ( float flDot, float flDist )
+{
+	// Decent fix to keep folks from kicking/punching hornets and snarks is to check the onground flag(sjb)
+	if ( flDist <= 64 && flDot >= 0.7 && m_hEnemy != NULL && FBitSet ( m_hEnemy->pev->flags, FL_ONGROUND ) )
+	{
+		return TRUE;
+	}
+	return FALSE;
+}
+
+//=========================================================
+// CheckMeleeAttack2
+//=========================================================
+BOOL CBaseMonster :: CheckMeleeAttack2 ( float flDot, float flDist )
+{
+	if ( flDist <= 64 && flDot >= 0.7 )
+	{
+		return TRUE;
+	}
+	return FALSE;
+}
+
+//=========================================================
+// CheckAttacks - sets all of the bits for attacks that the
+// monster is capable of carrying out on the passed entity.
+//=========================================================
+void CBaseMonster :: CheckAttacks ( CBaseEntity *pTarget, float flDist )
+{
+	Vector2D	vec2LOS;
+	float		flDot;
+
+	UTIL_MakeVectors ( pev->angles );
+
+	vec2LOS = ( pTarget->pev->origin - pev->origin ).Make2D();
+	vec2LOS = vec2LOS.Normalize();
+
+	flDot = DotProduct (vec2LOS , gpGlobals->v_forward.Make2D() );
+
+	// we know the enemy is in front now. We'll find which attacks the monster is capable of by
+	// checking for corresponding Activities in the model file, then do the simple checks to validate
+	// those attack types.
+	
+	// Clear all attack conditions
+	ClearConditions( bits_COND_CAN_RANGE_ATTACK1 | bits_COND_CAN_RANGE_ATTACK2 | bits_COND_CAN_MELEE_ATTACK1 |bits_COND_CAN_MELEE_ATTACK2 );
+
+	if ( m_afCapability & bits_CAP_RANGE_ATTACK1 )
+	{
+		if ( CheckRangeAttack1 ( flDot, flDist ) )
+			SetConditions( bits_COND_CAN_RANGE_ATTACK1 );
+	}
+	if ( m_afCapability & bits_CAP_RANGE_ATTACK2 )
+	{
+		if ( CheckRangeAttack2 ( flDot, flDist ) )
+			SetConditions( bits_COND_CAN_RANGE_ATTACK2 );
+	}
+	if ( m_afCapability & bits_CAP_MELEE_ATTACK1 )
+	{
+		if ( CheckMeleeAttack1 ( flDot, flDist ) )
+			SetConditions( bits_COND_CAN_MELEE_ATTACK1 );
+	}
+	if ( m_afCapability & bits_CAP_MELEE_ATTACK2 )
+	{
+		if ( CheckMeleeAttack2 ( flDot, flDist ) )
+			SetConditions( bits_COND_CAN_MELEE_ATTACK2 );
+	}
+}
+
+//=========================================================
+// CanCheckAttacks - prequalifies a monster to do more fine
+// checking of potential attacks. 
+//=========================================================
+BOOL CBaseMonster :: FCanCheckAttacks ( void )
+{
+	if ( HasConditions(bits_COND_SEE_ENEMY) && !HasConditions( bits_COND_ENEMY_TOOFAR ) )
+	{
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+//=========================================================
+// CheckEnemy - part of the Condition collection process,
+// gets and stores data and conditions pertaining to a monster's
+// enemy. Returns TRUE if Enemy LKP was updated.
+//=========================================================
+int CBaseMonster :: CheckEnemy ( CBaseEntity *pEnemy )
+{
+	float	flDistToEnemy;
+	int		iUpdatedLKP;// set this to TRUE if you update the EnemyLKP in this function.
+
+	iUpdatedLKP = FALSE;
+	ClearConditions ( bits_COND_ENEMY_FACING_ME );
+	
+	if ( !FVisible( pEnemy ) )
+	{
+		ASSERT(!HasConditions(bits_COND_SEE_ENEMY));
+		SetConditions( bits_COND_ENEMY_OCCLUDED );
+	}
+	else
+		ClearConditions( bits_COND_ENEMY_OCCLUDED );
+
+	if ( !pEnemy->IsAlive() )
+	{
+		SetConditions ( bits_COND_ENEMY_DEAD );
+		ClearConditions( bits_COND_SEE_ENEMY | bits_COND_ENEMY_OCCLUDED );
+		return FALSE;
+	}
+
+	Vector vecEnemyPos = pEnemy->pev->origin;
+	// distance to enemy's origin
+	flDistToEnemy = ( vecEnemyPos - pev->origin ).Length();
+	vecEnemyPos.z += pEnemy->pev->size.z * 0.5;
+	// distance to enemy's head
+	float flDistToEnemy2 = (vecEnemyPos - pev->origin).Length();
+	if (flDistToEnemy2 < flDistToEnemy)
+		flDistToEnemy = flDistToEnemy2;
+	else
+	{
+		// distance to enemy's feet
+		vecEnemyPos.z -= pEnemy->pev->size.z;
+		float flDistToEnemy2 = (vecEnemyPos - pev->origin).Length();
+		if (flDistToEnemy2 < flDistToEnemy)
+			flDistToEnemy = flDistToEnemy2;
+	}
+
+	if ( HasConditions( bits_COND_SEE_ENEMY ) )
+	{
+		CBaseMonster *pEnemyMonster;
+
+		iUpdatedLKP = TRUE;
+		m_vecEnemyLKP = pEnemy->pev->origin;
+
+		pEnemyMonster = pEnemy->MyMonsterPointer();
+
+		if ( pEnemyMonster )
+		{
+			if ( pEnemyMonster->FInViewCone ( this ) )
+			{
+				SetConditions ( bits_COND_ENEMY_FACING_ME );
+			}
+			else
+				ClearConditions( bits_COND_ENEMY_FACING_ME );
+		}
+
+		if (pEnemy->pev->velocity != Vector( 0, 0, 0))
+		{
+			// trail the enemy a bit
+			m_vecEnemyLKP = m_vecEnemyLKP - pEnemy->pev->velocity * RANDOM_FLOAT( -0.05, 0 );
+		}
+		else
+		{
+			// UNDONE: use pev->oldorigin?
+		}
+	}
+	else if ( !HasConditions(bits_COND_ENEMY_OCCLUDED|bits_COND_SEE_ENEMY) && ( flDistToEnemy <= 256 ) )
+	{
+		// if the enemy is not occluded, and unseen, that means it is behind or beside the monster.
+		// if the enemy is near enough the monster, we go ahead and let the monster know where the
+		// enemy is. 
+		iUpdatedLKP = TRUE;
+		m_vecEnemyLKP = pEnemy->pev->origin;
+	}
+
+	if ( flDistToEnemy >= m_flDistTooFar )
+	{
+		// enemy is very far away from monster
+		SetConditions( bits_COND_ENEMY_TOOFAR );
+	}
+	else
+		ClearConditions( bits_COND_ENEMY_TOOFAR );
+
+	if ( FCanCheckAttacks() )	
+	{
+		CheckAttacks ( m_hEnemy, flDistToEnemy );
+	}
+
+	if ( m_movementGoal == MOVEGOAL_ENEMY )
+	{
+		for ( int i = m_iRouteIndex; i < ROUTE_SIZE; i++ )
+		{
+			if ( m_Route[ i ].iType == (bits_MF_IS_GOAL|bits_MF_TO_ENEMY) )
+			{
+				// UNDONE: Should we allow monsters to override this distance (80?)
+				if ( (m_Route[ i ].vecLocation - m_vecEnemyLKP).Length() > 80 )
+				{
+					// Refresh
+					FRefreshRoute();
+					return iUpdatedLKP;
+				}
+			}
+		}
+	}
+
+	return iUpdatedLKP;
+}
+
+//=========================================================
+// PushEnemy - remember the last few enemies, always remember the player
+//=========================================================
+void CBaseMonster :: PushEnemy( CBaseEntity *pEnemy, Vector &vecLastKnownPos )
+{
+	int i;
+
+	if (pEnemy == NULL)
+		return;
+
+	// UNDONE: blah, this is bad, we should use a stack but I'm too lazy to code one.
+	for (i = 0; i < MAX_OLD_ENEMIES; i++)
+	{
+		if (m_hOldEnemy[i] == pEnemy)
+			return;
+		if (m_hOldEnemy[i] == NULL) // someone died, reuse their slot
+			break;
+	}
+	if (i >= MAX_OLD_ENEMIES)
+		return;
+
+	m_hOldEnemy[i] = pEnemy;
+	m_vecOldEnemy[i] = vecLastKnownPos;
+}
+
+//=========================================================
+// PopEnemy - try remembering the last few enemies
+//=========================================================
+BOOL CBaseMonster :: PopEnemy( )
+{
+	// UNDONE: blah, this is bad, we should use a stack but I'm too lazy to code one.
+	for (int i = MAX_OLD_ENEMIES - 1; i >= 0; i--)
+	{
+		if (m_hOldEnemy[i] != NULL)
+		{
+			if (m_hOldEnemy[i]->IsAlive( )) // cheat and know when they die
+			{
+				m_hEnemy = m_hOldEnemy[i];
+				m_vecEnemyLKP = m_vecOldEnemy[i];
+				// ALERT( at_console, "remembering\n");
+				return TRUE;
+			}
+			else
+			{
+				m_hOldEnemy[i] = NULL;
+			}
+		}
+	}
+	return FALSE;
+}
+
+//=========================================================
+// SetActivity 
+//=========================================================
+void CBaseMonster :: SetActivity ( Activity NewActivity )
+{
+	int	iSequence;
+
+	iSequence = LookupActivity ( NewActivity );
+
+	// Set to the desired anim, or default anim if the desired is not present
+	if ( iSequence > ACTIVITY_NOT_AVAILABLE )
+	{
+		if ( pev->sequence != iSequence || !m_fSequenceLoops )
+		{
+			// don't reset frame between walk and run
+			if ( !(m_Activity == ACT_WALK || m_Activity == ACT_RUN) || !(NewActivity == ACT_WALK || NewActivity == ACT_RUN))
+				pev->frame = 0;
+		}
+
+		pev->sequence		= iSequence;	// Set to the reset anim (if it's there)
+		ResetSequenceInfo( );
+		SetYawSpeed();
+	}
+	else
+	{
+		// Not available try to get default anim
+		ALERT ( at_aiconsole, "%s has no sequence for act:%d\n", STRING(pev->classname), NewActivity );
+		pev->sequence		= 0;	// Set to the reset anim (if it's there)
+	}
+
+	m_Activity = NewActivity; // Go ahead and set this so it doesn't keep trying when the anim is not present
+	
+	// In case someone calls this with something other than the ideal activity
+	m_IdealActivity = m_Activity;
+
+
+}
+
+//=========================================================
+// SetSequenceByName
+//=========================================================
+void CBaseMonster :: SetSequenceByName ( char *szSequence )
+{
+	int	iSequence;
+
+	iSequence = LookupSequence ( szSequence );
+
+	// Set to the desired anim, or default anim if the desired is not present
+	if ( iSequence > ACTIVITY_NOT_AVAILABLE )
+	{
+		if ( pev->sequence != iSequence || !m_fSequenceLoops )
+		{
+			pev->frame = 0;
+		}
+
+		pev->sequence		= iSequence;	// Set to the reset anim (if it's there)
+		ResetSequenceInfo( );
+		SetYawSpeed();
+	}
+	else
+	{
+		// Not available try to get default anim
+		ALERT ( at_aiconsole, "%s has no sequence named:%f\n", STRING(pev->classname), szSequence );
+		pev->sequence		= 0;	// Set to the reset anim (if it's there)
+	}
+}
+
+//=========================================================
+// CheckLocalMove - returns TRUE if the caller can walk a 
+// straight line from its current origin to the given 
+// location. If so, don't use the node graph!
+//
+// if a valid pointer to a int is passed, the function
+// will fill that int with the distance that the check 
+// reached before hitting something. THIS ONLY HAPPENS
+// IF THE LOCAL MOVE CHECK FAILS!
+//
+// !!!PERFORMANCE - should we try to load balance this?
+// DON"T USE SETORIGIN! 
+//=========================================================
+#define	LOCAL_STEP_SIZE	16
+int CBaseMonster :: CheckLocalMove ( const Vector &vecStart, const Vector &vecEnd, CBaseEntity *pTarget, float *pflDist )
+{
+	Vector	vecStartPos;// record monster's position before trying the move
+	float	flYaw;
+	float	flDist;
+	float	flStep, stepSize;
+	int		iReturn;
+
+	vecStartPos = pev->origin;
+	
+	
+	flYaw = UTIL_VecToYaw ( vecEnd - vecStart );// build a yaw that points to the goal.
+	flDist = ( vecEnd - vecStart ).Length2D();// get the distance.
+	iReturn = LOCALMOVE_VALID;// assume everything will be ok.
+
+	// move the monster to the start of the local move that's to be checked.
+	UTIL_SetOrigin( pev, vecStart );// !!!BUGBUG - won't this fire triggers? - nope, SetOrigin doesn't fire
+
+	if ( !(pev->flags & (FL_FLY|FL_SWIM)) )
+	{
+		DROP_TO_FLOOR( ENT( pev ) );//make sure monster is on the floor!
+	}
+
+	//pev->origin.z = vecStartPos.z;//!!!HACKHACK
+
+//	pev->origin = vecStart;
+
+/*
+	if ( flDist > 1024 )
+	{
+		// !!!PERFORMANCE - this operation may be too CPU intensive to try checks this large.
+		// We don't lose much here, because a distance this great is very likely
+		// to have something in the way.
+
+		// since we've actually moved the monster during the check, undo the move.
+		pev->origin = vecStartPos;
+		return FALSE;
+	}
+*/
+	// this loop takes single steps to the goal.
+	for ( flStep = 0 ; flStep < flDist ; flStep += LOCAL_STEP_SIZE )
+	{
+		stepSize = LOCAL_STEP_SIZE;
+
+		if ( (flStep + LOCAL_STEP_SIZE) >= (flDist-1) )
+			stepSize = (flDist - flStep) - 1;
+		
+//		UTIL_ParticleEffect ( pev->origin, g_vecZero, 255, 25 );
+
+		if ( !WALK_MOVE( ENT(pev), flYaw, stepSize, WALKMOVE_CHECKONLY ) )
+		{// can't take the next step, fail!
+
+			if ( pflDist != NULL )
+			{
+				*pflDist = flStep;
+			}
+			if ( pTarget && pTarget->edict() == gpGlobals->trace_ent )
+			{
+				// if this step hits target ent, the move is legal.
+				iReturn = LOCALMOVE_VALID;
+				break;
+			}
+			else
+			{
+				// If we're going toward an entity, and we're almost getting there, it's OK.
+//				if ( pTarget && fabs( flDist - iStep ) < LOCAL_STEP_SIZE )
+//					fReturn = TRUE;
+//				else
+				iReturn = LOCALMOVE_INVALID;
+				break;
+			}
+
+		}
+	}
+
+	if ( iReturn == LOCALMOVE_VALID && 	!(pev->flags & (FL_FLY|FL_SWIM) ) && (!pTarget || (pTarget->pev->flags & FL_ONGROUND)) )
+	{
+		// The monster can move to a spot UNDER the target, but not to it. Don't try to triangulate, go directly to the node graph.
+		// UNDONE: Magic # 64 -- this used to be pev->size.z but that won't work for small creatures like the headcrab
+		if ( fabs(vecEnd.z - pev->origin.z) > 64 )
+		{
+			iReturn = LOCALMOVE_INVALID_DONT_TRIANGULATE;
+		}
+	}
+	/*
+	// uncommenting this block will draw a line representing the nearest legal move.
+	WRITE_BYTE(MSG_BROADCAST, SVC_TEMPENTITY);
+	WRITE_BYTE(MSG_BROADCAST, TE_SHOWLINE);
+	WRITE_COORD(MSG_BROADCAST, pev->origin.x);
+	WRITE_COORD(MSG_BROADCAST, pev->origin.y);
+	WRITE_COORD(MSG_BROADCAST, pev->origin.z);
+	WRITE_COORD(MSG_BROADCAST, vecStart.x);
+	WRITE_COORD(MSG_BROADCAST, vecStart.y);
+	WRITE_COORD(MSG_BROADCAST, vecStart.z);
+	*/
+
+	// since we've actually moved the monster during the check, undo the move.
+	UTIL_SetOrigin( pev, vecStartPos );
+
+	return iReturn;
+}
+
+
+float CBaseMonster :: OpenDoorAndWait( entvars_t *pevDoor )
+{
+	float flTravelTime = 0;
+
+	//ALERT(at_aiconsole, "A door. ");
+	CBaseEntity *pcbeDoor = CBaseEntity::Instance(pevDoor);
+	if (pcbeDoor && !pcbeDoor->IsLockedByMaster())
+	{
+		//ALERT(at_aiconsole, "unlocked! ");
+		pcbeDoor->Use(this, this, USE_ON, 0.0);
+		//ALERT(at_aiconsole, "pevDoor->nextthink = %d ms\n", (int)(1000*pevDoor->nextthink));
+		//ALERT(at_aiconsole, "pevDoor->ltime = %d ms\n", (int)(1000*pevDoor->ltime));
+		//ALERT(at_aiconsole, "pev-> nextthink = %d ms\n", (int)(1000*pev->nextthink));
+		//ALERT(at_aiconsole, "pev->ltime = %d ms\n", (int)(1000*pev->ltime));
+		flTravelTime = pevDoor->nextthink - pevDoor->ltime;
+		//ALERT(at_aiconsole, "Waiting %d ms\n", (int)(1000*flTravelTime));
+		if ( pcbeDoor->pev->targetname )
+		{
+			edict_t *pentTarget = NULL;
+			for (;;)
+			{
+				pentTarget = FIND_ENTITY_BY_TARGETNAME( pentTarget, STRING(pcbeDoor->pev->targetname));
+
+				if ( VARS( pentTarget ) != pcbeDoor->pev )
+				{
+					if (FNullEnt(pentTarget))
+						break;
+
+					if ( FClassnameIs ( pentTarget, STRING(pcbeDoor->pev->classname) ) )
+					{
+						CBaseEntity *pDoor = Instance(pentTarget);
+						if ( pDoor )
+							pDoor->Use(this, this, USE_ON, 0.0);
+					}
+				}
+			}
+		}
+	}
+
+	return gpGlobals->time + flTravelTime;
+}
+
+
+//=========================================================
+// AdvanceRoute - poorly named function that advances the 
+// m_iRouteIndex. If it goes beyond ROUTE_SIZE, the route 
+// is refreshed. 
+//=========================================================
+void CBaseMonster :: AdvanceRoute ( float distance )
+{
+
+	if ( m_iRouteIndex == ROUTE_SIZE - 1 )
+	{
+		// time to refresh the route.
+		if ( !FRefreshRoute() )
+		{
+			ALERT ( at_aiconsole, "Can't Refresh Route!!\n" );
+		}
+	}
+	else
+	{
+		if ( ! (m_Route[ m_iRouteIndex ].iType & bits_MF_IS_GOAL) )
+		{
+			// If we've just passed a path_corner, advance m_pGoalEnt
+			if ( (m_Route[ m_iRouteIndex ].iType & ~bits_MF_NOT_TO_MASK) == bits_MF_TO_PATHCORNER )
+				m_pGoalEnt = m_pGoalEnt->GetNextTarget();
+
+			// IF both waypoints are nodes, then check for a link for a door and operate it.
+			//
+			if (  (m_Route[m_iRouteIndex].iType   & bits_MF_TO_NODE) == bits_MF_TO_NODE
+			   && (m_Route[m_iRouteIndex+1].iType & bits_MF_TO_NODE) == bits_MF_TO_NODE)
+			{
+				//ALERT(at_aiconsole, "SVD: Two nodes. ");
+
+				int iSrcNode  = WorldGraph.FindNearestNode(m_Route[m_iRouteIndex].vecLocation, this );
+				int iDestNode = WorldGraph.FindNearestNode(m_Route[m_iRouteIndex+1].vecLocation, this );
+
+				int iLink;
+				WorldGraph.HashSearch(iSrcNode, iDestNode, iLink);
+
+				if ( iLink >= 0 && WorldGraph.m_pLinkPool[iLink].m_pLinkEnt != NULL )
+				{
+					//ALERT(at_aiconsole, "A link. ");
+					if ( WorldGraph.HandleLinkEnt ( iSrcNode, WorldGraph.m_pLinkPool[iLink].m_pLinkEnt, m_afCapability, CGraph::NODEGRAPH_DYNAMIC ) )
+					{
+						//ALERT(at_aiconsole, "usable.");
+						entvars_t *pevDoor = WorldGraph.m_pLinkPool[iLink].m_pLinkEnt;
+						if (pevDoor)
+						{
+							m_flMoveWaitFinished = OpenDoorAndWait( pevDoor );
+//							ALERT( at_aiconsole, "Wating for door %.2f\n", m_flMoveWaitFinished-gpGlobals->time );
+						}
+					}
+				}
+				//ALERT(at_aiconsole, "\n");
+			}
+			m_iRouteIndex++;
+		}
+		else	// At goal!!!
+		{
+			if ( distance < m_flGroundSpeed * 0.2 /* FIX */ )
+			{
+				MovementComplete();
+			}
+		}
+	}
+}
+
+
+int CBaseMonster :: RouteClassify( int iMoveFlag )
+{
+	int movementGoal;
+
+	movementGoal = MOVEGOAL_NONE;
+
+	if ( iMoveFlag & bits_MF_TO_TARGETENT )
+		movementGoal = MOVEGOAL_TARGETENT;
+	else if ( iMoveFlag & bits_MF_TO_ENEMY )
+		movementGoal = MOVEGOAL_ENEMY;
+	else if ( iMoveFlag & bits_MF_TO_PATHCORNER )
+		movementGoal = MOVEGOAL_PATHCORNER;
+	else if ( iMoveFlag & bits_MF_TO_NODE )
+		movementGoal = MOVEGOAL_NODE;
+	else if ( iMoveFlag & bits_MF_TO_LOCATION )
+		movementGoal = MOVEGOAL_LOCATION;
+
+	return movementGoal;
+}
+
+//=========================================================
+// BuildRoute
+//=========================================================
+BOOL CBaseMonster :: BuildRoute ( const Vector &vecGoal, int iMoveFlag, CBaseEntity *pTarget )
+{
+	float	flDist;
+	Vector	vecApex;
+	int		iLocalMove;
+
+	RouteNew();
+	m_movementGoal = RouteClassify( iMoveFlag );
+
+// so we don't end up with no moveflags
+	m_Route[ 0 ].vecLocation = vecGoal;
+	m_Route[ 0 ].iType = iMoveFlag | bits_MF_IS_GOAL;
+
+// check simple local move
+	iLocalMove = CheckLocalMove( pev->origin, vecGoal, pTarget, &flDist );
+
+	if ( iLocalMove == LOCALMOVE_VALID )
+	{
+		// monster can walk straight there!
+		return TRUE;
+	}
+// try to triangulate around any obstacles.
+	else if ( iLocalMove != LOCALMOVE_INVALID_DONT_TRIANGULATE && FTriangulate( pev->origin, vecGoal, flDist, pTarget, &vecApex ) )
+	{
+		// there is a slightly more complicated path that allows the monster to reach vecGoal
+		m_Route[ 0 ].vecLocation = vecApex;
+		m_Route[ 0 ].iType = (iMoveFlag | bits_MF_TO_DETOUR);
+
+		m_Route[ 1 ].vecLocation = vecGoal;
+		m_Route[ 1 ].iType = iMoveFlag | bits_MF_IS_GOAL;
+
+			/*
+			WRITE_BYTE(MSG_BROADCAST, SVC_TEMPENTITY);
+			WRITE_BYTE(MSG_BROADCAST, TE_SHOWLINE);
+			WRITE_COORD(MSG_BROADCAST, vecApex.x );
+			WRITE_COORD(MSG_BROADCAST, vecApex.y );
+			WRITE_COORD(MSG_BROADCAST, vecApex.z );
+			WRITE_COORD(MSG_BROADCAST, vecApex.x );
+			WRITE_COORD(MSG_BROADCAST, vecApex.y );
+			WRITE_COORD(MSG_BROADCAST, vecApex.z + 128 );
+			*/
+
+		RouteSimplify( pTarget );
+		return TRUE;
+	}
+
+// last ditch, try nodes
+	if ( FGetNodeRoute( vecGoal ) )
+	{
+//		ALERT ( at_console, "Can get there on nodes\n" );
+		m_vecMoveGoal = vecGoal;
+		RouteSimplify( pTarget );
+		return TRUE;
+	}
+
+	// b0rk
+	return FALSE;
+}
+
+
+//=========================================================
+// InsertWaypoint - Rebuilds the existing route so that the
+// supplied vector and moveflags are the first waypoint in
+// the route, and fills the rest of the route with as much
+// of the pre-existing route as possible
+//=========================================================
+void CBaseMonster :: InsertWaypoint ( Vector vecLocation, int afMoveFlags )
+{
+	int			i, type;
+
+	
+	// we have to save some Index and Type information from the real
+	// path_corner or node waypoint that the monster was trying to reach. This makes sure that data necessary 
+	// to refresh the original path exists even in the new waypoints that don't correspond directy to a path_corner
+	// or node. 
+	type = afMoveFlags | (m_Route[ m_iRouteIndex ].iType & ~bits_MF_NOT_TO_MASK);
+
+	for ( i = ROUTE_SIZE-1; i > 0; i-- )
+		m_Route[i] = m_Route[i-1];
+
+	m_Route[ m_iRouteIndex ].vecLocation = vecLocation;
+	m_Route[ m_iRouteIndex ].iType = type;
+}
+
+//=========================================================
+// FTriangulate - tries to overcome local obstacles by 
+// triangulating a path around them.
+//
+// iApexDist is how far the obstruction that we are trying
+// to triangulate around is from the monster.
+//=========================================================
+BOOL CBaseMonster :: FTriangulate ( const Vector &vecStart , const Vector &vecEnd, float flDist, CBaseEntity *pTargetEnt, Vector *pApex )
+{
+	Vector		vecDir;
+	Vector		vecForward;
+	Vector		vecLeft;// the spot we'll try to triangulate to on the left
+	Vector		vecRight;// the spot we'll try to triangulate to on the right
+	Vector		vecTop;// the spot we'll try to triangulate to on the top
+	Vector		vecBottom;// the spot we'll try to triangulate to on the bottom
+	Vector		vecFarSide;// the spot that we'll move to after hitting the triangulated point, before moving on to our normal goal.
+	int			i;
+	float		sizeX, sizeZ;
+
+	// If the hull width is less than 24, use 24 because CheckLocalMove uses a min of
+	// 24.
+	sizeX = pev->size.x;
+	if (sizeX < 24.0)
+		sizeX = 24.0;
+	else if (sizeX > 48.0)
+		sizeX = 48.0;
+	sizeZ = pev->size.z;
+	//if (sizeZ < 24.0)
+	//	sizeZ = 24.0;
+
+	vecForward = ( vecEnd - vecStart ).Normalize();
+
+	Vector vecDirUp(0,0,1);
+	vecDir = CrossProduct ( vecForward, vecDirUp);
+
+	// start checking right about where the object is, picking two equidistant starting points, one on
+	// the left, one on the right. As we progress through the loop, we'll push these away from the obstacle, 
+	// hoping to find a way around on either side. pev->size.x is added to the ApexDist in order to help select
+	// an apex point that insures that the monster is sufficiently past the obstacle before trying to turn back
+	// onto its original course.
+
+	vecLeft = pev->origin + ( vecForward * ( flDist + sizeX ) ) - vecDir * ( sizeX * 3 );
+	vecRight = pev->origin + ( vecForward * ( flDist + sizeX ) ) + vecDir * ( sizeX * 3 );
+	if (pev->movetype == MOVETYPE_FLY)
+	{
+		vecTop = pev->origin + (vecForward * flDist) + (vecDirUp * sizeZ * 3);
+		vecBottom = pev->origin + (vecForward * flDist) - (vecDirUp *  sizeZ * 3);
+	}
+
+	vecFarSide = m_Route[ m_iRouteIndex ].vecLocation;
+	
+	vecDir = vecDir * sizeX * 2;
+	if (pev->movetype == MOVETYPE_FLY)
+		vecDirUp = vecDirUp * sizeZ * 2;
+
+	for ( i = 0 ; i < 8; i++ )
+	{
+// Debug, Draw the triangulation
+#if 0
+		MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+			WRITE_BYTE( TE_SHOWLINE);
+			WRITE_COORD( pev->origin.x );
+			WRITE_COORD( pev->origin.y );
+			WRITE_COORD( pev->origin.z );
+			WRITE_COORD( vecRight.x );
+			WRITE_COORD( vecRight.y );
+			WRITE_COORD( vecRight.z );
+		MESSAGE_END();
+
+		MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+			WRITE_BYTE( TE_SHOWLINE );
+			WRITE_COORD( pev->origin.x );
+			WRITE_COORD( pev->origin.y );
+			WRITE_COORD( pev->origin.z );
+			WRITE_COORD( vecLeft.x );
+			WRITE_COORD( vecLeft.y );
+			WRITE_COORD( vecLeft.z );
+		MESSAGE_END();
+#endif
+
+#if 0
+		if (pev->movetype == MOVETYPE_FLY)
+		{
+			MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+				WRITE_BYTE( TE_SHOWLINE );
+				WRITE_COORD( pev->origin.x );
+				WRITE_COORD( pev->origin.y );
+				WRITE_COORD( pev->origin.z );
+				WRITE_COORD( vecTop.x );
+				WRITE_COORD( vecTop.y );
+				WRITE_COORD( vecTop.z );
+			MESSAGE_END();
+
+			MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+				WRITE_BYTE( TE_SHOWLINE );
+				WRITE_COORD( pev->origin.x );
+				WRITE_COORD( pev->origin.y );
+				WRITE_COORD( pev->origin.z );
+				WRITE_COORD( vecBottom.x );
+				WRITE_COORD( vecBottom.y );
+				WRITE_COORD( vecBottom.z );
+			MESSAGE_END();
+		}
+#endif
+
+		if ( CheckLocalMove( pev->origin, vecRight, pTargetEnt, NULL ) == LOCALMOVE_VALID )
+		{
+			if ( CheckLocalMove ( vecRight, vecFarSide, pTargetEnt, NULL ) == LOCALMOVE_VALID )
+			{
+				if ( pApex )
+				{
+					*pApex = vecRight;
+				}
+
+				return TRUE;
+			}
+		}
+		if ( CheckLocalMove( pev->origin, vecLeft, pTargetEnt, NULL ) == LOCALMOVE_VALID )
+		{
+			if ( CheckLocalMove ( vecLeft, vecFarSide, pTargetEnt, NULL ) == LOCALMOVE_VALID )
+			{
+				if ( pApex )
+				{
+					*pApex = vecLeft;
+				}
+
+				return TRUE;
+			}
+		}
+
+		if (pev->movetype == MOVETYPE_FLY)
+		{
+			if ( CheckLocalMove( pev->origin, vecTop, pTargetEnt, NULL ) == LOCALMOVE_VALID)
+			{
+				if ( CheckLocalMove ( vecTop, vecFarSide, pTargetEnt, NULL ) == LOCALMOVE_VALID )
+				{
+					if ( pApex )
+					{
+						*pApex = vecTop;
+						//ALERT(at_aiconsole, "triangulate over\n");
+					}
+
+					return TRUE;
+				}
+			}
+#if 1
+			if ( CheckLocalMove( pev->origin, vecBottom, pTargetEnt, NULL ) == LOCALMOVE_VALID )
+			{
+				if ( CheckLocalMove ( vecBottom, vecFarSide, pTargetEnt, NULL ) == LOCALMOVE_VALID )
+				{
+					if ( pApex )
+					{
+						*pApex = vecBottom;
+						//ALERT(at_aiconsole, "triangulate under\n");
+					}
+
+					return TRUE;
+				}
+			}
+#endif
+		}
+
+		vecRight = vecRight + vecDir;
+		vecLeft = vecLeft - vecDir;
+		if (pev->movetype == MOVETYPE_FLY)
+		{
+			vecTop = vecTop + vecDirUp;
+			vecBottom = vecBottom - vecDirUp;
+		}
+	}
+
+	return FALSE;
+}
+
+//=========================================================
+// Move - take a single step towards the next ROUTE location
+//=========================================================
+#define DIST_TO_CHECK	200
+
+void CBaseMonster :: Move ( float flInterval ) 
+{
+	float		flWaypointDist;
+	float		flCheckDist;
+	float		flDist;// how far the lookahead check got before hitting an object.
+	Vector		vecDir;
+	Vector		vecApex;
+	CBaseEntity	*pTargetEnt;
+
+	// Don't move if no valid route
+	if ( FRouteClear() )
+	{
+		// If we still have a movement goal, then this is probably a route truncated by SimplifyRoute()
+		// so refresh it.
+		if ( m_movementGoal == MOVEGOAL_NONE || !FRefreshRoute() )
+		{
+			ALERT( at_aiconsole, "Tried to move with no route!\n" );
+			TaskFail();
+			return;
+		}
+	}
+	
+	if ( m_flMoveWaitFinished > gpGlobals->time )
+		return;
+
+// Debug, test movement code
+#if 0
+//	if ( CVAR_GET_FLOAT("stopmove" ) != 0 )
+	{
+		if ( m_movementGoal == MOVEGOAL_ENEMY )
+			RouteSimplify( m_hEnemy );
+		else
+			RouteSimplify( m_hTargetEnt );
+		FRefreshRoute();
+		return;
+	}
+#else
+// Debug, draw the route
+//	DrawRoute( pev, m_Route, m_iRouteIndex, 0, 200, 0 );
+#endif
+
+	// if the monster is moving directly towards an entity (enemy for instance), we'll set this pointer
+	// to that entity for the CheckLocalMove and Triangulate functions.
+	pTargetEnt = NULL;
+
+	// local move to waypoint.
+	vecDir = ( m_Route[ m_iRouteIndex ].vecLocation - pev->origin ).Normalize();
+	flWaypointDist = ( m_Route[ m_iRouteIndex ].vecLocation - pev->origin ).Length2D();
+	
+	MakeIdealYaw ( m_Route[ m_iRouteIndex ].vecLocation );
+	ChangeYaw ( pev->yaw_speed );
+
+	// if the waypoint is closer than CheckDist, CheckDist is the dist to waypoint
+	if ( flWaypointDist < DIST_TO_CHECK )
+	{
+		flCheckDist = flWaypointDist;
+	}
+	else
+	{
+		flCheckDist = DIST_TO_CHECK;
+	}
+	
+	if ( (m_Route[ m_iRouteIndex ].iType & (~bits_MF_NOT_TO_MASK)) == bits_MF_TO_ENEMY )
+	{
+		// only on a PURE move to enemy ( i.e., ONLY MF_TO_ENEMY set, not MF_TO_ENEMY and DETOUR )
+		pTargetEnt = m_hEnemy;
+	}
+	else if ( (m_Route[ m_iRouteIndex ].iType & ~bits_MF_NOT_TO_MASK) == bits_MF_TO_TARGETENT )
+	{
+		pTargetEnt = m_hTargetEnt;
+	}
+
+	// !!!BUGBUG - CheckDist should be derived from ground speed.
+	// If this fails, it should be because of some dynamic entity blocking this guy.
+	// We've already checked this path, so we should wait and time out if the entity doesn't move
+	flDist = 0;
+	if ( CheckLocalMove ( pev->origin, pev->origin + vecDir * flCheckDist, pTargetEnt, &flDist ) != LOCALMOVE_VALID )
+	{
+		CBaseEntity *pBlocker;
+
+		// Can't move, stop
+		Stop();
+		// Blocking entity is in global trace_ent
+		pBlocker = CBaseEntity::Instance( gpGlobals->trace_ent );
+		if (pBlocker)
+		{
+			DispatchBlocked( edict(), pBlocker->edict() );
+		}
+
+		if ( pBlocker && m_moveWaitTime > 0 && pBlocker->IsMoving() && !pBlocker->IsPlayer() && (gpGlobals->time-m_flMoveWaitFinished) > 3.0 )
+		{
+			// Can we still move toward our target?
+			if ( flDist < m_flGroundSpeed )
+			{
+				// No, Wait for a second
+				m_flMoveWaitFinished = gpGlobals->time + m_moveWaitTime;
+				return;
+			}
+			// Ok, still enough room to take a step
+		}
+		else 
+		{
+			// try to triangulate around whatever is in the way.
+			if ( FTriangulate( pev->origin, m_Route[ m_iRouteIndex ].vecLocation, flDist, pTargetEnt, &vecApex ) )
+			{
+				InsertWaypoint( vecApex, bits_MF_TO_DETOUR );
+				RouteSimplify( pTargetEnt );
+			}
+			else
+			{
+//				ALERT ( at_aiconsole, "Couldn't Triangulate\n" );
+				Stop();
+				// Only do this once until your route is cleared
+				if ( m_moveWaitTime > 0 && !(m_afMemory & bits_MEMORY_MOVE_FAILED) )
+				{
+					FRefreshRoute();
+					if ( FRouteClear() )
+					{
+						TaskFail();
+					}
+					else
+					{
+						// Don't get stuck
+						if ( (gpGlobals->time - m_flMoveWaitFinished) < 0.2 )
+							Remember( bits_MEMORY_MOVE_FAILED );
+
+						m_flMoveWaitFinished = gpGlobals->time + 0.1;
+					}
+				}
+				else
+				{
+					TaskFail();
+					ALERT( at_aiconsole, "%s Failed to move (%d)!\n", STRING(pev->classname), HasMemory( bits_MEMORY_MOVE_FAILED ) );
+					//ALERT( at_aiconsole, "%f, %f, %f\n", pev->origin.z, (pev->origin + (vecDir * flCheckDist)).z, m_Route[m_iRouteIndex].vecLocation.z );
+				}
+				return;
+			}
+		}
+	}
+
+	// close enough to the target, now advance to the next target. This is done before actually reaching
+	// the target so that we get a nice natural turn while moving.
+	if ( ShouldAdvanceRoute( flWaypointDist ) )///!!!BUGBUG- magic number
+	{
+		AdvanceRoute( flWaypointDist );
+	}
+
+	// Might be waiting for a door
+	if ( m_flMoveWaitFinished > gpGlobals->time )
+	{
+		Stop();
+		return;
+	}
+
+	// UNDONE: this is a hack to quit moving farther than it has looked ahead.
+	if (flCheckDist < m_flGroundSpeed * flInterval)
+	{
+		flInterval = flCheckDist / m_flGroundSpeed;
+		// ALERT( at_console, "%.02f\n", flInterval );
+	}
+	MoveExecute( pTargetEnt, vecDir, flInterval );
+
+	if ( MovementIsComplete() )
+	{
+		Stop();
+		RouteClear();
+	}
+}
+
+
+BOOL CBaseMonster:: ShouldAdvanceRoute( float flWaypointDist )
+{
+	if ( flWaypointDist <= MONSTER_CUT_CORNER_DIST )
+	{
+		// ALERT( at_console, "cut %f\n", flWaypointDist );
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+
+void CBaseMonster::MoveExecute( CBaseEntity *pTargetEnt, const Vector &vecDir, float flInterval )
+{
+//	float flYaw = UTIL_VecToYaw ( m_Route[ m_iRouteIndex ].vecLocation - pev->origin );// build a yaw that points to the goal.
+//	WALK_MOVE( ENT(pev), flYaw, m_flGroundSpeed * flInterval, WALKMOVE_NORMAL );
+	if ( m_IdealActivity != m_movementActivity )
+		m_IdealActivity = m_movementActivity;
+
+	float flTotal = m_flGroundSpeed * pev->framerate * flInterval;
+	float flStep;
+	while (flTotal > 0.001)
+	{
+		// don't walk more than 16 units or stairs stop working
+		flStep = min( 16.0, flTotal );
+		UTIL_MoveToOrigin ( ENT(pev), m_Route[ m_iRouteIndex ].vecLocation, flStep, MOVE_NORMAL );
+		flTotal -= flStep;
+	}
+	// ALERT( at_console, "dist %f\n", m_flGroundSpeed * pev->framerate * flInterval );
+}
+
+
+//=========================================================
+// MonsterInit - after a monster is spawned, it needs to 
+// be dropped into the world, checked for mobility problems,
+// and put on the proper path, if any. This function does
+// all of those things after the monster spawns. Any
+// initialization that should take place for all monsters
+// goes here.
+//=========================================================
+void CBaseMonster :: MonsterInit ( void )
+{
+	if (!g_pGameRules->FAllowMonsters())
+	{
+		pev->flags |= FL_KILLME;		// Post this because some monster code modifies class data after calling this function
+//		REMOVE_ENTITY(ENT(pev));
+		return;
+	}
+
+	// Set fields common to all monsters
+	pev->effects		= 0;
+	pev->takedamage		= DAMAGE_AIM;
+	pev->ideal_yaw		= pev->angles.y;
+	pev->max_health		= pev->health;
+	pev->deadflag		= DEAD_NO;
+	m_IdealMonsterState	= MONSTERSTATE_IDLE;// Assume monster will be idle, until proven otherwise
+
+	m_IdealActivity = ACT_IDLE;
+
+	SetBits (pev->flags, FL_MONSTER);
+	if ( pev->spawnflags & SF_MONSTER_HITMONSTERCLIP )
+		pev->flags |= FL_MONSTERCLIP;
+	
+	ClearSchedule();
+	RouteClear();
+	InitBoneControllers( ); // FIX: should be done in Spawn
+
+	m_iHintNode			= NO_NODE;
+
+	m_afMemory			= MEMORY_CLEAR;
+
+	m_hEnemy			= NULL;
+
+	m_flDistTooFar		= 1024.0;
+	m_flDistLook		= 2048.0;
+
+	// set eye position
+	SetEyePosition();
+
+	SetThink( &CBaseMonster::MonsterInitThink );
+	pev->nextthink = gpGlobals->time + 0.1;
+	SetUse ( &CBaseMonster::MonsterUse );
+}
+
+//=========================================================
+// MonsterInitThink - Calls StartMonster. Startmonster is 
+// virtual, but this function cannot be 
+//=========================================================
+void CBaseMonster :: MonsterInitThink ( void )
+{
+	StartMonster();
+}
+
+//=========================================================
+// StartMonster - final bit of initization before a monster 
+// is turned over to the AI. 
+//=========================================================
+void CBaseMonster :: StartMonster ( void )
+{
+	// update capabilities
+	if ( LookupActivity ( ACT_RANGE_ATTACK1 ) != ACTIVITY_NOT_AVAILABLE )
+	{
+		m_afCapability |= bits_CAP_RANGE_ATTACK1;
+	}
+	if ( LookupActivity ( ACT_RANGE_ATTACK2 ) != ACTIVITY_NOT_AVAILABLE )
+	{
+		m_afCapability |= bits_CAP_RANGE_ATTACK2;
+	}
+	if ( LookupActivity ( ACT_MELEE_ATTACK1 ) != ACTIVITY_NOT_AVAILABLE )
+	{
+		m_afCapability |= bits_CAP_MELEE_ATTACK1;
+	}
+	if ( LookupActivity ( ACT_MELEE_ATTACK2 ) != ACTIVITY_NOT_AVAILABLE )
+	{
+		m_afCapability |= bits_CAP_MELEE_ATTACK2;
+	}
+
+	// Raise monster off the floor one unit, then drop to floor
+	if ( pev->movetype != MOVETYPE_FLY && !FBitSet( pev->spawnflags, SF_MONSTER_FALL_TO_GROUND ) )
+	{
+		pev->origin.z += 1;
+		DROP_TO_FLOOR ( ENT(pev) );
+		// Try to move the monster to make sure it's not stuck in a brush.
+		if (!WALK_MOVE ( ENT(pev), 0, 0, WALKMOVE_NORMAL ) )
+		{
+			ALERT(at_error, "Monster %s stuck in wall--level design error", STRING(pev->classname));
+			pev->effects = EF_BRIGHTFIELD;
+		}
+	}
+	else 
+	{
+		pev->flags &= ~FL_ONGROUND;
+	}
+	
+	if ( !FStringNull(pev->target) )// this monster has a target
+	{
+		// Find the monster's initial target entity, stash it
+		m_pGoalEnt = CBaseEntity::Instance( FIND_ENTITY_BY_TARGETNAME ( NULL, STRING( pev->target ) ) );
+
+		if ( !m_pGoalEnt )
+		{
+			ALERT(at_error, "ReadyMonster()--%s couldn't find target %s", STRING(pev->classname), STRING(pev->target));
+		}
+		else
+		{
+			// Monster will start turning towards his destination
+			MakeIdealYaw ( m_pGoalEnt->pev->origin );
+
+			// JAY: How important is this error message?  Big Momma doesn't obey this rule, so I took it out.
+#if 0
+			// At this point, we expect only a path_corner as initial goal
+			if (!FClassnameIs( m_pGoalEnt->pev, "path_corner"))
+			{
+				ALERT(at_warning, "ReadyMonster--monster's initial goal '%s' is not a path_corner", STRING(pev->target));
+			}
+#endif
+
+			// set the monster up to walk a path corner path. 
+			// !!!BUGBUG - this is a minor bit of a hack.
+			// JAYJAY
+			m_movementGoal = MOVEGOAL_PATHCORNER;
+			
+			if ( pev->movetype == MOVETYPE_FLY )
+				m_movementActivity = ACT_FLY;
+			else
+				m_movementActivity = ACT_WALK;
+
+			if ( !FRefreshRoute() )
+			{
+				ALERT ( at_aiconsole, "Can't Create Route!\n" );
+			}
+			SetState( MONSTERSTATE_IDLE );
+			ChangeSchedule( GetScheduleOfType( SCHED_IDLE_WALK ) );
+		}
+	}
+	
+	//SetState ( m_IdealMonsterState );
+	//SetActivity ( m_IdealActivity );
+
+	// Delay drop to floor to make sure each door in the level has had its chance to spawn
+	// Spread think times so that they don't all happen at the same time (Carmack)
+	SetThink ( &CBaseMonster::CallMonsterThink );
+	pev->nextthink += RANDOM_FLOAT(0.1, 0.4); // spread think times.
+	
+	if ( !FStringNull(pev->targetname) )// wait until triggered
+	{
+		SetState( MONSTERSTATE_IDLE );
+		// UNDONE: Some scripted sequence monsters don't have an idle?
+		SetActivity( ACT_IDLE );
+		ChangeSchedule( GetScheduleOfType( SCHED_WAIT_TRIGGER ) );
+	}
+}
+
+
+void CBaseMonster :: MovementComplete( void ) 
+{ 
+	switch( m_iTaskStatus )
+	{
+	case TASKSTATUS_NEW:
+	case TASKSTATUS_RUNNING:
+		m_iTaskStatus = TASKSTATUS_RUNNING_TASK;
+		break;
+
+	case TASKSTATUS_RUNNING_MOVEMENT:
+		TaskComplete();
+		break;
+	
+	case TASKSTATUS_RUNNING_TASK:
+		ALERT( at_error, "Movement completed twice!\n" );
+		break;
+
+	case TASKSTATUS_COMPLETE:		
+		break;
+	}
+	m_movementGoal = MOVEGOAL_NONE;
+}
+
+
+int CBaseMonster::TaskIsRunning( void )
+{
+	if ( m_iTaskStatus != TASKSTATUS_COMPLETE && 
+		 m_iTaskStatus != TASKSTATUS_RUNNING_MOVEMENT )
+		 return 1;
+
+	return 0;
+}
+
+//=========================================================
+// IRelationship - returns an integer that describes the 
+// relationship between two types of monster.
+//=========================================================
+int CBaseMonster::IRelationship ( CBaseEntity *pTarget )
+{
+	static int iEnemy[14][14] =
+	{			 //   NONE	 MACH	 PLYR	 HPASS	 HMIL	 AMIL	 APASS	 AMONST	APREY	 APRED	 INSECT	PLRALY	PBWPN	ABWPN
+	/*NONE*/		{ R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO,	R_NO,	R_NO	},
+	/*MACHINE*/		{ R_NO	,R_NO	,R_DL	,R_DL	,R_NO	,R_DL	,R_DL	,R_DL	,R_DL	,R_DL	,R_NO	,R_DL,	R_DL,	R_DL	},
+	/*PLAYER*/		{ R_NO	,R_DL	,R_NO	,R_NO	,R_DL	,R_DL	,R_DL	,R_DL	,R_DL	,R_DL	,R_NO	,R_NO,	R_DL,	R_DL	},
+	/*HUMANPASSIVE*/{ R_NO	,R_NO	,R_AL	,R_AL	,R_HT	,R_FR	,R_NO	,R_HT	,R_DL	,R_FR	,R_NO	,R_AL,	R_NO,	R_NO	},
+	/*HUMANMILITAR*/{ R_NO	,R_NO	,R_HT	,R_DL	,R_NO	,R_HT	,R_DL	,R_DL	,R_DL	,R_DL	,R_NO	,R_HT,	R_NO,	R_NO	},
+	/*ALIENMILITAR*/{ R_NO	,R_DL	,R_HT	,R_DL	,R_HT	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_DL,	R_NO,	R_NO	},
+	/*ALIENPASSIVE*/{ R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO,	R_NO,	R_NO	},
+	/*ALIENMONSTER*/{ R_NO	,R_DL	,R_DL	,R_DL	,R_DL	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_DL,	R_NO,	R_NO	},
+	/*ALIENPREY   */{ R_NO	,R_NO	,R_DL	,R_DL	,R_DL	,R_NO	,R_NO	,R_NO	,R_NO	,R_FR	,R_NO	,R_DL,	R_NO,	R_NO	},
+	/*ALIENPREDATO*/{ R_NO	,R_NO	,R_DL	,R_DL	,R_DL	,R_NO	,R_NO	,R_NO	,R_HT	,R_DL	,R_NO	,R_DL,	R_NO,	R_NO	},
+	/*INSECT*/		{ R_FR	,R_FR	,R_FR	,R_FR	,R_FR	,R_NO	,R_FR	,R_FR	,R_FR	,R_FR	,R_NO	,R_FR,	R_NO,	R_NO	},
+	/*PLAYERALLY*/	{ R_NO	,R_DL	,R_AL	,R_AL	,R_DL	,R_DL	,R_DL	,R_DL	,R_DL	,R_DL	,R_NO	,R_NO,	R_NO,	R_NO	},
+	/*PBIOWEAPON*/	{ R_NO	,R_NO	,R_DL	,R_DL	,R_DL	,R_DL	,R_DL	,R_DL	,R_DL	,R_DL	,R_NO	,R_DL,	R_NO,	R_DL	},
+	/*ABIOWEAPON*/	{ R_NO	,R_NO	,R_DL	,R_DL	,R_DL	,R_AL	,R_NO	,R_DL	,R_DL	,R_NO	,R_NO	,R_DL,	R_DL,	R_NO	}
+	};
+
+	return iEnemy[ Classify() ][ pTarget->Classify() ];
+}
+
+//=========================================================
+// FindCover - tries to find a nearby node that will hide
+// the caller from its enemy. 
+//
+// If supplied, search will return a node at least as far
+// away as MinDist, but no farther than MaxDist. 
+// if MaxDist isn't supplied, it defaults to a reasonable 
+// value
+//=========================================================
+// UNDONE: Should this find the nearest node?
+
+//float CGraph::PathLength( int iStart, int iDest, int iHull, int afCapMask )
+
+BOOL CBaseMonster :: FindCover ( Vector vecThreat, Vector vecViewOffset, float flMinDist, float flMaxDist )
+{
+	int i;
+	int iMyHullIndex;
+	int iMyNode;
+	int iThreatNode;
+	float flDist;
+	Vector	vecLookersOffset;
+	TraceResult tr;
+
+	if ( !flMaxDist )
+	{
+		// user didn't supply a MaxDist, so work up a crazy one.
+		flMaxDist = 784;
+	}
+
+	if ( flMinDist > 0.5 * flMaxDist)
+	{
+#if _DEBUG
+		ALERT ( at_console, "FindCover MinDist (%.0f) too close to MaxDist (%.0f)\n", flMinDist, flMaxDist );
+#endif
+		flMinDist = 0.5 * flMaxDist;
+	}
+
+	if ( !WorldGraph.m_fGraphPresent || !WorldGraph.m_fGraphPointersSet )
+	{
+		ALERT ( at_aiconsole, "Graph not ready for findcover!\n" );
+		return FALSE;
+	}
+
+	iMyNode = WorldGraph.FindNearestNode( pev->origin, this );
+	iThreatNode = WorldGraph.FindNearestNode ( vecThreat, this );
+	iMyHullIndex = WorldGraph.HullIndex( this );
+
+	if ( iMyNode == NO_NODE )
+	{
+		ALERT ( at_aiconsole, "FindCover() - %s has no nearest node!\n", STRING(pev->classname));
+		return FALSE;
+	}
+	if ( iThreatNode == NO_NODE )
+	{
+		// ALERT ( at_aiconsole, "FindCover() - Threat has no nearest node!\n" );
+		iThreatNode = iMyNode;
+		// return FALSE;
+	}
+
+	vecLookersOffset = vecThreat + vecViewOffset;// calculate location of enemy's eyes
+
+	// we'll do a rough sample to find nodes that are relatively nearby
+	for ( i = 0 ; i < WorldGraph.m_cNodes ; i++ )
+	{
+		int nodeNumber = (i + WorldGraph.m_iLastCoverSearch) % WorldGraph.m_cNodes;
+
+		CNode &node = WorldGraph.Node( nodeNumber );
+		WorldGraph.m_iLastCoverSearch = nodeNumber + 1; // next monster that searches for cover node will start where we left off here.
+
+		// could use an optimization here!!
+		flDist = ( pev->origin - node.m_vecOrigin ).Length();
+
+		// DON'T do the trace check on a node that is farther away than a node that we've already found to 
+		// provide cover! Also make sure the node is within the mins/maxs of the search.
+		if ( flDist >= flMinDist && flDist < flMaxDist )
+		{
+			UTIL_TraceLine ( node.m_vecOrigin + vecViewOffset, vecLookersOffset, ignore_monsters, ignore_glass,  ENT(pev), &tr );
+
+			// if this node will block the threat's line of sight to me...
+			if ( tr.flFraction != 1.0 )
+			{
+				// ..and is also closer to me than the threat, or the same distance from myself and the threat the node is good.
+				if ( ( iMyNode == iThreatNode ) || WorldGraph.PathLength( iMyNode, nodeNumber, iMyHullIndex, m_afCapability ) <= WorldGraph.PathLength( iThreatNode, nodeNumber, iMyHullIndex, m_afCapability ) )
+				{
+					if ( FValidateCover ( node.m_vecOrigin ) && MoveToLocation( ACT_RUN, 0, node.m_vecOrigin ) )
+					{
+						/*
+						MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+							WRITE_BYTE( TE_SHOWLINE);
+							
+							WRITE_COORD( node.m_vecOrigin.x );
+							WRITE_COORD( node.m_vecOrigin.y );
+							WRITE_COORD( node.m_vecOrigin.z );
+
+							WRITE_COORD( vecLookersOffset.x );
+							WRITE_COORD( vecLookersOffset.y );
+							WRITE_COORD( vecLookersOffset.z );
+						MESSAGE_END();
+						*/
+
+						return TRUE;
+					}
+				}
+			}
+		}
+	}
+	return FALSE;
+}
+
+
+//=========================================================
+// BuildNearestRoute - tries to build a route as close to the target
+// as possible, even if there isn't a path to the final point.
+//
+// If supplied, search will return a node at least as far
+// away as MinDist from vecThreat, but no farther than MaxDist. 
+// if MaxDist isn't supplied, it defaults to a reasonable 
+// value
+//=========================================================
+BOOL CBaseMonster :: BuildNearestRoute ( Vector vecThreat, Vector vecViewOffset, float flMinDist, float flMaxDist )
+{
+	int i;
+	int iMyHullIndex;
+	int iMyNode;
+	float flDist;
+	Vector	vecLookersOffset;
+	TraceResult tr;
+
+	if ( !flMaxDist )
+	{
+		// user didn't supply a MaxDist, so work up a crazy one.
+		flMaxDist = 784;
+	}
+
+	if ( flMinDist > 0.5 * flMaxDist)
+	{
+#if _DEBUG
+		ALERT ( at_console, "FindCover MinDist (%.0f) too close to MaxDist (%.0f)\n", flMinDist, flMaxDist );
+#endif
+		flMinDist = 0.5 * flMaxDist;
+	}
+
+	if ( !WorldGraph.m_fGraphPresent || !WorldGraph.m_fGraphPointersSet )
+	{
+		ALERT ( at_aiconsole, "Graph not ready for BuildNearestRoute!\n" );
+		return FALSE;
+	}
+
+	iMyNode = WorldGraph.FindNearestNode( pev->origin, this );
+	iMyHullIndex = WorldGraph.HullIndex( this );
+
+	if ( iMyNode == NO_NODE )
+	{
+		ALERT ( at_aiconsole, "BuildNearestRoute() - %s has no nearest node!\n", STRING(pev->classname));
+		return FALSE;
+	}
+
+	vecLookersOffset = vecThreat + vecViewOffset;// calculate location of enemy's eyes
+
+	// we'll do a rough sample to find nodes that are relatively nearby
+	for ( i = 0 ; i < WorldGraph.m_cNodes ; i++ )
+	{
+		int nodeNumber = (i + WorldGraph.m_iLastCoverSearch) % WorldGraph.m_cNodes;
+
+		CNode &node = WorldGraph.Node( nodeNumber );
+		WorldGraph.m_iLastCoverSearch = nodeNumber + 1; // next monster that searches for cover node will start where we left off here.
+
+		// can I get there?
+		if (WorldGraph.NextNodeInRoute( iMyNode, nodeNumber, iMyHullIndex, 0 ) != iMyNode)
+		{
+			flDist = ( vecThreat - node.m_vecOrigin ).Length();
+
+			// is it close?
+			if ( flDist > flMinDist && flDist < flMaxDist)
+			{
+				// can I see where I want to be from there?
+				UTIL_TraceLine( node.m_vecOrigin + pev->view_ofs, vecLookersOffset, ignore_monsters, edict(), &tr );
+
+				if (tr.flFraction == 1.0)
+				{
+					// try to actually get there
+					if ( BuildRoute ( node.m_vecOrigin, bits_MF_TO_LOCATION, NULL ) )
+					{
+						flMaxDist = flDist;
+						m_vecMoveGoal = node.m_vecOrigin;
+						return TRUE; // UNDONE: keep looking for something closer!
+					}
+				}
+			}
+		}
+	}
+
+	return FALSE;
+}
+
+
+
+//=========================================================
+// BestVisibleEnemy - this functions searches the link
+// list whose head is the caller's m_pLink field, and returns
+// a pointer to the enemy entity in that list that is nearest the 
+// caller.
+//
+// !!!UNDONE - currently, this only returns the closest enemy.
+// we'll want to consider distance, relationship, attack types, back turned, etc.
+//=========================================================
+CBaseEntity *CBaseMonster :: BestVisibleEnemy ( void )
+{
+	CBaseEntity	*pReturn;
+	CBaseEntity	*pNextEnt;
+	int			iNearest;
+	int			iDist;
+	int			iBestRelationship;
+
+	iNearest = 8192;// so first visible entity will become the closest.
+	pNextEnt = m_pLink;
+	pReturn = NULL;
+	iBestRelationship = R_NO;
+
+	while ( pNextEnt != NULL )
+	{
+		if ( pNextEnt->IsAlive() )
+		{
+			if ( IRelationship( pNextEnt) > iBestRelationship )
+			{
+				// this entity is disliked MORE than the entity that we 
+				// currently think is the best visible enemy. No need to do 
+				// a distance check, just get mad at this one for now.
+				iBestRelationship = IRelationship ( pNextEnt );
+				iNearest = ( pNextEnt->pev->origin - pev->origin ).Length();
+				pReturn = pNextEnt;
+			}
+			else if ( IRelationship( pNextEnt) == iBestRelationship )
+			{
+				// this entity is disliked just as much as the entity that
+				// we currently think is the best visible enemy, so we only
+				// get mad at it if it is closer.
+				iDist = ( pNextEnt->pev->origin - pev->origin ).Length();
+				
+				if ( iDist <= iNearest )
+				{
+					iNearest = iDist;
+					iBestRelationship = IRelationship ( pNextEnt );
+					pReturn = pNextEnt;
+				}
+			}
+		}
+
+		pNextEnt = pNextEnt->m_pLink;
+	}
+
+	return pReturn;
+}
+
+
+//=========================================================
+// MakeIdealYaw - gets a yaw value for the caller that would
+// face the supplied vector. Value is stuffed into the monster's
+// ideal_yaw
+//=========================================================
+void CBaseMonster :: MakeIdealYaw( Vector vecTarget )
+{
+	Vector	vecProjection;
+	
+	// strafing monster needs to face 90 degrees away from its goal
+	if ( m_movementActivity == ACT_STRAFE_LEFT )
+	{
+		vecProjection.x = -vecTarget.y;
+		vecProjection.y = vecTarget.x;
+
+		pev->ideal_yaw = UTIL_VecToYaw( vecProjection - pev->origin );
+	}
+	else if ( m_movementActivity == ACT_STRAFE_RIGHT )
+	{
+		vecProjection.x = vecTarget.y;
+		vecProjection.y = vecTarget.x;
+
+		pev->ideal_yaw = UTIL_VecToYaw( vecProjection - pev->origin );
+	}
+	else
+	{
+		pev->ideal_yaw = UTIL_VecToYaw ( vecTarget - pev->origin );
+	}
+}
+
+//=========================================================
+// FlYawDiff - returns the difference ( in degrees ) between
+// monster's current yaw and ideal_yaw
+//
+// Positive result is left turn, negative is right turn
+//=========================================================
+float	CBaseMonster::FlYawDiff ( void )
+{
+	float	flCurrentYaw;
+
+	flCurrentYaw = UTIL_AngleMod( pev->angles.y );
+
+	if ( flCurrentYaw == pev->ideal_yaw )
+	{
+		return 0;
+	}
+
+
+	return UTIL_AngleDiff( pev->ideal_yaw, flCurrentYaw );
+}
+
+
+//=========================================================
+// Changeyaw - turns a monster towards its ideal_yaw
+//=========================================================
+float CBaseMonster::ChangeYaw ( int yawSpeed )
+{
+	float		ideal, current, move, speed;
+
+	current = UTIL_AngleMod( pev->angles.y );
+	ideal = pev->ideal_yaw;
+	if (current != ideal)
+	{
+		speed = (float)yawSpeed * gpGlobals->frametime * 10;
+		move = ideal - current;
+
+		if (ideal > current)
+		{
+			if (move >= 180)
+				move = move - 360;
+		}
+		else
+		{
+			if (move <= -180)
+				move = move + 360;
+		}
+
+		if (move > 0)
+		{// turning to the monster's left
+			if (move > speed)
+				move = speed;
+		}
+		else
+		{// turning to the monster's right
+			if (move < -speed)
+				move = -speed;
+		}
+		
+		pev->angles.y = UTIL_AngleMod (current + move);
+
+		// turn head in desired direction only if they have a turnable head
+		if (m_afCapability & bits_CAP_TURN_HEAD)
+		{
+			float yaw = pev->ideal_yaw - pev->angles.y;
+			if (yaw > 180) yaw -= 360;
+			if (yaw < -180) yaw += 360;
+			// yaw *= 0.8;
+			SetBoneController( 0, yaw );
+		}
+	}
+	else
+		move = 0;
+
+	return move;
+}
+
+//=========================================================
+// VecToYaw - turns a directional vector into a yaw value
+// that points down that vector.
+//=========================================================
+float	CBaseMonster::VecToYaw ( Vector vecDir )
+{
+	if (vecDir.x == 0 && vecDir.y == 0 && vecDir.z == 0)
+		return pev->angles.y;
+
+	return UTIL_VecToYaw( vecDir );
+}
+
+
+//=========================================================
+// SetEyePosition
+//
+// queries the monster's model for $eyeposition and copies
+// that vector to the monster's view_ofs
+//
+//=========================================================
+void CBaseMonster :: SetEyePosition ( void )
+{
+	Vector  vecEyePosition;
+	void	*pmodel = GET_MODEL_PTR( ENT(pev) );
+
+	GetEyePosition( pmodel, vecEyePosition );
+
+	pev->view_ofs = vecEyePosition;
+
+	if ( pev->view_ofs == g_vecZero )
+	{
+		ALERT ( at_aiconsole, "%s has no view_ofs!\n", STRING ( pev->classname ) );
+	}
+}
+
+void CBaseMonster :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	switch( pEvent->event )
+	{
+	case SCRIPT_EVENT_DEAD:
+		if ( m_MonsterState == MONSTERSTATE_SCRIPT )
+		{
+			pev->deadflag = DEAD_DYING;
+			// Kill me now! (and fade out when CineCleanup() is called)
+#if _DEBUG
+			ALERT( at_aiconsole, "Death event: %s\n", STRING(pev->classname) );
+#endif
+			pev->health = 0;
+		}
+#if _DEBUG
+		else
+			ALERT( at_aiconsole, "INVALID death event:%s\n", STRING(pev->classname) );
+#endif
+		break;
+	case SCRIPT_EVENT_NOT_DEAD:
+		if ( m_MonsterState == MONSTERSTATE_SCRIPT )
+		{
+			pev->deadflag = DEAD_NO;
+			// This is for life/death sequences where the player can determine whether a character is dead or alive after the script 
+			pev->health = pev->max_health;
+		}
+		break;
+
+	case SCRIPT_EVENT_SOUND:			// Play a named wave file
+		EMIT_SOUND( edict(), CHAN_BODY, pEvent->options, 1.0, ATTN_IDLE );
+		break;
+
+	case SCRIPT_EVENT_SOUND_VOICE:
+		EMIT_SOUND( edict(), CHAN_VOICE, pEvent->options, 1.0, ATTN_IDLE );
+		break;
+
+	case SCRIPT_EVENT_SENTENCE_RND1:		// Play a named sentence group 33% of the time
+		if (RANDOM_LONG(0,2) == 0)
+			break;
+		// fall through...
+	case SCRIPT_EVENT_SENTENCE:			// Play a named sentence group
+		SENTENCEG_PlayRndSz( edict(), pEvent->options, 1.0, ATTN_IDLE, 0, 100 );
+		break;
+
+	case SCRIPT_EVENT_FIREEVENT:		// Fire a trigger
+		FireTargets( pEvent->options, this, this, USE_TOGGLE, 0 );
+		break;
+
+	case SCRIPT_EVENT_NOINTERRUPT:		// Can't be interrupted from now on
+		if ( m_pCine )
+			m_pCine->AllowInterrupt( FALSE );
+		break;
+
+	case SCRIPT_EVENT_CANINTERRUPT:		// OK to interrupt now
+		if ( m_pCine )
+			m_pCine->AllowInterrupt( TRUE );
+		break;
+
+#if 0
+	case SCRIPT_EVENT_INAIR:			// Don't DROP_TO_FLOOR()
+	case SCRIPT_EVENT_ENDANIMATION:		// Set ending animation sequence to
+		break;
+#endif
+
+	case MONSTER_EVENT_BODYDROP_HEAVY:
+		if ( pev->flags & FL_ONGROUND )
+		{
+			if ( RANDOM_LONG( 0, 1 ) == 0 )
+			{
+				EMIT_SOUND_DYN( ENT(pev), CHAN_BODY, "common/bodydrop3.wav", 1, ATTN_NORM, 0, 90 );
+			}
+			else
+			{
+				EMIT_SOUND_DYN( ENT(pev), CHAN_BODY, "common/bodydrop4.wav", 1, ATTN_NORM, 0, 90 );
+			}
+		}
+		break;
+
+	case MONSTER_EVENT_BODYDROP_LIGHT:
+		if ( pev->flags & FL_ONGROUND )
+		{
+			if ( RANDOM_LONG( 0, 1 ) == 0 )
+			{
+				EMIT_SOUND( ENT(pev), CHAN_BODY, "common/bodydrop3.wav", 1, ATTN_NORM );
+			}
+			else
+			{
+				EMIT_SOUND( ENT(pev), CHAN_BODY, "common/bodydrop4.wav", 1, ATTN_NORM );
+			}
+		}
+		break;
+
+	case MONSTER_EVENT_SWISHSOUND:
+		{
+			// NO MONSTER may use this anim event unless that monster's precache precaches this sound!!!
+			EMIT_SOUND( ENT(pev), CHAN_BODY, "zombie/claw_miss2.wav", 1, ATTN_NORM );
+			break;
+		}
+
+	default:
+		ALERT( at_aiconsole, "Unhandled animation event %d for %s\n", pEvent->event, STRING(pev->classname) );
+		break;
+
+	}
+}
+
+
+// Combat
+
+Vector CBaseMonster :: GetGunPosition( )
+{
+	UTIL_MakeVectors(pev->angles);
+
+	// Vector vecSrc = pev->origin + gpGlobals->v_forward * 10;
+	//vecSrc.z = pevShooter->absmin.z + pevShooter->size.z * 0.7;
+	//vecSrc.z = pev->origin.z + (pev->view_ofs.z - 4);
+	Vector vecSrc = pev->origin 
+					+ gpGlobals->v_forward * m_HackedGunPos.y 
+					+ gpGlobals->v_right * m_HackedGunPos.x 
+					+ gpGlobals->v_up * m_HackedGunPos.z;
+
+	return vecSrc;
+}
+
+
+
+
+
+//=========================================================
+// NODE GRAPH
+//=========================================================
+
+
+
+
+
+//=========================================================
+// FGetNodeRoute - tries to build an entire node path from
+// the callers origin to the passed vector. If this is 
+// possible, ROUTE_SIZE waypoints will be copied into the
+// callers m_Route. TRUE is returned if the operation 
+// succeeds (path is valid) or FALSE if failed (no path 
+// exists )
+//=========================================================
+BOOL CBaseMonster :: FGetNodeRoute ( Vector vecDest )
+{
+	int iPath[ MAX_PATH_SIZE ];
+	int iSrcNode, iDestNode;
+	int iResult;
+	int i;
+	int iNumToCopy;
+
+	iSrcNode = WorldGraph.FindNearestNode ( pev->origin, this );
+	iDestNode = WorldGraph.FindNearestNode ( vecDest, this );
+
+	if ( iSrcNode == -1 )
+	{
+		// no node nearest self
+//		ALERT ( at_aiconsole, "FGetNodeRoute: No valid node near self!\n" );
+		return FALSE;
+	}
+	else if ( iDestNode == -1 )
+	{
+		// no node nearest target
+//		ALERT ( at_aiconsole, "FGetNodeRoute: No valid node near target!\n" );
+		return FALSE;
+	}
+
+	// valid src and dest nodes were found, so it's safe to proceed with
+	// find shortest path
+	int iNodeHull = WorldGraph.HullIndex( this ); // make this a monster virtual function
+	iResult = WorldGraph.FindShortestPath ( iPath, iSrcNode, iDestNode, iNodeHull, m_afCapability );
+
+	if ( !iResult )
+	{
+#if 1
+		ALERT ( at_aiconsole, "No Path from %d to %d!\n", iSrcNode, iDestNode );
+		return FALSE;
+#else
+		BOOL bRoutingSave = WorldGraph.m_fRoutingComplete;
+		WorldGraph.m_fRoutingComplete = FALSE;
+		iResult = WorldGraph.FindShortestPath(iPath, iSrcNode, iDestNode, iNodeHull, m_afCapability);
+		WorldGraph.m_fRoutingComplete = bRoutingSave;
+		if ( !iResult )
+		{
+			ALERT ( at_aiconsole, "No Path from %d to %d!\n", iSrcNode, iDestNode );
+			return FALSE;
+		}
+		else
+		{
+			ALERT ( at_aiconsole, "Routing is inconsistent!" );
+		}
+#endif
+	}
+
+	// there's a valid path within iPath now, so now we will fill the route array
+	// up with as many of the waypoints as it will hold.
+	
+	// don't copy ROUTE_SIZE entries if the path returned is shorter
+	// than ROUTE_SIZE!!!
+	if ( iResult < ROUTE_SIZE )
+	{
+		iNumToCopy = iResult;
+	}
+	else
+	{
+		iNumToCopy = ROUTE_SIZE;
+	}
+	
+	for ( i = 0 ; i < iNumToCopy; i++ )
+	{
+		m_Route[ i ].vecLocation = WorldGraph.m_pNodes[ iPath[ i ] ].m_vecOrigin;
+		m_Route[ i ].iType = bits_MF_TO_NODE;
+	}
+	
+	if ( iNumToCopy < ROUTE_SIZE )
+	{
+		m_Route[ iNumToCopy ].vecLocation = vecDest;
+		m_Route[ iNumToCopy ].iType |= bits_MF_IS_GOAL;
+	}
+
+	return TRUE;
+}
+
+//=========================================================
+// FindHintNode
+//=========================================================
+int CBaseMonster :: FindHintNode ( void )
+{
+	int i;
+	TraceResult tr;
+
+	if ( !WorldGraph.m_fGraphPresent )
+	{
+		ALERT ( at_aiconsole, "find_hintnode: graph not ready!\n" );
+		return NO_NODE;
+	}
+
+	if ( WorldGraph.m_iLastActiveIdleSearch >= WorldGraph.m_cNodes )
+	{
+		WorldGraph.m_iLastActiveIdleSearch = 0;
+	}
+
+	for ( i = 0; i < WorldGraph.m_cNodes ; i++ )
+	{
+		int nodeNumber = (i + WorldGraph.m_iLastActiveIdleSearch) % WorldGraph.m_cNodes;
+		CNode &node = WorldGraph.Node( nodeNumber );
+
+		if ( node.m_sHintType )
+		{
+			// this node has a hint. Take it if it is visible, the monster likes it, and the monster has an animation to match the hint's activity.
+			if ( FValidateHintType ( node.m_sHintType ) )
+			{
+				if ( !node.m_sHintActivity || LookupActivity ( node.m_sHintActivity ) != ACTIVITY_NOT_AVAILABLE )
+				{
+					UTIL_TraceLine ( pev->origin + pev->view_ofs, node.m_vecOrigin + pev->view_ofs, ignore_monsters, ENT(pev), &tr );
+
+					if ( tr.flFraction == 1.0 )
+					{
+						WorldGraph.m_iLastActiveIdleSearch = nodeNumber + 1; // next monster that searches for hint nodes will start where we left off.
+						return nodeNumber;// take it!
+					}
+				}
+			}
+		}
+	}
+
+	WorldGraph.m_iLastActiveIdleSearch = 0;// start at the top of the list for the next search.
+
+	return NO_NODE;
+}
+			
+
+void CBaseMonster::ReportAIState( void )
+{
+	ALERT_TYPE level = at_console;
+
+	static const char *pStateNames[] = { "None", "Idle", "Combat", "Alert", "Hunt", "Prone", "Scripted", "Dead" };
+
+	ALERT( level, "%s: ", STRING(pev->classname) );
+	if ( (int)m_MonsterState < ARRAYSIZE(pStateNames) )
+		ALERT( level, "State: %s, ", pStateNames[m_MonsterState] );
+	int i = 0;
+	while ( activity_map[i].type != 0 )
+	{
+		if ( activity_map[i].type == (int)m_Activity )
+		{
+			ALERT( level, "Activity %s, ", activity_map[i].name );
+			break;
+		}
+		i++;
+	}
+
+	if ( m_pSchedule )
+	{
+		const char *pName = NULL;
+		pName = m_pSchedule->pName;
+		if ( !pName )
+			pName = "Unknown";
+		ALERT( level, "Schedule %s, ", pName );
+		Task_t *pTask = GetTask();
+		if ( pTask )
+			ALERT( level, "Task %d (#%d), ", pTask->iTask, m_iScheduleIndex );
+	}
+	else
+		ALERT( level, "No Schedule, " );
+
+	if ( m_hEnemy != NULL )
+		ALERT( level, "\nEnemy is %s", STRING(m_hEnemy->pev->classname) );
+	else
+		ALERT( level, "No enemy" );
+
+	if ( IsMoving() )
+	{
+		ALERT( level, " Moving " );
+		if ( m_flMoveWaitFinished > gpGlobals->time )
+			ALERT( level, ": Stopped for %.2f. ", m_flMoveWaitFinished - gpGlobals->time );
+		else if ( m_IdealActivity == GetStoppedActivity() )
+			ALERT( level, ": In stopped anim. " );
+	}
+
+	CSquadMonster *pSquadMonster = MySquadMonsterPointer();
+
+	if ( pSquadMonster )
+	{
+		if ( !pSquadMonster->InSquad() )
+		{
+			ALERT ( level, "not " );
+		}
+
+		ALERT ( level, "In Squad, " );
+
+		if ( !pSquadMonster->IsLeader() )
+		{
+			ALERT ( level, "not " );
+		}
+
+		ALERT ( level, "Leader." );
+	}
+
+	ALERT( level, "\n" );
+	ALERT( level, "Yaw speed:%3.1f,Health: %3.1f\n", pev->yaw_speed, pev->health );
+	if ( pev->spawnflags & SF_MONSTER_PRISONER )
+		ALERT( level, " PRISONER! " );
+	if ( pev->spawnflags & SF_MONSTER_PREDISASTER )
+		ALERT( level, " Pre-Disaster! " );
+	ALERT( level, "\n" );
+}
+
+//=========================================================
+// KeyValue
+//
+// !!! netname entvar field is used in squadmonster for groupname!!!
+//=========================================================
+void CBaseMonster :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "TriggerTarget"))
+	{
+		m_iszTriggerTarget = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "TriggerCondition") )
+	{
+		m_iTriggerCondition = atoi( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else
+	{
+		CBaseToggle::KeyValue( pkvd );
+	}
+}
+
+//=========================================================
+// FCheckAITrigger - checks the monster's AI Trigger Conditions,
+// if there is a condition, then checks to see if condition is 
+// met. If yes, the monster's TriggerTarget is fired.
+//
+// Returns TRUE if the target is fired.
+//=========================================================
+BOOL CBaseMonster :: FCheckAITrigger ( void )
+{
+	BOOL fFireTarget;
+
+	if ( m_iTriggerCondition == AITRIGGER_NONE )
+	{
+		// no conditions, so this trigger is never fired.
+		return FALSE; 
+	}
+
+	fFireTarget = FALSE;
+
+	switch ( m_iTriggerCondition )
+	{
+	case AITRIGGER_SEEPLAYER_ANGRY_AT_PLAYER:
+		if ( m_hEnemy != NULL && m_hEnemy->IsPlayer() && HasConditions ( bits_COND_SEE_ENEMY ) )
+		{
+			fFireTarget = TRUE;
+		}
+		break;
+	case AITRIGGER_SEEPLAYER_UNCONDITIONAL:
+		if ( HasConditions ( bits_COND_SEE_CLIENT ) )
+		{
+			fFireTarget = TRUE;
+		}
+		break;
+	case AITRIGGER_SEEPLAYER_NOT_IN_COMBAT:
+		if ( HasConditions ( bits_COND_SEE_CLIENT ) && 
+			 m_MonsterState != MONSTERSTATE_COMBAT	&& 
+			 m_MonsterState != MONSTERSTATE_PRONE	&& 
+			 m_MonsterState != MONSTERSTATE_SCRIPT)
+		{
+			fFireTarget = TRUE;
+		}
+		break;
+	case AITRIGGER_TAKEDAMAGE:
+		if ( m_afConditions & ( bits_COND_LIGHT_DAMAGE | bits_COND_HEAVY_DAMAGE ) )
+		{
+			fFireTarget = TRUE;
+		}
+		break;
+	case AITRIGGER_DEATH:
+		if ( pev->deadflag != DEAD_NO )
+		{
+			fFireTarget = TRUE;
+		}
+		break;
+	case AITRIGGER_HALFHEALTH:
+		if ( IsAlive() && pev->health <= ( pev->max_health / 2 ) )
+		{
+			fFireTarget = TRUE;
+		}
+		break;
+/*
+
+  // !!!UNDONE - no persistant game state that allows us to track these two. 
+
+	case AITRIGGER_SQUADMEMBERDIE:
+		break;
+	case AITRIGGER_SQUADLEADERDIE:
+		break;
+*/
+	case AITRIGGER_HEARWORLD:
+		if ( m_afConditions & bits_COND_HEAR_SOUND && m_afSoundTypes & bits_SOUND_WORLD )
+		{
+			fFireTarget = TRUE;
+		}
+		break;
+	case AITRIGGER_HEARPLAYER:
+		if ( m_afConditions & bits_COND_HEAR_SOUND && m_afSoundTypes & bits_SOUND_PLAYER )
+		{
+			fFireTarget = TRUE;
+		}
+		break;
+	case AITRIGGER_HEARCOMBAT:
+		if ( m_afConditions & bits_COND_HEAR_SOUND && m_afSoundTypes & bits_SOUND_COMBAT )
+		{
+			fFireTarget = TRUE;
+		}
+		break;
+	}
+
+	if ( fFireTarget )
+	{
+		// fire the target, then set the trigger conditions to NONE so we don't fire again
+		ALERT ( at_aiconsole, "AI Trigger Fire Target\n" );
+		FireTargets( STRING( m_iszTriggerTarget ), this, this, USE_TOGGLE, 0 );
+		m_iTriggerCondition = AITRIGGER_NONE;
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+//=========================================================	
+// CanPlaySequence - determines whether or not the monster
+// can play the scripted sequence or AI sequence that is 
+// trying to possess it. If DisregardState is set, the monster
+// will be sucked into the script no matter what state it is
+// in. ONLY Scripted AI ents should allow this.
+//=========================================================	
+int CBaseMonster :: CanPlaySequence( BOOL fDisregardMonsterState, int interruptLevel )
+{
+	if ( m_pCine || !IsAlive() || m_MonsterState == MONSTERSTATE_PRONE )
+	{
+		// monster is already running a scripted sequence or dead!
+		return FALSE;
+	}
+	
+	if ( fDisregardMonsterState )
+	{
+		// ok to go, no matter what the monster state. (scripted AI)
+		return TRUE;
+	}
+
+	if ( m_MonsterState == MONSTERSTATE_NONE || m_MonsterState == MONSTERSTATE_IDLE || m_IdealMonsterState == MONSTERSTATE_IDLE )
+	{
+		// ok to go, but only in these states
+		return TRUE;
+	}
+	
+	if ( m_MonsterState == MONSTERSTATE_ALERT && interruptLevel >= SS_INTERRUPT_BY_NAME )
+		return TRUE;
+
+	// unknown situation
+	return FALSE;
+}
+
+
+//=========================================================
+// FindLateralCover - attempts to locate a spot in the world
+// directly to the left or right of the caller that will
+// conceal them from view of pSightEnt
+//=========================================================
+#define	COVER_CHECKS	5// how many checks are made
+#define COVER_DELTA		48// distance between checks
+
+BOOL CBaseMonster :: FindLateralCover ( const Vector &vecThreat, const Vector &vecViewOffset )
+{
+	TraceResult	tr;
+	Vector	vecBestOnLeft;
+	Vector	vecBestOnRight;
+	Vector	vecLeftTest;
+	Vector	vecRightTest;
+	Vector	vecStepRight;
+	int		i;
+
+	UTIL_MakeVectors ( pev->angles );
+	vecStepRight = gpGlobals->v_right * COVER_DELTA;
+	vecStepRight.z = 0; 
+	
+	vecLeftTest = vecRightTest = pev->origin;
+
+	for ( i = 0 ; i < COVER_CHECKS ; i++ )
+	{
+		vecLeftTest = vecLeftTest - vecStepRight;
+		vecRightTest = vecRightTest + vecStepRight;
+
+		// it's faster to check the SightEnt's visibility to the potential spot than to check the local move, so we do that first.
+		UTIL_TraceLine( vecThreat + vecViewOffset, vecLeftTest + pev->view_ofs, ignore_monsters, ignore_glass, ENT(pev)/*pentIgnore*/, &tr);
+		
+		if (tr.flFraction != 1.0)
+		{
+			if ( FValidateCover ( vecLeftTest ) && CheckLocalMove( pev->origin, vecLeftTest, NULL, NULL ) == LOCALMOVE_VALID )
+			{
+				if ( MoveToLocation( ACT_RUN, 0, vecLeftTest ) )
+				{
+					return TRUE;
+				}
+			}
+		}
+		
+		// it's faster to check the SightEnt's visibility to the potential spot than to check the local move, so we do that first.
+		UTIL_TraceLine(vecThreat + vecViewOffset, vecRightTest + pev->view_ofs, ignore_monsters, ignore_glass, ENT(pev)/*pentIgnore*/, &tr);
+		
+		if ( tr.flFraction != 1.0 )
+		{
+			if (  FValidateCover ( vecRightTest ) && CheckLocalMove( pev->origin, vecRightTest, NULL, NULL ) == LOCALMOVE_VALID )
+			{
+				if ( MoveToLocation( ACT_RUN, 0, vecRightTest ) )
+				{
+					return TRUE;
+				}
+			}
+		}
+	}
+
+	return FALSE;
+}
+
+
+Vector CBaseMonster :: ShootAtEnemy( const Vector &shootOrigin )
+{
+	CBaseEntity *pEnemy = m_hEnemy;
+
+	if ( pEnemy )
+	{
+		return ( (pEnemy->BodyTarget( shootOrigin ) - pEnemy->pev->origin) + m_vecEnemyLKP - shootOrigin ).Normalize();
+	}
+	else
+		return gpGlobals->v_forward;
+}
+
+
+
+//=========================================================
+// FacingIdeal - tells us if a monster is facing its ideal
+// yaw. Created this function because many spots in the 
+// code were checking the yawdiff against this magic
+// number. Nicer to have it in one place if we're gonna
+// be stuck with it.
+//=========================================================
+BOOL CBaseMonster :: FacingIdeal( void )
+{
+	if ( fabs( FlYawDiff() ) <= 0.006 )//!!!BUGBUG - no magic numbers!!!
+	{
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+//=========================================================
+// FCanActiveIdle
+//=========================================================
+BOOL CBaseMonster :: FCanActiveIdle ( void )
+{
+	/*
+	if ( m_MonsterState == MONSTERSTATE_IDLE && m_IdealMonsterState == MONSTERSTATE_IDLE && !IsMoving() )
+	{
+		return TRUE;
+	}
+	*/
+	return FALSE;
+}
+
+
+void CBaseMonster::PlaySentence( const char *pszSentence, float duration, float volume, float attenuation )
+{
+	if ( pszSentence && IsAlive() )
+	{
+		if ( pszSentence[0] == '!' )
+			EMIT_SOUND_DYN( edict(), CHAN_VOICE, pszSentence, volume, attenuation, 0, PITCH_NORM );
+		else
+			SENTENCEG_PlayRndSz( edict(), pszSentence, volume, attenuation, 0, PITCH_NORM );
+	}
+}
+
+
+void CBaseMonster::PlayScriptedSentence( const char *pszSentence, float duration, float volume, float attenuation, BOOL bConcurrent, CBaseEntity *pListener )
+{ 
+	PlaySentence( pszSentence, duration, volume, attenuation );
+}
+
+
+void CBaseMonster::SentenceStop( void )
+{
+	EMIT_SOUND( edict(), CHAN_VOICE, "common/null.wav", 1.0, ATTN_IDLE );
+}
+
+
+void CBaseMonster::CorpseFallThink( void )
+{
+	if ( pev->flags & FL_ONGROUND )
+	{
+		SetThink ( NULL );
+
+		SetSequenceBox( );
+		UTIL_SetOrigin( pev, pev->origin );// link into world.
+	}
+	else
+		pev->nextthink = gpGlobals->time + 0.1;
+}
+
+// Call after animation/pose is set up
+void CBaseMonster :: MonsterInitDead( void )
+{
+	InitBoneControllers();
+
+	pev->solid			= SOLID_BBOX;
+	pev->movetype		= MOVETYPE_TOSS;// so he'll fall to ground
+
+	pev->frame = 0;
+	ResetSequenceInfo( );
+	pev->framerate = 0;
+	
+	// Copy health
+	pev->max_health		= pev->health;
+	pev->deadflag		= DEAD_DEAD;
+	
+	UTIL_SetSize(pev, g_vecZero, g_vecZero );
+	UTIL_SetOrigin( pev, pev->origin );
+
+	// Setup health counters, etc.
+	BecomeDead();
+	SetThink( &CBaseMonster::CorpseFallThink );
+	pev->nextthink = gpGlobals->time + 0.5;
+}
+
+//=========================================================
+// BBoxIsFlat - check to see if the monster's bounding box
+// is lying flat on a surface (traces from all four corners
+// are same length.)
+//=========================================================
+BOOL CBaseMonster :: BBoxFlat ( void )
+{
+	TraceResult	tr;
+	Vector		vecPoint;
+	float		flXSize, flYSize;
+	float		flLength;
+	float		flLength2;
+
+	flXSize = pev->size.x / 2;
+	flYSize = pev->size.y / 2;
+
+	vecPoint.x = pev->origin.x + flXSize;
+	vecPoint.y = pev->origin.y + flYSize;
+	vecPoint.z = pev->origin.z;
+
+	UTIL_TraceLine ( vecPoint, vecPoint - Vector ( 0, 0, 100 ), ignore_monsters, ENT(pev), &tr );
+	flLength = (vecPoint - tr.vecEndPos).Length();
+
+	vecPoint.x = pev->origin.x - flXSize;
+	vecPoint.y = pev->origin.y - flYSize;
+
+	UTIL_TraceLine ( vecPoint, vecPoint - Vector ( 0, 0, 100 ), ignore_monsters, ENT(pev), &tr );
+	flLength2 = (vecPoint - tr.vecEndPos).Length();
+	if ( flLength2 > flLength )
+	{
+		return FALSE;
+	}
+	flLength = flLength2;
+
+	vecPoint.x = pev->origin.x - flXSize;
+	vecPoint.y = pev->origin.y + flYSize;
+	UTIL_TraceLine ( vecPoint, vecPoint - Vector ( 0, 0, 100 ), ignore_monsters, ENT(pev), &tr );
+	flLength2 = (vecPoint - tr.vecEndPos).Length();
+	if ( flLength2 > flLength )
+	{
+		return FALSE;
+	}
+	flLength = flLength2;
+
+	vecPoint.x = pev->origin.x + flXSize;
+	vecPoint.y = pev->origin.y - flYSize;
+	UTIL_TraceLine ( vecPoint, vecPoint - Vector ( 0, 0, 100 ), ignore_monsters, ENT(pev), &tr );
+	flLength2 = (vecPoint - tr.vecEndPos).Length();
+	if ( flLength2 > flLength )
+	{
+		return FALSE;
+	}
+	flLength = flLength2;
+
+	return TRUE;
+}
+
+//=========================================================
+// Get Enemy - tries to find the best suitable enemy for the monster.
+//=========================================================
+BOOL CBaseMonster :: GetEnemy ( void )
+{
+	CBaseEntity *pNewEnemy;
+
+	if ( HasConditions(bits_COND_SEE_HATE | bits_COND_SEE_DISLIKE | bits_COND_SEE_NEMESIS) )
+	{
+		pNewEnemy = BestVisibleEnemy();
+
+		if ( pNewEnemy != m_hEnemy && pNewEnemy != NULL)
+		{
+			// DO NOT mess with the monster's m_hEnemy pointer unless the schedule the monster is currently running will be interrupted
+			// by COND_NEW_ENEMY. This will eliminate the problem of monsters getting a new enemy while they are in a schedule that doesn't care,
+			// and then not realizing it by the time they get to a schedule that does. I don't feel this is a good permanent fix. 
+
+			if ( m_pSchedule )
+			{
+				if ( m_pSchedule->iInterruptMask & bits_COND_NEW_ENEMY )
+				{
+					PushEnemy( m_hEnemy, m_vecEnemyLKP );
+					SetConditions(bits_COND_NEW_ENEMY);
+					m_hEnemy = pNewEnemy;
+					m_vecEnemyLKP = m_hEnemy->pev->origin;
+				}
+				// if the new enemy has an owner, take that one as well
+				if (pNewEnemy->pev->owner != NULL)
+				{
+					CBaseEntity *pOwner = GetMonsterPointer( pNewEnemy->pev->owner );
+					if ( pOwner && (pOwner->pev->flags & FL_MONSTER) && IRelationship( pOwner ) != R_NO )
+						PushEnemy( pOwner, m_vecEnemyLKP );
+				}
+			}
+		}
+	}
+
+	// remember old enemies
+	if (m_hEnemy == NULL && PopEnemy( ))
+	{
+		if ( m_pSchedule )
+		{
+			if ( m_pSchedule->iInterruptMask & bits_COND_NEW_ENEMY )
+			{
+				SetConditions(bits_COND_NEW_ENEMY);
+			}
+		}
+	}
+
+	if ( m_hEnemy != NULL )
+	{
+		// monster has an enemy.
+		return TRUE;
+	}
+
+	return FALSE;// monster has no enemy
+}
+
+
+//=========================================================
+// DropItem - dead monster drops named item 
+//=========================================================
+CBaseEntity* CBaseMonster :: DropItem ( char *pszItemName, const Vector &vecPos, const Vector &vecAng )
+{
+	if ( !pszItemName )
+	{
+		ALERT ( at_console, "DropItem() - No item name!\n" );
+		return NULL;
+	}
+
+	CBaseEntity *pItem = CBaseEntity::Create( pszItemName, vecPos, vecAng, edict() );
+
+	if ( pItem )
+	{
+		// do we want this behavior to be default?! (sjb)
+		pItem->pev->velocity = pev->velocity;
+		pItem->pev->avelocity = Vector ( (float)0, (float)RANDOM_FLOAT( 0, 100 ), (float)0 );
+		return pItem;
+	}
+	else
+	{
+		ALERT ( at_console, "DropItem() - Didn't create!\n" );
+		return FALSE;
+	}
+
+}
+
+
+BOOL CBaseMonster :: ShouldFadeOnDeath( void )
+{
+	// if flagged to fade out or I have an owner (I came from a monster spawner)
+	if ( (pev->spawnflags & SF_MONSTER_FADECORPSE) || !FNullEnt( pev->owner ) )
+		return TRUE;
+
+	return FALSE;
+}
diff --git a/main/source/dlls/monsters.h b/main/source/dlls/monsters.h
new file mode 100644
index 00000000..5a219906
--- /dev/null
+++ b/main/source/dlls/monsters.h
@@ -0,0 +1,88 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+#ifndef MONSTERS_H
+#include "skill.h"
+#define MONSTERS_H
+
+/*
+
+===== monsters.h ========================================================
+
+  Header file for monster-related utility code
+
+*/
+
+// Hit Group standards
+#define	HITGROUP_GENERIC	0
+#define	HITGROUP_HEAD		1
+#define	HITGROUP_CHEST		2
+#define	HITGROUP_STOMACH	3
+#define HITGROUP_LEFTARM	4	
+#define HITGROUP_RIGHTARM	5
+#define HITGROUP_LEFTLEG	6
+#define HITGROUP_RIGHTLEG	7
+
+
+// spawn flags 256 and above are already taken by the engine
+extern void UTIL_MoveToOrigin( edict_t* pent, const Vector &vecGoal, float flDist, int iMoveType ); 
+
+Vector VecCheckToss ( entvars_t *pev, const Vector &vecSpot1, Vector vecSpot2, float flGravityAdj = 1.0 );
+Vector VecCheckThrow ( entvars_t *pev, const Vector &vecSpot1, Vector vecSpot2, float flSpeed, float flGravityAdj = 1.0 );
+extern DLL_GLOBAL Vector		g_vecAttackDir;
+extern DLL_GLOBAL CONSTANT float g_flMeleeRange;
+extern DLL_GLOBAL CONSTANT float g_flMediumRange;
+extern DLL_GLOBAL CONSTANT float g_flLongRange;
+extern void EjectBrass (const Vector &vecOrigin, const Vector &vecVelocity, float rotation, int model, int soundtype );
+extern void ExplodeModel( const Vector &vecOrigin, float speed, int model, int count );
+
+BOOL FBoxVisible ( entvars_t *pevLooker, entvars_t *pevTarget );
+BOOL FBoxVisible ( entvars_t *pevLooker, entvars_t *pevTarget, Vector &vecTargetOrigin, float flSize = 0.0 );
+
+// monster to monster relationship types
+#define R_AL	-2 // (ALLY) pals. Good alternative to R_NO when applicable.
+#define R_FR	-1// (FEAR)will run
+#define	R_NO	0// (NO RELATIONSHIP) disregard
+#define R_DL	1// (DISLIKE) will attack
+#define R_HT	2// (HATE)will attack this character instead of any visible DISLIKEd characters
+#define R_NM	3// (NEMESIS)  A monster Will ALWAYS attack its nemsis, no matter what
+
+
+#define bits_MEMORY_KILLED				( 1 << 7 )// HACKHACK -- remember that I've already called my Killed()
+
+//
+// A gib is a chunk of a body, or a piece of wood/metal/rocks/etc.
+//
+class CGib : public CBaseEntity
+{
+public:
+	void Spawn( const char *szGibModel );
+	void EXPORT BounceGibTouch ( CBaseEntity *pOther );
+	void EXPORT StickyGibTouch ( CBaseEntity *pOther );
+	void EXPORT WaitTillLand( void );
+	void		LimitVelocity( void );
+
+	virtual int	ObjectCaps( void ) { return (CBaseEntity :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION) | FCAP_DONT_SAVE; }
+	static	void SpawnHeadGib( entvars_t *pevVictim );
+	static	void SpawnRandomGibs( entvars_t *pevVictim, int cGibs, int human );
+	static  void SpawnStickyGibs( entvars_t *pevVictim, Vector vecOrigin, int cGibs );
+
+	int		m_bloodColor;
+	int		m_cBloodDecals;
+	int		m_material;
+	float	m_lifeTime;
+};
+
+
+#endif	//MONSTERS_H
diff --git a/main/source/dlls/monsterstate.cpp b/main/source/dlls/monsterstate.cpp
new file mode 100644
index 00000000..775bcda0
--- /dev/null
+++ b/main/source/dlls/monsterstate.cpp
@@ -0,0 +1,234 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// monsterstate.cpp - base class monster functions for 
+// controlling core AI.
+//=========================================================
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "nodes.h"
+#include "monsters.h"
+#include "animation.h"
+#include "saverestore.h"
+#include "soundent.h"
+
+//=========================================================
+// SetState
+//=========================================================
+void CBaseMonster :: SetState ( MONSTERSTATE State )
+{
+/*
+	if ( State != m_MonsterState )
+	{
+		ALERT ( at_aiconsole, "State Changed to %d\n", State );
+	}
+*/
+	
+	switch( State )
+	{
+	
+	// Drop enemy pointers when going to idle
+	case MONSTERSTATE_IDLE:
+
+		if ( m_hEnemy != NULL )
+		{
+			m_hEnemy = NULL;// not allowed to have an enemy anymore.
+			ALERT ( at_aiconsole, "Stripped\n" );
+		}
+		break;
+	}
+
+	m_MonsterState = State;
+	m_IdealMonsterState = State;
+}
+
+//=========================================================
+// RunAI
+//=========================================================
+void CBaseMonster :: RunAI ( void )
+{
+	// to test model's eye height
+	//UTIL_ParticleEffect ( pev->origin + pev->view_ofs, g_vecZero, 255, 10 );
+
+	// IDLE sound permitted in ALERT state is because monsters were silent in ALERT state. Only play IDLE sound in IDLE state
+	// once we have sounds for that state.
+	if ( ( m_MonsterState == MONSTERSTATE_IDLE || m_MonsterState == MONSTERSTATE_ALERT ) && RANDOM_LONG(0,99) == 0 && !(pev->flags & SF_MONSTER_GAG) )
+	{
+		IdleSound();
+	}
+
+	if ( m_MonsterState != MONSTERSTATE_NONE	&& 
+		 m_MonsterState != MONSTERSTATE_PRONE   && 
+		 m_MonsterState != MONSTERSTATE_DEAD )// don't bother with this crap if monster is prone. 
+	{
+		// collect some sensory Condition information.
+		// don't let monsters outside of the player's PVS act up, or most of the interesting
+		// things will happen before the player gets there!
+		// UPDATE: We now let COMBAT state monsters think and act fully outside of player PVS. This allows the player to leave 
+		// an area where monsters are fighting, and the fight will continue.
+		if ( !FNullEnt( FIND_CLIENT_IN_PVS( edict() ) ) || ( m_MonsterState == MONSTERSTATE_COMBAT ) )
+		{
+			Look( m_flDistLook );
+			Listen();// check for audible sounds. 
+
+			// now filter conditions.
+			ClearConditions( IgnoreConditions() );
+
+			GetEnemy();
+		}
+
+		// do these calculations if monster has an enemy.
+		if ( m_hEnemy != NULL )
+		{
+			CheckEnemy( m_hEnemy );
+		}
+
+		CheckAmmo();
+	}
+
+	FCheckAITrigger();
+
+	PrescheduleThink();
+
+	MaintainSchedule();
+
+	// if the monster didn't use these conditions during the above call to MaintainSchedule() or CheckAITrigger()
+	// we throw them out cause we don't want them sitting around through the lifespan of a schedule
+	// that doesn't use them. 
+	m_afConditions &= ~( bits_COND_LIGHT_DAMAGE | bits_COND_HEAVY_DAMAGE );
+}
+
+//=========================================================
+// GetIdealState - surveys the Conditions information available
+// and finds the best new state for a monster.
+//=========================================================
+MONSTERSTATE CBaseMonster :: GetIdealState ( void )
+{
+	int	iConditions;
+
+	iConditions = IScheduleFlags();
+	
+	// If no schedule conditions, the new ideal state is probably the reason we're in here.
+	switch ( m_MonsterState )
+	{
+	case MONSTERSTATE_IDLE:
+		
+		/*
+		IDLE goes to ALERT upon hearing a sound
+		-IDLE goes to ALERT upon being injured
+		IDLE goes to ALERT upon seeing food
+		-IDLE goes to COMBAT upon sighting an enemy
+		IDLE goes to HUNT upon smelling food
+		*/
+		{
+			if ( iConditions & bits_COND_NEW_ENEMY )			
+			{
+				// new enemy! This means an idle monster has seen someone it dislikes, or 
+				// that a monster in combat has found a more suitable target to attack
+				m_IdealMonsterState = MONSTERSTATE_COMBAT;
+			}
+			else if ( iConditions & bits_COND_LIGHT_DAMAGE )
+			{
+				MakeIdealYaw ( m_vecEnemyLKP );
+				m_IdealMonsterState = MONSTERSTATE_ALERT;
+			}
+			else if ( iConditions & bits_COND_HEAVY_DAMAGE )
+			{
+				MakeIdealYaw ( m_vecEnemyLKP );
+				m_IdealMonsterState = MONSTERSTATE_ALERT;
+			}
+			else if ( iConditions & bits_COND_HEAR_SOUND )
+			{
+				CSound *pSound;
+				
+				pSound = PBestSound();
+				ASSERT( pSound != NULL );
+				if ( pSound )
+				{
+					MakeIdealYaw ( pSound->m_vecOrigin );
+					if ( pSound->m_iType & (bits_SOUND_COMBAT|bits_SOUND_DANGER) )
+						m_IdealMonsterState = MONSTERSTATE_ALERT;
+				}
+			}
+			else if ( iConditions & (bits_COND_SMELL | bits_COND_SMELL_FOOD) )
+			{
+				m_IdealMonsterState = MONSTERSTATE_ALERT;
+			}
+
+			break;
+		}
+	case MONSTERSTATE_ALERT:
+		/*
+		ALERT goes to IDLE upon becoming bored
+		-ALERT goes to COMBAT upon sighting an enemy
+		ALERT goes to HUNT upon hearing a noise
+		*/
+		{
+			if ( iConditions & (bits_COND_NEW_ENEMY|bits_COND_SEE_ENEMY) )			
+			{
+				// see an enemy we MUST attack
+				m_IdealMonsterState = MONSTERSTATE_COMBAT;
+			}
+			else if ( iConditions & bits_COND_HEAR_SOUND )
+			{
+				m_IdealMonsterState = MONSTERSTATE_ALERT;
+				CSound *pSound = PBestSound();
+				ASSERT( pSound != NULL );
+				if ( pSound )
+					MakeIdealYaw ( pSound->m_vecOrigin );
+			}
+			break;
+		}
+	case MONSTERSTATE_COMBAT:
+		/*
+		COMBAT goes to HUNT upon losing sight of enemy
+		COMBAT goes to ALERT upon death of enemy
+		*/
+		{
+			if ( m_hEnemy == NULL )
+			{
+				m_IdealMonsterState = MONSTERSTATE_ALERT;
+				// pev->effects = EF_BRIGHTFIELD;
+				ALERT ( at_aiconsole, "***Combat state with no enemy!\n" );
+			}
+			break;
+		}
+	case MONSTERSTATE_HUNT:
+		/*
+		HUNT goes to ALERT upon seeing food
+		HUNT goes to ALERT upon being injured
+		HUNT goes to IDLE if goal touched
+		HUNT goes to COMBAT upon seeing enemy
+		*/
+		{
+			break;
+		}
+	case MONSTERSTATE_SCRIPT:
+		if ( iConditions & (bits_COND_TASK_FAILED|bits_COND_LIGHT_DAMAGE|bits_COND_HEAVY_DAMAGE) )
+		{
+			ExitScriptedSequence();	// This will set the ideal state
+		}
+		break;
+
+	case MONSTERSTATE_DEAD:
+		m_IdealMonsterState = MONSTERSTATE_DEAD;
+		break;
+	}
+
+	return m_IdealMonsterState;
+}
+
diff --git a/main/source/dlls/mortar.cpp b/main/source/dlls/mortar.cpp
new file mode 100644
index 00000000..60d61b2a
--- /dev/null
+++ b/main/source/dlls/mortar.cpp
@@ -0,0 +1,323 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/*
+
+===== mortar.cpp ========================================================
+
+  the "LaBuznik" mortar device              
+
+*/
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "saverestore.h"
+#include "weapons.h"
+#include "decals.h"
+#include "soundent.h"
+
+class CFuncMortarField : public CBaseToggle
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void KeyValue( KeyValueData *pkvd );
+
+	// Bmodels don't go across transitions
+	virtual int	ObjectCaps( void ) { return CBaseToggle :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+
+	virtual int	Save( CSave &save );
+	virtual int	Restore( CRestore &restore );
+
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	void EXPORT FieldUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+	int m_iszXController;
+	int m_iszYController;
+	float m_flSpread;
+	float m_flDelay;
+	int m_iCount;
+	int m_fControl;
+};
+
+LINK_ENTITY_TO_CLASS( func_mortar_field, CFuncMortarField );
+
+TYPEDESCRIPTION	CFuncMortarField::m_SaveData[] = 
+{
+	DEFINE_FIELD( CFuncMortarField, m_iszXController, FIELD_STRING ),
+	DEFINE_FIELD( CFuncMortarField, m_iszYController, FIELD_STRING ),
+	DEFINE_FIELD( CFuncMortarField, m_flSpread, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncMortarField, m_flDelay, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncMortarField, m_iCount, FIELD_INTEGER ),
+	DEFINE_FIELD( CFuncMortarField, m_fControl, FIELD_INTEGER ),
+};
+
+IMPLEMENT_SAVERESTORE( CFuncMortarField, CBaseToggle );
+
+
+void CFuncMortarField :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "m_iszXController"))
+	{
+		m_iszXController = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "m_iszYController"))
+	{
+		m_iszYController = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "m_flSpread"))
+	{
+		m_flSpread = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "m_fControl"))
+	{
+		m_fControl = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "m_iCount"))
+	{
+		m_iCount = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+}
+
+
+// Drop bombs from above
+void CFuncMortarField :: Spawn( void )
+{
+	pev->solid = SOLID_NOT;
+	SET_MODEL(ENT(pev), STRING(pev->model));    // set size and link into world
+	pev->movetype = MOVETYPE_NONE;
+	SetBits( pev->effects, EF_NODRAW );
+	SetUse( &CFuncMortarField::FieldUse );
+	Precache();
+}
+
+
+void CFuncMortarField :: Precache( void )
+{
+	PRECACHE_SOUND ("weapons/mortar.wav");
+	PRECACHE_SOUND ("weapons/mortarhit.wav");
+	PRECACHE_MODEL( "sprites/lgtning.spr" );
+}
+
+
+// If connected to a table, then use the table controllers, else hit where the trigger is.
+void CFuncMortarField :: FieldUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	Vector vecStart;
+
+	vecStart.x = RANDOM_FLOAT( pev->mins.x, pev->maxs.x );
+	vecStart.y = RANDOM_FLOAT( pev->mins.y, pev->maxs.y );
+	vecStart.z = pev->maxs.z;
+
+	switch( m_fControl )
+	{
+	case 0:	// random
+		break;
+	case 1: // Trigger Activator
+		if (pActivator != NULL)
+		{
+			vecStart.x = pActivator->pev->origin.x;
+			vecStart.y = pActivator->pev->origin.y;
+		}
+		break;
+	case 2: // table
+		{
+			CBaseEntity *pController;
+
+			if (!FStringNull(m_iszXController))
+			{
+				pController = UTIL_FindEntityByTargetname( NULL, STRING(m_iszXController));
+				if (pController != NULL)
+				{
+					vecStart.x = pev->mins.x + pController->pev->ideal_yaw * (pev->size.x);
+				}
+			}
+			if (!FStringNull(m_iszYController))
+			{
+				pController = UTIL_FindEntityByTargetname( NULL, STRING(m_iszYController));
+				if (pController != NULL)
+				{
+					vecStart.y = pev->mins.y + pController->pev->ideal_yaw * (pev->size.y);
+				}
+			}
+		}
+		break;
+	}
+
+	int pitch = RANDOM_LONG(95,124);
+
+	EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "weapons/mortar.wav", 1.0, ATTN_NONE, 0, pitch);	
+
+	float t = 2.5;
+	for (int i = 0; i < m_iCount; i++)
+	{
+		Vector vecSpot = vecStart;
+		vecSpot.x += RANDOM_FLOAT( -m_flSpread, m_flSpread );
+		vecSpot.y += RANDOM_FLOAT( -m_flSpread, m_flSpread );
+
+		TraceResult tr;
+		UTIL_TraceLine( vecSpot, vecSpot + Vector( 0, 0, -1 ) * 4096, ignore_monsters, ENT(pev), &tr );
+
+		edict_t *pentOwner = NULL;
+		if (pActivator)	pentOwner = pActivator->edict();
+
+		CBaseEntity *pMortar = Create("monster_mortar", tr.vecEndPos, Vector( 0, 0, 0 ), pentOwner );
+		pMortar->pev->nextthink = gpGlobals->time + t;
+		t += RANDOM_FLOAT( 0.2, 0.5 );
+
+		if (i == 0)
+			CSoundEnt::InsertSound ( bits_SOUND_DANGER, tr.vecEndPos, 400, 0.3 );
+	}
+}
+
+
+class CMortar : public CGrenade
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+
+	void EXPORT MortarExplode( void );
+
+	int m_spriteTexture;
+};
+
+LINK_ENTITY_TO_CLASS( monster_mortar, CMortar );
+
+void CMortar::Spawn( )
+{
+	pev->movetype	= MOVETYPE_NONE;
+	pev->solid		= SOLID_NOT;
+
+	pev->dmg		= 200;
+
+	SetThink( &CMortar::MortarExplode );
+	pev->nextthink = 0;
+
+	Precache( );
+
+
+}
+
+
+void CMortar::Precache( )
+{
+	m_spriteTexture = PRECACHE_MODEL( "sprites/lgtning.spr" );
+}
+
+void CMortar::MortarExplode( void )
+{
+#if 1
+	// mortar beam
+	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+		WRITE_BYTE( TE_BEAMPOINTS );
+		WRITE_COORD(pev->origin.x);
+		WRITE_COORD(pev->origin.y);
+		WRITE_COORD(pev->origin.z);
+		WRITE_COORD(pev->origin.x);
+		WRITE_COORD(pev->origin.y);
+		WRITE_COORD(pev->origin.z + 1024);
+		WRITE_SHORT(m_spriteTexture );
+		WRITE_BYTE( 0 ); // framerate
+		WRITE_BYTE( 0 ); // framerate
+		WRITE_BYTE( 1 ); // life
+		WRITE_BYTE( 40 );  // width
+		WRITE_BYTE( 0 );   // noise
+		WRITE_BYTE( 255 );   // r, g, b
+		WRITE_BYTE( 160 );   // r, g, b
+		WRITE_BYTE( 100 );   // r, g, b
+		WRITE_BYTE( 128 );	// brightness
+		WRITE_BYTE( 0 );		// speed
+	MESSAGE_END();
+#endif
+
+#if 0
+	// blast circle
+	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+		WRITE_BYTE( TE_BEAMTORUS);
+		WRITE_COORD(pev->origin.x);
+		WRITE_COORD(pev->origin.y);
+		WRITE_COORD(pev->origin.z + 32);
+		WRITE_COORD(pev->origin.x);
+		WRITE_COORD(pev->origin.y);
+		WRITE_COORD(pev->origin.z + 32 + pev->dmg * 2 / .2); // reach damage radius over .3 seconds
+		WRITE_SHORT(m_spriteTexture );
+		WRITE_BYTE( 0 ); // startframe
+		WRITE_BYTE( 0 ); // framerate
+		WRITE_BYTE( 2 ); // life
+		WRITE_BYTE( 12 );  // width
+		WRITE_BYTE( 0 );   // noise
+		WRITE_BYTE( 255 );   // r, g, b
+		WRITE_BYTE( 160 );   // r, g, b
+		WRITE_BYTE( 100 );   // r, g, b
+		WRITE_BYTE( 255 );	// brightness
+		WRITE_BYTE( 0 );		// speed
+	MESSAGE_END();
+#endif
+
+	TraceResult tr;
+	UTIL_TraceLine( pev->origin + Vector( 0, 0, 1024 ), pev->origin - Vector( 0, 0, 1024 ), dont_ignore_monsters, ENT(pev), &tr );
+
+	Explode( &tr, DMG_BLAST | DMG_MORTAR );
+	UTIL_ScreenShake( tr.vecEndPos, 25.0, 150.0, 1.0, 750 );
+
+#if 0
+	int pitch = RANDOM_LONG(95,124);
+	EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "weapons/mortarhit.wav", 1.0, 0.55, 0, pitch);
+
+	// ForceSound( SNDRADIUS_MP5, bits_SOUND_COMBAT );
+
+	// ExplodeModel( pev->origin, 400, g_sModelIndexShrapnel, 30 );
+
+	RadiusDamage ( pev, VARS(pev->owner), pev->dmg, CLASS_NONE, DMG_BLAST );
+
+	/*
+	if ( RANDOM_FLOAT ( 0 , 1 ) < 0.5 )
+	{
+		UTIL_DecalTrace( pTrace, DECAL_SCORCH1 );
+	}
+	else
+	{
+		UTIL_DecalTrace( pTrace, DECAL_SCORCH2 );
+	}
+	*/
+
+	SetThink( &CMortar::SUB_Remove );
+	pev->nextthink = gpGlobals->time + 0.1;
+#endif
+
+}
+
+
+#if 0
+void CMortar::ShootTimed( EVARS *pevOwner, Vector vecStart, float time )
+{
+	CMortar *pMortar = GetClassPtr( (CMortar *)NULL );
+	pMortar->Spawn();
+
+	TraceResult tr;
+	UTIL_TraceLine( vecStart, vecStart + Vector( 0, 0, -1 ) * 4096, ignore_monsters, ENT(pMortar->pev), &tr );
+
+	pMortar->pev->nextthink = gpGlobals->time + time;
+
+	UTIL_SetOrigin( pMortar->pev, tr.vecEndPos );
+}
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/mp5.cpp b/main/source/dlls/mp5.cpp
new file mode 100644
index 00000000..5626bc74
--- /dev/null
+++ b/main/source/dlls/mp5.cpp
@@ -0,0 +1,385 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "player.h"
+#include "soundent.h"
+#include "gamerules.h"
+
+enum mp5_e
+{
+	MP5_LONGIDLE = 0,
+	MP5_IDLE1,
+	MP5_LAUNCH,
+	MP5_RELOAD,
+	MP5_DEPLOY,
+	MP5_FIRE1,
+	MP5_FIRE2,
+	MP5_FIRE3,
+};
+
+
+
+LINK_ENTITY_TO_CLASS( weapon_mp5, CMP5 );
+LINK_ENTITY_TO_CLASS( weapon_9mmAR, CMP5 );
+
+
+//=========================================================
+//=========================================================
+int CMP5::SecondaryAmmoIndex( void )
+{
+	return m_iSecondaryAmmoType;
+}
+
+void CMP5::Spawn( )
+{
+	pev->classname = MAKE_STRING("weapon_9mmAR"); // hack to allow for old names
+	Precache( );
+	SET_MODEL(ENT(pev), "models/w_9mmAR.mdl");
+	m_iId = WEAPON_MP5;
+
+	m_iDefaultAmmo = MP5_DEFAULT_GIVE;
+
+	FallInit();// get ready to fall down.
+}
+
+
+void CMP5::Precache( void )
+{
+	PRECACHE_MODEL("models/v_9mmAR.mdl");
+	PRECACHE_MODEL("models/w_9mmAR.mdl");
+	PRECACHE_MODEL("models/p_9mmAR.mdl");
+
+	m_iShell = PRECACHE_MODEL ("models/shell.mdl");// brass shellTE_MODEL
+
+	PRECACHE_MODEL("models/grenade.mdl");	// grenade
+
+	PRECACHE_MODEL("models/w_9mmARclip.mdl");
+	PRECACHE_SOUND("items/9mmclip1.wav");              
+
+	PRECACHE_SOUND("items/clipinsert1.wav");
+	PRECACHE_SOUND("items/cliprelease1.wav");
+
+	PRECACHE_SOUND ("weapons/hks1.wav");// H to the K
+	PRECACHE_SOUND ("weapons/hks2.wav");// H to the K
+	PRECACHE_SOUND ("weapons/hks3.wav");// H to the K
+
+	PRECACHE_SOUND( "weapons/glauncher.wav" );
+	PRECACHE_SOUND( "weapons/glauncher2.wav" );
+
+	PRECACHE_SOUND ("weapons/357_cock1.wav");
+
+	m_usMP5 = PRECACHE_EVENT( 1, "events/mp5.sc" );
+	m_usMP52 = PRECACHE_EVENT( 1, "events/mp52.sc" );
+}
+
+int CMP5::GetItemInfo(ItemInfo *p)
+{
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = "9mm";
+	p->iMaxAmmo1 = _9MM_MAX_CARRY;
+	p->pszAmmo2 = "ARgrenades";
+	p->iMaxAmmo2 = M203_GRENADE_MAX_CARRY;
+	p->iMaxClip = MP5_MAX_CLIP;
+	p->iSlot = 2;
+	p->iPosition = 0;
+	p->iFlags = 0;
+	p->iId = m_iId = WEAPON_MP5;
+	p->iWeight = MP5_WEIGHT;
+
+	return 1;
+}
+
+int CMP5::AddToPlayer( CBasePlayer *pPlayer )
+{
+	if ( CBasePlayerWeapon::AddToPlayer( pPlayer ) )
+	{
+		MESSAGE_BEGIN( MSG_ONE, gmsgWeapPickup, NULL, pPlayer->pev );
+			WRITE_BYTE( m_iId );
+		MESSAGE_END();
+		return TRUE;
+	}
+	return FALSE;
+}
+
+BOOL CMP5::Deploy( )
+{
+	return DefaultDeploy( "models/v_9mmAR.mdl", "models/p_9mmAR.mdl", MP5_DEPLOY, "mp5" );
+}
+
+
+void CMP5::PrimaryAttack()
+{
+	// don't fire underwater
+	if (m_pPlayer->pev->waterlevel == 3)
+	{
+		PlayEmptySound( );
+		m_flNextPrimaryAttack = 0.15;
+		return;
+	}
+
+	if (m_iClip <= 0)
+	{
+		PlayEmptySound();
+		m_flNextPrimaryAttack = 0.15;
+		return;
+	}
+
+	m_pPlayer->m_iWeaponVolume = NORMAL_GUN_VOLUME;
+	m_pPlayer->m_iWeaponFlash = NORMAL_GUN_FLASH;
+
+	m_iClip--;
+
+
+	m_pPlayer->pev->effects = (int)(m_pPlayer->pev->effects) | EF_MUZZLEFLASH;
+
+	// player "shoot" animation
+	m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
+
+	Vector vecSrc	 = m_pPlayer->GetGunPosition( );
+	Vector vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES );
+	Vector vecDir;
+
+#ifdef CLIENT_DLL
+	if ( !bIsMultiplayer() )
+#else
+	if ( !g_pGameRules->IsMultiplayer() )
+#endif
+	{
+		// optimized multiplayer. Widened to make it easier to hit a moving player
+		vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_6DEGREES, 8192, BULLET_PLAYER_MP5, 2, 0, m_pPlayer->pev, m_pPlayer->random_seed );
+	}
+	else
+	{
+		// single player spread
+		vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_3DEGREES, 8192, BULLET_PLAYER_MP5, 2, 0, m_pPlayer->pev, m_pPlayer->random_seed );
+	}
+
+  int flags;
+#if defined( CLIENT_WEAPONS )
+	flags = FEV_NOTHOST;
+#else
+	flags = 0;
+#endif
+
+	PLAYBACK_EVENT_FULL( flags, m_pPlayer->edict(), m_usMP5, 0.0, (float *)&g_vecZero, (float *)&g_vecZero, vecDir.x, vecDir.y, 0, 0, 0, 0 );
+
+	if (!m_iClip && m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] <= 0)
+		// HEV suit - indicate out of ammo condition
+		m_pPlayer->SetSuitUpdate("!HEV_AMO0", FALSE, 0);
+
+	m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.1;
+
+	if ( m_flNextPrimaryAttack < UTIL_WeaponTimeBase() )
+		m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.1;
+
+	m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
+}
+
+
+
+void CMP5::SecondaryAttack( void )
+{
+	// don't fire underwater
+	if (m_pPlayer->pev->waterlevel == 3)
+	{
+		PlayEmptySound( );
+		m_flNextPrimaryAttack = 0.15;
+		return;
+	}
+
+	if (m_pPlayer->m_rgAmmo[m_iSecondaryAmmoType] == 0)
+	{
+		PlayEmptySound( );
+		return;
+	}
+
+	m_pPlayer->m_iWeaponVolume = NORMAL_GUN_VOLUME;
+	m_pPlayer->m_iWeaponFlash = BRIGHT_GUN_FLASH;
+
+	m_pPlayer->m_iExtraSoundTypes = bits_SOUND_DANGER;
+	m_pPlayer->m_flStopExtraSoundTime = UTIL_WeaponTimeBase() + 0.2;
+			
+	m_pPlayer->m_rgAmmo[m_iSecondaryAmmoType]--;
+
+	// player "shoot" animation
+	m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
+
+ 	UTIL_MakeVectors( m_pPlayer->pev->v_angle + m_pPlayer->pev->punchangle );
+
+	// we don't add in player velocity anymore.
+	CGrenade::ShootContact( m_pPlayer->pev, 
+							m_pPlayer->pev->origin + m_pPlayer->pev->view_ofs + gpGlobals->v_forward * 16, 
+							gpGlobals->v_forward * 800 );
+
+	int flags;
+#if defined( CLIENT_WEAPONS )
+	flags = FEV_NOTHOST;
+#else
+	flags = 0;
+#endif
+
+	PLAYBACK_EVENT( flags, m_pPlayer->edict(), m_usMP52 );
+	
+	m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 1;
+	m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 1;
+	m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 5;// idle pretty soon after shooting.
+
+	if (!m_pPlayer->m_rgAmmo[m_iSecondaryAmmoType])
+		// HEV suit - indicate out of ammo condition
+		m_pPlayer->SetSuitUpdate("!HEV_AMO0", FALSE, 0);
+}
+
+void CMP5::Reload( void )
+{
+	if ( m_pPlayer->ammo_9mm <= 0 )
+		return;
+
+	DefaultReload( MP5_MAX_CLIP, MP5_RELOAD, 1.5 );
+}
+
+
+void CMP5::WeaponIdle( void )
+{
+	ResetEmptySound( );
+
+	m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES );
+
+	if ( m_flTimeWeaponIdle > UTIL_WeaponTimeBase() )
+		return;
+
+	int iAnim;
+	switch ( RANDOM_LONG( 0, 1 ) )
+	{
+	case 0:	
+		iAnim = MP5_LONGIDLE;	
+		break;
+	
+	default:
+	case 1:
+		iAnim = MP5_IDLE1;
+		break;
+	}
+
+	SendWeaponAnim( iAnim );
+
+	m_flTimeWeaponIdle = UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 ); // how long till we do this again.
+}
+
+
+
+class CMP5AmmoClip : public CBasePlayerAmmo
+{
+	void Spawn( void )
+	{ 
+		Precache( );
+		SET_MODEL(ENT(pev), "models/w_9mmARclip.mdl");
+		CBasePlayerAmmo::Spawn( );
+	}
+	void Precache( void )
+	{
+		PRECACHE_MODEL ("models/w_9mmARclip.mdl");
+		PRECACHE_SOUND("items/9mmclip1.wav");
+	}
+	BOOL AddAmmo( CBaseEntity *pOther ) 
+	{ 
+		int bResult = (pOther->GiveAmmo( AMMO_MP5CLIP_GIVE, "9mm", _9MM_MAX_CARRY) != -1);
+		if (bResult)
+		{
+			EMIT_SOUND(ENT(pev), CHAN_ITEM, "items/9mmclip1.wav", 1, ATTN_NORM);
+		}
+		return bResult;
+	}
+};
+LINK_ENTITY_TO_CLASS( ammo_mp5clip, CMP5AmmoClip );
+LINK_ENTITY_TO_CLASS( ammo_9mmAR, CMP5AmmoClip );
+
+
+
+class CMP5Chainammo : public CBasePlayerAmmo
+{
+	void Spawn( void )
+	{ 
+		Precache( );
+		SET_MODEL(ENT(pev), "models/w_chainammo.mdl");
+		CBasePlayerAmmo::Spawn( );
+	}
+	void Precache( void )
+	{
+		PRECACHE_MODEL ("models/w_chainammo.mdl");
+		PRECACHE_SOUND("items/9mmclip1.wav");
+	}
+	BOOL AddAmmo( CBaseEntity *pOther ) 
+	{ 
+		int bResult = (pOther->GiveAmmo( AMMO_CHAINBOX_GIVE, "9mm", _9MM_MAX_CARRY) != -1);
+		if (bResult)
+		{
+			EMIT_SOUND(ENT(pev), CHAN_ITEM, "items/9mmclip1.wav", 1, ATTN_NORM);
+		}
+		return bResult;
+	}
+};
+LINK_ENTITY_TO_CLASS( ammo_9mmbox, CMP5Chainammo );
+
+
+class CMP5AmmoGrenade : public CBasePlayerAmmo
+{
+	void Spawn( void )
+	{ 
+		Precache( );
+		SET_MODEL(ENT(pev), "models/w_ARgrenade.mdl");
+		CBasePlayerAmmo::Spawn( );
+	}
+	void Precache( void )
+	{
+		PRECACHE_MODEL ("models/w_ARgrenade.mdl");
+		PRECACHE_SOUND("items/9mmclip1.wav");
+	}
+	BOOL AddAmmo( CBaseEntity *pOther ) 
+	{ 
+		int bResult = (pOther->GiveAmmo( AMMO_M203BOX_GIVE, "ARgrenades", M203_GRENADE_MAX_CARRY ) != -1);
+
+		if (bResult)
+		{
+			EMIT_SOUND(ENT(pev), CHAN_ITEM, "items/9mmclip1.wav", 1, ATTN_NORM);
+		}
+		return bResult;
+	}
+};
+LINK_ENTITY_TO_CLASS( ammo_mp5grenades, CMP5AmmoGrenade );
+LINK_ENTITY_TO_CLASS( ammo_ARgrenades, CMP5AmmoGrenade );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/main/source/dlls/mpstubb.cpp b/main/source/dlls/mpstubb.cpp
new file mode 100644
index 00000000..153b25e9
--- /dev/null
+++ b/main/source/dlls/mpstubb.cpp
@@ -0,0 +1,264 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"soundent.h"
+#include	"nodes.h"
+#include	"talkmonster.h"
+
+
+float	CTalkMonster::g_talkWaitTime = 0;		// time delay until it's ok to speak: used so that two NPCs don't talk at once
+
+/*********************************************************/
+
+
+CGraph	WorldGraph;
+void CGraph :: InitGraph( void ) { }
+int CGraph :: FLoadGraph ( char *szMapName ) { return FALSE; }
+int CGraph :: AllocNodes ( void ) { return FALSE; }
+int CGraph :: CheckNODFile ( char *szMapName ) { return FALSE; }
+int CGraph :: FSetGraphPointers ( void ) { return 0; }
+void CGraph :: ShowNodeConnections ( int iNode ) { }
+int	CGraph :: FindNearestNode ( const Vector &vecOrigin,  int afNodeTypes ) { return 0; }
+
+
+/*********************************************************/
+
+
+void	CBaseMonster :: ReportAIState( void ) { }
+float 	CBaseMonster :: ChangeYaw ( int speed ) { return 0; }
+void	CBaseMonster :: MakeIdealYaw( Vector vecTarget ) { }
+
+
+void CBaseMonster::CorpseFallThink( void )
+{
+	if ( pev->flags & FL_ONGROUND )
+	{
+		SetThink ( NULL );
+
+		SetSequenceBox( );
+		UTIL_SetOrigin( pev, pev->origin );// link into world.
+	}
+	else
+		pev->nextthink = gpGlobals->time + 0.1;
+}
+// Call after animation/pose is set up
+void CBaseMonster :: MonsterInitDead( void )
+{
+	InitBoneControllers();
+
+	pev->solid			= SOLID_BBOX;
+	pev->movetype		= MOVETYPE_TOSS;// so he'll fall to ground
+
+	pev->frame = 0;
+	ResetSequenceInfo( );
+	pev->framerate = 0;
+	
+	// Copy health
+	pev->max_health		= pev->health;
+	pev->deadflag		= DEAD_DEAD;
+	
+	UTIL_SetSize(pev, g_vecZero, g_vecZero );
+	UTIL_SetOrigin( pev, pev->origin );
+
+	// Setup health counters, etc.
+	BecomeDead();
+	SetThink( &CBaseMonster::CorpseFallThink );
+	pev->nextthink = gpGlobals->time + 0.5;
+}
+
+
+BOOL	CBaseMonster :: ShouldFadeOnDeath( void ) 
+{ 
+	return FALSE; 
+}
+
+BOOL	CBaseMonster :: FCheckAITrigger ( void ) 
+{ 
+	return FALSE; 
+}
+
+void	CBaseMonster :: KeyValue( KeyValueData *pkvd ) 
+{  
+	CBaseToggle::KeyValue( pkvd ); 
+}
+
+int CBaseMonster::IRelationship ( CBaseEntity *pTarget )
+{
+	static int iEnemy[14][14] =
+	{			 //   NONE	 MACH	 PLYR	 HPASS	 HMIL	 AMIL	 APASS	 AMONST	APREY	 APRED	 INSECT	PLRALY	PBWPN	ABWPN
+	/*NONE*/		{ R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO,	R_NO,	R_NO	},
+	/*MACHINE*/		{ R_NO	,R_NO	,R_DL	,R_DL	,R_NO	,R_DL	,R_DL	,R_DL	,R_DL	,R_DL	,R_NO	,R_DL,	R_DL,	R_DL	},
+	/*PLAYER*/		{ R_NO	,R_DL	,R_NO	,R_NO	,R_DL	,R_DL	,R_DL	,R_DL	,R_DL	,R_DL	,R_NO	,R_NO,	R_DL,	R_DL	},
+	/*HUMANPASSIVE*/{ R_NO	,R_NO	,R_AL	,R_AL	,R_HT	,R_FR	,R_NO	,R_HT	,R_DL	,R_FR	,R_NO	,R_AL,	R_NO,	R_NO	},
+	/*HUMANMILITAR*/{ R_NO	,R_NO	,R_HT	,R_DL	,R_NO	,R_HT	,R_DL	,R_DL	,R_DL	,R_DL	,R_NO	,R_HT,	R_NO,	R_NO	},
+	/*ALIENMILITAR*/{ R_NO	,R_DL	,R_HT	,R_DL	,R_HT	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_DL,	R_NO,	R_NO	},
+	/*ALIENPASSIVE*/{ R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO,	R_NO,	R_NO	},
+	/*ALIENMONSTER*/{ R_NO	,R_DL	,R_DL	,R_DL	,R_DL	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_NO	,R_DL,	R_NO,	R_NO	},
+	/*ALIENPREY   */{ R_NO	,R_NO	,R_DL	,R_DL	,R_DL	,R_NO	,R_NO	,R_NO	,R_NO	,R_FR	,R_NO	,R_DL,	R_NO,	R_NO	},
+	/*ALIENPREDATO*/{ R_NO	,R_NO	,R_DL	,R_DL	,R_DL	,R_NO	,R_NO	,R_NO	,R_HT	,R_DL	,R_NO	,R_DL,	R_NO,	R_NO	},
+	/*INSECT*/		{ R_FR	,R_FR	,R_FR	,R_FR	,R_FR	,R_NO	,R_FR	,R_FR	,R_FR	,R_FR	,R_NO	,R_FR,	R_NO,	R_NO	},
+	/*PLAYERALLY*/	{ R_NO	,R_DL	,R_AL	,R_AL	,R_DL	,R_DL	,R_DL	,R_DL	,R_DL	,R_DL	,R_NO	,R_NO,	R_NO,	R_NO	},
+	/*PBIOWEAPON*/	{ R_NO	,R_NO	,R_DL	,R_DL	,R_DL	,R_DL	,R_DL	,R_DL	,R_DL	,R_DL	,R_NO	,R_DL,	R_NO,	R_DL	},
+	/*ABIOWEAPON*/	{ R_NO	,R_NO	,R_DL	,R_DL	,R_DL	,R_AL	,R_NO	,R_DL	,R_DL	,R_NO	,R_NO	,R_DL,	R_DL,	R_NO	}
+	};
+
+	return iEnemy[ Classify() ][ pTarget->Classify() ];
+}
+
+
+//=========================================================
+// Look - Base class monster function to find enemies or 
+// food by sight. iDistance is distance ( in units ) that the 
+// monster can see.
+//
+// Sets the sight bits of the m_afConditions mask to indicate
+// which types of entities were sighted.
+// Function also sets the Looker's m_pLink 
+// to the head of a link list that contains all visible ents.
+// (linked via each ent's m_pLink field)
+//
+//=========================================================
+void CBaseMonster :: Look ( int iDistance )
+{
+	int	iSighted = 0;
+
+	// DON'T let visibility information from last frame sit around!
+	ClearConditions(bits_COND_SEE_HATE | bits_COND_SEE_DISLIKE | bits_COND_SEE_ENEMY | bits_COND_SEE_FEAR | bits_COND_SEE_NEMESIS | bits_COND_SEE_CLIENT);
+
+	m_pLink = NULL;
+
+	CBaseEntity	*pSightEnt = NULL;// the current visible entity that we're dealing with
+
+	CBaseEntity *pList[100];
+
+	Vector delta = Vector( iDistance, iDistance, iDistance );
+
+	// Find only monsters/clients in box, NOT limited to PVS
+	int count = UTIL_EntitiesInBox( pList, 100, pev->origin - delta, pev->origin + delta, FL_CLIENT|FL_MONSTER );
+	for ( int i = 0; i < count; i++ )
+	{
+		pSightEnt = pList[i];
+		if ( pSightEnt != this && pSightEnt->pev->health > 0 )
+		{
+			// the looker will want to consider this entity
+			// don't check anything else about an entity that can't be seen, or an entity that you don't care about.
+			if ( IRelationship( pSightEnt ) != R_NO && FInViewCone( pSightEnt ) && !FBitSet( pSightEnt->pev->flags, FL_NOTARGET ) && FVisible( pSightEnt ) )
+			{
+				if ( pSightEnt->IsPlayer() )
+				{
+					// if we see a client, remember that (mostly for scripted AI)
+					iSighted |= bits_COND_SEE_CLIENT;
+				}
+
+				pSightEnt->m_pLink = m_pLink;
+				m_pLink = pSightEnt;
+
+				if ( pSightEnt == m_hEnemy )
+				{
+					// we know this ent is visible, so if it also happens to be our enemy, store that now.
+					iSighted |= bits_COND_SEE_ENEMY;
+				}
+
+				// don't add the Enemy's relationship to the conditions. We only want to worry about conditions when
+				// we see monsters other than the Enemy.
+				switch ( IRelationship ( pSightEnt ) )
+				{
+				case	R_NM:
+					iSighted |= bits_COND_SEE_NEMESIS;		
+					break;
+				case	R_HT:		
+					iSighted |= bits_COND_SEE_HATE;		
+					break;
+				case	R_DL:
+					iSighted |= bits_COND_SEE_DISLIKE;
+					break;
+				case	R_FR:
+					iSighted |= bits_COND_SEE_FEAR;
+					break;
+				case    R_AL:
+					break;
+				default:
+					ALERT ( at_aiconsole, "%s can't assess %s\n", STRING(pev->classname), STRING(pSightEnt->pev->classname ) );
+					break;
+				}
+			}
+		}
+	}
+	
+	SetConditions( iSighted );
+}
+
+
+//=========================================================
+// BestVisibleEnemy - this functions searches the link
+// list whose head is the caller's m_pLink field, and returns
+// a pointer to the enemy entity in that list that is nearest the 
+// caller.
+//
+// !!!UNDONE - currently, this only returns the closest enemy.
+// we'll want to consider distance, relationship, attack types, back turned, etc.
+//=========================================================
+CBaseEntity *CBaseMonster :: BestVisibleEnemy ( void )
+{
+	CBaseEntity	*pReturn;
+	CBaseEntity	*pNextEnt;
+	int			iNearest;
+	int			iDist;
+	int			iBestRelationship;
+
+	iNearest = 8192;// so first visible entity will become the closest.
+	pNextEnt = m_pLink;
+	pReturn = NULL;
+	iBestRelationship = R_NO;
+
+	while ( pNextEnt != NULL )
+	{
+		if ( pNextEnt->IsAlive() )
+		{
+			if ( IRelationship( pNextEnt) > iBestRelationship )
+			{
+				// this entity is disliked MORE than the entity that we 
+				// currently think is the best visible enemy. No need to do 
+				// a distance check, just get mad at this one for now.
+				iBestRelationship = IRelationship ( pNextEnt );
+				iNearest = ( pNextEnt->pev->origin - pev->origin ).Length();
+				pReturn = pNextEnt;
+			}
+			else if ( IRelationship( pNextEnt) == iBestRelationship )
+			{
+				// this entity is disliked just as much as the entity that
+				// we currently think is the best visible enemy, so we only
+				// get mad at it if it is closer.
+				iDist = ( pNextEnt->pev->origin - pev->origin ).Length();
+				
+				if ( iDist <= iNearest )
+				{
+					iNearest = iDist;
+					iBestRelationship = IRelationship ( pNextEnt );
+					pReturn = pNextEnt;
+				}
+			}
+		}
+
+		pNextEnt = pNextEnt->m_pLink;
+	}
+
+	return pReturn;
+}
diff --git a/main/source/dlls/multiplay_gamerules.cpp b/main/source/dlls/multiplay_gamerules.cpp
new file mode 100644
index 00000000..e8759839
--- /dev/null
+++ b/main/source/dlls/multiplay_gamerules.cpp
@@ -0,0 +1,1801 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// teamplay_gamerules.cpp
+//
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"player.h"
+#include	"weapons.h"
+#include	"gamerules.h"
+ 
+#include	"skill.h"
+#include	"game.h"
+#include	"items.h"
+#include	"voice_gamemgr.h"
+#include	"mod/AvHServerUtil.h"
+#include	"hltv.h"
+#include	"mod/UPPUtil.h"
+
+extern DLL_GLOBAL CGameRules	*g_pGameRules;
+extern DLL_GLOBAL BOOL	g_fGameOver;
+extern int gmsgDeathMsg;	// client dll messages
+extern int gmsgScoreInfo;
+extern int gmsgMOTD;
+extern int gmsgServerName;
+
+extern int g_teamplay;
+
+#define ITEM_RESPAWN_TIME	30
+#define WEAPON_RESPAWN_TIME	20
+#define AMMO_RESPAWN_TIME	20
+
+// Allow assignment within conditional
+#pragma warning (disable: 4706)
+
+float g_flIntermissionStartTime = 0;
+
+//CVoiceGameMgr	g_VoiceGameMgr;
+
+class CMultiplayGameMgrHelper : public IVoiceGameMgrHelper
+{
+public:
+	virtual bool		CanPlayerHearPlayer(CBasePlayer *pListener, CBasePlayer *pTalker)
+	{
+		if ( g_teamplay )
+		{
+			if ( g_pGameRules->PlayerRelationship( pListener, pTalker ) != GR_TEAMMATE )
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+};
+static CMultiplayGameMgrHelper g_GameMgrHelper;
+
+//*********************************************************
+// Rules for the half-life multiplayer game.
+//*********************************************************
+
+CHalfLifeMultiplay :: CHalfLifeMultiplay()
+{
+	//g_VoiceGameMgr.Init(&g_GameMgrHelper, gpGlobals->maxClients);
+
+	RefreshSkillData();
+	m_flIntermissionEndTime = 0;
+	g_flIntermissionStartTime = 0;
+	
+	// 11/8/98
+	// Modified by YWB:  Server .cfg file is now a cvar, so that 
+	//  server ops can run multiple game servers, with different server .cfg files,
+	//  from a single installed directory.
+	// Mapcyclefile is already a cvar.
+
+	// 3/31/99
+	// Added lservercfg file cvar, since listen and dedicated servers should not
+	// share a single config file. (sjb)
+	if ( IS_DEDICATED_SERVER() )
+	{
+		// dedicated server
+		char *servercfgfile = (char *)CVAR_GET_STRING( "servercfgfile" );
+
+		if ( servercfgfile && servercfgfile[0] )
+		{
+			char szCommand[256];
+			
+			ALERT( at_console, "Executing dedicated server config file\n" );
+			sprintf( szCommand, "exec %s\n", servercfgfile );
+			SERVER_COMMAND( szCommand );
+		}
+	}
+	else
+	{
+		// listen server
+		char *lservercfgfile = (char *)CVAR_GET_STRING( "lservercfgfile" );
+
+		if ( lservercfgfile && lservercfgfile[0] )
+		{
+			char szCommand[256];
+			
+			ALERT( at_console, "Executing listen server config file\n" );
+			sprintf( szCommand, "exec %s\n", lservercfgfile );
+			SERVER_COMMAND( szCommand );
+		}
+	}
+}
+
+BOOL CHalfLifeMultiplay::ClientCommand( CBasePlayer *pPlayer, const char *pcmd )
+{
+	//if(g_VoiceGameMgr.ClientCommand(pPlayer, pcmd))
+	//	return TRUE;
+
+	return CGameRules::ClientCommand(pPlayer, pcmd);
+}
+
+//=========================================================
+//=========================================================
+void CHalfLifeMultiplay::RefreshSkillData( void )
+{
+// load all default values
+	CGameRules::RefreshSkillData();
+
+// override some values for multiplay.
+
+	// suitcharger
+	gSkillData.suitchargerCapacity = 30;
+
+	// Crowbar whack
+	gSkillData.plrDmgCrowbar = 25;
+
+	// Glock Round
+	gSkillData.plrDmg9MM = 12;
+
+	// 357 Round
+	gSkillData.plrDmg357 = 40;
+
+	// MP5 Round
+	gSkillData.plrDmgMP5 = 12;
+
+	// M203 grenade
+	gSkillData.plrDmgM203Grenade = 100;
+
+	// Shotgun buckshot
+	gSkillData.plrDmgBuckshot = 20;// fewer pellets in deathmatch
+
+	// Crossbow
+	gSkillData.plrDmgCrossbowClient = 20;
+
+	// RPG
+	gSkillData.plrDmgRPG = 120;
+
+	// Egon
+	gSkillData.plrDmgEgonWide = 20;
+	gSkillData.plrDmgEgonNarrow = 10;
+
+	// Hand Grendade
+	gSkillData.plrDmgHandGrenade = 100;
+
+	// Satchel Charge
+	gSkillData.plrDmgSatchel = 120;
+
+	// Tripmine
+	gSkillData.plrDmgTripmine = 150;
+
+	// hornet
+	gSkillData.plrDmgHornet = 10;
+}
+
+// longest the intermission can last, in seconds
+#define MAX_INTERMISSION_TIME		120
+
+extern cvar_t timeleft, fragsleft;
+
+extern cvar_t mp_chattime;
+
+//=========================================================
+//=========================================================
+void CHalfLifeMultiplay :: Think ( void )
+{
+	//g_VoiceGameMgr.Update(gpGlobals->frametime);
+
+	///// Check game rules /////
+	static int last_frags;
+	static int last_time;
+
+	int frags_remaining = 0;
+	int time_remaining = 0;
+
+	if ( g_fGameOver )   // someone else quit the game already
+	{
+		// bounds check
+		int time = (int)CVAR_GET_FLOAT( "mp_chattime" );
+		if ( time < 10 )
+			CVAR_SET_STRING( "mp_chattime", "10" );
+		else if ( time > MAX_INTERMISSION_TIME )
+			CVAR_SET_STRING( "mp_chattime", UTIL_dtos1( MAX_INTERMISSION_TIME ) );
+
+		m_flIntermissionEndTime = g_flIntermissionStartTime + mp_chattime.value;
+
+		// check to see if we should change levels now
+		if ( m_flIntermissionEndTime < gpGlobals->time )
+		{
+			if ( m_iEndIntermissionButtonHit  // check that someone has pressed a key, or the max intermission time is over
+				|| ( ( g_flIntermissionStartTime + MAX_INTERMISSION_TIME ) < gpGlobals->time) ) 
+				ChangeLevel(); // intermission is over
+		}
+
+		return;
+	}
+
+	float flTimeLimit = timelimit.value * 60;
+	float flFragLimit = fraglimit.value;
+
+	time_remaining = (int)(flTimeLimit ? ( flTimeLimit - gpGlobals->time ) : 0);
+	
+	if ( flTimeLimit != 0 && gpGlobals->time >= flTimeLimit )
+	{
+		GoToIntermission();
+		return;
+	}
+
+	if ( flFragLimit )
+	{
+		int bestfrags = 9999;
+		int remain;
+
+		// check if any player is over the frag limit
+		for ( int i = 1; i <= gpGlobals->maxClients; i++ )
+		{
+			CBaseEntity *pPlayer = UTIL_PlayerByIndex( i );
+
+			if ( pPlayer && pPlayer->pev->frags >= flFragLimit )
+			{
+				GoToIntermission();
+				return;
+			}
+
+
+			if ( pPlayer )
+			{
+				remain = flFragLimit - pPlayer->pev->frags;
+				if ( remain < bestfrags )
+				{
+					bestfrags = remain;
+				}
+			}
+
+		}
+		frags_remaining = bestfrags;
+	}
+
+	// Updates when frags change
+	if ( frags_remaining != last_frags )
+	{
+		g_engfuncs.pfnCvar_DirectSet( &fragsleft, UTIL_VarArgs( "%i", frags_remaining ) );
+	}
+
+	// Updates once per second
+	if ( timeleft.value != last_time )
+	{
+		g_engfuncs.pfnCvar_DirectSet( &timeleft, UTIL_VarArgs( "%i", time_remaining ) );
+	}
+
+	last_frags = frags_remaining;
+	last_time  = time_remaining;
+}
+
+
+//=========================================================
+//=========================================================
+BOOL CHalfLifeMultiplay::IsMultiplayer( void )
+{
+	return TRUE;
+}
+
+//=========================================================
+//=========================================================
+BOOL CHalfLifeMultiplay::IsDeathmatch( void )
+{
+	return TRUE;
+}
+
+//=========================================================
+//=========================================================
+BOOL CHalfLifeMultiplay::IsCoOp( void )
+{
+	return gpGlobals->coop;
+}
+
+//=========================================================
+//=========================================================
+BOOL CHalfLifeMultiplay::FShouldSwitchWeapon( CBasePlayer *pPlayer, CBasePlayerItem *pWeapon )
+{
+	if ( !pWeapon->CanDeploy() )
+	{
+		// that weapon can't deploy anyway.
+		return FALSE;
+	}
+
+	if ( !pPlayer->m_pActiveItem )
+	{
+		// player doesn't have an active item!
+		return TRUE;
+	}
+
+	if ( !pPlayer->m_pActiveItem->CanHolster() )
+	{
+		// can't put away the active item.
+		return FALSE;
+	}
+
+	if ( pWeapon->iWeight() > pPlayer->m_pActiveItem->iWeight() )
+	{
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+BOOL CHalfLifeMultiplay :: GetNextBestWeapon( CBasePlayer *pPlayer, CBasePlayerItem *pCurrentWeapon )
+{
+
+	CBasePlayerItem *pCheck;
+	CBasePlayerItem *pBest;// this will be used in the event that we don't find a weapon in the same category.
+	int iBestWeight;
+	int i;
+
+	iBestWeight = -1;// no weapon lower than -1 can be autoswitched to
+	pBest = NULL;
+
+	if ( pCurrentWeapon != NULL && !pCurrentWeapon->CanHolster() )
+	{
+		// can't put this gun away right now, so can't switch.
+		return FALSE;
+	}
+
+	for ( i = 0 ; i < MAX_ITEM_TYPES ; i++ )
+	{
+		pCheck = pPlayer->m_rgpPlayerItems[ i ];
+
+		while ( pCheck )
+		{
+			if ( pCurrentWeapon != NULL && pCheck->iWeight() > -1 && pCheck->iWeight() == pCurrentWeapon->iWeight() && pCheck != pCurrentWeapon )
+			{
+				// this weapon is from the same category. 
+				if ( pCheck->CanDeploy() && pCheck->IsUseable())
+				{
+					if ( pPlayer->SwitchWeapon( pCheck ) )
+					{
+						return TRUE;
+					}
+				}
+			}
+			else if ( pCheck->iWeight() > iBestWeight && pCheck != pCurrentWeapon )// don't reselect the weapon we're trying to get rid of
+			{
+				//ALERT ( at_console, "Considering %s\n", STRING( pCheck->pev->classname ) );
+				// we keep updating the 'best' weapon just in case we can't find a weapon of the same weight
+				// that the player was using. This will end up leaving the player with his heaviest-weighted 
+				// weapon. 
+				if ( pCheck->CanDeploy() && pCheck->IsUseable())
+				{
+					// if this weapon is useable, flag it as the best
+					iBestWeight = pCheck->iWeight();
+					pBest = pCheck;
+				}
+			}
+
+			pCheck = pCheck->m_pNext;
+		}
+	}
+
+	// if we make it here, we've checked all the weapons and found no useable 
+	// weapon in the same catagory as the current weapon. 
+	
+	// if pBest is null, we didn't find ANYTHING. Shouldn't be possible- should always 
+	// at least get the crowbar, but ya never know.
+	if ( !pBest )
+	{
+		return FALSE;
+	}
+
+	pPlayer->SwitchWeapon( pBest );
+
+	return TRUE;
+}
+
+//=========================================================
+//=========================================================
+BOOL CHalfLifeMultiplay :: ClientConnected( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[ 128 ] )
+{
+	//g_VoiceGameMgr.ClientConnected(pEntity);
+	return TRUE;
+}
+
+extern int gmsgGameMode;
+
+void CHalfLifeMultiplay :: UpdateGameMode( CBasePlayer *pPlayer )
+{
+	MESSAGE_BEGIN( MSG_ONE, gmsgGameMode, NULL, pPlayer->edict() );
+		WRITE_BYTE( 0 );  // game mode none
+	MESSAGE_END();
+}
+
+void CHalfLifeMultiplay :: InitHUD( CBasePlayer *pl )
+{
+	// notify other clients of player joining the game
+	UTIL_ClientPrintAll( HUD_PRINTNOTIFY, UTIL_VarArgs( "%s has joined the game\n", 
+		( pl->pev->netname && STRING(pl->pev->netname)[0] != 0 ) ? STRING(pl->pev->netname) : "unconnected" ) );
+	
+	// team match?
+	if ( g_teamplay )
+	{
+		UTIL_LogPrintf( "\"%s<%i><%s><%s>\" entered the game\n",  
+			STRING( pl->pev->netname ), 
+			GETPLAYERUSERID( pl->edict() ),
+#ifdef USE_UPP
+			UPPUtil_GetNetworkID(pl->edict()).c_str(),
+#else
+			AvHSUGetPlayerAuthIDString( pl->edict() ).c_str(),
+#endif
+			AvHSUGetTeamName(pl->pev->team));
+	}
+	else
+	{
+		UTIL_LogPrintf( "\"%s<%i><%s><%i>\" entered the game\n",  
+			STRING( pl->pev->netname ), 
+			GETPLAYERUSERID( pl->edict() ),
+#ifdef USE_UPP
+			UPPUtil_GetNetworkID(pl->edict()).c_str(),
+#else
+			AvHSUGetPlayerAuthIDString( pl->edict() ).c_str(),
+#endif
+			GETPLAYERUSERID( pl->edict() ) );
+	}
+	
+	UpdateGameMode( pl );
+	
+	// sending just one score makes the hud scoreboard active;  otherwise
+	// it is just disabled for single play
+	//MESSAGE_BEGIN( MSG_ONE, gmsgScoreInfo, NULL, pl->edict() );
+	//WRITE_BYTE( ENTINDEX(pl->edict()) );
+	//WRITE_SHORT( 0 );
+	//WRITE_SHORT( 0 );
+	//WRITE_SHORT( 0 );
+	//WRITE_SHORT( 0 );
+	//MESSAGE_END();
+	pl->EffectivePlayerClassChanged();
+	
+	SendMOTDToClient( pl->edict() );
+	
+	// loop through all active players and send their score info to the new client
+	for ( int i = 1; i <= gpGlobals->maxClients; i++ )
+	{
+		// FIXME:  Probably don't need to cast this just to read m_iDeaths
+		CBasePlayer *plr = (CBasePlayer *)UTIL_PlayerByIndex( i );
+		
+		if ( plr )
+		{
+//			MESSAGE_BEGIN( MSG_ONE, gmsgScoreInfo, NULL, pl->edict() );
+//			WRITE_BYTE( i );	// client number
+//			WRITE_SHORT( plr->pev->frags );
+//			WRITE_SHORT( plr->m_iDeaths );
+//			WRITE_SHORT( plr->GetEffectivePlayerClass() );
+//			WRITE_SHORT( GetTeamIndex( plr->TeamID() ) );
+//			MESSAGE_END();
+
+			plr->EffectivePlayerClassChanged();
+		}
+	}
+	
+	if ( g_fGameOver )
+	{
+		MESSAGE_BEGIN( MSG_ONE, SVC_INTERMISSION, NULL, pl->edict() );
+		MESSAGE_END();
+	}
+}
+
+//=========================================================
+//=========================================================
+void CHalfLifeMultiplay :: ClientDisconnected( edict_t *pClient )
+{
+	if ( pClient )
+	{
+		CBasePlayer *pPlayer = (CBasePlayer *)CBaseEntity::Instance( pClient );
+		
+		if ( pPlayer )
+		{
+			FireTargets( "game_playerleave", pPlayer, pPlayer, USE_TOGGLE, 0 );
+			
+			// team match?
+			if ( g_teamplay )
+			{
+				UTIL_LogPrintf( "\"%s<%i><%s><%s>\" disconnected\n",  
+					STRING( pPlayer->pev->netname ), 
+					GETPLAYERUSERID( pPlayer->edict() ),
+#ifdef USE_UPP
+					UPPUtil_GetNetworkID(pPlayer->edict()).c_str(),
+#else
+					AvHSUGetPlayerAuthIDString( pPlayer->edict() ).c_str(),
+#endif
+					AvHSUGetTeamName(pPlayer->pev->team));
+			}
+			else
+			{
+				UTIL_LogPrintf( "\"%s<%i><%s><%i>\" disconnected\n",  
+					STRING( pPlayer->pev->netname ), 
+					GETPLAYERUSERID( pPlayer->edict() ),
+#ifdef USE_UPP
+					UPPUtil_GetNetworkID(pPlayer->edict()).c_str(),
+#else
+					AvHSUGetPlayerAuthIDString( pPlayer->edict() ).c_str(),
+#endif
+					GETPLAYERUSERID( pPlayer->edict() ) );
+			}
+			
+			pPlayer->RemoveAllItems( TRUE );// destroy all of the players weapons and items
+		}
+	}
+}
+
+
+//=========================================================
+//=========================================================
+float CHalfLifeMultiplay :: FlPlayerFallDamage( CBasePlayer *pPlayer )
+{
+	int iFallDamage = (int)falldamage.value;
+
+	switch ( iFallDamage )
+	{
+	case 1://progressive
+		pPlayer->m_flFallVelocity -= PLAYER_MAX_SAFE_FALL_SPEED;
+		return pPlayer->m_flFallVelocity * DAMAGE_FOR_FALL_SPEED;
+		break;
+	default:
+	case 0:// fixed
+		return 10;
+		break;
+	}
+} 
+
+//=========================================================
+//=========================================================
+BOOL CHalfLifeMultiplay::FPlayerCanTakeDamage( CBasePlayer *pPlayer, CBaseEntity *pAttacker )
+{
+	return TRUE;
+}
+
+//=========================================================
+//=========================================================
+void CHalfLifeMultiplay :: PlayerThink( CBasePlayer *pPlayer )
+{
+	if ( g_fGameOver )
+	{
+		// check for button presses
+		if ( pPlayer->m_afButtonPressed & ( IN_DUCK | IN_ATTACK | IN_ATTACK2 | IN_USE | IN_JUMP ) )
+			m_iEndIntermissionButtonHit = TRUE;
+
+        pPlayer->ClearKeys();
+	}
+}
+
+//=========================================================
+//=========================================================
+void CHalfLifeMultiplay :: PlayerSpawn( CBasePlayer *pPlayer )
+{
+	BOOL		addDefault;
+	CBaseEntity	*pWeaponEntity = NULL;
+
+	pPlayer->pev->weapons |= (1<<WEAPON_SUIT);
+	
+	addDefault = TRUE;
+
+	while ( pWeaponEntity = UTIL_FindEntityByClassname( pWeaponEntity, "game_player_equip" ))
+	{
+		pWeaponEntity->Touch( pPlayer );
+		addDefault = FALSE;
+	}
+
+	if ( addDefault )
+	{
+	}
+}
+
+//=========================================================
+//=========================================================
+BOOL CHalfLifeMultiplay :: FPlayerCanRespawn( CBasePlayer *pPlayer )
+{
+	return TRUE;
+}
+
+//=========================================================
+//=========================================================
+float CHalfLifeMultiplay :: FlPlayerSpawnTime( CBasePlayer *pPlayer )
+{
+	return gpGlobals->time;//now!
+}
+
+BOOL CHalfLifeMultiplay :: AllowAutoTargetCrosshair( void )
+{
+	return ( aimcrosshair.value != 0 );
+}
+
+//=========================================================
+// IPointsForKill - how many points awarded to anyone
+// that kills this player?
+//=========================================================
+int CHalfLifeMultiplay :: IPointsForKill( CBasePlayer *pAttacker, CBasePlayer *pKilled )
+{
+	return 1;
+}
+
+
+//=========================================================
+// PlayerKilled - someone/something killed this player
+//=========================================================
+void CHalfLifeMultiplay :: PlayerKilled( CBasePlayer *pVictim, entvars_t *pKiller, entvars_t *pInflictor )
+{
+	DeathNotice( pVictim, pKiller, pInflictor );
+
+	pVictim->m_iDeaths += 1;
+
+
+	FireTargets( "game_playerdie", pVictim, pVictim, USE_TOGGLE, 0 );
+	CBasePlayer *peKiller = NULL;
+	CBaseEntity *ktmp = CBaseEntity::Instance( pKiller );
+	if ( ktmp && (ktmp->Classify() == CLASS_PLAYER) )
+		peKiller = (CBasePlayer*)ktmp;
+
+	if ( pVictim->pev == pKiller )  
+    {
+        // Already increment deaths, don't need to lose frags also
+        // killed self
+		//pKiller->frags -= 1;
+	}
+	else if ( ktmp && ktmp->IsPlayer() )
+	{
+		// if a player dies in a deathmatch game and the killer is a client, award the killer some points
+		pKiller->frags += IPointsForKill( peKiller, pVictim );
+		
+		FireTargets( "game_playerkill", ktmp, ktmp, USE_TOGGLE, 0 );
+	}
+	else
+	{  // killed by the world
+		pKiller->frags -= 1;
+	}
+
+	// update the scores
+	// killed scores
+//	MESSAGE_BEGIN( MSG_ALL, gmsgScoreInfo );
+//		WRITE_BYTE( ENTINDEX(pVictim->edict()) );
+//		WRITE_SHORT( pVictim->pev->frags );
+//		WRITE_SHORT( pVictim->m_iDeaths );
+//		WRITE_SHORT( pVictim->GetEffectivePlayerClass() );
+//		WRITE_SHORT( GetTeamIndex( pVictim->TeamID() ) );
+//	MESSAGE_END();
+	pVictim->EffectivePlayerClassChanged();
+
+	// killers score, if it's a player
+	CBaseEntity *ep = CBaseEntity::Instance( pKiller );
+	if ( ep && ep->Classify() == CLASS_PLAYER )
+	{
+		CBasePlayer *PK = (CBasePlayer*)ep;
+
+//		MESSAGE_BEGIN( MSG_ALL, gmsgScoreInfo );
+//			WRITE_BYTE( ENTINDEX(PK->edict()) );
+//			WRITE_SHORT( PK->pev->frags );
+//			WRITE_SHORT( PK->m_iDeaths );
+//			WRITE_SHORT( PK->GetEffectivePlayerClass() );
+//			WRITE_SHORT( GetTeamIndex( PK->TeamID()) );
+//		MESSAGE_END();
+		PK->EffectivePlayerClassChanged();
+
+		// let the killer paint another decal as soon as he'd like.
+		PK->m_flNextDecalTime = gpGlobals->time;
+	}
+
+// Game rules shouldn't know about specific weapons!  Removed this because AvH doesn't have satchel charges.
+//#ifndef HLDEMO_BUILD
+//	if ( pVictim->HasNamedPlayerItem("weapon_satchel") )
+//	{
+//		DeactivateSatchels( pVictim );
+//	}
+//#endif
+}
+
+//=========================================================
+// Deathnotice. 
+//=========================================================
+void CHalfLifeMultiplay::DeathNotice( CBasePlayer *pVictim, entvars_t *pKiller, entvars_t *pevInflictor )
+{
+	// Work out what killed the player, and send a message to all clients about it
+	CBaseEntity *Killer = CBaseEntity::Instance( pKiller );
+
+	const char *killer_weapon_name = "world";		// by default, the player is killed by the world
+	int killer_index = 0;
+	
+	// Hack to fix name change
+	char *tau = "tau_cannon";
+	char *gluon = "gluon gun";
+
+	if ( pKiller->flags & FL_CLIENT )
+	{
+		killer_index = ENTINDEX(ENT(pKiller));
+		
+		if ( pevInflictor )
+		{
+			if ( pevInflictor == pKiller )
+			{
+				// If the inflictor is the killer,  then it must be their current weapon doing the damage
+				CBasePlayer *pPlayer = (CBasePlayer*)CBaseEntity::Instance( pKiller );
+				
+				if ( pPlayer->m_pActiveItem )
+				{
+					killer_weapon_name = pPlayer->m_pActiveItem->pszName();
+				}
+			}
+			else
+			{
+				killer_weapon_name = STRING( pevInflictor->classname );  // it's just that easy
+			}
+		}
+	}
+	else
+	{
+		killer_weapon_name = STRING( pevInflictor->classname );
+	}
+
+	// strip the monster_* or weapon_* from the inflictor's classname
+	if ( strncmp( killer_weapon_name, "weapon_", 7 ) == 0 )
+		killer_weapon_name += 7;
+	else if ( strncmp( killer_weapon_name, "monster_", 8 ) == 0 )
+		killer_weapon_name += 8;
+	else if ( strncmp( killer_weapon_name, "func_", 5 ) == 0 )
+		killer_weapon_name += 5;
+
+	MESSAGE_BEGIN( MSG_ALL, gmsgDeathMsg );
+		WRITE_BYTE( killer_index );						// the killer
+		WRITE_BYTE( ENTINDEX(pVictim->edict()) );		// the victim
+		WRITE_STRING( killer_weapon_name );		// what they were killed by (should this be a string?)
+	MESSAGE_END();
+
+	// replace the code names with the 'real' names
+	if ( !strcmp( killer_weapon_name, "egon" ) )
+		killer_weapon_name = gluon;
+	else if ( !strcmp( killer_weapon_name, "gauss" ) )
+		killer_weapon_name = tau;
+
+	if ( pVictim->pev == pKiller )  
+	{
+		// killed self
+
+		// team match?
+		if ( g_teamplay )
+		{
+			UTIL_LogPrintf( "\"%s<%i><%s><%s>\" committed suicide with \"%s\"\n",  
+				STRING( pVictim->pev->netname ), 
+				GETPLAYERUSERID( pVictim->edict() ),
+#ifdef USE_UPP
+				UPPUtil_GetNetworkID(pVictim->edict()).c_str(),
+#else
+				AvHSUGetPlayerAuthIDString( pVictim->edict() ).c_str(),
+#endif
+				AvHSUGetTeamName(pVictim->pev->team),
+				killer_weapon_name );		
+		}
+		else
+		{
+			UTIL_LogPrintf( "\"%s<%i><%s><%i>\" committed suicide with \"%s\"\n",  
+				STRING( pVictim->pev->netname ), 
+				GETPLAYERUSERID( pVictim->edict() ),
+#ifdef USE_UPP
+				UPPUtil_GetNetworkID(pVictim->edict()).c_str(),
+#else
+				AvHSUGetPlayerAuthIDString( pVictim->edict() ).c_str(),
+#endif
+				GETPLAYERUSERID( pVictim->edict() ),
+				killer_weapon_name );		
+		}
+	}
+	else if ( pKiller->flags & FL_CLIENT )
+	{
+		// team match?
+		if ( g_teamplay )
+		{
+			UTIL_LogPrintf( "\"%s<%i><%s><%s>\" killed \"%s<%i><%s><%s>\" with \"%s\"\n",  
+				STRING( pKiller->netname ),
+				GETPLAYERUSERID( ENT(pKiller) ),
+#ifdef USE_UPP
+				UPPUtil_GetNetworkID(ENT(pKiller)).c_str(),
+#else
+				AvHSUGetPlayerAuthIDString( ENT(pKiller) ).c_str(),
+#endif
+				AvHSUGetTeamName(pKiller->team),
+				STRING( pVictim->pev->netname ),
+				GETPLAYERUSERID( pVictim->edict() ),
+#ifdef USE_UPP
+				UPPUtil_GetNetworkID(pVictim->edict()).c_str(),
+#else
+				AvHSUGetPlayerAuthIDString( pVictim->edict() ).c_str(),
+#endif
+				AvHSUGetTeamName(pVictim->pev->team),
+				killer_weapon_name );
+		}
+		else
+		{
+			UTIL_LogPrintf( "\"%s<%i><%s><%i>\" killed \"%s<%i><%s><%i>\" with \"%s\"\n",  
+				STRING( pKiller->netname ),
+				GETPLAYERUSERID( ENT(pKiller) ),
+#ifdef USE_UPP
+				UPPUtil_GetNetworkID(ENT(pKiller)).c_str(),
+#else
+				AvHSUGetPlayerAuthIDString( ENT(pKiller) ).c_str(),
+#endif
+				GETPLAYERUSERID( ENT(pKiller) ),
+				STRING( pVictim->pev->netname ),
+				GETPLAYERUSERID( pVictim->edict() ),
+#ifdef USE_UPP
+				UPPUtil_GetNetworkID(pVictim->edict()).c_str(),
+#else
+				AvHSUGetPlayerAuthIDString( pVictim->edict() ).c_str(),
+#endif
+				GETPLAYERUSERID( pVictim->edict() ),
+				killer_weapon_name );
+		}
+	}
+	else
+	{ 
+		// killed by the world
+
+		// team match?
+		if ( g_teamplay )
+		{
+			UTIL_LogPrintf( "\"%s<%i><%s><%s>\" committed suicide with \"%s\" (world)\n",
+				STRING( pVictim->pev->netname ), 
+				GETPLAYERUSERID( pVictim->edict() ), 
+#ifdef USE_UPP
+				UPPUtil_GetNetworkID(pVictim->edict()).c_str(),
+#else
+				AvHSUGetPlayerAuthIDString( pVictim->edict() ).c_str(),
+#endif
+				AvHSUGetTeamName(pVictim->pev->team),
+				killer_weapon_name );		
+		}
+		else
+		{
+			UTIL_LogPrintf( "\"%s<%i><%s><%i>\" committed suicide with \"%s\" (world)\n",
+				STRING( pVictim->pev->netname ), 
+				GETPLAYERUSERID( pVictim->edict() ), 
+#ifdef USE_UPP
+				UPPUtil_GetNetworkID(pVictim->edict()).c_str(),
+#else
+				AvHSUGetPlayerAuthIDString( pVictim->edict() ).c_str(),
+#endif
+				GETPLAYERUSERID( pVictim->edict() ),
+				killer_weapon_name );		
+		}
+	}
+
+	MESSAGE_BEGIN( MSG_SPEC, SVC_DIRECTOR );
+		WRITE_BYTE(DIRECTOR_MESSAGE_SIZE);
+		WRITE_BYTE(DRC_CMD_EVENT);	// player killed
+		WRITE_SHORT( ENTINDEX(pVictim->edict()) );	// index number of primary entity
+		if (pevInflictor)
+			WRITE_SHORT( ENTINDEX(ENT(pevInflictor)) );	// index number of secondary entity
+		else
+			WRITE_SHORT( ENTINDEX(ENT(pKiller)) );	// index number of secondary entity
+		WRITE_LONG( 7 | DRC_FLAG_DRAMATIC);   // eventflags (priority and flags)
+	MESSAGE_END();
+
+//  Print a standard message
+	// TODO: make this go direct to console
+	return; // just remove for now
+/*
+	char	szText[ 128 ];
+
+	if ( pKiller->flags & FL_MONSTER )
+	{
+		// killed by a monster
+		strcpy ( szText, STRING( pVictim->pev->netname ) );
+		strcat ( szText, " was killed by a monster.\n" );
+		return;
+	}
+
+	if ( pKiller == pVictim->pev )
+	{
+		strcpy ( szText, STRING( pVictim->pev->netname ) );
+		strcat ( szText, " commited suicide.\n" );
+	}
+	else if ( pKiller->flags & FL_CLIENT )
+	{
+		strcpy ( szText, STRING( pKiller->netname ) );
+
+		strcat( szText, " : " );
+		strcat( szText, killer_weapon_name );
+		strcat( szText, " : " );
+
+		strcat ( szText, STRING( pVictim->pev->netname ) );
+		strcat ( szText, "\n" );
+	}
+	else if ( FClassnameIs ( pKiller, "worldspawn" ) )
+	{
+		strcpy ( szText, STRING( pVictim->pev->netname ) );
+		strcat ( szText, " fell or drowned or something.\n" );
+	}
+	else if ( pKiller->solid == SOLID_BSP )
+	{
+		strcpy ( szText, STRING( pVictim->pev->netname ) );
+		strcat ( szText, " was mooshed.\n" );
+	}
+	else
+	{
+		strcpy ( szText, STRING( pVictim->pev->netname ) );
+		strcat ( szText, " died mysteriously.\n" );
+	}
+
+	UTIL_ClientPrintAll( szText );
+*/
+}
+
+//=========================================================
+// PlayerGotWeapon - player has grabbed a weapon that was
+// sitting in the world
+//=========================================================
+void CHalfLifeMultiplay :: PlayerGotWeapon( CBasePlayer *pPlayer, CBasePlayerItem *pWeapon )
+{
+}
+
+//=========================================================
+// FlWeaponRespawnTime - what is the time in the future
+// at which this weapon may spawn?
+//=========================================================
+float CHalfLifeMultiplay :: FlWeaponRespawnTime( CBasePlayerItem *pWeapon )
+{
+	if ( weaponstay.value > 0 )
+	{
+		// make sure it's only certain weapons
+		if ( !(pWeapon->iFlags() & ITEM_FLAG_LIMITINWORLD) )
+		{
+			return gpGlobals->time + 0;		// weapon respawns almost instantly
+		}
+	}
+
+	return gpGlobals->time + WEAPON_RESPAWN_TIME;
+}
+
+// when we are within this close to running out of entities,  items 
+// marked with the ITEM_FLAG_LIMITINWORLD will delay their respawn
+#define ENTITY_INTOLERANCE	100
+
+//=========================================================
+// FlWeaponRespawnTime - Returns 0 if the weapon can respawn 
+// now,  otherwise it returns the time at which it can try
+// to spawn again.
+//=========================================================
+float CHalfLifeMultiplay :: FlWeaponTryRespawn( CBasePlayerItem *pWeapon )
+{
+	if ( pWeapon && pWeapon->m_iId && (pWeapon->iFlags() & ITEM_FLAG_LIMITINWORLD) )
+	{
+		if ( NUMBER_OF_ENTITIES() < (gpGlobals->maxEntities - ENTITY_INTOLERANCE) )
+			return 0;
+
+		// we're past the entity tolerance level,  so delay the respawn
+		return FlWeaponRespawnTime( pWeapon );
+	}
+
+	return 0;
+}
+
+//=========================================================
+// VecWeaponRespawnSpot - where should this weapon spawn?
+// Some game variations may choose to randomize spawn locations
+//=========================================================
+Vector CHalfLifeMultiplay :: VecWeaponRespawnSpot( CBasePlayerItem *pWeapon )
+{
+	return pWeapon->pev->origin;
+}
+
+//=========================================================
+// WeaponShouldRespawn - any conditions inhibiting the
+// respawning of this weapon?
+//=========================================================
+int CHalfLifeMultiplay :: WeaponShouldRespawn( CBasePlayerItem *pWeapon )
+{
+	if ( pWeapon->pev->spawnflags & SF_NORESPAWN )
+	{
+		return GR_WEAPON_RESPAWN_NO;
+	}
+
+	return GR_WEAPON_RESPAWN_YES;
+}
+
+//=========================================================
+// CanHaveWeapon - returns FALSE if the player is not allowed
+// to pick up this weapon
+//=========================================================
+BOOL CHalfLifeMultiplay::CanHavePlayerItem( CBasePlayer *pPlayer, CBasePlayerItem *pItem )
+{
+	if ( weaponstay.value > 0 )
+	{
+		if ( pItem->iFlags() & ITEM_FLAG_LIMITINWORLD )
+			return CGameRules::CanHavePlayerItem( pPlayer, pItem );
+
+		// check if the player already has this weapon
+		for ( int i = 0 ; i < MAX_ITEM_TYPES ; i++ )
+		{
+			CBasePlayerItem *it = pPlayer->m_rgpPlayerItems[i];
+
+			while ( it != NULL )
+			{
+				if ( it->m_iId == pItem->m_iId )
+				{
+					return FALSE;
+				}
+
+				it = it->m_pNext;
+			}
+		}
+	}
+
+	return CGameRules::CanHavePlayerItem( pPlayer, pItem );
+}
+
+//=========================================================
+//=========================================================
+BOOL CHalfLifeMultiplay::CanHaveItem( CBasePlayer *pPlayer, CItem *pItem )
+{
+	return TRUE;
+}
+
+//=========================================================
+//=========================================================
+void CHalfLifeMultiplay::PlayerGotItem( CBasePlayer *pPlayer, CItem *pItem )
+{
+}
+
+//=========================================================
+//=========================================================
+int CHalfLifeMultiplay::ItemShouldRespawn( CItem *pItem )
+{
+	if ( pItem->pev->spawnflags & SF_NORESPAWN )
+	{
+		return GR_ITEM_RESPAWN_NO;
+	}
+
+	return GR_ITEM_RESPAWN_YES;
+}
+
+
+//=========================================================
+// At what time in the future may this Item respawn?
+//=========================================================
+float CHalfLifeMultiplay::FlItemRespawnTime( CItem *pItem )
+{
+	return gpGlobals->time + ITEM_RESPAWN_TIME;
+}
+
+//=========================================================
+// Where should this item respawn?
+// Some game variations may choose to randomize spawn locations
+//=========================================================
+Vector CHalfLifeMultiplay::VecItemRespawnSpot( CItem *pItem )
+{
+	return pItem->pev->origin;
+}
+
+//=========================================================
+//=========================================================
+void CHalfLifeMultiplay::PlayerGotAmmo( CBasePlayer *pPlayer, char *szName, int iCount )
+{
+}
+
+//=========================================================
+//=========================================================
+BOOL CHalfLifeMultiplay::IsAllowedToSpawn( CBaseEntity *pEntity )
+{
+//	if ( pEntity->pev->flags & FL_MONSTER )
+//		return FALSE;
+
+	return TRUE;
+}
+
+//=========================================================
+//=========================================================
+int CHalfLifeMultiplay::AmmoShouldRespawn( CBasePlayerAmmo *pAmmo )
+{
+	if ( pAmmo->pev->spawnflags & SF_NORESPAWN )
+	{
+		return GR_AMMO_RESPAWN_NO;
+	}
+
+	return GR_AMMO_RESPAWN_YES;
+}
+
+//=========================================================
+//=========================================================
+float CHalfLifeMultiplay::FlAmmoRespawnTime( CBasePlayerAmmo *pAmmo )
+{
+	return gpGlobals->time + AMMO_RESPAWN_TIME;
+}
+
+//=========================================================
+//=========================================================
+Vector CHalfLifeMultiplay::VecAmmoRespawnSpot( CBasePlayerAmmo *pAmmo )
+{
+	return pAmmo->pev->origin;
+}
+
+//=========================================================
+//=========================================================
+float CHalfLifeMultiplay::FlHealthChargerRechargeTime( void )
+{
+	return 60;
+}
+
+
+float CHalfLifeMultiplay::FlHEVChargerRechargeTime( void )
+{
+	return 30;
+}
+
+//=========================================================
+//=========================================================
+int CHalfLifeMultiplay::DeadPlayerWeapons( CBasePlayer *pPlayer )
+{
+	return GR_PLR_DROP_GUN_ACTIVE;
+}
+
+//=========================================================
+//=========================================================
+int CHalfLifeMultiplay::DeadPlayerAmmo( CBasePlayer *pPlayer )
+{
+	return GR_PLR_DROP_AMMO_ACTIVE;
+}
+
+edict_t *CHalfLifeMultiplay::GetPlayerSpawnSpot( CBasePlayer *pPlayer )
+{
+	edict_t *pentSpawnSpot = CGameRules::GetPlayerSpawnSpot( pPlayer );	
+	if ( IsMultiplayer() && !FNullEnt(pentSpawnSpot) && (pentSpawnSpot->v.target))
+	{
+		FireTargets( STRING(pentSpawnSpot->v.target), pPlayer, pPlayer, USE_TOGGLE, 0 );
+	}
+
+	return pentSpawnSpot;
+}
+
+
+//=========================================================
+//=========================================================
+int CHalfLifeMultiplay::PlayerRelationship( CBaseEntity *pPlayer, CBaseEntity *pTarget )
+{
+	// half life deathmatch has only enemies
+	return GR_NOTTEAMMATE;
+}
+
+BOOL CHalfLifeMultiplay :: PlayFootstepSounds( CBasePlayer *pl, float fvol )
+{
+	if ( g_footsteps && g_footsteps->value == 0 )
+		return FALSE;
+
+	if ( pl->IsOnLadder() || pl->pev->velocity.Length2D() > pl->GetMaxWalkSpeed() )
+		return TRUE;  // only make step sounds in multiplayer if the player is moving fast enough
+
+	return FALSE;
+}
+
+BOOL CHalfLifeMultiplay :: FAllowFlashlight( void ) 
+{ 
+	return flashlight.value != 0; 
+}
+
+//=========================================================
+//=========================================================
+BOOL CHalfLifeMultiplay :: FAllowMonsters( void )
+{
+	return ( allowmonsters.value != 0 );
+}
+
+//=========================================================
+//======== CHalfLifeMultiplay private functions ===========
+#define INTERMISSION_TIME		6
+
+void CHalfLifeMultiplay :: GoToIntermission( void )
+{
+	if ( g_fGameOver )
+		return;  // intermission has already been triggered, so ignore.
+
+	MESSAGE_BEGIN(MSG_ALL, SVC_INTERMISSION);
+	MESSAGE_END();
+
+	// bounds check
+	int time = (int)CVAR_GET_FLOAT( "mp_chattime" );
+	if ( time < 10 )
+		CVAR_SET_STRING( "mp_chattime", "10" );
+	else if ( time > MAX_INTERMISSION_TIME )
+		CVAR_SET_STRING( "mp_chattime", UTIL_dtos1( MAX_INTERMISSION_TIME ) );
+
+	m_flIntermissionEndTime = gpGlobals->time + ( (int)mp_chattime.value );
+	g_flIntermissionStartTime = gpGlobals->time;
+
+	g_fGameOver = TRUE;
+	m_iEndIntermissionButtonHit = FALSE;
+}
+
+#define MAX_RULE_BUFFER 1024
+
+typedef struct mapcycle_item_s
+{
+	struct mapcycle_item_s *next;
+
+	char mapname[ 32 ];
+	int  minplayers, maxplayers;
+	char rulebuffer[ MAX_RULE_BUFFER ];
+} mapcycle_item_t;
+
+typedef struct mapcycle_s
+{
+	struct mapcycle_item_s *items;
+	struct mapcycle_item_s *next_item;
+} mapcycle_t;
+
+/*
+==============
+DestroyMapCycle
+
+Clean up memory used by mapcycle when switching it
+==============
+*/
+void DestroyMapCycle( mapcycle_t *cycle )
+{
+	mapcycle_item_t *p, *n, *start;
+	p = cycle->items;
+	if ( p )
+	{
+		start = p;
+		p = p->next;
+		while ( p != start )
+		{
+			n = p->next;
+			delete p;
+			p = n;
+		}
+		
+		delete cycle->items;
+	}
+	cycle->items = NULL;
+	cycle->next_item = NULL;
+}
+
+static char com_token[ 1500 ];
+
+/*
+==============
+COM_Parse
+
+Parse a token out of a string
+==============
+*/
+char *COM_Parse (char *data)
+{
+	int             c;
+	int             len;
+	
+	len = 0;
+	com_token[0] = 0;
+	
+	if (!data)
+		return NULL;
+		
+// skip whitespace
+skipwhite:
+	while ( (c = *data) <= ' ')
+	{
+		if (c == 0)
+			return NULL;                    // end of file;
+		data++;
+	}
+	
+// skip // comments
+	if (c=='/' && data[1] == '/')
+	{
+		while (*data && *data != '\n')
+			data++;
+		goto skipwhite;
+	}
+	
+
+// handle quoted strings specially
+	if (c == '\"')
+	{
+		data++;
+		while (1)
+		{
+			c = *data++;
+			if (c=='\"' || !c)
+			{
+				com_token[len] = 0;
+				return data;
+			}
+			com_token[len] = c;
+			len++;
+		}
+	}
+
+// parse single characters
+	if (c=='{' || c=='}'|| c==')'|| c=='(' || c=='\'' || c == ',' )
+	{
+		com_token[len] = c;
+		len++;
+		com_token[len] = 0;
+		return data+1;
+	}
+
+// parse a regular word
+	do
+	{
+		com_token[len] = c;
+		data++;
+		len++;
+		c = *data;
+	if (c=='{' || c=='}'|| c==')'|| c=='(' || c=='\'' || c == ',' )
+			break;
+	} while (c>32);
+	
+	com_token[len] = 0;
+	return data;
+}
+
+/*
+==============
+COM_TokenWaiting
+
+Returns 1 if additional data is waiting to be processed on this line
+==============
+*/
+int COM_TokenWaiting( char *buffer )
+{
+	char *p;
+
+	p = buffer;
+	while ( *p && *p!='\n')
+	{
+		if ( !isspace( *p ) || isalnum( *p ) )
+			return 1;
+
+		p++;
+	}
+
+	return 0;
+}
+
+void GetMapNamesFromMapCycle(StringList& outMapNameList)
+{
+    char* mapcfile = (char*)CVAR_GET_STRING( "mapcyclefile" );
+    ASSERT( mapcfile != NULL );
+    
+    char szBuffer[ MAX_RULE_BUFFER ];
+    char szMap[ 32 ];
+    int length;
+    char *pFileList;
+    char *aFileList = pFileList = (char*)LOAD_FILE_FOR_ME( mapcfile, &length );
+    int hasbuffer;
+    mapcycle_item_s *newlist = NULL;
+    
+    if ( pFileList && length )
+    {
+        // the first map name in the file becomes the default
+        while ( 1 )
+        {
+            hasbuffer = 0;
+            memset( szBuffer, 0, MAX_RULE_BUFFER );
+            
+            pFileList = COM_Parse( pFileList );
+            if ( strlen( com_token ) <= 0 )
+                break;
+            
+            strcpy( szMap, com_token );
+            
+            // Any more tokens on this line?
+            if ( COM_TokenWaiting( pFileList ) )
+            {
+                pFileList = COM_Parse( pFileList );
+                if ( strlen( com_token ) > 0 )
+                {
+                    hasbuffer = 1;
+                    strcpy( szBuffer, com_token );
+                }
+            }
+            
+            // Check map
+            if ( IS_MAP_VALID( szMap ) )
+            {
+                outMapNameList.push_back( szMap );
+            }
+        }
+        
+        FREE_FILE( aFileList );
+    }
+}
+
+
+/*
+==============
+ReloadMapCycleFile
+
+
+Parses mapcycle.txt file into mapcycle_t structure
+==============
+*/
+int ReloadMapCycleFile( char *filename, mapcycle_t *cycle )
+{
+	char szBuffer[ MAX_RULE_BUFFER ];
+	char szMap[ 32 ];
+	int length;
+	char *pFileList;
+	char *aFileList = pFileList = (char*)LOAD_FILE_FOR_ME( filename, &length );
+	int hasbuffer;
+	mapcycle_item_s *item, *newlist = NULL, *next;
+
+	if ( pFileList && length )
+	{
+		// the first map name in the file becomes the default
+		while ( 1 )
+		{
+			hasbuffer = 0;
+			memset( szBuffer, 0, MAX_RULE_BUFFER );
+
+			pFileList = COM_Parse( pFileList );
+			if ( strlen( com_token ) <= 0 )
+				break;
+
+			strcpy( szMap, com_token );
+
+			// Any more tokens on this line?
+			if ( COM_TokenWaiting( pFileList ) )
+			{
+				pFileList = COM_Parse( pFileList );
+				if ( strlen( com_token ) > 0 )
+				{
+					hasbuffer = 1;
+					strcpy( szBuffer, com_token );
+				}
+			}
+
+			// Check map
+			if ( IS_MAP_VALID( szMap ) )
+			{
+				// Create entry
+				char *s;
+
+				item = new mapcycle_item_s;
+
+				strcpy( item->mapname, szMap );
+
+				item->minplayers = 0;
+				item->maxplayers = 0;
+
+				memset( item->rulebuffer, 0, MAX_RULE_BUFFER );
+
+				if ( hasbuffer )
+				{
+					s = g_engfuncs.pfnInfoKeyValue( szBuffer, "minplayers" );
+					if ( s && s[0] )
+					{
+						item->minplayers = atoi( s );
+						item->minplayers = max( item->minplayers, 0 );
+						item->minplayers = min( item->minplayers, gpGlobals->maxClients );
+					}
+					s = g_engfuncs.pfnInfoKeyValue( szBuffer, "maxplayers" );
+					if ( s && s[0] )
+					{
+						item->maxplayers = atoi( s );
+						item->maxplayers = max( item->maxplayers, 0 );
+						item->maxplayers = min( item->maxplayers, gpGlobals->maxClients );
+					}
+
+					// Remove keys
+					//
+					g_engfuncs.pfnInfo_RemoveKey( szBuffer, "minplayers" );
+					g_engfuncs.pfnInfo_RemoveKey( szBuffer, "maxplayers" );
+
+					strcpy( item->rulebuffer, szBuffer );
+				}
+
+				item->next = cycle->items;
+				cycle->items = item;
+			}
+			else
+			{
+				ALERT( at_console, "Skipping %s from mapcycle, not a valid map\n", szMap );
+			}
+
+		}
+
+		FREE_FILE( aFileList );
+	}
+
+	// Fixup circular list pointer
+	item = cycle->items;
+
+	// Reverse it to get original order
+	while ( item )
+	{
+		next = item->next;
+		item->next = newlist;
+		newlist = item;
+		item = next;
+	}
+	cycle->items = newlist;
+	item = cycle->items;
+
+	// Didn't parse anything
+	if ( !item )
+	{
+		return 0;
+	}
+
+	while ( item->next )
+	{
+		item = item->next;
+	}
+	item->next = cycle->items;
+	
+	cycle->next_item = item->next;
+
+	return 1;
+}
+
+/*
+==============
+CountPlayers
+
+Determine the current # of active players on the server for map cycling logic
+==============
+*/
+int CountPlayers( void )
+{
+	int	num = 0;
+
+	for ( int i = 1; i <= gpGlobals->maxClients; i++ )
+	{
+		CBaseEntity *pEnt = UTIL_PlayerByIndex( i );
+
+		if ( pEnt )
+		{
+			num = num + 1;
+		}
+	}
+
+	return num;
+}
+
+/*
+==============
+ExtractCommandString
+
+Parse commands/key value pairs to issue right after map xxx command is issued on server
+ level transition
+==============
+*/
+void ExtractCommandString( char *s, char *szCommand )
+{
+	// Now make rules happen
+	char	pkey[512];
+	char	value[512];	// use two buffers so compares
+								// work without stomping on each other
+	char	*o;
+	
+	if ( *s == '\\' )
+		s++;
+
+	while (1)
+	{
+		o = pkey;
+		while ( *s != '\\' )
+		{
+			if ( !*s )
+				return;
+			*o++ = *s++;
+		}
+		*o = 0;
+		s++;
+
+		o = value;
+
+		while (*s != '\\' && *s)
+		{
+			if (!*s)
+				return;
+			*o++ = *s++;
+		}
+		*o = 0;
+
+		strcat( szCommand, pkey );
+		if ( strlen( value ) > 0 )
+		{
+			strcat( szCommand, " " );
+			strcat( szCommand, value );
+		}
+		strcat( szCommand, "\n" );
+
+		if (!*s)
+			return;
+		s++;
+	}
+}
+
+/*
+==============
+ChangeLevel
+
+Server is changing to a new level, check mapcycle.txt for map name and setup info
+==============
+*/
+void CHalfLifeMultiplay :: ChangeLevel( void )
+{
+	static char szPreviousMapCycleFile[ 256 ];
+	static mapcycle_t mapcycle;
+
+	char szNextMap[32];
+	char szFirstMapInList[32];
+	char szCommands[ 1500 ];
+	char szRules[ 1500 ];
+	int minplayers = 0, maxplayers = 0;
+	strcpy( szFirstMapInList, "hldm1" );  // the absolute default level is hldm1
+
+	int	curplayers;
+	BOOL do_cycle = TRUE;
+
+	// find the map to change to
+	char *mapcfile = (char*)CVAR_GET_STRING( "mapcyclefile" );
+	ASSERT( mapcfile != NULL );
+
+	szCommands[ 0 ] = '\0';
+	szRules[ 0 ] = '\0';
+
+	curplayers = CountPlayers();
+
+	// Has the map cycle filename changed?
+	if ( stricmp( mapcfile, szPreviousMapCycleFile ) )
+	{
+		strcpy( szPreviousMapCycleFile, mapcfile );
+
+		DestroyMapCycle( &mapcycle );
+
+		if ( !ReloadMapCycleFile( mapcfile, &mapcycle ) || ( !mapcycle.items ) )
+		{
+			ALERT( at_console, "Unable to load map cycle file %s\n", mapcfile );
+			do_cycle = FALSE;
+		}
+	}
+
+	if ( do_cycle && mapcycle.items )
+	{
+		BOOL keeplooking = FALSE;
+		BOOL found = FALSE;
+		mapcycle_item_s *item;
+
+		// Assume current map
+		strcpy( szNextMap, STRING(gpGlobals->mapname) );
+		strcpy( szFirstMapInList, STRING(gpGlobals->mapname) );
+
+		// Traverse list
+		for ( item = mapcycle.next_item; item->next != mapcycle.next_item; item = item->next )
+		{
+			keeplooking = FALSE;
+
+			ASSERT( item != NULL );
+
+			if ( item->minplayers != 0 )
+			{
+				if ( curplayers >= item->minplayers )
+				{
+					found = TRUE;
+					minplayers = item->minplayers;
+				}
+				else
+				{
+					keeplooking = TRUE;
+				}
+			}
+
+			if ( item->maxplayers != 0 )
+			{
+				if ( curplayers <= item->maxplayers )
+				{
+					found = TRUE;
+					maxplayers = item->maxplayers;
+				}
+				else
+				{
+					keeplooking = TRUE;
+				}
+			}
+
+			if ( keeplooking )
+				continue;
+
+			found = TRUE;
+			break;
+		}
+
+		if ( !found )
+		{
+			item = mapcycle.next_item;
+		}			
+		
+		// Increment next item pointer
+		mapcycle.next_item = item->next;
+
+		// Perform logic on current item
+		strcpy( szNextMap, item->mapname );
+
+		ExtractCommandString( item->rulebuffer, szCommands );
+		strcpy( szRules, item->rulebuffer );
+	}
+
+	if ( !IS_MAP_VALID(szNextMap) )
+	{
+		strcpy( szNextMap, szFirstMapInList );
+	}
+
+	g_fGameOver = TRUE;
+
+	ALERT( at_console, "CHANGE LEVEL: %s\n", szNextMap );
+	if ( minplayers || maxplayers )
+	{
+		ALERT( at_console, "PLAYER COUNT:  min %i max %i current %i\n", minplayers, maxplayers, curplayers );
+	}
+	if ( strlen( szRules ) > 0 )
+	{
+		ALERT( at_console, "RULES:  %s\n", szRules );
+	}
+	
+	CHANGE_LEVEL( szNextMap, NULL );
+	if ( strlen( szCommands ) > 0 )
+	{
+		SERVER_COMMAND( szCommands );
+	}
+}
+
+#define MAX_MOTD_CHUNK	  60
+#define MAX_MOTD_LENGTH   1536 // (MAX_MOTD_CHUNK * 4)
+
+void CHalfLifeMultiplay :: SendMOTDToClient( edict_t *client )
+{
+	// read from the MOTD.txt file
+	int length, char_count = 0;
+	char *pFileList;
+	char *aFileList = pFileList = (char*)LOAD_FILE_FOR_ME( (char *)CVAR_GET_STRING( "motdfile" ), &length );
+
+	// send the server name
+	MESSAGE_BEGIN( MSG_ONE, gmsgServerName, NULL, client );
+	WRITE_STRING( CVAR_GET_STRING("hostname") );
+	MESSAGE_END();
+	
+	// Send the message of the day
+	// read it chunk-by-chunk,  and send it in parts
+	
+	while ( pFileList && *pFileList && char_count < MAX_MOTD_LENGTH )
+	{
+		char chunk[MAX_MOTD_CHUNK+1];
+		
+		if ( strlen( pFileList ) < MAX_MOTD_CHUNK )
+		{
+			strcpy( chunk, pFileList );
+		}
+		else
+		{
+			strncpy( chunk, pFileList, MAX_MOTD_CHUNK );
+			chunk[MAX_MOTD_CHUNK] = 0;		// strncpy doesn't always append the null terminator
+		}
+		
+		char_count += strlen( chunk );
+		if ( char_count < MAX_MOTD_LENGTH )
+			pFileList = aFileList + char_count; 
+		else
+			*pFileList = 0;
+		
+		MESSAGE_BEGIN( MSG_ONE, gmsgMOTD, NULL, client );
+		WRITE_BYTE( *pFileList ? FALSE : TRUE );	// FALSE means there is still more message to come
+		WRITE_STRING( chunk );
+		MESSAGE_END();
+	}
+	
+	FREE_FILE( aFileList );
+}
+
diff --git a/main/source/dlls/nihilanth.cpp b/main/source/dlls/nihilanth.cpp
new file mode 100644
index 00000000..8116f902
--- /dev/null
+++ b/main/source/dlls/nihilanth.cpp
@@ -0,0 +1,1836 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD )
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "effects.h"
+
+#define N_SCALE		15
+#define N_SPHERES	20
+
+class CNihilanth : public CBaseMonster
+{
+public:
+	int		Save( CSave &save );
+	int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	void Spawn( void );
+	void Precache( void );
+	int  Classify( void ) { return CLASS_ALIEN_MILITARY; };
+	int  BloodColor( void ) { return BLOOD_COLOR_YELLOW; }
+	void Killed( entvars_t *pevAttacker, int iGib );
+	void GibMonster( void );
+
+	void SetObjectCollisionBox( void )
+	{
+		pev->absmin = pev->origin + Vector( -16 * N_SCALE, -16 * N_SCALE, -48 * N_SCALE );
+		pev->absmax = pev->origin + Vector( 16 * N_SCALE, 16 * N_SCALE, 28 * N_SCALE );
+	}
+
+	void HandleAnimEvent( MonsterEvent_t *pEvent );
+
+	void EXPORT StartupThink( void );
+	void EXPORT HuntThink( void );
+	void EXPORT CrashTouch( CBaseEntity *pOther );
+	void EXPORT DyingThink( void );
+	void EXPORT StartupUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void EXPORT NullThink( void );
+	void EXPORT CommandUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+	void FloatSequence( void );
+	void NextActivity( void );
+
+	void Flight( void );
+
+	BOOL AbsorbSphere( void );
+	BOOL EmitSphere( void );
+	void TargetSphere( USE_TYPE useType, float value );
+	CBaseEntity *RandomTargetname( const char *szName );
+	void ShootBalls( void );
+	void MakeFriend( Vector vecPos );
+	
+	int  TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType );
+	void TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType);
+
+	void PainSound( void );
+	void DeathSound( void );
+
+	static const char *pAttackSounds[];	// vocalization: play sometimes when he launches an attack
+	static const char *pBallSounds[];	// the sound of the lightening ball launch
+	static const char *pShootSounds[];	// grunting vocalization: play sometimes when he launches an attack
+	static const char *pRechargeSounds[];	// vocalization: play when he recharges
+	static const char *pLaughSounds[];	// vocalization: play sometimes when hit and still has lots of health
+	static const char *pPainSounds[];	// vocalization: play sometimes when hit and has much less health and no more chargers
+	static const char *pDeathSounds[];	// vocalization: play as he dies
+	
+	// x_teleattack1.wav	the looping sound of the teleport attack ball.
+
+	float m_flForce;
+
+	float m_flNextPainSound;
+
+	Vector m_velocity;
+	Vector m_avelocity;
+
+	Vector m_vecTarget;
+	Vector m_posTarget;
+
+	Vector m_vecDesired;
+	Vector m_posDesired;
+
+	float  m_flMinZ;
+	float  m_flMaxZ;
+
+	Vector m_vecGoal;
+
+	float m_flLastSeen;
+	float m_flPrevSeen;
+
+	int m_irritation;
+
+	int m_iLevel;
+	int m_iTeleport;
+
+	EHANDLE m_hRecharger;
+
+	EHANDLE m_hSphere[N_SPHERES];
+	int	m_iActiveSpheres;
+
+	float m_flAdj;
+
+	CSprite *m_pBall;
+
+	char m_szRechargerTarget[64];
+	char m_szDrawUse[64];
+	char m_szTeleportUse[64];
+	char m_szTeleportTouch[64];
+	char m_szDeadUse[64];
+	char m_szDeadTouch[64];
+
+	float m_flShootEnd;
+	float m_flShootTime;
+
+	EHANDLE m_hFriend[3];
+};
+
+LINK_ENTITY_TO_CLASS( monster_nihilanth, CNihilanth );
+
+TYPEDESCRIPTION	CNihilanth::m_SaveData[] = 
+{
+	DEFINE_FIELD( CNihilanth, m_flForce, FIELD_FLOAT ),
+	DEFINE_FIELD( CNihilanth, m_flNextPainSound, FIELD_TIME ),
+	DEFINE_FIELD( CNihilanth, m_velocity, FIELD_VECTOR ),
+	DEFINE_FIELD( CNihilanth, m_avelocity, FIELD_VECTOR ),
+	DEFINE_FIELD( CNihilanth, m_vecTarget, FIELD_VECTOR ),
+	DEFINE_FIELD( CNihilanth, m_posTarget, FIELD_POSITION_VECTOR ),
+	DEFINE_FIELD( CNihilanth, m_vecDesired, FIELD_VECTOR ),
+	DEFINE_FIELD( CNihilanth, m_posDesired, FIELD_POSITION_VECTOR ),
+	DEFINE_FIELD( CNihilanth, m_flMinZ, FIELD_FLOAT ),
+	DEFINE_FIELD( CNihilanth, m_flMaxZ, FIELD_FLOAT ),
+	DEFINE_FIELD( CNihilanth, m_vecGoal, FIELD_VECTOR ),
+	DEFINE_FIELD( CNihilanth, m_flLastSeen, FIELD_TIME ),
+	DEFINE_FIELD( CNihilanth, m_flPrevSeen, FIELD_TIME ),
+	DEFINE_FIELD( CNihilanth, m_irritation, FIELD_INTEGER ),
+	DEFINE_FIELD( CNihilanth, m_iLevel, FIELD_INTEGER ),
+	DEFINE_FIELD( CNihilanth, m_iTeleport, FIELD_INTEGER ),
+	DEFINE_FIELD( CNihilanth, m_hRecharger, FIELD_EHANDLE ),
+	DEFINE_ARRAY( CNihilanth, m_hSphere, FIELD_EHANDLE, N_SPHERES ),
+	DEFINE_FIELD( CNihilanth, m_iActiveSpheres, FIELD_INTEGER ),
+	DEFINE_FIELD( CNihilanth, m_flAdj, FIELD_FLOAT ),
+	DEFINE_FIELD( CNihilanth, m_pBall, FIELD_CLASSPTR ),
+	DEFINE_ARRAY( CNihilanth, m_szRechargerTarget, FIELD_CHARACTER, 64 ),
+	DEFINE_ARRAY( CNihilanth, m_szDrawUse, FIELD_CHARACTER, 64 ),
+	DEFINE_ARRAY( CNihilanth, m_szTeleportUse, FIELD_CHARACTER, 64 ),
+	DEFINE_ARRAY( CNihilanth, m_szTeleportTouch, FIELD_CHARACTER, 64 ),
+	DEFINE_ARRAY( CNihilanth, m_szDeadUse, FIELD_CHARACTER, 64 ),
+	DEFINE_ARRAY( CNihilanth, m_szDeadTouch, FIELD_CHARACTER, 64 ),
+	DEFINE_FIELD( CNihilanth, m_flShootEnd, FIELD_TIME ),
+	DEFINE_FIELD( CNihilanth, m_flShootTime, FIELD_TIME ),
+	DEFINE_ARRAY( CNihilanth, m_hFriend, FIELD_EHANDLE, 3 ),
+};
+
+IMPLEMENT_SAVERESTORE( CNihilanth, CBaseMonster );
+
+class CNihilanthHVR : public CBaseMonster
+{
+public:
+	int		Save( CSave &save );
+	int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	void Spawn( void );
+	void Precache( void );
+
+	void CircleInit( CBaseEntity *pTarget );
+	void AbsorbInit( void );
+	void TeleportInit( CNihilanth *pOwner, CBaseEntity *pEnemy, CBaseEntity *pTarget, CBaseEntity *pTouch );
+	void GreenBallInit( void );
+	void ZapInit( CBaseEntity *pEnemy );
+
+	void EXPORT HoverThink( void );
+	BOOL CircleTarget( Vector vecTarget );
+	void EXPORT DissipateThink( void );
+
+	void EXPORT ZapThink( void );
+	void EXPORT TeleportThink( void );
+	void EXPORT TeleportTouch( CBaseEntity *pOther );
+	
+	void EXPORT RemoveTouch( CBaseEntity *pOther );
+	void EXPORT BounceTouch( CBaseEntity *pOther );
+	void EXPORT ZapTouch( CBaseEntity *pOther );
+
+	CBaseEntity *RandomClassname( const char *szName );
+
+	// void EXPORT SphereUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+	void MovetoTarget( Vector vecTarget );
+	virtual void Crawl( void );
+
+	void Zap( void );
+	void Teleport( void );
+
+	float m_flIdealVel;
+	Vector m_vecIdeal;
+	CNihilanth *m_pNihilanth;
+	EHANDLE m_hTouch;
+	int m_nFrames;
+};
+
+LINK_ENTITY_TO_CLASS( nihilanth_energy_ball, CNihilanthHVR );
+
+
+TYPEDESCRIPTION	CNihilanthHVR::m_SaveData[] = 
+{
+	DEFINE_FIELD( CNihilanthHVR, m_flIdealVel, FIELD_FLOAT ),
+	DEFINE_FIELD( CNihilanthHVR, m_vecIdeal, FIELD_VECTOR ),
+	DEFINE_FIELD( CNihilanthHVR, m_pNihilanth, FIELD_CLASSPTR ),
+	DEFINE_FIELD( CNihilanthHVR, m_hTouch, FIELD_EHANDLE ),
+	DEFINE_FIELD( CNihilanthHVR, m_nFrames, FIELD_INTEGER ),
+};
+
+
+IMPLEMENT_SAVERESTORE( CNihilanthHVR, CBaseMonster );
+
+
+//=========================================================
+// Nihilanth, final Boss monster
+//=========================================================
+
+const char *CNihilanth::pAttackSounds[] = 
+{
+	"X/x_attack1.wav",
+	"X/x_attack2.wav",
+	"X/x_attack3.wav",
+};
+
+const char *CNihilanth::pBallSounds[] = 
+{
+	"X/x_ballattack1.wav",
+};
+
+const char *CNihilanth::pShootSounds[] = 
+{
+	"X/x_shoot1.wav",
+};
+
+const char *CNihilanth::pRechargeSounds[] = 
+{
+	"X/x_recharge1.wav",
+	"X/x_recharge2.wav",
+	"X/x_recharge3.wav",
+};
+
+const char *CNihilanth::pLaughSounds[] = 
+{
+	"X/x_laugh1.wav",
+	"X/x_laugh2.wav",
+};
+
+const char *CNihilanth::pPainSounds[] = 
+{
+	"X/x_pain1.wav",
+	"X/x_pain2.wav",
+};
+
+const char *CNihilanth::pDeathSounds[] = 
+{
+	"X/x_die1.wav",
+};
+
+
+void CNihilanth :: Spawn( void )
+{
+	Precache( );
+	// motor
+	pev->movetype = MOVETYPE_FLY;
+	pev->solid = SOLID_BBOX;
+
+	SET_MODEL(edict(), "models/nihilanth.mdl");
+	// UTIL_SetSize(pev, Vector( -300, -300, 0), Vector(300, 300, 512));
+	UTIL_SetSize(pev, Vector( -32, -32, 0), Vector(32, 32, 64));
+	UTIL_SetOrigin( pev, pev->origin );
+
+	pev->flags			|= FL_MONSTER;
+	pev->takedamage		= DAMAGE_AIM;
+	pev->health			= gSkillData.nihilanthHealth;
+	pev->view_ofs		= Vector( 0, 0, 300 );
+
+	m_flFieldOfView = -1; // 360 degrees
+
+	pev->sequence = 0;
+	ResetSequenceInfo( );
+
+	InitBoneControllers();
+
+	SetThink( &CNihilanth::StartupThink );
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	m_vecDesired = Vector( 1, 0, 0 );
+	m_posDesired = Vector( pev->origin.x, pev->origin.y, 512 );
+
+	m_iLevel = 1; 
+	m_iTeleport = 1;
+
+	if (m_szRechargerTarget[0] == '\0')	strcpy( m_szRechargerTarget, "n_recharger" );
+	if (m_szDrawUse[0] == '\0')			strcpy( m_szDrawUse, "n_draw" );
+	if (m_szTeleportUse[0] == '\0')		strcpy( m_szTeleportUse, "n_leaving" );
+	if (m_szTeleportTouch[0] == '\0')	strcpy( m_szTeleportTouch, "n_teleport" );
+	if (m_szDeadUse[0] == '\0')			strcpy( m_szDeadUse, "n_dead" );
+	if (m_szDeadTouch[0] == '\0')		strcpy( m_szDeadTouch, "n_ending" );
+
+	// near death
+	/*
+	m_iTeleport = 10;
+	m_iLevel = 10;
+	m_irritation = 2;
+	pev->health = 100;
+	*/
+}
+
+
+void CNihilanth::Precache( void )
+{
+	PRECACHE_MODEL("models/nihilanth.mdl");
+	PRECACHE_MODEL("sprites/lgtning.spr");
+	UTIL_PrecacheOther( "nihilanth_energy_ball" );
+	UTIL_PrecacheOther( "monster_alien_controller" );
+	UTIL_PrecacheOther( "monster_alien_slave" );
+
+	PRECACHE_SOUND_ARRAY( pAttackSounds );
+	PRECACHE_SOUND_ARRAY( pBallSounds );
+	PRECACHE_SOUND_ARRAY( pShootSounds );
+	PRECACHE_SOUND_ARRAY( pRechargeSounds );
+	PRECACHE_SOUND_ARRAY( pLaughSounds );
+	PRECACHE_SOUND_ARRAY( pPainSounds );
+	PRECACHE_SOUND_ARRAY( pDeathSounds );
+	PRECACHE_SOUND("debris/beamstart7.wav");
+}
+
+
+
+void CNihilanth :: PainSound( void )
+{
+	if (m_flNextPainSound > gpGlobals->time)
+		return;
+	
+	m_flNextPainSound = gpGlobals->time + RANDOM_FLOAT( 2, 5 );
+
+	if (pev->health > gSkillData.nihilanthHealth / 2)
+	{
+		EMIT_SOUND( edict(), CHAN_VOICE, RANDOM_SOUND_ARRAY( pLaughSounds ), 1.0, 0.2 ); 
+	}
+	else if (m_irritation >= 2)
+	{
+		EMIT_SOUND( edict(), CHAN_VOICE, RANDOM_SOUND_ARRAY( pPainSounds ), 1.0, 0.2 ); 
+	}
+}	
+
+void CNihilanth :: DeathSound( void )
+{
+	EMIT_SOUND( edict(), CHAN_VOICE, RANDOM_SOUND_ARRAY( pDeathSounds ), 1.0, 0.1 ); 
+}
+
+
+void CNihilanth::NullThink( void )
+{
+	StudioFrameAdvance( );
+	pev->nextthink = gpGlobals->time + 0.5;
+}
+
+
+void CNihilanth::StartupUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	SetThink( &CNihilanth::HuntThink );
+	pev->nextthink = gpGlobals->time + 0.1;
+	SetUse( &CNihilanth::CommandUse );
+}
+
+
+void CNihilanth::StartupThink( void )
+{
+	m_irritation = 0;
+	m_flAdj = 512;
+
+	CBaseEntity *pEntity;
+
+	pEntity = UTIL_FindEntityByTargetname( NULL, "n_min");
+	if (pEntity)
+		m_flMinZ = pEntity->pev->origin.z;
+	else
+		m_flMinZ = -4096;
+
+	pEntity = UTIL_FindEntityByTargetname( NULL, "n_max");
+	if (pEntity)
+		m_flMaxZ = pEntity->pev->origin.z;
+	else
+		m_flMaxZ = 4096;
+
+	m_hRecharger = this;
+	for (int i = 0; i < N_SPHERES; i++)
+	{
+		EmitSphere( );
+	}
+	m_hRecharger = NULL;
+
+	SetThink( &CNihilanth::HuntThink);
+	SetUse( &CNihilanth::CommandUse );
+	pev->nextthink = gpGlobals->time + 0.1;
+}
+
+
+void CNihilanth :: Killed( entvars_t *pevAttacker, int iGib )
+{
+	CBaseMonster::Killed( pevAttacker, iGib );
+}
+
+void CNihilanth :: DyingThink( void )
+{
+	pev->nextthink = gpGlobals->time + 0.1;
+	DispatchAnimEvents( );
+	StudioFrameAdvance( );
+
+	if (pev->deadflag == DEAD_NO)
+	{
+		DeathSound( );
+		pev->deadflag = DEAD_DYING;
+
+		m_posDesired.z = m_flMaxZ;
+	}
+
+	if (pev->deadflag == DEAD_DYING)
+	{
+		Flight( );
+
+		if (fabs( pev->origin.z - m_flMaxZ ) < 16)
+		{
+			pev->velocity = Vector( 0, 0, 0 );
+			FireTargets( m_szDeadUse, this, this, USE_ON, 1.0 );
+			pev->deadflag = DEAD_DEAD;
+		}
+	}
+
+	if (m_fSequenceFinished)
+	{
+		pev->avelocity.y += RANDOM_FLOAT( -100, 100 );
+		if (pev->avelocity.y < -100)
+			pev->avelocity.y = -100;
+		if (pev->avelocity.y > 100)
+			pev->avelocity.y = 100;
+
+		pev->sequence = LookupSequence( "die1" );
+	}
+
+	if (m_pBall)
+	{
+		if (m_pBall->pev->renderamt > 0)
+		{
+			m_pBall->pev->renderamt = max( 0, m_pBall->pev->renderamt - 2);
+		}
+		else
+		{
+			UTIL_Remove( m_pBall );
+			m_pBall = NULL;
+		}
+	}
+
+	Vector vecDir, vecSrc, vecAngles;
+
+	UTIL_MakeAimVectors( pev->angles );
+	int iAttachment = RANDOM_LONG( 1, 4 );
+
+	do {
+		vecDir = Vector( RANDOM_FLOAT( -1, 1 ), RANDOM_FLOAT( -1, 1 ), RANDOM_FLOAT( -1, 1 ));
+	} while (DotProduct( vecDir, vecDir) > 1.0);
+
+	switch( RANDOM_LONG( 1, 4 ))
+	{
+	case 1: // head
+		vecDir.z = fabs( vecDir.z ) * 0.5;
+		vecDir = vecDir + 2 * gpGlobals->v_up;
+		break;
+	case 2: // eyes
+		if (DotProduct( vecDir, gpGlobals->v_forward ) < 0)
+			vecDir = vecDir * -1;
+
+		vecDir = vecDir + 2 * gpGlobals->v_forward;
+		break;
+	case 3: // left hand
+		if (DotProduct( vecDir, gpGlobals->v_right ) > 0)
+			vecDir = vecDir * -1;
+		vecDir = vecDir - 2 * gpGlobals->v_right;
+		break;
+	case 4: // right hand
+		if (DotProduct( vecDir, gpGlobals->v_right ) < 0)
+			vecDir = vecDir * -1;
+		vecDir = vecDir + 2 * gpGlobals->v_right;
+		break;
+	}
+
+	GetAttachment( iAttachment - 1, vecSrc, vecAngles );
+
+	TraceResult tr;
+
+	UTIL_TraceLine( vecSrc, vecSrc + vecDir * 4096, ignore_monsters, ENT(pev), &tr );
+	
+	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+		WRITE_BYTE( TE_BEAMENTPOINT );
+		WRITE_SHORT( entindex() + 0x1000 * iAttachment );
+		WRITE_COORD( tr.vecEndPos.x);
+		WRITE_COORD( tr.vecEndPos.y);
+		WRITE_COORD( tr.vecEndPos.z);
+		WRITE_SHORT( g_sModelIndexLaser );
+		WRITE_BYTE( 0 ); // frame start
+		WRITE_BYTE( 10 ); // framerate
+		WRITE_BYTE( 5 ); // life
+		WRITE_BYTE( 100 );  // width
+		WRITE_BYTE( 120 );   // noise
+		WRITE_BYTE( 64 );   // r, g, b
+		WRITE_BYTE( 128 );   // r, g, b
+		WRITE_BYTE( 255);   // r, g, b
+		WRITE_BYTE( 255 );	// brightness
+		WRITE_BYTE( 10 );		// speed
+	MESSAGE_END();
+
+	GetAttachment( 0, vecSrc, vecAngles ); 
+	CNihilanthHVR *pEntity = (CNihilanthHVR *)Create( "nihilanth_energy_ball", vecSrc, pev->angles, edict() );
+	pEntity->pev->velocity = Vector ( RANDOM_FLOAT( -0.7, 0.7 ), RANDOM_FLOAT( -0.7, 0.7 ), 1.0 ) * 600.0;
+	pEntity->GreenBallInit( );
+
+	return;
+}
+
+
+
+void CNihilanth::CrashTouch( CBaseEntity *pOther )
+{
+	// only crash if we hit something solid
+	if ( pOther->pev->solid == SOLID_BSP) 
+	{
+		SetTouch( &CNihilanth::NULL );
+		pev->nextthink = gpGlobals->time;
+	}
+}
+
+
+
+void CNihilanth :: GibMonster( void )
+{
+	// EMIT_SOUND_DYN(edict(), CHAN_VOICE, "common/bodysplat.wav", 0.75, ATTN_NORM, 0, 200);		
+}
+
+
+
+void CNihilanth :: FloatSequence( void )
+{
+	if (m_irritation >= 2)
+	{
+		pev->sequence = LookupSequence( "float_open" );
+	}
+	else if (m_avelocity.y > 30)
+	{
+		pev->sequence = LookupSequence( "walk_r" );
+	}
+	else if (m_avelocity.y < -30)
+	{
+		pev->sequence = LookupSequence( "walk_l" );
+	}
+	else if (m_velocity.z > 30)
+	{
+		pev->sequence = LookupSequence( "walk_u" );
+	} 
+	else if (m_velocity.z < -30)
+	{
+		pev->sequence = LookupSequence( "walk_d" );
+	}
+	else
+	{
+		pev->sequence = LookupSequence( "float" );
+	}
+}
+
+
+void CNihilanth :: ShootBalls( void )
+{
+	if (m_flShootEnd > gpGlobals->time)
+	{
+		Vector vecHand, vecAngle;
+		
+		while (m_flShootTime < m_flShootEnd && m_flShootTime < gpGlobals->time)
+		{
+			if (m_hEnemy != NULL)
+			{
+				Vector vecSrc, vecDir;
+				CNihilanthHVR *pEntity;
+
+				GetAttachment( 2, vecHand, vecAngle );
+				vecSrc = vecHand + pev->velocity * (m_flShootTime - gpGlobals->time);
+				// vecDir = (m_posTarget - vecSrc).Normalize( );
+				vecDir = (m_posTarget - pev->origin).Normalize( );
+				vecSrc = vecSrc + vecDir * (gpGlobals->time - m_flShootTime);
+				pEntity = (CNihilanthHVR *)Create( "nihilanth_energy_ball", vecSrc, pev->angles, edict() );
+				pEntity->pev->velocity = vecDir * 200.0; 
+				pEntity->ZapInit( m_hEnemy );
+
+				GetAttachment( 3, vecHand, vecAngle );
+				vecSrc = vecHand + pev->velocity * (m_flShootTime - gpGlobals->time);
+				// vecDir = (m_posTarget - vecSrc).Normalize( );
+				vecDir = (m_posTarget - pev->origin).Normalize( );
+				vecSrc = vecSrc + vecDir * (gpGlobals->time - m_flShootTime);
+				pEntity = (CNihilanthHVR *)Create( "nihilanth_energy_ball", vecSrc, pev->angles, edict() );
+				pEntity->pev->velocity = vecDir * 200.0; 
+				pEntity->ZapInit( m_hEnemy );
+			}
+			m_flShootTime += 0.2;
+		}
+	}
+}
+
+
+void CNihilanth :: MakeFriend( Vector vecStart )
+{
+	int i;
+
+	for (i = 0; i < 3; i++)
+	{
+		if (m_hFriend[i] != NULL && !m_hFriend[i]->IsAlive())
+		{
+			if (pev->rendermode == kRenderNormal) // don't do it if they are already fading
+				m_hFriend[i]->MyMonsterPointer()->FadeMonster( );
+			m_hFriend[i] = NULL;
+		}
+
+		if (m_hFriend[i] == NULL)
+		{
+			if (RANDOM_LONG(0, 1) == 0)
+			{
+				int iNode = WorldGraph.FindNearestNode ( vecStart, bits_NODE_AIR );
+				if (iNode != NO_NODE)
+				{
+					CNode &node = WorldGraph.Node( iNode );
+					TraceResult tr;
+					UTIL_TraceHull( node.m_vecOrigin + Vector( 0, 0, 32 ), node.m_vecOrigin + Vector( 0, 0, 32 ), dont_ignore_monsters, large_hull, NULL, &tr );
+					if (tr.fStartSolid == 0)
+						m_hFriend[i] = Create("monster_alien_controller", node.m_vecOrigin, pev->angles );
+				}
+			}
+			else
+			{
+				int iNode = WorldGraph.FindNearestNode ( vecStart, bits_NODE_LAND | bits_NODE_WATER );
+				if (iNode != NO_NODE)
+				{
+					CNode &node = WorldGraph.Node( iNode );
+					TraceResult tr;
+					UTIL_TraceHull( node.m_vecOrigin + Vector( 0, 0, 36 ), node.m_vecOrigin + Vector( 0, 0, 36 ), dont_ignore_monsters, human_hull, NULL, &tr );
+					if (tr.fStartSolid == 0)
+						m_hFriend[i] = Create("monster_alien_slave", node.m_vecOrigin, pev->angles );
+				}
+			}
+			if (m_hFriend[i] != NULL)
+			{
+				EMIT_SOUND( m_hFriend[i]->edict(), CHAN_WEAPON, "debris/beamstart7.wav", 1.0, ATTN_NORM );
+			}
+
+			return;
+		}
+	}
+}
+
+
+void CNihilanth :: NextActivity( )
+{
+	UTIL_MakeAimVectors( pev->angles );
+
+	if (m_irritation >= 2)
+	{
+		if (m_pBall == NULL)
+		{
+			m_pBall = CSprite::SpriteCreate( "sprites/tele1.spr", pev->origin, TRUE );
+			if (m_pBall)
+			{
+				m_pBall->SetTransparency( kRenderTransAdd, 255, 255, 255, 255, kRenderFxNoDissipation );
+				m_pBall->SetAttachment( edict(), 1 );
+				m_pBall->SetScale( 4.0 );
+				m_pBall->pev->framerate = 10.0;
+				m_pBall->TurnOn( );
+			}
+		}
+
+		if (m_pBall)
+		{
+			MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+				WRITE_BYTE( TE_ELIGHT );
+				WRITE_SHORT( entindex( ) + 0x1000 );		// entity, attachment
+				WRITE_COORD( pev->origin.x );		// origin
+				WRITE_COORD( pev->origin.y );
+				WRITE_COORD( pev->origin.z );
+				WRITE_COORD( 256 );	// radius
+				WRITE_BYTE( 255 );	// R
+				WRITE_BYTE( 192 );	// G
+				WRITE_BYTE( 64 );	// B
+				WRITE_BYTE( 200 );	// life * 10
+				WRITE_COORD( 0 ); // decay
+			MESSAGE_END();
+		}
+	}
+
+	if ((pev->health < gSkillData.nihilanthHealth / 2 || m_iActiveSpheres < N_SPHERES / 2) && m_hRecharger == NULL && m_iLevel <= 9)
+	{
+		char szName[64];
+
+		CBaseEntity *pEnt = NULL;
+		CBaseEntity *pRecharger = NULL;
+		float flDist = 8192;
+
+		sprintf(szName, "%s%d", m_szRechargerTarget, m_iLevel );
+
+		while ((pEnt = UTIL_FindEntityByTargetname( pEnt, szName )) != NULL)
+		{
+			float flLocal = (pEnt->pev->origin - pev->origin).Length();
+			if (flLocal < flDist)
+			{
+				flDist = flLocal;
+				pRecharger = pEnt;
+			}	
+		}
+		
+		if (pRecharger)
+		{
+			m_hRecharger = pRecharger;
+			m_posDesired = Vector( pev->origin.x, pev->origin.y, pRecharger->pev->origin.z );
+			m_vecDesired = (pRecharger->pev->origin - m_posDesired).Normalize( );
+			m_vecDesired.z = 0;
+			m_vecDesired = m_vecDesired.Normalize();
+		}
+		else
+		{
+			m_hRecharger = NULL;
+			ALERT( at_aiconsole, "nihilanth can't find %s\n", szName );
+			m_iLevel++;
+			if (m_iLevel > 9)
+				m_irritation = 2;
+		}
+	}
+
+	float flDist = (m_posDesired - pev->origin).Length();
+	float flDot = DotProduct( m_vecDesired, gpGlobals->v_forward );
+
+	if (m_hRecharger != NULL)
+	{
+		// at we at power up yet?
+		if (flDist < 128.0)
+		{
+			int iseq = LookupSequence( "recharge" );
+
+			if (iseq != pev->sequence)
+			{
+				char szText[64];
+
+				sprintf( szText, "%s%d", m_szDrawUse, m_iLevel );
+				FireTargets( szText, this, this, USE_ON, 1.0 );
+
+				ALERT( at_console, "fireing %s\n", szText );
+			}
+			pev->sequence = LookupSequence( "recharge" );
+		}
+		else
+		{
+			FloatSequence( );
+		}
+		return;
+	}
+
+	if (m_hEnemy != NULL && !m_hEnemy->IsAlive())
+	{
+		m_hEnemy = NULL;
+	}
+
+	if (m_flLastSeen + 15 < gpGlobals->time)
+	{
+		m_hEnemy = NULL;
+	}
+
+	if (m_hEnemy == NULL)
+	{
+		Look( 4096 );
+		m_hEnemy = BestVisibleEnemy( );
+	}
+
+	if (m_hEnemy != NULL && m_irritation != 0)
+	{
+		if (m_flLastSeen + 5 > gpGlobals->time && flDist < 256 && flDot > 0)
+		{
+			if (m_irritation >= 2 && pev->health < gSkillData.nihilanthHealth / 2.0)
+			{
+				pev->sequence = LookupSequence( "attack1_open" );
+			}
+			else 
+			{
+				if (RANDOM_LONG(0, 1 ) == 0)
+				{
+					pev->sequence = LookupSequence( "attack1" ); // zap
+				}
+				else
+				{
+					char szText[64];
+
+					sprintf( szText, "%s%d", m_szTeleportTouch, m_iTeleport );
+					CBaseEntity *pTouch = UTIL_FindEntityByTargetname( NULL, szText );
+
+					sprintf( szText, "%s%d", m_szTeleportUse, m_iTeleport );
+					CBaseEntity *pTrigger = UTIL_FindEntityByTargetname( NULL, szText );
+
+					if (pTrigger != NULL || pTouch != NULL)
+					{
+						pev->sequence = LookupSequence( "attack2" ); // teleport
+					}
+					else
+					{
+						m_iTeleport++;
+						pev->sequence = LookupSequence( "attack1" ); // zap
+					}
+				}
+			}
+			return;
+		}
+	}
+
+	FloatSequence( );		
+}
+
+void CNihilanth :: HuntThink( void )
+{
+	pev->nextthink = gpGlobals->time + 0.1;
+	DispatchAnimEvents( );
+	StudioFrameAdvance( );
+
+	ShootBalls( );
+
+	// if dead, force cancelation of current animation
+	if (pev->health <= 0)
+	{
+		SetThink( &CNihilanth::DyingThink );
+		m_fSequenceFinished = TRUE;
+		return;
+	}
+
+	// ALERT( at_console, "health %.0f\n", pev->health );
+
+	// if damaged, try to abosorb some spheres
+	if (pev->health < gSkillData.nihilanthHealth && AbsorbSphere( ))
+	{
+		pev->health += gSkillData.nihilanthHealth / N_SPHERES;
+	}
+
+	// get new sequence
+	if (m_fSequenceFinished)
+	{
+		// if (!m_fSequenceLoops)
+		pev->frame = 0;
+		NextActivity( );
+		ResetSequenceInfo( );
+		pev->framerate = 2.0 - 1.0 * (pev->health / gSkillData.nihilanthHealth);
+	}
+
+	// look for current enemy	
+	if (m_hEnemy != NULL && m_hRecharger == NULL)
+	{
+		if (FVisible( m_hEnemy ))
+		{
+			if (m_flLastSeen < gpGlobals->time - 5)
+				m_flPrevSeen = gpGlobals->time;
+			m_flLastSeen = gpGlobals->time;
+			m_posTarget = m_hEnemy->pev->origin;
+			m_vecTarget = (m_posTarget - pev->origin).Normalize();
+			m_vecDesired = m_vecTarget;
+			m_posDesired = Vector( pev->origin.x, pev->origin.y, m_posTarget.z + m_flAdj );
+		}
+		else
+		{
+			m_flAdj = min( m_flAdj + 10, 1000 );
+		}
+	}
+
+	// don't go too high
+	if (m_posDesired.z > m_flMaxZ)
+		m_posDesired.z = m_flMaxZ;
+
+	// don't go too low
+	if (m_posDesired.z < m_flMinZ)
+		m_posDesired.z = m_flMinZ;
+
+	Flight( );
+}
+
+
+
+void CNihilanth :: Flight( void )
+{
+	// estimate where I'll be facing in one seconds
+	UTIL_MakeAimVectors( pev->angles + m_avelocity );
+	// Vector vecEst1 = pev->origin + m_velocity + gpGlobals->v_up * m_flForce - Vector( 0, 0, 384 );
+	// float flSide = DotProduct( m_posDesired - vecEst1, gpGlobals->v_right );
+	
+	float flSide = DotProduct( m_vecDesired, gpGlobals->v_right );
+
+	if (flSide < 0)
+	{
+		if (m_avelocity.y < 180)
+		{
+			m_avelocity.y += 6; // 9 * (3.0/2.0);
+		}
+	}
+	else
+	{
+		if (m_avelocity.y > -180)
+		{
+			m_avelocity.y -= 6; // 9 * (3.0/2.0);
+		}
+	}
+	m_avelocity.y *= 0.98;
+
+	// estimate where I'll be in two seconds
+	Vector vecEst = pev->origin + m_velocity * 2.0 + gpGlobals->v_up * m_flForce * 20;
+
+	// add immediate force
+	UTIL_MakeAimVectors( pev->angles );
+	m_velocity.x += gpGlobals->v_up.x * m_flForce;
+	m_velocity.y += gpGlobals->v_up.y * m_flForce;
+	m_velocity.z += gpGlobals->v_up.z * m_flForce;
+
+
+	float flSpeed = m_velocity.Length();
+	float flDir = DotProduct( Vector( gpGlobals->v_forward.x, gpGlobals->v_forward.y, 0 ), Vector( m_velocity.x, m_velocity.y, 0 ) );
+	if (flDir < 0)
+		flSpeed = -flSpeed;
+
+	float flDist = DotProduct( m_posDesired - vecEst, gpGlobals->v_forward );
+
+	// sideways drag
+	m_velocity.x = m_velocity.x * (1.0 - fabs( gpGlobals->v_right.x ) * 0.05);
+	m_velocity.y = m_velocity.y * (1.0 - fabs( gpGlobals->v_right.y ) * 0.05);
+	m_velocity.z = m_velocity.z * (1.0 - fabs( gpGlobals->v_right.z ) * 0.05);
+
+	// general drag
+	m_velocity = m_velocity * 0.995;
+	
+	// apply power to stay correct height
+	if (m_flForce < 100 && vecEst.z < m_posDesired.z) 
+	{
+		m_flForce += 10;
+	}
+	else if (m_flForce > -100 && vecEst.z > m_posDesired.z)
+	{
+		if (vecEst.z > m_posDesired.z) 
+			m_flForce -= 10;
+	}
+
+	UTIL_SetOrigin( pev, pev->origin + m_velocity * 0.1 );
+	pev->angles = pev->angles + m_avelocity * 0.1;
+
+	// ALERT( at_console, "%5.0f %5.0f : %4.0f : %3.0f : %2.0f\n", m_posDesired.z, pev->origin.z, m_velocity.z, m_avelocity.y, m_flForce ); 
+}
+
+
+BOOL CNihilanth :: AbsorbSphere( void )
+{
+	for (int i = 0; i < N_SPHERES; i++)
+	{
+		if (m_hSphere[i] != NULL)
+		{
+			CNihilanthHVR *pSphere = (CNihilanthHVR *)((CBaseEntity *)m_hSphere[i]);
+			pSphere->AbsorbInit( );
+			m_hSphere[i] = NULL;
+			m_iActiveSpheres--;
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+
+BOOL CNihilanth :: EmitSphere( void )
+{
+	m_iActiveSpheres = 0;
+	int empty = 0;
+
+	for (int i = 0; i < N_SPHERES; i++)
+	{
+		if (m_hSphere[i] != NULL)
+		{
+			m_iActiveSpheres++;
+		}
+		else
+		{
+			empty = i;
+		}
+	}
+
+	if (m_iActiveSpheres >= N_SPHERES)
+		return FALSE;
+
+	Vector vecSrc = m_hRecharger->pev->origin;
+	CNihilanthHVR *pEntity = (CNihilanthHVR *)Create( "nihilanth_energy_ball", vecSrc, pev->angles, edict() );
+	pEntity->pev->velocity = pev->origin - vecSrc;
+	pEntity->CircleInit( this );
+
+	m_hSphere[empty] = pEntity;
+	return TRUE;
+}
+
+
+void CNihilanth :: 	TargetSphere( USE_TYPE useType, float value )
+{
+	CBaseMonster *pSphere;
+	for (int i = 0; i < N_SPHERES; i++)
+	{
+		if (m_hSphere[i] != NULL)
+		{
+			pSphere = m_hSphere[i]->MyMonsterPointer();
+			if (pSphere->m_hEnemy == NULL)
+				break;
+		}
+	}
+	if (i == N_SPHERES)
+	{
+		return;
+	}
+
+	Vector vecSrc, vecAngles;
+	GetAttachment( 2, vecSrc, vecAngles ); 
+	UTIL_SetOrigin( pSphere->pev, vecSrc );
+	pSphere->Use( this, this, useType, value );
+	pSphere->pev->velocity = m_vecDesired * RANDOM_FLOAT( 50, 100 ) + Vector( RANDOM_FLOAT( -50, 50 ), RANDOM_FLOAT( -50, 50 ), RANDOM_FLOAT( -50, 50 ) );
+}
+
+
+
+void CNihilanth :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	switch( pEvent->event )
+	{
+	case 1:	// shoot 
+		break;
+	case 2:	// zen
+		if (m_hEnemy != NULL)
+		{
+			if (RANDOM_LONG(0,4) == 0)
+				EMIT_SOUND( edict(), CHAN_VOICE, RANDOM_SOUND_ARRAY( pAttackSounds ), 1.0, 0.2 ); 
+
+			EMIT_SOUND( edict(), CHAN_WEAPON, RANDOM_SOUND_ARRAY( pBallSounds ), 1.0, 0.2 ); 
+
+			MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+				WRITE_BYTE( TE_ELIGHT );
+				WRITE_SHORT( entindex( ) + 0x3000 );		// entity, attachment
+				WRITE_COORD( pev->origin.x );		// origin
+				WRITE_COORD( pev->origin.y );
+				WRITE_COORD( pev->origin.z );
+				WRITE_COORD( 256 );	// radius
+				WRITE_BYTE( 128 );	// R
+				WRITE_BYTE( 128 );	// G
+				WRITE_BYTE( 255 );	// B
+				WRITE_BYTE( 10 );	// life * 10
+				WRITE_COORD( 128 ); // decay
+			MESSAGE_END();
+
+			MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+				WRITE_BYTE( TE_ELIGHT );
+				WRITE_SHORT( entindex( ) + 0x4000 );		// entity, attachment
+				WRITE_COORD( pev->origin.x );		// origin
+				WRITE_COORD( pev->origin.y );
+				WRITE_COORD( pev->origin.z );
+				WRITE_COORD( 256 );	// radius
+				WRITE_BYTE( 128 );	// R
+				WRITE_BYTE( 128 );	// G
+				WRITE_BYTE( 255 );	// B
+				WRITE_BYTE( 10 );	// life * 10
+				WRITE_COORD( 128 ); // decay
+			MESSAGE_END();
+			
+			m_flShootTime = gpGlobals->time;
+			m_flShootEnd = gpGlobals->time + 1.0;
+		}
+		break;
+	case 3:	// prayer
+		if (m_hEnemy != NULL)
+		{
+			char szText[32];
+
+			sprintf( szText, "%s%d", m_szTeleportTouch, m_iTeleport );
+			CBaseEntity *pTouch = UTIL_FindEntityByTargetname( NULL, szText );
+
+			sprintf( szText, "%s%d", m_szTeleportUse, m_iTeleport );
+			CBaseEntity *pTrigger = UTIL_FindEntityByTargetname( NULL, szText );
+
+			if (pTrigger != NULL || pTouch != NULL)
+			{
+				EMIT_SOUND( edict(), CHAN_VOICE, RANDOM_SOUND_ARRAY( pAttackSounds ), 1.0, 0.2 ); 
+
+				Vector vecSrc, vecAngles;
+				GetAttachment( 2, vecSrc, vecAngles ); 
+				CNihilanthHVR *pEntity = (CNihilanthHVR *)Create( "nihilanth_energy_ball", vecSrc, pev->angles, edict() );
+				pEntity->pev->velocity = pev->origin - vecSrc;
+				pEntity->TeleportInit( this, m_hEnemy, pTrigger, pTouch );
+			}
+			else
+			{
+				m_iTeleport++; // unexpected failure
+
+				EMIT_SOUND( edict(), CHAN_WEAPON, RANDOM_SOUND_ARRAY( pBallSounds ), 1.0, 0.2 ); 
+
+				ALERT( at_aiconsole, "nihilanth can't target %s\n", szText );
+
+				MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+					WRITE_BYTE( TE_ELIGHT );
+					WRITE_SHORT( entindex( ) + 0x3000 );		// entity, attachment
+					WRITE_COORD( pev->origin.x );		// origin
+					WRITE_COORD( pev->origin.y );
+					WRITE_COORD( pev->origin.z );
+					WRITE_COORD( 256 );	// radius
+					WRITE_BYTE( 128 );	// R
+					WRITE_BYTE( 128 );	// G
+					WRITE_BYTE( 255 );	// B
+					WRITE_BYTE( 10 );	// life * 10
+					WRITE_COORD( 128 ); // decay
+				MESSAGE_END();
+
+				MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+					WRITE_BYTE( TE_ELIGHT );
+					WRITE_SHORT( entindex( ) + 0x4000 );		// entity, attachment
+					WRITE_COORD( pev->origin.x );		// origin
+					WRITE_COORD( pev->origin.y );
+					WRITE_COORD( pev->origin.z );
+					WRITE_COORD( 256 );	// radius
+					WRITE_BYTE( 128 );	// R
+					WRITE_BYTE( 128 );	// G
+					WRITE_BYTE( 255 );	// B
+					WRITE_BYTE( 10 );	// life * 10
+					WRITE_COORD( 128 ); // decay
+				MESSAGE_END();
+
+				m_flShootTime = gpGlobals->time;
+				m_flShootEnd = gpGlobals->time + 1.0;
+			}
+		}
+		break;
+	case 4:	// get a sphere
+		{
+			if (m_hRecharger != NULL)
+			{
+				if (!EmitSphere( ))
+				{
+					m_hRecharger = NULL;
+				}
+			}
+		}
+		break;
+	case 5:	// start up sphere machine
+		{
+			EMIT_SOUND( edict(), CHAN_VOICE , RANDOM_SOUND_ARRAY( pRechargeSounds ), 1.0, 0.2 ); 
+		}
+		break;
+	case 6:
+		if (m_hEnemy != NULL)
+		{
+			Vector vecSrc, vecAngles;
+			GetAttachment( 2, vecSrc, vecAngles ); 
+			CNihilanthHVR *pEntity = (CNihilanthHVR *)Create( "nihilanth_energy_ball", vecSrc, pev->angles, edict() );
+			pEntity->pev->velocity = pev->origin - vecSrc;
+			pEntity->ZapInit( m_hEnemy );
+		}
+		break;
+	case 7:
+		/*
+		Vector vecSrc, vecAngles;
+		GetAttachment( 0, vecSrc, vecAngles ); 
+		CNihilanthHVR *pEntity = (CNihilanthHVR *)Create( "nihilanth_energy_ball", vecSrc, pev->angles, edict() );
+		pEntity->pev->velocity = Vector ( RANDOM_FLOAT( -0.7, 0.7 ), RANDOM_FLOAT( -0.7, 0.7 ), 1.0 ) * 600.0;
+		pEntity->GreenBallInit( );
+		*/
+		break;
+	}
+}
+
+
+
+void CNihilanth::CommandUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	switch (useType)
+	{
+	case USE_OFF:
+		{
+		CBaseEntity *pTouch = UTIL_FindEntityByTargetname( NULL, m_szDeadTouch );
+		if ( pTouch && m_hEnemy != NULL )
+			pTouch->Touch( m_hEnemy );
+		}
+		break;
+	case USE_ON:
+		if (m_irritation == 0)
+		{
+			m_irritation = 1;
+		}
+		break;
+	case USE_SET:
+		break;
+	case USE_TOGGLE:
+		break;
+	}
+}
+
+
+int CNihilanth :: TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType )
+{
+	if (pevInflictor->owner == edict())
+		return 0;
+
+	if (flDamage >= pev->health)
+	{
+		pev->health = 1;
+		if (m_irritation != 3)
+			return 0;
+	}
+	
+	PainSound( );
+
+	pev->health -= flDamage;
+	return 0;
+}
+
+
+
+void CNihilanth::TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType)
+{
+	if (m_irritation == 3)
+		m_irritation = 2;
+
+	if (m_irritation == 2 && ptr->iHitgroup == 2 && flDamage > 2)
+		m_irritation = 3;
+
+	if (m_irritation != 3)
+	{
+		Vector vecBlood = (ptr->vecEndPos - pev->origin).Normalize( );
+
+		UTIL_BloodStream( ptr->vecEndPos, vecBlood, BloodColor(), flDamage + (100 - 100 * (pev->health / gSkillData.nihilanthHealth)));
+	}
+
+	// SpawnBlood(ptr->vecEndPos, BloodColor(), flDamage * 5.0);// a little surface blood.
+	AddMultiDamage( pevAttacker, this, flDamage, bitsDamageType );
+}
+
+
+
+CBaseEntity *CNihilanth::RandomTargetname( const char *szName )
+{
+	int total = 0;
+
+	CBaseEntity *pEntity = NULL;
+	CBaseEntity *pNewEntity = NULL;
+	while ((pNewEntity = UTIL_FindEntityByTargetname( pNewEntity, szName )) != NULL)
+	{
+		total++;
+		if (RANDOM_LONG(0,total-1) < 1)
+			pEntity = pNewEntity;
+	}
+	return pEntity;
+}
+
+
+
+
+
+
+
+
+
+//=========================================================
+// Controller bouncy ball attack
+//=========================================================
+
+
+
+void CNihilanthHVR :: Spawn( void )
+{
+	Precache( );
+
+	pev->rendermode = kRenderTransAdd;
+	pev->renderamt = 255;
+	pev->scale = 3.0;
+}
+
+
+void CNihilanthHVR :: Precache( void )
+{
+	PRECACHE_MODEL("sprites/flare6.spr");
+	PRECACHE_MODEL("sprites/nhth1.spr");
+	PRECACHE_MODEL("sprites/exit1.spr");
+	PRECACHE_MODEL("sprites/tele1.spr");
+	PRECACHE_MODEL("sprites/animglow01.spr");
+	PRECACHE_MODEL("sprites/xspark4.spr");
+	PRECACHE_MODEL("sprites/muzzleflash3.spr");
+	PRECACHE_SOUND("debris/zap4.wav");
+	PRECACHE_SOUND("weapons/electro4.wav");
+	PRECACHE_SOUND("x/x_teleattack1.wav");
+}
+
+
+
+void CNihilanthHVR :: CircleInit( CBaseEntity *pTarget )
+{
+	pev->movetype = MOVETYPE_NOCLIP;
+	pev->solid = SOLID_NOT;
+
+	// SET_MODEL(edict(), "sprites/flare6.spr");
+	// pev->scale = 3.0;
+	// SET_MODEL(edict(), "sprites/xspark4.spr");
+	SET_MODEL(edict(), "sprites/muzzleflash3.spr");
+	pev->rendercolor.x = 255;
+	pev->rendercolor.y = 224;
+	pev->rendercolor.z = 192;
+	pev->scale = 2.0;
+	m_nFrames = 1;
+	pev->renderamt = 255;
+
+	UTIL_SetSize(pev, Vector( 0, 0, 0), Vector(0, 0, 0));
+	UTIL_SetOrigin( pev, pev->origin );
+
+	SetThink( &CNihilanth::HoverThink );
+	SetTouch( &CNihilanthHVR::BounceTouch );
+	pev->nextthink = gpGlobals->time + 0.1;
+	
+	m_hTargetEnt = pTarget;
+}
+
+
+CBaseEntity *CNihilanthHVR::RandomClassname( const char *szName )
+{
+	int total = 0;
+
+	CBaseEntity *pEntity = NULL;
+	CBaseEntity *pNewEntity = NULL;
+	while ((pNewEntity = UTIL_FindEntityByClassname( pNewEntity, szName )) != NULL)
+	{
+		total++;
+		if (RANDOM_LONG(0,total-1) < 1)
+			pEntity = pNewEntity;
+	}
+	return pEntity;
+}
+
+void CNihilanthHVR :: HoverThink( void  )
+{
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	if (m_hTargetEnt != NULL)
+	{
+		CircleTarget( m_hTargetEnt->pev->origin + Vector( 0, 0, 16 * N_SCALE ) );
+	}
+	else
+	{
+		UTIL_Remove( this );
+	}
+
+
+	if (RANDOM_LONG( 0, 99 ) < 5)
+	{
+/*
+		CBaseEntity *pOther = RandomClassname( STRING(pev->classname) );
+
+		if (pOther && pOther != this)
+		{
+			MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+				WRITE_BYTE( TE_BEAMENTS );
+				WRITE_SHORT( this->entindex() );
+				WRITE_SHORT( pOther->entindex() );
+				WRITE_SHORT( g_sModelIndexLaser );
+				WRITE_BYTE( 0 ); // framestart
+				WRITE_BYTE( 0 ); // framerate
+				WRITE_BYTE( 10 ); // life
+				WRITE_BYTE( 80 );  // width
+				WRITE_BYTE( 80 );   // noise
+				WRITE_BYTE( 255 );   // r, g, b
+				WRITE_BYTE( 128 );   // r, g, b
+				WRITE_BYTE( 64 );   // r, g, b
+				WRITE_BYTE( 255 );	// brightness
+				WRITE_BYTE( 30 );		// speed
+			MESSAGE_END();
+		}
+*/
+/*
+		MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+			WRITE_BYTE( TE_BEAMENTS );
+			WRITE_SHORT( this->entindex() );
+			WRITE_SHORT( m_hTargetEnt->entindex() + 0x1000 );
+			WRITE_SHORT( g_sModelIndexLaser );
+			WRITE_BYTE( 0 ); // framestart
+			WRITE_BYTE( 0 ); // framerate
+			WRITE_BYTE( 10 ); // life
+			WRITE_BYTE( 80 );  // width
+			WRITE_BYTE( 80 );   // noise
+			WRITE_BYTE( 255 );   // r, g, b
+			WRITE_BYTE( 128 );   // r, g, b
+			WRITE_BYTE( 64 );   // r, g, b
+			WRITE_BYTE( 255 );	// brightness
+			WRITE_BYTE( 30 );		// speed
+		MESSAGE_END();
+*/
+	}
+
+	pev->frame = ((int)pev->frame + 1) % m_nFrames;
+}
+
+
+
+
+void CNihilanthHVR :: ZapInit( CBaseEntity *pEnemy )
+{
+	pev->movetype = MOVETYPE_FLY;
+	pev->solid = SOLID_BBOX;
+
+	SET_MODEL(edict(), "sprites/nhth1.spr");
+
+	pev->rendercolor.x = 255;
+	pev->rendercolor.y = 255;
+	pev->rendercolor.z = 255;
+	pev->scale = 2.0;
+
+	pev->velocity = (pEnemy->pev->origin - pev->origin).Normalize() * 200;
+
+	m_hEnemy = pEnemy;
+	SetThink( &CNihilanthHVR::ZapThink );
+	SetTouch( &CNihilanthHVR::ZapTouch );
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	EMIT_SOUND_DYN( edict(), CHAN_WEAPON, "debris/zap4.wav", 1, ATTN_NORM, 0, 100 );
+}
+
+void CNihilanthHVR :: ZapThink( void  )
+{
+	pev->nextthink = gpGlobals->time + 0.05;
+
+	// check world boundaries
+	if (m_hEnemy == NULL ||  pev->origin.x < -4096 || pev->origin.x > 4096 || pev->origin.y < -4096 || pev->origin.y > 4096 || pev->origin.z < -4096 || pev->origin.z > 4096)
+	{
+		SetTouch( NULL );
+		UTIL_Remove( this );
+		return;
+	}
+
+	if (pev->velocity.Length() < 2000)
+	{
+		pev->velocity = pev->velocity * 1.2;
+	}
+
+
+	// MovetoTarget( m_hEnemy->Center( ) );
+
+	if ((m_hEnemy->Center() - pev->origin).Length() < 256)
+	{
+		TraceResult tr;
+
+		UTIL_TraceLine( pev->origin, m_hEnemy->Center(), dont_ignore_monsters, edict(), &tr );
+
+		CBaseEntity *pEntity = CBaseEntity::Instance(tr.pHit);
+		if (pEntity != NULL && pEntity->pev->takedamage)
+		{
+			ClearMultiDamage( );
+			pEntity->TraceAttack( pev, gSkillData.nihilanthZap, pev->velocity, &tr, DMG_SHOCK );
+			ApplyMultiDamage( pev, pev );
+		}
+
+		MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+			WRITE_BYTE( TE_BEAMENTPOINT );
+			WRITE_SHORT( entindex() );
+			WRITE_COORD( tr.vecEndPos.x );
+			WRITE_COORD( tr.vecEndPos.y );
+			WRITE_COORD( tr.vecEndPos.z );
+			WRITE_SHORT( g_sModelIndexLaser );
+			WRITE_BYTE( 0 ); // frame start
+			WRITE_BYTE( 10 ); // framerate
+			WRITE_BYTE( 3 ); // life
+			WRITE_BYTE( 20 );  // width
+			WRITE_BYTE( 20 );   // noise
+			WRITE_BYTE( 64 );   // r, g, b
+			WRITE_BYTE( 196 );   // r, g, b
+			WRITE_BYTE( 255);   // r, g, b
+			WRITE_BYTE( 255 );	// brightness
+			WRITE_BYTE( 10 );		// speed
+		MESSAGE_END();
+
+		UTIL_EmitAmbientSound( edict(), tr.vecEndPos, "weapons/electro4.wav", 0.5, ATTN_NORM, 0, RANDOM_LONG( 140, 160 ) );
+
+		SetTouch( NULL );
+		UTIL_Remove( this );
+		pev->nextthink = gpGlobals->time + 0.2;
+		return;
+	}
+
+	pev->frame = (int)(pev->frame + 1) % 11;
+
+	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+		WRITE_BYTE( TE_ELIGHT );
+		WRITE_SHORT( entindex( ) );		// entity, attachment
+		WRITE_COORD( pev->origin.x );		// origin
+		WRITE_COORD( pev->origin.y );
+		WRITE_COORD( pev->origin.z );
+		WRITE_COORD( 128 );	// radius
+		WRITE_BYTE( 128 );	// R
+		WRITE_BYTE( 128 );	// G
+		WRITE_BYTE( 255 );	// B
+		WRITE_BYTE( 10 );	// life * 10
+		WRITE_COORD( 128 ); // decay
+	MESSAGE_END();
+
+	// Crawl( );
+}
+
+
+void CNihilanthHVR::ZapTouch( CBaseEntity *pOther )
+{
+	UTIL_EmitAmbientSound( edict(), pev->origin, "weapons/electro4.wav", 1.0, ATTN_NORM, 0, RANDOM_LONG( 90, 95 ) );
+
+	RadiusDamage( pev, pev, 50, CLASS_NONE, DMG_SHOCK );
+	pev->velocity = pev->velocity * 0;
+
+	/*
+	for (int i = 0; i < 10; i++)
+	{
+		Crawl( );
+	}
+	*/
+
+	SetTouch( NULL );
+	UTIL_Remove( this );
+	pev->nextthink = gpGlobals->time + 0.2;
+}
+
+
+
+void CNihilanthHVR :: TeleportInit( CNihilanth *pOwner, CBaseEntity *pEnemy, CBaseEntity *pTarget, CBaseEntity *pTouch )
+{
+	pev->movetype = MOVETYPE_FLY;
+	pev->solid = SOLID_BBOX;
+
+	pev->rendercolor.x = 255;
+	pev->rendercolor.y = 255;
+	pev->rendercolor.z = 255;
+	pev->velocity.z *= 0.2;
+
+	SET_MODEL(edict(), "sprites/exit1.spr");
+
+	m_pNihilanth = pOwner;
+	m_hEnemy = pEnemy;
+	m_hTargetEnt = pTarget;
+	m_hTouch = pTouch;
+
+	SetThink( &CNihilanthHVR::TeleportThink );
+	SetTouch( &CNihilanthHVR::TeleportTouch );
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	EMIT_SOUND_DYN( edict(), CHAN_WEAPON, "x/x_teleattack1.wav", 1, 0.2, 0, 100 );
+}
+
+
+void CNihilanthHVR :: GreenBallInit( )
+{
+	pev->movetype = MOVETYPE_FLY;
+	pev->solid = SOLID_BBOX;
+
+	pev->rendercolor.x = 255;
+	pev->rendercolor.y = 255;
+	pev->rendercolor.z = 255;
+	pev->scale = 1.0;
+
+	SET_MODEL(edict(), "sprites/exit1.spr");
+
+	SetTouch( &CNihilanthHVR::RemoveTouch );
+}
+
+
+void CNihilanthHVR :: TeleportThink( void  )
+{
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	// check world boundaries
+	if (m_hEnemy == NULL || !m_hEnemy->IsAlive() || pev->origin.x < -4096 || pev->origin.x > 4096 || pev->origin.y < -4096 || pev->origin.y > 4096 || pev->origin.z < -4096 || pev->origin.z > 4096)
+	{
+		STOP_SOUND(edict(), CHAN_WEAPON, "x/x_teleattack1.wav" );
+		UTIL_Remove( this );
+		return;
+	}
+
+	if ((m_hEnemy->Center() - pev->origin).Length() < 128)
+	{
+		STOP_SOUND(edict(), CHAN_WEAPON, "x/x_teleattack1.wav" );
+		UTIL_Remove( this );
+
+		if (m_hTargetEnt != NULL)
+			m_hTargetEnt->Use( m_hEnemy, m_hEnemy, USE_ON, 1.0 );
+
+		if ( m_hTouch != NULL && m_hEnemy != NULL )
+			m_hTouch->Touch( m_hEnemy );
+	}
+	else 
+	{
+		MovetoTarget( m_hEnemy->Center( ) );
+	}
+
+	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+		WRITE_BYTE( TE_ELIGHT );
+		WRITE_SHORT( entindex( ) );		// entity, attachment
+		WRITE_COORD( pev->origin.x );		// origin
+		WRITE_COORD( pev->origin.y );
+		WRITE_COORD( pev->origin.z );
+		WRITE_COORD( 256 );	// radius
+		WRITE_BYTE( 0 );	// R
+		WRITE_BYTE( 255 );	// G
+		WRITE_BYTE( 0 );	// B
+		WRITE_BYTE( 10 );	// life * 10
+		WRITE_COORD( 256 ); // decay
+	MESSAGE_END();
+
+	pev->frame = (int)(pev->frame + 1) % 20;
+}
+
+
+void CNihilanthHVR :: AbsorbInit( void  )
+{
+	SetThink( &CNihilanthHVR::DissipateThink );
+	pev->renderamt = 255;
+
+	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+		WRITE_BYTE( TE_BEAMENTS );
+		WRITE_SHORT( this->entindex() );
+		WRITE_SHORT( m_hTargetEnt->entindex() + 0x1000 );
+		WRITE_SHORT( g_sModelIndexLaser );
+		WRITE_BYTE( 0 ); // framestart
+		WRITE_BYTE( 0 ); // framerate
+		WRITE_BYTE( 50 ); // life
+		WRITE_BYTE( 80 );  // width
+		WRITE_BYTE( 80 );   // noise
+		WRITE_BYTE( 255 );   // r, g, b
+		WRITE_BYTE( 128 );   // r, g, b
+		WRITE_BYTE( 64 );   // r, g, b
+		WRITE_BYTE( 255 );	// brightness
+		WRITE_BYTE( 30 );		// speed
+	MESSAGE_END();
+}
+
+void CNihilanthHVR::TeleportTouch( CBaseEntity *pOther )
+{
+	CBaseEntity *pEnemy = m_hEnemy;
+
+	if (pOther == pEnemy)
+	{
+		if (m_hTargetEnt != NULL)
+			m_hTargetEnt->Use( pEnemy, pEnemy, USE_ON, 1.0 );
+
+		if (m_hTouch != NULL && pEnemy != NULL )
+			m_hTouch->Touch( pEnemy );
+	}
+	else
+	{
+		m_pNihilanth->MakeFriend( pev->origin );
+	}
+
+	SetTouch( NULL );
+	STOP_SOUND(edict(), CHAN_WEAPON, "x/x_teleattack1.wav" );
+	UTIL_Remove( this );
+}
+
+
+void CNihilanthHVR :: DissipateThink( void  )
+{
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	if (pev->scale > 5.0)
+		UTIL_Remove( this );
+
+	pev->renderamt -= 2;
+	pev->scale += 0.1;
+
+	if (m_hTargetEnt != NULL)
+	{
+		CircleTarget( m_hTargetEnt->pev->origin + Vector( 0, 0, 4096 ) );
+	}
+	else
+	{
+		UTIL_Remove( this );
+	}
+
+	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+		WRITE_BYTE( TE_ELIGHT );
+		WRITE_SHORT( entindex( ) );		// entity, attachment
+		WRITE_COORD( pev->origin.x );		// origin
+		WRITE_COORD( pev->origin.y );
+		WRITE_COORD( pev->origin.z );
+		WRITE_COORD( pev->renderamt );	// radius
+		WRITE_BYTE( 255 );	// R
+		WRITE_BYTE( 192 );	// G
+		WRITE_BYTE( 64 );	// B
+		WRITE_BYTE( 2 );	// life * 10
+		WRITE_COORD( 0 ); // decay
+	MESSAGE_END();
+}
+
+
+BOOL CNihilanthHVR :: CircleTarget( Vector vecTarget )
+{
+	BOOL fClose = FALSE;
+
+	Vector vecDest = vecTarget;
+	Vector vecEst = pev->origin + pev->velocity * 0.5;
+	Vector vecSrc = pev->origin;
+	vecDest.z = 0;
+	vecEst.z = 0;
+	vecSrc.z = 0;
+	float d1 = (vecDest - vecSrc).Length() - 24 * N_SCALE;
+	float d2 = (vecDest - vecEst).Length() - 24 * N_SCALE;
+
+	if (m_vecIdeal == Vector( 0, 0, 0 ))
+	{
+		m_vecIdeal = pev->velocity;
+	}
+
+	if (d1 < 0 && d2 <= d1)
+	{
+		// ALERT( at_console, "too close\n");
+		m_vecIdeal = m_vecIdeal - (vecDest - vecSrc).Normalize() * 50;
+	}
+	else if (d1 > 0 && d2 >= d1)
+	{
+		// ALERT( at_console, "too far\n");
+		m_vecIdeal = m_vecIdeal + (vecDest - vecSrc).Normalize() * 50;
+	}
+	pev->avelocity.z = d1 * 20;
+
+	if (d1 < 32)
+	{
+		fClose = TRUE;
+	}
+
+	m_vecIdeal = m_vecIdeal + Vector( RANDOM_FLOAT( -2, 2 ), RANDOM_FLOAT( -2, 2 ), RANDOM_FLOAT( -2, 2 ));
+	m_vecIdeal = Vector( m_vecIdeal.x, m_vecIdeal.y, 0 ).Normalize( ) * 200
+		/* + Vector( -m_vecIdeal.y, m_vecIdeal.x, 0 ).Normalize( ) * 32 */
+		+ Vector( 0, 0, m_vecIdeal.z );
+	// m_vecIdeal = m_vecIdeal + Vector( -m_vecIdeal.y, m_vecIdeal.x, 0 ).Normalize( ) * 2;
+
+	// move up/down
+	d1 = vecTarget.z - pev->origin.z;
+	if (d1 > 0 && m_vecIdeal.z < 200)
+		m_vecIdeal.z += 20;
+	else if (d1 < 0 && m_vecIdeal.z > -200)
+		m_vecIdeal.z -= 20;
+
+	pev->velocity = m_vecIdeal;
+
+	// ALERT( at_console, "%.0f %.0f %.0f\n", m_vecIdeal.x, m_vecIdeal.y, m_vecIdeal.z );
+	return fClose;
+}
+
+
+void CNihilanthHVR :: MovetoTarget( Vector vecTarget )
+{
+	if (m_vecIdeal == Vector( 0, 0, 0 ))
+	{
+		m_vecIdeal = pev->velocity;
+	}
+
+	// accelerate
+	float flSpeed = m_vecIdeal.Length();
+	if (flSpeed > 300)
+	{
+		m_vecIdeal = m_vecIdeal.Normalize( ) * 300;
+	}
+	m_vecIdeal = m_vecIdeal + (vecTarget - pev->origin).Normalize() * 300;
+	pev->velocity = m_vecIdeal;
+}
+
+
+
+
+void CNihilanthHVR :: Crawl( void  )
+{
+
+	Vector vecAim = Vector( RANDOM_FLOAT( -1, 1 ), RANDOM_FLOAT( -1, 1 ), RANDOM_FLOAT( -1, 1 ) ).Normalize( );
+	Vector vecPnt = pev->origin + pev->velocity * 0.2 + vecAim * 128;
+
+	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+		WRITE_BYTE( TE_BEAMENTPOINT );
+		WRITE_SHORT( entindex() );
+		WRITE_COORD( vecPnt.x);
+		WRITE_COORD( vecPnt.y);
+		WRITE_COORD( vecPnt.z);
+		WRITE_SHORT( g_sModelIndexLaser );
+		WRITE_BYTE( 0 ); // frame start
+		WRITE_BYTE( 10 ); // framerate
+		WRITE_BYTE( 3 ); // life
+		WRITE_BYTE( 20 );  // width
+		WRITE_BYTE( 80 );   // noise
+		WRITE_BYTE( 64 );   // r, g, b
+		WRITE_BYTE( 128 );   // r, g, b
+		WRITE_BYTE( 255);   // r, g, b
+		WRITE_BYTE( 255 );	// brightness
+		WRITE_BYTE( 10 );		// speed
+	MESSAGE_END();
+}
+
+
+void CNihilanthHVR::RemoveTouch( CBaseEntity *pOther )
+{
+	STOP_SOUND(edict(), CHAN_WEAPON, "x/x_teleattack1.wav" );
+	UTIL_Remove( this );
+}
+
+void CNihilanthHVR::BounceTouch( CBaseEntity *pOther )
+{
+	Vector vecDir = m_vecIdeal.Normalize( );
+
+	TraceResult tr = UTIL_GetGlobalTrace( );
+
+	float n = -DotProduct(tr.vecPlaneNormal, vecDir);
+
+	vecDir = 2.0 * tr.vecPlaneNormal * n + vecDir;
+
+	m_vecIdeal = vecDir * m_vecIdeal.Length();
+}
+
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/nodes.cpp b/main/source/dlls/nodes.cpp
new file mode 100644
index 00000000..807a9c52
--- /dev/null
+++ b/main/source/dlls/nodes.cpp
@@ -0,0 +1,3642 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// nodes.cpp - AI node tree stuff.
+//=========================================================
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"nodes.h"
+#include	"animation.h"
+#include	"doors.h"
+#include	"mod/AvHConstants.h"
+
+#define	HULL_STEP_SIZE 16// how far the test hull moves on each step
+#define	NODE_HEIGHT	8	// how high to lift nodes off the ground after we drop them all (make stair/ramp mapping easier)
+
+// to help eliminate node clutter by level designers, this is used to cap how many other nodes
+// any given node is allowed to 'see' in the first stage of graph creation "LinkVisibleNodes()".
+#define	MAX_NODE_INITIAL_LINKS	128
+#define	MAX_NODES               1024
+
+extern DLL_GLOBAL edict_t		*g_pBodyQueueHead;
+
+Vector VecBModelOrigin( entvars_t* pevBModel );
+ 
+CGraph	WorldGraph;
+
+LINK_ENTITY_TO_CLASS( info_node, CNodeEnt );
+LINK_ENTITY_TO_CLASS( info_node_air, CNodeEnt );
+#ifdef __linux__
+#include <sys/stat.h>
+#include <unistd.h>
+#define CreateDirectory(p, n) mkdir(p, 0777)
+#endif
+//=========================================================
+// CGraph - InitGraph - prepares the graph for use. Frees any
+// memory currently in use by the world graph, NULLs 
+// all pointers, and zeros the node count.
+//=========================================================
+void CGraph :: InitGraph( void)
+{
+
+	// Make the graph unavailable
+	//
+	m_fGraphPresent = FALSE;
+	m_fGraphPointersSet = FALSE;
+	m_fRoutingComplete = FALSE;
+
+	// Free the link pool
+	//
+	if ( m_pLinkPool )
+	{
+		free ( m_pLinkPool );
+		m_pLinkPool = NULL;
+	}
+		
+	// Free the node info
+	//
+	if ( m_pNodes )
+	{
+		free ( m_pNodes );
+		m_pNodes = NULL;
+	}
+
+	if ( m_di )
+	{
+		free ( m_di );
+		m_di = NULL;
+	}
+
+	// Free the routing info.
+	//
+	if ( m_pRouteInfo )
+	{
+		free ( m_pRouteInfo );
+		m_pRouteInfo = NULL;
+	}
+
+	if (m_pHashLinks)
+	{
+		free(m_pHashLinks);
+		m_pHashLinks = NULL;
+	}
+
+	// Zero node and link counts
+	//
+	m_cNodes = 0;
+	m_cLinks = 0;
+	m_nRouteInfo = 0;
+
+	m_iLastActiveIdleSearch = 0;
+	m_iLastCoverSearch = 0;
+}
+	
+//=========================================================
+// CGraph - AllocNodes - temporary function that mallocs a
+// reasonable number of nodes so we can build the path which
+// will be saved to disk.
+//=========================================================
+int CGraph :: AllocNodes ( void )
+{
+//  malloc all of the nodes
+	WorldGraph.m_pNodes = (CNode *)calloc ( sizeof ( CNode ), MAX_NODES );
+
+// could not malloc space for all the nodes!
+	if ( !WorldGraph.m_pNodes )
+	{
+		ALERT ( at_aiconsole, "**ERROR**\nCouldn't malloc %d nodes!\n", WorldGraph.m_cNodes );
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+//=========================================================
+// CGraph - LinkEntForLink - sometimes the ent that blocks
+// a path is a usable door, in which case the monster just
+// needs to face the door and fire it. In other cases, the
+// monster needs to operate a button or lever to get the 
+// door to open. This function will return a pointer to the
+// button if the monster needs to hit a button to open the 
+// door, or returns a pointer to the door if the monster 
+// need only use the door.
+//
+// pNode is the node the monster will be standing on when it
+// will need to stop and trigger the ent.
+//=========================================================
+entvars_t* CGraph :: LinkEntForLink ( CLink *pLink, CNode *pNode )
+{
+	edict_t	*pentSearch;
+	edict_t	*pentTrigger;
+	entvars_t		*pevTrigger;
+	entvars_t		*pevLinkEnt;
+	TraceResult	tr;
+	
+	pevLinkEnt = pLink->m_pLinkEnt;
+	if ( !pevLinkEnt )
+		return NULL;
+
+	pentSearch = NULL;// start search at the top of the ent list.
+			
+	if ( FClassnameIs ( pevLinkEnt, kesFuncDoor ) || FClassnameIs ( pevLinkEnt, "func_door_rotating" ) )
+	{
+
+		///!!!UNDONE - check for TOGGLE or STAY open doors here. If a door is in the way, and is 
+		// TOGGLE or STAY OPEN, even monsters that can't open doors can go that way.
+
+		if ( ( pevLinkEnt->spawnflags & SF_DOOR_USE_ONLY ) )
+		{// door is use only, so the door is all the monster has to worry about
+			return pevLinkEnt;
+		}
+
+		while ( 1 )
+		{
+			pentTrigger = FIND_ENTITY_BY_TARGET ( pentSearch, STRING( pevLinkEnt->targetname ) );// find the button or trigger
+
+			if ( FNullEnt( pentTrigger ) )
+			{// no trigger found
+
+				// right now this is a problem among auto-open doors, or any door that opens through the use 
+				// of a trigger brush. Trigger brushes have no models, and don't show up in searches. Just allow
+				// monsters to open these sorts of doors for now. 
+				return pevLinkEnt;
+			}
+			
+			pentSearch = pentTrigger;
+			pevTrigger = VARS( pentTrigger );
+			
+			if ( FClassnameIs(pevTrigger, "func_button") || FClassnameIs(pevTrigger, "func_rot_button" ) )
+			{// only buttons are handled right now. 
+
+				// trace from the node to the trigger, make sure it's one we can see from the node.
+				// !!!HACKHACK Use bodyqueue here cause there are no ents we really wish to ignore!
+				UTIL_TraceLine ( pNode->m_vecOrigin, VecBModelOrigin( pevTrigger ), ignore_monsters, g_pBodyQueueHead, &tr );
+
+
+				if ( VARS(tr.pHit) == pevTrigger )
+				{// good to go!
+					return VARS( tr.pHit );
+				}
+			}
+		}
+	}
+	else
+	{
+		ALERT ( at_aiconsole, "Unsupported PathEnt:\n'%s'\n", STRING ( pevLinkEnt->classname ) );
+		return NULL;
+	}
+}
+
+//=========================================================
+// CGraph - HandleLinkEnt - a brush ent is between two
+// nodes that would otherwise be able to see each other. 
+// Given the monster's capability, determine whether
+// or not the monster can go this way. 
+//=========================================================
+int	CGraph :: HandleLinkEnt ( int iNode, entvars_t *pevLinkEnt, int afCapMask, NODEQUERY queryType )
+{
+	edict_t  *pentWorld;
+	CBaseEntity	*pDoor;
+	TraceResult	tr;
+
+	if ( !m_fGraphPresent || !m_fGraphPointersSet )
+	{// protect us in the case that the node graph isn't available
+		ALERT ( at_aiconsole, "Graph not ready!\n" );
+		return FALSE;
+	}
+
+	if ( FNullEnt ( pevLinkEnt ) )
+	{
+		ALERT ( at_aiconsole, "dead path ent!\n" );
+		return TRUE;
+	}
+	pentWorld = NULL;
+
+// func_door
+	if ( FClassnameIs( pevLinkEnt, kesFuncDoor ) || FClassnameIs( pevLinkEnt, "func_door_rotating" ) )
+	{// ent is a door.
+
+		pDoor = ( CBaseEntity::Instance( pevLinkEnt ) );
+
+		if ( ( pevLinkEnt->spawnflags & SF_DOOR_USE_ONLY ) ) 
+		{// door is use only.
+
+			if  ( ( afCapMask & bits_CAP_OPEN_DOORS ) )
+			{// let monster right through if he can open doors
+				return TRUE;
+			}
+			else 
+			{
+				// monster should try for it if the door is open and looks as if it will stay that way
+				if ( pDoor->GetToggleState()== TS_AT_TOP && ( pevLinkEnt->spawnflags & SF_DOOR_NO_AUTO_RETURN ) )
+				{
+					return TRUE;
+				}
+
+				return FALSE;
+			}
+		}
+		else 
+		{// door must be opened with a button or trigger field.
+			
+			// monster should try for it if the door is open and looks as if it will stay that way
+			if ( pDoor->GetToggleState() == TS_AT_TOP && ( pevLinkEnt->spawnflags & SF_DOOR_NO_AUTO_RETURN ) )
+			{
+				return TRUE;
+			}
+			if  ( ( afCapMask & bits_CAP_OPEN_DOORS ) )
+			{
+				if ( !( pevLinkEnt->spawnflags & SF_DOOR_NOMONSTERS ) || queryType == NODEGRAPH_STATIC )
+					return TRUE;
+			}
+
+			return FALSE;
+		}
+	}
+// func_breakable	
+	else if ( FClassnameIs( pevLinkEnt, "func_breakable" ) && queryType == NODEGRAPH_STATIC )
+	{
+		return TRUE;
+	}
+	else
+	{
+		ALERT ( at_aiconsole, "Unhandled Ent in Path %s\n", STRING( pevLinkEnt->classname ) );
+		return FALSE;
+	}
+
+	return FALSE;
+}
+
+#if 0
+//=========================================================
+// FindNearestLink - finds the connection (line) nearest
+// the given point. Returns FALSE if fails, or TRUE if it
+// has stuffed the index into the nearest link pool connection
+// into the passed int pointer, and a BOOL telling whether or 
+// not the point is along the line into the passed BOOL pointer.
+//=========================================================
+int	CGraph :: FindNearestLink ( const Vector &vecTestPoint, int *piNearestLink, BOOL *pfAlongLine )
+{
+	int			i, j;// loops
+	
+	int			iNearestLink;// index into the link pool, this is the nearest node at any time. 
+	float		flMinDist;// the distance of of the nearest case so far
+	float		flDistToLine;// the distance of the current test case
+
+	BOOL		fCurrentAlongLine;
+	BOOL		fSuccess;
+
+	//float		flConstant;// line constant
+	Vector		vecSpot1, vecSpot2;
+	Vector2D	vec2Spot1, vec2Spot2, vec2TestPoint;
+	Vector2D	vec2Normal;// line normal
+	Vector2D	vec2Line;
+
+	TraceResult	tr;
+
+	iNearestLink = -1;// prepare for failure
+	fSuccess = FALSE;
+
+	flMinDist = 9999;// anything will be closer than this
+
+// go through all of the nodes, and each node's connections	
+	int	cSkip = 0;// how many links proper pairing allowed us to skip
+	int cChecked = 0;// how many links were checked
+
+	for ( i = 0 ; i < m_cNodes ; i++ )
+	{
+		vecSpot1 = m_pNodes[ i ].m_vecOrigin;
+
+		if ( m_pNodes[ i ].m_cNumLinks <= 0 )
+		{// this shouldn't happen!
+			ALERT ( at_aiconsole, "**Node %d has no links\n", i );
+			continue;
+		}
+
+		for ( j = 0 ; j < m_pNodes[ i ].m_cNumLinks ; j++ )
+		{
+			/*
+			!!!This optimization only works when the node graph consists of properly linked pairs. 
+			if ( INodeLink ( i, j ) <= i )
+			{
+				// since we're going through the nodes in order, don't check
+				// any connections whose second node is lower in the list
+				// than the node we're currently working with. This eliminates
+				// redundant checks.
+				cSkip++;
+				continue;
+			}
+			*/
+
+			vecSpot2 = PNodeLink ( i, j )->m_vecOrigin;
+
+			// these values need a little attention now and then, or sometimes ramps cause trouble.
+			if ( fabs ( vecSpot1.z - vecTestPoint.z ) > 48 && fabs ( vecSpot2.z - vecTestPoint.z ) > 48 )
+			{
+				// if both endpoints of the line are 32 units or more above or below the monster, 
+				// the monster won't be able to get to them, so we do a bit of trivial rejection here.
+				// this may change if monsters are allowed to jump down. 
+				// 
+				// !!!LATER: some kind of clever X/Y hashing should be used here, too
+				continue;
+			}
+
+// now we have two endpoints for a line segment that we've not already checked. 
+// since all lines that make it this far are within -/+ 32 units of the test point's
+// Z Plane, we can get away with doing the point->line check in 2d.
+			
+			cChecked++;
+
+			vec2Spot1 = vecSpot1.Make2D();
+			vec2Spot2 = vecSpot2.Make2D();
+			vec2TestPoint = vecTestPoint.Make2D();
+		
+			// get the line normal.
+			vec2Line = ( vec2Spot1 - vec2Spot2 ).Normalize();
+			vec2Normal.x = -vec2Line.y;
+			vec2Normal.y = vec2Line.x;
+
+			if ( DotProduct ( vec2Line, ( vec2TestPoint - vec2Spot1 ) ) > 0 )
+			{// point outside of line
+				flDistToLine = ( vec2TestPoint - vec2Spot1 ).Length();
+				fCurrentAlongLine = FALSE;
+			}
+			else if ( DotProduct ( vec2Line, ( vec2TestPoint - vec2Spot2 ) ) < 0 )
+			{// point outside of line
+				flDistToLine = ( vec2TestPoint - vec2Spot2 ).Length();
+				fCurrentAlongLine = FALSE;
+			}
+			else
+			{// point inside line
+				flDistToLine = fabs( DotProduct ( vec2TestPoint - vec2Spot2, vec2Normal ) );
+				fCurrentAlongLine = TRUE;
+			}
+
+			if ( flDistToLine < flMinDist )
+			{// just found a line nearer than any other so far
+				
+				UTIL_TraceLine ( vecTestPoint, SourceNode( i, j ).m_vecOrigin, ignore_monsters, g_pBodyQueueHead, &tr );
+
+				if ( tr.flFraction != 1.0 )
+				{// crap. can't see the first node of this link, try to see the other
+					
+					UTIL_TraceLine ( vecTestPoint, DestNode( i, j ).m_vecOrigin, ignore_monsters, g_pBodyQueueHead, &tr );
+					if ( tr.flFraction != 1.0 )
+					{// can't use this link, cause can't see either node!
+						continue;
+					}
+
+				}
+				
+				fSuccess = TRUE;// we know there will be something to return.
+				flMinDist = flDistToLine;
+				iNearestLink = m_pNodes [ i ].m_iFirstLink + j;
+				*piNearestLink = m_pNodes[ i ].m_iFirstLink + j;
+				*pfAlongLine = fCurrentAlongLine;
+			}
+		}
+	}
+
+/*
+	if ( fSuccess )
+	{
+		WRITE_BYTE(MSG_BROADCAST, SVC_TEMPENTITY);
+		WRITE_BYTE(MSG_BROADCAST, TE_SHOWLINE);
+		
+		WRITE_COORD(MSG_BROADCAST, m_pNodes[ m_pLinkPool[ iNearestLink ].m_iSrcNode ].m_vecOrigin.x );
+		WRITE_COORD(MSG_BROADCAST, m_pNodes[ m_pLinkPool[ iNearestLink ].m_iSrcNode ].m_vecOrigin.y );
+		WRITE_COORD(MSG_BROADCAST, m_pNodes[ m_pLinkPool[ iNearestLink ].m_iSrcNode ].m_vecOrigin.z + NODE_HEIGHT);
+
+		WRITE_COORD(MSG_BROADCAST, m_pNodes[ m_pLinkPool[ iNearestLink ].m_iDestNode ].m_vecOrigin.x );
+		WRITE_COORD(MSG_BROADCAST, m_pNodes[ m_pLinkPool[ iNearestLink ].m_iDestNode ].m_vecOrigin.y );
+		WRITE_COORD(MSG_BROADCAST, m_pNodes[ m_pLinkPool[ iNearestLink ].m_iDestNode ].m_vecOrigin.z + NODE_HEIGHT);
+	}
+*/
+
+	ALERT ( at_aiconsole, "%d Checked\n", cChecked );
+	return fSuccess;
+}
+
+#endif
+
+int	CGraph::HullIndex( const CBaseEntity *pEntity )
+{
+	if ( pEntity->pev->movetype == MOVETYPE_FLY)
+		return NODE_FLY_HULL;
+
+	if ( pEntity->pev->mins == Vector( -12, -12, 0 ) )
+		return NODE_SMALL_HULL;
+	else if ( pEntity->pev->mins == VEC_HUMAN_HULL_MIN )
+		return NODE_HUMAN_HULL;
+	else if ( pEntity->pev->mins == Vector ( -32, -32, 0 ) )
+		return NODE_LARGE_HULL;
+
+//	ALERT ( at_aiconsole, "Unknown Hull Mins!\n" );
+	return NODE_HUMAN_HULL;
+}
+
+
+int	CGraph::NodeType( const CBaseEntity *pEntity )
+{
+	if ( pEntity->pev->movetype == MOVETYPE_FLY)
+	{
+		if (pEntity->pev->waterlevel != 0)
+		{
+			return bits_NODE_WATER;
+		}
+		else
+		{
+			return bits_NODE_AIR;
+		}
+	}
+	return bits_NODE_LAND;
+}
+
+
+// Sum up graph weights on the path from iStart to iDest to determine path length
+float CGraph::PathLength( int iStart, int iDest, int iHull, int afCapMask )
+{
+	float	distance = 0;
+	int		iNext;
+
+	int		iMaxLoop = m_cNodes;
+
+	int iCurrentNode = iStart;
+	int iCap = CapIndex( afCapMask );
+
+	while (iCurrentNode != iDest)
+	{
+		if (iMaxLoop-- <= 0)
+		{
+			ALERT( at_console, "Route Failure\n" );
+			return 0;
+		}
+
+		iNext = NextNodeInRoute( iCurrentNode, iDest, iHull, iCap );
+		if (iCurrentNode == iNext)
+		{
+			//ALERT(at_aiconsole, "SVD: Can't get there from here..\n");
+			return 0;
+		}
+
+		int iLink;
+		HashSearch(iCurrentNode, iNext, iLink);
+		if (iLink < 0)
+		{
+			ALERT(at_console, "HashLinks is broken from %d to %d.\n", iCurrentNode, iDest);
+			return 0;
+		}
+		CLink &link = Link(iLink);
+		distance += link.m_flWeight;
+
+		iCurrentNode = iNext;
+	}
+
+	return distance;
+}
+
+
+// Parse the routing table at iCurrentNode for the next node on the shortest path to iDest
+int CGraph::NextNodeInRoute( int iCurrentNode, int iDest, int iHull, int iCap )
+{
+	int iNext = iCurrentNode;
+	int nCount = iDest+1;
+	char *pRoute = m_pRouteInfo + m_pNodes[ iCurrentNode ].m_pNextBestNode[iHull][iCap];
+
+	// Until we decode the next best node
+	//
+	while (nCount > 0)
+	{
+		char ch = *pRoute++;
+		//ALERT(at_aiconsole, "C(%d)", ch);
+		if (ch < 0)
+		{
+			// Sequence phrase
+			//
+			ch = -ch;
+			if (nCount <= ch)
+			{
+				iNext = iDest;
+				nCount = 0;
+				//ALERT(at_aiconsole, "SEQ: iNext/iDest=%d\n", iNext);
+			}
+			else
+			{
+				//ALERT(at_aiconsole, "SEQ: nCount + ch (%d + %d)\n", nCount, ch);
+				nCount = nCount - ch;
+			}
+		}
+		else
+		{
+			//ALERT(at_aiconsole, "C(%d)", *pRoute);
+
+			// Repeat phrase
+			//
+			if (nCount <= ch+1)
+			{
+				iNext = iCurrentNode + *pRoute;
+				if (iNext >= m_cNodes) iNext -= m_cNodes;
+				else if (iNext < 0) iNext += m_cNodes;
+				nCount = 0;
+				//ALERT(at_aiconsole, "REP: iNext=%d\n", iNext);
+			}
+			else
+			{
+				//ALERT(at_aiconsole, "REP: nCount - ch+1 (%d - %d+1)\n", nCount, ch);
+				nCount = nCount - ch - 1;
+			}
+			pRoute++;
+		}
+	}
+
+	return iNext;
+}
+
+
+//=========================================================
+// CGraph - FindShortestPath 
+//
+// accepts a capability mask (afCapMask), and will only 
+// find a path usable by a monster with those capabilities
+// returns the number of nodes copied into supplied array
+//=========================================================
+int CGraph :: FindShortestPath ( int *piPath, int iStart, int iDest, int iHull, int afCapMask)
+{
+	int		iVisitNode;
+	int		iCurrentNode;
+	int		iNumPathNodes;
+	int		iHullMask;
+
+	if ( !m_fGraphPresent || !m_fGraphPointersSet )
+	{// protect us in the case that the node graph isn't available or built
+		ALERT ( at_aiconsole, "Graph not ready!\n" );
+		return FALSE;
+	}
+	
+	if ( iStart < 0 || iStart > m_cNodes )
+	{// The start node is bad?
+		ALERT ( at_aiconsole, "Can't build a path, iStart is %d!\n", iStart );
+		return FALSE;
+	}
+
+	if (iStart == iDest)
+	{
+		piPath[0] = iStart;
+		piPath[1] = iDest;
+		return 2;
+	}
+
+	// Is routing information present.
+	//
+	if (m_fRoutingComplete)
+	{
+		int iCap = CapIndex( afCapMask );
+
+		iNumPathNodes = 0;
+		piPath[iNumPathNodes++] = iStart;
+		iCurrentNode = iStart;
+		int iNext;
+
+		//ALERT(at_aiconsole, "GOAL: %d to %d\n", iStart, iDest);
+
+		// Until we arrive at the destination
+		//
+		while (iCurrentNode != iDest)
+		{
+			iNext = NextNodeInRoute( iCurrentNode, iDest, iHull, iCap );
+			if (iCurrentNode == iNext)
+			{
+				//ALERT(at_aiconsole, "SVD: Can't get there from here..\n");
+				return 0;
+				break;
+			}
+			if (iNumPathNodes >= MAX_PATH_SIZE) 
+			{
+				//ALERT(at_aiconsole, "SVD: Don't return the entire path.\n");
+				break;
+			}
+			piPath[iNumPathNodes++] = iNext;
+			iCurrentNode = iNext;
+		}
+		//ALERT( at_aiconsole, "SVD: Path with %d nodes.\n", iNumPathNodes);
+	}
+	else
+	{
+		CQueuePriority	queue;
+
+		switch( iHull )
+		{
+		case NODE_SMALL_HULL:
+			iHullMask = bits_LINK_SMALL_HULL;
+			break;
+		case NODE_HUMAN_HULL:
+			iHullMask = bits_LINK_HUMAN_HULL;
+			break;
+		case NODE_LARGE_HULL:
+			iHullMask = bits_LINK_LARGE_HULL;
+			break;
+		case NODE_FLY_HULL:
+			iHullMask = bits_LINK_FLY_HULL;
+			break;
+		}
+
+		// Mark all the nodes as unvisited.
+		//
+		for ( int i = 0; i < m_cNodes; i++)
+		{
+			m_pNodes[ i ].m_flClosestSoFar = -1.0;
+		}
+
+		m_pNodes[ iStart ].m_flClosestSoFar = 0.0;
+		m_pNodes[ iStart ].m_iPreviousNode = iStart;// tag this as the origin node
+		queue.Insert( iStart, 0.0 );// insert start node 
+		
+		while ( !queue.Empty() )
+		{
+			// now pull a node out of the queue
+			float flCurrentDistance;
+			iCurrentNode = queue.Remove(flCurrentDistance);
+
+			// For straight-line weights, the following Shortcut works. For arbitrary weights,
+			// it doesn't.
+			//
+			if (iCurrentNode == iDest) break;
+
+			CNode *pCurrentNode = &m_pNodes[ iCurrentNode ];
+			
+			for ( i = 0 ; i < pCurrentNode->m_cNumLinks ; i++ )
+			{// run through all of this node's neighbors
+				
+				iVisitNode = INodeLink ( iCurrentNode, i );
+				if ( ( m_pLinkPool[  m_pNodes[ iCurrentNode ].m_iFirstLink + i ].m_afLinkInfo & iHullMask ) != iHullMask )
+				{// monster is too large to walk this connection
+					//ALERT ( at_aiconsole, "fat ass %d/%d\n",m_pLinkPool[ m_pNodes[ iCurrentNode ].m_iFirstLink + i ].m_afLinkInfo, iMonsterHull );
+					continue;
+				}
+				// check the connection from the current node to the node we're about to mark visited and push into the queue				
+				if ( m_pLinkPool[ m_pNodes[ iCurrentNode ].m_iFirstLink + i ].m_pLinkEnt != NULL )
+				{// there's a brush ent in the way! Don't mark this node or put it into the queue unless the monster can negotiate it
+					
+					if ( !HandleLinkEnt ( iCurrentNode, m_pLinkPool[ m_pNodes[ iCurrentNode ].m_iFirstLink + i ].m_pLinkEnt, afCapMask, NODEGRAPH_STATIC ) )
+					{// monster should not try to go this way.
+						continue;
+					}
+				}
+				float flOurDistance = flCurrentDistance + m_pLinkPool[ m_pNodes[ iCurrentNode ].m_iFirstLink + i].m_flWeight;
+				if (  m_pNodes[ iVisitNode ].m_flClosestSoFar < -0.5
+				   || flOurDistance < m_pNodes[ iVisitNode ].m_flClosestSoFar - 0.001 )
+				{
+					m_pNodes[iVisitNode].m_flClosestSoFar = flOurDistance;
+					m_pNodes[iVisitNode].m_iPreviousNode = iCurrentNode;
+
+					queue.Insert ( iVisitNode, flOurDistance );
+				}
+			}
+		}
+		if ( m_pNodes[iDest].m_flClosestSoFar < -0.5 )
+		{// Destination is unreachable, no path found.
+			return 0;
+		}
+
+	// the queue is not empty
+		
+		// now we must walk backwards through the m_iPreviousNode field, and count how many connections there are in the path
+		iCurrentNode = iDest;
+		iNumPathNodes = 1;// count the dest
+		
+		while ( iCurrentNode != iStart )
+		{
+			iNumPathNodes++;
+			iCurrentNode = m_pNodes[ iCurrentNode ].m_iPreviousNode;
+		}
+
+		iCurrentNode = iDest;
+		for ( i = iNumPathNodes - 1 ; i >= 0 ; i-- )
+		{
+			piPath[ i ] = iCurrentNode;
+			iCurrentNode = m_pNodes [ iCurrentNode ].m_iPreviousNode;
+		}
+	}
+
+#if 0
+
+	if (m_fRoutingComplete)
+	{
+		// This will draw the entire path that was generated for the monster.
+
+		for ( int i = 0 ; i < iNumPathNodes - 1 ; i++ )
+		{
+			MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+				WRITE_BYTE( TE_SHOWLINE);
+				
+				WRITE_COORD( m_pNodes[ piPath[ i ] ].m_vecOrigin.x );
+				WRITE_COORD( m_pNodes[ piPath[ i ] ].m_vecOrigin.y );
+				WRITE_COORD( m_pNodes[ piPath[ i ] ].m_vecOrigin.z + NODE_HEIGHT );
+
+				WRITE_COORD( m_pNodes[ piPath[ i + 1 ] ].m_vecOrigin.x );
+				WRITE_COORD( m_pNodes[ piPath[ i + 1 ] ].m_vecOrigin.y );
+				WRITE_COORD( m_pNodes[ piPath[ i + 1 ] ].m_vecOrigin.z + NODE_HEIGHT );
+			MESSAGE_END();
+		}
+	}
+
+#endif
+#if 0 // MAZE map
+	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+		WRITE_BYTE( TE_SHOWLINE);
+		
+		WRITE_COORD( m_pNodes[ 4 ].m_vecOrigin.x );
+		WRITE_COORD( m_pNodes[ 4 ].m_vecOrigin.y );
+		WRITE_COORD( m_pNodes[ 4 ].m_vecOrigin.z + NODE_HEIGHT );
+
+		WRITE_COORD( m_pNodes[ 9 ].m_vecOrigin.x );
+		WRITE_COORD( m_pNodes[ 9 ].m_vecOrigin.y );
+		WRITE_COORD( m_pNodes[ 9 ].m_vecOrigin.z + NODE_HEIGHT );
+	MESSAGE_END();
+#endif
+
+	return iNumPathNodes;
+}
+
+inline ULONG Hash(void *p, int len)
+{
+	CRC32_t ulCrc;
+	CRC32_INIT(&ulCrc);
+	CRC32_PROCESS_BUFFER(&ulCrc, p, len);
+	return CRC32_FINAL(ulCrc);
+}
+
+void inline CalcBounds(int &Lower, int &Upper, int Goal, int Best)
+{
+    int Temp = 2*Goal - Best;
+    if (Best > Goal)
+    {
+        Lower = max(0, Temp);
+        Upper = Best;
+    }
+    else
+    {
+        Upper = min(255, Temp);
+        Lower = Best;
+    }
+}
+
+// Convert from [-8192,8192] to [0, 255]
+//
+inline int CALC_RANGE(int x, int lower, int upper)
+{
+	return NUM_RANGES*(x-lower)/((upper-lower+1));
+}
+
+
+void inline UpdateRange(int &minValue, int &maxValue, int Goal, int Best)
+{
+    int Lower, Upper;
+    CalcBounds(Lower, Upper, Goal, Best);
+    if (Upper < maxValue) maxValue = Upper;
+    if (minValue < Lower) minValue = Lower;
+}
+
+void CGraph :: CheckNode(Vector vecOrigin, int iNode)
+{
+    // Have we already seen this point before?.
+    //
+    if (m_di[iNode].m_CheckedEvent == m_CheckedCounter) return;
+    m_di[iNode].m_CheckedEvent = m_CheckedCounter;
+
+	float flDist = ( vecOrigin - m_pNodes[ iNode ].m_vecOriginPeek ).Length();
+
+	if ( flDist < m_flShortest )
+	{
+		TraceResult tr;
+
+		// make sure that vecOrigin can trace to this node!
+		UTIL_TraceLine ( vecOrigin, m_pNodes[ iNode ].m_vecOriginPeek, ignore_monsters, 0, &tr );
+
+		if ( tr.flFraction == 1.0 )
+		{
+			m_iNearest = iNode;
+			m_flShortest = flDist;
+
+			UpdateRange(m_minX, m_maxX, CALC_RANGE(vecOrigin.x, m_RegionMin[0], m_RegionMax[0]), m_pNodes[iNode].m_Region[0]);
+			UpdateRange(m_minY, m_maxY, CALC_RANGE(vecOrigin.y, m_RegionMin[1], m_RegionMax[1]), m_pNodes[iNode].m_Region[1]);
+			UpdateRange(m_minZ, m_maxZ, CALC_RANGE(vecOrigin.z, m_RegionMin[2], m_RegionMax[2]), m_pNodes[iNode].m_Region[2]);
+
+			// From maxCircle, calculate maximum bounds box. All points must be
+			// simultaneously inside all bounds of the box.
+			//
+			m_minBoxX = CALC_RANGE(vecOrigin.x - flDist, m_RegionMin[0], m_RegionMax[0]);
+			m_maxBoxX = CALC_RANGE(vecOrigin.x + flDist, m_RegionMin[0], m_RegionMax[0]);
+			m_minBoxY = CALC_RANGE(vecOrigin.y - flDist, m_RegionMin[1], m_RegionMax[1]);
+			m_maxBoxY = CALC_RANGE(vecOrigin.y + flDist, m_RegionMin[1], m_RegionMax[1]);
+			m_minBoxZ = CALC_RANGE(vecOrigin.z - flDist, m_RegionMin[2], m_RegionMax[2]);
+			m_maxBoxZ = CALC_RANGE(vecOrigin.z + flDist, m_RegionMin[2], m_RegionMax[2]);
+		}
+	}
+}
+
+//=========================================================
+// CGraph - FindNearestNode - returns the index of the node nearest
+// the given vector -1 is failure (couldn't find a valid
+// near node )
+//=========================================================
+int	CGraph :: FindNearestNode ( const Vector &vecOrigin,  CBaseEntity *pEntity )
+{
+	return FindNearestNode( vecOrigin, NodeType( pEntity ) );
+}
+
+int	CGraph :: FindNearestNode ( const Vector &vecOrigin,  int afNodeTypes )
+{
+	int	i;
+	TraceResult tr;
+
+	if ( !m_fGraphPresent || !m_fGraphPointersSet )
+	{// protect us in the case that the node graph isn't available
+		ALERT ( at_aiconsole, "Graph not ready!\n" );
+		return -1;
+	}
+
+	// Check with the cache
+	//
+	ULONG iHash = (CACHE_SIZE-1) & Hash((void *)(const float *)vecOrigin, sizeof(vecOrigin));
+	if (m_Cache[iHash].v == vecOrigin)
+	{
+		//ALERT(at_aiconsole, "Cache Hit.\n");
+		return m_Cache[iHash].n;
+	}
+	else
+	{
+		//ALERT(at_aiconsole, "Cache Miss.\n");
+	}
+
+	// Mark all points as unchecked.
+	//
+	m_CheckedCounter++;
+	if (m_CheckedCounter == 0)
+	{
+		for (int i = 0; i < m_cNodes; i++)
+		{
+			m_di[i].m_CheckedEvent = 0;
+		}
+		m_CheckedCounter++;
+	}
+
+	m_iNearest = -1;
+	m_flShortest = 999999.0; // just a big number.
+
+	// If we can find a visible point, then let CalcBounds set the limits, but if
+	// we have no visible point at all to start with, then don't restrict the limits.
+	//
+#if 1
+	m_minX = 0; m_maxX = 255;
+	m_minY = 0; m_maxY = 255;
+	m_minZ = 0; m_maxZ = 255;
+	m_minBoxX = 0; m_maxBoxX = 255;
+	m_minBoxY = 0; m_maxBoxY = 255;
+	m_minBoxZ = 0; m_maxBoxZ = 255;
+#else
+	m_minBoxX = CALC_RANGE(vecOrigin.x - flDist, m_RegionMin[0], m_RegionMax[0]);
+	m_maxBoxX = CALC_RANGE(vecOrigin.x + flDist, m_RegionMin[0], m_RegionMax[0]);
+	m_minBoxY = CALC_RANGE(vecOrigin.y - flDist, m_RegionMin[1], m_RegionMax[1]);
+	m_maxBoxY = CALC_RANGE(vecOrigin.y + flDist, m_RegionMin[1], m_RegionMax[1]);
+	m_minBoxZ = CALC_RANGE(vecOrigin.z - flDist, m_RegionMin[2], m_RegionMax[2]);
+	m_maxBoxZ = CALC_RANGE(vecOrigin.z + flDist, m_RegionMin[2], m_RegionMax[2])
+    CalcBounds(m_minX, m_maxX, CALC_RANGE(vecOrigin.x, m_RegionMin[0], m_RegionMax[0]), m_pNodes[m_iNearest].m_Region[0]);
+    CalcBounds(m_minY, m_maxY, CALC_RANGE(vecOrigin.y, m_RegionMin[1], m_RegionMax[1]), m_pNodes[m_iNearest].m_Region[1]);
+    CalcBounds(m_minZ, m_maxZ, CALC_RANGE(vecOrigin.z, m_RegionMin[2], m_RegionMax[2]), m_pNodes[m_iNearest].m_Region[2]);
+#endif
+
+    int halfX = (m_minX+m_maxX)/2;
+    int halfY = (m_minY+m_maxY)/2;
+    int halfZ = (m_minZ+m_maxZ)/2;
+
+    int j;
+
+    for (i = halfX; i >= m_minX; i--)
+    {
+        for (j = m_RangeStart[0][i]; j <= m_RangeEnd[0][i]; j++)
+        {
+			if (!(m_pNodes[m_di[j].m_SortedBy[0]].m_afNodeInfo & afNodeTypes)) continue;
+
+			int rgY = m_pNodes[m_di[j].m_SortedBy[0]].m_Region[1];
+			if (rgY > m_maxBoxY) break;
+            if (rgY < m_minBoxY) continue;
+
+			int rgZ = m_pNodes[m_di[j].m_SortedBy[0]].m_Region[2];
+            if (rgZ < m_minBoxZ) continue;
+            if (rgZ > m_maxBoxZ) continue;
+            CheckNode(vecOrigin, m_di[j].m_SortedBy[0]);
+        }
+    }
+
+    for (i = max(m_minY,halfY+1); i <= m_maxY; i++)
+    {
+        for (j = m_RangeStart[1][i]; j <= m_RangeEnd[1][i]; j++)
+        {
+			if (!(m_pNodes[m_di[j].m_SortedBy[1]].m_afNodeInfo & afNodeTypes)) continue;
+
+			int rgZ = m_pNodes[m_di[j].m_SortedBy[1]].m_Region[2];
+            if (rgZ > m_maxBoxZ) break;
+            if (rgZ < m_minBoxZ) continue;
+			int rgX = m_pNodes[m_di[j].m_SortedBy[1]].m_Region[0];
+            if (rgX < m_minBoxX) continue;
+            if (rgX > m_maxBoxX) continue;
+            CheckNode(vecOrigin, m_di[j].m_SortedBy[1]);
+        }
+    }
+
+    for (i = min(m_maxZ,halfZ); i >= m_minZ; i--)
+    {
+        for (j = m_RangeStart[2][i]; j <= m_RangeEnd[2][i]; j++)
+        {
+			if (!(m_pNodes[m_di[j].m_SortedBy[2]].m_afNodeInfo & afNodeTypes)) continue;
+
+			int rgX = m_pNodes[m_di[j].m_SortedBy[2]].m_Region[0];
+            if (rgX > m_maxBoxX) break;
+            if (rgX < m_minBoxX) continue;
+			int rgY = m_pNodes[m_di[j].m_SortedBy[2]].m_Region[1];
+            if (rgY < m_minBoxY) continue;
+			if (rgY > m_maxBoxY) continue;
+            CheckNode(vecOrigin, m_di[j].m_SortedBy[2]);
+        }
+    }
+
+    for (i = max(m_minX,halfX+1); i <= m_maxX; i++)
+    {
+        for (j = m_RangeStart[0][i]; j <= m_RangeEnd[0][i]; j++)
+        {
+			if (!(m_pNodes[m_di[j].m_SortedBy[0]].m_afNodeInfo & afNodeTypes)) continue;
+
+			int rgY = m_pNodes[m_di[j].m_SortedBy[0]].m_Region[1];
+			if (rgY > m_maxBoxY) break;
+            if (rgY < m_minBoxY) continue;
+
+			int rgZ = m_pNodes[m_di[j].m_SortedBy[0]].m_Region[2];
+            if (rgZ < m_minBoxZ) continue;
+            if (rgZ > m_maxBoxZ) continue;
+            CheckNode(vecOrigin, m_di[j].m_SortedBy[0]);
+        }
+    }
+
+    for (i = min(m_maxY,halfY); i >= m_minY; i--)
+    {
+        for (j = m_RangeStart[1][i]; j <= m_RangeEnd[1][i]; j++)
+        {
+			if (!(m_pNodes[m_di[j].m_SortedBy[1]].m_afNodeInfo & afNodeTypes)) continue;
+
+			int rgZ = m_pNodes[m_di[j].m_SortedBy[1]].m_Region[2];
+            if (rgZ > m_maxBoxZ) break;
+            if (rgZ < m_minBoxZ) continue;
+			int rgX = m_pNodes[m_di[j].m_SortedBy[1]].m_Region[0];
+            if (rgX < m_minBoxX) continue;
+            if (rgX > m_maxBoxX) continue;
+            CheckNode(vecOrigin, m_di[j].m_SortedBy[1]);
+        }
+    }
+
+    for (i = max(m_minZ,halfZ+1); i <= m_maxZ; i++)
+    {
+        for (j = m_RangeStart[2][i]; j <= m_RangeEnd[2][i]; j++)
+        {
+			if (!(m_pNodes[m_di[j].m_SortedBy[2]].m_afNodeInfo & afNodeTypes)) continue;
+
+			int rgX = m_pNodes[m_di[j].m_SortedBy[2]].m_Region[0];
+            if (rgX > m_maxBoxX) break;
+            if (rgX < m_minBoxX) continue;
+			int rgY = m_pNodes[m_di[j].m_SortedBy[2]].m_Region[1];
+            if (rgY < m_minBoxY) continue;
+			if (rgY > m_maxBoxY) continue;
+            CheckNode(vecOrigin, m_di[j].m_SortedBy[2]);
+        }
+    }
+
+#if 0
+	// Verify our answers.
+	//
+	int iNearestCheck = -1;
+	m_flShortest = 8192;// find nodes within this radius
+
+	for ( i = 0 ; i < m_cNodes ; i++ )
+	{
+		float flDist = ( vecOrigin - m_pNodes[ i ].m_vecOriginPeek ).Length();
+
+		if ( flDist < m_flShortest )
+		{
+			// make sure that vecOrigin can trace to this node!
+			UTIL_TraceLine ( vecOrigin, m_pNodes[ i ].m_vecOriginPeek, ignore_monsters, 0, &tr );
+
+			if ( tr.flFraction == 1.0 )
+			{
+				iNearestCheck = i;
+				m_flShortest = flDist;
+			}
+		}
+	}
+
+	if (iNearestCheck != m_iNearest)
+	{
+		ALERT( at_aiconsole, "NOT closest %d(%f,%f,%f) %d(%f,%f,%f).\n",
+			iNearestCheck,
+			m_pNodes[iNearestCheck].m_vecOriginPeek.x,
+			m_pNodes[iNearestCheck].m_vecOriginPeek.y,
+			m_pNodes[iNearestCheck].m_vecOriginPeek.z,
+			m_iNearest,
+			(m_iNearest == -1?0.0:m_pNodes[m_iNearest].m_vecOriginPeek.x),
+			(m_iNearest == -1?0.0:m_pNodes[m_iNearest].m_vecOriginPeek.y),
+			(m_iNearest == -1?0.0:m_pNodes[m_iNearest].m_vecOriginPeek.z));
+	}
+	if (m_iNearest == -1)
+	{
+		ALERT(at_aiconsole, "All that work for nothing.\n");
+	}
+#endif
+	m_Cache[iHash].v = vecOrigin;
+	m_Cache[iHash].n = m_iNearest;
+	return m_iNearest;
+}
+
+//=========================================================
+// CGraph - ShowNodeConnections - draws a line from the given node
+// to all connected nodes
+//=========================================================
+void CGraph :: ShowNodeConnections ( int iNode )
+{
+	Vector	vecSpot;
+	CNode	*pNode;
+	CNode	*pLinkNode;
+	int	i;
+
+	if ( !m_fGraphPresent || !m_fGraphPointersSet )
+	{// protect us in the case that the node graph isn't available or built
+		ALERT ( at_aiconsole, "Graph not ready!\n" );
+		return;
+	}
+
+	if ( iNode < 0 )
+	{
+		ALERT( at_aiconsole, "Can't show connections for node %d\n", iNode );
+		return;
+	}
+
+	pNode = &m_pNodes[ iNode ];
+
+	UTIL_ParticleEffect( pNode->m_vecOrigin, g_vecZero, 255, 20 );// show node position
+	
+	if ( pNode->m_cNumLinks <= 0 )
+	{// no connections!
+		ALERT ( at_aiconsole, "**No Connections!\n" );
+	}
+
+	for ( i = 0 ; i < pNode->m_cNumLinks ; i++ )
+	{
+		
+		pLinkNode = &Node( NodeLink( iNode, i).m_iDestNode );
+		vecSpot = pLinkNode->m_vecOrigin;
+
+		MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+			WRITE_BYTE( TE_SHOWLINE);
+			
+			WRITE_COORD( m_pNodes[ iNode ].m_vecOrigin.x );
+			WRITE_COORD( m_pNodes[ iNode ].m_vecOrigin.y );
+			WRITE_COORD( m_pNodes[ iNode ].m_vecOrigin.z + NODE_HEIGHT );
+
+			WRITE_COORD( vecSpot.x );
+			WRITE_COORD( vecSpot.y );
+			WRITE_COORD( vecSpot.z + NODE_HEIGHT );
+		MESSAGE_END();
+
+	}
+}
+
+//=========================================================
+// CGraph - LinkVisibleNodes - the first, most basic
+// function of node graph creation, this connects every
+// node to every other node that it can see. Expects a 
+// pointer to an empty connection pool and a file pointer 
+// to write progress to. Returns the total number of initial
+// links.
+//
+// If there's a problem with this process, the index
+// of the offending node will be written to piBadNode
+//=========================================================
+int CGraph :: LinkVisibleNodes ( CLink *pLinkPool, FILE *file, int *piBadNode )
+{
+	int			i,j,z;
+	edict_t		*pTraceEnt;
+	int			cTotalLinks, cLinksThisNode, cMaxInitialLinks;
+	TraceResult	tr;
+	
+	// !!!BUGBUG - this function returns 0 if there is a problem in the middle of connecting the graph
+	// it also returns 0 if none of the nodes in a level can see each other. piBadNode is ALWAYS read
+	// by BuildNodeGraph() if this function returns a 0, so make sure that it doesn't get some random
+	// number back.
+	*piBadNode = 0;
+
+
+	if ( m_cNodes <= 0 )
+	{
+		ALERT ( at_aiconsole, "No Nodes!\n" );
+		return FALSE;
+	}
+
+	// if the file pointer is bad, don't blow up, just don't write the
+	// file.
+	if ( !file )
+	{
+		ALERT ( at_aiconsole, "**LinkVisibleNodes:\ncan't write to file." );
+	}
+	else
+	{
+		fprintf ( file, "----------------------------------------------------------------------------\n" );
+		fprintf ( file, "LinkVisibleNodes - Initial Connections\n" );
+		fprintf ( file, "----------------------------------------------------------------------------\n" );
+	}
+
+	cTotalLinks = 0;// start with no connections
+	
+	// to keep track of the maximum number of initial links any node had so far.
+	// this lets us keep an eye on MAX_NODE_INITIAL_LINKS to ensure that we are
+	// being generous enough.
+	cMaxInitialLinks = 0;
+
+	for ( i = 0 ; i < m_cNodes ; i++ )
+	{
+		cLinksThisNode = 0;// reset this count for each node.
+
+		if ( file )
+		{
+			fprintf ( file, "Node #%4d:\n\n", i );
+		}
+
+		for ( z = 0 ; z < MAX_NODE_INITIAL_LINKS ; z++ )
+		{// clear out the important fields in the link pool for this node
+			pLinkPool [ cTotalLinks + z ].m_iSrcNode = i;// so each link knows which node it originates from
+			pLinkPool [ cTotalLinks + z ].m_iDestNode = 0;
+			pLinkPool [ cTotalLinks + z ].m_pLinkEnt = NULL;
+		}
+
+		m_pNodes [ i ].m_iFirstLink = cTotalLinks;
+
+		// now build a list of every other node that this node can see
+		for ( j = 0 ; j < m_cNodes ; j++ )
+  		{
+			if ( j == i )
+			{// don't connect to self!
+				continue;
+			}
+
+#if 0
+			
+			if ( (m_pNodes[ i ].m_afNodeInfo & bits_NODE_WATER) != (m_pNodes[ j ].m_afNodeInfo & bits_NODE_WATER) )
+			{
+				// don't connect water nodes to air nodes or land nodes. It just wouldn't be prudent at this juncture.
+				continue;
+			}
+#else
+			if ( (m_pNodes[ i ].m_afNodeInfo & bits_NODE_GROUP_REALM) != (m_pNodes[ j ].m_afNodeInfo & bits_NODE_GROUP_REALM) )
+			{
+				// don't connect air nodes to water nodes to land nodes. It just wouldn't be prudent at this juncture.
+				continue;
+			}
+#endif
+
+			tr.pHit = NULL;// clear every time so we don't get stuck with last trace's hit ent
+			pTraceEnt = 0;
+
+			UTIL_TraceLine ( m_pNodes[ i ].m_vecOrigin,
+							 m_pNodes[ j ].m_vecOrigin,
+							 ignore_monsters,
+							 g_pBodyQueueHead,//!!!HACKHACK no real ent to supply here, using a global we don't care about
+							 &tr );
+			
+			
+			if ( tr.fStartSolid )
+				continue;
+
+			if ( tr.flFraction != 1.0 )
+			{// trace hit a brush ent, trace backwards to make sure that this ent is the only thing in the way.
+				
+				pTraceEnt = tr.pHit;// store the ent that the trace hit, for comparison
+	
+				UTIL_TraceLine ( m_pNodes[ j ].m_vecOrigin,
+								 m_pNodes[ i ].m_vecOrigin,
+								 ignore_monsters,
+								 g_pBodyQueueHead,//!!!HACKHACK no real ent to supply here, using a global we don't care about
+								 &tr );
+
+				
+// there is a solid_bsp ent in the way of these two nodes, so we must record several things about in order to keep
+// track of it in the pathfinding code, as well as through save and restore of the node graph. ANY data that is manipulated 
+// as part of the process of adding a LINKENT to a connection here must also be done in CGraph::SetGraphPointers, where reloaded
+// graphs are prepared for use.
+				if ( tr.pHit == pTraceEnt && !FClassnameIs( tr.pHit, "worldspawn" ) )
+				{
+					// get a pointer
+					pLinkPool [ cTotalLinks ].m_pLinkEnt = VARS( tr.pHit );
+
+					// record the modelname, so that we can save/load node trees
+					memcpy( pLinkPool [ cTotalLinks ].m_szLinkEntModelname, STRING( VARS(tr.pHit)->model ), 4 );
+
+					// set the flag for this ent that indicates that it is attached to the world graph
+					// if this ent is removed from the world, it must also be removed from the connections
+					// that it formerly blocked.
+					if ( !FBitSet( VARS( tr.pHit )->flags, FL_GRAPHED ) )
+					{
+						VARS( tr.pHit )->flags += FL_GRAPHED;
+					}
+				}
+				else
+				{// even if the ent wasn't there, these nodes couldn't be connected. Skip.
+					continue;
+				}
+			}
+
+			if ( file )
+			{
+				fprintf ( file, "%4d", j );
+
+				if ( !FNullEnt( pLinkPool[ cTotalLinks ].m_pLinkEnt ) )
+				{// record info about the ent in the way, if any.
+					fprintf ( file, "  Entity on connection: %s, name: %s  Model: %s", STRING( VARS( pTraceEnt )->classname ), STRING ( VARS( pTraceEnt )->targetname ), STRING ( VARS(tr.pHit)->model ) );
+				}
+				
+				fprintf ( file, "\n", j );
+			}
+
+			pLinkPool [ cTotalLinks ].m_iDestNode = j;
+			cLinksThisNode++;
+			cTotalLinks++;
+
+			// If we hit this, either a level designer is placing too many nodes in the same area, or 
+			// we need to allow for a larger initial link pool.
+			if ( cLinksThisNode == MAX_NODE_INITIAL_LINKS )
+			{
+				ALERT ( at_aiconsole, "**LinkVisibleNodes:\nNode %d has NodeLinks > MAX_NODE_INITIAL_LINKS", i );
+				fprintf ( file, "** NODE %d HAS NodeLinks > MAX_NODE_INITIAL_LINKS **\n", i );
+				*piBadNode = i;
+				return	FALSE;
+			}
+			else if ( cTotalLinks > MAX_NODE_INITIAL_LINKS * m_cNodes )
+			{// this is paranoia
+				ALERT ( at_aiconsole, "**LinkVisibleNodes:\nTotalLinks > MAX_NODE_INITIAL_LINKS * NUMNODES" );
+				*piBadNode = i;
+				return	FALSE;
+			}
+
+			if ( cLinksThisNode == 0 )
+			{
+				fprintf ( file, "**NO INITIAL LINKS**\n" );
+			}
+
+			// record the connection info in the link pool
+			WorldGraph.m_pNodes [ i ].m_cNumLinks = cLinksThisNode;
+			
+			// keep track of the most initial links ANY node had, so we can figure out
+			// if we have a large enough default link pool
+			if ( cLinksThisNode > cMaxInitialLinks )
+			{
+				cMaxInitialLinks = cLinksThisNode;
+			}
+		}
+		
+
+		if ( file )
+		{
+			fprintf ( file, "----------------------------------------------------------------------------\n" );
+		}
+	}
+
+	fprintf ( file, "\n%4d Total Initial Connections - %4d Maximum connections for a single node.\n", cTotalLinks, cMaxInitialLinks );
+	fprintf ( file, "----------------------------------------------------------------------------\n\n\n" );
+
+	return cTotalLinks;
+}
+
+//=========================================================
+// CGraph - RejectInlineLinks - expects a pointer to a link
+// pool, and a pointer to and already-open file ( if you
+// want status reports written to disk ). RETURNS the number
+// of connections that were rejected
+//=========================================================
+int	CGraph :: RejectInlineLinks ( CLink *pLinkPool, FILE *file )
+{
+	int		i,j,k;
+
+	int		cRejectedLinks;
+
+	BOOL	fRestartLoop;// have to restart the J loop if we eliminate a link.
+
+	CNode	*pSrcNode;
+	CNode	*pCheckNode;// the node we are testing for (one of pSrcNode's connections)
+	CNode	*pTestNode;// the node we are checking against ( also one of pSrcNode's connections)
+
+	float	flDistToTestNode, flDistToCheckNode;
+
+	Vector2D	vec2DirToTestNode, vec2DirToCheckNode;
+
+	if ( file )
+	{
+		fprintf ( file, "----------------------------------------------------------------------------\n" );
+		fprintf ( file, "InLine Rejection:\n" );
+		fprintf ( file, "----------------------------------------------------------------------------\n" );
+	}
+
+	cRejectedLinks = 0;
+
+	for ( i = 0 ; i < m_cNodes ; i++ )
+	{
+		pSrcNode = &m_pNodes[ i ];
+
+		if ( file )
+		{
+			fprintf ( file, "Node %3d:\n", i );
+		}
+
+		for ( j = 0 ; j < pSrcNode->m_cNumLinks ; j++ )
+		{
+			pCheckNode = &m_pNodes[ pLinkPool[ pSrcNode->m_iFirstLink + j ].m_iDestNode ];
+
+			vec2DirToCheckNode = ( pCheckNode->m_vecOrigin - pSrcNode->m_vecOrigin ).Make2D(); 
+			flDistToCheckNode = vec2DirToCheckNode.Length();
+			vec2DirToCheckNode = vec2DirToCheckNode.Normalize();
+
+			pLinkPool[ pSrcNode->m_iFirstLink + j ].m_flWeight = flDistToCheckNode;
+
+			fRestartLoop = FALSE;
+			for ( k = 0 ; k < pSrcNode->m_cNumLinks && !fRestartLoop ; k++ )
+			{
+				if ( k == j )
+				{// don't check against same node
+					continue;
+				}
+
+				pTestNode = &m_pNodes [ pLinkPool[ pSrcNode->m_iFirstLink + k ].m_iDestNode ];
+
+				vec2DirToTestNode = ( pTestNode->m_vecOrigin - pSrcNode->m_vecOrigin ).Make2D(); 
+
+				flDistToTestNode = vec2DirToTestNode.Length();
+				vec2DirToTestNode = vec2DirToTestNode.Normalize();
+
+				if ( DotProduct ( vec2DirToCheckNode, vec2DirToTestNode ) >= 0.998 )
+				{
+					// there's a chance that TestNode intersects the line to CheckNode. If so, we should disconnect the link to CheckNode. 
+					if ( flDistToTestNode < flDistToCheckNode )
+					{
+						if ( file )
+						{
+							fprintf ( file, "REJECTED NODE %3d through Node %3d, Dot = %8f\n", pLinkPool[ pSrcNode->m_iFirstLink + j ].m_iDestNode, pLinkPool[ pSrcNode->m_iFirstLink + k ].m_iDestNode, DotProduct ( vec2DirToCheckNode, vec2DirToTestNode ) );
+						}
+
+						pLinkPool[ pSrcNode->m_iFirstLink + j ] = pLinkPool[ pSrcNode->m_iFirstLink + ( pSrcNode->m_cNumLinks - 1 ) ];
+						pSrcNode->m_cNumLinks--;
+						j--;
+
+						cRejectedLinks++;// keeping track of how many links are cut, so that we can return that value.
+
+						fRestartLoop = TRUE;
+					}
+				}
+			}
+		}
+
+		if ( file )
+		{
+			fprintf ( file, "----------------------------------------------------------------------------\n\n" );
+		}
+	}
+
+	return cRejectedLinks;
+}
+
+//=========================================================
+// TestHull is a modelless clip hull that verifies reachable
+// nodes by walking from every node to each of it's connections
+//=========================================================
+class CTestHull : public CBaseMonster
+{
+
+public:
+	void Spawn( entvars_t *pevMasterNode );
+	virtual int	ObjectCaps( void ) { return CBaseMonster :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+	void EXPORT CallBuildNodeGraph ( void );
+	void BuildNodeGraph ( void );
+	void EXPORT ShowBadNode ( void );
+	void EXPORT DropDelay ( void );
+	void EXPORT PathFind ( void );
+
+	Vector	vecBadNodeOrigin;
+};
+
+LINK_ENTITY_TO_CLASS( testhull, CTestHull );
+
+//=========================================================
+// CTestHull::Spawn
+//=========================================================
+void CTestHull :: Spawn( entvars_t *pevMasterNode )
+{
+	SET_MODEL(ENT(pev), "models/player.mdl");
+	UTIL_SetSize(pev, VEC_HUMAN_HULL_MIN, VEC_HUMAN_HULL_MAX);
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_STEP;
+	pev->effects		= 0;
+	pev->health			= 50;
+	pev->yaw_speed		= 8;
+
+	if ( WorldGraph.m_fGraphPresent )
+	{// graph loaded from disk, so we don't need the test hull
+		SetThink ( &CTestHull::SUB_Remove );
+		pev->nextthink = gpGlobals->time;
+	}
+	else
+	{
+		SetThink ( &CTestHull::DropDelay );
+		pev->nextthink = gpGlobals->time + 1;
+	}
+
+	// Make this invisible
+	// UNDONE: Shouldn't we just use EF_NODRAW?  This doesn't need to go to the client.
+	pev->rendermode = kRenderTransTexture;
+	pev->renderamt = 0;
+}
+
+//=========================================================
+// TestHull::DropDelay - spawns TestHull on top of 
+// the 0th node and drops it to the ground.
+//=========================================================
+void CTestHull::DropDelay ( void )
+{
+	UTIL_CenterPrintAll( "Node Graph out of Date. Rebuilding..." );
+
+	UTIL_SetOrigin ( VARS(pev), WorldGraph.m_pNodes[ 0 ].m_vecOrigin );
+
+	SetThink ( &CTestHull::CallBuildNodeGraph );
+
+	pev->nextthink = gpGlobals->time + 1;
+}
+
+//=========================================================
+// nodes start out as ents in the world. As they are spawned,
+// the node info is recorded then the ents are discarded.
+//=========================================================
+void CNodeEnt :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "hinttype"))
+	{
+		m_sHintType = (short)atoi( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+
+	if (FStrEq(pkvd->szKeyName, "activity"))
+	{
+		m_sHintActivity = (short)atoi( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseEntity::KeyValue( pkvd );
+}
+
+//=========================================================
+//=========================================================
+void CNodeEnt :: Spawn( void )
+{
+	pev->movetype = MOVETYPE_NONE;
+	pev->solid = SOLID_NOT;// always solid_not 
+
+	if ( WorldGraph.m_fGraphPresent )
+	{// graph loaded from disk, so discard all these node ents as soon as they spawn
+		REMOVE_ENTITY( edict() );
+		return;
+	}
+
+	if ( WorldGraph.m_cNodes == 0 )
+	{// this is the first node to spawn, spawn the test hull entity that builds and walks the node tree
+		CTestHull *pHull = GetClassPtr((CTestHull *)NULL);
+		pHull->Spawn( pev );
+	}
+
+	if ( WorldGraph.m_cNodes >= MAX_NODES )
+	{
+		ALERT ( at_aiconsole, "cNodes > MAX_NODES\n" );
+		return;
+	}
+
+	WorldGraph.m_pNodes[ WorldGraph.m_cNodes ].m_vecOriginPeek =
+		WorldGraph.m_pNodes[ WorldGraph.m_cNodes ].m_vecOrigin = pev->origin;
+	WorldGraph.m_pNodes[ WorldGraph.m_cNodes ].m_flHintYaw = pev->angles.y;
+	WorldGraph.m_pNodes[ WorldGraph.m_cNodes ].m_sHintType = m_sHintType;
+	WorldGraph.m_pNodes[ WorldGraph.m_cNodes ].m_sHintActivity = m_sHintActivity;
+
+	if (FClassnameIs( pev, "info_node_air" ))
+		WorldGraph.m_pNodes[ WorldGraph.m_cNodes ].m_afNodeInfo = bits_NODE_AIR;
+	else
+		WorldGraph.m_pNodes[ WorldGraph.m_cNodes ].m_afNodeInfo = 0;
+
+	WorldGraph.m_cNodes++;
+
+	REMOVE_ENTITY( edict() );
+}
+
+//=========================================================
+// CTestHull - ShowBadNode - makes a bad node fizzle. When
+// there's a problem with node graph generation, the test 
+// hull will be placed up the bad node's location and will generate
+// particles
+//=========================================================
+void CTestHull :: ShowBadNode( void )
+{
+	pev->movetype = MOVETYPE_FLY;
+	pev->angles.y = pev->angles.y + 4;
+
+	UTIL_MakeVectors ( pev->angles );
+
+	UTIL_ParticleEffect ( pev->origin, g_vecZero, 255, 25 );
+	UTIL_ParticleEffect ( pev->origin + gpGlobals->v_forward * 64, g_vecZero, 255, 25 );
+	UTIL_ParticleEffect ( pev->origin - gpGlobals->v_forward * 64, g_vecZero, 255, 25 );
+	UTIL_ParticleEffect ( pev->origin + gpGlobals->v_right * 64, g_vecZero, 255, 25 );
+	UTIL_ParticleEffect ( pev->origin - gpGlobals->v_right * 64, g_vecZero, 255, 25 );
+
+	pev->nextthink = gpGlobals->time + 0.1;
+}
+
+extern BOOL gTouchDisabled;
+void CTestHull::CallBuildNodeGraph( void )
+{
+	// TOUCH HACK -- Don't allow this entity to call anyone's "touch" function
+	gTouchDisabled = TRUE;
+	BuildNodeGraph();
+	gTouchDisabled = FALSE;
+	// Undo TOUCH HACK
+}
+
+//=========================================================
+// BuildNodeGraph - think function called by the empty walk
+// hull that is spawned by the first node to spawn. This
+// function links all nodes that can see each other, then
+// eliminates all inline links, then uses a monster-sized 
+// hull that walks between each node and each of its links
+// to ensure that a monster can actually fit through the space
+//=========================================================
+void CTestHull :: BuildNodeGraph( void )
+{
+	TraceResult	tr;
+	FILE	*file;
+
+	char	szNrpFilename [MAX_PATH];// text node report filename
+
+	CLink	*pTempPool; // temporary link pool 
+
+	CNode	*pSrcNode;// node we're currently working with
+	CNode	*pDestNode;// the other node in comparison operations
+
+	BOOL	fSkipRemainingHulls;//if smallest hull can't fit, don't check any others
+	BOOL	fPairsValid;// are all links in the graph evenly paired?
+
+	int		i, j, hull;
+
+	int		iBadNode;// this is the node that caused graph generation to fail
+
+	int		cMaxInitialLinks = 0;
+	int		cMaxValidLinks	= 0;
+
+	int		iPoolIndex = 0;
+	int		cPoolLinks;// number of links in the pool.
+
+	Vector	vecDirToCheckNode;
+	Vector	vecDirToTestNode;
+	Vector	vecStepCheckDir;
+	Vector	vecTraceSpot;
+	Vector  vecSpot;
+
+	Vector2D	vec2DirToCheckNode;
+	Vector2D	vec2DirToTestNode;
+	Vector2D	vec2StepCheckDir;
+	Vector2D	vec2TraceSpot;
+	Vector2D	vec2Spot;
+
+	float	flYaw;// use this stuff to walk the hull between nodes
+	float	flDist;
+	int		step;
+
+	SetThink ( &CTestHull::SUB_Remove );// no matter what happens, the hull gets rid of itself.
+	pev->nextthink = gpGlobals->time;
+
+// 	malloc a swollen temporary connection pool that we trim down after we know exactly how many connections there are.
+	pTempPool = (CLink *)calloc ( sizeof ( CLink ) , ( WorldGraph.m_cNodes * MAX_NODE_INITIAL_LINKS ) );
+	if ( !pTempPool )
+	{
+		ALERT ( at_aiconsole, "**Could not malloc TempPool!\n" );
+		return;
+	}
+
+
+	// make sure directories have been made
+	GET_GAME_DIR( szNrpFilename );
+	strcat( szNrpFilename, "/maps" );
+	CreateDirectory( szNrpFilename, NULL );
+	strcat( szNrpFilename, "/graphs" );
+	CreateDirectory( szNrpFilename, NULL );
+
+	strcat( szNrpFilename, "/" );
+	strcat( szNrpFilename, STRING( gpGlobals->mapname ) );
+	strcat( szNrpFilename, ".nrp" );
+
+	file = fopen ( szNrpFilename, "w+" );
+
+	if ( !file )
+	{// file error
+		ALERT ( at_aiconsole, "Couldn't create %s!\n", szNrpFilename );
+
+		if ( pTempPool )
+		{
+			free ( pTempPool );
+		}
+
+		return;
+	}
+
+	fprintf( file, "Node Graph Report for map:  %s.bsp\n", STRING(gpGlobals->mapname) );
+	fprintf ( file, "%d Total Nodes\n\n", WorldGraph.m_cNodes );
+
+	for ( i = 0 ; i < WorldGraph.m_cNodes ; i++ )
+	{// print all node numbers and their locations to the file.
+		WorldGraph.m_pNodes[ i ].m_cNumLinks = 0;
+		WorldGraph.m_pNodes[ i ].m_iFirstLink = 0;
+		memset(WorldGraph.m_pNodes[ i ].m_pNextBestNode, 0, sizeof(WorldGraph.m_pNodes[ i ].m_pNextBestNode));
+
+		fprintf ( file, "Node#         %4d\n", i );
+		fprintf ( file, "Location      %4d,%4d,%4d\n",(int)WorldGraph.m_pNodes[ i ].m_vecOrigin.x, (int)WorldGraph.m_pNodes[ i ].m_vecOrigin.y, (int)WorldGraph.m_pNodes[ i ].m_vecOrigin.z );
+		fprintf ( file, "HintType:     %4d\n", WorldGraph.m_pNodes[ i ].m_sHintType );
+		fprintf ( file, "HintActivity: %4d\n", WorldGraph.m_pNodes[ i ].m_sHintActivity );
+		fprintf ( file, "HintYaw:      %4f\n", WorldGraph.m_pNodes[ i ].m_flHintYaw );
+		fprintf ( file, "-------------------------------------------------------------------------------\n" );
+	}
+	fprintf ( file, "\n\n" );
+
+
+	// Automatically recognize WATER nodes and drop the LAND nodes to the floor.
+	//
+	for ( i = 0; i < WorldGraph.m_cNodes; i++)
+	{
+		if (WorldGraph.m_pNodes[ i ].m_afNodeInfo & bits_NODE_AIR)
+		{
+			// do nothing
+		}
+		else if (UTIL_PointContents(WorldGraph.m_pNodes[ i ].m_vecOrigin) == CONTENTS_WATER)
+		{
+			WorldGraph.m_pNodes[ i ].m_afNodeInfo |= bits_NODE_WATER;
+		}
+		else
+		{
+			WorldGraph.m_pNodes[ i ].m_afNodeInfo |= bits_NODE_LAND;
+
+			// trace to the ground, then pop up 8 units and place node there to make it
+			// easier for them to connect (think stairs, chairs, and bumps in the floor).
+			// After the routing is done, push them back down.
+			//
+			TraceResult	tr;
+
+			UTIL_TraceLine ( WorldGraph.m_pNodes[i].m_vecOrigin,
+							 WorldGraph.m_pNodes[i].m_vecOrigin - Vector ( 0, 0, 384 ),
+							 ignore_monsters,
+							 g_pBodyQueueHead,//!!!HACKHACK no real ent to supply here, using a global we don't care about
+							 &tr );
+
+			// This trace is ONLY used if we hit an entity flagged with FL_WORLDBRUSH
+			TraceResult	trEnt;
+			UTIL_TraceLine ( WorldGraph.m_pNodes[i].m_vecOrigin,
+				 WorldGraph.m_pNodes[i].m_vecOrigin - Vector ( 0, 0, 384 ),
+				 dont_ignore_monsters,
+				 g_pBodyQueueHead,//!!!HACKHACK no real ent to supply here, using a global we don't care about
+				 &trEnt );
+
+			
+			// Did we hit something closer than the floor?
+			if ( trEnt.flFraction < tr.flFraction )
+			{
+				// If it was a world brush entity, copy the node location
+				if ( trEnt.pHit && (trEnt.pHit->v.flags & FL_WORLDBRUSH) )
+					tr.vecEndPos = trEnt.vecEndPos;
+			}
+
+			WorldGraph.m_pNodes[i].m_vecOriginPeek.z = 
+				WorldGraph.m_pNodes[i].m_vecOrigin.z = tr.vecEndPos.z + NODE_HEIGHT;
+		}
+	}
+
+	cPoolLinks = WorldGraph.LinkVisibleNodes( pTempPool, file, &iBadNode );
+	
+	if ( !cPoolLinks )
+	{
+		ALERT ( at_aiconsole, "**ConnectVisibleNodes FAILED!\n" );
+		
+		SetThink ( &CTestHull::ShowBadNode );// send the hull off to show the offending node.
+		//pev->solid = SOLID_NOT;
+		pev->origin = WorldGraph.m_pNodes[ iBadNode ].m_vecOrigin;
+		
+		if ( pTempPool )
+		{
+			free ( pTempPool );
+		}
+
+		if ( file )
+		{// close the file
+			fclose ( file );
+		}
+
+		return;
+	}
+
+// send the walkhull to all of this node's connections now. We'll do this here since
+// so much of it relies on being able to control the test hull.
+	fprintf ( file, "----------------------------------------------------------------------------\n" );
+	fprintf ( file, "Walk Rejection:\n");	
+
+	for ( i = 0 ; i < WorldGraph.m_cNodes ; i++ )
+	{
+		pSrcNode = &WorldGraph.m_pNodes[ i ];
+
+		fprintf ( file, "-------------------------------------------------------------------------------\n");
+		fprintf ( file, "Node %4d:\n\n", i );
+		
+		for ( j = 0 ; j < pSrcNode->m_cNumLinks ; j++ )
+		{
+			// assume that all hulls can walk this link, then eliminate the ones that can't.
+			pTempPool [ pSrcNode->m_iFirstLink + j ].m_afLinkInfo = bits_LINK_SMALL_HULL | bits_LINK_HUMAN_HULL | bits_LINK_LARGE_HULL | bits_LINK_FLY_HULL;
+
+
+			// do a check for each hull size.
+			
+			// if we can't fit a tiny hull through a connection, no other hulls with fit either, so we 
+			// should just fall out of the loop. Do so by setting the SkipRemainingHulls flag.
+			fSkipRemainingHulls = FALSE;
+			for ( hull = 0 ; hull < MAX_NODE_HULLS; hull++ )
+			{
+				if (fSkipRemainingHulls && (hull == NODE_HUMAN_HULL || hull == NODE_LARGE_HULL)) // skip the remaining walk hulls
+					continue;
+
+				switch ( hull )
+				{
+				case NODE_SMALL_HULL:
+					UTIL_SetSize(pev, Vector(-12, -12, 0), Vector(12, 12, 24));
+					break;
+				case NODE_HUMAN_HULL:
+					UTIL_SetSize(pev, VEC_HUMAN_HULL_MIN, VEC_HUMAN_HULL_MAX );
+					break;
+				case NODE_LARGE_HULL:
+					UTIL_SetSize(pev, Vector(-32, -32, 0), Vector(32, 32, 64));
+					break;
+				case NODE_FLY_HULL:
+					UTIL_SetSize(pev, Vector(-32, -32, 0), Vector(32, 32, 64));
+					// UTIL_SetSize(pev, Vector(0, 0, 0), Vector(0, 0, 0));
+					break;
+				}
+
+				UTIL_SetOrigin ( pev, pSrcNode->m_vecOrigin );// place the hull on the node
+
+				if ( !FBitSet ( pev->flags, FL_ONGROUND ) )
+				{
+					ALERT ( at_aiconsole, "OFFGROUND!\n" );
+				}
+
+				// now build a yaw that points to the dest node, and get the distance.
+				if ( j < 0 )
+				{
+					ALERT ( at_aiconsole, "**** j = %d ****\n", j );
+					if ( pTempPool )
+					{
+						free ( pTempPool );
+					}
+
+					if ( file )
+					{// close the file
+						fclose ( file );
+					}
+					return;
+				}
+				
+				pDestNode = &WorldGraph.m_pNodes [ pTempPool[ pSrcNode->m_iFirstLink + j ].m_iDestNode ];
+
+				vecSpot = pDestNode->m_vecOrigin;
+				//vecSpot.z = pev->origin.z;
+
+				if (hull < NODE_FLY_HULL)
+				{
+					int SaveFlags = pev->flags;
+					int MoveMode = WALKMOVE_WORLDONLY;
+					if (pSrcNode->m_afNodeInfo & bits_NODE_WATER)
+					{
+						pev->flags |= FL_SWIM;
+						MoveMode = WALKMOVE_NORMAL;
+					}
+
+					flYaw = UTIL_VecToYaw ( pDestNode->m_vecOrigin - pev->origin );
+
+					flDist = ( vecSpot - pev->origin ).Length2D();
+
+					int fWalkFailed = FALSE;
+
+					// in this loop we take tiny steps from the current node to the nodes that it links to, one at a time.
+					// pev->angles.y = flYaw;
+					for ( step = 0 ; step < flDist && !fWalkFailed ; step += HULL_STEP_SIZE )
+					{
+						float stepSize = HULL_STEP_SIZE;
+
+						if ( (step + stepSize) >= (flDist-1) )
+							stepSize = (flDist - step) - 1;
+
+						if ( !WALK_MOVE( ENT(pev), flYaw, stepSize, MoveMode ) )
+						{// can't take the next step
+
+							fWalkFailed = TRUE;
+							break;
+						}
+					}
+
+					if (!fWalkFailed && (pev->origin - vecSpot).Length() > 64)
+					{
+						// ALERT( at_console, "bogus walk\n");
+						// we thought we 
+						fWalkFailed = TRUE;
+					}
+
+					if (fWalkFailed)
+					{
+
+						//pTempPool[ pSrcNode->m_iFirstLink + j ] = pTempPool [ pSrcNode->m_iFirstLink + ( pSrcNode->m_cNumLinks - 1 ) ];
+
+						// now me must eliminate the hull that couldn't walk this connection
+						switch ( hull )
+						{
+						case NODE_SMALL_HULL:	// if this hull can't fit, nothing can, so drop the connection
+							fprintf ( file, "NODE_SMALL_HULL step %f\n", step );
+							pTempPool[ pSrcNode->m_iFirstLink + j ].m_afLinkInfo &= ~(bits_LINK_SMALL_HULL | bits_LINK_HUMAN_HULL | bits_LINK_LARGE_HULL);
+							fSkipRemainingHulls = TRUE;// don't bother checking larger hulls
+							break;
+						case NODE_HUMAN_HULL:
+							fprintf ( file, "NODE_HUMAN_HULL step %f\n", step );
+							pTempPool[ pSrcNode->m_iFirstLink + j ].m_afLinkInfo &= ~(bits_LINK_HUMAN_HULL | bits_LINK_LARGE_HULL);
+							fSkipRemainingHulls = TRUE;// don't bother checking larger hulls
+							break;
+						case NODE_LARGE_HULL:
+							fprintf ( file, "NODE_LARGE_HULL step %f\n", step );
+							pTempPool[ pSrcNode->m_iFirstLink + j ].m_afLinkInfo &= ~bits_LINK_LARGE_HULL;
+							break;
+						}
+					}
+					pev->flags = SaveFlags;
+				}
+				else
+				{
+					TraceResult tr;
+
+					UTIL_TraceHull( pSrcNode->m_vecOrigin + Vector( 0, 0, 32 ), pDestNode->m_vecOriginPeek + Vector( 0, 0, 32 ), ignore_monsters, large_hull, ENT( pev ), &tr );
+					if (tr.fStartSolid || tr.flFraction < 1.0)
+					{
+						pTempPool[ pSrcNode->m_iFirstLink + j ].m_afLinkInfo &= ~bits_LINK_FLY_HULL;
+					}
+				}
+			}
+
+			if (pTempPool[ pSrcNode->m_iFirstLink + j ].m_afLinkInfo == 0)
+			{
+				fprintf ( file, "Rejected Node %3d - Unreachable by ", pTempPool [ pSrcNode->m_iFirstLink + j ].m_iDestNode );
+				pTempPool[ pSrcNode->m_iFirstLink + j ] = pTempPool [ pSrcNode->m_iFirstLink + ( pSrcNode->m_cNumLinks - 1 ) ];
+				fprintf ( file, "Any Hull\n" );
+				
+				pSrcNode->m_cNumLinks--;
+				cPoolLinks--;// we just removed a link, so decrement the total number of links in the pool.
+				j--;
+			}
+
+		}
+	}
+	fprintf ( file, "-------------------------------------------------------------------------------\n\n\n");
+
+	cPoolLinks -= WorldGraph.RejectInlineLinks ( pTempPool, file );
+
+// now malloc a pool just large enough to hold the links that are actually used
+	WorldGraph.m_pLinkPool = (CLink *) calloc ( sizeof ( CLink ), cPoolLinks );
+
+	if ( !WorldGraph.m_pLinkPool )
+	{// couldn't make the link pool!
+		ALERT ( at_aiconsole, "Couldn't malloc LinkPool!\n" );
+		if ( pTempPool )
+		{
+			free ( pTempPool );
+		}
+		if ( file )
+		{// close the file
+			fclose ( file );
+		}
+
+		return;
+	}
+	WorldGraph.m_cLinks = cPoolLinks;
+
+//copy only the used portions of the TempPool into the graph's link pool
+	int iFinalPoolIndex = 0;
+	int iOldFirstLink;
+
+	for ( i = 0 ; i < WorldGraph.m_cNodes ; i++ )
+	{
+		iOldFirstLink = WorldGraph.m_pNodes[ i ].m_iFirstLink;// store this, because we have to re-assign it before entering the copy loop
+
+		WorldGraph.m_pNodes[ i ].m_iFirstLink = iFinalPoolIndex;
+
+		for ( j = 0 ; j < WorldGraph.m_pNodes[ i ].m_cNumLinks ; j++ )
+		{
+			WorldGraph.m_pLinkPool[ iFinalPoolIndex++ ] = pTempPool[ iOldFirstLink + j ];
+		}
+	}
+
+	
+	// Node sorting numbers linked nodes close to each other
+	//
+	WorldGraph.SortNodes();
+
+	// This is used for HashSearch
+	//
+	WorldGraph.BuildLinkLookups();
+
+	fPairsValid = TRUE; // assume that the connection pairs are all valid to start
+
+	fprintf ( file, "\n\n-------------------------------------------------------------------------------\n");
+	fprintf ( file, "Link Pairings:\n");
+
+// link integrity check. The idea here is that if Node A links to Node B, node B should
+// link to node A. If not, we have a situation that prevents us from using a basic 
+// optimization in the FindNearestLink function. 
+	for ( i = 0 ; i < WorldGraph.m_cNodes ; i++ )
+	{
+		for ( j = 0 ; j < WorldGraph.m_pNodes[ i ].m_cNumLinks ; j++ )
+		{
+			int iLink;
+			WorldGraph.HashSearch(WorldGraph.INodeLink(i,j), i, iLink);
+			if (iLink < 0)
+			{
+				fPairsValid = FALSE;// unmatched link pair.
+				fprintf ( file, "WARNING: Node %3d does not connect back to Node %3d\n", WorldGraph.INodeLink(i, j), i);
+			}
+		}
+	}
+
+	// !!!LATER - if all connections are properly paired, when can enable an optimization in the pathfinding code
+	// (in the find nearest line function)
+	if ( fPairsValid )
+	{
+		fprintf ( file, "\nAll Connections are Paired!\n");
+	}
+
+	fprintf ( file, "-------------------------------------------------------------------------------\n");
+	fprintf ( file, "\n\n-------------------------------------------------------------------------------\n");
+	fprintf ( file, "Total Number of Connections in Pool: %d\n", cPoolLinks );
+	fprintf ( file, "-------------------------------------------------------------------------------\n");
+	fprintf ( file, "Connection Pool: %d bytes\n", sizeof ( CLink ) * cPoolLinks );
+	fprintf ( file, "-------------------------------------------------------------------------------\n");
+
+
+	ALERT ( at_aiconsole, "%d Nodes, %d Connections\n", WorldGraph.m_cNodes, cPoolLinks );
+	
+	// This is used for FindNearestNode
+	//
+	WorldGraph.BuildRegionTables();
+
+
+	// Push all of the LAND nodes down to the ground now. Leave the water and air nodes alone.
+	//
+	for ( i = 0 ; i < WorldGraph.m_cNodes ; i++ )
+	{
+		if ((WorldGraph.m_pNodes[ i ].m_afNodeInfo & bits_NODE_LAND))
+		{
+			WorldGraph.m_pNodes[ i ].m_vecOrigin.z -= NODE_HEIGHT;
+		}
+	}
+
+
+	if ( pTempPool )
+	{// free the temp pool
+		free ( pTempPool );
+	}
+
+	if ( file )
+	{
+		fclose ( file );
+	}
+
+	// We now have some graphing capabilities.
+	//
+	WorldGraph.m_fGraphPresent = TRUE;//graph is in memory.
+	WorldGraph.m_fGraphPointersSet = TRUE;// since the graph was generated, the pointers are ready
+	WorldGraph.m_fRoutingComplete = FALSE; // Optimal routes aren't computed, yet.
+
+	// Compute and compress the routing information.
+	//
+	WorldGraph.ComputeStaticRoutingTables();
+
+// save the node graph for this level	
+	WorldGraph.FSaveGraph( (char *)STRING( gpGlobals->mapname ) );
+	ALERT( at_console, "Done.\n");
+}
+
+
+//=========================================================
+// returns a hardcoded path.
+//=========================================================
+void CTestHull :: PathFind ( void )
+{
+	int	iPath[ 50 ];
+	int	iPathSize;
+	int	i;
+	CNode	*pNode, *pNextNode;
+
+	if ( !WorldGraph.m_fGraphPresent || !WorldGraph.m_fGraphPointersSet )
+	{// protect us in the case that the node graph isn't available
+		ALERT ( at_aiconsole, "Graph not ready!\n" );
+		return;
+	}
+
+	iPathSize = WorldGraph.FindShortestPath ( iPath, 0, 19, 0, 0 ); // UNDONE use hull constant
+
+	if ( !iPathSize )
+	{
+		ALERT ( at_aiconsole, "No Path!\n" );
+		return;
+	}
+	
+	ALERT ( at_aiconsole, "%d\n", iPathSize );
+
+	pNode = &WorldGraph.m_pNodes[ iPath [ 0 ] ];
+
+	for ( i = 0 ; i < iPathSize - 1 ; i++ )
+	{
+
+		pNextNode = &WorldGraph.m_pNodes[ iPath [ i + 1 ] ];
+
+		MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+			WRITE_BYTE( TE_SHOWLINE);
+			
+			WRITE_COORD( pNode->m_vecOrigin.x );
+			WRITE_COORD( pNode->m_vecOrigin.y );
+			WRITE_COORD( pNode->m_vecOrigin.z + NODE_HEIGHT );
+
+			WRITE_COORD( pNextNode->m_vecOrigin.x);
+			WRITE_COORD( pNextNode->m_vecOrigin.y);
+			WRITE_COORD( pNextNode->m_vecOrigin.z + NODE_HEIGHT);
+		MESSAGE_END();
+
+		pNode = pNextNode;
+	}
+
+}
+
+
+//=========================================================
+// CStack Constructor
+//=========================================================
+CStack :: CStack( void )
+{
+	m_level = 0;
+}
+
+//=========================================================
+// pushes a value onto the stack
+//=========================================================
+void CStack :: Push( int value )
+{
+	if ( m_level >= MAX_STACK_NODES )
+	{
+		printf("Error!\n");
+		return;
+	}
+	m_stack[m_level] = value;
+	m_level++;
+}
+
+//=========================================================
+// pops a value off of the stack
+//=========================================================
+int CStack :: Pop( void )
+{
+	if ( m_level <= 0 )
+		return -1;
+
+	m_level--;
+	return m_stack[ m_level ];
+}
+
+//=========================================================
+// returns the value on the top of the stack
+//=========================================================
+int CStack :: Top ( void )
+{
+	return m_stack[ m_level - 1 ];
+}
+
+//=========================================================
+// copies every element on the stack into an array LIFO 
+//=========================================================
+void CStack :: CopyToArray ( int *piArray )
+{
+	int	i;
+
+	for ( i = 0 ; i < m_level ; i++ )
+	{
+		piArray[ i ] = m_stack[ i ];
+	}
+}
+
+//=========================================================
+// CQueue constructor
+//=========================================================
+CQueue :: CQueue( void )
+{
+	m_cSize = 0;
+	m_head = 0;
+	m_tail = -1;
+}
+
+//=========================================================
+// inserts a value into the queue
+//=========================================================
+void CQueue :: Insert ( int iValue, float fPriority )
+{
+
+	if ( Full() )
+	{
+		printf ( "Queue is full!\n" );
+		return;
+	}
+
+	m_tail++;
+
+	if ( m_tail == MAX_STACK_NODES )
+	{//wrap around
+		m_tail = 0;
+	}
+
+	m_queue[ m_tail ].Id = iValue;
+	m_queue[ m_tail ].Priority = fPriority;
+	m_cSize++;
+}
+
+//=========================================================
+// removes a value from the queue (FIFO)
+//=========================================================
+int CQueue :: Remove ( float &fPriority )
+{
+	if ( m_head == MAX_STACK_NODES )
+	{// wrap
+		m_head = 0;
+	}
+
+	m_cSize--;
+	fPriority = m_queue[ m_head ].Priority;
+	return m_queue[ m_head++ ].Id;
+}
+
+//=========================================================
+// CQueue constructor
+//=========================================================
+CQueuePriority :: CQueuePriority( void )
+{
+	m_cSize = 0;
+}
+
+//=========================================================
+// inserts a value into the priority queue
+//=========================================================
+void CQueuePriority :: Insert( int iValue, float fPriority )
+{
+
+	if ( Full() )
+	{
+		printf ( "Queue is full!\n" );
+		return;
+	}
+
+    m_heap[ m_cSize ].Priority = fPriority;
+	m_heap[ m_cSize ].Id = iValue;
+    m_cSize++;
+    Heap_SiftUp();
+}
+
+//=========================================================
+// removes the smallest item from the priority queue
+//
+//=========================================================
+int CQueuePriority :: Remove( float &fPriority )
+{
+	int iReturn = m_heap[ 0 ].Id;
+	fPriority = m_heap[ 0 ].Priority;
+
+	m_cSize--;
+
+	m_heap[ 0 ] = m_heap[ m_cSize ];
+
+    Heap_SiftDown(0);
+    return iReturn;
+}
+
+#define HEAP_LEFT_CHILD(x) (2*(x)+1)
+#define HEAP_RIGHT_CHILD(x) (2*(x)+2)
+#define HEAP_PARENT(x) (((x)-1)/2)
+
+void CQueuePriority::Heap_SiftDown(int iSubRoot)
+{
+	int parent = iSubRoot;
+	int child = HEAP_LEFT_CHILD(parent);
+
+	struct tag_HEAP_NODE Ref = m_heap[ parent ];
+
+    while (child < m_cSize)
+	{
+		int rightchild = HEAP_RIGHT_CHILD(parent);
+		if (rightchild < m_cSize)
+		{
+			if ( m_heap[ rightchild ].Priority < m_heap[ child ].Priority )
+			{
+				child = rightchild;
+			}
+		}
+		if ( Ref.Priority <= m_heap[ child ].Priority )
+			break;
+
+		m_heap[ parent ] = m_heap[ child ];
+		parent = child;
+		child = HEAP_LEFT_CHILD(parent);
+	}
+	m_heap[ parent ] = Ref;
+}
+
+void CQueuePriority::Heap_SiftUp(void)
+{
+	int child = m_cSize-1;
+	while (child)
+	{
+		int parent = HEAP_PARENT(child);
+		if ( m_heap[ parent ].Priority <= m_heap[ child ].Priority )
+			break;
+
+		struct tag_HEAP_NODE Tmp;
+		Tmp = m_heap[ child ];
+		m_heap[ child ] = m_heap[ parent ];
+		m_heap[ parent ] = Tmp;
+
+		child = parent;
+	}
+}
+
+//=========================================================
+// CGraph - FLoadGraph - attempts to load a node graph from disk.
+// if the current level is maps/snar.bsp, maps/graphs/snar.nod
+// will be loaded. If file cannot be loaded, the node tree
+// will be created and saved to disk.
+//=========================================================
+int CGraph :: FLoadGraph ( char *szMapName )
+{
+	char	szFilename[MAX_PATH];
+	int		iVersion;
+	int     length;
+	byte    *aMemFile;
+	byte    *pMemFile;
+
+	// make sure the directories have been made
+	char	szDirName[MAX_PATH];
+	GET_GAME_DIR( szDirName );
+	strcat( szDirName, "/maps" );
+	CreateDirectory( szDirName, NULL );
+	strcat( szDirName, "/graphs" );
+	CreateDirectory( szDirName, NULL );
+
+	strcpy ( szFilename, "maps/graphs/" );
+	strcat ( szFilename, szMapName );
+	strcat( szFilename, ".nod" );
+
+	pMemFile = aMemFile = LOAD_FILE_FOR_ME(szFilename, &length);
+
+	if ( !aMemFile )
+	{
+		return FALSE;
+	}
+	else
+	{
+		// Read the graph version number
+		//
+		length -= sizeof(int);
+		if (length < 0) goto ShortFile;
+		memcpy(&iVersion, pMemFile, sizeof(int));
+		pMemFile += sizeof(int);
+
+		if ( iVersion != GRAPH_VERSION )
+		{
+			// This file was written by a different build of the dll!
+			//
+			ALERT ( at_aiconsole, "**ERROR** Graph version is %d, expected %d\n",iVersion, GRAPH_VERSION );
+			goto ShortFile;
+		}
+
+		// Read the graph class
+		//
+		length -= sizeof(CGraph);
+		if (length < 0) goto ShortFile;
+		memcpy(this, pMemFile, sizeof(CGraph));
+		pMemFile += sizeof(CGraph);
+
+		// Set the pointers to zero, just in case we run out of memory.
+		//
+		m_pNodes     = NULL;
+		m_pLinkPool  = NULL;
+		m_di         = NULL;
+		m_pRouteInfo = NULL;
+		m_pHashLinks = NULL;
+
+
+		// Malloc for the nodes
+		//
+		m_pNodes = ( CNode * )calloc ( sizeof ( CNode ), m_cNodes );
+
+		if ( !m_pNodes )
+		{
+			ALERT ( at_aiconsole, "**ERROR**\nCouldn't malloc %d nodes!\n", m_cNodes );
+			goto NoMemory;
+		}
+
+		// Read in all the nodes
+		//
+		length -= sizeof(CNode) * m_cNodes;
+		if (length < 0) goto ShortFile;
+		memcpy(m_pNodes, pMemFile, sizeof(CNode)*m_cNodes);
+		pMemFile += sizeof(CNode) * m_cNodes;
+
+		
+		// Malloc for the link pool
+		//
+		m_pLinkPool = ( CLink * )calloc ( sizeof ( CLink ), m_cLinks );
+
+		if ( !m_pLinkPool )
+		{
+			ALERT ( at_aiconsole, "**ERROR**\nCouldn't malloc %d link!\n", m_cLinks );
+			goto NoMemory;
+		}
+
+		// Read in all the links
+		//
+		length -= sizeof(CLink)*m_cLinks;
+		if (length < 0) goto ShortFile;
+		memcpy(m_pLinkPool, pMemFile, sizeof(CLink)*m_cLinks);
+		pMemFile += sizeof(CLink)*m_cLinks;
+
+		// Malloc for the sorting info.
+		//
+		m_di = (DIST_INFO *)calloc( sizeof(DIST_INFO), m_cNodes );
+		if ( !m_di )
+		{
+			ALERT ( at_aiconsole, "***ERROR**\nCouldn't malloc %d entries sorting nodes!\n", m_cNodes );
+			goto NoMemory;
+		}
+
+		// Read it in.
+		//
+		length -= sizeof(DIST_INFO)*m_cNodes;
+		if (length < 0) goto ShortFile;
+		memcpy(m_di, pMemFile, sizeof(DIST_INFO)*m_cNodes);
+		pMemFile += sizeof(DIST_INFO)*m_cNodes;
+
+		// Malloc for the routing info.
+		//
+		m_fRoutingComplete = FALSE;
+		m_pRouteInfo = (char *)calloc( sizeof(char), m_nRouteInfo );
+		if ( !m_pRouteInfo )
+		{
+			ALERT ( at_aiconsole, "***ERROR**\nCounldn't malloc %d route bytes!\n", m_nRouteInfo );
+			goto NoMemory;
+		}
+		m_CheckedCounter = 0;
+		for (int i = 0; i < m_cNodes; i++)
+		{
+			m_di[i].m_CheckedEvent = 0;
+		}
+		
+		// Read in the route information.
+		//
+		length -= sizeof(char)*m_nRouteInfo;
+		if (length < 0) goto ShortFile;
+		memcpy(m_pRouteInfo, pMemFile, sizeof(char)*m_nRouteInfo);
+		pMemFile += sizeof(char)*m_nRouteInfo;
+		m_fRoutingComplete = TRUE;;
+
+		// malloc for the hash links
+		//
+		m_pHashLinks = (short *)calloc(sizeof(short), m_nHashLinks);
+		if (!m_pHashLinks)
+		{
+			ALERT ( at_aiconsole, "***ERROR**\nCounldn't malloc %d hash link bytes!\n", m_nHashLinks );
+			goto NoMemory;
+		}
+
+		// Read in the hash link information
+		//
+		length -= sizeof(short)*m_nHashLinks;
+		if (length < 0) goto ShortFile;
+		memcpy(m_pHashLinks, pMemFile, sizeof(short)*m_nHashLinks);
+		pMemFile += sizeof(short)*m_nHashLinks;
+
+		// Set the graph present flag, clear the pointers set flag
+		//
+		m_fGraphPresent = TRUE;
+		m_fGraphPointersSet = FALSE;
+		
+		FREE_FILE(aMemFile);
+
+		if (length != 0)
+		{
+			ALERT ( at_aiconsole, "***WARNING***:Node graph was longer than expected by %d bytes.!\n", length);
+		}
+
+		return TRUE;
+	}
+
+ShortFile:
+NoMemory:
+	FREE_FILE(aMemFile);
+	return FALSE;
+}
+
+//=========================================================
+// CGraph - FSaveGraph - It's not rocket science.
+// this WILL overwrite existing files.
+//=========================================================
+int CGraph :: FSaveGraph ( char *szMapName )
+{
+	
+	int		iVersion = GRAPH_VERSION;
+	char	szFilename[MAX_PATH];
+	FILE	*file;
+
+	if ( !m_fGraphPresent || !m_fGraphPointersSet )
+	{// protect us in the case that the node graph isn't available or built
+		ALERT ( at_aiconsole, "Graph not ready!\n" );
+		return FALSE;
+	}
+
+	// make sure directories have been made
+	GET_GAME_DIR( szFilename );
+	strcat( szFilename, "/maps" );
+	CreateDirectory( szFilename, NULL );
+	strcat( szFilename, "/graphs" );
+	CreateDirectory( szFilename, NULL );
+
+	strcat( szFilename, "/" );
+	strcat( szFilename, szMapName );
+	strcat( szFilename, ".nod" );
+
+	file = fopen ( szFilename, "wb" );
+
+	ALERT ( at_aiconsole, "Created: %s\n", szFilename );
+
+	if ( !file )
+	{// couldn't create
+		ALERT ( at_aiconsole, "Couldn't Create: %s\n", szFilename );
+		return FALSE;
+	}
+	else
+	{
+	// write the version
+		fwrite ( &iVersion, sizeof ( int ), 1, file );
+
+	// write the CGraph class
+		fwrite ( this, sizeof ( CGraph ), 1, file );
+
+	// write the nodes
+		fwrite ( m_pNodes, sizeof ( CNode ), m_cNodes, file );
+
+	// write the links
+		fwrite ( m_pLinkPool, sizeof ( CLink ), m_cLinks, file );
+
+		fwrite ( m_di, sizeof(DIST_INFO), m_cNodes, file );
+
+		// Write the route info.
+		//
+		if ( m_pRouteInfo && m_nRouteInfo )
+		{
+			fwrite ( m_pRouteInfo, sizeof( char ), m_nRouteInfo, file );
+		}
+
+		if (m_pHashLinks && m_nHashLinks)
+		{
+			fwrite(m_pHashLinks, sizeof(short), m_nHashLinks, file);
+		}
+		fclose ( file );
+		return TRUE;
+	}
+}
+
+//=========================================================
+// CGraph - FSetGraphPointers - Takes the modelnames of 
+// all of the brush ents that block connections in the node
+// graph and resolves them into pointers to those entities.
+// this is done after loading the graph from disk, whereupon
+// the pointers are not valid.
+//=========================================================
+int CGraph :: FSetGraphPointers ( void )
+{
+	int	i;
+	edict_t	*pentLinkEnt;
+
+	for ( i = 0 ; i < m_cLinks ; i++ )
+	{// go through all of the links
+		
+		if ( m_pLinkPool[ i ].m_pLinkEnt != NULL )
+		{
+			char name[5];
+			// when graphs are saved, any valid pointers are will be non-zero, signifying that we should
+			// reset those pointers upon reloading. Any pointers that were NULL when the graph was saved
+			// will be NULL when reloaded, and will ignored by this function.
+
+			// m_szLinkEntModelname is not necessarily NULL terminated (so we can store it in a more alignment-friendly 4 bytes)
+			memcpy( name, m_pLinkPool[ i ].m_szLinkEntModelname, 4 );
+			name[4] = 0;
+			pentLinkEnt =  FIND_ENTITY_BY_STRING( NULL, "model", name );
+
+			if ( FNullEnt ( pentLinkEnt ) )
+			{
+			// the ent isn't around anymore? Either there is a major problem, or it was removed from the world
+			// ( like a func_breakable that's been destroyed or something ). Make sure that LinkEnt is null.
+				ALERT ( at_aiconsole, "**Could not find model %s\n", name );
+				m_pLinkPool[ i ].m_pLinkEnt = NULL;
+			}
+			else
+			{
+				m_pLinkPool[ i ].m_pLinkEnt = VARS( pentLinkEnt );
+
+				if ( !FBitSet( m_pLinkPool[ i ].m_pLinkEnt->flags, FL_GRAPHED ) )
+				{
+					m_pLinkPool[ i ].m_pLinkEnt->flags += FL_GRAPHED;
+				}
+			}
+		}
+	}
+
+	// the pointers are now set.
+	m_fGraphPointersSet = TRUE;
+	return TRUE;
+}
+
+//=========================================================
+// CGraph - CheckNODFile - this function checks the date of 
+// the BSP file that was just loaded and the date of the a
+// ssociated .NOD file. If the NOD file is not present, or 
+// is older than the BSP file, we rebuild it.
+//
+// returns FALSE if the .NOD file doesn't qualify and needs
+// to be rebuilt.
+//
+// !!!BUGBUG - the file times we get back are 20 hours ahead!
+// since this happens consistantly, we can still correctly 
+// determine which of the 2 files is newer. This needs fixed,
+// though. ( I now suspect that we are getting GMT back from
+// these functions and must compensate for local time ) (sjb)
+//=========================================================
+int CGraph :: CheckNODFile ( char *szMapName )
+{
+	int 		retValue;
+
+	char		szBspFilename[MAX_PATH];
+	char		szGraphFilename[MAX_PATH];
+	
+
+	strcpy ( szBspFilename, "maps/" );
+	strcat ( szBspFilename, szMapName );
+	strcat ( szBspFilename, ".bsp" );
+
+	strcpy ( szGraphFilename, "maps/graphs/" );
+	strcat ( szGraphFilename, szMapName );
+	strcat ( szGraphFilename, ".nod" );
+	
+	retValue = TRUE;
+
+	int iCompare;
+	if (COMPARE_FILE_TIME(szBspFilename, szGraphFilename, &iCompare))
+	{
+		if ( iCompare > 0 )
+		{// BSP file is newer.
+			ALERT ( at_aiconsole, ".NOD File will be updated\n\n" );
+			retValue = FALSE;
+		}
+	}
+	else
+	{
+		retValue = FALSE;
+	}
+
+	return retValue;
+}
+
+#define ENTRY_STATE_EMPTY -1
+
+struct tagNodePair
+{
+	short iSrc;
+	short iDest;
+};
+
+void CGraph::HashInsert(int iSrcNode, int iDestNode, int iKey)
+{
+	struct tagNodePair np;
+
+	np.iSrc  = iSrcNode;
+	np.iDest = iDestNode;
+	CRC32_t dwHash;
+	CRC32_INIT(&dwHash);
+	CRC32_PROCESS_BUFFER(&dwHash, &np, sizeof(np));
+	dwHash = CRC32_FINAL(dwHash);
+
+    int di = m_HashPrimes[dwHash&15];
+    int i = (dwHash >> 4) % m_nHashLinks;
+    while (m_pHashLinks[i] != ENTRY_STATE_EMPTY)
+    {
+        i += di;
+        if (i >= m_nHashLinks) i -= m_nHashLinks;
+    }
+	m_pHashLinks[i] = iKey;
+}
+
+void CGraph::HashSearch(int iSrcNode, int iDestNode, int &iKey)
+{
+	struct tagNodePair np;
+
+	np.iSrc  = iSrcNode;
+	np.iDest = iDestNode;
+	CRC32_t dwHash;
+	CRC32_INIT(&dwHash);
+	CRC32_PROCESS_BUFFER(&dwHash, &np, sizeof(np));
+	dwHash = CRC32_FINAL(dwHash);
+
+    int di = m_HashPrimes[dwHash&15];
+    int i = (dwHash >> 4) % m_nHashLinks;
+    while (m_pHashLinks[i] != ENTRY_STATE_EMPTY)
+    {
+		CLink &link = Link(m_pHashLinks[i]);
+        if (iSrcNode == link.m_iSrcNode && iDestNode == link.m_iDestNode)
+        {
+			break;
+        }
+        else
+        {
+            i += di;
+            if (i >= m_nHashLinks) i -= m_nHashLinks;
+        }
+    }
+	iKey = m_pHashLinks[i];
+}
+
+#define NUMBER_OF_PRIMES 177
+
+int Primes[NUMBER_OF_PRIMES] =
+{ 1, 2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67,
+71, 73, 79, 83, 89, 97, 101, 103, 107, 109, 113, 127, 131, 137, 139, 149, 151,
+157, 163, 167, 173, 179, 181, 191, 193, 197, 199, 211, 223, 227, 229, 233, 239,
+241, 251, 257, 263, 269, 271, 277, 281, 283, 293, 307, 311, 313, 317, 331, 337,
+347, 349, 353, 359, 367, 373, 379, 383, 389, 397, 401, 409, 419, 421, 431, 433,
+439, 443, 449, 457, 461, 463, 467, 479, 487, 491, 499, 503, 509, 521, 523, 541,
+547, 557, 563, 569, 571, 577, 587, 593, 599, 601, 607, 613, 617, 619, 631, 641,
+643, 647, 653, 659, 661, 673, 677, 683, 691, 701, 709, 719, 727, 733, 739, 743,
+751, 757, 761, 769, 773, 787, 797, 809, 811, 821, 823, 827, 829, 839, 853, 857,
+859, 863, 877, 881, 883, 887, 907, 911, 919, 929, 937, 941, 947, 953, 967, 971,
+977, 983, 991, 997, 1009, 1013, 1019, 1021, 1031, 1033, 1039, 0 };
+
+void CGraph::HashChoosePrimes(int TableSize)
+{
+    int LargestPrime = TableSize/2;
+    if (LargestPrime > Primes[NUMBER_OF_PRIMES-2])
+    {
+        LargestPrime = Primes[NUMBER_OF_PRIMES-2];
+    }
+    int Spacing = LargestPrime/16;
+
+    // Pick a set primes that are evenly spaced from (0 to LargestPrime)
+    // We divide this interval into 16 equal sized zones. We want to find
+    // one prime number that best represents that zone.
+    //
+    for (int iZone = 1, iPrime = 0; iPrime < 16; iZone += Spacing)
+    {
+        // Search for a prime number that is less than the target zone
+        // number given by iZone.
+        //
+        int Lower = Primes[0];
+        for (int jPrime = 0; Primes[jPrime] != 0; jPrime++)
+        {
+            if (jPrime != 0 && TableSize % Primes[jPrime] == 0) continue;
+            int Upper = Primes[jPrime];
+            if (Lower <= iZone && iZone <= Upper)
+            {
+                // Choose the closest lower prime number.
+                //
+                if (iZone - Lower <= Upper - iZone)
+                {
+                    m_HashPrimes[iPrime++] = Lower;
+                }
+                else
+                {
+                    m_HashPrimes[iPrime++] = Upper;
+                }
+                break;
+            }
+            Lower = Upper;
+        }
+    }
+
+    // Alternate negative and positive numbers
+    //
+    for (iPrime = 0; iPrime < 16; iPrime += 2)
+    {
+        m_HashPrimes[iPrime] = TableSize-m_HashPrimes[iPrime];
+    }
+
+    // Shuffle the set of primes to reduce correlation with bits in
+    // hash key.
+    //
+    for (iPrime = 0; iPrime < 16-1; iPrime++)
+    {
+        int Pick = RANDOM_LONG(0, 15-iPrime);
+        int Temp = m_HashPrimes[Pick];
+        m_HashPrimes[Pick] = m_HashPrimes[15-iPrime];
+        m_HashPrimes[15-iPrime] = Temp;
+    }
+}
+
+// Renumber nodes so that nodes that link together are together.
+//
+#define UNNUMBERED_NODE -1
+void CGraph::SortNodes(void)
+{
+	// We are using m_iPreviousNode to be the new node number.
+	// After assigning new node numbers to everything, we move
+	// things and patchup the links.
+	//
+	int iNodeCnt = 0;
+	m_pNodes[0].m_iPreviousNode = iNodeCnt++;
+	for (int i = 1; i < m_cNodes; i++)
+	{
+		m_pNodes[i].m_iPreviousNode = UNNUMBERED_NODE;
+	}
+
+	for (i = 0; i < m_cNodes; i++)
+	{
+		// Run through all of this node's neighbors
+		//
+		for (int j = 0 ; j < m_pNodes[i].m_cNumLinks; j++ )
+		{
+			int iDestNode = INodeLink(i, j);
+			if (m_pNodes[iDestNode].m_iPreviousNode == UNNUMBERED_NODE)
+			{
+				m_pNodes[iDestNode].m_iPreviousNode = iNodeCnt++;
+			}
+		}
+	}
+
+	// Assign remaining node numbers to unlinked nodes.
+	//
+	for (i = 0; i < m_cNodes; i++)
+	{
+		if (m_pNodes[i].m_iPreviousNode == UNNUMBERED_NODE)
+		{
+			m_pNodes[i].m_iPreviousNode = iNodeCnt++;
+		}
+	}
+
+	// Alter links to reflect new node numbers.
+	//
+	for (i = 0; i < m_cLinks; i++)
+	{
+		m_pLinkPool[i].m_iSrcNode  = m_pNodes[m_pLinkPool[i].m_iSrcNode].m_iPreviousNode;
+		m_pLinkPool[i].m_iDestNode = m_pNodes[m_pLinkPool[i].m_iDestNode].m_iPreviousNode;
+	}
+
+	// Rearrange nodes to reflect new node numbering.
+	//
+	for (i = 0; i < m_cNodes; i++)
+	{
+		while (m_pNodes[i].m_iPreviousNode != i)
+		{
+			// Move current node off to where it should be, and bring
+			// that other node back into the current slot.
+			//
+			int iDestNode = m_pNodes[i].m_iPreviousNode;
+			CNode TempNode = m_pNodes[iDestNode];
+			m_pNodes[iDestNode] = m_pNodes[i];
+			m_pNodes[i] = TempNode;
+		}
+	}
+}
+
+void CGraph::BuildLinkLookups(void)
+{
+	m_nHashLinks = 3*m_cLinks/2 + 3;
+
+	HashChoosePrimes(m_nHashLinks);
+	m_pHashLinks = (short *)calloc(sizeof(short), m_nHashLinks);
+	if (!m_pHashLinks)
+	{
+		ALERT(at_aiconsole, "Couldn't allocated Link Lookup Table.\n");
+		return;
+	}
+	for (int i = 0; i < m_nHashLinks; i++)
+	{
+		m_pHashLinks[i] = ENTRY_STATE_EMPTY;
+	}
+
+	for (i = 0; i < m_cLinks; i++)
+	{
+		CLink &link = Link(i);
+		HashInsert(link.m_iSrcNode, link.m_iDestNode, i);
+	}
+#if 0
+	for (i = 0; i < m_cLinks; i++)
+	{
+		CLink &link = Link(i);
+		int iKey;
+		HashSearch(link.m_iSrcNode, link.m_iDestNode, iKey);
+		if (iKey != i)
+		{
+			ALERT(at_aiconsole, "HashLinks don't match (%d versus %d)\n", i, iKey);
+		}
+	}
+#endif
+}
+
+void CGraph::BuildRegionTables(void)
+{
+	if (m_di) free(m_di);
+
+	// Go ahead and setup for range searching the nodes for FindNearestNodes
+	//
+	m_di = (DIST_INFO *)calloc(sizeof(DIST_INFO), m_cNodes);
+	if (!m_di)
+	{
+		ALERT(at_aiconsole, "Couldn't allocated node ordering array.\n");
+		return;
+	}
+
+	// Calculate regions for all the nodes.
+	//
+	//
+	for (int i = 0; i < 3; i++)
+	{
+		m_RegionMin[i] =  999999999.0; // just a big number out there;
+		m_RegionMax[i] = -999999999.0; // just a big number out there;
+	}
+	for (i = 0; i < m_cNodes; i++)
+	{
+		if (m_pNodes[i].m_vecOrigin.x < m_RegionMin[0])
+			m_RegionMin[0] = m_pNodes[i].m_vecOrigin.x;
+		if (m_pNodes[i].m_vecOrigin.y < m_RegionMin[1])
+			m_RegionMin[1] = m_pNodes[i].m_vecOrigin.y;
+		if (m_pNodes[i].m_vecOrigin.z < m_RegionMin[2])
+			m_RegionMin[2] = m_pNodes[i].m_vecOrigin.z;
+
+		if (m_pNodes[i].m_vecOrigin.x > m_RegionMax[0])
+			m_RegionMax[0] = m_pNodes[i].m_vecOrigin.x;
+		if (m_pNodes[i].m_vecOrigin.y > m_RegionMax[1])
+			m_RegionMax[1] = m_pNodes[i].m_vecOrigin.y;
+		if (m_pNodes[i].m_vecOrigin.z > m_RegionMax[2])
+			m_RegionMax[2] = m_pNodes[i].m_vecOrigin.z;
+	}
+	for (i = 0; i < m_cNodes; i++)
+	{
+		m_pNodes[i].m_Region[0] = CALC_RANGE(m_pNodes[i].m_vecOrigin.x, m_RegionMin[0], m_RegionMax[0]);
+		m_pNodes[i].m_Region[1] = CALC_RANGE(m_pNodes[i].m_vecOrigin.y, m_RegionMin[1], m_RegionMax[1]);
+		m_pNodes[i].m_Region[2] = CALC_RANGE(m_pNodes[i].m_vecOrigin.z, m_RegionMin[2], m_RegionMax[2]);
+	}
+
+	for (i = 0; i < 3; i++)
+	{
+		for (int j = 0; j < NUM_RANGES; j++)
+		{
+			m_RangeStart[i][j] = 255;
+			m_RangeEnd[i][j] = 0;
+		}
+		for (j = 0; j < m_cNodes; j++)
+		{
+			m_di[j].m_SortedBy[i] = j;
+		}
+
+		for (j = 0; j < m_cNodes - 1; j++)
+		{
+			int jNode = m_di[j].m_SortedBy[i];
+			int jCodeX = m_pNodes[jNode].m_Region[0];
+			int jCodeY = m_pNodes[jNode].m_Region[1];
+			int jCodeZ = m_pNodes[jNode].m_Region[2];
+			int jCode;
+			switch (i)
+			{
+			case 0:
+				jCode = (jCodeX << 16) + (jCodeY << 8) + jCodeZ;
+				break;
+			case 1:
+				jCode = (jCodeY << 16) + (jCodeZ << 8) + jCodeX;
+				break;
+			case 2:
+				jCode = (jCodeZ << 16) + (jCodeX << 8) + jCodeY;
+				break;
+			}
+
+			for (int k = j+1; k < m_cNodes; k++)
+			{
+				int kNode = m_di[k].m_SortedBy[i];
+				int kCodeX = m_pNodes[kNode].m_Region[0];
+				int kCodeY = m_pNodes[kNode].m_Region[1];
+				int kCodeZ = m_pNodes[kNode].m_Region[2];
+				int kCode;
+				switch (i)
+				{
+				case 0:
+					kCode = (kCodeX << 16) + (kCodeY << 8) + kCodeZ;
+					break;
+				case 1:
+					kCode = (kCodeY << 16) + (kCodeZ << 8) + kCodeX;
+					break;
+				case 2:
+					kCode = (kCodeZ << 16) + (kCodeX << 8) + kCodeY;
+					break;
+				}
+
+				if (kCode < jCode)
+				{
+					// Swap j and k entries.
+					//
+					int Tmp = m_di[j].m_SortedBy[i];
+					m_di[j].m_SortedBy[i] = m_di[k].m_SortedBy[i];
+					m_di[k].m_SortedBy[i] = Tmp;
+				}
+			}
+		}
+	}
+
+	// Generate lookup tables.
+	//
+	for (i = 0; i < m_cNodes; i++)
+	{
+		int CodeX = m_pNodes[m_di[i].m_SortedBy[0]].m_Region[0];
+		int CodeY = m_pNodes[m_di[i].m_SortedBy[1]].m_Region[1];
+		int CodeZ = m_pNodes[m_di[i].m_SortedBy[2]].m_Region[2];
+
+        if (i < m_RangeStart[0][CodeX])
+        {
+            m_RangeStart[0][CodeX] = i;
+        }
+        if (i < m_RangeStart[1][CodeY])
+        {
+            m_RangeStart[1][CodeY] = i;
+        }
+        if (i < m_RangeStart[2][CodeZ])
+        {
+            m_RangeStart[2][CodeZ] = i;
+        }
+        if (m_RangeEnd[0][CodeX] < i)
+        {
+            m_RangeEnd[0][CodeX] = i;
+        }
+        if (m_RangeEnd[1][CodeY] < i)
+        {
+            m_RangeEnd[1][CodeY] = i;
+        }
+        if (m_RangeEnd[2][CodeZ] < i)
+        {
+            m_RangeEnd[2][CodeZ] = i;
+        }
+	}
+
+	// Initialize the cache.
+	//
+	memset(m_Cache, 0, sizeof(m_Cache));
+}
+
+void CGraph :: ComputeStaticRoutingTables( void )
+{
+	int nRoutes = m_cNodes*m_cNodes;
+#define FROM_TO(x,y) ((x)*m_cNodes+(y))
+	short *Routes = new short[nRoutes];
+
+	int *pMyPath = new int[m_cNodes];
+	unsigned short *BestNextNodes = new unsigned short[m_cNodes];
+	char *pRoute = new char[m_cNodes*2];
+
+
+	if (Routes && pMyPath && BestNextNodes && pRoute)
+	{
+		int nTotalCompressedSize = 0;
+		for (int iHull = 0; iHull < MAX_NODE_HULLS; iHull++)
+		{
+			for (int iCap = 0; iCap < 2; iCap++)
+			{
+				int iCapMask;
+				switch (iCap)
+				{
+				case 0:
+					iCapMask = 0;
+					break;
+
+				case 1:
+					iCapMask = bits_CAP_OPEN_DOORS | bits_CAP_AUTO_DOORS | bits_CAP_USE;
+					break;
+				}
+
+
+				// Initialize Routing table to uncalculated.
+				//
+				for (int iFrom = 0; iFrom < m_cNodes; iFrom++)
+				{
+					for (int iTo = 0; iTo < m_cNodes; iTo++)
+					{
+						Routes[FROM_TO(iFrom, iTo)] = -1;
+					}
+				}
+
+				for (iFrom = 0; iFrom < m_cNodes; iFrom++)
+				{
+					for (int iTo = m_cNodes-1; iTo >= 0; iTo--)
+					{
+						if (Routes[FROM_TO(iFrom, iTo)] != -1) continue;
+
+						int cPathSize = FindShortestPath(pMyPath, iFrom, iTo, iHull, iCapMask);
+
+						// Use the computed path to update the routing table.
+						//
+						if (cPathSize > 1)
+						{
+							for (int iNode = 0; iNode < cPathSize-1; iNode++)
+							{
+								int iStart = pMyPath[iNode];
+								int iNext  = pMyPath[iNode+1];
+								for (int iNode1 = iNode+1; iNode1 < cPathSize; iNode1++)
+								{
+									int iEnd = pMyPath[iNode1];
+									Routes[FROM_TO(iStart, iEnd)] = iNext;
+								}
+							}
+#if 0
+							// Well, at first glance, this should work, but actually it's safer
+							// to be told explictly that you can take a series of node in a
+							// particular direction. Some links don't appear to have links in
+							// the opposite direction.
+							//
+							for (iNode = cPathSize-1; iNode >= 1; iNode--)
+							{
+								int iStart = pMyPath[iNode];
+								int iNext  = pMyPath[iNode-1];
+								for (int iNode1 = iNode-1; iNode1 >= 0; iNode1--)
+								{
+									int iEnd = pMyPath[iNode1];
+									Routes[FROM_TO(iStart, iEnd)] = iNext;
+								}
+							}
+#endif
+						}
+						else
+						{
+							Routes[FROM_TO(iFrom, iTo)] = iFrom;
+							Routes[FROM_TO(iTo, iFrom)] = iTo;
+						}
+					}
+				}
+
+				for (iFrom = 0; iFrom < m_cNodes; iFrom++)
+				{
+					for (int iTo = 0; iTo < m_cNodes; iTo++)
+					{
+						BestNextNodes[iTo] = Routes[FROM_TO(iFrom, iTo)];
+					}
+
+					// Compress this node's routing table.
+					//
+					int iLastNode = 9999999; // just really big.
+					int cSequence = 0;
+					int cRepeats = 0;
+					int CompressedSize = 0;
+					char *p = pRoute;
+					for (int i = 0; i < m_cNodes; i++)
+					{
+						BOOL CanRepeat = ((BestNextNodes[i] == iLastNode) && cRepeats < 127);
+						BOOL CanSequence = (BestNextNodes[i] == i && cSequence < 128);
+
+						if (cRepeats)
+						{
+							if (CanRepeat)
+							{
+								cRepeats++;
+							}
+							else
+							{
+								// Emit the repeat phrase.
+								//
+								CompressedSize += 2; // (count-1, iLastNode-i)
+								*p++ = cRepeats - 1;
+								int a = iLastNode - iFrom;
+								int b = iLastNode - iFrom + m_cNodes;
+								int c = iLastNode - iFrom - m_cNodes;
+								if (-128 <= a && a <= 127)
+								{
+									*p++ = a;
+								}
+								else if (-128 <= b && b <= 127)
+								{
+									*p++ = b;
+								}
+								else if (-128 <= c && c <= 127)
+								{
+									*p++ = c;
+								}
+								else
+								{
+									ALERT( at_aiconsole, "Nodes need sorting (%d,%d)!\n", iLastNode, iFrom);
+								}
+								cRepeats = 0;
+
+								if (CanSequence)
+								{
+									// Start a sequence.
+									//
+									cSequence++;
+								}
+								else
+								{
+									// Start another repeat.
+									//
+									cRepeats++;
+								}
+							}
+						}
+						else if (cSequence)
+						{
+							if (CanSequence)
+							{
+								cSequence++;
+							}
+							else
+							{
+								// It may be advantageous to combine
+								// a single-entry sequence phrase with the
+								// next repeat phrase.
+								//
+								if (cSequence == 1 && CanRepeat)
+								{
+									// Combine with repeat phrase.
+									//
+									cRepeats = 2;
+									cSequence = 0;
+								}
+								else
+								{
+									// Emit the sequence phrase.
+									//
+									CompressedSize += 1; // (-count)
+									*p++ = -cSequence;
+									cSequence = 0;
+
+									// Start a repeat sequence.
+									//
+									cRepeats++;
+								}
+							}
+						}
+						else
+						{
+							if (CanSequence)
+							{
+								// Start a sequence phrase.
+								//
+								cSequence++;
+							}
+							else
+							{
+								// Start a repeat sequence.
+								//
+								cRepeats++;
+							}
+						}
+						iLastNode = BestNextNodes[i];
+					}
+					if (cRepeats)
+					{
+						// Emit the repeat phrase.
+						//
+						CompressedSize += 2;
+						*p++ = cRepeats - 1;
+#if 0
+						iLastNode = iFrom + *pRoute;
+						if (iLastNode >= m_cNodes) iLastNode -= m_cNodes;
+						else if (iLastNode < 0) iLastNode += m_cNodes;
+#endif
+						int a = iLastNode - iFrom;
+						int b = iLastNode - iFrom + m_cNodes;
+						int c = iLastNode - iFrom - m_cNodes;
+						if (-128 <= a && a <= 127)
+						{
+							*p++ = a;
+						}
+						else if (-128 <= b && b <= 127)
+						{
+							*p++ = b;
+						}
+						else if (-128 <= c && c <= 127)
+						{
+							*p++ = c;
+						}
+						else
+						{
+							ALERT( at_aiconsole, "Nodes need sorting (%d,%d)!\n", iLastNode, iFrom);
+						}
+					}
+					if (cSequence)
+					{
+						// Emit the Sequence phrase.
+						//
+						CompressedSize += 1;
+						*p++ = -cSequence;
+					}
+
+					// Go find a place to store this thing and point to it.
+					//
+					int nRoute = p - pRoute;
+					if (m_pRouteInfo)
+					{
+						for (int i = 0; i < m_nRouteInfo - nRoute; i++)
+						{
+							if (memcmp(m_pRouteInfo + i, pRoute, nRoute) == 0)
+							{
+								break;
+							}
+						}
+						if (i < m_nRouteInfo - nRoute)
+						{
+							m_pNodes[ iFrom ].m_pNextBestNode[iHull][iCap] = i;
+						}
+						else
+						{
+							char *Tmp = (char *)calloc(sizeof(char), (m_nRouteInfo + nRoute));
+							memcpy(Tmp, m_pRouteInfo, m_nRouteInfo);
+							free(m_pRouteInfo);
+							m_pRouteInfo = Tmp;
+							memcpy(m_pRouteInfo + m_nRouteInfo, pRoute, nRoute);
+							m_pNodes[ iFrom ].m_pNextBestNode[iHull][iCap] = m_nRouteInfo;
+							m_nRouteInfo += nRoute;
+							nTotalCompressedSize += CompressedSize;
+						}
+					}
+					else
+					{
+						m_nRouteInfo = nRoute;
+						m_pRouteInfo = (char *)calloc(sizeof(char), nRoute);
+						memcpy(m_pRouteInfo, pRoute, nRoute);
+						m_pNodes[ iFrom ].m_pNextBestNode[iHull][iCap] = 0;
+						nTotalCompressedSize += CompressedSize;
+					}
+				}
+			}
+		}		
+		ALERT( at_aiconsole, "Size of Routes = %d\n", nTotalCompressedSize);
+	}
+	if (Routes) delete Routes;
+	if (BestNextNodes) delete BestNextNodes;
+	if (pRoute) delete pRoute;
+	if (pMyPath) delete pMyPath;
+	Routes = 0;
+	BestNextNodes = 0;
+	pRoute = 0;
+	pMyPath = 0;
+
+#if 0
+	TestRoutingTables();
+#endif
+	m_fRoutingComplete = TRUE;
+}
+
+// Test those routing tables. Doesn't really work, yet.
+//
+void CGraph :: TestRoutingTables( void )
+{
+	int *pMyPath = new int[m_cNodes];
+	int *pMyPath2 = new int[m_cNodes];
+	if (pMyPath && pMyPath2)
+	{
+		for (int iHull = 0; iHull < MAX_NODE_HULLS; iHull++)
+		{
+			for (int iCap = 0; iCap < 2; iCap++)
+			{
+				int iCapMask;
+				switch (iCap)
+				{
+				case 0:
+					iCapMask = 0;
+					break;
+
+				case 1:
+					iCapMask = bits_CAP_OPEN_DOORS | bits_CAP_AUTO_DOORS | bits_CAP_USE;
+					break;
+				}
+
+				for (int iFrom = 0; iFrom < m_cNodes; iFrom++)
+				{
+					for (int iTo = 0; iTo < m_cNodes; iTo++)
+					{
+						m_fRoutingComplete = FALSE;
+						int cPathSize1 = FindShortestPath(pMyPath, iFrom, iTo, iHull, iCapMask);
+						m_fRoutingComplete = TRUE;
+						int cPathSize2 = FindShortestPath(pMyPath2, iFrom, iTo, iHull, iCapMask);
+
+						// Unless we can look at the entire path, we can verify that it's correct.
+						//
+						if (cPathSize2 == MAX_PATH_SIZE) continue;
+
+						// Compare distances.
+						//
+#if 1
+						float flDistance1 = 0.0;
+						for (int i = 0; i < cPathSize1-1; i++)
+						{
+							// Find the link from pMyPath[i] to pMyPath[i+1]
+							//
+							if (pMyPath[i] == pMyPath[i+1]) continue;
+							int iVisitNode;
+							BOOL bFound = FALSE;
+							for (int iLink = 0; iLink < m_pNodes[pMyPath[i]].m_cNumLinks; iLink++)
+							{
+								iVisitNode = INodeLink ( pMyPath[i], iLink );
+								if (iVisitNode == pMyPath[i+1])
+								{
+									flDistance1 += m_pLinkPool[ m_pNodes[ pMyPath[i] ].m_iFirstLink + iLink].m_flWeight;
+									bFound = TRUE;
+									break;
+								}
+							}
+							if (!bFound)
+							{
+								ALERT(at_aiconsole, "No link.\n");
+							}
+						}
+
+						float flDistance2 = 0.0;
+						for (i = 0; i < cPathSize2-1; i++)
+						{
+							// Find the link from pMyPath2[i] to pMyPath2[i+1]
+							//
+							if (pMyPath2[i] == pMyPath2[i+1]) continue;
+							int iVisitNode;
+							BOOL bFound = FALSE;
+							for (int iLink = 0; iLink < m_pNodes[pMyPath2[i]].m_cNumLinks; iLink++)
+							{
+								iVisitNode = INodeLink ( pMyPath2[i], iLink );
+								if (iVisitNode == pMyPath2[i+1])
+								{
+									flDistance2 += m_pLinkPool[ m_pNodes[ pMyPath2[i] ].m_iFirstLink + iLink].m_flWeight;
+									bFound = TRUE;
+									break;
+								}
+							}
+							if (!bFound)
+							{
+								ALERT(at_aiconsole, "No link.\n");
+							}
+						}
+						if (fabs(flDistance1 - flDistance2) > 0.10)
+						{
+#else
+						if (cPathSize1 != cPathSize2 || memcmp(pMyPath, pMyPath2, sizeof(int)*cPathSize1) != 0)
+						{
+#endif
+							ALERT(at_aiconsole, "Routing is inconsistent!!!\n");
+							ALERT(at_aiconsole, "(%d to %d |%d/%d)1:", iFrom, iTo, iHull, iCap);
+							for (int i = 0; i < cPathSize1; i++)
+							{
+								ALERT(at_aiconsole, "%d ", pMyPath[i]);
+							}
+							ALERT(at_aiconsole, "\n(%d to %d |%d/%d)2:", iFrom, iTo, iHull, iCap);
+							for (i = 0; i < cPathSize2; i++)
+							{
+								ALERT(at_aiconsole, "%d ", pMyPath2[i]);
+							}
+							ALERT(at_aiconsole, "\n");
+							m_fRoutingComplete = FALSE;
+							cPathSize1 = FindShortestPath(pMyPath, iFrom, iTo, iHull, iCapMask);
+							m_fRoutingComplete = TRUE;
+							cPathSize2 = FindShortestPath(pMyPath2, iFrom, iTo, iHull, iCapMask);
+							goto EnoughSaid;
+						}
+					}
+				}
+			}
+		}
+	}
+
+EnoughSaid:
+
+	if (pMyPath) delete pMyPath;
+	if (pMyPath2) delete pMyPath2;
+	pMyPath = 0;
+	pMyPath2 = 0;
+}
+
+
+
+
+
+
+
+
+
+//=========================================================
+// CNodeViewer - Draws a graph of the shorted path from all nodes
+// to current location (typically the player).  It then draws
+// as many connects as it can per frame, trying not to overflow the buffer
+//=========================================================
+class CNodeViewer : public CBaseEntity
+{
+public:
+	void Spawn( void );
+
+	int m_iBaseNode;
+	int m_iDraw;
+	int	m_nVisited;
+	int m_aFrom[128];
+	int m_aTo[128];
+	int m_iHull;
+	int m_afNodeType;
+	Vector m_vecColor;
+
+	void FindNodeConnections( int iNode );
+	void AddNode( int iFrom, int iTo );
+	void EXPORT DrawThink( void );
+
+};
+LINK_ENTITY_TO_CLASS( node_viewer, CNodeViewer );
+LINK_ENTITY_TO_CLASS( node_viewer_human, CNodeViewer );
+LINK_ENTITY_TO_CLASS( node_viewer_fly, CNodeViewer );
+LINK_ENTITY_TO_CLASS( node_viewer_large, CNodeViewer );
+
+void CNodeViewer::Spawn( )
+{
+	if ( !WorldGraph.m_fGraphPresent || !WorldGraph.m_fGraphPointersSet )
+	{// protect us in the case that the node graph isn't available or built
+		ALERT ( at_console, "Graph not ready!\n" );
+		UTIL_Remove( this );
+		return;
+	}
+
+
+	if (FClassnameIs( pev, "node_viewer_fly"))
+	{
+		m_iHull = NODE_FLY_HULL;
+		m_afNodeType = bits_NODE_AIR;
+		m_vecColor = Vector( 160, 100, 255 );
+	}
+	else if (FClassnameIs( pev, "node_viewer_large"))
+	{
+		m_iHull = NODE_LARGE_HULL;
+		m_afNodeType = bits_NODE_LAND | bits_NODE_WATER;
+		m_vecColor = Vector( 100, 255, 160 );
+	}
+	else
+	{
+		m_iHull = NODE_HUMAN_HULL;
+		m_afNodeType = bits_NODE_LAND | bits_NODE_WATER;
+		m_vecColor = Vector( 255, 160, 100 );
+	}
+
+
+	m_iBaseNode = WorldGraph.FindNearestNode ( pev->origin, m_afNodeType );
+
+	if ( m_iBaseNode < 0 )
+	{
+		ALERT( at_console, "No nearby node\n" );
+		return;
+	}
+
+	m_nVisited = 0;
+
+	ALERT( at_aiconsole, "basenode %d\n", m_iBaseNode );
+
+	if (WorldGraph.m_cNodes < 128)
+	{
+		for (int i = 0; i < WorldGraph.m_cNodes; i++)
+		{
+			AddNode( i, WorldGraph.NextNodeInRoute( i, m_iBaseNode, m_iHull, 0 ));
+		}
+	}
+	else
+	{
+		// do a depth traversal
+		FindNodeConnections( m_iBaseNode );
+
+		int start = 0;
+		int end;
+		do {
+			end = m_nVisited;
+			// ALERT( at_console, "%d :", m_nVisited );
+			for (end = m_nVisited; start < end; start++)
+			{
+				FindNodeConnections( m_aFrom[start] );
+				FindNodeConnections( m_aTo[start] );
+			}
+		} while (end != m_nVisited);
+	}
+
+	ALERT( at_aiconsole, "%d nodes\n", m_nVisited );
+
+	m_iDraw = 0;
+	SetThink( &CNodeViewer::DrawThink );
+	pev->nextthink = gpGlobals->time;
+}
+
+
+void CNodeViewer :: FindNodeConnections ( int iNode )
+{
+	AddNode( iNode, WorldGraph.NextNodeInRoute( iNode, m_iBaseNode, m_iHull, 0 ));
+	for ( int i = 0 ; i < WorldGraph.m_pNodes[ iNode ].m_cNumLinks ; i++ )
+	{
+		CLink *pToLink = &WorldGraph.NodeLink( iNode, i);
+		AddNode( pToLink->m_iDestNode, WorldGraph.NextNodeInRoute( pToLink->m_iDestNode, m_iBaseNode, m_iHull, 0 ));
+	}
+}
+
+void CNodeViewer::AddNode( int iFrom, int iTo )
+{
+	if (m_nVisited >= 128)
+	{
+		return;
+	}
+	else
+	{
+		if (iFrom == iTo)
+			return;
+
+		for (int i = 0; i < m_nVisited; i++)
+		{
+			if (m_aFrom[i] == iFrom && m_aTo[i] == iTo)
+				return;
+			if (m_aFrom[i] == iTo && m_aTo[i] == iFrom)
+				return;
+		}
+		m_aFrom[m_nVisited] = iFrom;
+		m_aTo[m_nVisited] = iTo;
+		m_nVisited++;
+	}
+}
+
+
+void CNodeViewer :: DrawThink( void )
+{
+	pev->nextthink = gpGlobals->time;
+
+	for (int i = 0; i < 10; i++)
+	{
+		if (m_iDraw == m_nVisited)
+		{
+			UTIL_Remove( this );
+			return;
+		}
+
+		extern short g_sModelIndexLaser;
+		MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+			WRITE_BYTE( TE_BEAMPOINTS );
+			WRITE_COORD( WorldGraph.m_pNodes[ m_aFrom[m_iDraw] ].m_vecOrigin.x );
+			WRITE_COORD( WorldGraph.m_pNodes[ m_aFrom[m_iDraw] ].m_vecOrigin.y );
+			WRITE_COORD( WorldGraph.m_pNodes[ m_aFrom[m_iDraw] ].m_vecOrigin.z + NODE_HEIGHT );
+
+			WRITE_COORD( WorldGraph.m_pNodes[ m_aTo[m_iDraw] ].m_vecOrigin.x );
+			WRITE_COORD( WorldGraph.m_pNodes[ m_aTo[m_iDraw] ].m_vecOrigin.y );
+			WRITE_COORD( WorldGraph.m_pNodes[ m_aTo[m_iDraw] ].m_vecOrigin.z + NODE_HEIGHT );
+			WRITE_SHORT( g_sModelIndexLaser );
+			WRITE_BYTE( 0 ); // framerate
+			WRITE_BYTE( 0 ); // framerate
+			WRITE_BYTE( 250 ); // life
+			WRITE_BYTE( 40 );  // width
+			WRITE_BYTE( 0 );   // noise
+			WRITE_BYTE( m_vecColor.x );   // r, g, b
+			WRITE_BYTE( m_vecColor.y );   // r, g, b
+			WRITE_BYTE( m_vecColor.z );   // r, g, b
+			WRITE_BYTE( 128 );	// brightness
+			WRITE_BYTE( 0 );		// speed
+		MESSAGE_END();
+
+		m_iDraw++;
+	}
+}
+
+
diff --git a/main/source/dlls/nodes.h b/main/source/dlls/nodes.h
new file mode 100644
index 00000000..824ceb20
--- /dev/null
+++ b/main/source/dlls/nodes.h
@@ -0,0 +1,54 @@
+/***
+*
+*	Copyright (c) 1996-2002, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//=========================================================
+// nodes.h
+//=========================================================
+
+#ifndef	NODES_H
+#define	NODES_H
+
+#define	bits_NODE_GROUP_REALM	1
+
+class CLink
+{
+public:
+	entvars_t	*m_pLinkEnt;// the entity that blocks this connection (doors, etc)
+};
+
+
+class CGraph
+{
+public:
+	BOOL	m_fGraphPresent;// is the graph in memory?
+	BOOL	m_fGraphPointersSet;// are the entity pointers for the graph all set?
+
+	int		m_cLinks;// total number of links
+	CLink	*m_pLinkPool;// big list of all node connections
+
+	void	InitGraph( void );
+	int		AllocNodes ( void );
+	
+	int		CheckNODFile(char *szMapName);
+	int		FLoadGraph(char *szMapName);
+	int		FSetGraphPointers(void);
+	void	ShowNodeConnections ( int iNode );
+	int		FindNearestNode ( const Vector &vecOrigin, CBaseEntity *pEntity );
+	int		FindNearestNode ( const Vector &vecOrigin, int afNodeTypes );
+
+};
+
+extern CGraph WorldGraph;
+
+#endif	// NODES_H
\ No newline at end of file
diff --git a/main/source/dlls/observer.cpp b/main/source/dlls/observer.cpp
new file mode 100644
index 00000000..f738b5c0
--- /dev/null
+++ b/main/source/dlls/observer.cpp
@@ -0,0 +1,315 @@
+//=========== (C) Copyright 1996-2002, Valve, L.L.C. All rights reserved. ===========
+//
+// The copyright to the contents herein is the property of Valve, L.L.C.
+// The contents may be used and/or copied only with the written permission of
+// Valve, L.L.C., or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: Functionality for the observer chase camera
+//
+// $Workfile:     $
+// $Date:         $
+//
+//-----------------------------------------------------------------------------
+// $Log: $
+//
+// $NoKeywords: $
+//=============================================================================
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "player.h"
+#include "pm_shared.h"
+#include "mod/AvHPlayer.h"
+#include "mod/AvHGamerules.h"
+
+const float kNextTargetInterval = .2f;
+
+// Find the next client in the game for this player to spectate
+bool CBasePlayer::Observer_FindNextPlayer(bool inReverse)
+{
+	// MOD AUTHORS: Modify the logic of this function if you want to restrict the observer to watching
+	//				only a subset of the players. e.g. Make it check the target's team.
+	bool theSuccess = false;
+	int	iStart;
+	if ( m_hObserverTarget )
+		iStart = ENTINDEX( m_hObserverTarget->edict() );
+	else
+		iStart = ENTINDEX( edict() );
+	int	iCurrent = iStart;
+	m_hObserverTarget = NULL;
+
+	if(this->entindex() == 1)
+	{
+		int a = 0;
+	}
+
+	int iDir = inReverse ? -1 : 1; 
+	AvHPlayer* theThisAvHPlayer = dynamic_cast<AvHPlayer*>(this);
+
+	do
+	{
+		iCurrent += iDir;
+
+		// Loop through the clients
+		if (iCurrent > gpGlobals->maxClients)
+			iCurrent = 1;
+		if (iCurrent < 1)
+			iCurrent = gpGlobals->maxClients;
+
+		CBaseEntity *pEnt = UTIL_PlayerByIndex( iCurrent );
+		if ( !pEnt )
+			continue;
+		if ( pEnt == this )
+			continue;
+		// Don't spec observers or invisible players
+		if ( ((CBasePlayer*)pEnt)->IsObserver() || (pEnt->pev->effects & EF_NODRAW))
+			continue;
+
+		// MOD AUTHORS: Add checks on target here.
+		AvHPlayer* thePotentialTargetPlayer = dynamic_cast<AvHPlayer*>(pEnt);
+		if(theThisAvHPlayer && thePotentialTargetPlayer)
+		{
+			if(!thePotentialTargetPlayer->GetIsRelevant())
+			{
+				continue;
+			}
+
+			// Don't allow spectating of other team when we could come back in
+			if(((theThisAvHPlayer->GetPlayMode() == PLAYMODE_AWAITINGREINFORCEMENT) || (theThisAvHPlayer->GetPlayMode() == PLAYMODE_REINFORCING)) && (thePotentialTargetPlayer->pev->team != this->pev->team))
+			{
+				continue;
+			}
+
+			if(theThisAvHPlayer->GetPlayMode() != PLAYMODE_OBSERVER)
+			{
+				if(GetGameRules()->GetIsTournamentMode() && (thePotentialTargetPlayer->pev->team != this->pev->team) && (this->pev->team != TEAM_IND))
+				{
+					continue;
+				}
+			}
+			
+			// Don't allow spectating of players in top down mode
+			if(thePotentialTargetPlayer->GetIsInTopDownMode())
+			{
+				continue;
+			}
+			
+			// Don't allow spectating opposite teams in tournament mode
+			//if(GetGameRules()->GetIsTournamentMode())
+			//{
+			//}
+
+			m_hObserverTarget = pEnt;
+		}
+		break;
+
+	} while ( iCurrent != iStart );
+
+	// Did we find a target?
+	if ( m_hObserverTarget )
+	{
+		// Store the target in pev so the physics DLL can get to it
+		if (pev->iuser1 != OBS_ROAMING)
+			pev->iuser2 = ENTINDEX( m_hObserverTarget->edict() );
+		// Move to the target
+		UTIL_SetOrigin( pev, m_hObserverTarget->pev->origin );
+
+		//ALERT( at_console, "Now Tracking %s\n", STRING( m_hObserverTarget->pev->classname ) );
+		m_flNextObserverInput = gpGlobals->time + kNextTargetInterval;
+
+		theSuccess = true;
+	}
+	else
+	{
+		//ALERT( at_console, "No observer targets.\n" );
+	}
+	return theSuccess;
+}
+
+void CBasePlayer::Observer_SpectatePlayer(int index)
+{
+
+    CBaseEntity* pEnt = UTIL_PlayerByIndex(index);
+    
+    AvHPlayer* thePotentialTargetPlayer = dynamic_cast<AvHPlayer*>(pEnt);
+    AvHPlayer* theThisAvHPlayer = dynamic_cast<AvHPlayer*>(this);
+
+    if (theThisAvHPlayer == NULL || thePotentialTargetPlayer == NULL)
+    {
+        return;
+    }
+    
+	if(!thePotentialTargetPlayer->GetIsRelevant())
+	{
+		return;
+	}
+
+	// Don't allow spectating of other team when we could come back in
+	if(((theThisAvHPlayer->GetPlayMode() == PLAYMODE_AWAITINGREINFORCEMENT) || (theThisAvHPlayer->GetPlayMode() == PLAYMODE_REINFORCING)) && (thePotentialTargetPlayer->pev->team != this->pev->team))
+	{
+		return;
+	}
+
+	if(theThisAvHPlayer->GetPlayMode() != PLAYMODE_OBSERVER)
+	{
+		if(GetGameRules()->GetIsTournamentMode() && (thePotentialTargetPlayer->pev->team != this->pev->team) && (this->pev->team != TEAM_IND))
+		{
+			return;
+		}
+	}
+	
+	// Don't allow spectating of players in top down mode
+	if(thePotentialTargetPlayer->GetIsInTopDownMode())
+	{
+		return;
+	}
+	
+	m_hObserverTarget = pEnt;
+    pev->iuser2 = index;
+
+}
+
+// Handle buttons in observer mode
+void CBasePlayer::Observer_HandleButtons()
+{
+
+    // Removed by mmcguire.
+    // This is all handled through the client side UI.
+
+    /*
+	// Slow down mouse clicks
+	if ( m_flNextObserverInput > gpGlobals->time )
+		return;
+
+	// Only do this if spectating
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this);
+	ASSERT(thePlayer);
+	bool theIsObserving = (thePlayer->GetPlayMode() == PLAYMODE_OBSERVER);
+		
+	// Jump changes from modes: Chase to Roaming
+	if ( m_afButtonPressed & IN_JUMP )
+	{
+		if ( pev->iuser1 == OBS_CHASE_LOCKED )
+		{
+			Observer_SetMode( OBS_CHASE_FREE );
+		}
+		else if ( pev->iuser1 == OBS_CHASE_FREE )
+		{
+			if(theIsObserving)
+			{
+				Observer_SetMode(OBS_ROAMING);
+			}
+			else
+			{
+				Observer_SetMode(OBS_IN_EYE);
+			}
+		}
+		else if ( pev->iuser1 == OBS_ROAMING )
+		{
+			Observer_SetMode( OBS_IN_EYE );
+		}
+		else if ( pev->iuser1 == OBS_IN_EYE )
+		{
+			if(theIsObserving)
+			{
+				Observer_SetMode(OBS_MAP_FREE);
+			}
+			else
+			{
+				Observer_SetMode(OBS_CHASE_LOCKED);
+			}
+		}
+		else if ( pev->iuser1 == OBS_MAP_FREE )
+		{
+			Observer_SetMode( OBS_MAP_CHASE );
+		}
+		else
+		{
+			Observer_SetMode( OBS_CHASE_FREE );	// don't use OBS_CHASE_LOCKED anymore
+		}
+
+		m_flNextObserverInput = gpGlobals->time + kNextTargetInterval;
+	}
+
+	// Attack moves to the next player
+	if ( (m_afButtonPressed & IN_ATTACK) || ((m_afButtonPressed & IN_MOVERIGHT) && (pev->iuser1 != OBS_ROAMING)) )
+	{
+		if(Observer_FindNextPlayer( false ))
+		{
+			m_flNextObserverInput = gpGlobals->time + kNextTargetInterval;
+		}
+		else
+		{
+			Observer_SetMode( OBS_CHASE_FREE );
+		}
+	}
+
+	// Attack2 moves to the prev player
+	if ( (m_afButtonPressed & IN_ATTACK2) || ((m_afButtonPressed & IN_MOVELEFT) && (pev->iuser1 != OBS_ROAMING)) )
+	{
+		if(Observer_FindNextPlayer( true ))
+		{
+			m_flNextObserverInput = gpGlobals->time + kNextTargetInterval;
+		}
+		else
+		{
+			Observer_SetMode( OBS_CHASE_FREE );
+		}
+	}
+    */
+
+}
+
+// Attempt to change the observer mode
+void CBasePlayer::Observer_SetMode( int iMode )
+{
+	// Limit some modes if we're not observing
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this);
+	ASSERT(thePlayer);
+
+    bool theIsObserving = (thePlayer->GetPlayMode() == PLAYMODE_OBSERVER);
+    
+    if(!theIsObserving)
+	{
+		if((iMode == OBS_ROAMING) /*|| (iMode == OBS_MAP_FREE) || (iMode == OBS_MAP_CHASE)*/)
+		{
+			return;
+		}
+	}
+
+	// Just abort if we're changing to the mode we're already in
+	if ( iMode == pev->iuser1 )
+		return;
+
+    // Removed by mmcguire.
+    
+	// is valid mode ?
+	if ( iMode < OBS_CHASE_LOCKED || iMode > OBS_IN_EYE )
+		iMode = OBS_IN_EYE; // now it is
+
+    // if we are not roaming, we need a valid target to track
+	if ( (iMode != OBS_ROAMING) && (m_hObserverTarget == NULL) )
+	{
+		Observer_FindNextPlayer();
+
+		// if we didn't find a valid target switch to roaming
+		if (m_hObserverTarget == NULL)
+		{
+			iMode = OBS_ROAMING;
+		}
+	}
+
+	// set spectator mode
+	pev->iuser1 = iMode;
+
+	// set target if not roaming
+	if (iMode == OBS_ROAMING)
+		pev->iuser2 = 0;
+	else
+		pev->iuser2 = ENTINDEX( m_hObserverTarget->edict() );
+
+	// Make sure our target is valid (go backward then forward)
+	Observer_FindNextPlayer(true);
+	Observer_FindNextPlayer(false);
+}
\ No newline at end of file
diff --git a/main/source/dlls/osprey.cpp b/main/source/dlls/osprey.cpp
new file mode 100644
index 00000000..75503e79
--- /dev/null
+++ b/main/source/dlls/osprey.cpp
@@ -0,0 +1,805 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "soundent.h"
+#include "effects.h"
+#include "customentity.h"
+
+typedef struct 
+{
+	int isValid;
+	EHANDLE hGrunt;
+	Vector	vecOrigin;
+	Vector  vecAngles;
+} t_ospreygrunt;
+
+
+
+#define SF_WAITFORTRIGGER	0x40
+
+
+#define MAX_CARRY	24
+
+class COsprey : public CBaseMonster
+{
+public:
+	int		Save( CSave &save );
+	int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+	int		ObjectCaps( void ) { return CBaseMonster :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+	
+	void Spawn( void );
+	void Precache( void );
+	int  Classify( void ) { return CLASS_MACHINE; };
+	int  BloodColor( void ) { return DONT_BLEED; }
+	void Killed( entvars_t *pevAttacker, int iGib );
+
+	void UpdateGoal( void );
+	BOOL HasDead( void );
+	void EXPORT FlyThink( void );
+	void EXPORT DeployThink( void );
+	void Flight( void );
+	void EXPORT HitTouch( CBaseEntity *pOther );
+	void EXPORT FindAllThink( void );
+	void EXPORT HoverThink( void );
+	CBaseMonster *MakeGrunt( Vector vecSrc );
+	void EXPORT CrashTouch( CBaseEntity *pOther );
+	void EXPORT DyingThink( void );
+	void EXPORT CommandUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+	// int  TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType );
+	void TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType);
+	void ShowDamage( void );
+
+	CBaseEntity *m_pGoalEnt;
+	Vector m_vel1;
+	Vector m_vel2;
+	Vector m_pos1;
+	Vector m_pos2;
+	Vector m_ang1;
+	Vector m_ang2;
+	float m_startTime;
+	float m_dTime;
+
+	Vector m_velocity;
+
+	float m_flIdealtilt;
+	float m_flRotortilt;
+
+	float m_flRightHealth;
+	float m_flLeftHealth;
+
+	int	m_iUnits;
+	EHANDLE m_hGrunt[MAX_CARRY];
+	Vector m_vecOrigin[MAX_CARRY];
+	EHANDLE m_hRepel[4];
+
+	int m_iSoundState;
+	int m_iSpriteTexture;
+
+	int m_iPitch;
+
+	int m_iExplode;
+	int	m_iTailGibs;
+	int	m_iBodyGibs;
+	int	m_iEngineGibs;
+
+	int m_iDoLeftSmokePuff;
+	int m_iDoRightSmokePuff;
+};
+
+LINK_ENTITY_TO_CLASS( monster_osprey, COsprey );
+
+TYPEDESCRIPTION	COsprey::m_SaveData[] = 
+{
+	DEFINE_FIELD( COsprey, m_pGoalEnt, FIELD_CLASSPTR ),
+	DEFINE_FIELD( COsprey, m_vel1, FIELD_VECTOR ),
+	DEFINE_FIELD( COsprey, m_vel2, FIELD_VECTOR ),
+	DEFINE_FIELD( COsprey, m_pos1, FIELD_POSITION_VECTOR ),
+	DEFINE_FIELD( COsprey, m_pos2, FIELD_POSITION_VECTOR ),
+	DEFINE_FIELD( COsprey, m_ang1, FIELD_VECTOR ),
+	DEFINE_FIELD( COsprey, m_ang2, FIELD_VECTOR ),
+
+	DEFINE_FIELD( COsprey, m_startTime, FIELD_TIME ),
+	DEFINE_FIELD( COsprey, m_dTime, FIELD_FLOAT ),
+	DEFINE_FIELD( COsprey, m_velocity, FIELD_VECTOR ),
+
+	DEFINE_FIELD( COsprey, m_flIdealtilt, FIELD_FLOAT ),
+	DEFINE_FIELD( COsprey, m_flRotortilt, FIELD_FLOAT ),
+
+	DEFINE_FIELD( COsprey, m_flRightHealth, FIELD_FLOAT ),
+	DEFINE_FIELD( COsprey, m_flLeftHealth, FIELD_FLOAT ),
+
+	DEFINE_FIELD( COsprey, m_iUnits, FIELD_INTEGER ),
+	DEFINE_ARRAY( COsprey, m_hGrunt, FIELD_EHANDLE, MAX_CARRY ),
+	DEFINE_ARRAY( COsprey, m_vecOrigin, FIELD_POSITION_VECTOR, MAX_CARRY ),
+	DEFINE_ARRAY( COsprey, m_hRepel, FIELD_EHANDLE, 4 ),
+
+	// DEFINE_FIELD( COsprey, m_iSoundState, FIELD_INTEGER ),
+	// DEFINE_FIELD( COsprey, m_iSpriteTexture, FIELD_INTEGER ),
+	// DEFINE_FIELD( COsprey, m_iPitch, FIELD_INTEGER ),
+
+	DEFINE_FIELD( COsprey, m_iDoLeftSmokePuff, FIELD_INTEGER ),
+	DEFINE_FIELD( COsprey, m_iDoRightSmokePuff, FIELD_INTEGER ),
+};
+IMPLEMENT_SAVERESTORE( COsprey, CBaseMonster );
+
+
+void COsprey :: Spawn( void )
+{
+	Precache( );
+	// motor
+	pev->movetype = MOVETYPE_FLY;
+	pev->solid = SOLID_BBOX;
+
+	SET_MODEL(ENT(pev), "models/osprey.mdl");
+	UTIL_SetSize(pev, Vector( -400, -400, -100), Vector(400, 400, 32));
+	UTIL_SetOrigin( pev, pev->origin );
+
+	pev->flags |= FL_MONSTER;
+	pev->takedamage		= DAMAGE_YES;
+	m_flRightHealth		= 200;
+	m_flLeftHealth		= 200;
+	pev->health			= 400;
+
+	m_flFieldOfView = 0; // 180 degrees
+
+	pev->sequence = 0;
+	ResetSequenceInfo( );
+	pev->frame = RANDOM_LONG(0,0xFF);
+
+	InitBoneControllers();
+
+	SetThink( &COsprey::FindAllThink );
+	SetUse( &COsprey::CommandUse );
+
+	if (!(pev->spawnflags & SF_WAITFORTRIGGER))
+	{
+		pev->nextthink = gpGlobals->time + 1.0;
+	}
+
+	m_pos2 = pev->origin;
+	m_ang2 = pev->angles;
+	m_vel2 = pev->velocity;
+}
+
+
+void COsprey::Precache( void )
+{
+	UTIL_PrecacheOther( "monster_human_grunt" );
+
+	PRECACHE_MODEL("models/osprey.mdl");
+	PRECACHE_MODEL("models/HVR.mdl");
+
+	PRECACHE_SOUND("apache/ap_rotor4.wav");
+	PRECACHE_SOUND("weapons/mortarhit.wav");
+
+	m_iSpriteTexture = PRECACHE_MODEL( "sprites/rope.spr" );
+
+	m_iExplode	= PRECACHE_MODEL( "sprites/fexplo.spr" );
+	m_iTailGibs = PRECACHE_MODEL( "models/osprey_tailgibs.mdl" );
+	m_iBodyGibs = PRECACHE_MODEL( "models/osprey_bodygibs.mdl" );
+	m_iEngineGibs = PRECACHE_MODEL( "models/osprey_enginegibs.mdl" );
+}
+
+void COsprey::CommandUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	pev->nextthink = gpGlobals->time + 0.1;
+}
+
+void COsprey :: FindAllThink( void )
+{
+	CBaseEntity *pEntity = NULL;
+
+	m_iUnits = 0;
+	while (m_iUnits < MAX_CARRY && (pEntity = UTIL_FindEntityByClassname( pEntity, "monster_human_grunt" )) != NULL)
+	{
+		if (pEntity->IsAlive())
+		{
+			m_hGrunt[m_iUnits]		= pEntity;
+			m_vecOrigin[m_iUnits]	= pEntity->pev->origin;
+			m_iUnits++;
+		}
+	}
+
+	if (m_iUnits == 0)
+	{
+		ALERT( at_console, "osprey error: no grunts to resupply\n");
+		UTIL_Remove( this );
+		return;
+	}
+	SetThink( &COsprey::FlyThink );
+	pev->nextthink = gpGlobals->time + 0.1;
+	m_startTime = gpGlobals->time;
+}
+
+
+void COsprey :: DeployThink( void )
+{
+	UTIL_MakeAimVectors( pev->angles );
+
+	Vector vecForward = gpGlobals->v_forward;
+	Vector vecRight = gpGlobals->v_right;
+	Vector vecUp = gpGlobals->v_up;
+
+	Vector vecSrc;
+
+	TraceResult tr;
+	UTIL_TraceLine( pev->origin, pev->origin + Vector( 0, 0, -4096.0), ignore_monsters, ENT(pev), &tr);
+	CSoundEnt::InsertSound ( bits_SOUND_DANGER, tr.vecEndPos, 400, 0.3 );
+
+	vecSrc = pev->origin + vecForward *  32 + vecRight *  100 + vecUp * -96;
+	m_hRepel[0] = MakeGrunt( vecSrc );
+
+	vecSrc = pev->origin + vecForward * -64 + vecRight *  100 + vecUp * -96;
+	m_hRepel[1] = MakeGrunt( vecSrc );
+
+	vecSrc = pev->origin + vecForward *  32 + vecRight * -100 + vecUp * -96;
+	m_hRepel[2] = MakeGrunt( vecSrc );
+
+	vecSrc = pev->origin + vecForward * -64 + vecRight * -100 + vecUp * -96;
+	m_hRepel[3] = MakeGrunt( vecSrc );
+
+	SetThink( &COsprey::HoverThink );
+	pev->nextthink = gpGlobals->time + 0.1;
+}
+
+
+
+BOOL COsprey :: HasDead( )
+{
+	for (int i = 0; i < m_iUnits; i++)
+	{
+		if (m_hGrunt[i] == NULL || !m_hGrunt[i]->IsAlive())
+		{
+			return TRUE;
+		}
+		else
+		{
+			m_vecOrigin[i] = m_hGrunt[i]->pev->origin;  // send them to where they died
+		}
+	}
+	return FALSE;
+}
+
+
+CBaseMonster *COsprey :: MakeGrunt( Vector vecSrc )
+{
+	CBaseEntity *pEntity;
+	CBaseMonster *pGrunt;
+
+	TraceResult tr;
+	UTIL_TraceLine( vecSrc, vecSrc + Vector( 0, 0, -4096.0), dont_ignore_monsters, ENT(pev), &tr);
+	if ( tr.pHit && Instance( tr.pHit )->pev->solid != SOLID_BSP) 
+		return NULL;
+
+	for (int i = 0; i < m_iUnits; i++)
+	{
+		if (m_hGrunt[i] == NULL || !m_hGrunt[i]->IsAlive())
+		{
+			if (m_hGrunt[i] != NULL && m_hGrunt[i]->pev->rendermode == kRenderNormal)
+			{
+				m_hGrunt[i]->SUB_StartFadeOut( );
+			}
+			pEntity = Create( "monster_human_grunt", vecSrc, pev->angles );
+			pGrunt = pEntity->MyMonsterPointer( );
+			pGrunt->pev->movetype = MOVETYPE_FLY;
+			pGrunt->pev->velocity = Vector( 0, 0, RANDOM_FLOAT( -196, -128 ) );
+			pGrunt->SetActivity( ACT_GLIDE );
+
+			CBeam *pBeam = CBeam::BeamCreate( "sprites/rope.spr", 10 );
+			pBeam->PointEntInit( vecSrc + Vector(0,0,112), pGrunt->entindex() );
+			pBeam->SetFlags( BEAM_FSOLID );
+			pBeam->SetColor( 255, 255, 255 );
+			pBeam->SetThink( &COsprey::SUB_Remove );
+			pBeam->pev->nextthink = gpGlobals->time + -4096.0 * tr.flFraction / pGrunt->pev->velocity.z + 0.5;
+
+			// ALERT( at_console, "%d at %.0f %.0f %.0f\n", i, m_vecOrigin[i].x, m_vecOrigin[i].y, m_vecOrigin[i].z );  
+			pGrunt->m_vecLastPosition = m_vecOrigin[i];
+			m_hGrunt[i] = pGrunt;
+			return pGrunt;
+		}
+	}
+	// ALERT( at_console, "none dead\n");
+	return NULL;
+}
+
+
+void COsprey :: HoverThink( void )
+{
+	int i;
+	for (i = 0; i < 4; i++)
+	{
+		if (m_hRepel[i] != NULL && m_hRepel[i]->pev->health > 0 && !(m_hRepel[i]->pev->flags & FL_ONGROUND))
+		{
+			break;
+		}
+	}
+
+	if (i == 4)
+	{
+		m_startTime = gpGlobals->time;
+		SetThink( &COsprey::FlyThink );
+	}
+
+	pev->nextthink = gpGlobals->time + 0.1;
+	UTIL_MakeAimVectors( pev->angles );
+	ShowDamage( );
+}
+
+
+void COsprey::UpdateGoal( )
+{
+	if (m_pGoalEnt)
+	{
+		m_pos1 = m_pos2;
+		m_ang1 = m_ang2;
+		m_vel1 = m_vel2;
+		m_pos2 = m_pGoalEnt->pev->origin;
+		m_ang2 = m_pGoalEnt->pev->angles;
+		UTIL_MakeAimVectors( Vector( 0, m_ang2.y, 0 ) );
+		m_vel2 = gpGlobals->v_forward * m_pGoalEnt->pev->speed;
+
+		m_startTime = m_startTime + m_dTime;
+		m_dTime = 2.0 * (m_pos1 - m_pos2).Length() / (m_vel1.Length() + m_pGoalEnt->pev->speed);
+
+		if (m_ang1.y - m_ang2.y < -180)
+		{
+			m_ang1.y += 360;
+		}
+		else if (m_ang1.y - m_ang2.y > 180)
+		{
+			m_ang1.y -= 360;
+		}
+
+		if (m_pGoalEnt->pev->speed < 400)
+			m_flIdealtilt = 0;
+		else
+			m_flIdealtilt = -90;
+	}
+	else
+	{
+		ALERT( at_console, "osprey missing target");
+	}
+}
+
+
+void COsprey::FlyThink( void )
+{
+	StudioFrameAdvance( );
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	if ( m_pGoalEnt == NULL && !FStringNull(pev->target) )// this monster has a target
+	{
+		m_pGoalEnt = CBaseEntity::Instance( FIND_ENTITY_BY_TARGETNAME ( NULL, STRING( pev->target ) ) );
+		UpdateGoal( );
+	}
+
+	if (gpGlobals->time > m_startTime + m_dTime)
+	{
+		if (m_pGoalEnt->pev->speed == 0)
+		{
+			SetThink( &COsprey::DeployThink );
+		}
+		do {
+			m_pGoalEnt = CBaseEntity::Instance( FIND_ENTITY_BY_TARGETNAME ( NULL, STRING( m_pGoalEnt->pev->target ) ) );
+		} while (m_pGoalEnt->pev->speed < 400 && !HasDead());
+		UpdateGoal( );
+	}
+
+	Flight( );
+	ShowDamage( );
+}
+
+
+void COsprey::Flight( )
+{
+	float t = (gpGlobals->time - m_startTime);
+	float scale = 1.0 / m_dTime;
+	
+	float f = UTIL_SplineFraction( t * scale, 1.0 );
+
+	Vector pos = (m_pos1 + m_vel1 * t) * (1.0 - f) + (m_pos2 - m_vel2 * (m_dTime - t)) * f;
+	Vector ang = (m_ang1) * (1.0 - f) + (m_ang2) * f;
+	m_velocity = m_vel1 * (1.0 - f) + m_vel2 * f;
+
+	UTIL_SetOrigin( pev, pos );
+	pev->angles = ang;
+	UTIL_MakeAimVectors( pev->angles );
+	float flSpeed = DotProduct( gpGlobals->v_forward, m_velocity );
+
+	// float flSpeed = DotProduct( gpGlobals->v_forward, pev->velocity );
+
+	float m_flIdealtilt = (160 - flSpeed) / 10.0;
+
+	// ALERT( at_console, "%f %f\n", flSpeed, flIdealtilt );
+	if (m_flRotortilt < m_flIdealtilt)
+	{
+		m_flRotortilt += 0.5;
+		if (m_flRotortilt > 0)
+			m_flRotortilt = 0;
+	}
+	if (m_flRotortilt > m_flIdealtilt)
+	{
+		m_flRotortilt -= 0.5;
+		if (m_flRotortilt < -90)
+			m_flRotortilt = -90;
+	}
+	SetBoneController( 0, m_flRotortilt );
+
+
+	if (m_iSoundState == 0)
+	{
+		EMIT_SOUND_DYN(ENT(pev), CHAN_STATIC, "apache/ap_rotor4.wav", 1.0, 0.15, 0, 110 );
+		// EMIT_SOUND_DYN(ENT(pev), CHAN_STATIC, "apache/ap_whine1.wav", 0.5, 0.2, 0, 110 );
+
+		m_iSoundState = SND_CHANGE_PITCH; // hack for going through level transitions
+	}
+	else
+	{
+		CBaseEntity *pPlayer = NULL;
+
+		pPlayer = UTIL_FindEntityByClassname( NULL, "player" );
+		// UNDONE: this needs to send different sounds to every player for multiplayer.	
+		if (pPlayer)
+		{
+			float pitch = DotProduct( m_velocity - pPlayer->pev->velocity, (pPlayer->pev->origin - pev->origin).Normalize() );
+
+			pitch = (int)(100 + pitch / 75.0);
+
+			if (pitch > 250) 
+				pitch = 250;
+			if (pitch < 50)
+				pitch = 50;
+
+			if (pitch == 100)
+				pitch = 101;
+
+			if (pitch != m_iPitch)
+			{
+				m_iPitch = pitch;
+				EMIT_SOUND_DYN(ENT(pev), CHAN_STATIC, "apache/ap_rotor4.wav", 1.0, 0.15, SND_CHANGE_PITCH | SND_CHANGE_VOL, pitch);
+				// ALERT( at_console, "%.0f\n", pitch );
+			}
+		}
+		// EMIT_SOUND_DYN(ENT(pev), CHAN_STATIC, "apache/ap_whine1.wav", flVol, 0.2, SND_CHANGE_PITCH | SND_CHANGE_VOL, pitch);
+	}
+
+}
+
+
+void COsprey::HitTouch( CBaseEntity *pOther )
+{
+	pev->nextthink = gpGlobals->time + 2.0;
+}
+
+
+/*
+int COsprey::TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType )
+{
+	if (m_flRotortilt <= -90)
+	{
+		m_flRotortilt = 0;
+	}
+	else
+	{
+		m_flRotortilt -= 45;
+	}
+	SetBoneController( 0, m_flRotortilt );
+	return 0;
+}
+*/
+
+
+
+void COsprey :: Killed( entvars_t *pevAttacker, int iGib )
+{
+	pev->movetype = MOVETYPE_TOSS;
+	pev->gravity = 0.3;
+	pev->velocity = m_velocity;
+	pev->avelocity = Vector( RANDOM_FLOAT( -20, 20 ), 0, RANDOM_FLOAT( -50, 50 ) );
+	STOP_SOUND( ENT(pev), CHAN_STATIC, "apache/ap_rotor4.wav" );
+
+	UTIL_SetSize( pev, Vector( -32, -32, -64), Vector( 32, 32, 0) );
+	SetThink( &COsprey::DyingThink );
+	SetTouch( &COsprey::CrashTouch );
+	pev->nextthink = gpGlobals->time + 0.1;
+	pev->health = 0;
+	pev->takedamage = DAMAGE_NO;
+
+	m_startTime = gpGlobals->time + 4.0;
+}
+
+void COsprey::CrashTouch( CBaseEntity *pOther )
+{
+	// only crash if we hit something solid
+	if ( pOther->pev->solid == SOLID_BSP) 
+	{
+		SetTouch( NULL );
+		m_startTime = gpGlobals->time;
+		pev->nextthink = gpGlobals->time;
+		m_velocity = pev->velocity;
+	}
+}
+
+
+void COsprey :: DyingThink( void )
+{
+	StudioFrameAdvance( );
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	pev->avelocity = pev->avelocity * 1.02;
+
+	// still falling?
+	if (m_startTime > gpGlobals->time )
+	{
+		UTIL_MakeAimVectors( pev->angles );
+		ShowDamage( );
+
+		Vector vecSpot = pev->origin + pev->velocity * 0.2;
+
+		// random explosions
+		MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, vecSpot );
+			WRITE_BYTE( TE_EXPLOSION);		// This just makes a dynamic light now
+			WRITE_COORD( vecSpot.x + RANDOM_FLOAT( -150, 150 ));
+			WRITE_COORD( vecSpot.y + RANDOM_FLOAT( -150, 150 ));
+			WRITE_COORD( vecSpot.z + RANDOM_FLOAT( -150, -50 ));
+			WRITE_SHORT( g_sModelIndexFireball );
+			WRITE_BYTE( RANDOM_LONG(0,29) + 30  ); // scale * 10
+			WRITE_BYTE( 12  ); // framerate
+			WRITE_BYTE( TE_EXPLFLAG_NONE );
+		MESSAGE_END();
+
+		// lots of smoke
+		MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, vecSpot );
+			WRITE_BYTE( TE_SMOKE );
+			WRITE_COORD( vecSpot.x + RANDOM_FLOAT( -150, 150 ));
+			WRITE_COORD( vecSpot.y + RANDOM_FLOAT( -150, 150 ));
+			WRITE_COORD( vecSpot.z + RANDOM_FLOAT( -150, -50 ));
+			WRITE_SHORT( g_sModelIndexSmoke );
+			WRITE_BYTE( 100 ); // scale * 10
+			WRITE_BYTE( 10  ); // framerate
+		MESSAGE_END();
+
+
+		vecSpot = pev->origin + (pev->mins + pev->maxs) * 0.5;
+		MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, vecSpot );
+			WRITE_BYTE( TE_BREAKMODEL);
+
+			// position
+			WRITE_COORD( vecSpot.x );
+			WRITE_COORD( vecSpot.y );
+			WRITE_COORD( vecSpot.z );
+
+			// size
+			WRITE_COORD( 800 );
+			WRITE_COORD( 800 );
+			WRITE_COORD( 132 );
+
+			// velocity
+			WRITE_COORD( pev->velocity.x ); 
+			WRITE_COORD( pev->velocity.y );
+			WRITE_COORD( pev->velocity.z );
+
+			// randomization
+			WRITE_BYTE( 50 ); 
+
+			// Model
+			WRITE_SHORT( m_iTailGibs );	//model id#
+
+			// # of shards
+			WRITE_BYTE( 8 );	// let client decide
+
+			// duration
+			WRITE_BYTE( 200 );// 10.0 seconds
+
+			// flags
+
+			WRITE_BYTE( BREAK_METAL );
+		MESSAGE_END();
+
+
+
+		// don't stop it we touch a entity
+		pev->flags &= ~FL_ONGROUND;
+		pev->nextthink = gpGlobals->time + 0.2;
+		return;
+	}
+	else
+	{
+		Vector vecSpot = pev->origin + (pev->mins + pev->maxs) * 0.5;
+
+		/*
+		MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+			WRITE_BYTE( TE_EXPLOSION);		// This just makes a dynamic light now
+			WRITE_COORD( vecSpot.x );
+			WRITE_COORD( vecSpot.y );
+			WRITE_COORD( vecSpot.z + 512 );
+			WRITE_SHORT( m_iExplode );
+			WRITE_BYTE( 250 ); // scale * 10
+			WRITE_BYTE( 10  ); // framerate
+		MESSAGE_END();
+		*/
+
+		// gibs
+		MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, vecSpot );
+			WRITE_BYTE( TE_SPRITE );
+			WRITE_COORD( vecSpot.x );
+			WRITE_COORD( vecSpot.y );
+			WRITE_COORD( vecSpot.z + 512 );
+			WRITE_SHORT( m_iExplode );
+			WRITE_BYTE( 250 ); // scale * 10
+			WRITE_BYTE( 255 ); // brightness
+		MESSAGE_END();
+
+		/*
+		MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+			WRITE_BYTE( TE_SMOKE );
+			WRITE_COORD( vecSpot.x );
+			WRITE_COORD( vecSpot.y );
+			WRITE_COORD( vecSpot.z + 300 );
+			WRITE_SHORT( g_sModelIndexSmoke );
+			WRITE_BYTE( 250 ); // scale * 10
+			WRITE_BYTE( 6  ); // framerate
+		MESSAGE_END();
+		*/
+
+		// blast circle
+		MESSAGE_BEGIN( MSG_PAS, SVC_TEMPENTITY, pev->origin );
+			WRITE_BYTE( TE_BEAMCYLINDER );
+			WRITE_COORD( pev->origin.x);
+			WRITE_COORD( pev->origin.y);
+			WRITE_COORD( pev->origin.z);
+			WRITE_COORD( pev->origin.x);
+			WRITE_COORD( pev->origin.y);
+			WRITE_COORD( pev->origin.z + 2000 ); // reach damage radius over .2 seconds
+			WRITE_SHORT( m_iSpriteTexture );
+			WRITE_BYTE( 0 ); // startframe
+			WRITE_BYTE( 0 ); // framerate
+			WRITE_BYTE( 4 ); // life
+			WRITE_BYTE( 32 );  // width
+			WRITE_BYTE( 0 );   // noise
+			WRITE_BYTE( 255 );   // r, g, b
+			WRITE_BYTE( 255 );   // r, g, b
+			WRITE_BYTE( 192 );   // r, g, b
+			WRITE_BYTE( 128 ); // brightness
+			WRITE_BYTE( 0 );		// speed
+		MESSAGE_END();
+
+		EMIT_SOUND(ENT(pev), CHAN_STATIC, "weapons/mortarhit.wav", 1.0, 0.3);
+
+		RadiusDamage( pev->origin, pev, pev, 300, CLASS_NONE, DMG_BLAST );
+
+		// gibs
+		vecSpot = pev->origin + (pev->mins + pev->maxs) * 0.5;
+		MESSAGE_BEGIN( MSG_PAS, SVC_TEMPENTITY, vecSpot );
+			WRITE_BYTE( TE_BREAKMODEL);
+
+			// position
+			WRITE_COORD( vecSpot.x );
+			WRITE_COORD( vecSpot.y );
+			WRITE_COORD( vecSpot.z + 64);
+
+			// size
+			WRITE_COORD( 800 );
+			WRITE_COORD( 800 );
+			WRITE_COORD( 128 );
+
+			// velocity
+			WRITE_COORD( m_velocity.x ); 
+			WRITE_COORD( m_velocity.y );
+			WRITE_COORD( fabs( m_velocity.z ) * 0.25 );
+
+			// randomization
+			WRITE_BYTE( 40 ); 
+
+			// Model
+			WRITE_SHORT( m_iBodyGibs );	//model id#
+
+			// # of shards
+			WRITE_BYTE( 128 );
+
+			// duration
+			WRITE_BYTE( 200 );// 10.0 seconds
+
+			// flags
+
+			WRITE_BYTE( BREAK_METAL );
+		MESSAGE_END();
+
+		UTIL_Remove( this );
+	}
+}
+
+
+void COsprey :: ShowDamage( void )
+{
+	if (m_iDoLeftSmokePuff > 0 || RANDOM_LONG(0,99) > m_flLeftHealth)
+	{
+		Vector vecSrc = pev->origin + gpGlobals->v_right * -340;
+		MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, vecSrc );
+			WRITE_BYTE( TE_SMOKE );
+			WRITE_COORD( vecSrc.x );
+			WRITE_COORD( vecSrc.y );
+			WRITE_COORD( vecSrc.z );
+			WRITE_SHORT( g_sModelIndexSmoke );
+			WRITE_BYTE( RANDOM_LONG(0,9) + 20 ); // scale * 10
+			WRITE_BYTE( 12 ); // framerate
+		MESSAGE_END();
+		if (m_iDoLeftSmokePuff > 0)
+			m_iDoLeftSmokePuff--;
+	}
+	if (m_iDoRightSmokePuff > 0 || RANDOM_LONG(0,99) > m_flRightHealth)
+	{
+		Vector vecSrc = pev->origin + gpGlobals->v_right * 340;
+		MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, vecSrc );
+			WRITE_BYTE( TE_SMOKE );
+			WRITE_COORD( vecSrc.x );
+			WRITE_COORD( vecSrc.y );
+			WRITE_COORD( vecSrc.z );
+			WRITE_SHORT( g_sModelIndexSmoke );
+			WRITE_BYTE( RANDOM_LONG(0,9) + 20 ); // scale * 10
+			WRITE_BYTE( 12 ); // framerate
+		MESSAGE_END();
+		if (m_iDoRightSmokePuff > 0)
+			m_iDoRightSmokePuff--;
+	}
+}
+
+
+void COsprey::TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType)
+{
+	// ALERT( at_console, "%d %.0f\n", ptr->iHitgroup, flDamage );
+
+	// only so much per engine
+	if (ptr->iHitgroup == 3)
+	{
+		if (m_flRightHealth < 0)
+			return;
+		else
+			m_flRightHealth -= flDamage;
+		m_iDoLeftSmokePuff = 3 + (flDamage / 5.0);
+	}
+
+	if (ptr->iHitgroup == 2)
+	{
+		if (m_flLeftHealth < 0)
+			return;
+		else
+			m_flLeftHealth -= flDamage;
+		m_iDoRightSmokePuff = 3 + (flDamage / 5.0);
+	}
+
+	// hit hard, hits cockpit, hits engines
+	if (flDamage > 50 || ptr->iHitgroup == 1 || ptr->iHitgroup == 2 || ptr->iHitgroup == 3)
+	{
+		// ALERT( at_console, "%.0f\n", flDamage );
+		AddMultiDamage( pevAttacker, this, flDamage, bitsDamageType );
+	}
+	else
+	{
+		UTIL_Sparks( ptr->vecEndPos );
+	}
+}
+
+
+
+
+
diff --git a/main/source/dlls/pathcorner.cpp b/main/source/dlls/pathcorner.cpp
new file mode 100644
index 00000000..f8cc66b3
--- /dev/null
+++ b/main/source/dlls/pathcorner.cpp
@@ -0,0 +1,428 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// ========================== PATH_CORNER ===========================
+//
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "trains.h"
+#include "saverestore.h"
+
+class CPathCorner : public CPointEntity
+{
+public:
+	void Spawn( );
+	void KeyValue( KeyValueData* pkvd );
+	float GetDelay( void ) { return m_flWait; }
+//	void Touch( CBaseEntity *pOther );
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	
+	static	TYPEDESCRIPTION m_SaveData[];
+
+private:
+	float	m_flWait;
+};
+
+LINK_ENTITY_TO_CLASS( path_corner, CPathCorner );
+
+// Global Savedata for Delay
+TYPEDESCRIPTION	CPathCorner::m_SaveData[] = 
+{
+	DEFINE_FIELD( CPathCorner, m_flWait, FIELD_FLOAT ),
+};
+
+IMPLEMENT_SAVERESTORE( CPathCorner, CPointEntity );
+
+//
+// Cache user-entity-field values until spawn is called.
+//
+void CPathCorner :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "wait"))
+	{
+		m_flWait = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else 
+		CPointEntity::KeyValue( pkvd );
+}
+
+
+void CPathCorner :: Spawn( )
+{
+	ASSERTSZ(!FStringNull(pev->targetname), "path_corner without a targetname");
+}
+
+#if 0
+void CPathCorner :: Touch( CBaseEntity *pOther )
+{
+	entvars_t*		pevToucher = pOther->pev;
+		
+	if ( FBitSet ( pevToucher->flags, FL_MONSTER ) )
+	{// monsters don't navigate path corners based on touch anymore
+		return;
+	}
+
+	// If OTHER isn't explicitly looking for this path_corner, bail out
+	if ( pOther->m_pGoalEnt != this )
+	{
+		return;
+	}
+
+	// If OTHER has an enemy, this touch is incidental, ignore
+	if ( !FNullEnt(pevToucher->enemy) )
+	{
+		return;		// fighting, not following a path
+	}
+	
+	// UNDONE: support non-zero flWait
+	/*
+	if (m_flWait != 0)
+		ALERT(at_warning, "Non-zero path-cornder waits NYI");
+	*/
+
+	// Find the next "stop" on the path, make it the goal of the "toucher".
+	if (FStringNull(pev->target))
+	{
+		ALERT(at_warning, "PathCornerTouch: no next stop specified");
+	}
+
+	pOther->m_pGoalEnt = CBaseEntity::Instance( FIND_ENTITY_BY_TARGETNAME ( NULL, STRING(pev->target) ) );
+
+	// If "next spot" was not found (does not exist - level design error)
+	if ( !pOther->m_pGoalEnt )
+	{
+		ALERT(at_console, "PathCornerTouch--%s couldn't find next stop in path: %s", STRING(pev->classname), STRING(pev->target));
+		return;
+	}
+
+	// Turn towards the next stop in the path.
+	pevToucher->ideal_yaw = UTIL_VecToYaw ( pOther->m_pGoalEnt->pev->origin - pevToucher->origin );
+}
+#endif
+
+
+
+TYPEDESCRIPTION	CPathTrack::m_SaveData[] = 
+{
+	DEFINE_FIELD( CPathTrack, m_length, FIELD_FLOAT ),
+	DEFINE_FIELD( CPathTrack, m_pnext, FIELD_CLASSPTR ),
+	DEFINE_FIELD( CPathTrack, m_paltpath, FIELD_CLASSPTR ),
+	DEFINE_FIELD( CPathTrack, m_pprevious, FIELD_CLASSPTR ),
+	DEFINE_FIELD( CPathTrack, m_altName, FIELD_STRING ),
+};
+
+IMPLEMENT_SAVERESTORE( CPathTrack, CBaseEntity );
+LINK_ENTITY_TO_CLASS( path_track, CPathTrack );
+
+//
+// Cache user-entity-field values until spawn is called.
+//
+void CPathTrack :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "altpath"))
+	{
+		m_altName = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CPointEntity::KeyValue( pkvd );
+}
+
+void CPathTrack :: Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	int on;
+
+	// Use toggles between two paths
+	if ( m_paltpath )
+	{
+		on = !FBitSet( pev->spawnflags, SF_PATH_ALTERNATE );
+		if ( ShouldToggle( useType, on ) )
+		{
+			if ( on )
+				SetBits( pev->spawnflags, SF_PATH_ALTERNATE );
+			else
+				ClearBits( pev->spawnflags, SF_PATH_ALTERNATE );
+		}
+	}
+	else	// Use toggles between enabled/disabled
+	{
+		on = !FBitSet( pev->spawnflags, SF_PATH_DISABLED );
+
+		if ( ShouldToggle( useType, on ) )
+		{
+			if ( on )
+				SetBits( pev->spawnflags, SF_PATH_DISABLED );
+			else
+				ClearBits( pev->spawnflags, SF_PATH_DISABLED );
+		}
+	}
+}
+
+
+void CPathTrack :: Link( void  )
+{
+	edict_t *pentTarget;
+
+	if ( !FStringNull(pev->target) )
+	{
+		pentTarget = FIND_ENTITY_BY_TARGETNAME( NULL, STRING(pev->target) );
+		if ( !FNullEnt(pentTarget) )
+		{
+			m_pnext = CPathTrack::Instance( pentTarget );
+
+			if ( m_pnext )		// If no next pointer, this is the end of a path
+			{
+				m_pnext->SetPrevious( this );
+			}
+		}
+		else
+			ALERT( at_console, "Dead end link %s\n", STRING(pev->target) );
+	}
+
+	// Find "alternate" path
+	if ( m_altName )
+	{
+		pentTarget = FIND_ENTITY_BY_TARGETNAME( NULL, STRING(m_altName) );
+		if ( !FNullEnt(pentTarget) )
+		{
+			m_paltpath = CPathTrack::Instance( pentTarget );
+
+			if ( m_paltpath )		// If no next pointer, this is the end of a path
+			{
+				m_paltpath->SetPrevious( this );
+			}
+		}
+	}
+}
+
+
+void CPathTrack :: Spawn( void )
+{
+	pev->solid = SOLID_TRIGGER;
+	UTIL_SetSize(pev, Vector(-8, -8, -8), Vector(8, 8, 8));
+
+	m_pnext = NULL;
+	m_pprevious = NULL;
+// DEBUGGING CODE
+#if PATH_SPARKLE_DEBUG
+	SetThink( &CPathTrack::Sparkle );
+	pev->nextthink = gpGlobals->time + 0.5;
+#endif
+}
+
+
+void CPathTrack::Activate( void )
+{
+	if ( !FStringNull( pev->targetname ) )		// Link to next, and back-link
+		Link();
+}
+
+CPathTrack	*CPathTrack :: ValidPath( CPathTrack	*ppath, int testFlag )
+{
+	if ( !ppath )
+		return NULL;
+
+	if ( testFlag && FBitSet( ppath->pev->spawnflags, SF_PATH_DISABLED ) )
+		return NULL;
+
+	return ppath;
+}
+
+
+void CPathTrack :: Project( CPathTrack *pstart, CPathTrack *pend, Vector *origin, float dist )
+{
+	if ( pstart && pend )
+	{
+		Vector dir = (pend->pev->origin - pstart->pev->origin);
+		dir = dir.Normalize();
+		*origin = pend->pev->origin + dir * dist;
+	}
+}
+
+CPathTrack *CPathTrack::GetNext( void )
+{
+	if ( m_paltpath && FBitSet( pev->spawnflags, SF_PATH_ALTERNATE ) && !FBitSet( pev->spawnflags, SF_PATH_ALTREVERSE ) )
+		return m_paltpath;
+	
+	return m_pnext;
+}
+
+
+
+CPathTrack *CPathTrack::GetPrevious( void )
+{
+	if ( m_paltpath && FBitSet( pev->spawnflags, SF_PATH_ALTERNATE ) && FBitSet( pev->spawnflags, SF_PATH_ALTREVERSE ) )
+		return m_paltpath;
+	
+	return m_pprevious;
+}
+
+
+
+void CPathTrack::SetPrevious( CPathTrack *pprev )
+{
+	// Only set previous if this isn't my alternate path
+	if ( pprev && !FStrEq( STRING(pprev->pev->targetname), STRING(m_altName) ) )
+		m_pprevious = pprev;
+}
+
+
+// Assumes this is ALWAYS enabled
+CPathTrack *CPathTrack :: LookAhead( Vector *origin, float dist, int move )
+{
+	CPathTrack *pcurrent;
+	float originalDist = dist;
+	
+	pcurrent = this;
+	Vector currentPos = *origin;
+
+	if ( dist < 0 )		// Travelling backwards through path
+	{
+		dist = -dist;
+		while ( dist > 0 )
+		{
+			Vector dir = pcurrent->pev->origin - currentPos;
+			float length = dir.Length();
+			if ( !length )
+			{
+				if ( !ValidPath(pcurrent->GetPrevious(), move) ) 	// If there is no previous node, or it's disabled, return now.
+				{
+					if ( !move )
+						Project( pcurrent->GetNext(), pcurrent, origin, dist );
+					return NULL;
+				}
+				pcurrent = pcurrent->GetPrevious();
+			}
+			else if ( length > dist )	// enough left in this path to move
+			{
+				*origin = currentPos + (dir * (dist / length));
+				return pcurrent;
+			}
+			else
+			{
+				dist -= length;
+				currentPos = pcurrent->pev->origin;
+				*origin = currentPos;
+				if ( !ValidPath(pcurrent->GetPrevious(), move) )	// If there is no previous node, or it's disabled, return now.
+					return NULL;
+
+				pcurrent = pcurrent->GetPrevious();
+			}
+		}
+		*origin = currentPos;
+		return pcurrent;
+	}
+	else 
+	{
+		while ( dist > 0 )
+		{
+			if ( !ValidPath(pcurrent->GetNext(), move) )	// If there is no next node, or it's disabled, return now.
+			{
+				if ( !move )
+					Project( pcurrent->GetPrevious(), pcurrent, origin, dist );
+				return NULL;
+			}
+			Vector dir = pcurrent->GetNext()->pev->origin - currentPos;
+			float length = dir.Length();
+			if ( !length  && !ValidPath( pcurrent->GetNext()->GetNext(), move ) )
+			{
+				if ( dist == originalDist ) // HACK -- up against a dead end
+					return NULL;
+				return pcurrent;
+			}
+			if ( length > dist )	// enough left in this path to move
+			{
+				*origin = currentPos + (dir * (dist / length));
+				return pcurrent;
+			}
+			else
+			{
+				dist -= length;
+				currentPos = pcurrent->GetNext()->pev->origin;
+				pcurrent = pcurrent->GetNext();
+				*origin = currentPos;
+			}
+		}
+		*origin = currentPos;
+	}
+
+	return pcurrent;
+}
+
+	
+// Assumes this is ALWAYS enabled
+CPathTrack *CPathTrack :: Nearest( Vector origin )
+{
+	int			deadCount;
+	float		minDist, dist;
+	Vector		delta;
+	CPathTrack	*ppath, *pnearest;
+
+
+	delta = origin - pev->origin;
+	delta.z = 0;
+	minDist = delta.Length();
+	pnearest = this;
+	ppath = GetNext();
+
+	// Hey, I could use the old 2 racing pointers solution to this, but I'm lazy :)
+	deadCount = 0;
+	while ( ppath && ppath != this )
+	{
+		deadCount++;
+		if ( deadCount > 9999 )
+		{
+			ALERT( at_error, "Bad sequence of path_tracks from %s", STRING(pev->targetname) );
+			return NULL;
+		}
+		delta = origin - ppath->pev->origin;
+		delta.z = 0;
+		dist = delta.Length();
+		if ( dist < minDist )
+		{
+			minDist = dist;
+			pnearest = ppath;
+		}
+		ppath = ppath->GetNext();
+	}
+	return pnearest;
+}
+
+
+CPathTrack *CPathTrack::Instance( edict_t *pent )
+{ 
+	if ( FClassnameIs( pent, "path_track" ) )
+		return (CPathTrack *)GET_PRIVATE(pent);
+	return NULL;
+}
+
+
+	// DEBUGGING CODE
+#if PATH_SPARKLE_DEBUG
+void CPathTrack :: Sparkle( void )
+{
+
+	pev->nextthink = gpGlobals->time + 0.2;
+	if ( FBitSet( pev->spawnflags, SF_PATH_DISABLED ) )
+		UTIL_ParticleEffect(pev->origin, Vector(0,0,100), 210, 10);
+	else
+		UTIL_ParticleEffect(pev->origin, Vector(0,0,100), 84, 10);
+}
+#endif
+
diff --git a/main/source/dlls/plane.cpp b/main/source/dlls/plane.cpp
new file mode 100644
index 00000000..c96bf464
--- /dev/null
+++ b/main/source/dlls/plane.cpp
@@ -0,0 +1,60 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#include "extdll.h"
+#include "plane.h"
+
+//=========================================================
+// Plane
+//=========================================================
+CPlane :: CPlane ( void )
+{
+	m_fInitialized = FALSE;
+}
+
+//=========================================================
+// InitializePlane - Takes a normal for the plane and a
+// point on the plane and 
+//=========================================================
+void CPlane :: InitializePlane ( const Vector &vecNormal, const Vector &vecPoint )
+{
+	m_vecNormal = vecNormal;
+	m_flDist = DotProduct ( m_vecNormal, vecPoint );
+	m_fInitialized = TRUE;
+}
+
+
+//=========================================================
+// PointInFront - determines whether the given vector is 
+// in front of the plane. 
+//=========================================================
+BOOL CPlane :: PointInFront ( const Vector &vecPoint )
+{
+	float flFace;
+
+	if ( !m_fInitialized )
+	{
+		return FALSE;
+	}
+
+	flFace = DotProduct ( m_vecNormal, vecPoint ) - m_flDist;
+
+	if ( flFace >= 0 )
+	{
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
diff --git a/main/source/dlls/plane.h b/main/source/dlls/plane.h
new file mode 100644
index 00000000..ea2aa336
--- /dev/null
+++ b/main/source/dlls/plane.h
@@ -0,0 +1,43 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef PLANE_H
+#define PLANE_H
+
+//=========================================================
+// Plane
+//=========================================================
+class CPlane 
+{
+public:
+	CPlane ( void );
+
+	//=========================================================
+	// InitializePlane - Takes a normal for the plane and a
+	// point on the plane and 
+	//=========================================================
+	void InitializePlane ( const Vector &vecNormal, const Vector &vecPoint );
+
+	//=========================================================
+	// PointInFront - determines whether the given vector is 
+	// in front of the plane. 
+	//=========================================================
+	BOOL PointInFront ( const Vector &vecPoint );
+
+	Vector	m_vecNormal;
+	float	m_flDist;
+	BOOL	m_fInitialized;
+};
+
+#endif // PLANE_H
diff --git a/main/source/dlls/plats.cpp b/main/source/dlls/plats.cpp
new file mode 100644
index 00000000..01c1199c
--- /dev/null
+++ b/main/source/dlls/plats.cpp
@@ -0,0 +1,2266 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/*
+
+===== plats.cpp ========================================================
+
+  spawn, think, and touch functions for trains, etc
+
+*/
+
+//#include "extdll.h"
+//#include "util.h"
+//#include "cbase.h"
+//#include "trains.h"
+//#include "saverestore.h"
+#include <cmath>
+#include "dlls/plats.h"
+
+static void PlatSpawnInsideTrigger(entvars_t* pevPlatform);
+
+TYPEDESCRIPTION	CBasePlatTrain::m_SaveData[] = 
+{
+	DEFINE_FIELD( CBasePlatTrain, m_bMoveSnd, FIELD_CHARACTER ),
+	DEFINE_FIELD( CBasePlatTrain, m_bStopSnd, FIELD_CHARACTER ),
+	DEFINE_FIELD( CBasePlatTrain, m_volume, FIELD_FLOAT ),
+};
+
+IMPLEMENT_SAVERESTORE( CBasePlatTrain, CBaseToggle );
+
+void CBasePlatTrain :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "lip"))
+	{
+		m_flLip = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "wait"))
+	{
+		m_flWait = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "height"))
+	{
+		m_flHeight = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "rotation"))
+	{
+		m_vecFinalAngle.x = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "movesnd"))
+	{
+		m_bMoveSnd = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "stopsnd"))
+	{
+		m_bStopSnd = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "volume"))
+	{
+		m_volume = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseToggle::KeyValue( pkvd );
+}
+
+#define noiseMoving noise
+#define noiseArrived noise1
+
+void CBasePlatTrain::Precache( void )
+{
+// set the plat's "in-motion" sound
+	switch (m_bMoveSnd)
+	{
+	case	0:
+		pev->noiseMoving = MAKE_STRING("common/null.wav");
+		break;
+	case	1:
+		PRECACHE_SOUND ("plats/bigmove1.wav");
+		pev->noiseMoving = MAKE_STRING("plats/bigmove1.wav");
+		break;
+	case	2:
+		PRECACHE_SOUND ("plats/bigmove2.wav");
+		pev->noiseMoving = MAKE_STRING("plats/bigmove2.wav");
+		break;
+	case	3:
+		PRECACHE_SOUND ("plats/elevmove1.wav");
+		pev->noiseMoving = MAKE_STRING("plats/elevmove1.wav");
+		break;
+	case	4:
+		PRECACHE_SOUND ("plats/elevmove2.wav");
+		pev->noiseMoving = MAKE_STRING("plats/elevmove2.wav");
+		break;
+	case	5:
+		PRECACHE_SOUND ("plats/elevmove3.wav");
+		pev->noiseMoving = MAKE_STRING("plats/elevmove3.wav");
+		break;
+	case	6:
+		PRECACHE_SOUND ("plats/freightmove1.wav");
+		pev->noiseMoving = MAKE_STRING("plats/freightmove1.wav");
+		break;
+	case	7:
+		PRECACHE_SOUND ("plats/freightmove2.wav");
+		pev->noiseMoving = MAKE_STRING("plats/freightmove2.wav");
+		break;
+	case	8:
+		PRECACHE_SOUND ("plats/heavymove1.wav");
+		pev->noiseMoving = MAKE_STRING("plats/heavymove1.wav");
+		break;
+	case	9:
+		PRECACHE_SOUND ("plats/rackmove1.wav");
+		pev->noiseMoving = MAKE_STRING("plats/rackmove1.wav");
+		break;
+	case	10:
+		PRECACHE_SOUND ("plats/railmove1.wav");
+		pev->noiseMoving = MAKE_STRING("plats/railmove1.wav");
+		break;
+	case	11:
+		PRECACHE_SOUND ("plats/squeekmove1.wav");
+		pev->noiseMoving = MAKE_STRING("plats/squeekmove1.wav");
+		break;
+	case	12:
+		PRECACHE_SOUND ("plats/talkmove1.wav");
+		pev->noiseMoving = MAKE_STRING("plats/talkmove1.wav");
+		break;
+	case	13:
+		PRECACHE_SOUND ("plats/talkmove2.wav");
+		pev->noiseMoving = MAKE_STRING("plats/talkmove2.wav");
+		break;
+	default:
+		pev->noiseMoving = MAKE_STRING("common/null.wav");
+		break;
+	}
+
+// set the plat's 'reached destination' stop sound
+	switch (m_bStopSnd)
+	{
+	case	0:
+		pev->noiseArrived = MAKE_STRING("common/null.wav");
+		break;
+	case	1:
+		PRECACHE_SOUND ("plats/bigstop1.wav");
+		pev->noiseArrived = MAKE_STRING("plats/bigstop1.wav");
+		break;
+	case	2:
+		PRECACHE_SOUND ("plats/bigstop2.wav");
+		pev->noiseArrived = MAKE_STRING("plats/bigstop2.wav");
+		break;
+	case	3:
+		PRECACHE_SOUND ("plats/freightstop1.wav");
+		pev->noiseArrived = MAKE_STRING("plats/freightstop1.wav");
+		break;
+	case	4:
+		PRECACHE_SOUND ("plats/heavystop2.wav");
+		pev->noiseArrived = MAKE_STRING("plats/heavystop2.wav");
+		break;
+	case	5:
+		PRECACHE_SOUND ("plats/rackstop1.wav");
+		pev->noiseArrived = MAKE_STRING("plats/rackstop1.wav");
+		break;
+	case	6:
+		PRECACHE_SOUND ("plats/railstop1.wav");
+		pev->noiseArrived = MAKE_STRING("plats/railstop1.wav");
+		break;
+	case	7:
+		PRECACHE_SOUND ("plats/squeekstop1.wav");
+		pev->noiseArrived = MAKE_STRING("plats/squeekstop1.wav");
+		break;
+	case	8:
+		PRECACHE_SOUND ("plats/talkstop1.wav");
+		pev->noiseArrived = MAKE_STRING("plats/talkstop1.wav");
+		break;
+
+	default:
+		pev->noiseArrived = MAKE_STRING("common/null.wav");
+		break;
+	}
+}
+
+//
+//====================== PLAT code ====================================================
+//
+
+
+#define noiseMovement noise
+#define noiseStopMoving noise1
+
+class CFuncPlat : public CBasePlatTrain
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void Setup( void );
+
+	virtual void Blocked( CBaseEntity *pOther );
+
+
+	void EXPORT PlatUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+	void	EXPORT CallGoDown( void ) { GoDown(); }
+	void	EXPORT CallHitTop( void  ) { HitTop(); }
+	void	EXPORT CallHitBottom( void ) { HitBottom(); }
+
+	virtual void GoUp( void );
+	virtual void GoDown( void );
+	virtual void HitTop( void );
+	virtual void HitBottom( void );
+};
+LINK_ENTITY_TO_CLASS( func_plat, CFuncPlat );
+
+
+// UNDONE: Need to save this!!! It needs class & linkage
+class CPlatTrigger : public CBaseEntity
+{
+public:
+	virtual int	ObjectCaps( void ) { return (CBaseEntity :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION) | FCAP_DONT_SAVE; }
+	void SpawnInsideTrigger( CFuncPlat *pPlatform );
+	void Touch( CBaseEntity *pOther );
+	CFuncPlat *m_pPlatform;
+};
+
+
+
+/*QUAKED func_plat (0 .5 .8) ? PLAT_LOW_TRIGGER
+speed	default 150
+
+Plats are always drawn in the extended position, so they will light correctly.
+
+If the plat is the target of another trigger or button, it will start out disabled in
+the extended position until it is trigger, when it will lower and become a normal plat.
+
+If the "height" key is set, that will determine the amount the plat moves, instead of
+being implicitly determined by the model's height.
+
+Set "sounds" to one of the following:
+1) base fast
+2) chain slow
+*/
+
+void CFuncPlat :: Setup( void )
+{
+	//pev->noiseMovement = MAKE_STRING("plats/platmove1.wav");
+	//pev->noiseStopMoving = MAKE_STRING("plats/platstop1.wav");
+
+	if (m_flTLength == 0)
+		m_flTLength = 80;
+	if (m_flTWidth == 0)
+		m_flTWidth = 10;
+	
+	pev->angles		= g_vecZero;
+
+	pev->solid		= SOLID_BSP;
+	pev->movetype	= MOVETYPE_PUSH;
+
+	UTIL_SetOrigin(pev, pev->origin);		// set size and link into world
+	UTIL_SetSize(pev, pev->mins, pev->maxs);
+	SET_MODEL(ENT(pev), STRING(pev->model) );
+
+	// vecPosition1 is the top position, vecPosition2 is the bottom
+	m_vecPosition1 = pev->origin;
+	m_vecPosition2 = pev->origin;
+	if (m_flHeight != 0)
+		m_vecPosition2.z = pev->origin.z - m_flHeight;
+	else
+		m_vecPosition2.z = pev->origin.z - pev->size.z + 8;
+	if (pev->speed == 0)
+		pev->speed = 150;
+
+	if ( m_volume == 0 )
+		m_volume = 0.85;
+}
+
+
+void CFuncPlat :: Precache( )
+{
+	CBasePlatTrain::Precache();
+	//PRECACHE_SOUND("plats/platmove1.wav");
+	//PRECACHE_SOUND("plats/platstop1.wav");
+	if ( !IsTogglePlat() )
+		PlatSpawnInsideTrigger( pev );		// the "start moving" trigger
+}
+
+
+void CFuncPlat :: Spawn( )
+{
+	Setup();
+
+	Precache();
+
+	// If this platform is the target of some button, it starts at the TOP position,
+	// and is brought down by that button.  Otherwise, it starts at BOTTOM.
+	if ( !FStringNull(pev->targetname) )
+	{
+		UTIL_SetOrigin (pev, m_vecPosition1);
+		m_toggle_state = TS_AT_TOP;
+		SetUse( &CFuncPlat::PlatUse );
+	}
+	else
+	{
+		UTIL_SetOrigin (pev, m_vecPosition2);
+		m_toggle_state = TS_AT_BOTTOM;
+	}
+}
+
+
+
+static void PlatSpawnInsideTrigger(entvars_t* pevPlatform)
+{
+	GetClassPtr( (CPlatTrigger *)NULL)->SpawnInsideTrigger( GetClassPtr( (CFuncPlat *)pevPlatform ) );
+}
+		
+
+//
+// Create a trigger entity for a platform.
+//
+void CPlatTrigger :: SpawnInsideTrigger( CFuncPlat *pPlatform )
+{
+	m_pPlatform = pPlatform;
+	// Create trigger entity, "point" it at the owning platform, give it a touch method
+	pev->solid		= SOLID_TRIGGER;
+	pev->movetype	= MOVETYPE_NONE;
+	pev->origin = pPlatform->pev->origin;
+
+	// Establish the trigger field's size
+	Vector vecTMin = m_pPlatform->pev->mins + Vector ( 25 , 25 , 0 );
+	Vector vecTMax = m_pPlatform->pev->maxs + Vector ( 25 , 25 , 8 );
+	vecTMin.z = vecTMax.z - ( m_pPlatform->m_vecPosition1.z - m_pPlatform->m_vecPosition2.z + 8 );
+	if (m_pPlatform->pev->size.x <= 50)
+	{
+		vecTMin.x = (m_pPlatform->pev->mins.x + m_pPlatform->pev->maxs.x) / 2;
+		vecTMax.x = vecTMin.x + 1;
+	}
+	if (m_pPlatform->pev->size.y <= 50)
+	{
+		vecTMin.y = (m_pPlatform->pev->mins.y + m_pPlatform->pev->maxs.y) / 2;
+		vecTMax.y = vecTMin.y + 1;
+	}
+	UTIL_SetSize ( pev, vecTMin, vecTMax );
+}
+
+
+//
+// When the platform's trigger field is touched, the platform ???
+//
+void CPlatTrigger :: Touch( CBaseEntity *pOther )
+{
+	// Ignore touches by non-players
+	entvars_t*	pevToucher = pOther->pev;
+	if ( !FClassnameIs (pevToucher, "player") )
+		return;
+
+	// Ignore touches by corpses
+	if (!pOther->IsAlive())
+		return;
+	
+	// Make linked platform go up/down.
+	if (m_pPlatform->m_toggle_state == TS_AT_BOTTOM)
+		m_pPlatform->GoUp();
+	else if (m_pPlatform->m_toggle_state == TS_AT_TOP)
+		m_pPlatform->pev->nextthink = m_pPlatform->pev->ltime + 1;// delay going down
+}
+
+
+//
+// Used by SUB_UseTargets, when a platform is the target of a button.
+// Start bringing platform down.
+//
+void CFuncPlat :: PlatUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( IsTogglePlat() )
+	{
+		// Top is off, bottom is on
+		BOOL on = (m_toggle_state == TS_AT_BOTTOM) ? TRUE : FALSE;
+
+		if ( !ShouldToggle( useType, on ) )
+			return;
+
+		if (m_toggle_state == TS_AT_TOP)
+			GoDown();
+		else if ( m_toggle_state == TS_AT_BOTTOM )
+			GoUp();
+	}
+	else
+	{
+		SetUse( NULL );
+
+		if (m_toggle_state == TS_AT_TOP)
+			GoDown();
+	}
+}
+
+
+//
+// Platform is at top, now starts moving down.
+//
+void CFuncPlat :: GoDown( void )
+{
+	if(pev->noiseMovement)
+		EMIT_SOUND(ENT(pev), CHAN_STATIC, (char*)STRING(pev->noiseMovement), m_volume, ATTN_NORM);
+
+	ASSERT(m_toggle_state == TS_AT_TOP || m_toggle_state == TS_GOING_UP);
+	m_toggle_state = TS_GOING_DOWN;
+	SetMoveDone(&CFuncPlat::CallHitBottom);
+	LinearMove(m_vecPosition2, pev->speed);
+}
+
+
+//
+// Platform has hit bottom.  Stops and waits forever.
+//
+void CFuncPlat :: HitBottom( void )
+{
+	if(pev->noiseMovement)
+		STOP_SOUND(ENT(pev), CHAN_STATIC, (char*)STRING(pev->noiseMovement));
+
+	if (pev->noiseStopMoving)
+		EMIT_SOUND(ENT(pev), CHAN_WEAPON, (char*)STRING(pev->noiseStopMoving), m_volume, ATTN_NORM);
+
+	ASSERT(m_toggle_state == TS_GOING_DOWN);
+	m_toggle_state = TS_AT_BOTTOM;
+}
+
+
+//
+// Platform is at bottom, now starts moving up
+//
+void CFuncPlat :: GoUp( void )
+{
+	if (pev->noiseMovement)
+		EMIT_SOUND(ENT(pev), CHAN_STATIC, (char*)STRING(pev->noiseMovement), m_volume, ATTN_NORM);
+	
+	ASSERT(m_toggle_state == TS_AT_BOTTOM || m_toggle_state == TS_GOING_DOWN);
+	m_toggle_state = TS_GOING_UP;
+	SetMoveDone(&CFuncPlat::CallHitTop);
+	LinearMove(m_vecPosition1, pev->speed);
+}
+
+
+//
+// Platform has hit top.  Pauses, then starts back down again.
+//
+void CFuncPlat :: HitTop( void )
+{
+	if(pev->noiseMovement)
+		STOP_SOUND(ENT(pev), CHAN_STATIC, (char*)STRING(pev->noiseMovement));
+
+	if (pev->noiseStopMoving)
+		EMIT_SOUND(ENT(pev), CHAN_WEAPON, (char*)STRING(pev->noiseStopMoving), m_volume, ATTN_NORM);
+	
+	ASSERT(m_toggle_state == TS_GOING_UP);
+	m_toggle_state = TS_AT_TOP;
+
+	if ( !IsTogglePlat() )
+	{
+		// After a delay, the platform will automatically start going down again.
+		SetThink( &CFuncPlat::CallGoDown );
+		pev->nextthink = pev->ltime + 3;
+	}
+}
+
+
+void CFuncPlat :: Blocked( CBaseEntity *pOther )
+{
+	ALERT( at_aiconsole, "%s Blocked by %s\n", STRING(pev->classname), STRING(pOther->pev->classname) );
+	// Hurt the blocker a little
+	pOther->TakeDamage(pev, pev, 1, DMG_CRUSH);
+
+	if(pev->noiseMovement)
+		STOP_SOUND(ENT(pev), CHAN_STATIC, (char*)STRING(pev->noiseMovement));
+	
+	// Send the platform back where it came from
+	ASSERT(m_toggle_state == TS_GOING_UP || m_toggle_state == TS_GOING_DOWN);
+	if (m_toggle_state == TS_GOING_UP)
+		GoDown();
+	else if (m_toggle_state == TS_GOING_DOWN)
+		GoUp ();
+}
+
+
+class CFuncPlatRot : public CFuncPlat
+{
+public:
+	void Spawn( void );
+	void SetupRotation( void );
+
+	virtual void	GoUp( void );
+	virtual void	GoDown( void );
+	virtual void	HitTop( void );
+	virtual void	HitBottom( void );
+	
+	void			RotMove( Vector &destAngle, float time );
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	Vector	m_end, m_start;
+};
+LINK_ENTITY_TO_CLASS( func_platrot, CFuncPlatRot );
+TYPEDESCRIPTION	CFuncPlatRot::m_SaveData[] = 
+{
+	DEFINE_FIELD( CFuncPlatRot, m_end, FIELD_VECTOR ),
+	DEFINE_FIELD( CFuncPlatRot, m_start, FIELD_VECTOR ),
+};
+
+IMPLEMENT_SAVERESTORE( CFuncPlatRot, CFuncPlat );
+
+
+void CFuncPlatRot :: SetupRotation( void )
+{
+	if ( m_vecFinalAngle.x != 0 )		// This plat rotates too!
+	{
+		CBaseToggle :: AxisDir( pev );
+		m_start	= pev->angles;
+		m_end = pev->angles + pev->movedir * m_vecFinalAngle.x;
+	}
+	else
+	{
+		m_start = g_vecZero;
+		m_end = g_vecZero;
+	}
+	if ( !FStringNull(pev->targetname) )	// Start at top
+	{
+		pev->angles = m_end;
+	}
+}
+
+
+void CFuncPlatRot :: Spawn( void )
+{
+	CFuncPlat :: Spawn();
+	SetupRotation();
+}
+
+void CFuncPlatRot :: GoDown( void )
+{
+	CFuncPlat :: GoDown();
+	RotMove( m_start, pev->nextthink - pev->ltime );
+}
+
+
+//
+// Platform has hit bottom.  Stops and waits forever.
+//
+void CFuncPlatRot :: HitBottom( void )
+{
+	CFuncPlat :: HitBottom();
+	pev->avelocity = g_vecZero;
+	pev->angles = m_start;
+}
+
+
+//
+// Platform is at bottom, now starts moving up
+//
+void CFuncPlatRot :: GoUp( void )
+{
+	CFuncPlat :: GoUp();
+	RotMove( m_end, pev->nextthink - pev->ltime );
+}
+
+
+//
+// Platform has hit top.  Pauses, then starts back down again.
+//
+void CFuncPlatRot :: HitTop( void )
+{
+	CFuncPlat :: HitTop();
+	pev->avelocity = g_vecZero;
+	pev->angles = m_end;
+}
+
+
+void CFuncPlatRot :: RotMove( Vector &destAngle, float time )
+{
+	// set destdelta to the vector needed to move
+	Vector vecDestDelta = destAngle - pev->angles;
+
+	// Travel time is so short, we're practically there already;  so make it so.
+	if ( time >= 0.1)
+		pev->avelocity = vecDestDelta / time;
+	else
+	{
+		pev->avelocity = vecDestDelta;
+		pev->nextthink = pev->ltime + 1;
+	}
+}
+
+
+//
+//====================== TRAIN code ==================================================
+//
+
+class CFuncTrain : public CBasePlatTrain
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void Activate( void );
+	void OverrideReset( void );
+
+	void Blocked( CBaseEntity *pOther );
+	void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void KeyValue( KeyValueData *pkvd );
+
+
+	void EXPORT Wait( void );
+	void EXPORT Next( void );
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	entvars_t	*m_pevCurrentTarget;
+	int			m_sounds;
+	BOOL		m_activated;
+};
+
+LINK_ENTITY_TO_CLASS( func_train, CFuncTrain );
+TYPEDESCRIPTION	CFuncTrain::m_SaveData[] = 
+{
+	DEFINE_FIELD( CFuncTrain, m_sounds, FIELD_INTEGER ),
+	DEFINE_FIELD( CFuncTrain, m_pevCurrentTarget, FIELD_EVARS ),
+	DEFINE_FIELD( CFuncTrain, m_activated, FIELD_BOOLEAN ),
+};
+
+IMPLEMENT_SAVERESTORE( CFuncTrain, CBasePlatTrain );
+
+
+void CFuncTrain :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "sounds"))
+	{
+		m_sounds = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBasePlatTrain::KeyValue( pkvd );
+}
+
+
+void CFuncTrain :: Blocked( CBaseEntity *pOther )
+
+{
+	if ( gpGlobals->time < m_flActivateFinished)
+		return;
+
+	m_flActivateFinished = gpGlobals->time + 0.5;
+	
+	pOther->TakeDamage(pev, pev, pev->dmg, DMG_CRUSH);
+}
+
+
+void CFuncTrain :: Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( pev->spawnflags & SF_TRAIN_WAIT_RETRIGGER )
+	{
+		// Move toward my target
+		pev->spawnflags &= ~SF_TRAIN_WAIT_RETRIGGER;
+		Next();
+	}
+	else
+	{
+		pev->spawnflags |= SF_TRAIN_WAIT_RETRIGGER;
+		// Pop back to last target if it's available
+		if ( pev->enemy )
+			pev->target = pev->enemy->v.targetname;
+		pev->nextthink = 0;
+		pev->velocity = g_vecZero;
+		if ( pev->noiseStopMoving )
+			EMIT_SOUND (ENT(pev), CHAN_VOICE, (char*)STRING(pev->noiseStopMoving), m_volume, ATTN_NORM);
+	}
+}
+
+
+void CFuncTrain :: Wait( void )
+{
+	// Fire the pass target if there is one
+	if ( m_pevCurrentTarget->message )
+	{
+		FireTargets( STRING(m_pevCurrentTarget->message), this, this, USE_TOGGLE, 0 );
+		if ( FBitSet( m_pevCurrentTarget->spawnflags, SF_CORNER_FIREONCE ) )
+			m_pevCurrentTarget->message = 0;
+	}
+		
+	// need pointer to LAST target.
+	if ( FBitSet (m_pevCurrentTarget->spawnflags , SF_TRAIN_WAIT_RETRIGGER ) || ( pev->spawnflags & SF_TRAIN_WAIT_RETRIGGER ) )
+    {
+		pev->spawnflags |= SF_TRAIN_WAIT_RETRIGGER;
+        // clear the sound channel.
+		if ( pev->noiseMovement )
+			STOP_SOUND( edict(), CHAN_STATIC, (char*)STRING(pev->noiseMovement) );
+		if ( pev->noiseStopMoving )
+			EMIT_SOUND (ENT(pev), CHAN_VOICE, (char*)STRING(pev->noiseStopMoving), m_volume, ATTN_NORM);
+		pev->nextthink = 0;
+        return;
+    }
+    
+    // ALERT ( at_console, "%f\n", m_flWait );
+
+	if (m_flWait != 0)
+	{// -1 wait will wait forever!		
+		pev->nextthink = pev->ltime + m_flWait;
+		if ( pev->noiseMovement )
+			STOP_SOUND( edict(), CHAN_STATIC, (char*)STRING(pev->noiseMovement) );
+		if ( pev->noiseStopMoving )
+			EMIT_SOUND (ENT(pev), CHAN_VOICE, (char*)STRING(pev->noiseStopMoving), m_volume, ATTN_NORM);
+		SetThink( &CFuncTrain::Next );
+	}
+	else
+	{
+		Next();// do it RIGHT now!
+	}
+}
+
+
+//
+// Train next - path corner needs to change to next target 
+//
+void CFuncTrain :: Next( void )
+{
+	CBaseEntity	*pTarg;
+
+	
+	// now find our next target
+	pTarg = GetNextTarget();
+
+    if ( !pTarg )
+	{
+		if ( pev->noiseMovement )
+			STOP_SOUND( edict(), CHAN_STATIC, (char*)STRING(pev->noiseMovement) );
+		// Play stop sound
+		if ( pev->noiseStopMoving )
+			EMIT_SOUND (ENT(pev), CHAN_VOICE, (char*)STRING(pev->noiseStopMoving), m_volume, ATTN_NORM);
+		return;
+	}
+
+	// Save last target in case we need to find it again
+	pev->message = pev->target;
+
+	pev->target = pTarg->pev->target;
+	m_flWait = pTarg->GetDelay();
+
+	if ( m_pevCurrentTarget && m_pevCurrentTarget->speed != 0 )
+	{// don't copy speed from target if it is 0 (uninitialized)
+        pev->speed = m_pevCurrentTarget->speed;
+		ALERT( at_aiconsole, "Train %s speed to %4.2f\n", STRING(pev->targetname), pev->speed );
+	}
+	m_pevCurrentTarget = pTarg->pev;// keep track of this since path corners change our target for us.
+
+    pev->enemy = pTarg->edict();//hack
+
+	if(FBitSet(m_pevCurrentTarget->spawnflags, SF_CORNER_TELEPORT))
+	{
+		// Path corner has indicated a teleport to the next corner.
+		SetBits(pev->effects, EF_NOINTERP);
+		UTIL_SetOrigin(pev, pTarg->pev->origin - (pev->mins + pev->maxs)* 0.5);
+		Wait(); // Get on with doing the next path corner.
+	}
+	else
+	{
+		// Normal linear move.
+		
+		// CHANGED this from CHAN_VOICE to CHAN_STATIC around OEM beta time because trains should
+		// use CHAN_STATIC for their movement sounds to prevent sound field problems.
+		// this is not a hack or temporary fix, this is how things should be. (sjb).
+		if ( pev->noiseMovement )
+			STOP_SOUND( edict(), CHAN_STATIC, (char*)STRING(pev->noiseMovement) );
+		if ( pev->noiseMovement )
+			EMIT_SOUND (ENT(pev), CHAN_STATIC, (char*)STRING(pev->noiseMovement), m_volume, ATTN_NORM);
+		ClearBits(pev->effects, EF_NOINTERP);
+		SetMoveDone( &CFuncTrain::Wait );
+		LinearMove (pTarg->pev->origin - (pev->mins + pev->maxs)* 0.5, pev->speed);
+	}
+}
+
+
+void CFuncTrain :: Activate( void )
+{
+	// Not yet active, so teleport to first target
+	if ( !m_activated )
+	{
+		m_activated = TRUE;
+		entvars_t	*pevTarg = VARS( FIND_ENTITY_BY_TARGETNAME (NULL, STRING(pev->target) ) );
+		
+		pev->target = pevTarg->target;
+		m_pevCurrentTarget = pevTarg;// keep track of this since path corners change our target for us.
+    
+		UTIL_SetOrigin	(pev, pevTarg->origin - (pev->mins + pev->maxs) * 0.5 );
+		
+		if ( FStringNull(pev->targetname) )
+		{	// not triggered, so start immediately
+			pev->nextthink = pev->ltime + 0.1;
+			SetThink( &CFuncTrain::Next );
+		}
+		else
+			pev->spawnflags |= SF_TRAIN_WAIT_RETRIGGER;
+	}
+}
+
+/*QUAKED func_train (0 .5 .8) ?
+Trains are moving platforms that players can ride.
+The targets origin specifies the min point of the train at each corner.
+The train spawns at the first target it is pointing at.
+If the train is the target of a button or trigger, it will not begin moving until activated.
+speed	default 100
+dmg		default	2
+sounds
+1) ratchet metal
+*/
+
+void CFuncTrain :: Spawn( void )
+{
+	Precache();
+	if (pev->speed == 0)
+		pev->speed = 100;
+	
+	if ( FStringNull(pev->target) )
+		ALERT(at_console, "FuncTrain with no target");
+	
+	if (pev->dmg == 0)
+		pev->dmg = 2;
+	
+	pev->movetype = MOVETYPE_PUSH;
+	
+	if ( FBitSet (pev->spawnflags, SF_TRACKTRAIN_PASSABLE) )
+		pev->solid		= SOLID_NOT;
+	else
+		pev->solid		= SOLID_BSP;
+
+	SET_MODEL( ENT(pev), STRING(pev->model) );
+	UTIL_SetSize (pev, pev->mins, pev->maxs);
+	UTIL_SetOrigin(pev, pev->origin);
+
+	m_activated = FALSE;
+
+	if ( m_volume == 0 )
+		m_volume = 0.85;
+}
+
+
+void CFuncTrain::Precache( void )
+{
+	CBasePlatTrain::Precache();
+
+#if 0  // obsolete
+	// otherwise use preset sound
+	switch (m_sounds)
+	{
+	case 0:
+		pev->noise = 0;
+		pev->noise1 = 0;
+		break;
+
+	case 1:
+		PRECACHE_SOUND ("plats/train2.wav");
+		PRECACHE_SOUND ("plats/train1.wav");
+		pev->noise = MAKE_STRING("plats/train2.wav");
+		pev->noise1 = MAKE_STRING("plats/train1.wav");
+		break;
+
+	case 2:
+		PRECACHE_SOUND ("plats/platmove1.wav");
+		PRECACHE_SOUND ("plats/platstop1.wav");
+		pev->noise = MAKE_STRING("plats/platstop1.wav");
+		pev->noise1 = MAKE_STRING("plats/platmove1.wav");
+		break;
+	}
+#endif
+}
+
+
+void CFuncTrain::OverrideReset( void )
+{
+	CBaseEntity	*pTarg;
+
+	// Are we moving?
+	if ( pev->velocity != g_vecZero && pev->nextthink != 0 )
+	{
+		pev->target = pev->message;
+		// now find our next target
+		pTarg = GetNextTarget();
+		if ( !pTarg )
+		{
+			pev->nextthink = 0;
+			pev->velocity = g_vecZero;
+		}
+		else	// Keep moving for 0.1 secs, then find path_corner again and restart
+		{
+			SetThink( &CFuncTrain::Next );
+			pev->nextthink = pev->ltime + 0.1;
+		}
+	}
+}
+
+
+
+
+// ---------------------------------------------------------------------
+//
+// Track Train
+//
+// ---------------------------------------------------------------------
+
+TYPEDESCRIPTION	CFuncTrackTrain::m_SaveData[] = 
+{
+	DEFINE_FIELD( CFuncTrackTrain, m_ppath, FIELD_CLASSPTR ),
+	DEFINE_FIELD( CFuncTrackTrain, m_length, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncTrackTrain, m_height, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncTrackTrain, m_speed, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncTrackTrain, m_dir, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncTrackTrain, m_startSpeed, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncTrackTrain, m_controlMins, FIELD_VECTOR ),
+	DEFINE_FIELD( CFuncTrackTrain, m_controlMaxs, FIELD_VECTOR ),
+	DEFINE_FIELD( CFuncTrackTrain, m_sounds, FIELD_INTEGER ),
+	DEFINE_FIELD( CFuncTrackTrain, m_flVolume, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncTrackTrain, m_flBank, FIELD_FLOAT ),
+	DEFINE_FIELD( CFuncTrackTrain, m_oldSpeed, FIELD_FLOAT ),
+};
+
+IMPLEMENT_SAVERESTORE( CFuncTrackTrain, CBaseEntity );
+LINK_ENTITY_TO_CLASS( func_tracktrain, CFuncTrackTrain );
+
+void CFuncTrackTrain :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "wheels"))
+	{
+		m_length = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "height"))
+	{
+		m_height = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "startspeed"))
+	{
+		m_startSpeed = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "sounds"))
+	{
+		m_sounds = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "volume"))
+	{
+		m_flVolume = (float) (atoi(pkvd->szValue));
+		m_flVolume *= 0.1;
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "bank"))
+	{
+		m_flBank = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseEntity::KeyValue( pkvd );
+}
+
+
+void CFuncTrackTrain :: NextThink( float thinkTime, BOOL alwaysThink )
+{
+	if ( alwaysThink )
+		pev->flags |= FL_ALWAYSTHINK;
+	else
+		pev->flags &= ~FL_ALWAYSTHINK;
+
+	pev->nextthink = thinkTime;
+}
+
+
+void CFuncTrackTrain :: Blocked( CBaseEntity *pOther )
+{
+	entvars_t	*pevOther = pOther->pev;
+
+	// Blocker is on-ground on the train
+	if ( FBitSet( pevOther->flags, FL_ONGROUND ) && VARS(pevOther->groundentity) == pev )
+	{
+		float deltaSpeed = fabs(pev->speed);
+		if ( deltaSpeed > 50 )
+			deltaSpeed = 50;
+		if ( !pevOther->velocity.z )
+			pevOther->velocity.z += deltaSpeed;
+		return;
+	}
+	else
+		pevOther->velocity = (pevOther->origin - pev->origin ).Normalize() * pev->dmg;
+
+	ALERT( at_aiconsole, "TRAIN(%s): Blocked by %s (dmg:%.2f)\n", STRING(pev->targetname), STRING(pOther->pev->classname), pev->dmg );
+	if ( pev->dmg <= 0 )
+		return;
+	// we can't hurt this thing, so we're not concerned with it
+	pOther->TakeDamage(pev, pev, pev->dmg, DMG_CRUSH);
+}
+
+
+void CFuncTrackTrain :: Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( useType != USE_SET )
+	{
+		if ( !ShouldToggle( useType, (pev->speed != 0) ) )
+			return;
+
+		if ( pev->speed == 0 )
+		{
+			pev->speed = m_speed * m_dir;
+			
+			Next();
+		}
+		else
+		{
+			pev->speed = 0;
+			pev->velocity = g_vecZero;
+			pev->avelocity = g_vecZero;
+			StopSound();
+			SetThink( NULL );
+		}
+	}
+	else
+	{
+		float delta = value;
+
+		delta = ((int)(pev->speed * 4) / (int)m_speed)*0.25 + 0.25 * delta;
+		if ( delta > 1 )
+			delta = 1;
+		else if ( delta < -1 )
+			delta = -1;
+		if ( pev->spawnflags & SF_TRACKTRAIN_FORWARDONLY )
+		{
+			if ( delta < 0 )
+				delta = 0;
+		}
+		pev->speed = m_speed * delta;
+		Next();	
+		ALERT( at_aiconsole, "TRAIN(%s), speed to %.2f\n", STRING(pev->targetname), pev->speed );
+	}
+}
+
+
+static float Fix( float angle )
+{
+	while ( angle < 0 )
+		angle += 360;
+	while ( angle > 360 )
+		angle -= 360;
+
+	return angle;
+}
+
+
+static void FixupAngles( Vector &v )
+{
+	v.x = Fix( v.x );
+	v.y = Fix( v.y );
+	v.z = Fix( v.z );
+}
+
+#define TRAIN_STARTPITCH	60
+#define TRAIN_MAXPITCH		200
+#define TRAIN_MAXSPEED		1000	// approx max speed for sound pitch calculation
+
+void CFuncTrackTrain :: StopSound( void )
+{
+	// if sound playing, stop it
+	if (m_soundPlaying && pev->noise)
+	{
+		unsigned short us_encode;
+		unsigned short us_sound  = ( ( unsigned short )( m_sounds ) & 0x0007 ) << 12;
+
+		us_encode = us_sound;
+
+		PLAYBACK_EVENT_FULL( FEV_RELIABLE | FEV_UPDATE, edict(), m_usAdjustPitch, 0.0, 
+			(float *)&g_vecZero, (float *)&g_vecZero, 0.0, 0.0, us_encode, 0, 1, 0 );
+
+		/*
+		STOP_SOUND(ENT(pev), CHAN_STATIC, (char*)STRING(pev->noise));
+		*/
+		EMIT_SOUND_DYN(ENT(pev), CHAN_ITEM, "plats/ttrain_brake1.wav", m_flVolume, ATTN_NORM, 0, 100);
+	}
+
+	m_soundPlaying = 0;
+}
+
+// update pitch based on speed, start sound if not playing
+// NOTE: when train goes through transition, m_soundPlaying should go to 0, 
+// which will cause the looped sound to restart.
+
+void CFuncTrackTrain :: UpdateSound( void )
+{
+	float flpitch;
+	
+	if (!pev->noise)
+		return;
+
+	flpitch = TRAIN_STARTPITCH + (abs(pev->speed) * (TRAIN_MAXPITCH - TRAIN_STARTPITCH) / TRAIN_MAXSPEED);
+
+	if (!m_soundPlaying)
+	{
+		// play startup sound for train
+		EMIT_SOUND_DYN(ENT(pev), CHAN_ITEM, "plats/ttrain_start1.wav", m_flVolume, ATTN_NORM, 0, 100);
+		EMIT_SOUND_DYN(ENT(pev), CHAN_STATIC, (char*)STRING(pev->noise), m_flVolume, ATTN_NORM, 0, (int) flpitch);
+		m_soundPlaying = 1;
+	} 
+	else
+	{
+/*
+		// update pitch
+		EMIT_SOUND_DYN(ENT(pev), CHAN_STATIC, (char*)STRING(pev->noise), m_flVolume, ATTN_NORM, SND_CHANGE_PITCH, (int) flpitch);
+*/
+		// volume 0.0 - 1.0 - 6 bits
+		// m_sounds 3 bits
+		// flpitch = 6 bits
+		// 15 bits total
+
+		unsigned short us_encode;
+		unsigned short us_sound  = ( ( unsigned short )( m_sounds ) & 0x0007 ) << 12;
+		unsigned short us_pitch  = ( ( unsigned short )( flpitch / 10.0 ) & 0x003f ) << 6;
+		unsigned short us_volume = ( ( unsigned short )( m_flVolume * 40.0 ) & 0x003f );
+
+		us_encode = us_sound | us_pitch | us_volume;
+
+		PLAYBACK_EVENT_FULL( FEV_RELIABLE | FEV_UPDATE, edict(), m_usAdjustPitch, 0.0, 
+			(float *)&g_vecZero, (float *)&g_vecZero, 0.0, 0.0, us_encode, 0, 0, 0 );
+	}
+}
+
+
+void CFuncTrackTrain :: Next( void )
+{
+	float time = 0.5;
+
+	if ( !pev->speed )
+	{
+		ALERT( at_aiconsole, "TRAIN(%s): Speed is 0\n", STRING(pev->targetname) );
+		StopSound();
+		return;
+	}
+
+//	if ( !m_ppath )
+//		m_ppath = CPathTrack::Instance(FIND_ENTITY_BY_TARGETNAME( NULL, STRING(pev->target) ));
+	if ( !m_ppath )
+	{	
+		ALERT( at_aiconsole, "TRAIN(%s): Lost path\n", STRING(pev->targetname) );
+		StopSound();
+		return;
+	}
+
+	UpdateSound();
+
+	Vector nextPos = pev->origin;
+
+	nextPos.z -= m_height;
+	CPathTrack *pnext = m_ppath->LookAhead( &nextPos, pev->speed * 0.1, 1 );
+	nextPos.z += m_height;
+
+	pev->velocity = (nextPos - pev->origin) * 10;
+	Vector nextFront = pev->origin;
+
+	nextFront.z -= m_height;
+	if ( m_length > 0 )
+		m_ppath->LookAhead( &nextFront, m_length, 0 );
+	else
+		m_ppath->LookAhead( &nextFront, 100, 0 );
+	nextFront.z += m_height;
+
+	Vector delta = nextFront - pev->origin;
+	Vector angles = UTIL_VecToAngles( delta );
+	// The train actually points west
+	angles.y += 180;
+
+	// !!!  All of this crap has to be done to make the angles not wrap around, revisit this.
+	FixupAngles( angles );
+	FixupAngles( pev->angles );
+
+	if ( !pnext || (delta.x == 0 && delta.y == 0) )
+		angles = pev->angles;
+
+	float vy, vx;
+	if ( !(pev->spawnflags & SF_TRACKTRAIN_NOPITCH) )
+		vx = UTIL_AngleDistance( angles.x, pev->angles.x );
+	else
+		vx = 0;
+	vy = UTIL_AngleDistance( angles.y, pev->angles.y );
+
+	pev->avelocity.y = vy * 10;
+	pev->avelocity.x = vx * 10;
+
+	if ( m_flBank != 0 )
+	{
+		if ( pev->avelocity.y < -5 )
+			pev->avelocity.z = UTIL_AngleDistance( UTIL_ApproachAngle( -m_flBank, pev->angles.z, m_flBank*2 ), pev->angles.z);
+		else if ( pev->avelocity.y > 5 )
+			pev->avelocity.z = UTIL_AngleDistance( UTIL_ApproachAngle( m_flBank, pev->angles.z, m_flBank*2 ), pev->angles.z);
+		else
+			pev->avelocity.z = UTIL_AngleDistance( UTIL_ApproachAngle( 0, pev->angles.z, m_flBank*4 ), pev->angles.z) * 4;
+	}
+		
+	if ( pnext )
+	{
+		if ( pnext != m_ppath )
+		{
+			CPathTrack *pFire;
+			if ( pev->speed >= 0 )
+				pFire = pnext;
+			else 
+				pFire = m_ppath;
+
+			m_ppath = pnext;
+			// Fire the pass target if there is one
+			if ( pFire->pev->message )
+			{
+				FireTargets( STRING(pFire->pev->message), this, this, USE_TOGGLE, 0 );
+				if ( FBitSet( pFire->pev->spawnflags, SF_PATH_FIREONCE ) )
+					pFire->pev->message = 0;
+			}
+
+			if ( pFire->pev->spawnflags & SF_PATH_DISABLE_TRAIN )
+				pev->spawnflags |= SF_TRACKTRAIN_NOCONTROL;
+			
+			// Don't override speed if under user control
+			if ( pev->spawnflags & SF_TRACKTRAIN_NOCONTROL )
+			{
+				if ( pFire->pev->speed != 0 )
+				{// don't copy speed from target if it is 0 (uninitialized)
+					pev->speed = pFire->pev->speed;
+					ALERT( at_aiconsole, "TrackTrain %s speed to %4.2f\n", STRING(pev->targetname), pev->speed );
+				}
+			}
+
+		}
+		SetThink( &CFuncTrackTrain::Next );
+		NextThink( pev->ltime + time, TRUE );
+	}
+	else	// end of path, stop
+	{
+		StopSound();
+		pev->velocity = (nextPos - pev->origin);
+		pev->avelocity = g_vecZero;
+		float distance = pev->velocity.Length();
+		m_oldSpeed = pev->speed;
+
+
+		pev->speed = 0;
+		
+		// Move to the dead end
+		
+		// Are we there yet?
+		if ( distance > 0 )
+		{
+			// no, how long to get there?
+			time = distance / m_oldSpeed;
+			pev->velocity = pev->velocity * (m_oldSpeed / distance);
+			SetThink( &CFuncTrackTrain::DeadEnd );
+			NextThink( pev->ltime + time, FALSE );
+		}
+		else
+		{
+			DeadEnd();
+		}
+	}
+}
+
+
+void CFuncTrackTrain::DeadEnd( void )
+{
+	// Fire the dead-end target if there is one
+	CPathTrack *pTrack, *pNext;
+
+	pTrack = m_ppath;
+
+	ALERT( at_aiconsole, "TRAIN(%s): Dead end ", STRING(pev->targetname) );
+	// Find the dead end path node
+	// HACKHACK -- This is bugly, but the train can actually stop moving at a different node depending on it's speed
+	// so we have to traverse the list to it's end.
+	if ( pTrack )
+	{
+		if ( m_oldSpeed < 0 )
+		{
+			do
+			{
+				pNext = pTrack->ValidPath( pTrack->GetPrevious(), TRUE );
+				if ( pNext )
+					pTrack = pNext;
+			} while ( pNext );
+		}
+		else
+		{
+			do
+			{
+				pNext = pTrack->ValidPath( pTrack->GetNext(), TRUE );
+				if ( pNext )
+					pTrack = pNext;
+			} while ( pNext );
+		}
+	}
+
+	pev->velocity = g_vecZero;
+	pev->avelocity = g_vecZero;
+	if ( pTrack )
+	{
+		ALERT( at_aiconsole, "at %s\n", STRING(pTrack->pev->targetname) );
+		if ( pTrack->pev->netname )
+			FireTargets( STRING(pTrack->pev->netname), this, this, USE_TOGGLE, 0 );
+	}
+	else
+		ALERT( at_aiconsole, "\n" );
+}
+
+
+void CFuncTrackTrain :: SetControls( entvars_t *pevControls )
+{
+	Vector offset = pevControls->origin - pev->oldorigin;
+
+	m_controlMins = pevControls->mins + offset;
+	m_controlMaxs = pevControls->maxs + offset;
+}
+
+
+BOOL CFuncTrackTrain :: OnControls( entvars_t *pevTest )
+{
+	Vector offset = pevTest->origin - pev->origin;
+
+	if ( pev->spawnflags & SF_TRACKTRAIN_NOCONTROL )
+		return FALSE;
+
+	// Transform offset into local coordinates
+	UTIL_MakeVectors( pev->angles );
+	Vector local;
+	local.x = DotProduct( offset, gpGlobals->v_forward );
+	local.y = -DotProduct( offset, gpGlobals->v_right );
+	local.z = DotProduct( offset, gpGlobals->v_up );
+
+	if ( local.x >= m_controlMins.x && local.y >= m_controlMins.y && local.z >= m_controlMins.z &&
+		 local.x <= m_controlMaxs.x && local.y <= m_controlMaxs.y && local.z <= m_controlMaxs.z )
+		 return TRUE;
+
+	return FALSE;
+}
+
+
+void CFuncTrackTrain :: Find( void )
+{
+	m_ppath = CPathTrack::Instance(FIND_ENTITY_BY_TARGETNAME( NULL, STRING(pev->target) ));
+	if ( !m_ppath )
+		return;
+
+	entvars_t *pevTarget = m_ppath->pev;
+	if ( !FClassnameIs( pevTarget, "path_track" ) )
+	{
+		ALERT( at_error, "func_track_train must be on a path of path_track\n" );
+		m_ppath = NULL;
+		return;
+	}
+
+	Vector nextPos = pevTarget->origin;
+	nextPos.z += m_height;
+
+	Vector look = nextPos;
+	look.z -= m_height;
+	m_ppath->LookAhead( &look, m_length, 0 );
+	look.z += m_height;
+
+	pev->angles = UTIL_VecToAngles( look - nextPos );
+	// The train actually points west
+	pev->angles.y += 180;
+
+	if ( pev->spawnflags & SF_TRACKTRAIN_NOPITCH )
+		pev->angles.x = 0;
+    UTIL_SetOrigin( pev, nextPos );
+	NextThink( pev->ltime + 0.1, FALSE );
+	SetThink( &CFuncTrackTrain::Next );
+	pev->speed = m_startSpeed;
+
+	UpdateSound();
+}
+
+
+void CFuncTrackTrain :: NearestPath( void )
+{
+	CBaseEntity *pTrack = NULL;
+	CBaseEntity *pNearest = NULL;
+	float dist, closest;
+
+	closest = 1024;
+
+	while ((pTrack = UTIL_FindEntityInSphere( pTrack, pev->origin, 1024 )) != NULL)
+	{
+		// filter out non-tracks
+		if ( !(pTrack->pev->flags & (FL_CLIENT|FL_MONSTER)) && FClassnameIs( pTrack->pev, "path_track" ) )
+		{
+			dist = (pev->origin - pTrack->pev->origin).Length();
+			if ( dist < closest )
+			{
+				closest = dist;
+				pNearest = pTrack;
+			}
+		}
+	}
+
+	if ( !pNearest )
+	{
+		ALERT( at_console, "Can't find a nearby track !!!\n" );
+		SetThink(NULL);
+		return;
+	}
+
+	ALERT( at_aiconsole, "TRAIN: %s, Nearest track is %s\n", STRING(pev->targetname), STRING(pNearest->pev->targetname) );
+	// If I'm closer to the next path_track on this path, then it's my real path
+	pTrack = ((CPathTrack *)pNearest)->GetNext();
+	if ( pTrack )
+	{
+		if ( (pev->origin - pTrack->pev->origin).Length() < (pev->origin - pNearest->pev->origin).Length() )
+			pNearest = pTrack;
+	}
+
+	m_ppath = (CPathTrack *)pNearest;
+
+	if ( pev->speed != 0 )
+	{
+		NextThink( pev->ltime + 0.1, FALSE );
+		SetThink( &CFuncTrackTrain::Next );
+	}
+}
+
+
+void CFuncTrackTrain::OverrideReset( void )
+{
+	NextThink( pev->ltime + 0.1, FALSE );
+	SetThink( &CFuncTrackTrain::NearestPath );
+}
+
+
+CFuncTrackTrain *CFuncTrackTrain::Instance( edict_t *pent )
+{ 
+	if ( FClassnameIs( pent, "func_tracktrain" ) )
+		return (CFuncTrackTrain *)GET_PRIVATE(pent);
+	return NULL;
+}
+
+/*QUAKED func_train (0 .5 .8) ?
+Trains are moving platforms that players can ride.
+The targets origin specifies the min point of the train at each corner.
+The train spawns at the first target it is pointing at.
+If the train is the target of a button or trigger, it will not begin moving until activated.
+speed	default 100
+dmg		default	2
+sounds
+1) ratchet metal
+*/
+
+void CFuncTrackTrain :: Spawn( void )
+{
+	if ( pev->speed == 0 )
+		m_speed = 100;
+	else
+		m_speed = pev->speed;
+	
+	pev->speed = 0;
+	pev->velocity = g_vecZero;
+	pev->avelocity = g_vecZero;
+	pev->impulse = m_speed;
+
+	m_dir = 1;
+
+	if ( FStringNull(pev->target) )
+		ALERT( at_console, "FuncTrain with no target" );
+
+	if ( pev->spawnflags & SF_TRACKTRAIN_PASSABLE )
+		pev->solid = SOLID_NOT;
+	else
+		pev->solid = SOLID_BSP;
+	pev->movetype = MOVETYPE_PUSH;
+	
+	SET_MODEL( ENT(pev), STRING(pev->model) );
+
+	UTIL_SetSize( pev, pev->mins, pev->maxs );
+	UTIL_SetOrigin( pev, pev->origin );
+
+	// Cache off placed origin for train controls
+	pev->oldorigin = pev->origin;
+
+	m_controlMins = pev->mins;
+	m_controlMaxs = pev->maxs;
+	m_controlMaxs.z += 72;
+// start trains on the next frame, to make sure their targets have had
+// a chance to spawn/activate
+	NextThink( pev->ltime + 0.1, FALSE );
+	SetThink( &CFuncTrackTrain::Find );
+	Precache();
+}
+
+void CFuncTrackTrain :: Precache( void )
+{
+	if (m_flVolume == 0.0)
+		m_flVolume = 1.0;
+
+	switch (m_sounds)
+	{
+	default:
+		// no sound
+		pev->noise = 0;
+		break;
+	case 1: PRECACHE_SOUND("plats/ttrain1.wav"); pev->noise = MAKE_STRING("plats/ttrain1.wav");break;
+	case 2: PRECACHE_SOUND("plats/ttrain2.wav"); pev->noise = MAKE_STRING("plats/ttrain2.wav");break;
+	case 3: PRECACHE_SOUND("plats/ttrain3.wav"); pev->noise = MAKE_STRING("plats/ttrain3.wav");break; 
+	case 4: PRECACHE_SOUND("plats/ttrain4.wav"); pev->noise = MAKE_STRING("plats/ttrain4.wav");break;
+	case 5: PRECACHE_SOUND("plats/ttrain6.wav"); pev->noise = MAKE_STRING("plats/ttrain6.wav");break;
+	case 6: PRECACHE_SOUND("plats/ttrain7.wav"); pev->noise = MAKE_STRING("plats/ttrain7.wav");break;
+	}
+
+	PRECACHE_SOUND("plats/ttrain_brake1.wav");
+	PRECACHE_SOUND("plats/ttrain_start1.wav");
+
+	m_usAdjustPitch = PRECACHE_EVENT( 1, "events/train.sc" );
+}
+
+// This class defines the volume of space that the player must stand in to control the train
+class CFuncTrainControls : public CBaseEntity
+{
+public:
+	virtual int	ObjectCaps( void ) { return CBaseEntity :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+	void Spawn( void );
+	void EXPORT Find( void );
+};
+LINK_ENTITY_TO_CLASS( func_traincontrols, CFuncTrainControls );
+
+
+void CFuncTrainControls :: Find( void )
+{
+	edict_t *pTarget = NULL;
+
+	do 
+	{
+		pTarget = FIND_ENTITY_BY_TARGETNAME( pTarget, STRING(pev->target) );
+	} while ( !FNullEnt(pTarget) && !FClassnameIs(pTarget, "func_tracktrain") );
+
+	if ( FNullEnt( pTarget ) )
+	{
+		ALERT( at_console, "No train %s\n", STRING(pev->target) );
+		return;
+	}
+
+	CFuncTrackTrain *ptrain = CFuncTrackTrain::Instance(pTarget);
+	ptrain->SetControls( pev );
+	UTIL_Remove( this );
+}
+
+
+void CFuncTrainControls :: Spawn( void )
+{
+	pev->solid = SOLID_NOT;
+	pev->movetype = MOVETYPE_NONE;
+	SET_MODEL( ENT(pev), STRING(pev->model) );
+
+	UTIL_SetSize( pev, pev->mins, pev->maxs );
+	UTIL_SetOrigin( pev, pev->origin );
+	
+	SetThink( &CFuncTrainControls::Find );
+	pev->nextthink = gpGlobals->time;
+}
+
+
+
+// ----------------------------------------------------------------------------
+//
+// Track changer / Train elevator
+//
+// ----------------------------------------------------------------------------
+
+#define SF_TRACK_ACTIVATETRAIN		0x00000001
+#define SF_TRACK_RELINK				0x00000002
+#define SF_TRACK_ROTMOVE			0x00000004
+#define SF_TRACK_STARTBOTTOM		0x00000008
+#define SF_TRACK_DONT_MOVE			0x00000010
+
+//
+// This entity is a rotating/moving platform that will carry a train to a new track.
+// It must be larger in X-Y planar area than the train, since it must contain the
+// train within these dimensions in order to operate when the train is near it.
+//
+
+typedef enum { TRAIN_SAFE, TRAIN_BLOCKING, TRAIN_FOLLOWING } TRAIN_CODE;
+
+class CFuncTrackChange : public CFuncPlatRot
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+
+//	virtual void	Blocked( void );
+	virtual void	EXPORT GoUp( void );
+	virtual void	EXPORT GoDown( void );
+
+	void			KeyValue( KeyValueData* pkvd );
+	void			Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void			EXPORT Find( void );
+	TRAIN_CODE		EvaluateTrain( CPathTrack *pcurrent );
+	void			UpdateTrain( Vector &dest );
+	virtual void	HitBottom( void );
+	virtual void	HitTop( void );
+	void			Touch( CBaseEntity *pOther );
+	virtual void	UpdateAutoTargets( int toggleState );
+	virtual	BOOL	IsTogglePlat( void ) { return TRUE; }
+
+	void			DisableUse( void ) { m_use = 0; }
+	void			EnableUse( void ) { m_use = 1; }
+	int				UseEnabled( void ) { return m_use; }
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	virtual void	OverrideReset( void );
+
+
+	CPathTrack		*m_trackTop;
+	CPathTrack		*m_trackBottom;
+
+	CFuncTrackTrain	*m_train;
+
+	int				m_trackTopName;
+	int				m_trackBottomName;
+	int				m_trainName;
+	TRAIN_CODE		m_code;
+	int				m_targetState;
+	int				m_use;
+};
+LINK_ENTITY_TO_CLASS( func_trackchange, CFuncTrackChange );
+
+TYPEDESCRIPTION	CFuncTrackChange::m_SaveData[] = 
+{
+	DEFINE_GLOBAL_FIELD( CFuncTrackChange, m_trackTop, FIELD_CLASSPTR ),
+	DEFINE_GLOBAL_FIELD( CFuncTrackChange, m_trackBottom, FIELD_CLASSPTR ),
+	DEFINE_GLOBAL_FIELD( CFuncTrackChange, m_train, FIELD_CLASSPTR ),
+	DEFINE_GLOBAL_FIELD( CFuncTrackChange, m_trackTopName, FIELD_STRING ),
+	DEFINE_GLOBAL_FIELD( CFuncTrackChange, m_trackBottomName, FIELD_STRING ),
+	DEFINE_GLOBAL_FIELD( CFuncTrackChange, m_trainName, FIELD_STRING ),
+	DEFINE_FIELD( CFuncTrackChange, m_code, FIELD_INTEGER ),
+	DEFINE_FIELD( CFuncTrackChange, m_targetState, FIELD_INTEGER ),
+	DEFINE_FIELD( CFuncTrackChange, m_use, FIELD_INTEGER ),
+};
+
+IMPLEMENT_SAVERESTORE( CFuncTrackChange, CFuncPlatRot );
+
+void CFuncTrackChange :: Spawn( void )
+{
+	Setup();
+	if ( FBitSet( pev->spawnflags, SF_TRACK_DONT_MOVE ) )
+		m_vecPosition2.z = pev->origin.z;
+
+	SetupRotation();
+
+	if ( FBitSet( pev->spawnflags, SF_TRACK_STARTBOTTOM ) )
+	{
+		UTIL_SetOrigin (pev, m_vecPosition2);
+		m_toggle_state = TS_AT_BOTTOM;
+		pev->angles = m_start;
+		m_targetState = TS_AT_TOP;
+	}
+	else
+	{
+		UTIL_SetOrigin (pev, m_vecPosition1);
+		m_toggle_state = TS_AT_TOP;
+		pev->angles = m_end;
+		m_targetState = TS_AT_BOTTOM;
+	}
+
+	EnableUse();
+	pev->nextthink = pev->ltime + 2.0;
+	SetThink( &CFuncTrackChange::Find );
+	Precache();
+}
+
+void CFuncTrackChange :: Precache( void )
+{
+	// Can't trigger sound
+	PRECACHE_SOUND( "buttons/button11.wav" );
+	
+	CFuncPlatRot::Precache();
+}
+
+
+// UNDONE: Filter touches before re-evaluating the train.
+void CFuncTrackChange :: Touch( CBaseEntity *pOther )
+{
+#if 0
+	TRAIN_CODE code;
+	entvars_t *pevToucher = pOther->pev;
+#endif
+}
+
+
+
+void CFuncTrackChange :: KeyValue( KeyValueData *pkvd )
+{
+	if ( FStrEq(pkvd->szKeyName, "train") )
+	{
+		m_trainName = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if ( FStrEq(pkvd->szKeyName, "toptrack") )
+	{
+		m_trackTopName = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if ( FStrEq(pkvd->szKeyName, "bottomtrack") )
+	{
+		m_trackBottomName = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else
+	{
+		CFuncPlatRot::KeyValue( pkvd );		// Pass up to base class
+	}
+}
+
+
+void CFuncTrackChange::OverrideReset( void )
+{
+	pev->nextthink = pev->ltime + 1.0;
+	SetThink( &CFuncTrackChange::Find );
+}
+
+void CFuncTrackChange :: Find( void )
+{
+	// Find track entities
+	edict_t *target;
+
+	target = FIND_ENTITY_BY_TARGETNAME( NULL, STRING(m_trackTopName) );
+	if ( !FNullEnt(target) )
+	{
+		m_trackTop = CPathTrack::Instance( target );
+		target = FIND_ENTITY_BY_TARGETNAME( NULL, STRING(m_trackBottomName) );
+		if ( !FNullEnt(target) )
+		{
+			m_trackBottom = CPathTrack::Instance( target );
+			target = FIND_ENTITY_BY_TARGETNAME( NULL, STRING(m_trainName) );
+			if ( !FNullEnt(target) )
+			{
+				m_train = CFuncTrackTrain::Instance( FIND_ENTITY_BY_TARGETNAME( NULL, STRING(m_trainName) ) );
+				if ( !m_train )
+				{
+					ALERT( at_error, "Can't find train for track change! %s\n", STRING(m_trainName) );
+					return;
+				}
+				Vector center = (pev->absmin + pev->absmax) * 0.5;
+				m_trackBottom = m_trackBottom->Nearest( center );
+				m_trackTop = m_trackTop->Nearest( center );
+				UpdateAutoTargets( m_toggle_state );
+				SetThink( NULL );
+				return;
+			}
+			else
+			{
+				ALERT( at_error, "Can't find train for track change! %s\n", STRING(m_trainName) );
+				target = FIND_ENTITY_BY_TARGETNAME( NULL, STRING(m_trainName) );
+			}
+		}
+		else
+			ALERT( at_error, "Can't find bottom track for track change! %s\n", STRING(m_trackBottomName) );
+	}
+	else
+		ALERT( at_error, "Can't find top track for track change! %s\n", STRING(m_trackTopName) );
+}
+
+
+
+TRAIN_CODE CFuncTrackChange :: EvaluateTrain( CPathTrack *pcurrent )
+{
+	// Go ahead and work, we don't have anything to switch, so just be an elevator
+	if ( !pcurrent || !m_train )
+		return TRAIN_SAFE;
+
+	if ( m_train->m_ppath == pcurrent || (pcurrent->m_pprevious && m_train->m_ppath == pcurrent->m_pprevious) ||
+		 (pcurrent->m_pnext && m_train->m_ppath == pcurrent->m_pnext) )
+	{
+		if ( m_train->pev->speed != 0 )
+			return TRAIN_BLOCKING;
+
+		Vector dist = pev->origin - m_train->pev->origin;
+		float length = dist.Length2D();
+		if ( length < m_train->m_length )		// Empirically determined close distance
+			return TRAIN_FOLLOWING;
+		else if ( length > (150 + m_train->m_length) )
+			return TRAIN_SAFE;
+
+		return TRAIN_BLOCKING;
+	}
+	
+	return TRAIN_SAFE;
+}
+
+
+void CFuncTrackChange :: UpdateTrain( Vector &dest )
+{
+	float time = (pev->nextthink - pev->ltime);
+
+	m_train->pev->velocity = pev->velocity;
+	m_train->pev->avelocity = pev->avelocity;
+	m_train->NextThink( m_train->pev->ltime + time, FALSE );
+
+	// Attempt at getting the train to rotate properly around the origin of the trackchange
+	if ( time <= 0 )
+		return;
+
+	Vector offset = m_train->pev->origin - pev->origin;
+	Vector delta = dest - pev->angles;
+	// Transform offset into local coordinates
+	UTIL_MakeInvVectors( delta, gpGlobals );
+	Vector local;
+	local.x = DotProduct( offset, gpGlobals->v_forward );
+	local.y = DotProduct( offset, gpGlobals->v_right );
+	local.z = DotProduct( offset, gpGlobals->v_up );
+
+	local = local - offset;
+	m_train->pev->velocity = pev->velocity + (local * (1.0/time));
+}
+
+void CFuncTrackChange :: GoDown( void )
+{
+	if ( m_code == TRAIN_BLOCKING )
+		return;
+
+	// HitBottom may get called during CFuncPlat::GoDown(), so set up for that
+	// before you call GoDown()
+
+	UpdateAutoTargets( TS_GOING_DOWN );
+	// If ROTMOVE, move & rotate
+	if ( FBitSet( pev->spawnflags, SF_TRACK_DONT_MOVE ) )
+	{
+		SetMoveDone( &CFuncTrackChange::CallHitBottom );
+		m_toggle_state = TS_GOING_DOWN;
+		AngularMove( m_start, pev->speed );
+	}
+	else
+	{
+		CFuncPlat :: GoDown();
+		SetMoveDone( &CFuncTrackChange::CallHitBottom );
+		RotMove( m_start, pev->nextthink - pev->ltime );
+	}
+	// Otherwise, rotate first, move second
+
+	// If the train is moving with the platform, update it
+	if ( m_code == TRAIN_FOLLOWING )
+	{
+		UpdateTrain( m_start );
+		m_train->m_ppath = NULL;
+	}
+}
+
+
+//
+// Platform is at bottom, now starts moving up
+//
+void CFuncTrackChange :: GoUp( void )
+{
+	if ( m_code == TRAIN_BLOCKING )
+		return;
+
+	// HitTop may get called during CFuncPlat::GoUp(), so set up for that
+	// before you call GoUp();
+
+	UpdateAutoTargets( TS_GOING_UP );
+	if ( FBitSet( pev->spawnflags, SF_TRACK_DONT_MOVE ) )
+	{
+		m_toggle_state = TS_GOING_UP;
+		SetMoveDone( &CFuncTrackChange::CallHitTop );
+		AngularMove( m_end, pev->speed );
+	}
+	else
+	{
+		// If ROTMOVE, move & rotate
+		CFuncPlat :: GoUp();
+		SetMoveDone( &CFuncTrackChange::CallHitTop );
+		RotMove( m_end, pev->nextthink - pev->ltime );
+	}
+	
+	// Otherwise, move first, rotate second
+
+	// If the train is moving with the platform, update it
+	if ( m_code == TRAIN_FOLLOWING )
+	{
+		UpdateTrain( m_end );
+		m_train->m_ppath = NULL;
+	}
+}
+
+
+// Normal track change
+void CFuncTrackChange :: UpdateAutoTargets( int toggleState )
+{
+	if ( !m_trackTop || !m_trackBottom )
+		return;
+
+	if ( toggleState == TS_AT_TOP )
+		ClearBits( m_trackTop->pev->spawnflags, SF_PATH_DISABLED );
+	else
+		SetBits( m_trackTop->pev->spawnflags, SF_PATH_DISABLED );
+
+	if ( toggleState == TS_AT_BOTTOM )
+		ClearBits( m_trackBottom->pev->spawnflags, SF_PATH_DISABLED );
+	else
+		SetBits( m_trackBottom->pev->spawnflags, SF_PATH_DISABLED );
+}
+
+
+void CFuncTrackChange :: Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( m_toggle_state != TS_AT_TOP && m_toggle_state != TS_AT_BOTTOM )
+		return;
+
+	// If train is in "safe" area, but not on the elevator, play alarm sound
+	if ( m_toggle_state == TS_AT_TOP )
+		m_code = EvaluateTrain( m_trackTop );
+	else if ( m_toggle_state == TS_AT_BOTTOM )
+		m_code = EvaluateTrain( m_trackBottom );
+	else
+		m_code = TRAIN_BLOCKING;
+	if ( m_code == TRAIN_BLOCKING )
+	{
+		// Play alarm and return
+		EMIT_SOUND(ENT(pev), CHAN_VOICE, "buttons/button11.wav", 1, ATTN_NORM);
+		return;
+	}
+
+	// Otherwise, it's safe to move
+	// If at top, go down
+	// at bottom, go up
+
+	DisableUse();
+	if (m_toggle_state == TS_AT_TOP)
+		GoDown();
+	else
+		GoUp();
+}
+
+
+//
+// Platform has hit bottom.  Stops and waits forever.
+//
+void CFuncTrackChange :: HitBottom( void )
+{
+	CFuncPlatRot :: HitBottom();
+	if ( m_code == TRAIN_FOLLOWING )
+	{
+//		UpdateTrain();
+		m_train->SetTrack( m_trackBottom );
+	}
+	SetThink( NULL );
+	pev->nextthink = -1;
+
+	UpdateAutoTargets( m_toggle_state );
+
+	EnableUse();
+}
+
+
+//
+// Platform has hit bottom.  Stops and waits forever.
+//
+void CFuncTrackChange :: HitTop( void )
+{
+	CFuncPlatRot :: HitTop();
+	if ( m_code == TRAIN_FOLLOWING )
+	{
+//		UpdateTrain();
+		m_train->SetTrack( m_trackTop );
+	}
+	
+	// Don't let the plat go back down
+	SetThink( NULL );
+	pev->nextthink = -1;
+	UpdateAutoTargets( m_toggle_state );
+	EnableUse();
+}
+
+
+
+class CFuncTrackAuto : public CFuncTrackChange
+{
+public:
+	void			Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	virtual void	UpdateAutoTargets( int toggleState );
+};
+
+LINK_ENTITY_TO_CLASS( func_trackautochange, CFuncTrackAuto );
+
+// Auto track change
+void CFuncTrackAuto :: UpdateAutoTargets( int toggleState )
+{
+	CPathTrack *pTarget, *pNextTarget;
+
+	if ( !m_trackTop || !m_trackBottom )
+		return;
+
+	if ( m_targetState == TS_AT_TOP )
+	{
+		pTarget = m_trackTop->GetNext();
+		pNextTarget = m_trackBottom->GetNext();
+	}
+	else
+	{
+		pTarget = m_trackBottom->GetNext();
+		pNextTarget = m_trackTop->GetNext();
+	}
+	if ( pTarget )
+	{
+		ClearBits( pTarget->pev->spawnflags, SF_PATH_DISABLED );
+		if ( m_code == TRAIN_FOLLOWING && m_train && m_train->pev->speed == 0 )
+			m_train->Use( this, this, USE_ON, 0 );
+	}
+
+	if ( pNextTarget )
+		SetBits( pNextTarget->pev->spawnflags, SF_PATH_DISABLED );
+
+}
+
+
+void CFuncTrackAuto :: Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	CPathTrack *pTarget;
+
+	if ( !UseEnabled() )
+		return;
+
+	if ( m_toggle_state == TS_AT_TOP )
+		pTarget = m_trackTop;
+	else if ( m_toggle_state == TS_AT_BOTTOM )
+		pTarget = m_trackBottom;
+	else
+		pTarget = NULL;
+
+	if ( FClassnameIs( pActivator->pev, "func_tracktrain" ) )
+	{
+		m_code = EvaluateTrain( pTarget );
+		// Safe to fire?
+		if ( m_code == TRAIN_FOLLOWING && m_toggle_state != m_targetState )
+		{
+			DisableUse();
+			if (m_toggle_state == TS_AT_TOP)
+				GoDown();
+			else
+				GoUp();
+		}
+	}
+	else
+	{
+		if ( pTarget )
+			pTarget = pTarget->GetNext();
+		if ( pTarget && m_train->m_ppath != pTarget && ShouldToggle( useType, m_targetState ) )
+		{
+			if ( m_targetState == TS_AT_TOP )
+				m_targetState = TS_AT_BOTTOM;
+			else
+				m_targetState = TS_AT_TOP;
+		}
+
+		UpdateAutoTargets( m_targetState );
+	}
+}
+
+
+// ----------------------------------------------------------
+//
+//
+// pev->speed is the travel speed
+// pev->health is current health
+// pev->max_health is the amount to reset to each time it starts
+
+#define FGUNTARGET_START_ON			0x0001
+
+class CGunTarget : public CBaseMonster
+{
+public:
+	void			Spawn( void );
+	void			Activate( void );
+	void EXPORT		Next( void );
+	void EXPORT		Start( void );
+	void EXPORT		Wait( void );
+	void			Stop( void );
+
+	int				BloodColor( void ) { return DONT_BLEED; }
+	int				Classify( void ) { return CLASS_MACHINE; }
+	int				TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType );
+	void			Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	Vector			BodyTarget( const Vector &posSrc ) { return pev->origin; }
+
+	virtual int	ObjectCaps( void ) { return CBaseEntity :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+
+	static	TYPEDESCRIPTION m_SaveData[];
+
+private:
+	BOOL			m_on;
+};
+
+
+LINK_ENTITY_TO_CLASS( func_guntarget, CGunTarget );
+
+TYPEDESCRIPTION	CGunTarget::m_SaveData[] = 
+{
+	DEFINE_FIELD( CGunTarget, m_on, FIELD_BOOLEAN ),
+};
+
+IMPLEMENT_SAVERESTORE( CGunTarget, CBaseMonster );
+
+
+void CGunTarget::Spawn( void )
+{
+	pev->solid		= SOLID_BSP;
+	pev->movetype	= MOVETYPE_PUSH;
+
+	UTIL_SetOrigin(pev, pev->origin);
+	SET_MODEL(ENT(pev), STRING(pev->model) );
+
+	if ( pev->speed == 0 )
+		pev->speed = 100;
+
+	// Don't take damage until "on"
+	pev->takedamage = DAMAGE_NO;
+	pev->flags |= FL_MONSTER;
+
+	m_on = FALSE;
+	pev->max_health = pev->health;
+
+	if ( pev->spawnflags & FGUNTARGET_START_ON )
+	{
+		SetThink( &CGunTarget::Start );
+		pev->nextthink = pev->ltime + 0.3;
+	}
+}
+
+
+void CGunTarget::Activate( void )
+{
+	CBaseEntity	*pTarg;
+
+	// now find our next target
+	pTarg = GetNextTarget();
+	if ( pTarg )
+	{
+		m_hTargetEnt = pTarg;
+		UTIL_SetOrigin( pev, pTarg->pev->origin - (pev->mins + pev->maxs) * 0.5 );
+	}
+}
+
+
+void CGunTarget::Start( void )
+{
+	Use( this, this, USE_ON, 0 );
+}
+
+
+void CGunTarget::Next( void )
+{
+	SetThink( NULL );
+
+	m_hTargetEnt = GetNextTarget();
+	CBaseEntity *pTarget = m_hTargetEnt;
+	
+	if ( !pTarget )
+	{
+		Stop();
+		return;
+	}
+	SetMoveDone( &CGunTarget::Wait );
+	LinearMove( pTarget->pev->origin - (pev->mins + pev->maxs) * 0.5, pev->speed );
+}
+
+
+void CGunTarget::Wait( void )
+{
+	CBaseEntity *pTarget = m_hTargetEnt;
+	
+	if ( !pTarget )
+	{
+		Stop();
+		return;
+	}
+
+	// Fire the pass target if there is one
+	if ( pTarget->pev->message )
+	{
+		FireTargets( STRING(pTarget->pev->message), this, this, USE_TOGGLE, 0 );
+		if ( FBitSet( pTarget->pev->spawnflags, SF_CORNER_FIREONCE ) )
+			pTarget->pev->message = 0;
+	}
+		
+	m_flWait = pTarget->GetDelay();
+
+	pev->target = pTarget->pev->target;
+	SetThink( &CGunTarget::Next );
+	if (m_flWait != 0)
+	{// -1 wait will wait forever!		
+		pev->nextthink = pev->ltime + m_flWait;
+	}
+	else
+	{
+		Next();// do it RIGHT now!
+	}
+}
+
+
+void CGunTarget::Stop( void )
+{
+	pev->velocity = g_vecZero;
+	pev->nextthink = 0;
+	pev->takedamage = DAMAGE_NO;
+}
+
+
+int	CGunTarget::TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType )
+{
+	if ( pev->health > 0 )
+	{
+		pev->health -= flDamage;
+		if ( pev->health <= 0 )
+		{
+			pev->health = 0;
+			Stop();
+			if ( pev->message )
+				FireTargets( STRING(pev->message), this, this, USE_TOGGLE, 0 );
+		}
+	}
+	return 0;
+}
+
+
+void CGunTarget::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( !ShouldToggle( useType, m_on ) )
+		return;
+
+	if ( m_on )
+	{
+		Stop();
+	}
+	else
+	{
+		pev->takedamage = DAMAGE_AIM;
+		m_hTargetEnt = GetNextTarget();
+		if ( m_hTargetEnt == NULL )
+			return;
+		pev->health = pev->max_health;
+		Next();
+	}
+}
+
+
+
diff --git a/main/source/dlls/plats.h b/main/source/dlls/plats.h
new file mode 100644
index 00000000..53fed78d
--- /dev/null
+++ b/main/source/dlls/plats.h
@@ -0,0 +1,31 @@
+#ifndef CBASEPLATTRAIN_H
+#define CBASEPLATTRAIN_H
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "trains.h"
+#include "saverestore.h"
+
+#define SF_PLAT_TOGGLE		0x0001
+
+class CBasePlatTrain : public CBaseToggle
+{
+public:
+	virtual int	ObjectCaps( void ) { return CBaseEntity :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+	void KeyValue( KeyValueData* pkvd);
+	void Precache( void );
+
+	// This is done to fix spawn flag collisions between this class and a derived class
+	virtual BOOL IsTogglePlat( void ) { return (pev->spawnflags & SF_PLAT_TOGGLE) ? TRUE : FALSE; }
+
+	virtual int	Save( CSave &save );
+	virtual int	Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	BYTE	m_bMoveSnd;			// sound a plat makes while moving
+	BYTE	m_bStopSnd;			// sound a plat makes when it stops
+	float	m_volume;			// Sound volume
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/player.cpp b/main/source/dlls/player.cpp
new file mode 100644
index 00000000..4e6e64f5
--- /dev/null
+++ b/main/source/dlls/player.cpp
@@ -0,0 +1,5523 @@
+//
+//	Copyright (c) 1999, Valve LLC. All rights reserved.
+//	
+//	This product contains software technology licensed from Id 
+//	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+//	All Rights Reserved.
+//
+//	Use, distribution, and modification of this source code and/or resulting
+//	object code is restricted to non-commercial enhancements to products from
+//	Valve LLC.  All other use, distribution, or modification is prohibited
+//	without written permission from Valve LLC.
+//
+//
+//===== player.cpp ========================================================
+//
+//  functions dealing with the player
+//
+//
+// $Workfile: player.cpp $
+// $Date: 2002/11/22 21:12:55 $
+//
+//-------------------------------------------------------------------------------
+// $Log: player.cpp,v $
+// Revision 1.39  2002/11/22 21:12:55  Flayra
+// - Added DMG_IGNOREARMOR flag for players (used for ending game quickly)
+// - NULL checks for when owner of turret is removed after owner leaves team
+// - Send deploy weapon switch to player, when "lastinv" is executed
+//
+// Revision 1.38  2002/11/15 19:09:40  Flayra
+// - Reworked network metering to be easily toggleable
+//
+// Revision 1.37  2002/11/12 02:18:41  Flayra
+// - Beginning of HLTV changes
+//
+// Revision 1.36  2002/10/24 21:18:23  Flayra
+// - Major networking optimizations, to prevent overlflows after 20+ players on game reset
+//
+// Revision 1.35  2002/10/18 22:15:13  Flayra
+// - Fixed problem where level5 gets stuck with redemption
+//
+// Revision 1.34  2002/10/16 00:40:39  Flayra
+// - Fixed bug where player couldn't switch to next player while observing
+// - Propagate health as short for larger aliens
+// - Propagate auth mask
+//
+// Revision 1.33  2002/10/03 18:26:03  Flayra
+// - Removed HL "flatline" sound on death
+//
+// Revision 1.32  2002/09/23 22:03:50  Flayra
+// - Fixed problem where anims weren't playing properly in ready room
+// - Fixed problem where gestation model anims were playing before model was updated
+//
+// Revision 1.31  2002/08/31 18:01:18  Flayra
+// - Work at VALVe
+//
+// Revision 1.30  2002/08/09 00:17:03  Flayra
+// - Allow moveleft and moveright to change targets, allow players to have only one primary weapon
+//
+// Revision 1.29  2002/07/23 16:48:21  Flayra
+// - Refactored duplicate spawn code
+//
+// Revision 1.28  2002/07/10 14:36:09  Flayra
+// - Fixed bug that caused "Battery" message to be sent every tick (this never showed up in HL because they never had a float armor value?)
+//
+// Revision 1.27  2002/07/08 16:31:39  Flayra
+// - Level 1 doesn't make falling splat sound, dead players shouldn't block spawn points, replaced impulse hard-codes with constants
+//
+//===============================================================================
+#include <cmath>
+#include "extdll.h"
+#include "util.h"
+
+#include "cbase.h"
+#include "player.h"
+#include "trains.h"
+#include "nodes.h"
+#include "weapons.h"
+#include "soundent.h"
+#include "monsters.h"
+#include "shake.h"
+#include "decals.h"
+#include "gamerules.h"
+#include "mod/AvHEntities.h"
+#include "mod/AvHPlayer.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHServerVariables.h"
+#include "mod/AvHHulls.h"
+#include "mod/AvHMovementUtil.h"
+#include "game.h"
+#include "hltv.h"
+
+// #define DUCKFIX
+
+// Allow assignment within conditional
+#pragma warning (disable: 4706)
+
+extern DLL_GLOBAL ULONG		g_ulModelIndexPlayer;
+extern DLL_GLOBAL BOOL		g_fGameOver;
+extern DLL_GLOBAL	BOOL	g_fDrawLines;
+int gEvilImpulse101;
+extern DLL_GLOBAL int		g_iSkillLevel, gDisplayTitle;
+
+
+BOOL gInitHUD = TRUE;
+
+extern void CopyToBodyQue(entvars_t* pev);
+extern void respawn(entvars_t *pev, BOOL fCopyCorpse);
+extern Vector VecBModelOrigin(entvars_t *pevBModel );
+//extern edict_t *EntSelectSpawnPoint( CBaseEntity *pPlayer );
+
+// the world node graph
+extern CGraph	WorldGraph;
+
+#define TRAIN_ACTIVE	0x80 
+#define TRAIN_NEW		0xc0
+#define TRAIN_OFF		0x00
+#define TRAIN_NEUTRAL	0x01
+#define TRAIN_SLOW		0x02
+#define TRAIN_MEDIUM	0x03
+#define TRAIN_FAST		0x04 
+#define TRAIN_BACK		0x05
+
+#define	FLASH_DRAIN_TIME	 1.2 //100 units/3 minutes
+#define	FLASH_CHARGE_TIME	 0.2 // 100 units/20 seconds  (seconds per unit)
+
+// Global Savedata for player
+TYPEDESCRIPTION	CBasePlayer::m_playerSaveData[] = 
+{
+	//DEFINE_FIELD( CBasePlayer, m_flFlashLightTime, FIELD_TIME ),
+	//DEFINE_FIELD( CBasePlayer, m_iFlashBattery, FIELD_INTEGER ),
+
+	DEFINE_FIELD( CBasePlayer, m_afButtonLast, FIELD_INTEGER ),
+	DEFINE_FIELD( CBasePlayer, m_afButtonPressed, FIELD_INTEGER ),
+	DEFINE_FIELD( CBasePlayer, m_afButtonReleased, FIELD_INTEGER ),
+
+	DEFINE_ARRAY( CBasePlayer, m_rgItems, FIELD_INTEGER, MAX_ITEMS ),
+	DEFINE_FIELD( CBasePlayer, m_afPhysicsFlags, FIELD_INTEGER ),
+
+	DEFINE_FIELD( CBasePlayer, m_flTimeStepSound, FIELD_TIME ),
+	DEFINE_FIELD( CBasePlayer, m_flTimeWeaponIdle, FIELD_TIME ),
+	DEFINE_FIELD( CBasePlayer, m_flSwimTime, FIELD_TIME ),
+	DEFINE_FIELD( CBasePlayer, m_flDuckTime, FIELD_TIME ),
+	DEFINE_FIELD( CBasePlayer, m_flWallJumpTime, FIELD_TIME ),
+
+	DEFINE_FIELD( CBasePlayer, m_flSuitUpdate, FIELD_TIME ),
+	DEFINE_ARRAY( CBasePlayer, m_rgSuitPlayList, FIELD_INTEGER, CSUITPLAYLIST ),
+	DEFINE_FIELD( CBasePlayer, m_iSuitPlayNext, FIELD_INTEGER ),
+	DEFINE_ARRAY( CBasePlayer, m_rgiSuitNoRepeat, FIELD_INTEGER, CSUITNOREPEAT ),
+	DEFINE_ARRAY( CBasePlayer, m_rgflSuitNoRepeatTime, FIELD_TIME, CSUITNOREPEAT ),
+	DEFINE_FIELD( CBasePlayer, m_lastDamageAmount, FIELD_INTEGER ),
+
+	DEFINE_ARRAY( CBasePlayer, m_rgpPlayerItems, FIELD_CLASSPTR, MAX_ITEM_TYPES ),
+	DEFINE_FIELD( CBasePlayer, m_pActiveItem, FIELD_CLASSPTR ),
+	DEFINE_FIELD( CBasePlayer, m_pLastItem, FIELD_CLASSPTR ),
+	
+	DEFINE_ARRAY( CBasePlayer, m_rgAmmo, FIELD_INTEGER, MAX_AMMO_SLOTS ),
+	DEFINE_FIELD( CBasePlayer, m_idrowndmg, FIELD_INTEGER ),
+	DEFINE_FIELD( CBasePlayer, m_idrownrestored, FIELD_INTEGER ),
+	DEFINE_FIELD( CBasePlayer, m_tSneaking, FIELD_TIME ),
+
+	DEFINE_FIELD( CBasePlayer, m_iTrain, FIELD_INTEGER ),
+	DEFINE_FIELD( CBasePlayer, m_bitsHUDDamage, FIELD_INTEGER ),
+	DEFINE_FIELD( CBasePlayer, m_flFallVelocity, FIELD_FLOAT ),
+	DEFINE_FIELD( CBasePlayer, m_iTargetVolume, FIELD_INTEGER ),
+	DEFINE_FIELD( CBasePlayer, m_iWeaponVolume, FIELD_INTEGER ),
+	DEFINE_FIELD( CBasePlayer, m_iExtraSoundTypes, FIELD_INTEGER ),
+	DEFINE_FIELD( CBasePlayer, m_iWeaponFlash, FIELD_INTEGER ),
+	DEFINE_FIELD( CBasePlayer, m_fLongJump, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CBasePlayer, m_fInitHUD, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CBasePlayer, m_tbdPrev, FIELD_TIME ),
+
+	DEFINE_FIELD( CBasePlayer, m_pTank, FIELD_EHANDLE ),
+	DEFINE_FIELD( CBasePlayer, m_iHideHUD, FIELD_INTEGER ),
+	DEFINE_FIELD( CBasePlayer, m_iFOV, FIELD_INTEGER ),
+	
+	//DEFINE_FIELD( CBasePlayer, m_fDeadTime, FIELD_FLOAT ), // only used in multiplayer games
+	//DEFINE_FIELD( CBasePlayer, m_fGameHUDInitialized, FIELD_INTEGER ), // only used in multiplayer games
+	//DEFINE_FIELD( CBasePlayer, m_flStopExtraSoundTime, FIELD_TIME ),
+	// DEFINE_FIELD( CBasePlayer, m_fKnownItem, FIELD_INTEGER ), // reset to zero on load
+	//DEFINE_FIELD( CBasePlayer, m_iPlayerSound, FIELD_INTEGER ),	// Don't restore, set in Precache()
+	//DEFINE_FIELD( CBasePlayer, m_pentSndLast, FIELD_EDICT ),	// Don't restore, client needs reset
+	//DEFINE_FIELD( CBasePlayer, m_flSndRoomtype, FIELD_FLOAT ),	// Don't restore, client needs reset
+	//DEFINE_FIELD( CBasePlayer, m_flSndRange, FIELD_FLOAT ),	// Don't restore, client needs reset
+	//DEFINE_FIELD( CBasePlayer, m_fNewAmmo, FIELD_INTEGER ), // Don't restore, client needs reset
+	//DEFINE_FIELD( CBasePlayer, m_flgeigerRange, FIELD_FLOAT ),	// Don't restore, reset in Precache()
+	//DEFINE_FIELD( CBasePlayer, m_flgeigerDelay, FIELD_FLOAT ),	// Don't restore, reset in Precache()
+	//DEFINE_FIELD( CBasePlayer, m_igeigerRangePrev, FIELD_FLOAT ),	// Don't restore, reset in Precache()
+	//DEFINE_FIELD( CBasePlayer, m_iStepLeft, FIELD_INTEGER ), // Don't need to restore
+	//DEFINE_ARRAY( CBasePlayer, m_szTextureName, FIELD_CHARACTER, CBTEXTURENAMEMAX ), // Don't need to restore
+	//DEFINE_FIELD( CBasePlayer, m_chTextureType, FIELD_CHARACTER ), // Don't need to restore
+	//DEFINE_FIELD( CBasePlayer, m_fNoPlayerSound, FIELD_BOOLEAN ), // Don't need to restore, debug
+	//DEFINE_FIELD( CBasePlayer, m_iUpdateTime, FIELD_INTEGER ), // Don't need to restore
+	//DEFINE_FIELD( CBasePlayer, m_iClientHealth, FIELD_INTEGER ), // Don't restore, client needs reset
+	//DEFINE_FIELD( CBasePlayer, m_iClientBattery, FIELD_INTEGER ), // Don't restore, client needs reset
+	//DEFINE_FIELD( CBasePlayer, m_iClientHideHUD, FIELD_INTEGER ), // Don't restore, client needs reset
+	//DEFINE_FIELD( CBasePlayer, m_fWeapon, FIELD_BOOLEAN ),  // Don't restore, client needs reset
+	//DEFINE_FIELD( CBasePlayer, m_nCustomSprayFrames, FIELD_INTEGER ), // Don't restore, depends on server message after spawning and only matters in multiplayer
+	//DEFINE_FIELD( CBasePlayer, m_vecAutoAim, FIELD_VECTOR ), // Don't save/restore - this is recomputed
+	//DEFINE_ARRAY( CBasePlayer, m_rgAmmoLast, FIELD_INTEGER, MAX_AMMO_SLOTS ), // Don't need to restore
+	//DEFINE_FIELD( CBasePlayer, m_fOnTarget, FIELD_BOOLEAN ), // Don't need to restore
+	//DEFINE_FIELD( CBasePlayer, m_nCustomSprayFrames, FIELD_INTEGER ), // Don't need to restore
+	
+};	
+
+
+int giPrecacheGrunt = 0;
+int gmsgShake = 0;
+int gmsgFade = 0;
+int gmsgSelAmmo = 0;
+//int gmsgFlashlight = 0;
+//int gmsgFlashBattery = 0;
+int gmsgResetHUD = 0;
+int gmsgInitHUD = 0;
+int gmsgShowGameTitle = 0;
+int gmsgCurWeapon = 0;
+int gmsgHealth = 0;
+int gmsgDamage = 0;
+int gmsgBattery = 0;
+int gmsgTrain = 0;
+int gmsgLogo = 0;
+int gmsgWeaponList = 0;
+int gmsgAmmoX = 0;
+int gmsgHudText = 0;
+int gmsgHudText2 = 0;
+int gmsgDeathMsg = 0;
+int gmsgScoreInfo = 0;
+int gmsgTeamInfo = 0;
+int gmsgTeamScore = 0;
+int gmsgGameMode = 0;
+int gmsgMOTD = 0;
+int gmsgServerName = 0;
+int gmsgAmmoPickup = 0;
+int gmsgWeapPickup = 0;
+int gmsgItemPickup = 0;
+int gmsgHideWeapon = 0;
+int gmsgSetCurWeap = 0;
+int gmsgSayText = 0;
+int gmsgTextMsg = 0;
+int gmsgSetFOV = 0;
+int gmsgShowMenu = 0;
+int gmsgGeigerRange = 0;
+int gmsgTeamNames = 0;
+int gmsgStatusText = 0;
+int gmsgStatusValue = 0; 
+//int gmsgSendCorpse = 0;
+//LINK_ENTITY_TO_CLASS( player, CBasePlayer );
+
+void CBasePlayer :: Pain( void )
+{
+	float	flRndSound;//sound randomizer
+
+	flRndSound = RANDOM_FLOAT ( 0 , 1 ); 
+	
+	if ( flRndSound <= 0.33 )
+		EMIT_SOUND(ENT(pev), CHAN_VOICE, "player/pl_pain5.wav", 1, ATTN_NORM);
+	else if ( flRndSound <= 0.66 )	
+		EMIT_SOUND(ENT(pev), CHAN_VOICE, "player/pl_pain6.wav", 1, ATTN_NORM);
+	else
+		EMIT_SOUND(ENT(pev), CHAN_VOICE, "player/pl_pain7.wav", 1, ATTN_NORM);
+}
+
+/* 
+ *
+ */
+Vector VecVelocityForDamage(float flDamage)
+{
+	Vector vec(RANDOM_FLOAT(-100,100), RANDOM_FLOAT(-100,100), RANDOM_FLOAT(200,300));
+
+	if (flDamage > -50)
+		vec = vec * 0.7;
+	else if (flDamage > -200)
+		vec = vec * 2;
+	else
+		vec = vec * 10;
+	
+	return vec;
+}
+
+#if 0 /*
+static void ThrowGib(entvars_t *pev, char *szGibModel, float flDamage)
+{
+	edict_t *pentNew = CREATE_ENTITY();
+	entvars_t *pevNew = VARS(pentNew);
+
+	pevNew->origin = pev->origin;
+	SET_MODEL(ENT(pevNew), szGibModel);
+	UTIL_SetSize(pevNew, g_vecZero, g_vecZero);
+
+	pevNew->velocity		= VecVelocityForDamage(flDamage);
+	pevNew->movetype		= MOVETYPE_BOUNCE;
+	pevNew->solid			= SOLID_NOT;
+	pevNew->avelocity.x		= RANDOM_FLOAT(0,600);
+	pevNew->avelocity.y		= RANDOM_FLOAT(0,600);
+	pevNew->avelocity.z		= RANDOM_FLOAT(0,600);
+	CHANGE_METHOD(ENT(pevNew), em_think, SUB_Remove);
+	pevNew->ltime		= gpGlobals->time;
+	pevNew->nextthink	= gpGlobals->time + RANDOM_FLOAT(10,20);
+	pevNew->frame		= 0;
+	pevNew->flags		= 0;
+}
+	
+	
+static void ThrowHead(entvars_t *pev, char *szGibModel, floatflDamage)
+{
+	SET_MODEL(ENT(pev), szGibModel);
+	pev->frame			= 0;
+	pev->nextthink		= -1;
+	pev->movetype		= MOVETYPE_BOUNCE;
+	pev->takedamage		= DAMAGE_NO;
+	pev->solid			= SOLID_NOT;
+	pev->view_ofs		= Vector(0,0,8);
+	UTIL_SetSize(pev, Vector(-16,-16,0), Vector(16,16,56));
+	pev->velocity		= VecVelocityForDamage(flDamage);
+	pev->avelocity		= RANDOM_FLOAT(-1,1) * Vector(0,600,0);
+	pev->origin.z -= 24;
+	ClearBits(pev->flags, FL_ONGROUND);
+}
+
+
+*/ 
+#endif
+
+int TrainSpeed(int iSpeed, int iMax)
+{
+	float fSpeed, fMax;
+	int iRet = 0;
+
+	fMax = (float)iMax;
+	fSpeed = iSpeed;
+
+	fSpeed = fSpeed/fMax;
+
+	if (iSpeed < 0)
+		iRet = TRAIN_BACK;
+	else if (iSpeed == 0)
+		iRet = TRAIN_NEUTRAL;
+	else if (fSpeed < 0.33)
+		iRet = TRAIN_SLOW;
+	else if (fSpeed < 0.66)
+		iRet = TRAIN_MEDIUM;
+	else
+		iRet = TRAIN_FAST;
+
+	return iRet;
+}
+
+void CBasePlayer :: DeathSound( void )
+{
+	// water death sounds
+	/*
+	if (pev->waterlevel == 3)
+	{
+		EMIT_SOUND(ENT(pev), CHAN_VOICE, "player/h2odeath.wav", 1, ATTN_NONE);
+		return;
+	}
+	*/
+
+	// temporarily using pain sounds for death sounds
+	switch (RANDOM_LONG(1,5)) 
+	{
+	case 1: 
+		EMIT_SOUND(ENT(pev), CHAN_VOICE, "player/pl_pain5.wav", 1, ATTN_NORM);
+		break;
+	case 2: 
+		EMIT_SOUND(ENT(pev), CHAN_VOICE, "player/pl_pain6.wav", 1, ATTN_NORM);
+		break;
+	case 3: 
+		EMIT_SOUND(ENT(pev), CHAN_VOICE, "player/pl_pain7.wav", 1, ATTN_NORM);
+		break;
+	}
+
+	// play one of the suit death alarms
+	//EMIT_GROUPNAME_SUIT(ENT(pev), "HEV_DEAD");
+}
+
+// override takehealth
+// bitsDamageType indicates type of damage healed. 
+
+int CBasePlayer :: TakeHealth( float flHealth, int bitsDamageType )
+{
+	return CBaseMonster :: TakeHealth (flHealth, bitsDamageType);
+
+}
+
+Vector CBasePlayer :: GetGunPosition( )
+{
+//	UTIL_MakeVectors(pev->v_angle);
+//	m_HackedGunPos = pev->view_ofs;
+	Vector origin;
+	
+	origin = pev->origin + pev->view_ofs;
+
+	return origin;
+}
+
+//=========================================================
+// TraceAttack
+//=========================================================
+void CBasePlayer :: TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType)
+{
+	if ( pev->takedamage )
+	{
+		m_LastHitGroup = ptr->iHitgroup;
+
+		switch ( ptr->iHitgroup )
+		{
+		case HITGROUP_GENERIC:
+			break;
+		case HITGROUP_HEAD:
+			flDamage *= gSkillData.plrHead;
+			break;
+		case HITGROUP_CHEST:
+			flDamage *= gSkillData.plrChest;
+			break;
+		case HITGROUP_STOMACH:
+			flDamage *= gSkillData.plrStomach;
+			break;
+		case HITGROUP_LEFTARM:
+		case HITGROUP_RIGHTARM:
+			flDamage *= gSkillData.plrArm;
+			break;
+		case HITGROUP_LEFTLEG:
+		case HITGROUP_RIGHTLEG:
+			flDamage *= gSkillData.plrLeg;
+			break;
+		default:
+			break;
+		}
+
+		SpawnBlood(ptr->vecEndPos, BloodColor(), flDamage);// a little surface blood.
+		TraceBleed( flDamage, vecDir, ptr, bitsDamageType );
+		AddMultiDamage( pevAttacker, this, flDamage, bitsDamageType );
+	}
+}
+
+void CBasePlayer::SpawnClientSideCorpse()
+{
+//	char *infobuffer = g_engfuncs.pfnGetInfoKeyBuffer( edict() );
+//	char *pModel = g_engfuncs.pfnInfoKeyValue( infobuffer, "model" );
+//				
+//	MESSAGE_BEGIN( MSG_ALL, gmsgSendCorpse );
+//		WRITE_STRING( pModel );
+//		WRITE_LONG ( pev->origin.x * 128.0);
+//		WRITE_LONG ( pev->origin.y * 128.0);
+//		WRITE_LONG ( pev->origin.z * 128.0);
+//		WRITE_COORD ( pev->angles.x );
+//		WRITE_COORD ( pev->angles.y );
+//		WRITE_COORD ( pev->angles.z );
+//		WRITE_LONG	( (pev->animtime - gpGlobals->time) * 100.0f );
+//		WRITE_BYTE ( pev->sequence ); 
+//		WRITE_BYTE ( pev->body );
+//	MESSAGE_END();
+}
+
+/*
+	Take some damage.  
+	NOTE: each call to TakeDamage with bitsDamageType set to a time-based damage
+	type will cause the damage time countdown to be reset.  Thus the ongoing effects of poison, radiation
+	etc are implemented with subsequent calls to TakeDamage using DMG_GENERIC.
+*/
+
+int CBasePlayer :: TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType )
+{
+	// have suit diagnose the problem - ie: report damage type
+	int bitsDamage = bitsDamageType;
+	int ffound = TRUE;
+	int fmajor;
+	int fcritical;
+	int fTookDamage;
+	int ftrivial;
+	//float flRatio;
+	//float flBonus;
+	float flHealthPrev = pev->health;
+
+	//flBonus = AvHPlayerUpgrade::GetArmorBonus(this->pev->iuser4);
+	//flRatio = AvHPlayerUpgrade::GetArmorRatio(this->pev->iuser4);
+
+//	if ( ( bitsDamageType & DMG_BLAST ) && g_pGameRules->IsMultiplayer() )
+//	{
+//		// blasts damage armor more.
+//		flBonus *= 2;
+//	}
+
+	// Already dead
+	if ( !IsAlive() )
+		return 0;
+	// go take the damage first
+
+	
+	CBaseEntity *pAttacker = NULL;
+
+	if(pevAttacker)
+	{
+		pAttacker = CBaseEntity::Instance(pevAttacker);
+	}
+
+	if ( !g_pGameRules->FPlayerCanTakeDamage( this, pAttacker ) )
+	{
+		// Refuse the damage
+		return 0;
+	}
+
+	// keep track of amount of damage last sustained
+	m_lastDamageAmount = flDamage;
+
+	if(!(bitsDamageType & DMG_IGNOREARMOR))
+	{
+		flDamage = AvHPlayerUpgrade::CalculateDamageLessArmor((AvHUser3)this->pev->iuser3, this->pev->iuser4, flDamage, this->pev->armorvalue, bitsDamageType, GetGameRules()->GetNumActiveHives((AvHTeamNumber)this->pev->team));
+	}
+	else
+	{
+		int a = 0;
+	}
+
+	// Armor. 
+//	if (pev->armorvalue && !(bitsDamageType & (DMG_FALL | DMG_DROWN)) )// armor doesn't protect against fall or drown damage!
+//	{
+//		float flNew = flDamage * flRatio;
+//
+//		float flArmor;
+//
+//		flArmor = (flDamage - flNew) * flBonus;
+//
+//		// Does this use more armor than we have?
+//		if (flArmor > pev->armorvalue)
+//		{
+//			flArmor = pev->armorvalue;
+//			flArmor *= (1/flBonus);
+//			flNew = flDamage - flArmor;
+//			pev->armorvalue = 0;
+//		}
+//		else
+//			pev->armorvalue -= flArmor;
+//		
+//		flDamage = flNew;
+//	}
+
+	fTookDamage = CBaseMonster::TakeDamage(pevInflictor, pevAttacker, flDamage, bitsDamageType);
+
+	// reset damage time countdown for each type of time based damage player just sustained
+
+	{
+		for (int i = 0; i < CDMG_TIMEBASED; i++)
+			if (bitsDamageType & (DMG_PARALYZE << i))
+				m_rgbTimeBasedDamage[i] = 0;
+	}
+
+	// tell director about it
+	MESSAGE_BEGIN( MSG_SPEC, SVC_DIRECTOR );
+		WRITE_BYTE(DIRECTOR_MESSAGE_SIZE);
+		WRITE_BYTE ( DRC_CMD_EVENT );	// take damage event
+		WRITE_SHORT( ENTINDEX(this->edict()) );	// index number of primary entity
+		WRITE_SHORT( ENTINDEX(ENT(pevInflictor)) );	// index number of secondary entity
+		WRITE_LONG( 5 );   // eventflags (priority and flags)
+	MESSAGE_END();
+
+
+	// how bad is it, doc?
+
+	ftrivial = (pev->health > 75 || m_lastDamageAmount < 5);
+	fmajor = (m_lastDamageAmount > 25);
+	fcritical = (pev->health < 30);
+
+	// handle all bits set in this damage message,
+	// let the suit give player the diagnosis
+
+	// UNDONE: add sounds for types of damage sustained (ie: burn, shock, slash )
+
+	// UNDONE: still need to record damage and heal messages for the following types
+
+		// DMG_BURN	
+		// DMG_FREEZE
+		// DMG_BLAST
+		// DMG_SHOCK
+
+	m_bitsDamageType |= bitsDamage; // Save this so we can report it to the client
+	m_bitsHUDDamage = -1;  // make sure the damage bits get resent
+
+	while (fTookDamage && (!ftrivial || (bitsDamage & DMG_TIMEBASED)) && ffound && bitsDamage)
+	{
+		ffound = FALSE;
+
+		if (bitsDamage & DMG_CLUB)
+		{
+			if (fmajor)
+				SetSuitUpdate("!HEV_DMG4", FALSE, SUIT_NEXT_IN_30SEC);	// minor fracture
+			bitsDamage &= ~DMG_CLUB;
+			ffound = TRUE;
+		}
+		if (bitsDamage & (DMG_FALL | DMG_CRUSH))
+		{
+			if (fmajor)
+				SetSuitUpdate("!HEV_DMG5", FALSE, SUIT_NEXT_IN_30SEC);	// major fracture
+			else
+				SetSuitUpdate("!HEV_DMG4", FALSE, SUIT_NEXT_IN_30SEC);	// minor fracture
+	
+			bitsDamage &= ~(DMG_FALL | DMG_CRUSH);
+			ffound = TRUE;
+		}
+		
+		if (bitsDamage & DMG_BULLET)
+		{
+			if (m_lastDamageAmount > 5)
+				SetSuitUpdate("!HEV_DMG6", FALSE, SUIT_NEXT_IN_30SEC);	// blood loss detected
+			//else
+			//	SetSuitUpdate("!HEV_DMG0", FALSE, SUIT_NEXT_IN_30SEC);	// minor laceration
+			
+			bitsDamage &= ~DMG_BULLET;
+			ffound = TRUE;
+		}
+
+		if (bitsDamage & DMG_SLASH)
+		{
+			if (fmajor)
+				SetSuitUpdate("!HEV_DMG1", FALSE, SUIT_NEXT_IN_30SEC);	// major laceration
+			else
+				SetSuitUpdate("!HEV_DMG0", FALSE, SUIT_NEXT_IN_30SEC);	// minor laceration
+
+			bitsDamage &= ~DMG_SLASH;
+			ffound = TRUE;
+		}
+		
+		if (bitsDamage & DMG_SONIC)
+		{
+			if (fmajor)
+				SetSuitUpdate("!HEV_DMG2", FALSE, SUIT_NEXT_IN_1MIN);	// internal bleeding
+			bitsDamage &= ~DMG_SONIC;
+			ffound = TRUE;
+		}
+
+		if (bitsDamage & (DMG_POISON | DMG_PARALYZE))
+		{
+			SetSuitUpdate("!HEV_DMG3", FALSE, SUIT_NEXT_IN_1MIN);	// blood toxins detected
+			bitsDamage &= ~(DMG_POISON | DMG_PARALYZE);
+			ffound = TRUE;
+		}
+
+		if (bitsDamage & DMG_ACID)
+		{
+			SetSuitUpdate("!HEV_DET1", FALSE, SUIT_NEXT_IN_1MIN);	// hazardous chemicals detected
+			bitsDamage &= ~DMG_ACID;
+			ffound = TRUE;
+		}
+
+		if (bitsDamage & DMG_NERVEGAS)
+		{
+			SetSuitUpdate("!HEV_DET0", FALSE, SUIT_NEXT_IN_1MIN);	// biohazard detected
+			bitsDamage &= ~DMG_NERVEGAS;
+			ffound = TRUE;
+		}
+
+		if (bitsDamage & DMG_RADIATION)
+		{
+			SetSuitUpdate("!HEV_DET2", FALSE, SUIT_NEXT_IN_1MIN);	// radiation detected
+			bitsDamage &= ~DMG_RADIATION;
+			ffound = TRUE;
+		}
+		if (bitsDamage & DMG_SHOCK)
+		{
+			bitsDamage &= ~DMG_SHOCK;
+			ffound = TRUE;
+		}
+	}
+
+	pev->punchangle.x = -2;
+
+	if (fTookDamage && !ftrivial && fmajor && flHealthPrev >= 75) 
+	{
+		// first time we take major damage...
+		// turn automedic on if not on
+		SetSuitUpdate("!HEV_MED1", FALSE, SUIT_NEXT_IN_30MIN);	// automedic on
+
+		// give morphine shot if not given recently
+		SetSuitUpdate("!HEV_HEAL7", FALSE, SUIT_NEXT_IN_30MIN);	// morphine shot
+	}
+	
+	if (fTookDamage && !ftrivial && fcritical && flHealthPrev < 75)
+	{
+
+		// already took major damage, now it's critical...
+		if (pev->health < 6)
+			SetSuitUpdate("!HEV_HLTH3", FALSE, SUIT_NEXT_IN_10MIN);	// near death
+		else if (pev->health < 20)
+			SetSuitUpdate("!HEV_HLTH2", FALSE, SUIT_NEXT_IN_10MIN);	// health critical
+	
+		// give critical health warnings
+		if (!RANDOM_LONG(0,3) && flHealthPrev < 50)
+			SetSuitUpdate("!HEV_DMG7", FALSE, SUIT_NEXT_IN_5MIN); //seek medical attention
+	}
+
+	// if we're taking time based damage, warn about its continuing effects
+	if (fTookDamage && (bitsDamageType & DMG_TIMEBASED) && flHealthPrev < 75)
+		{
+			if (flHealthPrev < 50)
+			{
+				if (!RANDOM_LONG(0,3))
+					SetSuitUpdate("!HEV_DMG7", FALSE, SUIT_NEXT_IN_5MIN); //seek medical attention
+			}
+			else
+				SetSuitUpdate("!HEV_HLTH1", FALSE, SUIT_NEXT_IN_10MIN);	// health dropping
+		}
+
+	//return fTookDamage;
+	int theReturnValue = 0;
+	if(fTookDamage)
+	{
+		theReturnValue = flDamage;
+	}
+	return theReturnValue;
+}
+
+//=========================================================
+// PackDeadPlayerItems - call this when a player dies to
+// pack up the appropriate weapons and ammo items, and to
+// destroy anything that shouldn't be packed.
+//
+// This is pretty brute force :(
+//=========================================================
+void CBasePlayer::PackDeadPlayerItems( void )
+{
+	int iWeaponRules;
+	int iAmmoRules;
+	int i;
+	CBasePlayerWeapon *rgpPackWeapons[ 20 ];// 20 hardcoded for now. How to determine exactly how many weapons we have?
+	int iPackAmmo[ MAX_AMMO_SLOTS + 1];
+	int iPW = 0;// index into packweapons array
+	int iPA = 0;// index into packammo array
+
+	memset(rgpPackWeapons, NULL, sizeof(rgpPackWeapons) );
+	memset(iPackAmmo, -1, sizeof(iPackAmmo) );
+
+	// get the game rules 
+	iWeaponRules = g_pGameRules->DeadPlayerWeapons( this );
+ 	iAmmoRules = g_pGameRules->DeadPlayerAmmo( this );
+
+	if ( iWeaponRules == GR_PLR_DROP_GUN_NO && iAmmoRules == GR_PLR_DROP_AMMO_NO )
+	{
+		// nothing to pack. Remove the weapons and return. Don't call create on the box!
+		RemoveAllItems( TRUE );
+		return;
+	}
+
+// go through all of the weapons and make a list of the ones to pack
+	for ( i = 0 ; i < MAX_ITEM_TYPES ; i++ )
+	{
+		if ( m_rgpPlayerItems[ i ] )
+		{
+			// there's a weapon here. Should I pack it?
+			CBasePlayerItem *pPlayerItem = m_rgpPlayerItems[ i ];
+
+			while ( pPlayerItem )
+			{
+				switch( iWeaponRules )
+				{
+				case GR_PLR_DROP_GUN_ACTIVE:
+					if ( m_pActiveItem && pPlayerItem == m_pActiveItem )
+					{
+						// this is the active item. Pack it.
+						rgpPackWeapons[ iPW++ ] = (CBasePlayerWeapon *)pPlayerItem;
+					}
+					break;
+
+				case GR_PLR_DROP_GUN_ALL:
+					rgpPackWeapons[ iPW++ ] = (CBasePlayerWeapon *)pPlayerItem;
+					break;
+
+				default:
+					break;
+				}
+
+				pPlayerItem = pPlayerItem->m_pNext;
+			}
+		}
+	}
+
+// now go through ammo and make a list of which types to pack.
+	if ( iAmmoRules != GR_PLR_DROP_AMMO_NO )
+	{
+		for ( i = 0 ; i < MAX_AMMO_SLOTS ; i++ )
+		{
+			if ( m_rgAmmo[ i ] > 0 )
+			{
+				// player has some ammo of this type.
+				switch ( iAmmoRules )
+				{
+				case GR_PLR_DROP_AMMO_ALL:
+					iPackAmmo[ iPA++ ] = i;
+					break;
+
+				case GR_PLR_DROP_AMMO_ACTIVE:
+					if ( m_pActiveItem && i == m_pActiveItem->PrimaryAmmoIndex() ) 
+					{
+						// this is the primary ammo type for the active weapon
+						iPackAmmo[ iPA++ ] = i;
+					}
+					else if ( m_pActiveItem && i == m_pActiveItem->SecondaryAmmoIndex() ) 
+					{
+						// this is the secondary ammo type for the active weapon
+						iPackAmmo[ iPA++ ] = i;
+					}
+					break;
+
+				default:
+					break;
+				}
+			}
+		}
+	}
+
+// create a box to pack the stuff into.
+	CWeaponBox *pWeaponBox = (CWeaponBox *)CBaseEntity::Create( "weaponbox", pev->origin, pev->angles, edict() );
+
+	pWeaponBox->pev->angles.x = 0;// don't let weaponbox tilt.
+	pWeaponBox->pev->angles.z = 0;
+
+	pWeaponBox->SetThink( &CWeaponBox::Kill );
+	pWeaponBox->pev->nextthink = gpGlobals->time + 120;
+
+// back these two lists up to their first elements
+	iPA = 0;
+	iPW = 0;
+
+// pack the ammo
+	while ( iPackAmmo[ iPA ] != -1 )
+	{
+		// Only pack items with ammo
+		const char* theAmmoName = CBasePlayerItem::AmmoInfoArray[ iPackAmmo[ iPA ] ].pszName;
+		if(theAmmoName && theAmmoName != "")
+			pWeaponBox->PackAmmo( MAKE_STRING(theAmmoName), m_rgAmmo[ iPackAmmo[ iPA ] ] );
+
+		iPA++;
+	}
+
+// now pack all of the items in the lists
+	while ( rgpPackWeapons[ iPW ] )
+	{
+		// weapon unhooked from the player. Pack it into der box.
+		pWeaponBox->PackWeapon( rgpPackWeapons[ iPW ] );
+
+		iPW++;
+	}
+
+	pWeaponBox->pev->velocity = pev->velocity * 1.2;// weaponbox has player's velocity, then some.
+
+	RemoveAllItems( TRUE );// now strip off everything that wasn't handled by the code above.
+}
+
+void CBasePlayer::DestroyAllItems(BOOL removeSuit)
+{
+	if (m_pActiveItem)
+	{
+		ResetAutoaim( );
+		m_pActiveItem->Holster( );
+		m_pActiveItem = NULL;
+	}
+
+	m_pLastItem = NULL;
+
+	int i;
+	CBasePlayerItem *pPendingItem;
+	for (i = 0; i < MAX_ITEM_TYPES; i++)
+	{
+		m_pActiveItem = m_rgpPlayerItems[i];
+		while (m_pActiveItem)
+		{
+			pPendingItem = m_pActiveItem->m_pNext; 
+			m_pActiveItem->DestroyItem();
+			m_pActiveItem = pPendingItem;
+		}
+		m_rgpPlayerItems[i] = NULL;
+	}
+	m_pActiveItem = NULL;
+
+	pev->viewmodel		= 0;
+	pev->weaponmodel	= 0;
+	
+	if ( removeSuit )
+		pev->weapons = 0;
+	else
+		pev->weapons &= ~WEAPON_ALLWEAPONS;
+
+	for ( i = 0; i < MAX_AMMO_SLOTS;i++)
+		m_rgAmmo[i] = 0;
+
+	// Removed because network messages were being sent before client was fully in the game (some messages weren't going through, like gmsgWeaponList).  
+	// This gets called every tick by AvHPlayer::UpdateClientData() anyways.
+	//UpdateClientData();
+
+	// send Selected Weapon Message to our client
+	MESSAGE_BEGIN( MSG_ONE, gmsgCurWeapon, NULL, pev );
+		WRITE_BYTE(0);
+		WRITE_BYTE(0);
+		WRITE_BYTE(0);
+		WRITE_BYTE(0);
+	MESSAGE_END();
+
+}
+
+void CBasePlayer::RemoveAllItems( BOOL removeSuit )
+{
+	if (m_pActiveItem)
+	{
+		ResetAutoaim( );
+		m_pActiveItem->Holster( );
+		m_pActiveItem = NULL;
+	}
+
+	m_pLastItem = NULL;
+
+	int i;
+	CBasePlayerItem *pPendingItem;
+	for (i = 0; i < MAX_ITEM_TYPES; i++)
+	{
+		m_pActiveItem = m_rgpPlayerItems[i];
+		while (m_pActiveItem)
+		{
+			pPendingItem = m_pActiveItem->m_pNext; 
+			m_pActiveItem->Drop( );
+			m_pActiveItem = pPendingItem;
+		}
+		m_rgpPlayerItems[i] = NULL;
+	}
+	m_pActiveItem = NULL;
+
+	pev->viewmodel		= 0;
+	pev->weaponmodel	= 0;
+	
+	if ( removeSuit )
+		pev->weapons = 0;
+	else
+		pev->weapons &= ~WEAPON_ALLWEAPONS;
+
+	for ( i = 0; i < MAX_AMMO_SLOTS;i++)
+		m_rgAmmo[i] = 0;
+
+//	UpdateClientData();
+//	// send Selected Weapon Message to our client
+//	MESSAGE_BEGIN( MSG_ONE, gmsgCurWeapon, NULL, pev );
+//		WRITE_BYTE(0);
+//		WRITE_BYTE(0);
+//		WRITE_BYTE(0);
+//	MESSAGE_END();
+}
+
+/*
+ * GLOBALS ASSUMED SET:  g_ulModelIndexPlayer
+ *
+ * ENTITY_METHOD(PlayerDie)
+ */
+entvars_t *g_pevLastInflictor;  // Set in combat.cpp.  Used to pass the damage inflictor for death messages.
+								// Better solution:  Add as parameter to all Killed() functions.
+
+void CBasePlayer::Killed( entvars_t *pevAttacker, int iGib )
+{
+	CSound *pSound;
+
+	// Holster weapon immediately, to allow it to cleanup
+	if ( m_pActiveItem )
+		m_pActiveItem->Holster( );
+
+	GetGameRules()->PlayerKilled( this, pevAttacker, g_pevLastInflictor );
+
+	if ( m_pTank != NULL )
+	{
+		m_pTank->Use( this, this, USE_OFF, 0 );
+		m_pTank = NULL;
+	}
+
+	// this client isn't going to be thinking for a while, so reset the sound until they respawn
+	pSound = CSoundEnt::SoundPointerForIndex( CSoundEnt::ClientSoundIndex( edict() ) );
+	{
+		if ( pSound )
+		{
+			pSound->Reset();
+		}
+	}
+
+	SetAnimation( PLAYER_DIE );
+	
+	m_iRespawnFrames = 0;
+
+	//pev->modelindex = g_ulModelIndexPlayer;    // don't use eyes
+
+	// Clear buttons held down on death, fixes bug where player can't switch observer targets
+	m_afButtonLast = 0;
+
+	pev->deadflag		= DEAD_DYING;
+	pev->movetype		= MOVETYPE_TOSS;
+	ClearBits( pev->flags, FL_ONGROUND );
+	if (pev->velocity.z < 10)
+		pev->velocity.z += RANDOM_FLOAT(0,300);
+
+	// clear out the suit message cache so we don't keep chattering
+	SetSuitUpdate(NULL, FALSE, 0);
+
+	// send "health" update message to zero
+	m_iClientHealth = 0;
+	MESSAGE_BEGIN( MSG_ONE, gmsgHealth, NULL, pev );
+		WRITE_SHORT( m_iClientHealth );
+	MESSAGE_END();
+
+	// Tell Ammo Hud that the player is dead
+	MESSAGE_BEGIN( MSG_ONE, gmsgCurWeapon, NULL, pev );
+		WRITE_BYTE(0);
+		WRITE_BYTE(0XFF);
+		WRITE_BYTE(0xFF);
+		WRITE_BYTE(0);
+	MESSAGE_END();
+
+	// reset FOV
+	pev->fov = m_iFOV = m_iClientFOV = 0;
+
+	MESSAGE_BEGIN( MSG_ONE, gmsgSetFOV, NULL, pev );
+		WRITE_BYTE(0);
+	MESSAGE_END();
+
+
+	// UNDONE: Put this in, but add FFADE_PERMANENT and make fade time 8.8 instead of 4.12
+	// UTIL_ScreenFade( edict(), Vector(128,0,0), 6, 15, 255, FFADE_OUT | FFADE_MODULATE );
+
+	if ( ( pev->health < -40 && iGib != GIB_NEVER ) || iGib == GIB_ALWAYS )
+	{
+		pev->solid			= SOLID_NOT;
+		GibMonster();	// This clears pev->model
+		pev->effects |= EF_NODRAW;
+		return;
+	}
+
+	DeathSound();
+	
+	pev->angles.x = 0;
+	pev->angles.z = 0;
+
+	SetThink(&CBasePlayer::PlayerDeathThink);
+	pev->nextthink = gpGlobals->time + 0.1;
+}
+
+void CBasePlayer::Suicide(void)
+{
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this);
+
+	ASSERT(thePlayer);
+
+	if(thePlayer && thePlayer->GetUsedKilled())//voogru: prevent exploitation of "kill" command.
+		return;
+
+	// have the player kill themself
+	float theKillDelay = CVAR_GET_FLOAT(kvKillDelay);
+
+	#ifdef DEBUG
+	#ifndef	AVH_EXTERNAL_BUILD
+	theKillDelay = 0;
+	#endif
+	#endif
+
+	if(theKillDelay > 0.0f)
+	{
+		char theMessage[256];
+		sprintf(theMessage, "Suiciding in %.1f seconds...\n", theKillDelay);
+		UTIL_SayText(theMessage, this, ENTINDEX(this->edict()));
+	}
+	
+	thePlayer->SetUsedKilled(true);
+	SetThink(&CBasePlayer::SuicideThink);
+	this->pev->nextthink = gpGlobals->time + theKillDelay;
+}
+
+void CBasePlayer::SuicideThink(void)
+{
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this);
+	if(thePlayer && thePlayer->GetCanBeAffectedByEnemies())
+	{
+		this->pev->health = 0;
+		this->Killed(this->pev, GIB_NEVER);
+	}
+}
+
+// Set the activity based on an event or current state
+void CBasePlayer::SetAnimation( PLAYER_ANIM playerAnim )
+{
+	int animDesired;
+	int gaitDesired;
+	float speed;
+	char szAnim[64];
+	bool theFoundAnim = true;
+	int theDebugAnimations = BALANCE_IVAR(kDebugAnimations);
+	bool reloadAnim = false;
+
+	// Make sure the model is set, as gestating models aren't set before the animation starts playing
+	AvHPlayer* theAvHPlayer = dynamic_cast<AvHPlayer*>(this);
+	ASSERT(theAvHPlayer);
+	theAvHPlayer->SetModelFromState();
+
+	speed = pev->velocity.Length2D();
+
+	if (pev->flags & FL_FROZEN)
+	{
+		speed = 0;
+		playerAnim = PLAYER_IDLE;
+	}
+
+	switch (playerAnim) 
+	{
+	case PLAYER_JUMP:
+		m_IdealActivity = ACT_HOP;
+		break;
+	
+	case PLAYER_SUPERJUMP:
+		m_IdealActivity = ACT_LEAP;
+		break;
+	
+	case PLAYER_DIE:
+		m_IdealActivity = ACT_DIESIMPLE;
+		m_IdealActivity = GetDeathActivity( );
+
+		//this->GetAnimationForActivity(this->m_IdealActivity, szAnim);
+		//animDesired = LookupSequence( szAnim );
+		//if (animDesired == -1)
+		//{
+		//	animDesired = 0;
+		//}
+		//this->pev->sequence = animDesired;
+		break;
+
+	case PLAYER_ATTACK1:	
+		switch( m_Activity )
+		{
+		case ACT_HOVER:
+		case ACT_SWIM:
+		case ACT_HOP:
+		case ACT_LEAP:
+		case ACT_DIESIMPLE:
+			m_IdealActivity = m_Activity;
+			break;
+		default:
+			m_IdealActivity = ACT_RANGE_ATTACK1;
+			break;
+		}
+		break;
+
+	case PLAYER_PRIME:	
+		switch( m_Activity )
+		{
+		case ACT_HOVER:
+		case ACT_SWIM:
+		case ACT_HOP:
+		case ACT_LEAP:
+		case ACT_DIESIMPLE:
+			m_IdealActivity = m_Activity;
+			break;
+		default:
+			m_IdealActivity = ACT_RANGE_PRIME;
+			break;
+		}
+		break;
+
+	case PLAYER_RELOAD:
+		switch( m_Activity )
+			{
+				case ACT_HOVER:
+				case ACT_SWIM:
+				case ACT_HOP:
+				case ACT_LEAP:
+				case ACT_DIESIMPLE:
+					m_IdealActivity = m_Activity;
+					break;
+				default:
+					m_IdealActivity = ACT_RELOAD;
+					break;
+				}		
+		break;
+	case PLAYER_RELOAD_START:
+		switch( m_Activity )
+			{
+				case ACT_HOVER:
+				case ACT_SWIM:
+				case ACT_HOP: 
+				case ACT_LEAP:
+				case ACT_DIESIMPLE:
+					m_IdealActivity = m_Activity;
+					break;
+				default:
+					m_IdealActivity = ACT_RELOAD_START;
+					break;
+				}		
+		break;
+	case PLAYER_RELOAD_INSERT:
+		switch( m_Activity )
+			{
+				case ACT_HOVER:
+				case ACT_SWIM:
+				case ACT_HOP:
+				case ACT_LEAP:
+				case ACT_DIESIMPLE:
+					m_IdealActivity = m_Activity;
+					break;
+				default:
+					m_IdealActivity = ACT_RELOAD_INSERT;
+					break;
+				}		
+		break;
+	case PLAYER_RELOAD_END:
+		switch( m_Activity )
+			{
+				case ACT_HOVER:
+				case ACT_SWIM:
+				case ACT_HOP:
+				case ACT_LEAP:
+				case ACT_DIESIMPLE:
+					m_IdealActivity = m_Activity;
+					break;
+				default:
+					m_IdealActivity = ACT_RELOAD_END;
+					break;
+				}		
+		break;
+	case PLAYER_IDLE:
+	case PLAYER_WALK:
+		if ( !FBitSet( pev->flags, FL_ONGROUND ) && (m_Activity == ACT_HOP || m_Activity == ACT_LEAP) )	// Still jumping
+		{
+			m_IdealActivity = m_Activity;
+		}
+		else if ( pev->waterlevel > 1 )
+		{
+			if ( speed == 0 )
+				m_IdealActivity = ACT_HOVER;
+			else
+				m_IdealActivity = ACT_SWIM;
+		}
+		else
+		{
+			if((playerAnim == PLAYER_IDLE) && !strcmp(this->m_szAnimExtention, "") && (theAvHPlayer->GetPlayMode() != PLAYMODE_READYROOM))
+			{
+				m_IdealActivity = ACT_IDLE;
+			}
+			else
+			{
+				m_IdealActivity = ACT_WALK;
+			}
+		}
+		break;
+	}
+
+	switch (m_IdealActivity)
+	{
+	
+	case ACT_DIESIMPLE:
+	case ACT_DIEBACKWARD:
+	case ACT_DIEFORWARD:
+	case ACT_DIEVIOLENT:
+	default:
+		if ( m_Activity == m_IdealActivity)
+			return;
+		m_Activity = m_IdealActivity;
+		
+		//animDesired = LookupActivity( m_Activity );
+		this->GetAnimationForActivity(this->m_Activity, szAnim);
+		animDesired = LookupSequence( szAnim );
+		
+		// Already using the desired animation?
+		if (pev->sequence == animDesired)
+			return;
+
+		#ifdef DEBUG
+		if(theDebugAnimations)
+		{
+			char theMessage[256];
+			sprintf(theMessage, "Setting full-body animation (%s): %d (no gaitsequence)\n", szAnim, animDesired);
+			ALERT(at_console, theMessage);
+		}
+		#endif
+		
+		pev->gaitsequence = 0;
+		pev->sequence		= animDesired;
+		pev->frame			= 0;
+		ResetSequenceInfo( );
+		return;
+
+	// create seperate case for these so that they don't interfere with a reload - Elven
+	case ACT_HOVER:
+	case ACT_LEAP:
+	case ACT_SWIM:
+	case ACT_HOP:
+		reloadAnim = (m_Activity == ACT_RELOAD) || (m_Activity == ACT_RELOAD_START) || (m_Activity ==						ACT_RELOAD_INSERT) || (m_Activity == ACT_RELOAD_END);
+		if ( m_Activity == m_IdealActivity || reloadAnim)
+			return;
+		m_Activity = m_IdealActivity;
+		
+		//animDesired = LookupActivity( m_Activity );
+		this->GetAnimationForActivity(this->m_Activity, szAnim);
+		animDesired = LookupSequence( szAnim );
+		
+		// Already using the desired animation?
+		if (pev->sequence == animDesired)
+			return;
+		pev->gaitsequence = 0;
+		pev->sequence		= animDesired;
+		pev->frame			= 0;
+		ResetSequenceInfo( );
+		return;
+	
+
+	case ACT_RANGE_ATTACK1:
+	case ACT_RANGE_PRIME:
+		this->GetAnimationForActivity(this->m_IdealActivity, szAnim);
+		animDesired = LookupSequence( szAnim );
+
+		if (animDesired == -1)
+		{
+			animDesired = 0;
+			theFoundAnim = false;
+		}
+		
+		if ( pev->sequence != animDesired || !m_fSequenceLoops )
+		{
+			pev->frame = 0;
+		}
+		
+		if (!m_fSequenceLoops)
+		{
+			pev->effects |= EF_NOINTERP;
+		}
+		
+		m_Activity = m_IdealActivity;
+
+		if(theFoundAnim)
+		{
+			#ifdef DEBUG
+			if(theDebugAnimations)
+			{
+				char theMessage[256];
+				sprintf(theMessage, "%s%s\n", "Setting attack animation: ", szAnim);
+				ALERT(at_console, theMessage);
+			}
+			#endif
+		}
+		
+		pev->sequence		= animDesired;
+		ResetSequenceInfo( );
+		break;
+
+	case ACT_RELOAD:
+	case ACT_RELOAD_START:
+	case ACT_RELOAD_INSERT:
+	case ACT_RELOAD_END:
+		this->GetAnimationForActivity(this->m_IdealActivity, szAnim);
+		animDesired = LookupSequence( szAnim );
+		
+		if ( pev->sequence != animDesired || !m_fSequenceLoops )
+		{
+			pev->frame = 0;
+		}
+		m_Activity = m_IdealActivity;
+		break;
+	
+	
+
+    case ACT_WALK:
+		reloadAnim = (m_Activity == ACT_RELOAD) || (m_Activity == ACT_RELOAD_START) || 
+					  (m_Activity == ACT_RELOAD_INSERT) || (m_Activity == ACT_RELOAD_END);
+		if ((m_Activity != ACT_RANGE_ATTACK1 && m_Activity != ACT_RANGE_PRIME && !reloadAnim/*m_Activity != ACT_RELOAD*/ ) || m_fSequenceFinished)
+		{
+			this->GetAnimationForActivity(this->m_IdealActivity, szAnim);
+			animDesired = LookupSequence( szAnim );
+			if (animDesired == -1)
+			{
+				animDesired = 0;
+			}
+			m_Activity = ACT_WALK;
+		}
+		else
+		{
+			animDesired = pev->sequence;
+		}
+		break;
+	}
+
+	// Now handle gaitsequence
+	if(FBitSet(this->pev->flags, FL_DUCKING))
+	{
+		if(speed == 0)
+		{
+			this->GetAnimationForActivity(ACT_CROUCHIDLE, szAnim, true);
+		}
+		else
+		{
+			this->GetAnimationForActivity(ACT_CROUCH, szAnim, true);
+		}
+	}
+	else if (speed > this->GetMaxWalkSpeed() )
+	{
+		this->GetAnimationForActivity(ACT_RUN, szAnim, true);
+	}
+	else if (speed > 0)
+	{
+		this->GetAnimationForActivity(ACT_WALK, szAnim, true);
+	}
+	else
+	{
+		this->GetAnimationForActivity(ACT_IDLE, szAnim, true);
+	}
+	
+	// Set the gaitsequence
+	gaitDesired = LookupSequence(szAnim);
+	if(gaitDesired == -1)
+	{
+		gaitDesired = 0;
+	}
+
+#ifdef DEBUG
+	if(theDebugAnimations)
+	{
+		if((this->pev->gaitsequence != gaitDesired) || (this->pev->sequence != animDesired))
+		{
+			ALERT(at_console, "Anim desired (%s): %d, gaitsequence: %d  gaitdesired: %d \n", szAnim, animDesired, pev->gaitsequence, gaitDesired);
+		}
+	}
+#endif
+
+	this->pev->gaitsequence = gaitDesired;
+
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this);
+	if(thePlayer && (thePlayer->GetPlayMode() == PLAYMODE_READYROOM))
+	{
+		// Play some animation on top and bottom when not holding any weapons
+		animDesired = gaitDesired;
+	}
+
+	// Already using the desired animation?
+	if (pev->sequence == animDesired)
+		return;
+
+	// Reset to first frame of desired animation
+	pev->sequence		= animDesired;
+	pev->frame			= 0;
+	ResetSequenceInfo( );
+}
+
+/*
+===========
+TabulateAmmo
+This function is used to find and store 
+all the ammo we have into the ammo vars.
+============
+*/
+void CBasePlayer::TabulateAmmo()
+{
+	ammo_9mm = AmmoInventory( GetAmmoIndex( "9mm" ) );
+	ammo_357 = AmmoInventory( GetAmmoIndex( "357" ) );
+	ammo_argrens = AmmoInventory( GetAmmoIndex( "ARgrenades" ) );
+	ammo_bolts = AmmoInventory( GetAmmoIndex( "bolts" ) );
+	ammo_buckshot = AmmoInventory( GetAmmoIndex( "buckshot" ) );
+	ammo_rockets = AmmoInventory( GetAmmoIndex( "rockets" ) );
+	ammo_uranium = AmmoInventory( GetAmmoIndex( "uranium" ) );
+	ammo_hornets = AmmoInventory( GetAmmoIndex( "Hornets" ) );
+}
+
+
+/*
+===========
+WaterMove
+============
+*/
+#define AIRTIME	12		// lung full of air lasts this many seconds
+
+void CBasePlayer::WaterMove()
+{
+	int air;
+
+	if (pev->movetype == MOVETYPE_NOCLIP)
+		return;
+
+	if (pev->health < 0)
+		return;
+
+	// waterlevel 0 - not in water
+	// waterlevel 1 - feet in water
+	// waterlevel 2 - waist in water
+	// waterlevel 3 - head in water
+
+	if (pev->waterlevel != 3) 
+	{
+		// not underwater
+		
+		// play 'up for air' sound
+		if (pev->air_finished < gpGlobals->time)
+			EMIT_SOUND(ENT(pev), CHAN_VOICE, "player/pl_wade1.wav", 1, ATTN_NORM);
+		else if (pev->air_finished < gpGlobals->time + 9)
+			EMIT_SOUND(ENT(pev), CHAN_VOICE, "player/pl_wade2.wav", 1, ATTN_NORM);
+
+		pev->air_finished = gpGlobals->time + AIRTIME;
+		pev->dmg = 2;
+
+		// if we took drowning damage, give it back slowly
+		if (m_idrowndmg > m_idrownrestored)
+		{
+			// set drowning damage bit.  hack - dmg_drownrecover actually
+			// makes the time based damage code 'give back' health over time.
+			// make sure counter is cleared so we start count correctly.
+			
+			// NOTE: this actually causes the count to continue restarting
+			// until all drowning damage is healed.
+
+			m_bitsDamageType |= DMG_DROWNRECOVER;
+			m_bitsDamageType &= ~DMG_DROWN;
+			m_rgbTimeBasedDamage[itbd_DrownRecover] = 0;
+		}
+
+	}
+	else
+	{	// fully under water
+		// stop restoring damage while underwater
+		m_bitsDamageType &= ~DMG_DROWNRECOVER;
+		m_rgbTimeBasedDamage[itbd_DrownRecover] = 0;
+
+		if (pev->air_finished < gpGlobals->time)		// drown!
+		{
+			if (pev->pain_finished < gpGlobals->time)
+			{
+				// take drowning damage
+				pev->dmg += 1;
+				if (pev->dmg > 5)
+					pev->dmg = 5;
+				TakeDamage(VARS(eoNullEntity), VARS(eoNullEntity), pev->dmg, DMG_DROWN);
+				pev->pain_finished = gpGlobals->time + 1;
+				
+				// track drowning damage, give it back when
+				// player finally takes a breath
+
+				m_idrowndmg += pev->dmg;
+			} 
+		}
+		else
+		{
+			m_bitsDamageType &= ~DMG_DROWN;
+		}
+	}
+
+	if (!pev->waterlevel)
+	{
+		if (FBitSet(pev->flags, FL_INWATER))
+		{       
+			ClearBits(pev->flags, FL_INWATER);
+		}
+		return;
+	}
+	
+	// make bubbles
+
+	air = (int)(pev->air_finished - gpGlobals->time);
+	if (!RANDOM_LONG(0,0x1f) && RANDOM_LONG(0,AIRTIME-1) >= air)
+	{
+		switch (RANDOM_LONG(0,3))
+			{
+			case 0:	EMIT_SOUND(ENT(pev), CHAN_BODY, "player/pl_swim1.wav", 0.8, ATTN_NORM); break;
+			case 1:	EMIT_SOUND(ENT(pev), CHAN_BODY, "player/pl_swim2.wav", 0.8, ATTN_NORM); break;
+			case 2:	EMIT_SOUND(ENT(pev), CHAN_BODY, "player/pl_swim3.wav", 0.8, ATTN_NORM); break;
+			case 3:	EMIT_SOUND(ENT(pev), CHAN_BODY, "player/pl_swim4.wav", 0.8, ATTN_NORM); break;
+		}
+	}
+
+	if (pev->watertype == CONTENT_LAVA)		// do damage
+	{
+		if (pev->dmgtime < gpGlobals->time)
+			TakeDamage(VARS(eoNullEntity), VARS(eoNullEntity), 10 * pev->waterlevel, DMG_BURN);
+	}
+	else if (pev->watertype == CONTENT_SLIME)		// do damage
+	{
+		pev->dmgtime = gpGlobals->time + 1;
+		TakeDamage(VARS(eoNullEntity), VARS(eoNullEntity), 4 * pev->waterlevel, DMG_ACID);
+	}
+	
+	if (!FBitSet(pev->flags, FL_INWATER))
+	{
+		SetBits(pev->flags, FL_INWATER);
+		pev->dmgtime = 0;
+	}
+}
+
+void CBasePlayer::InitPlayerFromSpawn(edict_t* inSpawn)
+{
+	if(!FNullEnt(inSpawn))
+	{
+		int theOffset = AvHMUGetOriginOffsetForUser3(AvHUser3(this->pev->iuser3));
+		this->pev->origin = VARS(inSpawn)->origin + Vector(0, 0, theOffset);
+
+		this->pev->v_angle  = VARS(inSpawn)->v_angle;
+		this->pev->velocity = g_vecZero;
+		this->pev->angles = VARS(inSpawn)->angles;
+		this->pev->punchangle = g_vecZero;
+		this->pev->fixangle = TRUE;
+	}
+}
+
+// TRUE if the player is attached to a ladder
+BOOL CBasePlayer::IsOnLadder( void )
+{ 
+	return ( pev->movetype == MOVETYPE_FLY );
+}
+
+void CBasePlayer::PlayerDeathThink(void)
+{
+	float flForward;
+
+	if (FBitSet(pev->flags, FL_ONGROUND))
+	{
+		flForward = pev->velocity.Length() - 20;
+		if (flForward <= 0)
+			pev->velocity = g_vecZero;
+		else    
+			pev->velocity = flForward * pev->velocity.Normalize();
+	}
+
+	if ( HasWeapons() )
+	{
+		// we drop the guns here because weapons that have an area effect and can kill their user
+		// will sometimes crash coming back from CBasePlayer::Killed() if they kill their owner because the
+		// player class sometimes is freed. It's safer to manipulate the weapons once we know
+		// we aren't calling into any of their code anymore through the player pointer.
+		PackDeadPlayerItems();
+
+		// Assumes that all players have at least one weapon when they die
+		//SpawnClientSideCorpse();
+	}
+
+	if (pev->modelindex && (!m_fSequenceFinished) && (pev->deadflag == DEAD_DYING))
+	{
+		StudioFrameAdvance( );
+
+		m_iRespawnFrames++;				// Note, these aren't necessarily real "frames", so behavior is dependent on # of client movement commands
+		if ( m_iRespawnFrames < 120 )   // Animations should be no longer than this
+			return;
+	}
+
+	// once we're done animating our death and we're on the ground, we want to set movetype to None so our dead body won't do collisions and stuff anymore
+	// this prevents a bug where the dead body would go to a player's head if he walked over it while the dead player was clicking their button to respawn
+	if ( pev->movetype != MOVETYPE_NONE && FBitSet(pev->flags, FL_ONGROUND) )
+		pev->movetype = MOVETYPE_NONE;
+
+	if (pev->deadflag == DEAD_DYING)
+		pev->deadflag = DEAD_DEAD;
+	
+	StopAnimation();
+
+	pev->effects |= EF_NOINTERP;
+	pev->framerate = 0.0;
+
+	BOOL fAnyButtonDown = (pev->button & ~IN_SCORE );
+	
+	// wait for all buttons released
+	if (pev->deadflag == DEAD_DEAD)
+	{
+		if (fAnyButtonDown)
+			return;
+
+		//if ( g_pGameRules->FPlayerCanRespawn( this ) )
+		//{
+			m_fDeadTime = gpGlobals->time;
+			pev->deadflag = DEAD_RESPAWNABLE;
+		//}
+
+		return;
+	}
+
+// if the player has been dead for one second longer than allowed by forcerespawn, 
+// forcerespawn isn't on. Send the player off to an intermission camera until they 
+// choose to respawn.
+	//if ( g_pGameRules->IsMultiplayer() && ( gpGlobals->time > (m_fDeadTime + 6) ) && !(m_afPhysicsFlags & PFLAG_OBSERVER) )
+	//{
+	//	// go to dead camera. 
+	//	StartDeathCam();
+	//}
+
+
+	// From Counter-strike
+	// if the player has been dead for one second longer than allowed by forcerespawn, 
+	// forcerespawn isn't on. Send the player off to an intermission camera until they 
+	// choose to respawn.
+//	if ( g_pGameRules->IsMultiplayer() && 
+//	   ( gpGlobals->time > (m_fDeadTime + 3) ) && 
+//	  !( m_afPhysicsFlags & PFLAG_OBSERVER) )
+//	{
+//		//Send message to everybody to spawn a corpse.
+//		SpawnClientSideCorpse();
+//
+//		// go to dead camera. 
+//		//StartDeathCam();
+//	}
+
+	const float kMinDeathTime = .5f;
+	
+// wait for any button down,  or mp_forcerespawn is set and the respawn time is up
+	if ((!fAnyButtonDown || ( gpGlobals->time < (m_fDeadTime + kMinDeathTime) ))
+		&& !( g_pGameRules->IsMultiplayer() && forcerespawn.value > 0 && (gpGlobals->time > (m_fDeadTime + kMinDeathTime))) )
+		return;
+
+	pev->button = 0;
+	m_iRespawnFrames = 0;
+
+	// Player is done with the death cam, continue
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this);
+	AvHGamerules* theGameRules = dynamic_cast<AvHGamerules*>(g_pGameRules);
+
+	theGameRules->PlayerDeathEnd(thePlayer);
+}
+
+//=========================================================
+// StartDeathCam - find an intermission spot and send the
+// player off into observer mode
+//=========================================================
+void CBasePlayer::StartDeathCam( void )
+{
+	edict_t *pSpot, *pNewSpot;
+	int iRand;
+
+	if ( pev->view_ofs == g_vecZero )
+	{
+		// don't accept subsequent attempts to StartDeathCam()
+		return;
+	}
+
+	pSpot = FIND_ENTITY_BY_CLASSNAME( NULL, "info_intermission");	
+
+	if ( !FNullEnt( pSpot ) )
+	{
+		// at least one intermission spot in the world.
+		iRand = RANDOM_LONG( 0, 3 );
+
+		while ( iRand > 0 )
+		{
+			pNewSpot = FIND_ENTITY_BY_CLASSNAME( pSpot, "info_intermission");
+			
+			if ( pNewSpot )
+			{
+				pSpot = pNewSpot;
+			}
+
+			iRand--;
+		}
+
+		CopyToBodyQue( pev );
+		StartObserver( pSpot->v.origin, pSpot->v.v_angle );
+	}
+	else
+	{
+		// no intermission spot. Push them up in the air, looking down at their corpse
+		TraceResult tr;
+		CopyToBodyQue( pev );
+		UTIL_TraceLine( pev->origin, pev->origin + Vector( 0, 0, 128 ), ignore_monsters, edict(), &tr );
+		StartObserver( tr.vecEndPos, UTIL_VecToAngles( tr.vecEndPos - pev->origin  ) );
+		return;
+	}
+}
+
+void CBasePlayer::StartObserver( Vector vecPosition, Vector vecViewAngle )
+{
+//	m_afPhysicsFlags |= PFLAG_OBSERVER;
+//
+//	pev->view_ofs = g_vecZero;
+//	pev->angles = pev->v_angle = vecViewAngle;
+//	pev->fixangle = TRUE;
+//	pev->solid = SOLID_NOT;
+//	pev->takedamage = DAMAGE_NO;
+//	pev->movetype = MOVETYPE_NONE;
+//	pev->modelindex = 0;
+//	UTIL_SetOrigin( pev, vecPosition );
+
+	m_iHideHUD |= (HIDEHUD_HEALTH | HIDEHUD_WEAPONS);
+	m_afPhysicsFlags |= PFLAG_OBSERVER;
+	
+	pev->effects = EF_NODRAW;
+	pev->view_ofs = g_vecZero;
+	pev->angles = pev->v_angle = vecViewAngle;
+	pev->fixangle = TRUE;
+	pev->solid = SOLID_NOT;
+	pev->takedamage = DAMAGE_NO;
+	pev->movetype = MOVETYPE_NONE;
+	UTIL_SetOrigin( pev, vecPosition );
+	
+	ClearBits( m_afPhysicsFlags, PFLAG_DUCKING );
+	ClearBits( pev->flags, FL_DUCKING );
+	// pev->flags = FL_CLIENT | FL_SPECTATOR;	// Should we set Spectator flag? Or is it reserver for people connecting with spectator 1?
+	pev->deadflag = DEAD_RESPAWNABLE;
+	
+	// Tell the physics code that this player's now in observer mode
+	Observer_SetMode(this->GetDefaultSpectatingMode());
+	Observer_SpectatePlayer(this->GetDefaultSpectatingTarget());
+	m_flNextObserverInput = 0;
+}
+
+void CBasePlayer::StopObserver()
+{
+	this->pev->solid = SOLID_SLIDEBOX;
+	this->pev->effects = 0;
+	this->pev->takedamage = DAMAGE_YES;
+	this->pev->movetype = MOVETYPE_WALK;
+	ClearBits(this->m_afPhysicsFlags, PFLAG_OBSERVER);
+	ClearBits(this->m_afPhysicsFlags, PFLAG_DUCKING );
+	ClearBits(this->pev->flags, FL_DUCKING );
+	this->pev->iuser1 = this->pev->iuser2 = 0;
+}
+
+// 
+// PlayerUse - handles USE keypress
+//
+#define	PLAYER_SEARCH_RADIUS	(float)64
+
+void CBasePlayer::ClearKeys()
+{
+    // clear attack/use commands from player
+    this->m_afButtonPressed = 0;
+    this->pev->button = 0;
+    this->m_afButtonReleased = 0;
+}
+
+void CBasePlayer::PlayerUse ( void )
+{
+	AvHPlayer* theAvHPlayer = dynamic_cast<AvHPlayer*>(this);
+
+	// Was use pressed or released?
+	if ( ! ((pev->button | m_afButtonPressed | m_afButtonReleased) & IN_USE) )
+		return;
+
+	//voogru: Dont do this on commanders to prevent phantom use sounds.
+	if(theAvHPlayer->GetIsInTopDownMode())
+		return;
+
+	// Hit Use on a train?
+	if ( m_afButtonPressed & IN_USE )
+	{
+		if ( m_pTank != NULL )
+		{
+			// Stop controlling the tank
+			// TODO: Send HUD Update
+			m_pTank->Use( this, this, USE_OFF, 0 );
+			m_pTank = NULL;
+			return;
+		}
+		else
+		{
+			if ( m_afPhysicsFlags & PFLAG_ONTRAIN )
+			{
+				m_afPhysicsFlags &= ~PFLAG_ONTRAIN;
+				m_iTrain = TRAIN_NEW|TRAIN_OFF;
+				return;
+			}
+			else
+			{	// Start controlling the train!
+				CBaseEntity *pTrain = CBaseEntity::Instance( pev->groundentity );
+
+				if ( pTrain && !(pev->button & IN_JUMP) && FBitSet(pev->flags, FL_ONGROUND) && (pTrain->ObjectCaps() & FCAP_DIRECTIONAL_USE) && pTrain->OnControls(pev) )
+				{
+					m_afPhysicsFlags |= PFLAG_ONTRAIN;
+					m_iTrain = TrainSpeed(pTrain->pev->speed, pTrain->pev->impulse);
+					m_iTrain |= TRAIN_NEW;
+					EMIT_SOUND( ENT(pev), CHAN_ITEM, "plats/train_use1.wav", 0.8, ATTN_NORM);
+					return;
+				}
+			}
+		}
+	}
+
+	CBaseEntity *pObject = NULL;
+	CBaseEntity *pClosest = NULL;
+	Vector		vecLOS;
+	float flMaxDot = VIEW_FIELD_NARROW;
+	float flDot;
+
+	UTIL_MakeVectors ( pev->v_angle );// so we know which way we are facing
+	
+	while ((pObject = UTIL_FindEntityInSphere( pObject, pev->origin, PLAYER_SEARCH_RADIUS )) != NULL)
+	{
+
+		if (pObject->ObjectCaps() & (FCAP_IMPULSE_USE | FCAP_CONTINUOUS_USE | FCAP_ONOFF_USE))
+		{
+			// !!!PERFORMANCE- should this check be done on a per case basis AFTER we've determined that
+			// this object is actually usable? This dot is being done for every object within PLAYER_SEARCH_RADIUS
+			// when player hits the use key. How many objects can be in that area, anyway? (sjb)
+			vecLOS = (VecBModelOrigin( pObject->pev ) - (pev->origin + pev->view_ofs));
+			
+			// This essentially moves the origin of the target to the corner nearest the player to test to see 
+			// if it's "hull" is in the view cone
+			vecLOS = UTIL_ClampVectorToBox( vecLOS, pObject->pev->size * 0.5 );
+			
+			flDot = DotProduct (vecLOS , gpGlobals->v_forward);
+			if (flDot > flMaxDot )
+			{// only if the item is in front of the user
+				pClosest = pObject;
+				flMaxDot = flDot;
+//				ALERT( at_console, "%s : %f\n", STRING( pObject->pev->classname ), flDot );
+			}
+//			ALERT( at_console, "%s : %f\n", STRING( pObject->pev->classname ), flDot );
+		}
+	}
+	pObject = pClosest;
+
+	// Found an object
+	if (pObject )
+	{
+		//!!!UNDONE: traceline here to prevent USEing buttons through walls			
+		int caps = pObject->ObjectCaps();
+
+		if ( m_afButtonPressed & IN_USE )
+		{
+			//EMIT_SOUND( ENT(pev), CHAN_ITEM, "common/wpn_select.wav", 0.4, ATTN_NORM);
+			const char* theSound = AvHSHUGetCommonSoundName(theAvHPlayer->GetIsAlien(), WEAPON_SOUND_SELECT);
+			EMIT_SOUND( ENT(pev), CHAN_ITEM, theSound, 0.4, ATTN_NORM);
+		}
+
+		if ( ( (pev->button & IN_USE) && (caps & FCAP_CONTINUOUS_USE) ) ||
+			 ( (m_afButtonPressed & IN_USE) && (caps & (FCAP_IMPULSE_USE|FCAP_ONOFF_USE)) ) )
+		{
+			if ( caps & FCAP_CONTINUOUS_USE )
+				m_afPhysicsFlags |= PFLAG_USING;
+
+			pObject->Use( this, this, USE_SET, 1 );
+		}
+		// UNDONE: Send different USE codes for ON/OFF.  Cache last ONOFF_USE object to send 'off' if you turn away
+		else if ( (m_afButtonReleased & IN_USE) && (pObject->ObjectCaps() & FCAP_ONOFF_USE) )	// BUGBUG This is an "off" use
+		{
+			pObject->Use( this, this, USE_SET, 0 );
+		}
+	}
+	else
+	{
+		if ( m_afButtonPressed & IN_USE )
+		{
+			//EMIT_SOUND( ENT(pev), CHAN_ITEM, "common/wpn_denyselect.wav", 0.4, ATTN_NORM);
+			const char* theSound = AvHSHUGetCommonSoundName(theAvHPlayer->GetIsAlien(), WEAPON_SOUND_DENYSELECT);
+			EMIT_SOUND( ENT(pev), CHAN_ITEM, theSound, 0.4, ATTN_NORM);
+		}
+	}
+}
+
+
+
+void CBasePlayer::Jump()
+{
+	Vector		vecWallCheckDir;// direction we're tracing a line to find a wall when walljumping
+	Vector		vecAdjustedVelocity;
+	Vector		vecSpot;
+	TraceResult	tr;
+	
+	if (FBitSet(pev->flags, FL_WATERJUMP))
+		return;
+	
+	if (pev->waterlevel >= 2)
+	{
+		return;
+	}
+
+	// jump velocity is sqrt( height * gravity * 2)
+
+	// If this isn't the first frame pressing the jump button, break out.
+	if ( !FBitSet( m_afButtonPressed, IN_JUMP ) )
+		return;         // don't pogo stick
+
+	if ( !(pev->flags & FL_ONGROUND) || !pev->groundentity )
+	{
+		return;
+	}
+
+// many features in this function use v_forward, so makevectors now.
+	UTIL_MakeVectors (pev->angles);
+
+	// ClearBits(pev->flags, FL_ONGROUND);		// don't stairwalk
+	
+	SetAnimation( PLAYER_JUMP );
+
+	if ( m_fLongJump &&
+		(pev->button & IN_DUCK) &&
+		( pev->flDuckTime > 0 ) &&
+		pev->velocity.Length() > 50 )
+	{
+		SetAnimation( PLAYER_SUPERJUMP );
+	}
+
+	// If you're standing on a conveyor, add it's velocity to yours (for momentum)
+	entvars_t *pevGround = VARS(pev->groundentity);
+	if ( pevGround && (pevGround->flags & FL_CONVEYOR) )
+	{
+		pev->velocity = pev->velocity + pev->basevelocity;
+	}
+}
+
+
+
+// This is a glorious hack to find free space when you've crouched into some solid space
+// Our crouching collisions do not work correctly for some reason and this is easier
+// than fixing the problem :(
+void FixPlayerCrouchStuck( edict_t *pPlayer )
+{
+	TraceResult trace;
+
+	// Move up as many as 18 pixels if the player is stuck.
+	for ( int i = 0; i < 18; i++ )
+	{
+		UTIL_TraceHull( pPlayer->v.origin, pPlayer->v.origin, dont_ignore_monsters, head_hull, pPlayer, &trace );
+		if ( trace.fStartSolid )
+			pPlayer->v.origin.z ++;
+		else
+			break;
+	}
+}
+
+void CBasePlayer::Duck( )
+{
+	if (pev->button & IN_DUCK) 
+	{
+		if ( m_IdealActivity != ACT_LEAP )
+		{
+			SetAnimation( PLAYER_WALK );
+		}
+	}
+}
+
+//
+// ID's player as such.
+//
+int  CBasePlayer::Classify ( void )
+{
+	return CLASS_PLAYER;
+}
+
+
+void CBasePlayer::AddPoints( int score, BOOL bAllowNegativeScore )
+{
+	// Positive score always adds
+	if ( score < 0 )
+	{
+		if ( !bAllowNegativeScore )
+		{
+			if ( pev->frags < 0 )		// Can't go more negative
+				return;
+			
+			if ( -score > pev->frags )	// Will this go negative?
+			{
+				score = -pev->frags;		// Sum will be 0
+			}
+		}
+	}
+
+	pev->frags += score;
+}
+
+void CBasePlayer::EffectivePlayerClassChanged()
+{
+}
+
+void CBasePlayer::NeedsTeamUpdate()
+{
+}
+
+void CBasePlayer::SendTeamUpdate()
+{
+}
+
+void CBasePlayer::AddPointsToTeam( int score, BOOL bAllowNegativeScore )
+{
+	int index = entindex();
+
+	for ( int i = 1; i <= gpGlobals->maxClients; i++ )
+	{
+		CBaseEntity *pPlayer = UTIL_PlayerByIndex( i );
+
+		if ( pPlayer && i != index )
+		{
+			if ( g_pGameRules->PlayerRelationship( this, pPlayer ) == GR_TEAMMATE )
+			{
+				pPlayer->AddPoints( score, bAllowNegativeScore );
+			}
+		}
+	}
+}
+
+//Player ID
+void CBasePlayer::InitStatusBar()
+{
+	m_flStatusBarDisappearDelay = 0;
+	m_SbarString1[0] = m_SbarString0[0] = 0; 
+}
+
+void CBasePlayer::UpdateStatusBar()
+{
+	int newSBarState[ SBAR_END ];
+	char sbuf0[ SBAR_STRING_SIZE ];
+	char sbuf1[ SBAR_STRING_SIZE ];
+
+	int i;
+
+    for (i = 0; i < SBAR_END; ++i)
+    {
+        newSBarState[i] = -1;
+    }
+    
+    //memset( newSBarState, 0, sizeof(newSBarState) );
+
+    strcpy( sbuf0, m_SbarString0 );
+	strcpy( sbuf1, m_SbarString1 );
+
+	// Find an ID Target
+	TraceResult tr;
+	UTIL_MakeVectors( pev->v_angle + pev->punchangle );
+	Vector vecSrc = EyePosition();
+	Vector vecEnd = vecSrc + (gpGlobals->v_forward * MAX_ID_RANGE);
+	UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, edict(), &tr);
+
+	bool theIsCombatMode = GetGameRules()->GetIsCombatMode();
+	int theMaxEnumToSend = SBAR_ID_TARGETARMOR;
+	if(theIsCombatMode)
+	{
+		theMaxEnumToSend = SBAR_ID_TARGETLEVEL;
+	}
+
+	if (tr.flFraction != 1.0)
+	{
+		if ( !FNullEnt( tr.pHit ) )
+		{
+			CBaseEntity *pEntity = CBaseEntity::Instance( tr.pHit );
+
+			if(!pEntity)
+				return;
+
+			if (pEntity->Classify() == CLASS_PLAYER )
+			{
+				newSBarState[ SBAR_ID_TARGETNAME ] = ENTINDEX( pEntity->edict() );
+				
+				// Name Health: X% Armor: Y%
+				//strcpy( sbuf1, "1 %p1\n2 Health: %i2%%\n3 Armor: %i3%%" );
+
+				// (health: X armor: Y)
+				if(!theIsCombatMode)
+				{
+					strcpy( sbuf1, "2 (health: %i2%%\n3 armor: %i3%%)" );
+				}
+				else
+				{
+					strcpy( sbuf1, "2 (health: %i2%%\n3 armor: %i3%%\n4 level: %i4)" );
+				}
+
+				// allies and medics get to see the targets health
+				if ( g_pGameRules->PlayerRelationship( this, pEntity ) == GR_TEAMMATE )
+				{
+					int theLevel = 1;
+					AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(pEntity);
+					if(thePlayer)
+					{
+						theLevel = thePlayer->GetExperienceLevel();
+					}
+
+					//newSBarState[ SBAR_ID_TARGETHEALTH ] = 100 * (pEntity->pev->health / pEntity->pev->max_health);
+					//newSBarState[ SBAR_ID_TARGETARMOR ] = pEntity->pev->armorvalue; //No need to get it % based since 100 it's the max.
+					float theHealthPercent = pEntity->pev->health/AvHPlayerUpgrade::GetMaxHealth(pEntity->pev->iuser4, (AvHUser3)pEntity->pev->iuser3, theLevel);
+					float theArmorPercent = pEntity->pev->armorvalue/AvHPlayerUpgrade::GetMaxArmorLevel(pEntity->pev->iuser4, (AvHUser3)pEntity->pev->iuser3);
+					newSBarState[ SBAR_ID_TARGETHEALTH ] = max(theHealthPercent*100+0.5, 0);
+					newSBarState[ SBAR_ID_TARGETARMOR ] = max(theArmorPercent*100+0.5, 0);
+					newSBarState[ SBAR_ID_TARGETLEVEL ] = theLevel;
+				}
+			}
+			else 
+			{
+				bool theSuccess = false;
+
+				// Show hive health for friendlies
+				if(this->pev->team == pEntity->pev->team)
+				{
+					AvHUser3 theUser3 = (AvHUser3)pEntity->pev->iuser3;
+					switch(theUser3)
+					{
+					// Place user3s to draw here
+					case AVH_USER3_HIVE:
+						theSuccess = true;
+						break;
+					}
+				}
+
+				if(theSuccess)
+				{
+					newSBarState[ SBAR_ID_TARGETNAME ] = ENTINDEX( pEntity->edict() );
+
+					strcpy( sbuf1, "2 (health: %i2%%)\n" );
+
+					float theHealthPercentage = pEntity->pev->health/pEntity->pev->max_health;
+					newSBarState[ SBAR_ID_TARGETHEALTH ] = max(theHealthPercentage*100+0.5, 0);
+				}
+			}
+
+			m_flStatusBarDisappearDelay = gpGlobals->time + 1.0;
+		}
+		else if ( m_flStatusBarDisappearDelay > gpGlobals->time )
+		{
+			// hold the values for a short amount of time after viewing the object
+			newSBarState[ SBAR_ID_TARGETNAME ] = m_izSBarState[ SBAR_ID_TARGETNAME ];
+			newSBarState[ SBAR_ID_TARGETHEALTH ] = m_izSBarState[ SBAR_ID_TARGETHEALTH ];
+			newSBarState[ SBAR_ID_TARGETARMOR ] = m_izSBarState[ SBAR_ID_TARGETARMOR ];
+			newSBarState[ SBAR_ID_TARGETLEVEL ] = m_izSBarState[ SBAR_ID_TARGETLEVEL ];
+		}
+	}
+
+	BOOL bForceResend = FALSE;
+
+	if ( strcmp( sbuf0, m_SbarString0 ) )
+	{
+		MESSAGE_BEGIN( MSG_ONE, gmsgStatusText, NULL, pev );
+			WRITE_BYTE( 0 );
+			WRITE_STRING( sbuf0 );
+		MESSAGE_END();
+
+		strcpy( m_SbarString0, sbuf0 );
+
+		// make sure everything's resent
+		bForceResend = TRUE;
+	}
+
+	if ( strcmp( sbuf1, m_SbarString1 ) )
+	{
+		MESSAGE_BEGIN( MSG_ONE, gmsgStatusText, NULL, pev );
+			WRITE_BYTE( 1 );
+			WRITE_STRING( sbuf1 );
+		MESSAGE_END();
+
+		strcpy( m_SbarString1, sbuf1 );
+
+		// make sure everything's resent
+		bForceResend = TRUE;
+	}
+
+	// Check values and send if they don't match
+	for (i = 1; i <= theMaxEnumToSend; i++)
+	{
+		if ( newSBarState[i] != m_izSBarState[i] || bForceResend )
+		{
+			MESSAGE_BEGIN( MSG_ONE, gmsgStatusValue, NULL, pev );
+				WRITE_BYTE( i );
+				WRITE_SHORT( newSBarState[i] );
+			MESSAGE_END();
+
+			m_izSBarState[i] = newSBarState[i];
+		}
+	}
+}
+
+
+
+
+
+
+
+
+
+#define CLIMB_SHAKE_FREQUENCY	22	// how many frames in between screen shakes when climbing
+#define	MAX_CLIMB_SPEED			200	// fastest vertical climbing speed possible
+#define	CLIMB_SPEED_DEC			15	// climbing deceleration rate
+#define	CLIMB_PUNCH_X			-7  // how far to 'punch' client X axis when climbing
+#define CLIMB_PUNCH_Z			7	// how far to 'punch' client Z axis when climbing
+
+void CBasePlayer::PreThink(void)
+{
+	int buttonsChanged = (m_afButtonLast ^ pev->button);	// These buttons have changed this frame
+	
+	// Debounced button codes for pressed/released
+	// UNDONE: Do we need auto-repeat?
+	m_afButtonPressed =  buttonsChanged & pev->button;		// The changed ones still down are "pressed"
+	m_afButtonReleased = buttonsChanged & (~pev->button);	// The ones not down are "released"
+
+	g_pGameRules->PlayerThink( this );
+
+	if ( g_fGameOver )
+		return;         // intermission or finale
+
+	UTIL_MakeVectors(pev->v_angle);             // is this still used?
+	
+	ItemPreFrame( );
+	WaterMove();
+
+	if ( g_pGameRules && g_pGameRules->FAllowFlashlight() )
+		m_iHideHUD &= ~HIDEHUD_FLASHLIGHT;
+	else
+		m_iHideHUD |= HIDEHUD_FLASHLIGHT;
+
+
+	// JOHN: checks if new client data (for HUD and view control) needs to be sent to the client
+	UpdateClientData();
+	
+	CheckTimeBasedDamage();
+
+	// Observer Button Handling
+	if (this->IsObserver() )
+	{
+		Observer_HandleButtons();
+		pev->impulse = 0;
+		return;
+	}
+
+	CheckSuitUpdate();
+
+	if (pev->deadflag >= DEAD_DYING)
+	{
+		PlayerDeathThink();
+		return;
+	}
+
+	// So the correct flags get sent to client asap.
+	//
+	if ( m_afPhysicsFlags & PFLAG_ONTRAIN )
+		pev->flags |= FL_ONTRAIN;
+	else 
+		pev->flags &= ~FL_ONTRAIN;
+
+	// Train speed control
+	if ( m_afPhysicsFlags & PFLAG_ONTRAIN )
+	{
+		CBaseEntity *pTrain = CBaseEntity::Instance( pev->groundentity );
+		float vel;
+		
+		if ( !pTrain )
+		{
+			TraceResult trainTrace;
+			// Maybe this is on the other side of a level transition
+			UTIL_TraceLine( pev->origin, pev->origin + Vector(0,0,-38), ignore_monsters, ENT(pev), &trainTrace );
+
+			// HACKHACK - Just look for the func_tracktrain classname
+			if ( trainTrace.flFraction != 1.0 && trainTrace.pHit )
+			pTrain = CBaseEntity::Instance( trainTrace.pHit );
+
+
+			if ( !pTrain || !(pTrain->ObjectCaps() & FCAP_DIRECTIONAL_USE) || !pTrain->OnControls(pev) )
+			{
+				//ALERT( at_error, "In train mode with no train!\n" );
+				m_afPhysicsFlags &= ~PFLAG_ONTRAIN;
+				m_iTrain = TRAIN_NEW|TRAIN_OFF;
+				return;
+			}
+		}
+		else if ( !FBitSet( pev->flags, FL_ONGROUND ) || FBitSet( pTrain->pev->spawnflags, SF_TRACKTRAIN_NOCONTROL ) || (pev->button & (IN_MOVELEFT|IN_MOVERIGHT) ) )
+		{
+			// Turn off the train if you jump, strafe, or the train controls go dead
+			m_afPhysicsFlags &= ~PFLAG_ONTRAIN;
+			m_iTrain = TRAIN_NEW|TRAIN_OFF;
+			return;
+		}
+
+		pev->velocity = g_vecZero;
+		vel = 0;
+		if ( m_afButtonPressed & IN_FORWARD )
+		{
+			vel = 1;
+			pTrain->Use( this, this, USE_SET, (float)vel );
+		}
+		else if ( m_afButtonPressed & IN_BACK )
+		{
+			vel = -1;
+			pTrain->Use( this, this, USE_SET, (float)vel );
+		}
+
+		if (vel)
+		{
+			m_iTrain = TrainSpeed(pTrain->pev->speed, pTrain->pev->impulse);
+			m_iTrain |= TRAIN_ACTIVE|TRAIN_NEW;
+		}
+
+	} else if (m_iTrain & TRAIN_ACTIVE)
+		m_iTrain = TRAIN_NEW; // turn off train
+
+	if (pev->button & IN_JUMP)
+	{
+		// If on a ladder, jump off the ladder
+		// else Jump
+		Jump();
+	}
+
+
+	// If trying to duck, already ducked, or in the process of ducking
+	if ((pev->button & IN_DUCK) || FBitSet(pev->flags,FL_DUCKING) || (m_afPhysicsFlags & PFLAG_DUCKING) )
+		Duck();
+
+	if ( !FBitSet ( pev->flags, FL_ONGROUND ) )
+	{
+		m_flFallVelocity = -pev->velocity.z;
+	}
+
+	// StudioFrameAdvance( );//!!!HACKHACK!!! Can't be hit by traceline when not animating?
+
+	// Clear out ladder pointer
+	m_hEnemy = NULL;
+
+	if ( m_afPhysicsFlags & PFLAG_ONBARNACLE )
+	{
+		pev->velocity = g_vecZero;
+	}
+}
+/* Time based Damage works as follows: 
+	1) There are several types of timebased damage:
+
+		#define DMG_PARALYZE		(1 << 14)	// slows affected creature down
+		#define DMG_NERVEGAS		(1 << 15)	// nerve toxins, very bad
+		#define DMG_POISON			(1 << 16)	// blood poisioning
+		#define DMG_RADIATION		(1 << 17)	// radiation exposure
+		#define DMG_DROWNRECOVER	(1 << 18)	// drown recovery
+		#define DMG_ACID			(1 << 19)	// toxic chemicals or acid burns
+		#define DMG_SLOWBURN		(1 << 20)	// in an oven
+		#define DMG_SLOWFREEZE		(1 << 21)	// in a subzero freezer
+
+	2) A new hit inflicting tbd restarts the tbd counter - each monster has an 8bit counter,
+		per damage type. The counter is decremented every second, so the maximum time 
+		an effect will last is 255/60 = 4.25 minutes.  Of course, staying within the radius
+		of a damaging effect like fire, nervegas, radiation will continually reset the counter to max.
+
+	3) Every second that a tbd counter is running, the player takes damage.  The damage
+		is determined by the type of tdb.  
+			Paralyze		- 1/2 movement rate, 30 second duration.
+			Nervegas		- 5 points per second, 16 second duration = 80 points max dose.
+			Poison			- 2 points per second, 25 second duration = 50 points max dose.
+			Radiation		- 1 point per second, 50 second duration = 50 points max dose.
+			Drown			- 5 points per second, 2 second duration.
+			Acid/Chemical	- 5 points per second, 10 second duration = 50 points max.
+			Burn			- 10 points per second, 2 second duration.
+			Freeze			- 3 points per second, 10 second duration = 30 points max.
+
+	4) Certain actions or countermeasures counteract the damaging effects of tbds:
+
+		Armor/Heater/Cooler - Chemical(acid),burn, freeze all do damage to armor power, then to body
+							- recharged by suit recharger
+		Air In Lungs		- drowning damage is done to air in lungs first, then to body
+							- recharged by poking head out of water
+							- 10 seconds if swiming fast
+		Air In SCUBA		- drowning damage is done to air in tanks first, then to body
+							- 2 minutes in tanks. Need new tank once empty.
+		Radiation Syringe	- Each syringe full provides protection vs one radiation dosage
+		Antitoxin Syringe	- Each syringe full provides protection vs one poisoning (nervegas or poison).
+		Health kit			- Immediate stop to acid/chemical, fire or freeze damage.
+		Radiation Shower	- Immediate stop to radiation damage, acid/chemical or fire damage.
+		
+	
+*/
+
+// If player is taking time based damage, continue doing damage to player -
+// this simulates the effect of being poisoned, gassed, dosed with radiation etc -
+// anything that continues to do damage even after the initial contact stops.
+// Update all time based damage counters, and shut off any that are done.
+
+// The m_bitsDamageType bit MUST be set if any damage is to be taken.
+// This routine will detect the initial on value of the m_bitsDamageType
+// and init the appropriate counter.  Only processes damage every second.
+
+//#define PARALYZE_DURATION	30		// number of 2 second intervals to take damage
+//#define PARALYZE_DAMAGE		0.0		// damage to take each 2 second interval
+
+//#define NERVEGAS_DURATION	16
+//#define NERVEGAS_DAMAGE		5.0
+
+//#define POISON_DURATION		25
+//#define POISON_DAMAGE		2.0
+
+//#define RADIATION_DURATION	50
+//#define RADIATION_DAMAGE	1.0
+
+//#define ACID_DURATION		10
+//#define ACID_DAMAGE			5.0
+
+//#define SLOWBURN_DURATION	2
+//#define SLOWBURN_DAMAGE		1.0
+
+//#define SLOWFREEZE_DURATION	1.0
+//#define SLOWFREEZE_DAMAGE	3.0
+
+/* */
+
+
+void CBasePlayer::CheckTimeBasedDamage() 
+{
+	int i;
+	BYTE bDuration = 0;
+
+	static float gtbdPrev = 0.0;
+
+	if (!(m_bitsDamageType & DMG_TIMEBASED))
+		return;
+
+	// only check for time based damage approx. every 2 seconds
+	if (abs(gpGlobals->time - m_tbdPrev) < 2.0)
+		return;
+	
+	m_tbdPrev = gpGlobals->time;
+
+	for (i = 0; i < CDMG_TIMEBASED; i++)
+	{
+		// make sure bit is set for damage type
+		if (m_bitsDamageType & (DMG_PARALYZE << i))
+		{
+			switch (i)
+			{
+			case itbd_Paralyze:
+				// UNDONE - flag movement as half-speed
+				bDuration = PARALYZE_DURATION;
+				break;
+			case itbd_NerveGas:
+//				TakeDamage(pev, pev, NERVEGAS_DAMAGE, DMG_GENERIC);	
+				bDuration = NERVEGAS_DURATION;
+				break;
+			case itbd_Poison:
+				TakeDamage(pev, pev, POISON_DAMAGE, DMG_GENERIC);
+				bDuration = POISON_DURATION;
+				break;
+			case itbd_Radiation:
+//				TakeDamage(pev, pev, RADIATION_DAMAGE, DMG_GENERIC);
+				bDuration = RADIATION_DURATION;
+				break;
+			case itbd_DrownRecover:
+				// NOTE: this hack is actually used to RESTORE health
+				// after the player has been drowning and finally takes a breath
+				if (m_idrowndmg > m_idrownrestored)
+				{
+					int idif = min(m_idrowndmg - m_idrownrestored, 10);
+
+					TakeHealth(idif, DMG_GENERIC);
+					m_idrownrestored += idif;
+				}
+				bDuration = 4;	// get up to 5*10 = 50 points back
+				break;
+			case itbd_Acid:
+//				TakeDamage(pev, pev, ACID_DAMAGE, DMG_GENERIC);
+				bDuration = ACID_DURATION;
+				break;
+			case itbd_SlowBurn:
+//				TakeDamage(pev, pev, SLOWBURN_DAMAGE, DMG_GENERIC);
+				bDuration = SLOWBURN_DURATION;
+				break;
+			case itbd_SlowFreeze:
+//				TakeDamage(pev, pev, SLOWFREEZE_DAMAGE, DMG_GENERIC);
+				bDuration = SLOWFREEZE_DURATION;
+				break;
+			default:
+				bDuration = 0;
+			}
+
+			if (m_rgbTimeBasedDamage[i])
+			{
+				// use up an antitoxin on poison or nervegas after a few seconds of damage					
+				if (((i == itbd_NerveGas) && (m_rgbTimeBasedDamage[i] < NERVEGAS_DURATION)) ||
+					((i == itbd_Poison)   && (m_rgbTimeBasedDamage[i] < POISON_DURATION)))
+				{
+					if (m_rgItems[ITEM_ANTIDOTE])
+					{
+						m_rgbTimeBasedDamage[i] = 0;
+						m_rgItems[ITEM_ANTIDOTE]--;
+						SetSuitUpdate("!HEV_HEAL4", FALSE, SUIT_REPEAT_OK);
+					}
+				}
+
+
+				// decrement damage duration, detect when done.
+				if (!m_rgbTimeBasedDamage[i] || --m_rgbTimeBasedDamage[i] == 0)
+				{
+					m_rgbTimeBasedDamage[i] = 0;
+					// if we're done, clear damage bits
+					m_bitsDamageType &= ~(DMG_PARALYZE << i);	
+				}
+			}
+			else
+				// first time taking this damage type - init damage duration
+				m_rgbTimeBasedDamage[i] = bDuration;
+		}
+	}
+}
+
+/*
+THE POWER SUIT
+
+The Suit provides 3 main functions: Protection, Notification and Augmentation. 
+Some functions are automatic, some require power. 
+The player gets the suit shortly after getting off the train in C1A0 and it stays
+with him for the entire game.
+
+Protection
+
+	Heat/Cold
+		When the player enters a hot/cold area, the heating/cooling indicator on the suit 
+		will come on and the battery will drain while the player stays in the area. 
+		After the battery is dead, the player starts to take damage. 
+		This feature is built into the suit and is automatically engaged.
+	Radiation Syringe
+		This will cause the player to be immune from the effects of radiation for N seconds. Single use item.
+	Anti-Toxin Syringe
+		This will cure the player from being poisoned. Single use item.
+	Health
+		Small (1st aid kits, food, etc.)
+		Large (boxes on walls)
+	Armor
+		The armor works using energy to create a protective field that deflects a
+		percentage of damage projectile and explosive attacks. After the armor has been deployed,
+		it will attempt to recharge itself to full capacity with the energy reserves from the battery.
+		It takes the armor N seconds to fully charge. 
+
+Notification (via the HUD)
+
+x	Health
+x	Ammo  
+x	Automatic Health Care
+		Notifies the player when automatic healing has been engaged. 
+x	Geiger counter
+		Classic Geiger counter sound and status bar at top of HUD 
+		alerts player to dangerous levels of radiation. This is not visible when radiation levels are normal.
+x	Poison
+	Armor
+		Displays the current level of armor. 
+
+Augmentation 
+
+	Reanimation (w/adrenaline)
+		Causes the player to come back to life after he has been dead for 3 seconds. 
+		Will not work if player was gibbed. Single use.
+	Long Jump
+		Used by hitting the ??? key(s). Caused the player to further than normal.
+	SCUBA	
+		Used automatically after picked up and after player enters the water. 
+		Works for N seconds. Single use.	
+	
+Things powered by the battery
+
+	Armor		
+		Uses N watts for every M units of damage.
+	Heat/Cool	
+		Uses N watts for every second in hot/cold area.
+	Long Jump	
+		Uses N watts for every jump.
+	Alien Cloak	
+		Uses N watts for each use. Each use lasts M seconds.
+	Alien Shield	
+		Augments armor. Reduces Armor drain by one half
+ 
+*/
+
+// if in range of radiation source, ping geiger counter
+
+#define GEIGERDELAY 0.25
+
+void CBasePlayer :: UpdateGeigerCounter( void )
+{
+	BYTE range;
+
+	// delay per update ie: don't flood net with these msgs
+	if (gpGlobals->time < m_flgeigerDelay)
+		return;
+
+	m_flgeigerDelay = gpGlobals->time + GEIGERDELAY;
+		
+	// send range to radition source to client
+
+	range = (BYTE) (m_flgeigerRange / 4);
+
+	if (range != m_igeigerRangePrev)
+	{
+		m_igeigerRangePrev = range;
+
+		MESSAGE_BEGIN( MSG_ONE, gmsgGeigerRange, NULL, pev );
+			WRITE_BYTE( range );
+		MESSAGE_END();
+	}
+
+	// reset counter and semaphore
+	if (!RANDOM_LONG(0,3))
+		m_flgeigerRange = 1000;
+
+}
+
+/*
+================
+CheckSuitUpdate
+
+Play suit update if it's time
+================
+*/
+
+#define SUITUPDATETIME	3.5
+#define SUITFIRSTUPDATETIME 0.1
+
+void CBasePlayer::CheckSuitUpdate()
+{
+	int i;
+	int isentence = 0;
+	int isearch = m_iSuitPlayNext;
+	
+	// Ignore suit updates if no suit
+	if ( !(pev->weapons & (1<<WEAPON_SUIT)) )
+		return;
+
+	// if in range of radiation source, ping geiger counter
+	UpdateGeigerCounter();
+
+	if ( g_pGameRules->IsMultiplayer() )
+	{
+		// don't bother updating HEV voice in multiplayer.
+		return;
+	}
+
+	if ( gpGlobals->time >= m_flSuitUpdate && m_flSuitUpdate > 0)
+	{
+		// play a sentence off of the end of the queue
+		for (i = 0; i < CSUITPLAYLIST; i++)
+			{
+			if (isentence = m_rgSuitPlayList[isearch])
+				break;
+			
+			if (++isearch == CSUITPLAYLIST)
+				isearch = 0;
+			}
+
+		if (isentence)
+		{
+			m_rgSuitPlayList[isearch] = 0;
+			if (isentence > 0)
+			{
+				// play sentence number
+
+				char sentence[CBSENTENCENAME_MAX+1];
+				strcpy(sentence, "!");
+				strcat(sentence, gszallsentencenames[isentence]);
+				EMIT_SOUND_SUIT(ENT(pev), sentence);
+			}
+			else
+			{
+				// play sentence group
+				EMIT_GROUPID_SUIT(ENT(pev), -isentence);
+			}
+		m_flSuitUpdate = gpGlobals->time + SUITUPDATETIME;
+		}
+		else
+			// queue is empty, don't check 
+			m_flSuitUpdate = 0;
+	}
+}
+ 
+// add sentence to suit playlist queue. if fgroup is true, then
+// name is a sentence group (HEV_AA), otherwise name is a specific
+// sentence name ie: !HEV_AA0.  If iNoRepeat is specified in
+// seconds, then we won't repeat playback of this word or sentence
+// for at least that number of seconds.
+
+void CBasePlayer::SetSuitUpdate(char *name, int fgroup, int iNoRepeatTime)
+{
+	int i;
+	int isentence;
+	int iempty = -1;
+	
+	
+	// Ignore suit updates if no suit
+	if ( !(pev->weapons & (1<<WEAPON_SUIT)) )
+		return;
+
+	if ( g_pGameRules->IsMultiplayer() )
+	{
+		// due to static channel design, etc. We don't play HEV sounds in multiplayer right now.
+		return;
+	}
+
+	// if name == NULL, then clear out the queue
+
+	if (!name)
+	{
+		for (i = 0; i < CSUITPLAYLIST; i++)
+			m_rgSuitPlayList[i] = 0;
+		return;
+	}
+	// get sentence or group number
+	if (!fgroup)
+	{
+		isentence = SENTENCEG_Lookup(name, NULL);
+		if (isentence < 0)
+			return;
+	}
+	else
+		// mark group number as negative
+		isentence = -SENTENCEG_GetIndex(name);
+
+	// check norepeat list - this list lets us cancel
+	// the playback of words or sentences that have already
+	// been played within a certain time.
+
+	for (i = 0; i < CSUITNOREPEAT; i++)
+	{
+		if (isentence == m_rgiSuitNoRepeat[i])
+			{
+			// this sentence or group is already in 
+			// the norepeat list
+
+			if (m_rgflSuitNoRepeatTime[i] < gpGlobals->time)
+				{
+				// norepeat time has expired, clear it out
+				m_rgiSuitNoRepeat[i] = 0;
+				m_rgflSuitNoRepeatTime[i] = 0.0;
+				iempty = i;
+				break;
+				}
+			else
+				{
+				// don't play, still marked as norepeat
+				return;
+				}
+			}
+		// keep track of empty slot
+		if (!m_rgiSuitNoRepeat[i])
+			iempty = i;
+	}
+
+	// sentence is not in norepeat list, save if norepeat time was given
+
+	if (iNoRepeatTime)
+	{
+		if (iempty < 0)
+			iempty = RANDOM_LONG(0, CSUITNOREPEAT-1); // pick random slot to take over
+		m_rgiSuitNoRepeat[iempty] = isentence;
+		m_rgflSuitNoRepeatTime[iempty] = iNoRepeatTime + gpGlobals->time;
+	}
+
+	// find empty spot in queue, or overwrite last spot
+	
+	m_rgSuitPlayList[m_iSuitPlayNext++] = isentence;
+	if (m_iSuitPlayNext == CSUITPLAYLIST)
+		m_iSuitPlayNext = 0;
+
+	if (m_flSuitUpdate <= gpGlobals->time)
+	{
+		if (m_flSuitUpdate == 0)
+			// play queue is empty, don't delay too long before playback
+			m_flSuitUpdate = gpGlobals->time + SUITFIRSTUPDATETIME;
+		else 
+			m_flSuitUpdate = gpGlobals->time + SUITUPDATETIME; 
+	}
+
+}
+
+/*
+================
+CheckPowerups
+
+Check for turning off powerups
+
+GLOBALS ASSUMED SET:  g_ulModelIndexPlayer
+================
+*/
+	static void
+CheckPowerups(entvars_t *pev)
+{
+	if (pev->health <= 0)
+		return;
+    
+    //pev->modelindex = g_ulModelIndexPlayer;    // don't use eyes
+}
+
+
+//=========================================================
+// UpdatePlayerSound - updates the position of the player's
+// reserved sound slot in the sound list.
+//=========================================================
+void CBasePlayer :: UpdatePlayerSound ( void )
+{
+	int iBodyVolume;
+	int iVolume;
+	CSound *pSound;
+
+	pSound = CSoundEnt::SoundPointerForIndex( CSoundEnt :: ClientSoundIndex( edict() ) );
+
+	if ( !pSound )
+	{
+		ALERT ( at_console, "Client lost reserved sound!\n" );
+		return;
+	}
+
+	pSound->m_iType = bits_SOUND_NONE;
+
+	// now calculate the best target volume for the sound. If the player's weapon
+	// is louder than his body/movement, use the weapon volume, else, use the body volume.
+	
+	if ( FBitSet ( pev->flags, FL_ONGROUND ) )
+	{	
+		iBodyVolume = pev->velocity.Length(); 
+
+		// clamp the noise that can be made by the body, in case a push trigger,
+		// weapon recoil, or anything shoves the player abnormally fast. 
+		if ( iBodyVolume > 512 )
+		{
+			iBodyVolume = 512;
+		}
+	}
+	else
+	{
+		iBodyVolume = 0;
+	}
+
+	if ( pev->button & IN_JUMP )
+	{
+		iBodyVolume += 100;
+	}
+
+// convert player move speed and actions into sound audible by monsters.
+	if ( m_iWeaponVolume > iBodyVolume )
+	{
+		m_iTargetVolume = m_iWeaponVolume;
+
+		// OR in the bits for COMBAT sound if the weapon is being louder than the player. 
+		pSound->m_iType |= bits_SOUND_COMBAT;
+	}
+	else
+	{
+		m_iTargetVolume = iBodyVolume;
+	}
+
+	// decay weapon volume over time so bits_SOUND_COMBAT stays set for a while
+	m_iWeaponVolume -= 250 * gpGlobals->frametime;
+	if ( m_iWeaponVolume < 0 )
+	{
+		iVolume = 0;
+	}
+
+
+	// if target volume is greater than the player sound's current volume, we paste the new volume in 
+	// immediately. If target is less than the current volume, current volume is not set immediately to the
+	// lower volume, rather works itself towards target volume over time. This gives monsters a much better chance
+	// to hear a sound, especially if they don't listen every frame.
+	iVolume = pSound->m_iVolume;
+
+	if ( m_iTargetVolume > iVolume )
+	{
+		iVolume = m_iTargetVolume;
+	}
+	else if ( iVolume > m_iTargetVolume )
+	{
+		iVolume -= 250 * gpGlobals->frametime;
+
+		if ( iVolume < m_iTargetVolume )
+		{
+			iVolume = 0;
+		}
+	}
+
+	if ( m_fNoPlayerSound )
+	{
+		// debugging flag, lets players move around and shoot without monsters hearing.
+		iVolume = 0;
+	}
+
+	if ( gpGlobals->time > m_flStopExtraSoundTime )
+	{
+		// since the extra sound that a weapon emits only lasts for one client frame, we keep that sound around for a server frame or two 
+		// after actual emission to make sure it gets heard.
+		m_iExtraSoundTypes = 0;
+	}
+
+	if ( pSound )
+	{
+		pSound->m_vecOrigin = pev->origin;
+		pSound->m_iType |= ( bits_SOUND_PLAYER | m_iExtraSoundTypes );
+		pSound->m_iVolume = iVolume;
+	}
+
+	// keep track of virtual muzzle flash
+	m_iWeaponFlash -= 256 * gpGlobals->frametime;
+	if (m_iWeaponFlash < 0)
+		m_iWeaponFlash = 0;
+
+	//UTIL_MakeVectors ( pev->angles );
+	//gpGlobals->v_forward.z = 0;
+
+	// Below are a couple of useful little bits that make it easier to determine just how much noise the 
+	// player is making. 
+	// UTIL_ParticleEffect ( pev->origin + gpGlobals->v_forward * iVolume, g_vecZero, 255, 25 );
+	//ALERT ( at_console, "%d/%d\n", iVolume, m_iTargetVolume );
+}
+
+
+void CBasePlayer::PostThink()
+{
+	if ( g_fGameOver )
+		goto pt_end;         // intermission or finale
+
+	if (!IsAlive())
+		goto pt_end;
+
+	// Handle Tank controlling
+	if ( m_pTank != NULL )
+	{ // if they've moved too far from the gun,  or selected a weapon, unuse the gun
+		if ( m_pTank->OnControls( pev ) && !pev->weaponmodel )
+		{  
+			m_pTank->Use( this, this, USE_SET, 2 );	// try fire the gun
+		}
+		else
+		{  // they've moved off the platform
+			m_pTank->Use( this, this, USE_OFF, 0 );
+			m_pTank = NULL;
+		}
+	}
+
+// do weapon stuff
+	ItemPostFrame( );
+
+// check to see if player landed hard enough to make a sound
+// falling farther than half of the maximum safe distance, but not as far a max safe distance will
+// play a bootscrape sound, and no damage will be inflicted. Fallling a distance shorter than half
+// of maximum safe distance will make no sound. Falling farther than max safe distance will play a 
+// fallpain sound, and damage will be inflicted based on how far the player fell
+
+	if ( (FBitSet(pev->flags, FL_ONGROUND)) && (pev->health > 0) && m_flFallVelocity >= PLAYER_FALL_PUNCH_THRESHHOLD )
+	{
+		// ALERT ( at_console, "%f\n", m_flFallVelocity );
+
+		if (pev->watertype == CONTENT_WATER)
+		{
+			// Did he hit the world or a non-moving entity?
+			// BUG - this happens all the time in water, especially when 
+			// BUG - water has current force
+			// if ( !pev->groundentity || VARS(pev->groundentity)->velocity.z == 0 )
+				// EMIT_SOUND(ENT(pev), CHAN_BODY, "player/pl_wade1.wav", 1, ATTN_NORM);
+		}
+		// skulks, lerks, fades and jetpackers don't take falling damage
+		else if ((m_flFallVelocity > PLAYER_MAX_SAFE_FALL_SPEED) && (this->pev->iuser3 != AVH_USER3_ALIEN_PLAYER1) && (this->pev->iuser3 != AVH_USER3_ALIEN_PLAYER3) && (this->pev->iuser3 != AVH_USER3_ALIEN_PLAYER4) && (!GetHasUpgrade(this->pev->iuser4, MASK_UPGRADE_7) || !(this->pev->iuser3 == AVH_USER3_MARINE_PLAYER)) )
+		{// after this point, we start doing damage
+			
+			float flFallDamage = g_pGameRules->FlPlayerFallDamage( this );
+
+			if ( flFallDamage > pev->health )
+			{//splat
+				// note: play on item channel because we play footstep landing on body channel
+				EMIT_SOUND(ENT(pev), CHAN_ITEM, "common/bodysplat.wav", 1, ATTN_NORM);
+			}
+
+			if ( flFallDamage > 0 )
+			{
+				TakeDamage(VARS(eoNullEntity), VARS(eoNullEntity), flFallDamage, DMG_FALL ); 
+				pev->punchangle.x = 0;
+			}
+		}
+
+		if ( IsAlive() )
+		{
+			SetAnimation( PLAYER_WALK );
+		}
+    }
+
+	if (FBitSet(pev->flags, FL_ONGROUND))
+	{		
+		if (m_flFallVelocity > 64 && !g_pGameRules->IsMultiplayer())
+		{
+			CSoundEnt::InsertSound ( bits_SOUND_PLAYER, pev->origin, m_flFallVelocity, 0.2 );
+			// ALERT( at_console, "fall %f\n", m_flFallVelocity );
+		}
+		m_flFallVelocity = 0;
+	}
+
+	// select the proper animation for the player character	
+	if ( IsAlive() )
+	{
+		if (!pev->velocity.x && !pev->velocity.y)
+			SetAnimation( PLAYER_IDLE );
+		else if ((pev->velocity.x || pev->velocity.y) && (FBitSet(pev->flags, FL_ONGROUND)))
+			SetAnimation( PLAYER_WALK );
+		else if (pev->waterlevel > 1)
+			SetAnimation( PLAYER_WALK );
+	}
+
+	StudioFrameAdvance( );
+	CheckPowerups(pev);
+
+	UpdatePlayerSound();
+
+	// Track button info so we can detect 'pressed' and 'released' buttons next frame
+	m_afButtonLast = pev->button;
+
+pt_end:
+#if defined( CLIENT_WEAPONS )
+		// Decay timers on weapons
+	// go through all of the weapons and make a list of the ones to pack
+	for ( int i = 0 ; i < MAX_ITEM_TYPES ; i++ )
+	{
+		if ( m_rgpPlayerItems[ i ] )
+		{
+			CBasePlayerItem *pPlayerItem = m_rgpPlayerItems[ i ];
+
+			while ( pPlayerItem )
+			{
+				CBasePlayerWeapon *gun;
+
+				gun = (CBasePlayerWeapon *)pPlayerItem->GetWeaponPtr();
+				
+				if ( gun && gun->UseDecrement() )
+				{
+					gun->m_flNextPrimaryAttack		= max( gun->m_flNextPrimaryAttack - gpGlobals->frametime, -1.0 );
+					gun->m_flNextSecondaryAttack	= max( gun->m_flNextSecondaryAttack - gpGlobals->frametime, -0.001 );
+
+					if ( gun->m_flTimeWeaponIdle != 1000 )
+					{
+						gun->m_flTimeWeaponIdle		= max( gun->m_flTimeWeaponIdle - gpGlobals->frametime, -0.001 );
+					}
+
+					if ( gun->pev->fuser1 != 1000 )
+					{
+						gun->pev->fuser1	= max( gun->pev->fuser1 - gpGlobals->frametime, -0.001 );
+					}
+
+					// Only decrement if not flagged as NO_DECREMENT
+//					if ( gun->m_flPumpTime != 1000 )
+				//	{
+				//		gun->m_flPumpTime	= max( gun->m_flPumpTime - gpGlobals->frametime, -0.001 );
+				//	}
+					
+				}
+
+				pPlayerItem = pPlayerItem->m_pNext;
+			}
+		}
+	}
+
+	m_flNextAttack -= gpGlobals->frametime;
+	if ( m_flNextAttack < -0.001 )
+		m_flNextAttack = -0.001;
+	
+	if ( m_flNextAmmoBurn != 1000 )
+	{
+		m_flNextAmmoBurn -= gpGlobals->frametime;
+		
+		if ( m_flNextAmmoBurn < -0.001 )
+			m_flNextAmmoBurn = -0.001;
+	}
+
+	if ( m_flAmmoStartCharge != 1000 )
+	{
+		m_flAmmoStartCharge -= gpGlobals->frametime;
+		
+		if ( m_flAmmoStartCharge < -0.001 )
+			m_flAmmoStartCharge = -0.001;
+	}
+	
+
+#else
+	return;
+#endif
+}
+
+
+// checks if the spot is clear of players
+BOOL IsSpawnPointValid( CBaseEntity *pPlayer, CBaseEntity *pSpot )
+{
+	CBaseEntity *ent = NULL;
+
+	if ( !pSpot->IsTriggered( pPlayer ) )
+	{
+		return FALSE;
+	}
+
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(pPlayer);
+	ASSERT(thePlayer);
+
+	Vector theMinSize;
+	Vector theMaxSize;
+	thePlayer->GetSize(theMinSize, theMaxSize);
+	
+	int theOffset = AvHMUGetOriginOffsetForUser3(AvHUser3(thePlayer->pev->iuser3));
+	Vector theOriginToSpawn = pSpot->pev->origin;
+	theOriginToSpawn.z += theOffset;
+	
+	if(!AvHSUGetIsEnoughRoomForHull(theOriginToSpawn, AvHMUGetHull(false, thePlayer->pev->iuser3), thePlayer->edict()))
+		return FALSE;
+	
+	//while ( (ent = UTIL_FindEntityInSphere( ent, pSpot->pev->origin, 128 )) != NULL )
+
+	// Assumes UTIL_FindEntityInSphere doesn't take size of other object into account.  Players should be 2*HULL0_MAXX from each other, add another for safety
+	while ( (ent = UTIL_FindEntityInSphere( ent, pSpot->pev->origin,  3*HULL0_MAXX)) != NULL )
+	{
+		// if ent is a client, don't spawn on 'em (but dead players don't block)
+		if ( ent->IsPlayer() && (ent != pPlayer) && ent->IsAlive() )
+			return FALSE;
+
+	}
+
+	return TRUE;
+}
+
+BOOL CBasePlayer::IsAlive() const
+{
+	// Take into account spectators
+	return (pev->deadflag == DEAD_NO) && pev->health > 0; 
+}
+
+BOOL CBasePlayer::IsAlive(bool inIncludeSpectating) const
+{
+	// Take into account spectators
+	BOOL theIsAlive = this->IsAlive();
+	if(inIncludeSpectating)
+	{
+		CBaseEntity* theSpectatingEntity = this->GetSpectatingEntity();
+		if(theSpectatingEntity)
+		{
+			theIsAlive = theSpectatingEntity->IsAlive();
+		}
+	}
+
+	return theIsAlive;
+}
+
+CBaseEntity* CBasePlayer::GetSpectatingEntity() const
+{
+	CBaseEntity* theSpectatingEntity = NULL;
+
+	if(this->pev && this->pev->iuser1 && this->pev->iuser2)
+	{
+		int theEntityIndex = this->pev->iuser2;
+		theSpectatingEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theEntityIndex));
+	}
+
+	return theSpectatingEntity;
+}
+
+
+//inline int FNullEnt( CBaseEntity *ent ) { return (ent == NULL) || FNullEnt( ent->edict() ); }
+
+/*
+============
+EntSelectSpawnPoint
+
+Returns the entity to spawn at
+
+USES AND SETS GLOBAL g_pLastSpawn
+============
+*/
+//edict_t *EntSelectSpawnPoint( CBaseEntity *pPlayer )
+//{
+//	return GetGameRules()->SelectSpawnPoint(pPlayer);
+//
+////	CBaseEntity*	pSpot;
+////	edict_t*		player;
+////	const char*		theSpawnName = kesReadyRoomStart;
+////	AvHGamerules*	theGameRules = GetGameRules
+////
+////	player = pPlayer->edict();
+////
+////	// Get name of desired spawn entity from player
+////	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(pPlayer);
+////	if(thePlayer)
+////	{
+////		// Set name of spawn point accordingly
+////		theSpawnName = theGameRules->GetSpawnEntityName(thePlayer);
+////		//theSpawnName = thePlayer->GetSpawnEntityName();
+////
+////		// Spawn player in at a free spawn point of that name, spawnkilling if there are no free spawns left (even in ready room)
+////	}
+////
+////
+////// choose a info_player_deathmatch point
+////	//if (g_pGameRules->IsCoOp())
+////	//{
+////	//	pSpot = UTIL_FindEntityByClassname( g_pLastSpawn, "info_player_coop");
+////	//	if ( !FNullEnt(pSpot) )
+////	//		goto ReturnSpot;
+////	//	pSpot = UTIL_FindEntityByClassname( g_pLastSpawn, "info_player_start");
+////	//	if ( !FNullEnt(pSpot) ) 
+////	//		goto ReturnSpot;
+////	//}
+////	//else if ( g_pGameRules->IsDeathmatch() )
+////	//{
+////		pSpot = g_pLastSpawn;
+////		// Randomize the start spot
+////		for ( int i = RANDOM_LONG(1,5); i > 0; i-- )
+////			pSpot = UTIL_FindEntityByClassname( pSpot, theSpawnName );
+////		if ( FNullEnt( pSpot ) )  // skip over the null point
+////			pSpot = UTIL_FindEntityByClassname( pSpot, theSpawnName );
+////
+////		CBaseEntity *pFirstSpot = pSpot;
+////
+////		do 
+////		{
+////			if ( pSpot )
+////			{
+////				// check if pSpot is valid
+////				if ( IsSpawnPointValid( pPlayer, pSpot ) )
+////				{
+////					if ( pSpot->pev->origin == Vector( 0, 0, 0 ) )
+////					{
+////						pSpot = UTIL_FindEntityByClassname( pSpot, theSpawnName );
+////						continue;
+////					}
+////
+////					// if so, go to pSpot
+////					goto ReturnSpot;
+////				}
+////			}
+////			// increment pSpot
+////			pSpot = UTIL_FindEntityByClassname( pSpot, theSpawnName );
+////		} while ( pSpot != pFirstSpot ); // loop if we're not back to the start
+////
+////		// we haven't found a place to spawn yet,  so kill any guy at the first spawn point and spawn there
+////		if ( !FNullEnt( pSpot ) )
+////		{
+////			CBaseEntity *ent = NULL;
+////			while ( (ent = UTIL_FindEntityInSphere( ent, pSpot->pev->origin, 128 )) != NULL )
+////			{
+////				// if ent is a client, kill em (unless they are ourselves)
+////				if ( ent->IsPlayer() && !(ent->edict() == player) )
+////					ent->TakeDamage( VARS(INDEXENT(0)), VARS(INDEXENT(0)), 300, DMG_GENERIC );
+////			}
+////			goto ReturnSpot;
+////		}
+////	//}
+////
+////	// If startspot is set, (re)spawn there.
+////	if ( FStringNull( gpGlobals->startspot ) || !strlen(STRING(gpGlobals->startspot)))
+////	{
+////		pSpot = UTIL_FindEntityByClassname(NULL, theSpawnName);
+////		if ( !FNullEnt(pSpot) )
+////			goto ReturnSpot;
+////	}
+////	else
+////	{
+////		pSpot = UTIL_FindEntityByTargetname( NULL, STRING(gpGlobals->startspot) );
+////		if ( !FNullEnt(pSpot) )
+////			goto ReturnSpot;
+////	}
+////
+////ReturnSpot:
+////	if ( FNullEnt( pSpot ) )
+////	{
+////		char theErrorString[256];
+////		sprintf(theErrorString, "PutClientInServer: no %s on level", theSpawnName);
+////		ALERT(at_error, theErrorString);
+////		return INDEXENT(0);
+////	}
+////
+////	g_pLastSpawn = pSpot;
+////	return pSpot->edict();
+//}
+
+
+void CBasePlayer::Spawn( void )
+{
+	pev->classname		= MAKE_STRING("player");
+//	pev->health			= 100;
+//	pev->armorvalue		= 0;
+//	pev->max_health		= pev->health;
+	pev->takedamage		= DAMAGE_AIM;
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_WALK;
+	pev->flags		   &= FL_PROXY;	// keep proxy flag sey by engine
+	pev->flags		   |= FL_CLIENT;
+	pev->air_finished	= gpGlobals->time + 12;
+	pev->dmg			= 2;				// initial water damage
+	pev->effects		= 0;
+	pev->deadflag		= DEAD_NO;
+	pev->dmg_take		= 0;
+	pev->dmg_save		= 0;
+	pev->friction		= 1.0;
+	pev->gravity		= 1.0;
+	m_bitsHUDDamage		= -1;
+	m_bitsDamageType	= 0;
+	m_afPhysicsFlags	= 0;
+	m_fLongJump			= FALSE;// no longjump module. 
+
+	g_engfuncs.pfnSetPhysicsKeyValue( edict(), "slj", "0" );
+	g_engfuncs.pfnSetPhysicsKeyValue( edict(), "hl", "1" );
+
+	pev->fov = m_iFOV				= 0;// init field of view.
+	m_iClientFOV		= -1; // make sure fov reset is sent
+
+	m_flNextDecalTime	= 0;// let this player decal as soon as he spawns.
+
+	m_flgeigerDelay = gpGlobals->time + 2.0;	// wait a few seconds until user-defined message registrations
+												// are recieved by all clients
+	
+	m_flTimeStepSound	= 0;
+	m_iStepLeft = 0;
+	m_flFieldOfView		= 0.5;// some monsters use this to determine whether or not the player is looking at them.
+
+	m_bloodColor	= BLOOD_COLOR_RED;
+	m_flNextAttack	= UTIL_WeaponTimeBase();
+	StartSneaking();
+
+//	m_iFlashBattery = 99;
+//	m_flFlashLightTime = 1; // force first message
+
+// dont let uninitialized value here hurt the player
+	m_flFallVelocity = 0;
+
+	GetGameRules()->SetDefaultPlayerTeam( this );
+	edict_t* theSpawnPoint = GetGameRules()->SelectSpawnPoint( this );
+	ASSERT(theSpawnPoint);
+	this->InitPlayerFromSpawn(theSpawnPoint);
+
+	//AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this);
+	//char* thePlayerModel = thePlayer->GetPlayerModel();
+    //SET_MODEL(ENT(pev), thePlayerModel);
+    SET_MODEL(ENT(pev), "models/player.mdl");
+
+    g_ulModelIndexPlayer = pev->modelindex;
+	//pev->sequence		= LookupActivity( ACT_IDLE );
+	pev->sequence = LookupSequence("idle1");
+
+	if ( FBitSet(pev->flags, FL_DUCKING) ) 
+		UTIL_SetSize(pev, VEC_DUCK_HULL_MIN, VEC_DUCK_HULL_MAX);
+	else
+		UTIL_SetSize(pev, VEC_HULL_MIN, VEC_HULL_MAX);
+
+    pev->view_ofs = VEC_VIEW;
+	Precache();
+	m_HackedGunPos		= Vector( 0, 32, 0 );
+
+	if ( m_iPlayerSound == SOUNDLIST_EMPTY )
+	{
+		ALERT ( at_console, "Couldn't alloc player sound slot!\n" );
+	}
+
+	m_fNoPlayerSound = FALSE;// normal sound behavior.
+
+	m_pLastItem = NULL;
+    m_pLastItemName = 0; // Added by mmcguire.
+
+	m_fInitHUD = TRUE;
+	m_iClientHideHUD = -1;  // force this to be recalculated
+	m_fWeapon = FALSE;
+	m_pClientActiveItem = NULL;
+	m_iClientBattery = -1;
+
+	// reset all ammo values to 0
+	for ( int i = 0; i < MAX_AMMO_SLOTS; i++ )
+	{
+		m_rgAmmo[i] = 0;
+		m_rgAmmoLast[i] = 0;  // client ammo values also have to be reset  (the death hud clear messages does on the client side)
+	}
+
+	m_lastx = m_lasty = 0;
+	
+	m_flNextChatTime = gpGlobals->time;
+
+	g_pGameRules->PlayerSpawn( this );
+}
+
+
+void CBasePlayer :: Precache( void )
+{
+	// in the event that the player JUST spawned, and the level node graph
+	// was loaded, fix all of the node graph pointers before the game starts.
+	
+	// !!!BUGBUG - now that we have multiplayer, this needs to be moved!
+	if ( WorldGraph.m_fGraphPresent && !WorldGraph.m_fGraphPointersSet )
+	{
+		if ( !WorldGraph.FSetGraphPointers() )
+		{
+			ALERT ( at_console, "**Graph pointers were not set!\n");
+		}
+		else
+		{
+			ALERT ( at_console, "**Graph Pointers Set!\n" );
+		} 
+	}
+
+	// SOUNDS / MODELS ARE PRECACHED in ClientPrecache() (game specific)
+	// because they need to precache before any clients have connected
+
+	// init geiger counter vars during spawn and each time
+	// we cross a level transition
+
+	m_flgeigerRange = 1000;
+	m_igeigerRangePrev = 1000;
+
+	m_bitsDamageType = 0;
+	m_bitsHUDDamage = -1;
+
+	m_iClientBattery = -1;
+
+	m_iTrain = TRAIN_NEW;
+
+	// Make sure any necessary user messages have been registered
+	LinkUserMessages();
+
+	m_iUpdateTime = 5;  // won't update for 1/2 a second
+
+	if ( gInitHUD )
+		m_fInitHUD = TRUE;
+}
+
+
+int CBasePlayer::Save( CSave &save )
+{
+	if ( !CBaseMonster::Save(save) )
+		return 0;
+
+	return save.WriteFields( "PLAYER", this, m_playerSaveData, ARRAYSIZE(m_playerSaveData) );
+}
+
+
+//
+// Marks everything as new so the player will resend this to the hud.
+//
+void CBasePlayer::RenewItems(void)
+{
+
+}
+
+
+int CBasePlayer::Restore( CRestore &restore )
+{
+	if ( !CBaseMonster::Restore(restore) )
+		return 0;
+
+	int status = restore.ReadFields( "PLAYER", this, m_playerSaveData, ARRAYSIZE(m_playerSaveData) );
+
+	SAVERESTOREDATA *pSaveData = (SAVERESTOREDATA *)gpGlobals->pSaveData;
+	// landmark isn't present.
+	if ( !pSaveData->fUseLandmark )
+	{
+		ALERT( at_console, "No Landmark:%s\n", pSaveData->szLandmarkName );
+
+		// default to normal spawn
+		//edict_t* pentSpawnSpot = EntSelectSpawnPoint( this );
+		ASSERT(FALSE);
+		//pev->origin = VARS(pentSpawnSpot)->origin + Vector(0,0,1);
+		//pev->angles = VARS(pentSpawnSpot)->angles;
+	}
+	pev->v_angle.z = 0;	// Clear out roll
+	pev->angles = pev->v_angle;
+
+	pev->fixangle = TRUE;           // turn this way immediately
+
+// Copied from spawn() for now
+	m_bloodColor	= BLOOD_COLOR_RED;
+
+    g_ulModelIndexPlayer = pev->modelindex;
+
+	if ( FBitSet(pev->flags, FL_DUCKING) ) 
+	{
+		// Use the crouch HACK
+		//FixPlayerCrouchStuck( edict() );
+		// Don't need to do this with new player prediction code.
+		UTIL_SetSize(pev, VEC_DUCK_HULL_MIN, VEC_DUCK_HULL_MAX);
+	}
+	else
+	{
+		UTIL_SetSize(pev, VEC_HULL_MIN, VEC_HULL_MAX);
+	}
+
+	g_engfuncs.pfnSetPhysicsKeyValue( edict(), "hl", "1" );
+
+	if ( m_fLongJump )
+	{
+		g_engfuncs.pfnSetPhysicsKeyValue( edict(), "slj", "1" );
+	}
+	else
+	{
+		g_engfuncs.pfnSetPhysicsKeyValue( edict(), "slj", "0" );
+	}
+
+	RenewItems();
+
+#if defined( CLIENT_WEAPONS )
+	// HACK:	This variable is saved/restored in CBaseMonster as a time variable, but we're using it
+	//			as just a counter.  Ideally, this needs its own variable that's saved as a plain float.
+	//			Barring that, we clear it out here instead of using the incorrect restored time value.
+	m_flNextAttack = UTIL_WeaponTimeBase();
+#endif
+	return status;
+}
+
+
+
+void CBasePlayer::SelectNextItem( int iItem )
+{
+	CBasePlayerItem *pItem;
+
+	pItem = m_rgpPlayerItems[ iItem ];
+	
+	if (!pItem)
+		return;
+
+	if (pItem == m_pActiveItem)
+	{
+		// select the next one in the chain
+		pItem = m_pActiveItem->m_pNext; 
+		if (! pItem)
+		{
+			return;
+		}
+
+		CBasePlayerItem *pLast;
+		pLast = pItem;
+		while (pLast->m_pNext)
+			pLast = pLast->m_pNext;
+
+		// relink chain
+		pLast->m_pNext = m_pActiveItem;
+		m_pActiveItem->m_pNext = NULL;
+		m_rgpPlayerItems[ iItem ] = pItem;
+	}
+
+	ResetAutoaim( );
+
+	// FIX, this needs to queue them up and delay
+	if (m_pActiveItem)
+	{
+		m_pActiveItem->Holster( );
+	}
+	
+	m_pActiveItem = pItem;
+
+	if (m_pActiveItem)
+	{
+		m_pActiveItem->Deploy( );
+		m_pActiveItem->UpdateItemInfo( );
+	}
+}
+
+void CBasePlayer::SelectItem(const char *pstr)
+{
+	if (!pstr)
+		return;
+
+	CBasePlayerItem *pItem = NULL;
+
+	for (int i = 0; i < MAX_ITEM_TYPES; i++)
+	{
+		if (m_rgpPlayerItems[i])
+		{
+			pItem = m_rgpPlayerItems[i];
+	
+			while (pItem)
+			{
+				if (FClassnameIs(pItem->pev, pstr))
+					break;
+				pItem = pItem->m_pNext;
+			}
+		}
+
+		if (pItem)
+			break;
+	}
+
+	if (!pItem)
+		return;
+
+	
+	if ((pItem == m_pActiveItem) || (m_pActiveItem != NULL && !m_pActiveItem->CanHolster()))
+		return;
+
+	ResetAutoaim( );
+
+	// FIX, this needs to queue them up and delay
+	if (m_pActiveItem)
+		m_pActiveItem->Holster( );
+	
+	m_pLastItem = m_pActiveItem;
+    
+    if (m_pLastItem)
+    {
+        m_pLastItemName = m_pLastItem->pev->classname;
+    }
+    else
+    {
+        m_pLastItemName = 0;
+    }
+
+	m_pActiveItem = pItem;
+
+	if (m_pActiveItem)
+	{
+		m_pActiveItem->Deploy( );
+		m_pActiveItem->UpdateItemInfo( );
+	}
+}
+
+//note this should no longer be called, and asserts if used
+void CBasePlayer::SelectLastItem(void)
+{
+	if (!m_pLastItem)
+	{
+
+        // Try the last item name.
+
+        if (m_pLastItemName != 0)
+        {
+            for (int i = 0; i < MAX_ITEM_TYPES; i++)
+	        {
+		        CBasePlayerItem* theCurrentItem = this->m_rgpPlayerItems[i];
+		        while (theCurrentItem)
+		        {
+			        if(FClassnameIs(theCurrentItem->pev, STRING(m_pLastItemName)))
+			        {
+                        m_pLastItem = theCurrentItem;
+				        break;
+			        }
+			        theCurrentItem = theCurrentItem->m_pNext;
+		        }
+	        }
+        }
+
+	}
+
+    if (!m_pLastItem)
+    {
+        return;
+    }
+
+	this->SelectItem(STRING(m_pLastItem->pev->classname)); //replaced copy-and-paste from SelectItem with actual SelectItem call
+}
+
+BOOL CBasePlayer::HasItem(CBasePlayerItem* inWeapon)
+{
+	// Return true if we have a weapon of this type
+	bool theHasWeapon = false;
+	
+	for(int i = 0; (i < MAX_ITEM_TYPES) && !theHasWeapon; i++)
+	{
+		CBasePlayerItem* theCurrentItem = this->m_rgpPlayerItems[i];
+		while(theCurrentItem && !theHasWeapon)
+		{
+			if(FClassnameIs(theCurrentItem->pev, STRING(inWeapon->pev->classname)))
+			{
+				theHasWeapon = true;
+			}
+			theCurrentItem = theCurrentItem->m_pNext;
+		}
+	}
+	
+	return theHasWeapon;
+}
+
+BOOL CBasePlayer::HasItemWithFlag(int inFlag, CBasePlayerItem*& outItem)
+{
+	// Return true if we have a weapon of this type
+	bool theHasWeaponWithFlag = false;
+	
+	for(int i = 0; (i < MAX_ITEM_TYPES) && !theHasWeaponWithFlag; i++)
+	{
+		CBasePlayerItem* theCurrentItem = this->m_rgpPlayerItems[i];
+		while(theCurrentItem && !theHasWeaponWithFlag)
+		{
+			ItemInfo theItemInfo;
+			theCurrentItem->GetItemInfo(&theItemInfo);
+
+			int theFlags = theItemInfo.iFlags;
+			if(theFlags & inFlag)
+			{
+				theHasWeaponWithFlag = true;
+				outItem = theCurrentItem;
+			}
+			theCurrentItem = theCurrentItem->m_pNext;
+		}
+	}
+	
+	return theHasWeaponWithFlag;
+}
+
+//==============================================
+// HasWeapons - do I have any weapons at all?
+//==============================================
+BOOL CBasePlayer::HasWeapons( void )
+{
+	int i;
+	
+	for ( i = 0 ; i < MAX_ITEM_TYPES ; i++ )
+	{
+		if ( m_rgpPlayerItems[ i ] )
+		{
+			return TRUE;
+		}
+	}
+	
+	return FALSE;
+}
+
+void CBasePlayer::SelectPrevItem( int iItem )
+{
+}
+
+
+char *CBasePlayer::TeamID( void )
+{
+	if ( pev == NULL )		// Not fully connected yet
+		return "";
+	
+	// return their team name
+	return m_szTeamName;
+}
+
+void CBasePlayer::SetTeamID(const char* inTeamID)
+{
+	strncpy(this->m_szTeamName, inTeamID, TEAM_NAME_LENGTH);
+}
+
+//==============================================
+// !!!UNDONE:ultra temporary SprayCan entity to apply
+// decal frame at a time. For PreAlpha CD
+//==============================================
+class CSprayCan : public CBaseEntity
+{
+public:
+	void	Spawn ( entvars_t *pevOwner );
+	void	Think( void );
+
+	virtual int	ObjectCaps( void ) { return FCAP_DONT_SAVE; }
+};
+
+void CSprayCan::Spawn ( entvars_t *pevOwner )
+{
+	pev->origin = pevOwner->origin + Vector ( 0 , 0 , 32 );
+	pev->angles = pevOwner->v_angle;
+	pev->owner = ENT(pevOwner);
+	pev->frame = 0;
+
+	pev->nextthink = gpGlobals->time + 0.1;
+	EMIT_SOUND(ENT(pev), CHAN_VOICE, "player/sprayer.wav", 1, ATTN_NORM);
+}
+
+void CSprayCan::Think( void )
+{
+	TraceResult	tr;	
+	int playernum;
+	int nFrames;
+	CBasePlayer *pPlayer;
+	
+	pPlayer = (CBasePlayer *)GET_PRIVATE(pev->owner);
+
+	if (pPlayer)
+		nFrames = pPlayer->GetCustomDecalFrames();
+	else
+		nFrames = -1;
+
+	playernum = ENTINDEX(pev->owner);
+	
+	// ALERT(at_console, "Spray by player %i, %i of %i\n", playernum, (int)(pev->frame + 1), nFrames);
+
+	UTIL_MakeVectors(pev->angles);
+	UTIL_TraceLine ( pev->origin, pev->origin + gpGlobals->v_forward * 128, ignore_monsters, pev->owner, & tr);
+
+	// No customization present.
+	if (nFrames == -1)
+	{
+		UTIL_DecalTrace( &tr, DECAL_LAMBDA6 );
+		UTIL_Remove( this );
+	}
+	else
+	{
+		UTIL_PlayerDecalTrace( &tr, playernum, pev->frame, TRUE );
+		// Just painted last custom frame.
+		if ( pev->frame++ >= (nFrames - 1))
+			UTIL_Remove( this );
+	}
+
+	pev->nextthink = gpGlobals->time + 0.1;
+}
+
+class	CBloodSplat : public CBaseEntity
+{
+public:
+	void	Spawn ( entvars_t *pevOwner );
+	void	Spray ( void );
+};
+
+void CBloodSplat::Spawn ( entvars_t *pevOwner )
+{
+	pev->origin = pevOwner->origin + Vector ( 0 , 0 , 32 );
+	pev->angles = pevOwner->v_angle;
+	pev->owner = ENT(pevOwner);
+
+	SetThink ( &CBloodSplat::Spray );
+	pev->nextthink = gpGlobals->time + 0.1;
+}
+
+void CBloodSplat::Spray ( void )
+{
+	TraceResult	tr;	
+	
+	if ( g_Language != LANGUAGE_GERMAN )
+	{
+		UTIL_MakeVectors(pev->angles);
+		UTIL_TraceLine ( pev->origin, pev->origin + gpGlobals->v_forward * 128, ignore_monsters, pev->owner, & tr);
+
+		UTIL_BloodDecalTrace( &tr, BLOOD_COLOR_RED );
+	}
+	SetThink ( &CBloodSplat::SUB_Remove );
+	pev->nextthink = gpGlobals->time + 0.1;
+}
+
+//==============================================
+
+
+
+void CBasePlayer::GiveNamedItem( const char *pszName, bool inSendMessage )
+{
+	edict_t	*pent;
+
+	int istr = MAKE_STRING(pszName);
+
+	pent = CREATE_NAMED_ENTITY(istr);
+	if ( FNullEnt( pent ) )
+	{
+		ALERT ( at_console, "NULL Ent in GiveNamedItem!\n" );
+		return;
+	}
+	VARS( pent )->origin = pev->origin;
+	pent->v.spawnflags |= SF_NORESPAWN;
+
+	DispatchSpawn( pent );
+	DispatchTouch( pent, ENT( pev ) );
+
+	if(inSendMessage)
+	{
+		CBaseEntity* theEntity = CBaseEntity::Instance(ENT(pent));
+		ASSERT(theEntity);
+		CBasePlayerWeapon* theWeapon = dynamic_cast<CBasePlayerWeapon*>(theEntity);
+		//ASSERT(theWeapon);
+		if(theWeapon)
+		{
+			int theWeaponID = theWeapon->m_iId;
+			
+			MESSAGE_BEGIN(MSG_ONE, gmsgWeapPickup, NULL, this->pev);
+				WRITE_BYTE(theWeaponID);
+			MESSAGE_END();
+		}
+	}
+}
+
+
+
+CBaseEntity *FindEntityForward( CBaseEntity *pMe )
+{
+	TraceResult tr;
+
+	UTIL_MakeVectors(pMe->pev->v_angle);
+	UTIL_TraceLine(pMe->pev->origin + pMe->pev->view_ofs,pMe->pev->origin + pMe->pev->view_ofs + gpGlobals->v_forward * 8192,dont_ignore_monsters, pMe->edict(), &tr );
+	if ( tr.flFraction != 1.0 && !FNullEnt( tr.pHit) )
+	{
+		CBaseEntity *pHit = CBaseEntity::Instance( tr.pHit );
+		return pHit;
+	}
+	return NULL;
+}
+
+
+BOOL CBasePlayer :: FlashlightIsOn( void )
+{
+	return FBitSet(pev->effects, EF_DIMLIGHT);
+}
+
+const float kFlashlightVolume = .3f;
+ 
+void CBasePlayer :: FlashlightTurnOn( void )
+{
+	if ( !g_pGameRules->FAllowFlashlight() )
+	{
+		return;
+	}
+
+	if ( (pev->weapons & (1<<WEAPON_SUIT)) )
+	{
+		EMIT_SOUND_DYN( ENT(pev), CHAN_WEAPON, SOUND_FLASHLIGHT_ON, kFlashlightVolume, ATTN_NORM, 0, PITCH_NORM );
+		SetBits(pev->effects, EF_DIMLIGHT);
+		
+		/*MESSAGE_BEGIN( MSG_ONE, gmsgFlashlight, NULL, pev );
+		WRITE_BYTE(1);
+		WRITE_BYTE(m_iFlashBattery);
+		MESSAGE_END();
+
+		m_flFlashLightTime = FLASH_DRAIN_TIME + gpGlobals->time;*/
+
+	}
+}
+
+
+void CBasePlayer :: FlashlightTurnOff( void )
+{
+	EMIT_SOUND_DYN( ENT(pev), CHAN_WEAPON, SOUND_FLASHLIGHT_OFF, kFlashlightVolume, ATTN_NORM, 0, PITCH_NORM );
+    ClearBits(pev->effects, EF_DIMLIGHT);
+	
+	/*MESSAGE_BEGIN( MSG_ONE, gmsgFlashlight, NULL, pev );
+	WRITE_BYTE(0);
+	WRITE_BYTE(m_iFlashBattery);
+	MESSAGE_END();
+
+	m_flFlashLightTime = FLASH_CHARGE_TIME + gpGlobals->time;*/
+
+}
+
+/*
+===============
+ForceClientDllUpdate
+
+When recording a demo, we need to have the server tell us the entire client state
+so that the client side .dll can behave correctly.
+Reset stuff so that the state is transmitted.
+===============
+*/
+void CBasePlayer :: ForceClientDllUpdate( void )
+{
+	m_iClientHealth  = -1;
+	m_iClientBattery = -1;
+	m_iTrain |= TRAIN_NEW;  // Force new train message.
+	m_fWeapon = FALSE;          // Force weapon send
+	m_fKnownItem = FALSE;    // Force weaponinit messages.
+	m_fInitHUD = TRUE;		// Force HUD gmsgResetHUD message
+
+	// Now force all the necessary messages
+	//  to be sent.
+	UpdateClientData();
+	m_fWeapon = TRUE;          // Force weapon send
+}
+
+/*
+============
+ImpulseCommands
+============
+*/
+extern float g_flWeaponCheat;
+
+void CBasePlayer::ImpulseCommands( )
+{
+	TraceResult	tr;// UNDONE: kill me! This is temporary for PreAlpha CDs
+
+	int iImpulse = (int)pev->impulse;
+	switch (iImpulse)
+	{
+	case IMPULSE_LOGO:
+		{
+
+		int iOn;
+
+		if (!gmsgLogo)
+		{
+			iOn = 1;
+			gmsgLogo = REG_USER_MSG("Logo", 1);
+		} 
+		else 
+		{
+			iOn = 0;
+		}
+		
+		ASSERT( gmsgLogo > 0 );
+		// send "health" update message
+		MESSAGE_BEGIN( MSG_ONE, gmsgLogo, NULL, pev );
+			WRITE_BYTE(iOn);
+		MESSAGE_END();
+
+		if(!iOn)
+			gmsgLogo = 0;
+		break;
+		}
+	case IMPULSE_FLASHLIGHT:
+        // temporary flashlight for level designers
+        if ( FlashlightIsOn() )
+		{
+			FlashlightTurnOff();
+		}
+        else 
+		{
+			FlashlightTurnOn();
+		}
+		break;
+
+	case IMPULSE_SPRAYPAINT:// paint decal
+		
+		if ( gpGlobals->time < m_flNextDecalTime )
+		{
+			// too early!
+			break;
+		}
+
+		UTIL_MakeVectors(pev->v_angle);
+		UTIL_TraceLine ( pev->origin + pev->view_ofs, pev->origin + pev->view_ofs + gpGlobals->v_forward * 128, ignore_monsters, ENT(pev), & tr);
+
+		if ( tr.flFraction != 1.0 )
+		{// line hit something, so paint a decal
+			m_flNextDecalTime = gpGlobals->time + decalfrequency.value;
+			CSprayCan *pCan = GetClassPtr((CSprayCan *)NULL);
+			pCan->Spawn( pev );
+		}
+
+		break;
+// HLDSDK 2.3 update
+//	case IMPULSE_DEMORECORD:  //  Demo recording, update client dll specific data again.
+//		ForceClientDllUpdate(); 
+//		break;
+	default:
+		// check all of the cheat impulse commands now
+		CheatImpulseCommands( iImpulse );
+		break;
+	}
+	
+	pev->impulse = 0;
+}
+
+//=========================================================
+//=========================================================
+void CBasePlayer::CheatImpulseCommands( int iImpulse )
+{
+//#if !defined( HLDEMO_BUILD )
+//	if ( g_flWeaponCheat == 0.0 )
+//	{
+//		return;
+//	}
+//
+//	CBaseEntity *pEntity;
+//	TraceResult tr;
+//
+//	switch ( iImpulse )
+//	{
+//	case 76:
+//		{
+//			if (!giPrecacheGrunt)
+//			{
+//				giPrecacheGrunt = 1;
+//				ALERT(at_console, "You must now restart to use Grunt-o-matic.\n");
+//			}
+//			else
+//			{
+//				UTIL_MakeVectors( Vector( (float)0, (float)pev->v_angle.y, (float)0 ) );
+//				Create("monster_human_grunt", pev->origin + gpGlobals->v_forward * 128, pev->angles);
+//			}
+//			break;
+//		}
+//
+//
+//	case 101:
+//		gEvilImpulse101 = TRUE;
+//		GiveNamedItem( "item_suit" );
+//		GiveNamedItem( "item_battery" );
+//		GiveNamedItem( "weapon_crowbar" );
+//		GiveNamedItem( "weapon_9mmhandgun" );
+//		GiveNamedItem( "ammo_9mmclip" );
+//		GiveNamedItem( "weapon_shotgun" );
+//		GiveNamedItem( "ammo_buckshot" );
+//		GiveNamedItem( "weapon_9mmAR" );
+//		GiveNamedItem( "ammo_9mmAR" );
+//		GiveNamedItem( "ammo_ARgrenades" );
+//		GiveNamedItem( "weapon_handgrenade" );
+//		GiveNamedItem( "weapon_tripmine" );
+//#ifndef OEM_BUILD
+//		GiveNamedItem( "weapon_357" );
+//		GiveNamedItem( "ammo_357" );
+//		GiveNamedItem( "weapon_crossbow" );
+//		GiveNamedItem( "ammo_crossbow" );
+//		GiveNamedItem( "weapon_egon" );
+//		GiveNamedItem( "weapon_gauss" );
+//		GiveNamedItem( "ammo_gaussclip" );
+//		GiveNamedItem( "weapon_rpg" );
+//		GiveNamedItem( "ammo_rpgclip" );
+//		GiveNamedItem( "weapon_satchel" );
+//		GiveNamedItem( "weapon_snark" );
+//		GiveNamedItem( "weapon_hornetgun" );
+//#endif
+//		gEvilImpulse101 = FALSE;
+//		break;
+//
+//	case 102:
+//		// Gibbage!!!
+//		CGib::SpawnRandomGibs( pev, 1, 1 );
+//		break;
+//
+//	case 103:
+//		// What the hell are you doing?
+//		pEntity = FindEntityForward( this );
+//		if ( pEntity )
+//		{
+//			CBaseMonster *pMonster = pEntity->MyMonsterPointer();
+//			if ( pMonster )
+//				pMonster->ReportAIState();
+//		}
+//		break;
+//
+//	case 104:
+//		// Dump all of the global state varaibles (and global entity names)
+//		gGlobalState.DumpGlobals();
+//		break;
+//
+//	case	105:// player makes no sound for monsters to hear.
+//		{
+//			if ( m_fNoPlayerSound )
+//			{
+//				ALERT ( at_console, "Player is audible\n" );
+//				m_fNoPlayerSound = FALSE;
+//			}
+//			else
+//			{
+//				ALERT ( at_console, "Player is silent\n" );
+//				m_fNoPlayerSound = TRUE;
+//			}
+//			break;
+//		}
+//
+//	case 106:
+//		// Give me the classname and targetname of this entity.
+//		pEntity = FindEntityForward( this );
+//		if ( pEntity )
+//		{
+//			ALERT ( at_console, "Classname: %s", STRING( pEntity->pev->classname ) );
+//			
+//			if ( !FStringNull ( pEntity->pev->targetname ) )
+//			{
+//				ALERT ( at_console, " - Targetname: %s\n", STRING( pEntity->pev->targetname ) );
+//			}
+//			else
+//			{
+//				ALERT ( at_console, " - TargetName: No Targetname\n" );
+//			}
+//
+//			ALERT ( at_console, "Model: %s\n", STRING( pEntity->pev->model ) );
+//			if ( pEntity->pev->globalname )
+//				ALERT ( at_console, "Globalname: %s\n", STRING( pEntity->pev->globalname ) );
+//		}
+//		break;
+//
+//	case 107:
+//		{
+//			TraceResult tr;
+//
+//			edict_t		*pWorld = g_engfuncs.pfnPEntityOfEntIndex( 0 );
+//
+//			Vector start = pev->origin + pev->view_ofs;
+//			Vector end = start + gpGlobals->v_forward * 1024;
+//			UTIL_TraceLine( start, end, ignore_monsters, edict(), &tr );
+//			if ( tr.pHit )
+//				pWorld = tr.pHit;
+//			const char *pTextureName = TRACE_TEXTURE( pWorld, start, end );
+//			if ( pTextureName )
+//				ALERT( at_console, "Texture: %s\n", pTextureName );
+//		}
+//		break;
+//	case	195:// show shortest paths for entire level to nearest node
+//		{
+//			Create("node_viewer_fly", pev->origin, pev->angles);
+//		}
+//		break;
+//	case	196:// show shortest paths for entire level to nearest node
+//		{
+//			Create("node_viewer_large", pev->origin, pev->angles);
+//		}
+//		break;
+//	case	197:// show shortest paths for entire level to nearest node
+//		{
+//			Create("node_viewer_human", pev->origin, pev->angles);
+//		}
+//		break;
+//	case	199:// show nearest node and all connections
+//		{
+//			ALERT ( at_console, "%d\n", WorldGraph.FindNearestNode ( pev->origin, bits_NODE_GROUP_REALM ) );
+//			WorldGraph.ShowNodeConnections ( WorldGraph.FindNearestNode ( pev->origin, bits_NODE_GROUP_REALM ) );
+//		}
+//		break;
+//	case	202:// Random blood splatter
+//		UTIL_MakeVectors(pev->v_angle);
+//		UTIL_TraceLine ( pev->origin + pev->view_ofs, pev->origin + pev->view_ofs + gpGlobals->v_forward * 128, ignore_monsters, ENT(pev), & tr);
+//
+//		if ( tr.flFraction != 1.0 )
+//		{// line hit something, so paint a decal
+//			CBloodSplat *pBlood = GetClassPtr((CBloodSplat *)NULL);
+//			pBlood->Spawn( pev );
+//		}
+//		break;
+//	case	203:// remove creature.
+//		pEntity = FindEntityForward( this );
+//		if ( pEntity )
+//		{
+//			if ( pEntity->pev->takedamage )
+//				pEntity->SetThink(SUB_Remove);
+//		}
+//		break;
+//	}
+//#endif	// HLDEMO_BUILD
+}
+
+//
+// Add a weapon to the player (Item == Weapon == Selectable Object)
+//
+int CBasePlayer::AddPlayerItem( CBasePlayerItem *pItem )
+{
+	CBasePlayerItem *pInsert;
+	
+	pInsert = m_rgpPlayerItems[pItem->iItemSlot()];
+
+	while (pInsert)
+	{
+		if (FClassnameIs( pInsert->pev, STRING( pItem->pev->classname) ))
+		{
+			if (pItem->AddDuplicate( pInsert ))
+			{
+				g_pGameRules->PlayerGotWeapon ( this, pItem );
+				pItem->CheckRespawn();
+
+				// ugly hack to update clip w/o an update clip message
+				pInsert->UpdateItemInfo( );
+				if (m_pActiveItem)
+					m_pActiveItem->UpdateItemInfo( );
+
+				pItem->Kill( );
+			}
+			else if (gEvilImpulse101)
+			{
+				// FIXME: remove anyway for deathmatch testing
+				pItem->Kill( );
+			}
+			return FALSE;
+		}
+		pInsert = pInsert->m_pNext;
+	}
+
+	if (pItem->AddToPlayer( this ))
+	{
+		g_pGameRules->PlayerGotWeapon ( this, pItem );
+		pItem->CheckRespawn();
+
+		pItem->m_pNext = m_rgpPlayerItems[pItem->iItemSlot()];
+		m_rgpPlayerItems[pItem->iItemSlot()] = pItem;
+
+		// should we switch to this item?
+		if ( g_pGameRules->FShouldSwitchWeapon( this, pItem ) )
+		{
+			SwitchWeapon( pItem );
+		}
+
+		return TRUE;
+	}
+	else if (gEvilImpulse101)
+	{
+		// FIXME: remove anyway for deathmatch testing
+		pItem->Kill( );
+	}
+	return FALSE;
+}
+
+
+
+int CBasePlayer::RemovePlayerItem( CBasePlayerItem *pItem )
+{
+    
+	if (m_pActiveItem == pItem)
+	{
+
+        ResetAutoaim( );
+		pItem->Holster( );
+		pItem->pev->nextthink = 0;// crowbar may be trying to swing again, etc.
+		pItem->SetThink( NULL );
+        m_pActiveItem = NULL;
+		pev->viewmodel = 0;
+		pev->weaponmodel = 0;
+
+	}
+	else if ( m_pLastItem == pItem )
+		m_pLastItem = NULL;
+	
+	AvHBasePlayerWeapon* theWeapon = dynamic_cast<AvHBasePlayerWeapon*>(pItem);
+	if(theWeapon)
+	{
+		ItemInfo theInfo;
+		theWeapon->GetItemInfo(&theInfo);
+		int theID = theInfo.iId;
+		this->pev->weapons &= ~(1<<theID);
+	}
+
+	CBasePlayerItem *pPrev = m_rgpPlayerItems[pItem->iItemSlot()];
+
+	if (pPrev == pItem)
+	{
+		m_rgpPlayerItems[pItem->iItemSlot()] = pItem->m_pNext;
+		return TRUE;
+	}
+	else
+	{
+		while (pPrev && pPrev->m_pNext != pItem)
+		{
+			pPrev = pPrev->m_pNext;
+		}
+		if (pPrev)
+		{
+			pPrev->m_pNext = pItem->m_pNext;
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+
+//
+// Returns the unique ID for the ammo, or -1 if error
+//
+int CBasePlayer :: GiveAmmo( int iCount, char *szName, int iMax )
+{
+	if ( !szName )
+	{
+		// no ammo.
+		return -1;
+	}
+
+	if ( !g_pGameRules->CanHaveAmmo( this, szName, iMax ) )
+	{
+		// game rules say I can't have any more of this ammo type.
+		return -1;
+	}
+
+	int i = 0;
+
+	i = GetAmmoIndex( szName );
+
+	if ( i < 0 || i >= MAX_AMMO_SLOTS )
+		return -1;
+
+	int iAdd = min( iCount, iMax - m_rgAmmo[i] );
+	if ( iAdd < 1 )
+		return i;
+
+	m_rgAmmo[ i ] += iAdd;
+
+
+	if ( gmsgAmmoPickup )  // make sure the ammo messages have been linked first
+	{
+		// Send the message that ammo has been picked up
+		MESSAGE_BEGIN( MSG_ONE, gmsgAmmoPickup, NULL, pev );
+			WRITE_BYTE( GetAmmoIndex(szName) );		// ammo ID
+			WRITE_BYTE( iAdd );		// amount
+		MESSAGE_END();
+	}
+
+	TabulateAmmo();
+
+	return i;
+}
+
+
+/*
+============
+ItemPreFrame
+
+Called every frame by the player PreThink
+============
+*/
+void CBasePlayer::ItemPreFrame()
+{
+#if defined( CLIENT_WEAPONS )
+    if ( m_flNextAttack > 0 )
+#else
+    if ( gpGlobals->time < m_flNextAttack )
+#endif
+	{
+		return;
+	}
+
+	if (!m_pActiveItem)
+		return;
+
+	m_pActiveItem->ItemPreFrame( );
+}
+
+
+/*
+============
+ItemPostFrame
+
+Called every frame by the player PostThink
+============
+*/
+void CBasePlayer::ItemPostFrame()
+{
+	static int fInSelect = FALSE;
+
+	// check if the player is using a tank
+	if ( m_pTank != NULL )
+		return;
+
+    ImpulseCommands();
+
+#if defined( CLIENT_WEAPONS )
+    if ( m_flNextAttack > 0 )
+#else
+    if ( gpGlobals->time < m_flNextAttack )
+#endif
+	{
+		return;
+	}
+
+	if (!m_pActiveItem)
+		return;
+
+	// Only update weapon once game has started (no firing before then)
+	//if(GetGameRules()->GetGameStarted())
+	//{
+		this->m_pActiveItem->ItemPostFrame( );
+	//}
+}
+
+int CBasePlayer::AmmoInventory( int iAmmoIndex )
+{
+	if (iAmmoIndex == -1)
+	{
+		return -1;
+	}
+
+	return m_rgAmmo[ iAmmoIndex ];
+}
+
+int CBasePlayer::GetAmmoIndex(const char *psz)
+{
+	int i;
+
+	if (!psz)
+		return -1;
+
+	for (i = 1; i < MAX_AMMO_SLOTS; i++)
+	{
+		if ( !CBasePlayerItem::AmmoInfoArray[i].pszName )
+			continue;
+
+		if (stricmp( psz, CBasePlayerItem::AmmoInfoArray[i].pszName ) == 0)
+			return i;
+	}
+
+	return -1;
+}
+
+int	CBasePlayer::GetMaxWalkSpeed(void) const
+{
+	return 220;
+}
+
+// Called from UpdateClientData
+// makes sure the client has all the necessary ammo info,  if values have changed
+void CBasePlayer::SendAmmoUpdate(void)
+{
+	int	theAmmoToSend[MAX_AMMO_SLOTS];
+	memcpy(&theAmmoToSend, &this->m_rgAmmo, MAX_AMMO_SLOTS*sizeof(int));
+
+//	if(this->pev->iuser1 == OBS_IN_EYE)
+//	{
+//		CBasePlayer* theEntity = NULL;
+//		if(AvHSUGetEntityFromIndex(this->pev->iuser2, theEntity))
+//		{
+//			memcpy(&theAmmoToSend, &theEntity->m_rgAmmo, MAX_AMMO_SLOTS*sizeof(int));
+//		}
+//	}
+
+	for (int i=0; i < MAX_AMMO_SLOTS;i++)
+	{
+		if (theAmmoToSend[i] != m_rgAmmoLast[i])
+		{
+			m_rgAmmoLast[i] = theAmmoToSend[i];
+
+			// TODO: Fix me!
+			//ASSERT( m_rgAmmo[i] >= 0 );
+			//ASSERT( m_rgAmmo[i] < 255 );
+			if((theAmmoToSend[i] >= 0) && (theAmmoToSend[i] < 255))
+			{
+				// send "Ammo" update message
+				MESSAGE_BEGIN( MSG_ONE, gmsgAmmoX, NULL, pev );
+					WRITE_BYTE( i );
+					WRITE_BYTE( max( min( theAmmoToSend[i], 254 ), 0 ) );  // clamp the value to one byte
+				MESSAGE_END();
+			}
+		}
+	}
+}
+
+/*
+=========================================================
+	UpdateClientData
+
+resends any changed player HUD info to the client.
+Called every frame by PlayerPreThink
+Also called at start of demo recording and playback by
+ForceClientDllUpdate to ensure the demo gets messages
+reflecting all of the HUD state info.
+=========================================================
+*/
+void CBasePlayer :: UpdateClientData( void )
+{
+	CBasePlayer* thePlayerToUseForWeaponUpdates = this;
+//	if(this->pev->iuser1 == OBS_IN_EYE)
+//	{
+//		CBasePlayer* theSpectatingPlayer = NULL;
+//		if(AvHSUGetEntityFromIndex(this->pev->iuser2, theSpectatingPlayer))
+//		{
+//			thePlayerToUseForWeaponUpdates = theSpectatingPlayer;
+//		}
+//	}
+
+	if (m_fInitHUD)
+	{
+		m_fInitHUD = FALSE;
+		gInitHUD = FALSE;
+
+		MESSAGE_BEGIN( MSG_ONE, gmsgResetHUD, NULL, pev );
+			WRITE_BYTE( 0 );
+		MESSAGE_END();
+
+		if ( !m_fGameHUDInitialized )
+		{
+			MESSAGE_BEGIN( MSG_ONE, gmsgInitHUD, NULL, pev );
+			MESSAGE_END();
+
+			g_pGameRules->InitHUD( this );
+			m_fGameHUDInitialized = TRUE;
+			if ( g_pGameRules->IsMultiplayer() )
+			{
+				FireTargets( "game_playerjoin", this, this, USE_TOGGLE, 0 );
+			}
+		}
+		FireTargets( "game_playerspawn", this, this, USE_TOGGLE, 0 );
+
+		InitStatusBar();
+	}
+
+	if ( m_iHideHUD != m_iClientHideHUD )
+	{
+		MESSAGE_BEGIN( MSG_ONE, gmsgHideWeapon, NULL, pev );
+			WRITE_BYTE( m_iHideHUD );
+		MESSAGE_END();
+
+		m_iClientHideHUD = m_iHideHUD;
+	}
+
+	if ( m_iFOV != m_iClientFOV )
+	{
+		MESSAGE_BEGIN( MSG_ONE, gmsgSetFOV, NULL, pev );
+			WRITE_BYTE( m_iFOV );
+		MESSAGE_END();
+
+		// cache FOV change at end of function, so weapon updates can see that FOV has changed
+	}
+
+	// HACKHACK -- send the message to display the game title
+	if (gDisplayTitle)
+	{
+		MESSAGE_BEGIN( MSG_ONE, gmsgShowGameTitle, NULL, pev );
+		WRITE_BYTE( 0 );
+		MESSAGE_END();
+		gDisplayTitle = 0;
+	}
+
+	if ((int)pev->health != m_iClientHealth) //voogru: this cast to int is important, otherwise we spam the message, this is just a quick and easy fix. 
+	{
+		int iHealth = min( max( pev->health, 0 ), 999);  // make sure that no negative health values are sent
+	
+		//voogru: you know what may be smart? why not do health and armor in the same message? free's up a message slot for us to use somewhere else.
+
+		// send "health" update message
+		MESSAGE_BEGIN( MSG_ONE, gmsgHealth, NULL, pev );
+			WRITE_SHORT( iHealth );
+		MESSAGE_END();
+
+		m_iClientHealth = (int)pev->health;
+	}
+
+	if ((int)pev->armorvalue != m_iClientBattery)
+	{
+		ASSERT( gmsgBattery > 0 );
+
+		int iArmorValue = min( max( pev->armorvalue, 0 ), 999);  // make sure that no negative health values are sent
+
+		// send "armor" update message
+		MESSAGE_BEGIN( MSG_ONE, gmsgBattery, NULL, pev );
+			WRITE_SHORT( iArmorValue);
+		MESSAGE_END();
+
+		m_iClientBattery = (int)pev->armorvalue;
+	}
+
+	if (pev->dmg_take || pev->dmg_save || m_bitsHUDDamage != m_bitsDamageType)
+	{
+		// Comes from inside me if not set
+		Vector damageOrigin = pev->origin;
+		// send "damage" message
+		// causes screen to flash, and pain compass to show direction of damage
+		edict_t *other = pev->dmg_inflictor;
+		if ( other )
+		{
+			CBaseEntity *pEntity = CBaseEntity::Instance(other);
+			if ( pEntity )
+				damageOrigin = pEntity->Center();
+		}
+
+		// only send down damage type that have hud art
+		int visibleDamageBits = m_bitsDamageType & DMG_SHOWNHUD;
+
+		MESSAGE_BEGIN( MSG_ONE, gmsgDamage, NULL, pev );
+			WRITE_BYTE( pev->dmg_save );
+			WRITE_BYTE( pev->dmg_take );
+			WRITE_LONG( 0 );
+			WRITE_COORD( damageOrigin.x );
+			WRITE_COORD( damageOrigin.y );
+			WRITE_COORD( damageOrigin.z );
+		MESSAGE_END();
+	
+		pev->dmg_take = 0;
+		pev->dmg_save = 0;
+		m_bitsHUDDamage = m_bitsDamageType;
+		
+		// Clear off non-time-based damage indicators
+		m_bitsDamageType &= DMG_TIMEBASED;
+	}
+
+/*	// Update Flashlight
+	if ((m_flFlashLightTime) && (m_flFlashLightTime <= gpGlobals->time))
+	{
+		if (FlashlightIsOn())
+		{
+			if (m_iFlashBattery)
+			{
+				m_flFlashLightTime = FLASH_DRAIN_TIME + gpGlobals->time;
+				m_iFlashBattery--;
+				
+				if (!m_iFlashBattery)
+					FlashlightTurnOff();
+			}
+		}
+		else
+		{
+			if (m_iFlashBattery < 100)
+			{
+				m_flFlashLightTime = FLASH_CHARGE_TIME + gpGlobals->time;
+				m_iFlashBattery++;
+			}
+			else
+				m_flFlashLightTime = 0;
+		}
+
+		//MESSAGE_BEGIN( MSG_ONE, gmsgFlashBattery, NULL, pev );
+		//WRITE_BYTE(m_iFlashBattery);
+		//MESSAGE_END();
+	}
+*/
+
+
+	if (m_iTrain & TRAIN_NEW)
+	{
+		ASSERT( gmsgTrain > 0 );
+		// send "health" update message
+		MESSAGE_BEGIN( MSG_ONE, gmsgTrain, NULL, pev );
+			WRITE_BYTE(m_iTrain & 0xF);
+		MESSAGE_END();
+
+		m_iTrain &= ~TRAIN_NEW;
+	}
+
+	//
+	// New Weapon?
+	//
+	
+	if (!m_fKnownItem)
+	{
+
+		m_fKnownItem = TRUE;
+
+	// WeaponInit Message
+	// byte  = # of weapons
+	//
+	// for each weapon:
+	// byte		name str length (not including null)
+	// bytes... name
+	// byte		Ammo Type
+	// byte		Ammo2 Type
+	// byte		bucket
+	// byte		bucket pos
+	// byte		flags	
+	// ????		Icons
+		
+		// Send ALL the weapon info now
+		this->SendWeaponUpdate();
+	}
+
+
+	SendAmmoUpdate();
+
+	// Update all the items
+	for ( int i = 0; i < MAX_ITEM_TYPES; i++ )
+	{
+		if ( thePlayerToUseForWeaponUpdates->m_rgpPlayerItems[i] )  // each item updates it's successors
+			thePlayerToUseForWeaponUpdates->m_rgpPlayerItems[i]->UpdateClientData( thePlayerToUseForWeaponUpdates );
+	}
+
+	// Cache and client weapon change
+	m_pClientActiveItem = thePlayerToUseForWeaponUpdates->m_pActiveItem;
+	m_iClientFOV = thePlayerToUseForWeaponUpdates->m_iFOV;
+
+	// Update Status Bar if we're playing
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this);
+	if(thePlayer && (thePlayer->GetPlayMode() == PLAYMODE_PLAYING))
+	{
+		if ( m_flNextSBarUpdateTime < gpGlobals->time )
+		{
+			UpdateStatusBar();
+			m_flNextSBarUpdateTime = gpGlobals->time + 0.2;
+		}
+	}
+}
+
+void CBasePlayer::SendWeaponUpdate()
+{
+	int i;
+	
+	for (i = 0; i < MAX_WEAPONS; i++)
+	{
+		ItemInfo& II = CBasePlayerItem::ItemInfoArray[i];
+		
+		if ( !II.iId )
+			continue;
+		
+		const char *pszName;
+		if (!II.pszName)
+			pszName = "Empty";
+		else
+			pszName = II.pszName;
+		
+		MESSAGE_BEGIN( MSG_ONE, gmsgWeaponList, NULL, pev );  
+		WRITE_STRING(pszName);			// string	weapon name
+		WRITE_BYTE(GetAmmoIndex(II.pszAmmo1));	// byte		Ammo Type
+		WRITE_BYTE(II.iMaxAmmo1);				// byte     Max Ammo 1
+		WRITE_BYTE(GetAmmoIndex(II.pszAmmo2));	// byte		Ammo2 Type
+		WRITE_BYTE(II.iMaxAmmo2);				// byte     Max Ammo 2
+		WRITE_BYTE(II.iSlot);					// byte		bucket
+		WRITE_BYTE(II.iPosition);				// byte		bucket pos
+		WRITE_BYTE(II.iId);						// byte		id (bit index into pev->weapons)
+		WRITE_BYTE(II.iFlags);					// byte		Flags
+		MESSAGE_END();
+	}
+}
+
+//=========================================================
+// FBecomeProne - Overridden for the player to set the proper
+// physics flags when a barnacle grabs player.
+//=========================================================
+BOOL CBasePlayer :: FBecomeProne ( void )
+{
+	m_afPhysicsFlags |= PFLAG_ONBARNACLE;
+	return TRUE;
+}
+
+//=========================================================
+// BarnacleVictimBitten - bad name for a function that is called
+// by Barnacle victims when the barnacle pulls their head
+// into its mouth. For the player, just die.
+//=========================================================
+void CBasePlayer :: BarnacleVictimBitten ( entvars_t *pevBarnacle )
+{
+	TakeDamage ( pevBarnacle, pevBarnacle, pev->health + pev->armorvalue, DMG_SLASH | DMG_ALWAYSGIB );
+}
+
+//=========================================================
+// BarnacleVictimReleased - overridden for player who has
+// physics flags concerns. 
+//=========================================================
+void CBasePlayer :: BarnacleVictimReleased ( void )
+{
+	m_afPhysicsFlags &= ~PFLAG_ONBARNACLE;
+}
+
+
+//=========================================================
+// Illumination 
+// return player light level plus virtual muzzle flash
+//=========================================================
+int CBasePlayer :: Illumination( void )
+{
+	int iIllum = CBaseEntity::Illumination( );
+
+	iIllum += m_iWeaponFlash;
+	if (iIllum > 255)
+		return 255;
+	return iIllum;
+}
+
+
+void CBasePlayer :: EnableControl(BOOL fControl)
+{
+	if (!fControl)
+		pev->flags |= FL_FROZEN;
+	else
+		pev->flags &= ~FL_FROZEN;
+
+}
+
+
+#define DOT_1DEGREE   0.9998476951564
+#define DOT_2DEGREE   0.9993908270191
+#define DOT_3DEGREE   0.9986295347546
+#define DOT_4DEGREE   0.9975640502598
+#define DOT_5DEGREE   0.9961946980917
+#define DOT_6DEGREE   0.9945218953683
+#define DOT_7DEGREE   0.9925461516413
+#define DOT_8DEGREE   0.9902680687416
+#define DOT_9DEGREE   0.9876883405951
+#define DOT_10DEGREE  0.9848077530122
+#define DOT_15DEGREE  0.9659258262891
+#define DOT_20DEGREE  0.9396926207859
+#define DOT_25DEGREE  0.9063077870367
+
+//=========================================================
+// Autoaim
+// set crosshair position to point to enemey
+//=========================================================
+Vector CBasePlayer :: GetAutoaimVector( float flDelta )
+{
+	if (g_iSkillLevel == SKILL_HARD)
+	{
+		UTIL_MakeVectors( pev->v_angle + pev->punchangle );
+		return gpGlobals->v_forward;
+	}
+
+	Vector vecSrc = GetGunPosition( );
+	float flDist = 8192;
+
+	// always use non-sticky autoaim
+	// UNDONE: use sever variable to chose!
+	if (1 || g_iSkillLevel == SKILL_MEDIUM)
+	{
+		m_vecAutoAim = Vector( 0, 0, 0 );
+		// flDelta *= 0.5;
+	}
+
+	BOOL m_fOldTargeting = m_fOnTarget;
+	Vector angles = AutoaimDeflection(vecSrc, flDist, flDelta );
+
+	// update ontarget if changed
+	if ( !g_pGameRules->AllowAutoTargetCrosshair() )
+		m_fOnTarget = 0;
+	else if (m_fOldTargeting != m_fOnTarget)
+	{
+		m_pActiveItem->UpdateItemInfo( );
+	}
+
+	if (angles.x > 180)
+		angles.x -= 360;
+	if (angles.x < -180)
+		angles.x += 360;
+	if (angles.y > 180)
+		angles.y -= 360;
+	if (angles.y < -180)
+		angles.y += 360;
+
+	if (angles.x > 25)
+		angles.x = 25;
+	if (angles.x < -25)
+		angles.x = -25;
+	if (angles.y > 12)
+		angles.y = 12;
+	if (angles.y < -12)
+		angles.y = -12;
+
+
+	// always use non-sticky autoaim
+	// UNDONE: use sever variable to chose!
+	if (0 || g_iSkillLevel == SKILL_EASY)
+	{
+		m_vecAutoAim = m_vecAutoAim * 0.67 + angles * 0.33;
+	}
+	else
+	{
+		m_vecAutoAim = angles * 0.9;
+	}
+
+	// m_vecAutoAim = m_vecAutoAim * 0.99;
+
+	// Don't send across network if sv_aim is 0
+	if ( g_psv_aim->value != 0 )
+	{
+		if ( m_vecAutoAim.x != m_lastx ||
+			 m_vecAutoAim.y != m_lasty )
+		{
+			SET_CROSSHAIRANGLE( edict(), -m_vecAutoAim.x, m_vecAutoAim.y );
+			
+			m_lastx = m_vecAutoAim.x;
+			m_lasty = m_vecAutoAim.y;
+		}
+	}
+
+	// ALERT( at_console, "%f %f\n", angles.x, angles.y );
+
+	UTIL_MakeVectors( pev->v_angle + pev->punchangle + m_vecAutoAim );
+	return gpGlobals->v_forward;
+}
+
+
+Vector CBasePlayer :: AutoaimDeflection( Vector &vecSrc, float flDist, float flDelta  )
+{
+	edict_t		*pEdict = g_engfuncs.pfnPEntityOfEntIndex( 1 );
+	CBaseEntity	*pEntity;
+	float		bestdot;
+	Vector		bestdir;
+	edict_t		*bestent;
+	TraceResult tr;
+
+	if ( g_psv_aim->value == 0 )
+	{
+		m_fOnTarget = FALSE;
+		return g_vecZero;
+	}
+
+	UTIL_MakeVectors( pev->v_angle + pev->punchangle + m_vecAutoAim );
+
+	// try all possible entities
+	bestdir = gpGlobals->v_forward;
+	bestdot = flDelta; // +- 10 degrees
+	bestent = NULL;
+
+	m_fOnTarget = FALSE;
+
+	UTIL_TraceLine( vecSrc, vecSrc + bestdir * flDist, dont_ignore_monsters, edict(), &tr );
+
+
+	if ( tr.pHit && tr.pHit->v.takedamage != DAMAGE_NO)
+	{
+		// don't look through water
+		if (!((pev->waterlevel != 3 && tr.pHit->v.waterlevel == 3) 
+			|| (pev->waterlevel == 3 && tr.pHit->v.waterlevel == 0)))
+		{
+			if (tr.pHit->v.takedamage == DAMAGE_AIM)
+				m_fOnTarget = TRUE;
+
+			return m_vecAutoAim;
+		}
+	}
+
+	for ( int i = 1; i < gpGlobals->maxEntities; i++, pEdict++ )
+	{
+		Vector center;
+		Vector dir;
+		float dot;
+
+		if ( pEdict->free )	// Not in use
+			continue;
+		
+		if (pEdict->v.takedamage != DAMAGE_AIM)
+			continue;
+		if (pEdict == edict())
+			continue;
+//		if (pev->team > 0 && pEdict->v.team == pev->team)
+//			continue;	// don't aim at teammate
+		if ( !g_pGameRules->ShouldAutoAim( this, pEdict ) )
+			continue;
+
+		pEntity = Instance( pEdict );
+		if (pEntity == NULL)
+			continue;
+
+		if (!pEntity->IsAlive())
+			continue;
+
+		// don't look through water
+		if ((pev->waterlevel != 3 && pEntity->pev->waterlevel == 3) 
+			|| (pev->waterlevel == 3 && pEntity->pev->waterlevel == 0))
+			continue;
+
+		center = pEntity->BodyTarget( vecSrc );
+
+		dir = (center - vecSrc).Normalize( );
+
+		// make sure it's in front of the player
+		if (DotProduct (dir, gpGlobals->v_forward ) < 0)
+			continue;
+
+		dot = fabs( DotProduct (dir, gpGlobals->v_right ) ) 
+			+ fabs( DotProduct (dir, gpGlobals->v_up ) ) * 0.5;
+
+		// tweek for distance
+		dot *= 1.0 + 0.2 * ((center - vecSrc).Length() / flDist);
+
+		if (dot > bestdot)
+			continue;	// to far to turn
+
+		UTIL_TraceLine( vecSrc, center, dont_ignore_monsters, edict(), &tr );
+		if (tr.flFraction != 1.0 && tr.pHit != pEdict)
+		{
+			// ALERT( at_console, "hit %s, can't see %s\n", STRING( tr.pHit->v.classname ), STRING( pEdict->v.classname ) );
+			continue;
+		}
+
+		// don't shoot at friends
+		if (IRelationship( pEntity ) < 0)
+		{
+			if ( !pEntity->IsPlayer() && !g_pGameRules->IsDeathmatch())
+				// ALERT( at_console, "friend\n");
+				continue;
+		}
+
+		// can shoot at this one
+		bestdot = dot;
+		bestent = pEdict;
+		bestdir = dir;
+	}
+
+	if (bestent)
+	{
+		bestdir = UTIL_VecToAngles (bestdir);
+		bestdir.x = -bestdir.x;
+		bestdir = bestdir - pev->v_angle - pev->punchangle;
+
+		if (bestent->v.takedamage == DAMAGE_AIM)
+			m_fOnTarget = TRUE;
+
+		return bestdir;
+	}
+
+	return Vector( 0, 0, 0 );
+}
+
+
+void CBasePlayer :: ResetAutoaim( )
+{
+	if (m_vecAutoAim.x != 0 || m_vecAutoAim.y != 0)
+	{
+		m_vecAutoAim = Vector( 0, 0, 0 );
+		SET_CROSSHAIRANGLE( edict(), 0, 0 );
+	}
+	m_fOnTarget = FALSE;
+}
+
+/*
+=============
+SetCustomDecalFrames
+
+  UNDONE:  Determine real frame limit, 8 is a placeholder.
+  Note:  -1 means no custom frames present.
+=============
+*/
+void CBasePlayer :: SetCustomDecalFrames( int nFrames )
+{
+	if (nFrames > 0 &&
+		nFrames < 8)
+		m_nCustomSprayFrames = nFrames;
+	else
+		m_nCustomSprayFrames = -1;
+}
+
+/*
+=============
+GetCustomDecalFrames
+
+  Returns the # of custom frames this player's custom clan logo contains.
+=============
+*/
+int CBasePlayer :: GetCustomDecalFrames( void )
+{
+	return m_nCustomSprayFrames;
+}
+
+
+//=========================================================
+// DropPlayerItem - drop the named item, or if no name,
+// the active item. 
+//=========================================================
+void CBasePlayer::DropPlayerItem ( char *pszItemName )
+{
+	if ( !g_pGameRules->IsMultiplayer() || (weaponstay.value > 0) )
+	{
+		// no dropping in single player.
+		return;
+	}
+
+	if ( !strlen( pszItemName ) )
+	{
+		// if this string has no length, the client didn't type a name!
+		// assume player wants to drop the active item.
+		// make the string null to make future operations in this function easier
+		pszItemName = NULL;
+	} 
+
+	CBasePlayerItem *pWeapon;
+	int i;
+
+	for ( i = 0 ; i < MAX_ITEM_TYPES ; i++ )
+	{
+		pWeapon = m_rgpPlayerItems[ i ];
+
+		while ( pWeapon )
+		{
+			if ( pszItemName )
+			{
+				// try to match by name. 
+                const char* theWeaponClassName = STRING( pWeapon->pev->classname );
+				if ( !strcmp( pszItemName,  theWeaponClassName) )
+				{
+					// match! 
+					break;
+				}
+			}
+			else
+			{
+				// trying to drop active item
+				if ( pWeapon == m_pActiveItem )
+				{
+					// active item!
+					break;
+				}
+			}
+
+			pWeapon = pWeapon->m_pNext; 
+		}
+
+		
+		// if we land here with a valid pWeapon pointer, that's because we found the 
+		// item we want to drop and hit a BREAK;  pWeapon is the item.
+		if ( pWeapon )
+		{
+			g_pGameRules->GetNextBestWeapon( this, pWeapon );
+
+			UTIL_MakeVectors ( pev->angles ); 
+
+			pev->weapons &= ~(1<<pWeapon->m_iId);// take item off hud
+
+			CWeaponBox *pWeaponBox = (CWeaponBox *)CBaseEntity::Create( "weaponbox", pev->origin + gpGlobals->v_forward * 10, pev->angles, edict() );
+			pWeaponBox->pev->angles.x = 0;
+			pWeaponBox->pev->angles.z = 0;
+			pWeaponBox->PackWeapon( pWeapon );
+			pWeaponBox->pev->velocity = gpGlobals->v_forward * 300 + gpGlobals->v_forward * 100;
+			
+			// drop half of the ammo for this weapon.
+			int	iAmmoIndex;
+
+			iAmmoIndex = GetAmmoIndex ( pWeapon->pszAmmo1() ); // ???
+			
+			if ( iAmmoIndex != -1 )
+			{
+				// this weapon weapon uses ammo, so pack an appropriate amount.
+				if ( pWeapon->iFlags() & ITEM_FLAG_EXHAUSTIBLE )
+				{
+					// pack up all the ammo, this weapon is its own ammo type
+					pWeaponBox->PackAmmo( MAKE_STRING(pWeapon->pszAmmo1()), m_rgAmmo[ iAmmoIndex ] );
+					m_rgAmmo[ iAmmoIndex ] = 0; 
+
+				}
+				else
+				{
+					// pack half of the ammo
+					pWeaponBox->PackAmmo( MAKE_STRING(pWeapon->pszAmmo1()), m_rgAmmo[ iAmmoIndex ] / 2 );
+					m_rgAmmo[ iAmmoIndex ] /= 2; 
+				}
+
+			}
+
+			return;// we're done, so stop searching with the FOR loop.
+		}
+	}
+}
+
+//=========================================================
+// HasPlayerItem Does the player already have this item?
+//=========================================================
+BOOL CBasePlayer::HasPlayerItem( CBasePlayerItem *pCheckItem )
+{
+	CBasePlayerItem *pItem = m_rgpPlayerItems[pCheckItem->iItemSlot()];
+
+	while (pItem)
+	{
+		if (FClassnameIs( pItem->pev, STRING( pCheckItem->pev->classname) ))
+		{
+			return TRUE;
+		}
+		pItem = pItem->m_pNext;
+	}
+
+	return FALSE;
+}
+
+//=========================================================
+// HasNamedPlayerItem Does the player already have this item?
+//=========================================================
+CBasePlayerItem* CBasePlayer::HasNamedPlayerItem( const char *pszItemName )
+{
+	CBasePlayerItem *pReturn = NULL;
+	CBasePlayerItem *pItem = NULL;
+	int i;
+ 
+	for ( i = 0 ; (i < MAX_ITEM_TYPES) && !pReturn ; i++ )
+	{
+		pItem = m_rgpPlayerItems[ i ];
+		
+		while (pItem && !pReturn)
+		{
+			if ( !strcmp( pszItemName, STRING( pItem->pev->classname ) ) )
+			{
+				pReturn = pItem;
+			}
+			pItem = pItem->m_pNext;
+		}
+	}
+
+	return pReturn;
+}
+
+//=========================================================
+// 
+//=========================================================
+BOOL CBasePlayer :: SwitchWeapon( CBasePlayerItem *pWeapon ) 
+{
+	if ( !pWeapon->CanDeploy() )
+	{
+		return FALSE;
+	}
+	
+	ResetAutoaim( );
+	
+	if (m_pActiveItem)
+	{
+		m_pActiveItem->Holster( );
+	}
+
+	m_pActiveItem = pWeapon;
+	pWeapon->Deploy( );
+
+	return TRUE;
+}
+
+//=========================================================
+// Dead HEV suit prop
+//=========================================================
+class CDeadHEV : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	int	Classify ( void ) { return	CLASS_HUMAN_MILITARY; }
+
+	void KeyValue( KeyValueData *pkvd );
+
+	int	m_iPose;// which sequence to display	-- temporary, don't need to save
+	static char *m_szPoses[4];
+};
+
+char *CDeadHEV::m_szPoses[] = { "deadback", "deadsitting", "deadstomach", "deadtable" };
+
+void CDeadHEV::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "pose"))
+	{
+		m_iPose = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else 
+		CBaseMonster::KeyValue( pkvd );
+}
+
+LINK_ENTITY_TO_CLASS( monster_hevsuit_dead, CDeadHEV );
+
+//=========================================================
+// ********** DeadHEV SPAWN **********
+//=========================================================
+void CDeadHEV :: Spawn( void )
+{
+	PRECACHE_MODEL("models/player.mdl");
+	SET_MODEL(ENT(pev), "models/player.mdl");
+
+	pev->effects		= 0;
+	pev->yaw_speed		= 8;
+	pev->sequence		= 0;
+	pev->body			= 1;
+	m_bloodColor		= BLOOD_COLOR_RED;
+
+	pev->sequence = LookupSequence( m_szPoses[m_iPose] );
+
+	if (pev->sequence == -1)
+	{
+		ALERT ( at_console, "Dead hevsuit with bad pose\n" );
+		pev->sequence = 0;
+		pev->effects = EF_BRIGHTFIELD;
+	}
+
+	// Corpses have less health
+	pev->health			= 8;
+
+	MonsterInitDead();
+}
+
+
+class CStripWeapons : public CPointEntity
+{
+public:
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+private:
+};
+
+LINK_ENTITY_TO_CLASS( player_weaponstrip, CStripWeapons );
+
+void CStripWeapons :: Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	CBasePlayer *pPlayer = NULL;
+
+	if ( pActivator && pActivator->IsPlayer() )
+	{
+		pPlayer = (CBasePlayer *)pActivator;
+	}
+	else if ( !g_pGameRules->IsDeathmatch() )
+	{
+		pPlayer = (CBasePlayer *)CBaseEntity::Instance( g_engfuncs.pfnPEntityOfEntIndex( 1 ) );
+	}
+
+	if ( pPlayer )
+		pPlayer->RemoveAllItems( FALSE );
+}
+
+
+class CRevertSaved : public CPointEntity
+{
+public:
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void	EXPORT MessageThink( void );
+	void	EXPORT LoadThink( void );
+	void	KeyValue( KeyValueData *pkvd );
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	inline	float	Duration( void ) { return pev->dmg_take; }
+	inline	float	HoldTime( void ) { return pev->dmg_save; }
+	inline	float	MessageTime( void ) { return m_messageTime; }
+	inline	float	LoadTime( void ) { return m_loadTime; }
+
+	inline	void	SetDuration( float duration ) { pev->dmg_take = duration; }
+	inline	void	SetHoldTime( float hold ) { pev->dmg_save = hold; }
+	inline	void	SetMessageTime( float time ) { m_messageTime = time; }
+	inline	void	SetLoadTime( float time ) { m_loadTime = time; }
+
+private:
+	float	m_messageTime;
+	float	m_loadTime;
+};
+
+LINK_ENTITY_TO_CLASS( player_loadsaved, CRevertSaved );
+
+TYPEDESCRIPTION	CRevertSaved::m_SaveData[] = 
+{
+	DEFINE_FIELD( CRevertSaved, m_messageTime, FIELD_FLOAT ),	// These are not actual times, but durations, so save as floats
+	DEFINE_FIELD( CRevertSaved, m_loadTime, FIELD_FLOAT ),
+};
+
+IMPLEMENT_SAVERESTORE( CRevertSaved, CPointEntity );
+
+void CRevertSaved :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "duration"))
+	{
+		SetDuration( atof(pkvd->szValue) );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "holdtime"))
+	{
+		SetHoldTime( atof(pkvd->szValue) );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "messagetime"))
+	{
+		SetMessageTime( atof(pkvd->szValue) );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "loadtime"))
+	{
+		SetLoadTime( atof(pkvd->szValue) );
+		pkvd->fHandled = TRUE;
+	}
+	else 
+		CPointEntity::KeyValue( pkvd );
+}
+
+void CRevertSaved :: Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	UTIL_ScreenFadeAll( pev->rendercolor, Duration(), HoldTime(), pev->renderamt, FFADE_OUT );
+	pev->nextthink = gpGlobals->time + MessageTime();
+	SetThink( &CRevertSaved::MessageThink );
+}
+
+
+void CRevertSaved :: MessageThink( void )
+{
+	UTIL_ShowMessageAll( STRING(pev->message) );
+	float nextThink = LoadTime() - MessageTime();
+	if ( nextThink > 0 ) 
+	{
+		pev->nextthink = gpGlobals->time + nextThink;
+		SetThink( &CRevertSaved::LoadThink );
+	}
+	else
+		LoadThink();
+}
+
+
+void CRevertSaved :: LoadThink( void )
+{
+	if ( !gpGlobals->deathmatch )
+	{
+		SERVER_COMMAND("reload\n");
+	}
+}
+
+
+//=========================================================
+// Multiplayer intermission spots.
+//=========================================================
+class CInfoIntermission:public CPointEntity
+{
+	void Spawn( void );
+	void Think( void );
+};
+
+void CInfoIntermission::Spawn( void )
+{
+	UTIL_SetOrigin( pev, pev->origin );
+	pev->solid = SOLID_NOT;
+	pev->effects = EF_NODRAW;
+	pev->v_angle = g_vecZero;
+
+	pev->nextthink = gpGlobals->time + 2;// let targets spawn!
+
+}
+
+void CInfoIntermission::Think ( void )
+{
+	edict_t *pTarget;
+
+	// find my target
+	pTarget = FIND_ENTITY_BY_TARGETNAME( NULL, STRING(pev->target) );
+
+	if ( !FNullEnt(pTarget) )
+	{
+		pev->v_angle = UTIL_VecToAngles( (pTarget->v.origin - pev->origin).Normalize() );
+		pev->v_angle.x = -pev->v_angle.x;
+	}
+}
+
+LINK_ENTITY_TO_CLASS( info_intermission, CInfoIntermission );
+
diff --git a/main/source/dlls/player.h b/main/source/dlls/player.h
new file mode 100644
index 00000000..14ecd54b
--- /dev/null
+++ b/main/source/dlls/player.h
@@ -0,0 +1,381 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef PLAYER_H
+#define PLAYER_H
+
+
+#include "pm_materials.h"
+
+
+#define PLAYER_FATAL_FALL_SPEED		1024// approx 60 feet
+#define PLAYER_MAX_SAFE_FALL_SPEED	580// approx 20 feet
+#define DAMAGE_FOR_FALL_SPEED		(float) 100 / ( PLAYER_FATAL_FALL_SPEED - PLAYER_MAX_SAFE_FALL_SPEED )// damage per unit per second.
+#define PLAYER_MIN_BOUNCE_SPEED		200
+#define PLAYER_FALL_PUNCH_THRESHHOLD (float)350 // won't punch player's screen/make scrape noise unless player falling at least this fast.
+
+//
+// Player PHYSICS FLAGS bits
+//
+#define		PFLAG_ONLADDER		( 1<<0 )
+#define		PFLAG_ONSWING		( 1<<0 )
+#define		PFLAG_ONTRAIN		( 1<<1 )
+#define		PFLAG_ONBARNACLE	( 1<<2 )
+#define		PFLAG_DUCKING		( 1<<3 )		// In the process of ducking, but totally squatted yet
+#define		PFLAG_USING			( 1<<4 )		// Using a continuous entity
+#define		PFLAG_OBSERVER		( 1<<5 )		// player is locked in stationary cam mode. Spectators can move, observers can't.
+
+//
+// generic player
+//
+//-----------------------------------------------------
+//This is Half-Life player entity
+//-----------------------------------------------------
+#define CSUITPLAYLIST	4		// max of 4 suit sentences queued up at any time
+
+#define SUIT_GROUP			TRUE
+#define	SUIT_SENTENCE		FALSE
+
+#define	SUIT_REPEAT_OK		0
+#define SUIT_NEXT_IN_30SEC	30
+#define SUIT_NEXT_IN_1MIN	60
+#define SUIT_NEXT_IN_5MIN	300
+#define SUIT_NEXT_IN_10MIN	600
+#define SUIT_NEXT_IN_30MIN	1800
+#define SUIT_NEXT_IN_1HOUR	3600
+
+#define CSUITNOREPEAT		32
+
+#define	SOUND_FLASHLIGHT_ON		"items/flashlight1.wav"
+#define	SOUND_FLASHLIGHT_OFF	"items/flashlight1.wav"
+
+#define TEAM_NAME_LENGTH	16
+
+typedef enum
+{
+	PLAYER_IDLE,
+	PLAYER_WALK,
+	PLAYER_JUMP,
+	PLAYER_SUPERJUMP,
+	PLAYER_DIE,
+	PLAYER_ATTACK1,
+	PLAYER_RELOAD,
+    PLAYER_PRIME,
+	PLAYER_RELOAD_START,
+	PLAYER_RELOAD_INSERT,
+	PLAYER_RELOAD_END
+} PLAYER_ANIM;
+
+#define MAX_ID_RANGE 2048
+#define SBAR_STRING_SIZE 128
+
+enum sbar_data
+{
+	SBAR_ID_TARGETNAME = 1,
+	SBAR_ID_TARGETHEALTH,
+	SBAR_ID_TARGETARMOR,
+	SBAR_ID_TARGETLEVEL,
+	SBAR_END,
+};
+
+#define CHAT_INTERVAL 1.0f
+class CBasePlayer : public CBaseMonster
+{
+public:
+	int					random_seed;    // See that is shared between client & server for shared weapons code
+
+	int					m_iPlayerSound;// the index of the sound list slot reserved for this player
+	int					m_iTargetVolume;// ideal sound volume. 
+	int					m_iWeaponVolume;// how loud the player's weapon is right now.
+	int					m_iExtraSoundTypes;// additional classification for this weapon's sound
+	int					m_iWeaponFlash;// brightness of the weapon flash
+	float				m_flStopExtraSoundTime;
+	
+//	float				m_flFlashLightTime;	// Time until next battery draw/Recharge
+//	int					m_iFlashBattery;		// Flashlight Battery Draw
+
+	int					m_afButtonLast;
+	int					m_afButtonPressed;
+	int					m_afButtonReleased;
+	
+	edict_t			   *m_pentSndLast;			// last sound entity to modify player room type
+	float				m_flSndRoomtype;		// last roomtype set by sound entity
+	float				m_flSndRange;			// dist from player to sound entity
+
+	float				m_flFallVelocity;
+	
+	int					m_rgItems[MAX_ITEMS];
+	int					m_fKnownItem;		// True when a new item needs to be added
+	int					m_fNewAmmo;			// True when a new item has been added
+
+	unsigned int		m_afPhysicsFlags;	// physics flags - set when 'normal' physics should be revisited or overriden
+	float				m_fNextSuicideTime; // the time after which the player can next use the suicide command
+
+
+// these are time-sensitive things that we keep track of
+	float				m_flTimeStepSound;	// when the last stepping sound was made
+	float				m_flTimeWeaponIdle; // when to play another weapon idle animation.
+	float				m_flSwimTime;		// how long player has been underwater
+	float				m_flDuckTime;		// how long we've been ducking
+	float				m_flWallJumpTime;	// how long until next walljump
+
+	float				m_flSuitUpdate;					// when to play next suit update
+	int					m_rgSuitPlayList[CSUITPLAYLIST];// next sentencenum to play for suit update
+	int					m_iSuitPlayNext;				// next sentence slot for queue storage;
+	int					m_rgiSuitNoRepeat[CSUITNOREPEAT];		// suit sentence no repeat list
+	float				m_rgflSuitNoRepeatTime[CSUITNOREPEAT];	// how long to wait before allowing repeat
+	int					m_lastDamageAmount;		// Last damage taken
+	float				m_tbdPrev;				// Time-based damage timer
+
+	float				m_flgeigerRange;		// range to nearest radiation source
+	float				m_flgeigerDelay;		// delay per update of range msg to client
+	int					m_igeigerRangePrev;
+	int					m_iStepLeft;			// alternate left/right foot stepping sound
+	char				m_szTextureName[CBTEXTURENAMEMAX];	// current texture name we're standing on
+	char				m_chTextureType;		// current texture type
+
+	int					m_idrowndmg;			// track drowning damage taken
+	int					m_idrownrestored;		// track drowning damage restored
+
+	int					m_bitsHUDDamage;		// Damage bits for the current fame. These get sent to 
+												// the hude via the DAMAGE message
+	BOOL				m_fInitHUD;				// True when deferred HUD restart msg needs to be sent
+	BOOL				m_fGameHUDInitialized;
+	int					m_iTrain;				// Train control position
+	BOOL				m_fWeapon;				// Set this to FALSE to force a reset of the current weapon HUD info
+
+	EHANDLE				m_pTank;				// the tank which the player is currently controlling,  NULL if no tank
+	float				m_fDeadTime;			// the time at which the player died  (used in PlayerDeathThink())
+
+	BOOL			m_fNoPlayerSound;	// a debugging feature. Player makes no sound if this is true. 
+	BOOL			m_fLongJump; // does this player have the longjump module?
+
+	float       m_tSneaking;
+	int			m_iUpdateTime;		// stores the number of frame ticks before sending HUD update messages
+	int			m_iClientHealth;	// the health currently known by the client.  If this changes, send a new
+	int			m_iClientBattery;	// the Battery currently known by the client.  If this changes, send a new
+	int			m_iHideHUD;		// the players hud weapon info is to be hidden
+	int			m_iClientHideHUD;
+	int			m_iFOV;			// field of view
+	int			m_iClientFOV;	// client's known FOV
+	// usable player items 
+	CBasePlayerItem	*m_rgpPlayerItems[MAX_ITEM_TYPES];
+	CBasePlayerItem *m_pActiveItem;
+	CBasePlayerItem *m_pClientActiveItem;  // client version of the active item
+	CBasePlayerItem *m_pLastItem;
+    // Added by mmcguire.
+    string_t m_pLastItemName;
+
+
+	// shared ammo slots
+	int	m_rgAmmo[MAX_AMMO_SLOTS];
+	int	m_rgAmmoLast[MAX_AMMO_SLOTS];
+
+	Vector				m_vecAutoAim;
+	BOOL				m_fOnTarget;
+	int					m_iDeaths;
+	float				m_iRespawnFrames;	// used in PlayerDeathThink() to make sure players can always respawn
+
+	int m_lastx, m_lasty;  // These are the previous update's crosshair angles, DON"T SAVE/RESTORE
+
+	int m_nCustomSprayFrames;// Custom clan logo frames for this player
+	float	m_flNextDecalTime;// next time this player can spray a decal
+
+	char m_szTeamName[TEAM_NAME_LENGTH];
+
+	virtual void Spawn( void );
+	void Pain( void );
+
+//	virtual void Think( void );
+	virtual void Jump( void );
+	virtual void Duck( void );
+	virtual void PreThink( void );
+	virtual void PostThink( void );
+	virtual Vector GetGunPosition( void );
+	virtual int	GetMaxWalkSpeed(void) const;
+	virtual int TakeHealth( float flHealth, int bitsDamageType );
+	virtual void TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType);
+	virtual int TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType);
+	virtual void	Killed( entvars_t *pevAttacker, int iGib );
+	virtual Vector BodyTarget( const Vector &posSrc ) { return Center( ) + pev->view_ofs * RANDOM_FLOAT( 0.5, 1.1 ); };		// position to shoot at
+	virtual void StartSneaking( void ) { m_tSneaking = gpGlobals->time - 1; }
+	virtual void StopSneaking( void ) { m_tSneaking = gpGlobals->time + 30; }
+	virtual BOOL IsSneaking( void ) { return m_tSneaking <= gpGlobals->time; }
+	virtual BOOL IsAlive() const;
+	virtual BOOL IsAlive(bool inIncludeSpectating) const;
+	virtual BOOL ShouldFadeOnDeath( void ) { return FALSE; }
+	void SpawnClientSideCorpse();
+	virtual	BOOL IsPlayer( void ) { return TRUE; }			// Spectators should return FALSE for this, they aren't "players" as far as game logic is concerned
+
+	virtual BOOL IsNetClient( void ) { return !(pev->flags & FL_FAKECLIENT); }		// Bots should return FALSE for this, they can't receive NET messages
+																					// Spectators should return TRUE for this
+	virtual char *TeamID(void);
+	virtual void SetTeamID(const char* inTeamID);
+	virtual int	GetEffectivePlayerClass() { return 0; }
+	virtual int	GetAuthenticationMask() { return 0; }
+	virtual void EffectivePlayerClassChanged();
+	virtual void NeedsTeamUpdate();
+	virtual void SendTeamUpdate();
+	virtual void SendWeaponUpdate();
+	
+	virtual void	InitPlayerFromSpawn(edict_t* inSpawn);
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	void RenewItems(void);
+	virtual void PackDeadPlayerItems( void );
+	void DestroyAllItems( BOOL removeSuit );
+	void RemoveAllItems( BOOL removeSuit );
+	BOOL SwitchWeapon( CBasePlayerItem *pWeapon );
+
+	// JOHN:  sends custom messages if player HUD data has changed  (eg health, ammo)
+	virtual void UpdateClientData( void );
+	
+	static	TYPEDESCRIPTION m_playerSaveData[];
+
+	// Player is moved across the transition by other means
+	virtual int		ObjectCaps( void ) { return CBaseMonster :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+	virtual void	Precache( void );
+	BOOL			IsOnLadder( void );
+	BOOL			FlashlightIsOn( void );
+	void			FlashlightTurnOn( void );
+	void			FlashlightTurnOff( void );
+	
+	void UpdatePlayerSound ( void );
+	void DeathSound ( void );
+
+	int Classify ( void );
+	virtual void GetAnimationForActivity(int inActivity, char outAnimation[64], bool inGaitSequence = false) { strcpy(outAnimation, ""); };
+	void SetAnimation( PLAYER_ANIM playerAnim );
+	void SetWeaponAnimType( const char *szExtention );
+	char m_szAnimExtention[32];
+
+	// custom player functions
+	virtual void ImpulseCommands( void );
+	void CheatImpulseCommands( int iImpulse );
+
+	void StartDeathCam( void );
+	virtual void StartObserver( Vector vecPosition, Vector vecViewAngle );
+	virtual void StopObserver();
+
+	// Observer camera
+	bool	Observer_FindNextPlayer(bool inReverse = false);
+	void	Observer_HandleButtons();
+	void	Observer_SetMode( int iMode );
+    void	Observer_SpectatePlayer( int idx);
+
+	EHANDLE	m_hObserverTarget;
+	float	m_flNextObserverInput;
+	int		IsObserver() const { return pev->iuser1; };
+	
+	virtual float GetAdrenalineFactor() const { return 0.0f; }
+	
+	virtual void AddPoints( int score, BOOL bAllowNegativeScore );
+	virtual void AddPointsToTeam( int score, BOOL bAllowNegativeScore );
+	BOOL AddPlayerItem( CBasePlayerItem *pItem );
+	BOOL RemovePlayerItem( CBasePlayerItem *pItem );
+	void DropPlayerItem ( char *pszItemName );
+	BOOL HasPlayerItem( CBasePlayerItem *pCheckItem );
+	CBasePlayerItem* HasNamedPlayerItem( const char *pszItemName );
+	BOOL HasItem(CBasePlayerItem* inWeapon);
+	BOOL HasItemWithFlag(int inFlag, CBasePlayerItem*& outItem);
+	BOOL HasWeapons( void );// do I have ANY weapons?
+	void SelectPrevItem( int iItem );
+	void SelectNextItem( int iItem );
+	void SelectLastItem(void);
+	void SelectItem(const char *pstr);
+	void ItemPreFrame( void );
+	virtual void ItemPostFrame( void );
+
+	virtual void GiveNamedItem( const char *szName, bool inSendMessage = false);
+	void EnableControl(BOOL fControl);
+
+	virtual int GiveAmmo( int iAmount, char *szName, int iMax );
+	void SendAmmoUpdate(void);
+
+	void WaterMove( void );
+	virtual void Suicide();
+	void EXPORT PlayerDeathThink( void );
+	void EXPORT SuicideThink(void);
+	void PlayerUse( void );
+    void ClearKeys( void);
+
+	void CheckSuitUpdate();
+	void SetSuitUpdate(char *name, int fgroup, int iNoRepeat);
+	void UpdateGeigerCounter( void );
+	void CheckTimeBasedDamage( void );
+
+	BOOL FBecomeProne ( void );
+	void BarnacleVictimBitten ( entvars_t *pevBarnacle );
+	void BarnacleVictimReleased ( void );
+	static int GetAmmoIndex(const char *psz);
+	int AmmoInventory( int iAmmoIndex );
+	int Illumination( void );
+
+	void ResetAutoaim( void );
+	Vector GetAutoaimVector( float flDelta  );
+	Vector AutoaimDeflection( Vector &vecSrc, float flDist, float flDelta  );
+
+	void ForceClientDllUpdate( void );  // Forces all client .dll specific data to be resent to client.
+
+	void DeathMessage( entvars_t *pevKiller );
+
+	void SetCustomDecalFrames( int nFrames );
+	int GetCustomDecalFrames( void );
+
+	void CBasePlayer::TabulateAmmo( void );
+
+	float m_flStartCharge;
+	float m_flAmmoStartCharge;
+	float m_flPlayAftershock;
+	float m_flNextAmmoBurn;// while charging, when to absorb another unit of player's ammo?
+	//Player ID
+	void InitStatusBar( void );
+	void UpdateStatusBar( void );
+	int m_izSBarState[ SBAR_END ];
+	float m_flNextSBarUpdateTime;
+	float m_flStatusBarDisappearDelay;
+	char m_SbarString0[ SBAR_STRING_SIZE ];
+	char m_SbarString1[ SBAR_STRING_SIZE ];
+	
+	float m_flNextChatTime;
+	int m_DefaultSpectatingMode;
+	int m_DefaultSpectatingTarget;
+
+	CBaseEntity*	GetSpectatingEntity() const;
+	int				GetDefaultSpectatingMode() const { return this->m_DefaultSpectatingMode; }
+	int				GetDefaultSpectatingTarget() const { return this->m_DefaultSpectatingTarget; }
+	void			SetDefaultSpectatingSettings(int inSpectatingMode, int inDefaultSpectatingTarget = -1) { this->m_DefaultSpectatingMode = inSpectatingMode; this->m_DefaultSpectatingTarget = inDefaultSpectatingTarget; }
+
+    // Added by mmcguire.
+    virtual bool    GetCanUseWeapon() const { return true; }
+
+};
+
+#define AUTOAIM_2DEGREES  0.0348994967025
+#define AUTOAIM_5DEGREES  0.08715574274766
+#define AUTOAIM_8DEGREES  0.1391731009601
+#define AUTOAIM_10DEGREES 0.1736481776669
+
+
+extern int	gmsgHudText;
+extern BOOL gInitHUD;
+
+// HLSDK 2.3 update
+//// Observer Movement modes (stored in pev->iuser1, so the physics code can get at them)
+//#define OBS_CHASE_LOCKED		1
+//#define OBS_CHASE_FREE			2
+//#define OBS_ROAMING			3
+
+#endif // PLAYER_H
diff --git a/main/source/dlls/playermonster.cpp b/main/source/dlls/playermonster.cpp
new file mode 100644
index 00000000..ce1781a1
--- /dev/null
+++ b/main/source/dlls/playermonster.cpp
@@ -0,0 +1,115 @@
+//=========================================================
+// playermonster - for scripted sequence use.
+//=========================================================
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"schedule.h"
+
+// For holograms, make them not solid so the player can walk through them
+#define	SF_MONSTERPLAYER_NOTSOLID					4 
+
+//=========================================================
+// Monster's Anim Events Go Here
+//=========================================================
+
+class CPlayerMonster : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void SetYawSpeed( void );
+	int  Classify ( void );
+	void HandleAnimEvent( MonsterEvent_t *pEvent );
+	int ISoundMask ( void );
+};
+LINK_ENTITY_TO_CLASS( monster_player, CPlayerMonster );
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CPlayerMonster :: Classify ( void )
+{
+	return	CLASS_PLAYER_ALLY;
+}
+
+//=========================================================
+// SetYawSpeed - allows each sequence to have a different
+// turn rate associated with it.
+//=========================================================
+void CPlayerMonster :: SetYawSpeed ( void )
+{
+	int ys;
+
+	switch ( m_Activity )
+	{
+	case ACT_IDLE:
+	default:
+		ys = 90;
+	}
+
+	pev->yaw_speed = ys;
+}
+
+//=========================================================
+// HandleAnimEvent - catches the monster-specific messages
+// that occur when tagged animation frames are played.
+//=========================================================
+void CPlayerMonster :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	switch( pEvent->event )
+	{
+	case 0:
+	default:
+		CBaseMonster::HandleAnimEvent( pEvent );
+		break;
+	}
+}
+
+//=========================================================
+// ISoundMask - player monster can't hear.
+//=========================================================
+int CPlayerMonster :: ISoundMask ( void )
+{
+	return	NULL;
+}
+
+//=========================================================
+// Spawn
+//=========================================================
+void CPlayerMonster :: Spawn()
+{
+	Precache( );
+
+	SET_MODEL(ENT(pev), "models/player.mdl");
+	UTIL_SetSize(pev, VEC_HULL_MIN, VEC_HULL_MAX);
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_STEP;
+	m_bloodColor		= BLOOD_COLOR_RED;
+	pev->health			= 8;
+	m_flFieldOfView		= 0.5;// indicates the width of this monster's forward view cone ( as a dotproduct result )
+	m_MonsterState		= MONSTERSTATE_NONE;
+
+
+	MonsterInit();
+	if ( pev->spawnflags & SF_MONSTERPLAYER_NOTSOLID )
+	{
+		pev->solid = SOLID_NOT;
+		pev->takedamage = DAMAGE_NO;
+	}
+}
+
+//=========================================================
+// Precache - precaches all resources this monster needs
+//=========================================================
+void CPlayerMonster :: Precache()
+{
+	PRECACHE_MODEL("models/player.mdl");
+}	
+
+//=========================================================
+// AI Schedules Specific to this monster
+//=========================================================
diff --git a/main/source/dlls/python.cpp b/main/source/dlls/python.cpp
new file mode 100644
index 00000000..9e7a645a
--- /dev/null
+++ b/main/source/dlls/python.cpp
@@ -0,0 +1,319 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD )
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "weapons.h"
+#include "monsters.h"
+#include "player.h"
+#include "gamerules.h"
+
+
+enum python_e {
+	PYTHON_IDLE1 = 0,
+	PYTHON_FIDGET,
+	PYTHON_FIRE1,
+	PYTHON_RELOAD,
+	PYTHON_HOLSTER,
+	PYTHON_DRAW,
+	PYTHON_IDLE2,
+	PYTHON_IDLE3
+};
+
+LINK_ENTITY_TO_CLASS( weapon_python, CPython );
+LINK_ENTITY_TO_CLASS( weapon_357, CPython );
+
+int CPython::GetItemInfo(ItemInfo *p)
+{
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = "357";
+	p->iMaxAmmo1 = _357_MAX_CARRY;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = -1;
+	p->iMaxClip = PYTHON_MAX_CLIP;
+	p->iFlags = 0;
+	p->iSlot = 1;
+	p->iPosition = 1;
+	p->iId = m_iId = WEAPON_PYTHON;
+	p->iWeight = PYTHON_WEIGHT;
+
+	return 1;
+}
+
+int CPython::AddToPlayer( CBasePlayer *pPlayer )
+{
+	if ( CBasePlayerWeapon::AddToPlayer( pPlayer ) )
+	{
+		MESSAGE_BEGIN( MSG_ONE, gmsgWeapPickup, NULL, pPlayer->pev );
+			WRITE_BYTE( m_iId );
+		MESSAGE_END();
+		return TRUE;
+	}
+	return FALSE;
+}
+
+void CPython::Spawn( )
+{
+	pev->classname = MAKE_STRING("weapon_357"); // hack to allow for old names
+	Precache( );
+	m_iId = WEAPON_PYTHON;
+	SET_MODEL(ENT(pev), "models/w_357.mdl");
+
+	m_iDefaultAmmo = PYTHON_DEFAULT_GIVE;
+
+	FallInit();// get ready to fall down.
+}
+
+
+void CPython::Precache( void )
+{
+	PRECACHE_MODEL("models/v_357.mdl");
+	PRECACHE_MODEL("models/w_357.mdl");
+	PRECACHE_MODEL("models/p_357.mdl");
+
+	PRECACHE_MODEL("models/w_357ammobox.mdl");
+	PRECACHE_SOUND("items/9mmclip1.wav");              
+
+	PRECACHE_SOUND ("weapons/357_reload1.wav");
+	PRECACHE_SOUND ("weapons/357_cock1.wav");
+	PRECACHE_SOUND ("weapons/357_shot1.wav");
+	PRECACHE_SOUND ("weapons/357_shot2.wav");
+
+	m_usFirePython = PRECACHE_EVENT( 1, "events/python.sc" );
+}
+
+BOOL CPython::Deploy( )
+{
+#ifdef CLIENT_DLL
+	if ( bIsMultiplayer() )
+#else
+	if ( g_pGameRules->IsMultiplayer() )
+#endif
+	{
+		// enable laser sight geometry.
+		pev->body = 1;
+	}
+	else
+	{
+		pev->body = 0;
+	}
+
+	return DefaultDeploy( "models/v_357.mdl", "models/p_357.mdl", PYTHON_DRAW, "python", UseDecrement(), pev->body );
+}
+
+
+void CPython::Holster( int skiplocal /* = 0 */ )
+{
+	m_fInReload = FALSE;// cancel any reload in progress.
+
+	if ( m_fInZoom )
+	{
+		SecondaryAttack();
+	}
+
+	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 1.0;
+	m_flTimeWeaponIdle = UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
+	SendWeaponAnim( PYTHON_HOLSTER );
+}
+
+void CPython::SecondaryAttack( void )
+{
+#ifdef CLIENT_DLL
+	if ( !bIsMultiplayer() )
+#else
+	if ( !g_pGameRules->IsMultiplayer() )
+#endif
+	{
+		return;
+	}
+
+	if ( m_pPlayer->pev->fov != 0 )
+	{
+		m_fInZoom = FALSE;
+		m_pPlayer->pev->fov = m_pPlayer->m_iFOV = 0;  // 0 means reset to default fov
+	}
+	else if ( m_pPlayer->pev->fov != 40 )
+	{
+		m_fInZoom = TRUE;
+		m_pPlayer->pev->fov = m_pPlayer->m_iFOV = 40;
+	}
+
+	m_flNextSecondaryAttack = 0.5;
+}
+
+void CPython::PrimaryAttack()
+{
+	// don't fire underwater
+	if (m_pPlayer->pev->waterlevel == 3)
+	{
+		PlayEmptySound( );
+		m_flNextPrimaryAttack = 0.15;
+		return;
+	}
+
+	if (m_iClip <= 0)
+	{
+		if (!m_fFireOnEmpty)
+			Reload( );
+		else
+		{
+			EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/357_cock1.wav", 0.8, ATTN_NORM);
+			m_flNextPrimaryAttack = 0.15;
+		}
+
+		return;
+	}
+
+	m_pPlayer->m_iWeaponVolume = LOUD_GUN_VOLUME;
+	m_pPlayer->m_iWeaponFlash = BRIGHT_GUN_FLASH;
+
+	m_iClip--;
+
+	m_pPlayer->pev->effects = (int)(m_pPlayer->pev->effects) | EF_MUZZLEFLASH;
+
+	// player "shoot" animation
+	m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
+
+
+	UTIL_MakeVectors( m_pPlayer->pev->v_angle + m_pPlayer->pev->punchangle );
+
+	Vector vecSrc	 = m_pPlayer->GetGunPosition( );
+	Vector vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_10DEGREES );
+
+	Vector vecDir;
+	vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_1DEGREES, 8192, BULLET_PLAYER_357, 0, 0, m_pPlayer->pev, m_pPlayer->random_seed );
+
+    int flags;
+#if defined( CLIENT_WEAPONS )
+	flags = FEV_NOTHOST;
+#else
+	flags = 0;
+#endif
+
+	PLAYBACK_EVENT_FULL( flags, m_pPlayer->edict(), m_usFirePython, 0.0, (float *)&g_vecZero, (float *)&g_vecZero, vecDir.x, vecDir.y, 0, 0, 0, 0 );
+
+	if (!m_iClip && m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] <= 0)
+		// HEV suit - indicate out of ammo condition
+		m_pPlayer->SetSuitUpdate("!HEV_AMO0", FALSE, 0);
+
+	m_flNextPrimaryAttack = 0.75;
+	m_flTimeWeaponIdle = UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
+}
+
+
+void CPython::Reload( void )
+{
+	if ( m_pPlayer->ammo_357 <= 0 )
+		return;
+
+	if ( m_pPlayer->pev->fov != 0 )
+	{
+		m_fInZoom = FALSE;
+		m_pPlayer->pev->fov = m_pPlayer->m_iFOV = 0;  // 0 means reset to default fov
+	}
+
+	int bUseScope = FALSE;
+#ifdef CLIENT_DLL
+	bUseScope = bIsMultiplayer();
+#else
+	bUseScope = g_pGameRules->IsMultiplayer();
+#endif
+	if (DefaultReload( 6, PYTHON_RELOAD, 2.0, bUseScope ))
+	{
+		m_flSoundDelay = 1.5;
+	}
+}
+
+
+void CPython::WeaponIdle( void )
+{
+	ResetEmptySound( );
+
+	m_pPlayer->GetAutoaimVector( AUTOAIM_10DEGREES );
+
+	// ALERT( at_console, "%.2f\n", gpGlobals->time - m_flSoundDelay );
+	if (m_flSoundDelay != 0 && m_flSoundDelay <= UTIL_WeaponTimeBase() )
+	{
+		EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/357_reload1.wav", RANDOM_FLOAT(0.8, 0.9), ATTN_NORM);
+		m_flSoundDelay = 0;
+	}
+
+	if (m_flTimeWeaponIdle > UTIL_WeaponTimeBase() )
+		return;
+
+	int iAnim;
+	float flRand = UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
+	if (flRand <= 0.5)
+	{
+		iAnim = PYTHON_IDLE1;
+		m_flTimeWeaponIdle = (70.0/30.0);
+	}
+	else if (flRand <= 0.7)
+	{
+		iAnim = PYTHON_IDLE2;
+		m_flTimeWeaponIdle = (60.0/30.0);
+	}
+	else if (flRand <= 0.9)
+	{
+		iAnim = PYTHON_IDLE3;
+		m_flTimeWeaponIdle = (88.0/30.0);
+	}
+	else
+	{
+		iAnim = PYTHON_FIDGET;
+		m_flTimeWeaponIdle = (170.0/30.0);
+	}
+	
+	int bUseScope = FALSE;
+#ifdef CLIENT_DLL
+	bUseScope = bIsMultiplayer();
+#else
+	bUseScope = g_pGameRules->IsMultiplayer();
+#endif
+	
+	SendWeaponAnim( iAnim, UseDecrement() ? 1 : 0, bUseScope );
+}
+
+
+
+class CPythonAmmo : public CBasePlayerAmmo
+{
+	void Spawn( void )
+	{ 
+		Precache( );
+		SET_MODEL(ENT(pev), "models/w_357ammobox.mdl");
+		CBasePlayerAmmo::Spawn( );
+	}
+	void Precache( void )
+	{
+		PRECACHE_MODEL ("models/w_357ammobox.mdl");
+		PRECACHE_SOUND("items/9mmclip1.wav");
+	}
+	BOOL AddAmmo( CBaseEntity *pOther ) 
+	{ 
+		if (pOther->GiveAmmo( AMMO_357BOX_GIVE, "357", _357_MAX_CARRY ) != -1)
+		{
+			EMIT_SOUND(ENT(pev), CHAN_ITEM, "items/9mmclip1.wav", 1, ATTN_NORM);
+			return TRUE;
+		}
+		return FALSE;
+	}
+};
+LINK_ENTITY_TO_CLASS( ammo_357, CPythonAmmo );
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/rat.cpp b/main/source/dlls/rat.cpp
new file mode 100644
index 00000000..58827451
--- /dev/null
+++ b/main/source/dlls/rat.cpp
@@ -0,0 +1,98 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// rat - environmental monster
+//=========================================================
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"schedule.h"
+
+//=========================================================
+// Monster's Anim Events Go Here
+//=========================================================
+
+class CRat : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void SetYawSpeed( void );
+	int  Classify ( void );
+};
+LINK_ENTITY_TO_CLASS( monster_rat, CRat );
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CRat :: Classify ( void )
+{
+	return	CLASS_INSECT;
+}
+
+//=========================================================
+// SetYawSpeed - allows each sequence to have a different
+// turn rate associated with it.
+//=========================================================
+void CRat :: SetYawSpeed ( void )
+{
+	int ys;
+
+	switch ( m_Activity )
+	{
+	case ACT_IDLE:
+	default:
+		ys = 45;
+		break;
+	}
+
+	pev->yaw_speed = ys;
+}
+
+//=========================================================
+// Spawn
+//=========================================================
+void CRat :: Spawn()
+{
+	Precache( );
+
+	SET_MODEL(ENT(pev), "models/bigrat.mdl");
+	UTIL_SetSize( pev, Vector( 0, 0, 0 ), Vector( 0, 0, 0 ) );
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_STEP;
+	m_bloodColor		= BLOOD_COLOR_RED;
+	pev->health			= 8;
+	pev->view_ofs		= Vector ( 0, 0, 6 );// position of the eyes relative to monster's origin.
+	m_flFieldOfView		= 0.5;// indicates the width of this monster's forward view cone ( as a dotproduct result )
+	m_MonsterState		= MONSTERSTATE_NONE;
+
+	MonsterInit();
+}
+
+//=========================================================
+// Precache - precaches all resources this monster needs
+//=========================================================
+void CRat :: Precache()
+{
+	PRECACHE_MODEL("models/bigrat.mdl");
+}	
+
+//=========================================================
+// AI Schedules Specific to this monster
+//=========================================================
diff --git a/main/source/dlls/roach.cpp b/main/source/dlls/roach.cpp
new file mode 100644
index 00000000..c64d6069
--- /dev/null
+++ b/main/source/dlls/roach.cpp
@@ -0,0 +1,436 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// cockroach
+//=========================================================
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"schedule.h"
+#include	"soundent.h"
+#include	"decals.h"
+#include	"roach.h"
+
+#define		ROACH_IDLE				0
+#define		ROACH_BORED				1
+#define		ROACH_SCARED_BY_ENT		2
+#define		ROACH_SCARED_BY_LIGHT	3
+#define		ROACH_SMELL_FOOD		4
+#define		ROACH_EAT				5
+
+LINK_ENTITY_TO_CLASS( monster_cockroach, CRoach );
+
+//=========================================================
+// ISoundMask - returns a bit mask indicating which types
+// of sounds this monster regards. In the base class implementation,
+// monsters care about all sounds, but no scents.
+//=========================================================
+int CRoach :: ISoundMask ( void )
+{
+	return	bits_SOUND_CARCASS | bits_SOUND_MEAT;
+}
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CRoach :: Classify ( void )
+{
+	return CLASS_INSECT;
+}
+
+//=========================================================
+// Touch
+//=========================================================
+void CRoach :: Touch ( CBaseEntity *pOther )
+{
+	Vector		vecSpot;
+	TraceResult	tr;
+
+	if ( pOther->pev->velocity == g_vecZero || !pOther->IsPlayer() )
+	{
+		return;
+	}
+
+	vecSpot = pev->origin + Vector ( 0 , 0 , 8 );//move up a bit, and trace down.
+	UTIL_TraceLine ( vecSpot, vecSpot + Vector ( 0, 0, -24 ),  ignore_monsters, ENT(pev), & tr);
+
+	// This isn't really blood.  So you don't have to screen it out based on violence levels (UTIL_ShouldShowBlood())
+	UTIL_DecalTrace( &tr, DECAL_YBLOOD1 +RANDOM_LONG(0,5) );
+
+	TakeDamage( pOther->pev, pOther->pev, pev->health, DMG_CRUSH );
+}
+
+//=========================================================
+// SetYawSpeed - allows each sequence to have a different
+// turn rate associated with it.
+//=========================================================
+void CRoach :: SetYawSpeed ( void )
+{
+	int ys;
+
+	ys = 120;
+
+	pev->yaw_speed = ys;
+}
+
+//=========================================================
+// Spawn
+//=========================================================
+void CRoach :: Spawn()
+{
+	Precache( );
+
+	SET_MODEL(ENT(pev), "models/roach.mdl");
+	UTIL_SetSize( pev, Vector( -1, -1, 0 ), Vector( 1, 1, 2 ) );
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_STEP;
+	m_bloodColor		= BLOOD_COLOR_YELLOW;
+	pev->effects		= 0;
+	pev->health			= 1;
+	m_flFieldOfView		= 0.5;// indicates the width of this monster's forward view cone ( as a dotproduct result )
+	m_MonsterState		= MONSTERSTATE_NONE;
+	this->pev->classname = ALLOC_STRING(kRoachClassName);
+
+	MonsterInit();
+	SetActivity ( ACT_IDLE );
+
+	pev->view_ofs		= Vector ( 0, 0, 1 );// position of the eyes relative to monster's origin.
+	pev->takedamage		= DAMAGE_YES;
+	m_fLightHacked		= FALSE;
+	m_flLastLightLevel	= -1;
+	m_iMode				= ROACH_IDLE;
+	m_flNextSmellTime	= gpGlobals->time;
+}
+
+//=========================================================
+// Precache - precaches all resources this monster needs
+//=========================================================
+void CRoach :: Precache()
+{
+	PRECACHE_MODEL("models/roach.mdl");
+
+	PRECACHE_SOUND("roach/rch_die.wav");
+	PRECACHE_SOUND("roach/rch_walk.wav");
+	PRECACHE_SOUND("roach/rch_smash.wav");
+}	
+
+
+//=========================================================
+// Killed.
+//=========================================================
+void CRoach :: Killed( entvars_t *pevAttacker, int iGib )
+{
+	pev->solid = SOLID_NOT;
+
+	//random sound
+	if ( RANDOM_LONG(0,4) == 1 )
+	{
+		EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "roach/rch_die.wav", 0.8, ATTN_NORM, 0, 80 + RANDOM_LONG(0,39) );
+	}
+	else
+	{
+		EMIT_SOUND_DYN(ENT(pev), CHAN_BODY, "roach/rch_smash.wav", 0.7, ATTN_NORM, 0, 80 + RANDOM_LONG(0,39) );
+	}
+	
+	CSoundEnt::InsertSound ( bits_SOUND_WORLD, pev->origin, 128, 1 );
+
+	CBaseEntity *pOwner = CBaseEntity::Instance(pev->owner);
+	if ( pOwner )
+	{
+		pOwner->DeathNotice( pev );
+	}
+	UTIL_Remove( this );
+}
+
+//=========================================================
+// MonsterThink, overridden for roaches.
+//=========================================================
+void CRoach :: MonsterThink( void  )
+{
+	if ( FNullEnt( FIND_CLIENT_IN_PVS( edict() ) ) )
+		pev->nextthink = gpGlobals->time + RANDOM_FLOAT(1,1.5);
+	else
+		pev->nextthink = gpGlobals->time + 0.1;// keep monster thinking
+
+	float flInterval = StudioFrameAdvance( ); // animate
+
+	if ( !m_fLightHacked )
+	{
+		// if light value hasn't been collection for the first time yet, 
+		// suspend the creature for a second so the world finishes spawning, then we'll collect the light level.
+		pev->nextthink = gpGlobals->time + 1;
+		m_fLightHacked = TRUE;
+		return;
+	}
+	else if ( m_flLastLightLevel < 0 )
+	{
+		// collect light level for the first time, now that all of the lightmaps in the roach's area have been calculated.
+		m_flLastLightLevel = GETENTITYILLUM( ENT( pev ) );
+	}
+
+	switch ( m_iMode )
+	{
+	case	ROACH_IDLE:
+	case	ROACH_EAT:
+		{
+			// if not moving, sample environment to see if anything scary is around. Do a radius search 'look' at random.
+			if ( RANDOM_LONG(0,3) == 1 )
+			{
+				Look( 150 );
+				if (HasConditions(bits_COND_SEE_FEAR))
+				{
+					// if see something scary
+					//ALERT ( at_aiconsole, "Scared\n" );
+					Eat( 30 +  ( RANDOM_LONG(0,14) ) );// roach will ignore food for 30 to 45 seconds
+					PickNewDest( ROACH_SCARED_BY_ENT );
+					SetActivity ( ACT_WALK );
+				}
+				else if ( RANDOM_LONG(0,149) == 1 )
+				{
+					// if roach doesn't see anything, there's still a chance that it will move. (boredom)
+					//ALERT ( at_aiconsole, "Bored\n" );
+					PickNewDest( ROACH_BORED );
+					SetActivity ( ACT_WALK );
+
+					if ( m_iMode == ROACH_EAT )
+					{
+						// roach will ignore food for 30 to 45 seconds if it got bored while eating. 
+						Eat( 30 +  ( RANDOM_LONG(0,14) ) );
+					}
+				}
+			}
+	
+			// don't do this stuff if eating!
+			if ( m_iMode == ROACH_IDLE )
+			{
+				if ( FShouldEat() )
+				{
+					Listen();
+				}
+
+				if ( GETENTITYILLUM( ENT(pev) ) > m_flLastLightLevel )
+				{
+					// someone turned on lights!
+					//ALERT ( at_console, "Lights!\n" );
+					PickNewDest( ROACH_SCARED_BY_LIGHT );
+					SetActivity ( ACT_WALK );
+				}
+				else if ( HasConditions(bits_COND_SMELL_FOOD) )
+				{
+					CSound *pSound;
+
+					pSound = CSoundEnt::SoundPointerForIndex( m_iAudibleList );
+
+					// roach smells food and is just standing around. Go to food unless food isn't on same z-plane.
+					if ( pSound && abs( pSound->m_vecOrigin.z - pev->origin.z ) <= 3 )
+					{
+						PickNewDest( ROACH_SMELL_FOOD );
+						SetActivity ( ACT_WALK );
+					}
+				}
+			}
+
+			break;
+		}
+	case	ROACH_SCARED_BY_LIGHT:
+		{
+			// if roach was scared by light, then stop if we're over a spot at least as dark as where we started!
+			if ( GETENTITYILLUM( ENT( pev ) ) <= m_flLastLightLevel )
+			{
+				SetActivity ( ACT_IDLE );
+				m_flLastLightLevel = GETENTITYILLUM( ENT ( pev ) );// make this our new light level.
+			}
+			break;
+		}
+	}
+	
+	if ( m_flGroundSpeed != 0 )
+	{
+		Move( flInterval );
+	}
+}
+
+//=========================================================
+// Picks a new spot for roach to run to.(
+//=========================================================
+void CRoach :: PickNewDest ( int iCondition )
+{
+	Vector	vecNewDir;
+	Vector	vecDest;
+	float	flDist;
+
+	m_iMode = iCondition;
+
+	if ( m_iMode == ROACH_SMELL_FOOD )
+	{
+		// find the food and go there.
+		CSound *pSound;
+
+		pSound = CSoundEnt::SoundPointerForIndex( m_iAudibleList );
+
+		if ( pSound )
+		{
+			m_Route[ 0 ].vecLocation.x = pSound->m_vecOrigin.x + ( 3 - RANDOM_LONG(0,5) );
+			m_Route[ 0 ].vecLocation.y = pSound->m_vecOrigin.y + ( 3 - RANDOM_LONG(0,5) );
+			m_Route[ 0 ].vecLocation.z = pSound->m_vecOrigin.z;
+			m_Route[ 0 ].iType = bits_MF_TO_LOCATION;
+			m_movementGoal = RouteClassify( m_Route[ 0 ].iType );
+			return;
+		}
+	}
+
+	do 
+	{
+		// picks a random spot, requiring that it be at least 128 units away
+		// else, the roach will pick a spot too close to itself and run in 
+		// circles. this is a hack but buys me time to work on the real monsters.
+		vecNewDir.x = RANDOM_FLOAT( -1, 1 );
+		vecNewDir.y = RANDOM_FLOAT( -1, 1 );
+		flDist		= 256 + ( RANDOM_LONG(0,255) );
+		vecDest = pev->origin + vecNewDir * flDist;
+
+	} while ( ( vecDest - pev->origin ).Length2D() < 128 );
+
+	m_Route[ 0 ].vecLocation.x = vecDest.x;
+	m_Route[ 0 ].vecLocation.y = vecDest.y;
+	m_Route[ 0 ].vecLocation.z = pev->origin.z;
+	m_Route[ 0 ].iType = bits_MF_TO_LOCATION;
+	m_movementGoal = RouteClassify( m_Route[ 0 ].iType );
+
+	if ( RANDOM_LONG(0,9) == 1 )
+	{
+		// every once in a while, a roach will play a skitter sound when they decide to run
+		EMIT_SOUND_DYN(ENT(pev), CHAN_BODY, "roach/rch_walk.wav", 1, ATTN_NORM, 0, 80 + RANDOM_LONG(0,39) );
+	}
+}
+
+//=========================================================
+// roach's move function
+//=========================================================
+void CRoach :: Move ( float flInterval ) 
+{
+	float		flWaypointDist;
+	Vector		vecApex;
+
+	// local move to waypoint.
+	flWaypointDist = ( m_Route[ m_iRouteIndex ].vecLocation - pev->origin ).Length2D();
+	MakeIdealYaw ( m_Route[ m_iRouteIndex ].vecLocation );
+
+	ChangeYaw ( pev->yaw_speed );
+	UTIL_MakeVectors( pev->angles );
+
+	if ( RANDOM_LONG(0,7) == 1 )
+	{
+		// randomly check for blocked path.(more random load balancing)
+		if ( !WALK_MOVE( ENT(pev), pev->ideal_yaw, 4, WALKMOVE_NORMAL ) )
+		{
+			// stuck, so just pick a new spot to run off to
+			PickNewDest( m_iMode );
+		}
+	}
+	
+	WALK_MOVE( ENT(pev), pev->ideal_yaw, m_flGroundSpeed * flInterval, WALKMOVE_NORMAL );
+
+	// if the waypoint is closer than step size, then stop after next step (ok for roach to overshoot)
+	if ( flWaypointDist <= m_flGroundSpeed * flInterval )
+	{
+		// take truncated step and stop
+
+		SetActivity ( ACT_IDLE );
+		m_flLastLightLevel = GETENTITYILLUM( ENT ( pev ) );// this is roach's new comfortable light level
+
+		if ( m_iMode == ROACH_SMELL_FOOD )
+		{
+			m_iMode = ROACH_EAT;
+		}
+		else
+		{
+			m_iMode = ROACH_IDLE;
+		}
+	}
+
+	if ( RANDOM_LONG(0,149) == 1 && m_iMode != ROACH_SCARED_BY_LIGHT && m_iMode != ROACH_SMELL_FOOD )
+	{
+		// random skitter while moving as long as not on a b-line to get out of light or going to food
+		PickNewDest( FALSE );
+	}
+}
+
+//=========================================================
+// Look - overriden for the roach, which can virtually see 
+// 360 degrees.
+//=========================================================
+void CRoach :: Look ( int iDistance )
+{
+	CBaseEntity	*pSightEnt = NULL;// the current visible entity that we're dealing with
+	CBaseEntity	*pPreviousEnt;// the last entity added to the link list 
+	int			iSighted = 0;
+
+	// DON'T let visibility information from last frame sit around!
+	ClearConditions( bits_COND_SEE_HATE |bits_COND_SEE_DISLIKE | bits_COND_SEE_ENEMY | bits_COND_SEE_FEAR );
+
+	// don't let monsters outside of the player's PVS act up, or most of the interesting
+	// things will happen before the player gets there!
+	if ( FNullEnt( FIND_CLIENT_IN_PVS( edict() ) ) )
+	{
+		return;
+	}
+
+	m_pLink = NULL;
+	pPreviousEnt = this;
+
+	// Does sphere also limit itself to PVS?
+	// Examine all entities within a reasonable radius
+	// !!!PERFORMANCE - let's trivially reject the ent list before radius searching!
+	while ((pSightEnt = UTIL_FindEntityInSphere( pSightEnt, pev->origin, iDistance )) != NULL)
+	{
+		// only consider ents that can be damaged. !!!temporarily only considering other monsters and clients
+		if (  pSightEnt->IsPlayer() || FBitSet ( pSightEnt->pev->flags, FL_MONSTER ) )
+		{
+			if ( /*FVisible( pSightEnt ) &&*/ !FBitSet( pSightEnt->pev->flags, FL_NOTARGET ) && pSightEnt->pev->health > 0 )
+			{
+				// NULL the Link pointer for each ent added to the link list. If other ents follow, the will overwrite
+				// this value. If this ent happens to be the last, the list will be properly terminated.
+				pPreviousEnt->m_pLink = pSightEnt;
+				pSightEnt->m_pLink = NULL;
+				pPreviousEnt = pSightEnt;
+
+				// don't add the Enemy's relationship to the conditions. We only want to worry about conditions when
+				// we see monsters other than the Enemy.
+				switch ( IRelationship ( pSightEnt ) )
+				{
+				case	R_FR:		
+					iSighted |= bits_COND_SEE_FEAR;	
+					break;
+				case	R_NO:
+					break;
+				default:
+					ALERT ( at_console, "%s can't asses %s\n", STRING(pev->classname), STRING(pSightEnt->pev->classname ) );
+					break;
+				}
+			}
+		}
+	}
+	SetConditions( iSighted );
+}
+
+//=========================================================
+// AI Schedules Specific to this monster
+//=========================================================
+
diff --git a/main/source/dlls/roach.h b/main/source/dlls/roach.h
new file mode 100644
index 00000000..dea76767
--- /dev/null
+++ b/main/source/dlls/roach.h
@@ -0,0 +1,35 @@
+#ifndef ROACH_H
+#define ROACH_H
+
+#include	"cbase.h"
+
+#define kRoachClassName "Roach"
+
+//=========================================================
+// Monster's Anim Events Go Here
+//=========================================================
+class CRoach : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void SetYawSpeed( void );
+	void EXPORT MonsterThink ( void );
+	void Move ( float flInterval );
+	void PickNewDest ( int iCondition );
+	void EXPORT Touch ( CBaseEntity *pOther );
+	void Killed( entvars_t *pevAttacker, int iGib );
+
+	float	m_flLastLightLevel;
+	float	m_flNextSmellTime;
+	int		Classify ( void );
+	void	Look ( int iDistance );
+	int		ISoundMask ( void );
+	
+	// UNDONE: These don't necessarily need to be save/restored, but if we add more data, it may
+	BOOL	m_fLightHacked;
+	int		m_iMode;
+	// -----------------------------
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/rpg.cpp b/main/source/dlls/rpg.cpp
new file mode 100644
index 00000000..472d9676
--- /dev/null
+++ b/main/source/dlls/rpg.cpp
@@ -0,0 +1,617 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined( OEM_BUILD )
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "player.h"
+#include "gamerules.h"
+
+
+
+
+enum rpg_e {
+	RPG_IDLE = 0,
+	RPG_FIDGET,
+	RPG_RELOAD,		// to reload
+	RPG_FIRE2,		// to empty
+	RPG_HOLSTER1,	// loaded
+	RPG_DRAW1,		// loaded
+	RPG_HOLSTER2,	// unloaded
+	RPG_DRAW_UL,	// unloaded
+	RPG_IDLE_UL,	// unloaded idle
+	RPG_FIDGET_UL,	// unloaded fidget
+};
+
+LINK_ENTITY_TO_CLASS( weapon_rpg, CRpg );
+
+#ifndef CLIENT_DLL
+
+LINK_ENTITY_TO_CLASS( laser_spot, CLaserSpot );
+
+//=========================================================
+//=========================================================
+CLaserSpot *CLaserSpot::CreateSpot( void )
+{
+	CLaserSpot *pSpot = GetClassPtr( (CLaserSpot *)NULL );
+	pSpot->Spawn();
+
+	pSpot->pev->classname = MAKE_STRING("laser_spot");
+
+	return pSpot;
+}
+
+//=========================================================
+//=========================================================
+void CLaserSpot::Spawn( void )
+{
+	Precache( );
+	pev->movetype = MOVETYPE_NONE;
+	pev->solid = SOLID_NOT;
+
+	pev->rendermode = kRenderGlow;
+	pev->renderfx = kRenderFxNoDissipation;
+	pev->renderamt = 255;
+
+	SET_MODEL(ENT(pev), "sprites/laserdot.spr");
+	UTIL_SetOrigin( pev, pev->origin );
+};
+
+//=========================================================
+// Suspend- make the laser sight invisible. 
+//=========================================================
+void CLaserSpot::Suspend( float flSuspendTime )
+{
+	pev->effects |= EF_NODRAW;
+	
+	SetThink( &CLaserSpot::Revive );
+	pev->nextthink = gpGlobals->time + flSuspendTime;
+}
+
+//=========================================================
+// Revive - bring a suspended laser sight back.
+//=========================================================
+void CLaserSpot::Revive( void )
+{
+	pev->effects &= ~EF_NODRAW;
+
+	SetThink( NULL );
+}
+
+void CLaserSpot::Precache( void )
+{
+	PRECACHE_MODEL("sprites/laserdot.spr");
+};
+
+LINK_ENTITY_TO_CLASS( rpg_rocket, CRpgRocket );
+
+//=========================================================
+//=========================================================
+CRpgRocket *CRpgRocket::CreateRpgRocket( Vector vecOrigin, Vector vecAngles, CBaseEntity *pOwner, CRpg *pLauncher )
+{
+	CRpgRocket *pRocket = GetClassPtr( (CRpgRocket *)NULL );
+
+	UTIL_SetOrigin( pRocket->pev, vecOrigin );
+	pRocket->pev->angles = vecAngles;
+	pRocket->Spawn();
+	pRocket->SetTouch( &CRpgRocket::RocketTouch );
+	pRocket->m_pLauncher = pLauncher;// remember what RPG fired me. 
+	pRocket->m_pLauncher->m_cActiveRockets++;// register this missile as active for the launcher
+	pRocket->pev->owner = pOwner->edict();
+
+	return pRocket;
+}
+
+//=========================================================
+//=========================================================
+void CRpgRocket :: Spawn( void )
+{
+	Precache( );
+	// motor
+	pev->movetype = MOVETYPE_BOUNCE;
+	pev->solid = SOLID_BBOX;
+
+	SET_MODEL(ENT(pev), "models/rpgrocket.mdl");
+	UTIL_SetSize(pev, Vector( 0, 0, 0), Vector(0, 0, 0));
+	UTIL_SetOrigin( pev, pev->origin );
+
+	pev->classname = MAKE_STRING("rpg_rocket");
+
+	SetThink( &CRpgRocket::IgniteThink );
+	SetTouch( &CRpgRocket::ExplodeTouch );
+
+	pev->angles.x -= 30;
+	UTIL_MakeVectors( pev->angles );
+	pev->angles.x = -(pev->angles.x + 30);
+
+	pev->velocity = gpGlobals->v_forward * 250;
+	pev->gravity = 0.5;
+
+	pev->nextthink = gpGlobals->time + 0.4;
+
+	pev->dmg = gSkillData.plrDmgRPG;
+}
+
+//=========================================================
+//=========================================================
+void CRpgRocket :: RocketTouch ( CBaseEntity *pOther )
+{
+	if ( m_pLauncher )
+	{
+		// my launcher is still around, tell it I'm dead.
+		m_pLauncher->m_cActiveRockets--;
+	}
+
+	STOP_SOUND( edict(), CHAN_VOICE, "weapons/rocket1.wav" );
+	ExplodeTouch( pOther );
+}
+
+//=========================================================
+//=========================================================
+void CRpgRocket :: Precache( void )
+{
+	PRECACHE_MODEL("models/rpgrocket.mdl");
+	m_iTrail = PRECACHE_MODEL("sprites/smoke.spr");
+	PRECACHE_SOUND ("weapons/rocket1.wav");
+}
+
+
+void CRpgRocket :: IgniteThink( void  )
+{
+	// pev->movetype = MOVETYPE_TOSS;
+
+	pev->movetype = MOVETYPE_FLY;
+	pev->effects |= EF_LIGHT;
+
+	// make rocket sound
+	EMIT_SOUND( ENT(pev), CHAN_VOICE, "weapons/rocket1.wav", 1, 0.5 );
+
+	// rocket trail
+	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+
+		WRITE_BYTE( TE_BEAMFOLLOW );
+		WRITE_SHORT(entindex());	// entity
+		WRITE_SHORT(m_iTrail );	// model
+		WRITE_BYTE( 40 ); // life
+		WRITE_BYTE( 5 );  // width
+		WRITE_BYTE( 224 );   // r, g, b
+		WRITE_BYTE( 224 );   // r, g, b
+		WRITE_BYTE( 255 );   // r, g, b
+		WRITE_BYTE( 255 );	// brightness
+
+	MESSAGE_END();  // move PHS/PVS data sending into here (SEND_ALL, SEND_PVS, SEND_PHS)
+
+	m_flIgniteTime = gpGlobals->time;
+
+	// set to follow laser spot
+	SetThink( &CRpgRocket::FollowThink );
+	pev->nextthink = gpGlobals->time + 0.1;
+}
+
+
+void CRpgRocket :: FollowThink( void  )
+{
+	CBaseEntity *pOther = NULL;
+	Vector vecTarget;
+	Vector vecDir;
+	float flDist, flMax, flDot;
+	TraceResult tr;
+
+	UTIL_MakeAimVectors( pev->angles );
+
+	vecTarget = gpGlobals->v_forward;
+	flMax = 4096;
+	
+	// Examine all entities within a reasonable radius
+	while ((pOther = UTIL_FindEntityByClassname( pOther, "laser_spot" )) != NULL)
+	{
+		UTIL_TraceLine ( pev->origin, pOther->pev->origin, dont_ignore_monsters, ENT(pev), &tr );
+		// ALERT( at_console, "%f\n", tr.flFraction );
+		if (tr.flFraction >= 0.90)
+		{
+			vecDir = pOther->pev->origin - pev->origin;
+			flDist = vecDir.Length( );
+			vecDir = vecDir.Normalize( );
+			flDot = DotProduct( gpGlobals->v_forward, vecDir );
+			if ((flDot > 0) && (flDist * (1 - flDot) < flMax))
+			{
+				flMax = flDist * (1 - flDot);
+				vecTarget = vecDir;
+			}
+		}
+	}
+
+	pev->angles = UTIL_VecToAngles( vecTarget );
+
+	// this acceleration and turning math is totally wrong, but it seems to respond well so don't change it.
+	float flSpeed = pev->velocity.Length();
+	if (gpGlobals->time - m_flIgniteTime < 1.0)
+	{
+		pev->velocity = pev->velocity * 0.2 + vecTarget * (flSpeed * 0.8 + 400);
+		if (pev->waterlevel == 3)
+		{
+			// go slow underwater
+			if (pev->velocity.Length() > 300)
+			{
+				pev->velocity = pev->velocity.Normalize() * 300;
+			}
+			UTIL_BubbleTrail( pev->origin - pev->velocity * 0.1, pev->origin, 4 );
+		} 
+		else 
+		{
+			if (pev->velocity.Length() > 2000)
+			{
+				pev->velocity = pev->velocity.Normalize() * 2000;
+			}
+		}
+	}
+	else
+	{
+		if (pev->effects & EF_LIGHT)
+		{
+			pev->effects = 0;
+			STOP_SOUND( ENT(pev), CHAN_VOICE, "weapons/rocket1.wav" );
+		}
+		pev->velocity = pev->velocity * 0.2 + vecTarget * flSpeed * 0.798;
+		if (pev->waterlevel == 0 && pev->velocity.Length() < 1500)
+		{
+			Detonate( );
+		}
+	}
+	// ALERT( at_console, "%.0f\n", flSpeed );
+
+	pev->nextthink = gpGlobals->time + 0.1;
+}
+#endif
+
+
+
+void CRpg::Reload( void )
+{
+	int iResult;
+
+	if ( m_iClip == 1 )
+	{
+		// don't bother with any of this if don't need to reload.
+		return;
+	}
+
+	if ( m_pPlayer->ammo_rockets <= 0 )
+		return;
+
+	// because the RPG waits to autoreload when no missiles are active while  the LTD is on, the
+	// weapons code is constantly calling into this function, but is often denied because 
+	// a) missiles are in flight, but the LTD is on
+	// or
+	// b) player is totally out of ammo and has nothing to switch to, and should be allowed to
+	//    shine the designator around
+	//
+	// Set the next attack time into the future so that WeaponIdle will get called more often
+	// than reload, allowing the RPG LTD to be updated
+	
+	m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.5;
+
+	if ( m_cActiveRockets && m_fSpotActive )
+	{
+		// no reloading when there are active missiles tracking the designator.
+		// ward off future autoreload attempts by setting next attack time into the future for a bit. 
+		return;
+	}
+
+#ifndef CLIENT_DLL
+	if ( m_pSpot && m_fSpotActive )
+	{
+		m_pSpot->Suspend( 2.1 );
+		m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 2.1;
+	}
+#endif
+
+	if ( m_iClip == 0 )
+		iResult = DefaultReload( RPG_MAX_CLIP, RPG_RELOAD, 2 );
+	
+	if ( iResult )
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
+	
+}
+
+void CRpg::Spawn( )
+{
+	Precache( );
+	m_iId = WEAPON_RPG;
+
+	SET_MODEL(ENT(pev), "models/w_rpg.mdl");
+	m_fSpotActive = 1;
+
+#ifdef CLIENT_DLL
+	if ( bIsMultiplayer() )
+#else
+	if ( g_pGameRules->IsMultiplayer() )
+#endif
+	{
+		// more default ammo in multiplay. 
+		m_iDefaultAmmo = RPG_DEFAULT_GIVE * 2;
+	}
+	else
+	{
+		m_iDefaultAmmo = RPG_DEFAULT_GIVE;
+	}
+
+	FallInit();// get ready to fall down.
+}
+
+
+void CRpg::Precache( void )
+{
+	PRECACHE_MODEL("models/w_rpg.mdl");
+	PRECACHE_MODEL("models/v_rpg.mdl");
+	PRECACHE_MODEL("models/p_rpg.mdl");
+
+	PRECACHE_SOUND("items/9mmclip1.wav");
+
+	UTIL_PrecacheOther( "laser_spot" );
+	UTIL_PrecacheOther( "rpg_rocket" );
+
+	PRECACHE_SOUND("weapons/rocketfire1.wav");
+	PRECACHE_SOUND("weapons/glauncher.wav"); // alternative fire sound
+
+	m_usRpg = PRECACHE_EVENT ( 1, "events/rpg.sc" );
+}
+
+
+int CRpg::GetItemInfo(ItemInfo *p)
+{
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = "rockets";
+	p->iMaxAmmo1 = ROCKET_MAX_CARRY;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = -1;
+	p->iMaxClip = RPG_MAX_CLIP;
+	p->iSlot = 3;
+	p->iPosition = 0;
+	p->iId = m_iId = WEAPON_RPG;
+	p->iFlags = 0;
+	p->iWeight = RPG_WEIGHT;
+
+	return 1;
+}
+
+int CRpg::AddToPlayer( CBasePlayer *pPlayer )
+{
+	if ( CBasePlayerWeapon::AddToPlayer( pPlayer ) )
+	{
+		MESSAGE_BEGIN( MSG_ONE, gmsgWeapPickup, NULL, pPlayer->pev );
+			WRITE_BYTE( m_iId );
+		MESSAGE_END();
+		return TRUE;
+	}
+	return FALSE;
+}
+
+BOOL CRpg::Deploy( )
+{
+	if ( m_iClip == 0 )
+	{
+		return DefaultDeploy( "models/v_rpg.mdl", "models/p_rpg.mdl", RPG_DRAW_UL, "rpg" );
+	}
+
+	return DefaultDeploy( "models/v_rpg.mdl", "models/p_rpg.mdl", RPG_DRAW1, "rpg" );
+}
+
+
+BOOL CRpg::CanHolster( void )
+{
+	if ( m_fSpotActive && m_cActiveRockets )
+	{
+		// can't put away while guiding a missile.
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+void CRpg::Holster( int skiplocal /* = 0 */ )
+{
+	m_fInReload = FALSE;// cancel any reload in progress.
+
+	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 0.5;
+	
+	SendWeaponAnim( RPG_HOLSTER1 );
+
+#ifndef CLIENT_DLL
+	if (m_pSpot)
+	{
+		m_pSpot->Killed( NULL, GIB_NEVER );
+		m_pSpot = NULL;
+	}
+#endif
+
+}
+
+
+
+void CRpg::PrimaryAttack()
+{
+	if ( m_iClip )
+	{
+		m_pPlayer->m_iWeaponVolume = LOUD_GUN_VOLUME;
+		m_pPlayer->m_iWeaponFlash = BRIGHT_GUN_FLASH;
+
+#ifndef CLIENT_DLL
+		// player "shoot" animation
+		m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
+
+		UTIL_MakeVectors( m_pPlayer->pev->v_angle );
+		Vector vecSrc = m_pPlayer->GetGunPosition( ) + gpGlobals->v_forward * 16 + gpGlobals->v_right * 8 + gpGlobals->v_up * -8;
+		
+		CRpgRocket *pRocket = CRpgRocket::CreateRpgRocket( vecSrc, m_pPlayer->pev->v_angle, m_pPlayer, this );
+
+		UTIL_MakeVectors( m_pPlayer->pev->v_angle );// RpgRocket::Create stomps on globals, so remake.
+		pRocket->pev->velocity = pRocket->pev->velocity + gpGlobals->v_forward * DotProduct( m_pPlayer->pev->velocity, gpGlobals->v_forward );
+#endif
+
+		// firing RPG no longer turns on the designator. ALT fire is a toggle switch for the LTD.
+		// Ken signed up for this as a global change (sjb)
+
+		int flags;
+#if defined( CLIENT_WEAPONS )
+	flags = FEV_NOTHOST;
+#else
+	flags = 0;
+#endif
+
+		PLAYBACK_EVENT( flags, m_pPlayer->edict(), m_usRpg );
+
+		m_iClip--; 
+				
+		m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 1.5;
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 1.5;
+	}
+	else
+	{
+		PlayEmptySound( );
+	}
+	UpdateSpot( );
+}
+
+
+void CRpg::SecondaryAttack()
+{
+	m_fSpotActive = ! m_fSpotActive;
+
+#ifndef CLIENT_DLL
+	if (!m_fSpotActive && m_pSpot)
+	{
+		m_pSpot->Killed( NULL, GIB_NORMAL );
+		m_pSpot = NULL;
+	}
+#endif
+
+	m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 0.2;
+}
+
+
+void CRpg::WeaponIdle( void )
+{
+	UpdateSpot( );
+
+	ResetEmptySound( );
+
+	if ( m_flTimeWeaponIdle > UTIL_WeaponTimeBase() )
+		return;
+
+	if ( m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType])
+	{
+		int iAnim;
+		float flRand = UTIL_SharedRandomFloat( m_pPlayer->random_seed, 0, 1 );
+		if (flRand <= 0.75 || m_fSpotActive)
+		{
+			if ( m_iClip == 0 )
+				iAnim = RPG_IDLE_UL;
+			else
+				iAnim = RPG_IDLE;
+
+			m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 90.0 / 15.0;
+		}
+		else
+		{
+			if ( m_iClip == 0 )
+				iAnim = RPG_FIDGET_UL;
+			else
+				iAnim = RPG_FIDGET;
+
+			m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 3.0;
+		}
+
+		SendWeaponAnim( iAnim );
+	}
+	else
+	{
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 1;
+	}
+}
+
+
+
+void CRpg::UpdateSpot( void )
+{
+
+#ifndef CLIENT_DLL
+	if (m_fSpotActive)
+	{
+		if (!m_pSpot)
+		{
+			m_pSpot = CLaserSpot::CreateSpot();
+		}
+
+		UTIL_MakeVectors( m_pPlayer->pev->v_angle );
+		Vector vecSrc = m_pPlayer->GetGunPosition( );;
+		Vector vecAiming = gpGlobals->v_forward;
+
+		TraceResult tr;
+		UTIL_TraceLine ( vecSrc, vecSrc + vecAiming * 8192, dont_ignore_monsters, ENT(m_pPlayer->pev), &tr );
+		
+		UTIL_SetOrigin( m_pSpot->pev, tr.vecEndPos );
+	}
+#endif
+
+}
+
+
+class CRpgAmmo : public CBasePlayerAmmo
+{
+	void Spawn( void )
+	{ 
+		Precache( );
+		SET_MODEL(ENT(pev), "models/w_rpgammo.mdl");
+		CBasePlayerAmmo::Spawn( );
+	}
+	void Precache( void )
+	{
+		PRECACHE_MODEL ("models/w_rpgammo.mdl");
+		PRECACHE_SOUND("items/9mmclip1.wav");
+	}
+	BOOL AddAmmo( CBaseEntity *pOther ) 
+	{ 
+		int iGive;
+
+#ifdef CLIENT_DLL
+	if ( bIsMultiplayer() )
+#else
+	if ( g_pGameRules->IsMultiplayer() )
+#endif
+		{
+			// hand out more ammo per rocket in multiplayer.
+			iGive = AMMO_RPGCLIP_GIVE * 2;
+		}
+		else
+		{
+			iGive = AMMO_RPGCLIP_GIVE;
+		}
+
+		if (pOther->GiveAmmo( iGive, "rockets", ROCKET_MAX_CARRY ) != -1)
+		{
+			EMIT_SOUND(ENT(pev), CHAN_ITEM, "items/9mmclip1.wav", 1, ATTN_NORM);
+			return TRUE;
+		}
+		return FALSE;
+	}
+};
+LINK_ENTITY_TO_CLASS( ammo_rpgclip, CRpgAmmo );
+
+#endif
diff --git a/main/source/dlls/satchel.cpp b/main/source/dlls/satchel.cpp
new file mode 100644
index 00000000..ea2025b0
--- /dev/null
+++ b/main/source/dlls/satchel.cpp
@@ -0,0 +1,494 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD )
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "player.h"
+#include "gamerules.h"
+
+enum satchel_e {
+	SATCHEL_IDLE1 = 0,
+	SATCHEL_FIDGET1,
+	SATCHEL_DRAW,
+	SATCHEL_DROP
+};
+
+enum satchel_radio_e {
+	SATCHEL_RADIO_IDLE1 = 0,
+	SATCHEL_RADIO_FIDGET1,
+	SATCHEL_RADIO_DRAW,
+	SATCHEL_RADIO_FIRE,
+	SATCHEL_RADIO_HOLSTER
+};
+
+
+
+class CSatchelCharge : public CGrenade
+{
+	void Spawn( void );
+	void Precache( void );
+	void BounceSound( void );
+
+	void EXPORT SatchelSlide( CBaseEntity *pOther );
+	void EXPORT SatchelThink( void );
+
+public:
+	void Deactivate( void );
+};
+LINK_ENTITY_TO_CLASS( monster_satchel, CSatchelCharge );
+
+//=========================================================
+// Deactivate - do whatever it is we do to an orphaned 
+// satchel when we don't want it in the world anymore.
+//=========================================================
+void CSatchelCharge::Deactivate( void )
+{
+	pev->solid = SOLID_NOT;
+	UTIL_Remove( this );
+}
+
+
+void CSatchelCharge :: Spawn( void )
+{
+	Precache( );
+	// motor
+	pev->movetype = MOVETYPE_BOUNCE;
+	pev->solid = SOLID_BBOX;
+
+	SET_MODEL(ENT(pev), "models/w_satchel.mdl");
+	//UTIL_SetSize(pev, Vector( -16, -16, -4), Vector(16, 16, 32));	// Old box -- size of headcrab monsters/players get blocked by this
+	UTIL_SetSize(pev, Vector( -4, -4, -4), Vector(4, 4, 4));	// Uses point-sized, and can be stepped over
+	UTIL_SetOrigin( pev, pev->origin );
+
+	SetTouch( &CSatchelCharge::SatchelSlide );
+	SetUse( &CSatchelCharge::DetonateUse );
+	SetThink( &CSatchelCharge::SatchelThink );
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	pev->gravity = 0.5;
+	pev->friction = 0.8;
+
+	pev->dmg = gSkillData.plrDmgSatchel;
+	// ResetSequenceInfo( );
+	pev->sequence = 1;
+}
+
+
+void CSatchelCharge::SatchelSlide( CBaseEntity *pOther )
+{
+	entvars_t	*pevOther = pOther->pev;
+
+	// don't hit the guy that launched this grenade
+	if ( pOther->edict() == pev->owner )
+		return;
+
+	// pev->avelocity = Vector (300, 300, 300);
+	pev->gravity = 1;// normal gravity now
+
+	// HACKHACK - On ground isn't always set, so look for ground underneath
+	TraceResult tr;
+	UTIL_TraceLine( pev->origin, pev->origin - Vector(0,0,10), ignore_monsters, edict(), &tr );
+
+	if ( tr.flFraction < 1.0 )
+	{
+		// add a bit of static friction
+		pev->velocity = pev->velocity * 0.95;
+		pev->avelocity = pev->avelocity * 0.9;
+		// play sliding sound, volume based on velocity
+	}
+	if ( !(pev->flags & FL_ONGROUND) && pev->velocity.Length2D() > 10 )
+	{
+		BounceSound();
+	}
+	StudioFrameAdvance( );
+}
+
+
+void CSatchelCharge :: SatchelThink( void )
+{
+	StudioFrameAdvance( );
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	if (!IsInWorld())
+	{
+		UTIL_Remove( this );
+		return;
+	}
+
+	if (pev->waterlevel == 3)
+	{
+		pev->movetype = MOVETYPE_FLY;
+		pev->velocity = pev->velocity * 0.8;
+		pev->avelocity = pev->avelocity * 0.9;
+		pev->velocity.z += 8;
+	}
+	else if (pev->waterlevel == 0)
+	{
+		pev->movetype = MOVETYPE_BOUNCE;
+	}
+	else
+	{
+		pev->velocity.z -= 8;
+	}	
+}
+
+void CSatchelCharge :: Precache( void )
+{
+	PRECACHE_MODEL("models/grenade.mdl");
+	PRECACHE_SOUND("weapons/g_bounce1.wav");
+	PRECACHE_SOUND("weapons/g_bounce2.wav");
+	PRECACHE_SOUND("weapons/g_bounce3.wav");
+}
+
+void CSatchelCharge :: BounceSound( void )
+{
+	switch ( RANDOM_LONG( 0, 2 ) )
+	{
+	case 0:	EMIT_SOUND(ENT(pev), CHAN_VOICE, "weapons/g_bounce1.wav", 1, ATTN_NORM);	break;
+	case 1:	EMIT_SOUND(ENT(pev), CHAN_VOICE, "weapons/g_bounce2.wav", 1, ATTN_NORM);	break;
+	case 2:	EMIT_SOUND(ENT(pev), CHAN_VOICE, "weapons/g_bounce3.wav", 1, ATTN_NORM);	break;
+	}
+}
+
+
+LINK_ENTITY_TO_CLASS( weapon_satchel, CSatchel );
+
+
+//=========================================================
+// CALLED THROUGH the newly-touched weapon's instance. The existing player weapon is pOriginal
+//=========================================================
+int CSatchel::AddDuplicate( CBasePlayerItem *pOriginal )
+{
+	CSatchel *pSatchel;
+
+#ifdef CLIENT_DLL
+	if ( bIsMultiplayer() )
+#else
+	if ( g_pGameRules->IsMultiplayer() )
+#endif
+	{
+		pSatchel = (CSatchel *)pOriginal;
+
+		if ( pSatchel->m_chargeReady != 0 )
+		{
+			// player has some satchels deployed. Refuse to add more.
+			return FALSE;
+		}
+	}
+
+	return CBasePlayerWeapon::AddDuplicate ( pOriginal );
+}
+
+//=========================================================
+//=========================================================
+int CSatchel::AddToPlayer( CBasePlayer *pPlayer )
+{
+	int bResult = CBasePlayerItem::AddToPlayer( pPlayer );
+
+	pPlayer->pev->weapons |= (1<<m_iId);
+	m_chargeReady = 0;// this satchel charge weapon now forgets that any satchels are deployed by it.
+
+	if ( bResult )
+	{
+		return AddWeapon( );
+	}
+	return FALSE;
+}
+
+void CSatchel::Spawn( )
+{
+	Precache( );
+	m_iId = WEAPON_SATCHEL;
+	SET_MODEL(ENT(pev), "models/w_satchel.mdl");
+
+	m_iDefaultAmmo = SATCHEL_DEFAULT_GIVE;
+		
+	FallInit();// get ready to fall down.
+}
+
+
+void CSatchel::Precache( void )
+{
+	PRECACHE_MODEL("models/v_satchel.mdl");
+	PRECACHE_MODEL("models/v_satchel_radio.mdl");
+	PRECACHE_MODEL("models/w_satchel.mdl");
+	PRECACHE_MODEL("models/p_satchel.mdl");
+	PRECACHE_MODEL("models/p_satchel_radio.mdl");
+
+	UTIL_PrecacheOther( "monster_satchel" );
+}
+
+
+int CSatchel::GetItemInfo(ItemInfo *p)
+{
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = "Satchel Charge";
+	p->iMaxAmmo1 = SATCHEL_MAX_CARRY;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = -1;
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iSlot = 4;
+	p->iPosition = 1;
+	p->iFlags = ITEM_FLAG_SELECTONEMPTY | ITEM_FLAG_LIMITINWORLD | ITEM_FLAG_EXHAUSTIBLE;
+	p->iId = m_iId = WEAPON_SATCHEL;
+	p->iWeight = SATCHEL_WEIGHT;
+
+	return 1;
+}
+
+//=========================================================
+//=========================================================
+BOOL CSatchel::IsUseable( void )
+{
+	if ( m_pPlayer->m_rgAmmo[ PrimaryAmmoIndex() ] > 0 ) 
+	{
+		// player is carrying some satchels
+		return TRUE;
+	}
+
+	if ( m_chargeReady != 0 )
+	{
+		// player isn't carrying any satchels, but has some out
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+BOOL CSatchel::CanDeploy( void )
+{
+	if ( m_pPlayer->m_rgAmmo[ PrimaryAmmoIndex() ] > 0 ) 
+	{
+		// player is carrying some satchels
+		return TRUE;
+	}
+
+	if ( m_chargeReady != 0 )
+	{
+		// player isn't carrying any satchels, but has some out
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+BOOL CSatchel::Deploy( )
+{
+
+	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 1.0;
+	m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
+
+	if ( m_chargeReady )
+		return DefaultDeploy( "models/v_satchel_radio.mdl", "models/p_satchel_radio.mdl", SATCHEL_RADIO_DRAW, "hive" );
+	else
+		return DefaultDeploy( "models/v_satchel.mdl", "models/p_satchel.mdl", SATCHEL_DRAW, "trip" );
+
+	
+	return TRUE;
+}
+
+
+void CSatchel::Holster( int skiplocal /* = 0 */ )
+{
+	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 0.5;
+	
+	if ( m_chargeReady )
+	{
+		SendWeaponAnim( SATCHEL_RADIO_HOLSTER );
+	}
+	else
+	{
+		SendWeaponAnim( SATCHEL_DROP );
+	}
+	EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "common/null.wav", 1.0, ATTN_NORM);
+
+	if ( !m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] && !m_chargeReady )
+	{
+		m_pPlayer->pev->weapons &= ~(1<<WEAPON_SATCHEL);
+		SetThink( &CSatchel::DestroyItem );
+		pev->nextthink = gpGlobals->time + 0.1;
+	}
+}
+
+
+
+void CSatchel::PrimaryAttack()
+{
+	switch (m_chargeReady)
+	{
+	case 0:
+		{
+		Throw( );
+		}
+		break;
+	case 1:
+		{
+		SendWeaponAnim( SATCHEL_RADIO_FIRE );
+
+		edict_t *pPlayer = m_pPlayer->edict( );
+
+		CBaseEntity *pSatchel = NULL;
+
+		while ((pSatchel = UTIL_FindEntityInSphere( pSatchel, m_pPlayer->pev->origin, 4096 )) != NULL)
+		{
+			if (FClassnameIs( pSatchel->pev, "monster_satchel"))
+			{
+				if (pSatchel->pev->owner == pPlayer)
+				{
+					pSatchel->Use( m_pPlayer, m_pPlayer, USE_ON, 0 );
+					m_chargeReady = 2;
+				}
+			}
+		}
+
+		m_chargeReady = 2;
+		m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.5;
+		m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 0.5;
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 0.5;
+		break;
+		}
+
+	case 2:
+		// we're reloading, don't allow fire
+		{
+		}
+		break;
+	}
+}
+
+
+void CSatchel::SecondaryAttack( void )
+{
+	if ( m_chargeReady != 2 )
+	{
+		Throw( );
+	}
+}
+
+
+void CSatchel::Throw( void )
+{
+	if ( m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] )
+	{
+		Vector vecSrc = m_pPlayer->pev->origin;
+
+		Vector vecThrow = gpGlobals->v_forward * 274 + m_pPlayer->pev->velocity;
+
+#ifndef CLIENT_DLL
+		CBaseEntity *pSatchel = Create( "monster_satchel", vecSrc, Vector( 0, 0, 0), m_pPlayer->edict() );
+		pSatchel->pev->velocity = vecThrow;
+		pSatchel->pev->avelocity.y = 400;
+
+		m_pPlayer->pev->viewmodel = MAKE_STRING("models/v_satchel_radio.mdl");
+		m_pPlayer->pev->weaponmodel = MAKE_STRING("models/p_satchel_radio.mdl");
+#else
+		LoadVModel ( "models/v_satchel_radio.mdl", m_pPlayer );
+#endif
+
+		SendWeaponAnim( SATCHEL_RADIO_DRAW );
+
+		// player "shoot" animation
+		m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
+
+		m_chargeReady = 1;
+		
+		m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType]--;
+
+		m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 1.0;
+		m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 0.5;
+	}
+}
+
+
+void CSatchel::WeaponIdle( void )
+{
+	if ( m_flTimeWeaponIdle > UTIL_WeaponTimeBase() )
+		return;
+
+	switch( m_chargeReady )
+	{
+	case 0:
+		SendWeaponAnim( SATCHEL_FIDGET1 );
+		// use tripmine animations
+		strcpy( m_pPlayer->m_szAnimExtention, "trip" );
+		break;
+	case 1:
+		SendWeaponAnim( SATCHEL_RADIO_FIDGET1 );
+		// use hivehand animations
+		strcpy( m_pPlayer->m_szAnimExtention, "hive" );
+		break;
+	case 2:
+		if ( !m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] )
+		{
+			m_chargeReady = 0;
+			RetireWeapon();
+			return;
+		}
+
+#ifndef CLIENT_DLL
+		m_pPlayer->pev->viewmodel = MAKE_STRING("models/v_satchel.mdl");
+		m_pPlayer->pev->weaponmodel = MAKE_STRING("models/p_satchel.mdl");
+#else
+		LoadVModel ( "models/v_satchel.mdl", m_pPlayer );
+#endif
+
+		SendWeaponAnim( SATCHEL_DRAW );
+
+		// use tripmine animations
+		strcpy( m_pPlayer->m_szAnimExtention, "trip" );
+
+		m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.5;
+		m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 0.5;
+		m_chargeReady = 0;
+		break;
+	}
+	m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );// how long till we do this again.
+}
+
+//=========================================================
+// DeactivateSatchels - removes all satchels owned by
+// the provided player. Should only be used upon death.
+//
+// Made this global on purpose.
+//=========================================================
+void DeactivateSatchels( CBasePlayer *pOwner )
+{
+	edict_t *pFind; 
+
+	pFind = FIND_ENTITY_BY_CLASSNAME( NULL, "monster_satchel" );
+
+	while ( !FNullEnt( pFind ) )
+	{
+		CBaseEntity *pEnt = CBaseEntity::Instance( pFind );
+		CSatchelCharge *pSatchel = (CSatchelCharge *)pEnt;
+
+		if ( pSatchel )
+		{
+			if ( pSatchel->pev->owner == pOwner->edict() )
+			{
+				pSatchel->Deactivate();
+			}
+		}
+
+		pFind = FIND_ENTITY_BY_CLASSNAME( pFind, "monster_satchel" );
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/saverestore.h b/main/source/dlls/saverestore.h
new file mode 100644
index 00000000..c07a66c1
--- /dev/null
+++ b/main/source/dlls/saverestore.h
@@ -0,0 +1,171 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+// Implementation in UTIL.CPP
+#ifndef SAVERESTORE_H
+#define SAVERESTORE_H
+
+class CBaseEntity;
+
+class CSaveRestoreBuffer
+{
+public:
+	CSaveRestoreBuffer( void );
+	CSaveRestoreBuffer( SAVERESTOREDATA *pdata );
+	~CSaveRestoreBuffer( void );
+
+	int			EntityIndex( entvars_t *pevLookup );
+	int			EntityIndex( edict_t *pentLookup );
+	int			EntityIndex( EOFFSET eoLookup );
+	int			EntityIndex( CBaseEntity *pEntity );
+
+	int			EntityFlags( int entityIndex, int flags ) { return EntityFlagsSet( entityIndex, 0 ); }
+	int			EntityFlagsSet( int entityIndex, int flags );
+
+	edict_t		*EntityFromIndex( int entityIndex );
+
+	unsigned short	TokenHash( const char *pszToken );
+
+protected:
+	SAVERESTOREDATA		*m_pdata;
+	void		BufferRewind( int size );
+	unsigned int	HashString( const char *pszToken );
+};
+
+
+class CSave : public CSaveRestoreBuffer
+{
+public:
+	CSave( SAVERESTOREDATA *pdata ) : CSaveRestoreBuffer( pdata ) {};
+
+	void	WriteShort( const char *pname, const short *value, int count );
+	void	WriteInt( const char *pname, const int *value, int count );		// Save an int
+	void	WriteFloat( const char *pname, const float *value, int count );	// Save a float
+	void	WriteTime( const char *pname, const float *value, int count );	// Save a float (timevalue)
+	void	WriteData( const char *pname, int size, const char *pdata );		// Save a binary data block
+	void	WriteString( const char *pname, const char *pstring );			// Save a null-terminated string
+	void	WriteString( const char *pname, const int *stringId, int count );	// Save a null-terminated string (engine string)
+	void	WriteVector( const char *pname, const Vector &value );				// Save a vector
+	void	WriteVector( const char *pname, const float *value, int count );	// Save a vector
+	void	WritePositionVector( const char *pname, const Vector &value );		// Offset for landmark if necessary
+	void	WritePositionVector( const char *pname, const float *value, int count );	// array of pos vectors
+	void	WriteFunction( const char *pname, const int *value, int count );		// Save a function pointer
+	int		WriteEntVars( const char *pname, entvars_t *pev );		// Save entvars_t (entvars_t)
+	int		WriteFields( const char *pname, void *pBaseData, TYPEDESCRIPTION *pFields, int fieldCount );
+
+private:
+	int		DataEmpty( const char *pdata, int size );
+	void	BufferField( const char *pname, int size, const char *pdata );
+	void	BufferString( char *pdata, int len );
+	void	BufferData( const char *pdata, int size );
+	void	BufferHeader( const char *pname, int size );
+};
+
+typedef struct 
+{
+	unsigned short		size;
+	unsigned short		token;
+	char				*pData;
+} HEADER;
+
+class CRestore : public CSaveRestoreBuffer
+{
+public:
+	CRestore( SAVERESTOREDATA *pdata ) : CSaveRestoreBuffer( pdata ) { m_global = 0; m_precache = TRUE; }
+	int		ReadEntVars( const char *pname, entvars_t *pev );		// entvars_t
+	int		ReadFields( const char *pname, void *pBaseData, TYPEDESCRIPTION *pFields, int fieldCount );
+	int		ReadField( void *pBaseData, TYPEDESCRIPTION *pFields, int fieldCount, int startField, int size, char *pName, void *pData );
+	int		ReadInt( void );
+	short	ReadShort( void );
+	int		ReadNamedInt( const char *pName );
+	char	*ReadNamedString( const char *pName );
+	int		Empty( void ) { return (m_pdata == NULL) || ((m_pdata->pCurrentData-m_pdata->pBaseData)>=m_pdata->bufferSize); }
+	inline	void SetGlobalMode( int global ) { m_global = global; }
+	void	PrecacheMode( BOOL mode ) { m_precache = mode; }
+
+private:
+	char	*BufferPointer( void );
+	void	BufferReadBytes( char *pOutput, int size );
+	void	BufferSkipBytes( int bytes );
+	int		BufferSkipZString( void );
+	int		BufferCheckZString( const char *string );
+
+	void	BufferReadHeader( HEADER *pheader );
+
+	int		m_global;		// Restoring a global entity?
+	BOOL	m_precache;
+};
+
+#define MAX_ENTITYARRAY 64
+
+//#define ARRAYSIZE(p)		(sizeof(p)/sizeof(p[0]))
+
+#define IMPLEMENT_SAVERESTORE(derivedClass,baseClass) \
+	int derivedClass::Save( CSave &save )\
+	{\
+		if ( !baseClass::Save(save) )\
+			return 0;\
+		return save.WriteFields( #derivedClass, this, m_SaveData, ARRAYSIZE(m_SaveData) );\
+	}\
+	int derivedClass::Restore( CRestore &restore )\
+	{\
+		if ( !baseClass::Restore(restore) )\
+			return 0;\
+		return restore.ReadFields( #derivedClass, this, m_SaveData, ARRAYSIZE(m_SaveData) );\
+	}
+
+
+typedef enum { GLOBAL_OFF = 0, GLOBAL_ON = 1, GLOBAL_DEAD = 2 } GLOBALESTATE;
+
+typedef struct globalentity_s globalentity_t;
+
+struct globalentity_s
+{
+	char			name[64];
+	char			levelName[32];
+	GLOBALESTATE	state;
+	globalentity_t	*pNext;
+};
+
+class CGlobalState
+{
+public:
+					CGlobalState();
+	void			Reset( void );
+	void			ClearStates( void );
+	void			EntityAdd( string_t globalname, string_t mapName, GLOBALESTATE state );
+	void			EntitySetState( string_t globalname, GLOBALESTATE state );
+	void			EntityUpdate( string_t globalname, string_t mapname );
+	const globalentity_t	*EntityFromTable( string_t globalname );
+	GLOBALESTATE	EntityGetState( string_t globalname );
+	int				EntityInTable( string_t globalname ) { return (Find( globalname ) != NULL) ? 1 : 0; }
+	int				Save( CSave &save );
+	int				Restore( CRestore &restore );
+	static TYPEDESCRIPTION m_SaveData[];
+
+	const char*		GetLevelName();
+
+//#ifdef _DEBUG
+	void			DumpGlobals( void );
+//#endif
+
+private:
+	globalentity_t	*Find( string_t globalname );
+	globalentity_t	*m_pList;
+	int				m_listCount;
+};
+
+extern CGlobalState gGlobalState;
+
+#endif		//SAVERESTORE_H
diff --git a/main/source/dlls/schedule.cpp b/main/source/dlls/schedule.cpp
new file mode 100644
index 00000000..2b6058e4
--- /dev/null
+++ b/main/source/dlls/schedule.cpp
@@ -0,0 +1,1514 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// schedule.cpp - functions and data pertaining to the 
+// monsters' AI scheduling system.
+//=========================================================
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "animation.h"
+#include "scripted.h"
+#include "nodes.h"
+#include "defaultai.h"
+#include "soundent.h"
+
+extern CGraph WorldGraph;
+
+//=========================================================
+// FHaveSchedule - Returns TRUE if monster's m_pSchedule
+// is anything other than NULL.
+//=========================================================
+BOOL CBaseMonster :: FHaveSchedule( void )
+{
+	if ( m_pSchedule == NULL )
+	{
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+//=========================================================
+// ClearSchedule - blanks out the caller's schedule pointer
+// and index.
+//=========================================================
+void CBaseMonster :: ClearSchedule( void )
+{
+	m_iTaskStatus = TASKSTATUS_NEW;
+	m_pSchedule = NULL;
+	m_iScheduleIndex = 0;
+}
+
+//=========================================================
+// FScheduleDone - Returns TRUE if the caller is on the
+// last task in the schedule
+//=========================================================
+BOOL CBaseMonster :: FScheduleDone ( void )
+{
+	ASSERT( m_pSchedule != NULL );
+	
+	if ( m_iScheduleIndex == m_pSchedule->cTasks )
+	{
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+//=========================================================
+// ChangeSchedule - replaces the monster's schedule pointer
+// with the passed pointer, and sets the ScheduleIndex back
+// to 0
+//=========================================================
+void CBaseMonster :: ChangeSchedule ( Schedule_t *pNewSchedule )
+{
+	ASSERT( pNewSchedule != NULL );
+
+	m_pSchedule			= pNewSchedule;
+	m_iScheduleIndex	= 0;
+	m_iTaskStatus		= TASKSTATUS_NEW;
+	m_afConditions		= 0;// clear all of the conditions
+	m_failSchedule		= SCHED_NONE;
+
+	if ( m_pSchedule->iInterruptMask & bits_COND_HEAR_SOUND && !(m_pSchedule->iSoundMask) )
+	{
+		ALERT ( at_aiconsole, "COND_HEAR_SOUND with no sound mask!\n" );
+	}
+	else if ( m_pSchedule->iSoundMask && !(m_pSchedule->iInterruptMask & bits_COND_HEAR_SOUND) )
+	{
+		ALERT ( at_aiconsole, "Sound mask without COND_HEAR_SOUND!\n" );
+	}
+
+#if _DEBUG
+	if ( !ScheduleFromName( pNewSchedule->pName ) )
+	{
+		ALERT( at_console, "Schedule %s not in table!!!\n", pNewSchedule->pName );
+	}
+#endif
+	
+// this is very useful code if you can isolate a test case in a level with a single monster. It will notify
+// you of every schedule selection the monster makes.
+#if 0
+	if ( FClassnameIs( pev, "monster_human_grunt" ) )
+	{
+		Task_t *pTask = GetTask();
+		
+		if ( pTask )
+		{
+			const char *pName = NULL;
+
+			if ( m_pSchedule )
+			{
+				pName = m_pSchedule->pName;
+			}
+			else
+			{
+				pName = "No Schedule";
+			}
+			
+			if ( !pName )
+			{
+				pName = "Unknown";
+			}
+
+			ALERT( at_aiconsole, "%s: picked schedule %s\n", STRING( pev->classname ), pName );
+		}
+	}
+#endif// 0
+
+}
+
+//=========================================================
+// NextScheduledTask - increments the ScheduleIndex
+//=========================================================
+void CBaseMonster :: NextScheduledTask ( void )
+{
+	ASSERT( m_pSchedule != NULL );
+
+	m_iTaskStatus = TASKSTATUS_NEW;
+	m_iScheduleIndex++;
+
+	if ( FScheduleDone() )
+	{
+		// just completed last task in schedule, so make it invalid by clearing it.
+		SetConditions( bits_COND_SCHEDULE_DONE );
+		//ClearSchedule();	
+	}
+}
+
+//=========================================================
+// IScheduleFlags - returns an integer with all Conditions
+// bits that are currently set and also set in the current
+// schedule's Interrupt mask.
+//=========================================================
+int CBaseMonster :: IScheduleFlags ( void )
+{
+	if( !m_pSchedule )
+	{
+		return 0;
+	}
+	
+	// strip off all bits excepts the ones capable of breaking this schedule.
+	return m_afConditions & m_pSchedule->iInterruptMask;
+}
+
+//=========================================================
+// FScheduleValid - returns TRUE as long as the current
+// schedule is still the proper schedule to be executing,
+// taking into account all conditions
+//=========================================================
+BOOL CBaseMonster :: FScheduleValid ( void )
+{
+	if ( m_pSchedule == NULL )
+	{
+		// schedule is empty, and therefore not valid.
+		return FALSE;
+	}
+
+	if ( HasConditions( m_pSchedule->iInterruptMask | bits_COND_SCHEDULE_DONE | bits_COND_TASK_FAILED ) )
+	{
+#ifdef DEBUG
+		if ( HasConditions ( bits_COND_TASK_FAILED ) && m_failSchedule == SCHED_NONE )
+		{
+			// fail! Send a visual indicator.
+			ALERT ( at_aiconsole, "Schedule: %s Failed\n", m_pSchedule->pName );
+
+			Vector tmp = pev->origin;
+			tmp.z = pev->absmax.z + 16;
+			UTIL_Sparks( tmp );
+		}
+#endif // DEBUG
+
+		// some condition has interrupted the schedule, or the schedule is done
+		return FALSE;
+	}
+	
+	return TRUE;
+}
+
+//=========================================================
+// MaintainSchedule - does all the per-think schedule maintenance.
+// ensures that the monster leaves this function with a valid
+// schedule!
+//=========================================================
+void CBaseMonster :: MaintainSchedule ( void )
+{
+	Schedule_t	*pNewSchedule;
+	int			i;
+
+	// UNDONE: Tune/fix this 10... This is just here so infinite loops are impossible
+	for ( i = 0; i < 10; i++ )
+	{
+		if ( m_pSchedule != NULL && TaskIsComplete() )
+		{
+			NextScheduledTask();                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
+		}
+
+	// validate existing schedule 
+		if ( !FScheduleValid() || m_MonsterState != m_IdealMonsterState )
+		{
+			// if we come into this block of code, the schedule is going to have to be changed.
+			// if the previous schedule was interrupted by a condition, GetIdealState will be 
+			// called. Else, a schedule finished normally.
+
+			// Notify the monster that his schedule is changing
+			ScheduleChange();
+
+			// Call GetIdealState if we're not dead and one or more of the following...
+			// - in COMBAT state with no enemy (it died?)
+			// - conditions bits (excluding SCHEDULE_DONE) indicate interruption,
+			// - schedule is done but schedule indicates it wants GetIdealState called
+			//   after successful completion (by setting bits_COND_SCHEDULE_DONE in iInterruptMask)
+			// DEAD & SCRIPT are not suggestions, they are commands!
+			if ( m_IdealMonsterState != MONSTERSTATE_DEAD && 
+				 (m_IdealMonsterState != MONSTERSTATE_SCRIPT || m_IdealMonsterState == m_MonsterState) )
+			{
+				if (	(m_afConditions && !HasConditions(bits_COND_SCHEDULE_DONE)) ||
+						(m_pSchedule && (m_pSchedule->iInterruptMask & bits_COND_SCHEDULE_DONE)) ||
+						((m_MonsterState == MONSTERSTATE_COMBAT) && (m_hEnemy == NULL))	)
+				{
+					GetIdealState();
+				}
+			}
+			if ( HasConditions( bits_COND_TASK_FAILED ) && m_MonsterState == m_IdealMonsterState )
+			{
+				if ( m_failSchedule != SCHED_NONE )
+					pNewSchedule = GetScheduleOfType( m_failSchedule );
+				else
+					pNewSchedule = GetScheduleOfType( SCHED_FAIL );
+				// schedule was invalid because the current task failed to start or complete
+				ALERT ( at_aiconsole, "Schedule Failed at %d!\n", m_iScheduleIndex );
+				ChangeSchedule( pNewSchedule );
+			}
+			else
+			{
+				SetState( m_IdealMonsterState );
+				if ( m_MonsterState == MONSTERSTATE_SCRIPT || m_MonsterState == MONSTERSTATE_DEAD )
+					pNewSchedule = CBaseMonster::GetSchedule();
+				else
+					pNewSchedule = GetSchedule();
+				ChangeSchedule( pNewSchedule );
+			}
+		}
+
+		if ( m_iTaskStatus == TASKSTATUS_NEW )
+		{	
+			Task_t *pTask = GetTask();
+			ASSERT( pTask != NULL );
+			TaskBegin();
+			StartTask( pTask );
+		}
+
+		// UNDONE: Twice?!!!
+		if ( m_Activity != m_IdealActivity )
+		{
+			SetActivity ( m_IdealActivity );
+		}
+		
+		if ( !TaskIsComplete() && m_iTaskStatus != TASKSTATUS_NEW )
+			break;
+	}
+
+	if ( TaskIsRunning() )
+	{
+		Task_t *pTask = GetTask();
+		ASSERT( pTask != NULL );
+		RunTask( pTask );
+	}
+
+	// UNDONE: We have to do this so that we have an animation set to blend to if RunTask changes the animation
+	// RunTask() will always change animations at the end of a script!
+	// Don't do this twice
+	if ( m_Activity != m_IdealActivity )
+	{
+		SetActivity ( m_IdealActivity );
+	}
+}
+
+//=========================================================
+// RunTask 
+//=========================================================
+void CBaseMonster :: RunTask ( Task_t *pTask )
+{
+	switch ( pTask->iTask )
+	{
+	case TASK_TURN_RIGHT:
+	case TASK_TURN_LEFT:
+		{
+			ChangeYaw( pev->yaw_speed );
+
+			if ( FacingIdeal() )
+			{
+				TaskComplete();
+			}
+			break;
+		}
+
+	case TASK_PLAY_SEQUENCE_FACE_ENEMY:
+	case TASK_PLAY_SEQUENCE_FACE_TARGET:
+		{
+			CBaseEntity *pTarget;
+
+			if ( pTask->iTask == TASK_PLAY_SEQUENCE_FACE_TARGET )
+				pTarget = m_hTargetEnt;
+			else
+				pTarget = m_hEnemy;
+			if ( pTarget )
+			{
+				pev->ideal_yaw = UTIL_VecToYaw( pTarget->pev->origin - pev->origin );
+				ChangeYaw( pev->yaw_speed );
+			}
+			if ( m_fSequenceFinished )
+				TaskComplete();
+		}
+		break;
+
+	case TASK_PLAY_SEQUENCE:
+	case TASK_PLAY_ACTIVE_IDLE:
+		{
+			if ( m_fSequenceFinished )
+			{
+				TaskComplete();
+			}
+			break;
+		}
+
+
+	case TASK_FACE_ENEMY:
+		{
+			MakeIdealYaw( m_vecEnemyLKP );
+
+			ChangeYaw( pev->yaw_speed );
+
+			if ( FacingIdeal() )
+			{
+				TaskComplete();
+			}
+			break;
+		}
+	case TASK_FACE_HINTNODE:
+	case TASK_FACE_LASTPOSITION:
+	case TASK_FACE_TARGET:
+	case TASK_FACE_IDEAL:
+	case TASK_FACE_ROUTE:
+		{
+			ChangeYaw( pev->yaw_speed );
+
+			if ( FacingIdeal() )
+			{
+				TaskComplete();
+			}
+			break;
+		}
+	case TASK_WAIT_PVS:
+		{
+			if ( !FNullEnt(FIND_CLIENT_IN_PVS(edict())) )
+			{
+				TaskComplete();
+			}
+			break;
+		}
+	case TASK_WAIT_INDEFINITE:
+		{
+			// don't do anything.
+			break;
+		}
+	case TASK_WAIT:
+	case TASK_WAIT_RANDOM:
+		{
+			if ( gpGlobals->time >= m_flWaitFinished )
+			{
+				TaskComplete();
+			}
+			break;
+		}
+	case TASK_WAIT_FACE_ENEMY:
+		{
+			MakeIdealYaw ( m_vecEnemyLKP );
+			ChangeYaw( pev->yaw_speed ); 
+
+			if ( gpGlobals->time >= m_flWaitFinished )
+			{
+				TaskComplete();
+			}
+			break;
+		}
+	case TASK_MOVE_TO_TARGET_RANGE:
+		{
+			float distance;
+
+			if ( m_hTargetEnt == NULL )
+				TaskFail();
+			else
+			{
+				distance = ( m_vecMoveGoal - pev->origin ).Length2D();
+				// Re-evaluate when you think your finished, or the target has moved too far
+				if ( (distance < pTask->flData) || (m_vecMoveGoal - m_hTargetEnt->pev->origin).Length() > pTask->flData * 0.5 )
+				{
+					m_vecMoveGoal = m_hTargetEnt->pev->origin;
+					distance = ( m_vecMoveGoal - pev->origin ).Length2D();
+					FRefreshRoute();
+				}
+
+				// Set the appropriate activity based on an overlapping range
+				// overlap the range to prevent oscillation
+				if ( distance < pTask->flData )
+				{
+					TaskComplete();
+					RouteClear();		// Stop moving
+				}
+				else if ( distance < 190 && m_movementActivity != ACT_WALK )
+					m_movementActivity = ACT_WALK;
+				else if ( distance >= 270 && m_movementActivity != ACT_RUN )
+					m_movementActivity = ACT_RUN;
+			}
+
+			break;
+		}
+	case TASK_WAIT_FOR_MOVEMENT:
+		{
+			if (MovementIsComplete())
+			{
+				TaskComplete();
+				RouteClear();		// Stop moving
+			}
+			break;
+		}
+	case TASK_DIE:
+		{
+			if ( m_fSequenceFinished && pev->frame >= 255 )
+			{
+				pev->deadflag = DEAD_DEAD;
+				
+				SetThink ( NULL );
+				StopAnimation();
+
+				if ( !BBoxFlat() )
+				{
+					// a bit of a hack. If a corpses' bbox is positioned such that being left solid so that it can be attacked will
+					// block the player on a slope or stairs, the corpse is made nonsolid. 
+//					pev->solid = SOLID_NOT;
+					UTIL_SetSize ( pev, Vector ( -4, -4, 0 ), Vector ( 4, 4, 1 ) );
+				}
+				else // !!!HACKHACK - put monster in a thin, wide bounding box until we fix the solid type/bounding volume problem
+					UTIL_SetSize ( pev, Vector ( pev->mins.x, pev->mins.y, pev->mins.z ), Vector ( pev->maxs.x, pev->maxs.y, pev->mins.z + 1 ) );
+
+				if ( ShouldFadeOnDeath() )
+				{
+					// this monster was created by a monstermaker... fade the corpse out.
+					SUB_StartFadeOut();
+				}
+				else
+				{
+					// body is gonna be around for a while, so have it stink for a bit.
+					CSoundEnt::InsertSound ( bits_SOUND_CARCASS, pev->origin, 384, 30 );
+				}
+			}
+			break;
+		}
+	case TASK_RANGE_ATTACK1_NOTURN:
+	case TASK_MELEE_ATTACK1_NOTURN:
+	case TASK_MELEE_ATTACK2_NOTURN:
+	case TASK_RANGE_ATTACK2_NOTURN:
+	case TASK_RELOAD_NOTURN:
+		{
+			if ( m_fSequenceFinished )
+			{
+				m_Activity = ACT_RESET;
+				TaskComplete();
+			}
+			break;
+		}
+	case TASK_RANGE_ATTACK1:
+	case TASK_MELEE_ATTACK1:
+	case TASK_MELEE_ATTACK2:
+	case TASK_RANGE_ATTACK2:
+	case TASK_SPECIAL_ATTACK1:
+	case TASK_SPECIAL_ATTACK2:
+	case TASK_RELOAD:
+		{
+			MakeIdealYaw ( m_vecEnemyLKP );
+			ChangeYaw ( pev->yaw_speed );
+
+			if ( m_fSequenceFinished )
+			{
+				m_Activity = ACT_RESET;
+				TaskComplete();
+			}
+			break;
+		}
+	case TASK_SMALL_FLINCH:
+		{
+			if ( m_fSequenceFinished )
+			{
+				TaskComplete();
+			}
+		}
+		break;
+	case TASK_WAIT_FOR_SCRIPT:
+		{
+			if ( m_pCine->m_iDelay <= 0 && gpGlobals->time >= m_pCine->m_startTime )
+			{
+				TaskComplete();
+				m_pCine->StartSequence( (CBaseMonster *)this, m_pCine->m_iszPlay, TRUE );
+				if ( m_fSequenceFinished )
+					ClearSchedule();
+				pev->framerate = 1.0;
+				//ALERT( at_aiconsole, "Script %s has begun for %s\n", STRING( m_pCine->m_iszPlay ), STRING(pev->classname) );
+			}
+			break;
+		}
+	case TASK_PLAY_SCRIPT:
+		{
+			if (m_fSequenceFinished)
+			{
+				m_pCine->SequenceDone( this );
+			}
+			break;
+		}
+	}
+}
+
+//=========================================================
+// SetTurnActivity - measures the difference between the way
+// the monster is facing and determines whether or not to
+// select one of the 180 turn animations.
+//=========================================================
+void CBaseMonster :: SetTurnActivity ( void )
+{
+	float flYD;
+	flYD = FlYawDiff();
+
+	if ( flYD <= -45 && LookupActivity ( ACT_TURN_RIGHT ) != ACTIVITY_NOT_AVAILABLE )
+	{// big right turn
+		m_IdealActivity = ACT_TURN_RIGHT;
+	}
+	else if ( flYD > 45 && LookupActivity ( ACT_TURN_LEFT ) != ACTIVITY_NOT_AVAILABLE )
+	{// big left turn
+		m_IdealActivity = ACT_TURN_LEFT;
+	}
+}
+
+//=========================================================
+// Start task - selects the correct activity and performs
+// any necessary calculations to start the next task on the
+// schedule. 
+//=========================================================
+void CBaseMonster :: StartTask ( Task_t *pTask )
+{
+	switch ( pTask->iTask )
+	{
+	case TASK_TURN_RIGHT:
+		{
+			float flCurrentYaw;
+			
+			flCurrentYaw = UTIL_AngleMod( pev->angles.y );
+			pev->ideal_yaw = UTIL_AngleMod( flCurrentYaw - pTask->flData );
+			SetTurnActivity();
+			break;
+		}
+	case TASK_TURN_LEFT:
+		{
+			float flCurrentYaw;
+			
+			flCurrentYaw = UTIL_AngleMod( pev->angles.y );
+			pev->ideal_yaw = UTIL_AngleMod( flCurrentYaw + pTask->flData );
+			SetTurnActivity();
+			break;
+		}
+	case TASK_REMEMBER:
+		{
+			Remember ( (int)pTask->flData );
+			TaskComplete();
+			break;
+		}
+	case TASK_FORGET:
+		{
+			Forget ( (int)pTask->flData );
+			TaskComplete();
+			break;
+		}
+	case TASK_FIND_HINTNODE:
+		{
+			m_iHintNode = FindHintNode();
+
+			if ( m_iHintNode != NO_NODE )
+			{
+				TaskComplete();
+			}
+			else
+			{
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_STORE_LASTPOSITION:
+		{
+			m_vecLastPosition = pev->origin;
+			TaskComplete();
+			break;
+		}
+	case TASK_CLEAR_LASTPOSITION:
+		{
+			m_vecLastPosition = g_vecZero;
+			TaskComplete();
+			break;
+		}
+	case TASK_CLEAR_HINTNODE:
+		{
+			m_iHintNode = NO_NODE;
+			TaskComplete();
+			break;
+		}
+	case TASK_STOP_MOVING:
+		{
+			if ( m_IdealActivity == m_movementActivity )
+			{
+				m_IdealActivity = GetStoppedActivity();
+			}
+
+			RouteClear();
+			TaskComplete();
+			break;
+		}
+	case TASK_PLAY_SEQUENCE_FACE_ENEMY:
+	case TASK_PLAY_SEQUENCE_FACE_TARGET:
+	case TASK_PLAY_SEQUENCE:
+		{
+			m_IdealActivity = ( Activity )( int )pTask->flData;
+			break;
+		}
+	case TASK_PLAY_ACTIVE_IDLE:
+		{
+			// monsters verify that they have a sequence for the node's activity BEFORE
+			// moving towards the node, so it's ok to just set the activity without checking here.
+			m_IdealActivity = ( Activity )WorldGraph.m_pNodes[ m_iHintNode ].m_sHintActivity;
+			break;
+		}
+	case TASK_SET_SCHEDULE:
+		{
+			Schedule_t *pNewSchedule;
+
+			pNewSchedule = GetScheduleOfType( (int)pTask->flData );
+			
+			if ( pNewSchedule )
+			{
+				ChangeSchedule( pNewSchedule );
+			}
+			else
+			{
+				TaskFail();
+			}
+
+			break;
+		}
+	case TASK_FIND_NEAR_NODE_COVER_FROM_ENEMY:
+		{
+			if ( m_hEnemy == NULL )
+			{
+				TaskFail();
+				return;
+			}
+
+			if ( FindCover( m_hEnemy->pev->origin, m_hEnemy->pev->view_ofs, 0, pTask->flData ) )
+			{
+				// try for cover farther than the FLData from the schedule.
+				TaskComplete();
+			}
+			else
+			{
+				// no coverwhatsoever.
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_FIND_FAR_NODE_COVER_FROM_ENEMY:
+		{
+			if ( m_hEnemy == NULL )
+			{
+				TaskFail();
+				return;
+			}
+
+			if ( FindCover( m_hEnemy->pev->origin, m_hEnemy->pev->view_ofs, pTask->flData, CoverRadius() ) )
+			{
+				// try for cover farther than the FLData from the schedule.
+				TaskComplete();
+			}
+			else
+			{
+				// no coverwhatsoever.
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_FIND_NODE_COVER_FROM_ENEMY:
+		{
+			if ( m_hEnemy == NULL )
+			{
+				TaskFail();
+				return;
+			}
+
+			if ( FindCover( m_hEnemy->pev->origin, m_hEnemy->pev->view_ofs, 0, CoverRadius() ) )
+			{
+				// try for cover farther than the FLData from the schedule.
+				TaskComplete();
+			}
+			else
+			{
+				// no coverwhatsoever.
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_FIND_COVER_FROM_ENEMY:
+		{
+			entvars_t *pevCover;
+
+			if ( m_hEnemy == NULL )
+			{
+				// Find cover from self if no enemy available
+				pevCover = pev;
+//				TaskFail();
+//				return;
+			}
+			else
+				pevCover = m_hEnemy->pev;
+
+			if ( FindLateralCover( pevCover->origin, pevCover->view_ofs ) )
+			{
+				// try lateral first
+				m_flMoveWaitFinished = gpGlobals->time + pTask->flData;
+				TaskComplete();
+			}
+			else if ( FindCover( pevCover->origin, pevCover->view_ofs, 0, CoverRadius() ) )
+			{
+				// then try for plain ole cover
+				m_flMoveWaitFinished = gpGlobals->time + pTask->flData;
+				TaskComplete();
+			}
+			else
+			{
+				// no coverwhatsoever.
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_FIND_COVER_FROM_ORIGIN:
+		{
+			if ( FindCover( pev->origin, pev->view_ofs, 0, CoverRadius() ) )
+			{
+				// then try for plain ole cover
+				m_flMoveWaitFinished = gpGlobals->time + pTask->flData;
+				TaskComplete();
+			}
+			else
+			{
+				// no cover!
+				TaskFail();
+			}
+		}
+		break;
+	case TASK_FIND_COVER_FROM_BEST_SOUND:
+		{
+			CSound *pBestSound;
+
+			pBestSound = PBestSound();
+
+			ASSERT( pBestSound != NULL );
+			/*
+			if ( pBestSound && FindLateralCover( pBestSound->m_vecOrigin, g_vecZero ) )
+			{
+				// try lateral first
+				m_flMoveWaitFinished = gpGlobals->time + pTask->flData;
+				TaskComplete();
+			}
+			*/
+
+			if ( pBestSound && FindCover( pBestSound->m_vecOrigin, g_vecZero, pBestSound->m_iVolume, CoverRadius() ) )
+			{
+				// then try for plain ole cover
+				m_flMoveWaitFinished = gpGlobals->time + pTask->flData;
+				TaskComplete();
+			}
+			else
+			{
+				// no coverwhatsoever. or no sound in list
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_FACE_HINTNODE:
+		{
+			pev->ideal_yaw = WorldGraph.m_pNodes[ m_iHintNode ].m_flHintYaw;
+			SetTurnActivity();
+			break;
+		}
+	
+	case TASK_FACE_LASTPOSITION:
+		MakeIdealYaw ( m_vecLastPosition );
+		SetTurnActivity(); 
+		break;
+
+	case TASK_FACE_TARGET:
+		if ( m_hTargetEnt != NULL )
+		{
+			MakeIdealYaw ( m_hTargetEnt->pev->origin );
+			SetTurnActivity(); 
+		}
+		else
+			TaskFail();
+		break;
+	case TASK_FACE_ENEMY:
+		{
+			MakeIdealYaw ( m_vecEnemyLKP );
+			SetTurnActivity(); 
+			break;
+		}
+	case TASK_FACE_IDEAL:
+		{
+			SetTurnActivity();
+			break;
+		}
+	case TASK_FACE_ROUTE:
+		{
+			if (FRouteClear())
+			{
+				ALERT(at_aiconsole, "No route to face!\n");
+				TaskFail();
+			}
+			else
+			{
+				MakeIdealYaw(m_Route[m_iRouteIndex].vecLocation);
+				SetTurnActivity();
+			}
+			break;
+		}
+	case TASK_WAIT_PVS:
+	case TASK_WAIT_INDEFINITE:
+		{
+			// don't do anything.
+			break;
+		}
+	case TASK_WAIT:
+	case TASK_WAIT_FACE_ENEMY:
+		{// set a future time that tells us when the wait is over.
+			m_flWaitFinished = gpGlobals->time + pTask->flData;	
+			break;
+		}
+	case TASK_WAIT_RANDOM:
+		{// set a future time that tells us when the wait is over.
+			m_flWaitFinished = gpGlobals->time + RANDOM_FLOAT( 0.1, pTask->flData );
+			break;
+		}
+	case TASK_MOVE_TO_TARGET_RANGE:
+		{
+			if ( (m_hTargetEnt->pev->origin - pev->origin).Length() < 1 )
+				TaskComplete();
+			else
+			{
+				m_vecMoveGoal = m_hTargetEnt->pev->origin;
+				if ( !MoveToTarget( ACT_WALK, 2 ) )
+					TaskFail();
+			}
+			break;
+		}
+	case TASK_RUN_TO_TARGET:
+	case TASK_WALK_TO_TARGET:
+		{
+			Activity newActivity;
+
+			if ( (m_hTargetEnt->pev->origin - pev->origin).Length() < 1 )
+				TaskComplete();
+			else
+			{
+				if ( pTask->iTask == TASK_WALK_TO_TARGET )
+					newActivity = ACT_WALK;
+				else
+					newActivity = ACT_RUN;
+				// This monster can't do this!
+				if ( LookupActivity( newActivity ) == ACTIVITY_NOT_AVAILABLE )
+					TaskComplete();
+				else 
+				{
+					if ( m_hTargetEnt == NULL || !MoveToTarget( newActivity, 2 ) )
+					{
+						TaskFail();
+						ALERT( at_aiconsole, "%s Failed to reach target!!!\n", STRING(pev->classname) );
+						RouteClear();
+					}
+				}
+			}
+			TaskComplete();
+			break;
+		}
+	case TASK_CLEAR_MOVE_WAIT:
+		{
+			m_flMoveWaitFinished = gpGlobals->time;
+			TaskComplete();
+			break;
+		}
+	case TASK_MELEE_ATTACK1_NOTURN:
+	case TASK_MELEE_ATTACK1:
+		{
+			m_IdealActivity = ACT_MELEE_ATTACK1;
+			break;
+		}
+	case TASK_MELEE_ATTACK2_NOTURN:
+	case TASK_MELEE_ATTACK2:
+		{
+			m_IdealActivity = ACT_MELEE_ATTACK2;
+			break;
+		}
+	case TASK_RANGE_ATTACK1_NOTURN:
+	case TASK_RANGE_ATTACK1:
+		{
+			m_IdealActivity = ACT_RANGE_ATTACK1;
+			break;
+		}
+	case TASK_RANGE_ATTACK2_NOTURN:
+	case TASK_RANGE_ATTACK2:
+		{
+			m_IdealActivity = ACT_RANGE_ATTACK2;
+			break;
+		}
+	case TASK_RELOAD_NOTURN:
+	case TASK_RELOAD:
+		{
+			m_IdealActivity = ACT_RELOAD;
+			break;
+		}
+	case TASK_SPECIAL_ATTACK1:
+		{
+			m_IdealActivity = ACT_SPECIAL_ATTACK1;
+			break;
+		}
+	case TASK_SPECIAL_ATTACK2:
+		{
+			m_IdealActivity = ACT_SPECIAL_ATTACK2;
+			break;
+		}
+	case TASK_SET_ACTIVITY:
+		{
+			m_IdealActivity = (Activity)(int)pTask->flData;
+			TaskComplete();
+			break;
+		}
+	case TASK_GET_PATH_TO_ENEMY_LKP:
+		{
+			if ( BuildRoute ( m_vecEnemyLKP, bits_MF_TO_LOCATION, NULL ) )
+			{
+				TaskComplete();
+			}
+			else if (BuildNearestRoute( m_vecEnemyLKP, pev->view_ofs, 0, (m_vecEnemyLKP - pev->origin).Length() ))
+			{
+				TaskComplete();
+			}
+			else
+			{
+				// no way to get there =(
+				ALERT ( at_aiconsole, "GetPathToEnemyLKP failed!!\n" );
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_GET_PATH_TO_ENEMY:
+		{
+			CBaseEntity *pEnemy = m_hEnemy;
+
+			if ( pEnemy == NULL )
+			{
+				TaskFail();
+				return;
+			}
+
+			if ( BuildRoute ( pEnemy->pev->origin, bits_MF_TO_ENEMY, pEnemy ) )
+			{
+				TaskComplete();
+			}
+			else if (BuildNearestRoute( pEnemy->pev->origin, pEnemy->pev->view_ofs, 0, (pEnemy->pev->origin - pev->origin).Length() ))
+			{
+				TaskComplete();
+			}
+			else
+			{
+				// no way to get there =(
+				ALERT ( at_aiconsole, "GetPathToEnemy failed!!\n" );
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_GET_PATH_TO_ENEMY_CORPSE:
+		{
+			UTIL_MakeVectors( pev->angles );
+			if ( BuildRoute ( m_vecEnemyLKP - gpGlobals->v_forward * 64, bits_MF_TO_LOCATION, NULL ) )
+			{
+				TaskComplete();
+			}
+			else
+			{
+				ALERT ( at_aiconsole, "GetPathToEnemyCorpse failed!!\n" );
+				TaskFail();
+			}
+		}
+		break;
+	case TASK_GET_PATH_TO_SPOT:
+		{
+			CBaseEntity *pPlayer = CBaseEntity::Instance( FIND_ENTITY_BY_CLASSNAME( NULL, "player" ) );
+			if ( BuildRoute ( m_vecMoveGoal, bits_MF_TO_LOCATION, pPlayer ) )
+			{
+				TaskComplete();
+			}
+			else
+			{
+				// no way to get there =(
+				ALERT ( at_aiconsole, "GetPathToSpot failed!!\n" );
+				TaskFail();
+			}
+			break;
+		}
+
+	case TASK_GET_PATH_TO_TARGET:
+		{
+			RouteClear();
+			if ( m_hTargetEnt != NULL && MoveToTarget( m_movementActivity, 1 ) )
+			{
+				TaskComplete();
+			}
+			else
+			{
+				// no way to get there =(
+				ALERT ( at_aiconsole, "GetPathToSpot failed!!\n" );
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_GET_PATH_TO_HINTNODE:// for active idles!
+		{
+			if ( MoveToLocation( m_movementActivity, 2, WorldGraph.m_pNodes[ m_iHintNode ].m_vecOrigin ) )
+			{
+				TaskComplete();
+			}
+			else
+			{
+				// no way to get there =(
+				ALERT ( at_aiconsole, "GetPathToHintNode failed!!\n" );
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_GET_PATH_TO_LASTPOSITION:
+		{
+			m_vecMoveGoal = m_vecLastPosition;
+
+			if ( MoveToLocation( m_movementActivity, 2, m_vecMoveGoal ) )
+			{
+				TaskComplete();
+			}
+			else
+			{
+				// no way to get there =(
+				ALERT ( at_aiconsole, "GetPathToLastPosition failed!!\n" );
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_GET_PATH_TO_BESTSOUND:
+		{
+			CSound *pSound;
+
+			pSound = PBestSound();
+
+			if ( pSound && MoveToLocation( m_movementActivity, 2, pSound->m_vecOrigin ) )
+			{
+				TaskComplete();
+			}
+			else
+			{
+				// no way to get there =(
+				ALERT ( at_aiconsole, "GetPathToBestSound failed!!\n" );
+				TaskFail();
+			}
+			break;
+		}
+case TASK_GET_PATH_TO_BESTSCENT:
+		{
+			CSound *pScent;
+
+			pScent = PBestScent();
+
+			if ( pScent && MoveToLocation( m_movementActivity, 2, pScent->m_vecOrigin ) )
+			{
+				TaskComplete();
+			}
+			else
+			{
+				// no way to get there =(
+				ALERT ( at_aiconsole, "GetPathToBestScent failed!!\n" );
+				
+				TaskFail();
+			}
+			break;
+		}
+	case TASK_RUN_PATH:
+		{
+			// UNDONE: This is in some default AI and some monsters can't run? -- walk instead?
+			if ( LookupActivity( ACT_RUN ) != ACTIVITY_NOT_AVAILABLE )
+			{
+				m_movementActivity = ACT_RUN;
+			}
+			else
+			{
+				m_movementActivity = ACT_WALK;
+			}
+			TaskComplete();
+			break;
+		}
+	case TASK_WALK_PATH:
+		{
+			if ( pev->movetype == MOVETYPE_FLY )
+			{
+				m_movementActivity = ACT_FLY;
+			}
+			if ( LookupActivity( ACT_WALK ) != ACTIVITY_NOT_AVAILABLE )
+			{
+				m_movementActivity = ACT_WALK;
+			}
+			else
+			{
+				m_movementActivity = ACT_RUN;
+			}
+			TaskComplete();
+			break;
+		}
+	case TASK_STRAFE_PATH:
+		{
+			Vector2D	vec2DirToPoint; 
+			Vector2D	vec2RightSide;
+
+			// to start strafing, we have to first figure out if the target is on the left side or right side
+			UTIL_MakeVectors ( pev->angles );
+
+			vec2DirToPoint = ( m_Route[ 0 ].vecLocation - pev->origin ).Make2D().Normalize();
+			vec2RightSide = gpGlobals->v_right.Make2D().Normalize();
+
+			if ( DotProduct ( vec2DirToPoint, vec2RightSide ) > 0 )
+			{
+				// strafe right
+				m_movementActivity = ACT_STRAFE_RIGHT;
+			}
+			else
+			{
+				// strafe left
+				m_movementActivity = ACT_STRAFE_LEFT;
+			}
+			TaskComplete();
+			break;
+		}
+
+
+	case TASK_WAIT_FOR_MOVEMENT:
+		{
+			if (FRouteClear())
+			{
+				TaskComplete();
+			}
+			break;
+		}
+
+	case TASK_EAT:
+		{
+			Eat( pTask->flData );
+			TaskComplete();
+			break;
+		}
+	case TASK_SMALL_FLINCH:
+		{
+			m_IdealActivity = GetSmallFlinchActivity();
+			break;
+		}
+	case TASK_DIE:
+		{
+			RouteClear();	
+			
+			m_IdealActivity = GetDeathActivity();
+
+			pev->deadflag = DEAD_DYING;
+			break;
+		}
+	case TASK_SOUND_WAKE:
+		{
+			AlertSound();
+			TaskComplete();
+			break;
+		}
+	case TASK_SOUND_DIE:
+		{
+			DeathSound();
+			TaskComplete();
+			break;
+		}
+	case TASK_SOUND_IDLE:
+		{
+			IdleSound();
+			TaskComplete();
+			break;
+		}
+	case TASK_SOUND_PAIN:
+		{
+			PainSound();
+			TaskComplete();
+			break;
+		}
+	case TASK_SOUND_DEATH:
+		{
+			DeathSound();
+			TaskComplete();
+			break;
+		}
+	case TASK_SOUND_ANGRY:
+		{
+			// sounds are complete as soon as we get here, cause we've already played them.
+			ALERT ( at_aiconsole, "SOUND\n" );			
+			TaskComplete();
+			break;
+		}
+	case TASK_WAIT_FOR_SCRIPT:
+		{
+			if (m_pCine->m_iszIdle)
+			{
+				m_pCine->StartSequence( (CBaseMonster *)this, m_pCine->m_iszIdle, FALSE );
+				if (FStrEq( STRING(m_pCine->m_iszIdle), STRING(m_pCine->m_iszPlay)))
+				{
+					pev->framerate = 0;
+				}
+			}
+			else
+				m_IdealActivity = ACT_IDLE;
+
+			break;
+		}
+	case TASK_PLAY_SCRIPT:
+		{
+			pev->movetype = MOVETYPE_FLY;
+			ClearBits(pev->flags, FL_ONGROUND);
+			m_scriptState = SCRIPT_PLAYING;
+			break;
+		}
+	case TASK_ENABLE_SCRIPT:
+		{
+			m_pCine->DelayStart( 0 );
+			TaskComplete();
+			break;
+		}
+	case TASK_PLANT_ON_SCRIPT:
+		{
+			if ( m_hTargetEnt != NULL )
+			{
+				pev->origin = m_hTargetEnt->pev->origin;	// Plant on target
+			}
+
+			TaskComplete();
+			break;
+		}
+	case TASK_FACE_SCRIPT:
+		{
+			if ( m_hTargetEnt != NULL )
+			{
+				pev->ideal_yaw = UTIL_AngleMod( m_hTargetEnt->pev->angles.y );
+			}
+
+			TaskComplete();
+			m_IdealActivity = ACT_IDLE;
+			RouteClear();
+			break;
+		}
+
+	case TASK_SUGGEST_STATE:
+		{
+			m_IdealMonsterState = (MONSTERSTATE)(int)pTask->flData;
+			TaskComplete();
+			break;
+		}
+
+	case TASK_SET_FAIL_SCHEDULE:
+		m_failSchedule = (int)pTask->flData;
+		TaskComplete();
+		break;
+
+	case TASK_CLEAR_FAIL_SCHEDULE:
+		m_failSchedule = SCHED_NONE;
+		TaskComplete();
+		break;
+
+	default:
+		{
+			ALERT ( at_aiconsole, "No StartTask entry for %d\n", (SHARED_TASKS)pTask->iTask );
+			break;
+		}
+	}
+}
+
+//=========================================================
+// GetTask - returns a pointer to the current 
+// scheduled task. NULL if there's a problem.
+//=========================================================
+Task_t	*CBaseMonster :: GetTask ( void ) 
+{
+	if ( m_iScheduleIndex < 0 || m_iScheduleIndex >= m_pSchedule->cTasks )
+	{
+		// m_iScheduleIndex is not within valid range for the monster's current schedule.
+		return NULL;
+	}
+	else
+	{
+		return &m_pSchedule->pTasklist[ m_iScheduleIndex ];
+	}
+}
+
+//=========================================================
+// GetSchedule - Decides which type of schedule best suits
+// the monster's current state and conditions. Then calls
+// monster's member function to get a pointer to a schedule
+// of the proper type.
+//=========================================================
+Schedule_t *CBaseMonster :: GetSchedule ( void )
+{
+	switch	( m_MonsterState )
+	{
+	case MONSTERSTATE_PRONE:
+		{
+			return GetScheduleOfType( SCHED_BARNACLE_VICTIM_GRAB );
+			break;
+		}
+	case MONSTERSTATE_NONE:
+		{
+			ALERT ( at_aiconsole, "MONSTERSTATE IS NONE!\n" );
+			break;
+		}
+	case MONSTERSTATE_IDLE:
+		{
+			if ( HasConditions ( bits_COND_HEAR_SOUND ) )
+			{
+				return GetScheduleOfType( SCHED_ALERT_FACE );
+			}
+			else if ( FRouteClear() )
+			{
+				// no valid route!
+				return GetScheduleOfType( SCHED_IDLE_STAND );
+			}
+			else
+			{
+				// valid route. Get moving
+				return GetScheduleOfType( SCHED_IDLE_WALK );
+			}
+			break;
+		}
+	case MONSTERSTATE_ALERT:
+		{
+			if ( HasConditions( bits_COND_ENEMY_DEAD ) && LookupActivity( ACT_VICTORY_DANCE ) != ACTIVITY_NOT_AVAILABLE )
+			{
+				return GetScheduleOfType ( SCHED_VICTORY_DANCE );
+			}
+
+			if ( HasConditions(bits_COND_LIGHT_DAMAGE | bits_COND_HEAVY_DAMAGE) )
+			{
+				if ( fabs( FlYawDiff() ) < (1.0 - m_flFieldOfView) * 60 ) // roughly in the correct direction
+				{
+					return GetScheduleOfType( SCHED_TAKE_COVER_FROM_ORIGIN );
+				}
+				else
+				{
+					return GetScheduleOfType( SCHED_ALERT_SMALL_FLINCH );
+				}
+			}
+
+			else if ( HasConditions ( bits_COND_HEAR_SOUND ) )
+			{
+				return GetScheduleOfType( SCHED_ALERT_FACE );
+			}
+			else
+			{
+				return GetScheduleOfType( SCHED_ALERT_STAND );
+			}
+			break;
+		}
+	case MONSTERSTATE_COMBAT:
+		{
+			if ( HasConditions( bits_COND_ENEMY_DEAD ) )
+			{
+				// clear the current (dead) enemy and try to find another.
+				m_hEnemy = NULL;
+
+				if ( GetEnemy() )
+				{
+					ClearConditions( bits_COND_ENEMY_DEAD );
+					return GetSchedule();
+				}
+				else
+				{
+					SetState( MONSTERSTATE_ALERT );
+					return GetSchedule();
+				}
+			}
+
+			if ( HasConditions(bits_COND_NEW_ENEMY) )
+			{
+				return GetScheduleOfType ( SCHED_WAKE_ANGRY );
+			}
+			else if (HasConditions(bits_COND_LIGHT_DAMAGE) && !HasMemory( bits_MEMORY_FLINCHED) )
+			{
+				return GetScheduleOfType( SCHED_SMALL_FLINCH );
+			}
+			else if ( !HasConditions(bits_COND_SEE_ENEMY) )
+			{
+				// we can't see the enemy
+				if ( !HasConditions(bits_COND_ENEMY_OCCLUDED) )
+				{
+					// enemy is unseen, but not occluded!
+					// turn to face enemy
+					return GetScheduleOfType( SCHED_COMBAT_FACE );
+				}
+				else
+				{
+					// chase!
+					return GetScheduleOfType( SCHED_CHASE_ENEMY );
+				}
+			}
+			else  
+			{
+				// we can see the enemy
+				if ( HasConditions(bits_COND_CAN_RANGE_ATTACK1) )
+				{
+					return GetScheduleOfType( SCHED_RANGE_ATTACK1 );
+				}
+				if ( HasConditions(bits_COND_CAN_RANGE_ATTACK2) )
+				{
+					return GetScheduleOfType( SCHED_RANGE_ATTACK2 );
+				}
+				if ( HasConditions(bits_COND_CAN_MELEE_ATTACK1) )
+				{
+					return GetScheduleOfType( SCHED_MELEE_ATTACK1 );
+				}
+				if ( HasConditions(bits_COND_CAN_MELEE_ATTACK2) )
+				{
+					return GetScheduleOfType( SCHED_MELEE_ATTACK2 );
+				}
+				if ( !HasConditions(bits_COND_CAN_RANGE_ATTACK1 | bits_COND_CAN_MELEE_ATTACK1) )
+				{
+					// if we can see enemy but can't use either attack type, we must need to get closer to enemy
+					return GetScheduleOfType( SCHED_CHASE_ENEMY );
+				}
+				else if ( !FacingIdeal() )
+				{
+					//turn
+					return GetScheduleOfType( SCHED_COMBAT_FACE );
+				}
+				else
+				{
+					ALERT ( at_aiconsole, "No suitable combat schedule!\n" );
+				}
+			}
+			break;
+		}
+	case MONSTERSTATE_DEAD:
+		{
+			return GetScheduleOfType( SCHED_DIE );
+			break;
+		}
+	case MONSTERSTATE_SCRIPT:
+		{
+			ASSERT( m_pCine != NULL );
+			if ( !m_pCine )
+			{
+				ALERT( at_aiconsole, "Script failed for %s\n", STRING(pev->classname) );
+				CineCleanup();
+				return GetScheduleOfType( SCHED_IDLE_STAND );
+			}
+
+			return GetScheduleOfType( SCHED_AISCRIPT );
+		}
+	default:
+		{
+			ALERT ( at_aiconsole, "Invalid State for GetSchedule!\n" );
+			break;
+		}
+	}
+
+	return &slError[ 0 ];
+}
diff --git a/main/source/dlls/schedule.h b/main/source/dlls/schedule.h
new file mode 100644
index 00000000..7d341588
--- /dev/null
+++ b/main/source/dlls/schedule.h
@@ -0,0 +1,31 @@
+/***
+*
+*	Copyright (c) 1996-2002, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//=========================================================
+// Scheduling 
+//=========================================================
+#ifndef	SCHEDULE_H
+#define	SCHEDULE_H
+
+#define	bits_COND_SEE_HATE				( 1 << 1 ) // see something that you hate
+#define bits_COND_SEE_FEAR				( 1 << 2 ) // see something that you are afraid of
+#define bits_COND_SEE_DISLIKE			( 1 << 3 ) // see something that you dislike
+#define bits_COND_SEE_ENEMY				( 1 << 4 ) // target entity is in full view.
+#define bits_COND_LIGHT_DAMAGE			( 1 << 8 ) // hurt a little 
+#define bits_COND_HEAVY_DAMAGE			( 1 << 9 ) // hurt a lot
+#define bits_COND_SEE_CLIENT			( 1 << 21) // see a client
+#define bits_COND_SEE_NEMESIS			( 1 << 22) // see my nemesis
+
+
+#endif	// SCHEDULE_H
diff --git a/main/source/dlls/scientist.cpp b/main/source/dlls/scientist.cpp
new file mode 100644
index 00000000..98050950
--- /dev/null
+++ b/main/source/dlls/scientist.cpp
@@ -0,0 +1,1428 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// human scientist (passive lab worker)
+//=========================================================
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"talkmonster.h"
+#include	"schedule.h"
+#include	"defaultai.h"
+#include	"scripted.h"
+#include	"animation.h"
+#include	"soundent.h"
+
+
+#define		NUM_SCIENTIST_HEADS		4 // four heads available for scientist model
+enum { HEAD_GLASSES = 0, HEAD_EINSTEIN = 1, HEAD_LUTHER = 2, HEAD_SLICK = 3 };
+
+enum
+{
+	SCHED_HIDE = LAST_TALKMONSTER_SCHEDULE + 1,
+	SCHED_FEAR,
+	SCHED_PANIC,
+	SCHED_STARTLE,
+	SCHED_TARGET_CHASE_SCARED,
+	SCHED_TARGET_FACE_SCARED,
+};
+
+enum
+{
+	TASK_SAY_HEAL = LAST_TALKMONSTER_TASK + 1,
+	TASK_HEAL,
+	TASK_SAY_FEAR,
+	TASK_RUN_PATH_SCARED,
+	TASK_SCREAM,
+	TASK_RANDOM_SCREAM,
+	TASK_MOVE_TO_TARGET_RANGE_SCARED,
+};
+
+//=========================================================
+// Monster's Anim Events Go Here
+//=========================================================
+#define		SCIENTIST_AE_HEAL		( 1 )
+#define		SCIENTIST_AE_NEEDLEON	( 2 )
+#define		SCIENTIST_AE_NEEDLEOFF	( 3 )
+
+//=======================================================
+// Scientist
+//=======================================================
+
+class CScientist : public CTalkMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+
+	void SetYawSpeed( void );
+	int  Classify ( void );
+	void HandleAnimEvent( MonsterEvent_t *pEvent );
+	void RunTask( Task_t *pTask );
+	void StartTask( Task_t *pTask );
+	int	ObjectCaps( void ) { return CTalkMonster :: ObjectCaps() | FCAP_IMPULSE_USE; }
+	int TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType);
+	virtual int FriendNumber( int arrayNumber );
+	void SetActivity ( Activity newActivity );
+	Activity GetStoppedActivity( void );
+	int ISoundMask( void );
+	void DeclineFollowing( void );
+
+	float	CoverRadius( void ) { return 1200; }		// Need more room for cover because scientists want to get far away!
+	BOOL	DisregardEnemy( CBaseEntity *pEnemy ) { return !pEnemy->IsAlive() || (gpGlobals->time - m_fearTime) > 15; }
+
+	BOOL	CanHeal( void );
+	void	Heal( void );
+	void	Scream( void );
+
+	// Override these to set behavior
+	Schedule_t *GetScheduleOfType ( int Type );
+	Schedule_t *GetSchedule ( void );
+	MONSTERSTATE GetIdealState ( void );
+
+	void DeathSound( void );
+	void PainSound( void );
+	
+	void TalkInit( void );
+
+	void			Killed( entvars_t *pevAttacker, int iGib );
+	
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	CUSTOM_SCHEDULES;
+
+private:	
+	float m_painTime;
+	float m_healTime;
+	float m_fearTime;
+};
+
+LINK_ENTITY_TO_CLASS( monster_scientist, CScientist );
+
+TYPEDESCRIPTION	CScientist::m_SaveData[] = 
+{
+	DEFINE_FIELD( CScientist, m_painTime, FIELD_TIME ),
+	DEFINE_FIELD( CScientist, m_healTime, FIELD_TIME ),
+	DEFINE_FIELD( CScientist, m_fearTime, FIELD_TIME ),
+};
+
+IMPLEMENT_SAVERESTORE( CScientist, CTalkMonster );
+
+//=========================================================
+// AI Schedules Specific to this monster
+//=========================================================
+Task_t	tlFollow[] =
+{
+	{ TASK_SET_FAIL_SCHEDULE,	(float)SCHED_CANT_FOLLOW },	// If you fail, bail out of follow
+	{ TASK_MOVE_TO_TARGET_RANGE,(float)128		},	// Move within 128 of target ent (client)
+//	{ TASK_SET_SCHEDULE,		(float)SCHED_TARGET_FACE },
+};
+
+Schedule_t	slFollow[] =
+{
+	{
+		tlFollow,
+		ARRAYSIZE ( tlFollow ),
+		bits_COND_NEW_ENEMY |
+		bits_COND_LIGHT_DAMAGE |
+		bits_COND_HEAVY_DAMAGE |
+		bits_COND_HEAR_SOUND,
+		bits_SOUND_COMBAT |
+		bits_SOUND_DANGER,
+		"Follow"
+	},
+};
+
+Task_t	tlFollowScared[] =
+{
+	{ TASK_SET_FAIL_SCHEDULE,	(float)SCHED_TARGET_CHASE },// If you fail, follow normally
+	{ TASK_MOVE_TO_TARGET_RANGE_SCARED,(float)128		},	// Move within 128 of target ent (client)
+//	{ TASK_SET_SCHEDULE,		(float)SCHED_TARGET_FACE_SCARED },
+};
+
+Schedule_t	slFollowScared[] =
+{
+	{
+		tlFollowScared,
+		ARRAYSIZE ( tlFollowScared ),
+		bits_COND_NEW_ENEMY |
+		bits_COND_HEAR_SOUND |
+		bits_COND_LIGHT_DAMAGE |
+		bits_COND_HEAVY_DAMAGE,
+		bits_SOUND_DANGER,
+		"FollowScared"
+	},
+};
+
+Task_t	tlFaceTargetScared[] =
+{
+	{ TASK_FACE_TARGET,			(float)0		},
+	{ TASK_SET_ACTIVITY,		(float)ACT_CROUCHIDLE },
+	{ TASK_SET_SCHEDULE,		(float)SCHED_TARGET_CHASE_SCARED },
+};
+
+Schedule_t	slFaceTargetScared[] =
+{
+	{
+		tlFaceTargetScared,
+		ARRAYSIZE ( tlFaceTargetScared ),
+		bits_COND_HEAR_SOUND |
+		bits_COND_NEW_ENEMY,
+		bits_SOUND_DANGER,
+		"FaceTargetScared"
+	},
+};
+
+Task_t	tlStopFollowing[] =
+{
+	{ TASK_CANT_FOLLOW,		(float)0 },
+};
+
+Schedule_t	slStopFollowing[] =
+{
+	{
+		tlStopFollowing,
+		ARRAYSIZE ( tlStopFollowing ),
+		0,
+		0,
+		"StopFollowing"
+	},
+};
+
+
+Task_t	tlHeal[] =
+{
+	{ TASK_MOVE_TO_TARGET_RANGE,(float)50		},	// Move within 60 of target ent (client)
+	{ TASK_SET_FAIL_SCHEDULE,	(float)SCHED_TARGET_CHASE },	// If you fail, catch up with that guy! (change this to put syringe away and then chase)
+	{ TASK_FACE_IDEAL,			(float)0		},
+	{ TASK_SAY_HEAL,			(float)0		},
+	{ TASK_PLAY_SEQUENCE_FACE_TARGET,		(float)ACT_ARM	},			// Whip out the needle
+	{ TASK_HEAL,				(float)0	},	// Put it in the player
+	{ TASK_PLAY_SEQUENCE_FACE_TARGET,		(float)ACT_DISARM	},			// Put away the needle
+};
+
+Schedule_t	slHeal[] =
+{
+	{
+		tlHeal,
+		ARRAYSIZE ( tlHeal ),
+		0,	// Don't interrupt or he'll end up running around with a needle all the time
+		0,
+		"Heal"
+	},
+};
+
+
+Task_t	tlFaceTarget[] =
+{
+	{ TASK_STOP_MOVING,			(float)0		},
+	{ TASK_FACE_TARGET,			(float)0		},
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE },
+	{ TASK_SET_SCHEDULE,		(float)SCHED_TARGET_CHASE },
+};
+
+Schedule_t	slFaceTarget[] =
+{
+	{
+		tlFaceTarget,
+		ARRAYSIZE ( tlFaceTarget ),
+		bits_COND_CLIENT_PUSH |
+		bits_COND_NEW_ENEMY |
+		bits_COND_HEAR_SOUND,
+		bits_SOUND_COMBAT |
+		bits_SOUND_DANGER,
+		"FaceTarget"
+	},
+};
+
+
+Task_t	tlSciPanic[] =
+{
+	{ TASK_STOP_MOVING,			(float)0		},
+	{ TASK_FACE_ENEMY,			(float)0		},
+	{ TASK_SCREAM,				(float)0		},
+	{ TASK_PLAY_SEQUENCE_FACE_ENEMY,		(float)ACT_EXCITED	},	// This is really fear-stricken excitement
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE	},
+};
+
+Schedule_t	slSciPanic[] =
+{
+	{
+		tlSciPanic,
+		ARRAYSIZE ( tlSciPanic ),
+		0,
+		0,
+		"SciPanic"
+	},
+};
+
+
+Task_t	tlIdleSciStand[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE },
+	{ TASK_WAIT,				(float)2		}, // repick IDLESTAND every two seconds.
+	{ TASK_TLK_HEADRESET,		(float)0		}, // reset head position
+};
+
+Schedule_t	slIdleSciStand[] =
+{
+	{ 
+		tlIdleSciStand,
+		ARRAYSIZE ( tlIdleSciStand ), 
+		bits_COND_NEW_ENEMY		|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE	|
+		bits_COND_HEAR_SOUND	|
+		bits_COND_SMELL			|
+		bits_COND_CLIENT_PUSH	|
+		bits_COND_PROVOKED,
+
+		bits_SOUND_COMBAT		|// sound flags
+		//bits_SOUND_PLAYER		|
+		//bits_SOUND_WORLD		|
+		bits_SOUND_DANGER		|
+		bits_SOUND_MEAT			|// scents
+		bits_SOUND_CARCASS		|
+		bits_SOUND_GARBAGE,
+		"IdleSciStand"
+
+	},
+};
+
+
+Task_t	tlScientistCover[] =
+{
+	{ TASK_SET_FAIL_SCHEDULE,		(float)SCHED_PANIC },		// If you fail, just panic!
+	{ TASK_STOP_MOVING,				(float)0					},
+	{ TASK_FIND_COVER_FROM_ENEMY,	(float)0					},
+	{ TASK_RUN_PATH_SCARED,			(float)0					},
+	{ TASK_TURN_LEFT,				(float)179					},
+	{ TASK_SET_SCHEDULE,			(float)SCHED_HIDE			},
+};
+
+Schedule_t	slScientistCover[] =
+{
+	{ 
+		tlScientistCover,
+		ARRAYSIZE ( tlScientistCover ), 
+		bits_COND_NEW_ENEMY,
+		0,
+		"ScientistCover"
+	},
+};
+
+
+
+Task_t	tlScientistHide[] =
+{
+	{ TASK_SET_FAIL_SCHEDULE,		(float)SCHED_PANIC },		// If you fail, just panic!
+	{ TASK_STOP_MOVING,				(float)0					},
+	{ TASK_PLAY_SEQUENCE,			(float)ACT_CROUCH			},
+	{ TASK_SET_ACTIVITY,			(float)ACT_CROUCHIDLE		},	// FIXME: This looks lame
+	{ TASK_WAIT_RANDOM,				(float)10.0					},
+};
+
+Schedule_t	slScientistHide[] =
+{
+	{ 
+		tlScientistHide,
+		ARRAYSIZE ( tlScientistHide ), 
+		bits_COND_NEW_ENEMY |
+		bits_COND_HEAR_SOUND |
+		bits_COND_SEE_ENEMY |
+		bits_COND_SEE_HATE |
+		bits_COND_SEE_FEAR |
+		bits_COND_SEE_DISLIKE,
+		bits_SOUND_DANGER,
+		"ScientistHide"
+	},
+};
+
+
+Task_t	tlScientistStartle[] =
+{
+	{ TASK_SET_FAIL_SCHEDULE,		(float)SCHED_PANIC },		// If you fail, just panic!
+	{ TASK_RANDOM_SCREAM,			(float)0.3 },				// Scream 30% of the time
+	{ TASK_STOP_MOVING,				(float)0					},
+	{ TASK_PLAY_SEQUENCE_FACE_ENEMY,			(float)ACT_CROUCH			},
+	{ TASK_RANDOM_SCREAM,			(float)0.1 },				// Scream again 10% of the time
+	{ TASK_PLAY_SEQUENCE_FACE_ENEMY,			(float)ACT_CROUCHIDLE		},
+	{ TASK_WAIT_RANDOM,				(float)1.0					},
+};
+
+Schedule_t	slScientistStartle[] =
+{
+	{ 
+		tlScientistStartle,
+		ARRAYSIZE ( tlScientistStartle ), 
+		bits_COND_NEW_ENEMY |
+		bits_COND_SEE_ENEMY |
+		bits_COND_SEE_HATE |
+		bits_COND_SEE_FEAR |
+		bits_COND_SEE_DISLIKE,
+		0,
+		"ScientistStartle"
+	},
+};
+
+
+
+Task_t	tlFear[] =
+{
+	{ TASK_STOP_MOVING,				(float)0					},
+	{ TASK_FACE_ENEMY,				(float)0					},
+	{ TASK_SAY_FEAR,				(float)0					},
+//	{ TASK_PLAY_SEQUENCE,			(float)ACT_FEAR_DISPLAY		},
+};
+
+Schedule_t	slFear[] =
+{
+	{ 
+		tlFear,
+		ARRAYSIZE ( tlFear ), 
+		bits_COND_NEW_ENEMY,
+		0,
+		"Fear"
+	},
+};
+
+
+DEFINE_CUSTOM_SCHEDULES( CScientist )
+{
+	slFollow,
+	slFaceTarget,
+	slIdleSciStand,
+	slFear,
+	slScientistCover,
+	slScientistHide,
+	slScientistStartle,
+	slHeal,
+	slStopFollowing,
+	slSciPanic,
+	slFollowScared,
+	slFaceTargetScared,
+};
+
+
+IMPLEMENT_CUSTOM_SCHEDULES( CScientist, CTalkMonster );
+
+
+void CScientist::DeclineFollowing( void )
+{
+	Talk( 10 );
+	m_hTalkTarget = m_hEnemy;
+	PlaySentence( "SC_POK", 2, VOL_NORM, ATTN_NORM );
+}
+
+
+void CScientist :: Scream( void )
+{
+	if ( FOkToSpeak() )
+	{
+		Talk( 10 );
+		m_hTalkTarget = m_hEnemy;
+		PlaySentence( "SC_SCREAM", RANDOM_FLOAT(3, 6), VOL_NORM, ATTN_NORM );
+	}
+}
+
+
+Activity CScientist::GetStoppedActivity( void )
+{ 
+	if ( m_hEnemy != NULL ) 
+		return ACT_EXCITED;
+	return CTalkMonster::GetStoppedActivity();
+}
+
+
+void CScientist :: StartTask( Task_t *pTask )
+{
+	switch( pTask->iTask )
+	{
+	case TASK_SAY_HEAL:
+//		if ( FOkToSpeak() )
+		Talk( 2 );
+		m_hTalkTarget = m_hTargetEnt;
+		PlaySentence( "SC_HEAL", 2, VOL_NORM, ATTN_IDLE );
+
+		TaskComplete();
+		break;
+
+	case TASK_SCREAM:
+		Scream();
+		TaskComplete();
+		break;
+
+	case TASK_RANDOM_SCREAM:
+		if ( RANDOM_FLOAT( 0, 1 ) < pTask->flData )
+			Scream();
+		TaskComplete();
+		break;
+
+	case TASK_SAY_FEAR:
+		if ( FOkToSpeak() )
+		{
+			Talk( 2 );
+			m_hTalkTarget = m_hEnemy;
+			if ( m_hEnemy->IsPlayer() )
+				PlaySentence( "SC_PLFEAR", 5, VOL_NORM, ATTN_NORM );
+			else
+				PlaySentence( "SC_FEAR", 5, VOL_NORM, ATTN_NORM );
+		}
+		TaskComplete();
+		break;
+
+	case TASK_HEAL:
+		m_IdealActivity = ACT_MELEE_ATTACK1;
+		break;
+
+	case TASK_RUN_PATH_SCARED:
+		m_movementActivity = ACT_RUN_SCARED;
+		break;
+
+	case TASK_MOVE_TO_TARGET_RANGE_SCARED:
+		{
+			if ( (m_hTargetEnt->pev->origin - pev->origin).Length() < 1 )
+				TaskComplete();
+			else
+			{
+				m_vecMoveGoal = m_hTargetEnt->pev->origin;
+				if ( !MoveToTarget( ACT_WALK_SCARED, 0.5 ) )
+					TaskFail();
+			}
+		}
+		break;
+
+	default:
+		CTalkMonster::StartTask( pTask );
+		break;
+	}
+}
+
+void CScientist :: RunTask( Task_t *pTask )
+{
+	switch ( pTask->iTask )
+	{
+	case TASK_RUN_PATH_SCARED:
+		if ( MovementIsComplete() )
+			TaskComplete();
+		if ( RANDOM_LONG(0,31) < 8 )
+			Scream();
+		break;
+
+	case TASK_MOVE_TO_TARGET_RANGE_SCARED:
+		{
+			if ( RANDOM_LONG(0,63)< 8 )
+				Scream();
+
+			if ( m_hEnemy == NULL )
+			{
+				TaskFail();
+			}
+			else
+			{
+				float distance;
+
+				distance = ( m_vecMoveGoal - pev->origin ).Length2D();
+				// Re-evaluate when you think your finished, or the target has moved too far
+				if ( (distance < pTask->flData) || (m_vecMoveGoal - m_hTargetEnt->pev->origin).Length() > pTask->flData * 0.5 )
+				{
+					m_vecMoveGoal = m_hTargetEnt->pev->origin;
+					distance = ( m_vecMoveGoal - pev->origin ).Length2D();
+					FRefreshRoute();
+				}
+
+				// Set the appropriate activity based on an overlapping range
+				// overlap the range to prevent oscillation
+				if ( distance < pTask->flData )
+				{
+					TaskComplete();
+					RouteClear();		// Stop moving
+				}
+				else if ( distance < 190 && m_movementActivity != ACT_WALK_SCARED )
+					m_movementActivity = ACT_WALK_SCARED;
+				else if ( distance >= 270 && m_movementActivity != ACT_RUN_SCARED )
+					m_movementActivity = ACT_RUN_SCARED;
+			}
+		}
+		break;
+
+	case TASK_HEAL:
+		if ( m_fSequenceFinished )
+		{
+			TaskComplete();
+		}
+		else
+		{
+			if ( TargetDistance() > 90 )
+				TaskComplete();
+			pev->ideal_yaw = UTIL_VecToYaw( m_hTargetEnt->pev->origin - pev->origin );
+			ChangeYaw( pev->yaw_speed );
+		}
+		break;
+	default:
+		CTalkMonster::RunTask( pTask );
+		break;
+	}
+}
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CScientist :: Classify ( void )
+{
+	return	CLASS_HUMAN_PASSIVE;
+}
+
+
+//=========================================================
+// SetYawSpeed - allows each sequence to have a different
+// turn rate associated with it.
+//=========================================================
+void CScientist :: SetYawSpeed ( void )
+{
+	int ys;
+
+	ys = 90;
+
+	switch ( m_Activity )
+	{
+	case ACT_IDLE:
+		ys = 120;
+		break;
+	case ACT_WALK:
+		ys = 180;
+		break;
+	case ACT_RUN:
+		ys = 150;
+		break;
+	case ACT_TURN_LEFT:
+	case ACT_TURN_RIGHT:
+		ys = 120;
+		break;
+	}
+
+	pev->yaw_speed = ys;
+}
+
+//=========================================================
+// HandleAnimEvent - catches the monster-specific messages
+// that occur when tagged animation frames are played.
+//=========================================================
+void CScientist :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	switch( pEvent->event )
+	{		
+	case SCIENTIST_AE_HEAL:		// Heal my target (if within range)
+		Heal();
+		break;
+	case SCIENTIST_AE_NEEDLEON:
+		{
+		int oldBody = pev->body;
+		pev->body = (oldBody % NUM_SCIENTIST_HEADS) + NUM_SCIENTIST_HEADS * 1;
+		}
+		break;
+	case SCIENTIST_AE_NEEDLEOFF:
+		{
+		int oldBody = pev->body;
+		pev->body = (oldBody % NUM_SCIENTIST_HEADS) + NUM_SCIENTIST_HEADS * 0;
+		}
+		break;
+
+	default:
+		CTalkMonster::HandleAnimEvent( pEvent );
+	}
+}
+
+//=========================================================
+// Spawn
+//=========================================================
+void CScientist :: Spawn( void )
+{
+	Precache( );
+
+	SET_MODEL(ENT(pev), "models/scientist.mdl");
+	UTIL_SetSize(pev, VEC_HUMAN_HULL_MIN, VEC_HUMAN_HULL_MAX);
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_STEP;
+	m_bloodColor		= BLOOD_COLOR_RED;
+	pev->health			= gSkillData.scientistHealth;
+	pev->view_ofs		= Vector ( 0, 0, 50 );// position of the eyes relative to monster's origin.
+	m_flFieldOfView		= VIEW_FIELD_WIDE; // NOTE: we need a wide field of view so scientists will notice player and say hello
+	m_MonsterState		= MONSTERSTATE_NONE;
+
+//	m_flDistTooFar		= 256.0;
+
+	m_afCapability		= bits_CAP_HEAR | bits_CAP_TURN_HEAD | bits_CAP_OPEN_DOORS | bits_CAP_AUTO_DOORS | bits_CAP_USE;
+
+	// White hands
+	pev->skin = 0;
+
+	if ( pev->body == -1 )
+	{// -1 chooses a random head
+		pev->body = RANDOM_LONG(0, NUM_SCIENTIST_HEADS-1);// pick a head, any head
+	}
+
+	// Luther is black, make his hands black
+	if ( pev->body == HEAD_LUTHER )
+		pev->skin = 1;
+	
+	MonsterInit();
+	SetUse( FollowerUse );
+}
+
+//=========================================================
+// Precache - precaches all resources this monster needs
+//=========================================================
+void CScientist :: Precache( void )
+{
+	PRECACHE_MODEL("models/scientist.mdl");
+	PRECACHE_SOUND("scientist/sci_pain1.wav");
+	PRECACHE_SOUND("scientist/sci_pain2.wav");
+	PRECACHE_SOUND("scientist/sci_pain3.wav");
+	PRECACHE_SOUND("scientist/sci_pain4.wav");
+	PRECACHE_SOUND("scientist/sci_pain5.wav");
+
+	// every new scientist must call this, otherwise
+	// when a level is loaded, nobody will talk (time is reset to 0)
+	TalkInit();
+
+	CTalkMonster::Precache();
+}	
+
+// Init talk data
+void CScientist :: TalkInit()
+{
+	
+	CTalkMonster::TalkInit();
+
+	// scientist will try to talk to friends in this order:
+
+	m_szFriends[0] = "monster_scientist";
+	m_szFriends[1] = "monster_sitting_scientist";
+	m_szFriends[2] = "monster_barney";
+
+	// scientists speach group names (group names are in sentences.txt)
+
+	m_szGrp[TLK_ANSWER]  =	"SC_ANSWER";
+	m_szGrp[TLK_QUESTION] =	"SC_QUESTION";
+	m_szGrp[TLK_IDLE] =		"SC_IDLE";
+	m_szGrp[TLK_STARE] =	"SC_STARE";
+	m_szGrp[TLK_USE] =		"SC_OK";
+	m_szGrp[TLK_UNUSE] =	"SC_WAIT";
+	m_szGrp[TLK_STOP] =		"SC_STOP";
+	m_szGrp[TLK_NOSHOOT] =	"SC_SCARED";
+	m_szGrp[TLK_HELLO] =	"SC_HELLO";
+
+	m_szGrp[TLK_PLHURT1] =	"!SC_CUREA";
+	m_szGrp[TLK_PLHURT2] =	"!SC_CUREB"; 
+	m_szGrp[TLK_PLHURT3] =	"!SC_CUREC";
+
+	m_szGrp[TLK_PHELLO] =	"SC_PHELLO";
+	m_szGrp[TLK_PIDLE] =	"SC_PIDLE";
+	m_szGrp[TLK_PQUESTION] = "SC_PQUEST";
+	m_szGrp[TLK_SMELL] =	"SC_SMELL";
+	
+	m_szGrp[TLK_WOUND] =	"SC_WOUND";
+	m_szGrp[TLK_MORTAL] =	"SC_MORTAL";
+
+	// get voice for head
+	switch (pev->body % 3)
+	{
+	default:
+	case HEAD_GLASSES:	m_voicePitch = 105; break;	//glasses
+	case HEAD_EINSTEIN: m_voicePitch = 100; break;	//einstein
+	case HEAD_LUTHER:	m_voicePitch = 95;  break;	//luther
+	case HEAD_SLICK:	m_voicePitch = 100;  break;//slick
+	}
+}
+
+int CScientist :: TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType)
+{
+
+	if ( pevInflictor && pevInflictor->flags & FL_CLIENT )
+	{
+		Remember( bits_MEMORY_PROVOKED );
+		StopFollowing( TRUE );
+	}
+
+	// make sure friends talk about it if player hurts scientist...
+	return CTalkMonster::TakeDamage(pevInflictor, pevAttacker, flDamage, bitsDamageType);
+}
+
+
+//=========================================================
+// ISoundMask - returns a bit mask indicating which types
+// of sounds this monster regards. In the base class implementation,
+// monsters care about all sounds, but no scents.
+//=========================================================
+int CScientist :: ISoundMask ( void )
+{
+	return	bits_SOUND_WORLD	|
+			bits_SOUND_COMBAT	|
+			bits_SOUND_DANGER	|
+			bits_SOUND_PLAYER;
+}
+	
+//=========================================================
+// PainSound
+//=========================================================
+void CScientist :: PainSound ( void )
+{
+	if (gpGlobals->time < m_painTime )
+		return;
+	
+	m_painTime = gpGlobals->time + RANDOM_FLOAT(0.5, 0.75);
+
+	switch (RANDOM_LONG(0,4))
+	{
+	case 0: EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, "scientist/sci_pain1.wav", 1, ATTN_NORM, 0, GetVoicePitch()); break;
+	case 1: EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, "scientist/sci_pain2.wav", 1, ATTN_NORM, 0, GetVoicePitch()); break;
+	case 2: EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, "scientist/sci_pain3.wav", 1, ATTN_NORM, 0, GetVoicePitch()); break;
+	case 3: EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, "scientist/sci_pain4.wav", 1, ATTN_NORM, 0, GetVoicePitch()); break;
+	case 4: EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, "scientist/sci_pain5.wav", 1, ATTN_NORM, 0, GetVoicePitch()); break;
+	}
+}
+
+//=========================================================
+// DeathSound 
+//=========================================================
+void CScientist :: DeathSound ( void )
+{
+	PainSound();
+}
+
+
+void CScientist::Killed( entvars_t *pevAttacker, int iGib )
+{
+	SetUse( NULL );	
+	CTalkMonster::Killed( pevAttacker, iGib );
+}
+
+
+void CScientist :: SetActivity ( Activity newActivity )
+{
+	int	iSequence;
+
+	iSequence = LookupActivity ( newActivity );
+
+	// Set to the desired anim, or default anim if the desired is not present
+	if ( iSequence == ACTIVITY_NOT_AVAILABLE )
+		newActivity = ACT_IDLE;
+	CTalkMonster::SetActivity( newActivity );
+}
+
+
+Schedule_t* CScientist :: GetScheduleOfType ( int Type )
+{
+	Schedule_t *psched;
+
+	switch( Type )
+	{
+	// Hook these to make a looping schedule
+	case SCHED_TARGET_FACE:
+		// call base class default so that scientist will talk
+		// when 'used' 
+		psched = CTalkMonster::GetScheduleOfType(Type);
+
+		if (psched == slIdleStand)
+			return slFaceTarget;	// override this for different target face behavior
+		else
+			return psched;
+
+	case SCHED_TARGET_CHASE:
+		return slFollow;
+	
+	case SCHED_CANT_FOLLOW:
+		return slStopFollowing;
+
+	case SCHED_PANIC:
+		return slSciPanic;
+
+	case SCHED_TARGET_CHASE_SCARED:
+		return slFollowScared;
+
+	case SCHED_TARGET_FACE_SCARED:
+		return slFaceTargetScared;
+
+	case SCHED_IDLE_STAND:
+		// call base class default so that scientist will talk
+		// when standing during idle
+		psched = CTalkMonster::GetScheduleOfType(Type);
+
+		if (psched == slIdleStand)
+			return slIdleSciStand;
+		else
+			return psched;
+
+	case SCHED_HIDE:
+		return slScientistHide;
+
+	case SCHED_STARTLE:
+		return slScientistStartle;
+
+	case SCHED_FEAR:
+		return slFear;
+	}
+
+	return CTalkMonster::GetScheduleOfType( Type );
+}
+
+Schedule_t *CScientist :: GetSchedule ( void )
+{
+	// so we don't keep calling through the EHANDLE stuff
+	CBaseEntity *pEnemy = m_hEnemy;
+
+	if ( HasConditions( bits_COND_HEAR_SOUND ) )
+	{
+		CSound *pSound;
+		pSound = PBestSound();
+
+		ASSERT( pSound != NULL );
+		if ( pSound && (pSound->m_iType & bits_SOUND_DANGER) )
+			return GetScheduleOfType( SCHED_TAKE_COVER_FROM_BEST_SOUND );
+	}
+
+	switch( m_MonsterState )
+	{
+	case MONSTERSTATE_ALERT:	
+	case MONSTERSTATE_IDLE:
+		if ( pEnemy )
+		{
+			if ( HasConditions( bits_COND_SEE_ENEMY ) )
+				m_fearTime = gpGlobals->time;
+			else if ( DisregardEnemy( pEnemy ) )		// After 15 seconds of being hidden, return to alert
+			{
+				m_hEnemy = NULL;
+				pEnemy = NULL;
+			}
+		}
+
+		if ( HasConditions(bits_COND_LIGHT_DAMAGE | bits_COND_HEAVY_DAMAGE))
+		{
+			// flinch if hurt
+			return GetScheduleOfType( SCHED_SMALL_FLINCH );
+		}
+
+		// Cower when you hear something scary
+		if ( HasConditions( bits_COND_HEAR_SOUND ) )
+		{
+			CSound *pSound;
+			pSound = PBestSound();
+
+			ASSERT( pSound != NULL );
+			if ( pSound )
+			{
+				if ( pSound->m_iType & (bits_SOUND_DANGER | bits_SOUND_COMBAT) )
+				{
+					if ( gpGlobals->time - m_fearTime > 3 )	// Only cower every 3 seconds or so
+					{
+						m_fearTime = gpGlobals->time;		// Update last fear
+						return GetScheduleOfType( SCHED_STARTLE );	// This will just duck for a second
+					}
+				}
+			}
+		}
+
+		// Behavior for following the player
+		if ( IsFollowing() )
+		{
+			if ( !m_hTargetEnt->IsAlive() )
+			{
+				// UNDONE: Comment about the recently dead player here?
+				StopFollowing( FALSE );
+				break;
+			}
+
+			int relationship = R_NO;
+
+			// Nothing scary, just me and the player
+			if ( pEnemy != NULL )
+				relationship = IRelationship( pEnemy );
+
+			// UNDONE: Model fear properly, fix R_FR and add multiple levels of fear
+			if ( relationship != R_DL && relationship != R_HT )
+			{
+				// If I'm already close enough to my target
+				if ( TargetDistance() <= 128 )
+				{
+					if ( CanHeal() )	// Heal opportunistically
+						return slHeal;
+					if ( HasConditions( bits_COND_CLIENT_PUSH ) )	// Player wants me to move
+						return GetScheduleOfType( SCHED_MOVE_AWAY_FOLLOW );
+				}
+				return GetScheduleOfType( SCHED_TARGET_FACE );	// Just face and follow.
+			}
+			else	// UNDONE: When afraid, scientist won't move out of your way.  Keep This?  If not, write move away scared
+			{
+				if ( HasConditions( bits_COND_NEW_ENEMY ) ) // I just saw something new and scary, react
+					return GetScheduleOfType( SCHED_FEAR );					// React to something scary
+				return GetScheduleOfType( SCHED_TARGET_FACE_SCARED );	// face and follow, but I'm scared!
+			}
+		}
+
+		if ( HasConditions( bits_COND_CLIENT_PUSH ) )	// Player wants me to move
+			return GetScheduleOfType( SCHED_MOVE_AWAY );
+
+		// try to say something about smells
+		TrySmellTalk();
+		break;
+	case MONSTERSTATE_COMBAT:
+		if ( HasConditions( bits_COND_NEW_ENEMY ) )
+			return slFear;					// Point and scream!
+		if ( HasConditions( bits_COND_SEE_ENEMY ) )
+			return slScientistCover;		// Take Cover
+		
+		if ( HasConditions( bits_COND_HEAR_SOUND ) )
+			return slTakeCoverFromBestSound;	// Cower and panic from the scary sound!
+
+		return slScientistCover;			// Run & Cower
+		break;
+	}
+	
+	return CTalkMonster::GetSchedule();
+}
+
+MONSTERSTATE CScientist :: GetIdealState ( void )
+{
+	switch ( m_MonsterState )
+	{
+	case MONSTERSTATE_ALERT:
+	case MONSTERSTATE_IDLE:
+		if ( HasConditions( bits_COND_NEW_ENEMY ) )
+		{
+			if ( IsFollowing() )
+			{
+				int relationship = IRelationship( m_hEnemy );
+				if ( relationship != R_FR || relationship != R_HT && !HasConditions( bits_COND_LIGHT_DAMAGE | bits_COND_HEAVY_DAMAGE ) )
+				{
+					// Don't go to combat if you're following the player
+					m_IdealMonsterState = MONSTERSTATE_ALERT;
+					return m_IdealMonsterState;
+				}
+				StopFollowing( TRUE );
+			}
+		}
+		else if ( HasConditions( bits_COND_LIGHT_DAMAGE | bits_COND_HEAVY_DAMAGE ) )
+		{
+			// Stop following if you take damage
+			if ( IsFollowing() )
+				StopFollowing( TRUE );
+		}
+		break;
+
+	case MONSTERSTATE_COMBAT:
+		{
+			CBaseEntity *pEnemy = m_hEnemy;
+			if ( pEnemy != NULL )
+			{
+				if ( DisregardEnemy( pEnemy ) )		// After 15 seconds of being hidden, return to alert
+				{
+					// Strip enemy when going to alert
+					m_IdealMonsterState = MONSTERSTATE_ALERT;
+					m_hEnemy = NULL;
+					return m_IdealMonsterState;
+				}
+				// Follow if only scared a little
+				if ( m_hTargetEnt != NULL )
+				{
+					m_IdealMonsterState = MONSTERSTATE_ALERT;
+					return m_IdealMonsterState;
+				}
+
+				if ( HasConditions ( bits_COND_SEE_ENEMY ) )
+				{
+					m_fearTime = gpGlobals->time;
+					m_IdealMonsterState = MONSTERSTATE_COMBAT;
+					return m_IdealMonsterState;
+				}
+
+			}
+		}
+		break;
+	}
+
+	return CTalkMonster::GetIdealState();
+}
+
+
+BOOL CScientist::CanHeal( void )
+{ 
+	if ( (m_healTime > gpGlobals->time) || (m_hTargetEnt == NULL) || (m_hTargetEnt->pev->health > (m_hTargetEnt->pev->max_health * 0.5)) )
+		return FALSE;
+
+	return TRUE;
+}
+
+void CScientist::Heal( void )
+{
+	if ( !CanHeal() )
+		return;
+
+	Vector target = m_hTargetEnt->pev->origin - pev->origin;
+	if ( target.Length() > 100 )
+		return;
+
+	m_hTargetEnt->TakeHealth( gSkillData.scientistHeal, DMG_GENERIC );
+	// Don't heal again for 1 minute
+	m_healTime = gpGlobals->time + 60;
+}
+
+int CScientist::FriendNumber( int arrayNumber )
+{
+	static int array[3] = { 1, 2, 0 };
+	if ( arrayNumber < 3 )
+		return array[ arrayNumber ];
+	return arrayNumber;
+}
+
+
+//=========================================================
+// Dead Scientist PROP
+//=========================================================
+class CDeadScientist : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	int	Classify ( void ) { return	CLASS_HUMAN_PASSIVE; }
+
+	void KeyValue( KeyValueData *pkvd );
+	int	m_iPose;// which sequence to display
+	static char *m_szPoses[7];
+};
+char *CDeadScientist::m_szPoses[] = { "lying_on_back", "lying_on_stomach", "dead_sitting", "dead_hang", "dead_table1", "dead_table2", "dead_table3" };
+
+void CDeadScientist::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "pose"))
+	{
+		m_iPose = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseMonster::KeyValue( pkvd );
+}
+LINK_ENTITY_TO_CLASS( monster_scientist_dead, CDeadScientist );
+
+//
+// ********** DeadScientist SPAWN **********
+//
+void CDeadScientist :: Spawn( )
+{
+	PRECACHE_MODEL("models/scientist.mdl");
+	SET_MODEL(ENT(pev), "models/scientist.mdl");
+	
+	pev->effects		= 0;
+	pev->sequence		= 0;
+	// Corpses have less health
+	pev->health			= 8;//gSkillData.scientistHealth;
+	
+	m_bloodColor = BLOOD_COLOR_RED;
+
+	if ( pev->body == -1 )
+	{// -1 chooses a random head
+		pev->body = RANDOM_LONG(0, NUM_SCIENTIST_HEADS-1);// pick a head, any head
+	}
+	// Luther is black, make his hands black
+	if ( pev->body == HEAD_LUTHER )
+		pev->skin = 1;
+	else
+		pev->skin = 0;
+
+	pev->sequence = LookupSequence( m_szPoses[m_iPose] );
+	if (pev->sequence == -1)
+	{
+		ALERT ( at_console, "Dead scientist with bad pose\n" );
+	}
+
+	//	pev->skin += 2; // use bloody skin -- UNDONE: Turn this back on when we have a bloody skin again!
+	MonsterInitDead();
+}
+
+
+//=========================================================
+// Sitting Scientist PROP
+//=========================================================
+
+class CSittingScientist : public CScientist // kdb: changed from public CBaseMonster so he can speak
+{
+public:
+	void Spawn( void );
+	void  Precache( void );
+
+	void EXPORT SittingThink( void );
+	int	Classify ( void );
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	virtual void SetAnswerQuestion( CTalkMonster *pSpeaker );
+	int FriendNumber( int arrayNumber );
+
+	int FIdleSpeak ( void );
+	int		m_baseSequence;	
+	int		m_headTurn;
+	float	m_flResponseDelay;
+};
+
+LINK_ENTITY_TO_CLASS( monster_sitting_scientist, CSittingScientist );
+TYPEDESCRIPTION	CSittingScientist::m_SaveData[] = 
+{
+	// Don't need to save/restore m_baseSequence (recalced)
+	DEFINE_FIELD( CSittingScientist, m_headTurn, FIELD_INTEGER ),
+	DEFINE_FIELD( CSittingScientist, m_flResponseDelay, FIELD_FLOAT ),
+};
+
+IMPLEMENT_SAVERESTORE( CSittingScientist, CScientist );
+
+// animation sequence aliases 
+typedef enum
+{
+SITTING_ANIM_sitlookleft,
+SITTING_ANIM_sitlookright,
+SITTING_ANIM_sitscared,
+SITTING_ANIM_sitting2,
+SITTING_ANIM_sitting3
+} SITTING_ANIM;
+
+
+//
+// ********** Scientist SPAWN **********
+//
+void CSittingScientist :: Spawn( )
+{
+	PRECACHE_MODEL("models/scientist.mdl");
+	SET_MODEL(ENT(pev), "models/scientist.mdl");
+	Precache();
+	InitBoneControllers();
+
+	UTIL_SetSize(pev, Vector(-14, -14, 0), Vector(14, 14, 36));
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_STEP;
+	pev->effects		= 0;
+	pev->health			= 50;
+	
+	m_bloodColor = BLOOD_COLOR_RED;
+	m_flFieldOfView		= VIEW_FIELD_WIDE; // indicates the width of this monster's forward view cone ( as a dotproduct result )
+
+	m_afCapability		= bits_CAP_HEAR | bits_CAP_TURN_HEAD;
+
+	SetBits(pev->spawnflags, SF_MONSTER_PREDISASTER); // predisaster only!
+
+	if ( pev->body == -1 )
+	{// -1 chooses a random head
+		pev->body = RANDOM_LONG(0, NUM_SCIENTIST_HEADS-1);// pick a head, any head
+	}
+	// Luther is black, make his hands black
+	if ( pev->body == HEAD_LUTHER )
+		pev->skin = 1;
+	
+	m_baseSequence = LookupSequence( "sitlookleft" );
+	pev->sequence = m_baseSequence + RANDOM_LONG(0,4);
+	ResetSequenceInfo( );
+	
+	SetThink (SittingThink);
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	DROP_TO_FLOOR ( ENT(pev) );
+}
+
+void CSittingScientist :: Precache( void )
+{
+	m_baseSequence = LookupSequence( "sitlookleft" );
+	TalkInit();
+}
+
+//=========================================================
+// ID as a passive human
+//=========================================================
+int	CSittingScientist :: Classify ( void )
+{
+	return	CLASS_HUMAN_PASSIVE;
+}
+
+
+int CSittingScientist::FriendNumber( int arrayNumber )
+{
+	static int array[3] = { 2, 1, 0 };
+	if ( arrayNumber < 3 )
+		return array[ arrayNumber ];
+	return arrayNumber;
+}
+
+
+
+//=========================================================
+// sit, do stuff
+//=========================================================
+void CSittingScientist :: SittingThink( void )
+{
+	CBaseEntity *pent;	
+
+	StudioFrameAdvance( );
+
+	// try to greet player
+	if (FIdleHello())
+	{
+		pent = FindNearestFriend(TRUE);
+		if (pent)
+		{
+			float yaw = VecToYaw(pent->pev->origin - pev->origin) - pev->angles.y;
+
+			if (yaw > 180) yaw -= 360;
+			if (yaw < -180) yaw += 360;
+				
+			if (yaw > 0)
+				pev->sequence = m_baseSequence + SITTING_ANIM_sitlookleft;
+			else
+				pev->sequence = m_baseSequence + SITTING_ANIM_sitlookright;
+		
+		ResetSequenceInfo( );
+		pev->frame = 0;
+		SetBoneController( 0, 0 );
+		}
+	}
+	else if (m_fSequenceFinished)
+	{
+		int i = RANDOM_LONG(0,99);
+		m_headTurn = 0;
+		
+		if (m_flResponseDelay && gpGlobals->time > m_flResponseDelay)
+		{
+			// respond to question
+			IdleRespond();
+			pev->sequence = m_baseSequence + SITTING_ANIM_sitscared;
+			m_flResponseDelay = 0;
+		}
+		else if (i < 30)
+		{
+			pev->sequence = m_baseSequence + SITTING_ANIM_sitting3;	
+
+			// turn towards player or nearest friend and speak
+
+			if (!FBitSet(m_bitsSaid, bit_saidHelloPlayer))
+				pent = FindNearestFriend(TRUE);
+			else
+				pent = FindNearestFriend(FALSE);
+
+			if (!FIdleSpeak() || !pent)
+			{	
+				m_headTurn = RANDOM_LONG(0,8) * 10 - 40;
+				pev->sequence = m_baseSequence + SITTING_ANIM_sitting3;
+			}
+			else
+			{
+				// only turn head if we spoke
+				float yaw = VecToYaw(pent->pev->origin - pev->origin) - pev->angles.y;
+
+				if (yaw > 180) yaw -= 360;
+				if (yaw < -180) yaw += 360;
+				
+				if (yaw > 0)
+					pev->sequence = m_baseSequence + SITTING_ANIM_sitlookleft;
+				else
+					pev->sequence = m_baseSequence + SITTING_ANIM_sitlookright;
+
+				//ALERT(at_console, "sitting speak\n");
+			}
+		}
+		else if (i < 60)
+		{
+			pev->sequence = m_baseSequence + SITTING_ANIM_sitting3;	
+			m_headTurn = RANDOM_LONG(0,8) * 10 - 40;
+			if (RANDOM_LONG(0,99) < 5)
+			{
+				//ALERT(at_console, "sitting speak2\n");
+				FIdleSpeak();
+			}
+		}
+		else if (i < 80)
+		{
+			pev->sequence = m_baseSequence + SITTING_ANIM_sitting2;
+		}
+		else if (i < 100)
+		{
+			pev->sequence = m_baseSequence + SITTING_ANIM_sitscared;
+		}
+
+		ResetSequenceInfo( );
+		pev->frame = 0;
+		SetBoneController( 0, m_headTurn );
+	}
+	pev->nextthink = gpGlobals->time + 0.1;
+}
+
+// prepare sitting scientist to answer a question
+void CSittingScientist :: SetAnswerQuestion( CTalkMonster *pSpeaker )
+{
+	m_flResponseDelay = gpGlobals->time + RANDOM_FLOAT(3, 4);
+	m_hTalkTarget = (CBaseMonster *)pSpeaker;
+}
+
+
+//=========================================================
+// FIdleSpeak
+// ask question of nearby friend, or make statement
+//=========================================================
+int CSittingScientist :: FIdleSpeak ( void )
+{ 
+	// try to start a conversation, or make statement
+	int pitch;
+	
+	if (!FOkToSpeak())
+		return FALSE;
+
+	// set global min delay for next conversation
+	CTalkMonster::g_talkWaitTime = gpGlobals->time + RANDOM_FLOAT(4.8, 5.2);
+
+	pitch = GetVoicePitch();
+		
+	// if there is a friend nearby to speak to, play sentence, set friend's response time, return
+
+	// try to talk to any standing or sitting scientists nearby
+	CBaseEntity *pentFriend = FindNearestFriend(FALSE);
+
+	if (pentFriend && RANDOM_LONG(0,1))
+	{
+		CTalkMonster *pTalkMonster = GetClassPtr((CTalkMonster *)pentFriend->pev);
+		pTalkMonster->SetAnswerQuestion( this );
+		
+		IdleHeadTurn(pentFriend->pev->origin);
+		SENTENCEG_PlayRndSz( ENT(pev), m_szGrp[TLK_PQUESTION], 1.0, ATTN_IDLE, 0, pitch );
+		// set global min delay for next conversation
+		CTalkMonster::g_talkWaitTime = gpGlobals->time + RANDOM_FLOAT(4.8, 5.2);
+		return TRUE;
+	}
+
+	// otherwise, play an idle statement
+	if (RANDOM_LONG(0,1))
+	{
+		SENTENCEG_PlayRndSz( ENT(pev), m_szGrp[TLK_PIDLE], 1.0, ATTN_IDLE, 0, pitch );
+		// set global min delay for next conversation
+		CTalkMonster::g_talkWaitTime = gpGlobals->time + RANDOM_FLOAT(4.8, 5.2);
+		return TRUE;
+	}
+
+	// never spoke
+	CTalkMonster::g_talkWaitTime = 0;
+	return FALSE;
+}
diff --git a/main/source/dlls/scripted.cpp b/main/source/dlls/scripted.cpp
new file mode 100644
index 00000000..9ce2db02
--- /dev/null
+++ b/main/source/dlls/scripted.cpp
@@ -0,0 +1,1249 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+/*
+
+
+===== scripted.cpp ========================================================
+
+*/
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+
+#ifndef ANIMATION_H
+#include "animation.h"
+#endif
+
+#ifndef SAVERESTORE_H
+#include "saverestore.h"
+#endif
+
+#include "schedule.h"
+#include "scripted.h"
+#include "defaultai.h"
+
+
+
+/*
+classname "scripted_sequence"
+targetname "me" - there can be more than one with the same name, and they act in concert
+target "the_entity_I_want_to_start_playing" or "class entity_classname" will pick the closest inactive scientist
+play "name_of_sequence"
+idle "name of idle sequence to play before starting"
+donetrigger "whatever" - can be any other triggerable entity such as another sequence, train, door, or a special case like "die" or "remove"
+moveto - if set the monster first moves to this nodes position
+range # - only search this far to find the target
+spawnflags - (stop if blocked, stop if player seen)
+*/
+
+
+//
+// Cache user-entity-field values until spawn is called.
+//
+
+void CCineMonster :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "m_iszIdle"))
+	{
+		m_iszIdle = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "m_iszPlay"))
+	{
+		m_iszPlay = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "m_iszEntity"))
+	{
+		m_iszEntity = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "m_fMoveTo"))
+	{
+		m_fMoveTo = atoi( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "m_flRepeat"))
+	{
+		m_flRepeat = atof( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "m_flRadius"))
+	{
+		m_flRadius = atof( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "m_iFinishSchedule"))
+	{
+		m_iFinishSchedule = atoi( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else
+	{
+		CBaseMonster::KeyValue( pkvd );
+	}
+}
+
+TYPEDESCRIPTION	CCineMonster::m_SaveData[] = 
+{
+	DEFINE_FIELD( CCineMonster, m_iszIdle, FIELD_STRING ),
+	DEFINE_FIELD( CCineMonster, m_iszPlay, FIELD_STRING ),
+	DEFINE_FIELD( CCineMonster, m_iszEntity, FIELD_STRING ),
+	DEFINE_FIELD( CCineMonster, m_fMoveTo, FIELD_INTEGER ),
+	DEFINE_FIELD( CCineMonster, m_flRepeat, FIELD_FLOAT ),
+	DEFINE_FIELD( CCineMonster, m_flRadius, FIELD_FLOAT ),
+
+	DEFINE_FIELD( CCineMonster, m_iDelay, FIELD_INTEGER ),
+	DEFINE_FIELD( CCineMonster, m_startTime, FIELD_TIME ),
+
+	DEFINE_FIELD( CCineMonster,	m_saved_movetype, FIELD_INTEGER ),
+	DEFINE_FIELD( CCineMonster,	m_saved_solid, FIELD_INTEGER ),
+	DEFINE_FIELD( CCineMonster, m_saved_effects, FIELD_INTEGER ),
+	DEFINE_FIELD( CCineMonster, m_iFinishSchedule, FIELD_INTEGER ),
+	DEFINE_FIELD( CCineMonster, m_interruptable, FIELD_BOOLEAN ),
+};
+
+
+IMPLEMENT_SAVERESTORE( CCineMonster, CBaseMonster );
+
+LINK_ENTITY_TO_CLASS( scripted_sequence, CCineMonster );
+#define CLASSNAME "scripted_sequence"
+
+LINK_ENTITY_TO_CLASS( aiscripted_sequence, CCineAI );
+
+
+void CCineMonster :: Spawn( void )
+{
+	// pev->solid = SOLID_TRIGGER;
+	// UTIL_SetSize(pev, Vector(-8, -8, -8), Vector(8, 8, 8));
+	pev->solid = SOLID_NOT;
+
+
+	// REMOVE: The old side-effect
+#if 0
+	if ( m_iszIdle )
+		m_fMoveTo = 4;
+#endif
+
+	// if no targetname, start now
+	if ( FStringNull(pev->targetname) || !FStringNull( m_iszIdle ) )
+	{
+		SetThink( &CCineMonster::CineThink );
+		pev->nextthink = gpGlobals->time + 1.0;
+		// Wait to be used?
+		if ( pev->targetname )
+			m_startTime = gpGlobals->time + 1E6;
+	}
+	if ( pev->spawnflags & SF_SCRIPT_NOINTERRUPT )
+		m_interruptable = FALSE;
+	else
+		m_interruptable = TRUE;
+}
+
+//=========================================================
+// FCanOverrideState - returns FALSE, scripted sequences 
+// cannot possess entities regardless of state.
+//=========================================================
+BOOL CCineMonster :: FCanOverrideState( void )
+{
+	if ( pev->spawnflags & SF_SCRIPT_OVERRIDESTATE )
+		return TRUE;
+	return FALSE;
+}
+
+//=========================================================
+// FCanOverrideState - returns true because scripted AI can
+// possess entities regardless of their state.
+//=========================================================
+BOOL CCineAI :: FCanOverrideState( void )
+{
+	return TRUE;
+}
+
+
+//
+// CineStart
+//
+void CCineMonster :: Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	// do I already know who I should use
+	CBaseEntity		*pEntity = m_hTargetEnt;
+	CBaseMonster	*pTarget = NULL;
+
+	if ( pEntity )
+		pTarget = pEntity->MyMonsterPointer();
+
+	if ( pTarget )
+	{
+		// am I already playing the script?
+		if ( pTarget->m_scriptState == SCRIPT_PLAYING )
+			return;
+
+		m_startTime = gpGlobals->time + 0.05;
+	}
+	else
+	{
+		// if not, try finding them
+		SetThink( &CCineMonster::CineThink );
+		pev->nextthink = gpGlobals->time;
+	}
+}
+
+
+// This doesn't really make sense since only MOVETYPE_PUSH get 'Blocked' events
+void CCineMonster :: Blocked( CBaseEntity *pOther )
+{
+
+}
+
+void CCineMonster :: Touch( CBaseEntity *pOther )
+{
+/*
+	ALERT( at_aiconsole, "Cine Touch\n" );
+	if (m_pentTarget && OFFSET(pOther->pev) == OFFSET(m_pentTarget))
+	{
+		CBaseMonster *pTarget = GetClassPtr((CBaseMonster *)VARS(m_pentTarget));
+		pTarget->m_monsterState == MONSTERSTATE_SCRIPT;
+	}
+*/
+}
+
+
+/*
+	entvars_t *pevOther = VARS( gpGlobals->other );
+
+	if ( !FBitSet ( pevOther->flags , FL_MONSTER ) ) 
+	{// touched by a non-monster.
+		return;
+	}
+
+	pevOther->origin.z += 1;
+	
+	if ( FBitSet ( pevOther->flags, FL_ONGROUND ) ) 
+	{// clear the onground so physics don't bitch
+		pevOther->flags -= FL_ONGROUND;
+	}
+
+	// toss the monster!
+	pevOther->velocity = pev->movedir * pev->speed;
+	pevOther->velocity.z += m_flHeight;
+
+
+	pev->solid = SOLID_NOT;// kill the trigger for now !!!UNDONE
+}
+*/
+
+
+//
+// ********** Cinematic DIE **********
+//
+void CCineMonster :: Die( void )
+{
+	SetThink( &CCineMonster::SUB_Remove );
+}
+
+//
+// ********** Cinematic PAIN **********
+//
+void CCineMonster :: Pain( void )
+{
+
+}
+
+//
+// ********** Cinematic Think **********
+//
+
+// find a viable entity
+int CCineMonster :: FindEntity( void )
+{
+	edict_t *pentTarget;
+
+	pentTarget = FIND_ENTITY_BY_TARGETNAME(NULL, STRING(m_iszEntity));
+	m_hTargetEnt = NULL;
+	CBaseMonster	*pTarget = NULL;
+
+	while (!FNullEnt(pentTarget))
+	{
+		if ( FBitSet( VARS(pentTarget)->flags, FL_MONSTER ))
+		{
+			pTarget = GetMonsterPointer( pentTarget );
+			if ( pTarget && pTarget->CanPlaySequence( FCanOverrideState(), SS_INTERRUPT_BY_NAME ) )
+			{
+				m_hTargetEnt = pTarget;
+				return TRUE;
+			}
+			ALERT( at_console, "Found %s, but can't play!\n", STRING(m_iszEntity) );
+		}
+		pentTarget = FIND_ENTITY_BY_TARGETNAME(pentTarget, STRING(m_iszEntity));
+		pTarget = NULL;
+	}
+	
+	if ( !pTarget )
+	{
+		CBaseEntity *pEntity = NULL;
+		while ((pEntity = UTIL_FindEntityInSphere( pEntity, pev->origin, m_flRadius )) != NULL)
+		{
+			if (FClassnameIs( pEntity->pev, STRING(m_iszEntity)))
+			{
+				if ( FBitSet( pEntity->pev->flags, FL_MONSTER ))
+				{
+					pTarget = pEntity->MyMonsterPointer( );
+					if ( pTarget && pTarget->CanPlaySequence( FCanOverrideState(), SS_INTERRUPT_IDLE ) )
+					{
+						m_hTargetEnt = pTarget;
+						return TRUE;
+					}
+				}
+			}
+		}
+	}
+	pTarget = NULL;
+	m_hTargetEnt = NULL;
+	return FALSE;
+}
+
+// make the entity enter a scripted sequence
+void CCineMonster :: PossessEntity( void )
+{
+	CBaseEntity		*pEntity = m_hTargetEnt;
+	CBaseMonster	*pTarget = NULL;
+	if ( pEntity )
+		pTarget = pEntity->MyMonsterPointer();
+
+	if ( pTarget )
+	{
+
+	// FindEntity() just checked this!
+#if 0
+		if ( !pTarget->CanPlaySequence(  FCanOverrideState() ) )
+		{
+			ALERT( at_aiconsole, "Can't possess entity %s\n", STRING(pTarget->pev->classname) );
+			return;
+		}
+#endif
+
+		pTarget->m_pGoalEnt = this;
+		pTarget->m_pCine = this;
+		pTarget->m_hTargetEnt = this;
+
+		m_saved_movetype = pTarget->pev->movetype;
+		m_saved_solid = pTarget->pev->solid;
+		m_saved_effects = pTarget->pev->effects;
+		pTarget->pev->effects |= pev->effects;
+
+		switch (m_fMoveTo)
+		{
+		case 0: 
+			pTarget->m_scriptState = SCRIPT_WAIT; 
+			break;
+
+		case 1: 
+			pTarget->m_scriptState = SCRIPT_WALK_TO_MARK; 
+			DelayStart( 1 ); 
+			break;
+
+		case 2: 
+			pTarget->m_scriptState = SCRIPT_RUN_TO_MARK; 
+			DelayStart( 1 ); 
+			break;
+
+		case 4: 
+			UTIL_SetOrigin( pTarget->pev, pev->origin );
+			pTarget->pev->ideal_yaw = pev->angles.y;
+			pTarget->pev->avelocity = Vector( 0, 0, 0 );
+			pTarget->pev->velocity = Vector( 0, 0, 0 );
+			pTarget->pev->effects |= EF_NOINTERP;
+			pTarget->pev->angles.y = pev->angles.y;
+			pTarget->m_scriptState = SCRIPT_WAIT;
+			m_startTime = gpGlobals->time + 1E6;
+			// UNDONE: Add a flag to do this so people can fixup physics after teleporting monsters
+			//			pTarget->pev->flags &= ~FL_ONGROUND;
+			break;
+		}
+//		ALERT( at_aiconsole, "\"%s\" found and used (INT: %s)\n", STRING( pTarget->pev->targetname ), FBitSet(pev->spawnflags, SF_SCRIPT_NOINTERRUPT)?"No":"Yes" );
+
+		pTarget->m_IdealMonsterState = MONSTERSTATE_SCRIPT;
+		if (m_iszIdle)
+		{
+			StartSequence( pTarget, m_iszIdle, FALSE );
+			if (FStrEq( STRING(m_iszIdle), STRING(m_iszPlay)))
+			{
+				pTarget->pev->framerate = 0;
+			}
+		}
+	}
+}
+
+// make the entity carry out the scripted sequence instructions, but without 
+// destroying the monster's state.
+void CCineAI :: PossessEntity( void )
+{
+	Schedule_t *pNewSchedule;
+
+	CBaseEntity		*pEntity = m_hTargetEnt;
+	CBaseMonster	*pTarget = NULL;
+	if ( pEntity )
+		pTarget = pEntity->MyMonsterPointer();
+
+	if ( pTarget )
+	{
+		if ( !pTarget->CanPlaySequence( FCanOverrideState(), SS_INTERRUPT_AI ) )
+		{
+			ALERT( at_aiconsole, "(AI)Can't possess entity %s\n", STRING(pTarget->pev->classname) );
+			return;
+		}
+
+		pTarget->m_pGoalEnt = this;
+		pTarget->m_pCine = this;
+		pTarget->m_hTargetEnt = this;
+
+		m_saved_movetype = pTarget->pev->movetype;
+		m_saved_solid = pTarget->pev->solid;
+		m_saved_effects = pTarget->pev->effects;
+		pTarget->pev->effects |= pev->effects;
+
+		switch (m_fMoveTo)
+		{
+		case 0: 
+		case 5:
+			pTarget->m_scriptState = SCRIPT_WAIT; 
+			break;
+
+		case 1: 
+			pTarget->m_scriptState = SCRIPT_WALK_TO_MARK; 
+			break;
+
+		case 2: 
+			pTarget->m_scriptState = SCRIPT_RUN_TO_MARK; 
+			break;
+
+		case 4: 
+			// zap the monster instantly to the site of the script entity.
+			UTIL_SetOrigin( pTarget->pev, pev->origin );
+			pTarget->pev->ideal_yaw = pev->angles.y;
+			pTarget->pev->avelocity = Vector( 0, 0, 0 );
+			pTarget->pev->velocity = Vector( 0, 0, 0 );
+			pTarget->pev->effects |= EF_NOINTERP;
+			pTarget->pev->angles.y = pev->angles.y;
+			pTarget->m_scriptState = SCRIPT_WAIT;
+			m_startTime = gpGlobals->time + 1E6;
+			// UNDONE: Add a flag to do this so people can fixup physics after teleporting monsters
+			pTarget->pev->flags &= ~FL_ONGROUND;
+			break;
+		default:
+			ALERT ( at_aiconsole, "aiscript:  invalid Move To Position value!" );
+			break;
+		}
+		
+		ALERT( at_aiconsole, "\"%s\" found and used\n", STRING( pTarget->pev->targetname ) );
+
+		pTarget->m_IdealMonsterState = MONSTERSTATE_SCRIPT;
+
+/*
+		if (m_iszIdle)
+		{
+			StartSequence( pTarget, m_iszIdle, FALSE );
+			if (FStrEq( STRING(m_iszIdle), STRING(m_iszPlay)))
+			{
+				pTarget->pev->framerate = 0;
+			}
+		}
+*/
+		// Already in a scripted state?
+		if ( pTarget->m_MonsterState == MONSTERSTATE_SCRIPT )
+		{
+			pNewSchedule = pTarget->GetScheduleOfType( SCHED_AISCRIPT );
+			pTarget->ChangeSchedule( pNewSchedule );
+		}
+	}
+}
+
+void CCineMonster :: CineThink( void )
+{
+	if (FindEntity())
+	{
+		PossessEntity( );
+		ALERT( at_aiconsole, "script \"%s\" using monster \"%s\"\n", STRING( pev->targetname ), STRING( m_iszEntity ) );
+	}
+	else
+	{
+		CancelScript( );
+		ALERT( at_aiconsole, "script \"%s\" can't find monster \"%s\"\n", STRING( pev->targetname ), STRING( m_iszEntity ) );
+		pev->nextthink = gpGlobals->time + 1.0;
+	}
+}
+
+
+// lookup a sequence name and setup the target monster to play it
+BOOL CCineMonster :: StartSequence( CBaseMonster *pTarget, int iszSeq, BOOL completeOnEmpty )
+{
+	if ( !iszSeq && completeOnEmpty )
+	{
+		SequenceDone( pTarget );
+		return FALSE;
+	}
+
+	pTarget->pev->sequence = pTarget->LookupSequence( STRING( iszSeq ) );
+	if (pTarget->pev->sequence == -1)
+	{
+		ALERT( at_error, "%s: unknown scripted sequence \"%s\"\n", STRING( pTarget->pev->targetname ), STRING( iszSeq) );
+		pTarget->pev->sequence = 0;
+		// return FALSE;
+	}
+
+#if 0
+	char *s;
+	if ( pev->spawnflags & SF_SCRIPT_NOINTERRUPT ) 
+		s = "No";
+	else
+		s = "Yes";
+
+	ALERT( at_console, "%s (%s): started \"%s\":INT:%s\n", STRING( pTarget->pev->targetname ), STRING( pTarget->pev->classname ), STRING( iszSeq), s );
+#endif
+
+	pTarget->pev->frame = 0;
+	pTarget->ResetSequenceInfo( );
+	return TRUE;
+}
+
+// lookup a sequence name and setup the target monster to play it
+// overridden for CCineAI because it's ok for them to not have an animation sequence
+// for the monster to play. For a regular Scripted Sequence, that situation is an error.
+BOOL CCineAI :: StartSequence( CBaseMonster *pTarget, int iszSeq, BOOL completeOnEmpty )
+{
+	if ( iszSeq == 0 && completeOnEmpty )
+	{
+		// no sequence was provided. Just let the monster proceed, however, we still have to fire any Sequence target
+		// and remove any non-repeatable CineAI entities here ( because there is code elsewhere that handles those tasks, but
+		// not until the animation sequence is finished. We have to manually take care of these things where there is no sequence.
+
+		SequenceDone ( pTarget );
+
+		return TRUE;
+	}
+
+	pTarget->pev->sequence = pTarget->LookupSequence( STRING( iszSeq ) );
+
+	if (pTarget->pev->sequence == -1)
+	{
+		ALERT( at_error, "%s: unknown aiscripted sequence \"%s\"\n", STRING( pTarget->pev->targetname ), STRING( iszSeq) );
+		pTarget->pev->sequence = 0;
+		// return FALSE;
+	}
+
+	pTarget->pev->frame = 0;
+	pTarget->ResetSequenceInfo( );
+	return TRUE;
+}
+
+//=========================================================
+// SequenceDone - called when a scripted sequence animation
+// sequence is done playing ( or when an AI Scripted Sequence
+// doesn't supply an animation sequence to play ). Expects
+// the CBaseMonster pointer to the monster that the sequence
+// possesses. 
+//=========================================================
+void CCineMonster :: SequenceDone ( CBaseMonster *pMonster )
+{
+	//ALERT( at_aiconsole, "Sequence %s finished\n", STRING( m_pCine->m_iszPlay ) );
+
+	if ( !( pev->spawnflags & SF_SCRIPT_REPEATABLE ) )
+	{
+		SetThink( &CCineMonster::SUB_Remove );
+		pev->nextthink = gpGlobals->time + 0.1;
+	}
+	
+	// This is done so that another sequence can take over the monster when triggered by the first
+	
+	pMonster->CineCleanup();
+
+	FixScriptMonsterSchedule( pMonster );
+	
+	// This may cause a sequence to attempt to grab this guy NOW, so we have to clear him out
+	// of the existing sequence
+	SUB_UseTargets( NULL, USE_TOGGLE, 0 );
+}
+
+//=========================================================
+// When a monster finishes a scripted sequence, we have to 
+// fix up its state and schedule for it to return to a 
+// normal AI monster. 
+//
+// Scripted sequences just dirty the Schedule and drop the
+// monster in Idle State.
+//=========================================================
+void CCineMonster :: FixScriptMonsterSchedule( CBaseMonster *pMonster )
+{
+	if ( pMonster->m_IdealMonsterState != MONSTERSTATE_DEAD )
+		pMonster->m_IdealMonsterState = MONSTERSTATE_IDLE;
+	pMonster->ClearSchedule();
+}
+
+//=========================================================
+// When a monster finishes a scripted sequence, we have to 
+// fix up its state and schedule for it to return to a 
+// normal AI monster. 
+//
+// AI Scripted sequences will, depending on what the level
+// designer selects:
+//
+// -Dirty the monster's schedule and drop out of the 
+//  sequence in their current state.
+//
+// -Select a specific AMBUSH schedule, regardless of state.
+//=========================================================
+void CCineAI :: FixScriptMonsterSchedule( CBaseMonster *pMonster )
+{
+	switch ( m_iFinishSchedule )
+	{
+		case SCRIPT_FINISHSCHED_DEFAULT:
+			pMonster->ClearSchedule();
+			break;
+		case SCRIPT_FINISHSCHED_AMBUSH:
+			pMonster->ChangeSchedule( pMonster->GetScheduleOfType( SCHED_AMBUSH ) );
+			break;
+		default:
+			ALERT ( at_aiconsole, "FixScriptMonsterSchedule - no case!\n" );
+			pMonster->ClearSchedule();
+			break;
+	}
+}
+
+BOOL CBaseMonster :: ExitScriptedSequence( )
+{
+	if ( pev->deadflag == DEAD_DYING )
+	{
+		// is this legal?
+		// BUGBUG -- This doesn't call Killed()
+		m_IdealMonsterState = MONSTERSTATE_DEAD;
+		return FALSE;
+	}
+
+	if (m_pCine)
+	{
+		m_pCine->CancelScript( );
+	}
+
+	return TRUE;
+}
+
+
+void CCineMonster::AllowInterrupt( BOOL fAllow )
+{
+	if ( pev->spawnflags & SF_SCRIPT_NOINTERRUPT )
+		return;
+	m_interruptable = fAllow;
+}
+
+
+BOOL CCineMonster::CanInterrupt( void )
+{
+	if ( !m_interruptable )
+		return FALSE;
+
+	CBaseEntity *pTarget = m_hTargetEnt;
+
+	if ( pTarget != NULL && pTarget->pev->deadflag == DEAD_NO )
+		return TRUE;
+
+	return FALSE;
+}
+
+
+int	CCineMonster::IgnoreConditions( void )
+{
+	if ( CanInterrupt() )
+		return 0;
+	return SCRIPT_BREAK_CONDITIONS;
+}
+
+
+void ScriptEntityCancel( edict_t *pentCine )
+{
+	// make sure they are a scripted_sequence
+	if (FClassnameIs( pentCine, CLASSNAME ))
+	{
+		CCineMonster *pCineTarget = GetClassPtr((CCineMonster *)VARS(pentCine));
+		// make sure they have a monster in mind for the script
+		CBaseEntity		*pEntity = pCineTarget->m_hTargetEnt;
+		CBaseMonster	*pTarget = NULL;
+		if ( pEntity )
+			pTarget = pEntity->MyMonsterPointer();
+		
+		if (pTarget)
+		{
+			// make sure their monster is actually playing a script
+			if ( pTarget->m_MonsterState == MONSTERSTATE_SCRIPT )
+			{
+				// tell them do die
+				pTarget->m_scriptState = CCineMonster::SCRIPT_CLEANUP;
+				// do it now
+				pTarget->CineCleanup( );
+			}
+		}
+	}
+}
+
+
+// find all the cinematic entities with my targetname and stop them from playing
+void CCineMonster :: CancelScript( void )
+{
+	ALERT( at_aiconsole, "Cancelling script: %s\n", STRING(m_iszPlay) );
+	
+	if ( !pev->targetname )
+	{
+		ScriptEntityCancel( edict() );
+		return;
+	}
+
+	edict_t *pentCineTarget = FIND_ENTITY_BY_TARGETNAME(NULL, STRING(pev->targetname));
+
+	while (!FNullEnt(pentCineTarget))
+	{
+		ScriptEntityCancel( pentCineTarget );
+		pentCineTarget = FIND_ENTITY_BY_TARGETNAME(pentCineTarget, STRING(pev->targetname));
+	}
+}
+
+
+// find all the cinematic entities with my targetname and tell them to wait before starting
+void CCineMonster :: DelayStart( int state )
+{
+	edict_t *pentCine = FIND_ENTITY_BY_TARGETNAME(NULL, STRING(pev->targetname));
+
+	while (!FNullEnt(pentCine))
+	{
+		if (FClassnameIs( pentCine, "scripted_sequence" ))
+		{
+			CCineMonster *pTarget = GetClassPtr((CCineMonster *)VARS(pentCine));
+			if (state)
+			{
+				pTarget->m_iDelay++;
+			}
+			else
+			{
+				pTarget->m_iDelay--;
+				if (pTarget->m_iDelay <= 0)
+					pTarget->m_startTime = gpGlobals->time + 0.05;
+			}
+		}
+		pentCine = FIND_ENTITY_BY_TARGETNAME(pentCine, STRING(pev->targetname));
+	}
+}
+
+
+
+// Find an entity that I'm interested in and precache the sounds he'll need in the sequence.
+void CCineMonster :: Activate( void )
+{
+	edict_t			*pentTarget;
+	CBaseMonster	*pTarget;
+
+	// The entity name could be a target name or a classname
+	// Check the targetname
+	pentTarget = FIND_ENTITY_BY_TARGETNAME(NULL, STRING(m_iszEntity));
+	pTarget = NULL;
+
+	while (!pTarget && !FNullEnt(pentTarget))
+	{
+		if ( FBitSet( VARS(pentTarget)->flags, FL_MONSTER ))
+		{
+			pTarget = GetMonsterPointer( pentTarget );
+		}
+		pentTarget = FIND_ENTITY_BY_TARGETNAME(pentTarget, STRING(m_iszEntity));
+	}
+	
+	// If no entity with that targetname, check the classname
+	if ( !pTarget )
+	{
+		pentTarget = FIND_ENTITY_BY_CLASSNAME(NULL, STRING(m_iszEntity));
+		while (!pTarget && !FNullEnt(pentTarget))
+		{
+			pTarget = GetMonsterPointer( pentTarget );
+			pentTarget = FIND_ENTITY_BY_TARGETNAME(pentTarget, STRING(m_iszEntity));
+		}
+	}
+	// Found a compatible entity
+	if ( pTarget )
+	{
+		void *pmodel;
+		pmodel = GET_MODEL_PTR( pTarget->edict() );
+		if ( pmodel )
+		{
+			// Look through the event list for stuff to precache
+			SequencePrecache( pmodel, STRING( m_iszIdle ) );
+			SequencePrecache( pmodel, STRING( m_iszPlay ) );
+		}
+	}
+}
+
+		
+BOOL CBaseMonster :: CineCleanup( )
+{
+	CCineMonster *pOldCine = m_pCine;
+
+	// am I linked to a cinematic?
+	if (m_pCine)
+	{
+		// okay, reset me to what it thought I was before
+		m_pCine->m_hTargetEnt = NULL;
+		pev->movetype = m_pCine->m_saved_movetype;
+		pev->solid = m_pCine->m_saved_solid;
+		pev->effects = m_pCine->m_saved_effects;
+	}
+	else
+	{
+		// arg, punt
+		pev->movetype = MOVETYPE_STEP;// this is evil
+		pev->solid = SOLID_SLIDEBOX;
+	}
+	m_pCine = NULL;
+	m_hTargetEnt = NULL;
+	m_pGoalEnt = NULL;
+	if (pev->deadflag == DEAD_DYING)
+	{
+		// last frame of death animation?
+		pev->health			= 0;
+		pev->framerate		= 0.0;
+		pev->solid			= SOLID_NOT;
+		SetState( MONSTERSTATE_DEAD );
+		pev->deadflag = DEAD_DEAD;
+		UTIL_SetSize( pev, pev->mins, Vector(pev->maxs.x, pev->maxs.y, pev->mins.z + 2) );
+
+		if ( pOldCine && FBitSet( pOldCine->pev->spawnflags, SF_SCRIPT_LEAVECORPSE ) )
+		{
+			SetUse( NULL );		// BUGBUG -- This doesn't call Killed()
+			SetThink( NULL );	// This will probably break some stuff
+			SetTouch( NULL );
+		}
+		else
+			SUB_StartFadeOut(); // SetThink( SUB_DoNothing );
+		// This turns off animation & physics in case their origin ends up stuck in the world or something
+		StopAnimation();
+		pev->movetype = MOVETYPE_NONE;
+		pev->effects |= EF_NOINTERP;	// Don't interpolate either, assume the corpse is positioned in its final resting place
+		return FALSE;
+	}
+
+	// If we actually played a sequence
+	if ( pOldCine && pOldCine->m_iszPlay )
+	{
+		if ( !(pOldCine->pev->spawnflags & SF_SCRIPT_NOSCRIPTMOVEMENT) )
+		{
+			// reset position
+			Vector new_origin, new_angle;
+			GetBonePosition( 0, new_origin, new_angle );
+
+			// Figure out how far they have moved
+			// We can't really solve this problem because we can't query the movement of the origin relative
+			// to the sequence.  We can get the root bone's position as we do here, but there are
+			// cases where the root bone is in a different relative position to the entity's origin
+			// before/after the sequence plays.  So we are stuck doing this:
+
+			// !!!HACKHACK: Float the origin up and drop to floor because some sequences have
+			// irregular motion that can't be properly accounted for.
+
+			// UNDONE: THIS SHOULD ONLY HAPPEN IF WE ACTUALLY PLAYED THE SEQUENCE.
+			Vector oldOrigin = pev->origin;
+
+			// UNDONE: ugly hack.  Don't move monster if they don't "seem" to move
+			// this really needs to be done with the AX,AY,etc. flags, but that aren't consistantly
+			// being set, so animations that really do move won't be caught.
+			if ((oldOrigin - new_origin).Length2D() < 8.0)
+				new_origin = oldOrigin;
+
+			pev->origin.x = new_origin.x;
+			pev->origin.y = new_origin.y;
+			pev->origin.z += 1;
+
+			pev->flags |= FL_ONGROUND;
+			int drop = DROP_TO_FLOOR( ENT(pev) );
+			
+			// Origin in solid?  Set to org at the end of the sequence
+			if ( drop < 0 )
+				pev->origin = oldOrigin;
+			else if ( drop == 0 ) // Hanging in air?
+			{
+				pev->origin.z = new_origin.z;
+				pev->flags &= ~FL_ONGROUND;
+			}
+			// else entity hit floor, leave there
+
+			// pEntity->pev->origin.z = new_origin.z + 5.0; // damn, got to fix this
+
+			UTIL_SetOrigin( pev, pev->origin );
+			pev->effects |= EF_NOINTERP;
+		}
+
+		// We should have some animation to put these guys in, but for now it's idle.
+		// Due to NOINTERP above, there won't be any blending between this anim & the sequence
+		m_Activity = ACT_RESET;
+	}
+	// set them back into a normal state
+	pev->enemy = NULL;
+	if ( pev->health > 0 )
+		m_IdealMonsterState = MONSTERSTATE_IDLE; // m_previousState;
+	else
+	{
+		// Dropping out because he got killed
+		// Can't call killed() no attacker and weirdness (late gibbing) may result
+		m_IdealMonsterState = MONSTERSTATE_DEAD;
+		SetConditions( bits_COND_LIGHT_DAMAGE );
+		pev->deadflag = DEAD_DYING;
+		FCheckAITrigger();
+		pev->deadflag = DEAD_NO;
+	}
+
+
+	//	SetAnimation( m_MonsterState );
+	ClearBits(pev->spawnflags, SF_MONSTER_WAIT_FOR_SCRIPT );
+
+	return TRUE;
+}
+
+
+
+
+class CScriptedSentence : public CBaseToggle
+{
+public:
+	void Spawn( void );
+	void KeyValue( KeyValueData *pkvd );
+	void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void EXPORT FindThink( void );
+	void EXPORT DelayThink( void );
+	int	 ObjectCaps( void ) { return (CBaseToggle :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION); }
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	CBaseMonster *FindEntity( void );
+	BOOL AcceptableSpeaker( CBaseMonster *pMonster );
+	BOOL StartSentence( CBaseMonster *pTarget );
+
+
+private:
+	int		m_iszSentence;		// string index for idle animation
+	int		m_iszEntity;	// entity that is wanted for this sentence
+	float	m_flRadius;		// range to search
+	float	m_flDuration;	// How long the sentence lasts
+	float	m_flRepeat;	// repeat rate
+	float	m_flAttenuation;
+	float	m_flVolume;
+	BOOL	m_active;
+	int		m_iszListener;	// name of entity to look at while talking
+};
+
+#define SF_SENTENCE_ONCE		0x0001
+#define SF_SENTENCE_FOLLOWERS	0x0002	// only say if following player
+#define SF_SENTENCE_INTERRUPT	0x0004	// force talking except when dead
+#define SF_SENTENCE_CONCURRENT	0x0008	// allow other people to keep talking
+
+TYPEDESCRIPTION	CScriptedSentence::m_SaveData[] = 
+{
+	DEFINE_FIELD( CScriptedSentence, m_iszSentence, FIELD_STRING ),
+	DEFINE_FIELD( CScriptedSentence, m_iszEntity, FIELD_STRING ),
+	DEFINE_FIELD( CScriptedSentence, m_flRadius, FIELD_FLOAT ),
+	DEFINE_FIELD( CScriptedSentence, m_flDuration, FIELD_FLOAT ),
+	DEFINE_FIELD( CScriptedSentence, m_flRepeat, FIELD_FLOAT ),
+	DEFINE_FIELD( CScriptedSentence, m_flAttenuation, FIELD_FLOAT ),
+	DEFINE_FIELD( CScriptedSentence, m_flVolume, FIELD_FLOAT ),
+	DEFINE_FIELD( CScriptedSentence, m_active, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CScriptedSentence, m_iszListener, FIELD_STRING ),
+};
+
+
+IMPLEMENT_SAVERESTORE( CScriptedSentence, CBaseToggle );
+
+LINK_ENTITY_TO_CLASS( scripted_sentence, CScriptedSentence );
+
+void CScriptedSentence :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "sentence"))
+	{
+		m_iszSentence = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "entity"))
+	{
+		m_iszEntity = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "duration"))
+	{
+		m_flDuration = atof( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "radius"))
+	{
+		m_flRadius = atof( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "refire"))
+	{
+		m_flRepeat = atof( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if(FStrEq(pkvd->szKeyName, "attenuation"))
+	{
+		pev->impulse = atoi( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if(FStrEq(pkvd->szKeyName, "volume"))
+	{
+		m_flVolume = atof( pkvd->szValue ) * 0.1;
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "listener"))
+	{
+		m_iszListener = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseToggle::KeyValue( pkvd );
+}
+
+
+void CScriptedSentence :: Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( !m_active )
+		return;
+//	ALERT( at_console, "Firing sentence: %s\n", STRING(m_iszSentence) );
+	SetThink( &CScriptedSentence::FindThink );
+	pev->nextthink = gpGlobals->time;
+}
+
+
+void CScriptedSentence :: Spawn( void )
+{
+	pev->solid = SOLID_NOT;
+	
+	m_active = TRUE;
+	// if no targetname, start now
+	if ( !pev->targetname )
+	{
+		SetThink( &CScriptedSentence::FindThink );
+		pev->nextthink = gpGlobals->time + 1.0;
+	}
+
+	switch( pev->impulse )
+	{
+	case 1: // Medium radius
+		m_flAttenuation = ATTN_STATIC;
+		break;
+	
+	case 2:	// Large radius
+		m_flAttenuation = ATTN_NORM;
+		break;
+
+	case 3:	//EVERYWHERE
+		m_flAttenuation = ATTN_NONE;
+		break;
+	
+	default:
+	case 0: // Small radius
+		m_flAttenuation = ATTN_IDLE;
+		break;
+	}
+	pev->impulse = 0;
+
+	// No volume, use normal
+	if ( m_flVolume <= 0 )
+		m_flVolume = 1.0;
+}
+
+
+void CScriptedSentence :: FindThink( void )
+{
+	CBaseMonster *pMonster = FindEntity();
+	if ( pMonster )
+	{
+		StartSentence( pMonster );
+		if ( pev->spawnflags & SF_SENTENCE_ONCE )
+			UTIL_Remove( this );
+		SetThink( &CScriptedSentence::DelayThink );
+		pev->nextthink = gpGlobals->time + m_flDuration + m_flRepeat;
+		m_active = FALSE;
+//		ALERT( at_console, "%s: found monster %s\n", STRING(m_iszSentence), STRING(m_iszEntity) );
+	}
+	else
+	{
+//		ALERT( at_console, "%s: can't find monster %s\n", STRING(m_iszSentence), STRING(m_iszEntity) );
+		pev->nextthink = gpGlobals->time + m_flRepeat + 0.5;
+	}
+}
+
+
+void CScriptedSentence :: DelayThink( void )
+{
+	m_active = TRUE;
+	if ( !pev->targetname )
+		pev->nextthink = gpGlobals->time + 0.1;
+	SetThink( &CScriptedSentence::FindThink );
+}
+
+
+BOOL CScriptedSentence :: AcceptableSpeaker( CBaseMonster *pMonster )
+{
+	if ( pMonster )
+	{
+		if ( pev->spawnflags & SF_SENTENCE_FOLLOWERS )
+		{
+			if ( pMonster->m_hTargetEnt == NULL || !FClassnameIs(pMonster->m_hTargetEnt->pev, "player") )
+				return FALSE;
+		}
+		BOOL override;
+		if ( pev->spawnflags & SF_SENTENCE_INTERRUPT )
+			override = TRUE;
+		else
+			override = FALSE;
+		if ( pMonster->CanPlaySentence( override ) )
+			return TRUE;
+	}
+	return FALSE;
+}
+
+
+CBaseMonster *CScriptedSentence :: FindEntity( void )
+{
+	edict_t *pentTarget;
+	CBaseMonster *pMonster;
+
+
+	pentTarget = FIND_ENTITY_BY_TARGETNAME(NULL, STRING(m_iszEntity));
+	pMonster = NULL;
+
+	while (!FNullEnt(pentTarget))
+	{
+		pMonster = GetMonsterPointer( pentTarget );
+		if ( pMonster != NULL )
+		{
+			if ( AcceptableSpeaker( pMonster ) )
+				return pMonster;
+//			ALERT( at_console, "%s (%s), not acceptable\n", STRING(pMonster->pev->classname), STRING(pMonster->pev->targetname) );
+		}
+		pentTarget = FIND_ENTITY_BY_TARGETNAME(pentTarget, STRING(m_iszEntity));
+	}
+	
+	CBaseEntity *pEntity = NULL;
+	while ((pEntity = UTIL_FindEntityInSphere( pEntity, pev->origin, m_flRadius )) != NULL)
+	{
+		if (FClassnameIs( pEntity->pev, STRING(m_iszEntity)))
+		{
+			if ( FBitSet( pEntity->pev->flags, FL_MONSTER ))
+			{
+				pMonster = pEntity->MyMonsterPointer( );
+				if ( AcceptableSpeaker( pMonster ) )
+					return pMonster;
+			}
+		}
+	}
+	
+	return NULL;
+}
+
+
+BOOL CScriptedSentence :: StartSentence( CBaseMonster *pTarget )
+{
+	if ( !pTarget )
+	{
+		ALERT( at_aiconsole, "Not Playing sentence %s\n", STRING(m_iszSentence) );
+		return NULL;
+	}
+
+	BOOL bConcurrent = FALSE;
+	if ( !(pev->spawnflags & SF_SENTENCE_CONCURRENT) )
+		bConcurrent = TRUE;
+
+	CBaseEntity *pListener = NULL;
+	if (!FStringNull(m_iszListener))
+	{
+		float radius = m_flRadius;
+
+		if ( FStrEq( STRING(m_iszListener ), "player" ) )
+			radius = 4096;	// Always find the player
+
+		pListener = UTIL_FindEntityGeneric( STRING( m_iszListener ), pTarget->pev->origin, radius );
+	}
+
+	pTarget->PlayScriptedSentence( STRING(m_iszSentence), m_flDuration,  m_flVolume, m_flAttenuation, bConcurrent, pListener );
+	ALERT( at_aiconsole, "Playing sentence %s (%.1f)\n", STRING(m_iszSentence), m_flDuration );
+	SUB_UseTargets( NULL, USE_TOGGLE, 0 );
+	return TRUE;
+}
+
+
+
+
+
+/*
+
+*/
+
+
+#include "dlls/furniture.h"
+
+LINK_ENTITY_TO_CLASS( monster_furniture, CFurniture );
+
+
+//=========================================================
+// Furniture is killed
+//=========================================================
+void CFurniture :: Die ( void )
+{
+	SetThink ( &CFurniture::SUB_Remove );
+	pev->nextthink = gpGlobals->time;
+}
+
+//=========================================================
+// This used to have something to do with bees flying, but 
+// now it only initializes moving furniture in scripted sequences
+//=========================================================
+void CFurniture :: Spawn( )
+{
+	PRECACHE_MODEL((char *)STRING(pev->model));
+	SET_MODEL(ENT(pev),	STRING(pev->model));
+
+	pev->movetype	= MOVETYPE_NONE;
+	pev->solid		= SOLID_BBOX;
+	pev->health		= 80000;
+	pev->takedamage = DAMAGE_AIM;
+	pev->effects		= 0;
+	pev->yaw_speed		= 0;
+	pev->sequence		= 0;
+	pev->frame			= 0;
+
+//	pev->nextthink += 1.0;
+//	SetThink (WalkMonsterDelay);
+
+	ResetSequenceInfo( );
+	pev->frame = 0;
+	MonsterInit();
+}
+
+//=========================================================
+// ID's Furniture as neutral (noone will attack it)
+//=========================================================
+int CFurniture::Classify ( void )
+{
+	return	CLASS_NONE;
+}
+
+
diff --git a/main/source/dlls/scripted.h b/main/source/dlls/scripted.h
new file mode 100644
index 00000000..d83614ad
--- /dev/null
+++ b/main/source/dlls/scripted.h
@@ -0,0 +1,107 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+#ifndef SCRIPTED_H
+#define SCRIPTED_H
+
+#ifndef SCRIPTEVENT_H
+#include "scriptevent.h"
+#endif
+
+#define SF_SCRIPT_WAITTILLSEEN		1
+#define SF_SCRIPT_EXITAGITATED		2
+#define SF_SCRIPT_REPEATABLE		4
+#define SF_SCRIPT_LEAVECORPSE		8
+//#define SF_SCRIPT_INTERPOLATE		16 // don't use, old bug
+#define SF_SCRIPT_NOINTERRUPT		32
+#define SF_SCRIPT_OVERRIDESTATE		64
+#define SF_SCRIPT_NOSCRIPTMOVEMENT	128
+
+#define SCRIPT_BREAK_CONDITIONS		(bits_COND_LIGHT_DAMAGE|bits_COND_HEAVY_DAMAGE)
+
+enum SS_INTERRUPT
+{
+	SS_INTERRUPT_IDLE = 0,
+	SS_INTERRUPT_BY_NAME,
+	SS_INTERRUPT_AI,
+};
+
+// when a monster finishes an AI scripted sequence, we can choose
+// a schedule to place them in. These defines are the aliases to
+// resolve worldcraft input to real schedules (sjb)
+#define SCRIPT_FINISHSCHED_DEFAULT	0
+#define SCRIPT_FINISHSCHED_AMBUSH	1
+
+class CCineMonster : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	virtual void KeyValue( KeyValueData *pkvd );
+	virtual void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	virtual void Blocked( CBaseEntity *pOther );
+	virtual void Touch( CBaseEntity *pOther );
+	virtual int	 ObjectCaps( void ) { return (CBaseMonster :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION); }
+	virtual void Activate( void );
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	// void EXPORT CineSpawnThink( void );
+	void EXPORT CineThink( void );
+	void Pain( void );
+	void Die( void );
+	void DelayStart( int state );
+	BOOL FindEntity( void );
+	virtual void PossessEntity( void );
+
+	void ReleaseEntity( CBaseMonster *pEntity );
+	void CancelScript( void );
+	virtual BOOL StartSequence( CBaseMonster *pTarget, int iszSeq, BOOL completeOnEmpty );
+	virtual BOOL FCanOverrideState ( void );
+	void SequenceDone ( CBaseMonster *pMonster );
+	virtual void FixScriptMonsterSchedule( CBaseMonster *pMonster );
+	BOOL	CanInterrupt( void );
+	void	AllowInterrupt( BOOL fAllow );
+	int		IgnoreConditions( void );
+
+	int	m_iszIdle;		// string index for idle animation
+	int	m_iszPlay;		// string index for scripted animation
+	int m_iszEntity;	// entity that is wanted for this script
+	int m_fMoveTo;
+	int m_iFinishSchedule;
+	float m_flRadius;		// range to search
+	float m_flRepeat;	// repeat rate
+
+	int m_iDelay;
+	float m_startTime;
+
+	int	m_saved_movetype;
+	int	m_saved_solid;
+	int m_saved_effects;
+//	Vector m_vecOrigOrigin;
+	BOOL m_interruptable;
+};
+
+class CCineAI : public CCineMonster
+{
+	BOOL StartSequence( CBaseMonster *pTarget, int iszSeq, BOOL completeOnEmpty );
+	void PossessEntity( void );
+	BOOL FCanOverrideState ( void );
+	virtual void FixScriptMonsterSchedule( CBaseMonster *pMonster );
+};
+
+
+#endif		//SCRIPTED_H
diff --git a/main/source/dlls/scriptevent.h b/main/source/dlls/scriptevent.h
new file mode 100644
index 00000000..d660e4ba
--- /dev/null
+++ b/main/source/dlls/scriptevent.h
@@ -0,0 +1,29 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef SCRIPTEVENT_H
+#define SCRIPTEVENT_H
+
+#define SCRIPT_EVENT_DEAD			1000		// character is now dead
+#define SCRIPT_EVENT_NOINTERRUPT	1001		// does not allow interrupt
+#define SCRIPT_EVENT_CANINTERRUPT	1002		// will allow interrupt
+#define SCRIPT_EVENT_FIREEVENT		1003		// event now fires
+#define SCRIPT_EVENT_SOUND			1004		// Play named wave file (on CHAN_BODY)
+#define SCRIPT_EVENT_SENTENCE		1005		// Play named sentence
+#define SCRIPT_EVENT_INAIR			1006		// Leave the character in air at the end of the sequence (don't find the floor)
+#define SCRIPT_EVENT_ENDANIMATION	1007		// Set the animation by name after the sequence completes
+#define SCRIPT_EVENT_SOUND_VOICE	1008		// Play named wave file (on CHAN_VOICE)
+#define	SCRIPT_EVENT_SENTENCE_RND1	1009		// Play sentence group 25% of the time
+#define SCRIPT_EVENT_NOT_DEAD		1010		// Bring back to life (for life/death sequences)
+#endif   //SCRIPTEVENT_H
diff --git a/main/source/dlls/shotgun.cpp b/main/source/dlls/shotgun.cpp
new file mode 100644
index 00000000..19f5bc6b
--- /dev/null
+++ b/main/source/dlls/shotgun.cpp
@@ -0,0 +1,401 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "player.h"
+#include "gamerules.h"
+
+// special deathmatch shotgun spreads
+#define VECTOR_CONE_DM_SHOTGUN	Vector( 0.08716, 0.04362, 0.00  )// 10 degrees by 5 degrees
+#define VECTOR_CONE_DM_DOUBLESHOTGUN Vector( 0.17365, 0.04362, 0.00 ) // 20 degrees by 5 degrees
+
+enum shotgun_e {
+	SHOTGUN_IDLE = 0,
+	SHOTGUN_FIRE,
+	SHOTGUN_FIRE2,
+	SHOTGUN_RELOAD,
+	SHOTGUN_PUMP,
+	SHOTGUN_START_RELOAD,
+	SHOTGUN_DRAW,
+	SHOTGUN_HOLSTER,
+	SHOTGUN_IDLE4,
+	SHOTGUN_IDLE_DEEP
+};
+
+//LINK_ENTITY_TO_CLASS( weapon_shotgun, CShotgun );
+
+void CShotgun::Spawn( )
+{
+	Precache( );
+	m_iId = WEAPON_SHOTGUN;
+	SET_MODEL(ENT(pev), "models/w_shotgun.mdl");
+
+	m_iDefaultAmmo = SHOTGUN_DEFAULT_GIVE;
+
+	FallInit();// get ready to fall
+}
+
+
+void CShotgun::Precache( void )
+{
+	PRECACHE_MODEL("models/v_shotgun.mdl");
+	PRECACHE_MODEL("models/w_shotgun.mdl");
+	PRECACHE_MODEL("models/p_shotgun.mdl");
+
+	m_iShell = PRECACHE_MODEL ("models/shotgunshell.mdl");// shotgun shell
+
+	PRECACHE_SOUND("items/9mmclip1.wav");              
+
+	PRECACHE_SOUND ("weapons/dbarrel1.wav");//shotgun
+	PRECACHE_SOUND ("weapons/sbarrel1.wav");//shotgun
+
+	PRECACHE_SOUND ("weapons/reload1.wav");	// shotgun reload
+	PRECACHE_SOUND ("weapons/reload3.wav");	// shotgun reload
+
+//	PRECACHE_SOUND ("weapons/sshell1.wav");	// shotgun reload - played on client
+//	PRECACHE_SOUND ("weapons/sshell3.wav");	// shotgun reload - played on client
+	
+	PRECACHE_SOUND ("weapons/357_cock1.wav"); // gun empty sound
+	PRECACHE_SOUND ("weapons/scock1.wav");	// cock gun
+
+	m_usSingleFire = PRECACHE_EVENT( 1, "events/shotgun1.sc" );
+	m_usDoubleFire = PRECACHE_EVENT( 1, "events/shotgun2.sc" );
+}
+
+int CShotgun::AddToPlayer( CBasePlayer *pPlayer )
+{
+	if ( CBasePlayerWeapon::AddToPlayer( pPlayer ) )
+	{
+		MESSAGE_BEGIN( MSG_ONE, gmsgWeapPickup, NULL, pPlayer->pev );
+			WRITE_BYTE( m_iId );
+		MESSAGE_END();
+		return TRUE;
+	}
+	return FALSE;
+}
+
+
+int CShotgun::GetItemInfo(ItemInfo *p)
+{
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = "buckshot";
+	p->iMaxAmmo1 = BUCKSHOT_MAX_CARRY;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = -1;
+	p->iMaxClip = SHOTGUN_MAX_CLIP;
+	p->iSlot = 2;
+	p->iPosition = 1;
+	p->iFlags = 0;
+	p->iId = m_iId = WEAPON_SHOTGUN;
+	p->iWeight = SHOTGUN_WEIGHT;
+
+	return 1;
+}
+
+
+
+BOOL CShotgun::Deploy( )
+{
+	return DefaultDeploy( "models/v_shotgun.mdl", "models/p_shotgun.mdl", SHOTGUN_DRAW, "shotgun" );
+}
+
+void CShotgun::PrimaryAttack()
+{
+	// don't fire underwater
+	if (m_pPlayer->pev->waterlevel == 3)
+	{
+		PlayEmptySound( );
+		m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15;
+		return;
+	}
+
+	if (m_iClip <= 0)
+	{
+		Reload( );
+		if (m_iClip == 0)
+			PlayEmptySound( );
+		return;
+	}
+
+	m_pPlayer->m_iWeaponVolume = LOUD_GUN_VOLUME;
+	m_pPlayer->m_iWeaponFlash = NORMAL_GUN_FLASH;
+
+	m_iClip--;
+
+	int flags;
+#if defined( CLIENT_WEAPONS )
+	flags = FEV_NOTHOST;
+#else
+	flags = 0;
+#endif
+
+
+	m_pPlayer->pev->effects = (int)(m_pPlayer->pev->effects) | EF_MUZZLEFLASH;
+
+	Vector vecSrc	 = m_pPlayer->GetGunPosition( );
+	Vector vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES );
+
+	Vector vecDir;
+
+#ifdef CLIENT_DLL
+	if ( bIsMultiplayer() )
+#else
+	if ( g_pGameRules->IsMultiplayer() )
+#endif
+	{
+		vecDir = m_pPlayer->FireBulletsPlayer( 4, vecSrc, vecAiming, VECTOR_CONE_DM_SHOTGUN, 2048, BULLET_PLAYER_BUCKSHOT, 0, 0, m_pPlayer->pev, m_pPlayer->random_seed );
+	}
+	else
+	{
+		// regular old, untouched spread. 
+		vecDir = m_pPlayer->FireBulletsPlayer( 6, vecSrc, vecAiming, VECTOR_CONE_10DEGREES, 2048, BULLET_PLAYER_BUCKSHOT, 0, 0, m_pPlayer->pev, m_pPlayer->random_seed );
+	}
+
+	PLAYBACK_EVENT_FULL( flags, m_pPlayer->edict(), m_usSingleFire, 0.0, (float *)&g_vecZero, (float *)&g_vecZero, vecDir.x, vecDir.y, 0, 0, 0, 0 );
+
+
+	if (!m_iClip && m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] <= 0)
+		// HEV suit - indicate out of ammo condition
+		m_pPlayer->SetSuitUpdate("!HEV_AMO0", FALSE, 0);
+
+	if (m_iClip != 0)
+		m_flPumpTime = gpGlobals->time + 0.5;
+
+	m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.75;
+	m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 0.75;
+	if (m_iClip != 0)
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 5.0;
+	else
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 0.75;
+	m_fInSpecialReload = 0;
+}
+
+
+void CShotgun::SecondaryAttack( void )
+{
+	// don't fire underwater
+	if (m_pPlayer->pev->waterlevel == 3)
+	{
+		PlayEmptySound( );
+		m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15;
+		return;
+	}
+
+	if (m_iClip <= 1)
+	{
+		Reload( );
+		PlayEmptySound( );
+		return;
+	}
+
+	m_pPlayer->m_iWeaponVolume = LOUD_GUN_VOLUME;
+	m_pPlayer->m_iWeaponFlash = NORMAL_GUN_FLASH;
+
+	m_iClip -= 2;
+
+
+	int flags;
+#if defined( CLIENT_WEAPONS )
+	flags = FEV_NOTHOST;
+#else
+	flags = 0;
+#endif
+
+	m_pPlayer->pev->effects = (int)(m_pPlayer->pev->effects) | EF_MUZZLEFLASH;
+
+	// player "shoot" animation
+	m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
+
+	Vector vecSrc	 = m_pPlayer->GetGunPosition( );
+	Vector vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES );
+
+	Vector vecDir;
+	
+#ifdef CLIENT_DLL
+	if ( bIsMultiplayer() )
+#else
+	if ( g_pGameRules->IsMultiplayer() )
+#endif
+	{
+		// tuned for deathmatch
+		vecDir = m_pPlayer->FireBulletsPlayer( 8, vecSrc, vecAiming, VECTOR_CONE_DM_DOUBLESHOTGUN, 2048, BULLET_PLAYER_BUCKSHOT, 0, 0, m_pPlayer->pev, m_pPlayer->random_seed );
+	}
+	else
+	{
+		// untouched default single player
+		vecDir = m_pPlayer->FireBulletsPlayer( 12, vecSrc, vecAiming, VECTOR_CONE_10DEGREES, 2048, BULLET_PLAYER_BUCKSHOT, 0, 0, m_pPlayer->pev, m_pPlayer->random_seed );
+	}
+		
+	PLAYBACK_EVENT_FULL( flags, m_pPlayer->edict(), m_usDoubleFire, 0.0, (float *)&g_vecZero, (float *)&g_vecZero, vecDir.x, vecDir.y, 0, 0, 0, 0 );
+
+	if (!m_iClip && m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] <= 0)
+		// HEV suit - indicate out of ammo condition
+		m_pPlayer->SetSuitUpdate("!HEV_AMO0", FALSE, 0);
+
+	if (m_iClip != 0)
+		m_flPumpTime = gpGlobals->time + 0.95;
+
+	m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 1.5;
+	m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 1.5;
+	if (m_iClip != 0)
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 6.0;
+	else
+		m_flTimeWeaponIdle = 1.5;
+
+	m_fInSpecialReload = 0;
+
+}
+
+
+void CShotgun::Reload( void )
+{
+	if (m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] <= 0 || m_iClip == SHOTGUN_MAX_CLIP)
+		return;
+
+	// don't reload until recoil is done
+	if (m_flNextPrimaryAttack > UTIL_WeaponTimeBase())
+		return;
+
+	// check to see if we're ready to reload
+	if (m_fInSpecialReload == 0)
+	{
+		SendWeaponAnim( SHOTGUN_START_RELOAD );
+		m_fInSpecialReload = 1;
+		m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 0.6;
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 0.6;
+		m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 1.0;
+		m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 1.0;
+		return;
+	}
+	else if (m_fInSpecialReload == 1)
+	{
+		if (m_flTimeWeaponIdle > UTIL_WeaponTimeBase())
+			return;
+		// was waiting for gun to move to side
+		m_fInSpecialReload = 2;
+
+		if (RANDOM_LONG(0,1))
+			EMIT_SOUND_DYN(ENT(m_pPlayer->pev), CHAN_ITEM, "weapons/reload1.wav", 1, ATTN_NORM, 0, 85 + RANDOM_LONG(0,0x1f));
+		else
+			EMIT_SOUND_DYN(ENT(m_pPlayer->pev), CHAN_ITEM, "weapons/reload3.wav", 1, ATTN_NORM, 0, 85 + RANDOM_LONG(0,0x1f));
+
+		SendWeaponAnim( SHOTGUN_RELOAD );
+
+		m_flNextReload = UTIL_WeaponTimeBase() + 0.5;
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 0.5;
+	}
+	else
+	{
+		// Add them to the clip
+		m_iClip += 1;
+		m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] -= 1;
+		m_fInSpecialReload = 1;
+	}
+}
+
+
+void CShotgun::WeaponIdle( void )
+{
+	ResetEmptySound( );
+
+	m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES );
+
+	if ( m_flPumpTime && m_flPumpTime < gpGlobals->time )
+	{
+		// play pumping sound
+		EMIT_SOUND_DYN(ENT(m_pPlayer->pev), CHAN_ITEM, "weapons/scock1.wav", 1, ATTN_NORM, 0, 95 + RANDOM_LONG(0,0x1f));
+		m_flPumpTime = 0;
+	}
+
+	if (m_flTimeWeaponIdle <  UTIL_WeaponTimeBase() )
+	{
+		if (m_iClip == 0 && m_fInSpecialReload == 0 && m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType])
+		{
+			Reload( );
+		}
+		else if (m_fInSpecialReload != 0)
+		{
+			if (m_iClip != 8 && m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType])
+			{
+				Reload( );
+			}
+			else
+			{
+				// reload debounce has timed out
+				SendWeaponAnim( SHOTGUN_PUMP );
+				
+				// play cocking sound
+				EMIT_SOUND_DYN(ENT(m_pPlayer->pev), CHAN_ITEM, "weapons/scock1.wav", 1, ATTN_NORM, 0, 95 + RANDOM_LONG(0,0x1f));
+				m_fInSpecialReload = 0;
+				m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 1.5;
+			}
+		}
+		else
+		{
+			int iAnim;
+			float flRand = UTIL_SharedRandomFloat( m_pPlayer->random_seed, 0, 1 );
+			if (flRand <= 0.8)
+			{
+				iAnim = SHOTGUN_IDLE_DEEP;
+				m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + (60.0/12.0);// * RANDOM_LONG(2, 5);
+			}
+			else if (flRand <= 0.95)
+			{
+				iAnim = SHOTGUN_IDLE;
+				m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + (20.0/9.0);
+			}
+			else
+			{
+				iAnim = SHOTGUN_IDLE4;
+				m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + (20.0/9.0);
+			}
+			SendWeaponAnim( iAnim );
+		}
+	}
+}
+
+
+
+class CShotgunAmmo : public CBasePlayerAmmo
+{
+	void Spawn( void )
+	{ 
+		Precache( );
+		SET_MODEL(ENT(pev), "models/w_shotbox.mdl");
+		CBasePlayerAmmo::Spawn( );
+	}
+	void Precache( void )
+	{
+		PRECACHE_MODEL ("models/w_shotbox.mdl");
+		PRECACHE_SOUND("items/9mmclip1.wav");
+	}
+	BOOL AddAmmo( CBaseEntity *pOther ) 
+	{ 
+		if (pOther->GiveAmmo( AMMO_BUCKSHOTBOX_GIVE, "buckshot", BUCKSHOT_MAX_CARRY ) != -1)
+		{
+			EMIT_SOUND(ENT(pev), CHAN_ITEM, "items/9mmclip1.wav", 1, ATTN_NORM);
+			return TRUE;
+		}
+		return FALSE;
+	}
+};
+LINK_ENTITY_TO_CLASS( ammo_buckshot, CShotgunAmmo );
+
+
diff --git a/main/source/dlls/singleplay_gamerules.cpp b/main/source/dlls/singleplay_gamerules.cpp
new file mode 100644
index 00000000..160757aa
--- /dev/null
+++ b/main/source/dlls/singleplay_gamerules.cpp
@@ -0,0 +1,328 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// teamplay_gamerules.cpp
+//
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"player.h"
+#include	"weapons.h"
+#include	"gamerules.h"
+#include	"skill.h"
+#include	"items.h"
+
+extern DLL_GLOBAL CGameRules	*g_pGameRules;
+extern DLL_GLOBAL BOOL	g_fGameOver;
+extern int gmsgDeathMsg;	// client dll messages
+extern int gmsgScoreInfo;
+extern int gmsgMOTD;
+
+//=========================================================
+//=========================================================
+CHalfLifeRules::CHalfLifeRules( void )
+{
+	RefreshSkillData();
+}
+
+//=========================================================
+//=========================================================
+void CHalfLifeRules::Think ( void )
+{
+}
+
+//=========================================================
+//=========================================================
+BOOL CHalfLifeRules::IsMultiplayer( void )
+{
+	return FALSE;
+}
+
+//=========================================================
+//=========================================================
+BOOL CHalfLifeRules::IsDeathmatch ( void )
+{
+	return FALSE;
+}
+
+//=========================================================
+//=========================================================
+BOOL CHalfLifeRules::IsCoOp( void )
+{
+	return FALSE;
+}
+
+
+//=========================================================
+//=========================================================
+BOOL CHalfLifeRules::FShouldSwitchWeapon( CBasePlayer *pPlayer, CBasePlayerItem *pWeapon )
+{
+	if ( !pPlayer->m_pActiveItem )
+	{
+		// player doesn't have an active item!
+		return TRUE;
+	}
+
+	if ( !pPlayer->m_pActiveItem->CanHolster() )
+	{
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+//=========================================================
+//=========================================================
+BOOL CHalfLifeRules :: GetNextBestWeapon( CBasePlayer *pPlayer, CBasePlayerItem *pCurrentWeapon )
+{
+	return FALSE;
+}
+
+//=========================================================
+//=========================================================
+BOOL CHalfLifeRules :: ClientConnected( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[ 128 ] )
+{
+	return TRUE;
+}
+
+void CHalfLifeRules :: InitHUD( CBasePlayer *pl )
+{
+}
+
+//=========================================================
+//=========================================================
+void CHalfLifeRules :: ClientDisconnected( edict_t *pClient )
+{
+}
+
+//=========================================================
+//=========================================================
+float CHalfLifeRules::FlPlayerFallDamage( CBasePlayer *pPlayer )
+{
+	// subtract off the speed at which a player is allowed to fall without being hurt,
+	// so damage will be based on speed beyond that, not the entire fall
+	pPlayer->m_flFallVelocity -= PLAYER_MAX_SAFE_FALL_SPEED;
+	return pPlayer->m_flFallVelocity * DAMAGE_FOR_FALL_SPEED;
+}
+
+//=========================================================
+//=========================================================
+void CHalfLifeRules :: PlayerSpawn( CBasePlayer *pPlayer )
+{
+}
+
+//=========================================================
+//=========================================================
+BOOL CHalfLifeRules :: AllowAutoTargetCrosshair( void )
+{
+	return ( g_iSkillLevel == SKILL_EASY );
+}
+
+//=========================================================
+//=========================================================
+void CHalfLifeRules :: PlayerThink( CBasePlayer *pPlayer )
+{
+}
+
+
+//=========================================================
+//=========================================================
+BOOL CHalfLifeRules :: FPlayerCanRespawn( CBasePlayer *pPlayer )
+{
+	return TRUE;
+}
+
+//=========================================================
+//=========================================================
+float CHalfLifeRules :: FlPlayerSpawnTime( CBasePlayer *pPlayer )
+{
+	return gpGlobals->time;//now!
+}
+
+//=========================================================
+// IPointsForKill - how many points awarded to anyone
+// that kills this player?
+//=========================================================
+int CHalfLifeRules :: IPointsForKill( CBasePlayer *pAttacker, CBasePlayer *pKilled )
+{
+	return 1;
+}
+
+//=========================================================
+// PlayerKilled - someone/something killed this player
+//=========================================================
+void CHalfLifeRules :: PlayerKilled( CBasePlayer *pVictim, entvars_t *pKiller, entvars_t *pInflictor )
+{
+}
+
+//=========================================================
+// Deathnotice
+//=========================================================
+void CHalfLifeRules::DeathNotice( CBasePlayer *pVictim, entvars_t *pKiller, entvars_t *pInflictor )
+{
+}
+
+//=========================================================
+// PlayerGotWeapon - player has grabbed a weapon that was
+// sitting in the world
+//=========================================================
+void CHalfLifeRules :: PlayerGotWeapon( CBasePlayer *pPlayer, CBasePlayerItem *pWeapon )
+{
+}
+
+//=========================================================
+// FlWeaponRespawnTime - what is the time in the future
+// at which this weapon may spawn?
+//=========================================================
+float CHalfLifeRules :: FlWeaponRespawnTime( CBasePlayerItem *pWeapon )
+{
+	return -1;
+}
+
+//=========================================================
+// FlWeaponRespawnTime - Returns 0 if the weapon can respawn 
+// now,  otherwise it returns the time at which it can try
+// to spawn again.
+//=========================================================
+float CHalfLifeRules :: FlWeaponTryRespawn( CBasePlayerItem *pWeapon )
+{
+	return 0;
+}
+
+//=========================================================
+// VecWeaponRespawnSpot - where should this weapon spawn?
+// Some game variations may choose to randomize spawn locations
+//=========================================================
+Vector CHalfLifeRules :: VecWeaponRespawnSpot( CBasePlayerItem *pWeapon )
+{
+	return pWeapon->pev->origin;
+}
+
+//=========================================================
+// WeaponShouldRespawn - any conditions inhibiting the
+// respawning of this weapon?
+//=========================================================
+int CHalfLifeRules :: WeaponShouldRespawn( CBasePlayerItem *pWeapon )
+{
+	return GR_WEAPON_RESPAWN_NO;
+}
+
+//=========================================================
+//=========================================================
+BOOL CHalfLifeRules::CanHaveItem( CBasePlayer *pPlayer, CItem *pItem )
+{
+	return TRUE;
+}
+
+//=========================================================
+//=========================================================
+void CHalfLifeRules::PlayerGotItem( CBasePlayer *pPlayer, CItem *pItem )
+{
+}
+
+//=========================================================
+//=========================================================
+int CHalfLifeRules::ItemShouldRespawn( CItem *pItem )
+{
+	return GR_ITEM_RESPAWN_NO;
+}
+
+
+//=========================================================
+// At what time in the future may this Item respawn?
+//=========================================================
+float CHalfLifeRules::FlItemRespawnTime( CItem *pItem )
+{
+	return -1;
+}
+
+//=========================================================
+// Where should this item respawn?
+// Some game variations may choose to randomize spawn locations
+//=========================================================
+Vector CHalfLifeRules::VecItemRespawnSpot( CItem *pItem )
+{
+	return pItem->pev->origin;
+}
+
+//=========================================================
+//=========================================================
+BOOL CHalfLifeRules::IsAllowedToSpawn( CBaseEntity *pEntity )
+{
+	return TRUE;
+}
+
+//=========================================================
+//=========================================================
+void CHalfLifeRules::PlayerGotAmmo( CBasePlayer *pPlayer, char *szName, int iCount )
+{
+}
+
+//=========================================================
+//=========================================================
+int CHalfLifeRules::AmmoShouldRespawn( CBasePlayerAmmo *pAmmo )
+{
+	return GR_AMMO_RESPAWN_NO;
+}
+
+//=========================================================
+//=========================================================
+float CHalfLifeRules::FlAmmoRespawnTime( CBasePlayerAmmo *pAmmo )
+{
+	return -1;
+}
+
+//=========================================================
+//=========================================================
+Vector CHalfLifeRules::VecAmmoRespawnSpot( CBasePlayerAmmo *pAmmo )
+{
+	return pAmmo->pev->origin;
+}
+
+//=========================================================
+//=========================================================
+float CHalfLifeRules::FlHealthChargerRechargeTime( void )
+{
+	return 0;// don't recharge
+}
+
+//=========================================================
+//=========================================================
+int CHalfLifeRules::DeadPlayerWeapons( CBasePlayer *pPlayer )
+{
+	return GR_PLR_DROP_GUN_NO;
+}
+
+//=========================================================
+//=========================================================
+int CHalfLifeRules::DeadPlayerAmmo( CBasePlayer *pPlayer )
+{
+	return GR_PLR_DROP_AMMO_NO;
+}
+
+//=========================================================
+//=========================================================
+int CHalfLifeRules::PlayerRelationship( CBaseEntity *pPlayer, CBaseEntity *pTarget )
+{
+	// why would a single player in half life need this? 
+	return GR_NOTTEAMMATE;
+}
+
+//=========================================================
+//=========================================================
+BOOL CHalfLifeRules :: FAllowMonsters( void )
+{
+	return TRUE;
+}
diff --git a/main/source/dlls/skill.cpp b/main/source/dlls/skill.cpp
new file mode 100644
index 00000000..6718db58
--- /dev/null
+++ b/main/source/dlls/skill.cpp
@@ -0,0 +1,47 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//=========================================================
+// skill.cpp - code for skill level concerns
+//=========================================================
+#include	"extdll.h"
+#include	"util.h"
+#include	"skill.h"
+
+
+skilldata_t	gSkillData;
+
+
+//=========================================================
+// take the name of a cvar, tack a digit for the skill level
+// on, and return the value.of that Cvar 
+//=========================================================
+float GetSkillCvar( char *pName )
+{
+	int		iCount;
+	float	flValue;
+	char	szBuffer[ 64 ];
+	
+	iCount = sprintf( szBuffer, "%s%d",pName, gSkillData.iSkillLevel );
+
+	flValue = CVAR_GET_FLOAT ( szBuffer );
+
+	if ( flValue <= 0 )
+	{
+		ALERT ( at_console, "\n\n** GetSkillCVar Got a zero for %s **\n\n", szBuffer );
+	}
+
+	return flValue;
+}
+
diff --git a/main/source/dlls/skill.h b/main/source/dlls/skill.h
new file mode 100644
index 00000000..d695b0a7
--- /dev/null
+++ b/main/source/dlls/skill.h
@@ -0,0 +1,151 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//=========================================================
+// skill.h - skill level concerns
+//=========================================================
+#ifndef SKILL_H
+#define SKILL_H
+
+struct skilldata_t
+{
+
+	int iSkillLevel; // game skill level
+
+// Monster Health & Damage
+	float	agruntHealth;
+	float agruntDmgPunch;
+
+	float apacheHealth;
+	
+	float barneyHealth;
+
+	float bigmommaHealthFactor;		// Multiply each node's health by this
+	float bigmommaDmgSlash;			// melee attack damage
+	float bigmommaDmgBlast;			// mortar attack damage
+	float bigmommaRadiusBlast;		// mortar attack radius
+
+	float bullsquidHealth;
+	float bullsquidDmgBite;
+	float bullsquidDmgWhip;
+	float bullsquidDmgSpit;
+
+	float gargantuaHealth;
+	float gargantuaDmgSlash;
+	float gargantuaDmgFire;
+	float gargantuaDmgStomp;
+
+	float hassassinHealth;
+
+	float headcrabHealth;
+	float headcrabDmgBite;
+
+	float hgruntHealth;
+	float hgruntDmgKick;
+	float hgruntShotgunPellets;
+	float hgruntGrenadeSpeed;
+
+	float houndeyeHealth;
+	float houndeyeDmgBlast;
+
+	float slaveHealth;
+	float slaveDmgClaw;
+	float slaveDmgClawrake;
+	float slaveDmgZap;
+
+	float ichthyosaurHealth;
+	float ichthyosaurDmgShake;
+
+	float leechHealth;
+	float leechDmgBite;
+
+	float controllerHealth;
+	float controllerDmgZap;
+	float controllerSpeedBall;
+	float controllerDmgBall;
+
+	float nihilanthHealth;
+	float nihilanthZap;
+
+	float scientistHealth;
+
+	float snarkHealth;
+	float snarkDmgBite;
+	float snarkDmgPop;
+
+	float zombieHealth;
+	float zombieDmgOneSlash;
+	float zombieDmgBothSlash;
+
+	float turretHealth;
+	float miniturretHealth;
+	float sentryHealth;
+
+
+// Player Weapons
+	float plrDmgCrowbar;
+	float plrDmg9MM;
+	float plrDmg357;
+	float plrDmgMP5;
+	float plrDmgM203Grenade;
+	float plrDmgBuckshot;
+	float plrDmgCrossbowClient;
+	float plrDmgCrossbowMonster;
+	float plrDmgRPG;
+	float plrDmgGauss;
+	float plrDmgEgonNarrow;
+	float plrDmgEgonWide;
+	float plrDmgHornet;
+	float plrDmgHandGrenade;
+	float plrDmgSatchel;
+	float plrDmgTripmine;
+	
+// weapons shared by monsters
+	float monDmg9MM;
+	float monDmgMP5;
+	float monDmg12MM;
+	float monDmgHornet;
+
+// health/suit charge
+	float suitchargerCapacity;
+	float batteryCapacity;
+	float healthchargerCapacity;
+	float healthkitCapacity;
+	float scientistHeal;
+
+// monster damage adj
+	float monHead;
+	float monChest;
+	float monStomach;
+	float monLeg;
+	float monArm;
+
+// player damage adj
+	float plrHead;
+	float plrChest;
+	float plrStomach;
+	float plrLeg;
+	float plrArm;
+};
+
+extern	DLL_GLOBAL	skilldata_t	gSkillData;
+float GetSkillCvar( char *pName );
+
+extern DLL_GLOBAL int		g_iSkillLevel;
+
+#define SKILL_EASY		1
+#define SKILL_MEDIUM	2
+#define SKILL_HARD		3
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/sound.cpp b/main/source/dlls/sound.cpp
new file mode 100644
index 00000000..a5d77bbe
--- /dev/null
+++ b/main/source/dlls/sound.cpp
@@ -0,0 +1,1990 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//=========================================================
+// sound.cpp 
+//=========================================================
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "weapons.h"
+#include "player.h"
+#include "talkmonster.h"
+#include "gamerules.h"
+#include "mod/AvHSpecials.h"
+
+static char *memfgets( byte *pMemFile, int fileSize, int &filePos, char *pBuffer, int bufferSize );
+
+
+// ==================== GENERIC AMBIENT SOUND ======================================
+
+// runtime pitch shift and volume fadein/out structure
+
+// NOTE: IF YOU CHANGE THIS STRUCT YOU MUST CHANGE THE SAVE/RESTORE VERSION NUMBER
+// SEE BELOW (in the typedescription for the class)
+typedef struct dynpitchvol
+{
+	// NOTE: do not change the order of these parameters 
+	// NOTE: unless you also change order of rgdpvpreset array elements!
+	int preset;
+
+	int pitchrun;		// pitch shift % when sound is running 0 - 255
+	int pitchstart;		// pitch shift % when sound stops or starts 0 - 255
+	int spinup;			// spinup time 0 - 100
+	int spindown;		// spindown time 0 - 100
+
+	int volrun;			// volume change % when sound is running 0 - 10
+	int volstart;		// volume change % when sound stops or starts 0 - 10
+	int fadein;			// volume fade in time 0 - 100
+	int fadeout;		// volume fade out time 0 - 100
+
+						// Low Frequency Oscillator
+	int	lfotype;		// 0) off 1) square 2) triangle 3) random
+	int lforate;		// 0 - 1000, how fast lfo osciallates
+	
+	int lfomodpitch;	// 0-100 mod of current pitch. 0 is off.
+	int lfomodvol;		// 0-100 mod of current volume. 0 is off.
+
+	int cspinup;		// each trigger hit increments counter and spinup pitch
+
+
+	int	cspincount;
+
+	int pitch;			
+	int spinupsav;
+	int spindownsav;
+	int pitchfrac;
+
+	int vol;
+	int fadeinsav;
+	int fadeoutsav;
+	int volfrac;
+
+	int	lfofrac;
+	int	lfomult;
+
+
+} dynpitchvol_t;
+
+#define CDPVPRESETMAX 27
+
+// presets for runtime pitch and vol modulation of ambient sounds
+
+dynpitchvol_t rgdpvpreset[CDPVPRESETMAX] = 
+{
+// pitch	pstart	spinup	spindwn	volrun	volstrt	fadein	fadeout	lfotype	lforate	modptch modvol	cspnup		
+{1,	255,	 75,	95,		95,		10,		1,		50,		95, 	0,		0,		0,		0,		0,		0,0,0,0,0,0,0,0,0,0}, 
+{2,	255,	 85,	70,		88,		10,		1,		20,		88,		0,		0,		0,		0,		0,		0,0,0,0,0,0,0,0,0,0}, 
+{3,	255,	100,	50,		75,		10,		1,		10,		75,		0,		0,		0,		0,		0,		0,0,0,0,0,0,0,0,0,0},
+{4,	100,	100,	0,		0,		10,		1,		90,		90,		0,		0,		0,		0,		0,		0,0,0,0,0,0,0,0,0,0},
+{5,	100,	100,	0,		0,		10,		1,		80,		80,		0,		0,		0,		0,		0,		0,0,0,0,0,0,0,0,0,0},
+{6,	100,	100,	0,		0,		10,		1,		50,		70,		0,		0,		0,		0,		0,		0,0,0,0,0,0,0,0,0,0},
+{7,	100,	100,	0,		0,		 5,		1,		40,		50,		1,		50,		0,		10,		0,		0,0,0,0,0,0,0,0,0,0},
+{8,	100,	100,	0,		0,		 5,		1,		40,		50,		1,		150,	0,		10,		0,		0,0,0,0,0,0,0,0,0,0},
+{9,	100,	100,	0,		0,		 5,		1,		40,		50,		1,		750,	0,		10,		0,		0,0,0,0,0,0,0,0,0,0},
+{10,128,	100,	50,		75,		10,		1,		30,		40,		2,		 8,		20,		0,		0,		0,0,0,0,0,0,0,0,0,0},
+{11,128,	100,	50,		75,		10,		1,		30,		40,		2,		25,		20,		0,		0,		0,0,0,0,0,0,0,0,0,0},
+{12,128,	100,	50,		75,		10,		1,		30,		40,		2,		70,		20,		0,		0,		0,0,0,0,0,0,0,0,0,0},
+{13,50,		 50,	0,		0,		10,		1,		20,		50,		0,		0,		0,		0,		0,		0,0,0,0,0,0,0,0,0,0},
+{14,70,		 70,	0,		0,		10,		1,		20,		50,		0,		0,		0,		0,		0,		0,0,0,0,0,0,0,0,0,0},
+{15,90,		 90,	0,		0,		10,		1,		20,		50,		0,		0,		0,		0,		0,		0,0,0,0,0,0,0,0,0,0},
+{16,120,	120,	0,		0,		10,		1,		20,		50,		0,		0,		0,		0,		0,		0,0,0,0,0,0,0,0,0,0},
+{17,180,	180,	0,		0,		10,		1,		20,		50,		0,		0,		0,		0,		0,		0,0,0,0,0,0,0,0,0,0},
+{18,255,	255,	0,		0,		10,		1,		20,		50,		0,		0,		0,		0,		0,		0,0,0,0,0,0,0,0,0,0},
+{19,200,	 75,	90,		90,		10,		1,		50,		90,		2,		100,	20,		0,		0,		0,0,0,0,0,0,0,0,0,0},
+{20,255,	 75,	97,		90,		10,		1,		50,		90,		1,		40,		50,		0,		0,		0,0,0,0,0,0,0,0,0,0},
+{21,100,	100,	0,		0,		10,		1,		30,		50,		3,		15,		20,		0,		0,		0,0,0,0,0,0,0,0,0,0},
+{22,160,	160,	0,		0,		10,		1,		50,		50,		3,		500,	25,		0,		0,		0,0,0,0,0,0,0,0,0,0},
+{23,255,	 75,	88,		0,		10,		1,		40,		0,		0,		0,		0,		0,		5,		0,0,0,0,0,0,0,0,0,0}, 
+{24,200,	 20,	95,	    70,		10,		1,		70,		70,		3,		20,		50,		0,		0,		0,0,0,0,0,0,0,0,0,0}, 
+{25,180,	100,	50,		60,		10,		1,		40,		60,		2,		90,		100,	100,	0,		0,0,0,0,0,0,0,0,0,0}, 
+{26,60,		 60,	0,		0,		10,		1,		40,		70,		3,		80,		20,		50,		0,		0,0,0,0,0,0,0,0,0,0}, 
+{27,128,	 90,	10,		10,		10,		1,		20,		40,		1,		5,		10,		20,		0,		0,0,0,0,0,0,0,0,0,0}
+};
+
+class CAmbientGeneric : public CBaseEntity
+{
+public:
+	void KeyValue( KeyValueData* pkvd);
+	void Spawn( void );
+	void Precache( void );
+	void EXPORT ToggleUse ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void EXPORT RampThink( void );
+	void InitModulationParms(void);
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+	virtual int	ObjectCaps( void ) { return (CBaseEntity :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION); }
+
+	float m_flAttenuation;		// attenuation value
+	dynpitchvol_t m_dpv;	
+
+	BOOL	m_fActive;	// only TRUE when the entity is playing a looping sound
+	BOOL	m_fLooping;	// TRUE when the sound played will loop
+};
+
+LINK_ENTITY_TO_CLASS( ambient_generic, CAmbientGeneric );
+TYPEDESCRIPTION	CAmbientGeneric::m_SaveData[] = 
+{
+	DEFINE_FIELD( CAmbientGeneric, m_flAttenuation, FIELD_FLOAT ),
+	DEFINE_FIELD( CAmbientGeneric, m_fActive, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CAmbientGeneric, m_fLooping, FIELD_BOOLEAN ),
+
+	// HACKHACK - This is not really in the spirit of the save/restore design, but save this
+	// out as a binary data block.  If the dynpitchvol_t is changed, old saved games will NOT
+	// load these correctly, so bump the save/restore version if you change the size of the struct
+	// The right way to do this is to split the input parms (read in keyvalue) into members and re-init this
+	// struct in Precache(), but it's unlikely that the struct will change, so it's not worth the time right now.
+	DEFINE_ARRAY( CAmbientGeneric, m_dpv, FIELD_CHARACTER, sizeof(dynpitchvol_t) ),
+};
+
+IMPLEMENT_SAVERESTORE( CAmbientGeneric, CBaseEntity );
+
+//
+// ambient_generic - general-purpose user-defined static sound
+//
+void CAmbientGeneric :: Spawn( void )
+{
+/*
+		-1 : "Default"
+		0  : "Everywhere"
+		200 : "Small Radius"
+		125 : "Medium Radius"
+		80  : "Large Radius"
+*/
+
+	if ( FBitSet ( pev->spawnflags, AMBIENT_SOUND_EVERYWHERE) )
+	{
+		m_flAttenuation = ATTN_NONE;
+	}
+	else if ( FBitSet ( pev->spawnflags, AMBIENT_SOUND_SMALLRADIUS) )
+	{
+		m_flAttenuation = ATTN_IDLE;
+	}
+	else if ( FBitSet ( pev->spawnflags, AMBIENT_SOUND_MEDIUMRADIUS) )
+	{
+		m_flAttenuation = ATTN_STATIC;
+	}
+	else if ( FBitSet ( pev->spawnflags, AMBIENT_SOUND_LARGERADIUS) )
+	{
+		m_flAttenuation = ATTN_NORM;
+	}
+	else 
+	{// if the designer didn't set a sound attenuation, default to one.
+		m_flAttenuation = ATTN_STATIC;
+	}
+	
+	char* szSoundFile = (char*) STRING(pev->message);
+
+	if ( FStringNull( pev->message ) || strlen( szSoundFile ) < 1 )
+	{
+		ALERT( at_error, "EMPTY AMBIENT AT: %f, %f, %f\n", pev->origin.x, pev->origin.y, pev->origin.z );
+		pev->nextthink = gpGlobals->time + 0.1;
+		SetThink( &CAmbientGeneric::SUB_Remove );
+		return;
+	}
+    pev->solid		= SOLID_NOT;
+    pev->movetype	= MOVETYPE_NONE;
+
+	// Set up think function for dynamic modification 
+	// of ambient sound's pitch or volume. Don't
+	// start thinking yet.
+
+	SetThink(&CAmbientGeneric::RampThink);
+	pev->nextthink = 0;
+
+	// allow on/off switching via 'use' function.
+
+	SetUse ( &CAmbientGeneric::ToggleUse );
+	
+	m_fActive = FALSE;
+
+	if ( FBitSet ( pev->spawnflags, AMBIENT_SOUND_NOT_LOOPING ) )
+		m_fLooping = FALSE;
+	else
+		m_fLooping = TRUE;
+	Precache( );
+}
+
+
+void CAmbientGeneric :: Precache( void )
+{
+	char* szSoundFile = (char*) STRING(pev->message);
+
+	if ( !FStringNull( pev->message ) && strlen( szSoundFile ) > 1 )
+	{
+		if (*szSoundFile != '!')
+			PRECACHE_SOUND(szSoundFile);
+	}
+	// init all dynamic modulation parms
+	InitModulationParms();
+
+	if ( !FBitSet (pev->spawnflags, AMBIENT_SOUND_START_SILENT ) )
+	{
+		// start the sound ASAP
+		if (m_fLooping)
+			m_fActive = TRUE;
+	}
+	if ( m_fActive )
+	{
+		UTIL_EmitAmbientSound ( ENT(pev), pev->origin, szSoundFile, 
+				(m_dpv.vol * 0.01), m_flAttenuation, SND_SPAWNING, m_dpv.pitch);
+
+		pev->nextthink = gpGlobals->time + 0.1;
+	}
+}
+
+// RampThink - Think at 5hz if we are dynamically modifying 
+// pitch or volume of the playing sound.  This function will
+// ramp pitch and/or volume up or down, modify pitch/volume
+// with lfo if active.
+
+void CAmbientGeneric :: RampThink( void )
+{
+	char* szSoundFile = (char*) STRING(pev->message);
+	int pitch = m_dpv.pitch; 
+	int vol = m_dpv.vol;
+	int flags = 0;
+	int fChanged = 0;		// FALSE if pitch and vol remain unchanged this round
+	int	prev;
+
+	if (!m_dpv.spinup && !m_dpv.spindown && !m_dpv.fadein && !m_dpv.fadeout && !m_dpv.lfotype)
+		return;						// no ramps or lfo, stop thinking
+
+	// ==============
+	// pitch envelope
+	// ==============
+	if (m_dpv.spinup || m_dpv.spindown)
+	{
+		prev = m_dpv.pitchfrac >> 8;
+
+		if (m_dpv.spinup > 0)
+			m_dpv.pitchfrac += m_dpv.spinup;
+		else if (m_dpv.spindown > 0)
+			m_dpv.pitchfrac -= m_dpv.spindown;
+
+		pitch = m_dpv.pitchfrac >> 8;
+		
+		if (pitch > m_dpv.pitchrun)
+		{
+			pitch = m_dpv.pitchrun;
+			m_dpv.spinup = 0;				// done with ramp up
+		}
+
+		if (pitch < m_dpv.pitchstart)
+		{
+			pitch = m_dpv.pitchstart;
+			m_dpv.spindown = 0;				// done with ramp down
+
+			// shut sound off
+			UTIL_EmitAmbientSound(ENT(pev), pev->origin, szSoundFile, 
+					0, 0, SND_STOP, 0);
+
+			// return without setting nextthink
+			return;
+		}
+
+		if (pitch > 255) pitch = 255;
+		if (pitch < 1) pitch = 1;
+
+		m_dpv.pitch = pitch;
+
+		fChanged |= (prev != pitch);
+		flags |= SND_CHANGE_PITCH;
+	}
+
+	// ==================
+	// amplitude envelope
+	// ==================
+	if (m_dpv.fadein || m_dpv.fadeout)
+	{
+		prev = m_dpv.volfrac >> 8;
+
+		if (m_dpv.fadein > 0)
+			m_dpv.volfrac += m_dpv.fadein;
+		else if (m_dpv.fadeout > 0)
+			m_dpv.volfrac -= m_dpv.fadeout;
+
+		vol = m_dpv.volfrac >> 8;
+
+		if (vol > m_dpv.volrun)
+		{
+			vol = m_dpv.volrun;
+			m_dpv.fadein = 0;				// done with ramp up
+		}
+
+		if (vol < m_dpv.volstart)
+		{
+			vol = m_dpv.volstart;
+			m_dpv.fadeout = 0;				// done with ramp down
+			
+			// shut sound off
+			UTIL_EmitAmbientSound(ENT(pev), pev->origin, szSoundFile, 
+					0, 0, SND_STOP, 0);
+
+			// return without setting nextthink
+			return;
+		}
+
+		if (vol > 100) vol = 100;
+		if (vol < 1) vol = 1;
+
+		m_dpv.vol = vol;
+
+		fChanged |= (prev != vol);
+		flags |= SND_CHANGE_VOL;
+	}
+
+	// ===================
+	// pitch/amplitude LFO
+	// ===================
+	if (m_dpv.lfotype)
+	{
+		int pos;
+
+		if (m_dpv.lfofrac > 0x6fffffff)
+			m_dpv.lfofrac = 0;
+
+		// update lfo, lfofrac/255 makes a triangle wave 0-255
+		m_dpv.lfofrac += m_dpv.lforate;
+		pos = m_dpv.lfofrac >> 8;
+
+		if (m_dpv.lfofrac < 0)
+		{
+			m_dpv.lfofrac = 0;
+			m_dpv.lforate = abs(m_dpv.lforate);
+			pos = 0;
+		}
+		else if (pos > 255)
+		{
+			pos = 255;
+			m_dpv.lfofrac = (255 << 8);
+			m_dpv.lforate = -abs(m_dpv.lforate);
+		}
+
+		switch(m_dpv.lfotype)
+		{
+		case LFO_SQUARE:
+			if (pos < 128)
+				m_dpv.lfomult = 255;
+			else
+				m_dpv.lfomult = 0;
+			
+			break;
+		case LFO_RANDOM:
+			if (pos == 255)
+				m_dpv.lfomult = RANDOM_LONG(0, 255);
+			break;
+		case LFO_TRIANGLE:
+		default: 
+			m_dpv.lfomult = pos;
+			break;
+		}
+
+		if (m_dpv.lfomodpitch)
+		{
+			prev = pitch;
+
+			// pitch 0-255
+			pitch += ((m_dpv.lfomult - 128) * m_dpv.lfomodpitch) / 100;
+
+			if (pitch > 255) pitch = 255;
+			if (pitch < 1) pitch = 1;
+
+			
+			fChanged |= (prev != pitch);
+			flags |= SND_CHANGE_PITCH;
+		}
+
+		if (m_dpv.lfomodvol)
+		{
+			// vol 0-100
+			prev = vol;
+
+			vol += ((m_dpv.lfomult - 128) * m_dpv.lfomodvol) / 100;
+
+			if (vol > 100) vol = 100;
+			if (vol < 0) vol = 0;
+			
+			fChanged |= (prev != vol);
+			flags |= SND_CHANGE_VOL;
+		}
+
+	}
+
+	// Send update to playing sound only if we actually changed
+	// pitch or volume in this routine.
+
+	if (flags && fChanged) 
+	{
+		if (pitch == PITCH_NORM)
+			pitch = PITCH_NORM + 1; // don't send 'no pitch' !
+
+		UTIL_EmitAmbientSound(ENT(pev), pev->origin, szSoundFile, 
+				(vol * 0.01), m_flAttenuation, flags, pitch);
+	}
+
+	// update ramps at 5hz
+	pev->nextthink = gpGlobals->time + 0.2;
+	return;
+}
+
+// Init all ramp params in preparation to 
+// play a new sound
+
+void CAmbientGeneric :: InitModulationParms(void)
+{
+	int pitchinc;
+
+	m_dpv.volrun = pev->health * 10;	// 0 - 100
+	if (m_dpv.volrun > 100) m_dpv.volrun = 100;
+	if (m_dpv.volrun < 0) m_dpv.volrun = 0;
+
+	// get presets
+	if (m_dpv.preset != 0 && m_dpv.preset <= CDPVPRESETMAX)
+	{
+		// load preset values
+		m_dpv = rgdpvpreset[m_dpv.preset - 1];
+
+		// fixup preset values, just like
+		// fixups in KeyValue routine.
+		if (m_dpv.spindown > 0)
+			m_dpv.spindown = (101 - m_dpv.spindown) * 64;
+		if (m_dpv.spinup > 0)
+			m_dpv.spinup = (101 - m_dpv.spinup) * 64;
+
+		m_dpv.volstart *= 10;
+		m_dpv.volrun *= 10;
+
+		if (m_dpv.fadein > 0)
+			m_dpv.fadein = (101 - m_dpv.fadein) * 64;
+		if (m_dpv.fadeout > 0)
+			m_dpv.fadeout = (101 - m_dpv.fadeout) * 64;
+
+		m_dpv.lforate *= 256;
+
+		m_dpv.fadeinsav = m_dpv.fadein;
+		m_dpv.fadeoutsav = m_dpv.fadeout;
+		m_dpv.spinupsav = m_dpv.spinup;
+		m_dpv.spindownsav = m_dpv.spindown;
+	}
+
+	m_dpv.fadein = m_dpv.fadeinsav;
+	m_dpv.fadeout = 0; 
+	
+	if (m_dpv.fadein)
+		m_dpv.vol = m_dpv.volstart;
+	else
+		m_dpv.vol = m_dpv.volrun;
+
+	m_dpv.spinup = m_dpv.spinupsav;
+	m_dpv.spindown = 0; 
+
+	if (m_dpv.spinup)
+		m_dpv.pitch = m_dpv.pitchstart;
+	else
+		m_dpv.pitch = m_dpv.pitchrun;
+
+	if (m_dpv.pitch == 0)
+		m_dpv.pitch = PITCH_NORM;
+
+	m_dpv.pitchfrac = m_dpv.pitch << 8;
+	m_dpv.volfrac = m_dpv.vol << 8;
+
+	m_dpv.lfofrac = 0;
+	m_dpv.lforate = abs(m_dpv.lforate);
+
+	m_dpv.cspincount = 1;
+	
+	if (m_dpv.cspinup) 
+	{
+		pitchinc = (255 - m_dpv.pitchstart) / m_dpv.cspinup;
+
+		m_dpv.pitchrun = m_dpv.pitchstart + pitchinc;
+		if (m_dpv.pitchrun > 255) m_dpv.pitchrun = 255;
+	}
+
+	if ((m_dpv.spinupsav || m_dpv.spindownsav || (m_dpv.lfotype && m_dpv.lfomodpitch))
+		&& (m_dpv.pitch == PITCH_NORM))
+		m_dpv.pitch = PITCH_NORM + 1; // must never send 'no pitch' as first pitch
+									  // if we intend to pitch shift later!
+}
+
+//
+// ToggleUse - turns an ambient sound on or off.  If the 
+// ambient is a looping sound, mark sound as active (m_fActive)
+// if it's playing, innactive if not.  If the sound is not
+// a looping sound, never mark it as active.
+//
+void CAmbientGeneric :: ToggleUse ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	char* szSoundFile = (char*) STRING(pev->message);
+	float fraction;
+
+	if ( useType != USE_TOGGLE )
+	{
+		if ( (m_fActive && useType == USE_ON) || (!m_fActive && useType == USE_OFF) )
+			return;
+	}
+	// Directly change pitch if arg passed. Only works if sound is already playing.
+
+	if (useType == USE_SET && m_fActive)		// Momentary buttons will pass down a float in here
+	{
+
+		fraction = value;
+		
+		if ( fraction > 1.0 )
+			fraction = 1.0;
+		if (fraction < 0.0)
+			fraction = 0.01;
+
+		m_dpv.pitch = fraction * 255;
+
+		UTIL_EmitAmbientSound(ENT(pev), pev->origin, szSoundFile, 
+					0, 0, SND_CHANGE_PITCH, m_dpv.pitch);
+
+		return;
+	}
+
+	// Toggle
+
+	// m_fActive is TRUE only if a looping sound is playing.
+	
+	if ( m_fActive )
+	{// turn sound off
+
+		if (m_dpv.cspinup)
+		{
+			// Don't actually shut off. Each toggle causes
+			// incremental spinup to max pitch
+
+			if (m_dpv.cspincount <= m_dpv.cspinup)
+			{	
+				int pitchinc;
+
+				// start a new spinup
+				m_dpv.cspincount++;
+				
+				pitchinc = (255 - m_dpv.pitchstart) / m_dpv.cspinup;
+
+				m_dpv.spinup = m_dpv.spinupsav;
+				m_dpv.spindown = 0;
+
+				m_dpv.pitchrun = m_dpv.pitchstart + pitchinc * m_dpv.cspincount;
+				if (m_dpv.pitchrun > 255) m_dpv.pitchrun = 255;
+
+				pev->nextthink = gpGlobals->time + 0.1;
+			}
+			
+		}
+		else
+		{
+			m_fActive = FALSE;
+			
+			// HACKHACK - this makes the code in Precache() work properly after a save/restore
+			pev->spawnflags |= AMBIENT_SOUND_START_SILENT;
+
+			if (m_dpv.spindownsav || m_dpv.fadeoutsav)
+			{
+				// spin it down (or fade it) before shutoff if spindown is set
+				m_dpv.spindown = m_dpv.spindownsav;
+				m_dpv.spinup = 0;
+
+				m_dpv.fadeout = m_dpv.fadeoutsav;
+				m_dpv.fadein = 0;
+				pev->nextthink = gpGlobals->time + 0.1;
+			}
+			else
+				UTIL_EmitAmbientSound(ENT(pev), pev->origin, szSoundFile, 
+					0, 0, SND_STOP, 0);
+		}
+	}
+	else 
+	{// turn sound on
+
+		// only toggle if this is a looping sound.  If not looping, each
+		// trigger will cause the sound to play.  If the sound is still
+		// playing from a previous trigger press, it will be shut off
+		// and then restarted.
+
+		if (m_fLooping)
+			m_fActive = TRUE;
+		else
+			// shut sound off now - may be interrupting a long non-looping sound
+			UTIL_EmitAmbientSound(ENT(pev), pev->origin, szSoundFile, 
+				0, 0, SND_STOP, 0);
+			
+		// init all ramp params for startup
+
+		InitModulationParms();
+
+		UTIL_EmitAmbientSound(ENT(pev), pev->origin, szSoundFile, 
+				(m_dpv.vol * 0.01), m_flAttenuation, 0, m_dpv.pitch);
+		
+		pev->nextthink = gpGlobals->time + 0.1;
+
+	} 
+}
+// KeyValue - load keyvalue pairs into member data of the
+// ambient generic. NOTE: called BEFORE spawn!
+
+void CAmbientGeneric :: KeyValue( KeyValueData *pkvd )
+{
+	// NOTE: changing any of the modifiers in this code
+	// NOTE: also requires changing InitModulationParms code.
+
+	// preset
+	if (FStrEq(pkvd->szKeyName, "preset"))
+	{
+		m_dpv.preset = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+
+	// pitchrun
+	else if (FStrEq(pkvd->szKeyName, "pitch"))
+	{
+		m_dpv.pitchrun = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+		
+		if (m_dpv.pitchrun > 255) m_dpv.pitchrun = 255;
+		if (m_dpv.pitchrun < 0) m_dpv.pitchrun = 0;
+	}		
+
+	// pitchstart
+	else if (FStrEq(pkvd->szKeyName, "pitchstart"))
+	{
+		m_dpv.pitchstart = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;		
+		
+		if (m_dpv.pitchstart > 255) m_dpv.pitchstart = 255;
+		if (m_dpv.pitchstart < 0) m_dpv.pitchstart = 0;
+	}
+
+	// spinup
+	else if (FStrEq(pkvd->szKeyName, "spinup"))
+	{
+		m_dpv.spinup = atoi(pkvd->szValue);
+		
+		if (m_dpv.spinup > 100) m_dpv.spinup = 100;
+		if (m_dpv.spinup < 0) m_dpv.spinup = 0;
+
+		if (m_dpv.spinup > 0)
+			m_dpv.spinup = (101 - m_dpv.spinup) * 64;
+		m_dpv.spinupsav = m_dpv.spinup;
+		pkvd->fHandled = TRUE;
+	}		
+
+	// spindown
+	else if (FStrEq(pkvd->szKeyName, "spindown"))
+	{
+		m_dpv.spindown = atoi(pkvd->szValue);
+		
+		if (m_dpv.spindown > 100) m_dpv.spindown = 100;
+		if (m_dpv.spindown < 0) m_dpv.spindown = 0;
+
+		if (m_dpv.spindown > 0)
+			m_dpv.spindown = (101 - m_dpv.spindown) * 64;
+		m_dpv.spindownsav = m_dpv.spindown;
+		pkvd->fHandled = TRUE;
+	}
+
+	// volstart
+	else if (FStrEq(pkvd->szKeyName, "volstart"))
+	{
+		m_dpv.volstart = atoi(pkvd->szValue);
+
+		if (m_dpv.volstart > 10) m_dpv.volstart = 10;
+		if (m_dpv.volstart < 0) m_dpv.volstart = 0;
+		
+		m_dpv.volstart *= 10;	// 0 - 100
+
+		pkvd->fHandled = TRUE;
+	}
+
+	// fadein
+	else if (FStrEq(pkvd->szKeyName, "fadein"))
+	{
+		m_dpv.fadein = atoi(pkvd->szValue);
+		
+		if (m_dpv.fadein > 100) m_dpv.fadein = 100;
+		if (m_dpv.fadein < 0) m_dpv.fadein = 0;
+
+		if (m_dpv.fadein > 0)
+			m_dpv.fadein = (101 - m_dpv.fadein) * 64;
+		m_dpv.fadeinsav = m_dpv.fadein;
+		pkvd->fHandled = TRUE;
+	}
+
+	// fadeout
+	else if (FStrEq(pkvd->szKeyName, "fadeout"))
+	{
+		m_dpv.fadeout = atoi(pkvd->szValue);
+		
+		if (m_dpv.fadeout > 100) m_dpv.fadeout = 100;
+		if (m_dpv.fadeout < 0) m_dpv.fadeout = 0;
+
+		if (m_dpv.fadeout > 0)
+			m_dpv.fadeout = (101 - m_dpv.fadeout) * 64;
+		m_dpv.fadeoutsav = m_dpv.fadeout;
+		pkvd->fHandled = TRUE;
+	}
+
+	// lfotype
+	else if (FStrEq(pkvd->szKeyName, "lfotype"))
+	{
+		m_dpv.lfotype = atoi(pkvd->szValue);
+		if (m_dpv.lfotype > 4) m_dpv.lfotype = LFO_TRIANGLE;
+		pkvd->fHandled = TRUE;
+	}
+
+	// lforate
+	else if (FStrEq(pkvd->szKeyName, "lforate"))
+	{
+		m_dpv.lforate = atoi(pkvd->szValue);
+		
+		if (m_dpv.lforate > 1000) m_dpv.lforate = 1000;
+		if (m_dpv.lforate < 0) m_dpv.lforate = 0;
+
+		m_dpv.lforate *= 256;
+
+		pkvd->fHandled = TRUE;
+	}
+	// lfomodpitch
+	else if (FStrEq(pkvd->szKeyName, "lfomodpitch"))
+	{
+		m_dpv.lfomodpitch = atoi(pkvd->szValue);
+		if (m_dpv.lfomodpitch > 100) m_dpv.lfomodpitch = 100;
+		if (m_dpv.lfomodpitch < 0) m_dpv.lfomodpitch = 0;
+		
+
+		pkvd->fHandled = TRUE;
+	}
+
+	// lfomodvol
+	else if (FStrEq(pkvd->szKeyName, "lfomodvol"))
+	{
+		m_dpv.lfomodvol = atoi(pkvd->szValue);
+		if (m_dpv.lfomodvol > 100) m_dpv.lfomodvol = 100;
+		if (m_dpv.lfomodvol < 0) m_dpv.lfomodvol = 0;
+
+		pkvd->fHandled = TRUE;
+	}
+
+	// cspinup
+	else if (FStrEq(pkvd->szKeyName, "cspinup"))
+	{
+		m_dpv.cspinup = atoi(pkvd->szValue);
+		if (m_dpv.cspinup > 100) m_dpv.cspinup = 100;
+		if (m_dpv.cspinup < 0) m_dpv.cspinup = 0;
+
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseEntity::KeyValue( pkvd );
+}
+
+
+// =================== ROOM SOUND FX ==========================================
+
+class CEnvSound : public CPointEntity
+{
+public:
+	void KeyValue( KeyValueData* pkvd);
+	void Spawn( void );
+
+	void Think( void );
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	float m_flRadius;
+	float m_flRoomtype;
+};
+
+LINK_ENTITY_TO_CLASS( env_sound, CEnvSound );
+TYPEDESCRIPTION	CEnvSound::m_SaveData[] = 
+{
+	DEFINE_FIELD( CEnvSound, m_flRadius, FIELD_FLOAT ),
+	DEFINE_FIELD( CEnvSound, m_flRoomtype, FIELD_FLOAT ),
+};
+
+IMPLEMENT_SAVERESTORE( CEnvSound, CBaseEntity );
+
+
+void CEnvSound :: KeyValue( KeyValueData *pkvd )
+{
+	
+	if (FStrEq(pkvd->szKeyName, "radius"))
+	{
+		m_flRadius = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	if (FStrEq(pkvd->szKeyName, "roomtype"))
+	{
+		m_flRoomtype = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+}
+
+// returns TRUE if the given sound entity (pev) is in range 
+// and can see the given player entity (pevTarget)
+
+BOOL FEnvSoundInRange(entvars_t *pev, entvars_t *pevTarget, float *pflRange) 
+{
+	CEnvSound *pSound = GetClassPtr( (CEnvSound *)pev );
+	Vector vecSpot1 = pev->origin + pev->view_ofs;
+	Vector vecSpot2 = pevTarget->origin + pevTarget->view_ofs;
+	Vector vecRange;
+	float flRange;
+	TraceResult tr;
+
+	UTIL_TraceLine(vecSpot1, vecSpot2, ignore_monsters, ENT(pev), &tr);
+	
+	// check if line of sight crosses water boundary, or is blocked
+
+	if ((tr.fInOpen && tr.fInWater) || tr.flFraction != 1)
+		return FALSE;
+
+	// calc range from sound entity to player
+
+	vecRange = tr.vecEndPos - vecSpot1;
+	flRange = vecRange.Length();
+
+	if (pSound->m_flRadius < flRange)		
+		return FALSE;
+	
+	if (pflRange)
+		*pflRange = flRange;
+
+	return TRUE;
+}
+
+//
+// A client that is visible and in range of a sound entity will
+// have its room_type set by that sound entity.  If two or more
+// sound entities are contending for a client, then the nearest
+// sound entity to the client will set the client's room_type.
+// A client's room_type will remain set to its prior value until
+// a new in-range, visible sound entity resets a new room_type.
+//
+
+// CONSIDER: if player in water state, autoset roomtype to 14,15 or 16. 
+
+void CEnvSound :: Think( void )
+{
+	// get pointer to client if visible; FIND_CLIENT_IN_PVS will
+	// cycle through visible clients on consecutive calls.
+
+	edict_t *pentPlayer = FIND_CLIENT_IN_PVS(edict());
+	CBasePlayer *pPlayer = NULL;
+
+	if (FNullEnt(pentPlayer))
+		goto env_sound_Think_slow; // no player in pvs of sound entity, slow it down
+ 
+	pPlayer = GetClassPtr( (CBasePlayer *)VARS(pentPlayer));
+	float flRange;
+
+	// Don't change sound types for players that are being digested
+	if(!GetHasUpgrade(pPlayer->pev->iuser4, MASK_DIGESTING))
+	{
+		// check to see if this is the sound entity that is 
+		// currently affecting this player
+		
+		if(!FNullEnt(pPlayer->m_pentSndLast) && (pPlayer->m_pentSndLast == ENT(pev))) {
+		
+			// this is the entity currently affecting player, check
+			// for validity
+		
+			if (pPlayer->m_flSndRoomtype != 0 && pPlayer->m_flSndRange != 0) {
+			
+				// we're looking at a valid sound entity affecting
+				// player, make sure it's still valid, update range
+		
+				if (FEnvSoundInRange(pev, VARS(pentPlayer), &flRange)) {
+					pPlayer->m_flSndRange = flRange;
+					goto env_sound_Think_fast;
+				} else {
+					
+					// current sound entity affecting player is no longer valid,
+					// flag this state by clearing room_type and range.
+					// NOTE: we do not actually change the player's room_type
+					// NOTE: until we have a new valid room_type to change it to.
+		
+					pPlayer->m_flSndRange = 0;
+					pPlayer->m_flSndRoomtype = 0;
+					goto env_sound_Think_slow;
+				}
+			} else {
+				// entity is affecting player but is out of range,
+				// wait passively for another entity to usurp it...
+				goto env_sound_Think_slow;
+			}
+		}
+		
+		// if we got this far, we're looking at an entity that is contending
+		// for current player sound. the closest entity to player wins.
+		
+		if (FEnvSoundInRange(pev, VARS(pentPlayer), &flRange)) 
+		{
+			if (flRange < pPlayer->m_flSndRange || pPlayer->m_flSndRange == 0) 
+			{
+				// new entity is closer to player, so it wins.
+				pPlayer->m_pentSndLast = ENT(pev);
+				pPlayer->m_flSndRoomtype = m_flRoomtype;
+				pPlayer->m_flSndRange = flRange;
+				
+				// send room_type command to player's server.
+				// this should be a rare event - once per change of room_type
+				// only!
+		
+				//CLIENT_COMMAND(pentPlayer, "room_type %f", m_flRoomtype);
+				
+				MESSAGE_BEGIN( MSG_ONE, SVC_ROOMTYPE, NULL, pentPlayer );		// use the magic #1 for "one client"
+					WRITE_SHORT( (short)m_flRoomtype );					// sequence number
+				MESSAGE_END();
+		
+				// crank up nextthink rate for new active sound entity
+				// by falling through to think_fast...
+			}
+			// player is not closer to the contending sound entity,
+			// just fall through to think_fast. this effectively
+			// cranks up the think_rate of entities near the player.
+		} 
+	}
+	else
+	{
+		int a = 0;
+	}
+
+	// player is in pvs of sound entity, but either not visible or
+	// not in range. do nothing, fall through to think_fast...
+
+env_sound_Think_fast:
+	pev->nextthink = gpGlobals->time + 0.25;
+	return;
+
+env_sound_Think_slow:
+	pev->nextthink = gpGlobals->time + 0.75;
+	return;
+}
+
+//
+// env_sound - spawn a sound entity that will set player roomtype
+// when player moves in range and sight.
+//
+//
+void CEnvSound :: Spawn( )
+{
+	// spread think times
+	pev->nextthink = gpGlobals->time + RANDOM_FLOAT(0.0, 0.5); 
+}
+
+// ==================== SENTENCE GROUPS, UTILITY FUNCTIONS  ======================================
+
+#define CSENTENCE_LRU_MAX	32		// max number of elements per sentence group
+
+// group of related sentences
+
+typedef struct sentenceg
+{
+	char szgroupname[CBSENTENCENAME_MAX];
+	int count;
+	unsigned char rgblru[CSENTENCE_LRU_MAX];
+
+} SENTENCEG;
+
+#define CSENTENCEG_MAX 200					// max number of sentence groups
+// globals
+
+SENTENCEG rgsentenceg[CSENTENCEG_MAX];
+int fSentencesInit = FALSE;
+
+char gszallsentencenames[CVOXFILESENTENCEMAX][CBSENTENCENAME_MAX];
+int gcallsentences = 0;
+
+// randomize list of sentence name indices
+
+void USENTENCEG_InitLRU(unsigned char *plru, int count)
+{
+	int i, j, k;
+	unsigned char temp;
+	
+	if (!fSentencesInit)
+		return;
+
+	if (count > CSENTENCE_LRU_MAX)
+		count = CSENTENCE_LRU_MAX;
+
+	for (i = 0; i < count; i++)
+		plru[i] = (unsigned char) i;
+
+	// randomize array
+	for (i = 0; i < (count * 4); i++)
+	{
+		j = RANDOM_LONG(0,count-1);
+		k = RANDOM_LONG(0,count-1);
+		temp = plru[j];
+		plru[j] = plru[k];
+		plru[k] = temp;
+	}
+}
+
+// ignore lru. pick next sentence from sentence group. Go in order until we hit the last sentence, 
+// then repeat list if freset is true.  If freset is false, then repeat last sentence.
+// ipick is passed in as the requested sentence ordinal.
+// ipick 'next' is returned.  
+// return of -1 indicates an error.
+
+int USENTENCEG_PickSequential(int isentenceg, char *szfound, int ipick, int freset)
+{
+	char *szgroupname;
+	unsigned char count;
+	char sznum[8];
+	
+	if (!fSentencesInit)
+		return -1;
+
+	if (isentenceg < 0)
+		return -1;
+
+	szgroupname = rgsentenceg[isentenceg].szgroupname;
+	count = rgsentenceg[isentenceg].count;
+	
+	if (count == 0)
+		return -1;
+
+	if (ipick >= count)
+		ipick = count-1;
+
+	strcpy(szfound, "!");
+	strcat(szfound, szgroupname);
+	sprintf(sznum, "%d", ipick);
+	strcat(szfound, sznum);
+	
+	if (ipick >= count)
+	{
+		if (freset)
+			// reset at end of list
+			return 0;
+		else
+			return count;
+	}
+
+	return ipick + 1;
+}
+
+
+
+// pick a random sentence from rootname0 to rootnameX.
+// picks from the rgsentenceg[isentenceg] least
+// recently used, modifies lru array. returns the sentencename.
+// note, lru must be seeded with 0-n randomized sentence numbers, with the
+// rest of the lru filled with -1. The first integer in the lru is
+// actually the size of the list.  Returns ipick, the ordinal
+// of the picked sentence within the group.
+
+int USENTENCEG_Pick(int isentenceg, char *szfound)
+{
+	char *szgroupname;
+	unsigned char *plru;
+	unsigned char i;
+	unsigned char count;
+	char sznum[8];
+	unsigned char ipick;
+	int ffound = FALSE;
+	
+	if (!fSentencesInit)
+		return -1;
+
+	if (isentenceg < 0)
+		return -1;
+
+	szgroupname = rgsentenceg[isentenceg].szgroupname;
+	count = rgsentenceg[isentenceg].count;
+	plru = rgsentenceg[isentenceg].rgblru;
+
+	while (!ffound)
+	{
+		for (i = 0; i < count; i++)
+			if (plru[i] != 0xFF)
+			{
+				ipick = plru[i];
+				plru[i] = 0xFF;
+				ffound = TRUE;
+				break;
+			}
+
+		if (!ffound)
+			USENTENCEG_InitLRU(plru, count);
+		else
+		{
+			strcpy(szfound, "!");
+			strcat(szfound, szgroupname);
+			sprintf(sznum, "%d", ipick);
+			strcat(szfound, sznum);
+			return ipick;
+		}
+	}
+	return -1;
+}
+
+// ===================== SENTENCE GROUPS, MAIN ROUTINES ========================
+
+// Given sentence group rootname (name without number suffix),
+// get sentence group index (isentenceg). Returns -1 if no such name.
+
+int SENTENCEG_GetIndex(const char *szgroupname)
+{
+	int i;
+
+	if (!fSentencesInit || !szgroupname)
+		return -1;
+
+	// search rgsentenceg for match on szgroupname
+
+	i = 0;
+	while (rgsentenceg[i].count)
+	{
+		if (!strcmp(szgroupname, rgsentenceg[i].szgroupname))
+			return i;
+	i++;
+	}
+
+	return -1;
+}
+
+// given sentence group index, play random sentence for given entity.
+// returns ipick - which sentence was picked to 
+// play from the group. Ipick is only needed if you plan on stopping
+// the sound before playback is done (see SENTENCEG_Stop).
+
+int SENTENCEG_PlayRndI(edict_t *entity, int isentenceg, 
+					  float volume, float attenuation, int flags, int pitch)
+{
+	char name[64];
+	int ipick;
+
+	if (!fSentencesInit)
+		return -1;
+
+	name[0] = 0;
+
+	ipick = USENTENCEG_Pick(isentenceg, name);
+	if (ipick > 0 && name)
+		EMIT_SOUND_DYN(entity, CHAN_VOICE, name, volume, attenuation, flags, pitch);
+	return ipick;
+}
+
+// same as above, but takes sentence group name instead of index
+
+int SENTENCEG_PlayRndSz(edict_t *entity, const char *szgroupname, 
+					  float volume, float attenuation, int flags, int pitch)
+{
+	char name[64];
+	int ipick;
+	int isentenceg;
+
+	if (!fSentencesInit)
+		return -1;
+
+	name[0] = 0;
+
+	isentenceg = SENTENCEG_GetIndex(szgroupname);
+	if (isentenceg < 0)
+	{
+		ALERT( at_console, "No such sentence group %s\n", szgroupname );
+		return -1;
+	}
+
+	ipick = USENTENCEG_Pick(isentenceg, name);
+	if (ipick >= 0 && name[0])
+		EMIT_SOUND_DYN(entity, CHAN_VOICE, name, volume, attenuation, flags, pitch);
+
+	return ipick;
+}
+
+// play sentences in sequential order from sentence group.  Reset after last sentence.
+
+int SENTENCEG_PlaySequentialSz(edict_t *entity, const char *szgroupname, 
+					  float volume, float attenuation, int flags, int pitch, int ipick, int freset)
+{
+	char name[64];
+	int ipicknext;
+	int isentenceg;
+
+	if (!fSentencesInit)
+		return -1;
+
+	name[0] = 0;
+
+	isentenceg = SENTENCEG_GetIndex(szgroupname);
+	if (isentenceg < 0)
+		return -1;
+
+	ipicknext = USENTENCEG_PickSequential(isentenceg, name, ipick, freset);
+	if (ipicknext >= 0 && name[0])
+		EMIT_SOUND_DYN(entity, CHAN_VOICE, name, volume, attenuation, flags, pitch);
+	return ipicknext;
+}
+
+
+// for this entity, for the given sentence within the sentence group, stop
+// the sentence.
+
+void SENTENCEG_Stop(edict_t *entity, int isentenceg, int ipick)
+{
+	char buffer[64];
+	char sznum[8];
+	
+	if (!fSentencesInit)
+		return;
+
+	if (isentenceg < 0 || ipick < 0)
+		return;
+	
+	strcpy(buffer, "!");
+	strcat(buffer, rgsentenceg[isentenceg].szgroupname);
+	sprintf(sznum, "%d", ipick);
+	strcat(buffer, sznum);
+
+	STOP_SOUND(entity, CHAN_VOICE, buffer);
+}
+
+// open sentences.txt, scan for groups, build rgsentenceg
+// Should be called from world spawn, only works on the
+// first call and is ignored subsequently.
+
+void SENTENCEG_Init()
+{
+	char buffer[512];
+	char szgroup[64];
+	int i, j;
+	int isentencegs;
+
+	if (fSentencesInit)
+		return;
+
+	memset(gszallsentencenames, 0, CVOXFILESENTENCEMAX * CBSENTENCENAME_MAX);
+	gcallsentences = 0;
+
+	memset(rgsentenceg, 0, CSENTENCEG_MAX * sizeof(SENTENCEG));
+	memset(buffer, 0, 512);
+	memset(szgroup, 0, 64);
+	isentencegs = -1;
+
+	
+	int filePos = 0, fileSize;
+	byte *pMemFile = g_engfuncs.pfnLoadFileForMe( "sound/sentences.txt", &fileSize );
+	if ( !pMemFile )
+		return;
+
+	// for each line in the file...
+	while ( memfgets(pMemFile, fileSize, filePos, buffer, 511) != NULL )
+	{
+		// skip whitespace
+		i = 0;
+		while(buffer[i] && buffer[i] == ' ')
+			i++;
+		
+		if (!buffer[i])
+			continue;
+
+		if (buffer[i] == '/' || !isalpha(buffer[i]))
+			continue;
+
+		// get sentence name
+		j = i;
+		while (buffer[j] && buffer[j] != ' ')
+			j++;
+
+		if (!buffer[j])
+			continue;
+
+		if (gcallsentences > CVOXFILESENTENCEMAX)
+		{
+			ALERT (at_error, "Too many sentences in sentences.txt!\n");
+			break;
+		}
+
+		// null-terminate name and save in sentences array
+		buffer[j] = 0;
+		const char *pString = buffer + i;
+
+		if ( strlen( pString ) >= CBSENTENCENAME_MAX )
+			ALERT( at_warning, "Sentence %s longer than %d letters\n", pString, CBSENTENCENAME_MAX-1 );
+
+		strcpy( gszallsentencenames[gcallsentences++], pString );
+
+		j--;
+		if (j <= i)
+			continue;
+		if (!isdigit(buffer[j]))
+			continue;
+
+		// cut out suffix numbers
+		while (j > i && isdigit(buffer[j]))
+			j--;
+
+		if (j <= i)
+			continue;
+
+		buffer[j+1] = 0;
+		
+		// if new name doesn't match previous group name, 
+		// make a new group.
+
+		if (strcmp(szgroup, &(buffer[i])))
+		{
+			// name doesn't match with prev name,
+			// copy name into group, init count to 1
+			isentencegs++;
+			if (isentencegs >= CSENTENCEG_MAX)
+			{
+				ALERT (at_error, "Too many sentence groups in sentences.txt!\n");
+				break;
+			}
+
+			strcpy(rgsentenceg[isentencegs].szgroupname, &(buffer[i]));
+			rgsentenceg[isentencegs].count = 1;
+
+			strcpy(szgroup, &(buffer[i]));
+
+			continue;
+		}
+		else
+		{
+			//name matches with previous, increment group count
+			if (isentencegs >= 0)
+				rgsentenceg[isentencegs].count++;
+		}
+	}
+
+	g_engfuncs.pfnFreeFile( pMemFile );
+	
+	fSentencesInit = TRUE;
+
+	// init lru lists
+
+	i = 0;
+
+	while (rgsentenceg[i].count && i < CSENTENCEG_MAX)
+	{
+		USENTENCEG_InitLRU(&(rgsentenceg[i].rgblru[0]), rgsentenceg[i].count);
+		i++;
+	}
+
+}
+
+// convert sentence (sample) name to !sentencenum, return !sentencenum
+
+int SENTENCEG_Lookup(const char *sample, char *sentencenum)
+{
+	char sznum[8];
+
+//#ifdef GERMANY
+//	return -1; // no constructed sentences in international versions
+//#endif // GERMANY
+
+	int i;
+	// this is a sentence name; lookup sentence number
+	// and give to engine as string.
+	for (i = 0; i < gcallsentences; i++)
+		if (!stricmp(gszallsentencenames[i], sample+1))
+		{
+			if (sentencenum)
+			{
+				strcpy(sentencenum, "!");
+				sprintf(sznum, "%d", i);
+				strcat(sentencenum, sznum);
+			}
+			return i;
+		}
+	// sentence name not found!
+	return -1;
+}
+
+void EMIT_SOUND_DYN(edict_t *entity, int channel, const char *sample, float volume, float attenuation,
+						   int flags, int pitch)
+{
+	if (sample && *sample == '!')
+	{
+		char name[32];
+		if (SENTENCEG_Lookup(sample, name) >= 0)
+				EMIT_SOUND_DYN2(entity, channel, name, volume, attenuation, flags, pitch);
+		else
+			ALERT( at_aiconsole, "Unable to find %s in sentences.txt\n", sample );
+	}
+	else
+		EMIT_SOUND_DYN2(entity, channel, sample, volume, attenuation, flags, pitch);
+}
+
+// play a specific sentence over the HEV suit speaker - just pass player entity, and !sentencename
+
+void EMIT_SOUND_SUIT(edict_t *entity, const char *sample)
+{
+	float fvol;
+	int pitch = PITCH_NORM;
+
+	fvol = CVAR_GET_FLOAT("suitvolume");
+	if (RANDOM_LONG(0,1))
+		pitch = RANDOM_LONG(0,6) + 98;
+
+	if (fvol > 0.05)
+		EMIT_SOUND_DYN(entity, CHAN_STATIC, sample, fvol, ATTN_NORM, 0, pitch);
+}
+
+// play a sentence, randomly selected from the passed in group id, over the HEV suit speaker
+
+void EMIT_GROUPID_SUIT(edict_t *entity, int isentenceg)
+{
+	float fvol;
+	int pitch = PITCH_NORM;
+
+	fvol = CVAR_GET_FLOAT("suitvolume");
+	if (RANDOM_LONG(0,1))
+		pitch = RANDOM_LONG(0,6) + 98;
+
+	if (fvol > 0.05)
+		SENTENCEG_PlayRndI(entity, isentenceg, fvol, ATTN_NORM, 0, pitch);
+}
+
+// play a sentence, randomly selected from the passed in groupname
+
+void EMIT_GROUPNAME_SUIT(edict_t *entity, const char *groupname)
+{
+	float fvol;
+	int pitch = PITCH_NORM;
+
+	fvol = CVAR_GET_FLOAT("suitvolume");
+	if (RANDOM_LONG(0,1))
+		pitch = RANDOM_LONG(0,6) + 98;
+
+	if (fvol > 0.05)
+		SENTENCEG_PlayRndSz(entity, groupname, fvol, ATTN_NORM, 0, pitch);
+}
+
+// ===================== MATERIAL TYPE DETECTION, MAIN ROUTINES ========================
+// 
+// Used to detect the texture the player is standing on, map the
+// texture name to a material type.  Play footstep sound based
+// on material type.
+
+int fTextureTypeInit = FALSE;
+
+#define CTEXTURESMAX		512			// max number of textures loaded
+
+int gcTextures = 0;
+char grgszTextureName[CTEXTURESMAX][CBTEXTURENAMEMAX];	// texture names
+char grgchTextureType[CTEXTURESMAX];						// parallel array of texture types
+
+// open materials.txt,  get size, alloc space, 
+// save in array.  Only works first time called, 
+// ignored on subsequent calls.
+
+static char *memfgets( byte *pMemFile, int fileSize, int &filePos, char *pBuffer, int bufferSize )
+{
+	// Bullet-proofing
+	if ( !pMemFile || !pBuffer )
+		return NULL;
+
+	if ( filePos >= fileSize )
+		return NULL;
+
+	int i = filePos;
+	int last = fileSize;
+
+	// fgets always NULL terminates, so only read bufferSize-1 characters
+	if ( last - filePos > (bufferSize-1) )
+		last = filePos + (bufferSize-1);
+
+	int stop = 0;
+
+	// Stop at the next newline (inclusive) or end of buffer
+	while ( i < last && !stop )
+	{
+		if ( pMemFile[i] == '\n' )
+			stop = 1;
+		i++;
+	}
+
+
+	// If we actually advanced the pointer, copy it over
+	if ( i != filePos )
+	{
+		// We read in size bytes
+		int size = i - filePos;
+		// copy it out
+		memcpy( pBuffer, pMemFile + filePos, sizeof(byte)*size );
+		
+		// If the buffer isn't full, terminate (this is always true)
+		if ( size < bufferSize )
+			pBuffer[size] = 0;
+
+		// Update file pointer
+		filePos = i;
+		return pBuffer;
+	}
+
+	// No data read, bail
+	return NULL;
+}
+
+
+void TEXTURETYPE_Init()
+{
+	char buffer[512];
+	int i, j;
+	byte *pMemFile;
+	int fileSize, filePos;
+
+	if (fTextureTypeInit)
+		return;
+
+	memset(&(grgszTextureName[0][0]), 0, CTEXTURESMAX * CBTEXTURENAMEMAX);
+	memset(grgchTextureType, 0, CTEXTURESMAX);
+
+	gcTextures = 0;
+	memset(buffer, 0, 512);
+
+	pMemFile = g_engfuncs.pfnLoadFileForMe( "sound/materials.txt", &fileSize );
+	if ( !pMemFile )
+		return;
+
+	// for each line in the file...
+	while (memfgets(pMemFile, fileSize, filePos, buffer, 511) != NULL && (gcTextures < CTEXTURESMAX))
+	{
+		// skip whitespace
+		i = 0;
+		while(buffer[i] && isspace(buffer[i]))
+			i++;
+		
+		if (!buffer[i])
+			continue;
+
+		// skip comment lines
+		if (buffer[i] == '/' || !isalpha(buffer[i]))
+			continue;
+
+		// get texture type
+		grgchTextureType[gcTextures] = toupper(buffer[i++]);
+
+		// skip whitespace
+		while(buffer[i] && isspace(buffer[i]))
+			i++;
+		
+		if (!buffer[i])
+			continue;
+
+		// get sentence name
+		j = i;
+		while (buffer[j] && !isspace(buffer[j]))
+			j++;
+
+		if (!buffer[j])
+			continue;
+
+		// null-terminate name and save in sentences array
+		j = min (j, CBTEXTURENAMEMAX-1+i);
+		buffer[j] = 0;
+		strcpy(&(grgszTextureName[gcTextures++][0]), &(buffer[i]));
+	}
+
+	g_engfuncs.pfnFreeFile( pMemFile );
+	
+	fTextureTypeInit = TRUE;
+}
+
+// given texture name, find texture type
+// if not found, return type 'concrete'
+
+// NOTE: this routine should ONLY be called if the 
+// current texture under the player changes!
+
+char TEXTURETYPE_Find(char *name)
+{
+	// CONSIDER: pre-sort texture names and perform faster binary search here
+
+	for (int i = 0; i < gcTextures; i++)
+	{
+		if (!strnicmp(name, &(grgszTextureName[i][0]), CBTEXTURENAMEMAX-1))
+			return (grgchTextureType[i]);
+	}
+
+	return CHAR_TEX_CONCRETE;
+}
+
+// play a strike sound based on the texture that was hit by the attack traceline.  VecSrc/VecEnd are the
+// original traceline endpoints used by the attacker, iBulletType is the type of bullet that hit the texture.
+// returns volume of strike instrument (crowbar) to play
+
+float TEXTURETYPE_PlaySound(TraceResult *ptr,  Vector vecSrc, Vector vecEnd, int iBulletType)
+{
+// hit the world, try to play sound based on texture material type
+	
+	char chTextureType;
+	float fvol;
+	float fvolbar;
+	char szbuffer[64];
+	const char *pTextureName;
+	float rgfl1[3];
+	float rgfl2[3];
+	char *rgsz[4];
+	int cnt;
+	float fattn = ATTN_NORM;
+
+	if ( !g_pGameRules->PlayTextureSounds() )
+		return 0.0;
+
+	CBaseEntity *pEntity = CBaseEntity::Instance(ptr->pHit);
+
+	chTextureType = 0;
+
+	if (pEntity && pEntity->Classify() != CLASS_NONE && pEntity->Classify() != CLASS_MACHINE)
+		// hit body
+		chTextureType = CHAR_TEX_FLESH;
+	else
+	{
+		// hit world
+
+		// find texture under strike, get material type
+
+		// copy trace vector into array for trace_texture
+
+		vecSrc.CopyToArray(rgfl1);
+		vecEnd.CopyToArray(rgfl2);
+
+		// get texture from entity or world (world is ent(0))
+		if (pEntity)
+			pTextureName = TRACE_TEXTURE( ENT(pEntity->pev), rgfl1, rgfl2 );
+		else
+			pTextureName = TRACE_TEXTURE( ENT(0), rgfl1, rgfl2 );
+			
+		if ( pTextureName )
+		{
+			// strip leading '-0' or '+0~' or '{' or '!'
+			if (*pTextureName == '-' || *pTextureName == '+')
+				pTextureName += 2;
+
+			if (*pTextureName == '{' || *pTextureName == '!' || *pTextureName == '~' || *pTextureName == ' ')
+				pTextureName++;
+			// '}}'
+			strcpy(szbuffer, pTextureName);
+			szbuffer[CBTEXTURENAMEMAX - 1] = 0;
+				
+			// ALERT ( at_console, "texture hit: %s\n", szbuffer);
+
+			// get texture type
+			chTextureType = TEXTURETYPE_Find(szbuffer);	
+		}
+	}
+
+	switch (chTextureType)
+	{
+	default:
+	case CHAR_TEX_CONCRETE: fvol = 0.9;	fvolbar = 0.6;
+		rgsz[0] = "player/pl_step1.wav";
+		rgsz[1] = "player/pl_step2.wav";
+		cnt = 2;
+		break;
+	case CHAR_TEX_METAL: fvol = 0.9; fvolbar = 0.3;
+		rgsz[0] = "player/pl_metal1.wav";
+		rgsz[1] = "player/pl_metal2.wav";
+		cnt = 2;
+		break;
+	case CHAR_TEX_DIRT:	fvol = 0.9; fvolbar = 0.1;
+		rgsz[0] = "player/pl_dirt1.wav";
+		rgsz[1] = "player/pl_dirt2.wav";
+		rgsz[2] = "player/pl_dirt3.wav";
+		cnt = 3;
+		break;
+	case CHAR_TEX_VENT:	fvol = 0.5; fvolbar = 0.3;
+		rgsz[0] = "player/pl_duct1.wav";
+		rgsz[1] = "player/pl_duct1.wav";
+		cnt = 2;
+		break;
+	case CHAR_TEX_GRATE: fvol = 0.9; fvolbar = 0.5;
+		rgsz[0] = "player/pl_grate1.wav";
+		rgsz[1] = "player/pl_grate4.wav";
+		cnt = 2;
+		break;
+	case CHAR_TEX_TILE:	fvol = 0.8; fvolbar = 0.2;
+		rgsz[0] = "player/pl_tile1.wav";
+		rgsz[1] = "player/pl_tile3.wav";
+		rgsz[2] = "player/pl_tile2.wav";
+		rgsz[3] = "player/pl_tile4.wav";
+		cnt = 4;
+		break;
+	case CHAR_TEX_SLOSH: fvol = 0.9; fvolbar = 0.0;
+		rgsz[0] = "player/pl_slosh1.wav";
+		rgsz[1] = "player/pl_slosh3.wav";
+		rgsz[2] = "player/pl_slosh2.wav";
+		rgsz[3] = "player/pl_slosh4.wav";
+		cnt = 4;
+		break;
+	case CHAR_TEX_WOOD: fvol = 0.9; fvolbar = 0.2;
+		rgsz[0] = "debris/wood1.wav";
+		rgsz[1] = "debris/wood2.wav";
+		rgsz[2] = "debris/wood3.wav";
+		cnt = 3;
+		break;
+	case CHAR_TEX_GLASS:
+	case CHAR_TEX_COMPUTER:
+		fvol = 0.8; fvolbar = 0.2;
+		rgsz[0] = "debris/glass1.wav";
+		rgsz[1] = "debris/glass2.wav";
+		rgsz[2] = "debris/glass3.wav";
+		cnt = 3;
+		break;
+	case CHAR_TEX_FLESH:
+		//if (iBulletType == BULLET_PLAYER_CROWBAR)
+		//	return 0.0; // crowbar already makes this sound
+		fvol = 1.0;	fvolbar = 0.2;
+		rgsz[0] = "weapons/bullet_hit1.wav";
+		rgsz[1] = "weapons/bullet_hit2.wav";
+		fattn = 1.0;
+		cnt = 2;
+		break;
+	}
+
+	// did we hit a breakable?
+
+	if (pEntity && FClassnameIs(pEntity->pev, "func_breakable"))
+	{
+		// drop volumes, the object will already play a damaged sound
+		fvol /= 1.5;
+		fvolbar /= 2.0;	
+	}
+	else if (chTextureType == CHAR_TEX_COMPUTER)
+	{
+		// play random spark if computer
+
+		if ( ptr->flFraction != 1.0 && RANDOM_LONG(0,1))
+		{
+			UTIL_Sparks( ptr->vecEndPos );
+
+			float flVolume = RANDOM_FLOAT ( 0.7 , 1.0 );//random volume range
+			switch ( RANDOM_LONG(0,1) )
+			{
+				case 0: UTIL_EmitAmbientSound(ENT(0), ptr->vecEndPos, "buttons/spark5.wav", flVolume, ATTN_NORM, 0, 100); break;
+				case 1: UTIL_EmitAmbientSound(ENT(0), ptr->vecEndPos, "buttons/spark6.wav", flVolume, ATTN_NORM, 0, 100); break;
+				// case 0: EMIT_SOUND(ENT(pev), CHAN_VOICE, "buttons/spark5.wav", flVolume, ATTN_NORM);	break;
+				// case 1: EMIT_SOUND(ENT(pev), CHAN_VOICE, "buttons/spark6.wav", flVolume, ATTN_NORM);	break;
+			}
+		}
+	}
+
+	// play material hit sound
+	UTIL_EmitAmbientSound(ENT(0), ptr->vecEndPos, rgsz[RANDOM_LONG(0,cnt-1)], fvol, fattn, 0, 96 + RANDOM_LONG(0,0xf));
+	//EMIT_SOUND_DYN( ENT(m_pPlayer->pev), CHAN_WEAPON, rgsz[RANDOM_LONG(0,cnt-1)], fvol, ATTN_NORM, 0, 96 + RANDOM_LONG(0,0xf));
+			
+	return fvolbar;
+}
+
+// ===================================================================================
+//
+// Speaker class. Used for announcements per level, for door lock/unlock spoken voice. 
+//
+
+class CSpeaker : public CBaseEntity
+{
+public:
+	void KeyValue( KeyValueData* pkvd);
+	void Spawn( void );
+	void Precache( void );
+	void EXPORT ToggleUse ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void EXPORT SpeakerThink( void );
+	
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	virtual int	ObjectCaps( void ) { return (CBaseEntity :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION); }
+	
+	int	m_preset;			// preset number
+};
+
+LINK_ENTITY_TO_CLASS( speaker, CSpeaker );
+TYPEDESCRIPTION	CSpeaker::m_SaveData[] = 
+{
+	DEFINE_FIELD( CSpeaker, m_preset, FIELD_INTEGER ),
+};
+
+IMPLEMENT_SAVERESTORE( CSpeaker, CBaseEntity );
+
+//
+// ambient_generic - general-purpose user-defined static sound
+//
+void CSpeaker :: Spawn( void )
+{
+	char* szSoundFile = (char*) STRING(pev->message);
+
+	if ( !m_preset && (FStringNull( pev->message ) || strlen( szSoundFile ) < 1 ))
+	{
+		ALERT( at_error, "SPEAKER with no Level/Sentence! at: %f, %f, %f\n", pev->origin.x, pev->origin.y, pev->origin.z );
+		pev->nextthink = gpGlobals->time + 0.1;
+		SetThink( &CSpeaker::SUB_Remove );
+		return;
+	}
+    pev->solid		= SOLID_NOT;
+    pev->movetype	= MOVETYPE_NONE;
+
+	
+	SetThink(&CSpeaker::SpeakerThink);
+	pev->nextthink = 0.0;
+
+	// allow on/off switching via 'use' function.
+
+	SetUse ( &CSpeaker::ToggleUse );
+
+	Precache( );
+}
+
+#define ANNOUNCE_MINUTES_MIN	0.25	 
+#define ANNOUNCE_MINUTES_MAX	2.25
+
+void CSpeaker :: Precache( void )
+{
+	if ( !FBitSet (pev->spawnflags, SPEAKER_START_SILENT ) )
+		// set first announcement time for random n second
+		pev->nextthink = gpGlobals->time + RANDOM_FLOAT(5.0, 15.0);
+}
+void CSpeaker :: SpeakerThink( void )
+{
+	char* szSoundFile;
+	float flvolume = pev->health * 0.1;
+	float flattenuation = 0.3;
+	int flags = 0;
+	int pitch = 100;
+
+
+	// Wait for the talkmonster to finish first.
+	if (gpGlobals->time <= CTalkMonster::g_talkWaitTime)
+	{
+		pev->nextthink = CTalkMonster::g_talkWaitTime + RANDOM_FLOAT( 5, 10 );
+		return;
+	}
+	
+	if (m_preset)
+	{
+		// go lookup preset text, assign szSoundFile
+		switch (m_preset)
+		{
+		case 1: szSoundFile =  "C1A0_"; break;
+		case 2: szSoundFile =  "C1A1_"; break;
+		case 3: szSoundFile =  "C1A2_"; break;
+		case 4: szSoundFile =  "C1A3_"; break;
+		case 5: szSoundFile =  "C1A4_"; break; 
+		case 6: szSoundFile =  "C2A1_"; break;
+		case 7: szSoundFile =  "C2A2_"; break;
+		case 8: szSoundFile =  "C2A3_"; break;
+		case 9: szSoundFile =  "C2A4_"; break;
+		case 10: szSoundFile = "C2A5_"; break;
+		case 11: szSoundFile = "C3A1_"; break;
+		case 12: szSoundFile = "C3A2_"; break;
+		}
+	} else
+		szSoundFile = (char*) STRING(pev->message);
+	
+	if (szSoundFile[0] == '!')
+	{
+		// play single sentence, one shot
+		UTIL_EmitAmbientSound ( ENT(pev), pev->origin, szSoundFile, 
+			flvolume, flattenuation, flags, pitch);
+
+		// shut off and reset
+		pev->nextthink = 0.0;
+	}
+	else
+	{
+		// make random announcement from sentence group
+
+		if (SENTENCEG_PlayRndSz(ENT(pev), szSoundFile, flvolume, flattenuation, flags, pitch) < 0)
+			ALERT(at_console, "Level Design Error!\nSPEAKER has bad sentence group name: %s\n",szSoundFile); 
+
+		// set next announcement time for random 5 to 10 minute delay
+		pev->nextthink = gpGlobals->time + 
+						RANDOM_FLOAT(ANNOUNCE_MINUTES_MIN * 60.0, ANNOUNCE_MINUTES_MAX * 60.0);
+
+		CTalkMonster::g_talkWaitTime = gpGlobals->time + 5;		// time delay until it's ok to speak: used so that two NPCs don't talk at once
+	}
+
+	return;
+}
+
+
+//
+// ToggleUse - if an announcement is pending, cancel it.  If no announcement is pending, start one.
+//
+void CSpeaker :: ToggleUse ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	int fActive = (pev->nextthink > 0.0);
+
+	// fActive is TRUE only if an announcement is pending
+	
+	if ( useType != USE_TOGGLE )
+	{
+		// ignore if we're just turning something on that's already on, or
+		// turning something off that's already off.
+		if ( (fActive && useType == USE_ON) || (!fActive && useType == USE_OFF) )
+			return;
+	}
+
+	if ( useType == USE_ON )
+	{
+		// turn on announcements
+		pev->nextthink = gpGlobals->time + 0.1;
+		return;
+	}
+
+	if ( useType == USE_OFF )
+	{
+		// turn off announcements
+		pev->nextthink = 0.0;
+		return;
+	
+	}
+
+	// Toggle announcements
+
+	
+	if ( fActive )
+	{
+		// turn off announcements
+		pev->nextthink = 0.0;
+	}
+	else 
+	{
+		// turn on announcements
+		pev->nextthink = gpGlobals->time + 0.1;
+	} 
+}
+
+// KeyValue - load keyvalue pairs into member data
+// NOTE: called BEFORE spawn!
+
+void CSpeaker :: KeyValue( KeyValueData *pkvd )
+{
+	
+	// preset
+	if (FStrEq(pkvd->szKeyName, "preset"))
+	{
+		m_preset = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseEntity::KeyValue( pkvd );
+}
\ No newline at end of file
diff --git a/main/source/dlls/soundent.cpp b/main/source/dlls/soundent.cpp
new file mode 100644
index 00000000..ff16d49e
--- /dev/null
+++ b/main/source/dlls/soundent.cpp
@@ -0,0 +1,379 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"soundent.h"
+
+
+LINK_ENTITY_TO_CLASS( soundent, CSoundEnt );
+
+CSoundEnt *pSoundEnt;
+
+//=========================================================
+// CSound - Clear - zeros all fields for a sound
+//=========================================================
+void CSound :: Clear ( void )
+{
+	m_vecOrigin		= g_vecZero;
+	m_iType			= 0;
+	m_iVolume		= 0;
+	m_flExpireTime	= 0;
+	m_iNext			= SOUNDLIST_EMPTY;
+	m_iNextAudible	= 0;
+}
+
+//=========================================================
+// Reset - clears the volume, origin, and type for a sound,
+// but doesn't expire or unlink it. 
+//=========================================================
+void CSound :: Reset ( void )
+{
+	m_vecOrigin		= g_vecZero;
+	m_iType			= 0;
+	m_iVolume		= 0;
+	m_iNext			= SOUNDLIST_EMPTY;
+}
+
+//=========================================================
+// FIsSound - returns TRUE if the sound is an Audible sound
+//=========================================================
+BOOL CSound :: FIsSound ( void )
+{
+	if ( m_iType & ( bits_SOUND_COMBAT | bits_SOUND_WORLD | bits_SOUND_PLAYER | bits_SOUND_DANGER ) )
+	{
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+//=========================================================
+// FIsScent - returns TRUE if the sound is actually a scent
+//=========================================================
+BOOL CSound :: FIsScent ( void )
+{
+	if ( m_iType & ( bits_SOUND_CARCASS | bits_SOUND_MEAT | bits_SOUND_GARBAGE ) )
+	{
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+//=========================================================
+// Spawn 
+//=========================================================
+void CSoundEnt :: Spawn( void )
+{
+	pev->solid = SOLID_NOT;
+	Initialize();
+
+	pev->nextthink = gpGlobals->time + 1; 
+}
+
+//=========================================================
+// Think - at interval, the entire active sound list is checked
+// for sounds that have ExpireTimes less than or equal
+// to the current world time, and these sounds are deallocated.
+//=========================================================
+void CSoundEnt :: Think ( void )
+{
+	int iSound;
+	int iPreviousSound;
+
+	pev->nextthink = gpGlobals->time + 0.3;// how often to check the sound list.
+
+	iPreviousSound = SOUNDLIST_EMPTY;
+	iSound = m_iActiveSound; 
+
+	while ( iSound != SOUNDLIST_EMPTY )
+	{
+		if ( m_SoundPool[ iSound ].m_flExpireTime <= gpGlobals->time && m_SoundPool[ iSound ].m_flExpireTime != SOUND_NEVER_EXPIRE )
+		{
+			int iNext = m_SoundPool[ iSound ].m_iNext;
+
+			// move this sound back into the free list
+			FreeSound( iSound, iPreviousSound );
+
+			iSound = iNext;
+		}
+		else
+		{
+			iPreviousSound = iSound;
+			iSound = m_SoundPool[ iSound ].m_iNext;
+		}
+	}
+
+	if ( m_fShowReport )
+	{
+		ALERT ( at_aiconsole, "Soundlist: %d / %d  (%d)\n", ISoundsInList( SOUNDLISTTYPE_ACTIVE ),ISoundsInList( SOUNDLISTTYPE_FREE ), ISoundsInList( SOUNDLISTTYPE_ACTIVE ) - m_cLastActiveSounds );
+		m_cLastActiveSounds = ISoundsInList ( SOUNDLISTTYPE_ACTIVE );
+	}
+
+}
+
+//=========================================================
+// Precache - dummy function
+//=========================================================
+void CSoundEnt :: Precache ( void )
+{
+}
+
+//=========================================================
+// FreeSound - clears the passed active sound and moves it 
+// to the top of the free list. TAKE CARE to only call this
+// function for sounds in the Active list!!
+//=========================================================
+void CSoundEnt :: FreeSound ( int iSound, int iPrevious )
+{
+	if ( !pSoundEnt )
+	{
+		// no sound ent!
+		return;
+	}
+
+	if ( iPrevious != SOUNDLIST_EMPTY )
+	{
+		// iSound is not the head of the active list, so
+		// must fix the index for the Previous sound
+//		pSoundEnt->m_SoundPool[ iPrevious ].m_iNext = m_SoundPool[ iSound ].m_iNext;
+		pSoundEnt->m_SoundPool[ iPrevious ].m_iNext = pSoundEnt->m_SoundPool[ iSound ].m_iNext;
+	}
+	else 
+	{
+		// the sound we're freeing IS the head of the active list.
+		pSoundEnt->m_iActiveSound = pSoundEnt->m_SoundPool [ iSound ].m_iNext;
+	}
+
+	// make iSound the head of the Free list.
+	pSoundEnt->m_SoundPool[ iSound ].m_iNext = pSoundEnt->m_iFreeSound;
+	pSoundEnt->m_iFreeSound = iSound;
+}
+
+//=========================================================
+// IAllocSound - moves a sound from the Free list to the 
+// Active list returns the index of the alloc'd sound
+//=========================================================
+int CSoundEnt :: IAllocSound( void )
+{
+	int iNewSound;
+
+	if ( m_iFreeSound == SOUNDLIST_EMPTY )
+	{
+		// no free sound!
+		ALERT ( at_console, "Free Sound List is full!\n" );
+		return SOUNDLIST_EMPTY;
+	}
+
+	// there is at least one sound available, so move it to the
+	// Active sound list, and return its SoundPool index.
+	
+	iNewSound = m_iFreeSound;// copy the index of the next free sound
+
+	m_iFreeSound = m_SoundPool[ m_iFreeSound ].m_iNext;// move the index down into the free list. 
+
+	m_SoundPool[ iNewSound ].m_iNext = m_iActiveSound;// point the new sound at the top of the active list.
+
+	m_iActiveSound = iNewSound;// now make the new sound the top of the active list. You're done.
+
+	return iNewSound;
+}
+
+//=========================================================
+// InsertSound - Allocates a free sound and fills it with 
+// sound info.
+//=========================================================
+void CSoundEnt :: InsertSound ( int iType, const Vector &vecOrigin, int iVolume, float flDuration )
+{
+	int	iThisSound;
+
+	if ( !pSoundEnt )
+	{
+		// no sound ent!
+		return;
+	}
+
+	iThisSound = pSoundEnt->IAllocSound();
+
+	if ( iThisSound == SOUNDLIST_EMPTY )
+	{
+		ALERT ( at_console, "Could not AllocSound() for InsertSound() (DLL)\n" );
+		return;
+	}
+
+	pSoundEnt->m_SoundPool[ iThisSound ].m_vecOrigin = vecOrigin;
+	pSoundEnt->m_SoundPool[ iThisSound ].m_iType = iType;
+	pSoundEnt->m_SoundPool[ iThisSound ].m_iVolume = iVolume;
+	pSoundEnt->m_SoundPool[ iThisSound ].m_flExpireTime = gpGlobals->time + flDuration;
+}
+
+//=========================================================
+// Initialize - clears all sounds and moves them into the 
+// free sound list.
+//=========================================================
+void CSoundEnt :: Initialize ( void )
+{
+  	int i;
+	int iSound;
+
+	m_cLastActiveSounds;
+	m_iFreeSound = 0;
+	m_iActiveSound = SOUNDLIST_EMPTY;
+
+	for ( i = 0 ; i < MAX_WORLD_SOUNDS ; i++ )
+	{// clear all sounds, and link them into the free sound list.
+		m_SoundPool[ i ].Clear();
+		m_SoundPool[ i ].m_iNext = i + 1;
+	}
+
+	m_SoundPool[ i - 1 ].m_iNext = SOUNDLIST_EMPTY;// terminate the list here.
+
+	
+	// now reserve enough sounds for each client
+	for ( i = 0 ; i < gpGlobals->maxClients ; i++ )
+	{
+		iSound = pSoundEnt->IAllocSound();
+
+		if ( iSound == SOUNDLIST_EMPTY )
+		{
+			ALERT ( at_console, "Could not AllocSound() for Client Reserve! (DLL)\n" );
+			return;
+		}
+
+		pSoundEnt->m_SoundPool[ iSound ].m_flExpireTime = SOUND_NEVER_EXPIRE;
+	}
+
+	if ( CVAR_GET_FLOAT("displaysoundlist") == 1 )
+	{
+		m_fShowReport = TRUE;
+	}
+	else
+	{
+		m_fShowReport = FALSE;
+	}
+}
+
+//=========================================================
+// ISoundsInList - returns the number of sounds in the desired
+// sound list.
+//=========================================================
+int CSoundEnt :: ISoundsInList ( int iListType )
+{
+	int i;
+	int iThisSound;
+
+	if ( iListType == SOUNDLISTTYPE_FREE )
+	{
+		iThisSound = m_iFreeSound;
+	}
+	else if ( iListType == SOUNDLISTTYPE_ACTIVE )
+	{
+		iThisSound = m_iActiveSound;
+	}
+	else
+	{
+		ALERT ( at_console, "Unknown Sound List Type!\n" );
+	}
+
+	if ( iThisSound == SOUNDLIST_EMPTY )
+	{
+		return 0;
+	}
+
+	i = 0;
+
+	while ( iThisSound != SOUNDLIST_EMPTY )
+	{
+		i++;
+
+		iThisSound = m_SoundPool[ iThisSound ].m_iNext;
+	}
+
+	return i;
+}
+
+//=========================================================
+// ActiveList - returns the head of the active sound list
+//=========================================================
+int CSoundEnt :: ActiveList ( void )
+{
+	if ( !pSoundEnt )
+	{
+		return SOUNDLIST_EMPTY;
+	}
+
+	return pSoundEnt->m_iActiveSound;
+}
+
+//=========================================================
+// FreeList - returns the head of the free sound list
+//=========================================================
+int CSoundEnt :: FreeList ( void )
+{
+	if ( !pSoundEnt )
+	{
+		return SOUNDLIST_EMPTY;
+	}
+
+	return pSoundEnt->m_iFreeSound;
+}
+
+//=========================================================
+// SoundPointerForIndex - returns a pointer to the instance
+// of CSound at index's position in the sound pool.
+//=========================================================
+CSound*	CSoundEnt :: SoundPointerForIndex( int iIndex )
+{
+	if ( !pSoundEnt )
+	{
+		return NULL;
+	}
+
+	if ( iIndex > ( MAX_WORLD_SOUNDS - 1 ) )
+	{
+		ALERT ( at_console, "SoundPointerForIndex() - Index too large!\n" );
+		return NULL;
+	}
+
+	if ( iIndex < 0 )
+	{
+		ALERT ( at_console, "SoundPointerForIndex() - Index < 0!\n" );
+		return NULL;
+	}
+
+	return &pSoundEnt->m_SoundPool[ iIndex ];
+}
+
+//=========================================================
+// Clients are numbered from 1 to MAXCLIENTS, but the client
+// reserved sounds in the soundlist are from 0 to MAXCLIENTS - 1,
+// so this function ensures that a client gets the proper index
+// to his reserved sound in the soundlist.
+//=========================================================
+int CSoundEnt :: ClientSoundIndex ( edict_t *pClient )
+{
+	int iReturn = ENTINDEX( pClient ) - 1;
+
+#ifdef _DEBUG
+	if ( iReturn < 0 || iReturn > gpGlobals->maxClients )
+	{
+		ALERT ( at_console, "** ClientSoundIndex returning a bogus value! **\n" );
+	}
+#endif // _DEBUG
+
+	return iReturn;
+}
\ No newline at end of file
diff --git a/main/source/dlls/soundent.h b/main/source/dlls/soundent.h
new file mode 100644
index 00000000..3d1c5cb7
--- /dev/null
+++ b/main/source/dlls/soundent.h
@@ -0,0 +1,99 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//=========================================================
+// Soundent.h - the entity that spawns when the world 
+// spawns, and handles the world's active and free sound
+// lists.
+//=========================================================
+#ifndef SOUNDENT_H
+#define SOUNDENT_H
+
+#define	MAX_WORLD_SOUNDS	64 // maximum number of sounds handled by the world at one time.
+
+#define bits_SOUND_NONE		0
+#define	bits_SOUND_COMBAT	( 1 << 0 )// gunshots, explosions
+#define bits_SOUND_WORLD	( 1 << 1 )// door opening/closing, glass breaking
+#define bits_SOUND_PLAYER	( 1 << 2 )// all noises generated by player. walking, shooting, falling, splashing
+#define bits_SOUND_CARCASS	( 1 << 3 )// dead body
+#define bits_SOUND_MEAT		( 1 << 4 )// gib or pork chop
+#define bits_SOUND_DANGER	( 1 << 5 )// pending danger. Grenade that is about to explode, explosive barrel that is damaged, falling crate
+#define bits_SOUND_GARBAGE	( 1 << 6 )// trash cans, banana peels, old fast food bags.
+
+#define bits_ALL_SOUNDS 0xFFFFFFFF
+
+#define SOUNDLIST_EMPTY	-1
+
+#define SOUNDLISTTYPE_FREE	1// identifiers passed to functions that can operate on either list, to indicate which list to operate on.
+#define SOUNDLISTTYPE_ACTIVE 2
+
+#define	SOUND_NEVER_EXPIRE	-1 // with this set as a sound's ExpireTime, the sound will never expire.
+
+//=========================================================
+// CSound - an instance of a sound in the world.
+//=========================================================
+class CSound
+{
+public:
+
+	void	Clear ( void );
+	void	Reset ( void );
+
+	Vector	m_vecOrigin;	// sound's location in space
+	int		m_iType;		// what type of sound this is
+	int		m_iVolume;		// how loud the sound is
+	float	m_flExpireTime;	// when the sound should be purged from the list
+	int		m_iNext;		// index of next sound in this list ( Active or Free )
+	int		m_iNextAudible;	// temporary link that monsters use to build a list of audible sounds
+
+	BOOL	FIsSound( void );
+	BOOL	FIsScent( void );
+};
+
+//=========================================================
+// CSoundEnt - a single instance of this entity spawns when
+// the world spawns. The SoundEnt's job is to update the 
+// world's Free and Active sound lists.
+//=========================================================
+class CSoundEnt : public CBaseEntity 
+{
+public:
+
+	void Precache ( void );
+	void Spawn( void );
+	void Think( void );
+	void Initialize ( void );
+	
+	static void		InsertSound ( int iType, const Vector &vecOrigin, int iVolume, float flDuration );
+	static void		FreeSound ( int iSound, int iPrevious );
+	static int		ActiveList( void );// return the head of the active list
+	static int		FreeList( void );// return the head of the free list
+	static CSound*	SoundPointerForIndex( int iIndex );// return a pointer for this index in the sound list
+	static int		ClientSoundIndex ( edict_t *pClient );
+
+	BOOL	IsEmpty( void ) { return m_iActiveSound == SOUNDLIST_EMPTY; }
+	int		ISoundsInList ( int iListType );
+	int		IAllocSound ( void );
+	virtual int		ObjectCaps( void ) { return FCAP_DONT_SAVE; }
+	
+	int		m_iFreeSound;	// index of the first sound in the free sound list
+	int		m_iActiveSound; // indes of the first sound in the active sound list
+	int		m_cLastActiveSounds; // keeps track of the number of active sounds at the last update. (for diagnostic work)
+	BOOL	m_fShowReport; // if true, dump information about free/active sounds.
+
+private:
+	CSound		m_SoundPool[ MAX_WORLD_SOUNDS ];
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/spectator.cpp b/main/source/dlls/spectator.cpp
new file mode 100644
index 00000000..28002eb6
--- /dev/null
+++ b/main/source/dlls/spectator.cpp
@@ -0,0 +1,149 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+// CBaseSpectator
+
+// YWB:  UNDONE
+
+// Spectator functions
+// 
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"spectator.h"
+
+/*
+===========
+SpectatorConnect
+
+called when a spectator connects to a server
+============
+*/
+void CBaseSpectator::SpectatorConnect(void)
+{
+	pev->flags = FL_SPECTATOR;
+	pev->solid = SOLID_NOT;
+	pev->movetype = MOVETYPE_NOCLIP;
+	
+	m_pGoalEnt = NULL;
+}
+
+/*
+===========
+SpectatorDisconnect
+
+called when a spectator disconnects from a server
+============
+*/
+void CBaseSpectator::SpectatorDisconnect(void)
+{
+}
+
+/*
+================
+SpectatorImpulseCommand
+
+Called by SpectatorThink if the spectator entered an impulse
+================
+*/
+void CBaseSpectator::SpectatorImpulseCommand(void)
+{
+	static edict_t	*pGoal		= NULL;
+	edict_t         *pPreviousGoal;
+	edict_t         *pCurrentGoal;
+	BOOL			bFound;
+	
+	switch (pev->impulse)
+	{
+	case 1:
+		// teleport the spectator to the next spawn point
+		// note that if the spectator is tracking, this doesn't do
+		// much
+		pPreviousGoal = pGoal;
+		pCurrentGoal  = pGoal;
+		// Start at the current goal, skip the world, and stop if we looped
+		//  back around
+
+		bFound = FALSE;
+		while (1)
+		{
+			pCurrentGoal = FIND_ENTITY_BY_CLASSNAME(pCurrentGoal, "info_player_deathmatch");
+			// Looped around, failure
+			if (pCurrentGoal == pPreviousGoal)
+			{
+				ALERT(at_console, "Could not find a spawn spot.\n");
+				break;
+			}
+			// Found a non-world entity, set success, otherwise, look for the next one.
+			if (!FNullEnt(pCurrentGoal))
+			{
+				bFound = TRUE;
+				break;
+			}
+		}
+
+		if (!bFound)  // Didn't find a good spot.
+			break;
+		
+		pGoal = pCurrentGoal;
+		UTIL_SetOrigin( pev, pGoal->v.origin );
+		pev->angles = pGoal->v.angles;
+		pev->fixangle = FALSE;
+		break;
+	default:
+		ALERT(at_console, "Unknown spectator impulse\n");
+		break;
+	}
+
+	pev->impulse = 0;
+}
+
+/*
+================
+SpectatorThink
+
+Called every frame after physics are run
+================
+*/
+void  CBaseSpectator::SpectatorThink(void)
+{
+	if (!(pev->flags & FL_SPECTATOR))
+	{
+		pev->flags = FL_SPECTATOR;
+	}
+
+	pev->solid	   = SOLID_NOT;
+	pev->movetype  = MOVETYPE_NOCLIP;
+
+	if (pev->impulse)
+		SpectatorImpulseCommand();
+}
+
+/*
+===========
+Spawn
+
+  Called when spectator is initialized:
+  UNDONE:  Is this actually being called because spectators are not allocated in normal fashion?
+============
+*/
+void CBaseSpectator::Spawn()
+{
+	pev->flags = FL_SPECTATOR;
+	pev->solid = SOLID_NOT;
+	pev->movetype = MOVETYPE_NOCLIP;
+	
+	m_pGoalEnt = NULL;
+}
diff --git a/main/source/dlls/spectator.h b/main/source/dlls/spectator.h
new file mode 100644
index 00000000..f4c4ef37
--- /dev/null
+++ b/main/source/dlls/spectator.h
@@ -0,0 +1,27 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+// Spectator.h
+
+class CBaseSpectator : public CBaseEntity 
+{
+public:
+	void Spawn();
+	void SpectatorConnect(void);
+	void SpectatorDisconnect(void);
+	void SpectatorThink(void);
+
+private:
+	void SpectatorImpulseCommand(void);
+};
\ No newline at end of file
diff --git a/main/source/dlls/squad.h b/main/source/dlls/squad.h
new file mode 100644
index 00000000..abf3194f
--- /dev/null
+++ b/main/source/dlls/squad.h
@@ -0,0 +1,13 @@
+//=========================================================
+// squad.h
+//=========================================================
+
+// these are special group roles that are assigned to members when the group is formed.
+// the reason these are explicitly assigned and tasks like throwing grenades to flush out 
+// enemies is that it's bad to have two members trying to flank left at the same time, but 
+// ok to have two throwing grenades at the same time. When a squad member cannot attack the 
+// enemy, it will choose to execute its special role.
+#define		bits_SQUAD_FLANK_LEFT		( 1 << 0 )
+#define		bits_SQUAD_FLANK_RIGHT		( 1 << 1 )
+#define		bits_SQUAD_ADVANCE			( 1 << 2 )
+#define		bits_SQUAD_FLUSH_ATTACK		( 1 << 3 )
\ No newline at end of file
diff --git a/main/source/dlls/squadmonster.cpp b/main/source/dlls/squadmonster.cpp
new file mode 100644
index 00000000..35d52ca1
--- /dev/null
+++ b/main/source/dlls/squadmonster.cpp
@@ -0,0 +1,623 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// Squadmonster  functions
+//=========================================================
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "nodes.h"
+#include "monsters.h"
+#include "animation.h"
+#include "saverestore.h"
+#include "squadmonster.h"
+#include "plane.h"
+
+//=========================================================
+// Save/Restore
+//=========================================================
+TYPEDESCRIPTION	CSquadMonster::m_SaveData[] = 
+{
+	DEFINE_FIELD( CSquadMonster, m_hSquadLeader, FIELD_EHANDLE ),
+	DEFINE_ARRAY( CSquadMonster, m_hSquadMember, FIELD_EHANDLE, MAX_SQUAD_MEMBERS - 1 ),
+
+	// DEFINE_FIELD( CSquadMonster, m_afSquadSlots, FIELD_INTEGER ), // these need to be reset after transitions!
+	DEFINE_FIELD( CSquadMonster, m_fEnemyEluded, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CSquadMonster, m_flLastEnemySightTime, FIELD_TIME ),
+
+	DEFINE_FIELD( CSquadMonster, m_iMySlot, FIELD_INTEGER ),
+
+
+};
+
+IMPLEMENT_SAVERESTORE( CSquadMonster, CBaseMonster );
+
+
+//=========================================================
+// OccupySlot - if any slots of the passed slots are 
+// available, the monster will be assigned to one.
+//=========================================================
+BOOL CSquadMonster :: OccupySlot( int iDesiredSlots )
+{
+	int i;
+	int iMask;
+	int iSquadSlots;
+
+	if ( !InSquad() )
+	{
+		return TRUE;
+	}
+
+	if ( SquadEnemySplit() )
+	{
+		// if the squad members aren't all fighting the same enemy, slots are disabled
+		// so that a squad member doesn't get stranded unable to engage his enemy because
+		// all of the attack slots are taken by squad members fighting other enemies.
+		m_iMySlot = bits_SLOT_SQUAD_SPLIT;
+		return TRUE;
+	}
+
+	CSquadMonster *pSquadLeader = MySquadLeader();
+
+	if ( !( iDesiredSlots ^ pSquadLeader->m_afSquadSlots ) )
+	{
+		// none of the desired slots are available. 
+		return FALSE;
+	}
+
+	iSquadSlots = pSquadLeader->m_afSquadSlots;
+
+	for ( i = 0; i < NUM_SLOTS; i++ )
+	{
+		iMask = 1<<i;
+		if ( iDesiredSlots & iMask ) // am I looking for this bit?
+		{
+			if ( !(iSquadSlots & iMask) )	// Is it already taken?
+			{
+				// No, use this bit
+				pSquadLeader->m_afSquadSlots |= iMask;
+				m_iMySlot = iMask;
+//				ALERT ( at_aiconsole, "Took slot %d - %d\n", i, m_hSquadLeader->m_afSquadSlots );
+				return TRUE;
+			}
+		}
+	}
+
+	return FALSE;
+}
+
+//=========================================================
+// VacateSlot 
+//=========================================================
+void CSquadMonster :: VacateSlot()
+{
+	if ( m_iMySlot != bits_NO_SLOT && InSquad() )
+	{
+//		ALERT ( at_aiconsole, "Vacated Slot %d - %d\n", m_iMySlot, m_hSquadLeader->m_afSquadSlots );
+		MySquadLeader()->m_afSquadSlots &= ~m_iMySlot;
+		m_iMySlot = bits_NO_SLOT;
+	}
+}
+
+//=========================================================
+// ScheduleChange
+//=========================================================
+void CSquadMonster :: ScheduleChange ( void )
+{
+	VacateSlot();
+}
+
+//=========================================================
+// Killed
+//=========================================================
+void CSquadMonster :: Killed( entvars_t *pevAttacker, int iGib )
+{
+	VacateSlot();
+
+	if ( InSquad() )
+	{
+		MySquadLeader()->SquadRemove( this );
+	}
+
+	CBaseMonster :: Killed ( pevAttacker, iGib );
+}
+
+// These functions are still awaiting conversion to CSquadMonster 
+
+
+//=========================================================
+//
+// SquadRemove(), remove pRemove from my squad.
+// If I am pRemove, promote m_pSquadNext to leader
+//
+//=========================================================
+void CSquadMonster :: SquadRemove( CSquadMonster *pRemove )
+{
+	ASSERT( pRemove!=NULL );
+	ASSERT( this->IsLeader() );
+	ASSERT( pRemove->m_hSquadLeader == this );
+
+	// If I'm the leader, get rid of my squad
+	if (pRemove == MySquadLeader())
+	{
+		for (int i = 0; i < MAX_SQUAD_MEMBERS-1;i++)
+		{
+			CSquadMonster *pMember = MySquadMember(i);
+			if (pMember)
+			{
+				pMember->m_hSquadLeader = NULL;
+				m_hSquadMember[i] = NULL;
+			}
+		}
+	}
+	else
+	{
+		CSquadMonster *pSquadLeader = MySquadLeader();
+		if (pSquadLeader)
+		{
+			for (int i = 0; i < MAX_SQUAD_MEMBERS-1;i++)
+			{
+				if (pSquadLeader->m_hSquadMember[i] == this)
+				{
+					pSquadLeader->m_hSquadMember[i] = NULL;
+					break;
+				}
+			}
+		}
+	}
+
+	pRemove->m_hSquadLeader = NULL;
+}
+
+//=========================================================
+//
+// SquadAdd(), add pAdd to my squad
+//
+//=========================================================
+BOOL CSquadMonster :: SquadAdd( CSquadMonster *pAdd )
+{
+	ASSERT( pAdd!=NULL );
+	ASSERT( !pAdd->InSquad() );
+	ASSERT( this->IsLeader() );
+
+	for (int i = 0; i < MAX_SQUAD_MEMBERS-1; i++)
+	{
+		if (m_hSquadMember[i] == NULL)
+		{
+			m_hSquadMember[i] = pAdd;
+			pAdd->m_hSquadLeader = this;
+			return TRUE;
+		}
+	}
+	return FALSE;
+	// should complain here
+}
+
+
+//=========================================================
+// 
+// SquadPasteEnemyInfo - called by squad members that have
+// current info on the enemy so that it can be stored for 
+// members who don't have current info.
+//
+//=========================================================
+void CSquadMonster :: SquadPasteEnemyInfo ( void )
+{
+	CSquadMonster *pSquadLeader = MySquadLeader( );
+	if (pSquadLeader)
+		pSquadLeader->m_vecEnemyLKP = m_vecEnemyLKP;
+}
+
+//=========================================================
+//
+// SquadCopyEnemyInfo - called by squad members who don't
+// have current info on the enemy. Reads from the same fields
+// in the leader's data that other squad members write to,
+// so the most recent data is always available here.
+//
+//=========================================================
+void CSquadMonster :: SquadCopyEnemyInfo ( void )
+{
+	CSquadMonster *pSquadLeader = MySquadLeader( );
+	if (pSquadLeader)
+		m_vecEnemyLKP = pSquadLeader->m_vecEnemyLKP;
+}
+
+//=========================================================
+// 
+// SquadMakeEnemy - makes everyone in the squad angry at
+// the same entity.
+//
+//=========================================================
+void CSquadMonster :: SquadMakeEnemy ( CBaseEntity *pEnemy )
+{
+	if (!InSquad())
+		return;
+
+	if ( !pEnemy )
+	{
+		ALERT ( at_console, "ERROR: SquadMakeEnemy() - pEnemy is NULL!\n" );
+		return;
+	}
+
+	CSquadMonster *pSquadLeader = MySquadLeader( );
+	for (int i = 0; i < MAX_SQUAD_MEMBERS; i++)
+	{
+		CSquadMonster *pMember = pSquadLeader->MySquadMember(i);
+		if (pMember)
+		{
+			// reset members who aren't activly engaged in fighting
+			if (pMember->m_hEnemy != pEnemy && !pMember->HasConditions( bits_COND_SEE_ENEMY))
+			{
+				if ( pMember->m_hEnemy != NULL) 
+				{
+					// remember their current enemy
+					pMember->PushEnemy( pMember->m_hEnemy, pMember->m_vecEnemyLKP );
+				}
+				// give them a new enemy
+				pMember->m_hEnemy = pEnemy;
+				pMember->m_vecEnemyLKP = pEnemy->pev->origin;
+				pMember->SetConditions ( bits_COND_NEW_ENEMY );
+			}
+		}
+	}
+}
+
+
+//=========================================================
+//
+// SquadCount(), return the number of members of this squad
+// callable from leaders & followers
+//
+//=========================================================
+int CSquadMonster :: SquadCount( void )
+{
+	if (!InSquad())
+		return 0;
+
+	CSquadMonster *pSquadLeader = MySquadLeader();
+	int squadCount = 0;
+	for (int i = 0; i < MAX_SQUAD_MEMBERS; i++)
+	{
+		if (pSquadLeader->MySquadMember(i) != NULL)
+			squadCount++;
+	}
+
+	return squadCount;
+}
+
+
+//=========================================================
+//
+// SquadRecruit(), get some monsters of my classification and
+// link them as a group.  returns the group size
+//
+//=========================================================
+int CSquadMonster :: SquadRecruit( int searchRadius, int maxMembers )
+{
+	int squadCount;
+	int iMyClass = Classify();// cache this monster's class
+
+
+	// Don't recruit if I'm already in a group
+	if ( InSquad() )
+		return 0;
+
+	if ( maxMembers < 2 )
+		return 0;
+
+	// I am my own leader
+	m_hSquadLeader = this;
+	squadCount = 1;
+
+	CBaseEntity *pEntity = NULL;
+
+	if ( !FStringNull( pev->netname ) )
+	{
+		// I have a netname, so unconditionally recruit everyone else with that name.
+		pEntity = UTIL_FindEntityByString( pEntity, "netname", STRING( pev->netname ) );
+		while ( pEntity )
+		{
+			CSquadMonster *pRecruit = pEntity->MySquadMonsterPointer();
+
+			if ( pRecruit )
+			{
+				if ( !pRecruit->InSquad() && pRecruit->Classify() == iMyClass && pRecruit != this )
+				{
+					// minimum protection here against user error.in worldcraft. 
+					if (!SquadAdd( pRecruit ))
+						break;
+					squadCount++;
+				}
+			}
+	
+			pEntity = UTIL_FindEntityByString( pEntity, "netname", STRING( pev->netname ) );
+		}
+	}
+	else 
+	{
+		while ((pEntity = UTIL_FindEntityInSphere( pEntity, pev->origin, searchRadius )) != NULL)
+		{
+			CSquadMonster *pRecruit = pEntity->MySquadMonsterPointer( );
+
+			if ( pRecruit && pRecruit != this && pRecruit->IsAlive() && !pRecruit->m_pCine )
+			{
+				// Can we recruit this guy?
+				if ( !pRecruit->InSquad() && pRecruit->Classify() == iMyClass &&
+				   ( (iMyClass != CLASS_ALIEN_MONSTER) || FStrEq(STRING(pev->classname), STRING(pRecruit->pev->classname))) &&
+				    FStringNull( pRecruit->pev->netname ) )
+				{
+					TraceResult tr;
+					UTIL_TraceLine( pev->origin + pev->view_ofs, pRecruit->pev->origin + pev->view_ofs, ignore_monsters, pRecruit->edict(), &tr );// try to hit recruit with a traceline.
+					if ( tr.flFraction == 1.0 )
+					{
+						if (!SquadAdd( pRecruit ))
+							break;
+
+						squadCount++;
+					}
+				}
+			}
+		}
+	}
+
+	// no single member squads
+	if (squadCount == 1)
+	{
+		m_hSquadLeader = NULL;
+	}
+
+	return squadCount;
+}
+
+//=========================================================
+// CheckEnemy
+//=========================================================
+int CSquadMonster :: CheckEnemy ( CBaseEntity *pEnemy )
+{
+	int iUpdatedLKP;
+
+	iUpdatedLKP = CBaseMonster :: CheckEnemy ( m_hEnemy );
+	
+	// communicate with squad members about the enemy IF this individual has the same enemy as the squad leader.
+	if ( InSquad() && (CBaseEntity *)m_hEnemy == MySquadLeader()->m_hEnemy )
+	{
+		if ( iUpdatedLKP )
+		{
+			// have new enemy information, so paste to the squad.
+			SquadPasteEnemyInfo();
+		}
+		else
+		{
+			// enemy unseen, copy from the squad knowledge.
+			SquadCopyEnemyInfo();
+		}
+	}
+
+	return iUpdatedLKP;
+}
+
+//=========================================================
+// StartMonster
+//=========================================================
+void CSquadMonster :: StartMonster( void )
+{
+	CBaseMonster :: StartMonster();
+
+	if ( ( m_afCapability & bits_CAP_SQUAD ) && !InSquad() )
+	{
+		if ( !FStringNull( pev->netname ) )
+		{
+			// if I have a groupname, I can only recruit if I'm flagged as leader
+			if ( !( pev->spawnflags & SF_SQUADMONSTER_LEADER ) )
+			{
+				return;
+			}
+		}
+
+		// try to form squads now.
+		int iSquadSize = SquadRecruit( 1024, 4 );
+
+		if ( iSquadSize )
+		{
+		  ALERT ( at_aiconsole, "Squad of %d %s formed\n", iSquadSize, STRING( pev->classname ) );
+		}
+
+		if ( IsLeader() && FClassnameIs ( pev, "monster_human_grunt" ) )
+		{
+			SetBodygroup( 1, 1 ); // UNDONE: truly ugly hack
+			pev->skin = 0;
+		}
+
+	}
+}
+
+//=========================================================
+// NoFriendlyFire - checks for possibility of friendly fire
+//
+// Builds a large box in front of the grunt and checks to see 
+// if any squad members are in that box. 
+//=========================================================
+BOOL CSquadMonster :: NoFriendlyFire( void )
+{
+	if ( !InSquad() )
+	{
+		return TRUE;
+	}
+
+	CPlane	backPlane;
+	CPlane  leftPlane;
+	CPlane	rightPlane;
+
+	Vector	vecLeftSide;
+	Vector	vecRightSide;
+	Vector	v_left;
+
+	//!!!BUGBUG - to fix this, the planes must be aligned to where the monster will be firing its gun, not the direction it is facing!!!
+
+	if ( m_hEnemy != NULL )
+	{
+		UTIL_MakeVectors ( UTIL_VecToAngles( m_hEnemy->Center() - pev->origin ) );
+	}
+	else
+	{
+		// if there's no enemy, pretend there's a friendly in the way, so the grunt won't shoot.
+		return FALSE;
+	}
+
+	//UTIL_MakeVectors ( pev->angles );
+	
+	vecLeftSide = pev->origin - ( gpGlobals->v_right * ( pev->size.x * 1.5 ) );
+	vecRightSide = pev->origin + ( gpGlobals->v_right * ( pev->size.x * 1.5 ) );
+	v_left = gpGlobals->v_right * -1;
+
+	leftPlane.InitializePlane ( gpGlobals->v_right, vecLeftSide );
+	rightPlane.InitializePlane ( v_left, vecRightSide );
+	backPlane.InitializePlane ( gpGlobals->v_forward, pev->origin );
+
+/*
+	ALERT ( at_console, "LeftPlane: %f %f %f : %f\n", leftPlane.m_vecNormal.x, leftPlane.m_vecNormal.y, leftPlane.m_vecNormal.z, leftPlane.m_flDist );
+	ALERT ( at_console, "RightPlane: %f %f %f : %f\n", rightPlane.m_vecNormal.x, rightPlane.m_vecNormal.y, rightPlane.m_vecNormal.z, rightPlane.m_flDist );
+	ALERT ( at_console, "BackPlane: %f %f %f : %f\n", backPlane.m_vecNormal.x, backPlane.m_vecNormal.y, backPlane.m_vecNormal.z, backPlane.m_flDist );
+*/
+
+	CSquadMonster *pSquadLeader = MySquadLeader();
+	for (int i = 0; i < MAX_SQUAD_MEMBERS; i++)
+	{
+		CSquadMonster *pMember = pSquadLeader->MySquadMember(i);
+		if (pMember && pMember != this)
+		{
+
+			if ( backPlane.PointInFront  ( pMember->pev->origin ) &&
+				 leftPlane.PointInFront  ( pMember->pev->origin ) && 
+				 rightPlane.PointInFront ( pMember->pev->origin) )
+			{
+				// this guy is in the check volume! Don't shoot!
+				return FALSE;
+			}
+		}
+	}
+
+	return TRUE;
+}
+
+//=========================================================
+// GetIdealState - surveys the Conditions information available
+// and finds the best new state for a monster.
+//=========================================================
+MONSTERSTATE CSquadMonster :: GetIdealState ( void )
+{
+	int	iConditions;
+
+	iConditions = IScheduleFlags();
+	
+	// If no schedule conditions, the new ideal state is probably the reason we're in here.
+	switch ( m_MonsterState )
+	{
+	case MONSTERSTATE_IDLE:
+	case MONSTERSTATE_ALERT:
+		if ( HasConditions ( bits_COND_NEW_ENEMY ) && InSquad() )
+		{
+			SquadMakeEnemy ( m_hEnemy );
+		}
+		break;
+	}
+
+	return CBaseMonster :: GetIdealState();
+}
+
+//=========================================================
+// FValidateCover - determines whether or not the chosen
+// cover location is a good one to move to. (currently based
+// on proximity to others in the squad)
+//=========================================================
+BOOL CSquadMonster :: FValidateCover ( const Vector &vecCoverLocation )
+{
+	if ( !InSquad() )
+	{
+		return TRUE;
+	}
+
+	if (SquadMemberInRange( vecCoverLocation, 128 ))
+	{
+		// another squad member is too close to this piece of cover.
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+//=========================================================
+// SquadEnemySplit- returns TRUE if not all squad members
+// are fighting the same enemy. 
+//=========================================================
+BOOL CSquadMonster :: SquadEnemySplit ( void )
+{
+	if (!InSquad())
+		return FALSE;
+
+	CSquadMonster	*pSquadLeader = MySquadLeader();
+	CBaseEntity		*pEnemy	= pSquadLeader->m_hEnemy;
+
+	for (int i = 0; i < MAX_SQUAD_MEMBERS; i++)
+	{
+		CSquadMonster *pMember = pSquadLeader->MySquadMember(i);
+		if (pMember != NULL && pMember->m_hEnemy != NULL && pMember->m_hEnemy != pEnemy)
+		{
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+//=========================================================
+// FValidateCover - determines whether or not the chosen
+// cover location is a good one to move to. (currently based
+// on proximity to others in the squad)
+//=========================================================
+BOOL CSquadMonster :: SquadMemberInRange ( const Vector &vecLocation, float flDist )
+{
+	if (!InSquad())
+		return FALSE;
+
+	CSquadMonster *pSquadLeader = MySquadLeader();
+
+	for (int i = 0; i < MAX_SQUAD_MEMBERS; i++)
+	{
+		CSquadMonster *pSquadMember = pSquadLeader->MySquadMember(i);
+		if (pSquadMember && (vecLocation - pSquadMember->pev->origin ).Length2D() <= flDist)
+			return TRUE;
+	}
+	return FALSE;
+}
+
+
+extern Schedule_t	slChaseEnemyFailed[];
+
+Schedule_t *CSquadMonster::GetScheduleOfType( int iType )
+{
+	switch ( iType )
+	{
+
+	case SCHED_CHASE_ENEMY_FAILED:
+		{
+			return &slChaseEnemyFailed[ 0 ];
+		}
+	
+	default:
+		return CBaseMonster::GetScheduleOfType( iType );
+	}
+}
+
diff --git a/main/source/dlls/squadmonster.h b/main/source/dlls/squadmonster.h
new file mode 100644
index 00000000..b1517348
--- /dev/null
+++ b/main/source/dlls/squadmonster.h
@@ -0,0 +1,120 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// CSquadMonster - all the extra data for monsters that
+// form squads.
+//=========================================================
+
+#define	SF_SQUADMONSTER_LEADER	32
+
+
+#define bits_NO_SLOT		0
+
+// HUMAN GRUNT SLOTS
+#define bits_SLOT_HGRUNT_ENGAGE1	( 1 << 0 )
+#define bits_SLOT_HGRUNT_ENGAGE2	( 1 << 1 )
+#define bits_SLOTS_HGRUNT_ENGAGE	( bits_SLOT_HGRUNT_ENGAGE1 | bits_SLOT_HGRUNT_ENGAGE2 )
+
+#define bits_SLOT_HGRUNT_GRENADE1	( 1 << 2 ) 
+#define bits_SLOT_HGRUNT_GRENADE2	( 1 << 3 ) 
+#define bits_SLOTS_HGRUNT_GRENADE	( bits_SLOT_HGRUNT_GRENADE1 | bits_SLOT_HGRUNT_GRENADE2 )
+
+// ALIEN GRUNT SLOTS
+#define bits_SLOT_AGRUNT_HORNET1	( 1 << 4 )
+#define bits_SLOT_AGRUNT_HORNET2	( 1 << 5 )
+#define bits_SLOT_AGRUNT_CHASE		( 1 << 6 )
+#define bits_SLOTS_AGRUNT_HORNET	( bits_SLOT_AGRUNT_HORNET1 | bits_SLOT_AGRUNT_HORNET2 )
+
+// HOUNDEYE SLOTS
+#define bits_SLOT_HOUND_ATTACK1		( 1 << 7 )
+#define bits_SLOT_HOUND_ATTACK2		( 1 << 8 )
+#define bits_SLOT_HOUND_ATTACK3		( 1 << 9 )
+#define bits_SLOTS_HOUND_ATTACK		( bits_SLOT_HOUND_ATTACK1 | bits_SLOT_HOUND_ATTACK2 | bits_SLOT_HOUND_ATTACK3 )
+
+// global slots
+#define bits_SLOT_SQUAD_SPLIT		( 1 << 10 )// squad members don't all have the same enemy
+
+#define NUM_SLOTS			11// update this every time you add/remove a slot.
+
+#define	MAX_SQUAD_MEMBERS	5
+
+//=========================================================
+// CSquadMonster - for any monster that forms squads.
+//=========================================================
+class CSquadMonster : public CBaseMonster 
+{
+public:
+	// squad leader info
+	EHANDLE	m_hSquadLeader;		// who is my leader
+	EHANDLE	m_hSquadMember[MAX_SQUAD_MEMBERS-1];	// valid only for leader
+	int		m_afSquadSlots;
+	float	m_flLastEnemySightTime; // last time anyone in the squad saw the enemy
+	BOOL	m_fEnemyEluded;
+
+	// squad member info
+	int		m_iMySlot;// this is the behaviour slot that the monster currently holds in the squad. 
+
+	int  CheckEnemy ( CBaseEntity *pEnemy );
+	void StartMonster ( void );
+	void VacateSlot( void );
+	void ScheduleChange( void );
+	void Killed( entvars_t *pevAttacker, int iGib );
+	BOOL OccupySlot( int iDesiredSlot );
+	BOOL NoFriendlyFire( void );
+
+	// squad functions still left in base class
+	CSquadMonster *MySquadLeader( ) 
+	{ 
+		CSquadMonster *pSquadLeader = (CSquadMonster *)((CBaseEntity *)m_hSquadLeader); 
+		if (pSquadLeader != NULL)
+			return pSquadLeader;
+		return this;
+	}
+	CSquadMonster *MySquadMember( int i ) 
+	{ 
+		if (i >= MAX_SQUAD_MEMBERS-1)
+			return this;
+		else
+			return (CSquadMonster *)((CBaseEntity *)m_hSquadMember[i]); 
+	}
+	int	InSquad ( void ) { return m_hSquadLeader != NULL; }
+	int IsLeader ( void ) { return m_hSquadLeader == this; }
+	int SquadJoin ( int searchRadius );
+	int SquadRecruit ( int searchRadius, int maxMembers );
+	int	SquadCount( void );
+	void SquadRemove( CSquadMonster *pRemove );
+	void SquadUnlink( void );
+	BOOL SquadAdd( CSquadMonster *pAdd );
+	void SquadDisband( void );
+	void SquadAddConditions ( int iConditions );
+	void SquadMakeEnemy ( CBaseEntity *pEnemy );
+	void SquadPasteEnemyInfo ( void );
+	void SquadCopyEnemyInfo ( void );
+	BOOL SquadEnemySplit ( void );
+	BOOL SquadMemberInRange( const Vector &vecLocation, float flDist );
+
+	virtual CSquadMonster *MySquadMonsterPointer( void ) { return this; }
+
+	static TYPEDESCRIPTION m_SaveData[];
+
+	int	Save( CSave &save ); 
+	int Restore( CRestore &restore );
+
+	BOOL FValidateCover ( const Vector &vecCoverLocation );
+
+	MONSTERSTATE GetIdealState ( void );
+	Schedule_t	*GetScheduleOfType ( int iType );
+};
+
diff --git a/main/source/dlls/squeakgrenade.cpp b/main/source/dlls/squeakgrenade.cpp
new file mode 100644
index 00000000..c4e88cd8
--- /dev/null
+++ b/main/source/dlls/squeakgrenade.cpp
@@ -0,0 +1,604 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD )
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "player.h"
+#include "soundent.h"
+#include "gamerules.h"
+
+// Allow assignment within conditional
+#pragma warning (disable: 4706)
+
+enum w_squeak_e {
+	WSQUEAK_IDLE1 = 0,
+	WSQUEAK_FIDGET,
+	WSQUEAK_JUMP,
+	WSQUEAK_RUN,
+};
+
+enum squeak_e {
+	SQUEAK_IDLE1 = 0,
+	SQUEAK_FIDGETFIT,
+	SQUEAK_FIDGETNIP,
+	SQUEAK_DOWN,
+	SQUEAK_UP,
+	SQUEAK_THROW
+};
+
+#ifndef CLIENT_DLL
+
+class CSqueakGrenade : public CGrenade
+{
+	void Spawn( void );
+	void Precache( void );
+	int  Classify( void );
+	void EXPORT SuperBounceTouch( CBaseEntity *pOther );
+	void EXPORT HuntThink( void );
+	int  BloodColor( void ) { return BLOOD_COLOR_YELLOW; }
+	void Killed( entvars_t *pevAttacker, int iGib );
+	void GibMonster( void );
+
+	virtual int		Save( CSave &save ); 
+	virtual int		Restore( CRestore &restore );
+	
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	static float m_flNextBounceSoundTime;
+
+	// CBaseEntity *m_pTarget;
+	float m_flDie;
+	Vector m_vecTarget;
+	float m_flNextHunt;
+	float m_flNextHit;
+	Vector m_posPrev;
+	EHANDLE m_hOwner;
+	int  m_iMyClass;
+};
+
+float CSqueakGrenade::m_flNextBounceSoundTime = 0;
+
+LINK_ENTITY_TO_CLASS( monster_snark, CSqueakGrenade );
+TYPEDESCRIPTION	CSqueakGrenade::m_SaveData[] = 
+{
+	DEFINE_FIELD( CSqueakGrenade, m_flDie, FIELD_TIME ),
+	DEFINE_FIELD( CSqueakGrenade, m_vecTarget, FIELD_VECTOR ),
+	DEFINE_FIELD( CSqueakGrenade, m_flNextHunt, FIELD_TIME ),
+	DEFINE_FIELD( CSqueakGrenade, m_flNextHit, FIELD_TIME ),
+	DEFINE_FIELD( CSqueakGrenade, m_posPrev, FIELD_POSITION_VECTOR ),
+	DEFINE_FIELD( CSqueakGrenade, m_hOwner, FIELD_EHANDLE ),
+};
+
+IMPLEMENT_SAVERESTORE( CSqueakGrenade, CGrenade );
+
+#define SQUEEK_DETONATE_DELAY	15.0
+
+int CSqueakGrenade :: Classify ( void )
+{
+	if (m_iMyClass != 0)
+		return m_iMyClass; // protect against recursion
+
+	if (m_hEnemy != NULL)
+	{
+		m_iMyClass = CLASS_INSECT; // no one cares about it
+		switch( m_hEnemy->Classify( ) )
+		{
+			case CLASS_PLAYER:
+			case CLASS_HUMAN_PASSIVE:
+			case CLASS_HUMAN_MILITARY:
+				m_iMyClass = 0;
+				return CLASS_ALIEN_MILITARY; // barney's get mad, grunts get mad at it
+		}
+		m_iMyClass = 0;
+	}
+
+	return CLASS_ALIEN_BIOWEAPON;
+}
+
+void CSqueakGrenade :: Spawn( void )
+{
+	Precache( );
+	// motor
+	pev->movetype = MOVETYPE_BOUNCE;
+	pev->solid = SOLID_BBOX;
+
+	SET_MODEL(ENT(pev), "models/w_squeak.mdl");
+	UTIL_SetSize(pev, Vector( -4, -4, 0), Vector(4, 4, 8));
+	UTIL_SetOrigin( pev, pev->origin );
+
+	SetTouch( &CSqueakGrenade::SuperBounceTouch );
+	SetThink( &CSqueakGrenade::HuntThink );
+	pev->nextthink = gpGlobals->time + 0.1;
+	m_flNextHunt = gpGlobals->time + 1E6;
+
+	pev->flags |= FL_MONSTER;
+	pev->takedamage		= DAMAGE_AIM;
+	pev->health			= gSkillData.snarkHealth;
+	pev->gravity		= 0.5;
+	pev->friction		= 0.5;
+
+	pev->dmg = gSkillData.snarkDmgPop;
+
+	m_flDie = gpGlobals->time + SQUEEK_DETONATE_DELAY;
+
+	m_flFieldOfView = 0; // 180 degrees
+
+	if ( pev->owner )
+		m_hOwner = Instance( pev->owner );
+
+	m_flNextBounceSoundTime = gpGlobals->time;// reset each time a snark is spawned.
+
+	pev->sequence = WSQUEAK_RUN;
+	ResetSequenceInfo( );
+}
+
+void CSqueakGrenade::Precache( void )
+{
+	PRECACHE_MODEL("models/w_squeak.mdl");
+	PRECACHE_SOUND("squeek/sqk_blast1.wav");
+	PRECACHE_SOUND("common/bodysplat.wav");
+	PRECACHE_SOUND("squeek/sqk_die1.wav");
+	PRECACHE_SOUND("squeek/sqk_hunt1.wav");
+	PRECACHE_SOUND("squeek/sqk_hunt2.wav");
+	PRECACHE_SOUND("squeek/sqk_hunt3.wav");
+	PRECACHE_SOUND("squeek/sqk_deploy1.wav");
+}
+
+
+void CSqueakGrenade :: Killed( entvars_t *pevAttacker, int iGib )
+{
+	pev->model = iStringNull;// make invisible
+	SetThink( &CSqueakGrenade::SUB_Remove );
+	SetTouch( NULL );
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	// since squeak grenades never leave a body behind, clear out their takedamage now.
+	// Squeaks do a bit of radius damage when they pop, and that radius damage will
+	// continue to call this function unless we acknowledge the Squeak's death now. (sjb)
+	pev->takedamage = DAMAGE_NO;
+
+	// play squeek blast
+	EMIT_SOUND_DYN(ENT(pev), CHAN_ITEM, "squeek/sqk_blast1.wav", 1, 0.5, 0, PITCH_NORM);	
+
+	CSoundEnt::InsertSound ( bits_SOUND_COMBAT, pev->origin, SMALL_EXPLOSION_VOLUME, 3.0 );
+
+	UTIL_BloodDrips( pev->origin, g_vecZero, BloodColor(), 80 );
+
+	if (m_hOwner != NULL)
+		RadiusDamage ( pev, m_hOwner->pev, pev->dmg, CLASS_NONE, DMG_BLAST );
+	else
+		RadiusDamage ( pev, pev, pev->dmg, CLASS_NONE, DMG_BLAST );
+
+	// reset owner so death message happens
+	if (m_hOwner != NULL)
+		pev->owner = m_hOwner->edict();
+
+	CBaseMonster :: Killed( pevAttacker, GIB_ALWAYS );
+}
+
+void CSqueakGrenade :: GibMonster( void )
+{
+	EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "common/bodysplat.wav", 0.75, ATTN_NORM, 0, 200);		
+}
+
+
+
+void CSqueakGrenade::HuntThink( void )
+{
+	// ALERT( at_console, "think\n" );
+
+	if (!IsInWorld())
+	{
+		SetTouch( NULL );
+		UTIL_Remove( this );
+		return;
+	}
+	
+	StudioFrameAdvance( );
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	// explode when ready
+	if (gpGlobals->time >= m_flDie)
+	{
+		g_vecAttackDir = pev->velocity.Normalize( );
+		pev->health = -1;
+		Killed( pev, 0 );
+		return;
+	}
+
+	// float
+	if (pev->waterlevel != 0)
+	{
+		if (pev->movetype == MOVETYPE_BOUNCE)
+		{
+			pev->movetype = MOVETYPE_FLY;
+		}
+		pev->velocity = pev->velocity * 0.9;
+		pev->velocity.z += 8.0;
+	}
+	else if (pev->movetype = MOVETYPE_FLY)
+	{
+		pev->movetype = MOVETYPE_BOUNCE;
+	}
+
+	// return if not time to hunt
+	if (m_flNextHunt > gpGlobals->time)
+		return;
+
+	m_flNextHunt = gpGlobals->time + 2.0;
+	
+	CBaseEntity *pOther = NULL;
+	Vector vecDir;
+	TraceResult tr;
+
+	Vector vecFlat = pev->velocity;
+	vecFlat.z = 0;
+	vecFlat = vecFlat.Normalize( );
+
+	UTIL_MakeVectors( pev->angles );
+
+	if (m_hEnemy == NULL || !m_hEnemy->IsAlive())
+	{
+		// find target, bounce a bit towards it.
+		Look( 512 );
+		m_hEnemy = BestVisibleEnemy( );
+	}
+
+	// squeek if it's about time blow up
+	if ((m_flDie - gpGlobals->time <= 0.5) && (m_flDie - gpGlobals->time >= 0.3))
+	{
+		EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "squeek/sqk_die1.wav", 1, ATTN_NORM, 0, 100 + RANDOM_LONG(0,0x3F));
+		CSoundEnt::InsertSound ( bits_SOUND_COMBAT, pev->origin, 256, 0.25 );
+	}
+
+	// higher pitch as squeeker gets closer to detonation time
+	float flpitch = 155.0 - 60.0 * ((m_flDie - gpGlobals->time) / SQUEEK_DETONATE_DELAY);
+	if (flpitch < 80)
+		flpitch = 80;
+
+	if (m_hEnemy != NULL)
+	{
+		if (FVisible( m_hEnemy ))
+		{
+			vecDir = m_hEnemy->EyePosition() - pev->origin;
+			m_vecTarget = vecDir.Normalize( );
+		}
+
+		float flVel = pev->velocity.Length();
+		float flAdj = 50.0 / (flVel + 10.0);
+
+		if (flAdj > 1.2)
+			flAdj = 1.2;
+		
+		// ALERT( at_console, "think : enemy\n");
+
+		// ALERT( at_console, "%.0f %.2f %.2f %.2f\n", flVel, m_vecTarget.x, m_vecTarget.y, m_vecTarget.z );
+
+		pev->velocity = pev->velocity * flAdj + m_vecTarget * 300;
+	}
+
+	if (pev->flags & FL_ONGROUND)
+	{
+		pev->avelocity = Vector( 0, 0, 0 );
+	}
+	else
+	{
+		if (pev->avelocity == Vector( 0, 0, 0))
+		{
+			pev->avelocity.x = RANDOM_FLOAT( -100, 100 );
+			pev->avelocity.z = RANDOM_FLOAT( -100, 100 );
+		}
+	}
+
+	if ((pev->origin - m_posPrev).Length() < 1.0)
+	{
+		pev->velocity.x = RANDOM_FLOAT( -100, 100 );
+		pev->velocity.y = RANDOM_FLOAT( -100, 100 );
+	}
+	m_posPrev = pev->origin;
+
+	pev->angles = UTIL_VecToAngles( pev->velocity );
+	pev->angles.z = 0;
+	pev->angles.x = 0;
+}
+
+
+void CSqueakGrenade::SuperBounceTouch( CBaseEntity *pOther )
+{
+	float	flpitch;
+
+	TraceResult tr = UTIL_GetGlobalTrace( );
+
+	// don't hit the guy that launched this grenade
+	if ( pev->owner && pOther->edict() == pev->owner )
+		return;
+
+	// at least until we've bounced once
+	pev->owner = NULL;
+
+	pev->angles.x = 0;
+	pev->angles.z = 0;
+
+	// avoid bouncing too much
+	if (m_flNextHit > gpGlobals->time)
+		return;
+
+	// higher pitch as squeeker gets closer to detonation time
+	flpitch = 155.0 - 60.0 * ((m_flDie - gpGlobals->time) / SQUEEK_DETONATE_DELAY);
+
+	if ( pOther->pev->takedamage && m_flNextAttack < gpGlobals->time )
+	{
+		// attack!
+
+		// make sure it's me who has touched them
+		if (tr.pHit == pOther->edict())
+		{
+			// and it's not another squeakgrenade
+			if (tr.pHit->v.modelindex != pev->modelindex)
+			{
+				// ALERT( at_console, "hit enemy\n");
+				ClearMultiDamage( );
+				pOther->TraceAttack(pev, gSkillData.snarkDmgBite, gpGlobals->v_forward, &tr, DMG_SLASH ); 
+				if (m_hOwner != NULL)
+					ApplyMultiDamage( pev, m_hOwner->pev );
+				else
+					ApplyMultiDamage( pev, pev );
+
+				pev->dmg += gSkillData.snarkDmgPop; // add more explosion damage
+				// m_flDie += 2.0; // add more life
+
+				// make bite sound
+				EMIT_SOUND_DYN(ENT(pev), CHAN_WEAPON, "squeek/sqk_deploy1.wav", 1.0, ATTN_NORM, 0, (int)flpitch);
+				m_flNextAttack = gpGlobals->time + 0.5;
+			}
+		}
+		else
+		{
+			// ALERT( at_console, "been hit\n");
+		}
+	}
+
+	m_flNextHit = gpGlobals->time + 0.1;
+	m_flNextHunt = gpGlobals->time;
+
+	if ( g_pGameRules->IsMultiplayer() )
+	{
+		// in multiplayer, we limit how often snarks can make their bounce sounds to prevent overflows.
+		if ( gpGlobals->time < m_flNextBounceSoundTime )
+		{
+			// too soon!
+			return;
+		}
+	}
+
+	if (!(pev->flags & FL_ONGROUND))
+	{
+		// play bounce sound
+		float flRndSound = RANDOM_FLOAT ( 0 , 1 );
+
+		if ( flRndSound <= 0.33 )
+			EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "squeek/sqk_hunt1.wav", 1, ATTN_NORM, 0, (int)flpitch);		
+		else if (flRndSound <= 0.66)
+			EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "squeek/sqk_hunt2.wav", 1, ATTN_NORM, 0, (int)flpitch);
+		else 
+			EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "squeek/sqk_hunt3.wav", 1, ATTN_NORM, 0, (int)flpitch);
+		CSoundEnt::InsertSound ( bits_SOUND_COMBAT, pev->origin, 256, 0.25 );
+	}
+	else
+	{
+		// skittering sound
+		CSoundEnt::InsertSound ( bits_SOUND_COMBAT, pev->origin, 100, 0.1 );
+	}
+
+	m_flNextBounceSoundTime = gpGlobals->time + 0.5;// half second.
+}
+
+#endif
+
+LINK_ENTITY_TO_CLASS( weapon_snark, CSqueak );
+
+
+void CSqueak::Spawn( )
+{
+	Precache( );
+	m_iId = WEAPON_SNARK;
+	SET_MODEL(ENT(pev), "models/w_sqknest.mdl");
+
+	FallInit();//get ready to fall down.
+
+	m_iDefaultAmmo = SNARK_DEFAULT_GIVE;
+		
+	pev->sequence = 1;
+	pev->animtime = gpGlobals->time;
+	pev->framerate = 1.0;
+}
+
+
+void CSqueak::Precache( void )
+{
+	PRECACHE_MODEL("models/w_sqknest.mdl");
+	PRECACHE_MODEL("models/v_squeak.mdl");
+	PRECACHE_MODEL("models/p_squeak.mdl");
+	PRECACHE_SOUND("squeek/sqk_hunt2.wav");
+	PRECACHE_SOUND("squeek/sqk_hunt3.wav");
+	UTIL_PrecacheOther("monster_snark");
+
+	m_usSnarkFire = PRECACHE_EVENT ( 1, "events/snarkfire.sc" );
+}
+
+
+int CSqueak::GetItemInfo(ItemInfo *p)
+{
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = "Snarks";
+	p->iMaxAmmo1 = SNARK_MAX_CARRY;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = -1;
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iSlot = 4;
+	p->iPosition = 3;
+	p->iId = m_iId = WEAPON_SNARK;
+	p->iWeight = SNARK_WEIGHT;
+	p->iFlags = ITEM_FLAG_LIMITINWORLD | ITEM_FLAG_EXHAUSTIBLE;
+
+	return 1;
+}
+
+
+
+BOOL CSqueak::Deploy( )
+{
+	// play hunt sound
+	float flRndSound = RANDOM_FLOAT ( 0 , 1 );
+
+	if ( flRndSound <= 0.5 )
+		EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "squeek/sqk_hunt2.wav", 1, ATTN_NORM, 0, 100);
+	else 
+		EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "squeek/sqk_hunt3.wav", 1, ATTN_NORM, 0, 100);
+
+	m_pPlayer->m_iWeaponVolume = QUIET_GUN_VOLUME;
+
+	return DefaultDeploy( "models/v_squeak.mdl", "models/p_squeak.mdl", SQUEAK_UP, "squeak" );
+}
+
+
+void CSqueak::Holster( int skiplocal /* = 0 */ )
+{
+	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 0.5;
+	
+	if ( !m_pPlayer->m_rgAmmo[ m_iPrimaryAmmoType ] )
+	{
+		m_pPlayer->pev->weapons &= ~(1<<WEAPON_SNARK);
+		SetThink( &CSqueak::DestroyItem );
+		pev->nextthink = gpGlobals->time + 0.1;
+		return;
+	}
+	
+	SendWeaponAnim( SQUEAK_DOWN );
+	EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "common/null.wav", 1.0, ATTN_NORM);
+}
+
+
+void CSqueak::PrimaryAttack()
+{
+	if ( m_pPlayer->m_rgAmmo[ m_iPrimaryAmmoType ] )
+	{
+		UTIL_MakeVectors( m_pPlayer->pev->v_angle );
+		TraceResult tr;
+		Vector trace_origin;
+
+		// HACK HACK:  Ugly hacks to handle change in origin based on new physics code for players
+		// Move origin up if crouched and start trace a bit outside of body ( 20 units instead of 16 )
+		trace_origin = m_pPlayer->pev->origin;
+		if ( m_pPlayer->pev->flags & FL_DUCKING )
+		{
+			trace_origin = trace_origin - ( VEC_HULL_MIN - VEC_DUCK_HULL_MIN );
+		}
+
+		// find place to toss monster
+		UTIL_TraceLine( trace_origin + gpGlobals->v_forward * 20, trace_origin + gpGlobals->v_forward * 64, dont_ignore_monsters, NULL, &tr );
+
+	int flags;
+#ifdef CLIENT_WEAPONS
+	flags = FEV_NOTHOST;
+#else
+	flags = 0;
+#endif
+
+	    PLAYBACK_EVENT_FULL( flags, m_pPlayer->edict(), m_usSnarkFire, 0.0, (float *)&g_vecZero, (float *)&g_vecZero, 0.0, 0.0, 0, 0, 0, 0 );
+
+		if ( tr.fAllSolid == 0 && tr.fStartSolid == 0 && tr.flFraction > 0.25 )
+		{
+			// player "shoot" animation
+			m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
+
+#ifndef CLIENT_DLL
+			CBaseEntity *pSqueak = CBaseEntity::Create( "monster_snark", tr.vecEndPos, m_pPlayer->pev->v_angle, m_pPlayer->edict() );
+			pSqueak->pev->velocity = gpGlobals->v_forward * 200 + m_pPlayer->pev->velocity;
+#endif
+
+			// play hunt sound
+			float flRndSound = RANDOM_FLOAT ( 0 , 1 );
+
+			if ( flRndSound <= 0.5 )
+				EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "squeek/sqk_hunt2.wav", 1, ATTN_NORM, 0, 105);
+			else 
+				EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "squeek/sqk_hunt3.wav", 1, ATTN_NORM, 0, 105);
+
+			m_pPlayer->m_iWeaponVolume = QUIET_GUN_VOLUME;
+
+			m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType]--;
+
+			m_fJustThrown = 1;
+
+			m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.3;
+			m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 1.0;
+		}
+	}
+}
+
+
+void CSqueak::SecondaryAttack( void )
+{
+
+}
+
+
+void CSqueak::WeaponIdle( void )
+{
+	if ( m_flTimeWeaponIdle > UTIL_WeaponTimeBase() )
+		return;
+
+	if (m_fJustThrown)
+	{
+		m_fJustThrown = 0;
+
+		if ( !m_pPlayer->m_rgAmmo[PrimaryAmmoIndex()] )
+		{
+			RetireWeapon();
+			return;
+		}
+
+		SendWeaponAnim( SQUEAK_UP );
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
+		return;
+	}
+
+	int iAnim;
+	float flRand = UTIL_SharedRandomFloat( m_pPlayer->random_seed, 0, 1 );
+	if (flRand <= 0.75)
+	{
+		iAnim = SQUEAK_IDLE1;
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 30.0 / 16 * (2);
+	}
+	else if (flRand <= 0.875)
+	{
+		iAnim = SQUEAK_FIDGETFIT;
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 70.0 / 16.0;
+	}
+	else
+	{
+		iAnim = SQUEAK_FIDGETNIP;
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 80.0 / 16.0;
+	}
+	SendWeaponAnim( iAnim );
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/stats.cpp b/main/source/dlls/stats.cpp
new file mode 100644
index 00000000..54ea2839
--- /dev/null
+++ b/main/source/dlls/stats.cpp
@@ -0,0 +1,149 @@
+#include "extdll.h"
+#include "util.h"
+
+#include "cbase.h"
+#include "player.h"
+#include "trains.h"
+#include "nodes.h"
+#include "weapons.h"
+#include "soundent.h"
+#include "monsters.h"
+#include "..\engine\shake.h"
+#include "decals.h"
+#include "gamerules.h"
+
+
+float AmmoDamage( const char *pName )
+{
+	if ( !pName )
+		return 0;
+
+	if ( !strcmp( pName, "9mm" ) )
+		return gSkillData.plrDmg9MM;
+	if ( !strcmp( pName, "357" ) )
+		return gSkillData.plrDmg357;
+	if ( !strcmp( pName, "ARgrenades" ) )
+		return gSkillData.plrDmgM203Grenade;
+	if ( !strcmp( pName, "buckshot" ) )
+		return gSkillData.plrDmgBuckshot;
+	if ( !strcmp( pName, "bolts") )
+		return gSkillData.plrDmgCrossbowMonster;
+	if ( !strcmp( pName, "rockets") )
+		return gSkillData.plrDmgRPG;
+	if ( !strcmp( pName, "uranium") )
+		return gSkillData.plrDmgGauss;
+	if ( !strcmp( pName, "Hand Grenade") )
+		return gSkillData.plrDmgHandGrenade;
+	if ( !strcmp( pName, "Satchel Charge") )
+		return gSkillData.plrDmgSatchel;
+	if ( !strcmp( pName, "Trip Mine") )
+		return gSkillData.plrDmgTripmine;
+
+	return 0;
+}
+
+
+void UpdateStatsFile( float dataTime, char *pMapname, float health, float ammo, int skillLevel )
+{
+	FILE *fp;
+
+	fp = fopen( "stats.txt", "a" );
+	if ( !fp )
+		return;
+	fprintf( fp, "%6.2f, %6.2f, %6.2f, %s, %2d\n", dataTime, health, ammo, pMapname, skillLevel );
+	fclose( fp );
+}
+
+
+#define AMMO_THRESHOLD		10			// This much ammo goes by before it is "interesting"
+#define HEALTH_THRESHOLD	10			// Same for health
+#define OUTPUT_LATENCY		3			// This many seconds for ammo/health to settle
+
+typedef struct
+{
+	int		lastAmmo;
+	float	lastHealth;
+	float	lastOutputTime; // NOTE: These times are in "game" time -- a running total of elapsed time since the game started
+	float	nextOutputTime;
+	float	dataTime;
+	float	gameTime;
+	float	lastGameTime;
+} TESTSTATS;
+
+TESTSTATS gStats = {0,0,0,0,0,0,0};
+
+void UpdateStats( CBasePlayer *pPlayer )
+{
+	int i;
+
+	int ammoCount[ MAX_AMMO_SLOTS ];
+	memcpy( ammoCount, pPlayer->m_rgAmmo, MAX_AMMO_SLOTS * sizeof(int) );
+
+	// Keep a running time, so the graph doesn't overlap
+	
+	if ( gpGlobals->time < gStats.lastGameTime )	// Changed level or died, don't b0rk
+	{
+		gStats.lastGameTime = gpGlobals->time;
+		gStats.dataTime = gStats.gameTime;
+	}
+
+	gStats.gameTime += gpGlobals->time - gStats.lastGameTime;
+	gStats.lastGameTime = gpGlobals->time;
+
+	for (i = 0; i < MAX_ITEM_TYPES; i++)
+	{
+		CBasePlayerItem *p = pPlayer->m_rgpPlayerItems[i];
+		while (p)
+		{
+			ItemInfo II;
+			
+			memset(&II, 0, sizeof(II));
+			p->GetItemInfo(&II);
+
+			int index = pPlayer->GetAmmoIndex(II.pszAmmo1);
+			if ( index >= 0 )
+				ammoCount[ index ] += ((CBasePlayerWeapon *)p)->m_iClip;
+			
+			p = p->m_pNext;
+		}
+	}
+
+	float ammo = 0;
+	for (i = 1; i < MAX_AMMO_SLOTS; i++)
+	{
+		ammo += ammoCount[i] * AmmoDamage( CBasePlayerItem::AmmoInfoArray[i].pszName );
+	}
+
+	float health = pPlayer->pev->health + pPlayer->pev->armorvalue * 2;	// Armor is 2X health
+	float ammoDelta = fabs( ammo - gStats.lastAmmo );
+	float healthDelta = fabs( health - gStats.lastHealth );
+	int forceWrite = 0;
+	if ( health <= 0 && gStats.lastHealth > 0 )
+		forceWrite = 1;
+
+	if ( (ammoDelta > AMMO_THRESHOLD || healthDelta > HEALTH_THRESHOLD) && !forceWrite )
+	{
+		if ( gStats.nextOutputTime == 0 )
+			gStats.dataTime = gStats.gameTime;
+
+		gStats.lastAmmo = ammo;
+		gStats.lastHealth = health;
+
+		gStats.nextOutputTime = gStats.gameTime + OUTPUT_LATENCY;
+	}
+	else if ( (gStats.nextOutputTime != 0 && gStats.nextOutputTime < gStats.gameTime) || forceWrite )
+	{
+		UpdateStatsFile( gStats.dataTime, (char *)STRING(gpGlobals->mapname), health, ammo, (int)CVAR_GET_FLOAT("skill") );
+
+		gStats.lastAmmo = ammo;
+		gStats.lastHealth = health;
+		gStats.lastOutputTime = gStats.gameTime;
+		gStats.nextOutputTime = 0;
+	}
+}
+
+void InitStats( CBasePlayer *pPlayer )
+{
+	gStats.lastGameTime = gpGlobals->time;	// Fixup stats time
+}
+
diff --git a/main/source/dlls/subs.cpp b/main/source/dlls/subs.cpp
new file mode 100644
index 00000000..b249b2b9
--- /dev/null
+++ b/main/source/dlls/subs.cpp
@@ -0,0 +1,568 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/*
+
+===== subs.cpp ========================================================
+
+  frequently used global functions
+
+*/
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "saverestore.h"
+#include "nodes.h"
+#include "doors.h"
+
+extern CGraph WorldGraph;
+
+extern BOOL FEntIsVisible(entvars_t* pev, entvars_t* pevTarget);
+
+extern DLL_GLOBAL int g_iSkillLevel;
+
+
+// Landmark class
+void CPointEntity :: Spawn( void )
+{
+	pev->solid = SOLID_NOT;
+	
+//	UTIL_SetSize(pev, g_vecZero, g_vecZero);
+}
+
+
+class CNullEntity : public CBaseEntity
+{
+public:
+	void Spawn( void );
+};
+
+
+// Null Entity, remove on startup
+void CNullEntity :: Spawn( void )
+{
+	REMOVE_ENTITY(ENT(pev));
+}
+LINK_ENTITY_TO_CLASS(info_null,CNullEntity);
+
+class CBaseDMStart : public CPointEntity
+{
+public:
+	void		KeyValue( KeyValueData *pkvd );
+	BOOL		IsTriggered( CBaseEntity *pEntity );
+
+private:
+};
+
+// These are the new entry points to entities. 
+LINK_ENTITY_TO_CLASS(info_player_deathmatch,CBaseDMStart);
+LINK_ENTITY_TO_CLASS(info_player_start,CPointEntity);
+LINK_ENTITY_TO_CLASS(info_landmark,CPointEntity);
+
+void CBaseDMStart::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "master"))
+	{
+		pev->netname = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CPointEntity::KeyValue( pkvd );
+}
+
+BOOL CBaseDMStart::IsTriggered( CBaseEntity *pEntity )
+{
+	BOOL master = UTIL_IsMasterTriggered( pev->netname, pEntity );
+
+	return master;
+}
+
+// This updates global tables that need to know about entities being removed
+void CBaseEntity::UpdateOnRemove( void )
+{
+	int	i;
+
+	if ( FBitSet( pev->flags, FL_GRAPHED ) )
+	{
+	// this entity was a LinkEnt in the world node graph, so we must remove it from
+	// the graph since we are removing it from the world.
+		for ( i = 0 ; i < WorldGraph.m_cLinks ; i++ )
+		{
+			if ( WorldGraph.m_pLinkPool [ i ].m_pLinkEnt == pev )
+			{
+				// if this link has a link ent which is the same ent that is removing itself, remove it!
+				WorldGraph.m_pLinkPool [ i ].m_pLinkEnt = NULL;
+			}
+		}
+	}
+	if ( pev->globalname )
+		gGlobalState.EntitySetState( pev->globalname, GLOBAL_DEAD );
+}
+
+// Convenient way to delay removing oneself
+void CBaseEntity :: SUB_Remove( void )
+{
+	UpdateOnRemove();
+	if (pev->health > 0)
+	{
+		// this situation can screw up monsters who can't tell their entity pointers are invalid.
+		pev->health = 0;
+		ALERT( at_aiconsole, "SUB_Remove called on entity with health > 0\n");
+	}
+
+	REMOVE_ENTITY(ENT(pev));
+}
+
+
+// Convenient way to explicitly do nothing (passed to functions that require a method)
+void CBaseEntity :: SUB_DoNothing( void )
+{
+}
+
+
+// Global Savedata for Delay
+TYPEDESCRIPTION	CBaseDelay::m_SaveData[] = 
+{
+	DEFINE_FIELD( CBaseDelay, m_flDelay, FIELD_FLOAT ),
+	DEFINE_FIELD( CBaseDelay, m_iszKillTarget, FIELD_STRING ),
+};
+
+IMPLEMENT_SAVERESTORE( CBaseDelay, CBaseEntity );
+
+void CBaseDelay :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "delay"))
+	{
+		m_flDelay = atof( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "killtarget"))
+	{
+		m_iszKillTarget = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+	{
+		CBaseEntity::KeyValue( pkvd );
+	}
+}
+
+
+/*
+==============================
+SUB_UseTargets
+
+If self.delay is set, a DelayedUse entity will be created that will actually
+do the SUB_UseTargets after that many seconds have passed.
+
+Removes all entities with a targetname that match self.killtarget,
+and removes them, so some events can remove other triggers.
+
+Search for (string)targetname in all entities that
+match (string)self.target and call their .use function (if they have one)
+
+==============================
+*/
+void CBaseEntity :: SUB_UseTargets( CBaseEntity *pActivator, USE_TYPE useType, float value )
+{
+	//
+	// fire targets
+	//
+	if (!FStringNull(pev->target))
+	{
+		FireTargets( STRING(pev->target), pActivator, this, useType, value );
+	}
+}
+
+
+void FireTargets( const char *targetName, CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	edict_t *pentTarget = NULL;
+	if ( !targetName )
+		return;
+
+	ALERT( at_aiconsole, "Firing: (%s)\n", targetName );
+
+	for (;;)
+	{
+		pentTarget = FIND_ENTITY_BY_TARGETNAME(pentTarget, targetName);
+		if (FNullEnt(pentTarget))
+			break;
+
+		CBaseEntity *pTarget = CBaseEntity::Instance( pentTarget );
+		if ( pTarget && !(pTarget->pev->flags & FL_KILLME) )	// Don't use dying ents
+		{
+			ALERT( at_aiconsole, "Found: %s, firing (%s)\n", STRING(pTarget->pev->classname), targetName );
+			pTarget->Use( pActivator, pCaller, useType, value );
+		}
+	}
+}
+
+LINK_ENTITY_TO_CLASS( DelayedUse, CBaseDelay );
+
+
+void CBaseDelay :: SUB_UseTargets( CBaseEntity *pActivator, USE_TYPE useType, float value )
+{
+	//
+	// exit immediatly if we don't have a target or kill target
+	//
+	if (FStringNull(pev->target) && !m_iszKillTarget)
+		return;
+
+	//
+	// check for a delay
+	//
+	if (m_flDelay != 0)
+	{
+		// create a temp object to fire at a later time
+		CBaseDelay *pTemp = GetClassPtr( (CBaseDelay *)NULL);
+		pTemp->pev->classname = MAKE_STRING("DelayedUse");
+
+		pTemp->pev->nextthink = gpGlobals->time + m_flDelay;
+
+		pTemp->SetThink( &CBaseDelay::DelayThink );
+		
+		// Save the useType
+		pTemp->pev->button = (int)useType;
+		pTemp->m_iszKillTarget = m_iszKillTarget;
+		pTemp->m_flDelay = 0; // prevent "recursion"
+		pTemp->pev->target = pev->target;
+
+		// HACKHACK
+		// This wasn't in the release build of Half-Life.  We should have moved m_hActivator into this class
+		// but changing member variable hierarchy would break save/restore without some ugly code.
+		// This code is not as ugly as that code
+		if ( pActivator && pActivator->IsPlayer() )		// If a player activates, then save it
+		{
+			pTemp->pev->owner = pActivator->edict();
+		}
+		else
+		{
+			pTemp->pev->owner = NULL;
+		}
+
+		return;
+	}
+
+	//
+	// kill the killtargets
+	//
+
+	if ( m_iszKillTarget )
+	{
+		edict_t *pentKillTarget = NULL;
+
+		ALERT( at_aiconsole, "KillTarget: %s\n", STRING(m_iszKillTarget) );
+		pentKillTarget = FIND_ENTITY_BY_TARGETNAME( NULL, STRING(m_iszKillTarget) );
+		while ( !FNullEnt(pentKillTarget) )
+		{
+			UTIL_Remove( CBaseEntity::Instance(pentKillTarget) );
+
+			ALERT( at_aiconsole, "killing %s\n", STRING( pentKillTarget->v.classname ) );
+			pentKillTarget = FIND_ENTITY_BY_TARGETNAME( pentKillTarget, STRING(m_iszKillTarget) );
+		}
+	}
+	
+	//
+	// fire targets
+	//
+	if (!FStringNull(pev->target))
+	{
+		FireTargets( STRING(pev->target), pActivator, this, useType, value );
+	}
+}
+
+
+/*
+void CBaseDelay :: SUB_UseTargetsEntMethod( void )
+{
+	SUB_UseTargets(pev);
+}
+*/
+
+/*
+QuakeEd only writes a single float for angles (bad idea), so up and down are
+just constant angles.
+*/
+void SetMovedir( entvars_t *pev )
+{
+	if (pev->angles == Vector(0, -1, 0))
+	{
+		pev->movedir = Vector(0, 0, 1);
+	}
+	else if (pev->angles == Vector(0, -2, 0))
+	{
+		pev->movedir = Vector(0, 0, -1);
+	}
+	else
+	{
+		UTIL_MakeVectors(pev->angles);
+		pev->movedir = gpGlobals->v_forward;
+	}
+	
+	pev->angles = g_vecZero;
+}
+
+
+
+
+void CBaseDelay::DelayThink( void )
+{
+	CBaseEntity *pActivator = NULL;
+
+	if ( pev->owner != NULL )		// A player activated this on delay
+	{
+		pActivator = CBaseEntity::Instance( pev->owner );	
+	}
+	// The use type is cached (and stashed) in pev->button
+	SUB_UseTargets( pActivator, (USE_TYPE)pev->button, 0 );
+	REMOVE_ENTITY(ENT(pev));
+}
+
+
+// Global Savedata for Toggle
+TYPEDESCRIPTION	CBaseToggle::m_SaveData[] = 
+{
+	DEFINE_FIELD( CBaseToggle, m_toggle_state, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseToggle, m_flActivateFinished, FIELD_TIME ),
+	DEFINE_FIELD( CBaseToggle, m_flMoveDistance, FIELD_FLOAT ),
+	DEFINE_FIELD( CBaseToggle, m_flWait, FIELD_FLOAT ),
+	DEFINE_FIELD( CBaseToggle, m_flLip, FIELD_FLOAT ),
+	DEFINE_FIELD( CBaseToggle, m_flTWidth, FIELD_FLOAT ),
+	DEFINE_FIELD( CBaseToggle, m_flTLength, FIELD_FLOAT ),
+	DEFINE_FIELD( CBaseToggle, m_vecPosition1, FIELD_POSITION_VECTOR ),
+	DEFINE_FIELD( CBaseToggle, m_vecPosition2, FIELD_POSITION_VECTOR ),
+	DEFINE_FIELD( CBaseToggle, m_vecAngle1, FIELD_VECTOR ),		// UNDONE: Position could go through transition, but also angle?
+	DEFINE_FIELD( CBaseToggle, m_vecAngle2, FIELD_VECTOR ),		// UNDONE: Position could go through transition, but also angle?
+	DEFINE_FIELD( CBaseToggle, m_cTriggersLeft, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseToggle, m_flHeight, FIELD_FLOAT ),
+	DEFINE_FIELD( CBaseToggle, m_hActivator, FIELD_EHANDLE ),
+	DEFINE_FIELD( CBaseToggle, m_pfnCallWhenMoveDone, FIELD_FUNCTION ),
+	DEFINE_FIELD( CBaseToggle, m_vecFinalDest, FIELD_POSITION_VECTOR ),
+	DEFINE_FIELD( CBaseToggle, m_vecFinalAngle, FIELD_VECTOR ),
+	DEFINE_FIELD( CBaseToggle, m_sMaster, FIELD_STRING),
+	DEFINE_FIELD( CBaseToggle, m_bitsDamageInflict, FIELD_INTEGER ),	// damage type inflicted
+};
+IMPLEMENT_SAVERESTORE( CBaseToggle, CBaseAnimating );
+
+
+void CBaseToggle::SaveDataForReset()
+{
+}
+
+void CBaseToggle::ResetEntity()
+{
+}
+
+void CBaseToggle::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "lip"))
+	{
+		m_flLip = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "wait"))
+	{
+		m_flWait = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "master"))
+	{
+		m_sMaster = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "distance"))
+	{
+		m_flMoveDistance = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseDelay::KeyValue( pkvd );
+}
+
+/*
+=============
+LinearMove
+
+calculate pev->velocity and pev->nextthink to reach vecDest from
+pev->origin traveling at flSpeed
+===============
+*/
+void CBaseToggle ::  LinearMove( Vector	vecDest, float flSpeed )
+{
+	ASSERTSZ(flSpeed != 0, "LinearMove:  no speed is defined!");
+//	ASSERTSZ(m_pfnCallWhenMoveDone != NULL, "LinearMove: no post-move function defined");
+	
+	m_vecFinalDest = vecDest;
+
+	// Already there?
+	if (vecDest == pev->origin)
+	{
+		LinearMoveDone();
+		return;
+	}
+		
+	// set destdelta to the vector needed to move
+	Vector vecDestDelta = vecDest - pev->origin;
+	
+	// divide vector length by speed to get time to reach dest
+	float flTravelTime = vecDestDelta.Length() / flSpeed;
+
+	// set nextthink to trigger a call to LinearMoveDone when dest is reached
+	pev->nextthink = pev->ltime + flTravelTime;
+	SetThink( &CBaseToggle::LinearMoveDone );
+
+	// scale the destdelta vector by the time spent traveling to get velocity
+	pev->velocity = vecDestDelta / flTravelTime;
+}
+
+
+/*
+============
+After moving, set origin to exact final destination, call "move done" function
+============
+*/
+void CBaseToggle :: LinearMoveDone( void )
+{
+	UTIL_SetOrigin(pev, m_vecFinalDest);
+	pev->velocity = g_vecZero;
+	pev->nextthink = -1;
+	if ( m_pfnCallWhenMoveDone )
+		(this->*m_pfnCallWhenMoveDone)();
+}
+
+BOOL CBaseToggle :: IsLockedByMaster( void )
+{
+	if (m_sMaster && !UTIL_IsMasterTriggered(m_sMaster, m_hActivator))
+		return TRUE;
+	else
+		return FALSE;
+}
+
+/*
+=============
+AngularMove
+
+calculate pev->velocity and pev->nextthink to reach vecDest from
+pev->origin traveling at flSpeed
+Just like LinearMove, but rotational.
+===============
+*/
+void CBaseToggle :: AngularMove( Vector vecDestAngle, float flSpeed )
+{
+	ASSERTSZ(flSpeed != 0, "AngularMove:  no speed is defined!");
+//	ASSERTSZ(m_pfnCallWhenMoveDone != NULL, "AngularMove: no post-move function defined");
+	
+	m_vecFinalAngle = vecDestAngle;
+
+	// Already there?
+	if (vecDestAngle == pev->angles)
+	{
+		AngularMoveDone();
+		return;
+	}
+	
+	// set destdelta to the vector needed to move
+	Vector vecDestDelta = vecDestAngle - pev->angles;
+	
+	// divide by speed to get time to reach dest
+	float flTravelTime = vecDestDelta.Length() / flSpeed;
+
+	// set nextthink to trigger a call to AngularMoveDone when dest is reached
+	pev->nextthink = pev->ltime + flTravelTime;
+	SetThink( &CBaseToggle::AngularMoveDone );
+
+	// scale the destdelta vector by the time spent traveling to get velocity
+	pev->avelocity = vecDestDelta / flTravelTime;
+}
+
+
+/*
+============
+After rotating, set angle to exact final angle, call "move done" function
+============
+*/
+void CBaseToggle :: AngularMoveDone( void )
+{
+	pev->angles = m_vecFinalAngle;
+	pev->avelocity = g_vecZero;
+	pev->nextthink = -1;
+	if ( m_pfnCallWhenMoveDone )
+		(this->*m_pfnCallWhenMoveDone)();
+}
+
+
+float CBaseToggle :: AxisValue( int flags, const Vector &angles )
+{
+	if ( FBitSet(flags, SF_DOOR_ROTATE_Z) )
+		return angles.z;
+	if ( FBitSet(flags, SF_DOOR_ROTATE_X) )
+		return angles.x;
+
+	return angles.y;
+}
+
+
+void CBaseToggle :: AxisDir( entvars_t *pev )
+{
+	if ( FBitSet(pev->spawnflags, SF_DOOR_ROTATE_Z) )
+		pev->movedir = Vector ( 0, 0, 1 );	// around z-axis
+	else if ( FBitSet(pev->spawnflags, SF_DOOR_ROTATE_X) )
+		pev->movedir = Vector ( 1, 0, 0 );	// around x-axis
+	else
+		pev->movedir = Vector ( 0, 1, 0 );		// around y-axis
+}
+
+
+float CBaseToggle :: AxisDelta( int flags, const Vector &angle1, const Vector &angle2 )
+{
+	if ( FBitSet (flags, SF_DOOR_ROTATE_Z) )
+		return angle1.z - angle2.z;
+	
+	if ( FBitSet (flags, SF_DOOR_ROTATE_X) )
+		return angle1.x - angle2.x;
+
+	return angle1.y - angle2.y;
+}
+
+
+/*
+=============
+FEntIsVisible
+
+returns TRUE if the passed entity is visible to caller, even if not infront ()
+=============
+*/
+	BOOL
+FEntIsVisible(
+	entvars_t*		pev,
+	entvars_t*		pevTarget)
+	{
+	Vector vecSpot1 = pev->origin + pev->view_ofs;
+	Vector vecSpot2 = pevTarget->origin + pevTarget->view_ofs;
+	TraceResult tr;
+
+	UTIL_TraceLine(vecSpot1, vecSpot2, ignore_monsters, ENT(pev), &tr);
+	
+	if (tr.fInOpen && tr.fInWater)
+		return FALSE;                   // sight line crossed contents
+
+	if (tr.flFraction == 1)
+		return TRUE;
+
+	return FALSE;
+	}
+
+
diff --git a/main/source/dlls/talkmonster.cpp b/main/source/dlls/talkmonster.cpp
new file mode 100644
index 00000000..8e283fa0
--- /dev/null
+++ b/main/source/dlls/talkmonster.cpp
@@ -0,0 +1,1475 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"schedule.h"
+#include	"talkmonster.h"
+#include	"defaultai.h"
+#include	"scripted.h"
+#include	"soundent.h"
+#include	"animation.h"
+
+//=========================================================
+// Talking monster base class
+// Used for scientists and barneys
+//=========================================================
+float	CTalkMonster::g_talkWaitTime = 0;		// time delay until it's ok to speak: used so that two NPCs don't talk at once
+
+// Allow assignment within conditional
+#pragma warning (disable: 4706)
+
+// NOTE: m_voicePitch & m_szGrp should be fixed up by precache each save/restore
+
+TYPEDESCRIPTION	CTalkMonster::m_SaveData[] = 
+{
+	DEFINE_FIELD( CTalkMonster, m_bitsSaid, FIELD_INTEGER ),
+	DEFINE_FIELD( CTalkMonster, m_nSpeak, FIELD_INTEGER ),
+
+	// Recalc'ed in Precache()
+	//	DEFINE_FIELD( CTalkMonster, m_voicePitch, FIELD_INTEGER ),
+	//	DEFINE_FIELD( CTalkMonster, m_szGrp, FIELD_??? ),
+	DEFINE_FIELD( CTalkMonster, m_useTime, FIELD_TIME ),
+	DEFINE_FIELD( CTalkMonster, m_iszUse, FIELD_STRING ),
+	DEFINE_FIELD( CTalkMonster, m_iszUnUse, FIELD_STRING ),
+	DEFINE_FIELD( CTalkMonster, m_flLastSaidSmelled, FIELD_TIME ),
+	DEFINE_FIELD( CTalkMonster, m_flStopTalkTime, FIELD_TIME ),
+	DEFINE_FIELD( CTalkMonster, m_hTalkTarget, FIELD_EHANDLE ),
+};
+
+IMPLEMENT_SAVERESTORE( CTalkMonster, CBaseMonster );
+
+// array of friend names
+char *CTalkMonster::m_szFriends[TLK_CFRIENDS] = 
+{
+	"monster_barney",
+	"monster_scientist",
+	"monster_sitting_scientist",
+};
+
+
+//=========================================================
+// AI Schedules Specific to talking monsters
+//=========================================================
+
+Task_t	tlIdleResponse[] =
+{
+	{ TASK_SET_ACTIVITY,	(float)ACT_IDLE	},// Stop and listen
+	{ TASK_WAIT,			(float)0.5		},// Wait until sure it's me they are talking to
+	{ TASK_TLK_EYECONTACT,	(float)0		},// Wait until speaker is done
+	{ TASK_TLK_RESPOND,		(float)0		},// Wait and then say my response
+	{ TASK_TLK_IDEALYAW,	(float)0		},// look at who I'm talking to
+	{ TASK_FACE_IDEAL,		(float)0		}, 
+	{ TASK_SET_ACTIVITY,	(float)ACT_SIGNAL3	},
+	{ TASK_TLK_EYECONTACT,	(float)0		},// Wait until speaker is done
+};
+
+Schedule_t	slIdleResponse[] =
+{
+	{ 
+		tlIdleResponse,
+		ARRAYSIZE ( tlIdleResponse ), 
+		bits_COND_NEW_ENEMY		|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE,
+		0,
+		"Idle Response"
+
+	},
+};
+
+Task_t	tlIdleSpeak[] =
+{
+	{ TASK_TLK_SPEAK,		(float)0		},// question or remark
+	{ TASK_TLK_IDEALYAW,	(float)0		},// look at who I'm talking to
+	{ TASK_FACE_IDEAL,		(float)0		}, 
+	{ TASK_SET_ACTIVITY,	(float)ACT_SIGNAL3	},
+	{ TASK_TLK_EYECONTACT,	(float)0		},
+	{ TASK_WAIT_RANDOM,		(float)0.5		},
+};
+
+Schedule_t	slIdleSpeak[] =
+{
+	{ 
+		tlIdleSpeak,
+		ARRAYSIZE ( tlIdleSpeak ), 
+		bits_COND_NEW_ENEMY		|
+		bits_COND_CLIENT_PUSH	|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE,
+		0,
+		"Idle Speak"
+	},
+};
+
+Task_t	tlIdleSpeakWait[] =
+{
+	{ TASK_SET_ACTIVITY,	(float)ACT_SIGNAL3	},// Stop and talk
+	{ TASK_TLK_SPEAK,		(float)0		},// question or remark
+	{ TASK_TLK_EYECONTACT,	(float)0		},// 
+	{ TASK_WAIT,			(float)2		},// wait - used when sci is in 'use' mode to keep head turned
+};
+
+Schedule_t	slIdleSpeakWait[] =
+{
+	{ 
+		tlIdleSpeakWait,
+		ARRAYSIZE ( tlIdleSpeakWait ), 
+		bits_COND_NEW_ENEMY		|
+		bits_COND_CLIENT_PUSH	|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE,
+		0,
+		"Idle Speak Wait"
+	},
+};
+
+Task_t	tlIdleHello[] =
+{
+	{ TASK_SET_ACTIVITY,	(float)ACT_SIGNAL3	},// Stop and talk
+	{ TASK_TLK_HELLO,		(float)0		},// Try to say hello to player
+	{ TASK_TLK_EYECONTACT,	(float)0		},
+	{ TASK_WAIT,			(float)0.5		},// wait a bit
+	{ TASK_TLK_HELLO,		(float)0		},// Try to say hello to player
+	{ TASK_TLK_EYECONTACT,	(float)0		},
+	{ TASK_WAIT,			(float)0.5		},// wait a bit
+	{ TASK_TLK_HELLO,		(float)0		},// Try to say hello to player
+	{ TASK_TLK_EYECONTACT,	(float)0		},
+	{ TASK_WAIT,			(float)0.5		},// wait a bit
+	{ TASK_TLK_HELLO,		(float)0		},// Try to say hello to player
+	{ TASK_TLK_EYECONTACT,	(float)0		},
+	{ TASK_WAIT,			(float)0.5		},// wait a bit
+
+};
+
+Schedule_t	slIdleHello[] =
+{
+	{ 
+		tlIdleHello,
+		ARRAYSIZE ( tlIdleHello ), 
+		bits_COND_NEW_ENEMY		|
+		bits_COND_CLIENT_PUSH	|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE	|
+		bits_COND_HEAR_SOUND	|
+		bits_COND_PROVOKED,
+
+		bits_SOUND_COMBAT,
+		"Idle Hello"
+	},
+};
+
+Task_t	tlIdleStopShooting[] =
+{
+	{ TASK_TLK_STOPSHOOTING,	(float)0		},// tell player to stop shooting friend
+	// { TASK_TLK_EYECONTACT,		(float)0		},// look at the player
+};
+
+Schedule_t	slIdleStopShooting[] =
+{
+	{ 
+		tlIdleStopShooting,
+		ARRAYSIZE ( tlIdleStopShooting ), 
+		bits_COND_NEW_ENEMY		|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE	|
+		bits_COND_HEAR_SOUND,
+		0,
+		"Idle Stop Shooting"
+	},
+};
+
+Task_t	tlMoveAway[] =
+{
+	{ TASK_SET_FAIL_SCHEDULE,		(float)SCHED_MOVE_AWAY_FAIL },
+	{ TASK_STORE_LASTPOSITION,		(float)0		},
+	{ TASK_MOVE_AWAY_PATH,			(float)100		},
+	{ TASK_WALK_PATH_FOR_UNITS,		(float)100		},
+	{ TASK_STOP_MOVING,				(float)0		},
+	{ TASK_FACE_PLAYER,				(float)0.5 },
+};
+
+Schedule_t	slMoveAway[] =
+{
+	{
+		tlMoveAway,
+		ARRAYSIZE ( tlMoveAway ),
+		0,
+		0,
+		"MoveAway"
+	},
+};
+
+
+Task_t	tlMoveAwayFail[] =
+{
+	{ TASK_STOP_MOVING,				(float)0		},
+	{ TASK_FACE_PLAYER,				(float)0.5		},
+};
+
+Schedule_t	slMoveAwayFail[] =
+{
+	{
+		tlMoveAwayFail,
+		ARRAYSIZE ( tlMoveAwayFail ),
+		0,
+		0,
+		"MoveAwayFail"
+	},
+};
+
+
+
+Task_t	tlMoveAwayFollow[] =
+{
+	{ TASK_SET_FAIL_SCHEDULE,		(float)SCHED_TARGET_FACE },
+	{ TASK_STORE_LASTPOSITION,		(float)0		},
+	{ TASK_MOVE_AWAY_PATH,			(float)100				},
+	{ TASK_WALK_PATH_FOR_UNITS,		(float)100		},
+	{ TASK_STOP_MOVING,				(float)0		},
+	{ TASK_SET_SCHEDULE,			(float)SCHED_TARGET_FACE },
+};
+
+Schedule_t	slMoveAwayFollow[] =
+{
+	{
+		tlMoveAwayFollow,
+		ARRAYSIZE ( tlMoveAwayFollow ),
+		0,
+		0,
+		"MoveAwayFollow"
+	},
+};
+
+Task_t	tlTlkIdleWatchClient[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE	},
+	{ TASK_TLK_LOOK_AT_CLIENT,	(float)6		},
+};
+
+Task_t	tlTlkIdleWatchClientStare[] =
+{
+	{ TASK_STOP_MOVING,			0				},
+	{ TASK_SET_ACTIVITY,		(float)ACT_IDLE	},
+	{ TASK_TLK_CLIENT_STARE,	(float)6		},
+	{ TASK_TLK_STARE,			(float)0		},
+	{ TASK_TLK_IDEALYAW,		(float)0		},// look at who I'm talking to
+	{ TASK_FACE_IDEAL,			(float)0		}, 
+	{ TASK_SET_ACTIVITY,		(float)ACT_SIGNAL3	},
+	{ TASK_TLK_EYECONTACT,		(float)0		},
+};
+
+Schedule_t	slTlkIdleWatchClient[] =
+{
+	{ 
+		tlTlkIdleWatchClient,
+		ARRAYSIZE ( tlTlkIdleWatchClient ), 
+		bits_COND_NEW_ENEMY		|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE	|
+		bits_COND_HEAR_SOUND	|
+		bits_COND_SMELL			|
+		bits_COND_CLIENT_PUSH	|
+		bits_COND_CLIENT_UNSEEN	|
+		bits_COND_PROVOKED,
+
+		bits_SOUND_COMBAT		|// sound flags - change these, and you'll break the talking code.
+		//bits_SOUND_PLAYER		|
+		//bits_SOUND_WORLD		|
+		
+		bits_SOUND_DANGER		|
+		bits_SOUND_MEAT			|// scents
+		bits_SOUND_CARCASS		|
+		bits_SOUND_GARBAGE,
+		"TlkIdleWatchClient"
+	},
+
+	{ 
+		tlTlkIdleWatchClientStare,
+		ARRAYSIZE ( tlTlkIdleWatchClientStare ), 
+		bits_COND_NEW_ENEMY		|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE	|
+		bits_COND_HEAR_SOUND	|
+		bits_COND_SMELL			|
+		bits_COND_CLIENT_PUSH	|
+		bits_COND_CLIENT_UNSEEN	|
+		bits_COND_PROVOKED,
+
+		bits_SOUND_COMBAT		|// sound flags - change these, and you'll break the talking code.
+		//bits_SOUND_PLAYER		|
+		//bits_SOUND_WORLD		|
+		
+		bits_SOUND_DANGER		|
+		bits_SOUND_MEAT			|// scents
+		bits_SOUND_CARCASS		|
+		bits_SOUND_GARBAGE,
+		"TlkIdleWatchClientStare"
+	},
+};
+
+
+Task_t	tlTlkIdleEyecontact[] =
+{
+	{ TASK_TLK_IDEALYAW,	(float)0		},// look at who I'm talking to
+	{ TASK_FACE_IDEAL,		(float)0		}, 
+	{ TASK_SET_ACTIVITY,	(float)ACT_SIGNAL3	},
+	{ TASK_TLK_EYECONTACT,	(float)0		},// Wait until speaker is done
+};
+
+Schedule_t	slTlkIdleEyecontact[] =
+{
+	{ 
+		tlTlkIdleEyecontact,
+		ARRAYSIZE ( tlTlkIdleEyecontact ), 
+		bits_COND_NEW_ENEMY		|
+		bits_COND_CLIENT_PUSH	|
+		bits_COND_LIGHT_DAMAGE	|
+		bits_COND_HEAVY_DAMAGE,
+		0,
+		"TlkIdleEyecontact"
+	},
+};
+
+
+DEFINE_CUSTOM_SCHEDULES( CTalkMonster )
+{
+	slIdleResponse,
+	slIdleSpeak,
+	slIdleHello,
+	slIdleSpeakWait,
+	slIdleStopShooting,
+	slMoveAway,
+	slMoveAwayFollow,
+	slMoveAwayFail,
+	slTlkIdleWatchClient,
+	&slTlkIdleWatchClient[ 1 ],
+	slTlkIdleEyecontact,
+};
+
+IMPLEMENT_CUSTOM_SCHEDULES( CTalkMonster, CBaseMonster );
+
+
+void CTalkMonster :: SetActivity ( Activity newActivity )
+{
+	if (newActivity == ACT_IDLE && IsTalking() )
+		newActivity = ACT_SIGNAL3;
+	
+	if ( newActivity == ACT_SIGNAL3 && (LookupActivity ( ACT_SIGNAL3 ) == ACTIVITY_NOT_AVAILABLE))
+		newActivity = ACT_IDLE;
+
+	CBaseMonster::SetActivity( newActivity );
+}
+
+
+void CTalkMonster :: StartTask( Task_t *pTask )
+{
+	switch ( pTask->iTask )
+	{
+	case TASK_TLK_SPEAK:
+		// ask question or make statement
+		FIdleSpeak();
+		TaskComplete();
+		break;
+
+	case TASK_TLK_RESPOND:
+		// respond to question
+		IdleRespond();
+		TaskComplete();
+		break;
+
+	case TASK_TLK_HELLO:
+		// greet player
+		FIdleHello();
+		TaskComplete();
+		break;
+	
+
+	case TASK_TLK_STARE:
+		// let the player know I know he's staring at me.
+		FIdleStare();
+		TaskComplete();
+		break;
+
+	case TASK_FACE_PLAYER:
+	case TASK_TLK_LOOK_AT_CLIENT:
+	case TASK_TLK_CLIENT_STARE:
+		// track head to the client for a while.
+		m_flWaitFinished = gpGlobals->time + pTask->flData;
+		break;
+
+	case TASK_TLK_EYECONTACT:
+		break;
+
+	case TASK_TLK_IDEALYAW:
+		if (m_hTalkTarget != NULL)
+		{
+			pev->yaw_speed = 60;
+			float yaw = VecToYaw(m_hTalkTarget->pev->origin - pev->origin) - pev->angles.y;
+
+			if (yaw > 180) yaw -= 360;
+			if (yaw < -180) yaw += 360;
+
+			if (yaw < 0)
+			{
+				pev->ideal_yaw = min( yaw + 45, 0 ) + pev->angles.y;
+			}
+			else
+			{
+				pev->ideal_yaw = max( yaw - 45, 0 ) + pev->angles.y;
+			}
+		}
+		TaskComplete();
+		break;
+
+	case TASK_TLK_HEADRESET:
+		// reset head position after looking at something
+		m_hTalkTarget = NULL;
+		TaskComplete();
+		break;
+
+	case TASK_TLK_STOPSHOOTING:
+		// tell player to stop shooting
+		PlaySentence( m_szGrp[TLK_NOSHOOT], RANDOM_FLOAT(2.8, 3.2), VOL_NORM, ATTN_NORM );
+		TaskComplete();
+		break;
+
+	case TASK_CANT_FOLLOW:
+		StopFollowing( FALSE );
+		PlaySentence( m_szGrp[TLK_STOP], RANDOM_FLOAT(2, 2.5), VOL_NORM, ATTN_NORM );
+		TaskComplete();
+		break;
+
+	case TASK_WALK_PATH_FOR_UNITS:
+		m_movementActivity = ACT_WALK;
+		break;
+
+	case TASK_MOVE_AWAY_PATH:
+		{
+			Vector dir = pev->angles;
+			dir.y = pev->ideal_yaw + 180;
+			Vector move;
+
+			UTIL_MakeVectorsPrivate( dir, move, NULL, NULL );
+			dir = pev->origin + move * pTask->flData;
+			if ( MoveToLocation( ACT_WALK, 2, dir ) )
+			{
+				TaskComplete();
+			}
+			else if ( FindCover( pev->origin, pev->view_ofs, 0, CoverRadius() ) )
+			{
+				// then try for plain ole cover
+				m_flMoveWaitFinished = gpGlobals->time + 2;
+				TaskComplete();
+			}
+			else
+			{
+				// nowhere to go?
+				TaskFail();
+			}
+		}
+		break;
+
+	case TASK_PLAY_SCRIPT:
+		m_hTalkTarget = NULL;
+		CBaseMonster::StartTask( pTask );
+		break;
+
+	default:
+		CBaseMonster::StartTask( pTask );
+	}
+}
+
+
+void CTalkMonster :: RunTask( Task_t *pTask )
+{
+	switch( pTask->iTask )
+	{
+	case TASK_TLK_CLIENT_STARE:
+	case TASK_TLK_LOOK_AT_CLIENT:
+
+		edict_t *pPlayer;
+
+		// track head to the client for a while.
+		if ( m_MonsterState == MONSTERSTATE_IDLE		&& 
+			 !IsMoving()								&&
+			 !IsTalking()								)
+		{
+			// Get edict for one player
+			pPlayer = g_engfuncs.pfnPEntityOfEntIndex( 1 );
+
+			if ( pPlayer )
+			{
+				IdleHeadTurn( pPlayer->v.origin );
+			}
+		}
+		else
+		{
+			// started moving or talking
+			TaskFail();
+			return;
+		}
+
+		if ( pTask->iTask == TASK_TLK_CLIENT_STARE )
+		{
+			// fail out if the player looks away or moves away.
+			if ( ( pPlayer->v.origin - pev->origin ).Length2D() > TLK_STARE_DIST )
+			{
+				// player moved away.
+				TaskFail();
+			}
+
+			UTIL_MakeVectors( pPlayer->v.angles );
+			if ( UTIL_DotPoints( pPlayer->v.origin, pev->origin, gpGlobals->v_forward ) < m_flFieldOfView )
+			{
+				// player looked away
+				TaskFail();
+			}
+		}
+
+		if ( gpGlobals->time > m_flWaitFinished )
+		{
+			TaskComplete();
+		}
+		break;
+
+	case TASK_FACE_PLAYER:
+		{
+			// Get edict for one player
+			edict_t *pPlayer = g_engfuncs.pfnPEntityOfEntIndex( 1 );
+
+			if ( pPlayer )
+			{
+				MakeIdealYaw ( pPlayer->v.origin );
+				ChangeYaw ( pev->yaw_speed );
+				IdleHeadTurn( pPlayer->v.origin );
+				if ( gpGlobals->time > m_flWaitFinished && FlYawDiff() < 10 )
+				{
+					TaskComplete();
+				}
+			}
+			else
+			{
+				TaskFail();
+			}
+		}
+		break;
+
+	case TASK_TLK_EYECONTACT:
+		if (!IsMoving() && IsTalking() && m_hTalkTarget != NULL)
+		{
+			// ALERT( at_console, "waiting %f\n", m_flStopTalkTime - gpGlobals->time );
+			IdleHeadTurn( m_hTalkTarget->pev->origin );
+		}
+		else
+		{
+			TaskComplete();
+		}
+		break;
+
+	case TASK_WALK_PATH_FOR_UNITS:
+		{
+			float distance;
+
+			distance = (m_vecLastPosition - pev->origin).Length2D();
+
+			// Walk path until far enough away
+			if ( distance > pTask->flData || MovementIsComplete() )
+			{
+				TaskComplete();
+				RouteClear();		// Stop moving
+			}
+		}
+		break;
+	case TASK_WAIT_FOR_MOVEMENT:
+		if (IsTalking() && m_hTalkTarget != NULL)
+		{
+			// ALERT(at_console, "walking, talking\n");
+			IdleHeadTurn( m_hTalkTarget->pev->origin );
+		}
+		else
+		{
+			IdleHeadTurn( pev->origin );
+			// override so that during walk, a scientist may talk and greet player
+			FIdleHello();
+			if (RANDOM_LONG(0,m_nSpeak * 20) == 0)
+			{
+				FIdleSpeak();
+			}
+		}
+
+		CBaseMonster::RunTask( pTask );
+		if (TaskIsComplete())
+			IdleHeadTurn( pev->origin );
+		break;
+
+	default:
+		if (IsTalking() && m_hTalkTarget != NULL)
+		{
+			IdleHeadTurn( m_hTalkTarget->pev->origin );
+		}
+		else
+		{
+			SetBoneController( 0, 0 );
+		}
+		CBaseMonster::RunTask( pTask );
+	}
+}
+
+
+void CTalkMonster :: Killed( entvars_t *pevAttacker, int iGib )
+{
+	// If a client killed me (unless I was already Barnacle'd), make everyone else mad/afraid of him
+	if ( (pevAttacker->flags & FL_CLIENT) && m_MonsterState != MONSTERSTATE_PRONE )
+	{
+		AlertFriends();
+		LimitFollowers( CBaseEntity::Instance(pevAttacker), 0 );
+	}
+
+	m_hTargetEnt = NULL;
+	// Don't finish that sentence
+	StopTalking();
+	SetUse( NULL );
+	CBaseMonster::Killed( pevAttacker, iGib );
+}
+
+
+
+CBaseEntity	*CTalkMonster::EnumFriends( CBaseEntity *pPrevious, int listNumber, BOOL bTrace )
+{
+	CBaseEntity *pFriend = pPrevious;
+	char *pszFriend;
+	TraceResult tr;
+	Vector vecCheck;
+
+	pszFriend = m_szFriends[ FriendNumber(listNumber) ];
+	while (pFriend = UTIL_FindEntityByClassname( pFriend, pszFriend ))
+	{
+		if (pFriend == this || !pFriend->IsAlive())
+			// don't talk to self or dead people
+			continue;
+		if ( bTrace )
+		{
+			vecCheck = pFriend->pev->origin;
+			vecCheck.z = pFriend->pev->absmax.z;
+
+			UTIL_TraceLine( pev->origin, vecCheck, ignore_monsters, ENT(pev), &tr);
+		}
+		else
+			tr.flFraction = 1.0;
+
+		if (tr.flFraction == 1.0)
+		{
+			return pFriend;
+		}
+	}
+
+	return NULL;
+}
+
+
+void CTalkMonster::AlertFriends( void )
+{
+	CBaseEntity *pFriend = NULL;
+	int i;
+
+	// for each friend in this bsp...
+	for ( i = 0; i < TLK_CFRIENDS; i++ )
+	{
+		while (pFriend = EnumFriends( pFriend, i, TRUE ))
+		{
+			CBaseMonster *pMonster = pFriend->MyMonsterPointer();
+			if ( pMonster->IsAlive() )
+			{
+				// don't provoke a friend that's playing a death animation. They're a goner
+				pMonster->m_afMemory |= bits_MEMORY_PROVOKED;
+			}
+		}
+	}
+}
+
+
+
+void CTalkMonster::ShutUpFriends( void )
+{
+	CBaseEntity *pFriend = NULL;
+	int i;
+
+	// for each friend in this bsp...
+	for ( i = 0; i < TLK_CFRIENDS; i++ )
+	{
+		while (pFriend = EnumFriends( pFriend, i, TRUE ))
+		{
+			CBaseMonster *pMonster = pFriend->MyMonsterPointer();
+			if ( pMonster )
+			{
+				pMonster->SentenceStop();
+			}
+		}
+	}
+}
+
+
+// UNDONE: Keep a follow time in each follower, make a list of followers in this function and do LRU
+// UNDONE: Check this in Restore to keep restored monsters from joining a full list of followers
+void CTalkMonster::LimitFollowers( CBaseEntity *pPlayer, int maxFollowers )
+{
+	CBaseEntity *pFriend = NULL;
+	int i, count;
+
+	count = 0;
+	// for each friend in this bsp...
+	for ( i = 0; i < TLK_CFRIENDS; i++ )
+	{
+		while (pFriend = EnumFriends( pFriend, i, FALSE ))
+		{
+			CBaseMonster *pMonster = pFriend->MyMonsterPointer();
+			if ( pMonster )
+			{
+				if ( pMonster->m_hTargetEnt == pPlayer )
+				{
+					count++;
+					if ( count > maxFollowers )
+						pMonster->StopFollowing( TRUE );
+				}
+			}
+		}
+	}
+}
+
+
+float CTalkMonster::TargetDistance( void )
+{
+	// If we lose the player, or he dies, return a really large distance
+	if ( m_hTargetEnt == NULL || !m_hTargetEnt->IsAlive() )
+		return 1e6;
+
+	return (m_hTargetEnt->pev->origin - pev->origin).Length();
+}
+
+
+//=========================================================
+// HandleAnimEvent - catches the monster-specific messages
+// that occur when tagged animation frames are played.
+//=========================================================
+void CTalkMonster :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	switch( pEvent->event )
+	{		
+	case SCRIPT_EVENT_SENTENCE_RND1:		// Play a named sentence group 25% of the time
+		if (RANDOM_LONG(0,99) < 75)
+			break;
+		// fall through...
+	case SCRIPT_EVENT_SENTENCE:				// Play a named sentence group
+		ShutUpFriends();
+		PlaySentence( pEvent->options, RANDOM_FLOAT(2.8, 3.4), VOL_NORM, ATTN_IDLE );
+		//ALERT(at_console, "script event speak\n");
+		break;
+
+	default:
+		CBaseMonster::HandleAnimEvent( pEvent );
+		break;
+	}
+}
+
+// monsters derived from ctalkmonster should call this in precache()
+
+void CTalkMonster :: TalkInit( void )
+{
+	// every new talking monster must reset this global, otherwise
+	// when a level is loaded, nobody will talk (time is reset to 0)
+
+	CTalkMonster::g_talkWaitTime = 0;
+
+	m_voicePitch = 100;
+}	
+//=========================================================
+// FindNearestFriend
+// Scan for nearest, visible friend. If fPlayer is true, look for
+// nearest player
+//=========================================================
+CBaseEntity *CTalkMonster :: FindNearestFriend(BOOL fPlayer)
+{
+	CBaseEntity *pFriend = NULL;
+	CBaseEntity *pNearest = NULL;
+	float range = 10000000.0;
+	TraceResult tr;
+	Vector vecStart = pev->origin;
+	Vector vecCheck;
+	int i;
+	char *pszFriend;
+	int cfriends;
+
+	vecStart.z = pev->absmax.z;
+	
+	if (fPlayer)
+		cfriends = 1;
+	else
+		cfriends = TLK_CFRIENDS;
+
+	// for each type of friend...
+
+	for (i = cfriends-1; i > -1; i--)
+	{
+		if (fPlayer)
+			pszFriend = "player";
+		else
+			pszFriend = m_szFriends[FriendNumber(i)];
+
+		if (!pszFriend)
+			continue;
+
+		// for each friend in this bsp...
+		while (pFriend = UTIL_FindEntityByClassname( pFriend, pszFriend ))
+		{
+			if (pFriend == this || !pFriend->IsAlive())
+				// don't talk to self or dead people
+				continue;
+
+			CBaseMonster *pMonster = pFriend->MyMonsterPointer();
+
+			// If not a monster for some reason, or in a script, or prone
+			if ( !pMonster || pMonster->m_MonsterState == MONSTERSTATE_SCRIPT || pMonster->m_MonsterState == MONSTERSTATE_PRONE )
+				continue;
+
+			vecCheck = pFriend->pev->origin;
+			vecCheck.z = pFriend->pev->absmax.z;
+
+			// if closer than previous friend, and in range, see if he's visible
+
+			if (range > (vecStart - vecCheck).Length())
+			{
+				UTIL_TraceLine(vecStart, vecCheck, ignore_monsters, ENT(pev), &tr);
+
+				if (tr.flFraction == 1.0)
+				{
+					// visible and in range, this is the new nearest scientist
+					if ((vecStart - vecCheck).Length() < TALKRANGE_MIN)
+					{
+						pNearest = pFriend;
+						range = (vecStart - vecCheck).Length();
+					}
+				}
+			}
+		}
+	}
+	return pNearest;
+}
+
+int CTalkMonster :: GetVoicePitch( void )
+{
+	return m_voicePitch + RANDOM_LONG(0,3);
+}
+
+
+void CTalkMonster :: Touch( CBaseEntity *pOther )
+{
+	// Did the player touch me?
+	if ( pOther->IsPlayer() )
+	{
+		// Ignore if pissed at player
+		if ( m_afMemory & bits_MEMORY_PROVOKED )
+			return;
+
+		// Stay put during speech
+		if ( IsTalking() )
+			return;
+
+		// Heuristic for determining if the player is pushing me away
+		float speed = fabs(pOther->pev->velocity.x) + fabs(pOther->pev->velocity.y);
+		if ( speed > 50 )
+		{
+			SetConditions( bits_COND_CLIENT_PUSH );
+			MakeIdealYaw( pOther->pev->origin );
+		}
+	}
+}
+
+
+
+//=========================================================
+// IdleRespond
+// Respond to a previous question
+//=========================================================
+void CTalkMonster :: IdleRespond( void )
+{
+	int pitch = GetVoicePitch();
+	
+	// play response
+	PlaySentence( m_szGrp[TLK_ANSWER], RANDOM_FLOAT(2.8, 3.2), VOL_NORM, ATTN_IDLE );
+}
+
+int CTalkMonster :: FOkToSpeak( void )
+{
+	// if in the grip of a barnacle, don't speak
+	if ( m_MonsterState == MONSTERSTATE_PRONE || m_IdealMonsterState == MONSTERSTATE_PRONE )
+	{
+		return FALSE;
+	}
+
+	// if not alive, certainly don't speak
+	if ( pev->deadflag != DEAD_NO )
+	{
+		return FALSE;
+	}
+
+	// if someone else is talking, don't speak
+	if (gpGlobals->time <= CTalkMonster::g_talkWaitTime)
+		return FALSE;
+
+	if ( pev->spawnflags & SF_MONSTER_GAG )
+		return FALSE;
+
+	if ( m_MonsterState == MONSTERSTATE_PRONE )
+		return FALSE;
+
+	// if player is not in pvs, don't speak
+	if (!IsAlive() || FNullEnt(FIND_CLIENT_IN_PVS(edict())))
+		return FALSE;
+
+	// don't talk if you're in combat
+	if (m_hEnemy != NULL && FVisible( m_hEnemy ))
+		return FALSE;
+
+	return TRUE;
+}
+
+
+int CTalkMonster::CanPlaySentence( BOOL fDisregardState ) 
+{ 
+	if ( fDisregardState )
+		return CBaseMonster::CanPlaySentence( fDisregardState );
+	return FOkToSpeak(); 
+}
+
+//=========================================================
+// FIdleStare
+//=========================================================
+int CTalkMonster :: FIdleStare( void )
+{
+	if (!FOkToSpeak())
+		return FALSE;
+
+	PlaySentence( m_szGrp[TLK_STARE], RANDOM_FLOAT(5, 7.5), VOL_NORM, ATTN_IDLE );
+
+	m_hTalkTarget = FindNearestFriend( TRUE );
+	return TRUE;
+}
+
+//=========================================================
+// IdleHello
+// Try to greet player first time he's seen
+//=========================================================
+int CTalkMonster :: FIdleHello( void )
+{
+	if (!FOkToSpeak())
+		return FALSE;
+
+	// if this is first time scientist has seen player, greet him
+	if (!FBitSet(m_bitsSaid, bit_saidHelloPlayer))
+	{
+		// get a player
+		CBaseEntity *pPlayer = FindNearestFriend(TRUE);
+
+		if (pPlayer)
+		{
+			if (FInViewCone(pPlayer) && FVisible(pPlayer))
+			{
+				m_hTalkTarget = pPlayer;
+
+				if (FBitSet(pev->spawnflags, SF_MONSTER_PREDISASTER))
+					PlaySentence( m_szGrp[TLK_PHELLO], RANDOM_FLOAT(3, 3.5), VOL_NORM,  ATTN_IDLE );
+				else
+					PlaySentence( m_szGrp[TLK_HELLO], RANDOM_FLOAT(3, 3.5), VOL_NORM,  ATTN_IDLE );
+
+				SetBits(m_bitsSaid, bit_saidHelloPlayer);
+				
+				return TRUE;
+			}
+		}
+	}
+	return FALSE;
+}
+
+
+// turn head towards supplied origin
+void CTalkMonster :: IdleHeadTurn( Vector &vecFriend )
+{
+	 // turn head in desired direction only if ent has a turnable head
+	if (m_afCapability & bits_CAP_TURN_HEAD)
+	{
+		float yaw = VecToYaw(vecFriend - pev->origin) - pev->angles.y;
+
+		if (yaw > 180) yaw -= 360;
+		if (yaw < -180) yaw += 360;
+
+		// turn towards vector
+		SetBoneController( 0, yaw );
+	}
+}
+
+//=========================================================
+// FIdleSpeak
+// ask question of nearby friend, or make statement
+//=========================================================
+int CTalkMonster :: FIdleSpeak ( void )
+{ 
+	// try to start a conversation, or make statement
+	int pitch;
+	const char *szIdleGroup;
+	const char *szQuestionGroup;
+	float duration;
+
+	if (!FOkToSpeak())
+		return FALSE;
+
+	// set idle groups based on pre/post disaster
+	if (FBitSet(pev->spawnflags, SF_MONSTER_PREDISASTER))
+	{
+		szIdleGroup = m_szGrp[TLK_PIDLE];
+		szQuestionGroup = m_szGrp[TLK_PQUESTION];
+		// set global min delay for next conversation
+		duration = RANDOM_FLOAT(4.8, 5.2);
+	}
+	else
+	{
+		szIdleGroup = m_szGrp[TLK_IDLE];
+		szQuestionGroup = m_szGrp[TLK_QUESTION];
+		// set global min delay for next conversation
+		duration = RANDOM_FLOAT(2.8, 3.2);
+
+	}
+
+	pitch = GetVoicePitch();
+		
+	// player using this entity is alive and wounded?
+	CBaseEntity *pTarget = m_hTargetEnt;
+
+	if ( pTarget != NULL )
+	{
+		if ( pTarget->IsPlayer() )
+		{
+			if ( pTarget->IsAlive() )
+			{
+				m_hTalkTarget = m_hTargetEnt;
+				if (!FBitSet(m_bitsSaid, bit_saidDamageHeavy) && 
+					(m_hTargetEnt->pev->health <= m_hTargetEnt->pev->max_health / 8))
+				{
+					//EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, m_szGrp[TLK_PLHURT3], 1.0, ATTN_IDLE, 0, pitch);
+					PlaySentence( m_szGrp[TLK_PLHURT3], duration, VOL_NORM, ATTN_IDLE );
+					SetBits(m_bitsSaid, bit_saidDamageHeavy);
+					return TRUE;
+				}
+				else if (!FBitSet(m_bitsSaid, bit_saidDamageMedium) && 
+					(m_hTargetEnt->pev->health <= m_hTargetEnt->pev->max_health / 4))
+				{
+					//EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, m_szGrp[TLK_PLHURT2], 1.0, ATTN_IDLE, 0, pitch);
+					PlaySentence( m_szGrp[TLK_PLHURT2], duration, VOL_NORM, ATTN_IDLE );
+					SetBits(m_bitsSaid, bit_saidDamageMedium);
+					return TRUE;
+				}
+				else if (!FBitSet(m_bitsSaid, bit_saidDamageLight) &&
+					(m_hTargetEnt->pev->health <= m_hTargetEnt->pev->max_health / 2))
+				{
+					//EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, m_szGrp[TLK_PLHURT1], 1.0, ATTN_IDLE, 0, pitch);
+					PlaySentence( m_szGrp[TLK_PLHURT1], duration, VOL_NORM, ATTN_IDLE );
+					SetBits(m_bitsSaid, bit_saidDamageLight);
+					return TRUE;
+				}
+			}
+			else
+			{
+				//!!!KELLY - here's a cool spot to have the talkmonster talk about the dead player if we want.
+				// "Oh dear, Gordon Freeman is dead!" -Scientist
+				// "Damn, I can't do this without you." -Barney
+			}
+		}
+	}
+
+	// if there is a friend nearby to speak to, play sentence, set friend's response time, return
+	CBaseEntity *pFriend = FindNearestFriend(FALSE);
+
+	if (pFriend && !(pFriend->IsMoving()) && (RANDOM_LONG(0,99) < 75))
+	{
+		PlaySentence( szQuestionGroup, duration, VOL_NORM, ATTN_IDLE );
+		//SENTENCEG_PlayRndSz( ENT(pev), szQuestionGroup, 1.0, ATTN_IDLE, 0, pitch );
+
+		// force friend to answer
+		CTalkMonster *pTalkMonster = (CTalkMonster *)pFriend;
+		m_hTalkTarget = pFriend;
+		pTalkMonster->SetAnswerQuestion( this ); // UNDONE: This is EVIL!!!
+		pTalkMonster->m_flStopTalkTime = m_flStopTalkTime;
+
+		m_nSpeak++;
+		return TRUE;
+	}
+
+	// otherwise, play an idle statement, try to face client when making a statement.
+	if ( RANDOM_LONG(0,1) )
+	{
+		//SENTENCEG_PlayRndSz( ENT(pev), szIdleGroup, 1.0, ATTN_IDLE, 0, pitch );
+		CBaseEntity *pFriend = FindNearestFriend(TRUE);
+
+		if ( pFriend )
+		{
+			m_hTalkTarget = pFriend;
+			PlaySentence( szIdleGroup, duration, VOL_NORM, ATTN_IDLE );
+			m_nSpeak++;
+			return TRUE;
+		}
+	}
+
+	// didn't speak
+	Talk( 0 );
+	CTalkMonster::g_talkWaitTime = 0;
+	return FALSE;
+}
+
+void CTalkMonster::PlayScriptedSentence( const char *pszSentence, float duration, float volume, float attenuation, BOOL bConcurrent, CBaseEntity *pListener )
+{
+	if ( !bConcurrent )
+		ShutUpFriends();
+
+	ClearConditions( bits_COND_CLIENT_PUSH );	// Forget about moving!  I've got something to say!
+	m_useTime = gpGlobals->time + duration;
+	PlaySentence( pszSentence, duration, volume, attenuation );
+
+	m_hTalkTarget = pListener;
+}
+
+void CTalkMonster::PlaySentence( const char *pszSentence, float duration, float volume, float attenuation )
+{
+	if ( !pszSentence )
+		return;
+
+	Talk ( duration );
+
+	CTalkMonster::g_talkWaitTime = gpGlobals->time + duration + 2.0;
+	if ( pszSentence[0] == '!' )
+		EMIT_SOUND_DYN( edict(), CHAN_VOICE, pszSentence, volume, attenuation, 0, GetVoicePitch());
+	else
+		SENTENCEG_PlayRndSz( edict(), pszSentence, volume, attenuation, 0, GetVoicePitch() );
+
+	// If you say anything, don't greet the player - you may have already spoken to them
+	SetBits(m_bitsSaid, bit_saidHelloPlayer);
+}
+
+//=========================================================
+// Talk - set a timer that tells us when the monster is done
+// talking.
+//=========================================================
+void CTalkMonster :: Talk( float flDuration )
+{
+	if ( flDuration <= 0 )
+	{
+		// no duration :( 
+		m_flStopTalkTime = gpGlobals->time + 3;
+	}
+	else
+	{
+		m_flStopTalkTime = gpGlobals->time + flDuration;
+	}
+}
+
+// Prepare this talking monster to answer question
+void CTalkMonster :: SetAnswerQuestion( CTalkMonster *pSpeaker )
+{
+	if ( !m_pCine )
+		ChangeSchedule( slIdleResponse );
+	m_hTalkTarget = (CBaseMonster *)pSpeaker;
+}
+
+int CTalkMonster :: TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType)
+{
+	if ( IsAlive() )
+	{
+		// if player damaged this entity, have other friends talk about it
+		if (pevAttacker && m_MonsterState != MONSTERSTATE_PRONE && FBitSet(pevAttacker->flags, FL_CLIENT))
+		{
+			CBaseEntity *pFriend = FindNearestFriend(FALSE);
+
+			if (pFriend && pFriend->IsAlive())
+			{
+				// only if not dead or dying!
+				CTalkMonster *pTalkMonster = (CTalkMonster *)pFriend;
+				pTalkMonster->ChangeSchedule( slIdleStopShooting );
+			}
+		}
+	}
+	return CBaseMonster::TakeDamage(pevInflictor, pevAttacker, flDamage, bitsDamageType);
+}
+
+
+Schedule_t* CTalkMonster :: GetScheduleOfType ( int Type )
+{
+	switch( Type )
+	{
+	case SCHED_MOVE_AWAY:
+		return slMoveAway;
+
+	case SCHED_MOVE_AWAY_FOLLOW:
+		return slMoveAwayFollow;
+
+	case SCHED_MOVE_AWAY_FAIL:
+		return slMoveAwayFail;
+
+	case SCHED_TARGET_FACE:
+		// speak during 'use'
+		if (RANDOM_LONG(0,99) < 2)
+			//ALERT ( at_console, "target chase speak\n" );
+			return slIdleSpeakWait;
+		else
+			return slIdleStand;
+		
+	case SCHED_IDLE_STAND:
+		{	
+			// if never seen player, try to greet him
+			if (!FBitSet(m_bitsSaid, bit_saidHelloPlayer))
+			{
+				return slIdleHello;
+			}
+
+			// sustained light wounds?
+			if (!FBitSet(m_bitsSaid, bit_saidWoundLight) && (pev->health <= (pev->max_health * 0.75)))
+			{
+				//SENTENCEG_PlayRndSz( ENT(pev), m_szGrp[TLK_WOUND], 1.0, ATTN_IDLE, 0, GetVoicePitch() );
+				//CTalkMonster::g_talkWaitTime = gpGlobals->time + RANDOM_FLOAT(2.8, 3.2);
+				PlaySentence( m_szGrp[TLK_WOUND], RANDOM_FLOAT(2.8, 3.2), VOL_NORM, ATTN_IDLE );
+				SetBits(m_bitsSaid, bit_saidWoundLight);
+				return slIdleStand;
+			}
+			// sustained heavy wounds?
+			else if (!FBitSet(m_bitsSaid, bit_saidWoundHeavy) && (pev->health <= (pev->max_health * 0.5)))
+			{
+				//SENTENCEG_PlayRndSz( ENT(pev), m_szGrp[TLK_MORTAL], 1.0, ATTN_IDLE, 0, GetVoicePitch() );
+				//CTalkMonster::g_talkWaitTime = gpGlobals->time + RANDOM_FLOAT(2.8, 3.2);
+				PlaySentence( m_szGrp[TLK_MORTAL], RANDOM_FLOAT(2.8, 3.2), VOL_NORM, ATTN_IDLE );
+				SetBits(m_bitsSaid, bit_saidWoundHeavy);
+				return slIdleStand;
+			}
+
+			// talk about world
+			if (FOkToSpeak() && RANDOM_LONG(0,m_nSpeak * 2) == 0)
+			{
+				//ALERT ( at_console, "standing idle speak\n" );
+				return slIdleSpeak;
+			}
+			
+			if ( !IsTalking() && HasConditions ( bits_COND_SEE_CLIENT ) && RANDOM_LONG( 0, 6 ) == 0 )
+			{
+				edict_t *pPlayer = g_engfuncs.pfnPEntityOfEntIndex( 1 );
+
+				if ( pPlayer )
+				{
+					// watch the client.
+					UTIL_MakeVectors ( pPlayer->v.angles );
+					if ( ( pPlayer->v.origin - pev->origin ).Length2D() < TLK_STARE_DIST	&& 
+						 UTIL_DotPoints( pPlayer->v.origin, pev->origin, gpGlobals->v_forward ) >= m_flFieldOfView )
+					{
+						// go into the special STARE schedule if the player is close, and looking at me too.
+						return &slTlkIdleWatchClient[ 1 ];
+					}
+
+					return slTlkIdleWatchClient;
+				}
+			}
+			else
+			{
+				if (IsTalking())
+					// look at who we're talking to
+					return slTlkIdleEyecontact;
+				else
+					// regular standing idle
+					return slIdleStand;
+			}
+
+
+			// NOTE - caller must first CTalkMonster::GetScheduleOfType, 
+			// then check result and decide what to return ie: if sci gets back
+			// slIdleStand, return slIdleSciStand
+		}
+		break;
+	}
+
+	return CBaseMonster::GetScheduleOfType( Type );
+}
+
+//=========================================================
+// IsTalking - am I saying a sentence right now?
+//=========================================================
+BOOL CTalkMonster :: IsTalking( void )
+{
+	if ( m_flStopTalkTime > gpGlobals->time )
+	{
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+//=========================================================
+// If there's a player around, watch him.
+//=========================================================
+void CTalkMonster :: PrescheduleThink ( void )
+{
+	if ( !HasConditions ( bits_COND_SEE_CLIENT ) )
+	{
+		SetConditions ( bits_COND_CLIENT_UNSEEN );
+	}
+}
+
+// try to smell something
+void CTalkMonster :: TrySmellTalk( void )
+{
+	if ( !FOkToSpeak() )
+		return;
+
+	// clear smell bits periodically
+	if ( gpGlobals->time > m_flLastSaidSmelled  )
+	{
+//		ALERT ( at_aiconsole, "Clear smell bits\n" );
+		ClearBits(m_bitsSaid, bit_saidSmelled);
+	}
+	// smelled something?
+	if (!FBitSet(m_bitsSaid, bit_saidSmelled) && HasConditions ( bits_COND_SMELL ))
+	{
+		PlaySentence( m_szGrp[TLK_SMELL], RANDOM_FLOAT(2.8, 3.2), VOL_NORM, ATTN_IDLE );
+		m_flLastSaidSmelled = gpGlobals->time + 60;// don't talk about the stinky for a while.
+		SetBits(m_bitsSaid, bit_saidSmelled);
+	}
+}
+
+
+
+int CTalkMonster::IRelationship( CBaseEntity *pTarget )
+{
+	if ( pTarget->IsPlayer() )
+		if ( m_afMemory & bits_MEMORY_PROVOKED )
+			return R_HT;
+	return CBaseMonster::IRelationship( pTarget );
+}
+
+
+void CTalkMonster::StopFollowing( BOOL clearSchedule )
+{
+	if ( IsFollowing() )
+	{
+		if ( !(m_afMemory & bits_MEMORY_PROVOKED) )
+		{
+			PlaySentence( m_szGrp[TLK_UNUSE], RANDOM_FLOAT(2.8, 3.2), VOL_NORM, ATTN_IDLE );
+			m_hTalkTarget = m_hTargetEnt;
+		}
+
+		if ( m_movementGoal == MOVEGOAL_TARGETENT )
+			RouteClear(); // Stop him from walking toward the player
+		m_hTargetEnt = NULL;
+		if ( clearSchedule )
+			ClearSchedule();
+		if ( m_hEnemy != NULL )
+			m_IdealMonsterState = MONSTERSTATE_COMBAT;
+	}
+}
+
+
+void CTalkMonster::StartFollowing( CBaseEntity *pLeader )
+{
+	if ( m_pCine )
+		m_pCine->CancelScript();
+
+	if ( m_hEnemy != NULL )
+		m_IdealMonsterState = MONSTERSTATE_ALERT;
+
+	m_hTargetEnt = pLeader;
+	PlaySentence( m_szGrp[TLK_USE], RANDOM_FLOAT(2.8, 3.2), VOL_NORM, ATTN_IDLE );
+	m_hTalkTarget = m_hTargetEnt;
+	ClearConditions( bits_COND_CLIENT_PUSH );
+	ClearSchedule();
+}
+
+
+BOOL CTalkMonster::CanFollow( void )
+{
+	if ( m_MonsterState == MONSTERSTATE_SCRIPT )
+	{
+		if ( !m_pCine->CanInterrupt() )
+			return FALSE;
+	}
+	
+	if ( !IsAlive() )
+		return FALSE;
+
+	return !IsFollowing();
+}
+
+
+void CTalkMonster :: FollowerUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	// Don't allow use during a scripted_sentence
+	if ( m_useTime > gpGlobals->time )
+		return;
+
+	if ( pCaller != NULL && pCaller->IsPlayer() )
+	{
+		// Pre-disaster followers can't be used
+		if ( pev->spawnflags & SF_MONSTER_PREDISASTER )
+		{
+			DeclineFollowing();
+		}
+		else if ( CanFollow() )
+		{
+			LimitFollowers( pCaller , 1 );
+
+			if ( m_afMemory & bits_MEMORY_PROVOKED )
+				ALERT( at_console, "I'm not following you, you evil person!\n" );
+			else
+			{
+				StartFollowing( pCaller );
+				SetBits(m_bitsSaid, bit_saidHelloPlayer);	// Don't say hi after you've started following
+			}
+		}
+		else
+		{
+			StopFollowing( TRUE );
+		}
+	}
+}
+
+void CTalkMonster::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "UseSentence"))
+	{
+		m_iszUse = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "UnUseSentence"))
+	{
+		m_iszUnUse = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else 
+		CBaseMonster::KeyValue( pkvd );
+}
+
+
+void CTalkMonster::Precache( void )
+{
+	if ( m_iszUse )
+		m_szGrp[TLK_USE] = STRING( m_iszUse );
+	if ( m_iszUnUse )
+		m_szGrp[TLK_UNUSE] = STRING( m_iszUnUse );
+}
+
diff --git a/main/source/dlls/talkmonster.h b/main/source/dlls/talkmonster.h
new file mode 100644
index 00000000..34fc40ee
--- /dev/null
+++ b/main/source/dlls/talkmonster.h
@@ -0,0 +1,26 @@
+/***
+*
+*	Copyright (c) 1996-2002, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+#ifndef TALKMONSTER_H
+#define TALKMONSTER_H
+
+class CTalkMonster : public CBaseMonster
+{
+public:
+	static float g_talkWaitTime;
+
+};
+
+#endif		//TALKMONSTER_H
diff --git a/main/source/dlls/teamplay_gamerules.cpp b/main/source/dlls/teamplay_gamerules.cpp
new file mode 100644
index 00000000..654e5a9a
--- /dev/null
+++ b/main/source/dlls/teamplay_gamerules.cpp
@@ -0,0 +1,651 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// teamplay_gamerules.cpp
+//
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"player.h"
+#include	"weapons.h"
+#include	"gamerules.h"
+#include	"teamplay_gamerules.h"
+#include	"game.h"
+#include	"mod/AvHConstants.h"
+#include	"mod/AvHServerVariables.h"
+#include	"mod/AvHServerUtil.h"
+#include	"mod/UPPUtil.h"
+
+static char team_names[MAX_TEAMS][MAX_TEAMNAME_LENGTH];
+static int team_scores[MAX_TEAMS];
+static int num_teams = 0;
+
+extern DLL_GLOBAL BOOL		g_fGameOver;
+
+CHalfLifeTeamplay :: CHalfLifeTeamplay()
+{
+	m_DisableDeathMessages = FALSE;
+	m_DisableDeathPenalty = FALSE;
+
+	memset( team_names, 0, sizeof(team_names) );
+	memset( team_scores, 0, sizeof(team_scores) );
+	num_teams = 0;
+
+	// Copy over the team from the server config
+	m_szTeamList[0] = 0;
+
+	// Cache this because the team code doesn't want to deal with changing this in the middle of a game
+	//strncpy( m_szTeamList, teamlist.string, TEAMPLAY_TEAMLISTLENGTH );
+	strcpy(this->m_szTeamList, kTeamString);
+
+	edict_t *pWorld = INDEXENT(0);
+	if ( pWorld && pWorld->v.team )
+	{
+		if ( teamoverride.value )
+		{
+			const char *pTeamList = STRING(pWorld->v.team);
+			if ( pTeamList && strlen(pTeamList) )
+			{
+				strncpy( m_szTeamList, pTeamList, TEAMPLAY_TEAMLISTLENGTH );
+			}
+		}
+	}
+	// Has the server set teams
+	if ( strlen( m_szTeamList ) )
+		m_teamLimit = TRUE;
+	else
+		m_teamLimit = FALSE;
+
+	RecountTeams();
+}
+
+extern cvar_t timeleft, fragsleft;
+
+#include "voice_gamemgr.h"
+extern CVoiceGameMgr	g_VoiceGameMgr;
+
+void CHalfLifeTeamplay :: Think ( void )
+{
+	///// Check game rules /////
+	static int last_frags;
+	static int last_time;
+
+	int frags_remaining = 0;
+	int time_remaining = 0;
+
+	g_VoiceGameMgr.Update(gpGlobals->frametime);
+
+	if ( g_fGameOver )   // someone else quit the game already
+	{
+		CHalfLifeMultiplay::Think();
+		return;
+	}
+
+	float flTimeLimit = CVAR_GET_FLOAT("mp_timelimit") * 60;
+	
+	time_remaining = (int)(flTimeLimit ? ( flTimeLimit - gpGlobals->time ) : 0);
+
+	// Don't map switch in tourny mode, it signals the end of the match instead
+	bool theIsTournyMode = (CVAR_GET_FLOAT(kvTournamentMode) > 0);
+	if ( flTimeLimit != 0 && (gpGlobals->time >= flTimeLimit) && !theIsTournyMode)
+	{
+		GoToIntermission();
+		return;
+	}
+
+	float flFragLimit = fraglimit.value;
+	if ( flFragLimit )
+	{
+		int bestfrags = 9999;
+		int remain;
+
+		// check if any team is over the frag limit
+		for ( int i = 0; i < num_teams; i++ )
+		{
+			if ( team_scores[i] >= flFragLimit )
+			{
+				GoToIntermission();
+				return;
+			}
+
+			remain = flFragLimit - team_scores[i];
+			if ( remain < bestfrags )
+			{
+				bestfrags = remain;
+			}
+		}
+		frags_remaining = bestfrags;
+	}
+
+	// Updates when frags change
+	if ( frags_remaining != last_frags )
+	{
+		g_engfuncs.pfnCvar_DirectSet( &fragsleft, UTIL_VarArgs( "%i", frags_remaining ) );
+	}
+
+	// Updates once per second
+	if ( timeleft.value != last_time )
+	{
+		g_engfuncs.pfnCvar_DirectSet( &timeleft, UTIL_VarArgs( "%i", time_remaining ) );
+	}
+
+	last_frags = frags_remaining;
+	last_time  = time_remaining;
+}
+
+//=========================================================
+// ClientCommand
+// the user has typed a command which is unrecognized by everything else;
+// this check to see if the gamerules knows anything about the command
+//=========================================================
+BOOL CHalfLifeTeamplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd )
+{
+	if(g_VoiceGameMgr.ClientCommand(pPlayer, pcmd))
+		return TRUE;
+
+	if ( FStrEq( pcmd, "menuselect" ) )
+	{
+		if ( CMD_ARGC() < 2 )
+			return TRUE;
+
+		int slot = atoi( CMD_ARGV(1) );
+
+		// select the item from the current menu
+
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+extern int gmsgGameMode;
+extern int gmsgTeamInfo;
+extern int gmsgTeamNames;
+extern int gmsgScoreInfo;
+
+void CHalfLifeTeamplay :: UpdateGameMode( CBasePlayer *pPlayer )
+{
+	MESSAGE_BEGIN( MSG_ONE, gmsgGameMode, NULL, pPlayer->edict() );
+		WRITE_BYTE( 1 );  // game mode teamplay
+	MESSAGE_END();
+}
+
+
+const char *CHalfLifeTeamplay::SetDefaultPlayerTeam( CBasePlayer *pPlayer )
+{
+	// copy out the team name from the model
+	char *mdls = g_engfuncs.pfnInfoKeyValue( g_engfuncs.pfnGetInfoKeyBuffer( pPlayer->edict() ), "model" );
+	pPlayer->SetTeamID(mdls);
+
+	RecountTeams();
+
+	// update the current player of the team he is joining
+	const char* theTeamName = pPlayer->TeamID();
+
+	if ( theTeamName == '\0' || !IsValidTeam( theTeamName ) || defaultteam.value )
+	{
+		const char *pTeamName = NULL;
+		
+		if ( defaultteam.value )
+		{
+			pTeamName = team_names[0];
+		}
+		else
+		{
+			pTeamName = TeamWithFewestPlayers();
+		}
+		pPlayer->SetTeamID(pTeamName);
+	}
+
+	return pPlayer->TeamID();
+}
+
+
+//=========================================================
+// InitHUD
+//=========================================================
+void CHalfLifeTeamplay::InitHUD( CBasePlayer *pPlayer )
+{
+	int i;
+
+	SetDefaultPlayerTeam( pPlayer );
+	CHalfLifeMultiplay::InitHUD( pPlayer );
+
+	// Send down the team names
+	MESSAGE_BEGIN( MSG_ONE, gmsgTeamNames, NULL, pPlayer->edict() );  
+		WRITE_BYTE( num_teams );
+
+		for ( i = 0; i < num_teams; i++ )
+		{
+			char theTeamName[256];
+			strcpy(theTeamName, team_names[i]);
+
+			// If the team name isn't empty, append # so team name is translated on client
+			if(strcmp(theTeamName, ""))
+			{
+				sprintf(theTeamName, "#%s", team_names[i]);
+			}
+			
+			WRITE_STRING(theTeamName);
+		}
+	MESSAGE_END();
+
+	RecountTeams();
+
+//	char *mdls = g_engfuncs.pfnInfoKeyValue( g_engfuncs.pfnGetInfoKeyBuffer( pPlayer->edict() ), "model" );
+//	// update the current player of the team he is joining
+//	char text[1024];
+//	if ( !strcmp( mdls, pPlayer->m_szTeamName ) )
+//	{
+//		sprintf( text, "* you are on team \'%s\'\n", pPlayer->m_szTeamName );
+//	}
+//	else
+//	{
+//		sprintf( text, "* assigned to team %s\n", pPlayer->m_szTeamName );
+//	}
+
+	ChangePlayerTeam( pPlayer, pPlayer->TeamID(), FALSE, FALSE );
+//	UTIL_SayText( text, pPlayer );
+	int clientIndex = pPlayer->entindex();
+	RecountTeams();
+
+//	// update this player with all the other players team info
+//	// loop through all active players and send their team info to the new client
+//	for ( i = 1; i <= gpGlobals->maxClients; i++ )
+//	{
+//		CBasePlayer *plr = (CBasePlayer*)UTIL_PlayerByIndex( i );
+//		if ( plr && IsValidTeam( plr->TeamID() ) )
+//		{
+//			MESSAGE_BEGIN( MSG_ONE, gmsgTeamInfo, NULL, pPlayer->edict() );
+//				WRITE_BYTE( plr->entindex() );
+//				WRITE_STRING( plr->TeamID() );
+//			MESSAGE_END();
+//		}
+//	}
+
+	pPlayer->NeedsTeamUpdate();
+}
+
+
+void CHalfLifeTeamplay::ChangePlayerTeam( CBasePlayer *pPlayer, const char *pTeamName, BOOL bKill, BOOL bGib )
+{
+	int damageFlags = DMG_GENERIC;
+	int clientIndex = pPlayer->entindex();
+
+	if ( !bGib )
+	{
+		damageFlags |= DMG_NEVERGIB;
+	}
+	else
+	{
+		damageFlags |= DMG_ALWAYSGIB;
+	}
+
+	if ( bKill )
+	{
+		// kill the player,  remove a death,  and let them start on the new team
+		m_DisableDeathMessages = TRUE;
+		m_DisableDeathPenalty = TRUE;
+
+		entvars_t *pevWorld = VARS( INDEXENT(0) );
+		pPlayer->TakeDamage( pevWorld, pevWorld, 900, damageFlags );
+
+		m_DisableDeathMessages = FALSE;
+		m_DisableDeathPenalty = FALSE;
+	}
+
+	// copy out the team name from the model
+	//strncpy( pPlayer->m_szTeamName, pTeamName, TEAM_NAME_LENGTH );
+	pPlayer->SetTeamID(pTeamName);
+
+    // Don't assume team and model are linked
+	//g_engfuncs.pfnSetClientKeyValue( clientIndex, g_engfuncs.pfnGetInfoKeyBuffer( pPlayer->edict() ), "model", pPlayer->m_szTeamName );
+	g_engfuncs.pfnSetClientKeyValue( clientIndex, g_engfuncs.pfnGetInfoKeyBuffer( pPlayer->edict() ), "team", pPlayer->TeamID());
+
+	// notify everyone's HUD of the team change
+//	MESSAGE_BEGIN( MSG_ALL, gmsgTeamInfo );
+//		WRITE_BYTE( clientIndex );
+//		//WRITE_STRING( pPlayer->m_szTeamName );
+//		WRITE_STRING( pPlayer->TeamID() );
+//	MESSAGE_END();
+	pPlayer->SendTeamUpdate();
+
+//	MESSAGE_BEGIN( MSG_ALL, gmsgScoreInfo );
+//		WRITE_BYTE( clientIndex );
+//		WRITE_SHORT( pPlayer->pev->frags );
+//		WRITE_SHORT( pPlayer->m_iDeaths );
+//		WRITE_SHORT( pPlayer->GetEffectivePlayerClass() );
+//		//WRITE_SHORT( g_pGameRules->GetTeamIndex( pPlayer->m_szTeamName ) + 1 );
+//		WRITE_SHORT( g_pGameRules->GetTeamIndex( pPlayer->TeamID() ) );
+//	MESSAGE_END();
+
+	pPlayer->EffectivePlayerClassChanged();
+}
+
+
+//=========================================================
+// ClientUserInfoChanged
+//=========================================================
+void CHalfLifeTeamplay::ClientUserInfoChanged( CBasePlayer *pPlayer, char *infobuffer )
+{
+	char text[1024];
+
+	// prevent skin/color/model changes
+	char *mdls = g_engfuncs.pfnInfoKeyValue( infobuffer, "model" );
+
+	if ( !stricmp( mdls, pPlayer->TeamID() ) )
+		return;
+
+	if ( defaultteam.value )
+	{
+		int clientIndex = pPlayer->entindex();
+
+		g_engfuncs.pfnSetClientKeyValue( clientIndex, g_engfuncs.pfnGetInfoKeyBuffer( pPlayer->edict() ), "model", pPlayer->TeamID() );
+		g_engfuncs.pfnSetClientKeyValue( clientIndex, g_engfuncs.pfnGetInfoKeyBuffer( pPlayer->edict() ), "team", pPlayer->TeamID() );
+		sprintf( text, "* Not allowed to change teams in this game!\n" );
+		UTIL_SayText( text, pPlayer );
+		return;
+	}
+
+	if ( defaultteam.value || !IsValidTeam( mdls ) )
+	{
+		int clientIndex = pPlayer->entindex();
+
+		g_engfuncs.pfnSetClientKeyValue( clientIndex, g_engfuncs.pfnGetInfoKeyBuffer( pPlayer->edict() ), "model", pPlayer->TeamID() );
+		sprintf( text, "* Can't change team to \'%s\'\n", mdls );
+		UTIL_SayText( text, pPlayer );
+		sprintf( text, "* Server limits teams to \'%s\'\n", m_szTeamList );
+		UTIL_SayText( text, pPlayer );
+		return;
+	}
+	// notify everyone of the team change
+	sprintf( text, "* %s has changed to team \'%s\'\n", STRING(pPlayer->pev->netname), mdls );
+	UTIL_SayTextAll( text, pPlayer );
+
+	UTIL_LogPrintf( "\"%s<%i><%s><%s>\" joined team \"%s\"\n", 
+		STRING(pPlayer->pev->netname),
+		GETPLAYERUSERID( pPlayer->edict() ),
+#ifdef USE_UPP
+				UPPUtil_GetNetworkID(pPlayer->edict()).c_str(),
+#else
+				AvHSUGetPlayerAuthIDString( pPlayer->edict() ).c_str(),
+#endif
+		pPlayer->TeamID(),
+		mdls );
+
+	ChangePlayerTeam( pPlayer, mdls, TRUE, TRUE );
+	// recound stuff
+	RecountTeams();
+}
+
+extern int gmsgDeathMsg;
+
+//=========================================================
+// Deathnotice. 
+//=========================================================
+void CHalfLifeTeamplay::DeathNotice( CBasePlayer *pVictim, entvars_t *pKiller, entvars_t *pevInflictor )
+{
+	if ( m_DisableDeathMessages )
+		return;
+	
+	if ( pVictim && pKiller && pKiller->flags & FL_CLIENT )
+	{
+		CBasePlayer *pk = (CBasePlayer*) CBaseEntity::Instance( pKiller );
+
+		if ( pk )
+		{
+			if ( (pk != pVictim) && (PlayerRelationship( pVictim, pk ) == GR_TEAMMATE) )
+			{
+				MESSAGE_BEGIN( MSG_ALL, gmsgDeathMsg );
+					WRITE_BYTE( ENTINDEX(ENT(pKiller)) );		// the killer
+					WRITE_BYTE( ENTINDEX(pVictim->edict()) );	// the victim
+					WRITE_STRING( "teammate" );		// flag this as a teammate kill
+				MESSAGE_END();
+				return;
+			}
+		}
+	}
+
+	CHalfLifeMultiplay::DeathNotice( pVictim, pKiller, pevInflictor );
+}
+
+//=========================================================
+//=========================================================
+void CHalfLifeTeamplay :: PlayerKilled( CBasePlayer *pVictim, entvars_t *pKiller, entvars_t *pInflictor )
+{
+	if ( !m_DisableDeathPenalty )
+	{
+		CHalfLifeMultiplay::PlayerKilled( pVictim, pKiller, pInflictor );
+		RecountTeams();
+	}
+}
+
+
+//=========================================================
+// IsTeamplay
+//=========================================================
+BOOL CHalfLifeTeamplay::IsTeamplay( void )
+{
+	return TRUE;
+}
+
+BOOL CHalfLifeTeamplay::FPlayerCanTakeDamage( CBasePlayer *pPlayer, CBaseEntity *pAttacker )
+{
+	if ( pAttacker && PlayerRelationship( pPlayer, pAttacker ) == GR_TEAMMATE )
+	{
+		// my teammate hit me.
+		if ( (friendlyfire.value == 0) && (pAttacker != pPlayer) )
+		{
+			// friendly fire is off, and this hit came from someone other than myself,  then don't get hurt
+			return FALSE;
+		}
+	}
+
+	return CHalfLifeMultiplay::FPlayerCanTakeDamage( pPlayer, pAttacker );
+}
+
+//=========================================================
+//=========================================================
+int CHalfLifeTeamplay::PlayerRelationship( CBaseEntity *pPlayer, CBaseEntity *pTarget )
+{
+	// half life multiplay has a simple concept of Player Relationships.
+	// you are either on another player's team, or you are not.
+	if ( !pPlayer || !pTarget || !pTarget->IsPlayer() )
+		return GR_NOTTEAMMATE;
+
+	if ( (*GetTeamID(pPlayer) != '\0') && (*GetTeamID(pTarget) != '\0') && !stricmp( GetTeamID(pPlayer), GetTeamID(pTarget) ) )
+	{
+		return GR_TEAMMATE;
+	}
+
+	return GR_NOTTEAMMATE;
+}
+
+//=========================================================
+//=========================================================
+BOOL CHalfLifeTeamplay::ShouldAutoAim( CBasePlayer *pPlayer, edict_t *target )
+{
+	// always autoaim, unless target is a teammate
+	CBaseEntity *pTgt = CBaseEntity::Instance( target );
+	if ( pTgt && pTgt->IsPlayer() )
+	{
+		if ( PlayerRelationship( pPlayer, pTgt ) == GR_TEAMMATE )
+			return FALSE; // don't autoaim at teammates
+	}
+
+	return CHalfLifeMultiplay::ShouldAutoAim( pPlayer, target );
+}
+
+//=========================================================
+//=========================================================
+int CHalfLifeTeamplay::IPointsForKill( CBasePlayer *pAttacker, CBasePlayer *pKilled )
+{
+	if ( !pKilled )
+		return 0;
+
+	if ( !pAttacker )
+		return 1;
+
+	if ( pAttacker != pKilled && PlayerRelationship( pAttacker, pKilled ) == GR_TEAMMATE )
+		return -1;
+
+	return 1;
+}
+
+//=========================================================
+//=========================================================
+const char *CHalfLifeTeamplay::GetTeamID( CBaseEntity *pEntity )
+{
+	if ( pEntity == NULL || pEntity->pev == NULL )
+		return "";
+
+	// return their team name
+	return pEntity->TeamID();
+}
+
+
+int CHalfLifeTeamplay::GetTeamIndex( const char *pTeamName )
+{
+	if ( pTeamName && *pTeamName != 0 )
+	{
+		// try to find existing team
+		for ( int tm = 0; tm < num_teams; tm++ )
+		{
+			if ( !stricmp( team_names[tm], pTeamName ) )
+				return tm;
+		}
+	}
+	
+	return -1;	// No match
+}
+
+
+const char *CHalfLifeTeamplay::GetIndexedTeamName( int teamIndex )
+{
+	if ( teamIndex < 0 || teamIndex >= num_teams )
+		return "";
+
+	return team_names[ teamIndex ];
+}
+
+
+BOOL CHalfLifeTeamplay::IsValidTeam( const char *pTeamName ) 
+{
+	if ( !m_teamLimit )	// Any team is valid if the teamlist isn't set
+		return TRUE;
+
+	return ( GetTeamIndex( pTeamName ) != -1 ) ? TRUE : FALSE;
+}
+
+const char *CHalfLifeTeamplay::TeamWithFewestPlayers( void )
+{
+	int i;
+	int minPlayers = MAX_TEAMS;
+	int teamCount[ MAX_TEAMS ];
+	char *pTeamName = NULL;
+
+	memset( teamCount, 0, MAX_TEAMS * sizeof(int) );
+	
+	// loop through all clients, count number of players on each team
+	for ( i = 1; i <= gpGlobals->maxClients; i++ )
+	{
+		CBaseEntity *plr = UTIL_PlayerByIndex( i );
+
+		if ( plr )
+		{
+			int team = GetTeamIndex( plr->TeamID() );
+			if ( team >= 0 )
+				teamCount[team] ++;
+		}
+	}
+
+	// Find team with least players
+	for ( i = 0; i < num_teams; i++ )
+	{
+		if ( teamCount[i] < minPlayers )
+		{
+			minPlayers = teamCount[i];
+			pTeamName = team_names[i];
+		}
+	}
+
+	return pTeamName;
+}
+
+
+//=========================================================
+//=========================================================
+void CHalfLifeTeamplay::RecountTeams( void )
+{
+	char	*pName;
+	char	teamlist[TEAMPLAY_TEAMLISTLENGTH];
+
+	// loop through all teams, recounting everything
+	num_teams = 0;
+
+	// Copy all of the teams from the teamlist
+	// make a copy because strtok is destructive
+	strcpy( teamlist, m_szTeamList );
+	pName = teamlist;
+	pName = strtok( pName, ";" );
+	while ( pName != NULL && *pName )
+	{
+		if ( GetTeamIndex( pName ) < 0 )
+		{
+			strcpy( team_names[num_teams], pName );
+			num_teams++;
+		}
+		pName = strtok( NULL, ";" );
+	}
+
+	if ( num_teams < 2 )
+	{
+		num_teams = 0;
+		m_teamLimit = FALSE;
+	}
+
+	// Sanity check
+	memset( team_scores, 0, sizeof(team_scores) );
+
+	// loop through all clients
+	for ( int i = 1; i <= gpGlobals->maxClients; i++ )
+	{
+		CBaseEntity *plr = UTIL_PlayerByIndex( i );
+
+		if ( plr )
+		{
+			const char *pTeamName = plr->TeamID();
+			// try add to existing team
+			int tm = GetTeamIndex( pTeamName );
+			
+			if ( tm < 0 ) // no team match found
+			{ 
+				if ( !m_teamLimit )
+				{
+					// add to new team
+					tm = num_teams;
+					num_teams++;
+					team_scores[tm] = 0;
+					strncpy( team_names[tm], pTeamName, MAX_TEAMNAME_LENGTH );
+				}
+			}
+
+			if ( tm >= 0 )
+			{
+				team_scores[tm] += plr->pev->frags;
+			}
+		}
+	}
+}
diff --git a/main/source/dlls/teamplay_gamerules.h b/main/source/dlls/teamplay_gamerules.h
new file mode 100644
index 00000000..624481b8
--- /dev/null
+++ b/main/source/dlls/teamplay_gamerules.h
@@ -0,0 +1,58 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// teamplay_gamerules.h
+//
+#ifndef CHALFLIFETEAMPLAY_H
+#define CHALFLIFETEAMPLAY_H
+
+#include "game_shared/teamconst.h"
+
+class CHalfLifeTeamplay : public CHalfLifeMultiplay
+{
+public:
+	CHalfLifeTeamplay();
+
+	virtual BOOL ClientCommand( CBasePlayer *pPlayer, const char *pcmd );
+	virtual void ClientUserInfoChanged( CBasePlayer *pPlayer, char *infobuffer );
+	virtual BOOL IsTeamplay( void );
+	virtual BOOL FPlayerCanTakeDamage( CBasePlayer *pPlayer, CBaseEntity *pAttacker );
+	virtual int PlayerRelationship( CBaseEntity *pPlayer, CBaseEntity *pTarget );
+	virtual const char *GetTeamID( CBaseEntity *pEntity );
+	virtual BOOL ShouldAutoAim( CBasePlayer *pPlayer, edict_t *target );
+	virtual int IPointsForKill( CBasePlayer *pAttacker, CBasePlayer *pKilled );
+	virtual void InitHUD( CBasePlayer *pl );
+	virtual void DeathNotice( CBasePlayer *pVictim, entvars_t *pKiller, entvars_t *pevInflictor );
+	virtual const char *GetGameDescription( void ) { return "HL Teamplay"; }  // this is the game name that gets seen in the server browser
+	virtual void UpdateGameMode( CBasePlayer *pPlayer );  // the client needs to be informed of the current game mode
+	virtual void PlayerKilled( CBasePlayer *pVictim, entvars_t *pKiller, entvars_t *pInflictor );
+	virtual void Think ( void );
+	virtual int GetTeamIndex( const char *pTeamName );
+	virtual const char *GetIndexedTeamName( int teamIndex );
+	virtual BOOL IsValidTeam( const char *pTeamName );
+	const char *SetDefaultPlayerTeam( CBasePlayer *pPlayer );
+	virtual void ChangePlayerTeam( CBasePlayer *pPlayer, const char *pTeamName, BOOL bKill, BOOL bGib );
+
+private:
+	void RecountTeams( void );
+	const char *TeamWithFewestPlayers( void );
+
+	BOOL m_DisableDeathMessages;
+	BOOL m_DisableDeathPenalty;
+	BOOL m_teamLimit;				// This means the server set only some teams as valid
+	char m_szTeamList[TEAMPLAY_TEAMLISTLENGTH];
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/tempmonster.cpp b/main/source/dlls/tempmonster.cpp
new file mode 100644
index 00000000..8dfeef8b
--- /dev/null
+++ b/main/source/dlls/tempmonster.cpp
@@ -0,0 +1,117 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// monster template
+//=========================================================
+#if 0
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"schedule.h"
+
+//=========================================================
+// Monster's Anim Events Go Here
+//=========================================================
+
+class CMyMonster : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void SetYawSpeed( void );
+	int  Classify ( void );
+	void HandleAnimEvent( MonsterEvent_t *pEvent );
+};
+LINK_ENTITY_TO_CLASS( my_monster, CMyMonster );
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CMyMonster :: Classify ( void )
+{
+	return	CLASS_MY_MONSTER;
+}
+
+//=========================================================
+// SetYawSpeed - allows each sequence to have a different
+// turn rate associated with it.
+//=========================================================
+void CMyMonster :: SetYawSpeed ( void )
+{
+	int ys;
+
+	switch ( m_Activity )
+	{
+	case ACT_IDLE:
+	default:
+		ys = 90;
+	}
+
+	pev->yaw_speed = ys;
+}
+
+//=========================================================
+// HandleAnimEvent - catches the monster-specific messages
+// that occur when tagged animation frames are played.
+//=========================================================
+void CMyMonster :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	switch( pEvent->event )
+	{
+	case 0:
+	default:
+		CBaseMonster::HandleAnimEvent( pEvent );
+		break;
+	}
+}
+
+//=========================================================
+// Spawn
+//=========================================================
+void CMyMonster :: Spawn()
+{
+	Precache( );
+
+	SET_MODEL(ENT(pev), "models/mymodel.mdl");
+	UTIL_SetSize( pev, Vector( -12, -12, 0 ), Vector( 12, 12, 24 ) );
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_STEP;
+	m_bloodColor		= BLOOD_COLOR_GREEN;
+	pev->health			= 8;
+	pev->view_ofs		= Vector ( 0, 0, 0 );// position of the eyes relative to monster's origin.
+	m_flFieldOfView		= 0.5;// indicates the width of this monster's forward view cone ( as a dotproduct result )
+	m_MonsterState		= MONSTERSTATE_NONE;
+
+	MonsterInit();
+}
+
+//=========================================================
+// Precache - precaches all resources this monster needs
+//=========================================================
+void CMyMonster :: Precache()
+{
+	PRECACHE_SOUND("mysound.wav");
+
+	PRECACHE_MODEL("models/mymodel.mdl");
+}	
+
+//=========================================================
+// AI Schedules Specific to this monster
+//=========================================================
+#endif 0
diff --git a/main/source/dlls/tentacle.cpp b/main/source/dlls/tentacle.cpp
new file mode 100644
index 00000000..2cc5c176
--- /dev/null
+++ b/main/source/dlls/tentacle.cpp
@@ -0,0 +1,1044 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD )
+
+/*
+
+	h_tentacle.cpp - silo of death tentacle monster (half life)
+
+*/
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"weapons.h"
+#include	"soundent.h"
+
+
+#define ACT_T_IDLE		1010
+#define ACT_T_TAP			1020
+#define ACT_T_STRIKE		1030
+#define ACT_T_REARIDLE	1040
+
+class CTentacle : public CBaseMonster
+{
+public:
+	CTentacle( void );
+
+	void Spawn( );
+	void Precache( );
+	void KeyValue( KeyValueData *pkvd );
+
+	int		Save( CSave &save );
+	int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	// Don't allow the tentacle to go across transitions!!!
+	virtual int	ObjectCaps( void ) { return CBaseMonster :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+
+	void SetObjectCollisionBox( void )
+	{
+		pev->absmin = pev->origin + Vector(-400, -400, 0);
+		pev->absmax = pev->origin + Vector(400, 400, 850);
+	}
+
+	void EXPORT Cycle( void );
+	void EXPORT CommandUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void EXPORT Start( void );
+	void EXPORT DieThink( void );
+
+	void EXPORT Test( void );
+
+	void EXPORT HitTouch( CBaseEntity *pOther );
+
+	float HearingSensitivity( void ) { return 2.0; };
+
+	int TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType );
+	void HandleAnimEvent( MonsterEvent_t *pEvent );
+	void Killed( entvars_t *pevAttacker, int iGib );
+
+	MONSTERSTATE GetIdealState ( void ) { return MONSTERSTATE_IDLE; };
+	int CanPlaySequence( BOOL fDisregardState ) { return TRUE; };
+
+	int Classify( void );
+
+	int Level( float dz );
+	int MyLevel( void );
+	float MyHeight( void );
+
+	float m_flInitialYaw;
+	int m_iGoalAnim;
+	int m_iLevel;
+	int m_iDir;
+	float m_flFramerateAdj;
+	float m_flSoundYaw;
+	int m_iSoundLevel;
+	float m_flSoundTime;
+	float m_flSoundRadius;
+	int m_iHitDmg;
+	float m_flHitTime;
+
+	float m_flTapRadius;
+
+	float m_flNextSong;
+	static int g_fFlySound;
+	static int g_fSquirmSound;
+
+	float m_flMaxYaw;
+	int m_iTapSound;
+
+	Vector m_vecPrevSound;
+	float m_flPrevSoundTime;
+
+	static const char *pHitSilo[];
+	static const char *pHitDirt[];
+	static const char *pHitWater[];
+};
+
+
+
+int CTentacle :: g_fFlySound;
+int CTentacle :: g_fSquirmSound;
+
+LINK_ENTITY_TO_CLASS( monster_tentacle, CTentacle );
+
+// stike sounds
+#define TE_NONE -1
+#define TE_SILO 0
+#define TE_DIRT 1
+#define TE_WATER 2
+
+const char *CTentacle::pHitSilo[] = 
+{
+	"tentacle/te_strike1.wav",
+	"tentacle/te_strike2.wav",
+};
+
+const char *CTentacle::pHitDirt[] = 
+{
+	"player/pl_dirt1.wav",
+	"player/pl_dirt2.wav",
+	"player/pl_dirt3.wav",
+	"player/pl_dirt4.wav",
+};
+
+const char *CTentacle::pHitWater[] = 
+{
+	"player/pl_slosh1.wav",
+	"player/pl_slosh2.wav",
+	"player/pl_slosh3.wav",
+	"player/pl_slosh4.wav",
+};
+
+
+TYPEDESCRIPTION	CTentacle::m_SaveData[] = 
+{
+	DEFINE_FIELD( CTentacle, m_flInitialYaw, FIELD_FLOAT ),
+	DEFINE_FIELD( CTentacle, m_iGoalAnim, FIELD_INTEGER ),
+	DEFINE_FIELD( CTentacle, m_iLevel, FIELD_INTEGER ),
+	DEFINE_FIELD( CTentacle, m_iDir, FIELD_INTEGER ),
+	DEFINE_FIELD( CTentacle, m_flFramerateAdj, FIELD_FLOAT ),
+	DEFINE_FIELD( CTentacle, m_flSoundYaw, FIELD_FLOAT ),
+	DEFINE_FIELD( CTentacle, m_iSoundLevel, FIELD_INTEGER ),
+	DEFINE_FIELD( CTentacle, m_flSoundTime, FIELD_TIME ),
+	DEFINE_FIELD( CTentacle, m_flSoundRadius, FIELD_FLOAT ),
+	DEFINE_FIELD( CTentacle, m_iHitDmg, FIELD_INTEGER ),
+	DEFINE_FIELD( CTentacle, m_flHitTime, FIELD_TIME ),
+	DEFINE_FIELD( CTentacle, m_flTapRadius, FIELD_FLOAT ),
+	DEFINE_FIELD( CTentacle, m_flNextSong, FIELD_TIME ),
+	DEFINE_FIELD( CTentacle, m_iTapSound, FIELD_INTEGER ),
+	DEFINE_FIELD( CTentacle, m_flMaxYaw, FIELD_FLOAT ),
+	DEFINE_FIELD( CTentacle, m_vecPrevSound, FIELD_POSITION_VECTOR ),
+	DEFINE_FIELD( CTentacle, m_flPrevSoundTime, FIELD_TIME ),
+};
+IMPLEMENT_SAVERESTORE( CTentacle, CBaseMonster );
+
+
+// animation sequence aliases 
+typedef enum
+{
+	TENTACLE_ANIM_Pit_Idle,
+
+	TENTACLE_ANIM_rise_to_Temp1,
+	TENTACLE_ANIM_Temp1_to_Floor,
+	TENTACLE_ANIM_Floor_Idle,
+	TENTACLE_ANIM_Floor_Fidget_Pissed,
+	TENTACLE_ANIM_Floor_Fidget_SmallRise,
+	TENTACLE_ANIM_Floor_Fidget_Wave,
+	TENTACLE_ANIM_Floor_Strike,
+	TENTACLE_ANIM_Floor_Tap,
+	TENTACLE_ANIM_Floor_Rotate,
+	TENTACLE_ANIM_Floor_Rear,
+	TENTACLE_ANIM_Floor_Rear_Idle,
+	TENTACLE_ANIM_Floor_to_Lev1,
+
+	TENTACLE_ANIM_Lev1_Idle,
+	TENTACLE_ANIM_Lev1_Fidget_Claw,
+	TENTACLE_ANIM_Lev1_Fidget_Shake,
+	TENTACLE_ANIM_Lev1_Fidget_Snap,
+	TENTACLE_ANIM_Lev1_Strike,
+	TENTACLE_ANIM_Lev1_Tap,
+	TENTACLE_ANIM_Lev1_Rotate,
+	TENTACLE_ANIM_Lev1_Rear,
+	TENTACLE_ANIM_Lev1_Rear_Idle,
+	TENTACLE_ANIM_Lev1_to_Lev2,
+
+	TENTACLE_ANIM_Lev2_Idle,
+	TENTACLE_ANIM_Lev2_Fidget_Shake,
+	TENTACLE_ANIM_Lev2_Fidget_Swing,
+	TENTACLE_ANIM_Lev2_Fidget_Tut,
+	TENTACLE_ANIM_Lev2_Strike,
+	TENTACLE_ANIM_Lev2_Tap,
+	TENTACLE_ANIM_Lev2_Rotate,
+	TENTACLE_ANIM_Lev2_Rear,
+	TENTACLE_ANIM_Lev2_Rear_Idle,
+	TENTACLE_ANIM_Lev2_to_Lev3,
+
+	TENTACLE_ANIM_Lev3_Idle,
+	TENTACLE_ANIM_Lev3_Fidget_Shake,
+	TENTACLE_ANIM_Lev3_Fidget_Side,
+	TENTACLE_ANIM_Lev3_Fidget_Swipe,
+	TENTACLE_ANIM_Lev3_Strike,
+	TENTACLE_ANIM_Lev3_Tap,
+	TENTACLE_ANIM_Lev3_Rotate,
+	TENTACLE_ANIM_Lev3_Rear,
+	TENTACLE_ANIM_Lev3_Rear_Idle,
+
+	TENTACLE_ANIM_Lev1_Door_reach,
+
+	TENTACLE_ANIM_Lev3_to_Engine,
+	TENTACLE_ANIM_Engine_Idle,
+	TENTACLE_ANIM_Engine_Sway,
+	TENTACLE_ANIM_Engine_Swat,
+	TENTACLE_ANIM_Engine_Bob,
+	TENTACLE_ANIM_Engine_Death1,
+	TENTACLE_ANIM_Engine_Death2,
+	TENTACLE_ANIM_Engine_Death3,
+
+	TENTACLE_ANIM_none
+} TENTACLE_ANIM;
+
+
+
+
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CTentacle :: Classify ( void )
+{
+	return	CLASS_ALIEN_MONSTER;
+}
+
+//
+// Tentacle Spawn
+//
+void CTentacle :: Spawn( )
+{
+	Precache( );
+
+	pev->solid			= SOLID_BBOX;
+	pev->movetype		= MOVETYPE_FLY;
+	pev->effects		= 0;
+	pev->health			= 75;
+	pev->sequence		= 0;
+
+	SET_MODEL(ENT(pev), "models/tentacle2.mdl");
+	UTIL_SetSize( pev, Vector( -32, -32, 0 ), Vector( 32, 32, 64 ) );
+
+	pev->takedamage		= DAMAGE_AIM;
+	pev->flags			|= FL_MONSTER;
+	
+	m_bloodColor		= BLOOD_COLOR_GREEN;
+
+	SetThink( &CTentacle::Start );
+	SetTouch( &CTentacle::HitTouch );
+	SetUse( &CTentacle::CommandUse );
+
+	pev->nextthink = gpGlobals->time + 0.2;
+
+	ResetSequenceInfo( );
+	m_iDir = 1;
+
+	pev->yaw_speed = 18;
+	m_flInitialYaw = pev->angles.y;
+	pev->ideal_yaw = m_flInitialYaw;
+
+	g_fFlySound = FALSE;
+	g_fSquirmSound = FALSE;
+
+	m_iHitDmg = 20;
+
+	if (m_flMaxYaw <= 0)
+		m_flMaxYaw = 65;
+
+	m_MonsterState = MONSTERSTATE_IDLE;
+
+	// SetThink( Test );
+	UTIL_SetOrigin( pev, pev->origin );
+}
+
+void CTentacle :: Precache( )
+{
+	PRECACHE_MODEL("models/tentacle2.mdl");
+
+	PRECACHE_SOUND("ambience/flies.wav");
+	PRECACHE_SOUND("ambience/squirm2.wav");
+
+	PRECACHE_SOUND("tentacle/te_alert1.wav");
+	PRECACHE_SOUND("tentacle/te_alert2.wav");
+	PRECACHE_SOUND("tentacle/te_flies1.wav");
+	PRECACHE_SOUND("tentacle/te_move1.wav");
+	PRECACHE_SOUND("tentacle/te_move2.wav");
+	PRECACHE_SOUND("tentacle/te_roar1.wav");
+	PRECACHE_SOUND("tentacle/te_roar2.wav");
+	PRECACHE_SOUND("tentacle/te_search1.wav");
+	PRECACHE_SOUND("tentacle/te_search2.wav");
+	PRECACHE_SOUND("tentacle/te_sing1.wav");
+	PRECACHE_SOUND("tentacle/te_sing2.wav");
+	PRECACHE_SOUND("tentacle/te_squirm2.wav");
+	PRECACHE_SOUND("tentacle/te_strike1.wav");
+	PRECACHE_SOUND("tentacle/te_strike2.wav");
+	PRECACHE_SOUND("tentacle/te_swing1.wav");
+	PRECACHE_SOUND("tentacle/te_swing2.wav");
+
+	PRECACHE_SOUND_ARRAY( pHitSilo );
+	PRECACHE_SOUND_ARRAY( pHitDirt );
+	PRECACHE_SOUND_ARRAY( pHitWater );
+}
+
+
+CTentacle::CTentacle( )
+{
+	m_flMaxYaw = 65;
+	m_iTapSound = 0;
+}
+
+void CTentacle::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "sweeparc"))
+	{
+		m_flMaxYaw = atof(pkvd->szValue) / 2.0;
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "sound"))
+	{
+		m_iTapSound = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+
+	}
+	else
+		CBaseMonster::KeyValue( pkvd );
+}
+
+
+
+int CTentacle :: Level( float dz )
+{
+	if (dz < 216)
+		return 0;
+	if (dz < 408)
+		return 1;
+	if (dz < 600)
+		return 2;
+	return 3;
+}
+
+
+float CTentacle :: MyHeight( )
+{
+	switch ( MyLevel( ) )
+	{
+	case 1:
+		return 256;
+	case 2:
+		return 448;
+	case 3:
+		return 640;
+	}
+	return 0;
+}
+
+
+int CTentacle :: MyLevel( )
+{
+	switch( pev->sequence )
+	{
+	case TENTACLE_ANIM_Pit_Idle: 
+		return -1;
+
+	case TENTACLE_ANIM_rise_to_Temp1:
+	case TENTACLE_ANIM_Temp1_to_Floor:
+	case TENTACLE_ANIM_Floor_to_Lev1:
+		return 0;
+
+	case TENTACLE_ANIM_Floor_Idle:
+	case TENTACLE_ANIM_Floor_Fidget_Pissed:
+	case TENTACLE_ANIM_Floor_Fidget_SmallRise:
+	case TENTACLE_ANIM_Floor_Fidget_Wave:
+	case TENTACLE_ANIM_Floor_Strike:
+	case TENTACLE_ANIM_Floor_Tap:
+	case TENTACLE_ANIM_Floor_Rotate:
+	case TENTACLE_ANIM_Floor_Rear:
+	case TENTACLE_ANIM_Floor_Rear_Idle:
+		return 0;
+
+	case TENTACLE_ANIM_Lev1_Idle:
+	case TENTACLE_ANIM_Lev1_Fidget_Claw:
+	case TENTACLE_ANIM_Lev1_Fidget_Shake:
+	case TENTACLE_ANIM_Lev1_Fidget_Snap:
+	case TENTACLE_ANIM_Lev1_Strike:
+	case TENTACLE_ANIM_Lev1_Tap:
+	case TENTACLE_ANIM_Lev1_Rotate:
+	case TENTACLE_ANIM_Lev1_Rear:
+	case TENTACLE_ANIM_Lev1_Rear_Idle:
+		return 1;
+
+	case TENTACLE_ANIM_Lev1_to_Lev2:
+		return 1;
+
+	case TENTACLE_ANIM_Lev2_Idle:
+	case TENTACLE_ANIM_Lev2_Fidget_Shake:
+	case TENTACLE_ANIM_Lev2_Fidget_Swing:
+	case TENTACLE_ANIM_Lev2_Fidget_Tut:
+	case TENTACLE_ANIM_Lev2_Strike:
+	case TENTACLE_ANIM_Lev2_Tap:
+	case TENTACLE_ANIM_Lev2_Rotate:
+	case TENTACLE_ANIM_Lev2_Rear:
+	case TENTACLE_ANIM_Lev2_Rear_Idle:
+		return 2;
+
+	case TENTACLE_ANIM_Lev2_to_Lev3:
+		return 2;
+
+	case TENTACLE_ANIM_Lev3_Idle:
+	case TENTACLE_ANIM_Lev3_Fidget_Shake:
+	case TENTACLE_ANIM_Lev3_Fidget_Side:
+	case TENTACLE_ANIM_Lev3_Fidget_Swipe:
+	case TENTACLE_ANIM_Lev3_Strike:
+	case TENTACLE_ANIM_Lev3_Tap:
+	case TENTACLE_ANIM_Lev3_Rotate:
+	case TENTACLE_ANIM_Lev3_Rear:
+	case TENTACLE_ANIM_Lev3_Rear_Idle:
+		return 3;
+
+	case TENTACLE_ANIM_Lev1_Door_reach:
+		return -1;
+	}
+	return -1;
+}
+
+
+void CTentacle :: Test( void )
+{
+	pev->sequence = TENTACLE_ANIM_Floor_Strike;
+	pev->framerate = 0;
+	StudioFrameAdvance( );
+	pev->nextthink = gpGlobals->time + 0.1;
+}
+
+
+
+//
+// TentacleThink
+//
+void CTentacle :: Cycle( void )
+{
+	// ALERT( at_console, "%s %.2f %d %d\n", STRING( pev->targetname ), pev->origin.z, m_MonsterState, m_IdealMonsterState );
+	pev->nextthink = gpGlobals-> time + 0.1;
+
+	// ALERT( at_console, "%s %d %d %d %f %f\n", STRING( pev->targetname ), pev->sequence, m_iGoalAnim, m_iDir, pev->framerate, pev->health );
+
+	if (m_MonsterState == MONSTERSTATE_SCRIPT || m_IdealMonsterState == MONSTERSTATE_SCRIPT)
+	{
+		pev->angles.y = m_flInitialYaw;
+		pev->ideal_yaw = m_flInitialYaw;	
+		ClearConditions( IgnoreConditions() );
+		MonsterThink( );
+		m_iGoalAnim = TENTACLE_ANIM_Pit_Idle;
+		return;
+	}
+
+	DispatchAnimEvents( );
+	StudioFrameAdvance( );
+
+	ChangeYaw( pev->yaw_speed );
+
+	CSound *pSound;
+
+	Listen( );
+
+	// Listen will set this if there's something in my sound list
+	if ( HasConditions( bits_COND_HEAR_SOUND ) )
+		pSound = PBestSound();
+	else
+		pSound = NULL;
+
+	if ( pSound )
+	{
+		Vector vecDir;
+		if (gpGlobals->time - m_flPrevSoundTime < 0.5)
+		{
+			float dt = gpGlobals->time - m_flPrevSoundTime;
+			vecDir = pSound->m_vecOrigin + (pSound->m_vecOrigin - m_vecPrevSound) / dt - pev->origin;
+		}
+		else
+		{
+			vecDir = pSound->m_vecOrigin - pev->origin;
+		}
+		m_flPrevSoundTime = gpGlobals->time;
+		m_vecPrevSound = pSound->m_vecOrigin;
+
+		m_flSoundYaw = UTIL_VecToYaw ( vecDir ) - m_flInitialYaw;
+		m_iSoundLevel = Level( vecDir.z );
+
+		if (m_flSoundYaw < -180)
+			m_flSoundYaw += 360;
+		if (m_flSoundYaw > 180)
+			m_flSoundYaw -= 360;
+
+		// ALERT( at_console, "sound %d %.0f\n", m_iSoundLevel, m_flSoundYaw );
+		if (m_flSoundTime < gpGlobals->time)
+		{
+			// play "I hear new something" sound
+			char *sound;	
+
+			switch( RANDOM_LONG(0,1) )
+			{
+			case 0: sound = "tentacle/te_alert1.wav"; break;
+			case 1: sound = "tentacle/te_alert2.wav"; break;
+			}
+
+			// UTIL_EmitAmbientSound(ENT(pev), pev->origin + Vector( 0, 0, MyHeight()), sound, 1.0, ATTN_NORM, 0, 100);
+		}
+		m_flSoundTime = gpGlobals->time + RANDOM_FLOAT( 5.0, 10.0 );
+	}
+
+	// clip ideal_yaw
+	float dy = m_flSoundYaw;
+	switch( pev->sequence )
+	{
+	case TENTACLE_ANIM_Floor_Rear:
+	case TENTACLE_ANIM_Floor_Rear_Idle:
+	case TENTACLE_ANIM_Lev1_Rear:
+	case TENTACLE_ANIM_Lev1_Rear_Idle:
+	case TENTACLE_ANIM_Lev2_Rear:
+	case TENTACLE_ANIM_Lev2_Rear_Idle:
+	case TENTACLE_ANIM_Lev3_Rear:
+	case TENTACLE_ANIM_Lev3_Rear_Idle:
+		if (dy < 0 && dy > -m_flMaxYaw)
+			dy = -m_flMaxYaw;
+		if (dy > 0 && dy < m_flMaxYaw)
+			dy = m_flMaxYaw;
+		break;
+	default:
+		if (dy < -m_flMaxYaw)
+			dy = -m_flMaxYaw;
+		if (dy > m_flMaxYaw)
+			dy = m_flMaxYaw;
+	}
+	pev->ideal_yaw = m_flInitialYaw + dy;
+
+	if (m_fSequenceFinished)
+	{
+		// ALERT( at_console, "%s done %d %d\n", STRING( pev->targetname ), pev->sequence, m_iGoalAnim );
+		if (pev->health <= 1)
+		{
+			m_iGoalAnim = TENTACLE_ANIM_Pit_Idle;
+			if (pev->sequence == TENTACLE_ANIM_Pit_Idle)
+			{
+				pev->health = 75;
+			}
+		}
+		else if ( m_flSoundTime > gpGlobals->time )
+		{
+			if (m_flSoundYaw >= -(m_flMaxYaw + 30) && m_flSoundYaw <= (m_flMaxYaw + 30))
+			{
+				// strike
+				m_iGoalAnim = LookupActivity( ACT_T_STRIKE + m_iSoundLevel );
+			}
+			else if (m_flSoundYaw >= -m_flMaxYaw * 2 && m_flSoundYaw <= m_flMaxYaw * 2) 
+			{
+				// tap
+				m_iGoalAnim = LookupActivity( ACT_T_TAP + m_iSoundLevel );
+			}
+			else
+			{
+				// go into rear idle
+				m_iGoalAnim = LookupActivity( ACT_T_REARIDLE + m_iSoundLevel );
+			}
+		}
+		else if (pev->sequence == TENTACLE_ANIM_Pit_Idle)
+		{
+			// stay in pit until hear noise
+			m_iGoalAnim = TENTACLE_ANIM_Pit_Idle;
+		}
+		else if (pev->sequence == m_iGoalAnim)
+		{
+			if (MyLevel() >= 0 && gpGlobals->time < m_flSoundTime)
+			{
+				if (RANDOM_LONG(0,9) < m_flSoundTime - gpGlobals->time)
+				{
+					// continue stike
+					m_iGoalAnim = LookupActivity( ACT_T_STRIKE + m_iSoundLevel );
+				}
+				else
+				{
+					// tap
+					m_iGoalAnim = LookupActivity( ACT_T_TAP + m_iSoundLevel );
+				}
+			}
+			else if (MyLevel( ) < 0)
+			{
+				m_iGoalAnim = LookupActivity( ACT_T_IDLE + 0 );
+			}
+			else
+			{
+				if (m_flNextSong < gpGlobals->time)
+				{
+					// play "I hear new something" sound
+					char *sound;	
+
+					switch( RANDOM_LONG(0,1) )
+					{
+					case 0: sound = "tentacle/te_sing1.wav"; break;
+					case 1: sound = "tentacle/te_sing2.wav"; break;
+					}
+
+					EMIT_SOUND(ENT(pev), CHAN_VOICE, sound, 1.0, ATTN_NORM);
+
+					m_flNextSong = gpGlobals->time + RANDOM_FLOAT( 10, 20 );
+				}
+
+				if (RANDOM_LONG(0,15) == 0)
+				{
+					// idle on new level
+					m_iGoalAnim = LookupActivity( ACT_T_IDLE + RANDOM_LONG(0,3) );
+				}
+				else if (RANDOM_LONG(0,3)  == 0)
+				{
+					// tap
+					m_iGoalAnim = LookupActivity( ACT_T_TAP + MyLevel( ) );
+				}
+				else
+				{
+					// idle
+					m_iGoalAnim = LookupActivity( ACT_T_IDLE + MyLevel( ) );
+				}
+			}
+			if (m_flSoundYaw < 0)
+				m_flSoundYaw += RANDOM_FLOAT( 2, 8 );
+			else
+				m_flSoundYaw -= RANDOM_FLOAT( 2, 8 );
+		}
+
+		pev->sequence = FindTransition( pev->sequence, m_iGoalAnim, &m_iDir );
+
+		if (m_iDir > 0)
+		{
+			pev->frame = 0;
+		}
+		else
+		{
+			m_iDir = -1; // just to safe
+			pev->frame = 255;
+		}
+		ResetSequenceInfo( );
+
+		m_flFramerateAdj = RANDOM_FLOAT( -0.2, 0.2 );
+		pev->framerate = m_iDir * 1.0 + m_flFramerateAdj;
+
+		switch( pev->sequence)
+		{
+		case TENTACLE_ANIM_Floor_Tap:
+		case TENTACLE_ANIM_Lev1_Tap:
+		case TENTACLE_ANIM_Lev2_Tap:
+		case TENTACLE_ANIM_Lev3_Tap:
+			{
+				Vector vecSrc;
+				UTIL_MakeVectors( pev->angles );
+
+				TraceResult tr1, tr2;
+
+				vecSrc = pev->origin + Vector( 0, 0, MyHeight() - 4);
+				UTIL_TraceLine( vecSrc, vecSrc + gpGlobals->v_forward * 512, ignore_monsters, ENT( pev ), &tr1 );
+
+				vecSrc = pev->origin + Vector( 0, 0, MyHeight() + 8);
+				UTIL_TraceLine( vecSrc, vecSrc + gpGlobals->v_forward * 512, ignore_monsters, ENT( pev ), &tr2 );
+
+				// ALERT( at_console, "%f %f\n", tr1.flFraction * 512, tr2.flFraction * 512 );
+
+				m_flTapRadius = SetBlending( 0, RANDOM_FLOAT( tr1.flFraction * 512, tr2.flFraction * 512 ) );
+			}
+			break;
+		default:
+			m_flTapRadius = 336; // 400 - 64
+			break;
+		}
+		pev->view_ofs.z = MyHeight( );
+		// ALERT( at_console, "seq %d\n", pev->sequence );
+	}
+
+	if (m_flPrevSoundTime + 2.0 > gpGlobals->time)
+	{
+		// 1.5 normal speed if hears sounds
+		pev->framerate = m_iDir * 1.5 + m_flFramerateAdj;
+	}
+	else if (m_flPrevSoundTime + 5.0 > gpGlobals->time)
+	{
+		// slowdown to normal
+		pev->framerate = m_iDir + m_iDir * (5 - (gpGlobals->time - m_flPrevSoundTime)) / 2 + m_flFramerateAdj;
+	}
+}
+
+
+
+void CTentacle::CommandUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	// ALERT( at_console, "%s triggered %d\n", STRING( pev->targetname ), useType ); 
+	switch( useType )
+	{
+	case USE_OFF:
+		pev->takedamage = DAMAGE_NO;
+		SetThink( &CTentacle::DieThink );
+		m_iGoalAnim = TENTACLE_ANIM_Engine_Death1;
+		break;
+	case USE_ON:
+		if (pActivator)
+		{
+			// ALERT( at_console, "insert sound\n");
+			CSoundEnt::InsertSound ( bits_SOUND_WORLD, pActivator->pev->origin, 1024, 1.0 );
+		}
+		break;
+	case USE_SET:
+		break;
+	case USE_TOGGLE:
+		pev->takedamage = DAMAGE_NO;
+		SetThink( &CTentacle::DieThink );
+		m_iGoalAnim = TENTACLE_ANIM_Engine_Idle;
+		break;
+	}
+
+}
+
+
+
+void CTentacle :: DieThink( void )
+{
+	pev->nextthink = gpGlobals-> time + 0.1;
+
+	DispatchAnimEvents( );
+	StudioFrameAdvance( );
+
+	ChangeYaw( 24 );
+
+	if (m_fSequenceFinished)
+	{
+		if (pev->sequence == m_iGoalAnim)
+		{
+			switch( m_iGoalAnim )
+			{
+			case TENTACLE_ANIM_Engine_Idle:
+			case TENTACLE_ANIM_Engine_Sway:
+			case TENTACLE_ANIM_Engine_Swat:
+			case TENTACLE_ANIM_Engine_Bob:
+				m_iGoalAnim = TENTACLE_ANIM_Engine_Sway + RANDOM_LONG( 0, 2 );
+				break;
+			case TENTACLE_ANIM_Engine_Death1:
+			case TENTACLE_ANIM_Engine_Death2:
+			case TENTACLE_ANIM_Engine_Death3:
+				UTIL_Remove( this );
+				return;
+			}
+		}
+
+		// ALERT( at_console, "%d : %d => ", pev->sequence, m_iGoalAnim );
+		pev->sequence = FindTransition( pev->sequence, m_iGoalAnim, &m_iDir );
+		// ALERT( at_console, "%d\n", pev->sequence );
+
+		if (m_iDir > 0)
+		{
+			pev->frame = 0;
+		}
+		else
+		{
+			pev->frame = 255;
+		}
+		ResetSequenceInfo( );
+
+		float dy;
+		switch( pev->sequence )
+		{
+		case TENTACLE_ANIM_Floor_Rear:
+		case TENTACLE_ANIM_Floor_Rear_Idle:
+		case TENTACLE_ANIM_Lev1_Rear:
+		case TENTACLE_ANIM_Lev1_Rear_Idle:
+		case TENTACLE_ANIM_Lev2_Rear:
+		case TENTACLE_ANIM_Lev2_Rear_Idle:
+		case TENTACLE_ANIM_Lev3_Rear:
+		case TENTACLE_ANIM_Lev3_Rear_Idle:
+		case TENTACLE_ANIM_Engine_Idle:
+		case TENTACLE_ANIM_Engine_Sway:
+		case TENTACLE_ANIM_Engine_Swat:
+		case TENTACLE_ANIM_Engine_Bob:
+		case TENTACLE_ANIM_Engine_Death1:
+		case TENTACLE_ANIM_Engine_Death2:
+		case TENTACLE_ANIM_Engine_Death3:
+			pev->framerate = RANDOM_FLOAT( m_iDir - 0.2, m_iDir + 0.2 );
+			dy = 180;
+			break;
+		default:
+			pev->framerate = 1.5;
+			dy = 0;
+			break;
+		}
+		pev->ideal_yaw = m_flInitialYaw + dy;
+	}
+}
+
+
+void CTentacle :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	char *sound;
+
+	switch( pEvent->event )
+	{
+	case 1:	// bang 
+		{
+			Vector vecSrc, vecAngles;
+			GetAttachment( 0, vecSrc, vecAngles );
+
+			// Vector vecSrc = pev->origin + m_flTapRadius * Vector( cos( pev->angles.y * (3.14192653 / 180.0) ), sin( pev->angles.y * (M_PI / 180.0) ), 0.0 );
+
+			// vecSrc.z += MyHeight( );
+
+			switch( m_iTapSound )
+			{
+			case TE_SILO:
+				UTIL_EmitAmbientSound(ENT(pev), vecSrc, RANDOM_SOUND_ARRAY( pHitSilo ), 1.0, ATTN_NORM, 0, 100);
+				break;
+			case TE_NONE:
+				break;
+			case TE_DIRT:
+				UTIL_EmitAmbientSound(ENT(pev), vecSrc, RANDOM_SOUND_ARRAY( pHitDirt ), 1.0, ATTN_NORM, 0, 100);
+				break;
+			case TE_WATER:
+				UTIL_EmitAmbientSound(ENT(pev), vecSrc, RANDOM_SOUND_ARRAY( pHitWater ), 1.0, ATTN_NORM, 0, 100);
+				break;
+			}
+          gpGlobals->force_retouch++;
+		}
+		break;
+
+	case 3: // start killing swing
+		m_iHitDmg = 200;
+		// UTIL_EmitAmbientSound(ENT(pev), pev->origin + Vector( 0, 0, MyHeight()), "tentacle/te_swing1.wav", 1.0, ATTN_NORM, 0, 100);
+		break;
+
+	case 4: // end killing swing
+		m_iHitDmg = 25;
+		break;
+
+	case 5: // just "whoosh" sound
+		// UTIL_EmitAmbientSound(ENT(pev), pev->origin + Vector( 0, 0, MyHeight()), "tentacle/te_swing2.wav", 1.0, ATTN_NORM, 0, 100);
+		break;
+
+	case 2:	// tap scrape
+	case 6: // light tap
+		{
+			Vector vecSrc = pev->origin + m_flTapRadius * Vector( cos( pev->angles.y * (M_PI / 180.0) ), sin( pev->angles.y * (M_PI / 180.0) ), 0.0 );
+
+			vecSrc.z += MyHeight( );
+
+			float flVol = RANDOM_FLOAT( 0.3, 0.5 );
+
+			switch( m_iTapSound )
+			{
+			case TE_SILO:
+				UTIL_EmitAmbientSound(ENT(pev), vecSrc, RANDOM_SOUND_ARRAY( pHitSilo ), flVol, ATTN_NORM, 0, 100);
+				break;
+			case TE_NONE:
+				break;
+			case TE_DIRT:
+				UTIL_EmitAmbientSound(ENT(pev), vecSrc, RANDOM_SOUND_ARRAY( pHitDirt ), flVol, ATTN_NORM, 0, 100);
+				break;
+			case TE_WATER:
+				UTIL_EmitAmbientSound(ENT(pev), vecSrc, RANDOM_SOUND_ARRAY( pHitWater ), flVol, ATTN_NORM, 0, 100);
+				break;
+			}
+		}
+		break;
+
+
+	case 7: // roar
+		switch( RANDOM_LONG(0,1) )
+		{
+		case 0: sound = "tentacle/te_roar1.wav"; break;
+		case 1: sound = "tentacle/te_roar2.wav"; break;
+		}
+
+		UTIL_EmitAmbientSound(ENT(pev), pev->origin + Vector( 0, 0, MyHeight()), sound, 1.0, ATTN_NORM, 0, 100);
+		break;
+
+	case 8: // search
+		switch( RANDOM_LONG(0,1) )
+		{
+		case 0: sound = "tentacle/te_search1.wav"; break;
+		case 1: sound = "tentacle/te_search2.wav"; break;
+		}
+
+		UTIL_EmitAmbientSound(ENT(pev), pev->origin + Vector( 0, 0, MyHeight()), sound, 1.0, ATTN_NORM, 0, 100);
+		break;
+
+	case 9: // swing
+		switch( RANDOM_LONG(0,1) )
+		{
+		case 0: sound = "tentacle/te_move1.wav"; break;
+		case 1: sound = "tentacle/te_move2.wav"; break;
+		}
+
+		UTIL_EmitAmbientSound(ENT(pev), pev->origin + Vector( 0, 0, MyHeight()), sound, 1.0, ATTN_NORM, 0, 100);
+		break;
+
+	default:
+		CBaseMonster::HandleAnimEvent( pEvent );
+	}
+}
+
+
+//
+// TentacleStart
+//
+// void CTentacle :: Start( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+void CTentacle :: Start( void )
+{
+	SetThink( &CTentacle::Cycle );
+
+	if ( !g_fFlySound )
+	{
+		EMIT_SOUND (ENT(pev), CHAN_BODY, "ambience/flies.wav", 1, ATTN_NORM );
+		g_fFlySound = TRUE;
+//		pev->nextthink = gpGlobals-> time + 0.1;
+	}
+	else if ( !g_fSquirmSound )
+	{
+		EMIT_SOUND (ENT(pev), CHAN_BODY, "ambience/squirm2.wav", 1, ATTN_NORM );
+		g_fSquirmSound = TRUE;
+	}
+	
+	pev->nextthink = gpGlobals->time + 0.1;
+}
+
+
+
+
+void CTentacle :: HitTouch( CBaseEntity *pOther )
+{
+	TraceResult tr = UTIL_GetGlobalTrace( );
+
+	if (pOther->pev->modelindex == pev->modelindex)
+		return;
+
+	if (m_flHitTime > gpGlobals->time)
+		return;
+
+	// only look at the ones where the player hit me
+	if (tr.pHit == NULL || tr.pHit->v.modelindex != pev->modelindex)
+		return;
+
+	if (tr.iHitgroup >= 3)
+	{
+		pOther->TakeDamage( pev, pev, m_iHitDmg, DMG_CRUSH );
+		// ALERT( at_console, "wack %3d : ", m_iHitDmg );
+	}
+	else if (tr.iHitgroup != 0)
+	{
+		pOther->TakeDamage( pev, pev, 20, DMG_CRUSH );
+		// ALERT( at_console, "tap  %3d : ", 20 );
+	}
+	else
+	{
+		return; // Huh?
+	}
+
+	m_flHitTime = gpGlobals->time + 0.5;
+
+	// ALERT( at_console, "%s : ", STRING( tr.pHit->v.classname ) );
+
+	// ALERT( at_console, "%.0f : %s : %d\n", pev->angles.y, STRING( pOther->pev->classname ), tr.iHitgroup );
+}
+
+
+int CTentacle::TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType )
+{
+	if (flDamage > pev->health)
+	{
+		pev->health = 1;
+	}
+	else
+	{
+		pev->health -= flDamage;
+	}
+	return 1;
+}
+
+
+
+
+void CTentacle :: Killed( entvars_t *pevAttacker, int iGib )
+{
+	m_iGoalAnim = TENTACLE_ANIM_Pit_Idle;
+	return;
+}
+
+
+
+class CTentacleMaw : public CBaseMonster
+{
+public:
+	void Spawn( );
+	void Precache( );
+};
+
+LINK_ENTITY_TO_CLASS( monster_tentaclemaw, CTentacleMaw );
+
+//
+// Tentacle Spawn
+//
+void CTentacleMaw :: Spawn( )
+{
+	Precache( );
+	SET_MODEL(ENT(pev), "models/maw.mdl");
+	UTIL_SetSize(pev, Vector(-32, -32, 0), Vector(32, 32, 64));
+
+	pev->solid			= SOLID_NOT;
+	pev->movetype		= MOVETYPE_STEP;
+	pev->effects		= 0;
+	pev->health			= 75;
+	pev->yaw_speed		= 8;
+	pev->sequence		= 0;
+	
+	pev->angles.x		= 90;
+	// ResetSequenceInfo( );
+}
+
+void CTentacleMaw :: Precache( )
+{
+	PRECACHE_MODEL("models/maw.mdl");
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/trains.h b/main/source/dlls/trains.h
new file mode 100644
index 00000000..15aa38ca
--- /dev/null
+++ b/main/source/dlls/trains.h
@@ -0,0 +1,127 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef TRAINS_H
+#define TRAINS_H
+
+// Tracktrain spawn flags
+#define SF_TRACKTRAIN_NOPITCH		0x0001
+#define SF_TRACKTRAIN_NOCONTROL		0x0002
+#define SF_TRACKTRAIN_FORWARDONLY	0x0004
+#define SF_TRACKTRAIN_PASSABLE		0x0008
+
+// Spawnflag for CPathTrack
+#define SF_PATH_DISABLED		0x00000001
+#define SF_PATH_FIREONCE		0x00000002
+#define SF_PATH_ALTREVERSE		0x00000004
+#define SF_PATH_DISABLE_TRAIN	0x00000008
+#define SF_PATH_ALTERNATE		0x00008000
+
+// Spawnflags of CPathCorner
+#define SF_CORNER_WAITFORTRIG	0x001
+#define SF_CORNER_TELEPORT		0x002
+#define SF_CORNER_FIREONCE		0x004
+
+//#define PATH_SPARKLE_DEBUG		1	// This makes a particle effect around path_track entities for debugging
+class CPathTrack : public CPointEntity
+{
+public:
+	void		Spawn( void );
+	void		Activate( void );
+	void		KeyValue( KeyValueData* pkvd);
+	
+	void		SetPrevious( CPathTrack *pprevious );
+	void		Link( void );
+	void		Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+	CPathTrack	*ValidPath( CPathTrack *ppath, int testFlag );		// Returns ppath if enabled, NULL otherwise
+	void		Project( CPathTrack *pstart, CPathTrack *pend, Vector *origin, float dist );
+
+	static CPathTrack *Instance( edict_t *pent );
+
+	CPathTrack	*LookAhead( Vector *origin, float dist, int move );
+	CPathTrack	*Nearest( Vector origin );
+
+	CPathTrack	*GetNext( void );
+	CPathTrack	*GetPrevious( void );
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	
+	static	TYPEDESCRIPTION m_SaveData[];
+#if PATH_SPARKLE_DEBUG
+	void EXPORT Sparkle(void);
+#endif
+
+	float		m_length;
+	string_t	m_altName;
+	CPathTrack	*m_pnext;
+	CPathTrack	*m_pprevious;
+	CPathTrack	*m_paltpath;
+};
+
+
+class CFuncTrackTrain : public CBaseEntity
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+
+	void Blocked( CBaseEntity *pOther );
+	void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void KeyValue( KeyValueData* pkvd );
+
+	void EXPORT Next( void );
+	void EXPORT Find( void );
+	void EXPORT NearestPath( void );
+	void EXPORT DeadEnd( void );
+
+	void		NextThink( float thinkTime, BOOL alwaysThink );
+
+	void SetTrack( CPathTrack *track ) { m_ppath = track->Nearest(pev->origin); }
+	void SetControls( entvars_t *pevControls );
+	BOOL OnControls( entvars_t *pev );
+
+	void StopSound ( void );
+	void UpdateSound ( void );
+	
+	static CFuncTrackTrain *Instance( edict_t *pent );
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	
+	static	TYPEDESCRIPTION m_SaveData[];
+	virtual int	ObjectCaps( void ) { return (CBaseEntity :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION) | FCAP_DIRECTIONAL_USE; }
+
+	virtual void	OverrideReset( void );
+
+	CPathTrack	*m_ppath;
+	float		m_length;
+	float		m_height;
+	float		m_speed;
+	float		m_dir;
+	float		m_startSpeed;
+	Vector		m_controlMins;
+	Vector		m_controlMaxs;
+	int			m_soundPlaying;
+	int			m_sounds;
+	float		m_flVolume;
+	float		m_flBank;
+	float		m_oldSpeed;
+
+private:
+	unsigned short m_usAdjustPitch;
+};
+
+#endif
diff --git a/main/source/dlls/triggers.cpp b/main/source/dlls/triggers.cpp
new file mode 100644
index 00000000..e0085768
--- /dev/null
+++ b/main/source/dlls/triggers.cpp
@@ -0,0 +1,2404 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/*
+
+===== triggers.cpp ========================================================
+
+  spawn and use functions for editor-placed triggers              
+
+*/
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "player.h"
+#include "saverestore.h"
+#include "trains.h"			// trigger_camera has train functionality
+#include "gamerules.h"
+#include "dlls/triggers.h"
+
+#define	SF_TRIGGER_PUSH_START_OFF	2//spawnflag that makes trigger_push spawn turned OFF
+#define SF_TRIGGER_HURT_TARGETONCE	1// Only fire hurt target once
+#define	SF_TRIGGER_HURT_START_OFF	2//spawnflag that makes trigger_push spawn turned OFF
+#define	SF_TRIGGER_HURT_NO_CLIENTS	8//spawnflag that makes trigger_push spawn turned OFF
+#define SF_TRIGGER_HURT_CLIENTONLYFIRE	16// trigger hurt will only fire its target if it is hurting a client
+#define SF_TRIGGER_HURT_CLIENTONLYTOUCH 32// only clients may touch this trigger.
+
+extern DLL_GLOBAL BOOL		g_fGameOver;
+
+extern void SetMovedir(entvars_t* pev);
+extern Vector VecBModelOrigin( entvars_t* pevBModel );
+
+class CFrictionModifier : public CBaseEntity
+{
+public:
+	void		Spawn( void );
+	void		KeyValue( KeyValueData *pkvd );
+	void EXPORT	ChangeFriction( CBaseEntity *pOther );
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+
+	virtual int	ObjectCaps( void ) { return CBaseEntity :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	float		m_frictionFraction;		// Sorry, couldn't resist this name :)
+};
+
+LINK_ENTITY_TO_CLASS( func_friction, CFrictionModifier );
+
+// Global Savedata for changelevel friction modifier
+TYPEDESCRIPTION	CFrictionModifier::m_SaveData[] = 
+{
+	DEFINE_FIELD( CFrictionModifier, m_frictionFraction, FIELD_FLOAT ),
+};
+
+IMPLEMENT_SAVERESTORE(CFrictionModifier,CBaseEntity);
+
+
+// Modify an entity's friction
+void CFrictionModifier :: Spawn( void )
+{
+	pev->solid = SOLID_TRIGGER;
+	SET_MODEL(ENT(pev), STRING(pev->model));    // set size and link into world
+	pev->movetype = MOVETYPE_NONE;
+	SetTouch( &CFrictionModifier::ChangeFriction );
+}
+
+
+// Sets toucher's friction to m_frictionFraction (1.0 = normal friction)
+void CFrictionModifier :: ChangeFriction( CBaseEntity *pOther )
+{
+	if ( pOther->pev->movetype != MOVETYPE_BOUNCEMISSILE && pOther->pev->movetype != MOVETYPE_BOUNCE )
+		pOther->pev->friction = m_frictionFraction;
+}
+
+
+
+// Sets toucher's friction to m_frictionFraction (1.0 = normal friction)
+void CFrictionModifier :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "modifier"))
+	{
+		m_frictionFraction = atof(pkvd->szValue) / 100.0;
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseEntity::KeyValue( pkvd );
+}
+
+
+// This trigger will fire when the level spawns (or respawns if not fire once)
+// It will check a global state before firing.  It supports delay and killtargets
+
+#define SF_AUTO_FIREONCE		0x0001
+
+class CAutoTrigger : public CBaseDelay
+{
+public:
+	void KeyValue( KeyValueData *pkvd );
+	void Spawn( void );
+	void Precache( void );
+	void Think( void );
+
+	int ObjectCaps( void ) { return CBaseDelay::ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+
+	static	TYPEDESCRIPTION m_SaveData[];
+
+private:
+	int			m_globalstate;
+	USE_TYPE	triggerType;
+};
+LINK_ENTITY_TO_CLASS( trigger_auto, CAutoTrigger );
+
+TYPEDESCRIPTION	CAutoTrigger::m_SaveData[] = 
+{
+	DEFINE_FIELD( CAutoTrigger, m_globalstate, FIELD_STRING ),
+	DEFINE_FIELD( CAutoTrigger, triggerType, FIELD_INTEGER ),
+};
+
+IMPLEMENT_SAVERESTORE(CAutoTrigger,CBaseDelay);
+
+void CAutoTrigger::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "globalstate"))
+	{
+		m_globalstate = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "triggerstate"))
+	{
+		int type = atoi( pkvd->szValue );
+		switch( type )
+		{
+		case 0:
+			triggerType = USE_OFF;
+			break;
+		case 2:
+			triggerType = USE_TOGGLE;
+			break;
+		default:
+			triggerType = USE_ON;
+			break;
+		}
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseDelay::KeyValue( pkvd );
+}
+
+
+void CAutoTrigger::Spawn( void )
+{
+	Precache();
+}
+
+
+void CAutoTrigger::Precache( void )
+{
+	pev->nextthink = gpGlobals->time + 0.1;
+}
+
+
+void CAutoTrigger::Think( void )
+{
+	if ( !m_globalstate || gGlobalState.EntityGetState( m_globalstate ) == GLOBAL_ON )
+	{
+		SUB_UseTargets( this, triggerType, 0 );
+		if ( pev->spawnflags & SF_AUTO_FIREONCE )
+			UTIL_Remove( this );
+	}
+}
+
+
+
+#define SF_RELAY_FIREONCE		0x0001
+
+class CTriggerRelay : public CBaseDelay
+{
+public:
+	void KeyValue( KeyValueData *pkvd );
+	void Spawn( void );
+	void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+	int ObjectCaps( void ) { return CBaseDelay::ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+
+	static	TYPEDESCRIPTION m_SaveData[];
+
+private:
+	USE_TYPE	triggerType;
+};
+LINK_ENTITY_TO_CLASS( trigger_relay, CTriggerRelay );
+
+TYPEDESCRIPTION	CTriggerRelay::m_SaveData[] = 
+{
+	DEFINE_FIELD( CTriggerRelay, triggerType, FIELD_INTEGER ),
+};
+
+IMPLEMENT_SAVERESTORE(CTriggerRelay,CBaseDelay);
+
+void CTriggerRelay::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "triggerstate"))
+	{
+		int type = atoi( pkvd->szValue );
+		switch( type )
+		{
+		case 0:
+			triggerType = USE_OFF;
+			break;
+		case 2:
+			triggerType = USE_TOGGLE;
+			break;
+		default:
+			triggerType = USE_ON;
+			break;
+		}
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseDelay::KeyValue( pkvd );
+}
+
+
+void CTriggerRelay::Spawn( void )
+{
+}
+
+
+
+
+void CTriggerRelay::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	SUB_UseTargets( this, triggerType, 0 );
+	if ( pev->spawnflags & SF_RELAY_FIREONCE )
+		UTIL_Remove( this );
+}
+
+
+//**********************************************************
+// The Multimanager Entity - when fired, will fire up to 16 targets 
+// at specified times.
+// FLAG:		THREAD (create clones when triggered)
+// FLAG:		CLONE (this is a clone for a threaded execution)
+
+#define SF_MULTIMAN_CLONE		0x80000000
+#define SF_MULTIMAN_THREAD		0x00000001
+
+class CMultiManager : public CBaseToggle
+{
+public:
+	void KeyValue( KeyValueData *pkvd );
+	void Spawn ( void );
+	void EXPORT ManagerThink ( void );
+	void EXPORT ManagerUse   ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+#if _DEBUG
+	void EXPORT ManagerReport( void );
+#endif
+
+	BOOL		HasTarget( string_t targetname );
+	
+	int ObjectCaps( void ) { return CBaseToggle::ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	int		m_cTargets;	// the total number of targets in this manager's fire list.
+	int		m_index;	// Current target
+	float	m_startTime;// Time we started firing
+	int		m_iTargetName	[ MAX_MULTI_TARGETS ];// list if indexes into global string array
+	float	m_flTargetDelay [ MAX_MULTI_TARGETS ];// delay (in seconds) from time of manager fire to target fire
+private:
+	inline BOOL IsClone( void ) { return (pev->spawnflags & SF_MULTIMAN_CLONE) ? TRUE : FALSE; }
+	inline BOOL ShouldClone( void ) 
+	{ 
+		if ( IsClone() )
+			return FALSE;
+
+		return (pev->spawnflags & SF_MULTIMAN_THREAD) ? TRUE : FALSE; 
+	}
+
+	CMultiManager *Clone( void );
+};
+LINK_ENTITY_TO_CLASS( multi_manager, CMultiManager );
+
+// Global Savedata for multi_manager
+TYPEDESCRIPTION	CMultiManager::m_SaveData[] = 
+{
+	DEFINE_FIELD( CMultiManager, m_cTargets, FIELD_INTEGER ),
+	DEFINE_FIELD( CMultiManager, m_index, FIELD_INTEGER ),
+	DEFINE_FIELD( CMultiManager, m_startTime, FIELD_TIME ),
+	DEFINE_ARRAY( CMultiManager, m_iTargetName, FIELD_STRING, MAX_MULTI_TARGETS ),
+	DEFINE_ARRAY( CMultiManager, m_flTargetDelay, FIELD_FLOAT, MAX_MULTI_TARGETS ),
+};
+
+IMPLEMENT_SAVERESTORE(CMultiManager,CBaseToggle);
+
+void CMultiManager :: KeyValue( KeyValueData *pkvd )
+{
+	// UNDONE: Maybe this should do something like this:
+	//CBaseToggle::KeyValue( pkvd );
+	// if ( !pkvd->fHandled )
+	// ... etc.
+
+	if (FStrEq(pkvd->szKeyName, "wait"))
+	{
+		m_flWait = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else // add this field to the target list
+	{
+		// this assumes that additional fields are targetnames and their values are delay values.
+		if ( m_cTargets < MAX_MULTI_TARGETS )
+		{
+			char tmp[128];
+
+			UTIL_StripToken( pkvd->szKeyName, tmp );
+			m_iTargetName [ m_cTargets ] = ALLOC_STRING( tmp );
+			m_flTargetDelay [ m_cTargets ] = atof (pkvd->szValue);
+			m_cTargets++;
+			pkvd->fHandled = TRUE;
+		}
+	}
+}
+
+
+void CMultiManager :: Spawn( void )
+{
+	pev->solid = SOLID_NOT;
+	SetUse ( &CMultiManager::ManagerUse );
+	SetThink (&CMultiManager::ManagerThink);
+
+	// Sort targets
+	// Quick and dirty bubble sort
+	int swapped = 1;
+
+	while ( swapped )
+	{
+		swapped = 0;
+		for ( int i = 1; i < m_cTargets; i++ )
+		{
+			if ( m_flTargetDelay[i] < m_flTargetDelay[i-1] )
+			{
+				// Swap out of order elements
+				int name = m_iTargetName[i];
+				float delay = m_flTargetDelay[i];
+				m_iTargetName[i] = m_iTargetName[i-1];
+				m_flTargetDelay[i] = m_flTargetDelay[i-1];
+				m_iTargetName[i-1] = name;
+				m_flTargetDelay[i-1] = delay;
+				swapped = 1;
+			}
+		}
+	}
+}
+
+
+BOOL CMultiManager::HasTarget( string_t targetname )
+{ 
+	for ( int i = 0; i < m_cTargets; i++ )
+		if ( FStrEq(STRING(targetname), STRING(m_iTargetName[i])) )
+			return TRUE;
+	
+	return FALSE;
+}
+
+
+// Designers were using this to fire targets that may or may not exist -- 
+// so I changed it to use the standard target fire code, made it a little simpler.
+void CMultiManager :: ManagerThink ( void )
+{
+	float	time;
+
+	time = gpGlobals->time - m_startTime;
+	while ( m_index < m_cTargets && m_flTargetDelay[ m_index ] <= time )
+	{
+		FireTargets( STRING( m_iTargetName[ m_index ] ), m_hActivator, this, USE_TOGGLE, 0 );
+		m_index++;
+	}
+
+	if ( m_index >= m_cTargets )// have we fired all targets?
+	{
+		SetThink( NULL );
+		if ( IsClone() )
+		{
+			UTIL_Remove( this );
+			return;
+		}
+		SetUse ( &CMultiManager::ManagerUse );// allow manager re-use 
+	}
+	else
+		pev->nextthink = m_startTime + m_flTargetDelay[ m_index ];
+}
+
+CMultiManager *CMultiManager::Clone( void )
+{
+	CMultiManager *pMulti = GetClassPtr( (CMultiManager *)NULL );
+
+	edict_t *pEdict = pMulti->pev->pContainingEntity;
+	memcpy( pMulti->pev, pev, sizeof(*pev) );
+	pMulti->pev->pContainingEntity = pEdict;
+
+	pMulti->pev->spawnflags |= SF_MULTIMAN_CLONE;
+	pMulti->m_cTargets = m_cTargets;
+	memcpy( pMulti->m_iTargetName, m_iTargetName, sizeof( m_iTargetName ) );
+	memcpy( pMulti->m_flTargetDelay, m_flTargetDelay, sizeof( m_flTargetDelay ) );
+
+	return pMulti;
+}
+
+
+// The USE function builds the time table and starts the entity thinking.
+void CMultiManager :: ManagerUse ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	// In multiplayer games, clone the MM and execute in the clone (like a thread)
+	// to allow multiple players to trigger the same multimanager
+	if ( ShouldClone() )
+	{
+		CMultiManager *pClone = Clone();
+		pClone->ManagerUse( pActivator, pCaller, useType, value );
+		return;
+	}
+
+	m_hActivator = pActivator;
+	m_index = 0;
+	m_startTime = gpGlobals->time;
+
+	SetUse( NULL );// disable use until all targets have fired
+
+	SetThink ( &CMultiManager::ManagerThink );
+	pev->nextthink = gpGlobals->time;
+}
+
+#if _DEBUG
+void CMultiManager :: ManagerReport ( void )
+{
+	int	cIndex;
+
+	for ( cIndex = 0 ; cIndex < m_cTargets ; cIndex++ )
+	{
+		ALERT ( at_console, "%s %f\n", STRING(m_iTargetName[cIndex]), m_flTargetDelay[cIndex] );
+	}
+}
+#endif
+
+//***********************************************************
+
+
+//
+// Render parameters trigger
+//
+// This entity will copy its render parameters (renderfx, rendermode, rendercolor, renderamt)
+// to its targets when triggered.
+//
+
+
+// Flags to indicate masking off various render parameters that are normally copied to the targets
+#define SF_RENDER_MASKFX	(1<<0)
+#define SF_RENDER_MASKAMT	(1<<1)
+#define SF_RENDER_MASKMODE	(1<<2)
+#define SF_RENDER_MASKCOLOR	(1<<3)
+
+class CRenderFxManager : public CBaseEntity
+{
+public:
+	void Spawn( void );
+	void Use ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+};
+
+LINK_ENTITY_TO_CLASS( env_render, CRenderFxManager );
+
+
+void CRenderFxManager :: Spawn ( void )
+{
+	pev->solid = SOLID_NOT;
+}
+
+void CRenderFxManager :: Use ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if (!FStringNull(pev->target))
+	{
+		edict_t* pentTarget	= NULL;
+		while ( 1 )
+		{
+			pentTarget = FIND_ENTITY_BY_TARGETNAME(pentTarget, STRING(pev->target));
+			if (FNullEnt(pentTarget))
+				break;
+
+			entvars_t *pevTarget = VARS( pentTarget );
+			if ( !FBitSet( pev->spawnflags, SF_RENDER_MASKFX ) )
+				pevTarget->renderfx = pev->renderfx;
+			if ( !FBitSet( pev->spawnflags, SF_RENDER_MASKAMT ) )
+				pevTarget->renderamt = pev->renderamt;
+			if ( !FBitSet( pev->spawnflags, SF_RENDER_MASKMODE ) )
+				pevTarget->rendermode = pev->rendermode;
+			if ( !FBitSet( pev->spawnflags, SF_RENDER_MASKCOLOR ) )
+				pevTarget->rendercolor = pev->rendercolor;
+		}
+	}
+}
+
+
+
+LINK_ENTITY_TO_CLASS( trigger, CBaseTrigger );
+
+/*
+================
+InitTrigger
+================
+*/
+void CBaseTrigger::InitTrigger( )
+{
+	// trigger angles are used for one-way touches.  An angle of 0 is assumed
+	// to mean no restrictions, so use a yaw of 360 instead.
+	if (pev->angles != g_vecZero)
+		SetMovedir(pev);
+	pev->solid = SOLID_TRIGGER;
+	pev->movetype = MOVETYPE_NONE;
+	SET_MODEL(ENT(pev), STRING(pev->model));    // set size and link into world
+	if ( CVAR_GET_FLOAT("showtriggers") == 0 )
+		SetBits( pev->effects, EF_NODRAW );
+}
+
+
+//
+// Cache user-entity-field values until spawn is called.
+//
+
+void CBaseTrigger :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "damage"))
+	{
+		pev->dmg = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "count"))
+	{
+		m_cTriggersLeft = (int) atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "damagetype"))
+	{
+		m_bitsDamageInflict = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseToggle::KeyValue( pkvd );
+}
+
+class CTriggerHurt : public CBaseTrigger
+{
+public:
+	void Spawn( void );
+	void EXPORT RadiationThink( void );
+};
+
+LINK_ENTITY_TO_CLASS( trigger_hurt, CTriggerHurt );
+
+//
+// trigger_monsterjump
+//
+class CTriggerMonsterJump : public CBaseTrigger
+{
+public:
+	void Spawn( void );
+	void Touch( CBaseEntity *pOther );
+	void Think( void );
+};
+
+LINK_ENTITY_TO_CLASS( trigger_monsterjump, CTriggerMonsterJump );
+
+
+void CTriggerMonsterJump :: Spawn ( void )
+{
+	SetMovedir ( pev );
+	
+	InitTrigger ();
+
+	pev->nextthink = 0;
+	pev->speed = 200;
+	m_flHeight = 150;
+
+	if ( !FStringNull ( pev->targetname ) )
+	{// if targetted, spawn turned off
+		pev->solid = SOLID_NOT;
+		UTIL_SetOrigin( pev, pev->origin ); // Unlink from trigger list
+		SetUse( &CTriggerMonsterJump::ToggleUse );
+	}
+}
+
+
+void CTriggerMonsterJump :: Think( void )
+{
+	pev->solid = SOLID_NOT;// kill the trigger for now !!!UNDONE
+	UTIL_SetOrigin( pev, pev->origin ); // Unlink from trigger list
+	SetThink( NULL );
+}
+
+void CTriggerMonsterJump :: Touch( CBaseEntity *pOther )
+{
+	entvars_t *pevOther = pOther->pev;
+
+	if ( !FBitSet ( pevOther->flags , FL_MONSTER ) ) 
+	{// touched by a non-monster.
+		return;
+	}
+
+	pevOther->origin.z += 1;
+	
+	if ( FBitSet ( pevOther->flags, FL_ONGROUND ) ) 
+	{// clear the onground so physics don't bitch
+		pevOther->flags &= ~FL_ONGROUND;
+	}
+
+	// toss the monster!
+	pevOther->velocity = pev->movedir * pev->speed;
+	pevOther->velocity.z += m_flHeight;
+	pev->nextthink = gpGlobals->time;
+}
+
+
+//=====================================
+//
+// trigger_cdaudio - starts/stops cd audio tracks
+//
+class CTriggerCDAudio : public CBaseTrigger
+{
+public:
+	void Spawn( void );
+
+	virtual void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void PlayTrack( void );
+	void Touch ( CBaseEntity *pOther );
+};
+
+LINK_ENTITY_TO_CLASS( trigger_cdaudio, CTriggerCDAudio );
+
+//
+// Changes tracks or stops CD when player touches
+//
+// !!!HACK - overloaded HEALTH to avoid adding new field
+void CTriggerCDAudio :: Touch ( CBaseEntity *pOther )
+{
+	if ( !pOther->IsPlayer() )
+	{// only clients may trigger these events
+		return;
+	}
+
+	PlayTrack();
+}
+
+void CTriggerCDAudio :: Spawn( void )
+{
+	InitTrigger();
+}
+
+void CTriggerCDAudio::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	PlayTrack();
+}
+
+void PlayCDTrack( int iTrack )
+{
+	edict_t *pClient;
+	
+	// manually find the single player. 
+	pClient = g_engfuncs.pfnPEntityOfEntIndex( 1 );
+	
+	// Can't play if the client is not connected!
+	if ( !pClient )
+		return;
+
+	if ( iTrack < -1 || iTrack > 30 )
+	{
+		ALERT ( at_console, "TriggerCDAudio - Track %d out of range\n" );
+		return;
+	}
+
+	if ( iTrack == -1 )
+	{
+		CLIENT_COMMAND ( pClient, "cd pause\n");
+	}
+	else
+	{
+		char string [ 64 ];
+
+		sprintf( string, "cd play %3d\n", iTrack );
+		CLIENT_COMMAND ( pClient, string);
+	}
+}
+
+
+// only plays for ONE client, so only use in single play!
+void CTriggerCDAudio :: PlayTrack( void )
+{
+	PlayCDTrack( (int)pev->health );
+	
+	SetTouch( NULL );
+	UTIL_Remove( this );
+}
+
+
+// This plays a CD track when fired or when the player enters it's radius
+class CTargetCDAudio : public CPointEntity
+{
+public:
+	void			Spawn( void );
+	void			KeyValue( KeyValueData *pkvd );
+
+	virtual void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void			Think( void );
+	void			Play( void );
+};
+
+LINK_ENTITY_TO_CLASS( target_cdaudio, CTargetCDAudio );
+
+void CTargetCDAudio :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "radius"))
+	{
+		pev->scale = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CPointEntity::KeyValue( pkvd );
+}
+
+void CTargetCDAudio :: Spawn( void )
+{
+	pev->solid = SOLID_NOT;
+	pev->movetype = MOVETYPE_NONE;
+
+	if ( pev->scale > 0 )
+		pev->nextthink = gpGlobals->time + 1.0;
+}
+
+void CTargetCDAudio::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	Play();
+}
+
+// only plays for ONE client, so only use in single play!
+void CTargetCDAudio::Think( void )
+{
+	edict_t *pClient;
+	
+	// manually find the single player. 
+	pClient = g_engfuncs.pfnPEntityOfEntIndex( 1 );
+	
+	// Can't play if the client is not connected!
+	if ( !pClient )
+		return;
+	
+	pev->nextthink = gpGlobals->time + 0.5;
+
+	if ( (pClient->v.origin - pev->origin).Length() <= pev->scale )
+		Play();
+
+}
+
+void CTargetCDAudio::Play( void ) 
+{ 
+	PlayCDTrack( (int)pev->health );
+	UTIL_Remove(this); 
+}
+
+//=====================================
+
+//
+// trigger_hurt - hurts anything that touches it. if the trigger has a targetname, firing it will toggle state
+//
+//int gfToggleState = 0; // used to determine when all radiation trigger hurts have called 'RadiationThink'
+
+void CTriggerHurt :: Spawn( void )
+{
+	InitTrigger();
+	SetTouch ( &CTriggerHurt::HurtTouch );
+
+	if ( !FStringNull ( pev->targetname ) )
+	{
+		SetUse ( &CTriggerHurt::ToggleUse );
+	}
+	else
+	{
+		SetUse ( NULL );
+	}
+
+	if (m_bitsDamageInflict & DMG_RADIATION)
+	{
+		SetThink ( &CTriggerHurt::RadiationThink );
+		pev->nextthink = gpGlobals->time + RANDOM_FLOAT(0.0, 0.5); 
+	}
+
+	if ( FBitSet (pev->spawnflags, SF_TRIGGER_HURT_START_OFF) )// if flagged to Start Turned Off, make trigger nonsolid.
+		pev->solid = SOLID_NOT;
+
+	UTIL_SetOrigin( pev, pev->origin );		// Link into the list
+}
+
+// trigger hurt that causes radiation will do a radius
+// check and set the player's geiger counter level
+// according to distance from center of trigger
+
+void CTriggerHurt :: RadiationThink( void )
+{
+
+	edict_t *pentPlayer;
+	CBasePlayer *pPlayer = NULL;
+	float flRange;
+	entvars_t *pevTarget;
+	Vector vecSpot1;
+	Vector vecSpot2;
+	Vector vecRange;
+	Vector origin;
+	Vector view_ofs;
+
+	// check to see if a player is in pvs
+	// if not, continue	
+
+	// set origin to center of trigger so that this check works
+	origin = pev->origin;
+	view_ofs = pev->view_ofs;
+
+	pev->origin = (pev->absmin + pev->absmax) * 0.5;
+	pev->view_ofs = pev->view_ofs * 0.0;
+
+	pentPlayer = FIND_CLIENT_IN_PVS(edict());
+
+	pev->origin = origin;
+	pev->view_ofs = view_ofs;
+
+	// reset origin
+
+	if (!FNullEnt(pentPlayer))
+	{
+ 
+		pPlayer = GetClassPtr( (CBasePlayer *)VARS(pentPlayer));
+
+		pevTarget = VARS(pentPlayer);
+
+		// get range to player;
+
+		vecSpot1 = (pev->absmin + pev->absmax) * 0.5;
+		vecSpot2 = (pevTarget->absmin + pevTarget->absmax) * 0.5;
+		
+		vecRange = vecSpot1 - vecSpot2;
+		flRange = vecRange.Length();
+
+		// if player's current geiger counter range is larger
+		// than range to this trigger hurt, reset player's
+		// geiger counter range 
+
+		if (pPlayer->m_flgeigerRange >= flRange)
+			pPlayer->m_flgeigerRange = flRange;
+	}
+
+	pev->nextthink = gpGlobals->time + 0.25;
+}
+
+//
+// ToggleUse - If this is the USE function for a trigger, its state will toggle every time it's fired
+//
+void CBaseTrigger :: ToggleUse ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if (pev->solid == SOLID_NOT)
+	{// if the trigger is off, turn it on
+		pev->solid = SOLID_TRIGGER;
+		
+		// Force retouch
+		gpGlobals->force_retouch++;
+	}
+	else
+	{// turn the trigger off
+		pev->solid = SOLID_NOT;
+	}
+	UTIL_SetOrigin( pev, pev->origin );
+}
+
+// When touched, a hurt trigger does DMG points of damage each half-second
+void CBaseTrigger :: HurtTouch ( CBaseEntity *pOther )
+{
+	float fldmg;
+
+	if ( !pOther->pev->takedamage )
+		return;
+
+	if ( (pev->spawnflags & SF_TRIGGER_HURT_CLIENTONLYTOUCH) && !pOther->IsPlayer() )
+	{
+		// this trigger is only allowed to touch clients, and this ain't a client.
+		return;
+	}
+
+	if ( (pev->spawnflags & SF_TRIGGER_HURT_NO_CLIENTS) && pOther->IsPlayer() )
+		return;
+
+	// HACKHACK -- In multiplayer, players touch this based on packet receipt.
+	// So the players who send packets later aren't always hurt.  Keep track of
+	// how much time has passed and whether or not you've touched that player
+	if ( g_pGameRules->IsMultiplayer() )
+	{
+		if ( pev->dmgtime > gpGlobals->time )
+		{
+			if ( gpGlobals->time != pev->pain_finished )
+			{// too early to hurt again, and not same frame with a different entity
+				if ( pOther->IsPlayer() )
+				{
+					int playerMask = 1 << (pOther->entindex() - 1);
+
+					// If I've already touched this player (this time), then bail out
+					if ( pev->impulse & playerMask )
+						return;
+
+					// Mark this player as touched
+					// BUGBUG - There can be only 32 players!
+					pev->impulse |= playerMask;
+				}
+				else
+				{
+					return;
+				}
+			}
+		}
+		else
+		{
+			// New clock, "un-touch" all players
+			pev->impulse = 0;
+			if ( pOther->IsPlayer() )
+			{
+				int playerMask = 1 << (pOther->entindex() - 1);
+
+				// Mark this player as touched
+				// BUGBUG - There can be only 32 players!
+				pev->impulse |= playerMask;
+			}
+		}
+	}
+	else	// Original code -- single player
+	{
+		if ( pev->dmgtime > gpGlobals->time && gpGlobals->time != pev->pain_finished )
+		{// too early to hurt again, and not same frame with a different entity
+			return;
+		}
+	}
+
+
+
+	// If this is time_based damage (poison, radiation), override the pev->dmg with a 
+	// default for the given damage type.  Monsters only take time-based damage
+	// while touching the trigger.  Player continues taking damage for a while after
+	// leaving the trigger
+
+	fldmg = pev->dmg * 0.5;	// 0.5 seconds worth of damage, pev->dmg is damage/second
+
+
+	// JAY: Cut this because it wasn't fully realized.  Damage is simpler now.
+#if 0
+	switch (m_bitsDamageInflict)
+	{
+	default: break;
+	case DMG_POISON:		fldmg = POISON_DAMAGE/4; break;
+	case DMG_NERVEGAS:		fldmg = NERVEGAS_DAMAGE/4; break;
+	case DMG_RADIATION:		fldmg = RADIATION_DAMAGE/4; break;
+	case DMG_PARALYZE:		fldmg = PARALYZE_DAMAGE/4; break; // UNDONE: cut this? should slow movement to 50%
+	case DMG_ACID:			fldmg = ACID_DAMAGE/4; break;
+	case DMG_SLOWBURN:		fldmg = SLOWBURN_DAMAGE/4; break;
+	case DMG_SLOWFREEZE:	fldmg = SLOWFREEZE_DAMAGE/4; break;
+	}
+#endif
+
+	if ( fldmg < 0 )
+		pOther->TakeHealth( -fldmg, m_bitsDamageInflict );
+	else
+		pOther->TakeDamage( pev, pev, fldmg, m_bitsDamageInflict );
+
+	// Store pain time so we can get all of the other entities on this frame
+	pev->pain_finished = gpGlobals->time;
+
+	// Apply damage every half second
+	pev->dmgtime = gpGlobals->time + 0.5;// half second delay until this trigger can hurt toucher again
+
+  
+	
+	if ( pev->target )
+	{
+		// trigger has a target it wants to fire. 
+		if ( pev->spawnflags & SF_TRIGGER_HURT_CLIENTONLYFIRE )
+		{
+			// if the toucher isn't a client, don't fire the target!
+			if ( !pOther->IsPlayer() )
+			{
+				return;
+			}
+		}
+
+		SUB_UseTargets( pOther, USE_TOGGLE, 0 );
+		if ( pev->spawnflags & SF_TRIGGER_HURT_TARGETONCE )
+			pev->target = 0;
+	}
+}
+
+
+/*QUAKED trigger_multiple (.5 .5 .5) ? notouch
+Variable sized repeatable trigger.  Must be targeted at one or more entities.
+If "health" is set, the trigger must be killed to activate each time.
+If "delay" is set, the trigger waits some time after activating before firing.
+"wait" : Seconds between triggerings. (.2 default)
+If notouch is set, the trigger is only fired by other entities, not by touching.
+NOTOUCH has been obsoleted by trigger_relay!
+sounds
+1)      secret
+2)      beep beep
+3)      large switch
+4)
+NEW
+if a trigger has a NETNAME, that NETNAME will become the TARGET of the triggered object.
+*/
+class CTriggerMultiple : public CBaseTrigger
+{
+public:
+	void Spawn( void );
+};
+
+LINK_ENTITY_TO_CLASS( trigger_multiple, CTriggerMultiple );
+
+
+void CTriggerMultiple :: Spawn( void )
+{
+	if (m_flWait == 0)
+		m_flWait = 0.2;
+
+	InitTrigger();
+
+	ASSERTSZ(pev->health == 0, "trigger_multiple with health");
+//	UTIL_SetOrigin(pev, pev->origin);
+//	SET_MODEL( ENT(pev), STRING(pev->model) );
+//	if (pev->health > 0)
+//		{
+//		if (FBitSet(pev->spawnflags, SPAWNFLAG_NOTOUCH))
+//			ALERT(at_error, "trigger_multiple spawn: health and notouch don't make sense");
+//		pev->max_health = pev->health;
+//UNDONE: where to get pfnDie from?
+//		pev->pfnDie = multi_killed;
+//		pev->takedamage = DAMAGE_YES;
+//		pev->solid = SOLID_BBOX;
+//		UTIL_SetOrigin(pev, pev->origin);  // make sure it links into the world
+//		}
+//	else
+		{
+			SetTouch( &CTriggerMultiple::MultiTouch );
+		}
+	}
+
+
+/*QUAKED trigger_once (.5 .5 .5) ? notouch
+Variable sized trigger. Triggers once, then removes itself.  You must set the key "target" to the name of another object in the level that has a matching
+"targetname".  If "health" is set, the trigger must be killed to activate.
+If notouch is set, the trigger is only fired by other entities, not by touching.
+if "killtarget" is set, any objects that have a matching "target" will be removed when the trigger is fired.
+if "angle" is set, the trigger will only fire when someone is facing the direction of the angle.  Use "360" for an angle of 0.
+sounds
+1)      secret
+2)      beep beep
+3)      large switch
+4)
+*/
+class CTriggerOnce : public CTriggerMultiple
+{
+public:
+	void Spawn( void );
+};
+
+LINK_ENTITY_TO_CLASS( trigger_once, CTriggerOnce );
+void CTriggerOnce::Spawn( void )
+{
+	m_flWait = -1;
+	
+	CTriggerMultiple :: Spawn();
+}
+
+
+
+void CBaseTrigger :: MultiTouch( CBaseEntity *pOther )
+{
+	entvars_t	*pevToucher;
+
+	pevToucher = pOther->pev;
+
+	// Only touch clients, monsters, or pushables (depending on flags)
+	if ( ((pevToucher->flags & FL_CLIENT) && !(pev->spawnflags & SF_TRIGGER_NOCLIENTS)) ||
+		 ((pevToucher->flags & FL_MONSTER) && (pev->spawnflags & SF_TRIGGER_ALLOWMONSTERS)) ||
+		 (pev->spawnflags & SF_TRIGGER_PUSHABLES) && FClassnameIs(pevToucher,"func_pushable") )
+	{
+
+#if 0
+		// if the trigger has an angles field, check player's facing direction
+		if (pev->movedir != g_vecZero)
+		{
+			UTIL_MakeVectors( pevToucher->angles );
+			if ( DotProduct( gpGlobals->v_forward, pev->movedir ) < 0 )
+				return;         // not facing the right way
+		}
+#endif
+		
+		ActivateMultiTrigger( pOther );
+	}
+}
+
+
+//
+// the trigger was just touched/killed/used
+// self.enemy should be set to the activator so it can be held through a delay
+// so wait for the delay time before firing
+//
+void CBaseTrigger :: ActivateMultiTrigger( CBaseEntity *pActivator )
+{
+	if (pev->nextthink > gpGlobals->time)
+		return;         // still waiting for reset time
+
+	if (!UTIL_IsMasterTriggered(m_sMaster,pActivator))
+		return;
+
+	if (FClassnameIs(pev, "trigger_secret"))
+	{
+		if ( pev->enemy == NULL || !FClassnameIs(pev->enemy, "player"))
+			return;
+		gpGlobals->found_secrets++;
+	}
+
+	if (!FStringNull(pev->noise))
+		EMIT_SOUND(ENT(pev), CHAN_VOICE, (char*)STRING(pev->noise), 1, ATTN_NORM);
+
+// don't trigger again until reset
+// pev->takedamage = DAMAGE_NO;
+
+	m_hActivator = pActivator;
+	SUB_UseTargets( m_hActivator, USE_TOGGLE, 0 );
+
+	if ( pev->message && pActivator->IsPlayer() )
+	{
+		UTIL_ShowMessage( STRING(pev->message), pActivator );
+//		CLIENT_PRINTF( ENT( pActivator->pev ), print_center, STRING(pev->message) );
+	}
+
+	if (m_flWait > 0)
+	{
+		SetThink( &CBaseTrigger::MultiWaitOver );
+		pev->nextthink = gpGlobals->time + m_flWait;
+	}
+	else
+	{
+		// we can't just remove (self) here, because this is a touch function
+		// called while C code is looping through area links...
+		SetTouch( NULL );
+		pev->nextthink = gpGlobals->time + 0.1;
+		SetThink(  &CBaseTrigger::SUB_Remove );
+	}
+}
+
+
+// the wait time has passed, so set back up for another activation
+void CBaseTrigger :: MultiWaitOver( void )
+{
+//	if (pev->max_health)
+//		{
+//		pev->health		= pev->max_health;
+//		pev->takedamage	= DAMAGE_YES;
+//		pev->solid		= SOLID_BBOX;
+//		}
+	SetThink( NULL );
+}
+
+
+// ========================= COUNTING TRIGGER =====================================
+
+//
+// GLOBALS ASSUMED SET:  g_eoActivator
+//
+void CBaseTrigger::CounterUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	m_cTriggersLeft--;
+	m_hActivator = pActivator;
+
+	if (m_cTriggersLeft < 0)
+		return;
+	
+	BOOL fTellActivator =
+		(m_hActivator != 0) &&
+		(FClassnameIs(m_hActivator->pev, "player") &&
+		!FBitSet(pev->spawnflags, SPAWNFLAG_NOMESSAGE));
+	if (m_cTriggersLeft != 0)
+	{
+		if (fTellActivator)
+		{
+			// UNDONE: I don't think we want these Quakesque messages
+			switch (m_cTriggersLeft)
+			{
+			case 1:		ALERT(at_console, "Only 1 more to go...");		break;
+			case 2:		ALERT(at_console, "Only 2 more to go...");		break;
+			case 3:		ALERT(at_console, "Only 3 more to go...");		break;
+			default:	ALERT(at_console, "There are more to go...");	break;
+			}
+		}
+		return;
+	}
+
+	// !!!UNDONE: I don't think we want these Quakesque messages
+	if (fTellActivator)
+		ALERT(at_console, "Sequence completed!");
+	
+	ActivateMultiTrigger( m_hActivator );
+}
+
+
+/*QUAKED trigger_counter (.5 .5 .5) ? nomessage
+Acts as an intermediary for an action that takes multiple inputs.
+If nomessage is not set, it will print "1 more.. " etc when triggered and
+"sequence complete" when finished.  After the counter has been triggered "cTriggersLeft"
+times (default 2), it will fire all of it's targets and remove itself.
+*/
+class CTriggerCounter : public CBaseTrigger
+{
+public:
+	void Spawn( void );
+};
+LINK_ENTITY_TO_CLASS( trigger_counter, CTriggerCounter );
+
+void CTriggerCounter :: Spawn( void )
+{
+	// By making the flWait be -1, this counter-trigger will disappear after it's activated
+	// (but of course it needs cTriggersLeft "uses" before that happens).
+	m_flWait = -1;
+
+	if (m_cTriggersLeft == 0)
+		m_cTriggersLeft = 2;
+	SetUse( &CTriggerCounter::CounterUse );
+}
+
+// ====================== TRIGGER_CHANGELEVEL ================================
+
+class CTriggerVolume : public CPointEntity	// Derive from point entity so this doesn't move across levels
+{
+public:
+	void		Spawn( void );
+};
+
+LINK_ENTITY_TO_CLASS( trigger_transition, CTriggerVolume );
+
+// Define space that travels across a level transition
+void CTriggerVolume :: Spawn( void )
+{
+	pev->solid = SOLID_NOT;
+	pev->movetype = MOVETYPE_NONE;
+	SET_MODEL(ENT(pev), STRING(pev->model));    // set size and link into world
+	pev->model = NULL;
+	pev->modelindex = 0;
+}
+
+
+// Fires a target after level transition and then dies
+class CFireAndDie : public CBaseDelay
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void Think( void );
+	int ObjectCaps( void ) { return CBaseDelay::ObjectCaps() | FCAP_FORCE_TRANSITION; }	// Always go across transitions
+};
+LINK_ENTITY_TO_CLASS( fireanddie, CFireAndDie );
+
+void CFireAndDie::Spawn( void )
+{
+	pev->classname = MAKE_STRING("fireanddie");
+	// Don't call Precache() - it should be called on restore
+}
+
+
+void CFireAndDie::Precache( void )
+{
+	// This gets called on restore
+	pev->nextthink = gpGlobals->time + m_flDelay;
+}
+
+
+void CFireAndDie::Think( void )
+{
+	SUB_UseTargets( this, USE_TOGGLE, 0 );
+	UTIL_Remove( this );
+}
+
+
+#define SF_CHANGELEVEL_USEONLY		0x0002
+class CChangeLevel : public CBaseTrigger
+{
+public:
+	void Spawn( void );
+	void KeyValue( KeyValueData *pkvd );
+	void EXPORT UseChangeLevel ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void EXPORT TriggerChangeLevel( void );
+	void EXPORT ExecuteChangeLevel( void );
+	void EXPORT TouchChangeLevel( CBaseEntity *pOther );
+	void ChangeLevelNow( CBaseEntity *pActivator );
+
+	static edict_t *FindLandmark( const char *pLandmarkName );
+	static int ChangeList( LEVELLIST *pLevelList, int maxList );
+	static int AddTransitionToList( LEVELLIST *pLevelList, int listCount, const char *pMapName, const char *pLandmarkName, edict_t *pentLandmark );
+	static int InTransitionVolume( CBaseEntity *pEntity, char *pVolumeName );
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	char m_szMapName[cchMapNameMost];		// trigger_changelevel only:  next map
+	char m_szLandmarkName[cchMapNameMost];		// trigger_changelevel only:  landmark on next map
+	int		m_changeTarget;
+	float	m_changeTargetDelay;
+};
+LINK_ENTITY_TO_CLASS( trigger_changelevel, CChangeLevel );
+
+// Global Savedata for changelevel trigger
+TYPEDESCRIPTION	CChangeLevel::m_SaveData[] = 
+{
+	DEFINE_ARRAY( CChangeLevel, m_szMapName, FIELD_CHARACTER, cchMapNameMost ),
+	DEFINE_ARRAY( CChangeLevel, m_szLandmarkName, FIELD_CHARACTER, cchMapNameMost ),
+	DEFINE_FIELD( CChangeLevel, m_changeTarget, FIELD_STRING ),
+	DEFINE_FIELD( CChangeLevel, m_changeTargetDelay, FIELD_FLOAT ),
+};
+
+IMPLEMENT_SAVERESTORE(CChangeLevel,CBaseTrigger);
+
+//
+// Cache user-entity-field values until spawn is called.
+//
+
+void CChangeLevel :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "map"))
+	{
+		if (strlen(pkvd->szValue) >= cchMapNameMost)
+			ALERT( at_error, "Map name '%s' too long (32 chars)\n", pkvd->szValue );
+		strcpy(m_szMapName, pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "landmark"))
+	{
+		if (strlen(pkvd->szValue) >= cchMapNameMost)
+			ALERT( at_error, "Landmark name '%s' too long (32 chars)\n", pkvd->szValue );
+		strcpy(m_szLandmarkName, pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "changetarget"))
+	{
+		m_changeTarget = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "changedelay"))
+	{
+		m_changeTargetDelay = atof( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseTrigger::KeyValue( pkvd );
+}
+
+
+/*QUAKED trigger_changelevel (0.5 0.5 0.5) ? NO_INTERMISSION
+When the player touches this, he gets sent to the map listed in the "map" variable.  Unless the NO_INTERMISSION flag is set, the view will go to the info_intermission spot and display stats.
+*/
+
+void CChangeLevel :: Spawn( void )
+{
+	if ( FStrEq( m_szMapName, "" ) )
+		ALERT( at_console, "a trigger_changelevel doesn't have a map" );
+
+	if ( FStrEq( m_szLandmarkName, "" ) )
+		ALERT( at_console, "trigger_changelevel to %s doesn't have a landmark", m_szMapName );
+
+	if (!FStringNull ( pev->targetname ) )
+	{
+		SetUse ( &CChangeLevel::UseChangeLevel );
+	}
+	InitTrigger();
+	if ( !(pev->spawnflags & SF_CHANGELEVEL_USEONLY) )
+		SetTouch( &CChangeLevel::TouchChangeLevel );
+//	ALERT( at_console, "TRANSITION: %s (%s)\n", m_szMapName, m_szLandmarkName );
+}
+
+
+void CChangeLevel :: ExecuteChangeLevel( void )
+{
+	MESSAGE_BEGIN( MSG_ALL, SVC_CDTRACK );
+		WRITE_BYTE( 3 );
+		WRITE_BYTE( 3 );
+	MESSAGE_END();
+
+	MESSAGE_BEGIN(MSG_ALL, SVC_INTERMISSION);
+	MESSAGE_END();
+}
+
+
+FILE_GLOBAL char st_szNextMap[cchMapNameMost];
+FILE_GLOBAL char st_szNextSpot[cchMapNameMost];
+
+edict_t *CChangeLevel :: FindLandmark( const char *pLandmarkName )
+{
+	edict_t	*pentLandmark;
+
+	pentLandmark = FIND_ENTITY_BY_STRING( NULL, "targetname", pLandmarkName );
+	while ( !FNullEnt( pentLandmark ) )
+	{
+		// Found the landmark
+		if ( FClassnameIs( pentLandmark, "info_landmark" ) )
+			return pentLandmark;
+		else
+			pentLandmark = FIND_ENTITY_BY_STRING( pentLandmark, "targetname", pLandmarkName );
+	}
+	ALERT( at_error, "Can't find landmark %s\n", pLandmarkName );
+	return NULL;
+}
+
+
+//=========================================================
+// CChangeLevel :: Use - allows level transitions to be 
+// triggered by buttons, etc.
+//
+//=========================================================
+void CChangeLevel :: UseChangeLevel ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	ChangeLevelNow( pActivator );
+}
+
+void CChangeLevel :: ChangeLevelNow( CBaseEntity *pActivator )
+{
+	edict_t	*pentLandmark;
+	LEVELLIST	levels[16];
+
+	ASSERT(!FStrEq(m_szMapName, ""));
+
+	// Don't work in deathmatch
+	if ( g_pGameRules->IsDeathmatch() )
+		return;
+
+	// Some people are firing these multiple times in a frame, disable
+	if ( gpGlobals->time == pev->dmgtime )
+		return;
+
+	pev->dmgtime = gpGlobals->time;
+
+
+	CBaseEntity *pPlayer = CBaseEntity::Instance( g_engfuncs.pfnPEntityOfEntIndex( 1 ) );
+	if ( !InTransitionVolume( pPlayer, m_szLandmarkName ) )
+	{
+		ALERT( at_aiconsole, "Player isn't in the transition volume %s, aborting\n", m_szLandmarkName );
+		return;
+	}
+
+	// Create an entity to fire the changetarget
+	if ( m_changeTarget )
+	{
+		CFireAndDie *pFireAndDie = GetClassPtr( (CFireAndDie *)NULL );
+		if ( pFireAndDie )
+		{
+			// Set target and delay
+			pFireAndDie->pev->target = m_changeTarget;
+			pFireAndDie->m_flDelay = m_changeTargetDelay;
+			pFireAndDie->pev->origin = pPlayer->pev->origin;
+			// Call spawn
+			DispatchSpawn( pFireAndDie->edict() );
+		}
+	}
+	// This object will get removed in the call to CHANGE_LEVEL, copy the params into "safe" memory
+	strcpy(st_szNextMap, m_szMapName);
+
+	m_hActivator = pActivator;
+	SUB_UseTargets( pActivator, USE_TOGGLE, 0 );
+	st_szNextSpot[0] = 0;	// Init landmark to NULL
+
+	// look for a landmark entity		
+	pentLandmark = FindLandmark( m_szLandmarkName );
+	if ( !FNullEnt( pentLandmark ) )
+	{
+		strcpy(st_szNextSpot, m_szLandmarkName);
+		gpGlobals->vecLandmarkOffset = VARS(pentLandmark)->origin;
+	}
+//	ALERT( at_console, "Level touches %d levels\n", ChangeList( levels, 16 ) );
+	ALERT( at_console, "CHANGE LEVEL: %s %s\n", st_szNextMap, st_szNextSpot );
+	CHANGE_LEVEL( st_szNextMap, st_szNextSpot );
+}
+
+//
+// GLOBALS ASSUMED SET:  st_szNextMap
+//
+void CChangeLevel :: TouchChangeLevel( CBaseEntity *pOther )
+{
+	if (!FClassnameIs(pOther->pev, "player"))
+		return;
+
+	ChangeLevelNow( pOther );
+}
+
+
+// Add a transition to the list, but ignore duplicates 
+// (a designer may have placed multiple trigger_changelevels with the same landmark)
+int CChangeLevel::AddTransitionToList( LEVELLIST *pLevelList, int listCount, const char *pMapName, const char *pLandmarkName, edict_t *pentLandmark )
+{
+	int i;
+
+	if ( !pLevelList || !pMapName || !pLandmarkName || !pentLandmark )
+		return 0;
+
+	for ( i = 0; i < listCount; i++ )
+	{
+		if ( pLevelList[i].pentLandmark == pentLandmark && strcmp( pLevelList[i].mapName, pMapName ) == 0 )
+			return 0;
+	}
+	strcpy( pLevelList[listCount].mapName, pMapName );
+	strcpy( pLevelList[listCount].landmarkName, pLandmarkName );
+	pLevelList[listCount].pentLandmark = pentLandmark;
+	pLevelList[listCount].vecLandmarkOrigin = VARS(pentLandmark)->origin;
+
+	return 1;
+}
+
+int BuildChangeList( LEVELLIST *pLevelList, int maxList )
+{
+	return CChangeLevel::ChangeList( pLevelList, maxList );
+}
+
+
+int CChangeLevel::InTransitionVolume( CBaseEntity *pEntity, char *pVolumeName )
+{
+	edict_t	*pentVolume;
+
+
+	if ( pEntity->ObjectCaps() & FCAP_FORCE_TRANSITION )
+		return 1;
+
+	// If you're following another entity, follow it through the transition (weapons follow the player)
+	if ( pEntity->pev->movetype == MOVETYPE_FOLLOW )
+	{
+		if ( pEntity->pev->aiment != NULL )
+			pEntity = CBaseEntity::Instance( pEntity->pev->aiment );
+	}
+
+	int inVolume = 1;	// Unless we find a trigger_transition, everything is in the volume
+
+	pentVolume = FIND_ENTITY_BY_TARGETNAME( NULL, pVolumeName );
+	while ( !FNullEnt( pentVolume ) )
+	{
+		CBaseEntity *pVolume = CBaseEntity::Instance( pentVolume );
+		
+		if ( pVolume && FClassnameIs( pVolume->pev, "trigger_transition" ) )
+		{
+			if ( pVolume->Intersects( pEntity ) )	// It touches one, it's in the volume
+				return 1;
+			else
+				inVolume = 0;	// Found a trigger_transition, but I don't intersect it -- if I don't find another, don't go!
+		}
+		pentVolume = FIND_ENTITY_BY_TARGETNAME( pentVolume, pVolumeName );
+	}
+
+	return inVolume;
+}
+
+
+// We can only ever move 512 entities across a transition
+#define MAX_ENTITY 512
+
+// This has grown into a complicated beast
+// Can we make this more elegant?
+// This builds the list of all transitions on this level and which entities are in their PVS's and can / should
+// be moved across.
+int CChangeLevel::ChangeList( LEVELLIST *pLevelList, int maxList )
+{
+	edict_t	*pentChangelevel, *pentLandmark;
+	int			i, count;
+
+	count = 0;
+
+	// Find all of the possible level changes on this BSP
+	pentChangelevel = FIND_ENTITY_BY_STRING( NULL, "classname", "trigger_changelevel" );
+	if ( FNullEnt( pentChangelevel ) )
+		return 0;
+	while ( !FNullEnt( pentChangelevel ) )
+	{
+		CChangeLevel *pTrigger;
+		
+		pTrigger = GetClassPtr((CChangeLevel *)VARS(pentChangelevel));
+		if ( pTrigger )
+		{
+			// Find the corresponding landmark
+			pentLandmark = FindLandmark( pTrigger->m_szLandmarkName );
+			if ( pentLandmark )
+			{
+				// Build a list of unique transitions
+				if ( AddTransitionToList( pLevelList, count, pTrigger->m_szMapName, pTrigger->m_szLandmarkName, pentLandmark ) )
+				{
+					count++;
+					if ( count >= maxList )		// FULL!!
+						break;
+				}
+			}
+		}
+		pentChangelevel = FIND_ENTITY_BY_STRING( pentChangelevel, "classname", "trigger_changelevel" );
+	}
+
+	if ( gpGlobals->pSaveData && ((SAVERESTOREDATA *)gpGlobals->pSaveData)->pTable )
+	{
+		CSave saveHelper( (SAVERESTOREDATA *)gpGlobals->pSaveData );
+
+		for ( i = 0; i < count; i++ )
+		{
+			int j, entityCount = 0;
+			CBaseEntity *pEntList[ MAX_ENTITY ];
+			int			 entityFlags[ MAX_ENTITY ];
+
+			// Follow the linked list of entities in the PVS of the transition landmark
+			edict_t *pent = UTIL_EntitiesInPVS( pLevelList[i].pentLandmark );
+
+			// Build a list of valid entities in this linked list (we're going to use pent->v.chain again)
+			while ( !FNullEnt( pent ) )
+			{
+				CBaseEntity *pEntity = CBaseEntity::Instance(pent);
+				if ( pEntity )
+				{
+//					ALERT( at_console, "Trying %s\n", STRING(pEntity->pev->classname) );
+					int caps = pEntity->ObjectCaps();
+					if ( !(caps & FCAP_DONT_SAVE) )
+					{
+						int flags = 0;
+
+						// If this entity can be moved or is global, mark it
+						if ( caps & FCAP_ACROSS_TRANSITION )
+							flags |= FENTTABLE_MOVEABLE;
+						if ( pEntity->pev->globalname && !pEntity->IsDormant() )
+							flags |= FENTTABLE_GLOBAL;
+						if ( flags )
+						{
+							pEntList[ entityCount ] = pEntity;
+							entityFlags[ entityCount ] = flags;
+							entityCount++;
+							if ( entityCount > MAX_ENTITY )
+								ALERT( at_error, "Too many entities across a transition!" );
+						}
+//						else
+//							ALERT( at_console, "Failed %s\n", STRING(pEntity->pev->classname) );
+					}
+//					else
+//						ALERT( at_console, "DON'T SAVE %s\n", STRING(pEntity->pev->classname) );
+				}
+				pent = pent->v.chain;
+			}
+
+			for ( j = 0; j < entityCount; j++ )
+			{
+				// Check to make sure the entity isn't screened out by a trigger_transition
+				if ( entityFlags[j] && InTransitionVolume( pEntList[j], pLevelList[i].landmarkName ) )
+				{
+					// Mark entity table with 1<<i
+					int index = saveHelper.EntityIndex( pEntList[j] );
+					// Flag it with the level number
+					saveHelper.EntityFlagsSet( index, entityFlags[j] | (1<<i) );
+				}
+//				else
+//					ALERT( at_console, "Screened out %s\n", STRING(pEntList[j]->pev->classname) );
+
+			}
+		}
+	}
+
+	return count;
+}
+
+/*
+go to the next level for deathmatch
+only called if a time or frag limit has expired
+*/
+void NextLevel( void )
+{
+	edict_t* pent;
+	CChangeLevel *pChange;
+	
+	// find a trigger_changelevel
+	pent = FIND_ENTITY_BY_CLASSNAME(NULL, "trigger_changelevel");
+	
+	// go back to start if no trigger_changelevel
+	if (FNullEnt(pent))
+	{
+		gpGlobals->mapname = ALLOC_STRING("start");
+		pChange = GetClassPtr( (CChangeLevel *)NULL );
+		strcpy(pChange->m_szMapName, "start");
+	}
+	else
+		pChange = GetClassPtr( (CChangeLevel *)VARS(pent));
+	
+	strcpy(st_szNextMap, pChange->m_szMapName);
+	g_fGameOver = TRUE;
+	
+	if (pChange->pev->nextthink < gpGlobals->time)
+	{
+		pChange->SetThink( &CChangeLevel::ExecuteChangeLevel );
+		pChange->pev->nextthink = gpGlobals->time + 0.1;
+	}
+}
+
+LINK_ENTITY_TO_CLASS( func_ladder, CLadder );
+
+
+void CLadder :: KeyValue( KeyValueData *pkvd )
+{
+	CBaseTrigger::KeyValue( pkvd );
+}
+
+
+//=========================================================
+// func_ladder - makes an area vertically negotiable
+//=========================================================
+void CLadder :: Precache( void )
+{
+	// Do all of this in here because we need to 'convert' old saved games
+	pev->solid = SOLID_NOT;
+	pev->skin = CONTENTS_LADDER;
+	if ( CVAR_GET_FLOAT("showtriggers") == 0 )
+	{
+		pev->rendermode = kRenderTransTexture;
+		pev->renderamt = 0;
+	}
+	pev->effects &= ~EF_NODRAW;
+}
+
+
+void CLadder :: Spawn( void )
+{
+	Precache();
+
+	SET_MODEL(ENT(pev), STRING(pev->model));    // set size and link into world
+	pev->movetype = MOVETYPE_PUSH;
+}
+
+
+// ========================== A TRIGGER THAT PUSHES YOU ===============================
+
+class CTriggerPush : public CBaseTrigger
+{
+public:
+	void Spawn( void );
+	void KeyValue( KeyValueData *pkvd );
+	void Touch( CBaseEntity *pOther );
+};
+LINK_ENTITY_TO_CLASS( trigger_push, CTriggerPush );
+
+
+void CTriggerPush :: KeyValue( KeyValueData *pkvd )
+{
+	CBaseTrigger::KeyValue( pkvd );
+}
+
+
+/*QUAKED trigger_push (.5 .5 .5) ? TRIG_PUSH_ONCE
+Pushes the player
+*/
+
+void CTriggerPush :: Spawn( )
+{
+	if ( pev->angles == g_vecZero )
+		pev->angles.y = 360;
+	InitTrigger();
+
+	if (pev->speed == 0)
+		pev->speed = 100;
+
+	if ( FBitSet (pev->spawnflags, SF_TRIGGER_PUSH_START_OFF) )// if flagged to Start Turned Off, make trigger nonsolid.
+		pev->solid = SOLID_NOT;
+
+	SetUse(&CTriggerPush::ToggleUse );
+
+	UTIL_SetOrigin( pev, pev->origin );		// Link into the list
+}
+
+
+void CTriggerPush :: Touch( CBaseEntity *pOther )
+{
+	entvars_t* pevToucher = pOther->pev;
+
+	// UNDONE: Is there a better way than health to detect things that have physics? (clients/monsters)
+	switch( pevToucher->movetype )
+	{
+	case MOVETYPE_NONE:
+	case MOVETYPE_PUSH:
+	case MOVETYPE_NOCLIP:
+	case MOVETYPE_FOLLOW:
+		return;
+	}
+
+	if ( pevToucher->solid != SOLID_NOT && pevToucher->solid != SOLID_BSP )
+	{
+		// Instant trigger, just transfer velocity and remove
+		if (FBitSet(pev->spawnflags, SF_TRIG_PUSH_ONCE))
+		{
+			pevToucher->velocity = pevToucher->velocity + (pev->speed * pev->movedir);
+			if ( pevToucher->velocity.z > 0 )
+				pevToucher->flags &= ~FL_ONGROUND;
+			UTIL_Remove( this );
+		}
+		else
+		{	// Push field, transfer to base velocity
+			Vector vecPush = (pev->speed * pev->movedir);
+			if ( pevToucher->flags & FL_BASEVELOCITY )
+				vecPush = vecPush +  pevToucher->basevelocity;
+
+			pevToucher->basevelocity = vecPush;
+
+			pevToucher->flags |= FL_BASEVELOCITY;
+//			ALERT( at_console, "Vel %f, base %f\n", pevToucher->velocity.z, pevToucher->basevelocity.z );
+		}
+	}
+}
+
+
+//======================================
+// teleport trigger
+//
+//
+
+void CBaseTrigger :: TeleportTouch( CBaseEntity *pOther )
+{
+	entvars_t* pevToucher = pOther->pev;
+	edict_t	*pentTarget = NULL;
+
+	// Only teleport monsters or clients
+	if ( !FBitSet( pevToucher->flags, FL_CLIENT|FL_MONSTER ) )
+		return;
+    
+	if (!UTIL_IsMasterTriggered(m_sMaster, pOther))
+		return;
+ 	
+	if ( !( pev->spawnflags & SF_TRIGGER_ALLOWMONSTERS ) )
+	{// no monsters allowed!
+		if ( FBitSet( pevToucher->flags, FL_MONSTER ) )
+		{
+			return;
+		}
+	}
+
+	if ( ( pev->spawnflags & SF_TRIGGER_NOCLIENTS ) )
+	{// no clients allowed
+		if ( pOther->IsPlayer() )
+		{
+			return;
+		}
+	}
+	
+	pentTarget = FIND_ENTITY_BY_TARGETNAME( pentTarget, STRING(pev->target) );
+	if (FNullEnt(pentTarget))
+	   return;	
+	
+	Vector tmp = VARS( pentTarget )->origin;
+
+	if ( pOther->IsPlayer() )
+	{
+		tmp.z -= pOther->pev->mins.z;// make origin adjustments in case the teleportee is a player. (origin in center, not at feet)
+	}
+
+	tmp.z++;
+
+	pevToucher->flags &= ~FL_ONGROUND;
+	
+	UTIL_SetOrigin( pevToucher, tmp );
+
+	pevToucher->angles = pentTarget->v.angles;
+
+	if ( pOther->IsPlayer() )
+	{
+		pevToucher->v_angle = pentTarget->v.angles;
+	}
+
+	pevToucher->fixangle = TRUE;
+	pevToucher->velocity = pevToucher->basevelocity = g_vecZero;
+}
+
+
+class CTriggerTeleport : public CBaseTrigger
+{
+public:
+	void Spawn( void );
+};
+LINK_ENTITY_TO_CLASS( trigger_teleport, CTriggerTeleport );
+
+void CTriggerTeleport :: Spawn( void )
+{
+	InitTrigger();
+
+	SetTouch( &CTriggerTeleport::TeleportTouch );
+}
+
+
+LINK_ENTITY_TO_CLASS( info_teleport_destination, CPointEntity );
+
+
+
+class CTriggerSave : public CBaseTrigger
+{
+public:
+	void Spawn( void );
+	void EXPORT SaveTouch( CBaseEntity *pOther );
+};
+LINK_ENTITY_TO_CLASS( trigger_autosave, CTriggerSave );
+
+void CTriggerSave::Spawn( void )
+{
+	if ( g_pGameRules->IsDeathmatch() )
+	{
+		REMOVE_ENTITY( ENT(pev) );
+		return;
+	}
+
+	InitTrigger();
+	SetTouch( &CTriggerSave::SaveTouch );
+}
+
+void CTriggerSave::SaveTouch( CBaseEntity *pOther )
+{
+	if ( !UTIL_IsMasterTriggered( m_sMaster, pOther ) )
+		return;
+
+	// Only save on clients
+	if ( !pOther->IsPlayer() )
+		return;
+    
+	SetTouch( NULL );
+	UTIL_Remove( this );
+	SERVER_COMMAND( "autosave\n" );
+}
+
+#define SF_ENDSECTION_USEONLY		0x0001
+
+class CTriggerEndSection : public CBaseTrigger
+{
+public:
+	void Spawn( void );
+	void EXPORT EndSectionTouch( CBaseEntity *pOther );
+	void KeyValue( KeyValueData *pkvd );
+	void EXPORT EndSectionUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+};
+LINK_ENTITY_TO_CLASS( trigger_endsection, CTriggerEndSection );
+
+
+void CTriggerEndSection::EndSectionUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	// Only save on clients
+	if ( pActivator && !pActivator->IsNetClient() )
+		return;
+    
+	SetUse( NULL );
+
+	if ( pev->message )
+	{
+		g_engfuncs.pfnEndSection(STRING(pev->message));
+	}
+	UTIL_Remove( this );
+}
+
+void CTriggerEndSection::Spawn( void )
+{
+	if ( g_pGameRules->IsDeathmatch() )
+	{
+		REMOVE_ENTITY( ENT(pev) );
+		return;
+	}
+
+	InitTrigger();
+
+	SetUse ( &CTriggerEndSection::EndSectionUse );
+	// If it is a "use only" trigger, then don't set the touch function.
+	if ( ! (pev->spawnflags & SF_ENDSECTION_USEONLY) )
+		SetTouch( &CTriggerEndSection::EndSectionTouch );
+}
+
+void CTriggerEndSection::EndSectionTouch( CBaseEntity *pOther )
+{
+	// Only save on clients
+	if ( !pOther->IsNetClient() )
+		return;
+    
+	SetTouch( NULL );
+
+	if (pev->message)
+	{
+		g_engfuncs.pfnEndSection(STRING(pev->message));
+	}
+	UTIL_Remove( this );
+}
+
+void CTriggerEndSection :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "section"))
+	{
+//		m_iszSectionName = ALLOC_STRING( pkvd->szValue );
+		// Store this in message so we don't have to write save/restore for this ent
+		pev->message = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseTrigger::KeyValue( pkvd );
+}
+
+
+class CTriggerGravity : public CBaseTrigger
+{
+public:
+	void Spawn( void );
+	void EXPORT GravityTouch( CBaseEntity *pOther );
+};
+LINK_ENTITY_TO_CLASS( trigger_gravity, CTriggerGravity );
+
+void CTriggerGravity::Spawn( void )
+{
+	InitTrigger();
+	SetTouch( &CTriggerGravity::GravityTouch );
+}
+
+void CTriggerGravity::GravityTouch( CBaseEntity *pOther )
+{
+	// Only save on clients
+	if ( !pOther->IsPlayer() )
+		return;
+
+	pOther->pev->gravity = pev->gravity;
+}
+
+
+
+
+
+
+
+// this is a really bad idea.
+class CTriggerChangeTarget : public CBaseDelay
+{
+public:
+	void KeyValue( KeyValueData *pkvd );
+	void Spawn( void );
+	void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+	int ObjectCaps( void ) { return CBaseDelay::ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+
+	static	TYPEDESCRIPTION m_SaveData[];
+
+private:
+	int		m_iszNewTarget;
+};
+LINK_ENTITY_TO_CLASS( trigger_changetarget, CTriggerChangeTarget );
+
+TYPEDESCRIPTION	CTriggerChangeTarget::m_SaveData[] = 
+{
+	DEFINE_FIELD( CTriggerChangeTarget, m_iszNewTarget, FIELD_STRING ),
+};
+
+IMPLEMENT_SAVERESTORE(CTriggerChangeTarget,CBaseDelay);
+
+void CTriggerChangeTarget::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "m_iszNewTarget"))
+	{
+		m_iszNewTarget = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseDelay::KeyValue( pkvd );
+}
+
+void CTriggerChangeTarget::Spawn( void )
+{
+}
+
+
+void CTriggerChangeTarget::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	CBaseEntity *pTarget = UTIL_FindEntityByString( NULL, "targetname", STRING( pev->target ) );
+
+	if (pTarget)
+	{
+		pTarget->pev->target = m_iszNewTarget;
+		CBaseMonster *pMonster = pTarget->MyMonsterPointer( );
+		if (pMonster)
+		{
+			pMonster->m_pGoalEnt = NULL;
+		}
+	}
+}
+
+
+
+
+#define SF_CAMERA_PLAYER_POSITION	1
+#define SF_CAMERA_PLAYER_TARGET		2
+#define SF_CAMERA_PLAYER_TAKECONTROL 4
+
+class CTriggerCamera : public CBaseDelay
+{
+public:
+	void Spawn( void );
+	void KeyValue( KeyValueData *pkvd );
+	void Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void EXPORT FollowTarget( void );
+	void Move(void);
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	virtual int	ObjectCaps( void ) { return CBaseEntity :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	EHANDLE m_hPlayer;
+	EHANDLE m_hTarget;
+	CBaseEntity *m_pentPath;
+	int	  m_sPath;
+	float m_flWait;
+	float m_flReturnTime;
+	float m_flStopTime;
+	float m_moveDistance;
+	float m_targetSpeed;
+	float m_initialSpeed;
+	float m_acceleration;
+	float m_deceleration;
+	int	  m_state;
+	
+};
+LINK_ENTITY_TO_CLASS( trigger_camera, CTriggerCamera );
+
+// Global Savedata for changelevel friction modifier
+TYPEDESCRIPTION	CTriggerCamera::m_SaveData[] = 
+{
+	DEFINE_FIELD( CTriggerCamera, m_hPlayer, FIELD_EHANDLE ),
+	DEFINE_FIELD( CTriggerCamera, m_hTarget, FIELD_EHANDLE ),
+	DEFINE_FIELD( CTriggerCamera, m_pentPath, FIELD_CLASSPTR ),
+	DEFINE_FIELD( CTriggerCamera, m_sPath, FIELD_STRING ),
+	DEFINE_FIELD( CTriggerCamera, m_flWait, FIELD_FLOAT ),
+	DEFINE_FIELD( CTriggerCamera, m_flReturnTime, FIELD_TIME ),
+	DEFINE_FIELD( CTriggerCamera, m_flStopTime, FIELD_TIME ),
+	DEFINE_FIELD( CTriggerCamera, m_moveDistance, FIELD_FLOAT ),
+	DEFINE_FIELD( CTriggerCamera, m_targetSpeed, FIELD_FLOAT ),
+	DEFINE_FIELD( CTriggerCamera, m_initialSpeed, FIELD_FLOAT ),
+	DEFINE_FIELD( CTriggerCamera, m_acceleration, FIELD_FLOAT ),
+	DEFINE_FIELD( CTriggerCamera, m_deceleration, FIELD_FLOAT ),
+	DEFINE_FIELD( CTriggerCamera, m_state, FIELD_INTEGER ),
+};
+
+IMPLEMENT_SAVERESTORE(CTriggerCamera,CBaseDelay);
+
+void CTriggerCamera::Spawn( void )
+{
+	pev->movetype = MOVETYPE_NOCLIP;
+	pev->solid = SOLID_NOT;							// Remove model & collisions
+	pev->renderamt = 0;								// The engine won't draw this model if this is set to 0 and blending is on
+	pev->rendermode = kRenderTransTexture;
+
+	m_initialSpeed = pev->speed;
+	if ( m_acceleration == 0 )
+		m_acceleration = 500;
+	if ( m_deceleration == 0 )
+		m_deceleration = 500;
+}
+
+
+void CTriggerCamera :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "wait"))
+	{
+		m_flWait = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "moveto"))
+	{
+		m_sPath = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "acceleration"))
+	{
+		m_acceleration = atof( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "deceleration"))
+	{
+		m_deceleration = atof( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseDelay::KeyValue( pkvd );
+}
+
+
+
+void CTriggerCamera::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( !ShouldToggle( useType, m_state ) )
+		return;
+
+	// Toggle state
+	m_state = !m_state;
+	if (m_state == 0)
+	{
+		m_flReturnTime = gpGlobals->time;
+		return;
+	}
+	if ( !pActivator || !pActivator->IsPlayer() )
+	{
+		pActivator = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex( 1 ));
+	}
+		
+	m_hPlayer = pActivator;
+
+	m_flReturnTime = gpGlobals->time + m_flWait;
+	pev->speed = m_initialSpeed;
+	m_targetSpeed = m_initialSpeed;
+
+	if (FBitSet (pev->spawnflags, SF_CAMERA_PLAYER_TARGET ) )
+	{
+		m_hTarget = m_hPlayer;
+	}
+	else
+	{
+		m_hTarget = GetNextTarget();
+	}
+
+	// Nothing to look at!
+	if ( m_hTarget == NULL )
+	{
+		return;
+	}
+
+
+	if (FBitSet (pev->spawnflags, SF_CAMERA_PLAYER_TAKECONTROL ) )
+	{
+		((CBasePlayer *)pActivator)->EnableControl(FALSE);
+	}
+
+	if ( m_sPath )
+	{
+		m_pentPath = Instance( FIND_ENTITY_BY_TARGETNAME ( NULL, STRING(m_sPath)) );
+	}
+	else
+	{
+		m_pentPath = NULL;
+	}
+
+	m_flStopTime = gpGlobals->time;
+	if ( m_pentPath )
+	{
+		if ( m_pentPath->pev->speed != 0 )
+			m_targetSpeed = m_pentPath->pev->speed;
+		
+		m_flStopTime += m_pentPath->GetDelay();
+	}
+
+	// copy over player information
+	if (FBitSet (pev->spawnflags, SF_CAMERA_PLAYER_POSITION ) )
+	{
+		UTIL_SetOrigin( pev, pActivator->pev->origin + pActivator->pev->view_ofs );
+		pev->angles.x = -pActivator->pev->angles.x;
+		pev->angles.y = pActivator->pev->angles.y;
+		pev->angles.z = 0;
+		pev->velocity = pActivator->pev->velocity;
+	}
+	else
+	{
+		pev->velocity = Vector( 0, 0, 0 );
+	}
+
+	SET_VIEW( pActivator->edict(), edict() );
+
+	SET_MODEL(ENT(pev), STRING(pActivator->pev->model) );
+
+	// follow the player down
+	SetThink( &CTriggerCamera::FollowTarget );
+	pev->nextthink = gpGlobals->time;
+
+	m_moveDistance = 0;
+	Move();
+}
+
+
+void CTriggerCamera::FollowTarget( )
+{
+	if (m_hPlayer == NULL)
+		return;
+
+	if (m_hTarget == NULL || m_flReturnTime < gpGlobals->time)
+	{
+		if (m_hPlayer->IsAlive( ))
+		{
+			SET_VIEW( m_hPlayer->edict(), m_hPlayer->edict() );
+			((CBasePlayer *)((CBaseEntity *)m_hPlayer))->EnableControl(TRUE);
+		}
+		SUB_UseTargets( this, USE_TOGGLE, 0 );
+		pev->avelocity = Vector( 0, 0, 0 );
+		m_state = 0;
+		return;
+	}
+
+	Vector vecGoal = UTIL_VecToAngles( m_hTarget->pev->origin - pev->origin );
+	vecGoal.x = -vecGoal.x;
+
+	if (pev->angles.y > 360)
+		pev->angles.y -= 360;
+
+	if (pev->angles.y < 0)
+		pev->angles.y += 360;
+
+	float dx = vecGoal.x - pev->angles.x;
+	float dy = vecGoal.y - pev->angles.y;
+
+	if (dx < -180) 
+		dx += 360;
+	if (dx > 180) 
+		dx = dx - 360;
+	
+	if (dy < -180) 
+		dy += 360;
+	if (dy > 180) 
+		dy = dy - 360;
+
+	pev->avelocity.x = dx * 40 * gpGlobals->frametime;
+	pev->avelocity.y = dy * 40 * gpGlobals->frametime;
+
+
+	if (!(FBitSet (pev->spawnflags, SF_CAMERA_PLAYER_TAKECONTROL)))	
+	{
+		pev->velocity = pev->velocity * 0.8;
+		if (pev->velocity.Length( ) < 10.0)
+			pev->velocity = g_vecZero;
+	}
+
+	pev->nextthink = gpGlobals->time;
+
+	Move();
+}
+
+void CTriggerCamera::Move()
+{
+	// Not moving on a path, return
+	if (!m_pentPath)
+		return;
+
+	// Subtract movement from the previous frame
+	m_moveDistance -= pev->speed * gpGlobals->frametime;
+
+	// Have we moved enough to reach the target?
+	if ( m_moveDistance <= 0 )
+	{
+		// Fire the passtarget if there is one
+		if ( m_pentPath->pev->message )
+		{
+			FireTargets( STRING(m_pentPath->pev->message), this, this, USE_TOGGLE, 0 );
+			if ( FBitSet( m_pentPath->pev->spawnflags, SF_CORNER_FIREONCE ) )
+				m_pentPath->pev->message = 0;
+		}
+		// Time to go to the next target
+		m_pentPath = m_pentPath->GetNextTarget();
+
+		// Set up next corner
+		if ( !m_pentPath )
+		{
+			pev->velocity = g_vecZero;
+		}
+		else 
+		{
+			if ( m_pentPath->pev->speed != 0 )
+				m_targetSpeed = m_pentPath->pev->speed;
+
+			Vector delta = m_pentPath->pev->origin - pev->origin;
+			m_moveDistance = delta.Length();
+			pev->movedir = delta.Normalize();
+			m_flStopTime = gpGlobals->time + m_pentPath->GetDelay();
+		}
+	}
+
+	if ( m_flStopTime > gpGlobals->time )
+		pev->speed = UTIL_Approach( 0, pev->speed, m_deceleration * gpGlobals->frametime );
+	else
+		pev->speed = UTIL_Approach( m_targetSpeed, pev->speed, m_acceleration * gpGlobals->frametime );
+
+	float fraction = 2 * gpGlobals->frametime;
+	pev->velocity = ((pev->movedir * pev->speed) * fraction) + (pev->velocity * (1-fraction));
+}
diff --git a/main/source/dlls/triggers.h b/main/source/dlls/triggers.h
new file mode 100644
index 00000000..4eabd7fe
--- /dev/null
+++ b/main/source/dlls/triggers.h
@@ -0,0 +1,27 @@
+// ============================== LADDER =======================================
+
+class CBaseTrigger : public CBaseToggle
+{
+public:
+	void EXPORT TeleportTouch ( CBaseEntity *pOther );
+	void KeyValue( KeyValueData *pkvd );
+	void EXPORT MultiTouch( CBaseEntity *pOther );
+	void EXPORT HurtTouch ( CBaseEntity *pOther );
+	void EXPORT CDAudioTouch ( CBaseEntity *pOther );
+	void ActivateMultiTrigger( CBaseEntity *pActivator );
+	void EXPORT MultiWaitOver( void );
+	void EXPORT CounterUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void EXPORT ToggleUse ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void InitTrigger( void );
+	
+	virtual int	ObjectCaps( void ) { return CBaseToggle :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+};
+
+
+class CLadder : public CBaseTrigger
+{
+public:
+	void KeyValue( KeyValueData *pkvd );
+	void Spawn( void );
+	void Precache( void );
+};
diff --git a/main/source/dlls/turret.cpp b/main/source/dlls/turret.cpp
new file mode 100644
index 00000000..3a1f5533
--- /dev/null
+++ b/main/source/dlls/turret.cpp
@@ -0,0 +1,1210 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+/*
+
+===== turret.cpp ========================================================
+
+*/
+
+//
+// TODO: 
+//		Take advantage of new monster fields like m_hEnemy and get rid of that OFFSET() stuff
+//		Revisit enemy validation stuff, maybe it's not necessary with the newest monster code
+//
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "effects.h"
+#include "dlls/turret.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "mod/AvHSpecials.h"
+
+extern Vector VecBModelOrigin( entvars_t* pevBModel );
+
+
+TYPEDESCRIPTION	CBaseTurret::m_SaveData[] = 
+{
+	DEFINE_FIELD( CBaseTurret, m_flMaxSpin, FIELD_FLOAT ),
+	DEFINE_FIELD( CBaseTurret, m_iSpin, FIELD_INTEGER ),
+
+	DEFINE_FIELD( CBaseTurret, m_pEyeGlow, FIELD_CLASSPTR ),
+	DEFINE_FIELD( CBaseTurret, m_eyeBrightness, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseTurret, m_iDeployHeight, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseTurret, m_iRetractHeight, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseTurret, m_iMinPitch, FIELD_INTEGER ),
+
+	DEFINE_FIELD( CBaseTurret, m_iBaseTurnRate, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseTurret, m_fTurnRate, FIELD_FLOAT ),
+	DEFINE_FIELD( CBaseTurret, m_iOrientation, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseTurret, m_iOn, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseTurret, m_fBeserk, FIELD_INTEGER ),
+	DEFINE_FIELD( CBaseTurret, m_iAutoStart, FIELD_INTEGER ),
+
+
+	DEFINE_FIELD( CBaseTurret, m_vecLastSight, FIELD_POSITION_VECTOR ),
+	DEFINE_FIELD( CBaseTurret, m_flLastSight, FIELD_TIME ),
+	DEFINE_FIELD( CBaseTurret, m_flMaxWait, FIELD_FLOAT ),
+	DEFINE_FIELD( CBaseTurret, m_iSearchSpeed, FIELD_INTEGER ),
+
+	DEFINE_FIELD( CBaseTurret, m_flStartYaw, FIELD_FLOAT ),
+	DEFINE_FIELD( CBaseTurret, m_vecCurAngles, FIELD_VECTOR ),
+	DEFINE_FIELD( CBaseTurret, m_vecGoalAngles, FIELD_VECTOR ),
+
+	DEFINE_FIELD( CBaseTurret, m_flPingTime, FIELD_TIME ),
+	DEFINE_FIELD( CBaseTurret, m_flSpinUpTime, FIELD_TIME ),
+};
+
+IMPLEMENT_SAVERESTORE( CBaseTurret, CBaseMonster );
+
+TYPEDESCRIPTION	CTurret::m_SaveData[] = 
+{
+	DEFINE_FIELD( CTurret, m_iStartSpin, FIELD_INTEGER ),
+};
+
+IMPLEMENT_SAVERESTORE( CTurret, CBaseTurret );
+
+
+
+LINK_ENTITY_TO_CLASS( monster_turret, CTurret );
+LINK_ENTITY_TO_CLASS( monster_miniturret, CMiniTurret );
+
+const float kPingInterval = 3.0f;
+const float kPingVolume = .7f;
+
+void CBaseTurret::KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "maxsleep"))
+	{
+		m_flMaxWait = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "orientation"))
+	{
+		m_iOrientation = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+
+	}
+	else if (FStrEq(pkvd->szKeyName, "searchspeed"))
+	{
+		m_iSearchSpeed = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+
+	}
+	else if (FStrEq(pkvd->szKeyName, "turnrate"))
+	{
+		m_iBaseTurnRate = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "style") ||
+			 FStrEq(pkvd->szKeyName, "height") ||
+			 FStrEq(pkvd->szKeyName, "value1") ||
+			 FStrEq(pkvd->szKeyName, "value2") ||
+			 FStrEq(pkvd->szKeyName, "value3"))
+		pkvd->fHandled = TRUE;
+	else
+		CBaseMonster::KeyValue( pkvd );
+}
+
+
+void CBaseTurret::Spawn()
+{ 
+	Precache( );
+	pev->nextthink		= gpGlobals->time + 1;
+	pev->movetype		= MOVETYPE_FLY;
+	pev->sequence		= 0;
+	pev->frame			= 0;
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->takedamage		= DAMAGE_AIM;
+
+	SetBits (pev->flags, FL_MONSTER);
+	SetUse(&CBaseTurret::TurretUse );
+
+	if (( pev->spawnflags & SF_MONSTER_TURRET_AUTOACTIVATE ) 
+		 && !( pev->spawnflags & SF_MONSTER_TURRET_STARTINACTIVE ))
+	{
+		m_iAutoStart = TRUE;
+	}
+
+	ResetSequenceInfo( );
+	SetBoneController( 0, 0 );
+	SetBoneController( 1, 0 );
+	m_flFieldOfView = VIEW_FIELD_FULL;
+	// m_flSightRange = this->GetRange();
+}
+
+char* CBaseTurret::GetPingSound() const
+{
+	return "turret/tu_ping.wav";
+}
+
+char* CBaseTurret::GetActiveSound() const
+{
+	return "turret/tu_active2.wav";
+}
+
+char* CBaseTurret::GetAlertSound() const
+{
+	return "turret/tu_alert.wav";
+}
+
+char* CBaseTurret::GetDeploySound() const
+{
+	return "turret/tu_deploy.wav";
+}
+
+void CBaseTurret::Precache( )
+{
+	PRECACHE_SOUND ("turret/tu_fire1.wav");
+	PRECACHE_SOUND (this->GetPingSound());
+	PRECACHE_SOUND (this->GetActiveSound());
+	PRECACHE_SOUND ("turret/tu_die.wav");
+	PRECACHE_SOUND ("turret/tu_die2.wav");
+	PRECACHE_SOUND ("turret/tu_die3.wav");
+	PRECACHE_SOUND ("turret/tu_active2.wav");
+	// PRECACHE_SOUND ("turret/tu_retract.wav"); // just use deploy sound to save memory
+	PRECACHE_SOUND (this->GetDeploySound());
+	PRECACHE_SOUND ("turret/tu_spinup.wav");
+	PRECACHE_SOUND ("turret/tu_spindown.wav");
+	PRECACHE_SOUND (this->GetAlertSound());
+}
+
+#define TURRET_GLOW_SPRITE "sprites/flare3.spr"
+
+void CTurret::Spawn()
+{ 
+	Precache( );
+	SET_MODEL(ENT(pev), "models/turret.mdl");
+	pev->health			= gSkillData.turretHealth;
+	m_HackedGunPos		= Vector( (float)0, (float)0, (float)12.75 );
+	m_flMaxSpin =		TURRET_MAXSPIN;
+	pev->view_ofs.z = 12.75;
+
+	CBaseTurret::Spawn( );
+
+	m_iRetractHeight = 16;
+	m_iDeployHeight = 32;
+	m_iMinPitch	= -15;
+	UTIL_SetSize(pev, Vector(-32, -32, -m_iRetractHeight), Vector(32, 32, m_iRetractHeight));
+	
+	SetThink(&CTurret::Initialize);	
+
+	m_pEyeGlow = CSprite::SpriteCreate( TURRET_GLOW_SPRITE, pev->origin, FALSE );
+	m_pEyeGlow->SetTransparency( kRenderGlow, 255, 0, 0, 0, kRenderFxNoDissipation );
+	m_pEyeGlow->SetAttachment( edict(), 2 );
+	m_eyeBrightness = 0;
+
+	pev->nextthink = gpGlobals->time + 0.3; 
+}
+
+void CTurret::Precache()
+{
+	CBaseTurret::Precache( );
+	PRECACHE_MODEL ("models/turret.mdl");	
+	PRECACHE_MODEL (TURRET_GLOW_SPRITE);
+}
+
+void CMiniTurret::Spawn()
+{ 
+	Precache( );
+	SET_MODEL(ENT(pev), "models/miniturret.mdl");
+	pev->health			= gSkillData.miniturretHealth;
+	m_HackedGunPos		= Vector( (float)0, (float)0, (float)12.75 );
+	m_flMaxSpin = 0;
+	pev->view_ofs.z = 12.75;
+
+	CBaseTurret::Spawn( );
+	m_iRetractHeight = 16;
+	m_iDeployHeight = 32;
+	m_iMinPitch	= -15;
+	UTIL_SetSize(pev, Vector(-16, -16, -m_iRetractHeight), Vector(16, 16, m_iRetractHeight));
+
+	SetThink(&CMiniTurret::Initialize);	
+	pev->nextthink = gpGlobals->time + 0.3; 
+}
+
+
+void CMiniTurret::Precache()
+{
+	CBaseTurret::Precache( );
+	PRECACHE_MODEL ("models/miniturret.mdl");	
+	PRECACHE_SOUND("weapons/hks1.wav");
+	PRECACHE_SOUND("weapons/hks2.wav");
+	PRECACHE_SOUND("weapons/hks3.wav");
+}
+
+void CBaseTurret::Initialize(void)
+{
+	m_iOn = 0;
+	m_fBeserk = 0;
+	m_iSpin = 0;
+
+	SetBoneController( 0, 0 );
+	SetBoneController( 1, 0 );
+
+	if (m_iBaseTurnRate == 0) 
+	{
+		m_iBaseTurnRate = TURRET_TURNRATE;
+	}
+	if (m_flMaxWait == 0)
+	{
+		m_flMaxWait = TURRET_MAXWAIT;
+	}
+
+	m_flStartYaw = pev->angles.y;
+	if (m_iOrientation == 1)
+	{
+		pev->idealpitch = 180;
+		pev->angles.x = 180;
+		pev->view_ofs.z = -pev->view_ofs.z;
+		pev->effects |= EF_INVLIGHT;
+		pev->angles.y = pev->angles.y + 180;
+		if (pev->angles.y > 360)
+			pev->angles.y = pev->angles.y - 360;
+	}
+
+	m_vecGoalAngles.x = 0;
+
+	if (m_iAutoStart)
+	{
+		m_flLastSight = gpGlobals->time + m_flMaxWait;
+		SetThink(&CBaseTurret::AutoSearchThink);		
+		pev->nextthink = gpGlobals->time + .1;
+	}
+	else
+		SetThink(&CBaseTurret::SUB_DoNothing);
+
+	int a = 0;
+}
+
+void CBaseTurret::TurretUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if ( !ShouldToggle( useType, m_iOn ) )
+		return;
+
+	if (m_iOn)
+	{
+		m_hEnemy = NULL;
+		pev->nextthink = gpGlobals->time + 0.1;
+		m_iAutoStart = FALSE;// switching off a turret disables autostart
+		//!!!! this should spin down first!!BUGBUG
+		SetThink(&CBaseTurret::Retire);
+	}
+	else 
+	{
+		pev->nextthink = gpGlobals->time + 0.1; // turn on delay
+
+		// if the turret is flagged as an autoactivate turret, re-enable it's ability open self.
+		if ( pev->spawnflags & SF_MONSTER_TURRET_AUTOACTIVATE )
+		{
+			m_iAutoStart = TRUE;
+		}
+		
+		SetThink(&CBaseTurret::Deploy);
+	}
+}
+
+
+void CBaseTurret::Ping( void )
+{
+	// make the pinging noise every second while searching
+	if (m_flPingTime == 0)
+		m_flPingTime = gpGlobals->time + kPingInterval;
+	else if (m_flPingTime <= gpGlobals->time)
+	{
+		m_flPingTime = gpGlobals->time + kPingInterval;
+		EMIT_SOUND(ENT(pev), CHAN_ITEM, this->GetPingSound(), kPingVolume, ATTN_STATIC);
+		EyeOn( );
+	}
+	else if (m_eyeBrightness > 0)
+	{
+		EyeOff( );
+	}
+}
+
+
+void CBaseTurret::EyeOn( )
+{
+	if (m_pEyeGlow)
+	{
+		if (m_eyeBrightness != 255)
+		{
+			m_eyeBrightness = 255;
+		}
+		m_pEyeGlow->SetBrightness( m_eyeBrightness );
+	}
+}
+
+
+void CBaseTurret::EyeOff( )
+{
+	if (m_pEyeGlow)
+	{
+		if (m_eyeBrightness > 0)
+		{
+			m_eyeBrightness = max( 0, m_eyeBrightness - 30 );
+			m_pEyeGlow->SetBrightness( m_eyeBrightness );
+		}
+	}
+}
+
+bool CBaseTurret::NeedsLineOfSight() const
+{
+	return true;
+}
+
+void CBaseTurret::ActiveThink(void)
+{
+	int fAttack = 0;
+	Vector vecDirToEnemy;
+
+	pev->nextthink = gpGlobals->time + 0.1;
+	StudioFrameAdvance( );
+
+	if ((!m_iOn) || FNullEnt(m_hEnemy))
+	{
+		m_hEnemy = NULL;
+		m_flLastSight = gpGlobals->time + m_flMaxWait;
+		SetThink(&CBaseTurret::SearchThink);
+		return;
+	}
+	
+	// if it's dead, look for something new
+	if ( !m_hEnemy->IsAlive() )
+	{
+		if (!m_flLastSight)
+		{
+			m_flLastSight = gpGlobals->time + 0.5; // continue-shooting timeout
+		}
+		else
+		{
+			if (gpGlobals->time > m_flLastSight)
+			{	
+				m_hEnemy = NULL;
+				m_flLastSight = gpGlobals->time + m_flMaxWait;
+				SetThink(&CBaseTurret::SearchThink);
+				return;
+			}
+		}
+	}
+
+	Vector vecMid = pev->origin + pev->view_ofs;
+	Vector vecMidEnemy = m_hEnemy->BodyTarget( vecMid );
+
+	// Look for our current enemy
+	bool theEnemyHasCloaking = false;//GetHasUpgrade(m_hEnemy->pev->iuser4, MASK_ALIEN_UPGRADE_10);
+	if(theEnemyHasCloaking)
+	{
+		int a = 0;
+	}
+
+	int fEnemyVisible = FBoxVisible(pev, m_hEnemy->pev, vecMidEnemy) || !this->NeedsLineOfSight();
+
+	vecDirToEnemy = vecMidEnemy - vecMid;	// calculate dir and dist to enemy
+	float flDistToEnemy = vecDirToEnemy.Length();
+
+	Vector vec = UTIL_VecToAngles(vecMidEnemy - vecMid);	
+
+	// Current enemy is not visible.
+	if (!fEnemyVisible || (flDistToEnemy > this->GetRange()) || theEnemyHasCloaking)
+	{
+		if (!m_flLastSight)
+			m_flLastSight = gpGlobals->time + 0.5;
+		else
+		{
+			// Should we look for a new target?
+			if (gpGlobals->time > m_flLastSight)
+			{
+				m_hEnemy = NULL;
+				m_flLastSight = gpGlobals->time + m_flMaxWait;
+				SetThink(&CBaseTurret::SearchThink);
+				return;
+			}
+		}
+		fEnemyVisible = 0;
+	}
+	else
+	{
+		m_vecLastSight = vecMidEnemy;
+	}
+
+	UTIL_MakeAimVectors(m_vecCurAngles);	
+
+	/*
+	ALERT( at_console, "%.0f %.0f : %.2f %.2f %.2f\n", 
+		m_vecCurAngles.x, m_vecCurAngles.y,
+		gpGlobals->v_forward.x, gpGlobals->v_forward.y, gpGlobals->v_forward.z );
+	*/
+	
+	Vector vecLOS = vecDirToEnemy; //vecMid - m_vecLastSight;
+	vecLOS = vecLOS.Normalize();
+
+	// Is the Gun looking at the target
+	if (DotProduct(vecLOS, gpGlobals->v_forward) <= 0.866) // 30 degree slop
+		fAttack = FALSE;
+	else
+		fAttack = TRUE;
+
+	// fire the gun
+	if (m_iSpin && ((fAttack) || (m_fBeserk)))
+	{
+		Vector vecSrc, vecAng;
+		GetAttachment( 0, vecSrc, vecAng );
+		SetTurretAnim(TURRET_ANIM_FIRE);
+		Shoot(vecSrc, gpGlobals->v_forward );
+	} 
+	else
+	{
+		SetTurretAnim(TURRET_ANIM_SPIN);
+		this->StopShooting();
+	}
+
+	//move the gun
+	if (m_fBeserk)
+	{
+		if (RANDOM_LONG(0,9) == 0)
+		{
+			m_vecGoalAngles.y = RANDOM_FLOAT(0,360);
+			m_vecGoalAngles.x = RANDOM_FLOAT(0,90) - 90 * m_iOrientation;
+			TakeDamage(pev,pev,1, DMG_GENERIC); // don't beserk forever
+			return;
+		}
+	} 
+	else if (fEnemyVisible)
+	{
+		if (vec.y > 360)
+			vec.y -= 360;
+
+		if (vec.y < 0)
+			vec.y += 360;
+
+		//ALERT(at_console, "[%.2f]", vec.x);
+		
+		if (vec.x < -180)
+			vec.x += 360;
+
+		if (vec.x > 180)
+			vec.x -= 360;
+
+		// now all numbers should be in [1...360]
+		// pin to turret limitations to [-90...15]
+
+		if (m_iOrientation == 0)
+		{
+			if (vec.x > 90)
+				vec.x = 90;
+			else if (vec.x < m_iMinPitch)
+				vec.x = m_iMinPitch;
+		}
+		else
+		{
+			if (vec.x < -90)
+				vec.x = -90;
+			else if (vec.x > -m_iMinPitch)
+				vec.x = -m_iMinPitch;
+		}
+
+		// ALERT(at_console, "->[%.2f]\n", vec.x);
+
+		m_vecGoalAngles.y = vec.y;
+		m_vecGoalAngles.x = vec.x;
+
+	}
+
+	SpinUpCall();
+	MoveTurret();
+}
+
+
+void CTurret::Shoot(Vector &vecSrc, Vector &vecDirToEnemy)
+{
+	FireBullets( 1, vecSrc, vecDirToEnemy, TURRET_SPREAD, this->GetRange(), BULLET_MONSTER_12MM, 1 );
+	EMIT_SOUND(ENT(pev), CHAN_WEAPON, "turret/tu_fire1.wav", 1, 0.6);
+	pev->effects = pev->effects | EF_MUZZLEFLASH;
+}
+
+
+void CMiniTurret::Shoot(Vector &vecSrc, Vector &vecDirToEnemy)
+{
+	FireBullets( 1, vecSrc, vecDirToEnemy, TURRET_SPREAD, this->GetRange(), BULLET_MONSTER_9MM, 1 );
+
+	switch(RANDOM_LONG(0,2))
+	{
+	case 0: EMIT_SOUND(ENT(pev), CHAN_WEAPON, "weapons/hks1.wav", 1, ATTN_NORM); break;
+	case 1: EMIT_SOUND(ENT(pev), CHAN_WEAPON, "weapons/hks2.wav", 1, ATTN_NORM); break;
+	case 2: EMIT_SOUND(ENT(pev), CHAN_WEAPON, "weapons/hks3.wav", 1, ATTN_NORM); break;
+	}
+	pev->effects = pev->effects | EF_MUZZLEFLASH;
+}
+
+
+void CBaseTurret::Deploy(void)
+{
+	pev->nextthink = gpGlobals->time + 0.1;
+	StudioFrameAdvance( );
+
+	if (pev->sequence != TURRET_ANIM_DEPLOY)
+	{
+		m_iOn = 1;
+		SetTurretAnim(TURRET_ANIM_DEPLOY);
+		EMIT_SOUND(ENT(pev), CHAN_BODY, this->GetDeploySound(), TURRET_MACHINE_VOLUME, ATTN_NORM);
+		SUB_UseTargets( this, USE_ON, 0 );
+	}
+
+	if (m_fSequenceFinished)
+	{
+		pev->maxs.z = m_iDeployHeight;
+		pev->mins.z = -m_iDeployHeight;
+		UTIL_SetSize(pev, pev->mins, pev->maxs);
+
+		m_vecCurAngles.x = 0;
+
+		if (m_iOrientation == 1)
+		{
+			m_vecCurAngles.y = UTIL_AngleMod( pev->angles.y + 180 );
+		}
+		else
+		{
+			m_vecCurAngles.y = UTIL_AngleMod( pev->angles.y );
+		}
+
+		SetTurretAnim(TURRET_ANIM_SPIN);
+		pev->framerate = 0;
+		SetThink(&CBaseTurret::SearchThink);
+	}
+
+	m_flLastSight = gpGlobals->time + m_flMaxWait;
+}
+
+void CBaseTurret::Retire(void)
+{
+	// make the turret level
+	m_vecGoalAngles.x = 0;
+	m_vecGoalAngles.y = m_flStartYaw;
+
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	StudioFrameAdvance( );
+
+	EyeOff( );
+
+	if (!MoveTurret())
+	{
+		if (m_iSpin)
+		{
+			SpinDownCall();
+		}
+		else if (pev->sequence != TURRET_ANIM_RETIRE)
+		{
+			SetTurretAnim(TURRET_ANIM_RETIRE);
+			EMIT_SOUND_DYN(ENT(pev), CHAN_BODY, this->GetDeploySound(), TURRET_MACHINE_VOLUME, ATTN_NORM, 0, 120);
+			SUB_UseTargets( this, USE_OFF, 0 );
+		}
+		else if (m_fSequenceFinished) 
+		{	
+			m_iOn = 0;
+			m_flLastSight = 0;
+			SetTurretAnim(TURRET_ANIM_NONE);
+			pev->maxs.z = m_iRetractHeight;
+			pev->mins.z = -m_iRetractHeight;
+			UTIL_SetSize(pev, pev->mins, pev->maxs);
+			if (m_iAutoStart)
+			{
+				SetThink(&CBaseTurret::AutoSearchThink);		
+				pev->nextthink = gpGlobals->time + .1;
+			}
+			else
+				SetThink(&CBaseTurret::SUB_DoNothing);
+		}
+	}
+	else
+	{
+		SetTurretAnim(TURRET_ANIM_SPIN);
+	}
+}
+
+
+void CTurret::SpinUpCall(void)
+{
+	StudioFrameAdvance( );
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	// Are we already spun up? If not start the two stage process.
+	if (!m_iSpin)
+	{
+		SetTurretAnim( TURRET_ANIM_SPIN );
+		// for the first pass, spin up the the barrel
+		if (!m_iStartSpin)
+		{
+			pev->nextthink = gpGlobals->time + 1.0; // spinup delay
+			EMIT_SOUND(ENT(pev), CHAN_BODY, "turret/tu_spinup.wav", TURRET_MACHINE_VOLUME, ATTN_NORM);
+			m_iStartSpin = 1;
+			pev->framerate = 0.1;
+		}
+		// after the barrel is spun up, turn on the hum
+		else if (pev->framerate >= 1.0)
+		{
+			pev->nextthink = gpGlobals->time + 0.1; // retarget delay
+			EMIT_SOUND(ENT(pev), CHAN_STATIC, "turret/tu_active2.wav", TURRET_MACHINE_VOLUME, ATTN_NORM);
+			SetThink(&CTurret::ActiveThink);
+			m_iStartSpin = 0;
+			m_iSpin = 1;
+		} 
+		else
+		{
+			pev->framerate += 0.075;
+		}
+	}
+
+	if (m_iSpin)
+	{
+		SetThink(&CTurret::ActiveThink);
+	}
+}
+
+
+void CTurret::SpinDownCall(void)
+{
+	if (m_iSpin)
+	{
+		SetTurretAnim( TURRET_ANIM_SPIN );
+		if (pev->framerate == 1.0)
+		{
+			EMIT_SOUND_DYN(ENT(pev), CHAN_STATIC, "turret/tu_active2.wav", 0, 0, SND_STOP, 100);
+			EMIT_SOUND(ENT(pev), CHAN_ITEM, "turret/tu_spindown.wav", TURRET_MACHINE_VOLUME, ATTN_NORM);
+		}
+		pev->framerate -= 0.02;
+		if (pev->framerate <= 0)
+		{
+			pev->framerate = 0;
+			m_iSpin = 0;
+		}
+	}
+}
+
+
+void CBaseTurret::SetTurretAnim(TURRET_ANIM anim)
+{
+	if (pev->sequence != anim)
+	{
+		switch(anim)
+		{
+		case TURRET_ANIM_FIRE:
+		case TURRET_ANIM_SPIN:
+			if (pev->sequence != TURRET_ANIM_FIRE && pev->sequence != TURRET_ANIM_SPIN)
+			{
+				pev->frame = 0;
+			}
+			break;
+		default:
+			pev->frame = 0;
+			break;
+		}
+
+		pev->sequence = anim;
+		ResetSequenceInfo( );
+
+		switch(anim)
+		{
+		case TURRET_ANIM_RETIRE:
+			pev->frame			= 255;
+			pev->framerate		= -1.0;
+			break;
+		case TURRET_ANIM_DIE:
+			pev->framerate		= 1.0;
+			break;
+		}
+		//ALERT(at_console, "Turret anim #%d\n", anim);
+	}
+}
+
+
+//
+// This search function will sit with the turret deployed and look for a new target. 
+// After a set amount of time, the barrel will spin down. After m_flMaxWait, the turret will
+// retact.
+//
+void CBaseTurret::SearchThink(void)
+{
+	// ensure rethink
+	SetTurretAnim(TURRET_ANIM_SPIN);
+	StudioFrameAdvance( );
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	if (m_flSpinUpTime == 0 && m_flMaxSpin)
+		m_flSpinUpTime = gpGlobals->time + m_flMaxSpin;
+
+	Ping( );
+
+	// If we have a target and we're still healthy
+	if (m_hEnemy != NULL)
+	{
+		if (!m_hEnemy->IsAlive() )
+			m_hEnemy = NULL;// Dead enemy forces a search for new one
+	}
+
+
+	// Acquire Target
+	if (m_hEnemy == NULL)
+	{
+		Look(this->GetRange());
+		m_hEnemy = BestVisibleEnemy();
+	}
+
+	// If we've found a target, spin up the barrel and start to attack
+	if (m_hEnemy != NULL)
+	{
+		m_flLastSight = 0;
+		m_flSpinUpTime = 0;
+		SetThink(&CBaseTurret::ActiveThink);
+	}
+	else
+	{
+		// Are we out of time, do we need to retract?
+ 		if (gpGlobals->time > m_flLastSight)
+		{
+			//Before we retrace, make sure that we are spun down.
+			m_flLastSight = 0;
+			m_flSpinUpTime = 0;
+			SetThink(&CBaseTurret::Retire);
+		}
+		// should we stop the spin?
+		else if ((m_flSpinUpTime) && (gpGlobals->time > m_flSpinUpTime))
+		{
+			SpinDownCall();
+		}
+		
+		// generic hunt for new victims
+		m_vecGoalAngles.y = (m_vecGoalAngles.y + 0.1 * m_fTurnRate);
+		if (m_vecGoalAngles.y >= 360)
+			m_vecGoalAngles.y -= 360;
+		MoveTurret();
+	}
+}
+
+int CBaseTurret::GetRange() const
+{
+	return TURRET_RANGE;
+}
+
+// 
+// This think function will deploy the turret when something comes into range. This is for
+// automatically activated turrets.
+//
+void CBaseTurret::AutoSearchThink(void)
+{
+	// ensure rethink
+	StudioFrameAdvance( );
+	pev->nextthink = gpGlobals->time + 0.3;
+
+	// If we have a target and we're still healthy
+
+	if (m_hEnemy != NULL)
+	{
+		if (!m_hEnemy->IsAlive() )
+			m_hEnemy = NULL;// Dead enemy forces a search for new one
+	}
+
+	// Acquire Target
+
+	if (m_hEnemy == NULL)
+	{
+		Look( this->GetRange() );
+		m_hEnemy = BestVisibleEnemy();
+	}
+
+	if (m_hEnemy != NULL)
+	{
+		SetThink(&CBaseTurret::Deploy);
+		EMIT_SOUND(ENT(pev), CHAN_BODY, this->GetAlertSound(), TURRET_MACHINE_VOLUME, ATTN_NORM);
+	}
+}
+
+
+void CBaseTurret ::	TurretDeath( void )
+{
+	BOOL iActive = FALSE;
+
+	StudioFrameAdvance( );
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	if (pev->deadflag != DEAD_DEAD)
+	{
+		pev->deadflag = DEAD_DEAD;
+
+		float flRndSound = RANDOM_FLOAT ( 0 , 1 );
+
+		if ( flRndSound <= 0.33 )
+			EMIT_SOUND(ENT(pev), CHAN_BODY, "turret/tu_die.wav", 1.0, ATTN_NORM);
+		else if ( flRndSound <= 0.66 )
+			EMIT_SOUND(ENT(pev), CHAN_BODY, "turret/tu_die2.wav", 1.0, ATTN_NORM);
+		else 
+			EMIT_SOUND(ENT(pev), CHAN_BODY, "turret/tu_die3.wav", 1.0, ATTN_NORM);
+
+		EMIT_SOUND_DYN(ENT(pev), CHAN_STATIC, "turret/tu_active2.wav", 0, 0, SND_STOP, 100);
+
+		if (m_iOrientation == 0)
+			m_vecGoalAngles.x = -15;
+		else
+			m_vecGoalAngles.x = -90;
+
+		SetTurretAnim(TURRET_ANIM_DIE); 
+
+		EyeOn( );	
+	}
+
+	EyeOff( );
+
+	if (pev->dmgtime + RANDOM_FLOAT( 0, 2 ) > gpGlobals->time)
+	{
+		// lots of smoke
+		MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+			WRITE_BYTE( TE_SMOKE );
+			WRITE_COORD( RANDOM_FLOAT( pev->absmin.x, pev->absmax.x ) );
+			WRITE_COORD( RANDOM_FLOAT( pev->absmin.y, pev->absmax.y ) );
+			WRITE_COORD( pev->origin.z - m_iOrientation * 64 );
+			WRITE_SHORT( g_sModelIndexSmoke );
+			WRITE_BYTE( 25 ); // scale * 10
+			WRITE_BYTE( 10 - m_iOrientation * 5); // framerate
+		MESSAGE_END();
+	}
+	
+	if (pev->dmgtime + RANDOM_FLOAT( 0, 5 ) > gpGlobals->time)
+	{
+		Vector vecSrc = Vector( (float)RANDOM_FLOAT( pev->absmin.x, pev->absmax.x ), (float)RANDOM_FLOAT( pev->absmin.y, pev->absmax.y ), (float)0 );
+		if (m_iOrientation == 0)
+			vecSrc = vecSrc + Vector( (float)0, (float)0, (float)RANDOM_FLOAT( pev->origin.z, pev->absmax.z ) );
+		else
+			vecSrc = vecSrc + Vector( (float)0, (float)0, (float)RANDOM_FLOAT( pev->absmin.z, pev->origin.z ) );
+
+		UTIL_Sparks( vecSrc );
+	}
+
+	if (m_fSequenceFinished && !MoveTurret( ) && pev->dmgtime + 5 < gpGlobals->time)
+	{
+		pev->framerate = 0;
+		SetThink( NULL );
+	}
+}
+
+
+
+void CBaseTurret :: TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType)
+{
+	if ( ptr->iHitgroup == 10 )
+	{
+		// hit armor
+		if ( pev->dmgtime != gpGlobals->time || (RANDOM_LONG(0,10) < 1) )
+		{
+			UTIL_Ricochet( ptr->vecEndPos, RANDOM_FLOAT( 1, 2) );
+			pev->dmgtime = gpGlobals->time;
+		}
+
+		flDamage = 0.1;// don't hurt the monster much, but allow bits_COND_LIGHT_DAMAGE to be generated
+	}
+
+	if ( !pev->takedamage )
+		return;
+
+	AddMultiDamage( pevAttacker, this, flDamage, bitsDamageType );
+}
+
+// take damage. bitsDamageType indicates type of damage sustained, ie: DMG_BULLET
+
+int CBaseTurret::TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType)
+{
+	if ( !pev->takedamage )
+		return 0;
+
+	if (!m_iOn)
+		flDamage /= 10.0;
+
+	pev->health -= flDamage;
+	if (pev->health <= 0)
+	{
+		pev->health = 0;
+		pev->takedamage = DAMAGE_NO;
+		pev->dmgtime = gpGlobals->time;
+
+		ClearBits (pev->flags, FL_MONSTER); // why are they set in the first place???
+
+		SetUse(NULL);
+		SetThink(&CBaseTurret::TurretDeath);
+		SUB_UseTargets( this, USE_ON, 0 ); // wake up others
+		pev->nextthink = gpGlobals->time + 0.1;
+
+		return 0;
+	}
+
+	if (pev->health <= 10)
+	{
+		if (m_iOn && (1 || RANDOM_LONG(0, 0x7FFF) > 800))
+		{
+			m_fBeserk = 1;
+			SetThink(&CBaseTurret::SearchThink);
+		}
+	}
+
+	return 1;
+}
+
+int CBaseTurret::MoveTurret(void)
+{
+	ASSERT(this->m_iBaseTurnRate > 0);
+	ASSERT(this->m_fTurnRate > 0);
+
+	int state = 0;
+	// any x movement?
+	
+	if (m_vecCurAngles.x != m_vecGoalAngles.x)
+	{
+		float flDir = m_vecGoalAngles.x > m_vecCurAngles.x ? 1 : -1 ;
+
+		m_vecCurAngles.x += 0.1 * m_fTurnRate * flDir;
+
+		// if we started below the goal, and now we're past, peg to goal
+		if (flDir == 1)
+		{
+			if (m_vecCurAngles.x > m_vecGoalAngles.x)
+				m_vecCurAngles.x = m_vecGoalAngles.x;
+		} 
+		else
+		{
+			if (m_vecCurAngles.x < m_vecGoalAngles.x)
+				m_vecCurAngles.x = m_vecGoalAngles.x;
+		}
+
+		if (m_iOrientation == 0)
+			SetBoneController(1, -m_vecCurAngles.x);
+		else
+			SetBoneController(1, m_vecCurAngles.x);
+		state = 1;
+	}
+
+	if (m_vecCurAngles.y != m_vecGoalAngles.y)
+	{
+		float flDir = m_vecGoalAngles.y > m_vecCurAngles.y ? 1 : -1 ;
+		float flDist = fabs(m_vecGoalAngles.y - m_vecCurAngles.y);
+		
+		if (flDist > 180)
+		{
+			flDist = 360 - flDist;
+			flDir = -flDir;
+		}
+		if (flDist > 30)
+		{
+			if (m_fTurnRate < m_iBaseTurnRate * 10)
+			{
+				m_fTurnRate += m_iBaseTurnRate;
+			}
+		}
+		else if (m_fTurnRate > 45)
+		{
+			m_fTurnRate -= m_iBaseTurnRate;
+		}
+		else
+		{
+			m_fTurnRate += m_iBaseTurnRate;
+		}
+
+		m_vecCurAngles.y += 0.1 * m_fTurnRate * flDir;
+
+		if (m_vecCurAngles.y < 0)
+			m_vecCurAngles.y += 360;
+		else if (m_vecCurAngles.y >= 360)
+			m_vecCurAngles.y -= 360;
+
+		if (flDist < (0.05 * m_iBaseTurnRate))
+			m_vecCurAngles.y = m_vecGoalAngles.y;
+
+		//ALERT(at_console, "%.2f -> %.2f\n", m_vecCurAngles.y, y);
+		if (m_iOrientation == 0)
+			SetBoneController(0, m_vecCurAngles.y - pev->angles.y );
+		else 
+			SetBoneController(0, pev->angles.y - 180 - m_vecCurAngles.y );
+		state = 1;
+	}
+
+	if (!state)
+		m_fTurnRate = m_iBaseTurnRate;
+	
+	//ALERT(at_console, "(%.2f, %.2f)->(%.2f, %.2f)\n", m_vecCurAngles.x, 
+	//	m_vecCurAngles.y, m_vecGoalAngles.x, m_vecGoalAngles.y);
+	return state;
+}
+
+//
+// ID as a machine
+//
+int	CBaseTurret::Classify ( void )
+{
+	if (m_iOn || m_iAutoStart)
+		return	CLASS_MACHINE;
+	return CLASS_NONE;
+}
+
+
+
+
+LINK_ENTITY_TO_CLASS( monster_sentry, CSentry );
+
+void CSentry::Precache()
+{
+	CBaseTurret::Precache( );
+	PRECACHE_MODEL (kDeployedTurretModel);	
+}
+
+void CSentry::Spawn()
+{ 
+	Precache( );
+	SET_MODEL(ENT(pev), kDeployedTurretModel);
+	pev->health			= gSkillData.sentryHealth;
+	m_HackedGunPos		= Vector( 0, 0, 48 );
+	pev->view_ofs.z		= 48;
+	m_flMaxWait = TURRET_MAXWAIT;
+	m_flMaxSpin	= TURRET_MAXSPIN;
+
+	CBaseTurret::Spawn();
+	m_iRetractHeight = 64;
+	m_iDeployHeight = 64;
+	m_iMinPitch	= -60;
+	UTIL_SetSize(pev, Vector(-16, -16, -m_iRetractHeight), Vector(16, 16, m_iRetractHeight));
+
+	SetTouch(&CSentry::SentryTouch);
+	SetThink(&CSentry::Initialize);	
+	pev->nextthink = gpGlobals->time + 0.3; 
+}
+
+void CSentry::Shoot(Vector &vecSrc, Vector &vecDirToEnemy)
+{
+	FireBullets( 1, vecSrc, vecDirToEnemy, TURRET_SPREAD, this->GetRange(), BULLET_MONSTER_MP5, 1 );
+	
+	switch(RANDOM_LONG(0,2))
+	{
+	case 0: EMIT_SOUND(ENT(pev), CHAN_WEAPON, "weapons/hks1.wav", 1, ATTN_NORM); break;
+	case 1: EMIT_SOUND(ENT(pev), CHAN_WEAPON, "weapons/hks2.wav", 1, ATTN_NORM); break;
+	case 2: EMIT_SOUND(ENT(pev), CHAN_WEAPON, "weapons/hks3.wav", 1, ATTN_NORM); break;
+	}
+	pev->effects = pev->effects | EF_MUZZLEFLASH;
+}
+
+int CSentry::TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType)
+{
+	if ( !pev->takedamage )
+		return 0;
+
+//	if (!m_iOn)
+//	{
+//		SetThink( Deploy );
+//		SetUse( NULL );
+//		pev->nextthink = gpGlobals->time + 0.1;
+//	}
+
+	pev->health -= flDamage;
+	if (pev->health <= 0)
+	{
+		pev->health = 0;
+		pev->takedamage = DAMAGE_NO;
+		pev->dmgtime = gpGlobals->time;
+
+		ClearBits (pev->flags, FL_MONSTER); // why are they set in the first place???
+
+		SetUse(NULL);
+		SetThink(&CSentry::SentryDeath);
+		SUB_UseTargets( this, USE_ON, 0 ); // wake up others
+		pev->nextthink = gpGlobals->time + 0.1;
+
+		return 0;
+	}
+
+	return 1;
+}
+
+
+void CSentry::SentryTouch( CBaseEntity *pOther )
+{
+	if ( pOther && (pOther->IsPlayer() || (pOther->pev->flags & FL_MONSTER)) )
+	{
+		TakeDamage(pOther->pev, pOther->pev, 0, 0 );
+	}
+}
+
+
+void CSentry ::	SentryDeath( void )
+{
+	BOOL iActive = FALSE;
+
+	StudioFrameAdvance( );
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	if (pev->deadflag != DEAD_DEAD)
+	{
+		pev->deadflag = DEAD_DEAD;
+
+		float flRndSound = RANDOM_FLOAT ( 0 , 1 );
+
+		if ( flRndSound <= 0.33 )
+			EMIT_SOUND(ENT(pev), CHAN_BODY, "turret/tu_die.wav", 1.0, ATTN_NORM);
+		else if ( flRndSound <= 0.66 )
+			EMIT_SOUND(ENT(pev), CHAN_BODY, "turret/tu_die2.wav", 1.0, ATTN_NORM);
+		else 
+			EMIT_SOUND(ENT(pev), CHAN_BODY, "turret/tu_die3.wav", 1.0, ATTN_NORM);
+
+		EMIT_SOUND_DYN(ENT(pev), CHAN_STATIC, "turret/tu_active2.wav", 0, 0, SND_STOP, 100);
+
+		SetBoneController( 0, 0 );
+		SetBoneController( 1, 0 );
+
+		SetTurretAnim(TURRET_ANIM_DIE); 
+
+		pev->solid = SOLID_NOT;
+		pev->angles.y = UTIL_AngleMod( pev->angles.y + RANDOM_LONG( 0, 2 ) * 120 );
+
+		EyeOn( );
+	}
+
+	EyeOff( );
+
+	Vector vecSrc, vecAng;
+	GetAttachment( 1, vecSrc, vecAng );
+
+	if (pev->dmgtime + RANDOM_FLOAT( 0, 2 ) > gpGlobals->time)
+	{
+		// lots of smoke
+		MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+			WRITE_BYTE( TE_SMOKE );
+			WRITE_COORD( vecSrc.x + RANDOM_FLOAT( -16, 16 ) );
+			WRITE_COORD( vecSrc.y + RANDOM_FLOAT( -16, 16 ) );
+			WRITE_COORD( vecSrc.z - 32 );
+			WRITE_SHORT( g_sModelIndexSmoke );
+			WRITE_BYTE( 15 ); // scale * 10
+			WRITE_BYTE( 8 ); // framerate
+		MESSAGE_END();
+	}
+	
+	if (pev->dmgtime + RANDOM_FLOAT( 0, 8 ) > gpGlobals->time)
+	{
+		UTIL_Sparks( vecSrc );
+	}
+
+	if (m_fSequenceFinished && pev->dmgtime + 5 < gpGlobals->time)
+	{
+		pev->framerate = 0;
+		SetThink( NULL );
+	}
+}
+
diff --git a/main/source/dlls/turret.h b/main/source/dlls/turret.h
new file mode 100644
index 00000000..9ee8195d
--- /dev/null
+++ b/main/source/dlls/turret.h
@@ -0,0 +1,149 @@
+#ifndef TURRET_H
+#define TURRET_H
+
+#include "effects.h"
+#include "dlls/turretconst.h"
+
+class CBaseTurret : public CBaseMonster
+{
+public:
+	void Spawn(void);
+	virtual void Precache(void);
+	void KeyValue( KeyValueData *pkvd );
+	void EXPORT TurretUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	
+	virtual void TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType);
+	virtual int	 TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType );
+	virtual int	 Classify(void);
+	virtual int  GetRange() const;
+
+	virtual char* GetPingSound() const;
+	virtual char* GetActiveSound() const;
+	virtual char* GetAlertSound() const;
+	virtual char* GetDeploySound() const;
+	
+	int BloodColor( void ) { return DONT_BLEED; }
+	void GibMonster( void ) {}	// UNDONE: Throw turret gibs?
+	virtual void StopShooting() {};
+	virtual bool NeedsLineOfSight() const;
+
+	// Think functions
+
+	void EXPORT ActiveThink(void);
+	void EXPORT SearchThink(void);
+	void EXPORT AutoSearchThink(void);
+	void EXPORT TurretDeath(void);
+
+	virtual void EXPORT SpinDownCall(void) { m_iSpin = 0; }
+	virtual void EXPORT SpinUpCall(void) { m_iSpin = 1; }
+
+	// void SpinDown(void);
+	// float EXPORT SpinDownCall( void ) { return SpinDown(); }
+
+	// virtual float SpinDown(void) { return 0;}
+	// virtual float Retire(void) { return 0;}
+
+	void EXPORT Deploy(void);
+	void EXPORT Retire(void);
+	
+	void EXPORT Initialize(void);
+
+	virtual void Ping(void);
+	virtual void EyeOn(void);
+	virtual void EyeOff(void);
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	// other functions
+	void SetTurretAnim(TURRET_ANIM anim);
+	int MoveTurret(void);
+	virtual void Shoot(Vector &vecSrc, Vector &vecDirToEnemy) { };
+
+	float m_flMaxSpin;		// Max time to spin the barrel w/o a target
+	int m_iSpin;
+
+	CSprite *m_pEyeGlow;
+	int		m_eyeBrightness;
+
+	int	m_iDeployHeight;
+	int	m_iRetractHeight;
+	int m_iMinPitch;
+
+	int m_iBaseTurnRate;	// angles per second
+	float m_fTurnRate;		// actual turn rate
+	int m_iOrientation;		// 0 = floor, 1 = Ceiling
+	int	m_iOn;
+	int m_fBeserk;			// Sometimes this bitch will just freak out
+	int m_iAutoStart;		// true if the turret auto deploys when a target
+							// enters its range
+
+	Vector m_vecLastSight;
+	float m_flLastSight;	// Last time we saw a target
+	float m_flMaxWait;		// Max time to seach w/o a target
+	int m_iSearchSpeed;		// Not Used!
+
+	// movement
+	float	m_flStartYaw;
+	Vector	m_vecCurAngles;
+	Vector	m_vecGoalAngles;
+
+
+	float	m_flPingTime;	// Time until the next ping, used when searching
+	float	m_flSpinUpTime;	// Amount of time until the barrel should spin down when searching
+};
+
+class CTurret : public CBaseTurret
+{
+public:
+	void Spawn(void);
+	void Precache(void);
+	// Think functions
+	void SpinUpCall(void);
+	void SpinDownCall(void);
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	// other functions
+	void Shoot(Vector &vecSrc, Vector &vecDirToEnemy);
+
+private:
+	int m_iStartSpin;
+
+};
+
+
+class CMiniTurret : public CBaseTurret
+{
+public:
+	void Spawn( );
+	void Precache(void);
+	// other functions
+	void Shoot(Vector &vecSrc, Vector &vecDirToEnemy);
+};
+
+
+//=========================================================
+// Sentry gun - smallest turret, placed near grunt entrenchments
+//=========================================================
+class CSentry : public CBaseTurret
+{
+public:
+	void Spawn( );
+	void Precache(void);
+	// other functions
+	void Shoot(Vector &vecSrc, Vector &vecDirToEnemy);
+	int TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType);
+	void EXPORT SentryTouch( CBaseEntity *pOther );
+	void EXPORT SentryDeath( void );
+
+};
+
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/turretconst.h b/main/source/dlls/turretconst.h
new file mode 100644
index 00000000..204c05d8
--- /dev/null
+++ b/main/source/dlls/turretconst.h
@@ -0,0 +1,25 @@
+#ifndef TURRET_CONST_H
+#define TURRET_CONST_H
+
+#define TURRET_SHOTS	2
+#define TURRET_RANGE	(100 * 12)
+#define TURRET_SPREAD	Vector( 0, 0, 0 )
+#define TURRET_TURNRATE	30		//angles per 0.1 second
+#define TURRET_MAXWAIT	15		// seconds turret will stay active w/o a target
+#define TURRET_MAXSPIN	5		// seconds turret barrel will spin w/o a target
+#define TURRET_MACHINE_VOLUME	0.5
+
+typedef enum
+{
+	TURRET_ANIM_NONE = 0,
+		TURRET_ANIM_FIRE,
+		TURRET_ANIM_SPIN,
+		TURRET_ANIM_DEPLOY,
+		TURRET_ANIM_RETIRE,
+		TURRET_ANIM_DIE,
+} TURRET_ANIM;
+
+#define SF_MONSTER_TURRET_AUTOACTIVATE	32
+#define SF_MONSTER_TURRET_STARTINACTIVE	64
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/util.cpp b/main/source/dlls/util.cpp
new file mode 100644
index 00000000..ef0a3489
--- /dev/null
+++ b/main/source/dlls/util.cpp
@@ -0,0 +1,2655 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/*
+
+===== util.cpp ========================================================
+
+  Utility code.  Really not optional after all.
+
+*/
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "saverestore.h"
+#include <time.h>
+#include "shake.h"
+#include "decals.h"
+#include "player.h"
+#include "weapons.h"
+#include "gamerules.h"
+#include "mod/AvHServerUtil.h"
+//#include "mod/AvHSharedUtil.h"
+//#include "mod/AvHGamerules.h"
+
+extern int gmsgHudText2;
+
+float UTIL_WeaponTimeBase( void )
+{
+#if defined( CLIENT_WEAPONS )
+	return 0.0;
+#else
+	return gpGlobals->time;
+#endif
+}
+
+static unsigned int glSeed = 0; 
+
+unsigned int seed_table[ 256 ] =
+{
+	28985, 27138, 26457, 9451, 17764, 10909, 28790, 8716, 6361, 4853, 17798, 21977, 19643, 20662, 10834, 20103,
+	27067, 28634, 18623, 25849, 8576, 26234, 23887, 18228, 32587, 4836, 3306, 1811, 3035, 24559, 18399, 315,
+	26766, 907, 24102, 12370, 9674, 2972, 10472, 16492, 22683, 11529, 27968, 30406, 13213, 2319, 23620, 16823,
+	10013, 23772, 21567, 1251, 19579, 20313, 18241, 30130, 8402, 20807, 27354, 7169, 21211, 17293, 5410, 19223,
+	10255, 22480, 27388, 9946, 15628, 24389, 17308, 2370, 9530, 31683, 25927, 23567, 11694, 26397, 32602, 15031,
+	18255, 17582, 1422, 28835, 23607, 12597, 20602, 10138, 5212, 1252, 10074, 23166, 19823, 31667, 5902, 24630,
+	18948, 14330, 14950, 8939, 23540, 21311, 22428, 22391, 3583, 29004, 30498, 18714, 4278, 2437, 22430, 3439,
+	28313, 23161, 25396, 13471, 19324, 15287, 2563, 18901, 13103, 16867, 9714, 14322, 15197, 26889, 19372, 26241,
+	31925, 14640, 11497, 8941, 10056, 6451, 28656, 10737, 13874, 17356, 8281, 25937, 1661, 4850, 7448, 12744,
+	21826, 5477, 10167, 16705, 26897, 8839, 30947, 27978, 27283, 24685, 32298, 3525, 12398, 28726, 9475, 10208,
+	617, 13467, 22287, 2376, 6097, 26312, 2974, 9114, 21787, 28010, 4725, 15387, 3274, 10762, 31695, 17320,
+	18324, 12441, 16801, 27376, 22464, 7500, 5666, 18144, 15314, 31914, 31627, 6495, 5226, 31203, 2331, 4668,
+	12650, 18275, 351, 7268, 31319, 30119, 7600, 2905, 13826, 11343, 13053, 15583, 30055, 31093, 5067, 761,
+	9685, 11070, 21369, 27155, 3663, 26542, 20169, 12161, 15411, 30401, 7580, 31784, 8985, 29367, 20989, 14203,
+	29694, 21167, 10337, 1706, 28578, 887, 3373, 19477, 14382, 675, 7033, 15111, 26138, 12252, 30996, 21409,
+	25678, 18555, 13256, 23316, 22407, 16727, 991, 9236, 5373, 29402, 6117, 15241, 27715, 19291, 19888, 19847
+};
+
+unsigned int U_Random( void ) 
+{ 
+	glSeed *= 69069; 
+	glSeed += seed_table[ glSeed & 0xff ];
+ 
+	return ( ++glSeed & 0x0fffffff ); 
+} 
+
+void U_Srand( unsigned int seed )
+{
+	glSeed = seed_table[ seed & 0xff ];
+}
+
+/*
+=====================
+UTIL_SharedRandomLong
+=====================
+*/
+int UTIL_SharedRandomLong( unsigned int seed, int low, int high )
+{
+	unsigned int range;
+
+	U_Srand( (int)seed + low + high );
+
+	range = high - low + 1;
+	if ( !(range - 1) )
+	{
+		return low;
+	}
+	else
+	{
+		int offset;
+		int rnum;
+
+		rnum = U_Random();
+
+		offset = rnum % range;
+
+		return (low + offset);
+	}
+}
+
+/*
+=====================
+UTIL_SharedRandomFloat
+=====================
+*/
+float UTIL_SharedRandomFloat( unsigned int seed, float low, float high )
+{
+	U_Srand( (int)seed + *(int *)&low + *(int *)&high );
+
+	U_Random();
+	U_Random();
+
+	float range = high - low;
+	if ( !range )
+	{
+		return low;
+	}
+	else
+	{
+		int tensixrand;
+		float offset;
+
+		tensixrand = U_Random() & 65535;
+
+		offset = (float)tensixrand / 65536.0;
+
+		return (low + offset * range );
+	}
+}
+
+void UTIL_ParametricRocket( entvars_t *pev, Vector vecOrigin, Vector vecAngles, edict_t *owner )
+{	
+	pev->startpos = vecOrigin;
+	// Trace out line to end pos
+	TraceResult tr;
+	UTIL_MakeVectors( vecAngles );
+	UTIL_TraceLine( pev->startpos, pev->startpos + gpGlobals->v_forward * 8192, ignore_monsters, owner, &tr);
+	pev->endpos = tr.vecEndPos;
+
+	// Now compute how long it will take based on current velocity
+	Vector vecTravel = pev->endpos - pev->startpos;
+	float travelTime = 0.0;
+	if ( pev->velocity.Length() > 0 )
+	{
+		travelTime = vecTravel.Length() / pev->velocity.Length();
+	}
+	pev->starttime = gpGlobals->time;
+	pev->impacttime = gpGlobals->time + travelTime;
+}
+
+int g_groupmask = 0;
+int g_groupop = 0;
+
+// Normal overrides
+void UTIL_SetGroupTrace( int groupmask, int op )
+{
+	g_groupmask		= groupmask;
+	g_groupop		= op;
+
+	ENGINE_SETGROUPMASK( g_groupmask, g_groupop );
+}
+
+void UTIL_UnsetGroupTrace( void )
+{
+	g_groupmask		= 0;
+	g_groupop		= 0;
+
+	ENGINE_SETGROUPMASK( 0, 0 );
+}
+
+// Smart version, it'll clean itself up when it pops off stack
+UTIL_GroupTrace::UTIL_GroupTrace( int groupmask, int op )
+{
+	m_oldgroupmask	= g_groupmask;
+	m_oldgroupop	= g_groupop;
+
+	g_groupmask		= groupmask;
+	g_groupop		= op;
+
+	ENGINE_SETGROUPMASK( g_groupmask, g_groupop );
+}
+
+UTIL_GroupTrace::~UTIL_GroupTrace( void )
+{
+	g_groupmask		=	m_oldgroupmask;
+	g_groupop		=	m_oldgroupop;
+
+	ENGINE_SETGROUPMASK( g_groupmask, g_groupop );
+}
+
+TYPEDESCRIPTION	gEntvarsDescription[] = 
+{
+	DEFINE_ENTITY_FIELD( classname, FIELD_STRING ),
+	DEFINE_ENTITY_GLOBAL_FIELD( globalname, FIELD_STRING ),
+	
+	DEFINE_ENTITY_FIELD( origin, FIELD_POSITION_VECTOR ),
+	DEFINE_ENTITY_FIELD( oldorigin, FIELD_POSITION_VECTOR ),
+	DEFINE_ENTITY_FIELD( velocity, FIELD_VECTOR ),
+	DEFINE_ENTITY_FIELD( basevelocity, FIELD_VECTOR ),
+	DEFINE_ENTITY_FIELD( movedir, FIELD_VECTOR ),
+
+	DEFINE_ENTITY_FIELD( angles, FIELD_VECTOR ),
+	DEFINE_ENTITY_FIELD( avelocity, FIELD_VECTOR ),
+	DEFINE_ENTITY_FIELD( punchangle, FIELD_VECTOR ),
+	DEFINE_ENTITY_FIELD( v_angle, FIELD_VECTOR ),
+	DEFINE_ENTITY_FIELD( fixangle, FIELD_FLOAT ),
+	DEFINE_ENTITY_FIELD( idealpitch, FIELD_FLOAT ),
+	DEFINE_ENTITY_FIELD( pitch_speed, FIELD_FLOAT ),
+	DEFINE_ENTITY_FIELD( ideal_yaw, FIELD_FLOAT ),
+	DEFINE_ENTITY_FIELD( yaw_speed, FIELD_FLOAT ),
+
+	DEFINE_ENTITY_FIELD( modelindex, FIELD_INTEGER ),
+	DEFINE_ENTITY_GLOBAL_FIELD( model, FIELD_MODELNAME ),
+
+	DEFINE_ENTITY_FIELD( viewmodel, FIELD_MODELNAME ),
+	DEFINE_ENTITY_FIELD( weaponmodel, FIELD_MODELNAME ),
+
+	DEFINE_ENTITY_FIELD( absmin, FIELD_POSITION_VECTOR ),
+	DEFINE_ENTITY_FIELD( absmax, FIELD_POSITION_VECTOR ),
+	DEFINE_ENTITY_GLOBAL_FIELD( mins, FIELD_VECTOR ),
+	DEFINE_ENTITY_GLOBAL_FIELD( maxs, FIELD_VECTOR ),
+	DEFINE_ENTITY_GLOBAL_FIELD( size, FIELD_VECTOR ),
+
+	DEFINE_ENTITY_FIELD( ltime, FIELD_TIME ),
+	DEFINE_ENTITY_FIELD( nextthink, FIELD_TIME ),
+
+	DEFINE_ENTITY_FIELD( solid, FIELD_INTEGER ),
+	DEFINE_ENTITY_FIELD( movetype, FIELD_INTEGER ),
+
+	DEFINE_ENTITY_FIELD( skin, FIELD_INTEGER ),
+	DEFINE_ENTITY_FIELD( body, FIELD_INTEGER ),
+	DEFINE_ENTITY_FIELD( effects, FIELD_INTEGER ),
+
+	DEFINE_ENTITY_FIELD( gravity, FIELD_FLOAT ),
+	DEFINE_ENTITY_FIELD( friction, FIELD_FLOAT ),
+	DEFINE_ENTITY_FIELD( light_level, FIELD_FLOAT ),
+
+	DEFINE_ENTITY_FIELD( frame, FIELD_FLOAT ),
+	DEFINE_ENTITY_FIELD( scale, FIELD_FLOAT ),
+	DEFINE_ENTITY_FIELD( sequence, FIELD_INTEGER ),
+	DEFINE_ENTITY_FIELD( animtime, FIELD_TIME ),
+	DEFINE_ENTITY_FIELD( framerate, FIELD_FLOAT ),
+	DEFINE_ENTITY_FIELD( controller, FIELD_INTEGER ),
+	DEFINE_ENTITY_FIELD( blending, FIELD_INTEGER ),
+
+	DEFINE_ENTITY_FIELD( rendermode, FIELD_INTEGER ),
+	DEFINE_ENTITY_FIELD( renderamt, FIELD_FLOAT ),
+	DEFINE_ENTITY_FIELD( rendercolor, FIELD_VECTOR ),
+	DEFINE_ENTITY_FIELD( renderfx, FIELD_INTEGER ),
+
+	DEFINE_ENTITY_FIELD( health, FIELD_FLOAT ),
+	DEFINE_ENTITY_FIELD( frags, FIELD_FLOAT ),
+	DEFINE_ENTITY_FIELD( weapons, FIELD_INTEGER ),
+	DEFINE_ENTITY_FIELD( takedamage, FIELD_FLOAT ),
+
+	DEFINE_ENTITY_FIELD( deadflag, FIELD_FLOAT ),
+	DEFINE_ENTITY_FIELD( view_ofs, FIELD_VECTOR ),
+	DEFINE_ENTITY_FIELD( button, FIELD_INTEGER ),
+	DEFINE_ENTITY_FIELD( impulse, FIELD_INTEGER ),
+
+	DEFINE_ENTITY_FIELD( chain, FIELD_EDICT ),
+	DEFINE_ENTITY_FIELD( dmg_inflictor, FIELD_EDICT ),
+	DEFINE_ENTITY_FIELD( enemy, FIELD_EDICT ),
+	DEFINE_ENTITY_FIELD( aiment, FIELD_EDICT ),
+	DEFINE_ENTITY_FIELD( owner, FIELD_EDICT ),
+	DEFINE_ENTITY_FIELD( groundentity, FIELD_EDICT ),
+
+	DEFINE_ENTITY_FIELD( spawnflags, FIELD_INTEGER ),
+	DEFINE_ENTITY_FIELD( flags, FIELD_FLOAT ),
+
+	DEFINE_ENTITY_FIELD( colormap, FIELD_INTEGER ),
+	DEFINE_ENTITY_FIELD( team, FIELD_INTEGER ),
+
+	DEFINE_ENTITY_FIELD( max_health, FIELD_FLOAT ),
+	DEFINE_ENTITY_FIELD( teleport_time, FIELD_TIME ),
+	DEFINE_ENTITY_FIELD( armortype, FIELD_FLOAT ),
+	DEFINE_ENTITY_FIELD( armorvalue, FIELD_FLOAT ),
+	DEFINE_ENTITY_FIELD( waterlevel, FIELD_INTEGER ),
+	DEFINE_ENTITY_FIELD( watertype, FIELD_INTEGER ),
+
+	// Having these fields be local to the individual levels makes it easier to test those levels individually.
+	DEFINE_ENTITY_GLOBAL_FIELD( target, FIELD_STRING ),
+	DEFINE_ENTITY_GLOBAL_FIELD( targetname, FIELD_STRING ),
+	DEFINE_ENTITY_FIELD( netname, FIELD_STRING ),
+	DEFINE_ENTITY_FIELD( message, FIELD_STRING ),
+
+	DEFINE_ENTITY_FIELD( dmg_take, FIELD_FLOAT ),
+	DEFINE_ENTITY_FIELD( dmg_save, FIELD_FLOAT ),
+	DEFINE_ENTITY_FIELD( dmg, FIELD_FLOAT ),
+	DEFINE_ENTITY_FIELD( dmgtime, FIELD_TIME ),
+
+	DEFINE_ENTITY_FIELD( noise, FIELD_SOUNDNAME ),
+	DEFINE_ENTITY_FIELD( noise1, FIELD_SOUNDNAME ),
+	DEFINE_ENTITY_FIELD( noise2, FIELD_SOUNDNAME ),
+	DEFINE_ENTITY_FIELD( noise3, FIELD_SOUNDNAME ),
+	DEFINE_ENTITY_FIELD( speed, FIELD_FLOAT ),
+	DEFINE_ENTITY_FIELD( air_finished, FIELD_TIME ),
+	DEFINE_ENTITY_FIELD( pain_finished, FIELD_TIME ),
+	DEFINE_ENTITY_FIELD( radsuit_finished, FIELD_TIME ),
+};
+
+#define ENTVARS_COUNT		(sizeof(gEntvarsDescription)/sizeof(gEntvarsDescription[0]))
+
+
+#ifdef	DEBUG
+edict_t *DBG_EntOfVars( const entvars_t *pev )
+{
+	if (pev->pContainingEntity != NULL)
+		return pev->pContainingEntity;
+	ALERT(at_console, "entvars_t pContainingEntity is NULL, calling into engine");
+	edict_t* pent = (*g_engfuncs.pfnFindEntityByVars)((entvars_t*)pev);
+	if (pent == NULL)
+		ALERT(at_console, "DAMN!  Even the engine couldn't FindEntityByVars!");
+	((entvars_t *)pev)->pContainingEntity = pent;
+	return pent;
+}
+#endif //DEBUG
+
+
+//#ifdef	DEBUG
+//	void
+//DBG_AssertFunction(
+//	BOOL		fExpr,
+//	const char*	szExpr,
+//	const char*	szFile,
+//	int			szLine,
+//	const char*	szMessage)
+//	{
+//	if (fExpr)
+//		return;
+//	char szOut[512];
+//	if (szMessage != NULL)
+//		sprintf(szOut, "ASSERT FAILED:\n %s \n(%s@%d)\n%s", szExpr, szFile, szLine, szMessage);
+//	else
+//		sprintf(szOut, "ASSERT FAILED:\n %s \n(%s@%d)", szExpr, szFile, szLine);
+//	ALERT(at_console, szOut);
+//	}
+//#endif	// DEBUG
+
+BOOL UTIL_GetNextBestWeapon( CBasePlayer *pPlayer, CBasePlayerItem *pCurrentWeapon )
+{
+	return g_pGameRules->GetNextBestWeapon( pPlayer, pCurrentWeapon );
+}
+
+// ripped this out of the engine
+float	UTIL_AngleMod(float a)
+{
+	if (a < 0)
+	{
+		a = a + 360 * ((int)(a / 360) + 1);
+	}
+	else if (a >= 360)
+	{
+		a = a - 360 * ((int)(a / 360));
+	}
+	// a = (360.0/65536) * ((int)(a*(65536/360.0)) & 65535);
+	return a;
+}
+
+float UTIL_AngleDiff( float destAngle, float srcAngle )
+{
+	float delta;
+
+	delta = destAngle - srcAngle;
+	if ( destAngle > srcAngle )
+	{
+		if ( delta >= 180 )
+			delta -= 360;
+	}
+	else
+	{
+		if ( delta <= -180 )
+			delta += 360;
+	}
+	return delta;
+}
+
+Vector UTIL_VecToAngles( const Vector &vec )
+{
+	float rgflVecOut[3];
+	VEC_TO_ANGLES(vec, rgflVecOut);
+	return Vector(rgflVecOut);
+}
+	
+//	float UTIL_MoveToOrigin( edict_t *pent, const Vector vecGoal, float flDist, int iMoveType )
+void UTIL_MoveToOrigin( edict_t *pent, const Vector &vecGoal, float flDist, int iMoveType )
+{
+	float rgfl[3];
+	vecGoal.CopyToArray(rgfl);
+//		return MOVE_TO_ORIGIN ( pent, rgfl, flDist, iMoveType ); 
+	MOVE_TO_ORIGIN ( pent, rgfl, flDist, iMoveType ); 
+}
+
+
+int UTIL_EntitiesInBox( CBaseEntity **pList, int listMax, const Vector &mins, const Vector &maxs, int flagMask )
+{
+	edict_t		*pEdict = g_engfuncs.pfnPEntityOfEntIndex( 1 );
+	CBaseEntity *pEntity;
+	int			count;
+
+	count = 0;
+
+	if ( !pEdict )
+		return count;
+
+	for ( int i = 1; i < gpGlobals->maxEntities; i++, pEdict++ )
+	{
+		if ( pEdict->free )	// Not in use
+			continue;
+		
+		if ( flagMask && !(pEdict->v.flags & flagMask) )	// Does it meet the criteria?
+			continue;
+
+		if ( mins.x > pEdict->v.absmax.x ||
+			 mins.y > pEdict->v.absmax.y ||
+			 mins.z > pEdict->v.absmax.z ||
+			 maxs.x < pEdict->v.absmin.x ||
+			 maxs.y < pEdict->v.absmin.y ||
+			 maxs.z < pEdict->v.absmin.z )
+			 continue;
+
+		pEntity = CBaseEntity::Instance(pEdict);
+		if ( !pEntity )
+			continue;
+
+		pList[ count ] = pEntity;
+		count++;
+
+		if ( count >= listMax )
+			return count;
+	}
+
+	return count;
+}
+
+
+int UTIL_MonstersInSphere( CBaseEntity **pList, int listMax, const Vector &center, float radius )
+{
+	edict_t		*pEdict = g_engfuncs.pfnPEntityOfEntIndex( 1 );
+	CBaseEntity *pEntity;
+	int			count;
+	float		distance, delta;
+
+	count = 0;
+	float radiusSquared = radius * radius;
+
+	if ( !pEdict )
+		return count;
+
+	for ( int i = 1; i < gpGlobals->maxEntities; i++, pEdict++ )
+	{
+		if ( pEdict->free )	// Not in use
+			continue;
+		
+		if ( !(pEdict->v.flags & (FL_CLIENT|FL_MONSTER)) )	// Not a client/monster ?
+			continue;
+
+		// Use origin for X & Y since they are centered for all monsters
+		// Now X
+		delta = center.x - pEdict->v.origin.x;//(pEdict->v.absmin.x + pEdict->v.absmax.x)*0.5;
+		delta *= delta;
+
+		if ( delta > radiusSquared )
+			continue;
+		distance = delta;
+		
+		// Now Y
+		delta = center.y - pEdict->v.origin.y;//(pEdict->v.absmin.y + pEdict->v.absmax.y)*0.5;
+		delta *= delta;
+
+		distance += delta;
+		if ( distance > radiusSquared )
+			continue;
+
+		// Now Z
+		delta = center.z - (pEdict->v.absmin.z + pEdict->v.absmax.z)*0.5;
+		delta *= delta;
+
+		distance += delta;
+		if ( distance > radiusSquared )
+			continue;
+
+		pEntity = CBaseEntity::Instance(pEdict);
+		if ( !pEntity )
+			continue;
+
+		pList[ count ] = pEntity;
+		count++;
+
+		if ( count >= listMax )
+			return count;
+	}
+
+
+	return count;
+}
+
+
+CBaseEntity *UTIL_FindEntityInSphere( CBaseEntity *pStartEntity, const Vector &vecCenter, float flRadius )
+{
+	edict_t	*pentEntity;
+
+	if (pStartEntity)
+		pentEntity = pStartEntity->edict();
+	else
+		pentEntity = NULL;
+
+	pentEntity = FIND_ENTITY_IN_SPHERE( pentEntity, vecCenter, flRadius);
+
+	if (!FNullEnt(pentEntity))
+		return CBaseEntity::Instance(pentEntity);
+	return NULL;
+}
+
+int UTIL_CountEntitiesInSphere(const Vector& inVecCenter, float inRadius, const char* inClassName)
+{
+	int theNumEntities = 0;
+
+	CBaseEntity* theEntity = NULL;
+	while((theEntity = UTIL_FindEntityInSphere(theEntity, inVecCenter, inRadius)) != NULL)
+	{
+		if(!strcmp(STRING(theEntity->pev->classname), inClassName))
+		{
+			theNumEntities++;
+		}
+	}
+
+	return theNumEntities;
+}
+
+
+CBaseEntity *UTIL_FindEntityByString( CBaseEntity *pStartEntity, const char *szKeyword, const char *szValue )
+{
+	edict_t	*pentEntity;
+
+	if (pStartEntity)
+		pentEntity = pStartEntity->edict();
+	else
+		pentEntity = NULL;
+
+	pentEntity = FIND_ENTITY_BY_STRING( pentEntity, szKeyword, szValue );
+
+	if (!FNullEnt(pentEntity))
+		return CBaseEntity::Instance(pentEntity);
+	return NULL;
+}
+
+CBaseEntity *UTIL_FindEntityByClassname( CBaseEntity *pStartEntity, const char *szName )
+{
+	return UTIL_FindEntityByString( pStartEntity, "classname", szName );
+}
+
+CBaseEntity *UTIL_FindEntityByTargetname( CBaseEntity *pStartEntity, const char *szName )
+{
+	return UTIL_FindEntityByString( pStartEntity, "targetname", szName );
+}
+
+
+CBaseEntity *UTIL_FindEntityGeneric( const char *szWhatever, Vector &vecSrc, float flRadius )
+{
+	CBaseEntity *pEntity = NULL;
+
+	pEntity = UTIL_FindEntityByTargetname( NULL, szWhatever );
+	if (pEntity)
+		return pEntity;
+
+	CBaseEntity *pSearch = NULL;
+	float flMaxDist2 = flRadius * flRadius;
+	while ((pSearch = UTIL_FindEntityByClassname( pSearch, szWhatever )) != NULL)
+	{
+		float flDist2 = (pSearch->pev->origin - vecSrc).Length();
+		flDist2 = flDist2 * flDist2;
+		if (flMaxDist2 > flDist2)
+		{
+			pEntity = pSearch;
+			flMaxDist2 = flDist2;
+		}
+	}
+	return pEntity;
+}
+
+
+// returns a CBaseEntity pointer to a player by index.  Only returns if the player is spawned and connected
+// otherwise returns NULL
+// Index is 1 based
+CBaseEntity	*UTIL_PlayerByIndex( int playerIndex )
+{
+	CBaseEntity *pPlayer = NULL;
+
+	if ( playerIndex > 0 && playerIndex <= gpGlobals->maxClients )
+	{
+		edict_t *pPlayerEdict = INDEXENT( playerIndex );
+		if ( pPlayerEdict && !pPlayerEdict->free )
+		{
+			pPlayer = CBaseEntity::Instance( pPlayerEdict );
+		}
+	}
+	
+	return pPlayer;
+}
+
+
+void UTIL_MakeVectors( const Vector &vecAngles )
+{
+	MAKE_VECTORS( vecAngles );
+}
+
+
+void UTIL_MakeAimVectors( const Vector &vecAngles )
+{
+	float rgflVec[3];
+	vecAngles.CopyToArray(rgflVec);
+	rgflVec[0] = -rgflVec[0];
+	MAKE_VECTORS(rgflVec);
+}
+
+
+#define SWAP(a,b,temp)	((temp)=(a),(a)=(b),(b)=(temp))
+
+void UTIL_MakeInvVectors( const Vector &vec, globalvars_t *pgv )
+{
+	MAKE_VECTORS(vec);
+
+	float tmp;
+	pgv->v_right = pgv->v_right * -1;
+
+	SWAP(pgv->v_forward.y, pgv->v_right.x, tmp);
+	SWAP(pgv->v_forward.z, pgv->v_up.x, tmp);
+	SWAP(pgv->v_right.z, pgv->v_up.y, tmp);
+}
+
+
+void UTIL_EmitAmbientSound( edict_t *entity, const Vector &vecOrigin, const char *samp, float vol, float attenuation, int fFlags, int pitch )
+{
+	float rgfl[3];
+	vecOrigin.CopyToArray(rgfl);
+
+	if (samp && *samp == '!')
+	{
+		char name[32];
+		if (SENTENCEG_Lookup(samp, name) >= 0)
+			EMIT_AMBIENT_SOUND(entity, rgfl, name, vol, attenuation, fFlags, pitch);
+	}
+	else
+		EMIT_AMBIENT_SOUND(entity, rgfl, samp, vol, attenuation, fFlags, pitch);
+}
+
+static unsigned short FixedUnsigned16( float value, float scale )
+{
+	int output;
+
+	output = value * scale;
+	if ( output < 0 )
+		output = 0;
+	if ( output > 0xFFFF )
+		output = 0xFFFF;
+
+	return (unsigned short)output;
+}
+
+static short FixedSigned16( float value, float scale )
+{
+	int output;
+
+	output = value * scale;
+
+	if ( output > 32767 )
+		output = 32767;
+
+	if ( output < -32768 )
+		output = -32768;
+
+	return (short)output;
+}
+
+// Shake the screen of all clients within radius
+// radius == 0, shake all clients
+// UNDONE: Allow caller to shake clients not ONGROUND?
+// UNDONE: Fix falloff model (disabled)?
+// UNDONE: Affect user controls?
+void UTIL_ScreenShake( const Vector &center, float amplitude, float frequency, float duration, float radius )
+{
+	int			i;
+	float		localAmplitude;
+	ScreenShake	shake;
+
+	shake.duration = FixedUnsigned16( duration, 1<<12 );		// 4.12 fixed
+	shake.frequency = FixedUnsigned16( frequency, 1<<8 );	// 8.8 fixed
+
+	for ( i = 1; i <= gpGlobals->maxClients; i++ )
+	{
+		CBaseEntity *pPlayer = UTIL_PlayerByIndex( i );
+
+		if ( !pPlayer /*|| !(pPlayer->pev->flags & FL_ONGROUND)*/ )	// Don't shake if not onground
+			continue;
+
+		localAmplitude = 0;
+
+		if ( radius <= 0 )
+			localAmplitude = amplitude;
+		else
+		{
+			Vector delta = center - pPlayer->pev->origin;
+			float distance = delta.Length();
+	
+			// Had to get rid of this falloff - it didn't work well
+			if ( distance < radius )
+				localAmplitude = amplitude;//radius - distance;
+		}
+		if ( localAmplitude )
+		{
+			shake.amplitude = FixedUnsigned16( localAmplitude, 1<<12 );		// 4.12 fixed
+			
+			MESSAGE_BEGIN( MSG_ONE, gmsgShake, NULL, pPlayer->edict() );		// use the magic #1 for "one client"
+				
+				WRITE_SHORT( shake.amplitude );				// shake amount
+				WRITE_SHORT( shake.duration );				// shake lasts this long
+				WRITE_SHORT( shake.frequency );				// shake noise frequency
+
+			MESSAGE_END();
+		}
+	}
+}
+
+
+
+void UTIL_ScreenShakeAll( const Vector &center, float amplitude, float frequency, float duration )
+{
+	UTIL_ScreenShake( center, amplitude, frequency, duration, 0 );
+}
+
+
+void UTIL_ScreenFadeBuild( ScreenFade &fade, const Vector &color, float fadeTime, float fadeHold, int alpha, int flags )
+{
+	fade.duration = FixedUnsigned16( fadeTime, 1<<12 );		// 4.12 fixed
+	fade.holdTime = FixedUnsigned16( fadeHold, 1<<12 );		// 4.12 fixed
+	fade.r = (int)color.x;
+	fade.g = (int)color.y;
+	fade.b = (int)color.z;
+	fade.a = alpha;
+	fade.fadeFlags = flags;
+}
+
+
+void UTIL_ScreenFadeWrite( const ScreenFade &fade, CBaseEntity *pEntity )
+{
+	if ( !pEntity || !pEntity->IsNetClient() )
+		return;
+
+	MESSAGE_BEGIN( MSG_ONE, gmsgFade, NULL, pEntity->edict() );		// use the magic #1 for "one client"
+		
+		WRITE_SHORT( fade.duration );		// fade lasts this long
+		WRITE_SHORT( fade.holdTime );		// fade lasts this long
+		WRITE_SHORT( fade.fadeFlags );		// fade type (in / out)
+		WRITE_BYTE( fade.r );				// fade red
+		WRITE_BYTE( fade.g );				// fade green
+		WRITE_BYTE( fade.b );				// fade blue
+		WRITE_BYTE( fade.a );				// fade blue
+
+	MESSAGE_END();
+}
+
+
+void UTIL_ScreenFadeAll( const Vector &color, float fadeTime, float fadeHold, int alpha, int flags )
+{
+	int			i;
+	ScreenFade	fade;
+
+
+	UTIL_ScreenFadeBuild( fade, color, fadeTime, fadeHold, alpha, flags );
+
+	for ( i = 1; i <= gpGlobals->maxClients; i++ )
+	{
+		CBaseEntity *pPlayer = UTIL_PlayerByIndex( i );
+	
+		UTIL_ScreenFadeWrite( fade, pPlayer );
+	}
+}
+
+
+void UTIL_ScreenFade( CBaseEntity *pEntity, const Vector &color, float fadeTime, float fadeHold, int alpha, int flags )
+{
+	ScreenFade	fade;
+
+	UTIL_ScreenFadeBuild( fade, color, fadeTime, fadeHold, alpha, flags );
+	UTIL_ScreenFadeWrite( fade, pEntity );
+}
+
+
+void UTIL_HudMessage( CBaseEntity *pEntity, const hudtextparms_t &textparms, const char *pMessage )
+{
+	if ( !pEntity || !pEntity->IsNetClient() )
+		return;
+
+	MESSAGE_BEGIN( MSG_ONE, SVC_TEMPENTITY, NULL, pEntity->edict() );
+		WRITE_BYTE( TE_TEXTMESSAGE );
+		WRITE_BYTE( textparms.channel & 0xFF );
+
+		WRITE_SHORT( FixedSigned16( textparms.x, 1<<13 ) );
+		WRITE_SHORT( FixedSigned16( textparms.y, 1<<13 ) );
+		WRITE_BYTE( textparms.effect );
+
+		WRITE_BYTE( textparms.r1 );
+		WRITE_BYTE( textparms.g1 );
+		WRITE_BYTE( textparms.b1 );
+		WRITE_BYTE( textparms.a1 );
+
+		WRITE_BYTE( textparms.r2 );
+		WRITE_BYTE( textparms.g2 );
+		WRITE_BYTE( textparms.b2 );
+		WRITE_BYTE( textparms.a2 );
+
+		WRITE_SHORT( FixedUnsigned16( textparms.fadeinTime, 1<<8 ) );
+		WRITE_SHORT( FixedUnsigned16( textparms.fadeoutTime, 1<<8 ) );
+		WRITE_SHORT( FixedUnsigned16( textparms.holdTime, 1<<8 ) );
+
+		if ( textparms.effect == 2 )
+			WRITE_SHORT( FixedUnsigned16( textparms.fxTime, 1<<8 ) );
+		
+		if ( strlen( pMessage ) < 512 )
+		{
+			WRITE_STRING( pMessage );
+		}
+		else
+		{
+			char tmp[512];
+			strncpy( tmp, pMessage, 511 );
+			tmp[511] = 0;
+			WRITE_STRING( tmp );
+		}
+	MESSAGE_END();
+}
+
+void UTIL_HudMessageAll( const hudtextparms_t &textparms, const char *pMessage )
+{
+	int			i;
+
+	for ( i = 1; i <= gpGlobals->maxClients; i++ )
+	{
+		CBaseEntity *pPlayer = UTIL_PlayerByIndex( i );
+		if ( pPlayer )
+			UTIL_HudMessage( pPlayer, textparms, pMessage );
+	}
+}
+
+					 
+extern int gmsgTextMsg, gmsgSayText;
+void UTIL_ClientPrintAll( int msg_dest, const char *msg_name, const char *param1, const char *param2, const char *param3, const char *param4 )
+{
+	MESSAGE_BEGIN( MSG_ALL, gmsgTextMsg );
+		WRITE_BYTE( msg_dest );
+		WRITE_STRING( msg_name );
+
+		if ( param1 )
+			WRITE_STRING( param1 );
+		if ( param2 )
+			WRITE_STRING( param2 );
+		if ( param3 )
+			WRITE_STRING( param3 );
+		if ( param4 )
+			WRITE_STRING( param4 );
+
+	MESSAGE_END();
+}
+
+void ClientPrint( entvars_t *client, int msg_dest, const char *msg_name, const char *param1, const char *param2, const char *param3, const char *param4 )
+{
+	MESSAGE_BEGIN( MSG_ONE, gmsgTextMsg, NULL, client );
+		WRITE_BYTE( msg_dest );
+		WRITE_STRING( msg_name );
+
+		if ( param1 )
+			WRITE_STRING( param1 );
+		if ( param2 )
+			WRITE_STRING( param2 );
+		if ( param3 )
+			WRITE_STRING( param3 );
+		if ( param4 )
+			WRITE_STRING( param4 );
+
+	MESSAGE_END();
+}
+
+void UTIL_SayText( const char *pText, CBaseEntity *pEntity, int inEntIndex)
+{
+	if ( !pEntity->IsNetClient() )
+		return;
+
+	string theLocation(" ");
+
+	if(inEntIndex == -1)
+	{
+		inEntIndex = pEntity->entindex();
+	}
+	else
+	{
+		CBaseEntity* theSpeakingPlayer = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(inEntIndex));
+		if(theSpeakingPlayer)
+		{
+			theLocation = AvHSUGetLocationText(theSpeakingPlayer);
+		}
+	}
+
+	MESSAGE_BEGIN( MSG_ONE, gmsgSayText, NULL, pEntity->edict() );
+		WRITE_BYTE( inEntIndex );
+		WRITE_STRING( pText );
+		WRITE_STRING( theLocation.c_str() );
+	MESSAGE_END();
+}
+
+void UTIL_SayTextAll( const char *pText, CBaseEntity *pEntity, int inEntIndex)
+{
+	string theLocation(" ");
+
+	if(inEntIndex == -1)
+	{
+		inEntIndex = pEntity->entindex();
+	}
+	else
+	{
+		CBaseEntity* theSpeakingPlayer = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(inEntIndex));
+		if(theSpeakingPlayer)
+		{
+			theLocation = AvHSUGetLocationText(theSpeakingPlayer);
+		}
+	}
+
+	MESSAGE_BEGIN( MSG_ALL, gmsgSayText, NULL );
+		WRITE_BYTE( inEntIndex );
+		WRITE_STRING( pText );
+		WRITE_STRING(theLocation.c_str());
+	MESSAGE_END();
+}
+
+void UTIL_Tutorial( CBaseEntity *pEntity, const char *pMessage )
+{
+	// TODO: Be able to turn these off as a preference
+	hudtextparms_t	theTextParms;
+
+	// Init text parms
+	theTextParms.x = -1;
+	theTextParms.y = .8;
+	theTextParms.effect = 0;
+	theTextParms.r1 = 240;
+	theTextParms.g1 = 240;
+	theTextParms.b1 = 240;
+	theTextParms.a1 = 128;
+	theTextParms.r2 = 240;
+	theTextParms.g2 = 240;
+	theTextParms.b2 = 240;
+	theTextParms.a2 = 128;
+	theTextParms.fadeinTime = .3f;
+	theTextParms.fadeoutTime = .3f;
+	theTextParms.holdTime = 6.0f;
+	theTextParms.fxTime = .25f;
+	theTextParms.channel = 1;
+
+	UTIL_HudMessage( pEntity, theTextParms, pMessage);
+}
+
+void UTIL_Error( CBaseEntity *pEntity, const char *pMessage )
+{
+	hudtextparms_t	theTextParms;
+
+	// Init text parms
+	theTextParms.x = -1;
+	theTextParms.y = .8;
+	theTextParms.effect = 0;
+	theTextParms.r1 = 240;
+	theTextParms.g1 = 100;
+	theTextParms.b1 = 100;
+	theTextParms.a1 = 128;
+	theTextParms.r2 = 240;
+	theTextParms.g2 = 100;
+	theTextParms.b2 = 100;
+	theTextParms.a2 = 128;
+	theTextParms.fadeinTime = .3f;
+	theTextParms.fadeoutTime = .3f;
+	theTextParms.holdTime = 2.0f;
+	theTextParms.fxTime = .25f;
+	theTextParms.channel = 1;
+
+	UTIL_HudMessage( pEntity, theTextParms, pMessage);
+}
+
+char *UTIL_dtos1( int d )
+{
+	static char buf[8];
+	sprintf( buf, "%d", d );
+	return buf;
+}
+
+char *UTIL_dtos2( int d )
+{
+	static char buf[8];
+	sprintf( buf, "%d", d );
+	return buf;
+}
+
+char *UTIL_dtos3( int d )
+{
+	static char buf[8];
+	sprintf( buf, "%d", d );
+	return buf;
+}
+
+char *UTIL_dtos4( int d )
+{
+	static char buf[8];
+	sprintf( buf, "%d", d );
+	return buf;
+}
+
+void UTIL_ShowMessage( const char *pString, CBaseEntity *pEntity)
+{
+	if ( !pEntity || !pEntity->IsNetClient() )
+		return;
+
+	MESSAGE_BEGIN( MSG_ONE, gmsgHudText, NULL, pEntity->edict() );
+		WRITE_STRING( pString );
+	MESSAGE_END();
+}
+
+void UTIL_ShowMessage2( const char *pString, CBaseEntity *pEntity, bool inIsAutoHelp)
+{
+	if ( !pEntity || !pEntity->IsNetClient() )
+		return;
+	
+	MESSAGE_BEGIN( MSG_ONE, gmsgHudText2, NULL, pEntity->edict() );
+		WRITE_STRING( pString );
+		WRITE_BYTE(inIsAutoHelp);
+	MESSAGE_END();
+}
+
+
+void UTIL_ShowMessageAll( const char *pString )
+{
+	int		i;
+
+	// loop through all players
+
+	for ( i = 1; i <= gpGlobals->maxClients; i++ )
+	{
+		CBaseEntity *pPlayer = UTIL_PlayerByIndex( i );
+		if ( pPlayer )
+			UTIL_ShowMessage( pString, pPlayer );
+	}
+}
+
+// Overloaded to add IGNORE_GLASS
+void UTIL_TraceLine( const Vector &vecStart, const Vector &vecEnd, IGNORE_MONSTERS igmon, IGNORE_GLASS ignoreGlass, edict_t *pentIgnore, TraceResult *ptr )
+{
+	TRACE_LINE( vecStart, vecEnd, (igmon == ignore_monsters ? TRUE : FALSE) | (ignoreGlass?0x100:0), pentIgnore, ptr );
+}
+
+
+void UTIL_TraceLine( const Vector &vecStart, const Vector &vecEnd, IGNORE_MONSTERS igmon, edict_t *pentIgnore, TraceResult *ptr )
+{
+	TRACE_LINE( vecStart, vecEnd, (igmon == ignore_monsters ? TRUE : FALSE), pentIgnore, ptr );
+}
+
+
+void UTIL_TraceHull( const Vector &vecStart, const Vector &vecEnd, IGNORE_MONSTERS igmon, int hullNumber, edict_t *pentIgnore, TraceResult *ptr )
+{
+	TRACE_HULL( vecStart, vecEnd, (igmon == ignore_monsters ? TRUE : FALSE), hullNumber, pentIgnore, ptr );
+}
+
+void UTIL_TraceModel( const Vector &vecStart, const Vector &vecEnd, int hullNumber, edict_t *pentModel, TraceResult *ptr )
+{
+	g_engfuncs.pfnTraceModel( vecStart, vecEnd, hullNumber, pentModel, ptr );
+}
+
+
+TraceResult UTIL_GetGlobalTrace( )
+{
+	TraceResult tr;
+
+	tr.fAllSolid		= gpGlobals->trace_allsolid;
+	tr.fStartSolid		= gpGlobals->trace_startsolid;
+	tr.fInOpen			= gpGlobals->trace_inopen;
+	tr.fInWater			= gpGlobals->trace_inwater;
+	tr.flFraction		= gpGlobals->trace_fraction;
+	tr.flPlaneDist		= gpGlobals->trace_plane_dist;
+	tr.pHit			= gpGlobals->trace_ent;
+	tr.vecEndPos		= gpGlobals->trace_endpos;
+	tr.vecPlaneNormal	= gpGlobals->trace_plane_normal;
+	tr.iHitgroup		= gpGlobals->trace_hitgroup;
+	return tr;
+}
+
+	
+void UTIL_SetSize( entvars_t *pev, const Vector &vecMin, const Vector &vecMax )
+{
+	SET_SIZE( ENT(pev), vecMin, vecMax );
+}
+	
+	
+float UTIL_VecToYaw( const Vector &vec )
+{
+	return VEC_TO_YAW(vec);
+}
+
+
+void UTIL_SetOrigin( entvars_t *pev, const Vector &vecOrigin )
+{
+	SET_ORIGIN(ENT(pev), vecOrigin );
+}
+
+void UTIL_ParticleEffect( const Vector &vecOrigin, const Vector &vecDirection, ULONG ulColor, ULONG ulCount )
+{
+	PARTICLE_EFFECT( vecOrigin, vecDirection, (float)ulColor, (float)ulCount );
+}
+
+
+float UTIL_Approach( float target, float value, float speed )
+{
+	float delta = target - value;
+
+	if ( delta > speed )
+		value += speed;
+	else if ( delta < -speed )
+		value -= speed;
+	else 
+		value = target;
+
+	return value;
+}
+
+
+float UTIL_ApproachAngle( float target, float value, float speed )
+{
+	target = UTIL_AngleMod( target );
+	value = UTIL_AngleMod( target );
+	
+	float delta = target - value;
+
+	// Speed is assumed to be positive
+	if ( speed < 0 )
+		speed = -speed;
+
+	if ( delta < -180 )
+		delta += 360;
+	else if ( delta > 180 )
+		delta -= 360;
+
+	if ( delta > speed )
+		value += speed;
+	else if ( delta < -speed )
+		value -= speed;
+	else 
+		value = target;
+
+	return value;
+}
+
+
+float UTIL_AngleDistance( float next, float cur )
+{
+	float delta = next - cur;
+
+	if ( delta < -180 )
+		delta += 360;
+	else if ( delta > 180 )
+		delta -= 360;
+
+	return delta;
+}
+
+
+float UTIL_SplineFraction( float value, float scale )
+{
+	value = scale * value;
+	float valueSquared = value * value;
+
+	// Nice little ease-in, ease-out spline-like curve
+	return 3 * valueSquared - 2 * valueSquared * value;
+}
+
+
+char* UTIL_VarArgs( char *format, ... )
+{
+	va_list		argptr;
+	static char		string[1024];
+	
+	va_start (argptr, format);
+	vsprintf (string, format,argptr);
+	va_end (argptr);
+
+	return string;	
+}
+	
+Vector UTIL_GetAimVector( edict_t *pent, float flSpeed )
+{
+	Vector tmp;
+	GET_AIM_VECTOR(pent, flSpeed, tmp);
+	return tmp;
+}
+
+int UTIL_IsMasterTriggered(string_t sMaster, CBaseEntity *pActivator)
+{
+	if (sMaster)
+	{
+		edict_t *pentTarget = FIND_ENTITY_BY_TARGETNAME(NULL, STRING(sMaster));
+	
+		if ( !FNullEnt(pentTarget) )
+		{
+			CBaseEntity *pMaster = CBaseEntity::Instance(pentTarget);
+			if ( pMaster && (pMaster->ObjectCaps() & FCAP_MASTER) )
+				return pMaster->IsTriggered( pActivator );
+		}
+
+		ALERT(at_console, "Master was null or not a master!\n");
+	}
+
+	// if this isn't a master entity, just say yes.
+	return 1;
+}
+
+BOOL UTIL_ShouldShowBlood( int color )
+{
+	if ( color != DONT_BLEED )
+	{
+		if ( color == BLOOD_COLOR_RED )
+		{
+			if ( CVAR_GET_FLOAT("violence_hblood") != 0 )
+				return TRUE;
+		}
+		else
+		{
+			if ( CVAR_GET_FLOAT("violence_ablood") != 0 )
+				return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+int UTIL_PointContents(	const Vector &vec )
+{
+	int thePointContents = POINT_CONTENTS(vec);
+	return thePointContents;
+}
+
+void UTIL_BloodStream( const Vector &origin, const Vector &direction, int color, int amount )
+{
+	if ( !UTIL_ShouldShowBlood( color ) )
+		return;
+
+	if ( g_Language == LANGUAGE_GERMAN && color == BLOOD_COLOR_RED )
+		color = 0;
+
+	
+	MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, origin );
+		WRITE_BYTE( TE_BLOODSTREAM );
+		WRITE_COORD( origin.x );
+		WRITE_COORD( origin.y );
+		WRITE_COORD( origin.z );
+		WRITE_COORD( direction.x );
+		WRITE_COORD( direction.y );
+		WRITE_COORD( direction.z );
+		WRITE_BYTE( color );
+		WRITE_BYTE( min( amount, 255 ) );
+	MESSAGE_END();
+}				
+
+void UTIL_BloodDrips( const Vector &origin, const Vector &direction, int color, int amount )
+{
+	if ( !UTIL_ShouldShowBlood( color ) )
+		return;
+
+	if ( color == DONT_BLEED || amount == 0 )
+		return;
+
+	if ( g_Language == LANGUAGE_GERMAN && color == BLOOD_COLOR_RED )
+		color = 0;
+
+	if ( g_pGameRules->IsMultiplayer() )
+	{
+		// scale up blood effect in multiplayer for better visibility
+		amount *= 2;
+	}
+
+	if ( amount > 255 )
+		amount = 255;
+
+	MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, origin );
+		WRITE_BYTE( TE_BLOODSPRITE );
+		WRITE_COORD( origin.x);								// pos
+		WRITE_COORD( origin.y);
+		WRITE_COORD( origin.z);
+		WRITE_SHORT( g_sModelIndexBloodSpray );				// initial sprite model
+		WRITE_SHORT( g_sModelIndexBloodDrop );				// droplet sprite models
+		WRITE_BYTE( color );								// color index into host_basepal
+		WRITE_BYTE( min( max( 3, amount / 10 ), 16 ) );		// size
+	MESSAGE_END();
+}				
+
+Vector UTIL_RandomBloodVector( void )
+{
+	Vector direction;
+
+	direction.x = RANDOM_FLOAT ( -1, 1 );
+	direction.y = RANDOM_FLOAT ( -1, 1 );
+	direction.z = RANDOM_FLOAT ( 0, 1 );
+
+	return direction;
+}
+
+
+void UTIL_BloodDecalTrace( TraceResult *pTrace, int bloodColor )
+{
+	if ( UTIL_ShouldShowBlood( bloodColor ) )
+	{
+		if ( bloodColor == BLOOD_COLOR_RED )
+			UTIL_DecalTrace( pTrace, DECAL_BLOOD1 + RANDOM_LONG(0,5) );
+		else
+			UTIL_DecalTrace( pTrace, DECAL_YBLOOD1 + RANDOM_LONG(0,5) );
+	}
+}
+
+
+void UTIL_DecalTrace( TraceResult *pTrace, int decalNumber )
+{
+	short entityIndex;
+	int index;
+	int message;
+
+	if ( decalNumber < 0 )
+		return;
+
+	index = gDecals[ decalNumber ].index;
+
+	if ( index < 0 )
+		return;
+
+	if (pTrace->flFraction == 1.0)
+		return;
+
+	// Only decal BSP models
+	if ( pTrace->pHit )
+	{
+		CBaseEntity *pEntity = CBaseEntity::Instance( pTrace->pHit );
+		if ( pEntity && !pEntity->IsBSPModel() )
+			return;
+		entityIndex = ENTINDEX( pTrace->pHit );
+	}
+	else 
+		entityIndex = 0;
+
+	message = TE_DECAL;
+	if ( entityIndex != 0 )
+	{
+		if ( index > 255 )
+		{
+			message = TE_DECALHIGH;
+			index -= 256;
+		}
+	}
+	else
+	{
+		message = TE_WORLDDECAL;
+		if ( index > 255 )
+		{
+			message = TE_WORLDDECALHIGH;
+			index -= 256;
+		}
+	}
+	
+	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+		WRITE_BYTE( message );
+		WRITE_COORD( pTrace->vecEndPos.x );
+		WRITE_COORD( pTrace->vecEndPos.y );
+		WRITE_COORD( pTrace->vecEndPos.z );
+		WRITE_BYTE( index );
+		if ( entityIndex )
+			WRITE_SHORT( entityIndex );
+	MESSAGE_END();
+}
+
+/*
+==============
+UTIL_PlayerDecalTrace
+
+A player is trying to apply his custom decal for the spray can.
+Tell connected clients to display it, or use the default spray can decal
+if the custom can't be loaded.
+==============
+*/
+void UTIL_PlayerDecalTrace( TraceResult *pTrace, int playernum, int decalNumber, BOOL bIsCustom )
+{
+	int index;
+	
+	if (!bIsCustom)
+	{
+		if ( decalNumber < 0 )
+			return;
+
+		index = gDecals[ decalNumber ].index;
+		if ( index < 0 )
+			return;
+	}
+	else
+		index = decalNumber;
+
+	if (pTrace->flFraction == 1.0)
+		return;
+
+	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+		WRITE_BYTE( TE_PLAYERDECAL );
+		WRITE_BYTE ( playernum );
+		WRITE_COORD( pTrace->vecEndPos.x );
+		WRITE_COORD( pTrace->vecEndPos.y );
+		WRITE_COORD( pTrace->vecEndPos.z );
+		WRITE_SHORT( (short)ENTINDEX(pTrace->pHit) );
+		WRITE_BYTE( index );
+	MESSAGE_END();
+}
+
+void UTIL_GunshotDecalTrace( TraceResult *pTrace, int decalNumber )
+{
+	if ( decalNumber < 0 )
+		return;
+
+	int index = gDecals[ decalNumber ].index;
+	if ( index < 0 )
+		return;
+
+	if (pTrace->flFraction == 1.0)
+		return;
+
+	MESSAGE_BEGIN( MSG_PAS, SVC_TEMPENTITY, pTrace->vecEndPos );
+		WRITE_BYTE( TE_GUNSHOTDECAL );
+		WRITE_COORD( pTrace->vecEndPos.x );
+		WRITE_COORD( pTrace->vecEndPos.y );
+		WRITE_COORD( pTrace->vecEndPos.z );
+		WRITE_SHORT( (short)ENTINDEX(pTrace->pHit) );
+		WRITE_BYTE( index );
+	MESSAGE_END();
+}
+
+
+void UTIL_Sparks( const Vector &position )
+{
+	MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, position );
+		WRITE_BYTE( TE_SPARKS );
+		WRITE_COORD( position.x );
+		WRITE_COORD( position.y );
+		WRITE_COORD( position.z );
+	MESSAGE_END();
+}
+
+
+void UTIL_Ricochet( const Vector &position, float scale )
+{
+	MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, position );
+		WRITE_BYTE( TE_ARMOR_RICOCHET );
+		WRITE_COORD( position.x );
+		WRITE_COORD( position.y );
+		WRITE_COORD( position.z );
+		WRITE_BYTE( (int)(scale*10) );
+	MESSAGE_END();
+}
+
+
+BOOL UTIL_TeamsMatch( const char *pTeamName1, const char *pTeamName2 )
+{
+	// Everyone matches unless it's teamplay
+	if ( !g_pGameRules->IsTeamplay() )
+		return TRUE;
+
+	// Both on a team?
+	if ( *pTeamName1 != 0 && *pTeamName2 != 0 )
+	{
+		if ( !stricmp( pTeamName1, pTeamName2 ) )	// Same Team?
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
+
+void UTIL_StringToVector( float *pVector, const char *pString )
+{
+	char *pstr, *pfront, tempString[128];
+	int	j;
+
+	strcpy( tempString, pString );
+	pstr = pfront = tempString;
+
+	for ( j = 0; j < 3; j++ )			// lifted from pr_edict.c
+	{
+		pVector[j] = atof( pfront );
+
+		while ( *pstr && *pstr != ' ' )
+			pstr++;
+		if (!*pstr)
+			break;
+		pstr++;
+		pfront = pstr;
+	}
+	if (j < 2)
+	{
+		/*
+		ALERT( at_error, "Bad field in entity!! %s:%s == \"%s\"\n",
+			pkvd->szClassName, pkvd->szKeyName, pkvd->szValue );
+		*/
+		for (j = j+1;j < 3; j++)
+			pVector[j] = 0;
+	}
+}
+
+
+void UTIL_StringToIntArray( int *pVector, int count, const char *pString )
+{
+	char *pstr, *pfront, tempString[128];
+	int	j;
+
+	strcpy( tempString, pString );
+	pstr = pfront = tempString;
+
+	for ( j = 0; j < count; j++ )			// lifted from pr_edict.c
+	{
+		pVector[j] = atoi( pfront );
+
+		while ( *pstr && *pstr != ' ' )
+			pstr++;
+		if (!*pstr)
+			break;
+		pstr++;
+		pfront = pstr;
+	}
+
+	for ( j++; j < count; j++ )
+	{
+		pVector[j] = 0;
+	}
+}
+
+Vector UTIL_ClampVectorToBox( const Vector &input, const Vector &clampSize )
+{
+	Vector sourceVector = input;
+
+	if ( sourceVector.x > clampSize.x )
+		sourceVector.x -= clampSize.x;
+	else if ( sourceVector.x < -clampSize.x )
+		sourceVector.x += clampSize.x;
+	else
+		sourceVector.x = 0;
+
+	if ( sourceVector.y > clampSize.y )
+		sourceVector.y -= clampSize.y;
+	else if ( sourceVector.y < -clampSize.y )
+		sourceVector.y += clampSize.y;
+	else
+		sourceVector.y = 0;
+	
+	if ( sourceVector.z > clampSize.z )
+		sourceVector.z -= clampSize.z;
+	else if ( sourceVector.z < -clampSize.z )
+		sourceVector.z += clampSize.z;
+	else
+		sourceVector.z = 0;
+
+	return sourceVector.Normalize();
+}
+
+
+float UTIL_WaterLevel( const Vector &position, float minz, float maxz )
+{
+	Vector midUp = position;
+	midUp.z = minz;
+
+	if (UTIL_PointContents(midUp) != CONTENTS_WATER)
+		return minz;
+
+	midUp.z = maxz;
+	if (UTIL_PointContents(midUp) == CONTENTS_WATER)
+		return maxz;
+
+	float diff = maxz - minz;
+	while (diff > 1.0)
+	{
+		midUp.z = minz + diff/2.0;
+		if (UTIL_PointContents(midUp) == CONTENTS_WATER)
+		{
+			minz = midUp.z;
+		}
+		else
+		{
+			maxz = midUp.z;
+		}
+		diff = maxz - minz;
+	}
+
+	return midUp.z;
+}
+
+
+extern DLL_GLOBAL	short	g_sModelIndexBubbles;// holds the index for the bubbles model
+
+void UTIL_Bubbles( Vector mins, Vector maxs, int count )
+{
+	Vector mid =  (mins + maxs) * 0.5;
+
+	float flHeight = UTIL_WaterLevel( mid,  mid.z, mid.z + 1024 );
+	flHeight = flHeight - mins.z;
+
+	MESSAGE_BEGIN( MSG_PAS, SVC_TEMPENTITY, mid );
+		WRITE_BYTE( TE_BUBBLES );
+		WRITE_COORD( mins.x );	// mins
+		WRITE_COORD( mins.y );
+		WRITE_COORD( mins.z );
+		WRITE_COORD( maxs.x );	// maxz
+		WRITE_COORD( maxs.y );
+		WRITE_COORD( maxs.z );
+		WRITE_COORD( flHeight );			// height
+		WRITE_SHORT( g_sModelIndexBubbles );
+		WRITE_BYTE( count ); // count
+		WRITE_COORD( 8 ); // speed
+	MESSAGE_END();
+}
+
+void UTIL_BubbleTrail( Vector from, Vector to, int count )
+{
+	float flHeight = UTIL_WaterLevel( from,  from.z, from.z + 256 );
+	flHeight = flHeight - from.z;
+
+	if (flHeight < 8)
+	{
+		flHeight = UTIL_WaterLevel( to,  to.z, to.z + 256 );
+		flHeight = flHeight - to.z;
+		if (flHeight < 8)
+			return;
+
+		// UNDONE: do a ploink sound
+		flHeight = flHeight + to.z - from.z;
+	}
+
+	if (count > 255) 
+		count = 255;
+
+	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+		WRITE_BYTE( TE_BUBBLETRAIL );
+		WRITE_COORD( from.x );	// mins
+		WRITE_COORD( from.y );
+		WRITE_COORD( from.z );
+		WRITE_COORD( to.x );	// maxz
+		WRITE_COORD( to.y );
+		WRITE_COORD( to.z );
+		WRITE_COORD( flHeight );			// height
+		WRITE_SHORT( g_sModelIndexBubbles );
+		WRITE_BYTE( count ); // count
+		WRITE_COORD( 8 ); // speed
+	MESSAGE_END();
+}
+
+
+void UTIL_Remove( CBaseEntity *pEntity )
+{
+	if ( !pEntity )
+		return;
+
+	pEntity->UpdateOnRemove();
+	pEntity->pev->flags |= FL_KILLME;
+	pEntity->pev->targetname = 0;
+}
+
+
+BOOL UTIL_IsValidEntity( edict_t *pent )
+{
+	if ( !pent || pent->free || (pent->v.flags & FL_KILLME) )
+		return FALSE;
+	return TRUE;
+}
+
+
+void UTIL_PrecacheOther( const char *szClassname )
+{
+	edict_t	*pent;
+
+	pent = CREATE_NAMED_ENTITY( MAKE_STRING( szClassname ) );
+	if ( FNullEnt( pent ) )
+	{
+		ALERT ( at_console, "NULL Ent in UTIL_PrecacheOther\n" );
+		return;
+	}
+	
+	CBaseEntity *pEntity = CBaseEntity::Instance (VARS( pent ));
+	if (pEntity)
+		pEntity->Precache( );
+	REMOVE_ENTITY(pent);
+}
+
+//=========================================================
+// UTIL_LogPrintf - Prints a logged message to console.
+// Preceded by LOG: ( timestamp ) < message >
+//=========================================================
+void UTIL_LogPrintf( char *fmt, ... )
+{
+	va_list			argptr;
+	static char		string[1024];
+	
+	va_start ( argptr, fmt );
+	vsprintf ( string, fmt, argptr );
+	va_end   ( argptr );
+
+	// Print to server console
+	ALERT( at_logged, "%s", string );
+}
+
+//=========================================================
+// UTIL_DotPoints - returns the dot product of a line from
+// src to check and vecdir.
+//=========================================================
+float UTIL_DotPoints ( const Vector &vecSrc, const Vector &vecCheck, const Vector &vecDir )
+{
+	Vector2D	vec2LOS;
+
+	vec2LOS = ( vecCheck - vecSrc ).Make2D();
+	vec2LOS = vec2LOS.Normalize();
+
+	return DotProduct (vec2LOS , ( vecDir.Make2D() ) );
+}
+
+
+//=========================================================
+// UTIL_StripToken - for redundant keynames
+//=========================================================
+void UTIL_StripToken( const char *pKey, char *pDest )
+{
+	int i = 0;
+
+	while ( pKey[i] && pKey[i] != '#' )
+	{
+		pDest[i] = pKey[i];
+		i++;
+	}
+	pDest[i] = 0;
+}
+
+
+// --------------------------------------------------------------
+//
+// CSave
+//
+// --------------------------------------------------------------
+static int gSizes[FIELD_TYPECOUNT] = 
+{
+	sizeof(float),		// FIELD_FLOAT
+	sizeof(int),		// FIELD_STRING
+	sizeof(int),		// FIELD_ENTITY
+	sizeof(int),		// FIELD_CLASSPTR
+	sizeof(int),		// FIELD_EHANDLE
+	sizeof(int),		// FIELD_entvars_t
+	sizeof(int),		// FIELD_EDICT
+	sizeof(float)*3,	// FIELD_VECTOR
+	sizeof(float)*3,	// FIELD_POSITION_VECTOR
+	sizeof(int *),		// FIELD_POINTER
+	sizeof(int),		// FIELD_INTEGER
+	sizeof(int *),		// FIELD_FUNCTION
+	sizeof(int),		// FIELD_BOOLEAN
+	sizeof(short),		// FIELD_SHORT
+	sizeof(char),		// FIELD_CHARACTER
+	sizeof(float),		// FIELD_TIME
+	sizeof(int),		// FIELD_MODELNAME
+	sizeof(int),		// FIELD_SOUNDNAME
+};
+
+
+// Base class includes common SAVERESTOREDATA pointer, and manages the entity table
+CSaveRestoreBuffer :: CSaveRestoreBuffer( void )
+{
+	m_pdata = NULL;
+}
+
+
+CSaveRestoreBuffer :: CSaveRestoreBuffer( SAVERESTOREDATA *pdata )
+{
+	m_pdata = pdata;
+}
+
+
+CSaveRestoreBuffer :: ~CSaveRestoreBuffer( void )
+{
+}
+
+int	CSaveRestoreBuffer :: EntityIndex( CBaseEntity *pEntity )
+{
+	if ( pEntity == NULL )
+		return -1;
+	return EntityIndex( pEntity->pev );
+}
+
+
+int	CSaveRestoreBuffer :: EntityIndex( entvars_t *pevLookup )
+{
+	if ( pevLookup == NULL )
+		return -1;
+	return EntityIndex( ENT( pevLookup ) );
+}
+
+int	CSaveRestoreBuffer :: EntityIndex( EOFFSET eoLookup )
+{
+	return EntityIndex( ENT( eoLookup ) );
+}
+
+
+int	CSaveRestoreBuffer :: EntityIndex( edict_t *pentLookup )
+{
+	if ( !m_pdata || pentLookup == NULL )
+		return -1;
+
+	int i;
+	ENTITYTABLE *pTable;
+
+	for ( i = 0; i < m_pdata->tableCount; i++ )
+	{
+		pTable = m_pdata->pTable + i;
+		if ( pTable->pent == pentLookup )
+			return i;
+	}
+	return -1;
+}
+
+
+edict_t *CSaveRestoreBuffer :: EntityFromIndex( int entityIndex )
+{
+	if ( !m_pdata || entityIndex < 0 )
+		return NULL;
+
+	int i;
+	ENTITYTABLE *pTable;
+
+	for ( i = 0; i < m_pdata->tableCount; i++ )
+	{
+		pTable = m_pdata->pTable + i;
+		if ( pTable->id == entityIndex )
+			return pTable->pent;
+	}
+	return NULL;
+}
+
+
+int	CSaveRestoreBuffer :: EntityFlagsSet( int entityIndex, int flags )
+{
+	if ( !m_pdata || entityIndex < 0 )
+		return 0;
+	if ( entityIndex > m_pdata->tableCount )
+		return 0;
+
+	m_pdata->pTable[ entityIndex ].flags |= flags;
+
+	return m_pdata->pTable[ entityIndex ].flags;
+}
+
+
+void CSaveRestoreBuffer :: BufferRewind( int size )
+{
+	if ( !m_pdata )
+		return;
+
+	if ( m_pdata->size < size )
+		size = m_pdata->size;
+
+	m_pdata->pCurrentData -= size;
+	m_pdata->size -= size;
+}
+
+#ifndef _WIN32
+extern "C" {
+unsigned _rotr ( unsigned val, int shift)
+{
+        register unsigned lobit;        /* non-zero means lo bit set */
+        register unsigned num = val;    /* number to rotate */
+
+        shift &= 0x1f;                  /* modulo 32 -- this will also make
+                                           negative shifts work */
+
+        while (shift--) {
+                lobit = num & 1;        /* get high bit */
+                num >>= 1;              /* shift right one bit */
+                if (lobit)
+                        num |= 0x80000000;  /* set hi bit if lo bit was set */
+        }
+
+        return num;
+}
+}
+#endif
+
+unsigned int CSaveRestoreBuffer :: HashString( const char *pszToken )
+{
+	unsigned int	hash = 0;
+
+	while ( *pszToken )
+		hash = _rotr( hash, 4 ) ^ *pszToken++;
+
+	return hash;
+}
+
+unsigned short CSaveRestoreBuffer :: TokenHash( const char *pszToken )
+{
+	unsigned short	hash = (unsigned short)(HashString( pszToken ) % (unsigned)m_pdata->tokenCount );
+	
+#if _DEBUG
+	static int tokensparsed = 0;
+	tokensparsed++;
+	if ( !m_pdata->tokenCount || !m_pdata->pTokens )
+		ALERT( at_error, "No token table array in TokenHash()!" );
+#endif
+
+	for ( int i=0; i<m_pdata->tokenCount; i++ )
+	{
+#if _DEBUG
+		static qboolean beentheredonethat = FALSE;
+		if ( i > 50 && !beentheredonethat )
+		{
+			beentheredonethat = TRUE;
+			ALERT( at_error, "CSaveRestoreBuffer :: TokenHash() is getting too full!" );
+		}
+#endif
+
+		int	index = hash + i;
+		if ( index >= m_pdata->tokenCount )
+			index -= m_pdata->tokenCount;
+
+		if ( !m_pdata->pTokens[index] || strcmp( pszToken, m_pdata->pTokens[index] ) == 0 )
+		{
+			m_pdata->pTokens[index] = (char *)pszToken;
+			return index;
+		}
+	}
+		
+	// Token hash table full!!! 
+	// [Consider doing overflow table(s) after the main table & limiting linear hash table search]
+	ALERT( at_error, "CSaveRestoreBuffer :: TokenHash() is COMPLETELY FULL!" );
+	return 0;
+}
+
+void CSave :: WriteData( const char *pname, int size, const char *pdata )
+{
+	BufferField( pname, size, pdata );
+}
+
+
+void CSave :: WriteShort( const char *pname, const short *data, int count )
+{
+	BufferField( pname, sizeof(short) * count, (const char *)data );
+}
+
+
+void CSave :: WriteInt( const char *pname, const int *data, int count )
+{
+	BufferField( pname, sizeof(int) * count, (const char *)data );
+}
+
+
+void CSave :: WriteFloat( const char *pname, const float *data, int count )
+{
+	BufferField( pname, sizeof(float) * count, (const char *)data );
+}
+
+
+void CSave :: WriteTime( const char *pname, const float *data, int count )
+{
+	int i;
+	Vector tmp, input;
+
+	BufferHeader( pname, sizeof(float) * count );
+	for ( i = 0; i < count; i++ )
+	{
+		float tmp = data[0];
+
+		// Always encode time as a delta from the current time so it can be re-based if loaded in a new level
+		// Times of 0 are never written to the file, so they will be restored as 0, not a relative time
+		if ( m_pdata )
+			tmp -= m_pdata->time;
+
+		BufferData( (const char *)&tmp, sizeof(float) );
+		data ++;
+	}
+}
+
+
+void CSave :: WriteString( const char *pname, const char *pdata )
+{
+#ifdef TOKENIZE
+	short	token = (short)TokenHash( pdata );
+	WriteShort( pname, &token, 1 );
+#else
+	BufferField( pname, strlen(pdata) + 1, pdata );
+#endif
+}
+
+
+void CSave :: WriteString( const char *pname, const int *stringId, int count )
+{
+	int i, size;
+
+#ifdef TOKENIZE
+	short	token = (short)TokenHash( STRING( *stringId ) );
+	WriteShort( pname, &token, 1 );
+#else
+#if 0
+	if ( count != 1 )
+		ALERT( at_error, "No string arrays!\n" );
+	WriteString( pname, (char *)STRING(*stringId) );
+#endif
+
+	size = 0;
+	for ( i = 0; i < count; i++ )
+		size += strlen( STRING( stringId[i] ) ) + 1;
+
+	BufferHeader( pname, size );
+	for ( i = 0; i < count; i++ )
+	{
+		const char *pString = STRING(stringId[i]);
+		BufferData( pString, strlen(pString)+1 );
+	}
+#endif
+}
+
+
+void CSave :: WriteVector( const char *pname, const Vector &value )
+{
+	WriteVector( pname, &value.x, 1 );
+}
+
+
+void CSave :: WriteVector( const char *pname, const float *value, int count )
+{
+	BufferHeader( pname, sizeof(float) * 3 * count );
+	BufferData( (const char *)value, sizeof(float) * 3 * count );
+}
+
+
+
+void CSave :: WritePositionVector( const char *pname, const Vector &value )
+{
+
+	if ( m_pdata && m_pdata->fUseLandmark )
+	{
+		Vector tmp = value - m_pdata->vecLandmarkOffset;
+		WriteVector( pname, tmp );
+	}
+
+	WriteVector( pname, value );
+}
+
+
+void CSave :: WritePositionVector( const char *pname, const float *value, int count )
+{
+	int i;
+	Vector tmp, input;
+
+	BufferHeader( pname, sizeof(float) * 3 * count );
+	for ( i = 0; i < count; i++ )
+	{
+		Vector tmp( value[0], value[1], value[2] );
+
+		if ( m_pdata && m_pdata->fUseLandmark )
+			tmp = tmp - m_pdata->vecLandmarkOffset;
+
+		BufferData( (const char *)&tmp.x, sizeof(float) * 3 );
+		value += 3;
+	}
+}
+
+
+void CSave :: WriteFunction( const char *pname, const int *data, int count )
+{
+	const char *functionName;
+
+	functionName = NAME_FOR_FUNCTION( *data );
+	if ( functionName )
+		BufferField( pname, strlen(functionName) + 1, functionName );
+	else
+		ALERT( at_error, "Invalid function pointer in entity!" );
+}
+
+
+void EntvarsKeyvalue( entvars_t *pev, KeyValueData *pkvd )
+{
+	int i;
+	TYPEDESCRIPTION		*pField;
+
+	for ( i = 0; i < ENTVARS_COUNT; i++ )
+	{
+		pField = &gEntvarsDescription[i];
+
+		if ( !stricmp( pField->fieldName, pkvd->szKeyName ) )
+		{
+			switch( pField->fieldType )
+			{
+			case FIELD_MODELNAME:
+			case FIELD_SOUNDNAME:
+			case FIELD_STRING:
+				(*(int *)((char *)pev + pField->fieldOffset)) = ALLOC_STRING( pkvd->szValue );
+				break;
+
+			case FIELD_TIME:
+			case FIELD_FLOAT:
+				(*(float *)((char *)pev + pField->fieldOffset)) = atof( pkvd->szValue );
+				break;
+
+			case FIELD_INTEGER:
+				(*(int *)((char *)pev + pField->fieldOffset)) = atoi( pkvd->szValue );
+				break;
+
+			case FIELD_POSITION_VECTOR:
+			case FIELD_VECTOR:
+				UTIL_StringToVector( (float *)((char *)pev + pField->fieldOffset), pkvd->szValue );
+				break;
+
+			default:
+			case FIELD_EVARS:
+			case FIELD_CLASSPTR:
+			case FIELD_EDICT:
+			case FIELD_ENTITY:
+			case FIELD_POINTER:
+				ALERT( at_error, "Bad field in entity!!\n" );
+				break;
+			}
+			pkvd->fHandled = TRUE;
+			return;
+		}
+	}
+}
+
+
+
+int CSave :: WriteEntVars( const char *pname, entvars_t *pev )
+{
+	return WriteFields( pname, pev, gEntvarsDescription, ENTVARS_COUNT );
+}
+
+
+
+int CSave :: WriteFields( const char *pname, void *pBaseData, TYPEDESCRIPTION *pFields, int fieldCount )
+{
+	int				i, j, actualCount, emptyCount;
+	TYPEDESCRIPTION	*pTest;
+	int				entityArray[MAX_ENTITYARRAY];
+
+	// Precalculate the number of empty fields
+	emptyCount = 0;
+	for ( i = 0; i < fieldCount; i++ )
+	{
+		void *pOutputData;
+		pOutputData = ((char *)pBaseData + pFields[i].fieldOffset );
+		if ( DataEmpty( (const char *)pOutputData, pFields[i].fieldSize * gSizes[pFields[i].fieldType] ) )
+			emptyCount++;
+	}
+
+	// Empty fields will not be written, write out the actual number of fields to be written
+	actualCount = fieldCount - emptyCount;
+	WriteInt( pname, &actualCount, 1 );
+
+	for ( i = 0; i < fieldCount; i++ )
+	{
+		void *pOutputData;
+		pTest = &pFields[ i ];
+		pOutputData = ((char *)pBaseData + pTest->fieldOffset );
+
+		// UNDONE: Must we do this twice?
+		if ( DataEmpty( (const char *)pOutputData, pTest->fieldSize * gSizes[pTest->fieldType] ) )
+			continue;
+
+		switch( pTest->fieldType )
+		{
+		case FIELD_FLOAT:
+			WriteFloat( pTest->fieldName, (float *)pOutputData, pTest->fieldSize );
+		break;
+		case FIELD_TIME:
+			WriteTime( pTest->fieldName, (float *)pOutputData, pTest->fieldSize );
+		break;
+		case FIELD_MODELNAME:
+		case FIELD_SOUNDNAME:
+		case FIELD_STRING:
+			WriteString( pTest->fieldName, (int *)pOutputData, pTest->fieldSize );
+		break;
+		case FIELD_CLASSPTR:
+		case FIELD_EVARS:
+		case FIELD_EDICT:
+		case FIELD_ENTITY:
+		case FIELD_EHANDLE:
+			if ( pTest->fieldSize > MAX_ENTITYARRAY )
+				ALERT( at_error, "Can't save more than %d entities in an array!!!\n", MAX_ENTITYARRAY );
+			for ( j = 0; j < pTest->fieldSize; j++ )
+			{
+				switch( pTest->fieldType )
+				{
+					case FIELD_EVARS:
+						entityArray[j] = EntityIndex( ((entvars_t **)pOutputData)[j] );
+					break;
+					case FIELD_CLASSPTR:
+						entityArray[j] = EntityIndex( ((CBaseEntity **)pOutputData)[j] );
+					break;
+					case FIELD_EDICT:
+						entityArray[j] = EntityIndex( ((edict_t **)pOutputData)[j] );
+					break;
+					case FIELD_ENTITY:
+						entityArray[j] = EntityIndex( ((EOFFSET *)pOutputData)[j] );
+					break;
+					case FIELD_EHANDLE:
+						entityArray[j] = EntityIndex( (CBaseEntity *)(((EHANDLE *)pOutputData)[j]) );
+					break;
+				}
+			}
+			WriteInt( pTest->fieldName, entityArray, pTest->fieldSize );
+		break;
+		case FIELD_POSITION_VECTOR:
+			WritePositionVector( pTest->fieldName, (float *)pOutputData, pTest->fieldSize );
+		break;
+		case FIELD_VECTOR:
+			WriteVector( pTest->fieldName, (float *)pOutputData, pTest->fieldSize );
+		break;
+
+		case FIELD_BOOLEAN:
+		case FIELD_INTEGER:
+			WriteInt( pTest->fieldName, (int *)pOutputData, pTest->fieldSize );
+		break;
+
+		case FIELD_SHORT:
+			WriteData( pTest->fieldName, 2 * pTest->fieldSize, ((char *)pOutputData) );
+		break;
+
+		case FIELD_CHARACTER:
+			WriteData( pTest->fieldName, pTest->fieldSize, ((char *)pOutputData) );
+		break;
+
+		// For now, just write the address out, we're not going to change memory while doing this yet!
+		case FIELD_POINTER:
+			WriteInt( pTest->fieldName, (int *)(char *)pOutputData, pTest->fieldSize );
+		break;
+
+		case FIELD_FUNCTION:
+			WriteFunction( pTest->fieldName, (int *)(char *)pOutputData, pTest->fieldSize );
+		break;
+		default:
+			ALERT( at_error, "Bad field type\n" );
+		}
+	}
+
+	return 1;
+}
+
+
+void CSave :: BufferString( char *pdata, int len )
+{
+	char c = 0;
+
+	BufferData( pdata, len );		// Write the string
+	BufferData( &c, 1 );			// Write a null terminator
+}
+
+
+int CSave :: DataEmpty( const char *pdata, int size )
+{
+	for ( int i = 0; i < size; i++ )
+	{
+		if ( pdata[i] )
+			return 0;
+	}
+	return 1;
+}
+
+
+void CSave :: BufferField( const char *pname, int size, const char *pdata )
+{
+	BufferHeader( pname, size );
+	BufferData( pdata, size );
+}
+
+
+void CSave :: BufferHeader( const char *pname, int size )
+{
+	short	hashvalue = TokenHash( pname );
+	if ( size > 1<<(sizeof(short)*8) )
+		ALERT( at_error, "CSave :: BufferHeader() size parameter exceeds 'short'!" );
+	BufferData( (const char *)&size, sizeof(short) );
+	BufferData( (const char *)&hashvalue, sizeof(short) );
+}
+
+
+void CSave :: BufferData( const char *pdata, int size )
+{
+	if ( !m_pdata )
+		return;
+
+	if ( m_pdata->size + size > m_pdata->bufferSize )
+	{
+		ALERT( at_error, "Save/Restore overflow!" );
+		m_pdata->size = m_pdata->bufferSize;
+		return;
+	}
+
+	memcpy( m_pdata->pCurrentData, pdata, size );
+	m_pdata->pCurrentData += size;
+	m_pdata->size += size;
+}
+
+
+
+// --------------------------------------------------------------
+//
+// CRestore
+//
+// --------------------------------------------------------------
+
+int CRestore::ReadField( void *pBaseData, TYPEDESCRIPTION *pFields, int fieldCount, int startField, int size, char *pName, void *pData )
+{
+	int i, j, stringCount, fieldNumber, entityIndex;
+	TYPEDESCRIPTION *pTest;
+	float	time, timeData;
+	Vector	position;
+	edict_t	*pent;
+	char	*pString;
+
+	time = 0;
+	position = Vector(0,0,0);
+
+	if ( m_pdata )
+	{
+		time = m_pdata->time;
+		if ( m_pdata->fUseLandmark )
+			position = m_pdata->vecLandmarkOffset;
+	}
+
+	for ( i = 0; i < fieldCount; i++ )
+	{
+		fieldNumber = (i+startField)%fieldCount;
+		pTest = &pFields[ fieldNumber ];
+		if ( !stricmp( pTest->fieldName, pName ) )
+		{
+			if ( !m_global || !(pTest->flags & FTYPEDESC_GLOBAL) )
+			{
+				for ( j = 0; j < pTest->fieldSize; j++ )
+				{
+					void *pOutputData = ((char *)pBaseData + pTest->fieldOffset + (j*gSizes[pTest->fieldType]) );
+					void *pInputData = (char *)pData + j * gSizes[pTest->fieldType];
+
+					switch( pTest->fieldType )
+					{
+					case FIELD_TIME:
+						timeData = *(float *)pInputData;
+						// Re-base time variables
+						timeData += time;
+						*((float *)pOutputData) = timeData;
+					break;
+					case FIELD_FLOAT:
+						*((float *)pOutputData) = *(float *)pInputData;
+					break;
+					case FIELD_MODELNAME:
+					case FIELD_SOUNDNAME:
+					case FIELD_STRING:
+						// Skip over j strings
+						pString = (char *)pData;
+						for ( stringCount = 0; stringCount < j; stringCount++ )
+						{
+							while (*pString)
+								pString++;
+							pString++;
+						}
+						pInputData = pString;
+						if ( strlen( (char *)pInputData ) == 0 )
+							*((int *)pOutputData) = 0;
+						else
+						{
+							int string;
+
+							string = ALLOC_STRING( (char *)pInputData );
+							
+							*((int *)pOutputData) = string;
+
+							if ( !FStringNull( string ) && m_precache )
+							{
+								if ( pTest->fieldType == FIELD_MODELNAME )
+									PRECACHE_MODEL( (char *)STRING( string ) );
+								else if ( pTest->fieldType == FIELD_SOUNDNAME )
+									PRECACHE_SOUND( (char *)STRING( string ) );
+							}
+						}
+					break;
+					case FIELD_EVARS:
+						entityIndex = *( int *)pInputData;
+						pent = EntityFromIndex( entityIndex );
+						if ( pent )
+							*((entvars_t **)pOutputData) = VARS(pent);
+						else
+							*((entvars_t **)pOutputData) = NULL;
+					break;
+					case FIELD_CLASSPTR:
+						entityIndex = *( int *)pInputData;
+						pent = EntityFromIndex( entityIndex );
+						if ( pent )
+							*((CBaseEntity **)pOutputData) = CBaseEntity::Instance(pent);
+						else
+							*((CBaseEntity **)pOutputData) = NULL;
+					break;
+					case FIELD_EDICT:
+						entityIndex = *( int *)pInputData;
+						pent = EntityFromIndex( entityIndex );
+						*((edict_t **)pOutputData) = pent;
+					break;
+					case FIELD_EHANDLE:
+						// Input and Output sizes are different!
+						pOutputData = (char *)pOutputData + j*(sizeof(EHANDLE) - gSizes[pTest->fieldType]);
+						entityIndex = *( int *)pInputData;
+						pent = EntityFromIndex( entityIndex );
+						if ( pent )
+							*((EHANDLE *)pOutputData) = CBaseEntity::Instance(pent);
+						else
+							*((EHANDLE *)pOutputData) = NULL;
+					break;
+					case FIELD_ENTITY:
+						entityIndex = *( int *)pInputData;
+						pent = EntityFromIndex( entityIndex );
+						if ( pent )
+							*((EOFFSET *)pOutputData) = OFFSET(pent);
+						else
+							*((EOFFSET *)pOutputData) = 0;
+					break;
+					case FIELD_VECTOR:
+						((float *)pOutputData)[0] = ((float *)pInputData)[0];
+						((float *)pOutputData)[1] = ((float *)pInputData)[1];
+						((float *)pOutputData)[2] = ((float *)pInputData)[2];
+					break;
+					case FIELD_POSITION_VECTOR:
+						((float *)pOutputData)[0] = ((float *)pInputData)[0] + position.x;
+						((float *)pOutputData)[1] = ((float *)pInputData)[1] + position.y;
+						((float *)pOutputData)[2] = ((float *)pInputData)[2] + position.z;
+					break;
+
+					case FIELD_BOOLEAN:
+					case FIELD_INTEGER:
+						*((int *)pOutputData) = *( int *)pInputData;
+					break;
+
+					case FIELD_SHORT:
+						*((short *)pOutputData) = *( short *)pInputData;
+					break;
+
+					case FIELD_CHARACTER:
+						*((char *)pOutputData) = *( char *)pInputData;
+					break;
+
+					case FIELD_POINTER:
+						*((int *)pOutputData) = *( int *)pInputData;
+					break;
+					case FIELD_FUNCTION:
+						if ( strlen( (char *)pInputData ) == 0 )
+							*((int *)pOutputData) = 0;
+						else
+							*((int *)pOutputData) = FUNCTION_FROM_NAME( (char *)pInputData );
+					break;
+
+					default:
+						ALERT( at_error, "Bad field type\n" );
+					}
+				}
+			}
+#if 0
+			else
+			{
+				ALERT( at_console, "Skipping global field %s\n", pName );
+			}
+#endif
+			return fieldNumber;
+		}
+	}
+
+	return -1;
+}
+
+
+int CRestore::ReadEntVars( const char *pname, entvars_t *pev )
+{
+	return ReadFields( pname, pev, gEntvarsDescription, ENTVARS_COUNT );
+}
+
+
+int CRestore::ReadFields( const char *pname, void *pBaseData, TYPEDESCRIPTION *pFields, int fieldCount )
+{
+	unsigned short	i, token;
+	int		lastField, fileCount;
+	HEADER	header;
+
+	i = ReadShort();
+	ASSERT( i == sizeof(int) );			// First entry should be an int
+
+	token = ReadShort();
+
+	// Check the struct name
+	if ( token != TokenHash(pname) )			// Field Set marker
+	{
+//		ALERT( at_error, "Expected %s found %s!\n", pname, BufferPointer() );
+		BufferRewind( 2*sizeof(short) );
+		return 0;
+	}
+
+	// Skip over the struct name
+	fileCount = ReadInt();						// Read field count
+
+	lastField = 0;								// Make searches faster, most data is read/written in the same order
+
+	// Clear out base data
+	for ( i = 0; i < fieldCount; i++ )
+	{
+		// Don't clear global fields
+		if ( !m_global || !(pFields[i].flags & FTYPEDESC_GLOBAL) )
+			memset( ((char *)pBaseData + pFields[i].fieldOffset), 0, pFields[i].fieldSize * gSizes[pFields[i].fieldType] );
+	}
+
+	for ( i = 0; i < fileCount; i++ )
+	{
+		BufferReadHeader( &header );
+		lastField = ReadField( pBaseData, pFields, fieldCount, lastField, header.size, m_pdata->pTokens[header.token], header.pData );
+		lastField++;
+	}
+	
+	return 1;
+}
+
+
+void CRestore::BufferReadHeader( HEADER *pheader )
+{
+	ASSERT( pheader!=NULL );
+	pheader->size = ReadShort();				// Read field size
+	pheader->token = ReadShort();				// Read field name token
+	pheader->pData = BufferPointer();			// Field Data is next
+	BufferSkipBytes( pheader->size );			// Advance to next field
+}
+
+
+short	CRestore::ReadShort( void )
+{
+	short tmp = 0;
+
+	BufferReadBytes( (char *)&tmp, sizeof(short) );
+
+	return tmp;
+}
+
+int	CRestore::ReadInt( void )
+{
+	int tmp = 0;
+
+	BufferReadBytes( (char *)&tmp, sizeof(int) );
+
+	return tmp;
+}
+
+int CRestore::ReadNamedInt( const char *pName )
+{
+	HEADER header;
+
+	BufferReadHeader( &header );
+	return ((int *)header.pData)[0];
+}
+
+char *CRestore::ReadNamedString( const char *pName )
+{
+	HEADER header;
+
+	BufferReadHeader( &header );
+#ifdef TOKENIZE
+	return (char *)(m_pdata->pTokens[*(short *)header.pData]);
+#else
+	return (char *)header.pData;
+#endif
+}
+
+
+char *CRestore::BufferPointer( void )
+{
+	if ( !m_pdata )
+		return NULL;
+
+	return m_pdata->pCurrentData;
+}
+
+void CRestore::BufferReadBytes( char *pOutput, int size )
+{
+	ASSERT( m_pdata !=NULL );
+
+	if ( !m_pdata || Empty() )
+		return;
+
+	if ( (m_pdata->size + size) > m_pdata->bufferSize )
+	{
+		ALERT( at_error, "Restore overflow!" );
+		m_pdata->size = m_pdata->bufferSize;
+		return;
+	}
+
+	if ( pOutput )
+		memcpy( pOutput, m_pdata->pCurrentData, size );
+	m_pdata->pCurrentData += size;
+	m_pdata->size += size;
+}
+
+
+void CRestore::BufferSkipBytes( int bytes )
+{
+	BufferReadBytes( NULL, bytes );
+}
+
+int CRestore::BufferSkipZString( void )
+{
+	char *pszSearch;
+	int	 len;
+
+	if ( !m_pdata )
+		return 0;
+
+	int maxLen = m_pdata->bufferSize - m_pdata->size;
+
+	len = 0;
+	pszSearch = m_pdata->pCurrentData;
+	while ( *pszSearch++ && len < maxLen )
+		len++;
+
+	len++;
+
+	BufferSkipBytes( len );
+
+	return len;
+}
+
+int	CRestore::BufferCheckZString( const char *string )
+{
+	if ( !m_pdata )
+		return 0;
+
+	int maxLen = m_pdata->bufferSize - m_pdata->size;
+	int len = strlen( string );
+	if ( len <= maxLen )
+	{
+		if ( !strncmp( string, m_pdata->pCurrentData, len ) )
+			return 1;
+	}
+	return 0;
+}
+
diff --git a/main/source/dlls/util.h b/main/source/dlls/util.h
new file mode 100644
index 00000000..40d09010
--- /dev/null
+++ b/main/source/dlls/util.h
@@ -0,0 +1,577 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+// Misc utility code
+//
+#ifndef UTIL_H
+#define UTIL_H
+
+#include "build.h"
+#include <string.h>
+
+#ifndef ACTIVITY_H
+#include "activity.h"
+#endif
+
+#ifndef ENGINECALLBACK_H
+#include "enginecallback.h"
+#endif
+
+#include "game_shared/directorconst.h"
+
+//inline void MESSAGE_BEGIN( int msg_dest, int msg_type, const float *pOrigin, entvars_t *ent );  // implementation later in this file
+
+extern globalvars_t				*gpGlobals;
+
+// Use this instead of ALLOC_STRING on constant strings
+#define STRING(offset)		(const char *)(gpGlobals->pStringBase + (int)offset)
+#define MAKE_STRING(str)	((int)str - (int)STRING(0))
+
+inline edict_t *FIND_ENTITY_BY_CLASSNAME(edict_t *entStart, const char *pszName) 
+{
+	return FIND_ENTITY_BY_STRING(entStart, "classname", pszName);
+}	
+
+inline edict_t *FIND_ENTITY_BY_TARGETNAME(edict_t *entStart, const char *pszName) 
+{
+	return FIND_ENTITY_BY_STRING(entStart, "targetname", pszName);
+}	
+
+// for doing a reverse lookup. Say you have a door, and want to find its button.
+inline edict_t *FIND_ENTITY_BY_TARGET(edict_t *entStart, const char *pszName) 
+{
+	return FIND_ENTITY_BY_STRING(entStart, "target", pszName);
+}	
+
+// Keeps clutter down a bit, when writing key-value pairs
+#define WRITEKEY_INT(pf, szKeyName, iKeyValue) ENGINE_FPRINTF(pf, "\"%s\" \"%d\"\n", szKeyName, iKeyValue)
+#define WRITEKEY_FLOAT(pf, szKeyName, flKeyValue)								\
+		ENGINE_FPRINTF(pf, "\"%s\" \"%f\"\n", szKeyName, flKeyValue)
+#define WRITEKEY_STRING(pf, szKeyName, szKeyValue)								\
+		ENGINE_FPRINTF(pf, "\"%s\" \"%s\"\n", szKeyName, szKeyValue)
+#define WRITEKEY_VECTOR(pf, szKeyName, flX, flY, flZ)							\
+		ENGINE_FPRINTF(pf, "\"%s\" \"%f %f %f\"\n", szKeyName, flX, flY, flZ)
+
+// Keeps clutter down a bit, when using a float as a bit-vector
+#define SetBits(flBitVector, bits)		((flBitVector) = (int)(flBitVector) | (bits))
+#define ClearBits(flBitVector, bits)	((flBitVector) = (int)(flBitVector) & ~(bits))
+#define FBitSet(flBitVector, bit)		((int)(flBitVector) & (bit))
+
+// Makes these more explicit, and easier to find
+#define FILE_GLOBAL static
+#define DLL_GLOBAL
+
+// Until we figure out why "const" gives the compiler problems, we'll just have to use
+// this bogus "empty" define to mark things as constant.
+#define CONSTANT
+
+// More explicit than "int"
+typedef int EOFFSET;
+
+// In case it's not alread defined
+typedef int BOOL;
+
+// In case this ever changes
+#ifndef M_PI
+#define M_PI			3.14159265358979323846
+#endif
+
+// Keeps clutter down a bit, when declaring external entity/global method prototypes
+#define DECLARE_GLOBAL_METHOD(MethodName)  extern void DLLEXPORT MethodName( void )
+#define GLOBAL_METHOD(funcname)					void DLLEXPORT funcname(void)
+
+// This is the glue that hooks .MAP entity class names to our CPP classes
+// The _declspec forces them to be exported by name so we can do a lookup with GetProcAddress()
+// The function is used to intialize / allocate the object for the entity
+#ifdef _WIN32
+#define LINK_ENTITY_TO_CLASS(mapClassName,DLLClassName) \
+	extern "C" _declspec( dllexport ) void mapClassName( entvars_t *pev ); \
+	void mapClassName( entvars_t *pev ) { GetClassPtr( (DLLClassName *)pev ); }
+#else
+#define LINK_ENTITY_TO_CLASS(mapClassName,DLLClassName) extern "C" void mapClassName( entvars_t *pev ); void mapClassName( entvars_t *pev ) { GetClassPtr( (DLLClassName *)pev ); }
+#endif
+
+
+//
+// Conversion among the three types of "entity", including identity-conversions.
+//
+#ifdef DEBUG
+	extern edict_t *DBG_EntOfVars(const entvars_t *pev);
+	inline edict_t *ENT(const entvars_t *pev)	{ return DBG_EntOfVars(pev); }
+#else
+	inline edict_t *ENT(const entvars_t *pev)	{ return pev->pContainingEntity; }
+#endif
+inline edict_t *ENT(edict_t *pent)		{ return pent; }
+inline edict_t *ENT(EOFFSET eoffset)			{ return (*g_engfuncs.pfnPEntityOfEntOffset)(eoffset); }
+inline EOFFSET OFFSET(EOFFSET eoffset)			{ return eoffset; }
+inline EOFFSET OFFSET(const edict_t *pent)	
+{ 
+#if _DEBUG
+	if ( !pent )
+		ALERT( at_error, "Bad ent in OFFSET()\n" );
+#endif
+	return (*g_engfuncs.pfnEntOffsetOfPEntity)(pent); 
+}
+inline EOFFSET OFFSET(entvars_t *pev)				
+{ 
+#if _DEBUG
+	if ( !pev )
+		ALERT( at_error, "Bad pev in OFFSET()\n" );
+#endif
+	return OFFSET(ENT(pev)); 
+}
+inline entvars_t *VARS(entvars_t *pev)					{ return pev; }
+
+inline entvars_t *VARS(edict_t *pent)			
+{ 
+	if ( !pent )
+		return NULL;
+
+	return &pent->v; 
+}
+
+inline entvars_t* VARS(EOFFSET eoffset)				{ return VARS(ENT(eoffset)); }
+inline int	  ENTINDEX(const edict_t *pEdict)			{ return (*g_engfuncs.pfnIndexOfEdict)(pEdict); }
+inline edict_t* INDEXENT( int iEdictNum )		{ return (*g_engfuncs.pfnPEntityOfEntIndex)(iEdictNum); }
+
+extern void NetworkMeterMessageBegin(int msg_dest, int msg_type, const float* pOrigin, edict_t* ed);
+
+inline void MESSAGE_BEGIN( int msg_dest, int msg_type, const float *pOrigin, entvars_t *ent ) 
+{
+	NetworkMeterMessageBegin(msg_dest, msg_type, pOrigin, ENT(ent));
+}
+inline void MESSAGE_BEGIN( int msg_dest, int msg_type, const float *pOrigin = NULL, edict_t* ed = NULL) 
+{
+	NetworkMeterMessageBegin(msg_dest, msg_type, pOrigin, ed);
+}
+
+// Testing the three types of "entity" for nullity
+#define eoNullEntity 0
+inline BOOL FNullEnt(EOFFSET eoffset)			{ return eoffset == 0; }
+inline BOOL FNullEnt(const edict_t* pent)	{ return pent == NULL || FNullEnt(OFFSET(pent)); }
+inline BOOL FNullEnt(entvars_t* pev)				{ return pev == NULL || FNullEnt(OFFSET(pev)); }
+
+// Testing strings for nullity
+#define iStringNull 0
+inline BOOL FStringNull(int iString)			{ return iString == iStringNull; }
+
+#define cchMapNameMost 32
+
+// Dot products for view cone checking
+#define VIEW_FIELD_FULL		(float)-1.0 // +-180 degrees
+#define	VIEW_FIELD_WIDE		(float)-0.7 // +-135 degrees 0.1 // +-85 degrees, used for full FOV checks 
+#define	VIEW_FIELD_NARROW	(float)0.7 // +-45 degrees, more narrow check used to set up ranged attacks
+#define	VIEW_FIELD_ULTRA_NARROW	(float)0.9 // +-25 degrees, more narrow check used to set up ranged attacks
+
+// All monsters need this data
+#define		DONT_BLEED			-1
+#define		BLOOD_COLOR_RED		(BYTE)247
+#define		BLOOD_COLOR_YELLOW	(BYTE)195
+#define		BLOOD_COLOR_GREEN	BLOOD_COLOR_YELLOW
+
+typedef enum 
+{
+
+	MONSTERSTATE_NONE = 0,
+	MONSTERSTATE_IDLE,
+	MONSTERSTATE_COMBAT,
+	MONSTERSTATE_ALERT,
+	MONSTERSTATE_HUNT,
+	MONSTERSTATE_PRONE,
+	MONSTERSTATE_SCRIPT,
+	MONSTERSTATE_PLAYDEAD,
+	MONSTERSTATE_DEAD
+
+} MONSTERSTATE;
+
+
+
+// Things that toggle (buttons/triggers/doors) need this
+typedef enum
+	{
+	TS_AT_TOP,
+	TS_AT_BOTTOM,
+	TS_GOING_UP,
+	TS_GOING_DOWN
+	} TOGGLE_STATE;
+
+// Misc useful
+inline BOOL FStrEq(const char*sz1, const char*sz2)
+	{ return (strcmp(sz1, sz2) == 0); }
+inline BOOL FClassnameIs(edict_t* pent, const char* szClassname)
+	{ return FStrEq(STRING(VARS(pent)->classname), szClassname); }
+inline BOOL FClassnameIs(entvars_t* pev, const char* szClassname)
+	{ return FStrEq(STRING(pev->classname), szClassname); }
+
+class CBaseEntity;
+
+// Misc. Prototypes
+extern void			UTIL_SetSize			(entvars_t* pev, const Vector &vecMin, const Vector &vecMax);
+extern float		UTIL_VecToYaw			(const Vector &vec);
+extern Vector		UTIL_VecToAngles		(const Vector &vec);
+extern float		UTIL_AngleMod			(float a);
+extern float		UTIL_AngleDiff			( float destAngle, float srcAngle );
+
+extern CBaseEntity	*UTIL_FindEntityInSphere(CBaseEntity *pStartEntity, const Vector &vecCenter, float flRadius);
+extern CBaseEntity	*UTIL_FindEntityByString(CBaseEntity *pStartEntity, const char *szKeyword, const char *szValue );
+extern CBaseEntity	*UTIL_FindEntityByClassname(CBaseEntity *pStartEntity, const char *szName );
+extern CBaseEntity	*UTIL_FindEntityByTargetname(CBaseEntity *pStartEntity, const char *szName );
+extern CBaseEntity	*UTIL_FindEntityGeneric(const char *szName, Vector &vecSrc, float flRadius );
+int UTIL_CountEntitiesInSphere(const Vector& inVecCenter, float inRadius, const char* inClassName);
+
+// returns a CBaseEntity pointer to a player by index.  Only returns if the player is spawned and connected
+// otherwise returns NULL
+// Index is 1 based
+extern CBaseEntity	*UTIL_PlayerByIndex( int playerIndex );
+
+#define UTIL_EntitiesInPVS(pent)			(*g_engfuncs.pfnEntitiesInPVS)(pent)
+extern void			UTIL_MakeVectors		(const Vector &vecAngles);
+
+// Pass in an array of pointers and an array size, it fills the array and returns the number inserted
+extern int			UTIL_MonstersInSphere( CBaseEntity **pList, int listMax, const Vector &center, float radius );
+extern int			UTIL_EntitiesInBox( CBaseEntity **pList, int listMax, const Vector &mins, const Vector &maxs, int flagMask );
+
+inline void UTIL_MakeVectorsPrivate( const Vector &vecAngles, float *p_vForward, float *p_vRight, float *p_vUp )
+{
+	g_engfuncs.pfnAngleVectors( vecAngles, p_vForward, p_vRight, p_vUp );
+}
+
+extern void			UTIL_MakeAimVectors		( const Vector &vecAngles ); // like MakeVectors, but assumes pitch isn't inverted
+extern void			UTIL_MakeInvVectors		( const Vector &vec, globalvars_t *pgv );
+
+extern void			UTIL_Error				( CBaseEntity *pEntity, const char *pMessage );
+extern void			UTIL_SetOrigin			( entvars_t* pev, const Vector &vecOrigin );
+extern void			UTIL_EmitAmbientSound	( edict_t *entity, const Vector &vecOrigin, const char *samp, float vol, float attenuation, int fFlags, int pitch );
+extern void			UTIL_ParticleEffect		( const Vector &vecOrigin, const Vector &vecDirection, ULONG ulColor, ULONG ulCount );
+extern void			UTIL_ScreenShake		( const Vector &center, float amplitude, float frequency, float duration, float radius );
+extern void			UTIL_ScreenShakeAll		( const Vector &center, float amplitude, float frequency, float duration );
+extern void			UTIL_ShowMessage		( const char *pString, CBaseEntity *pPlayer);
+extern void			UTIL_ShowMessage2		( const char *pString, CBaseEntity *pPlayer, bool inIsToolTip = false);
+extern void			UTIL_ShowMessageAll		( const char *pString );
+extern void			UTIL_ScreenFadeAll		( const Vector &color, float fadeTime, float holdTime, int alpha, int flags );
+extern void			UTIL_ScreenFade			( CBaseEntity *pEntity, const Vector &color, float fadeTime, float fadeHold, int alpha, int flags );
+
+typedef enum { ignore_monsters=1, dont_ignore_monsters=0, missile=2 } IGNORE_MONSTERS;
+typedef enum { ignore_glass=1, dont_ignore_glass=0 } IGNORE_GLASS;
+extern void			UTIL_TraceLine			(const Vector &vecStart, const Vector &vecEnd, IGNORE_MONSTERS igmon, edict_t *pentIgnore, TraceResult *ptr);
+extern void			UTIL_TraceLine			(const Vector &vecStart, const Vector &vecEnd, IGNORE_MONSTERS igmon, IGNORE_GLASS ignoreGlass, edict_t *pentIgnore, TraceResult *ptr);
+typedef enum { point_hull=0, human_hull=1, large_hull=2, head_hull=3 };
+extern void			UTIL_TraceHull			(const Vector &vecStart, const Vector &vecEnd, IGNORE_MONSTERS igmon, int hullNumber, edict_t *pentIgnore, TraceResult *ptr);
+extern TraceResult	UTIL_GetGlobalTrace		(void);
+extern void			UTIL_TraceModel			(const Vector &vecStart, const Vector &vecEnd, int hullNumber, edict_t *pentModel, TraceResult *ptr);
+extern Vector		UTIL_GetAimVector		(edict_t* pent, float flSpeed);
+extern int			UTIL_PointContents		(const Vector &vec);
+
+extern int			UTIL_IsMasterTriggered	(string_t sMaster, CBaseEntity *pActivator);
+extern void			UTIL_BloodStream( const Vector &origin, const Vector &direction, int color, int amount );
+extern void			UTIL_BloodDrips( const Vector &origin, const Vector &direction, int color, int amount );
+extern Vector		UTIL_RandomBloodVector( void );
+extern BOOL			UTIL_ShouldShowBlood( int bloodColor );
+extern void			UTIL_BloodDecalTrace( TraceResult *pTrace, int bloodColor );
+extern void			UTIL_DecalTrace( TraceResult *pTrace, int decalNumber );
+extern void			UTIL_PlayerDecalTrace( TraceResult *pTrace, int playernum, int decalNumber, BOOL bIsCustom );
+extern void			UTIL_GunshotDecalTrace( TraceResult *pTrace, int decalNumber );
+extern void			UTIL_Sparks( const Vector &position );
+extern void			UTIL_Ricochet( const Vector &position, float scale );
+extern void			UTIL_StringToVector( float *pVector, const char *pString );
+extern void			UTIL_StringToIntArray( int *pVector, int count, const char *pString );
+extern Vector		UTIL_ClampVectorToBox( const Vector &input, const Vector &clampSize );
+extern float		UTIL_Approach( float target, float value, float speed );
+extern float		UTIL_ApproachAngle( float target, float value, float speed );
+extern float		UTIL_AngleDistance( float next, float cur );
+
+extern char			*UTIL_VarArgs( char *format, ... );
+extern void			UTIL_Remove( CBaseEntity *pEntity );
+extern BOOL			UTIL_IsValidEntity( edict_t *pent );
+extern BOOL			UTIL_TeamsMatch( const char *pTeamName1, const char *pTeamName2 );
+
+// Use for ease-in, ease-out style interpolation (accel/decel)
+extern float		UTIL_SplineFraction( float value, float scale );
+
+// Search for water transition along a vertical line
+extern float		UTIL_WaterLevel( const Vector &position, float minz, float maxz );
+extern void			UTIL_Bubbles( Vector mins, Vector maxs, int count );
+extern void			UTIL_BubbleTrail( Vector from, Vector to, int count );
+
+// allows precacheing of other entities
+extern void			UTIL_PrecacheOther( const char *szClassname );
+
+// prints a message to each client
+extern void			UTIL_ClientPrintAll( int msg_dest, const char *msg_name, const char *param1 = NULL, const char *param2 = NULL, const char *param3 = NULL, const char *param4 = NULL );
+inline void			UTIL_CenterPrintAll( const char *msg_name, const char *param1 = NULL, const char *param2 = NULL, const char *param3 = NULL, const char *param4 = NULL ) 
+{
+	UTIL_ClientPrintAll( HUD_PRINTCENTER, msg_name, param1, param2, param3, param4 );
+}
+
+class CBasePlayerItem;
+class CBasePlayer;
+extern BOOL UTIL_GetNextBestWeapon( CBasePlayer *pPlayer, CBasePlayerItem *pCurrentWeapon );
+
+// prints messages through the HUD
+extern void ClientPrint( entvars_t *client, int msg_dest, const char *msg_name, const char *param1 = NULL, const char *param2 = NULL, const char *param3 = NULL, const char *param4 = NULL );
+
+typedef struct hudtextparms_s
+{
+	float		x;
+	float		y;
+	int			effect;
+	byte		r1, g1, b1, a1;
+	byte		r2, g2, b2, a2;
+	float		fadeinTime;
+	float		fadeoutTime;
+	float		holdTime;
+	float		fxTime;
+	int			channel;
+} hudtextparms_t;
+
+// prints as transparent 'title' to the HUD
+extern void			UTIL_HudMessageAll( const hudtextparms_t &textparms, const char *pMessage );
+extern void			UTIL_HudMessage( CBaseEntity *pEntity, const hudtextparms_t &textparms, const char *pMessage );
+
+// for handy use with ClientPrint params
+extern char *UTIL_dtos1( int d );
+extern char *UTIL_dtos2( int d );
+extern char *UTIL_dtos3( int d );
+extern char *UTIL_dtos4( int d );
+
+// Writes message to console with timestamp and FragLog header.
+extern void			UTIL_LogPrintf( char *fmt, ... );
+
+// Sorta like FInViewCone, but for nonmonsters. 
+extern float UTIL_DotPoints ( const Vector &vecSrc, const Vector &vecCheck, const Vector &vecDir );
+
+extern void UTIL_StripToken( const char *pKey, char *pDest );// for redundant keynames
+
+// Misc functions
+extern void SetMovedir(entvars_t* pev);
+extern Vector VecBModelOrigin( entvars_t* pevBModel );
+extern int BuildChangeList( LEVELLIST *pLevelList, int maxList );
+
+//
+// How did I ever live without ASSERT?
+//
+#include "localassert.h"
+//#ifdef	DEBUG
+//void DBG_AssertFunction(BOOL fExpr, const char* szExpr, const char* szFile, int szLine, const char* szMessage);
+//#define ASSERT(f)		DBG_AssertFunction(f, #f, __FILE__, __LINE__, NULL)
+//#define ASSERTSZ(f, sz)	DBG_AssertFunction(f, #f, __FILE__, __LINE__, sz)
+//#else	// !DEBUG
+//#define ASSERT(f)
+//#define ASSERTSZ(f, sz)
+//#endif	// !DEBUG
+
+extern DLL_GLOBAL const Vector g_vecZero;
+
+//
+// Constants that were used only by QC (maybe not used at all now)
+//
+// Un-comment only as needed
+//
+#define LANGUAGE_ENGLISH				0
+#define LANGUAGE_GERMAN					1
+#define LANGUAGE_FRENCH					2
+#define LANGUAGE_BRITISH				3
+
+extern DLL_GLOBAL int			g_Language;
+
+#define AMBIENT_SOUND_STATIC			0	// medium radius attenuation
+#define AMBIENT_SOUND_EVERYWHERE		1
+#define AMBIENT_SOUND_SMALLRADIUS		2
+#define AMBIENT_SOUND_MEDIUMRADIUS		4
+#define AMBIENT_SOUND_LARGERADIUS		8
+#define AMBIENT_SOUND_START_SILENT		16
+#define AMBIENT_SOUND_NOT_LOOPING		32
+
+#define SPEAKER_START_SILENT			1	// wait for trigger 'on' to start announcements
+
+#define SND_SPAWNING		(1<<8)		// duplicated in protocol.h we're spawing, used in some cases for ambients 
+#define SND_STOP			(1<<5)		// duplicated in protocol.h stop sound
+#define SND_CHANGE_VOL		(1<<6)		// duplicated in protocol.h change sound vol
+#define SND_CHANGE_PITCH	(1<<7)		// duplicated in protocol.h change sound pitch
+
+#define	LFO_SQUARE			1
+#define LFO_TRIANGLE		2
+#define LFO_RANDOM			3
+
+// func_rotating
+#define SF_BRUSH_ROTATE_Y_AXIS		0
+#define SF_BRUSH_ROTATE_INSTANT		1
+#define SF_BRUSH_ROTATE_BACKWARDS	2
+#define SF_BRUSH_ROTATE_Z_AXIS		4
+#define SF_BRUSH_ROTATE_X_AXIS		8
+#define SF_PENDULUM_AUTO_RETURN		16
+#define	SF_PENDULUM_PASSABLE		32
+
+
+#define SF_BRUSH_ROTATE_SMALLRADIUS	128
+#define SF_BRUSH_ROTATE_MEDIUMRADIUS 256
+#define SF_BRUSH_ROTATE_LARGERADIUS 512
+
+#define PUSH_BLOCK_ONLY_X	1
+#define PUSH_BLOCK_ONLY_Y	2
+
+#define VEC_HULL_MIN		Vector(-16, -16, -36)
+#define VEC_HULL_MAX		Vector( 16,  16,  36)
+#define VEC_HUMAN_HULL_MIN	Vector( -16, -16, 0 )
+#define VEC_HUMAN_HULL_MAX	Vector( 16, 16, 72 )
+#define VEC_HUMAN_HULL_DUCK	Vector( 16, 16, 36 )
+
+#define VEC_VIEW			Vector( 0, 0, 28 )
+
+#define VEC_DUCK_HULL_MIN	Vector(-16, -16, -18 )
+#define VEC_DUCK_HULL_MAX	Vector( 16,  16,  18)
+//#define VEC_DUCK_VIEW		Vector( 0, 0, 12 )
+
+#define SVC_TEMPENTITY		23
+#define SVC_INTERMISSION	30
+#define SVC_CDTRACK			32
+#define SVC_WEAPONANIM		35
+#define SVC_ROOMTYPE		37
+
+// triggers
+#define	SF_TRIGGER_ALLOWMONSTERS	1// monsters allowed to fire this trigger
+#define	SF_TRIGGER_NOCLIENTS		2// players not allowed to fire this trigger
+#define SF_TRIGGER_PUSHABLES		4// only pushables can fire this trigger
+
+// func breakable
+#define SF_BREAK_TRIGGER_ONLY	1// may only be broken by trigger
+#define	SF_BREAK_TOUCH			2// can be 'crashed through' by running player (plate glass)
+#define SF_BREAK_PRESSURE		4// can be broken by a player standing on it
+#define SF_BREAK_CROWBAR		256// instant break if hit with crowbar
+
+// func_pushable (it's also func_breakable, so don't collide with those flags)
+#define SF_PUSH_BREAKABLE		128
+
+#define SF_LIGHT_START_OFF		1
+
+#define SPAWNFLAG_NOMESSAGE	1
+#define SPAWNFLAG_NOTOUCH	1
+#define SPAWNFLAG_DROIDONLY	4
+
+#define SPAWNFLAG_USEONLY	1		// can't be touched, must be used (buttons)
+
+#define TELE_PLAYER_ONLY	1
+#define TELE_SILENT			2
+
+#define SF_TRIG_PUSH_ONCE		1
+
+
+// Sound Utilities
+
+// sentence groups
+#define CBSENTENCENAME_MAX 16
+#define CVOXFILESENTENCEMAX		1536		// max number of sentences in game. NOTE: this must match
+											// CVOXFILESENTENCEMAX in engine\sound.h!!!
+
+extern char gszallsentencenames[CVOXFILESENTENCEMAX][CBSENTENCENAME_MAX];
+extern int gcallsentences;
+
+int USENTENCEG_Pick(int isentenceg, char *szfound);
+int USENTENCEG_PickSequential(int isentenceg, char *szfound, int ipick, int freset);
+void USENTENCEG_InitLRU(unsigned char *plru, int count);
+
+void SENTENCEG_Init();
+void SENTENCEG_Stop(edict_t *entity, int isentenceg, int ipick);
+int SENTENCEG_PlayRndI(edict_t *entity, int isentenceg, float volume, float attenuation, int flags, int pitch);
+int SENTENCEG_PlayRndSz(edict_t *entity, const char *szrootname, float volume, float attenuation, int flags, int pitch);
+int SENTENCEG_PlaySequentialSz(edict_t *entity, const char *szrootname, float volume, float attenuation, int flags, int pitch, int ipick, int freset);
+int SENTENCEG_GetIndex(const char *szrootname);
+int SENTENCEG_Lookup(const char *sample, char *sentencenum);
+
+void TEXTURETYPE_Init();
+char TEXTURETYPE_Find(char *name);
+float TEXTURETYPE_PlaySound(TraceResult *ptr,  Vector vecSrc, Vector vecEnd, int iBulletType);
+
+// NOTE: use EMIT_SOUND_DYN to set the pitch of a sound. Pitch of 100
+// is no pitch shift.  Pitch > 100 up to 255 is a higher pitch, pitch < 100
+// down to 1 is a lower pitch.   150 to 70 is the realistic range.
+// EMIT_SOUND_DYN with pitch != 100 should be used sparingly, as it's not quite as
+// fast as EMIT_SOUND (the pitchshift mixer is not native coded).
+
+void EMIT_SOUND_DYN(edict_t *entity, int channel, const char *sample, float volume, float attenuation,
+						   int flags, int pitch);
+
+
+inline void EMIT_SOUND(edict_t *entity, int channel, const char *sample, float volume, float attenuation)
+{
+	EMIT_SOUND_DYN(entity, channel, sample, volume, attenuation, 0, PITCH_NORM);
+}
+
+inline void STOP_SOUND(edict_t *entity, int channel, const char *sample)
+{
+	EMIT_SOUND_DYN(entity, channel, sample, 0, 0, SND_STOP, PITCH_NORM);
+}
+
+void EMIT_SOUND_SUIT(edict_t *entity, const char *sample);
+void EMIT_GROUPID_SUIT(edict_t *entity, int isentenceg);
+void EMIT_GROUPNAME_SUIT(edict_t *entity, const char *groupname);
+
+#define PRECACHE_SOUND_ARRAY( a ) \
+	{ for (int i = 0; i < ARRAYSIZE( a ); i++ ) PRECACHE_SOUND((char *) a [i]); }
+
+#define EMIT_SOUND_ARRAY_DYN( chan, array ) \
+	EMIT_SOUND_DYN ( ENT(pev), chan , array [ RANDOM_LONG(0,ARRAYSIZE( array )-1) ], 1.0, ATTN_NORM, 0, RANDOM_LONG(95,105) ); 
+
+#define RANDOM_SOUND_ARRAY( array ) (array) [ RANDOM_LONG(0,ARRAYSIZE( (array) )-1) ]
+
+#define PLAYBACK_EVENT( flags, who, index ) PLAYBACK_EVENT_FULL( flags, who, index, 0, (float *)&g_vecZero, (float *)&g_vecZero, 0.0, 0.0, 0, 0, 0, 0 );
+#define PLAYBACK_EVENT_DELAY( flags, who, index, delay ) PLAYBACK_EVENT_FULL( flags, who, index, delay, (float *)&g_vecZero, (float *)&g_vecZero, 0.0, 0.0, 0, 0, 0, 0 );
+
+#define GROUP_OP_AND	0
+#define GROUP_OP_NAND	1
+
+extern int g_groupmask;
+extern int g_groupop;
+
+class UTIL_GroupTrace
+{
+public:
+	UTIL_GroupTrace( int groupmask, int op );
+	~UTIL_GroupTrace( void );
+
+private:
+	int m_oldgroupmask, m_oldgroupop;
+};
+
+void UTIL_SetGroupTrace( int groupmask, int op );
+void UTIL_UnsetGroupTrace( void );
+
+int UTIL_SharedRandomLong( unsigned int seed, int low, int high );
+float UTIL_SharedRandomFloat( unsigned int seed, float low, float high );
+
+float UTIL_WeaponTimeBase( void );
+
+// Leave last parameter to make the same as pEntity
+void UTIL_SayText( const char *pText, CBaseEntity *pEntity, int inEntIndex = -1);
+void UTIL_SayTextAll( const char *pText, CBaseEntity *pEntity, int inEntIndex = -1);
+
+//voogru: hope you dont mind me adding this, I use this in NSAdmin 
+// Statements like:
+//		#pragma message(Reminder "Fix this problem!")
+// Which will cause messages like:
+//		C:\Source\Project\main.cpp(47): Reminder: Fix this problem!
+// to show up during compiles.  Note that you can NOT use the
+// words "error" or "warning" in your reminders, since it will
+// make the IDE think it should abort execution.  You can double
+// click on these messages and jump to the line in question.
+#define Stringize( L )			#L
+#define MakeString( M, L )		M(L)
+#define $Line					\
+	MakeString( Stringize, __LINE__ )
+#define Reminder				\
+	__FILE__ "(" $Line ") : Reminder: "
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/vector.h b/main/source/dlls/vector.h
new file mode 100644
index 00000000..e1e6081d
--- /dev/null
+++ b/main/source/dlls/vector.h
@@ -0,0 +1,20 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef VECTOR2D_H
+#define VECTOR2D_H
+
+#include "common/vectorclasses.h"
+
+#endif
\ No newline at end of file
diff --git a/main/source/dlls/weapons.cpp b/main/source/dlls/weapons.cpp
new file mode 100644
index 00000000..641b003e
--- /dev/null
+++ b/main/source/dlls/weapons.cpp
@@ -0,0 +1,1946 @@
+//	
+//	Copyright (c) 1999, Valve LLC. All rights reserved.
+//	
+//	This product contains software technology licensed from Id 
+//	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+//	All Rights Reserved.
+//	
+//	Use, distribution, and modification of this source code and/or resulting
+//	object code is restricted to non-commercial enhancements to products from
+//	Valve LLC.  All other use, distribution, or modification is prohibited
+//	without written permission from Valve LLC.
+//
+//	===== weapons.cpp ========================================================
+//
+//  functions governing the selection/use of weapons for players
+//
+// $Workfile: weapons.cpp $
+// $Date: 2002/11/22 21:13:52 $
+//
+//-------------------------------------------------------------------------------
+// $Log: weapons.cpp,v $
+// Revision 1.49  2002/11/22 21:13:52  Flayra
+// - mp_consistency changes
+//
+// Revision 1.48  2002/11/12 02:19:43  Flayra
+// - Fixed problem where friendly bulletfire was doing damage
+//
+// Revision 1.47  2002/10/24 21:19:11  Flayra
+// - Reworked jetpack effects
+// - Added a few extra sounds
+//
+// Revision 1.46  2002/10/16 00:41:15  Flayra
+// - Removed unneeds sounds and events
+// - Added distress beacon event
+// - Added general purpose particle event
+//
+// Revision 1.45  2002/09/25 20:40:09  Flayra
+// - Play different sound for aliens when they get weapons
+//
+// Revision 1.44  2002/09/23 22:04:00  Flayra
+// - Regular update
+//
+// Revision 1.43  2002/08/31 18:01:18  Flayra
+// - Work at VALVe
+//
+// Revision 1.42  2002/07/26 23:01:05  Flayra
+// - Precache numerical feedback event
+//
+// Revision 1.41  2002/07/23 16:48:37  Flayra
+// - Added distress beacon
+//
+// Revision 1.40  2002/07/08 16:35:17  Flayra
+// - Added document header, updates for cheat protection, added constants
+//
+//===============================================================================
+#include "util/nowarnings.h"
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "player.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "soundent.h"
+#include "decals.h"
+#include "gamerules.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHAlienEquipmentConstants.h"
+#include "mod/AvHPlayer.h"
+#include "mod/AvHGamerules.h"
+
+extern CGraph	WorldGraph;
+extern int gEvilImpulse101;
+
+int gJetpackEventID;
+int gStartOverwatchEventID;
+int gEndOverwatchEventID;
+int gTeleportEventID;
+int gBlinkEffectSuccessEventID;
+int gPhaseInEventID;
+int gSiegeHitEventID;
+int gSiegeViewHitEventID;
+int gCommanderPointsAwardedEventID;
+int gAlienSightOnEventID;
+int gAlienSightOffEventID;
+//int gParalysisStartEventID;
+int gRegenerationEventID;
+int gStartCloakEventID;
+int gEndCloakEventID;
+int gSporeCloudEventID;
+int gUmbraCloudEventID;
+int gStopScreamEventID;
+
+int gWelderEventID;
+int gWelderConstEventID;
+//int gWallJumpEventID;
+//int gFlightEventID;
+int gEmptySoundEventID;
+int gNumericalInfoEventID;
+int gInvalidActionEventID;
+int gParticleEventID;
+int gDistressBeaconEventID;
+int gWeaponAnimationEventID;
+int gLevelUpEventID;
+int gMetabolizeSuccessEventID;
+
+#define NOT_USED 255
+
+DLL_GLOBAL	short	g_sModelIndexLaser;// holds the index for the laser beam
+DLL_GLOBAL  const char *g_pModelNameLaser = "sprites/laserbeam.spr";
+DLL_GLOBAL	short	g_sModelIndexLaserDot;// holds the index for the laser beam dot
+DLL_GLOBAL	short	g_sModelIndexFireball;// holds the index for the fireball
+DLL_GLOBAL	short	g_sModelIndexSmoke;// holds the index for the smoke cloud
+DLL_GLOBAL	short	g_sModelIndexWExplosion;// holds the index for the underwater explosion
+DLL_GLOBAL	short	g_sModelIndexBubbles;// holds the index for the bubbles model
+DLL_GLOBAL	short	g_sModelIndexBloodDrop;// holds the sprite index for the initial blood
+DLL_GLOBAL	short	g_sModelIndexBloodSpray;// holds the sprite index for splattered blood
+
+ItemInfo CBasePlayerItem::ItemInfoArray[MAX_WEAPONS];
+AmmoInfo CBasePlayerItem::AmmoInfoArray[MAX_AMMO_SLOTS];
+
+extern int gmsgCurWeapon;
+
+MULTIDAMAGE gMultiDamage;
+
+#define TRACER_FREQ		4			// Tracers fire every fourth bullet
+
+
+//=========================================================
+// MaxAmmoCarry - pass in a name and this function will tell
+// you the maximum amount of that type of ammunition that a 
+// player can carry.
+//=========================================================
+int MaxAmmoCarry( int iszName )
+{
+	for ( int i = 0;  i < MAX_WEAPONS; i++ )
+	{
+		if ( CBasePlayerItem::ItemInfoArray[i].pszAmmo1 && !strcmp( STRING(iszName), CBasePlayerItem::ItemInfoArray[i].pszAmmo1 ) )
+			return CBasePlayerItem::ItemInfoArray[i].iMaxAmmo1;
+		if ( CBasePlayerItem::ItemInfoArray[i].pszAmmo2 && !strcmp( STRING(iszName), CBasePlayerItem::ItemInfoArray[i].pszAmmo2 ) )
+			return CBasePlayerItem::ItemInfoArray[i].iMaxAmmo2;
+	}
+
+	ALERT( at_console, "MaxAmmoCarry() doesn't recognize '%s'!\n", STRING( iszName ) );
+	return -1;
+}
+
+	
+/*
+==============================================================================
+
+MULTI-DAMAGE
+
+Collects multiple small damages into a single damage
+
+==============================================================================
+*/
+
+//
+// ClearMultiDamage - resets the global multi damage accumulator
+//
+void ClearMultiDamage(void)
+{
+	gMultiDamage.pEntity = NULL;
+	gMultiDamage.amount	= 0;
+	gMultiDamage.type = 0;
+}
+
+//
+// ApplyMultiDamage - inflicts contents of global multi damage register on gMultiDamage.pEntity
+//
+// GLOBALS USED:
+//		gMultiDamage
+
+void ApplyMultiDamage(entvars_t *pevInflictor, entvars_t *pevAttacker )
+{
+	Vector		vecSpot1;//where blood comes from
+	Vector		vecDir;//direction blood should go
+	TraceResult	tr;
+	
+	if ( !gMultiDamage.pEntity )
+		return;
+
+	float theDamage = gMultiDamage.amount;
+	gMultiDamage.pEntity->TakeDamage(pevInflictor, pevAttacker, theDamage, gMultiDamage.type );
+}
+
+
+// GLOBALS USED:
+//		gMultiDamage
+
+void AddMultiDamage( entvars_t *pevInflictor, CBaseEntity *pEntity, float flDamage, int bitsDamageType)
+{
+	if ( !pEntity )
+		return;
+	
+	gMultiDamage.type |= bitsDamageType;
+
+	if ( pEntity != gMultiDamage.pEntity )
+	{
+		ApplyMultiDamage(pevInflictor,pevInflictor); // UNDONE: wrong attacker!
+		gMultiDamage.pEntity	= pEntity;
+		gMultiDamage.amount		= 0;
+	}
+
+	gMultiDamage.amount += flDamage;
+}
+
+/*
+================
+SpawnBlood
+================
+*/
+void SpawnBlood(Vector vecSpot, int bloodColor, float flDamage)
+{
+	if(flDamage >= 0.0f)
+	{
+		if(bloodColor == DONT_BLEED)
+		{
+			UTIL_Sparks(vecSpot);
+		}
+		else
+		{
+			UTIL_BloodDrips( vecSpot, g_vecAttackDir, bloodColor, (int)flDamage );
+		}
+	}
+}
+
+
+int DamageDecal( CBaseEntity *pEntity, int bitsDamageType )
+{
+	if ( !pEntity )
+		return (DECAL_GUNSHOT1 + RANDOM_LONG(0,4));
+	
+	return pEntity->DamageDecal( bitsDamageType );
+}
+
+void DecalGunshot( TraceResult *pTrace, int iBulletType )
+{
+	// Is the entity valid
+	if ( !UTIL_IsValidEntity( pTrace->pHit ) )
+		return;
+
+	if ( VARS(pTrace->pHit)->solid == SOLID_BSP || VARS(pTrace->pHit)->movetype == MOVETYPE_PUSHSTEP )
+	{
+		CBaseEntity *pEntity = NULL;
+		// Decal the wall with a gunshot
+		if ( !FNullEnt(pTrace->pHit) )
+			pEntity = CBaseEntity::Instance(pTrace->pHit);
+
+//		switch( iBulletType )
+//		{
+//		case BULLET_PLAYER_9MM:
+//		case BULLET_MONSTER_9MM:
+//		case BULLET_PLAYER_MP5:
+//		case BULLET_MONSTER_MP5:
+//		case BULLET_PLAYER_BUCKSHOT:
+//		case BULLET_PLAYER_357:
+//		default:
+			// smoke and decal
+			UTIL_GunshotDecalTrace( pTrace, DamageDecal( pEntity, DMG_BULLET ) );
+//			break;
+//		case BULLET_MONSTER_12MM:
+//			// smoke and decal
+//			UTIL_GunshotDecalTrace( pTrace, DamageDecal( pEntity, DMG_BULLET ) );
+//			break;
+//		case BULLET_PLAYER_CROWBAR:
+//			// wall decal
+//			UTIL_DecalTrace( pTrace, DamageDecal( pEntity, DMG_CLUB ) );
+//			break;
+//		}
+	}
+}
+
+
+
+//
+// EjectBrass - tosses a brass shell from passed origin at passed velocity
+//
+void EjectBrass ( const Vector &vecOrigin, const Vector &vecVelocity, float rotation, int model, int soundtype )
+{
+	// FIX: when the player shoots, their gun isn't in the same position as it is on the model other players see.
+
+	MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, vecOrigin );
+		WRITE_BYTE( TE_MODEL);
+		WRITE_COORD( vecOrigin.x);
+		WRITE_COORD( vecOrigin.y);
+		WRITE_COORD( vecOrigin.z);
+		WRITE_COORD( vecVelocity.x);
+		WRITE_COORD( vecVelocity.y);
+		WRITE_COORD( vecVelocity.z);
+		WRITE_ANGLE( rotation );
+		WRITE_SHORT( model );
+		WRITE_BYTE ( soundtype);
+		WRITE_BYTE ( 25 );// 2.5 seconds
+	MESSAGE_END();
+}
+
+
+#if 0
+// UNDONE: This is no longer used?
+void ExplodeModel( const Vector &vecOrigin, float speed, int model, int count )
+{
+	MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, vecOrigin );
+		WRITE_BYTE ( TE_EXPLODEMODEL );
+		WRITE_COORD( vecOrigin.x );
+		WRITE_COORD( vecOrigin.y );
+		WRITE_COORD( vecOrigin.z );
+		WRITE_COORD( speed );
+		WRITE_SHORT( model );
+		WRITE_SHORT( count );
+		WRITE_BYTE ( 15 );// 1.5 seconds
+	MESSAGE_END();
+}
+#endif
+
+
+int giAmmoIndex = 0;
+
+// Precaches the ammo and queues the ammo info for sending to clients
+void AddAmmoNameToAmmoRegistry( const char *szAmmoname )
+{
+	// make sure it's not already in the registry
+	for ( int i = 0; i < MAX_AMMO_SLOTS; i++ )
+	{
+		if ( !CBasePlayerItem::AmmoInfoArray[i].pszName)
+			continue;
+
+		if ( stricmp( CBasePlayerItem::AmmoInfoArray[i].pszName, szAmmoname ) == 0 )
+			return; // ammo already in registry, just quite
+	}
+
+
+	giAmmoIndex++;
+	ASSERT( giAmmoIndex < MAX_AMMO_SLOTS );
+	if ( giAmmoIndex >= MAX_AMMO_SLOTS )
+		giAmmoIndex = 0;
+
+	CBasePlayerItem::AmmoInfoArray[giAmmoIndex].pszName = szAmmoname;
+	CBasePlayerItem::AmmoInfoArray[giAmmoIndex].iId = giAmmoIndex;   // yes, this info is redundant
+}
+
+
+// Precaches the weapon and queues the weapon info for sending to clients
+void UTIL_PrecacheOtherWeapon( const char *szClassname )
+{
+	edict_t	*pent;
+
+	pent = CREATE_NAMED_ENTITY( MAKE_STRING( szClassname ) );
+	if ( FNullEnt( pent ) )
+	{
+		ALERT ( at_console, "NULL Ent in UTIL_PrecacheOtherWeapon\n" );
+		return;
+	}
+	
+	CBaseEntity *pEntity = CBaseEntity::Instance (VARS( pent ));
+
+	if (pEntity)
+	{
+		ItemInfo II;
+		pEntity->Precache( );
+		memset( &II, 0, sizeof II );
+		if ( ((CBasePlayerItem*)pEntity)->GetItemInfo( &II ) )
+		{
+			CBasePlayerItem::ItemInfoArray[II.iId] = II;
+
+			if ( II.pszAmmo1 && *II.pszAmmo1 )
+			{
+				AddAmmoNameToAmmoRegistry( II.pszAmmo1 );
+			}
+
+			if ( II.pszAmmo2 && *II.pszAmmo2 )
+			{
+				AddAmmoNameToAmmoRegistry( II.pszAmmo2 );
+			}
+
+			memset( &II, 0, sizeof II );
+		}
+	}
+
+	REMOVE_ENTITY(pent);
+}
+
+// called by worldspawn
+void W_Precache(void)
+{
+	memset( CBasePlayerItem::ItemInfoArray, 0, sizeof(CBasePlayerItem::ItemInfoArray) );
+	memset( CBasePlayerItem::AmmoInfoArray, 0, sizeof(CBasePlayerItem::AmmoInfoArray) );
+	giAmmoIndex = 0;
+
+	// Marine weapons
+	//UTIL_PrecacheOtherWeapon("weapon_9mmhandgun");
+    //UTIL_PrecacheOtherWeapon("weapon_glock");
+	//UTIL_PrecacheOther("ammo_9mmclip");
+
+	// Player assets
+	PRECACHE_UNMODIFIED_MODEL(kReadyRoomModel);
+	PRECACHE_UNMODIFIED_MODEL(kMarineSoldierModel);
+	PRECACHE_UNMODIFIED_MODEL(kHeavySoldierModel);
+	PRECACHE_UNMODIFIED_MODEL(kAlienLevelOneModel);
+	PRECACHE_UNMODIFIED_SOUND(kDistressBeaconSound);
+	PRECACHE_UNMODIFIED_SOUND(kLevelUpMarineSound);
+	PRECACHE_UNMODIFIED_SOUND(kLevelUpAlienSound);
+	PRECACHE_UNMODIFIED_SOUND(kAlienBuildingSound1);
+	PRECACHE_UNMODIFIED_SOUND(kAlienBuildingSound2);
+	PRECACHE_SOUND(kMyHiveEasterEgg);
+	
+	//PRECACHE_UNMODIFIED_SOUND(kAlienAbilitiesGrantedSound);
+	//PRECACHE_UNMODIFIED_SOUND(kAlienAbilitiesLostSound);
+	
+	PRECACHE_UNMODIFIED_MODEL(kAlienLevelTwoModel);
+	PRECACHE_UNMODIFIED_MODEL(kAlienLevelThreeModel);
+	PRECACHE_UNMODIFIED_MODEL(kAlienLevelFourModel);
+	PRECACHE_UNMODIFIED_MODEL(kAlienLevelFiveModel);
+
+    PRECACHE_UNMODIFIED_MODEL(kMarineCommanderModel);
+    PRECACHE_UNMODIFIED_MODEL(kAlienGestateModel);
+
+	#ifndef AVH_MAPPER_BUILD
+	UTIL_PrecacheOtherWeapon(kwsMine);
+    UTIL_PrecacheOtherWeapon(kwsKnife);
+    UTIL_PrecacheOtherWeapon(kwsMachineGun);
+    UTIL_PrecacheOtherWeapon(kwsPistol);
+    UTIL_PrecacheOtherWeapon(kwsShotGun);
+    UTIL_PrecacheOtherWeapon(kwsHeavyMachineGun);
+    UTIL_PrecacheOtherWeapon(kwsGrenadeGun);
+    UTIL_PrecacheOtherWeapon(kwsGrenade);
+
+	// Alien weapons
+	UTIL_PrecacheOtherWeapon(kwsSpitGun);
+	UTIL_PrecacheOther(kwsSpitProjectile);
+	UTIL_PrecacheOther(kwsWebProjectile);
+	UTIL_PrecacheOtherWeapon(kwsClaws);
+	UTIL_PrecacheOtherWeapon(kwsSwipe);
+	UTIL_PrecacheOtherWeapon(kwsSporeGun);
+	UTIL_PrecacheOther(kwsSporeProjectile);
+//	UTIL_PrecacheOtherWeapon(kwsParalysisGun);
+	UTIL_PrecacheOtherWeapon(kwsSpikeGun);
+	UTIL_PrecacheOtherWeapon(kwsBiteGun);
+	UTIL_PrecacheOtherWeapon(kwsBite2Gun);
+	UTIL_PrecacheOtherWeapon(kwsHealingSpray);
+	UTIL_PrecacheOtherWeapon(kwsWebSpinner);
+//	UTIL_PrecacheOtherWeapon(kwsBabblerGun);
+	UTIL_PrecacheOtherWeapon(kwsPrimalScream);
+	UTIL_PrecacheOtherWeapon(kwsParasiteGun);
+	UTIL_PrecacheOtherWeapon(kwsMetabolize);
+	UTIL_PrecacheOtherWeapon(kwsUmbraGun);
+	UTIL_PrecacheOtherWeapon(kwsBlinkGun);
+	UTIL_PrecacheOtherWeapon(kwsDivineWind);
+	UTIL_PrecacheOtherWeapon(kwsBileBombGun);
+	UTIL_PrecacheOtherWeapon(kwsAcidRocketGun);
+	UTIL_PrecacheOtherWeapon(kwsStomp);
+	UTIL_PrecacheOtherWeapon(kwsDevour);
+//	UTIL_PrecacheOtherWeapon(kwsAmplify);
+	UTIL_PrecacheOther(kwsBileBomb);
+
+	// Alien abilities
+	UTIL_PrecacheOtherWeapon(kwsLeap);
+	UTIL_PrecacheOtherWeapon(kwsCharge);
+
+	// Alien buildings
+	UTIL_PrecacheOther(kwsAlienResourceTower);
+	UTIL_PrecacheOther(kwsOffenseChamber);
+	UTIL_PrecacheOther(kwsDefenseChamber);
+	UTIL_PrecacheOther(kwsSensoryChamber);
+	UTIL_PrecacheOther(kwsMovementChamber);
+	UTIL_PrecacheOther(kesTeamWebStrand);
+	
+	// Equipment
+	//UTIL_PrecacheOtherWeapon("weapon_tripmine");
+	UTIL_PrecacheOther(kwsScan);
+	UTIL_PrecacheOther(kwsPhaseGate);
+	//UTIL_PrecacheOther(kwsNuke);
+
+	// Marine buildings
+	UTIL_PrecacheOther(kwsTeamCommand);
+	UTIL_PrecacheOther(kwsResourceTower);
+	UTIL_PrecacheOther(kwsInfantryPortal);
+	UTIL_PrecacheOther(kwsTurretFactory);
+	UTIL_PrecacheOther(kwsArmory);
+	UTIL_PrecacheOther(kwsAdvancedArmory);
+	UTIL_PrecacheOther(kwsArmsLab);
+	UTIL_PrecacheOther(kwsPrototypeLab);
+	UTIL_PrecacheOther(kwsObservatory);
+	//UTIL_PrecacheOther(kwsChemlab);
+	//UTIL_PrecacheOther(kwsMedlab);
+	//UTIL_PrecacheOther(kwsNukePlant);
+	UTIL_PrecacheOther(kwsDeployedTurret);
+	UTIL_PrecacheOther(kwsSiegeTurret);
+#endif
+
+	// container for dropped deathmatch weapons
+	UTIL_PrecacheOther("weaponbox");
+
+	UTIL_PrecacheOtherWeapon(kwsWelder);
+	UTIL_PrecacheOther(kwsDeployedMine);
+	UTIL_PrecacheOther(kwsHealth);
+    UTIL_PrecacheOther(kwsCatalyst);
+	UTIL_PrecacheOther(kwsGenericAmmo);
+	UTIL_PrecacheOther(kwsHeavyArmor);
+	UTIL_PrecacheOther(kwsJetpack);
+	UTIL_PrecacheOther(kwsAmmoPack);
+	
+	UTIL_PrecacheOther(kwsDebugEntity);
+
+	#ifndef AVH_MAPPER_BUILD
+	// Precache other events
+	gJetpackEventID = PRECACHE_EVENT(1, kJetpackEvent);
+	//gStartOverwatchEventID = PRECACHE_EVENT(1, kStartOverwatchEvent);
+	//gEndOverwatchEventID = PRECACHE_EVENT(1, kEndOverwatchEvent);
+	
+	// Alien upgrade events
+	gRegenerationEventID = PRECACHE_EVENT(1, kRegenerationEvent);
+	gStartCloakEventID = PRECACHE_EVENT(1, kStartCloakEvent);
+	gEndCloakEventID = PRECACHE_EVENT(1, kEndCloakEvent);
+
+	// Extra alien weapon events
+	//gEnsnareHitEventID = PRECACHE_EVENT(1, kEnsnareHitEventName);
+	gSporeCloudEventID = PRECACHE_EVENT(1, kSporeCloudEventName);
+	gUmbraCloudEventID = PRECACHE_EVENT(1, kUmbraCloudEventName);
+	gStopScreamEventID = PRECACHE_EVENT(1, kStopPrimalScreamSoundEvent);
+	
+	// Extra marine events
+	gTeleportEventID = PRECACHE_EVENT(1, kTeleportEvent);
+	gBlinkEffectSuccessEventID = PRECACHE_EVENT(1, kBlinkEffectSuccessEventName);
+	gPhaseInEventID = PRECACHE_EVENT(1, kPhaseInEvent);
+	gSiegeHitEventID = PRECACHE_EVENT(1, kSiegeHitEvent);
+	gSiegeViewHitEventID = PRECACHE_EVENT(1, kSiegeViewHitEvent);
+	gCommanderPointsAwardedEventID = PRECACHE_EVENT(1, kCommanderPointsAwardedEvent);
+	gAlienSightOnEventID = PRECACHE_EVENT(1, kAlienSightOnEvent);
+	gAlienSightOffEventID = PRECACHE_EVENT(1, kAlienSightOffEvent);
+//	gParalysisStartEventID = PRECACHE_EVENT(1, kParalysisStartEventName);
+
+	//gWallJumpEventID = PRECACHE_EVENT(1, kWallJumpEvent);
+	//gFlightEventID = PRECACHE_EVENT(1, kFlightEvent);
+	PRECACHE_UNMODIFIED_SOUND(kConnectSound);
+	//PRECACHE_UNMODIFIED_SOUND(kDisconnectSound);
+	PRECACHE_UNMODIFIED_MODEL(kNullModel);
+
+#endif
+
+	UTIL_PrecacheOther("monster_sentry");
+	
+	// Allow welder events in mapper build
+	gWelderEventID = PRECACHE_EVENT(1, kWelderEventName);
+	gWelderConstEventID = PRECACHE_EVENT(1, kWelderConstEventName);
+	PRECACHE_EVENT(1, kWelderStartEventName);
+	PRECACHE_EVENT(1, kWelderEndEventName);
+	
+	gEmptySoundEventID = PRECACHE_EVENT(1, kEmptySoundEvent);
+	gNumericalInfoEventID = PRECACHE_EVENT(1, kNumericalInfoEvent);
+	gInvalidActionEventID = PRECACHE_EVENT(1, kInvalidActionEvent);
+	gParticleEventID = PRECACHE_EVENT(1, kParticleEvent);
+	gDistressBeaconEventID = PRECACHE_EVENT(1, kDistressBeaconEvent);
+	gWeaponAnimationEventID= PRECACHE_EVENT(1, kWeaponAnimationEvent);
+	gLevelUpEventID = PRECACHE_EVENT(1, kLevelUpEvent);
+	gMetabolizeSuccessEventID = PRECACHE_EVENT(1, kMetabolizeSuccessEventName);
+	
+	PRECACHE_UNMODIFIED_SOUND(kPhaseInSound);
+	
+	// Precache reload sound that is hardcoded deep in HL
+	PRECACHE_UNMODIFIED_SOUND(kEmptySound);
+	PRECACHE_UNMODIFIED_SOUND(kInvalidSound);
+
+	// Not sure who's using these, but I keep getting errors that they're not precached.  Buttons?
+	PRECACHE_UNMODIFIED_SOUND("buttons/spark1.wav");
+	PRECACHE_UNMODIFIED_SOUND("buttons/spark2.wav");
+	PRECACHE_UNMODIFIED_SOUND("buttons/spark3.wav");
+	PRECACHE_UNMODIFIED_SOUND("buttons/spark4.wav");
+	PRECACHE_UNMODIFIED_SOUND("buttons/spark5.wav");
+	PRECACHE_UNMODIFIED_SOUND("buttons/spark6.wav");
+
+	// For grunts.  Careful, this uses the same weapon id that the grenade gun uses
+	//UTIL_PrecacheOtherWeapon("weapon_9mmAR");
+
+	// common world objects
+//	UTIL_PrecacheOther( "item_suit" );
+//	UTIL_PrecacheOther( "item_battery" );
+//	UTIL_PrecacheOther( "item_antidote" );
+//	UTIL_PrecacheOther( "item_security" );
+//	UTIL_PrecacheOther( "item_longjump" );
+
+	// shotgun
+//	UTIL_PrecacheOtherWeapon( "weapon_shotgun" );
+//	UTIL_PrecacheOther( "ammo_buckshot" );
+//
+//	// crowbar
+//	UTIL_PrecacheOtherWeapon( "weapon_rowbar" );
+//
+//	// glock
+//	UTIL_PrecacheOtherWeapon( "weapon_9mmhandgun" );
+//	UTIL_PrecacheOther( "ammo_9mmclip" );
+//
+//	// mp5
+//	UTIL_PrecacheOtherWeapon( "weapon_9mmAR" );
+//	UTIL_PrecacheOther( "ammo_9mmAR" );
+//	UTIL_PrecacheOther( "ammo_ARgrenades" );
+
+//#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD )
+//	// python
+//	UTIL_PrecacheOtherWeapon( "weapon_357" );
+//	UTIL_PrecacheOther( "ammo_357" );
+//#endif
+//	
+//#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD )
+//	// gauss
+//	UTIL_PrecacheOtherWeapon( "weapon_gauss" );
+//	UTIL_PrecacheOther( "ammo_gaussclip" );
+//#endif
+//
+//#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD )
+//	// rpg
+//	UTIL_PrecacheOtherWeapon( "weapon_rpg" );
+//	UTIL_PrecacheOther( "ammo_rpgclip" );
+//#endif
+//
+//#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD )
+//	// crossbow
+//	UTIL_PrecacheOtherWeapon( "weapon_crossbow" );
+//	UTIL_PrecacheOther( "ammo_crossbow" );
+//	UTIL_PrecacheOther( "weaponbox" );// container for dropped deathmatch weapons
+//#endif
+//
+//#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD )
+//	// egon
+//	UTIL_PrecacheOtherWeapon( "weapon_egon" );
+//#endif
+//
+//#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD )
+//	// satchel charge
+//	UTIL_PrecacheOtherWeapon( "weapon_satchel" );
+//#endif
+//
+//	// hand grenade
+//	UTIL_PrecacheOtherWeapon("weapon_handgrenade");
+//
+//
+//#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD )
+//	// squeak grenade
+//	UTIL_PrecacheOtherWeapon( "weapon_snark" );
+//#endif
+//
+//#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD )
+//	// hornetgun
+//	UTIL_PrecacheOtherWeapon( "weapon_hornetgun" );
+//#endif
+
+
+//#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD )
+//	if ( g_pGameRules->IsDeathmatch() )
+//	{
+//		UTIL_PrecacheOther( "weaponbox" );// container for dropped deathmatch weapons
+//	}
+//#endif
+
+	g_sModelIndexFireball = PRECACHE_UNMODIFIED_MODEL ("sprites/zerogxplode.spr");// fireball
+	g_sModelIndexWExplosion = PRECACHE_UNMODIFIED_MODEL ("sprites/WXplo1.spr");// underwater fireball
+	g_sModelIndexSmoke = PRECACHE_UNMODIFIED_MODEL ("sprites/steam1.spr");// smoke
+	g_sModelIndexBubbles = PRECACHE_UNMODIFIED_MODEL ("sprites/bubble2.spr");//bubbles
+	g_sModelIndexBloodSpray = PRECACHE_UNMODIFIED_MODEL ("sprites/bloodspray.spr"); // initial blood
+	g_sModelIndexBloodDrop = PRECACHE_UNMODIFIED_MODEL ("sprites/blood.spr"); // splattered blood 
+
+	g_sModelIndexLaser = PRECACHE_UNMODIFIED_MODEL( (char *)g_pModelNameLaser );
+	g_sModelIndexLaserDot = PRECACHE_UNMODIFIED_MODEL("sprites/laserdot.spr");
+
+
+	// used by explosions
+	PRECACHE_UNMODIFIED_MODEL ("models/grenade.mdl");
+	PRECACHE_UNMODIFIED_MODEL ("sprites/explode1.spr");
+
+	PRECACHE_SOUND ("weapons/debris1.wav");// explosion aftermaths
+	PRECACHE_SOUND ("weapons/debris2.wav");// explosion aftermaths
+	PRECACHE_SOUND ("weapons/debris3.wav");// explosion aftermaths
+
+	PRECACHE_UNMODIFIED_SOUND (kGrenadeBounceSound1);
+	PRECACHE_UNMODIFIED_SOUND (kGrenadeBounceSound2);
+	PRECACHE_UNMODIFIED_SOUND (kGrenadeBounceSound3);
+    PRECACHE_UNMODIFIED_SOUND (kGRHitSound);
+
+	PRECACHE_UNMODIFIED_SOUND ("weapons/bullet_hit1.wav");	// hit by bullet
+	PRECACHE_UNMODIFIED_SOUND ("weapons/bullet_hit2.wav");	// hit by bullet
+	
+	PRECACHE_UNMODIFIED_SOUND ("items/weapondrop1.wav");// weapon falls to the ground
+
+}
+
+
+ 
+
+TYPEDESCRIPTION	CBasePlayerItem::m_SaveData[] = 
+{
+	DEFINE_FIELD( CBasePlayerItem, m_pPlayer, FIELD_CLASSPTR ),
+	DEFINE_FIELD( CBasePlayerItem, m_pNext, FIELD_CLASSPTR ),
+	//DEFINE_FIELD( CBasePlayerItem, m_fKnown, FIELD_INTEGER ),Reset to zero on load
+	DEFINE_FIELD( CBasePlayerItem, m_iId, FIELD_INTEGER ),
+	// DEFINE_FIELD( CBasePlayerItem, m_iIdPrimary, FIELD_INTEGER ),
+	// DEFINE_FIELD( CBasePlayerItem, m_iIdSecondary, FIELD_INTEGER ),
+};
+IMPLEMENT_SAVERESTORE( CBasePlayerItem, CBaseAnimating );
+
+
+TYPEDESCRIPTION	CBasePlayerWeapon::m_SaveData[] = 
+{
+	DEFINE_FIELD( CBasePlayerWeapon, m_flNextPrimaryAttack, FIELD_TIME ),
+	DEFINE_FIELD( CBasePlayerWeapon, m_flNextSecondaryAttack, FIELD_TIME ),
+	DEFINE_FIELD( CBasePlayerWeapon, m_flTimeWeaponIdle, FIELD_TIME ),
+	DEFINE_FIELD( CBasePlayerWeapon, m_iPrimaryAmmoType, FIELD_INTEGER ),
+	DEFINE_FIELD( CBasePlayerWeapon, m_iSecondaryAmmoType, FIELD_INTEGER ),
+	DEFINE_FIELD( CBasePlayerWeapon, m_iClip, FIELD_INTEGER ),
+	DEFINE_FIELD( CBasePlayerWeapon, m_iDefaultAmmo, FIELD_INTEGER ),
+//	DEFINE_FIELD( CBasePlayerWeapon, m_iClientClip, FIELD_INTEGER )	 , reset to zero on load so hud gets updated correctly
+//  DEFINE_FIELD( CBasePlayerWeapon, m_iClientWeaponState, FIELD_INTEGER ), reset to zero on load so hud gets updated correctly
+};
+
+IMPLEMENT_SAVERESTORE( CBasePlayerWeapon, CBasePlayerItem );
+
+
+void CBasePlayerItem :: SetObjectCollisionBox( void )
+{
+	pev->absmin = pev->origin + Vector(-24, -24, 0);
+	pev->absmax = pev->origin + Vector(24, 24, 16); 
+}
+
+BOOL
+CBasePlayerItem::CanDeploy( void ) 
+{ 
+	return TRUE; 
+}
+
+// can this weapon be put away right now?
+BOOL CBasePlayerItem::CanHolster( void ) 
+{ 
+	return TRUE; 
+};
+
+// returns is deploy was successful
+BOOL CBasePlayerItem::Deploy( )								
+{ 
+	return TRUE; 
+}
+
+BOOL
+CBasePlayerItem::IsUseable( void ) 
+{ 
+	return TRUE; 
+}
+
+
+//=========================================================
+// Sets up movetype, size, solidtype for a new weapon. 
+//=========================================================
+void CBasePlayerItem :: FallInit( void )
+{
+	pev->movetype = MOVETYPE_TOSS;
+	pev->solid = SOLID_BBOX;
+
+	UTIL_SetOrigin( pev, pev->origin );
+	UTIL_SetSize(pev, Vector( 0, 0, 0), Vector(0, 0, 0) );//pointsize until it lands on the ground.
+	
+	SetTouch(&CBasePlayerItem::DefaultTouch );
+	SetThink(&CBasePlayerItem::FallThink );
+
+	pev->nextthink = gpGlobals->time + 0.1;
+}
+
+//=========================================================
+// FallThink - Items that have just spawned run this think
+// to catch them when they hit the ground. Once we're sure
+// that the object is grounded, we change its solid type
+// to trigger and set it in a large box that helps the
+// player get it.
+//=========================================================
+void CBasePlayerItem::FallThink ( void )
+{
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	if ( pev->flags & FL_ONGROUND )
+	{
+		// clatter if we have an owner (i.e., dropped by someone)
+		// don't clatter if the gun is waiting to respawn (if it's waiting, it is invisible!)
+		if ( !FNullEnt( pev->owner ) )
+		{
+			int pitch = 95 + RANDOM_LONG(0,29);
+			EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "items/weapondrop1.wav", 1, ATTN_NORM, 0, pitch);	
+		}
+
+		// lie flat
+		pev->angles.x = 0;
+		pev->angles.z = 0;
+
+		Materialize(); 
+	}
+}
+
+//=========================================================
+// Materialize - make a CBasePlayerItem visible and tangible
+//=========================================================
+void CBasePlayerItem::Materialize( void )
+{
+	if ( pev->effects & EF_NODRAW )
+	{
+		// changing from invisible state to visible.
+		EMIT_SOUND_DYN( ENT(pev), CHAN_WEAPON, "items/suitchargeok1.wav", 1, ATTN_NORM, 0, 150 );
+		pev->effects &= ~EF_NODRAW;
+		pev->effects |= EF_MUZZLEFLASH;
+	}
+
+	pev->solid = SOLID_TRIGGER;
+
+	UTIL_SetOrigin( pev, pev->origin );// link into world.
+	SetTouch (&CBasePlayerItem::DefaultTouch);
+	SetThink (NULL);
+
+	this->VirtualMaterialize();
+}
+
+//=========================================================
+// AttemptToMaterialize - the item is trying to rematerialize,
+// should it do so now or wait longer?
+//=========================================================
+void CBasePlayerItem::AttemptToMaterialize( void )
+{
+	float time = g_pGameRules->FlWeaponTryRespawn( this );
+
+	if ( time == 0 )
+	{
+		Materialize();
+		return;
+	}
+
+	pev->nextthink = gpGlobals->time + time;
+}
+
+//=========================================================
+// CheckRespawn - a player is taking this weapon, should 
+// it respawn?
+//=========================================================
+void CBasePlayerItem :: CheckRespawn ( void )
+{
+	switch ( g_pGameRules->WeaponShouldRespawn( this ) )
+	{
+	case GR_WEAPON_RESPAWN_YES:
+		Respawn();
+		break;
+	case GR_WEAPON_RESPAWN_NO:
+		return;
+		break;
+	}
+}
+
+//=========================================================
+// Respawn- this item is already in the world, but it is
+// invisible and intangible. Make it visible and tangible.
+//=========================================================
+CBaseEntity* CBasePlayerItem::Respawn( void )
+{
+	// make a copy of this weapon that is invisible and inaccessible to players (no touch function). The weapon spawn/respawn code
+	// will decide when to make the weapon visible and touchable.
+	CBaseEntity *pNewWeapon = CBaseEntity::Create( (char *)STRING( pev->classname ), g_pGameRules->VecWeaponRespawnSpot( this ), pev->angles, pev->owner );
+
+	if ( pNewWeapon )
+	{
+		pNewWeapon->pev->effects |= EF_NODRAW;// invisible for now
+		pNewWeapon->SetTouch( NULL );// no touch
+		pNewWeapon->SetThink(&CBasePlayerItem::AttemptToMaterialize );
+
+		DROP_TO_FLOOR ( ENT(pev) );
+
+		// not a typo! We want to know when the weapon the player just picked up should respawn! This new entity we created is the replacement,
+		// but when it should respawn is based on conditions belonging to the weapon that was taken.
+		pNewWeapon->pev->nextthink = g_pGameRules->FlWeaponRespawnTime( this );
+	}
+	else
+	{
+		ALERT ( at_console, "Respawn failed to create %s!\n", STRING( pev->classname ) );
+	}
+
+	return pNewWeapon;
+}
+
+void CBasePlayerItem::DefaultTouch( CBaseEntity *pOther )
+{
+	// if it's not a player, ignore
+	if ( !pOther->IsPlayer() )
+		return;
+
+	CBasePlayer *pPlayer = (CBasePlayer *)pOther;
+
+	// can I have this?
+	if ( !g_pGameRules->CanHavePlayerItem( pPlayer, this ) )
+	{
+		if ( gEvilImpulse101 )
+		{
+			UTIL_Remove( this );
+		}
+		return;
+	}
+
+	if (pOther->AddPlayerItem( this ))
+	{
+		AttachToPlayer( pPlayer );
+
+		AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(pPlayer);
+		if(thePlayer && thePlayer->GetIsAlien())
+		{
+			EMIT_SOUND(ENT(pPlayer->pev), CHAN_ITEM, "items/gunpickup2-a.wav", 1, ATTN_NORM);
+		}
+		else
+		{
+			EMIT_SOUND(ENT(pPlayer->pev), CHAN_ITEM, "items/gunpickup2.wav", 1, ATTN_NORM);
+		}
+	}
+
+	SUB_UseTargets( pOther, USE_TOGGLE, 0 ); // UNDONE: when should this happen?
+}
+
+BOOL CanAttack( float attack_time, float curtime, BOOL isPredicted )
+{
+#if defined( CLIENT_WEAPONS )
+	if ( !isPredicted )
+#else
+	if ( 1 )
+#endif
+	{
+		return ( attack_time <= curtime ) ? TRUE : FALSE;
+	}
+	else
+	{
+		return ( attack_time <= 0.0 ) ? TRUE : FALSE;
+	}
+}
+
+
+void CBasePlayerWeapon::ItemPostFrame( void )
+{
+	bool theAttackPressed = (m_pPlayer->pev->button & IN_ATTACK);
+
+    bool theWeaponPrimes = (this->GetWeaponPrimeTime() > 0.0f);
+    bool theWeaponIsPriming = this->GetIsWeaponPriming();
+    bool theWeaponIsPrimed = this->GetIsWeaponPrimed();
+
+	if ((m_fInReload) && ( m_pPlayer->m_flNextAttack <= UTIL_WeaponTimeBase() ) )
+	{
+		// complete the reload. 
+		int j = min( iMaxClip() - m_iClip, m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType]);	
+
+		// Add them to the clip
+		m_iClip += j;
+		m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] -= j;
+
+		m_pPlayer->TabulateAmmo();
+
+		m_fInReload = FALSE;
+	}
+
+	if ((m_pPlayer->pev->button & IN_ATTACK2) && CanAttack( m_flNextSecondaryAttack, gpGlobals->time, UseDecrement() ) )
+	{
+        if (m_pPlayer->GetCanUseWeapon())
+        {
+        
+		    if ( pszAmmo2() && !m_pPlayer->m_rgAmmo[SecondaryAmmoIndex()] )
+		    {
+			    m_fFireOnEmpty = TRUE;
+		    }
+
+		    m_pPlayer->TabulateAmmo();
+		    SecondaryAttack();
+		    m_pPlayer->pev->button &= ~IN_ATTACK2;
+        }
+	}
+    else if ( theAttackPressed && CanAttack( m_flNextPrimaryAttack, gpGlobals->time, UseDecrement() ) )
+	{
+        if (m_pPlayer->GetCanUseWeapon())
+        {
+            if ( (m_iClip == 0 && pszAmmo1()) || (iMaxClip() == -1 && !m_pPlayer->m_rgAmmo[PrimaryAmmoIndex()] ) )
+		    {
+			    m_fFireOnEmpty = TRUE;
+		    }
+
+		    m_pPlayer->TabulateAmmo();
+		    PrimaryAttack();
+        }
+	}
+	else if ( m_pPlayer->pev->button & IN_RELOAD && iMaxClip() != WEAPON_NOCLIP && !m_fInReload ) 
+	{
+        if (m_pPlayer->GetCanUseWeapon())
+        {
+            // reload when reload is pressed, or if no buttons are down and weapon is empty.
+	        Reload();
+        }
+	}
+	else if ( !(m_pPlayer->pev->button & (IN_ATTACK|IN_ATTACK2) ) )
+	{
+        if (m_pPlayer->GetCanUseWeapon())
+        {
+
+		    // no fire buttons down
+
+		    m_fFireOnEmpty = FALSE;
+
+		    if ( !IsUseable() && m_flNextPrimaryAttack < ( UseDecrement() ? 0.0 : gpGlobals->time ) ) 
+		    {
+			    // weapon isn't useable, switch.
+			    if ( !(iFlags() & ITEM_FLAG_NOAUTOSWITCHEMPTY) && g_pGameRules->GetNextBestWeapon( m_pPlayer, this ) )
+			    {
+				    m_flNextPrimaryAttack = ( UseDecrement() ? 0.0 : gpGlobals->time ) + 0.3;
+				    return;
+			    }
+		    }
+		    else
+		    {
+			    // weapon is useable. Reload if empty and weapon has waited as long as it has to after firing
+			    if ( m_iClip == 0 && !(iFlags() & ITEM_FLAG_NOAUTORELOAD) && m_flNextPrimaryAttack < ( UseDecrement() ? 0.0 : gpGlobals->time ) )
+			    {
+                    if (m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] > 0)
+			        {
+    				    Reload();
+	    			    return;
+		    	    }
+                }
+		    }
+
+		    WeaponIdle( );
+        }
+		return;
+	}
+	
+	// catch all
+	if ( ShouldWeaponIdle() )
+	{
+		WeaponIdle();
+	}
+}
+
+void CBasePlayerItem::DestroyItem( void )
+{
+	if ( m_pPlayer )
+	{
+		// if attached to a player, remove. 
+		m_pPlayer->RemovePlayerItem( this );
+	}
+	Kill( );
+}
+
+void CBasePlayerItem::VirtualDestroyItem( void )
+{
+	if ( m_pPlayer )
+	{
+		// if attached to a player, remove. 
+		m_pPlayer->RemovePlayerItem( this );
+	}
+	
+	Kill( );
+}
+
+int CBasePlayerItem::AddToPlayer( CBasePlayer *pPlayer )
+{
+	m_pPlayer = pPlayer;
+	pPlayer->m_iHideHUD &= ~HIDEHUD_WEAPONS;
+	return TRUE;
+}
+
+void CBasePlayerItem::Drop( void )
+{
+	SetTouch( NULL );
+	SetThink(&CBasePlayerItem::SUB_Remove);
+	pev->nextthink = gpGlobals->time + .1;
+}
+
+void CBasePlayerItem::Kill( void )
+{
+	SetTouch( NULL );
+	SetThink(&CBasePlayerItem::SUB_Remove);
+	pev->nextthink = gpGlobals->time + .1;
+}
+
+void CBasePlayerItem::Holster( int skiplocal /* = 0 */ )
+{ 
+	m_pPlayer->pev->viewmodel = 0; 
+	m_pPlayer->pev->weaponmodel = 0;
+}
+
+void CBasePlayerItem::AttachToPlayer ( CBasePlayer *pPlayer )
+{
+	pev->movetype = MOVETYPE_FOLLOW;
+	pev->solid = SOLID_NOT;
+	pev->aiment = pPlayer->edict();
+	pev->effects = EF_NODRAW; // ??
+	pev->modelindex = 0;// server won't send down to clients if modelindex == 0
+	pev->model = iStringNull;
+	pev->owner = pPlayer->edict();
+	pev->nextthink = gpGlobals->time + .1;
+	SetTouch( NULL );
+}
+
+void CBasePlayerItem::Spawn()
+{
+    CBaseAnimating::Spawn();
+}
+
+// CALLED THROUGH the newly-touched weapon's instance. The existing player weapon is pOriginal
+int CBasePlayerWeapon::AddDuplicate( CBasePlayerItem *pOriginal )
+{
+	if ( m_iDefaultAmmo )
+	{
+		return ExtractAmmo( (CBasePlayerWeapon *)pOriginal );
+	}
+	else
+	{
+		// a dead player dropped this.
+		return ExtractClipAmmo( (CBasePlayerWeapon *)pOriginal );
+	}
+}
+
+
+int CBasePlayerWeapon::AddToPlayer( CBasePlayer *pPlayer )
+{
+	int bResult = CBasePlayerItem::AddToPlayer( pPlayer );
+
+	pPlayer->pev->weapons |= (1<<m_iId);
+
+	if ( !m_iPrimaryAmmoType )
+	{
+		m_iPrimaryAmmoType = pPlayer->GetAmmoIndex( pszAmmo1() );
+		m_iSecondaryAmmoType = pPlayer->GetAmmoIndex( pszAmmo2() );
+	}
+
+
+	if (bResult)
+		return AddWeapon( );
+	return FALSE;
+}
+
+int CBasePlayerWeapon::UpdateClientData( CBasePlayer *pPlayer )
+{
+	BOOL bSend = FALSE;
+	int state = 0;
+	
+    if ( pPlayer->m_pActiveItem == this )
+	{
+		if ( pPlayer->m_fOnTarget )
+			state = WEAPON_IS_ONTARGET;
+		else
+			state = 1;
+	}
+
+	// If weapon is disabled, set state to 0 (for disabling alien weapons when there aren't hives anymore)
+	if(this->m_flNextSecondaryAttack == -1)
+	{
+		state = 0;
+	}
+
+	// Forcing send of all data!
+	if ( !pPlayer->m_fWeapon )
+	{
+		bSend = TRUE;
+	}
+	
+	// This is the current or last weapon, so the state will need to be updated
+	if ( this == pPlayer->m_pActiveItem ||
+		 this == pPlayer->m_pClientActiveItem )
+	{
+		if ( pPlayer->m_pActiveItem != pPlayer->m_pClientActiveItem )
+		{
+			bSend = TRUE;
+		}
+	}
+
+	// If the ammo, state, or fov has changed, update the weapon
+	// puzl: 497 - send if enabled state has changed
+	if ( m_iClip != m_iClientClip || 
+		 state != m_iClientWeaponState || 
+		 m_iEnabled != m_iClientEnableState ||
+		 pPlayer->m_iFOV != pPlayer->m_iClientFOV )
+	{
+		bSend = TRUE;
+	}
+
+	if ( bSend )
+	{
+        MESSAGE_BEGIN( MSG_ONE, gmsgCurWeapon, NULL, pPlayer->pev );
+		    WRITE_BYTE( state );
+		    WRITE_BYTE( m_iId );
+		    WRITE_BYTE( m_iClip );
+			// puzl: 497 - enabled state
+		    WRITE_BYTE( m_iEnabled );
+	    MESSAGE_END();
+
+	    m_iClientClip = m_iClip;
+	    m_iClientWeaponState = state;
+		// puzl: 497 - remember the old enabled state
+		m_iClientEnableState = m_iEnabled;
+//	    pPlayer->m_fWeapon = TRUE;
+
+	}
+
+	if ( m_pNext )
+		m_pNext->UpdateClientData( pPlayer );
+
+	return 1;
+}
+
+void CBasePlayerWeapon::SendWeaponAnim( int iAnim, int skiplocal, int body )
+{
+	if(iAnim >= 0)
+	{
+		if ( UseDecrement() )
+			skiplocal = 1;
+		else
+			skiplocal = 0;
+	
+		m_pPlayer->pev->weaponanim = iAnim;
+	
+	#if defined( CLIENT_WEAPONS )
+		if ( skiplocal && ENGINE_CANSKIP( m_pPlayer->edict() ) )
+			return;
+	#endif
+	
+		MESSAGE_BEGIN( MSG_ONE, SVC_WEAPONANIM, NULL, m_pPlayer->pev );
+			WRITE_BYTE( iAnim );						// sequence number
+			WRITE_BYTE( pev->body );					// weaponmodel bodygroup.
+		MESSAGE_END();
+	}
+}
+
+BOOL CBasePlayerWeapon :: AddPrimaryAmmo( int iCount, char *szName, int iMaxClip, int iMaxCarry )
+{
+	int iIdAmmo;
+
+	if (iMaxClip < 1)
+	{
+		m_iClip = -1;
+		iIdAmmo = m_pPlayer->GiveAmmo( iCount, szName, iMaxCarry );
+	}
+	else if (m_iClip == 0)
+	{
+		int i;
+		i = min( m_iClip + iCount, iMaxClip ) - m_iClip;
+		m_iClip += i;
+		iIdAmmo = m_pPlayer->GiveAmmo( iCount - i, szName, iMaxCarry );
+	}
+	else
+	{
+		iIdAmmo = m_pPlayer->GiveAmmo( iCount, szName, iMaxCarry );
+	}
+	
+	// m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] = iMaxCarry; // hack for testing
+
+	if (iIdAmmo > 0)
+	{
+		m_iPrimaryAmmoType = iIdAmmo;
+		if (m_pPlayer->HasPlayerItem( this ) )
+		{
+			// play the "got ammo" sound only if we gave some ammo to a player that already had this gun.
+			// if the player is just getting this gun for the first time, DefaultTouch will play the "picked up gun" sound for us.
+			EMIT_SOUND(ENT(pev), CHAN_ITEM, "items/9mmclip1.wav", 1, ATTN_NORM);
+		}
+	}
+
+	return iIdAmmo > 0 ? TRUE : FALSE;
+}
+
+
+BOOL CBasePlayerWeapon :: AddSecondaryAmmo( int iCount, char *szName, int iMax )
+{
+	int iIdAmmo;
+
+	iIdAmmo = m_pPlayer->GiveAmmo( iCount, szName, iMax );
+
+	//m_pPlayer->m_rgAmmo[m_iSecondaryAmmoType] = iMax; // hack for testing
+
+	if (iIdAmmo > 0)
+	{
+		m_iSecondaryAmmoType = iIdAmmo;
+		EMIT_SOUND(ENT(pev), CHAN_ITEM, "items/9mmclip1.wav", 1, ATTN_NORM);
+	}
+	return iIdAmmo > 0 ? TRUE : FALSE;
+}
+
+//=========================================================
+// IsUseable - this function determines whether or not a 
+// weapon is useable by the player in its current state. 
+// (does it have ammo loaded? do I have any ammo for the 
+// weapon?, etc)
+//=========================================================
+BOOL CBasePlayerWeapon :: IsUseable( void )
+{
+	if ( m_iClip <= 0 )
+	{
+		// This looks like a nasty bug Valve didn't notice
+		ASSERT(PrimaryAmmoIndex() >= 0);
+
+		if ( m_pPlayer->m_rgAmmo[ PrimaryAmmoIndex() ] <= 0 && iMaxAmmo1() != -1 )			
+		{
+			// clip is empty (or nonexistant) and the player has no more ammo of this type. 
+			return FALSE;
+		}
+	}
+
+	return TRUE;
+}
+
+BOOL CBasePlayerWeapon :: CanDeploy( void )
+{
+	BOOL bHasAmmo = 0;
+
+	// All weapons can always deploy.  Once fire is hit, it checks if it's out of ammo.  If so, the weapon switches.
+	// This is needed so ammo packs function correctly, and it also feels more responsive.
+
+//	if ( !pszAmmo1() )
+//	{
+//		// this weapon doesn't use ammo, can always deploy.
+//		return TRUE;
+//	}
+//
+//	if ( pszAmmo1() )
+//	{
+//		bHasAmmo |= (m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] != 0);
+//	}
+//	if ( pszAmmo2() )
+//	{
+//		bHasAmmo |= (m_pPlayer->m_rgAmmo[m_iSecondaryAmmoType] != 0);
+//	}
+//	if (m_iClip > 0)
+//	{
+//		bHasAmmo |= 1;
+//	}
+//	if (!bHasAmmo)
+//	{
+//		return FALSE;
+//	}
+
+	return TRUE;
+}
+
+BOOL CBasePlayerWeapon :: DefaultDeploy( char *szViewModel, char *szWeaponModel, int iAnim, char *szAnimExt, int skiplocal, int body)
+{
+	if (!CanDeploy( ))
+		return FALSE;
+
+	m_pPlayer->TabulateAmmo();
+	m_pPlayer->pev->viewmodel = MAKE_STRING(szViewModel);
+	m_pPlayer->pev->weaponmodel = MAKE_STRING(szWeaponModel);
+	strcpy( m_pPlayer->m_szAnimExtention, szAnimExt );
+	SendWeaponAnim( iAnim, skiplocal, body );
+
+	// Set the player animation as well
+	//this->m_pPlayer->SetAnimation(PLAYER_ANIM(iAnim));
+
+	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + this->GetDeployTime();
+	m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + this->GetDeployTime() + kDeployIdleInterval;
+
+	return TRUE;
+}
+
+
+BOOL CBasePlayerWeapon :: DefaultReload( int iClipSize, int iAnim, float fDelay, int body)
+{
+	if (m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] <= 0)
+		return FALSE;
+
+	int j = min(iClipSize - m_iClip, m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType]);	
+
+	if (j == 0)
+		return FALSE;
+
+	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + fDelay;
+
+	//!!UNDONE -- reload sound goes here !!!
+	//SendWeaponAnim( iAnim, UseDecrement() ? 1 : 0 );
+
+	m_fInReload = TRUE;
+
+	m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + kDeployIdleInterval;
+
+	return TRUE;
+}
+
+BOOL CBasePlayerWeapon :: PlayEmptySound( void )
+{
+	if (m_iPlayEmptySound)
+	{
+//		EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/357_cock1.wav", 0.8, ATTN_NORM);
+
+		int flags;
+		#if defined( CLIENT_WEAPONS )
+		flags = FEV_NOTHOST;
+		#else
+		flags = 0;
+		#endif
+		
+		PLAYBACK_EVENT_FULL( flags, m_pPlayer->edict(), gEmptySoundEventID, 0.0, (float *)&(m_pPlayer->pev->origin), (float *)&g_vecZero, 0.0, 0.0, 0, 0, 0, 0 );
+
+		m_iPlayEmptySound = 0;
+		return 0;
+	}
+	return 0;
+}
+
+void CBasePlayerWeapon :: ResetEmptySound( void )
+{
+	m_iPlayEmptySound = 1;
+}
+
+//=========================================================
+//=========================================================
+int CBasePlayerWeapon::PrimaryAmmoIndex( void )
+{
+	return m_iPrimaryAmmoType;
+}
+
+//=========================================================
+//=========================================================
+int CBasePlayerWeapon::SecondaryAmmoIndex( void )
+{
+	return -1;
+}
+
+void CBasePlayerWeapon::Holster( int skiplocal /* = 0 */ )
+{ 
+	m_fInReload = FALSE; // cancel any reload in progress.
+	m_pPlayer->pev->viewmodel = 0; 
+	m_pPlayer->pev->weaponmodel = 0;
+}
+
+void CBasePlayerAmmo::Spawn( void )
+{
+	pev->movetype = MOVETYPE_TOSS;
+	pev->solid = SOLID_TRIGGER;
+	UTIL_SetSize(pev, Vector(-16, -16, 0), Vector(16, 16, 16));
+	UTIL_SetOrigin( pev, pev->origin );
+
+	SetTouch(&CBasePlayerAmmo::DefaultTouch );
+}
+
+CBaseEntity* CBasePlayerAmmo::Respawn( void )
+{
+	pev->effects |= EF_NODRAW;
+	SetTouch( NULL );
+
+	UTIL_SetOrigin( pev, g_pGameRules->VecAmmoRespawnSpot( this ) );// move to wherever I'm supposed to repawn.
+
+	SetThink(&CBasePlayerAmmo::Materialize );
+	pev->nextthink = g_pGameRules->FlAmmoRespawnTime( this );
+
+	return this;
+}
+
+void CBasePlayerAmmo::Materialize( void )
+{
+	if ( pev->effects & EF_NODRAW )
+	{
+		// changing from invisible state to visible.
+		EMIT_SOUND_DYN( ENT(pev), CHAN_WEAPON, "items/suitchargeok1.wav", 1, ATTN_NORM, 0, 150 );
+		pev->effects &= ~EF_NODRAW;
+		pev->effects |= EF_MUZZLEFLASH;
+	}
+
+	SetTouch(&CBasePlayerAmmo::DefaultTouch );
+}
+
+void CBasePlayerAmmo :: DefaultTouch( CBaseEntity *pOther )
+{
+	if ( !pOther->IsPlayer() )
+	{
+		return;
+	}
+
+	if (AddAmmo( pOther ))
+	{
+		if ( g_pGameRules->AmmoShouldRespawn( this ) == GR_AMMO_RESPAWN_YES )
+		{
+			Respawn();
+		}
+		else
+		{
+			SetTouch( NULL );
+			SetThink(&CBasePlayerAmmo::SUB_Remove);
+			pev->nextthink = gpGlobals->time + .1;
+		}
+	}
+	else if (gEvilImpulse101)
+	{
+		// evil impulse 101 hack, kill always
+		SetTouch( NULL );
+		SetThink(&CBasePlayerAmmo::SUB_Remove);
+		pev->nextthink = gpGlobals->time + .1;
+	}
+}
+
+//=========================================================
+// called by the new item with the existing item as parameter
+//
+// if we call ExtractAmmo(), it's because the player is picking up this type of weapon for 
+// the first time. If it is spawned by the world, m_iDefaultAmmo will have a default ammo amount in it.
+// if  this is a weapon dropped by a dying player, has 0 m_iDefaultAmmo, which means only the ammo in 
+// the weapon clip comes along. 
+//=========================================================
+int CBasePlayerWeapon::ExtractAmmo( CBasePlayerWeapon *pWeapon )
+{
+	int			iReturn;
+
+	if ( pszAmmo1() != NULL )
+	{
+		// blindly call with m_iDefaultAmmo. It's either going to be a value or zero. If it is zero,
+		// we only get the ammo in the weapon's clip, which is what we want. 
+		iReturn = pWeapon->AddPrimaryAmmo( m_iDefaultAmmo, (char *)pszAmmo1(), iMaxClip(), iMaxAmmo1() );
+		m_iDefaultAmmo = 0;
+	}
+
+	if ( pszAmmo2() != NULL )
+	{
+		iReturn = pWeapon->AddSecondaryAmmo( 0, (char *)pszAmmo2(), iMaxAmmo2() );
+	}
+
+	return iReturn;
+}
+
+//=========================================================
+// called by the new item's class with the existing item as parameter
+//=========================================================
+int CBasePlayerWeapon::ExtractClipAmmo( CBasePlayerWeapon *pWeapon )
+{
+	int			iAmmo;
+
+	if ( m_iClip == WEAPON_NOCLIP )
+	{
+		iAmmo = 0;// guns with no clips always come empty if they are second-hand
+	}
+	else
+	{
+		iAmmo = m_iClip;
+	}
+	
+	return pWeapon->m_pPlayer->GiveAmmo( iAmmo, (char *)pszAmmo1(), iMaxAmmo1() ); // , &m_iPrimaryAmmoType
+}
+	
+//=========================================================
+// RetireWeapon - no more ammo for this gun, put it away.
+//=========================================================
+void CBasePlayerWeapon::RetireWeapon( void )
+{
+	// first, no viewmodel at all.
+	m_pPlayer->pev->viewmodel = iStringNull;
+	m_pPlayer->pev->weaponmodel = iStringNull;
+	//m_pPlayer->pev->viewmodelindex = NULL;
+
+	g_pGameRules->GetNextBestWeapon( m_pPlayer, this );
+}
+
+//*********************************************************
+// weaponbox code:
+//*********************************************************
+
+LINK_ENTITY_TO_CLASS( weaponbox, CWeaponBox );
+
+TYPEDESCRIPTION	CWeaponBox::m_SaveData[] = 
+{
+	DEFINE_ARRAY( CWeaponBox, m_rgAmmo, FIELD_INTEGER, MAX_AMMO_SLOTS ),
+	DEFINE_ARRAY( CWeaponBox, m_rgiszAmmo, FIELD_STRING, MAX_AMMO_SLOTS ),
+	DEFINE_ARRAY( CWeaponBox, m_rgpPlayerItems, FIELD_CLASSPTR, MAX_ITEM_TYPES ),
+	DEFINE_FIELD( CWeaponBox, m_cAmmoTypes, FIELD_INTEGER ),
+};
+
+IMPLEMENT_SAVERESTORE( CWeaponBox, CBaseEntity );
+
+//=========================================================
+//
+//=========================================================
+void CWeaponBox::Precache( void )
+{
+	PRECACHE_UNMODIFIED_MODEL("models/w_weaponbox.mdl");
+}
+
+//=========================================================
+//=========================================================
+void CWeaponBox :: KeyValue( KeyValueData *pkvd )
+{
+	if ( m_cAmmoTypes < MAX_AMMO_SLOTS )
+	{
+		PackAmmo( ALLOC_STRING(pkvd->szKeyName), atoi(pkvd->szValue) );
+		m_cAmmoTypes++;// count this new ammo type.
+
+		pkvd->fHandled = TRUE;
+	}
+	else
+	{
+		ALERT ( at_console, "WeaponBox too full! only %d ammotypes allowed\n", MAX_AMMO_SLOTS );
+	}
+}
+
+//=========================================================
+// CWeaponBox - Spawn 
+//=========================================================
+void CWeaponBox::Spawn( void )
+{
+	Precache( );
+
+	pev->movetype = MOVETYPE_TOSS;
+	pev->solid = SOLID_TRIGGER;
+
+	UTIL_SetSize( pev, g_vecZero, g_vecZero );
+
+	SET_MODEL( ENT(pev), "models/w_weaponbox.mdl");
+}
+
+//=========================================================
+// CWeaponBox - Kill - the think function that removes the
+// box from the world.
+//=========================================================
+void CWeaponBox::Kill( void )
+{
+	CBasePlayerItem *pWeapon;
+	int i;
+
+	// destroy the weapons
+	for ( i = 0 ; i < MAX_ITEM_TYPES ; i++ )
+	{
+		pWeapon = m_rgpPlayerItems[ i ];
+
+		while ( pWeapon )
+		{
+			pWeapon->SetThink(&CWeaponBox::SUB_Remove);
+			pWeapon->pev->nextthink = gpGlobals->time + 0.1;
+			pWeapon = pWeapon->m_pNext;
+		}
+	}
+
+	// remove the box
+	UTIL_Remove( this );
+}
+
+//=========================================================
+// CWeaponBox - Touch: try to add my contents to the toucher
+// if the toucher is a player.
+//=========================================================
+void CWeaponBox::Touch( CBaseEntity *pOther )
+{
+	if ( !(pev->flags & FL_ONGROUND ) )
+	{
+		return;
+	}
+
+	if ( !pOther->IsPlayer() )
+	{
+		// only players may touch a weaponbox.
+		return;
+	}
+
+	if ( !pOther->IsAlive() )
+	{
+		// no dead guys.
+		return;
+	}
+
+	CBasePlayer *pPlayer = (CBasePlayer *)pOther;
+	int i;
+
+// dole out ammo
+	for ( i = 0 ; i < MAX_AMMO_SLOTS ; i++ )
+	{
+		if ( !FStringNull( m_rgiszAmmo[ i ] ) )
+		{
+			// there's some ammo of this type. 
+			pPlayer->GiveAmmo( m_rgAmmo[ i ], (char *)STRING( m_rgiszAmmo[ i ] ), MaxAmmoCarry( m_rgiszAmmo[ i ] ) );
+
+			//ALERT ( at_console, "Gave %d rounds of %s\n", m_rgAmmo[i], STRING(m_rgiszAmmo[i]) );
+
+			// now empty the ammo from the weaponbox since we just gave it to the player
+			m_rgiszAmmo[ i ] = iStringNull;
+			m_rgAmmo[ i ] = 0;
+		}
+	}
+
+// go through my weapons and try to give the usable ones to the player. 
+// it's important the the player be given ammo first, so the weapons code doesn't refuse 
+// to deploy a better weapon that the player may pick up because he has no ammo for it.
+	for ( i = 0 ; i < MAX_ITEM_TYPES ; i++ )
+	{
+		if ( m_rgpPlayerItems[ i ] )
+		{
+			CBasePlayerItem *pItem;
+
+			// have at least one weapon in this slot
+			while ( m_rgpPlayerItems[ i ] )
+			{
+				//ALERT ( at_console, "trying to give %s\n", STRING( m_rgpPlayerItems[ i ]->pev->classname ) );
+
+				pItem = m_rgpPlayerItems[ i ];
+				m_rgpPlayerItems[ i ] = m_rgpPlayerItems[ i ]->m_pNext;// unlink this weapon from the box
+
+				if ( pPlayer->AddPlayerItem( pItem ) )
+				{
+					pItem->AttachToPlayer( pPlayer );
+				}
+			}
+		}
+	}
+
+	EMIT_SOUND( pOther->edict(), CHAN_ITEM, "items/gunpickup2.wav", 1, ATTN_NORM );
+	SetTouch(NULL);
+	UTIL_Remove(this);
+}
+
+//=========================================================
+// CWeaponBox - PackWeapon: Add this weapon to the box
+//=========================================================
+BOOL CWeaponBox::PackWeapon( CBasePlayerItem *pWeapon )
+{
+	// is one of these weapons already packed in this box?
+	if ( HasWeapon( pWeapon ) )
+	{
+		return FALSE;// box can only hold one of each weapon type
+	}
+
+	if ( pWeapon->m_pPlayer )
+	{
+		if ( !pWeapon->m_pPlayer->RemovePlayerItem( pWeapon ) )
+		{
+			// failed to unhook the weapon from the player!
+			return FALSE;
+		}
+	}
+
+	int iWeaponSlot = pWeapon->iItemSlot();
+	
+	if ( m_rgpPlayerItems[ iWeaponSlot ] )
+	{
+		// there's already one weapon in this slot, so link this into the slot's column
+		pWeapon->m_pNext = m_rgpPlayerItems[ iWeaponSlot ];	
+		m_rgpPlayerItems[ iWeaponSlot ] = pWeapon;
+	}
+	else
+	{
+		// first weapon we have for this slot
+		m_rgpPlayerItems[ iWeaponSlot ] = pWeapon;
+		pWeapon->m_pNext = NULL;	
+	}
+
+	pWeapon->pev->spawnflags |= SF_NORESPAWN;// never respawn
+	pWeapon->pev->movetype = MOVETYPE_NONE;
+	pWeapon->pev->solid = SOLID_NOT;
+	pWeapon->pev->effects = EF_NODRAW;
+	pWeapon->pev->modelindex = 0;
+	pWeapon->pev->model = iStringNull;
+	pWeapon->pev->owner = edict();
+	pWeapon->SetThink( NULL );// crowbar may be trying to swing again, etc.
+	pWeapon->SetTouch( NULL );
+	pWeapon->m_pPlayer = NULL;
+
+	//ALERT ( at_console, "packed %s\n", STRING(pWeapon->pev->classname) );
+
+	return TRUE;
+}
+
+//=========================================================
+// CWeaponBox - PackAmmo
+//=========================================================
+BOOL CWeaponBox::PackAmmo( int iszName, int iCount )
+{
+	int iMaxCarry;
+
+	if ( FStringNull( iszName ) )
+	{
+		// error here
+		ALERT ( at_console, "NULL String in PackAmmo!\n" );
+		return FALSE;
+	}
+	
+	iMaxCarry = MaxAmmoCarry( iszName );
+
+	if ( iMaxCarry != -1 && iCount > 0 )
+	{
+		//ALERT ( at_console, "Packed %d rounds of %s\n", iCount, STRING(iszName) );
+		GiveAmmo( iCount, (char *)STRING( iszName ), iMaxCarry );
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+//=========================================================
+// CWeaponBox - GiveAmmo
+//=========================================================
+int CWeaponBox::GiveAmmo( int iCount, char *szName, int iMax, int *pIndex/* = NULL*/ )
+{
+	int i;
+
+	for (i = 1; i < MAX_AMMO_SLOTS && !FStringNull( m_rgiszAmmo[i] ); i++)
+	{
+		if (stricmp( szName, STRING( m_rgiszAmmo[i])) == 0)
+		{
+			if (pIndex)
+				*pIndex = i;
+
+			int iAdd = min( iCount, iMax - m_rgAmmo[i]);
+			if (iCount == 0 || iAdd > 0)
+			{
+				m_rgAmmo[i] += iAdd;
+
+				return i;
+			}
+			return -1;
+		}
+	}
+	if (i < MAX_AMMO_SLOTS)
+	{
+		if (pIndex)
+			*pIndex = i;
+
+		m_rgiszAmmo[i] = MAKE_STRING( szName );
+		m_rgAmmo[i] = iCount;
+
+		return i;
+	}
+	ALERT( at_console, "out of named ammo slots\n");
+	return i;
+}
+
+//=========================================================
+// CWeaponBox::HasWeapon - is a weapon of this type already
+// packed in this box?
+//=========================================================
+BOOL CWeaponBox::HasWeapon( CBasePlayerItem *pCheckItem )
+{
+	CBasePlayerItem *pItem = m_rgpPlayerItems[pCheckItem->iItemSlot()];
+
+	while (pItem)
+	{
+		if (FClassnameIs( pItem->pev, STRING( pCheckItem->pev->classname) ))
+		{
+			return TRUE;
+		}
+		pItem = pItem->m_pNext;
+	}
+
+	return FALSE;
+}
+
+//=========================================================
+// CWeaponBox::IsEmpty - is there anything in this box?
+//=========================================================
+BOOL CWeaponBox::IsEmpty( void )
+{
+	int i;
+
+	for ( i = 0 ; i < MAX_ITEM_TYPES ; i++ )
+	{
+		if ( m_rgpPlayerItems[ i ] )
+		{
+			return FALSE;
+		}
+	}
+
+	for ( i = 0 ; i < MAX_AMMO_SLOTS ; i++ )
+	{
+		if ( !FStringNull( m_rgiszAmmo[ i ] ) )
+		{
+			// still have a bit of this type of ammo
+			return FALSE;
+		}
+	}
+
+	return TRUE;
+}
+
+//=========================================================
+//=========================================================
+void CWeaponBox::SetObjectCollisionBox( void )
+{
+	pev->absmin = pev->origin + Vector(-16, -16, 0);
+	pev->absmax = pev->origin + Vector(16, 16, 16); 
+}
+
+
+void CBasePlayerWeapon::PrintState( void )
+{
+	ALERT( at_console, "primary:  %f\n", m_flNextPrimaryAttack );
+	ALERT( at_console, "idle   :  %f\n", m_flTimeWeaponIdle );
+
+//	ALERT( at_console, "nextrl :  %f\n", m_flNextReload );
+//	ALERT( at_console, "nextpum:  %f\n", m_flPumpTime );
+
+//	ALERT( at_console, "m_frt  :  %f\n", m_fReloadTime );
+	ALERT( at_console, "m_finre:  %i\n", m_fInReload );
+//	ALERT( at_console, "m_finsr:  %i\n", m_fInSpecialReload );
+
+	ALERT( at_console, "m_iclip:  %i\n", m_iClip );
+}
+
+
+TYPEDESCRIPTION	CRpg::m_SaveData[] = 
+{
+	DEFINE_FIELD( CRpg, m_fSpotActive, FIELD_INTEGER ),
+	DEFINE_FIELD( CRpg, m_cActiveRockets, FIELD_INTEGER ),
+};
+IMPLEMENT_SAVERESTORE( CRpg, CBasePlayerWeapon );
+
+TYPEDESCRIPTION	CRpgRocket::m_SaveData[] = 
+{
+	DEFINE_FIELD( CRpgRocket, m_flIgniteTime, FIELD_TIME ),
+	DEFINE_FIELD( CRpgRocket, m_pLauncher, FIELD_CLASSPTR ),
+};
+IMPLEMENT_SAVERESTORE( CRpgRocket, CGrenade );
+
+TYPEDESCRIPTION	CShotgun::m_SaveData[] = 
+{
+	DEFINE_FIELD( CShotgun, m_flNextReload, FIELD_TIME ),
+	DEFINE_FIELD( CShotgun, m_fInSpecialReload, FIELD_INTEGER ),
+	DEFINE_FIELD( CShotgun, m_flNextReload, FIELD_TIME ),
+	// DEFINE_FIELD( CShotgun, m_iShell, FIELD_INTEGER ),
+	DEFINE_FIELD( CShotgun, m_flPumpTime, FIELD_TIME ),
+};
+IMPLEMENT_SAVERESTORE( CShotgun, CBasePlayerWeapon );
+
+TYPEDESCRIPTION	CGauss::m_SaveData[] = 
+{
+	DEFINE_FIELD( CGauss, m_fInAttack, FIELD_INTEGER ),
+//	DEFINE_FIELD( CGauss, m_flStartCharge, FIELD_TIME ),
+//	DEFINE_FIELD( CGauss, m_flPlayAftershock, FIELD_TIME ),
+//	DEFINE_FIELD( CGauss, m_flNextAmmoBurn, FIELD_TIME ),
+	DEFINE_FIELD( CGauss, m_fPrimaryFire, FIELD_BOOLEAN ),
+};
+IMPLEMENT_SAVERESTORE( CGauss, CBasePlayerWeapon );
+
+TYPEDESCRIPTION	CEgon::m_SaveData[] = 
+{
+//	DEFINE_FIELD( CEgon, m_pBeam, FIELD_CLASSPTR ),
+//	DEFINE_FIELD( CEgon, m_pNoise, FIELD_CLASSPTR ),
+//	DEFINE_FIELD( CEgon, m_pSprite, FIELD_CLASSPTR ),
+	DEFINE_FIELD( CEgon, m_shootTime, FIELD_TIME ),
+	DEFINE_FIELD( CEgon, m_fireState, FIELD_INTEGER ),
+	DEFINE_FIELD( CEgon, m_fireMode, FIELD_INTEGER ),
+	DEFINE_FIELD( CEgon, m_shakeTime, FIELD_TIME ),
+	DEFINE_FIELD( CEgon, m_flAmmoUseTime, FIELD_TIME ),
+};
+IMPLEMENT_SAVERESTORE( CEgon, CBasePlayerWeapon );
+
+TYPEDESCRIPTION	CSatchel::m_SaveData[] = 
+{
+	DEFINE_FIELD( CSatchel, m_chargeReady, FIELD_INTEGER ),
+};
+IMPLEMENT_SAVERESTORE( CSatchel, CBasePlayerWeapon );
+
diff --git a/main/source/dlls/weapons.h b/main/source/dlls/weapons.h
new file mode 100644
index 00000000..01308f94
--- /dev/null
+++ b/main/source/dlls/weapons.h
@@ -0,0 +1,1052 @@
+//	Copyright (c) 1999, Valve LLC. All rights reserved.
+//	
+//	This product contains software technology licensed from Id 
+//	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+//	All Rights Reserved.
+//
+//	Use, distribution, and modification of this source code and/or resulting
+//	object code is restricted to non-commercial enhancements to products from
+//	Valve LLC.  All other use, distribution, or modification is prohibited
+//	without written permission from Valve LLC.
+//
+// $Workfile: weapons.h $
+// $Date: 2002/10/24 21:18:58 $
+//
+//-------------------------------------------------------------------------------
+// $Log: weapons.h,v $
+// Revision 1.17  2002/10/24 21:18:58  Flayra
+// - Made virtual so child weapons could customize reload
+//
+// Revision 1.16  2002/10/16 00:41:15  Flayra
+// - Removed unneeds sounds and events
+// - Added distress beacon event
+// - Added general purpose particle event
+//
+// Revision 1.15  2002/08/31 18:01:18  Flayra
+// - Work at VALVe
+//
+// Revision 1.14  2002/08/09 00:17:35  Flayra
+// - Added PRIMARY_WEAPON flag (allow marines to hold only one)
+//
+// Revision 1.13  2002/07/08 16:36:35  Flayra
+// - Added 0-degree constant, added document header
+//
+//===============================================================================
+#ifndef WEAPONS_H
+#define WEAPONS_H
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"player.h"
+#include	"effects.h"
+//#include	"dlls/weapons.h"
+
+class CBasePlayer;
+extern int gmsgWeapPickup;
+
+void DeactivateSatchels( CBasePlayer *pOwner );
+
+// Contact Grenade / Timed grenade / Satchel Charge
+class CGrenade : public CBaseMonster
+{
+public:
+	void Spawn( void );
+
+	typedef enum { SATCHEL_DETONATE = 0, SATCHEL_RELEASE } SATCHELCODE;
+
+	static CGrenade *ShootExplosiveTimed( entvars_t *pevOwner, Vector vecStart, Vector vecVelocity, float time );
+	static CGrenade *ShootTimed( entvars_t *pevOwner, Vector vecStart, Vector vecVelocity, float time );
+	static CGrenade *ShootContact( entvars_t *pevOwner, Vector vecStart, Vector vecVelocity );
+	static CGrenade *ShootSatchelCharge( entvars_t *pevOwner, Vector vecStart, Vector vecVelocity );
+	static void UseSatchelCharges( entvars_t *pevOwner, SATCHELCODE code );
+
+	void Explode( Vector vecSrc, Vector vecAim );
+	void Explode( TraceResult *pTrace, int bitsDamageType );
+	void EXPORT Smoke( void );
+
+	void EXPORT BounceTouch( CBaseEntity *pOther );
+	void EXPORT SlideTouch( CBaseEntity *pOther );
+	void EXPORT ExplosiveBounceTouch( CBaseEntity *pOther );
+	void EXPORT ExplodeTouch( CBaseEntity *pOther );
+	void EXPORT DangerSoundThink( void );
+	void EXPORT PreDetonate( void );
+	void EXPORT Detonate( void );
+	void EXPORT DetonateUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void EXPORT TumbleThink( void );
+
+	virtual void BounceSound( void );
+	virtual int	BloodColor( void ) { return DONT_BLEED; }
+	virtual void Killed( entvars_t *pevAttacker, int iGib );
+
+	BOOL m_fRegisteredSound;// whether or not this grenade has issued its DANGER sound to the world sound list yet.
+};
+
+
+// constant items
+#define ITEM_HEALTHKIT		1
+#define ITEM_ANTIDOTE		2
+#define ITEM_SECURITY		3
+#define ITEM_BATTERY		4
+
+#define WEAPON_NONE				0
+#define WEAPON_CROWBAR			1
+#define	WEAPON_GLOCK			2
+#define WEAPON_PYTHON			3
+#define WEAPON_MP5				4
+#define WEAPON_CHAINGUN			5
+#define WEAPON_CROSSBOW			6
+#define WEAPON_SHOTGUN			7
+#define WEAPON_RPG				8
+#define WEAPON_GAUSS			9
+#define WEAPON_EGON				10
+#define WEAPON_HORNETGUN		11
+#define WEAPON_HANDGRENADE		12
+#define WEAPON_TRIPMINE			13
+#define	WEAPON_SATCHEL			14
+#define	WEAPON_SNARK			15
+
+#define WEAPON_ALLWEAPONS		(~(1<<WEAPON_SUIT))
+
+#define WEAPON_SUIT				31	// ?????
+
+#define MAX_WEAPONS				32
+
+
+#define MAX_NORMAL_BATTERY	100
+
+
+// weapon weight factors (for auto-switching)   (-1 = noswitch)
+#define CROWBAR_WEIGHT		0
+#define GLOCK_WEIGHT		10
+#define PYTHON_WEIGHT		15
+#define MP5_WEIGHT			15
+#define MG_WEIGHT			15
+#define SHOTGUN_WEIGHT		15
+#define CROSSBOW_WEIGHT		10
+#define RPG_WEIGHT			20
+#define GAUSS_WEIGHT		20
+#define EGON_WEIGHT			20
+#define HORNETGUN_WEIGHT	10
+#define HANDGRENADE_WEIGHT	5
+#define SNARK_WEIGHT		5
+#define SATCHEL_WEIGHT		-10
+#define TRIPMINE_WEIGHT		-10
+
+
+// weapon clip/carry ammo capacities
+#define URANIUM_MAX_CARRY		100
+#define	_9MM_MAX_CARRY			250
+#define _357_MAX_CARRY			36
+#define BUCKSHOT_MAX_CARRY		125
+#define BOLT_MAX_CARRY			50
+#define ROCKET_MAX_CARRY		5
+#define HANDGRENADE_MAX_CARRY	10
+#define SATCHEL_MAX_CARRY		5
+#define TRIPMINE_MAX_CARRY		5
+#define SNARK_MAX_CARRY			15
+#define HORNET_MAX_CARRY		8
+#define M203_GRENADE_MAX_CARRY	10
+
+// the maximum amount of ammo each weapon's clip can hold
+#define WEAPON_NOCLIP			-1
+
+//#define CROWBAR_MAX_CLIP		WEAPON_NOCLIP
+//#define GLOCK_MAX_CLIP			17
+#define GLOCK_MAX_CLIP			200
+#define PYTHON_MAX_CLIP			6
+#define MP5_MAX_CLIP			50
+//#define MP5_DEFAULT_AMMO		25
+#define MG_MAX_CLIP			50
+#define MG_DEFAULT_AMMO		25
+#define SHOTGUN_MAX_CLIP		8
+#define CROSSBOW_MAX_CLIP		5
+#define RPG_MAX_CLIP			1
+#define GAUSS_MAX_CLIP			WEAPON_NOCLIP
+#define EGON_MAX_CLIP			WEAPON_NOCLIP
+#define HORNETGUN_MAX_CLIP		WEAPON_NOCLIP
+#define HANDGRENADE_MAX_CLIP	WEAPON_NOCLIP
+#define SATCHEL_MAX_CLIP		WEAPON_NOCLIP
+#define TRIPMINE_MAX_CLIP		WEAPON_NOCLIP
+#define SNARK_MAX_CLIP			WEAPON_NOCLIP
+
+
+// the default amount of ammo that comes with each gun when it spawns
+#define GLOCK_DEFAULT_GIVE			17
+#define PYTHON_DEFAULT_GIVE			6
+#define MP5_DEFAULT_GIVE			25
+#define MP5_DEFAULT_AMMO			25
+#define MG_DEFAULT_GIVE			25
+#define MG_DEFAULT_AMMO			25
+
+#define MP5_M203_DEFAULT_GIVE		0
+#define SHOTGUN_DEFAULT_GIVE		12
+#define CROSSBOW_DEFAULT_GIVE		5
+#define RPG_DEFAULT_GIVE			1
+#define GAUSS_DEFAULT_GIVE			20
+#define EGON_DEFAULT_GIVE			20
+#define HANDGRENADE_DEFAULT_GIVE	5
+#define SATCHEL_DEFAULT_GIVE		1
+#define TRIPMINE_DEFAULT_GIVE		1
+#define SNARK_DEFAULT_GIVE			5
+#define HIVEHAND_DEFAULT_GIVE		8
+
+// The amount of ammo given to a player by an ammo item.
+#define AMMO_URANIUMBOX_GIVE	20
+#define AMMO_GLOCKCLIP_GIVE		GLOCK_MAX_CLIP
+#define AMMO_357BOX_GIVE		PYTHON_MAX_CLIP
+#define AMMO_MP5CLIP_GIVE		MP5_MAX_CLIP
+#define AMMO_CHAINBOX_GIVE		200
+#define AMMO_M203BOX_GIVE		2
+#define AMMO_BUCKSHOTBOX_GIVE	12
+#define AMMO_CROSSBOWCLIP_GIVE	CROSSBOW_MAX_CLIP
+#define AMMO_RPGCLIP_GIVE		RPG_MAX_CLIP
+#define AMMO_URANIUMBOX_GIVE	20
+#define AMMO_SNARKBOX_GIVE		5
+
+#include "common/bullettypes.h"
+
+#define ITEM_FLAG_SELECTONEMPTY		1
+#define ITEM_FLAG_NOAUTORELOAD		2
+#define ITEM_FLAG_NOAUTOSWITCHEMPTY	4
+#define ITEM_FLAG_LIMITINWORLD		8
+#define ITEM_FLAG_EXHAUSTIBLE		16 // A player can totally exhaust their ammo supply and lose this weapon
+#define ONE_HIVE_REQUIRED			32
+#define TWO_HIVES_REQUIRED			64
+#define THREE_HIVES_REQUIRED		128
+#define PRIMARY_WEAPON				256
+#define SECONDARY_WEAPON			512
+
+#define WEAPON_IS_ONTARGET 0x40
+
+typedef struct
+{
+	int		iSlot;
+	int		iPosition;
+	const char	*pszAmmo1;	// ammo 1 type
+	int		iMaxAmmo1;		// max ammo 1
+	const char	*pszAmmo2;	// ammo 2 type
+	int		iMaxAmmo2;		// max ammo 2
+	const char	*pszName;
+	int		iMaxClip;
+	int		iId;
+	int		iFlags;
+	int		iWeight;// this value used to determine this weapon's importance in autoselection.
+} ItemInfo;
+
+typedef struct
+{
+	const char *pszName;
+	int iId;
+} AmmoInfo;
+
+// Items that the player has in their inventory that they can use
+class CBasePlayerItem : public CBaseAnimating
+{
+public:
+	virtual void SetObjectCollisionBox( void );
+
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	virtual int AddToPlayer( CBasePlayer *pPlayer );	// return TRUE if the item you want the item added to the player inventory
+	virtual int AddDuplicate( CBasePlayerItem *pItem ) { return FALSE; }	// return TRUE if you want your duplicate removed from world
+	void EXPORT DestroyItem( void );
+	virtual void VirtualDestroyItem( void );
+	void EXPORT DefaultTouch( CBaseEntity *pOther );	// default weapon touch
+	void EXPORT FallThink ( void );// when an item is first spawned, this think is run to determine when the object has hit the ground.
+	void EXPORT Materialize( void );// make a weapon visible and tangible
+	virtual void VirtualMaterialize(void) {}; // make a weapon visible and tangible
+	void EXPORT AttemptToMaterialize( void );  // the weapon desires to become visible and tangible, if the game rules allow for it
+	CBaseEntity* Respawn ( void );// copy a weapon
+	void FallInit( void );
+	void CheckRespawn( void );
+	virtual int GetItemInfo(ItemInfo *p) const { return 0; };	// returns 0 if struct not filled out
+	virtual BOOL CanDeploy( void );
+	virtual BOOL Deploy( );								// returns is deploy was successful
+	virtual BOOL CanHolster( void );
+	virtual void Holster( int skiplocal = 0 );
+	virtual BOOL IsUseable( void );
+	virtual void UpdateItemInfo( void ) { return; };
+
+	virtual void ItemPreFrame( void )	{ return; }		// called each frame by the player PreThink
+	virtual void ItemPostFrame( void ) { return; }		// called each frame by the player PostThink
+
+	virtual void Drop( void );
+	virtual void Kill( void );
+	virtual void AttachToPlayer ( CBasePlayer *pPlayer );
+
+	virtual int PrimaryAmmoIndex() { return -1; };
+	virtual int SecondaryAmmoIndex() { return -1; };
+    virtual void Spawn();
+	virtual int UpdateClientData( CBasePlayer *pPlayer ) { return 0; }
+
+	virtual CBasePlayerItem *GetWeaponPtr( void ) { return (CBasePlayerItem *)this; };
+
+	static ItemInfo ItemInfoArray[ MAX_WEAPONS ];
+	static AmmoInfo AmmoInfoArray[ MAX_AMMO_SLOTS ];
+
+	CBasePlayer	*m_pPlayer;
+	CBasePlayerItem *m_pNext;
+	int		m_iId;												// WEAPON_???
+
+	virtual int iItemSlot( void ) { return 0; }			// return 0 to MAX_ITEMS_SLOTS, used in hud
+
+	int			iItemPosition( void ) { return ItemInfoArray[ m_iId ].iPosition; }
+	const char	*pszAmmo1( void )	{ return ItemInfoArray[ m_iId ].pszAmmo1; }
+	int			iMaxAmmo1( void )	{ return ItemInfoArray[ m_iId ].iMaxAmmo1; }
+	const char	*pszAmmo2( void )	{ return ItemInfoArray[ m_iId ].pszAmmo2; }
+	int			iMaxAmmo2( void )	{ return ItemInfoArray[ m_iId ].iMaxAmmo2; }
+	const char	*pszName( void )	{ return ItemInfoArray[ m_iId ].pszName; }
+	int			iMaxClip( void )	{ return ItemInfoArray[ m_iId ].iMaxClip; }
+	int			iWeight( void )		{ return ItemInfoArray[ m_iId ].iWeight; }
+	int			iFlags( void )		{ return ItemInfoArray[ m_iId ].iFlags; }
+
+	// int		m_iIdPrimary;										// Unique Id for primary ammo
+	// int		m_iIdSecondary;										// Unique Id for secondary ammo
+};
+
+
+// inventory items that 
+class CBasePlayerWeapon : public CBasePlayerItem
+{
+public:
+	virtual int		Save( CSave &save );
+	virtual int		Restore( CRestore &restore );
+	
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	// generic weapon versions of CBasePlayerItem calls
+	virtual int AddToPlayer( CBasePlayer *pPlayer );
+	virtual int AddDuplicate( CBasePlayerItem *pItem );
+
+	virtual int ExtractAmmo( CBasePlayerWeapon *pWeapon ); //{ return TRUE; };			// Return TRUE if you can add ammo to yourself when picked up
+	virtual int ExtractClipAmmo( CBasePlayerWeapon *pWeapon );// { return TRUE; };			// Return TRUE if you can add ammo to yourself when picked up
+
+	virtual int AddWeapon( void ) { ExtractAmmo( this ); return TRUE; };	// Return TRUE if you want to add yourself to the player
+
+	// generic "shared" ammo handlers
+	BOOL AddPrimaryAmmo( int iCount, char *szName, int iMaxClip, int iMaxCarry );
+	BOOL AddSecondaryAmmo( int iCount, char *szName, int iMaxCarry );
+
+	virtual void UpdateItemInfo( void ) {};	// updates HUD state
+
+	int m_iPlayEmptySound;
+	int m_fFireOnEmpty;		// True when the gun is empty and the player is still holding down the
+							// attack key(s)
+	virtual BOOL PlayEmptySound( void );
+	virtual void ResetEmptySound( void );
+    
+    virtual float GetWeaponPrimeTime() const { return -1.0f; }
+    virtual void PrimeWeapon() {}
+    virtual BOOL GetIsWeaponPrimed() const { return false; }
+    virtual BOOL GetIsWeaponPriming() const { return false; }
+
+	virtual void SendWeaponAnim( int iAnim, int skiplocal = 1, int body = 0 );  // skiplocal is 1 if client is predicting weapon animations
+
+	virtual BOOL CanDeploy( void );
+	virtual BOOL IsUseable( void );
+	virtual BOOL DefaultDeploy( char *szViewModel, char *szWeaponModel, int iAnim, char *szAnimExt, int skiplocal = 0, int body = 0 );
+	virtual int DefaultReload( int iClipSize, int iAnim, float fDelay, int body = 0 );
+	virtual float GetDeployTime() const { return .3f; }
+
+	virtual void ItemPostFrame( void );	// called each frame by the player PostThink
+	// called by CBasePlayerWeapons ItemPostFrame()
+	virtual void PrimaryAttack( void ) { return; }				// do "+ATTACK"
+	virtual void SecondaryAttack( void ) { return; }			// do "+ATTACK2"
+	virtual void Reload( void ) { return; }						// do "+RELOAD"
+	virtual void WeaponIdle( void ) { return; }					// called when no buttons pressed
+	virtual int UpdateClientData( CBasePlayer *pPlayer );		// sends hud info to client dll, if things have changed
+	virtual void RetireWeapon( void );
+	virtual BOOL ShouldWeaponIdle( void ) {return FALSE; };
+	virtual void Holster( int skiplocal = 0 );
+	virtual BOOL UseDecrement( void ) { return FALSE; };
+	
+	int	PrimaryAmmoIndex(); 
+	int	SecondaryAmmoIndex(); 
+
+	void PrintState( void );
+
+	float m_flPumpTime;
+	int		m_fInSpecialReload;									// Are we in the middle of a reload for the shotguns
+	float	m_flNextPrimaryAttack;								// soonest time ItemPostFrame will call PrimaryAttack
+	float	m_flNextSecondaryAttack;							// soonest time ItemPostFrame will call SecondaryAttack
+	float	m_flTimeWeaponIdle;									// soonest time ItemPostFrame will call WeaponIdle
+	int		m_iPrimaryAmmoType;									// "primary" ammo index into players m_rgAmmo[]
+	int		m_iSecondaryAmmoType;								// "secondary" ammo index into players m_rgAmmo[]
+	int		m_iClip;											// number of shots left in the primary weapon clip, -1 it not used
+	int		m_iClientClip;										// the last version of m_iClip sent to hud dll
+	int		m_iClientWeaponState;								// the last version of the weapon state sent to hud dll (is current weapon, is on target)
+	int		m_iClientEnableState;								// puzl: 497 the last version of the weapon enabled state sent to the hud dll
+	int		m_fInReload;										// Are we in the middle of a reload;
+	int		m_iEnabled;											// Is the weapon enabled
+    
+	int		m_iDefaultAmmo;// how much ammo you get when you pick up this weapon as placed by a level designer.
+
+};
+
+
+class CBasePlayerAmmo : public CBaseEntity
+{
+public:
+	virtual void Spawn( void );
+	void EXPORT DefaultTouch( CBaseEntity *pOther ); // default weapon touch
+	virtual BOOL AddAmmo( CBaseEntity *pOther ) { return TRUE; };
+
+	CBaseEntity* Respawn( void );
+	void EXPORT Materialize( void );
+};
+
+
+extern DLL_GLOBAL	short	g_sModelIndexLaser;// holds the index for the laser beam
+extern DLL_GLOBAL	const char *g_pModelNameLaser;
+
+extern DLL_GLOBAL	short	g_sModelIndexLaserDot;// holds the index for the laser beam dot
+extern DLL_GLOBAL	short	g_sModelIndexFireball;// holds the index for the fireball
+extern DLL_GLOBAL	short	g_sModelIndexSmoke;// holds the index for the smoke cloud
+extern DLL_GLOBAL	short	g_sModelIndexWExplosion;// holds the index for the underwater explosion
+extern DLL_GLOBAL	short	g_sModelIndexBubbles;// holds the index for the bubbles model
+extern DLL_GLOBAL	short	g_sModelIndexBloodDrop;// holds the sprite index for blood drops
+extern DLL_GLOBAL	short	g_sModelIndexBloodSpray;// holds the sprite index for blood spray (bigger)
+
+extern void ClearMultiDamage(void);
+extern void ApplyMultiDamage(entvars_t* pevInflictor, entvars_t* pevAttacker );
+extern void AddMultiDamage( entvars_t *pevInflictor, CBaseEntity *pEntity, float flDamage, int bitsDamageType);
+
+extern void DecalGunshot( TraceResult *pTrace, int iBulletType );
+extern void SpawnBlood(Vector vecSpot, int bloodColor, float flDamage);
+extern int DamageDecal( CBaseEntity *pEntity, int bitsDamageType );
+extern void RadiusDamage( Vector vecSrc, entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, float flRadius, int iClassIgnore, int bitsDamageType );
+
+typedef struct 
+{
+	CBaseEntity		*pEntity;
+	float			amount;
+	int				type;
+} MULTIDAMAGE;
+
+extern MULTIDAMAGE gMultiDamage;
+
+
+#define LOUD_GUN_VOLUME			1000
+#define NORMAL_GUN_VOLUME		600
+#define QUIET_GUN_VOLUME		200
+
+#define	BRIGHT_GUN_FLASH		512
+#define NORMAL_GUN_FLASH		256
+#define	DIM_GUN_FLASH			128
+
+#define BIG_EXPLOSION_VOLUME	2048
+#define NORMAL_EXPLOSION_VOLUME	1024
+#define SMALL_EXPLOSION_VOLUME	512
+
+#define	WEAPON_ACTIVITY_VOLUME	64
+
+#define VECTOR_CONE_0DEGREES	Vector( 0.0f, 0.0f, 0.0f)
+#define VECTOR_CONE_1DEGREES	Vector( 0.00873, 0.00873, 0.00873 )
+#define VECTOR_CONE_2DEGREES	Vector( 0.01745, 0.01745, 0.01745 )
+#define VECTOR_CONE_3DEGREES	Vector( 0.02618, 0.02618, 0.02618 )
+#define VECTOR_CONE_4DEGREES	Vector( 0.03490, 0.03490, 0.03490 )
+#define VECTOR_CONE_5DEGREES	Vector( 0.04362, 0.04362, 0.04362 )
+#define VECTOR_CONE_6DEGREES	Vector( 0.05234, 0.05234, 0.05234 )
+#define VECTOR_CONE_7DEGREES	Vector( 0.06105, 0.06105, 0.06105 )
+#define VECTOR_CONE_8DEGREES	Vector( 0.06976, 0.06976, 0.06976 )
+#define VECTOR_CONE_9DEGREES	Vector( 0.07846, 0.07846, 0.07846 )
+#define VECTOR_CONE_10DEGREES	Vector( 0.08716, 0.08716, 0.08716 )
+#define VECTOR_CONE_15DEGREES	Vector( 0.13053, 0.13053, 0.13053 )
+#define VECTOR_CONE_20DEGREES	Vector( 0.17365, 0.17365, 0.17365 )
+
+//=========================================================
+// CWeaponBox - a single entity that can store weapons
+// and ammo. 
+//=========================================================
+class CWeaponBox : public CBaseEntity
+{
+	void Precache( void );
+	void Spawn( void );
+	void Touch( CBaseEntity *pOther );
+	void KeyValue( KeyValueData *pkvd );
+	BOOL IsEmpty( void );
+	int  GiveAmmo( int iCount, char *szName, int iMax, int *pIndex = NULL );
+	void SetObjectCollisionBox( void );
+
+public:
+	void EXPORT Kill ( void );
+	int		Save( CSave &save );
+	int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	BOOL HasWeapon( CBasePlayerItem *pCheckItem );
+	BOOL PackWeapon( CBasePlayerItem *pWeapon );
+	BOOL PackAmmo( int iszName, int iCount );
+	
+	CBasePlayerItem	*m_rgpPlayerItems[MAX_ITEM_TYPES];// one slot for each 
+
+	int m_rgiszAmmo[MAX_AMMO_SLOTS];// ammo names
+	int	m_rgAmmo[MAX_AMMO_SLOTS];// ammo quantities
+
+	int m_cAmmoTypes;// how many ammo types packed into this box (if packed by a level designer)
+};
+
+#ifdef CLIENT_DLL
+bool bIsMultiplayer ( void );
+void LoadVModel ( char *szViewModel, CBasePlayer *m_pPlayer );
+#endif
+
+class CGlock : public CBasePlayerWeapon
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	int iItemSlot( void ) { return 2; }
+	int GetItemInfo(ItemInfo *p);
+
+	void PrimaryAttack( void );
+	void SecondaryAttack( void );
+	void GlockFire( float flSpread, float flCycleTime, BOOL fUseAutoAim );
+	BOOL Deploy( void );
+	void Reload( void );
+	void WeaponIdle( void );
+
+	virtual BOOL UseDecrement( void )
+	{ 
+#if defined( CLIENT_WEAPONS )
+		return TRUE;
+#else
+		return FALSE;
+#endif
+	}
+
+private:
+	int m_iShell;
+	
+
+	unsigned short m_usFireGlock1;
+	unsigned short m_usFireGlock2;
+};
+
+
+class CCrowbar : public CBasePlayerWeapon
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	int iItemSlot( void ) { return 1; }
+	void EXPORT SwingAgain( void );
+	void EXPORT Smack( void );
+	int GetItemInfo(ItemInfo *p);
+
+	void PrimaryAttack( void );
+	int Swing( int fFirst );
+	BOOL Deploy( void );
+	void Holster( int skiplocal = 0 );
+	int m_iSwing;
+	TraceResult m_trHit;
+
+	virtual BOOL UseDecrement( void )
+	{ 
+#if defined( CLIENT_WEAPONS )
+		return TRUE;
+#else
+		return FALSE;
+#endif
+	}
+private:
+	unsigned short m_usCrowbar;
+};
+
+class CPython : public CBasePlayerWeapon
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	int iItemSlot( void ) { return 2; }
+	int GetItemInfo(ItemInfo *p);
+	int AddToPlayer( CBasePlayer *pPlayer );
+	void PrimaryAttack( void );
+	void SecondaryAttack( void );
+	BOOL Deploy( void );
+	void Holster( int skiplocal = 0 );
+	void Reload( void );
+	void WeaponIdle( void );
+	float m_flSoundDelay;
+
+	BOOL m_fInZoom;// don't save this. 
+
+	virtual BOOL UseDecrement( void )
+	{ 
+#if defined( CLIENT_WEAPONS )
+		return TRUE;
+#else
+		return FALSE;
+#endif
+	}
+
+private:
+	unsigned short m_usFirePython;
+};
+
+class CMP5 : public CBasePlayerWeapon
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	int iItemSlot( void ) { return 3; }
+	int GetItemInfo(ItemInfo *p);
+	int AddToPlayer( CBasePlayer *pPlayer );
+
+	void PrimaryAttack( void );
+	void SecondaryAttack( void );
+	int SecondaryAmmoIndex( void );
+	BOOL Deploy( void );
+	void Reload( void );
+	void WeaponIdle( void );
+	float m_flNextAnimTime;
+	int m_iShell;
+
+	virtual BOOL UseDecrement( void )
+	{ 
+#if defined( CLIENT_WEAPONS )
+		return TRUE;
+#else
+		return FALSE;
+#endif
+	}
+
+private:
+	unsigned short m_usMP5;
+	unsigned short m_usMP52;
+};
+
+class CCrossbow : public CBasePlayerWeapon
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	int iItemSlot( ) { return 3; }
+	int GetItemInfo(ItemInfo *p);
+
+	void FireBolt( void );
+	void FireSniperBolt( void );
+	void PrimaryAttack( void );
+	void SecondaryAttack( void );
+	int AddToPlayer( CBasePlayer *pPlayer );
+	BOOL Deploy( );
+	void Holster( int skiplocal = 0 );
+	void Reload( void );
+	void WeaponIdle( void );
+
+	int m_fInZoom; // don't save this
+
+	virtual BOOL UseDecrement( void )
+	{ 
+#if defined( CLIENT_WEAPONS )
+		return TRUE;
+#else
+		return FALSE;
+#endif
+	}
+
+private:
+	unsigned short m_usCrossbow;
+	unsigned short m_usCrossbow2;
+};
+
+class CShotgun : public CBasePlayerWeapon
+{
+public:
+
+#ifndef CLIENT_DLL
+	int		Save( CSave &save );
+	int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+#endif
+
+
+	void Spawn( void );
+	void Precache( void );
+	int iItemSlot( ) { return 3; }
+	int GetItemInfo(ItemInfo *p);
+	int AddToPlayer( CBasePlayer *pPlayer );
+
+	void PrimaryAttack( void );
+	void SecondaryAttack( void );
+	BOOL Deploy( );
+	void Reload( void );
+	void WeaponIdle( void );
+	int m_fInReload;
+	float m_flNextReload;
+	int m_iShell;
+
+	virtual BOOL UseDecrement( void )
+	{ 
+#if defined( CLIENT_WEAPONS )
+		return TRUE;
+#else
+		return FALSE;
+#endif
+	}
+
+private:
+	unsigned short m_usDoubleFire;
+	unsigned short m_usSingleFire;
+};
+
+class CLaserSpot : public CBaseEntity
+{
+	void Spawn( void );
+	void Precache( void );
+
+	int	ObjectCaps( void ) { return FCAP_DONT_SAVE; }
+
+public:
+	void Suspend( float flSuspendTime );
+	void EXPORT Revive( void );
+	
+	static CLaserSpot *CreateSpot( void );
+};
+
+class CRpg : public CBasePlayerWeapon
+{
+public:
+
+#ifndef CLIENT_DLL
+	int		Save( CSave &save );
+	int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+#endif
+
+	void Spawn( void );
+	void Precache( void );
+	void Reload( void );
+	int iItemSlot( void ) { return 4; }
+	int GetItemInfo(ItemInfo *p);
+	int AddToPlayer( CBasePlayer *pPlayer );
+
+	BOOL Deploy( void );
+	BOOL CanHolster( void );
+	void Holster( int skiplocal = 0 );
+
+	void PrimaryAttack( void );
+	void SecondaryAttack( void );
+	void WeaponIdle( void );
+
+	void UpdateSpot( void );
+	BOOL ShouldWeaponIdle( void ) { return TRUE; };
+
+	CLaserSpot *m_pSpot;
+	int m_fSpotActive;
+	int m_cActiveRockets;// how many missiles in flight from this launcher right now?
+
+	virtual BOOL UseDecrement( void )
+	{ 
+#if defined( CLIENT_WEAPONS )
+		return TRUE;
+#else
+		return FALSE;
+#endif
+	}
+
+private:
+	unsigned short m_usRpg;
+
+};
+
+class CRpgRocket : public CGrenade
+{
+public:
+	int		Save( CSave &save );
+	int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+	void Spawn( void );
+	void Precache( void );
+	void EXPORT FollowThink( void );
+	void EXPORT IgniteThink( void );
+	void EXPORT RocketTouch( CBaseEntity *pOther );
+	static CRpgRocket *CreateRpgRocket( Vector vecOrigin, Vector vecAngles, CBaseEntity *pOwner, CRpg *pLauncher );
+
+	int m_iTrail;
+	float m_flIgniteTime;
+	CRpg *m_pLauncher;// pointer back to the launcher that fired me. 
+};
+
+class CGauss : public CBasePlayerWeapon
+{
+public:
+
+#ifndef CLIENT_DLL
+	int		Save( CSave &save );
+	int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+#endif
+
+	void Spawn( void );
+	void Precache( void );
+	int iItemSlot( void ) { return 4; }
+	int GetItemInfo(ItemInfo *p);
+	int AddToPlayer( CBasePlayer *pPlayer );
+
+	BOOL Deploy( void );
+	void Holster( int skiplocal = 0  );
+
+	void PrimaryAttack( void );
+	void SecondaryAttack( void );
+	void WeaponIdle( void );
+	
+	void StartFire( void );
+	void Fire( Vector vecOrigSrc, Vector vecDirShooting, float flDamage );
+	float GetFullChargeTime( void );
+	int m_iBalls;
+	int m_iGlow;
+	int m_iBeam;
+	int m_iSoundState; // don't save this
+
+	// was this weapon just fired primary or secondary?
+	// we need to know so we can pick the right set of effects. 
+	BOOL m_fPrimaryFire;
+
+	virtual BOOL UseDecrement( void )
+	{ 
+#if defined( CLIENT_WEAPONS )
+		return TRUE;
+#else
+		return FALSE;
+#endif
+	}
+
+private:
+	unsigned short m_usGaussFire;
+	unsigned short m_usGaussSpin;
+};
+
+class CEgon : public CBasePlayerWeapon
+{
+public:
+#ifndef CLIENT_DLL
+	int		Save( CSave &save );
+	int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+#endif
+
+	void Spawn( void );
+	void Precache( void );
+	int iItemSlot( void ) { return 4; }
+	int GetItemInfo(ItemInfo *p);
+	int AddToPlayer( CBasePlayer *pPlayer );
+
+	BOOL Deploy( void );
+	void Holster( int skiplocal = 0 );
+
+	void UpdateEffect( const Vector &startPoint, const Vector &endPoint, float timeBlend );
+
+	void CreateEffect ( void );
+	void DestroyEffect ( void );
+
+	void EndAttack( void );
+	void Attack( void );
+	void PrimaryAttack( void );
+	void WeaponIdle( void );
+
+	float m_flAmmoUseTime;// since we use < 1 point of ammo per update, we subtract ammo on a timer.
+
+	float GetPulseInterval( void );
+	float GetDischargeInterval( void );
+
+	void Fire( const Vector &vecOrigSrc, const Vector &vecDir );
+
+	BOOL HasAmmo( void );
+
+	void UseAmmo( int count );
+	
+	enum EGON_FIREMODE { FIRE_NARROW, FIRE_WIDE};
+
+	CBeam				*m_pBeam;
+	CBeam				*m_pNoise;
+	CSprite				*m_pSprite;
+
+	virtual BOOL UseDecrement( void )
+	{ 
+#if defined( CLIENT_WEAPONS )
+		return TRUE;
+#else
+		return FALSE;
+#endif
+	}
+
+	unsigned short m_usEgonStop;
+
+private:
+	float				m_shootTime;
+	EGON_FIREMODE		m_fireMode;
+	float				m_shakeTime;
+	BOOL				m_deployed;
+
+	unsigned short m_usEgonFire;
+};
+
+class CHgun : public CBasePlayerWeapon
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	int iItemSlot( void ) { return 4; }
+	int GetItemInfo(ItemInfo *p);
+	int AddToPlayer( CBasePlayer *pPlayer );
+
+	void PrimaryAttack( void );
+	void SecondaryAttack( void );
+	BOOL Deploy( void );
+	BOOL IsUseable( void );
+	void Holster( int skiplocal = 0 );
+	void Reload( void );
+	void WeaponIdle( void );
+	float m_flNextAnimTime;
+
+	float m_flRechargeTime;
+	
+	int m_iFirePhase;// don't save me.
+
+	virtual BOOL UseDecrement( void )
+	{ 
+#if defined( CLIENT_WEAPONS )
+		return TRUE;
+#else
+		return FALSE;
+#endif
+	}
+private:
+	unsigned short m_usHornetFire;
+};
+
+
+
+class CHandGrenade : public CBasePlayerWeapon
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	int iItemSlot( void ) { return 5; }
+	int GetItemInfo(ItemInfo *p);
+
+	void PrimaryAttack( void );
+	BOOL Deploy( void );
+	BOOL CanHolster( void );
+	void Holster( int skiplocal = 0 );
+	void WeaponIdle( void );
+	
+	virtual BOOL UseDecrement( void )
+	{ 
+#if defined( CLIENT_WEAPONS )
+		return TRUE;
+#else
+		return FALSE;
+#endif
+	}
+};
+
+class CSatchel : public CBasePlayerWeapon
+{
+public:
+
+#ifndef CLIENT_DLL
+	int		Save( CSave &save );
+	int		Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+#endif
+
+	void Spawn( void );
+	void Precache( void );
+	int iItemSlot( void ) { return 5; }
+	int GetItemInfo(ItemInfo *p);
+	int AddToPlayer( CBasePlayer *pPlayer );
+	void PrimaryAttack( void );
+	void SecondaryAttack( void );
+	int AddDuplicate( CBasePlayerItem *pOriginal );
+	BOOL CanDeploy( void );
+	BOOL Deploy( void );
+	BOOL IsUseable( void );
+	
+	void Holster( int skiplocal = 0 );
+	void WeaponIdle( void );
+	void Throw( void );
+	
+	virtual BOOL UseDecrement( void )
+	{ 
+#if defined( CLIENT_WEAPONS )
+		return TRUE;
+#else
+		return FALSE;
+#endif
+	}
+};
+
+
+//class CTripmine : public CBasePlayerWeapon
+//class CTripmine : public AvHBasePlayerWeapon
+//{
+//public:
+//
+//	virtual int	GetBarrelLength() const;
+//	
+//	void Spawn( void );
+//	void Precache( void );
+//	int iItemSlot( void ) { return 5; }
+//	int GetItemInfo(ItemInfo *p);
+//	void SetObjectCollisionBox( void )
+//	{
+//		//!!!BUGBUG - fix the model!
+//		pev->absmin = pev->origin + Vector(-16, -16, -5);
+//		pev->absmax = pev->origin + Vector(16, 16, 28); 
+//	}
+//
+//	void PrimaryAttack( void );
+//	BOOL Deploy( void );
+//	void Holster( int skiplocal = 0 );
+//	void WeaponIdle( void );
+//
+//	virtual BOOL UseDecrement( void )
+//	{ 
+//#if defined( CLIENT_WEAPONS )
+//		return TRUE;
+//#else
+//		return FALSE;
+//#endif
+//	}
+//
+//private:
+//	unsigned short m_usTripFire;
+//
+//};
+
+class CSqueak : public CBasePlayerWeapon
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	int iItemSlot( void ) { return 5; }
+	int GetItemInfo(ItemInfo *p);
+
+	void PrimaryAttack( void );
+	void SecondaryAttack( void );
+	BOOL Deploy( void );
+	void Holster( int skiplocal = 0 );
+	void WeaponIdle( void );
+	int m_fJustThrown;
+
+	virtual BOOL UseDecrement( void )
+	{ 
+#if defined( CLIENT_WEAPONS )
+		return TRUE;
+#else
+		return FALSE;
+#endif
+	}
+
+private:
+	unsigned short m_usSnarkFire;
+};
+
+
+#endif // WEAPONS_H
diff --git a/main/source/dlls/world.cpp b/main/source/dlls/world.cpp
new file mode 100644
index 00000000..4783a7d1
--- /dev/null
+++ b/main/source/dlls/world.cpp
@@ -0,0 +1,783 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+/*
+
+===== world.cpp ========================================================
+
+  precaches and defs for entities and other data that must always be available.
+
+*/
+
+#include "util/nowarnings.h"
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "nodes.h"
+#include "soundent.h"
+#include "client.h"
+#include "decals.h"
+#include "skill.h"
+#include "effects.h"
+#include "player.h"
+#include "weapons.h"
+#include "gamerules.h"
+#include "teamplay_gamerules.h"
+#include "mod/AvHGamerules.h"
+#include "pm_shared/pm_defs.h"
+
+extern CGraph WorldGraph;
+extern CSoundEnt *pSoundEnt;
+
+DLL_GLOBAL edict_t				*g_pBodyQueueHead;
+CGlobalState					gGlobalState;
+extern DLL_GLOBAL	int			gDisplayTitle;
+extern playermove_t* pmove;
+
+extern void W_Precache(void);
+
+//
+// This must match the list in util.h
+//
+DLL_DECALLIST gDecals[] = {
+	{ "{shot1",	0 },		// DECAL_GUNSHOT1 
+	{ "{shot2",	0 },		// DECAL_GUNSHOT2
+	{ "{shot3",0 },			// DECAL_GUNSHOT3
+	{ "{shot4",	0 },		// DECAL_GUNSHOT4
+	{ "{shot5",	0 },		// DECAL_GUNSHOT5
+	{ "{lambda01", 0 },		// DECAL_LAMBDA1
+	{ "{lambda02", 0 },		// DECAL_LAMBDA2
+	{ "{lambda03", 0 },		// DECAL_LAMBDA3
+	{ "{lambda04", 0 },		// DECAL_LAMBDA4
+	{ "{lambda05", 0 },		// DECAL_LAMBDA5
+	{ "{lambda06", 0 },		// DECAL_LAMBDA6
+	{ "{scorch1", 0 },		// DECAL_SCORCH1
+	{ "{scorch2", 0 },		// DECAL_SCORCH2
+	{ "{blood1", 0 },		// DECAL_BLOOD1
+	{ "{blood2", 0 },		// DECAL_BLOOD2
+	{ "{blood3", 0 },		// DECAL_BLOOD3
+	{ "{blood4", 0 },		// DECAL_BLOOD4
+	{ "{blood5", 0 },		// DECAL_BLOOD5
+	{ "{blood6", 0 },		// DECAL_BLOOD6
+	{ "{yblood1", 0 },		// DECAL_YBLOOD1
+	{ "{yblood2", 0 },		// DECAL_YBLOOD2
+	{ "{yblood3", 0 },		// DECAL_YBLOOD3
+	{ "{yblood4", 0 },		// DECAL_YBLOOD4
+	{ "{yblood5", 0 },		// DECAL_YBLOOD5
+	{ "{yblood6", 0 },		// DECAL_YBLOOD6
+	{ "{break1", 0 },		// DECAL_GLASSBREAK1
+	{ "{break2", 0 },		// DECAL_GLASSBREAK2
+	{ "{break3", 0 },		// DECAL_GLASSBREAK3
+	{ "{bigshot1", 0 },		// DECAL_BIGSHOT1
+	{ "{bigshot2", 0 },		// DECAL_BIGSHOT2
+	{ "{bigshot3", 0 },		// DECAL_BIGSHOT3
+	{ "{bigshot4", 0 },		// DECAL_BIGSHOT4
+	{ "{bigshot5", 0 },		// DECAL_BIGSHOT5
+	{ "{spit1", 0 },		// DECAL_SPIT1
+	{ "{spit2", 0 },		// DECAL_SPIT2
+	{ "{bproof1", 0 },		// DECAL_BPROOF1
+	{ "{gargstomp", 0 },	// DECAL_GARGSTOMP1,	// Gargantua stomp crack
+	{ "{smscorch1", 0 },	// DECAL_SMALLSCORCH1,	// Small scorch mark
+	{ "{smscorch2", 0 },	// DECAL_SMALLSCORCH2,	// Small scorch mark
+	{ "{smscorch3", 0 },	// DECAL_SMALLSCORCH3,	// Small scorch mark
+	{ "{mommablob", 0 },	// DECAL_MOMMABIRTH		// BM Birth spray
+	{ "{mommablob", 0 },	// DECAL_MOMMASPLAT		// BM Mortar spray?? need decal
+};
+
+/*
+==============================================================================
+
+BODY QUE
+
+==============================================================================
+*/
+
+#define SF_DECAL_NOTINDEATHMATCH		2048
+
+class CDecal : public CBaseEntity
+{
+public:
+	void	Spawn( void );
+	void	KeyValue( KeyValueData *pkvd );
+	void	EXPORT StaticDecal( void );
+	void	EXPORT TriggerDecal( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+};
+
+LINK_ENTITY_TO_CLASS( infodecal, CDecal );
+
+// UNDONE:  These won't get sent to joining players in multi-player
+void CDecal :: Spawn( void )
+{
+	if ( pev->skin < 0 || (gpGlobals->deathmatch && FBitSet( pev->spawnflags, SF_DECAL_NOTINDEATHMATCH )) )
+	{
+		REMOVE_ENTITY(ENT(pev));
+		return;
+	}
+
+	if ( FStringNull ( pev->targetname ) )
+	{
+		SetThink(&CDecal::StaticDecal );
+		// if there's no targetname, the decal will spray itself on as soon as the world is done spawning.
+		pev->nextthink = gpGlobals->time;
+	}
+	else
+	{
+		// if there IS a targetname, the decal sprays itself on when it is triggered.
+		SetThink (&CDecal::SUB_DoNothing );
+		SetUse(&CDecal::TriggerDecal);
+	}
+}
+
+void CDecal :: TriggerDecal ( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	// this is set up as a USE function for infodecals that have targetnames, so that the
+	// decal doesn't get applied until it is fired. (usually by a scripted sequence)
+	TraceResult trace;
+	int			entityIndex;
+
+	UTIL_TraceLine( pev->origin - Vector(5,5,5), pev->origin + Vector(5,5,5),  ignore_monsters, ENT(pev), &trace );
+
+	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY);
+		WRITE_BYTE( TE_BSPDECAL );
+		WRITE_COORD( pev->origin.x );
+		WRITE_COORD( pev->origin.y );
+		WRITE_COORD( pev->origin.z );
+		WRITE_SHORT( (int)pev->skin );
+		entityIndex = (short)ENTINDEX(trace.pHit);
+		WRITE_SHORT( entityIndex );
+		if ( entityIndex )
+			WRITE_SHORT( (int)VARS(trace.pHit)->modelindex );
+	MESSAGE_END();
+
+	SetThink(&CDecal::SUB_Remove );
+	pev->nextthink = gpGlobals->time + 0.1;
+}
+
+
+void CDecal :: StaticDecal( void )
+{
+	TraceResult trace;
+	int			entityIndex, modelIndex;
+
+	UTIL_TraceLine( pev->origin - Vector(5,5,5), pev->origin + Vector(5,5,5),  ignore_monsters, ENT(pev), &trace );
+
+	entityIndex = (short)ENTINDEX(trace.pHit);
+	if ( entityIndex )
+		modelIndex = (int)VARS(trace.pHit)->modelindex;
+	else
+		modelIndex = 0;
+
+	g_engfuncs.pfnStaticDecal( pev->origin, (int)pev->skin, entityIndex, modelIndex );
+
+	SUB_Remove();
+}
+
+
+void CDecal :: KeyValue( KeyValueData *pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "texture"))
+	{
+		pev->skin = DECAL_INDEX( pkvd->szValue );
+		
+		// Found
+		if ( pev->skin >= 0 )
+			return;
+		ALERT( at_console, "Can't find decal %s\n", pkvd->szValue );
+	}
+	else
+		CBaseEntity::KeyValue( pkvd );
+}
+
+
+// Body queue class here.... It's really just CBaseEntity
+class CCorpse : public CBaseEntity
+{
+	virtual int ObjectCaps( void ) { return FCAP_DONT_SAVE; }	
+};
+
+LINK_ENTITY_TO_CLASS( bodyque, CCorpse );
+
+static void InitBodyQue(void)
+{
+	string_t	istrClassname = MAKE_STRING("bodyque");
+
+	g_pBodyQueueHead = CREATE_NAMED_ENTITY( istrClassname );
+	entvars_t *pev = VARS(g_pBodyQueueHead);
+	
+	// Reserve 3 more slots for dead bodies
+	for ( int i = 0; i < 3; i++ )
+	{
+		pev->owner = CREATE_NAMED_ENTITY( istrClassname );
+		pev = VARS(pev->owner);
+	}
+	
+	pev->owner = g_pBodyQueueHead;
+}
+
+
+//
+// make a body que entry for the given ent so the ent can be respawned elsewhere
+//
+// GLOBALS ASSUMED SET:  g_eoBodyQueueHead
+//
+void CopyToBodyQue(entvars_t *pev) 
+{
+	if (pev->effects & EF_NODRAW)
+		return;
+
+	entvars_t *pevHead	= VARS(g_pBodyQueueHead);
+
+	pevHead->angles		= pev->angles;
+	pevHead->model		= pev->model;
+	pevHead->modelindex	= pev->modelindex;
+	pevHead->frame		= pev->frame;
+	pevHead->colormap	= pev->colormap;
+	pevHead->movetype	= MOVETYPE_TOSS;
+	pevHead->velocity	= pev->velocity;
+	pevHead->flags		= 0;
+	pevHead->deadflag	= pev->deadflag;
+	pevHead->renderfx	= kRenderFxDeadPlayer;
+	pevHead->renderamt	= ENTINDEX( ENT( pev ) );
+
+	pevHead->effects    = pev->effects | EF_NOINTERP;
+	//pevHead->goalstarttime = pev->goalstarttime;
+	//pevHead->goalframe	= pev->goalframe;
+	//pevHead->goalendtime = pev->goalendtime ;
+	
+	pevHead->sequence = pev->sequence;
+	pevHead->animtime = pev->animtime;
+
+	UTIL_SetOrigin(pevHead, pev->origin);
+	UTIL_SetSize(pevHead, pev->mins, pev->maxs);
+	g_pBodyQueueHead = pevHead->owner;
+}
+
+
+CGlobalState::CGlobalState( void )
+{
+	Reset();
+}
+
+void CGlobalState::Reset( void )
+{
+	m_pList = NULL; 
+	m_listCount = 0;
+}
+
+globalentity_t *CGlobalState :: Find( string_t globalname )
+{
+	if ( !globalname )
+		return NULL;
+
+	globalentity_t *pTest;
+	const char *pEntityName = STRING(globalname);
+
+	
+	pTest = m_pList;
+	while ( pTest )
+	{
+		if ( FStrEq( pEntityName, pTest->name ) )
+			break;
+	
+		pTest = pTest->pNext;
+	}
+
+	return pTest;
+}
+
+
+// This is available all the time now on impulse 104, remove later
+//#ifdef _DEBUG
+void CGlobalState :: DumpGlobals( void )
+{
+	static char *estates[] = { "Off", "On", "Dead" };
+	globalentity_t *pTest;
+
+	ALERT( at_console, "-- Globals --\n" );
+	pTest = m_pList;
+	while ( pTest )
+	{
+		ALERT( at_console, "%s: %s (%s)\n", pTest->name, pTest->levelName, estates[pTest->state] );
+		pTest = pTest->pNext;
+	}
+}
+//#endif
+
+
+void CGlobalState :: EntityAdd( string_t globalname, string_t mapName, GLOBALESTATE state )
+{
+	ASSERT( !Find(globalname) );
+
+	globalentity_t *pNewEntity = (globalentity_t *)calloc( sizeof( globalentity_t ), 1 );
+	ASSERT( pNewEntity != NULL );
+	pNewEntity->pNext = m_pList;
+	m_pList = pNewEntity;
+	strcpy( pNewEntity->name, STRING( globalname ) );
+	strcpy( pNewEntity->levelName, STRING(mapName) );
+	pNewEntity->state = state;
+	m_listCount++;
+}
+
+
+void CGlobalState :: EntitySetState( string_t globalname, GLOBALESTATE state )
+{
+	globalentity_t *pEnt = Find( globalname );
+
+	if ( pEnt )
+		pEnt->state = state;
+}
+
+
+const globalentity_t *CGlobalState :: EntityFromTable( string_t globalname )
+{
+	globalentity_t *pEnt = Find( globalname );
+
+	return pEnt;
+}
+
+
+GLOBALESTATE CGlobalState :: EntityGetState( string_t globalname )
+{
+	globalentity_t *pEnt = Find( globalname );
+	if ( pEnt )
+		return pEnt->state;
+
+	return GLOBAL_OFF;
+}
+
+
+// Global Savedata for Delay
+TYPEDESCRIPTION	CGlobalState::m_SaveData[] = 
+{
+	DEFINE_FIELD( CGlobalState, m_listCount, FIELD_INTEGER ),
+};
+
+// Global Savedata for Delay
+TYPEDESCRIPTION	gGlobalEntitySaveData[] = 
+{
+	DEFINE_ARRAY( globalentity_t, name, FIELD_CHARACTER, 64 ),
+	DEFINE_ARRAY( globalentity_t, levelName, FIELD_CHARACTER, 32 ),
+	DEFINE_FIELD( globalentity_t, state, FIELD_INTEGER ),
+};
+
+const char* CGlobalState::GetLevelName()
+{
+	return STRING(this->m_pList->levelName);
+}
+
+int CGlobalState::Save( CSave &save )
+{
+	int i;
+	globalentity_t *pEntity;
+
+	if ( !save.WriteFields( "GLOBAL", this, m_SaveData, ARRAYSIZE(m_SaveData) ) )
+		return 0;
+	
+	pEntity = m_pList;
+	for ( i = 0; i < m_listCount && pEntity; i++ )
+	{
+		if ( !save.WriteFields( "GENT", pEntity, gGlobalEntitySaveData, ARRAYSIZE(gGlobalEntitySaveData) ) )
+			return 0;
+
+		pEntity = pEntity->pNext;
+	}
+	
+	return 1;
+}
+
+int CGlobalState::Restore( CRestore &restore )
+{
+	int i, listCount;
+	globalentity_t tmpEntity;
+
+
+	ClearStates();
+	if ( !restore.ReadFields( "GLOBAL", this, m_SaveData, ARRAYSIZE(m_SaveData) ) )
+		return 0;
+	
+	listCount = m_listCount;	// Get new list count
+	m_listCount = 0;				// Clear loaded data
+
+	for ( i = 0; i < listCount; i++ )
+	{
+		if ( !restore.ReadFields( "GENT", &tmpEntity, gGlobalEntitySaveData, ARRAYSIZE(gGlobalEntitySaveData) ) )
+			return 0;
+		EntityAdd( MAKE_STRING(tmpEntity.name), MAKE_STRING(tmpEntity.levelName), tmpEntity.state );
+	}
+	return 1;
+}
+
+void CGlobalState::EntityUpdate( string_t globalname, string_t mapname )
+{
+	globalentity_t *pEnt = Find( globalname );
+
+	if ( pEnt )
+		strcpy( pEnt->levelName, STRING(mapname) );
+}
+
+
+void CGlobalState::ClearStates( void )
+{
+	globalentity_t *pFree = m_pList;
+	while ( pFree )
+	{
+		globalentity_t *pNext = pFree->pNext;
+		free( pFree );
+		pFree = pNext;
+	}
+	Reset();
+}
+
+
+void SaveGlobalState( SAVERESTOREDATA *pSaveData )
+{
+	CSave saveHelper( pSaveData );
+	gGlobalState.Save( saveHelper );
+}
+
+
+void RestoreGlobalState( SAVERESTOREDATA *pSaveData )
+{
+	CRestore restoreHelper( pSaveData );
+	gGlobalState.Restore( restoreHelper );
+}
+
+
+void ResetGlobalState( void )
+{
+	gGlobalState.ClearStates();
+	gInitHUD = TRUE;	// Init the HUD on a new game / load game
+}
+
+// moved CWorld class definition to cbase.h
+//=======================
+// CWorld
+//
+// This spawns first when each level begins.
+//=======================
+
+LINK_ENTITY_TO_CLASS( worldspawn, CWorld );
+
+#define SF_WORLD_DARK		0x0001		// Fade from black at startup
+#define SF_WORLD_TITLE		0x0002		// Display game title at startup
+#define SF_WORLD_FORCETEAM	0x0004		// Force teams
+
+extern DLL_GLOBAL BOOL		g_fGameOver;
+float g_flWeaponCheat; 
+
+void CWorld :: Spawn( void )
+{
+	g_fGameOver = FALSE;
+	Precache( );
+	g_flWeaponCheat = CVAR_GET_FLOAT( "sv_cheats" );  // Is the impulse 101 command allowed?
+}
+
+void CWorld :: Precache( void )
+{
+#if 1
+	CVAR_SET_STRING("sv_gravity", "800"); // 67ft/sec
+	CVAR_SET_STRING("sv_stepsize", "18");
+#else
+	CVAR_SET_STRING("sv_gravity", "384"); // 32ft/sec
+	CVAR_SET_STRING("sv_stepsize", "24");
+#endif
+
+	CVAR_SET_STRING("room_type", "0");// clear DSP
+
+	// Set up game rules
+	if (g_pGameRules)
+	{
+		delete g_pGameRules;
+
+		// This is needed because pmove is used by AvHSUGetIsEnoughRoomForHull, and if it isn't set to null, pmove->physents[0].worldmodel is the old map on a changelevel, and invalid
+		pmove = NULL;
+	}
+
+	InstallGameRules( );
+	GetGameRules()->PreWorldPrecacheReset();
+	
+	//AvHGamerules* theGameRules = dynamic_cast<AvHGamerules*>(g_pGameRules);
+	
+	//static const char* sCurrentLevelName = NULL;
+	//const char* theLevelName = STRING(gpGlobals->mapname);
+	//bool theNewMap = false;
+	//if(!sCurrentLevelName || strcmp(theLevelName, sCurrentLevelName))
+	//{
+	//	theNewMap = true;
+	//}
+
+	// Reset game, but don't send need to send particles if same map (remove this distinction?)
+	//theGameRules->ResetGame(theNewMap);
+	//sCurrentLevelName = theLevelName;
+//	static bool theFirstTime = true;
+//	if(!theFirstTime)
+//	{
+//		theGameRules->ResetGame(true);
+//	}
+//	theFirstTime = false;
+	
+	//!!!UNDONE why is there so much Spawn code in the Precache function? I'll just keep it here 
+
+	///!!!LATER - do we want a sound ent in deathmatch? (sjb)
+	//pSoundEnt = CBaseEntity::Create( "soundent", g_vecZero, g_vecZero, edict() );
+	pSoundEnt = GetClassPtr( ( CSoundEnt *)NULL );
+	pSoundEnt->Spawn();
+
+	if ( !pSoundEnt )
+	{
+		ALERT ( at_console, "**COULD NOT CREATE SOUNDENT**\n" );
+	}
+
+	InitBodyQue();
+	
+// init sentence group playback stuff from sentences.txt.
+// ok to call this multiple times, calls after first are ignored.
+
+	SENTENCEG_Init();
+
+// init texture type array from materials.txt
+
+	TEXTURETYPE_Init();
+
+
+// the area based ambient sounds MUST be the first precache_sounds
+
+// player precaches     
+	W_Precache ();									// get weapon precaches
+
+	ClientPrecache();
+
+// sounds used from C physics code
+	PRECACHE_SOUND("common/null.wav");				// clears sound channels
+
+	PRECACHE_SOUND( "items/suitchargeok1.wav" );//!!! temporary sound for respawning weapons.
+	PRECACHE_UNMODIFIED_SOUND( "items/gunpickup2.wav" );	// player picks up a gun.
+	PRECACHE_UNMODIFIED_SOUND( "items/gunpickup2-a.wav" );	// alien is equipped
+
+	PRECACHE_SOUND( "common/bodydrop3.wav" );// dead bodies hitting the ground (animation events)
+	PRECACHE_SOUND( "common/bodydrop4.wav" );
+	
+	g_Language = (int)CVAR_GET_FLOAT( "sv_language" );
+	if ( g_Language == LANGUAGE_GERMAN )
+	{
+		PRECACHE_UNMODIFIED_MODEL( "models/germangibs.mdl" );
+	}
+	else
+	{
+		PRECACHE_UNMODIFIED_MODEL( "models/hgibs.mdl" );
+		PRECACHE_UNMODIFIED_MODEL( "models/agibs.mdl" );
+	}
+
+	PRECACHE_UNMODIFIED_SOUND ("weapons/ric1.wav");
+	PRECACHE_UNMODIFIED_SOUND ("weapons/ric2.wav");
+	PRECACHE_UNMODIFIED_SOUND ("weapons/ric3.wav");
+	PRECACHE_UNMODIFIED_SOUND ("weapons/ric4.wav");
+	PRECACHE_UNMODIFIED_SOUND ("weapons/ric5.wav");
+
+	PRECACHE_UNMODIFIED_SOUND ("weapons/ric_conc-1.wav");
+	PRECACHE_UNMODIFIED_SOUND ("weapons/ric_conc-2.wav");
+
+	PRECACHE_UNMODIFIED_SOUND ("weapons/ric_metal-1.wav");
+	PRECACHE_UNMODIFIED_SOUND ("weapons/ric_metal-2.wav");
+
+	// Precache alien ricochet sounds
+	PRECACHE_UNMODIFIED_SOUND ("weapons/a_ric1.wav");
+	PRECACHE_UNMODIFIED_SOUND ("weapons/a_ric2.wav");
+	PRECACHE_UNMODIFIED_SOUND ("weapons/a_ric3.wav");
+//
+// Setup light animation tables. 'a' is total darkness, 'z' is maxbright.
+//
+
+	// 0 normal
+	LIGHT_STYLE(0, "m");
+	
+	// 1 FLICKER (first variety)
+	LIGHT_STYLE(1, "mmnmmommommnonmmonqnmmo");
+	
+	// 2 SLOW STRONG PULSE
+	LIGHT_STYLE(2, "abcdefghijklmnopqrstuvwxyzyxwvutsrqponmlkjihgfedcba");
+	
+	// 3 CANDLE (first variety)
+	LIGHT_STYLE(3, "mmmmmaaaaammmmmaaaaaabcdefgabcdefg");
+	
+	// 4 FAST STROBE
+	LIGHT_STYLE(4, "mamamamamama");
+	
+	// 5 GENTLE PULSE 1
+	LIGHT_STYLE(5,"jklmnopqrstuvwxyzyxwvutsrqponmlkj");
+	
+	// 6 FLICKER (second variety)
+	LIGHT_STYLE(6, "nmonqnmomnmomomno");
+	
+	// 7 CANDLE (second variety)
+	LIGHT_STYLE(7, "mmmaaaabcdefgmmmmaaaammmaamm");
+	
+	// 8 CANDLE (third variety)
+	LIGHT_STYLE(8, "mmmaaammmaaammmabcdefaaaammmmabcdefmmmaaaa");
+	
+	// 9 SLOW STROBE (fourth variety)
+	LIGHT_STYLE(9, "aaaaaaaazzzzzzzz");
+	
+	// 10 FLUORESCENT FLICKER
+	LIGHT_STYLE(10, "mmamammmmammamamaaamammma");
+
+	// 11 SLOW PULSE NOT FADE TO BLACK
+	LIGHT_STYLE(11, "abcdefghijklmnopqrrqponmlkjihgfedcba");
+	
+	// 12 UNDERWATER LIGHT MUTATION
+	// this light only distorts the lightmap - no contribution
+	// is made to the brightness of affected surfaces
+	LIGHT_STYLE(12, "mmnnmmnnnmmnn");
+	
+	// styles 32-62 are assigned by the light program for switchable lights
+
+	// 63 testing
+	LIGHT_STYLE(63, "a");
+
+	for ( int i = 0; i < ARRAYSIZE(gDecals); i++ )
+		gDecals[i].index = DECAL_INDEX( gDecals[i].name );
+
+// init the WorldGraph.
+	WorldGraph.InitGraph();
+
+// make sure the .NOD file is newer than the .BSP file.
+	if ( !WorldGraph.CheckNODFile ( ( char * )STRING( gpGlobals->mapname ) ) )
+	{// NOD file is not present, or is older than the BSP file.
+		WorldGraph.AllocNodes ();
+	}
+	else
+	{// Load the node graph for this level
+		if ( !WorldGraph.FLoadGraph ( (char *)STRING( gpGlobals->mapname ) ) )
+		{// couldn't load, so alloc and prepare to build a graph.
+			ALERT ( at_console, "*Error opening .NOD file\n" );
+			WorldGraph.AllocNodes ();
+		}
+		else
+		{
+			ALERT ( at_console, "\n*Graph Loaded!\n" );
+		}
+	}
+
+	if ( pev->speed > 0 )
+		CVAR_SET_FLOAT( "sv_zmax", pev->speed );
+	else
+		CVAR_SET_FLOAT( "sv_zmax", 4096 );
+
+	if ( pev->netname )
+	{
+		ALERT( at_aiconsole, "Chapter title: %s\n", STRING(pev->netname) );
+		CBaseEntity *pEntity = CBaseEntity::Create( "env_message", g_vecZero, g_vecZero, NULL );
+		if ( pEntity )
+		{
+			pEntity->SetThink( &CBaseEntity::SUB_CallUseToggle );
+			pEntity->pev->message = pev->netname;
+			pev->netname = 0;
+			pEntity->pev->nextthink = gpGlobals->time + 0.3;
+			pEntity->pev->spawnflags = SF_MESSAGE_ONCE;
+		}
+	}
+
+	if ( pev->spawnflags & SF_WORLD_DARK )
+		CVAR_SET_FLOAT( "v_dark", 1.0 );
+	else
+		CVAR_SET_FLOAT( "v_dark", 0.0 );
+
+	if ( pev->spawnflags & SF_WORLD_TITLE )
+		gDisplayTitle = TRUE;		// display the game title if this key is set
+	else
+		gDisplayTitle = FALSE;
+
+	if ( pev->spawnflags & SF_WORLD_FORCETEAM )
+	{
+		CVAR_SET_FLOAT( "mp_defaultteam", 1 );
+	}
+	else
+	{
+		CVAR_SET_FLOAT( "mp_defaultteam", 0 );
+	}
+}
+
+
+//
+// Just to ignore the "wad" field.
+//
+void CWorld :: KeyValue( KeyValueData *pkvd )
+{
+	if ( FStrEq(pkvd->szKeyName, "skyname") )
+	{
+		// Sent over net now.
+		CVAR_SET_STRING( "sv_skyname", pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if ( FStrEq(pkvd->szKeyName, "sounds") )
+	{
+		gpGlobals->cdAudioTrack = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if ( FStrEq(pkvd->szKeyName, "WaveHeight") )
+	{
+		// Sent over net now.
+		pev->scale = atof(pkvd->szValue) * (1.0/8.0);
+		pkvd->fHandled = TRUE;
+		CVAR_SET_FLOAT( "sv_wateramp", pev->scale );
+	}
+	else if ( FStrEq(pkvd->szKeyName, "MaxRange") )
+	{
+		pev->speed = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if ( FStrEq(pkvd->szKeyName, "chaptertitle") )
+	{
+		pev->netname = ALLOC_STRING(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if ( FStrEq(pkvd->szKeyName, "startdark") )
+	{
+		// UNDONE: This is a gross hack!!! The CVAR is NOT sent over the client/sever link
+		// but it will work for single player
+		int flag = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+		if ( flag )
+			pev->spawnflags |= SF_WORLD_DARK;
+	}
+	else if ( FStrEq(pkvd->szKeyName, "newunit") )
+	{
+		// Single player only.  Clear save directory if set
+		if ( atoi(pkvd->szValue) )
+			CVAR_SET_FLOAT( "sv_newunit", 1 );
+		pkvd->fHandled = TRUE;
+	}
+	else if ( FStrEq(pkvd->szKeyName, "gametitle") )
+	{
+		if ( atoi(pkvd->szValue) )
+			pev->spawnflags |= SF_WORLD_TITLE;
+
+		pkvd->fHandled = TRUE;
+	}
+	else if ( FStrEq(pkvd->szKeyName, "mapteams") )
+	{
+		pev->team = ALLOC_STRING( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
+	else if ( FStrEq(pkvd->szKeyName, "defaultteam") )
+	{
+		if ( atoi(pkvd->szValue) )
+		{
+			pev->spawnflags |= SF_WORLD_FORCETEAM;
+		}
+		pkvd->fHandled = TRUE;
+	}
+	else
+		CBaseEntity::KeyValue( pkvd );
+}
diff --git a/main/source/dlls/wpn_shared/hl_wpn_glock.cpp b/main/source/dlls/wpn_shared/hl_wpn_glock.cpp
new file mode 100644
index 00000000..b04ec276
--- /dev/null
+++ b/main/source/dlls/wpn_shared/hl_wpn_glock.cpp
@@ -0,0 +1,318 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "player.h"
+
+enum glock_e {
+	GLOCK_IDLE1 = 0,
+	GLOCK_IDLE2,
+	GLOCK_IDLE3,
+	GLOCK_SHOOT,
+	GLOCK_SHOOT_EMPTY,
+	GLOCK_RELOAD,
+	GLOCK_RELOAD_NOT_EMPTY,
+	GLOCK_DRAW,
+	GLOCK_HOLSTER,
+	GLOCK_ADD_SILENCER
+};
+
+LINK_ENTITY_TO_CLASS( weapon_glock, CGlock );
+LINK_ENTITY_TO_CLASS( weapon_9mmhandgun, CGlock );
+
+char sDebugString[128];
+
+void CGlock::Spawn( )
+{
+	pev->classname = MAKE_STRING("weapon_9mmhandgun"); // hack to allow for old names
+	Precache( );
+	m_iId = WEAPON_GLOCK;
+	SET_MODEL(ENT(pev), "models/w_9mmhandgun.mdl");
+
+	m_iDefaultAmmo = GLOCK_DEFAULT_GIVE;
+
+	FallInit();// get ready to fall down.
+}
+
+
+void CGlock::Precache( void )
+{
+	PRECACHE_MODEL("models/v_9mmhandgun.mdl");
+	PRECACHE_MODEL("models/w_9mmhandgun.mdl");
+	PRECACHE_MODEL("models/p_9mmhandgun.mdl");
+
+	m_iShell = PRECACHE_MODEL ("models/shell.mdl");// brass shell
+
+	PRECACHE_SOUND("items/9mmclip1.wav");
+	PRECACHE_SOUND("items/9mmclip2.wav");
+
+	PRECACHE_SOUND ("weapons/pl_gun1.wav");//silenced handgun
+	PRECACHE_SOUND ("weapons/pl_gun2.wav");//silenced handgun
+	PRECACHE_SOUND ("weapons/pl_gun3.wav");//handgun
+
+	m_usFireGlock1 = PRECACHE_EVENT( 1, "events/glock1.sc" );
+	m_usFireGlock2 = PRECACHE_EVENT( 1, "events/glock2.sc" );
+}
+
+int CGlock::GetItemInfo(ItemInfo *p)
+{
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = "9mm";
+	p->iMaxAmmo1 = _9MM_MAX_CARRY;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = -1;
+	p->iMaxClip = GLOCK_MAX_CLIP;
+	p->iSlot = 1;
+	p->iPosition = 0;
+	p->iFlags = 0;
+	p->iId = m_iId = WEAPON_GLOCK;
+	p->iWeight = GLOCK_WEIGHT;
+
+	return 1;
+}
+
+BOOL CGlock::Deploy( )
+{
+	// pev->body = 1;
+	return DefaultDeploy( "models/v_9mmhandgun.mdl", "models/p_9mmhandgun.mdl", GLOCK_DRAW, "onehanded", /*UseDecrement() ? 1 : 0*/ 0 );
+}
+
+void CGlock::SecondaryAttack( void )
+{
+	GlockFire( 0.1, 0.2, FALSE );
+}
+
+void CGlock::PrimaryAttack( void )
+{
+#ifdef AVH_CLIENT
+	static float sTimeOfLastShot = 0;
+	float theTimeOfThisShot = gpGlobals->time;
+	float theTimeBetweenShots = theTimeOfThisShot - sTimeOfLastShot;
+	sTimeOfLastShot = theTimeOfThisShot;
+	
+	sprintf(sDebugString, "time between this and last shot: %f", theTimeBetweenShots);
+	//CenterPrint(theString);
+#endif
+
+	//GlockFire( 0.01, 0.3, TRUE );
+	GlockFire( 0.01, 0.2, TRUE );
+}
+
+void CGlock::GlockFire( float flSpread , float flCycleTime, BOOL fUseAutoAim )
+{
+	if (m_iClip <= 0)
+	{
+		if (m_fFireOnEmpty)
+		{
+			PlayEmptySound();
+			//m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.2;
+			m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + flCycleTime;
+		}
+
+		return;
+	}
+
+	m_iClip--;
+
+	m_pPlayer->pev->effects = (int)(m_pPlayer->pev->effects) | EF_MUZZLEFLASH;
+
+#if defined ( OLD_WEAPONS )
+	if (m_iClip != 0)
+		SendWeaponAnim( GLOCK_SHOOT );
+	else
+		SendWeaponAnim( GLOCK_SHOOT_EMPTY );
+#endif
+
+	int flags;
+
+#if defined( CLIENT_WEAPONS )
+	flags = FEV_NOTHOST;
+#else
+	flags = 0;
+#endif
+
+	PLAYBACK_EVENT_FULL( flags, m_pPlayer->edict(), fUseAutoAim ? m_usFireGlock1 : m_usFireGlock2, 0.0, (float *)&g_vecZero, (float *)&g_vecZero, 0.0, 0.0, 0, 0, ( m_iClip == 0 ) ? 1 : 0, 0 );
+
+	// player "shoot" animation
+	m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
+
+#if defined ( OLD_WEAPONS )
+	UTIL_MakeVectors( m_pPlayer->pev->v_angle + m_pPlayer->pev->punchangle );
+		
+	Vector	vecShellVelocity = m_pPlayer->pev->velocity 
+							 + gpGlobals->v_right * RANDOM_FLOAT(50,70) 
+							 + gpGlobals->v_up * RANDOM_FLOAT(100,150) 
+							 + gpGlobals->v_forward * 25;
+	EjectBrass ( pev->origin + m_pPlayer->pev->view_ofs + gpGlobals->v_up * -12 + gpGlobals->v_forward * 32 + gpGlobals->v_right * 6 , vecShellVelocity, pev->angles.y, m_iShell, TE_BOUNCE_SHELL ); 
+#endif
+
+	// silenced
+	if (pev->body == 1)
+	{
+		m_pPlayer->m_iWeaponVolume = QUIET_GUN_VOLUME;
+		m_pPlayer->m_iWeaponFlash = DIM_GUN_FLASH;
+#if defined ( OLD_WEAPONS )
+		switch(RANDOM_LONG(0,1))
+		{
+		case 0:
+			EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/pl_gun1.wav", RANDOM_FLOAT(0.9, 1.0), ATTN_NORM);
+			break;
+		case 1:
+			EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/pl_gun2.wav", RANDOM_FLOAT(0.9, 1.0), ATTN_NORM);
+			break;
+		}
+#endif
+	}
+	else
+	{
+		// non-silenced
+		m_pPlayer->m_iWeaponVolume = NORMAL_GUN_VOLUME;
+		m_pPlayer->m_iWeaponFlash = NORMAL_GUN_FLASH;
+#if defined ( OLD_WEAPONS )
+		EMIT_SOUND_DYN(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/pl_gun3.wav", RANDOM_FLOAT(0.92, 1.0), ATTN_NORM, 0, 98 + RANDOM_LONG(0,3));
+#endif
+	}
+
+	Vector vecSrc	 = m_pPlayer->GetGunPosition( );
+	Vector vecAiming;
+	
+	if ( fUseAutoAim )
+	{
+		vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_10DEGREES );
+	}
+	else
+	{
+		vecAiming = gpGlobals->v_forward;
+	}
+
+	m_pPlayer->FireBullets( 1, vecSrc, vecAiming, Vector( flSpread, flSpread, flSpread ), 8192, BULLET_PLAYER_9MM, 0 );
+
+	m_flNextPrimaryAttack = m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + flCycleTime;
+
+	if (!m_iClip && m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] <= 0)
+		// HEV suit - indicate out of ammo condition
+		m_pPlayer->SetSuitUpdate("!HEV_AMO0", FALSE, 0);
+
+	m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
+
+#if defined ( OLD_WEAPONS )
+	m_pPlayer->pev->punchangle.x -= 2;
+#endif
+}
+
+
+void CGlock::Reload( void )
+{
+	int iResult;
+
+	if (m_iClip == 0)
+		iResult = DefaultReload( 17, GLOCK_RELOAD, 1.5 );
+	else
+		iResult = DefaultReload( 18, GLOCK_RELOAD_NOT_EMPTY, 1.5 );
+
+	if (iResult)
+	{
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
+	}
+}
+
+
+
+void CGlock::WeaponIdle( void )
+{
+	ResetEmptySound( );
+
+	m_pPlayer->GetAutoaimVector( AUTOAIM_10DEGREES );
+
+	if ( m_flTimeWeaponIdle > UTIL_WeaponTimeBase() )
+		return;
+
+	// only idle if the slid isn't back
+	if (m_iClip != 0)
+	{
+		int iAnim;
+		float flRand = UTIL_SharedRandomFloat( m_pPlayer->random_seed, 0.0, 1.0 );
+
+		if (flRand <= 0.3 + 0 * 0.75)
+		{
+			iAnim = GLOCK_IDLE3;
+			m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 49.0 / 16;
+		}
+		else if (flRand <= 0.6 + 0 * 0.875)
+		{
+			iAnim = GLOCK_IDLE1;
+			m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 60.0 / 16.0;
+		}
+		else
+		{
+			iAnim = GLOCK_IDLE2;
+			m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 40.0 / 16.0;
+		}
+		SendWeaponAnim( iAnim, 1 );
+	}
+}
+
+
+
+
+
+
+
+
+class CGlockAmmo : public CBasePlayerAmmo
+{
+	void Spawn( void )
+	{ 
+		Precache( );
+		SET_MODEL(ENT(pev), "models/w_9mmclip.mdl");
+		CBasePlayerAmmo::Spawn( );
+	}
+	void Precache( void )
+	{
+		PRECACHE_MODEL ("models/w_9mmclip.mdl");
+		PRECACHE_SOUND("items/9mmclip1.wav");
+	}
+	BOOL AddAmmo( CBaseEntity *pOther ) 
+	{ 
+		if (pOther->GiveAmmo( AMMO_GLOCKCLIP_GIVE, "9mm", _9MM_MAX_CARRY ) != -1)
+		{
+			EMIT_SOUND(ENT(pev), CHAN_ITEM, "items/9mmclip1.wav", 1, ATTN_NORM);
+			return TRUE;
+		}
+		return FALSE;
+	}
+};
+LINK_ENTITY_TO_CLASS( ammo_glockclip, CGlockAmmo );
+LINK_ENTITY_TO_CLASS( ammo_9mmclip, CGlockAmmo );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/main/source/dlls/wxdebug.h b/main/source/dlls/wxdebug.h
new file mode 100644
index 00000000..321b1bcd
--- /dev/null
+++ b/main/source/dlls/wxdebug.h
@@ -0,0 +1,137 @@
+#ifndef __WXDEBUG__
+#define __WXDEBUG__
+
+// This library provides fairly straight forward debugging functionality, this
+// is split into two main sections. The first is assertion handling, there are
+// three types of assertions provided here. The most commonly used one is the
+// ASSERT(condition) macro which will pop up a message box including the file
+// and line number if the condition evaluates to FALSE. Then there is the
+// EXECUTE_ASSERT macro which is the same as ASSERT except the condition will
+// still be executed in NON debug builds. The final type of assertion is the
+// KASSERT macro which is more suitable for pure (perhaps kernel) filters as
+// the condition is printed onto the debugger rather than in a message box.
+//
+// The other part of the debug module facilties is general purpose logging.
+// This is accessed by calling DbgLog(). The function takes a type and level
+// field which define the type of informational string you are presenting and
+// it's relative importance. The type field can be a combination (one or more)
+// of LOG_TIMING, LOG_TRACE, LOG_MEMORY, LOG_LOCKING and LOG_ERROR. The level
+// is a DWORD value where zero defines highest important. Use of zero as the
+// debug logging level is to be encouraged ONLY for major errors or events as
+// they will ALWAYS be displayed on the debugger. Other debug output has it's
+// level matched against the current debug output level stored in the registry
+// for this module and if less than the current setting it will be displayed.
+//
+// Each module or executable has it's own debug output level for each of the
+// five types. These are read in when the DbgInitialise function is called
+// for DLLs linking to STRMBASE.LIB this is done automatically when the DLL
+// is loaded, executables must call it explicitely with the module instance
+// handle given to them through the WINMAIN entry point. An executable must
+// also call DbgTerminate when they have finished to clean up the resources
+// the debug library uses, once again this is done automatically for DLLs
+
+// These are the five different categories of logging information
+
+#ifdef _DEBUG
+
+
+enum
+{
+	LOG_TRACE		= 0x00000001,	// General tracing
+    LOG_ENTRY		= 0x00000002,	// Function entry logging
+    LOG_EXIT		= 0x00000004,	// Function exit logging
+    LOG_MEMORY		= 0x00000008,	// Memory alloc/free debugging
+    LOG_ERROR		= 0x00000010,	// Error notification
+	LOG_UNUSED0		= 0x00000020,	// reserved
+	LOG_UNUSED1		= 0x00000040,	// reserved
+	LOG_UNUSED2		= 0x00000080,	// reserved
+	LOG_CHUM		= 0x00000100,	// Chumtoad debugging
+	LOG_LEECH		= 0x00000200,	// Leech debugging
+	LOG_ICHTHYOSAUR = 0x00000400,   // Ichthyosaur debugging
+};
+
+
+// These are public but should be called only by the DLLMain function
+void WINAPI DbgInitialise(HINSTANCE hInst);
+void WINAPI DbgTerminate();
+// These are public but should be called by macro only
+void WINAPI DbgKernelAssert(const TCHAR *pCondition,const TCHAR *pFileName,INT iLine);
+void WINAPI DbgLogInfo(DWORD Type,DWORD Level,const TCHAR *pFormat,...);
+void WINAPI DbgOutString(LPCTSTR psz);
+
+
+// These are the macros that should be used in code.
+
+#define DBGASSERT(_x_) \
+    if (!(_x_)) \
+        DbgKernelAssert(TEXT(#_x_),TEXT(__FILE__),__LINE__)
+
+#define DBGBREAK(_x_)                   \
+    DbgKernelAssert(TEXT(#_x_),TEXT(__FILE__),__LINE__)
+
+#define DBGASSERTEXECUTE(_x_) DBGASSERT(_x_)
+
+#define DBGLOG(_x_) DbgLogInfo _x_
+
+#define DBGOUT(_x_) DbgOutString(_x_)
+
+#define ValidateReadPtr(p,cb) \
+    {if(IsBadReadPtr((PVOID)p,cb) == TRUE) \
+        DBGBREAK("Invalid read pointer");}
+
+#define ValidateWritePtr(p,cb) \
+    {if(IsBadWritePtr((PVOID)p,cb) == TRUE) \
+        DBGBREAK("Invalid write pointer");}
+
+#define ValidateReadWritePtr(p,cb) \
+    {ValidateReadPtr(p,cb) ValidateWritePtr(p,cb)}
+
+#define ValidateStringPtr(p) \
+    {if(IsBadStringPtr((LPCTSTR)p,INFINITE) == TRUE) \
+        DBGBREAK("Invalid string pointer");}
+
+#define ValidateStringPtrA(p) \
+    {if(IsBadStringPtrA((LPCSTR)p,INFINITE) == TRUE) \
+        DBGBREAK("Invalid ANSII string pointer");}
+
+#define ValidateStringPtrW(p) \
+    {if(IsBadStringPtrW((LPCWSTR)p,INFINITE) == TRUE) \
+        DBGBREAK("Invalid UNICODE string pointer");}
+
+#else // !_DEBUG
+
+// Retail builds make public debug functions inert  - WARNING the source
+// files do not define or build any of the entry points in debug builds
+// (public entry points compile to nothing) so if you go trying to call
+// any of the private entry points in your source they won't compile
+
+#define DBGASSERT(_x_)
+#define DBGBREAK(_x_)
+#define DBGASSERTEXECUTE(_x_) _x_
+#define DBGLOG(_x_)
+#define DBGOUT(_x_)
+#define ValidateReadPtr(p,cb)
+#define ValidateWritePtr(p,cb)
+#define ValidateReadWritePtr(p,cb)
+#define ValidateStringPtr(p)
+#define ValidateStringPtrA(p)
+#define ValidateStringPtrW(p)
+
+#endif  // !_DEBUG
+
+
+#ifndef REMIND
+    //  REMIND macro - generates warning as reminder to complete coding
+    //  (eg) usage:
+    //
+    //  #pragma message (REMIND("Add automation support"))
+
+
+    #define REMINDQUOTE(x) #x
+    #define REMINDQQUOTE(y) REMINDQUOTE(y)
+    #define REMIND(str) __FILE__ "(" REMINDQQUOTE(__LINE__) ") :  " str
+#endif
+
+#endif // __WXDEBUG__
+
+
diff --git a/main/source/dlls/xen.cpp b/main/source/dlls/xen.cpp
new file mode 100644
index 00000000..606b6489
--- /dev/null
+++ b/main/source/dlls/xen.cpp
@@ -0,0 +1,584 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "animation.h"
+#include "effects.h"
+
+
+#define XEN_PLANT_GLOW_SPRITE		"sprites/flare3.spr"
+#define XEN_PLANT_HIDE_TIME			5
+
+
+class CActAnimating : public CBaseAnimating
+{
+public:
+	void			SetActivity( Activity act );
+	inline Activity	GetActivity( void ) { return m_Activity; }
+
+	virtual int	ObjectCaps( void ) { return CBaseAnimating :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
+
+	virtual int	Save( CSave &save );
+	virtual int	Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+private:
+	Activity	m_Activity;
+};
+
+TYPEDESCRIPTION	CActAnimating::m_SaveData[] = 
+{
+	DEFINE_FIELD( CActAnimating, m_Activity, FIELD_INTEGER ),
+};
+
+IMPLEMENT_SAVERESTORE( CActAnimating, CBaseAnimating );
+
+void CActAnimating :: SetActivity( Activity act ) 
+{ 
+	int sequence = LookupActivity( act ); 
+	if ( sequence != ACTIVITY_NOT_AVAILABLE )
+	{
+		pev->sequence = sequence;
+		m_Activity = act; 
+		pev->frame = 0;
+		ResetSequenceInfo( );
+	}
+}
+
+
+
+
+class CXenPLight : public CActAnimating
+{
+public:
+	void		Spawn( void );
+	void		Precache( void );
+	void		Touch( CBaseEntity *pOther );
+	void		Think( void );
+
+	void		LightOn( void );
+	void		LightOff( void );
+
+	virtual int	Save( CSave &save );
+	virtual int	Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+private:
+	CSprite		*m_pGlow;
+};
+
+LINK_ENTITY_TO_CLASS( xen_plantlight, CXenPLight );
+
+TYPEDESCRIPTION	CXenPLight::m_SaveData[] = 
+{
+	DEFINE_FIELD( CXenPLight, m_pGlow, FIELD_CLASSPTR ),
+};
+
+IMPLEMENT_SAVERESTORE( CXenPLight, CActAnimating );
+
+void CXenPLight :: Spawn( void )
+{
+	Precache();
+
+	SET_MODEL( ENT(pev), "models/light.mdl" );
+	pev->movetype	= MOVETYPE_NONE;
+	pev->solid		= SOLID_TRIGGER;
+
+	UTIL_SetSize( pev, Vector(-80,-80,0), Vector(80,80,32));
+	SetActivity( ACT_IDLE );
+	pev->nextthink = gpGlobals->time + 0.1;
+	pev->frame = RANDOM_FLOAT(0,255);
+
+	m_pGlow = CSprite::SpriteCreate( XEN_PLANT_GLOW_SPRITE, pev->origin + Vector((float)0, (float)0, (float)((pev->mins.z+pev->maxs.z)*0.5)), FALSE );
+	m_pGlow->SetTransparency( kRenderGlow, pev->rendercolor.x, pev->rendercolor.y, pev->rendercolor.z, pev->renderamt, pev->renderfx );
+	m_pGlow->SetAttachment( edict(), 1 );
+}
+
+
+void CXenPLight :: Precache( void )
+{
+	PRECACHE_MODEL( "models/light.mdl" );
+	PRECACHE_MODEL( XEN_PLANT_GLOW_SPRITE );
+}
+
+
+void CXenPLight :: Think( void )
+{
+	StudioFrameAdvance();
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	switch( GetActivity() )
+	{
+	case ACT_CROUCH:
+		if ( m_fSequenceFinished )
+		{
+			SetActivity( ACT_CROUCHIDLE );
+			LightOff();
+		}
+		break;
+
+	case ACT_CROUCHIDLE:
+		if ( gpGlobals->time > pev->dmgtime )
+		{
+			SetActivity( ACT_STAND );
+			LightOn();
+		}
+		break;
+
+	case ACT_STAND:
+		if ( m_fSequenceFinished )
+			SetActivity( ACT_IDLE );
+		break;
+
+	case ACT_IDLE:
+	default:
+		break;
+	}
+}
+
+
+void CXenPLight :: Touch( CBaseEntity *pOther )
+{
+	if ( pOther->IsPlayer() )
+	{
+		pev->dmgtime = gpGlobals->time + XEN_PLANT_HIDE_TIME;
+		if ( GetActivity() == ACT_IDLE || GetActivity() == ACT_STAND )
+		{
+			SetActivity( ACT_CROUCH );
+		}
+	}
+}
+
+
+void CXenPLight :: LightOn( void )
+{
+	SUB_UseTargets( this, USE_ON, 0 );
+	if ( m_pGlow )
+		m_pGlow->pev->effects &= ~EF_NODRAW;
+}
+
+
+void CXenPLight :: LightOff( void )
+{
+	SUB_UseTargets( this, USE_OFF, 0 );
+	if ( m_pGlow )
+		m_pGlow->pev->effects |= EF_NODRAW;
+}
+
+
+
+class CXenHair : public CActAnimating
+{
+public:
+	void		Spawn( void );
+	void		Precache( void );
+	void		Think( void );
+};
+
+LINK_ENTITY_TO_CLASS( xen_hair, CXenHair );
+
+#define SF_HAIR_SYNC		0x0001
+
+void CXenHair::Spawn( void )
+{
+	Precache();
+	SET_MODEL( edict(), "models/hair.mdl" );
+	UTIL_SetSize( pev, Vector(-4,-4,0), Vector(4,4,32));
+	pev->sequence = 0;
+	
+	if ( !(pev->spawnflags & SF_HAIR_SYNC) )
+	{
+		pev->frame = RANDOM_FLOAT(0,255);
+		pev->framerate = RANDOM_FLOAT( 0.7, 1.4 );
+	}
+	ResetSequenceInfo( );
+
+	pev->solid = SOLID_NOT;
+	pev->movetype = MOVETYPE_NONE;
+	pev->nextthink = gpGlobals->time + RANDOM_FLOAT( 0.1, 0.4 );	// Load balance these a bit
+}
+
+
+void CXenHair::Think( void )
+{
+	StudioFrameAdvance();
+	pev->nextthink = gpGlobals->time + 0.5;
+}
+
+
+void CXenHair::Precache( void )
+{
+	PRECACHE_MODEL( "models/hair.mdl" );
+}
+
+
+class CXenTreeTrigger : public CBaseEntity
+{
+public:
+	void		Touch( CBaseEntity *pOther );
+	static CXenTreeTrigger *TriggerCreate( edict_t *pOwner, const Vector &position );
+};
+LINK_ENTITY_TO_CLASS( xen_ttrigger, CXenTreeTrigger );
+
+CXenTreeTrigger *CXenTreeTrigger :: TriggerCreate( edict_t *pOwner, const Vector &position )
+{
+	CXenTreeTrigger *pTrigger = GetClassPtr( (CXenTreeTrigger *)NULL );
+	pTrigger->pev->origin = position;
+	pTrigger->pev->classname = MAKE_STRING("xen_ttrigger");
+	pTrigger->pev->solid = SOLID_TRIGGER;
+	pTrigger->pev->movetype = MOVETYPE_NONE;
+	pTrigger->pev->owner = pOwner;
+
+	return pTrigger;
+}
+
+
+void CXenTreeTrigger::Touch( CBaseEntity *pOther )
+{
+	if ( pev->owner )
+	{
+		CBaseEntity *pEntity = CBaseEntity::Instance(pev->owner);
+		pEntity->Touch( pOther );
+	}
+}
+
+
+#define TREE_AE_ATTACK		1
+
+class CXenTree : public CActAnimating
+{
+public:
+	void		Spawn( void );
+	void		Precache( void );
+	void		Touch( CBaseEntity *pOther );
+	void		Think( void );
+	int			TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType ) { Attack(); return 0; }
+	void		HandleAnimEvent( MonsterEvent_t *pEvent );
+	void		Attack( void );	
+	int			Classify( void ) { return CLASS_BARNACLE; }
+
+	virtual int	Save( CSave &save );
+	virtual int	Restore( CRestore &restore );
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	static const char *pAttackHitSounds[];
+	static const char *pAttackMissSounds[];
+
+private:
+	CXenTreeTrigger	*m_pTrigger;
+};
+
+LINK_ENTITY_TO_CLASS( xen_tree, CXenTree );
+
+TYPEDESCRIPTION	CXenTree::m_SaveData[] = 
+{
+	DEFINE_FIELD( CXenTree, m_pTrigger, FIELD_CLASSPTR ),
+};
+
+IMPLEMENT_SAVERESTORE( CXenTree, CActAnimating );
+
+void CXenTree :: Spawn( void )
+{
+	Precache();
+
+	SET_MODEL( ENT(pev), "models/tree.mdl" );
+	pev->movetype	= MOVETYPE_NONE;
+	pev->solid		= SOLID_BBOX;
+
+	pev->takedamage = DAMAGE_YES;
+
+	UTIL_SetSize( pev, Vector(-30,-30,0), Vector(30,30,188));
+	SetActivity( ACT_IDLE );
+	pev->nextthink = gpGlobals->time + 0.1;
+	pev->frame = RANDOM_FLOAT(0,255);
+	pev->framerate = RANDOM_FLOAT( 0.7, 1.4 );
+
+	Vector triggerPosition;
+	UTIL_MakeVectorsPrivate( pev->angles, triggerPosition, NULL, NULL );
+	triggerPosition = pev->origin + (triggerPosition * 64);
+	// Create the trigger
+	m_pTrigger = CXenTreeTrigger::TriggerCreate( edict(), triggerPosition );
+	UTIL_SetSize( m_pTrigger->pev, Vector( -24, -24, 0 ), Vector( 24, 24, 128 ) );
+}
+
+const char *CXenTree::pAttackHitSounds[] = 
+{
+	"zombie/claw_strike1.wav",
+	"zombie/claw_strike2.wav",
+	"zombie/claw_strike3.wav",
+};
+
+const char *CXenTree::pAttackMissSounds[] = 
+{
+	"zombie/claw_miss1.wav",
+	"zombie/claw_miss2.wav",
+};
+
+void CXenTree :: Precache( void )
+{
+	PRECACHE_MODEL( "models/tree.mdl" );
+	PRECACHE_MODEL( XEN_PLANT_GLOW_SPRITE );
+	PRECACHE_SOUND_ARRAY( pAttackHitSounds );
+	PRECACHE_SOUND_ARRAY( pAttackMissSounds );
+}
+
+
+void CXenTree :: Touch( CBaseEntity *pOther )
+{
+	if ( !pOther->IsPlayer() && FClassnameIs( pOther->pev, "monster_bigmomma" ) )
+		return;
+
+	Attack();
+}
+
+
+void CXenTree :: Attack( void )
+{
+	if ( GetActivity() == ACT_IDLE )
+	{
+		SetActivity( ACT_MELEE_ATTACK1 );
+		pev->framerate = RANDOM_FLOAT( 1.0, 1.4 );
+		EMIT_SOUND_ARRAY_DYN( CHAN_WEAPON, pAttackMissSounds );
+	}
+}
+
+
+void CXenTree :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	switch( pEvent->event )
+	{
+		case TREE_AE_ATTACK:
+		{
+			CBaseEntity *pList[8];
+			BOOL sound = FALSE;
+			int count = UTIL_EntitiesInBox( pList, 8, m_pTrigger->pev->absmin, m_pTrigger->pev->absmax, FL_MONSTER|FL_CLIENT );
+			Vector forward;
+
+			UTIL_MakeVectorsPrivate( pev->angles, forward, NULL, NULL );
+
+			for ( int i = 0; i < count; i++ )
+			{
+				if ( pList[i] != this )
+				{
+					if ( pList[i]->pev->owner != edict() )
+					{
+						sound = TRUE;
+						pList[i]->TakeDamage( pev, pev, 25, DMG_CRUSH | DMG_SLASH );
+						pList[i]->pev->punchangle.x = 15;
+						pList[i]->pev->velocity = pList[i]->pev->velocity + forward * 100;
+					}
+				}
+			}
+					
+			if ( sound )
+			{
+				EMIT_SOUND_ARRAY_DYN( CHAN_WEAPON, pAttackHitSounds );
+			}
+		}
+		return;
+	}
+
+	CActAnimating::HandleAnimEvent( pEvent );
+}
+
+void CXenTree :: Think( void )
+{
+	float flInterval = StudioFrameAdvance();
+	pev->nextthink = gpGlobals->time + 0.1;
+	DispatchAnimEvents( flInterval );
+
+	switch( GetActivity() )
+	{
+	case ACT_MELEE_ATTACK1:
+		if ( m_fSequenceFinished )
+		{
+			SetActivity( ACT_IDLE );
+			pev->framerate = RANDOM_FLOAT( 0.6, 1.4 );
+		}
+		break;
+
+	default:
+	case ACT_IDLE:
+		break;
+
+	}
+}
+
+
+// UNDONE:	These need to smoke somehow when they take damage
+//			Touch behavior?
+//			Cause damage in smoke area
+
+//
+// Spores
+//
+class CXenSpore : public CActAnimating
+{
+public:
+	void		Spawn( void );
+	void		Precache( void );
+	void		Touch( CBaseEntity *pOther );
+	void		Think( void );
+	int			TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType ) { Attack(); return 0; }
+//	void		HandleAnimEvent( MonsterEvent_t *pEvent );
+	void		Attack( void ) {}
+
+	static const char *pModelNames[];
+};
+
+class CXenSporeSmall : public CXenSpore
+{
+	void		Spawn( void );
+};
+
+class CXenSporeMed : public CXenSpore
+{
+	void		Spawn( void );
+};
+
+class CXenSporeLarge : public CXenSpore
+{
+	void		Spawn( void );
+
+	static const Vector m_hullSizes[];
+};
+
+// Fake collision box for big spores
+class CXenHull : public CPointEntity
+{
+public:
+	static CXenHull	*CreateHull( CBaseEntity *source, const Vector &mins, const Vector &maxs, const Vector &offset );
+	int			Classify( void ) { return CLASS_BARNACLE; }
+};
+
+CXenHull *CXenHull :: CreateHull( CBaseEntity *source, const Vector &mins, const Vector &maxs, const Vector &offset )
+{
+	CXenHull *pHull = GetClassPtr( (CXenHull *)NULL );
+
+	UTIL_SetOrigin( pHull->pev, source->pev->origin + offset );
+	SET_MODEL( pHull->edict(), STRING(source->pev->model) );
+	pHull->pev->solid = SOLID_BBOX;
+	pHull->pev->classname = MAKE_STRING("xen_hull");
+	pHull->pev->movetype = MOVETYPE_NONE;
+	pHull->pev->owner = source->edict();
+	UTIL_SetSize( pHull->pev, mins, maxs );
+	pHull->pev->renderamt = 0;
+	pHull->pev->rendermode = kRenderTransTexture;
+	//	pHull->pev->effects = EF_NODRAW;
+
+	return pHull;
+}
+
+
+LINK_ENTITY_TO_CLASS( xen_spore_small, CXenSporeSmall );
+LINK_ENTITY_TO_CLASS( xen_spore_medium, CXenSporeMed );
+LINK_ENTITY_TO_CLASS( xen_spore_large, CXenSporeLarge );
+LINK_ENTITY_TO_CLASS( xen_hull, CXenHull );
+
+void CXenSporeSmall::Spawn( void )
+{
+	pev->skin = 0;
+	CXenSpore::Spawn();
+	UTIL_SetSize( pev, Vector(-16,-16,0), Vector(16,16,64));
+}
+void CXenSporeMed::Spawn( void )
+{
+	pev->skin = 1;
+	CXenSpore::Spawn();
+	UTIL_SetSize( pev, Vector(-40,-40,0), Vector(40,40,120));
+}
+
+
+// I just eyeballed these -- fill in hulls for the legs
+const Vector CXenSporeLarge::m_hullSizes[] = 
+{
+	Vector( 90, -25, 0 ),
+	Vector( 25, 75, 0 ),
+	Vector( -15, -100, 0 ),
+	Vector( -90, -35, 0 ),
+	Vector( -90, 60, 0 ),
+};
+
+void CXenSporeLarge::Spawn( void )
+{
+	pev->skin = 2;
+	CXenSpore::Spawn();
+	UTIL_SetSize( pev, Vector(-48,-48,110), Vector(48,48,240));
+	
+	Vector forward, right;
+
+	UTIL_MakeVectorsPrivate( pev->angles, forward, right, NULL );
+
+	// Rotate the leg hulls into position
+	for ( int i = 0; i < ARRAYSIZE(m_hullSizes); i++ )
+		CXenHull :: CreateHull( this, Vector(-12, -12, 0 ), Vector( 12, 12, 120 ), (m_hullSizes[i].x * forward) + (m_hullSizes[i].y * right) );
+}
+
+void CXenSpore :: Spawn( void )
+{
+	Precache();
+
+	SET_MODEL( ENT(pev), pModelNames[pev->skin] );
+	pev->movetype	= MOVETYPE_NONE;
+	pev->solid		= SOLID_BBOX;
+	pev->takedamage = DAMAGE_YES;
+
+//	SetActivity( ACT_IDLE );
+	pev->sequence = 0;
+	pev->frame = RANDOM_FLOAT(0,255);
+	pev->framerate = RANDOM_FLOAT( 0.7, 1.4 );
+	ResetSequenceInfo( );
+	pev->nextthink = gpGlobals->time + RANDOM_FLOAT( 0.1, 0.4 );	// Load balance these a bit
+}
+
+const char *CXenSpore::pModelNames[] = 
+{
+	"models/fungus(small).mdl",
+	"models/fungus.mdl",
+	"models/fungus(large).mdl",
+};
+
+
+void CXenSpore :: Precache( void )
+{
+	PRECACHE_MODEL( (char *)pModelNames[pev->skin] );
+}
+
+
+void CXenSpore :: Touch( CBaseEntity *pOther )
+{
+}
+
+
+void CXenSpore :: Think( void )
+{
+	float flInterval = StudioFrameAdvance();
+	pev->nextthink = gpGlobals->time + 0.1;
+
+#if 0
+	DispatchAnimEvents( flInterval );
+
+	switch( GetActivity() )
+	{
+	default:
+	case ACT_IDLE:
+		break;
+
+	}
+#endif
+}
+
+
diff --git a/main/source/dlls/zombie.cpp b/main/source/dlls/zombie.cpp
new file mode 100644
index 00000000..127cb261
--- /dev/null
+++ b/main/source/dlls/zombie.cpp
@@ -0,0 +1,346 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   This source code contains proprietary and confidential information of
+*   Valve LLC and its suppliers.  Access to this code is restricted to
+*   persons who have executed a written SDK license with Valve.  Any access,
+*   use or distribution of this code by or to any unlicensed person is illegal.
+*
+****/
+//=========================================================
+// Zombie
+//=========================================================
+
+// UNDONE: Don't flinch every time you get hit
+
+#include	"extdll.h"
+#include	"util.h"
+#include	"cbase.h"
+#include	"monsters.h"
+#include	"schedule.h"
+
+
+//=========================================================
+// Monster's Anim Events Go Here
+//=========================================================
+#define	ZOMBIE_AE_ATTACK_RIGHT		0x01
+#define	ZOMBIE_AE_ATTACK_LEFT		0x02
+#define	ZOMBIE_AE_ATTACK_BOTH		0x03
+
+#define ZOMBIE_FLINCH_DELAY			2		// at most one flinch every n secs
+
+class CZombie : public CBaseMonster
+{
+public:
+	void Spawn( void );
+	void Precache( void );
+	void SetYawSpeed( void );
+	int  Classify ( void );
+	void HandleAnimEvent( MonsterEvent_t *pEvent );
+	int IgnoreConditions ( void );
+
+	float m_flNextFlinch;
+
+	void PainSound( void );
+	void AlertSound( void );
+	void IdleSound( void );
+	void AttackSound( void );
+
+	static const char *pAttackSounds[];
+	static const char *pIdleSounds[];
+	static const char *pAlertSounds[];
+	static const char *pPainSounds[];
+	static const char *pAttackHitSounds[];
+	static const char *pAttackMissSounds[];
+
+	// No range attacks
+	BOOL CheckRangeAttack1 ( float flDot, float flDist ) { return FALSE; }
+	BOOL CheckRangeAttack2 ( float flDot, float flDist ) { return FALSE; }
+	int TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType );
+};
+
+LINK_ENTITY_TO_CLASS( monster_zombie, CZombie );
+
+const char *CZombie::pAttackHitSounds[] = 
+{
+	"zombie/claw_strike1.wav",
+	"zombie/claw_strike2.wav",
+	"zombie/claw_strike3.wav",
+};
+
+const char *CZombie::pAttackMissSounds[] = 
+{
+	"zombie/claw_miss1.wav",
+	"zombie/claw_miss2.wav",
+};
+
+const char *CZombie::pAttackSounds[] = 
+{
+	"zombie/zo_attack1.wav",
+	"zombie/zo_attack2.wav",
+};
+
+const char *CZombie::pIdleSounds[] = 
+{
+	"zombie/zo_idle1.wav",
+	"zombie/zo_idle2.wav",
+	"zombie/zo_idle3.wav",
+	"zombie/zo_idle4.wav",
+};
+
+const char *CZombie::pAlertSounds[] = 
+{
+	"zombie/zo_alert10.wav",
+	"zombie/zo_alert20.wav",
+	"zombie/zo_alert30.wav",
+};
+
+const char *CZombie::pPainSounds[] = 
+{
+	"zombie/zo_pain1.wav",
+	"zombie/zo_pain2.wav",
+};
+
+//=========================================================
+// Classify - indicates this monster's place in the 
+// relationship table.
+//=========================================================
+int	CZombie :: Classify ( void )
+{
+	return	CLASS_ALIEN_MONSTER;
+}
+
+//=========================================================
+// SetYawSpeed - allows each sequence to have a different
+// turn rate associated with it.
+//=========================================================
+void CZombie :: SetYawSpeed ( void )
+{
+	int ys;
+
+	ys = 120;
+
+#if 0
+	switch ( m_Activity )
+	{
+	}
+#endif
+
+	pev->yaw_speed = ys;
+}
+
+int CZombie :: TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType )
+{
+	// Take 30% damage from bullets
+	if ( bitsDamageType == DMG_BULLET )
+	{
+		Vector vecDir = pev->origin - (pevInflictor->absmin + pevInflictor->absmax) * 0.5;
+		vecDir = vecDir.Normalize();
+		float flForce = DamageForce( flDamage );
+		pev->velocity = pev->velocity + vecDir * flForce;
+		flDamage *= 0.3;
+	}
+
+	// HACK HACK -- until we fix this.
+	if ( IsAlive() )
+		PainSound();
+	return CBaseMonster::TakeDamage( pevInflictor, pevAttacker, flDamage, bitsDamageType );
+}
+
+void CZombie :: PainSound( void )
+{
+	int pitch = 95 + RANDOM_LONG(0,9);
+
+	if (RANDOM_LONG(0,5) < 2)
+		EMIT_SOUND_DYN ( ENT(pev), CHAN_VOICE, pPainSounds[ RANDOM_LONG(0,ARRAYSIZE(pPainSounds)-1) ], 1.0, ATTN_NORM, 0, pitch );
+}
+
+void CZombie :: AlertSound( void )
+{
+	int pitch = 95 + RANDOM_LONG(0,9);
+
+	EMIT_SOUND_DYN ( ENT(pev), CHAN_VOICE, pAlertSounds[ RANDOM_LONG(0,ARRAYSIZE(pAlertSounds)-1) ], 1.0, ATTN_NORM, 0, pitch );
+}
+
+void CZombie :: IdleSound( void )
+{
+	int pitch = 95 + RANDOM_LONG(0,9);
+
+	// Play a random idle sound
+	EMIT_SOUND_DYN ( ENT(pev), CHAN_VOICE, pIdleSounds[ RANDOM_LONG(0,ARRAYSIZE(pIdleSounds)-1) ], 1.0, ATTN_NORM, 0, 100 + RANDOM_LONG(-5,5) );
+}
+
+void CZombie :: AttackSound( void )
+{
+	// Play a random attack sound
+	EMIT_SOUND_DYN ( ENT(pev), CHAN_VOICE, pAttackSounds[ RANDOM_LONG(0,ARRAYSIZE(pAttackSounds)-1) ], 1.0, ATTN_NORM, 0, 100 + RANDOM_LONG(-5,5) );
+}
+
+
+//=========================================================
+// HandleAnimEvent - catches the monster-specific messages
+// that occur when tagged animation frames are played.
+//=========================================================
+void CZombie :: HandleAnimEvent( MonsterEvent_t *pEvent )
+{
+	switch( pEvent->event )
+	{
+		case ZOMBIE_AE_ATTACK_RIGHT:
+		{
+			// do stuff for this event.
+	//		ALERT( at_console, "Slash right!\n" );
+			CBaseEntity *pHurt = CheckTraceHullAttack( 70, gSkillData.zombieDmgOneSlash, DMG_SLASH );
+			if ( pHurt )
+			{
+				if ( pHurt->pev->flags & (FL_MONSTER|FL_CLIENT) )
+				{
+					pHurt->pev->punchangle.z = -18;
+					pHurt->pev->punchangle.x = 5;
+					pHurt->pev->velocity = pHurt->pev->velocity - gpGlobals->v_right * 100;
+				}
+				// Play a random attack hit sound
+				EMIT_SOUND_DYN ( ENT(pev), CHAN_WEAPON, pAttackHitSounds[ RANDOM_LONG(0,ARRAYSIZE(pAttackHitSounds)-1) ], 1.0, ATTN_NORM, 0, 100 + RANDOM_LONG(-5,5) );
+			}
+			else // Play a random attack miss sound
+				EMIT_SOUND_DYN ( ENT(pev), CHAN_WEAPON, pAttackMissSounds[ RANDOM_LONG(0,ARRAYSIZE(pAttackMissSounds)-1) ], 1.0, ATTN_NORM, 0, 100 + RANDOM_LONG(-5,5) );
+
+			if (RANDOM_LONG(0,1))
+				AttackSound();
+		}
+		break;
+
+		case ZOMBIE_AE_ATTACK_LEFT:
+		{
+			// do stuff for this event.
+	//		ALERT( at_console, "Slash left!\n" );
+			CBaseEntity *pHurt = CheckTraceHullAttack( 70, gSkillData.zombieDmgOneSlash, DMG_SLASH );
+			if ( pHurt )
+			{
+				if ( pHurt->pev->flags & (FL_MONSTER|FL_CLIENT) )
+				{
+					pHurt->pev->punchangle.z = 18;
+					pHurt->pev->punchangle.x = 5;
+					pHurt->pev->velocity = pHurt->pev->velocity + gpGlobals->v_right * 100;
+				}
+				EMIT_SOUND_DYN ( ENT(pev), CHAN_WEAPON, pAttackHitSounds[ RANDOM_LONG(0,ARRAYSIZE(pAttackHitSounds)-1) ], 1.0, ATTN_NORM, 0, 100 + RANDOM_LONG(-5,5) );
+			}
+			else
+				EMIT_SOUND_DYN ( ENT(pev), CHAN_WEAPON, pAttackMissSounds[ RANDOM_LONG(0,ARRAYSIZE(pAttackMissSounds)-1) ], 1.0, ATTN_NORM, 0, 100 + RANDOM_LONG(-5,5) );
+
+			if (RANDOM_LONG(0,1))
+				AttackSound();
+		}
+		break;
+
+		case ZOMBIE_AE_ATTACK_BOTH:
+		{
+			// do stuff for this event.
+			CBaseEntity *pHurt = CheckTraceHullAttack( 70, gSkillData.zombieDmgBothSlash, DMG_SLASH );
+			if ( pHurt )
+			{
+				if ( pHurt->pev->flags & (FL_MONSTER|FL_CLIENT) )
+				{
+					pHurt->pev->punchangle.x = 5;
+					pHurt->pev->velocity = pHurt->pev->velocity + gpGlobals->v_forward * -100;
+				}
+				EMIT_SOUND_DYN ( ENT(pev), CHAN_WEAPON, pAttackHitSounds[ RANDOM_LONG(0,ARRAYSIZE(pAttackHitSounds)-1) ], 1.0, ATTN_NORM, 0, 100 + RANDOM_LONG(-5,5) );
+			}
+			else
+				EMIT_SOUND_DYN ( ENT(pev), CHAN_WEAPON, pAttackMissSounds[ RANDOM_LONG(0,ARRAYSIZE(pAttackMissSounds)-1) ], 1.0, ATTN_NORM, 0, 100 + RANDOM_LONG(-5,5) );
+
+			if (RANDOM_LONG(0,1))
+				AttackSound();
+		}
+		break;
+
+		default:
+			CBaseMonster::HandleAnimEvent( pEvent );
+			break;
+	}
+}
+
+//=========================================================
+// Spawn
+//=========================================================
+void CZombie :: Spawn()
+{
+	Precache( );
+
+	SET_MODEL(ENT(pev), "models/zombie.mdl");
+	UTIL_SetSize( pev, VEC_HUMAN_HULL_MIN, VEC_HUMAN_HULL_MAX );
+
+	pev->solid			= SOLID_SLIDEBOX;
+	pev->movetype		= MOVETYPE_STEP;
+	m_bloodColor		= BLOOD_COLOR_GREEN;
+	pev->health			= gSkillData.zombieHealth;
+	pev->view_ofs		= VEC_VIEW;// position of the eyes relative to monster's origin.
+	m_flFieldOfView		= 0.5;// indicates the width of this monster's forward view cone ( as a dotproduct result )
+	m_MonsterState		= MONSTERSTATE_NONE;
+	m_afCapability		= bits_CAP_DOORS_GROUP;
+
+	MonsterInit();
+}
+
+//=========================================================
+// Precache - precaches all resources this monster needs
+//=========================================================
+void CZombie :: Precache()
+{
+	int i;
+
+	PRECACHE_MODEL("models/zombie.mdl");
+
+	for ( i = 0; i < ARRAYSIZE( pAttackHitSounds ); i++ )
+		PRECACHE_SOUND((char *)pAttackHitSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pAttackMissSounds ); i++ )
+		PRECACHE_SOUND((char *)pAttackMissSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pAttackSounds ); i++ )
+		PRECACHE_SOUND((char *)pAttackSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pIdleSounds ); i++ )
+		PRECACHE_SOUND((char *)pIdleSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pAlertSounds ); i++ )
+		PRECACHE_SOUND((char *)pAlertSounds[i]);
+
+	for ( i = 0; i < ARRAYSIZE( pPainSounds ); i++ )
+		PRECACHE_SOUND((char *)pPainSounds[i]);
+}	
+
+//=========================================================
+// AI Schedules Specific to this monster
+//=========================================================
+
+
+
+int CZombie::IgnoreConditions ( void )
+{
+	int iIgnore = CBaseMonster::IgnoreConditions();
+
+	if ((m_Activity == ACT_MELEE_ATTACK1) || (m_Activity == ACT_MELEE_ATTACK1))
+	{
+#if 0
+		if (pev->health < 20)
+			iIgnore |= (bits_COND_LIGHT_DAMAGE|bits_COND_HEAVY_DAMAGE);
+		else
+#endif			
+		if (m_flNextFlinch >= gpGlobals->time)
+			iIgnore |= (bits_COND_LIGHT_DAMAGE|bits_COND_HEAVY_DAMAGE);
+	}
+
+	if ((m_Activity == ACT_SMALL_FLINCH) || (m_Activity == ACT_BIG_FLINCH))
+	{
+		if (m_flNextFlinch < gpGlobals->time)
+			m_flNextFlinch = gpGlobals->time + ZOMBIE_FLINCH_DELAY;
+	}
+
+	return iIgnore;
+	
+}
\ No newline at end of file
diff --git a/main/source/doc/1-1_changelog.txt b/main/source/doc/1-1_changelog.txt
new file mode 100644
index 00000000..8976e7cc
--- /dev/null
+++ b/main/source/doc/1-1_changelog.txt
@@ -0,0 +1,2535 @@
+
+NS v1.1
+-------
+
+	General
+	-------
+	O The resource model and balance has been fundamentally reworked to promote scouting, distinct tech levels, counters and generally more interaction with the enemy
+	O Big server performance optimizations.  CPU usage is around 50% less for both win32 and linux.
+	O Added HLTV support and overviews for all maps.
+	O Added first-person spectating, including health, armor, deploy/fire/reload animations, hive sight, current orders, alerts, etc.
+	O Added new skulk rotation system, so wall-running skulks orient properly on sloped floors, walls and ceilings
+	O Updated existing maps for performance and balance and added four new maps: ns_fenris, ns_lost, ns_mineshaft and ns_origin
+	O New context-sensitive popup-menu cursors
+	O New weapon crosshairs
+	O Added building notifications so players can see what their gorges and commander are building, and where.  This can be disabled in the options.
+	O Added Constellation authentication system
+	O Added heavy armor footsteps, new weapon sounds, new phase sounds
+	O Added new graphic effects for when alien structures are killed and when sentries fire
+	O Added team handicapping, so either team can slow their general resource intake.
+	O Removed alien "frags" in scoreboard (they show up for both teams in tournament mode)
+	O Preserved classes in ready room, so you can fly, wall-crawl or jetpack if you ended the game as such
+	O Much improved demo record/playback 
+
+	Aliens
+	------
+	O Addressed problem where more gorges means slower growth (non-intuitive): More gorges should increase alien growth speed (increases value of scouting and probing heavily, means less waiting and problems for newbie aliens, gives more interesting configurations and builds for aliens)
+		O Removed the 33/66/100 limit for each alien.
+		O Every alien starts with 25 resources.
+		O All aliens always split resources evenly.  Gorges no longer get more resources then other alien lifeforms.
+		O Gorges can "suck" resources from unbuilt resource nozzles.  Point at the nozzle and hold your "use" to slowly draw resources.
+
+	O Alien upgrade adjustments to make non-defense viable in early game
+		O Changed behavior of "Scent of Fear".  Any enemy players within range of a player show up on hive sight (as if they were parasited).  Each level increases range.
+		O Replaced "Enhanced Sight" with "Pheromones".  This upgrade leaves a pheromone trail behind all enemies in range, which is visible for 10 seconds.  Each level increases range.
+		O All alien structures now slowly regenerate so def chambers aren't used everywhere
+		O Silence upgrade quiets attacking and drop-to-ground sounds.  So you can be totally quiet while attacking now, but your damage feedback sounds will still be played (necessary to avoid commander/marine confusion).
+		O Carapace now slows down players slightly with each level.
+		O Movement chambers now give nearby players an energy boost.  They give up to three nearby friendly players +10% energy every 2 seconds.
+		O Sensory chamber reworked:
+			O Sensory chamber cloaks all structures and players nearby.  Players can move, but as soon as they attack, they uncloak.  Offensive chambers uncloak when they attack.
+			O Touching or scanning a cloaked structure will uncloak it.
+			O Removed "incoming enemies" warning
+
+	O New "stomp" ability: at two hives, the Onos can stomp on the ground, stunning all nearby players for a couple seconds.
+	O New "devour" ability: at three hives, the Onos can devour an enemy whole.  The player is then slowly digested, giving health back to the Onos, and effectively removing the player from the game for a short time.
+	O Bile bomb moved to 2nd hive gorge ability and affects structures only
+	O Web is now a 3rd hive gorge ability (babblers removed)
+	O Gorge spit improved
+	O Pop-up menu reorganized to be more intuitive.  Options are greyed out when not available.  Alien "sayings" removed (all but chuckle).
+	O Bite removed from lerk, and spikes replace it
+	O Spores moved to 1 hive lerk ability, and damage reduced significantly.  Spores no longer damage players through walls.
+	O Primal scream moved to 3rd hive lerk ability
+	O Lerk now shoots umbra like his spores, allowing him to defend at a distance
+	O Changed offensive chambers to shoot spikes instead of spit
+	O Tweaked alien field of view for immersion (skulk and gorge can see slightly more, onos can see slightly less).  This was in the game for a long time, but was removed when attempting to support software.
+	O Updated the skulk view model so it doesn't obscure the screen as much when biting.
+	O Removed hive requirement for higher lifeforms.  This should stop stalemates when aliens have resources but marines have camped hives.  Note that aliens still need hives for lifeforms, upgrades and faster spawning.
+	O Reduced spike damage back to 16, reduced spores energy cost from .6 to .4
+	O Removed visible lerk projectiles (because the spikes hit instantly)
+	O Each level of carapace now slows aliens by slightly, because of the heavier shell
+
+	Marines
+	-------
+	O Tightened HMG cone to make better vs. ranged fades/oni and harder to respond to skulk chomping on leg (changed from 10 degrees to 6 degrees)
+	O Added a "phase gate tech" upgrade on observatory that's required for phase gates.
+	O Changed scanner sweeps to use energy.  They slowly gain energy, and so can be used for scanning only every so often.  Scans cost no resources.  Distress beacon also uses energy system.  This should make multiple observatories viable.
+	O Improved scrolling for commander (no more hitching)
+	O Updated LMG model to obscure the screen less.  It has been moved down and the muzzle flash has been shrunk.
+	O Added more "acknowledged" sounds for soldiers
+	O Lowered pistol rate of fire because of script abuse
+	O Tech tree reorganized (diagram to follow)
+	O New technology: Electrical upgrade.  Turret factories and resource nodes can be upgraded to electrify nearby enemies.
+	O Scanning is now energy-based instead of resource-based.  The observatory slowly accumulates energy, and 25 is needed to scan.
+
+	O Commander mode improvements
+		O Added hotgroups!  Holding control and 1-5 will create a hotgroup of of the current selection.  You can select the group by pressing the number key, or clicking the hotgroup icon.  Selecting it again will jump to the group.
+		O When soldiers are added to a group, they become a squad, and they hear a "You're squad x".  All players in the squad see an indicator telling them they are in that squad.  This is just for organizational purposes, and has no other gameplay effect.
+		O When any member of a hotgroup is under attack, the icon will blink red.
+		O Added "select all" button
+		O All buttons highlight
+		O Added "idle soldier", "soldier needs ammo" and "soldier needs health" indicators.  Clicking these will bring you to the soldier who made the request.
+		O Draw player names at all times
+		O Commander can use voice comm to talk to just the selected marines by holding his crouch button while talking
+		O Holding crouch while selecting units will add them to the current selection
+		O Commander can now see which marines are parasited
+
+	Bug fixes, exploit fixes, anti-cheat, misc
+	------------------------------------------
+	O Removed frame-rate dependence for building structures and jetpack usage
+	O Added icon for Cheating Death (it will display when authorized)
+	O Fixed leap/charge exploit
+	O Death notices getting logged twice when mp_logdetail > 0
+	O Structures play their animations without "hitching", and don't reset when coming onto the screen for the first time
+	O Added Cheating Death icon for validated players 
+	O Lowered pistol rate of fire to prevent scripting abuses
+	O Fixed recycling observatory not removing scanning tech
+	O Menu doesn't update if recycling structure selected
+	O Allow recycling of unbuilt structures
+	O Fixed not playing proper player weapon animation after commanding
+	O HMG view model animations updated to be smoother
+	O Player muting now works (**and particle editing**)
+	O Moved NS to HLSDK 2.3 (includes support for sv_alltalk)
+	O Changed armory resupply code back the way it was
+	O Players can now "walk"
+	O Changed commander name so soldiers can read it
+	O Disabled +use for commander so he can't build structures when flying "low"
+	O Nearly all assets are checked for consistency when mp_consistency is 1, fixed problems with shell.mdl
+	O Put mp_drawdamage back in as server option
+	O Decreased time needed to start respawning after death (make sure it works with death anims)
+	O Added option to disable dynamic lights photosensitive players and for performance reasons
+	O Messages from server always show up, even if tooltips are off (voting messages, adminmod messages, etc.).  Turning off tooltips no longer disables help icons.
+	O Primal scream now makes affected aliens scream back in defiance
+	O Removed mp_teamhandicap, and spawn invulnerable time from menu, removed other stuff and added new handicaps and stuff
+	O Make sure advanced turret factory can be recycled
+	O Relaxed gestation requirements to avoid annoying "you must be on ground to gestate" errors
+	O Offense chambers no longer hurt themselves in tournament mode
+	O Collision fixes (no longer "jitter" when crouching no nodes or structures)
+	O Lerks no longer take falling damage
+	O Minimap no longer "stretches"
+
+	Known issues
+	------------
+	- Bile-bomb projectile isn't oriented properly
+	- Energy display for observatory is non-informative
+	- Armory and phase gate animations are still messed up 
+	- VALVe Anti-Cheat support not in yet
+	- Armories and alien resource towers don't draw rings (collision sizes I think)
+	- Enforce entity limit of some kind to prevent/reduce overflows?
+	- Remove commander mouse-over for players (now that names always display)
+	- Alerts for commander aren't working
+	- Test demos, decide on backwards-compatibility
+	- Fade third-person anims are messed?
+	- Siege still can't hit targets in range of an observatory
+	- Timer on scoreboard is ugly
+	- Blink still needs to be fixed
+	- Fade is missing his 2nd hive ability (unannounced)
+	- Stomp sound is placeholder
+	- Minimap still needs fixes and improvements
+	- Placeholder HUD sprites for stomp, devour and death-by-electricity
+	- Walking speeds are messed up for some classes
+	- You may have to aim down or crouch to get devour to work
+	- RESEARCH_HEALTH is still available after researching it
+	- Lerk flight hasn't been updated yet
+	- "Hitboxes" haven't been fixed yet
+
+	- 1.1 rollout
+		- Initial playtesting with PTs
+			- Find obvious problems (missing files, stuff that isn't fun at all)
+			- Iterate until things are right conceptually and big-picture wise
+		- Rollout to vet players
+			- Start working on balance and exploits
+			- Once very big holes are patched
+			- Rollout to beta server ops
+				- Work out performance, compatibility and 3rd party issues
+				- Increase # of playtests through all these servers (open beta if people want it?).  Use auth system to prevent people from joining a team if they aren't a PT/vet?
+				- Get PR movie completed, and hype to sites.  Get PTs and clan people to write previews and spread the info?
+
+	- Lose upgrades when structure is lost (motion-tracking, upgrades)
+	- Add graphic effect for primal scream (or draw icon above their head like voice?)
+	- Show health for selected marines and structures (draw icons somewhere?)
+	- Reconcile umbra visuals and gameplay effect 
+	- Move skulk view offset to be closer to actual (so your nose doesn't poke out when you don't realize)
+	- Draw number of nodes that team has (draw info for both teams when spectating).  Draw shadows showing which nodes were last seen to be controlled by enemy. (or more simply, just draw +x which is how much was received last tick?)
+	- Change alien upgrades to draw icon and then number, instead of layers
+	- Ammo packs go to "best" weapon
+	- **Extra skulk death anims
+	- Don't draw crosshairs when pop-up menu is open
+	- Rework welding role (or show how much armor someone has when looking at them)
+	- Weapons dropped near armory don't expire
+	- Speed cap for flying players
+	- Keep old assets in game so old demos work?
+
+	- Auth icons
+		O Got all PTs and devs
+		- Just need new PTs 
+	? Fix jump to go to alerts
+	? Change config from selectall to impulse
+	- Marine resource tower rings
+	? Show progress bar for devour
+	O Change view model for devour, don't allow it to fire again while digesting
+	- Make sure mp_uplink is getting set to 1 every tick
+	- Some tech node label is visible in ready room
+
+	- Make announcement when ready to start soliciting veterans (put up demo FTP also)
+		- My basic strategy will be to hang out in #nsscrim and watch games.  Sometimes I'll watch demos also, but mostly I'm interested in seeing clans that do the following:
+			- Scrim multiple times per week
+			- Can get along well with the other clans, and can talk about balance, strategy, etc. while remaining pleasant and respectful
+			- Will continually try new strategies and try to "break" the balance
+			- Can compete with the other top clans that are selected
+
+	- Client downloads, 3/29/03
+		- Gamehelper: 4829
+		- Computergames.ro: 77806
+		- Fileplanet: 59,391
+		- Ozfiles.net: 29173
+		- Khabal.com: 10468
+		- Halflife.nu: 41878
+		- Gamershell: 37616 
+		- Ausgamers.com: 32032 (telstra: 7435)
+		- extremeplayers.de: 27649
+		- Multiplayer.it: 2747
+		- Daddeln.de: 22980
+		- Fileshack: 14752
+		total: 368,756 (many missing mirrors though)
+
+	- Round reset problems
+		- Jobabob's analysis: http://www.natural-selection.org/forums/index.php?act=ST&f=4&t=24222
+
+	- Welding changes
+		? Make them reset properly every time
+		- Only take damage from the right things (healing spray)
+		- Really think about their role
+
+	O Alien turret changes
+		O They shoot spikes intead of spit
+		O Their idle animations play without hitching (3 different idles)
+		O They play take damage animations also
+		O Show spike sprite when projectile hits it
+
+	- Lerk physics changes
+		- Try flying in whatever direction you're looking
+		? Lerks no longer take falling damage
+
+	- Korean push
+		- Find someone to translate (asked Jason Robar)
+		- Anything other usability in SC/War III NS is missing?
+
+	Time line:
+		Game start	->	Marine Tier 0, Alien Tier 1
+		~30 seconds ->	Marine Tier 1
+		~1 minute	->	Advanced Tier 1
+		4 minutes	->	Tier 2
+		~5 minutes	->	Advanced Tier 2
+		8 minutes	->	Tier 3
+		~9 minutes	->	Advanced Tier 3
+
+	- Marine Tier 0
+		- LMG, pistol, knife, without capability for more extra ammo
+	- Alien Tier 0
+		- Bite, spit
+			
+	- Marine Tier 1
+		- Deployable ammo
+		Advanced -> mines, sentries, deployable health, distress beacon, resource towers, welder/welding, shotguns
+	- Alien Tier 1
+		- Parasite, healing spray
+		Advanced -> Offensive chambers, bite2, spores, sensory/movement/defensive upgrades, resource towers, blink, onos-1
+
+		Analysis: 
+			mines > tier1 fades
+			tier 2 siege > sentries/OCs
+			If enough money is pumped in: 
+				onos > sentries, deployable ammo/health > OCs
+				shotties > skulks/gorges
+				onos > LMGs
+			lerks competitive with shotties
+			mines competitive with fades, onos
+			alien upgrades allow aliens to become more powerful for cash, just like shotties/mines/welders
+			welder competitive with healing spray
+			Gorge have ability to remove welds (takes the same time as welding, allow it to be welded back and forth?)
+			Massed spores beat armory-teching marines
+
+	- Marine Tier 2
+		- Level 1 ammo/armor
+		Advanced -> Siege cannons, HMGs, GLs, motion-tracking, phase gates (with new prerequisite upgrade), scanning (if upgrade added), armor/ammo upgrades
+	- Alien Tier 2
+		- Leap, gorge bile bomb
+		Advanced -> Umbra, fade ability, second set of upgrades 
+
+		Analysis: 
+			Tier 3 GLs beat umbra
+			Marines get scanning to counter hive-1 sensory
+			Marines get siege to counter hive-1 defense
+			Motion-tracking or phase gates vs movement chambers (vs. silence and celerity)
+			Bilebomb beats sentries
+			HMGs counter tier 1 skulks/gorges, competitive with tier 2 lerks and fades (umbra, esp. with def chambers/regen)
+			Umbra/skulks beats LMGs, sentries
+			Scanning beats Alien Tier 1 (current sYn tactic)
+			Leap vs. ?
+			Tier 2 onos competitive with 
+
+	- Marine Tier 3
+		- Level 2 ammo/armor
+		Advanced -> Heavy armor, jetpacks, level 3 ammo/armor
+	- Alien Tier 3
+		- Xenocide, web
+		Advanced -> primal scream, acid rocket, third set of upgrades
+
+		Analysis:
+			Webs strong vs. jetpacks (though hard to use in practice with vulnerable gorge on frontlines)
+			Jetpacks counter onos (make sure devour only works if player is on ground?)
+			Onos beat HA/HMG (with charge)
+			GL beats umbra
+			Acid rocket strong vs. jetpacks, and JP/HMG (though a little more expensive)
+			Acid rocket beats tier-2 HMG
+			Tier-3 HA/HMG should beat acid rocket (but not hard counter, implies reduction in acid damage and increase in splash radius)
+			Level 3 ammo/armor upgrades competitive with fades (esp. at marine spawn)
+			Primal scream helps beat tier 2 marines
+			Leap-Xenocide vs. HMG/GLs (esp. with cost)
+			* Make gorges slightly more costly or take longer to morph to, so losing gorges is still bad, and going all gorge is risky (in light of new resource model changes)
+			Problem: alien team will generally have all lifeforms, because it doesn't cost anything to explore a technology.  This means fades/onos will always be present at tier 3.  Fix this by making alien lifeforms initially more expensive and then cheaper as they continue to be evolved to?  Or first cost and then cost after that?  Say, 80 for first onos, then 50 after that?  Or one cost if there exists none of that lifeform, and another if there are multiples?  Cheaper and cheaper?
+
+	? Resource nodes now run out
+		? They give alerts when nearly empty
+			- They need to always show, even when visible and not within range?
+		? They stomp making sounds and pumping when they are empty
+		? Takes 10 minutes to run out, resources harvest evenly no matter the team size, they also show accurate non-float numbers when harvesting (unless handicap is activated)
+
+	O Added volunteer handicap for teams in tourny mode.  Removed team size handicapping now (team limit enforcement is enough).
+
+	- Alien menu improvements
+		- Show cost for OC, Hive, resource tower, upgrade chambers
+		- Show disabled nodes (esp. upgrades) more clearly
+			- Make invalid nodes obvious without moving to them
+		- Move tooltip back near mouse?
+		O Make chooseable nodes clear (upgrade nodes aren't obvious)
+			O Rework nodes to do so
+		- Add changing cursor for all valid end nodes
+			O Added lifeforms change
+			O Added marine change (need new cursor though?)
+			- Change cursor for other alien options (get artwork from Relic)
+
+		- Remove or rework alien comms
+			- Draw chatting/status alien blips even if not pointing at them?
+		- Remove ready room off pop-up for both sides
+		- Allow cancelling of morphs?
+		- Unify marine and alien upgrades by drawing at the same place if possible
+
+	- Allow server to csay without autohelp enabled (http://www.natural-selection.org/forums/index.php?act=ST&f=5&t=23194)
+	- Force "hive construction complete" sound
+	- Low-resolution support (weapon sprites, theme.txt)?
+
+	- Make sure to show build rings for structures on mouseover 
+	- Change leap to not hurt buildings?
+
+	- Move PT auth icon status "above" guide icon status
+	- Move auth system after mp_authicons is loaded from .cfg 
+	- Fix or rework blink
+	- Go through NS Bugs mail folder and fix as many of those as possible
+	O Resource tower "targetOnBuild" only fires once now
+	- Remove info_location z-checking.  Remove info_locations from map after loaded to reduce entity count (make sure map reset still works)
+	- Add client-side temp grenade for grenade launcher
+	- Display message when cheats are enabled
+	- Include cheating death icon from prodigy, add auth mask as well
+	- Leap exploit: when binding leap impulse with two hives (energy must be decremented in AvHPlayer::ExecuteMessage instead of weapon::DeductCostForShot
+
+	O Integrate new tech icons
+		O Use red frame for structure under attack
+		O Use red frame for not enough cash
+
+	- Armory exploit:
+		From Swirl, via forum PM: "When a marine stands next to an armoury and presses his use key to get ammo, its quite slow getting ammo, but when you press your use key + flashlight repetitively, the speed that you gain ammo at is incredibly fast. I dont know if you know about this, and I hope you will fix it for 1.1 . Ill send you a demo of this if my explanation is a bit vague"
+
+	- Easier learning curve
+		- Perfect world: there's a full single-player campaign that teaches all the basic mechanics...but this doesn't solve the strategy part
+		- Simple SP level that gets player to learn the very basics, then
+			- queries n-s.org for list of training servers, and asks the user if they would like to connect one of them (it would need a certain number of players with x status and have a ping of y or less)
+			- gets them to configure their mic first, if at all possible (Steam, or add voice control myself and set sv_loopback for a moment)
+			- get training servers by all servers running special training maps (nst_?) or get sponsored servers and allow player to choose one
+			- add GUI for trainers to let them easily run things 
+				- Turn on/off damage for players, reset the game, enable alltalk, allow them to spectate first-person for a player, build a structure anywhere, mute players temporarily so they have the floor
+				- Allow players to report abuse
+				- Allow trainers to move players between teams (put all this on the scoreboard?)
+				- Only allow trainers that have been authenticated as such
+				- Add features that encourage players to add others as friends when playing on Steam
+				- Allow trainers to signal for more trainers
+				- Allow trainers to take control of other players (hard for commanding though)
+
+	- Remove/disable thirdperson commands (from Tau hang10)
+		cam_command 1
+		cam_idealyaw 0
+		then do a retry to the server
+		im pretty sure this is client side only
+
+	? Physics exploits
+		? Bunnyhopping (from iwa.plex)
+			- sv_airaccelerate 0
+			- sv_airmove 0
+
+		? ex_ exploits:
+			- ex_maxerrordistance 0
+			- ex_interp 0.01
+
+		- Address lerk and jetpack physics after disabling airmove
+
+	- Potential vets
+		- STD
+			Kenneth Lee (ksl4@georgetown.edu), STD-Ardesco
+		- Eve, eR, 
+		- RED
+			- cornesm@bellsouth.net (RED-Tiki)
+		- sYn/HAM 
+			- (Steve Meenehan <smeene@yahoo.com>)
+			- Ackz (AcKz666@hotmail.com)
+		- TAU
+			- solarcurve@msn.com (SolarCurve)
+			- hang10@myway.com (hang10)
+		- XoverZero
+			- archhaven@sbcglobal.net <archhaven@sbcglobal.net>
+		- TE?
+			Seraphic8x (Mrfranz16@aol.com)
+			do0bie[TE] (Ben Wolf)
+		- Need a couple Euro clans?
+		- Misc. people
+			WeRRa|Torhu (on IRC, S. Korean guy, stuwon@Hotmail.com)
+		- CAL folks
+			- Othell <othell@caleague.com>
+			- boeckelmann@caleague.com
+			- eric@doticon.com
+			- bralph82@yahoo.com
+
+		- UGL folks?
+			- UGL|SeanA
+
+
+		- Please e-mail me your full name, handle, clan name, and WON id
+		- Changing clans won't affect your vet status, but you won't be able to bring all your new clan mates in as vets
+
+		- Confirmed vets
+			O Kanwei "#cri.ogenics" Li, 3598159 (New wonid, fix it for constallation too)
+			O *Nick "#cri.Nicuss" Chebeleu, 3237836
+			O Andrew "#cri.tical" Hammett, 3221707
+			- Guérin "#cri.Draco" Christophe, 1773753
+			- Tylor Yeung, "cx.cypher", 162108 (leader of cx, founder of NSA)
+			O Kenneth "cX.Screamer" Wunderlich handle, 203409
+			O Anthony "cX.Mr Radical Ed" Guevara, 37306
+			O Marvin "cX.Vinin", "something" 2065255
+			O *Jerry "cX.TheNaySayer", 331066 (NSA owner)
+			- Justin "er.IcE-" Goodman, 110613
+			O Lane "er.Lux" LaRue, 42770
+			O *Brett "eR [ Erilane ]" Erilane, 1160592
+			O *Ben "eve.doobie" Wolf, 7154
+			O Paul "eve.seraphicx" Franz, 829329
+			O Daniel "eve.hang10" Garza, 3196484
+			O John "eve.romano^_^" Romans, 80973
+			O Brad J Rosin "eR [ lagger ]", 155580
+			O *Stephen "HAMBONE" Meenehan, 2884666
+			- Michael Moorman "STEAMEDHAM" (WonID: 3508091)
+			- Christopher Meenehan "SMOKEDHAM" (WonID: 2244778)
+			- josh resendiz "SHAMPOO" (WonID: 978045) (or -> Tim Ang "GREENEGGSANDHAM" (WonID: 170749) )
+			O *Josh "STD-Goosey*" Szepietowski, 3243397
+			O Kenneth "STD-Ardesco*" Lee, 144891
+			O Josh "STD-Slash*" Keats, 59932
+			O Logan "STD-Kalmah*" Reeves, 3162858
+			O Tae "[ReD]TaE" Kim, 633578
+			O *D. "[ReD]boobs" Anderson, 2377185 (leader)
+			- Michael "[ReD]Knight" Choe, 124911
+			O Dean "[ReD]Dean" Kovacs, 39960
+			O *Joe Shanahan, [ReD]mogg, 2817243
+			X James "FatKao" Thomas Milko, 538967 (forum name: FatKao)
+			O Amit "Uubu" Shah, 690509
+			- Firewater?
+			O *Phillip "Borf" Whang, 1492447
+			O *Kyle "ue.akiro" Hallenbeck, 536458
+			O Josh "ue.theoryhat" Porte, 958962
+			O Jacob "ue.eisen" Smith, 589464
+			O Anthony "ue.jdub" Carpio, 741488
+			O John Strickler, ue.optikal, 992223 - Old head of nG, close to top members of NS community, got scrim channel for us (!)
+			O *Jonathan "UGL|Jon" Green, 1032836
+			O *Paul Fisch "Eats", 1271383
+			O Tim Manns "kenichi", 556510
+			O *Andreas Carlos Serna "pandas|churro", 81383
+			O Chris "pandas|3-toed_sloth" Mann, 2418057. 
+			- Alex Kong "pandas|Tare", 303687
+			O Shozo "pandas | snakpak^p.rP" Hirano, 109722
+			O Hugh "[one]arch" McDonald, 395278
+			O *David "[one]Toasty!!" Rodriguez, 3048748
+			O Devan "[one]froggeh" Laska, 1074623
+			- Matt "[one]cinderous" Bloom, 148963
+			O *Othell, 83473
+			O Brad "CAL|Brad" Ralph, (pandas | mcclane), 518141 (forum: mcclane)
+			O *Paul "Solarcurve" Drew
+			O Benoit "Naxo" Richter, 379698 (NS Clanbase supervisor)
+
+			? full name: Michael E. Boeckelmann, handle: chem^ten, wonid: 115515, CAL|Boeckelmann on gamesnet
+
+
+			Potential new vets
+			- apex|lego - Brian1095@mailcity.com - From nG, "Beaten sg tied ue, beaten one, beaten x over zero, tied eve, and it will get better... were just not league atm =("
+
+	O Removed "if you're new to NS, play marines first" tooltip (to get balance numbers in line?)
+	O Fixed view "jog" when releasing pop-up menu key in windowed mode
+	O Fixed stretching problems for soldier minimap
+	- Remove "try morphing to gorge" tooltip"
+	- Change tooltips so server messages can still be sent
+	- Remove listening for hive bug, necessary for HMG rush to not be over-powered
+
+	- **Crash when joining marine team before particles come down on hera
+		- Same with delta?
+
+	- Logging stuff
+		- Commander-wins
+		- Time research finished ("time to arms lab", "time to HA")
+		- 
+
+	- Directions to Mike:
+		Mike: ok . . . red line to broadway
+		Mike: then you have to go over the broadway bridge and onto albany
+		Mike: then albany onto harrison
+		Mike: and we're 580 harrison, fourth floor
+		Mike: we'll have to let you in
+		Mike: it's about a 10 minute walk
+		Mike: or so
+
+	- Install and configure ArticleManager
+		- Write honest review for Fraser: fraser@interactivetools.com
+
+	- CAL support
+		? Team score shows number of resources accumulated (show for both teams to start, remove if not cool)
+		? Show marine kills/deaths in tourny mode
+		? mp_timelimit in tournymode shows countdown for everyone and ends the game afterwards (looking at team resources when setting the victory condition)
+		- Add support for draw game
+		- Make timelimit blink red when almost done
+		- Don't display team resources for enemy team
+		- Log game end specially (score)
+
+	- Enhanced demo playback
+		- Particles
+			O Added support
+			- Figure out why they are only drawing sometimes
+			- Spawn particles aren't oriented towards viewer, probably because of vofs crap
+		- Building health circles
+		O Gamma
+		? Weapon info
+		- Minimap for marine
+		- Music (?)
+		- Pop-up menus
+			- Don't playback when HLTV menu is up
+		- Tech slots
+		O Teams
+		- Non zbuffered stuff
+			- Orders
+			- Hive sight
+			- Need VALVe help here
+
+		- Commander mode
+		- Reload map HLTV images for demo playback
+
+	- Job search
+		O Send e-mail to Josh Resnick
+		O Pinged Arena.net and S2games via gamejobs.com
+		O Talk to DAM and get things moving for Monolith
+		O Apply to Big Blue Box
+		O Apply to Intrepid
+		O Send followup e-mail to Arena.net
+		- Send e-mail to CCPGames.com
+		- Remedy -> Max Payne (www.remedy.fi)
+		O http://www.dperry.com/ -> Lots of UK listings
+
+	O Rework commander hotkeys so they're hardcoded but work well
+		- Menu is now 4x3 (new category for orders, 4 rows no longer needed with new armory/equipment model)
+			- Get artwork scaled (maybe I can do this) and tweak values so it looks right
+			O Add new category
+		O QWER, ASDF, ZXCV match up to menu intuitively
+		O Added customization support in advanced config
+
+	- Armory changes
+		- Put equipment into production
+			- Research shotty production, HMG production, GL production
+			- Each armory slowly creates a weapon of that type in range every 20-30 seconds (up to three weapons around each structure?)
+			- Same goes for the prototype lab (jetpacks and HA)
+			! Don't forget to always propagate entities to commander if they are selected
+
+		- Advantages
+			- Frees up room on the UI for new hotkey system
+			- Less commander frustration
+			- No more whining about "HMG/HA plz"
+			- Means multiple armories and prototype labs are useful (as well as specialized bases)
+			- Means heavy weapons are more viable without super high costs
+			- Means armories might be targetted
+			- Perhaps an appropriate advantage against new faster growing aliens
+			- Binds technology to an area ("shotties at sewer" or "grenades outside refinery")
+			- Consistent with high-level duties, scales well to games of all sizes
+
+		- Disadvantages
+			- Commander can't reward individual players easily
+			X Pain to implement
+			- Fundamental balance change
+
+	- If marines have no arms lab, they lose those upgrades as well (make arms lab a bit tougher probably)
+
+	O Adjusted voice comm icons to position above models properly.  Updated HUD voice icons to use same as world voice icon.
+	? Fix problem where adv. armory factory doesn't show circle
+
+	m Slant Wall Hack from Hang10
+
+	m Hitbox issues
+
+	- Drowning bug/exploit (healthbug.dem, from Comprox)
+
+	- Commander building exploit (e-mail from Mike Hodgkinson)
+		- One of regulars found an exploit which could be used on NS as commander where he could build structures while in the commandchair.
+		- I saw hi doing this on ns_missilecommand_final3, it looked like the structure was being built by no one.
+		- He told me how to do it, you centre your view over the structure and hold "use", builds just as fast as if a marine was building it. This makes sense as I understand thier is a commghost entity. Im thinking of disabling comms from being able to press thier "use" while they are in the commchair with a metamod plugin, but I thought it may be important to advise you of.
+
+	? mp_logdetail 2/3 every kill message is reported twice
+
+	- Minimap fixes
+		? Max fixed stretching
+
+	- Status bar issues when using gorge
+
+	- PR
+		- Talk to SolarCurve 
+		- Talk to iwa-dec for promotion (DOG, gotfrag people)
+
+	? Add alien building destruction effects
+	? Add turret smoke effects
+
+	? Renamed mp_authicons to mp_uplink
+		? mp_uplink now controls versioning too
+		? Put in basic throttling to prevent ridiculous abuse
+		? Updated default .cfgs
+
+		- What's bandwidth for this?
+			Assume 1000 servers, average game length is 20 minutes
+			3000 queries per hour, roughly one per second
+			Change this to only allow updates every hour, so one every three seconds
+
+	? Added "select all" command
+		- Add to config
+	? Fixed guide tooltip bug where it wouldn't work for any player but the first
+	? Made tweaks to fade view model (needed for HLTV, new animation for smoothly switching between cannon and swipes)
+	? Added idle animations to acid rocket and bilebomb
+	? Weapon reloading, deploying issues with new event model
+	? Add player reload animation support
+	- Frame-rate dependence
+		? Building (change to gpGlobals->frametime)
+		? Jetpacks (ask Quietmischief or Seraphic8x)	
+		- HMG firing rate (looks like all weapons too?)
+		O Wrote Eric and VALVe
+
+	- Remove or revisit recycling
+	- Get particle editing working again
+	- Logging out of the command chair in HA repairs all armor damage.
+	- Increase initial alien points
+	- Increase late-game power of marines (defending nodes/structures)
+		- Add alert that marines can hear?
+	- Info_location optimization (delete itself on the server when loaded)
+	- Info_player_location optimziations (!)
+		- 160 entities removed
+	- Balance
+		? Tightened HMG cone from 10 degrees to 6 degrees (allows HMGs to battle fades)
+		? Aliens now start with 20 points instead of 10
+		? Marine resources now scale, with each player contributing 15 points to the pool
+			- Make it non-exploitable and really think through all the ramifications of this
+
+	- CC recycle bug (demo from Joev)
+	- Map reset doesn't work for welds
+	- Weldable damage by spit, parasite
+	? Fix generate on collision particle systems
+
+	- Experiment with resource model changes:
+		- More gorges mean more resources and faster growth (ie, not on a share system)
+		- 
+
+	- Internationalization from Nem
+		- Spanish
+	- mouse3 for comm
+
+	- New site
+		- Credits on site (Josh, others)
+		- Shader lab textures credit (ydnar)
+		- Josh credits
+
+	- PR art pack
+		- Add map pics
+		- Add NS banner
+		- Release
+
+	O Show player score in tourny mode?
+
+	O Fixed problem where adv. turret factory doesn't show circle
+	- Fix weapon hud sprites for very small resolution (Merks)
+	- Cursor bug: If you are in the menu when the game ends you are brought back out to the waiting room, but you still have a selection cursor that you can't get rid of (and thus can't walk around or look if you have those keys bound to the mouse). If you join a game in this state, you are shown a blank menu that you can't get rid of. I tried escaping to the game main menu and going back in the game, but the menu was still there. I finally had the exit the game completely and go back in.
+	- Voogru: I dont know if you know about this or not but the advanced armory doesnt show the health becuase the fuser2  on the armory is reset to 0. I fixed this by simply doing this:pEntity->v.fuser2 = pEntity->v.health/2.4;I know it probally will be different with how you have it setup but i think its becuase of the fuser2 getting reset.Just trying to help out.-voogru(BTW, your PM box is full!)
+	- PAS stuff
+	- Team score = total resource gathered
+	- Speed up harvesting a little (scale resources for both sides)
+	- Fix resource max on client for evolving gorges (it will still count down to 33, but will immediately count back up to your resource count (this is just a visual problem on the client)
+
+	- Fade looking up/down bug (e-mail from Peterson Roald)
+	- Set r_drawviewmodel to 1 every frame, or don't send move when it's 0 (cvar_t* m_pCvarDrawEntities = IEngineStudio.GetCvar( "r_drawviewmodel" );)
+	X Allow bots to use command station (for Paul)
+	- Blast damage differences between game and manual
+	- Verify that tooltips and manual values are updated with v1.3 and beyond (change system to dynamically display values like costs?)
+
+	- Change webs to not be placed with same normals (ie, on floor)
+	- Change xenocide to charge up a progress indicator instead of triggering once?
+	O Change contact info on team page to filter mail
+	- Patch server performance
+	O Bills
+	O Forum work
+	O Burn CD and return CD for/to Adam
+	O ESR interview
+	O DOG interview
+	O HomeLAN interview
+	- Use shotgun animation when holding shotgun, instead of machine gun anims
+	- Add speech binds in config screen
+	- Allow pop-up menu to execute regular HL commands?  Like maybe 'node4 = 4/2/2/#MenuCovering/$"impulse 8;say_team I'm covering you!"' instead of just "node4 = 4/2/2/#MenuCovering/8"?
+	- Add visible number of resource nodes (eg, 3/9 <node sym bol)
+	- Particle editing fixes
+	- VAC support
+	- Fix fonts for low-res
+	- Add hotgroups "You are squad 1"
+	- Show player names for commander
+	- Cycle to next player hotkey
+	- Select all button
+	- Voice squelching
+	- Spectator tweaks
+		- Draw death messages
+
+	- Marines getting RPs too fast?
+	- "Incoming enemies" fix
+	- Sensory chamber giving infinite cloaking
+	- Files
+		dlls/ns.dll
+		dlls/ns_i386.so
+		dedvars.txt
+		skill.cfg
+		listenserver.cfg
+		server.cfg
+
+
+	- Rules
+		- Opposing tier one higher needs to have hard counter (cheaper, as easy to execute or easier)
+		- Like tiers should be competitive (like skill, like points)
+		- Opposing higher tiers can also enhance lower tiers to make competitive units no longer competitive (primal scream could make HMGs/siege fall, or tier-2 spores could work against scaled groups of tier-1 marines)
+		- Assuming equal resources, skill and scouting, both sides should be able to get to the same tiers in the same amount of time
+		- Tech tree changes: 
+			O Inf portal no longer required for anything (iron man!)
+			O Phase gates need research at observatory
+			O Scanning needs research at observatory (same as phase?)
+			- Prototype lab needs advanced armory
+			O Small upgrade for deployable health required at command center
+			- Each observatory capable of one scan every x seconds, once researched
+			- Siege tech researched, then siege can be built at any turret factory (?)
+			- Time/cost for jetpack/HA research increased to make it tier 3
+			- Only advanced armory and advanced proto lab can build advanced stuff (unlike siege).  This way they can be destroyed to knock stuff out of production for awhile.
+			- Hives need to be cheaper to make it easier for aliens to get them earlier, and to allow aliens a choice of build order (though maybe extra resources at start compensate)
+			O Add electrical upgrade for TFs and nodes to prevent lone skulk from taking them out.
+			- Increase cost of advanced armory, decrease weapons cost?
+			- Healing spray should be able to corrode welds after a time
+			- Think about hotkeys to make sure they work with this new model (they do)
+			- Now that games are shorter, resource nodes may need to be more expensive (?)
+			- ** Alien lifeforms are unchained from hives, to compensate from location-dependence of alien tech tree.  Notably, this means a tier-1 onos (though hard to get), could counter tier-2 marine tech (HMGs) and maybe be competitive with tier-3 marine tech
+			- Remove blast damage on xenocide, possibly change damage, possibly change energy requirement and countdown time to make it good vs. HMGs
+			- Maybe jetpacks need to slowly heal armor/health automatically to give them a chance vs. acid
+			O Movement chambers give energy instead of teleport
+			O Bile bomb doesn't damage players ("structural damage")...is this going to feel weird?
+			O Remove spike gun
+			O Change OCs to fire spikes
+			- New Onos movement physics?
+		- This should work for marine/marine and alien/alien too
+		- Bite, parasite, leap (?), xenocide (?) (currently, skulks just get better, they don't really counter anything, though late-game zerglings do the same)
+		- Spit (tweak to make more useful or interesting?  Slow enemy?), healing spray, bile bomb substitute, web
+			- Bilebomb changed to be slower and non-parabolical
+		- Bite2, spores (weaker, as support role), umbra, primal scream (ROF slightly, damage upgrades, all affected immediately make squealing noises)
+		- Swipe, blink, hive-teleport (or teleport to blip under attack?  Rejuvenate, to get health/energy back?  Launch moth from cannon that flies attacks and distracts targets?  Ability converts health to energy <"digest", "expend", "deplete", "amplify", "heighten", "guzzle">?), acid rocket
+		- Gore, Stomp, Devour, Charge
+			- Devour
+				O Knocks person out of combat for a bit while they're digested, though they appear again if Onos dies
+				O Show "Being digested..."
+				O Change sound effects while inside
+				O Make screen go black, change HUD
+				O Show "Devouring MonsieurEvil" with status bar
+				- Progress bar is 0
+				O Aiming issues
+				- View model issues (wait for new view model to fix)
+
+			- Stomp 
+				- Enemies on ground within radius get view shaken hard, can't move or fire for short time
+
+		O New research tech/icons
+			? Deployable health tech (use medlab icon)
+			? Phase tech (needed for both phase and scanning)
+			? Electrical defense
+			? Don't show upgrades that can be researched multiple times when already researched (advanced armory, advanced turret factory)
+			? Don't show upgrades that can't be researched multiple times after started researching or researched
+
+		- Animation changes:
+			O Lerk: add primal scream
+			- Fade: add "guzzle"
+			- Onos: add devour, stomp
+				- Waiting for view model
+
+		- New sounds:
+			- Primal scream adapted for lerk?
+			- Bile bomb sounds changed to sound like it's dissolving structures?
+			- Guzzle sound (liquidy, metabolic)
+			- Devour sounds (one for attack, one for onos-killed and guy pops out, one for devour finished <burp?>)
+			- Ground stomp
+			- Electrical sound 
+
+
+
+Design problems
+	- At three hives, marines can't counter Onos because both Fades and Oni are always seen
+	- They need options to start, but can't grow too fast.
+		- Random resources (with 2 "chances" to grow <ie, two players that can build nodes>?)  40, 20, 10, 10, 10, 10, 10?
+		- Maybe spawn some players as gorges to start ?!  1/4 rounded up?
+		- Allow gorges to pull resources from nodes by holding their use key?  
+			- Then teams could go multiple gorges if they wanted, but it would be risky!
+			- Could be just the mechanism to make expansion as difficult for the fast-moving and responsive Kharaa as it is for the marines.  The gorges would need protection.
+			- Aliens can't pull resources from occupied nodes.  Rewards taking nodes that are farther from spawn and harder to protect.
+			- Gorge cost would have to be higher to make sure aliens don't spend time sucking on nozzles and never building towers
+			- Beautiful part is that gorges can't share the same node, so it scales well for big teams (because effective growth limit is capped by nearby nodes)
+			- Makes silence much more useful for gorge too
+			X Tradeoff between long-term growth (by sucking on node a lot) and short-term (building node immediately?)
+
+1.1b
+----
+	O Holding crouch while selecting units lets you add to the selection (still a bit wonky)
+	O Added missing welder icon to the armory
+	O Resources in each nozzle increased from 150 to 300
+	O "Scent of Fear" renamed to "Danger Sense" (you won't see this without client update, oh well)
+	O Added "sv_restart" ("sv_restartround" also works)
+	O Fixed changelevel/auth problem
+	O Fixed nodes not being buildable by aliens (also fixes the "dropping" effect when building towers for either race).  Any nodes that can't be built now are actually too small and need to be enlarged (but I didn't find any).
+	O You now need 1/2 the team to be gorge to double your resource intake (instead of 1/3)
+	O Stomp no longer affects the commander, or jetpacking marines
+	O Spore damage increased from 3 to 4 (per .8 seconds)
+	O Increased Onos cost from 55 to 65 (they were way too prevalent)
+	O Put infinite resources back in
+	O Removed auto-healing for alien structures until fixed
+	O Hive 45->50, gorge 13->15, fade 45->55, onos 65->85
+	O Fixed stomp (doesn't affect flying jetpackers but does go through walls)
+	O Numbers no longer draw near select all button or hotgroups
+	O Added welder icon to advanced armory
+	O Structures and players now uncloak when they take damage
+	O Fixed auto-healing for structures
+	O Structures won't play their take damage animation unless they're built
+	O Structures that take damage while being built, retain that damage when finished
+	O Added armory equipment back onto equipment menu
+	O Switched position of distress beacon and motion-tracking for consistency
+	O Jetpack energy/force tweaked (it felt sluggish with new timing fixes)
+	O Lerks and jetpackers no longer take falling damage
+	O Onos claw damage reduced from 120 to 90
+	O New resource model tweaks!  All aliens start with 20 resources.  Gorges can "draw" resources out of unoccupied nozzles with their use key.
+	O Upgrade chamber costs increased, higher lifeform costs brought back to 1.04 levels, except gorge which now costs 20.
+	O Chambers and players become uncloaked when taking damage
+	O Danger Sense renamed back to Scent of Fear (it does sound too much like a super-hero ability)
+	O Acid rocket energy cost reduced from .26 to .2
+	O Don't allow players that are being digested to suicide
+	O Digesting players count as dead players for determining game victory
+	O Added gross digestion artwork
+	? Animated digestion and gestation overlays
+	O Welder deploy time reduced slightly because it felt sluggish
+	O Replaced lerk bite with spikes
+	O Spore damage increased from 4 to 5
+	O Spike energy cost reduced slightly
+	X Allow voice comm buttons for commander
+	O Fixed seeing incorrect motion-tracking or hive sight briefly when switching targets while observing
+	O Smooth interpolation of alien energy bar (finally!)
+	O Health research time reduced from 40 to 20 (cost is the important thing, not time)
+	O Phase tech time reduced from 100 to 60
+	O Phase gates reduced from 25 to 20 (now that phase tech is needed)
+	O Fixed round reset problems
+	O Heavies and jetpacks show up in ready room
+	O Always play proper lerk death animation
+	O Server ops and developers can end the game without cheats on
+	O sv_restart/sv_restartround preserves teams properly
+	O Stomp particle system tweaked so there are less rings
+	O Devouring gives Onos the health that he takes from his meal
+
+1.1c
+----
+	O Fixed various height problems for voice icons
+	O Now draw names above players heads in ready room
+	O Increased bile bomb damage
+	O Completely reworked many costs on both sides.  Alien upgrade chambers more costly but more health, resource towers more expensive on both sides (takes 3.3 minutes to recoup investment, so don't place them without careful consideration), electrification more expensive, much more.
+	O Reduced CC, TF, Armory ranges so they don't take up whole screen
+	O Creating a hotgroup now removes those entities from other hotgroups (more intuitive and easier to make squads using select-all)
+	O Changed numeric events to draw as floats (needed so handicapping displays proper resource amounts above nodes)
+	O Weapon help is now automatically updated from server when damage values change (also added help text for devour and stomp)
+	O Electrical upgrade reduced in damage (12 to 10) and electrical effect duration shortened (reduce time when electrical effect goes across the wall after redeeming)
+	O Fixed visual artifacts when being digested
+	O Allow spectators to see cloaked entities as if they are the player they are following, or as if they are on the same team as the alien otherwise
+	? Limit marine entities in radius to prevent server crashing with mines (like alien structures and webs)
+	O Fixed bug where sometimes a structure wasn't created but it took the points anyways
+	O Fixed bug where turrets would power down near advanced turret factories
+	O Fixed bug where structures didn't start with full health
+	O Fixed welding problems
+	O Welder damage reduced from 7 to 4 (to prevent abuse)
+	O New weapon and reload sounds (testing)
+	O Rewrote mines.  They now function as proximity mines only, and never show trip lasers.  They work against Oni, and also work properly when you place them, switch teams, then set them off.
+		O Fixed mine bugs where Oni didn't set them off (they have bigger proximity range so you don't have to actually touch them)
+		O Problems when placing them on moving entities still
+		O Mines need to damage the player that placed them after switching teams
+		O Mines don't blow each other up
+		O Mines can't currently be destroyed by spit, acid or anything else
+	O You can no longer go to the ready room while being digested
+	O Fixed bug where being healed by a DC/Hive/Gorge causes regeneration not to work
+	O If you die while evolving, screen still has gestation overlay in view mode
+	O Much better support for first-person spectating (digestion and gestation overlays, jetpack/upgrade indicators, resources, energy, more)
+	O Added new HLTV icons for various lifeforms (thanks Relic!)
+	O Added new sound for phase gates, to differentiate between infantry portals (testing)
+	O After joining a team but before the game starts, players can only hear others on their team, spectators or ready room players (only affects tourny mode, allows pre-game planning)
+	O When tournament mode is enabled, voice can no longer be heard by spectators (preserve their strats and privacy).  When not tournament mode, observers can hear the whole team.
+	O When spectating first-person and it isn't tournament mode, observers can only hear players on that team
+	O Updated alien crosshair
+	O Experimenting with new hive sight icons
+	O Fixed bug where the wrong view model was sometimes displayed while spectating first-person
+	O Distress beacon cost points again (15)
+	O Fixed bug where observatory couldn't scan when it got to 100 energy
+	O Fixed bug where resources were adding with multiple resource towers (I think this just snuck in for 1.1b and could explain some things)
+	O New version of ns_atomicmass (ns_atomicmass25)
+
+1.1d
+----
+
+
+1.1e
+----
+	- New playtesting console means the game can be altered on the fly
+		? Add time/date to logged balance change
+		? Don't allow commands to work while editing (chat, kill, etc.)
+		? Stop capturing key input when playtest screen is gone
+		? Add floats to it
+		- Make screen look presentable
+		? Tweak server-side a bit to allow data to be propagated as soon as it's changed
+			? Pop-up menu costs
+			? Commander mode costs
+			? Even weapon costs
+		- Fix mystical floating zero above armor
+		- Last entry isn't in list
+
+	O Merge with Max's check-in
+	O New command to force uplink
+	O New model rotation for skulks
+	O Added building notifications so players can see what their gorges and commander are building, and where
+	? Skulk rotation freeze fix
+	- Linux testing
+		O Get assets updated
+		- Get it building again
+		 
+	O Decide on out of game menu
+		O Change playtesting menu to popup only if DEBUG or AVH_PLAYTEST_BUILD
+
+	O Fix server-op auth status
+
+	O Decide on electrified nodes and hive-requirements for gestation
+	O Moved 'game won't start until both teams type "ready"' into titles.txt
+	O "entityinfo" "endgame", "sv_restart", "sv_restartround", "numents", "addcat", "removecat", "nschangelevel", "switch", "spawnhive", "killhive", "giveupgrade" and "removeupgrade" all work for playtesters or developers on playtest builds
+	O Fixed getting stuck in own structures as gorge
+	O Fixed parasite drawing/propagation for players
+	O Fix bug where sv_restart messed up commander
+	? Existing tooltips and reticle help don't draw when cl_autohelp is 0
+	? Added AVH_LAN_PLAYTEST_BUILD build directive to allow PTing on a trusted LAN (Iron Lore)
+	? Don't play hints sounds unless the team has more then 1 player
+	O Fix commander scrolling
+	O Fixed phantom 0 above armor (introduced by playtest variable back-end)
+	O Lerk now shoots umbra like his spores, allowing him to defend at a distance
+	O Reduced spike damage back to 16, reduced spores energy cost from .6 to .4
+	? Removed visible lerk projectiles (make sure spike hit effect and ricochet plays)
+		- Spikes cause teammates to bleed even when they don't take damage (marines show sparks too)
+	? Spectators now become spectators again on game reset
+
+	? Increase marine buildable limit
+	? Added missing "selectall" sprite
+	? Removed floating player names in ready room
+	? Stunned players can no longer fire their weapons
+	? Healing spray now works under water
+	? Added beta server op status
+	? Fixed game reset problems (and sv_restart while commanding)
+	O Fixed mine view model animations, lowered volume of mine deployment 
+
+First vet beta
+--------------
+	O Reworked resource nozzles, which should solve problems where sometimes gorges couldn't +use them and may have been slowing resources on both sides.  Improved look of particles.
+	O Fixed "nschangelevel", "endgame", "tournymode" and "sv_restart" commands so everyone can execute them.  Please, don't abuse them!
+	O Balance change: "kSporeDamage" increased from 6 to 9
+	O Balance change: "kFadeCost" lowered from 55 to 45
+	O Balance change: "kFadeBaseArmor" increased from 125 to 150
+	O Balance change: "kGorgeBaseArmor" increased from 50 to 75
+	O Balance change: "kInfantryPortalBuildTime" lowered from 20 to 15
+
+Second vet beta (v1.1h)
+-----------------------
+O Stomp fixed so it doesn't affect flying jetpacks (also, can't use jetpack once you're stunned)
+O Stomp range decreased from 350 to 250 (it didn't look right with sprite)
+O Marine tech building build time reduced approximately 20-25%
+O Changed weapon "weights" so mines and welders don't always become current when picked up
+O Resource nodes that are upgrading electricity now give resources in the meantime
+O Changes to reduce or fix "Can't allocate 128 hud sprites" error
+O Added "HVY" scoreboard designation for heavy armor, plus HLTV icon
+O Changed "GORG" to "GRGE" in scoreboard
+O Decreased gorge draw amount from .5 to .4 resources per second
+O Increased Xenocide damage from 200 to 240 (need to be able to kill stock marines at close range)
+O Increased grenade launcher damage from 90 to 150 (does double damage to structures)
+O Decreased armory build time from 20 to 15
+O Decreased infantry portal build time from 15 to 12
+O Increased gorge gestate time from 13 to 15
+O Added new hive sight icon for gorges, so they can be easily located and protected (thanks Immacolata)
+O Removed alien sayings from hive sight ("player is building here")
+O Onos speed reduced slightly, so he can't outrun stock marines (standard marines and Oni both now run at 206)
+O Turret factory build time reduced from 18 to 13
+O Turret factory siege upgrade time reduced from 30 to 22
+O Stomp energy cost increased from .25 to .3
+O Phase gate cost lowered from 20 to 15
+O Phase tech research time lowered from 60 to 45
+O All turrets acquire targets faster (affects offensive chambers, sentries and siege cannons)
+O Lowered death messages while spectating in map mode so they aren't obscured
+O Fixed flashlight resupply exploit
+O Added mp_limitteams server variable (works like CS)
+O Mines no longer ever damage friendly teammates or structures
+O Fixed bug where you can't fire weapons after commanding
+O Fixed bug where killing turret factories didn't deactivate turrets
+O Killing marine structures now removes their upgrades temporarily.  They are regained when the structure is rebuilt.  This works with all upgrades (notably motion tracking on the observatory, and armor/ammo upgrades on the arms lab)
+O Lerk health increased from 60 to 75
+O Gorge health increased from 100 to 125
+O Movement chamber cost increased from 15 to 20
+O Defense chamber health increased from 1000 to 1200
+O Only draw "x health received" message when mp_drawdamage is 1
+O Increased Onos gestation time from 30 to 38
+O Fixed bug where hives weren't starting fully healed
+O Increased hive hitpoints from 6000 to 7000 to make up for hard-coded armor value that was removed
+O Gorges suck resources from nodes slower as they "fill up"
+O Possible fix for first-person spectating crash
+O (Fix bug where marines can attack their own RTs)
+O Throttle sayings so players can't spam chuckle or other sayings
+O New blink!  Fades can now quickly maneuver in combat, moving quickly and becoming hidden as they blink.  Hold your fire button to try it out.  No more getting stuck.
+O New Gorge jump and death animations
+O New skulk model with a better run animation and a parasite animation (thanks Mojo!)
+O Fixed bug where alien vision mode would glow entities in the ready room
+O Fixed game time not showing properly on scoreboard
+O Fixed "draw game" victory condition in tourny mode when time limit hit
+O Fixed bug where text sometimes isn't visible in ready room
+O New eclipse
+O New lost
+
+Third vet beta (1.1i)
+---------------------
+O Improve balancing interface for Blizzard
+	O Added overmind logo, nice highlighting and moved buttons around
+	O Make sure keys don't enter into labels when screen is down
+O Fixed server crash when joining/leaving teams after game ended properly (thanks Prodigy)
+O New sprites from Relic (death by electricity sprites, new onos ability sprites, crosshair tweaks)
+O Fix offensive chambers super-high health (changed from 4000 to 1200, not sure how this happened in the first place)
+O Fixed heavy armor not working properly
+O Lowered grenade damage from 150 to 140
+O Apply less force to jetpacks according to weight.  Means HMGers are less maneuverable then LMGers.
+O Fixed various alien view model problems (onos paralysis view model showing up on spawn, gorge deploy not playing when he spawns)
+O Fixed invisible view model when specing FPS in HLTV
+O Fixed bug where typing spectate into console wasn't removing player from the team
+O Fixed death messages overlapping hive info
+O New stomp sound
+O New HMG sound
+O Sensory chamber cost lowered from 20 to 15
+O Sensory chamber build time lowered from 18 to 14
+O Alien resource health lowered from 4000 to 3200 (they took forever to kill)
+O Spore damage increased from 9 to 10
+O Marine bunny-hopping addressed: When marines land after a jump, they are slowed down a bit (like CS), so speed can't be increased by jumping repeatedly.  You can still hop to your heart's content as alien.
+O Capped air speeds, so lerk and jetpacks can't go infinitely fast (celerity for lerk is now meaningful).  All player airspeeds are 2x that on the ground (leap, jetpack, flight).
+O Reduced lerk wingflap energy cost from .06 to .04 to encourage shooting while flying.
+O Phase gate and infantry portal play different sounds
+O Phase gate emits sound at both ends
+O Spectators now follow players through phase gates or movement chambers
+O Spaced out ammo/health/order requests on commander HUD
+O Shrunk the sentry, offense chamber, defense chamber, sensory chamber and movement chamber slightly, to allow players to jump past them yet not intersect them too much when standing on them
+O Shrunk the Onos health ring (it was out of control before)
+O Silence upgrade now affects building placement sounds also.
+O Disabled wall-running on players (prevents weird visuals and skulks that can climb on each other)
+O Don't draw tooltips when spectating
+O Rewrote alert system.  Jump will go to the last alert, no matter what it is.  Alerts now time out after 20 seconds (including ammo, health, orders).
+O Don't draw player name tooltip for commanders (names always draw so it's redundant)
+O Fixed "we need builders" hint playing when team had gorges but they were evolving traits or were still evolving to gorges
+O Fixed shotgun reloading bug
+O Clear tooltips on role change (test by getting tooltips, spectating, then switching back to play mode quickly)
+O New veil
+- Rework info display for commander
+	? Don't show entity hint when mouse is over the UI
+	? Get rid of ugly center text and use tooltip
+	- Fix energy display
+? Refactor to improve HLTV first-person spectating
+	? Get rid of roles entirely, and look at iuser3 instead
+	? Fix role sounds (PlayRandomRoleSound in AvHPlayer)
+
+
+Fourth vet beta (1.1j)
+----------------------
+O Yet More Resource model changes:
+	O Removed sucking (not sure it could work)
+	O Added variable point reward when aliens make a kill.  The killing player gets 1-3 resources (randomly) for the kill.
+		O Encourage more group movements for marines, speedier end-games when aliens has decisive advantage, promote more conflict in general, and reward great alien players with higher lifeforms, allow aliens a way to grow without building RTs
+		O Addresses long end-game against stock marines at marine start
+		O Lowered offense chamber build time
+		O Lowered alien resource node cost and health (they only cost 10, but are roughly half their old health)
+		O Changed gorge, fade, upgrade chamber, OC and hive costs to reflect new model
+		O Marines no longer drop their weapons when they die.  Lowered shotgun (15 -> 10), HMG (25 -> 20) and grenade launcher (30 -> 25) costs slightly to compensate
+		O Hive build time and armory upgrade time each reduced from 180 seconds to 120 seconds (encourage early upgrade option and tier 2 response)
+
+O Added player's location to all chat messages
+O Bile bomb damage increased from 180 to 250 (increase bile bomb damage even more (do War III catapult calculations) (allow it to do a little damage vs. players to make it intuitive?))
+O Fixed heavy armor not starting with full armor
+O Hive now emits umbra around spawning players, and also occassionally around itself when under attack (to lessen spawn camping and instant hive death).  Hive health reduced from 7000 to 3500 to compensate.
+O Umbra and spore particle systems lessened to decrease slowdowns.
+O Alien regeneration lowered from 4% per second per level to 3% per second per level
+O Changed organic structure regen to be a fixed amount, not a percentage (now it's 5 points per second)
+O Cloaked players are no longer show up on motion-tracking
+O Electrical damage increased from 10 to 12 (skulks should NOT be able to singly take out these, and electrified nodes are still falling all the time to 1-hive single aliens)
+O Jetpack cost reduced from 20 to 15
+O Fade blink energy cost increased as temporary holdover until fix
+O New version of eclipse: little lighting tweaks and overall brightening.  Known bug: locations are no longer user-friendly.
+O Added sound that plays when players receive resources (from "givepoints" or from kill).
+O Unchained marine armor and weapon upgrades from other structures (they are all available once an armory is available)
+O Changed Onos abilities around: now it's claws, charge, stomp, then devour (reduces overall amount of devouring, and allows Onos to function as early base breaker, but not mass destroyer, also means he can be used early without movement upgrades).  Also lowered rate of fire on charge to avoid useless spamming.
+O Movement chambers now energize offense chambers and hives.  OCs fire faster, hives spawn faster.
+O Inactive hives no longer draw for marine players (allows sensory to be used to hide hives)
+O Preserve current spectate mode so it always starts up in the last mode you were in
+O Play role help text only once per game
+O New Fade Hive #2 ability: Metabolize.  Drains energy when used, but for the next second, converts incoming damage into energy.  Depends player knowing when he's going to get hit, and using it to maximize his energy. (kinda like the Utwig from Star Control II).  Sounds are placeholder.
+O Backed out mine-can-be-killed change.  There are engine problems with this, and will have to be addressed another way if it's still a problem.
+O New siege sounds (now with more bass), new offense chamber sound to differentiate from spikes (thanks MadMaxx!)
+O You now stop blinking when you're out of energy
+
+Passwords:
+1.1E Client Patch (108MB - 108950153 Bytes):
+http://www.natural-selection.org/protectdl...atch042503B.exe (Install password: ch1b1z0r)
+
+1.1h patch:
+http://www.natural-selection.org/protectdl/ns-v11h.zip (5.5 megs, .zip password is "onos")
+
+1.1i patch:
+http://www.natural-selection.org/protectdl/ns-v11i.zip (5 megs, .zip password is "ch1b1z0r")
+
+1.1j patch:
+http://www.natural-selection.org/protectdl/ns-v11j.zip (3.7 megs, .zip password is "0nos")
+
+Reminder: Any leak of these passwords, files or screenshots results in removal from NS PT status. Thanks!
+
+The installation will prompt you if it detects you are running NS 1.0 and ask to back it up for you.
+
+1.1k
+----
+O Points only awarded to aliens, no marines (bug)
+O Marine ammo and armor upgrades back to 1.04 values (20/40/60 instead of 20/30/40)
+O Hive health increased from 3500 to 5500
+O Increased alien resource tower health from 1500 to 2500
+O Shotgun damage decreased from 16 to 15 (per pellet)
+O Both teams get a minimum resource flow of 1 resource point at all times (to keep a team in the game if they lose all their RTs)
+O Lowered bile bomb damage from 240 to 225
+
+O Grenade launchers now require advanced armory and prototype lab instead of advanced armory and arms lab
+O Increased gorge gestation time from 15 to 20
+O Increased lerk gestation time from 18 to 21
+O Lowered sentry build time from 13 to 10
+O Temporary experiment: increased alien spawn time from 8 to 11, increased marine spawn time from 10 to 14
+O Sentries no longer target cloaked structures
+O Hive build time increased from 120 to 180
+O Hive cost increased from 30 to 45
+O It now takes 120 seconds before any resource tower starts giving resources for the team
+
+X Lowered alien resource tower health from 2500 to 2000
+? Lower bile bomb damage more, make it shootable?
+
+1.1p
+----
+O Removed health upgrade
+O Heavy armor is now immune to spores (the model has a gas mask anyways)
+O Offense chambers increased to 10 points (health is 1200)
+O Electrified structures are _still_ being killed by groups of coordinated hive-1 alien.  Increased damage to 30, and max targets to 3.
+O Increased phase gate health from 2000 to 3000
+O Changed onos ability ordering back to gore -> stomp -> devour -> charge
+O Put marine resources for kills back in.  The marine sound is placeholder.  Play rising numeric effect at point kill was scored.
+O Changed handicapping to reduce damage done instead of affecting resources (means build orders and tech are the same, but battles are harder for handicapped teams).  Handicapping only takes effect in tournament mode.
+O Marine resource tower cost lowered from 20 to 15
+O Lowered bile bomb damage from 225 to 200
+O Slowed resource gathering rate from 1 point every 4 seconds to every 5 seconds
+
+1.1q
+----
+O Sensory chamber range increased from 600 to 750
+O PR document merging MonsE's ideas and mine, mail to Bailey and Ned for discussion
+O FAX legal documents to Kevin
+
+O Teams no longer get minimum 1 resource (now that resources for kills are on both sides, this should address problem where marines can tech too high without expanding)
+O Widened HMG firing cone so MG is more accurate.  Keeps it good against big targets.  Increased from 6 degrees to 8 degrees (it was 10 in v1.0x)
+O Increased turret factory radius from 300 to 450 to adequately defend areas
+O Added new electrical sounds when getting zapped (thanks Dave)
+O Starting res node gives resources immediately without having to "activate"
+O Lowered grenade clip size from 6 back down to 4 (for upcoming new artwork and to reduce spammage)
+O Change lifeforms back to 2 and 3 hive model.  Reduced Fade cost from 75 to 50.  See if lockdowns can still happen.  I cannot make up my mind on this, but want to try it the "old" way one more time.
+O Increased jetpack thrust from 1100 to 1250
+O Hive cost decreased from 45 to 30
+O Removed carapace slow factor
+O Handicapping can be set during the match
+O Your team's handicap is now drawn on the HUD (please test this!)
+O Default late-join time increased from 60 to 90 seconds
+O Gorge armor reduced from 75 to 50 (gorge rushing is great, but not every game)
+O Gorge gestate time reduced from 20 to 17 (previously increased because of alien res problems because of sucking)
+O Respawn time for aliens lowered from 11 to 10
+O Respawn time for marines lowered from 14 to 10
+O Sentry health increased from 1200 to 1400
+O Armory cost reduced from 25 to 20
+O Lowered marine structure build times
+	O Prototype lab build time reduced from 35 to 25
+	O Sentry build time reduced from 10 to 7
+	O IP build time reduced from 12 to 10
+	O Observatory build time reduced from 20 to 15
+	O Resource tower build time reduced from 18 to 15
+	O Arms lab build time reduced from 30 to 23
+	O CC build time reduced from 25 to 20
+O Armory resupply time sped up a bit
+O Changed xenocide damage type from "blast" to "normal" (no longer does double damage vs. structures, use against HA, use bile against structures)
+O Umbra duration lowered from 10 to 6 (to try to allow marines a chance to rush early and to workaround problem where particles disappeared before umbra effect)
+O Phase tech cost reduced from 25 to 15
+O Fixed HA starting armor points
+O nschangelevel, sv_restartround, spawnhive, killhive, etc. now all tell everyone on the server who executed the command
+O Fixed rounding problems with carapace and weapon upgrades
+	- Before:
+		- MG l0: vs skulk: 11/13/18/21
+		- MG l1: vs skulk: 10/12/16/19
+		- MG l2: vs skulk: 9/11/15/18
+		- MG l3: vs skulk: 8/10/14/17
+
+	- After removing damage off the top:
+		- MG l0: vs skulk: 11/12/14/15
+		- MG l1: vs skulk: 9/11/13/14
+		- MG l2: vs skulk: 9/10/12/13
+		- MG l3: vs skulk: 8/9/11/12
+
+O Changed stomp from radius to shockwave (increases skill, gives enemies a chance, means onos can kill groups of heavies with help, not by himself).  Still needs new visual effect.  Enemies show stomp rings when they are hit.
+
+O Fade changes
+	O Acid rocket is now hive 2, metabolize is hive 3
+	O Acid rocket damage decreased from 60 from 50
+	O Fixed acid rocket idle
+	O Added metabolize view model animations (thanks Def One!)
+	O Metabolize now functions only when you're holding down the attack button
+	O Change metabolize so fade can't move while using it?
+	O Added force where rocket hits (only affects enemy players...rocket jumping!)
+	O Acid rockets now affect the firer again
+
+O Fixed bug where spit could hurt things it didn't look like it was hitting
+O Fixed bug where spit, bile bomb, and web projectiles sometimes hit the player shooting it (esp. with celerity)
+O Fixed bug where killing alien upgrade structures weren't removing upgrades
+O Fixed game reset problems (sv_restart, sv_restartround, regular game end)
+O Added default HLTV setup (.cfg, .bat)
+O New HMG sound and sentry deploy sound (thanks Dave)
+
+1.1r
+----
+O Removed hive restrictions again because of stalemates.  I'm glad we tried it this way one last time, and I'm finally convinced that this new approach can work.
+
+O Encourage and allow both sides to convert resources into immediate, limited, offense
+	O Decrease OCs to 5
+	O Increase shotty damage from 15 to 17
+
+O Don't allow onos to stomp with 1 hive.  This means an Onos won't wipe out marine base easily (and he can't flee so easily).  Charge at last hive facilitates game-end (as he can get nodes, and attack and respond quickly)
+	O Gore, Devour, Stomp, Charge (swapped Stomp and Devour)
+	O Reduced base Onos armor from 200 to 150
+
+O Increased blink cost from .03 to .05
+O Fixed stomp going through walls (though you may still see visual effect go through).  Structures or players won't block stomp, only world geometry.
+O Fixed spit hurting friendly players/structures
+O Need marine counter vs. stomp (one that works everywhere, not only where you can jetpack effectively) (now it's flanking and/or surrounding him!)
+O Grenades don't shoot with as much force now to prevent easy base spamming
+O Added mp_killdelay (seconds before suicide happens)
+O Work to help fix 128 sprites crash again (removed 10 extra unused minimap sprites, let me know if anyone sees this error again, it could come back)
+O Fixed gametime not showing when server name was empty
+O Fixed game reporting when a draw occurs (esp. in tourny mode).  Now reports victory_team and losing_team as "draw".
+O Game reporting indicates minutes and seconds of victory, instead of seconds (eg, game_time "13:29")
+O Resources earned for kills now added to score in tourny mode
+O Game reports score for team in log (always resources gathered)
+O New version of ns_lost (all new marine start, lots of other changes)
+O Temporarily increased skulk bite damage by 1 point as a holdover to fix new 3 bite marine kill caused by previous rounding fix
+O New HMG sound, new sound for when marines get points from a kill (flush of nanites)
+
+O Ubisoft schedule
+	- 3 or 4 steps
+	- Pre-pro/negotiation then milestones
+	- 1 page
+	- Small test, big test
+	- How much time
+	- Ubisoft, but CC Jason -> carlod@ubisoft.com
+	- Needs full home/business address
+
+1.1r-b
+------
+O Cloaking upgrade sound volume halved
+O Electrical research time increased from 30 to 60
+O Fixed sprite bug that showed random crap on your screen when you took damage (instead of red HL arrows)
+O Fixed server crash caused when building an OC then switching teams, then being hurt by that OC 
+
+1.1s
+----
+O Fixed ALL melee problems where skulks can't hit marines in corners, where they can bite through floors, etc. (!!)
+O Security fixes
+O Changed default network settings to fix choke issues
+O +resource messages should clip to commander UI
+O Fixed "TooManyStructuresOfThisTypeNearby" not being translated
+O Rewrite HL turrets to fix accuracy problems.  They are nasty now, watch out.  They may still need more tweaking.
+	O Death from OCs now report damage from OC instead of spike
+	O Damage and health changed for sentries and OCs (they now do small damage evenly instead of randomly hitting you for more)
+O Lowered resource activation time from 120 seconds to 90 seconds for both sides to speed up alien game
+O Lowered electrical damage from 30 to 25
+O Removed remaining resource sucking code that sometimes made it tricky to build a res node
+O Lowered turret factory radius from 450 to 400 (takes up too much of screen)
+O Footstep changes
+	O New HA sounds (thanks Dave, just what I've always wanted!)
+	O Tried to synch up footsteps a bit better
+	O Gorge has pitter-patter now
+	O Walking now moves you roughly half-speed, and plays no footstep sounds.  Not working perfectly all the time, but it's better.
+
+O Added treadwater animations
+O Lots of alien health and armor tweaking (lots of values changed in small amounts to preserve following relationships)
+	- Kept number rounded to 25's or 5's whenever possible
+	- Most damage upgrades change the number of bullets to kill vs. every lifeform and carapace level (ie, they are almost all effective)
+	- Level III carapace generally adds 50% damage capability to all aliens
+	- Level III carapace generally takes more shots vs. level 3 weapons then no carapace can take against level O weapons (carapace shouldn't be mandator, but should remain useful throughout)
+	- Fixed three bite problem (reverted armor back to pre 1.1r levels, affects marines and aliens)
+
+O Knife and bite range decreased (they were both unrealistically long)
+
+O Fixed problems when aiming devour (no longer need to crouch)
+O Infantry portals and phase gates now check to be sure there is room for spawning-players when placing them
+O Aliens can no longer use phase gates (fixes Onos stuck problems and hopefully will encourage their use again)
+O Electricity is now blocked by walls
+O Onos gore attack now throws players around when he hits
+
+
+O Nate this weekend
+O Buy fax machine and printer cable
+O Sweep, organize 2nd table, set up office
+O Groceries
+O Call Ned 2nd shift tonight about server stuff and PR stuff (Constellation members playing)
+O Jeff tonight
+
+1.1t
+----
+O New version of eclipse
+O Revisit upgrades and alien health to make sure the scale is right
+O Reduced infantry portal health from 3000 to 2500 (attempt to reduced long alien win endgames)
+O Lowered electricity range so it's only used to protect target structure and for perceived fairness
+O Fixed bite/hull problem for good (I think)
+O Fixed OCs so sensory chambers cloak them again
+O Changed damage type on OCs so you don't see blinking O2 symbol
+X Increased probability and frequency of hive umbra (to make HMGs not able to take it down instantly and siege more useful)
+O Increased gore range to make it easier for onos to attack low targets
+O Increased volume on marine-kill sound
+O Fixed spectating problems when moving betweens spectator and play modes
+O Fixed game reset weirdness and teleporting around ready room (players that are dead stay dead, spectators aren't handled properly).  The only game reset problems I still know about involve welds.
+O Marines now get res for turret and siege kills.  The death message is credited to the commander.
+O Fixed possible server crash involving siege turrets.
+O Final versions of all new 1.1 sounds (thanks Dave!)
+
+O New version of ns_origin
+	- Fixed alien spawning/movement chamber problem in Ventilation and Biodome
+	- New sky
+	- Added ladder up to Biodome Observation window from within the Biodome
+	- Changed Ventilation hive vent so that it drops down into the room, so marines can't sit in the vent and fire at the hive
+	- Replaced Magma Pump room with Ore Scanner room. Mainly because I felt the Magma Pump was rather crappy, but also to make that area more skulk friendly
+	- HLTV overview files
+
+Commander mode fixes and improvements:
+--
+O Added fourth "equipment" menu to commander interface (means JPs and HA are accessible there instead of proto lab)
+O Reset commander UI when not commanding (fixes numerous little things that were weird when taking the chair after someone else or after logging out)
+O Reworked hotgroups/squads so they persist between commanders (so if you take over for another commander, you'll see the existing squads, not what you last had)
+O Draw tech requirements nicely
+O Draw "Required: whatever" in yellow when tech needed
+O Draw keyboard accelerator in parens
+O Don't draw mouse cursor when you have a ghost building unless we're over the UI
+O When choosing something to build, blank out all buttons but "cancel"
+O Make sure canceling of regular research still works
+O Going to hotgroup twice goes back to where you were (include goto request)
+O Draw no buttons or radii for building that's recycling.
+O Draw progress bar for recycling, and draw text saying as much
+O When drawing waypoint text, make sure it's not obscured by topdown UI
+O Fixed bug where extra structure tooltips would sometimes draw and never go away
+O Fix energy display (compute help even when energy entity selected)
+O Fixed problem where UI gets in weird mode and menus don't open
+O Holding crouch while selecting will toggle that unit's selection (useful for adding or removing players from group)
+O Removed umbra that the hive emits to protect itself (this may or may not be temporary, but seems necessary given marines inability to kill undefended hive with LMGs)
+O New grenade launcher artwork!  Thanks BathroomMonkey, Mojo, and Def one!
+O New Fade view model with metabolize support (thanks Def one!).
+O Metabolize no longer forces you to be still (not totally happy with this yet, but it will be revisited at some point)
+O Change electricity damage type
+O Electrify gives res for kill too
+O CC health increased from 8000 to 10000
+O Fixed bug where you could electrify or reycle the comm chair bug
+O Fixed bug where getting heavy armor didn't update the scoreboard status instantly
+O Reworked descriptions to be more then four characters (SKLK -> Skulk, etc.) (thanks Pyrul!)
+
+v1.1u
+-----
+O Added blood feedback when marines are hurt, and when alien structures are hurt.  Alien structures no longer spark for any reason. I made this change happily, and I don't feel like it compromises the vision of NS in any way.
+O Fixed location names on ns_caged
+O Reduced sentry cost from 10 to 5
+O Reduced xenocide damage from 240 to 200
+O Rework spores to be able to hold off groups of T1 marines, but fall to HMGs even while defending a hive (currently they can hold off tier 2 marines with enough lerks)
+	O Increased area of particle effect, to more accurately represent their area of effect.
+	O Spores do the same damage, but they do it more often, and they don't stack.
+	O Hoping to see more HMGs without HA
+	- Test this
+
+O Map gamma now gets set properly for HLTV spectators
+O Removed last momentum given to players with hit with various attacks (notably, skulks don't ever knock marines back any more, die bug die)
+O Can no longer create a hive if one is currently building
+O Never add parasite or Scent of Fear blips for Commander
+O Redemption no longer redeems dead players.  Redeem now will pull you back to a hive, even if you're close to it (better then dying).
+O Play redeem sound on both ends so attackers know what happened.
+O Slow down Onos a bit when digesting a player (to allow rescues)
+O Increased gorge armor from 50 to 75
+O Increased lerk gestate time to 28
+O Increased sentry damage from 10 to 12
+O Increased sentry health from 1000 to 1300
+O Skulk health is now 85
+O Turret factory cost reduced from 15 to 10
+O Armory upgrade cost redued from 50 to 30
+O Armory upgrade time increased from 120 to 180
+O Added new sprite for hives in hive sight and removed extra hive text (thanks Frogg2!)
+O Fixed up tooltips so regular HL messages can be displayed, and error messages still display when cl_autohelp is 0, also added server MOTD (you're welcome, Voogru!)
+O Reticle help and player names show instantly instead of fading in
+O Orient bile bomb properly
+O Spectators can only hear players talk in-game when it's not tournament mode, and when they are spectating first-person.
+O Entity info command works only for developers now
+O Now you can see your teammates' health and ammo percentage by looking at them.  Enemy player names are drawn without this info and in red.
+O New veil
+O Put in network debugging code to figure out what's going wrong when pings escalate.  This may have temporary overflow or HUD lag side effects.
+O Fixed when dropping meds quickly, cursor changes from med to IP (good one Mcclane).  Also means that your current menu panel doesn't change when selection changes if possible.
+O Commander mouse cursor draws when ghost structure selected (fixes disorienting problem when placing structures over the "void")
+O Fixed bug where selecting advanced build menu with menus didn't work right
+O Fixed bug where selecting a structure that was researching wouldn't let you out of it
+
+2.0v
+----
+O Major server performance improvement (should be really noticeable, but need to test)
+O Don't show health/armor for players in RR
+O Reduced arms lab and prototype lab build times to 19 and 20 respectively (from 25)
+O Fixed eclipse HLTV overview (thanks Cadaver and KFS!)
+O Fixed nancy mother hive title
+O New 2.0u version of linux!
+O Incorporate linux changes to P4
+O entityinfo only works for devs now, and is more useful for them
+O Added fix for r_drawviewmodel exploit, to make sure it can never be reset (Thanks Voogru!  Everyone, try everything you can to make your view model disappear.)
+	- (r_drawviewmodel 1;alias r_drawviewmodel "")
+O Initialize scoreboard map name to zeros before setting (drawing some garbage after it)
+O Fixed problem where mines were rotated incorrectly from commander view when dropping them
+O New marine blood sprites (only seen when red blood hits wall, ie, tourny mode).  Thanks Merks!
+O Added better animation debugging code for Def One
+O Marines play their run animation properly in the ready room (thanks Def!)
+O Removed legacy overwatch stuff causing error (missing bitmap font: gfx\vgui\fonts\640_OverwatchScheme.tga)
+O Removed view shaking from Onos and Fade melee attacks, and knife attack
+O Fixed Onos-stuck problem (thanks Max!!)
+O Crouching is now smooth as a Gorge's bottom (it only took a year, BathroomMonkey...)
+O Giving orders and dropping health/ammo/weapons works in almost all places (any areas where it doesn't work should be fixed by the mapper)
+O Sped up commander scrolling and removed acceleration for usability
+O Revise metamod entity list and send to Will Day and crew
+O New vet icon, PT and Constellation icons (thanks Squeal!)
+O Vet icons are now yellow, guide icons are magenta
+O Updated readme for 2.0
+
+- Performance tests
+	- It's somewhere in AvHGamerules::Think but it's not:
+//		this->UpdateWorldEntities();
+//		this->UpdateEntityHierarchy();
+//		this->UpdateBlips();
+	//this->UpdateCloakables();
+//	g_VoiceGameMgr.Update(gpGlobals->frametime);
+//	this->UpdateServerCommands();
+//	this->UpdateGameTime();
+//		PROFILE_START(kUpdateReinforcementsProfile);
+//		// Try to join any players that are waiting for a spot (bypass cost of reinforcements before game starts)
+//		// Players are put into reinforcement mode if there are no available spawns
+//		FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+//			if(theEntity->GetPlayMode() == PLAYMODE_AWAITINGREINFORCEMENT)
+//			{
+//				AvHTeamNumber theTeamNumber = theEntity->GetTeam();
+//				if(theTeamNumber != TEAM_IND)
+//				{
+//					this->AttemptToJoinTeam(theEntity, theTeamNumber, false);
+//				}
+//			}
+//		END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+//		PROFILE_END(kUpdateReinforcementsProfile);
+//		this->UpdateEntitiesUnderAttack();
+//			this->UpdateVictoryStatus();
+//			this->mTeamOne.Update();
+//			this->mTeamTwo.Update();
+// 	#ifdef USE_NETWORK_METERING stuff
+//			this->UpdateVictoryStatus();
+//	this->RecalculateHandicap();
+//	this->UpdateCheats();
+//	this->UpdateUplink();
+//	this->UpdatePlaytesting();
+//this->mMiniMap.Process();
+//AvHParticleSystemManager::Instance()->Update(theTimePassed);
+// Still at 40% usage on bast, 24 bots with all this commented out
+//this->UpdateCountdown(theTime);
+
+// It's one of the following: (29 bots on bast, 1% with everything included but the following!)
+//	AvHScriptManager::Instance()->Reset();
+//	this->InitializeTechNodes();
+//	this->PostWorldPrecacheInitParticles();
+//	if(inNewMap || (this->mSpawnList.size() == 0))
+//	{
+
+// Looks like one of:
+//	this->PostWorldPrecacheInitParticles();
+//	if(inNewMap || (this->mSpawnList.size() == 0))
+//	{
+
+// OK, it's the spawn thing.  Is this only because bots aren't able to spawn?
+// Commenting out all of AvHPlayer::Prethink except CPlayer::Think didn't have any effect
+
+// Seeing problem with almost no gamerules::Think
+// Problem isn't entityhierarchy::SetBaseLineSet
+// Problem likely: 
+//	this->InitializeTechNodes();
+//	this->PostWorldPrecacheInitParticles();
+
+// Summary:
+// It's not in AvHGameRules::Think. 
+// It doesn't appear to be in AvHPlayer::Think() anywhere
+// Overall CPU usage doesn't change when significantly when enabling/disabling entity caching.  I'm reducing AddToFullPack cost to essentially nothing.
+// CPU stays near zero until player count gets up to around 20-22 then it spikes
+
+// There is still excess CPU usage with bots
+//	Made aliens spawn as gorge, to check model-orientation performance
+//	Disabled all of AvHGamerules::Think except code inside first update
+//	Disabled all of AvHPlayer::PreThink() except CBasePlayer::PreThink() and RecalculateSpeed
+//	Build settings are without profiling, network buffering, nor balancing constants
+//	Next stop: AvHPlayer::UpdateClientData?
+//  Under this config it's botThink.  Remove that and try some other stuff.
+//  All of gamerules::Think is back in, and it affects the performance, but not by more then 7-10%
+//  Put 
+
+2.0w
+----
+O Fixed "too many upgrades for alien player" crash
+O Fixed 'give weapon_bite2' crash
+O Another new version of nothing (better lighting, vent addition, thanks for PTing it on FoR on Thursday!)
+O Removed debugging messages for MonsE
+O OC damage reduced from 25 to 20
+O Stomp wave artwork (still needs reorientation and shouldn't draw as black)
+O Electrical upgrade cost reduced from 20 to 15
+O Bilebomb changed back to arc instead of straight line
+O Bilebomb radius reduced from 500 to 400
+O Removed view shake on bile bomb
+O Bilebomb hit sound and particles plays more accurately (weren't being predicted properly)
+O Removed misc. movement abilities.  Now movement chambers give energy to nearby players, and allow them to teleport to hives, that's it.
+O Hive health increased from 5500 to 6000 (1.04 level)
+O Active resource node message is back in (removed by mistake, though it will be removed permanently soon, once balance is better)
+O Marines drop their weapons when they die again
+O Reduced jetpack cost from 15 to 10
+O Added explosive force to xenocide for aesthetic effect (thanks Nemesis Zero!)
+O Don't give energy back when evolving
+O Fixed sensories so they only start cloaking after they are built (broken with other recent changes)
+O Renamed "Mother" hive to "Noname" hive
+O Added in missing hive name to veil (veil_south)
+O Weld icons always draw, even without auto help enabled
+O Fixed bug where player would sometimes be spammed with help
+O Reduced phase gate build time from 15 to 12
+O Scan duration increased from 7 to 10
+O Fixes for not killing players at 0 health and also displaying 0% health/armor when looking at other players
+O Improved sentry/OC/siege turret tracking (still needs work but it's better)
+
+2.0x
+----
+O New origin:
+	- Made all important vents gorge-friendly, most notably the Ventilation->Ore Extraction and Ventilation->Biodome vent routes.
+	- Ventilation Hive: added extra cover and ambush points. Removed weld point. Made part of the walkway broken off to let skulks get up there quicker.
+	- Made ladder chamber up into the double node more skulk-friendly, in terms of wall-climbing.
+	- Moved hanging crate in double node room nearer to the control deck window, to allow marines to jump on there and clear out camping aliens more easily.
+	- Made Ore Scanner->Ore Extraction corridor a vent instead, to make marines more vulnerable when moving through there.
+	- Brightened up a few areas a tad.
+	- Made it so that vent grates cannot be shot through.
+	- Revamped Biodome - lower roof and struts should make it a bit less jetpack friendly. However, r_speeds are higher, so let me know if the resultant frame-rate drop is unacceptable. Also, nicer in terms of aesthetics now, IMO. Bit more cover too.
+	- Raised all alien spawns up off the ground by a fair bit, in order to combat the Onos-movement chamber-sticking problem. If this problem is still occurring, someone let me know ASAP.
+O New eclipse
+O New nothing
+O New veil
+O New mineshaft
+? New hera (new marine start, you can go back out on landing pad, added ambience)
+O New caged
+	- tweaked lighting a little (brighter in several places)
+	- altered the vent between the MS and the sewer area
+	- split the vent between shipping tunnel, generator and area02 into two separate vents
+	- added a few extra brushes to fix the 'leaking wall'
+	- turned the platform the node rests on in shipping tunnel to a world brush
+O Reduced spore cloud time from 8 seconds to 6 seconds
+O Reduced arms lab cost from 25 to 20
+O Reduced arms lab upgrade costs from 20/40/60 back to 20/30/40
+O Grenade explosion radius reduced from 350 to 275
+O Included world model of new grenade launcher
+O Fixed two linux bugs (code was confusing gcc optimizer and causing alien res towers to not be able to be built, also fixed blink and metabolize not showing up).  Thanks Joev!
+O Digestion fixes (turrets no longer fire at players being digested, available upgrades no longer blink when being digested)
+O Fixed marine and alien upgrades so they take full effect immediately but they preserve current percentages
+
+? Write up tech tree icons task for Cory
+? Write up HLTV task for Cory
+? Write Merks for hera update and new stomp
+
+O Heavy armor sparks instead of bleeds
+O Attacks that cause 0 damage no longer cause players to bleed (bilebomb)
+O News update to announce party at Adrenaline Zone and other news
+O Removed deathmessage and setskin developer commands (prevents deathmessage spamming with cheats on)
+O 'gtt' command renamed to 'tt'.  Playtesters and guides can use this command to give help to players.  "tt playername message text" sends tooltip to that player with your name attached.
+O Fixed invisible CC bug (http://www.natural-selection.org/forums/index.php?act=ST&f=29&t=37943&s=2cfbfe64ca76f37a8775b14fb742f07a)
+O Added support for external music directory (cl_musicdirectory), music delay (cl_musicdelay) and skipping tracks ("nexttrack")
+O Fixed sentry, OC and siege targetting 
+O Removed ns_nancy because of Onos stuck issues that can't be fixed without the map source. :(  Sad to see you go, it was great.
+O Added fenris ambience .mp3s to general ambience folder for mappers (thanks HyperGrip!)
+O Parasite only does damage to players to prevent "under attack" message when marking structures
+O Elec TF that is upgraded to siege does not elec any aliens till upgraded to elec again
+O Sentry health reduced from 1300 to 1200
+O Shrunk build/health ring around observatory
+O Fixed bug where comm chair restored players health and armor
+O Fixed bug where mines didn't take marine upgrades into account properly (rounding error)
+O Increased mine damage from 100 to 125
+O The Onos gore now does blast damage (double damage vs. structures), to help with lock downs and differentiate his melee from the other aliens
+O Fixed bug where you couldn't scan if you didn't have enough resources (even though scanning costs only energy).  Scanning no longer plays "phase in" effect.
+O Stomp model is now translucent (though may not be oriented properly still)(thanks Merkaba!)
+O Leaping, JPing and flying is now less restrictive on max air speed, so leap is back to nearly 1.04 level
+O Reduced hive healing of players from 30/second to 20/second
+O Hives no longer show up on motion-tracking
+O Reduced skulk health from 85 to 75 
+O Sentry and OC rate of fire decreased slightly
+O Chat location shows your location, not location of person typing (untested)
+O Reduced stomp range slightly
+O New blink (it works essentially the same way, but without ridiculous speeds and it works smoothly with latency and won't let you blink forever)
+O Fixed animation problem when crouching while holding the shotgun (thanks Def!)
+O Four new ambient music tracks from Hypergrip (the sound guy on ns_fenris)!
+O Fixed crash bug when devouring a player and going back to ready room (thanks Grepdashv!)
+O Fixed bug where MCs and DCs weren't auto-healing (thanks Grepdashv!)
+O Added heavy view model artwork (thanks Def!)
+O Fixed bug where digesting Onos that quits the server messes up player he was eating (please test...thanks Grepdashv!)
+O Tweaked reload speed of GL so it matches up with artwork
+O Added wound and death sounds for marines (thanks Dave!).  What do you think of these, cheesy, too gory or just plain good feedback?
+
+2.0y
+----
+O Fixed problem where disconnecting from server without hitting F4 caused major crashing, ghost players, maps not to reset or change and more.  Thanks Grepdashv!
+O Updated origin
+  - Fixed marine spawn (weldables reset properly, more spawn at marine start to allow marines to build and aliens to attack)
+  - Reduced commander r_speeds by lowering commander height
+  - Updated holo fade model
+O Increased hive cost from 30 to 40
+O Lowered sentry damage from 12 to 10, and lowered tracking speed
+O Lowered offense chamber damage from 20 to 16, and lowered tracking speed
+O Bile bomb radius reduced from 400 to 200
+O Increased prototype lab health from 2000 to 4000
+O Increased siege rate of fire from 1/5s to 1/4.5s (to increase the likelihood of two salvos per scan)
+O Fixed authentication check so it doesn't ping n-s.org more then once every 2 hours
+O Fixed bug where picking up a health pack didn't give you fractional health back (resulting in being permanently at 99 health).  Thanks Grep!
+O Particle system fixes.  Spit hit effect and acid rocket effect play properly now (thanks Max!).
+O Removed  'Can't send message "" of length 0' logging
+O Fixes for ALL cases of Onos getting stuck.  Also, structures should not be able to be built on players, ever.  This was quite a bit of work, and thanks to Max for working on this with me.  Please test this and e-mail me if you find a way to get someone stuck.
+O Fixed problem where sometimes death animations wouldn't play for skulks
+O Fixed Onos floating off the ground while standing, but hovers while crouching (thanks DrHugo!)
+O Added handicap message (like active resource nodes) that displays when handicapping is active for either team
+O Moved fade acid rocket back to hive 3 and reduced it's force push
+O HMG damage type changed to piercing (half damage vs. structures).  Damage increased back to 20 so it doesn't do less then LMGs vs. structures.
+O Protolab requirement removed for grenade launchers
+O Going to ready room while digesting doesn't stop digestion still (update digestion kills player, then ASSERT)
+
+Updated y (Wed. night or earlier, speed is of the essence)
+---------
+O Fixed spawning issues and loose weapon weirdness.  Note that due to these fixes, ns_veil, ns_eclipse and ns_mineshaft are temporarily unplayable.  They will be fixed ASAP.
+O Fixed recent bug where you could build resource towers multiple times
+O Fixed bug where observatory showed nearby alien structures and uncloaked players as blue circles on commander view, before it was built (thanks Grep!)
+O Halved umbra cloud duration (and energy cost, when shot by lerk), to lessen spawn umbra power
+O Tooltips now draw while dead (so you can see your respawning message)
+O Turned on ASSERT messages, so all players will see a message when the server normally would crash.  Please use these errors to find the frequent server crash where a player is no longer on a team when he should be (sound see something like "ASSERT FAILED: theTeam != NULL (AvHPlayer.cpp@6980)").  It would do me a great service to have all ASSERT messages reported, especially with instructions on how to get them to happen (post on PT or Vet forum).  This will help a huge amount!
+O Lowered grenade launcher reload time (thanks Def!)
+O New icons for commander UI (for assist and equip menus).  Thanks Squeal!
+
+2.0z (final release candidate for crash bugs and balance!)
+----------------------------------------------------------
+O Reduced heavy slowdown factor from .88 to .95
+O Reduced hive healing radius from 500 to 350
+O Changed node activation time for both sides from 90 to 60
+O Grenade launcher cost decreased from 25 to 20
+O Fixed bug which caused marine weapons not to drop
+O Removed debug code that created a movement chamber when you redeemed
+O Fixed stomp projectile orientation and drawing (oriented incorrectly, and would disappear too early sometimes)
+O Fade out stomp projectile, create shockwave at Onos and added rising smoke effect to stomp
+O Reduced welder deploy time (thanks Def One!)
+O Remove redeem/debug movement chamber
+O Increased lerk spore damage from 12 per second to 14 per second
+O Increased grenade force from 550 to 600
+O Decide on HMG damage
+	- Pros: great hive battles and feels right with GL
+	- Cons: too extreme vs. players at 20
+	- 18 piercing damage means 9 damage vs. structures, less then an MG, but barely (and bigger clip).  Can I be satisfied with it doing less then MGs vs. structures?
+	- Including ROF, HMG does 94.5 damage vs. structures, MG does 100
+	- Change from (1/.095)*18 -> (1/.105)*20 -> damage vs. players would change from 189/s to 190/s
+	- Slightly slower ROF implies use at medium range, and encourages use of shotties for close high damage.  14 seconds before reload -> 15.75
+O Fixed changelevel security problem
+O If you know of any crash bugs that you can still repro, PLEASE e-mail steps to repro to me ASAP at flayra@overmind.org
+O Fixed digestion problems (continuing to play sound at end of game, and "ghost" player problems)
+
+Hambone's change list
+---------------------
+O kElectricalUpgradeResearchCost 15 -> 30
+O kElectricalDamage 25 -> 15
+O Removed spawn umbra
+O Removed activation time
+O OCs and sentries increased from 5 to 10
+O Turret factory increased from 10 to 15
+O Spit damage lowered from 30 to 25
+O Alien resource nozzle cost increased from 10 to 15
+O Marine resource node cost increased from 15 to 20
+O Welder reduced from 10 to 5
+O Decrease skulk armor from 20 to 15
+
+	- or 15 and less damage
+	- 3 skulks should take it down
+	- 1 target, still did 25 damage
+Welder -> 5
+Welder damage
+Knives do explosive damage
+Hive stay at 40
+(301) 251-8987 - HAMBONE (Steve)
+sensory 1st commits to 3 hives because fades can't down base
+
+Thursday
+--------
+O Check in updates
+O Add Six Days in Sanjii part #2 (wait for notice from Ned)
+O Updated/fixed eclipse and veil overviews (not sure what happened here before, thanks Cadaver!)
+O Move car
+O Fix new crash caused by not setting pmove to NULL on changelevel (in world.cpp?)
+O 9pm shows
+
+Friday
+------
+O increased hive healing radius to 500 again
+O increased OC health from 900 to 1000
+O changed HMG damage back to 18, and non-piercing damage																					  
+O increased grenade force (600 to 800), lowered grenade damage (140 to 110, still doubled vs. structures) and increased blast radius (275 to (to prevent stalemates and increase use as area-clearing)
+O increased lerk health from 100 to 125
+O electrical upgrade does 25 damage again, still 1 target though (allows groups to take it down)
+O hive cost reduced from 40 to 35
+? New player and world models of the GL, with the green added to the front section and slight changes to other areas (thanks Mojo)
+? New brighter ns_nothing (thanks KFS!)
+? Updated ns_nothing overview
+? Killing comm chair means it doesn't reset (test hive too)
+? After recycling a structure, automatically cause deselection of the recycled structure and bring back the usual QWER root menu.
+? Fixed skulk bite issues (please test knives, and all melee attacks, and make sure this works in vents)
+? Onos stomp event plays too low for other players (fixed for playing while crouching too)
+? "charge" ability stays active and continues to constantly drain energy after use, even if you gestate to get an upgrade or change forms.
+	- make sure this works on evolve too
+? Added game time and time limit to scoreboard (should work for HLTV, spectating, and late-joining too)
+? Added game time to upper right of spectating view
+? Show voice icon on HUD when talking (thanks Max!)
+? Fixed missing music on late-join
+? Fixed Vet icon
+? When you build 2 of any structure (armory or armslab im sure about) and the 2nd copy of the structure is destroyed you no longer have access to any tech that has one of those structures as a pre-requisite. If you want to recreate this, build 2 armslabs then recycle the 2nd one. You will find that you cannot build a prototype lab until you rebuild the 2nd armslab. Another way you can recreate this is if you build an armory, upgrade it, then build another armory. If you recycle the 2nd armory, you will lose the ability to drop welders, shotguns, and mines until you rebuild a 2nd armory
+O Fix for drawing particle systems oriented incorrectly while spectating
+
+Saturday
+---------
+? New minimap!  This is the first pass, and there will be more stuff added to it very soon.  PLEASE keep this feature quiet right now, and keep it out of screenshots, as we want it to be a surprise (unless MonsE says otherwise). (thanks Max!!)
+? Talk to Darren about Gamespy integration or pawn off on Ned
+? Reduced "under attack" time from 10 seconds to 5 seconds (affects hive display, blinking hotgroups, etc.)
+? Updated marine model with anims to support the new gg style. also, is a re-oriented p_gg model
+? Fixed RR spawning in ns_veil, ns_eclipse and ns_mineshaft (note that these three maps are temporarily unplayable)
+
+Sunday
+------
+Final build
+O Increased OC health from 1000 to 1150
+O Increase jetpack cost and research cost from 10/25 to 15/35
+O Increase marine armor and weapon upgrade costs from 20/30/40 to 30/40/50
+O Changed HMG from 18 damage, ROF 9.5 to 20 piercing damage, ROF 8.5 (should do damage at the same speed to players, but means bullet for bullet it's comparable to the light machine gun)
+O Re-changed hive healing radius back to 500 (this may or may not have been the case on various servers).
+O Fades no longer take falling damage
+
+O Updated ns_mineshaft (easier to build at marine spawn, removed ready room from the overview map)
+O Onos crouch still a bit high (wrote DrHugo, maybe get an update)
+O Fixed ghost player bug (thanks Hypergrip, rain and others!)
+O Cleared tooltips when your playmode changes (reduces build-up when moving between RR and observer)
+O Compensated for gamma on scoreboard, so team colors always look right
+O Fixed bug where sometimes players would be left in the ready room when they tried to spectate
+	- repro: start caged, join marines, spectate (sets m_DefaultSpectatingMode to OBS_ROAMING), add a few bots, ready room, spectate
+O Updated gorge and fade crosshairs and weapon selection sprites (thanks Merkaba!)
+O Updated gore and metabolize sprite (thanks Merkaba!)
+O Final pass on titles.txt
+O New grenade launcher with sounds (thanks Def!)
+O New tech tree menu icons for assist and equip (thanks Squeal!)
+O All new selection marquee for commander (does lag, looks much better)
+O Commander sees nice animated visual alert on minimap (thanks Max!)
+O All new MINIMAP! (OMG thanks Max and Cory!)
+	O Commander blips are much clearer...and are always right, even on map reset!
+	O Soldiers can see all their team's structures and their teammates!  They can also see them off-screen, and can see their waypoint as well!
+	O Try "bind m +minimap" for a treat (not sure if this will go in yet)
+	O Doesn't work right for aliens yet, but will
+
+Monday
+------
+O Infinite loop on EntityHierachy::SendToNetwork stream
+	- It was adding an entity, which incremented server iter, but kept going until serveriter was garbage (developed game on eclipse)
+O Linux build and updated win32 build from last night
+? Map extents on eclipse need greater y (wrote KFS)
+O Looked into skulk bite range (decided it's not an important issue right now)
+O Fixed Constellation and PT icons
+O Devour kill is using babblers (wrote Merks)
+? Integrate +showmap
+	X Don't allow movement while it's open
+	? Add to options
+
+O Crash on some maps when quick joining (only when voice comm?  Shampoo)
+	- Couldn't repro local on tanith in release
+	- Couldn't repro on FoR with full server on hera
+	- Seems to be marine only
+
+O Fix missing footsteps under linux (thanks Joev!)
+O New sounds for grenade launcher (thanks MadMaxx!)
+O Increased heavy footstep volume
+O When spectating a player that dies, your view now stays where it was (instead of seeing objects disappear)
+O When spectating players that start commanding, go back to the ready room, or leave the server, go to the next target
+O Move soldier voice icon over so it doesn't collide with upgrades
+O Reduced HMG max ammo from 500 to 250 and clip from 150 to 125 for consistency (ammo over this amount wasn't displayed anyways)
+O Do pass on key bindings and defaults
+O Tweaked alerts so they expire faster
+O Remove letterbox while spectating (talked to Max, he's doing it)
+O Removed drawcones by default when spectating
+O Get updated tanith without problematic spawn (fixes stuck Onos at fusion hive)
+
+X VAC (start testing Friday or Saturday)
+
+O Client crash:
+	- UpdateEntityHierarchy
+		- AvHEntityHierarchy: line 514 (Assert("entityIter != mEntityList.end()"))
+
+O Fix round reset problem due to resetting entities without teams
+O Active resource node messages now only display in casual mode
+	? Put up poll
+? Narrow down ghost player (?)
+? Tried to fix server name garbage
+? Fixed bug where crouching doesn't work right in ready room
+
+? Remove bottom letter box bit so it's not redundant with "viewing through eyes of" text
+? Get new veil overview from Cadaver
+O Get new hera from Merks
+O Send party invitation
+
+2.01a
+-----
+O Skulk health decreased from 75 to 70
+O Skulk armor decreased from 20 to 10
+O Electricity cost reduced from 30 to 20
+O Electricity research time reduced from 60 to 30
+O Electricity range increased from 90 to 110 (to prevent exploiting)
+O Offense chamber health reduced from 1150 to 1000
+O Onos can no longer redeem while digesting a player
+O Added "parasite switch fun" back
+
+2.01b
+-----
+O Unless otherwise specified, includes all changes from 2.01a
+O Reverted skulk health changes back to 2.0 levels
+O Lowered marine upgrade costs from 30/40/50 to 20/30/40
+O Umbra now blocks 2 out of 3 bullets (down from 3 out of 4)
+O Reduce healing spray from 16 to 13
+O Increase grenade damage from 110 to 125
+O Fixed problem where specs can be heard talking before game start in tourny mode (untested)
+O Fixed problem where dead players can sometimes be heard (untested)
+O Fixed CURL timeout problems (untested)
+O Hide opposing team score in tournament mode so you can't see how many resources towers they have (untested)
+
+2.01c (for CAL pre-season)
+-----
+O New collision code to prevent players from getting stuck in structures (thanks Max!)
+O Fixed problem where hera holoroom double node didn't build properly
+O Fixed bug where being webbed and then devoured pulls out your weapon while inside the Onos
+O Umbra now blocks 1 out of 2 bullets (down from 2 out of 3)
+O Movement chambers can no longer be +used to teleport to hive
+O Increased hive cost from 35 to 50
+O Removed HMG piercing damage (now does full damage vs. structures)
+O Each level of celerity now increases speed by 25, down from 35 (it's now back to the 1.04 level)
+O Aliens can only change lifeforms when within healing range of an active hive
+	- TODO: Change popup menu to grey out when not close enough
+	- TODO: Add error message
+
+2.01d
+-----
+O Balance.txt
+O AvHPlayer.*
+O AvHGamerules.cpp (edit to remove scoring and revert to old MOTD)
+O AvHBaseBuildable.*
+O AvHConstants.h
+O AvHDramaticPriority.h
+O AvHHive.*
+O Turret files (but remove 3rd person reloading)
+O AvHServerPlayerData.*
+O AvHSpecials.h
+O AvHTeam.* (but undo commander score update)
+O AvHWorldUpdate.cpp
+O AvHCurl.cpp
+O AvHParasiteGun.cpp, AvHSpitGun.cpp
+O AvHServerUtil.cpp
+O AvHVoiceHelper.cpp
+O AvHMarineWeaponConstants.h
+O AvHSharedUtil.cpp
+O AvHBasePlayerWeapon.*
+O AvHAlienEquipment.cpp
+O AvHAlienWeaponConstants.h
+O AvHConsoleCommands.cpp
+
+O Electricity research time reduced from 60 to 30
+O Electricity range increased from 90 to 120 (to prevent exploiting)
+O Offense chamber health reduced from 1150 to 1000
+O If an Onos redeems while digesting a player, the player is left behind
+O Added "parasite switch fun" back
+O Marine resource tower cost lowered from 20 to 15
+O Lowered marine upgrade costs from 30/40/50 to 20/30/40
+O Healing spray is 16 (same as 2.0)
+O Increase grenade damage from 110 to 125
+O Fixed problem where specs can be heard talking before game start in tourny mode
+O Fixed problem where dead players can sometimes be heard
+O Voice comm can no longer be heard for anyone during countdown (to allow safe demo recording)
+O Fixed CURL timeout problems (untested)
+O Hide opposing team score in tournament mode so you can't see how many resources towers they have (untested)
+O Fixed problem where hera holoroom double node didn't build properly
+O Fixed bug where being webbed and then devoured pulls out your weapon while inside the Onos
+O Removed frame-rate dependence from leap and charge damage
+O Increased hive cost from 35 to 40
+O Reduced command station cost from 25 to 20
+O Reduced command station build time from 20 to 15
+O Each level of celerity now increases speed by 25, down from 35 (it's now back to the 1.04 level)
+
+O Umbra blocks 2 out of 3 bullets (down from 3 out of 4 in 2.0)
+O Changed lastinv so that it's preserved between upgrade gestations
+
+O Shotgun clip and reserve reduced from 10/50 to 8/40
+O Removed cloaking and uncloaking sounds via cloaking upgrade (they are only a third as loud as they used to be).
+O The cloaking upgrade now fades smoothly instead of becoming instantly invisible.  The higher level of your cloaking upgrade, the faster you'll cloak.
+O Aliens should be able to walk very slowly cloaked via the cloaking upgrade.
+O Each level of cloaking decreases time needed to cloak more.
+
+O Sentries and offense chambers now do "light" damage.  Light damage does half damage to heavy armor and Oni.
+X Movement chambers won't teleport aliens to a building hive any more
+
+O Only allow resource towers and turret factories to be electrified (fix for exploit timing/selection exploit)
+
+O Resupplying at armory can only go into reserve (addresses end-game grenade spam at marine start).  It also now rounds up (so odd-sized clips like the HMG load intuitively)
+O Gorge spit can operate switches again as well
+
+O Made offense chambers less accurate against fast-moving targets (jetpackers)
+O Fixed "super-hive" bug (from Uranium on the forums): Maintenance hive: if you as gorge stay there a build hive, from up there, as long as you DO NOT MOVE, the hive cannot die. I did it in 1.0 and its still there in 2.0 despite my efforts to get it fixed. It can easily be replicated. I have even died and as long as i do not move when i spawn the hive itself can never die.  If you want me to show you ingame, just get a time/server and ill try to be there.
+
+O Fixed alien resource exploit involving late-joining
+O Fixed spawning exploit involving late-joining
+O If you get disconnected while playing aliens, and you rejoin, your resources will be preserved
+
+O Players can only become spectators from the ready room (fixes devour exploit)
+
+O Building hives can now be healed
+O Unbuilt structures can now be repaired with the welder
+
+2.01e
+-----
+O Increase charge and leap effectiveness.  Leap is still 40 damage per second, Charge was increased from 100 damage per second to 160 damage per second.
+O Lowered armory cost from 20 to 15
+O Electricity can now attack two targets at a time instead of one
+O Lowered gorge armor from 75 to 50 (shouldn't affect gorge lifespan, as they usually have extra armor when they die)
+O HMG cost reduced from 20 to 15 (marines should be able to attack at tier 2 without it being a make-or-break effort)
+O Increased cloaking speed threshold so skulks don't wink in and out when using stairs
+O Increased cloaking time a bit (one second divided by your current level of cloaking, ie 1 second, 1/2 second, 1/3 second)
+O Fixed bug where weapon doesn't deploy after being rescued from a devouring Onos
+O Fixed bug where turrets could be fire before they were built by recycling and building turret factories
+O When you use a phase gate, it checks to see if there are any structures blocking the phase gate.  If there are, it blocks the phase.  It then checks to see if there are any players blocking the phase gate.  If there are teammates that have phased within the last 2 seconds, it blocks the phase.  If the phase succeeds, it kills any players that are on the phase gate. So teammates have a 2 second window to get off the phase gate; enemies are telefragged instantly.  Structures however can still block a phase gate, though this will likely change in a future version.
+O Removed frame-rate dependence when building structures
+O Fixed bilebomb exploit that could sometimes allow it to damage through walls
+O Handicap can now be set in non-tourny mode.  Message displays like active resource nodes message, every 20 seconds.
+
+2.01 final
+----------
+O 2.01e as base
+O Version number and build settings
+O Fixed problem where bile bomb wasn't always doing damage to resource towers
+(Note: Many of these changes are to reduce the "do or die" effect for the marines (ie, when they launch an attack and if they fail, their victory chances are much reduced))
+O Reduced siege cannon build time from 15 to 10
+O Reduced siege upgrade time from 22 to 15
+O Reduced heavy armor cost from 20 to 15
+
+2.01f 
+-----
+
+Armor and health changes to address the following issues:
+	- Hive-1 Fade/Onos too powerful
+	- Hive-2 Fades too powerful
+	- Carapace is a bit dominant
+	- Swifter game resolution on both sides when significant advantage
+
+NOTE: Don't freak out, most of these changes don't actually affect anything, as many aliens died with excess armor, and there were other changes made to the armor system.
+NOTE: There may be some problems with individual alien/carapace/hive combinations where an alien has too much or too little health/armor, but it's now easy to remedy
+NOTE: Overall, this is not a nerf to the aliens.  It takes the edge off fades/oni and carapace early, and gives them some late-game strength.  The vast majority of the time, the amount of damage an alien can take hasn't changed from 2.0x.
+O Changed armor so it generally absorbs more damage (so players on both teams generally don't die with excess armor)
+O Fade base armor reduced from 100 to 50, and carapace upgrade armor increased from 50 to 100
+O Gorge base armor reduced from 75 to 40 (doesn't affect his lifetime, as he died with excess armor)
+O Lerk base armor increased from 25 to 30, and his armor upgrade increased from 25 to 30
+O Onos base armor reduced from 150 to 100, and armor upgrade increased from 100 to 150
+O Reduced skulk health from 75 to 70
+O Alien armor value increases with each level of hive.  This means a 2-hive alien without any upgrades can take more damage then a 1-hive alien.  The chart is as follows:
+	- # of hives: 0/1/2/3 -> each point of (alien) armor counts as 1.2/1.6/2/2.4/ points of health
+	- Result is lifeforms with lots of armor (Fades, Oni, players with carapace) are more fragile then v2.01e at hive 1, the same at hive 2, and more sturdy at hive 3
+	Note: in NS v2.01e and before, armor counts as 2 points of health
+	Note: the number of bullets to kill non-carapaced hive-1 aliens is the same as in 2.01e, so this isn't as huge a change as it sounds
+
+- Knockback
+O HLTV syn/ham match Saturday:  65.125.236.122:27020 (HLTV will be sponsored by nucleargamer.com)
+- credit for mine kills
+- Don't auto-reload when 0 ammo and resupplying at armory
+- While charging, sometimes you don't speed up. So you're charging and at normal walk speed?
+- Also as charging, after devouring charge refuses to work, even with full adrenaline, and takes up to 40 seconds before working again?
+- Siege and OC fire sounds don't play?
+
+69.56.158.34:27015
+
+- Test welding
+ensureLevel("ns_bast")
+resetGame
+jointeam(localPlayer, 1)
+move player
+sleep(5000)
+giveNamedWeapon(localPlayer, "item_welder")
+switchWeapon(localPlayer, "item_welder")
+setAttackButton(true)
+sleep(5000)
+setAttackButton(false)
+return getIsChecksumEqualTo("1209i120398123oiuo28308")
+
+- Test damage types
+ensureLevel("ns_eclipse")
+resetGame
+jointeam(localPlayer, 1)
+move player(double node)
+buildMarineResourceTower(x, y, z)
+setVariable("mp_tournamentmode 1")
+giveNamedWeapon(localPlayer, "weapon_grenadelauncher")
+switchWeapon(localPlayer, "switchWeapon(localPlayer, "")
+giveNamedItem(localPlayer, "item_genericammo")
+giveNamedItem(localPlayer, "item_genericammo")
+giveNamedItem(localPlayer, "item_genericammo")
+setAngles(x, y, z)
+setAttackButton(true)
+setAttackButton(false)
+setAttackButton(true)
+setAttackButton(false)
+setAttackButton(true)
+setAttackButton(false)
+sleep(5000) // wait for grenades to go off
+return getIsChecksumEqualTo("1209i120398123oiuo28308")
+
+- Custom gamerules
+global variable team1won = false
+global variable team2won = false
+
+updateVictoryStatus()
+ - if(!theteam1won)
+	lalala
+ - return false
+
+initializeTeam()
+ - add tech node
+ - add starting resource tower
+ - spawn every player at info_player_start
+ - give team 100 resources
+
+
+
+- On win32 siege wont fire without scan (within range of obs). spotting doesnt work. havent tested on linux. 
+- On linux server (don't know about win,) being rescued from the innards of a digesting onos leaves you in a weird "weaponless" state where you can't change or fire your weapons. the fast cure is to hit your "drop weapon" button and then pick it back up again, and everything returns to normal...
+- They seem very simple to fix by just locking cl_pitchup 89 and cl_pitchdown 89 (89 is the default for both of these and there is no conceivable reason for them to be lower. Higher values can be used to do some nasty things and are just annoying to play legitimately with anyway so please, please lock these.)
+- Redeeming to Ventiliation 3-C hive on Hera gets you stuck in the hive frequently (not sure if it's a 2.0 or 2.01d issue, I don't get redemption much). 
+
+- Suiciding while commanding (http://www.teamkindred.com/cgi-bin/ubbcgi/ultimatebb.cgi?ubb=get_topic;f=4;t=000412)
+- Look into a turret limit
+
+Hinesberg
+O E-mail
+O Process Constellation junk
+O Work on 2.01
+- Update FAQ with HL2 info
+O News post
+O Talk to Joev about stats 
+- Post SGI on E-bay (get pictures from Elliott first)
+
+
+2.1a
+----
+- Blackwall exploit
+	========= 
+	This exploit still remains, by abusive the console command 'Lightgamma' you can turn walls black to make it incredibly easy to spot aliens. 
+
+	Set lightgamma to 100. 
+	Turn on the flashlight. 
+	Any wall you touch with the flashlight turns black. 
+	Turn off the flashlight. 
+	Set lightgamma to 0. 
+	All structures and players are fully bright against the black walls. 
+
+	After setting lightgamma to 0 you can remove the black by using the flashlight on the affected areas. 
+
+- Draw handicap on client, and allow in non-tourny mode (for voodooc -> http://ns.warmfuzzyland.com/index.php?name=PNphpBB2&file=viewtopic&p=5570#5570)
+O New collision code to prevent players from getting stuck in structures (thanks Max!)
+? Increased bilebomb force from 600 to 750
+O Fixed blinking marine HUD artifact when switching weapons with lag
+
+? Added VALVe Anti-Cheat support
+O Leap reduced in speed slightly (think about removing/reducing leap damage and adding kick-back, so skulks could scatter marines with it)
+
+? Skulks don't flip around as much in the air
+O Fixed grenade launcher artwork on tech tree and build notification sprite
+O Fixed hud_draw exploit
+? Extensive stuck issues fixed, along with sinking buildings (thanks Max!)
+? Digestion and gestation overlays now animate smoothly
+? Resource and energy indicators now animate smoothly
+? Updated Eclipse overview from Cadaver
+O HMG does piercing damage.  Rate of fire increased slightly (170.9 damage per second to 180.1 damage per second).  (We all felt 190 was too much, when clip was 150 at least)
+
+? Fixed small skulks view model animation hitches
+? Updated Quark support (thanks Wolv!)
+? Scores are now always drawn on the scoreboard (too many people are confused by not seeing them, and paradoxically, this may increase teamplay)
+X The commander now has the same score as the best player on his team.
+? Points are given for building and destroying structures and players.
+	1 point  - Skulks and most marines
+	2 points - Gorges, sentries, OCs, upgrade chambers, marine structures, marine upgrades
+	3 points - Lerks, resource nodes, jetpacking marine, siege turrets, phase gates, observatories
+	4 points - Fades, HA marines, turret factories, infantry portals
+	5 points - Oni, hives, command consoles, advanced armory, prototype lab
+
+O Fixed problem where ns-hltv.bat wasn't authenticating with WON (thanks Guspaz and UGL-ns|Larry!)
+O Made changes to HLTV default settings
+O Added translations for German, Spanish and Turkish (thanks Nemesis Zero and others!
+? Third-person spectator letterbox fix (Max)
+? Fixed small glitch where shooting a parasite made the view model hitch slightly
+
+- Model consistency on dedicated server (agibs.mdl)
+
+? Meet with Jeff to get manual organized and moving again
+O Constellation payments
+
+? Collision problems
+	- Occassional crashing around 10-15 mins (onos?)
+	- Debug crash on FoR
+
+? Spectator UI for Max
+? Renamed occurrence of "grenade gun" to "grenade launcher"
+? Squads are no longer persistent through team change
+? Updated FMOD sound library to 3.63 in attempt to fix crashing and hanging on Audigy cards
+? Removed "HelpTextAlienCommunication" help message
+? Updated "HelpTextAlienHiveSight" message
+- Sidespeed change? (from Zek): By the way, I should add that the problem with decloaking when walking is partly caused by setting cl_sidespeed to 1000, which I(as well as many others) have done because Flayra has yet to address it. We still need to hear whether or not defaulting it to 400(and thereby "nerfing" diagonal movement) was an intended change, and either way it should be changed in 2.01 to be locked onto whatever the intended value is... 
+
+- Moved grenades client-side, added spinning animation
+	- Still needs work
+- Structure notification broken (Max)
+- Couldn't evolve to gorge near airlock on bast
+- Fix server-crash/exploit where joining marine and readyroom quickly overflows
+- Upgrading a TF (or armory?) restores it's health instead of preserving it
+- Added 3rd-person reload animations for marines and heavy marines (thanks Def One!)
+	- Doesn't work while crouching
+	- Need heavy armor animations still
+- Fix MOTD to use HL way, but disable team selection on client
+- Show global chat in spectator mode
+- Allow chatting while dead (and seeing chat)
+- Force consistency on full-screen HUD sprites (gestating, digestion)
+- Telefrag people blocking phase gates (if the same person blocks a gate more then a couple times, telefrag him)
+- **Update titles.txt and AvHItemInfo.cpp to show leap and charge damage per second
+
+- Bug where a : in your name causes chat messages to appear wrong (Dave/MadMaxx)
+- Valve.rc fix (http://www.natural-selection.org/forums/index.php?act=ST&f=18&t=41688&st=0&)
+- Exploits from Dave: http://www.natural-selection.org/forums/index.php?act=ST&f=15&t=41460&s=344d4f346f70db5411ee41d5b9e06b84
+- Acid rocket bug (demo)
+x Replacement for ric1.wav (http://www.natural-selection.org/forums/index.php?act=ST&f=18&t=40115&st=30&), more info in PM ()  
+- Address kill delay issues (remove it)
+- Phase gates not rotating properly (use entindex())
+- Phase tech not going away
+- New command stations start with too much health (put breakpoint in Materialize)
+- Update with latest titles.txt from Nemesis Zero (e-mail dated 8/27/03)
+
+- Grenade reload aesthetic bug: If you reload it and you have, for example, 1 grenade in the launcher and 1 grenade with you in the ammo box, the reload animation is played as often as the difference between 4 and the grenades in the launcher, although you have only 1 grenade with you (in this case 3 times, but it should be played 1 time).
+
+- You are an observer and you press the duck-key to get into the spectator menu. You click on "Options" and then on "Help". The cursor suddenly disappears and if you manage it to click on the "OK" button, the old TeamFortress team menu opens on screen. All replacements like those #Spectator_Menu_Help etc. aren't replaced, so I think you forgot this menu in the hurry to get out the new spectator mode. (Max)
+- Bug where resource towers don't show until they are visible first (Max)
+- Pretty up HLTV icons (Max)
+- Particle system editing (Max)
+- Stuck issue: going back to the ready room when you're an Onos (hera) (Max)
+- <voogru> Something I noticed in the server dll, not sure if this is meant to be this way. But it seems that the "Health" message is spammed like crazy to the client when they die until they respawn (Max)
+- Don't ever show progress bar when spectating (Max)
+- Building alien structures on marine IP gets them stuck (Max)
+- if u +duck, and +use, u cant +moveleft.... but u can move any other way (cx.rain) (Max)
+- Green text on some machines?
+- Make sure disabling dynamic lights affects phase gates as well (cl_dynamic lights, must be disabled on the client-side, so do it by removing the flag in AvHHud::ClientProcessEntity).  Any others?  (Max)
+- Improve quality of HLTV icons (Max)
+- Remove a couple more sprites, or figure out a way to unload them (some people still get the 128 HUD sprites crash) (Max)
+- Fix bug where sometimes some pop-up menu nodes don't go away (I've seen it with lag, not sure how to repro, but maybe some #nsers or PTs would know?) (Max)
+
+- Primal scream icon
+- Parasited text blocks FPS spec view text
+- Fade deploy animations after morphing into him (also, blink to claws switch)
+- Option to research phase tech is still there after researching it. (thanks Grep!)
+
+- Music not playing after a round restart?
+
+- Remove config.cfg and other files automatically from dedicated server install
+
+<sYn|Terminotaur> alias specialhop "-attack2; wait; +jump; wait; -jump; +attack2;"
+<sYn|Terminotaur> alias "+hop" "alias _special specialhop; +attack2;"
+<sYn|Terminotaur> alias "-hop" "alias _special; -moveup; -attack2;"
+<sYn|Terminotaur> bind whatever +hop
+<sYn|Terminotaur> that loops jumping so you can bhop pretty well ^^
+<sYn|Terminotaur> it's pretty well accepted in the tfc community though
+<Flayra|201d> wtf does the _special do?
+<sYn|Terminotaur> loops commands
+
+Other tasks
+-----------
+- News update
+	- T-shirts
+	- Announce 2.1
+	? Update Constellation page with non-US payment info
+
+O Get new password/access for site
+- New contact pop-up for web site
+O Post to everyone for backups
+- Write a 'getting into the industry' page for overmind.org
+- Formal team and community re-org 
+
+- Write up requirements for Joe
+	- Global statistics
+	- Official servers
+	- Community calendar, where anyone can submit events, and they are approved and posted on n-s.org
+	- NS insider (mailing list)
+	- Keep track of player statistics, and use to show level and preferred class on forums and in-game
+	- Live event system, for broadcasting events to all servers (tell players to go to ready room, and use terminal there, which execs a special client command)
+		- This would be great with VGUI2, so it could flash and alert you when there's a new version or special event
+	- Hub servers, which people join automatically (executes special query to put them on a hub server, or a game in progress that's uniquely suited for them)
+
+O Write Peter Molyneaux
+O Remove Lou "Z3r0" Trujillo FORUM NAME: Z3r0  EMAIL: Z3r0@chem-x.net WONID: 1212637 from forums (removed auth already)
+
+Official n-s.org server
+-----------------------
+HLTV password: hltvonarack
+63.225.168.178:27015
+
+
+A new balance methodology
+-------------------------
+- Inefficient, slow and stressful to talk to individuals
+- Stats are needed, but not just wins and losses, but as much info about the win as possible
+- Need to see full game history, and snapshot of how the game was ultimately won
+- Include when and where structures were built and destroyed (though this implies a game by game analysis, which isn't efficient)
+- Maybe some kind of asserts, where you're asserting that the counter is actually working?  Ie:
+	- assert that grenades are killing players in umbra, or that aliens with OCs at hive aren't losing to tier 1 marines
+	- assert that the total res income on both sides is generally the same (graph it)
+
+O Update team page with contributing mappers
+X Limit teams bug? http://www.natural-selection.org/forums/index.php?act=ST&f=8&t=40941&s=773009872303c6181f887b0edc332c5e
+
+- HLTV pass
+	? remove old dramatic triggers
+	- add a few good dramatic triggers
+	- add HLTV icons for health and ammo (shows marine hand right now)
+	- snap all particle system heights to map height if time
+	? Remove drawing of view cones
+	X Remove "viewing through the eyes" message
+	- Improve quality of icons
+
+- Record/playback pass
+- Siege/obs bug (seems to work when you scan though?)
+
+- <Sirus^> If you have 2 obs, and if one is researching, and the other is destroyed, then when the other one finishes researching or if the research if finished, then the building that's still left doesnt count towards anything in the techtree, IE. Phasegates, even with the technology already (or if the research is cancelled)
+
+- Typing kill right before being devoured (you die inside Onos and sound is messed up)
+
+- Metabolize not showing up on some flavors of linux (Gentoo and Slackware) (Prodigy)
+- Most people have voicecomm bound to the "V" key. Guess what button is used for commandermode to recycle buildings?
+- Devour is a bit picky
+
+- Add help tips to tell marines to ask for orders, health and ammo
+- Round up when getting ammo from the armory to fix rounding problems for odd clip sizes
+- Possibly speed up devour?
+- cl_sidespeed default is 400, setting to 1000 lets you strafe properly (axe)
+- keep scoreboard populated after end of round (needed for CAL/tournies)
+
+X Remove TF requirement on electricity?
+- Jumping to alerts doesn't always work (HAMBOWN)
+- Fastswitch exploit for GL
+* infinite blink still possible using adrenaline.
+
+- Give snark crash?  Fam?
+
+X Fix versioning (wait for feedback from Joe)
+- From Bacon Bits: obscure bug I dunno if you know about. If you hold forward while you evolve once you do that progress bar stays and shows your adrenaline rather than going away 
+- ns_nothing crash bug: if you build a OC between the two doors near power silo it crashs alot of servers or laggs the server to near death , if you close the door and build a OC at the right time it gets cought in the door and wont move at all , easily done too :/ , anyway if its been said before thanx for reading if not there is a demo attacked showing what i mean. (ns_nothing-crash.zip)
+* JP energy gets set to zero when you exit the command console.
+* cloaked structures other than sensory chamber do not become uncloaked when touched.
+
+
+- Performance work
+	O Major server optimizations (CS entity caching)
+	O Move animation debug data into variable
+	O Use more caching when doing world update
+	? Smarter about querying world entities in AvHTeam
+	? Inlined determine vis and others
+	- Added mp_performance when PROFILE_BUILD #defined
+		7 Game rules think
+			1 update world
+			2 particles
+			4 everything after particles
+		120 Player think (120 for just player think)
+			8 ready roomers think
+			16 spectators think
+			32 aliens think
+			64 marines think
+		896 AddToFullPack
+			128 use caching or not
+			256 process NS visibility or not
+			512 propagate non-self entities
+		1023 for everything
+
+	- 9 players playing on bast (with cheats, hosted on cable)
+		- 1023 -> 30-50%
+		- 7 -> 4-5%
+		- 127 -> 5.5% (fluctuates as per 'normal' NS)
+		- 895 (all but caching) -> 40-60
+		- 767 (all but NS vis) -> 40-50%
+		- 1016 -> Not a big difference
+		- 511 (everything but don't propagate non-self ents) -> Average of 6%!  It really is AddToFullPack
+		- 896 -> essentially the same as 1023
+		- 384 -> plummetted
+		- 0 (with 10 players on bast with lots of ents) -> 28% (where is this going?)
+
+	- Conclusions: 
+		- nothing but # of entities matters, and it matters only because of AddToFullPack.
+		- the implementation of AddToFullPack is very important
+		- There is something else that's taking 20-30% of CPU that's not covered by GET_RUN_CODE
+		- Rolled back to CS AddToFullPack and performance wasn't significantly different then NS' cached and lengthier version
+		- Main conclusion: performance is largely taken up by AddToFullPack and some other (probably NS) code.  
+			- This other section is now affecting bots as well, where previously it didn't seem to.  Rebuilding in release and without profiling to see if that's it.  
+			- Release/without profile and without bot thinking is around 1% per player still
+
+	- TriggerRemoveTech gets called over and over sometimes, expensive and wrong (change to kind of reference count?)
+	- Performance is still very much tied to # of entities...put back in other AddToFullPack optimizations?
+
+O Ask KFS for South hive translation
+	? e-mailed
+
+- HLTV triggers
+
+- Fixed crash bugs:
+	- endgame crash
+		- after big game, players go back to ready room.  A couple people join teams, the game resets and gets ready to start
+		- during the reset (PostWorldPrecacheReset), players that had already joined team one, rejoin the team (AvHGameRules, 2056, AttemptToJoinTeam(...TEAM_ONE)), their playmode is set to playing (AvHGamerules.cpp, 410), all times are destroyed, m_pActiveItem isn't null but is invalid and Holster() fails
+	- turn on cheats, bind "give item_health" to a key, then spam it 200 times
+	- Invincible hive: shooting eclipse hive while it's building?
+	- Onos stuck: only when using MC
+	- gestating to Onos on top of rail outside of tanith start gets you stuck (HAMBONE)
+
+Next vet beta			  
+-------------
+O Linux build
+	? Get CURL building
+	? Get NS building
+	? Build new asset files for server-only release
+	? Resolve linker errors (Joev is on this)
+	? Get new CURL into source control
+	? Entering testing!
+	? Compatibility issues
+	? Missing fade abilities
+	? Unable to build alien res towers
+	? Performance
+	- oprofile (source forge)
+	- stlport
+
+- Record/playback
+	- Disable pop-up menu
+	- Spectator windows don't show up right
+
+- CC improvements and fixes
+	- Fix CC bug where nothing can be selected (only after a couple games?)
+	- Jumping to alerts doesn't always work (HAMBOWN)
+	- Holding duck while selecting will select all of that type (jetpacks, heavies, vanilla)
+	- Holding run will add to selection
+	- Allow clicking on voice indicator to select and jump to player
+	- Move commander tooltips to the left, next to requests (they are overlapping with action button help)
+	- Make commander text white, with yellow border
+	- Make commander action button tooltip fade out after some inactivity
+
+O PR stuff with MonsE
+	? Write up press release tonight
+	? Work with him to deploy it at 7pm
+
+- Team chat tweaks
+	- Team chat (messagemode2) should be visible to all teammates, regardless of who's dead or alive. 
+	- HL comm should be audible by all teamates (dead or alive), and only teammates (not specs or HLTV viewers).
+	- All chat (messagemode) should be visible by everyone in the server at all times, including spectators or those in the ready room; text sent by those in the readyroom or spectating should be visible to players also. (people can join the game, say "scrim?" or something like that, and get a response this way) 
+
+HLTV issues
+- General networking issues
+	- Death messages work, but why don't particle systems get propagated?
+	- Any state that is to be displayed per player, needs to be stored in the player entity (NS client and server doesn't think player is spectating, it just sends all data to HLTV proxy)
+		- Team HUD 
+		- Current/team resources
+		- Current hive situation
+		- Structure health (client drawing)
+		- Player health, armor (why isn't this propagated or used?)
+		- FOV
+		- Weapon deploy anims
+		- Ammo
+		? gmsgSetResources (stored per player)
+		- Remove gmsgPlayerAction (not used)
+		- Remove gmsgSetFOV
+		? Remove gmsgSetSoundNames, put sound name into netname
+		- Particles
+		- Location names (store in unused string in player?
+
+		vuser4[0][0-1]: clip ammo (reduce HMG max to fit into one byte?)
+		vuser4[0][2-3]: reserve ammo
+		vuser4[1][0]: fov
+		vuser4[1][1]: gamma
+		vuser4[1][2-3]: team/player resources
+		vuser4[2][0-1]: current health
+		vuser4[2][2-3]: current armor (max can be computed using iuser3 and iuser4)
+
+		- Add two special entities for more global settings?  This would be propagated to players on the team, and always to HLTV proxies.
+			- Global info
+				- gamma, remove gmsgSetGammaRamp
+				- Particle templates?
+
+			- Team info
+				- hive info, gmsgAlienInfo
+
+	- Hive sight and motion-tracking via network messages?
+
+X Minimap fix/update/rework for marines	(use HLTV like DOD 1.0)
+	? Got basic system almost working, clearly the way to go
+	- Works when spectating, but icons don't draw properly when playing.  They are being added, but when they are drawn they are culled, because world -> screen says they are behind the player
+		- V_CalSpecRefDef 1, V_CalSpecRefDef 2 works but V_CalcRefDef 1, V_CalSpecRefDef 2 doesn't.
+		- Appears not to be spectator related, as it works fine when specing aliens, but not when specing marines.  Seems to be GetIsDrawingMarineView() related.
+		- Doesn't matter it's position, still doesn't work when minimap is at same size/position as spec map
+
+X Mines now take damage normally and have 150 hit points.  They detonate when they are killed.  This allows gorges to bile bomb them and to a limited extent, lerks to spike them.  Skulks can try bite them if they want...
+X Mines now show up on your reticle help if you look at them
+X Mines spark when they take damage
+X Mine shakiness
+
+- Enhance balancing interface with basic analysis 
+	- Use kBalanceTeamSize, kBalanceNumGorges, kBalanceHiveDistance, kBalanceNodeDistance for calculations
+	- Time to second hive
+	- Time to third hive
+	- Time to first Onos
+	- Time to first HMG
+	- Time to jetpacks
+	- All gorge strategy
+	- MG shots vs. skulk (for each damage upgrade and for each carapace level too) 
+		- "MG vs. uncarapaced Skulk -> 1/2/3/4"
+		- "MG vs. level 1 carapace Skulk -> 2/3/4/5"
+		- "MG vs. level 2 carapace Skulk -> 2/3/4/5"
+		- "MG vs. level 3 carapace Skulk -> 2/3/4/5"
+	- # bile bombs against resource tower
+	- # of shotgun blasts to kill a hive
+
+- Automate updating of manual
+	O Designed system and did initial work
+	O Wrote Jeff to create small manual
+	- Integrate with Perforce, get fully functional
+
+- Need way to visualize games
+	- Emitting # of nodes is a great start, but need more
+	- Aliens
+		- Need to know # and type of aliens, # of building/active hives, % of player time for each alien, alien upgrade chambers built and upgrades used
+	- Marines
+		- What tech tree looks like
+	- Both
+		- Average # of res towers, player deaths (and distance from spawn?), structures killed, resources harvested, resources spent, % of tech researched, game length, % time alive
+
+First 1.1 feedback from vets
+----------------------------
+O Marine buildings take too long (IP especially)
+X Jetpacks are wimpy
+O Spores too weak
+? Aliens generally die too quickly
+Sucks not getting acid until 3rd hive
+Protolab interface is weird and non-intuitive
+Spectator crash
+Love the new hive sight sprites
+Love sensory, silence
+MG feels faster, more powerful
+
+Can be fixed during vet playtesting
+-----------------------------------
+	- Ready room spawning as Onos
+	- Come up with a solution for spawn-camping
+	- Fix bug where person being digested can still spot for sieges
+	- Fix bug where digestion sound tweaks were still playing on end game
+	- Fix voice icon when speaking
+	- Demo record testing, improving, tweaking
+	- HLTV dramatic hooks
+	- Clean up scoreboard timer
+	- VAC testing
+	- Minimap fixes
+
+	- Bind exploits
+	  -------------
+		(from CheesyPeteza)
+		You probably already figured out how this was done. But just incase I thought I better let you know:
+			
+		impulse 119 leap
+		impulse 120 blink
+		impulse 122 charge
+		
+		impulse 122 works slightly as a marine. :o It makes you go forward a bit and does about as much damage as a knife. There is no limit to the rate of fire though. So by binding it to mwheeldown, 3 flicks of the wheel can kill an onos and skulks are toast. You have to be right next to the enemy.
+		
+		I also noticed you can do blink without losing energy and without sound using impulse 120. Also as an onos charge does charge without the sound, but you still lose energy. And I assume you already know about the leap problems.
+
+- Last Fade ability
+	- Metabolize: which drains energy when used, but for the next second, converts incoming damage into energy.  Depends player knowing when he's going to get hit, and using it to maximize his energy. (kinda like Melnorme)
+		- Makes sound when used, creates particle effect when damage is converted.  Is active for 1 second after used.  Shows "metabolizing damage to energy" on HUD when under effect.  Adds "gamble" effect that I've always wanted, and is easy to do.  Scales well with damage too!  Infinite turrets, HMGs, mines, he can handle take them, though he can't do anything else.  Something on the order of 10 damage points per .1 energy.  Swap with acid rocket because it's so powerful and to allow more range earlier?
+	- Presence: draws nearby (airborne?) players (or player under reticle) towards him.  Could be used to draw players into traps and would be easy to implement.
+	- Frenzy: like claws, but each successful attack on a player increases you max speed and damage (takes double energy to use)
+
+- Lerk spike vs. bite
+	- Spike: 
+		- Good: fits support role best, only alien hitscan attack
+		- Bad: players will use it against structures, even if it takes minutes, it's a little redundant with spores
+	- Bite:
+		- Good: vets/clan players love it, dog-fighting vs. JPs, cool effect where lerk flies in and person dies instantly, more visceral then spikes
+		- Bad: spikes show on model but are never used, means lerk could be a great fighting class in talented hands
+
+Adding marine skill
+-------------------
+- Locational damage
+- JP subtleties
+- Recoil
+- Decide on role of armor
+
diff --git a/main/source/doc/2.1.txt b/main/source/doc/2.1.txt
new file mode 100644
index 00000000..780eac24
--- /dev/null
+++ b/main/source/doc/2.1.txt
@@ -0,0 +1,2151 @@
+What's left for 2.1
+-------------------
+
+Steam support
+-------------
+	O Fixed ex_maxerrordistance
+	O Added new dummy sprites
+	O Debugging environment
+	O media\gamestartup.mp3
+	O Overflow issues
+	O Could not load tech0s.spr over and over
+	O New background
+	
+	- ESC while commanding
+
+	- Pop-up menu corruption (not the connector sprite)
+		O Alfred is looking into this
+		- Corrupted fonts (http://www.natural-selection.org/forums/index.php?s=49a95b2b5ced1b68c86341f6b632a946&act=ST&f=19&t=48042&st=15)
+
+	- Experience sprite and cursor not drawing properly
+		? Talk to Max and Alfred
+
+	O Players go through players and hives
+
+	- Crosshair still visible when pop-up menu is open (reported on Mantis)
+
+	- Host_Error: UserMsg: Not Present on Client 57 (dropped all players in middle of game)
+		? Added network debug data to build
+		- Reported on Mantis
+
+	O WONids to SteamIDs
+		- Use WON id
+		- If it returns -1, use SteamID
+		- Returns "BOT" for fake clients
+		- There may be a delay before SteamID is available on connect
+		- LAN play returns STEAM_ID_PENDING
+		- Local player returns STEAM_ID_LOOPBACK
+
+	O Added ready room option below disconnect (and moved it off the pop-up menu)
+		O Ask hlcoder list
+		O Reworked pop-up menus to remove ready room option
+		O Take care of translation technical details first
+
+O Updated all Combat maps and minimaps, and removed HLTV overview files
+O Try mapping local build directory drive to avoid @ errors
+O Update titles.txt and translations for Nem
+	? Write and debug script
+O Manual automation update!  Now manual can be updated from Balance.txt automagically.
+O Added in security, so players will get kicked off server if they aren't authorized
+- Update docs to explain that mp_gametime sets the match time in tourny mode and the time after which the aliens win in Combat.  If running iron man, use mp_ironmantime (recommended at 5).
+- Quick guide
+	? Wrote XP-Cagey, wait for 1st draft
+	? Got first draft, sent feedback
+	- Think about adding Perl statement tags to process data (eg, Combat experience table and percentages)
+
+Combat
+------
+O Reworked resupply, scan and distress beacon to be automatic.  They are cued by the "commander" when you're low in health or ammo, when there's a cloaked alien in view, or when a large portion of your team is dead.
+? Don't allow sayings to be spammed (bug #8)
+O New level up sound (thanks MadMaxx)
+- IMPORTANT: Add game goal tooltips or messages so new players won't be confused the first time it transitions into a new mode
+- Finalize ranks
+- Tooltip help on mouse-over
+- Think about story and context
+- Client crash?
+
+General bugs
+------------
+O Fix dropping hives
+? Recycling is much faster with cheats on (bug #2)
+O Melee attacks never cause a player to be moved (bug #4) 
+
+O 128 HUD sprites
+	? Removed a handful of old sprites, consolidated alien mouse cursor
+	- Merge tech sprites
+	- iplayerdead, comm-blip, should be removed or consolidated
+
+General NS balance
+------------------
+O Fade blink adjustment
+O Brought cost of health packs and ammo down to 1
+
+- Other alien adjustments
+	<pandas|RoQ> Aliens need Hive, 2 fades, 4 forges, 3 res towers, 3 D's, that adds up to 255 res
+	<pandas|RoQ> For us to compete against that on marines... we need....
+	<Flayra|NS-Steam> I'm talking to churro right now about this
+	<pandas|RoQ> 4 res, 1 ip, 1 armoury, 1 upgraded armoury, arms lab, 2/1, proto, jp, 4 jp's, 4 shotguns
+	<pandas|RoQ> 435 res
+
+General features
+----------------
+O New spectator UI (thanks Max!)
+	O This new UI is more simple, informative and easier to use then the old UI.  HLTV overviews have been discarded completely, and they are no longer needed at all.  They have been replaced the NS minimap.  The UI should be especially for great for referees and commentators, as access to the entire map is granted, along with display of all structures.  It is also easy to jump to a single player's view.
+	O Publish screenshots
+	- Fix PIP rendering
+		? Fixed scaling of all but health/armor and overview
+	- Verify behavior with 0 players
+
+O New scoring system
+	O Enabled and chose values (get score for building structures, or for killing players or structures).  
+	O 5 for CC or hive, 3 for RT, 2 for other structures. 
+	O 1 for base Marine or Skulk, 2 for Gorge, 3 for Lerk, 4 for Fade, 5 for Onos, 3 for marine with Jetpack, 4 for marine with HA.
+	O Draw changes on scoreboard, so players can see how many points they get for actions
+
+- Translations
+	O Waiting for Alfred on titles.txt fix
+	O Release to hlcoder list
+	- German
+	- Spanish
+	- Turkish
+	- French
+
+Playtest new maps (X means visually not good enough to be considered)
+	X ns_scifailure 
+	X co_sirius
+	X ns_terra (didn't include co_baal.wad, 291 entities)
+	? co_tasium
+	X co_hyper (flawed layout IMHO)
+	X co_futile (just eww)
+	? ns_ayumi (295 entities)
+	? ns_mystic (266 entities, high r_speeds at a few points, up to 1000 on the ground at map center)
+	? ns_delta
+	X co_diortem (Great Matrix ready room, too boring otherwise, just big halls)
+	X ns_nirvana (390 entities, lighting isn't great, it's pastelly and too bright)
+	X ns_unknown (390 entities, massive and kinda cool though)
+	? ns_mazion_2 (really need to respond to Mazy) (468 entities!)
+	? co_nano (from Nemesis)
+	X ns_hydrosity (317 entities)
+	? co_core
+	- co_nour
+
+X Fix 3rd-person reloads
+	? Added missing code
+	O Put off until a future release
+	- Fix crouching
+	- Missing grenadegun_reload
+	- Shotgun reload
+	- HMG reload needs to be much longer
+	- Add reload sounds?
+
+X Add fun extra flavor sounds ("contact")
+X Fix repetitive crash script
+
+VAC
+	? Fix gamma reset on game crash, and on VAC exit (added _onexit)
+	- Wait until Steam and 2.1 are solid, then VACize and test
+
+Bugs
+	- Fix recycle timing exploit that could lead to an invincible commander (from Roger Dodger)
+	O Selectall now selects dead players too
+	O Increased charge and leap damage
+	O Fixed devour aiming problems and possibility for exploitation (thanks Revenge)
+	- Fix bug where players could change their name into something that as translated from titles.txt (CheezyPeteza)
+	- Lock ex_extrapmax to default (around 1.2?) (DXO, Othell)
+	- Sentries aren't spinning right when searching for a target
+	- Make sure primal scream doesn't affect enemies
+
+NS: Combat
+
+	v2.1a?
+	------
+	- Core representation
+		? Use AddTechNode?  Looks pretty good.
+		? Experience gets stored in vuser4.z
+		? Parse current level out of experience
+		? Change player upgrade to increment health with each level
+		? Weapons can no longer be dropped (check impulse and don't drop on death)
+		? When a player spawns, they get all their stored upgrades again
+		? When a player is killed, find friends in range and split experience among them
+		? Fill in AvHPlayer::ValidateClientMoveEvents
+		? Spawning in waves
+		? Victory conditions
+			? Time limit
+			? Hive killed
+			? All players killed
+
+	- Client menus
+		? Use formatted tooltip that parses tech nodes
+		? Draw it in team color
+		? Have it slide in from the side
+		? Players press one of their weapon select keys to choose.  Code emits impulse, which is stored in a list in the player (unless ammo or health, which is a one-shot)
+
+	- UI changes 
+		? Remove pop-up menu
+		? Remove HUD elements (resources, map?)
+		? Remove hive info text
+		? Draw current level and title/rank
+		? Remove active resource nodes message (but keep handicapping)
+		? Draw player level when looking at them
+		? Draw experience (bar)
+		- Remove/change tooltips
+		- Draw timer on screen?	
+
+	? Draw experience bar prettier
+	? Make sure alien upgrades and gestations come back when respawning
+	? Test distress beacon
+	X Scoreboard changes?
+	? Set default timelimit and test it
+	? Fade/oni getting stuck
+	X When picking up ammo, allow it to go to your primary weapon even if not deployed (increased item stay time instead)
+
+	? Map parsing/checking
+
+	- Code to switch between the two modes
+		- New server variable that switches automatically
+		- Level change keeps current mode preserved (searches for ns_ or co_ only)
+
+	- Misc.
+		? Turn off hints
+		? Fix alien gestations
+		? Fix health increase
+		? Added slight speed increase per level
+		- Fix marine upgrades
+			? Don't fetch from team every tick
+			- What else is wrong?
+		- Fix alien upgrades
+			? Draw multiple upgrades of the same type next to each other
+			- Make sure aliens get level 3 of each upgrade
+			- Remove/lower gestation time for upgrades
+		? Fix alien ability unlocking
+		? HUD blinking in issue
+		? Reset experience when switching teams
+		? Health/ammo upgrades (random distribution to start)
+		? Make sure menu works right when a player gains multiple levels (make the menu appearance server-side, so the menu doesn't go away when there isn't enough room to gestate)
+
+	- Level up effect
+		? Sound effect
+		- Particle system
+		- Play sound when picking upgrade?
+
+	v2.1b?
+	------
+	- After first PT
+		O Alien upgrades not coming back
+		X Make sure aliens always spawn with full health
+		X Move upgrades to F-keys
+		O Fixed percentage display on status bar
+		O Fix problem where you don't get your weapons on respawn
+		O Make sure multiple rounds work after killing a hive
+		O Scoreboard is now sorted by kills
+		O Added new experience bar artwork for each side
+		O Move alien health display left because resource bar not displayed in Combat
+		O Changed default time limit to 5 minutes
+		O Changed ammo/health to "resupply".  No longer creates huge numbers of entities.  Can no longer be spammed.  This should fix some of the network choke issues and server crashes.
+		O Changed experience system a bit to reduce the "slippery slope" effect a bit
+		O Show current level/rank of player you're spectating (it was showing your local level/rank)
+		O Killing a hive means instant-win now.  Aliens can't lose any other way.  Marines can still lose if all players are dead.
+
+	v2.1c?
+	------
+	- After second PT
+		- <[ReD]Lego> Anyway what i was saying is, right at end of round on alien if you evolve. You stay in game i guess like a spectator bug.
+		- <[ReD]Lego> So have one upgrade right before round ends click it evo, bam stuck in map you dont go to ready room
+		X Move upgrade menu to 6-0 (and make bindable)
+		X Get rid of scan?
+		? Disabled invalid structures in Combat mode
+		? Fixup scoreboard
+		? Fix up menu
+		? Check out Enemy Territory
+		? Add voices again
+		? Reduced devour and gestation time
+		? Always draw alien upgrades flush if possible
+		? Remove unnecessary MESSAGE_NULLs when pop-up menu is decided on
+		? Removed Gorge
+		? Fix priority problems (mines/welder, heavy/jp)
+		? Fade/Onos/spawning/equipment
+		? Don't allow "lower" gestations
+		? Pop-up menu changes for lifeforms and ability unlocking
+		? Fixed experience problem which caused faster levelling as targets got to higher levels, instead of slower levelling
+		? Fixed not being able to spawn on late-join
+		- Experience given for making a kill: 80 + (targetlevel - 1)*15
+		- Experience is split evenly among all friendly players near killing player
+		- Experience needed for each level:
+			1 - 0
+			2 - 100
+			3 - 220
+			4 - 360
+			5 - 520
+			6 - 700
+			7 - 900
+			8 - 1120
+			9 - 1360
+			10 - 1620
+
+	v2.1d?
+	------
+	- After third PT
+		O Fixed exploit on alien menu (Shampoo, Romano)
+		O Make sure marines are 2 bites to kill
+			- Look into this more seriously to ensure regular NS balance isn't affected
+		O Decreased tech slope a bit, and spread out marine armor/damage upgrades
+		O Allow all players one level to spend immediately
+		O All guns get two clips of ammo on spawn
+		O Fixed bug where resupply wasn't giving health
+		O Make alien gestate after evolving 2nd/3rd hive ability
+		O Added co_pulse (thanks tommyd!)
+		O New version of co_angst (thanks ChromeAngel!)
+		O Updated co_daimos to beta3 (thanks Hypergrip!)
+			- Completely reworked Marine Start to allow faster choice of routes.
+			- Fixed bug where players got stuck on the pipe at hive (thx Aioros).
+
+	v2.1e?
+	------
+	- After fourth PT
+		O Allow structures to be placed in maps
+			? Move persistent flag out of CommandStation and into AvHBaseBuildable
+			? Check whether built or not
+			? Set owning team
+			? Make sure map reset works
+			- Allow weapons to spawned as well (set groundTime, -1 is infinite)
+		O Reworked tech tree again for balance (and added our favorite pudgy alien back in)
+		O Update victory conditions (killing marine team no longer wins, but killing their CC does)
+		? Decide on initial level to spend or not (removed)
+		O Mines now give credit to owner on kill (also give res on regular NS)
+		O Display correct death icon when killing with mines
+		O Fixed pre-game jittering
+		O Extra experience is now given out when there are more players in range of a kill.
+			- Each player used to get: (80 + (target experience level - 1)*15)/number friendlies nearby
+			- Now each player gets: ((55 + target experience level)*15/number friendlies nearby) + 10
+			- Result: same XP for soloing, but some extra experience given out to offset slower leveling for groups.  Also fixes problem where level 2 targets didn't give more XP then level 1.
+		O Radius for friendly players increased from 400 to 500
+		O Slowed leveling slightly (20% increase per level to 30%)
+		O Marine scoreboard is now sorted properly by kills
+		O Fixed bug where you could evolve to a higher lifeform even when disabled on your menu
+		O Reduced blink power by 25% (less force is applied when you blink)
+		O Added "Iron-man" variation (mp_ironman 1)
+			O Lose all levels and upgrades on death
+			O Experience comes in faster (currently 2x)
+			O Get full health back on level up
+		O New version of co_pulse
+		O First version of co_sepulcher build 1 (from KungFuSquirrel, the ns_eclipse and ns_veil guy)
+			X - Unfinished geometry work in central cavern/room
+			X - No lighting
+			X - Unoptimized geometry
+			X - Hive area to be re-structured to a human manufactured/infested area
+			X - Minimap seems broken
+			X - Map sucks
+			X - No major landmarks (to be remedied by implementing more structure in place of rock/dirt)
+
+	v2.1f
+	-----
+	- After fifth PT
+		O mapcycle.txt now specifies number of players for each map type, so servers automatically switch between Combat and NS (14 max for Combat, 12 player min for NS)
+		O Added min/max player defaults to mapcycle.txt.  When the timelimit is hit, the map/gamemode chosen next will depend on the # of players on the server.
+		O Removed screen darkening for losers in Combat mode
+		O Changed pop-up menu to reflect JP/HA after level 2 armor
+		O New version of co_angst with CC, armory, and expanded marines start
+		O Player collision fixes (thanks Max!)
+		O New version of co_angst
+		O New version of co_daimos
+		O New map! co_kestrel, from the creator of ns_nancy (DevilDog)
+		O Added spawn invulnerability for Combat mode (currently 3 seconds, set by "mp_spawninvulnerabletime seconds").  Also protects player from stomp, webs, etc.
+		O Combat timelimit is disabled by default
+		O Mines are now a "one-shot" (they don't come back when you spawn, like resupply, scan, distress-beacon)
+		O Number of webs allowed in an area reduced from 16 to 8 in both NS and NS:Combat.  Max webs on your team lowered from 60 to 30.
+		O Increased wave spawn time slightly to lessen stomp/shotgun camping annoyance, and to promote spawning in waves (10 to 12 seconds)
+		O Increased XP needed to gain levels (from 30% more XP per level to 40%).  This should alleviate the slippery slope a bit.
+		O Show health on HUD while gestating
+		O Added new NS map for playtesting (ns_metal, by quazilin).  This thing looks fantastic.
+		O Added alert for marines when their CC is under attack (this change takes effect in regular NS mode as well)
+		O Verify/fix authentication (make sure it works for WON too)
+		O Fixed resource tower particle system
+		O Fixed problem where using the switch command didn't spawn you immediately
+		O Level-up tooltip message now goes away after a short time
+		O Combat timelimit turned off by default
+		O Fixed mine/owner bug that allows mines to hang in mid-air
+		O Replaced level up sound with a spare legitimate one
+
+	v2.1g?
+	------
+	O After sixth PT (final combat beta)
+		? Levelup sound request to Madmaxx
+		? If players aren't authorized, kick them off server
+		O Draw unspent levels on HUD
+		? Keep experience and purchased upgrades after leaving server
+		O Set mapcycle defaults to Combat on 0 players, and other good defaults
+		O New co_kestrel
+			Elevator shafts changed a bit to cut down on vertical travel
+			Elevator shafts have double ladders now
+			CC moved out of alcove
+			2nd armory placed where CC was
+			Vent to old back way into hive lowered to let marines crawl in
+			the old "lower" back way hall removed
+			New "back" way into hive created (much faster travel time now, still goes through EDS room)
+			A few halls and doors more ohno friendly
+			Assorted texture fixes
+
+		O Fixed bug where aliens don't spawn with full health
+			-get damaged
+			-gestate with a new trait
+			-die
+			-respawn with the same health after previously gestating
+
+		O Fixed bug where welding progress bar overlapped other screen elements
+		O Added hive health percentage to status bar (when you look at it).  Works in regular NS as well.
+
+	v2.1h?
+	------
+	- After seventh PT
+		O Fixed scanning problem so it only scans when it detects cloaked players nearby
+		O Remember spectator settings fully
+		O Fixed problem where numents and entityinfo weren't printing info properly (worked for debug code, but not in released NS)
+		? Changed iron man variation
+			O Same experience curve, but only life per game
+			X Can spectate both sides
+			? set mp_ironmantime to minutes after which, aliens win
+			- don't let players rejoin after they've been killed, before latejoin elapses
+		- Write EJ every day this week
+		O Fix network metering to track down error
+		- Test full install
+		O Fixed turrets (broke with placeable CCs and structures)
+		O Fixed problem where light damage showed blinking O on HUD, and spit showed a HL icon 
+		O NS Balance
+			O Health pack staying at 2, ammo down to 1
+			O Fade cost up to 60
+			O Recycling unbuilt/built structures now gives 100%/50% resources back, instead of 80%/40%
+			O TF reduced from 15 to 10
+			O Armory reduced from 15 to 10
+			O Increased sentry health from 1200 to 1300
+			O Reduced motion-tracking cost from 45 to 35
+		O Only show hive health friendly players
+		O Distress beacon now respawns friendly alive players back at base as well (could be abuseable, but I think it's worth the risk)
+		O Pheromones replaced with "Enhanced Hearing".  This upgrade allows aliens to "listen" to nearby enemy build/drop/research messages (level 1 = 500, level 2 = 700, level 3 = 900).
+		X Occasional respawning problem from ElvenThief
+		O Fixed live particle editing (bug #39).  Also fixed annoying problem where toggling the edit PS screen jarred your view.
+		O Fixed siege targetting, and turrets targetting structures
+		O Fixed bug where observatory couldn't be used to target for siege (and in fact blocked siege)
+		- Need new levelup sound
+			? Wrote MadMaxx
+		X Norman Chan PC Gamer quotes
+		O Make sure iron man doesn't affect regular NS
+		O When speccing first-person, don't draw our own unspent levels 
+		O Fixed bug where Lerk didn't require Gorge first in Combat 
+		O Fixed problem where light damage showed blinking O on HUD
+		O Added ability for servers to add custom icons for members (mp_customicon of "AAAARGB" where the custom icon is gfx/vgui/640_AAAA.tga, using color components RGB (each are 0-9).  Use player authentication mask is 512.)
+		O Fixed problem where mines are doing damage to friendly players and structures (bug #26).  Affects mines, grenades, xenocide and bileomb, so watch out that they didn't break.
+		O Fixed problem where marine upgrades weren't being drawn in NS mode
+		O Fixed problem where mines could be stacked (bug #34).  They are now solid, with the following ramifications:
+			O They can be stacked on each other, but it is immediately obvious.  A stack of mines now looks like a stack of mines.
+			O Mines are can be stood upon.
+			O Mines can be killed by regular projectiles, including parasites and friendly fire.  Mines have 30 health.
+		- Fonts
+			- Corruption
+				? Build notifications
+				? Occasional missing first upper-case character in location, and autohelp on right (alien only?)
+				- Popup menu and your "rank" that appears when you go up a level are still corrupted, but will be fixed with a Steam update next week
+			- Reduce 1024x768 font size (CC help text interferes with location as marine)
+			- Missing bitmap font: gfx\vgui\fonts\640_OverwatchScheme.tga
+		O Showing enemy names shouldn't work on cloaked players (bug #32)
+		? Recycling TF/Siege problems (recycling a TF while nearby turrets were recycling prevents turrets from ever finishing recycle)
+		O Make MT blips appear on minimap for commander and marines (bug #31)
+		O Don't draw motion-tracking circles for soldiers any more (just blips on their map)
+		O Turrets now animate smoothly (bug #41)
+		O Fixed recycling TF/Siege problems (bug #36)
+		O Turrets and siege turrets now play their "power-down" animation when they recycle, instead of their attack animation
+		O Updated co_pulse and co_faceoff
+		O Added polish to first-person spectating, including highlight on mouseover, next/prev player buttons, and the ability to click players on the overview to switch to their view
+		O Fixed bug where players gestating on entities could sometimes fall through them
+
+	2.1i
+	----
+		O New levelup sound (supposed to be a rush of energy)
+		O Fixed all hitbox issues (Max, you da man!).  This should fix the problems where players crouching behind structures could become harder to hit ("Crouching Skulk, Hidden Damage").  Bug #84.
+		O HLTV/model problems, where sometimes the wrong model would be drawn
+		O Manual script should allow division or multiplication by a number
+		O Don't scan or resupply in Combat while being digested (bug #69)
+		O New game_menu NS logo from Def One
+		O Fixed bug where typing "kill" as commander meant you were unkillable even after killing CC (bug #74)
+		O Updated ns_metal
+			* Removed 2 res nodes
+			* More particle effects
+			* More ambience sounds
+			* Bug fixes
+			* Fixed ladder bug (thanks Ekaj)
+			* More vents/hiding places
+		O New map for playtesting: ns_agora_beta3.  Please give feedback in BI forum, I'll e-mail to the mapper ("kawaak").
+		O Fixed: Siege cannons no longer fire on "detected" targets, only on visible targets
+		? Addressed "57" bug by not messaging players when a player is booted for not being authorized (not sure if this is the problem, but it seems reasonable)
+		O Siege cannons no longer fire on "detected" targets, they must be visible.
+		O Removed entity "detection" when near players and moving.  While originally used to allow the commander to detect threats before players can see them, it no longer works with the minimap.
+		X Decide whether to recompile all maps for Onos/respawn change or not
+		O Removed automatic detection of moving players in Combat mode (just affects minimap)
+		O Updated co_core minimap because it was out of date
+		O Moved both mines and the welder to slot 4.  This means you can hold your pistol along with one of them.  However, you still can't have both mines and a welder.
+		O Removed debug code that spawned player as Onos
+		O Fixed bug where typing "kill" as commander meant you were unkillable even after killing CC (bug #74)
+		O Fixed Command station not ejecting the commander on death (introduced with mapper-placed structures)
+		O Added missing sound for aliens getting resources
+		O Put back in knockback for bite, claws, gore and swipe (it affects balance too much to remove without careful testing)
+		O Fixed tech tree dependency problems (bug #37)
+		O Cloaked players are barely decloaked when touched (bug #59)
+		O Fixed bug where players were uncloaking without fading in smoothly
+		O Don't allow mines to be placed func_doors, func_door_rotatings, or 3rd-party entities (bug #64)
+		O Fixed "cannot click 'need' icons in commander mode" (bug #73)
+		O Removed the overview file loading which isn't needed in the new spectator mode (bug #104)
+		O Removed many unused sprites, which should fix the "128 HUD sprites" error
+		O Fixed bile bomb / acid rocket / stomp can be fired through thin walls (bug #67)
+		O Fixed players gestating "through" things (bug #33).
+		O Fixed bug where authentication queries were happening too often (every hour instead of every 2 hours)
+		O Secure playtest servers now update authentication data every 10 minutes or so, resulting in less chaos and frustration for last-minute SteamID updaters (bug #109)
+		O Fixed bug where armory and phase gates useable while being recycled  (bug #65)
+		O Replaced Enhanced Hearing with "focus".  Each level of focus slows your weapon/ability rate of fire by 30%, and increases effectiveness (damage, duration) by 10%.  Doesn't currently give a benefit to use of umbra or blink.
+
+	2.1j
+	----
+		O Update Constellation DB and e-mails
+		O Fix focus issues where marine weapons could be affected
+		O Each level of focus now slows attacks by 20% instead of 30%
+		O It's now impossible for primal scream to affect marine weapons (couldn't repro the bug, but it can't happen any more)
+		O Removed locational damage
+		O Check out co_nour from RoQ
+		O Try out new levelup sound and decide
+		O Removed Pheromones effect
+		O Fixed bug #77: When a player hits ESC to get to the root menu, the text "#Menu_ReadyRoom" appears instead of "Ready Room". 
+		? Update security to allow Constellation members
+		? Disable/remove auto-director checkbox when not in HLTV mode (Max)
+		O Fixed "Gestating while leaping causes crash" (bug #102) (thanks Alpha & the whole GaB-Clan!)
+		O Restore default menu after recycling a structure (bug #86)
+		O Removed hive locations and hives not under attack from hive sight (now that they are on map)
+		O Any unauthorized player that tries to spectate will now be kicked as if they tried to join a team (bug #23)
+		O Removed legacy "frost" damage icon shown after being digested and while drowning (bug #68)
+		O "Transient" entities (ammo, health, weapons, scans) no longer show up on commander minimap (bug #92)
+		O Fixed shotgun reloading problems (we think).  Bug #27.
+		O Removed display of a lot of non-essential error tooltips with autohelp off
+		O New version of co_ulysses
+		O Rewrote entire font rendering engine to get rid of Steam corruption (go Max!)
+			http://www.lmnopc.com/bitmapfontbuilder/
+
+	2.1k
+	----
+		O Onos armor increased from 100 to 300 (hitbox compensation)
+		O Fade armor increased from 50 to 100
+		O Resupply doesn't help out as much at the higher levels
+		O Some font fixes and experience bar fixes
+		X Overviews in Combat are messed up, disable for Combat?
+
+	2.1l
+	-----
+		O Added view interpolation while gestating (!)
+
+	2.1m
+	----
+		O Fixed font drawing (there's a new chat system).  Affects chat and death messages.  Please give feedback in the forum.
+		O New player/entity collision system so that entities can use more accurate, oriented bounding boxes (bug #35).
+		O Fixed skulk wallwalking on entities (it was accidentally broken at some point).
+		O Changed resupply to only give one health or ammo pack at a time (gives out health first, then ammo)
+		O Sped up evolve time of alien upgrades in Combat mode
+		O Fixed jetpack energy not drawing
+		O Removed speed increase with levels in Combat
+		O A team can now wins in "iron man" mode when all players on the other team are dead.  Aliens win after two minutes if the hive isn't destroyed and they are still alive.
+		O Increased Onos armor from 300 to 400
+		O Sped up gestations for ugprades in Combat
+		O New version of agora (mapname: ns_agora)
+		O Focus upgrade now says "Focus" on pop-up menu instead of "Pheromones"
+		O Reverted motion-tracking back to old way, so it shows up on your HUD again (needed for Combat, and more useful in NS)
+		O New level up sound for marines, added different sound for alien level up as well
+		O Fixed bug where hive construction could be sped with +use (bug# 139)
+		O Fixed bug where gorges could construct chambers in Combat using impulses (bug# 145)
+		O Fixed bug where aliens didn't always respawn with full health (bug# 143)
+		O Gamma is now reset when hitting ESC to Steam menu from in-game, or when hitting alt-tab!
+		O New version of co_ulysses
+
+	2.1n
+	-----
+	Private:
+			O Crash bug(s)
+			- http://www.natural-selection.org/forums/index.php?act=ST&f=18&t=48187&hl=&s=1ce7269981ff8047764fa0004efcdf7a
+			Confirmed: Duffy crashes on WON, under 2.0 and 2.01 every time on ns_eclipse, by joining marines.  GF4 MX, XP-Pro.  Crashes every time.
+				Screen freezes, sound loops. I have to Ctrl+Alt+Del it.
+				Detonator: 6.14.10.4403
+				There are a couple of frames of animation before it dies. Sometimes the black fade-in is completely opaque, sometimes I can slightly see through it. The health, armor, ammo is all there. So is the view model (and it goes through a couple of frames). The extra LMG and Pistol ammo is obtained (and indictated by the pickup sprites on the right).
+				Shortcut: C:\Sierra\Counter-Strike\cstrike.exe -console -game ns (Starts in: C:\Sierra\Counter-Strike)
+				Tested under HL too, it happened
+
+			Confirmed: 
+				NS v2.1m
+				Geforce FX, Win XP, SP1, detonator 6.14.0010.4469
+				<SantaClaws> well i can reproduce mine every time basically
+				<SantaClaws> not the first game...
+				<SantaClaws> but any game after that, if i go into rines as the first player
+				<SantaClaws> someone joins aliens, i crash
+				<Sandrock> I randomly crash even when in the readyroom, not in a join portal
+				<SantaClaws> actually i think if i get into rines b4 any aleins comes in i crash
+				<SantaClaws> hehe yeah then sometimes i'll crash in ready room too
+				<SantaClaws> may only be when i've been on aliens but i cant confirm that
+				<SantaClaws> ooer we have a winner
+				<Sandrock> hehe
+				<Sandrock> santa joined marines, i joined aliens with bind = crash
+				<SantaClaws> :)
+				<SantaClaws> every time i tell you
+				Doesn't crash if one person goes aliens, then you're the first person to join marines
+				Crashes 90% of the time when one person goes aliens, and he's the first person to join marines
+
+			<Moebius|naacg> i have never crashed
+			<Moebius|naacg> i have a geforce4 mx 440 with agp8x, version: 4.5.2.3
+			Some are crashing to desktop, others get nvogl error screen
+
+			Immacolata:
+				Spec: XP1 Pro SP1, Audigy Platinum (drivers 383 - latest webupdate), GeForce 3 Ti w 52.21, VIA KT333 mobo with 1,0 Gig.
+				Crashing to desktop
+				<Immacolata> I have no error screen, its straight to my desktop
+				<Immacolata> I have had one OCCASSIONALLY
+				<Immacolata> but I havent seen the box for a long while now
+				<Immacolata> it might be from an earlier build
+				<Immacolata> frequency, predictably if I join marines as the first
+				<Immacolata> at least two times today when we tested
+				<Immacolata> (not a lot to make sure fire statements on!)
+				<Immacolata> BTW I play with 32 bpp, EAX 1 , both igh and low quality but that didnt seem to change it
+
+			<jacksonj04|> Radeon 9600 crashed on NS:C when present on a team for the start of a round (2.1m)
+				it was a crash to desktop, which happened on co_pulse (I think) when joining marines.
+				it happened if i was in the marine start area as a round started
+
+	Public:
+	O Fixed bug that ended a Combat game prematurely if everyone on the team died
+	O New version of ns_metal
+		* Res node location changes
+		* Named: Cargo -> Storage D
+		* More details.
+	O New ns_veil
+		O Removed Monitoring Pods
+		O Fixed floating clip brush o' doom
+		O Fixed doorways with Onos movement issues
+		O Small lighting tweaks
+		O Contemplating additional route just north of dual nozzle - either a vent or hallway. Not sure yet. Need feedback on this point.
+	O Fixed gamma correction on HUD text
+	O Fixed the bug which prevented living players from seeing dead players' chat messages (bug #10)
+	O Fixed jetpack fuel meter not displaying in regular NS mode -- hopefully for real this time (bug #72).
+	O Fixed bug where Steam UI would steal the mouse cursor in spectator mode (bug #15).
+	O Fixed bug where Steam UI would create a double cursor in commander mode (bug #97).
+	O Fixed ability to jam doors with mines by having them explode whenever a door runs into them.  Doors now blow up mines when they are jammed by them.  Allow mines to be closer to invalid targets like conveyor belts and lifts now.  (bug #88)
+	O Fixed bug where mines started with 10 reserve ammo in Combat mode (bug #156)
+	O Fixed bug where using the kill command and then jumping into the comm chair did Bad Things (bug #74)
+	O Fixed problem on ns_eclipse where marine start in commander mode penetrated the ceiling (bug #146)
+	O New optimized ns_ayumi (should seriously decrease server CPU and associated lag)
+	O Disabled "kill" command in Combat (as there's no way you can get stuck, it can only be abused)
+	O Fixed bug where semicolons would truncate chat messages (bug #176)
+	O Fixed gestation overlay not being drawn while in Steam UI (bug #45)
+	O Fixed popup menu stealing crosshair.
+	O Fixed view jog when releasing the popup menu or returning from the Steam UI.
+	O Fixed colors for death messages.
+	O Updated server.cfg and listenserver.cfg to set "mapchangecfgfile", so the .cfg is executed after a map change (this will solve the sv_maxspeed and Commander Mode scrolling problem)
+	O Added default sv_region value to server.cfg and listenserver.cfg (if not set, it won't show up in Steam server browser)
+	O mp_friendlyfire variable is now used in non-tournament mode (though tournament mode ignores it, and acts the way it always has).  Bug #44.
+	O giveupgrade and removeupgrade now work with cheats enabled (for grep/testing only)
+	O Fixed bug where marine structures played a bad-looking animation when they take damage
+	O Now marine structures play their deploy animation backwards when they are recycled (bug #53)
+	O Recycling strucures now show rings
+	O Allow recycling of non-occupied CCs
+	O When a structure is successfully recycled, draw a rising indicator showing the number of resources received
+	O New optimized ns_ayumi (down to 175 entities, should seriously decrease server CPU and associated lag)
+	O Distress beacon no longer affects commander
+	O Distress beacon now removes webbed and stomp effect (bug #58)
+	O Double-check network debug isn't being included somehow
+	O Fixed new bug where if all players on a team are dead, the round ends (non-ironman).  Bug #172.
+	O Fixed bug where +popupmenu gets stuck if active while changing modes 
+	O Nodes sometimes stay visible when much lag is present (300+ ms). Bug #168.
+	O Fixed bug where jetpack and HA interacted strangely, and other upgrades that invalid previous upgrades didn't act right (bug #124)
+	O Fixed HP/armor popup text never goes below 1% (bug #56)
+	O Fixed jetpack energy emptied when exiting command console (bug #46).
+	O Fixed stuck after gestating from fade to gorge while ducking (bug #122hh)
+	O Probable fix for nasty resetgame/skin crash bug! (bug #7)
+	O Reduced HMG damage from 20 to 18
+	O Fixed ESC in chat (bug #188).
+	O Fixed ESC in commander mode.
+	O Fixed chat for non-US keyboard layouts.
+	O New version of co_pulse (removed one armory, easier access to CC)
+	O New version of co_faceoff (streamlined, new vent, killer new ready room!)
+	O Fixed sv_region bug which caused servers not to be visible in the browser
+
+	2.1o
+	----
+		O New ns_agora
+			O The surrounding of the marine start are reduced a lot  (all the corridors arround).
+			O so the layout has changed a bit
+			O sewer's hive has moved (downward) and there is a new siege room (not finishes yet..)
+			O this siege room has a funcO weldable to "evacuate" the water and allow the comm to build in it
+			O "The pit" is "retextured" with more "cleaver"(brillant) textures, and i've added more crates in it.
+			O some nex things (textures, lightings..) almost everywhere
+		O Fix for lerk flying animation going into the ceiling (bug #152) (Thanks def_one!)
+		O Improved the chat visuals (changed the font and colors and moved it so that it doesn't overlap other HUD elements) (bug #174).
+		O Fixed chat and death messages not showing up while being digested (bug #161).
+		O Fixed right clicking not properly canceling a building in commander mode (bug #197).
+		O Fixed bug where spectators couldn't see living player's chat (bug #10).
+		O Re-added lerk bite in place of spikes!
+		O Tweaked lerk physics to allow more control
+		O Fixed entity leak, resulting in nasty server performance. (bug #183)
+		O Locked cl_rate to 9999 to prevent exploits
+		O Changed focus to affect only slot 1
+		O Increased hive healing rate in Combat mode
+		O Webbed players can now be unwebbed by welding them
+		O Added "catalysts" to marine tech tree!
+			O Research at arms lab, allows dropping of "cat-packs"
+			O A marine that touches pack, gives +25% movmement speed and +25% rate of fire for 8 seconds.  The marine also takes damage equal to 25% of his max health, but it will never kill him.
+		O Increased hive health from 6000 to 7000
+
+	2.1p
+	----
+
+	2.1q
+	----
+	private:
+		? Write Eric S.
+		? Quick guide response to Jeff
+		- Quick guide work with Karl
+			- Need to add damage types
+			- Jeff: add note on commander ejection at end of the commander section
+		
+		? Post to dev about team changes
+			- Make preliminary team changes
+
+		O Get flayra@natural-selection working right, and get HAMBONE set up with steve@natural-selection.org
+		O Updated mapping guidelines with BB/CC rules (also alien RT rules)
+		O Weapons have no weight in Combat? (weight seems to be working properly)
+
+	public:
+		O "Disabled" software rendering mode to prevent exploits (bug #208).
+		O Fixed the bug where phase gates can be blocked by alien chambers.  Now any structures on the phase gate (except a hive) will be killed when someone goes through. (bug #190).
+		O Enabled +showmap in combat (bug #202).
+		O Fixed chat text overlaps command minimap (bug #220).
+		O Fix for keys not being released properly while the chat window was open.
+		O Changed chat so that it does not go between the ready room and observers.
+		O Fixed team chat bug
+		O Fixed bug where lerk bite was doing damage of skulk bite (75 instead of 50). However, the bite still does 75 currently, until balance indicates otherwise. Bug #344.
+		O Fixed bug where cloaked structures other than SC weren't uncloaking properly which touched (bug #134)
+		O Fixed focus ROF issues
+		O Add CS-like hotkeys to spectator mode (jump to switch view modes, left to go to previous player, right for next player)
+
+		O Updated version of ns_metal from quazilin
+			Map has currently 7 resource nodes.
+			+ update-4
+			* One res node removed
+			* Cooling sys - Res node location changed
+			* Little tweaks
+			* Cooling hive easier to heal now
+
+		O New co_daimos
+			O Reworked Hive Area.
+			O "Repaired" ladder at Marine Start to give Aliens easier access this way.
+			O Lowered ceilings in some areas a bit.
+			O Added additional lights to Cargo Area, Upper Tram Area and Central Sewer Area.
+
+		O New catalyst pack sound
+		O Removed health increase for each level in Combat.  If this sucks hard, we'll put it back in.  Hopefully this will both prevent jetpacks/resupply from being all-powerful, and allow more alien diversity.  It also means combat is closer to NS mode.
+		O When you level up in Combat, you get 20% of your health back (increases heroics, soloing, and reduce dependence on hive/resupply).
+		O Fixed commander mode exploit for research trasference to wrong building (bug #199)
+
+		O Fixed bug where you couldn't +use (switches, phasegates) anything when reloading, or use sayings.  Bug #116.  (also fixes bug #182: "HMG sometimes not received immediately if purchased while reloading shotgun", also fixes "unspent level could added back after being spent" (bug #209), also fixes "joining a game causes temporary loss of HMG or GL" (bug #166))
+		O Swapped spit and health spray back to 2.0x configuration (so spit is focusable, healing spray isn't)
+		O Fixed bug where givepoints plays a sound in combat mode (cheats only, bug #153)
+		O Refactor "set commander" message, fixing problem where current commander couldn't always be seen by late-joiners and HLTV spectators (bug #195).
+		O Removed "active node count" messages.  I think I'd like to test it without.  This was originally a tool for finding big balance problems, and as we got closer to the 2.0 ship date, it was too risky to remove.  Now is the time to remove it, to see how it plays without it. (bug #231)
+		O Reduced size of Onos "ring" 
+		O Fixed various problems with mines and commander mode (bug #95)
+		O Fixed bug which was preventing mines from getting damage upgrades
+		O Fixed "catalysts don't require research" (bug #223)
+		O Increased jetpack energy cost by around 30% to make it more close to 2.01 levels
+		O Fixed sprite/font rendering artifacts in Direct3D mode (bug #234)
+		O Stop-gap collision fixes (fixes resource towers for now)
+		O Lerk Flight v2.0!  Has both Flying (tap jump) and Gliding (hold jump).  We have more work to do here, but I think you'll see that Max made him MUCH more maneuverable.  Make sure to press in the direction you want to fly while flapping.
+		O Fixed bug where you couldn't talk or +use while you were reloading (finally!)
+
+		O Scoreboard v2.0
+		   O Don't show enemy scores (bug #28)
+		   O Add kills column (so both kills and score are shown)
+		   O Sort players by score, which is non-combat points + kills - deaths (bug #224)
+		   O Free up room to display tracker icon
+		   O Gamma-corrected scoreboard labels
+		   O Don't draw +/- score when going to ready room
+
+		O Items, weapons and structures will no longer fall through sloped surfaces or stairs!  There is still a problem with railings that we're working on.
+		O Code to get ready for changing the grenade launcher to reload like the shotgun, this should be in 2.1r
+		O Fixed bug where aliens can see some "health received" and "ammo received" messages (bug #61)
+		O Fixed problem where "ready" didn't set team ready in tourny mode (maybe a side effect of the new chat system?)
+		O Refactored shotgun into AvHBaseReloadableWeapon, in preparation of extending grenade launcher off this (as soon as the artwork is done)
+		O Fixed bug where "phase tech" research option not disabled after research completed (bug #75)
+		O Charge damage increased from 240/second to 320/second
+		O Leap damage increased from 60/second to 80/second
+		O Fixed "hive is under attack" sound not played soon/often enough (fixes other important alerts too) (bug #48)
+		O Fixed bug where "hive is complete" sound rarely plays (bug #43)
+		O Fixed "frozen" turrets/siege turrets bug (bug #83)
+		O Fixed bug where recycling unbuilt structures doesn't return correct amount of resources (was going to be 100%, but needs to be lower for gameplay reasons).  Now it returns 80% of the cost.  (bug #204)
+		O Added alien resource overflow (bug #87)
+		O Fixed "alien 'use' sound played during failed attempt to use marine radio command (bug #159)
+		O Reduced time to wait before reusing the command station from 12 seconds to 5 seconds (if we start seeing overflow issues, I'm going to change this back)
+		O Increased electricity range, to encourage alternate defense, and in anticipation of new structure spacing (also fixes problems where tricky aliens could sometimes munch electrified targets without taking damage)
+		O Fixed bug where loss of arms lab upgrades if armory is recycled (bug #185)
+
+	2.1q part deux
+	--------------
+		O Clamped airspeed for all players (this came undone somehow).  Rolled back jetpack energy cost to compensate.
+		O No longer subtract deaths from score to avoid commonly negative scores.  Also, in case of tie score, sort by least # of deaths.
+		O Fixed ultra-fast welding
+		O Lowered rate of fire on lerk bite
+		O Changed lerk flight so that flapping "up" uses the world space up direction and not the object space up direction.
+		O Added new version of co_ulysses
+		O Added a minimum build radius for marine buildings.  Increased electricity distance slightly to compensate.
+		O Fixed a bug which caused the client to crash if ESC was pushed in the Steam UI before a game was joined.
+		O Some minor player/object collision improvements (so players can fit through gaps more easily)
+		O Test delta when commanding
+
+	2.1r
+	----
+
+	Private:
+		O Fixed min build distance problem
+		O Test ns_depths
+		? Fixed bug where incorrect GL auto-reload sequence played when fewer than 4 rounds in reserve (bug #151)
+		O Test co_exit_b1
+		O Test co_dawn
+		hlds
+			- -console -maxplayers -game nsp -port aslj +map 
+
+	Public:
+		O New agora
+			_in Marine-Start: Window removed, and downward entrance modified to resolve some FPS issue
+			_in M-S: Lowered the platform
+			_in M-S: moved the "Ressource point" near the crates
+			_"The Pit" is modified and reduced (a bit)
+			_the "Steam tunnel" is completely removed (so there is only one acces to "Cargo Hive" for marines, but there is still 3 vents for aliens/jetpack)
+			_Ressource Point in "U-turn" has moved into "Tunnel" (the side near U-Turn)
+			_"U-turn" is reduced and has a new name: "C-Blue LT21"
+			_The corridors to acces "Tunnel Hive" are redesigned
+			_The room between "Tunnel" and "Freight Elevator Acces" has now a name: "Piping's System 42b"
+			_New textures in "Pumping Station 01" , the "underwater acces" is a bit modified.
+			_Ready Room's lighting modified
+			_Typo's error (info_location) fixed
+			_Added more sounds and  2 particles systems
+
+		O Added votemap system (especially for vet program) that works just like in CS.  Type votemap for a list of maps and their current votes.  Type votemap # to cast your vote for a map.  Servers can disable by setting mp_mapvoteratio to -1, or can set the percentage of players needed for a vote to succeed by setting mp_mapvoteratio from 0-1.
+		O Fixed bug in umbra that was causing it to block 1 in 3 bullets, instead of letting through 1 in 3 bullets
+		O Minor tweaks to the sprite rendering to fix missing pixels on certain font characters.
+		O Fixed bug where players couldn't be muted via the scoreboard (mouse behavior) (bug #211).
+		O Fixed one pixel border on some of the minimaps (bug #275)
+		O Changed the font on the popup menu so that it fits in the nodes better.
+		O Changed the mouse input to invert the horizontal axis if the camera is upside down (this is neat if you are flying and you set cl_pitchup and cl_pitchdown to 1000)
+		O Fix for "lines" showing up on the minimap.
+		O Change marine resource and commander status labels to use the NS font drawing routines so that they have a more consistent appearance with the rest of the HUD.
+		O Fixed the bug where items and buildings would drop through the floor if they were placed on railings (bug #125) (!!)
+		O Fixed structures sinking when placed in vents (bug #148) (!!)
+		O Fixed hive spawning bug
+		O Added catalyst-pack artwork
+		O Fixed airspeed cap problems (back to 2.1o)
+		O Lowered lerk bite damage from 75 to 60 to avoid hard to stop one-bite focus kills
+		O Tweaked lerk flight energy cost, physics and ground speed (to not feel quite so heavy, and to be able to really soar)
+		O Fixed issues with blinking while on the ground (bug #221)
+		O Fixed bug where HA footsteps didn't play when armor 3 was researched (bug #49)
+		O "numents" command now works with cheats on, or in playtest builds (this is for you Grep)
+		O Fixed problem with bullets not hurting teammtes with mp_friendlyfire 1
+
+		O Combat issues
+			O Changed wave spawning so there is a minimum wait of 8 seconds before respawning (ie, you will spawn with the next wave).  This will make respawning groups smaller, allowing bases to be attacked more easily.
+			O Players now gain full health and armor on a level-up
+			O Increased amount of experience needed to go up each level from 40% to 50% (so players level up slightly slower, and higher levels significantly harder to get)
+			O Removed minimap from Combat
+			X Aliens now gain Combat experience when alive
+			O Players now get experience for damaging hive or CC
+
+	2.1s
+	----
+	Private:
+		O Profiling enhancements
+		O Write Galen about kestrel improvements
+
+	Public:
+		O Fixed lurching skulk movement on func_seethroughs, in water, on ladders, and more! (bug #140, bug #103, bug #313) (Thanks Mouse and Khaim!). THIS IS HUGE.
+		O Server CPU work (blasted turrets).  This should fix all the lagginess and bad server performance we've been experiencing in NS mode (bug #278). THIS IS ALSO HUGE.
+		O Fixed players getting stuck in vents after gestating to a fade (bug #209)
+		O Fixed players getting stuck when gestating from onos to skulk on a ramp (bug #205)
+		O Now players get XP for welding the CC or healing the hive (if it gets abused in tourny mode, I can fix it).  Only give experience for hurting enemy structures or repairing friendly structures.
+		? Scan is now more effective in Combat (cloaked player no longer has to be in sight, only in range)
+		O Mine kills no longer share experience to players that happen to be nearby to the mine owner when they detonate
+		O Focus now slows down your rate of fire more, making it more of a finesse/anti-player upgrade (it's original intent)
+		O Lowered XP for damaging (or repairing) objective slightly
+		O Added "player voted for x" message on votemap
+		O Fixed problem where players wait more then 20 seconds to spawn, while waiting for someone else to die
+		O Fixed bug where hive is gimped if killed and rebuilt (bug #292).  You will not be forgotten, Surface Access Hive.
+		O Resupplying at the armory is now at the correct speed (faster then it was in 2.0x, but slower then in 2.1r)
+		O Fixed bug where structures could be knocked around by a melee attack (bug #4)
+		O Fixed problem where overview mode still available by pressing your jump key to cycle modes
+		O Fixed problem where overview mode wasn't available in NS mode
+		O Fixed problem where leaving an NS map and going to a Combat map let you use overviews briefly
+		O Fixed bug where spectators could sometimes suicide (bug #303)
+		O Included agibs.mdl and hgibs.mdl with install so mp_consistency always works (bug #297)
+
+	3.0a
+	----
+	Private:
+		O Test manual changes
+			- Focus damage
+			- Cloaking upgrade speed
+			- Leap and charge
+			- Leap and charge autohelp damage
+			- All alien abilities
+			- Aliens ROFs
+			- Max webs in area, max alien structures of same type in area
+			- Redemption
+		O News post on UGS
+		O Constellation memberships
+		O Fix car with dad
+		O Announce v3.0 (and UGS)
+		O Send out PR to news sites?
+		X Weapon rate of fire problem
+
+	O Vet mailing list and tools for HAMBONE
+		O Waiting on Joe
+
+	Public:
+		v3.0a (For NS LAN)
+		-----
+			O Fixed bug where aliens sometimes appear as a marine player and then turn into a skulk. when dying, sometimes an alien player will briefly appear as a marine (bug #193)
+			O Fixed turrets/OCs targeting anomalies (bug #329)
+			O Fixed music playback (updated to FMOD 3.7.1)
+				O Fixed problem where music stops playing on map change
+				O Fixed problem where music stops playing when going to third person camera
+			O Fixed grenade launcher reload animations
+			O New siege deploy animation and "inactive" state (thank Mojo!)
+			X Focus not working on win32 (build in release, Max)
+			? Near-final version of ns_agora.
+				O Just 1 big change in this version concerning the second acces to Cargo Hive (re-added especially for you ;) )
+				O Added 2 or 3 crates in "The Pit" and "C-Transport" and 1 vent to acces "Analysis Lab".
+				O Fixed format of sounds (giving conversion errors)
+				O Added missing xsmoke1.spr sprite
+			O Fixed acid rocket colliding with attacker when moving forward (bug #163)
+			O Fixed bile bomb, acid rocket and stomp able to be fired through thin walls (bug #67)
+			O Added new hive flinch anims for when hive is building (thanks Mojo!)
+			O Updated infantry portal artwork to get rid of z-buffering issues (thanks Mojo!)
+			O Fixed welding/healing exploit in Combat (bug #328)
+			O Renamed version to v3.0 :)
+			O Removed spawn invulnerable time by default in Combat (as a test)
+
+			O Updated co_angst (ChromeAngel)
+				- New sounds, a new sky, changed lighting, more sensitive doors and warning sights on the closed doors.   
+				- Can you give me some feedback on the lighting and check the terms of use in the skybox use are compatible with NS before I send in the MAP and the rest of the gubbins.
+				- I’m thinking of moving the doorway from the bridge to the observatory further towards the back of the bridge, I think this might work around a VIS glitch in the observatory.  Since no-one else appears to have noticed and it could cause an r_speed jump elsewhere it I’m not sure it’s worth doing.
+				- Write about nebula skybox (get Chalupa to create?)
+
+			O Updated co_kestrel (DevilDog)
+				- There is a new way into the hive.  When taking the Subhangar 5 route, after passing through the subhangar, and going through the elevator shaft, you turn left normally.  I've opened up the right side door now as well which uses a small corridor that dumps you into the hive - right under it in fact, where the closed door use to be.  This leaves a total of 4 ways into the hive now.
+				- I widened the hall from the hive to the comm room.
+				- Moved the hive up so the room is clear and move friendly.  
+				- The hangar I dropped portion of the floor (turned it into a lift) and tucked the CC down in it.  Its open enough so its not like it was before when it was in that alcove originally, but the lowering of the floor gives it cover from respawning marines (They need to run up to it and look down).
+
+			O Updated co_ulysses (Blueman)
+				:: New RR (still needs some work)
+				:: New MS cause many people hated old one.
+				:: Added another vent (4 in total)
+				:: Changed lighting all over the map.
+
+			- Last TODO before LAN:
+				? Talk to PAQ and get build to Web2zone
+				O Get server build ready for transport
+				- Print directions to Max's house
+				? Release 3.0a officially
+					O CM note
+					O Forum post in BI
+					O Build to Joe
+				- More 3.0 PR to other bigger sites?
+
+			O Music problem (decided not to bring fmod.dll, or to have two installers?)
+				? Look into licensing
+			O Make build
+
+		v3.0b
+		-----
+		Private:
+			355 12.99x10.74x1.17
+			460 12.69x10.38x1.25
+
+			O Updated HPB_bot so bots will morph again
+		
+			- Evaluate/respond co_machina03
+
+			X Kevin Heller Newsweek thing
+			? Notebook design ideas to Cory
+			? Test co_rebirth and respond to him
+				? Sent feedback
+
+		Public:
+			O Fixed some structure bounding boxes where parts of them couldn't be hit (bug #247)
+			O Removed walking dependence on cl_forwardspeed
+			O Fixed "shooting-the-egg" crash
+			O Fixed the bug where items (medpacks, ammo, weapons, etc.) couldn't be dropped directly on players.
+			O Combat tuning
+				O Removed health/armor on level up
+				O Removed distress beacon
+				O Removed gorges
+				O Removed experience for welding (didn't want to remove welding totally)
+				O Added cat-packs to Combat (players are catalysted a short time after they make a kill, if they aren't currently catalysted)
+				O Mines are no longer give you 5 mines once, but give you one mine per life (can't suicide in Combat so it shouldn't be abusable)
+			O Added hand-grenades (thanks BrigadierWolf!)
+				O Grenades don't detonate on contact, only after 4 seconds.
+				O Available in Combat as regular upgrade (1 per life).
+				O Available in regular NS as upgrade at armory.  After researched, all marines spawn with a single grenade.
+			O Lowered lerk flap energy cost slightly
+			O Removed new hitbox code to see if it lessens server crashing
+			O Fixed bug where "impulse 1" does not cycle through slot 4 marine weapons (bug #178)
+			O Increased Onos health/armor from 500/400 to 900/500 to compensate for new 4x hitbox 
+			O New co_kestrel
+				O I removed the "roof" over the CC and brought it out just a touch away from the wall (its still down in the elevator).  This should solve the virtual invicibility that skulks have hiding behind it in which marines have to jump down in and often die to protect the CC.  Marines should be able to now just  look down and shoot.
+				O Generate new minimap sprite
+			O Playtesting new map: co_rebirth
+
+		v3.0c
+		-----
+		Private:
+			Hambone: i think onos health should go back to how it used to be
+			Hambone: 500/350
+			Hambone: and they should get a small speed increase
+			Hambone: i think gorges should be put back in, but I realized something crucial which is
+			Hambone: not only did the hive heal itself at an astounding rate
+			Hambone: but gorges healed the hive at a much faster rate than normal
+			Hambone: so i say put gorge healing back to normal and put them back in
+			Hambone: i think hand grenades should be exact replicas of grenade launcher grenades
+			Hambone: explode on impact and same dmg
+			Hambone: i think cloaking should be 10% visibility or something like that
+			Hambone: and I think that cloak-walking should get taken out
+			Hambone: if you arent going to nerf web, maybe put spawn invul back in for marines (i'd prefer to nerf web)
+			Hambone: stomp is too good although its always been too good
+			Hambone: i still think you should go back to the old faster spawning system
+			Hambone: and i think you should raise the speed cap
+
+			O Server performance (cache AvHPlayer::GetAuthenticationMask() to see if it improves server CPU noticeably)
+				- Work with bots on dedicated server
+				- Looks like two problems
+					- 1. 1+% per human player overhead, which isn't present with bots
+						- Test with live people, using profiling to figure out what main loop is causing it.
+					- 2. 20+ bots starts to really spike.
+						- 40% of this seems to be kUpdateWorldEntitiesProfile
+						- Chunk is kUpdateWorldEntitiesUpdateBlips
+							- Optimized slightly, see if measurable
+						- A chunk seems to be AvHPlayer::PreThink
+					- 8 people in RR
+						- mp_performance of 0 results in 1% per player, about CS levels
+						- removing just AddToFullPack gives about 1% per player back
+						- Removing player thinking in RR, results in 1-2% total less CPU
+						- Up to 1% less by removing the world update
+					- 3. 16 players on ns_caged, on AA, on 2.01 under Steam, average of .5%, spiking to 1.5-3% (AA 2.1s was 20-25% avg, same people).  15 players, 2.01, steam, avg of 15%.
+					- Could it be that errant health message, or extra messages in general?
+					- Next step: keep reverting builds until we get to 2.01, or until there's no change (bisect)
+				- v2.0 under Steam (dedicated server .zip), 5 people in RR or so, negligble server CPU (ns_caged)
+				- v2.1a under Steam, 5 people or so, negligible server CPU (ns_caged) (.06%-.15%)
+				- v2.1b under Steam, 7 people or so, .10% CPU, in RR and even with a commander and micro-game (ns_caged)
+				- v2.1c had auth errors, no one could connect
+				- v2.1d has auth errors, as does 2.1e
+				- v2.1f, 9 people in RR, .08% average
+				- v2.1g, 6 people playing, .11% average, 1.5% max (ns_caged)
+				- v2.1h (full), 8 people in real NS game, .28% average
+				- v2.1i, 
+				- v2.1m, 14 players in real game, average 12%, max of 20% (AA, ns_caged).  This is too high, as LB's 2.01 steam server avg's 0%
+				- v2.1a, again, 12 people, semi-real game of NS, average is .45%
+				- v2.1b, 14 people, semi-real game, average is .45%
+				- v2.1f, 14 people, semi-real game, average is 2.7%.  16 players at two hives go to 20% or so (STEAM I believe) (**BAD**)
+				- v2.1c, 14 people, semi-real game, average is .237% (game time at 5 mins) WON (**GOOD**)
+				- v2.1d, 10 people, semi-real game, average is .095% or less (game time 4 mins or so) WON (**GOOD**)
+				- v2.1e, 13 people, real game, average is .5%, max of 6.2% (game time is 15 mins) WON (**GOOD**)
+				- v2.1f, 13 people, full game (very marine-sided though), less then 1% CPU, WON (**GOOD**)
+				- v2.1f, 10 people, semi-real game, less then 1% CPU, Steam
+				- Next day:
+				- v2.1g, Steam, couldn't get it to run, skipping it
+				- v2.1h (full install), Steam, 13 people (2 are spectating), real game, .66% average (turrets, phase, d-chambers, etc.).  Then we got to 14 people, and some turrets were built.  The CPU started responding drastically to more sentries, but not to more entities.
+				- v2.1f Steam, 
+				- v3.0b Steam, 22 players, co_kestrel, 
+					- readyroom CPU is .13%
+					- Joining teams without game starting (tourny mode), CPU averages 25%
+					- After game starts, CPU averages 22% or so
+				- same but on ns_caged
+				- v2.1q: 18 players, ready room was fine, even teams before game started is 13%.  Game started without doing anything, up to 19% or so.
+				- v2.1h: 14 players, 5 specs, 9% before game starts, after games starts
+				- v3.0b: 26 players, before game starts, profile build, Steam:
+					- CPU is at 43%! 
+					- mp_performance of 534 (no AddToFullPack), down to 12% maybe? (crash)
+
+				- Remember that numbers aren't absolute, as Profile build changes it:
+				- v3.0b: 26 players, before game starts, profile build, Steam: (ns_caged)
+					- 35%, down to 10% with mp_performance of 534
+					- ns_kestrel, 25 players, before game starts: 
+						- 13%, down to 0 without AddToFullPack
+					- ns_tanith (394 ents)
+						- 50%, down to 30% without AddToFullPack
+						- 26% without marine/alien thinking
+					- ns_eclipse (305 ents)
+						- 33%, down to 7% without AddToFullPack, 14% withtout marine/alien thinking
+						- 37% to 27% without gamerules thinking
+					- co_faceoff (213 entities)
+						- 11% before game starts on teams, 4% without AddToFullPack (this should be the amount we can fix is my guess, with the other part being profile-related and entity-based/unavoidable)
+						- all marines, 25 people still, 1.1% (this may not have been 1023)
+						- all aliens, 8.5%!!!!  Even with alien thinking off, it's still 8%
+						- all marines with 1023, 5%, all aliens is 16%
+
+				- Ideas:
+					- Alerts
+					? Status bar (lower update time)
+					? For every entity, GetIsRelevant() blocks (change for gamestarted)
+					x Phase gate blocking
+					? Visibility enhancements 
+					- Make sure entity caching is in effect
+
+		Public:
+			O Fixed sighting through transparent surfaces (sighting for siege behaves very oddly in certain locations. most importantly, it seems to fail through any kind of glass, such as the hera glass tube, bug #361)
+			O Reduced skulk armor from 20 to 10.  Explanation - Now that the skulk hitbox is fixed, it's half the height that it used to be, making skulks much harder to hit.
+			O Encourage marines to move out by adding slow alien XP gain over time (currently 1 XP every three seconds)
+			O Made respawn times scaleable for small games.  If x is the number of players on your team, respawn waves happen every x seconds.  
+			O Removed minimum spawn time because it felt like a bug.  Generally spawning is faster now.
+			O Server performance improved!  Thanks to everyone in #nstest that put in many long hours to find this. (bug #278)
+			O Added missing co_rebirth.wad
+			O Moved the skulk model so that it rotates around its center rather than its hind legs. This should look more natural when wall walking and the make the skulk's head stick out less when hiding (Thanks Mojo!)
+			O Fixed mouse focus problems with commander minimap and alert buttons (bugs #357 and #335)
+			O Fix for mouse pointer disappearing sometimes when switching between programs using the taskbar (bug #363)
+			O Took out "special", "_special" and "wait" commands to prevent abusive scripts from being written (especially bunny-hopping scripts)
+			O If both Vet and Constellation access, show Constellation (new order of preference: Custom, Developer, Playtester, Guide (unused), Constellation member, Beta server op, Veteran, Cheating Death)
+			O Reduced web potency by reducing min/max ensnare times from 4/10 to 2/5
+			O New version of co_ulysses (mostly tweaked marine start and hive room)
+			O Updated hand grenade model to prime faster
+			O Added in grenade roll animation when crouched
+			O Lowered force and gravity or make them bounce less
+			O Don't allow grenade ammo to be refilled from armory/resupply
+			O Fixed problem where incorrect animations sometimes played
+			O Lowered stomp stun duration from 2 seconds to 1 second
+			O Armory now occasionally gives health back when used
+			O New version of ns_tanith
+				-> waste hive more accessable for aliens/onos
+				-> new unweldable vent to waste
+				-> onos no longer has to crouch anywhere
+				-> added weld for top vent in reactor room
+				-> removed water vent weld in reactor room
+			O ns_metal revision 6
+				-> Small layout change
+				-> Tweaks and bugfixes
+				-> Added res nodes
+			O New version of co_rebirth
+				-> Added two armories at the marine start
+				-> Built a new command room for marines (bigger, higher)
+				-> Increased the size of a stockage room for JetPacks and lerks. 
+				-> Increased the size of the hive, it was too small and marines had the possibility to shoot it from a far corridor
+
+	v3.0d
+	-----		
+		O Fixed problems with server authentication issues (increased length of timeout, don't clear existing icons if it does timeout)
+		O Fixed votemap on vet servers (thanks Puzl!)
+		O Removed "given by commander" light/particle effect when getting health at armory (because it's not given by commander)
+		O Fixed problem where resources from kills weren't overflowing properly (bug #87)
+		x Resupply and scanning interval shortened slightly (increased in power)
+		O Reduced Onos armor from 500 to 400
+		O Cat-packs are now always given on kill (used to be 50% chance)
+		O Fixed weird effect when using jointeam binds while on a team (also fixes problem where players sometimes join teams dead in tourny mode) (bug #137)
+		O Fixed problem where plays cannot join any team if difference between teams is mp_limitteams (bug #302)
+		O Fixed bug where unlocking abilities longer then evolutions in Combat (bug #314)
+		O Fixed cloaking problems (bug #236)
+		O Fixed bug where alien structures within observatory range are not decloaked (bug #272)
+		O Uncloaking now always takes 1/2 a second for all players and structures
+
+	v3.0e (01/02/04)
+	-----
+	Private:
+		O Xmas/New Year's
+		O UWE web site (phoned in 12/29/03)
+			O Confirmation #: 9510
+			O Update DNS at Network Solutions: ns1.worldaxxs.net
+			O Add e-mail addresses and forward properly
+			O Make default UWE page
+			O Update n-s.org news
+		O Write Bob Wallace
+		O Persistent spec for Joev
+		O Update downloads page with Steam beta info
+		O Update news with link to UWE
+	? Respawn waves every 3 seconds
+			? Change minimum player spawn time to theNumPlayersOnTeam*(.3 + (1/8)*thePlayersSpentLevel) seconds
+			? 1v1 should go from 1 to 8 (+0-3)
+			? 16v16 should go from 1 to 24 (+0-3)
+			? (1.0f + (numPlayers/16)*2)*(thePlayersSpentLevels/maxLevels)*8
+			? slope = max(min(numPlayers/5.0f, 1), 3.0f)
+			? (thePlayersSpentLevels/10.0f) * 8
+
+	Public:
+		O Fixed problem introduced in 3.0d where alien res grows totally out of control (bug #87, already updated on servers around Xmas time)
+		O Fixed problem where alien alerts play in rapid succession..your hive is under attack, your h-h-hive... (bug #299)
+		O Fixed problem where alien "under attack" warning messages not played frequently enough.  Now they are played up to every 6 seconds, just like the marine warnings.  (bug #300)
+		O Fixed problem where marine "upgrade complete" alert wasn't playing (bug #402)
+		O Fix bug where bile bomb / acid rocket / stomp can be fired through thin walls (bug #67)
+		O Fixed mines so that they cannot be placed on top of each other (bug #225)
+		O Fixed recent bug where structures under attack do not appear on hive sight (bug #354)
+		O Fixed bug where grenade research option was not available at advanced armory (bug #386)
+		O Fixed recent bug where healspray has very radius and was ignoring z-axis (bug #359)
+		O More server performance enhancements (visibility, and turret target acquisition)
+		? Fixed bug where players can still be parasited, devoured, and pushed by melee attacks before while they were spawn-invulnerable (bug #259)
+		O Fixed bug where Onos stomp caused players climbing ladders to continue to climb them (bug #200)
+		O Added/fixed subtle white screen flash when stunned by stomp
+		O Fixed bug where players didn't drop to floor when spawning in 
+		O Fixed bug where commander-mode impulses didn't work when bound to keys (bug #338)
+			O Select all marines
+			O Go to health request
+			O Go to ammo request
+			O Go to order request
+		O Changed Onos to 600/500 health and armor (makes regen less powerful, makes him more susceptible to # of hives, trying to strike the right balance between Combat and NS)
+		O Fixed bug where incorrect xp given in combat mode for damaging hive/CC with certain weapons (bug #392)
+		O Fixed bug where structures could be built while hand grenade is primed (bug #394)
+		O Fixed bug where you couldn't use other weapons after firing xenocide (bug #395)
+		O Fixed bug where extra hand grenades given in combat mode (bug #373)
+		O Fixed Combat bug where JP / HA could be given to incorrect player (bug #212)
+		O Tweaks to lerk flight and lowered energy cost.
+			O Celerity upgrade is meaningful again (bug #345).
+			O Lerk can now fly backwards.
+			O Diving is now more effective (bug #352).
+		O Added cl_showspeed command when cheats are enabled
+		O Fixed bug where egg hp/ap calculated incorrectly in combat mode (bug #398)
+		O Fixed the delay when switching between weapons in high lag situations (bug #265)
+		O Fixed the (apparent) super fast rate of fire in high lag situations.
+		O Fixed bug where Onos shifts laterally when standing up after ducking (bug #298)
+		O Alien chuckle sound update from Madmaxx (placeholder that slipped through)
+		O Removed slow alien XP growth in Combat
+		O Experiment: if mp_ironman is 2, it's regular Combat with a twist: purchased upgrades are lost on death.  You keep your levels, but you have to respend them.  Everything else is the same.
+		O Increased lerk bite rate of fire (increases effectiveness vs. jetpacks without increasing frequency of one-bite kills)
+		O Disabled caps lock for chat messages because some people use caps lock to activate voice comm (bug #344)
+		O Fixed bug where lastinv could be used while webbed (bug #379)
+		O Fixed bug where a player could reload or use lastinv while stunned (bug #380)
+		O Removed cl_pitchup and cl_pitchdown because they are exploitable/stupid.
+		O Changed spawn system to spawn in players with more spent levels slower.
+		
+		O ns_metal version 7
+			O Lowered "Storage D" ceiling
+			O Small bug fixes
+			O Tweaks
+
+		O Updated ns_agora
+			O Modified the hive "Cargo Storage" (now you can't siege it from the platform in "The Pit")
+			O Added some crates in "Cargo Storage"
+			O Added 1 more vent in "The Pit"
+			O Fixed all the "Onos stuck problems"
+			O Fixed the second underwater's vent in the "Abandonned Corridor" (for the Onos)
+
+		O New co_faceoff
+			- tweaked readyroom
+			- moved armory to near CC
+			- new weldable in MS leads to another armory
+			- added clip brushes to MS to make slopes easier to maneuver
+
+	v3.0f
+	-----
+    Private:
+        O Files/backup final work
+            O Move all docs to laptop, but how to have them backed up every night (@backup from only one machine)?
+        O Orgnized art and misc NS data, put into repository
+        O Backup solutions
+            O Perforce respository mirrored on n-s.org
+            O Laptop data backed up nightly
+        O Set up VPN to UWE/Ripley
+
+        O Forum post about NemesisZero's new responsibilities
+        - Quick guide
+            O Finish Quick Start Guide edits and send to Karl/Jeff
+			- Armor performance according to hive #
+			- Note about healing spray coefficient vs. structures
+
+        O Call Luce, et al, work with Kevin more
+        O Plan trip to Raleigh
+        O Call Scott R. again
+
+        O Talk to Jason R. about Atari, and send phone schedule
+        O Change paypal@overmind.org to paypal@unknownworlds.com
+        O GDC pass and IGDA membership
+
+        O Look into some Combat upgrades costing more then one level
+            ? Is it technically feasible?
+            ? Is it overly complex?
+            - Validate/invalidate nodes properly
+                - Disable upgrades on server in NS mode when chambers not built
+                ? Disable current lifeform in all modes
+                ? Disable structures when not Gorge
+
+            - If it works, plot out upgrades perfectly
+
+        ? Temporarily removed ns_hera until entity count is under control
+            O Write Merkaba huge mail about this first
+            O Wrote him again
+            - Wait for his response
+
+		- ns_metal: 211
+		- ns_caged: 273
+		- ns_lost: 200
+		- ns_nothing: 315
+		- ns_mineshaft: 216
+		- ns_tanith: 314
+		- ns_veil: 222
+		- ns_eclipse: 219
+		- ns_ayumi: 209
+		- ns_delta: 326
+		- ns_agora: 235
+		- ns_bast: 458
+		- ns_hera: 475
+
+		- Remove info_location entities (!)
+		- Remove info_player_start entities (!)
+		- Remove info_team_start entities (!)
+
+
+		- hera/bast decision
+			- Save hera
+				? 36 particle systems
+				? 48 env_sprites
+				? 46 ambient_generic
+				? 13 env_glow
+				- 28 func_button
+				- 74 func_illusionary
+				- 475 currently
+				- 339 after removing particles, sprites, ambient_generics, and glows
+				- 257 after removing particles, sprites, ambient_generics, env_glows and func_illusionaries
+				
+				- Move resource nozzles into hive rooms
+				- Move small ledge above node in Maintenance, so Comm can get at it
+				- Bring CC down to floor, and don't enclose it in a cage (it's much easier to guard, though it doesn't seem like it).
+				- Get rid of "extra" rooms and routes (I realize you can't necessarily just delete geometry and easily patch things together, but if you can, I would)
+					- Data Core Alpha
+					- Make Maintainance Corridor more direct (as it's too risky for the reward atm)
+					- Remove Hera Entrance Walkway, or make it more direct (just unnecessarily long)
+
+        O Write Kaeo with fyi
+        O Write Rob Heubner with fyi
+        ? Contact Vancouver lawyers
+
+        - Unify tech tree
+            O Combat: don't cost res, cost levels
+            X Combat: don't display levels if 1
+            ? Combat: invalidate nodes already evolved, keep tech nodes separate per player
+            ? Make pop-up menu aware of tech nodes (researched and unresearchable grey)
+
+        - Write the BC-Canada Business Service Centre
+            - 800 959-5525 (employer's guidelines)
+            - Employment standards: 800 663-3316
+            - 800-661-2112 - Worker's compensation
+            - http://www.cic.gc.ca
+            - Program set up by Canada: www.businessimmigration.gov.bc.ca
+
+        O One more pass at Perforce
+            O Add account for Max on Ripley, make sure only certain directories are shared, give him the VPN info
+            O Remove files that will never change, put in group data directory on Ripley
+
+        O Work with Def One on trailer
+            O Write Cory about command chair concepting
+
+		- Hambone Combat suggestions
+			- 800/400 Onos and maybe remove claws blast damage
+			- Slow down focus animation or play pause before
+			- Cat-packs reload speed
+			- Gore range a bit (hit JPs on the ceiling, 3/4s)
+			- Add in experiment to not spend your upgrades automatically
+
+		- Removing CC and adding time limit back in
+			Pros:
+				- Dramatic voice-over for time intervals
+				- No guarding, simpler
+				- Moves game out of marine start
+				- Solves camping problem for marines
+				- Shorter games
+
+			Cons:
+				- Games sometimes end just as it gets fun
+				- Gorges or boring healing role forced?
+				- Game can't end early for aliens, only for marines
+
+        - $250/hour Canadian for Melanie for NAFTA
+            - Immigration 
+            - Company history
+            - Educational background
+
+    Public:
+
+        Map Sadness, Gladness and Madness(TM)
+        -------------------------------------
+        O Removed ns_bast due to loss of map source and high entity count (may you R.I.P, we love you)
+           
+        O Re-added complete remake of ns_nancy!  For those that have seen this already, here are the updated changes:
+            O Clip errors in subspace that could make people get stuck to the pillar if flying around it.
+            O Air Filtration System room has been completely redone and is now infested. It looks better than I thought it would come out to be.
+            O Ambient noises added to make even more like the old.
+            O Now when looking out of the window in port engine you can see the side of the ship like in the old one.
+
+        ? New co_ulysses
+            :: Removed ladder in hive and placed a ramp.
+            :: Vent from hive to low hive entrance.
+            :: Added detail at the hive.
+            :: Fixed movement issues at hive.
+            :: Added atmospheric elements to the map (sounds and FX all over the map, including drips and steam)
+
+        O Updated ns_eclipse:
+            O Fixed weldable health issues
+            O Replaced Horseshoe electric effect with 1.0 release version
+
+        O Updated ns_nothing:
+            O General point/brush entity optimizations (315 entities down to 268)
+
+        O Updated ns_veil
+            O New corridor new double node
+            O New location called "North Loop"
+
+        ? co_rebirth version 4-5
+			O Added some new textures in co_rebirth.wad
+			O Added an ambiant_generic ( sound ) in the Ready Room. 
+			O Changed some details everywhere for esthetic or optimisation.
+			O Increased the size of an important acces (door) and built stairs for a better flow.
+			O Added a little room in the way to the hive, to get a little bit hidden a few seconds.=>screen2 
+			O Built a new acces to spectate in the Ready Room (bigger) => the two doors drive now to random team (essentialy because of players AFK who blocked the access) =>screen1
+			O Added some few things like thanks to playtesters in the co_rebirth.txt ;)
+			O Increased size of hive room
+			O Waiting for updated map with updated sound name
+			O Waiting for smoke sprite
+
+        O ns_metal update-8
+            * Tweaks
+            * Two more vents
+            * Removed one res (Heating room)
+            * More infestation near hives
+
+        O Lerk flight tweaks.
+            O Turning does not slow you down as much.
+            O Energy cost of flapping increased slightly.
+
+        O Allow fakeclients to use impulses to initiate leap, blink and charge (to help bot writers)
+
+        O Fixed getting stunned with primed grenade causes it to be dropped (bug #390).
+
+        O Fixed primed grenade not getting holstered when player is webbed.
+        O Fixed grenade prediction problems.
+        O Added 3rd person grenade animations.
+        O Changed hand grenades so they explode on contact
+
+        O Added grenade sprite artwork (thanks Hackepeter and Max!)
+
+        O Reworked tech tree to allow different Combat upgrades to cost different numbers of levels.  Lerk, jetpack and Onos now each cost two levels to purchase.
+        O Improved pop-up menu to more accurately show you what's available and when (for aliens)
+        ? HUD sound precedence issues (bug #402)
+
+        O Important note: alien armor is affected by the number of hives you have.  1 hive means armor is worth 1.6 points of health, 2 hives means it's worth 2 points of health, 3 hives means it's worth 2.4 points of health.  It's been this way since the first version of 3.0, but keep this in mind when attacking.
+        O Increased Onos health from 600 to 700
+        O Reduced Onos cost from 100 to 75
+        O Reduced Fade cost from 60 to 50
+        O Increased build-hive score from 5 to 8
+        O Increased Combat spawn times a bit more (max wait is 45 seconds, up from 30).
+        O Reduce Onos gore range from 130 to 90 (he shouldn't be able to pick JPs out of the air)
+        O Fixed lerk death animations (bug #276)
+
+        O Added anti-scripting code (activated when mp_blockscripts is 1).  When enabled, it blocks any command with wait, _special, exec or a ; in it.  This is off by default.  
+        O New primal scream sprite with a lerk instead of an onos (Thanks CoolCookieCooks!)       
+
+        O Fixed problem where players taking melee damage while spawn-invulnerable were still pushed around
+        O Changed parasite to organic damage (only hurts living targets), so they can't be used against mines.  The "parasite-hit" sound only plays when you newly parasite a player or structure, or when you do damage to a target.
+        ? Gameplay test: with Hambone mode enabled, res towers give a resource point every 2 seconds, instead of every 4.
+  
+        O Tournament mode no longer necessarily includes friendly fire (mp_friendlyfire controls it completely).
+        O Cleaned up and unified server.cfg and listenserver.cfg.
+        O Removed some extraneous server variables.
+        O Removed unpopular server and game options from the UI
+        O Added dynamic loading of FMOD DLL from the ns mod directory (to eliminate compatibility problems with other mods).
+        O Fixed bug where players sometimes crash when joining marine team (bug #404, introduced in changelist 1895).  Grepdashv, you rule!
+        O Fixed bug where cloaked aliens are visible to marines who are spectating while waiting to respawn.  Dead players now see cloaked entities as the person they are watching does.  True spectators see cloaked targets when they are spectating a person in non-first-person mode. (bug #295)
+        O Fixed bug where hive wouldn't spawn if blocked by player (bug #391)
+        O Removed mp_version variable.  Now the version is reported in the game description.
+        O Fixed bug where commander logged into non-primary CC wasn't ejected when it was destroyed (bug #422)
+        O Increased heal spray range from 250 to 300, in order to make it easier to heal hives (bug #414)
+        O Fixed marines able to +use while stunned (bug #441)
+        O Fixed bug where weird recycling can cause inability to buy arms lab upgrades (bug #186)
+        O Fixed bug where aliens sometimes appear as a marine when they die or spawn (bug #193)
+
+        3.0g
+        -----
+        Private:
+        O Update asset list with final map list
+        O Removed HPB_bot.dll from asset list
+        ? If SteamID authentication data isn't prefixed by "STEAM_", add it
+
+        Before public release:
+            O Get Constellation mailing list fully up to date and working
+            O Announce other mailing lists
+
+        Public:
+        O Fixed grenade problem introduced in 3.0f (but #452)
+        ? Updated command station grenade upgrade sprite (thanks Hackepeter!)
+        O Fixed problem where jetpacks cost one level instead of two
+        O Fixed new bug where Combat levels weren't spent properly as marine (reworked how purchases are validated and made)
+        ? Fixed authentication problem caused by duplicate WONids
+
+        O Fixed bug where a selectable ghost structure was left behind when original CC was recycled (bug #445)
+	    O Fixed bug where CC started out unbuilt in the next round if it was recycled last round (bug #445)
+        O Fixed alien melee attacks often cannot break grates at pointblank range (bug #440)
+        O Fixed problems with commander unable to drop some items on top of  other items (bug #291)
+        O Changed references to sv_cheats on the client to use the new server variable system (particle system editing and cl_showspeed).
+        ? Fixed problem where grenade assets weren't included properly
+        O Fixed bug where number of hives didn't affect alien armor properly (bug #453)
+        ? Updated co_angst to fix end of game spawn problems (bug #421)
+        O Reverted config.cfg to reasonable default
+        O Removed cl_forwardspeed, cl_backspeed, cl_sidespeed (bug #438)
+
+        O Changed alien armor value from 1.6, 2, 2.4 to 2, 2.5, 3 (this will help late-game fade and onos considerably without boosting him too much in Combat)
+        O Increased alien armor absorption with more hives, to make sure there is never armor left over (armor takes 70% of damage at hive 1, 80% at hive 2, 90% t hive 3, used to be 70% for all)
+        O Reduced lerk base speed from 200 to 175
+        O Increased speed boost lerk gets from celerity (8.3 to 25)
+        ? Fixed bug that was causing redemption to be way too effective
+
+        O New ns_nancy
+            ? Included ns_nancy overview sprite
+            O Fixed horrible ladder bug that would throw players up into the air.
+            O Air Filtration System fan no longer can be built on and no longer spins the commander view.
+            O Texture alignment fixes.
+            O Lighting tweaks
+            O Raised Subspace vent and made it so you can weld it shut on Subspace side.
+
+        O Fixed bug where Combat exploit allows a single earned level to be spent repeatedly (bug #466)
+        O Fixed bug in Combat where respawn time circumvented using ready room (bug #467)
+
+        NS v3.0 beta 2
+        --------------
+        Private:
+        O Write Will Day about metamod update
+
+        ? Tweaked Combat respawn times to faciliate shorter games (slightly longer minimum respawn time, slightly shorter maximum respawn time)
+            ? From roughly 0 - 45 seconds (depending on size of game and number of spent levels) to 5 - 40 seconds
+            - Spawn system:
+                - Want people to spawn in waves, though without such an advantage that they can repel any force. Waves allow them to attack in unison though.
+                - Is there any reason to increase spawn time for high-level players?  Used to be for Oni, but that should be fixed now.
+                - Still need to scale on team size though
+        X Check into Combat entity leak (co_daimos, 306 ents in an NS:C game.. 280 of which are not even cleared on map change...)
+        X Attempted to fix problem where gamma wasn't being set properly on dual-monitor systems (bugs #b62 and #364, dual users, please report back)
+
+        Public:
+        O Changed Combat respawn system.  Players now respawn in bigger waves, and time to wait depends only on team size (so smaller games spawn faster).  Spawn times vary from 4 seconds (1v1) to 25 seconds (16v16).
+        O The return of the Gorge to Combat!  This should address the problem where marines can heal their CC easily while the aliens cannot.
+
+        O Fixed bug in UTIL_SharedRandomFloat that fixes bug where bullet holes were firing with perfect accuracy for everyone but the shooter (bug #233)
+        O Changed catalyst packs so they no longer do damage to recipient
+        O Fixed bug where holding walk key while cloaked sometimes allowed you to move too fast and uncloak you
+        O Halved acid rocket damage and energy cost (to make rockets more fun to use)
+        O Fixed bug where lerk sometimes showed spike model
+        O Fixed bug where aliens sometimes spawned with the wrong weapon selected (bug #249)
+        O Increased Fade stats from 250/100 to 300/150 (+33% damage capacity)
+        O Increased Onos stats from 700/500 to 700/600
+        O Increased cost of heavy armor to 2 levels (Combat)
+
+        O Increased redemption chance from 30% per second per level to 35% per second per level
+        O Experience is again awarded for repairing the CC or healing the hive (currently 1/3 the amount). Removed faster hive healing in Combat to compensate.
+        O Changed welder to have a random ROF (gameplay effects should be unchanged)
+        O New welder sound
+        O Electricity damage reduced from 25 to 20 (to compensate for increased range)
+        
+        O Scan upgrade can no longer be purchased multiple times in Combat (bug #478)
+        O Fixed bug where options on the pop-up menu looked like they were available before they actually were (also bug #478) (should also fix bug where prices weren't shown in NS mode)
+        O Fixed issues with alien pop-up menu in NS mode (bug #471)
+
+        O Fixed bug where aliens with level 3 movement upgrades were taking 1/2 damage from turrets (Thanks Fortuna Wolf!)
+        O Added missing credits list to ns_agora
+
+        O Fixed bug where Metabolize interfered with regeneration (bug #356)
+        O Fixed bug where Metabolize cost more energy to use then energy it gave back
+        O Changed hive healing so it now scales healing by the target's hitpoints (the hive now heals 6% of a player's hitpoints per second)
+
+        O Changed "kills" to be actual number of players killed, not adjusted for type/level of lifeform (thanks Lux!)
+        O Removed mp_spawninvul variable (it defaulted to 0 before so this won't change most servers)
+
+        O Installer fixes (WON/multiple Steam ids)
+        O Temporarily removed playback of intro movies until we figure out how to encode them properly
+        
+        O Updated ns_metal (thanks quazilin!)
+            * Tweaks
+            * Fixed crash bug when cheats were enabled
+
+        O Updated ns_nancy (thanks Lazer!)
+            O Added ladder to vent outside of Marine Start. (the "death vent")
+            O Port Hive lowered a little, south wall moved back in to be a little more like the 1.x version.
+            O Made Subspace vent even more gorge friendly.
+            O Better clipping on ceilings of hallways so getting into the ceiling vents becomes a lot more possible without leap.
+            O Lowered r_speeds, and other assorted tweaks.
+            O Added a few things to the readyroom... :]
+
+        O Updated co_pulse (thanks tommyd!)
+            - improved marine spawn point locations
+            - added more room to the marine start
+
+        O Updated ns_tanith (thanks tommyd!)
+            - removed welds near waste hive to prevent marine camping
+            - fixed in-the-void siege/building exploit near fusion hive
+            - fixed vent-siege-building in new vent by waste hive
+
+    v3.0 beta 3
+    -----------
+        O Combat respawning change: only 1/4 of the team can respawn at a time (waves last 5-11 seconds, depending on team size).  This reduces Combat game length significantly, and gives much more importants to player death.
+
+        O All new ns_hera (massive server CPU optimizations and balance changes) (thanks Merkaba!)
+            O Data Core Alpha replaced with old Hera material which allows easier attack on the archive hive (no lifts)
+            O Marines can now go from the marine start to the warehouse without having to weld open anything.
+            O Warehouse is now connected to the holoroom via a small corridor.
+            O No more vents lead into marine start.
+            O Two more resource nodes added to the map. One in the fog corridor, and one in Systems Handling (where data core alpha used to be). The old node in that area has been moved into the Archiving hive.
+            O Archiving a little wider now, so the upper level isn't so cramped.
+            O Total entity count is now < 240
+            O Walkway no longer in an ineffecient U shape.
+            O Fog Corridor shortened.
+            O Various little fixes and touchups.
+            O Readyroom changes (shorter MS start, no egg)
+
+        O Added "Xfire" support to the installer (optional).  This is an instant messenger for gamers, and will auto-update full NS support later this week.  Visit www.xfire.com for more information.
+
+        O Updated hand grenade sounds (new explosion, bounce, prime, etc.)
+        O Fixed bug where grenade launcher grenades death messages used hand grenade sprite
+        O Sped up resupply time at armory slightly
+        O Reduced mine health to 20 (so gorges can easily take them out with spit and marines can detonate them in combat with FF)
+        O Purchasing mines now gets you 4 mines instead of 5
+        O Hand grenades now do less damage then grenade launcher grenades (100 instead of 125)
+        O Increased rate at which hives heal friendly players (from 6% per second to 15% per second)
+        O Fixed bug where heal spray wasn't working for many hives
+        O Removed preservation of experience when leaving the team because of abuse
+
+        O Updated co_kestrel (thanks DevilDog!)
+            O Extended existing vent near subhangar to also allow access to MS
+            O Added "Hangar 7 Control" room which sits above and looks into the MS.  This provides another way into the MS for a total of 2 normal, 1 accessible by all but Ohnos, and 1 vent
+            O Hive slightly moved and a vent added from the ladder that goes up to the escape pod that "looks" at the hive.  This serves as a perch to allow gorges to heal the hive (they can't reach it from the ground).  
+            O Couple of texture fixes
+        
+        O Updated ns_ayumi (thanks DrunkenMonkey!)
+            O The elevator outside marine start is replaced with a ramp.
+            O A new weldable just outside the "AE35" hive that open up a door to "Gorges Hideout".
+            O A new ladder in "Star Child".
+            O The rails are gone in "Eastern Entrance" to make the room more open, and also is the hallways that leads to that room remade.
+            O The "Hamasaki" hive have gotten a new exit.
+            O The hive in "Pressure Control" have been raised a little bit, so it can no longer be blocked by structures.
+            O A new vent in "Pressure Control".
+            O New sky.
+            O New ambient sounds in all of the three hives.
+            O Lots of tweaks all over the map, to make it easier and more fun to play.
+
+        O Updated co_ulysses (thanks Blueman!)
+            O Fixed clip error at the hive
+            O Added co_ulysses back into the mapcycle
+
+        O Fixed clipping problems on ns_nothing (thanks KungFuSquirrel!)
+
+        O Updated co_rebirth (thanks IAN!)
+            O A big change with this version, because I built a new level just under the marine start, trying to encourage marines to get out.
+            O Increased the size of corridors just next the rebirth room, built a little vent inside the MS for skulks and lerks (I enjoy the idea they could be hidden in the ms itself) and I built a place for gorges in the Hive room to heal the hive and perhaps will it help marines too. 
+            O Doors in general stay open longer
+
+        O Updated co_angst (thanks ChromeAngel!)
+            O Revamped marine start
+            O Other unlisted changes that were apparently favorably received by playtesters
+
+        O Fixed incompatibility with server mod menus (bug #482).
+        O Fixed cannot type text into the chat box while CTRL is pressed (bug #491)
+
+        O New co_daimos, to help fix problem where Oni have trouble spawning sometimes (thanks Hypergrip!)
+
+    v3.0 beta 4
+    -----------
+    Private:
+        O Worked with Network Solutions to finalize naturalselection.com transfer and to safeguard and consolidate other domains
+
+        ? First version of UPP
+            - #ifdefed out?
+            ? Moved NS to multithread libraries for UPP
+            - Added UPP into Perforce and got Karl on it
+                ? Delete Max
+            ? Switched to STL port
+            - atexit() server shutdown
+
+        ? compete.natural-selection.org
+            ? Get basic account set up with Harry
+            ? Get basic site set up andn announce
+            ? Make way to communicate with everyone (mailing list?)
+
+        ? Post programmer position on n-s.org
+            - Task contributors
+                - Hambone
+                - Philip Searle
+                - ElvenThief
+       
+       O E-mail const list about Friday morning PT session
+
+        X Spike/spore/umbra change?
+            ? Spike/bite transition anims
+            ? Spore/umbra changes
+                ? Change "in umbra" to "in spores"
+                ? Energy costs and durations and damage and ROFs (including particle system)
+            O Talk to Hambone about this first, and watch demo
+
+    Public:
+        O Combat changes
+            O Removed wave spawn to shorten game length (only one person spawning at a time). 
+                X Increased Combat spawn wait time slightly to shorten game times (makes it more of a disadvantage when you die).  Minimum spawn time increased from 5 to 7 seconds.
+            O Increased unlock hive ability 3 cost from 1 to 2
+            O Aliens now gain experience slowly over time
+
+        O Bast is back!!  Completely-remade ns_bast, with much better server performance/pings (thanks Mendasp and the entire crew!)
+            - Make sure all assets are in installer
+
+        O ns_metal update from Quazilin (update 10)
+            * New "Supply way"
+            * Smaller "Storage D"
+            * New res
+            * More infestation/Tweaks
+            * Added steam bursts with sfx
+
+        O Lerk gestation time lowered from 28 to 20 seconds
+
+        O Fixed bug where player angles weren't set properly on spawn (bug # 559, thanks XP-Cagey!)
+
+        O Phase 1 of the Big Unannounced System
+
+        O Fixed bug where joysticks weren't able to rotate the player view (thanks XP-Cagey!)
+
+        O Fixed voice comm labels so they can be read more easily (always black text).
+
+        O Changed commander voice comm label to white to differentiate him (soldiers are blue).
+
+        O Reduced number of entities in ns_tanith from 394 to 264 for improved server performance (thanks tommyd!)
+        
+        O No longer play client-side sparks or bullet impact particles on client when shotgun pellets hit a player or water (graphical bug only)
+
+        O Fixed bug where lone marines tended to spawn at some spawns more then others (Combat)
+
+        O Fixed bug where pop-up menu costs weren't visible for alien players (NS mode, bug #471)
+
+        O Removed unneeded HL commands (third-person camera exploit, timerefresh, gl_monolights, gl_overbright, gl_clear, cl_nosmooth, cl_smoothtime).  Bug #101.
+
+        O Fixed bug where marines could phase to a recycling phase gate (bug #554)
+
+        O Final version of ns_agora (thanks Kawak!)
+            - Added more covers in Tunnel and Cargo
+            - Added new vents
+            - New Sewer Hive and New "Main Generator" (so there is some changes in the layout for this side of the map)
+            - Added a ladder near "Freight Elevator Access" , but Marines need to weld a door to acces it.
+            - The vent leading to "The Wedge" from tunnel is now weldable.
+            - Fixed "Onos getting stuck" in "The Pit"
+            - Added/modified lots of little things here and there..
+
+        O Removed energy cost for lerk flight (to encourage flight while using abilities)
+
+        O Lag no longer allows exploit where research is done on wrong building / current comm chair can no longer be recycled (bug# 199)
+
+        O New welder, machine gun, pistol, hmg, metabolize and shotty sounds from MadMaxx
+            - Tweak welder ROF for variety
+            - Hand grenade sounds
+
+        O Improved HLTV support.  Blips still aren't drawing on the overview map, and some of the UI controls don't work very well, but it should be useable.  More to come.
+
+        O Updated ns_eclipse (thanks KungFuSquirrel!)
+            - New vent added between South Loop/Maintenance Vent and Keyhole 
+            - New vent added between South Loop and Computer Core 
+            - New weldable added on South Loop/Computer Core vent 
+            - Old Triad pits/effects restored 
+            - Old skylights near marine spawn restored 
+            - Restored ns_eclipse.wad 
+            - Various texture usage optimizations 
+            - Adjusted Triad layout to allow better res defense (experimental) 
+            - Restored doors in marine spawn 
+            - restructured active side of Marine Spawn 
+            - Moved Marine spawns closer to CC 
+            - CC moved out of alcove 
+            - Atmospheric adjustments to hives
+
+        O Updated ns_veil (thanks KungFuSquirrel!)
+            - Expanded Marine Spawn
+            - Lowered "Pink Monster" in Marine Spawn
+            - Fixed embarrassing "Eclipse Logo Backwards in my Own Map" problem... Doh. 
+            - Removed North Loop 
+            - Texture usage optimizations 
+            - Repaired remaining Onos stick points (I hope!) 
+            - Removed all chairs in front of computer panels 
+            - New vents (find/learn them yourselves ;) ) 
+            - Some added infestation in hive areas 
+            - Layout/architecture tweaks near Pipeline 
+            - Weldables added to Nanogrid Status
+
+        O Updated ns_nothing (thanks KungFuSquirrel!)
+            O Elevators changed to func_doors
+
+        O Upgrading a turret factory no longer restores all its hit points (bug #539)
+
+        O Items no longer sink through the world when placed against slopes, items can now be placed at up to 45 degrees, on stairs, etc.  (bug #291, bug #527)
+
+Beta 4a
+-------
+O Combat changes (near final!):
+-> Aliens no longer grow in experience over time (we didn't have time to test this properly last week)
+-> There is now a time limit (like old Combat builds!), which by default is 10 minutes.  Aliens automatically win after time expires, or if they take out the CC.  Marines win by taking out the hive.
+-> This time limit can be adjusted using mp_combattime
+-> Moved game timer off of scoreboard and onto HUD
+-> When there is less then a minute left, the game time readout blinks (both Combat and NS/tournament mode)
+-> Focus cost increased from 1 to 2 levels
+-> Because marines lose if timelimit is reached, sped marine spawning by 1 second to compensate
+O Fixed demo recording crash
+O Improved server performance (for programmers: we built using a debug version of STLport by accident).  There may still be a problem with escalating pings we're still looking into.
+O Reduced umbra power so it now blocks 1 out of 2 bullets (down from 2 out of 3)
+O Grenades no longer teleport into the void before exploding when they are shot into vents (bug #530)
+O Abbreviated "Natural Selection" in Steam server list so it's easier to filter by version
+O Removed mp_gametime server variable as it is no longer needed
+O Fixed gamma problems on map change for maps that didn't specify an env_gamma (usually custom maps)
+O Fixed exploit where weapons can be nearly instantly reloaded (bug #334)
+O Fixed bug where death messages overlapped spectator UI
+O Rewritten structure collision detection from XP-Cagey should mean many less sinking items!
+O Lerk flight costs energy again (1/2 the energy cost of beta 3)
+O Fixed missing textures in beta 4 (goodbye random pink-checkerboards)
+O Removed consistency checking of unnecessary files (mp_consistency 1) (thanks mahnsawce!) (bug #297)
+O Updated ns_nancy (helpful for CAL)
+-> You should no longer be able to siege Port/Subspace without spotting it.
+-> In an attempt to add a little more balance to the map the vent outside of Port has been turned into a hallway and the stairs to Mother Interface from Messhall were removed.
+-> Added a couple crates in the Mother Interface area for cover.
+-> Removed unnecessary side room in the Marine Start area. All it did was add a chance of the commander spawning way too far from the CC and had no game purpose.
+-> Misc. other smaller changes
+O sv_restart now works with cheats on (so you can execute it via rcon by setting cheats first)
+O Equipment is now easier to drop on players, buildings can no longer be dropped on players.
+O Fixed bug where multiple res towers were allowed to be dropped on the same node (appeared in early versions of 4a)
+O Rewrote EntityInfo and NumEnts printout formats to make them more useful to mappers.
+-> EntityInfo was reporting the first N entity slots of information instead of the first N valid entities. 
+-> Marked several types of entities (player slots, bodyque, weapons) as "dynamic" -- for now at least, they don't count towards the mapping limit
+
+	Beta 5
+	------
+	- TODO: Add mp_combattime to quick start guide and documentation if it stays
+	X Entity leak?
+	- 802-658-3842 (VT E-bay guy)
+	- Bug where after game ends your role isn't preserved
+	- Sparks/crosshair problem
+	- Infinite ammo exploit
+	
+    Beta 5
+    ------
+	- Overlapping countdown timer in 640x480
+   	- Weird spawning bug (http://www.natural-selection.org/forums/index.php?showtopic=69007) (bug #421)
+		? Distress beacon
+		- Joining teams
+		- Game reset
+		- Ending digestion
+		? Redemption
+		- Need to refactor spawning completely
+			- Remove spawn checking dependency on player
+			- Don't call CBasePlayer::Spawn() at all
+			- Refactor SetPlayMode() to not perform spawning at all.  Everyone that calls it should check if the player can spawn first, and if so, call set play mode and spawn them there.
+
+        - Lerks cannot fly backwards (bug #522)
+
+	X if you get killed while you are gestating, you'll respawn at low health values (querty@sandwaves.org)
+
+        - HLTV support (http://www.natural-selection.org/bt/bug_view_advanced_page.php?bug_id=0000256)
+            - Problem:
+                X g_iUser1 isn't set on client, because human players aren't being propagated to themselves under HLTV
+                X Human players aren't in AddToFullPack in HLTV (but bots are)
+                ? g_iUser1 needs to be initialized to 1
+                ? Fix check-boxes
+                ? Fix overview checkbox
+                ? Fix player picker (server-side problem?)
+                    - vgui_TeamFortressViewport, line 2230 (g_PlayerExtraInfo is not being filled in)
+                    - How to send gmsgTeamInfo messages to spectators?
+                - Auto-director button (server-side problem?)
+                - Blips on overview (server-side problem?)
+
+        - Crouch-blinking
+
+        - Fade +duck hitbox bug.  When a fade is crouching they are really really hard to hit.  I thought that fades were overpowered and their health or armor should be lowered a little but seeing as how bugged it is, its hard to say
+            - Re-size model
+
+        X Remove skulk/bite knockback?  Check beta information forum for discussion.
+
+        <Forlorn> Also you should consider 75/10 stats for skulks
+        <Forlorn> This would mean one bullet stronger in the early game
+        <Forlorn> but with lv. 1 weapons skulk dies in 1 bullet less
+        <Forlorn> Right now lv. 1 weapons gives no advantage against a basic skulk
+        <Forlorn> There is no reason to go lv. 1 weapons before lv. 1 armor
+        <Forlorn> Also I think that a skulk could use one more bullet
+
+        - **Update create server options
+
+        - Document mp_custom icon in server.cfg and listenserver.cfg
+
+        - guide.natural-selection.org
+            - Set it up
+            - Find head guy, establish rules, let them run mailing list
+            - Add more folks, talk to #nstrain
+            - Add new rank and account
+            - Read through mailing list
+				- Choose a leader, talk with on Skype
+				- login: guide
+				- password: 37andnf7a
+
+        ? Constellation survey
+            ? Freeze Constellation
+            ? Send Paypal data to Lars
+            ? Output e-mail addresses and send to Lars
+            ? Patch dates and other significant dates
+            ? E-mail my address
+            ? Add new temporary e-mail account for his friend (survey@unknownworlds.com)
+            
+        - www.naturalselection.com
+			- Constraints
+				- Use whole page
+				- Anti frame-set
+				- If flash used, then optional and decorative only (don't ever ask to download anything)
+				- Server-side template for menu (Server-side include or other)
+				- Menu that's displayed on every page should not take up a lot of screen real-estate
+			- Rebuild slowly and launch with 3.0 final?
+			- Need updated screenshot section
+			- Updated Team section
+			- UPP unveiling
+				- UWE only, or different domains for different games?
+				- UPP pages won't be that detailed
+				- Launch with UPP/login area
+					- Probably PHP based (Karl will write a C++ library that PHP will use)
+				- Most active servers, best servers
+				- Automated Constellation area
+			- Updated mailing list page
+			- Game/player stats
+
+        - Fixed Fade and Lerk so they pivots correctly (looking up makes him look up).  Thanks Cloud'King!
+		- Fix bug where death messages drawn behind overview map
+
+        - Delarosa as modeller/animator?
+			- co_core maintainer?
+
+        - Parasites can operate switches and buttons again
+
+        - Fix auth data getting propagated too much
+
+        - "kill" in Combat (remove "kill" override and assume kill delay?)
+
+        * exploit: scanning with observatory for free 
+        [http://www.natural-selection.org/bt/bug_view_advanced_page.php?bug_id=0000551] 
+
+        * "under attack" warning messages not played frequently enough 
+        [http://www.natural-selection.org/bt/bug_view_advanced_page.php?bug_id=0000300] 
+
+        * greatly increase frequency of visual alerts on commander minimap 
+        [http://www.natural-selection.org/bt/bug_view_advanced_page.php?bug_id=0000557] 
+
+        * regen effects do not apply to health and armor in the same tick 
+        [http://www.natural-selection.org/bt/bug_view_advanced_page.php?bug_id=0000558] 
+
+        * remove melee push for all weapons except onos gore (claws), and make that have a random direction; current ugly example: a marine can shove an onos around with a knife
+
+        * make umbra clouds have the same duration as spore clouds 
+
+        important changes and balance tweaks: 
+
+        * revert welder RoF back to non-random behavior until a real "fix" for the sounds can be implemented 
+
+        * make armory healing non-random but a much smaller value 
+
+        * de-randomize res-for-kills (making it 2rp for every kill) 
+
+        * revert mine cost to 10rp for 5 mines 
+
+        * eliminate energy cost for slot1 weapons 
+
+        * change healspray back to slot1 for gorge 
+
+        * remove leap damage 
+
+        * make the following visually distinct (color/shape):  parasited marines; parasited structures; marines on SoF; marines detected by SCs (this may sound minor but would be hugely beneficial)
+        [http://www.natural-selection.org/bt/bug_view_advanced_page.php?bug_id=0000481] 
+
+        * allow re-upgrading at full cost (e.g., an alien with silence can bay 2rp for adrenaline instead) 
+
+        * increase base onos speed significantly; it's currently far too slow to be effective without celerity 
+
+        other important fixes: 
+
+        * primal scream doesn't increase player movement speed 
+        [http://www.natural-selection.org/bt/bug_view_advanced_page.php?bug_id=0000437] 
+
+        * primal scream does not increase damage from xenocide or parasite (double-check other weapons?) 
+        [http://www.natural-selection.org/bt/bug_view_advanced_page.php?bug_id=0000553] 
+
+        * devour often fails 
+        [http://www.natural-selection.org/bt/bug_view_advanced_page.php?bug_id=0000434] 
+
+        * redemption fails too often (check more frequently and/or increase chance of success after every failed check?) 
+
+        * rework parasite 
+        [http://www.natural-selection.org/bt/bug_view_advanced_page.php?bug_id=0000454] 
+
+        * weapons not dropped properly upon death 
+        [http://www.natural-selection.org/bt/bug_view_advanced_page.php?bug_id=0000474] 
+
+        * [combat] resupply not effective for HMG or pistol 
+        [http://www.natural-selection.org/bt/bug_view_advanced_page.php?bug_id=0000542] 
+
+        * restore the SC effect where enemies show up on hive sight (as if parasited) when within SC range (remove audible warning "the enemy approaches")
+
+        * weapon upgrades do not affect turrets 
+        [http://www.natural-selection.org/bt/bug_view_advanced_page.php?bug_id=0000465] 
+
+        - 57 bug - 
+        - 547 (resupply HMG)
+        - 539 
+        - 538 
+        - 534
+        - 535
+        - 330
+        - 497
+        - 496
+        - Adding jetpack to scoreboard
+        - 493
+
+        - Muting a player, will sometimes mute other players along with it [ bug ]
+        - Make sure you can mute players that aren't on your team
+        - Apparently you can shoot through the CC , perhaps should be fixed. But then again, it does make sense, since there is a gap in the CC
+        - When the game ends, and when you're an alien, it seems that you are viewing from a Marine model, rather than a skulk model - inwhich is lower to the ground.
+        - Fixed bug where hive can't be built if blocked by a chamber 
+
+        - ** Update readme.txt before ship
+
+        - Change to "ns" directory (for Steam/metamod) (wait for Steam info back from Eric S. first)
+        - Movie conversion
+        - Fix bug where lerks can no longer fly backwards
+        
+        - Changed lerk gliding so it's default (hold jump to drop, instead of holding it to glide)
+
+        - Fixed bug where ammo upgrades weren't affecting hand grenades (?)
+
+        - Finalize titles.txt and get to Nemesis for translation
+            - Add "visit www.natural-selection.org" tooltip
+            - Add "visit www.unknownworlds.com" tooltip
+            - Add Combat-specific tooltips, and remove NS tooltips from Combat
+
+        - **Add manual to near final installer?
+
+        - Added gunsmoke to weapons? (thanks BrigadierWolf!)
+
+        - Updated ns_hera
+            - Add to mapcycle again, check assets
+            
+        x Remove co_tasium from asset list
+
+        - Lerk flying anim
+
+        Hambone: mp_blockscripts 0 blocks no scripts
+        Hambone: mp_blockscripts 1 blocks _special
+        Hambone: mp_blockscripts 2 blocks everything
+
+        - Add co_evan for playtesting
+
+        - Fixed bug where Commander "hacking" didn't work (clicking useables) (bug #376)
+		- Fixed bug where bottom of commander HUD is transparent to mouse clicks (bug #270)
+
+        - Write Mark Terrano with fyi
+
+		- Ability to upload screenshots (or community-content to gallery)
+        - More server performance work?
+        - HLTV work and testing
+
+		- Hambone feedback
+			Hambone: just a few things
+			Hambone: onos are way too good
+			Hambone: i think combat would be really good if onos wasnt so good
+			Hambone: a few other things you could change
+			Hambone: lerk flight and jetpacks should be a little faster
+			Hambone: still feels to slow
+			Hambone: i dont like how aliens gain res
+			Hambone: didnt change anything
+			Hambone: moving the skulks POV forward but not reducing his range makes the range feel much larger
+			Hambone: i really think there should be no or almost no speed cap
+
+		- E-mail Karl updated map requirements that everyone whose anyone knows
+			- Resource nozzle 
+			- Gestation egg armor and health for XP-Cagey
+			- Add 
+
+		- Add co_ether (after changes)
+		- Make it more obvious which side won a game in Combat
+		- Look at co_exit again
+		- Randomize spawns on pulse
+		- Test co_machina5 again
+
+		- Art task: Focus icon
+		- Art task: Primal scream icon should show lerk instead of Onos
+		
+		- Bring down structure radius a tad if possible
+
+		- Fix HLMP integration
+
+		- Any placed structure retains parasite
+		- Combat menu protrudes
+		- Don't redeem gestating
+		- Keep % health/armor of egg, not of pre-egg
+
+		- Test co_phobia and decide whether to include
+		- Test new ns_mystic
+
+		? Reworked record/playback (bug #40)
+			? Commander name
+			- Draw build/health circles
+			- Commander black background
+			- Scoreboard
+				- Team names
+			- Locations?
+			- Alien mouse cursor
+			- Spectator all loused up
+		
+		- Morgan e-mail
+		
+		- Think about making cat-packs damage temporary (ie, drowning damage)
+		
+		? Removed auth command
+		- Look at co_nano and decide to test or not
+		- Patch bunnyhopping script
+		O Check ns_spellbound (not pretty enough)
+
+		 --AusHybrid--
+			<Hybrid-Jason> Ftp-
+			<Hybrid-Jason> Domain: aushybrid.com ( 202.87.21.98 )
+			<Hybrid-Jason> U: hybrid
+			<Hybrid-Jason> P: chit
+			<Hybrid-Jason> ^^ FTP details
+			<Hybrid-Jason> 202.87.21.98 <--- use that for host
+
+		- Move death messages down a bit, they overlap the marine overlay while speccing in letterbox (they assume y viewport offset is 0)
+
+		X Change marine health bonus to armor bonus in Combat?
+		- Unknown command: cl_centerplayerid
+		
+		- Play commander drop event locally
+		- Predict hotgroups
+		- Update installer to default to a CO_ map (co_pulse?)
+		- Think about adding TSA and Kharaa skins to installer? (or add them to n-s.org at least?)
+		- Dedicated server and mp_consistency
+		- Double-check mapcycle.txt values (esp. hera, bast and faceoff)
+		- Add ability to propagate mp_ strings to client
+
+Marc (S2 games): 269-207-6556
+Jim phone: 802 482-2460
+My SteamID: STEAM_0:0:131785  
+
+News mailing list
+	NS fans: joev@natural-selection.org; monsieurevil@natural-selection.org; cory.strader@verizon.net; news@planethalflife.com; soopafly@punkassfraggers.com; eryx@ns-fr.com; eneale1@bigpond.net.au; Eaglec@dsl.pipex.com; mcooper@wildtangent.com; prodigy@lanvancouver.com; haven@thehavennet.org.uk; alexcl@charter.net; D_Snikch@natural-selection.co.nz;topper@flawedexistence.com; D_Snikch@flawedexistence.com; suicidal@guns4back2school.com; roly@dawazou.com; emmanuel.marseille@skynet.be; eliteguard@thehivemind.org; bobwc@free.fr; toor@torment-gaming.com; mike@cstrike.no; pistolonly@ukns.org; irsprint@aol.com; news@ausns.org; lachiep@optusnet.com.au; plasmatico@uol.com.br; naxo@dawazou.com; imdence@optushome.com.au; gunny@thegunslinger.de;hoppelhase@readyroom.de;olisc@readyroom.de; kali@das-interessiert.de; wigg@iinet.net.au; news@readyroom.org
+	General sites: newsroom@3dgamers.com; news@gamingnexus.com; jonas@dailygame.net; news@gamemarshal.com; editor27@frictionlessinsight.com; gswebmaster@idg.cz; admin@gengamers.com; news@wargamer.com; pr@gaminghorizon.com; webmaster@gamezone.com; news@vaultnetwork.com; news@avault.com; rcumine@gamebiz.com.au; comments@stratosgroup.com; news@gamershell.com; news@worthplaying.com; assassin@computergames.ro; info@gameplex.ch; letters@happypuppy.com; lanparties@clara.co.uk; jakob@boomtown.net; Editor@CuttingTheEdge.com?subject=News; content@homelanfed.com; aburnes@ve3d.com; ripclaw@gamerspulse.com; steerpike@fourfatchicks.com; mark@gamezilla.com; sgibson@gamingillustrated.com; Elphin@warcry.com; trog@qgl.org; finger@telefragged.com; team@nofrag.com; pr@ferrago.ltd.uk; shawn.w@gamingnext.com; news@gamesxtreme.net; news@gamechronicles.com; contact@gamesdomain.com; hx@ggmania.com; chrisl@totalvideogames.com; joule@factornews.com; jackal@battle-fields.com; news@tothegame.com; news@gameaxis.com; news@elited.net; 
+					falcon@canadiangamer.ca; info@escmag.com; marcus@firingsquad.com; news@gamerifts.com; Jesse@Nettowa-Ku.Com; jdiaz@loadedinc.com; news@pcgameworld.com; webmaster@cybergamingnet.com; pr@gaminghorizon.com;
+					evilavatar@evilavatar.com; press@entdepot.com; info@gamingworldx.com; lasermouse@worldnet.att.net; admins@alloutgames.com; whatever@projectwonderboy.com;
+					tom@accelenation.com; news@tothegame.com; sriach@game-over.net; gwjnews@gamerswithjobs.com; news@hardavenue.com; editor27@frictionlessinsight.com; kenbarnes@rewiredmind.com;
+					news@hlgaming.com; webmaster@3dgames.com.ar; hood@aixgaming.com; joran@gamers.nl; venom@rnp.ca; snypa@cgnation.net; 
+
+Info from Alfred
+- GameMenu.res is completely ignored under vgui1, TrackerRes.res is used instead
+- "Tracker" used to refer to just the Friends list, now it refers to any out-of-game UI
+- preface "engine" to allow console commands in game menu
+- titles.txt is backwards-compatible and works like it used to, except for one detail: if the text it translates to starts with #, it is referred to resources/modname_language.txt (this file must be Unicode).
+
+CPL success
+- Mostly game popularity, and compatible genre, definitely biased towards FPS 
+
+WCG success
+- Game popularity, general suitability towards clan play, and probably sponsorship, seems biased towards what's new/cool
+
+Advertising
+	X Battle.net
+	BluesNews
+	PHL
\ No newline at end of file
diff --git a/main/source/doc/AvH TODO.txt b/main/source/doc/AvH TODO.txt
new file mode 100644
index 00000000..dacc3ff5
--- /dev/null
+++ b/main/source/doc/AvH TODO.txt	
@@ -0,0 +1,6655 @@
+Fatal error: ED_Alloc(); No free edicts()
+
+AMD chipset (both from AMD)
+  Windows 2000 drivers
+  AGP registry update
+
+Latest NVIDIA driver
+  2832 fixes most or all freezing
+
+512 chips ($157) ECC ($197)
+
+1085 (Asus, dual 1.6 MPs, 1 gig standard)
+GF3 TI200 - $178
+
+Somerville police
+- 617 625-1600 
+- 220 Washington st.
+
+Pat's autobody
+- 617 776-5810
+
+Game objective
+--------------
+Summary: Multiplayer-only Half-life mod where one team plays marines and the other plays aliens. The humans must keep their cool and work together to assault an alien-infested spacecraft
+- "First-person strategy" with a real resource model and consequences for actions
+- Both sides are genuinely different and together they accommodate different play styles: 
+  1) Fighting skill deemphasized for marines, strategy and communication take their place.  Tense, not breakneck action.
+  2) Hero-based action, intuition and reflexes promoted for aliens.  Communication and coordination don't require typing.
+- Accessible, fast, mouse-driven interface: no keys beyond those used in Half-life needed
+- Simple to learn and play, it is hard-core action/strategy for a mainstream audience
+- Innovative social dynamics lead to memorable games
+- Emphasis on polish and atmosphere
+
+
+Get connected to CVS again - DONE 4/3/01 
+
+Get online backup working and right for new machine - DONE 4/3/01
+
+Get samba working on new machine - DONE 4/3/01
+
+Check-in all new code - DONE 4/3/01
+
+Make HL look as good as Q3 (run tests with new gamma and Q3 textures) (ongoing)
+
+Get game playable at a very basic level
+
+	Add spectator mode
+		+ Use tutorial - DONE 4/4/01 (still has a couple problems)
+		- Add collision detection (not immediate priority)
+		+ Add #spec_mode3, #spec_help and #spec_help2 to titles.txt - DONE 4/5/01
+		+ How to exit spec mode?  Look how TFC handles enter, then do that for most keys.
+
+	Ready room
+		+ Create marine player, alien player (added class/team types instead 4/3/01)
+		Menu to choose marine, alien or spectator mode
+			Scratched menus, they are so nasty and convoluted.  Using real world metaphor to choose teams.
+				+ Spawn in at avh_readyroom_start in "ready room".  Players are of indeterminate class (what's their model and stuff?  if default is used, we could have barneys, marines and aliens all in the ready room. :) )  - DONE 4/6/01
+				+ Disable weapons, damage and death for players in ready room.  - DONE 4/6/01
+				+ Public chatting and team chatting function identically in ready room.  Chat goes to everyone in casual mode, ready room and spectators only in tourny mode. - DONE 4/6/01
+				+ Type out the MOTD when first joining the server (look into env_message and game_text entities) - DONE 4/6/01
+				+ Presented with doors, one to join marine team, one to join aliens, one to auto-assign, one to spectate - DONE 4/6/01
+				+ Choosing marines spawns you in at avh_marine_start, Choosing aliens spawns you in at avh_alien_start - DONE 4/6/01
+				- Choosing spectator lets you spectate and talk with other spectators, not with people in game.  Attach light to spectators in non-tourny mode
+				+ The marine and alien bases have a door to bring them back to the ready room... - DONE 4/6/01
+				+ Revisit/cleanup concept of teams
+				+ Allow any team mate to "purchase" a new teammate?  Ie, someone in spectator mode?
+				+ When a player is in spectator mode with a future class set, don't allow spectator mode to free look and only allow follow of players of his team name
+				- When in tournament mode, both the marine and alien doors close.  Respawns can still be purchased, but only from spectators that were just on a team.
+				- Tournament mode could even be set by two switches, one at each base.  When both are set in the initial pre-game time, it is enabled. (sounds too easy for something so formal as a tournament mode)
+				- When round restarts, spectators are spawned back in ready room so they can choose teams (if they chose a team and were put into spectator mode, try to spawn in on that team first)
+				- Show tourny or casual mode on sign in ready room. (blinking "Tournament in progress")
+				- Allow disabling of spectator mode, so the door closes and people can be recruited from the ready room.
+				- Auto-assign door is disabled in tourny-mode
+				- Bug: MOTD doesn't work on net clients
+				+ Bug: Overbrightening not working on shodan
+				+ Bug: Players not being damaged outside of ready room (casual/tourny ruleset)
+				+ Rethink representation of rulesets - DONE	4/9/01
+
+	Late joining 
+		Terminology: 
+			"Observer" = Cannot play this match, includes match documenter, commentator (observer cam)
+			"Reinforcement" = Potentially was playing for a team, has indicated he wants to play on a specific team (fate cam)
+		Objectives: People get to play as much as possible, while still remaining strategic and still having some tension about sitting out
+		+ When marine or alien is chosen during pre-game, the team is joined immediately and the player spawns in
+		+ When chosen mid-game, the player becomes a reinforcement, waiting to join that team.
+		+ If auto-assign is chosen, the team with the fewest players/spectators is immediately set for that player's future team.
+		+ In true spectator mode, specatators can watch both teams freely, but they're stuck as spectators.  When the next game starts, they'll get a message telling them to hit enter to play.  True spectators will always be true spectators for the round, they cannot join the marines or aliens.
+		+ Reinforcements (those that are spectating because they died during play and couldn't respawn) can only watch their past/future teammates.  They can still leave and join in true spectator mode.
+		+ In tourny mode, reinforcements can never become true spectators or join the other team.
+		+ In casual mode, any player that has been a spectator cannot join any team until the next game
+		+ Reinforcements can only start playing when purchased or a new match starts
+		- In tourny play, reinforcements are only brought in when a teammate purchases them.  In casual play, the server will occasionally buy reinforcements for both sides simultaneously (for "free") if there exists compatible reinforcements.
+		- When a player becomes a reinforcement and is waiting to play, all the players on that team get a message saying "Reinforcements available"
+		- Show name of player on pie menu that will be brought in if a reinforcement is purchased?
+		- Add sounds that play when different spawns are used, round starts and round ends?
+		- Decrement points when calling in reinforcements
+		+ Add client command for ending the round
+		- Bug: Figure out why UTIL_Teletype isn't working (string issue?)
+    	+ Only let pie menu be active when play mode == PLAYMODE_PLAYING
+
+	Create ultra-basic level
+		+ Starting points/zones/spawns
+		- Model basic level (spend a few hours max, two bases, one hall/room to connect)
+
+	Create entities at starting points
+		- Entities
+			+ Create new entities for alien spawns and marine spawns
+			- Create entity that indicates starting "building"
+			- Add code to use these spawns on death?
+
+		- Create entity that specifies where "bases" can be built, create a default one
+		- Check for draw as well (both teams lose within a couple seconds of each other)
+
+	Game server update
+		- Check for game victory: if all of a team's "buildings" are destroyed, that team loses
+		- Audio/visual countdown before the game starts, so players know to make their choice.  Don't start counting until one player has joined each team, count avh_pregamelength after that.
+
+	Implement base resource model
+		+ Every player has point count
+		+ Award points periodically
+		+ Display current points on UI
+		+ Add point cost to all equipment 
+		+ Only allow purchase of equipment when legal
+		- Only draw resource label when appropriate (fix "default text" as well)
+		+ When a player dies, check if he has enough points to respawn.  If set, decrement them and do so.  If not, dump him into reinforcement mode.
+		  - Change this to decrement off commander instead
+		- Only draw resources if player role is squad leader or commander
+		(omit: - Draw points in red if not enough to respawn with)
+
+	User interface 
+		+ Draw pie menu better so fonts are readable
+		+ Fade in nodes again
+		- Add ability to have spaces in text
+		- Disable nodes that aren't currently being used, draw differently
+		+ Draw point/info indicator somewhere for upgrades and weapons
+		+ Draw point cost or hotkey next to it
+		+ Later: Disable option when not enough points (!!)
+		+ Change highlighted bar to follow chosen path
+		+ Text isn't drawing (centered too)
+		+ Fade out nodes better			   
+		+ Space nodes differently in x and y
+		+ Lines should draw to edge of text (or maybe nodes is ok if filling in background)
+		o Lines should fade in (not sure FillRBGA can do this)
+		- Draw lines to disabled nodes in disabled color
+		+ Color of node should take into account whether selected or not
+		+ After selecting a node, all nodes light up and they shouldn't
+		+ Root node is white sometimes (argh, stupid vgui bug), FadingImageLabel to extend Panel instead and draw it's own background
+		  X Increase size of bg image, make it oval and softer?  Center image.  Update 640 one too.
+		  X New pie node artwork (can't have images)
+		+ Space out nodes so there is room for lines between them
+		+ Fix placement bugs that started happening after changing FadingImageLabel to extend Panel
+		+ Fix it not popping up the first time 
+		+ Make it artificially taller (hard-code constanter bigger than just text height)
+		+ It's almost centered but not quite
+		+ Add tons of new impulses for all new actions, then hook 'em up
+		+ Fix bug where first time it's up it's in the wrong place
+		+ Add in other pie menus for other roles
+		+ Fix bug were the pie menu doesn't come up the first time...always!
+		+ Fix bug where SetRsrces is coming before the HUD is initlialized, sometimes
+		+ Disable Resources label when appropriate
+		- Grow hit area around it so it's easier to use
+	
+	Misc
+		+ Only allow player death when appropriate (while playing the game and after the game has started)
+		- When siege turret hits something, create nice siege splash effect
+		- Only have siege turret able to hit a target that it or a teammate can see (so no cloaking)
+		- Change decals for organic weapons (they are bullet holes right now)
+
+	Add team scoreboard
+		- Show teams on each side
+		- Show relevant info (ping, rounds played, no frags, etc)
+
+	Top-down UI
+		- Starcraft mini-map is 34% of screen height, 25% of screen width
+		- Center is 25% of height for roughly 50% of middle of screen
+		- Right side is 25% of width, 31%
+		- Changing mouse cursor for marquee (!), one for minerals/gas
+		- Don't allow scrolling when marquee selecting
+
+	Predict gun-empty sound. gEmptySoundEventID
+
+
+Maxim:
+	"Don't write any code you won't use."
+	- mouse dragging in HUD
+	- generic weapon config
+	- chain of command in many ways
+
+To make the game playable
+-------------------------
+  + Enhance pie menu with touching cells
+	+ Added quick select mode all
+  - Key bindings:
+	+ Remove 1,2,3,4,5 commands
+	+ Add commands for primary weapon, secondary weapon, use equipment?  (think this through, maybe just next weapon for now)
+	- Fix use item commands to use light, use heavy, use other
+	- Scratched all 
+  + for now, purchased weapons just use the crap weapons that are in there now
+  - Add entities that set your desired role
+    - Need to draw text when role changed "When game starts you will be a squad leader"
+    - Game starts 15 seconds after each team has at least one person.  needs audio/visual countdown (right now you type 'startgame' at the console)
+	- When a role is chosen, display message that summarizes the role to the player
+  + Expand test level to be somewhat playable (make three times the size with more spawns) (use marinestart7?)
+  + Fix draw text commands so all these messages show up
+    + Revamped messages, now they use titles.txt correctly and nothing is hard-coded
+	+ Messages for motd, marine roles, observer mode and more are now in
+  - Ammo...what to do about it?  
+	+ Rework weapons a bit so they have ammo, clips, reload, etc.
+	+ How about buying an ammo pack that can be dropped and given normally.
+	- Make sure reload command works (plays sound, animation, takes a little time)
+  + Make deployable mines (claymores)
+    + Deploy like claymore on wall
+	+ Deploy like mine on floor (<45 degrees) (no beam)
+	+ Doesn't go off for teammate, emits beeping sound instead.
+	+ Fix beeping so it doesn't go off until mine is active, and not too often
+	- Make mines not cause displace you (so you can't get stuck)
+	+ Make beams not break for friendlies
+  - Make a deployable turret
+	+ Design, make class
+	+ Deploy it correctly, visually
+	- Fix collision problems
+	- Ammo?  Damage?  Attribute resources correctly on a kill
+	+ Does it need to be built before activated?  Probably want this so turrets can't instantly be bought and deployed.
+	+ Better sounds (added hooks, sounds just need to be replaced)
+  + Refactor current team in AvHPlayer
+  + Refactor creation and dropping of ammo
+  - Bug: Turrets/marines/shotguns aren't hurting players
+  + Bug: Can't select mines
+  - HUDs for each class
+	- draw current health
+	- draw resources, if applicable
+	- get mouse dragging working again to customize nicely (use when all components hidden) (if easy to get working)
+  + Add concept of weight for everything that can be added to inventory.  Weight changes your max speed.  Carrying multiple weapons works differently though: only add the weight of the heaviest weapon you carry.
+    X add bool to panel that is debug only, never draw components that have debugonly set when this client variable is set
+    X add label that shows current weight, current top speed (debug only)
+	+ Print out current weight and speed when it changes
+  X After purchasing equipment, have concept of "held item"
+    - Allow "held item" to be dropped
+	  - Add a (blinking?) message on HUD that says "Holding <itemname>.  Touch a player to give it to them."
+	  - Fill in pie menu entry to switch between DynDropPurchase to Drop <itemname>
+	- If leader touches soldier (only in his squad?) (not the soldier touching the leader!) then the equipment is given to the player.
+	- If the equipment is given, display message to leader and soldier indicating equipment was given.
+	- If the player can't take it, display message to leader and soldier explaing why it couldn't be given.
+    - Don't allow purchases until "held item" is dropped or given
+	- This has changed to just buy and drop the item at once.  Less control but a lot easier to add.
+  X Commander is on the ground like the other roles for now
+  X Allow leaders to pick up equipment if they aren't holding an item
+  - Bring in reinforcements automatically (for now)
+  - For now, there are no separate squads.  All marines report to all squads (this can change later, just get it working!)
+  - Resources on kill:
+	+ Calculate how many points a kill was worth
+	+ Split points between squad leader and commander
+	- Display message to player indicating: "your squad just just earned X points for your side"
+	- Feedback to leader: "your squad just got x points". Very important not to display to squad leader who got the points. 
+	- Feedback to commander: "DarkBunny's squad just earned x points".  Very important to show commander which _squad_ got the points. Rewards squad efficiency, not player efficiency.
+  - Weapons
+	+ Get shotgun functional
+	- Flamethrower
+		- Think long and hard about how to do this 
+		+ Talk to Brian about it
+		+ Finish up particle systems so the look good and and relatively bugfree
+			- Get shotgun puff looking great (waiting for cory)
+			+ Get light dust cloud looking great (waiting for cory)
+			+ Fix particle shaking problem
+			+ Fix orientation of particles (test in observer mode too)
+			+ Fix particle systems not being added to full pack unless they have a model
+			+ Fix cone coming in at angle
+			O Fix "using" problems so they work well as button/use targets (also fix problem where other particle systems turn off)
+			+ Fix problem where events/particles don't fire every once in a while
+			+ Make sure .ps can do everything that avh_particles_custom can do (flags come to mind)
+			- Experiment particle/zbuffering interactions
+			+ Fix slowdown
+			+ Fix particle problems when loading a second map 
+				+ Reset server template list
+				+ Reset client template list
+				+ Clear all particle systems from manager
+				+ Reload map
+				+ Resend templates
+	O Add knife weapon
+
+  + Remove squad leader (8/8/01)
+	+ Add weapon buying for commander
+	+ Add team_command entity for entering and leaving commander mode
+	+ Fix up so you don't lose your weapons when moving between command mode and ground
+	+ Move marines to completely team resources
+	+ Revisit rewards for killing enemys, give team points for marines, individual points for aliens
+	+ Marines spend points out of team pool
+
+  - Movement modes
+	+ Jetpack
+		+ Get basics working
+		+ Fix prediction weirdness with fakelag
+		+ Add blue dlight
+			+ on client
+			+ on server
+		+ Add sound that plays
+			+ on client
+			+ on server
+		+ Bug: why doesn't the effect play locally depending on weapon you're holding?
+		- Add smoke spray out bottom
+		- Add jetpack as attachable model
+		- Modify jetpack so wishvel is taken into account, like flight
+		
+  + Test for victory
+	+ Victory mode where it says "x team wins" (it's got to be better than this, esp. given the longer length of games)
+	+ When victory mode ends, reset level and put everyone back in the ready room
+
+  - Optimization: check into marking func_waypoint and such with FL_DORMANT so they aren't updated to client ever
+
+  + Tone down alien speeds (8/8/01)
+  ? Lower marine speeds just a little for Lost Temple timing results
+  + Have less differentiation for equipment (8/8/01)
+
+  - Placing buildings from top down mode
+	+ Need placement of turrets, phase gates, siege turrets (so models, or particle systems)
+	+ Desirable to have same code running on client and server, so put it AvHSharedUtil?
+	+ Maybe this is the same code that traces for right-click?  It traces down to a avh_groundfloor?
+	+ If the client determines a successful placement, it sends request to server
+	+ Client can put it down immediately, server must send back error to delete it if it wasn't valid (sends message with "turret bought, or turret cancelled")
+	+ Get phase gate sound looping
+	O Get turrets rotating after placement
+	+ Add siege turret
+		+ Fix them so they fire
+		+ Add new effect when getting hit
+		+ Slow ROF, warm-up time
+		+ Minimum range
+	- Add camera tower
+		+ Have the resources affect incremental resources
+		- Have the resources affect kills
+		+ Set default incremental resource rate to 0
+		- Add health to camera tower so it can be destroyed
+
+   O Change how weldables look to the welder-wielding player
+   O Better sounds for turrets, let siege have different sound effects than regular turrets
+   - Make all buildings solid and fully built in testing mode, buildable in non-testing mode
+   + Fix siege turrets to fire again
+   - AvHCameraTower should take damage
+
+Ideas from Damon and Greg on camping trip:
+- Commander micro:
+	- Allow commander to use power-ups, like originally intended (they cost maybe 1 pt each time they're used, they're all part of level 1 weapons research)
+	- Let commander build hunter seeker scout thing that he can move around.  It doesn't path, just simple moves.  It cloaks when still, but only provides LOS when not cloaked.
+	- Allow aliens to mass by getting picking up eggs off walls of hive and dropping them like dropping a weapon.  When a marine comes within a certain distance, the egg opens and an alien attacks.  After that tha elien goes back to his post and ventures within a certain distance to engage enemies.  Allows aliens to rush, or keep them for defense.
+	- Damon doesn't like multiple commanders, conflicting orders
+	- Damon loves the idea of commanders turning turrets, because they can only be effective in a 90 degree angle or so
+
+Tasks before trying to have a real game of marines vs. marines (6+ people)
+  - Soldiers, general
+    + Weapon switching and showing your current inventory clearly
+    + Reloading
+    + Squad promotion and demotion
+	+ Fixed client-side prediction errors with weapons (make sure not to use random numbers anywhere!)
+    - The concept of armor, and heavy armor
+    - HUDs showing health, ammo, current weapon, armor, etc
+		+ health
+		- armor
+		+ ammo
+	+ CS hooks to let you play on a CS map
+	- Smoke puffs and other feedback for weapons
+    - Flamethrower
+    - Overwatch
+    + Welding gun
+	  + Shell/boilerplate code
+	  + Weapon effects
+		+ One for welding near nothing
+		+ One for welding an object (smoke, hot glow).  Use also for attacking.
+	  + New entity that represents a weldable item
+	  + When firing, check if any weldables are in the area.  If not, check for target directly in front of us.
+	  + If welding, increase percentageBuilt by rate dictated by welder and build time of entity
+
+    - Welder repairs armor, with status bar
+	- Show message when near something can be welded, draw line towards it too
+	+ Get heavy machine gun back in 
+	- New resource model (#4)
+	- Increase checking rate of claymores
+	- Revamp marine role messages
+	+ Fix observer targets
+
+    + Chain of command
+		- Allow marines to defect
+		- Player can only become commander when there is at least one squad leader.  If at the start of a round there are no leaders, change any commander to leader
+		- ...
+
+	+ Get player models working correctly for each marine, alien and ready room state
+
+	- Commanding
+		- Commander has no body
+		- Draw every player name on HUD (COC) with leaders at top, soldiers indented below
+			- Draw box around current squad, depending which is selected
+			+ When player is firing, draw blinking icon next to his name
+			- When player is being attacked, draw blinking icon next to his name
+			+ When player sees lifeform, highlight his name
+			- Draw player names in color that represents his health
+			- General LOS: Draw blips when near marines, don't draw elsewhere.  When an enemy is in view of a marine, draw it normally (add to PVS)
+
+    - Resources allocated correctly, due to squad
+
+    - New player models
+    - Grenades (they should check to make sure they have a clear line to target before doing damage, so they can be used to clear hall while in cover near it)
+    	- gas
+	    - frag
+
+  - Leaders
+	+ All bought items dropped
+
+  - Fully develop commander role and communication between him and teammates
+	- Added "Enemy spotted" and "Requesting orders" for non-commanders
+	- Give automatic orders that speak to players "build objective", "weld objective", "guard player", "pick up weapon"
+	- Make it SUPER-clear what your order is.  This is one of the big reasons why this approach hasn't worked in the past.  My mom should know what to do and where to go.
+	- Add tons of elevators, doors, buttons, switchable lights, this stuff seems great for commander
+	- Draw waypoints in yellow when given, green when acknowledged.  Yellow waypoints expire after 10 seconds or so (or when "negative")
+	- Definitely add powerups, they will transform the game
+	- Draw enemy hive locations on mini-map, draw visible enemies as red dots as well
+	- The commander can sometimes see red blips on the main view, that doesn't mean they are drawn on the mini-map
+	- Make aliens move much slower (except scout aliens?) so the micro-ing is useful for marines?
+	- Add localized description names for each func_waypoint so we can transmit orders like "guard location in the garage", or it speaks "guard location", then blinks arrow and shows "Move to the garage, acknowledge to accept"
+	- Communicate sub-menu sends trebley voice comms down to selected players (except taunt and a couple global ones)
+	- double-tap 1 jumps to squad 1, 2 -> 2, 3 -> 3
+
+  - Test teams by adding console command that changes renderfx for every entity in the world to yellow for neutral, blue for team1, red for team2
+  - How to show what can be welded
+  - Try to add graphical HUD for top-down using sprites
+  - Add power bar for jetpack and flight
+  + Velocity doesn't break cloaking, only user movement and attacking!
+  + Add entity that lets commander go into top down mode
+
+  Less important:
+  - Voice acks at start and stop of many actions
+  - Commander  
+    - Phase gate
+    - Adrenaline
+    - Def matrix
+    - Camera tower/resource building
+    - Siege turret
+
+  - Blaze of glory (or something in its place)
+  - Life support
+  - Nuke gun (save until last because it may not fit in the menu if the chain of command doesn't work)
+  - Promity sensor?
+  - At beginning of round: (commander player) "Are you ready to give your life for your team?" (all players at slightly different pitches/timings/voices) "Sir, yes sir!"
+  - Nearby chat
+  - Laser designator
+  - Ability to mark a target location or person
+  - Buy item, hold it, then give it to next player you touch
+  - Accuracy system: less accurate the faster you're moving (what's this trying to promote?)
+  - Good first map (using existing map pieces as a start)
+  - TODO: Override int CHud :: MsgFunc_Damage to really customize damage feedback, ala Carmack!
+  - Automatic shoulder lights
+
+Finalize mapping technology build
+	- Add gamma entity
+		- Make sure it restores when game crashes 
+		+ Make sure it works correctly when map changes
+		+ Remove ToggleGamma() and command
+		+ Allow tweaking of gamma in mapper build only?  Only if cheats enabled?
+		+ Allow tweaking of particle systems in mapper build only?  Or only if special command line parameter?  Only if cheats enabled?
+		- Include in docs how to modify screenshot using Photoshop using your gamma
+		- Add screen shot capability using PunkBuster stuff?
+	O Remove lots of stuff so it's totally unplayable
+	X Get view entity height working correctly
+	- Make start/stop commander mode work right, also don't show special commander HUD
+	- Fix up welding so it looks right on ground and in top-down view, also bring down number and size of particles and test on Shodan for peformance
+	- Finish documentation 
+		+ Rework visuals, add particle editing docs, update in a big way
+		- Add section on hacker mode and how to use it (must wait until public release)
+		- Update commander mode entities (must wait until public release)
+	- Finalize hacker mode stuff (ie, tweak collision and feedback)
+	- Fix particle system normal problem
+	O Have many less assets to keep build small (create formal asset list?)
+	- Create docs on how to setup Worldcraft for use with it?
+	- Have separate mapper IDs, up until the mapper build becomes public
+	- Fix/remove LOS stuff
+	X Rename all entities to ns_?
+	O Convert all .rmfs over to NS entities
+	+ Add listps command that lists particle systems
+	O Remove support for <mapname>.ps?
+	- Test triggers that are in place when game starts.  Remove trigger_ entities like ns_casualmode_enable?
+	+ Rename "specialsound" entity
+	+ Remove or add to glow entity
+	- Make sure order-giving works through multiple ground floor entities so we can have walkways
+	+ Rename ground floor to whatever Crinity/I decided to call it
+	- Finish sample level and all issues that go with it
+		+ Fix r_speeds with ceilings
+			- Incorporate into mapping guidelines
+		+ Fix func_waypoints...finally!
+		+ Water not showing up in top-down mode (are all entities being culled in top-down mode?)
+		+ can't cancel building anymore
+		+ Not smoothly scrolling anymore
+		+ Fix performance problem on _ground_ (top down works great)...func_seethrough, func_waypoint or clip brushes?
+		+ Get rid of random water effects?
+		- Add more shared experience stuff
+		+ Add hacker-mode stuff for commander
+		- Fix upper right corner
+		+ Add ready room
+		+ Add at least one particle system
+
+	+ Add periodic message indicating that game won't start until both teams have players
+	+ Update victory conditions to end whenever either team has no non-commander players with points and ability to respawn
+	+ Remove outdated console commands, move couple hard-coded ones into constants
+	+ Add end game as loss sound
+	+ Add knife sooner rather than later
+	- Add recoil system for weapons
+	- Make base movement without machine gun a bit faster (so going naked is more beneficial)
+
+Alien playable goals
+  + Figure out alien interface...pie menu?  Gestural stuff?  RMB as special?	Multiple weapons via HUD?
+  - Design interface and upgrade system
+	+ Rework pie menu a bit to allow sprite nodes and connectors
+	- Fix pie menu to clip vertical connectors correctly
+	- Add leaf node sprite nubs
+	- Make spit a ball that collides, not a point
+	- Get alien weapons to show up on HUD, play a different sound when selecting and choosing
+	- Get alien weapons to be predicted correctly, something's wrong
+  - Morphing and upgrade system
+	- Designed and mostly implemented
+	- Make upgrades take time?  Become an egg when morphing up to other lifeforms?
+	+ Give aliens some basic attacks so they can fight
+  + Hive mind structure that spawns in at random avh_hive_start point
+  + Spit weapon
+  - Dark swarm/gas
+  - Melee attack for level one
+  - Fix up flight
+	- Add effects
+  - Fix up wall jumping
+	- Add effects
+  - Fix up gliding
+  - Web?
+  - Wall running (big task I think)
+  X Egg laying for spawn points
+  - Acceleration, charging for artlu (takes awhile to get top speed)
+  - Player hulls for different size aliens
+  - Universal upgrades
+	+ Exoskeleton - Armor upgrade
+	+ Phermones - Increases movement speed 
+	+ Regeneration - All aliens heals damage and armor over time 
+	- Infravision - Player can see heat, even through world geometry (humans only for now...generators, phase gates, firing weapons? placeable heat entities so humans can hide out?) 
+	+ Cloaking - When alien stands still, he fades to near invisibility. Aliens remain cloaked when attacking but not while moving. 
+	- Acid blood - When alien takes damage, he inflicts damage on reflection of attack. Can hurt fellow aliens when team damage is on. 
+	- Allow upgrading multiple abilities at once?
+  - Alien language/taunting
+  - Whenever an alien attacks and hits ANY player, he squeals and his adrenaline goes up
+  - Unified hive mind system
+	+ Basic system (including for marine side!)
+	- Draw it better so it's easier to tell the range (fade it?)
+  - Ideas for alien weapons: 
+	- power up move that makes a sound, then attacks all players in range (like the electricity guys and blink dogs in Half-life)
+	- an alien ability that can be used to bring another alien back to life?
+	- some sort of gambling type, double or nothing ability.  Each time you use it, you get pumped up more (faster, more damage, etc.) but you lose points of your current AND max health
+
+
+Bigger tasks
+	- Nice scoreboard
+		- Basic system (teams, colors, schemes)
+			- going to ready room should change team to 0
+			- Draw team 0 at bottom
+			- Allow mouse to become visible when scoreboard is up (disable pie menu)
+			O Colors
+	- Player ID system
+	- Sniping
+	- Stim pack and other commander abilities
+	- Feedback for melee attacks
+	- Disable tech buttons when not allowed
+	- Fixup egg laying
+	- High jump, wall jump
+	- Growing melee
+	- Rework visible orders
+	- Regen near hive, get ammo near hive
+	- Friendly fire issues (make sure it works correctly in tournament mode, non-tournament mode)
+	- "stop-hit", "pull-back" and affecting velocity when hit by weapons
+	- Heat for marine weapons
+	- Charging (costs adrenaline, but you'll get it back if you hit!)
+	- Primal scream (adrenaline)
+	- Test commander blips
+	- Revisit tech tree and upgrades
+	- Voting system
+	- Turret solidity and build bug
+	- Make commander waypoints more clear in FP view
+	- Volumetrics (grenades and flamethrower)
+	- Eggs that visibly morph into creature
+
+Little tasks (bugs, small improvements)
+	+ Lower gravity for flying only when jump is held down (allows gliding down)
+	- Allow WASD scrolling in top down mode
+	- Make sure area is big enough for gestation
+	- Fixup selection of welder and grenades
+	- Fixup grenades
+	- "Press a key to continue" when screen blocks during death
+
+
+Possible features
+  - draw health and more in observer mode?
+
+Ways to play:
+  - save money, use points for respawns
+  - seal up the place with welder, buy time, drop resource buildings
+
+After watching Cory:
+  + "Build turret" buys it and starts building it
+  + "Next weapon" should be disabled when appropriate
+  + Mousewheel should cycle weapons
+  + Type out message: Activate the turret by pressing your "use" key on it.  Say this whenever you're near an unbuilt turret, not just after buying one!
+  + Bug: enemies aren't displaying message when killed
+
+After watching Nate
+  - Put ladders in corners or near obstacles so they can't easily be overshoot when trying to use 
+  - 
+
+Other stuff
+  - How to know whether your team is "winning"?
+  - When near a turret (or holding a turret before placing), draw circle showing it's area of effect
+  - How to look at another player and know their role and relation to you?
+  - Put chain of command back in
+	- Update to not use experience level but desired role
+	- Draw much smaller, use small font to do so
+    - Find bugs in it
+  - Manual reinforcements
+  - Sudden death mode where reinforcements aren't allowed after a certain point
+  - team scoreboard when holding tab
+  - ammo/healing (?)
+  - audio/visual victory, then observers/reinforcements respawn in ready room, those in game stay in the game
+  - basic level using new entities with ready room and two bases
+  Deferred/No longer needed:
+    - visual effects while building bases (you have to "use" the building kind of like the HEV recharge stations.  after you use it long enough, it comes online and starts humming.  multiple people can help to build it faster.  I want the building to fade into view.  also lets people have non-combat builder roles, esp. if allowing repair, or skilled building)
+    - ability to destroy bases to reduce resource intake (not working for some reason) 
+    - equipment can be purchased any time but is only given when near/touching base (promotes falling back and planning)
+  First-person reaver-like cannon for aliens, can hit clusters, can outrange turrets, sneak past mines/trips
+	- Maybe have it do more damage to closer the target is?  So it can outrange stuff but takes longer, or get really close for high-impact
+  Aliens need weapons that require cleverness and have neat side effects
+	- Things like blowing up ammo, affecting speed, damage multipliers, limpets, shooting projectiles that you can view from
+  Add lines to trace along to weld?  Damn that'd be cool....
+
++ Write documentation that describes how to build levels using these entities
+
+- Incorporate Zassert into rest of game
+
+- Before MOD expo application
+	- New cursors (just waiting for Jason)
+	- New commander UI, polishing and tweaking for 1024x768
+	- Fix cursor behavior over commander UI
+	- Order giving (only if movie being made)
+	- Drawing orders better in first-person
+	O Pretty up marine UI (resources/reinforcements...hide for now?)
+	- Implement colorful and helpful mini-map
+		- Design and get working
+		- Add hooks for map-makers to customize?  Specify minimum width/height for important entities so they show up?
+		- Add minimum view height to shading is right?
+		- Now that the aspect ratio is preserved, fix AvHTeamHierarchy
+	- Spruce how how marines look when selected
+		- Added spinning model that is colored according to player health
+	- Alien view model
+	- Take screenshots Tuesday night with mini-playtest
+
+- Before MOD expo
+	- Fix every single crash
+	+ Add func_useables entity so commander doesn't have to click tiny buttons, he can click on the entities themselves!
+
+--------------
+- Tech release
+--------------
+t.calder@home.com, by tomorrow evening
+kwarismian@home.com, icq: 5350815, MrBlonde (PolyFighter guy)
+O Fix up mouse cursor disappearing issues
+	- Allow right mouse to mute players when menu is up
+O Fix up particle editing
+	O Mouse issues
+	O Slider bugs
+		O Nubs too big
+		O Moving one slider changes another
+- Everything should reset properly
+	- Welds
+		- Appearance isn't restored yet (won't matter for tech release because no welder)
+	O Breakables
+	- Door positions
+		O Weird issue with them
+	- Clear decals
+- D3D commander mode compatibility
+- Software commander mode compatibility
+- Spawn in wrong place bug
+- Mouse click "bounce"
+- Fix up assert dialog
+	- Report symbols
+	O Make it simpler and easier to read, mouse cursor notification
+O fmod.dll issues (ask to overwrite)
+O Document trigger_random
+O Add UI artwork for each resolution
+- Tweak fonts for each resolution
++ Add installer
+	O EULA
+	O Background art
+	O Readme indicating release status (only for mappers)
+- Have NS verify it's own installation
+- Make weldable areas obvious 
+- Movement keys while using commander mode
+- Capture mouse in minimap
+X Make sure weapons can be placed (changed: weapons aren't part of the build)
+- func_waypoint building placement bug in ns_spacestation
+- Make func_waypoints non-solid if possible
+
+- Very last things
+	- Fix some schemes so they don't have background
+	+ Add message indicating that particle editing won't work in the ready room?  Moved messages so they can be seen better also.
+	+ Fix raindrop
+	ftp.todaysclan.com, port 21
+	milkchug/2percent
+	html/natural
+	http://milkchug.todaysclan.com/natural/FILENAME.zip
+
+- Bugs to fix in first patch
+	O build minimap error...is there a max number of network messages?  Change task to: remove old network messages.
+	O commander-only flag to func_doors?
+	O rewrite slider control
+	O Upside-down particles bug
+	- Culling/cleaning of particle systems
+	- allow particle editing before joining
+	- fix particle system network message overflow
+	- Cory fix blue textures
+	- Add mapper name and e-mail to fade in when map starts
+	- First hive should emit sound
+	- Gradual hive spawning effect (not sudden, more intuitive, give players an idea it's coming)
+	- Weldable drawing (hint text)
+
+
+Before REAL MOD expo
+	+ AvHClient entities shouldn't draw
+	O Final click-bounce issues
+	O Fix popping sound when game starts
+	O Fix "goto alert" bug
+	- New waypoint system
+		+ Basic work
+		O Fix infinite loop
+		- Shouldn't allow building on steep surfaces
+		- Turrets sinking through the ground
+	- Fix overflow issues
+	- Add LOS for webs and eggs
+	O Get particle animation events working
+	- Disable nodes that are researched or can't be researched (not obvious right now)
+	O Polish up alien melee feedback so you know when you're hitting something
+	- Marine eyebeam lights
+	- Fix turret and building bugs
+	- Reorganize HUD a bit
+	- Big time reworking of order giving
+		- Get waypoints working again
+		- Ability to give "pickup thing" order to player
+		- Selection discrepencies
+	- Make blips useful and looking cool
+	- Ability to give a movement order to a bot
+	- I also want no crash bugs at all
+	- Replace really blatantly recognizable sound effects.
+	- Non-smooth scrolling issues
+	- Minimap accuracy/usability issues
+		- Make sure it works again with new system
+		- Do something different if no map extents are specified?
+	- Be able to weld any door (other things too?)
+
+---------
+- NSTR2 - 
+---------
+O Token too long bug
+	- Into docs: instructions for converting particle systems:
+		1. Get a recent .map version of your .rmf.  Do this by exporting your .rmf if needed.  If this .map was last exported using the previous ns.fgd, you can skip step #3.
+		2. Open up your .map in a text edtior like notepad.
+		3. Search for env_particles_custom.  Delete any lines that you see any of the following lines in:
+			- "particlesMaxAlpha"
+
++ Find someone to update mapping guidelines continually from the forum (tell them to e-mail me and Monsieur when it happens)
+O Hulls.txt for CSG
+- Welder, welding
+	- Feedback showing what is weldable
+- Particle lifetime bug (Merks)
+	- the slider for particle system lifetime doesnt have a -1 setting, so if you edit a ps with a lifetime, and then edit one which is set to never die, then it uses the current value on the slider for the PS lifetime
+<Merkaba> and of course once its died, u cant get it back again
+- New mapping guidelines
+	- Visual rework (Mike)
+	O Add timing (a default marine takes 30-40 seconds to run between marine start and each hive, and between each hive)
+	- Define alpha sprites guideline
+	O Minimum frame rate, new r_speeds
+	- Particle velocities, use description from Relic in the forums (http://www.natural-selection.org/cgi-bin/UltraBoard/UltraBoard.cgi?action=Read&BID=4&TID=3343&SID=15832)
+	O Integrate commander mode EARLY, not later (Chromeangel - "Build your maps with commander mode from the start, don't try and add it later as that's a real nightmare.")
+O .mp3 water sound fix
+O Update .wad with Relic's textures
+- Test func_nowaypoint and func_waypoint backwards-compatibility
+- func_door seethrough entity
+	- Allow it to be hacked by checking for commander alpha
+- command station targets 
+- If you have Photoshop, you can fake the gamma with Image->Adjust->Levels, then change input levels to 0, 1.00, 128 (for gamma ramp of 2)
+O trigger_presence docs
+O Include hive
+O remove team_leavegame
+O Update all sample maps
+	O Get mappers online to provide new samples
+	O Fix old textures
+	O Update to new entities
+	O Streamline build to use nshulls.txt and one examples.rad
+	- ns_solar?
+O Quark update? (waiting for response)
+O Auto-help hookup
+O Add turret and ammo to tech tree for mapping build
+	- Make sure turrets and ammo can be built
++ Make sure people can't join when tournament mode enabled
+- Turn off cheats by default (why is this set?)
+- func_door bug (not opening when touched)
+- New hulls problem (crouching in general?)  (wrote Zoner)
+	- Ducking weirdness
+	- Level 5 not causing collisions
+X Missing sprite on spacestation?
+O Update .fgd to not say "Aliens vs. Humans"
+O Update server.cfg and listenserver.cfg to be right for NSTR
+O Remove player1.mdl (change to Gordon?)
+O Add player sizes to mapping guidelines
+O Welding
+	O Including building repair
+	O Get all assets
+	+ Get welder to show up in HUD selector
+O Fix up team damage
+O New particle docs from Merk (after it's released)
+O Make phase gates round-robin
+O Particles disappearing bug
+O trigger_hurt not doing damage bug (looks like a hull issue, recompile with -hullfile)
+- Crouching animation issues
+	O Most of it
+	- Sinking too far
+- Problems with item placement via commander mode
+	- Works on bast, but not on hera or commander_mode
+- Minimap scale issue
+	- It's better now, definitely not perfect
+- Welder delay weirdness
+- Shouldn't have to be on a team to edit particles
+O Bring hive collision size up a bit
+	O Hives will no longer spawn in on top of you
+O Bring alien speed down a bit
+- Particles not generated properly from moving entities
+- particle system lifetime bug?
+- Fix alt-tab bug when asserting?  
+	X Automatically e-mail maybe?
+
+ftp://milkchug:jimmytheswitch@ftp.todaysclan.com/html/natural/ - you only have access to this folder. Address is http://milkchug.todaysclan.com/natural/
+
+Tasks for PC Gamer
+-------------------
+O Make MG presentable (also spawn in with MG)
+- Change ready room model to marine
+O Have all weapons use HMG animation
+- Lots of hints
+	O Wall running
+	O Flight
+	O Explain hives
+	O Builder alien
+	O Help text for hacking
+	O Help text for welding, picking up items and attacking
+	- Help text for purchasing stuff and researching
+	- Show messages after a build ammo/item
+	O Show message after a build structure
+	O Tell players to use pie menu
+- Fixup voice chat if I'm gonna demo it to them
+	O Allow talk from commander
+	- Make commander icon a special icon or color?
+O Fixup building placement
+	O Transparent things (like dome in hera)
+	O Basic placement issues
+O Improve marine weapon feedback and effects
+O Add view window for minimap
+	O The map is displayed slightly off center still
+	- Fixup view window so it takes scale into account
+	- Clip view rectangle to component
+
+O Research should make nodes go away
+	- Clean up appearance of disabled nodes
+	O Disappearance of nodes after researching
+- Buy reinforcements, not infantry portal
+O Make equipment purchases cost money
+X Alien pie menu sprites aren't getting reset when "map ns_hera" after running game with bast
+- Explain leap attack (or make it work right)
+- Change alien weapon sprites to anything else?
+- Draw resources for players
+	- Draw semi-nice alien resource level
+	O Play "you require more minerals" appropriately
+- Don't ever let players get stuck
+	- Alien morphing
+O Virus scan EXE before sending
+O Make install
+	O Set up config
+	O Test on other machine
+	O Test with Mike or others in MP?
+O Overflow fix
+O Allow late-join no matter what for now
+O Player ID
+	O Remove ping
+	- Draw health for friendly?
+	O Draw in different colors for enemy for friendly?
+O Make commander mode useable (without using buildings)
+- Add grenade?
+- Receive updates or bast and/or hera
+- Tripmine is huge
+- Tool tips for alien pie menu
+- Make webs more significant (increase ensnare time and allow webs to be cumulative?)
+- Move chat up for commander?
+- Team scoreboard + colors (esp. after death)
+
+Fixes for NSTR2
+- Lots of stuff.  Hulls fixed, crouching fix, particle system isn't deleted until all particles are, welder is in and working, minimap scale fix, hives don't spawn in on players anymore, welder shows up on HUD, aliens are slower, team damage works better, buildings can be repaired with welder, phase gates operate round-robin (instead of random)
+
+Effective micromanagement
+  Ideas about making micro-management as powerful as possible.
+
+  1. When the commander issues an attack order, his target's location is revealed to him, even if he can't see the target and even as it moves (because 
+  the soldier will see the waypoint on his HUD).
+
+  2. I'm thinking of adding a "stimpack" type abiliity, where the currently selected player(s) gain speed (and maybe a damage bonus, ala Starcraft) for a 
+  short time.  This would probably cost points instead of health, not sure.  Of course, if it cost something else other then points, that would encourage the 
+  commander to micro even more.  The hard part is not making it prone to abuse.  If it costs health, a dickhead commander could kill off his team.
+
+  3. There is a full LOS in NS, so that means the commander can only see enemy units and structures when he's got a "unit" on the ground that can see it.  Otherwise, 
+  it's not drawn.  Currently though, the commander can sometimes see "blips" that his players can't see.  This happens when a player is close to an enemy player 
+  or structure but can't see it.  The commander can still issue orders to these blips and can act accordingly.
+
+  4. I'm thinking of some way the commander can mark areas as dangerous...like maybe he could quickly mark the mouth of a ventilation shaft as dangerous, 
+  so the commander can use his knowledge of the environment to help players he's nearby.
+
+  5. Maybe if a player hits the unit/building he's targetting, it can acquire a "lock" and he'll do more damage?  This is a bit artificial-sounding but this 
+  could really go a long way towards effective microing.
+
+  6. The commander can "drop" weapons, ammo and possibly healthpacks to players.  These items phase in almost instantly.
+
+  7. Possibly an ability the commander can research to allow a player to become invulnerable (but maybe immobile also?) for a short time.
+
+  8. Phase gates can be dropped in, providing a quick escape for players.
+
+  What I'm really looking for here is a way for the commander to affect the outcome of a combat.  Like in Starcraft, there's this great thing where 
+  you're constantly telling units to attack, run away, marine dance, attack new targets as they become visible, etc.  You're always assessing combat too, 
+  so you know whether to retreat or not.  In NS, that doesn't exist yet, but I think it will with some more work.  All the player move speeds are a bit 
+  slower then most FPS games, so troops can be deployed with intention, people aren't just running the map wildly and also so the commander can actually select 
+  players and give orders.
+
+
+From Shackes:
+
+http://www.shackes.com/articles/cpl_recap.html
+"The only really viable professional game on the horizon is Warcraft 3, and that's not an fps. Because of that, the CPL is probably going to be "stuck" 
+with Counter-Strike for awhile. Doom 3 and Quake 4 are a long way away. So where do we go now?"
+
+"The best thing that can happen over the next year of the CPL-CounterStrike relationship is to see the Counter-Strike community mature into something that 
+has stable clans and a plethora of players that are committed to being professional gamers, regardless of platform. That way, when a new CPL-worthy game comes 
+out there will be a huge community of clans and players that will compete hard at it. The serious Quake players and the serious Counter-Strike players, ideally, 
+will merge into one thing and the core community will balloon. Gamers will be unified, and the competition will be fierce. "
+
+
+- From DOD map submission guidelines:
+	WADS and textures: 
+	ALL textures will be inlcuded in either the .bsp file, or in a wad file with the SAME NAME AS THE MAP. No textures will be included in this .wad that are not in the map. The map will not point to other WAD files, only it's personal wad file. 
+	
+	MODELS, SOUNDS, and SPRITES: 
+	ALL map models will go in: 
+	half-life/dod/models/mapmodels/ 
+	ALL sprites will go in: 
+	half-life/dod/sprites/mapsprites/ 
+	Sounds will go in a subdirectory of: 
+	half-life/dod/sounds/ 
+	This subdirectory will have the same name of the map. So, each map will have its own 
+	directory for sounds. 
+	
+	NO DEFAULT DOD SOUNDS, MODELS, OR SPRITES WILL BE REPLACED BY MAP SUBMISSIONS. 
+	This includes flag models. If your objective system uses flags, then use the flags included with dod - No 600 poly waving flags that everyone seems to use. If a non-flag model is used for objectives, that's fine - as long as it's not high-poly. 
+	
+	NO INSTALLER FILES PLEASE. We here at the dod team know how to unzip a file! You don't need to include a useless installer that takes up extra space and clutters our program menu 
+	with uninstall options! Just put your files in zip format, preferably unzippable to /dod/, not /half-life/. 
+	
+	Do not clutter your map submissions with useless filler! File size will be a MAJOR consideration in what maps we choose - if a file is too large, or not CRUCIAL to your map, leave it out or cut it down! (i.e., you don't need a 2 meg sound file to play during different points of the map!) 
+	
+	If you use sounds, textures, or models from ANY OTHER GAME OR MOD, you must note it in your readme.txt. If we catch people using textures from other games, and we're not told about it by the mapper, we won't hesitate a second to remove your map from 2.0 consideration. 
+	
+	BE WARNED: We have ALOT of submissions, so if your map submission doesn't follow these rules carefully, it probably won't even be put into testing rotation. 
+
+
+
+Features not to forget
+- Blend on server, animation.cpp: "Like Adrian said, if you're doing custom player model blending on the client, you need to mirror that blending on the server or your hitboxes will not match." Digest, Vol #247 and #248
+- Locational damage
+- Recoil
+- Medic role
+- Add something a stationary marine can do for fun, to encourage waiting for orders instead of running off, when the commander's attention is elsewhere?
+- Viewing health/ammo as commander
+- Speaking to only selected players
+- Players being slowed down when hit
+- Slowing down marines
+- Non-active items don't weigh as much (ala CS)
+- Comm sat/scanner sweep
+- Increase speed of spectators, big time
+- Limit spectators to box in map
+- Some way to prevent players from quitting the game, then coming back in on the other team as a reinforcement (track IPs of players that joined a game.  If they leave the server and try to come back, don't let them back in until game finishes?)
+- Display # of reinforcements ("empty slots", or the ability to join the team) on the scoreboard while in the ready room?  Only allow auto-join after game starts?
+- Marines slowing down when really wounded
+- Check Tribes to get a really clear waypoint
+- "trickjumps" for aliens
+- Design a way for events to happen (needed for real community)
+- Published skill levels for servers (more fun for all, anti-cheating too, but requires admins)
++ user.scr and settings.scr
+- Spraypaint images
+	+ Call for action
+	- Look through, collate, test in game
+	- Add to .final wad
+- Profile and optimize network usage
+	X CS seems to use about 1.5k in and out generally, NS is around double that (even with just one player) -- CORRECTION: This was when running the server and is comparable to CS actually
+
+Exporting the db
+----------------
+script
+export QUERY_STRING="action=DoLogin&Username=Flayra&Password=phar0ah"
+export REQUEST_METHOD="GET" 
+UltraBoard.cgi
+
+export QUERY_STRING="CP=++&SID=24623&action=DoBackup&FORM_DESCRIPTION=&FORM_PACK=1&FORM_UPLOADS=1"
+UltraBoard.cgi 
+
+
+Yes!
+script
+export QUERY_STRING="CP=++&SID=24623&action=DoBackup&FORM_DESCRIPTION=&FORM_PACK=1&FORM_UPLOADS=1&Username=Flayra&Password=phar0ah"
+export REQUEST_METHOD="GET" 
+UltraBoard.cgi 
+
+
+
+<form action="UltraBoard.cgi" name="form" method="post"><input type="hidden" name="CP" value=""><input type="hidden" name="SID" value="24623"><input type="hidden" name="action" value="DoBackup"></td></tr></table>
+<td><input type="checkbox" name="FORM_PACK" value="1" class="checkbox"></td><td width="100%"><font class="body">Compress the backup into tar.gz or tar format.</font></td></tr></table></td>
+<td><input type="checkbox" name="FORM_UPLOADS" value="1" class="checkbox" checked></td><td width="100%"><font class="body">Backup all uploaded files.</font></td></tr></table></td>
+<td width="60%" nowrap><input type="submit" value="Backup" class="button"> <input type="reset" value="Cancel" class="button"></td>
+
+
+Set variable QUERY_STRING = "whatever=whatever&whatever=whatever" (may need \&) (or + instead of " ")
+Type set when done and you don't want to see quotes
+AAron: write down the "name" and "value" 's of each input that is "type=hidden" and those that you would interact with.
+AAron: The interaction ones could be type=radio, type=button, type=checkbox or no type at all which is same as type=text.
+AAron: just search for "<input" to find all the inputs.
+AAron: remember you must include the "type=hidden" ones.
+su - httpd (- is important)
+script <enter> (like nothing happened, exit will drop you back to previous shell and tell the filename that it was saved to)
+
+-------------
+- Tech tree -
+-------------																
+									/ -> Turret factory (research for siege) -> <Chem lab (stim, pain management)>
+Command center -> Infantry portal -> Armory (research for advanced armory) -> Arms lab (research armor, damage) -> Prototype lab
+               | \-> resources     \-> Observatory (phase gates)     \-> <Medlab (also allows healing weapon)>
+			   \--> Auxillary command center
+                                                       
+
+Select Command center
+	Build menu
+		(resource thingie)		Infantry portal			Weapon factory   
+		Turret factory			Ammo
+		
+	Advanced menu
+		Turret factory				Armory				Medlab
+		Advanced weapon factory		Observatory			Phase gate 
+		Nuke plant										
+
+	Communicate
+
+Select Turret factory
+		Build turret				Build siege turret	Research siege turret
+														
+Select Weapon factory									
+		Build shotgun				Build welder		Build mines
+		Build medkit (req. medlab)
+
+Select Advanced weapon factory
+		Build HMG			Build grenade gun (req. armory)
+
+Select Armory
+		Three armor upgrades
+		Three damage upgrades
+
+Select Prototype lab (allows new armor droppables from equip menu, placeable within range of any prototype lab)
+		Research jetpacks		Research heavy armor
+
+Select Observatory (allows scanning from equip menu)
+		Research motion-tracking
+
+Select a marine (see health, ammo, weapons including current)
+		
+		
+
+Notes
+	- Number of turret factories and distance to nearest factory together determine turret build time
+
+
+This week (week of 1/14/02)
+---------------------------
+O Dentist
+O Demo NS for Seven for XSR coverage and interest
+- Export forums for Monsieur 
+	O Get CGIs working
+	- Fix out-of-memory problem
+- Laptop for Andy
+	O Reformat and install Win98
+	- Need a mouse
+	- Basic config
+	- Free ISPs
+- Figure out what some people's issues are (JayDog, Eric, Joshes)
+	O Wrote Relic twice
+	O Heard from Josh M, Westward
+- Talk to Paul Ruskay for meeting next week
+	O Email Lani
+	O Call Lani tonight or tomorrow early afternoon
+- E-mail Jeremy?
+- Write up hive mind specs for Cory
+O Sign off on level 1 model
+O Talk to Jeff about work he should be doing
+O Mom visiting Friday, Saturday
+
+Week of 1/21/02
+---------------
+O Call Lani, Monday, 5pm (8pm here)
+- Safety deposit box (and recent backup)
+- Mojo
+	O Email with model and task
+	- Talk with Mojo/team about animation
+- Spec out image stuff with Matt
+- Export forums for Monsieur 
+	O Get CGIs working
+	- Fix out-of-memory problem
+		- Call WebAxxs again to export
+			O Call Monday
+			- Call and ask for Avelino Tuesday, 2:30pm
+- Laptop for Andy
+	O Need a mouse
+	- Working copy of Word
+	- Basic config
+	- Free ISPs
+- Max viewable entities problem
+	O Emailed Valve
+	O Tried my own culling
+		O Refactored AddToFullPack 1/22
+		O Particles don't draw 1/22
+		O Command station not drawing ever 1/22
+		O Some doors don't draw after being opened (doors that start down and move up) 1/22
+- New site
+	O Installed Ikonboard 1/22
+	O Configured colors setup user groups, forums, titles 1/22
+	O Tested new site to make sure there are no dead links 1/22
+	- Get icons for new site (Posted note on dev, MonsE asking Comprox)
+	O Switch over IP to HostRocket account 1/23
+	O Lots more forum work (new icons, avatars, more) 1/23
+
+- Fix HUD
+	O Fix drawing of non-square sprites 1/24
+	X Give commander invisible view model, hook drawing after that 1/24
+	O Convert commander UI 1/24
+	O Convert evolving graphic 1/24
+	X Change mini-maps 1/24
+	- Scaled sprites aren't drawing correctly in software, one of the engine calls probably returns something different (has to do with amount to project and z-buffer depth?)
+
+O Fix ordering giving, building dropping, etc. 1/25
+
+O Don't decrement points when cheats are on 1/29
+
+O Scale NS sprite correctly 1/28
+
+O Remove debug drawing 1/28
+
+O Remove mp_drawall variable 1/28
+
+O Document visibility scheme 1/29
+	O Allow visibility distance to be customized by maps 1/29 
+		O Refactor map extents in a big way first 1/29
+
+O Work on text schemes 1/29
+
+- Allow different error codes for waypoints, so the mini-map looks better
+	O First pass 1/30
+	- Needs more work after mappers have a look at it
+
+- Document F10 for mappers
+
+- Document particle system propagation, one every .5 seconds
+
+O Add setculldistance for mappers 1/29
+	- Document it
+
+O Remove overwatch for NSTR 1/29
+
+X Add bite gun 1/29
+
+O Remove help for mapper's build 1/29 
+
+O Doubled mouse-cursor on scoreboard 1/29
+
+O Allow voice between everyone in NSTR 1/29
+
+O Add wpn_denyselect-a.wav to NSTR (also remove egg) 2/1
+
+
+- Document particle entity field name changes
+
+O Fix sprite HUD drawing so it doesn't move when the view angle hints (from damage or falling) 1/28
+
+O Brightness in sprite drawing 1/29
+
+O Modify top-down background drawing to draw smaller, not the whole map (may fix software issues) 2/1
+
+O Have welder use other animation for NSTR only 1/31
+
+O Restore turret to it's old state before releasing NSTR 1/31
+
+X Fix up map extents, so you can't scroll commander origin to edge
+
+O Fix PAS problem with .mp3s 1/28
+	O Propagate PAS for commander? 1/28
+
+- Don't update context-sensitive cursor when over the UI
+
+- Remove references to ns_solar from the mapping guidelines
+
+- Add sky, clip and trigger textures to ns.wad
+	O Posted about in on forum 2/1
+
+O Add 'high-detail only' option for particle systems (defaults to on) (lower-priority) 1/28
+
+O func_illusionary flags 1/28
+	- Add note about doors changing their render mode from additive to textured, ask Relic to verify correct behavior
+
+O Add quick fog entity (bad Charlie!) 1/23 
+
+O Moved turret and siege turret constants into skill.cfg 1/30
+
+O Update all maps for new entities, test compile and test 1/31
+
+O Removed sounds that we shouldn't be redistributing from NS, NSTR and install
+
+O Fixed high_detail particle system creation bug (how did that ever work so well?) 1/31
+
+- Comprox offered server for playtesting on http://www.artofwarcentral.com/ 2/2
+
+Week of 2/4
+-----------
+- Andy computer
+	- Install Word (tried to, only one disk)
+	- Install new ISP stuff and test
+	- Send it out
+
+- Pay rent and gas 2/5
+
+- Save/restore gamma ramp for NSTR2 2/5
+	- Allow non 1.0 gamma on desktop
+	- Now gamma multiplies with your current gamma, so this seems correct (assumes that gamma set on your desktop is there to compensate for you monitor and/or your own eyes)
+	- Abstracted it into own class, much better now
+
+- Resource towers
+	- Implement base 2/4
+	- Have concept of occupied func_resource?
+
+- Selection issues
+	- All working 2/4
+
+- More forum shit
+	- Called again 2/5
+	- Ticket # for WebAxxs: 63391 (1-877-932-2997)
+	- Found out results for export, discussed solution with MonsE 2/5
+
+- Talked to Cory about open-sourcing artwork and his tasks 2/5
+
+- Talked to Merk about func_resource and final NSTR2 issues 2/5
+
+- Playtesting forum
+	- Conceptualized, created 2/5
+
+- CVS repository stuff 2/6
+	- Make directories: c:\projects and c:\projects\StratHL
+	- checkout strathl\strathl to c:\projects
+	- checkout strathl\cl_dll to c:\projects\StratHL (continue for common, dlls, dedicated, engine, external, HPB_bot, linux, lua, mod, particles, pm_shared, testbed, textrep, ui, util, utils)
+	- checkout game_shared to c:\projects\StratHL
+	- checkout zhlt to c:\projects\StratHL (not engine!)
+
+- Get laptop setup for NS
+	- CVS 2/6
+	- Experiment with different drivers for windowed mode, try debugging in full screen 2/6
+	- NS isn't running now, figure out why
+
+- Write Isabelle at Turbine for Skit 2/6
+
+- Updated and posted new art asset list 2/5
+
+- Write Comprox about new button task
+
+- Final final for NSTR2
+	- Draw scaled doesn't work for fov other then 90
+	- Allow particle editing when not on a team
+	- End game problems when player is commander
+	O Add trigger on build, trigger on destroy for func_resource 2/6
+		- Test 2/6
+	- Fix crash in software
+		O Investigated, posted thread on forum 2/1
+		- Test more
+	O Remove speed settings from trigger_presence 2/6
+	O Fix event playback 2/8
+		O Emailed Yahn 1/24 or 1/25
+		O Emailed Yahn 1/28
+		O Experiment with commander event playback 2/8
+		O Fixes for entity placement 2/11
+	O Shorten .fgd descriptions to fit in box 2/6
+	x Rename env_gamma to env_overbright?
+	** Fix infinite loop when scrolling around
+	- Add Merks final docs and samples to install
+	- Update .qrk when Howling has it
+	- Test uninstall
+
+Week of 2/11
+------------
+- Talked to Cory about Relic, Comprox, new tasks 2/11
+
+- Implemented camera HUD view (bad Charlie)
+	O Fix triangle drawing of black background 2/11
+	O Fix selection problem when overriding angles 2/11
+	O Fix other weird drawing problems 2/11
+	O Line up in UI 2/11
+	O Added cl_hudcam 2/11
+	- Add special code to propagate info for players when they are selected
+	- Add special code to allow all selectables to show their view_ofs and angles properly
+
+- Docs
+	- Remove speeds from trigger_presence docs
+	- Add Merk's recent post to mapping guidelines
+		- As everyone should know, the level 1 alien (Bob) is able to climb walls, and sit on ceilings. There is a small problem concerning this, due to the way halflife determins the brightness of a model. It takes the brightness setting by looking at the floor directly below it, meaning that if your ceiling is in darkness, but your floor is brightly lit, an alien sitting on the ceiling will also be brightly lit. This, of course, poses a problem. It might only be a temporary problem as it could be that Flay finds a way to take the brightness from the wall the alien is attached to, but for the mean time, be cautioned that dark ceilings and bright floors aren't a good mix.
+		- In various places of Hera, I have pipes/girders running along the ceiling but leaving a 64 unit gap or so above them, so aliens can run along them without being seen, and having the correct light level applied to them. This of course also means the pipe has to be made a func_seethrough (Unless its not a large obtrusion), but that shouldn't be a problem.
+		- The level 5 alien is a large creature, which means that it can only travel through large corridors. I suggest you try and at the least have a direct route between all 3 hive rooms which is large enough for the level 5 to pass through. Also bear in mind, though, that marines must have at least a 30 second walk between the hives. (unless they have jetpacks/welder, which can be used to open up / take alternative routes, if you do so wish to implement such a strategy in your map.)
+	- Fix in mapping guidelines: The caveats with the line of sight computations: sounds and weapon effects are still played for the commander normally. This means the commander can still deduce information about an area that he can't see. If he's hovering over a ventilation shaft with a noisy alien inside, he'll be able to hear the alien if he's close enough. If the alien fires, the commander will see his weapon effect, but not the alien itself
+
+O Research mods from mod college
+
+O Worked with Mojo to get sentry into game, also tweaked sizes and model data for siege 2/13
+
+O Laundry before Vegas
+
+O E-mail Casey or otherwise contact him
+
+Week of 2/18
+------------
+O Play Warcraft III beta 2/18
+O Waste time on forums, showing WCIII to Skit, and hanging out with Skit 2/19
+O Bills after Vegas 2/19
+O Pack and mail computer to Andy 2/19
+O Pack and mail forgotten cable to Andy 2/20
+- Document new func_seethrough (door now) in mapping guidelines
+O Updated resume, print to .pdf, sent to Erik Johnson 2/21
+- Added back in old func_seethrough, added func_seethroughdoor
+- Submit new build to Monsieur, then test it when ready
+	O NSPatch.exe in startup folder?
+	O I broke fog, I need to fix it. 2/22
+	O NS logo doesn't draw when player is an alien. 2/22
+	- NS logo shakes with view (this was fixed too!)
+	O Fix problem with spawning in general (esp. when there are no active hives) 2/22
+		O Spawning without hive stuff 2/22
+		O Fix up sample.rmf to be playable for aliens, compile and test 2/22
+		O Allow spawning in on alien start pos without active hive if cheats are on 2/22
+	O Merks maps may not be drawing correctly, due to recent change in func_seethrough and func_seethroughdoor
+	O Fix selection circle when selecting world brushes (0,0,0 problem) 2/22
+
+Week of 2/25
+------------
+Monday:
+	O Update mapping guidelines for NSTR2 release 2/25
+		O Update env_fog too and re-upload 2/25
+		O Add func_seethroughdoor entity docs 2/25
+	O Update NS.org 2/24
+	- Update ns.org downloads section tonight
+	O Updated NSTR forum description 2/25
+	O Call mom
+	O Check-in 
+		O Check in everything in NSTR2 2/25
+		- Tag it
+		O Post note to dev
+	- Write thank you note tonight to mappers that helped out
+
+Tuesday:
+	- Wasted the day drinking coffee outside, reading the forums, playing some SC, showing NS to Julian, grocery shopping, chatting with Mugsy and Autolycus, talking with Chaminda, drinking wine, and 2 hours of design work
+
+Wednesday:
+	- More alien design work
+	- Added new alien building (infrastructure, new base class for building weapon, contemplated AvHCompositeWeapon)
+	- Cleaned room
+	- Greg came over for dinner, Q2, etc.
+
+Thursday:
+Friday:
+	- Link lifeforms to # of hives
+	- Add upgrade buildings
+		O Add weapons, placeholder art 2/28
+		O Add upgrade messages 2/28
+		O Track unspent upgrade categories and upgrades, propagating to player 2/28
+		O Different construction sounds for aliens, only let builders build 2/28
+		O When upgrade buildings are finished, give the upgrade to the team! 3/1
+		- HUD work
+			O Draw icons for unspent upgrade categories 2/28
+			O Draw icons for current upgrades 2/28
+			- Rework alien pie menu
+				- Draw blinking icon for pending upgrade category
+				- Draw blinking icon in pie menu for pending upgrade category
+				O Draw icons for upgrades in pie menu 2/28
+				- Distinguish purchased from available?
+				- Auto-buy last upgrade in a category
+				- Draw icons better in HUD
+		O Refactor AvHBuildable, AvHResourceTower, etc. so alien buildings are AvHBaseBuildables and there isn't any redundant code	2/28-3/1
+		O When killing an alien building, remove upgrade capacity and random a upgrade from every alien 3/1
+	- Alien resource tower only on func_resource
+	- Phase gates and alien buildings sinking through floor
+	O Fixup bots so they morph and buy upgrades on their own 3/1
+	- Buildings only within bacterial stream
+		- Error message or other notification when not in stream
+	- Add all new upgrades
+		- Defensive
+		- Offensive
+		- Movement
+		- Sensory
+	- Add bacterial stream "gun" for builder
+	O Add projectile attack for builder (non-hitscan bullets?) 2/28
+	O Call Phiroze 2/28
+	O Pay rent 3/2
+	- Add bacterial stream
+		- Plan it first
+		- Guts
+		- Graphics
+	- Add alien score (buildings and kills)
+	- Remove marine score
+
+Esp. for Iron Lore:
+-------------------
+Highest priority at top:
+	FINALLY
+	O Put new buildings in 3/14
+	O Tweak building time (it's way too long in general) 3/14
+	O Make sure hera works without visibility problems (good as I can get it) 3/14
+	O Test and improve spawn code (I think it's better, can't repro horrible bugs from last night though) 3/14
+	O Add minimaps for hera_10_3 3/14
+	O Fixed hive sight 3/14
+	O Buildables take damage correctly (was the problem for melee only?) 3/14
+	O Fix turrets again 3/14
+	- Make sure "blocked by" error doesn't show up
+	O Phantom weapon 3/14
+	- Scoreboard
+	- Fix placement in bast if possible
+	O Moved marine radar to right side 3/14
+
+	Changed assets:
+	- Code
+	- New hera_10_3 minimaps
+	- New alien buildings
+	- skill.cfg
+	- titles.txt
+	- ui.txt
+	- sprites/crosshairs.spr
+	- sprites/640mw1.spr
+	- sprites/640mw1-s.spr
+	- games/half-life/ns/liblist.gam
+
+	X Allow pie menu to be bound to non mouse key 3/11
+		X Now fix mouse part again
+	O Unified hive sight for all 3/12
+	O Marine upgrades present after death (handle team-wide upgrades for everything) 3/12
+	O Fix new selection issues 3/12
+	- Alien resource model affected by resource towers (alter hive spawn time too)
+	- Getting stuck in resource towers
+		O For marines 3/12
+	- Hive drawing bug
+	- Step into morphing/alien-building enough-room code
+    O Fix marine resource tower placement 3/12
+	- Fix niggle where you select building as it's placed
+	O Bug where components and pie menu go away after being reinforced 3/13
+	O Fix tech nodes disappearing 3/12
+	O Tone down spit damage and range 3/12
+	O Draw resource costs for lifeforms 3/12
+	O Draw current # resources for alien players 3/12
+	O When spawning, make sure the area is free or choose another spawn! 3/12
+	O Don't mark webs as enemy 3/13
+	- Check that the right hulls are being used (flier weirdness)
+	- Give buildings tons more health (res tower 3 hits with flier bite)
+	O Lots of people, game restarted, "all spawns in use", crash (I THINK I got this) 3/13
+	- Infantry portal functional
+		O Get new artwork in, scale it down, precache, etc. 3/1
+		- Spawning model
+			- Menu
+			- Periodic spawning
+			- Button to allow reinforcement immediately (later add name of player that will be respawned?)
+			- New system
+				O Don't respawn player after death or when joining team, set player as reinforcement
+				O Gamerules::UpdateReinforcements(): 
+					O For each hive, if there are any reinforcements, spawn the one waiting the longest, play animation, play effect for player
+					O For each infantry portal, if there are any reinforcements, spawn the one waiting the longest, set position on top, play phase effect
+					O Change observer cam to only allow spectating of team when you are a reinforcement.  Handle case where only player left is in top-down mode.
+					- Infantry portals research reinforcements on their own when there are people waiting and not in tourny mode
+	- Fix phantom weapon
+		O Remove old ensnare gun
+	O Test/fix upgrading of resource towers 3/12
+	- Fix building placement on bast (just bite the bullet, it'll take 10 minutes)
+	O Revisit resources in general 3/13
+	O Fix spamming use sounds when building stuff 3/13
+	O Joining game with cheats off after it starts, only sets desired team, not full team (scoreboard is off, no valid chase camera targets) 3/12
+	O Rework upgrades completely (oops, bad timing) 3/11
+		O Test all alien movement modes 3/12
+		O Test all alien upgrades
+	O Add gestation times to skill.cfg 3/13
+	- Scoreboard
+		O Understand this thing first 3/5
+		O Get teams right 3/5
+		O Don't reset players that are already in ready room at the end of a match 3/5
+		O Show DEAD indicator in scoreboard 3/6
+		O Show Commander indicator in scoreboard 3/6
+		O Show score correctly for marine team 3/8
+		- Color changing bug?
+		- Show score correctly for aliens
+			O Increment score after building you bought is created (tricky) 3/5
+			O Decrement score after building you bought is killed (tricky) 3/5
+			O Increment score after a kill 3/5
+			- Reset score after leaving team
+			- Draw "reinforcing" status
+	- Armor and ammo upgrades
+		O Make sure upgrades are still present after death 3/12
+		O Jetpacks (do they still work?) 3/12
+		- Double check numbers
+	- Show alien resource costs for stuff
+	O Grant hive sight automatically 3/12
+	O ** Fix placement of resource towers
+	O ** Aliens getting stuck in buildings, walls or other players **
+	O Bug where switching roles while pie menu is up makes it go away temporarily 3/12
+	O Ability do disable ASSERTs on server via variable 3/11
+	O Delete all buildables on game reset 3/11
+	- Sniper weapon
+		O Added shell of weapon 3/9
+		- Add automatic zoom
+		- Adjust ammo, ROF, damage, sound effects
+		O Add crosshairs 3/13
+	- Paralysis weapon
+		O Added basic functionality 3/9
+		O Add crosshairs 3/13
+		- Better frozen effect
+		- Adjust ammo, ROF
+	- Add other sensory upgrades
+	O Post TODOs for next playtest (art and levels) 3/4
+	- Alien upgrades
+		O Created placeholder art for all upgrades 3/4
+		O Draw blinking icon when upgrade is available 3/4
+		O Remove empty grid, draw icons properly 3/4
+		O Fix HUD drawing so it doesn't bounce around 3/5
+		- Defense
+			O Armor, regen 3/4
+			O Pull-back issues 3/4
+		- Offense
+			- Make these work
+		- Movement
+			O Speed 3/4
+			O Adrenaline 3/4
+			O Silence
+				O Leaving water sounds 3/4
+				O Falling sound 3/4 (made falling sound for aliens too)
+		- Sensory
+			O Hive mind 3/4
+			O Cloaking 3/4
+			- Hearing
+			- Add another instead of hive mind (make that default)
+	O Fix pie menu so it draws correctly (finally!) 3/4
+	O Add help text for each upgrade 3/4
+	O Write Mojo to make sure he's checking the boards 3/4
+	O Updated mapping guidelines with info_gameplay 3/5
+	O Test out recent work posted on mapping forum, provide feedback 3/5
+	O Write Paul and Brian about playtest details 3/5
+	O Put in real healths for different buildings 3/7
+	O Put in destruction effect for all buildings 3/7
+	- Write Westward to ask what he needs to get marine in
+	- Make sure basic tech tree is running
+	- Selection problems (where you can't select commander station every again)
+	- Draw bounding boxes around all entities in testing mode to fix floating buildings
+	- Tech tree and building stuff
+		O Allow cancelling of research (2/3 * timepassed refund) 3/6
+		O Don't allow building or building of anything if structure isn't fully built 3/6
+		O Select command station when becoming commander, remove selection when logging out 3/6
+		O Make sure menus and buttons operate correctly, even when status changes while selected 3/6
+		O Draw "not built" when unbuilt buildings are selected 3/7
+		- Fix resource tower not showing up on menu
+		O Fix RESEARCH_CANCEL costing 2 points 3/7
+		O RESEARCH_SIEGE in titles.txt 3/7
+		- Mouse cursor change over a building?
+		O Server infinite loop in AvHSHUServerTraceWaypoint() 
+		- Some way of making the buildings much more obvious on the ground and for the commander
+			- Draw them one way when not built, another way when built
+			- Moving outline, yellow when not built, green when built?
+		- Draw health for selection
+		- Make sure buildings can't be placed on top of each other
+		- Buildings floating above the ground
+	O Deal with down forums 3/7
+	O Fix up player ID problems 3/7
+	O Elited interview 3/6
+	O Valve interview response and associated jubiliation 3/6
+	O Alien buildings too big 3/7
+	- Spawn problem with marines spawning in alien base
+	X Getting 2 points for a kill instead of 1
+	- Aliens cloaking and not decloaking even while moving (bots do this)
+	O Remove wall-crawling for level 2 3/7
+	O ASSERT after building structure (overflow) 3/7
+	O Rework visibility determination.  Now it works properly and cleanly for all entities.  (check bottom of AvHGamerules::UpdateVisibility()) 3/7
+	O Fix welding again 3/10
+	O Fix spawnhive command 3/10
+	- Alien weapons
+		O Make web shoot projectile 3/8
+		O Ensnaring is now cumulative, and players gradually recover 3/8
+		- Fix bug where strands can't be cut
+		- Tone down range and damage for spit
+		- At least 3 new ones
+	- Sinking through floor bugs 3/6?
+	- Spawn bugs
+	- Intuitive placeholder art for buildings
+		- Infantry gate into game
+		- Alien buildings and sizes
+	O Added motion-tracking upgrade 3/7
+	O Come up with list for building animations, post it, get Mojo to use it for all buildings 3/7
+		- NOTE: I play generic deploy, research, death and fire sounds, though we will probably move to embedding sound events in the animations for diversity and accuracy later
+		- NOTE: Many models won't have unique animations for all these.  All animations should exist though and should at least have a good default keyframe.  All animations are always played.
+		- NOTE: The order is important.  I play animations by their offsets.  For consistency, let's keep all the building animation names the same.  $include these animations to they are all the same.
+		- spawn (1 frame, not really animated, closed-looking)
+		- deploy (blends from spawn to idle, can take .5 - 2 seconds) (I play generic deploy sound, we will probably move to sound events on deploy later)
+		- idle (blends from deploy, optional)
+		- idle2 (blends from deploy, optional)
+		- researching (pistons moving, spewing smoke, etc. Looping.)
+		- active (spawning reinforcement for infantry portal, creating alien for hive, most will be empty.  If you don't know if it should loop or not, make it loop.)
+		- fire (turret, siege turret, most buildings won't need this.  Looping.)
+		- die forward
+		- die left
+		- die backward
+		- die right (most models will have identical death animations, but maybe small models will have all these)
+	- Hive animations
+	- Turret factory animations
+	- Gestation model from Cory
+		- Don't allow spinning in place
+	- Overwatch	(remove or make less powerful)
+		- Tried to make players in dark not visible, but it always returns 128
+	- Show hive progress indicator (goes down whenever a player respawns, grows faster with multiple resource towers)
+	O Added "hightech" cheat 3/7
+	O GDC plane tickets and hotel 3/9
+	- Put in some new weapon effects from Scott H.
+	- Alien animations
+		O Talk with Mojo about code changes 3/7
+		- Generic death animation
+		- Wall-running
+
+Early this week:
+	X Gamedev meeting
+	O Call Rich 3/2
+	- Call Hersh
+
+Week of 3/25
+------------
+O Catch up on post-GDC e-mail and forums 3/26
+O PHL interview
+	O Spice it up, send it off 3/26-3/27
+O Meet with Jon for dinner, coffee and SC 3/26
+- Contact Paul Ruskay
+	- Listen to more HW music and samples
+- Get Steam SDK
+	O Write Rick Ellis
+- Player animation list for Mojo
+O Write up tech tree button and order icon specs 3/26
+- Call Andy
+- Call Jeremy!
+	- Keep calling Jeremy
+- ICQ Humbled
+- Decide on 4MB limit or not, and change guidelines
+- Write letter to Ted Kennedy about internet music
+O Checkin playtest code
+O Post Wazz's picture when forums are back up 3/28
+O Post in general about lack of map update for Monsieur
+O Oil change Friday, 7:30am 3/29
+
+Great quote
+-----------
+"If you want to build a ship, don't drum up people together to collect wood or assign them tasks and
+work, but rather teach them to long for the endless immensity of the sea." -- Antoine de Saint Exupery
+
+
+Before playtest, Friday, April 5th (maybe Saturday instead?)
+------------------------------------------------------------
+- Fix ALL selection issues
+	O Turn off prediction 4/3
+	O Turn click-selection into lasso selection 4/3
+	- Fix issues
+		O Don't allow multiple building selection 4/3
+		O One problem left: don't select building locally on a build action 4/3
+		- When there are multiple selections queued, don't change local selection
+
+- Fix visibility again (mp_drawinvisibleentities 1)
+	O Remove performance optimization first and see if that fixes it. Nope. 4/4
+	- Hmmm?
+
+O Can't join alien team without cheats on
+
+O Fix observing stuff 4/4
+
+- Find and fix overflow error?
+	O Investigate server logging 4/4
+	O Add network message logging 4/4
+	O Add logging for assert 4/4
+
+- Spawn hive bug where two hive models were in the same place?
+	O Problem where hive isn't drawn/spawned when game starts? 4/4
+
+- Game balancing
+	- Make sure everything needed is in skill.cfg and is clean
+		O Add tons more values 4/4
+		- Test this
+	O Formulate game pacing on paper 4/5
+	- Forumulate resource model and pacing in spreadsheet
+		- Start working on spreadsheet 4/5
+			- Learn how to use excel
+		- Ongoing
+
+O Remove text that shows current command 4/4
+
+O Hive healing 4/4
+	O Implement
+	O Slow down
+	O Test regular player regen again
+
+- Remove armory researchables after researched (and motion-tracking)
+
+- Fix AvHTeam ASSERT in th17
+
+- Scoreboard problems
+
+O Ability to see chat text in commander mode 4/4
+
+O Level 3 view height 4/5
+
+O Enable music 4/5
+
+O Increase click size when selecting a unit 4/4
+
+O Fix motion-tracking 4/4
+
+- Hive gives you a few points, buildings give you a couple
+
+- Draw cost when selecting a weapon?
+
+O Update team page 4/4
+
+O Sniper gun should be in slot 3, with semi-real sprite
+
+O Shotgun rate of fire 4/4
+
+- Killing last hive, then killing alien gets "allspawns full" bug then assert or crash
+
+- Fix bug where prereqs aren't being recalculated when menu is open
+	O void AvHCommanderModeHandler::Update(const AvHTechNodes& inTechNodes, int inNumPoints)
+
+- Shuffle alien weapons around to get level 4 playable for playtest 
+	- Get sniper weapon working for level 4
+	- Add a couple more abilities for level 4?
+
+O Fix gamma resetting after game ends 4/4
+
+O Put time limit and point cost on webs 4/4
+
+- Pie menu not on mouse button
+	- Tried to fix and failed, put off until more important things are fixed 4/4
+
+O Fix floating buildings 4/2
+	O Doesn't work if I copy most spawn code from turret into Buildable 4/2
+	O DOES work if drop a turret instead of a buildable alien building (!) 4/2
+	O What if I inherit AvHBaseBuildable from CSentry?  Nope, that didn't work. 4/2
+	O Does movement chamber work with the sentry model? Nope. 4/2
+	O Does movement chamber work with sentry size? Yep! 4/2
+O Func_resources shouldn't be selectable or viewable unless marine nearby 4/3
+O Don't allow selection of anything that's not visible 4/3
+O Reset frags (score) at start of match
+- Water hive can't be built on hera (blocked by seethrough)
+O Allow morphing down 4/3
+- Alien damage upgrades
+	O Melee 4/2
+	O Ranged 4/2
+	- Ignore piercing for now?
+O Profile server 4/1
+	O Download, install VTUNE 4/1
+	O Fixed performance problems (resource, visibility) 4/1
+O Spawn players in with more ammo
+O April Fool's press release 4/1
+O Catch up on forums 4/1
+O Alien melee weapons must have button pressed each time 4/2
+O Send present to mom 4/2
+- Fix up HMG
+O Add M&D to MSN Messenger 4/1
+O Talk to MonsieurEvil about trip 4/2
+O Tell MonsieurEvil about NS World 4/2
+O Better build options for commander (select players) 3/29
+	O Add turret and sisege turret to player build list
+O Write Mojo about playtest tasks 4/2
+- Remove the level 5 (jack up the price)
+- Fix placement issues (on bast and elsewhere)
+- Balance down builder
+	- Range on spit
+** Reservations at Christopher's ** 4/1
+O Take 30 seconds by default to respawn in as alien 4/2
+	O Decrement alien respawn cost for aliens, if possible 4/2
+- Builders spawn hives
+	O Add basic weapon
+	O Mail Merks about sprite
+	O Make animation visible
+	O Add error messages and make using it intuitive
+O Fix bug where view model goes away and doesn't redeploy for builders 4/2
+O Buildings and hives grow automatically 4/2
+	O ...but can be helped by builders only 4/2
+	O Make sure all alien buildings fade in when building on their own
+	- Alien resource towers should build on their own
+	- Play building sounds
+O Make regen much less powerful 4/1/02
+- Spawn problems when late-joining (wrong team?  desired team?)
+	- Team isn't set to the team that we want to join
+	- Not allowed to join aliens for some reason
+- Test with fakelag beforehand
+- Possibly fix overwatch
+- Player ID functionality for buildings
+O Missing health bug 4/2
+- Tuesday, 6pm, IRC, Frank and N@rby
+
+Week of 4/8/02
+O Web site update (playtest, April Fool's) 4/8
+- Car junk
+	O Transfer insurance (phone) 4/1
+	O Go to Liberty Mutual for form, fill out form 4/11
+	O Go to DMV, new registration 4/11
+	- Inspection, photo inspection (within 7 days of 4/11)
+	- Get parking sticker, pay parking tickets
+	- Renew registration
+
+O Taxes
+	O Do Taxes 4/11
+	O Check back to confirm 4/12
+O Postmortem Tuesday
+
+-- Internet playtest #2 --
+	O Crash when hitting tab in ready room (maybe only when there is no one on any team?) 4/9
+	O Crash when hitting ESC to go to menus 4/9
+	O Overflowing: 4/10
+		x SZ_GetSpace: overflow on netchan->message
+		O Implement special system for handling all reliable messages 4/10
+			O Look into sending data as unreliaable?
+			O Make very general purpose
+			- Release to HLcoder list
+	O Visibility problems (maybe they'll go away when ladders are fixed?).  Fixed.  4/11
+		O Visibility now computed twice a second 4/12
+		O Particle systems no longer visible to commander unless a player is nearby 4/12
+	O New pistol model (thanks Mike)
+	O Pie menu going away, coming back during/after death 4/11
+	O Make hive sight on by default (hive sight upgrade now non-functional) 4/9
+	O Fixed up chat between observing, ready room, and game 4/9
+	O Bunny-hopping allowed with speed upgrade 4/9
+	O New mouse cursors, new order sprites (thanks Relic!) 4/9
+	O Givepoints works in commander mode 4/9
+	O Hive too weak 4/9
+	O Respawn problems
+		O Use different key for going back to ready room
+		O If joining marine team, join as reinforcement (added mp_latejointime) 4/9
+		O Scoreboard reports REIN and DEAD, as well as ready room and spectator state properly 4/9
+			- One last case: when spectating, you sometimes see REIN
+			- One more: player death doesn't send down message to update scoreboards
+		O When observing as a reinforcement, you can never follow an enemy 4/9
+		O No 2 second delay when spawning into gate 4/9
+	O Added mp_latejointime (# of seconds after game starts that players are still allowed to join a team normally, currently 25 seconds) 4/9
+	O func_resources not resetting properly 4/12
+		O Number of resources 4/12
+		O Particle system 4/12
+		O New way of doing particle systems (also allows you to look at a resource to see about how many resources are left)
+	O Increased health for level 1 to 70 HP 4/9
+	O Ability for players to look at a node and see how many RPs are left (one big step towards this with new particle system behavior)
+	O Evolve times adjusted 4/10
+	O ASSERT (timeout) when hitting ESC when playing	
+	O Missing bast sounds
+	O Web strands made less visible 4/10 (great idea, Wurmspawn!)
+	O Double clip size for machine gun, or 2.5 4/6
+	O Friendly fire off by default (tournament mode off by default)
+	O Leaving commander, then immediately logging back in kicks everyone 4/9
+	O Weaker builder (decreased health) 4/9
+
+- Known new problems
+	- There is some network weirdness that happens in the first 5-8 seconds of the game starting.  It's not serious
+	- Weldables reset at the end of the round better (no more weird textures and they actually function), but they come back invisible now.
+
+- Mid playtest #2 patch
+	- Commander voice now goes to everyone, not just selected units
+	- Movement chamber now creates a turret (just like marines'!) instead of the movement chamber (this is a big gameplay test)
+	- Turret range is now 500, instead of 1000 (note that siege range is 1500, so it can be used to take out turrets)
+	- Turret damage is now 5, instead of 10 (per bullet)
+	- Initial alien points is 30, instead of 10
+	- Alien respawn time is 15, instead of 30
+	- Alien respawn cost is 0, instead of 6
+	- Files: hl.dll, skill.cfg
+
+Week of 4/15/02
+---------------
+O Catch up on forums 4/15
+O Talk to Cory about art progress in general 4/15
+O Call Chris and Elaine about sink, be here for it to be fixed 4/16
+O Check-in code 4/16
+O Parking sticker on Wednesday
+O Inspection (insurance photo inspection too) on Wednesday
+O Release network meter source code to HLCoders and Off-topic 4/19
+- Game tasks
+	O Prediction errors 4/16
+		O Ladders
+		O Ready room spawns
+	- Add nuke 4/16
+		O Get it working 4/16
+		- Fix explosion sound
+		- Fix ticking sound
+	O Unbreak alien resource model (top alien gets twice the points) 4/16
+		O Add code to compensate for tied players 4/18
+	O Add droppable health (!) 4/16
+	O Turrets should be tougher, but more expensive 4/16
+	O Connect, disconnect sound effects 4/16
+	O Hive should regen players faster 4/16
+	O Regeneration doesn't make a sound unless you're at a hive (nice tactically, but grating) 4/17
+	O Improve cloaking to actually be invisible, not to be glowy/additive (thanks Relic) 4/17
+	- Alien abilities (2 days worth)
+		- Wall-jumping
+		O Blinking
+			O Hooks for weapon 4/17
+			O Implement body of weapon 4/18
+			O Add effects, debug 4/18
+			- Make it more useable somehow
+		- Umbra (puff to block turret sight)
+			O Hooks for weapon 4/17
+			- Implement body of weapon
+		O Level 1 2nd ability 
+			O Parasite, means marine is marked on hive sight (until healed?  forever?) 4/17
+			- Also, if level 1 hits enemy, he should be parasited too?
+		O Level 1 3rd ability...divine wind!  4/17
+	O Resource towers made more expensive (for both sides) 4/17
+	O Grammatical error fixed when near a friendly hive (WHEW!) 4/17
+	O No longer allow more then three of each type of alien upgrade building 4/19
+	- Add scanner sweep!
+		O Get it working 4/18
+		O Have it turn off cloaking 4/18
+		- Allow it to be built even on water
+	- Get one point for killing buildings, 2 for turrets, 3 for siege 4/19
+	O Give crosshairs to alien weapons 4/19
+	O Need two hives for level4, three hives for level5 4/19
+	- Hive sight improvements
+		O Hive gun showing up for everyone 4/19
+		O Show different status for players under attack 4/19
+			- Why isn't this working?
+		- Show sayings for friendlies
+	- Hive sight should show when target is being attacked (hives, players, buildings), also on by default
+	- Fix welding (using Relic's test map)
+	O Givepoints removed 4/19
+	O Marines always get a minimum of one resource point every injection interval 4/19
+	O Get score for parasiting 4/19
+	O Cloaking sound reduced more 4/19
+	- Turrets should unacquire targets that are cloaked
+	- Resource particles disappearing when looking away
+	- Turrets not spinning
+	O *Fix third hive placement in hera
+	- Only do visibility culling for commander
+	- *Fix droppable alien weapons, and aliens picking up marine weapons
+	- Fix problem where build-hive shows up for everyone now
+	O Draw hive sight always
+	O *Don't allow marines to pick up weapons they already have 4/18
+	- Make phase gates usable vs. early rushes (allow marines to attack aliens, but beam back easily)
+	O Allow building with multiple marines selected
+	- Minimap rework
+	O Automatic reinforcements 4/16
+	- Marines should start with resource tower
+	- Allow all doors to be welded (and the welds destroyed)
+	- Draw circles around all marines and buildings, fill circle when selected
+	- Add/switch more marine sayings: “Incoming” , “Stick together” and “Need backup”. (also, people didn't seem to use "help!" too much) 
+	- Add alien communication options on pop-up menu (esp. attack coordination)
+	- Building/player feedback when hit (audio and visual)
+	- Hotgrouping
+	- Building sizes, to allow buildings to function like walls
+	- Builder spray
+	- Scoreboard info that's wrong
+	- Add some effect for redemption (sound, sprite, something)
+	- Floating resource tower
+	O Cloaking sound way too loud, cloaked players are visible too
+	- Overwatch
+	- Allow slowly moving while cloaked (for anti-turret and general freakiness)
+	- New files:
+		O Nuke stuff
+		O connect.wav, disconnect.wav
+		O health pickup, health model
+		O ammo model w_ammo (used to be w_chainammo in the .pak)
+		O Assets for parasite, umbra, blink, divinewind (not umbra)
+		O maps/ns_bast.bsp, ns_bast.wad, sound/ambience/hotspark.wav, sound/doors/doormove6.wav, models/tripod1.mdl
+		O liblist.gam
+		O ns.ps
+		O sprites/640aw*.spr
+		O ui.txt, and 6 alien sayings
+		- All weapon_.txt files
+
+-- Internet playtest #3 --
+	- Big performance problems
+		- Take out bot thinking, profile game with tons of bots
+		- Can't seem to repro performance spikes.
+		- Try VTUNE (ugh)
+		- Try Microsoft profiling (ugh ugh)
+		- Try QueryPerformanceCounter and timeGetTime()
+	- Tone down alien resource model (so builders don't suck resources from everyone)
+	- Level 1 is way too weak 
+		O Increased health 4/9
+		- Add ability for slot #2?
+	- Draw points costs to the right of the weapon sprite
+	- Fix commander mode selection problems (when selecting command station, or when first using it)
+		- "the occasional null response from the UI was very deterring and I did not want to hinder those who were my responsibility" - Wurmspawn
+	- Add more help messages, and make this system a bit more sophisticated (lots of people said these were helpful)
+	- Possibly allow only one alien upgrade from each category to be chosen?
+	- The sensory structures should act as nodes for hivesight (Wurmspawn!)
+	- Ready room chat
+	- Bast minimap
+	- AvHPlayer::line 5007 (assert numupgrades)
+	- Infantry gates can cause people to get stuck when the respawn (check above when placing and also when respawning)
+	- The alien pie...of course worked fine (<except> when some dufus hadn't built 4 defense upgrades, trapping me in that upgrade menu)
+	- Constant HUD info showing name of current commander "Commander: KungFuSquirrel"
+	- Indicate growth of hive (else it's not obvious that it's growing)
+	- Allow alien menus to show cost of aliens, even if higher then your current resource count
+	- Allow alien abilities to be seen and selected, but not used (looks like out of ammo) when hives aren't present?
+	- Inf gates should respawn players automatically, for free, every so often
+	- New welder sprite
+	- Revisit either alien upgrade system or upgrade placement
+	- Remove respawn cost for aliens
+	- "The hive cluster is under attack" should happen much less often
+	- Add hives to hive sight
+	- Draw things in hive sight differently when being attacked
+	- Top problems everyone has
+		- "Which alien am I?"
+		- ""
+
+- Updated files for patch
+	O titles.txt
+	O client.dll, server.dll
+	O bast sound files
+	O pistol view model
+	O listenserver.cfg, server.cfg
+	O New bast .bsp
+	O New ns_bast.wad
+	O sprites/order*.spr, sprites/640order*.spr
+	O sound/weapons/hg-*.wav (four new sounds)
+	O hera.bsp
+	O hera minimap sprites
+	O ui.txt
+	O selectioncircle.spr
+	X assets for chatting in ready room (?)
+	O new bast minimaps
+	O c:\games\half-life\ns\liblist.gam
+
+Week of 4/22
+------------
+- Gamehelper interview
+- Write Josh and Cory, talk about alien view models
+- Post open animator position on NS.org news
+- Write Cory about new "position"
+- Write back artists and have them work with Cory
+O Write Mojo with player animation list 4/22
+- Update art asset list, send to Cory (prioritize?)
+- Update screenshots on web site with playtest pics
+- Forward Mojo work to Cory
+O Bills (health insurance Wed.)
+O Meet with Cory on phone 4/22
+O Meet with Mike on phone 4/22
+- Call Jeremy Soule and get moving on sound
+	O Called 4/22
+	- Write him e-mail, send him tons of work samples
+- Features and fixes
+	- Right-click to cancel building, not just ESC (Bilko)
+	- Space cycles through last few alerts (Bilko, War III)
+	- Scrolling around via WASD (everyone)
+	- Indicate that alien resources are yours, not the team's (Ecks)
+	- Test NS with HL1109
+		- Fog seems like it might be broken
+	- Get rid of chat/team-chat on pie menu, move some stuff around, add req. health
+	O Onscreen indication to show you when commander is present, and when you're commanderless 4/26
+	- Onscreen indication to show when you're parasited
+	O "Team resources", "Your resources" 
+	- Command station selection
+		O Start selected 4/23
+		- Remove idea of selecting it somehow?
+	O Builder spit at top of menu 4/23
+	- Flier changes
+		- Slow down flier a bit
+		O Make spores come later 4/23
+		- Add sniper weapon
+	O Hive sight tweaks (new artwork, tweak distances, draw when in sight) 4/23
+		- Add/fix "under attack" hive sight
+	O Increase damage on LMG 4/23
+	O Reduce builder power 4/23
+	O Remove UpdateMasks(), then disable network queueing, make a few network calls non-reliable and see if that fixes overflowing 4/23
+	- Tech tree images!
+		O Implement 4/23
+		O Get Relic to rearrange icons into bigger sprites, then fix code to get under 128 sprite HUD limit 4/23
+		O Code changes to make this work, test in multiple resolutions 4/23
+		O Get Relic to add build, advanced, comms and cancel sprites 4/23
+			O Sprites are black in-game 4/24
+		O Get Cory to change commander UI artwork so sprites are square (blurry in the meantime) 4/26
+	O Cleanup health, pistols, nukes at end of round 4/25
+	- Helpful entity sprites
+		O Implement basic system 4/23
+		O Scale up, remove building progress bar for commander and marines 4/23
+		- Don't draw buildable/researchable command station
+		- Scale techhelp correctly, so it doesn't look so weird (orders too)
+		- Offset icon, then add line that draws from icon to help target origin (draw box around it?)
+	O Fixed bug where ammo was piling up at landing pad on hera 4/25
+	O Loud, long alien build noises 4/25
+		O Fix for playing incorrect sounds (alien sounds for marines) 4/25
+	O Updated FAQ (release date, anti-cheat, playtest questions, team positions) 4/25
+	- Fix turrets
+		O Rewrite the bastards completely, make them AvHBaseBuildables 4/25
+		O Damage, target acquisition 4/25
+		O Not aiming down
+		O Floating in air when dropped
+		O Sinking/flying ground when hit
+		O Adjust hit points 4/25
+		O Test siege 4/25
+			O Firing animation
+	O New marine UI! 4/26
+		O Everything but pie menu
+		O Adjust death messages for each mode
+		O New marinescheme for all scheme files
+	- New commander UI artwork
+		O Highlight logout button 4/26
+		O Blinking alert button 4/26
+			- Red for attack, orange for notification 
+		O Add commander button artwork, does nothing yet 4/26
+		- Test in multiple resolutions
+	O Add "alert" console command for testing 4/26
+	O Fixed floating resource towers! 4/25
+	O Fixed bug where hive sight and other HUD elements were drawing when dead 4/26
+	O Performance logging only if more then 10ms 4/26
+	- Add help icons for special entities
+		O Breakables 4/23
+		O Command station 4/23
+		O Hive 4/23
+		O Weldables 4/23
+		- Useables (mark buttons and stuff with user3_useable)
+		- Pickup stuff (make sure all items are getting user3_marine_item)
+		- Add text along with it?
+		- Make it look nicer, by changing it to use scaled sprite code, not SPR_ stuff (fixes orders too)
+	- Disable view movement when gestating so gestate model looks right
+	- Floating player models?
+	- Add/switch more marine sayings: “Incoming” , “Stick together” and “Need backup”. (also, people didn't seem to use "help!" too much) 
+	- Visible entities problems
+		- Fix particle system culling first
+
+- Assets
+	O .dlls
+	O sprites/techtree/*.spr
+	O models/gestate/gestate.mdl
+	O sprites/helpicon-*.spr
+	O ui.txt, config.cfg, server.cfg, listenserver.cfg, titles.txt, skill.cfg, liblist.gam
+	O models/b_armor*.mdl
+	O New hive sight sprites (friendlyblip.spr, enemyblip.spr, enemyblip2.spr)
+	O sound/vox/ssay41.wav
+	O sprites/healthring.spr
+	O gfx/shell/newest stuff
+	O gfx/env/mars*.*
+	O New hera (rename ns_hera)
+	O Hera minimaps
+	O sound/misc/a-build*.wav
+	//- sprites/overwatch*.spr
+	//- sprites/marinenode.spr
+	O sprites/mainhud.spr
+	O sprites/hud.txt
+	O sprites/640hud7.spr
+	//- sprites/crosshairs.spr
+	O *textscheme*
+	O sprites/commandstatus.spr
+	O sprites/logout.spr
+	O sprites/topdowntop.spr
+	O sprites/topdownbottom.spr
+	O sprites/commandbutton.spr
+
+Changes for NSIPT6
+------------------
+O Better install process: automate .zip creation with asset list 5/15
+O Rename server dll to ns.dll and update build process 5/15
+O Level 1 bite more powerful, less energy 5/15
+O Less energy to fly, more on spores 5/15
+O Alien chat obscured (write test case?)
+- Fix alien spores?
+- Make sure AvHBaseBuildables are being removed from world on death 5/15
+O Unhacked AvHBasePlayerWeapon::AddToPlayer() (finally) 5/15
+O Resource scalar for aliens, little/no resource cost to respawn for aliens 5/15
+- Refactor mines to be marine weapons
+	O Mines no longer make beeping noises as often, and only when players are touching them
+	O Mines won't go off before game starts either
+	- Mine rate of fire
+O Fix shotgun spread, new effects
+O Aliens not-respawning bug 5/17
+O Crash hard drive 5/17
+O Decide on and purchase new computer 5/17
+O Install motherboard in old computer 5/17
+O Reinstall everything 5/17
+O Order sound effects CDs 5/17
+	O Aww yeah!
+O E-mail madness
+	O Debug network freezing 5/17
+	O Get new mail setup under Outlook 5/17
+- Work with Chris on backups
+	O First pass 5/17
+- Fix grenade launcher
+O Nuke cost increased to 40 points 5/17
+- Prediction issues for leap and knife (after it was just deployed)
+O Brought down spore cloud radius from 300 to 250, brought damage from 8 down to 7 5/17
+O Fixed leap so you don't have to jump 5/15
+O Clean up decals (entity limit!)
+	O Removed them client-side 5/15
+	O Remove them server-side 5/15
+- Buildable command station
+	O Basic code change
+	O Notify mappers of the change
+	- Wait for their new maps
+	- Move command station back to brush-based entity for now
+O Level 1 can now outrun marines 5/17
+	O Level 1s should be able to catch up to marines, without the speed upgrade
+O Victory condition bug for aliens
+O Fixed bug where going back to ready room doesn't take you off the team (you could cause game to start by joining and leaving each team) 5/17
+- Weapons, ammo, health, should decay, webs stay longer (entity problems, visibility problems, too easy for marines to come back)
+- Picking up alien weapons (put a breakpoint in the touchground, drop(), spawn for the weapon maybe?)
+- Marines don't see when they pickup weapons/health
+O Random (bell-curve) starting resources system for aliens (please don't work around this, use what you're given, it's a playtest!) 5/17
+- Spit killing welds bug
+- Respawn delay fix for infantry gates
+- Verify adrenaline help text is correct
+- Don't take energy if alien building couldn't be built
+O Fixed bug where all speed upgrades weren't being used 5/17
+- Infantry portal should be more obvious (light, sound, more expensive too)
+- Upgrade buildings for advanced versions (cuts down on art and entities too!)
+O Regeneration is twice as fast now (now 2/4/6 points per second) 5/17
+- Show health, weapons, ammo when selecting marines
+- Make sure I'm using tri strips instead of quads everywhere, it's probably faster
+- Mines blow each other up, should be more expensive too
+- Backpedalling marines should be slower (along with strafing)
+- Keeping your weapons selection & energy after gestating an upgrade would be nice
+- Rebind pop-up menu
+- Silence should affect your weapons as well
+O Figure out sound deal once and for all 5/15
+	O Decided on sound lib and Scott 5/15
+- Create sound asset list for Scott
+
+Changes for NSIPT7
+------------------
+O Redo repository and get @Backup setup again 5/22
+O Fixed max entities problem (this was the main server crash we saw) (maybe this fixes overflow?) 5/22
+O Rework hive sight 5/23
+O Web stuff 5/23
+	O Webs now affect friendly aliens in tournament mode
+	O Webs are now permanent
+	O Web energy cost increased to .2
+	O There is now a team limit on webs, if you try to build more, you'll get a message saying your team is at the max
+	O Webs slow down marines more
+	O Do scan to make sure there aren't too many webs in one area
+	O Solidity problems for web...how to destroy yet not block the player?  Welder removes webs now!
+O Moved resource tower gun to second slot, as 1 hive is needed
+Buildable command stations!
+	O Fix command station entity (make it functional, stop it from floating)
+	O Menus, costs
+	O When command station is destroyed, only allow kick out commander if there are none left for team
+	O Make command stations buildable, but first one starts built
+Allow building recycling for cash
+	O Get half points back, unless it's destroyed before it finishes
+	O Works for most buildings, but not turrets...fix
+	- Test recycling
+O Added first pass of shotgun artwork 5/24
+Fix problem where selecting command station didn't change the menu
+- Add alien turret (using offensive chamber)
+	- Added basic code...but it's crashing
+		- Try marine model
+		- Fixed it, it was a NULL ping sound (note to self: random crashes in the engine occur when playing a NULL sound name)
+	- Now it's firing, but it's blocking itself
+
+O Fix hive respawning (again)
+O Fix marine respawning (ASSERT)
+Rework minimap
+	O Refactor naming to "entity" instead of "player" 5/23
+	X See NSIPT8
+Fixed bug where "couldn't play sound "/" message displayed when using the level 4 melee
+Added first pass of level 4 artwork (thanks a ton Mojo!)
+Added first	pass of shotgun (thanks Def_One!)
+Added first version of ns_penumbra (thanks Yamazaki!)
+Added second version of ns_freon (thanks Narby!)
+
+Not yet:
+	Add button that sets current menu to that of command station
+	Add minimap to soldier view (!)
+
+Changes for NSIPT8
+------------------
+O Hive hitpoints tripled (6000) 5/27
+O Added secondary alien building functions 5/27
+O Spike attack energy cost increased slightly, web rate of fire increased to 2 web per second instead of 1 per 2 seconds
+- Rework siege turrets into real artillery role
+	O Remove them for now
+	- Track slowly, slightly inaccurate, can only directly hit non-moving targets
+	- Draw visible rocket, maybe Quake 1 rocket speed
+- Fix mine placement
+Rework minimap
+	X See NSIPT7
+	- Add player location to info that's propagated
+	- Use this player info to draw
+	- Remove rectangle, add sprite nub instead
+	- When clicking, make sure you go to exactly the place you expect to
+O Marine armor and damage upgrades toned down considerably
+O Marine respawn cost higher
+O Alien resource tower and hive costs increased
+O Resource nodes now have 150 resources instead of 300
+O Ammo pack cost reduced to 1 point (was 2)
+O Playtester contact list
+O Tweaked weapon speeds (welder weighs, slow grenade launcher, lighten shottie, etc.)
+- Building refactor
+	O Rename armory to arms lab
+	O Rename weapons factory to arsenal
+	- Remove adv. weapons factory, add upgrade instead?
+	O Add ability for marines to get more ammo by using the arsenal
+O Sound effect list back to Scott
+O LMG artwork and animations
+O HMG artwork and animations
+O Pistol artwork and animations
+	O Including empty reload
+
+- Fix non-predicted reload
+	- Networking issues, could this be related to the problems with swimming, ladders, func resources and buildings?
+	- Test vanilla delta.lst on Basespace
+		- Still have these problems, points to pm_shared changes?
+
+- Shotgun artwork and animations
+	O Artwork and base animations
+	- Special reload
+
+- Don't allow remote command stations to build remote command stations!
+O Show level of alien in scoreboard
+	O Also, don't show rank for opposing teams
+
+- Give points for building a hive (to 5)
+	O Increased points for building resource towers also (3)
+	- Refactored hive to be an AvHBaseBuildable
+
+- Weapons factory changes (rename Arms Factory?)
+	O Gives ammo to current weapon slowly when used
+	O Help message when near
+	- Only allow construction of weapons within its radius
+
+O Write Relic about particle creation problem and sticking points in engine room, also ask about weapon icons (player AKs player2)
+
+
+- Tons more alien sounds, some other high-tech sounds
+- The LMG, HMG, pistol and shotgun, fully animated and working perfectly (shots, reloads, etc.).
+O Hive sight that shows you EVERYTHING under attack.  If something comes under attack all the way on the other side of the map, it will blink red so you can do something about it.  It's not just players and hives anymore, it's everything.  I haevn't been able to repro the hive sight not showing up bug, but that will likely be fixed as well.
+O Showing state for aliens (LVL1, LVL2, GEST, DEAD, etc.).  The state for a player only shows for his team.
+O Movement chamber must be "used" to teleport.
+O Help messages for both friendly and enemy alien structures.
+O Def chambers should heal everything on your team
+O Tons of balance changes (hive hitpoints way up, marine respawn cost up, weight/speed tweaks, tons more) 
+O The ability to walk up to the arsenal (what used to be the weapons factory) and hold your use key to resupply your current weapon with ammo, slowly.
+- Fixed mines, with brand new mine artwork
+X Buildable command stations can't build other command stations
+- Tweaked alien turrets
+	O They fire smoothly (Client-side alien turret effect)
+	- They fire more accurately
+- Fix bug where you sometimes can't select any buildings
+- Always cloaked bug
+O Level 4 regenerating
+O Defensive chambers now also heal other buildings, hives, etc.
+- Resetting of buttons (test on lights in bast marine start)
+
+- Fix getting stuck when morphing
+
+O Hive animations (two idle animations, two flinches when attacked, death animation, scared when touched by enemy on other team)
+- Fix increasing lag/performance problem
+- Draw hive icons where there is no hive, don't draw them where this is a hive
+- Hive sight not always visible
+	 - Remove some more sprites?
+- New version of hera
+- Minimap on bast sometimes gone?
+- Remove hive sight radius check, experiment
+	- Cut down on some sprites via tech help, didn't seem to help
+
+- Fix grenade launcher aiming
+	O For Iron Lore, just put in fixed server-side grenades again, with fixed aiming
+	- Add a temp entity
+	- Fix aiming
+	- Add trailing smoke?
+
+O Play HUD sounds quieter
+	O Weapon selection
+	O select.wav
+
+Files to remove from the install:
+	sound/player/role4_idle2.wav
+	sound/player/role4_move2.wav
+	sound/player/role4_move3.wav
+	sound/player/role5_move3.wav
+	sound/player/role5_move4.wav
+	models/v_parasite.mdl
+	models/v_bite.mdl
+	models/v_divinewind.mdl
+	models/v_leap.mdl
+
+O Movement chamber should only activate with use key
+	O Put in help message for this
+- Ammo, health and weapons should always fade out (but it should take awhile when placed by the commander, or if it's within range of a marine building?)
+O Level 1 spiky footsteps
+O Increase hive sight to be unlimited
+O Fixed bug where rebuilt hives weren't full health when spawned
+- Disallow "model x" command
+- Remove leap cheat
+O Level 1 view model for bite, parasite, leap and divine wind!
+- Get more sound effects
+	- Highest machine gun upgrade sound gets cut off
+	O Replace regular alien footsteps
+	O New footsteps for level 1
+- Make clear which hives are coming online, and which are online
+O Added icon for arsenal
+- Allow building recycling when building hasn't been built
+- Turret factory
+	- Only allow turret construction within radius
+O Turret ping is quieter
+O HMG does more damage now
+- Armory upgrades
+	- Select marine and choose upgrade level (energy armor, exoskeleton, or jetpack)
+- Menu changes
+	- Top three don't change, they are like tabs for rest of menu
+	- Build, Advanced, Equip
+	- Equip has health, ammo, weapons (shotgun, welder, mines, hmg, grenade gun)
+O Fixed breakables, func_doors, func_door_rotatings, and func_buttons receiving damage 5/30
+- Draw current upgrades on screen (this will help find pistol upgrade sound problem too)
+- Clean up use icon clutter
+- Voice command spam
+- Remove view shake when hit and not taking damage (knife)
+O Hive spawn in 3 minutes now, sentries down to 500 hp instead of 1000
+
+Before Valve
+------------
+End of game respawn issues
+Hive sight sprite problems, minimap sprite problems
+Minimap rewrite
+Alien useability:
+	- Where are hive locations (draw in different color for hive sight, draw faded and shrunk before it's planted, more help text)
+	- Pie menu shows you what upgrades you can get
+	- Draw "resources" above resource level
+	- Describe hive sight to new players
+Look at building, to get name of it and status/health (for both sides)
+Tell them to run in OpenGL, D3D doesn't work
+Overflow errors
+Menu for ready room, team switching, etc.
+Level 5 alien
+	- Artwork
+	- Charging
+	- Paralysis
+Scoreboard
+Tell players when they are going to respawn
+Make it more obvious what's giving you resources
+Marine upgrade icons
+Rebinding command menu (remember, every Valver that tries this will have a bad game)
+Mines
+
+NSIPT9
+------
+Minimap rewrite
+	O Send multiple network messages so message size doesn't exceed 192
+	O Smaller reticle
+		- Make easier to see
+	- Fixup colors better (bright colors, green for players, blue for buildings, white for resources, grey for welds)
+		- Add killed location
+	- Animated effects when firing, when an enemy is viewed, etc.
+		O When firing
+		O Request
+		O Enemy sighted
+	O Draw hives on map correctly
+	O Draw invisible entities or scanning makes blips permanent
+		O First pass, still problems?
+	- Minimap generation just a tad off
+	O Test at other resolutions
+	- Soldier changes
+		- Fix for soldiers (off by minx and miny?)
+		X Draw rotated map for soldiers
+		O Draw subset of map for soldiers
+	O Drawing faded white for soldiers
+		O Gamma change, works after a setgamma
+		O Draw background black
+	O Reticle off on bast (aspect ratio)
+	O Don't draw everything as effects, draw as sprites (avoids blinking)
+	- Scale menu for soldiers
+	O Hive locations should draw whether active or not
+- New commander menu!
+	O Make a 3x4 grid
+	- Adjust artwork if necessary
+	O Fix problem when choosing build menu a research building selected
+	- Draw name of building that you're hovering over in pop-up help ("Need arsenal" but there's the arsenal?)
+	O Make sure arms lab and turret menus work
+- Customizable hotkeys
+- Center commander view such that the view centers in the middle of the viewable area, not the middle of the screen
+O Components not getting first gamma change (minimap esp.)
+O Fix entities disappearing in some congested areas (!)
+O Fix hive sprites not showing up
+O Fix minimap not showing up (?)
+O MG clip increased to 50 bullets
+O Grenade launcher increased to 300 points damage (up from 145)
+- ** Restart round problem (not going back to ready room!)
+- Arrow keys for commander movement
+	O Decide how hotkeys will work
+	- Allow movement keys, plus alternates
+O Removed marine blood, made alien blood yellow
+O Tried old-skool particle effect when spawning
+O Removed slowdown when hit, until thought through
+O Player model work with Mojo (figured out the floating problem, fixed the front-arms-not-playing-in-gaitsequence problem, got the level 1 and level 5 looking good in-game)
+O Knife model in!
+O Builder view model in!
+O Changed bot names to they don't mess with stats
+O New version of bast: tweaks to prevent getting stuck in the engine room and on the slanted elevator
+O Many more webs are allowed now (now that visible entities problem is fixed)
+O Builder chambers moved around: Sensory chamber with 1 hive, def chamber with 2, movement and offense with three
+O Level 1 no longer floating, his animations are fixed.  He shouldn't poke through the walls and actually looks somewhat fearsome now!
+- Leap doing damage
+
+NSIPT10
+-------
+O Fix bug where commander that's disconnected still blocks command station 6/10
+O Add map location entity
+	O Test 6/10
+	O Give out to mappers 6/10
+Tutorial mode
+	O Lightly design on paper 6/10
+	- Get shell to recognize it, add dummy map to test with
+Useability
+	O Move alien buildings to pop-up menu
+	- Rework pop-up menus to allow multiple images (disabled, allowed, selected)
+	- Add in new marine artwork
+	- Add in alien categories
+	- Disable/enable alien upgrades when available
+	O Draw "resources" near resources (only when cl_autohelp enabled)
+	O Draw "energy" near energy (only when cl_autohelp enabled)
+	- Add help messages that point out HUD items (easy!)
+	- Don't add and remove weapons, just disable them
+		O Do this for both marines and aliens, also for ensnare state
+		O Means weapons can be moved around easier just by editing AvHItemInfo.cpp
+		- Don't allow switching to weapon when not enabled (this will still allow marine weapons to work)
+	- Change random blinking icon to blinking category, blinking in place where upgrade will go
+	- Added error messages when trying to build structures when not a builder, or when not enough structures
+O A hive is now needed to gestate into flier
+O Towers and hives always available, alien turrets need 1 hive, defense and movement chambers require 2 hives, sensory chambers require 3 hives
+O New grenade model for grenade launcher
+O New world/player handgun model
+O New projectile for acid launcher and spikes
+O Fixed freezing bug (with looping sound, during scenes of action!)
+- Changes for new shotgun model
+- Add mines in
+- Remove nukes, jetpacks
+- ** Updated motd.txt and maplist.txt when new .bsps come in
+O Fixed memory overwrite bug in SDK in scoreboard 
+O Reworked player animations now many more are played, no more "airplane marines"!  Thanks for the anims, Mojo and Guy! (there are even a couple death animations in there!)
+O Removed egg_die on gestate (now play real sound)
+O Add sparks for marines when they are hit
+O Added smooth resource adjustment (instead of just setting the number/bar-level, it smoothly increments towards it)
+O Added realistic fall damage by default
+O Fixed bug where game wouldn't end if a team suddenly had no players
+O Inactive hives are now drawn for aliens, so they can find where they're supposed to be created
+O Added timelimit command -> When game ends, if timelimit has been reached, it switches the map (as opposed to switching maps in the middle of a game)
+O Late join time (mp_latejointime) changed to minutes (not seconds) and now defaults to 1 minute
+O Added numeric indicators and labels for alien resources and energy
+O Updated {alien_alpha to have less blue edges (Merks)
+O Updated ns.wad with Terawatt's transition textures
+- Level 1
+	O Make leap do damage
+	O Added flavor animation (picking teeth)
+	O Remove cheat where anyone can leap
+	- Add predicted/client-side damage feedback sound when touching player?
+	O Changes for new view model 
+	O Add visual indication to parasite
+		- Added code, but it doesn't show up?
+- Level 2
+	O Give builder web first, instead of spit
+	O Removed point cost for webs
+	- Change builder spit to be corrosive spit, does damage over time, esp. to welds (give it with 3 hives)
+	- Add new view model artwork
+		- Do it again
+	- Add healing/energy weapon
+		- Everything working but event
+	- Needs one more ability...
+- Level 3
+	O New view model (spikes, spores, bite and transition animations)
+	- Think about bite more (1)
+		O Add new weapon (last one?!)
+		O Add artwork
+	- Spikes (2)
+		- Animations
+		- Shoot fast spike model (alternate left/right when shooting)
+	- Spores (3)
+		- Animations
+	- Bombs (4)
+- Level 4
+	- Add double-jump
+	- Rocket-launcher instead of spikes (2)
+		O Add basic code
+		O Get the artwork for it started
+		O Make it explode in goo when it hits
+		- Make sure it doesn't hurt self in tournament mode (at least not when it leaves launcher)
+		- Make it look nice
+	- Change blink to be like BZII blink! (3)
+		O Rewrite
+		- Fix problems getting stuck
+		O Make it easier to blink (don't trace hull, just end point)
+		- Add visual indicator?
+		- Better sound effects, feedback
+	- Umbra (with three hives) (4)
+		- Basic code
+		- Make it block turrets...and bullets?
+		- Make it look better with new artwork and sounds
+		- Figure out a new ability for this, the turret thing is a bit hacky and hard to do
+- Level 5
+	- Artwork
+	- Bounding box, size, cost, speeds
+	- Huge hitpoints
+	- Galloping? (the longer you go in a straight line, the faster you can go?)
+		- Add basic speed code
+		- Make sound effects
+	- Melee (add some spice here...knockback?) (1)
+	- Charging attack (2)
+		O Got basic thing working
+	- Paralysis (3)
+		O Seems to be working, though a bit boring right now
+	- Primal scream (4)
+	- (swallow weapon?)
+- Fix iteminfo problem with acidrocket (the mID value is too high, what to do?)
+	O Try consolidating all the building IDs down into one ID (ugh, didn't work)
+	O Write Valve?
+	O Move build actions to pop-up menu!
+		O Remove hacky help system
+		O Now all resources are spent off menu, never from weapons
+		O Room for other builder abilities
+O New builder UI
+	O All buildings are on the pop-up menu now, so anything that costs points is on the menu
+	O Cleans up clutter of weapon icons, makes interface more clear
+	O Uses menu help instead of separate help system
+	O Workaround for 32 max weapons problem (engine limitation)
+	O Update help text to be more descriptive
+	- When pop-up menu is disabled properly, this will make hive and resource building more clear
+	- Add icons from Merkaba
+O New named locations tell players where they are (also works for commander)
+	O Draw info_location text nicely
+		O Added sprite for soldiers
+		O Tweaked position for commander and aliens
+O Don't draw health while gestating
+O Spit damage upped from 20 to 28
+O Added custom button sounds (button1->button10.wav)
+O New flashlight sound
+O New launcher sounds, brightened launcher artwork (temporary)
+O Play special animation when builder is building
+	- Only plays once, how to keep playing it?
+O New version of bast (locations)
+O New version of hera (new warehouse, new layout changes, locations, more)
+- New resource model
+	- Remove rank-based alien stuff
+	- Remove costs to respawn on both sides
+	- Slow down trickle for both sides
+	- Add rewards for kills on both sides (and for building on alien side?)
+	- Make resource towers much more noticeable
+	- Address problem where players are waiting around
+		- Sucking resources from nozzle?
+		- Hurt self for resources?
+- Alien tech tree changes
+	- Add sound effect when placing buildings
+	- When can offense chambers be built?  How about other buildings?  Try choice-based tech tree?
+O Add advanced weapons factory as research
+	O Rename arsenal to armory first
+	O Add new upgrade command
+	O Add code to handle upgrade
+	O Build times changed (30 secs to build armory, 120 to upgrade to adv. armory)
+	- Tweak code that converts it, it thinks it's buildable and stuck at 0%
+- Player animations
+	O Create constants from info sent to Mojo
+	O Start integrating
+		O Walk, run
+	O Fix marines quickly for NSIPT10?
+O Fix bug where deaths aren't reset when game is
+
+- Valve build 1 day after NSITP10
+	O Both sides now get points for killing enemies!  This should speed up the game.  More points are given for bigger aliens.
+	O There is no respawn cost for either side now.  This should speed up the game.
+	O Victory condition fixed (bug #111)
+	O Machine gun damage increased from 10 to 12 points
+	O Leap damage reduced to 20
+	O Acid rocket rate of fire decreased dramatically
+	O Spore damage reduced from 50 to 45
+	O Spore radius reduced from 300 to 250 (to line up with artwork)
+	O Level 5 cost reduced from 100 to 75
+	O Acid rocket awards points to owner correctly now
+	O Shotgun range dropped from 4000 to 1000, damage decreased from 27 to 23
+	O Turret damage reduced from 50 to 43
+	O Base points awarded for a kill reduced from 5 to 4
+	O Getting stuck when evolving as a level 5 (bug #113)
+	O Getting stuck when evolving in small places ()
+	O Updated models:
+		player/soldier/soldier.mdl
+		p_mg*.mdl
+		w_mg*.mdl
+		w_hg*.mdl
+	O Enlarged grenade
+		models/grenade.mdl
+	O Updated healing spray sprite
+		sprites/640aw4.spr
+		sprites/640aw4-s.spr
+		sprites/weapon_healingspray.txt
+	O Fixed bug #130 (parasite works while in commander mode)
+	O Reduced stepsize for level 5 (so he doesn't walk over marines instead of charging into them)
+	O Fixed bug #115 (weapons sometimes red when they shouldn't be on both sides)
+	O Temporarily removed buggy sensory chamber sight, it was causing players to show up when not visible
+	O Fixed bug #82 (ghost building not updating when changing your mind about what to build)
+	O Acid rocket doesn't leave phantoms anymore, works better now also
+
+E-mail:
+	- Level 5 morphing
+	- F4 to switch teams
+	- sound looping
+	- One marine must be commander.  Walk up to the command station and press your use key to command.
+	- Marines build structures by pointing at the structure and holding their use key.
+	- Don't place buildings in walls or on top of other buildings, you could get stuck
+	- Place infantry portals in large open areas, or players could get stuck when they spawn out of them
+
+NSIPT11 (RC1!)
+--------------
+O Builder level 4 ability
+	O Babblers!
+	- Limit them?
+O Primal scream
+	O Damage upgrades!
+	O Speed upgrades!
+	O ROF upgrades!
+O Umbra ability
+	O It's working!
+	O Added sound when it's effective
+O Bile bomb
+	O Kind of like a mortar!
+	- Work on visuals a bit more
+O New HMG model
+	O Animations 
+O All view shaking affects players in air as well
+O New siege turret role
+	O Siege rumbles screen if you're near it when it fires
+	O Added siege splash effect
+	O Just put them back in, aliens have artillery now as well
+O Added concrete and metal sounds when bullets hit them
+	O Make them quieter, normalization
+O Sensory chamber ability
+	- Screams when enemies are nearby?
+	O Parasites anyone who touches it
+	O Increase its health tons
+	O Sensory chamber must be built before becoming active
+O Gibs are now off by default (but can be turned on via server config)
+O Limit turret placement to radius around turret factory
+O Limit weapon placement to radius around armory/adv-armory
+	O Draw radius around building
+O Limit infantry portals to range of command station (to prevent hiding them)
+O Draw range of building when selected
+O Draw range of turrets when selected
+O Draw min/max range for siege turret when selected
+O Put infantry portals only near command center
+O Removed overwatch (until there's time to do it properly)
+O Marine backpedalling and strafing slowed down (I want feedback on this!)
+O Fixed bug where dropping your weapon made it look like you weren't either a marine or alien player
+O Ladder speed reduced for all players
+O A slow-moving marine is slightly faster (frustrating)
+O Level 1 speed increased, fixed alien speed upgrade bug (where 2 levels of speed upgrade was faster then 3)
+O Added new hive vision mode for the aliens!  Press your flashlight key to see...
+O Hive sight now only draws for entities out of sight (back the way it originally was, see if you like it better this way)
+O Marines now see enemy blips with new artwork
+O Two new sensory upgrades
+	O New vision mode, works on enemies
+	O Scent of fear
+O New mine artwork oriented properly (a little big and floaty still)
+O Freeze bug when shooting a hive
+	- Client or server?  Client.
+	- hive_wound3.wav seems bad?  It's frozen there twice.
+	- Yep, that was it!  Strange.
+O Hive sight icons aren't being reloaded on a level load (and other "invalid sprite x" errors)
+O Fix precache error that happens occasionally (move player assets into weapons.cpp)
+O Network logging code to track down overflow one and for all
+O Networking, overflow and performance enhancements.
+- Resource model tweaks
+	O Remove alpha-male double resources
+	- Make resource towers figure more prominently into incoming resources
+	- Start each side with fixed resources
+O Hive building problems fixed (on ns_nothing)
+O Bug: remove alien vision mode when you're a marine
+O Autobuild for resource towers and offensive chambers
+O Don't allow hive building to be sped up
+O Turret range reduced (too big for commander)
+- Rotate level 1
+- Clinging/roosting for level 3?
+- Jumping ability for level 4?
+- Fix alien turrets
+	- Make them able to aim straight up or straight down...because they're alien
+
+Post RC2
+--------
+- Fix armor display
+	O Now it draws
+	- Make current armor change proportionally when max changes
+O Siege damage much reduced
+O Throttled networking more to combat overflows (4000 to 3000)
+O Removed flashlight battery message
+O Grenade damage lowered, mine damage lowered, bile bomb damage increased
+O Grenade clip lowered, grenade max ammo lowered
+O HMG damage increased
+
+O Fixed permaweb bug, bug #167, bug #178, bug #128 (check for dupes first guys, just type a word and hit search, super-fast)
+O Limit amount webs a marine can receive, 
+O Removed ability for builder to use webs offensively by hitting players, bug #141
+O Changed primal scream HUD color to green instead of red (people were getting rightly confused about their weapons being unuseable), bug #165
+O Removed "bodysplat" sound when level 1 falls a long distance (bug #142)
+O Added code to detect that a level has the right amount of spawns.  This information is printed to the console on level load. (bug #187, bug #169, bug #112)
+O Weird "underwater" issues for commander above hera landing pad (bug #49)
+O Removed use of "model" command (set the model every tick) (bug #211)
+	- TODO: Also remove default model in RR?
+O Addressed commander crashing when selecting things (bug #173)
+- Added mp_teamresourcehandicap (if set to 1, biases team with less players with extra resources) (bug #202)
+	O Changed func_resource to represent resources as a float
+- Fixed problem where selection effects sometimes draw after leaving command station (bug #219)
+- Bite and spit started could go through walls, as their attacks emanated too far from the player origin (bug #177)
+O Reduced spike damage for level 3 (bug #207)
+O Don't auto-switch to an empty weapon (bug #194)
+O Fixed bug where particle systems weren't being reset properly after a game end, causing wrong or no particles to emit (bug #125)
+O Increased spike energy cost by 25%
+O Spent a long time narrowing down the jiggling while standing on buildings, it's in Valve's court at the moment
+	- Got e-mail back from Yahn, now investigate
+O New smaller mine artwork (still a bit floaty)
+O Fixed crash when placing tripmines on doors (bug #222)
+O Fixed command station healing players (also, retain armor value) (bug #137)
+O Started addressing cheating (leap exploit to start) though it's not fixed yet. You should hear a beep ("invalid.wav") when the game detects that you're doing something illegal, though it doesn't do anything about it yet.  Validated selection, research, building, hotgroups, lifeform morphing, upgrade evolution, etc.) (bug #118)  
+O Primal scream duration and cost increased significantly, for a more game-altering moment (bug #205)
+O Closed bug #101 (blinking no longer goes through walls)
+O Don't white-out commander when nukes detonate (bug #91)
+O Closed out ladder-speed bug (bug #28)
+O Fixed melee attacks not working up or down (bug #117)
+- func_buttons now reset properly (bug #4)
+	- Lots of stuff has changed reset-wise, but some lifts and doors don't reset right anymore, others work better
+O Reworked marine weapons to add randomness to their shots (Machine gun, pistol, shotgun, HMG) (bug #236)
+O Increased pistol damage from 18 to 25
+O Redemption tweaks (it triggers more often, it won't pull you back if you have no hives, plays a "invalid" sound when it tries to pull you back but you have no hives, it will now pull you back even if not in combat) (bug #238)
+O Removed sickness-inducing view shakes when hit with melee, but not taking damage, anti-llama (bug #230)
+O Builder healing spray damage/healing increased from 15 to 20
+O HMG damage increased from 22 to 28 and range increased about 20% (now that it has such a wide spray)
+- Added ready room command and commander voting to pop-up menu so console should never have to be used (bugs that will be fixed not withstanding)
+O Added temporarily invulnerable time (default is .1 minutes -> 6 seconds).  Players glow their team color during this time and can't be hurt. (bug #237)
+	- TODO: Draw this on view model as well
+O Fixed commander ability to change weapons (!) (bug #239)
+O Fixed marine progress indicators not always showing up after a map change (bug #24)
+O New buggy behavior: the command menu now longer works for MOUSE2!  The code is half-way to being fixed, need to work with Valve on this.  Bind it to a key in the meantime, sorry!
+O Moved soldier info_location out of minimap and to bottom of screen for consistency and to get around problems where it doesn't line up under different resolutions
+O Fixed bug where hitting "use defaults" in control setup would delete your settings
+O Overflow and HUD lag issues
+	O Disable network buffering to see if that's the HUD latency (set to -1)
+	O Log all network traffic by default
+	O HUD lag should be gone from now on, but we might see more overflows
+O Addressed various respawning issues (the problem will now be easier to find if it's not fixed).  Respawning changed significantly, (though it should behave the same), so be on the lookout for spawning problems.
+O New command center model!  I think you'll agree with me that this rules.  Thanks Squeal and Mojo!
+O New armory model!  Newly animated as well.  Looks different for the basic and the advanced versions.  Thanks Erex and Mojo!
+O New HMG model!  Animated and sized properly now (I need to change some code to make the fire animation look right).  Thanks BathroomMonkey and DefOne!
+O A bunch of new sound effects (xenocide, spit, blink, refilling at armory, grenade bounce, shotty, siege, spores, more)
+O New version of ns_nancy!
+O First version of ns_shaft from Ekaj!
+O New version of ns_tanith from tommyd!
+O New MUSIC!  This is a fairly significant milestone for us.  This is official music for NS.  There's more on the way.  Please do NOT give this to anyone under any circumstances, we are keeping it quiet right now.
+
+
+RC3
+---
+O Fixed marine build sound looping occasionally, divine wind looping sound problem, sample conversion warnings in console (bug #270)
+- Post post-installation image guidelines
+O Fixed hearing voice comm of enemies when dead (bug #274)
+O Fixed missing chat while dead (bug #280)
+O Fixed victory condition issue (bug #171)
+- Capture good overflow and performance logging
+	- Figure out cause of overflows
+		O Looks like network messages are being added faster then they can be sent...this is a big problem
+		O Removed errant "Battery" message!
+		- Looks like bullet decals could be a problem too...if all marines are firing LMGs and missing, 10 bullets a second*13*bytes*16 players
+			- Remove bullet decals first
+			- Removed texture sounds playing on server and client
+		- Bots marked returning TRUE for IsNetClient(), fix this too
+O Toned down level 5 stepsize (bug #255)
+O Workaround for -console problems on NVIDIA cards (bug #269)
+O Add spike hit sounds
+	O Added graphical effect back in for spikes also
+- Optimization: don't send particles to a player that already has them on a game reset
+O Fix ambient sound problems (bug #126)
+O Fix particle visible particles (bug #127, bug #216)
+- Write Chuck Olson about imminent build
+- Write ArsTechnica
+- Write N@rby's VISA recommendation
+- Talk Linux with Leon and Alfred
+
+- Consolidate alien sprites
+	O Work with Merks
+	- Implement
+	- Update installer/touch
+- Invulnerability should show on view model (bug #303)
+- Selection issues (waypoints not visible, very frustrating)
+- Invisible webs
+- Max web effect is too wimpy
+- Resource model changes
+	- Really think through this and work in excel on a new model
+	O Random resources for aliens (pick a few random cards from hand, these are percentages from pool)
+	X Remove trickle for marines (they can recycle)
+	O No resources for kills, it's a closed system
+	O Start with fixed resources don't add as they join
+	O Pool resources for the hive (aliens have team resources AND individual resources)
+	O When a player leaves the game, their points go back to pool (or half their points?  only in non-tournament mode)
+	X When joining after the game starts, you always get fixed (minimum?) points
+	O Remember points given to player while connected to server (to prevent joining/leaving repeatedly)
+	O Increase hitpoints for all towers for bigger battles
+	- Towers acquire resources, adding them to pool every so often.  This level is visible by looking at it.  When giving points to pool, the numbers are shown ("+10 resources") (for both marines and aliens)
+	- If a player has full resources, the extra stay in the pool, to be redistributed to the rest of the team
+	- The total resource pool (half of it?) is split among all players every 30 seconds or so
+	O Portals should have lots more hitpoints (1000 to 2000)
+	O Max alien resources now 50
+	- Scoring: marine score is always the total score divided by # of players
+	- What stops the aliens from rushing hard in the beginning?  If they die, they just come back, because the marines can't easily counter-rush.  The chance 
+	of aliens taking out marine emplacements early is definitely worth it.  Cost the hive some points to respawn the player?  Then what happens if all the aliens
+	rush, they can't respawn because there are no more points...the game just sits there with everyone dead?  Draw all alien hives to see if this fixes the problem 
+	(it will also force the marines to attack, and let them move to intercept builders)
+	O Allow hives to be hurt while spawning
+		- TODO: Grow in hitpoints as it spawns (it's a buildable now, so refactor)
+	- Add message for both sides when a tower has been depleted (kill the alien tower for them or show them where?)
+
+O Display message when parasited
+O The most recently dead would respawn before older dead (bug #200)
+- Implement commander voting down
+	O Remember players that have been voted down, don't let them become commander
+	- Implement voting
+		- When a vote is received, tell everyone on team that a vote has started
+		- After x seconds, say that vote has ended and give results
+O Allow aliens to build more then 3 upgrade buildings
+O Reduced level 1 speed (just too fast for meaningful marine tactics)
+O Added smooth energy transition
+O Allow aliens to build any upgrade building to start
+	- Need to propagate this to pop-up menu feedback
+- Resource tower upgrades take longer, cost more, and speed resource acquistion less
+O Alien turrets fixed! (bug #119)
+O Cloaking is effective against turrets (turrets won't fire at a cloaked target)
+O Alien turret projectiles are faster
+O Level 5 redemption problems (bug #312)
+O Reduced redemption probability slightly
+O Turrets can be built before building is finished (bug #271)
+O Fixed bug where ghost buildings sometimes showed when at an invalid build location
+O Building and active hives are now always visible to marines
+O Acid rocket and spike models shrunk
+O Level 4 view model in!
+	O Reduce ROF, increase damage, increase energy cost on swipe (to synch with art)
+O New version of ns_nothing!
+O Gestation model no longer floats
+	- TODO: lock it so it doesn't rotate
+- Buildable command station bug (bug #308)
+- Overlapping health/armor (bug #281)
+- Commander console slips around (bug #263)
+- Orient acid rocket and spikes properly
+
+New tech tree
+-------------
+								/--> Bunker (other option for defense besides turrets, mines, motion-tracking, or marines with shotties)
+							   /	 / -> Turret factory -> Nuke plant (build nuke)
+							  /		/						  /-> Prototype lab
+							 /	   /				  /--> Arms lab (research armor, damage, power armor) -> Medlab
+Command center -> Infantry portal ---------------> Armory -> Advanced armory (research) 
+                 \-> Resource tower		\-> Observatory	 
+
+Armory:
+	- Mines, shotties, welder
+
+Advanced armory:
+	- HMGs, Grenade guns (req. arms lab)
+
+Arms lab:
+	- All armor and weapon upgrades
+
+Observatory
+	- Scanning, motion-tracking, distress beacon (req: armory), phase gates (req. prototype lab)
+
+Prototype lab
+	- Jetpacks, stimpack, power armor
+
+Siege:
+	Research from turret factory 
+
+Nuke plant
+	Requires 
+
+RC3a
+----
+- UI, titles.txt, constants for:
+	- Stimpack (disable by default)
+	- Distress beacon
+	- Faster reinforcements
+	- Power armor
+
+O Power armor
+	O Auto-healing armor for everyone on team
+	O Draw cool effect when they have it
+	O Power armor regens faster when you're using less energy (when you're still), promoting leap-frogging (ala Halo?)
+O Tone down alien turrets
+O Adjust various alien costs
+O Cranked up the damage on the HMG (watch out for this aliens!)
+O Cranked up grens again (ha!)
+O Marine buildings strengthened, many costs tweaked
+O Add lightspeed reinforcements?
+	- TODO: Make spawning kill anyone standing on the portal
+O Added stimpack: increases marine speed dramatically
+O Many tech tree changes
+- Don't allow too many alien buildings in one area, as per webs?
+O Allow welder to heal armor
+- Add distress beacon (what does it do?)
+	- Doesn't do anything yet
+- Modify victory conditions: aliens lose when they lose all their hives?
+- Stress marine upgrades a bit more?
+- Make marines respawn at nearest portal (if portal is empty or if faster reinforcements is researched)
+O Fixed jetpack energy (?)
+O Observatories now detect nearby aliens and don't allow them to cloak
+O Draw marine upgrades on HUD
+	- Why are they blinking?  Same reason why some weapons sounds don't play the upgraded version occasionally?
+O Removed invul effect in ready room
+O Alien turret range brought down, it's now the same range as a sentry
+O Alien turret damage reduced
+O Siege turrets can be built anywhere (until they are mobile), and they can be recycled
+- Try making siege pushable
+	O Siege no longer shoot at players, ever
+	O Siege damage increased wildly, splash reduced
+	- Extend off pushable
+	- Put in action to deploy and undeploy
+	- Sounds, anims
+
+RC3b
+----
+- Marines can now build their advanced weapons properly
+- Acid rocket fire lessened
+- Alien max resources back up to 100, lots of costs changed
+- Phase gates now must be built and can be destroyed like every other building
+- "Parasite detected" text moved up a bit
+- Grenade launcher icon won't be enabled until it's actually valid (bug)
+- Level 4 slash attack energy lessened slightly
+- Lowered level 1 armor from 30/50 to 10/30 (he regularly takes out squads of marines and he's only 2 points!)
+- Added distress beacon!  Immediately respawns all dead marines at base.
+
+- Add TRAINER var
+
+File list: client.dll, sound/misc/distressbeacon.wav
+
+RC3c
+----
+O Siege turrets don't need LOS anymore, they can fire through walls (test)
+O Builder's healing spray can only damage players
+O 128 HUD sprites fixed again, and a couple new alien UI sprites (thanks Merks) (bug #352)
+O Alien balance!
+	O Spawn tower at nearest resource node for team
+	O Command station doesn't spawn in when game starts, but before
+	O Aliens can now donate their points to the team!  Any alien can hold their +use key on an active hive to donate points back into the pool.
+	O Resources adjusted again.  Resource towers contribute 3 points every 5 seconds, and have a total of 240 points each (lasts 5 minutes unless upgraded).  Other then upgrading, towers work identically for both sides.
+O Draw player name and location on hive sight
+	O Add nice aliens sayings ("Comprox is attacking", "KidC is buiding here", etc.)
+O Draw tech descriptions for commander (and updated some descriptions)
+O Fixed problems where it looked like the commander could build but couldn't (rough terrain currently prevents building, but at least you'll now generally see the building draw red)
+O Drawing location text for marines centered under minimap (again)
+O New tanith
+-Buildings are built at random angles now for visual interest
+	- Fix this up so the angles are chosen properly
+- Fixed marine flashlight (this is a BS setting I realized)
+
+- TODO: Fix angled surface build problems
+- TODO: Don't draw spectator health
+- TODO: Fix observer problems
+
+in PM_CatagorizePostion
+<MrBlondyman> change the check to this:
+<MrBlondyman> if(tr.ent > 0 && !pmove->physents[tr.ent].model)
+<MrBlondyman> 	pmove->onground = tr.ent; // Standing on a point entity
+<MrBlondyman> else if ( tr.plane.normal[2] < 0.7 )
+<MrBlondyman> else
+<MrBlondyman> 	pmove->onground = tr.ent;  // Otherwise, point to index of ent under us.
+
+File list:
+	sprites: upgrades, categories, aliens, 320aliennode, mainhud.spr
+	base: titles.txt, ui.txt, skill.cfg
+
+Alien names
+-----------
+Alien names, referred to out of game by all (website, forums) and in-game, by the marines:
+
+	Species name: The Rot
+	Generic name for an alien of any level: Rot, Rottie
+
+	Level 1: Claw
+	Level 2: Maker
+	Level 3: Flier
+	Level 4: Fade
+	Level 5: Bull
+
+Alien names, referred to "scientifically" and in-game, by the aliens (this is "alien-speak", how the aliens refer to themselves through non-speech):
+
+	Species name: Progenitors (capital P, indicating significance and respect like God)
+
+		1. A direct ancestor. See Synonyms at ancestor. 
+		2. An originator of a line of descent; a precursor.
+		
+		"And reverence thee their great progenitor." --Milton. 
+
+	Level 1: Skulk
+	Level 2: Gorge
+	Level 3: Lerk
+	Level 4: Scathe
+	Level 5: Ohnos
+
+
+RC4:
+----
+O Fixed pre-spawned towers floating (bug #365)
+O Increased siege splash
+O Added muzzle flash to siege, made muzzle flash always show for sentries
+O Visual turret radii are now correct (ignores height difference when calculating turret range)
+O Random building orientations for visual interest
+O Make sentries a bit more effective by speeding their turn rate, decreasing their cost from 20 to 16 and increasing their health from 600 to 800, also increased their range from 700 to 800
+- Fix infantry portal placement issues (don't allow it to be placed where players can't spawn out of it)
+- Don't allow buildings to be built on top of each other 
+- Don't allow a resource tower to be built an an occupied node
+- Don't allow any buildings but resource towers to be built on nodes
+- Scoreboard needs to be fixed for real
+O Put missing tanith locations in titles.txt
+- Siege firing anims
+O Hive no longer plays "flinch" animation when dead
+O Umbra now blocks only 7 out of 8 bullets
+O Make new .wad
+	- Post on mapping forum, write e-mail back to Mecha
+O New install process, lots of sounds and sprites removed
+O Fixed one of two "shaky" problems when standing on or near buildings or func_resources (thanks MrBlonde!)
+O Updated .wad (replaced Quake III placeholder texture)
+O New sounds for the level 3 bite, bilebomb, divine wind, parasite and umbra.  This marks the completion of all the non-vocal sounds!
+O New ns_caged!
+O New song!
+O Removed eclipse and shaft until they are more complete
+O Show why you can't build something somewhere (when trying to evolve to an illegal lifeform, make error message closer to center or otherwise way more obvious)
+
+O Linux fixes needed
+	O Write FindFirst/FindNext functionality for AvHSoundListManager
+		O Waiting on Albert
+	- Write AvHSUTimeGetTime() (not really necessary)
+	O Fix reading of textrep for particles
+	- Allow more/all cheats to work for dedicated server 
+O Wallclimbing changed to jump key for consistency (yes, he can still jump normally)
+O New marine texture and model, with jetpack (known bug: it always displays)
+O New welder model and anims (texture is rainbow right now)
+O Added text messages for when you receive health, ammo, when you do damage, and when a resource tower harvests resources for your team
+O New ammo model, new health model (thanks Merkaba!)
+O New level 1 animations (thanks Mojo!)
+O New level 2 and animations (thanks Guy and Def One!)
+O New version of tanith (thanks Tommy!)
+O New level 5 view model, and many animations! (thanks Cory and Def One!)
+O Level 5 melee attack ROF increased
+O Siege don't fire at babblers
+O Resource towers slowed down, take 10 mins to fully harvest for both sides (though marines can speed this up via tower upgrades)
+O Save state of alien vision mode during gestations
+O Fixed bug where vision mode sometimes persisted in ready room or after switching teams
+O Networking changes.  We may see more overflow, less HUD lag, or neither.
+O New ns_nothing (thanks Ken!)
+
+Difficulties that must be addressed
+
+- DOD/Valve playtest
+	- Maybe 5v5 DOD and Valvers, maybe 2 hours worth
+	- No one understood aliens
+	- Marines just ran off without building
+	- Allow marines to get weapons themselves?
+	- Show real path to get someplace
+	- Show players how to upgrade to new lifeforms and new abilities (blinking to show new abilities have been added)
+	- Show number of hives and hive status, including location (unborn, growing %, alive, under attack)
+	- Tutorial is nice, but for this to really work, it has to be all in-game
+	- Waypoints should have text showing what the waypoint means, and text to show where it is (just like alien hive sight)
+	- Describe marines as "teamplayers" and aliens as "loners/regenades"
+	
+	* Show names of buildings, show built/unbuilt/progress/health : reticle shows you building name, health, status text, explanation, ability/function
+	- Reticle over player shows you player name, type of marine/alien (level).  For same team, it shows you the weapon their holding, and their health as well.
+	- Reticle over hive shows you name, status, health
+	- Need an easy in-game (automatic) way to tell a player what an ability does (siege, bile bomb, umbra, etc.)
+
+	O Show how many resources a tower is giving your team, ala WCIII/EE
+	O Show damage feedback whenever you do damage to a building (to players too)
+	O Show why you can't build something somewhere (when trying to evolve to an illegal lifeform, make error message closer to center or otherwise way more obvious)
+	* Respawn timer 
+	- Scoreboard
+
+	- Label or distinguish subnodes for alien pop-up menu
+
+Minion
+http://www.adobe.com/type/browser/P/P_1719.jhtml
+
+- Before Valve's next playtest
+- Too many sounds played
+	O One shot of the shotgun, often with the MG (are these ricochet sounds then?)
+- Improve waypoints
+	O "Move to location", range, location
+	O "Build sentry turret", range, location
+	O Correct artwork now
+	O Make them go away automatically
+		O Build orders should go away when built
+		O Attack orders should go away when target is killed
+	- Fix selection issues (disable client-selection to start)
+	O Fixed incorrect sprites drawing for orders (verify)
+	- Tons of pop-up help for everything.  Make it as clear and "over the top" sounding as possible, then you'll realize that it's really not much work
+		O Help for every weapon, including different color text for damage and rate of fire
+		O Make text fade in and out nicely
+		- Icons, arrows and text pointing out every structure
+		- Tag and color bits (design first)
+		- Health bar
+		- Show status of structure?  (Status: Needs to be built/Building, Status: Functional)
+		- Fix for hive in first-person
+		- Test for aliens and their structures
+		O Fix for built structures in top-down
+		O Draw help text like this for tech help
+O Fix players getting stuck when using phase gates
+O Turned off damage drawing by default
+O Overflow stuff
+	- Tried reducing overflows at end of level
+- Overflow fixes
+	- Look at logs, decide if it's really particles or not
+	- Refactor particle systems so they don't propagate after every round, only sent when joining or on a map change
+	- Refactor so ns.ps is read on the client and only map particles are sent
+- Fix getting stuck in buildings
+	- Fix for marines
+	- Fix for aliens
+O Make "your hive is under attack" play a lot less often, and allow alerts to be tracked on a per-entity basis
+O Alien turrets more powerful
+O Wall-running is back to crouch
+O Fix level 5 redemption bug
+	O Disabled for now
+- New tooltips
+	O Verify pop-up menu text is working
+	- Messages disappearing too quickly in CM (only when there are other players!)
+	- Add more help messages, esp as beginner alien and as beginner commander
+	- Remove or update outdated messages
+	O Added under attack, research complete, upgrade complete messages
+	O Added messages explaining resources, energy, building structures, pending upgrades
+
+Before FOR LAN
+O Fixed jetpack energy problem
+O Toned down MG, HMG and shottie a little bit
+O Increased effectiveness of webs again (back the way it was awhile ago)
+- Stop blinking upgrade icon problem, make HUD look nicer
+O Fix chat text blocking hints
+O Update news page
+- Hive status help
+- Change UIDrawVariableBarSpriteHoles to use tri API, to fix D3D issues, doesn't look like Valve will.  Need to scale them anyways.
+- Client crash?
+O Tweaked level 3 flight to be more controllable in mid-air
+O Reduced energy costs for all alien melee attacks so they can take out buildings without having to wait
+O Reduced flier's flapping cost slightly, reduced fliers spike attack slightly
+O Removed stimpack (it is opposite of the marines mentality, it'll come back in a different form later)
+O Hives are no longer visible at game start (not having problems getting marines out of their base these days...glad to have this back)
+O Lots of weapon effect tweaks: ricochets, texture sounds, shotgun works right, puffs of smoke
+O New font, consistent with NS logo (thanks Merks!)
+O New eclipse!
+O New hera!
+O New caged!
+O New tanith!
+
+Post FOR LAN, Pre Tribes LAN
+----------------------------
+O Wall-running is now on by default, you can disable it by holding or tapping your crouch key
+	- Jumping ramifications?
+O Freeze players in place before game starts
+O Fixed alien death animations
+O Shaky ghost building bugs (when placing any buildings with any amount of lag)
+O Fix That Damned Scoreboard!
+	O Draw all effective player classes when observing
+	O Get team headers right
+		O All but "ready room when respawning"
+	O Get colors right
+	O Extra category for respawning players
+	O Drawing respawning players slightly differently (noticeable for other team)
+	O Don't order marines by score, do it alphabetically or by time in game (ent #?)
+	O Fix bugs when switching teams and score doesn't revert
+O Put back in feature where your old model is preserved after a game (your size is also preserved, let's hope there aren't people getting stuck in any ready rooms)
+O Fix jetpack feel...Tribes players!
+O Observatory cost lowered to 16 points (from 25)
+O Scanner duration tripled
+O Weapon bugs
+	O Pistol can be fired quickly after drawing, so can knife
+	O Button must be pressed repeatedly for knife, like other melee attacks
+	O MG deploys faster
+	O Fix bug were weapons can't fire immediately
+O Removed invulnerability when spawning (by default, server can still enable it)
+O Add particles back to phase in event (test)
+O Level 3 flight maneuverability reduced some
+O Phase gate cost halved, hitpoints doubled
+O Building on resource towers (fixed bug where you could build resource towers on top of other towers)
+O Command stations now are completely destroyed and can't be welded to be restored (have to figure out a better way to solve this, because welder journeys were great, but invisible command stations are unacceptable)
+O Bile bomb damage reduced from 70 to 45, energy cost also reduced from .3 to .25 (they should be used for attrition and anti-building, less vs. players)
+O Newly reskinned shotgun (thanks Beaner, SLAP, Def One!)
+O New shotgun reloading behavior
+	O Basics implemented
+	- Still glitches with sounds and anims
+O Marines can only have one primary weapon now
+O Moved grenade launcher to primary weapon slot
+O Increased weight of shotgun from 5 to 7
+O Decreased weight of HMG and GL to 11 (from 16 and 13, respectively)
+O Fixed bug where using the "drop" console command allowed aliens to drop their weapons, and allowed marines to drop them in a different and disconcerting fashion
+O Spruced up textures for the infantry portal and phase gate, to make them look more Coryized (thanks a ton Merks!)
+- Selection issues
+	O Removed selection prediction.  Selection may feel slightly lagged, but it should work better.  Let me know if this is a good tradeoff.
+	- Selecting a building, then build/advanced/equip causes menu to act strangely
+- Fix phase gates
+	O Effects play properly (particles, lines telescoping in, sound)
+	- Spawning
+- Players getting stuck in buildings bugs (reduced the chances of this a lot, but it can still happen)
+- Make pop-up menu more accessible (do whatever it takes for mouse2)
+- Finding hive locations
+- Observing bugs
+	- Attack and move right go to next target, attack2 and move left go to previous target
+- Soldier minimap additions
+- Pop-up menu visuals and disabling of tech (rework a bit, very much needed)
+- High-light buildings and build state
+- Layout HUD
+- Highlight players, always draw player names in top-down
+- D3D compatibility (people WILL run it on D3D, whether I realize it or not, just like software)
+
+Before leaving
+- Backup everything before leaving
+- Clean keyboard/mouse
+O ATM/laundry
+
+
+
+
+Post Tribes LAN
+---------------
+O Fixed grenade launcher sprite sometimes disappearing
+O Add health indicator for buildings and players, differentiate from build indicator (so now it's easy to see when something isn't built) (thanks Relic!)
+O Draw circle when reticle is on something (for commander, this is like mouseover in War III)
+- TODO: Draw armor rating somehow
+O Make welders functional for repairing buildings and armor
+O Show when buildings aren't built yet, even when relatively far away from players
+O Performance optimizations for calculating visibility and LOS (blips)
+O Rings around buildings and players draw at better sizes, so they are more easily viewable
+- Rework pop-up menu
+	- Draw scaled, so same size at all resolutions
+	- Ability to draw text and draw an image
+	- Ability to grey out or disable areas
+	- Draw normal instead of additively?
+O Removed junky little blue selection circles, replaced with new health-circles 
+O Fixed bug where victory sound would always play, now it plays the losing sound for players that lost
+O Hud sounds shouldn't be cut off anymore (under attack, countdown, research complete, victory/loss, etc.)
+O End game time is now 10 seconds (after victory is announced, this is how long the game keeps running until the map resets)
+O Sound replacements (new songs for victory and loss, replaced countdown sound)
+O Fixed bug where a marine resource tower and an alien resource tower can occupy the same node (bug #367)
+O BIG balance change: all weapon damage reduced by 80%, to slow down combats and to have less player death in general (also reduced turret, siege and offensive chamber damage)
+O Fixed command-station not resetting properly (bug #471)
+O Removed "give" cheat (only works with cheats on)
+- Add "Need attention" blinking icon for signalling commander
+O Call Todd
+O Visit Matt and Chad
+- Feedback on Comprox's IRC guidelines
+O Feedback on latest manual iteration
+O Add nice alert sounds for tooltips
+O Webs don't break on friends in tournament mode
+O Fixed bug where killing the command station didn't eject commander, and command station is permanently screwed up
+O New shotgun world and player models!
+O New welder view, world and player models!
+O Fixed those pesky selection problems!  Selection prediction is re-enabled, let me know if there are still any selection problems (show me how to repro too)
+O New ns_tanith!
+	-reduced file size, created ns_tanith.wad
+	-fixed spawning in map instead of RR (duh, i left info_player_start in the map last time)
+	-turned the map around 180 degrees so the marines start facing NORTH (makes a lot more sense)
+	-enclosed outside satellite section with a forcefield (had to do this because aliens could build structures on the sky)
+	-increased distance between MS and sat comm hive (makes laser strike more lucrative)
+	-made cargo storage more defensible for the aliens
+	-weldable vents only last 3 minutes instead of a permanent closure
+	-removed some clip brushes (since aliens can build structures that 'sink' into clip brushes)
+	-added a few more signs
+	-added a tactical map of the level in the ready room (!)
+	-removed placeholder music in the ready room (you can add your own mp3, rename any mp3 to 'tanith_rr.mp3' and place it in ns/sound/ns_tanith dir to listen)
+O New ns_caged!
+	- Added new readyroom
+	- Made some further texture changes
+	- Brightened up a few areas further
+	- Fiddled a bit of stuff to make the commanders view easier
+	- Altered the ambient sounds a little
+	- Altered some location names
+	- Partially rebuilt the larger service tunnel area
+O Added new alien nicknames in scoreboard (in order: Skulk, Gorge, Lerk, Fade, Ohnos) (PLEASE keep these under wraps until we know for sure, die Bob, die)
+O New damage types!
+	- Normal damage -> Full damage against all targets
+	- Piercing damage -> Full against players, half vs. buildings
+	- Blast damage -> Full against buildings, half vs. players
+	- Organic damage -> Does full damage vs. organic targets, does nothing against everything else (organic == players, babblers, hives, alien buildings)
+	- A point of armor blocks two points of damage.  
+	- Armor soaks 30% of incoming damage with no upgrades, then 50%, 70% and 90%
+	- Power armor soaks 60% of incoming damage with no upgrades, then 70%, 80%, 90%
+
+	Normal: Spit, knife, pistol, HMG, claws, welder, mines, swipe, bite2 (NS_DMG_NORMAL)
+	Piercing: bite, spikes, LMG, shotgun, sentries, offensive chambers, leap (NS_DMG_PIERCING)
+	Blast: Siege, grenades, xenocide, babbler blast, babbler bite, bile bomb, charging (NS_DMG_BLAST)
+	Organic: Parasite, healing spray, spores, acid rocket (NS_DMG_ORGANIC)
+
+O Bile bomb increased from 36 to 80 damage (but explosive now so it won't be killing players as much as it used to)
+O Level 3 bite damage increased from 32 to 50
+O Paralysis energy cost brought down from .2 to .13
+O Tuned level 5 charge sound
+O Increased damage of charge and increased energy cost as well (shorter, more meaningful charges)
+O Webs prevent jumping and jetpacks
+O Fixed bug where hives got twice the armor bonus they should
+O Draw "webbed" notification like "parasite detected"
+O Umbra is now a level 3 ability (requires three hives)
+O Blink now requires only two hives
+O Bile bomb is now a level 4 ability
+O Spores damage changed (for future alien vs. alien combat)
+O Parasite damage is 10 points now (organic)
+O Removed "give" cheat
+O HUD sounds no longer cut each other off (they won't play instead of cutting off another sound)
+O Removed overwatch code
+O Webs now prevent jumping and jetpacking
+- Big balance change: all weapons reduced by 20% damage
+
+- Decide to bring computer, or bring Archos and set it up nicely
+	- Charge Archos
+	- Bring SmartFTP
+	O Check settings for HLDir and NSBuildDir (environment)
+	- Check-in code so repository is up to date
+- Legal junk
+	O Talk to Brian and/or Paul about legal stuff
+	O Get NDA from Paul
+	O Insert copyright headers in all source
+	O Send NDA to VALVe and ask for theirs
+	X Get NDA from Morgan
+- Car stuff
+	O Talk to dad about NDA and car stuff
+		Complete exhaust (a-pipe, b-pipe and muffler) $675
+		Front rotors and pads $321
+		Master cylinder $287
+		CV boots $290
+	O Pick up car, then park it for trip
+	- Park car off the street, or talk to Brandy?
+	- Renew parking permit ASAP
+- env_fog issues
+O Wash sandals, mousepad
+- Haircut
+O Scott H. on Thursday, 6:30
+- Get more clans in on PTs 
+	- Get MonsE to make easy way for me to mail PTs
+- Write Jim C. before VALVe
+O Send in health insurance before VALVe
+O Bills
+O Buy some new clothes
+O Print out my NDA and VALVe's NDA
+O Call mom
+O Postmortem on Tuesday
+O Write Ido
+O Write Phil
+O Write Mark Terrano
+O Write Jeremy
+O Write Lani and get the ball rolling
+O Write Jason Mitchell
+
+RC6:
+	O New pop-up menus!  (disables invalid options, is much clearer now (no longer graphical, but usability takes precedence over artistic desires in this case, and people are absolutely baffled by the old alien pop-up)
+	O Fixed pop-up menu (!)  Works for any mouse button, and any key.  Also allows you to click a mouse button to choose an option.
+	O Performance improvements for CM, hive sight, motion-tracking, marine upgrades (Plaguebearer, let me know if you see a difference)
+	O Damage types removed, except blast damage on grenades, bile bomb and siege
+	O 20% damage adjustment removed (back to old damage amounts)
+	O Orienting temp entities
+	O Siege must be built within range of a turret factory (not an advanced turret factory though)
+	O HMG rounds increased to 150, max pistol ammo now 30
+	O MG and pistol feel improved (thanks Gooseman!)
+	O Moveable CC bug fixed
+	O Release mode (should be a noticeable performance improvement on client and server, for everyone)
+	O Map name (and author?) on scoreboard
+	O Visible resources not resetting when switching roles (or on game reset)
+	O No longer lose 1 point losing a building
+	O Grens explode on impact with enemy team entities, bounce otherwise
+	O Grenades, bile bombs, acid rockets and other weapons can generally hurt the launching player
+	O New MG, sounds for anims as well
+	O New prototype lab	model (goodbye HL grenade!) (this thing looks seriously amazing, thanks Squeal and Mojo!)
+	O Fixed grenade model trying to play anim it doesn't have (printed error to console)
+	O New shell (thanks Fam!)
+	O Reduced flier armor from 100/125 to 60/100
+	O Decreased def chambers from 6 points a second to 5
+	O Lerk scaled up by approximately 20%
+	O Removed nuke and nuke plant (and references to medlab and medkit)
+	O Welder cost reduced from 15 to 10
+	O Teammate health now draws properly for commander (when players are selected)
+	O No longer drawing any HUD or UI in demo playback mode (temporary workaround for recording footage)
+	O Fixed D3D problems for energy, resources and jetpack energy (draws to scale now, and works in D3D)
+		- Jetpack energy still needs work
+	O Make orders blinking
+	O Draw orders (and help icons) scaled to world, so they are smaller when far away.  Decrease overall size of orders.
+		- Draw text below it proportionally
+	O New weapon sounds when reloading, deploying, etc..  Some of these obviously don't fit quite right yet or aren't synched up. (thanks Def One!)
+	O New MG model ("I condensed it down to 3 256x256 maps, and then added some detail: graphically, the textures are more contrasted, the vid screen is closer in color to Cory's, and there are other various nick-nacks and refinements.  Polygonally, I've removed some pieces that bugged me, and used the extra space to add things like a proper bolt, and a casing around the clip port", "cleaned up a few polys (I went with the leaner look), polished up the maps, and here it is-- ready to swap") (thanks Bathroom!)
+	O New player model for MG, new HMG view model (thanks Def One!)
+	O New marine model animations! (thanks Def One!)
+	O New animated alien buildings!  (thanks Mojo)
+	O New death animations for the level 4! (thanks Mojo)
+	O New version of fmod (potential improved efficiency or compatibility for .mp3 playback)
+	O New hera!
+		- Walkway broken, hopefully more conenctivity.
+		- New entrance lift which won't screw up.
+		- Ladders at all the slow lifts; an attempt to speed up the action around the marine start area.
+		- A few vents removed
+		- Cosmetic changes here and there, including chairs in front of all the computer terminals.
+		- New lifts in general; no more of those 'U' shaped lifts.
+		- Lightning is out, thunder is still in.
+		- Lots of other little changes, eg join signs in readyroom are now the standard green signs, and the scrolling red line is on the floor instead of the ceiling now. (It's easier to see.)
+	O New bast!
+	O New caged!
+		- "Fixed a ton of minor shaz that only I'd notice ... texture things, little bits of brushwork yada yada"
+	O New ns_nothing!
+		- "bug fixes such as the weldable behind the MS, sound goofs, condensed info_location names, etc."
+	O New nancy!
+		- "File size is waaaaay down.  I moved some resources nozzles and added 1 extra.  Each "start" has its own nozzel (1 by each hive, and the marine bridge has 1) and the rest are scattered evenly across the map so whoever controls most of the map, will control most of the nozzels.  I also took out the cantina wav from the start and took care of a few texture alignments."
+	O Fixed intermittent client-crash that happened in large battles
+	O Don't send help messages for weapons that are selected but disabled
+	O Now players must wait 3 seconds getting in line to respawn, so death animation player properly
+
+
+	* Tried go-solid building fix to prevent players from getting stuck in buildings
+	* Refactored sensory chamber spawn/setconstructioncomplete to be uniform with other buildables
+	* Updated release project settings
+	* Reworked alien update message (got rid of old UI junk) in preparation for propagating hive info to alien players
+	* Removed ancient has-jetpack can-respawn variables on client and server (stored in upgrade var)
+	* Attempted to fix building sizes, but still doesn't work.  Keep values in there for when bug is fixed.
+	* Added Steam-friendly versions of FindFirst/FindNext.  Not using them yet though, until NS works with current goldsrc.
+	* New pop-up menu drawing!  Scales properly and easier to read (waiting for artwork now).
+
+RC6a
+	- Software problems
+		O Removed FOV changes for aliens, because of bug in software rendering where view model wasn't drawing (they will come back when engine is fixed)
+		O Fix alien energy and resources
+		- Indexalpha problem (topdown, builder spit, energy/resource indicators, mouse cursor)
+		- Pop-up menus are totally broken, draw differently in software mode
+		- Drawing progress indicators around bases of building are wack
+		O Crash in CHud::DrawHudString
+		- Music getting choked out because of CPU?
+	O Fixed pop-up menu corruption
+	O Fixed command station floating
+	O Fixed building ring scale
+	O Fixed floating resource towers
+	O Fixed z-fighting for inf portal (?)
+	O Blinking upgrades 
+	O Fixed occasional incorrect wrong playing weapon sound (due to upgrades)
+	O Added back in "upgrade lost" sound for aliens
+	O Chat text time changed from 6 to 10 seconds
+	O Implement eject-commander voting
+	O Draw blips, help icons, order icons and selection/build effects for demo watchers and spectators
+	O Fixed marine scores sometimes showing in scoreboard
+	O Fixed phase gates (they link up properly, and don't teleport you anywhere unless you have at least two)
+	O Increased command station health from 2500 to 3500
+	O HMG damage reduced from 28 to 23
+	O Fix tooltips not expiring
+	O Commander scoring (commander now has a score equal to his team average, rounded up)
+	O Make commander label blink when no commander is present
+	O Commander has voice precedence
+	O Jetpack energy drawing tweaked
+
+RC6b
+	O Lowered alien respawn time from 20 seconds to 10 seconds
+	O Lingering jetpack sound bug after game end
+	O Fixed permaweb bug (whoops!)
+	O Gorge spit energy cost reduced from .18 to .12, damage increased from 23 to 30
+	O Players slow down when hit some (so players don't go flying away when bitten) (this is the old system, not the extreme system in CS)
+	O Sensory chambers now detect enemies within range (they no longer do damage when touched though)
+	O Offensive chambers shoot faster projectiles, hitpoints increased from 600 to 800
+	O Hive spawn time reduced from 300 to 200 seconds
+	O Gestation health and armor increased (to allow more in-battle morphing)
+	O Hive animations play less often
+	O Screen fade on death back in
+	O Healing spray can no longer heal players over max health
+	O Healing spray can now heal armor (energy cost reduced)
+	O Healing spray now plays regeneration sound when healing players or buildings (it also heals buildings faster then players, to allow builders to save buildings)
+	O Put back in pauses between music tracks
+	O Improved blink a bit (shouldn't require jumping anymore, no longer "arrive" farther off the ground then you should be)
+	O Fixed incorrect help icons for weldables, command station, and others
+	O New idle animations for alien upgrade buildings (!)
+	O Don't generally play building animations when they interrupt another animation
+	O Changed FOV to 90 for all aliens (used to be 110 for skulk, 100 for gorge, 80 for level 5).  This is necessary for software rendering support.  Let me know if you think it really detracts from the game or if you don't even notice.
+	O New observatory model! (thanks Erex and Mojo!)
+	O Added view offset when firing babblers, so they fire successfully more often when standing on the ground
+	O Reduced siege upgrade time from 140 to 60 (seconds)
+	O Reduced movement chamber build time from 50 to 30 (not seconds, unitless)
+	O "Webbed" message now blinks
+	O Extensive information about current number of hives, building status for hives, and upgrades linked to hives.  Enjoy.
+	O Right-clicking will keep the pop-up menu open, until something is selected (makes it easier for players to stumble onto the menu instead of it disappearing too fast)
+	O Fixed reticle help text color not always set properly (when using pop-up menu before changing weapons)
+	O D3D (black edges) fixed
+	O Armor and ammo level 1 upgrade time increased from 30 to 60
+	O Orders no longer blink for the commander
+	O Fixed missing sprite when using welder
+	O Welder damage reduced from 30 to 14
+	O Parasites are reptions on round reset (New: parasites are meant to be able to be used on buildings as well)
+
+RC6c
+	O Updated sprite files and the babblers icon.
+		- Babblers
+		- New mine sprite
+		- New grenade launcher sprite (Got rid of HLs grenade)
+		- New knife
+		- New welder
+	O Observatory fixes (got rid of 48 polys that were doubled over on the back, also fixed all the uvws on the back so they used the correct part of the texture. deploy animtions also looks much cleaner.)
+	O Base marine speed decreased 20%
+	O All alien base speed increased slightly, speed upgrades lessened a bit (whoops, I overcompensated last time)
+	O HMG damage reduced from 23 to 18
+	O Rent
+	O Pay bills
+	O Send Jeff titles.txt (and techtree?)
+	O Create base hud.txt and get Merks going on death messages
+	O Phase gating through unbuilt gates
+	O Secondary CC not able to be built
+	O Removed tournament-mode rule where hives couldn't be respawned once they are destroyed
+	O Hives now become solid when they start spawning, so they can be shot before coming online
+		- They no longer animate when not spawning
+		- They are solid when spawning or active, translucent otherwise
+		- They can be damaged while spawning.
+	O Write Jeremy about using music for trailer, and telling him about gold date
+	O Fixed respawning order for both sides
+	O Energy cost for umbra reduced from 85% to 70%
+	O Siege damage reduced from 500 to 400
+	O Faster reinforcement is now half the regular respawn time
+	O Respawn times fixed (both aliens and mariens were 15, now aliens are 10, marines are 15)
+
+RC7
+	O Reduced level 5 stepsize to default
+	O No more scoring for parasite
+	O New marine skin! Now there are both black and white marines! (picks one randomly when you join the server)
+		O Updated all marine view models to use different skins as well (thanks Cory and Def One!)
+		O Added setskin cheat command for testing (setskin 0 or setskin 1)
+	O Update low-res sprites
+		O Wrote Merks about this
+	O Babbler sprites
+	O Parking tickets
+	O IRC guidelines
+	- Voiceovers
+		O Meet with Jeff
+		O Write prelim note to Lani
+		O Create formal and final voiceover document
+		O Write Lani
+		O Wait for e-mail back, talk to her on phone
+		O Talk to her again on Monday, talk to people about commander voice this weekend
+		O Wait for samples back from Lani
+		O Post samples on forum, send to Scott H, wait for their feedback and Scott's post before proceeding on marine/commander choice
+		O Try Max and Lani's sounds in-game, make final decision
+		- Put Lani's finish CC voiceovers in-game
+		- Write back Marc and Jon and thank them for the samples
+
+	O Lowered siege damage from 400 to 320
+	O Build circle artwork tweaked to be more intuitive (color doesn't fade away at end of "trail")
+	O Slow down resources on both sides a bit (to force more thought/consequence for resource tower placement, and to slow down tech on both sides)
+	O Primary resource towers start fully built for both sides
+	O Added death messages
+		O Death messages hitting hive info
+	O Droppable heavy armor (200 armor, plus 30 per armor upgrade level, armor absorbs 80% of damage, player movement much slower)
+	O Droppable jetpacks
+	O New NS icon (thanks Relic)!
+	O Fixed problem where victory/loss sounds weren't in the right format
+	O Fixed spores damaging buildings
+	O Fixed bug where alien defensive upgrades sometimes also gave damage upgrades (!)
+	O Added "command station online" sound when becoming commander
+	O Carapace and marine armor upgrades now absorb less damage (used to absorb 30% + 20% per upgrade, now it's 30% + 10% per upgrade)
+	O Lerk armor changed from 60/100 to 50/75
+	O Updated metamod with new jetpack and heavy entities
+	O Removed power armor, added heavy armor icon
+	O Fixed bug where grenade launcher looked available when it really wasn't (for commander)
+	O Turret factory health raised from 800 to 3000
+	O Arms lab health raised from 1000 to 2200
+	O Prototype lab health raised from 100 to 2000 (whoops)
+	O Armory health raised from 1200 to 2400
+	O When the server rotates to a new level, it now waits 12 seconds in the ready room first (used to be 5)
+	O Removed faster-reinforcements upgrade until it can be reworked into something meaningful and unique
+	O Fixed bug where sometimes players got stuck in limbo between readyroom and a team
+	- IRC ops forum
+		O Create and do initial setup
+		- Get MonsE to set up permissions and groups
+	- Demo playback
+		O Lots more stuff is being saved and restored, but old demos won't work anymore.  Still doesn't work properly but it's better.
+		- Try to get it working better for trailer
+			O Load/save initial HUD state so you can start recording at any time
+			- Get mouse working properly with pop-up menu
+			- Get scoreboard data seeded
+			- HUD not being updated properly problem
+			- Topdown mode won't work
+			- Learn about recording HLTV demos
+	O Alien donation problem
+		O Removed donation
+		O Builders get resources at three times the rate of other aliens
+		O Aliens have a max number of resources, given number of hives, but builders always have 100 max (so they can build hives)
+		O Lerk cost reduced from 35 to 33 (so he can be chosen with one hive)
+		O Gorge cost reduced from 18 to 13 (now that players will be spending more time as gorge)
+
+	O Fix "last" of the overflows! (also significantly less network usage on game reset)
+		O Don't resend particles every game to fix or reduce overflowing
+			O Fix client crash when particles are still drawing on a map change
+		O Removed unused particle effects (less data to send)
+	O Fixed builders getting twice the points for some buildings (movement chamber, maybe all upgrade chambers)
+	O HMG smoke emission removed
+	- Fix only two upgrades bug
+	- Fix get-all upgrades bug
+	O Hives drawing when not visible
+	O Fixed command-station alert for commander
+		O Added "attackcs" cheat to test
+		O New special CC under attack sounds
+	O Removed HMG and shotgun particle effects, they looked bad
+	O Turret factories now must be upgraded to advanced turret factories to build siege
+		O Cost reduced from 40 to 25
+		O Time reduced from 60 to 30
+	O Look at ISPs and pick one
+		O Looked at them and talked to their online people, let MonsE make the choice
+	O Pull together scripting care package for Ned
+	O Announce planned site outage
+	- Alien build and health rings (thanks Relic!)
+		O Alien buildings no longer fade in as they build, they are always solid
+		O Remove progress bar for alien building
+		- Adjust scaling for all buildings
+		- Allow all aliens (or builder only) to see health of aliens
+		- Z-buffering issues
+	O Fixed problem where top-half of marine played wrong animation in ready room (now it plays walk/run for whole body when no holding a weapon)
+	O All structures give one point to player, except resource towers which give 3 points (used to be that marine towers only gave one point, invalidating stats)
+		- NOTE: points go to builder if he creates the structures, points go to the marine team if the commander gets them built (awarded when structure is fully built)
+	O New tanith!
+		-increased overall brightness 15%
+		-changed big 'tanith' sign to a model
+		-hive location names are now post-rc6b compatable
+		-improved the tactical map in the readyroom
+		-removed mp3 music from the readyroom
+		-removed alien-only grates from the central tunnels
+	O New bast!
+		- Hopefully, this fixes 2 things: 1) people getting inadvertantly killed by the airlock, and 2) blocking the airlock with buildings.
+		- The airlock still does damage for those who insist on really trying hard to stop the airlock with their bodies, but you'll see that it's a lot harder to do that now.  I put down a func_nobuild that extends a little outside the bounds of both sides of the airlock to prevent anyone from building close enough to it that the building would halt the airlock's rotation
+	O New caged!
+		- Minor visual stuff and a few ambient sounds
+	O New nancy!
+		1) Overhead grates in locker room removed.  Allows for some Bob ceiling climbing and the comander to drop items correctly in room.
+		2) Vents redone near Marine Spawn and ones that stay mostly over hallways for more friendly commander interface
+			2a) Part of the same lines, I'm particularly found of the new vent opening near the marine spawn from the ground. It looks quite yummy (you'll know it                 when you see it)
+		3) Various little dents, dings various ambient brushwork to add to the overall setting.
+		4) A few more texture fixes
+
+	- Make minimap more functional for soldiers
+		- Draw map correctly
+		- Draw blips (teammates, enemies, buildings)
+		- Draw names?
+	- Aliens with jetpack effects from previous game
+		O Temporarily removed jetpack effects
+		- Rework...add smoke while in there?
+	O Fixed bug where the welder stopped you from using your jetpacks (and probably had other very nasty side effects) (bug# 509)
+	O Only allow resource towers on resource nodes (don't allow non-resource buildings to block access to nodes, pro-newbie, anti-llama)
+	O Set first alien resource node as built when game starts (same for marines?)
+	O Print out basic stats to log (victory team number, victory team type, map name, game length, game version)
+		- Change time to minutes, seconds, include server name, IP?
+	O Add blinking "paralyzed" message
+	O Fixed problem where motion-tracking upgrade didn't show on marine HUD
+	O When drawing armor, draw armor symbol using knowledge of current lifeform and max armor, not assuming 100
+	O Fixed incorrect/loud ricochet sounds for lerk spike attack
+	O Remove min range for siege
+	X Change armory to give you ammo automatically when you're in range
+		- Make sure it works properly when firing
+		- Undone?
+	O Ready room can't see voice
+	O Slow down the player to a near standstill when using the HMG.  Also, the HMG can only be fired while on the ground.  Bumped damage from 17 to 19 to compensate.
+	O Death animations now playing properly!
+	O Slow down resources on both sides a little bit, to allow a little more momentum coherence in (esp. in beginning)?
+		- Sanity check this with many bots before releasing
+	O Capped pistol speed (6.66 shots per second)
+	O Pistol damage changed from 25 to 20
+	O Slowed down level5 charging so it doesn't look quite so comical
+	O Hooked up gestation animations (looping gestate, flinching, death animation) (thanks Mojo!)
+	O Write Lani about alien direction
+	O Write Mark about soldier and commander direction
+	O Respond to Ned about PR stuff
+	O Tell Def One about ability slots for anims, also projectile for paralyze, ask for gore animation
+	O Write Hugo about walk and idle for skulk, tell him about ability slots for anims
+	X Write Hanz about doing spike hit sprite
+	O Write Relic about special effects
+
+	- Marine-crouching-suddenly bug for Mike
+
+	O Check .wavs for Lani
+		O Write Lani (send guidelines for alien voice, send any other samples for cc, discuss rate)
+		O Write Max (send guidelines for soldier voice, discuss rate)
+
+	O New particle effects (thanks Relic!)
+		O Resource nozzles:  used different sprite and tweaked particle system values.  Not a huge difference, but it looks nicer to me.
+		O Blink:  Uses new umbra sprite (see below) ie: looks like he appears in a cloud of sulfurous fume now
+		O Spike hit!
+		O Spores:  Modified the sprite to make it play smoother and look a little better.  Sporeclouds are a nice shade of alien green now.
+		O Umbra:  Modified the sprite to make it play smoother and look a little better.
+		O Weld stuff:  changed the sprites used for smoke, plasma, and droplets to create a more blue (and less obscuring) weld effect
+		O Phasegate:  Changed the sprite used.  If it's too 'fairydust' for you, try using the "welddrip.spr" instead (don't forget to change the # of frames to 1).  As you know, I couldn't properly test this one because the particles refused to obey and went about on their own agenda.
+		O Teleport/reinforcement spawn:  Tried a different approach.  You might want to double-check me on this, but is the flag value for "constrain pitch" on a particle system equal to 128?  I used this as an assumption, got a totally different result than I had intended, but liked the accidental result.  See what you think.  I also made a custom sprite for this.
+
+	O Fixed bug where blink effect wasn't playing at both start and end of blink
+	O Hives not taking damage before they're fully built
+	O All turrets (sentries, siege, offensive chambers) now reacquire closest target periodically (ie, turret firing at hive will turn to fire at incoming enemies if closer).
+	O Fixed lighting for skulk (tried using ceiling light level instead but that doesn't work most of the time)
+	O Skulk bite damage reduced from 88 to 70.  Before you freak out, realize that it will still mean two bites to kill 85% of all marines!  This just means heavy marines don't die in .5 seconds vs. skulks (it also means one skulk can't rip through an entire base of buildings).
+	O Play spike ricochet sounds less often and quieter (> 16 sounds with spikes esp.)
+	O Play less shotgun ricochet sounds
+	O Removed marine and alien points-received sounds (old placeholders, didn't need to be replaced)
+	O Distress beacon cost lowered from 30 to 15
+	O Phase gates no longer require prototype labs, just the observatory, cost for gates raised from 15 to 25
+	O New soldier model, with aiming and firing animations!  New p_models for weapons!  Touched up view models for skulk, onos and hmg! (thanks DefOne!)
+	O New heavy model and new level 5 model!  (thanks DrHugo!)
+
+	- Voice acting
+		- How much caricature, how much gravel, don't yell because you're using the mic
+			- Very specific, don't say "bad-ass", say "add more gravel"
+			- John st. John, If he's too radio (he's Duke Nukem)
+			- E-mail: stjohn4voice@sbcglobal.net   (949) 492-1892 home, (323) 533-1689 cell
+			- Don't talk money until I know he's the one
+			- Talk with Lani before I talk money
+			- Tell him that I'm doing it for low cost, that it could lead to something bug
+			- Tell him no accent, lots of gravel
+			- $150 for marines and commanders
+			- Ask him to strip compression, record flat, our sound eng. will do it
+
+		- Max McGill  (937) 435 2976
+			- reasonable rates
+			- maxtoo@earthlink.net
+			- Great new voice not heard on games
+			O Sent clips, awaiting samples
+			- From Lani: sneer, faster
+			
+		- Command station voice
+			- South African
+
+	O All new CC sounds!  These were recorded by Lani "I sense a soul in search of answers" Minella.  She's done work for Blizzard, Epic and tons of other companies.
+		O Command station online
+		O Command station under attack
+		O Research complete
+		O Commander ejected
+		O Tower low on resources (only give this once per node per game)
+		O Squad # sounds
+		O Need portal
+		O Press jump key to go to alert (only once per commander per game)
+		O Soldier needs ammo (plays for commander when soldiers uses pop-up menu, press jump key to go to alert)
+		O Soldier needs health (plays for commander when soldiers uses pop-up menu, press jump key to go to alert)
+		O What are you waiting for? (when idle)
+		O Soldier lost
+		O Select your troops and give them orders
+		O Sentry firing
+		O Sentry taking damage
+		- Soldier needs help
+
+	O Change all occurences of "building" with "structure" for clarity (some players get confused about buildings, because they assume they should be bigge)
+	O Marine equipment spawning issues
+		O Never remove equipment dropped by commander
+		O Anything dropped by a player lasts for 30 seconds (set by server as mp_weaponstaytime, in minutes)
+	X Wall climbing orientation
+		O Started work on it, wrote Brian
+		O Use his response to make this work
+		O Changes undone
+	O In ready room, use regular walk/run animations (not walk_noweaponname) so upper body looks right
+	O Draw range of observatory and sensory chambers when selected by commander
+	O Observatory and sensory chamber ranges now act in 2D (like siege), so commander can see what regions are affected
+	O Stop giving points for building on alien side (or give them for marines too)
+	O Revisit onos view model to make sure Def's new changes work properly
+	O Healing spray no longer sprays through walls or buildings, you need line of sight
+
+RC7a
+----
+	O Much improved teleport effect, changed spawn effect, improved performance for blink, tweaked spore sprite, toned down alien health/build rings (Relic)
+	O Changed hud.txt a little bit to fix some issues where the killsprites of certain weapons were displayed incorrectly and came out garbled (thanks Rhoads!)
+	O Heavy armor now absorbs 100% of damage instead of 80%
+	O Marines can now move full speed sideways (used to be 80%)
+	O Acid rocket damage changed from 80 to 60
+	O Spore range reduced from 80 to 60
+	O Spore damage reduced from 36 to 30
+	O Alien resource tower health lowered from 2000 to 1000
+	O Updated nancy (moved resource node in hive so it allows hive building)
+	O Big resource model change as an experiment:
+		O Resource towers are essentially infinite, but give resources much more slowly (2000 points each, giving out one point every six seconds instead of 360 points, 2 points every 5 seconds).
+		O Kill Grendel if you hate this model.  That is all.
+	O Commander idle sounds play less frequently
+	O New acid rocket effect, new bacterial spray effect (thanks Relic!)
+	O Command station health increased from 3500 to 9000
+	O All new final soldier sounds!
+	O All new final commander sounds!
+	O Removed "use target" order
+	O Only trigger phase gate help when phase gate is built
+	O Special select sound for aliens (in pop-up menu)
+	O Added new sound for aliens getting equipped (instead of marine sound)
+	O Removed extra sounds from install
+		O Many player footsteps
+		O Many sounds in sound/items
+	O Fixed shotgun ricochet (too loud and playing too many sounds)
+	O Added three new sayings for soldiers
+	O Marine armor increased from 50 + 30 per upgrade to 100 + 20 per upgrade
+	O Waypoints blink but are visible more often
+	O Typing kill in console for commander no longer does anything weird
+	O Moved choices on alien pop-up menu a bit so it's harder to go back to the ready room by accident
+	O Revisit building placement
+		O Allow ammo, health, scans, armor and weapons to go anywhere (including on top of players and buildings), not just flat areas
+		O Allow waypoints on slanted terrain
+		O Fix problem where ghost building sometimes draws behind walls
+	O Reworked hive sight messages
+		O The blip message closest to your reticle (and only that one) draws
+		O Allows player to see where other players are without an alert
+		O Stops cluttering the screen
+	O Reworked reticle message and help text (center player id works properly now, and autohelp can be disabled without losing player under the reticle)
+	O Take into account gamma when drawing things in HUD color (fonts should be the right color now)
+	O Draw blips while gestating
+	O Don't draw various UI elements during time between dying and getting in line to respawn (armor, hive info, resources, tooltips, etc.)
+	O Draw health for building or entity you're looking at, no matter the distance (instead of scanning immediate area for buildings).  Possible noticeable client performance improvement here.
+	O Gorges get to see health for teammates
+	O Server optimization: turrets search for new enemies less frequently (from 10 times a second to once every .8 seconds)
+	O Server optimization: defensive chambers heal twice as much, but half as often
+	O Server optimization: frame rate independent player updating
+	O Fixed server ASSERT when aliens "ask for ammo"
+
+RC8
+---
+	-> Server password: br1ng1t
+	O New main screen artwork (thanks Squeal!)
+	O Update FAQ
+	O Acid rocket and teleport effects updated (my bad, thanks Relic!)
+	O Don't allow commander to select units on other team (fixes health ring issues)
+	O Removed every last placeholder sound (most alien sayings don't play sounds right now, no pain/death sounds for marines, these will be replaced)
+	O Added new console backdrop (thanks Squeal!)
+	O Aliens with no hives have a max of 33 resources, not 0
+	O In an effort to shorten games and have less random node grabbing, resource nodes are now destroyable.  If a tower is successfully built on a node and then destroyed, the node can no longer give resources to either side for the rest of the game.  A node that's been destroyed in this manner will no longer allow towers to be built on them.
+	O Resource towers take longer to build, cost more, and are harder to destroy.  This may be the right solution for the rampant resource trading we've been seeing.
+	O Healing spray no longer damages non-players
+	O Get code off UW
+	O Removed HL "flatline" sound on death
+	O Refactor hard-coded hive sight network message limit
+	O Turrets track closer to the way they used to
+	O Marines in heavy armor are slightly faster
+	O More HP for phase
+	O Swap spores and umbra
+	O Movement chambers now teleport you to the farthest hive (!)
+	O Toned down primal scream (rate of fire, energy acquisition, +30% damage instead of %40%)
+	O Lerk bite and fade swipe icons display properly (thanks Merks)
+	O Grenade gun max clip increased from 4 to 6
+	O Fixed problem where help icons weren't drawing
+	O Made voting percentage and min votes server variables (mp_votepercentneeded and mp_minvotesneeded)
+	O Added heavy view models!  There are still some problems with the left hand and arm in some of these.  (thanks Def and Cory!)
+	O Fix order giving once and for all
+		O Players always see them
+		O Build orders always go away when structure is built
+		O Fixed problem were wrong action was being displayed
+		O Waypoint drawing in wrong location for entities
+		O Waypoint text obscured
+		O Waypoints a bit big
+		O Order completion is now an alert, so pressing jump key will go to it
+		O Make sure orders expire properly in all circumstances
+		O Don't play order complete sounds when order failed
+		O Wrong order icons
+		O Fix welding completion (mWelded)
+		O Only allow order giving when player(s) selected
+		O Movement order not expiring?
+	O Draw correct minimum resource amount on HUD (instead of 100 all the time)
+	O Flight/jumping and ladder issues (don't allow airborne lerks to use ladders)
+	O Distress beacon no longer needs armory, motion-tracking and phase gates now require armory (oops)
+	O New tech tree sprites
+	O Added knife flourish
+	O New soldier model strafes/twists properly (thanks Def One!)
+	O Acid rocket ASSERT
+	O Removed all knockback, slowdown and forces applied from melee or ranged weapons
+	O Don't disable alien pop-up nodes that are too expensive (allows quick help)
+	O Put in tooltip that explains the object of the game
+	O Higher HP for siege (1000 to 2000)
+	O Moved alien death messages
+	O Allow people to move around server until countdown starts.  When countdown starts, reset server so hive hasn't been discovered.
+	O Draw alien energy max at 100, not max resource level
+	O Fix skin problems in release/online (setskin is now allowed by players for testing ("setskin 0" for white marine, "setskin 1" for black))
+	O Fixed bug where using alien abilities sometimes played the "illegal action" sound
+	O Addressed exploits where alien abilities could be bound to keys (player is immediately killed)
+	O Move alien health into fuser2, alien energy is now fuser3, make sure gestation progress bar still works
+	O Don't draw health rings for enemies when you're a gorge
+	O Fixed alien building health not updating
+	O Fixed # sign in location text in non-official maps
+	O Updated community links page
+	O Final eclipse (thanks KungFu!)
+	O Soldier sayings and other HUD sounds increased in volume (they weren't normalized)
+	O Play "more resources" sound when not enough for building or evolving
+	O Dropping ammo at world origin when spawning
+	O Fixed shakiness while frozen before game start
+	O Allow right-click to cancel building in CM
+	O Armory's upgradin' message
+	O Added team sounds when game starts
+	O New hera (thanks Merks!)
+	O Beefed up turret acquisition time again (halfway between old and new)
+	O Hives can never be blocked by presence of resource nodes (the anti-llama tactic)
+	O Profiling code for Linux
+	O Linux build updated
+	O New skulk model (head turns properly when strafing, new death anim) (thanks Mojo!)
+	O New caged!
+		O Fixed areas where players could get stuck in the Ventilation System Hive room and the Generator Stability Monitoring room.
+		O Tweaked architecture and lighting in Central Hub, Sewer Vestibule and Freight Elevator areas.
+		O Added some other bits n pieces of detail and visual niceness: coronas, some accent lighting blah blah.
+		O Finally fixed Fam's floating button!
+	- Alien voiceovers
+		O Direct Lani
+		O Get Scott set up with them
+		O Work with Scott on them
+		- Add new voiceovers
+			- Incoming enemies (for sensory chamber)
+			O Game start sound
+			O Hive is complete
+			O Low resources
+			? New trait available
+			O Hive is dying
+			- Funny ones
+		O Send back to Scott for more post
+
+	O Removed "fetch config from URL"
+	O Write VALVe with final update
+
+RC8a
+----
+	O Hera crash
+	O Resource model is messed (dang, a missing "c" causes so many problems...)
+	O Make alien sounds louder (normalized)
+	O Call Mike Friday
+	O Fixed floating gestation sacs
+	O Fixed bug where extra resources were sometimes being wasted on the alien team
+	O Siege damage reduced from 400 to 350, range reduced from 500 to 400
+	O Aliens now fall all the way to ground during countdown (instead of floating and shaking)
+	O Added missing gunpickup2-a.wav
+	O Soldier armor reduced back to 50 + 20 per upgrade (instead of 100 + 20).  Means two skulk bites to kill.
+
+RC8b
+----
+	O Fixed bug where commander was getting "command station is under attack" when something else is under attack
+	O Write mappers about final map acceptance and deadline
+		O Opinion poll first
+		O Choose maps, post on forums
+		O Write mappers
+		O Write Narby
+
+RC9 - final
+-----------
+	- Password: l4stw33k
+	- Server password: k1ck1t
+	O Marine tower cost reduced from 50 to 35
+	O New ns_nothing (just info_location stuff)
+	O New voiceicon.spr from Relic
+	O Marine tower cost changed from 50 to 35
+	O Resources sped up just a hair
+	O Shotgun damage reduced from 20 to 18 per bullet
+	O Umbra lets through 1 in 7 bullets instead of 1 in 8
+	O Send detailed manual feedback to Jeff
+	O Revisit construction time and make sure it works (approximately) in seconds
+	O Touched up some alien and marine sounds (Onos footsteps, new alien death, mg and hmg upgraded shots, increased resource tower idle volume)
+	O Moved and removed many sounds, most of them duplicates or placeholders.
+	O Don't allow name changing mid-game (queue up changes and change when valid)
+	O Fixed bug where sometimes you couldn't switch to next player while spectating (happened when buttons were held down on death)
+	O Reduced leap and charge damage a bit
+	O Level 5 and alien health issues ("looping" past 0, make sure health color takes into account max health of player)
+	O Add damage ring for target building when close (doesn't work for alien resource tower, it's not working for reticle help either)
+	O Can no longer change skin via console unless cheats are on
+	O Alien energy problems (esp. with leap)
+	O Make sure alien abilities can't be abused by binding them
+	O Add "you need more resources" alert for aliens
+	O Get cable
+	O Pay Lani
+	O Send Avis receipt to Denise at VALVe
+	O Rent
+	O Bills
+	O Health/build-status rings should display when pointing
+	O Test waypoint visibility during a PT sometime
+		O PTs found cases where it doesn't work
+		O Fixed problems they found
+	O Send some NS radio clips to DJs
+	O Write Def One with new tasks
+		? Get Def to add reload sounds for HMG and GG
+		O Soldier crouch should be lower, going through ceilings
+		? Soldier crawl is going through the floor
+		- Scale up lerk a bit
+		- Soldier run
+	O New bast (updated sound locations, ladder to get out of breakable grate pit near furnace)
+	O Write Scott with new tasks
+	O Feedback on Citixen's story
+	O Make sure console commands require cheats if needed
+	O Make sure keybinds match up
+	O Fixed bodygroup jetpack problem (thanks Necro!)
+	O Mines are now visible when dropped, but still oriented wrong
+
+	O E-mail to Scott
+		O Out of game UI sounds
+		O Go through mg and hmg sounds
+		O bite2.wav (rework to sound cohesive with bite.wav)
+		O bitekill.wav/blinkfail.wav
+		O Replace mine_charge.wav, mine_deploy.wav (send sounds and explain timing)
+		O select.wav (and select_node_forward.wav and select_node_backward.wav) should be less abrasive if possible
+		O Touchup hud/you_lose.wav and hud/you_win.wav (fade in/out or otherwise improve)
+		O Create pickup_heavy.wav and pickup_jetpack.wav?
+		O Recreate fade sounds? (all the role6 sounds except role6_spawn)
+		O Alien sayings
+		O send blink sounds and verify that they are his
+		O divinewindexplode.wav is clipping, need old one back
+
+	O Precache error for team_advarmory
+	O General purpose particle event
+	O Add new xenocide effect
+	O Clean up e-mail
+	O Fix MOTD.txt not propagating
+	O Remove mp_demoing	
+	O Add generic sound when alien building dies (little squish/scream)
+	O Fixed refilling mines at armory bug
+	O Sensory chamber health increased
+	O Sensory chamber cost reduced, offensive chamber cost increased
+	O Ask AAron/MonsE about https and writing a backend script/db
+	O Removed the sound/ns_bast folder, integrated Relic's sound changes into the sound/ambience folder.  You may want to verify that your map's sounds are still correct.
+	O New particle effect for bile bomb
+	O Movement chambers take 3 seconds instead of 2 seconds to become usable after being built (to lessen chance of gorges jumping through by accident)
+	O Decide on software rendering: it's out until a future HL patch
+	O Building sizes: it is a problem with the engine, it'll be fixed in a future HL patch
+	O New sound and effects for distress beacon
+	X Display building range when dropping ghost building
+	O Reduced alien resource tower from 30 to 25
+	O Reduced shotgun range from 1000 to 7000
+	O New launcher sounds (thanks Scott!)
+	X Work with EricS on VAC and building problems
+		O Can't be fixed for v1.0.
+	O Fixed ammo/health alerts for soldiers, so the commander is notified (hit space to go to it)
+	O Added order requests as an alert for the commander (hit space to go to it)
+		- Add Lani's new sample
+	O Pistol, welder, and tripmines are now secondary weapons (only allow one)
+	O E-mail Slappy about metamod update for tonight
+	? Visibility tweak: enemies aren't "detected" unless they're moving.  This means the commander can only see nearby moving blips, and marines with motion-tracking won't see still aliens that are detected because they're nearby.  This also means webs won't show up when nearby.
+		? Fixed motion-tracking picks up unmoving players
+	O Added WON authentication IDs in scoreboard (must type "auth" in console for it to display an icon for you, auth again will toggle it off)
+		O Remove drawing over class name
+		O Fix weird memory problem
+		O Decide how server ops can specify their IDs (server variable, delimited with ;'s?)
+		? Get Relic to create icons
+		? Get Dev WON ids via forums
+		? Get Guide WON ids from Bilks
+		x Add any extra powers for those authed?  endgame, voting?
+		? Add "auth" command (it should reset when player disconnects but not between games)
+		? Tweak colors
+
+	O E-mail Jeremy about trailer music
+		O Talk to Cory and write Relic first
+
+	O Changed hive ambient sound to use version in HL
+	O Change primal scream to not use green, but to draw blinking primal scream text
+	O Added "In umbra" indicator
+
+	- Misc sound tasks
+		O Verify that there aren't any broken or placeholder sounds anywhere
+		O Go through alien deaths and idles
+		X Add soldier talking to traile r
+		X Bite death sound (Starcraft?)
+		O Phasegate.wav in?
+		O Marine resource tower sounds in?
+		O Add vibrato to alien voiceovers?  Lani used: Effects->Chorus->Vibrato2 (default settings) (feedback 40%, chorus 5/2. -6, input gain 0, mod depth 8%)
+		O sound/doors...include which ones?
+		X Merge mg-1.wav into two bullets?
+		? Add chargekill
+		O Scott's or SC's?
+			X misc/a-building1.wav and misc/a-building2.wav
+			X misc/distressbeacon.wav
+			O hud/countdown.wav
+			O kn-hit-3.wav kn-hit-4.wav (remove)
+		O Consolidate bitehit and bite2hit
+		x Make sure explode1.wav and explode2.wav (deep in engine)
+		
+		O Replace bitekill.wav with bite2kill.wav
+		O Add bite2kill (uses bitekill.wav)
+		O Remove abilities_granted and abilities_lost
+		O hive_death is in?
+		O Egg gestation sounds played more regularly
+	O Updated ns_nancy, ns_caged and ns_eclipse with info_locations
+	O Change launcher so it's multiplayer only
+	O Allow phase gates to be recycled
+	O Phase gate now plays looping sound
+	O Removed hotgroup support until it can be done properly
+		O Verify not crashing when creating hotgroups quickly
+	O Removed HMG slowdown, it can be fired from air again (too confusing and weird)
+	O New fade and onos models (anims tweaked)
+	O Removed upgrade sounds for weapons (unnecessarily confusing and doesn't warrant space/memory)
+	O Don't allow +using movement chambers while gestating.  Are there any other exploits?
+	O Last remaining new sounds!
+		O New alien vocals
+		O New mine sounds
+		O New pickup jetpack/heavy sounds
+		O New blink sounds
+		O New lerk bite sounds, new bitekill sounds
+		O New fade sounds
+	O New particle system for phase in
+	O Increased scan duration
+	O Removed parasite projectile
+	O Fixed "Need ammo" and "need health" alerts, now they fire for commander
+	O Offense chamber health increased from 800 to 1100
+	O New scanner sweep effect (gorgeous Relic!)
+		O Added face up particle flag, updated .fgd
+		O Post b_scan.mdl task for Def
+		O Adjusted scan timing
+
+	O Valve Anti-Cheat fully integrated!
+	O Preserve model from previous game in ready room
+	O New Onos footsteps
+	O Fixed bug where gestating on elevators turned off collision
+	O Fixed acid rocket problems!
+	O Orienting and scaling temp entities (lerk spikes, added paralysis projectile)
+	O Allow hives to be hurt while building (bounding box issue)
+	O Fixed hive building exploit
+	O Fixed bug where ghostly view model appears after building and entering command station
+
+
+	- Remaining Lani tasks
+		O Email her with "Soldier needs order", redo the annoying ones (structure is under attack), alien flavor
+
+	- Remaining Max tasks
+		O Emailed him with "There's something you don't see every day", "Why am I so good" and pain, death sounds
+
+	- Performance issues
+		- Turrets
+		- General performance
+			- Regular bots should think like regular players for easily profiling
+			- VTune pointed out AvHDetermineVisibility and some of the casting in there, but not sure if I believe it
+			- Performance with many bots seemed identical to that of many players, then I rebooted and now game performance with even 25 bots is minimal (?)
+
+RCX - final
+-----------
+	X Potential installer issues (happened to me at least, probably my environment)
+		X mouse2 wasn't bound to popup
+		X music volume was 200
+		O Use -console or -nointro?
+		? slide show should indicate that it transitioned to aliens (all of a sudden, everything's different and it's strange)
+		? Using old icon for shortcuts
+
+	O Jetpacks lose energy slower
+	O Acid rocket damage changed from 60 to 50
+	O Fade armor reduced from 125/150 to 90/215
+	O Addressed alien building spam, now you can't have more then 8 buildings of a specific type within a 1000 radius (half that of webs)
+	O Gamma washing out auth icons
+	O Don't reset spectators on game reset
+	O Fixed unlimited HMG ammo bug
+	O Fixed nodes not being buildable
+	O Fixed server crash when MOTD.txt is too long
+	O Make weapon priorities for shotty/HMG/GG equal
+	X Don't allow skulk to use ladders
+	O Fixed client crash that happened only as an alien, when players leave the server!
+
+  	- Server optimization
+		? Do what VTune says: AvHDetermineVisibility.  This is probably more due to the number of entities, and less due to this actual function.
+		- Get linux server working with compiler optimizations
+			O Buildables not fully built
+		X Try removing particle stuff on server
+		- Track only entities that need visibility calculations
+			- Buildables
+			- Players
+			- Webs
+			- CBasePlayerItems
+		O Found real problem: InternalHelpThink()!
+
+	- Onos issues
+		O Onos getting stuck when evolving
+		O Crouch bug
+		? Allow redemption to work
+		- Getting stuck occasionally while moving (?)
+		- Needs to crouch to do damage
+
+	O Avis info for car when at VALVe: Rental number: 669122985   Car number: 6140761,  Aug 16 through 29,  $632.41, 800-352-7900
+
+	? Added alien easter eggs
+	O New fade and onos models, no more floating (thanks DefOne!)
+	O Tweaked xenocide, bilebomb, blink for performance and aesthetics (thanks Relic!)
+	O Updated location names on hera to have less "processing" and "computers" (thanks Merks!)
+	O Reduced marine tower cost from 25 to 22
+	O Reduce portal cost from 25 to 15
+	O Reduced phase gate cost from 25 to 20
+	O Reduced HMG cost from 28 to 23
+	O Reduced grenade launcher from 33 to 27
+	O Reduced alien resource tower cost from 24 to 22
+	O Increased marine turret health from 800 to 1000
+	O Increased skulk bite from 70 to 75 (two-bite kill)
+	O Increased heavy armor speed scalar from .82 to .88
+	O Reduced jetpack tech cost from 50 to 25 (haven't seen jetpacks once since they've been droppable!)
+	O Reduced jetpack cost from 15 to 9
+	O Increased fade cost from 40 to 44
+	O Reduced builder morph time from 15 to 13
+	O Reduced lerk morph time from 20 to 18
+	O Reduced fade morph time from 25 to 23
+	O Reduced onos morph time from 34 to 30
+	O Decreased builder cost from 13 to 10
+	O Reduced heavy armor damage percentage from 100% to 95% (so you'll take some damage to your health)
+	O Reduce motion-tracking research time from 180 to 100
+	O Reduced portal build time from 30 to 22
+	O Reduced shotgun damage from 18 to 16
+	O Increased siege range from 1100 to 1250
+	O Increased HMG damage from 19 to 20 (double the power for regular MG)
+	O Fixed armory texture (not sure what was wrong though)
+	O New bast with particle performance fixes
+	O Added door sounds back in again
+	O New optimizations
+	? Allow players to change name after game started, as long as they haven't left the ready room
+	? Fixed gamma correction for auth icons
+
+	? Slow down particle propagation to fix timeouts?
+	? Bast particle performance
+
+	O Scan effect not visible in current build (missing/bad ParticleEvent.sc, scan.spr or particle name in ns.ps)
+	O Zero velocity of players going through phase (reduces chance of falling into hole after going through)
+	O Missing door sounds
+	O Replaced pistol sound with beefier one
+	? Respawn with full energy instead of 0 energy
+	? Added alert for sensory chambers ("The enemy approaches")
+	? Added alert for builders.  Now it only plays every 30 seconds and won't play if you have builders or players that are evolving to builders, or not enough alive players.
+	O Fixed bug where scanning also issues an order
+	O Look into network messages being sent on an endgame (redundant messages or something is causing overflows still)
+	O Updated spectator mode with new text and new camera distance for more cinematic feel
+	O Updated auth icons (thanks Relic!)
+	O Resized lerk
+	O MG, pistol and HMG muzzle-flashes now emit from the correct locations, new muzle flash sprites
+	O Update marine hud sprite
+		O Info_Location
+		O New mainhud.spr from Relic
+	O Limit # of buildings in an area (do generically)
+	O Change upgraded weapon sounds
+		O Emailed Scott H about making new ones
+
+	O Fixed client-side crash on changelevel and removed all "no such sprite" errors
+		O Has to do with particles drawing on map change, possibly with invalid sprites?  Possibly lag-related, test with fakelag?
+	? Write Relic about last particle effects
+		- Turret smoke
+	? Add new jetpack effects
+	O Welder performance
+	O New blink effect (better performance)
+	O Doubled grenade launcher rate of fire (improves feel and spam isn't an issue now)
+	O Skins are now working properly after a map change or reset
+	O Removed placeholder Q3 texture (nos_wall3) from ns_bast.wad
+	? Aliens not playing their death anims sometimes?
+		O DIE_BACKWARD not working for skulk or gorge.  Posted list of art fixes to forum.
+	? Add particle effect for commander hacking (not working properly yet)
+	O New alien sounds for "structure under attack", "resource tower under attack" and "lifeforms under attack" (a bit calmer, less grating)
+	O New and final hera
+		- All ladders should now be walkable on by skulks.
+		- New weldable into the back entrance to Data Core Delta, accessable from the seizure corridor. (Tell me if there's any speed problems there, although there shouldn't be.)
+		- New path from Maintenance to Processing. (Extention of the small corridor.) Level5s can only crawl through these corridors, mind.
+		- Archiving Hive now has a 2nd entrance on floor level, accessable with a welder.
+		- Marine Start Warehouse door can now be opened from the marine side, but only once the panel on the other side has been welded.
+		- Floor panels in the Holoroom are now solid.
+		- Marine Command Centre now very much protected, as you'll see. Commander can also build up there, although most of the floor is still invisible so he can see the area below.
+		- Replaced all momentary_doors with normal doors because I'm suspicious that they might not be working satisfactorily.  (I would recieve "found momentary_door 'labdoor03', firing." style messages constantly, for all the different doors.)
+		- Not sure if this is new or not, but the Data Core Delta resource node has been moved much nearer.
+		- Security Door welds have been cosmetically changed to fit in with the rest of the welds in the map.
+		- New door textures for marine start. Woo!
+		- Various tweaks here and there, as usual.
+
+	- **Print out and send in OLM credit card info (or cancel?)
+	- **Bills
+
+	O Deposits at bank
+	- Cancel BounceWEB and HostRocket
+		O Filled out trouble tickets for both
+		O Confirm HR
+		O Wrote back BounceWEB, trying to cancel
+		O Unleased MonsE on them
+		? Wait a bit longer
+
+	? Server crashes
+		? Minimap infinite loop
+		O On endgame with 20+ people
+			O Figure out how to repro...it's this overflow: "SZ_GetSpace: overflow without FSB_ALLOWOVERFLOW set on Server Reliable Datagram"
+				? Don't send sound names or map extents except on connect or map change
+				? Don't reset gamma on map reset
+				? Flag effective player class changes instead of sending redundant messages 
+				? Flag effective team changed and send once
+				? Removed carried resources update
+			
+				O MessageBegin:
+					- 74 -> UTIL_ShowMessage
+					- 82 -> gmsgScoreInfo (EffectivePlayerClassChanged)
+					- 83 -> gmsgTeamInfo (CHalfLifeTeamplay::ChangePlayerTeam)
+					- 95 -> screen fade
+	O Make sure gamma level message is supressed normally
+	O Added ns_authicons server var
+	O Fixed CD key problem when hosting NS on a LAN	(default variables weren't being set right, so sv_lan was 0)
+	O New countdown sound
+	O Custom muzzle flashes (rotate MG one by 90 degrees so it doesn't block small targets)
+	- Easter eggs
+		O "Now, we donce"
+		O "My hive"
+		O "I see dead people"
+		O "This place is a mess"
+		O "Need better players"
+		- "Not bad for a human"
+
+	O Fix skin color changing every time you spawn
+	O Fixed bug where muzzle flash played even when firing on empty
+	O Disabled useable and breakable icons, because I couldn't display them in a non-ugly fashion
+	O Fixed bug where sometimes two hives would support the same technology
+	O Removed ejected casings from grenade launcher
+	O Final tanith
+	O Removed skymap .bmps because software model isn't supported
+	O New heavy marine view models (thanks DefOne!)
+	O Players can no longer kill themselves with the "kill" command unless cheats are on
+	O Increased cost of observatory from 16 to 25
+	O Acid rocket energy cost increased from .2 to .26
+	O Update titles.txt with grammatical pass from Jeff
+	O Final pass at listenserver.cfg, server.cfg, user.scr and settings.scr
+	O Make inactive hives show up on hive sight
+	O Remove F1/F2 and F3 from shipping config.cfg 
+	O No longer draw "energy" or numeric data for alien energy
+	O Tooltips no longer intersect marine upgrades or alien energy
+	O Fixed up particle culling, should see better client performance and many less disappearing entities
+	? Move help text to client (CPU and network performance)
+	O Make player ID visible in ready room and spectator mode
+	O New eclipse
+		- Made a couple texture switches in accordance with the modified ns.wad
+		- -wadincluded ns_eclipse.wad (so don't include that file anymore)
+		- fixed a func_illusionary railing
+		- and made the doors to marine spawn reset quicker.
+	O Removed extra textures in wall_lab.wad to reduce download size (thanks KFS and Merks!)
+	O Reduced welder damage from 14 to 10
+	O Removed upgrade resource tower button
+	O Fixed bug where hive kept playing wound animation after it died
+	O Clean up heavy armor and jetpacks at the end of the round
+	O Fixed marines health circle when dead (used to draw fully sometimes)
+	O Recycled IP doesn't reset reinforcing player
+	O Change self-damage to 50%
+	O Removed builder scoring.  Score should be kills only (though commanders have a score equal to their average team score, rounded up).  Sorry MonsE, your reign of terror is over.  Builders now get points for their own turret kills.
+	O Spawning issues
+		O Make sure players spawn at random hive spot, so they can't be camped easiily, and also make sure the area isn't blocked by something
+		O Infantry portal and phase gate now kills any players too close to the respawning player
+	O Fixed blink effect playing multiple times
+	X Bug/exploit when joining team and hitting F4 at the same time
+		- Can't repro
+	O Dead aliens don't receive hive sight updates, maybe this will fix occasional alien/death overflow
+	O Fixed possible cause of last alien client crash
+	O Updated ns.wad has Cory's last texture
+	O Lowered build time for alien resource towers slightly
+	- New hera
+		- New ready room
+		- New weldables
+		- More marine-friendly
+	O Fixed bug where players could get more then one upgrade of each category
+	O Fixed acid rocket and bilebomb projectile orientation
+
+	? Possibly fixed progress indicators sometimes not visible
+	O Tweaked selection to make it easier/possible to select buildings when close together
+	O Fix shotgun weirdness when reloading and firing
+		O Playing idle animation in middle of reload causing hitch (it's doing this because the reload is happening server side, so mSpecialReload isn't set on the client)
+		O Faster reload
+		O Fixed bug where it refilled instantly sometimes
+	O Team resources label not visible when joining team
+	O Voting messages should now be sent properly
+	O New health/armor HUD sprites for low resolution, removed "CS" from an ammo sprite
+	O Revisit HUD in general, and layout everything properly (put all constants in one file)
+		O Move current commander text to left slightly
+		O Move commander text and resource labels up slightly
+		O Adjusted info location for low-res
+		O Move chat so it doesn't block resource text as alien
+		O Alien reticle help blocking "resources"
+		O Armor and health icons overlapping
+		O Move marine tooltip help to left, past these upgrades
+		O Only draw one damage and one armor upgrade, one jetpack/heavy upgrade, and align towards bottom (prevents collision with voice)
+		- Decrease font size for lower resolutions (#489)
+		- Test in all resolutions
+			Less then 640 - Tooltip font way too big, info location text isn't positioned properly, hive info icons and text crappy, weapon icons show snarks, crosshairs aren't the same, commander text and team resource text too low, icons for health and armor aren't updated
+
+RCX patch - Final gold
+----------------------
+O Fix for various marine HUD elements not showing up (team resources, etc.)
+O Doom, TommyD auth icons
+O Mines using p-model or something when held
+O Missing muzzle flash sprites
+O New version of caged with some wad changes and fixes for some messed up clipnodes near the sewer hive
+O If you join the readyroom while dead (f4) you spawn into the map, yet as a readyroom type player is still in.  I did it in hera, tonight.  You need to rejoin the server, to get to the RR again.
+O Binding for jetpack, not nuke
+O Remove disconcerting "unable to open commandmenu.txt" message
+O Find and fix telefragging issues
+O Added "auth" confirmation (ON/OFF message)
+? Gamma doesn't reset when quitting at console
+	- Only happens with VAC.  Wrote e-mail to ES and EJ, awaiting response
+O Added auth mask confirmation messages
+- Overflow with 22 players or so and a fair number of buildings (10 marines, 12 aliens I think)
+	- Only happens with real players, not bots
+	- Interesting fix: only propagate entities with non-team of 0 for players that aren't in the ready room?
+
+Make sure icons are right
+Created 3 shortcuts on my desktop that went away on their own after 2 mins
+Default music level should 200, should be 90
+
+O Fixed jetpacks and HA being able to be picked up by aliens
+O Increased Onos claw range so he can hit targets without crouching
+O Info locations aren't clearing/resetting properly always
+O See if I can get gamma resetting without atexit()
+O Removed donating text from friendly hive description
+O Fixed liblist.gam size
+O Umbra disappearing after a few seconds (I think this is the cull time!)
+- Rick Raymo (714) 227-2060  rick@ism-agency.com  "agent"
+- limelightmedia.com for quote format, send paragraph to Lani
+
+- Hive spawn problems (has to do with choosing random spawn at hive?)
+	- Sent e-mail to Relic
+- Death animations still not always playing
+- Phantom waypoints
+	"Could the waypoint bug be the order-completion bug?  I've noticed that when you order a marine to build a structure, completion of the structure sometimes causes the "build structure at waypoint" comm to be played again, rather than the "got it done" or another completion 	comm.  "Phantom" waypoints might be the same bug."
+- AddToFullPack server optimization
+
+
+	- Revisit building placement #2
+		O Allow hives to be attacked
+		- Make sure these items don't fall through world on slanted surfaces
+		- Merks' problem on slanted floors on hera
+
+	- Server optimizations
+		O Got remote access on Underworld, now wait for MSVC
+		O Setup MSVC and build process there
+		O Install TrueTime or other profiler
+		O Some server optimizations, not sure how effective yet (AddToFullPack)
+		- Linux performance
+			- AddToFullPack
+
+	http://www.natural-selection.org/protectdl/ns_playtest_installK.exe
+	webid: nsdl
+	web pass: j0ystick
+	installer pass: g0neg0ld
+	server pass: hallow33n
+
+	- Getting stuck while blinking
+	- Building alien structures in vents going through the world
+	- Building alien structures on self
+	- Unable to build upgrade chamber bug (#423)
+		O Can't repro
+	- Look at hitboxes
+		- Level 5 needs to crouch to hit
+		- Level 5 not doing damage when not crouched
+		- Crouched players in vents not taking damage
+
+	- Moving backwards while firing spit/rocket/spikes causes it to hit yourself
+	- Building structures and getting stuck in them
+	- Fix broken gun animation after exiting command station until next deploy
+	- Optimize hive sight messages to possibly fix overflows
+	- Can't bind CAPSLOCK in out of game UI
+	- Upgrade status bars?
+	- Paul Drew "SolarCurve" -> 972-691-3739
+
+NS v1.01
+--------
+	O Moved all gameplay constants into server code, so economy and balance will be identical on all servers
+	O Added auto team-balance: you are not allowed to join a team if joining it would give that team more then 2 players more then the other team.
+	O Increased server performance by 20-30% (should result in slightly less lag, more changes coming here)
+	O Dropped health and ammo packs now expire after 30 seconds
+	O Sentry cost increased from 16 to 19
+	O Sentries and siege turrets now need a functioning factory to stay operational.  They will power down and become inactive there are no factories nearby.  If a new factory is built nearby, they will power back up.
+	O Offensive chamber health increased from 1100 to 1200
+	O Lessened siege damage from 350 to 330
+	O Acid rocket rate of fire increased from .66 to 1.0 (shots per second)
+	O Increased fade armor from to 90/125 to 125/150
+	O Increased acid rocket damage from 50 to 60
+	O Increased base speed of fade from 210 to 240
+	O Changed regeneration upgrade from fixed number to percentage of alien max health.  Alien also emits regen sound when healing.
+	O Grenade damage reduced from 200 to 180 (still does blast damage), clip size reduced to 4, rate of fire decreased slightly
+	O Increased research time for heavy armor from 80 to 100
+	O Increased HMG cost from 23 to 25
+	O Increased grenade launcher cost from 27 to 33
+	O Increased cost of heavy armor from 20 to 25
+	O Lower cost for offensive chambers from 16 to 14, and build time from 40 to 30
+	O Friendly fire now does 33% damage instead of full damage (tournament mode only)
+	O Lessened HMG damage from 20 to 18
+	O Numeric indicator at resource towers now shows how many actual resources were contributed to your team (minimum 1)
+
+NS v1.02
+--------
+	O Fixed bug where parasite could hurt own team
+	O Fixed bug which allowed players to damage their own structures with gunfire
+	O Updated code to be more compatible with Adminmod under win32 (dynamic cast issues).  It may still not work under some configurations and work continues on it.
+	O Enhanced hive sight changed so it's useful at upgrade levels 1 and 2
+	O Updated NS to use the HL standard logging specification for server ops and for PsychoStats compatibility (http://www.hlstats.org/logs).  More work may be needed for better Psychostats compatibility.
+	O Removed draw numeric damage events
+	O Sighted buildings no longer show in hive sight (still show up with parasite, but prevents flood when alien views heavily populated area)
+	O Fixed exploit where +using a building could speed up research of a technology
+	O Preserve health and armor percentages when evolving
+	O Don't allow gorge to heal buildings before they are built
+	O Reduced chance of server overflow (crash) when large games (24+ players) end
+	O Fixed marine armor upgrades (previously, researching armor upgrades wouldn't give you that armor unless you were welded first)
+	O Added mp_logdetail (0-3)
+	O Changed the alien ability anti-exploit code to try to co-exist with scripters
+	O Turned off team-balance when in tourny mode
+	O Renamed ns_authicons to mp_authicons, renamed ns_eastereggchance to mp_eastereggchance for consistency
+	O Defensive chambers now only heal up to three nearby buildings or players per tick (prevents undestructible Walls of Lame).  Targets are chosen randomly.
+	O Cleanup babblers on game reset
+	O Built with compiler optimizations (linux)
+	O Spectators now hear spectators, their observer target and teammates of their observer target
+	O Networking changes that could result in CPU performance improvements (instead of tracking, storing and queuing network messages, they are sent immediately)
+	O All players can all hear all other players talking before countdown starts
+	O Tournament mode start changes to make it easier to coordinate and start a game.  It will only start when players are on both teams, when the teams are equal, and when both teams have said they are ready. A team is ready when one member of their team says "team x ready" (case not important, x is 1 or 2).
+	O Spectators get end-game victory sound and message
+
+Please make sure to put "1.02" somewhere in your server name so players know if you've updated.  The patch is 1.8 megabytes and contains both the linux and win32 versions.<br>
+
+	dlls/ns.dll
+	dlls/ns_i386.so
+	listenserver.cfg
+	server.cfg
+	skill.cfg (needed to include v1.01)
+	dedvars.cfg (needed to include v1.01)
+
+Performance:
+------------
+	O Revert to old AddToFullPack, but use new caching
+		O Didn't work (but performance was still good)
+	O Update SetupVisibility to cache at same rate as AddToFullPack
+	X Check client to make sure it has the same data as server
+	- Try removing network buffering as next/final big optimization
+
+NS v1.03
+--------
+	O Fix mail/Netflix problem
+	O Visit Zach, Iron Lore with Chris and Chad
+	O Groceries
+	O Bills (Friday)
+	O Laundry (Friday)
+	O Pack summer clothes, unpack winter clothes
+	O Cancel Bounceweb crap (Friday)
+	O Jump car (Friday)
+	O Stamps (Saturday)
+	O Figure out what to repair on car (Weekend)
+	O Fixed Adminmod compatibility problems.  It should work great now under all configurations.  Let me know if you're still having crashes.
+	O Added mp_version variable for better filtering with All-Seeing Eye and other third-party programs and scripts.
+	O Changed siege cost from 15 to 25 (this was a typo, not meant to be a balance change).
+	O Changed team join to not allow teams to have more then 1 player difference. Affects casual model only.
+	O Fixed readyroom bug/exploit while spectating (hitting F4 while REIN made you an invulnerable "ghost" player that could confuse others).
+	O Added support for model and sound consistency checking.  If you run your server with mp_consistency 1 (the default), it will require that all NS models and sounds are unchanged from the distribution.  This allows servers to disable custom models or sounds, and exploits that can result from them.
+	O Fixed infinite cloaking bug (occured when last sensory chamber lost while player was cloaked).
+	O Addressed alien leave/join resource exploit (joining a team you've already been on makes the player wait to respawn, as if he had been killed).
+	O Addressed early team-switch exploit to find hive (you can no longer switch teams after playing or observing).
+	O Aliens now lose health when all their hives are gone (damages every 2 seconds, all players hear countdown, ignores armor).  This is done to speed up the end game and prevent llamas from hiding in vents to prolong game.  If at least one hive is growing, players won't be damaged.
+	O Fixed various problems when building turrets, mines, offensive chambers, etc. then team-switching.
+	O Fixed explosion bug!  Siege, bilebombs, grenades and xenocide weren't doing damage properly.  Now they do.  Goodbye, farms of all kinds.
+	O Moved mp_drawinvisibleentities to debug builds only.
+	O Fixed mp_timelimit problems (I think, please test)
+	O Fixed Onos charging crash bug (I think, please test by playing with lots of Oni)
+	O Reduced knife range from 50 to 35 (not balance, this was a bug).
+	O Fixed melee weapon problems in vents (I think, please test)
+	O Fixed lastinv command.  Players can now bind a key to this (even though their menu will say it's not implemented).
+	O Fixed bug where players did friendly fire damage to some world objects (ie, doing 33% instead of 100% to doors and switches).
+	O Fixed turret factory abuse, where turrets became active after recycling the nearby turret factory before turret was fully contructed.
+	O Fixed bug where siege turrets became re-activated after building a regular turret factory nearby.
+	O Default mp_timelimit is now 60 (even for listen server).
+	O A team now automatically wins if they have 5 or more players then another team (generally because the losing team starts quitting).  Affects casual mode only.
+	O Fixed bug where a vote could affect a commander that logged in after a vote had been started.	
+	O Fixed armor bug where carapace protected aliens even after all armor was gone
+	O Fixed bug where gorges evolving upgrades (usually temporarily) lost resources above the hive maximum.  It will still count down to 33, but will immediately count back up to your resource count (this is just a visual problem on the client).
+	O Fixed timelimit bug (broken in 1.03b)
+	O Make sure current health and armor percentages are preserved when evolving
+	O When the alien team no longer has any growing or active hives, all aliens slowly take damage. This is done to speed up the end game and prevent hiding llamas.
+	O Include shells.mdl (should fix consistency errors that were preventing players from joining server)
+
+	- Adminmod and SQL patch
+
+	- Commander PAS issues
+	- Webstrand/vision-mode bug
+	- Aliens being stuck in structures
+	- Marines being stuck in structures
+	- Fix weird circle on advanced armory
+	- Entities not being cleaned up totally on a map reset?
+	- Evolve to skulk while stuck under lift on nothing causes server crash (?)
+	- Server op command to kick the commander?
+	- Marine building limit like aliens
+	- Load bast, weld the vent, then break it, and start a new round. The weld will be inoperably stuck at broken. Ditto for the lights, as I recall.
+	- Game start problems (with no players or 1 player)
+	- Remove mp_networkrate variable?
+	- Logging issues
+		- ** Psychostats fixes, everything he mentioned **
+		- There exists a logging bug, where all kills are being logged twice.
+		L 11/17/2002 - 15:14:04: "[DSSGR]Bubbabooye<548><2398808><marine1team>" 
+		killed "El Beeno<546><2852477><alien1team>" with "heavymachinegun"
+		L 11/17/2002 - 15:14:04: "[DSSGR]Bubbabooye<548><2398808><marine1team>" 
+		killed "El Beeno<546><2852477><alien1team>" with "heavymachinegun"
+		Its for every kill from what I can tell.  
+
+		- Also, its not logging player ID's properly.  As you can see the player ID is 548 where as my server can only handle up to a max of 24 playerid's at this point, so there is a secondary bug which is elevating the playerId's instead of rolling over and taking empty slots.
+
+	- Files
+		server.cfg
+		listenserver.cfg
+		models/alien2/alien2.mdl
+		models/alien1/alien1.mdl
+		models/alien5/alien5.mdl
+		models/shell.mdl
+
+	- Interviews
+		- Sebastian Pech interview (Tomas "samot" Hansson)
+		- Fragbite interview
+		- Lan-Z Chile interview
+		- Investigate Linux core dump crash (from Funka!)
+		- Half-life.nu interview (from Namron)
+		- Ozgn interview
+
+v1.04
+-----
+	O Fixed "stopcommandermode" exploit (allowed aliens to look like marines and fire marine weaponry)
+	O Changed max machine gun ammo to 250 (used to be 300, though it would only display 250)
+	O Fixed commander weapon exploit (using inventory commands).  Weapon commands in general (drop, switch, last) won't work for commanders.  This can no longer be exploited by building near the command station as well.
+	O 3rd party entities are never propagated to client (ie, adminmod_ entities).  This could fix an occasional crash (thanks Alfred)
+	O Moved auto-concession on unfair teams into server variable (mp_autoconcede: if set to greater then 0, then if teams are ever different by this many players, that smaller team loses immediately)
+	O Dead players can now talk to their teammates in both casual and tourny mode (needed to prevent team from getting an advantage by using external voice program in CAL)
+	O Fixed problem where ammo could be picked up while holding mines
+	O Aliens without any hives no longer take damage when the server is in tournament mode
+	O Add more triggers (for Psychostats and 3rd party program support)
+		O Added "player built x" (for commander and aliens)
+		O Added "recycled x"
+		O Added "started research x"
+		O Added "cancelled research x"
+		O Update to use StormTrooper's recent notes
+	O Fixed visual problem where advanced armory had weird build circle
+	O Reduced radius of acid rocket splash from 200 to 165
+	O Alien respawn time reduced from 10 to 8
+	O Reduced shotgun cost from 20 to 16
+	O Reduced welder damage from 10 to 7
+	O Armory can now give out ammo while upgrading to advanced armory
+	O Increased cost of infantry portal from 15 to 22
+	O Increased cost of phase gate from 20 to 25
+	O Decreased health of phase gate from 3500 to 2000
+	O Increased scan cost from 1 to 3
+	O Umbra now blocks 3 out of 4 bullets instead of 6 out of 7 (86% -> 75%)
+	O Arms lab reduced from 50 to 45 points
+	O Reduced siege cannon range from 1250 to 1100 
+		NOTES:
+			- The green circle that appears when the siege cannon is selected by the commander is using the old range, but this will be fixed in v1.1.
+			- This is the value siege range was for most of our internal playtesting (hence the bast and hera issues that suddenly arrived with v1.0)
+	O Siege cannon targets now must be sighted to be hit (in view of friendly player or scanned by commander)
+	O Hives now spawn with full health instead of having to heal up to full health on spawn
+	? Fix bug where advanced turret factories don't have full health
+	? Acid rocket showing damage icon when not taking damage?  Range working right?
+	O The advanced armory now has 2400 health instead of 1500 (same as regular armory, this is a fixed bug, not a balance change)
+	O Fixed bug where tournament mode caused some damage to be reduced more then it should be (acid rocket vs. any alien structures)
+	O Fixed bug where hive would sometimes play wound sound/animation when it got hit but didn't take damage
+	O Removed lingering "organic" damage type for acid rocket and spore cloud (fixes bug where acid rocket wasn't doing damage properly to organic structures)
+	O Aliens donate only half their points back to their team resource pool when they leave the team (less exploitable, but this will be revisited in v1.1)
+	O Fixed non-visible motion sensor and proximity "blips" (linux only)
+	O Defense chambers no longer heal themselves
+	O Removed gibbing of corpses (off by default, but some servers had enabled it).  This means death animations always play, so no more disappearing models when using high-powered weapons.
+	O Alien health circles seen by gorge now take armor into account (so gorge knows when player is fully healed)
+	O Morphing resets your health again (preserves percentage of armor when evolving carapace too)
+	O Fixed logging bug where model name was reported instead of team name for say and and say_team
+	O Fixed problem where aliens could gain resources by joining and leaving the team repeatedly (also caused problems by "carrying over" resources from one game to the next).  Now if an alien leaves the team, half his points go back into the pool, and half are lost.  This is a compromise and may need to be revisited.
+	O When hive is constructed, have it check to see if technology should be supported automatically (exploit for getting extra upgrades after a hive is killed and rebuilt)
+	O Observers can hear other observers and players on the screen, and can chat with each other
+	O Fixed various problems with holding mines while building or using command station
+	O Changed cloaking so it deactivates when a player moves faster then a certain speed, fixing an exploit.  Moving very slowly should allow an alien to remain cloaked.
+	O Added "highdamage" cheat for testing (sv_cheats must be 1, all damage is x100 vs. buildings, x10 vs. players)
+	O Added "slowresearch" cheat for testing (sv_cheats must be 1, research takes full time instead of normal 2 seconds when cheats are on)
+	O Phase gates now must be +used instead of just touched (less frustrating when trying to attack them or fight nearby)
+	O Don't play "select your troops, and give them orders" commander hint if you have no other players on your team
+	O Grenades and mines are now affected by arms lab damage upgrades (this will make grenades and mines more powerful when upgraded, but the damage values of these weapons haven't been touched)
+	O Fixed exploit where multiple upgrades from the same category could be purchased by jamming hotkeys (thanks localhost!)
+	O Fixed bug where trying to exploit alien abilities could crash the server
+	O Fixed bug where server name wasn't displayed on scoreboard
+	O Reduced "intermission" time after game ends before mp_timelimit is checked.  Disabled mp_timelimit map-switching for tournament mode.
+
+	O Put in 2 second wait time for phase gates so you aren't phased immediately (also changed similar functionality for movement chamber to 2 seconds instead of 3)
+	O Phase gates now only play their effects (particles, sound, light) when there another active phase gate (so a player can look at a phase gate and know if he can go through it)
+	? Fixed end-game server crash for large games
+	O Fixed rounding errors for level 3 arms lab upgrades for marine weaponry (thanks Kitsune and Comprox!)
+	O Fixed bug where babbler and xenocide damage wasn't being applied properly (babbler damage was halved, xenocide wasn't doing blast damage)
+	O Fixed bug where laser-style mines sometimes wouldn't go off when touching the base
+	X Re-enabled siege minimum range (10% of range, )
+	O Turret factory cost reduced from 25 to 20
+	O Siege turret cost reduced from 25 to 20
+	O Lerk spike damage increased from 16 to 18 (big lerk changes coming in v1.1, this is a hold-over)
+	? Fixed problem where dead players can sometimes hear spectator or enemy team voice comm
+	O Fixed problem where mines sometimes blow up on their own for no apparent reason after they are placed
+		- Introduced new problem where they don't blow up when their are on entities that start to move
+		- Mines shouldn't blow each other up or hurt their own team in any way
+	O Added "detectall" cheat for testing motion-tracking and marine blips
+	O All entities can hurt themselves (allows 1-hive alien team to battle siege)
+	O Allow siege turrets to see targets themselves (no spotter needed if in sight of the turret)
+
+	O Fix problem where killing a phase gate doesn't turn off it's ambient sound
+	O Tweaked armories to refill your primary ammo supply before your clip
+	O Stats changes for Stormtrooper - Changed role change
+	X Stats changes for Stormtrooper - Add research_end or research_finished
+	O Stats changes for Stormtrooper - Added structure_destroyed
+	O Stats changes for Stormtrooper - Added structure_built for hives
+	O Send Stormtrooper log of with full technology on both sides
+	O Fade cost increased from 44 to 54
+	O Movement chambers now teleport to aliens to a hive that's under attack, or the farthest active hive if none are under attack.
+	O Carapace now slowly gives out extra armor points with upgrade level, instead of giving it out all at once.  For example, a skulk with 0/1/2/3 carapaces has armor of 10/16/22/30.  All other properties of carapace remain the same.
+	O Regeneration upgrade now heals approximately twice as fast
+	O Redemption increased in effectiveness slightly
+	O Hive now heals nearby players faster in effort to allow aliens better chance to hold off early marine rush (20 points per second instead of 8)
+	O Added ability for guides to send hint tooltips to individual players
+	O Cloaking changed so higher levels make it faster to cloak.  All levels now make the alien equally invisible (not quite invisible, but very close)
+	O 2nd hive building bug (problem with -O2)
+	- Fix problem where you can't see enemies as commander under linux (again)
+	- The siege guns sometimes just decide NOT TO FIRE when they're in complete line of sight
+	- Introduce variable hive respawn time for larger team sizes
+	O A webbed marine can hop in the CC, and his gun will come come up, allowing him to shoot
+	X A marine who is building, can hop in the CC before his gun is up, and shoot
+	O Grenades not hurting the firer, grenade damage sounds low
+	- Pistol rate of fire (script abuse)
+		/////Jump/Bite Script -- By Rat
+		echo Bite Jump Loaded.
+		alias bjump "+jump; +attack; wait; -jump; -attack; wait; +jump; +attack; 
+		wait; -jump; -attack; wait;"
+		alias bjumpoff "bind space +jump"
+		alias bjumpon "bind space bjump"
+		alias p3 "bjumpon; developer 1; echo Bite Jump Activated!; developer 0; bind 
+		v p4"
+		alias p4 "bjumpoff; developer 1; echo Bite Jump Disabled!; developer 0; bind 
+		v p3"
+		bind space p3
+
+	- Siege idle/targetting issues (http://www.natural-selection.org/forums/index.php?act=ST&f=1&t=19635&s=1676545791a8627fbb9a9937692e7de6)
+	O Increased delay on phase gates so a player can only use one every 2 seconds (reduces chance of telefrag exploit)
+	O Test alien impulses (make sure they don't crash server)
+	O Fixed bug where hive death animation kept looping after hive was dead
+	O 1 bullet to kill hive bug (win)
+	O Fixed all problems with motion-tracking and visibility under linux
+		O Search code for other problems with this (AddToFullPack has some but there are no problems there yet)
+		? Make sure hives have 0 velocity
+	O Fixed bug where offensive chambers hurt themselves when firing in tourny mode
+	O Fixed turret factory upgrade problem (where factory had to be +used after upgrade before siege could be built)
+	O Tweaked animation for upgraded turret factory and armory
+	O Reverted armory resupply change due to reloading weirdness (and it didn't really fix the problem)
+	X Reset crash under linux with Adminmod
+	O Players are allowed to join teams freely in tournament mode
+	- Add r_drawviewmodel enforcing
+
+	O Write Jay Patel
+	O Feedback on Jeff's resume
+		- Write to GDP mailing list
+	- Decide on NCsoft interview
+	- Write arena.net again
+	- Call Ned 9pm EST
+
+	- Consider adding ability for aliens to donate to other aliens or to the hive (and doing so marks them as not getting resources for a minute or so?)
+	- Give all aliens 33 resources to start?
+
+	- Send quote to Lani
+	- Fix bug where countdown sound was heard from readyroom after a game ended
+	- Permacloak exploit:
+		Bind a button to +strafe (say it was alt)
+		Get cloak and wait for 3 sensory chambers
+		Stand still until you cloak
+		Hold the bound button and move around with your mouse
+	? Intermittent server crash with 20+ players on end-game (reset half players, wait, then the other half)
+	O Maps not changing anymore?  Linux only?
+	X Glitch where linux build said v1.03 instead of v1.04
+	- Dual logging bug?
+
+	- Using readyroom bug to run around as godmode player and harass people and block doorways
+	- Limit mines (200+ causes server to crash?  Just too many entities?)
+	X Mines can now be blown up if they take enough damage
+	X Mines blowing up after they become armed (I think they're touching a world entity?)
+	- Increase lerk spike damage and decide on role vs. buildings (maybe it should do blast damage?)
+	X If you upgrade a turret factory & it gets destroyed then you cannot upgrade any other turret factories for the rest of the game.
+		- Adv. turret factory bug?
+			<Grendel> JarHedz is working perfectly except for this:
+			<Grendel> After upgrading Turret Fac to Advanced TFac, you then need to rebuild it.
+			<Grendel> Was a bug in about RC4 or 5.
+	- Remove building stacking for both sides
+	- Fix getting stuck in alien resource towers
+	- Rework welds
+		- Resetting
+		- Taking damage
+		- Parasite and spit killing them? (bast weld near airlock)
+	X Chat text flooding to crash server (couldn't repro)
+
+	Linux stuff
+	O Update linux code to use GCC (talk to Joev)
+	- Test tournament mode and no-hive countdown under linux (forgot to check it in I think)
+	O Blips under Linux don't work (motion-tracking and commander mode blips, also commander mode aliens)
+	O Make sure motion-tracking is still working and working properly (linux)
+	- Server crash from Josh Beeler (11/27 core dump) (linux)
+
+NS v1.1
+-------
+	Balance, playability, depth
+	- Address issues in Eats' write-up
+	- Make lerk nastier with one hive (spike damage, lessen flight energy?) or change him to support only
+	- Tighten HMG cone to make better vs. ranged fades/oni and harder to respond to skulk chomping on leg
+	- Possible energy change: allow energy to come back much faster (2x?) when standing still (to reduce annoying chomp-on-stationary-thing syndrome, to speed up fades/lerks vs. buildings)
+	- Reduce initial marine points by making them scale? (makes early game aliens more equal)
+	- Address problem where more gorges == slower growth (non-intuitive): More gorges should increase alien growth speed (increases value of scouting and probing heavily, means less waiting and problems for newbie aliens, gives more interesting configurations and builds for aliens)
+		- This may very well allow the removal of the 33/66/100 limit for each hive too!
+		- Experiment with larger starting resources for aliens and slightly slower growth, so they have more options to start and less overall waiting
+		- Make changes to allow earlier hives but with less resources coming in (right now it's not really viable...perhaps making 1-hive lerk viable will change this)
+		- Allow resources to run out (need some kind of alert for gorges at least though)
+		- Starting resources problem where it doesn't scale properly for all games (100 vs. 10 per player)
+	- Make resources run out (balances multiple gorges, means marines can't play the turret and wait game) (add "resources running low" alert for both sides)
+	- Consider adding a "phase gate tech" upgrade on observatory that's required for phase gates
+	- Consider changing scanner sweeps to only be used every so often (would promote building multiples as well)
+	- Change map guidelines and tell mappers not to place hives/CC such that they can be attacked from outside the room or from an easily defended remote location (ns_nothing)
+	- Aliens hitting F4 or reconnecting to return resources to team (still present, or resolved with balance changes?)
+	- Remove nuke binding in config
+	- Change OCs to shoot spikes instead of spit
+	O Add new graphic effect for when alien structures are killed
+	- Make multiple observatories viable
+	- Increase range on observatory so they can be forward built when sensory chamber is detected (may have to decrease cost for it though, and add the phase gate research instead)
+	- Make multiple armories viable (only two people can re-arm at a time or too annoying?)
+	- Check/draw scanner range to make sure it feels right
+	O Tweaked alien field of view for immersiveness (skulk and gorge can see slightly more, onos can see slightly less).  This was in the game for a long time, but was removed when attempting to support software.
+	- Make orders expire properly
+	? <EdL|plex> you should knock out ex_ commands in the next release
+	- Little green bars on weapon HUD icons don't show max ammo right for MG (probably others too)
+	- Draw weapon pickup icons for marines
+	- Alien upgrade adjustments to make non-defense viable in early game
+		- Replace Scent of Fear with "Danger sense".  Any enemy players within range of a player show up on hive sight (as if they were parasited).  Each level increases range.
+		- Movement chambers move you to random hive under attack.  If none are under attack, it moves you to farthest hive or hive site (including unbuilt hives).  If you are near a hive that's under attack when using it, it won't teleport you there?
+		- Make all alien structures slowly regenerate so def chambers aren't used everywhere
+		- Increase regeneration upgrade speed to make more viable
+		- Silence upgrade quiets attacking and drop-from-ceiling sounds
+		- Change all levels of cloaking to make you just as invisible, but each level decreases the time it takes to activate cloaking
+		- Allow sensory chambers to parasite marines in sight (like a turret?).  Make it sound like a skulk parasiting you so marines don't immediately look for it (make ROF quite slow and variable so not everyone is 'sited and not regularly).  Or allow sensory chambers to cloak on their own, and cloak nearby players?!  Remove "incoming enemies" sound.
+		- Verify that cloaked aliens aren't showing up on proxmity for marines (only with scan)
+		- Revisit attacking while cloaked (if attack mainly does damage, it should uncloak, otherwise it shouldn't?)  Perhaps reduce energy cost for parasite so cloaked skulks can hold off one or two LMGers
+		O Tone down carapace a tad
+		- Add effect for when redemption kicks in (both on vanishing and reappearing...add for movement chambers also?  Make same as blink?)
+				pparams->vieworg 
+
+	- Make team limit option toggleable for v1.1
+	- Add sv_restartround, mp_teamlimit, timeleft (http://www.natural-selection.org/forums/index.php?act=ST&f=8&t=13081&hl=restart&s=97f3f757a04b563108dba0cb5acd3729)
+
+	- mpw@idkconsulting.com (Matt/Dextrous/Brit that called me)
+
+	- Test out removal of alien upgrade limit (they are all always buildable)
+
+	x Put pictures next to each download on n-s.org
+	O Post Jeff's resume
+	O Make announcement to mailing list
+	O Call Gavin
+	O Write Erik about NS on Steam
+	O Call Mom tonight
+	- Call Jeremy
+	- Launch Constellation program
+		O Write Mike for web site update
+		O Write Relic25 for new icon
+		- Write Mike again
+
+	- Move to HLSDK 2.3
+		O Support for sv_alltalk
+		- Mouse issues
+			O Muting
+			O Spectating
+			- Particle editing
+				- Bringing up scoreboard while commanding makes mouse disappear forever
+		- Fix player muting
+			? Make sure only one player is banned when clicked
+			- Make sure commander can mute
+		? Topdown camera transform not being used in cl_dlls/view.cpp
+			? Acceleration
+			? Mouse and ghost building aren't aligned
+		- "spectate" command is now used in dlls/client.cpp
+		- ShowMenu duplicated in dlls/client.cpp and somewhere else?
+		- Motd.txt -> motdfile (dlls/multiplaygamerules.cpp)
+		- gmsgSpectator removed
+		- Get rid of choose team menu when spectating
+		X remove dlls/observer.cpp from project
+		O remove schedule.cpp, scientist.cpp, scripted.cpp, scripted.h, squad.h, squadmonster.h, stats.cpp, talkmonster.cpp, tempmonster.cpp, 
+		? Address Host_Say -> IsObserver() stuff in dlls/client.cpp
+		? Observer visibility in SetupVisibility in client.cpp and CanPlayerHearPlayer (search for m_hObserverTarget everywhere)
+		- Authids are now strings, talk with Joev and fix GetAuthenticationMask and GetServerPlayerData
+		- Sequence out of bounds errors when spectating
+		- Missing titles when spectating
+		- Ladder problems
+
+	- HLTV support
+		O Add constants: #Spec_duck, #SPECT_OPTIONS, #SpecMode5Text, #OBS_MAP_FREE, #OBS_MAP_CHASE, #OBS_CHASE_FREE, #OBS_IN_EYE, #OBS_ROAMING
+		O No entities are visible
+			O Verify FL_PROXY set and HLTV proxy getting everything
+			O Could it be that bots aren't being propagated?  But no entities are drawing either...
+				O Verify that entities are still working properly normally after SDK switch
+			O Fixed
+		O Fix: icons draw below map
+		O Make icons work when spectating after death
+		O Add Spect_map constant
+		? Put in spectating rules on server (can't view other team, limit modes)
+		O Draw view model for first-person mode
+			O Being set, but for some reason it's not being drawn.  Where is it drawn normally?  From the engine?
+			O Integrate fade view models so this will work
+		- Get mouse clicking working
+			- has to do with toggleditps I'm sure
+		O Add health, armor and hud color to first-person perspective
+			O Decide way to draw it such that it doesn't overlap letterbox
+		? Add hive sight, motion-tracking, and alerts to spectator view
+			- Get sprite drawing when third-person chase enabled
+		- Don't draw view model when dead, also fade out player?
+		? Add reload anims (and precise idle anims, and get clean up AvHEvents by not having to know about specific predicted weapons!)
+		? Add deploy animations too!
+		? Don't draw "no commander" when in observing
+		? Don't target player we're observing when doing player trace
+
+	- Rework alien upgrades and tech
+		- Don't make defensive so powerful
+			? Improve hive regeneration speed so def not needed (improved by 50%)
+			- Counter by mobility? (one obs, phase gates, or siege)
+
+		- Sensory changes
+			? Sensory chamber cloaks all structures and players nearby, if they don't move or attack
+			? When cloaked structures fire or activate, they become uncloaked.  Players can move freely while cloaked, but attacking will break it.
+			? Fade structures in and out smoothly
+			? Cloaked structures are essentially invisible for enemies, but faded out for friends
+			? Touching or scanning a cloaked structure will uncloak it (sensory on touch)
+			? Sensory chambers themselves are always cloaked 
+			? Cloaking or uncloaking structures don't make sounds like cloaking/uncloaking players
+			? Even cloaks the hive and resource towers!
+			- Spawning players should spawn in cloaked if in range of sensory to fight spawn camping?
+			- Remove "incoming enemies"
+			? Don't draw rings or help text for cloaked structures
+
+			? Change other two abilities
+				? Scent of fear should detect players that are nearby
+				? Enhanced sight -> Pheromones
+
+			- Counter with observatory (or multiples), scanning, motion-tracking
+
+		- Improve movement upgrades
+			? Increase speed boost from celerity upgrade (by 40%)
+			? Change silence so attacks are silent too
+				? Building sounds should take it into account also
+			- Maybe increase adrenaline recovery in range of movement chambers
+
+			- Counter with higher damage, more powerful weapons
+
+		O Remove hive requirement for higher lifeforms
+
+	O Bringing up scoreboard moves minimap away
+	? Clear spores on game reset
+	? Change armory resupply code back the way it was
+	? Typing "give item_health" now works right (health can be picked up by all marines, regardless of team)
+	? Updated LMG model to obscure the screen less.  It has been moved down and the muzzle flash has been shrunk
+	? Updated the skulk view model so it doesn't obscure the screen as much when biting.  It now bites twice as fast.
+	- Fix alien-vision mode web bug (I bet it's client-side now that I think about it)
+	- Fix bug where you can be redeemed and then die
+	- Think about moving primal scream to lerk
+		- Increase frequency of sounds when in primal scream
+
+	O Announce NSR interview
+	O Meet on IRC noon or before
+	O Added more "acknowledged" sounds for soldiers
+
+	O Announce v1.1 deadline on mapping forum
+	- Address pistol rate of fire/scripting
+
+	O Big entity optimizations (removing all spawns)
+
+	- Map entity counts (numents) (after map optimzations, info_locations and spawn optimizations)
+		- new tanith		251		282 (?)
+		- ns_shaft_b1		281		171
+		- ns_lost			312		196
+		- ns_veil			330		232
+		- ns_atomicmass		342		234
+		- ns_caged_1_1		355		260
+		- New eclipse		384		264
+		- ns_nancy			386		293
+		- ns_kt214			390		281
+		- ns_delta			391		
+		- ns_cilrais_1229	473		346
+		- (old) ns_nothing	476		347
+		- new ns_bast		553		433
+		- (old) ns_caged	636		
+		- ns_hera			723		616
+		- ns_fenris			757		363
+
+	O Write Grendel with map feedback
+	O Call Phiroze to confirm flight plans
+	O Mail portfolio and Netflix
+	O Grocery shopping
+	O Move car during storm
+
+	- Rules
+		- Opposing tier one higher needs to have hard counter (cheaper, as easy to execute or easier)
+		- Like tiers should be competitive (like skill, like points)
+		- Opposing higher tiers can also enhance lower tiers to make competitive units no longer competitive (primal scream could make HMGs/siege fall, or tier-2 spores could work against scaled groups of tier-1 marines)
+		- Assuming equal resources, skill and scouting, both sides should be able to get to the same tiers in the same amount of time
+		- Tech tree changes: 
+			O Inf portal no longer required for anything (iron man!)
+			O Phase gates need research at observatory
+			O Scanning needs research at observatory (same as phase?)
+			- Prototype lab needs advanced armory
+			O Small upgrade for deployable health required at command center
+			- Each observatory capable of one scan every x seconds, once researched
+			- Siege tech researched, then siege can be built at any turret factory (?)
+			- Time/cost for jetpack/HA research increased to make it tier 3
+			- Only advanced armory and advanced proto lab can build advanced stuff (unlike siege).  This way they can be destroyed to knock stuff out of production for awhile.
+			- Hives need to be cheaper to make it easier for aliens to get them earlier, and to allow aliens a choice of build order (though maybe extra resources at start compensate)
+			O Add electrical upgrade for TFs and nodes to prevent lone skulk from taking them out.
+			- Increase cost of advanced armory, decrease weapons cost?
+			- Healing spray should be able to corrode welds after a time
+			- Think about hotkeys to make sure they work with this new model (they do)
+			- Now that games are shorter, resource nodes may need to be more expensive (?)
+			- ** Alien lifeforms are unchained from hives, to compensate from location-dependence of alien tech tree.  Notably, this means a tier-1 onos (though hard to get), could counter tier-2 marine tech (HMGs) and maybe be competitive with tier-3 marine tech
+			- Remove blast damage on xenocide, possibly change damage, possibly change energy requirement and countdown time to make it good vs. HMGs
+			- Maybe jetpacks need to slowly heal armor/health automatically to give them a chance vs. acid
+			O Movement chambers give energy instead of teleport
+			O Bile bomb doesn't damage players ("structural damage")...is this going to feel weird?
+			O Remove spike gun
+			O Change OCs to fire spikes
+			- New Onos movement physics?
+		- This should work for marine/marine and alien/alien too
+		- Bite, parasite, leap (?), xenocide (?) (currently, skulks just get better, they don't really counter anything, though late-game zerglings do the same)
+		- Spit (tweak to make more useful or interesting?  Slow enemy?), healing spray, bile bomb substitute, web
+			- Bilebomb changed to be slower and non-parabolical
+		- Bite2, spores (weaker, as support role), umbra, primal scream (ROF slightly, damage upgrades, all affected immediately make squealing noises)
+		- Swipe, blink, hive-teleport (or teleport to blip under attack?  Rejuvenate, to get health/energy back?  Launch moth from cannon that flies attacks and distracts targets?  Ability converts health to energy <"digest", "expend", "deplete", "amplify", "heighten", "guzzle">?), acid rocket
+		- Gore, Stomp, Devour, Charge
+			- Devour
+				O Knocks person out of combat for a bit while they're digested, though they appear again if Onos dies
+				O Show "Being digested..."
+				O Change sound effects while inside
+				O Make screen go black, change HUD
+				O Show "Devouring MonsieurEvil" with status bar
+				- Progress bar is 0
+				O Aiming issues
+				- View model issues (wait for new view model to fix)
+
+			- Stomp 
+				- Enemies on ground within radius get view shaken hard, can't move or fire for short time
+
+		O New research tech/icons
+			? Deployable health tech (use medlab icon)
+			? Phase tech (needed for both phase and scanning)
+			? Electrical defense
+			? Don't show upgrades that can be researched multiple times when already researched (advanced armory, advanced turret factory)
+			? Don't show upgrades that can't be researched multiple times after started researching or researched
+
+		- Animation changes:
+			O Lerk: add primal scream
+			- Fade: add "guzzle"
+			- Onos: add devour, stomp
+				- Waiting for view model
+
+		- New sounds:
+			- Primal scream adapted for lerk?
+			- Bile bomb sounds changed to sound like it's dissolving structures?
+			- Guzzle sound (liquidy, metabolic)
+			- Devour sounds (one for attack, one for onos-killed and guy pops out, one for devour finished <burp?>)
+			- Ground stomp
+			- Electrical sound 
+
+	Add damage effects to marine structures
+		- Light smoking after small damage
+		- Sparking with medium damage
+		- Catching fire and dark smoke with heavy damage
+
+	Roles:
+		Skulk - Basic ground, scouting, versatile at later hives
+		Gorge - Growth, siege, structure support (healings, welds, forward-building)
+		Lerk - Combat support
+		Fade - Versatile medium combat (anti-air, beats T1 marines, competitive with T2 marines, implies lowering his health/armor)
+		Onos - Heavy ground
+
+		Basic marine - Basic ground, ranged
+		HMG - Heavy offense
+		HA - Heavy ground
+		Jetpack marine - Air, versatile
+		GL - Versatile siege, visibility not needed, works better against players, no build time
+		ASC - Static siege
+
+	Resource changes:
+		? Remove resource limit depending on hives
+		? Every alien starts with enough resources to go gorge and then build a tower
+		? Marines start with 75 resources or so (100 lets you climb too much, but is a nice round number)
+		? In big games this means aliens will start with more total points, but the marines can build towers as fast as they want as well (because each tower immediately starts contributing)
+		? Gorges don't get any extra resources over other players
+		? Do resources from towers scale?  Perhaps not.
+		Bigger games will require more gorges.  Smaller games can still accomodate more gorges.  Many gorges won't adversely affect your team, not if they can stay alive.
+
+	- Move commander UI to tech slot model
+		? Integrate basic code and get hotkeys working again
+		? Added new research (electrical, phasegate tech, health)
+		? Distinction between available and enough points (calculate points on client?)
+		? Handle menus properly
+		? Add highlighting for current menu and when hotkey hit
+		? Set menu default when entering and leaving CC
+		- Fix recycle icon
+			- Show recycle progress indicator?
+		- Fix research problem with siege and health (keep researching)
+		- Send current menu to server for spectating/replays?
+		- Fix "jump to alert"
+		- Commander hotgroups!
+			? Basic system
+			? Remove buildings and players when destroyed or leaving team
+			? Get number drawing on icons
+				- Needs to be nicer looking
+			- Fix problem where one marine selected won't let menu change
+			- Hitting jump should go to last alert, including pending requests (and should remove the request normally)
+			? Add config binds for idle soldiers and requests
+			? Change hotgroups to draw proper icon for group
+			? Refactor highlighting
+			- Add visual way to create hotgroups?
+				- Draw hotgroups even when not created?
+			- Draw hotgroups when under attack
+			? Send sound to players added to squad
+			? Draw visual squad indicator for soldiers
+			? Make groups function properly when players in groups leave server or switch teams
+			- Fix tracking
+				? New system that tracks nearest entity in group
+			? Allow commander to talk to selection only (when holding duck key)
+			? Can't build structures when player is selected
+			? Draw ghost building in red if not enough cash (or don't draw)
+			? Draw current hotgroup as highlighted in status bar
+
+		- Allow arrows to scroll
+		- Next player on top menu bar
+		- Select all on top menu bar
+		- Draw health circles for all buildings and players all the time (or otherwise make them show up better)
+		- Allow order-giving to minimap
+		- Allow one click on player list to select player, two clicks to select and go to player
+		- Make resource towers run out again
+
+		- Always draw marine names for commander
+			? Indicate which marines are parasited
+			? Draw selected marines slightly differently to accentuate
+			? Don't draw stuff over UI
+
+		- Make structures and players easier to see
+			- Try drawing friendly ents additively
+			- Try drawing their health circles always
+
+	Before 1.1 PT
+		- Get new tanith from TommyD (mention delta crash also)
+			- Wrote him 
+		- Caged info_locations and IP problems when placing near CC
+			- Wrote him 
+		O Replace new sound effects
+		O Added new sprites in from Relic (pop-up cursors, stomp)
+		- Shaft overview and ready room
+			- Wrote him 
+		? Check in current code for Max before weekend
+		- Frame-rate dependence exploits
+		- New Fade weapon/ability
+			- New blink ability that moves you super-fast forward
+		- Get tracking working right or remove it
+		- CM tweaks
+			? Reformat button grid and hotkeys to line up properly
+			? Add "selectall" button with tooltip
+				? Sent art request to Cory
+		- Occasionally not able to fire bug after commanding
+		? Fill auth system with real data
+			O Reported bugs to Joev
+			O Filled in majority of data
+			O Sent out e-mail to those that need to send their WON ids
+		- Test versioning and auth system
+			- Think of security holes or issues
+			- Versioning not working quite right yet (parsing error)
+		? Death notices getting logged twice when mp_logdetail > 0
+		? Recycling not removing tech (scanning)
+		? Menu doesn't update if recycling structure selected
+		? Allow recycling of unbuilt structures
+		? Not playing proper weapon animation after commanding
+		- Auth is now enabled by default (?)
+		? Onos view model changes
+		- Stomp
+			- Sound work
+			- Delay attack a bit
+
+		- Player model animation work
+			- Devour
+			- Stomp
+			- Lerk flight
+			- Lerk death
+
+		- Orient bile-bomb projectile
+		- Armory and phase gate animations are still messed up 
+		- Armories and alien resource towers don't draw rings (collision sizes I think)
+		- Enforce entity limit of some kind to prevent/reduce overflows?
+		- Remove commander mouse-over for players (now that names always display)
+		- Check alerts ("hit jump to go to alert")
+		- Test demos, decide on backwards-compatibility
+		- Fade third-person anims are messed?
+		- Siege/observatory visibility bug
+		- Update titles.txt 
+			- Damage values for weapons
+			- Changes in upgrade chambers
+
+		? Cheating death icon
+		O Commander can talk to only selected players by holding crouch key
+		- Clean up timer on scoreboard
+		- Blink should be fixed
+		- Tweak sentry smoke anims (or remove)
+		O Sensory upgrades (change scent of fear to be anyone in range, change enhanced site somehow)
+		? Heavy armor footsteps
+		O HMG tweaks
+			O Animation changes
+			O Waiting for Def to send updated model again 
+		- Delta, lost, shaft, veil
+		- Make sure particle editing is working properly
+		- VACize
+		? Fade losing players out to black on game end
+
+	- 1.1 rollout
+		- Initial playtesting with PTs
+			- Find obvious problems (missing files, stuff that isn't fun at all)
+			- Iterate until things are right conceptually and big-picture wise
+		- Rollout to vet players
+			- Start working on balance and exploits
+			- Once very big holes are patched
+			- Rollout to beta server ops
+				- Work out performance, compatibility and 3rd party issues
+				- Increase # of playtests through all these servers (open beta if people want it?).  Use auth system to prevent people from joining a team if they aren't a PT/vet?
+				- Get PR movie completed, and hype to sites.  Get PTs and clan people to write previews and spread the info?
+
+	O Remove 'the enemy approaches'
+	O Put back in movement chamber teleport
+	? Remove commander "light"
+	? Primal scream has less range, lasts about as long as the sound does and has higher rate of fire
+	- Lose upgrades when structure is lost (motion-tracking, upgrades)
+	X Add graphic effect for primal scream (or draw icon above their head like voice?)
+	? Primal scream now makes affected aliens scream back in defiance
+	- Show health for selected marines and structures (draw icons somewhere?)
+	? Structures playing their anims when they come on screen (observatory and CC, not resource tower)
+		? CC not playing anims properly
+		? Observatory not playing anims properly
+		? Electric anim for TF
+		? Researching anims for all
+
+	- Reconcile umbra visuals and gameplay effect 
+	? Parasite range doubled
+	O Spores draw while flying.  Spores can no longer damage players through walls.
+	- Move skulk view offset to be closer to actual (so your nose doesn't poke out when you don't realize)
+	? Fix walking
+		- Fix strafing while walking
+	O Draw tournament mode timer to scoreboard, not to general HUD, draw it even without tourny mode?
+	? Change commander name so you can read it
+	- Draw number of nodes that team has (draw info for both teams when spectating).  Draw shadows showing which nodes were last seen to be controlled by enemy. (or more simply, just draw +x which is how much was received last tick?)
+	- Change alien upgrades to draw icon and then number, instead of layers
+	? Medpacks take parasite away
+	? Increased jetpack cost
+	? Lowered pistol rate of fire to prevent scripting abuses
+	? Added sv_alltalk
+	- Ammo packs go to "best" weapon
+	- **Extra skulk death anims
+	? Server ops can always switch teams regardless of team size
+	? Draw current squad indication on HUD
+	- Don't draw crosshairs when pop-up menu is open
+	O Swap sides for "ready room" option
+	- Rework welding role (or show how much armor someone has when looking at them)
+	? Increase shotgun ROF 
+	? Increase bile bomb speed
+	- Consistency check on ambience sounds?
+	? Alien structures regenerate slowly
+	- Lessen the importance of carapace
+	- Weapons dropped near armory don't expire
+	? Smooth fade-out effect for cloaking players
+	- Speed cap for flying players
+	? Make sure cloaking and sensories work right with commander proximity and turrets
+	? Remove alien frags in non-tourny mode
+	? Preserve alien classes in ready room
+	? Each level of carapace now slows aliens by 3% (because of heavier shell)
+	- Keep old assets in game so old demos work?
+	? Disable +use for commander so he can't build structures
+	? Distribute any models that consistency was complaining about (shell.mdl, pshell.mdl)
+	O Fixed bug when F4ing while in new observer mode
+
+	- Commanding tweaks
+		? When clicking pending request, change selection to him also
+		? Fix up scrolling (finally)
+		? Draw pending requests number properly 
+		? Clicking hotgroups no longer works
+		- Selecting a single marine and trying to build equipment
+	- RESEARCH_HEALTH not going away
+	- Auth icons
+		O Got all PTs and devs
+		- Just need new PTs 
+	O Put drawdamage back in as server option (tradeoff for finding bugs)
+	O Remove mp_teamhandicap, and spawn invulnerable time from menu, removed other stuff and added new handicaps and stuff
+	? Fix jump to go to alerts
+	? Change config from selectall to impulse
+	- Marine resource tower rings
+	? Client crash when selecting marine weapons
+	? Observer tweaks so you don't switch players while hitting left/right while flying around
+	? Make sure you can always join both teams, like cheats are enabled (I think)
+	? Using cloaking upgrade doesn't change view model
+	? stomp sound
+	x Change paralyze sprite -> stomp
+	x Change babbler sprite -> devour
+	? Onos too slow
+	? Don't change self with alternate vision mode
+	? Have to aim down to devour
+	? Show progress bar for devour
+	O Change view model for devour, don't allow it to fire again while digesting
+	- Make sure mp_uplink is getting set to 1 every tick
+	- Some tech node label is visible in ready room
+
+	- Change observatories and distress beacon to have energy 
+		? Work for generic system
+		? When not having enough energy, the tech node should show as red, not disabled
+		- Prereq text not printing when energy showing
+		- Energy doesn't show when full
+	O Decreased time needed to start respawning after death (make sure it works with death anims)
+	O Spit ROF and damage increased noticeably (overall power roughly doubled)
+	O Tweaked weapon and ammo weights (promote non-HA use of heavy weapons, promote shotgun as point, make marine weapons feel more responsive)
+	O Added option to disable flashing effects for photosensitive players
+	O Messages from server always show up, even if tooltips are off (voting messages, adminmod messages, etc.).  Turning off tooltips no longer disables help icons.
+	- Make announcement when ready to start soliciting veterans (put up demo FTP also)
+		- My basic strategy will be to hang out in #nsscrim and watch games.  Sometimes I'll watch demos also, but mostly I'm interested in seeing clans that do the following:
+			- Scrim multiple times per week
+			- Can get along well with the other clans, and can talk about balance, strategy, etc. while remaining pleasant and respectful
+			- Will continually try new strategies and try to "break" the balance
+			- Can compete with the other top clans that are selected
+
+	- Client downloads, 3/29/03
+		- Gamehelper: 4829
+		- Computergames.ro: 77806
+		- Fileplanet: 59,391
+		- Ozfiles.net: 29173
+		- Khabal.com: 10468
+		- Halflife.nu: 41878
+		- Gamershell: 37616 
+		- Ausgamers.com: 32032 (telstra: 7435)
+		- extremeplayers.de: 27649
+		- Multiplayer.it: 2747
+		- Daddeln.de: 22980
+		- Fileshack: 14752
+		total: 368,756 (many missing mirrors though)
+
+	- Round reset problems
+		- Jobabob's analysis: http://www.natural-selection.org/forums/index.php?act=ST&f=4&t=24222
+
+	- Welding changes
+		? Make them reset properly every time
+		- Only take damage from the right things (healing spray)
+		- Really think about their role
+
+	O Alien turret changes
+		O They shoot spikes intead of spit
+		O Their idle animations play without hitching (3 different idles)
+		O They play take damage animations also
+		O Show spike sprite when projectile hits it
+
+	- Lerk physics changes
+		- Try flying in whatever direction you're looking
+		? Lerks no longer take falling damage
+
+	- Korean push
+		- Find someone to translate (asked Jason Robar)
+		- Anything other usability in SC/War III NS is missing?
+
+	Time line:
+		Game start	->	Marine Tier 0, Alien Tier 1
+		~30 seconds ->	Marine Tier 1
+		~1 minute	->	Advanced Tier 1
+		4 minutes	->	Tier 2
+		~5 minutes	->	Advanced Tier 2
+		8 minutes	->	Tier 3
+		~9 minutes	->	Advanced Tier 3
+
+	- Marine Tier 0
+		- LMG, pistol, knife, without capability for more extra ammo
+	- Alien Tier 0
+		- Bite, spit
+			
+	- Marine Tier 1
+		- Deployable ammo
+		Advanced -> mines, sentries, deployable health, distress beacon, resource towers, welder/welding, shotguns, Siege cannons
+	- Alien Tier 1
+		- Parasite, healing spray
+		Advanced -> Offensive chambers, spikes, spores, sensory/movement/defensive upgrades, resource towers, blink, onos-1
+
+		Analysis: 
+			mines > rush (competitive with fades)
+			If enough money is pumped in: 
+				onos > sentries, deployable ammo/health > OCs
+				shotties > skulks/gorges
+				siege > sentries/OCs
+				onos > LMGs
+			lerks competitive with shotties (> in defense role)
+			mines competitive with fades, onos
+			alien upgrades allow aliens to become more powerful for cash, just like shotties/mines/welders
+			welder competitive with healing spray
+			Gorge have ability to remove welds (takes the same time as welding, allow it to be welded back and forth?)
+			Massed spores should beat armory-teching marines, but should fall once advanced weapons arrive
+
+	- Marine Tier 2
+		- Level 1 ammo/armor
+		Advanced -> HMGs, GLs, motion-tracking, phase gates (with new prerequisite upgrade), scanning (if upgrade added), armor/ammo upgrades
+	- Alien Tier 2
+		- Leap, gorge bile bomb
+		Advanced -> Umbra, fade ability, second set of upgrades 
+
+		Analysis: 
+			Tier 3 GLs beat umbra
+			Marines get scanning to counter hive-1 sensory
+			Marines get siege to counter hive-1 defense
+			Motion-tracking or phase gates vs movement chambers (vs. silence and celerity)
+			Bilebomb beats sentries
+			HMGs counter tier 1 skulks/gorges, competitive with tier 2 lerks and fades (umbra, esp. with def chambers/regen)
+			Umbra/skulks beats LMGs, sentries
+			Scanning beats Alien Tier 1 (current sYn tactic)
+			Leap vs. ?
+			Tier 2 onos competitive with 
+
+	- Marine Tier 3
+		- Level 2 ammo/armor
+		Advanced -> Heavy armor, jetpacks, level 3 ammo/armor
+	- Alien Tier 3
+		- Xenocide, web
+		Advanced -> primal scream, acid rocket, third set of upgrades
+
+		Analysis:
+			Webs strong vs. jetpacks (though hard to use in practice with vulnerable gorge on frontlines)
+			Jetpacks counter onos (make sure devour only works if player is on ground?)
+			Onos beat HA/HMG (with charge)
+			GL beats umbra
+			Acid rocket strong vs. jetpacks, and JP/HMG (though a little more expensive)
+			Acid rocket beats tier-2 HMG
+			Tier-3 HA/HMG should beat acid rocket (but not hard counter, implies reduction in acid damage and increase in splash radius)
+			Level 3 ammo/armor upgrades competitive with fades (esp. at marine spawn)
+			Primal scream helps beat tier 2 marines
+			Leap-Xenocide vs. HMG/GLs (esp. with cost)
+			* Make gorges slightly more costly or take longer to morph to, so losing gorges is still bad, and going all gorge is risky (in light of new resource model changes)
+			Problem: alien team will generally have all lifeforms, because it doesn't cost anything to explore a technology.  This means fades/onos will always be present at tier 3.  Fix this by making alien lifeforms initially more expensive and then cheaper as they continue to be evolved to?  Or first cost and then cost after that?  Say, 80 for first onos, then 50 after that?  Or one cost if there exists none of that lifeform, and another if there are multiples?  Cheaper and cheaper?
+
+	? Resource nodes now run out
+		? They give alerts when nearly empty
+			- They need to always show, even when visible and not within range?
+		? They stomp making sounds and pumping when they are empty
+		? Takes 10 minutes to run out, resources harvest evenly no matter the team size, they also show accurate non-float numbers when harvesting (unless handicap is activated)
+
+	O Added volunteer handicap for teams in tourny mode.  Removed team size handicapping now (team limit enforcement is enough).
+
+	- Alien menu improvements
+		- Show cost for OC, Hive, resource tower, upgrade chambers
+		- Show disabled nodes (esp. upgrades) more clearly
+			- Make invalid nodes obvious without moving to them
+		- Move tooltip back near mouse?
+		O Make chooseable nodes clear (upgrade nodes aren't obvious)
+			O Rework nodes to do so
+		- Add changing cursor for all valid end nodes
+			O Added lifeforms change
+			O Added marine change (need new cursor though?)
+			- Change cursor for other alien options (get artwork from Relic)
+
+		- Remove or rework alien comms
+			- Draw chatting/status alien blips even if not pointing at them?
+		- Remove ready room off pop-up for both sides
+		- Allow cancelling of morphs?
+		- Unify marine and alien upgrades by drawing at the same place if possible
+
+	- Allow server to csay without autohelp enabled (http://www.natural-selection.org/forums/index.php?act=ST&f=5&t=23194)
+	- Force "hive construction complete" sound
+	- Low-resolution support (weapon sprites, theme.txt)?
+	? Make sure advanced turret factory can be recycled
+	O Relaxed gestation requirements to avoid annoying "you must be on ground to gestate" errors
+	O Scent of Fear now shows nearby enemies, not nearby damaged enemies
+
+	- Make sure to show build rings for structures on mouseover 
+	- Change leap to not hurt buildings?
+
+	- Move PT auth icon status "above" guide icon status
+	- Move auth system after mp_authicons is loaded from .cfg 
+	? Offense chamber hurting themselves in tourny mode
+	- Fix or rework blink
+	- Go through NS Bugs mail folder and fix as many of those as possible
+	O Resource tower "targetOnBuild" only fires once now
+	- Remove info_location z-checking.  Remove info_locations from map after loaded to reduce entity count (make sure map reset still works)
+	- Add client-side temp grenade for grenade launcher
+	- Display message when cheats are enabled
+	- Include cheating death icon from prodigy, add auth mask as well
+	- Leap exploit: when binding leap impulse with two hives (energy must be decremented in AvHPlayer::ExecuteMessage instead of weapon::DeductCostForShot
+
+	O Integrate new tech icons
+		O Use red frame for structure under attack
+		O Use red frame for not enough cash
+
+	- Armory exploit:
+		From Swirl, via forum PM: "When a marine stands next to an armoury and presses his use key to get ammo, its quite slow getting ammo, but when you press your use key + flashlight repetitively, the speed that you gain ammo at is incredibly fast. I dont know if you know about this, and I hope you will fix it for 1.1 . Ill send you a demo of this if my explanation is a bit vague"
+
+	O Collision fixes
+    	O func_resources still jitter
+		O Resource nodes don't lie flush
+		X Turret factory could be wider
+		O Observatory and resource tower and alien resource tower cause jitters
+		O Hives aren't the right size? (getting stuck when spawning)
+		X Alien resource tower not tall enough
+		X Still crouch/jittering when holding duck on certain sides of buildings (regardless of facing)
+
+	- Easier learning curve
+		- Perfect world: there's a full single-player campaign that teaches all the basic mechanics...but this doesn't solve the strategy part
+		- Simple SP level that gets player to learn the very basics, then
+			- queries n-s.org for list of training servers, and asks the user if they would like to connect one of them (it would need a certain number of players with x status and have a ping of y or less)
+			- gets them to configure their mic first, if at all possible (Steam, or add voice control myself and set sv_loopback for a moment)
+			- get training servers by all servers running special training maps (nst_?) or get sponsored servers and allow player to choose one
+			- add GUI for trainers to let them easily run things 
+				- Turn on/off damage for players, reset the game, enable alltalk, allow them to spectate first-person for a player, build a structure anywhere, mute players temporarily so they have the floor
+				- Allow players to report abuse
+				- Allow trainers to move players between teams (put all this on the scoreboard?)
+				- Only allow trainers that have been authenticated as such
+				- Add features that encourage players to add others as friends when playing on Steam
+				- Allow trainers to signal for more trainers
+				- Allow trainers to take control of other players (hard for commanding though)
+
+	- Remove/disable thirdperson commands (from Tau hang10)
+		cam_command 1
+		cam_idealyaw 0
+		then do a retry to the server
+		im pretty sure this is client side only
+
+	? Physics exploits
+		? Bunnyhopping (from iwa.plex)
+			- sv_airaccelerate 0
+			- sv_airmove 0
+
+		? ex_ exploits:
+			- ex_maxerrordistance 0
+			- ex_interp 0.01
+
+		- Address lerk and jetpack physics after disabling airmove
+
+	- Potential vets
+		- STD
+			Kenneth Lee (ksl4@georgetown.edu), STD-Ardesco
+		- Eve, eR, 
+		- RED
+			- cornesm@bellsouth.net (RED-Tiki)
+		- sYn/HAM 
+			- (Steve Meenehan <smeene@yahoo.com>)
+			- Ackz (AcKz666@hotmail.com)
+		- TAU
+			- solarcurve@msn.com (SolarCurve)
+			- hang10@myway.com (hang10)
+		- XoverZero
+			- archhaven@sbcglobal.net <archhaven@sbcglobal.net>
+		- TE?
+			Seraphic8x (Mrfranz16@aol.com)
+			do0bie[TE] (Ben Wolf)
+		- Need a couple Euro clans?
+		- Misc. people
+			WeRRa|Torhu (on IRC, S. Korean guy, stuwon@Hotmail.com)
+		- CAL folks
+			- Othell <othell@caleague.com>
+			- boeckelmann@caleague.com
+			- eric@doticon.com
+			- bralph82@yahoo.com
+
+		- UGL folks?
+			- UGL|SeanA
+
+
+		- Please e-mail me your full name, handle, clan name, and WON id
+		- Changing clans won't affect your vet status, but you won't be able to bring all your new clan mates in as vets
+
+		- Confirmed vets (0 = forum and auth, ? means auth but not enabled, - means no forum no auth)
+			-> FoR admins: bitchslap@fistsofra.com; nicuss@yahoo.com; jcram@wideloader.com; berilane@adelphia.net; benwolf@comcast.net; smeene@yahoo.com; darkgoosey@yahoo.com; andersond030@hawaii.rr.com; mogg_4@hotmail.com; pw3@njit.edu; akiro@attbi.com, sugarmyownchurro@hotmail.com, mogs18@swfla.rr.com
+			mp_serverops: "3777810;141957;3237836;331066;1160592;7154;2884666;3243397;2377185;2817243;1492447;536458;81383;3048748"
+
+		- Current server ops:
+			-> SuicideDog, CrackerJack, Joev, Prodigy
+			-> swheet@mhcuc.org;cracker@covertoral.com;joev@dspsrv.com;jcouzens@uhfco.net
+
+			O Kanwei "#cri.ogenics" Li, 3598159 (New wonid, fix it for constallation too)
+			O *Nick "#cri.Nicuss" Chebeleu, 3237836
+			O Andrew "#cri.tical" Hammett, 3221707
+			- Guérin "#cri.Draco" Christophe, 1773753
+			- Tylor Yeung, "cx.cypher", 162108 (leader of cx, founder of NSA)
+			O Kenneth "cX.Screamer" Wunderlich handle, 203409
+			O Anthony "cX.Mr Radical Ed" Guevara, 37306
+			O Marvin "cX.Vinin", "something" 2065255
+			O *Jerry "cX.TheNaySayer", 331066 (NSA owner)
+			O Justin "er.IcE-" Goodman, 110613
+			O Lane "er.Lux" LaRue, 42770
+			O *Brett "eR [ Erilane ]" Erilane, 1160592
+			O *Ben "eve.doobie" Wolf, 7154
+			O Paul "eve.seraphicx" Franz, 829329
+			O Daniel "eve.hang10" Garza, 3196484
+			O John "eve.romano^_^" Romans, 80973
+			O Brad J Rosin "eR [ lagger ]", 155580
+			O *Stephen "HAMBONE" Meenehan, 2884666
+			? Michael Moorman "STEAMEDHAM" (WonID: 3508091)
+			? Christopher Meenehan "SMOKEDHAM" (WonID: 2244778)
+			- josh resendiz "SHAMPOO" (WonID: 978045) (or -> ? Tim Ang "GREENEGGSANDHAM" (WonID: 170749) )
+			O *Josh "STD-Goosey*" Szepietowski, 3243397
+			O Kenneth "STD-Ardesco*" Lee, 144891
+			O Josh "STD-Slash*" Keats, 59932
+			O Logan "STD-Kalmah*" Reeves, 3162858
+			O Tae "[ReD]TaE" Kim, 633578
+			O *D. "[ReD]boobs" Anderson, 2377185 (leader)
+			? Michael "[ReD]Knight" Choe, 124911
+			O Dean "[ReD]Dean" Kovacs, 39960
+			O *Joe Shanahan, [ReD]mogg, 2817243
+			X James "sYn | FatKao" Thomas Milko, 538967 (forum name: FatKao)
+			O Amit "sYn | Uubu" Shah, 690509
+			O Fred "sYn | Terminotaur" Lewis, 51510
+			- sYn | Zykosis, 2155820
+			- Firewater?
+			O *Phillip "sYn | Borf" Whang, 1492447
+			O *Kyle "ue.akiro" Hallenbeck, 536458
+			O Josh "ue.theoryhat" Porte, 958962
+			O Jacob "ue.eisen" Smith, 589464
+			O Anthony "ue.jdub" Carpio, 741488
+			O John Strickler, ue.optikal, 992223 - Old head of nG, close to top members of NS community, got scrim channel for us (!)
+			O *Jonathan "UGL|Jon" Green, 1032836
+			O *Paul Fisch "Eats", 1271383
+			O Tim Manns "kenichi", 556510
+			O *Andreas Carlos Serna "pandas|churro", 81383
+			O Chris "pandas|3-toed_sloth" Mann, 2418057. 
+			O Alex Kong "pandas|Tare", 303687
+			O Shozo "pandas | snakpak^p.rP" Hirano, 109722
+			O Hugh "[one]arch" McDonald, 395278
+			O *David "[one]Toasty!!" Rodriguez, 3048748
+			O Devan "[one]froggeh" Laska, 1074623
+			? Matt "[one]cinderous" Bloom, 3533692 
+			O *Othell, 83473
+			O Brad "CAL|Brad" Ralph, (pandas | mcclane), 518141 (forum: mcclane)
+			O *Paul "Solarcurve" Drew
+			O Benoit "Naxo" Richter, 379698 (NS Clanbase supervisor)
+			O Michael E. Boeckelmann, handle: chem^ten, wonid: 10222, CAL|Boeckelmann on gamesnet
+
+
+			Potential new vets
+			- apex|lego - Brian1095@mailcity.com - From nG, "Beaten sg tied ue, beaten one, beaten x over zero, tied eve, and it will get better... were just not league atm =("
+
+	O Removed "if you're new to NS, play marines first" tooltip (to get balance numbers in line?)
+	O Fixed view "jog" when releasing pop-up menu key in windowed mode
+	O Fixed stretching problems for soldier minimap
+	- Remove "try morphing to gorge" tooltip"
+	- Change tooltips so server messages can still be sent
+	- Remove listening for hive bug, necessary for HMG rush to not be over-powered
+
+	- **Crash when joining marine team before particles come down on hera
+		- Same with delta?
+
+	O Lerks no longer take falling damage
+	- Logging stuff
+		- Commander-wins
+		- Time research finished ("time to arms lab", "time to HA")
+		- 
+
+	O Add option to disable flashing effects for epileptic players (cl_photosensitive)
+	O Changed FOV for different aliens for immersion.  Added checkbox for forcing default FOV (cl_forcedefaultfov).
+		? Migrate FOV code back in
+		- Put check in for software rendering too, or if usedefaultfov is checked
+	O Added extra flavor animations to alien resource tower
+	O Fixed problems where marine and alien resource towers weren't animating smoothly
+	- Change spectator name color from black
+
+	? Added authentication system for registered users, playtesters
+		O Implement basic system
+		- Get Joev to add a special user-name password for it in the protectdl section so it can be monitored
+		- Ask Joev about what path to use for IP instead of using DNS
+		- Ask Joev if this is secure or if user/password will be obvious to people
+		- Look into getting a security certificate and using ssl
+		- Look into financial backend on n-s.org
+		joev: PK is an 'id' but auto incremented (better for MNySQL to optimize indexes that way)
+		joev: here's the schema: 
+		Flayra: Great, I was just thinking wonid would be a crappy id
+		joev: int id, char name, bigint wonid, int rank, smallint authorized.
+		joev: the 'auth' table is then joined on the rank field with the rankings table which is: 
+		Flayra: Great.  The rank is just a bitmask in the code right now (used for drawing the icon), so a player can have multiple ranks (dev, pt, etc.)
+		joev: int id, char ranktitle.
+		joev: yes.. but as I say, if you make your code stop looking when it hits the wonid, then the player get's the icon of the highest rank for that wonid :)
+		Flayra: Sounds great, though I don't know enough about dbs that I know why you'd join the two instead of putting all that info into one table
+		Flayra: Well I have to download the whole file so it won't matter when I stop looking
+		Flayra: (and I'm splitting the whole thing up when I first fetch it)
+		joev: the why is this: easier to add ranks without munging up the setup :)
+		Flayra: Rocking, you know bizest
+
+	- Sound tasks for Scott
+		? Emailed Scott
+		- Heavy marine footsteps: http://www.natural-selection.org/forums/index.php?act=ST&f=1&t=21797&s=809717bf921544be3ec003fafb17d9a1
+
+	- Directions to Mike:
+		Mike: ok . . . red line to broadway
+		Mike: then you have to go over the broadway bridge and onto albany
+		Mike: then albany onto harrison
+		Mike: and we're 580 harrison, fourth floor
+		Mike: we'll have to let you in
+		Mike: it's about a 10 minute walk
+		Mike: or so
+
+	- Install and configure ArticleManager
+		- Write honest review for Fraser: fraser@interactivetools.com
+
+	- CAL support
+		? Team score shows number of resources accumulated (show for both teams to start, remove if not cool)
+		? Show marine kills/deaths in tourny mode
+		? mp_timelimit in tournymode shows countdown for everyone and ends the game afterwards (looking at team resources when setting the victory condition)
+		- Add support for draw game
+		- Make timelimit blink red when almost done
+		- Don't display team resources for enemy team
+		- Log game end specially (score)
+
+	- Enhanced demo playback
+		- Particles
+			O Added support
+			- Figure out why they are only drawing sometimes
+			- Spawn particles aren't oriented towards viewer, probably because of vofs crap
+		- Building health circles
+		O Gamma
+		? Weapon info
+		- Minimap for marine
+		- Music (?)
+		- Pop-up menus
+			- Don't playback when HLTV menu is up
+		- Tech slots
+		O Teams
+		- Non zbuffered stuff
+			- Orders
+			- Hive sight
+			- Need VALVe help here
+
+		- Commander mode
+		- Reload map HLTV images for demo playback
+
+	- Job search
+		O Send e-mail to Josh Resnick
+		O Pinged Arena.net and S2games via gamejobs.com
+		O Talk to DAM and get things moving for Monolith
+		O Apply to Big Blue Box
+		O Apply to Intrepid
+		O Send followup e-mail to Arena.net
+		- Send e-mail to CCPGames.com
+		- Remedy -> Max Payne (www.remedy.fi)
+		O http://www.dperry.com/ -> Lots of UK listings
+
+	O Rework commander hotkeys so they're hardcoded but work well
+		- Menu is now 4x3 (new category for orders, 4 rows no longer needed with new armory/equipment model)
+			- Get artwork scaled (maybe I can do this) and tweak values so it looks right
+			O Add new category
+		O QWER, ASDF, ZXCV match up to menu intuitively
+		O Added customization support in advanced config
+
+	- Armory changes
+		- Put equipment into production
+			- Research shotty production, HMG production, GL production
+			- Each armory slowly creates a weapon of that type in range every 20-30 seconds (up to three weapons around each structure?)
+			- Same goes for the prototype lab (jetpacks and HA)
+			! Don't forget to always propagate entities to commander if they are selected
+
+		- Advantages
+			- Frees up room on the UI for new hotkey system
+			- Less commander frustration
+			- No more whining about "HMG/HA plz"
+			- Means multiple armories and prototype labs are useful (as well as specialized bases)
+			- Means heavy weapons are more viable without super high costs
+			- Means armories might be targetted
+			- Perhaps an appropriate advantage against new faster growing aliens
+			- Binds technology to an area ("shotties at sewer" or "grenades outside refinery")
+			- Consistent with high-level duties, scales well to games of all sizes
+
+		- Disadvantages
+			- Commander can't reward individual players easily
+			X Pain to implement
+			- Fundamental balance change
+
+	- If marines have no arms lab, they lose those upgrades as well (make arms lab a bit tougher probably)
+
+	O Adjusted voice comm icons to position above models properly.  Updated HUD voice icons to use same as world voice icon.
+	? Fix problem where adv. armory factory doesn't show circle
+
+	m Slant Wall Hack from Hang10
+
+	m Hitbox issues
+
+	? Leap exploit (Max fixed)
+
+	- Drowning bug/exploit (healthbug.dem, from Comprox)
+
+	- Commander building exploit (e-mail from Mike Hodgkinson)
+		- One of regulars found an exploit which could be used on NS as commander where he could build structures while in the commandchair.
+		- I saw hi doing this on ns_missilecommand_final3, it looked like the structure was being built by no one.
+		- He told me how to do it, you centre your view over the structure and hold "use", builds just as fast as if a marine was building it. This makes sense as I understand thier is a commghost entity. Im thinking of disabling comms from being able to press thier "use" while they are in the commchair with a metamod plugin, but I thought it may be important to advise you of.
+
+	? mp_logdetail 2/3 every kill message is reported twice
+
+	- Minimap fixes
+		? Max fixed stretching
+
+	- Status bar issues when using gorge
+
+	- PR
+		- Talk to SolarCurve 
+		- Talk to iwa-dec for promotion (DOG, gotfrag people)
+
+	? Add alien building destruction effects
+	? Add turret smoke effects
+
+	? Renamed mp_authicons to mp_uplink
+		? mp_uplink now controls versioning too
+		? Put in basic throttling to prevent ridiculous abuse
+		? Updated default .cfgs
+
+		- What's bandwidth for this?
+			Assume 1000 servers, average game length is 20 minutes
+			3000 queries per hour, roughly one per second
+			Change this to only allow updates every hour, so one every three seconds
+
+	? Added "select all" command
+		- Add to config
+	? Fixed guide tooltip bug where it wouldn't work for any player but the first
+	? Made tweaks to fade view model (needed for HLTV, new animation for smoothly switching between cannon and swipes)
+	? Added idle animations to acid rocket and bilebomb
+	? Weapon reloading, deploying issues with new event model
+	? Add player reload animation support
+	- Frame-rate dependence
+		? Building (change to gpGlobals->frametime)
+		? Jetpacks (ask Quietmischief or Seraphic8x)	
+		- HMG firing rate (looks like all weapons too?)
+		O Wrote Eric and VALVe
+
+	- Remove or revisit recycling
+	- Get particle editing working again
+	- Logging out of the command chair in HA repairs all armor damage.
+	- Increase initial alien points
+	- Increase late-game power of marines (defending nodes/structures)
+		- Add alert that marines can hear?
+	- Info_location optimization (delete itself on the server when loaded)
+	- Info_player_location optimziations (!)
+		- 160 entities removed
+	- Balance
+		? Tightened HMG cone from 10 degrees to 6 degrees (allows HMGs to battle fades)
+		? Aliens now start with 20 points instead of 10
+		? Marine resources now scale, with each player contributing 15 points to the pool
+			- Make it non-exploitable and really think through all the ramifications of this
+
+	X Send new credit card # to Webaxxs (Weekend)
+	O Send trademark changes in (Weekend)
+
+	- CC recycle bug (demo from Joev)
+	- Map reset doesn't work for welds
+	- Weldable damage by spit, parasite
+	? Fix generate on collision particle systems
+
+	- Experiment with resource model changes:
+		- More gorges mean more resources and faster growth (ie, not on a share system)
+		- 
+
+	- Internationalization from Nem
+		- Spanish
+	- mouse3 for comm
+
+	- New site
+		- Credits on site (Josh, others)
+		- Shader lab textures credit (ydnar)
+		- Josh credits
+
+	- PR art pack
+		- Add map pics
+		- Add NS banner
+		- Release
+
+	O Show player score in tourny mode?
+
+	O Fixed problem where adv. turret factory doesn't show circle
+	- Fix weapon hud sprites for very small resolution (Merks)
+	- Cursor bug: If you are in the menu when the game ends you are brought back out to the waiting room, but you still have a selection cursor that you can't get rid of (and thus can't walk around or look if you have those keys bound to the mouse). If you join a game in this state, you are shown a blank menu that you can't get rid of. I tried escaping to the game main menu and going back in the game, but the menu was still there. I finally had the exit the game completely and go back in.
+	- Voogru: I dont know if you know about this or not but the advanced armory doesnt show the health becuase the fuser2  on the armory is reset to 0. I fixed this by simply doing this:pEntity->v.fuser2 = pEntity->v.health/2.4;I know it probally will be different with how you have it setup but i think its becuase of the fuser2 getting reset.Just trying to help out.-voogru(BTW, your PM box is full!)
+	- PAS stuff
+	- Team score = total resource gathered
+	- Speed up harvesting a little (scale resources for both sides)
+	- Fix resource max on client for evolving gorges (it will still count down to 33, but will immediately count back up to your resource count (this is just a visual problem on the client)
+
+	- Fade looking up/down bug (e-mail from Peterson Roald)
+	- Set r_drawviewmodel to 1 every frame, or don't send move when it's 0 (cvar_t* m_pCvarDrawEntities = IEngineStudio.GetCvar( "r_drawviewmodel" );)
+	X Allow bots to use command station (for Paul)
+	- Blast damage differences between game and manual
+	- Verify that tooltips and manual values are updated with v1.3 and beyond (change system to dynamically display values like costs?)
+
+	- Change webs to not be placed with same normals (ie, on floor)
+	- Change xenocide to charge up a progress indicator instead of triggering once?
+	O Change contact info on team page to filter mail
+	- Patch server performance
+	O Bills
+	O Forum work
+	O Burn CD and return CD for/to Adam
+	O ESR interview
+	O DOG interview
+	O HomeLAN interview
+	- Use shotgun animation when holding shotgun, instead of machine gun anims
+	- Add speech binds in config screen
+	- Allow pop-up menu to execute regular HL commands?  Like maybe 'node4 = 4/2/2/#MenuCovering/$"impulse 8;say_team I'm covering you!"' instead of just "node4 = 4/2/2/#MenuCovering/8"?
+	- Add visible number of resource nodes (eg, 3/9 <node sym bol)
+	- Particle editing fixes
+	- VAC support
+	- Fix fonts for low-res
+	- Add hotgroups "You are squad 1"
+	- Show player names for commander
+	- Cycle to next player hotkey
+	- Select all button
+	- Voice squelching
+	- Spectator tweaks
+		- Draw death messages
+
+	- Marines getting RPs too fast?
+	- "Incoming enemies" fix
+	- Sensory chamber giving infinite cloaking
+	- Files
+		dlls/ns.dll
+		dlls/ns_i386.so
+		dedvars.txt
+		skill.cfg
+		listenserver.cfg
+		server.cfg
+
+Next client patch
+	- Allow admin_ messages to always display even with help off	
+	- Increase spit velocity
+
+After gold
+	O Announce AZ party
+	O Manual stats
+	X Move repository to n-s.org?
+	O Create readme
+	- Credits page on web site
+	O Add feedback@natural-selection.org to site 
+	O Rework forums
+	- Post IRC guidelines on n-s.org?
+	- DrHugo WON id: 162839 
+	- Store
+		O Talk to Cory about it
+		- Setup my part of store
+		- Link to site somehow
+
+After ship, before Ned leaves
+	- Setup automatic backup for n-s.org
+	O Uncensor "Bob"
+	O Add strategy/tactics forum
+
+Later
+	- Minimap reworking
+		- Not drawing properly for soldier
+			- Scaling
+			- Z-buffering
+			- Correct sprites when firing, seeing enemy, etc.
+		- Infinite loop (redesign or rethink algorithm)
+		- Residual blips
+		O Get blips drawing for soldier
+		- Draw self differently, with direction?
+
+	- Allow respawning after hitting mouse button (3 secs)
+
+	- New soldier sounds
+		- Replace taunts
+		- Add pain/wound/death sounds
+
+	X Add HPB_bot for download
+	- Send quick start guide ideas
+	- Player view is tilted after game over in commander mode
+	? Look into fading pop-up menu again
+	- Allow player voice to be squelched
+		- Get squelching working in ready room
+		- Get mouse input working after joining a game
+	- Revisit recycling (either discard, or get the anims going and resolve the unresolveds with it (turret factories, resource towers))
+		O Move buttons to new lower right (4x4 now)
+	- Leap/wallrun problem
+	- Test Xenocide
+	- Fix last weapon functionality
+	- Occasional selection problems (when buildings are close together?)
+	- Try to fix particle collision problems
+	- Add tooltip explaining that you can hold duck to disable wall-walking
+	- Add "webbed" viewmodel-weapon so playermodel and view model look right?
+	- Add server option where spectators are visible, as cameras?
+	- Don't draw health rings when mouse is over enemy structure
+	- Fix PAS problems allowing commander to "cheat"
+	- Look into force unmodified
+	- Feedback on Grendel's document
+	- Charge attack doesn't keep ramming spikes out
+	- Fix problem where blips sometimes linger (ASSERT)
+	- Draw health circles for spectator
+	- r_drawviewmodel 0 issue
+	- Allow keyboard scrolling in CM
+	- Make CC respawn?
+	- Nudged bug
+	- func_buttons resetting
+	- Guide tooltip?
+	- Select all hotkey for commander
+	- Order-giving tweaks
+		- Don't allow guarding self
+		- Pickup order still not working
+	- Allow previous target with +popupmenu
+	- Overlapping health and armor
+	- Aliens take damage when they have no hives left?
+	- Gamma ramp compatibility
+		- Rewrite using DirectX8
+		- Test to see if compatibility is better, if so, use it
+		- Test to see if gamma reverts on crash
+		- Write to GDP
+		- Write to Jason Mitchell
+
+	- Software rendering
+		O FOV changes
+		- Alpha test problems
+			O Can't be fixed without HL patch
+		- Pop-up menu problems
+		- Warped build circles
+	- Buildings sizes bug
+	- Respawn timer
+	- Always draw health circles for commander (easier to see)
+	- Breakables that keep breaking (mess hall glass, explodables outside water hive on hera)
+	- Remove weapon categories 4 and 5 for marines
+	- Offensive turrets need idle and should shoot spikes
+	- Want less turrets in general
+	- Switching to free-roaming mode should start where you were in non-free-roaming
+	- Play leaphit and leapkill sounds
+	- Add to IRC guidelines: you shall not publically question ops or their behavior, ever
+	- Turrets rotating too slowly
+	- Siege turret animation problems
+	- Finish up trademark application
+	- Calling URL from Win32: 
+	- Remove alien vision-mode for software mode compatibility
+	- New sensory evolutions
+		- Blur?
+		- Revenge spore
+		- Hunter sense
+		- Inhabit host
+	- Make "flayra sees incoming enemies" automatic
+
+	- Add healing spray particle effect whenever any player is regenerated by hive or otherwise?
+	- Make infantry portal button blink when needed
+	- Send message to all team members when someone becomes commander, indicating who it is
+	- Allow commander to talk to just a squad (when hotgroup is created and selected)
+	- Play special message when a commander leads the team to victory
+	- Add alert when marine is standing at empty resource node?
+	- Automatic sounds for soldiers
+		- We need a commander
+		- Contact
+
+	- Add special gestate anims depending on morph target (ie, seeing spikes grow slowly out for level 4)
+	- Histogram of where people are (can tell what areas to rework or remove, for most simple for most bang)
+
+Bugs that VALVe can help with, or are better solved while here:
+	- Steam
+		- One precache problem, work with Erik on it
+			- Now we know the problem, but I don't think it can be easily fixed without updating headers to main
+		- Test internally or find way to test externally?
+		- Get content tool setup at home?
+	O VAC
+		O Got everything setup in perforce, Eric S. started this, finish while I'm home
+		O Wrote e-mail to Eric
+	O Get NS in Perforce
+		- Get copy for home?
+	O Pop-up menu problem
+		O Fix drawing so image is used, and so it's more readable
+		O Got it to draw scaled image finally!
+		O Unhack test code so sprites and enabled state are read neatly
+	- Laggy buildings problem
+		- Work with Adrian on Monday...he didn't have time
+	- Building sizes problem
+		- Work with Adrian on Monday...he didn't have time
+	- D3D problems
+		- Black edges (is this really a problem, or is it a driver issue?)
+		O Cliprect not working (move this to tris anyways)
+			O Move energy, resources and jetpack to new function
+			O Touchup artwork or ask Relic to
+			- Still a bit shaky
+	X Get NS assets in VSS
+	- Demo playback
+		O Disable HUD for now
+		O Don't create tooltips
+		- Fix engine error when back on hl1110
+		- Write Martin
+		- Wait for Martin
+	- Integrate spectator code
+	O Release build
+		- Work on in spare time here, due to fast build times
+	O Orienting temp entities
+
+NS Retail
+---------
+Extras: A printed manual, printed maps of the maps, the missing tutorial level of dewm, extra ingame MP3 music, a cuddly onos beanie baby would all make it worthwhile (Commando)
+
+Lani Minella
+3823 69th st.
+San Diego, CA 92115
+
+Effects->Chorus->Vibrato2 (default settings) (feedback 40%, chorus 5/2. -6, input gain 0, mod depth 8%)
+Jamey Scott www.dramaticaudio.com
+
+Fix problems getting stuck in buildings once and for all (Robin's getting stuck in buildings fixes)
+Current #/location/status of hives
+Fix phase gates
+AFK on inf portal
+Remove "commander" in front of commander name
+Add blinking icons for players when they request help
+Shorten many tooltips
+Heavy weapons should be permanent on ground (or adjusted)
+Allow redemption for level 5
+Health overlapping
+2 join messages
+Ready room bug
+Voice while dead
+Steam precaching problem
+	- Fix via making random sounds part of minimum footprint
+Still some SC sounds
+Respawn order
+Respawn timer
+Player names in commander mode
+#423 is somewhat a problem, #512 is huge, and sometimes I get a afterimage from the popup menu.
+CM needs more feedback, hotkeys, usability stuff
+
+
+
+
+
+
+- Demo playback
+	- Lagging HUD at all times
+		- Try writing v_origin (didn't work)
+	- Mouse cursor isn't visible
+		- Save current cursor state at all times (didn't work)
+		- Something to do with hacky DummyPanel?
+	- Button presses in commander mode aren't recorded
+	- Building a marine structure doesn't show the circle around it
+
+- General
+	- Ready room
+
+- Alien
+	- Learn about the existence of the pop-up menu and how to use it
+	- Switching weapons (people don't know to look)
+	- Alien resource model
+	- Energy
+	- Movement modes for aliens
+	- Hive sight
+	- Changing lifeforms
+	- How upgrades work
+	- How to get more hives
+	- OK, what are my goals?  What can I do?
+	- What does parasite do?  Umbra?
+	- When do I respawn?
+	- Victory conditions
+
+- Soldier
+	- Learn about the existence of the pop-up menu and how to use it
+	- What are all these buildings?
+	- How to get more ammo, weapons
+	- Waypoints
+	- What commander does.  How to become commander.  How to remove the commander.
+	- When do I respawn?
+	- Victory conditions
+
+- Commander
+	- Hit "jump" to go to alert
+	- Playground to explore tech tree
+	- See how building radii work
+	- Upgrading resource towers
+	- Giving orders to players
+	- Hotgroups
+
+
+Software mode compatibility
+- FOV means view model doesn't draw in right place
+- Builder spit looks wrong (not setting or resetting mode?)
+- Drawing scaled sprites doesn't always work (but sometimes does)
+- Pie menu doesn't draw
+- Alternate vision mode isn't really additive
+- Build progress circle is screwed
+- Mouse cursor doesn't seem to draw
+
+Direct3D compatibility
+- SPR_EnableScissor() doesn't work (for drawing energy and resource indicators)
+- Edges of textured quads have black lines (try triangles instead?  should be faster anyways)
+	- Even using SPR_DrawHoles() results in black edges (energy and resource indicators)
+- Pop-up menu is drawing lines on top of textured connectors (actually, GL is doing this too I believe maybe just more obvious in D3D somehow?)
+
+Week of 3/29
+------------
+- Gamehelper interview
+- Write Cory about new "position"
+- Write back artists and have them work with Cory
+O Write Mojo with player animation list 4/22
+- Update art asset list, send to Cory (prioritize?)
+- Update screenshots on web site with playtest pics
+- Get ball rolling on player animations
+	O Work with Mojo 4/1
+- HomeLAN
+	O Get more info about them 4/1
+	O Play on their servers a bit 4/1
+	O Write them e-mail 4/1
+O Massive IPT3/4 checkin 3/30
+O Catch-up with with Mike and AdrenalineZone 4/1
+	O Drink tea at Tealuxe, read CGSP (wrong issue, thought NS was in this one!) 4/1
+	O Play chess with Elliot at the square briefly 4/1
+- Jeremy Soule
+	O Talked with for hours 3/29
+	- Followup e-mail, send him tons of work samples
+
+Current playtest mailing list:
+------------------------------
+mike@squarewaveinteractive.com, joshuamchugh@hotmail.com, jp00jp@hotmail.com, merkaba@btinternet.com, mojo@planethalflife.com, relic25@ec.rr.com, cory.strader@verizon.net, t.calder@shaw.ca, greedo386@readyroom.org, moleculor@yahoo.com, hivefiction@readyroom.org, HA_KIR_SpyderMonkey@ha.homelan.com, kyletsetso_25@yahoo.com, malavi@vt.edu, chromeangel@btopenworld.com, cd1f@yahoo.com, danj@princeton.edu, nick@switchboom.com, alastorx@hotmail.com, cyonpro@yahoo.com, alien_51@hotmail.com, milo@milo.cc, doomaniac@cox.net, gimpy_prophet@attbi.com, ekaj_niop@hotmail.com, fam@box7.co.uk, freestyler_8@hotmail.com, al@demiurgestudios.com, graheim@yahoo.com, david1625@hotmail.com, captain684@aol.com, humbaba10@aol.com, samc@defnow.com, dfm_onefleaarmy@hotmail.com, jcroisan@insightbb.com, pepperjack38@hotmail.com, ken20banks@yahoo.com, daws4442@bellsouth.net, joelak@ptd.net, aweldon@planethalflife.com, manah@planethalflife.com, mmcguire@ironlore.com, kwarismian@attbi.com, chrisa@gearboxsoftware.com, nemes1szer0@gmx.de, bsharp@ionstorm.com, rhoads2nw@comcast.net, quarry.b@neu.edu, sshoemak@vt.edu, tf_soldier@hotmail.com, grabiller@3dvf.net, stalkallez@hotmail.com, tjd159@psu.edu, voidstar@womer.org, wazz@planethalflife.com, wurmspawn@hotmail.com, bdorner@sympatico.ca, brujahaphrodite@hotmail.com, monsieurevil@readyroom.org, forumadmin@natural-selection.org
+
+Beran Peter
+207.106.87.43
+Terminal Services Client
+#l337g34r (redbaran is Beran)
+
+---------------------
+- XP approach to NS -
+---------------------
+- Get value from code ASAP
+	- Does this mean open beta, now?  No, not quite, but close.  I don't want a situation where people don't see what the game is trying to do, or where there are so many vocal dissidents that it ruins it for others.  Missing crucial features could be considered bugs, and I'm wasting people's time by giving them buggy software.
+	- But still, get value ASAP.  There is a value in people spreading the word and seeing what the game will be soon.  What's different about after release then the day before the release?  How about the day before that?  Where do you draw the line?  Why choose to draw the line so late, when people obviously want to see bits of it now?
+	- So, show it to people as soon as it's fun and as soon as it's representative of the final product.  Representative means, representative of the gameplay and quality of the final product.  This means it can't be full of bugs, and the gameplay must at least be similar, though not necessarily as full-realized, as the final product.
+	- When is this?
+		- Missing map areas are fine, so long as the map is representative of it's final state
+		- Missing weapons are fine
+		- Bad artwork isn't great
+		- Missing systems that are crucial to the gameplay are not
+		- The systems that are required are the alien buildings, the builder, the bacterial stream, resource towers, basic alien abilities
+
+----------------------------
+- Code statistics, 2/27/02 -
+----------------------------
+Recent line count:
+mod: 38757, 7174
+ui: 5281, 1268
+util: 1570, 400
+--
+Code I wrote for NS (not base particle system, not HL code): 55,000 lines, including whitespace
+
+cl_dll: 27420, 5333
+dlls: 89646, 7427
+--
+HL game code, roughly: 130,000
+
+------------------------------
+- Tasks for feature-complete -
+------------------------------
+- Commander mode tech (1/11/02)
+	- Continue working with Merk
+	O Get drawing of entities working
+	- Get selection working (1/14/02)
+	O Build version of NSTR2 for Merk so he can test 
+	- Test performance on ns_hera when Merk is done	(1/15/02)
+	O Add black background for commander mode, drawn at minviewz (allow it to be disabled also) (1/15/02)
+		O Update mapping docs (1/15/02)
+	O Add player alpha, commander alpha to func_illusionary
+	O Decide whether system will work 2/8
+
+- Marine resources (technology)
+	- Add func_resource to maps
+		O Only allow resource towers to be built on func_resources (snap them to the func_resource center) 2/4
+		O Make upgrading towers functional 2/4
+		O Add concept of fixed # of resources 2/4
+			O Allow func_resources to be selected, showing resources left 2/4
+			O Show "resources depleted" 2/4
+			O Show names for all selected buildings 2/4
+			O Don't show actions for buildings that are busy (make sure to catch this server-side too) 2/4
+		- Draw ghost buildings if necessary
+		- Particle tweaking?
+		- Update mapping docs
+		- Explain on forums
+	O Solidity for models, so func_resource can be completed 2/1
+		X Tried to get Adrian to help 1/29
+		O Wrote the hlcoder list 2/1
+
+- Marine tech tree
+	- Get selection working right for buildings, players, world items (almost)
+
+- Hives should contribute to hive sight
+
+- Quick fix for selection of buildings and things for NSTR (where to build turret from?  where to build welder from?)
+
+O Draw commander HUD scaled
+	O Investigate scaling of sprites (ask randomnine?) (1/14/02)
+	O Get sprite scaling working (1/14/02)
+	O Draw commander HUD
+
+O Unified hive mind
+	O Get working with new sprite scaling
+	O Placeholder artwork
+
+O Release NSTR2 2/25
+	O Prereq: "marine resources"
+	O Prereq: "commander mode tech"
+	X Prereq: "software mode issues"
+	O Installer (send info to Monsieur) 2/11
+	O Updated docs from Merk
+	O Test installer and update mechanism (Monsieur is doing this, ongoing)
+	O Switching map from commander mode problems (mouse, spawning, other?) 2/20
+	O Fix bug where players can't be hurt in the NSTR 2/21
+	O Get .fgd updated by Howling again
+		O Sent it to him 2/21
+		O Received it
+	O Remove hotgrouping stuff for NSTR 2/21
+	O Test minimap creation again now that placement code changed
+	O Add new sentry artwork to build, test it 2/21
+	O Turn off fog when drawing particles (but it doesn't seem to fix it?) 2/21
+	O Allow particle editing without joining a team first 2/21
+	O Checkin code 2/25
+
+- Present
+
+- New marine tech tree
+	O Placeholder ("crate") buildings
+	- Infantry portal
+		- Add button that allows paying to spawn
+	- Tweak jetpacks
+		- Make sure players keep upgrades after respawning
+		- Add cool smoke effect
+	- Acquire semi-real building artwork
+	- Add cheat that makes buildings complete when dropped
+	- Add cheat that enables all tech
+	- Buildings shouldn't allow actions when they aren't built
+		- Don't show action buttons
+		- Server-side (at tech tree level)
+		- More general case of not showing tech buttons for tech not researched yet (done?)
+	- Add hotkey selection of players and buildings
+		O Basic system 2/12
+		- Fix existing selection issues
+			O Make work server only 2/12
+			O Add selection prediction back in 2/12
+			- Fix order giving
+				O Don't draw for cl_hudcam 2/12
+				- Make sure to draw when behind player
+		O When double-tapping, go to selection 2/12
+
+- Alien building technology
+	- Base resource model
+		- Hives accumulate resources over time, then split them up among all alive alien players every so often
+		- Resource nodes acquire resources directly into the hive.  They are built by the level 2 aliens.
+		- After a team has harvested x resources, a new hive is built.  After x more resources, another hive is built.  If no resource nodes are built, the amount of
+		time it will take for each new hive to come online is around 8 minutes.
+		- Resources are not given to either team by kills.  Kills still go on the scoreboard for alien players.
+
+	- Builders (level 2 aliens)
+		- Builder aliens can shoot a short ranged projectile, build resource nodes, upgrade resource nodes, build evolutionary sacs and build static defenses.
+		- Builders can hold their use key to project the bacterial stream onto a target building or creature.  This builds or heals a building, and builds or heals a player.
+		It could also speed up evolution into a new lifeform.
+		- Multiple builders can work on the same player/building to speed up the process
+		- Buildings can only be placed within sight and range of another building.  If at any time, a building's link to the source of the bacterial stream, the building
+		will cease to function.  The exceptions to this rule are hives and resource towers, which generate the bacterial stream.
+		- The current upgrade system goes away (where each alien purchases his own upgrades).  This is done to ensure technology coherence in the alien team, for more strategy.
+		- Buildings include:
+			- Resource node (which can be upgraded multiple times by a builder)
+			- "Plant" turret (fairly weak)
+			- Four different evolutionary sacs (currently cloaking, regeneration, speed, armor).  
+			- Multiple buildings (up to three of each type) can be built to provide a new level of ability.  For example:
+				- 1 cloaking sac built - All aliens get current cloaking ability
+				- 2 cloaking sacs built - All aliens can cloak, but also remain cloaked while moving
+				- 3 cloaking sacs built - All aliens remain cloaked at all times, even when moving and firing
+				- 4 cloaking sacs built - No additional abilities (but if one sac is destroyed, the aliens still have 3 so they don't suffer any reduced ability)
+			- Some type of heavy defense (gas turret?)
+
+	- Alien respawning
+		- Egg laying is gone.  No one understood this and it doesn't make much sense anyways.
+		- A hive gives birth every 8 seconds or so.  It gives birth to the player that has been been out of play the longest (including late-joiners).  When a hive
+		is in the process of giving birth, it plays a special animation.  Recently birthed players appear next to the hive as a level 1 alien.
+		- If the game hasn't started, or the game time just started, the birthing time is only one second.
+		- Any alien near a hive becomes linked to the bacterial stream and regenerates (maybe visual, maybe not)
+
+	- Ammo for aliens
+		- All aliens have an "energy" bar that starts out full.  When using most of their weapons or abilities, this bar goes down.  Weapons or abilities can 
+		only be used if the alien has enough energy.
+		- At any time, an alien player can pay a flat point cost to refill his energy bar.  There is no way to get energy back for "free".  Maybe this can
+		only be done when the alien is accessible by the bacterial stream?
+
+	- Unlocking abilities
+		- There are exactly three hive locations per map.
+		- The level 1 and level 2 lifeforms are always available.  
+			- The level 3 lifeform is only available when the alien team has at least one active hive.
+			- The level 4 lifeform is only available when the alien team has at least two active hives.
+			- The level 5 lifeform is only available when the alien team has at least three active hives.
+		- All alien weapons and abilities are listed in the weapon groups (1-5), ala standard Half-life
+		- All passive movement abilities are always available
+		- The weapons and abilities in category 1 are always available
+			- The weapons and abilities in category 2 are only available when the alien team has at least one active hive
+			- The weapons and abilities in category 3 are only available when the alien team has at least two active hives
+			- The weapons and abilities in category 4 are only available when the alien team has at least three active hives
+			- There probably won't be any weapons and abilities in category 5 for now, but if they are added later, they will likely be linked up to the "alpha male".
+			- The alien player with the highest score is the "alpha male" and gets access to his category 5 weapons and abilities as a bonus!
+	
+	- Ramifications	
+		- This means can grow quickly by building resource nodes and can "tech up" by at the expense of other upgrades, static defenses, and some offense.  It also
+		means that if no aliens want to be builders, new hives will still grow.
+		- This also means that builder aliens can heal turrets, hives, players or other buildings while they are being attacked, enriching their support role.  It also
+		means they could function effectively near the front line.
+		- The energy bar means aliens will always be trying to optimize their weapon and ability usage.  It also limits abuse of webs, leaping, etc.  A great player
+		could continue to optimize his usage of energy, pushing for an earlier lifeform upgrade.
+		- Strategic strikes against hives or specific upgrade buildings could change all aliens capabilities immediately.  A alien "supply line" could also be attacked,
+		by attacking a structure in the middle of a chain.  Aliens could also build redundant bacterial links to prevent this.
+		- New hives are the key to radical new tech and lifeforms.  Keeping the hives under control will be an immediate priority for the enemy.
+
+- New alien weapons and abilities
+	O Implement unlocking of abilities with new hives 3/9
+	- Create resource buildings on func_resource
+	- Create plant turrets
+	- Design alien ammo/energy (and draw on HUD) (allow "reloading", but it costs points to refill, promotes waiting until almost empty, also promotes minimal use of firepower to get the job done)
+	- Draw alien membrane scaled
+	- Alien weapons and abilities
+		- An alien gun that fires both when you press the button and also when you release
+		- A tongue-spike that goes through walls and floors
+		- A spike gun that fires multiple spikes at once, at slightly different angles (around 30 degrees difference) (good players could hit multiple targets)
+		- A grenade-type weapon that inherits your velocity and also your angular velocity, so you can spin and whip it up onto balconies
+		- An alien gun that fires as fast as you can press the trigger
+		- A gun that charges, Melnorme style (it blocks whatever hits it, it grows bigger the longer you hold down, it is shot when released, it does more damage the bigger it is).  It only recharges when you don't have it held down, always takes same amount of energy to start.  Great vs. turrets!
+		- Dark swarm that blocks all visibility and turret fire!
+		- Phasing/teleport for level 4
+		- Ollying ability for level 4
+
+- Alien resource model
+	- First real system: building a structure or making a kill increased score by 1.  When resources are allocated, it is done proportionally by score, but with a minimum of 1 share per person.
+	- Show point costs for each icon
+	- Display current points
+	- Kills from structures increase score as well.  If a structure dies, the player that built it loses a point off their score.  This means players will want to protect their own structures.  Other players will want to also, because the loss of it means loss of a personal upgrade or future points.
+	- Loss of a structure removes the upgrade that the aliens have the most of.  Ie, if 3 aliens have pull back and armor, and 2 have pullback and regen, pullback will be removed first.  If this can't be removed from a player, a random upgrade from that player is removed.  This means the largest possible cohesive effect will be seen when structures are destroyed (suddenly, there are no cloakers, ie, the upgrade that was most "successful" and prominent)
+	- This means that builders won't build structures in dumb places, it would cost them
+	- Draw score on the UI somehow.  When a player has the highest score on their team, they should get a special designation (glistening?).  Maybe something for 2nd place also?
+	- When hive can spawn someone in, it spawns person with the highest score.  Spawning doesn't cost resources, except those lost on lifeform, which makes killing level 1s somewhat pointless.
+
+O Fixup grenade launcher (aiming is broken)
+
+- Fix up overwatch so it's not so accurate and deadly
+
+- <test at Iron Lore here>
+
+- Menu screen that lets you go back to the ready room (or otherwise switch teams)
+	- Do voting and other admin stuff from here?
+
+- Add ability to fire turrets by issuing them an order (!)
+
+- Software mode issues
+	- Crashing
+	- Try to decide if we want to support it
+
+- Fog of war?
+
+- Ability to hotkey buildings
+
+- Commander abilities
+	- Stim pack
+	- Teleport
+	- Shoulder cannons
+
+- Commander selection issues
+	- Make it easier to give attack-enemy orders (bounding spheres?)
+	- Highlight buildings to make easier to see for commander and players
+
+- Recoil and/or overheating
+	- Firing through walls with upgrades (maybe allow different depths according to upgrade?)
+	- Allow for aliens as well
+
+- Polish and improve waypoints
+
+- Experiment with using gamma
+	- Flash red when you're hit
+	- Green alien vision?
+
+- <test at Adrenaline Zone here?>
+
+Linux tar
+---------
+Make tar:
+tar zcvf tarball.tar.gz . 
+
+Unzip and untar:
+tar -xzvf tarball.tar.gz
+
+
+----------------------------
+- Particle system features -
+----------------------------
+- Allow editing of multiple particle systems with the same name (affect them all)
+- Add customizable gravity (for acceleration effect)
+- Add trigger that's fired when a particle collides
+
+Design ways for marines to participate with relying too heavily on combat (healing, building, ammo running, scouting, gate maintenance, etc.)
+	Scouting for marines:
+	  By product of a few rules
+	  - Move faster without weapons/armor
+	  - Purchase a HUD enhancement (scanner) that remembers the last position for an alien that was viewed
+
+Tourny quality:
+	- "Games need no configurable options. No obscure console based network settings and the like, just the game controls, a brightness slider and a 
+	connection selecter. I think this should be a high priority in the next ´cpl game´." 
+	- These game options could be stored at a URL.  Tourny mode makes it easy for people to sit down in front of machine, type their URL to download their base settings, then tweak their mouse sensitivy, gamma, monitor and stuff.  Make this part of the ready room?!
+	- Allow calling of time-outs.  Screen goes black, all chat becomes team-only.  Show countdown (configurable time).  Each team can call x timeouts per y rounds.  Only commander can call time-out, he does it in-game, it happens before the next round.
+	- Tournament mode where an administrator can view through anyone's eyes, record demo, pause the game, check people's configs remotely.  The best part would be if a player crashes, he could pause the game and wait for the person to reboot, reconnect and get back in, with same resources and everything, mid-game
+	- Have a tweaking map where everyone can run around and easily change their mouse sensitivity, try either side, set their binds, have access to all upgrades and abilities.  From here, the game should be able to be started on any map by the admin (they walk through door indicating they are ready to play) (maybe just ability for admin to give RUs, upgrades and lifeform to any player while paused)
+	- Disallow console access in tourny mode once game has started.  Checking .cfgs is one thing, but people will change it when the admin leaves!
+
+Actively think of ways the marine players will feel closer to each other after a game
+- Importance of repair role
+- The feeling that you know you're going to die if a person near you dies, or doesn't do something well
+- Gestures, communication, expressiveness.  
+  - This is the hardest part but potentially the most rewarding one.  Prevent that feeling of frustration you have when you feel you just can't do or express what you want to do in other games.  Doesn't happen as much in RTS, mostly FPS where the action is frantic and you have a persona (?).
+  - Custom skins, configurable sayings?  Ie, text to speech or custom chat sayings?
+
+Develop musical theme that is common throughout game (ala eXistenZ or Gladiator) (it should be the same theme for aliens and humans)
+- "Blizzard's music wizards Jason Hayes (sound lead on new unannounced, did zerg voices, protoss music I think, 318 984-7772), Glenn Stafford (War III) and Matt Uelman"
+
+-Angelus in medio ignis By Eric Serra. 
+(Great Choir work, done for the movie "the messenger") 
+-The good o'll "Panzerlied" 
+(Gets me all the time)  
+- Aria - 'Oceania, 'Tis for Thee' by Dominic Muldowney 
+(Sounds a bit like the Soviet party Hymn songs, and therefore it sounds great)
+
+Marines ability to fire depends on time spent looking in that direction (promotes alien flanking behavior, discourages marine DM behavior)...a bit unnatural though
+
+When a player disconnects from the server, have the model fade away slowly mid-action and play a phasing sound (or he walks back to base and disappears into spawn point area?).  Give some points back to the commander (half of what he's worth?)
+
+Report in - Updates marine's position with rest of teammates (like Aliens' HUD but is manual and not as up to date)
+  "Reporting in" - moving
+  "In position" - still
+  "Sarge!", "Help!" or "AIghghg!!" - being attacked
+  Marines only hear members in their own squad, and all superiors report in (though they still get update on HUD)
+  All communication and chat updates position as well
+  Any marine in view is automatically updated continuously, and for a few seconds after leaving sight
+
+Use text to speech capabilities for prototyping all comms
+
+Draw chat text on top of player via bubble to show who just said it
+
+Design marine training camp
+	- Human instructors
+	- Safe metagame
+	- Shooting range
+	- Give instructor full power for upgrades
+	- Place to try out jetpack jumping
+	- Area to be damaged slowly, surely
+	- Demonstrate what commander does (instructor becomes commander, everyone gets his view)
+	- Show what it's like for an alien to walk into an overwatched marine (put player into alien costume, he walks around corner...immersive ricocheting sounds, damage feedback)
+	- Military playground with buttons, elevators, glass, fans, etc
+	- No human can be damaged (except in danger area to test out lifesupport, healing/repair)
+	- Give instructor ability to transport others to server he goes to (they follow him)
+	- Check psychology references to see what kinds of environments people learn best in (no fear of failure, safe, clear source of direction)
+	- Drill Sargent: "What, you only got 50% accuracy with the AWP? That just earned you 300 pushups and 20 laps around the base, SOLDIER!" 
+	- Allow stats in the training mode.
+	- Make training camp useful for newbies, but also a way that clans could practice
+
+Design one-click play
+	- Starts game on clean, safe spaceship
+	- Access computers to train (on other server) or embark on a voyage (play).  Ping isn't nearly as important for training, so query for list of training servers from master and return an appropriate one automatically and quickly?
+
+Figure out a way for the aliens to cut the power ("What do you mean, THEY cut the power?")
+
+Alien base labrinth
+	- Multiple entrances and exits in a big mound of carbon stuff
+	- The base model has multiple doors and expansion nodes have names, link doors to these named expansion nodes, nydus style
+	- Means an alien can build one, then immediately receive reinforcements.  Remove warp gate?  Allow warp gate to be shot through?!! (big advantage for projectile-based marines)
+
+After first release:
+  - Have an official map of the week/month.  Post it super-prominently on the front page and it gives incentive for people to 
+  submit maps and put new ones in the rotation
+
+Extra features to investigate
+- Ability for the commander to call a time-out between rounds
+- Subliminal images of the aliens when they are near by (flash an image for a microsecond!)
+- Show tournament mode or casual mode in ready room
+- Add "Awaiting orders" or "Require assistance" and have them blink for commander's attention (hit space to go to)
+- When a player takes damage, play a "We're under attack" message, allow space to go to it
+
+When shipping:
+- Write Agent-Hunter for German mirror (www.blackmesa.de, agent@blackmesa.de)
+- Write ArsTechnica for followup
+- Write "excel", Joe Hoseman, of InVision Interactive 2 weeks before releasing first version of NS, he'll help out (InVision Interactive)
+- Write Bill Dugan at Sierra: Bill.Dugan@Sierra.com (tell him that it's released)
+- E-mail Max McGill telling him when the game is released
+- Write Tom Chick
+
+
+http://www.3dfestival.com/gallery_image.php?image_id=79
+http://www.faustodemartini.hpg.ig.com.br/mariner/mariner.htm
+
+Yeah this is my home ICQ (Chad) Hmm, well he might be at blizzard now then, although Bungie was after him too (on the forums). 
+Might of been from here: (*** warning you can waste alot of time here ***) 
+http://gallery.cgtalk.com/ or http://www.gd-world.com/  
+ 
+I did find his demo-real. Nice - it has music from run-lola-run. Here is link 
+http://www.cbsp.com.br/3d/Pictures/Fausto/ 
+http://www.cbsp.com.br/3d/Pictures/Fausto/repfausto.mp4 
\ No newline at end of file
diff --git a/main/source/doc/Before ship.txt b/main/source/doc/Before ship.txt
new file mode 100644
index 00000000..b5275513
--- /dev/null
+++ b/main/source/doc/Before ship.txt	
@@ -0,0 +1,7 @@
+Stuff to do before ship
+- Publically thank Groove Radio and Tag's Trance Trip
+- Make sure it works with the retail version of Counter-strike, and mention this publically
+- Get server ops to run the forums, they will be swamped (the Opera forums went totally nuts)
+- Put link on page that shows how many servers are up and how people are playing
+- Contact United Devices about integrating tech into server code
+
diff --git a/main/source/doc/Bugs.txt b/main/source/doc/Bugs.txt
new file mode 100644
index 00000000..b9f2e158
--- /dev/null
+++ b/main/source/doc/Bugs.txt
@@ -0,0 +1,149 @@
+Legend
+------
+- = unaddressed
+O = "fixed", not tested or not fully tested
+X = not going to fix, no longer needed
+
+  Bugs are listed in priority.
+
+
+Bug list
+--------
++ Don't allow aliens to pick up marine weapons and vice versa (also don't drop weapons when alien dies) (also only allow weapons for role)
++ Key bind problem (config.cfg gets rewritten incorrectly sometimes (with topdown bindings) )
++ Hitting ESC in top-down mode should do the right thing
+O Shotgun (and other weapons?) fire their effects even when out of ammo
+- All weapons should show up in HUD and be properly placed 
+	- Alien weapons should show up in HUD 
+	- Welder doesn't show up in HUD
+	+ Incorrect sprites are drawing for weapons
+- Change weapon artwork so weapons don't do crazy things
+	+ Fix up machine gun, knife and shotgun animations so they aren't embarassing
+	+ Mostly done, need to fix the knife idle anim though
+	- Add better pics for alien weapons
+O Init alert to not do anything before the first alert is set
+- can't chat while in commander mode **
++ Research messages are going to all players
++ MG underpowered, alien lifeforms massively underpowered
+O Remove blue line around hierarchy
+O Don't let bots use a leavegame entity
+O Turrets don't have nearly enough hitpoints
+- Turret solidity still weird
+O Siege should only target entities in it's LOS
+- Command sayings should go to entire team...convert to event.  Convert PlayHUDSound to local event as well?
+- Turrets come to life when you touch them, even when not built
+O Hives are still solid after being set active
+- Overwatch
+O Players don't join hierarchy correctly
+- Turrets should attack hives
+O Hives should count as aliens for "enemy sighted" blinking
+O Cloaked aliens should NOT count for "enemy sighted" blinking
+O Turrets and siege turrets should not fire at cloaked aliens
+- Welding status bar going to all players?
++ Alien weapons still don't fire correctly on net clients
+	+ Weird event playback problem with spit gun: runfuncs isn't being set for local player.  Once the server pauses the game by alt-tabbing back to MSDEV for a couple secs, the problem is fixed?!
+	+ It appears that this everything is playing correctly on other machines, just not locally
+	+ Claws don't work anymore, same problem? (they're not even showing up in HUD)
+- Allow scrolling from arrow keys
+- Left to right in tech tree doesn't make sense
+- Make logout button more obvious
+- Progress bar for building
++ Victory conditions
+	+ Killing all hives doesn't prevent aliens from respawning
+	+ Ready room doors
+	+ Don't allow marines to fire before game starts (allow aliens to though?)
+- Jetpack is underpowered and acts weirdly sometimes
+O Marine upgrades goes away at death
+O Ammo being given out correctly at beginning of round?
+O Shotgun isn't being spawned correctly
+O Don't allow joining teams or going back to ready room after game has started
+O When everyone leaves a server, the game doesn't reset
+- When the game resets
+	- Reset doors to the right position
+	O Remove all dead bodies (actually, fade these out immediately on death)
+	- Remove scorch marks
+- Weapons aren't being enabled/disabled correctly when player moves between ready room and game (but client is...wait does this even make sense?)
+- Investigate/remove impulse 101 and flashlight impulse
+- When joining a server, it's not setting music to the right offset, it starts at beginning
+- When typing disconnect, .mp3 playback is still going
+O Reduce size of machine gun bullet smoke, so big it obscures and slows down when targets are close (or don't play when you hit non-world)
+- Add "I'm in position", "Need assistance", "Need ammo", "I need some help here" sounds
+O Don't allow commander to scroll before the game starts
++ Finalize system to allow aliens vs. aliens and humans vs. humans
+O When a player leaves a team, remove him from the team hierarchy (this is why jumping back and forth between teams causes game to start, it thinks there are players on both teams)
++ Add bullet smoke puffs
+- Armor isn't visible in HUD (is that it in the lower right corner?)
++ Crash when picking up ammo while holding knife
++ Fix dropping of alien weapons and knife
+O Check welding
+	O Fix progress bar for welds that are opened
+	- Don't allow welding progress when any player is touching the weld
+	- Fix solidity problem (check the HL code on "use" to see how it traces a non-solid, non-blocking, visible entity?) (FL_WORLDBRUSH?)
++ Add crosshairs (pfnSetCrosshair)
+- Make sure aliens can't "use" things
+- Fix up overwatch
++ Add in scoreboard of some kind
+- Particle editing bug
+- Fix crap text for tech buttons (use images)
+- Fix flight events so it makes sound and plays animation if possible
+- Revisit resource injections
+	- Link resource variables to info_map_info
+- Have alien hives give more feedback when taking damage
+	- Blood?
+	- Marines get "the enemy is under attack"
+	O Hive screams or makes gushing noises when hit
+	- Should show damage as status bar?
++ Reload sprites in alien pie menu on map switch (is this causing the crash?  this seems to be the only map switching bug right now!)
+- Observer mode doesn't look up or down (also make player invisible for rider)
+- Observer mode won't let you change targets correctly
+- Add entities that observer starts at so you don't have to travel to the map
+- Clip observer to the map extents and view height
+- Clicking the mouse in top-down mode moves
++ When there are no people in the game, reset it then set flag indicating the game has been reset.  When a player joins, reset flag again
+O When going back to ready room, remove all upgrades and reset player model render mode (could've been invisible)
++ Only send alert when player takes damage from enemy, not from falling
++ Alien regenerating after death?
++ When connecting to existing server, particles aren't being triggered for creation
+O Don't allow "logout" button to function after a drag (like tech buttons)
+- Welder, mines, weapons aren't spawning when placed in map from Worldcraft (also, rename all weapons to weapon_)
+O Major performance issues (largely vguiDrawLine, because filling rect proved VERY slow when drawing minimap with it)
+- When going into top-down mode for like the 10th time, viewpoint is totally wrong (?)
+O Setting gamma to 1.0 repeatedly makes screen get darker
++ Sys_error when viewing any of the alien models (thirdperson, or if other player sees it)
+- When alert sounds, send "hit space to go to alert" to commander.  Prereq: have commander view draw hud messages
++ Creating game on shodan doesn't work?
+- Colliding with world problems, when in commander mode
+- Software mode: rectangles and lines don't take parent offset into account (I think this is the problem)
+X Defection doesn't work correctly (removed)
+- When a player demotes himself, update team so the player's leader is right
+- Bug: when demoting self, commander slot still taken, can't get another commander
+- Add audio/visual order giving feedback
+X Ammo and clips disappeared from HUD: gWR.GetWeaponSlot() returning NULL in ammo.cpp, line 1153 (weapon bits aren't coming across?)
+X Fix view height tracing
+- Land mines become solid when laser pops out, player can get permanently stuck in it
+- Fix overwatch entity tracing
+O Fix size problem for tech buttons (they are taller than they look)
++ Giving a weld goal gives a location of 0,0,0
+- Squad mates that in sight don't get updated, add squad to PVS or send extra position updates for squadmates
+O Don't allow researching of the same thing twice
+- Be able to give "pick up equipment" orders, by clicking on a dropped weapon
+X Be able to give "use" order, by clicking on "useable" (light switches)
+O Fix drawing of tech point costs
+- Write some kind of test bed for particles to prevent Crinity problems
+X Make shotgun smoke look good
+- Fix particles to collide with players as well
+- Bots (other players) show overwatch when moving (effect doesn't go away?)
+O Jump out of top down on the client when map changes
++ Game crashes when map switches (only occasionally, maybe only when leaving viewtest5, ie with buildings?)
+- Overwatch view cone is garbage sometimes (wrong sprite frame?)
+- When in CS mode, allow order giving anywhere, not just on ground floor
+- Commander hierarchy isn't populated by default, only when a player is added to the game after it's been viewed, does it draw anyone
+- Fixup observer for commander!
+
++ High-priority: crash when generating minimap...overwriting end of memory with zero
+
+
+- Particle system rotations not rotating correctly (MathUtil: AngleMatrix, RotateValuesByVector, VectorRotate)
+- Double-check assignment within conditional.  I'm not sure it's picking it up everywhere in UTIL_InSphere
+- fmod.dll crash or target_mp3s don't play when maxplayers is 1
+- Weirdness eventually leading to crash when switching maps while in commander mode
\ No newline at end of file
diff --git a/main/source/doc/Cheat codes.txt b/main/source/doc/Cheat codes.txt
new file mode 100644
index 00000000..2e210d96
--- /dev/null
+++ b/main/source/doc/Cheat codes.txt	
@@ -0,0 +1,58 @@
+
+Here are some cheat codes and server variables you may find useful.
+
+Cheats 
+------
+Notes: 
+	- sv_cheats must be 1
+	- If cheats aren't 1, it will say "unrecognized command", even though it IS a recognized command
+
+spawnhive - As an alien, creates a random new hive for your team
+killhive - As an alien, destroys a random hive
+addcat x - X where is 1-4.  Adds a random upgrade category, just like you had built an upgrade chamber (1 is defense, 2 used to be offense, 3 is movement, 4 is sensory)
+removecat x - Take a guess.
+givepoints (bound to F11 by default) - Gives you some points
+killall - Kills all players in the game with your current weapon (won't kill teammates unless FF is on via tournament mode)
+invul - Toggles invulnerability for yourself.
+startgame - Starts game immediately (untested for awhile)
+endgame - Ends the current game (as a victory for team one).  You can also type "endgame 1" for the same effect.  If you type "endgame 2", it will be a victory for team 2.
+adjustscore x - Changes your current score by x, where x is positive or negative
+tooltip lala - Adds a tooltip named "lala".  It will translate this tooltip if found in titles.txt, if possible.
+testevent - Plays a "you just got points for killing the enemy event", for testing where the commander can see events (he can't sometimes, when hovering over the void, or inside geometry)
+getnumplayers - Reports the current number of human players
+startcommandermode - Teleports you near the first command station it finds and starts commander mode.  This will sometimes teleport you inside geometry.
+stopcommandermode - Drops you out of command mode, useful when your mouse or the logout button stops working
+web - Gives you the effects of having just touched one web.  Use multiple times to simulate touching multiple webs.
+setculldistance x - Used by mappers to find the minimum culling distance needed for commander mode on their maps.
+setgamma x - Sets the current env_gamma level, where x is a number from 1.0 to 2.0.  This affects all players.
+bigdig - All buildings are built instantly, doesn't require manual building
+hightech - All research happens nearly instantly
+orderself - When commanding and giving orders, this will give the orders to yourself, so you can logout and see how they look on the HUD.  There's no way to stop doing this after you've used this cheat.
+editps <name> - Used to edit a particle system
+listps - Lists all particle systems in NS and in the map
+buildminimap - Generates a new minimap.  Very CPU intensive.  Saved in the ns/sprites/minimaps directory.
+crash - Causes NS to crash.
+assert - Causes NS to assert
+run <name> - Runs a server-side script.  Ignore this until scripting is more in place.
+clientrun <name> - Runs a client-side script.  Ignore this until scripting is more in place.
+giveupgrade x - Gives an upgrade.  20-22 are the marine armor upgrades, 23-25 are the marine damage upgrades, 28 is jetpacks, 29 is power armor, 31 is faster reinforcements, 33 is motion-tracking, 26 is siege, 27 is stimpack, 30 is distress beacon
+removeupgrade x - Like giveupgrade but removes one.
+killcs - Kills all command stations.
+attackcs - Does a little damage to one command station
+alert - Generates a random alert.
+parasite - Parasites self (no damage)
+paralyze - Paralyzes self (like level 5 ability)
+boxes - Draws boxes around all buildables (not sure if this still works).  Effect goes away after a short time.
+overflow - Tries to overflow player.
+deathmessage <weaponname> - Sends test death message to all.  Example: "deathmessage machinegun", "deathmessage bitegun"
+setskin x - Sets the players skin (0 for white marine, 1 for black marine)
+redeem - Makes it easier to test redemption
+
+Other useful console commands (these aren't cheats, not yet):
+
+jointeamone - Joins team one, if not on a team
+jointeamtwo - Joins team two, if not on a team
+spectate - Starts spectating, if not on a team
+readyroom - Brings you back to the ready room, if not in the ready room
+autoassign - Joins the team with the least players.  If teams are equal, picks a random team.
+addbot - Adds a bot to the server, on autoassign.  This is F3 by default.
diff --git a/main/source/doc/Checkin.txt b/main/source/doc/Checkin.txt
new file mode 100644
index 00000000..83e698fc
--- /dev/null
+++ b/main/source/doc/Checkin.txt
@@ -0,0 +1,3461 @@
+Checkins
+
+Monday, 4/9/01 5:55pm (most of this code was done on Friday 4/6/01)
++ Added many constants, including weapon names and entity names
++ Added new spawning system including the concept of the ready room and alien/marine spawns.  Added concept of teams.
++ Added new entities: avh_ready_room, avh_marine_start, avh_alien_start, avh_join_marines, avh_join_aliens, avh_join_autoassign, avh_leave_game and other unimplemented entities
++ Added Aliens-esque green teletype for the message of the day.  When you connect to a server, you immediately spawn in the ready room and see the MOTD type out, then fade away
++ Added spectator mode (like CS/TFC, spectator is a dynamic light right now, for fun).  Hitting enter will spawn you back in the ready room.
++ Reworked and simplified game rules, including tournament/casual mode.  Setting mp_tournament mode is all it takes. (rippled a bit through chain of command). Removed now-outdated AvHCOCRuleset.cpp.
++ Added ability to "purchase reinforcements" from the pie menu, which spawns a spectator in on your side (needs more work at high-level)
++ Added translation hack to let UIManager coexist peacefully with teamfortress_viewport UI elements.  This probably won't be needed because of the new spawning model.  I'm going to attempt to not use any interactive UI elements outside the pie menu.
++ Gamma stuff is no longer on by default so I can debug in windowed mode without garish artifacts
++ Chat should no longer work between the play area and non play area
++ Added mp_allowspectators and mp_tournamentmode
++ Added HUD ammo elements again, so I could choose items from a menu (probably not needed long-term)
+
+Tag: Alpha1
+Monday, 4/16/01 11:39am (Was doing taxes and sick a lot of this last week so didn't get much done)
++ new music system (plays randomly .mp3s out of your music dir, pauses between songs, volume control)
++ spectator mode (free roaming, lock, free-look)
++ reinforcements (paying to spawn your friends in while they're in observer mode)
++ a resource entity that you "build" (by holding use) then it gives your team points
++ resource injections every so often
++ all weapons cost points now
++ respawning costs points, if you can't pay it, you are made a potential reinforcement
++ experimented with making the machine gun pause after emptying its clip, new sounds
++ You can only die (or suicide) when playing, not in ready room or observer
++ Joining a team when a game is in progress makes you a reinforcement
++ The ability to have marines play marines, or aliens play aliens
++ Checking for victory (a team has no bases)
++ Lots more little stuff
++ Added avh_deathmatchmode for demoing regular maps and just running around and shooting each other
++ Precached weaponbox so a player could drop their weapons on death
++ Added UTIL_Teletype, UTIL_Tutorial and UTIL_Error (they don't work quite right yet tho)
++ Players in reinforcement mode should now only be able to view members of their team (untested)
++ All text file assets are in CVS and are copied into the game dir as part of the build (hl and cl_dll, all configs)
++ Added server variables for all weapon costs, resource injection times/amounts, pregame time, reinforcement cost and more 
++ Added new avh_resource entity.  Starts off half-transparent, then when you +use it for awhile, it builds up, fading into view.  When fully built, starts humming.
+
+Wednesday, 4/18/01 10:47am
++ Added the concept of player roles.  It's propagated to the client.
++ New ASSERT support (already found one two bugs with it!)
++ Support for different pie menus for soldier, leader and commander
++ Reworked pie menus.  They look great now.  They fade in and out better, don't have an image background (ie, no more vgui+impulse+white bug). They also show real+time point costs next to purchasable items, and nodes are disabled if you don't have the points to spend.  Pie menus now have separate x and y spacing. Pie menus now resize all nodes to be as big as the largest node needs to be to contain all the text. Tons more fixes. 
++ FadingImageLabel is now really a fading panel (haven't renamed yet). Fixed lots of bugs and inconsistencies
++ Added ability to "hide" components by translating them away.  This is needed to have overlapping, hidden components (ie, three pie menus)
+
+Tag: Alpha2
+Wednesday, 4/25/01 10:24am
++ Final phase of pie menus.  They have been further refined for speed and efficiency, using feedback from a Live Person (Matt).  They rock now!!
++ Added support for longer HUD messages (it was hardcoded at 80 per line)
++ Changed default music setting to 0 for testing
++ Added cl_quickselecttime for piemenu speed selection
++ Projects now copy config.cfg, server.cfg and listenserver.cfg as part of build
++ Music now starts when you start playing, not when you enter the ready room.  When you leave the play area, it stops again (observer mode, reinforcement mode, etc)
++ Purchasing upgrades and equipment
++ Upgrades are now screened by role type
++ Concept of ammo 
++ New message system for giving hints and instructions to players
++ Team now stored in pev+>team instead of player
++ Dropping items and inventory selection (toggle weapon now works right)
++ Added localized messages that display when your playmode changes or when your role changes
++ New weight system that changes your current speed depending on marine/alien and amount and type of weaponry/ammo you're holding
++ Hitting a mouse button in the ready room displays instructions (before you have a weapon or pie menu)
++ Ripped out weapons-class macro crap.
++ Weapons report info correctly including clip size, slot position, ammo type, total ammo allowed, etc.
++ Added mines!
++ Added buildable turrets!
++ Added droppable generic ammo packs that get added as a full clip to whatever weapon you're holding!
++ Weight system
++ Ammo no longer respawns automatically
++ Allowed to join teams whenever when cheats enabled
++ Added spawnenemy command (not sure if it works right)
++ Added equip1, equip2 and equip3 commands
++ Weapons allowed/disallowed for various roles
++ Support for weapons to decide what they do when they run out of ammo
+
+Tag: Alpha3
+Saturday, 4/28/01 1:01am
++ Ripped out weapon factory and WeaponInfo and made weapons normal, non+generic classes
++ All weapons are now predicted on the client
++ Changed many includes and broke out much duplicated HL code as part of weapon prediction work
++ Many new sounds for weapons
++ Added countdown clock to automatically start game
++ Alien idle and movement sounds that play depending on how frantically you're moving, also individual death, pain and wound sounds
++ New sound list manager that makes it easy to manage a list of sounds in a directory, without having to manually precache or choose one randomly
++ Added concept of team upgrades
++ Added pie nodes that upgrade along a path (they change upgrade values, then reset at the start of the match)
++ Renamed and/or removed most upgrades
++ Reworked pie menu again to reflect complete and utter lack of marine roles (I think it's for the best for now)
++ The pie menu now uses localized text from titles.txt
++ Turrets stop firing better
++ Pinging sound is softer and fades off faster 
++ Fixed team chat and regular chat so they work from the menu
++ Added tons of titles
+
+
+Tag: None
+Monday, 4/30/01 10:07am
++ Tried to get release config to build but stopped
++ Removed old weapons factory files and includes (this wasn't caught before, I had to do a full rebuild)
++ Removed outdated variable code
++ Added avh_alienspawncost
++ Added concept of illegal observer mode.  The screen goes black when you have no targets you're allowed to watch.
++ New client+side jetpack effects for all players!  Creates dynamic lights and they stay updated with player positions as they're using jetpacks.  All creates jetpack sound that is updated.  Lights are killed when the jetpack is turned off.  Happens client+side, then propagated to everyone else, beautiful!
++ Hooks for propagating jetpack events to everyone
++ Awarding points to players when they, or their turret or landmine, gets a kill
++ Point calculation for a player
++ Check for team victory!
+
+Tag: None
+Tuesday, 5/8/01  6:44pm
++ Added drawing of health on hud
++ Added weapon switching, including using the standard half+life weapon switch icons (after much fighting)
++ Finished up the particle system!  Working pretty darned well now.  Entities in Worldcraft work, then can be toggled on and off.  Tons of new parameters.
++ Now AvH supports playing on Counter+strike maps!  It will try to play a map as AvH but if it can't, it tries as a CS map, if it can't, it will try as a DM map.  Means you can play AvH on de_dust!  Used for prototyping gameplay.
++ Killing monsters or other players awards points in a general fashion
++ Added rank promotion/demotion through pie menu
++ Fixed up gamma correction so it's more compatibile on more systems (it will try different gammas until one works)
++ Fixed major problems with gamma ramp stuff (blatant bugs when generating ramp)
+
+Tag: None
+Wednesday, 5/9/01 6:44pm
++ Reworked particles integration with Worldcraft, it's great now!
++ Customizable particle systems are now completely supported in worldcraft in a relatively intuitive and visual fashion
+
+Tag: None
+Tuesday, 5/15/01 3:45pm
++ Added collision detection to particles, so they can generate other particle systems
++ Fixed up particle systems so they work right in multiplayer, including when changing levels in multiplayer and using "map whatever" in test mode
++ Added "constrain pitch" flag and "use world gravity" flags to particle systems
++ Better support for starting velocity and generation primitives
++ Added fade-in, fade-out and both fade-in fade-out support for different lifetime types
++ Reset particle system when map changes (completely reworked resetting for clients)
++ Fix slowdown problem where particle systems not getting deleted
+
+Tag: None
+Thursday, 5/17/01 10:56pm
++ Added new welder weapon!  This can be used to weld things closed, or weld through certain items!
++ Weldable entities are created in Worldcraft where their hit points, time to weld, weld-open or weld-close and other options are chosen
++ Added tons of cool effects for welding
++ Added progress bar that shows how much time is left on this weld job
++ Added support for destroyable weld-jobs (for welds that are closed, instead of opened).  
++ When closeable weld-jobs are destroyed, or when openable weld jobs are first finished, create a explosion of pieces of the correct material 
++ The welder and wendable entities are ready for use
++ Added default F keys for switching roles easily
+
+Tag: None
+Monday, 5/21/01 10:01am
+
+Features
++ First phase of overwatch!  All the code has been written but it needs some tweaking and fixing.
++ Stand still for 5 seconds or so and overwatch kicks in.  An overwatch indicator lights up and a sound plays.
++ While in overwatch, any enemy in view, in range of your weapon, is targetted.  When targetted, your HUD displays range to current target, and automatically starts firing at it.
++ Added "tension" sound that plays a low droning in the background when overwatch has a target, then increases the droning volume and pitch as the target gets closer.
+
+Internals and programming details
++ Reworked some of the user entity variables
++ Pulled Roach class definition into .h file so it could be included and extended
++ Roach has a class name now so it can be queried
++ Renamed user variable enums to be more descriptive and to make bugs more obvious
++ When in overwatch, weapon firing happens on the server, so send events to everyone (don't assume client already played it)
++ Oops, allow construction of FadingTextLabel from ui.txt
+
+Tag: None
+Tuesday, 5/22/01 7:03pm
+Features
++ Added bot support!  These bots are quite stupid right now but they are useful for testing large numbers of players.  It's really fun to have bots spawn in with names like Citizen, PsychoBoyJack and SquealLikeAPig.  It's about the only time I get to kill them.
++ Completely rewrote the chain of command, for the last time.  It is relatively clean and simple, now I'm going to rewrite the UI side of it.
++ Added support for soldier defection.  Leader rubbing your wrong?  Leave and join a new squad.  No others to join?  Take what's rightfully yours and venture out on your own.  A last resort for abusive superiors.
++ Preparation for implementing the first version of the commander mode
++ Lots of tweaks and fixes to observer mode, as the bots where using it when they died (they basically pound their buttons all the time) and it showed me where some problems were.  See the "no observer targets"?  That was them.
+
+Internals and details
++ Added "defect from squad" option to soldier menu
++ Different "got resources" messages for soldiers, leaders, and commanders
++ Added client sided prediction for welder (should've checked this in earlier, oops)
++ Precache snark for testing (not necessary tho)
++ Fixed up some respawning/points issues, fixed up observer mode 
++ Commented out debug message when a missing EXPORT is detected.  This was causing lots of error messages when using the bots, not sure why but everything still works fine (has something to do with the .dll spoofing of the bots)
++ Various changes to get bots working...this one is a bit scary but it seems to work and botman seems to know what he's doing.  It's on the end of the struct so I think it goes unused...
++ Removed tons of duplicate files that the HPB_bot was using, now it's using the my modified HL headers
++ Added just enough hooks to get bots spawning in and choosing teams
++ Added utility function to see how many clips a current weapon could use
++ Completely reworked command structure
++ Removed SetRole console command
+
+
+Tag: None
+Sunday, 5/27/01 5:18pm
+Features
++ Added player hierarchy that shows locations of relevant players.  Draws animated icons depending on whether players are talking, firing, can see an enemy, or are in overwatch.
++ Worked to make sure it is network efficient
+
+Internals and details
++ Updated F key keybinds for debugging
++ Added FillRGBAClipped utility function
++ Removed outdated chain of command, added new player hierarchy
++ Commented out SetRole command
++ Added new player state; enemy sighted, in overwatch, is speaking, etc
++ Added support for drawing animated icons on team hierarchy in generic fashion
++ Much more full-featured
++ Feeble attempt to change chain of command text (not sure if it worked, something's definitely wrong here)
+
+Tag: alpha4
+Saturday, 6/2/01  1:18pm
+Features
++ Top-down mode!  When a player is a commander, he leaves his body and zooms up above the map.  He can use the mouse cursor to pan around, select teammates, and give them orders.
++ When holding the welder, all weldable areas show as translucent
++ Hiearchy can draw whole map and all players for commander view
++ Fixed jetpack effects not firing if you weren't holding a weapon
+
+Internals and details
++ Added selection box component
++ Increased max speed for top-down panning responsiveness
++ Propagate weaponselect field for top-down mode
++ Added cursor binds for scrolling
++ Added bot config files
++ Added new entities for top-down mode: avh_seethrough, avh_viewheight and avh_viewfloor
++ Added utility function: CreatePickingRay
++ Added drawing of selection effects and orders
++ Removed scoreboard, it was causing problems
++ New input changes to make top-down mode work
++ Changed project settings: copy bot config files after build, added order, scrollhandler and marquee component files, new pm files
++ Tell AvHPlayer what move the player is currently making
++ Fade entities for commander
++ Reworked drawing of hierarchy to fix crash bug when querying world during draw
++ Added impulse for commander mouse click in top-down mode
++ New specials for welder view, commander view, glow effect
++ Added code for click selection, lasso selection, giving and taking orders, top-down support
++ Added code for click selection, lasso selection, giving and taking orders, top-down support
++ Perform selection client-side, give immediate feedback, then receive real selection from server when it arrives
++ Overwatch indicator pulses now
++ Various showing and hiding of components depending on mode
++ Fixed a few bugs with getting info about the hierarchy
++ A couple fixes for showing/hiding the mouse cursor when using the pie menu in top down mode
++ Temporarily allow rank changes after game has started, and allow commander no matter how many teammates, for debugging purposes
++ Changed the predicted movement code to live in .cpp files, finally
++ Added ability to always draw text even when label is fading
++ Added Update() function to all components
++ Added FadingImageLevel support in ui.txt
++ Added MarqueeComponent support
++ Added selection effects
+
+New files:
+AvHServerUtil.cpp
+AvHSelection.cpp
+AvHSelection.h
+AvHScrollHandler.cpp
+AvHScrollHandler.h
+AvHOrder.cpp
+AvHOrder.h
+
+Tag: alpha4
+Monday, 6/11/01  5:48pm
++ Added colored panel for top down view (allows filtered looking view)
++ Added logout button for top down view
++ Added avh_groundfloor for selection
+
+Internals and details
++ More messages, having to do with rank changes
++ Renamed avh_viewfloor entity to avh_glow
++ Added selection event
++ Fixes to reset view angle when leaving commander mode
++ Various top-down tweaks
++ Added drawing of debug graphical effects
++ Moved utilities into more general-purpose area
++ Barney won't drop his gun anymore, causing crashes because I stripped out most HL weapons
++ Renamed avh_viewfloor to avh_glow
++ Fixed problem with loading particle systems from levelname.ps
++ Renamed selection helper
++ Added new entities to bot linkfuncs
++ Added new utilities functions for picking units
++ Added ColoredPanel, ReloadablePanel and the beginning of ButtonChain
++ Added HideComponents
++ Fixed hidden translate components bug
++ Added ability for components to be reloaded on vidinit (needed for sprites)
++ Labels no longer start with "default text"
++ Fixed up top down movement
++ Tried to get client-side selection prediction working but it's not quite there
++ More entities, new constants, new selection event
++ Handler for UI while in commander mode
++ Team hierarchy reloads properly after a map change
++ Team hierarchy draws squad's hierarchy for soldiers
++ Team hierarchy: other fixes
++ Fixed overwatch firing for you when another player enters/leaves overwatch
++ Fixed cut and paste typos for weapon constants
++ Added functions to draw debugging circles easily
++ Added selection event 
++ Changed hard-coded chat commands to constants
++ Removed AvHSelection, now it's in AvHSelectionHelper
++ Bug fixes for defecting soldiers
++ Refactoring
++ Heavy MG can be bought again
++ Removed order giving for now
++ Enemy sighted works better now
++ Changed selection to use selection helper
++ Cleaned up StartTopDownMode
++ Wrote StopTopDownMode
++ Renamed SelectUnits to SetSelect
++ Refactored AvHHud
++ Fixed problem where leaving commander mode caused angles to be screwed up
++ The right UI components are now shown as roles change
++ Selection effects cleared after leaving top down mode
++ Selection is predicted, but is currently #ifdefed out because it selects everything right now
++ Made top-down camera a lot less bouncy, still not great though
++ Don't allow selection of spectators (!)
++ Bad looking lines
++ Being able to exit commander mode (now fix dead cam when leaving)
++ Having matches end safely
++ Selecting something that is already selected causes effect to be cleared locally and not resent
++ Pie menu doesn't come up after restarting map (variables in AvHHud::Init?)
++ Bots cause immediate crashing
++ Pie menu and maybe other HUD elements disappear after map switch
++ Overwatch activates when in top-down mode
++ Team hierarchy not updating/drawing as soldier
++ Team hierarchy not drawning anything in soldier mode
++ Overwatch is drawn even when not in overwatch
++ Can't move when game starts
++ Make team hierarchy show up when first becoming a soldier
++ Test out enemy sighted functionality
++ Draw selection effects at feet
+
+Tag: none
+Thursday, 6/14/01  2:13pm
+New features
++ Added tech tree!  Each team has a tech tree with nodes that can be open, closed or researched.  The tech tree is reset at the end of each match.
++ Reworked upgrades to be efficient and forward thinking.
++ Now the commander can see all upgrades on screen and can choose to research different nodes.  Hovering over each tech will show an explanation for what that tech does.  Open techs are clear, closed techs are red, researched techs are green.  All players get notified of a research in progress, and are told what the technology does.  All tech research is cheat-proof and localized correctly.
++ Cleaned up weapon dropping to use real weapon models and amount of ammo left.  Cleaned up weapon HUD so it is much more accurate (don't draw ammo when not holding a weapon, don't draw expendable weapons when out of ammo, etc.)
++ Lots of little bug fixes including: round resets better now (doesn't crash, chain of command reset right, spawn back in ready room), promotion/demotion works better, jetpack works when not holding a weapon, etc.
+
+Internals and details
++ util.cpp, cl_util.h: Improved localization function to work with STL strings and to add a # if needed
++ input.cpp: Sending of tech research events
++ cl_dll.dsp: Added new files
++ hl_weapons.cpp: Fixed bug where jetpack effects weren't firing if you weren't holding a weapon
++ hl_weapons.cpp: Changes to use new upgrade system
++ hl_baseentity.cpp: Changed string to be const
++ weapons.cpp: Unhide weapons HUD when picking up a weapon
++ tripmine.cpp: Fixed bug where tripmine would sometimes explode when touching the world
++ player.cpp: Keep HUD up to date when dropping a weapon
++ hl.dsp: New files: AvHSpecials.cpp, AvHTechNodes.h, AvHTechNodes.cpp
++ ggrenade.cpp: Doubled grenade damage, added experimental "bullet cam"
++ game.cpp: Added mp_bulletcam variable
++ client.cpp: Moved iuser4 into iuser3
++ cbase.h, cbase.cpp: Changed string parameter to be const
++ pm_shared.cpp: Moved iuser4 into iuser3, removed alien movement abilities temporarily, migrated to new upgrade system
++ UIManager.h : Always at least set output component to NULL for good measure
++ UIHud.h, UIHud.cpp: Misc vidinit fix, change StopMusic() to public to music can be reset at the end of the match
++ New files: AvHSpecials.cpp: Utility functions dealing with upgrades
++ New files: AvHTechButtons.h, AvHTechButtons.cpp: UI component for drawing tech tree in commander mode
++ New files: AvHTechNodes.h, AvHTechNodes.cpp: Representation for team tech tree 
++ AvHUIFactory.cpp: Support for new component "TechButtons"
++ AvHTitles.h: New constant for title
++ AvHTeam.h, AvHTeam.cpp: Team now manages tech tree, cleaner resetting at the end of match
++ AvHSquad.h, AvHSquad.cpp: Cleaner resetting at the end of match
++ AvHSpecials.h, AvHSpecials.cpp: Reworked entity constants, integrated iuser3 and iuser4, added tech tree contants, added tech tree utility functions
++ AvHScrollHandler.cpp: Compute screen coordinates of marquee selection correctly
++ AvHPlayer.h, AvHPlayer.cpp: Removed superfluous topdown functions, removed old armor system, added new tech tree support, cleaner and simpler weapon dropping, added tech researching, removed old pie-nodes-changing-cost stuff, weapon HUD fixes, resetting game fixes
++ AvHParticleSystemEntity.cpp: Moved iuser4 into iuser3, removed alien movement abilities temporarily, migrated to new upgrade system
++ AvHMessageID.h: New tech tree constants, removed old placeholders
++ AvHMarineEquipment.h, AvHMarineEquipment.cpp: After using the last mine, it now disappears from your HUD correctly
++ AvHCommanderModeHandler.h, AvHCommanderModeeHandler.cpp: Watch for tech nodes pressed, send up to server
++ AvHConstants.h: Removed old tech constants, added new
++ AvHEvents.cpp, AvHEntities.cpp: Moved iuser4 into iuser3
++ AvHHud.h, AvHHud.cpp: Added new researching, removed old armor system, moved iuser4 into iuser3, cleaner localization
++ AvHGamerules.h, AvHGamerules.cpp: Moved tech tree into team, removed old armor system, removed givearmor cheat (this should go back in)
++ delta.lst: Increased resolution of iuser4 for upgrades, add fuser2
++ ui.txt: Added research UI components
++ titles.txt: Added localized pop-up help text for all upgrades, also localized tech category names
++ resolution-dependent layout text files: Made font sizes and types look better in all resolutions, add scheme for tech nodes
+
+Tag: none
+Monday, 6/18/01  1:56pm
+New features
++ Weapon and armor upgrades are now in and functional
++ Weapon effects now take upgrade level into account (every weapon plays a different attack sound for each upgrade level.  Muzzle flash only happens when weapon is upgraded past level 0, view "shake" is affected by upgrade level (the higher the upgrade, the more the view shakes when firing), the heavy machine gun emits smoke only when upgraded, firing is louder and can be heard farther away with each level of upgrade, lots more)
++ Added research progress status bar that displays when researching tech
++ Turrets now use weapon upgrades, turret firing plays different sounds depending on upgrade level, only muzzleflash when upgraded, turrets get strengthened by armor upgrades
++ Mines, turrets, resource nodes, completed weld jobs and players are all strengthed through armor upgrades
++ New console commands: giveupgrade #, removeupgrade #, botleader
+
+Internals and details
+- cl_dll.dsp: Not sure what changed here, it looks like the whole file?
+- enginecallback.h, eiface.h, AvHMarineWeapons.h: Minor #include change to allow testbed to compile
+- client.cpp: When weld jobs are done, don't draw in special alpha mode (indicating that they are weldable)
+- hl.dsp: Added player upgrade files
+- tripmine.cpp, player.cpp, ggrenade.cpp: Tripmines, players and grenades now take into account armor and upgrade level when taking damage
+- New files: AvHPlayerUpgrade.h/.cpp: Central place where armor and weapon upgrades are taken into account
+- AvHWelder.cpp, AvHSonicGun.cpp: Weapon upgrades are taken into account when doing damage
+- AvHTitles.h: New titles
+- AvHPlayer.h/.cpp: Refactoring upgrade code
+- AvHBasePlayer.h/.cpp: Changed includes for testbed, weapons use weapon upgrade level to do more damage
+- AvHBasePlayerWeaponConstants.h: Standardized weapon constants, there are now four sounds for every weapon, tweaked punch values, changed ROF for MG and HMG
+- AvHSpecials.h/.cpp: Refactoring
+- AvHServerUtil.h/.cpp: Added utility function for account for effects of armor generally (used by all weapons, players)
+- AvHMachineGun.cpp, AvHGrenadeGunc.cpp, AvHNukeGun.cpp: Weapons have four sounds now, one for base level, then a new firing sound for each level of upgrade
+- AvHEvents.cpp: Weapon effects now take upgrade level into account
+- AvHEntities.h/.cpp: Resource entities can now be armored (in Worldcraft), weld jobs now can be strengthened through armor upgrades
+- AvHConstants.h: New console commands: giveupgrade #, removeupgrade #, botleader, added research progress status bar that displays when researching tech
+- AvHGamerules.h/.cpp: New console commands: giveupgrade #, removeupgrade #, botleader, added research progress status bar that displays when researching tech, refactoring for upgrades, remove check for num commanders temporarily
+- AvHHud.h/AvHHud.cpp: Audio/visual feedback for research, added mouse-over help text
+- AvHMessage.h: Added turret command back in
+- AvHMarineEquipment.h/.cpp: Changed hard-coded strings to constants, turrets now use weapon upgrades, turret firing plays different sounds depending on upgrade level, only muzzleflash when upgraded, turrets get strengthened by armor upgrades
+- AvHMarineEquipmentConstants.h: New constants for turrets 
+- AvHOrder.h: Added #include guards
+- AvHTeam.h/.cpp: Minor refactoring in preparation to fix rank demotion bug
+- AvHTechButtons.cpp: Draw cost of upgrade on each tech button, localize category properly
+- UIHud.cpp: Fixed bug where music wasn't starting again after the round ends and restarts
+- New files: STLUtil.h/.cpp: string functions and home for STL functions
+- util.dsp: Added STLUtil.h/.cpp
+- ui.txt, resolution config files: Make researching look nicer (too bad it doesn't yet)
+- titles.txt: Make researching look nicer (too bad it doesn't yet)
+- avh.fgd: Added "maxarmor" field to resource nodes
+- avh.ps: Added particle smoke for full upgraded heavy machine gun
+
+
+Tag: none
+Friday, 6/22/01  8:50pm
+New features
+- Added animated sprite cursor support for context-sensitivity in top-down mode.  Unfortunately, they draw below UI components, can there's nothing I can do about it, so this was probably wasted work.
+- Cleaned up all sound effects, in preparation for getting a Sound Guy.  There are proper placeholder sounds everywhere, ready to be replaced and tested.
+- Added scripting language called LUA.  I'm testing this out for being able to script victory conditions, dedicated server customization, etc.  Hello world is all that works right now, type "lua hello.bin" at the console with cheats on to see it work.  There is now a LUA bytecode compiler in the root directory that will build .lua scripts for use with NS.
+- Added high-quality .mp3 support through Worldcraft.  Load up the "soundtest" map and press the buttons and prepare to be wowed.
+- Added particle system editing tool.  Type "editps <psname>" at the console, you'll get a message indicating whether it found it or not.  Then hit F4.  Tweak away!  This is so satisfying I wish we could work it into the game somehow...?
+- Added UI slider support
+- Lasso selection and basic order-giving is now working perfectly and is nicely predicted on the client.  This had to be reworked quite a bit but it's good now.  Now you can only give orders to proper locations, ie, you can't tell a marine to move to the top of a bookshelf, or outside the world.
+
+Internals and details
+tri.cpp: Changed circles to glow
+input.cpp: Music on by default for Crin
+cl_util.h: Include change for testbed
+cl_dll.dsp, hl.dsp: Added .fgd and liblist.gam to custom build, new files
+hl_weapons.cpp, weapons.cpp: Removed old select event
+avh.fgd: Added special sound entity
+liblist.gam: Cleaned up and updated game description
+ui.txt: Added particle editing controls
+titles.txt: Added new titles for particle editing
+config.cfg: Bound F4 to edit particles
+800_textscheme.txt: Tweaks
+client.cpp: Fixed sound caching bug, propagate team to client
+world.cpp: Fixed weird bug where particle templates weren't being downloaded correctly on a map change (not sure why this is so wrong but it is)
+util.h: Made ENTINDEX macro const correct
+tripmine.cpp: Replaced hard-coded strings with nice constants as part of SoundGuy preparation
+linkfunc.cpp: Pass through for new entity
+util.dsp, MathUtil.h, MathUtil.cpp: Fixed major problems with lasso selection
+UIHud.h, UIHud.cpp: New cleaner sound support for special sound effects through Worldcraft
+UITags.h, UIManager.*, UIFactory.cpp, UIComponents.*: Added slider support
+main.cpp, testbed.dsp: Added new testbed support, I hope I use it more, it could really help
+pm_shared.h, pm_shared.cpp, pm_debug.h: Removed PM_GetEntity support, it's totally broken, must fix this soon
+New files: AvHAmbientSound.*: High-quality .mp3 playback through worldcraft, kick-ass!
+New files: AvHParticleEditorHandler.*
+AvHSoundListManager.*: Small bug fixes
+AvHBasePlayerWeaponConstants.h: Cleaned up all sound effects, in preparation for getting a Sound Guy.  There are proper placeholder sounds everywhere, ready to be replaced and tested.
+AvHConstants.h: New components, new console commands, lots more
+AvHOrder.*, AvHSelectionHelper.*, AvHSharedUtil.*, AvHSpecials.h: Lasso selection and basic order-giving is now working perfectly and is nicely predicted on the client.  This had to be reworked quite a bit but it's good now.  Now you can only give orders to proper locations, ie, you can't tell a marine to move to the top of a bookshelf, or outside the world.
+All weapon files: Added virtual utility function for getting the point at the end of the weapon's barrel, used to emit effects
+AvHWelder.cpp: Fixed heinous welder bug where the progress bar status being saved in the player, not the target..it was working too ?!
+AvHTitles.h: Particle editing constants
+AvHTechButtons.cpp: Pulled tags out into constants, fixed tech buttons bigger than they look bug, tech cost draws properly
+AvHEntities.*, AvHEvents.cpp: Pulled tags out into constants, fixed heinous welder bug, pulled out last hard-coded sound effects into constants for Sound Guy
+AvHGamerules.cpp: Added basic LUA support, added "editps" console command
+AvHHud.*: Added animated sprite cursor support but disabled it, added editps functionality, added ambient .mp3s, updated selection effects
+AvHMarineEquipmentConstants.h, AvHMarineEquipment.cpp: Cleaned up all sound effects, in preparation for getting a Sound Guy
+AvHPlayer.*: Propagate team with role down to client, ability to force SendMessage() even cheats are on, selection effects, overwatch fix after dropping a weapon, particle template propagation fix
+AvHPieMenuHandler.cpp: Pulled out last hard-coded sound effects into constants for Sound Guy
+AvHParticleSystem.*, AvHParticleSystemManager.*: Refactoring to edit particle systems in real time
+StratHL.dsw: Added LUA to workspace
+
+
+Tag: none
+Friday, 6/29/01  6:42pm
+New features
++ Super-enhanced top-down mode:  Reworked interface to be like a standard RTS, like Starcraft.  Modular array of tech buttons
+with sub-menus, enhanced tool-tips showing the cost and pre-requisites for technologies, polished marquee selection, added a
+mini-map (zero-lag no matter your ping), fixed bouncy camera, added hotkeys for all buttons and actions, researched technologies
+now disappear and allowed buildings are enabled (ala Starcraft).
++ Added first version of alien wall-jumping and alien flight (Joust-style).  All predicted, so they are zero-lag as well.
++ Finally got player model switching right.  Now when you switch roles (soldier/leader/commander/alien#), your player model changes as well.
++ Added avh_mapextents entity.  This entity defines the boundaries of the map so the mini-map doesn't allow scrolling off into lala-land.
++ Added rest of useful attributes to in-game particle editing: render mode, generation shape/parms, velocity shape/parms, beginning of vortex effect
++ Fire map triggers when game starts or ends (untested)
+
+Internals and details
+cl_dll/util.cpp: Don't localize empty strings
+input.cpp: Mini-map support
+cl_dlls.dsp: New files
+hl_weapons.cpp, weapons.cpp: Added wall-jump and flight events
+client.cpp: Precache wall jump and flight sounds, player models
+hl.dsp: Copy topdown.cfg as part of custom build
+New files: "Game names.txt", Checkin.txt, Bugs.txt
+linkfunc.cpp: Added avh_mapextents
+bot_start.cpp: All bots try to be squad leader
+New files: StaticLabel.h, ReloadableComponent.h (was ReloadablePanel.h), LabelButton.h, InvisiblePanel.h/.cpp
+StaticLabel.h: A label that doesn't resize depending on its text, in order to draw in the special non-additive way that labels seem to
+ColoredPanel.*: New constructor, draws as gradient now
+InvisiblePanel.*: Just like it sounds
+MarqueeComponent.cpp: Simplified drawing to use vguiSimpleBox
+ReloadableComponent.h: Now an interface, not from Panel
+UIFactor.cpp: Added support for InvisiblePanel and StaticLabel
+UIComponents.h/.cpp: Added support for InvisiblePanel and StaticLabel, localized all label text
+Removed: ReloadablePanel.h: Replaced with ReloadableComponent.h
+UIUtil.*: Added utility function that I no longer need right now: UIKeyCodeToChar()
+UIManager.cpp: Replaced ReloadablePanel with ReloadableComponent
+pm_shared.*: Added PM_PlaybackEvent() doesn't quite work yet though, support for map extents, flight and wall jumping, fixed camera bounciness, added mini-map support
+PS Docs.htm: Added .html docs in case the author's web site drops off the face of the planet
+New files: AvHScrollPanel.*, AvHLogoutComponent.*: Added this component in name only because vgui doesn't support components with names
+AvHHotKey.*: Files for all the events and keybind stuff associated with hotkeys in top-down mode
+AvHActionButtons.*: New UI component that handles tech tree and nested button controls
+LineDrawer.*: Added utility function for drawing non-overlapping lines in a box
+AvHTechNodes.*, AvHPlayer.*: Reworked tech tree so it's much more general and simpler
+AvHPlayer.*: Added support for player models, revised tech tree in a big way, fixed bug where "spawn sound not precached" (problem with SetPlayMode and the ready room), send map extents down when switching to top-down mode
+AvHUIFactory.cpp: Removed AvHTechButtons and added AvHActionButtons, added ScrollPanel and LogoutComponent
+AvHTeamHierarchy.*: Added mini-map and view window support to control
+AvHTeam.*: Greatly simplified code with new simpler tech nodes
+AvHSpecials.*, AvHPlayerUpgrade.cpp: Renamed upgrade constants for the last time
+AvHScrollHandler.*: Usability tweaks: Don't scroll when marquee selecting, scrolling via ScrollPanel instead of ColoredPanel
+AvHParticleTemplate.*, AvHParticleSystem.*, AvHParticleEditorHandler.*: Added rest of useful attributes to in-game particle editing: render mode, generation shape/parms, velocity shape/parms, beginning of vortex effect
+AvHMessage.h: Removed outdated tech constants, added menu choices, code yellow, code red, etc.
+AvHMarineEquipmentConstants.h: Added wingflap and walljump sounds (probably should create a new file for this?)
+AvHHud.*: Map extents, top-down hotkey support, new top-down UI components, new ActionButtons support, support for researchable and non-researchable tech
+AvHGamerules.*: Map extents, new simplified tech nodes, new ClientUserInfoChanged during work to get player models working (is this needed?), fire map triggers when game starts or ends (untested)
+AvHEvents.cpp: Removed particle line for player waypoints, added walljump and flapwings events
+AvHEntities.*: New avh_mapextents entity, AvHWeldable upgrades updates uses new tech tree constants
+AvHConstants.h: Minimap support, player models, new top-down UI controls, hotkey config files, new particle editing controls
+AvHCommanderModeHandler.*: Minimap support, new action buttons support, hotkey support, usability tweaks
+ui.txt: Changes for new top-down ui, more particle editing, scheme changes
+New file: topdown.cfg: Needed to rebind keys when entering top-down mode
+titles.txt: Tons of new titles for tech and stuff
+bot.cfg: Removed useless bot settings
+avh.fgd: Added vortex checkbox for avh_customparticles, added avh_mapextents
+textschemes.txt: Tweaks for new topdown UI
+checkin.txt, AvH TODO.txt: Regular update
+
+
+
+Tag: none
+Tuesday, 7/10/01  8:42am
+New features
++ Added concept of reinforcements.  Now lives must be purchased ahead of time by the commander, and the total number is visible at all times to all marines.  When a player dies, he respawns back in the game if there is at least one reinforcement left.  So if the commander bought two reinforcements, the next two marines that die will be able to come back.  This idea fixes a lot of problems: 1) it means that if a team has careless players, the team points are automatically used to pay to bring back these people 2) the marines by default are more precious 3) the marine team can bulk up and rush by choosing to buy reinforcements instead of tech or weapons, enabling them to play very aggressively 4) this also gives the commander more urgency (long skill curve) as he will want to buy reinforcements only when needed, so he'll want to watch battles and be ready to pay for them if it looks like he needs them (stressing micro)
++ Added ability to place buildings!  From the commander mode, just press build->turret and it draws the turret at your mouse cursor, showing where it would go if you clicked.  It draws red or green depending if the location is valid and looks pretty cool.  Works for turrets, siege turrets, phase gates and camera towers.
++ Added siege turrets, phase gates and camera towers!  Siege turrets do massive damage at long range but only fire every 5 seconds or so, and they have a minimum range so they can't hit targets close to them.  They also do splash damage so they'll break nearby glass and be effective on groups of aliens.  Nasty, and so cool in first-person.  The phase gate is linked to another phase gate and allows instant travel between them.  It makes a cool sound, flashes your view hot white and fades it back, and leaves a cool fading particle cluster where your body entered.  Soon this will work for equipment too, so you could drop a weapon in one side and have it pop out the other.  Camera towers give resources to the marines.  They don't do anything flashy right now, not sure if these are going to fit in.
++ Useables!  In looking for more things for the commander to do and to make micromanagement important for him, I stumbled across a cool idea I've always wanted in a game.  In cyberpunk, there's the recurring theme of the hacker who hacks into a compound just as his team of baddies bust in the front door.  The hacker disables the room cameras and security systems and watches out for the team actually inside.  I was watching a bot walking around and he walked over to a light switch and turned it on, letting me (as the commander) see that area much more easily.  I thought, wouldn't it be SO cool if I could just click that light switch with my mouse?  The commander is "jacked in" anyways, so it's perfectly conceivable that he have access to all electronics.  It still means the commander isn't killing aliens but he can facilitate and control the environment for his troops.  Imagine how cool it would be to have him tell a squad to move to the end of a darkened hall, just as they get there, the elevator doors open and the elevator is arriving to meet them.  Or he could close doors to prevent aliens from coming in a certain way.  So now your mouse cursor changes to a hand whenever you're over something that can be used, just left-click and it activates it.
++ Fixed some nasty bugs, jetpack crashing when tapping it quickly, map switching causing crash or the wrong particle systems being generated
++ Updated sound library with new version, removes some hitching that happened when loading .mp3s
+
+Internals and details
+tri.cpp, input.cpp: Added building placement
+ev_hldm.cpp: Added cheezy particle trail to shotgun pellets
+world.cpp: Fixed nasty map switch bug that was corrupting game rules (also fixed related particle initialization problems)
+weapons.cpp: Precache new buildings, building events, removed snark, weaponbox
+New file: turretconst.h: Pulled out common turret constants for overriding turrets (siege turret)
+turret.h, turret.cpp: Made turret more override-friendly and generic for deployed turret and siege turret (now they can have different sounds)
+tripmine.cpp, testbed/main.cpp: Renamed CalculateDamageLessArmor() to be consistent
+player.h/player.cpp: PackDeadPlayerItems() now virtual so a weaponbox isn't dropped for AvHPlayers
+ggrenade.cpp: mp_bulletcam is now a constant
+gamerules.h: Made destructor virtual, changed InstallGameRules() to be a bit more generic
+game.cpp, AvHServerVariables.h: Added new multiplayer variables (mp_testing, mp_camtowerhealth, mp_siegehealth), organized
+client.cpp: Tried to change weldable look (didn't work), no longer set play mode before spawning, read deathmatch setting from variable (?), added effects for USEABLE entities
+linkfunc.cpp: Added three new entities
+UIHud.cpp: Change to support updated FMOD
+UIManager.cpp: Default cursor is now arrow instead of hand
+pm_shared.cpp: Save predicted player origin so we can use that wherever possible, especially when playing back events
+AvHTechNodes.cpp: Bug fix, set researchable to false
+AvHTeam.*: Added concept of reinforcements for a team
+AvHSpecials.h: Added new constants for useable, upcoming visibility
+AvHSharedUtil.*: Lots of utility functions for placing buildings identically on server and client
+AvHServerUtil.*: Mostly building-related server utils
+AvHPlayer.*: Reinforcements support, override PackDeadPlayerItems to drop weapon instead of weaponbox, place building support, crash fixes (NULL team), refactored HandleTopDownInput() to be cleaner and for USEABLE and buliding support, reset top down mode when resetting player
+AvHParticleTemplate.*: Allow fetching particle systems by name, not by index
+AvHParticleSystemManager.*: Allow creation of particle systems at a location (for phase gate, useful elsewhere)
+AvHParticleEditorHandler.cpp: Move hierarchy components out of the way when editing systems
+New file: AvHParticleConstants.h: Named particle systems used by the game
+AvHOrder.*: Added new order: ORDERTYPEL_USE (shows hand where you can toggle lights and stuff), allow toggling of useables
+AvHMessage.h: Added BUY_REINFORCEMENTS
+AvHMarineEquipmentConstants.h: Lots of new constants for phase gates, siege turrets, camera tower, changed welder barrel length (still incorrect)
+AvHMarineEquipment.*: Added siege turret, camera tower, phase gate.  Made turrets more generic, changed to call more shared functions
+AvHHud.*: Reinforcements support, building placement (ghosted buildings), started to add range drawing support but didn't finish because not useful, simplified context cursors, use predicted position for hierarchy
+AvHGamerules.*: Removed death message ("so and so <AKed> so and so"), cleaned up game rules installing and world initialization, reduced costs for most all weapons, added set team console command, reinforcement support, mark all useables appropriately, fixed divide by zero when defecting, take camera towers into effect when giving teams incremental resources
+AvHEvents.*: Use predicted origin wherever possible (for jetpack light and elsewhere), added new building events (phase gate effect, getting hit by siege, your view change when getting hit by siege), shotgun shoots buckshot now, create all particle systems by name now, fix jetpack crash when tapping quickly, added drawing of range (not needed)
+AvHEntities.*: AvHResource can return it's resource contribution (doesn't give points until fully built), fixed up looping sounds (finally)
+AvHConstants.h: New constants for building entities and others
+AvHCommanderModeHandler.cpp: Reordered buildings to be more like Starcraft 
+AvHAmbientSound.cpp: Commented out ASSERT that started firing after updating to new FMOD.  I've checked my values and they look fine...look into this?
+
+
+
+Tag: mongo (very near alpha5)
+Monday, 8/13/01  12:13pm
+
+Super mongo-mega check-in.
+
+- Finalized all Natural Selection entities.  Renamed all of them so they are no longer avh_ they are the more standard weapon_, func_, item_, etc.  
+
+- Added new info_gameplay entity.  This entity lets maps customize tons of game behavior.  Things a map can control via this entity include:
+	- Humans vs. Humans and Aliens vs. Aliens support (!)
+	- Ability to change respawn cost, initial number of hives, how often alien resources are given out, how much aliens get from each hive, starting marine points, starting alien points, and lots more!
+
+- Added command stations.  When a marine touches a friendly command station, and if his team doesn't have a commander already, he becomes the commander and immediately goes to the top-down view.  When he logs out, he appears next to the command station.
+
+- Added weapon_ entities for all the marine weapons.  This allows mappers to create interesting scenarios where you don't have to buy all your weapons
+
+- Renamed entities to func_weldable, func_seethrough, func_viewheight, env_gamma, env_particles, env_particles_custom
+
+- Moved overbrightening into a map entity.  Now a map can set the monitor gamma.  The entity is called env_gamma.
+
+- Aliens now spawn at spawn points near an active hive.
+
+- Preliminary work to strip down NS for mapping/technology build.  This will make the game unplayable, but fully functional for mapping.
+
+- Removed func_viewheight.  The commander camera is now always at one height.  This height is set through the info_mapinfo entity.
+
+- Renamed "StratHL" game directory to "ns".  So the game type is now officially "ns"!
+
+- Reworked client-side weapons.  Much cleaner code, it still has problems though.
+
+- Added graphical alien pie menu
+	+ Reworked pie menu to allow sprite nodes and connectors
+
+- Added bare-bones team scoreboard (default is the tab key)
+
+- Removed squad leader role.  Now the commander makes all equipment and weapon purchases.  Removed rank menu, concept of promotion and defecting.
+
+- Added first pass of alien weapons.  Added spit gun, ensnare gun, spore cloud and claw attack.
+
+- Added first pass of alien upgrades.  Added speed, armor, regeneration and cloaking.
+
+- Increased rate that tripmines check so fast aliens can't run by without triggering them.
+
+- Added knife weapon for all marines.  Can you say, Counter-strike?  A melee weapon was really needed so when you run out of ammo AND points, you can still conceivably win.
+
+- Lots of changes and fixes for round resetting, pre-game warm-up, ready room.
+	+ Add periodic message indicating that game won't start until both teams have players
+	+ Update victory conditions to end whenever either team has no non-commander players with points and ability to respawn
+	+ Remove outdated console commands, move couple hard-coded ones into constants
+	+ Play victory or loss sound when the game ends, depending whether your team won or lost
+
+- Hives now "scream" in many different ways when they take damage.  They also make a satisfying sound when they are killed.
+
+- Camera towers are fully functional now.
+
+- Added basic commander visibility.  The commander can't see hives or aliens that his teammates can't see.  As soon as a teammate can see an alien or hive, the commander is able to see it.  This will be extended to draw blips as well.  This will also be basis of the alien's unified hive mind.
+
+- First pass at marine weapon "feel" effects.  Smoke puffs where bullets hit, tweaked view punching.
+
+- Ripped out broken weapon models and put in basic Half-life models.  Fixed reload, draw, holster, fire animations so they're much better, but not perfect yet.
+
+- Reload all sprites on a map change (pie menu, elsewhere)
+
+- Added "you're under attack" messages.  When a building your team owns, or a teammate gets hurt, you get a message that says "your base is under attack" (different sounds for each side).  The commander can hit space to jump immediately to the site of the alert.
+
+- Added to alien UI.  Now there is an egg in the upper right corner of the screen showing that you can respawn.  If you don't have enough points to respawn, it shows the egg with an X through it.  Also added an animated hive in the upper left, one for each hive you have online.  Thanks JayDog!
+
+- Fixed nasty bug where quitting the game while in topdown mode messed up all your keys
+
+- Added "need order" and "acknowledged" as special commands so they blink red and can affect waypoints (but don't yet)
+
+- Added player's name to message that is sent to commander when a player kills an enemy: "Squeal like a Pig earned points for killing an enemy!"
+
+- Added "this weapon can't be dropped" message
+
+- Changed mod info to direct players to http://www.natural-selection.org 
+
+- Added nice assert that lets you report a bug automatically.  When the assert pops up, it shows as much of the stack trace as it can, lets you type in your own comment, then you can hit a button to e-mail a bug report to bugs@overmind.org.  This isn't fully implemented yet, but it's close.
+
+- Fixed bug where hitting escape while in top-down mode when back to the Half-life menu, now it cancels whatever action you're doing instead.
+
+- Reworked how target_mp3s are propagated.  Now if you join a game after they have started playing, they will start playing for you too.  There's still one problem where they don't start playing approximately where they are on everyone else's machine but it's close.  Their position now gets transmitted, so we can have moving ambient sounds!
+
+- Added nicer weapon feedback.  The machine gun, shotgun and heavy machine gun have much better feel, leaving smoke puffs on the wall where bullets hit.
+
+- Added teleport particle effect (blue-white particles that freeze and fade), siege blast effect where it hits, also smack your view when you get hit with siege
+
+- Disable weapons before game starts so people don't shoot each other in the ready room
+
+- Added different levels of pain and wounding sounds for all marines and each alien lifeform.  
+
+- Commander uses the nearest marine for audio.  This way he can't "fly" over a hive area and listen in on what the aliens are doing and predict where hives are.
+
+- Allow particle systems to be rotated. This allows particle systems to be created so "up" is really the normal of something, so you can make a system spatter off a wall (there's a teensy bug in this right now)
+
+- Added "listps" command to see the names of all particle systems on the current level
+
+- Particle system entities now work correctly when a player joins the game late
+
+- Added new artwork for shell (stolen from Blue shift and edited).  It seems more professional now.
+
+- Rebuilt cvs repository for local use
+
+Internals and details
+
+General: Emit fatal warning on assignment within conditional
+
+ui.txt: Removed rank commands, lots of tweaks
+topdown.cfg: Removed this hack
+titles.txt: Added localized strings for scoreboard, made role help more succinct, added "need order" and "acknowledged", added player's name to commander's "enemy killed" message, command station messages
+server.cfg: Changed default settings
+liblist.gam: Changed mod info to direct players to http://www.natural-selection.org 
+delta.lst: Weapon ids are sent across using 6 bits instead of 5, iuser4, fuser1 and fuser2 are now 32-bits
+copybuild.bat: Updated to use new ns instead of strathl directory (also fixed bug in script)
+config.cfg: Various default useability tweaks
+avh.fgd, ns.fgd, avh.ps, ns.ps: Removed old, added new, lots of changes to ns.fgd including new entities and renaming of almost all entities
+cl_dll.dsp: Added new weapons, changed custom build to use new "ns" directory, removed AvHHotkey.*
+
+Client changes:
+	ammo.cpp: Fixed bug where hitting escape while in top-down mode when back to the Half-life menu, now it cancels whatever action you're doing instead.
+	cdll_int.cpp: Renamed "StratHL" game directory to "ns"
+	entity.cpp: Reworked how target_mp3s are propagated.  Now if you join a game after they have started playing, they will start playing for you too.  There's still one problem where they don't start playing approximately where they are on everyone else's machine but it's close.  Also, don't simulate temp entities when we're paused.
+	ev_hldm.cpp: Added nicer weapon feedback.  The machine gun, shotgun and heavy machine gun have much better feel, leaving smoke puffs on the wall where bullets hit.
+	input.cpp: Un-hacked hotkeys in the overhead view so they work properly now, also added team scoreboard
+	tri.cpp: Added support for drawing blips
+	hl_events.cpp: Split weapon constants into marine and alien files
+	hl_weapons.cpp: Predict knife, spit gun, ensnare, claws and and spores, added teleport effect, siege hit effect, siege view hit effect
+
+Server changes:
+	client.cpp: Commander uses the nearest marine for audio.  New commander visibility.  New target_mp3 audio propagation.
+	combat.cpp: Award a kill to an entity's owner, if possible.  This should make sure mines and turrets and flying projectile entities award kills properly.
+	doors.cpp: Don't assert if door starting and ending positions are equal.  I treat ASSERTs as fatal.	
+	game.cpp: Removed old server variables, now this stuff is all controlled by a info_gameplay in the map
+	multiplay_gamerules.cpp, squeakgrenade.cpp, talkmonster.cpp: Allow assignment within conditional in Valve code
+	player.cpp: Aliens now spawn at spawn points near an active hive.  Don't send network message immediately when removing all items, allow top level player to do it (not sure if this is totally right)
+	tripmine.cpp: Tripmine checks 20 times a second now to make sure fast aliens can walk through it without tripping it
+	weapons.cpp: Precache all alien upgrade events, new alien weapons, knife
+	hl.dsp: Added new weapons, changed custom build to use new "ns" directory
+
+Bot changes:
+	bot_start.cpp: Bots don't try to promote themselves anymore (because we don't have promotion)
+	dll.cpp: Try to allow adding bots when running via dedicated server (not working though)
+	h_export.cpp, util.cpp: Change game directory to ns.
+	linkfunc.cpp: Removed old entities, added all new ones.
+	HPB_bot.dsp: Changed custom build to copy to the "ns" directory
+
+Particles changes:
+	particles.dsp: Build options changed (not sure why, not looking into it right now)
+
+Mod changes:
+	pm_shared.cpp: New way of using map extents (view height), fixed bug where the movement code wasn't detecting when alien upgrades were purchased, fixed bug where you could jump straight up even in mid-air, don't allow commander mode to scroll before the game starts.
+	AvHActionButtons.cpp: Optimization: Now fills a rectangle to draw grid lines, instead of a line
+	AvHAmbientSound.*: Ambient sounds can now move, updated mod directory, removed ASSERT because something changed in new version of fmod, so FSOUND_STREAMs aren't internally the same after being copied (?)
+	AvHBasePlayerWeapon.*: Cleaned up prediction big-time.  Weapons can now generically specify whether they fire under water, whether they are droppable, and their idle and reload anims
+	AvHBasePlayerWeaponConstants.h: Moved constants into new file
+	AvHCommanderModeHandler.*: Fixed bug where mouse up on the logout button (usually after a drag select) logged you out.  Added equipment menu, removed research buildings menu.
+	AvHEntities.*: Removed, renamed, reworked and improved many entities
+	AvHConstants.h: Tweaking constants, removing old entities, adding new entities, new HUD sounds, new sayings
+	AvHEvents.*: New alien weapon events, new alien upgrade events, knife event, blip drawing, fixed some weapon animations, welder event fixes
+	AvHFlamegun.cpp, AvHSonicGun.cpp, AvHHeavyMachineGun.cpp, AvHMachineGun.cpp, AvHGrenadeGun.cpp, AvHNukeGun.cpp: Only allowed for marine players, changed slot/position, precache wallpuff
+	AvHWelder.cpp: Changed slot/position, don't mark the wielder of the welder in any special way
+	AvHTitles.h: Messages for game draw, command station, weapon dropping, game starting
+	AvHTeamHierarchy.*: Added new blinking effects for "need order" and "acknowledged", added mini-map (which doesn't work right), new map extents
+	AvHTeam.*: Teams now decide whether they've lost or not, commented out soldier/squad code, spawn hives periodically, inject resources for both sides (hives and camera towers), handle team resources
+	AvHSpecials.*: Commander visibility, sound propagation, alien upgrades
+	AvHSoundListManager.cpp: Changed mod name to use constant
+	AvHSharedUtil.*: Added AvHSUTraceVerticalTangibleEntities, support for placing equipment from commander mode
+	AvHServerVariables.h: Removed outdated server variables
+	AvHServerUtil.*: Added hive utility functions.  Ability to drop equipment from commander mode.
+	AvHPlayerUpgrade.*: Added utility function: GetMaxHealth(upgrade, role)
+	AvHPlayerHierarchy.*: Added support for "need order" and "acknowledged" commands
+	AvHPlayer.*: Support for visible blips, removed defection, removed old morale code, added special PAS origin, alien upgrade support, alien UI code, changed reset game to game status (message), added "listps" command, better weapon dropping, new equipment buying, no more squad leader, lots of utility functions
+	AvHPieMenuHandler.cpp: Allow pie menu for alien roles
+	AvHParticleSystemManager.*, AvHParticleSystemEntity.*, AvHParticleSystem.*, AvHParticleEditorHandler.cpp: Particle systems can have normals, particle systems get propagated correctly in multiplayer, particle editing hides alien pie menu
+	AvHParticleConstants.h: Added new particle system constants for alien weapons
+	AvHMessage.h: Order request, order ack, equipment menu, alien lifeforms, alien upgrades
+	AvHMarineWeapons.h: Allowing weapons for roles, fixed weapon animations
+	AvHMarineWeaponConstants.h: Entity name changes, new sounds, hive assets
+	AvHMarineEquipment.*: Removed outdated AvHTurret, deployed turret and camera tower generate alert when damaged, solidity and movetype tweaks
+	AvHHud.*: Added visible blips, animated sprites (for hive display), removed outdated GetTextHeader(), removed old gamma code, added alert, new map extents, removed old morale, particle and ambient sound fixes, alien UI, tracking game started state, fixed top-down hotkey, disable weapons before game start, new HUD sounds, view model effects for cloaking, reload sprites on map/video-mode change, pass upgrade costs to alien pie menu
+	AvHGamerules.*: Map gamma support, removed player rank, alert support, new map extents, alien hive spawning, team resources, moved resource injection into team, blinking game-won't-start message, moved console commands into AvHConsoleCommand.cpp, alien lifeform and upgrade costs, updated point awarding on kill, reset hives on game reset, fire target on map reset, read lots of settings from info_gameplay, team visibility
+	AvHAssert.cpp: Phase 1 of new assert
+
+docs:
+	AvH TODO.txt, Bugs.txt, Checkin.txt, ForPlaytest.txt, Map making guidelines.htm: Periodic update
+
+ui changes:
+	UIUtil.*: New utility function
+	UIHud.*: Visible blips reset their sprites when video mode changes or on a map switch, PlaySong can now start playing partway through a song
+	FadingImageLabel.*: Can now fade in a sprite, or a filled color.  Reloads sprites correctly on video mode change or map switch.
+	PieNode.*, PieMenu.*: PieMenus can now have sprite connectors, that are drawn and clipped correctly between pie nodes
+
+util changes:
+	nowarnings.h: Added detection of tons of new warnings
+	MathUtil.*: Added new utility functions (not fully working yet)
+	Util.dsp: New files, change of project options that I can't remember
+
+textrep changes:
+	textrep.dsp: Mysterious project settings change
+
+testbed changes:
+	main.cpp: Commented out most of testbed because other changed caused it to be near impossible to compile (stupid Valve)
+	testbed.dsp: New files to test Zassert.  Mysterious project settings change.
+
+New files:
+ - AvHMarineWeaponConstants.h:
+ - AvHAlienWeaponConstants.h:
+ - AvHAlienWeapons.h: 
+ - AvHClaws.cpp:
+ - AvHConsoleCommands.cpp:
+ - AvHEnsnare.cpp:
+ - AvHKnife.cpp:
+ - AvHMarineWeaponConstants.h:
+ - AvHSprites.h:
+ - AvHVisibleBlip.*: 
+ - StackTrace.*, Zassert.*, ZassertTemplate.cpp, zassert.readme.txt: New files for better asserts and bug-reporting (including stack trace)
+
+ Removed files:
+ - AvHHotkey.*: No longer needed
+
+
+Tag: Alpha6
+Monday, 8/21/01  12:07pm
+
+Features and bug-fixes:
+	- All marine prediction issues are fixed.  They all feel like there is no lag, all the animation and event problems have been fixed.  Your clip is also predicted
+	- Camera towers, turrets and command stations are fully fixed and functional
+	- Phase gates teleport players to other phase gates, or back to their respawn if there aren't any other phase gates
+	- The alien UI shows the number of hives you have, your current lifeform, whether you can respawn and all your purchased upgrades.  Thanks JayDog!
+	- Grenade launcher fire impact grenades now
+	- Specator mode works better, not perfect yet though
+	- Three new alien weapons: level 1 has a little bite, level four has a nasty slash attack, level 2 has a spike gun (kind of like a regenerating machine gun)
+	- Level 2 also has an ensnare attack that can slow down enemies to half-speed for a few seconds
+	- Tons of other tweaks and bug fixes
+	- This is the first real playable build!
+
+client:
+	ev_hldm.cpp - Only play "bullet hit" effects when hitting something not underwater and not a player (not done yet, but started)
+	cl_dll.dsp - Added three new alien weapons: the bite attack (currently level 1), the "swipe" (level 4), and the spike gun (level 2)
+	chudmisc.h, ammo.cpp - Added clip prediction
+	hl_weapons.cpp - Client-side prediction of weapons totally fixed!  Predict ammo count, only try to reload if we have more ammo, added prediction code for three new alien weapons, added debugging code, removed disabling of weapons temporarily
+	ui.txt - Moved resource label, removed invalid options of alien ui menu, added labels for debugging weapon prediction
+	titles.txt - Added message for command station, added all of Jason's new sprites to the alien pie menu
+	config.cfg - Added music by default, removed old gamma toggling
+
+server:
+	client.cpp - Allow weapon giving cheat, added code to debug weapon prediction, started to fix observing commander
+	ggrenade.cpp - Grenades now explode on contact, grenades use the right damage constant
+	hl.dsp - Added glock for testing, added three new alien weapons, added new iteminfo file
+	observer.cpp - Relaxed rules for spectating other team members, started to add spectating of commander (not done yet)
+	player.cpp - Allow weapons to think before the game starts (oops), much cleaner approach to respawning (let gamerules handle it)
+	player.h - virtualized StartObserver so AvHPlayer can override
+	tripmine.h, tripmine.cpp - Removed last hard-coded constants, change solidity of mines so players don't get stuck, clean up beams when cleaning up mines between rounds
+	weapons.h, weapons.cpp - Added new alien weapons, removed flamer and nuke gun until implemented, removed redundant caching of tripmines, started to add predicted empty sound but stopped
+	hl_wpn_glock.cpp - Changes to glock to help understand and debug predicted weapons
+
+shared:
+	pm_shared.cpp - Removed wall jumping and weird gravity stuff for now, beginnings of observable commander
+
+game:
+	AvHAlienWeaponConstants.h - Constants for three new alien weapons, weaked claw attack from 80 damage to 50
+	AvHAlienWeapons.h - Base classes for new alien weapons
+	AvHMarineWeapons.h, AvHBasePlayerWeapon.* - Some weapons have muzzle flash now, fixed nasty weapon prediction event playback bug
+	AvHBasePlayerWeaponConstants.h - Added three new alien weapon constants, allowed glock to coexist with NS weapons
+	AvHEnsnare.cpp - Ensnare gun now halves target speed for a few seconds
+	AvHClaws.cpp, AvHGrenadeGun.cpp, AvHSpitGun.cpp, AvHMachineGun.cpp, AvHHeavyMachineGun.cpp, AvHSpores.cpp, AvHNukeGun.cpp, AvHSonicGun.cpp, AvHWelder.cpp, AvHKnife.cpp - Added muzzle flash hooks, moved slot/position code into AvHItemInfo.cpp, tried to increase collision size of spit, changed how bullets fire to get a visible trail for each bullet (not working)
+	AvHConstants.h - New alien weapons, added constants for number of upgrades and lifeforms (to draw stuff generically on the HUD), component names for debugging predicted weapons
+	AvHEntities.* - Comamnd stations and camera towers can now be killed, hives play random wound sounds when hurt, command stations won't let you log back in for 1.5 seconds after logging out (helps command station hell), command stations stop working when killed, command stations trigger alerts when attacked
+	AvHEvents.cpp - Phase gate teleport sound is now predicted, added three new events for new alien weapons, added glock weapons for debugging CSP
+	AvHGamerules.* - Cleaned up how players respawn, tweaked some upgrade costs, removed old MG upgrade tech node, reset command stations and mines correctly between rounds, refactored team resource updating
+	AvHTeam.* - Moved research into team, cleaned it up.  Cleaned up resource updating, aliens don't lose as soon as all their hives are gone.
+	AvHTitles.h - New constant for "command station destroyed" message
+	AvHSprites.h - New constants for alien HUD sprites
+	AvHTeamHierarchy.cpp - Removed squad leader code for team hierarchy
+	AvHPlayer.*: - Added pause for teleporting, added pause for using command station, added ensnaring, better observing, moved research into team, added debug CSP code, tweaking alien speeds, player models fade out on death now, screen fades up from black when starting observer, commander player is drawn (temporary, for spectating commander), added alien UI hooks, only send research messages to players on team
+	AvHMessage.h - Removed purchase-alien-spawn message
+	AvHHud.* - Added debug CSP code, added new alien UI (hives/upgrades), show resources to soldiers, changed hive animation speed, reload sprites on map change or video mode change
+	AvHMarineEquipment.cpp - Lots of tweaks, turrets think properly again (from their solidity and movetype!), phase gates teleport players to other phase gates, camera towers only give resources when built
+	AvHMarineEquipmentConstants.h - New command station constants, new deployed mine name
+	AvHMarineWeaponConstants.h - Lots of weapon rate of fire and damage tweaks
+	
+ui:
+	FadingImageLabel.cpp, PieNode.cpp - Sprites draw as alpha sprites instead of additively now
+
+hpb_bot:
+	bot.cpp - Bots use my tripmine constant instead of hardcoded monster_tripmine
+	bot_start.cpp - Bots randomly join a team
+	linkfunc.cpp - Added three new alien weapons
+
+misc:
+	copydlls.bat, copybuild.bat - Updated with new ns game directory
+
+doc:
+	AvH TODO.txt, Bugs.txt, Checkin.txt, ForPlaytest.txt - Perodic updates
+
+New files:
+	AvHSwipe.cpp, AvHSpikeGun.cpp, AvHBite.cpp - New alien weapons
+	AvHItemInfo.cpp - Put all these functions in one file because they're so dependent on each other
+
+
+
+Tag: none
+Monday, 8/31/01  6:40pm
+- Marine sayings now pick a random saying instead of the same one.  
+- Commander HUD: new minimap and commander nice UI
+- Egg-laying capability.  The level 2 alien can now spend a couple points to lay an egg.  It makes a squishing sound and it appears on the ground.  Whenever any alien dies, he will respawn at an egg if one exists, even if there are no gives left.  Respawning at an egg destroys the egg.
+- Reinforcements can now be bought/used posthumously.  If a reinforcement is purchased and there's a dead player waiting to get into the game, he immediately spawns in!  This includes people that joined the server after the game started.  The person that's been waiting the longest is chosen.
+- Gave biting capability to the flying alien (fun!)
+- Entering or leaving command mode now does nice fade
+- Added some code that will allow the welder to repair different targets and display a progress bar.  Not functional yet.
+- Added lots of help text for different actions.  Most of these happen only once so you don't keep seeing the help text you already know about.
+	- When you're near an unbuilt turret, you are told to build the turret with your use key
+	- When near an enemy hive, you're told "you're near an enemy hive, attack it!"
+	- When near a friendly hive, you're told "you're near a friendly hive, it provides you resources...protect it!"
+	- When near a command station and your team has no commander, you're told that you're near it and that you can press your use to to become commander
+	- When near a phase gate, you're told it's a phase gate and that you can enter it to teleport
+	- When near a camera tower, you're told "you're near a camera tower, it gives your team resources"
+- Aliens no longer make any sounds while cloaked
+- Automatic orders: 
+	- Whenever you receive an order, play a sound like "move to waypoint", "deploy turret at waypoint", "attack target", etc.
+	- When you complete an order, your player automatically says "order complete" and your order goes away.  The commander hears it too.
+- Added network screenshot (hit F12 and everyone in the game will take a screenshot)
+- When aliens try to purchase something they already have, it does nothing (used to charge them and buy it again)
+- Slowed down marines and aliens around 10%
+- Machine gun does more damage (was 8, not 10 dmg per shot), shotgun does less damage (35->27 per pellet), grenade damage increased (125->145)
+- Increased health of turret and siege turret, added sounds that play when command station logged into, and logged out of
+- Turrets no longer fire at cloaked aliens, siege turrets must see target to fire at it
+- Added nice new sprite cursors for pie menu and commander UI
+- When ghosting a player while dead, you can now see that player's current orders
+- Added commander sayings off the commander HUD (a bit weird, but an experiment)
+- Turret, siege turret and mine kills are now credited to the team properly
+
+client:
+	tri.cpp: New order drawing
+	input.cpp: Added ability to take screenshots from commander mode
+	ev_hldm.cpp: Add spark effects for all bullets
+	cl_dll.dsp: New files
+	hl/hl_weapons.cpp: Added egg layer prediction
+
+dlls:
+	weapons.cpp: Cache egg layer and egg
+	observer.cpp: Don't allow spectating of enemies anymore, because you could can come back in
+	client.cpp: Removed last traces of squad leader.  Moved marine sayings into sound lists.
+	hl.dsp: New files
+
+HPB_bot:
+	lincfunc.cpp: Added egglayer and egg
+	bot_start.cpp: Bots now auto-team
+
+game:
+	AvHWelder.cpp: Added some code that will allow the welder to repair different targets and display a progress bar.  Not functional yet.
+	AvHTitles.h: Moved hard-coded strings into constants file
+	AvHTeamHierarchy.*: Removed slow minimap, replaced with nice sprite-based UI.  Removed last traces of squads and squad leaders
+	AvHTeam.*: Removed old squad leader code.  Reworking commander orders.  Now when a player is allowed to respawn, the player that's been waiting the longest will come back.
+	AvHSprites.h: Added order and cursor constants
+	AvHSpecials.h: Tag marine equipment and buildables
+	AvHSoundListManager.cpp: Max number of sound lists is now 200
+	AvHPlayerHierarchy.*, AvHPlayerUpgrade.cpp, AvHMachineGun.cpp, AvHSonicGun.cpp, AvHKnife.cpp, AvHHeavyMachineGun.cpp: Removed last trace of squad leader role.
+	AvHSharedUtil.*: Return height hit, check for marine buildables, don't add players to hit test, look for marine items, some debug code
+	AvHSelectionHelper.cpp: Reworking selection
+	AvHPlayer.*: New order giving, removed last trace of squad leaders, added bite gun for level 3, added egg laying, added help text
+	AvHParticleEditorHandler.cpp: Removed leader and commander pie menus.  Removed assert.
+	AvHOrder.*: Orders can now be completed and automatically go away.  Build orders complete when building is completed, welding orders can be given, etc.
+	AvHMarineWeapons.h: Server-side welding
+	AvHMarineWeaponConstants.h: Machine gun does more damage (was 8, not 10 dmg per shot), shotgun does less damage (35->27 per pellet), grenade damage increased (125->145)
+	AvHMarineEquipmentConstants.h: Increased health of turret and siege turret, added sounds that play when command station logged into, and logged out of
+	AvHMarineEquipment.*: Turrets no longer fire at cloaked aliens, siege turrets must see target to fire at it
+	AvHItemInfo.cpp: Added egg layer to hud
+	AvHHud.*: Sprite cursors, networked screenshot, added special alien cursor, added minimap creation, when spectating a player, draw that players orders, calculate bytes read correctly when receiving strings over the network, added commander sayings
+	AvHGameRules.*: Changed costs for many items in commander HUD, remember time game started so we can respawn player that's been waiting the longest, added ability to respawn at eggs, non-player kills are now credited to the right team
+	AvHEvents.cpp: Added egg laying event, reworked how orders are drawn
+	AvHEntities.*: Abstracted explosion code, command stations now need to be used, not just touched, hive solidity bug fixed, only one commander allowed per team now
+	AvHConstants.h: New HUD sounds for orders, new order enum names, removed old order enums, added team_egg entity, new marine sayings
+	AvHConsoleCommands.cpp: Bots can no longer go back to the ready room, setteam hack allowed even with cheats off to workaround bug when playtesting, added netscreenshot and buildminimap commands
+	AvHCommanderModeHandler.cpp: Remove code_yellow and code_red commands
+	AvHBasePlayerWeaponConstants.h, AvHAlienWeapons.h: Added egg layer weapon
+	AvHBasePlayerWeapons.*: Mark all weapons as marine items
+	AvHAlienWeaponConstants.*: Tweaked spit damage, spike damage and more
+	AvHActionButton.cpp: No longer paint background of action buttons, that will be handled by new commander HUD sprite 
+
+doc:
+	AvH TODO.txt, Bugs.txt, Checkin.txt: Regular updates
+
+ui:
+	UIManager.cpp: Added sprite cursors
+	UITags.h: Added basesprite and rendermode tags
+	UIFactory.cpp, UIComponents.*: Added SpritePanel and DummyPanel components
+	FadingImageLabel.*:  Starting to add support for animation (?)
+
+base:
+	config.cfg: added new commands for taking net screenshots, building minimap, etc
+	copybuild.bat: don't copy source directory when propagating build
+	titles.txt: new help messages
+	ui.txt: alien membrane, more commander UI stuff, sprite cursors
+
+
+New files:
+	mod/AvHMiniMap.*: New minimap
+	mod/AvHEggLayer.cpp: New egg layer
+	mod/AvHAlienEquipmentConstants.h: Added egg laying constants
+	ui/SpritePanel.*: New tiled sprite panel for drawing full screen alien egg and commander UI
+	ui/DummyPanel.h: New invisible component for correct cursor drawing
+
+
+Removed files:
+	AvHSquad.*: Squads and squad leaders are gone
+	AvHMarineWeapons.cpp: No longer needed
+
+
+
+Tag: Pre-1108
+Wednesday, 9/12/01, 11:22am
+
+Features:
+	- Added new height and FOV for each alien
+	- The commander can click on the useable target (elevator, door) instead of only the button/switch itself
+	- Added slightly customizable minimap shading according to height
+	- Reworked minimap completely, now it generates a sprite for each resolution and automatically uses those
+	- Minimap is scaled correctly, centered, and draws blips in the right place (used to be distorted, assumed that maps were square)
+	- Added new better assert mechanism, which allows bugs to be automatically e-mailed to me
+	- Lots of tweaks and bug fixes for fonts
+
+cl_dll:
+	vgui_SchemeManager.cpp: Slightly better error checking
+
+dlls:
+	client.cpp: Added zassert dialog on sys_error
+	hl.dsp: Added new minimap files
+
+HPB_bot: 
+	bot_start.cpp: Bots autoassign
+	linkfunc.cpp: Added egg and egglayer hooks
+
+mod:
+	AvHAssert.cpp: Added zassert
+	AvHMiniMap.*, AvHConsoleCommands.cpp: Reworked minimap entirely
+	AvHConstants.h: Added constants for commander HUD sprites
+	AvHEntities.*: Added min view height to map info
+	AvHGamerules.*: Added min view height to map info, reworked mini-map, mark targets of useables as useable as well
+	AvHHud.*: Added min view height to map info, reworked mini-map, removed some old dead code, hid some components for movie making, don't draw mouse cursor for move order
+	AvHLogoutComponent.*: Added reading of class properties (oops)
+	AvHOrder.cpp: Toggle all useables with the same target when any of them are clicked
+	AvHTeamHierarchy.*: Add hooks for drawing blips according to health status, draw minimaps correctly for different aspect-ratios, assuming map is centered, only draw alive players
+	AvHSharedUtil.h: Added some #includes that are now evidently necessary
+	AvHPlayer.*: Add support code for min view height, now have different FOV and height for different roles
+
+pm_shared:
+	pm_shared.cpp: Added min view height to map info
+
+ui:
+	SpritePanel.cpp: Bug fix when drawing sprites
+	UIComponents.cpp: Read scheme font for labels
+	UIUtil.*: Added UIBlendColor utility function
+
+util:
+	util.dsp, Zassert.*, ZassertTemplate.cpp: Integrated Zassert into NS, allow the window to pop up and shut down HL properly
+
+base:
+	1024_textscheme.txt, 800_textscheme.txt, ui.txt, titles.txt - Font tweaks, ui tweaks to make UI look great for gameplay movie
+	ns.fgd - Added minheight for minimap shading
+
+
+Tag: Post-1108
+Thursday, 9/13/01, 6:25pm
+
+Features:
+	- Updated Natural Selection with new Half-life 1108 patch in preparation for voice support and spectator mode
+
+Tons and tons of files (almost all of them)
+
+
+Tag: Post NSTR
+Monday, 10/22/01, 2:02pm
+Features:
+	- Created the NSTR, a stripped down version of NS
+	- Added first hooks for dramatic events for HLTV
+	- Maps now reset correctly (doors, breakables, etc.)
+	- Sprite panels (commander HUD) now compensates for gamma change correctly
+	- Added trigger_random
+	- Added voice support
+
+cl_dll:
+	hl/hl_weapons.cpp - Removed new 1108 client side HL weapons (I need these user variables for my own NS purposes)
+	hl/hl_baseentity.cpp - Needed to add this function for some reason
+	vgui_TeamFortressViewport.cpp - Changes to make scoreboard work in commander mode
+	chudmisc.h, message.cpp - No idea why MessageRemove() was added
+	input.cpp - Added "gotoalert" command (oops)
+	entity.cpp - Filter audio or waypoint entities from rendering (shouldn't matter but plaguebearer complaining that func_waypoints increase r_speeds), refactored heinous HUD_TempEntUpdate
+	cl_dll.dsp - Added support for new target dir (NSTR), added SliderPlus, moved LineDrawer into utility file
+
+dlls:
+	weapons.cpp - Don't precache certain weapons and items in the NSTR
+	tripmine.cpp - Added dramatic events for mines
+	player.h - Made GiveNamedItem virtual (so weapons aren't given in the NSTR)
+	player.cpp - No longer precache grunt, commented out HL-specific cheats
+	multiplay_gamerules.cpp - Moved HL voice out of here into AvHGamerules
+	hl.dsp - Added support for new target dir (NSTR), added voice helper
+	func_break.* - Added support to reset breakables
+	doors.* - Added support for resetable doors, preliminary support for new fadeable doors, added door definition to doors.h
+	client.cpp - Commented out assert dialog to get back good HL error dialog (ie, "tfc2.wad couldn't be loaded"), proper particle system culling, hooks for new fadeable doors, allow lag compenstation, precache sounds differently for NSTR
+	cbase.h - Allow all entities to be reset
+	bmodels.cpp - Moved CFuncWall definition into cfuncwall.h
+
+doc:
+	checkin.txt, bugs.txt, AVH Todo.txt - Regular updates
+
+engine:
+	anorms.h - This looks like it was updated with 1108 but I forget to check it in
+
+HPB_bot:
+	linkfunc.cpp - Renamed shotgun for consistency, added trigger_random (oops)
+	HPB_bot.dsp - Added support for new target dir (NSTR)
+	h_export.cpp - Removed support for other mods, debugging code
+
+mod:
+	AvHTitles.h - Message saying you must join a team to edit particles
+	AvHTechButtons.cpp, AvHActionButtons.cpp - Moved util line drawing code 
+	AvHTeamHierarchy.cpp, AvHSelectionHelper.cpp, AvHOrder.cpp, AvHMiniMap.cpp - Changed "groundfloor" to "waypoint"
+	AvHSharedUtil.* - Changed "groundfloor" to "waypoint", added debugging code to find weird turret placement but on ns_spacestation 
+	AvHSpecials.h - Added enum for proper particle culling, renamed some enums
+	AvHServerUtil.* - Don't do damage or build structures in NSTR, new fadeable code
+	AvHPlayer.* - Fixed bug where too many network messages (removed old messages), added dramatic event on player death, added IsSpectator utility functions for dramatic events, help text only appears when facing entity, new way to propagate particle templates
+	AvHPieMenuHandler.cpp - Removed pie menu for NSTR
+	AvHParticleTemplateServer.* - Getting templates is now case-insensitive, reworked sending of templates
+	AvHParticleTemplateClient.cpp - Count bytes received for strings properly, 
+	AvHParticleTemplate.* - Removed old bounding radius, now we use real culling
+	AvHParticleSystemManager.*, AvHParticleSystemEntity.*, AvHParticleSystem.* - Reworked and refactored particle systems for culling and better positional updating, fixed particles upside-down bug, added culling
+	AvHParticleEditorHandler.* - Fixed bugs when moving sliders, added debug code for tracking down slider engine bug
+	AvHMarineEquipmentConstants.h - Renamed construction sounds to not have "SCV" in them
+	AvHHud.* - Removed outdated network messages and hooks, draw special sprite for NSTR, started to add player ID system, reset gamma when game starts, PS culling changes, notification of gamma change
+	AvHGamerules.* - Added dramatic event hooks, particle system changes, reset entities, added voice helper and manager
+	AvHEvents.cpp - Removed scatter on bullets (?), debug code
+	AvHEntities.* - Added trigger_random, renamed "groundfloor" to "waypoint", added support for resetable entities, renamed mp3 entity, added TriggerBroken() to weldables, use null model instead of welder model, new targets for hive
+	AvHConstants.h - Removed ancient classnames, added support for new build directory, renamed entities, removed old entities
+	AvHConsoleCommands.cpp, AvHCommanderModeHandler.cpp, AvHBasePlayerWeapon.cpp - Remove stuff for NSTR
+
+pm_shared:
+	pm_shared.cpp - Don't allow ducking or footsteps when in commander mode, removed commander "freeze" before game starts
+	pm_debug.h - Debug code
+
+
+ui:
+	UIUtil.* - Added draw line functions (from old LineDrawer.*)
+	UITags.h - New tags to align SpritePanels
+	UIManager.* - Cleaner notification of gamma change so any component can compensate
+	UIFactory.cpp, UIComponents.* - Added support for SliderPlus and Slider2 (trying to fix broken sliders)
+	SpritePanel.* - Now aligns correctly for all resolutions, compensates for gamma
+	PieNode.*, PieMenu.* - Changed concept of color bias to use more generic GammaAware
+	MarqueeComponent.cpp, FadingImageLabel.cpp - Moved util code
+
+util:
+	STLUtil.* - Added lowercase string utility function
+	ZAssert.cpp - Touched up assert text
+
+base:
+	ui.txt - Fixed up sprites in commander HUD so they are aligned correctly in all resolutions, changed to new sliders
+	localassert.h - Compilation changes
+	types.h - Added min/max macros, added mapper build define
+	titles.txt - Changed wording in ready room to allow entrances instead of doors, aligned particle editing messages so they can be seen while console is open, added "VOICE" for 1108
+	ns.fgd - Added new commander alpha to func_doors (allow fade for commander and invisible from ground), commented out HL weapons, removed outdated env_particles, modified weldable targets, removed func_seethrough, removed team_breach, changed weapon_welder to item_welder, changed weapon_mines to weapon_mine
+	delta.lst - Added commas, not sure if this is necessary
+	config.cfg - Reworked and cleaned up config for NSTR
+	400_textscheme.txt - Make low-res look better font-wise
+
+new files:
+	cfuncwall.h, doors.h - Added these so they could be inherited from
+	AvHVoiceHelper.* - Added voice support
+	AvHDramaticPriority.h - Settings and constants for HLTV
+	SliderPlus.* - Possible alternate slider to fix engine slider issues
+	GammaAwareComponent.h - Interface to react to gamma changes
+
+
+Tag: Alien work
+Monday, 10/30/01, 8:49pm
+Features:
+	- Alien wall-running!
+	- Alien adrenaline!
+	- Level 1 leap ability
+	- First version of hand grenades
+	- Added energy bar to marine jetpacks (ala Tribes)
+	- Alien flight has been improved slightly but still needs more work
+	- Added backup pistol for marines, functions just like glock from CS
+	- New alien weapon ordering (new weapons "unlocked" as new hives are born)
+	- New marine weapon ordering (mimic CS because it was annoying trying to relearn)
+	- ns_seethrough backwards-compatibility fix
+	- Added gestation!  You're encased in a pod and see a progress bar when you upgrade lifeforms
+	- Added most code to support different sized players (different "hulls" for aliens and marines)
+	- Added new footsteps for aliens, including big heavy footsteps for the level 5 (variable speed too)
+	- Added deploy sounds to most weapons
+	- Added new step size for different aliens, so big aliens can step over big things without jumping
+
+base:
+	ui.txt - Added jetpack energy and gestation ui changes
+	server.cfg - Changes for running NSTR test server
+	titles.txt - Gestation and jetpack titles
+	ns.fgd - seethrough backwards-compatibility
+	motd.txt - Updated ancient MOTD
+	delta.lst - Added fuser3
+
+cl_dll:
+	hl/hl_weapons.cpp - Added hand grenade, pistol, leap, new jetpack code
+	ammohistory.h - Allow 10 weapon positions now
+	cdll_int.cpp - Added custom NS hulls
+	cl_dll.dsp - Added new files
+	input.cpp - Alien ability support
+
+dlls:
+	ggrenade.cpp - Timed grenades no longer explode on touch
+	func_break.cpp - Fixed bug ("SOLID_BSP without MOVETYPE_PUSH")
+	player.cpp - Fixed bug where the correct damage level wasn't being returned (caused pain/wound sounds not to play)
+	player.h - Added GetAdrenalineFactor()
+	hl.dsp - Lots of new util files, plus files for hand grenade and pistol
+	client.cpp - Adrenaline, player hull and footsteps changes
+	weapons.cpp - Wall jump, flight and leap event changes
+
+doc:
+	Checkin.txt - Regular update
+
+HPB_bot:
+	linkfunc.cpp - New leap weapon, renamed some entities
+
+New files:
+	AvHAlienAbilities.* - 
+	AvHAlienAbilityConstants.h - 
+	AvHConstantUtil.* - 
+	AvHGrenade.cpp - 
+	AvHHulls.h - 
+	AvHMovementUtil.* - 
+	AvHPistol.cpp - 
+	AvHSoundConstants.h - 
+
+mod: 
+	AvHMarineWeapons.h - New pistol and grenade
+	AvHMarineWeaponConstants.h - New pistol and grenade constants
+	AvHMarineEquipmentConstants.h - Jetpack, wings
+	AvHMachineGun.cpp, AvHHeavyMachineGun.cpp, AvHGrenadeGun.cpp, AvHSonicGun.cpp - Added deploy sound, more ammo by default
+	AvHItemInfo.cpp - Reworked item placement
+	AvHHud.* - Gestation, adrenaline, alien abilities
+	AvHGamerules.cpp - Fixed potential weirdness caused by player quitting and not being reset.  I assumed that players were created new, but they're not.  This may fix the bug where people sometimes can't connect after the server has been up for a bit.
+	AvHEvents.cpp - Pistol, grenades, leap and more
+	AvHEntities.*, AvHServerUtil.cpp - Backwards compatibility for seethroughs
+	AvHConstants.h - Gestation constants, more
+	AvHBasePlayerWeapon.* - Added support for weapons that can fire as fast as you can pull the trigger, added concept of adrenaline
+	AvHConsoleCommands.cpp - Ability to switch new weapons...is this function being called?
+	AvHClaws.cpp, AvHBite.cpp - Claws pump adrenaline, deploy super-fast and vary pitch according to adrenaline
+	AvHAlienWeaponConstants.h - Added adrenaline pitch factor for claws
+	AvHBasePlayerWeaponConstants.h - New weapons, leap
+	AvHPlayer.* - Adrenaline and gestation UI, hulls, jetpack, adrenaline effects, gestation, fixed pain/wound sounds
+	AvHMessage.h - New alien abilities
+	AvHWelder.cpp - Fixed welder animation
+	AvHTitles.h - New gestation titles and messages
+	AvHSprites.h - Added adrenaline and jetpack sprites
+	AvHSpecials.h - Added UPGRADE_NONE, updated alien abilities
+	AvHSpecials.cpp - Removed old alien upgrades
+	AvHSharedUtil.* - New utility functions
+	AvHPlayerUpgrade.* - Added gestation time
+
+pm_shared:
+	pm_shared.cpp - Tons of changes for: wall-running, custom hulls, custom variable-speed footsteps, jetpack energy (and smoother operation), custom step size
+
+ui:
+	UIUtil.* - Added utility functions for drawing custom progress bar
+
+
+Tag: Alien work
+Monday, 11/13/01, 11:27am
+Features:
+	- Added new scoreboard (still got one or two small bugs: player muting doesn't work after joining, wrong team name sometimes displayed)
+	- Alien webs!
+	- Primal scream!
+	- Phasing-in effects when dropping equipment and buildings
+	- Fixed network overflow problems when connecting to a server with tons of particle systems
+	- Compensate for gamma on cursors, selection marquee and minimap
+	- Added working (but pretty ugly) version of hive sight.  Also shows commander alien blips that are near marines but not in sight
+	- Waypoints don't draw "behind" you anymore (when in first-person and given an order by commander)
+	- First pass for cocooning
+	- Overwatch is back in
+	- Added "player <eviscerated> player" death messages back in, using team colors
+	- Much better alien flight, feels right now
+	- Egg-laying works much better, now just waiting for art before tweaking it
+	- Current weapon is now holstered when building equipment
+
+cl_dll/hl:
+	hl_weapons.cpp - Added primal scream, webspinner and cocoon
+	hl_baseentity.cpp - Added max walk speed to player so different roles can have different walks
+
+cl_dll:
+	vgui_TeamFortressViewport.*, vgui_ScorePanel.* - Increased max teams, changed team colors (allow aliens vs. aliens and fronts vs. fronts), general scoreboard support
+	tri.cpp - Start of marine head-mounted laser lights
+	StudioModelRenderer.cpp - Debug code to track down player animation bugs and beginning of marine head-mounted laser lights
+	death.cpp - Added "player <eviscerated> player" death messages back in, using team colors
+	cl_dll.dsp - New files
+	chudmisc.h - Removed constants to separate header so they don't have to be duplicated everywhere
+
+dlls:
+	weapons.cpp - New events for phasing in matter and stoping the primal scream
+	tripmine.cpp - Mines now use correct animation extension
+	teamplay_gamerules.h - Use new header for constants instead of duplication
+	teamplay_gamerules.cpp - Various changes for scoreboard, also don't show "person joined x team" when they join, changes for proper localization
+	player.* - Added debug code to catch missing animations, added GetMaxWalkSpeed()
+	plats.cpp - Pulled class definition out of .cpp into header so other code knows about them
+	observer.cpp - Spectators are on the spectator team, not the no-team
+	multiplay_gamerules.cpp - Use GetMaxWalkSpeed() for emitting footsteps
+	hl.dsp - Added new alien weapons, removed outdated visible blip stuff
+	game.cpp - Set default team list (though it seems to be reset for some reason)
+	doors.cpp - Removed ASSERT that was firing when doors were reset outside their knowledge, should be OK
+	client.cpp - Renamed commander vis enum
+
+doc:
+	checkin.txt, AvH TODO.txt - Regular updates
+
+HPB_bot:
+	util.cpp - Bots now obey player max speed for footsteps instead of hard-coded value
+	linkfunc.cpp - New entities
+	bot.h - Bots use include instead of hard-coding
+	HPB_bot.dsp - Added linking to util.lib and define DEBUG, added AvHAssert.cpp
+
+mod:
+	AvHBasePlayerWeapon.cpp, AvHAlienWeapons.h, AvHAlienAbilities.*, Every weapon - Removed GetAllowedForRole() now that commanders are gone and aliens never drop their weapons.  Weapons can never be used by commanders, gestating aliens or cocooned players.
+	AvHTitles.h - New titles for team and cocoon
+	AvHTeamHiearchy.* - Minimap is now gamma-aware
+	AvHTeam.* - Removed old visible blips, added new team names
+	AvHSprite.h - Added sprite constants for hive mind and marine blips
+	AvHSpecials.h - Overwatch is now treated like a temporary upgrade, renamed a few constants for consistency
+	AvHServerUtil.* - Added new phase-in effect when dropping equipment or buildings, added utility function
+	AvHPlayerUpgrade.cpp - Added cocooning support (largely treated like gestation)
+	AvHPlayer.* - Added primal scream, added TeamID() for scoreboard, made the process of looking like an egg generic (cocoon and gestate use it), re-enabled overwatch (but not for bots), when a player is killed while cocooned, he doesn't die, he's back to his old self!  Reworked how sound names are propagated.
+	AvHPieMenuControl.* - Query pie-menu control so it can be disabled and re-enabled (for scoreboard)
+	AvHParticleConstants.h - New system for phase-in effect
+	AvHMovementUtil.cpp - Level 1 can duck again
+	AvHMarineWeaponConstants.h, AvHMarineEquipmentConstants.h, AvHMarineEquipment.h - Proper animation extensions
+	AvHMarineEquipment.cpp - Turrets shoot at all monsters on the other team, not all entities on the other team, try to fix turret solidity, holster weapon when building turret
+	AvHItemInfo.cpp - New weapons
+	AvHHud.* - Reworked blips and hive sight, added concept of cocooning, started to add drawing of health of players, fixed up map extents to not assume the hud has been initialized when message sent, don't draw waypoints when behind the player, mouse cursors are gamma-aware, 
+	AvHGamerules.* - Gamerules now inherit from TEAMPLAY, not MULTIPLAY, remove webs when map changes, player killed messages, new code to make sure team names are right when team types are the same (for the scoreboard), TriggerAlert caused crash when we were cheating by fighting in the ready room, new visibility
+	AvHEvents.* - New marine head-laser lights (kinda), new alien events, new phase-in event, blip drawing
+	AvHEntities.* - Eggs are now animating, hives tagged as monster, eggs fall and animate better, added webs
+	AvHEggLayer.cpp - Eggs can't be placed in small areas anymore
+	AvHDramaticPriority.h - Cocooning priority is really high
+	AvHConstantUtil.* - Role to upgrade mask function used for aliens and marines now
+	AvHConstants.h - Added teams, cocoon role, webs, new alien weapons
+	AvHBasePlayerWeaponConstants.h - New alien weapon constants
+	AvHAlienWeaponConstants.h, AvHAlienEquipmentConstants.h - New constants for cocoon, webs, scream
+
+pm_shared.cpp:
+	pm_shared.cpp - Added wall-running for level 2 alien, some refactoring, use player maxspeed, enum renaming, wall-running no longer slows you like crouching does, tweaked flight model, tried to fix click-bounce in top-down mode
+
+ui:
+	UIHud.* - Playing a song now initializes the sound system if it isn't intialized already, removed old visible blips stuff
+	MarqueeComponent.* - Marquee is now gamma-aware
+
+base:
+	1024_textscheme.txt - Added new font styles for scoreboard
+	config.cfg - Changed default keys a bit to be more standard
+	ns.ps - Added particle system for phase-in effect
+	titles.txt - Titles for scoreboard and cocooning
+	ui.txt - Various ui tweaks
+
+New files:
+	mod: AvHWebSpinner.cpp, AvHPrimalScream.cpp, AvHCocoon.cpp - New alien weapons
+	AvHVisibleBlipList.* - New alien hive sight
+	gameshared/teamconst.h - New include to avoid duplication of constants elsewhere (scoreboard)
+	dlls/plats.h - Needed to detect doors for web-placement
+
+Removed files:
+	mod/AvHVisibleBlip.* - Outdated hive sight
+
+
+Tag: Mod expo build
+Tuesday, 12/4/01, 1:51pm
+Features:
+
+  - Better egg-laying
+  - New heavy machine gun model
+  - New hive model
+  - New alien pie menu artwork
+  - Webs don't catch teammates
+  - Soldier animations fixed up (including new "final" player animation system for Josh B.)
+  - Disabled hive sight
+  - Fixed some spectating bugs
+  - Added alien sayings
+  - Level 1 alien uses small hull, and displays much better
+  - Progress bar for building all structures
+  - Alien sounds for pie menu and weapon/ability selection
+  - Removed grenade (for demo purposes)
+  - Removed message when becoming commander (for demo purposes)
+  - Added mp_demoing (for demo purposes)
+  - Undid small stepsizses for smaller aliens
+  - Fixed overwatch/cloaking in readyroom or while in wrong role
+  - Added egg model for gestation
+  - Gamma-aware alien pie menu
+  - Moved alien HUD elements down so player death announcements are visible
+  - Removed alien HUD display of adrenaline and resources (for demo purposes)
+  - Fixed some problems when placing buildings on sloped surfaces
+  - Soldier aim and fire blending anims ares now consistent
+  - Added drop physics to camera tower
+  - Bots can now use all marine weapons and some alien weapons correctly
+  - Bots now taunt and ask for orders
+  - Bots parse SetOrder, SetRole, WeaponPickup, AmmoX, AmmoPickup, WeaponPickup and ItemPickup messages
+  - Fixed some bugs with the equipment weight (also, equipment that is "stowed" weighs a bit less then when it's "held")
+  - Fixed "gotoalert" so it's not a separate keybind, it uses "jump"
+  - Added nice selection circle instead of old solid green
+  - Added "commander awarded points" event
+  - Removed func_waypoint, added func_nowaypoint
+  - Added ability to create particle systems on model events (7000, 7010, 7020, 7030)
+  - Mine weapon is now a AvHBasePlayerWeapon
+  - Fix of weird sound popping when game starts
+  - Team join entities are no longer visible
+  - Hives can no longer be kicked around, eggs now animate and can fall, eggs make screaming sound when destroyed, webs brightened
+  - Slow down player when damaged, play correct hurt sounds
+  - Much Much More
+
+base:
+	ui.txt - Added alien sayings, various tweaks
+	titles.txt - Tweaking
+	ns.ps - Added particle system for doing melee damage, not being used currently because it looks bad
+	ns.fgd - Removed func_waypoint, added func_nowaypoint
+	motd.txt - Updated
+	config.cfg - Updates for expo
+	bot_names.txt - Added new bot names from people in the forums and mod community
+
+cl_dll:
+	hl/hl_weapons.cpp - Added "commander points awarded" event
+	tri.cpp - Added new selection circle
+	StudioModelRenderer.cpp - New "final" player animation system, hooks for marine head lasers
+	input.cpp - Allow adding bots from top down mode, along with new "goto alert" system
+	entity.cpp - New particle system events 
+	ammo.cpp - Different weapon select sounds for each side
+	cl_dll.dsp - Project changes for some reason
+
+dedicated:
+	dedicated.dsp - Changed build options to build dedicated server on local system (probably a bad idea to change this)
+
+dlls:
+	weapons.* - Mine weapon is now a AvHBasePlayerWeapon, added "commander points awarded event"
+	util.h - MESSAGE_BEGIN now emits text to the log when testing (to track down overflow bug)
+	turret.cpp - Fixed turret deploy when AI touches it bug
+	tripmine.cpp - Tripmine is now an AvHBasePlayerWeapon
+	teamplay_gamerules.cpp - Doesn't assume team and model are linked (for scoreboard I believe)
+	player.cpp - Changes to allow different weapon selection sounds for each side
+	observer.cpp - Tweaks for observers
+	game.cpp - Added mp_demoing
+	hl.dsp - New build options for some reason
+	enginecallback.h - Debugging code to help find overflow bug
+	client.cpp - Precache alien sayings, and new alien select weapon sounds.  Things that fade away for commander are now marked SOLID_NOT and EF_NODRAW
+
+doc: 
+	Checkin.txt, AvHTODO.txt - Regular updates
+
+HPB_bot:
+	util.cpp - Return team for NS
+	linkfunc.cpp - Removed func_waypoint, added func_nowaypoint
+	engine.cpp, bot_client.* - Bots parse SetOrder, SetRole, WeaponPickup, AmmoX, AmmoPickup, WeaponPickup and ItemPickup messages
+	dll.cpp - Default bot skill is now 4 instead of 2
+	bot_start.cpp - Refactored playmode
+	bot_navigate.cpp - Lame flight imitation for flier, stop following when the target crouches
+	bot_combat.cpp - Added NS weapons for bots, taunt after a kill 20% of the time, search for all non-cloaked enemy targets
+	bot.* - Basic voice command support, alien morphing (removed because it was causing random crashing)
+
+mod:
+	AvHAlienEquipmentConstants.h - Web tweaks
+	AvHAmbientSound.* - Fixed sound popping when game starts
+	AvHBasePlayerWeapon.cpp - Hack: aliens can't pick up weapons
+	AvHBasePlayerWeaponConstants.h - Added weapon size and constants
+	AvHBite.cpp - Now only slash weapons can hurt webs
+	AvHClaws.cpp - Weapon hit feedback now done client-side
+	AvHConstants.h - Removed func_waypoint, added func_nowaypoint, alien sayings, alien sound effects, new alien lifeform cost constants
+	AvHEntities.* - Team join entities are no longer visible, seethroughs now ignore their seethrough parameter, changed waypoint to nowaypoint, hive is now a CBaseAnimating, hives can no longer be kicked around, eggs now animate and can fall, eggs make screaming sound when destroyed, webs brightened
+	AvHEvents.* - New selection circle, commander points received event, play alien melee attack feedback client-side, step #2 of marine eye beams, cleaned up overwatch mode and cloaking state
+	AvHGamerules.* - Added GetIsDemoing(), upgrade costs are now stored in the gamerules instead of the player, remove webs and eggs on level cleanup, fixed up and tweaked weight system
+	AvHHud.* - Cleaned up overwatch mode and cloaking state, added GetIsAlien(), added generic progress indicator, fixed up goto alert, added "use" order sound effect, hid some of the uglier components for demo purposes (adrenaline, resources when not commander), moved some of the alien UI down so we could see death messages, fixed bug where you could be cloaked after leaving the game or switching teams
+	AvHMarineEquipment.* - Tripmine is now an AvHBasePlayerWeapon, turrets build properly with progress indicator, turrets are now solid sometimes (always?), moved building sizes into constants, all buildings are droppable now
+	AvHMarineEquipmentConstants.h - Building sizes
+	AvHMessage.h - Added COMMANDER_SCROLL
+	AvHMiniMap.cpp, AvHOrder.cpp, AvHSharedUtil.* - Updated to use new waypoint system
+	AvHMovementUtil.cpp - Level 1 alien is always small
+	AvHSelectionHelper.* - Removed old code
+	AvHServerUtil.* - Updated to use new waypoint system, added custom sound names for each team type
+	AvHTitles.h - "Attack nearby commander station" message
+	AvHTeamHierarchy.cpp - Tried uselessly to color blips by health..it's just not being propagated
+	AvHSpecials.h - New alien cloaking representation, removed waypoint, added nowaypoint
+	AvHServerVariables.h - Added mp_demoing
+	AvHPieMenuHandler.cpp - Added alien pie menu sounds
+	AvHParticleConstants.h - Added new melee feedback particle system
+	AvHPlayer.* - Removed GetEffectiveTeam(), moved upgrade costs out of player into gamerules, added generic progress bar, fixed player weight calculation, spectators move faster, fixed bug where your wasn't used correctly when displaying messages about your immediate environment, when hatching from eggs, appear a bit higher than it, don't display message to commander when becoming commander, slow down player when damaged, play correct hurt sounds
+
+pm_shared:
+	pm_shared.cpp - Fixes for bouncing commander view (!), fixes for shaky commander view (!), changed stepsize
+
+ui:
+	UIPieMenu.cpp - Set root node color and font appropriately
+	UIHud.cpp - Removed an ASSERT that could fire occasionally when alt-tabbing away while the game is starting, don't init music here (to fix sound popping when game starts)
+	PieNode.* - Cleaned up clipping for connectors (still not quite right), pie menu is now gamma-aware, removed hard-coded color scheme 
+	PieMenu.cpp - Removed hard-coded color scheme
+	MarqueeComponent.cpp - Marquee is now gamma-aware
+
+util:
+	STLUtil.* - Streamlined syntax of LowerCaseString()
+
+New files:
+	ctripmine.h 
+
+
+Tag: PC Gamer build
+Monday, 12/31/01, 1:51pm
+Features:
+	- Added new building-oriented tech tree.  Most of it is currently disabled for PC Gamer due to lack of art.
+	- Tons of new help text for many different situations (alien weapons, alien abilities, hacking, building, etc.)
+	- Updated particle system code to use new field names (to avoid occasional "token name too long" error when compiling)
+	- Added new trigger_presence entity
+	- Updated .FGD with PS entity field names, removed outdated entities and fields
+	- Updated materials.txt from mapping forum goers
+	- Added build times and resource costs for all buildings and tech to skill.cfg for easier balancing and tweaking without changing code
+	- Better feedback for marine weapons
+	- Added first pass at look-at-player-and-see-his-name-and-friend/enemy-status (player ID)
+	- Added many settings to the GUI (auto-help, center player id, tournament/casual mode, music enabled, music volume, etc.)
+	- Voice tweaks (allow while commanding, only talk to selected when commanding, observers can hear other observers and visible players, spectators can hear other spectators and visible players)
+	- Propagate commander mouse movement to the server (allows auto-help messages when hovering mouse over something, also needed for record/playback support)
+	- Much better hull support (but hull 4 still doesn't activate touch for some reason)
+	- Radius damage is now gamerules-aware (friendly fire works more properly in general)
+	- Ducking works nearly perfectly now, for marines and every alien type (the view sinks a bit too much still though)
+	- Wall-crawling while falling now slows you to a stop instead of stopping instantly
+	- Allow bunny-hopping for aliens with speed upgrade
+	- Welder works better, and can now repair damaged buildings (shows progress bar)
+	- I _think_ I fixed the occasional "player overflowed" error when players join a server
+	- Minimaps are now generated as centered, and the minimap scale is now right
+	- Hives no longer spawn in if they are blocked by a player.  They wait until the area is free, then spawn.
+	- Slowed down all players
+	- Mark particle system for deletion when turned off, don't delete it immediately (fixes bug where all particles are deleted immediately)
+	- Added "animation speed" field for entity.  Don't crash or ASSERT if sprite couldn't be loaded, just don't draw.
+	- HMGs have slower ROF then MGs, do more damage though, tweaked view shaking
+	- Order-giving works better (esp. noticeable at marine start on ns_bast)
+	- Animated phase gate
+	- Phase gates now work round-robin instead of random
+	- Fixed target_mp3 bug where the wrong sounds were being played
+	- Eggs are now cleaned up when the next game starts
+	- All fired targets fire USE_TOGGLE instead of USE_ON or USE_OFF
+
+base:
+	ui.txt - Modified for new research system
+	titles.txt - Many new help messages
+	StratHL.dsw - Added ZHLT projects
+	materials.txt - Updated to use ns.wad
+	listenserver.cfg, server.cfg - Removed old junk, updated
+	config.cfg - Changes for PCG
+	ns.fgd - Removed leave game entity, updated alpha flags for seethroughs and doors, added trigger_presence, removed marine weapon entities, changed particle system field names, changed func_nowaypoint to func_nobuild
+	ns.ps - Added particle system for phase gates, changed all particle system field names
+	bot_names.txt - Fixed spelling error for Autolycus
+
+
+cl_dll:
+	hl/hl_weapons.cpp - Removed TFC/HL weapons code that stores and propagates weapon settings differently
+	chudmisc.h, message.cpp - Refactoring and player id code.  Don't display help messages when auto help is off.
+	input.cpp - Allow voice while commanding
+	ev_hldm.cpp - Better feedback for marine weapons
+	entity.cpp - Renamed NOWAYPOINT to NOBUILD
+	cl_dll.dsp - Added more files to post-build copy
+	cdll_int.cpp - More hull changes
+
+dlls:
+	weapons.cpp - Added new tech tree buildings, allow welder in the mapper build
+	tripmine.cpp - Ignore monsters when tracing tripmine beam (untested)
+	hl.dsp - Added new files to project and to post-build copy
+	game.cpp - New server variables for tech build time and cost
+	func_break.cpp - Pulled out CPushable definition into separate file
+	cbasedoor.h, doors.h, doors.cpp - Removed flags I added that are no longer needed
+	combat.cpp - Radius damage is now gamerules-aware.  Also, don't paint decals when not doing damage.
+	client.cpp - Visibility tweaks and fixes, seethrough capability for doors, only set size for role every tick
+
+doc:
+	Checkin.txt, AvH TODO.txt - Regular updates
+
+HPB_bot:
+	dlls/linkfunc.cpp - Renamed some entities, pass through for new marine tech tree buildings
+	dlls/bot.cpp - Renamed NO_OP to MESSAGE_NULL
+
+mod:
+	AvHWelder.cpp - Welder works better, and can now repair damaged buildings (shows progress bar)
+	AvHVoiceHelper.cpp - Voice tweaks (allow while commanding, only talk to selected when commanding, observers can hear other observers and visible players, spectators can hear other spectators and visible players)
+	AvHTitles.h - Tons more help text
+	AvHTechNodes.* - Reworked the tech tree, allow multiple prerequisite techs
+	AvHTeamHierarchy.* - Minimap now works properly
+	AvHTeam.* - Upgrades and tech are now tracked per team.  Tech nodes can be deactivated if their pre-requisite buildings cease to exist.
+	AvHSpecials.* - Refactored ids.  Entities can have an fuser3 AND be either sighted/non-sighted.  Added fuser4 enum to allow different menus depending what's selected.
+	AvHSoundConstants.h - Renamed vent to duct
+	AvHSharedUtil.*, AvHServerUtil.* - Reworked for new tech tree system
+	AvHPlayer.* - Extensive help system, send particle templates gradually (fixes player overflowed bug), track current mouse position while in commander mode, don't give named items in mapper build, point cost of message IDs now handled by gamerules, new player speeds, tweaked visibility system (treated as a mask), fire special targets when entering/leaving commander mode.
+	AvHParticleTemplateServer.cpp - New particle system field names
+	AvHParticleSystemManager.* - Mark particle system for deletion when turned off, don't delete it immediately
+	AvHParticleSystemEntity.cpp - New particle system field names (still read old names for backwards-compatibility), mark particle system for deletion when turned off, don't delete it immediately, added "animation speed" field for entity
+	AvHParticleSystem.cpp - Don't crash if sprite couldn't be loaded, just don't draw
+	AvHParticleConstants.h - New particle field name constants, new phase gate idle particle system
+	AvHOrder.cpp - Don't offset orders from commander (causing order-giving bug on ns_bast, no longer needed)
+	AvHMovementUtil.cpp - Use proper hulls for different players and duck state
+	AvHMinimap.cpp - Write out minimap sprites centered
+	AvHMessage.h - Lots of reworking, removing old messages, renaming new ones
+	AvHMarineWeaponConstants.h - HMGs have slower ROF then MGs, do more damage though, tweaked view shaking
+	AvHMarineEquipmentConstants.h - Tons of new equipment constants (esp. for new marine tech buildings and phase gate)
+	AvHMarineEquipment.* - Phase gates are now animated and work via round-robin.  Added new marine tech buildings.
+	AvHHulls.h - New hull constants
+	AvHHud.* - Player ID support, always draw NS sprite, tried to fix gamma-reset-on-crash bug, tech node changes, don't draw alien UI when dead, compensate for mouse hotspot (-1,-1)
+	AvHGamerules.* - Better friendly fire support, always allow players to join in casual mode (at least for PCG), cleaned up tech tree (moved into AvHTeam), moved build time and cost into generic skill.cfg, don't mark commander stations as useable by commander, visibility changes
+	AvHEvents.cpp - Modified weapon firing punch angle
+	AvHEntities.* - Removed leave-game entity, changed seethrough to seethroughdoor, removed dated seethroughwall, added trigger_presence, hives don't spawn in on players, tried to fix solidity with AvHEgg (this is the one bit of code that changed after making the PCG build)
+	AvHConstants.h - Updated and removed entities, overwatch takes 6 seconds instead of 4, constants for commander station targets, etc.
+	AvHConsoleCommands.cpp - Let gamerules decide whether we can join or not
+	AvHCommanderModeHandler.* - Lots of changes to allow multiple menus, depending what's selected
+	AvHClientVariables.h - Added cl_autohelp and cl_centerplayerid
+	AvHBasePlayerWeapon.cpp - Allow weapons to fire in mapper build (so welder works)
+	AvHAlienWeaponConstants.h - Increased level 1 bite damage from 40 to 60
+	AvHActionButtons.* - Allow multiple prerequisites, updated to new tech tree
+		
+
+pm_shared:
+	pm_shared.cpp - Don't play footsteps when ducked (wallcrawling doesn't count as ducking), reworked ducking, tweaked flier gravity, allow bunny-hopping for aliens with speed upgrade, renamed NO_OP to MESSAGE_NULL
+
+ui:
+	UIHud.cpp - Fixed bug where music would stop playing after a couple songs
+	UIFactory.cpp - Don't create pie menu controls in the mapper build
+
+util:
+	Zassert.cpp - Tried e-mailing ASSERTs automatically but that would probably get annoying real quick
+
+
+New files:
+	BuildQC.bat - Added my own buildqc.bat (probably not needed)
+	nshulls.txt - New hulls.txt that all maps will be compiled with
+	skill.cfg - Contains build times and resource costs for all buildings and tech
+	ns.qrk, ns_tex.qrk - New versions of the Quark entity definition files (not adding to CVS because they are binary)
+	cpushable.h - Refactored this out
+	mod/AvHBuildable.* - New subclass for anything buildable
+	mod/AvHHelp.cpp - All player auto-help goes here
+	mod/AvHTechID.h - New enum for tech ids
+
+
+Tag: NSTR2
+Wednesday, 1/30/02
+
+Features:
+	- Commander Mode, v2.0 (new order-giving/placement code, entity culling for commander, func_illusionary changes, minimap changes, info_mapextents changes)
+	- Added zooming for commander mode
+	- Tweaked fonts and colors for all resolutions
+	- New UI sprite scaling so the same sprites can be used for all resolutions
+	- Added env_fog entity
+	- Tech tree changes to allow all buildings to research independently (for new building-centric tech tree)
+	- Fixed up PAS for commander for sounds and target_mp3s
+	- Lots of small changes for the NSTR2 (setculldistance, high-detail only PS, changed startcommandermode to teleport you to commandstation)
+	- Experimented with players ferrying resources around
+	- New resource towers (they emit particles, added ability to tweak resource towers for efficiency, it shows output change)
+	- Experimented with modifying Zoner's tools to add one-way portals
+	- Added the concept of custom data for particle systems (allows worldwide modification of particle systems)
+	- Added reasonable hive sight (now that sprite scaling works)
+
+base:
+	ui.txt, titles.txt, skill.cfg, config.cfg - Regular updates
+	ns.ps - Added PS for new resource tower
+	ns.fgd - Updates for Commander Mode v2.0 (added env_fog, added new flags to func_illusionary, added team flags to trigger_presence, added "don't draw map background" to info_mapinfo, changed default env_gamma to 2)
+	listenserver.cfg - Updated to be the same as server.cfg
+	delta.lst - Updated comments
+	*textscheme.txt - Update fonts and colors to look decent
+	StratHL.dsp - Added hlbsp and hlrad projects to workspace
+	types.h - Set #define for mapper build
+
+cl_dll:
+	vgui_TeamFortressViewport.cpp - Fixed doubled-cursor problem with scoreboard (only show sprite cursor, not Windows cursor)
+	util.cpp - Attempt to make CreatePickingRay more accurate (view bob, punch, etc.)
+	StudioModelRenderer.cpp, tri.cpp - Added support for sprite scaling
+	input.cpp - One step towards adding keyboard scrolling to commander mode
+	cl_dll.dsp - New files
+	ammo.cpp - One step towards adding keyboard scrolling to commander mode
+
+common:
+	const.h - Added flag to try to make HLCSG support one-way portals
+
+dlls:
+	weapons.cpp - Added alien sight events
+	player.cpp - Renamed AvHSU to AvHSHU
+	hl.dsp - Added files to project
+	game.cpp - New tech vars
+	client.cpp - New commander culling, precache changes for NSTR2, refactored AddToFullPack(), renamed AVH_USER3_VIS_SPECIAL_COMMANDER, propagate weaponmodel for PS for some reason, 
+
+doc:
+	Checkin.txt, AvH TODO.txt - Regular updates
+
+HPB_bot:
+	linkfunc.cpp - Added env_fog and func_resource hooks
+
+mod:
+	AvHActionButtons.* - Action buttons can be busy, so researching buildings don't draw their buttons when selected
+	AvHAlienAbilityConstants.h - Constants for alien sight
+	AvHBasePlayerWeapon.cpp - Changes that might be needed in the future for sprite scaling for the commander (ie, if the commander needs a view model to hook the call in StudioModelRenderer)
+	AvHClientVariables.h - Added high detail variable
+	AvHCommanderModeHandler.* - New support for researching buildings, don't draw all main menu buttons in the NSTR
+	AvHConsoleCommands.cpp - Added setculldistance, modified startcommandermode to teleport player nearby, removed give/remove upgrade commands because they don't easily work with new tech tree changes
+	AvHConstants.h - Regular update
+	AvHEntities.* - Added "team x only" flags to trigger_presence, refactored AvHMapInfo, added AvHFuncResource, added AvHFog, modified command station to allow resources to be dropped off, command station visibility change to allow marines vs. marines
+	AvHEvents.* - Added alien sight events, refactored entity list
+	AvHGamerules.* - Refactored team visibility, refactored team upgrades, refactored map extents, added GetIsMapperBuild(), added func_resources to watch for team upgrades, alerts don't trigger in the NSTR
+	AvHHelp.cpp - No help in NSTR, renamed selected units to selected (because now buildings can be selected)
+	AvHHud.* - Refactored hud drawing, refactored map extents, added fog, removed research at the HUD level (now it's stored in entities), added commander PAS for mp3s, added high-detail PS, removed old tech buttons
+	AvHMarineEquipment.* - Added hack to test ferrying resources from turrets, big temporary changes to try to get solidity working for buildings
+	AvHMarineEquipmentConstants.h - Added func_resource size constants
+	AvHMessage.h - Added func_resource adjustment actions
+	AvHMiniMap.* - Refactored map extents, coloring changes, added 512x384 and 320x240 minimap exporting
+	AvHMovementUtil.cpp - Renamed AvHSU to AvHSHU
+	AvHOrder.* - Renamed AvHSU to AvHSHU, fixed ASSERT when order given when no players are selected (maybe select command station automatically when command mode starts?)
+	AvHParticleConstants.h - Added func_resource
+	AvHParticleSystem.* - Added custom data, changed vortex to high-detail flag, changed so lifetime and scale can be changed at runtime, changed ASSERT(this->mSprite != 0) to emit error message and delete the particle system
+	AvHParticleSystemEntity.* - Added concept of custom data, moved entity linkage to .cpp
+	AvHParticleSystemManager.* - Added concept of custom data
+	AvHParticleTemplate.* - Changed vortex flag to high-detail flag
+	AvHPlayer.* - Added fog support, added concept of carrying resources, changed research to be per entity not per player, changed PAS, added start of special alien sight, various small mapper build changes, added resource adjustment actions, 
+	AvHScrollHandler.* - Added zooming support
+	AvHSelectionHandler.cpp - Renamed GetPlayerUnderMouse()
+	AvHServerUtil.* - New utility functions
+	AvHSharedUtil.* - Added return codes for waypoint checking, renamed AvHSU to AvHSHU, commander mode v2.0 selection changes (now ray starts at first point in world), researching changes
+	AvHSpecials.h - Renamed AVH_USER3_VIS_SPECIAL_COMMANDER to AVH_USER3_VIS_SPECIAL_TOPDOWN (in case I allow spectating of commander mode, or something like that)
+	AvHSprites.h - Sprite changes for new sprite scaling in HUD
+	AvHTeam.* - Reworked resarch in a big way, now there's a research manager that handles everything.  If a tech node is given when a building is created, it is now taken away when there are no more buildings of that type
+	AvHTeamHierarchy.* - Refactored map extents
+	AvHTechNodes.* - Technodes now allow technology to be "researched" multiple times.  This is used for continually upgrading func_resources.  Maybe this should've been implemented as multiple technologies?
+	AvHTitles.h - Regular update
+	AvHVisibleBlipList.cpp - Updated drawing code to use triapi.  It's called during the RenderNoZBuffering() phase so they are always visible.
+	AvHVoiceHelper.cpp - Allow all players in the NSTR to always hear each other
+
+pm_shared:
+	pm_shared.cpp - Refactored mapextents, don't play alien5 footsteps in NSTR, commander doesn't collide with anything (PM_FlyMove()), commander isn't never classified as stuck in the world, added zooming
+
+ui:
+	PieNode.cpp - Take parent's position into account when drawing (trying to fix software issues with the pie-menu)
+
+utils/common:
+	bspfile.h - Added new constant for one-way portals
+
+zhlt/common:
+	bspfile.h - Added new constant for one-way portals
+
+zhlt/hlbsp:
+	writebsp.cpp, surfaces.cpp, qbsp.cpp, hlbsp.dsp, bsp5.h - Attempt at adding one-way portals
+
+zhlt/hlcsg:
+	textures.cpp, brush.cpp, hlcsg.dsp - Attempt at adding one-way portals
+
+
+New files:
+	AvHResearchManager.* - New class to handle all research
+	AvHMapExtents.* - New class for map extents
+	AvHHudRender.cpp - All HUD drawing happens here, added sprite scaling
+
+Removed files:
+	AvHTechButtons.* - Outdated commander mode tech buttons
+	hlcsg/debug - Added binary files by accident
+	hlvis/Super_Debug - Added binary files by accident
+	
+
+
+Tag: NSTR2 final release
+Monday, 2/25/02
+	- Experimented with adding a camera to the commander HUD that shows the world from the viewpoint of the current selection. It can be done, but it's more work
+	then it's worth right now
+	- Tons of NSTR2 bug fixes and updates
+	- Added ability to place resource towers only on top of func_resources.  It animates, plays sounds and can be upgraded properly.
+	- Updated .fgd names to be more descriptive and not to be cut off in Worldcraft
+	- Moved lots of turret values into skill.cfg for easy balancing
+	- Added hotgrouping of units and buildings, moving to units or buildings when double-tapping, and camera tracking
+	- Fixed up event playback for commander.  The commander is now actually inside the room that he's above (so his viewpoint is different then his position)
+	- Reworked spawning code so when cheats are on, aliens can spawn without an active hive
+	- Added func_seethroughdoor entity
+	- Refactored gamma code to be much cleaner (to fix bug where non-1.0 gamma ramp not restored when exiting the game)
+	- Reworked selection, much cleaner and working almost perfectly now.  Lasso select now works like Stacraft (people take precedence over buildings, friendly over enemy, multiple people allowed, only one building allowed, no lassoing of enemies, etc.)
+	- When an alien is wallrunning, he uses the light value from the ceiling instead of the floor (not sure how well this works though)
+	- Resources are selectable, shows how many resources are left.  Resource towers are selectable and can be upgraded.  
+	- Resource towers can be built, they play their animations properly and generally act right.
+	- Allow all buildables to be selected.  Added menu support for infantry gates.  Updated other building menus.
+	- Fixed all turret, building and egg solidity problems!
+	- Fixed bug where trying to join team 2 when on team 1 caused nasty things to happen, fixed "StartPlaying" bug
+	- Fixed ancient spawn bug where player would occasionally spawn in on other team side (I think), added research complete and upgrade complete sounds
+	- Fixed bug where ending map while in commander mode does weird things, fixed bug where the wrong particle systems could sometimes be generated
+
+base:
+	titles.txt - Regular update
+	skill.cfg - Moved many turret variables out of code and into skill.cfg
+	ns.fgd - Renamed many fields so they are readable in Worldcraft
+	copydlls.bat - Copies to laptop now instead
+	config.cfg - Regular update
+	types.h, build.h - Put build options here instead of types.h
+
+cl_dll:
+	cl_dll.dsp - Added AvHClientUtil.*
+	input.cpp, vgui_TeamFortressViewport.cpp - Added hotgrouping of units and buildings, moving to units or buildings when double-tapping, and camera tracking
+	tri.cpp, view.cpp - Added but disabled multiple viewports
+	util.cpp - Not sure, but must've been fixing something
+
+dlls:
+	scripted.cpp, new furniture.h - Refactored class definition out to header
+	client.cpp - Precache alien use sounds for NSTR, don't perform "behind commander" check anymore, now that commander origin is different from his viewpoint, always propagate selection to commander, support func_seethrough and func_seethroughdoor, removed special effects on brush entities (doesn't work)
+	combat.cpp - Check gamerules when doing damage via melee
+	game.cpp - Moved many turret variables out of code and into skill.cfg
+	gamerules.cpp, multiplay_gamerules.cpp - Reworked spawning code so when cheats are on, aliens can spawn without an active hive
+	weapons.cpp - Precaching changes for NSTR
+
+doc:
+	AvH TODO.txt, Checkin.txt - Regular updates
+
+HPB_bot:
+	linkfunc.cpp - Added func_seethroughdoor entity
+
+mod:
+	AvHClientUtil.* - New utility files and functions
+	AvHBasePlayerWeapon.cpp - Try to fix order giving to items
+	AvHCommanderModeHandler.* - Removed old hooks, refactored to use new utility functions, allow selecting of func_resources and resource towers, allow selecting of all buildables
+	AvHConsoleCommands.cpp - Fixed inability to edit particles when not on a team, added debugging testevent command
+	AvHConstants.h - Added hotgroup support, removed glow entity, updated hud sound constants for hotgroups, added func_seethroughdoor entity, added grouping and ugprade complete sounds, brought max map dimension down to 4095 due to networking limits
+	AvHEggLayer.cpp - Fixed egg solidity problems
+	AvHEntities.* - Added func_seethrough again (and func_seethroughdoor), new animating resource towers, added func_resource, command station reads settings from skill.cfg vars instead of hard-coded constants, removed solidity debugging code
+	AvHEvents.cpp - Draw selection circle correctly for brush entities
+	AvHGamerules.* - Reworked spawning to allow alien spawning with no active hive when cheats are enabled, fixed bug where trying to join team 2 when on team 1 caused nasty things to happen, fixed "StartPlaying" bug, resource towers are now upgraded, not func_resources (it was a hack when solidity wasn't working), fixed ancient spawn bug where player would occasionally spawn in on other team side (I think), added research complete and upgrade complete sounds
+	AvHHelp.cpp - Process help for where the commander looks like he is, not where he actually is
+	AvHHud.* - Added hotgrouping of units and buildings, moving to units or buildings when double-tapping, and camera tracking, added support for extra viewports, refactored gamma stuff out into util, fixed particle system bug where the wrong particle systems were being generated (how did this ever work?), fixed bug where ending map while in commander mode does weird things
+	AvHHudRender.* - Fixed bug where scaled sprites weren't visible at some FOVs, optimization where black commander background is now drawn only at the size of the screen, not in the whole world
+	AvHMapExtents.cpp - Clip map extents to +/- 4095
+	AvHMarineEquipment.* - Moved constants into variables, updated buildables, updated resource towers
+	AvHMarineEquipmentConstants.h - Renamed models for consistencey, moved various constants into variables, updated various sizes
+	AvHMarineWeaponConstants.h - Reduced clip size to encourage marines to advance as squads
+	AvHMessage.h - Added hotgroup support
+	AvHPlayer.* - Added debug code for blips (for debugging server side stuff graphically), hotgroup support, removed blips from mapper build, allow respawns when no active hive but cheats are enabled
+	AvHResearchManager.cpp - Send alert when research finishes
+	AvHSelectionHelper.* - Reworked selection, much cleaner and working almost perfectly now.  Lasso select now works like Stacraft (people take precedence over buildings, friendly over enemy, multiple people allowed, only one building allowed, no lassoing of enemies, etc.)
+	AvHServerUtil.cpp - Allow damage to be done in NSTR, fix solidity problems, fade func_seethroughdoors
+	AvHSharedUtil.* - Grouping utility functions, updates and bugfixes, sentry turret uses own model and size, support for resource towers, tracing updates and fixes
+	AvHSpecials.* - Updated constants (removed viewheight and glow), added func_resource, renamed reinforcements to infantryportal
+	AvHTeam.cpp - Updated tech tree, constants and order, allow siege to be researched, allow multiple turret upgrades
+	AvHTeamHierarchy.cpp - Reset fixes to team hierarchy and sanity check
+	AvHTechID.h - Added TECH_INFANTRYPORTAL
+	AvHTitles.h - Regular updates
+	AvHWelder.cpp - Have welder use MG animation temporarily so he's not running around with arms out
+
+
+pm_shared:
+	pm_shared.cpp - Commander stays inside the world now, added MOVETOGROUP support, wallcrawlers use ceiling light when wallcrawling
+
+util:
+	Util.dsp, added GammaTable.* - Overbrightening code
+	MathUtil.* - Reworked IsVectorBetweenBoundingVectors()
+	
+
+Tag: None
+Monday, 3/7/02
+	- New alien upgrade system.  When a builder creates a structure, all aliens on his team get a blinking icon on their HUD, showing them that they have a free upgrade to choose, which they can then choose off the pie menu.  When an upgrade building is destroyed, a random upgrade from this category is immediately taken away from every player.  In this way, upgrades are coherent and grouped, yet can still be chosen by each player to suit each person's playstyle.
+	- Added special sounds when aliens construct buildings
+	- Added deploy sound to all marine buildings when finished construction
+	- Added special sound when alien falls and takes damage (instead of HL sound)
+	- Egg-laying is offically gone
+	- Added infantry portal
+	- Better bot support: bots now rejoin teams after a game ends, bots morph into aliens on their own (!) and they buy alien upgrades.  They're not smart, but they do it.
+	- New alien upgrades: 
+	- Silence (makes footsteps and lots of other sounds next to inaudible!), 
+	- Redemption: The hive tries to "save" aliens with this ability.  If an alien is very hurt, far from the hive, and can see an enemy, the hive will try to teleport the alien back to the safety of the hive (not the upgrade for everyone but great for hit-and-runners)
+	- Clairaudience: (not implemented yet) Allows aliens to hear as if they are somewhere else (great with hive sight)
+	- Better armor: all damage is reduced by 50% 
+	- Builder no longer wall-runs
+	- Alien pie menu now looks good (finally) without any weird sprite clipping or misaligned or out of order sprites
+	- Alien pie menu displays tool tips when hovering over different icons (see attached pic)
+	- New placeholder art for new alien upgrade system, new pie menu layout
+	- Tons of tech tree and marine building improvements (researching can be cancelled for refund now, UI updates correctly no matter what happens and no matter what's selected, can no longer build things from building until it's completed <menu is blank>, tech tree is almost all filled in now, command station is selected automatically when logging in)
+	- Visibility reworked.  Now it works properly for all alien structures, marine structures, webs, hives, everything!
+	- Added "motion-tracking" upgrade.  When researched (at the observatory), it means all moving aliens show up as red blips to all marines!  Very expensive and deep in the tree of course.
+	- Fixed various buildings sinking into the floor bugs
+	- Fixed player ID system so it works up and down and will never detect yourself
+	- Added much better scoreboard.  It still gets some colors wrong, but it now tracks buildings and kills for players.
+	- New standardized animations for all buildings
+	- Added "bigdig" (all buildings are constructed automatically) and "hightech" (all research finishes instantly) cheats
+	- Refactored and standardized buildings in general, including their building/research status (also added destruction effects for all buildings)
+	- Added help text for all upgrades
+	- Tons of other little issues and fixes
+
+base:
+	BuildQC.bat, skill.cfg, ui.txt, titles.txt - Regular update
+	build.h, config.cfg - No longer NSTR2 build
+
+cl_dll:
+	hl/hl_baseentity.cpp - Regular update
+	hl/hl_weapons.cpp - Removed egg layer, added four alien research weapons
+	util.cpp - Fixed bug where UI bounces around when view angles are punched
+	vgui_ScorePanel.cpp - Refactored crappy-ass score panel.  It's not perfect, but it's better.  Removed TFC code, added DEAD and COMM tags to scoreboard.
+	cl_dll.dsp - Added building gun, removed egg layer
+
+dlls:
+	cbase.h - Changes to base entity for cleaner code in general
+	client.cpp - Added special sound when alien falls and takes damage (instead of HL sound), added special sounds when aliens construct buildings, added deploy sound to all marine buildings when finished construction
+	game.cpp - Added tons more tech times and costs to skill.cfg
+	h_cycler.cpp - Made IsAlive() const correct
+	hl.dsp - Added AvHBuildingGun.cpp and AvHAlienEquipment.cpp, removed AvHEgglayer.cpp
+	maprules.cpp - Added TeamID() stuff for cleaner scoreboard support
+	player.*, multiplay_gamerules.cpp - Cleaner scoreboard support
+	teamplay_gamerules.cpp - Cleaner scoreboard support, 
+	weapons.cpp - Added new alien building weapons, infantry portal, removed egg layer
+
+doc:
+	AvH TODO.txt, Checkin.txt - Regular updates
+
+HPB_bot:
+	dlls/bot.cpp, dlls/bot_client.cpp, dlls/bot_start.cpp - Better bot support: bots now rejoin teams after a game ends, bots morph into aliens on their own (!) and they buy alien upgrades.  They're not smart, but they do it.
+	dlls/bot_combat.cpp - Attempted to fix problem where aliens fire at their own teammates that join a new team after a previous game ends
+	dlls/linkfunc.cpp - Regular update
+
+mod:
+	AvHActionButtons.cpp - Variable renaming
+	AvHBasePlayerWeaponConstants.h, AvHAlienWeapons.h, AvHAlienEquipmentConstants.h - Added new alien structures
+	AvHAlienWeaponConstants.h - Modified spit weapon, removed egg laying, added building gun
+	AvHBasePlayerWeapon.cpp - Updated comment
+	AvHBuildable.* - Tracks the builder, hooks into gamerules when buildings are created or destroyed
+	AvHCommanderModeHandler.* - Added research menu, refactored, fixed bug where help text wasn't being displayed, update buttons/menus constantly to catch changes without having to reselect
+	AvHConsoleCommands.cpp - Added "bigdig", "hightech" and "addcat" cheats
+	AvHConstants.h - New alien upgrade system, teams changes for scoreboard fixes, new alien builder weapons, alien fall/pain sounds
+	AvHEntities.* - Major refactoring of hives, AvHBaseBuildables, resource towers, new visibility system
+	AvHEvents.cpp - Event for building alien structures, alien silence support, removed egglaying, tried to make spit short-range (doesn't work yet)
+	AvHGameRules.* - Builder hooks for score tracking, general cheat code support, changed point award system, great new visibility system
+	AvHHelp.cpp - Refactored buildings
+	AvHHud.* - New alien upgrade system, fixed player ID system, fixed progress bar lingering around bug, added support for researching
+	AvHHudRender.cpp - New alien upgrade system
+	AvHItemInfo.cpp - New alien buildings, removed egg layer
+	AvHMarineEquipment.* - Refactored buildings
+	AvHMarineEquipmentConstants.h - New alien construction sounds, smaller infantry portal
+	AvHMessage.h - Researching of faster reinforcements, research cancelling, motion tracking, new alien upgrades
+	AvHPlayer.* - New visibility system, added concept of player class and TeamID() for scoreboard status and team, renamed blip lists and changed how they are updated, added redemption ("pull-back"), added alien team upgrades, added support for silence upgrade, fixed bug in GetSpeeds() that was causing an ASSERT, added motion-tracking, added enemy dection (promity) for aliens too, added ability to research, fixed bug in UpdateAlienUI()
+	AvHPlayerUpgrade.cpp - Updated comment
+	AvHResearchManager.* - Added ability to cancel research for refund
+	AvHServerUtil.* - New visibility system, removed old unused functions, added alien armor support, track the builder of an structure, moved explode into general utility function, construction effects can be alien, motion-tracking support
+	AvHSharedUtil.* - Add support for infantry gate, add support for alien buildings and research, changed some buildings sizes, fixed buildings falling through world, fixed infinite loop in AvHSHUServerTraceWaypoint
+	AvHSpecials.* - New alien upgrade system
+	AvHSpitGun.cpp - Try to make spit a short range weapon (doesn't work yet)
+	AvHSprites.h - New alien upgrade system
+	AvHTeam.* - New alien upgrade system, new almost-complete tech tree
+	AvHTechID.h - Some new tech ids
+	AvHTechNodes.* - New utility function to check if actions are legal
+	AvHTitles.h - Titles for scoreboard ("playerclass")
+	AvHVisibleBlipList.* - operator== and operator!= functions to compare lists of blips (new more standard way of keeping client up to date)
+
+pm_shared:
+	pm_shared.cpp - Builder no longer wall-runs, added silence upgrade, play alien falling sound
+
+ui:
+	FadingImageLabel.cpp - Setting the text will now reload a sprite.  Changed to allow alien pie menu to change depending on the upgrades that are currently available.
+	PieNode.* - Allow pie nodes to be dynamically changed (for dynamic alien upgrade system)
+	UIUtil.* - Changed utility function to allow ignoring of screen resolution
+
+
+New files:
+	AvHAlienEquipment.* - New alien structures
+	AvHBuildingGun.cpp - Created for level 2 ability to build structures
+	
+
+Tag: None (Iron lore playtest #2!)
+Wednesday, 3/27/02
+	- Scoreboard now shows alien scores, and doesn't show marine scores.  Also draws DEAD and COMM indicators, and scoring is handled properly for aliens (points for kills, buildings)
+	- Countdown type is now a variable (mp_countdowntime), server asserts can now be disabled (mp_assert), teams can now be handicapped (mp_marineresoucescalar, mp_alienresourcescalar)
+	- Default observer mode is now free cam, not locked cam, don't allow observing enemies in tourny mode, don't allow spectating commander
+	- New spawning system.  Fixes bug where players occasionally spawn on the wrong team.
+	- Added concept of new abilities/weapons when hives come online or die
+	- The builder web weapon now shoots a projectile that leaves a web where it hits
+	- Added "killhive", "spawnhive", "killall" and "paralyze" commands for testing (cheats must be enabled)
+	- All buildings will animate properly when models are in (active animation, research animation, two idle animations, deploy animation, killed animation, take damage animation)
+	- New respawning system for hives and infantry gates
+	- Team upgrades are now persistent through death
+	- Updated visibility code to work properly with everything, including webs, alien buildings, all buildables, etc.
+	- Added tool tips for pie menu, including point cost
+	- Added motion-tracking upgrade for marines (all marines can see any moving alien!)
+	- Level 1's no longer take falling damage, ever
+
+base:
+	config.cfg - For when people get stuck and for testing
+	delta.lst - Need 6 bits for iuser3 now
+	titles.txt, skill.cfg - Regular update
+	ui.txt - Moved radar to upper right so it doesn't interfere with weapons
+		
+cl_dll:
+	cl_dll.dsp - Removed ensnare, added sniper gun and paralysis gun
+	input.cpp - Tried to make paralyzation lock view angles, but it didn't work
+	StudioModelRenderer.cpp - New user data
+	vgui_ScorePanel.cpp - Scoreboard now shows alien scores, and doesn't show marine scores.  Also draws DEAD and COMM indicators, and scoring is handled properly for aliens (points for kills, buildings)
+	
+cl_dll/hl:
+	hl_baseentity.cpp - Regular update
+	hl_weapons.cpp - Removed ensnare gun, added paralysis and sniper gun
+
+dlls:
+	client.cpp - Resource tower makes gross noises when harvesting, new user data	
+	doors.cpp - Less picky ASSERT for doors
+	game.cpp - Countdown type is now a variable (mp_countdowntime), server asserts can now be disabled (mp_assert), teams can now be handicapped (mp_marineresoucescalar, mp_alienresourcescalar)
+	observer.cpp - Default observer mode is now free cam, not locked cam, don't allow observing enemies in tourny mode, don't allow spectating commander
+	player.* - Added bool to choose whether to show new weapons as they are received or not
+	hl.dsp, weapons.cpp - Removed ensnare gun, added sniper gun and paralysis gun.  Made web a projectile.
+
+doc:
+	AvH TODO.txt, Checkin.txt - Regular updates
+
+HPB_bot/dlls:
+	bot_combat.cpp - User data change
+	linkfunc.cpp - Removed ensnare gun, added sniper gun and paralysis gun.  Made web a projectile.
+
+mod:
+	AvHActionButtons.cpp - Always draw node, whether researched or not
+	AvHAlienEquipment.* - Alien resource tower has different model then marine resource tower, all alien upgrade buildings have different models, fixed problem where building wasn't being completed properly
+	AvHAlienEquipmentConstants.h, AvHAlienWeaponConstants.h - Regular update
+	AvHAlienWeapons.h - Removed ensnare, added sniper gun and paralysis gun
+	AvHAssert.cpp - ASSERT can be disabled, server-side
+	AvHBasePlayerWeaponConstants.h - Removed ensnare and egglayer, added sniper gun and paralysis gun
+	AvHBuildingGun.cpp - Look up cost for buildings properly
+	AvHClaws.cpp - Fixed cut-and-paste error where claws where using spit constants
+	AvHClientUtil.cpp - User data update
+	AvHCommanderModeHandler.cpp - User data update, small menu fixes
+	AvHConsoleCommands.cpp - Allow teleport to command station to work regardless of current team, added "killhive", "spawnhive", "killall" and "paralyze" commands for testing
+	AvHConstants.h - Regular update (also added player class status for scoreboard)
+	AvHConstantUtil.* - User data update
+	AvHEntities.* - User data update (no more AvHSelectableUser4), all buildings will animate properly when models are in (active animation, research animation, two idle animations, deploy animation, killed animation, take damage animation), new respawning system for hives and infantry gates, refactored build/research state, fully built structures no longer marked as buildable
+	AvHEvents.cpp - Removed ensnare and egglayer, added sniper gun and paralysis gun, user data changes
+	AvHGamerules.* - Removed some ancient code relating to chain of command (!), reworked respawn system, clean up all buildables when resetting the level, visibility code much cleaner and works properly for all webs, buildings, etc.
+	AvHHelp.cpp - Removed egg layer help, fixed potential logic bugs, added help for alien resource tower weapon
+	AvHHud.cpp - Added particle system visibility (may not be completely working yet), added tool tips for pie menu, including point cost, drawing alien resources again, fixed client playmode error, always draw player ID
+	AvHHudRender.cpp - Only draw friendly blips with hive sight upgrade, draw enemy blips for marines with motion-tracking
+	AvHItemInfo.cpp - Added new weapons, removed old weapons, reordered/moved some weapons
+	AvHMarineEquipment.* - New reinforcement system for infantry gates, fixed bug where turrets weren't rotating, user data update
+	AvHMarineEquipmentConstants.h - Various building sizes changed
+	AvHMovementUtil.* - User data update
+	AvHOrder.cpp - Added user4 to TraceTangible
+	AvHPlayer.* - Added concept of paralysis, new reinforcing system, hive-dependent inventory, resources are now represented as floats, user data update, added effective player class (for scoreboard), better team-wide upgrades (they persist over death), visibility improvements
+	AvHPlayerUpgrade.* - Changed some health values for different roles (this should be pulled out into skills.txt), user data update
+	AvHResearchManager.cpp - Hook research complete generically, improved team upgrades, refactored build/research state, hook buildables when research state changes for animation
+	AvHSelectionHelper.* - Treat selectables generically, not as buildings, or whatever
+	AvHServerUtil.* - More utility functions
+	AvHServerVariables.h - Added mp_assert
+	AvHSharedUtil.* - TraceTangigble returns iuser4
+	AvHSpecials.* - Completely reworked iuser data and upgrades (much cleaner)	
+	AvHSwipe.cpp - Fixed cut and paste error where the wrong values were being used
+	AvHTeam.* - Resources changed to a float, better team-wide upgrade support, added SpawnHive() and KillHive() for testing, dynamic hive-based alien inventory, fixed up some misplaced data in the tech tree, refactored TriggerRemoveTech(), new reinforcement system, new resource model (based on score for aliens, takes into account resource towers better)
+	AvHTechNodes.cpp - Send down and read mAllowMultiples
+	AvHTitles.h - Regular update
+	AvHWebSpinner.cpp - Webspinner now shoots projectile, links web where it lands
+	AvHWelder.cpp - User data update
+
+pm_shared:
+	pm_shared.cpp - User data change
+
+New files:
+	AvHParalysisGun.cpp, AvHSniperGun.cpp
+
+
+
+Tag: None (Internet playtest #1 and #2!)
+Tuesday, 4/16/02
+    - Hives no longer spawn in on their own, instead, builders now create hives through a "create hive" ability.  Once created, they slowly grow until they are complete
+	- Most alien buildings build on their own, and can also be sped up by tended to by one or more builders
+	- Added helptext for builder weapons
+	- "givepoints" now works for commander (F11)
+	- Chat for commander appears correctly
+	- "REIN" appears for players that are reinforcing, "DEAD" shows for dead players waiting to be reinforced (or if they just joined)
+	- Fixed all reported crashes from Internet Playtest #1 (hitting ESC and reconfiguring during play, viewing scoreboard immediately on server join)
+	- Fixed bug where pop-up menu would sometimes stop working
+	- Fixed reinforcement "workaround" where players could go back to ready room, then join team immediately (including chat problems sending you back to readyroom)
+	- Added mp_latejointime, which is the time (in seconds) that players are allowed to join a team after the game starts, without having to come back as a reinforcement
+	- Wrote new networking layer to buffer reliable data out to clients (to reduce or eliminate overflows)
+	- Reworked chatting so observers, reinforcers, readyroomers, and players can see chat appropriately
+	- Optimized server (visibility performed less often, victory check happens less often).  This was causing the huge lagging at Iron Lore and IPT1
+	- Visibility for commander works again (it broke a little while ago)
+	- Particle systems are now subject to visibility
+	- Some new (or newly-named) server variables for easy balancing and playtesting: 
+		- ns_funcresourcevalue, ns_commandstationhealth, ns_hiveinjectiontime, ns_hiveinjectionamount, ns_initialalienpoints, ns_initialmarinepoints, ns_alienrespawntime, ns_alienrespawncost, ns_marineresourcetime, ns_marineresourceamount, ns_alienresourcescalar, ns_marineresourcescalar
+	- Aliens with the speed upgrade you can bunny hop
+	- Web strands now snap after 50 seconds, cost 1/2 a point, and are nearly invisible
+	- Alien melee weapons now require you to press the attack button for each shot (you can no longer hold it down)
+	- Alien melee and ranged weapon damage upgrades are now functional
+	- Allow players to be selected, then accessing the build menu from there (gives automatic waypoint)
+	- Commander menu is now updated constantly, reflecting changes in the tech tree or your current selection
+	- func_resources now indicate approximate # of resources inside by the particle steam
+	- Resource towers (for both sides) stop making noises when out of resources 
+	- Fixed bug where gamma was being set to wrong value on a map reset or change
+	- Improved selection issues (clicking is now a small marquee-selection)
+	- Buildings no longer float (with the exception of the resource towers, but they are colliding with the func_resources)
+	- Fixed HUD problems where health, ammo, etc. weren't being displayed properly in the ready room, after death, etc.
+	- Allow aliens to morph down
+	- Fixed bug where building is selected after it's placed
+	- Hives regenerate nearby players
+	- Fixed bug where flier alien view clipped through ceilings 
+	- Commander speaks to everyone, not just selection
+
+base:
+	ui.txt - Selection marquee is now blue
+	types.h - Include std::map 
+	config.cfg, server.cfg, listenserver.cfg, skill.cfg, titles.txt - Regular update
+	bot.cfg - Regular update
+	ns.fgd - Weldables now have target on use (to support disabling of entities through welding), alien hive hitpoints no longer in team_hive
+	delta.lst - More changes to networking.  WARNING: Be sure to test everything well after changing this file, it can cause strange things to happen (ladder prediction, water prediction, etc.)
+
+cl_dll:
+	hl/hl_weapons.cpp - Removed flamegun, added hive gun
+	ammo.cpp - Help text for builder weapons
+	cl.dsp - New files (hivegun, pm_debug)
+	input.cpp - "givepoints" now works in commander mode
+	saytext.cpp - Chat for commander appears correctly
+	vgui_ScorePanel.cpp - Fixed crash when holding tab right when joining server, added "REIN" status
+	vgui_TeamFortressViewport.cpp - Removed crappy way of handling pop-up menu changes, removed pressing enter to go back to RR (was getting in way of chat, now just use "readyroom" - F4 -)
+
+dlls:
+	enginecallback.h, util.h - New networking layer to reduce or eliminate overflowing
+	client.cpp - Reworked chatting so observers, reinforcers, readyroomers, and players can see chat appropriately, visibility fixes, propagate team for all entities (for selection)
+	func_break.cpp - Breakables weren't caching assets they needed
+	game.cpp - Lots of new variables, renamed other variables
+	observer.cpp - Don't assume that because you're observing, you're on no team
+	triggers.cpp - Pulled class definition out into an include
+	weapons.cpp - Precache sparks, add hive gun
+	hl.dsp - Profiling options, added hive gun, added hive
+
+doc:
+	AvH Todo.txt, Checkin.txt - Regular updates
+
+HPB_bot:
+	dlls/bot.cpp - Profiling tests, removed alien lifeform costs (they're hard-coded now, but these bots are for personal use only)
+	dlls/linkfunc.cpp - Added hivegun
+	dlls/HPB_bot.dsp - Added network metering
+	dlls/waypoint.cpp - New network metering
+
+mod:
+	AvHActionButtons.cpp - Refactored help text, added help text for weapons
+	AvHAlienEquipment.* - Alien buildings now slowly build themselves
+	AvHAlienEquipmentConstants.h - Web strands
+	AvHAlienWeapons.h - Melee weapons must be pressed for each shot, added hive gun
+	AvHAssert.cpp - Only log asserts when mp_assert is 1
+	AvHBasePlayerWeaponConstants.h - Removed flamethrower constant, added hive gun constant
+	AvHBite.cpp, AvHClaws.cpp, AvHSwipe.cpp - Alien melee and ranged weapon damage upgrades are now functional
+	AvHBuildingGun.cpp - When trying to building an alien structure without enough points, you'll get a "not enough points" sound.  Alien building requires button to be pressed each time.  Experimented with allowing aliens to build turrets.
+	AvHCommanderModeHandler.* - Allow players to be selected, then accessing the build menu from there (gives automatic waypoint)
+	AvHConsoleCommands.cpp - Removed concept of "desired team", fixed specating problems, removed old "setteam" console command, don't allow spectating if allow_spectators isn't set, removed outdated "setrole" command
+	AvHConstants.h - Added "reinforcing" player state, added hive gun, removed alien lifeform constants (uses skill.cfg now), toned down regeneration big-time
+	AvHEntities.* - Only builders can help build alien structures, improved resetting of weldables (still not right though), use gameplay balancing variables (instead of gameplay object from map), command station has a delay before it can be used again, near-invisible web strands, web strands expire, new particle ideas for func_resources, resource towers stop making noise when out of resources
+	AvHFlameGun.cpp - Removed flamegun constants
+	AvHGamerules.* - Fixed problemw when moving between teams, removed concept of "desired team", added network metering, added latejoin time, added profiling, visibility is now computed every .5 seconds, removed server-side particle system updating
+	AvHHelp.cpp - Only give attack text when near a spawned in enemy hive, not a neutral hive
+	AvHHud.* - Tried to fix pop-up menu problems (only bindable to RMB), added help text for builder weapons, fixed bug where pop-up menus sometimes disappeared, fixed bug where gamma was being reset on a map change, selection improvements
+	AvHItemInfo.cpp - Regular update
+	AvHMarineEquipment.cpp - Infantry portals were phasing in players too high, now there is instant reinforcement time
+	AvHMarineEquipmentConstants.h - "fixed" floating buildings by making all buildings the same magical size
+	AvHMarineWeaponConstants.h - MG clip doubled, pistol clip increased, shotgun ROF slowed down to match sound effect, HMG ROF increased, HMG damage decreased, 	
+	AvHMessage.h - Added build_hive message
+	AvHParticleSystem.cpp - Added debugging code to fix particle system visibility problems
+	AvHParticleSystemEntity.* - Allow particle systems to be turned on and off (for func_resources)
+	AvHParticleSystemManager.cpp - Removed ASSERT that was causing crash when hitting ESC to navigate through menus while in-game
+	AvHPieMenuHandler.* - Refactored pop-up menu to allow it to work with non-RMB.  Ran into VGUI problem though, not sure how to proceed.
+	AvHPlayer.* - Removed concept of desired team and role (finally!), better scoreboard support, allow morphing down, reset score between matches, fixed bug where building is selected after it's placed, fixed bug where flier alien view clipped through ceilings, added hive gun to builder, particle template template throttling no longer needed
+	AvHPlayerUpgrade.* - Alien max healths adjusted, alien damage upgrades added
+	AvHSelectionHelper.* - Improved selection issues (clicking is now a small marquee-selection), 
+	AvHServerUtil.* - When exploding objects, remove the debris object, fixed visibility, added func_resources and particles to visibility, added profiling code
+	AvHServerVariables.h - Added many new server variables for balancing, renamed others (from avh_ to ns_)
+	AvHSharedUtil.* - Hives can be built now, but only near unoccupied team_hive entities
+	AvHSpecials.h - Added hive constant
+	AvHSpikeGun.cpp, AvHSpitGun.cpp, AvHSpores.cpp - Ranged damage upgrade takes effect
+	AvHTeam.* - Added motion-tracking upgrade, propagate alien build costs to alien players, hives no longer spawn in on their own, resource update only once per second now
+	AvHTitles.h - Regular update
+	AvHVoiceHelper.cpp - Commander speaks to everyone, not just selection
+	AvHWebSpinner.cpp - Webs costs .5 points
+
+pm_shared:
+	pm_debug.cpp - Debugging code (view bounding box of entity you look at)
+	pm_shared.cpp - Alien speed upgrade means you can bunny hop (it was using the wrong upgrade)
+
+New files:
+	dlls/triggers.h - Pulled class definition out into an include
+	doc/Quotes.txt - Various NS-related quotes for posterity
+	mod/AvHHive.* - Moved into it's own set of files.  Is created by the builder now, and grows slowly on it's own.
+	mod/AvHHiveGun.cpp - Builders create hives now
+	mod/NetworkMeter.* - General-purpose networking layer to trickle reliable updates to prevent overflows
+
+
+
+Tag: None (Internet playtest #3 and #4!)
+Tuesday, 4/30/02
+	- Completely rewrote turrets.  The function well now, and are consistent with the rest of the buildables (yay!)
+	- New building indicator (high-tech ring on ground)
+	- Iconic help for nearby objects (useables, breakables, hives, etc)
+	- Added new alien abilities/weapons: parasite, blink, divine wind
+	- Added new (but not fully functioning) alien abilities/weapons: paralysis, sniper weapon, umbra
+	- New commander UI (blinking alerts, highlighting of logout button, tech tree icons)
+	- New marine UI (commander status, resource label, nice minimap, consistent ammo/HUD colors)
+	- Added scanner sweep
+	- Added droppable health
+	- Made marine reinforcements automatic
+	- Added nuke for marines
+	- Alien resource changes (alpha male gets twice what everyone has, not proportional to their score)
+	- Tons of bug fixes and balance changes (hive healing rate reduced, duplicate weapons aren't picked up, mines are selectable again, resource towers don't float)
+
+cl_dll:
+	hl/hl_weapons.cpp - Removed glock, added many new alien weapons/abilities
+	ammo.cpp, ammo_secondary.cpp, ammohistory.cpp, battery.cpp, chudmisc.h, flashlight.cpp, health.cpp, hud_spectator.cpp, train.cpp - Allow different colors schemes
+	death.cpp - Death messages are moved for commander
+	ev_hldm.cpp - Error check creation of temporary entities (these failed sometimes in playtests)
+	tri.cpp: Moved selection effects to AvHHudRender.cpp
+	cl_dll.dsp - New files
+
+dlls:
+	client.cpp - Removed "lastinv" command (causing harsh crashing in playtests, fix later), added code to detect errors when sending weapon list to client
+	explode.* - Added concept of team to explosion (needed for nuke?)
+	func_break.cpp - Mark breakables so they are visible in pop-up help
+	game.cpp - Regular update (now that turrets are regular buildings)
+	player.* - Added utility function to prevent players from picking up weapons they already have
+	turret.cpp - Tried to figure out why turrets were broken, then rewrote them instead
+	weapons.cpp - Regular update
+	hl.dsp - New files for new turrets and new alien abilities
+
+doc:
+	AvH TODO.txt, Checkin.txt, Quotes.txt, Passwords.txt - Regular update
+
+game_shared:
+	voice_gamemgr.cpp - Incorporated potential overflow fixes from Mugsy
+
+HPB_bot:
+	linkfunc.cpp - Regular update
+
+mod:
+	AvHActionButtons.cpp - Added images on tech tree
+	AvHAlienAbilityConstants.h, AvHAlienEquipmentConstants.h, AvHAlienWeaponConstants.h - Regular update
+	AvHAlienWeapons.h - New alien weapons
+	AvHBasePlayerWeapons.cpp - Don't pick up weapon if we already have one of this type
+	AvHBasePlayerWeaponConstants.h - Regular update
+	AvHBuildingGun.cpp - Don't allow more then three of a building
+	AvHCommanderModeHandler.* - Fixed bug where multiply selecting marines wouldn't show player menu, menu tweaks
+	AvHConsoleCommands.cpp - givepoints now only available with cheats on, added "alert" command
+	AvHConstants.h - Regular update
+	AvHEntities.* - Moved AvHBaseBuildable into it's own set of files, cleaned up AvHResource
+	AvHEvents.* - Moved some HUD drawing code into AvHHudRender
+	AvHGamerules.* - Added connect/disconnect sounds, more cleanup at end of round, add profiling, update victory doesn't happen every tick
+	AvHNukeGun.cpp, AvHGrenade.cpp - Changed constant because the number of constants is limited
+	AvHHelp.cpp - Updates for new non-HL turrets
+	AvHHive.h - Healing balance change
+	AvHHud.* - New selection effects, new marine HUD, new tech tree buttons, new help icons 
+	AvHHudRender.cpp - Allow scaling of a one-frame sprite (with optional UV coords), refactored drawing of world sprites and orders, added primary HUD color, new selection effects, new help icons, hive sight enhancments, new commander HUD, don't draw hive sight when dead
+	AvHItemInfo.cpp - Moved tons of weapons around for ease of use (feedback from playtesters)
+	AvHMarineEquipment.* - Added marine nuke, rewrote all turrets, added droppable health, added scanner sweep, no more floating resource towers
+	AvHMarineEquipmentConstants.h - Added nukes, scanner sweeps, droppable health, tweaked lots
+	AvHMarineWeaponConstants.h - Tweaked LMG
+	AvHMessage.h - Regular update
+	AvHParticleConstants.h - Added blink effect
+	AvHParticleSystemManager.* - Added debug code to track down "too many visible entities" problem
+	AvHPlayer.* - Scanner uncloaks cloaked aliens, added notification when commander status changes, can only morph to level 4 with 2 hives, and level 5 with 3, cloaked aliens are much harder to see, hive regenerates nearby players, refactored hive sight (for performance?), some messages are unreliable now (to try to alleviate overflows)
+	AvHServerUtil.* - Only draw profile info if significant, "fixed" problem where alien use sounds were playing for marines, scanner support
+	AvHSharedUtil.cpp - Regular update
+	AvHSpecials.h - Regular update
+	AvHSpitGun.cpp - Fixed problem where spit continued to do damage after one hit
+	AvHSpores.cpp - Spore balance
+	AvHSprites.h - New sprites for new commander UI
+	AvHTeam.* - Fixed bug where game ended when everyone died but still had portals or hives left, added droppable health, added nuke, tech tree balance changes, alien resource changes
+	AvHTitles.h - Regular update
+	AvHVisibleBlipList.* - Added status for blips
+	NetworkMeter.* - Added document header
+
+pm_shared:
+	pm_shared.cpp - Added kinda crappy blink support
+
+util:
+	STLUtil.* - Added BuildAbridgedString
+
+base:
+	ui.txt, titles.txt, *.cfg - Regular update
+	*textscheme.txt - Added marine status scheme to color the marine HUD
+	delta.lst - Added two more bits to the weapon ID, because more weapons were added
+	ns.ps - Added blink particle effect
+
+New files:
+	AvHUmbraGun.cpp - CREATE: Umbra weapon
+	AvHParasiteGun.cpp - CREATE: Parasite weapon
+	AvHParalysisGun.cpp - CREATE: Alien paralysis gun
+	AvHMarineTurret.* - CREATE: Base marine turret (regular turret, base for siege turret)
+	AvHBlinkGun.cpp - CREATE: Alien blink ability
+	AvHTurret.* -CREATE: Base NS turret, used for all types of automated enemy detection
+	AvHSiegeTurret.h -CREATE: Marine siege cannon
+	AvHSharedMovementInfo.* - Helps keeps track of movement over multiple ticks
+	AvHDivineWind.cpp - CREATE: Alien suicide ability
+	AvHBaseBuildable.* - CREATE: Moved this class into it's own source file
+	Passwords.txt - File for tracking passords for all installs and .zips that are archived
+
+Tag: None (Internet playtest #5!)
+Tuesday, 5/14/02
+  - Ready room chat is visible now
+  - New scripting system added to client and server.  Not useable yet for mappers, details to come.
+  - New alien energy system
+    - Most alien abilities cost energy.  The energy graphic tells you how much energy is needed for your current ability.  If you don't have enough energy, you can't use your ability.
+    - Energy comes back slowly
+  - New alien resource indicator
+    - Graphical indicator shows you how many points you have
+    - Hovering over an alien lifeform or builder ability will show you how many points you'll have left if you use it
+  - New alien upgrade system
+    - Aliens must gestate to get an upgrade
+    - Only one upgrade from each category is allowed.  There are multiple levels to each upgrade now.
+    - More intuitive way of choosing upgrades from pop-up menu
+    - Alien abilities now have three levels (speed, armor, silence, etc.)
+  - "128 HUD sprites bug should be fixed", let me know if you see it
+  - Picking up and dropping alien weapons should no longer happen
+  - Gamma and brightness adjustment added to installer
+  - Aliens can travel through phase gates now :)
+  - Builder spit increased to 20 damage (up from 12)  
+  - Cleanup health, pistols, nukes at end of round
+  - Commander artwork updated 
+    - Tech buttons are scaled properly now
+    - Logout button becomes highlighted when you hover your mouse over it
+    - New tray for hotgroups (not implemented yet)
+    - Blinking orange light tells you when you have a non-urgent alert (research is done, hit jump/space)
+    - Blinking red light tells you when you're under attack (hit jump/space)
+  - Some new overwatch artwork, new "build ring" artwork
+  - New marine blip artwork
+  - Orders artwork (there were some messed up orders)
+  - Using various commands at dedicated server console no longer crashes
+  - New version of hera, area between marine start and NW hive redone, glass can't be shot through, lots of other changes
+  - Fixed bug where NS doesn't think you're in the ready room after joining the server
+  - Pistol damage increased from 8 to 18
+  - Crash when using next weapon fixed
+  - Armory now plays its animations properly
+  - ** Dead command stations can be rebuilt with welder (this is a quick test to see how it affects gameplay)
+  - Alien respawn cost of 5 (only pay if you have it, you always respawn)
+  - Marine respawn cost of 3 (only pay if team has it, you always respawn)
+  - Fixed bug where dead alien players sometimes got stuck waiting to respawn
+  - Added missing sound wind3.wav
+  - Alien resource towers increased from 12 to 22 points
+  - Removed display of NS logo
+  - Added AVH_DEVELOPER_BUILD for things that shouldn't be shipped
+  - Added trigger_script for scripting system
+  - Added debug command for particles (cl_particleinfo), but don't use it quite yet, it has some problems
+  - Added code to allow sub-models to have different draw modes
+  - Added mp_networkdebug for tracking down overflows
+  - Started to add level 5 in, including his weapons and charging
+  - Added "run x" and "clientrun" scripting commands (where x is the script name)
+  - Added "killcs" (kills command station) and "killhive" commands when cheats are enabled
+
+base:
+	ui.txt, titles.txt, skill.cfg, listenserver.cfg, server.cfg, config.cfg - Regular updates
+	ns.fgd - Added trigger_script for scripting system
+	build.h - Added AVH_DEVELOPER_BUILD	for things that shouldn't be shipped
+
+cl_dll:
+	hl/hl_baseentity.cpp - Added checksum
+	hl/hl_weapons.cpp - Removed outdated weapons, notify HUD about needed energy for current weapons
+	cl.dsp - Added scripting files
+	health.cpp - Moved health over for alien, so it doesn't overlap energy indicator
+	hud_redraw.cpp - Chat draws in ready room now
+	input.cpp - Allow client-side scripts to override client input, added cl_particleinfo
+	StudioModelRenderer.cpp - Added code to allow sub-models to have different draw modes
+	tri.cpp - Added support for cl_particleinfo
+
+common:
+	exefuncs.h - Supposed fix for dedicated server with HL1109
+
+dedicated:
+	engine.cpp, sys_ded.cpp - Supposed fix for dedicated server with HL1109
+
+dlls:
+	cbase.* - Added checksum
+	cdll_dll.h - Fixed chat in ready room
+	client.cpp - Fixed problem where players weren't officially in the ready room (playmode was undefined)
+	enginecallback.h, util.h - Added mp_networkdebug for tracking down overflows
+	game.cpp - Regular update
+	hl.dsp - Added scripting and weldable files
+	weapons.cpp - Started to add level 5 in, including his weapons and charging
+
+doc:
+	AvH TODO.txt, Checkin.txt, Passwords.txt - Regular updates
+
+HPB_bot:
+	linkfunc.cpp - Added trigger_script and weapon_charge
+
+lua:
+	lua.dsp - Updated lib with more files
+	lua.lib - Updated with library functions
+
+mod:
+	New files: AvHAlienEnergyConstants.h - Rates for abilities and weapons
+	New files: AvHAlienWeapon.* - New base class for alien weapons (long overdue)
+	New files: AvHScriptClient.cpp - Client script bindings
+	New files: AvHScriptServer.cpp - Server script bindings
+	New files: AvHScriptShared.cpp - Shared script bindings
+	New files: AvHScriptManager.* - Manages running scripts
+	New files: AvHWeldable.* - Moved weldable into it's own set of files
+	AvHAlienAbilities.* - Added charge, updated leap as it now inherits from AvHAlienWeapon
+	AvHAlienAbilityConstants.h - Added charge constants, updated cloaking constants for new alien upgrade system
+	AvHAlienWeaponConstants.h - Spit does 20 damage
+	AvHAlienWeapons.h - Alien weapons updated to extend AvHAlienWeapon
+	AvHBaseBuildable.cpp - Added armory animations
+	AvHBasePlayerWeapon.* - Changes to allow weapons to not use ammo, but still have a cost
+	AvHBasePlayerWeaponConstants.h - Added charge, removed cocoon
+	AvHBite.cpp, AvHBlinkGun.cpp, AvHBuildGun.cpp, AvHClaws.cpp, AvHCocoon.cpp, AvHDivineWind.cpp, AvHEggLayer.cpp, AvHEnsnare.cpp, AvHHiveGun.cpp, AvHParalysisGun.cpp, AvHParasiteGun.cpp, AvHSniperGun.cpp, AvHSpikeGun.cpp, AvHSpitGun.cpp, AvHSpore.cpp, AvHSwipe.cpp, AvHUmbra.cpp, AvHWebspinner.cpp - Refactored so alien weapons extend from AvHAlienWeapon.
+	AvHClientUtil.* - Regular update
+	AvHClientVariables.h - Added cl_particleinfo
+	AvHConsoleCommands.cpp - Fixed possible crashing when typing console commands into a dedicated server, refactored LUA support, added "run x" and "clientrun" scripting commands (where x is the script name), added "killcs" (kills command station) and "killhive" commands when cheats are enabled
+	AvHConstants.h - Regular update
+	AvHDramaticPriority.h - Added priority for gestating an upgrade
+	AvHEntities.* - Added trigger_script, moved func_weldable into it's own file, added marine respawn cost, added ability to restore command stations with welder
+	AvHMarineWeapons.h, AvHKnife.cpp, AvHMachineGun, AvHHeavyMachineGun.cpp, AvHPistol.cpp, AvHGrenadeGun.cpp, AvHGrenade.cpp, AvHFlameGun.cpp, AvHWelder.cpp, AvHNukeGun.cpp - Marine weapons now extend AvHMarineWeapon (long overdue)
+	AvHEvents.cpp - Added charge event
+	AvHGamerules.* - Added scripting support (including world checksumming)
+	AvHHelp.cpp - Added profiling and huge performance improvement for help text (it was computing every tick and didn't need to)
+	AvHHive.cpp - Attempt to fix problem where hives aren't respawning players properly (still not right)
+	AvHHud.* - Added new alien energy (and system) and resource sprites.  Added client-side scripting.  Removed net screenshots because we're out of network messages.  Fixed 128 HUD sprites error by moving many sprites into multiframe sprites (cursors, orders, etc.).  Added support for cl_particleinfo.  Added new alien upgrade system.
+	AvHHudRender.cpp - New alien energy and resource indicators, added drawing support from scripts, added cl_particleinfo client variable, added overwatch indicator, new commander HUD artwork tweaks
+	AvHItemInfo.cpp - Updated to get rid of ammo for all alien weapons, use energy instead.  Moved some weapons around.
+	AvHMarineEquipment.cpp - Added respawn cost for marines, aliens can use phase gates now
+	AvHMarineWeaponConstants.h - Pistol damage tweaked
+	AvHMessage.h - Added charge ability
+	AvHMovementUtil.* - Added utility functions for alien energy system
+	AvHOrder.cpp - Regular update
+	AvHParticleSystem.cpp - Added support for cl_particleinfo, debugging functionality
+	AvHPlayer.* - Refactored gestating for upgrades, added client scripting support, removed network screenshots (out of message), new alien upgrade system, morphing not allowed until game starts, profiling info added, HUGE performance enhancements (blip think, enemy sighted think!), fixed observer problem where you could observe enemy, cap alien resources
+	AvHPlayerUpgrade.* - New alien upgrade system
+	AvHServerUtil.* - New alien upgrade system
+	AvHServerVariables.h - Regular update
+	AvHSharedUtil.* - Added AvHSHUGetTime()
+	AvHSpecials.* - New alien upgrade system (phew!)
+	AvHSpikeGun.cpp - Spike gun uses new energy system
+	AvHSprites.h - Regular update
+	AvHTeam.* - New team upgrade system, killcs console command
+
+pm_shared:
+	pm_shared.cpp - New alien upgrade system (silence), started to add level 5 charging, leap works when on the ground now, new alien energy system, flight uses energy
+
+New files:
+	scripts/buildtest.lua
+	scripts/movetest.lua
+	scripts/ns_test.lua
+	scripts/tritest.lua
+	testbed.bat
+
+ui:
+	UIUtil.* - Updated to allow more functionality (for drawing multiple bars)
+
+util:
+	New files: Checksum.* - Used to track named checksums for testing and verification
+	CString.h - kMaxStrLen was interfering
+	STLUtil.* - More utility functions
+	Util.dsp - Added Checksum.*
+
+
+Post-crash checkin
+------------------
+Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+
+Tuesday, 5/28, NSIPT7
+---------------------
+O Redo repository and get @Backup setup again 5/22
+O Fixed max entities problem (this was the main server crash we saw) 5/22
+O Rework hive sight 5/23
+O Web stuff 5/23
+	O Webs now affect friendly aliens in tournament mode
+	O Webs are now permanent
+	O Web energy cost increased to .2
+	O There is now a team limit on webs, if you try to build more, you'll get a message saying your team is at the max
+	O Webs slow down marines more
+	O Do scan to make sure there aren't too many webs in one area
+	O Solidity problems for web...how to destroy yet not block the player?  Welder removes webs now!
+O Moved resource tower gun to second slot, as 1 hive is needed
+Buildable command stations!
+	O Fix command station entity (make it functional, stop it from floating)
+	O Menus, costs
+	O When command station is destroyed, only allow kick out commander if there are none left for team
+	O Make command stations buildable, but first one starts built
+Allow building recycling for cash
+	O Get half points back, unless it's destroyed before it finishes
+	O Works for most buildings, but not turrets...fix
+	- Test recycling
+O Added first pass of shotgun artwork 5/24
+Fix problem where selecting command station didn't change the menu
+- Add alien turret (using offensive chamber)
+	- Added basic code...but it's crashing
+		- Try marine model
+		- Fixed it, it was a NULL ping sound (note to self: random crashes in the engine occur when playing a NULL sound name)
+	- Now it's firing, but it's blocking itself
+- Secondary alien building functions
+	- Defensive chamber heals friendly players
+	- Movement chamber teleports friendly player to nearest hive
+	- Sensory chamber marks enemies for hive sight
+O Flier has spikes with one hive
+O Fix hive respawning (again)
+O Fix marine respawning (ASSERT)
+O Fixed bug where alien upgrades weren't being cleared between levels, causing eventual overflows for alien players after many games
+Rework minimap
+	O Refactor naming to "entity" instead of "player" 5/23
+	X See NSIPT8
+Fixed bug where "couldn't play sound "/" message displayed when using the level 4 melee
+Added first pass of level 4 artwork (thanks a ton Mojo!)
+Added first	pass of shotgun (thanks Def_One!)
+Added first version of ns_penumbra (thanks Yamazaki!)
+Added second version of ns_freon (thanks Narby!)
+When in testing mode (mp_testing = 1), your resource level will actually be the current number of entities 
+
+
+base: 
+	ns.fgd - Made command station a point-based entity
+	buildzip.bat, assets.txt, titles.txt, skill.cfg, listlist.gam, motd.txt - Regular update
+	
+client:
+	ev_hldm.cpp - Play ricochet sounds quieter, because HL didn't normalize their sounds
+	cl_dll.dsp - Started to refactor player hierarchy to entity hierarchy
+
+dlls:
+	weapons.* - Added hook so weapons could set their time to fade out after they hit the ground
+	util.* - New utility function UTIL_CountEntitiesInSphere
+	player.* - Added DestroyAllItems(), to deal with player items appropriately (part of max entities fix)
+	observer.cpp - Reinforcement refactoring
+	client.cpp - Role sounds are precached a bit differently, they're called rolex_whatever now, part of fix where game was crashing when no sounds for a list were found, also reinforcement refactor
+	cbase.h - Virtualized SetBoneController() so alien offensive chamber could work without bones
+	hl.dsp - Added alien turret, refactoring minimap
+
+doc:
+	Checkin.txt, AvHTODO.txt - Regular updates
+
+mod:
+	New files: AvHAlienTurret.* - Offensive chamber that shoots spit
+	New files: AvHEntityHierarchy.* - New name for old AvHPlayerHierarchy.*.  Ready to refactor for working minimap.
+	Removed files: AvHPlayerHiearchy.* - Moved into AvHEntityHierarchy.*
+	AvHAlienEquipment.* - Added new turret instead of old offensive upgrades chamber, added secondary functions
+	AvHAlienWeapon.* - Reduced times where alien weapons are dropped and picked up again (but didn't eliminate, they are still being instantiated somewhere)
+	AvHAmbientSound.h - AvHEntityHierarchy refactoring (for new minimap)
+	AvHBaseBuildable.* - Added building recycling, mark mapper placed buildables so they aren't destroyed at the end of the round
+	AvHBasePlayerWeapon.* - Max entities fix, added animation empty fire
+	AvHBuildingGun.cpp - Don't perform max # check for offense chambers (only for upgrade buildings)
+	AvHCommanderModeHandler.* - Added recycling, added fix for occasional crash when selecting command station with some lag
+	AvHConstants.h - Reinforcment refactoring, renamed role sounds to be less confusing
+	AvHEntities.* - Track number of web strands to enforce limit, reworking of webs in general, removed duplicate code for AvHResourceTower
+	AvHEvents.* - Don't play machine gun or pistol sounds louder when upgraded, changed welder from looping sound to periodic sound
+	AvHGamerules.* - Minimap refactoring, hive sight "under attack", reinforcement refactoring, don't delete entities marked as permanent (it was deleting hives!), allow players to join the opposite team until this can be fixed for real (server retry gets around this code so this is just an inconvenience), things build fast with cheats
+	AvHMachineGun.cpp, AvHPistol.cpp, AvHPistol.cpp, AvHHeavyMachineGun.cpp, AvHGrenadeGun.cpp - Tweak weapon deploy volume, as Valve's sounds weren't normalized
+	AvHSonicGun.cpp - Tweak weapon deploy volume, as Valve's sounds weren't normalized, started to use new reload method (reload each shell)
+	AvHWelder.cpp - Tweak weapon deploy volume, as Valve's sounds weren't normalized, welder clears webs now, welder no longer makes ambient hum, slight refactoring of variable names away from Valve style
+	AvHHive.cpp - Mark hives as persistent so they aren't deleted on level cleanup, new hive sight support, reinforcement refactoring and fixes
+	AvHHud.* - Minimap refactoring, reinforcement refactoring, new hive sight fixes, recycling support
+	AvHHudRender.cpp - Hive sight sprite changes
+	AvHItemInfo.cpp - Moved resource tower to second slot
+	AvHMarineEquipment.* - Tried to make nuke sound play, extended shake duration to sound length, reinforcement refactoring, mark command stations as mapper placed, so they aren't deleted on level cleanup, support for point-entity buildable command stations
+	AvHMarineEquipmentConstants.h - Removed extra knife sounds, tweaked HMG ROF for sound purposes, added marine deploy weapon volume so our sounds are normalized
+	AvHMarineWeapons.h - Started to add special animations for shotgun
+	AvHMessage.h - Added support for recycling
+	AvHMovementUtil.cpp - Tweaked costs for swipe and web
+	AvHParasiteGun.cpp - Parasite works properly in tournament mode now
+	AvHParticleSystem.cpp - Temporary fix for bast.  It was creating crazy amounts of particle systems and should be investigated immediately.
+	AvHPlayer.* - Refactored size for role code for movement chambers, deal with inventory properly (entity leak), increased web ensnaring effects (put weapon away!), reinforcement refactoring, tweaked speeds so marines are a little slower, and speed upgrade works properly again (now level 1 can generally outrun marines), added recycling support, play destroy egg sound when killed when morphing, new hive sight, EffectivePlayerClassChanged() refactoring
+	AvHSelectionHelper.* - Player hierarchy refactoring
+	AvHServerUtil.cpp - Sensory chambers contribute to hive sight
+	AvHSharedUtil.cpp - Changed "entity blocked by whatever" message to be logged for PR/screenshot purposes
+	AvHSiegeTurret.cpp - Reduced tracking rate for siege
+	AvHSoundListManager.cpp - Error-checking, don't play sounds if none are found
+	AvHSpecials.h - Added recycling and persistent masks
+	AvHTeam.* - Track number of webs for team, fix for premature victory condition (again), fixed bug where alien upgrades weren't being cleared between levels, causing eventual overflows for alien players after many games, recycling support, spawn in command center when game starts
+	AvHTeamHierarchy.* - Refactoring player hierarchy to entity hierarchy, updated tons of variables names
+	AvHTitles.h - Regular update
+	AvHTurret.* - Put in slower, randomish rate of fire for turrets for sound variance and drama, don't play ping if no ping sound specified (crashing with offensive tower)
+	AvHVisibleBlipList.* - New hive sight (different states for different targets)
+	AvHWebSpinner.cpp - Limit total webs, limit webs in sphere
+
+
+
+Monday, 5/3, NSIPT8
+-------------------
+O Hive hitpoints tripled (6000) 5/27
+O Added secondary alien building functions (this happened on Monday so some have played it)
+(defensive structures heals nearby players and structures, movement chamber teleports player back to nearest hive, sensory chamber sees enemies, offense chamber is like a turret)
+O Spike attack energy cost increased slightly, web rate of fire increased to 2 web per second instead of 1 per 2 seconds
+O Removed siege turrets while I rework them into real artillery role
+O Marine armor and damage upgrades toned down considerably
+O Marine respawn cost higher
+O Alien resource tower and hive costs increased
+O Resource nodes now have 150 resources instead of 300
+O Ammo pack cost reduced to 1 point (was 2)
+O Tweaked weapon speeds (welder weighs, slow grenade launcher, lighten shottie, etc.)
+O Marine building changes
+      O Rename armory to arms lab
+      O Rename weapons factory to arsenal
+      O Add ability for marines to get more ammo by using the arsenal
+O LMG artwork and animations
+O HMG artwork and animations
+O Pistol artwork and animations
+      O Including empty reload
+O Show level of alien in scoreboard
+      O Also, don't show rank for opposing teams
+O Give points for building a hive (to 5)
+      O Increased points for building resource towers also (3)
+O Weapons factory changes (now called the "arsenal")
+      O Gives ammo to current weapon slowly when used
+      O Help message when near
+O Tons of new alien sounds
+O Hive sight that shows you EVERYTHING under attack.  If something comes under attack all the way on the other side of the map, it will blink red so you can do something about it.  It's not just players and hives anymore, it's everything.  I haevn't been able to repro the hive sight not showing up bug, but that will likely be fixed as well.
+O Showing state for aliens (LVL1, LVL2, GEST, DEAD, etc.).  The state for a player only shows for his team.
+O Movement chamber must be "used" to teleport (instead of just touching it)
+O Help messages for both friendly and enemy alien structures.
+O Def chambers should heal everything on your team
+O Tons of balance changes (hive hitpoints way up, marine respawn cost up, weight/speed tweaks, tons more) 
+O The ability to walk up to the arsenal (what used to be the weapons factory) and hold your use key to resupply your current weapon with ammo, slowly.
+O Removed mines temporarily while they are fixed and new artwork integrated
+O Alien turrets fire smoothly now (client-side weapon spit effects)
+O Defensive chambers now also heal other buildings, hives, etc.
+O New hive animations (two idle animations, two flinches when attacked, death animation, scared when touched by enemy on other team)
+O Hera is back
+O Penumbra has been updated (Monday's version, but for everyone)
+O Fixed grenade launcher aiming
+O New marine HUD sounds
+O Level 1 spiky footsteps
+O Level 1 view model (!)
+O Increase hive sight to be unlimited
+O Fixed bug where rebuilt hives weren't full health when spawned
+O Level 1 view model for bite, parasite, leap and divine wind!
+O Turret ping is quieter
+O HMG does more damage now
+O Fixed breakables, func_doors, func_door_rotatings, and func_buttons receiving damage 5/30
+O Hive spawn in 3 minutes now, sentries down to 500 hp instead of 1000
+O Fixed bug where empty sound was playing twice (once on client, once on server)
+O Toned down carapace a lot, cranked up HMG damage
+O Added "invul" cheat (type once to make yourself invulnerable, type again to turn off)
+
+
+base:
+	skill.cfg, titles.txt, liblist.gam, config.cfg, buildzip.bat - Regular updates
+
+cl_dll:
+	hl/hl_weapons.cpp - Updated weapons with real NS artwork (added constants and propagated data to client)
+	ammo.cpp - Reduced HUD sound volume now that sound effects are normalized
+	com_weapons.cpp - Allow passing a negative number for a view model anim to play no anim
+	entity.cpp - Propagate data for correct weapon behavior
+	vgui_ScorePanel.cpp - Show player status for players on your team (LEV1, GEST, COMM, etc.)
+
+dlls:
+	weapons.* - Fixed bug where empty sound was playing twice (once on client, once on server), renamed weapons factory and armory, fixed idle and reload sync problems between client and server
+	tripmine.cpp - Added new mine artwork
+	client.cpp - Added level 1 footsteps, propagate data for weapons
+	ggrenade.cpp - Replaced hard-coded sounds with constants
+	hl.dsp - Experimented with pushable/buildables for siege turret
+
+doc:
+	AvH TODO.txt, Checkin.txt - Regular updates
+
+HPB_bot:
+	linkfunc.cpp - Renamed weapons factory and armory
+
+mod:
+	New files: AvHPushableBuildable.* - Experimented with pushable/buildables for siege turret
+	AvHAlienAbilities.* - Proper anims for alien abilities
+	AvHAlienWeaponConstants.h, AvHAlienAbilities.h - Removed outdated v_leap.mdl (!)
+	AvHAlienEquipment.* - Movement chamber needs to be used to teleport, get points for building resource tower, defense chambers heal buildables too, improved sensory chamber (still has problems though), removed duplicate hive classname
+	AvHAlienTurret.*, AvHAlienEquipmentConstants.h - Moved chamber firing into an event, added turret constants
+	AvHAlienWeapon.* - Switch alien weapons quickly, renamed CheckValidAttack()
+	AvHAlienWeapons.h, AvHBite.cpp, AvHParasiteGun.cpp, AvHDivineWind.cpp - Animation constants and changes with new artwork
+	AvHBaseBuildable.* - Allow alien buildings to regenerate, renamed weapons factory and armory
+	AvHBasePlayerWeaponConstants.h, AvHBasePlayerWeapon.* - Added resupply (from arsenal), better animation support (for both view model and player model)
+	AvHBlinkGun.cpp, AvHBuildingGun.cpp, AvHClaws.cpp, AvHCocoon.cpp, AvHEggLayer.cpp, AvHEnsnare.cpp, AvHFlameGun.cpp, AvHHiveGun.cpp, AvHNukeGun.cpp, AvHParalysisGun.cpp, AvHPrimalScream.cpp, AvHSniperGun.cpp, AvHSpikeGun.cpp, AvHSpitGun.cpp, AvHSpores.cpp, AvHSwipe.cpp, AvHUmbra.cpp, AvHWebSpinner.cpp, AvHWelder.cpp - Added different deploy times (this should be refactored a bit more)
+	AvHMarineWeapons.h, AvHMachineGun.cpp, AvHPistol.cpp, AvHSonicGun.cpp, AvHKnife.cpp, AvHMine.cpp, AvHHeavyMachineGun.cpp - Constants and tweaks to make weapon anims and times correct with new artwork, added different deploy times (this should be refactored a bit more)
+	AvHGrenade.cpp, AvHGrenadeGun.cpp - Added different deploy times (this should be refactored a bit more), refactored grenades
+	AvHBuildable.* - Default point cost for anything buildable is 1
+	AvHCommanderModeHandler.* - Renamed weapons factory and armory
+	AvHConsoleCommands.cpp - Added "invul" cheat
+	AvHConstants.h - Removed duplicate hive class name, added more player class types for scoreboard info
+	AvHEvents.cpp - Moved offense chamber firing into event, fixed duplicate empty sound (now it's an event, not server-side), weapons play view model anim in weapon (not event), started to add grenade event for grenade gun
+	AvHGamerules.cpp - Breakables and buttons take damage like they should, points added for buildables correctly, weapon weights tweaked
+	AvHHelp.cpp - Help for arsenal, help for alien building secondary functions (help me, I need to be rewritten!)
+	AvHHive.* - Hives are base buildables now (bug with allowing use to speed building), added other hive anims for hurt, death, bad-touch, fixed bug where hives didn't get full health when they were initially built (after being killed once)
+	AvHHudRender.cpp, AvHHud.* - Help sprites moved into one animated sprite, select sound volume reduced (now that sound is normalized)
+	AvHMarineEquipmentConstants.h, AvHMarineEquipment.* - Renamed weapons factory and armory, added ammo resupplying
+	AvHMarineWeaponConstants.h - Regular update
+	AvHMessage.h - Renamed weapons factory and armory
+	AvHMovementUtil.cpp - Tweaked spike energy cost
+	AvHPieMenuHandler.cpp - Sound volumes tweaked because sound is normalized now
+	AvHPlayer.cpp - Added more effective player classes for scoreboard, send player class every time role changes (more network usage, always updated), changed hive sight to always be visible when under attack, all entities added to hive sight, not just players
+	AvHPlayerUpgrade.cpp - Toned down carapace and marine upgrades
+	AvHServerUtil.cpp - Toned down carapace and marine upgrades, removed redundant hive class name, all buildables are subject to visibility rules
+	AvHSharedUtil.cpp - Renamed weapons factory and armory, hive is now a buildable
+	AvHSoundConstants.h - Added level 1 footsteps
+	AvHTechID.h, AvHSpecials.h - Renamed weapons factory and armory
+	AvHSprites.h - Help sprites moved into one animated sprite
+	AvHTeam.cpp - Removed mines and siege temporarily while being worked on, removed old code, removed redundant hive class name
+	AvHTitles.h - Regular update (alien building help text, effective player classes for aliens)
+	AvHTurret.h - Experimented with pushable/buildable siege turrets
+	AvHTurret.cpp - Reduced turret volume
+
+pm_shared:
+	pm_shared.cpp - Added level 1 footsteps
+
+
+Monday, 5/10, NSIPT9
+--------------------
+Minimap rewrite
+  Works now.  The commander can see all friendly buildings (blue), friendly players (green), enemy buildings and players that are in LOS (red), hive locations (white) and more.  There are also some animated sprites for different player states, like a blinking exclamation mark when an enemy is in sight of a player, a red "x" where a player died, etc.  Some of these sprites work, some don't.  The overall color scheme and ease of reading this information still needs tweaking, but this build should allow the commander to keep track of all his troops and enemies, no matter where they are.
+  Draw portion of the minimap for soldiers (non-commanding marines).  Soldiers can see around them, but not as much as the commander.  KNOWN ISSUE: soldiers can't see their fellow players, or even themselves on the map.  This will be added.
+  Minimap rectangle replaced with a circular nub, so it's no longer wildly inaccurate.
+  All minimaps regenerated, only one sprite needed now, and it's scaled accordingly.
+  NOTE: The minimap has to do a fair amount of tricky updating to make sure it doesn't send more info that it has to, and in order to not adversely affect NS network performance.  Please be on the lookout for network performance changes (though I think it's quite efficient).
+
+New commander UI
+  It's now a 3x4 grid, instead of 3x3.  The build, advanced build menus are always available, and there's now an "equip" menu as well.  The equip menu gives you access to health, ammo, and all weapons.  These three menus should never go away, so you can always have access to all buildings and equipment without selecting a building!  To do research, and to upgrade buildings, you still need to select the building, but you should NEVER have to select the command station, and you will never have to scroll back to your base, select something, then scroll back to the battle to do somethin
+
+Customizable commander hotkeys
+  Many actions in commander mode can be customized.  This may not be fully working yet, but try binding keys to the "build", "Advanced build" or "Equip" menu in the control config area.  There is also half-working support for scrolling around with whatever keys you want (though there are problems with it still).
+
+  Fixed components not getting first gamma change (minimap esp.)
+  Fixed bug where entities disappearing in some congested areas (go crazy with buildings now!)
+  Fixed hive sprites not showing up (I think, please verify)
+  Fixed minimap not showing up
+  MG clip increased to 50 bullets
+  Grenade launcher increased to 300 points damage (up from 145, it's super powerful now, watch it)
+  Removed marine blood, made alien blood yellow
+  Removed slowdown when hit, until thought through
+  New marine knife model in! (thanks DefOne!)
+  New builder view model in! (thanks DefOne!)
+  Changed bot names to they don't mess with stats
+  New version of bast: tweaks to prevent getting stuck in the engine room and on the slanted elevator
+  Many more webs are allowed now (now that visible entities problem is fixed)
+  Builder chambers moved around: Sensory chamber with 1 hive, def chamber with 2, movement and offense with three
+  Level 1 no longer floating, his animations are fixed.  He shouldn't poke through the walls and actually looks somewhat fearsome now! (thanks Mojo!)
+
+
+base:
+	ui.txt, titles.txt, skill.cfg, liblist.gam, config.cfg, buildzip.bat, bot_names.txt, assets.txt - Regular update
+
+cl_dll:
+	input.cpp - Better support for scrolling
+
+dlls:
+	gamerules.cpp - Tried to fix player angle not being used when spawning
+	doors.cpp - Public fix for horrible door/sound bug (not sure if this fully fixes it)
+	client.cpp - Fixed visibility bug, may be the cause of overflows
+
+doc:
+	Checkin.txt, AvH TODO.txt - Regular updates
+
+mod:
+	AvHWebspinner.cpp - Allow more webs now that visible entity problem is fixed, new level 2 view model
+	AvHSpitGun.cpp, AvHBuildingGun.cpp, AvHHiveGun.cpp - New level 2 view model
+	AvHActionButtons.cpp - Removed accelerator character, now these are bindable via commands
+	AvHAlienWeapons.h, AvHAlienWeaponConstants.h, AvHAlienAbilities.cpp, AvHBite.cpp, AvHParasiteGun.cpp, AvHDivineWind.cpp - Updated with new alien view model artwork (with running anims)
+	AvHBasePlayerWeapon.* - First-pass at level 1 animated view model (different anims when running and walking)
+	AvHCommanderModeHandler.* - New commander UI
+	AvHConstants.h - Regular update
+	AvHEntities.cpp - Marked non-visible entities as nodraw, fixes visible entities problems!
+	AvHEntityHierarchy.* - Rewrote minimap
+	AvHGamerules.* - New minimap support, more attempts to fix picking up of alien weapons
+	AvHHud.* - New commander UI (bindable via hotkeys, added REMOVE_SELECTION for when clicking menu options when no players selected)
+	AvHHudRender.cpp - Allow drawing just a portion of a texture when scaling it, draw team hierarchy for soldiers
+	AvHItemInfo.cpp - Regular update (moved alien upgrade chambers around)
+	AvHMarineWeapons.h, AvHKnife.cpp - Updated with new knife artwork
+	AvHMarineEquipment.cpp - Scan update happens more often, in case aliens go cloaked during scan
+	AvHMarineWeaponConstants.h - MG clip size increased to 50, grenades toned down
+	AvHMessage.h - Update for new commander UI
+	AvHMiniMap.* - Minimap now generates one image which it scales, instead of the old crappy way.  Fixes minimap appearing over scoreboard bug in CM.
+	AvHParticleSystem.cpp, AvHScriptClient.cpp - Updated extern references to drawing code (ugh)
+	AvHPlayer.* - Updated for new minimap (remember killed position).  Updated blood so marines aren't bloody, and aliens emit yellow blood.  Removed slowing when hit (now players fly back when hit though), UpdateBlips() hack (fix when time)
+	AvHSelectionHelper.* - Added more functionality for new commander UI
+	AvHTeamHierarchy.* - Completely reworked minimap.
+	AvHVisibleBlipList.cpp - Blip list wasn't being cleared properly (?)
+
+ui:
+	UIManager.* - Set gamma slope for gamma-aware components when they are created (fixes bug where gamma slope is propagated too early)
+	
+
+
+NSIPT10 - NSIPT10b
+------------------
+O Fix bug where commander that's disconnected still blocks command station
+O Add map location entity
+O Move alien buildings to pop-up menu
+O Draw "resources" near resources (only when cl_autohelp enabled)
+O Draw "energy" near energy (only when cl_autohelp enabled)
+O Don't add and remove weapons, just disable them
+O Change random blinking icon to blinking category, blinking in place where upgrade will go
+O Added error messages when trying to build structures when not a builder, or when not enough structures
+O A hive is now needed to gestate into flier
+O Towers and hives always available, alien turrets need 1 hive, defense and movement chambers require 2 hives, sensory chambers require 3 hives
+O New grenade model for grenade launcher
+O New world/player handgun model
+O New projectile for acid launcher and spikes
+O Fixed freezing bug (with looping sound, during scenes of action!)
+O Got mines working again
+O Updated motd.txt and maplist.txt with new .bsps
+O Fixed memory overwrite bug in SDK in scoreboard 
+O Reworked player animations now many more are played, no more "airplane marines"!  Thanks for the anims, Mojo and Guy! (there are even a couple death animations in there!)
+O Removed egg_die on gestate (now play real sound)
+O Add sparks for marines when they are hit
+O Added smooth resource adjustment (instead of just setting the number/bar-level, it smoothly increments towards it)
+O Added realistic fall damage by default
+O Fixed bug where game wouldn't end if a team suddenly had no players
+O Inactive hives are now drawn for aliens, so they can find where they're supposed to be created
+O Added timelimit command -> When game ends, if timelimit has been reached, it switches the map (as opposed to switching maps in the middle of a game)
+O Late join time (mp_latejointime) changed to minutes (not seconds) and now defaults to 1 minute
+O Added numeric indicators and labels for alien resources and energy
+O Updated {alien_alpha to have less blue edges (Merks)
+O Updated ns.wad with Terawatt's transition textures
+- Level 1
+	O Make leap do damage
+	O Added flavor animation (picking teeth)
+	O Remove cheat where anyone can leap
+	- Add predicted/client-side damage feedback sound when touching player?
+	O Changes for new view model 
+	O Add visual indication to parasite
+		- Added code, but it doesn't show up?
+- Level 2
+	O Give builder web first, instead of spit
+	O Removed point cost for webs
+	- Change builder spit to be corrosive spit, does damage over time, esp. to welds (give it with 3 hives)
+	- Add new view model artwork
+		- Do it again
+	- Add healing/energy weapon
+		- Everything working but event
+	- Needs one more ability...
+- Level 3
+	O New view model (spikes, spores, bite and transition animations)
+	- Think about bite more (1)
+		O Add new weapon (last one?!)
+		O Add artwork
+	- Spikes (2)
+		- Animations
+		- Shoot fast spike model (alternate left/right when shooting)
+	- Spores (3)
+		- Animations
+	- Bombs (4)
+- Level 4
+	- Add double-jump
+	- Rocket-launcher instead of spikes (2)
+		O Add basic code
+		O Get the artwork for it started
+		O Make it explode in goo when it hits
+		- Make sure it doesn't hurt self in tournament mode (at least not when it leaves launcher)
+		- Make it look nice
+	- Change blink to be like BZII blink! (3)
+		O Rewrite
+		- Fix problems getting stuck
+		O Make it easier to blink (don't trace hull, just end point)
+		- Add visual indicator?
+		- Better sound effects, feedback
+	- Umbra (with three hives) (4)
+		- Basic code
+		- Make it block turrets...and bullets?
+		- Make it look better with new artwork and sounds
+		- Figure out a new ability for this, the turret thing is a bit hacky and hard to do
+- Level 5
+	- Artwork
+	- Bounding box, size, cost, speeds
+	- Huge hitpoints
+	- Galloping? (the longer you go in a straight line, the faster you can go?)
+		- Add basic speed code
+		- Make sound effects
+	- Melee (add some spice here...knockback?) (1)
+	- Charging attack (2)
+		O Got basic thing working
+	- Paralysis (3)
+		O Seems to be working, though a bit boring right now
+	- Primal scream (4)
+	- (swallow weapon?)
+- Fix iteminfo problem with acidrocket (the mID value is too high, what to do?)
+	O Try consolidating all the building IDs down into one ID (ugh, didn't work)
+	O Write Valve?
+	O Move build actions to pop-up menu!
+		O Remove hacky help system
+		O Now all resources are spent off menu, never from weapons
+		O Room for other builder abilities
+O New builder UI
+	O All buildings are on the pop-up menu now, so anything that costs points is on the menu
+	O Cleans up clutter of weapon icons, makes interface more clear
+	O Uses menu help instead of separate help system
+	O Workaround for 32 max weapons problem (engine limitation)
+	O Update help text to be more descriptive
+O New named locations tell players where they are (also works for commander)
+	O Draw info_location text nicely
+		O Added sprite for soldiers
+		O Tweaked position for commander and aliens
+O Don't draw health while gestating
+O Spit damage upped from 20 to 28
+O Added custom button sounds (button1->button10.wav)
+O New flashlight sound
+O New launcher sounds, brightened launcher artwork (temporary)
+O Play special animation when builder is building
+	- Only plays once, how to keep playing it?
+O New version of bast (locations)
+O New version of hera (new warehouse, new layout changes, locations, more)
+O Remove costs to respawn on both sides
+O Add rewards for kills on both sides (and for building on alien side?)
+O Add advanced weapons factory as research
+	O Rename arsenal to armory first
+	O Add new upgrade command
+	O Add code to handle upgrade
+	O Build times changed (30 secs to build armory, 120 to upgrade to adv. armory)
+	- Tweak code that converts it, it thinks it's buildable and stuck at 0%
+- Player animations
+	O Create constants from info sent to Mojo
+	O Start integrating
+		O Walk, run
+	O Fix marines quickly for NSIPT10?
+O Fix bug where deaths aren't reset when game is
+O Both sides now get points for killing enemies!  This should speed up the game.  More points are given for bigger aliens.
+O There is no respawn cost for either side now.  This should speed up the game.
+O Victory condition fixed (bug #111)
+O Machine gun damage increased from 10 to 12 points
+O Leap damage reduced to 20
+O Acid rocket rate of fire decreased dramatically
+O Spore damage reduced from 50 to 45
+O Spore radius reduced from 300 to 250 (to line up with artwork)
+O Level 5 cost reduced from 100 to 75
+O Acid rocket awards points to owner correctly now
+O Shotgun range dropped from 4000 to 1000, damage decreased from 27 to 23
+O Turret damage reduced from 50 to 43
+O Base points awarded for a kill reduced from 5 to 4
+O Getting stuck when evolving as a level 5 (bug #113)
+O Getting stuck when evolving in small places ()
+O Fixed bug #130 (parasite works while in commander mode)
+O Reduced stepsize for level 5 (so he doesn't walk over marines instead of charging into them)
+O Fixed bug #115 (weapons sometimes red when they shouldn't be on both sides)
+O Temporarily removed buggy sensory chamber sight, it was causing players to show up when not visible
+O Fixed bug #82 (ghost building not updating when changing your mind about what to build)
+O Acid rocket doesn't leave phantoms anymore, works better now also
+
+
+base:
+	buildzip.bat, listenserver.cfg, mapcycle.txt, server.cfg, skill.cfg - Regular update
+	liblist.gam - Added training map (enables training button in launcher)
+	titles.txt - Regular update.  Added official map location names.
+	delta.lst - Increase size for health, propagate iuser3 for weapons (for enabling/disabling weapons according to # of hives)
+	ns.fgd - Added info_location 
+	ns.ps - Added level 4 blink effect
+	ui.txt - Move alien building actions to pop-up menu
+
+cl_dlls:
+	hl/hl_weapons.cpp - Removed old weapons, added new weapons, fixed mines, iuser3 enables and disables weapons 
+	ammo.cpp - Removed old weapon help system (now it's all on pop-up menu), iuser3 enables and disables weapons
+	ammohistory.h - Weapon enabling/disabling works differently now
+	StudioModelRenderer.cpp - Removed crash when gaitsequence is propagated as -1 (means we can't have 255 animations, oh no).  Beginning of wall-running model orientation.
+	vgui_ScorePanel.cpp - Removed memory overwrite from hlcoder list
+	cl_dll.dsp - Added mapcycle.txt to custom build, added new files
+
+dlls:
+	animation.cpp - When testing is enabled, report missing animations
+	cdll_dll.h - Weapon category #5 is never used, so remove it
+	client.cpp - Unbuilt hives are drawn faded out for alien players, propagate iuser3 for weapons (enable/disable state)
+	combat.cpp - Wrapped bullet tracing, in preparation for umbra ability (so it could block bullets for players and turrets)
+	game.cpp - Fall damage on by default, late join time in minutes (standard with other time settings)
+	hl.dsp - Added mapcycle.txt to custom build, added new files
+	player.* - Moved player animation specification into general virtual function, quieted flashlight sounds (because sound is normalized)
+	weapons.* - Changed blood and blood color, removed old weapons, added new weapons, new events, temporarily removed deploy player animation (constants need to be rethought)
+
+doc:
+	AvH TODO.txt, Checkin.txt - Regular updates
+
+HPB_bot:
+	dlls/bot.cpp - Updated bot with point cost for level 5
+	dlls/linkfunc.cpp - Updated entity names, removed old entity names
+
+mod:
+	New files: 
+		AvHAcidRocketGun.cpp - Level 4 projectile
+		AvHBaseInfoLocation.* - Entity for info_location
+		AvHBileBombGun.cpp - Level 3 bomb attack
+		AvHBite2.cpp - Level 3 bite attack
+		AvHHealingSpray.cpp - Level 2 healing ability
+
+	AvHAlienAbilityConstants.h, AvHAlienAbilities.* - Regular update for leap and charge
+	AvHAlienEquipmentConstants.h - Regular update
+	AvHAlienWeapon.* - Better default behavior
+	AvHAlienWeaponConstants.h - Consolidated view models, correct animations for player models, removed ancient weapons
+	AvHAlienWeapons.h - Better default behavior, removed building weapons
+	AvHBaseBuildable.cpp - Regular update, don't assume anything about player building, renamed arsenal to armory
+	AvHBasePlayerWeapon.* - Reworking for correct player animations and new enable/disable state
+	AvHBasePlayerWeaponConstants.h - Removed building weapons, added new weapons
+	AvHBlinkGun.cpp - Reworked blinking
+	AvHBuildingGun.cpp - Removed this
+	AvHCommanderModeHandler.* - Renamed some buildings, armory is now upgraded
+	AvHBite.cpp, AvHClaws.cpp, AvHDivineWind.cpp, AvHGrenadeGun.cpp, AvHHeavyMachineGun.cpp, AvHKnife.cpp, AvHMachineGun.cpp, AvHMarineWeapon.*, AvHParalysisGun.cpp, AvHParasiteGun.cpp, AvHPistol.cpp, AvHPrimalScream.cpp, AvHSonicGun.cpp, AvHSpikeGun.cpp, AvHSpitGun.cpp, AvHSwipe.cpp, AvHUmbraGun, AvHWelder.cpp - Reworking for correct player animations and new enable/disable state, new view model artwork, alien weapon refactoring
+	AvHMine.cpp - Fixed mine, refactored for new disabled/enabled state
+	AvHSpores.cpp - Some refactoring, new view model artwork, removed old code
+	AvHWebSpinner.cpp - Some refactoring, new view model, removed old code, no longer costs resources to use, web projectile can ensnare marines without creating web
+	AvHConstants.h - Regular update (cleanup, new entities, new classnames)
+	AvHEntities.* - New info_location entity, make resource tower sounds very quiet
+	AvHEntityHierarchy.* - Quick fix during playtesting...why is this happening?
+	AvHEvents.cpp - Removed old events, added new events, fixed infinite loop crash in PlayMeleeHitEffects, added parasite projectile
+	AvHGameRules.* - Added timelimit (switches map after a game finishes), added info_locations, tried adding team balance (not sure it works yet), give resources for kills
+	AvHHelp.cpp - Removed help for building gun, renamed arsenal to armory
+	AvHHive.cpp - Play sequence for non-active hives
+	AvHHiveGun.cpp - Removed this
+	AvHHud.*, AvHHudRender.cpp - Added info_locations, removed old weapon help system, added smooth resource swelling, lots of alien UI usability changes, fixed problem with ghost building
+	AvHItemInfo.cpp - Mark weapons with hive flags, deleted old weapons, added new weapons, fixed mines, changed weapon IDs
+	AvHMarineEquipment.* - Renamed some buildings, armory is now upgraded to advanced armory
+	AvHMarineEquipmentConstants.h - Renamed some buildings, armory is now upgraded to advanced armory, fixed mine ROF (why doesn't the compiler catch this?), updated player animations
+	AvHMarineWeaponConstants.h - Updated player animations, balance changes
+	AvHMarineWeapons.h - Refactoring, cleanup
+	AvHMessageID.h - Building rename, blinking change
+	AvHMovementUtil.cpp - Energy costs tweaking, added new weapons, added charging
+	AvHParticleConstants.h - Added umbra effect
+	AvHPlayer.* - Added death animations, added more general animation support, leaps do damage, general construct effects, new alien inventory system, added charging, info_locations, galloping, new alien building code, better morphing system (prevents getting stuck), more builder error messages, clear deaths on game end, hide health while gestating
+	AvHPlayerUpgrade.cpp - Removed old offensive upgrades
+	AvHScriptManager.cpp, AvHScriptServer.cpp - Some enhancements and bugfixes for tutorial
+	AvHServerUtil.* - Quieted construction effects (normalized now), temporarily removed sensory chamber sight, added upgrading of armory, wrapped bullet tracing for umbra
+	AvHSharedUtil.cpp - Renamed buildings, better is-area-free detection
+	AvHSpecials.h - Removed offensive upgrades, added charging, new alien upgrade system
+	AvHSpecials.cpp - Removed old offensive upgrades
+	AvHSprites.h - New alien upgrade system
+	AvHTeam.* - New enabled/disabled system for alien weapons, better victory detection, updated tech tree (removed old junk, added armory upgrade), fixed bug where a commander that leaves the game hogged the station, update resources less often (optimization)
+	AvHTechID.h - Renamed buildings
+	AvHTitles.h - Regular update
+
+pm_shared.cpp
+	pm_shared.cpp - Cleaned up wall-crawling, in preparation for rotating model properly, added charging, updated position free code, only let level 1 aliens cheat with leap :), new level 4 blinking
+
+scripts:
+	testbed.bat - Regular update
+
+util:
+	MathUtil.cpp - Added float value of RotateValuesByVector
+
+
+
+Monday, 6/1, NS RC1
+--------------------
+O Both sides now get points for killing enemies!  This should speed up the game.  More points are given for bigger aliens.
+O There is no respawn cost for either side now.  This should speed up the game.
+O Victory condition fixed (bug #111)
+O Machine gun damage increased from 10 to 12 points
+O Leap damage reduced to 20
+O Acid rocket rate of fire decreased dramatically
+O Spore damage reduced from 50 to 45
+O Spore radius reduced from 300 to 250 (to line up with artwork)
+O Level 5 cost reduced from 100 to 75
+O Acid rocket awards points to owner correctly now
+O Shotgun range dropped from 4000 to 1000, damage decreased from 27 to 23
+O Turret damage reduced from 50 to 43
+O Base points awarded for a kill reduced from 5 to 4
+O Getting stuck when evolving as a level 5 (bug #113) (REALLY, it's fixed this time)
+O Getting stuck when evolving in small places ()
+O Updated models soldier, machine gun, and handgun world and player models
+O Enlarged grenade
+O Updated healing spray sprite
+O Fixed bug #130 (parasite works while on commanders)
+O Reduced stepsize for level 5 (so he doesn't walk over marines instead of charging into them)
+O Fixed bug #115 (weapons sometimes red when they shouldn't be on both sides)
+O Fixed bug #82 (ghost building not updating when changing your mind about what to build)
+O Acid rocket doesn't leave phantoms anymore, works better now also
+O Builder level 4 ability
+	O Babblers!  Try it, you'll see.
+O Primal scream.  The level 5 screams, and gives energy increases, speed increases, ROF increases and damage upgrades to all friendlies in range!  ATTACK!
+O Level 4 Umbra ability!  Any friendlies inside the umbra are immune to bullets and turret fire.
+O Level 3 Bile bomb!  This is a mortar, meant for taking out bases without a scratch.
+O New HMG model (new model, unanimated)
+O All view shaking affects players in air as well
+O Siege turrets are back!
+	O Siege rumbles screen if you're near it when it fires
+	O Added siege splash effect
+	O Just put them back in, aliens have artillery now as well
+O Added concrete and metal sounds when bullets hit them
+O Sensory chamber ability - parasites and lightly damages anyone who touches it, has tons of health
+O Gibs are now off by default (but can be turned on via server config)
+O Limit turret placement to radius around turret factory
+O Limit weapon placement to radius around armory/adv-armory
+O Limit infantry portals to range of command station (to prevent hiding them)
+O Draw range of selected buildings when selected (turrets, etc.)
+O Draw min/max range for siege turret when selected
+O Removed overwatch (until there's time to do it properly)
+O Marine backpedalling and strafing slowed down (I want feedback on this!)
+O Fixed bug where dropping your weapon made it look like you weren't either a marine or alien player
+O Ladder speed reduced for all players
+O A slow-moving marine is slightly faster (frustrating)
+O Level 1 speed increased, fixed alien speed upgrade bug (where 2 levels of speed upgrade was faster then 3)
+O Added new hive vision mode for the aliens!  Press your flashlight key to see...
+O Hive sight now only draws for entities out of sight (back the way it originally was, see if you like it better this way)
+O Marines now see enemy blips with new artwork
+O Two new sensory upgrades
+	O Alien vision mode, for finding enemies and hidden enemy buildings
+	O Scent of fear - you can see enemies under attack or that are seriously wounded so you can hunt them down...
+O New blip artwork for marine team
+O New mine artwork oriented properly (a little big and floaty still)
+O Fixed all "invalid sprite x" errors after a level change
+O Fix precache error that happens occasionally (move player assets into weapons.cpp)
+O Network logging code to track down overflow one and for all
+O Networking, overflow and performance enhancements.
+O Removed alpha-male double resources (more resource changes coming soon)
+O Hive building problems fixed (noticeable on ns_nothing)
+O Fixed autobuild for resource towers and offensive chambers
+O Don't allow hive building to be sped up
+O Turret range reduced
+O Removed alpha male resource model
+O HMG damage increased, grenade damage decreased, bile bomb damage increased
+O Logging for overflows
+O Some network message buffering performance enhancements
+O Fixed drawing of armor value in HUD
+O Added view shakes for grenades
+O Removed phase gate particle system, added implosion effect instead
+O Removed outdated overwatch target and tension events
+
+base:
+	assets.txt, buildzip.bat, config.cfg, liblist.gam, listenserver.cfg, server.cfg, mapcycle.txt, ns.ps, skill.cfg, titles.txt - Regular updates
+
+cl_dll:
+	cl_dll.dsp, hl/hl_weapons.cpp - Added babbler gun
+	battery.cpp - Fixed drawing of armor value in HUD
+	ev_hldm.cpp - Added special ricochet sounds for metal and concrete surface types
+
+dlls:
+	client.cpp - Added special alien vision mode
+	combat.cpp - Added umbra effects (don't do damage, play "blocked" sound)
+	enginecallback.h - Added debugging/logging code for tracking down overflows
+	game.cpp - Removed outdated variables
+	ggrenade.cpp - Moved grenade damage to a constant, added view shaking when they go off nearby
+	hl.dsp - Added babbler gun
+	player.cpp - Removed flashlight battery message, not needed for NS
+	tripmine.cpp - Moved mine damage to constant (used old HL constant in skill.cfg)
+	util.* - View shaking works even in air (not just for gargantuas anymore), removed old network debug code
+	weapons.cpp - Moved player assets out of AvHPlayer::Precache and into here (they weren't being called reliably there, fixes precache error), added babbler and bile bomb, removed old weapons, removed old command points sound
+	world.cpp - Precache new ricochet sounds
+
+doc:
+	AvH TODO.txt, Checkin.txt - Regular updates
+
+HPB_bot:
+	linkfunc.cpp - Regular update
+
+mod:
+	AvHAcidProjectile.cpp - Removed unneeded linking entity to classname
+	AvHAlienEquipment.* - Added auto-build to all alien buildings, added new parasiting ability to sensory chambers
+	AvHAlienEquipmentConstants.h - Regular update
+	AvHAlienTurret.* - Added auto-building, added damage upgrade (from primal scream), added vertical FOV (doesn't work yet)
+	AvHAlienWeaponConstants.h, AvHAlienWeapons.h - Added new alien abilities (primal scream, babblers, bilebomb, umbra)
+	AvHBaseBuildable.* - Added auto-build capability
+	AvHBasePlayerWeapon.* - Removed outdated adrenaline concept, made ROF generic for primal scream
+	AvHBasePlayerWeaponConstants.h - Added babbler id
+	AvHBileBombGun.cpp - Implemented bile bomb
+	AvHBite.cpp, AvHClaws.cpp - Removed adrenaline
+	AvHParasite.cpp - Removed hard-coded parasite damage
+	AvHUmbraGun.cpp - Implemented umbra weapon
+	NetworkMeter.* - Added logging code to track down overflows
+	AvHVisibleBlipList.* - Reworked sprites to be simpler and to allow more types
+	AvHTurret.* - Added generic vertical FOV to allow alien turrets to shoot very high and low
+	AvHTeam.cpp - Brought siege back, removed alpha male resource model
+	AvHSprites.h - Removed outdated sprites, updated visible blips
+	AvHSpecials.h - Regular update
+	AvHConstants.h - Added new alien weapons, added build ranges
+	AvHEntities.cpp - Toned down resource tower sounds (moved to CHAN_BODY to cut down on multiples playing)
+	AvHMarineEquipment.cpp - Removed phase particles, added implosion instead, don't select command station on log-in (messy for drawing building radii)
+	AvHMarineEquipmentConstants.h - Removed outdated commandpoints event, added siege turret shockwave, tweaked ranges and damage
+	AvHEvents.cpp - Regular update
+	AvHGamerules.* - Visibility update now updates world for primal scream and umbra, don't update reliable network messages every tick (big optimization)
+	AvHMarineWeapons.h, AvHHeavyMachineGun.cpp - Tweaks for new artwork
+	AvHHive.* - Hives can no longer be "used" to speed construction, wound sounds play on CHAN_BODY
+	AvHHud.* - Removed lots of outdated sprites and sprite code, added building ranges, fixed ghost building problem (bug #82)
+	AvHHudRender.cpp - Added primal scream effect, added building ranges for ghost buildings, removed outdated code, removed mapping build sprite, call vidinit() on hive sight sprites
+	AvHItemInfo.cpp - Regular update (new weapons, new placement)
+	AvHServerVariables.h, AvHMarineTurret.cpp - Removed turret range from skill.cfg (for visible building placement ranges)
+	AvHMarineEquipmentConstants.h - Balance changes, removed outdated grenade constants
+	AvHMovementUtil.cpp - Primal scream gives energy back faster, added energy usage for new weapons
+	AvHPlayer.* - Removed outdated adrenaline concept, added new alien sight mode, primal scream, removed flashlight battery message, fixed morphing problems for level 5 (and others), tweaked marine and alien speeds, fixed triple speed upgrade problem, disabled overwatch, moved player assets out of precache() (wasn't being called reliably), get full energy after a lifeform change, hive sight only draws out of sight now, added scent of fear
+	AvHPlayerUpgrade.cpp - Added offensive upgrade back, when under the influence...of primal scream!
+	AvHPrimalScream.cpp - Refactoring
+	AvHServerUtil.* - Added primal scream and umbra support
+	AvHSharedUtil.* - Added support for generic building ranges, fixed morphing problems
+	AvHSiegeTurret.* - Added siege shockwave effect, added view shaking effects
+	AvHSoundListManager.* - Added debug code, added document headers
+	client.cpp, weapons.cpp, AvHEvents.cpp, AvHConstants.h, AvHPlayer.cpp - Removed outdated overwatch target and tension events
+	AvHMarineWeaponConstants.h - Moved grenade damage to a constant
+
+pm_shared:
+	pm_shared.cpp - Slow down marine strafing and back-pedalling (including footstep sounds), reduced ladder climbing speed 
+
+
+Monday, 6/8, NS RC2
+-------------------
+- Fix armor display
+	O Now it draws
+	- Make current armor change proportionally when max changes
+	- Bug: overlapping armor and health in some resolutions
+O Siege damage much reduced
+O Throttled networking more to combat overflows (4000 to 3000)
+O Removed flashlight battery message
+O Grenade damage lowered, mine damage lowered, bile bomb damage increased
+O Grenade clip lowered, grenade max ammo lowered
+O HMG damage increased
+
+O Fixed permaweb bug, bug #167, bug #178, bug #128 (check for dupes first guys, just type a word and hit search, super-fast)
+O Limit amount webs a marine can receive, 
+O Removed ability for builder to use webs offensively by hitting players, bug #141
+O Changed primal scream HUD color to green instead of red (people were getting rightly confused about their weapons being unuseable), bug #165
+O Removed "bodysplat" sound when level 1 falls a long distance (bug #142)
+O Added code to detect that a level has the right amount of spawns.  This information is printed to the console on level load. (bug #187, bug #169, bug #112)
+O Weird "underwater" issues for commander above hera landing pad (bug #49)
+O Removed use of "model" command (set the model every tick) (bug #211)
+	- TODO: Also remove default model in RR?
+O Addressed commander crashing when selecting things (bug #173)
+- Added mp_teamresourcehandicap (if set to 1, biases team with less players with extra resources) (bug #202)
+	O Changed func_resource to represent resources as a float
+- Fixed problem where selection effects sometimes draw after leaving command station (bug #219)
+- Bite and spit started could go through walls, as their attacks emanated too far from the player origin (bug #177)
+O Reduced spike damage for level 3 (bug #207)
+O Don't auto-switch to an empty weapon (bug #194)
+O Fixed bug where particle systems weren't being reset properly after a game end, causing wrong or no particles to emit (bug #125)
+O Increased spike energy cost by 25%
+O Spent a long time narrowing down the jiggling while standing on buildings, it's in Valve's court at the moment
+	- Got e-mail back from Yahn, now investigate
+O New smaller mine artwork (still a bit floaty)
+O Fixed crash when placing tripmines on doors (bug #222)
+O Fixed command station healing players (also, retain armor value) (bug #137)
+O Started addressing cheating (leap exploit to start) though it's not fixed yet. You should hear a beep ("invalid.wav") when the game detects that you're doing something illegal, though it doesn't do anything about it yet.  Validated selection, research, building, hotgroups, lifeform morphing, upgrade evolution, etc.) (bug #118)  
+O Primal scream duration and cost increased significantly, for a more game-altering moment (bug #205)
+O Closed bug #101 (blinking no longer goes through walls)
+O Don't white-out commander when nukes detonate (bug #91)
+O Closed out ladder-speed bug (bug #28)
+O Fixed melee attacks not working up or down (bug #117)
+- func_buttons now reset properly (bug #4)
+	- Lots of stuff has changed reset-wise, but some lifts and doors don't reset right anymore, others work better
+O Reworked marine weapons to add randomness to their shots (Machine gun, pistol, shotgun, HMG) (bug #236)
+O Increased pistol damage from 18 to 25
+O Redemption tweaks (it triggers more often, it won't pull you back if you have no hives, plays a "invalid" sound when it tries to pull you back but you have no hives, it will now pull you back even if not in combat) (bug #238)
+O Removed sickness-inducing view shakes when hit with melee, but not taking damage, anti-llama (bug #230)
+O Builder healing spray damage/healing increased from 15 to 20
+O HMG damage increased from 22 to 28 and range increased about 20% (now that it has such a wide spray)
+- Added ready room command and commander voting to pop-up menu so console should never have to be used (bugs that will be fixed not withstanding)
+O Added temporarily invulnerable time (default is .1 minutes -> 6 seconds).  Players glow their team color during this time and can't be hurt. (bug #237)
+	- TODO: Draw this on view model as well
+O Fixed commander ability to change weapons (!) (bug #239)
+O Fixed marine progress indicators not always showing up after a map change (bug #24)
+O New buggy behavior: the command menu now longer works for MOUSE2!  The code is half-way to being fixed, need to work with Valve on this.  Bind it to a key in the meantime, sorry!
+O Moved soldier info_location out of minimap and to bottom of screen for consistency and to get around problems where it doesn't line up under different resolutions
+O Fixed bug where hitting "use defaults" in control setup would delete your settings
+O Overflow and HUD lag issues
+	O Disable network buffering to see if that's the HUD latency (set to -1)
+	O Log all network traffic by default
+	O HUD lag should be gone from now on, but we might see more overflows
+O Addressed various respawning issues (the problem will now be easier to find if it's not fixed).  Respawning changed significantly, (though it should behave the same), so be on the lookout for spawning problems.
+O New command center model!  I think you'll agree with me that this rules.  Thanks Squeal and Mojo!
+O New armory model!  Newly animated as well.  Looks different for the basic and the advanced versions.  Thanks Erex and Mojo!
+O New HMG model!  Animated and sized properly now (I need to change some code to make the fire animation look right).  Thanks BathroomMonkey and DefOne!
+
+
+
+base:
+	buildzip.bat, config.cfg, listenserver.cfg, server.cfg, titles.txt, ui.txt - Regular updates
+
+cl_dll:
+	hl/hl_weapons.cpp - Removed unneeded code here, so random numbers were generated properly on both client and server
+	hl/hl_baseentity.cpp - Added stubs for functionality to fix button resets
+	cdll_int.cpp - Added test case for Valve to fix D3D artifacts
+	death.cpp, health.cpp, hud.cpp, saytext.cpp, vgui_ClassMenu.cpp, vgui_ScorePanel.cpp, vgui_TeamFortressViewport.*, vgui_teammenu.cpp - Refactored team color management
+	input.cpp - Fixed bug where command was able to switch weapons via mousewheel (bug #239)
+	ev_hldm.cpp - Reworked bullet firing to add random spread (bug #236)
+	cl_dll.dsp - Removed AvHBlinkGun.cpp from project (it's a regular alien ability now)
+
+common:
+	hldm.h - Reworked bullet firing to add random spread (bug #236)
+
+dlls:
+	buttons.cpp, cbase.h, lights.cpp, subs.cpp - Tried to make general fix for buttons, lifts, lights.  Doesn't work yet.
+	cbase.cpp - Fixed a crash bug when placing a mine on a moving door.  Not sure if this is the right fix, but I can't figure out how this could be happening.
+	game.cpp - Regular update, added document header
+	player.cpp - Level 1 doesn't make falling splat sound, dead players shouldn't block spawn points, replaced impulse hard-codes with constants
+	tripmine.cpp - Added document header, fixed potential crash bug (when placing mines on doors?)
+	weapons.cpp - Added document header, updates for cheat protection, added constants
+	weapons.h - Added 0-degree constant, added document header
+	hl.dsp - Removed AvHBlinkGun.cpp (it's a regular alien ability now)
+	client.cpp - Draw invulnerable players differently
+	combat.cpp - Fix bug where melee attacks couldn't aim up or down, reworked bullet firing to add random spread (bug #236)
+
+doc:
+	AvH TODO.txt, Checkin.txt - Regular updates
+
+mod:
+	AvHAlienAbilities.*, AvHBlinkGun.cpp (removed), AvHAlienWeapons.h - Refactoring for cheat protection, moved blinking in here from separate class
+	AvHAlienWeapon.cpp - Web change?
+	AvHAlienWeaponConstants.h - Spit gun and bites were shooting through walls, balance changes
+	AvHBasePlayerWeapon.* - Reworked bullet firing to add random spread (bug #236), temporarily hacked shotty player animation, removed old adrenaline, don't allow using weapons when invulnerable
+	AvHBite.cpp, AvHKnife.cpp, AvHSwipe.cpp, AvHClaws.cpp - Melee weapons don't play hit sounds or punchangle target if they didn't damage them
+	AvHConsoleCommands.cpp - Unhacked this to fix some random bug
+	AvHConstants.h - Reworked team colors, #define a few more sounds, weapon spread
+	AvHEntities.* - Added max ensnare, can't remember why I'm tagging team starts, changed resources functions to floats (for proper handicapping)
+	AvHEntityHierarchy.cpp - Workaround to infinite loop encountered during playtest: look into this more
+	AvHEvents.cpp - Added "invalid action" event, reworking for random spread for bullet fire
+	AvHGamerules.* - Don't pick up empty weapons, added handicapping, check map validity when loaded, reset players just like all other entities, fixed spawn bug code where it was counting non-team spawns
+	AvHHeavyMachineGun.cpp - Updated anims and timing for new artwork
+	AvHHive.*, AvHMarineEquipment.* - Refactored reinforcements
+	AvHMarineEquipment.* - Refactored reinforcements, updated entities for new artwork
+	AvHHud.*, AvHHudRender.cpp - Started to add display of marine upgrade sprite, fixed bug where building indicators aren't displayed after a map change, info_location drawing changes, primal scream color tweak, removed old hive drawing code
+	AvHMachineGun.cpp, AvHPistol.cpp, AvHSonicGun.cpp - Tweaked for bullet spread
+	AvHMarineWeaponConstants.h - Balance tweaks, bullet spread
+	AvHMarineWeapons.h - Bullet spread, new HMG artwork
+	AvHMessage.h - Added admin commands, explicity defined HL impulses, removed offensive upgrades
+	AvHMovementUtil.cpp - Regular update
+	AvHPieMenuHandler.cpp - Renamed pop-up menu command, reworked it to be a regular bind
+	AvHPlayer.* - Added validation of all impulses (assumes invalid by default, instead of valid), reset players like all other entities, ensnaring fixes, players are temporarily invulnerable when they spawn, preserve health and armor when using command station, fixed up redemption, add hooks for commander voting and going back to the ready room, models can't be changed via the console anymore
+	AvHServerUtil.* - Tried to cut down on sound list spam by defaulting to CHAN_BODY, added debugging code for tracking down solidity issues
+	AvHServerVariables.h - Regular update
+	AvHSharedUtil.* - Reworked colors, moved functions into server util
+	AvHSpecials.* - Mark spawn points (can't remember why this is needed), updated comments, removed offensive upgrade code
+	AvHSprites.h - Added marine upgrades sprite to be drawn in the future
+	AvHTeam.* - Added handicapping, map validity checking, reinforcements happen independently of teams now
+	AvHTechNodes.* - Added hooks to support disallowing actions when a building is "busy"
+	AvHTitles.h - Regular update
+	AvHVisibleBlipList.* - Allow up to 64 blips, don't ASSERT if we exceed them (trying to draw all physents from shared code on client and server)
+	AvHWebSpinner.cpp - Don't allow builder to web a player by hitting him
+	NetworkMeter.cpp - Allow disabling of network metering by setting rate to -1
+
+	New:	AvHBabblerGun.cpp (forgot to add this last week) - Create a babbler to attack enemies
+			AvHReinforceable.* - Generic reinforcing behavior to be shared by hives and inf portals
+
+
+pm_shared:
+	pm_shared.cpp - Added debug code to fix solidity problems, fixed commander/hera-landing-pad bug, added document header
+
+ui:
+	PieNode.cpp - Tried to turn off mouse capture so menu can be binded to keyboard and mouse properly
+
+
+Wednesday, 6/10
+---------------
+Overflows fixed, mp3s fixed, particles fixed, victory condition fixed!
+
+O Fixed marine build sound looping occasionally, divine wind looping sound problem, sample conversion warnings in console (bug #270)
+O Fixed hearing voice comm of enemies when dead (bug #274)
+O Fixed missing chat while dead (bug #280)
+O Fixed victory condition issue (bug #171)
+O Toned down level 5 stepsize (bug $255)
+O Workaround for -console problems on NVIDIA cards (bug #269)
+O Add spike hit sounds
+	O Added graphical effect back in for spikes also
+O Fix ambient sound problems (bug #126)
+O Fix particle visible particles (bug #127, bug #216)
+
+
+base:
+	config.cfg - cl_centerid is now 1 by default, console fixes for NVIDIA cards (bug #269)
+	liblist.gam, server.cfg, listenserver.cfg, skill.cfg - Regular update
+
+cl_dll:
+	ev_hldm.cpp - Removed unused code for spike projectile
+	tri.cpp - Removed cl_particleinfo drawing differences
+
+dlls:
+	client.cpp - .mp3 and particle fixes
+	combat.cpp - Removed major cause of lag: redundant server-side decals.  Also removed duplicate texture sound.
+	player.cpp - Fixed bug that caused "Battery" message to be sent every tick (this never showed up in HL because they never had a float armor value?)
+	player.h - Don't send network messages to bots
+	world.cpp - Added spike ricochet sounds
+
+doc:
+	AvH TODO.txt, Checkin.txt - Regular update
+
+mod:
+	AvHAmbientSound.* - Fixed bug where sound volume wasn't being set for omnipresent sounds, added document headers
+	AvHConsoleCommands.cpp - Added "overflow" cheat for debugging
+	AvHEntities.* - Fixed bug where .mp3s weren't being processed client-side
+	AvHEvents.cpp - Added special spike hit effect
+	AvHGamerules.cpp - Profiling and performance tweaks
+	AvHHud.cpp - Fixed bug where non-sighted particle systems weren't being drawn for players on the ground (bug #127)
+	AvHHudRender.cpp - Removed cl_particleinfo drawing differences
+	AvHParticleSystem.* - Visibility fixes (too many PSs drawing, now they expire when not visible for awhile), removed cl_particleinfo drawing
+	AvHParticleSystemManager.cpp - Visibility fixes (too many PSs drawing, now they expire when not visible for awhile)
+	AvHPlayer.cpp - Draw chat text while dead (bug #280)
+	AvHTeam.cpp - Fixed victory condition bug (bug #171)
+	AvHVoiceHelper.cpp - Removed unnecessary code, hopefully fixing bug #274
+	NetworkMeter.* - More debug info to the log to track down overflows
+
+
+pm_shared:
+	pm_shared.cpp - Removed large differing step-sizes (bug #255)
+
+
+RC3/4
+-----
+O Siege turrets don't need LOS anymore, they can fire through walls (test)
+O Builder's healing spray can only damage players
+O 128 HUD sprites fixed again, and a couple new alien UI sprites (thanks Merks) (bug #352)
+O Alien balance!
+	O Spawn tower at nearest resource node for team
+	O Command station doesn't spawn in when game starts, but before
+	O Aliens can now donate their points to the team!  Any alien can hold their +use key on an active hive to donate points back into the pool.
+	O Resources adjusted again.  Resource towers contribute 3 points every 5 seconds, and have a total of 240 points each (lasts 5 minutes unless upgraded).  Other then upgrading, towers work identically for both sides.
+O Draw player name and location on hive sight
+	O Add nice aliens sayings ("Comprox is attacking", "KidC is buiding here", etc.)
+O Draw tech descriptions for commander (and updated some descriptions)
+O Fixed problems where it looked like the commander could build but couldn't (rough terrain currently prevents building, but at least you'll now generally see the building draw red)
+O Drawing location text for marines centered under minimap (again)
+O New tanith
+O Buildings are built at random angles now for visual interest
+O Fixed marine flashlight (this is a BS setting I realized)
+O New automation for creating builds and tracking assets
+O Fixed pre-spawned towers floating (bug #365)
+O Increased siege splash
+O Added muzzle flash to siege, made muzzle flash always show for sentries
+O Visual turret radii are now correct (ignores height difference when calculating turret range)
+O Random building orientations for visual interest
+O Make sentries a bit more effective by speeding their turn rate, decreasing their cost from 20 to 16 and increasing their health from 600 to 800, also increased their range from 700 to 800
+O Put missing tanith locations in titles.txt
+O Hive no longer plays "flinch" animation when dead
+O Umbra now blocks only 7 out of 8 bullets
+O Make new .wad
+O New install process, lots of sounds and sprites removed
+O Fixed one of two "shaky" problems when standing on or near buildings or func_resources (thanks MrBlonde!)
+O Updated .wad (replaced Quake III placeholder texture)
+O New sounds for the level 3 bite, bilebomb, divine wind, parasite and umbra.  This marks the completion of all the non-vocal sounds!
+O Removed eclipse and shaft until they are more complete
+
+base:
+	New: assets-*.txt, builddiff.bat, buildfull.bat - Files used to create builds and track assets without losing sanity
+	New: metamod-NS.txt - File needed for metamod integration
+	Removed: buildzip.bat - Now this is builddiff.bat
+	assets.txt, bot.cfg, config.cfg, liblist.gam, listenserver.cfg, mapcycle.txt, server.cfg, skill.cfg, titles.txt - Regular updates
+
+cl_dll:
+	hl/hl_baseentity.cpp - Regular update
+	chud.h, hud_redraw.cpp - Added code to draw centered messages
+
+dlls:
+	client.cpp - Added power-armor drawing, tweaked invul drawing
+	game.cpp - Regular update
+	gamerules.cpp, player.* - Refactored duplicate spawn code
+	hl.dsp - Added server tracking of player data (for random resources, will be used for players that have been voted down also)
+	weapons.cpp - Added distress beacon
+
+doc:
+	AvH TODO.txt, Checkin.txt - Regular updates
+
+game_shared:
+	teamconst.h - Added document header, new player constant
+
+HPB_bot:
+	bot.* - Bots chatter a lot, to test new hive sight additions
+	linkfunc.cpp - Removed old entities when putting together metamod-NS.txt
+
+mod:
+	AvHAcidRocketGun.cpp, AvHAlienAbilities.cpp, AvHAlienWeapons.h - Updates for new viewmodel artwork
+	AvHAlienEquipment.* - Alien buildings now have an iuser3 type (used for "resource tower is under attack")
+	AvHAlienEquipmentConstants.h, AvHAlienTurret.* - Alien turret refactoring and fixing (the view offset in spawn() was causing them to always miss crouched players)
+	AvHAlienWeaponConstants.h - Lots of tweaks (new artwork, balance/feel)
+	AvHBaseBuildable.cpp - Auto-build can't happen before game starts
+	AvHClientUtil.* - AvHCUWorldToScreen now returns true if the position is in front of player
+	AvHCommanderModeHandler.cpp - Lots of UI changes, new upgrades, selectable siege
+	AvHConstants.h - Regular update
+	AvHEntities.* - Updated resource model, removed old junk
+	AvHEvents.cpp - Turret velocity is constructed on client in same way as server, instead of being sent across as calculated (network precision issues)
+	AvHGamerules.* - Resource model changes, refactoring spawning to fix level 5 redemption bug without code duplication
+	AvHHealingSpray.cpp - Spray only hurts players (prevents builders from easily taking out mines)
+	AvHHive.* - Added ability for aliens to donate their resources at the hive, bind technology to a hive (so builders can choose the route), fixed bug where death animation played repeatedly
+	AvHHud.* - Added visually-smooth energy level, added versatile location code, new hive sight info, refactored to remove extra sprites (128 HUD sprites bug), commander tech help fixes
+	AvHHudRender.cpp - Add ability to centered, translated strings, visually-smooth energy level, new hive sight info, draw parasited message, draw marine upgrades, new method of drawing alien upgrades (overlapping and offset)
+	AvHMarineEquipment.* - Phase gates must be built and can be destroyed, observatories decloak aliens, hooks for fast reinforcements upgrade, nuke damage increased, commander banning
+	AvHMarineEquipmentConstants.h - Turret tweaks, regular update
+	AvHMarineTurret.* - Always draw muzzle flash, calculate range in 2D
+	AvHMarineWeaponConstants.h - Marine weapons given back their mojo
+	AvHMessage.h - Removed unused constants, new upgrades
+	AvHMovementUtil.* - Energy updates
+	AvHPlayer.* - Added power armor, added "talking" state for hive sight, changes for new resource model, removed max buildings, create buildings with random orientation, added stimpack, tweaked redemption, added new hive sight info
+	AvHPlayerUpgrade.cpp - Level 1 armor toned down, power armor changes
+	AvHReinforceable.* - Added subclass-changeable reinforce time to allow faster respawns upgrade
+	AvHResearchManager.cpp - Added hooks for research starting, for distress beacon sound effects
+	AvHServerUtil.* - Added random building angles for diversity, added research started hooks for distress beacon effects, added versatile alien tech tree, hives are always visible, observatories detect nearby aliens, umbra blocks most but not all bullets
+	AvHServerVariables.h - Regular update
+	AvHSharedUtil.* - Siege don't require a nearby turret factory, only add built buildings for range detection, build problems on client (point contents failing on rough surfaces)
+	AvHSiegeTurret.* - Siege no longer requires LOS (so it's actual siege)
+	AvHSpecials.* - New constants for phase gates and alien buildings, new marine upgrades
+	AvHSprites.h - Big update to hive sight and sprites
+	AvHSwipe.cpp, AvHUmbraGun.cpp - Updated for new artwork
+	AvHTeam.* - Resource model overhaul (closed system, random initial points), tech tree changes (new marine upgrades), free resource tower at nearest func_resource
+	AvHTechID.h - Regular update
+	AvHTitles.h - Regular update
+	AvHTurret.* - Turrets track range in 2D, turrets can not require LOS if desired (for siege)
+	AvHVisibleBlipList.* - Updates for new hive sight info
+
+pm_shared:
+	pm_shared.cpp - MrBlonde's fix for player shaking (not sure how well it works)
+
+ui:
+	FadingImageLabel.* - Added support for multiple sprite frames (for pie nodes and max sprite problem), added document headers
+
+util:
+	MathUtil.* - Added VectorDistance2D, added document headers
+	
+
+
+
+Pre RC4
+-------
+- Linux and scripting changes
+
+
diff --git a/main/source/doc/Console commands.txt b/main/source/doc/Console commands.txt
new file mode 100644
index 00000000..a273984e
--- /dev/null
+++ b/main/source/doc/Console commands.txt	
@@ -0,0 +1,62 @@
+Good variables to use:
+----------------------
+mp_tournamentmode - Set this to 1 for a tournament mode.  Tournament mode doesn't allow late-joining, doesn't allow commander ejecting, enables friendly-fire, and more.  Use this for organized matches only.  Set to 0 for public servers and your average LAN game.
+mp_serverops - This is a semi-colon delimited string of the WON ids for players that run the server.  Example: if there are two server ops on your server, with WON ids "123" and "789", then you would set mp_serverops to "123;789".  This displays a special server op icon next to these players names when they play on this server.  This display is toggled on and off by typing "auth" at the console.
+ns_authicons - Setting this to 0 will disable all icons next to players names in the scoreboard, including server op icons.
+mp_countdowntime - Number of minutes that the countdown to game start will last (indicated by the beeping once players are on both teams).  The default is .05, which is 3 seconds.
+mp_latejointime - The number of minutes after the game has started that players are allowed to join the team without waiting to respawn.  If a player joins a team after this time, they must wait in line to spawn.  Default is 1 (60 seconds).
+mp_teamresourcehandicap - When set to 1, this means that the team with less players (if any) gets a bonus on harvesting resources.  The bonus is equal to the percentage team size discrepancy.  If one team has half the size of the other, it will get a x2 resource bonus.  When set to 0, no bonus is ever allotted.  Default is 1. (in the future, this will probably be disabled in tournament mode)
+mp_spawninvulnerabletime - Not currently implemented.  This used to make a player invulnerable for this many minutes upon spawning, to prevent spawn camping.  This will likely be re-enabled for the next version.  Default was 0 (we tested with .033 which is 2 seconds).
+mp_votecasttime - When the first vote to eject a commander is cast, this is the amount of minutes that the other teammates have to vote.  If mp_votepercentneeded votes aren't received by this time, the vote fails.
+mp_votedowntime - This is the number of minutes that an ejected commander is banned from the command station on this server.  This is persistent across new levels and games.  For example, if set to 180, then an ejected commander couldn't play commander on this server for 3 hours.  If the server crashes or is restarted, all commander bans are lost.
+mp_minvotesneeded - This is the minimum number of votes needed to eject the commander.  This can be tweaked to prevent abuse by a roving group of llamas.
+mp_votepercentneeded - This is the percentage of the team (0-1) that must vote to eject a commander for it to succeed.  Additionally, mp_minvotesneeded must be met.  For example, if this is set to .5, then half the marine team must vote against the commander within mp_votecasttime for the commander to be ejected.
+ns_eastereggchance - Set this value to x, where 1 in x+1 games will play humorous audio easter eggs in certain situations.  Setting to 0 will enable them for all games.  Currently this only affects alien audio easter eggs.
+                                
+Good variables for debugging
+----------------------------
+mp_networkdebug - Set this to 1 to see every message NS sends.  Logging must be enabled.  Use this to track overflows or performance.  Default is 0.
+mp_drawdamage - Set to 1 to see a rising number whenever any player or structure takes damage.  Useful for clan practice or reproducing bugs.
+mp_drawinvisibleentities - Entities are drawn for commander even when not visible by a team member
+mp_assert - Setting to 1 will cause server to halt when an ASSERT is hit instead of bypassing them
+
+Balance variables that you probably shouldn't touch:
+----------------------------------------------------
+mp_weaponstaytime - Number of minutes that a dropped weapon will persist before expiring.  Default is .5 (30 seconds).
+
+ns_hiveinjectiontime           
+ns_hiveinjectionamount         
+ns_initialalienpoints - Amount of points the alien team starts with, split among all the players         
+ns_initialmarinepoints - Amount of points the marine team starts the game with
+                                
+ns_alienrespawntime - Number of seconds it takes for a hive to spawn an alien
+ns_marinerespawntime - Number of seconds it takes for an infantry portal to spawn a marine
+
+ns_alienrespawncost - Not implemented
+ns_marinerespawncost - Not implemented
+                                
+ns_towertime                   
+ns_toweramount                 
+                                
+ns_alienresourcescalar         
+ns_marineresourcescalar 
+
+ns_playerresourcescalar - Floating point scalar that's multiplied with incoming resources to determine how many resources that player or team gets.
+
+ns_turretdamage                
+ns_turrethealth                
+ns_siegedamage                 
+ns_siegerof                    
+ns_siegesplashradius           
+ns_siegehealth                 
+ns_funcresourcevalue           
+
+Don't ever use:
+---------------
+mp_bulletcam - Setting to 1 will give "bulletcam" effect when using the grenade launcher.  Unpredictable and untested
+mp_testing - Setting this to 1 will spit out animation error messages, don't use 
+mp_trainingmode - Mostly unused
+mp_deathmatchmode - Don't touch
+mp_networkmeterrate - This can be adjusted (at your own risk) to only send x amount of bytes to each player per second.  Could be useful for fixing overflows, but could have dangerous performance ramifications
+mp_serverscripts - Not fully implemented.  When set to 1, this will (in the future) allow servers to run their own LUA scripts
+
diff --git a/main/source/doc/ForPlaytest.txt b/main/source/doc/ForPlaytest.txt
new file mode 100644
index 00000000..6a8549f6
--- /dev/null
+++ b/main/source/doc/ForPlaytest.txt
@@ -0,0 +1,156 @@
+
+- Fix up prediction errors on all weapons
+	O Wait for Yahn for a bit
+	O Weird holster/deploy problem
+	O Shotgun not working
+	O Claws not working
+	- Knife slash sounds not predicted
+	O client version of weapon has 10 bullets in MG and shotgun clip even when out of ammo, so effect fires anyways.  Figure out where clip is propagated
+
+O Fix bug where AvHTeam::GetHasTeamLost() doesn't take into account reinforcements
+
+O Take out code that lets everyone have all weapons
+
+O Remove error logging to hl.log (hl_weapons.cpp)
+
++ Switching to welder crashes the game (iuser3 assert in gamerules line 2153)
+
+- Verify: Set starting points for marines correctly (when 2+ marines and afer a map restart)
+
++ Make sure welding works currently (it doesn't.  this was caused when changing solidity states for welding, trying to fix that bug)
+
+- Remove glock, glock ammo and "b" bind
+
+- Fix all weapons
+	+ Machine gun broken
+	+ Shot gun broken
+	- Welder broken?
+	+ Fix weapons so they are in the right place in the HUD
+	+ Fix up weapon_ text files
+	+ Fix claws
+
+- Tweak rate of fire and damage for all weapons so the weapons feel better and have a tiny hope of balance
+
+- Fix turrets
+	- They are only thinking every once in awhile!
+
+- Fix siege turrets
+
+- When level resets
+	+ Remove all tripmines
+	- Reset doors if possible
+	+ Reset command stations
+
++ New model for hive
+
++ Remove all dead bodies
+
+- Add hive mind effect for all aliens
+	- Server checks if aliens are visible, maintains list of effects
+	- Propagates effects to client
+	- Client draws effects
+	- Make general enough to use for commander LOS, including showing up for friendlies when target of an order
+
+- Alien weapons 
+	O Make sure alien flight works again (it's just resetting some pev->iuser variable I think)
+	- Fix the existing alien weapons so they all do damage
+		+ Spores
+		- Make spit do something
+		- Make ensnare do something
+	X Alien adrenaline when hitting each other
+	O At least one weapon for each alien, two weapons for a couple
+
+- Fix turrets again, they're hitting the world or the floor, though their effects look right (sparks, ricochet).  Their construction complete is weird and not right.
+
+O Alien flashlight bug
+
+O Allow morphing back to level 1
+	O Fix up alien menu so there aren't unused nodes
+
+O Don't deduct points or evolve if player tries to evolve to current lifeform
+
+O Make sure jetpack is given on upgrade (it's getting lost when researched)
+
+O Make sure aliens respawn as level 1
+
+O Show current resources for aliens!
+
+O Remove currently unused nodes off alien pie menu
+
+O Mines are solid unless they are in landmine mode, then they become solid_not
+	- Changed to be solid_trigger always (at least until this is fixed for real)
+
++ Hives make wound sounds and death sound
+
++ Allow mines to be bought and dropped from commander mode
+
+- Use the above system for the commander LOS
+	- When an alien is within range of a soldier (not commander!), add it to the LOS for the commander
+
+- Must be able to kill camera tower and turret, they are marked as damage_none or something
+
+- Add all teammates to TeamHierarchy
+
+- Add responsive order-giving for commander
+	- 
+
+O Fix observer mode
+	+ Looking up and down
+	O Observing commander
+	+ Observing enemy team
+
+- Make sure teams are set correctly for turrets, siege turrets, mines
+	- Test to make sure they give resources properly on kill
+		
+- Add real research times for upgrades
+	- Add cheat that makes all research instant (if mp_testing is on)
+	- Make the tech tree real
+
+- Commander power-ups
+	- Adrenaline
+		- Nice effects in radius
+	- Another area effect?
+	- Shield
+	- Blaze of glory (only if you have a reinforcement available?)
+
+O Add simple hit effect for siege turret
+
+- Using command station heals the player (feature?)
+
+- Make another version of ns_solar fit for marines vs. marines, we could try that too
+
+- Make hives obvious goals.  Paint on mini-map
+
+- Need mini-map!
+
+- Make sure marines die really really easily.  Just a shot or two from any alien (increase spit gun damage)
+
++ Add alien "machine gun" (shoots spikes)
+
+O Make sure camera tower can be destroyed and gives points
+	+ Make info_gameplay super general and customizable
+
+O Allow destruction of command station?
+
++ Put walls over tops of command stations so they can't be landed on.  Otherwise, when the player logs out, he falls onto command station and logs back in (infinitely)
+
+O Remove items off menu that aren't functional (nuke, flamer, infravision)?
+
+O Get phase gates to link (maybe they link to the next/last one built?
+
+
+- Tech tree
+Routes: 
+	mass, expand: camera towers, but some defense or reinforcements
+	quick attack (rush): reinforcements, ammo, weapon upgrades, command
+	slow n' steady: move to a hive location, kill the hive if there, stake it out with turrets if not
+
+Ideas:
+	maybe only one weapon upgrade, but make it big (the really obvious one)
+	jetpacks must be upgrade, can't be at bottom level, must take at least one other to get to it (or have some obvious way for aliens to see it coming)
+	reinforcements must be researched first?
+	siege must be researched
+	don't have tech that does multiple things, ie damage, AND allows HMGs.  this is confusing, makes the tech hard to name and makes strategy less clear (or painfully simple)
+
+
+
diff --git a/main/source/doc/Game names.txt b/main/source/doc/Game names.txt
new file mode 100644
index 00000000..2323be44
--- /dev/null
+++ b/main/source/doc/Game names.txt	
@@ -0,0 +1,32 @@
+Game names
+  Takeaway: Space.  Meaningful experience.  Something fresh.  Drama.
+  Think of what it sounds like with Half-Life: in front of it.  Half-life: Galaxy
+	- Glory
+	- Cleanse
+	- Impure
+	- Flashback
+	- Delta squadron
+	- Scavenger
+	- The great war
+	- Flash war
+	- Unite
+	- Host
+	- Gathering
+	- Reunion
+	- Swarm, "The swarm"
+	- Galaxy (implies both the space part and the congregation part!)
+		1. Any of numerous large-scale aggregates of stars, gas, and dust that constitute the universe, containing an average of 100 billion (1011) solar masses and ranging in diameter from 1,500 to 300,000 light-years. Also called nebula. 
+		Often Galaxy. The Milky Way. 
+		2. An assembly of brilliant, glamorous, or distinguished persons or things: "a galaxy of theatrical performers".
+	- Sentinel
+	- Guardian - Nice because it works for both sides (Is "Guardians" better?)
+	- Salvation (it has the accursed Half-life "-tion" suffix however)
+		1. Preservation or deliverance from destruction, difficulty, or evil. 
+		2. A source, means, or cause of such preservation or deliverance. 
+		Theology. 
+		1. Deliverance from the power or penalty of sin; redemption. 
+		2. The agent or means that brings about such deliverance. 
+		Christian Science. The realization and demonstration of Life, Truth, and Love as supreme over all, carrying with it the destruction of the illusions of sin, sickness, and death. 
+	- Natural selection
+	- Bloodlines
+
diff --git a/main/source/doc/Humans vs. Aliens.htm b/main/source/doc/Humans vs. Aliens.htm
new file mode 100644
index 00000000..3ff69db7
--- /dev/null
+++ b/main/source/doc/Humans vs. Aliens.htm	
@@ -0,0 +1,1174 @@
+<HTML>
+<HEAD>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=windows-1252">
+<META NAME="Generator" CONTENT="Microsoft Word 97">
+<TITLE>Humans vs. Aliens</TITLE>
+<META NAME="Template" CONTENT="C:\Program Files\Microsoft Office\Office\html.dot">
+</HEAD>
+<BODY LINK="#0000ff" VLINK="#800080">
+<FONT SIZE=2> 
+<p ALIGN="right"><i><font face="Arial, Helvetica, sans-serif" color="#808080"><b>Last 
+  updated, <!-- #BeginDate format:Am1a -->August 11, 2000 0:08 AM<!-- #EndDate --></b></font></i></p>
+<p ALIGN="right">&nbsp;</p>
+</FONT><B><FONT FACE="Arial" SIZE=4> </font></B><B><FONT FACE="Arial" SIZE=4> 
+<P ALIGN="CENTER">The definitive tactical and atmospheric</P>
+<P ALIGN="CENTER">humans vs. aliens experience</P>
+</font></B><FONT SIZE=2></FONT><B><FONT FACE="Arial"> 
+<P>Overview</P>
+</font></B> 
+<div align="center">
+  <table width="85%" border="0" cellspacing="1" cellpadding="1">
+    <tr> 
+      <td><font size=2><i>Game objective </i></font><font size=2>– The humans 
+        assault an infested spacecraft and must keep their cool and work together 
+        to kill the alien queen</font></td>
+    </tr>
+    <tr> 
+      <td><font size=2>Multiplayer-only Half-life mod</font></td>
+    </tr>
+    <tr> 
+      <td><font size=2>Tense, not breakneck action</font></td>
+    </tr>
+    <tr> 
+      <td><font size=2>Marines get fluctuating resource injections based on chain 
+        of command and team merit</font></td>
+    </tr>
+    <tr>
+      <td><font size=2>Aliens get increasing resource injections based on the 
+        game time elapsed</font></td>
+    </tr>
+    <tr> 
+      <td><font size=2>Marines don’t respawn but aliens do</font></td>
+    </tr>
+    <tr> 
+      <td><font size="2">Innovative social dynamics and UI</font></td>
+    </tr>
+    <tr> 
+      <td><font size=2>Extremely polished and atmospheric</font></td>
+    </tr>
+    <tr> 
+      <td><font size=2>Simple to learn and play, it is hard-core action/strategy 
+        for a mainstream audience</font></td>
+    </tr>
+    <tr> 
+      <td><font size=2>Both sides are genuinely different and together they accommodate 
+        a different play styles including strategic team-based play, &quot;hero&quot;-based 
+        action </font></td>
+    </tr>
+    <tr> 
+      <td><font size=2>Influences include Starcraft &trade;, Aliens &trade;, Advanced 
+        Space Crusade &trade; and Gloom &trade;</font></td>
+    </tr>
+  </table>
+  <p align="left"><b><font face="Arial">General goals</font></b></p>
+  <table width="85%" border="0" cellspacing="1" cellpadding="1">
+    <tr> 
+      <td>
+        <p><font size=2> Every rule, included feature and decision made should 
+          be made with these goals in mind. If a potential feature or rule doesn't 
+          serve one of these goals, it is removed from the design. </font></p>
+        <div align="center">
+          <table width="85%" border="0" cellspacing="1" cellpadding="1">
+            <tr> 
+              <td colspan="2" height="20"><font size=2><b>Create a first-person, 
+                strategic, experience that is rich enough to warrant hours and 
+                hours of play</b></font></td>
+            </tr>
+            <tr> 
+              <td width="7%" height="90">&nbsp;</td>
+              <td width="93%" height="90">
+                <p><font size="2">There are many design features that promote 
+                  this goal including: the resource system, upgrades that have 
+                  fundamental gameplay-changing effects (firing through walls, 
+                  door welding, indirect fire, wall/ceiling travel, spore cloud, 
+                  flying units, etc.), the morale system, the two different play 
+                  styles represented by the two sides, the ability to upgrade 
+                  and purchase equipment mid-game, overwatch and the unified hive 
+                  mind. The gameplay is rich on and individual and the group level, 
+                  and on the tactical and strategic levels. </font></p>
+                </td>
+            </tr>
+            <tr> 
+              <td colspan="2"><font size=2><b>Reward teamplay for the humans</b></font></td>
+            </tr>
+            <tr> 
+              <td>&nbsp;</td>
+              <td><font size=2>Most first-person games encourage everyone to run 
+                around like madman, ignoring their teammates and being as aggressive 
+                as possible. This will not work for the marines. This means encouraging 
+                the marines to act like a real </font><font size=2>squad. The 
+                resource model is such that the marines must move forward methodically, 
+                in a group fashion to take action before the aliens gain too much 
+                power. Communication is a big part of this, as is tension. Some 
+                of the gameplay mechanics that actively promote this include: 
+                varying resources depending how well a player is doing his &quot;job&quot; 
+                as a leader or green marine, the commander having morale gameplay 
+                effects on his squadmates, the marines don't respawn and automatic 
+                overwatch. </font></td>
+            </tr>
+            <tr> 
+              <td height="23" colspan="2"><font size=2><b>Reward power-playing 
+                for the aliens</b></font></td>
+            </tr>
+            <tr> 
+              <td height="23"> 
+                <p><font size=2> </font></p>
+              </td>
+              <td height="23"><font size=2>The aliens must delay and harass the 
+                humans while they gain power. They punish rash and impulsive behavior 
+                with swift and deadly retribution. The aliens benefit from coordination, 
+                but don't require the tight groups of players and concentrated 
+                fire that the marines do. An individual alien can become much 
+                more powerful than an individual marine and the alien side doesn't 
+                rely on teamplay to gain power. The aliens are for individual 
+                power players and will benefit from quick reflexes, sneakiness 
+                and thinking on the fly. </font></td>
+            </tr>
+            <tr> 
+              <td colspan="2"> 
+                <p><font size=2><b>Shared, complete immersion</b></font></p>
+              </td>
+            </tr>
+            <tr> 
+              <td>&nbsp;</td>
+              <td><font size=2>This is acheived through professional orchestral 
+                music and sound effects. Also, by keeping the game mechanics simple 
+                enough to have time to add lots of little details like mist from 
+                the aliens' mouths, and the echo of a rifle reloading in a ventilation 
+                shaft. The shared part means concentrating on players' shared 
+                experiences, like riding massive elevators together, watching 
+                in awe as an alien rises up out of the water, waiting anxiously 
+                as the loading bay door closes and advancing through the ship 
+                as a team. Further immerse the players by encouraging true role-playing. 
+                The awesomely powerful aliens can scuttle and scream to frighten 
+                the marine players and even themselves. The humans should constantly 
+                try to keep their cool and stay organized. They wig out when sarge 
+                dies and run like a little girl when they see a lumbering beast 
+                coming towards them. Everyone has fun playing the role they're 
+                supposed to, and the <i>game rules encourage</i> it.</font></td>
+            </tr>
+          </table>
+        </div>
+        <p>&nbsp;</p>
+      </td>
+    </tr>
+  </table>
+  <p align="left">&nbsp;</p>
+</div>
+<div align="center"> 
+  <table width="85%" border="0" cellspacing="1" cellpadding="1">
+    <tr> 
+      <td colspan="2"><font size=2><b>Humans</b></font></td>
+    </tr>
+    <tr> 
+      <td colspan="2"><font size=2><i> 
+        <p>Team philosophy and themes</p>
+        </i></font></td>
+    </tr>
+    <tr> 
+      <td width="6%">&nbsp;</td>
+      <td width="94%"><font size="2">Well-executed, coherent, macro. Keep them 
+        operating as a cohesive unit. Decisive group actions are potent. Promote 
+        these through: commander area effect bonus, arrows on ground showing exact 
+        line and direction of each teammate, upgrades distributed by commander, 
+        powerful mini-nukes require time to set, powerful rockets leave firing 
+        marine vulnerable, upgrades distributed at a maximum rate that should 
+        be planned for.</font></td>
+    </tr>
+    <tr> 
+      <td colspan="2"><font size=2><i> 
+        <p>Advantages</p>
+        </i></font></td>
+    </tr>
+    <tr> 
+      <td width="6%">&nbsp;</td>
+      <td width="94%"> 
+        <p><font size=2>High-tech and powerful weaponry, versatile, multi-talented, 
+          superior ranged-fire, can change level geometry through door sealing, 
+          can shoot through walls, overwatch, autonomous (don’t need a base of 
+          operations and each can upgrade independently), can communicate silently 
+          via throat mikes and gestures, indirect fire.</font></p>
+      </td>
+    </tr>
+    <tr> 
+      <td colspan="2"><font size=2><i> 
+        <p>Disadvantages</p>
+        </i> </font></td>
+    </tr>
+    <tr> 
+      <td width="6%">&nbsp;</td>
+      <td width="94%"><font size=2>Fatigue, wounds slow movement and cause pain 
+        until treated, can’t see well in dark, all damage is permanent, fear, 
+        slower than many aliens, no jumping, can't respawn.</font></td>
+    </tr>
+    <tr> 
+      <td colspan="2"><font size=2> 
+        <dir> 
+          <dir> 
+            <p> </p>
+          </dir>
+        </dir>
+        <i> 
+        <p>Hero figure</p>
+        </i> </font></td>
+    </tr>
+    <tr> 
+      <td width="6%">&nbsp;</td>
+      <td width="94%"><font size=2>Commander. Can possibly view through teammate 
+        cameras or top-view, reduces fatigue, fights, gives orders. In charge 
+        of purchasing special upgrades, authoritative order-giving.</font></td>
+    </tr>
+    <tr> 
+      <td colspan="2"><font size=2><b>Aliens</b></font></td>
+    </tr>
+    <tr> 
+      <td colspan="2"><font size=2><i> 
+        <p>Team philosophy and themes</p>
+        </i></font></td>
+    </tr>
+    <tr> 
+      <td width="6%">&nbsp;</td>
+      <td width="94%"><font size="2">Sneaky, micro. More powerful when spread 
+        out. Coordination still powerful but it can be acted upon without planning; 
+        actions fall into place naturally without communication. Distraction, 
+        subterfuge and harassment tactics. Provoke single marine away from group. 
+        Promote these through: communal LOS/scouting, nasty close attacks forcing 
+        overwatch, slime slows movement, flanking very powerful because of overwatch 
+        and concentrated fire, turrets, human fears. Played psychologically and 
+        instinctually. Role-playing aspect.</font></td>
+    </tr>
+    <tr> 
+      <td colspan="2"><font size=2><i> 
+        <p>Advantages</p>
+        </i> </font></td>
+    </tr>
+    <tr> 
+      <td width="6%">&nbsp;</td>
+      <td width="94%"> 
+        <p><font size=2>Time advantage because of reinforcements and accelerating 
+          resource injection, faster movement, teleportation and can use walls 
+          and ceilings, can respawn, magic-like abilities, faster than marines, 
+          flight, unified hive mind, can respawn, cloaking</font></p>
+      </td>
+    </tr>
+    <tr> 
+      <td colspan="2"><font size=2><i> 
+        <p>Disadvantages</p>
+        </i></font></td>
+    </tr>
+    <tr> 
+      <td width="6%">&nbsp;</td>
+      <td width="94%"><font size=2>Low rate of fire ranged weapons (hit and run), 
+        entire team loses if queen dies, upgrades are centralized, low-level aliens 
+        not very powerful, communication is implicit via unified hive mind, no 
+        indirect fire, no defensive structures</font></td>
+    </tr>
+    <tr> 
+      <td colspan="2"><font size=2><i> 
+        <p>Hero figure</p>
+        </i> </font></td>
+    </tr>
+    <tr> 
+      <td width="6%">&nbsp;</td>
+      <td width="94%"><font size="2">None.</font></td>
+    </tr>
+  </table>
+  <B><FONT FACE="Arial"> </font></B></div>
+<B><FONT FACE="Arial"> 
+<P>&nbsp;</P>
+</font></B>
+<div align="center">
+  <table width="85%" border="0" cellspacing="1" cellpadding="1">
+    <tr> 
+      <td colspan="2"><b><font size="2">Atmosphere</font></b></td>
+    </tr>
+    <tr> 
+      <td width="7%">&nbsp;</td>
+      <td width="93%"><font size="2">Gun sounds and screams are heard through 
+        trebly radio when teammate isn’t close by</font></td>
+    </tr>
+    <tr> 
+      <td width="7%">&nbsp;</td>
+      <td width="93%"><font size="2">Extensive particle effects (smoke, fog, fire, 
+        cold breath)</font></td>
+    </tr>
+    <tr> 
+      <td width="7%">&nbsp;</td>
+      <td width="93%"><font size="2">Extensive taunts, breathing and hissing for 
+        aliens</font></td>
+    </tr>
+    <tr> 
+      <td width="7%">&nbsp;</td>
+      <td width="93%"><font size="2">Slight jingling of bullets when marines walk, 
+        background breathing </font></td>
+    </tr>
+    <tr> 
+      <td width="7%">&nbsp;</td>
+      <td width="93%"><font size="2">Different material types that make different 
+        sounds when walking (or scuttling) on them</font></td>
+    </tr>
+    <tr>
+      <td width="7%">&nbsp;</td>
+      <td width="93%"><font size="2">Simulate background ambient noises programmatically 
+        </font></td>
+    </tr>
+    <tr> 
+      <td width="7%">&nbsp;</td>
+      <td width="93%"><font size="2">Extensive hand gestures for marines</font></td>
+    </tr>
+    <tr> 
+      <td width="7%">&nbsp;</td>
+      <td width="93%"><font size="2">When overwatch kicks in, there is an audio 
+        cue</font></td>
+    </tr>
+    <tr> 
+      <td width="7%">&nbsp;</td>
+      <td width="93%"><font size="2">&quot;Jungle&quot; feel for aliens with &quot;bogs&quot;, 
+        mist and mossy growth. They change the environment with their presence.</font></td>
+    </tr>
+  </table>
+</div>
+<p>&nbsp;</p>
+<div align="center">
+  <table width="85%" border="0" cellspacing="1" cellpadding="1">
+    <tr> 
+      <td colspan="2"><b><font size="2">Easy to learn</font></b></td>
+    </tr>
+    <tr> 
+      <td width="7%">&nbsp;</td>
+      <td width="93%"><font size="2">Track how many games a player has played. 
+        Display some in-game indication on each player showing their experience 
+        level. New players will be indicated as new to teammates. This encourages 
+        social order and listening to orders. Display with colored stars and adjective 
+        (three gold stars, Veteran). When a newbie sees an experienced player, 
+        they will be in awe and will listen and learn. This automatic mentoring 
+        helps new players get up to speed and helps the community sustain itself.</font></td>
+    </tr>
+    <tr> 
+      <td width="7%">&nbsp;</td>
+      <td width="93%"><font size="2">Pie-menu starts simple and opens itself up 
+        over time. At any time, the player can revert to simple mode or advanced 
+        mode. Simple mode also displays all key bindings for basic keys.</font></td>
+    </tr>
+    <tr> 
+      <td width="7%">&nbsp;</td>
+      <td width="93%"><font size="2">Chain of command for humans means that new 
+        players get put into &quot;commanded&quot; position and can receive orders 
+        from more experienced players. The aliens are even easier to start playing; 
+        their sneaky DM play style is familiar, only their abilities will be strange 
+        at first.</font></td>
+    </tr>
+    <tr> 
+      <td width="7%">&nbsp;</td>
+      <td width="93%"><font size="2">When in spectator mode, clip camera to world 
+        and use intelligent default view.</font></td>
+    </tr>
+  </table>
+</div>
+<div align="center">
+  <p>&nbsp;</p>
+  <table width="85%" border="0" cellspacing="1" cellpadding="1">
+    <tr> 
+      <td colspan="2"><b><font size="2">Game rules to promote</font></b></td>
+    </tr>
+    <tr> 
+      <td width="7%">&nbsp;</td>
+      <td width="93%"><font size="2">Concentrated fire is huge (human)</font></td>
+    </tr>
+    <tr> 
+      <td width="7%">&nbsp;</td>
+      <td width="93%"><font size="2">Suppressing fire (human)</font></td>
+    </tr>
+    <tr> 
+      <td width="7%">&nbsp;</td>
+      <td width="93%"><font size="2">Covering a teammate while they perform a 
+        slower, vulnerable but important action (human)</font></td>
+    </tr>
+    <tr> 
+      <td width="7%">&nbsp;</td>
+      <td width="93%"><font size="2">When in spectator mode, clip camera to world 
+        and use intelligent default view (human)</font></td>
+    </tr>
+    <tr>
+      <td width="7%">&nbsp;</td>
+      <td width="93%"><font size="2">Flanking is very effective (for aliens)</font></td>
+    </tr>
+    <tr> 
+      <td width="7%">&nbsp;</td>
+      <td width="93%"><font size="2">Quickly taking opportunities and exploiting 
+        weaknesses when they present themselves (both)</font></td>
+    </tr>
+    <tr> 
+      <td width="7%">&nbsp;</td>
+      <td width="93%"><font size="2">Ultra-cautious behavior, as time to wait 
+        for match to end can be up to a couple minutes (human)</font></td>
+    </tr>
+  </table>
+</div>
+<p>&nbsp;</p>
+<p><b><font size="2">Morale and resource model for humans</font></b></p>
+<p><font size="2">The resource system is modelled through likelihood of resources 
+  getting put to good use. If a player has shown his competence, he continues 
+  to receive resources. If a player fails at his role, he is given less resources 
+  because he has shown that he is less likely to put them to good use. This system 
+  is justified in the backstory but also promotes teamwork and protecting of teammates. 
+  The more players under a player's command, the more his resources depend on 
+  their livelihood. With this greater responsibility should come a bigger reward: 
+  knowledge that a successful mission was in large part to his own efforts and 
+  leadership? An extra sub-menu with special commands? Special priviledged upgrades? 
+  </font></p>
+<p><font size="2">Every x seconds, a resource injection is administered. The maximum 
+  size of the injection is determined by a starting number, then increased by 
+  number of aliens killed. The resources a player receives at regular intervals 
+  is proportional to percentage of those below a player in the chain of command 
+  (if any) that are alive. This proportion is multiplied with the current maximum 
+  resource injection to determine the actual injection. Whenever a squad leader 
+  receives resources, the players under his command who AREN'T squad leaders also 
+  receive it. Example: Player A is squad leader for Player B and Player C. Player 
+  B and Player C are at the bottom of the totem pole and command no one. Player 
+  A receives 100% of the resource injection at regular intervals. When he receives 
+  it, B and C also get it so everyone gets one 100% of the maximum resource injection. 
+  Player B then dies. Player A now only gets 50% of the resource injection, which 
+  also goes to C. Another example: Player 1 is the ultimate commander. He commands 
+  Player 2, who in turn commands Player 3 and Player 4. It is time to give a resource 
+  injection. Player 2 is alive, so Player 1 gets 100% of his resources. Player 
+  2 is below Player 1 but is a squad leader, so gets no runoff. Player 3 and Player 
+  4 are alive, so Player 2 then gets 100% of the resources. Player 3 and Player 
+  4 aren't leaders, so they also get the resources that Player 2 got. Now Player 
+  3 dies and it's time to give resources again. Player 1 gets 100% of his injection 
+  because Player 2 is alive. Player 2 only gets 50% of his injection because Player 
+  3 died. Player 4 also gets the 50%.</font></p>
+<p><font size="2">The morale level of a player is proportional to the percentage 
+  of players above you in the chain of command (if any) and below you in the chain 
+  of command (if any) that are alive and in a defined range. If there were never 
+  any players below a player in the chain of command, the number of players in 
+  the same squad count instead (those commanded and not other leaders for squad 
+  leaders, and close teammates for lowest-level soldiers). If a relevant player 
+  is alive but not in range, only 50% of that player's morale bonus is contributed. 
+  The morale level for a player is expressed as a percentage and is displayed 
+  at all times. Morale gives a player a defensive bonus and an accuracy bonus.</font></p>
+<p><font size="2">This system promotes proximity between squads and makes it in 
+  a player's best interest to keep his commander and fellow squad mates alive. 
+  It also forces the marines to move forward to and kill aliens. It also keeps 
+  the aliens from acting stupid and throwing themselves into the marines' weaponry, 
+  lest they feed the fire.</font></p>
+<p><font size="2">How to make the commander a leader? When the leader is more 
+  skilled than the others, it should be evident. Those below him will want to 
+  be led and want to feel like they are under the care and guidance of a true 
+  protector. How to make the commander a leader and not just another player? He 
+  has to have the ability to make decisions that no one else can make, because 
+  they don't have as much information. The commander can be in contact with the 
+  mothership which has more information about this engagement than he does. Maybe 
+  he receives intel about types and numbers of aliens in the vicinity? Informs 
+  him when aliens purchase key upgrades? Let him use his &quot;insight&quot; to 
+  get glimpses of aliens through walls (or at least vague shape indicating amount 
+  and position)? What can we do to make squad leaders feel more responsible and 
+  empowered?</font></p>
+<p><font size="2"><b>The alien resource model</b></font></p>
+<p><font size="2">The aliens have a constantly increasing maximum resource injection. 
+  It also increases when they kill marines. They have no morale model or chain 
+  of command. The total resources is divided among the number of players on the 
+  team (including dead players). If a player leaves the game, that player's remaining 
+  resources are divided to everyone else on the team. After an alien player dies, 
+  he is presented with a graphical menu that shows all the different aliens he 
+  can respawn back as. One or more of the alien choices may not be available in 
+  the beginning of the match. There should be a choice in the beginning of the 
+  game, not only one alien to select. Alternatively, the player can wait a bit 
+  and receive resources before entering. While this menu is up, they can still 
+  receive chat messages but are at a dark screen (or inside the alien hive mind?). 
+  They can't see the current game in progress.</font></p>
+<FONT SIZE=2>
+<DIR></DIR>
+<B> 
+<P>Version 0.9 feature list (each described in detail below)</P>
+</B></FONT> 
+<p><font size="2"><b>Marines vs. Marines</b></font></p>
+<div align="center"> 
+  <table width="85%" border="0" cellspacing="1" cellpadding="1">
+    <tr> 
+      <td colspan="2"><font size=2><i> 
+        <p><b>Humans</b></p>
+        </i> </font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Resource injections to everyone (probably equal 
+        for all players but may respond to player’s actions)</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>All soldiers get base amount of points to start</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Equipment buying during game, distribution 
+        to soldiers from commander</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Commander provides leadership near him, decreased 
+        fatigue, increased damage (encourage grouping of marines so they advance 
+        together or in small teams)</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Marine movement (walking, running and crouching)</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Comm radios</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Upgrade menu</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Overwatch</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Fatigue</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Machine gun (all soldiers have this)</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Explosive grenades (all soldiers have this, 
+        very important advantage vs. aliens)</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Flame thrower (purchased)</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Ammo clips (guns) and fire canisters (flame 
+        and napalm)</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Medium and heavy armor (slows movement, greatly 
+        increases damage and carrying capacity, purchased)</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Turrets (purchased)</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Door welding (purchased)</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Armor piercing ammo (shoots through thin walls 
+        and all aliens, upgrade)</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Stimpack (purchased)</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Smoke grenades (purchased)</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Gestures (pointing left, right, up, down, wait, 
+        follow)</font></td>
+    </tr>
+  </table>
+  
+  <p align="left"><font size="2"><b>Version 1.0 feature list</b></font> </p>
+  <p align="left"><font size="2"><b>Marines vs. Aliens</b></font></p>
+  </div>
+<div align="center">
+  <table width="85%" border="0" cellspacing="1" cellpadding="1" height="490">
+    <tr> 
+      <td colspan="2"><font size=2><b><i>Aliens</i></b></font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size="2">Allow jumping and hopping off walls to promote 
+        skillful use</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Abstract and grotesque view for queen player 
+        (warm, pulsing, indistinguishable dark shapes), shows third person view 
+        of each other alien on team</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size="2">Don't concentrate on melee, it's boring </font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Alien movement: Creeping, scuttling, flying, 
+        and gliding down from high places</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size="2">Teleportation or hive structure to move quickly 
+        to another place</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Non-queen aliens communicate mostly via primal 
+        squeals, grunts and gurgling. Messages from queen are broadcast to all 
+        minions in italicized font (like a thought or urge more than speech)</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Some aliens can move on walls and ceilings 
+        (too confusing?)</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size="2">Communal upgrades that any player can buy, 
+        everyone receives benefit:</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"> 
+        <div align="center"> 
+          <table width="85%" border="0" cellspacing="1" cellpadding="1">
+            <tr> 
+              <td><font size=2>Regeneration - slowly gives health back to all 
+                aliens</font></td>
+            </tr>
+            <tr> 
+              <td><font size=2>Unified hive mind (UHM) - </font></td>
+            </tr>
+            <tr> 
+              <td><font size=2>Exoskeleton - provides extra protection for all 
+                aliens</font></td>
+            </tr>
+            <tr> 
+              <td><font size="2">Speed upgrade - </font></td>
+            </tr>
+            <tr> 
+              <td><font size="2">Cloaking when motionless -</font></td>
+            </tr>
+            <tr>
+              <td><font size="2">Spore cloud - Blocks line of sight in a given 
+                area</font></td>
+            </tr>
+            <tr> 
+              <td><font size="2">Infravision - </font></td>
+            </tr>
+          </table>
+        </div>
+      </td>
+    </tr>
+  </table>
+</div>
+<FONT SIZE=2><B><I></i></B></FONT> 
+<DIR></DIR>
+<div align="center"><FONT SIZE=2> <B><I> </i></B></FONT> 
+  <table width="85%" border="0" cellspacing="1" cellpadding="1">
+    <tr> 
+      <td colspan="2"><font size=2><b><i> 
+        <p>General</p>
+        </i></b> </font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Automatic opening and closing doors (aperature 
+        and regular doors) </font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Particle system for all effects</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Very 3D maps with ventilation shafts, bridges, 
+        tight corridors opening into rooms and mutiple paths between rooms</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Sound system features if needed</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"> 
+        <table width="100%" border="0" cellspacing="1" cellpadding="1">
+          <tr> 
+            <td colspan="2"><font size=2>DSP effects:</font></td>
+          </tr>
+          <tr> 
+            <td width="4%">&nbsp;</td>
+            <td width="96%"><font size=2>Trebly/scratchy for sounds heard through 
+              communicator </font></td>
+          </tr>
+          <tr> 
+            <td width="4%">&nbsp;</td>
+            <td width="96%"><font size=2>Muffled/droning through other alien via 
+              UHM</font></td>
+          </tr>
+          <tr> 
+            <td width="4%">&nbsp;</td>
+            <td width="96%"><font size=2>Metal hallway</font></td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+  </table>
+</div>
+<FONT SIZE=2><B><I></i></B></FONT> 
+<div align="center">
+  <p>&nbsp;</p>
+  <table width="85%" border="0" cellspacing="1" cellpadding="1">
+    <tr> 
+      <td colspan="2"><font size=2><b><i> 
+        <p>Media</p>
+        </i></b> </font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"> 
+        <table width="100%" border="0" cellspacing="1" cellpadding="1">
+          <tr> 
+            <td colspan="2"><font size=2>Three good levels</font></td>
+          </tr>
+          <tr> 
+            <td width="5%">&nbsp;</td>
+            <td width="95%"><font size=2>Asteroid mining ship</font></td>
+          </tr>
+          <tr> 
+            <td width="5%">&nbsp;</td>
+            <td width="95%"><font size=2>Infested colony ship</font></td>
+          </tr>
+          <tr> 
+            <td width="5%">&nbsp;</td>
+            <td width="95%"><font size=2>Communications outpost</font></td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"> 
+        <table width="85%" border="0" cellspacing="1" cellpadding="1">
+          <tr> 
+            <td colspan="2"><font size=2>Models and animations</font></td>
+          </tr>
+          <tr> 
+            <td width="6%">&nbsp;</td>
+            <td width="94%"><font size=2>Marine walking, crouching, running</font></td>
+          </tr>
+          <tr> 
+            <td width="6%">&nbsp;</td>
+            <td width="94%"><font size="2">Commander skin (battle-worn comfortable-looking 
+              armor, fleet insignia)</font></td>
+          </tr>
+          <tr> 
+            <td width="6%">&nbsp;</td>
+            <td width="94%"><font size="2">Squad leader skin (Scuffed armor, experienced, 
+              a </font></td>
+          </tr>
+          <tr> 
+            <td width="6%">&nbsp;</td>
+            <td width="94%"><font size="2">Grunt skin (brand-new, bright, clean, 
+              plastic-looking)</font></td>
+          </tr>
+          <tr> 
+            <td width="6%">&nbsp;</td>
+            <td width="94%"><font size=2> 
+              <p>(To be filled in later)</p>
+              <p></p>
+              </font></td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+    <tr> 
+      <td colspan="2"><font size=2><b>Human sounds</b></font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Each marine weapon</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>A few marine pain sounds</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Marine walking (almost silent)</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Marine running (jangly)</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Heartbeat</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Overwatch activated sound</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Two different marine dying sounds</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Upgrade or purchase complete notification (short 
+        and unobtrusive)</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size="2">Commander voice (authoritative, confident 
+        and cool as a cucumber)</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size="2">Squad leader voice (moderately authoritative 
+        and seasoned)</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size="2">Grunt voice (slightly indignant, a little 
+        panicky, green-sounding) </font> </td>
+    </tr>
+    <tr> 
+      <td colspan="2"><font size=2><b>Alien sounds</b></font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Dying sound for each alien</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Layered whispers for alien UHM</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Looping queen-is-nearby sound</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Generic scuttling sound</font></td>
+    </tr>
+    <tr> 
+      <td colspan="2"><font size=2><b>General sounds</b></font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>A few explosions for grenades</font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>Ambient ship sounds: groans, clanks, alert 
+        sirens, humming</font></td>
+    </tr>
+    <tr> 
+      <td colspan="2"><font size=2><b> 
+        <p>Music</p>
+        </b> </font></td>
+    </tr>
+    <tr> 
+      <td width="4%">&nbsp;</td>
+      <td width="96%"><font size=2>A few songs to play in the background occasionally 
+        (one for beginning, one when game completes, one when marine dies). Often 
+        there will be very subtle background music, along with sounds of the ship. 
+        If it had intermittent volume swells, it would be clost to inaudible then 
+        occasionally swelling to the foreground (parallels hidden enemies suddenly 
+        attacking and allows ambient and environmental cues).</font></td>
+    </tr>
+  </table>
+  <FONT SIZE=2><B><I> </i></B></FONT></div>
+<FONT SIZE=2><B><I>
+<P>&nbsp;</P>
+</i></B>
+<DIR> 
+  <DIR> 
+    <DIR></DIR>
+  </DIR>
+</DIR>
+</FONT><B><FONT FACE="Arial"> 
+<P><b><font size="2">Version 1.1 feature list</font></b></P>
+</FONT></B> 
+<p><font size="2"><b>Marines vs. Aliens with more depth and scale</b></font></p>
+<div align="center"> 
+  <table width="85%" border="0" cellspacing="1" cellpadding="1">
+    <tr> 
+      <td width="5%">&nbsp;</td>
+      <td width="95%"><font size="2">Solider cam for commander</font></td>
+    </tr>
+    <tr> 
+      <td width="5%">&nbsp;</td>
+      <td width="95%"><font size=2>Grenade launcher (purchased)</font></td>
+    </tr>
+    <tr> 
+      <td width="5%">&nbsp;</td>
+      <td width="95%"><font size="2">Flashlights and/or nightvision</font></td>
+    </tr>
+    <tr> 
+      <td width="5%">&nbsp;</td>
+      <td width="95%"><font size=2>Options only shown on upgrade list if carrying 
+        capacity allows (shows text why not available)</font></td>
+    </tr>
+  </table>
+  <p>&nbsp;</p>
+</div>
+<div align="center"></div>
+<B><FONT FACE="Arial">
+<P>Feature descriptions</P>
+</FONT></B> 
+<P><font size="2"><b>Alien movement: -</b> Creeping, scuttling and flying</font></P>
+<p><font size="2"><b>Buying menu -</b> Marines can buy new equipment, armor and 
+  upgrades during the game. The menu is brought by hitting a key. The menu shows 
+  the list of items and upgrades and their prices, also showing the amount of 
+  points each costs. Any upgrade that is too expensive is drawn in red, any upgrade 
+  that is already purchased is drawn in green. The rest are drawn in white. Any 
+  equipment or upgrades that are &quot;purchased&quot; are acquired immediately.</font></p>
+<p><font size=2> </font><font size="2"> </font><font size="2"><b>Commander </b> 
+  - Marines within a certain range of the (a) commander has their fatigue reduced 
+  quickly or is completely immune to effects of fatigue. The commander has more 
+  responsibility for all his teammates, so his resource level depends on their 
+  livelihood. With this increased responsibility, does he get any extra power? 
+  To prevent cheating and make the commander role a social distinction, no extra 
+  power would be granted. To compensate for this extra responsibility, the commander 
+  should get something...maybe he just has an booming and authoritative voice 
+  that is distinct from the others. Likewise, the squad leaders should have a 
+  distinct voice, and the grunts their own as well.</font></p>
+<p><font size="2"><b>Comm radios -</b> When marines use their communicators (team 
+  chat), they make muffled chatting noises that the aliens can hear. Besides team 
+  chat, marines also have a handful of common sayings.</font></p>
+<p><font size="2"><b>Door welding</b> – Marines with welding torch can spend twenty 
+  seconds to weld doors shut. Aliens cannot get through closed doors</font></p>
+<p><font size="2"><b>Explosive grenades-</b> This is the marines' main form of 
+  indirect fire and is a principal advantage over the aliens. It can be bounced 
+  around corners and does damage to marines as well.</font></p>
+<p><font size="2"><b>Fatigue (marines only) </b>– When a marine runs <b>or fighting</b>, 
+  his fatigue level increases. When he is walking, it stays the same and when 
+  he is stationary, it decreases. The higher the fatigue level, the slower his 
+  movement rate. He will also take slightly more damage from attacks and will 
+  take longer to arm his weapon. When a marine is fully fatigued, he cannot fire 
+  and his movement rate drops severely. It is important that firing isn't allowed 
+  because the machine gun has unlimited ammo. Alternatively, force reloading. 
+  The fatigue rules promote planning and &quot;leap-frogging&quot; with teammates 
+  and further discourage the one-man army.</font></p>
+<div align="center"></div>
+<p><font size="2"><b>Flame thrower-</b> </font></p>
+<p><font size="2"><b>Gestures -</b> </font></p>
+<p><font size="2"><b>Machine gun-</b> Unlimited ammo. Can be upgraded in ROF and 
+  damage. Promotes cover fire.</font></p>
+<p><font size="2"><b>Marine movement-</b></font></p>
+<p><font size="2"><b>Overwatch</b> - Kicks in automatically when weapon is held 
+  stationary for a few seconds. Marines stay in overwatch as long as they don’t 
+  move, turn, change weapons or gesture. Overwatch increases the amount of damage 
+  inflicted on it’s target and automatically starts firing as soon as an enemy 
+  passes in range and area of effect of the weapon. Not all weapons can go into 
+  overwatch (only machine guns?). Overwatch is disabled when ammo runs out or 
+  the marine runs, turns, gestures or changes weapons. Chatting is still permitted 
+  and the weapon will still fire even while typing. This lets the marines strategize 
+  without immediate fear of death!</font></p>
+<p><FONT SIZE=2><B>Queen’s lair</b></font><FONT SIZE=2>- The big room where the 
+  queen lives. Aliens spawn here and is their base of operations. The aliens will 
+  try to prevent the marines from finding or entering this room for as long as 
+  possible so reinforcements can be gathered.</font></p>
+<P><font size="2"><b>Resource injections (both)-</b> Both the marines and aliens 
+  get intermittent resource points. The queen player gets all the alien resource 
+  points, which he can use to produce drones or purchase upgrades. Every marine 
+  gets their own amount of resources, with the commander getting more. The marines 
+  then handle individual upgrades themselves and buy their own equipment. The 
+  marines can also give resources to other marines if they are both within range 
+  of a commander.</font></P>
+<P><font size="2"><B>Regeneration </b>– Gives all aliens (including the queen 
+  and drones) automatic regeneration. Marines must continue to press attack to 
+  prevent reinforcements.</font></P>
+<P><font size="2"><b>Scuttle on ceiling/walls </b>– Aliens of level 1 and 2 can 
+  freely travel on ceilings and walls with no movement penalty</font></P>
+<P><font size="2"><b>Stimpack</b> – Reduces fatigue effects and temporarily increases 
+  speed </font></P>
+<P><font size="2"><B>Turrets - </b>After turrets are placed, overwatch kicks in 
+  after a few seconds and the same sound plays. Turrets also have an audio sensor 
+  and will track sounds that are close by. It will spin to aim at the nearest 
+  sound, overwatch flipping on after it is still for a few seconds each time. 
+  This lets aliens outwit turrets. Do turrets fire at any targets or only aliens?</font></P>
+<p><font size="2"><B>Wounding </b>– Both marines and aliens move slower and generally 
+  are less effective when wounded. This is largely permanent for marines but can 
+  be regenerated by aliens when available.</font></p>
+<P><font size="2"><B>Victory conditions </b>– The game is immediately won by the 
+  marines if the queen is destroyed. The game is won by the aliens when all the 
+  marines have been killed.</font></P>
+<div align="center"> </div>
+<P><font size="2"><b>Current design weaknesses</b></font></P>
+<div align="center"> 
+  <table width="85%" border="0" cellspacing="1" cellpadding="1">
+    <tr> 
+      <td width="5%">&nbsp;</td>
+      <td width="95%"><font size="2">The commander isn't well-defined or justified</font></td>
+    </tr>
+    <tr> 
+      <td width="5%">&nbsp;</td>
+      <td width="95%"><font size="2">The aliens don't have any equipment or social 
+        rules (all innovative stuff is on human side)</font></td>
+    </tr>
+  </table>
+  <p>&nbsp;</p>
+</div>
+<P align="center"><br>
+</P>
+<hr>
+<P align="left"><font size="2"><b>Old or undecided</b></font></P>
+<div align="left">
+  <p><font size=2><b><font size="2">Possession-</font></b>Target another alien 
+    not controlled by a player and hit possess key. You are instantly in control 
+    of that alien. Any alien not controlled by a player, will attack marines within 
+    a reasonable range but won't follow them. An alien player can group other 
+    aliens with him by targetting it and holding the possess key. After a few 
+    seconds, the alien will travel over to the player and will now follow the 
+    player and attack the target the player is targetting. Only aliens of the 
+    same type as the player can be grouped. In this way, a player can create and 
+    control an army. He can also &quot;place&quot; aliens as sentries and set 
+    up ambushes.</font></p>
+  <p><font size="2"><b>Infestation -</b> Can inhabit enemy player (host). Subject 
+    loses ability to speak, gets fatigued quickly and triggers unified hive mind 
+    sight for aliens. Unresolved: Is there a way to cure?</font></p>
+  <p><font size=2><b>Sphincters </b>- Aliens can enter the queen via sphincters 
+    on her. Once inside, they can choose between multiple exits, each one leading 
+    to a different part of the map. These sphincter doors exit through ceilings, 
+    walls or floors. They can also be entered to quickly travel back to the queen’s 
+    lair. They can be destroyed by marines</font></p>
+  <p><font size="2"><b>Unified hive mind (UHM) </b>- When alien sees marine, queen 
+    and teammates get notified of general location via sound or display, enabling 
+    aliens to stalk the marines. Aliens also always know about each other’s locations. 
+    The player or enemy type is not disclosed. When drone is spawned, play sound 
+    that can always be heard. When upgrade is purchased, play sound that can always 
+    be heard. In each case, play chat message from hive mind to all players. Chat 
+    messages to and from hive mind are silent so they can’t be heard by marines.</font></p>
+  <p><b><font size="2">Version 1.2 feature list</font></b></p>
+  <p><font size="2"><b>Marines vs. Aliens, easier to use, more cinematic</b></font></p>
+  <div align="center"> 
+    <table width="85%" border="0" cellspacing="1" cellpadding="1">
+      <tr> 
+        <td width="5%">&nbsp;</td>
+        <td width="95%"><font size=2>Show upgrade in progress HUD, along with 
+          researched tech</font></td>
+      </tr>
+      <tr> 
+        <td width="5%">&nbsp;</td>
+        <td width="95%"><font size="2">Pre-game buying aboard drop ship</font></td>
+      </tr>
+      <tr> 
+        <td width="5%">&nbsp;</td>
+        <td width="95%"><font size="2">Drop pods that land on alien ship with 
+          cinematic camera</font></td>
+      </tr>
+      <tr> 
+        <td width="5%">&nbsp;</td>
+        <td width="95%"><font size=2>Automatic upgrade option so player doesn’t 
+          have to choose</font></td>
+      </tr>
+      <tr> 
+        <td width="5%">&nbsp;</td>
+        <td width="95%"><font size="2">Solider cam for commander</font></td>
+      </tr>
+      <tr> 
+        <td width="5%">&nbsp;</td>
+        <td width="95%"><font size="2">Multiple simultaneous alien cams for queen 
+          </font></td>
+      </tr>
+      <tr> 
+        <td width="5%">&nbsp;</td>
+        <td width="95%"><font size=2>Grenade launcher (purchased)</font></td>
+      </tr>
+      <tr> 
+        <td width="5%">&nbsp;</td>
+        <td width="95%"><font size=2>Show key bindings and abilities on HUD with 
+          simple explanations (give reason why available if not)</font></td>
+      </tr>
+      <tr> 
+        <td width="5%">&nbsp;</td>
+        <td width="95%"><font size=2>Options can be queued for purchase (triggers 
+          AVC)</font></td>
+      </tr>
+      <tr> 
+        <td width="5%">&nbsp;</td>
+        <td width="95%"><font size=2>Automatic voice chat (AVC) that informs teammates 
+          of upgrade choices</font></td>
+      </tr>
+    </table>
+    <p align="left"><font size="1" face="Georgia, Times New Roman, Times, serif"><i></i></font><font size="2">General 
+      wounding for both sides</font></p>
+    <p align="left"><font size="2">Blaze of Glory</font></p>
+    <p align="left"><font size="2">Grow queen (upgrade, provides quicker drone 
+      production, increases hit points, cannot be purchased to early so other 
+      players aren’t bored). Risky, as offensive power suffers and marines could 
+      stumble upon queen.</font></p>
+    <p align="left"><font size="2">Alien cam for queen (like observer mode, takes 
+      up full screen)</font></p>
+    <p align="left"><font size="2">Slow or immobile defensive alien</font></p>
+    <p align="left"><font size=2>Marines can give resources to another player 
+      to acheive an expensive upgrade sooner</font></p>
+    <p align="left"><font size="2">Display a teammate's role (scout, heavy, commander, 
+      etc.) when looking at him. Role's aren't chosen, but would have to be determined 
+      by looking at the player's equipment and actions.</font></p>
+    <p align="left"><font size="2">Six levels of aliens. Each one costs more than 
+      the last. To spawn, the player must have enough to pay for one of the alien 
+      types. Show graphical menu where they are shown and can be selected.</font></p>
+    <p align="left"><font size=2>Napalm missile (purchased)</font></p>
+    <table cellspacing=1 border=0 cellpadding=1 width=85%>
+      <tr> 
+        <td valign="TOP"> <i></i> 
+          <p><font size=2><i>Level 0</i> – Drone, bottom of food chain. No combat 
+            skills. (guinea pig size) Suicide ability?</font> 
+        </td>
+      </tr>
+      <tr> 
+        <td valign="TOP"> <i></i> 
+          <p><font size=2><i>Level 1</i></font><font size=2> – Basic melee alien, 
+            scout (cat-sized). Can lunge and hop.</font> 
+        </td>
+      </tr>
+      <tr> 
+        <td valign="TOP"> <i></i> 
+          <p><font size=2><i>Level 2</i></font><font size=2> – Alien with basic 
+            ranged attack can lay sticky web (upgrade, German-shepherd sized)</font> 
+        </td>
+      </tr>
+      <tr> 
+        <td valign="TOP"> <i></i> 
+          <p><font size=2><i>Level 3</i></font><font size=2> – Flying alien with 
+            lightning speed and nasty melee attack (eagle-sized). Flies like first-person 
+            Joust (default is right mouse button)</font> 
+        </td>
+      </tr>
+      <tr> 
+        <td valign="TOP"> <i></i> 
+          <p><font size=2><i>Level 4</i></font><font size=2> – Big alien with 
+            acid gun that does splash damage (infection upgrade, man-sized). This 
+            is a heavy defender that can also take damage clustered marines. </font> 
+        </td>
+      </tr>
+      <tr> 
+        <td valign="TOP"> <i></i> 
+          <p><font size=2><i>Level 5</i></font><font size=2> – Monstrous charging 
+            melee alien that can run through turrets (horse-sized)</font> 
+        </td>
+      </tr>
+    </table>
+    <p align="left"><font size="2">Possession (allowed by all aliens except queen)</font></p>
+    <p align="left"><font size="2">Level 2 alien gets infestation ability</font></p>
+    <p>&nbsp;</p>
+    <div align="center">
+<p><font size="1" face="Georgia, Times New Roman, Times, serif"><i>All material 
+        property of Charlie Cleveland and is not to be referenced, used or reprinted 
+        </i></font></p>
+    </div>
+    <p align="center"><font size="1" face="Georgia, Times New Roman, Times, serif"><i>Violators 
+      will be violated</i></font></p>
+    <p align="center">&nbsp;</p>
+    <p align="left">&nbsp;</p>
+  </div>
+</div>
+</BODY>
+</HTML>
diff --git a/main/source/doc/Manual numbers.txt b/main/source/doc/Manual numbers.txt
new file mode 100644
index 00000000..8cc76974
--- /dev/null
+++ b/main/source/doc/Manual numbers.txt	
@@ -0,0 +1,201 @@
+RC: resource cost
+BT: build time (unitless, maybe call it something special like Hirshelm)
+H: health (how much damage it can take before being destroyed)
+DM: damage
+ROF: Rate of fire
+
+Buildings don't have armor in the strict sense, so I take it when you say this you mean, "how much damage can it take?".  I know it sound sound weird to talk about building "health" so that sounds good to me.
+
+CC
+RC:		30
+BT:		35
+H:		10000
+
+IP
+RC:		15
+BT:		22
+H:		2000 
+
+Armory
+RC:		25
+BT:		30
+H:		2400
+
+Adv. armory
+RC:		35
+BT:		120
+H:		Same as armory
+
+Turret factory
+RC:		25
+BT:		40
+H:		3000
+
+Adv. turret factory
+RC:		25
+BT:		30
+H:		Same as turret factory
+
+Arms lab
+RC:		50
+BT:		40
+H:		2200
+
+Prototype lab
+RC:		45
+BT:		50
+H:		2000
+
+Observatory
+RC:		25
+BT:		30
+H:		1000
+
+Phase gate
+RC:		20
+BT:		30
+H:		3500
+
+Marine resource tower
+RC:		22
+BT:		50
+H:		5000
+
+Knife:
+DM:		30
+
+Pistol:
+DM:		20
+
+MG:
+DM:		10
+
+HMG:
+DM:		20
+Clip:	150
+
+Shotgun:
+DM:		16 per pellet, 10 pellets per shot
+
+Grenade launcher:
+DM:		200 at epicenter, falls off from there (range unknown)
+Clip:	6
+
+Mine:
+DM:		100 at epicenter, falls off
+Clip:	5
+
+Sentry turret:
+Can aim 30 degrees up and 30 degress down (60 degree FOV)
+DM:		27
+Range:	800
+ROF:	.5 seconds + 0.0 to .2 seconds (random)
+Cost:	16
+H:		1000
+BT:		30
+
+Siege turret:
+Range:	1250
+Cost:	25
+ROF:	1 shot per 5 seconds
+H:		2000
+BT:		50
+
+Heavy armor:
+Absorbs 95% of damage
+
+Bite:
+DM: 75
+
+If a hive is destroyed, aliens lose 0 resources
+
+Skulk
+H:		70
+Armor:	10/30
+Leap:	4 damage each time he "touches" player while he's leaping (hard to make sense of, maybe omit)
+Xenocide:	400 damage at epicenter, falls off.  Double damage vs. buildings.
+
+Gorge:
+H:		100
+Armor:	50/75
+Spit DM:	22
+
+Healing spray:	
+DM:		16
+ROF:	1 "shot" every 1.6 seconds
+
+Lerk:
+H:		60
+Armor:	50/75
+Bite DM:	50
+Spike DM:	16
+Spores:
+	DM:		36
+	Radius:	250
+
+Fade:
+H:		200
+Armor:	90/125
+Swipe D:	80
+Rocket D:	50 (falls off for splash)
+Bile bomb D:	80 (double vs. structures)
+Bile bomb radius: 500
+
+Onos:
+H:		500
+Armor:	150/200
+Gore:	120
+Charge: 10 damage each time he touches player or entity (like leap, kind of a meaningless number, maybe omit)
+Paralysis time: 6 seconds
+
+Carapace example, not sure about this number, make it up, test it out or omit
+
+Regeneration upgrade
+- Regens every 2 seconds
+- Heals 1 point at level 1, 2 points at level 2 and 3 points at level 3
+
+Redemption upgrade
+- Only will fire when alien is at 40% health or less
+- Will never redeem you to a hive that's 500 range away or closer
+- I can't really give you any numbers here, they are unitless. 
+
+Adrenaline:
+- Aliens within range of primal scream get energy back 60% faster.  Screams don't "stack" (umbras don't stack either)
+- Aliens recover 8% of their energy per second.  Each level of adrenaline increases this by 33% (so level 3 adrenaline would give adren back double speed, at 16% of the full amount per second)
+
+Celerity:
+- Each level increases speed by set amount.
+- This set amount varies from alien to alien.
+- These amounts are as follows:
+l1: 25
+l2: 25
+l3: 25
+l4: 25
+l5: 45
+
+So a skulk with 2 levels of celerity moves at his base speed plus 2x25.  The base speeds for the aliens are as follows:
+l1: 290
+l2: 170
+l3: 200
+l4: 210
+l5: Depends on galloping.  The max is 350. (don't worry about documenting this yet, it's a bit weird and will likely be reworked or removed)
+
+So a skulk with 2 levels of celerity moves at 290 + 2x25 = 340
+
+Silence:
+Sounds that are affected by silence are reduced in volume. 
+Level/Percent volume
+0/100
+1/66
+2/33
+3/0
+
+Enhanced sight.  Oops, this isn't "Advanced Hive Sight" but enhanced "regular" sight.  Each level of this ability makes enemy structures and entities glow brighter.
+It's currently a bit buggy though, as low levels of enhanced sight can make entities harder to see instead of easier.
+
+Scent of fear - If an enemy player or structure is at 33% of their full health or below, and is within range, they show up as a special type of entity on hive sight.
+level 1 - range 700
+level 2 - range 1400
+level 3 - range 2100
+
+
diff --git a/main/source/doc/Map Making Guidelines.htm b/main/source/doc/Map Making Guidelines.htm
new file mode 100644
index 00000000..225f9cb9
--- /dev/null
+++ b/main/source/doc/Map Making Guidelines.htm	
@@ -0,0 +1,1727 @@
+<html>
+<head>
+<title>Natural Selection Mapping Guidelines</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body bgcolor="#FFFFFF">
+<h3 align="center">&nbsp;</h3>
+<div align="center">
+  <table width="90%" border="1" cellspacing="0" cellpadding="0">
+    <tr> 
+      <td> 
+        <table width="100%" border="0" cellspacing="0" cellpadding="5">
+          <tr bgcolor="#666600"> 
+            <td><font color="#FFFFFF"><b><font size="+2">Mapping guidelines for 
+              Natural Selection </font></b></font></td>
+            <td colspan="2"> 
+              <div align="right"><font color="#FFFFFF"><b><font size="+1">Version 
+                .7a, last updated July 25, 2001</font></b></font></div>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+    <tr> 
+      <td> 
+        <div align="center">
+<p>&nbsp;</p>
+          <table width="85%" border="1" cellpadding="2" cellspacing="0">
+            <tr> 
+              <td> 
+                <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                  <tr bgcolor="#666600"> 
+                    <td><font color="#FFFFFF"><b><font size="+1">Introduction</font></b></font></td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+            <tr> 
+              <td> This guide will provide all the info needed to create levels 
+                for Natural Selection. It describes the ideas and philosophies 
+                needed to make levels that are true to the game's spirit. This 
+                document is the official reference for all game specific entities 
+                as well. Please post on the <a href="http://overmind.org/cgi-bin/UltraBoard/UltraBoard.cgi?action=Headlines&amp;BID=4&amp;SID=335">mapping 
+                forum</a> or write <a href="mailto:flayra@overmind.org">flayra@overmind.org</a> 
+                if you have comments or questions on anything here. Good luck!</td>
+            </tr>
+          </table>
+        </div>
+        <div align="center"> 
+          <table width="85%" border="1" cellspacing="0" cellpadding="2">
+            <tr> 
+              <td> 
+                <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                  <tr bgcolor="#666600"> 
+                    <td><font color="#FFFFFF"><b><font size="+1">Design philosophies</font></b></font></td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+            <tr> 
+              <td>
+                <p>There are some design philosophies that should be observed 
+                  to make cohesive maps that work well for Natural Selection.</p>
+                <div align="center"> 
+                  <table width="85%" border="1" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td> 
+                        <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                          <tr bgcolor="#666600"> 
+                            <td><font color="#FFFFFF"><b>Rules to know about</b></font></td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <p>When the game first starts, the marines have a pre-game 
+                          sequence (<a href="http://overmind.org/strathl/OldGameDescription.html">link</a>) 
+                          on their dropship which gives the aliens have some time 
+                          before the marines can advance through the spacecraft. 
+                          During this time, the faster aliens should have time 
+                          to reach almost all the way to the marine starting location, 
+                          to wait quietly in the rafters or dark corners. The 
+                          marines will want to storm out of their dropship immediately, 
+                          but there shouldn't be enough time for aliens to get 
+                          all the way to the room the marines deploy into. </p>
+                      </td>
+                    </tr>
+                  </table>
+                  <table width="85%" border="1" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td> 
+                        <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                          <tr bgcolor="#666600"> 
+                            <td><font color="#FFFFFF"><b>Basic structure</b></font></td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <p>The marines don't know where the aliens starting location 
+                          is, so there needs to be three to five starting locations 
+                          that are roughly equidistant from the marine starting 
+                          location. This fact, along with the desired intentional, 
+                          committal and strategic nature of the game, imply a 
+                          circular, web-like connected map structure, with the 
+                          marine staring point at the center. The desired optimal 
+                          behavior for the marines is advancing in one or many 
+                          squads, spreading out to find the alien base. Speed 
+                          is not to be stressed, a minimum of losses should be 
+                          more valuable to winning. The marines should spread 
+                          out and find the source of the aliens with some urgency, 
+                          but not at a high expense of resources. In the beginning 
+                          of the game, the marines have to commit to one or more 
+                          branches of the web. A squad that has chosen one branch 
+                          shouldn't be able to quickly fall back and regroup with 
+                          members that chose another branch, the aliens should 
+                          have the ability to cut squads off from each other. 
+                        </p>
+                        <p>This basic structure should also have areas where the 
+                          aliens can take alternate paths, not accessible to the 
+                          marines. Ventilation shafts, electrical tunnels and 
+                          power conduits allow aliens to ambush and flank vulnerable 
+                          marines. These alien-only paths should connect the alien 
+                          hive rooms and with each other and allow the aliens 
+                          to travel between adjacent web branches. They shouldn't 
+                          be overdone though, as the marines need to be able to 
+                          easily understand which openings should be watched or 
+                          blocked off if they want to fortify an area. There can 
+                          be occasional hidden openings, but most should be obvious 
+                          gratings, still fans, holes and access tunnels. The 
+                          aliens should be encouraged to use the areas accessible 
+                          to the marines about half the time. Making tunnels harder 
+                          to get to or a farther distance than the regular hallways 
+                          could help encourage this.</p>
+                        <p>There should be a good choke point or two between the 
+                          marine starting point and each hive room, so the marines 
+                          can decide to build a safe area, or choose locations 
+                          for deploying siege weaponry or phase gates. Ideally 
+                          there would be at least one marine-accessible location 
+                          from outside each hive room that the marines could shoot 
+                          at the hive from. A desired viable strategy would be 
+                          finding the hive, fortifying an attack point by welding 
+                          all openings shut and deploying siege and defensive 
+                          marines. The aliens should prevent this from happening 
+                          or upgrade to anti-siege aliens before this happens 
+                          or pay the price. In other words, the marines should 
+                          be allowed to stage a good attack on the hive, not only 
+                          by running into the final room and engaging the aliens 
+                          close up on their turf. Generally there should safer 
+                          areas where the marines can cover each other and leapfrog 
+                          forward, connected by less safe narrow passageways. 
+                          The ultimate goal is organized marine movements by squad, 
+                          advancing and covering each other.</p>
+                        <p align="left">Strive to make the lighting feel dark, 
+                          but never actually be dark. A near-dark corner or two 
+                          is fine, but never make areas that are completely dark. 
+                          This promotes replay and reduces general frustration.</p>
+                        <p align="center"><img src="devshots/alien3.jpg" width="400" height="357"></p>
+                        </td>
+                    </tr>
+                  </table>
+                </div>
+                <div align="center"> 
+                  <table width="85%" border="1" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td> 
+                        <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                          <tr bgcolor="#666600"> 
+                            <td><font color="#FFFFFF"><b>The marine starting point</b></font></td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> The marine starting point should be the center of the 
+                        map. There should be at least two exits leading out and 
+                        it should be easily defensible with turrets, mines and 
+                        overwatch. There should be no ventilation shafts into 
+                        this area, only hallways or wide passage ways that multiple 
+                        marines can advance through or hold. It is undecided if 
+                        aliens will be allowed into this area and how they will 
+                        be prevented from entering if not.</td>
+                    </tr>
+                  </table>
+                  <table width="85%" border="1" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td> 
+                        <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                          <tr bgcolor="#666600"> 
+                            <td><font color="#FFFFFF"><b>Alien hive rooms</b></font></td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> At the end of each of the web-branches should have 
+                        a medium-sized area suitable for alien spawning and for 
+                        a tank-sized alien hive structure. There should be five 
+                        to ten alien spawning points arrayed around or within 
+                        the hive structure. These rooms should also be conducive 
+                        for fighting for the aliens, so there should be short 
+                        passageways and cover suitable for flanking, turning and 
+                        enveloping. There could also be a level-over-level or 
+                        vertical aspect that would be hard for marines to fortify. 
+                        There should be many passageways in and out of these rooms, 
+                        ones that link up to other adjacent hive rooms but are 
+                        only accessible to aliens. There should be occasional 
+                        passageways that are accessible for aliens or marines 
+                        with jetpacks, but travel between most hive rooms should 
+                        require going halfway back to the marine start first. 
+                        There are also certain desired visual characteristics 
+                        of hive rooms (it's not decided exactly what form the 
+                        hive rooms will take yet, coming soon).</td>
+                    </tr>
+                  </table>
+                  <table width="85%" border="1" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td> 
+                        <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                          <tr bgcolor="#666600"> 
+                            <td><font color="#FFFFFF"><b>The marine/alien continuum</b></font></td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <p>Good levels will let players recognize where they are 
+                          at all times and hint at which way to go. One way of 
+                          doing this is by having the marine starting location 
+                          be the highest altitude of the map, then having the 
+                          path the each alien hive room be below that. That way, 
+                          a marine knows which direction to go to run towards 
+                          or away from an enemy. Most importantly, he knows how 
+                          to run away and rejoin his team if he wandered off and 
+                          is feeling scared...</p>
+                        <p>Additionally, the look and feel should change between 
+                          the marine and alien starting points. Choose an artistic 
+                          style for each side, then carry it through fully. Make 
+                          it as though the jungle-like aliens have somehow transformed 
+                          their areas of the ship into their natural habitats 
+                          from their homeworld. A flooded boiler room could be 
+                          decorated with with draped cables and floating debris 
+                          to simulate a &quot;bog&quot;. A hive room could could 
+                          have treelike structures with connecting &quot;branches&quot;, 
+                          formed by fallen transmitters and posts. Make the marine 
+                          base camp completely dry, then have some dripping water 
+                          nearby, changing to puddles of standing water close 
+                          to the hive rooms, then having the hive rooms be waste 
+                          deep water. Make the marine side &quot;dead&quot; and 
+                          the alien parts &quot;living&quot;. Consider choosing 
+                          two drastically different color or lighting schemes 
+                          and slowly morphing between them as the players travel 
+                          from one area to the other. Try making the marine side 
+                          technological and controlled, the alien side organic 
+                          and primal, then see how slowly you can transition between 
+                          the two. Or make the marine side quiet (good for marines 
+                          to hear the alien growls and squeals) then create a 
+                          massive fan room and generators that drone out voice 
+                          communication and scare the marines as they get farther 
+                          away. Or use only ambient and lights coming from fixtures 
+                          on the marine side, then only ominous texture lights 
+                          towards the aliens. Have little &quot;ambient movement&quot; 
+                          on the marine side, then have moving fans, malfunctioning 
+                          elevators and unexpected gusts of steam erupting from 
+                          pipes as the marines get closer. </p>
+                        <p>This continuum will really help players know where 
+                          they are, and get them to feel the tension they should 
+                          as they leave their territory. Most importantly, get 
+                          creative and work whatever continuums you've chosen 
+                          into your level as deeply as you can. </p>
+                      </td>
+                    </tr>
+                  </table>
+                </div>
+                <div align="center"> 
+                  <table width="85%" border="1" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td> 
+                        <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                          <tr bgcolor="#666600"> 
+                            <td><font color="#FFFFFF"><b>Shared experience and 
+                              landmarks</b></font></td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> One of the sub-goals that the game tries to accomplish 
+                        is to have memorable and cinematic games and to strengthen 
+                        to bonds between players. Games where you say &quot;remember 
+                        when you punched the elevator button and backed away and 
+                        as it slowly opened we say the elevator was FULL already 
+                        and turned to run....&quot;. One way to accomplish this 
+                        is to have sections of the map which cause a group of 
+                        players to pause and look in the same direction, or to 
+                        wait for another player to do something. An event that 
+                        causes players to realize for a moment, that they're all 
+                        doing the same thing. The marines especially should be 
+                        watching each other often, so their actions should be 
+                        relevant. Creating landmarks like this also makes it easy 
+                        to describe parts of the map during or after the game, 
+                        allows impromptu battle plans and allows for more reacting 
+                        by both sides. If the marines hear a a bay door opening 
+                        and they're all in sight, they know the aliens have breached 
+                        an area and can react. If the aliens listen for a tram 
+                        to start up, they can visualize where the marines are 
+                        and try to track them (or the marines can outwit them 
+                        by hitting the button and then not using it). So these 
+                        landmarks and shared experiences promote interaction between 
+                        teams and teammates, and makes the games more enjoyable 
+                        and memorable. Try to add at least a few of these elements 
+                        per map, especially around chokepoints. Make certain areas 
+                        wide enough for multiple players to walk, fly or scuttle 
+                        through at once or a quadruple-wide ladder that multiple 
+                        players could use. Create somewhat noisy freight elevators, 
+                        loading bays, a door that can only be opened by having 
+                        two buttons being pressed by two players at once, bridges, 
+                        clocks that show you when an event is going to happen, 
+                        anything that gets players to recognize each others actions 
+                        or makes one player dependent on another. These landmarks 
+                        are much more important for the marines, as the aliens 
+                        generally will lead coordinated but separate attacks.</td>
+                    </tr>
+                  </table>
+                </div>
+                <div align="center"> 
+                  <table width="85%" border="1" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td> 
+                        <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                          <tr bgcolor="#666600"> 
+                            <td><font color="#FFFFFF"><b>Fleshing out the world</b></font></td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> The ambiance is especially important in this game. 
+                        Maps can create many powerful custom effects. One great 
+                        way to do this is to create detailed little sub-areas 
+                        of the map that can only be viewed, not entered. Create 
+                        a little side-passage with a half of a broken electrical 
+                        door showing exposed wires, puddles and blinking lights 
+                        behind it. Create wire gratings that only partly conceal 
+                        a hopelessly detailed mess of pipes and and wheels. A 
+                        hole in an elevator shaft that reveals a cafeteria that's 
+                        now a grotto. A crack in the wall that shows a hollowed 
+                        out area filled with cables. <a href="http://www.planethalflife.com/crinity">Crinity</a> 
+                        is the true master of this and it makes a huge difference 
+                        in creating ambiance and wonder in his maps.</td>
+                    </tr>
+                  </table>
+                </div>
+                <p>&nbsp; </p>
+              </td>
+            </tr>
+          </table>
+        </div>
+        <div align="center"> 
+          <table width="85%" border="1" cellspacing="0" cellpadding="0">
+            <tr> 
+              <td> 
+                <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                  <tr bgcolor="#666600"> 
+                    <td><font color="#FFFFFF"><b>The ready room and the absence 
+                      of menus</b></font></td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+            <tr> 
+              <td> 
+                <p>Another sub-goal of this game is to reduce the amount of time 
+                  players spend in a non-immersive environment. So instead of 
+                  the text menus to choose your team as in other games, this game 
+                  has a the concept of the &quot;ready room&quot;. The theme and 
+                  layout of the ready room can fit into the theme of the map but 
+                  keep it easy to use. At minimum, there should be a door with 
+                  a sign that says &quot;Join marine team&quot;, another door 
+                  that says &quot;Join alien team&quot;, one that says &quot;Join 
+                  a auto-assigned team&quot; and the last that says &quot;Watch 
+                  game&quot;. When you join a server, you spawn in immediately 
+                  into the ready room. You choose what you want to do by interacting 
+                  with the map, i.e., by walking through one of the doors, or 
+                  just hanging out in this area and talking with other players 
+                  in the ready room, waiting for the match in progress to end 
+                  or the map to change. There is also one more door that should 
+                  say or indicate &quot;disconnect from server&quot;.</p>
+                <p>The ready room should be an unconnected area of the main map, 
+                  but make it far enough away from the main game area so ambient 
+                  sounds from one area aren't heard in the other. There should 
+                  be at least ten info_player_start entities, as all the players 
+                  on the server could spawn in here at once. Make the room dramatic 
+                  and make the routes to each door an inviting choice. Maybe an 
+                  animated hologram of a marine or an alien inviting players to 
+                  their doors will get people into the mood of your map. Use animated 
+                  lights on runways leading to the doors, spawn point facing and 
+                  other factors and railings to lead players out of the ready 
+                  room into the game. Try making the spectator door up a small 
+                  stairway to a balcony that implies the height needed to adequately 
+                  watch the game in progress. Have klaxons going off at the beginning 
+                  of the round for dramatic tension. When a game that can't be 
+                  late-joined has started, use the entities below to close the 
+                  appropriate doors dramatically and display other instructions. 
+                </p>
+                <p>When a player wants to leave a game in progress, he can exit 
+                  through a door at their starting point labeled &quot;leave game&quot; 
+                  or whatever is appropriate and clear for your map theme. </p>
+                <p>The ready room is a dramatic way to wrap the game and serves 
+                  as a mini meta-game in itself. Unfortunately, it's also more 
+                  work for the level designers. If this idea doesn't work out 
+                  so well, I'll be adding traditional text menus in..</p>
+              </td>
+            </tr>
+          </table>
+          <table width="85%" border="1" cellspacing="0" cellpadding="0">
+            <tr> 
+              <td> 
+                <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                  <tr bgcolor="#666600"> 
+                    <td><font color="#FFFFFF"><b>Alien design considerations</b></font></td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+            <tr> 
+              <td> The aliens have many movement types including wall-running, 
+                gliding, flying and &quot;ollying&quot; (jumping off walls) Additionally, 
+                aliens come in different sizes, the biggest of which is a bit 
+                bigger than the general player model. Try to make areas that accommodate 
+                and promote these movement types and try to let the alien players 
+                skill level scale. Do this by making glides or &quot;ollies&quot; 
+                that are really hard for aliens to make, but possible. Make vertical 
+                columns in the ceiling that house lights and are accessible from 
+                a tunnel, so gliders can silently glide down from them. Make a 
+                few big wide hallways near the alien hives so the bigger aliens 
+                don't have trouble attacking. More to come in this area... </td>
+            </tr>
+          </table>
+        </div>
+        <div align="center"> 
+          <table width="85%" border="1" cellspacing="0" cellpadding="0">
+            <tr> 
+              <td> 
+                <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                  <tr bgcolor="#666600"> 
+                    <td><font color="#FFFFFF"><b><font size="+1">Visual entities</font></b></font></td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+            <tr> 
+              <td> 
+                <div align="center"> 
+                  <table width="100%" border="1" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td> 
+                        <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                          <tr bgcolor="#666600"> 
+                            <td><font color="#FFFFFF"><b>env_gamma</b></font></td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <p>This entity changes your monitor's gamma ramp for your 
+                          map. Half-life engine games don't modify your monitor's 
+                          settings, so they have an effect gamma slope of 1.0. 
+                          Making your gamma ramp steeper will make your colors 
+                          more vibrant and will give lots more contrast to your 
+                          maps. Quake III does this to great effect (John Carmack 
+                          calls it &quot;overbrightening&quot;. For a detailed 
+                          technical paper on this, check the <a href="http://home.inforamp.net/%7Epoynton/GammaFAQ.html/">here</a>. 
+                          What you really need to know is that changing this setting 
+                          can give your map lots more contrast make everything 
+                          look much more vivid. However, this setting drastically 
+                          affects your map's lighting, so you won't want to tweak 
+                          this when you're almost done your map. Try to decide 
+                          early on what setting you'll use by doing some letting 
+                          tests, then stick with it. There may be some compatibility 
+                          problems with gamma values over or around 1.7, so don't 
+                          depend too much on the gamma being exactly what you 
+                          set it to.</p>
+                        <div align="center"> 
+                          <table width="90%" border="0" cellspacing="1" cellpadding="1">
+                            <tr> 
+                              <td><b>Desired map gamma</b> -This is the gamma 
+                                slope to change the all players' monitors to when 
+                                playing your map. The default is 1.0. Don't set 
+                                it higher than 2.0 or there's a good chance some 
+                                monitors won't be able to switch to this. A good 
+                                set of values is around 1.4 to 1.8. If a monitor 
+                                can't switch to the value you set, it will try 
+                                again with a slightly lower number until it succeeds, 
+                                or until the gamma is 1.0.</td>
+                            </tr>
+                          </table>
+                        </div>
+                      </td>
+                    </tr>
+                  </table>
+                  <table width="100%" border="1" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td> 
+                        <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                          <tr bgcolor="#666600"> 
+                            <td><font color="#FFFFFF"><b>env_particles</b></font></td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <p>This entity places a particle system in a level. It 
+                          can only be used to place a particle system that has 
+                          been defined in avh.ps, it can't be used to create a 
+                          new one. To create custom particle effects, use <b>env_custom_particles</b>. 
+                          This entity may not be very useful and will probably 
+                          be phased out, so skip this for now and read about <b>env_custom_particles</b> 
+                          below. This entity is fully switchable, like a light 
+                          or any other target in Worldcraft. It's fields are as 
+                          follows:</p>
+                        <div align="center"> 
+                          <table width="90%" border="0" cellspacing="1" cellpadding="1">
+                            <tr> 
+                              <td><b>Name</b> - Target name that can be triggered 
+                                with a button or switch. Triggering it will toggle 
+                                it on and off, like a light.</td>
+                            </tr>
+                            <tr> 
+                              <td><b>Name (from .ps) </b>- Type the name of the 
+                                particle system that it should from avh.ps. Example: 
+                                &quot;ShotgunSmoke&quot; or &quot;DustLight&quot;</td>
+                            </tr>
+                            <tr> 
+                              <td><b>flags</b>: &quot;start on&quot; (checking 
+                                this means the particle generates particles without 
+                                having to be triggered first)</td>
+                            </tr>
+                          </table>
+                        </div>
+                      </td>
+                    </tr>
+                  </table>
+                </div>
+                <div align="center"> 
+                  <table width="100%" border="1" cellspacing="0" cellpadding="0">
+                    <tr> 
+                      <td> 
+                        <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                          <tr bgcolor="#666600"> 
+                            <td><font color="#FFFFFF"><b>env_custom_particles</b></font></td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <p>This entity lets you create your own custom particle 
+                          effects for your map. They include things like light 
+                          mist, volumetric fog (simulated), haze, dust motes, 
+                          smoke, steam, fire, etc. Almost any type of effect can 
+                          be created with this system, including effects that 
+                          generate other types of effects. It is just like any 
+                          other switcheable, moveable Worldcraft entity and can 
+                          be triggered with buttons and moved. There are a lot 
+                          of fields, but it is quite advanced and use of it will 
+                          be richly rewarded. </p>
+                        <p><b>Important notes:</b> </p>
+                        <p>All floats are currently limited to 1/8 increments 
+                          due to network packing of data. This means if you enter 
+                          a value of .2, it will be truncated to .125. For best 
+                          results, enter all floats as multiples of 1/8.</p>
+                        <p>Particle systems can have a big affect on frame rate, 
+                          but don't be afraid to try out systems with tons of 
+                          particles. Experiment and see what actually affects 
+                          your frame rate, you'll probably be surprised it isn't 
+                          what you think. Size, drawing type, number of particles 
+                          and collision all affect frame rate to some extent.</p>
+                        <div align="center"> 
+                          <table width="90%" border="0" cellspacing="1" cellpadding="1">
+                            <tr> 
+                              <td><b>Name</b> - Target name that can be triggered 
+                                with a button or switch. Triggering it will toggle 
+                                it on and off, like a light.</td>
+                            </tr>
+                            <tr> 
+                              <td> 
+                                <p><b>Generation entity (invisible)</b> - This 
+                                  is the name of the entity that is particles 
+                                  will be generated inside. This will generally 
+                                  be a func_illusionary with render_mode additive 
+                                  and and FX amount of 0 (so it's invisible) but 
+                                  it can be any entity you want. The type of shape 
+                                  that the particles will be generated in is specified 
+                                  by the next parameter, &quot;Generation shape&quot;, 
+                                  not only by the shape of the brush! Furthermore, 
+                                  the generation shape used will be the <b>axis-aligned</b> 
+                                  version of this entity, so rotating this shape 
+                                  will have no effect. This is will be expanded 
+                                  to use the actual shape of the entity if necessary 
+                                  (but that's a lot of work).</p>
+                                <p>If no generation entity is specified, the point 
+                                  where the <b>env_custom_particles </b>is place 
+                                  is where particles will be generated from (I 
+                                  think, not sure if this is tested!)</p>
+                              </td>
+                            </tr>
+                            <tr> 
+                              <td> 
+                                <p><b>Generation shape</b> - This can be one of 
+                                  the following shapes Point, Box, Sphere or Blob. 
+                                  In all cases, the generation shape is centered 
+                                  at the the &quot;Generation Entity&quot;'s center.</p>
+                                <p>If Point is chosen, the center of the generation 
+                                  entity is used to as a starting location for 
+                                  newborn particles. </p>
+                                <p>If &quot;Box&quot; is chosen, then the axis-aligned 
+                                  box defined by the Generation Entity is used. 
+                                  For each new particle, a random point within 
+                                  this box is used for the starting location. 
+                                </p>
+                                <p>If Sphere is chosen, a sphere with a radius 
+                                  equal to the x-dimension of the Generation Entity 
+                                  is used. </p>
+                                <p>If Blob is used, the blob's parameters are 
+                                  read from the &quot;Generation Shape Parameter&quot; 
+                                  field. Blob is very useful for generating particles 
+                                  in an organic and versatile fashion. </p>
+                                <p>&nbsp;</p>
+                              </td>
+                            </tr>
+                            <tr> 
+                              <td><b>Particle sprite</b> - Browse to the sprite 
+                                that will be drawn for each particle. Only textured 
+                                sprites are supported. Generally the best type 
+                                of sprite will be additive sprites, but any can 
+                                be used.</td>
+                            </tr>
+                            <tr> 
+                              <td><b>Animation frames in sprite</b> - This field 
+                                lets each particle be animated. To have a sprite 
+                                animate, make sure the &quot;Particle Sprite&quot; 
+                                has multiple frames of animation, then enter the 
+                                number of frames to use here. If a sprite has 
+                                10 frames in it, any number up to 10 could be 
+                                entered. This field can only be used with particles 
+                                that don't live forever, i.e., Particle Lifetime 
+                                (not Particle System Lifetime) has to be set to 
+                                some number above 0. The sprite will animate evenly 
+                                over it's life, so it will play the number of 
+                                frames entered in this box over its life. </td>
+                            </tr>
+                            <tr> 
+                              <td> 
+                                <p><b>Generation shape parameter</b> - This is 
+                                  an extra parameter that is only used when the 
+                                  generation shape is specified as &quot;Sphere&quot; 
+                                  or &quot;Blob&quot;.</p>
+                                <p>Sphere - radius 1 is the axis-aligned x-width 
+                                  of the generation entity created, this parameter 
+                                  is radius 2. Particles are generated between 
+                                  radius1 and radius 2, around the center point 
+                                  of the generation entity. This generates particles 
+                                  in the shape of a hollow ball.</p>
+                                <p>Blob - The center of the generation entity 
+                                  is called P. This parameter is called alpha. 
+                                  Blob generates points such that the point P 
+                                  is the center of a normal probability density 
+                                  of standard deviation alpha. The density is 
+                                  radially symmetrical. The blob domain allows 
+                                  for some very natural-looking effects because 
+                                  there is no sharp, artificial-looking boundary 
+                                  at the edge of the generation entity.</p>
+                              </td>
+                            </tr>
+                            <tr> 
+                              <td><b>Maximum particles </b>- This is the maximum 
+                                number of particles that this particle system 
+                                can have at any given time. If it has this many 
+                                particles, no more will be generated until if 
+                                and when one of it's particles dies. This takes 
+                                priority the &quot;Generate Rate&quot; below.</td>
+                            </tr>
+                            <tr> 
+                              <td><b>Generation rate (particles/second) </b>- 
+                                This is how many particles per second will be 
+                                generated per second. The system will stop generating 
+                                particles if the number entered in &quot;Maximum 
+                                Particles&quot; is reached.</td>
+                            </tr>
+                            <tr> 
+                              <td><b>Particle size</b> - This is a somewhat arbitrary 
+                                size value that is used when drawing each particle. 
+                                A big speck is around size 5, your average smoke 
+                                particle might be around 15. Experiment. A negative 
+                                value would probably be very bad.</td>
+                            </tr>
+                            <tr> 
+                              <td><b>Particle system lifetime</b> - How long the 
+                                particle system generates particles in seconds. 
+                                If -1 is specified, the system will never die 
+                                and will generate particles forever. Once a particle 
+                                system dies, it's particles will still live on 
+                                until they die on their own, the particle system 
+                                will just stop generating new particles</td>
+                            </tr>
+                            <tr> 
+                              <td><b>Particle lifetime </b>- A particle lives 
+                                this long, in seconds. Once this time runs out, 
+                                the particle will die and no longer be drawn. 
+                                Specifying a value of -1 means the particle will 
+                                live forever.</td>
+                            </tr>
+                            <tr> 
+                              <td> 
+                                <p><b>Starting velocity shape</b> - This can be 
+                                  a &quot;Point&quot;, &quot;Box&quot;, &quot;Sphere&quot; 
+                                  or &quot;Blob&quot;.</p>
+                                <p>Point - Particles are generated with a fixed 
+                                  starting velocity equal to v0, v1, v2 (see next 
+                                  parameter).</p>
+                                <p>Box - Particles are generated with a random 
+                                  starting velocity in the range v0,v1,v2 to v3,v4,v5. 
+                                  You can think of v0,v2,v3 as the negative corner 
+                                  of a box around the origin and v3,v4,v5 as the 
+                                  costive corner of a box around the origin. To 
+                                  generate particles with a starting velocity 
+                                  between -.5,-.5,-.5 and 1,1,1, the params below 
+                                  would be -.5,-.5,-5,1,1,1,0,0. To generate particles 
+                                  with upwards velocity but spraying out to the 
+                                  sides (like a fountain), you could try something 
+                                  like 50,-10,-10,80,10,10,0,0.</p>
+                                <p>Sphere - v0,v1,v2 is the center point, v3,v4 
+                                  are radius 1 and radius 2. Particles should 
+                                  be generated with a velocity between v3 and 
+                                  v4, randomly distributed in a circle. I believe 
+                                  v0,v1,v2 are ignored or write and ask me. :)</p>
+                                <p>Blob - v0,v1,v2 is the center point, v3 is 
+                                  the standard deviation. See generation shape 
+                                  parameter documentation for Blob for more info. 
+                                  I believe v0,v1,v2 are ignored.</p>
+                              </td>
+                            </tr>
+                            <tr> 
+                              <td> 
+                                <p><b>Starting velocity parameters</b> - Seven 
+                                  floating point values, all comma-delimited. 
+                                  Make sure there aren't any spaces there and 
+                                  that the format stays exactly the same or it 
+                                  may not work. :( See Starting Velocity Shape 
+                                  above to see how the numbers are interpreted..</p>
+                                <p>v0,v1,v2,v3,v4,v5,v6,v7</p>
+                              </td>
+                            </tr>
+                            <tr> 
+                              <td><b>Scale particle over time</b> - If this value 
+                                is different than 1.0, the particle will scale 
+                                to this value towards the end of its life. For 
+                                example if you wanted a smoke particle to grow 
+                                to three times its size (to dissipate) you could 
+                                enter three here and it would gradually grow. 
+                                This field will only have an effect if particle 
+                                lifetime is something than -1 (i.e., the particle 
+                                can't live forever).</td>
+                            </tr>
+                            <tr> 
+                              <td><b>Max alpha</b> - Enter a value from 0 to 1. 
+                                If other than 1, generated particles will draw 
+                                with a max alpha of this value. If you want a 
+                                very subtle and faint particle effect, you could 
+                                enter a value of maybe .4 here. The default is 
+                                1.</td>
+                            </tr>
+                            <tr> 
+                              <td><b>Render mode</b> - There are five blend modes 
+                                that particles can be drawn in. The Half-life 
+                                SDK seems to be broken however so I would only 
+                                use the most useful one for now, additive mode. 
+                              </td>
+                            </tr>
+                            <tr> 
+                              <td><b>Particle system to generate on collision</b> 
+                                - This is a powerful feature. If you type the 
+                                name of any other particle system name here and 
+                                check the &quot;collide&quot; flag, than particles 
+                                that hit the world or a player will die and generate 
+                                a new <b>particle system</b> at that point. Rain 
+                                drop splatters are simulated using this method 
+                                in one of the example maps below. For best results, 
+                                use particle systems with a generation shape of 
+                                &quot;Point&quot; here, as the point will represent 
+                                the point of contact.</td>
+                            </tr>
+                            <tr> 
+                              <td> 
+                                <div align="center"> 
+                                  <table width="100%" border="0" cellspacing="5" cellpadding="5">
+                                    <tr> 
+                                      <td> 
+                                        <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                                          <tr bgcolor="#666600"> 
+                                            <td><font color="#FFFFFF"><b>Flags</b></font></td>
+                                          </tr>
+                                        </table>
+                                      </td>
+                                    </tr>
+                                    <tr> 
+                                      <td> 
+                                        <div align="center"> 
+                                          <table width="90%" border="0" cellspacing="1" cellpadding="1">
+                                            <tr> 
+                                              <td><b>Start on </b>- Checking this 
+                                                means the system starts on and 
+                                                doesn't have to be triggered initially. 
+                                              </td>
+                                            </tr>
+                                            <tr> 
+                                              <td><b>Particle density </b>- This 
+                                                option is very useful for particle 
+                                                systems with a large generation 
+                                                shape. If checked, this means 
+                                                that particle rate (above) will 
+                                                be interpreted as a factor times 
+                                                the volume of the generation shape, 
+                                                not actual particles per second. 
+                                                This means you could make a snow 
+                                                storm over an area and then just 
+                                                make the generation area bigger 
+                                                and the snow would fall with the 
+                                                same density. It calculate the 
+                                                number of particles to generate 
+                                                per second as the (generation 
+                                                shape width/100) * (generation 
+                                                shape height/100) * (generation 
+                                                shape height/100)*generation rate. 
+                                              </td>
+                                            </tr>
+                                            <tr> 
+                                              <td><b>Fade in </b>- If this is 
+                                                checked, and particle lifetime 
+                                                (not particle system lifetime) 
+                                                is finite, then the particle will 
+                                                fade in gradually over it's lifetime. 
+                                                If max alpha is set, it will fade 
+                                                from 0 to max alpha, otherwise 
+                                                it will fade from 0 to 1.</td>
+                                            </tr>
+                                            <tr> 
+                                              <td><b>Fade out </b>- If this is 
+                                                checked, and particle lifetime 
+                                                (not particle system lifetime) 
+                                                is finite, then the particle will 
+                                                fade out gradually over it's lifetime. 
+                                                If max alpha is set, it will fade 
+                                                from max alpha to 0, otherwise 
+                                                it will fade from 1 to 0. If both 
+                                                fade in and fade out are checked, 
+                                                it will fade from 0 to max alpha 
+                                                then back to 0. </td>
+                                            </tr>
+                                            <tr> 
+                                              <td><b>Use world gravity</b> - Checking 
+                                                this applies the world gravity 
+                                                to each particle. </td>
+                                            </tr>
+                                            <tr> 
+                                              <td><b>Tris, not quads </b>- Using 
+                                                this option draws all particles 
+                                                as triangles instead of squads 
+                                                (pointy side up). The texture 
+                                                coordinates are &lt;0,1&gt;, &lt;.5,0&gt;, 
+                                                &lt;1,1&gt; (starting at bottom 
+                                                left, going clockwise). Quads 
+                                                use texture coordinates of &lt;0,1&gt;, 
+                                                &lt;0,0&gt;, &lt;1,0&gt;, &lt;1,1&gt;. 
+                                                This will roughly halve the performance 
+                                                hit of drawing the particle system 
+                                                but may not look good for all 
+                                                systems.</td>
+                                            </tr>
+                                            <tr> 
+                                              <td><b>Minimize edges </b>- This 
+                                                parameter doesn't work quite right 
+                                                yet but it attempts to look at 
+                                                particle size and change the generation 
+                                                area so particles aren't generated 
+                                                so as to leave their generation 
+                                                area. They could still move outside 
+                                                their area, but this could help 
+                                                reduce lines when particles z-buffer 
+                                                with world.</td>
+                                            </tr>
+                                            <tr> 
+                                              <td><b>Constrain pitch </b>- Checking 
+                                                this means particles won't rotate 
+                                                up or down to face the player. 
+                                                This can look better for some 
+                                                types of &quot;falling&quot; effects.</td>
+                                            </tr>
+                                            <tr> 
+                                              <td><b>Collide</b> - Checking this 
+                                                means the particles will collide 
+                                                with the world. After colliding, 
+                                                they will disappear and if a collision 
+                                                particle system is specified, 
+                                                they will generate that at the 
+                                                point of collision. Using this 
+                                                could have big performance implications, 
+                                                so be sure to notice and tweak 
+                                                accordingly.</td>
+                                            </tr>
+                                          </table>
+                                        </div>
+                                      </td>
+                                    </tr>
+                                  </table>
+                                </div>
+                              </td>
+                            </tr>
+                            <tr> 
+                              <td>&nbsp;</td>
+                            </tr>
+                          </table>
+                        </div>
+                        <p>&nbsp;</p>
+                        <div align="left"> </div>
+                        <p>&nbsp;</p>
+                        <p align="right">&nbsp;</p>
+                      </td>
+                    </tr>
+                  </table>
+                  <table width="100%" border="1" cellspacing="0" cellpadding="5">
+                    <tr> 
+                      <td colspan="2" bgcolor="#666600"><font color="#FFFFFF"><b>Tweaking 
+                        your particle systems </b></font></td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <p>There are so many parameters, how do you make your 
+                          particle system look good? You can tweak your particles 
+                          in real-time, inside the game! Here's how. </p>
+                        <p>1. Create your custom particle system in Worldcraft. 
+                          You may need to set up temporary entities to make it 
+                          easy to repeatedly trigger your particle system. Compile 
+                          the map, then test out your map inside Natural Selection.</p>
+                        <p>2. Walk over to the particle system you want to tweak 
+                          so you can see it.</p>
+                        <p>3. Bring up the console (hit the ~ key), type &quot;<b>listps</b>&quot;, 
+                          then hit enter. It will show you a list of all the particle 
+                          systems that the game knows about right now. Most of 
+                          these are used by the game itself, but the custom ones 
+                          that your map created should be listed at the bottom. 
+                          Each particle system should have the name you assigned 
+                          in Worldcraft. Find the name of the particle system 
+                          you want to tweak.</p>
+                        <p>4. While still in the console, type &quot;<b>editps 
+                          &lt;particle system name&gt;</b>&quot; where the second 
+                          parameter is the name of the particle system to tweak 
+                          (without the &lt;&gt; or &quot;'s). Close the console 
+                          by hitting ~ again, then you should see a message that 
+                          says something like &quot;found particle system, hit 
+                          F4 to edit&quot;. If you don't see this, or you see 
+                          an error message, try again, but make sure you type 
+                          it exactly as shown by the <b>listps</b> command.</p>
+                        <p>5. Now hit F4. You now have access to most of the parameters 
+                          specified in your <b>env_custom_particles </b>entity, 
+                          but you can change them in real-time! The label next 
+                          to each slider always shows you the current value of 
+                          that slider. Go crazy and tweak your system while it's 
+                          playing, occasionally hitting F4 to temporarily hide 
+                          the editing controls so you can walk around and see 
+                          everything from other angles. When you're happy with 
+                          your parameters, write down the values you changed, 
+                          or take a screenshot. Now go back to Worldcraft and 
+                          enter these values back into your <b>env_custom_particles</b> 
+                          entity and you're done!</p>
+                        <p>Note. Whenever you change the &quot;max particles&quot; 
+                          parameter, all the active particles are immediately 
+                          deleted. This is a technical limitation, not a bug. 
+                          Typically you'll just have to wait a couple seconds 
+                          after changing this before the particle system is back 
+                          to normal.</p>
+                      </td>
+                      <td bgcolor="#000000"> 
+                        <div align="center"><img src="devshots/particle-edit.jpg" width="400" height="300"></div>
+                      </td>
+                    </tr>
+                  </table>
+                </div>
+              </td>
+            </tr>
+            <tr> 
+              <td> 
+                <div align="center"> 
+                  <table width="85%" border="1" cellspacing="0" cellpadding="2">
+                    <tr> 
+                      <td> 
+                        <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                          <tr bgcolor="#666600"> 
+                            <td><font color="#FFFFFF"><b>Ready room entities</b></font></td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="100%" border="1" cellspacing="0" cellpadding="2">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                                <tr bgcolor="#666600"> 
+                                  <td><font color="#FFFFFF"><b>info_player_start</b></font></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                          <tr> 
+                            <td> These are the spawn points for the ready room. 
+                              All players use this, because they haven't chosen 
+                              a side yet. Make sure to have at least ten of these 
+                              in the ready room. See the above section on the 
+                              ready room for crucial information.</td>
+                          </tr>
+                        </table>
+                        <table width="100%" border="1" cellspacing="0" cellpadding="2">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                                <tr bgcolor="#666600"> 
+                                  <td><font color="#FFFFFF"><b>info_join_teamone</b></font></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                          <tr> 
+                            <td> When a player touches this, he will join the 
+                              marine team, if possible. If the team is full or 
+                              the game can't be joined, he will observe that team, 
+                              and join when he can. This is an invisible entity 
+                              that should be placed inside the &quot;Join marines&quot; 
+                              doorway in the ready room. </td>
+                          </tr>
+                        </table>
+                        <table width="100%" border="1" cellspacing="0" cellpadding="2">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                                <tr bgcolor="#666600"> 
+                                  <td><font color="#FFFFFF"><b>Info_join_teamtwo</b></font></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                          <tr> 
+                            <td> When a player touches this, he will join the 
+                              alien team, if possible. If the team is full or 
+                              the game can't be joined, he will observe that team, 
+                              and join when he can. This is an invisible entity 
+                              that should be placed inside the &quot;Join aliens&quot; 
+                              doorway in the ready room. </td>
+                          </tr>
+                        </table>
+                        <table width="100%" border="1" cellspacing="0" cellpadding="2">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                                <tr bgcolor="#666600"> 
+                                  <td><font color="#FFFFFF"><b>info_join_autoassign</b></font></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                          <tr> 
+                            <td> When a player touches this, he will join the 
+                              team with the fewest number of players, if possible. 
+                              If the teams have the same number of players, he 
+                              will join a random team. If the game is full or 
+                              the game can't be joined, he will observe that team, 
+                              and join when he can. This is an invisible entity 
+                              that should be placed inside the &quot;Auto-assign&quot; 
+                              doorway in the ready room. </td>
+                          </tr>
+                        </table>
+                        <table width="100%" border="1" cellspacing="0" cellpadding="2">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                                <tr bgcolor="#666600"> 
+                                  <td><font color="#FFFFFF"><b>info_spectate</b></font></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                          <tr> 
+                            <td> When a player touches this, he will get a free-roaming 
+                              spectator view of the game in progress. He is not 
+                              allowed to join either side for the game in progress, 
+                              no matter what, as he has now had the opportunity 
+                              to see the whole map. When the next game starts, 
+                              he will spawn back in the ready room and be allowed 
+                              to join a team manually.</td>
+                          </tr>
+                        </table>
+                        <table width="100%" border="1" cellspacing="0" cellpadding="2">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                                <tr bgcolor="#666600"> 
+                                  <td><font color="#FFFFFF"><b><i>info_leave_game 
+                                    (not implemented)</i></b></font></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                          <tr> 
+                            <td> When a player touches this, he will leave the 
+                              game in progress and go back to the ready room. 
+                              One of these should be placed near each base and 
+                              perhaps a few others around the map for ease of 
+                              use. They should be placed in highly visible place 
+                              and be clearly marked but should only be able to 
+                              be used deliberately. This is currently unimplemented 
+                              and may never be.</td>
+                          </tr>
+                        </table>
+                        <table width="100%" border="1" cellspacing="0" cellpadding="2">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                                <tr bgcolor="#666600"> 
+                                  <td><font color="#FFFFFF"><b><i>info_leave_server 
+                                    (not implemented)</i></b></font></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                          <tr> 
+                            <td> This is placed in the ready room, away from from 
+                              the join team doorways. Touching this will disconnect 
+                              from the server. This is currently unimplemented 
+                              and may never be.</td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+                  <p>&nbsp;</p>
+                  <table width="85%" border="1" cellspacing="0" cellpadding="2">
+                    <tr> 
+                      <td> 
+                        <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                          <tr bgcolor="#666600"> 
+                            <td><font color="#FFFFFF"><b>Main game entities</b></font></td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <table width="100%" border="1" cellspacing="0" cellpadding="2">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                                <tr bgcolor="#666600"> 
+                                  <td><font color="#FFFFFF"><b>hive</b></font></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                          <tr> 
+                            <td> 
+                              <p>This entity specifies where a random alien hive 
+                                could spawn in. Most maps will want at least three 
+                                of these, with four probably being the best number. 
+                                One of these hives is chosen at random for the 
+                                first hive, then the <b>info_teamtwo_start</b> 
+                                entities around it are used to spawning in players. 
+                                Later in the game, more hives will come online 
+                                at the other hive locations. Choose a model to 
+                                specify what the hive looks like. </p>
+                              <div align="center"> 
+                                <table width="90%" border="0" cellspacing="1" cellpadding="1">
+                                  <tr> 
+                                    <td> 
+                                      <p><b>Model</b>: This is the model that 
+                                        is displayed for the hive. There is no 
+                                        artwork for it yet, I'm using &quot;models/hive.mdl&quot; 
+                                        for now. The model is only drawn when 
+                                        the hive comes online. </p>
+                                    </td>
+                                  </tr>
+                                  <tr> 
+                                    <td><b>Max dist to nearby spawn points:</b> 
+                                      When an alien spawns at this hive, the game 
+                                      randomly selects a spawn point within this 
+                                      range of the hive. In this way, the map 
+                                      creator can place alien spawns how he likes 
+                                      without worrying that aliens spawning at 
+                                      the wrong places. It allows maximum flexibility, 
+                                      so two hives could be very near each other, 
+                                      but separated from a wall, and the spawns 
+                                      could still be made to function correctly.</td>
+                                  </tr>
+                                  <tr> 
+                                    <td><b>Hit points</b>: This is how much damage 
+                                      a hive can take before it dies. When all 
+                                      of an alien team's hives are destroyed, 
+                                      they can no longer respawn or get points. 
+                                      The alien team could still win though...the 
+                                      team that outlives the other is the winner.</td>
+                                  </tr>
+                                  <tr> 
+                                    <td><b>Armor value</b>: How much armor the 
+                                      hive has. Armor lessens the damage the hive 
+                                      takes, the same way armor protects the player 
+                                      (and monsters) in Half-life.</td>
+                                  </tr>
+                                </table>
+                              </div>
+                              <p>&nbsp; </p>
+                            </td>
+                          </tr>
+                        </table>
+                        <table width="100%" border="1" cellspacing="0" cellpadding="2">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                                <tr bgcolor="#666600"> 
+                                  <td><font color="#FFFFFF"><b>info_teamtwo_start</b></font></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                          <tr> 
+                            <td> At least ten of these should be placed in around 
+                              each each <b>hive</b> entity. When a player joins 
+                              the alien team, or respawns after death as an alien, 
+                              he comes back to one of these. </td>
+                          </tr>
+                        </table>
+                        <table width="100%" border="1" cellspacing="0" cellpadding="2">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                                <tr bgcolor="#666600"> 
+                                  <td><font color="#FFFFFF"><b><i>info_dropship 
+                                    (not implemented)</i></b></font></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                          <tr> 
+                            <td> This will somehow define the safe area for marines 
+                              and the aliens may not be allowed in this zone, 
+                              or it may have other special properties. There should 
+                              be a group of info_teamone_start entities placed 
+                              nearby or within this zone.</td>
+                          </tr>
+                        </table>
+                        <table width="100%" border="1" cellspacing="0" cellpadding="2">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                                <tr bgcolor="#666600"> 
+                                  <td><font color="#FFFFFF"><b>info_teamone_start</b></font></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                          <tr> 
+                            <td> This is a spawn point that's used when a player 
+                              joins the marine team or when a marine respawns 
+                              after dying or being brought in as a reinforcement.</td>
+                          </tr>
+                        </table>
+                        <table width="100%" border="1" cellspacing="0" cellpadding="2">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                                <tr bgcolor="#666600"> 
+                                  <td><font color="#FFFFFF"><b>func_seethrough</b></font></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                          <tr> 
+                            <td>(classified for now, coming soon)</td>
+                          </tr>
+                        </table>
+                        <table width="100%" border="1" cellspacing="0" cellpadding="2">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                                <tr bgcolor="#666600"> 
+                                  <td><font color="#FFFFFF"><b>func_viewheight</b></font></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                          <tr> 
+                            <td> (classified for now, coming soon)</td>
+                          </tr>
+                        </table>
+                        <table width="100%" border="1" cellspacing="0" cellpadding="2">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                                <tr bgcolor="#666600"> 
+                                  <td><font color="#FFFFFF"><b>func_waypoint</b></font></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                          <tr> 
+                            <td> (classified for now, coming soon)</td>
+                          </tr>
+                        </table>
+                        <table width="100%" border="1" cellspacing="0" cellpadding="2">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                                <tr bgcolor="#666600"> 
+                                  <td><font color="#FFFFFF"><b>info_mapextents</b></font></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                          <tr> 
+                            <td>(classified for now, coming soon) </td>
+                          </tr>
+                        </table>
+                        <table width="100%" border="1" cellspacing="0" cellpadding="2">
+                          <tr> 
+                            <td> 
+                              <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                                <tr bgcolor="#666600"> 
+                                  <td><font color="#FFFFFF"><b>func_weldable</b></font></td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                          <tr> 
+                            <td> 
+                              <p>This entity lets you create areas of the map 
+                                that can be welded shut or cut through, by the 
+                                marine's use of the welder. Create the geometry 
+                                as it is completely opened, then create a brush 
+                                that represents the part to be welded. For a grating 
+                                to cut through, this might be a square piece of 
+                                grating. For a ventilation shaft that could be 
+                                closed off, this might be a metal plate or something 
+                                that could've been created out of nearby materials. 
+                                Place the brush in place so the area is &quot;closed&quot;, 
+                                then create an <b>func_weldable</b> out of it. 
+                                Note that <b>func_weldables</b> must be enabled 
+                                before they can be welded on. This means a weldable 
+                                could be triggered to a door state, so the door 
+                                must be closed before welding could commence. 
+                                Many weldable entities will use the &quot;start 
+                                enabled&quot; flag. If you can't weld your entity, 
+                                make sure this is set first.</p>
+                              <div align="center"> 
+                                <table width="90%" border="0" cellspacing="0" cellpadding="2">
+                                  <tr> 
+                                    <td><b>Health </b>- This is how many hit points 
+                                      the weld has after it is closed. This is 
+                                      only valid for closable welds, not openable 
+                                      ones (see the flags below). Set to -1 to 
+                                      create an entity that once welded, is impervious 
+                                      and cannot ever be destroyed.</td>
+                                  </tr>
+                                  <tr> 
+                                    <td><b>Weldable time </b>- This is how many 
+                                      seconds of welding it takes to complete 
+                                      the job. This is either how much time it 
+                                      takes to seal off an area or cut through 
+                                      it, depending what flags are set. Most weld 
+                                      jobs should take upwards of twenty, some 
+                                      quite a bit longer that that.</td>
+                                  </tr>
+                                  <tr> 
+                                    <td><b>Weldable sounds </b>- Currently unimplemented. 
+                                      This may eventually be the file list of 
+                                      sounds that welding this entity produces. 
+                                      Is this worth putting in?</td>
+                                  </tr>
+                                  <tr> 
+                                    <td><b>Start alpha </b>- No longer implemented. 
+                                      Welding used to cause the entity to fade 
+                                      in, but no longer does. This set the beginning 
+                                      alpha, so potential weld jobs were always 
+                                      visible.</td>
+                                  </tr>
+                                  <tr>
+                                    <td> <b>Target to trigger on finish</b> - 
+                                      This trigger will fire when the welding 
+                                      is completed. This can be used for cool 
+                                      and complex visuals such as girders falling, 
+                                      sparks and sounds triggering, doors falling 
+                                      open, etc. Good idea, Hectate!</td>
+                                  </tr>
+                                  <tr> 
+                                    <td><b>Material </b>- This is the type of 
+                                      material the welding entity looks like it 
+                                      is made of. When cutting through, this is 
+                                      the type of material chunks will break and 
+                                      fall. When applied to a closable weldable 
+                                      entity, this will be used when and if the 
+                                      welded entity is destroyed by damage (see 
+                                      the health field above). Either way, chunks 
+                                      are made out of the geometry and sounds 
+                                      are played, much like func_breakables.</td>
+                                  </tr>
+                                  <tr> 
+                                    <td> 
+                                      <div align="center"> 
+                                        <table width="90%" border="0" cellspacing="1" cellpadding="1">
+                                          <tr> 
+                                            <td><b>Flags</b></td>
+                                          </tr>
+                                          <tr> 
+                                            <td><b>Start enabled </b>- Means the 
+                                              entity doesn't have to be &quot;switched 
+                                              on&quot; before the marines can 
+                                              start welding it.</td>
+                                          </tr>
+                                          <tr> 
+                                            <td><b>Weld opens, not closes </b>- 
+                                              Check this to create a weldable 
+                                              entity that is cut open instead 
+                                              of shut. When this is checked, the 
+                                              entity will start off visible and 
+                                              will disappear and break into pieces 
+                                              when welding finishes.</td>
+                                          </tr>
+                                          <tr> 
+                                            <td><b>Always draw, don't fade </b>- 
+                                              No longer implemented. This used 
+                                              to disable fading as construction 
+                                              occurred. </td>
+                                          </tr>
+                                        </table>
+                                      </div>
+                                    </td>
+                                  </tr>
+                                </table>
+                              </div>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+                  <p>&nbsp;</p><table width="85%" border="1" cellspacing="0" cellpadding="2">
+                    <tr> 
+                      <td> 
+                        <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                          <tr bgcolor="#666600"> 
+                            <td><font color="#FFFFFF"><b>Sound entities</b></font></td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <div align="center"> 
+                          <p align="left">&nbsp; </p>
+                          <table width="100%" border="1" cellspacing="0" cellpadding="2">
+                            <tr> 
+                              <td> 
+                                <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                                  <tr bgcolor="#666600"> 
+                                    <td><font color="#FFFFFF"><b>target_mp3audio</b></font></td>
+                                  </tr>
+                                </table>
+                              </td>
+                            </tr>
+                            <tr> 
+                              <td> 
+                                <div align="center">
+                                  <p align="left">This entity lets you trigger 
+                                    .mp3 playback in your maps. This can be used 
+                                    for subtle background creaking and groaning, 
+                                    the hum of space, a dash of music, simulated 
+                                    gunfire in the next room, etc. This entity 
+                                    is useful because it allows very high-quality 
+                                    sound in maps, for smooth clean (almost inaudible!) 
+                                    bass, and static-free sound playback. The 
+                                    compression of .mp3 files also means you can 
+                                    include more and longer sound samples, with 
+                                    shorter downloads than .wav files. This entity 
+                                    is fully triggerable, so maps can turn sounds 
+                                    on and off and work with all sorts of triggers. 
+                                  </p>
+                                  <table width="90%" border="0" cellspacing="0" cellpadding="2">
+                                    <tr> 
+                                      <td><b>Sound name </b>- This is the relative 
+                                        path name to the .mp3 file to that this 
+                                        entity plays. By convention, .mp3s should 
+                                        be placed in the sound directory and should 
+                                        be named &quot;mapname-sound.mp3&quot;. 
+                                        This will help prevent file name collisions 
+                                        and files from being overwritten. For 
+                                        example, if your map is called ns_derelict, 
+                                        this might be: &quot;sound/ns_derelict-gunfire.mp3&quot;, 
+                                        &quot;sound/sound/ns_derelict-shipcreaking.mp3&quot;. 
+                                        This might change in the future to force 
+                                        this convention. MP3s can be any format, 
+                                        any size and can be stereo. MP3s are streamed, 
+                                        so it doesn't really matter how big it 
+                                        is, less than 200k will be loaded at any 
+                                        given time.</td>
+                                    </tr>
+                                    <tr> 
+                                      <td><b>Volume -</b>The base volume to play 
+                                        the sound. Valid values are from 0 to 
+                                        255, with 255 being full volume. The actual 
+                                        volume a player hears the sound will be 
+                                        modified by the <b>fadedistance</b> parameter. 
+                                        When a player is very close to the <b>target_mp3audio</b> 
+                                        entity, the sound will play at this volume.</td>
+                                    </tr>
+                                    <tr>
+                                      <td><b>Fade distance (inaudible here) - 
+                                        </b>This is the distance in world units 
+                                        at which the sound becomes totally inaudible. 
+                                        As the player moves away from the entity, 
+                                        the sound fades out. </td>
+                                    </tr>
+                                    <tr> 
+                                      <td> 
+                                        <div align="left"> 
+                                          <table width="90%" border="0" cellspacing="1" cellpadding="1">
+                                            <tr> 
+                                              <td><b>Flags</b></td>
+                                            </tr>
+                                            <tr> 
+                                              <td><b>Don't fade volume</b>- The 
+                                                sound will ignore the player's 
+                                                position and fade distance and 
+                                                always play at the same volume.</td>
+                                            </tr>
+                                            <tr> 
+                                              <td><b>Looping </b>- The .mp3 will 
+                                                loop until the entity is triggered 
+                                                off. </td>
+                                            </tr>
+                                          </table>
+                                        </div>
+                                      </td>
+                                    </tr>
+                                  </table>
+                                </div>
+                                <p>&nbsp;</p>
+                              </td>
+                            </tr>
+                          </table>
+                          <table width="100%" border="1" cellspacing="0" cellpadding="2">
+                            <tr> 
+                              <td> 
+                                <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                                  <tr bgcolor="#666600"> 
+                                    <td><font color="#FFFFFF"><b>Marine buildings</b></font></td>
+                                  </tr>
+                                </table>
+                              </td>
+                            </tr>
+                            <tr> 
+                              <td> 
+                                <div align="center"> 
+                                  <p align="left">Any building that normally need 
+                                    to be built by players start fully contructed. 
+                                    TODO: Add a team designator if allowing marines 
+                                    vs. marines or aliens vs. aliens.</p>
+                                  <table width="90%" border="0" cellspacing="0" cellpadding="2">
+                                    <tr> 
+                                      <td><b>turret - </b></td>
+                                    </tr>
+                                    <tr> 
+                                      <td><b>siegeturret - </b></td>
+                                    </tr>
+                                    <tr> 
+                                      <td><b>phasegate - </b></td>
+                                    </tr>
+                                    <tr> 
+                                      <td><b>cameratower - </b></td>
+                                    </tr>
+                                  </table>
+                                </div>
+                                <p>&nbsp;</p>
+                              </td>
+                            </tr>
+                          </table>
+                          <p>&nbsp;</p>
+                        </div>
+                      </td>
+                    </tr>
+                  </table>
+                  <p>&nbsp;</p>
+                  <table width="85%" border="1" cellspacing="0" cellpadding="2">
+                    <tr> 
+                      <td> 
+                        <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                          <tr bgcolor="#666600"> 
+                            <td><font color="#FFFFFF"><b>Equipment</b></font></td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr> 
+                      <td> 
+                        <div align="center"> 
+                          <p align="left">These entities won't be used in most 
+                            Natural Selection maps, but they can be used for unique 
+                            scenarios or for testing or training maps. Weapons, 
+                            building and equipment are normally purchased by marine 
+                            players during the course of the game. Use these entities 
+                            to place &quot;free&quot; stuff around the level. 
+                            Each weapon starts with the default amount of ammo. 
+                          </p>
+                          <table width="100%" border="1" cellspacing="0" cellpadding="2">
+                            <tr> 
+                              <td> 
+                                <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                                  <tr bgcolor="#666600"> 
+                                    <td><font color="#FFFFFF"><b>Marine weapons</b></font></td>
+                                  </tr>
+                                </table>
+                              </td>
+                            </tr>
+                            <tr> 
+                              <td> 
+                                <div align="center"> 
+                                  <p>&nbsp;</p>
+                                  <table width="90%" border="0" cellspacing="0" cellpadding="2">
+                                    <tr> 
+                                      <td><b>item_machinegun </b>- </td>
+                                    </tr>
+                                    <tr> 
+                                      <td><b>item_shotgun - </b></td>
+                                    </tr>
+                                    <tr> 
+                                      <td><b>item_heavymachinegun - </b></td>
+                                    </tr>
+                                    <tr> 
+                                      <td><b>item_grenadegun - </b></td>
+                                    </tr>
+                                    <tr> 
+                                      <td><b>item_nukegun - </b></td>
+                                    </tr>
+                                    <tr> 
+                                      <td><b>item_flamegun - </b></td>
+                                    </tr>
+                                    <tr> 
+                                      <td><b>item_genericammo - </b></td>
+                                    </tr>
+                                  </table>
+                                </div>
+                                <p>&nbsp;</p>
+                              </td>
+                            </tr>
+                          </table>
+                          <table width="100%" border="1" cellspacing="0" cellpadding="2">
+                            <tr> 
+                              <td> 
+                                <table width="100%" border="0" cellspacing="0" cellpadding="5">
+                                  <tr bgcolor="#666600"> 
+                                    <td><font color="#FFFFFF"><b>Marine buildings</b></font></td>
+                                  </tr>
+                                </table>
+                              </td>
+                            </tr>
+                            <tr> 
+                              <td> 
+                                <div align="center"> 
+                                  <p align="left">Any building that normally need 
+                                    to be built by players start fully contructed. 
+                                    TODO: Add a team designator if allowing marines 
+                                    vs. marines or aliens vs. aliens.</p>
+                                  <table width="90%" border="0" cellspacing="0" cellpadding="2">
+                                    <tr> 
+                                      <td><b>turret - </b></td>
+                                    </tr>
+                                    <tr> 
+                                      <td><b>siegeturret - </b></td>
+                                    </tr>
+                                    <tr> 
+                                      <td><b>phasegate - </b></td>
+                                    </tr>
+                                    <tr> 
+                                      <td><b>cameratower - </b></td>
+                                    </tr>
+                                  </table>
+                                </div>
+                                <p>&nbsp;</p>
+                              </td>
+                            </tr>
+                          </table>
+                          <p>&nbsp;</p>
+                        </div>
+                      </td>
+                    </tr>
+                  </table>
+                  <p align="left"> Coming soon, sample maps showing how to every 
+                    custom entity here.</p>
+                </div>
+              </td>
+            </tr>
+          </table>
+        </div>
+        <p>&nbsp;</p>
+        <p>&nbsp;</p>
+      </td>
+    </tr>
+  </table>
+</div>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp; </p>
+</body>
+</html>
diff --git a/main/source/doc/NS-Voiceovers.doc b/main/source/doc/NS-Voiceovers.doc
new file mode 100644
index 00000000..909ca941
Binary files /dev/null and b/main/source/doc/NS-Voiceovers.doc differ
diff --git a/main/source/doc/PR v11.rtf b/main/source/doc/PR v11.rtf
new file mode 100644
index 00000000..6c5b7a7b
--- /dev/null
+++ b/main/source/doc/PR v11.rtf	
@@ -0,0 +1,151 @@
+{\rtf1\ansi\ansicpg1252\uc1 \deff0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f1\fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Arial;}
+{\f51\froman\fcharset238\fprq2 Times New Roman CE;}{\f52\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f54\froman\fcharset161\fprq2 Times New Roman Greek;}{\f55\froman\fcharset162\fprq2 Times New Roman Tur;}
+{\f56\froman\fcharset186\fprq2 Times New Roman Baltic;}{\f57\fswiss\fcharset238\fprq2 Arial CE;}{\f58\fswiss\fcharset204\fprq2 Arial Cyr;}{\f60\fswiss\fcharset161\fprq2 Arial Greek;}{\f61\fswiss\fcharset162\fprq2 Arial Tur;}
+{\f62\fswiss\fcharset186\fprq2 Arial Baltic;}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;
+\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{\widctlpar\adjustright \fs20\cgrid \snext0 Normal;}{
+\s1\keepn\widctlpar\outlinelevel0\adjustright \b\fs20\cgrid \sbasedon0 \snext0 heading 1;}{\*\cs10 \additive Default Paragraph Font;}{\*\cs15 \additive \ul\cf2 \sbasedon10 Hyperlink;}{\s16\li720\widctlpar\adjustright \fs20\cgrid \sbasedon0 \snext16 
+Body Text 2;}{\s17\widctlpar\adjustright \f1\fs20\cf1\cgrid \sbasedon0 \snext17 Body Text;}{\*\cs18 \additive \ul\cf12 \sbasedon10 FollowedHyperlink;}}{\*\listtable{\list\listtemplateid-1305988540\listsimple{\listlevel\levelnfc0\leveljc0\levelfollow0
+\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\f1\cf2\fbias0 \fi-360\li360\jclisttab\tx360 }{\listname ;}\listid546799346}{\list\listtemplateid1150870258\listsimple{\listlevel\levelnfc23\leveljc0\levelfollow0
+\levelstartat1\levelspace0\levelindent0{\leveltext\'01-;}{\levelnumbers;}\fbias0 \fi-360\li360\jclisttab\tx360 }{\listname ;}\listid1763984926}}{\*\listoverridetable{\listoverride\listid546799346\listoverridecount0\ls1}{\listoverride\listid1763984926
+\listoverridecount0\ls2}}{\info{\author Charles G. Cleveland}{\operator Charles G. Cleveland}{\creatim\yr2003\mo6\dy3\hr12\min40}{\revtim\yr2003\mo6\dy3\hr14\min54}{\version58}{\edmins58}{\nofpages3}{\nofwords897}{\nofchars5118}{\*\company  }
+{\nofcharsws6285}{\vern89}}\margl1440\margr1440 \widowctrl\ftnbj\aenddoc\hyphcaps0\viewkind1\viewscale100 \fet0\sectd \linex0\headery1440\footery1440\sectdefaultcl {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl2
+\pnucltr\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang{\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl6
+\pnlcltr\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang
+{\pntxtb (}{\pntxta )}}\pard\plain \widctlpar\adjustright \fs20\cgrid {\b Overview
+\par }{Version 1.1 of Natural Selection will be the release that starts it on the road to massive clan popularity and is refined enough for more wide appeal for \ldblquote casual\rdblquote 
+ players as well.  This release fixes all the major problems found in previous versions, an
+d will set the stage for larger long-term growth.  In short, the game is now there, we just need a massive splash to get it noticed.  This document will serve as a press release plan, and will be maintained by Charlie, Ned and Bailey.  I technically have 
+final say here, but the only real things I would veto are some type of lurid, hyper-violent or otherwise out of character ad compaigns. :)
+\par 
+\par I want this release to at least double the size of the active NS community.  I think we can do this, but we need a huge PR push to drive people into a frenzy.  I think we can do this through this general approach:
+\par 
+\par {\pntext\pard\plain\fs20\cgrid \hich\af0\dbch\af0\loch\f0 -\tab}}\pard \fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlblt\ilvl0\ls2\pnrnot0\pnstart1\pnindent360\pnhang{\pntxtb -}}\ls2\adjustright {
+Early info for the hard-core players (this has already been done through the Veteran program and the }{\field{\*\fldinst { HYPERLINK "http://www.natural-selection.org/forums/index.php?s=7a595dc67e58bfa9b08fa1084d7b470a&act=SF&f=30" }{{\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90bc200000068007400740070003a002f002f007700770077002e006e00610074007500720061006c002d00730065006c0065006300740069006f006e002e006f00720067002f0066006f00720075006d0073002f006900
+6e006400650078002e007000680070003f0073003d003700610035003900350064006300360037006500350038006200660061003900620030003800660061003100300038003400640037006200340037003000610026006100630074003d0053004600260066003d00330030000000}}}{\fldrslt {\cs15\ul\cf2 
+Beta Information forum}}}{).  Target }{\field{\*\fldinst { HYPERLINK "http://www.caleague.com/?div=natsl" }{{\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b4600000068007400740070003a002f002f007700770077002e00630061006c00650061006700750065002e0063006f006d002f003f006400690076003d006e006100740073006c000000}}}{\fldrslt {
+\cs15\ul\cf2 CAL}}}{, }{\field{\*\fldinst { HYPERLINK "http://www.nsarchives.com/" }{{\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b3600000068007400740070003a002f002f007700770077002e006e007300610072006300680069007600650073002e0063006f006d002f000000}}}{\fldrslt {\cs15\ul\cf2 NSA}}}{, }{\field{\*\fldinst {
+ HYPERLINK "http://www.clanbase.com/" }{{\*\datafield 00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b3200000068007400740070003a002f002f007700770077002e0063006c0061006e0062006100730065002e0063006f006d002f000000}}
+}{\fldrslt {\cs15\ul\cf2 Clanbase}}}{, }{\field{\*\fldinst { HYPERLINK "http://www.esreality.com/" }{{\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b3400000068007400740070003a002f002f007700770077002e00650073007200650061006c006900740079002e0063006f006d002f000000}}}{\fldrslt {\cs15\ul\cf2 ESReality}}}{
+ and the clan community.
+\par {\pntext\pard\plain\fs20\cgrid \hich\af0\dbch\af0\loch\f0 -\tab}}\pard \fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlblt\ilvl0\ls2\pnrnot0\pnstart1\pnindent360\pnhang{\pntxtb -}}\ls2\adjustright {Continual info for attentive 
+players via previews, website updates, and downloadable content. Sites that have been responsive thus far and like our work include }{\field{\*\fldinst { HYPERLINK "http://www.bluesnews.com/" }{{\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b3400000068007400740070003a002f002f007700770077002e0062006c007500650073006e006500770073002e0063006f006d002f000000}}}{\fldrslt {\cs15\ul\cf2 Blues News}}}{, }
+{\field{\*\fldinst { HYPERLINK "http://www.penny-arcade.com/" }{{\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b3a00000068007400740070003a002f002f007700770077002e00700065006e006e0079002d006100720063006100640065002e0063006f006d002f000000}}}{\fldrslt {\cs15\ul\cf2 Penny Arcade}}}{, }
+{\field{\*\fldinst { HYPERLINK "http://www.gamespy.com/" }{{\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b3000000068007400740070003a002f002f007700770077002e00670061006d0065007300700079002e0063006f006d002f000000}}}{\fldrslt {\cs15\ul\cf2 Gamespy}}}{, }{\field{\*\fldinst { 
+HYPERLINK "http://www.gamehelper.com/" }{{\*\datafield 00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b3600000068007400740070003a002f002f007700770077002e00670061006d006500680065006c007000650072002e0063006f006d002f000000}}
+}{\fldrslt {\cs15\ul\cf2 GameHelper}}}{ and }{\field{\*\fldinst { HYPERLINK "http://www.planethalflife.com/" }{{\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b3e00000068007400740070003a002f002f007700770077002e0070006c0061006e0065007400680061006c0066006c006900660065002e0063006f006d002f000000}}}{\fldrslt {\cs15\ul\cf2 
+PlanetHalf-life}}}{.
+\par {\pntext\pard\plain\fs20\cgrid \hich\af0\dbch\af0\loch\f0 -\tab}}\pard \fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlblt\ilvl0\ls2\pnrnot0\pnstart1\pnindent360\pnhang{\pntxtb -}}\ls2\adjustright {These drive: the casual droves that 
+play what everyone else is playing and talking about
+\par }\pard \widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright {
+\par }\pard\plain \s1\keepn\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\outlinelevel0\adjustright \b\fs20\cgrid Contact info
+\par \pard\plain \widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright \fs20\cgrid {\i Charlie \ldblquote Flayra\rdblquote  Cleveland}{ \endash  }{\field\fldedit{\*\fldinst { HYPERLINK mailto:flayra@overmind.org }{{\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b02000000170000001400000066006c00610079007200610040006f007600650072006d0069006e0064002e006f00720067000000e0c9ea79f9bace118c8200aa004ba90b360000006d00610069006c0074006f003a0066006c00610079007200610040006f007600650072006d00
+69006e0064002e006f00720067000000}}}{\fldrslt {\cs15\ul\cf2 flayra@natural-selection.org}}}{, ICQ: 14056133, (617) 905-6741
+\par \tab Evil overseer that tries to take all the credit while you guys do all the work.
+\par 
+\par }{\i Ned \ldblquote MonsieurEvil\rdblquote  Pyle}{ - }{\field{\*\fldinst { HYPERLINK mailto:monsieurevil@natural-selection.org }{{\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b0200000017000000230000006d006f006e00730069006500750072006500760069006c0040006e00610074007500720061006c002d00730065006c0065006300740069006f006e002e006f00720067000000e0c9ea79f9bace118c8200aa004ba90b540000006d00610069006c00
+74006f003a006d006f006e00730069006500750072006500760069006c0040006e00610074007500720061006c002d00730065006c0065006300740069006f006e002e006f00720067000000}}}{\fldrslt {\cs15\ul\cf2 monsieurevil@natural-selection.org}}}{, ICQ: 135490305
+\par }\pard\plain \s16\li720\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright \fs20\cgrid Ned has done all the PR for NS up to this point.  He has tons of contacts throughout the gaming news sites, knows many of the clans
+ and generally knows what\rquote s going on.
+\par \pard\plain \widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright \fs20\cgrid {
+\par }{\i Bailey Stoler}{ - }{\field{\*\fldinst { HYPERLINK mailto:bailey_stoler@yahoo.com }{{\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b0200000017000000180000006200610069006c00650079005f00730074006f006c006500720040007900610068006f006f002e0063006f006d000000e0c9ea79f9bace118c8200aa004ba90b3e0000006d00610069006c0074006f003a006200610069006c00650079005f007300
+74006f006c006500720040007900610068006f006f002e0063006f006d000000}}}{\fldrslt {\cs15\ul\cf2 bailey_stoler@yahoo.com}}}{, IM }{IrishCream4000}{
+\par }\pard\plain \s16\li720\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright \fs20\cgrid Bailey has done PR, marketing and writing professionally.  She\rquote s good at writing press releases, advertising copy, web content, brochures, etc. 
+ Bailey, I\rquote m not sure if you have expertise or desire to help with the overall marketing plan or not.  I know writing is your true passion, but I didn\rquote t know if you 
+loved driving people into a marketing frenzy or not also.  If so, you and Ned can refine the overall plan here, else just say so and Ned will do that part and you can help write the press releases and whatever else you think you can contribute.
+\par \pard\plain \widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright \fs20\cgrid {
+\par 
+\par }{\b Timeline 
+\par }{
+\par }\trowd \trgaph108\trleft-108\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10 \trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \trbrdrh\brdrs\brdrw10 \trbrdrv\brdrs\brdrw10 \clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr
+\brdrs\brdrw10 \cltxlrtb \cellx1620\clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb \cellx9468\pard \widctlpar\intbl{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright {\cell }{\cf2 \cell 
+}\pard \widctlpar\intbl{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright {\row }\trowd \trgaph108\trleft-108\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10 \trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \trbrdrh\brdrs\brdrw10 \trbrdrv\brdrs\brdrw10 
+\clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb \cellx1620\clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb \cellx9468\pard 
+\widctlpar\intbl{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright {T \endash  30}{ days}{\cell }{\cf1 Start allowing previews to as many news sites as want them.  Work with Grendel to make sure they can easily play without a lot of set up (WON id). 
+Don\rquote t release previews yet, but assign a date to each site.  Aim to have them released evenly starting at the 21 day mark, all the way to release.\cell }\pard \widctlpar\intbl{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright {\row }\pard 
+\widctlpar\intbl{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright {T - 21\cell }{\cf1 Countdown}{\cf1  begins}{\cf1 . With that announcement, release all new feature info in a more concise and readable format, and some teaser screens}{\cf1 . }{\cf1 
+For the next week, send off tons of screens and such to as many HL and gaming websites as possible, using an updated list (a lot of the old sites have gone by the wayside, unfortunately.) Emphasis is on best sites, as usual.}{\cf1 \cell }\pard 
+\widctlpar\intbl{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright {\row }\pard \widctlpar\intbl{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright {T \endash  20\cell }{\cf1 Update site with NS banners and desktops if they are ready.  This will 
+help our fans spread the word.\cell }\pard \widctlpar\intbl{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright {\row }\pard \widctlpar\intbl{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright {T \endash  14\cell }{\cf1 R}{\cf1 
+elease a series of small action vignette movies - only 10 seconds long or so, the around 5 MB variety. These show off newest features, and are especially attractive to 56K users as they are not a huge download. Get as many out 
+there as possible - around say 10. Also possibly some 1st-person movies of the new art features like the GL or the Fade abilities. Also, emphasis on highlighting the new maps and new animations and effects.}{\cf1 \cell }\pard 
+\widctlpar\intbl{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright {\row }\pard \widctlpar\intbl{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright {T- 8\cell }{\cf1 Update n-s.org, mentioning that the 1.0x T-shirt won\rquote 
+t be available for much longer, and to order it now if you want one.\cell }\pard \widctlpar\intbl{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright {\row }\pard \widctlpar\intbl{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright {T \endash  7
+\cell }{\cf1 R}{\cf1 elease the main trailer.}{\cf1   Tell all news sites that NS 1.1 will be released in one week.\cell }\pard \widctlpar\intbl{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright {\row }\pard 
+\widctlpar\intbl{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright {T \endash  2\cell }{\cf1 Release the updated manual.\cell }\pard \widctlpar\intbl{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright {\row }\pard 
+\widctlpar\intbl{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright {T \endash  1\cell }{\cf1 Release the dedicated server code.  Remove old 1.0x T-shirt design from NS store.  Add new design.  Get n-s.org 
+news update ready for uploading (make sure to thank Constellation members)\cell }\pard \widctlpar\intbl{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright {\row }\pard\plain \s1\keepn\widctlpar\intbl{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }
+\outlinelevel0\adjustright \b\fs20\cgrid Release day
+\par \pard\plain \widctlpar\intbl{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\adjustright \fs20\cgrid {(Holiday?  I\rquote m thinking mid-July right now, after Warcraft expansion)\cell {\pntext\pard\plain\intbl\fs20\cgrid \hich\af0\dbch\af0\loch\f0 -\tab}
+}\pard \fi-360\li360\widctlpar\intbl\jclisttab\tx360{\*\pn \pnlvlblt\ilvl0\ls2\pnrnot0\pnstart1\pnindent360\pnhang{\pntxtb -}}\ls2\adjustright {Get Adrenaline Zone installed in the morning.
+\par {\pntext\pard\plain\intbl\fs20\cgrid \hich\af0\dbch\af0\loch\f0 -\tab}}\pard \fi-360\li360\widctlpar\intbl\jclisttab\tx360{\*\pn \pnlvlblt\ilvl0\ls2\pnrnot0\pnstart1\pnindent360\pnhang{\pntxtb -}}\ls2\adjustright {5pm IRC countdown and release party
+.  Update n-s.org news.
+\par {\pntext\pard\plain\intbl\fs20\cgrid \hich\af0\dbch\af0\loch\f0 -\tab}}\pard \fi-360\li360\widctlpar\intbl\jclisttab\tx360{\*\pn \pnlvlblt\ilvl0\ls2\pnrnot0\pnstart1\pnindent360\pnhang{\pntxtb -}}\ls2\adjustright {6pm-12pm Adrenaline Zone party
+.  Dinner at Borders cafe at 10pm with dev team, PTs, whoever else wants to come along.
+\par {\pntext\pard\plain\intbl\fs20\cgrid \hich\af0\dbch\af0\loch\f0 -\tab}}\pard \fi-360\li360\widctlpar\intbl\jclisttab\tx360{\*\pn \pnlvlblt\ilvl0\ls2\pnrnot0\pnstart1\pnindent360\pnhang{\pntxtb -}}\ls2\adjustright {Sleep.
+\par }\pard \widctlpar\intbl\adjustright {\cell }\pard \widctlpar\intbl\adjustright {\row }\pard \widctlpar\intbl\adjustright {T + 1\cell NS Radio interviews on the state of the release.\cell }\pard \widctlpar\intbl\adjustright {\row }\pard 
+\widctlpar\intbl\adjustright {T + 2\cell Big HLTV clan game.  We need a sponsor to provide all the bandwidth.  Perhaps sYn vs. RED?  Or perhaps a PT/Vet/Dev game?\cell }\pard \widctlpar\intbl\adjustright {\row }\pard \widctlpar\intbl\adjustright {T + 7
+\cell Announce NS Olympics.  This is an international contest that ATI will be sponsoring.  The winners will all receive the latest and greatest ATI radeon boards, care of ATI.  We\rquote ll have to find someone to organize teams for this, as we can
+\rquote t do it ourselves.  Perhaps get CAL to run and judge the competition?  We can wait a bit longer then this before announcing it also, there isn\rquote t a huge rush.\cell }\pard \widctlpar\intbl\adjustright {\row }\pard 
+\widctlpar\intbl\adjustright {Continuous\cell }\pard\plain \s17\widctlpar\intbl\adjustright \f1\fs20\cf1\cgrid {\f0 
+All the while, we are sending off as much daily updates top websites as we can stomach, and getting as many people to hit readyroom and n-s.org as we possibly c
+an for centralized news sources - the Day markers above are mrely milestones; not like we won't be newsing in between those days as much as possible. RR.org can handle th}{\f0 e}{\f0  loa
+d much better these days, so I will try to utilize it as much as I can. 
+\par }\pard\plain \widctlpar\intbl\adjustright \fs20\cgrid {\cf1 Bailey }{\cf1 may have more elaborate or imaginative ideas than these, and I also don}{\cf1 \rquote }{\cf1 
+t know how many interviews you can stomach, as I can arrange plenty of them with NS' fame at this point, at PHL, Gamespy, other big}{\cf1 -}{\cf1 name sites, etc.}{\cell }\pard \widctlpar\intbl\adjustright {\row }\trowd \trgaph108\trleft-108\trbrdrt
+\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10 \trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \trbrdrh\brdrs\brdrw10 \trbrdrv\brdrs\brdrw10 \clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb \cellx1620
+\clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb \cellx9468\pard \widctlpar\intbl\adjustright {\cell \cell }\pard \widctlpar\intbl\adjustright {\row }\pard \widctlpar\adjustright {
+\par }\pard\plain \s1\keepn\widctlpar\outlinelevel0\adjustright \b\fs20\cgrid {Link banners
+\par }\pard\plain \widctlpar\adjustright \fs20\cgrid {We need a couple banners for fan sites and news sites to link to us.  }{ Ned, perhaps you could do something like your Ready Room logo competition to get a few of these for our n-s.org?  Some of these can 
+be 1.1 specific, some should be more general.}{
+\par 
+\par }\pard\plain \s1\keepn\widctlpar\outlinelevel0\adjustright \b\fs20\cgrid {Desktops
+\par }\pard\plain \widctlpar\adjustright \fs20\cgrid {We should get Cory to make a couple desktops for us.  I\rquote ve written him about this, and I hope to get him to make a couple images that people can download before release, to spread the word.  I
+\rquote m thinking of something like }{\field\flddirty{\*\fldinst { HYPERLINK "http://www.blizzard.com/wow/wallpaper/" }{{\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b4e00000068007400740070003a002f002f007700770077002e0062006c0069007a007a006100720064002e0063006f006d002f0077006f0077002f00770061006c006c00700061007000650072002f000000}}
+}{\fldrslt {\cs15\ul\cf2 Blizzard\rquote s wallpaper section}}}{.  Cory may or may not have time to get these done in time, so let\rquote s not depend on them.
+\par 
+\par }\pard\plain \s1\keepn\widctlpar\outlinelevel0\adjustright \b\fs20\cgrid {Manual
+\par }\pard\plain \widctlpar\adjustright \fs20\cgrid {I\rquote m going to do my best to have an updated manual ready before release.  The manual currently on the website may not be updated quite in time because it\rquote 
+s so large, but we should have a quick start guide ready a couple days before release.  I can\rquote t totally commit to this, but I think there\rquote s an 80% chance or so of it being ready (even if I have to write it myself).  I\rquote 
+m going to work with Jeff to get this going.  Note that from here on, the manual will be updated much more often then it has been before, because it will automatically be updated as the game balance changes.
+\par }{\b 
+\par Updated screenshots
+\par }{By the time we release, we need to have the n-s.org screenshots area populated with updated screenshots.  I think Ned should be in charge of this, with perhaps myself and Cory making the final decisions on them (an artist should definitely be involved
+ at least, non-artists aren\rquote t usually very good at this).
+\par 
+\par }\pard\plain \s1\keepn\widctlpar\outlinelevel0\adjustright \b\fs20\cgrid {Release party
+\par }\pard\plain \widctlpar\adjustright \fs20\cgrid {Have an open release party at }{\field{\*\fldinst { HYPERLINK "http://www.adrenzone.com/" }{{\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b3400000068007400740070003a002f002f007700770077002e0061006400720065006e007a006f006e0065002e0063006f006d002f000000}}}{\fldrslt {\cs15\ul\cf2 Adrenaline Zone}}}{
+ in Harvard Square.  Reservations won\rquote t be accepted, so arrive early.  It will be free to play NS there from 6pm until close.  Charlie will be there, along with other members of the dev team (probably Cory, Mike, Jeff, maybe Mike).
+\par 
+\par }\pard\plain \s1\keepn\widctlpar\outlinelevel0\adjustright \b\fs20\cgrid {NS Radio strategy
+\par }\pard\plain \widctlpar\adjustright \fs20\cgrid {How to integrate dev team interviews here?  Experiment with NS Radio integration into the game.
+\par 
+\par }\pard\plain \s1\keepn\widctlpar\outlinelevel0\adjustright \b\fs20\cgrid {Trailer
+\par }\pard\plain \widctlpar\adjustright \fs20\cgrid {We have an NS community member making a gameplay trailer for us.  He\rquote s done lots of in-game movies before, and is pretty good.  His name is Justin Phillips, and can be reached at }{\field{\*\fldinst 
+{ HYPERLINK "mailto:ns_regis@hotmail.com" }{{\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b0200000017000000150000006e0073005f0072006500670069007300400068006f0074006d00610069006c002e0063006f006d000000e0c9ea79f9bace118c8200aa004ba90b380000006d00610069006c0074006f003a006e0073005f0072006500670069007300400068006f00
+74006d00610069006c002e0063006f006d000000}}}{\fldrslt {\cs15\ul\cf2 ns_regis@hotmail.com}}}{.  He is about half done with the trailer so far, and he will be showing off new maps, features, and artwork.}{
+\par 
+\par }{\b Previews:
+\par }{Ixion at NSA: }{\field{\*\fldinst { HYPERLINK mailto:efinkelnburg@allthingsfoul.com }{{\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b02000000170000001f0000006500660069006e006b0065006c006e006200750072006700400061006c006c007400680069006e006700730066006f0075006c002e0063006f006d000000e0c9ea79f9bace118c8200aa004ba90b4c0000006d00610069006c0074006f003a006500
+660069006e006b0065006c006e006200750072006700400061006c006c007400680069006e006700730066006f0075006c002e0063006f006d000000}}}{\fldrslt {\cs15\ul\cf2 efinkelnburg@allthingsfoul.com}}}{
+\par Fragmaster at PHL
+\par 
+\par }{\b NS Olympics:
+\par }{Prizes sponsored by ATI
+\par 
+\par 
+\par }}
\ No newline at end of file
diff --git a/main/source/doc/Pie menu design.txt b/main/source/doc/Pie menu design.txt
new file mode 100644
index 00000000..638f36af
--- /dev/null
+++ b/main/source/doc/Pie menu design.txt	
@@ -0,0 +1,109 @@
+Even numbers of options best
+Non changing UI best (options always are in the same place)
+Good to always show you which options are available or unavailable 
+Pick an intuitive direction that fits the option chosen (overwatch could be straight up, indicating your firing direction; forward)
+Intuitive 'undo' or toggle action at the same location on the menu (probably the only time you 'change' options)
+Pie-menu doesn't need to pop up always, allow option to delay popping it up for advanced users
+Grey out unavailable, show text indicating why
+Make most common options move from the center to the right and/or down.  Other common options along the primary NSWE axes.  Less common options along diagonals and left/up
+8 options max, more than that becomes difficult to remember and execute
+Leave a couple options open for expansion.  Try to NEVER move options after shipping.  If you have to provide option for old and new ways.
+
+How does this work for the aliens?
+
+Layout-
+	Gestures- These can really take advantage of the layout.  Put on right hand side as they are hand gestures performed with the right hand!
+		Advance forward (north)
+		Fall back (backwards)
+		Hold up (left or right)
+
+	Communication (put south as used often and time-critical)
+		Team chat (right, more often used)
+		Public chat (left, not needed in the heat of battle as much).  Make sure not to put public and team chat on same axis to avoid moving mouse too far and telling the world your team's secrets
+
+	Upgrades- Not used often so sideways or non-main direction appropriate?
+
+
+	Equipment/weapon - South indicating self?  Or North for overwatch?  Try North first.
+		Automatic overwatch/disable automatic overwatch (forward is most intuitive, gun direction).  
+			Icons change here, as does option.  Show state on UI as Overwatch label.
+			Only problem, this doesn't fit into a category easily.  Make label clickable?
+
+
+
+
+First pass:
+
+Communication on one axis
+Weapons/equipment on the other
+South is personal/team
+North is public/enemy
+
+
+
+
+                                            Overwatch  
+                                          \  toggle   /
+                                           \   |    /
+                                            \  |  /
+                        Public           --- Weapons -----            
+                         chat              /   |  \                  Proceed
+                     \    |     /         /    |    \              \    |      /
+                      \   |    /         /     |      \             \   |    /   
+                       \  |  /                 |                     \  |  /     
+      "Fall back!" --- Communication-------- center ----------------- Gestures ------ Halt
+                      /   |  \                 |                    /   |  \     
+                     /    |    \           \   |   /               /    |    \   
+                    /     |      \          \  |  /               /     |      \ 
+              "Cover me"  |   "Roger"    -- Upgrades ---                |     
+                        Team               /   |  \                    Fall
+                        chat              /    |    \                  back
+                                         /     |      \ 
+                                               |        
+
+
+Option 2:
+Put default action as center of menu?! Just make sure this action is
+representative of the options around it.  Unconventional but it could work...
+Shows text with each button
+West side is voice comm
+North is weapons and equpment
+South is upgrades and "econ"
+East side is a bit awkwardly catagorized as "misc. communication"
+Game design gets lots of control over what people say and do and how often by placement!
+Add option to flip everything over vertical axis for left-handed players?
+Being physically limited to options forces only the most relevent options to be included.  Good
+for implementation time and simplicity.
+
+
+                                    Ready
+                                    Rocket        Arm grenade (1 left)
+                                          \    |      /
+                                           \   |    /
+                                            \  |  /
+                                 Welder (NA) Toggle
+            "Cover me"                  -- Overwatch --- Bind 
+                    \                      /   |  \      wounds       Proceed      
+                     \    |      /        /    |    \              \    |      /
+                      \   |    /         /     |      \             \   |    /   
+                       \  |  /       Reload    |                     \  |  /     
+             --- "Alien spotted" ----------  center ---------------- Team chat ------ Halt (mid between fall back and proceed)
+                      /   |  \                 |                    /   |  \     
+                     /    |    \           \   |   /               /    |    \   
+                    /     |      \          \  |  /               /     |      \ 
+              "Got ya     |    "Roger"   --  Default --- Armor          |     Public
+              covered""Fall back!"           Upgrade     upgrade        |      chat (off axis from team chat)
+                                           /   |  \                    Fall
+                                          /    |    \                  back
+                                         /     |      \ 
+                                               |     Armor piercing   
+                                                        rounds
+                                                         (10 more creds)
+
+
+
+
+
+
+
+
diff --git a/main/source/doc/Quotes.txt b/main/source/doc/Quotes.txt
new file mode 100644
index 00000000..194ce1e3
--- /dev/null
+++ b/main/source/doc/Quotes.txt
@@ -0,0 +1,61 @@
+After IPT1 (4/5/02)
+--------------------
+
+"Sorry for the total lack of updates lately. I've just been quite preoccupied with my level and other things like... NS playtesting!! I've got to tell you, 
+if you had any doubts about the mod, you can just throw them down the drain now. And then turn on the garbage disposal. This thing is going to rock some 
+serious ground when it's released. I can't even begin to explain some of the moments of pure awe I experienced while playing... The teamplay on the marine 
+side is simply amazing. This isn't your fake "stick together to live" concept here... It is true, authentic teamplay. No one even thought once about their 
+score... It's just amazing. " - Ken20Banks
+
+
+"First off, Natural Selection is amazing. I've been fortunate enough to be a part of playtesting starting today, and let me tell you, this is well worth 
+the wait. Check the Natural Selection forums or the IRC channel (#naturalselection on irc.gamesnet.net) for more info on this mod. I've said it before and 
+I've said it again -- this is the real deal, kiddies. Well, and non-kiddies too. You get the idea." - KungFuSquirrel
+
+
+"It's like crack, or black-crack if you buy vinyl.  If I hadn't had the responsibilities of school I would've slept less than Stal-Kalle last weekend.  
+I played until my eyes hurt and I could not physically stand to be in front of a computer any longer.  I don't think this is just a result of it being 
+new.  That is partially responsible indeed, but other games that I have got in the past never cause me to debate whether meals are really worth the trip 
+down to the kitchen.  After it is released, I will be playing until I know every possible permutation of the game in existence.  You guys have really 
+struck the right nail here." - Wurmspawn
+
+
+"Natural Selection = pure swank. I can't think of a better way to put it.
+
+	I hadn't had that much fun playing a mod since the original Frontline Force release and NS still has a lot of work to be done. I'm more excited now 
+	having played it than I was before. Ns_caged is having a bit of a reshuffle to accommodate the ideas gleamed from seeing the basic game mechanics in 
+	action and from the inspirational joys of Relic25's ns_bast and Merkaba's ns_hera."
+	
+	Must send out various pats of encouragement to: 
+	
+	Flayra and the NS team - For making this vision a wonderful (albeit slightly unbalanced and unfair) reality. Natural Selection is going to be great.
+	
+	Ken Banks - Space Station Nothing is awesome, the design, the light, the whole feel of the thing ... but I didn't realise how so until I wandered around the little test map with the nspt. I can't wait to see more! Ken you MUST finish this map.
+	
+	MonsE - He's just quite obviously the man.
+	
+	And anyone who shot, bit, spat, spiked, clawed or otherwise damaged me during the playtest :D" - Manah
+
+
+"NS went WAY past my expectations.  It is so much better than I thought it was going to be.  The experiences are truly memorable, and the mouse interface 
+is very clean and tight.  The atmosphere is superb, really puts you in the middle of things, and I think a lot people will like this game.  I can see how 
+this could bring in all genre's of MP games (DM, Team play, RTS, strategy).  I think you've outdone yourselves J.  The only thing I would disagree with is 
+that it's simple to learn.  It's simple to PICK UP, and just play.  But to master it I can tell will take some time (time I'm willing to 
+commit--the game rocks)." - Badmofo
+
+
+4/18/02 (or so)
+---------------
+"Natural Selection Mod for HL: It's like these assholes have some weird machine inside my brain that tells them what I want. I've talked about how a Command & 
+Conquer: Renegade with just as much conquering but more commanding would bind me into servitude. Well, no need to wait for some jackhole to authorize innovation. 
+Natural Selection is congealing my gaming fantasies. " - Tycho (Penny Arcade)
+
+4/25/02
+-------
+"One of the coolest things about NS for me right now is that every single proper game I've played so far is just oozing with story-telling content. Every 
+game is so memorable, and you just have to share it with people." - Ken20Banks
+
+"I really truly believe that this thing is closer to a commercial game than an amateur community mod. In all ways: The quality of the work, the innovative 
+and original gameplay, the mindset of the dev team, the way the community is handled, everything! Like I've said a million times over: You are going to 
+be blown away when you get your hands on Natural Selection." - Ken20Banks
+
diff --git a/main/source/doc/Resource model.txt b/main/source/doc/Resource model.txt
new file mode 100644
index 00000000..a95460b9
--- /dev/null
+++ b/main/source/doc/Resource model.txt	
@@ -0,0 +1,266 @@
+Social model #1 (old model)
+---------------------------
+a) Commanders get points depending on the amount of subordinates that are alive, and the general health of his subordinates
+
+b) Leaders get points in the same way as the commanders, but also on their proximity to their subordinates
+
+c) Soldiers get points for killing aliens, but they are split with the rest of the team
+
+
+Social model #2 (new model)
+---------------------------
+
+Rules
+-----
+a) Chain of command is largely randomized at beginning of match (see exceptions below)
+
+b) Subordinates don't have their own resource count
+
+c) Whenever anyone is squad kills an alien, points are given to the squad leader
+
+d) A squad leader is the only one that can buy weapons or equipment for his subordinates.  He can buy stuff for himself as well.
+
+e) When a marine or leader dies, he respawns automatically if the leader has enough points (they are automatically spent).  He, of course, loses all his weapons and equipment.  He drops his current weapon (or everything BUT his current weapon? it was destroyed...prevents people from letting teammates die so they can take their toys)
+
+f) Leaders can only use one weapon: the basic machine gun.  They can deploy turrets and mines however.
+
+g) Soldiers can use all weapons.  They can use repair guns and grenades.
+
+Side note: squad leaders get laser designators they can use for communication.  The commander gets one as well, but it's a different color.
+
+Gameplay this encourages
+------------------------
+A soldier will need to show his superior that he deserves rewards.  A good soldier that doesn't get rewards won't be a good soldier for long.  A bad soldier who is stuck with a wimpy weapon and a repair gun will learn to use the repair gun to help his buddies or he won't get a bigger weapon.  TKers and people swearing constantly or holding auctions won't be rewarded.  True team players that actually make themselves useful will be more likely to get benefits in the future.  
+
+Leaders won't have any reason to hold back goodies from soldiers; if soldiers are well equipped, they won't die as often and the leader won't have to pay to bring them back (it's automatically spent).  This encourages the leader to spend where it's most valuable, but can still have preferences that will cause others to act in line.
+
+Soldiers are true soldiers, concentrating on using what they have at their disposal, not making strategic decisions or learning UI or relative merits of flamethrowers vs. flyers.  This is a great learning curve for people coming in from DM.  They are given weapons and equipment, it's all operated the same way.
+
+Leaders are making the strategic decisions, letting the soldiers do the majority of the fighting.  They can spend big amounts of points, but it will never be for the leader's personal benefit (because he can't beef himself up much).
+
+Because the chain of command is randomized every round, a selfish leader will be treated as such when he's serving the ranks.
+
+Soldiers and their leaders will tend to stay in a group because a) leaders watch soldiers to see who deserves more merit b) soldiers need to be touched by leader to get new weaponry and equipment and c) the leader wants to stay alive and can't use the big weapons himself
+
+Leaves room for some neat psychological stuff where marines can try to look like they're taking more risks than they are (this happens in real war)
+
+
+The Big question: What does commander do?
+- This is an added feature, it isn't integral to the rest of the resource model.  It can be added or omitted without affecting the rest:
+
+...He sits back at base, protected in some kind of computer-coffin thingie.  He has a kind of spectator mode that he can use to view all subords.  He can use switch between the views of his leaders (only) or can freely fly around a hunter-seeker camera device to see deep into alien territory.  From this device he can use his laser pointer.  This device can be killed and it will respawn automatically back at the ship after a time.  His camera device emits a light as well so he won't be used for sneaky recon.  Potential other feature: the commander could be the one choosing technologies for the rest of the team.  He would have to research certain techs before they become available for purchase by the leaders.  If he chooses nothing, a default choice will start to be researched.  The research rate loosely depends on the amount of resources the entire has earned, divided by the time passed (it could be increased maybe 50% but can't fall below a reasonable value).  The commander would choose things like heavy machine gun, heavy armor, phase gates, computer-aided accuracy (for overwatch mostly), flamethrower, jetpacks, turrets, siege turrets.  The research icons showing each tech would be shown on the HUD of all players, including the progress, ie, time until finished.  Some upgrades (like defense lasers) would be given automatically to everyone when complete (or maybe after a soldier's leader equips them by touching them).
+
+Commander controls all "party" upgrades!  I've always wanted an online party, maybe this is the way to do it.  All his upgrades are universal, game-changing and immediate.  He is also the force of drama for spectators.
+He could do:
+	- Give all marines get jetpacks
+	- Give all marines built-in motion tracking
+	- Dim the lights?  Bad idea.
+	- Teleport everyone back to base?
+	- Cause a player to get "blaze of glory" (he goes berserk and can't die for a time but then WILL die)
+	- Give a rallying call to give everyone an adrenaline boost?  Temporarily increase current speed and ROF of everyone in radius!
+	- Place a phase gate to provide an escape (or a place to attack!)
+	- Mark a enemy target or a friend that needs help
+	- Def matrix a marine
+
+Usable abilities
+	Marine - Can buy: nothing.  Can use: All weapons, mines/claymores, jetpacks (automatic), repair gun, 
+	Squad leader - Can buy: all weapons and equipment.  Can use: Basic machine gun only, ammo dispenser, turrets, has laser pointer.
+	Commander - No weapons, invisible laser pointer, party/drama upgrades, create camera outpost, siege turret (below).  His role is to manage the future of the team and he is ultimately responsible for everyone's lives.  He pays for all respawns.
+
+Random thoughts:
+  Instead of "resource buildings", how about a big cool-looking structure with cameras, lenses and other listening/broadcasting devices on it.  If an alien is killed where one of these could "see" the death, the marines get more points for it.  It shows the actuarial computer that the marines are kicking ass and is war-time propaganda.  Maybe it works the same for aliens, the marines lose more points when dying near such a thing?  This structure could be used by the commander (somehow) as well.
+  Keep a history of a soldier's use with a weapon.  When a squad leader looks at a soldier, his profile reads out, so the squad leader can see what they're good at and what they've never been able to try.  Also means more consequences for a marine's action. (include # of TKs with weapon?!)
+  Make healing/repair gun work very quickly so it's worth a player using it instead of fighting (or instead of another target).  It should be used to help a player deploy equipment or use a weapon when it's really needed.  It could be a repair gun and have armor/health work like the Protoss (it is more useful to use sooner rather than later)
+  One goal should be: have one "buddy thing" happen every 5 minutes of play.  Being healed, healing, being given something, giving something, saving someone, being given a sensible order, advancing together with communication, fleeing a bad situation together, etc.  This is what will keep people coming back to the game.  It should feel like "Remember that time when YYY and I were holed up in the med lab waiting for the rest of our team while the aliens were trying to get through the door...I was so scared until the team got there.  Boy did those aliens get a surprise"
+  Lots of meaningful and stuff can happen with a simple resource model and no commander or chain of command, don't force it in
+  When given a weapon by squad leader, switch to it automatically
+  Pie menu: 
+	Soldier: "light", "heavy" and "other" slots (down, up and right)
+
+        			  Reload
+		         	    |
+           			  Weapon - Drop    Repair
+		                |	     	     |	     
+      - START       -  Use ----- 	 Equipment - Mines
+		  |	            |	             |
+Gesture -Comm      Light/Heavy Smoke - Grenades - Nerve gas  (smoke grens don't affect turrets or overwatch!)
+		  |								 |
+Public - Chat - Team					Frag
+		  |
+		Nearby
+		  
+
+	
+
+	Squad leader: Can only buy one item at a time.  After deploying it he can buy another (next marine he touches receives it).  
+
+          grenade launcher
+             	  |
+        nuke -	heavy - flamethrower
+				  |
+       Repair	  |		            Drop item
+          |		  |         |		   |
+HvyArmr- Other  - Buy  -  START  -  Current
+          |		  |			           |
+        Turret    |              Toggle MG/laser ptr
+				  |
+        MGupg - light - shotgun
+         		  |
+              mines/clay
+
+	
+	Commander: (swap "help" with "orders" to be consistent...most commonly used on right, purchasing done to left)
+
+                      Motion tracking
+                            |
+            LifeSupport - Team - Jetpacks
+                            |	
+MoveTo-Area	                |	Camera tower
+       	|				    |		 |
+        Orders - Start	- Help -  Build - Phase gate
+          |					|		 |
+        Target - Repair     |      Siege
+          |    Adrenaline-Marine - Blaze of glory
+                            |
+                         DefMatrix
+
+Add more tech nodes that "upgrade", ie, a normal tech tree.  This makes the decisions much harder to make otherwise any option can be chosen at any time.
+ - Maybe you have to buy "team", "build" or "marine" first?
+  
+Potential problems
+------------------
+a) Newbies.  Your mod goes out there, no one has a clue what is going on...
+some people get randomly assigned leadership roles.  They get confused...
+this mod sucks!  Never play it again.  Learning curve too steep.
+- Check how many times a player has played on a server.  The first x times, he will always try to be a soldier.  Does this work?  What about duplicate nicknames or server-hopping?  It doesn't have to be a perfect system, but it should work the majority of the time.  What happens when a whole team is filled with newbies...ie, on a LAN!?!
+- Address through training.  Try to encourage playin on the training servers...is this a reality or theoretical happy land?
+- Make the commander an optional role.  If the game "decides" a player can be the commander, a message is broadcast telling him so.  He now has the option of walking over to the commander area and jacking in.  He can hit enter to leave the commander's chair and come back into the game but if he does, how does he fit into the COC?  Maybe he is only allowed to join during the first x seconds of the game?  Doesn't address the differences of squad leaders.
+
+b) The randomness of c.o.c.  It solves some problems, but seems to create a
+slight problem too.  What if someone REALLY wants to play a commander?  I.e.
+hes not the best dm'er but would love to order guys and do a good job about
+it.  How does he get to play?  Waiting 14 rounds for his turn?
+- 7 rounds on average, but that's still totally unacceptable, esp. given the longer average time of each game
+- Kind of the same as a).
+- Does it make sense that you could have a good commander that hasn't fought as a soldier?  Ie, how can he understand the strategic weapon/tech choices vs. different types of aliens if he hasn't seen them first hand?
+- The game could remember the % times you individually won or lost when you were in a certain role and tend to put you in the role more often?
+- Allow total and utter choice over role you spawn in as.  If your team is all soldiers or commanders, so be it.  If the choosing of roles is somewhat iterative and reactive (ie, choosing during pre-game by standing somewhere) then people who don't mind different roles would tend to choose roles to balance out the team.  This would inevitably lead to games where the team is weaker than it should be though.  Or an upper limit on superiors could be established by limiting the space that was occupied, but the team could be all soldiers if they wanted to.  Careful, by trying to be all things to everyone, it will be nothing.
+
+c) The research thing.  Will being a commander appeal to the dm online crowd?  Maybe not so much.  Or to a few people, but these people might not like it for reason B.
+- Researching sounds like a dud if you see what Science and Industry did with it
+- Get rid of commanders altogether.  It would be nice to have a chain of command, rather than squad leaders and soldiers, but only if he can make meaningful higher-level choices.  It's also hard when there are no resources he has control over.
+- It would be nice to have commander's that could keep the squad leaders in check, someone they somewhat controlled by
+- Make commanders more like squad leaders.  There are certain things they can buy and deploy that no one else can, ie phase gates, def lasers, and camera posts.  The squad leaders could use some heavy weapons but not all that a soldier could.  Everyone carries a weapon, though the commander wouldn't be on the front lines often.  This would open the game up to more people than DM, but it wouldn't accomodate the non-military commanders, meaning this problem goes away a bit.
+
+d) People won't "buy" the whole concept of subservience and won't like the idea that they can't always make their own weapon/equipment/role choices.  DMers might not like the marines at all because of this.
+
+e) Instead of TKing, a player that is a leader could just not buy upgrades for people.  Wouldn't they have more fun as an alien player?  What if they tried to join aliens but the team was full?
+
+f) Mega-big showstopper: what to do if everyone wants to play as a marine?
+- Display message: "Your team <still> needs a squad leader.  Use your rank menu before the match starts to volunteer."
+- Start "Sparring/Deathmatch mode".  Marines get weapon upgrades and ammo periodically, as needed.  Most upgrades aren't enabled, suitable for small games that focus on sparring and combat.  A pleasant sub-game that should always be visceral and fun.  
+- After number of DM games played > n: "You would make a good leader, how about giving it a shot?  Use your rank menu now to volunteer."
+
+
+
+
+System #3
+-----
+a) Everyone is a soldier until someone promotes up to a leader or commander
+
+b) Squad leaders and the commander have their own resources, marines only fight
+
+c) Whenever anyone's squad kills an alien, points are given to his squad leader.
+
+d) A squad leader is the only one that can buy weapons or equipment for his subordinates.  He can buy stuff for himself as well.
+
+e) When a marine dies, the leader chooses whether to bring him in as a reinforcement or not.
+
+f) When a leader dies, mariines are notified and they must touch his corpse to bring him back.  If he isn't brought back, his points are split between the other leaders and commander.  The marines change to a new squad.
+
+g) Leaders can only use one weapon: the basic machine gun.  They can deploy turrets and mines however.
+
+h) Soldiers can use all weapons.  They can use repair guns and grenades.
+
+i) Marines get resource injections, the amount of which depends on their current points.
+
+j) The aliens get resource injections, the amount of which depends on how many hives they have.
+
+k) The aliens start with a randomly placed hive.  Every n amount of time, they get another hive at another random location.
+
+l) Whenever an alien kills a marine, he gets points.
+
+m) Commander flies around and has a laser designator.  If he "dies" he respawns back at the ship and must travel to get to a destination again.
+
+n) The commander spends resources out of the pool from all the squad leaders.  He sees how many resources each has and the cost is split between all of them
+
+o) When a squad leader dies, he respawns back at the ship...his subordinates respawn back at the ship with him, and it costs enough everyone to respawn.
+
+
+
+System #4
+----------
+a) Everyone is a soldier until someone promotes up to a leader or commander
+- Code done
+
+b) Squad leaders and the commander have their own resources, marines only fight
+- Code done
+
+c) Whenever anyone's squad kills an alien, points are given to his squad leader (or split with his leader and commander if he has a commander).  Given to the soldier if no leader.
+- Code done
+
+d) A squad leader is the only one that can buy weapons or equipment for his subordinates.  He can buy stuff for himself as well.
+- Code done
+
+e) When a marine dies, the leader chooses whether to bring him in as a reinforcement or not.
+- Changed so he always comes in
+- Code done
+
+g) Leaders can only use one weapon: the basic machine gun.  They can deploy turrets and mines however.
+
+h) Soldiers can use all weapons.  They can use repair guns and grenades.
+
+j) The aliens get resource injections, the amount of which depends on how many hives they have.
+
+k) The aliens start with a randomly placed hive.  Every n amount of time, they get another hive at another random location.
+
+l) Whenever an alien kills a marine, he gets points.
+
+m) - Commander has no body and can only view combat from cameras mounted on shoulder of each squad leader.  
+   - Pressing 1-3 first selects the squad leader, pressing it again will go to it.
+   - Commander can free look when in a camera, it swivels the camera when he moves
+   - Orders can be given to the currently selected squad leader: hold this position, advance 10 meters, fallback, move to location, support squad, warning.
+   - The context is automatically implied from the camera that the commander is viewing through.
+   - Only squad leaders hear the orders, though perhaps the marines hear some indication that an order was given to the squad.
+   - Squad leaders give orders to their squad like, "around me", advance, fallback, hold here, incoming
+   - Very important that players know the commander knows more about the current game environment than they do, so they'll be tense and follow orders
+
+n) When a marine dies, he respawns at the expense of his leader. (possibly only expense is implied cost of weapons?  this way mean marines can't drain their leader's resources)
+- Code done
+
+o) When a leader dies, he respawns at the expense of his commander.
+-- or how about, a leader pays for it himself and can only respawn if all his marines are alive?  Once he's out, his surviving marines will defect if possible and still be able to play
+- Code done
+
+p) If a marine wants to defect from his squad, he immediately gets his share of the resources awarded in 
+  ammo and the best weapon he can, then is assigned to the next squad he hasn't been part of this match.  
+  - Code done
+  
+  p-a) If no squad exists, he has no squad and is on his own.  
+  p-b) If he dies, he can't come back.
+
+q) If a marine defects and a leader no longer has any subordinates, he is on his own and cannot respawn.  His resources are immediately forfeited to the commander.
+
+r) When all squad leaders are dead or orphaned, the commander can only inhabit turrets and home base.
+Need to be able to
+- give a marine's leader points
+  - Code done
+- remember the leaders a player has defected from
+  - Code done
+- check if a leader has any subordinates, and which ones died
+  - Code done
+- be able to find the leader of any squad (for commander possession)
+  - Code done
+- tell if a player is in any squad
+  - Code done
+
diff --git a/main/source/doc/Skill scalability.txt b/main/source/doc/Skill scalability.txt
new file mode 100644
index 00000000..1d6ff954
--- /dev/null
+++ b/main/source/doc/Skill scalability.txt	
@@ -0,0 +1,58 @@
+
+
+  One of the biggest attributes that make games compelling is when there is a high consequence to the player's actions.  When a player's every decision has a significant consequence (or perceived consequence), the player takes the time to learn about the play environment and try to excel in it.  Significant consequences mean the potential for significant rewards.  Without significant consequences, the player realizes that what he does matters less and playing becomes a chore or task list that is merely executed.  Seeing that the player always has interesting decisions can help acheive this goal.
+
+  Strategy games have interesting decisions built into their core.  The high-level is the choosing which nodes of the tech tree to research, when to attack and when to expand.  These all deserve significant thought on their own.  On top of this, real-time strategy games have the infinitely scalable "attention" dynamic: all your units can perform better if you micro them, and there's no theoretical limit on how much attention you can provide, if you're fast enough.  This makes RTS extremely compelling.
+
+  Vanilla deathmatch has some interesting decisions to make, like which weapons to go for, which weapon to use currently, trying to figure out where your target is going and leading him or outhinking him, etc.  It's all at the low-level however, and there are limited opportunities where a good high-level decision is more conducive to winning then raw skill in the low-level.  For example, even if you outwit your opponent and get armor and a better weapon before your next fight, his fighting skill can easily compensate and he can still win the encounter.
+
+  Counter-strike has this same dynamic, where it generally pays off to hone your fighting skills, more so then acting as a team, synchronizing a multi-pronged attack, typing a message to your teammate that he is about to be attacked (instead of running over there yourself or attacking someone instead), etc.  Counter-strike does add many more interesting decisions that affect the future of you and your team in big ways.  The biggest example, having to sit out after you die, makes every second of life that much more demanding.  The simple economy provides interesting high-level decisions as well.  The location-specific hit model, the necessity of reloading at the right time, the fact that you slow down when you take damage, all of these add lots more interesting decisions at the fighting level, and make Counter-strike perhaps more compelling than any other first-person game out there.  
+
+  Even with these amplified consequences to player actions, there seems to exist room in first-person games to incorporate more high-level decisions from strategy games.  In strategy games, the outcome of high-level decisions generally beat out low-level decisions.  Choosing to get airpower, cloaked units, or choosing when and where to attack generally is more conducive to winning than the actual deploying of your forces (though the outcome still rests on that to a degree).  Generally you can just throw the right units at an area at the right time and good things happen.  However, the great thing about strategy games is that once both players are competing at a high-level, individual battles (and then games) are resolved through the execution of the low-level, the fighting, targetting and maneuvering.  If both players are equally skilled (or inept!) at the high-level or the low-level, the game outcome switches to the other.  And so it goes, the entire game alternates between strategic decisions and execution.  The thought and the fighting.  This is only possible because the great high-level strategy can be potent and competitive in the face of great fighting.  In all FPS games out there right now, high-level strategy can't genearlly compete with fighting skills.  This is a fine state of things, but it leads to an environment where only the strong survive, and only the strong play.  The question seems to be, how to incorporate potent high-level strategy into the unparalled low-level decision-making depth of first-person games?
+
+  My first thought was to remove some of the fighting skill required, in order to compete.  By focussing on how many and what type of weapons were deployed in a battle at a time generally determines the outcome.  This means the high-leveld decisions get more credence next to the low-level ones.  Now I'm thinking this is the wrong approach, because it means the skill curve plateaus early.  After mastering the high-level, there is nothing else to get good at.  This would be like making an RTS where you can't control individual units.  Maybe it's fun for awhile, but it doesn't seem to be the grail of interesting decisions.  Maybe you could try to make the high-level decision making infinitely scaleable, like the low-level in FPS.  If you could accomplish this, the game doesn't get stale, much like the action part of FPS doesn't get stale: no matter how much you play, you can always get better.  Your accuracy can get better, you can move around the map faster, you can listen better, you can predict your opponent better, etc.  However, this too seems flawed because the number of high-level decisions made is much less than the infinite number of low-level decisions you make.  For example, the number of strategic decisions you might make in 40 minute game of Starcraft might number less than 100 (guessing).  The number of decisions you make in a 20 second firefight with a skilled opponent is uncountable, as many decisions are made as fast as you can react.  So it doesn't seem easy to make the high-level decision making of any game, let alone in an FPS, infinitely scaleable.
+
+  So it seems that traditional high-level decisions must be added to FPS to get this depth.  The speed and scale of FPS games makes the notion of many high-level decisions absurd.  "Deploy this unit <player1> and this unit <player2> under the bridge and let me know what you see."  This might be the equivalent of leaving a couple dragoons between your opponent's base and a nearby island expansion, watching for flying buildings and troop movements.  But let's look at the problems.  Instead of selecting a couple units and clicking on a destination, you must chat to those people and try to describe to them what to do.  Even if you had an interface where you could select and indicate an order, these aren't units, they're people and they don't listen, especially to boring-sounding orders.  Then there's the problem of reporting back.  Instead of paying attention to enemy colored blips on the mini-map (that are in LOS of your scouts), those people need to report back to you when they see something.  Then there's the question of scale: most of the time, those people would be much more helpful fighting alongside the rest of your team.  Instead of having dozens or hundreds of units, you generally have less than ten.  So it seems that the environment must be slowed down, scaled down or otherwise change to let players function strategically.  The social environment is perhaps the biggest obstacle, with most people not wanting to take orders, or not understanding orders.
+
+  So my question is (finally), what thoughts do you have on changing first-person games to allow high-level decisions to compete with low-level ones?
+
+  I'm thinking:
+
+- obvious material rewards for carrying out orders
+- a player's equipment being purchased by another player, who is rewarding people doing good for the team
+- increasing the size of maps, or otherwise increasing the amount of time it takes to reinforce an area or group, so it's not so easy to help out at a moment's notice (this isn't much of an issue in CS, if someone's in trouble they're usually dead before a friend could turn a nearby corner to help).
+- otherwise promoting the idea of troop movements or deploying defense
+- god I dunno anymore
+
+  Do you have any ideas?!
+  
+
+
+Situations that work great in RTS that would be great in FPS
+- leading an enemy into your defenses
+  - silent, effective sentries
+
+- a vigorous counter-attack after a lossy attack
+  - when aliens have to spend some time to upgrade, they will be gestating or only low-level during the counter
+
+- getting slaughtered after charging into an unknown battle
+
+- skipping low-level upgrades and going for a big tech upgrade as fast as possible before attacking (counter should be possible too: the other team expanding/growing like mad or containment)
+
+Goal: viably concentrating on high-level instead of low-level for a time
+  - soldiers could help build something (this could be a building that takes low-level skills to build faster, like a construction point that moves around and using it or lasing it constructs faster)
+  - ammo is important and costs points
+  - turrets that can only be constructed by soldiers
+  - ability to bunker up via sentrys, welding, mines
+
+Goal: effective scouting
+  - weight system where you can "go naked" and get big speed boost
+  - radically different reations depending on enemy's actions (invisible units, melee that can't hit air, siege)
+  - add buildings.  these commit your team to a strategy on a time and resource level and let's and enemy see what you're doing
+
+Goal: "going air"
+  - jetpacks for marines, most aliens have only melee
+
+Goal: Surgical strikes
+  - if buildings were needed for tech, they could be destroyed to have your tech disabled
+
diff --git a/main/source/doc/SteamApp.cfg b/main/source/doc/SteamApp.cfg
new file mode 100644
index 00000000..6521ec07
--- /dev/null
+++ b/main/source/doc/SteamApp.cfg
@@ -0,0 +1,44 @@
+##############################################################################
+# SteamApp.cfg
+#
+# Steam Client App configuration-override file
+#
+# This file is read by the Steam code in the Client
+# Application, and controls configurable parameters that
+# affect only that App.
+#
+# To be effective it must be placed in the App directory
+# (for example, c:\Steam\SteamApps\me@web.com\Half-Life\).
+#
+##############################################################################
+#
+# Debug-launch settings
+#
+# Use these settings when you are running your application directly
+# from your debugger (ie, not launching the App from the Steam UI)
+# In such cases, you need to tell Steam which application
+# you are running and the version you want to use.  Each application has
+# an ID number and each version of your application has a version ID number. 
+# You also need to indicate the username you are running Steam under. 
+#
+# SteamInstallPath should point to the directory where the corresponding Steam.exe 
+# resides
+#
+# To do a debug launch:
+#
+# - do at least one launch from the UI first to ensure the Minimum Footprint files 
+#   are present
+# - leave the Steam UI running
+# - copy this file into the App directory
+# - fill out the following config parameters
+# - copy Steam.dll into the App directory
+# - run the app directly or through the debugger, with "-steam" on the command line 
+#
+# You may leave it setup and still do normal launches through the
+# Steam UI. However, if you comment out the SteamInstallPath parameter,
+# you must also REMOVE Steam.dll from the App directory, or else the
+# launch will fail with "The local Steam service is not running".
+SteamAppId=70
+SteamAppVersionId=0
+SteamInstallPath=D:\Games\Steam
+SteamAppUser=steam@overmind.org
\ No newline at end of file
diff --git a/main/source/doc/Tips for online success.txt b/main/source/doc/Tips for online success.txt
new file mode 100644
index 00000000..808b4837
--- /dev/null
+++ b/main/source/doc/Tips for online success.txt	
@@ -0,0 +1,342 @@
+  Name: David Groves  
+  Location: London  
+  Posts: 9     
+  http://www.poddle.net
+--------------------------------------------------------------------------------
+
+This is a simple list of things that would DRAMATICALLY increase 
+the chances of a game becoming a popular online game. Some of these 
+things are easier to implement that others, but you will notice the 
+most popular games like counterstrike already have most of these 
+features. Of course, if you design a really shite game, none of the 
+rest of the article is going to be of any use to you whatsoever.
+
+
+
+
+
+
+Good netcode. Good examples, Quakeworld + Qizmo. Low bandwidth, 
+consistent, little warpyness, relatively kind on packetloss and 
+high latency (which are impossible to deal with), doesn't 
+excessively trust the client. Bad examples, Quake3, unplayable on 
+ISDN, certain CS versions, trusted the client far too much, making 
+for trivial exploits. Trust me game developers, hire Zibbo and 
+Perkele (zibbo@udpsoft.com) to sort out your netcode, I doubt you 
+will regret it. 
+
+
+
+Include a 'competition' mode WITH the game. The best examples of 
+this are kteams for Quakeworld, or OSP for Quake3. This allows 
+organised teams of people to play easier. Notably CS hasn't done 
+this. Perhaps if they did, the competitive scene in it would be 
+even larger than it is. 
+
+
+
+Multilevel admin support. Administrator privileges on a server 
+shouldn't be all or nothing. Almost all games ship with it like 
+this at the moment, with the 'rcon' system. I don't want to give 
+some people administrator rights to kick idiots, and maybe change 
+the map if its a 20v20 map and 4 people are playing, and also give 
+them the rights to shutdown the server, and maybe poke around on 
+the computer its hosted on (rcon dir in Q3 springs to mind). 
+
+
+
+Voicecomms. Integrate voicecomms into your games. That is the 
+ONLY way that public servers are going to see voicecomms in use, 
+and that is the ONLY way that you will see real teamplay on public 
+servers. I'd really like to see a project get going to write a BSD 
+licensed bit of code for windows clients, and windows/*nix servers 
+that just allows this to be a "bolt on" job for game developers. 
+Anyone also interested in doing this, please mail me.
+
+
+This also lets you impose things, like stopping dead players 
+from talking to players. This is GOOD. Remember the dedicated lamer 
+clans will cheat by using an external voicecomms programs anyway, 
+but this at least helps. 
+
+
+
+Be LAN friendly. Yes, this is mainly you blizzard. Always allow 
+people to just type in an IP address to connect to another server. 
+Some large lan events VLAN networks into several segments, mainly 
+for management reasons, and to limit exploits (accidental, like 
+lan clients running DHCP servers, or intentional). Since most "broadcast" 
+methods of finding games won't cross these boundaries, just let 
+people type in IP addresses or hostnames somewhere please.
+
+
+Also, and Tribes2 and Dynamix are being shouted at here, don't 
+make assumptions based on the netmask about clients being on LAN or 
+the Internet, thanks. 
+
+
+
+Be mod friendly. Keep a non-profit EULA if you want, but release 
+mod tools for your game. Go the undocumented route if you want. 
+Just look at halflife and counterstrike to see the benefits this 
+can bring. Well played id software for making this common in the 
+first place. 
+
+
+
+Cheats. We know it's not possible to make a cheat free game when 
+you have to put any trust in the client at all, and we know its not 
+possible to make a playable game if you don't put at least some 
+trust in the client. But it is possible to make the cheaters life 
+harder by releasing constant patches that just make them have to 
+work harder with a disassembler to insert the correct hooks, or 
+crack the appropriate part of the network code.
+
+
+
+Maybe the right answer to this is a patch a day, with the 
+compile run through an object code obfuscator with a different seed 
+each day. This does need a good update mechanism though, see 
+below, and may well be fatally flawed if the obfuscator is predictable. This combined with normal bugfixing patches that change the code logic should at least make things very difficult though.
+
+
+
+
+
+Patches. As mentioned above, if you are going to have frequent 
+patches, you need a good auto update mechanism. You also need a good 
+non-auto update mechanism. Heres why.
+
+
+Without a good auto update system, people won't have the latest 
+version, and having to patch up to play deters the casual 
+gamer.
+
+
+Without a good non-auto update people, it is hard for people 
+without internet connectivity, or temporally without internet 
+connectivity (ie. at a lan), to update.
+
+
+Ideally the auto update mechanism for the clients is just to ask 
+them if they want to update, and then for it to just work. It 
+should be fast too, so maybe keep deltas from every version to the 
+latest version on your update server, rather than patching through 
+30 versions to get to the latest.
+
+
+Ideally the non-auto update mechanism should be a single patch 
+that takes any version to the latest version. It's less of an issue 
+if this has to go through every revision to get to it though.
+
+
+
+
+Server patching. Nobody seems to have done auto-server patching 
+yet. Lots of people do auto-client patching. This to me seems 
+equally important. See the section on patch security though. Maybe 
+with FPS like games you can check for an update at a map change, 
+and with other games, maybe have them all shutdown for update at a 
+specific time (and broadcast warnings about it before it happens, 
+like unix computers being shutdown). Ideally, be like irssi, the 
+IRC client (www.irssi.org), and don't need to be shutdown at all, 
+(but don't be like irssi and get your configure script trojaned 
+:). 
+
+
+
+Server browsing. Either do it right, or leave it to someone 
+else, don't do a half assed job. A good example of an in game server 
+browser is UT. A bad example is Quake3. A good example of leave it 
+to someone else is Quakeworld (and the then Quakespy). 
+
+
+
+GUID's. Being able to see other players GUID's, (usually a hash 
+on the CD key) is important. Particularly if like most FPS games 
+you don't have accounts to get names. This lets you see if the 
+person you are playing is REALLY the person they claim to be, and 
+stops people pretending to be someone else and behaving like a 
+lamer to get a bad reputation for that person. 
+
+
+
+Secure updates. Please sign your updates in a secure manner. You 
+have an excellent method of distributing your key, just put it on 
+the CD that the game comes on. 
+
+
+
+CD key authentication. This is needed to prevent piracy, 
+and thats good. The client --> CD key hash --> server --> 
+authserver is the correct approach though. Also, PLEASE make your 
+auth servers reliable, nothing pisses people off more than being 
+unable to play a game because you or your ISP have ed up. (Hello Blizzard !). 
+
+
+
+*nix servers. Don't be like Medal of Honour. Lots of server admins like 
+to run *nix servers. Why take a game based on the Q3 engine that 
+has a wonderful linux port, and just break it. Please design your 
+games so at least the server can run on linux. Ideally have it able 
+to run on as much as possible. I'm not sure of the current state of 
+cross-compiling, but this seems to be an ideal way to get out other 
+platforms too. Imagine a IBM Bigass S/390, or a Sun E15k system running 19247819741 of 
+your servers, doesn't that appeal ? 
+
+
+
+No backdoors. Just NO backdoors. Bad id software. 
+
+
+
+Fix your bugs. A crash bug needs a patch, no matter how rare the 
+crash is. Example of unfixed crash bugs in games are Quake1, and 
+the teleporter at the start of e4m8 (RJ onto the right hand side of 
+it). A blatant exploit bug that allows people to spoil the game 
+also needs quick fixing. CnC renegade and the beacon your own base 
+even though friendly fire is off if you quit the game after 
+dropping the beacon bug, this BADLY needs fixing.
+
+
+
+
+
+Listen to the community. Anything the game lets you do shouldn't 
+be classed as cheating. I'm thinking mainly counterstrike here. In 
+counterstrike, some people decided to make standing on each others 
+heads to make a tower of players to boost someone up to a normally 
+unaccessible place against the 'local rules'. Imo, if the game 
+allows you to do it, it isn't cheating. If this is to be considered 
+cheating, the game should be patched to stop it.
+
+
+Also, some bugs are GOOD. Remember rocket jumping wasn't planned 
+in Quake1, it was an 'incidental feature'. Neither was bunnyhopping 
+in Quakeworld. In my opinion both of these add to the game. If 
+you ARE going to change something because you don't like it, but 
+missed it in QC, do it EARLY. Bad examples of this were the 
+removal of bunnyhopping from Counterstrike, and the removal of through 
+floors damage in Quake3, both of which should have been done 
+FAR earlier than they were (or just plain left alone).
+
+
+The same applies to graphics settings. RTCW is a good example of 
+the 'right' approach to this, but I don't like the way punkbuster 
+and it allow different server operators to declare different 
+standards. This leads to situations like in Quakeworld, where 
+different countries play different rules, which leads to all kinds 
+of problems in international play. This isn't like Amercian 
+Baseball, and the designated hitter rule, this is like different 
+numbers of players on each teams, totally different maps, and 
+differences in your ability to hurt your teammates or not.
+
+
+Nothing is wrong with having softcore modes and hardcore modes, 
+as long as its clear that the competitive players should be using 
+the hardcore mode, and you are only changing the rules between 
+modes, not things like the physics or the map layout. ie. this 
+shouldn't be vanilla Quake3 and CPMA Quake3, which I would class as 
+different (although similar) games. 
+
+
+
+Dedicated servers. Please work hard at optimising these so they 
+need as little memory and CPU as possible. This will make the 
+people that host your servers happy. I really am quite stunned when 
+I see the amount of resources say Quake3 consumes compared to 
+Quakeworld. I can understand it from the clients and flashy 
+graphics point of view, but I'm not sure why they require it on the 
+server side too. 
+
+
+
+Dedicated server hooks. I would love to see a standard API for 
+controlling programs to interface with dedicated servers, to add 
+bans, shut them down, change the mode they are running in etc ... 
+At the very least, please make your win32 servers simple console 
+apps, and not have rubbish wrappers around them to make them look 
+pretty (or at least have a runtime flag that gets rid of that 
+rubbish). This makes manually hooking into your server far 
+easier.
+
+
+Also, if you write a *nix dedicated server that needs X, you 
+should be shot. (I've forgotten which developer did this). 
+
+
+
+Dedicated servers that don't require the game to run. This 
+allows ISP's and the like that wouldn't go and buy the game to run 
+the server. Halfife GOOD, Quake3 BAD. 
+
+
+
+Console. id software introduced the console, and the console 
+was good. However, the console should only be a quick way for 
+experienced people to operate things. You shouldn't ever need to 
+drop to the console for anything. Every single graphics tweak, 
+sound tweak or whatever that the game developers consider "legal" 
+should be in the menus somewhere, preferably with a tooltip or 
+other explanation saying what they do.
+
+
+Also, please use the standard console key, and don't need people 
+to run the program with some fiddly command line option to get at 
+it. 
+
+
+
+International keyboard support. This is getting better, but 
+Quake1 had a total disregard for it, as did Allegiance (a MS game 
+that died due to several bits of mismanagement that reading this 
+webpage may have solved). 
+
+
+
+Portable settings. A player should be able to save all his 
+settings in one file, and be able to load all these settings on 
+another computer. He should have to fart about with what settings 
+are in the autoexec config, and what are in playername.cfg, and 
+what are in the mods directory config.cfg etc ... It should be a 
+simple option to "save all my settings".
+
+
+Of course some things like mouse drivers affecting sensitivity 
+are impossible to deal with, but you should make your best effort 
+at this. 
+
+
+
+Autodownloading of custom content. Without this custom content 
+doesn't get used. It's pretty much as simple as that. Ideally have 
+a field that is part of the custom content that is "download 
+locations", and have the client fetch (by http or ftp) from these 
+locations if possible in preference to fetching directly from the 
+server (to save on bandwidth on the server). If this isn't 
+possible, have a tuneable parameter as to how much bandwidth the 
+server will use for providing custom content to clients (don't have 
+it default to something far too low, like Quake3 does). 
+
+
+
+Multicast spectator tools. Like HLTV. Ideally actually using 
+proper multicasting when the internet in general is up to it. These 
+are essential if you want your game to get a good following as a 
+'spectator sport', in addition to having people play it. Possibly 
+have the viewer for this not require the game, so people can 
+download it, watch championship level games, and want to buy the 
+game to play it themselves. Like the Tennis effect in the UK 
+everytime Wimbledon is on the TV, for the month afterwards, all the 
+public courts are full, tennis racquets sell 50% of year round 
+sales at this time, and then everyone forgets it till next year. 
+
+
+
+Demo recording. It should be easy to record demos from a players 
+point of view, of what they did that game, for later playback. 
+Ideally, the server should also be able to record server side demos 
+of what every player did in the entire game. Please look at 
+compressing these demos as tightly as possible, look at the file size differences in .qwd and 
+.qwz in Quakeworld/Qizmo for an example of what happens when you 
+don't. 
\ No newline at end of file
diff --git a/main/source/doc/Training.txt b/main/source/doc/Training.txt
new file mode 100644
index 00000000..8f6b0a5c
--- /dev/null
+++ b/main/source/doc/Training.txt
@@ -0,0 +1,167 @@
+Features
+--------
+- Simple to add or reorder sections
+- Fully internationalizable
+- Allow skipping and replaying sections
+- Form solid base for scripting engine: only general changes to NS, no hard-coding tutorial behavior
+- Sections of tutorial are designed to be run independently.  Don't assume previous knowledge from one tutorial, nor assume any order.
+
+Overall code structure
+----------------------
+  I think we should have some general finite state machine that will call sections, and keep calling them until they finish.  Each section could be a function named
+using this the tut_xy convention and they could each specify if they have been completed or not.  Once this is established, we should be able to hook in new sections
+easily, with minimum work.  It should also easily allow bypassing of sections using the "need order" command.  Each section would need to be called such that it 
+can be forced to execute it's ending conditions.  I'll try to come up with this structure.  Once this is in, I can add the last hooks needed for the script behavior, 
+and the rest should be cake.
+
+function TutM1Init()
+end
+
+function TutM1Run(int inRunMode, string inText)
+	' Run mode 0 == reset
+	' Run mode 1 == execute step
+	' Run mode 2 == give hint or repeat instructions
+	' Run mode 3 == skip past step
+
+	' Return code 0 == Step didn't complete
+	' Return code 1 == Success, step completed
+end
+
+function TutM1IsComplete()
+	' Execute code when run is completed or skipped
+end
+
+function TutM1Completed(bool inShowAudioVisualCompletion)
+	' Execute code when run is completed or skipped
+end
+
+
+' Shell code
+	' Keep track of current part of training (g, m or a)
+	' Remember current step
+	' If time for next step?
+		' Run current training, with current run mode
+			' If 0 or none
+				' Run current step, mode 1
+					' If return value was 1, increment training for next tick
+					' Else if return value was 0, next step will be hint, set next time
+			' If 
+		' If current step 
+	' Else check if current step has been completed
+		' Call isComplete
+			' If so, increment 
+
+
+Tutorial
+--------
+All tasks are labelled as one of the following:
+	- map (meaning it's a map effect)
+	- script (meaning it's done via the scripting system)
+	- code (meaning the capability isn't there yet, and it must be added) 
+
+All the text that's displayed will be stored in titles.txt.  Name each bit of text with a nice naming convention, along the lines of the following:
+Tutxy - Where x is R for ready room, M for marines or A for aliens and y is a number starting with 1.
+
+This will let us easily tweak and internationalize the text without changing any of the scripts.
+
+Example:
+	script: "TutM3" -> titles.txt: "You are a soldier, and you are equipped with a machine gun, pistol and combat knife.  Press your left mouse button to try firing your machine gun."
+
+
+Go up lift
+	- Show intro credits (map)
+	- Show lots of cool stuff to get you in the mood, and get your senses primed
+
+Land in ready room
+	- Suppress countdown and regular MP player help (script) (code)
+	- Suppress initial resource tower completion (or remove it then add it when necessary?)
+	- Enable cheats (allows evolving to all aliens in tutorial with only one hive, makes building faster)
+	- Explain the concept of a ready room (script)
+	- Explain how to move (WASD, or arrow keys) (script)
+	- Tell the player to choose one side or the other (script)
+
+Soldier training
+	- Suppress ability to use command station (code, script)
+	- Welcome to marine training. Take this lift down to the training area.  (script)
+	- Give little flavor speech on the way down (being a TSA marine means sticking together, acting as a team, and following orders.  If you don't want to do this, perhaps you better find another unit.) (script)
+	- Prevent player from advancing past hallway at bottom of lift (map)
+		- If at any time the player asks for orders, skip past this phase of training
+		- "You are a soldier, and you are equipped with a machine gun, pistol and combat knife.  Press your left mouse button to try your machine gun." (script)
+		- "You can switch to your other weapons with the mousewheel, or by pressing the number keys, 1 through 3."
+		- Explain pop-up menu
+			- "Hold your right-mouse button to access your pop-up menu.  You can move your mouse over an area to see more options.  Move the mouse left to "orders", the select "need order".  (if not detected in 5-10 seconds, repeat, script)
+			- "Good.  Try a taunt by using your pop-up menu.  Hold your right-mouse button, select "Comms", move to "talk" then to "taunt" (wait, repeat if too slow, script)
+		- Open gate at end of hallway via a map trigger (script fires trigger, map links trigger to gate)
+		- "Good.  Now move to X to learn about military structures" (script)
+
+	- Military structure training
+		- When player reaches info_location... (script) (code)
+		- "Commencing, military structure training.  If you want to skip this phase of training, use your pop-up menu to ask for orders" (script)
+		- Point out resource tower. "This is a marine resource tower.  It collects resource for your team, and allows the Commander to research new technologies, and equip the team."  (script finds location of nearest resource tower and sends tooltip to point it out)
+		- "All structures must be built before they are activated.  A soldier can build a structure by pointing at the base of the structure and holding his 'use' key.  Try it." 
+		- Check build state of this entity.  If it doesn't increment at all within a few seconds, repeat the order.  Repeat until structure is built. (check build state of resource tower, proceed when at 100%, script)
+		- "Good.  Now the resource tower is fully built and will collect resources for your team."
+
+	- HUD training
+		- "HUD training commencing.  To skip this phase of training, use your pop-up menu to ask for orders" (script)
+		- "Your team's resources are always displayed at the top of the screen <point out>.  Notice that every few seconds the resource tower adds a few more points to your team's resource total" (point out resource total, script)
+		- "Only the team commander can spend resources.  As a soldier, it's your responsibility to fight enemies, build structures, and protect them." (pause, script)
+		- "This area of your HUD shows you the name of your commander.  Notice that you have no commander right now.  In a real military exercise, it's very important that you have a commander at all times.  A squad without a commander has very low survival odds." (pause, script)
+		- "Your HUD also shows your current health" (point, script)
+		- "..your armor" (point, script)
+		- "...the ammo in your clip, and your reserve ammo (point, script)
+		- "When your ammo is low, you can reload your weapon using the pop-up menu, or by pressing your 'r" key."
+		- "Your HUD has advanced entity recognition software that will describe objects you encounter.  If you see something you don't recognize, point your reticle at it and you'll see a description in the lower-left region of your HUD." (pause, script)
+		- "Your HUD also displays the structure around you, as well as teammate positions and known enemy locations.  Use this data even in battle, it can save more lives then your own." (point out, script)
+
+	- Orders training
+		- "Orders training commencing.  To skip this phase of training, use your pop-up menu to ask for orders" (script)
+		- "During a military exercise, your commander will give you orders using his command interface." (pause, script)
+		- "Here's a test order.  The blinking blue circle on your screen is telling you to move to that location.  Move to this waypoint now." (script)
+		- When player has completed orders: "Good.  Notice that your order was completed automatically.  Commanders often give new equipment, health and ammo to soldiers that keep their cool in battle and follow orders.  Keep this in mind when deciding whether to follow orders or not." (script)
+		- "The commander has more information about the environment then soldiers do, so sometimes an order may not make sense, but you should follow it anyways.  The commander can often point out enemies before you see them." (script)
+		- Create infantry portal nearby, with a build order (code, script)
+		- "This is what it looks like when the commander creates a new structure, and needs you to build it.  Build this structure by pointing at the base of it and holding your use key." (script)
+		- (when built) "Good.  One last thing about orders: when you need something to do, use your popup menu to ask for orders (left, up).  After receiving orders that you intend to carry out, use the pop-up menu to acknowledge them.  The commander will be grateful."
+
+	- Objectives
+		- Teach players about alien menace?  Would that be weird when adding marine vs. marine later?
+
+	- "Soldier training complete.  To begin commander training, walk to the command station and press your 'use' key."
+
+Commander training
+	- 
+
+
+Alien training
+	- HUD stuff
+		- Energy
+		- Individual resources 
+		- Weapons
+		- Hive sight
+
+	- Pop-up menu
+		- Evolving to new lifeforms
+			- Change to builder
+				- Hives
+					- Kill existing hive
+					- Explain what hive locations look like
+					- Build new hive
+				- Build turret
+
+	- Alien structures and builder training
+		- Resource towers
+		- Offense chambers
+		- Hurt a building, then show player how to heal it
+		- Upgrade chambers
+
+	- Upgrades
+		- Blinking icons
+		- Choose an upgrade, show level
+		- Explain that once an upgrade is chosen, it is automatic (maybe not needed)
+
+	- Ability to try out all lifeforms
+		- Give resources often
+			- Explain web
+			- Explain wall-running
+			- Explain flight
diff --git a/main/source/doc/Voiceover.txt b/main/source/doc/Voiceover.txt
new file mode 100644
index 00000000..53da8759
--- /dev/null
+++ b/main/source/doc/Voiceover.txt
@@ -0,0 +1,126 @@
+Lani: 619 583-2792
+
+"You're listening to NS radio"
+"Hive construction complete"
+
+
+Budget and constraints
+----------------------
+$600 for as many of these as you can do.  If you or any of the other voice professionals want to have fun and adlib their own sayings for free, please do 
+so and I'll use them for free.
+
+Desired format: 16-bit, Mono, 22050 Hz, Windows PCM .wavs
+
+Marine voices
+-------------
+Macho sounding, confident and bad-ass, but a bit foolhardy and inexperienced.  I'm too cool
+attitude.  These guys are hand-picked elite soldiers, and are working for the "cool" army.  They're not in it for the money,
+they're here because they know the Frontiersmen are the best and they're the best.  I'm really trying to promote cameraderie, teamwork, and
+interdependence between the marines and between the marines and their commander, so you can keep that in mind when casting.
+
+  Need ammo - "Commander, I need ammo!", "I need ammo over here!",
+  "It's gonna get ugly if I don't get another clip!", "Can anyone bring
+  me some ammo?"
+  Need health - "I need a medpack, stat!", "<groaning, teeth clenched>
+  Mmmmh, need help here", <super-rare homage> "Frontiersman, needs
+  food, badly"
+  Need order - "Standin' by".  "Where are those orders?", "Ready to
+  move.", "Commander, I'm standin' by."
+  Order acknowledged - "I'm on it", "Consider it done"
+  Objective completed - "Objective completed." 
+  Taunt - "Tell me one thing...why am I sooo bad?", "How'd I get to be
+  so good?", "Color me bad...-ass.", "Blood's in fashion this season",
+  "I only need to know one thing...what they are", "My home!" (damn
+  these are fun)
+  (this is about half of them)
+  (depending on costs, you could do female soldier versions of all
+  these as well, and we'll use them in the future when we add a female
+  model <which WON'T have big bust and skimpy amor, but will look more
+  like one of the boys>)
+  Enemy spotted - "<quiet, over throat mike> Enemy spotted" "We've got
+  hostiles."
+  Need commander - "We need a commander"
+  Game starts - "Squad, let's get those 
+  Misc: "All clear!", "For Ariadne!", "Now let's take back what's
+  ours.", "Remember, we're not just fightin' aliens out here, we're
+  fightin' for goddam law and order.", "Aliens!  Yee-freakin’-hah!",
+  "Watch your fire!"
+
+  - Commander voices (older and more mature, somewhat grizzled combat
+  vet, calm and cool.  I)
+  Move to waypoint - "Move to your waypoint, soldier", "Proceed into
+  the structure"
+  Build - "Build structure at waypoint", "
+  Attack - "Attack that enemy structure", "Attack the enemy"
+  Pull back - "Pull outta there...now."
+  Weld target - "Weld that area area, on the double"
+  (this is perhaps half of them)
+
+  - Command station computer voice.  These are pretty standard RTS
+  alerts.  This could be the standard sexy female computer voice, or
+  your own take on it.  The command station that's used to guide the
+  troops and build structures is actually a reprogrammed general
+  maintainance computer.  It seems a little strange that it would be
+  able to say "Your base is under attack", so maybe it should sound
+  synthesized, or otherwise put together from a dictionary of words? 
+  Only if it sounds cool though.
+
+  - Your base is under attack
+  - The command station is under attack
+  - Your soldiers have engaged the enemy
+  - Upgrade complete
+  - Research complete
+
+  - Alien team voices.  Should sound sound like an alien "hive" talking
+  to his team.  You're perfect for this.  This could be a lot like the
+  Zerg voice saying "The hive cluster is under attack".  It's bad-ass,
+  animal-like, sloppy and telepathically transmitted.  Whereas the
+  command station computer voice says "Your", the alien team voices say
+  "our" and "we", implying the communal hive mind.  Also, the marines
+  are generally male voices, and the aliens are generally female voices
+  (though neither side is good nor evil, they are both species just
+  trying to survive).
+
+  - "Our hive is under attack", "Our mother, needs help", "<a little
+  sad> Our hive...is dying"
+  - "Our structure is under attack", "
+  - "We need another hive", "We must expand to survive"
+  - "We need upgrade chambers"
+  - "The enemy approaches"
+  - "Hive construction complete", "Our hive...is complete"
+  - "You need more resources"
+  - "Resources...running out"
+  - "Parasite implanted"
+  - "Eradicate the intruders"
+  - Some grunts and pain sounds for the hive and shared organic
+  structures, when they take damage.  They are all linked, and they're
+  all alive.  Nothing too blood-curdling or chilling, there's no horror
+  here, more of a pagan/natural/primal/animal feel.
+
+  - Tutorial voice overs.  Depending on cost for this stuff, we could
+  use some tutorial voice overs as well, though I'm not sure I can
+  afford them.  These are full sentences or paragraphs, and will be
+  fairly dry.  "Walk up to the structure, look at the base, and hold
+  your 'use' key to build it.".  "Use your pop-up menu to ask for ammo
+  and health, or to communicate with the rest of your squad.".
+  
+  Finally, we really need to talk about rates.  I know high-quality
+  work costs good money, and I'm willing to pay it, but I do need to
+  know about how much it's going to cost me either per sample, or per
+  hour, so I can reduce the number of sounds we need, or add more.  
+
+  I want you to do the alien team voices (I wouldn't even consider
+  anyone else), and I'd like you to find and/or record others for the
+  marine voices and commander voices.  If in my price range, I'd also
+  like you to do the tutorial voice overs, though that's a lot more
+  reading and probably a lot less fun.  Lastly, I've heard that you
+  know some of the guys that did the macho voice overs for Unreal
+  Tournament.  Maybe they would be good for this as well?
+
+  I hope this isn't too much to take in at once, and I hope you're
+  still interested in working on Natural Selection.  Let's talk on the
+  phone sometime soon (today, or anytime this week), and we can discuss
+  rates and other specifics.  Thanks a lot, I can't wait to get going
+  on this!
+
+
diff --git a/main/source/doc/metamod-NS.txt b/main/source/doc/metamod-NS.txt
new file mode 100644
index 00000000..77f9e556
--- /dev/null
+++ b/main/source/doc/metamod-NS.txt
@@ -0,0 +1,142 @@
+// vim: set ft=cpp :
+
+//
+// Metamod info file
+//
+// Natural Selection, v3.0
+//
+// Game name: Natural Selection
+// Homepage URL: http://www.natural-selection.org (sister site: http://www.readyroom.org)
+// Game version: v3.0
+// Game directory: ns
+// Win32 DLL name: ns.dll
+// Linux SO name: ns_i386.so
+// Last updated: January 29th, 2004
+// contact: flayra@overmind.org
+//
+
+//
+// Start: NS v3.0
+// 
+// Note, this should also include entities in previous versions of NS as well.
+//
+
+// General entities
+info_team_start
+info_spectate
+info_join_team
+info_leave_game
+info_join_autoassign
+info_mapinfo
+info_gameplay
+
+env_fog
+env_gamma
+env_particles
+env_particles_custom
+
+func_weldable
+func_seethrough
+func_seethroughdoor
+func_nobuild
+func_resource
+
+info_location
+target_mp3audio
+trigger_presence
+trigger_random
+trigger_script
+
+// Used for dropped weapons
+weaponbox
+
+// Marine structures
+resourcetower
+team_command
+team_infportal
+team_turretfactory
+team_advturretfactory
+team_armory
+team_advarmory
+team_armslab
+team_prototypelab
+team_observatory
+
+// Marine weapons
+item_mine
+item_catalyst
+weapon_grenade
+weapon_grenadegun
+weapon_heavymachinegun
+weapon_knife
+weapon_machinegun
+weapon_mine
+weapon_pistol
+weapon_shotgun
+weapon_welder
+
+// Marine equipment
+item_genericammo
+item_health
+item_heavyarmor
+item_jetpack
+phasegate
+scan
+siegeturret
+turret
+
+// Alien structures
+alienresourcetower
+defensechamber
+movementchamber
+offensechamber
+sensorychamber
+team_hive
+team_webstrand
+
+// Alien abilities/weapons (along with their projectiles)
+weapon_acidrocket
+weapon_acidrocketgun
+weapon_bilebomb
+weapon_bilebombgun
+weapon_bitegun
+weapon_bite2gun
+weapon_blink
+weapon_charge
+weapon_claws
+weapon_devour
+weapon_divinewind
+weapon_healingspray
+weapon_leap
+weapon_metabolize
+weapon_parasite
+weapon_primalscream
+weapon_spit
+weapon_spore
+weapon_stomp
+weapon_swipe
+weapon_umbra
+weapon_webspinner
+
+// Alien projectiles
+spitgunprojectile
+sporegunprojectile
+umbracloud
+webgunprojectile
+
+// Old/unused entities for backwards compatibility
+gren_projectile
+nuke
+team_chemlab
+team_medlab
+team_nukeplant
+weapon_babblergun
+weapon_babblerprojectile
+weapon_flamegun
+weapon_nukegun
+weapon_paralysis
+weapon_spikegun
+
+//
+// End: NS v3.0
+//
\ No newline at end of file
diff --git a/main/source/doc/soap.txt b/main/source/doc/soap.txt
new file mode 100644
index 00000000..0214b50b
--- /dev/null
+++ b/main/source/doc/soap.txt
@@ -0,0 +1,3 @@
+
+Top level is server object
+
diff --git a/main/source/doc/v30b5.txt b/main/source/doc/v30b5.txt
new file mode 100644
index 00000000..b1cfb72b
--- /dev/null
+++ b/main/source/doc/v30b5.txt
@@ -0,0 +1,230 @@
+Features and bug fixes for beta 5
+---------------------------------
+Charlie
+- Evaluate new map: thor
+O Update ns_metal (in "to backup", dated 5/17)
+- New Guide icon for newly-relaunched Guide program (if program ready in time).
+- Remove co_core because no source?
+	- Posted note for Merkaba
+X Other CPL-specific stuff
+- Evaluate BrigadierWolf's submissions
+O Dev/team/forum changes/updates
+O Evaluate altair
+O Removed Xfire from installer
+O Updated Steam browser description and picture
+- Adjustments for large #s of players
+	- Try PTing scaling of resources
+	- Try PTing scaling of respawn times
+	
+O Updated ns_metal
+	* More infestation/Tweaks
+	* Optimized surface access
+	* Fixed 3 build exploits
+	* Removed weldable pipe(shortcut)
+
+O Test co_basic (not pretty enough)
+
+O Added two missing sounds in ns_agora
+
+O Updated ns_bast
+	- Reduced size of the vent on top of feedwater so marines have to crouch
+	- Fixed button on the Engine Door
+	- Fixed a lot of areas where the comm shouldn't build (this includes all the weird feedwater spots)
+	- Raised Feedwater hive to avoid exploits
+	- Moved the Feedwater resource a bit so you can get behind it
+	- Moved engine and added a second exit to the hive
+	- Moved the res outside of Refinery to Water treatment
+	- Made the revolving door unusable (like the one on the other side)
+	- Lowered Marine Spawn closer to the cargo level and removed the elevator
+	- Added new area between the Marine Spawn and the Engine corridor
+	- Moved the new res on the bottom of the main aft lift closer to Tram Tunnel.
+	- Reduced excessive brightness in some areas (lights over the nodes, feedwater)
+	- Added vent between Feedwater and Tram Tunnel
+	- Tweaked the Tram so the Onos can fit without crouching
+	- Fixed strange clipping holes and errors (this includes some stuck issues too)
+	- Added lights to the underwater tunnel
+
+O Updated co_ulysses
+	- Fixed bug in Hive ramp
+	- Changed and added detail at Cargo Bay, Marine Spawn and Hive.
+	- Added a new window to space at Cargo Hive.
+	- Modified some lights along the map to make it less “discotheque” looking.
+
+O Updated co_daimos
+	- fixed stuck issue in Lower Sewer (bug #0000590)
+	- grates can now be shot through (bug #0000692)
+	- added a vent from Hive Area to Upper Tram to allow Alien to fall into the Marines' back there.
+	- added a vent from Hive Area to Exactly above the PG welding point.
+
+O Alien resource nodes don't play gurgling sounds until a minute into the game (prevents commander from listening for starting hive)
+O Lowered turret factory build time from 13 seconds to 9 seconds
+O Movement chamber range increased from 400 to 500
+O Movement chamber energy bonus increased from 10% to 25%
+O Changed healing spray effectiveness vs. players: changed from 16 to 13 + 4% of target (both for healing friendly players and attacking enemy players)
+O Increased Gorge armor from 40 to 50
+O Increased Onos carapace armor bonus from 150 to 350 (makes it closer 50% like all the other aliens)
+O Changed hand grenade physics to make them more effective at attacking indirectly
+O Increased redemption chance from 35% per second to 45% per second (still happens when at or below 40% health)
+O Increased spit damage from 25 to 30
+O Grenade launcher cost lowered from 20 to 15
+
+Combat changes (thanks Forlorn!)
+	O Aliens always respawn as skulk, even if they were previously a higher lifeform
+	O Dying with a larger lifeform gives you back points spent on it
+	O Unchained alien lifeforms, like regular NS:
+		O Gorge costs 1 level
+		O Lerk costs 2 levels
+		O Fade costs 3 levels
+		O Onos costs 4 levels
+	O Lifeform evolution times increased to 75% of those in regular NS
+	
+O Changed version to "beta 5"
+
+Not checked in (previously mentioned)
+---
+X Electrical nodes take energy instead of health (adren counter-acts electricity exactly)
+	X Cost lowered from 30 to 20
+	X Research time lowered from 30 to 20
+	X 33% alien energy is reduced on each hit.  Structures are not affected affected by electricity.
+	X Fix energy issues
+X Distress beacon siren now emanates from the marine spawn area instead of the observatory (average of marine spawn points)
+--
+
+O Updated ns_hera
+	O Added missing titles
+	O Added a resource node in north-west corner of the map, by the weld to the rock cavity.
+	O Removed a node from Holoroom
+	O Removed ground path from Cargo to Holoroom
+	O Added in a balcony overlooking the Holoroom, accessible from the upper level of Cargo.
+	O Moved the node in Cargo back to it's original place - down in the pit beneath the door.
+	O Re-routed Maintenance Access' Cargo exit to beside the cargo life next to MS. (Just so the exit doesn't come out at the resource node)
+	O Enlarged the general area around the CC, as well as fixed the getting stuck problem around it.
+	O Fixed being able to see into the vent hive as commander with no marines around.
+	O Added a vent between Archiving hive and North Corridor (heralocation_ncorridor).
+	O Added a vent from broken security door to cargo lift.
+	O General fixes and modifications.
+
+O Updated ns_bast
+	O Fixed two new clipping errors
+	O Fixed excessive brightness in the marine start
+
+X Reduced jetpack cost from 15 to 10 (Jetpack cost back to 15)
+O Increased jetpack maneuverability, jetpackers are now immune to stomp and carried items/ammo affect lift less
+O Decreased Combat gestation time
+O Changed mp_limitteams default from 2 to 1 (in server.cfg and listenserver.cfg)
+O Undid turret factory build time change (back to 13) until turret farming hives can be resolved properly
+O Decreased grenade bounciness and increased gravity (I think this is perfect for everyone now)
+O Fixed bug where the hive take-damage animation interrupted itself
+O Fixed bug where HPB_bot wasn't working (internal use only)
+? Combat spawning changes (reprise)
+	O Players spawn in waves, with a maximum wave size of 5 players
+	O A wave starts when there is no wave in progress and a player dies
+	O The wave finishes when 5 seconds + (number of dead players - 1)*4.5 seconds have elapsed
+	
+- Increased welder priority so grenades appear below welder (so they aren't chosen by accident)
+- Tweak alien res model for large/small games
+
+
+Changes from XP-Cagey (the details are a bit fuzzy still, as I'm doing his check-in for him)
+O 'lastinv' is now client-side predicted
+O fixed bug where aliens sometimes spawned without a weapon
+O Fixed occasional 'garbage' in scoreboard title
+O Tweaked weapon 'weights' so grenades and other droppables are prioritzed better
+O Fixed bug with heavy armors in the minimap
+O When players in the air and are knocked-back, don't send them flying away so fast
+O Fixed bugs recently introduced in structure placement (especially resource towers)
+
+-O Changed method of giving players weapons/heavy armor/jetpack in combat mode, players should never seen a weapon or armor module on the ground ever again.
+-O Players can no longer delay their death by issuing kill command again.
+-O The sound when an alien building is placed only plays if the building is successfully placed.
+-O Fixed bug where evolving from a higher lifeform to a lower lifeform with low health would give you 0 health, but you would still be "alive".
+-O Fixed missing STEAMID's from some log messages.
+-O Changed method of locking cvars to one thats faster and cleaner.
+-O Added missing newline character in log message.
+-O Parasite flag now removed when a mapper placed building is destroyed.
+-O Aliens no longer take negative damage when they have 4 or more hives.
+-O Chat box code now sends strings as a single argument rather than multiple arguments.
+-O Fixed bug with health message being spammed.
+-O Commander can now click on switches to activate a door or elevator.
+-O Aliens can no longer evolve in mid air.
+-O Parasite flag is now removed from players when they die.
+-O Aliens will no longer show up on motion tracking if they are dead.
+-O Fixed "Game reset started" and "Game reset complete" log messages from sometimes having wierd characters.
+-O Added cvar "s_show" to locked cvars. (Forced to 0)
+-O Aliens now that get healed while evolving will keep thier health percentage once they finish evolving.
+-O Removed old flashlight battery code to prevent bug where players could run out of flashlight energy.
+-O "slowresearch" cheat now slows down recycling of buildings.
+-O Improved knockback code, HA takes less knockback than LA/JP'ers, less knockback is also applied if they are in the air
+-O Changed knockback of bitegun from 300 to 225. 
+-O Knockback _never_ affects friendlies.
+-O Parasite and xenocide now get damage boosts by primal scream.
+-O Commanders can no longer use a chair while its recycling.
+-O +attack and +jump can no longer be bound to mousewheel with mp_blockscripts 1.
+-O Added lightgamma to locked cvars. Value cannot be set below 2.0
+-O Removed ex_interp from cvar locks (I dont think its exploitable anymore)
+-O Added locking of r_detailedtextures to 0 due to exploit.
+-O Commanders can no longer use thier use key, they dont need it anyways (to prevent phantom use sounds).
+-O Weapon upgrades now affect turrets.
+-O Aliens can now evolve on slopes without having to jump.
+-O Aliens can now evolve again in the air (this was a previous change by me, which was the incorrect fix for the above)
+-O Fixed odd problem with alien regen, aliens could sometimes get insane health.
+-O lastinv no longer plays sound when used.
+-O Tweaked welder sounds a bit, welder now plays different sounds when its welding something & when its not welding, so its now possible to tell if your welding something or not.
+-O Fixed alerts not playing when a 'friendly' gorge attacks a building with FF on.
+-O Silence now affects the 'response' scream from players if they have silence.
+-O Silence now silences the scream emitted before a xenocide.
+-O Limited the updating of balance vars to 10 per second to prevent overflows.
+-O Removed automatic switch on alien weapons (added by cagey when lastinv was put in) due to odd crashes.
+-O Tweaked welder some more, added 2 balancevars to tweak how welder acts on players vs buildings.
+-O Lowered chat text bit (it was way too high).
+-O Changed channel of welder sound (to prevent it from cutting out when someone says something)
+-O Made a slight tweak to evolving, players should always be able to evolve if theres enough room.
+-O Digesting sounds are now quieter/silent if a player has silence upgrade.
+-O Blasts from onos gore, xenocide, no longer affect teammates, ever.
+-O Players gestate sound is now silenced if they are upgrading to silence.
+-O Waypoints shouldnt follow cloaked aliens. 
+-O Spectators should be able to see cloaked alien buildings when spectating in first person.
+-O Added precaches for certain sprites for mp_consistency.
+-O Re-added old sound that played when points were spent. (It rocks)
+-O Updated ns_nancy from Lazer
+-O Updated turret sounds from madmax.
+-O Made small code change with the welder (behaves same)
+-O Entity build limit circles ignores non-solid entities.
+-O Players that have joined a team before no longer qualify to be spawned back in instantly (prevents exploit with rushes)
+-O Damage is always rounded up to the highest full number.
+-O Fixed handgrenade from playing the same sound twice, now players the pin pull sound & throw sound when thrown rather than the pin pull sound twice.
+-O Fixed issue with mapper placed offense chambers with the startbuilt flag on from ever working, they will now auctually be fully built & should be operational.
+-O New grenade model from BrigadierWolf.
+-O Updated grenade sounds from MadMaxx
+
+
+Update from Elven Thief - (7/7/04)
+- Fixed bug where turrets would not target or fire on underwater aliens.
+- Fixed at same time issue where aliens that spawned or became submerged in water without
+  moving could not be shot.
+
+  WE HAVE A PROBLEM with playtest builds as it seems there is something with Balance.txt
+  causing overflow to client builds if the server is trying to send a copy of the vars.
+
+  ** SEE e-mail I sent to both of you (Flay)
+
+O Reduced time it takes to through hand-grenades (thanks BrigadierWolf!)
+O Changed grenade physics to a light toss when tossing grenade from crouched position
+O Improved animation playback for grenade view model, including synching up grenade creation with throw
+
+O Updated ns_eclipse
+	O Removed doors in Marine Spawn
+	O Layout adjustments to Marine Spawn
+	O Fixed clipnode issues in South Loop (invisible "ledges")
+	O Additional lighting tweaks
+	O Removed added pipes in Triad - nice idea, but very hard to implement logically. 
+	O Fixed damage issues on weldable doors 
+	O Attempted to smooth over infestation 'terrain' in hives (single convex clip brushes) 
+	O Fixed lips in vent to marine spawn and other vents for smoother navigation 
+	O Replaced old infestation texture with new hotness
+
+Charlie TODO:
+- Eclipse update from KFS
+
+Expose bunny-hopping to everyone? (+3jump automatically, or Quake-style queued jump?)
+1 for skulk, 3 for fade/onos?
diff --git a/main/source/engine/APIProxy.h b/main/source/engine/APIProxy.h
new file mode 100644
index 00000000..0675fb63
--- /dev/null
+++ b/main/source/engine/APIProxy.h
@@ -0,0 +1,178 @@
+
+// ********************************************************
+// Functions exported by the client .dll
+// ********************************************************
+
+// Function type declarations for client exports
+typedef int		( *INITIALIZE_FUNC )( struct cl_enginefuncs_s*, int );
+typedef void	( *HUD_INIT_FUNC )( void );
+typedef int		( *HUD_VIDINIT_FUNC )( void );
+typedef int		( *HUD_REDRAW_FUNC )( float, int );
+typedef int		( *HUD_UPDATECLIENTDATA_FUNC )( struct client_data_s*, float );
+typedef void	( *HUD_RESET_FUNC )( void );
+typedef void	( *HUD_CLIENTMOVE_FUNC )( struct playermove_s *ppmove, qboolean server );
+typedef void	( *HUD_CLIENTMOVEINIT_FUNC )( struct playermove_s *ppmove );
+typedef char	( *HUD_TEXTURETYPE_FUNC )( char *name );
+typedef void	( *HUD_IN_ACTIVATEMOUSE_FUNC )( void );
+typedef void	( *HUD_IN_DEACTIVATEMOUSE_FUNC )( void );
+typedef void	( *HUD_IN_MOUSEEVENT_FUNC )( int mstate );
+typedef void	( *HUD_IN_CLEARSTATES_FUNC )( void );
+typedef void	( *HUD_IN_ACCUMULATE_FUNC )( void );
+typedef void	( *HUD_CL_CREATEMOVE_FUNC )( float frametime, struct usercmd_s *cmd, int active );
+typedef int		( *HUD_CL_ISTHIRDPERSON_FUNC )( void );
+typedef void	( *HUD_CL_GETCAMERAOFFSETS_FUNC )( float *ofs );
+typedef struct kbutton_s * ( *HUD_KB_FIND_FUNC )( const char *name );
+typedef void	( *HUD_CAMTHINK_FUNC )( void );
+typedef void	( *HUD_CALCREF_FUNC )( struct ref_params_s *pparams );
+typedef int		( *HUD_ADDENTITY_FUNC )( int type, struct cl_entity_s *ent, const char *modelname );
+typedef void	( *HUD_CREATEENTITIES_FUNC )( void );
+typedef void	( *HUD_DRAWNORMALTRIS_FUNC )( void );
+typedef void	( *HUD_DRAWTRANSTRIS_FUNC )( void );
+typedef void	( *HUD_STUDIOEVENT_FUNC )( const struct mstudioevent_s *event, const struct cl_entity_s *entity );
+typedef void	( *HUD_POSTRUNCMD_FUNC )( struct local_state_s *from, struct local_state_s *to, struct usercmd_s *cmd, int runfuncs, double time, unsigned int random_seed );
+typedef void	( *HUD_SHUTDOWN_FUNC )( void );
+typedef void	( *HUD_TXFERLOCALOVERRIDES_FUNC )( struct entity_state_s *state, const struct clientdata_s *client );
+typedef void	( *HUD_PROCESSPLAYERSTATE_FUNC )( struct entity_state_s *dst, const struct entity_state_s *src );
+typedef void	( *HUD_TXFERPREDICTIONDATA_FUNC )( struct entity_state_s *ps, const struct entity_state_s *pps, struct clientdata_s *pcd, const struct clientdata_s *ppcd, struct weapon_data_s *wd, const struct weapon_data_s *pwd );
+typedef void	( *HUD_DEMOREAD_FUNC )( int size, unsigned char *buffer );
+typedef int		( *HUD_CONNECTIONLESS_FUNC )( const struct netadr_s *net_from, const char *args, char *response_buffer, int *response_buffer_size );
+typedef	int		( *HUD_GETHULLBOUNDS_FUNC )( int hullnumber, float *mins, float *maxs );
+typedef void	( *HUD_FRAME_FUNC)( double );
+typedef int		( *HUD_KEY_EVENT_FUNC )( int eventcode, int keynum, const char *pszCurrentBinding );
+typedef void	( *HUD_TEMPENTUPDATE_FUNC )( double frametime, double client_time, double cl_gravity, struct tempent_s **ppTempEntFree, struct tempent_s **ppTempEntActive, int ( *Callback_AddVisibleEntity )( struct cl_entity_s *pEntity ), void ( *Callback_TempEntPlaySound )( struct tempent_s *pTemp, float damp ) );
+typedef struct cl_entity_s *( *HUD_GETUSERENTITY_FUNC )( int index );
+typedef void	( *HUD_VOICESTATUS_FUNC )( int entindex, qboolean bTalking );
+typedef void	( *HUD_DIRECTOREVENT_FUNC )( int iSize, void *pbuf );
+typedef int		( *HUD_STUDIO_INTERFACE_FUNC )( int version, struct r_studio_interface_s **ppinterface, struct engine_studio_api_s *pstudio );
+
+// Pointers to the exported client functions themselves
+typedef struct
+{
+	INITIALIZE_FUNC						pInitFunc;
+	HUD_INIT_FUNC						pHudInitFunc;
+	HUD_VIDINIT_FUNC					pHudVidInitFunc;
+	HUD_REDRAW_FUNC						pHudRedrawFunc;
+	HUD_UPDATECLIENTDATA_FUNC			pHudUpdateClientDataFunc;
+	HUD_RESET_FUNC						pHudResetFunc;
+	HUD_CLIENTMOVE_FUNC					pClientMove;
+	HUD_CLIENTMOVEINIT_FUNC				pClientMoveInit;
+	HUD_TEXTURETYPE_FUNC				pClientTextureType;
+	HUD_IN_ACTIVATEMOUSE_FUNC			pIN_ActivateMouse;
+	HUD_IN_DEACTIVATEMOUSE_FUNC			pIN_DeactivateMouse;
+	HUD_IN_MOUSEEVENT_FUNC				pIN_MouseEvent;
+	HUD_IN_CLEARSTATES_FUNC				pIN_ClearStates;
+	HUD_IN_ACCUMULATE_FUNC				pIN_Accumulate;
+	HUD_CL_CREATEMOVE_FUNC				pCL_CreateMove;
+	HUD_CL_ISTHIRDPERSON_FUNC			pCL_IsThirdPerson;
+	HUD_CL_GETCAMERAOFFSETS_FUNC		pCL_GetCameraOffsets;
+	HUD_KB_FIND_FUNC					pFindKey;
+	HUD_CAMTHINK_FUNC					pCamThink;
+	HUD_CALCREF_FUNC					pCalcRefdef;
+	HUD_ADDENTITY_FUNC					pAddEntity;
+	HUD_CREATEENTITIES_FUNC				pCreateEntities;
+	HUD_DRAWNORMALTRIS_FUNC				pDrawNormalTriangles;
+	HUD_DRAWTRANSTRIS_FUNC				pDrawTransparentTriangles;
+	HUD_STUDIOEVENT_FUNC				pStudioEvent;
+	HUD_POSTRUNCMD_FUNC					pPostRunCmd;
+	HUD_SHUTDOWN_FUNC					pShutdown;
+	HUD_TXFERLOCALOVERRIDES_FUNC		pTxferLocalOverrides;
+	HUD_PROCESSPLAYERSTATE_FUNC			pProcessPlayerState;
+	HUD_TXFERPREDICTIONDATA_FUNC		pTxferPredictionData;
+	HUD_DEMOREAD_FUNC					pReadDemoBuffer;
+	HUD_CONNECTIONLESS_FUNC				pConnectionlessPacket;
+	HUD_GETHULLBOUNDS_FUNC				pGetHullBounds;
+	HUD_FRAME_FUNC						pHudFrame;
+	HUD_KEY_EVENT_FUNC					pKeyEvent;
+	HUD_TEMPENTUPDATE_FUNC				pTempEntUpdate;
+	HUD_GETUSERENTITY_FUNC				pGetUserEntity;
+	HUD_VOICESTATUS_FUNC				pVoiceStatus;
+	HUD_DIRECTOREVENT_FUNC				pDirectorMessage;
+	HUD_STUDIO_INTERFACE_FUNC			pStudioInterface;
+} cldll_func_t;
+
+// Function type declarations for client destination functions
+typedef void ( *DST_INITIALIZE_FUNC )( struct cl_enginefuncs_s**, int *);
+typedef void ( *DST_HUD_INIT_FUNC )( void );
+typedef void ( *DST_HUD_VIDINIT_FUNC )( void );
+typedef void ( *DST_HUD_REDRAW_FUNC )( float*, int* );
+typedef void ( *DST_HUD_UPDATECLIENTDATA_FUNC )( struct client_data_s**, float* );
+typedef void ( *DST_HUD_RESET_FUNC )( void );
+typedef void ( *DST_HUD_CLIENTMOVE_FUNC )( struct playermove_s **, qboolean * );
+typedef void ( *DST_HUD_CLIENTMOVEINIT_FUNC )( struct playermove_s ** );
+typedef void ( *DST_HUD_TEXTURETYPE_FUNC )( char ** );
+typedef void ( *DST_HUD_IN_ACTIVATEMOUSE_FUNC )( void );
+typedef void ( *DST_HUD_IN_DEACTIVATEMOUSE_FUNC )( void );
+typedef void ( *DST_HUD_IN_MOUSEEVENT_FUNC )( int * );
+typedef void ( *DST_HUD_IN_CLEARSTATES_FUNC )( void );
+typedef void ( *DST_HUD_IN_ACCUMULATE_FUNC )( void );
+typedef void ( *DST_HUD_CL_CREATEMOVE_FUNC )( float *, struct usercmd_s **, int * );
+typedef void ( *DST_HUD_CL_ISTHIRDPERSON_FUNC )( void );
+typedef void ( *DST_HUD_CL_GETCAMERAOFFSETS_FUNC )( float ** );
+typedef void ( *DST_HUD_KB_FIND_FUNC )( const char ** );
+typedef void ( *DST_HUD_CAMTHINK_FUNC )( void );
+typedef void ( *DST_HUD_CALCREF_FUNC )( struct ref_params_s ** );
+typedef void ( *DST_HUD_ADDENTITY_FUNC )( int *, struct cl_entity_s **, const char ** );
+typedef void ( *DST_HUD_CREATEENTITIES_FUNC )( void );
+typedef void ( *DST_HUD_DRAWNORMALTRIS_FUNC )( void );
+typedef void ( *DST_HUD_DRAWTRANSTRIS_FUNC )( void );
+typedef void ( *DST_HUD_STUDIOEVENT_FUNC )( const struct mstudioevent_s **, const struct cl_entity_s ** );
+typedef void ( *DST_HUD_POSTRUNCMD_FUNC )( struct local_state_s **, struct local_state_s **, struct usercmd_s **, int *, double *, unsigned int * );
+typedef void ( *DST_HUD_SHUTDOWN_FUNC )( void );
+typedef void ( *DST_HUD_TXFERLOCALOVERRIDES_FUNC )( struct entity_state_s **, const struct clientdata_s ** );
+typedef void ( *DST_HUD_PROCESSPLAYERSTATE_FUNC )( struct entity_state_s **, const struct entity_state_s ** );
+typedef void ( *DST_HUD_TXFERPREDICTIONDATA_FUNC )( struct entity_state_s **, const struct entity_state_s **, struct clientdata_s **, const struct clientdata_s **, struct weapon_data_s **, const struct weapon_data_s ** );
+typedef void ( *DST_HUD_DEMOREAD_FUNC )( int *, unsigned char ** );
+typedef void ( *DST_HUD_CONNECTIONLESS_FUNC )( const struct netadr_s **, const char **, char **, int ** );
+typedef void ( *DST_HUD_GETHULLBOUNDS_FUNC ) ( int *, float **, float ** );
+typedef void ( *DST_HUD_FRAME_FUNC )( double * );
+typedef void ( *DST_HUD_KEY_EVENT_FUNC )( int *, int *, const char ** );
+typedef void ( *DST_HUD_TEMPENTUPDATE_FUNC )( double *, double *, double *, struct tempent_s ***, struct tempent_s ***, int ( **Callback_AddVisibleEntity )( struct cl_entity_s *pEntity ),	void ( **Callback_TempEntPlaySound )( struct tempent_s *pTemp, float damp ) );
+typedef void ( *DST_HUD_GETUSERENTITY_FUNC )( int * );
+typedef void ( *DST_HUD_VOICESTATUS_FUNC )(int *, qboolean *);
+typedef void ( *DST_HUD_DIRECTORMESSAGE_FUNC )( int* iSize, void **pbuf );
+typedef void ( *DST_HUD_STUDIO_INTERFACE_FUNC )( int *, struct r_studio_interface_s ***, struct engine_studio_api_s ** );
+
+// Pointers to the client destination functions
+typedef struct
+{
+	DST_INITIALIZE_FUNC						pInitFunc;
+	DST_HUD_INIT_FUNC						pHudInitFunc;
+	DST_HUD_VIDINIT_FUNC					pHudVidInitFunc;
+	DST_HUD_REDRAW_FUNC						pHudRedrawFunc;
+	DST_HUD_UPDATECLIENTDATA_FUNC			pHudUpdateClientDataFunc;
+	DST_HUD_RESET_FUNC						pHudResetFunc;
+	DST_HUD_CLIENTMOVE_FUNC					pClientMove;
+	DST_HUD_CLIENTMOVEINIT_FUNC				pClientMoveInit;
+	DST_HUD_TEXTURETYPE_FUNC				pClientTextureType;
+	DST_HUD_IN_ACTIVATEMOUSE_FUNC			pIN_ActivateMouse;
+	DST_HUD_IN_DEACTIVATEMOUSE_FUNC			pIN_DeactivateMouse;
+	DST_HUD_IN_MOUSEEVENT_FUNC				pIN_MouseEvent;
+	DST_HUD_IN_CLEARSTATES_FUNC				pIN_ClearStates;
+	DST_HUD_IN_ACCUMULATE_FUNC				pIN_Accumulate;
+	DST_HUD_CL_CREATEMOVE_FUNC				pCL_CreateMove;
+	DST_HUD_CL_ISTHIRDPERSON_FUNC			pCL_IsThirdPerson;
+	DST_HUD_CL_GETCAMERAOFFSETS_FUNC		pCL_GetCameraOffsets;
+	DST_HUD_KB_FIND_FUNC					pFindKey;
+	DST_HUD_CAMTHINK_FUNC					pCamThink;
+	DST_HUD_CALCREF_FUNC					pCalcRefdef;
+	DST_HUD_ADDENTITY_FUNC					pAddEntity;
+	DST_HUD_CREATEENTITIES_FUNC				pCreateEntities;
+	DST_HUD_DRAWNORMALTRIS_FUNC				pDrawNormalTriangles;
+	DST_HUD_DRAWTRANSTRIS_FUNC				pDrawTransparentTriangles;
+	DST_HUD_STUDIOEVENT_FUNC				pStudioEvent;
+	DST_HUD_POSTRUNCMD_FUNC					pPostRunCmd;
+	DST_HUD_SHUTDOWN_FUNC					pShutdown;
+	DST_HUD_TXFERLOCALOVERRIDES_FUNC		pTxferLocalOverrides;
+	DST_HUD_PROCESSPLAYERSTATE_FUNC			pProcessPlayerState;
+	DST_HUD_TXFERPREDICTIONDATA_FUNC		pTxferPredictionData;
+	DST_HUD_DEMOREAD_FUNC					pReadDemoBuffer;
+	DST_HUD_CONNECTIONLESS_FUNC				pConnectionlessPacket;
+	DST_HUD_GETHULLBOUNDS_FUNC				pGetHullBounds;
+	DST_HUD_FRAME_FUNC						pHudFrame;
+	DST_HUD_KEY_EVENT_FUNC					pKeyEvent;
+	DST_HUD_TEMPENTUPDATE_FUNC				pTempEntUpdate;
+	DST_HUD_GETUSERENTITY_FUNC				pGetUserEntity;
+	DST_HUD_VOICESTATUS_FUNC				pVoiceStatus;
+	DST_HUD_DIRECTORMESSAGE_FUNC			pDirectorMessage;
+	DST_HUD_STUDIO_INTERFACE_FUNC			pStudioInterface;
+} cldll_func_dst_t;
diff --git a/main/source/engine/Progs.h b/main/source/engine/Progs.h
new file mode 100644
index 00000000..6115fcbb
--- /dev/null
+++ b/main/source/engine/Progs.h
@@ -0,0 +1,82 @@
+/***
+*
+*	Copyright (c) 1996-2002, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef PROGS_H
+#define PROGS_H
+
+#include "progdefs.h"
+
+// 16 simultaneous events, max
+#define MAX_EVENT_QUEUE 64
+
+#define DEFAULT_EVENT_RESENDS 1
+
+#include "event_flags.h"
+
+typedef struct event_info_s event_info_t;
+
+#include "event_args.h"
+
+struct event_info_s
+{
+	unsigned short index;			  // 0 implies not in use
+
+	short packet_index;      // Use data from state info for entity in delta_packet .  -1 implies separate info based on event
+	                         // parameter signature
+	short entity_index;      // The edict this event is associated with
+
+	float fire_time;        // if non-zero, the time when the event should be fired ( fixed up on the client )
+	
+	event_args_t args;
+
+// CLIENT ONLY	
+	int	  flags;			// Reliable or not, etc.
+
+};
+
+typedef struct event_state_s event_state_t;
+
+struct event_state_s
+{
+	struct event_info_s ei[ MAX_EVENT_QUEUE ];
+};
+
+#if !defined( ENTITY_STATEH )
+#include "entity_state.h"
+#endif
+
+#if !defined( EDICT_H )
+#include "edict.h"
+#endif
+
+#define	STRUCT_FROM_LINK(l,t,m) ((t *)((byte *)l - (int)&(((t *)0)->m)))
+#define	EDICT_FROM_AREA(l) STRUCT_FROM_LINK(l,edict_t,area)
+
+//============================================================================
+
+extern	char			*pr_strings;
+extern	globalvars_t	gGlobalVariables;
+
+//============================================================================
+
+edict_t		*ED_Alloc (void);
+void		ED_Free (edict_t *ed);
+void		ED_LoadFromFile (char *data);
+
+edict_t		*EDICT_NUM(int n);
+int			NUM_FOR_EDICT(const edict_t *e);
+
+#define PROG_TO_EDICT(e) ((edict_t *)((byte *)sv.edicts + e))
+
+#endif // PROGS_H
\ No newline at end of file
diff --git a/main/source/engine/anorms.h b/main/source/engine/anorms.h
new file mode 100644
index 00000000..c90f8d6f
--- /dev/null
+++ b/main/source/engine/anorms.h
@@ -0,0 +1,177 @@
+/***
+*
+*	Copyright (c) 1996-2002, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+{-0.525731, 0.000000, 0.850651}, 
+{-0.442863, 0.238856, 0.864188}, 
+{-0.295242, 0.000000, 0.955423}, 
+{-0.309017, 0.500000, 0.809017}, 
+{-0.162460, 0.262866, 0.951056}, 
+{0.000000, 0.000000, 1.000000}, 
+{0.000000, 0.850651, 0.525731}, 
+{-0.147621, 0.716567, 0.681718}, 
+{0.147621, 0.716567, 0.681718}, 
+{0.000000, 0.525731, 0.850651}, 
+{0.309017, 0.500000, 0.809017}, 
+{0.525731, 0.000000, 0.850651}, 
+{0.295242, 0.000000, 0.955423}, 
+{0.442863, 0.238856, 0.864188}, 
+{0.162460, 0.262866, 0.951056}, 
+{-0.681718, 0.147621, 0.716567}, 
+{-0.809017, 0.309017, 0.500000}, 
+{-0.587785, 0.425325, 0.688191}, 
+{-0.850651, 0.525731, 0.000000}, 
+{-0.864188, 0.442863, 0.238856}, 
+{-0.716567, 0.681718, 0.147621}, 
+{-0.688191, 0.587785, 0.425325}, 
+{-0.500000, 0.809017, 0.309017}, 
+{-0.238856, 0.864188, 0.442863}, 
+{-0.425325, 0.688191, 0.587785}, 
+{-0.716567, 0.681718, -0.147621}, 
+{-0.500000, 0.809017, -0.309017}, 
+{-0.525731, 0.850651, 0.000000}, 
+{0.000000, 0.850651, -0.525731}, 
+{-0.238856, 0.864188, -0.442863}, 
+{0.000000, 0.955423, -0.295242}, 
+{-0.262866, 0.951056, -0.162460}, 
+{0.000000, 1.000000, 0.000000}, 
+{0.000000, 0.955423, 0.295242}, 
+{-0.262866, 0.951056, 0.162460}, 
+{0.238856, 0.864188, 0.442863}, 
+{0.262866, 0.951056, 0.162460}, 
+{0.500000, 0.809017, 0.309017}, 
+{0.238856, 0.864188, -0.442863}, 
+{0.262866, 0.951056, -0.162460}, 
+{0.500000, 0.809017, -0.309017}, 
+{0.850651, 0.525731, 0.000000}, 
+{0.716567, 0.681718, 0.147621}, 
+{0.716567, 0.681718, -0.147621}, 
+{0.525731, 0.850651, 0.000000}, 
+{0.425325, 0.688191, 0.587785}, 
+{0.864188, 0.442863, 0.238856}, 
+{0.688191, 0.587785, 0.425325}, 
+{0.809017, 0.309017, 0.500000}, 
+{0.681718, 0.147621, 0.716567}, 
+{0.587785, 0.425325, 0.688191}, 
+{0.955423, 0.295242, 0.000000}, 
+{1.000000, 0.000000, 0.000000}, 
+{0.951056, 0.162460, 0.262866}, 
+{0.850651, -0.525731, 0.000000}, 
+{0.955423, -0.295242, 0.000000}, 
+{0.864188, -0.442863, 0.238856}, 
+{0.951056, -0.162460, 0.262866}, 
+{0.809017, -0.309017, 0.500000}, 
+{0.681718, -0.147621, 0.716567}, 
+{0.850651, 0.000000, 0.525731}, 
+{0.864188, 0.442863, -0.238856}, 
+{0.809017, 0.309017, -0.500000}, 
+{0.951056, 0.162460, -0.262866}, 
+{0.525731, 0.000000, -0.850651}, 
+{0.681718, 0.147621, -0.716567}, 
+{0.681718, -0.147621, -0.716567}, 
+{0.850651, 0.000000, -0.525731}, 
+{0.809017, -0.309017, -0.500000}, 
+{0.864188, -0.442863, -0.238856}, 
+{0.951056, -0.162460, -0.262866}, 
+{0.147621, 0.716567, -0.681718}, 
+{0.309017, 0.500000, -0.809017}, 
+{0.425325, 0.688191, -0.587785}, 
+{0.442863, 0.238856, -0.864188}, 
+{0.587785, 0.425325, -0.688191}, 
+{0.688191, 0.587785, -0.425325}, 
+{-0.147621, 0.716567, -0.681718}, 
+{-0.309017, 0.500000, -0.809017}, 
+{0.000000, 0.525731, -0.850651}, 
+{-0.525731, 0.000000, -0.850651}, 
+{-0.442863, 0.238856, -0.864188}, 
+{-0.295242, 0.000000, -0.955423}, 
+{-0.162460, 0.262866, -0.951056}, 
+{0.000000, 0.000000, -1.000000}, 
+{0.295242, 0.000000, -0.955423}, 
+{0.162460, 0.262866, -0.951056}, 
+{-0.442863, -0.238856, -0.864188}, 
+{-0.309017, -0.500000, -0.809017}, 
+{-0.162460, -0.262866, -0.951056}, 
+{0.000000, -0.850651, -0.525731}, 
+{-0.147621, -0.716567, -0.681718}, 
+{0.147621, -0.716567, -0.681718}, 
+{0.000000, -0.525731, -0.850651}, 
+{0.309017, -0.500000, -0.809017}, 
+{0.442863, -0.238856, -0.864188}, 
+{0.162460, -0.262866, -0.951056}, 
+{0.238856, -0.864188, -0.442863}, 
+{0.500000, -0.809017, -0.309017}, 
+{0.425325, -0.688191, -0.587785}, 
+{0.716567, -0.681718, -0.147621}, 
+{0.688191, -0.587785, -0.425325}, 
+{0.587785, -0.425325, -0.688191}, 
+{0.000000, -0.955423, -0.295242}, 
+{0.000000, -1.000000, 0.000000}, 
+{0.262866, -0.951056, -0.162460}, 
+{0.000000, -0.850651, 0.525731}, 
+{0.000000, -0.955423, 0.295242}, 
+{0.238856, -0.864188, 0.442863}, 
+{0.262866, -0.951056, 0.162460}, 
+{0.500000, -0.809017, 0.309017}, 
+{0.716567, -0.681718, 0.147621}, 
+{0.525731, -0.850651, 0.000000}, 
+{-0.238856, -0.864188, -0.442863}, 
+{-0.500000, -0.809017, -0.309017}, 
+{-0.262866, -0.951056, -0.162460}, 
+{-0.850651, -0.525731, 0.000000}, 
+{-0.716567, -0.681718, -0.147621}, 
+{-0.716567, -0.681718, 0.147621}, 
+{-0.525731, -0.850651, 0.000000}, 
+{-0.500000, -0.809017, 0.309017}, 
+{-0.238856, -0.864188, 0.442863}, 
+{-0.262866, -0.951056, 0.162460}, 
+{-0.864188, -0.442863, 0.238856}, 
+{-0.809017, -0.309017, 0.500000}, 
+{-0.688191, -0.587785, 0.425325}, 
+{-0.681718, -0.147621, 0.716567}, 
+{-0.442863, -0.238856, 0.864188}, 
+{-0.587785, -0.425325, 0.688191}, 
+{-0.309017, -0.500000, 0.809017}, 
+{-0.147621, -0.716567, 0.681718}, 
+{-0.425325, -0.688191, 0.587785}, 
+{-0.162460, -0.262866, 0.951056}, 
+{0.442863, -0.238856, 0.864188}, 
+{0.162460, -0.262866, 0.951056}, 
+{0.309017, -0.500000, 0.809017}, 
+{0.147621, -0.716567, 0.681718}, 
+{0.000000, -0.525731, 0.850651}, 
+{0.425325, -0.688191, 0.587785}, 
+{0.587785, -0.425325, 0.688191}, 
+{0.688191, -0.587785, 0.425325}, 
+{-0.955423, 0.295242, 0.000000}, 
+{-0.951056, 0.162460, 0.262866}, 
+{-1.000000, 0.000000, 0.000000}, 
+{-0.850651, 0.000000, 0.525731}, 
+{-0.955423, -0.295242, 0.000000}, 
+{-0.951056, -0.162460, 0.262866}, 
+{-0.864188, 0.442863, -0.238856}, 
+{-0.951056, 0.162460, -0.262866}, 
+{-0.809017, 0.309017, -0.500000}, 
+{-0.864188, -0.442863, -0.238856}, 
+{-0.951056, -0.162460, -0.262866}, 
+{-0.809017, -0.309017, -0.500000}, 
+{-0.681718, 0.147621, -0.716567}, 
+{-0.681718, -0.147621, -0.716567}, 
+{-0.850651, 0.000000, -0.525731}, 
+{-0.688191, 0.587785, -0.425325}, 
+{-0.587785, 0.425325, -0.688191}, 
+{-0.425325, 0.688191, -0.587785}, 
+{-0.425325, -0.688191, -0.587785}, 
+{-0.587785, -0.425325, -0.688191}, 
+{-0.688191, -0.587785, -0.425325}, 
diff --git a/main/source/engine/cdll_int.h b/main/source/engine/cdll_int.h
new file mode 100644
index 00000000..5ffbe9f8
--- /dev/null
+++ b/main/source/engine/cdll_int.h
@@ -0,0 +1,312 @@
+/***
+*
+*	Copyright (c) 1996-2002, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+//
+//  cdll_int.h
+//
+// 4-23-98  
+// JOHN:  client dll interface declarations
+//
+
+#ifndef CDLL_INT_H
+#define CDLL_INT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "const.h"
+
+
+// this file is included by both the engine and the client-dll,
+// so make sure engine declarations aren't done twice
+
+typedef int HSPRITE;	// handle to a graphic
+
+#define SCRINFO_SCREENFLASH 1
+#define SCRINFO_STRETCHED	2
+
+typedef struct SCREENINFO_s
+{
+	int		iSize;
+	int		iWidth;
+	int		iHeight;
+	int		iFlags;
+	int		iCharHeight;
+	short	charWidths[256];
+} SCREENINFO;
+
+
+typedef struct client_data_s
+{
+	// fields that cannot be modified  (ie. have no effect if changed)
+	vec3_t origin;
+
+	// fields that can be changed by the cldll
+	vec3_t viewangles;
+	int		iWeaponBits;
+	float	fov;	// field of view
+} client_data_t;
+
+typedef struct client_sprite_s
+{
+	char szName[64];
+	char szSprite[64];
+	int hspr;
+	int iRes;
+	wrect_t rc;
+} client_sprite_t;
+
+typedef struct client_textmessage_s
+{
+	int		effect;
+	byte	r1, g1, b1, a1;		// 2 colors for effects
+	byte	r2, g2, b2, a2;
+	float	x;
+	float	y;
+	float	fadein;
+	float	fadeout;
+	float	holdtime;
+	float	fxtime;
+	const char *pName;
+	const char *pMessage;
+} client_textmessage_t;
+
+typedef struct hud_player_info_s
+{
+	char *name;
+	short ping;
+	byte thisplayer;  // TRUE if this is the calling player
+
+  // stuff that's unused at the moment,  but should be done
+	byte spectator;
+	byte packetloss;
+
+	char *model;
+	short topcolor;
+	short bottomcolor;
+
+} hud_player_info_t;
+
+
+// this is by no means complete,  or even accurate
+typedef struct cl_enginefuncs_s
+{
+	// sprite handlers
+	HSPRITE						( *pfnSPR_Load )			( const char *szPicName );
+	int							( *pfnSPR_Frames )			( HSPRITE hPic );
+	int							( *pfnSPR_Height )			( HSPRITE hPic, int frame );
+	int							( *pfnSPR_Width )			( HSPRITE hPic, int frame );
+	void						( *pfnSPR_Set )				( HSPRITE hPic, int r, int g, int b );
+	void						( *pfnSPR_Draw )			( int frame, int x, int y, const wrect_t *prc );
+	void						( *pfnSPR_DrawHoles )		( int frame, int x, int y, const wrect_t *prc );
+	void						( *pfnSPR_DrawAdditive )	( int frame, int x, int y, const wrect_t *prc );
+	void						( *pfnSPR_EnableScissor )	( int x, int y, int width, int height );
+	void						( *pfnSPR_DisableScissor )	( void );
+	client_sprite_t				*( *pfnSPR_GetList )			( char *psz, int *piCount );
+
+	// screen handlers
+	void						( *pfnFillRGBA )			( int x, int y, int width, int height, int r, int g, int b, int a );
+	int							( *pfnGetScreenInfo ) 		( SCREENINFO *pscrinfo );
+	void						( *pfnSetCrosshair )		( HSPRITE hspr, wrect_t rc, int r, int g, int b );
+
+	// cvar handlers
+	struct cvar_s				*( *pfnRegisterVariable )	( char *szName, char *szValue, int flags );
+	float						( *pfnGetCvarFloat )		( char *szName );
+	char*						( *pfnGetCvarString )		( char *szName );
+
+	// command handlers
+	int							( *pfnAddCommand )			( char *cmd_name, void (*function)(void) );
+	int							( *pfnHookUserMsg )			( char *szMsgName, pfnUserMsgHook pfn );
+	int							( *pfnServerCmd )			( char *szCmdString );
+	int							( *pfnClientCmd )			( char *szCmdString );
+
+	void						( *pfnGetPlayerInfo )		( int ent_num, hud_player_info_t *pinfo );
+
+	// sound handlers
+	void						( *pfnPlaySoundByName )		( char *szSound, float volume );
+	void						( *pfnPlaySoundByIndex )	( int iSound, float volume );
+
+	// vector helpers
+	void						( *pfnAngleVectors )		( const float * vecAngles, float * forward, float * right, float * up );
+
+	// text message system
+	client_textmessage_t		*( *pfnTextMessageGet )		( const char *pName );
+	int							( *pfnDrawCharacter )		( int x, int y, int number, int r, int g, int b );
+	int							( *pfnDrawConsoleString )	( int x, int y, char *string );
+	void						( *pfnDrawSetTextColor )	( float r, float g, float b );
+	void						( *pfnDrawConsoleStringLen )(  const char *string, int *length, int *height );
+
+	void						( *pfnConsolePrint )		( const char *string );
+	void						( *pfnCenterPrint )			( const char *string );
+
+
+// Added for user input processing
+	int							( *GetWindowCenterX )		( void );
+	int							( *GetWindowCenterY )		( void );
+	void						( *GetViewAngles )			( float * );
+	void						( *SetViewAngles )			( float * );
+	int							( *GetMaxClients )			( void );
+	void						( *Cvar_SetValue )			( char *cvar, float value );
+
+	int       					(*Cmd_Argc)					(void);	
+	char						*( *Cmd_Argv )				( int arg );
+	void						( *Con_Printf )				( char *fmt, ... );
+	void						( *Con_DPrintf )			( char *fmt, ... );
+	void						( *Con_NPrintf )			( int pos, char *fmt, ... );
+	void						( *Con_NXPrintf )			( struct con_nprint_s *info, char *fmt, ... );
+
+	const char					*( *PhysInfo_ValueForKey )	( const char *key );
+	const char					*( *ServerInfo_ValueForKey )( const char *key );
+	float						( *GetClientMaxspeed )		( void );
+	int							( *CheckParm )				( char *parm, char **ppnext );
+	void						( *Key_Event )				( int key, int down );
+	void						( *GetMousePosition )		( int *mx, int *my );
+	int							( *IsNoClipping )			( void );
+
+	struct cl_entity_s			*( *GetLocalPlayer )		( void );
+	struct cl_entity_s			*( *GetViewModel )			( void );
+	struct cl_entity_s			*( *GetEntityByIndex )		( int idx );
+
+	float						( *GetClientTime )			( void );
+	void						( *V_CalcShake )			( void );
+	void						( *V_ApplyShake )			( float *origin, float *angles, float factor );
+
+	int							( *PM_PointContents )		( float *point, int *truecontents );
+	int							( *PM_WaterEntity )			( float *p );
+	struct pmtrace_s			*( *PM_TraceLine )			( float *start, float *end, int flags, int usehull, int ignore_pe );
+
+	struct model_s				*( *CL_LoadModel )			( const char *modelname, int *index );
+	int							( *CL_CreateVisibleEntity )	( int type, struct cl_entity_s *ent );
+
+	const struct model_s *		( *GetSpritePointer )		( HSPRITE hSprite );
+	void						( *pfnPlaySoundByNameAtLocation )	( char *szSound, float volume, float *origin );
+
+	unsigned short				( *pfnPrecacheEvent )		( int type, const char* psz );
+	void						( *pfnPlaybackEvent )		( int flags, const struct edict_s *pInvoker, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 );
+	void						( *pfnWeaponAnim )			( int iAnim, int body );
+	float						( *pfnRandomFloat )			( float flLow, float flHigh );
+	long						( *pfnRandomLong )			( long lLow, long lHigh );
+	void						( *pfnHookEvent )			( char *name, void ( *pfnEvent )( struct event_args_s *args ) );
+	int							(*Con_IsVisible)			();
+	const char					*( *pfnGetGameDirectory )	( void );
+	struct cvar_s				*( *pfnGetCvarPointer )		( const char *szName );
+	const char					*( *Key_LookupBinding )		( const char *pBinding );
+	const char					*( *pfnGetLevelName )		( void );
+	void						( *pfnGetScreenFade )		( struct screenfade_s *fade );
+	void						( *pfnSetScreenFade )		( struct screenfade_s *fade );
+	void                        *( *VGui_GetPanel )         ( );
+	void                         ( *VGui_ViewportPaintBackground ) (int extents[4]);
+
+	byte*						(*COM_LoadFile)				( char *path, int usehunk, int *pLength );
+	char*						(*COM_ParseFile)			( char *data, char *token );
+	void						(*COM_FreeFile)				( void *buffer );
+		
+	struct triangleapi_s		*pTriAPI;
+	struct efx_api_s			*pEfxAPI;
+	struct event_api_s			*pEventAPI;
+	struct demo_api_s			*pDemoAPI;
+	struct net_api_s			*pNetAPI;
+	struct IVoiceTweak_s		*pVoiceTweak;
+
+	// returns 1 if the client is a spectator only (connected to a proxy), 0 otherwise or 2 if in dev_overview mode
+	int							( *IsSpectateOnly ) ( void );
+	struct model_s				*( *LoadMapSprite )			( const char *filename );
+
+	// file search functions
+	void						( *COM_AddAppDirectoryToSearchPath ) ( const char *pszBaseDir, const char *appName );
+	int							( *COM_ExpandFilename)				 ( const char *fileName, char *nameOutBuffer, int nameOutBufferSize );
+
+	// User info
+	// playerNum is in the range (1, MaxClients)
+	// returns NULL if player doesn't exit
+	// returns "" if no value is set
+	const char					*( *PlayerInfo_ValueForKey )( int playerNum, const char *key );
+	void						( *PlayerInfo_SetValueForKey )( const char *key, const char *value );
+
+	// Gets a unique ID for the specified player. This is the same even if you see the player on a different server.
+	// iPlayer is an entity index, so client 0 would use iPlayer=1.
+	// Returns false if there is no player on the server in the specified slot.
+	qboolean					(*GetPlayerUniqueID)(int iPlayer, char playerID[16]);
+
+	// TrackerID access
+	int							(*GetTrackerIDForPlayer)(int playerSlot);
+	int							(*GetPlayerForTrackerID)(int trackerID);
+
+	// Same as pfnServerCmd, but the message goes in the unreliable stream so it can't clog the net stream
+	// (but it might not get there).
+	int							( *pfnServerCmdUnreliable )( char *szCmdString );
+
+	void						( *pfnGetMousePos )( struct tagPOINT *ppt );
+	void						( *pfnSetMousePos )( int x, int y );
+	void						( *pfnSetMouseEnable )( qboolean fEnable );
+} cl_enginefunc_t;
+
+#ifndef IN_BUTTONS_H
+#include "in_buttons.h"
+#endif
+
+#define CLDLL_INTERFACE_VERSION		7
+
+extern void ClientDLL_Init( void ); // from cdll_int.c
+extern void ClientDLL_Shutdown( void );
+extern void ClientDLL_HudInit( void );
+extern void ClientDLL_HudVidInit( void );
+extern void	ClientDLL_UpdateClientData( void );
+extern void ClientDLL_Frame( double time );
+extern void ClientDLL_HudRedraw( int intermission );
+extern void ClientDLL_MoveClient( struct playermove_s *ppmove );
+extern void ClientDLL_ClientMoveInit( struct playermove_s *ppmove );
+extern char ClientDLL_ClientTextureType( char *name );
+
+extern void ClientDLL_CreateMove( float frametime, struct usercmd_s *cmd, int active );
+extern void ClientDLL_ActivateMouse( void );
+extern void ClientDLL_DeactivateMouse( void );
+extern void ClientDLL_MouseEvent( int mstate );
+extern void ClientDLL_ClearStates( void );
+extern int ClientDLL_IsThirdPerson( void );
+extern void ClientDLL_GetCameraOffsets( float *ofs );
+extern int ClientDLL_GraphKeyDown( void );
+extern struct kbutton_s *ClientDLL_FindKey( const char *name );
+extern void ClientDLL_CAM_Think( void );
+extern void ClientDLL_IN_Accumulate( void );
+extern void ClientDLL_CalcRefdef( struct ref_params_s *pparams );
+extern int ClientDLL_AddEntity( int type, struct cl_entity_s *ent );
+extern void ClientDLL_CreateEntities( void );
+
+extern void ClientDLL_DrawNormalTriangles( void );
+extern void ClientDLL_DrawTransparentTriangles( void );
+extern void ClientDLL_StudioEvent( const struct mstudioevent_s *event, const struct cl_entity_s *entity );
+extern void ClientDLL_PostRunCmd( struct local_state_s *from, struct local_state_s *to, struct usercmd_s *cmd, int runfuncs, double time, unsigned int random_seed );
+extern void ClientDLL_TxferLocalOverrides( struct entity_state_s *state, const struct clientdata_s *client );
+extern void ClientDLL_ProcessPlayerState( struct entity_state_s *dst, const struct entity_state_s *src );
+extern void ClientDLL_TxferPredictionData ( struct entity_state_s *ps, const struct entity_state_s *pps, struct clientdata_s *pcd, const struct clientdata_s *ppcd, struct weapon_data_s *wd, const struct weapon_data_s *pwd );
+extern void ClientDLL_ReadDemoBuffer( int size, unsigned char *buffer );
+extern int ClientDLL_ConnectionlessPacket( const struct netadr_s *net_from, const char *args, char *response_buffer, int *response_buffer_size );
+extern int ClientDLL_GetHullBounds( int hullnumber, float *mins, float *maxs );
+
+extern void ClientDLL_VGui_ConsolePrint(const char* text);
+
+extern int ClientDLL_Key_Event( int down, int keynum, const char *pszCurrentBinding );
+extern void ClientDLL_TempEntUpdate( double ft, double ct, double grav, struct tempent_s **ppFreeTE, struct tempent_s **ppActiveTE, int ( *addTEntity )( struct cl_entity_s *pEntity ), void ( *playTESound )( struct tempent_s *pTemp, float damp ) );
+extern struct cl_entity_s *ClientDLL_GetUserEntity( int index );
+extern void ClientDLL_VoiceStatus(int entindex, qboolean bTalking);
+extern void ClientDLL_DirectorMessage( int iSize, void *pbuf );
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // CDLL_INT_H
diff --git a/main/source/engine/custom.h b/main/source/engine/custom.h
new file mode 100644
index 00000000..a5a8da93
--- /dev/null
+++ b/main/source/engine/custom.h
@@ -0,0 +1,101 @@
+/***
+*
+*	Copyright (c) 1996-2002, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+// Customization.h
+
+#ifndef CUSTOM_H
+#define CUSTOM_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+#include "const.h"
+
+#define MAX_QPATH 64    // Must match value in quakedefs.h
+
+/////////////////
+// Customization
+// passed to pfnPlayerCustomization
+// For automatic downloading.
+typedef enum
+{
+	t_sound = 0,
+	t_skin,
+	t_model,
+	t_decal,
+	t_generic,
+	t_eventscript,
+	t_world,		// Fake type for world, is really t_model
+} resourcetype_t;
+
+
+typedef struct
+{
+	int				size;
+} _resourceinfo_t;
+
+typedef struct resourceinfo_s
+{
+	_resourceinfo_t info[ 8 ];
+} resourceinfo_t;
+
+#define RES_FATALIFMISSING (1<<0)   // Disconnect if we can't get this file.
+#define RES_WASMISSING     (1<<1)   // Do we have the file locally, did we get it ok?
+#define RES_CUSTOM         (1<<2)   // Is this resource one that corresponds to another player's customization
+								    //  or is it a server startup resource.
+#define RES_REQUESTED	   (1<<3)	// Already requested a download of this one
+#define RES_PRECACHED	   (1<<4)	// Already precached
+
+#include "crc.h"
+
+typedef struct resource_s
+{
+	char              szFileName[MAX_QPATH]; // File name to download/precache.
+	resourcetype_t    type;                // t_sound, t_skin, t_model, t_decal.
+	int               nIndex;              // For t_decals
+	int               nDownloadSize;       // Size in Bytes if this must be downloaded.
+	unsigned char     ucFlags;
+
+// For handling client to client resource propagation
+	unsigned char     rgucMD5_hash[16];    // To determine if we already have it.
+	unsigned char     playernum;           // Which player index this resource is associated with, if it's a custom resource.
+
+	unsigned char	  rguc_reserved[ 32 ]; // For future expansion
+	struct resource_s *pNext;              // Next in chain.
+	struct resource_s *pPrev;
+} resource_t;
+
+typedef struct customization_s
+{
+	qboolean bInUse;     // Is this customization in use;
+	resource_t resource; // The resource_t for this customization
+	qboolean bTranslated; // Has the raw data been translated into a useable format?  
+						   //  (e.g., raw decal .wad make into texture_t *)
+	int        nUserData1; // Customization specific data
+	int        nUserData2; // Customization specific data
+	void *pInfo;          // Buffer that holds the data structure that references the data (e.g., the cachewad_t)
+	void *pBuffer;       // Buffer that holds the data for the customization (the raw .wad data)
+	struct customization_s *pNext; // Next in chain
+} customization_t;
+
+#define FCUST_FROMHPAK		( 1<<0 )
+#define FCUST_WIPEDATA		( 1<<1 )
+#define FCUST_IGNOREINIT	( 1<<2 )
+
+void		COM_ClearCustomizationList( struct customization_s *pHead, qboolean bCleanDecals);
+qboolean	COM_CreateCustomization( struct customization_s *pListHead, struct resource_s *pResource, int playernumber, int flags, 
+				struct customization_s **pCustomization, int *nLumps ); 
+int			COM_SizeofResourceList ( struct resource_s *pList, struct resourceinfo_s *ri );
+
+#endif // CUSTOM_H
diff --git a/main/source/engine/customentity.h b/main/source/engine/customentity.h
new file mode 100644
index 00000000..2c4eb5eb
--- /dev/null
+++ b/main/source/engine/customentity.h
@@ -0,0 +1,38 @@
+/***
+*
+*	Copyright (c) 1996-2002, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef CUSTOMENTITY_H
+#define CUSTOMENTITY_H
+
+// Custom Entities
+
+// Start/End Entity is encoded as 12 bits of entity index, and 4 bits of attachment (4:12)
+#define BEAMENT_ENTITY(x)		((x)&0xFFF)
+#define BEAMENT_ATTACHMENT(x)	(((x)>>12)&0xF)
+
+// Beam types, encoded as a byte
+enum 
+{
+	BEAM_POINTS = 0,
+	BEAM_ENTPOINT,
+	BEAM_ENTS,
+	BEAM_HOSE,
+};
+
+#define BEAM_FSINE		0x10
+#define BEAM_FSOLID		0x20
+#define BEAM_FSHADEIN	0x40
+#define BEAM_FSHADEOUT	0x80
+
+#endif	//CUSTOMENTITY_H
diff --git a/main/source/engine/edict.h b/main/source/engine/edict.h
new file mode 100644
index 00000000..6bb109d3
--- /dev/null
+++ b/main/source/engine/edict.h
@@ -0,0 +1,36 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#if !defined EDICT_H
+#define EDICT_H
+#ifdef _WIN32
+#pragma once
+#endif
+#define	MAX_ENT_LEAFS	48
+
+#include "progdefs.h"
+
+struct edict_s
+{
+	qboolean	free;
+	int			serialnumber;
+	link_t		area;				// linked to a division node or leaf
+	
+	int			headnode;			// -1 to use normal leaf check
+	int			num_leafs;
+	short		leafnums[MAX_ENT_LEAFS];
+
+	float		freetime;			// sv.time when the object was freed
+
+	void*		pvPrivateData;		// Alloced and freed by engine, used by DLLs
+
+	entvars_t	v;					// C exported fields from progs
+
+	// other fields from progs come immediately after
+};
+
+#endif
diff --git a/main/source/engine/eiface.h b/main/source/engine/eiface.h
new file mode 100644
index 00000000..0c8374ee
--- /dev/null
+++ b/main/source/engine/eiface.h
@@ -0,0 +1,492 @@
+/***
+*
+*	Copyright (c) 1996-2002, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef EIFACE_H
+#define EIFACE_H
+
+#ifdef HLDEMO_BUILD
+#define INTERFACE_VERSION       001
+#else  // !HLDEMO_BUILD, i.e., regular version of HL
+#define INTERFACE_VERSION		140
+#endif // !HLDEMO_BUILD
+
+#include <stdio.h>
+#include "custom.h"
+#include "cvardef.h"
+//
+// Defines entity interface between engine and DLLs.
+// This header file included by engine files and DLL files.
+//
+// Before including this header, DLLs must:
+//		include progdefs.h
+// This is conveniently done for them in extdll.h
+//
+
+#ifdef _WIN32
+#define DLLEXPORT __stdcall
+#else
+#define DLLEXPORT /* */
+#endif
+
+typedef enum
+	{
+	at_notice,
+	at_console,		// same as at_notice, but forces a ConPrintf, not a message box
+	at_aiconsole,	// same as at_console, but only shown if developer level is 2!
+	at_warning,
+	at_error,
+	at_logged		// Server print to console ( only in multiplayer games ).
+	} ALERT_TYPE;
+
+// 4-22-98  JOHN: added for use in pfnClientPrintf
+typedef enum
+	{
+	print_console,
+	print_center,
+	print_chat,
+	} PRINT_TYPE;
+
+// For integrity checking of content on clients
+typedef enum
+{
+	force_exactfile,			// File on client must exactly match server's file
+	force_model_samebounds,		// For model files only, the geometry must fit in the same bbox
+	force_model_specifybounds,	// For model files only, the geometry must fit in the specified bbox
+} FORCE_TYPE;
+
+// Returned by TraceLine
+typedef struct
+	{
+	int		fAllSolid;			// if true, plane is not valid
+	int		fStartSolid;		// if true, the initial point was in a solid area
+	int		fInOpen;
+	int		fInWater;
+	float	flFraction;			// time completed, 1.0 = didn't hit anything
+	vec3_t	vecEndPos;			// final position
+	float	flPlaneDist;
+	vec3_t	vecPlaneNormal;		// surface normal at impact
+	edict_t	*pHit;				// entity the surface is on
+	int		iHitgroup;			// 0 == generic, non zero is specific body part
+	} TraceResult;
+
+// CD audio status
+typedef struct 
+{
+	int	fPlaying;// is sound playing right now?
+	int	fWasPlaying;// if not, CD is paused if WasPlaying is true.
+	int	fInitialized;
+	int	fEnabled;
+	int	fPlayLooping;
+	float	cdvolume;
+	//BYTE 	remap[100];
+	int	fCDRom;
+	int	fPlayTrack;
+} CDStatus;
+
+#include "../common/crc.h"
+
+// Engine hands this to DLLs for functionality callbacks
+typedef struct enginefuncs_s
+{
+	int			(*pfnPrecacheModel)			(char* s);
+	int			(*pfnPrecacheSound)			(char* s);
+	void		(*pfnSetModel)				(edict_t *e, const char *m);
+	int			(*pfnModelIndex)			(const char *m);
+	int			(*pfnModelFrames)			(int modelIndex);
+	void		(*pfnSetSize)				(edict_t *e, const float *rgflMin, const float *rgflMax);
+	void		(*pfnChangeLevel)			(char* s1, char* s2);
+	void		(*pfnGetSpawnParms)			(edict_t *ent);
+	void		(*pfnSaveSpawnParms)		(edict_t *ent);
+	float		(*pfnVecToYaw)				(const float *rgflVector);
+	void		(*pfnVecToAngles)			(const float *rgflVectorIn, float *rgflVectorOut);
+	void		(*pfnMoveToOrigin)			(edict_t *ent, const float *pflGoal, float dist, int iMoveType);
+	void		(*pfnChangeYaw)				(edict_t* ent);
+	void		(*pfnChangePitch)			(edict_t* ent);
+	edict_t*	(*pfnFindEntityByString)	(edict_t *pEdictStartSearchAfter, const char *pszField, const char *pszValue);
+	int			(*pfnGetEntityIllum)		(edict_t* pEnt);
+	edict_t*	(*pfnFindEntityInSphere)	(edict_t *pEdictStartSearchAfter, const float *org, float rad);
+	edict_t*	(*pfnFindClientInPVS)		(edict_t *pEdict);
+	edict_t* (*pfnEntitiesInPVS)			(edict_t *pplayer);
+	void		(*pfnMakeVectors)			(const float *rgflVector);
+	void		(*pfnAngleVectors)			(const float *rgflVector, float *forward, float *right, float *up);
+	edict_t*	(*pfnCreateEntity)			(void);
+	void		(*pfnRemoveEntity)			(edict_t* e);
+	edict_t*	(*pfnCreateNamedEntity)		(int className);
+	void		(*pfnMakeStatic)			(edict_t *ent);
+	int			(*pfnEntIsOnFloor)			(edict_t *e);
+	int			(*pfnDropToFloor)			(edict_t* e);
+	int			(*pfnWalkMove)				(edict_t *ent, float yaw, float dist, int iMode);
+	void		(*pfnSetOrigin)				(edict_t *e, const float *rgflOrigin);
+	void		(*pfnEmitSound)				(edict_t *entity, int channel, const char *sample, /*int*/float volume, float attenuation, int fFlags, int pitch);
+	void		(*pfnEmitAmbientSound)		(edict_t *entity, float *pos, const char *samp, float vol, float attenuation, int fFlags, int pitch);
+	void		(*pfnTraceLine)				(const float *v1, const float *v2, int fNoMonsters, edict_t *pentToSkip, TraceResult *ptr);
+	void		(*pfnTraceToss)				(edict_t* pent, edict_t* pentToIgnore, TraceResult *ptr);
+	int			(*pfnTraceMonsterHull)		(edict_t *pEdict, const float *v1, const float *v2, int fNoMonsters, edict_t *pentToSkip, TraceResult *ptr);
+	void		(*pfnTraceHull)				(const float *v1, const float *v2, int fNoMonsters, int hullNumber, edict_t *pentToSkip, TraceResult *ptr);
+	void		(*pfnTraceModel)			(const float *v1, const float *v2, int hullNumber, edict_t *pent, TraceResult *ptr);
+	const char *(*pfnTraceTexture)			(edict_t *pTextureEntity, const float *v1, const float *v2 );
+	void		(*pfnTraceSphere)			(const float *v1, const float *v2, int fNoMonsters, float radius, edict_t *pentToSkip, TraceResult *ptr);
+	void		(*pfnGetAimVector)			(edict_t* ent, float speed, float *rgflReturn);
+	void		(*pfnServerCommand)			(char* str);
+	void		(*pfnServerExecute)			(void);
+	void		(*pfnClientCommand)			(edict_t* pEdict, char* szFmt, ...);
+	void		(*pfnParticleEffect)		(const float *org, const float *dir, float color, float count);
+	void		(*pfnLightStyle)			(int style, char* val);
+	int			(*pfnDecalIndex)			(const char *name);
+	int			(*pfnPointContents)			(const float *rgflVector);
+	void		(*pfnMessageBegin)			(int msg_dest, int msg_type, const float *pOrigin, edict_t *ed);
+	void		(*pfnMessageEnd)			(void);
+	void		(*pfnWriteByte)				(int iValue);
+	void		(*pfnWriteChar)				(int iValue);
+	void		(*pfnWriteShort)			(int iValue);
+	void		(*pfnWriteLong)				(int iValue);
+	void		(*pfnWriteAngle)			(float flValue);
+	void		(*pfnWriteCoord)			(float flValue);
+	void		(*pfnWriteString)			(const char *sz);
+	void		(*pfnWriteEntity)			(int iValue);
+	void		(*pfnCVarRegister)			(cvar_t *pCvar);
+	float		(*pfnCVarGetFloat)			(const char *szVarName);
+	const char*	(*pfnCVarGetString)			(const char *szVarName);
+	void		(*pfnCVarSetFloat)			(const char *szVarName, float flValue);
+	void		(*pfnCVarSetString)			(const char *szVarName, const char *szValue);
+	void		(*pfnAlertMessage)			(ALERT_TYPE atype, char *szFmt, ...);
+	void		(*pfnEngineFprintf)			(FILE *pfile, char *szFmt, ...);
+	void*		(*pfnPvAllocEntPrivateData)	(edict_t *pEdict, long cb);
+	void*		(*pfnPvEntPrivateData)		(edict_t *pEdict);
+	void		(*pfnFreeEntPrivateData)	(edict_t *pEdict);
+	const char*	(*pfnSzFromIndex)			(int iString);
+	int			(*pfnAllocString)			(const char *szValue);
+	struct entvars_s*	(*pfnGetVarsOfEnt)			(edict_t *pEdict);
+	edict_t*	(*pfnPEntityOfEntOffset)	(int iEntOffset);
+	int			(*pfnEntOffsetOfPEntity)	(const edict_t *pEdict);
+	int			(*pfnIndexOfEdict)			(const edict_t *pEdict);
+	edict_t*	(*pfnPEntityOfEntIndex)		(int iEntIndex);
+	edict_t*	(*pfnFindEntityByVars)		(struct entvars_s* pvars);
+	void*		(*pfnGetModelPtr)			(edict_t* pEdict);
+	int			(*pfnRegUserMsg)			(const char *pszName, int iSize);
+	void		(*pfnAnimationAutomove)		(const edict_t* pEdict, float flTime);
+	void		(*pfnGetBonePosition)		(const edict_t* pEdict, int iBone, float *rgflOrigin, float *rgflAngles );
+	unsigned long (*pfnFunctionFromName)	( const char *pName );
+	const char *(*pfnNameForFunction)		( unsigned long function );
+	void		(*pfnClientPrintf)			( edict_t* pEdict, PRINT_TYPE ptype, const char *szMsg ); // JOHN: engine callbacks so game DLL can print messages to individual clients
+	void		(*pfnServerPrint)			( const char *szMsg );
+	const char *(*pfnCmd_Args)				( void );		// these 3 added 
+	const char *(*pfnCmd_Argv)				( int argc );	// so game DLL can easily 
+	int			(*pfnCmd_Argc)				( void );		// access client 'cmd' strings
+	void		(*pfnGetAttachment)			(const edict_t *pEdict, int iAttachment, float *rgflOrigin, float *rgflAngles );
+	void		(*pfnCRC32_Init)			(CRC32_t *pulCRC);
+	void        (*pfnCRC32_ProcessBuffer)   (CRC32_t *pulCRC, void *p, int len);
+	void		(*pfnCRC32_ProcessByte)     (CRC32_t *pulCRC, unsigned char ch);
+	CRC32_t		(*pfnCRC32_Final)			(CRC32_t pulCRC);
+	long		(*pfnRandomLong)			(long  lLow,  long  lHigh);
+	float		(*pfnRandomFloat)			(float flLow, float flHigh);
+	void		(*pfnSetView)				(const edict_t *pClient, const edict_t *pViewent );
+	float		(*pfnTime)					( void );
+	void		(*pfnCrosshairAngle)		(const edict_t *pClient, float pitch, float yaw);
+	byte *      (*pfnLoadFileForMe)         (char *filename, int *pLength);
+	void        (*pfnFreeFile)              (void *buffer);
+	void        (*pfnEndSection)            (const char *pszSectionName); // trigger_endsection
+	int 		(*pfnCompareFileTime)       (char *filename1, char *filename2, int *iCompare);
+	void        (*pfnGetGameDir)            (char *szGetGameDir);
+	void		(*pfnCvar_RegisterVariable) (cvar_t *variable);
+	void        (*pfnFadeClientVolume)      (const edict_t *pEdict, int fadePercent, int fadeOutSeconds, int holdTime, int fadeInSeconds);
+	void        (*pfnSetClientMaxspeed)     (const edict_t *pEdict, float fNewMaxspeed);
+	edict_t *	(*pfnCreateFakeClient)		(const char *netname);	// returns NULL if fake client can't be created
+	void		(*pfnRunPlayerMove)			(edict_t *fakeclient, const float *viewangles, float forwardmove, float sidemove, float upmove, unsigned short buttons, byte impulse, byte msec );
+	int			(*pfnNumberOfEntities)		(void);
+	char*		(*pfnGetInfoKeyBuffer)		(edict_t *e);	// passing in NULL gets the serverinfo
+	char*		(*pfnInfoKeyValue)			(char *infobuffer, char *key);
+	void		(*pfnSetKeyValue)			(char *infobuffer, char *key, char *value);
+	void		(*pfnSetClientKeyValue)		(int clientIndex, char *infobuffer, char *key, char *value);
+	int			(*pfnIsMapValid)			(char *filename);
+	void		(*pfnStaticDecal)			( const float *origin, int decalIndex, int entityIndex, int modelIndex );
+	int			(*pfnPrecacheGeneric)		(char* s);
+	int			(*pfnGetPlayerUserId)		(edict_t *e ); // returns the server assigned userid for this player.  useful for logging frags, etc.  returns -1 if the edict couldn't be found in the list of clients
+	void		(*pfnBuildSoundMsg)			(edict_t *entity, int channel, const char *sample, /*int*/float volume, float attenuation, int fFlags, int pitch, int msg_dest, int msg_type, const float *pOrigin, edict_t *ed);
+	int			(*pfnIsDedicatedServer)		(void);// is this a dedicated server?
+	cvar_t		*(*pfnCVarGetPointer)		(const char *szVarName);
+	unsigned int (*pfnGetPlayerWONId)		(edict_t *e); // returns the server assigned WONid for this player.  useful for logging frags, etc.  returns -1 if the edict couldn't be found in the list of clients
+
+	// YWB 8/1/99 TFF Physics additions
+	void		(*pfnInfo_RemoveKey)		( char *s, const char *key );
+	const char *(*pfnGetPhysicsKeyValue)	( const edict_t *pClient, const char *key );
+	void		(*pfnSetPhysicsKeyValue)	( const edict_t *pClient, const char *key, const char *value );
+	const char *(*pfnGetPhysicsInfoString)	( const edict_t *pClient );
+	unsigned short (*pfnPrecacheEvent)		( int type, const char*psz );
+	void		(*pfnPlaybackEvent)			( int flags, const edict_t *pInvoker, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 );
+
+	unsigned char *(*pfnSetFatPVS)			( float *org );
+	unsigned char *(*pfnSetFatPAS)			( float *org );
+
+	int			(*pfnCheckVisibility )		( const edict_t *entity, unsigned char *pset );
+
+	void		(*pfnDeltaSetField)			( struct delta_s *pFields, const char *fieldname );
+	void		(*pfnDeltaUnsetField)		( struct delta_s *pFields, const char *fieldname );
+	void		(*pfnDeltaAddEncoder)		( char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) );
+	int			(*pfnGetCurrentPlayer)		( void );
+	int			(*pfnCanSkipPlayer)			( const edict_t *player );
+	int			(*pfnDeltaFindField)		( struct delta_s *pFields, const char *fieldname );
+	void		(*pfnDeltaSetFieldByIndex)	( struct delta_s *pFields, int fieldNumber );
+	void		(*pfnDeltaUnsetFieldByIndex)( struct delta_s *pFields, int fieldNumber );
+
+	void		(*pfnSetGroupMask)			( int mask, int op );
+
+	int			(*pfnCreateInstancedBaseline) ( int classname, struct entity_state_s *baseline );
+	void		(*pfnCvar_DirectSet)		( struct cvar_s *var, char *value );
+
+	// Forces the client and server to be running with the same version of the specified file
+	//  ( e.g., a player model ).
+	// Calling this has no effect in single player
+	void		(*pfnForceUnmodified)		( FORCE_TYPE type, float *mins, float *maxs, const char *filename );
+
+	void		(*pfnGetPlayerStats)		( const edict_t *pClient, int *ping, int *packet_loss );
+
+	void		(*pfnAddServerCommand)		( char *cmd_name, void (*function) (void) );
+
+	// For voice communications, set which clients hear eachother.
+	// NOTE: these functions take player entity indices (starting at 1).
+	qboolean	(*pfnVoice_GetClientListening)(int iReceiver, int iSender);
+	qboolean	(*pfnVoice_SetClientListening)(int iReceiver, int iSender, qboolean bListen);
+
+	const char*	(*pfnGetPlayerAuthId)		( edict_t *e );
+} enginefuncs_t;
+// ONLY ADD NEW FUNCTIONS TO THE END OF THIS STRUCT.  INTERFACE VERSION IS FROZEN AT 138
+
+// Passed to pfnKeyValue
+typedef struct KeyValueData_s
+{
+	char	*szClassName;	// in: entity classname
+	char	*szKeyName;		// in: name of key
+	char	*szValue;		// in: value of key
+	long	fHandled;		// out: DLL sets to true if key-value pair was understood
+} KeyValueData;
+
+
+typedef struct
+{
+	char		mapName[ 32 ];
+	char		landmarkName[ 32 ];
+	edict_t	*pentLandmark;
+	vec3_t		vecLandmarkOrigin;
+} LEVELLIST;
+#define MAX_LEVEL_CONNECTIONS	16		// These are encoded in the lower 16bits of ENTITYTABLE->flags
+
+typedef struct 
+{
+	int			id;				// Ordinal ID of this entity (used for entity <--> pointer conversions)
+	edict_t	*pent;			// Pointer to the in-game entity
+
+	int			location;		// Offset from the base data of this entity
+	int			size;			// Byte size of this entity's data
+	int			flags;			// This could be a short -- bit mask of transitions that this entity is in the PVS of
+	string_t	classname;		// entity class name
+
+} ENTITYTABLE;
+
+#define FENTTABLE_PLAYER		0x80000000
+#define FENTTABLE_REMOVED		0x40000000
+#define FENTTABLE_MOVEABLE		0x20000000
+#define FENTTABLE_GLOBAL		0x10000000
+
+typedef struct saverestore_s SAVERESTOREDATA;
+
+#ifdef _WIN32
+typedef 
+#endif
+struct saverestore_s
+{
+	char		*pBaseData;		// Start of all entity save data
+	char		*pCurrentData;	// Current buffer pointer for sequential access
+	int			size;			// Current data size
+	int			bufferSize;		// Total space for data
+	int			tokenSize;		// Size of the linear list of tokens
+	int			tokenCount;		// Number of elements in the pTokens table
+	char		**pTokens;		// Hash table of entity strings (sparse)
+	int			currentIndex;	// Holds a global entity table ID
+	int			tableCount;		// Number of elements in the entity table
+	int			connectionCount;// Number of elements in the levelList[]
+	ENTITYTABLE	*pTable;		// Array of ENTITYTABLE elements (1 for each entity)
+	LEVELLIST	levelList[ MAX_LEVEL_CONNECTIONS ];		// List of connections from this level
+
+	// smooth transition
+	int			fUseLandmark;
+	char		szLandmarkName[20];// landmark we'll spawn near in next level
+	vec3_t		vecLandmarkOffset;// for landmark transitions
+	float		time;
+	char		szCurrentMapName[32];	// To check global entities
+
+} 
+#ifdef _WIN32
+SAVERESTOREDATA 
+#endif
+;
+
+typedef enum _fieldtypes
+{
+	FIELD_FLOAT = 0,		// Any floating point value
+	FIELD_STRING,			// A string ID (return from ALLOC_STRING)
+	FIELD_ENTITY,			// An entity offset (EOFFSET)
+	FIELD_CLASSPTR,			// CBaseEntity *
+	FIELD_EHANDLE,			// Entity handle
+	FIELD_EVARS,			// EVARS *
+	FIELD_EDICT,			// edict_t *, or edict_t *  (same thing)
+	FIELD_VECTOR,			// Any vector
+	FIELD_POSITION_VECTOR,	// A world coordinate (these are fixed up across level transitions automagically)
+	FIELD_POINTER,			// Arbitrary data pointer... to be removed, use an array of FIELD_CHARACTER
+	FIELD_INTEGER,			// Any integer or enum
+	FIELD_FUNCTION,			// A class function pointer (Think, Use, etc)
+	FIELD_BOOLEAN,			// boolean, implemented as an int, I may use this as a hint for compression
+	FIELD_SHORT,			// 2 byte integer
+	FIELD_CHARACTER,		// a byte
+	FIELD_TIME,				// a floating point time (these are fixed up automatically too!)
+	FIELD_MODELNAME,		// Engine string that is a model name (needs precache)
+	FIELD_SOUNDNAME,		// Engine string that is a sound name (needs precache)
+
+	FIELD_TYPECOUNT,		// MUST BE LAST
+} FIELDTYPE;
+
+#ifndef offsetof
+#define offsetof(s,m)	(size_t)&(((s *)0)->m)
+#endif
+
+#define _FIELD(type,name,fieldtype,count,flags)		{ fieldtype, #name, offsetof(type, name), count, flags }
+#define DEFINE_FIELD(type,name,fieldtype)			_FIELD(type, name, fieldtype, 1, 0)
+#define DEFINE_ARRAY(type,name,fieldtype,count)		_FIELD(type, name, fieldtype, count, 0)
+#define DEFINE_ENTITY_FIELD(name,fieldtype)			_FIELD(entvars_t, name, fieldtype, 1, 0 )
+#define DEFINE_ENTITY_GLOBAL_FIELD(name,fieldtype)	_FIELD(entvars_t, name, fieldtype, 1, FTYPEDESC_GLOBAL )
+#define DEFINE_GLOBAL_FIELD(type,name,fieldtype)	_FIELD(type, name, fieldtype, 1, FTYPEDESC_GLOBAL )
+
+
+#define FTYPEDESC_GLOBAL			0x0001		// This field is masked for global entity save/restore
+
+typedef struct 
+{
+	FIELDTYPE		fieldType;
+	char			*fieldName;
+	int				fieldOffset;
+	short			fieldSize;
+	short			flags;
+} TYPEDESCRIPTION;
+
+#define ARRAYSIZE(p)		(sizeof(p)/sizeof(p[0]))
+
+typedef struct 
+{
+	// Initialize/shutdown the game (one-time call after loading of game .dll )
+	void			(*pfnGameInit)			( void );				
+	int				(*pfnSpawn)				( edict_t *pent );
+	void			(*pfnThink)				( edict_t *pent );
+	void			(*pfnUse)				( edict_t *pentUsed, edict_t *pentOther );
+	void			(*pfnTouch)				( edict_t *pentTouched, edict_t *pentOther );
+	void			(*pfnBlocked)			( edict_t *pentBlocked, edict_t *pentOther );
+	void			(*pfnKeyValue)			( edict_t *pentKeyvalue, KeyValueData *pkvd );
+	void			(*pfnSave)				( edict_t *pent, SAVERESTOREDATA *pSaveData );
+	int 			(*pfnRestore)			( edict_t *pent, SAVERESTOREDATA *pSaveData, int globalEntity );
+	void			(*pfnSetAbsBox)			( edict_t *pent );
+
+	void			(*pfnSaveWriteFields)	( SAVERESTOREDATA *, const char *, void *, TYPEDESCRIPTION *, int );
+	void			(*pfnSaveReadFields)	( SAVERESTOREDATA *, const char *, void *, TYPEDESCRIPTION *, int );
+
+	void			(*pfnSaveGlobalState)		( SAVERESTOREDATA * );
+	void			(*pfnRestoreGlobalState)	( SAVERESTOREDATA * );
+	void			(*pfnResetGlobalState)		( void );
+
+	qboolean		(*pfnClientConnect)		( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[ 128 ] );
+	
+	void			(*pfnClientDisconnect)	( edict_t *pEntity );
+	void			(*pfnClientKill)		( edict_t *pEntity );
+	void			(*pfnClientPutInServer)	( edict_t *pEntity );
+	void			(*pfnClientCommand)		( edict_t *pEntity );
+	void			(*pfnClientUserInfoChanged)( edict_t *pEntity, char *infobuffer );
+
+	void			(*pfnServerActivate)	( edict_t *pEdictList, int edictCount, int clientMax );
+	void			(*pfnServerDeactivate)	( void );
+
+	void			(*pfnPlayerPreThink)	( edict_t *pEntity );
+	void			(*pfnPlayerPostThink)	( edict_t *pEntity );
+
+	void			(*pfnStartFrame)		( void );
+	void			(*pfnParmsNewLevel)		( void );
+	void			(*pfnParmsChangeLevel)	( void );
+
+	 // Returns string describing current .dll.  E.g., TeamFotrress 2, Half-Life
+	const char     *(*pfnGetGameDescription)( void );     
+
+	// Notify dll about a player customization.
+	void            (*pfnPlayerCustomization) ( edict_t *pEntity, customization_t *pCustom );  
+
+	// Spectator funcs
+	void			(*pfnSpectatorConnect)		( edict_t *pEntity );
+	void			(*pfnSpectatorDisconnect)	( edict_t *pEntity );
+	void			(*pfnSpectatorThink)		( edict_t *pEntity );
+
+	// Notify game .dll that engine is going to shut down.  Allows mod authors to set a breakpoint.
+	void			(*pfnSys_Error)			( const char *error_string );
+
+	void			(*pfnPM_Move) ( struct playermove_s *ppmove, qboolean server );
+	void			(*pfnPM_Init) ( struct playermove_s *ppmove );
+	char			(*pfnPM_FindTextureType)( char *name );
+	void			(*pfnSetupVisibility)( struct edict_s *pViewEntity, struct edict_s *pClient, unsigned char **pvs, unsigned char **pas );
+	void			(*pfnUpdateClientData) ( const struct edict_s *ent, int sendweapons, struct clientdata_s *cd );
+	int				(*pfnAddToFullPack)( struct entity_state_s *state, int e, edict_t *ent, edict_t *host, int hostflags, int player, unsigned char *pSet );
+	void			(*pfnCreateBaseline) ( int player, int eindex, struct entity_state_s *baseline, struct edict_s *entity, int playermodelindex, vec3_t player_mins, vec3_t player_maxs );
+	void			(*pfnRegisterEncoders)	( void );
+	int				(*pfnGetWeaponData)		( struct edict_s *player, struct weapon_data_s *info );
+
+	void			(*pfnCmdStart)			( const edict_t *player, const struct usercmd_s *cmd, unsigned int random_seed );
+	void			(*pfnCmdEnd)			( const edict_t *player );
+
+	// Return 1 if the packet is valid.  Set response_buffer_size if you want to send a response packet.  Incoming, it holds the max
+	//  size of the response_buffer, so you must zero it out if you choose not to respond.
+	int				(*pfnConnectionlessPacket )	( const struct netadr_s *net_from, const char *args, char *response_buffer, int *response_buffer_size );
+
+	// Enumerates player hulls.  Returns 0 if the hull number doesn't exist, 1 otherwise
+	int				(*pfnGetHullBounds)	( int hullnumber, float *mins, float *maxs );
+
+	// Create baselines for certain "unplaced" items.
+	void			(*pfnCreateInstancedBaselines) ( void );
+
+	// One of the pfnForceUnmodified files failed the consistency check for the specified player
+	// Return 0 to allow the client to continue, 1 to force immediate disconnection ( with an optional disconnect message of up to 256 characters )
+	int				(*pfnInconsistentFile)( const struct edict_s *player, const char *filename, char *disconnect_message );
+
+	// The game .dll should return 1 if lag compensation should be allowed ( could also just set
+	//  the sv_unlag cvar.
+	// Most games right now should return 0, until client-side weapon prediction code is written
+	//  and tested for them.
+	int				(*pfnAllowLagCompensation)( void );
+} DLL_FUNCTIONS;
+
+extern DLL_FUNCTIONS		gEntityInterface;
+
+// Current version.
+#define NEW_DLL_FUNCTIONS_VERSION	1
+
+typedef struct
+{
+	// Called right before the object's memory is freed. 
+	// Calls its destructor.
+	void			(*pfnOnFreeEntPrivateData)(edict_t *pEnt);
+	void			(*pfnGameShutdown)(void);
+	int				(*pfnShouldCollide)( edict_t *pentTouched, edict_t *pentOther );
+} NEW_DLL_FUNCTIONS;
+typedef int	(*NEW_DLL_FUNCTIONS_FN)( NEW_DLL_FUNCTIONS *pFunctionTable, int *interfaceVersion );
+
+// Pointers will be null if the game DLL doesn't support this API.
+extern NEW_DLL_FUNCTIONS	gNewDLLFunctions;
+
+typedef int	(*APIFUNCTION)( DLL_FUNCTIONS *pFunctionTable, int interfaceVersion );
+typedef int	(*APIFUNCTION2)( DLL_FUNCTIONS *pFunctionTable, int *interfaceVersion );
+
+#endif EIFACE_H
diff --git a/main/source/engine/keydefs.h b/main/source/engine/keydefs.h
new file mode 100644
index 00000000..aca2c09b
--- /dev/null
+++ b/main/source/engine/keydefs.h
@@ -0,0 +1,129 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+// keydefs.h
+#ifndef KEYDEFS_H
+#define KEYDEFS_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+//
+// these are the key numbers that should be passed to Key_Event
+//
+#define	K_TAB			9
+#define	K_ENTER			13
+#define	K_ESCAPE		27
+#define	K_SPACE			32
+
+// normal keys should be passed as lowercased ascii
+
+#define	K_BACKSPACE		127
+#define	K_UPARROW		128
+#define	K_DOWNARROW		129
+#define	K_LEFTARROW		130
+#define	K_RIGHTARROW	131
+
+#define	K_ALT			132
+#define	K_CTRL			133
+#define	K_SHIFT			134
+#define	K_F1			135
+#define	K_F2			136
+#define	K_F3			137
+#define	K_F4			138
+#define	K_F5			139
+#define	K_F6			140
+#define	K_F7			141
+#define	K_F8			142
+#define	K_F9			143
+#define	K_F10			144
+#define	K_F11			145
+#define	K_F12			146
+#define	K_INS			147
+#define	K_DEL			148
+#define	K_PGDN			149
+#define	K_PGUP			150
+#define	K_HOME			151
+#define	K_END			152
+
+#define K_KP_HOME		160
+#define K_KP_UPARROW	161
+#define K_KP_PGUP		162
+#define	K_KP_LEFTARROW	163
+#define K_KP_5			164
+#define K_KP_RIGHTARROW	165
+#define K_KP_END		166
+#define K_KP_DOWNARROW	167
+#define K_KP_PGDN		168
+#define	K_KP_ENTER		169
+#define K_KP_INS   		170
+#define	K_KP_DEL		171
+#define K_KP_SLASH		172
+#define K_KP_MINUS		173
+#define K_KP_PLUS		174
+#define K_CAPSLOCK		175
+
+
+//
+// joystick buttons
+//
+#define	K_JOY1			203
+#define	K_JOY2			204
+#define	K_JOY3			205
+#define	K_JOY4			206
+
+//
+// aux keys are for multi-buttoned joysticks to generate so they can use
+// the normal binding process
+//
+#define	K_AUX1			207
+#define	K_AUX2			208
+#define	K_AUX3			209
+#define	K_AUX4			210
+#define	K_AUX5			211
+#define	K_AUX6			212
+#define	K_AUX7			213
+#define	K_AUX8			214
+#define	K_AUX9			215
+#define	K_AUX10			216
+#define	K_AUX11			217
+#define	K_AUX12			218
+#define	K_AUX13			219
+#define	K_AUX14			220
+#define	K_AUX15			221
+#define	K_AUX16			222
+#define	K_AUX17			223
+#define	K_AUX18			224
+#define	K_AUX19			225
+#define	K_AUX20			226
+#define	K_AUX21			227
+#define	K_AUX22			228
+#define	K_AUX23			229
+#define	K_AUX24			230
+#define	K_AUX25			231
+#define	K_AUX26			232
+#define	K_AUX27			233
+#define	K_AUX28			234
+#define	K_AUX29			235
+#define	K_AUX30			236
+#define	K_AUX31			237
+#define	K_AUX32			238
+#define K_MWHEELDOWN	239
+#define K_MWHEELUP		240
+
+#define K_PAUSE			255
+
+//
+// mouse buttons generate virtual keys
+//
+#define	K_MOUSE1		241
+#define	K_MOUSE2		242
+#define	K_MOUSE3		243
+#define K_MOUSE4		244
+#define K_MOUSE5		245
+
+#endif // KEYDEFS_H
diff --git a/main/source/engine/progdefs.h b/main/source/engine/progdefs.h
new file mode 100644
index 00000000..b8c58add
--- /dev/null
+++ b/main/source/engine/progdefs.h
@@ -0,0 +1,224 @@
+/***
+*
+*	Copyright (c) 1996-2002, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef PROGDEFS_H
+#define PROGDEFS_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+typedef struct
+{	
+	float		time;
+	float		frametime;
+	float		force_retouch;
+	string_t	mapname;
+	string_t	startspot;
+	float		deathmatch;
+	float		coop;
+	float		teamplay;
+	float		serverflags;
+	float		found_secrets;
+	vec3_t		v_forward;
+	vec3_t		v_up;
+	vec3_t		v_right;
+	float		trace_allsolid;
+	float		trace_startsolid;
+	float		trace_fraction;
+	vec3_t		trace_endpos;
+	vec3_t		trace_plane_normal;
+	float		trace_plane_dist;
+	edict_t		*trace_ent;
+	float		trace_inopen;
+	float		trace_inwater;
+	int			trace_hitgroup;
+	int			trace_flags;
+	int			msg_entity;
+	int			cdAudioTrack;
+	int			maxClients;
+	int			maxEntities;
+	const char	*pStringBase;
+
+	void		*pSaveData;
+	vec3_t		vecLandmarkOffset;
+} globalvars_t;
+
+
+typedef struct entvars_s
+{
+	string_t	classname;
+	string_t	globalname;
+
+	vec3_t		origin;
+	vec3_t		oldorigin;
+	vec3_t		velocity;
+	vec3_t		basevelocity;
+	vec3_t      clbasevelocity;  // Base velocity that was passed in to server physics so 
+							     //  client can predict conveyors correctly.  Server zeroes it, so we need to store here, too.
+	vec3_t		movedir;
+
+	vec3_t		angles;			// Model angles
+	vec3_t		avelocity;		// angle velocity (degrees per second)
+	vec3_t		punchangle;		// auto-decaying view angle adjustment
+	vec3_t		v_angle;		// Viewing angle (player only)
+
+	// For parametric entities
+	vec3_t		endpos;
+	vec3_t		startpos;
+	float		impacttime;
+	float		starttime;
+
+	int			fixangle;		// 0:nothing, 1:force view angles, 2:add avelocity
+	float		idealpitch;
+	float		pitch_speed;
+	float		ideal_yaw;
+	float		yaw_speed;
+
+	int			modelindex;
+	string_t	model;
+
+	int			viewmodel;		// player's viewmodel
+	int			weaponmodel;	// what other players see
+	
+	vec3_t		absmin;		// BB max translated to world coord
+	vec3_t		absmax;		// BB max translated to world coord
+	vec3_t		mins;		// local BB min
+	vec3_t		maxs;		// local BB max
+	vec3_t		size;		// maxs - mins
+
+	float		ltime;
+	float		nextthink;
+
+	int			movetype;
+	int			solid;
+
+	int			skin;			
+	int			body;			// sub-model selection for studiomodels
+	int 		effects;
+	
+	float		gravity;		// % of "normal" gravity
+	float		friction;		// inverse elasticity of MOVETYPE_BOUNCE
+	
+	int			light_level;
+
+	int			sequence;		// animation sequence
+	int			gaitsequence;	// movement animation sequence for player (0 for none)
+	float		frame;			// % playback position in animation sequences (0..255)
+	float		animtime;		// world time when frame was set
+	float		framerate;		// animation playback rate (-8x to 8x)
+	byte		controller[4];	// bone controller setting (0..255)
+	byte		blending[2];	// blending amount between sub-sequences (0..255)
+
+	float		scale;			// sprite rendering scale (0..255)
+
+	int			rendermode;
+	float		renderamt;
+	vec3_t		rendercolor;
+	int			renderfx;
+
+	float		health;
+	float		frags;
+	int			weapons;  // bit mask for available weapons
+	float		takedamage;
+
+	int			deadflag;
+	vec3_t		view_ofs;	// eye position
+
+	int			button;
+	int			impulse;
+
+	edict_t		*chain;			// Entity pointer when linked into a linked list
+	edict_t		*dmg_inflictor;
+	edict_t		*enemy;
+	edict_t		*aiment;		// entity pointer when MOVETYPE_FOLLOW
+	edict_t		*owner;
+	edict_t		*groundentity;
+
+	int			spawnflags;
+	int			flags;
+	
+	int			colormap;		// lowbyte topcolor, highbyte bottomcolor
+	int			team;
+
+	float		max_health;
+	float		teleport_time;
+	float		armortype;
+	float		armorvalue;
+	int			waterlevel;
+	int			watertype;
+	
+	string_t	target;
+	string_t	targetname;
+	string_t	netname;
+	string_t	message;
+
+	float		dmg_take;
+	float		dmg_save;
+	float		dmg;
+	float		dmgtime;
+	
+	string_t	noise;
+	string_t	noise1;
+	string_t	noise2;
+	string_t	noise3;
+	
+	float		speed;
+	float		air_finished;
+	float		pain_finished;
+	float		radsuit_finished;
+	
+	edict_t		*pContainingEntity;
+
+	int			playerclass;
+	float		maxspeed;
+
+	float		fov;
+	int			weaponanim;
+
+	int			pushmsec;
+
+	int			bInDuck;
+	int			flTimeStepSound;
+	int			flSwimTime;
+	int			flDuckTime;
+	int			iStepLeft;
+	float		flFallVelocity;
+
+	int			gamestate;
+
+	int			oldbuttons;
+
+	int			groupinfo;
+
+	// For mods
+	int			iuser1;
+	int			iuser2;
+	int			iuser3;
+	int			iuser4;
+	float		fuser1;
+	float		fuser2;
+	float		fuser3;
+	float		fuser4;
+	vec3_t		vuser1;
+	vec3_t		vuser2;
+	vec3_t		vuser3;
+	vec3_t		vuser4;
+	edict_t		*euser1;
+	edict_t		*euser2;
+	edict_t		*euser3;
+	edict_t		*euser4;
+} entvars_t;
+
+
+#endif // PROGDEFS_H
\ No newline at end of file
diff --git a/main/source/engine/shake.h b/main/source/engine/shake.h
new file mode 100644
index 00000000..8e405db0
--- /dev/null
+++ b/main/source/engine/shake.h
@@ -0,0 +1,55 @@
+/***
+*
+*	Copyright (c) 1996-2002, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef SHAKE_H
+#define SHAKE_H
+
+// Screen / View effects
+
+// screen shake
+extern int gmsgShake;
+
+// This structure is sent over the net to describe a screen shake event
+typedef struct
+{
+	unsigned short	amplitude;		// FIXED 4.12 amount of shake
+	unsigned short 	duration;		// FIXED 4.12 seconds duration
+	unsigned short	frequency;		// FIXED 8.8 noise frequency (low frequency is a jerk,high frequency is a rumble)
+} ScreenShake;
+
+extern void V_ApplyShake( float *origin, float *angles, float factor );
+extern void V_CalcShake( void );
+extern int V_ScreenShake( const char *pszName, int iSize, void *pbuf );
+extern int V_ScreenFade( const char *pszName, int iSize, void *pbuf );
+
+
+// Fade in/out
+extern int gmsgFade;
+
+#define FFADE_IN			0x0000		// Just here so we don't pass 0 into the function
+#define FFADE_OUT			0x0001		// Fade out (not in)
+#define FFADE_MODULATE		0x0002		// Modulate (don't blend)
+#define FFADE_STAYOUT		0x0004		// ignores the duration, stays faded out until new ScreenFade message received
+
+// This structure is sent over the net to describe a screen fade event
+typedef struct
+{
+	unsigned short 	duration;		// FIXED 4.12 seconds duration
+	unsigned short 	holdTime;		// FIXED 4.12 seconds duration until reset (fade & hold)
+	short			fadeFlags;		// flags
+	byte			r, g, b, a;		// fade to color ( max alpha )
+} ScreenFade;
+
+#endif		// SHAKE_H
+
diff --git a/main/source/engine/studio.h b/main/source/engine/studio.h
new file mode 100644
index 00000000..62d4a986
--- /dev/null
+++ b/main/source/engine/studio.h
@@ -0,0 +1,362 @@
+/***
+*
+*	Copyright (c) 1996-2002, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+
+
+
+#ifndef _STUDIO_H_
+#define _STUDIO_H_
+
+/*
+==============================================================================
+
+STUDIO MODELS
+
+Studio models are position independent, so the cache manager can move them.
+==============================================================================
+*/
+
+
+#define MAXSTUDIOTRIANGLES	20000	// TODO: tune this
+#define MAXSTUDIOVERTS		2048	// TODO: tune this
+#define MAXSTUDIOSEQUENCES	256		// total animation sequences
+#define MAXSTUDIOSKINS		100		// total textures
+#define MAXSTUDIOSRCBONES	512		// bones allowed at source movement
+#define MAXSTUDIOBONES		128		// total bones actually used
+#define MAXSTUDIOMODELS		32		// sub-models per model
+#define MAXSTUDIOBODYPARTS	32
+#define MAXSTUDIOGROUPS		16
+#define MAXSTUDIOANIMATIONS	512		// per sequence
+#define MAXSTUDIOMESHES		256
+#define MAXSTUDIOEVENTS		1024
+#define MAXSTUDIOPIVOTS		256
+#define MAXSTUDIOCONTROLLERS 8
+
+typedef struct 
+{
+	int					id;
+	int					version;
+
+	char				name[64];
+	int					length;
+
+	vec3_t				eyeposition;	// ideal eye position
+	vec3_t				min;			// ideal movement hull size
+	vec3_t				max;			
+
+	vec3_t				bbmin;			// clipping bounding box
+	vec3_t				bbmax;		
+
+	int					flags;
+
+	int					numbones;			// bones
+	int					boneindex;
+
+	int					numbonecontrollers;		// bone controllers
+	int					bonecontrollerindex;
+
+	int					numhitboxes;			// complex bounding boxes
+	int					hitboxindex;			
+	
+	int					numseq;				// animation sequences
+	int					seqindex;
+
+	int					numseqgroups;		// demand loaded sequences
+	int					seqgroupindex;
+
+	int					numtextures;		// raw textures
+	int					textureindex;
+	int					texturedataindex;
+
+	int					numskinref;			// replaceable textures
+	int					numskinfamilies;
+	int					skinindex;
+
+	int					numbodyparts;		
+	int					bodypartindex;
+
+	int					numattachments;		// queryable attachable points
+	int					attachmentindex;
+
+	int					soundtable;
+	int					soundindex;
+	int					soundgroups;
+	int					soundgroupindex;
+
+	int					numtransitions;		// animation node to animation node transition graph
+	int					transitionindex;
+} studiohdr_t;
+
+// header for demand loaded sequence group data
+typedef struct 
+{
+	int					id;
+	int					version;
+
+	char				name[64];
+	int					length;
+} studioseqhdr_t;
+
+// bones
+typedef struct 
+{
+	char				name[32];	// bone name for symbolic links
+	int		 			parent;		// parent bone
+	int					flags;		// ??
+	int					bonecontroller[6];	// bone controller index, -1 == none
+	float				value[6];	// default DoF values
+	float				scale[6];   // scale for delta DoF values
+} mstudiobone_t;
+
+
+// bone controllers
+typedef struct 
+{
+	int					bone;	// -1 == 0
+	int					type;	// X, Y, Z, XR, YR, ZR, M
+	float				start;
+	float				end;
+	int					rest;	// byte index value at rest
+	int					index;	// 0-3 user set controller, 4 mouth
+} mstudiobonecontroller_t;
+
+// intersection boxes
+typedef struct
+{
+	int					bone;
+	int					group;			// intersection group
+	vec3_t				bbmin;		// bounding box
+	vec3_t				bbmax;		
+} mstudiobbox_t;
+
+#if !defined( CACHE_USER ) && !defined( QUAKEDEF_H )
+#define CACHE_USER
+typedef struct cache_user_s
+{
+	void *data;
+} cache_user_t;
+#endif
+
+// demand loaded sequence groups
+typedef struct
+{
+	char				label[32];	// textual name
+	char				name[64];	// file name
+	cache_user_t		cache;		// cache index pointer
+	int					data;		// hack for group 0
+} mstudioseqgroup_t;
+
+// sequence descriptions
+typedef struct
+{
+	char				label[32];	// sequence label
+
+	float				fps;		// frames per second	
+	int					flags;		// looping/non-looping flags
+
+	int					activity;
+	int					actweight;
+
+	int					numevents;
+	int					eventindex;
+
+	int					numframes;	// number of frames per sequence
+
+	int					numpivots;	// number of foot pivots
+	int					pivotindex;
+
+	int					motiontype;	
+	int					motionbone;
+	vec3_t				linearmovement;
+	int					automoveposindex;
+	int					automoveangleindex;
+
+	vec3_t				bbmin;		// per sequence bounding box
+	vec3_t				bbmax;		
+
+	int					numblends;
+	int					animindex;		// mstudioanim_t pointer relative to start of sequence group data
+										// [blend][bone][X, Y, Z, XR, YR, ZR]
+
+	int					blendtype[2];	// X, Y, Z, XR, YR, ZR
+	float				blendstart[2];	// starting value
+	float				blendend[2];	// ending value
+	int					blendparent;
+
+	int					seqgroup;		// sequence group for demand loading
+
+	int					entrynode;		// transition node at entry
+	int					exitnode;		// transition node at exit
+	int					nodeflags;		// transition rules
+	
+	int					nextseq;		// auto advancing sequences
+} mstudioseqdesc_t;
+
+// events
+#include "studio_event.h"
+/*
+typedef struct 
+{
+	int 				frame;
+	int					event;
+	int					type;
+	char				options[64];
+} mstudioevent_t;
+*/
+
+// pivots
+typedef struct 
+{
+	vec3_t				org;	// pivot point
+	int					start;
+	int					end;
+} mstudiopivot_t;
+
+// attachment
+typedef struct 
+{
+	char				name[32];
+	int					type;
+	int					bone;
+	vec3_t				org;	// attachment point
+	vec3_t				vectors[3];
+} mstudioattachment_t;
+
+typedef struct
+{
+	unsigned short	offset[6];
+} mstudioanim_t;
+
+// animation frames
+typedef union 
+{
+	struct {
+		byte	valid;
+		byte	total;
+	} num;
+	short		value;
+} mstudioanimvalue_t;
+
+
+
+// body part index
+typedef struct
+{
+	char				name[64];
+	int					nummodels;
+	int					base;
+	int					modelindex; // index into models array
+} mstudiobodyparts_t;
+
+
+
+// skin info
+typedef struct
+{
+	char					name[64];
+	int						flags;
+	int						width;
+	int						height;
+	int						index;
+} mstudiotexture_t;
+
+
+// skin families
+// short	index[skinfamilies][skinref]
+
+// studio models
+typedef struct
+{
+	char				name[64];
+
+	int					type;
+
+	float				boundingradius;
+
+	int					nummesh;
+	int					meshindex;
+
+	int					numverts;		// number of unique vertices
+	int					vertinfoindex;	// vertex bone info
+	int					vertindex;		// vertex vec3_t
+	int					numnorms;		// number of unique surface normals
+	int					norminfoindex;	// normal bone info
+	int					normindex;		// normal vec3_t
+
+	int					numgroups;		// deformation groups
+	int					groupindex;
+} mstudiomodel_t;
+
+
+// vec3_t	boundingbox[model][bone][2];	// complex intersection info
+
+
+// meshes
+typedef struct 
+{
+	int					numtris;
+	int					triindex;
+	int					skinref;
+	int					numnorms;		// per mesh normals
+	int					normindex;		// normal vec3_t
+} mstudiomesh_t;
+
+// triangles
+#if 0
+typedef struct 
+{
+	short				vertindex;		// index into vertex array
+	short				normindex;		// index into normal array
+	short				s,t;			// s,t position on skin
+} mstudiotrivert_t;
+#endif
+
+// lighting options
+#define STUDIO_NF_FLATSHADE		0x0001
+#define STUDIO_NF_CHROME		0x0002
+#define STUDIO_NF_FULLBRIGHT	0x0004
+
+// motion flags
+#define STUDIO_X		0x0001
+#define STUDIO_Y		0x0002	
+#define STUDIO_Z		0x0004
+#define STUDIO_XR		0x0008
+#define STUDIO_YR		0x0010
+#define STUDIO_ZR		0x0020
+#define STUDIO_LX		0x0040
+#define STUDIO_LY		0x0080
+#define STUDIO_LZ		0x0100
+#define STUDIO_AX		0x0200
+#define STUDIO_AY		0x0400
+#define STUDIO_AZ		0x0800
+#define STUDIO_AXR		0x1000
+#define STUDIO_AYR		0x2000
+#define STUDIO_AZR		0x4000
+#define STUDIO_TYPES	0x7FFF
+#define STUDIO_RLOOP	0x8000	// controller that wraps shortest distance
+
+// sequence flags
+#define STUDIO_LOOPING	0x0001
+
+// bone flags
+#define STUDIO_HAS_NORMALS	0x0001
+#define STUDIO_HAS_VERTICES 0x0002
+#define STUDIO_HAS_BBOX		0x0004
+#define STUDIO_HAS_CHROME	0x0008	// if any of the textures have chrome on them
+
+#define RAD_TO_STUDIO		(32768.0/M_PI)
+#define STUDIO_TO_RAD		(M_PI/32768.0)
+
+#endif
diff --git a/main/source/external/vgui/include/VGUI.h b/main/source/external/vgui/include/VGUI.h
new file mode 100644
index 00000000..9549c305
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI.h
@@ -0,0 +1,101 @@
+
+#ifndef VGUI_H
+#define VGUI_H
+
+//If you are going to add stuff to the vgui core...
+//
+//Keep it simple.
+//
+//Never put code in a header.
+//
+//The name of the class is the name of the the file
+//
+//Each class gets its own .cpp file for its definition and a .h for its header. Helper
+//classes can be used but only within the .cpp and not referenceable from anywhere else.
+//
+//Don't add unneeded files. Keep the API clean.
+//
+//No platform specific code in vgui\lib-src\vgui dir. Code in vgui\lib-src\vgui should 
+//only include from vgui\include or standard C includes. ie, if I see windows.h included
+//anywhere but vgui\lib-src\win32 I will hunt you down and kill you. Don't give me any crap
+//that mfc is platform inspecific.
+//
+//Always use <> and not "" for includes
+//
+//Use minimum dependencies in headers. Don't include another header if you can get away
+//with forward declaring (which is usually the case)
+//
+//No macros in headers. They are tools of satan. This also means no use of DEFINEs, use enum
+//
+//Minimize global functions
+//
+//No global variables.
+//
+//Panel is getting pretty plump, try and avoid adding junk to it if you can
+
+//TODO: Look and Feel support
+//		add Panel::setPaintProxy, if _paintProxy exists, it calls _paintProxy->paint 
+//		instead of Panel::paint. Components should implement their painting in a seperate
+//      plugin class. Perhaps to encourage this, Panel::paint should just go away completely
+//      The other option is to have Panel have the interface Paintable
+//      class Paintable
+//      {
+//      public:
+//			virtual void paint()=0;
+//      };
+//      Then a component can implement its paint in the class itself and then call 
+//		setPaintProxy(this). If this is the case _paintProxy->paint should always be called
+//      and never Panel::paint from within paintTraverse
+//TODO: Figure out the 'Valve' Look and Feel and implement that instead of a the Java one
+//TODO: Determine ownership policy for Borders, Layouts, etc..
+//TODO: tooltips support
+//TODO: ComboKey (hot key support)
+//TODO: add Background.cpp, remove paintBackground from all components
+//		Panel implements setBackground, Panel::paintBackground calls _background->paintBackground
+//		similiar to the way Border works. 
+//TODO: Builtin components should never overide paintBackground, only paint
+//TODO: All protected members should be converted to private
+//TODO: All member variables should be moved to the top of the class prototype
+//TODO: All private methods should be prepended with private
+//TODO: Use of word internal in method names is not consistent and confusing
+//TODO: Cleanup so bullshit publics are properly named, maybe even figure out
+//      a naming convention for them
+//TODO: Breakup InputSignal into logical pieces
+//TODO: Button is in a state of disarray, it should have ButtonModel support
+//TODO: get rid of all the stupid strdup laziness, convert to vgui_strdup
+//TODO: actually figure out policy on String and implement it consistently
+//TODO: implement createLayoutInfo for other Layouts than need it
+//TODO: BorderLayout should have option for a null LayoutInfo defaulting to center
+//TODO: SurfaceBase should go away, put it in Surface
+//TODO: ActionSignals and other Signals should just set a flag when they fire.
+//		then App can come along later and fire all the signals
+//TODO: Change all method naming to starting with a capital letter.
+
+#ifdef _WIN32
+# define VGUIAPI __declspec( dllexport )
+#else
+# define VGUIAPI
+#endif
+
+#define null 0L
+
+typedef unsigned char  uchar;
+typedef unsigned short ushort;
+typedef unsigned int   uint;
+typedef unsigned long  ulong;
+
+namespace vgui
+{
+
+VGUIAPI void  vgui_setMalloc(void* (*malloc)(size_t size));
+VGUIAPI void  vgui_setFree(void (*free)(void* memblock));
+VGUIAPI void  vgui_strcpy(char* dst,int dstLen,const char* src);
+VGUIAPI char* vgui_strdup(const char* src);
+VGUIAPI int   vgui_printf(const char* format,...);
+VGUIAPI int   vgui_dprintf(const char* format,...);
+VGUIAPI int   vgui_dprintf2(const char* format,...);
+
+}
+
+#endif
+
diff --git a/main/source/external/vgui/include/VGUI_ActionSignal.h b/main/source/external/vgui/include/VGUI_ActionSignal.h
new file mode 100644
index 00000000..8c7798e9
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_ActionSignal.h
@@ -0,0 +1,78 @@
+
+#ifndef VGUI_ACTIONSIGNAL_H
+#define VGUI_ACTIONSIGNAL_H
+
+#include<VGUI.h>
+
+/*
+
+TODO: maybe try something like this..
+
+class VGUIAPI ActionSignal
+{
+};
+
+class VGUIAPI ActionSignalSimple : public ActionSignal
+{
+public:
+	virtual void actionPerformed(Panel* panel)=0;
+};
+
+class VGUIAPI ActionSignalInt : public ActionSignal
+{
+public:
+	virtual void actionPerformed(int value,Panel* panel)=0;
+};
+
+
+DefaultButtonModel would implement:
+
+virtual void addActionSignal(ActionSignal* s)
+{
+	if(s!=null)
+	{
+		_actionSignalDar.putElement(s);
+	}
+}
+
+virtual void fireActionSignal()
+{
+	for(int i=0;i<_actionSignalDar.getCount();i++)
+	{
+		ActionSignal* signal=_actionSignalDar[i];
+		
+		ActionSignalSimple* ss=dynamic_cast<ActionSignalSimple*>(signal);
+		if(ss!=null)
+		{
+			ss->actionPerformed(this);
+		}
+	
+		ActionSignalCommand* si=dynamic_cast<ActionSignalInt*>(signal);
+		if(si!=null)
+		{
+			si->actionPerformed(_intValue,this);
+		}
+	}
+}
+
+
+*/
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI ActionSignal
+{
+public:
+	virtual void actionPerformed(Panel* panel)=0;
+};
+
+}
+
+#endif
+
+
diff --git a/main/source/external/vgui/include/VGUI_App.h b/main/source/external/vgui/include/VGUI_App.h
new file mode 100644
index 00000000..b44f1558
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_App.h
@@ -0,0 +1,126 @@
+
+#ifndef VGUI_APP_H
+#define VGUI_APP_H
+
+#include<VGUI.h>
+#include<VGUI_MouseCode.h>
+#include<VGUI_KeyCode.h>
+#include<VGUI_Dar.h>
+#include<VGUI_Cursor.h>
+
+namespace vgui
+{
+
+enum MouseCode;
+enum KeyCode;
+class Panel;
+class TickSignal;
+class Scheme;
+class TickSignal;
+class SurfaceBase;
+
+class VGUIAPI App
+{
+public:
+	App();
+	App(bool externalMain);
+public:
+	static App* getInstance();
+	//TODO: the public and public bullshit are all messed up, need to organize
+	//TODO: actually all of the access needs to be properly thought out while you are at it
+public:
+	virtual void    start();
+	virtual void    stop();
+	virtual void    externalTick();
+	virtual bool    wasMousePressed(MouseCode code,Panel* panel);
+	virtual bool    wasMouseDoublePressed(MouseCode code,Panel* panel);
+	virtual bool    isMouseDown(MouseCode code,Panel* panel);
+	virtual bool    wasMouseReleased(MouseCode code,Panel* panel);
+	virtual bool    wasKeyPressed(KeyCode code,Panel* panel);
+	virtual bool    isKeyDown(KeyCode code,Panel* panel);
+	virtual bool    wasKeyTyped(KeyCode code,Panel* panel);
+	virtual bool    wasKeyReleased(KeyCode code,Panel* panel);
+	virtual void    addTickSignal(TickSignal* s);
+	virtual void    setCursorPos(int x,int y);
+	virtual void    getCursorPos(int& x,int& y);
+	virtual void    setMouseCapture(Panel* panel);
+	virtual void    setMouseArena(int x0,int y0,int x1,int y1,bool enabled);
+	virtual void    setMouseArena(Panel* panel);
+	virtual void    requestFocus(Panel* panel); 
+	virtual Panel*  getFocus();
+	virtual void    repaintAll();
+	virtual void    setScheme(Scheme* scheme);
+	virtual Scheme* getScheme();
+	virtual void    enableBuildMode();
+	virtual long    getTimeMillis();
+	virtual char    getKeyCodeChar(KeyCode code,bool shifted);
+	virtual void    getKeyCodeText(KeyCode code,char* buf,int buflen);
+	virtual int     getClipboardTextCount();
+	virtual void    setClipboardText(const char* text,int textLen);
+	virtual int     getClipboardText(int offset,char* buf,int bufLen);
+	virtual void    reset();
+	virtual void    internalSetMouseArena(int x0,int y0,int x1,int y1,bool enabled);
+	virtual bool    setRegistryString(const char* key,const char* value);
+	virtual bool    getRegistryString(const char* key,char* value,int valueLen);
+	virtual bool    setRegistryInteger(const char* key,int value);
+	virtual bool    getRegistryInteger(const char* key,int& value);
+	virtual void    setCursorOveride(Cursor* cursor);
+	virtual Cursor* getCursorOveride();
+	virtual void    setMinimumTickMillisInterval(int interval);
+public: //bullshit public stuff
+	virtual void main(int argc,char* argv[])=0;
+	virtual void run(); 
+	virtual void internalCursorMoved(int x,int y,SurfaceBase* surfaceBase); //expects input in surface space
+	virtual void internalMousePressed(MouseCode code,SurfaceBase* surfaceBase);
+	virtual void internalMouseDoublePressed(MouseCode code,SurfaceBase* surfaceBase);
+	virtual void internalMouseReleased(MouseCode code,SurfaceBase* surfaceBase);
+	virtual void internalMouseWheeled(int delta,SurfaceBase* surfaceBase);
+	virtual void internalKeyPressed(KeyCode code,SurfaceBase* surfaceBase);
+	virtual void internalKeyTyped(KeyCode code,SurfaceBase* surfaceBase);
+	virtual void internalKeyReleased(KeyCode code,SurfaceBase* surfaceBase);
+private:
+	virtual void init();
+	virtual void updateMouseFocus(int x,int y,SurfaceBase* surfaceBase);
+	virtual void setMouseFocus(Panel* newMouseFocus);
+protected: 
+	virtual void surfaceBaseCreated(SurfaceBase* surfaceBase);
+	virtual void surfaceBaseDeleted(SurfaceBase* surfaceBase);
+	virtual void platTick();
+	virtual void internalTick();
+protected:
+	static App* _instance;
+protected:
+	bool              _running;
+	bool              _externalMain;
+	Dar<SurfaceBase*> _surfaceBaseDar;
+	Panel*            _keyFocus;
+	Panel*            _oldMouseFocus;
+	Panel*            _mouseFocus;
+	Panel*            _mouseCapture;
+	Panel*            _wantedKeyFocus;
+	bool              _mousePressed[MOUSE_LAST];
+	bool              _mouseDoublePressed[MOUSE_LAST];
+	bool              _mouseDown[MOUSE_LAST];
+	bool              _mouseReleased[MOUSE_LAST];
+	bool              _keyPressed[KEY_LAST];
+	bool              _keyTyped[KEY_LAST];
+	bool              _keyDown[KEY_LAST];
+	bool              _keyReleased[KEY_LAST];
+	Dar<TickSignal*>  _tickSignalDar;
+	Scheme*           _scheme;
+	bool              _buildMode;
+	bool              _wantedBuildMode;
+	Panel*            _mouseArenaPanel;
+	Cursor*           _cursor[Cursor::DefaultCursor::dc_last];
+	Cursor*           _cursorOveride;
+private:
+	long              _nextTickMillis;
+	long              _minimumTickMillisInterval;
+	friend class SurfaceBase;
+};
+}
+
+#endif
+
+
+
diff --git a/main/source/external/vgui/include/VGUI_Bitmap.h b/main/source/external/vgui/include/VGUI_Bitmap.h
new file mode 100644
index 00000000..f82b10c4
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_Bitmap.h
@@ -0,0 +1,31 @@
+
+#ifndef VGUI_BITMAP_H
+#define VGUI_BITMAP_H
+
+#include<VGUI.h>
+#include<VGUI_Image.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI Bitmap : public Image
+{
+private:
+	int         _id;
+	bool        _uploaded;
+public:
+	Bitmap();
+protected:
+	virtual void setSize(int wide,int tall);
+	virtual void setRGBA(int x,int y,uchar r,uchar g,uchar b,uchar a);
+public:
+	virtual void paint(Panel* panel);
+protected:
+	uchar* _rgba;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_BitmapTGA.h b/main/source/external/vgui/include/VGUI_BitmapTGA.h
new file mode 100644
index 00000000..c8e3ab30
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_BitmapTGA.h
@@ -0,0 +1,23 @@
+
+#ifndef VGUI_BITMAPTGA_H
+#define VGUI_BITMAPTGA_H
+
+#include<VGUI_Bitmap.h>
+
+namespace vgui
+{
+
+class Panel;
+class InputStream;
+
+class VGUIAPI BitmapTGA : public Bitmap
+{
+public:
+	BitmapTGA(InputStream* is,bool invertAlpha);
+private:
+	virtual bool loadTGA(InputStream* is,bool invertAlpha);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_Border.h b/main/source/external/vgui/include/VGUI_Border.h
new file mode 100644
index 00000000..3210123a
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_Border.h
@@ -0,0 +1,39 @@
+
+#ifndef VGUI_BORDER_H
+#define VGUI_BORDER_H
+
+#include<VGUI.h>
+#include<VGUI_Image.h>
+
+//TODO: all borders should be titled
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI Border : public Image
+{
+public:
+	Border();
+	Border(int left,int top,int right,int bottom);
+public:
+	virtual void setInset(int left,int top,int right,int bottom);
+	virtual void getInset(int& left,int& top,int& right,int& bottom);
+protected:
+	virtual void drawFilledRect(int x0,int y0,int x1,int y1);
+	virtual void drawOutlinedRect(int x0,int y0,int x1,int y1);
+	virtual void drawSetTextPos(int x,int y);
+	virtual void drawPrintText(int x,int y,const char* str,int strlen);
+	virtual void drawPrintChar(int x,int y,char ch);
+protected:
+	int _inset[4];
+private:
+	Panel* _panel;
+friend class Panel;
+friend class BorderPair;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_BorderLayout.h b/main/source/external/vgui/include/VGUI_BorderLayout.h
new file mode 100644
index 00000000..194e7deb
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_BorderLayout.h
@@ -0,0 +1,40 @@
+
+#ifndef VGUI_BORDERLAYOUT_H
+#define VGUI_BORDERLAYOUT_H
+
+#include<VGUI.h>
+#include<VGUI_Layout.h>
+
+namespace vgui
+{
+
+class LayoutInfo;
+
+class VGUIAPI BorderLayout : public Layout
+{
+public:
+	enum Alignment
+	{
+		a_center=0,
+		a_north,
+		a_south,
+		a_east,
+		a_west,
+	};
+private:
+	int _inset;
+public:
+	BorderLayout(int inset);
+public:
+	virtual void        performLayout(Panel* panel);
+	virtual LayoutInfo* createLayoutInfo(Alignment alignment);
+};
+
+}
+
+#endif
+
+
+
+
+
diff --git a/main/source/external/vgui/include/VGUI_BorderPair.h b/main/source/external/vgui/include/VGUI_BorderPair.h
new file mode 100644
index 00000000..c28be9ab
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_BorderPair.h
@@ -0,0 +1,27 @@
+
+#ifndef VGUI_BORDERPAIR_H
+#define VGUI_BORDERPAIR_H
+
+#include<VGUI.h>
+#include<VGUI_Border.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI BorderPair : public Border
+{
+public:
+	BorderPair(Border* border0,Border* border1);
+public:
+	virtual void doPaint(Panel* panel);
+protected:
+	virtual void paint(Panel* panel);
+protected:
+	Border* _border[2];
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_BuildGroup.h b/main/source/external/vgui/include/VGUI_BuildGroup.h
new file mode 100644
index 00000000..27c7afa3
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_BuildGroup.h
@@ -0,0 +1,61 @@
+
+#ifndef VGUI_BUILDGROUP_H
+#define VGUI_BUILDGROUP_H
+
+#include<VGUI.h>
+#include<VGUI_Dar.h>
+
+
+namespace vgui
+{
+
+enum KeyCode;
+enum MouseCode;
+class Panel;
+class Cursor;
+class ChangeSignal;
+
+class VGUIAPI BuildGroup
+{
+private:	
+	bool      _enabled;
+	int       _snapX;
+	int       _snapY;
+	Cursor*   _cursor_sizenwse;
+	Cursor*   _cursor_sizenesw;
+	Cursor*   _cursor_sizewe;
+	Cursor*   _cursor_sizens;
+	Cursor*   _cursor_sizeall;
+	bool      _dragging;
+	MouseCode _dragMouseCode;
+	int       _dragStartPanelPos[2];
+	int       _dragStartCursorPos[2];
+	Panel*    _currentPanel;
+	Dar<ChangeSignal*> _currentPanelChangeSignalDar;
+	Dar<Panel*> _panelDar;
+	Dar<char*>  _panelNameDar;
+public:
+	BuildGroup();
+public:
+	virtual void   setEnabled(bool state);
+	virtual bool   isEnabled();
+	virtual void   addCurrentPanelChangeSignal(ChangeSignal* s);
+	virtual Panel* getCurrentPanel();
+	virtual void   copyPropertiesToClipboard();
+private:
+	virtual void applySnap(Panel* panel);
+	virtual void fireCurrentPanelChangeSignal();
+protected:
+	friend class Panel;
+	virtual void    panelAdded(Panel* panel,const char* panelName);
+	virtual void    cursorMoved(int x,int y,Panel* panel);
+	virtual void    mousePressed(MouseCode code,Panel* panel);
+	virtual void    mouseReleased(MouseCode code,Panel* panel);
+	virtual void    mouseDoublePressed(MouseCode code,Panel* panel);
+	virtual void    keyTyped(KeyCode code,Panel* panel);
+	virtual Cursor* getCursor(Panel* panel);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_Button.h b/main/source/external/vgui/include/VGUI_Button.h
new file mode 100644
index 00000000..614d4637
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_Button.h
@@ -0,0 +1,55 @@
+
+#ifndef VGUI_BUTTON_H
+#define VGUI_BUTTON_H
+
+#include<VGUI.h>
+#include<VGUI_Label.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+enum MouseCode;
+class ButtonController;
+class ButtonGroup;
+class ActionSignal;
+
+//TODO: Button should be derived from an AbstractButton
+class VGUIAPI Button : public Label
+{
+public:
+	Button(const char* text,int x,int y,int wide,int tall);
+	Button(const char* text,int x,int y);
+private:
+	void init();
+public:
+	virtual void setSelected(bool state);
+	virtual void setSelectedDirect(bool state);
+	virtual void setArmed(bool state);
+	virtual bool isSelected();
+	virtual void doClick();
+	virtual void addActionSignal(ActionSignal* s);
+	virtual void setButtonGroup(ButtonGroup* buttonGroup);
+	virtual bool isArmed();
+	virtual void setButtonBorderEnabled(bool state);
+	virtual void setMouseClickEnabled(MouseCode code,bool state);
+	virtual bool isMouseClickEnabled(MouseCode code);
+	virtual void fireActionSignal();
+	virtual Panel* createPropertyPanel();
+protected:
+	virtual void setButtonController(ButtonController* _buttonController);
+	virtual void paintBackground();
+protected:
+	char*              _text;
+	bool               _armed;
+	bool               _selected;
+	bool               _buttonBorderEnabled;
+	Dar<ActionSignal*> _actionSignalDar;
+	int                _mouseClickMask;
+	ButtonGroup*       _buttonGroup;
+	ButtonController*  _buttonController;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_ButtonController.h b/main/source/external/vgui/include/VGUI_ButtonController.h
new file mode 100644
index 00000000..3020c14c
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_ButtonController.h
@@ -0,0 +1,21 @@
+
+#ifndef VGUI_BUTTONCONTROLLER_H
+#define VGUI_BUTTONCONTROLLER_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+class Button;
+
+class VGUIAPI ButtonController
+{
+public:	
+	virtual void addSignals(Button* button)=0;
+	virtual void removeSignals(Button* button)=0;
+};
+
+}
+
+#endif
diff --git a/main/source/external/vgui/include/VGUI_ButtonGroup.h b/main/source/external/vgui/include/VGUI_ButtonGroup.h
new file mode 100644
index 00000000..82cecaf0
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_ButtonGroup.h
@@ -0,0 +1,24 @@
+
+#ifndef VGUI_BUTTONGROUP_H
+#define VGUI_BUTTONGROUP_H
+
+#include<VGUI.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+class Button;
+
+class VGUIAPI ButtonGroup
+{
+public:
+	virtual void addButton(Button* button);
+	virtual void setSelected(Button* button);
+protected:
+	Dar<Button*> _buttonDar;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_ChangeSignal.h b/main/source/external/vgui/include/VGUI_ChangeSignal.h
new file mode 100644
index 00000000..9b183a93
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_ChangeSignal.h
@@ -0,0 +1,20 @@
+
+#ifndef VGUI_CHANGESIGNAL_H
+#define VGUI_CHANGESIGNAL_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI ChangeSignal
+{
+public:
+	virtual void valueChanged(Panel* panel)=0;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_CheckButton.h b/main/source/external/vgui/include/VGUI_CheckButton.h
new file mode 100644
index 00000000..e2551e37
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_CheckButton.h
@@ -0,0 +1,22 @@
+
+#ifndef VGUI_CHECKBUTTON_H
+#define VGUI_CHECKBUTTON_H
+
+#include<VGUI.h>
+#include<VGUI_ToggleButton.h>
+
+namespace vgui
+{
+
+class VGUIAPI CheckButton : public ToggleButton
+{
+public:
+	CheckButton(const char* text,int x,int y,int wide,int tall);
+	CheckButton(const char* text,int x,int y);
+protected:
+	virtual void paintBackground();
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_Color.h b/main/source/external/vgui/include/VGUI_Color.h
new file mode 100644
index 00000000..a291cafe
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_Color.h
@@ -0,0 +1,38 @@
+
+#ifndef VGUI_COLOR_H
+#define VGUI_COLOR_H
+
+#include<VGUI.h>
+#include<VGUI_Scheme.h>
+
+//TODO: rename getColor(r,g,b,a) to getRGBA(r,g,b,a)
+//TODO: rename setColor(r,g,b,a) to setRGBA(r,g,b,a)
+//TODO: rename getColor(sc) to getSchemeColor(sc)
+//TODO: rename setColor(sc) to setSchemeColor(sc)
+
+namespace vgui
+{
+
+class VGUIAPI Color
+{
+private:
+	uchar               _color[4];
+	Scheme::SchemeColor _schemeColor;
+public:
+	Color();
+	Color(int r,int g,int b,int a);
+	Color(Scheme::SchemeColor sc);
+private:
+	virtual void init();
+public:
+	virtual void setColor(int r,int g,int b,int a);
+	virtual void setColor(Scheme::SchemeColor sc);
+	virtual void getColor(int& r,int& g,int& b,int& a);
+	virtual void getColor(Scheme::SchemeColor& sc);
+	virtual int  operator[](int index);
+};
+
+}
+
+
+#endif
diff --git a/main/source/external/vgui/include/VGUI_ComboKey.h b/main/source/external/vgui/include/VGUI_ComboKey.h
new file mode 100644
index 00000000..5f034460
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_ComboKey.h
@@ -0,0 +1,28 @@
+
+#ifndef VGUI_COMBOKEY_H
+#define VGUI_COMBOKEY_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+enum KeyCode;
+
+class ComboKey
+{
+public:
+	ComboKey(KeyCode code,KeyCode modifier);
+public:
+	bool isTwoCombo(KeyCode code,KeyCode modifier);
+protected:
+	bool check(KeyCode code);
+protected:
+	KeyCode _keyCode[2];
+friend class Panel;
+};
+
+}
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_ConfigWizard.h b/main/source/external/vgui/include/VGUI_ConfigWizard.h
new file mode 100644
index 00000000..0d1bfdaa
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_ConfigWizard.h
@@ -0,0 +1,34 @@
+
+#ifndef VGUI_CONFIGWIZARD_H
+#define VGUI_CONFIGWIZARD_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+
+class TreeFolder;
+class Panel;
+class Button;
+
+class VGUIAPI ConfigWizard : public Panel
+{
+public:
+	ConfigWizard(int x,int y,int wide,int tall);
+public:
+	virtual void        setSize(int wide,int tall);
+	virtual Panel*      getClient();
+	virtual TreeFolder* getFolder();
+protected:
+	TreeFolder* _treeFolder;
+	Panel*      _client;
+	Button*     _okButton;
+	Button*     _cancelButton;
+	Button*     _applyButton;
+	Button*     _helpButton;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_Cursor.h b/main/source/external/vgui/include/VGUI_Cursor.h
new file mode 100644
index 00000000..c51f1e8f
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_Cursor.h
@@ -0,0 +1,51 @@
+
+#ifndef VGUI_CURSOR_H
+#define VGUI_CURSOR_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+class Bitmap;
+
+class VGUIAPI Cursor
+{
+public:
+	enum DefaultCursor
+	{
+		dc_user,
+		dc_none,
+		dc_arrow,
+		dc_ibeam,
+		dc_hourglass,
+		dc_crosshair,
+		dc_up,
+		dc_sizenwse,
+		dc_sizenesw,
+		dc_sizewe,
+		dc_sizens,
+		dc_sizeall,
+		dc_no,
+		dc_hand,
+		dc_last,
+	};
+private:
+	int           _hotspot[2];
+	Bitmap*       _bitmap;
+	DefaultCursor _dc;
+public:
+	Cursor(DefaultCursor dc);
+	Cursor(Bitmap* bitmap,int hotspotX,int hotspotY);
+public:
+	virtual void getHotspot(int& x,int& y);
+private:
+	virtual void privateInit(Bitmap* bitmap,int hotspotX,int hotspotY);
+public:
+	virtual Bitmap*       getBitmap();
+	virtual DefaultCursor getDefaultCursor();
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_Dar.h b/main/source/external/vgui/include/VGUI_Dar.h
new file mode 100644
index 00000000..48c0b55e
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_Dar.h
@@ -0,0 +1,187 @@
+
+#ifndef VGUI_DAR_H
+#define VGUI_DAR_H
+
+#include<stdlib.h>
+#include<string.h>
+#include<VGUI.h>
+
+
+
+namespace vgui
+{
+
+//Simple lightweight dynamic array implementation
+template<class ELEMTYPE> class VGUIAPI Dar
+{
+public:
+	Dar()
+	{
+		_count=0;
+		_capacity=0;
+		_data=null;
+		ensureCapacity(4);
+	}
+	Dar(int initialCapacity)
+	{
+		_count=0;
+		_capacity=0;
+		_data=null;
+		ensureCapacity(initialCapacity);
+	}
+public:
+	void ensureCapacity(int wantedCapacity)
+	{
+		if(wantedCapacity<=_capacity){return;}
+
+		//double capacity until it is >= wantedCapacity
+		//this could be done with math, but iterative is just so much more fun
+		int newCapacity=_capacity;
+		if(newCapacity==0){newCapacity=1;}
+		while(newCapacity<wantedCapacity){newCapacity*=2;}
+
+		//allocate and zero newData
+		ELEMTYPE* newData=new ELEMTYPE[newCapacity]; 
+		if(newData==null){exit(0);return;}
+		memset(newData,0,sizeof(ELEMTYPE)*newCapacity);
+		_capacity=newCapacity;
+   
+		//copy data into newData
+		for(int i=0;i<_count;i++){newData[i]=_data[i];}
+
+		delete[] _data;
+		_data=newData;
+	}
+	void setCount(int count)
+	{
+		if((count<0)||(count>_capacity))
+		{
+			return;
+		}
+		_count=count;
+	}
+	int getCount()
+	{
+		return _count;
+	}
+	void addElement(ELEMTYPE elem)
+	{
+		ensureCapacity(_count+1);
+		_data[_count]=elem;
+		_count++;
+	}
+	bool hasElement(ELEMTYPE elem)
+	{
+		for(int i=0;i<_count;i++)
+		{
+			if(_data[i]==elem)
+			{
+				return true;
+			}
+		}
+	return false;
+	}
+	void putElement(ELEMTYPE elem)
+	{
+		if(hasElement(elem))
+		{
+			return;
+		}
+		addElement(elem);
+	}
+	void insertElementAt(ELEMTYPE elem,int index)
+	{
+		if((index<0)||(index>_count))
+		{
+			return;
+		}
+		if((index==_count)||(_count==0))
+		{
+			addElement(elem);
+		}
+		else
+		{
+			addElement(elem); //just to make sure it is big enough
+			for(int i=_count-1;i>index;i--)
+			{
+				_data[i]=_data[i-1];
+			}
+			_data[index]=elem;
+		}
+	}
+	void setElementAt(ELEMTYPE elem,int index)
+	{
+		if((index<0)||(index>=_count))
+		{
+			return;
+		}
+		_data[index]=elem;
+	}
+	void removeElementAt(int index)
+	{
+		if((index<0)||(index>=_count))
+		{
+			return;
+		}
+   
+		//slide everything to the right of index, left one.
+		for(int i=index;i<(_count-1);i++)
+		{
+			_data[i]=_data[i+1];
+		}
+		_count--;
+	} 
+	void removeElement(ELEMTYPE elem)
+	{
+		for(int i=0;i<_count;i++)
+		{
+			if(_data[i]==elem)
+			{
+				removeElementAt(i);
+				break;
+			}
+		}
+	}
+	void removeAll()
+	{
+		_count=0;
+	}
+	ELEMTYPE operator[](int index)
+	{
+		if((index<0)||(index>=_count))
+		{
+			return null;
+		}
+		return _data[index];
+	}
+protected:
+	int       _count;
+	int       _capacity;
+	ELEMTYPE* _data;
+};
+
+//forward referencing all the template types used so they get exported
+template class VGUIAPI Dar<char>;
+template class VGUIAPI Dar<char*>;
+template class VGUIAPI Dar<int>;
+template class VGUIAPI Dar<class Button*>;
+template class VGUIAPI Dar<class SurfaceBase*>;
+template class VGUIAPI Dar<class InputSignal*>;
+template class VGUIAPI Dar<class FocusChangeSignal*>;
+template class VGUIAPI Dar<class FrameSignal*>;
+template class VGUIAPI Dar<class ActionSignal*>;
+template class VGUIAPI Dar<class IntChangeSignal*>;
+template class VGUIAPI Dar<class TickSignal*>;
+template class VGUIAPI Dar<class Dar<char>*>;
+template class VGUIAPI Dar<class Frame*>;
+template class VGUIAPI Dar<class DesktopIcon*>;
+template class VGUIAPI Dar<class ChangeSignal*>;
+template class VGUIAPI Dar<class Panel*>;
+template class VGUIAPI Dar<class Label*>;
+template class VGUIAPI Dar<class RepaintSignal*>;
+
+
+}
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_DataInputStream.h b/main/source/external/vgui/include/VGUI_DataInputStream.h
new file mode 100644
index 00000000..4e621a34
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_DataInputStream.h
@@ -0,0 +1,43 @@
+
+#ifndef VGUI_DATAINPUTSTREAM_H
+#define VGUI_DATAINPUTSTREAM_H
+
+#include<VGUI.h>
+#include<VGUI_InputStream.h>
+
+namespace vgui
+{
+
+class VGUIAPI DataInputStream : virtual public InputStream
+{
+private:
+	InputStream* _is;
+public:
+	DataInputStream(InputStream* is);
+public:
+	virtual void  seekStart(bool& success);
+	virtual void  seekRelative(int count,bool& success);
+	virtual void  seekEnd(bool& success);
+	virtual int   getAvailable(bool& success);
+	//virtual uchar readUChar(bool& success);
+	virtual void  readUChar(uchar* buf,int count,bool& success);
+	virtual void  close(bool& success);
+	virtual void  close();
+public:
+	virtual bool   readBool(bool& success);
+	virtual char   readChar(bool& success);
+	virtual uchar  readUChar(bool& success);
+	virtual short  readShort(bool& success);
+	virtual ushort readUShort(bool& success);
+	virtual int    readInt(bool& success);
+	virtual uint   readUInt(bool& success);
+	virtual long   readLong(bool& success);
+	virtual ulong  readULong(bool& success);
+	virtual float  readFloat(bool& success);
+	virtual double readDouble(bool& success);
+	virtual void   readLine(char* buf,int bufLen,bool& success);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_Desktop.h b/main/source/external/vgui/include/VGUI_Desktop.h
new file mode 100644
index 00000000..e64baa25
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_Desktop.h
@@ -0,0 +1,36 @@
+
+#ifndef VGUI_DESKTOP_H
+#define VGUI_DESKTOP_H
+
+#include<VGUI.h>
+#include<VGUI_Dar.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+
+class DesktopIcon;
+class TaskBar;
+
+class VGUIAPI Desktop : public Panel
+{
+public:
+	Desktop(int x,int y,int wide,int tall);
+public:
+	virtual void    setSize(int wide,int tall);
+	virtual void    iconActivated(DesktopIcon* icon);
+	virtual void    addIcon(DesktopIcon* icon);
+	virtual void    arrangeIcons();
+	virtual Panel*  getBackground();
+	virtual Panel*  getForeground();
+protected:
+	Panel*            _background;
+	Panel*            _foreground;
+	TaskBar*          _taskBar;
+	Dar<DesktopIcon*> _desktopIconDar;
+	int           	  _cascade[2];
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_DesktopIcon.h b/main/source/external/vgui/include/VGUI_DesktopIcon.h
new file mode 100644
index 00000000..05ced104
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_DesktopIcon.h
@@ -0,0 +1,35 @@
+
+#ifndef VGUI_DESKTOPICON_H
+#define VGUI_DESKTOPICON_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+
+class MiniApp;
+class Image;
+class Desktop;
+
+class VGUIAPI DesktopIcon : public Panel
+{
+public:
+	DesktopIcon(MiniApp* miniApp,Image* image);
+public:
+	virtual void doActivate();
+	virtual void setImage(Image* image);
+public: //bullshit public
+	virtual void     setDesktop(Desktop* desktop);
+	virtual MiniApp* getMiniApp();
+protected:
+	virtual void paintBackground();
+protected:
+	Desktop* _desktop;
+	MiniApp* _miniApp;
+	Image*   _image;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_EditPanel.h b/main/source/external/vgui/include/VGUI_EditPanel.h
new file mode 100644
index 00000000..f6e45425
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_EditPanel.h
@@ -0,0 +1,59 @@
+
+#ifndef VGUI_EDITPANEL_H
+#define VGUI_EDITPANEL_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+class Font;
+
+class VGUIAPI EditPanel : public Panel
+{
+public:
+	EditPanel(int x,int y,int wide,int tall);
+public:
+	virtual void doCursorUp();
+	virtual void doCursorDown();
+	virtual void doCursorLeft();
+	virtual void doCursorRight();
+	virtual void doCursorToStartOfLine();
+	virtual void doCursorToEndOfLine();
+	virtual void doCursorInsertChar(char ch);
+	virtual void doCursorBackspace();
+	virtual void doCursorNewLine();
+	virtual void doCursorDelete();
+	virtual void doCursorPrintf(char* format,...);
+	virtual int  getLineCount();
+	virtual int  getVisibleLineCount();
+	virtual void setCursorBlink(bool state);
+	virtual void setFont(Font* font);
+	virtual void getText(int lineIndex, int offset,char* buf,int bufLen);
+
+public: //bullshit public
+	void getCursorBlink(bool& blink,int& nextBlinkTime);
+protected:
+	virtual void       paintBackground();
+	virtual void       paint();
+	virtual void       addLine();
+	virtual Dar<char>* getLine(int lineIndex);
+	virtual void       setChar(Dar<char>* lineDar,int x,char ch,char fill);
+	virtual void       setChar(Dar<char>* lineDar,int x,char ch);
+	virtual void       shiftLineLeft(Dar<char>* lineDar,int x,int count);
+	virtual void       shiftLineRight(Dar<char>* lineDar,int x,int count);
+private:
+	virtual int        spatialCharOffsetBetweenTwoLines(Dar<char>* srcDar,Dar<char>* dstDar,int x);
+protected:
+	Dar<Dar<char>*> _lineDarDar;
+	int             _cursor[2];
+	bool            _cursorBlink;
+	int             _cursorNextBlinkTime;
+	Font*           _font;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_EtchedBorder.h b/main/source/external/vgui/include/VGUI_EtchedBorder.h
new file mode 100644
index 00000000..25225ad7
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_EtchedBorder.h
@@ -0,0 +1,23 @@
+
+#ifndef VGUI_ETCHEDBORDER_H
+#define VGUI_ETCHEDBORDER_H
+
+#include<VGUI.h>
+#include<VGUI_Border.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI EtchedBorder : public Border
+{
+public:
+	EtchedBorder();
+protected:
+	virtual void paint(Panel* panel);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_FileInputStream.h b/main/source/external/vgui/include/VGUI_FileInputStream.h
new file mode 100644
index 00000000..a1319996
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_FileInputStream.h
@@ -0,0 +1,32 @@
+
+#ifndef VGUI_FILEINPUTSTREAM_H
+#define VGUI_FILEINPUTSTREAM_H
+
+//TODO : figure out how to get stdio out of here, I think std namespace is broken for FILE for forward declaring does not work in vc6
+
+#include<stdio.h> 
+#include<VGUI_InputStream.h>
+
+namespace vgui
+{
+
+class VGUIAPI FileInputStream : public InputStream
+{
+private:
+	FILE* _fp;
+public:
+	FileInputStream(const char* fileName,bool textMode);
+public:
+	virtual void  seekStart(bool& success);
+	virtual void  seekRelative(int count,bool& success);
+	virtual void  seekEnd(bool& success);
+	virtual int   getAvailable(bool& success);
+	virtual uchar readUChar(bool& success);
+	virtual void  readUChar(uchar* buf,int count,bool& success);
+	virtual void  close(bool& success);
+	virtual void  close();
+};
+
+}
+
+#endif
diff --git a/main/source/external/vgui/include/VGUI_FlowLayout.h b/main/source/external/vgui/include/VGUI_FlowLayout.h
new file mode 100644
index 00000000..45403a16
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_FlowLayout.h
@@ -0,0 +1,23 @@
+
+#ifndef VGUI_FLOWLAYOUT_H
+#define VGUI_FLOWLAYOUT_H
+
+#include<VGUI.h>
+#include<VGUI_Layout.h>
+
+namespace vgui
+{
+
+class VGUIAPI FlowLayout : public Layout
+{
+private:
+	int _hgap;
+public:
+	FlowLayout(int hgap);
+public:
+	virtual void performLayout(Panel* panel);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_FocusChangeSignal.h b/main/source/external/vgui/include/VGUI_FocusChangeSignal.h
new file mode 100644
index 00000000..925e457f
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_FocusChangeSignal.h
@@ -0,0 +1,20 @@
+
+#ifndef VGUI_FOCUSCHANGESIGNAL_H
+#define VGUI_FOCUSCHANGESIGNAL_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI FocusChangeSignal
+{
+public:
+	virtual void focusChanged(bool lost,Panel* panel)=0;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_FocusNavGroup.h b/main/source/external/vgui/include/VGUI_FocusNavGroup.h
new file mode 100644
index 00000000..647efd0b
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_FocusNavGroup.h
@@ -0,0 +1,29 @@
+
+#ifndef VGUI_FOCUSNAVGROUP_H
+#define VGUI_FOCUSNAVGROUP_H
+
+#include<VGUI.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI FocusNavGroup
+{
+public:
+	FocusNavGroup();
+protected:
+	virtual void addPanel(Panel* panel);
+	virtual void requestFocusPrev();
+	virtual void requestFocusNext();
+	virtual void setCurrentPanel(Panel* panel);
+protected:
+	Dar<Panel*> _panelDar;
+	int         _currentIndex;
+friend class Panel;
+};
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_Font.h b/main/source/external/vgui/include/VGUI_Font.h
new file mode 100644
index 00000000..ef2dbb0f
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_Font.h
@@ -0,0 +1,42 @@
+
+#ifndef VGUI_FONT_H
+#define VGUI_FONT_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+class BaseFontPlat;
+
+//TODO: cursors and fonts should work like gl binds
+class VGUIAPI Font
+ {
+ public:
+  Font(const char* name,int tall,int wide,float rotation,int weight,bool italic,bool underline,bool strikeout,bool symbol);
+  // If pFileData is non-NULL, then it will try to load the 32-bit (RLE) TGA file. If that fails,
+  // it will create the font using the specified parameters.
+  // pUniqueName should be set if pFileData and fileDataLen are set so it can determine if a font is already loaded.
+  Font(const char* name,void *pFileData,int fileDataLen, int tall,int wide,float rotation,int weight,bool italic,bool underline,bool strikeout,bool symbol);
+ private:
+  virtual void init(const char* name,void *pFileData,int fileDataLen, int tall,int wide,float rotation,int weight,bool italic,bool underline,bool strikeout,bool symbol);
+ public:
+  BaseFontPlat* getPlat();
+  virtual void getCharRGBA(int ch,int rgbaX,int rgbaY,int rgbaWide,int rgbaTall,uchar* rgba);
+  virtual void getCharABCwide(int ch,int& a,int& b,int& c);
+  virtual void getTextSize(const char* text,int& wide,int& tall);
+  virtual int  getTall();
+  virtual int  getId();
+ protected:
+  char*			_name;
+  BaseFontPlat*	_plat;
+  int			_id;
+ friend class Surface;
+ };
+
+
+void Font_Reset();
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_Frame.h b/main/source/external/vgui/include/VGUI_Frame.h
new file mode 100644
index 00000000..f047dc81
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_Frame.h
@@ -0,0 +1,67 @@
+
+#ifndef VGUI_FRAME_H
+#define VGUI_FRAME_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+class Button;
+class FrameSignal;
+
+class VGUIAPI Frame : public Panel
+ {
+ public:
+  Frame(int x,int y,int wide,int tall);
+ public:
+  virtual void   setSize(int wide,int tall);
+  virtual void   setInternal(bool state);
+  virtual void   paintBackground();
+  virtual bool   isInternal();
+  virtual Panel* getClient();
+  virtual void   setTitle(const char* title);
+  virtual void   getTitle(char* buf,int bufLen);
+  virtual void	 setMoveable(bool state);
+  virtual void   setSizeable(bool state);
+  virtual bool   isMoveable();
+  virtual bool   isSizeable();
+  virtual void   addFrameSignal(FrameSignal* s);
+  virtual void   setVisible(bool state);
+  virtual void   setMenuButtonVisible(bool state);
+  virtual void   setTrayButtonVisible(bool state);
+  virtual void   setMinimizeButtonVisible(bool state);
+  virtual void   setMaximizeButtonVisible(bool state);
+  virtual void   setCloseButtonVisible(bool state);
+ public: //bullshit public
+  virtual void fireClosingSignal();
+  virtual void fireMinimizingSignal();
+ protected:
+  char*             _title;
+  bool              _internal;
+  bool              _sizeable;
+  bool              _moveable;
+  Panel*            _topGrip;
+  Panel*            _bottomGrip;
+  Panel*            _leftGrip;
+  Panel*            _rightGrip;
+  Panel*            _topLeftGrip;
+  Panel*            _topRightGrip;
+  Panel*            _bottomLeftGrip;
+  Panel*            _bottomRightGrip;
+  Panel*            _captionGrip;
+  Panel*            _client;
+  Button*           _trayButton;
+  Button*           _minimizeButton;
+  Button*           _maximizeButton;
+  Button*           _closeButton;
+  Button*           _menuButton;
+  Dar<FrameSignal*> _frameSignalDar;
+  Frame*            _resizeable;
+ };
+
+}
+
+#endif
diff --git a/main/source/external/vgui/include/VGUI_FrameSignal.h b/main/source/external/vgui/include/VGUI_FrameSignal.h
new file mode 100644
index 00000000..1ca67df5
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_FrameSignal.h
@@ -0,0 +1,21 @@
+
+#ifndef VGUI_FRAMESIGNAL_H
+#define VGUI_FRAMESIGNAL_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+class Frame;
+
+class VGUIAPI FrameSignal
+{
+public:
+	virtual void closing(Frame* frame)=0;
+	virtual void minimizing(Frame* frame,bool toTray)=0;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_GridLayout.h b/main/source/external/vgui/include/VGUI_GridLayout.h
new file mode 100644
index 00000000..fda35f23
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_GridLayout.h
@@ -0,0 +1,24 @@
+
+#ifndef VGUI_GRIDLAYOUT_H
+#define VGUI_GRIDLAYOUT_H
+
+#include<VGUI.h>
+#include<VGUI_Layout.h>
+
+namespace vgui
+{
+
+/*
+class VGUIAPI GridLayout : public Layout
+{
+public:
+	GridLayout(int rows,int cols,int hgap,int vgap);
+protected:
+	int _rows;
+	int _cols;
+};
+*/
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_HeaderPanel.h b/main/source/external/vgui/include/VGUI_HeaderPanel.h
new file mode 100644
index 00000000..13a8daa6
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_HeaderPanel.h
@@ -0,0 +1,59 @@
+
+#ifndef VGUI_HEADERPANEL_H
+#define VGUI_HEADERPANEL_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+#include<VGUI_Dar.h>
+#include<VGUI_Cursor.h>
+
+namespace vgui
+{
+
+enum MouseCode;
+class ChangeSignal;
+
+class VGUIAPI HeaderPanel : public Panel
+{
+
+private:
+
+	Dar<Panel*>        _sliderPanelDar;
+	Dar<Panel*>        _sectionPanelDar;
+	Dar<ChangeSignal*> _changeSignalDar;
+	Panel*             _sectionLayer;
+	int                _sliderWide;
+	bool               _dragging;
+	int                _dragSliderIndex;
+	int                _dragSliderStartPos;
+	int                _dragSliderStartX;
+
+public:
+
+	HeaderPanel(int x,int y,int wide,int tall);
+
+protected:
+
+	virtual void performLayout();
+
+public:
+
+	virtual void addSectionPanel(Panel* panel);
+	virtual void setSliderPos(int sliderIndex,int pos);
+	virtual int  getSectionCount();
+	virtual void getSectionExtents(int sectionIndex,int& x0,int& x1);
+	virtual void addChangeSignal(ChangeSignal* s);
+
+public: //bullshit public
+
+	virtual void fireChangeSignal();
+	virtual void privateCursorMoved(int x,int y,Panel* panel);
+	virtual void privateMousePressed(MouseCode code,Panel* panel);
+	virtual void privateMouseReleased(MouseCode code,Panel* panel);
+
+};
+
+}
+
+#endif
+
diff --git a/main/source/external/vgui/include/VGUI_Image.h b/main/source/external/vgui/include/VGUI_Image.h
new file mode 100644
index 00000000..46c05753
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_Image.h
@@ -0,0 +1,56 @@
+
+#ifndef VGUI_IMAGE_H
+#define VGUI_IMAGE_H
+
+#include<VGUI.h>
+#include<VGUI_Scheme.h>
+#include<VGUI_Color.h>
+
+//TODO:: needs concept of insets
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI Image
+{
+friend class Panel;
+private:
+	int                 _pos[2];
+	int                 _size[2];
+	Panel*              _panel;
+	Color               _color;
+public:
+	Image();
+public:
+	virtual void setPos(int x,int y);
+	virtual void getPos(int& x,int& y);
+	virtual void getSize(int& wide,int& tall);
+	virtual void setColor(Color color);
+	virtual void getColor(Color& color);
+protected:
+	virtual void setSize(int wide,int tall);
+	virtual void drawSetColor(Scheme::SchemeColor sc);
+	virtual void drawSetColor(int r,int g,int b,int a);
+	virtual void drawFilledRect(int x0,int y0,int x1,int y1);
+	virtual void drawOutlinedRect(int x0,int y0,int x1,int y1);
+	virtual void drawSetTextFont(Scheme::SchemeFont sf);
+	virtual void drawSetTextFont(Font* font);
+	virtual void drawSetTextColor(Scheme::SchemeColor sc);
+	virtual void drawSetTextColor(int r,int g,int b,int a);
+	virtual void drawSetTextPos(int x,int y);
+	virtual void drawPrintText(const char* str,int strlen);
+	virtual void drawPrintText(int x,int y,const char* str,int strlen);
+	virtual void drawPrintChar(char ch);
+	virtual void drawPrintChar(int x,int y,char ch);
+	virtual void drawSetTextureRGBA(int id,const char* rgba,int wide,int tall);
+	virtual void drawSetTexture(int id);
+	virtual void drawTexturedRect(int x0,int y0,int x1,int y1);
+	virtual void paint(Panel* panel);
+public:
+	virtual void doPaint(Panel* panel);
+};
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_ImagePanel.h b/main/source/external/vgui/include/VGUI_ImagePanel.h
new file mode 100644
index 00000000..e5a36893
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_ImagePanel.h
@@ -0,0 +1,32 @@
+
+#ifndef VGUI_IMAGEPANEL_H
+#define VGUI_IMAGEPANEL_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+
+class Image;
+
+class VGUIAPI ImagePanel : public Panel
+{
+public:
+	inline ImagePanel()
+	{
+		_image=null;
+	}
+
+	ImagePanel(Image* image);
+public:
+	virtual void setImage(Image* image);
+protected:
+	virtual void paintBackground();
+protected:
+	Image* _image;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_InputSignal.h b/main/source/external/vgui/include/VGUI_InputSignal.h
new file mode 100644
index 00000000..7bf4dc4b
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_InputSignal.h
@@ -0,0 +1,33 @@
+
+#ifndef VGUI_INPUTSIGNAL_H
+#define VGUI_INPUTSIGNAL_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+enum MouseCode;
+enum KeyCode;
+class Panel;
+
+//these are lumped into one for simplicity sake right now
+class VGUIAPI InputSignal
+{
+public:
+	virtual void cursorMoved(int x,int y,Panel* panel)=0;
+	virtual void cursorEntered(Panel* panel)=0;
+	virtual void cursorExited(Panel* panel)=0;
+	virtual void mousePressed(MouseCode code,Panel* panel)=0;
+	virtual void mouseDoublePressed(MouseCode code,Panel* panel)=0;
+	virtual void mouseReleased(MouseCode code,Panel* panel)=0;
+	virtual void mouseWheeled(int delta,Panel* panel)=0;
+	virtual void keyPressed(KeyCode code,Panel* panel)=0;
+	virtual void keyTyped(KeyCode code,Panel* panel)=0;
+	virtual void keyReleased(KeyCode code,Panel* panel)=0;
+	virtual void keyFocusTicked(Panel* panel)=0;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_InputStream.h b/main/source/external/vgui/include/VGUI_InputStream.h
new file mode 100644
index 00000000..e9eddc27
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_InputStream.h
@@ -0,0 +1,24 @@
+
+#ifndef VGUI_FILE_H
+#define VGUI_FILE_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+class VGUIAPI InputStream
+{
+public:
+	virtual void  seekStart(bool& success)=0;
+	virtual void  seekRelative(int count,bool& success)=0;
+	virtual void  seekEnd(bool& success)=0;
+	virtual int   getAvailable(bool& success)=0;
+	virtual uchar readUChar(bool& success)=0;
+	virtual void  readUChar(uchar* buf,int count,bool& success)=0;
+	virtual void  close(bool& success)=0;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_IntChangeSignal.h b/main/source/external/vgui/include/VGUI_IntChangeSignal.h
new file mode 100644
index 00000000..f238d287
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_IntChangeSignal.h
@@ -0,0 +1,20 @@
+
+#ifndef VGUI_INTCHANGESIGNAL_H
+#define VGUI_INTCHANGESIGNAL_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI IntChangeSignal
+{
+public:
+	virtual void intChanged(int value,Panel* panel)=0;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_IntLabel.h b/main/source/external/vgui/include/VGUI_IntLabel.h
new file mode 100644
index 00000000..157b4525
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_IntLabel.h
@@ -0,0 +1,29 @@
+
+#ifndef VGUI_INTLABEL_H
+#define VGUI_INTLABEL_H
+
+#include<VGUI.h>
+#include<VGUI_Label.h>
+#include<VGUI_IntChangeSignal.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI IntLabel : public Label , public IntChangeSignal
+{
+public:
+	IntLabel(int value,int x,int y,int wide,int tall);
+public:
+	virtual void setValue(int value);
+	virtual void intChanged(int value,Panel* panel);
+protected:
+	virtual void paintBackground();
+protected:
+	int _value;
+};
+
+}
+
+#endif
diff --git a/main/source/external/vgui/include/VGUI_KeyCode.h b/main/source/external/vgui/include/VGUI_KeyCode.h
new file mode 100644
index 00000000..374d50fb
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_KeyCode.h
@@ -0,0 +1,120 @@
+
+#ifndef VGUI_KEYCODE_H
+#define VGUI_KEYCODE_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+enum VGUIAPI KeyCode
+{
+	KEY_0=0,
+	KEY_1,
+	KEY_2,
+	KEY_3,
+	KEY_4,
+	KEY_5,
+	KEY_6,
+	KEY_7,
+	KEY_8,
+	KEY_9,
+	KEY_A,
+	KEY_B,
+	KEY_C,
+	KEY_D,
+	KEY_E,
+	KEY_F,
+	KEY_G,
+	KEY_H,
+	KEY_I,
+	KEY_J,
+	KEY_K,
+	KEY_L,
+	KEY_M,
+	KEY_N,
+	KEY_O,
+	KEY_P,
+	KEY_Q,
+	KEY_R,
+	KEY_S,
+	KEY_T,
+	KEY_U,
+	KEY_V,
+	KEY_W,
+	KEY_X,
+	KEY_Y,
+	KEY_Z,
+	KEY_PAD_0,
+	KEY_PAD_1,
+	KEY_PAD_2,
+	KEY_PAD_3,
+	KEY_PAD_4,
+	KEY_PAD_5,
+	KEY_PAD_6,
+	KEY_PAD_7,
+	KEY_PAD_8,
+	KEY_PAD_9,
+	KEY_PAD_DIVIDE,
+	KEY_PAD_MULTIPLY,
+	KEY_PAD_MINUS,
+	KEY_PAD_PLUS,
+	KEY_PAD_ENTER,
+	KEY_PAD_DECIMAL,
+	KEY_LBRACKET,
+	KEY_RBRACKET,
+	KEY_SEMICOLON,
+	KEY_APOSTROPHE,
+	KEY_BACKQUOTE,
+	KEY_COMMA,
+	KEY_PERIOD,
+	KEY_SLASH,
+	KEY_BACKSLASH,
+	KEY_MINUS,
+	KEY_EQUAL,
+	KEY_ENTER,
+	KEY_SPACE,
+	KEY_BACKSPACE,
+	KEY_TAB,
+	KEY_CAPSLOCK,
+	KEY_NUMLOCK,
+	KEY_ESCAPE,
+	KEY_SCROLLLOCK,
+	KEY_INSERT,
+	KEY_DELETE,
+	KEY_HOME,
+	KEY_END,
+	KEY_PAGEUP,
+	KEY_PAGEDOWN,
+	KEY_BREAK,
+	KEY_LSHIFT,
+	KEY_RSHIFT,
+	KEY_LALT,
+	KEY_RALT,
+	KEY_LCONTROL,
+	KEY_RCONTROL,
+	KEY_LWIN,
+	KEY_RWIN,
+	KEY_APP,
+	KEY_UP,
+	KEY_LEFT,
+	KEY_DOWN,
+	KEY_RIGHT,
+	KEY_F1,
+	KEY_F2,
+	KEY_F3,
+	KEY_F4,
+	KEY_F5,
+	KEY_F6,
+	KEY_F7,
+	KEY_F8,
+	KEY_F9,
+	KEY_F10,
+	KEY_F11,
+	KEY_F12,
+	KEY_LAST,
+};
+}
+
+
+#endif
+
diff --git a/main/source/external/vgui/include/VGUI_Label.h b/main/source/external/vgui/include/VGUI_Label.h
new file mode 100644
index 00000000..72bc80b9
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_Label.h
@@ -0,0 +1,74 @@
+
+#ifndef VGUI_LABEL_H
+#define VGUI_LABEL_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+#include<VGUI_Scheme.h>
+
+//TODO: this should use a TextImage for the text
+
+namespace vgui
+{
+
+class Panel;
+class TextImage;
+
+class VGUIAPI Label : public Panel
+{
+public:
+	enum Alignment
+	{
+		a_northwest=0,
+		a_north,
+		a_northeast,
+		a_west,
+		a_center,
+		a_east,
+		a_southwest,
+		a_south,
+		a_southeast,
+	};
+public:	
+	Label(int textBufferLen,const char* text,int x,int y,int wide,int tall);
+	Label(const char* text,int x,int y,int wide,int tall);
+	Label(const char* text,int x,int y);
+	Label(const char* text);
+	
+	inline Label() : Panel(0,0,10,10)
+	{
+		init(1,"",true);
+	}
+private:
+	void init(int textBufferLen,const char* text,bool textFitted);
+public:
+	virtual void setImage(Image* image);
+	virtual void setText(int textBufferLen,const char* text);
+	virtual void setText(const char* format,...);
+	virtual void setFont(Scheme::SchemeFont schemeFont);
+	virtual void setFont(Font* font);
+	virtual void getTextSize(int& wide,int& tall);
+	virtual void getContentSize(int& wide,int& tall);
+	virtual void setTextAlignment(Alignment alignment);
+	virtual void setContentAlignment(Alignment alignment);
+	virtual Panel* createPropertyPanel();
+	virtual void setFgColor(int r,int g,int b,int a);
+	virtual void setFgColor(vgui::Scheme::SchemeColor sc);
+	virtual void setContentFitted(bool state);
+protected:
+	virtual void computeAlignment(int& tx0,int& ty0,int& tx1,int& ty1,int& ix0,int& iy0,int& ix1,int& iy1,int& minX,int& minY,int& maxX,int& maxY);
+	virtual void paint();
+	virtual void recomputeMinimumSize();
+protected:
+	bool       _textEnabled;
+	bool       _imageEnabled;
+	bool       _contentFitted;
+	Alignment  _textAlignment;
+	Alignment  _contentAlignment;
+	TextImage* _textImage;
+	Image*     _image;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_Layout.h b/main/source/external/vgui/include/VGUI_Layout.h
new file mode 100644
index 00000000..f76bf7e3
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_Layout.h
@@ -0,0 +1,25 @@
+
+#ifndef VGUI_LAYOUT_H
+#define VGUI_LAYOUT_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI Layout
+{
+//private:
+//	Panel* _panel;
+public:
+	Layout();
+public:
+	//virtual void setPanel(Panel* panel); //called by Panel::setLayout
+	virtual void performLayout(Panel* panel);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_LayoutInfo.h b/main/source/external/vgui/include/VGUI_LayoutInfo.h
new file mode 100644
index 00000000..5f87181c
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_LayoutInfo.h
@@ -0,0 +1,15 @@
+
+#ifndef VGUI_LAYOUTINFO_H
+#define VGUI_LAYOUTINFO_H
+
+namespace vgui
+{
+
+class VGUIAPI LayoutInfo
+{
+	virtual LayoutInfo* getThis()=0;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_LineBorder.h b/main/source/external/vgui/include/VGUI_LineBorder.h
new file mode 100644
index 00000000..f8fd8f79
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_LineBorder.h
@@ -0,0 +1,33 @@
+
+#ifndef VGUI_LINEBORDER_H
+#define VGUI_LINEBORDER_H
+
+#include<VGUI.h>
+#include<VGUI_Border.h>
+#include<VGUI_Color.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI LineBorder : public Border
+{
+private:
+	Color _color;
+public:
+	LineBorder();
+	LineBorder(int thickness);
+	LineBorder(Color color);
+	LineBorder(int thickness,Color color);
+
+	inline void setLineColor(int r, int g, int b, int a) {_color = Color(r,g,b,a);}
+private:
+	virtual void init(int thickness,Color color);
+protected:
+	virtual void paint(Panel* panel);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_ListPanel.h b/main/source/external/vgui/include/VGUI_ListPanel.h
new file mode 100644
index 00000000..8c11000c
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_ListPanel.h
@@ -0,0 +1,34 @@
+
+#ifndef VGUI_LISTPANEL_H
+#define VGUI_LISTPANEL_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+
+class ScrollBar;
+
+//TODO: make a ScrollPanel and use a constrained one for _vpanel in ListPanel
+class VGUIAPI ListPanel : public Panel
+{
+public:
+	ListPanel(int x,int y,int wide,int tall);
+public:
+	virtual void setSize(int wide,int tall);
+	virtual void addString(const char* str);
+	virtual void addItem(Panel* panel);
+	virtual void setPixelScroll(int value);
+	virtual void translatePixelScroll(int delta);
+protected:
+	virtual void performLayout();
+	virtual void paintBackground();
+protected: 
+	Panel*     _vpanel;
+	ScrollBar* _scroll;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_LoweredBorder.h b/main/source/external/vgui/include/VGUI_LoweredBorder.h
new file mode 100644
index 00000000..079f1bd6
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_LoweredBorder.h
@@ -0,0 +1,23 @@
+
+#ifndef VGUI_LOWEREDBORDER_H
+#define VGUI_LOWEREDBORDER_H
+
+#include<VGUI.h>
+#include<VGUI_Border.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI LoweredBorder : public Border
+{
+public:
+	LoweredBorder();
+protected:
+	virtual void paint(Panel* panel);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_Menu.h b/main/source/external/vgui/include/VGUI_Menu.h
new file mode 100644
index 00000000..bd840ea5
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_Menu.h
@@ -0,0 +1,24 @@
+
+#ifndef VGUI_MENU_H
+#define VGUI_MENU_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI Menu : public Panel
+{
+public:
+	Menu(int x,int y,int wide,int tall);
+	Menu(int wide,int tall);
+public:
+	virtual void addMenuItem(Panel* panel);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_MenuItem.h b/main/source/external/vgui/include/VGUI_MenuItem.h
new file mode 100644
index 00000000..07dc070b
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_MenuItem.h
@@ -0,0 +1,24 @@
+
+#ifndef VGUI_MENUITEM_H
+#define VGUI_MENUITEM_H
+
+#include<VGUI.h>
+#include<VGUI_Button.h>
+
+namespace vgui
+{
+
+class Menu;
+
+class VGUIAPI MenuItem : public Button
+{
+public:
+	MenuItem(const char* text);
+	MenuItem(const char* text,Menu* subMenu);
+protected:
+	Menu* _subMenu;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_MenuSeparator.h b/main/source/external/vgui/include/VGUI_MenuSeparator.h
new file mode 100644
index 00000000..e145135b
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_MenuSeparator.h
@@ -0,0 +1,21 @@
+
+#ifndef VGUI_MENUSEPARATOR_H
+#define VGUI_MENUSEPARATOR_H
+
+#include<VGUI.h>
+#include<VGUI_Label.h>
+
+namespace vgui
+{
+
+class VGUIAPI MenuSeparator : public Label
+{
+public:
+	MenuSeparator(const char* text);
+protected:
+	virtual void paintBackground();
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_MessageBox.h b/main/source/external/vgui/include/VGUI_MessageBox.h
new file mode 100644
index 00000000..6b68e207
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_MessageBox.h
@@ -0,0 +1,47 @@
+
+#ifndef VGUI_MESSAGEBOX_H
+#define VGUI_MESSAGEBOX_H
+
+#include<VGUI.h>
+#include<VGUI_Frame.h>
+#include<VGUI_Dar.h>
+
+
+namespace vgui
+{
+
+class Label;
+class Button;
+class ActionSignal;
+
+class VGUIAPI MessageBox : public Frame
+{
+
+private:
+	
+	Label*             _messageLabel;
+	Button*            _okButton;
+	Dar<ActionSignal*> _actionSignalDar;
+
+public:
+
+	MessageBox(const char* title,const char* text,int x,int y);
+
+protected:
+	
+	virtual void performLayout();
+
+public:
+	
+	virtual void addActionSignal(ActionSignal* s);
+	virtual void fireActionSignal();
+
+};
+
+}
+
+
+
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_MiniApp.h b/main/source/external/vgui/include/VGUI_MiniApp.h
new file mode 100644
index 00000000..aa9d9e9a
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_MiniApp.h
@@ -0,0 +1,27 @@
+
+#ifndef VGUI_MINIAPP_H
+#define VGUI_MINIAPP_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+class Frame;
+
+class VGUIAPI MiniApp
+{
+public:
+	MiniApp();
+public:
+	virtual void   getName(char* buf,int bufLen);
+	virtual Frame* createInstance()=0;
+protected:
+	virtual void setName(const char* name);
+protected:
+	char* _name;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_MouseCode.h b/main/source/external/vgui/include/VGUI_MouseCode.h
new file mode 100644
index 00000000..5a7228bf
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_MouseCode.h
@@ -0,0 +1,18 @@
+
+#ifndef VGUI_MOUSECODE_H
+#define VGUI_MOUSECODE_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+enum VGUIAPI MouseCode
+{
+	MOUSE_LEFT=0,
+	MOUSE_RIGHT,
+	MOUSE_MIDDLE,
+	MOUSE_LAST,
+};
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_Panel.h b/main/source/external/vgui/include/VGUI_Panel.h
new file mode 100644
index 00000000..365d67ce
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_Panel.h
@@ -0,0 +1,218 @@
+
+#ifndef VGUI_PANEL_H
+#define VGUI_PANEL_H
+
+
+/*
+
+TODO:
+
+Maybe have the border know who they are added to.
+A border can only be added to 1 thing, and will be
+removed from the other. That way they can actually
+be memory managed. Also do Layout's this way too.
+
+TODO:
+	outlinedRect should have a thickness arg
+
+*/
+
+					 
+#include<VGUI.h>
+#include<VGUI_Dar.h>
+#include<VGUI_Scheme.h>
+#include<VGUI_Color.h>
+
+namespace vgui
+{
+
+enum  KeyCode;
+enum  MouseCode;
+class SurfaceBase;
+class FocusChangeSignal;
+class InputSignal;
+class Cursor;
+class Layout;
+class FocusNavGroup;
+class Border;
+class Font;
+class BuildGroup;
+class App;
+class LayoutInfo;
+
+class VGUIAPI Panel
+{
+public:
+	Panel();
+	Panel(int x,int y,int wide,int tall); 
+private:
+	void init(int x,int y,int wide,int tall);
+public:
+	virtual void   setPos(int x,int y);
+	virtual void   getPos(int& x,int& y);
+	virtual void   setSize(int wide,int tall);
+	virtual void   getSize(int& wide,int& tall);
+	virtual void   setBounds(int x,int y,int wide,int tall);
+	virtual void   getBounds(int& x,int& y,int& wide,int& tall);
+	virtual int    getWide();
+	virtual int    getTall();
+	virtual Panel* getParent();
+	virtual void   setVisible(bool state);
+	virtual bool   isVisible();
+	virtual bool   isVisibleUp();
+	virtual void   repaint();
+	virtual void   repaintAll();
+	virtual void   getAbsExtents(int& x0,int& y0,int& x1,int& y1);
+	virtual void   getClipRect(int& x0,int& y0,int& x1,int& y1);
+	virtual void   setParent(Panel* newParent);
+	virtual void   addChild(Panel* child);
+	virtual void   insertChildAt(Panel* child,int index);
+	virtual void   removeChild(Panel* child);
+	virtual bool   wasMousePressed(MouseCode code);
+	virtual bool   wasMouseDoublePressed(MouseCode code);
+	virtual bool   isMouseDown(MouseCode code);
+	virtual bool   wasMouseReleased(MouseCode code);
+	virtual bool   wasKeyPressed(KeyCode code);
+	virtual bool   isKeyDown(KeyCode code);
+	virtual bool   wasKeyTyped(KeyCode code);
+	virtual bool   wasKeyReleased(KeyCode code);
+	virtual void   addInputSignal(InputSignal* s);
+	virtual void   removeInputSignal(InputSignal* s);
+	virtual void   addRepaintSignal(RepaintSignal* s);
+	virtual void   removeRepaintSignal(RepaintSignal* s);
+	virtual bool   isWithin(int x,int y); //in screen space
+	virtual Panel* isWithinTraverse(int x,int y);
+	virtual void   localToScreen(int& x,int& y);
+	virtual void   screenToLocal(int& x,int& y);
+	virtual void   setCursor(Cursor* cursor);
+	virtual void   setCursor(Scheme::SchemeCursor scu);
+	virtual Cursor* getCursor();
+	virtual void   setMinimumSize(int wide,int tall);
+	virtual void   getMinimumSize(int& wide,int& tall);
+	virtual void   requestFocus();
+	virtual bool   hasFocus();
+	virtual int    getChildCount();
+	virtual Panel* getChild(int index);
+	virtual void   setLayout(Layout* layout);
+	virtual void   invalidateLayout(bool layoutNow);
+	virtual void   setFocusNavGroup(FocusNavGroup* focusNavGroup);
+	virtual void   requestFocusPrev();
+	virtual void   requestFocusNext();
+	virtual void   addFocusChangeSignal(FocusChangeSignal* s);
+	virtual bool   isAutoFocusNavEnabled();
+	virtual void   setAutoFocusNavEnabled(bool state);
+	virtual void   setBorder(Border* border);
+	virtual void   setPaintBorderEnabled(bool state);
+	virtual void   setPaintBackgroundEnabled(bool state);
+	virtual void   setPaintEnabled(bool state);
+	virtual void   getInset(int& left,int& top,int& right,int& bottom);
+	virtual void   getPaintSize(int& wide,int& tall);
+	virtual void   setPreferredSize(int wide,int tall);
+	virtual void   getPreferredSize(int& wide,int& tall);
+	virtual SurfaceBase* getSurfaceBase();
+	virtual bool   isEnabled();
+	virtual void   setEnabled(bool state);
+	virtual void   setBuildGroup(BuildGroup* buildGroup,const char* panelPersistanceName);
+	virtual bool   isBuildGroupEnabled();
+	virtual void   removeAllChildren();
+	virtual void   repaintParent();
+	virtual Panel* createPropertyPanel();
+	virtual void   getPersistanceText(char* buf,int bufLen);
+	virtual void   applyPersistanceText(const char* buf);
+	virtual void   setFgColor(Scheme::SchemeColor sc);
+	virtual void   setBgColor(Scheme::SchemeColor sc);
+	virtual void   setFgColor(int r,int g,int b,int a);
+	virtual void   setBgColor(int r,int g,int b,int a);
+	virtual void   getFgColor(int& r,int& g,int& b,int& a);
+	virtual void   getBgColor(int& r,int& g,int& b,int& a);
+	virtual void   setBgColor(Color color);
+	virtual void   setFgColor(Color color);
+	virtual void   getBgColor(Color& color);
+	virtual void   getFgColor(Color& color);
+	virtual void   setAsMouseCapture(bool state);
+	virtual void   setAsMouseArena(bool state);
+	virtual App*   getApp();
+	virtual void   getVirtualSize(int& wide,int& tall);
+	virtual void   setLayoutInfo(LayoutInfo* layoutInfo);
+	virtual LayoutInfo* getLayoutInfo();
+	virtual bool   isCursorNone();
+public: //bullshit public
+	virtual void solveTraverse();
+	virtual void paintTraverse();
+	virtual void setSurfaceBaseTraverse(SurfaceBase* surfaceBase);
+protected:
+	virtual void performLayout();
+	virtual void internalPerformLayout();
+	virtual void drawSetColor(Scheme::SchemeColor sc);
+	virtual void drawSetColor(int r,int g,int b,int a);
+	virtual void drawFilledRect(int x0,int y0,int x1,int y1);
+	virtual void drawOutlinedRect(int x0,int y0,int x1,int y1);
+	virtual void drawSetTextFont(Scheme::SchemeFont sf);
+	virtual void drawSetTextFont(Font* font);
+	virtual void drawSetTextColor(Scheme::SchemeColor sc);
+	virtual void drawSetTextColor(int r,int g,int b,int a);
+	virtual void drawSetTextPos(int x,int y);
+	virtual void drawPrintText(const char* str,int strlen);
+	virtual void drawPrintText(int x,int y,const char* str,int strlen);
+	virtual void drawPrintChar(char ch);
+	virtual void drawPrintChar(int x,int y,char ch);
+	virtual void drawSetTextureRGBA(int id,const char* rgba,int wide,int tall);
+	virtual void drawSetTexture(int id);
+	virtual void drawTexturedRect(int x0,int y0,int x1,int y1);
+	virtual void solve();
+	virtual void paintTraverse(bool repaint);
+	virtual void paintBackground();
+	virtual void paint();
+	virtual void paintBuildOverlay();
+	virtual void internalCursorMoved(int x,int y);
+	virtual void internalCursorEntered();
+	virtual void internalCursorExited();
+	virtual void internalMousePressed(MouseCode code);
+	virtual void internalMouseDoublePressed(MouseCode code);
+	virtual void internalMouseReleased(MouseCode code);
+	virtual void internalMouseWheeled(int delta);
+	virtual void internalKeyPressed(KeyCode code);
+	virtual void internalKeyTyped(KeyCode code);
+	virtual void internalKeyReleased(KeyCode code);
+	virtual void internalKeyFocusTicked();
+	virtual void internalFocusChanged(bool lost);
+	virtual void internalSetCursor();
+protected:
+	int               _pos[2];
+	int               _size[2];
+	int               _loc[2];
+	int               _minimumSize[2];
+	int               _preferredSize[2];
+	Dar<Panel*>       _childDar;
+	Panel*            _parent;
+	SurfaceBase*      _surfaceBase;
+	Dar<InputSignal*> _inputSignalDar;
+	Dar<RepaintSignal*> _repaintSignalDar;
+	int               _clipRect[4];
+	Cursor*           _cursor;
+	Scheme::SchemeCursor _schemeCursor;
+	bool              _visible;
+	Layout*           _layout;
+	bool              _needsLayout;
+	FocusNavGroup*    _focusNavGroup;
+	Dar<FocusChangeSignal*> _focusChangeSignalDar;
+	bool              _autoFocusNavEnabled;
+	Border*           _border;
+private:
+	bool                _needsRepaint;
+	bool                _enabled;
+	BuildGroup*         _buildGroup;
+	Color               _fgColor;
+	Color               _bgColor;
+	LayoutInfo*         _layoutInfo;
+	bool                _paintBorderEnabled;
+	bool                _paintBackgroundEnabled;
+	bool                _paintEnabled;
+friend class Panel;
+friend class App;
+friend class SurfaceBase;
+friend class Image;
+};
+}
+
+#endif
diff --git a/main/source/external/vgui/include/VGUI_PopupMenu.h b/main/source/external/vgui/include/VGUI_PopupMenu.h
new file mode 100644
index 00000000..3305eee9
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_PopupMenu.h
@@ -0,0 +1,24 @@
+
+#ifndef VGUI_POPUPMENU_H
+#define VGUI_POPUPMENU_H
+
+#include<VGUI.h>
+#include<VGUI_Menu.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI PopupMenu : public Menu
+{
+public:
+	PopupMenu(int x,int y,int wide,int tall);
+	PopupMenu(int wide,int tall);
+public:
+	virtual void showModal(Panel* panel);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_ProgressBar.h b/main/source/external/vgui/include/VGUI_ProgressBar.h
new file mode 100644
index 00000000..304715d8
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_ProgressBar.h
@@ -0,0 +1,27 @@
+
+#ifndef VGUI_PROGRESSBAR_H
+#define VGUI_PROGRESSBAR_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+
+class VGUIAPI ProgressBar : public Panel
+{
+private:
+	int   _segmentCount;
+	float _progress;
+public:
+	ProgressBar(int segmentCount);
+protected:
+	virtual void paintBackground();
+public:
+	virtual void setProgress(float progress);
+	virtual int  getSegmentCount();
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_RadioButton.h b/main/source/external/vgui/include/VGUI_RadioButton.h
new file mode 100644
index 00000000..7a79000f
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_RadioButton.h
@@ -0,0 +1,23 @@
+
+#ifndef VGUI_RADIOBUTTON_H
+#define VGUI_RADIOBUTTON_H
+
+#include<VGUI.h>
+#include<VGUI_ToggleButton.h>
+
+namespace vgui
+{
+
+class VGUIAPI RadioButton : public ToggleButton
+{
+public:
+	RadioButton(const char* text,int x,int y,int wide,int tall);
+	RadioButton(const char* text,int x,int y);
+protected:
+	virtual void paintBackground();
+};
+
+}
+
+#endif
+
diff --git a/main/source/external/vgui/include/VGUI_RaisedBorder.h b/main/source/external/vgui/include/VGUI_RaisedBorder.h
new file mode 100644
index 00000000..8da50479
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_RaisedBorder.h
@@ -0,0 +1,23 @@
+
+#ifndef VGUI_RAISEDBORDER_H
+#define VGUI_RAISEDBORDER_H
+
+#include<VGUI.h>
+#include<VGUI_Border.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI RaisedBorder : public Border
+{
+public:
+	RaisedBorder();
+protected:
+	virtual void paint(Panel* panel);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_RepaintSignal.h b/main/source/external/vgui/include/VGUI_RepaintSignal.h
new file mode 100644
index 00000000..4f56ef91
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_RepaintSignal.h
@@ -0,0 +1,19 @@
+
+#ifndef VGUI_REPAINTSIGNAL_H
+#define VGUI_REPAINTSIGNAL_H
+
+
+
+namespace vgui
+{
+
+class RepaintSignal
+{
+public:
+	virtual void panelRepainted(Panel* panel)=0;
+};
+
+}
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_Scheme.h b/main/source/external/vgui/include/VGUI_Scheme.h
new file mode 100644
index 00000000..f606c021
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_Scheme.h
@@ -0,0 +1,76 @@
+
+#ifndef VGUI_SCHEME_H
+#define VGUI_SCHEME_H
+
+#include<VGUI.h>
+
+
+namespace vgui
+{
+
+class Font;
+class Cursor;
+
+class VGUIAPI Scheme
+{
+public:
+	enum SchemeColor
+	{
+		sc_user=0,
+		sc_black,
+		sc_white,
+		sc_primary1,
+		sc_primary2,
+		sc_primary3,
+		sc_secondary1,
+		sc_secondary2,
+		sc_secondary3,
+		sc_last,
+	};
+	enum SchemeFont
+	{
+		sf_user=0,
+		sf_primary1,
+		sf_primary2,
+		sf_primary3,
+		sf_secondary1,
+		sf_last,
+	};
+	enum SchemeCursor
+	{
+		scu_user=0,
+		scu_none,
+		scu_arrow,
+		scu_ibeam,
+		scu_hourglass,
+		scu_crosshair,
+		scu_up,
+		scu_sizenwse,
+		scu_sizenesw,
+		scu_sizewe,
+		scu_sizens,
+		scu_sizeall,
+		scu_no,
+		scu_hand,
+		scu_last,
+	};
+public:
+	Scheme();
+public:
+	virtual void    setColor(SchemeColor sc,int r,int g,int b,int a);
+	virtual void    getColor(SchemeColor sc,int& r,int& g,int& b,int& a);
+	virtual void    setFont(SchemeFont sf,Font* font);
+	virtual Font*   getFont(SchemeFont sf);
+	virtual void    setCursor(SchemeCursor sc,Cursor* cursor);
+	virtual Cursor* getCursor(SchemeCursor sc);
+protected:
+	int     _color[sc_last][4];
+    Font*   _font[sf_last];
+	Cursor* _cursor[scu_last];
+    friend class Panel;
+    friend class Canvas;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_ScrollBar.h b/main/source/external/vgui/include/VGUI_ScrollBar.h
new file mode 100644
index 00000000..c1c03e02
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_ScrollBar.h
@@ -0,0 +1,50 @@
+
+#ifndef VGUI_SCROLLBAR_H
+#define VGUI_SCROLLBAR_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+class IntChangeSignal;
+class Button;
+class Slider;
+
+class VGUIAPI ScrollBar : public Panel
+{
+public:
+	ScrollBar(int x,int y,int wide,int tall,bool vertical);
+public:
+	virtual void    setValue(int value);
+	virtual int     getValue();
+	virtual void    addIntChangeSignal(IntChangeSignal* s); 
+	virtual void    setRange(int min,int max);
+	virtual void    setRangeWindow(int rangeWindow);
+	virtual void    setRangeWindowEnabled(bool state);
+	virtual void    setSize(int wide,int tall);
+	virtual bool    isVertical();
+	virtual bool    hasFullRange();
+	virtual void    setButton(Button* button,int index);
+	virtual Button* getButton(int index);
+	virtual void    setSlider(Slider* slider);
+	virtual Slider* getSlider();
+	virtual void 	doButtonPressed(int buttonIndex);
+	virtual void    setButtonPressedScrollValue(int value);
+	virtual void    validate();
+public: //bullshit public 
+	virtual void fireIntChangeSignal();
+protected:
+	virtual void performLayout();
+protected:
+	Button* _button[2];
+	Slider* _slider;
+	Dar<IntChangeSignal*> _intChangeSignalDar;
+	int     _buttonPressedScrollValue;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_ScrollPanel.h b/main/source/external/vgui/include/VGUI_ScrollPanel.h
new file mode 100644
index 00000000..4b57d54c
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_ScrollPanel.h
@@ -0,0 +1,49 @@
+
+#ifndef VGUI_SCROLLPANEL_H
+#define VGUI_SCROLLPANEL_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+
+//NOTE: You need to call validate anytime you change a scrollbar
+
+namespace vgui
+{
+
+class ScrollBar;
+
+class VGUIAPI ScrollPanel : public Panel
+{
+private:
+	Panel*     _clientClip;
+	Panel*     _client;
+	ScrollBar* _horizontalScrollBar;
+	ScrollBar* _verticalScrollBar;
+	bool       _autoVisible[2];
+public:
+	ScrollPanel(int x,int y,int wide,int tall);
+protected:
+	virtual void setSize(int wide,int tall);
+public:
+	virtual void   setScrollBarVisible(bool horizontal,bool vertical);
+	virtual void   setScrollBarAutoVisible(bool horizontal,bool vertical);
+	virtual Panel* getClient();
+	virtual Panel* getClientClip();
+	virtual void   setScrollValue(int horizontal,int vertical);
+	virtual void   getScrollValue(int& horizontal,int& vertical);
+	virtual void   recomputeClientSize();
+	virtual ScrollBar* getHorizontalScrollBar();
+	virtual ScrollBar* getVerticalScrollBar();
+	virtual void       validate();
+public: //bullshit public
+	virtual void recomputeScroll();
+};
+
+}
+
+
+
+
+
+
+#endif
diff --git a/main/source/external/vgui/include/VGUI_Slider.h b/main/source/external/vgui/include/VGUI_Slider.h
new file mode 100644
index 00000000..eb79274e
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_Slider.h
@@ -0,0 +1,63 @@
+
+#ifndef VGUI_SLIDER_H
+#define VGUI_SLIDER_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+enum MouseCode;
+class IntChangeSignal;
+
+class VGUIAPI Slider : public Panel
+{
+private:
+	bool                  _vertical;
+	bool                  _dragging;
+	int                   _nobPos[2];
+	int                   _nobDragStartPos[2];
+	int                   _dragStartPos[2];
+	Dar<IntChangeSignal*> _intChangeSignalDar;
+	int                   _range[2];
+	int                   _value;
+	int                   _rangeWindow;
+	bool                  _rangeWindowEnabled;
+	int                   _buttonOffset;
+public:
+	Slider(int x,int y,int wide,int tall,bool vertical);
+public:
+	virtual void setValue(int value);
+	virtual int  getValue();
+	virtual bool isVertical();
+	virtual void addIntChangeSignal(IntChangeSignal* s);
+    virtual void setRange(int min,int max);
+	virtual void getRange(int& min,int& max);
+	virtual void setRangeWindow(int rangeWindow);
+	virtual void setRangeWindowEnabled(bool state);
+	virtual void setSize(int wide,int tall);
+	virtual void getNobPos(int& min, int& max);
+	virtual bool hasFullRange();
+	virtual void setButtonOffset(int buttonOffset);
+private:
+	virtual void recomputeNobPosFromValue();
+	virtual void recomputeValueFromNobPos();
+public: //bullshit public
+	virtual void privateCursorMoved(int x,int y,Panel* panel);
+	virtual void privateMousePressed(MouseCode code,Panel* panel);
+	virtual void privateMouseReleased(MouseCode code,Panel* panel);
+protected:
+    virtual void fireIntChangeSignal();
+	virtual void paintBackground();
+};
+
+}
+
+#endif
+
+
+
+
+
diff --git a/main/source/external/vgui/include/VGUI_StackLayout.h b/main/source/external/vgui/include/VGUI_StackLayout.h
new file mode 100644
index 00000000..e6d9e804
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_StackLayout.h
@@ -0,0 +1,24 @@
+
+#ifndef VGUI_STACKLAYOUT_H
+#define VGUI_STACKLAYOUT_H
+
+#include<VGUI.h>
+#include<VGUI_Layout.h>
+
+namespace vgui
+{
+
+class VGUIAPI StackLayout : public Layout
+{
+private:
+	int  _vgap;
+	bool _fitWide;
+public:
+	StackLayout(int vgap,bool fitWide);
+public:
+	virtual void performLayout(Panel* panel);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_String.h b/main/source/external/vgui/include/VGUI_String.h
new file mode 100644
index 00000000..1cdc5769
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_String.h
@@ -0,0 +1,55 @@
+
+#ifndef VGUI_STRING_H
+#define VGUI_STRING_H
+
+#include<VGUI.h>
+
+
+namespace vgui
+{
+
+class VGUIAPI String
+{
+
+friend class String;
+
+private:
+
+	char* _text;
+
+public:
+
+	String();
+	String(const char* text);
+	String(const String& src);
+
+public:
+	
+	~String();
+
+private:
+
+	int getCount(const char* text);
+
+public:
+
+	int    getCount();
+	String operator+(String text);
+	String operator+(const char* text);
+	bool   operator==(String text);
+	bool   operator==(const char* text);
+	char   operator[](int index);
+	const char* getChars();
+
+public:
+	
+	static void test();
+
+};
+
+
+}
+
+
+#endif
+
diff --git a/main/source/external/vgui/include/VGUI_Surface.h b/main/source/external/vgui/include/VGUI_Surface.h
new file mode 100644
index 00000000..ba1eda44
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_Surface.h
@@ -0,0 +1,61 @@
+
+#ifndef VGUI_SURFACE_H
+#define VGUI_SURFACE_H
+
+#include<VGUI.h>
+#include<VGUI_SurfaceBase.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+class Panel;
+class Cursor;
+
+class VGUIAPI Surface : public SurfaceBase
+{
+public:
+	Surface(Panel* embeddedPanel);
+public:
+	virtual void setTitle(const char* title);
+	virtual bool setFullscreenMode(int wide,int tall,int bpp);
+	virtual void setWindowedMode();
+	virtual void setAsTopMost(bool state);
+	virtual int  getModeInfoCount();
+	virtual void createPopup(Panel* embeddedPanel);
+	virtual bool hasFocus();
+	virtual bool isWithin(int x,int y);
+protected:
+	virtual int  createNewTextureID(void);
+	virtual void drawSetColor(int r,int g,int b,int a);
+	virtual void drawFilledRect(int x0,int y0,int x1,int y1);
+	virtual void drawOutlinedRect(int x0,int y0,int x1,int y1);
+	virtual void drawSetTextFont(Font* font);
+	virtual void drawSetTextColor(int r,int g,int b,int a);
+	virtual void drawSetTextPos(int x,int y);
+	virtual void drawPrintText(const char* text,int textLen);
+	virtual void drawSetTextureRGBA(int id,const char* rgba,int wide,int tall);
+	virtual void drawSetTexture(int id);
+	virtual void drawTexturedRect(int x0,int y0,int x1,int y1);
+	virtual void invalidate(Panel *panel);
+	virtual bool createPlat();
+	virtual bool recreateContext();
+	virtual void enableMouseCapture(bool state);
+	virtual void setCursor(Cursor* cursor);
+	virtual void swapBuffers();
+	virtual void pushMakeCurrent(Panel* panel,bool useInsets);
+	virtual void popMakeCurrent(Panel* panel);
+	virtual void applyChanges();
+protected:
+	class SurfacePlat* _plat;
+	bool               _needsSwap;
+	Panel*             _embeddedPanel;
+	Dar<char*>         _modeInfoDar;
+	friend class App;
+	friend class Panel;
+};
+
+}
+
+#endif
+
diff --git a/main/source/external/vgui/include/VGUI_SurfaceBase.h b/main/source/external/vgui/include/VGUI_SurfaceBase.h
new file mode 100644
index 00000000..50224cf6
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_SurfaceBase.h
@@ -0,0 +1,75 @@
+
+#ifndef VGUI_SURFACEBASE_H
+#define VGUI_SURFACEBASE_H
+
+#include<VGUI.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+class Panel;
+class Cursor;
+class Font;
+class App;
+class ImagePanel;
+
+class VGUIAPI SurfaceBase
+{
+public:
+	SurfaceBase(Panel* embeddedPanel);
+protected:
+	~SurfaceBase();
+public:
+	virtual Panel* getPanel();
+	virtual void   requestSwap();
+	virtual void   resetModeInfo();
+	virtual int    getModeInfoCount();
+	virtual bool   getModeInfo(int mode,int& wide,int& tall,int& bpp);
+	virtual App*   getApp();
+	virtual void   setEmulatedCursorVisible(bool state);
+	virtual void   setEmulatedCursorPos(int x,int y);
+public:
+	virtual void setTitle(const char* title)=0;
+	virtual bool setFullscreenMode(int wide,int tall,int bpp)=0;
+	virtual void setWindowedMode()=0;
+	virtual void setAsTopMost(bool state)=0;
+	virtual void createPopup(Panel* embeddedPanel)=0;
+	virtual bool hasFocus()=0;
+	virtual bool isWithin(int x,int y)=0;
+	virtual int  createNewTextureID(void)=0;
+protected:
+	virtual void addModeInfo(int wide,int tall,int bpp);
+protected:
+	virtual void drawSetColor(int r,int g,int b,int a)=0;
+	virtual void drawFilledRect(int x0,int y0,int x1,int y1)=0;
+	virtual void drawOutlinedRect(int x0,int y0,int x1,int y1)=0;
+	virtual void drawSetTextFont(Font* font)=0;
+	virtual void drawSetTextColor(int r,int g,int b,int a)=0;
+	virtual void drawSetTextPos(int x,int y)=0;
+	virtual void drawPrintText(const char* text,int textLen)=0;
+	virtual void drawSetTextureRGBA(int id,const char* rgba,int wide,int tall)=0;
+	virtual void drawSetTexture(int id)=0;
+	virtual void drawTexturedRect(int x0,int y0,int x1,int y1)=0;
+	virtual void invalidate(Panel *panel)=0;
+	virtual void enableMouseCapture(bool state)=0;
+	virtual void setCursor(Cursor* cursor)=0;
+	virtual void swapBuffers()=0;
+	virtual void pushMakeCurrent(Panel* panel,bool useInsets)=0;
+	virtual void popMakeCurrent(Panel* panel)=0;
+	virtual void applyChanges()=0;
+protected:
+	bool       _needsSwap;
+	App*       _app;
+	Panel*     _embeddedPanel;
+	Dar<char*> _modeInfoDar;
+	ImagePanel* _emulatedCursor;
+	Cursor*     _currentCursor;
+friend class App;
+friend class Panel;
+};
+
+}
+
+#endif
+
diff --git a/main/source/external/vgui/include/VGUI_SurfaceGL.h b/main/source/external/vgui/include/VGUI_SurfaceGL.h
new file mode 100644
index 00000000..bec574ba
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_SurfaceGL.h
@@ -0,0 +1,92 @@
+
+#ifndef VGUI_SURFACEGL_H
+#define VGUI_SURFACEGL_H
+
+//macros borrowed from GLUT to get rid of win32 dependent junk in gl headers
+#ifdef _WIN32
+# ifndef APIENTRY
+#  define VGUI_APIENTRY_DEFINED
+#  if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED)
+#   define APIENTRY    __stdcall
+#  else
+#   define APIENTRY
+#  endif
+# endif
+# ifndef CALLBACK
+#  define VGUI_CALLBACK_DEFINED
+#  if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_ALPHA) || defined(_M_PPC)) && !defined(MIDL_PASS)
+#   define CALLBACK __stdcall
+#  else
+#   define CALLBACK
+#  endif
+# endif
+# ifndef WINGDIAPI
+#  define VGUI_WINGDIAPI_DEFINED
+#  define WINGDIAPI __declspec(dllimport)
+# endif
+# ifndef _WCHAR_T_DEFINED
+typedef unsigned short wchar_t;
+#  define _WCHAR_T_DEFINED
+# endif
+# pragma comment(lib,"opengl32.lib")
+#endif
+
+#include <GL/gl.h>
+#include <GL/glu.h>
+
+#ifdef VGUI_APIENTRY_DEFINED
+# undef VGUI_APIENTRY_DEFINED
+# undef APIENTRY
+#endif
+
+#ifdef VGUI_CALLBACK_DEFINED
+# undef VGUI_CALLBACK_DEFINED
+# undef CALLBACK
+#endif
+
+#ifdef VGUI_WINGDIAPI_DEFINED
+# undef VGUI_WINGDIAPI_DEFINED
+# undef WINGDIAPI
+#endif
+
+
+
+#include<VGUI.h>
+#include<VGUI_Surface.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+
+class VGUIAPI SurfaceGL : public Surface
+{
+public:
+	SurfaceGL(Panel* embeddedPanel);
+public:
+	virtual void createPopup(Panel* embeddedPanel);
+protected:
+	virtual bool recreateContext();
+	virtual void pushMakeCurrent(Panel* panel,bool useInsets);
+	virtual void popMakeCurrent(Panel* panel);
+	virtual void makeCurrent();
+	virtual void swapBuffers();
+	virtual void setColor(int r,int g,int b);
+	virtual void filledRect(int x0,int y0,int x1,int y1);
+	virtual void outlinedRect(int x0,int y0,int x1,int y1);
+	virtual void setTextFont(Font* font);
+	virtual void setTextColor(int r,int g,int b);
+	virtual void setDrawPos(int x,int y);
+	virtual void printText(const char* str,int strlen);
+	virtual void setTextureRGBA(int id,const char* rgba,int wide,int tall);
+	virtual void setTexture(int id);
+	virtual void texturedRect(int x0,int y0,int x1,int y1);
+protected:
+	int   _drawPos[2];
+	uchar _drawColor[3];
+	uchar _drawTextColor[3];
+};
+
+}
+
+#endif
+
diff --git a/main/source/external/vgui/include/VGUI_TabPanel.h b/main/source/external/vgui/include/VGUI_TabPanel.h
new file mode 100644
index 00000000..f2670517
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_TabPanel.h
@@ -0,0 +1,43 @@
+
+#ifndef VGUI_TABPANEL_H
+#define VGUI_TABPANEL_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+
+class ButtonGroup;
+
+class VGUIAPI TabPanel : public Panel
+{
+public:
+	enum TabPlacement
+	{
+		tp_top=0,
+		tp_bottom,
+		tp_left,
+		tp_right,
+	};
+public:
+	TabPanel(int x,int y,int wide,int tall);
+public:
+	virtual Panel* addTab(const char* text);
+	virtual void   setSelectedTab(Panel* tab);
+	virtual void   setSize(int wide,int tall);
+protected:
+	virtual void recomputeLayoutTop();
+	virtual void recomputeLayout();
+protected:
+	TabPlacement _tabPlacement;
+	Panel*       _tabArea;
+	Panel*       _clientArea;
+	Panel*       _selectedTab;
+	Panel*       _selectedPanel;
+	ButtonGroup* _buttonGroup;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_TablePanel.h b/main/source/external/vgui/include/VGUI_TablePanel.h
new file mode 100644
index 00000000..07a0ecd5
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_TablePanel.h
@@ -0,0 +1,65 @@
+
+#ifndef VGUI_TABLEPANEL_H
+#define VGUI_TABLEPANEL_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+class HeaderPanel;
+
+class VGUIAPI TablePanel : public Panel
+{
+friend class FooVGuiTablePanelHandler;
+private:
+	vgui::Dar<int> _columnDar;
+	bool           _gridVisible[2];
+	int            _gridWide;
+	int            _gridTall;
+	int            _selectedCell[2];
+	int            _mouseOverCell[2];
+	int            _editableCell[2];
+	Panel*         _fakeInputPanel;
+	bool           _columnSelectionEnabled;
+	bool           _rowSelectionEnabled;
+	bool           _cellSelectionEnabled;
+	Panel*         _editableCellPanel;
+	int            _virtualSize[2];
+	bool           _cellEditingEnabled;
+public:
+	TablePanel(int x,int y,int wide,int tall,int columnCount);
+public:
+	virtual void   setCellEditingEnabled(bool state);
+	virtual void   setColumnCount(int columnCount);
+	virtual void   setGridVisible(bool horizontal,bool vertical);
+	virtual void   setGridSize(int gridWide,int gridTall);
+	virtual int    getColumnCount();
+	virtual void   setColumnExtents(int column,int x0,int x1);
+	virtual void   setSelectedCell(int column,int row);
+	virtual void   getSelectedCell(int& column,int& row);
+	virtual void   setHeaderPanel(HeaderPanel* header);
+	virtual void   setColumnSelectionEnabled(bool state);
+	virtual void   setRowSelectionEnabled(bool state);
+	virtual void   setCellSectionEnabled(bool state);
+	virtual void   setEditableCell(int column,int row);
+	virtual void   stopCellEditing();
+	virtual void   getVirtualSize(int& wide,int& tall);
+	virtual int    getRowCount()=0;
+	virtual int    getCellTall(int row)=0;
+	virtual Panel* getCellRenderer(int column,int row,bool columnSelected,bool rowSelected,bool cellSelected)=0;
+	virtual Panel* startCellEditing(int column,int row)=0;
+protected:
+	virtual void   paint();
+	virtual Panel* isWithinTraverse(int x,int y);
+private:
+	virtual void privateMousePressed(MouseCode code,Panel* panel);
+	virtual void privateMouseDoublePressed(MouseCode code,Panel* panel);
+	virtual void privateKeyTyped(KeyCode code,Panel* panel);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_TaskBar.h b/main/source/external/vgui/include/VGUI_TaskBar.h
new file mode 100644
index 00000000..37b7f4f7
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_TaskBar.h
@@ -0,0 +1,31 @@
+
+#ifndef VGUI_TASKBAR_H
+#define VGUI_TASKBAR_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+class Frame;
+class Button;
+
+class VGUIAPI TaskBar : public Panel
+{
+public:
+	TaskBar(int x,int y,int wide,int tall);
+public:
+	virtual void addFrame(Frame* frame);
+protected:
+	virtual void performLayout();
+protected:
+	Dar<Frame*>  _frameDar;
+	Dar<Button*> _taskButtonDar;
+	Panel*       _tray;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_TextEntry.h b/main/source/external/vgui/include/VGUI_TextEntry.h
new file mode 100644
index 00000000..5e18d61f
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_TextEntry.h
@@ -0,0 +1,74 @@
+
+#ifndef VGUI_TEXTENTRY_H
+#define VGUI_TEXTENTRY_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+#include<VGUI_InputSignal.h>
+
+namespace vgui
+{
+
+enum MouseCode;
+enum KeyCode;
+class ActionSignal;
+
+class VGUIAPI TextEntry : public Panel , public InputSignal
+{
+public:
+	TextEntry(const char* text,int x,int y,int wide,int tall);
+public:
+	virtual void setText(const char* text,int textLen);
+	virtual void getText(int offset,char* buf,int bufLen);
+	virtual void resetCursorBlink();
+	virtual void doGotoLeft();
+	virtual void doGotoRight();
+	virtual void doGotoFirstOfLine();
+	virtual void doGotoEndOfLine();
+	virtual void doInsertChar(char ch);
+	virtual void doBackspace();
+	virtual void doDelete();
+	virtual void doSelectNone();
+	virtual void doCopySelected();
+	virtual void doPaste();
+	virtual void doPasteSelected();
+	virtual void doDeleteSelected();
+	virtual void addActionSignal(ActionSignal* s);
+	virtual void setFont(Font* font);
+	virtual void setTextHidden(bool bHideText);
+protected:
+	virtual void paintBackground();
+	virtual void setCharAt(char ch,int index);
+protected:
+	virtual void fireActionSignal();
+	virtual bool getSelectedRange(int& cx0,int& cx1);
+	virtual bool getSelectedPixelRange(int& cx0,int& cx1);
+	virtual int  cursorToPixelSpace(int cursorPos);
+	virtual void selectCheck();
+protected: //InputSignal
+	virtual void cursorMoved(int x,int y,Panel* panel);
+	virtual void cursorEntered(Panel* panel);
+	virtual void cursorExited(Panel* panel);
+	virtual void mousePressed(MouseCode code,Panel* panel);
+	virtual void mouseDoublePressed(MouseCode code,Panel* panel);
+	virtual void mouseReleased(MouseCode code,Panel* panel);
+	virtual void mouseWheeled(int delta,Panel* panel);
+	virtual void keyPressed(KeyCode code,Panel* panel);
+	virtual void keyTyped(KeyCode code,Panel* panel);
+	virtual void keyReleased(KeyCode code,Panel* panel); 
+	virtual void keyFocusTicked(Panel* panel);
+protected:
+	Dar<char>          _lineDar;
+	int                _cursorPos;
+	bool               _cursorBlink;
+	bool               _hideText;
+	long               _cursorNextBlinkTime;
+	int                _cursorBlinkRate;
+	int                _select[2];
+	Dar<ActionSignal*> _actionSignalDar;
+	Font*              _font;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_TextGrid.h b/main/source/external/vgui/include/VGUI_TextGrid.h
new file mode 100644
index 00000000..a8b408cb
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_TextGrid.h
@@ -0,0 +1,36 @@
+
+#ifndef VGUI_TEXTGRID_H
+#define VGUI_TEXTGRID_H
+
+#include<stdarg.h>
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+
+class VGUIAPI TextGrid : public Panel
+{
+public:	
+	TextGrid(int gridWide,int gridTall,int x,int y,int wide,int tall);
+public:
+	virtual void setGridSize(int wide,int tall);
+	virtual void newLine();
+	virtual void setXY(int x,int y);
+	//virtual void setBgColor(int r,int g,int b);
+	//virtual void setFgColor(int r,int g,int b);
+	virtual int  vprintf(const char* format,va_list argList);
+	virtual int  printf(const char* format,...);
+protected:
+	virtual void paintBackground();
+protected:
+	int   _xy[2];
+	int   _bgColor[3];
+	int   _fgColor[3];
+	char* _grid; //[_gridSize[0]*_gridSize[1]*7] ch,br,bg,bb,fr,fg,fb
+	int	  _gridSize[2];
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_TextImage.h b/main/source/external/vgui/include/VGUI_TextImage.h
new file mode 100644
index 00000000..83a2a5ae
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_TextImage.h
@@ -0,0 +1,52 @@
+
+#ifndef VGUI_TEXTIMAGE_H
+#define VGUI_TEXTIMAGE_H
+
+#include<VGUI.h>
+#include<VGUI_Image.h>
+#include<VGUI_Scheme.h>
+
+
+//TODO: need to add wrapping flag instead of being arbitrary about when wrapping and auto-resizing actually happens
+//		This is probably why you are having problems if you had text in a constructor and then changed the font
+
+namespace vgui
+{
+
+class Panel;
+class Font;
+class App;
+
+class VGUIAPI TextImage : public Image
+{
+private:
+	char*                     _text;
+	int                       _textBufferLen;
+	vgui::Scheme::SchemeFont  _schemeFont;
+	vgui::Font*               _font;
+	int                       _textColor[4];
+	vgui::Scheme::SchemeColor _textSchemeColor;
+public:	
+	TextImage(int textBufferLen,const char* text);
+	TextImage(const char* text);
+private:
+	virtual void  init(int textBufferLen,const char* text);
+public:
+	virtual void  getTextSize(int& wide,int& tall);
+	virtual void  getTextSizeWrapped(int& wide,int& tall);
+	virtual Font* getFont();
+	virtual void  setText(int textBufferLen,const char* text);
+	virtual void  setText(const char* text);
+	virtual void  setFont(vgui::Scheme::SchemeFont schemeFont);
+	virtual void  setFont(vgui::Font* font);
+	virtual void  setSize(int wide,int tall);
+protected:
+	virtual void paint(Panel* panel);
+};
+
+}
+
+#endif
+
+
+
diff --git a/main/source/external/vgui/include/VGUI_TextPanel.h b/main/source/external/vgui/include/VGUI_TextPanel.h
new file mode 100644
index 00000000..ecd1aa15
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_TextPanel.h
@@ -0,0 +1,40 @@
+
+#ifndef VGUI_TEXTPANEL_H
+#define VGUI_TEXTPANEL_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+#include<VGUI_Scheme.h>
+
+//NOTE : If you are having trouble with this class, your problem is probably in TextImage
+
+namespace vgui
+{
+
+class TextImage;
+class Font;
+
+class VGUIAPI TextPanel : public Panel
+{
+private:
+	TextImage* _textImage;
+public:
+	TextPanel(const char* text,int x,int y,int wide,int tall);
+public:
+	virtual void setText(const char* text);
+	virtual void setFont(vgui::Scheme::SchemeFont schemeFont);
+	virtual void setFont(vgui::Font* font);
+	virtual void setSize(int wide,int tall);
+	virtual void setFgColor(int r,int g,int b,int a);
+	virtual void setFgColor(Scheme::SchemeColor sc);
+	virtual TextImage* getTextImage();
+protected:
+	virtual void paint();
+};
+
+}
+
+#endif
+
+
+
diff --git a/main/source/external/vgui/include/VGUI_TickSignal.h b/main/source/external/vgui/include/VGUI_TickSignal.h
new file mode 100644
index 00000000..88459982
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_TickSignal.h
@@ -0,0 +1,16 @@
+
+#ifndef VGUI_TICKSIGNAL_H
+#define VGUI_TICKSIGNAL_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+class VGUIAPI TickSignal
+ {
+ public:
+  virtual void ticked()=0;
+ };
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_ToggleButton.h b/main/source/external/vgui/include/VGUI_ToggleButton.h
new file mode 100644
index 00000000..96b304e9
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_ToggleButton.h
@@ -0,0 +1,20 @@
+
+#ifndef VGUI_TOGGLEBUTTON_H
+#define VGUI_TOGGLEBUTTON_H
+
+#include<VGUI.h>
+#include<VGUI_Button.h>
+
+namespace vgui
+{
+
+class VGUIAPI ToggleButton : public Button
+{
+public:
+	ToggleButton(const char* text,int x,int y,int wide,int tall);
+	ToggleButton(const char* text,int x,int y);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_TreeFolder.h b/main/source/external/vgui/include/VGUI_TreeFolder.h
new file mode 100644
index 00000000..be145c20
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_TreeFolder.h
@@ -0,0 +1,30 @@
+
+#ifndef VGUI_TREEFOLDER_H
+#define VGUI_TREEFOLDER_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+
+class VGUIAPI TreeFolder : public Panel
+{
+public:
+	TreeFolder(const char* name);
+	TreeFolder(const char* name,int x,int y);
+protected:
+	virtual void init(const char* name);
+public:
+	virtual void setOpenedTraverse(bool state);
+	virtual void setOpened(bool state);
+	virtual bool isOpened();
+protected:
+	virtual void paintBackground();
+protected:
+	bool _opened;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/external/vgui/include/VGUI_WizardPanel.h b/main/source/external/vgui/include/VGUI_WizardPanel.h
new file mode 100644
index 00000000..96cbc6ed
--- /dev/null
+++ b/main/source/external/vgui/include/VGUI_WizardPanel.h
@@ -0,0 +1,140 @@
+
+#ifndef VGUI_WIZARDPANEL_H
+#define VGUI_WIZARDPANEL_H
+
+#include<VGUI_Panel.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+class ActionSignal;
+
+class VGUIAPI WizardPanel : public Panel
+{
+
+public:
+
+	class VGUIAPI WizardPage : public Panel
+	{
+	
+	friend class WizardPanel;
+	
+	private:
+
+		WizardPage* _backWizardPage;
+		WizardPage* _nextWizardPage;
+		bool        _backButtonEnabled;
+		bool        _nextButtonEnabled;
+		bool        _finishedButtonEnabled;
+		bool        _cancelButtonEnabled;
+		bool        _backButtonVisible;
+		bool        _nextButtonVisible;
+		bool        _finishedButtonVisible;
+		bool        _cancelButtonVisible;
+		char*       _backButtonText;
+		char*       _nextButtonText;
+		char*       _finishedButtonText;
+		char*       _cancelButtonText;
+		Dar<ActionSignal*> _switchingToBackPageSignalDar;
+		Dar<ActionSignal*> _switchingToNextPageSignalDar;
+		char*       _title;
+		Panel*      _wantedFocus;
+
+	private:
+		
+		virtual void fireSwitchingToBackPageSignals();
+		virtual void fireSwitchingToNextPageSignals();
+		virtual void init();
+
+	public:
+
+		WizardPage();
+		WizardPage(int wide,int tall);
+
+	public:
+
+		virtual void        setBackWizardPage(WizardPage* backWizardPage);
+		virtual void        setNextWizardPage(WizardPage* nextWizardPage);
+		virtual WizardPage* getBackWizardPage();
+		virtual WizardPage* getNextWizardPage();
+
+		virtual bool        isBackButtonEnabled();
+		virtual bool        isNextButtonEnabled();
+		virtual bool        isFinishedButtonEnabled();
+		virtual bool        isCancelButtonEnabled();
+		virtual void        setBackButtonEnabled(bool state);
+		virtual void        setNextButtonEnabled(bool state);
+		virtual void        setFinishedButtonEnabled(bool state);
+		virtual void        setCancelButtonEnabled(bool state);
+
+		virtual bool        isBackButtonVisible();
+		virtual bool        isNextButtonVisible();
+		virtual bool        isFinishedButtonVisible();
+		virtual bool        isCancelButtonVisible();
+		virtual void        setBackButtonVisible(bool state);
+		virtual void        setNextButtonVisible(bool state);
+		virtual void        setFinishedButtonVisible(bool state);
+		virtual void        setCancelButtonVisible(bool state);
+
+		virtual void        getBackButtonText(char* text,int textLen);
+		virtual void        getNextButtonText(char* text,int textLen);
+		virtual void        getFinishedButtonText(char* text,int textLen);
+		virtual void        getCancelButtonText(char* text,int textLen);
+        virtual void        setBackButtonText(const char* text);
+		virtual void        setNextButtonText(const char* text);
+		virtual void        setFinishedButtonText(const char* text);
+		virtual void        setCancelButtonText(const char* text);
+
+		virtual void		setWantedFocus(Panel* panel);
+		virtual Panel*		getWantedFocus();
+
+		virtual void        addSwitchingToBackPageSignal(ActionSignal* s);
+		virtual void        addSwitchingToNextPageSignal(ActionSignal* s);
+
+		virtual void        setTitle(const char* title);
+		virtual void        getTitle(char* buf,int bufLen);
+
+	};
+
+private:
+
+	Button*     _backButton;
+	Button*     _nextButton;
+	Button*     _finishedButton;
+	Button*     _cancelButton;
+	WizardPage* _currentWizardPage;
+	Dar<ActionSignal*> _pageChangedActionSignalDar;
+
+private:
+
+	virtual void fireFinishedActionSignal();
+	virtual void fireCancelledActionSignal();
+	virtual void firePageChangedActionSignal();
+
+protected:
+
+	virtual void performLayout();
+
+public:
+
+	WizardPanel(int x,int y,int wide,int tall);
+
+public:
+
+	virtual void setCurrentWizardPage(WizardPage* currentWizardPage);
+	virtual void addFinishedActionSignal(ActionSignal* s);
+	virtual void addCancelledActionSignal(ActionSignal* s);
+	virtual void addPageChangedActionSignal(ActionSignal* s);
+	virtual void doBack();
+	virtual void doNext();
+	virtual void getCurrentWizardPageTitle(char* buf,int bufLen);
+	virtual WizardPage* getCurrentWizardPage();
+
+};
+
+}
+
+
+#endif
+
diff --git a/main/source/external/vgui/lib/win32_vc6/vgui.lib b/main/source/external/vgui/lib/win32_vc6/vgui.lib
new file mode 100644
index 00000000..66f7e909
Binary files /dev/null and b/main/source/external/vgui/lib/win32_vc6/vgui.lib differ
diff --git a/main/source/fmod/inc/fmod.h b/main/source/fmod/inc/fmod.h
new file mode 100644
index 00000000..4164a98b
--- /dev/null
+++ b/main/source/fmod/inc/fmod.h
@@ -0,0 +1,1183 @@
+/* ========================================================================================== */
+/* FMOD Main header file. Copyright (c), Firelight Technologies Pty, Ltd 1999-2003.           */
+/* ========================================================================================== */
+
+#ifndef _FMOD_H_
+#define _FMOD_H_
+
+/* ========================================================================================== */
+/* DEFINITIONS                                                                                */
+/* ========================================================================================== */
+
+#if (!defined(WIN32) && !defined(_WIN32) && !defined(__WIN32__) && !defined(_WIN32_WCE) && !defined(_XBOX)) || (defined(__GNUC__) && defined(WIN32))
+    #ifndef __cdecl
+        #define __cdecl
+    #endif
+    #ifndef __stdcall
+        #define __stdcall
+    #endif
+#endif 
+
+#if defined(_WIN32_WCE)
+    #define F_API _cdecl
+    #define F_CALLBACKAPI _cdecl
+#else
+    #define F_API __stdcall
+    #define F_CALLBACKAPI __stdcall
+#endif
+
+#ifdef DLL_EXPORTS
+    #define DLL_API __declspec(dllexport)
+#else
+    #if defined(__LCC__) || defined(__MINGW32__) || defined(__CYGWIN32__)
+        #define DLL_API F_API
+    #else
+        #define DLL_API
+    #endif /* __LCC__ ||  __MINGW32__ || __CYGWIN32__ */
+#endif /* DLL_EXPORTS */
+
+#define FMOD_VERSION    3.71f
+
+/* 
+    FMOD defined types 
+*/
+typedef struct FSOUND_SAMPLE    FSOUND_SAMPLE;
+typedef struct FSOUND_STREAM    FSOUND_STREAM;
+typedef struct FSOUND_DSPUNIT   FSOUND_DSPUNIT;
+typedef struct FSOUND_SYNCPOINT FSOUND_SYNCPOINT;
+typedef struct FMUSIC_MODULE    FMUSIC_MODULE;
+
+/* 
+    Callback types
+*/
+typedef void *      (F_CALLBACKAPI *FSOUND_DSPCALLBACK)     (void *originalbuffer, void *newbuffer, int length, int param);
+typedef signed char (F_CALLBACKAPI *FSOUND_STREAMCALLBACK)  (FSOUND_STREAM *stream, void *buff, int len, int param);
+typedef void        (F_CALLBACKAPI *FMUSIC_CALLBACK)        (FMUSIC_MODULE *mod, unsigned char param);
+
+typedef unsigned int(F_CALLBACKAPI *FSOUND_OPENCALLBACK)    (const char *name);
+typedef void        (F_CALLBACKAPI *FSOUND_CLOSECALLBACK)   (unsigned int handle);
+typedef int         (F_CALLBACKAPI *FSOUND_READCALLBACK)    (void *buffer, int size, unsigned int handle);
+typedef int         (F_CALLBACKAPI *FSOUND_SEEKCALLBACK)    (unsigned int handle, int pos, signed char mode);
+typedef int         (F_CALLBACKAPI *FSOUND_TELLCALLBACK)    (unsigned int handle);
+
+typedef void *      (F_CALLBACKAPI *FSOUND_ALLOCCALLBACK)   (unsigned int size);
+typedef void *      (F_CALLBACKAPI *FSOUND_REALLOCCALLBACK) (void *ptr, unsigned int size);
+typedef void        (F_CALLBACKAPI *FSOUND_FREECALLBACK)    (void *ptr);
+
+typedef signed char (F_CALLBACKAPI *FSOUND_METADATACALLBACK)(char *name, char *value, int userdata);
+
+
+/*
+[ENUM]
+[
+    [DESCRIPTION]   
+    On failure of commands in FMOD, use FSOUND_GetError to attain what happened.
+    
+    [SEE_ALSO]      
+    FSOUND_GetError
+]
+*/
+enum FMOD_ERRORS 
+{
+    FMOD_ERR_NONE,             /* No errors */
+    FMOD_ERR_BUSY,             /* Cannot call this command after FSOUND_Init.  Call FSOUND_Close first. */
+    FMOD_ERR_UNINITIALIZED,    /* This command failed because FSOUND_Init or FSOUND_SetOutput was not called */
+    FMOD_ERR_INIT,             /* Error initializing output device. */
+    FMOD_ERR_ALLOCATED,        /* Error initializing output device, but more specifically, the output device is already in use and cannot be reused. */
+    FMOD_ERR_PLAY,             /* Playing the sound failed. */
+    FMOD_ERR_OUTPUT_FORMAT,    /* Soundcard does not support the features needed for this soundsystem (16bit stereo output) */
+    FMOD_ERR_COOPERATIVELEVEL, /* Error setting cooperative level for hardware. */
+    FMOD_ERR_CREATEBUFFER,     /* Error creating hardware sound buffer. */
+    FMOD_ERR_FILE_NOTFOUND,    /* File not found */
+    FMOD_ERR_FILE_FORMAT,      /* Unknown file format */
+    FMOD_ERR_FILE_BAD,         /* Error loading file */
+    FMOD_ERR_MEMORY,           /* Not enough memory or resources */
+    FMOD_ERR_VERSION,          /* The version number of this file format is not supported */
+    FMOD_ERR_INVALID_PARAM,    /* An invalid parameter was passed to this function */
+    FMOD_ERR_NO_EAX,           /* Tried to use an EAX command on a non EAX enabled channel or output. */
+    FMOD_ERR_CHANNEL_ALLOC,    /* Failed to allocate a new channel */
+    FMOD_ERR_RECORD,           /* Recording is not supported on this machine */
+    FMOD_ERR_MEDIAPLAYER,      /* Windows Media Player not installed so cannot play wma or use internet streaming. */
+    FMOD_ERR_CDDEVICE          /* An error occured trying to open the specified CD device */
+};
+
+
+/*
+[ENUM]
+[
+    [DESCRIPTION]   
+    These output types are used with FSOUND_SetOutput, to choose which output driver to use.
+    
+    FSOUND_OUTPUT_DSOUND will not support hardware 3d acceleration if the sound card driver 
+    does not support DirectX 6 Voice Manager Extensions.
+
+    FSOUND_OUTPUT_WINMM is recommended for NT and CE.
+
+    [SEE_ALSO]      
+    FSOUND_SetOutput
+    FSOUND_GetOutput
+]
+*/
+enum FSOUND_OUTPUTTYPES
+{
+    FSOUND_OUTPUT_NOSOUND,    /* NoSound driver, all calls to this succeed but do nothing. */
+    FSOUND_OUTPUT_WINMM,      /* Windows Multimedia driver. */
+    FSOUND_OUTPUT_DSOUND,     /* DirectSound driver.  You need this to get EAX2 or EAX3 support, or FX api support. */
+    FSOUND_OUTPUT_A3D,        /* A3D driver. */
+
+    FSOUND_OUTPUT_OSS,        /* Linux/Unix OSS (Open Sound System) driver, i.e. the kernel sound drivers. */
+    FSOUND_OUTPUT_ESD,        /* Linux/Unix ESD (Enlightment Sound Daemon) driver. */
+    FSOUND_OUTPUT_ALSA,       /* Linux Alsa driver. */
+
+    FSOUND_OUTPUT_ASIO,       /* Low latency ASIO driver */
+    FSOUND_OUTPUT_XBOX,       /* Xbox driver */
+    FSOUND_OUTPUT_PS2,        /* PlayStation 2 driver */
+    FSOUND_OUTPUT_MAC,        /* Mac SoundManager driver */
+    FSOUND_OUTPUT_GC,         /* Gamecube driver */
+
+    FSOUND_OUTPUT_NOSOUND_NONREALTIME   /* This is the same as nosound, but the sound generation is driven by FSOUND_Update */
+};
+
+
+/*
+[ENUM]
+[
+    [DESCRIPTION]   
+    These mixer types are used with FSOUND_SetMixer, to choose which mixer to use, or to act 
+    upon for other reasons using FSOUND_GetMixer.
+    It is not nescessary to set the mixer.  FMOD will autodetect the best mixer for you.
+
+    [SEE_ALSO]      
+    FSOUND_SetMixer
+    FSOUND_GetMixer
+]
+*/
+enum FSOUND_MIXERTYPES
+{
+    FSOUND_MIXER_AUTODETECT,        /* CE/PS2/GC Only - Non interpolating/low quality mixer. */
+    FSOUND_MIXER_BLENDMODE,         /* Removed / obsolete. */
+    FSOUND_MIXER_MMXP5,             /* Removed / obsolete. */
+    FSOUND_MIXER_MMXP6,             /* Removed / obsolete. */
+
+    FSOUND_MIXER_QUALITY_AUTODETECT,/* All platforms - Autodetect the fastest quality mixer based on your cpu. */
+    FSOUND_MIXER_QUALITY_FPU,       /* Win32/Linux only - Interpolating/volume ramping FPU mixer.  */
+    FSOUND_MIXER_QUALITY_MMXP5,     /* Win32/Linux only - Interpolating/volume ramping P5 MMX mixer.  */
+    FSOUND_MIXER_QUALITY_MMXP6,     /* Win32/Linux only - Interpolating/volume ramping ppro+ MMX mixer. */
+
+    FSOUND_MIXER_MONO,              /* CE/PS2/GC only - MONO non interpolating/low quality mixer. For speed*/
+    FSOUND_MIXER_QUALITY_MONO,      /* CE/PS2/GC only - MONO Interpolating mixer.  For speed */
+
+    FSOUND_MIXER_MAX
+};
+
+
+/*
+[ENUM]
+[
+    [DESCRIPTION]   
+    These definitions describe the type of song being played.
+
+    [SEE_ALSO]      
+    FMUSIC_GetType  
+]
+*/
+enum FMUSIC_TYPES
+{
+    FMUSIC_TYPE_NONE,       
+    FMUSIC_TYPE_MOD,        /* Protracker / Fasttracker */
+    FMUSIC_TYPE_S3M,        /* ScreamTracker 3 */
+    FMUSIC_TYPE_XM,         /* FastTracker 2 */
+    FMUSIC_TYPE_IT,         /* Impulse Tracker. */
+    FMUSIC_TYPE_MIDI,       /* MIDI file */
+    FMUSIC_TYPE_FSB         /* FMOD Sample Bank file */
+};
+
+
+/*
+[DEFINE_START] 
+[
+    [NAME] 
+    FSOUND_DSP_PRIORITIES
+
+    [DESCRIPTION]   
+    These default priorities are used by FMOD internal system DSP units.  They describe the 
+    position of the DSP chain, and the order of how audio processing is executed.
+    You can actually through the use of FSOUND_DSP_GetxxxUnit (where xxx is the name of the DSP
+    unit), disable or even change the priority of a DSP unit.
+
+    [SEE_ALSO]      
+    FSOUND_DSP_Create
+    FSOUND_DSP_SetPriority
+    FSOUND_DSP_GetSpectrum
+]
+*/
+#define FSOUND_DSP_DEFAULTPRIORITY_CLEARUNIT        0       /* DSP CLEAR unit - done first */
+#define FSOUND_DSP_DEFAULTPRIORITY_SFXUNIT          100     /* DSP SFX unit - done second */
+#define FSOUND_DSP_DEFAULTPRIORITY_MUSICUNIT        200     /* DSP MUSIC unit - done third */
+#define FSOUND_DSP_DEFAULTPRIORITY_USER             300     /* User priority, use this as reference for your own DSP units */
+#define FSOUND_DSP_DEFAULTPRIORITY_FFTUNIT          900     /* This reads data for FSOUND_DSP_GetSpectrum, so it comes after user units */
+#define FSOUND_DSP_DEFAULTPRIORITY_CLIPANDCOPYUNIT  1000    /* DSP CLIP AND COPY unit - last */
+/* [DEFINE_END] */
+
+
+/*
+[DEFINE_START] 
+[
+    [NAME] 
+    FSOUND_CAPS
+
+    [DESCRIPTION]   
+    Driver description bitfields.  Use FSOUND_Driver_GetCaps to determine if a driver enumerated
+    has the settings you are after.  The enumerated driver depends on the output mode, see
+    FSOUND_OUTPUTTYPES
+
+    [SEE_ALSO]
+    FSOUND_GetDriverCaps
+    FSOUND_OUTPUTTYPES
+]
+*/
+#define FSOUND_CAPS_HARDWARE                0x1     /* This driver supports hardware accelerated 3d sound. */
+#define FSOUND_CAPS_EAX2                    0x2     /* This driver supports EAX 2 reverb */
+#define FSOUND_CAPS_EAX3                    0x10    /* This driver supports EAX 3 reverb */
+/* [DEFINE_END] */
+
+
+/*
+[DEFINE_START] 
+[
+    [NAME] 
+    FSOUND_MODES
+    
+    [DESCRIPTION]   
+    Sample description bitfields, OR them together for loading and describing samples.
+    NOTE.  If the file format being loaded already has a defined format, such as WAV or MP3, then 
+    trying to override the pre-defined format with a new set of format flags will not work.  For
+    example, an 8 bit WAV file will not load as 16bit if you specify FSOUND_16BITS.  It will just
+    ignore the flag and go ahead loading it as 8bits.  For these type of formats the only flags
+    you can specify that will really alter the behaviour of how it is loaded, are the following.
+    ---------
+    Looping behaviour - FSOUND_LOOP_OFF, FSOUND_LOOP_NORMAL, FSOUND_LOOP_BIDI 
+    Load destination - FSOUND_HW3D, FSOUND_HW2D, FSOUND_2D
+    Loading behaviour - FSOUND_NONBLOCKING, FSOUND_LOADMEMORY, FSOUND_LOADRAW, FSOUND_MPEGACCURATE, FSOUND_MPEGHALFRATE, FSOUND_FORCEMONO
+    Playback behaviour - FSOUND_STREAMABLE, FSOUND_ENABLEFX
+    PlayStation 2 only - FSOUND_USECORE0, FSOUND_USECORE1, FSOUND_LOADMEMORYIOP    
+    ---------
+    See flag descriptions for what these do.
+]
+*/
+#define FSOUND_LOOP_OFF      0x00000001  /* For non looping samples. */
+#define FSOUND_LOOP_NORMAL   0x00000002  /* For forward looping samples. */
+#define FSOUND_LOOP_BIDI     0x00000004  /* For bidirectional looping samples.  (no effect if in hardware). */
+#define FSOUND_8BITS         0x00000008  /* For 8 bit samples. */
+#define FSOUND_16BITS        0x00000010  /* For 16 bit samples. */
+#define FSOUND_MONO          0x00000020  /* For mono samples. */
+#define FSOUND_STEREO        0x00000040  /* For stereo samples. */
+#define FSOUND_UNSIGNED      0x00000080  /* For user created source data containing unsigned samples. */
+#define FSOUND_SIGNED        0x00000100  /* For user created source data containing signed data. */
+#define FSOUND_DELTA         0x00000200  /* For user created source data stored as delta values. */
+#define FSOUND_IT214         0x00000400  /* For user created source data stored using IT214 compression. */
+#define FSOUND_IT215         0x00000800  /* For user created source data stored using IT215 compression. */
+#define FSOUND_HW3D          0x00001000  /* Attempts to make samples use 3d hardware acceleration. (if the card supports it) */
+#define FSOUND_2D            0x00002000  /* Tells software (not hardware) based sample not to be included in 3d processing. */
+#define FSOUND_STREAMABLE    0x00004000  /* For a streamimg sound where you feed the data to it. */
+#define FSOUND_LOADMEMORY    0x00008000  /* "name" will be interpreted as a pointer to data for streaming and samples. */
+#define FSOUND_LOADRAW       0x00010000  /* Will ignore file format and treat as raw pcm. */
+#define FSOUND_MPEGACCURATE  0x00020000  /* For FSOUND_Stream_Open - for accurate FSOUND_Stream_GetLengthMs/FSOUND_Stream_SetTime.  WARNING, see FSOUND_Stream_Open for inital opening time performance issues. */
+#define FSOUND_FORCEMONO     0x00040000  /* For forcing stereo streams and samples to be mono - needed if using FSOUND_HW3D and stereo data - incurs a small speed hit for streams */
+#define FSOUND_HW2D          0x00080000  /* 2D hardware sounds.  allows hardware specific effects */
+#define FSOUND_ENABLEFX      0x00100000  /* Allows DX8 FX to be played back on a sound.  Requires DirectX 8 - Note these sounds cannot be played more than once, be 8 bit, be less than a certain size, or have a changing frequency */
+#define FSOUND_MPEGHALFRATE  0x00200000  /* For FMODCE only - decodes mpeg streams using a lower quality decode, but faster execution */
+#define FSOUND_IMAADPCM      0x00400000  /* Contents are stored compressed as IMA ADPCM */
+#define FSOUND_VAG           0x00800000  /* For PS2 only - Contents are compressed as Sony VAG format */
+#define FSOUND_NONBLOCKING   0x01000000  /* For FSOUND_Stream_Open/FMUSIC_LoadSong - Causes stream or music to open in the background and not block the foreground app.  See FSOUND_Stream_GetOpenState or FMUSIC_GetOpenState to determine when it IS ready. */
+#define FSOUND_GCADPCM       0x02000000  /* For Gamecube only - Contents are compressed as Gamecube DSP-ADPCM format */
+#define FSOUND_MULTICHANNEL  0x04000000  /* For PS2 and Gamecube only - Contents are interleaved into a multi-channel (more than stereo) format */
+#define FSOUND_USECORE0      0x08000000  /* For PS2 only - Sample/Stream is forced to use hardware voices 00-23 */
+#define FSOUND_USECORE1      0x10000000  /* For PS2 only - Sample/Stream is forced to use hardware voices 24-47 */
+#define FSOUND_LOADMEMORYIOP 0x20000000  /* For PS2 only - "name" will be interpreted as a pointer to data for streaming and samples.  The address provided will be an IOP address */
+#define FSOUND_STREAM_NET    0x80000000  /* Specifies an internet stream */
+
+#define FSOUND_NORMAL       (FSOUND_16BITS | FSOUND_SIGNED | FSOUND_MONO)      
+/* [DEFINE_END] */
+
+
+
+/*
+[DEFINE_START] 
+[
+    [NAME] 
+    FSOUND_CDPLAYMODES
+    
+    [DESCRIPTION]   
+    Playback method for a CD Audio track, with FSOUND_CD_SetPlayMode
+
+    [SEE_ALSO]    
+    FSOUND_CD_SetPlayMode  
+    FSOUND_CD_Play
+]
+*/
+#define FSOUND_CD_PLAYCONTINUOUS    0   /* Starts from the current track and plays to end of CD. */
+#define FSOUND_CD_PLAYONCE          1   /* Plays the specified track then stops. */
+#define FSOUND_CD_PLAYLOOPED        2   /* Plays the specified track looped, forever until stopped manually. */
+#define FSOUND_CD_PLAYRANDOM        3   /* Plays tracks in random order */
+/* [DEFINE_END] */
+
+
+/*
+[DEFINE_START] 
+[
+    [NAME] 
+    FSOUND_MISC_VALUES
+    
+    [DESCRIPTION]
+    Miscellaneous values for FMOD functions.
+
+    [SEE_ALSO]
+    FSOUND_PlaySound
+    FSOUND_PlaySoundEx
+    FSOUND_Sample_Alloc
+    FSOUND_Sample_Load
+    FSOUND_SetPan
+]
+*/
+#define FSOUND_FREE             -1      /* value to play on any free channel, or to allocate a sample in a free sample slot. */
+#define FSOUND_UNMANAGED        -2      /* value to allocate a sample that is NOT managed by FSOUND or placed in a sample slot. */
+#define FSOUND_ALL              -3      /* for a channel index , this flag will affect ALL channels available!  Not supported by every function. */
+#define FSOUND_STEREOPAN        -1      /* value for FSOUND_SetPan so that stereo sounds are not played at half volume.  See FSOUND_SetPan for more on this. */
+#define FSOUND_SYSTEMCHANNEL    -1000   /* special 'channel' ID for all channel based functions that want to alter the global FSOUND software mixing output channel */
+#define FSOUND_SYSTEMSAMPLE     -1000   /* special 'sample' ID for all sample based functions that want to alter the global FSOUND software mixing output sample */
+
+/* [DEFINE_END] */
+
+
+/*
+[STRUCTURE] 
+[
+    [DESCRIPTION]
+    Structure defining a reverb environment.
+    For more indepth descriptions of the reverb properties under win32, please see the EAX2 and EAX3
+    documentation at http://developer.creative.com/ under the 'downloads' section.
+    If they do not have the EAX3 documentation, then most information can be attained from
+    the EAX2 documentation, as EAX3 only adds some more parameters and functionality on top of EAX2.
+    Note the default reverb properties are the same as the FSOUND_PRESET_GENERIC preset.
+    Note that integer values that typically range from -10,000 to 1000 are represented in decibels, and are of a logarithmic scale, not linear, wheras float values are typically linear.
+    PORTABILITY: Each member has the platform it supports in braces ie (win32/xbox).  
+    Some reverb parameters are only supported in win32 and some only on xbox. If all parameters are set then the reverb should product a similar effect on either platform.
+    
+    The numerical values listed below are the maximum, minimum and default values for each variable respectively.
+
+    [SEE_ALSO]
+    FSOUND_Reverb_SetProperties
+    FSOUND_Reverb_GetProperties
+    FSOUND_REVERB_PRESETS
+    FSOUND_REVERB_FLAGS
+]
+*/
+typedef struct _FSOUND_REVERB_PROPERTIES /* MIN     MAX    DEFAULT   DESCRIPTION */
+{                                   
+    unsigned int Environment;            /* 0     , 25    , 0      , sets all listener properties (WIN32/PS2 only) */
+    float        EnvSize;                /* 1.0   , 100.0 , 7.5    , environment size in meters (WIN32 only) */
+    float        EnvDiffusion;           /* 0.0   , 1.0   , 1.0    , environment diffusion (WIN32/XBOX) */
+    int          Room;                   /* -10000, 0     , -1000  , room effect level (at mid frequencies) (WIN32/XBOX/PS2) */
+    int          RoomHF;                 /* -10000, 0     , -100   , relative room effect level at high frequencies (WIN32/XBOX) */
+    int          RoomLF;                 /* -10000, 0     , 0      , relative room effect level at low frequencies (WIN32 only) */
+    float        DecayTime;              /* 0.1   , 20.0  , 1.49   , reverberation decay time at mid frequencies (WIN32/XBOX) */
+    float        DecayHFRatio;           /* 0.1   , 2.0   , 0.83   , high-frequency to mid-frequency decay time ratio (WIN32/XBOX) */
+    float        DecayLFRatio;           /* 0.1   , 2.0   , 1.0    , low-frequency to mid-frequency decay time ratio (WIN32 only) */
+    int          Reflections;            /* -10000, 1000  , -2602  , early reflections level relative to room effect (WIN32/XBOX) */
+    float        ReflectionsDelay;       /* 0.0   , 0.3   , 0.007  , initial reflection delay time (WIN32/XBOX) */
+    float        ReflectionsPan[3];      /*       ,       , [0,0,0], early reflections panning vector (WIN32 only) */
+    int          Reverb;                 /* -10000, 2000  , 200    , late reverberation level relative to room effect (WIN32/XBOX) */
+    float        ReverbDelay;            /* 0.0   , 0.1   , 0.011  , late reverberation delay time relative to initial reflection (WIN32/XBOX) */
+    float        ReverbPan[3];           /*       ,       , [0,0,0], late reverberation panning vector (WIN32 only) */
+    float        EchoTime;               /* .075  , 0.25  , 0.25   , echo time (WIN32/PS2 only.  PS2 = Delay time for ECHO/DELAY modes only) */
+    float        EchoDepth;              /* 0.0   , 1.0   , 0.0    , echo depth (WIN32/PS2 only.  PS2 = Feedback level for ECHO mode only) */
+    float        ModulationTime;         /* 0.04  , 4.0   , 0.25   , modulation time (WIN32 only) */
+    float        ModulationDepth;        /* 0.0   , 1.0   , 0.0    , modulation depth (WIN32 only) */
+    float        AirAbsorptionHF;        /* -100  , 0.0   , -5.0   , change in level per meter at high frequencies (WIN32 only) */
+    float        HFReference;            /* 1000.0, 20000 , 5000.0 , reference high frequency (hz) (WIN32/XBOX) */
+    float        LFReference;            /* 20.0  , 1000.0, 250.0  , reference low frequency (hz) (WIN32 only) */
+    float        RoomRolloffFactor;      /* 0.0   , 10.0  , 0.0    , like FSOUND_3D_SetRolloffFactor but for room effect (WIN32/XBOX) */
+    float        Diffusion;              /* 0.0   , 100.0 , 100.0  , Value that controls the echo density in the late reverberation decay. (XBOX only) */
+    float        Density;                /* 0.0   , 100.0 , 100.0  , Value that controls the modal density in the late reverberation decay (XBOX only) */
+    unsigned int Flags;                  /* FSOUND_REVERB_FLAGS - modifies the behavior of above properties (WIN32/PS2 only) */
+} FSOUND_REVERB_PROPERTIES;
+
+
+/*
+[DEFINE_START] 
+[
+    [NAME] 
+    FSOUND_REVERB_FLAGS
+    
+    [DESCRIPTION]
+    Values for the Flags member of the FSOUND_REVERB_PROPERTIES structure.
+
+    [SEE_ALSO]
+    FSOUND_REVERB_PROPERTIES
+]
+*/
+#define FSOUND_REVERB_FLAGS_DECAYTIMESCALE        0x00000001 /* 'EnvSize' affects reverberation decay time */
+#define FSOUND_REVERB_FLAGS_REFLECTIONSSCALE      0x00000002 /* 'EnvSize' affects reflection level */
+#define FSOUND_REVERB_FLAGS_REFLECTIONSDELAYSCALE 0x00000004 /* 'EnvSize' affects initial reflection delay time */
+#define FSOUND_REVERB_FLAGS_REVERBSCALE           0x00000008 /* 'EnvSize' affects reflections level */
+#define FSOUND_REVERB_FLAGS_REVERBDELAYSCALE      0x00000010 /* 'EnvSize' affects late reverberation delay time */
+#define FSOUND_REVERB_FLAGS_DECAYHFLIMIT          0x00000020 /* AirAbsorptionHF affects DecayHFRatio */
+#define FSOUND_REVERB_FLAGS_ECHOTIMESCALE         0x00000040 /* 'EnvSize' affects echo time */
+#define FSOUND_REVERB_FLAGS_MODULATIONTIMESCALE   0x00000080 /* 'EnvSize' affects modulation time */
+#define FSOUND_REVERB_FLAGS_CORE0                 0x00000100 /* PS2 Only - Reverb is applied to CORE0 (hw voices 0-23) */
+#define FSOUND_REVERB_FLAGS_CORE1                 0x00000200 /* PS2 Only - Reverb is applied to CORE1 (hw voices 24-47) */
+#define FSOUND_REVERB_FLAGS_DEFAULT              (FSOUND_REVERB_FLAGS_DECAYTIMESCALE |        \
+                                                  FSOUND_REVERB_FLAGS_REFLECTIONSSCALE |      \
+                                                  FSOUND_REVERB_FLAGS_REFLECTIONSDELAYSCALE | \
+                                                  FSOUND_REVERB_FLAGS_REVERBSCALE |           \
+                                                  FSOUND_REVERB_FLAGS_REVERBDELAYSCALE |      \
+                                                  FSOUND_REVERB_FLAGS_DECAYHFLIMIT |          \
+                                                  FSOUND_REVERB_FLAGS_CORE0 |                 \
+                                                  FSOUND_REVERB_FLAGS_CORE1 )
+/* [DEFINE_END] */
+
+
+
+
+/*
+[DEFINE_START] 
+[
+    [NAME] 
+    FSOUND_REVERB_PRESETS
+    
+    [DESCRIPTION]   
+    A set of predefined environment PARAMETERS, created by Creative Labs
+    These are used to initialize an FSOUND_REVERB_PROPERTIES structure statically.
+    ie 
+    FSOUND_REVERB_PROPERTIES prop = FSOUND_PRESET_GENERIC;
+
+    [SEE_ALSO]
+    FSOUND_Reverb_SetProperties
+]
+*/
+/*                                     Env  Size    Diffus  Room   RoomHF  RmLF DecTm   DecHF  DecLF   Refl  RefDel  RefPan               Revb  RevDel  ReverbPan           EchoTm  EchDp  ModTm  ModDp  AirAbs  HFRef    LFRef  RRlOff Diffus  Densty  FLAGS */
+#define FSOUND_PRESET_OFF              {0,	7.5f,	1.00f, -10000, -10000, 0,   1.00f,  1.00f, 1.0f,  -2602, 0.007f, { 0.0f,0.0f,0.0f },   200, 0.011f, { 0.0f,0.0f,0.0f }, 0.250f, 0.00f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f,   0.0f,   0.0f, 0x33f }
+#define FSOUND_PRESET_GENERIC          {0,	7.5f,	1.00f, -1000,  -100,   0,   1.49f,  0.83f, 1.0f,  -2602, 0.007f, { 0.0f,0.0f,0.0f },   200, 0.011f, { 0.0f,0.0f,0.0f }, 0.250f, 0.00f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f, 100.0f, 100.0f, 0x3f }
+#define FSOUND_PRESET_PADDEDCELL       {1,	1.4f,	1.00f, -1000,  -6000,  0,   0.17f,  0.10f, 1.0f,  -1204, 0.001f, { 0.0f,0.0f,0.0f },   207, 0.002f, { 0.0f,0.0f,0.0f }, 0.250f, 0.00f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f, 100.0f, 100.0f, 0x3f }
+#define FSOUND_PRESET_ROOM 	           {2,	1.9f,	1.00f, -1000,  -454,   0,   0.40f,  0.83f, 1.0f,  -1646, 0.002f, { 0.0f,0.0f,0.0f },    53, 0.003f, { 0.0f,0.0f,0.0f }, 0.250f, 0.00f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f, 100.0f, 100.0f, 0x3f }
+#define FSOUND_PRESET_BATHROOM 	       {3,	1.4f,	1.00f, -1000,  -1200,  0,   1.49f,  0.54f, 1.0f,   -370, 0.007f, { 0.0f,0.0f,0.0f },  1030, 0.011f, { 0.0f,0.0f,0.0f }, 0.250f, 0.00f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f, 100.0f,  60.0f, 0x3f }
+#define FSOUND_PRESET_LIVINGROOM       {4,	2.5f,	1.00f, -1000,  -6000,  0,   0.50f,  0.10f, 1.0f,  -1376, 0.003f, { 0.0f,0.0f,0.0f }, -1104, 0.004f, { 0.0f,0.0f,0.0f }, 0.250f, 0.00f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f, 100.0f, 100.0f, 0x3f }
+#define FSOUND_PRESET_STONEROOM        {5,	11.6f,	1.00f, -1000,  -300,   0,   2.31f,  0.64f, 1.0f,   -711, 0.012f, { 0.0f,0.0f,0.0f },    83, 0.017f, { 0.0f,0.0f,0.0f }, 0.250f, 0.00f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f, 100.0f, 100.0f, 0x3f }
+#define FSOUND_PRESET_AUDITORIUM       {6,	21.6f,	1.00f, -1000,  -476,   0,   4.32f,  0.59f, 1.0f,   -789, 0.020f, { 0.0f,0.0f,0.0f },  -289, 0.030f, { 0.0f,0.0f,0.0f }, 0.250f, 0.00f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f, 100.0f, 100.0f, 0x3f }
+#define FSOUND_PRESET_CONCERTHALL      {7,	19.6f,	1.00f, -1000,  -500,   0,   3.92f,  0.70f, 1.0f,  -1230, 0.020f, { 0.0f,0.0f,0.0f },    -2, 0.029f, { 0.0f,0.0f,0.0f }, 0.250f, 0.00f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f, 100.0f, 100.0f, 0x3f }
+#define FSOUND_PRESET_CAVE             {8,	14.6f,	1.00f, -1000,  0,      0,   2.91f,  1.30f, 1.0f,   -602, 0.015f, { 0.0f,0.0f,0.0f },  -302, 0.022f, { 0.0f,0.0f,0.0f }, 0.250f, 0.00f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f, 100.0f, 100.0f, 0x1f }
+#define FSOUND_PRESET_ARENA            {9,	36.2f,	1.00f, -1000,  -698,   0,   7.24f,  0.33f, 1.0f,  -1166, 0.020f, { 0.0f,0.0f,0.0f },    16, 0.030f, { 0.0f,0.0f,0.0f }, 0.250f, 0.00f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f, 100.0f, 100.0f, 0x3f }
+#define FSOUND_PRESET_HANGAR           {10,	50.3f,	1.00f, -1000,  -1000,  0,   10.05f, 0.23f, 1.0f,   -602, 0.020f, { 0.0f,0.0f,0.0f },   198, 0.030f, { 0.0f,0.0f,0.0f }, 0.250f, 0.00f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f, 100.0f, 100.0f, 0x3f }
+#define FSOUND_PRESET_CARPETTEDHALLWAY {11,	1.9f,	1.00f, -1000,  -4000,  0,   0.30f,  0.10f, 1.0f,  -1831, 0.002f, { 0.0f,0.0f,0.0f }, -1630, 0.030f, { 0.0f,0.0f,0.0f }, 0.250f, 0.00f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f, 100.0f, 100.0f, 0x3f }
+#define FSOUND_PRESET_HALLWAY          {12,	1.8f,	1.00f, -1000,  -300,   0,   1.49f,  0.59f, 1.0f,  -1219, 0.007f, { 0.0f,0.0f,0.0f },   441, 0.011f, { 0.0f,0.0f,0.0f }, 0.250f, 0.00f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f, 100.0f, 100.0f, 0x3f }
+#define FSOUND_PRESET_STONECORRIDOR    {13,	13.5f,	1.00f, -1000,  -237,   0,   2.70f,  0.79f, 1.0f,  -1214, 0.013f, { 0.0f,0.0f,0.0f },   395, 0.020f, { 0.0f,0.0f,0.0f }, 0.250f, 0.00f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f, 100.0f, 100.0f, 0x3f }
+#define FSOUND_PRESET_ALLEY 	       {14,	7.5f,	0.30f, -1000,  -270,   0,   1.49f,  0.86f, 1.0f,  -1204, 0.007f, { 0.0f,0.0f,0.0f },    -4, 0.011f, { 0.0f,0.0f,0.0f }, 0.125f, 0.95f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f, 100.0f, 100.0f, 0x3f }
+#define FSOUND_PRESET_FOREST 	       {15,	38.0f,	0.30f, -1000,  -3300,  0,   1.49f,  0.54f, 1.0f,  -2560, 0.162f, { 0.0f,0.0f,0.0f },  -229, 0.088f, { 0.0f,0.0f,0.0f }, 0.125f, 1.00f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f,  79.0f, 100.0f, 0x3f }
+#define FSOUND_PRESET_CITY             {16,	7.5f,	0.50f, -1000,  -800,   0,   1.49f,  0.67f, 1.0f,  -2273, 0.007f, { 0.0f,0.0f,0.0f }, -1691, 0.011f, { 0.0f,0.0f,0.0f }, 0.250f, 0.00f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f,  50.0f, 100.0f, 0x3f }
+#define FSOUND_PRESET_MOUNTAINS        {17,	100.0f, 0.27f, -1000,  -2500,  0,   1.49f,  0.21f, 1.0f,  -2780, 0.300f, { 0.0f,0.0f,0.0f }, -1434, 0.100f, { 0.0f,0.0f,0.0f }, 0.250f, 1.00f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f,  27.0f, 100.0f, 0x1f }
+#define FSOUND_PRESET_QUARRY           {18,	17.5f,	1.00f, -1000,  -1000,  0,   1.49f,  0.83f, 1.0f, -10000, 0.061f, { 0.0f,0.0f,0.0f },   500, 0.025f, { 0.0f,0.0f,0.0f }, 0.125f, 0.70f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f, 100.0f, 100.0f, 0x3f }
+#define FSOUND_PRESET_PLAIN            {19,	42.5f,	0.21f, -1000,  -2000,  0,   1.49f,  0.50f, 1.0f,  -2466, 0.179f, { 0.0f,0.0f,0.0f }, -1926, 0.100f, { 0.0f,0.0f,0.0f }, 0.250f, 1.00f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f,  21.0f, 100.0f, 0x3f }
+#define FSOUND_PRESET_PARKINGLOT       {20,	8.3f,	1.00f, -1000,  0,      0,   1.65f,  1.50f, 1.0f,  -1363, 0.008f, { 0.0f,0.0f,0.0f }, -1153, 0.012f, { 0.0f,0.0f,0.0f }, 0.250f, 0.00f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f, 100.0f, 100.0f, 0x1f }
+#define FSOUND_PRESET_SEWERPIPE        {21,	1.7f,	0.80f, -1000,  -1000,  0,   2.81f,  0.14f, 1.0f,    429, 0.014f, { 0.0f,0.0f,0.0f },  1023, 0.021f, { 0.0f,0.0f,0.0f }, 0.250f, 0.00f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f,  80.0f,  60.0f, 0x3f }
+#define FSOUND_PRESET_UNDERWATER       {22,	1.8f,	1.00f, -1000,  -4000,  0,   1.49f,  0.10f, 1.0f,   -449, 0.007f, { 0.0f,0.0f,0.0f },  1700, 0.011f, { 0.0f,0.0f,0.0f }, 0.250f, 0.00f, 1.18f, 0.348f, -5.0f, 5000.0f, 250.0f, 0.0f, 100.0f, 100.0f, 0x3f }
+
+/* Non I3DL2 presets */
+
+#define FSOUND_PRESET_DRUGGED          {23,	1.9f,	0.50f, -1000,  0,      0,   8.39f,  1.39f, 1.0f,  -115,  0.002f, { 0.0f,0.0f,0.0f },   985, 0.030f, { 0.0f,0.0f,0.0f }, 0.250f, 0.00f, 0.25f, 1.000f, -5.0f, 5000.0f, 250.0f, 0.0f, 100.0f, 100.0f, 0x1f }
+#define FSOUND_PRESET_DIZZY            {24,	1.8f,	0.60f, -1000,  -400,   0,   17.23f, 0.56f, 1.0f,  -1713, 0.020f, { 0.0f,0.0f,0.0f },  -613, 0.030f, { 0.0f,0.0f,0.0f }, 0.250f, 1.00f, 0.81f, 0.310f, -5.0f, 5000.0f, 250.0f, 0.0f, 100.0f, 100.0f, 0x1f }
+#define FSOUND_PRESET_PSYCHOTIC        {25,	1.0f,	0.50f, -1000,  -151,   0,   7.56f,  0.91f, 1.0f,  -626,  0.020f, { 0.0f,0.0f,0.0f },   774, 0.030f, { 0.0f,0.0f,0.0f }, 0.250f, 0.00f, 4.00f, 1.000f, -5.0f, 5000.0f, 250.0f, 0.0f, 100.0f, 100.0f, 0x1f }
+
+/* PlayStation 2 Only presets */
+
+#define FSOUND_PRESET_PS2_ROOM         {1,	0,	    0,         0,  0,      0,   0.0f,   0.0f,  0.0f,     0,  0.000f, { 0.0f,0.0f,0.0f },     0, 0.000f, { 0.0f,0.0f,0.0f }, 0.000f, 0.00f, 0.00f, 0.000f,  0.0f, 0000.0f,   0.0f, 0.0f,   0.0f,   0.0f, 0x31f }
+#define FSOUND_PRESET_PS2_STUDIO_A     {2,	0,	    0,         0,  0,      0,   0.0f,   0.0f,  0.0f,     0,  0.000f, { 0.0f,0.0f,0.0f },     0, 0.000f, { 0.0f,0.0f,0.0f }, 0.000f, 0.00f, 0.00f, 0.000f,  0.0f, 0000.0f,   0.0f, 0.0f,   0.0f,   0.0f, 0x31f }
+#define FSOUND_PRESET_PS2_STUDIO_B     {3,	0,	    0,         0,  0,      0,   0.0f,   0.0f,  0.0f,     0,  0.000f, { 0.0f,0.0f,0.0f },     0, 0.000f, { 0.0f,0.0f,0.0f }, 0.000f, 0.00f, 0.00f, 0.000f,  0.0f, 0000.0f,   0.0f, 0.0f,   0.0f,   0.0f, 0x31f }
+#define FSOUND_PRESET_PS2_STUDIO_C     {4,	0,	    0,         0,  0,      0,   0.0f,   0.0f,  0.0f,     0,  0.000f, { 0.0f,0.0f,0.0f },     0, 0.000f, { 0.0f,0.0f,0.0f }, 0.000f, 0.00f, 0.00f, 0.000f,  0.0f, 0000.0f,   0.0f, 0.0f,   0.0f,   0.0f, 0x31f }
+#define FSOUND_PRESET_PS2_HALL         {5,	0,	    0,         0,  0,      0,   0.0f,   0.0f,  0.0f,     0,  0.000f, { 0.0f,0.0f,0.0f },     0, 0.000f, { 0.0f,0.0f,0.0f }, 0.000f, 0.00f, 0.00f, 0.000f,  0.0f, 0000.0f,   0.0f, 0.0f,   0.0f,   0.0f, 0x31f }
+#define FSOUND_PRESET_PS2_SPACE        {6,	0,	    0,         0,  0,      0,   0.0f,   0.0f,  0.0f,     0,  0.000f, { 0.0f,0.0f,0.0f },     0, 0.000f, { 0.0f,0.0f,0.0f }, 0.000f, 0.00f, 0.00f, 0.000f,  0.0f, 0000.0f,   0.0f, 0.0f,   0.0f,   0.0f, 0x31f }
+#define FSOUND_PRESET_PS2_ECHO         {7,	0,	    0,         0,  0,      0,   0.0f,   0.0f,  0.0f,     0,  0.000f, { 0.0f,0.0f,0.0f },     0, 0.000f, { 0.0f,0.0f,0.0f }, 0.000f, 0.00f, 0.00f, 0.000f,  0.0f, 0000.0f,   0.0f, 0.0f,   0.0f,   0.0f, 0x31f }
+#define FSOUND_PRESET_PS2_DELAY        {8,	0,	    0,         0,  0,      0,   0.0f,   0.0f,  0.0f,     0,  0.000f, { 0.0f,0.0f,0.0f },     0, 0.000f, { 0.0f,0.0f,0.0f }, 0.000f, 0.00f, 0.00f, 0.000f,  0.0f, 0000.0f,   0.0f, 0.0f,   0.0f,   0.0f, 0x31f }
+#define FSOUND_PRESET_PS2_PIPE         {9,	0,	    0,         0,  0,      0,   0.0f,   0.0f,  0.0f,     0,  0.000f, { 0.0f,0.0f,0.0f },     0, 0.000f, { 0.0f,0.0f,0.0f }, 0.000f, 0.00f, 0.00f, 0.000f,  0.0f, 0000.0f,   0.0f, 0.0f,   0.0f,   0.0f, 0x31f }
+
+/* [DEFINE_END] */
+
+
+/*
+[STRUCTURE] 
+[
+    [DESCRIPTION]
+    Structure defining the properties for a reverb source, related to a FSOUND channel.
+    For more indepth descriptions of the reverb properties under win32, please see the EAX3
+    documentation at http://developer.creative.com/ under the 'downloads' section.
+    If they do not have the EAX3 documentation, then most information can be attained from
+    the EAX2 documentation, as EAX3 only adds some more parameters and functionality on top of 
+    EAX2.
+    
+    Note the default reverb properties are the same as the FSOUND_PRESET_GENERIC preset.
+    Note that integer values that typically range from -10,000 to 1000 are represented in 
+    decibels, and are of a logarithmic scale, not linear, wheras float values are typically linear.
+    PORTABILITY: Each member has the platform it supports in braces ie (win32/xbox).  
+    Some reverb parameters are only supported in win32 and some only on xbox. If all parameters are set then
+    the reverb should product a similar effect on either platform.
+    Linux and FMODCE do not support the reverb api.
+    
+    The numerical values listed below are the maximum, minimum and default values for each variable respectively.
+
+    [SEE_ALSO]
+    FSOUND_Reverb_SetChannelProperties
+    FSOUND_Reverb_GetChannelProperties
+    FSOUND_REVERB_CHANNELFLAGS
+]
+*/
+typedef struct _FSOUND_REVERB_CHANNELPROPERTIES /* MIN     MAX    DEFAULT */
+{                                   
+    int    Direct;                              /* -10000, 1000,  0,    direct path level (at low and mid frequencies) (WIN32/XBOX) */
+    int    DirectHF;                            /* -10000, 0,     0,    relative direct path level at high frequencies (WIN32/XBOX) */
+    int    Room;                                /* -10000, 1000,  0,    room effect level (at low and mid frequencies) (WIN32/XBOX/PS2) */
+    int    RoomHF;                              /* -10000, 0,     0,    relative room effect level at high frequencies (WIN32/XBOX) */
+    int    Obstruction;                         /* -10000, 0,     0,    main obstruction control (attenuation at high frequencies)  (WIN32/XBOX) */
+    float  ObstructionLFRatio;                  /* 0.0,    1.0,   0.0,  obstruction low-frequency level re. main control (WIN32/XBOX) */
+    int    Occlusion;                           /* -10000, 0,     0,    main occlusion control (attenuation at high frequencies) (WIN32/XBOX) */
+    float  OcclusionLFRatio;                    /* 0.0,    1.0,   0.25, occlusion low-frequency level re. main control (WIN32/XBOX) */
+    float  OcclusionRoomRatio;                  /* 0.0,    10.0,  1.5,  relative occlusion control for room effect (WIN32) */
+    float  OcclusionDirectRatio;                /* 0.0,    10.0,  1.0,  relative occlusion control for direct path (WIN32) */
+    int    Exclusion;                           /* -10000, 0,     0,    main exlusion control (attenuation at high frequencies) (WIN32) */
+    float  ExclusionLFRatio;                    /* 0.0,    1.0,   1.0,  exclusion low-frequency level re. main control (WIN32) */
+    int    OutsideVolumeHF;                     /* -10000, 0,     0,    outside sound cone level at high frequencies (WIN32) */
+    float  DopplerFactor;                       /* 0.0,    10.0,  0.0,  like DS3D flDopplerFactor but per source (WIN32) */
+    float  RolloffFactor;                       /* 0.0,    10.0,  0.0,  like DS3D flRolloffFactor but per source (WIN32) */
+    float  RoomRolloffFactor;                   /* 0.0,    10.0,  0.0,  like DS3D flRolloffFactor but for room effect (WIN32/XBOX) */
+    float  AirAbsorptionFactor;                 /* 0.0,    10.0,  1.0,  multiplies AirAbsorptionHF member of FSOUND_REVERB_PROPERTIES (WIN32) */
+    int    Flags;                               /* FSOUND_REVERB_CHANNELFLAGS - modifies the behavior of properties (WIN32) */
+} FSOUND_REVERB_CHANNELPROPERTIES;
+
+
+/*
+[DEFINE_START] 
+[
+    [NAME] 
+    FSOUND_REVERB_CHANNELFLAGS
+    
+    [DESCRIPTION]
+    Values for the Flags member of the FSOUND_REVERB_CHANNELPROPERTIES structure.
+
+    [SEE_ALSO]
+    FSOUND_REVERB_CHANNELPROPERTIES
+]
+*/
+#define FSOUND_REVERB_CHANNELFLAGS_DIRECTHFAUTO  0x00000001 /* Automatic setting of 'Direct'  due to distance from listener */
+#define FSOUND_REVERB_CHANNELFLAGS_ROOMAUTO      0x00000002 /* Automatic setting of 'Room'  due to distance from listener */
+#define FSOUND_REVERB_CHANNELFLAGS_ROOMHFAUTO    0x00000004 /* Automatic setting of 'RoomHF' due to distance from listener */
+#define FSOUND_REVERB_CHANNELFLAGS_DEFAULT       (FSOUND_REVERB_CHANNELFLAGS_DIRECTHFAUTO |   \
+                                                  FSOUND_REVERB_CHANNELFLAGS_ROOMAUTO|        \
+                                                  FSOUND_REVERB_CHANNELFLAGS_ROOMHFAUTO)
+/* [DEFINE_END] */
+
+
+/*
+[ENUM] 
+[
+    [DESCRIPTION]
+    These values are used with FSOUND_FX_Enable to enable DirectX 8 FX for a channel.
+
+    [SEE_ALSO]
+    FSOUND_FX_Enable
+    FSOUND_FX_Disable
+    FSOUND_FX_SetChorus
+    FSOUND_FX_SetCompressor
+    FSOUND_FX_SetDistortion
+    FSOUND_FX_SetEcho
+    FSOUND_FX_SetFlanger
+    FSOUND_FX_SetGargle
+    FSOUND_FX_SetI3DL2Reverb
+    FSOUND_FX_SetParamEQ
+    FSOUND_FX_SetWavesReverb
+]
+*/
+enum FSOUND_FX_MODES
+{
+    FSOUND_FX_CHORUS,
+    FSOUND_FX_COMPRESSOR,
+    FSOUND_FX_DISTORTION,
+    FSOUND_FX_ECHO,
+    FSOUND_FX_FLANGER,
+    FSOUND_FX_GARGLE,
+    FSOUND_FX_I3DL2REVERB,
+    FSOUND_FX_PARAMEQ,
+    FSOUND_FX_WAVES_REVERB,
+
+    FSOUND_FX_MAX
+};
+
+/*
+[ENUM]
+[
+    [DESCRIPTION]   
+    These are speaker types defined for use with the FSOUND_SetSpeakerMode command.
+    Note - Only reliably works with FSOUND_OUTPUT_DSOUND or FSOUND_OUTPUT_XBOX output modes.  Other output modes will only 
+    interpret FSOUND_SPEAKERMODE_MONO and set everything else to be stereo.
+
+    Using either DolbyDigital or DTS will use whatever 5.1 digital mode is available if destination hardware is unsure.
+
+    [SEE_ALSO]
+    FSOUND_SetSpeakerMode
+
+]
+*/
+enum FSOUND_SPEAKERMODES
+{
+    FSOUND_SPEAKERMODE_DOLBYDIGITAL,        /* Dolby Digital Output (XBOX or PC only). */
+    FSOUND_SPEAKERMODE_HEADPHONES,          /* The speakers are headphones. */
+    FSOUND_SPEAKERMODE_MONO,                /* The speakers are monaural. */
+    FSOUND_SPEAKERMODE_QUAD,                /* The speakers are quadraphonic.  */
+    FSOUND_SPEAKERMODE_STEREO,              /* The speakers are stereo (default value). */
+    FSOUND_SPEAKERMODE_SURROUND,            /* The speakers are surround sound. */
+    FSOUND_SPEAKERMODE_DTS,                 /* DTS output (XBOX only). */
+    FSOUND_SPEAKERMODE_PROLOGIC2,           /* Dolby Prologic 2.  Playstation 2 and Gamecube only.  PlayStation 2 doesnt support interior panning, but supports 48 voices simultaneously. */
+    FSOUND_SPEAKERMODE_PROLOGIC2_INTERIOR   /* Dolby Prologic 2.  Playstation 2 and Gamecube only.  PlayStation 2 does support interior panning, but only supports 24 voices simultaneously. */
+};
+
+
+/*
+[DEFINE_START] 
+[
+    [NAME] 
+    FSOUND_INIT_FLAGS
+    
+    [DESCRIPTION]   
+    Initialization flags.  Use them with FSOUND_Init in the flags parameter to change various behaviour.
+    
+    FSOUND_INIT_ENABLEOUTPUTFX Is an init mode which enables the FSOUND mixer buffer to be affected by DirectX 8 effects.
+    Note that due to limitations of DirectSound, FSOUND_Init may fail if this is enabled because the buffersize is too small.
+    This can be fixed with FSOUND_SetBufferSize.  Increase the BufferSize until it works.
+    When it is enabled you can use the FSOUND_FX api, and use FSOUND_SYSTEMCHANNEL as the channel id when setting parameters.
+
+    [SEE_ALSO]
+    FSOUND_Init
+]
+*/
+#define FSOUND_INIT_USEDEFAULTMIDISYNTH     0x0001    /* Causes MIDI playback to force software decoding. */
+#define FSOUND_INIT_GLOBALFOCUS             0x0002    /* For DirectSound output - sound is not muted when window is out of focus. */
+#define FSOUND_INIT_ENABLEOUTPUTFX          0x0004    /* For DirectSound output - Allows FSOUND_FX api to be used on global software mixer output! */
+#define FSOUND_INIT_ACCURATEVULEVELS        0x0008    /* This latency adjusts FSOUND_GetCurrentLevels, but incurs a small cpu and memory hit */
+#define FSOUND_INIT_PS2_DISABLECORE0REVERB  0x0010    /* PS2 only - Disable reverb on CORE 0 to regain SRAM */
+#define FSOUND_INIT_PS2_DISABLECORE1REVERB  0x0020    /* PS2 only - Disable reverb on CORE 1 to regain SRAM */
+#define FSOUND_INIT_PS2_SWAPDMACORES        0x0040    /* PS2 only - By default FMOD uses DMA CH0 for mixing, CH1 for uploads, this flag swaps them around */
+#define FSOUND_INIT_DONTLATENCYADJUST       0x0080    /* Callbacks are not latency adjusted, and are called at mix time.  Also information functions are immediate */
+#define FSOUND_INIT_GC_INITLIBS             0x0100    /* Gamecube only - Initializes GC audio libraries */
+#define FSOUND_INIT_STREAM_FROM_MAIN_THREAD 0x0200    /* Turns off fmod streamer thread, and makes streaming update from FSOUND_Update called by the user */
+#define FSOUND_INIT_PS2_USEVOLUMERAMPING    0x0400    /* PS2 only - Turns on volume ramping system to remove hardware clicks. */
+/* [DEFINE_END] */
+
+
+/*
+[ENUM]
+[
+    [DESCRIPTION]   
+    Status values for internet streams. Use FSOUND_Stream_Net_GetStatus to get the current status of an internet stream.
+
+    [SEE_ALSO]
+    FSOUND_Stream_Net_GetStatus
+]
+*/
+enum FSOUND_STREAM_NET_STATUS
+{
+    FSOUND_STREAM_NET_NOTCONNECTED = 0,     /* Stream hasn't connected yet */
+    FSOUND_STREAM_NET_CONNECTING,           /* Stream is connecting to remote host */
+    FSOUND_STREAM_NET_BUFFERING,            /* Stream is buffering data */
+    FSOUND_STREAM_NET_READY,                /* Stream is ready to play */
+    FSOUND_STREAM_NET_ERROR                 /* Stream has suffered a fatal error */
+};
+
+
+/*
+[ENUM]
+[
+    [DESCRIPTION]   
+    Describes the type of a particular tag field.
+
+    [SEE_ALSO]
+    FSOUND_Stream_GetNumTagFields
+    FSOUND_Stream_GetTagField
+    FSOUND_Stream_FindTagField
+]
+*/
+enum FSOUND_TAGFIELD_TYPE
+{
+    FSOUND_TAGFIELD_VORBISCOMMENT = 0,      /* A vorbis comment */
+    FSOUND_TAGFIELD_ID3V1,                  /* Part of an ID3v1 tag */
+    FSOUND_TAGFIELD_ID3V2,                  /* An ID3v2 frame */
+    FSOUND_TAGFIELD_SHOUTCAST,              /* A SHOUTcast header line */
+    FSOUND_TAGFIELD_ICECAST,                /* An Icecast header line */
+    FSOUND_TAGFIELD_ASF                     /* An Advanced Streaming Format header line */
+};
+
+
+/*
+[DEFINE_START] 
+[
+    [NAME] 
+    FSOUND_STATUS_FLAGS
+    
+    [DESCRIPTION]   
+    These values describe the protocol and format of an internet stream. Use FSOUND_Stream_Net_GetStatus to retrieve this information for an open internet stream.
+    
+    [SEE_ALSO]
+    FSOUND_Stream_Net_GetStatus
+]
+*/
+#define FSOUND_PROTOCOL_SHOUTCAST   0x00000001
+#define FSOUND_PROTOCOL_ICECAST     0x00000002
+#define FSOUND_PROTOCOL_HTTP        0x00000004
+#define FSOUND_FORMAT_MPEG          0x00010000
+#define FSOUND_FORMAT_OGGVORBIS     0x00020000
+/* [DEFINE_END] */
+
+
+/* ========================================================================================== */
+/* FUNCTION PROTOTYPES                                                                        */
+/* ========================================================================================== */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* ================================== */
+/* Initialization / Global functions. */
+/* ================================== */
+
+/* 
+    PRE - FSOUND_Init functions. These can't be called after FSOUND_Init is 
+    called (they will fail). They set up FMOD system functionality. 
+*/
+
+DLL_API signed char     F_API FSOUND_SetOutput(int outputtype);
+DLL_API signed char     F_API FSOUND_SetDriver(int driver);
+DLL_API signed char     F_API FSOUND_SetMixer(int mixer);
+DLL_API signed char     F_API FSOUND_SetBufferSize(int len_ms);
+DLL_API signed char     F_API FSOUND_SetHWND(void *hwnd);
+DLL_API signed char     F_API FSOUND_SetMinHardwareChannels(int min);
+DLL_API signed char     F_API FSOUND_SetMaxHardwareChannels(int max);
+DLL_API signed char     F_API FSOUND_SetMemorySystem(void *pool, 
+                                                     int poollen, 
+                                                     FSOUND_ALLOCCALLBACK   useralloc,
+                                                     FSOUND_REALLOCCALLBACK userrealloc,
+                                                     FSOUND_FREECALLBACK    userfree);
+/* 
+    Main initialization / closedown functions.
+    Note : Use FSOUND_INIT_USEDEFAULTMIDISYNTH with FSOUND_Init for software override 
+           with MIDI playback.
+         : Use FSOUND_INIT_GLOBALFOCUS with FSOUND_Init to make sound audible no matter 
+           which window is in focus. (FSOUND_OUTPUT_DSOUND only)
+*/
+
+DLL_API signed char     F_API FSOUND_Init(int mixrate, int maxsoftwarechannels, unsigned int flags);
+DLL_API void            F_API FSOUND_Close();
+
+/* 
+    Runtime system level functions 
+*/
+
+DLL_API void            F_API FSOUND_Update();   /* This is called to update 3d sound / non-realtime output */
+
+DLL_API void            F_API FSOUND_SetSpeakerMode(unsigned int speakermode);
+DLL_API void            F_API FSOUND_SetSFXMasterVolume(int volume);
+DLL_API void            F_API FSOUND_SetPanSeperation(float pansep);
+DLL_API void            F_API FSOUND_File_SetCallbacks(FSOUND_OPENCALLBACK  useropen,
+                                                       FSOUND_CLOSECALLBACK userclose,
+                                                       FSOUND_READCALLBACK  userread,
+                                                       FSOUND_SEEKCALLBACK  userseek,
+                                                       FSOUND_TELLCALLBACK  usertell);
+
+/* 
+    System information functions. 
+*/
+
+DLL_API int             F_API FSOUND_GetError();
+DLL_API float           F_API FSOUND_GetVersion();
+DLL_API int             F_API FSOUND_GetOutput();
+DLL_API void *          F_API FSOUND_GetOutputHandle();
+DLL_API int             F_API FSOUND_GetDriver();
+DLL_API int             F_API FSOUND_GetMixer();
+DLL_API int             F_API FSOUND_GetNumDrivers();
+DLL_API const char *    F_API FSOUND_GetDriverName(int id);
+DLL_API signed char     F_API FSOUND_GetDriverCaps(int id, unsigned int *caps);
+DLL_API int             F_API FSOUND_GetOutputRate();
+DLL_API int             F_API FSOUND_GetMaxChannels();
+DLL_API int             F_API FSOUND_GetMaxSamples();
+DLL_API int             F_API FSOUND_GetSFXMasterVolume();
+DLL_API int             F_API FSOUND_GetNumHardwareChannels();
+DLL_API int             F_API FSOUND_GetChannelsPlaying();
+DLL_API float           F_API FSOUND_GetCPUUsage();
+DLL_API void            F_API FSOUND_GetMemoryStats(unsigned int *currentalloced, unsigned int *maxalloced);
+
+/* =================================== */
+/* Sample management / load functions. */
+/* =================================== */
+
+/* 
+    Sample creation and management functions
+    Note : Use FSOUND_LOADMEMORY   flag with FSOUND_Sample_Load to load from memory.
+           Use FSOUND_LOADRAW      flag with FSOUND_Sample_Load to treat as as raw pcm data.
+*/
+
+DLL_API FSOUND_SAMPLE * F_API FSOUND_Sample_Load(int index, const char *name_or_data, unsigned int mode, int offset, int length);
+DLL_API FSOUND_SAMPLE * F_API FSOUND_Sample_Alloc(int index, int length, unsigned int mode, int deffreq, int defvol, int defpan, int defpri);
+DLL_API void            F_API FSOUND_Sample_Free(FSOUND_SAMPLE *sptr);
+DLL_API signed char     F_API FSOUND_Sample_Upload(FSOUND_SAMPLE *sptr, void *srcdata, unsigned int mode);
+DLL_API signed char     F_API FSOUND_Sample_Lock(FSOUND_SAMPLE *sptr, int offset, int length, void **ptr1, void **ptr2, unsigned int *len1, unsigned int *len2);
+DLL_API signed char     F_API FSOUND_Sample_Unlock(FSOUND_SAMPLE *sptr, void *ptr1, void *ptr2, unsigned int len1, unsigned int len2);
+
+/*
+    Sample control functions
+*/
+
+DLL_API signed char     F_API FSOUND_Sample_SetMode(FSOUND_SAMPLE *sptr, unsigned int mode);
+DLL_API signed char     F_API FSOUND_Sample_SetLoopPoints(FSOUND_SAMPLE *sptr, int loopstart, int loopend);
+DLL_API signed char     F_API FSOUND_Sample_SetDefaults(FSOUND_SAMPLE *sptr, int deffreq, int defvol, int defpan, int defpri);
+DLL_API signed char     F_API FSOUND_Sample_SetMinMaxDistance(FSOUND_SAMPLE *sptr, float min, float max);
+DLL_API signed char     F_API FSOUND_Sample_SetMaxPlaybacks(FSOUND_SAMPLE *sptr, int max);
+
+/* 
+    Sample information functions
+*/
+
+DLL_API FSOUND_SAMPLE * F_API FSOUND_Sample_Get(int sampno);
+DLL_API const char *    F_API FSOUND_Sample_GetName(FSOUND_SAMPLE *sptr);
+DLL_API unsigned int    F_API FSOUND_Sample_GetLength(FSOUND_SAMPLE *sptr);
+DLL_API signed char     F_API FSOUND_Sample_GetLoopPoints(FSOUND_SAMPLE *sptr, int *loopstart, int *loopend);
+DLL_API signed char     F_API FSOUND_Sample_GetDefaults(FSOUND_SAMPLE *sptr, int *deffreq, int *defvol, int *defpan, int *defpri);
+DLL_API unsigned int    F_API FSOUND_Sample_GetMode(FSOUND_SAMPLE *sptr);
+  
+/* ============================ */
+/* Channel control functions.   */
+/* ============================ */
+
+/* 
+    Playing and stopping sounds.  
+    Note : Use FSOUND_FREE as the 'channel' variable, to let FMOD pick a free channel for you.
+           Use FSOUND_ALL as the 'channel' variable to control ALL channels with one function call!
+*/
+
+DLL_API int             F_API FSOUND_PlaySound(int channel, FSOUND_SAMPLE *sptr);
+DLL_API int             F_API FSOUND_PlaySoundEx(int channel, FSOUND_SAMPLE *sptr, FSOUND_DSPUNIT *dsp, signed char startpaused);
+DLL_API signed char     F_API FSOUND_StopSound(int channel);
+
+/* 
+    Functions to control playback of a channel.
+    Note : FSOUND_ALL can be used on most of these functions as a channel value.
+*/
+
+DLL_API signed char     F_API FSOUND_SetFrequency(int channel, int freq);
+DLL_API signed char     F_API FSOUND_SetVolume(int channel, int vol);
+DLL_API signed char     F_API FSOUND_SetVolumeAbsolute(int channel, int vol);
+DLL_API signed char     F_API FSOUND_SetPan(int channel, int pan);
+DLL_API signed char     F_API FSOUND_SetSurround(int channel, signed char surround);
+DLL_API signed char     F_API FSOUND_SetMute(int channel, signed char mute);
+DLL_API signed char     F_API FSOUND_SetPriority(int channel, int priority);
+DLL_API signed char     F_API FSOUND_SetReserved(int channel, signed char reserved);
+DLL_API signed char     F_API FSOUND_SetPaused(int channel, signed char paused);
+DLL_API signed char     F_API FSOUND_SetLoopMode(int channel, unsigned int loopmode);
+DLL_API signed char     F_API FSOUND_SetCurrentPosition(int channel, unsigned int offset);
+
+/* 
+    Channel information functions.
+*/
+
+DLL_API signed char     F_API FSOUND_IsPlaying(int channel);
+DLL_API int             F_API FSOUND_GetFrequency(int channel);
+DLL_API int             F_API FSOUND_GetVolume(int channel);
+DLL_API int             F_API FSOUND_GetPan(int channel);
+DLL_API signed char     F_API FSOUND_GetSurround(int channel);
+DLL_API signed char     F_API FSOUND_GetMute(int channel);
+DLL_API int             F_API FSOUND_GetPriority(int channel);
+DLL_API signed char     F_API FSOUND_GetReserved(int channel);
+DLL_API signed char     F_API FSOUND_GetPaused(int channel);
+DLL_API unsigned int    F_API FSOUND_GetLoopMode(int channel);
+DLL_API unsigned int    F_API FSOUND_GetCurrentPosition(int channel);
+DLL_API FSOUND_SAMPLE * F_API FSOUND_GetCurrentSample(int channel);
+DLL_API signed char     F_API FSOUND_GetCurrentLevels(int channel, float *l, float *r);
+DLL_API int             F_API FSOUND_GetNumSubChannels(int channel);
+DLL_API int             F_API FSOUND_GetSubChannel(int channel, int subchannel);
+
+
+/* =================== */
+/* FX functions.       */
+/* =================== */
+
+/* 
+    Functions to control DX8 only effects processing.
+
+    - FX enabled samples can only be played once at a time, not multiple times at once.
+    - Sounds have to be created with FSOUND_HW2D or FSOUND_HW3D for this to work.
+    - FSOUND_INIT_ENABLEOUTPUTFX can be used to apply hardware effect processing to the
+      global mixed output of FMOD's software channels.
+    - FSOUND_FX_Enable returns an FX handle that you can use to alter fx parameters.
+    - FSOUND_FX_Enable can be called multiple times in a row, even on the same FX type,
+      it will return a unique handle for each FX.
+    - FSOUND_FX_Enable cannot be called if the sound is playing or locked.
+    - FSOUND_FX_Disable must be called to reset/clear the FX from a channel.
+*/
+
+DLL_API int             F_API FSOUND_FX_Enable(int channel, unsigned int fx);    /* See FSOUND_FX_MODES */
+DLL_API signed char     F_API FSOUND_FX_Disable(int channel);    
+
+DLL_API signed char     F_API FSOUND_FX_SetChorus(int fxid, float WetDryMix, float Depth, float Feedback, float Frequency, int Waveform, float Delay, int Phase);
+DLL_API signed char     F_API FSOUND_FX_SetCompressor(int fxid, float Gain, float Attack, float Release, float Threshold, float Ratio, float Predelay);
+DLL_API signed char     F_API FSOUND_FX_SetDistortion(int fxid, float Gain, float Edge, float PostEQCenterFrequency, float PostEQBandwidth, float PreLowpassCutoff);
+DLL_API signed char     F_API FSOUND_FX_SetEcho(int fxid, float WetDryMix, float Feedback, float LeftDelay, float RightDelay, int PanDelay);
+DLL_API signed char     F_API FSOUND_FX_SetFlanger(int fxid, float WetDryMix, float Depth, float Feedback, float Frequency, int Waveform, float Delay, int Phase);
+DLL_API signed char     F_API FSOUND_FX_SetGargle(int fxid, int RateHz, int WaveShape);
+DLL_API signed char     F_API FSOUND_FX_SetI3DL2Reverb(int fxid, int Room, int RoomHF, float RoomRolloffFactor, float DecayTime, float DecayHFRatio, int Reflections, float ReflectionsDelay, int Reverb, float ReverbDelay, float Diffusion, float Density, float HFReference);
+DLL_API signed char     F_API FSOUND_FX_SetParamEQ(int fxid, float Center, float Bandwidth, float Gain);
+DLL_API signed char     F_API FSOUND_FX_SetWavesReverb(int fxid, float InGain, float ReverbMix, float ReverbTime, float HighFreqRTRatio);  
+ 
+/* =================== */
+/* 3D sound functions. */
+/* =================== */
+
+DLL_API void            F_API FSOUND_3D_SetDopplerFactor(float scale);
+DLL_API void            F_API FSOUND_3D_SetDistanceFactor(float scale);
+DLL_API void            F_API FSOUND_3D_SetRolloffFactor(float scale);
+DLL_API signed char     F_API FSOUND_3D_SetAttributes(int channel, const float *pos, const float *vel);
+DLL_API signed char     F_API FSOUND_3D_GetAttributes(int channel, float *pos, float *vel);
+
+DLL_API void            F_API FSOUND_3D_Listener_SetCurrent(int current, int numlisteners);  /* use this if you use multiple listeners / splitscreen */
+DLL_API void            F_API FSOUND_3D_Listener_SetAttributes(const float *pos, const float *vel, float fx, float fy, float fz, float tx, float ty, float tz);
+DLL_API void            F_API FSOUND_3D_Listener_GetAttributes(float *pos, float *vel, float *fx, float *fy, float *fz, float *tx, float *ty, float *tz);
+ 
+/* ========================= */
+/* File Streaming functions. */
+/* ========================= */
+
+/*
+    Note : Use FSOUND_LOADMEMORY   flag with FSOUND_Stream_Open to stream from memory.
+           Use FSOUND_LOADRAW      flag with FSOUND_Stream_Open to treat stream as raw pcm data.
+           Use FSOUND_MPEGACCURATE flag with FSOUND_Stream_Open to open mpegs in 'accurate mode' for settime/gettime/getlengthms.
+           Use FSOUND_FREE as the 'channel' variable, to let FMOD pick a free channel for you.
+*/
+
+DLL_API signed char        F_API FSOUND_Stream_SetBufferSize(int ms);      /* call this before opening streams, not after */
+                           
+DLL_API FSOUND_STREAM *    F_API FSOUND_Stream_Open(const char *name_or_data, unsigned int mode, int offset, int length);
+DLL_API FSOUND_STREAM *    F_API FSOUND_Stream_Create(FSOUND_STREAMCALLBACK callback, int length, unsigned int mode, int samplerate, int userdata);
+DLL_API signed char        F_API FSOUND_Stream_Close(FSOUND_STREAM *stream);
+                           
+DLL_API int                F_API FSOUND_Stream_Play(int channel, FSOUND_STREAM *stream);
+DLL_API int                F_API FSOUND_Stream_PlayEx(int channel, FSOUND_STREAM *stream, FSOUND_DSPUNIT *dsp, signed char startpaused);
+DLL_API signed char        F_API FSOUND_Stream_Stop(FSOUND_STREAM *stream);
+                           
+DLL_API signed char        F_API FSOUND_Stream_SetPosition(FSOUND_STREAM *stream, unsigned int position);
+DLL_API unsigned int       F_API FSOUND_Stream_GetPosition(FSOUND_STREAM *stream);
+DLL_API signed char        F_API FSOUND_Stream_SetTime(FSOUND_STREAM *stream, int ms);
+DLL_API int                F_API FSOUND_Stream_GetTime(FSOUND_STREAM *stream);
+DLL_API int                F_API FSOUND_Stream_GetLength(FSOUND_STREAM *stream);
+DLL_API int                F_API FSOUND_Stream_GetLengthMs(FSOUND_STREAM *stream);
+                           
+DLL_API signed char        F_API FSOUND_Stream_SetMode(FSOUND_STREAM *stream, unsigned int mode);
+DLL_API unsigned int       F_API FSOUND_Stream_GetMode(FSOUND_STREAM *stream);
+DLL_API signed char        F_API FSOUND_Stream_SetLoopPoints(FSOUND_STREAM *stream, unsigned int loopstartpcm, unsigned int loopendpcm);
+DLL_API signed char        F_API FSOUND_Stream_SetLoopCount(FSOUND_STREAM *stream, int count);
+DLL_API int                F_API FSOUND_Stream_GetOpenState(FSOUND_STREAM *stream);                /* use with FSOUND_NONBLOCKING opened streams */
+DLL_API FSOUND_SAMPLE *    F_API FSOUND_Stream_GetSample(FSOUND_STREAM *stream);
+DLL_API FSOUND_DSPUNIT *   F_API FSOUND_Stream_CreateDSP(FSOUND_STREAM *stream, FSOUND_DSPCALLBACK callback, int priority, int param);
+                           
+DLL_API signed char        F_API FSOUND_Stream_SetEndCallback(FSOUND_STREAM *stream, FSOUND_STREAMCALLBACK callback, int userdata);
+DLL_API signed char        F_API FSOUND_Stream_SetSyncCallback(FSOUND_STREAM *stream, FSOUND_STREAMCALLBACK callback, int userdata);
+
+DLL_API FSOUND_SYNCPOINT * F_API FSOUND_Stream_AddSyncPoint(FSOUND_STREAM *stream, unsigned int pcmoffset, const char *name);
+DLL_API signed char        F_API FSOUND_Stream_DeleteSyncPoint(FSOUND_SYNCPOINT *point);
+DLL_API int                F_API FSOUND_Stream_GetNumSyncPoints(FSOUND_STREAM *stream);
+DLL_API FSOUND_SYNCPOINT * F_API FSOUND_Stream_GetSyncPoint(FSOUND_STREAM *stream, int index);
+DLL_API char *             F_API FSOUND_Stream_GetSyncPointInfo(FSOUND_SYNCPOINT *point, unsigned int *pcmoffset);
+
+DLL_API signed char        F_API FSOUND_Stream_SetSubStream(FSOUND_STREAM *stream, int index);     /* For FMOD .FSB bank files. */
+DLL_API int                F_API FSOUND_Stream_GetNumSubStreams(FSOUND_STREAM *stream);            /* For FMOD .FSB bank files. */
+DLL_API signed char        F_API FSOUND_Stream_SetSubStreamSentence(FSOUND_STREAM *stream, const int *sentencelist, int numitems);
+
+DLL_API signed char        F_API FSOUND_Stream_GetNumTagFields(FSOUND_STREAM *stream, int *num);
+DLL_API signed char        F_API FSOUND_Stream_GetTagField(FSOUND_STREAM *stream, int num, int *type, char **name, void **value, int *length);
+DLL_API signed char        F_API FSOUND_Stream_FindTagField(FSOUND_STREAM *stream, int type, const char *name, void **value, int *length);
+
+/*
+    Internet streaming functions
+*/
+
+DLL_API signed char        F_API FSOUND_Stream_Net_SetProxy(const char *proxy);
+DLL_API char *             F_API FSOUND_Stream_Net_GetLastServerStatus();
+DLL_API signed char        F_API FSOUND_Stream_Net_SetBufferProperties(int buffersize, int prebuffer_percent, int rebuffer_percent);
+DLL_API signed char        F_API FSOUND_Stream_Net_GetBufferProperties(int *buffersize, int *prebuffer_percent, int *rebuffer_percent);
+DLL_API signed char        F_API FSOUND_Stream_Net_SetMetadataCallback(FSOUND_STREAM *stream, FSOUND_METADATACALLBACK callback, int userdata);
+DLL_API signed char        F_API FSOUND_Stream_Net_GetStatus(FSOUND_STREAM *stream, int *status, int *bufferpercentused, int *bitrate, unsigned int *flags);
+
+/* =================== */
+/* CD audio functions. */
+/* =================== */
+
+/*
+    Note : 0 = default cdrom.  Otherwise specify the drive letter, for example. 'D'. 
+*/
+
+DLL_API signed char     F_API FSOUND_CD_Play(char drive, int track);
+DLL_API void            F_API FSOUND_CD_SetPlayMode(char drive, signed char mode);
+DLL_API signed char     F_API FSOUND_CD_Stop(char drive);
+DLL_API signed char     F_API FSOUND_CD_SetPaused(char drive, signed char paused);
+DLL_API signed char     F_API FSOUND_CD_SetVolume(char drive, int volume);
+DLL_API signed char     F_API FSOUND_CD_SetTrackTime(char drive, unsigned int ms);
+DLL_API signed char     F_API FSOUND_CD_Eject(char drive);
+
+DLL_API signed char     F_API FSOUND_CD_GetPaused(char drive);
+DLL_API int             F_API FSOUND_CD_GetTrack(char drive);
+DLL_API int             F_API FSOUND_CD_GetNumTracks(char drive);
+DLL_API int             F_API FSOUND_CD_GetVolume(char drive);
+DLL_API int             F_API FSOUND_CD_GetTrackLength(char drive, int track); 
+DLL_API int             F_API FSOUND_CD_GetTrackTime(char drive);
+
+/* ============== */
+/* DSP functions. */
+/* ============== */
+
+/* 
+    DSP Unit control and information functions. 
+    These functions allow you access to the mixed stream that FMOD uses to play back sound on.
+*/
+
+DLL_API FSOUND_DSPUNIT *F_API FSOUND_DSP_Create(FSOUND_DSPCALLBACK callback, int priority, int param);
+DLL_API void            F_API FSOUND_DSP_Free(FSOUND_DSPUNIT *unit);
+DLL_API void            F_API FSOUND_DSP_SetPriority(FSOUND_DSPUNIT *unit, int priority);
+DLL_API int             F_API FSOUND_DSP_GetPriority(FSOUND_DSPUNIT *unit);
+DLL_API void            F_API FSOUND_DSP_SetActive(FSOUND_DSPUNIT *unit, signed char active);
+DLL_API signed char     F_API FSOUND_DSP_GetActive(FSOUND_DSPUNIT *unit);
+
+/* 
+    Functions to get hold of FSOUND 'system DSP unit' handles. 
+*/
+
+DLL_API FSOUND_DSPUNIT *F_API FSOUND_DSP_GetClearUnit();
+DLL_API FSOUND_DSPUNIT *F_API FSOUND_DSP_GetSFXUnit();
+DLL_API FSOUND_DSPUNIT *F_API FSOUND_DSP_GetMusicUnit();
+DLL_API FSOUND_DSPUNIT *F_API FSOUND_DSP_GetFFTUnit();
+DLL_API FSOUND_DSPUNIT *F_API FSOUND_DSP_GetClipAndCopyUnit();
+
+/* 
+    Miscellaneous DSP functions 
+    Note for the spectrum analysis function to work, you have to enable the FFT DSP unit with 
+    the following code FSOUND_DSP_SetActive(FSOUND_DSP_GetFFTUnit(), TRUE);
+    It is off by default to save cpu usage.
+*/
+
+DLL_API signed char     F_API FSOUND_DSP_MixBuffers(void *destbuffer, void *srcbuffer, int len, int freq, int vol, int pan, unsigned int mode);
+DLL_API void            F_API FSOUND_DSP_ClearMixBuffer();
+DLL_API int             F_API FSOUND_DSP_GetBufferLength();      /* Length of each DSP update */
+DLL_API int             F_API FSOUND_DSP_GetBufferLengthTotal(); /* Total buffer length due to FSOUND_SetBufferSize */
+DLL_API float *         F_API FSOUND_DSP_GetSpectrum();          /* Array of 512 floats - call FSOUND_DSP_SetActive(FSOUND_DSP_GetFFTUnit(), TRUE)) for this to work. */
+
+/* =================================================================================== */
+/* Reverb functions. (eax2/eax3 reverb)  (ONLY SUPPORTED ON WIN32 W/ FSOUND_HW3D FLAG) */
+/* =================================================================================== */
+
+/*
+    See top of file for definitions and information on the reverb parameters.
+*/
+
+DLL_API signed char     F_API FSOUND_Reverb_SetProperties(const FSOUND_REVERB_PROPERTIES *prop);
+DLL_API signed char     F_API FSOUND_Reverb_GetProperties(FSOUND_REVERB_PROPERTIES *prop);
+DLL_API signed char     F_API FSOUND_Reverb_SetChannelProperties(int channel, const FSOUND_REVERB_CHANNELPROPERTIES *prop);
+DLL_API signed char     F_API FSOUND_Reverb_GetChannelProperties(int channel, FSOUND_REVERB_CHANNELPROPERTIES *prop);
+
+/* ===================================================== */
+/* Recording functions  (ONLY SUPPORTED IN WIN32, WINCE) */
+/* ===================================================== */
+
+/*
+    Recording initialization functions
+*/
+
+DLL_API signed char     F_API FSOUND_Record_SetDriver(int outputtype);
+DLL_API int             F_API FSOUND_Record_GetNumDrivers();
+DLL_API const char *    F_API FSOUND_Record_GetDriverName(int id);
+DLL_API int             F_API FSOUND_Record_GetDriver();
+
+/*
+    Recording functionality.  Only one recording session will work at a time.
+*/
+
+DLL_API signed char     F_API FSOUND_Record_StartSample(FSOUND_SAMPLE *sptr, signed char loop);
+DLL_API signed char     F_API FSOUND_Record_Stop();
+DLL_API int             F_API FSOUND_Record_GetPosition();  
+
+/* ========================================================================================== */
+/* FMUSIC API (MOD,S3M,XM,IT,MIDI PLAYBACK)                                                   */
+/* ========================================================================================== */
+
+/* 
+    Song management / playback functions.
+*/
+
+DLL_API FMUSIC_MODULE * F_API FMUSIC_LoadSong(const char *name);
+DLL_API FMUSIC_MODULE * F_API FMUSIC_LoadSongEx(const char *name_or_data, int offset, int length, unsigned int mode, const int *samplelist, int samplelistnum);
+DLL_API int             F_API FMUSIC_GetOpenState(FMUSIC_MODULE *mod);
+DLL_API signed char     F_API FMUSIC_FreeSong(FMUSIC_MODULE *mod);
+DLL_API signed char     F_API FMUSIC_PlaySong(FMUSIC_MODULE *mod);
+DLL_API signed char     F_API FMUSIC_StopSong(FMUSIC_MODULE *mod);
+DLL_API void            F_API FMUSIC_StopAllSongs();
+
+DLL_API signed char     F_API FMUSIC_SetZxxCallback(FMUSIC_MODULE *mod, FMUSIC_CALLBACK callback);
+DLL_API signed char     F_API FMUSIC_SetRowCallback(FMUSIC_MODULE *mod, FMUSIC_CALLBACK callback, int rowstep);
+DLL_API signed char     F_API FMUSIC_SetOrderCallback(FMUSIC_MODULE *mod, FMUSIC_CALLBACK callback, int orderstep);
+DLL_API signed char     F_API FMUSIC_SetInstCallback(FMUSIC_MODULE *mod, FMUSIC_CALLBACK callback, int instrument);
+
+DLL_API signed char     F_API FMUSIC_SetSample(FMUSIC_MODULE *mod, int sampno, FSOUND_SAMPLE *sptr);
+DLL_API signed char     F_API FMUSIC_SetUserData(FMUSIC_MODULE *mod, unsigned int userdata);
+DLL_API signed char     F_API FMUSIC_OptimizeChannels(FMUSIC_MODULE *mod, int maxchannels, int minvolume);
+
+/*
+    Runtime song functions. 
+*/
+
+DLL_API signed char     F_API FMUSIC_SetReverb(signed char reverb);             /* MIDI only */
+DLL_API signed char     F_API FMUSIC_SetLooping(FMUSIC_MODULE *mod, signed char looping);
+DLL_API signed char     F_API FMUSIC_SetOrder(FMUSIC_MODULE *mod, int order);
+DLL_API signed char     F_API FMUSIC_SetPaused(FMUSIC_MODULE *mod, signed char pause);
+DLL_API signed char     F_API FMUSIC_SetMasterVolume(FMUSIC_MODULE *mod, int volume);
+DLL_API signed char     F_API FMUSIC_SetMasterSpeed(FMUSIC_MODULE *mode, float speed);
+DLL_API signed char     F_API FMUSIC_SetPanSeperation(FMUSIC_MODULE *mod, float pansep);
+ 
+/* 
+    Static song information functions.
+*/
+
+DLL_API const char *    F_API FMUSIC_GetName(FMUSIC_MODULE *mod);
+DLL_API int             F_API FMUSIC_GetType(FMUSIC_MODULE *mod);
+DLL_API int             F_API FMUSIC_GetNumOrders(FMUSIC_MODULE *mod);
+DLL_API int             F_API FMUSIC_GetNumPatterns(FMUSIC_MODULE *mod);
+DLL_API int             F_API FMUSIC_GetNumInstruments(FMUSIC_MODULE *mod);
+DLL_API int             F_API FMUSIC_GetNumSamples(FMUSIC_MODULE *mod);
+DLL_API int             F_API FMUSIC_GetNumChannels(FMUSIC_MODULE *mod);
+DLL_API FSOUND_SAMPLE * F_API FMUSIC_GetSample(FMUSIC_MODULE *mod, int sampno);
+DLL_API int             F_API FMUSIC_GetPatternLength(FMUSIC_MODULE *mod, int orderno);
+ 
+/* 
+    Runtime song information.
+*/
+
+DLL_API signed char     F_API FMUSIC_IsFinished(FMUSIC_MODULE *mod);
+DLL_API signed char     F_API FMUSIC_IsPlaying(FMUSIC_MODULE *mod);
+DLL_API int             F_API FMUSIC_GetMasterVolume(FMUSIC_MODULE *mod);
+DLL_API int             F_API FMUSIC_GetGlobalVolume(FMUSIC_MODULE *mod);
+DLL_API int             F_API FMUSIC_GetOrder(FMUSIC_MODULE *mod);
+DLL_API int             F_API FMUSIC_GetPattern(FMUSIC_MODULE *mod);
+DLL_API int             F_API FMUSIC_GetSpeed(FMUSIC_MODULE *mod);
+DLL_API int             F_API FMUSIC_GetBPM(FMUSIC_MODULE *mod);
+DLL_API int             F_API FMUSIC_GetRow(FMUSIC_MODULE *mod);
+DLL_API signed char     F_API FMUSIC_GetPaused(FMUSIC_MODULE *mod);
+DLL_API int             F_API FMUSIC_GetTime(FMUSIC_MODULE *mod);
+DLL_API int             F_API FMUSIC_GetRealChannel(FMUSIC_MODULE *mod, int modchannel);
+DLL_API unsigned int    F_API FMUSIC_GetUserData(FMUSIC_MODULE *mod);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/main/source/fmod/inc/fmod_errors.h b/main/source/fmod/inc/fmod_errors.h
new file mode 100644
index 00000000..b28b9c4f
--- /dev/null
+++ b/main/source/fmod/inc/fmod_errors.h
@@ -0,0 +1,32 @@
+#ifndef _FMOD_ERRORS_H
+#define _FMOD_ERRORS_H
+
+static char *FMOD_ErrorString(int errcode)
+{
+	switch (errcode)
+	{
+		case FMOD_ERR_NONE:				return "No errors";
+		case FMOD_ERR_BUSY:				return "Cannot call this command after FSOUND_Init.  Call FSOUND_Close first.";
+		case FMOD_ERR_UNINITIALIZED:	return "This command failed because FSOUND_Init was not called";
+		case FMOD_ERR_PLAY:				return "Playing the sound failed.";
+		case FMOD_ERR_INIT:				return "Error initializing output device.";
+		case FMOD_ERR_ALLOCATED:		return "The output device is already in use and cannot be reused.";
+		case FMOD_ERR_OUTPUT_FORMAT:	return "Soundcard does not support the features needed for this soundsystem (16bit stereo output)";
+		case FMOD_ERR_COOPERATIVELEVEL:	return "Error setting cooperative level for hardware.";
+		case FMOD_ERR_CREATEBUFFER:		return "Error creating hardware sound buffer.";
+		case FMOD_ERR_FILE_NOTFOUND:	return "File not found";
+		case FMOD_ERR_FILE_FORMAT:		return "Unknown file format";
+		case FMOD_ERR_FILE_BAD:			return "Error loading file";
+		case FMOD_ERR_MEMORY:			return "Not enough memory ";
+		case FMOD_ERR_VERSION:			return "The version number of this file format is not supported";
+		case FMOD_ERR_INVALID_PARAM:	return "An invalid parameter was passed to this function";
+		case FMOD_ERR_NO_EAX:			return "Tried to use an EAX command on a non EAX enabled channel or output.";
+		case FMOD_ERR_CHANNEL_ALLOC:	return "Failed to allocate a new channel";
+		case FMOD_ERR_RECORD:			return "Recording not supported on this device";
+		case FMOD_ERR_MEDIAPLAYER:		return "Required Mediaplayer codec is not installed";
+
+		default :						return "Unknown error";
+	};
+}
+
+#endif
diff --git a/main/source/fmod/inc/fmoddyn.h b/main/source/fmod/inc/fmoddyn.h
new file mode 100644
index 00000000..0ce5f68d
--- /dev/null
+++ b/main/source/fmod/inc/fmoddyn.h
@@ -0,0 +1,527 @@
+/* ========================================================================================== */
+/* FMOD Dynamic DLL loading header. Copyright (c), Firelight Technologies Pty, Ltd 1999-2003. */
+/* ========================================================================================== */
+
+#ifndef _FMODDYN_H_
+#define _FMODDYN_H_
+
+#ifdef WIN32
+  #include <windows.h>
+#else
+  #include <dlfcn.h>
+  #include <string.h>
+#endif
+#include <stdlib.h>
+
+#include "fmod.h"
+
+typedef struct
+{
+    void *module;
+
+    signed char       (F_API *FSOUND_SetOutput)(int outputtype);
+    signed char       (F_API *FSOUND_SetDriver)(int driver);
+    signed char       (F_API *FSOUND_SetMixer)(int mixer);
+    signed char       (F_API *FSOUND_SetBufferSize)(int len_ms);
+    signed char       (F_API *FSOUND_SetHWND)(void *hwnd);
+    signed char       (F_API *FSOUND_SetMinHardwareChannels)(int min);
+    signed char       (F_API *FSOUND_SetMaxHardwareChannels)(int max);
+    signed char       (F_API *FSOUND_SetMemorySystem)(void *pool, int poollen, FSOUND_ALLOCCALLBACK useralloc, FSOUND_REALLOCCALLBACK userrealloc, FSOUND_FREECALLBACK userfree);
+    signed char       (F_API *FSOUND_Init)(int mixrate, int maxsoftwarechannels, unsigned int flags);
+    void              (F_API *FSOUND_Close)();
+    void              (F_API *FSOUND_SetSpeakerMode)(unsigned int speakermode);
+    void              (F_API *FSOUND_SetSFXMasterVolume)(int volume);
+    void              (F_API *FSOUND_SetPanSeperation)(float pansep);
+    void              (F_API *FSOUND_File_SetCallbacks)(FSOUND_OPENCALLBACK  useropen, FSOUND_CLOSECALLBACK userclose, FSOUND_READCALLBACK userread, FSOUND_SEEKCALLBACK  userseek, FSOUND_TELLCALLBACK  usertell);
+    int               (F_API *FSOUND_GetError)();
+    float             (F_API *FSOUND_GetVersion)();
+    int               (F_API *FSOUND_GetOutput)();
+    void *            (F_API *FSOUND_GetOutputHandle)();
+    int               (F_API *FSOUND_GetDriver)();
+    int               (F_API *FSOUND_GetMixer)();
+    int               (F_API *FSOUND_GetNumDrivers)();
+    signed char *     (F_API *FSOUND_GetDriverName)(int id);
+    signed char       (F_API *FSOUND_GetDriverCaps)(int id, unsigned int *caps);
+    int               (F_API *FSOUND_GetOutputRate)();
+    int               (F_API *FSOUND_GetMaxChannels)();
+    int               (F_API *FSOUND_GetMaxSamples)();
+    int               (F_API *FSOUND_GetSFXMasterVolume)();
+    int               (F_API *FSOUND_GetNumHardwareChannels)();
+    int               (F_API *FSOUND_GetChannelsPlaying)();
+    float             (F_API *FSOUND_GetCPUUsage)();
+    void              (F_API *FSOUND_GetMemoryStats)(unsigned int *currentalloced, unsigned int *maxalloced);
+    FSOUND_SAMPLE *   (F_API *FSOUND_Sample_Load)(int index, const char *name_or_data, unsigned int mode, int offset, int length);
+    FSOUND_SAMPLE *   (F_API *FSOUND_Sample_Alloc)(int index, int length, unsigned int mode, int deffreq, int defvol, int defpan, int defpri);
+    void              (F_API *FSOUND_Sample_Free)(FSOUND_SAMPLE *sptr);
+    signed char       (F_API *FSOUND_Sample_Upload)(FSOUND_SAMPLE *sptr, void *srcdata, unsigned int mode);
+    signed char       (F_API *FSOUND_Sample_Lock)(FSOUND_SAMPLE *sptr, int offset, int length, void **ptr1, void **ptr2, unsigned int *len1, unsigned int *len2);
+    signed char       (F_API *FSOUND_Sample_Unlock)(FSOUND_SAMPLE *sptr, void *ptr1, void *ptr2, unsigned int len1, unsigned int len2);
+    signed char       (F_API *FSOUND_Sample_SetMode)(FSOUND_SAMPLE *sptr, unsigned int mode);
+    signed char       (F_API *FSOUND_Sample_SetLoopPoints)(FSOUND_SAMPLE *sptr, int loopstart, int loopend);
+    signed char       (F_API *FSOUND_Sample_SetDefaults)(FSOUND_SAMPLE *sptr, int deffreq, int defvol, int defpan, int defpri);
+    signed char       (F_API *FSOUND_Sample_SetMinMaxDistance)(FSOUND_SAMPLE *sptr, float min, float max);
+    signed char       (F_API *FSOUND_Sample_SetMaxPlaybacks)(FSOUND_SAMPLE *sptr, int max);
+    FSOUND_SAMPLE *   (F_API *FSOUND_Sample_Get)(int sampno);
+    char *            (F_API *FSOUND_Sample_GetName)(FSOUND_SAMPLE *sptr);
+    unsigned int      (F_API *FSOUND_Sample_GetLength)(FSOUND_SAMPLE *sptr);
+    signed char       (F_API *FSOUND_Sample_GetLoopPoints)(FSOUND_SAMPLE *sptr, int *loopstart, int *loopend);
+    signed char       (F_API *FSOUND_Sample_GetDefaults)(FSOUND_SAMPLE *sptr, int *deffreq, int *defvol, int *defpan, int *defpri);
+    unsigned int      (F_API *FSOUND_Sample_GetMode)(FSOUND_SAMPLE *sptr);
+    int               (F_API *FSOUND_PlaySound)(int channel, FSOUND_SAMPLE *sptr);
+    int               (F_API *FSOUND_PlaySoundEx)(int channel, FSOUND_SAMPLE *sptr, FSOUND_DSPUNIT *dsp, signed char startpaused);
+    signed char       (F_API *FSOUND_StopSound)(int channel);
+    signed char       (F_API *FSOUND_SetFrequency)(int channel, int freq);
+    signed char       (F_API *FSOUND_SetVolume)(int channel, int vol);
+    signed char       (F_API *FSOUND_SetVolumeAbsolute)(int channel, int vol);
+    signed char       (F_API *FSOUND_SetPan)(int channel, int pan);
+    signed char       (F_API *FSOUND_SetSurround)(int channel, signed char surround);
+    signed char       (F_API *FSOUND_SetMute)(int channel, signed char mute);
+    signed char       (F_API *FSOUND_SetPriority)(int channel, int priority);
+    signed char       (F_API *FSOUND_SetReserved)(int channel, signed char reserved);
+    signed char       (F_API *FSOUND_SetPaused)(int channel, signed char paused);
+    signed char       (F_API *FSOUND_SetLoopMode)(int channel, unsigned int loopmode);
+    signed char       (F_API *FSOUND_SetCurrentPosition)(int channel, unsigned int offset);
+    signed char       (F_API *FSOUND_IsPlaying)(int channel);
+    int               (F_API *FSOUND_GetFrequency)(int channel);
+    int               (F_API *FSOUND_GetVolume)(int channel);
+    int               (F_API *FSOUND_GetPan)(int channel);
+    signed char       (F_API *FSOUND_GetSurround)(int channel);
+    signed char       (F_API *FSOUND_GetMute)(int channel);
+    int               (F_API *FSOUND_GetPriority)(int channel);
+    signed char       (F_API *FSOUND_GetReserved)(int channel);
+    signed char       (F_API *FSOUND_GetPaused)(int channel);
+    unsigned int      (F_API *FSOUND_GetLoopMode)(int channel);
+    unsigned int      (F_API *FSOUND_GetCurrentPosition)(int channel);
+    FSOUND_SAMPLE *   (F_API *FSOUND_GetCurrentSample)(int channel);
+    signed char       (F_API *FSOUND_GetCurrentLevels)(int channel, float *l, float *r);
+    int               (F_API *FSOUND_FX_Enable)(int channel, unsigned int fx);    /* See FSOUND_FX_MODES */
+    signed char       (F_API *FSOUND_FX_Disable)(int channel);    
+    signed char       (F_API *FSOUND_FX_SetChorus)(int fxid, float WetDryMix, float Depth, float Feedback, float Frequency, int Waveform, float Delay, int Phase);
+    signed char       (F_API *FSOUND_FX_SetCompressor)(int fxid, float Gain, float Attack, float Release, float Threshold, float Ratio, float Predelay);
+    signed char       (F_API *FSOUND_FX_SetDistortion)(int fxid, float Gain, float Edge, float PostEQCenterFrequency, float PostEQBandwidth, float PreLowpassCutoff);
+    signed char       (F_API *FSOUND_FX_SetEcho)(int fxid, float WetDryMix, float Feedback, float LeftDelay, float RightDelay, int PanDelay);
+    signed char       (F_API *FSOUND_FX_SetFlanger)(int fxid, float WetDryMix, float Depth, float Feedback, float Frequency, int Waveform, float Delay, int Phase);
+    signed char       (F_API *FSOUND_FX_SetGargle)(int fxid, int RateHz, int WaveShape);
+    signed char       (F_API *FSOUND_FX_SetI3DL2Reverb)(int fxid, int Room, int RoomHF, float RoomRolloffFactor, float DecayTime, float DecayHFRatio, int Reflections, float ReflectionsDelay, int Reverb, float ReverbDelay, float Diffusion, float Density, float HFReference);
+    signed char       (F_API *FSOUND_FX_SetParamEQ)(int fxid, float Center, float Bandwidth, float Gain);
+    signed char       (F_API *FSOUND_FX_SetWavesReverb)(int fxid, float InGain, float ReverbMix, float ReverbTime, float HighFreqRTRatio);  
+    void              (F_API *FSOUND_Update)();   /* you must call this once a frame */
+    void              (F_API *FSOUND_3D_SetDopplerFactor)(float scale);
+    void              (F_API *FSOUND_3D_SetDistanceFactor)(float scale);
+    void              (F_API *FSOUND_3D_SetRolloffFactor)(float scale);
+    signed char       (F_API *FSOUND_3D_SetAttributes)(int channel, float *pos, float *vel);
+    signed char       (F_API *FSOUND_3D_GetAttributes)(int channel, float *pos, float *vel);
+    void              (F_API *FSOUND_3D_Listener_SetCurrent)(int current, int numlisteners);  /* use this if you use multiple listeners / splitscreen */
+    void              (F_API *FSOUND_3D_Listener_SetAttributes)(float *pos, float *vel, float fx, float fy, float fz, float tx, float ty, float tz);
+    void              (F_API *FSOUND_3D_Listener_GetAttributes)(float *pos, float *vel, float *fx, float *fy, float *fz, float *tx, float *ty, float *tz);
+    signed char       (F_API *FSOUND_Stream_SetBufferSize)(int ms);      /* call this before opening streams, not after */
+    FSOUND_STREAM *   (F_API *FSOUND_Stream_Open)(const char *name_or_data, unsigned int mode, int offset, int length);
+    FSOUND_STREAM *   (F_API *FSOUND_Stream_Create)(FSOUND_STREAMCALLBACK callback, int length, unsigned int mode, int samplerate, int userdata);
+    signed char       (F_API *FSOUND_Stream_Close)(FSOUND_STREAM *stream);
+    int               (F_API *FSOUND_Stream_Play)(int channel, FSOUND_STREAM *stream);
+    int               (F_API *FSOUND_Stream_PlayEx)(int channel, FSOUND_STREAM *stream, FSOUND_DSPUNIT *dsp, signed char startpaused);
+    signed char       (F_API *FSOUND_Stream_Stop)(FSOUND_STREAM *stream);
+    signed char       (F_API *FSOUND_Stream_SetPosition)(FSOUND_STREAM *stream, unsigned int position);
+    unsigned int      (F_API *FSOUND_Stream_GetPosition)(FSOUND_STREAM *stream);
+    signed char       (F_API *FSOUND_Stream_SetTime)(FSOUND_STREAM *stream, int ms);
+    int               (F_API *FSOUND_Stream_GetTime)(FSOUND_STREAM *stream);
+    int               (F_API *FSOUND_Stream_GetLength)(FSOUND_STREAM *stream);
+    int               (F_API *FSOUND_Stream_GetLengthMs)(FSOUND_STREAM *stream);
+    signed char       (F_API *FSOUND_Stream_SetMode)(FSOUND_STREAM *stream, unsigned int mode);
+    unsigned int      (F_API *FSOUND_Stream_GetMode)(FSOUND_STREAM *stream);
+    signed char       (F_API *FSOUND_Stream_SetLoopPoints)(FSOUND_STREAM *stream, unsigned int loopstartpcm, unsigned int loopendpcm);
+    signed char       (F_API *FSOUND_Stream_SetLoopCount)(FSOUND_STREAM *stream, int count);
+    int               (F_API *FSOUND_Stream_GetOpenState)(FSOUND_STREAM *stream);
+    FSOUND_SAMPLE *   (F_API *FSOUND_Stream_GetSample)(FSOUND_STREAM *stream);   /* every stream contains a sample to playback on */
+    FSOUND_DSPUNIT *  (F_API *FSOUND_Stream_CreateDSP)(FSOUND_STREAM *stream, FSOUND_DSPCALLBACK callback, int priority, int param);
+    signed char       (F_API *FSOUND_Stream_SetEndCallback)(FSOUND_STREAM *stream, FSOUND_STREAMCALLBACK callback, int userdata);
+    signed char       (F_API *FSOUND_Stream_SetSyncCallback)(FSOUND_STREAM *stream, FSOUND_STREAMCALLBACK callback, int userdata);
+    FSOUND_SYNCPOINT *(F_API *FSOUND_Stream_AddSyncPoint)(FSOUND_STREAM *stream, unsigned int pcmoffset, int userdata);
+    signed char       (F_API *FSOUND_Stream_DeleteSyncPoint)(FSOUND_SYNCPOINT *point);
+    int               (F_API *FSOUND_Stream_GetNumSyncPoints)(FSOUND_STREAM *stream);
+    FSOUND_SYNCPOINT *(F_API *FSOUND_Stream_GetSyncPoint)(FSOUND_STREAM *stream, int index);
+    char *            (F_API *FSOUND_Stream_GetSyncPointInfo)(FSOUND_SYNCPOINT *point, unsigned int *pcmoffset);
+    signed char       (F_API *FSOUND_Stream_SetSubStream)(FSOUND_STREAM *stream, int index);
+    int               (F_API *FSOUND_Stream_GetNumSubStreams)(FSOUND_STREAM *stream);
+    signed char       (F_API *FSOUND_Stream_SetSubStreamSentence)(FSOUND_STREAM *stream, int *sentencelist, int numitems);
+    signed char       (F_API *FSOUND_Stream_GetNumTagFields)(FSOUND_STREAM *stream, int *num);
+    signed char       (F_API *FSOUND_Stream_GetTagField)(FSOUND_STREAM *stream, int num, int *type, char **name, void **value, int *length);
+    signed char       (F_API *FSOUND_Stream_FindTagField)(FSOUND_STREAM *stream, int type, const char *name, void **value, int *length);
+    signed char       (F_API *FSOUND_Stream_Net_SetProxy)(const char *proxy);
+    char *            (F_API *FSOUND_Stream_Net_GetLastServerStatus)();
+    signed char       (F_API *FSOUND_Stream_Net_SetBufferProperties)(int buffersize, int prebuffer_percent, int rebuffer_percent);
+    signed char       (F_API *FSOUND_Stream_Net_GetBufferProperties)(int *buffersize, int *prebuffer_percent, int *rebuffer_percent);
+    signed char       (F_API *FSOUND_Stream_Net_SetMetadataCallback)(FSOUND_STREAM *stream, FSOUND_METADATACALLBACK callback, int userdata);
+    signed char       (F_API *FSOUND_Stream_Net_GetStatus)(FSOUND_STREAM *stream, int *status, int *bufferpercentused, int *bitrate, unsigned int *flags);
+    signed char       (F_API *FSOUND_CD_Play)(char drive, int track);
+    void              (F_API *FSOUND_CD_SetPlayMode)(char drive, signed char mode);
+    signed char       (F_API *FSOUND_CD_Stop)(char drive);
+    signed char       (F_API *FSOUND_CD_SetPaused)(char drive, signed char paused);
+    signed char       (F_API *FSOUND_CD_SetVolume)(char drive, int volume);
+    signed char       (F_API *FSOUND_CD_SetTrackTime)(char drive, unsigned int ms);
+    signed char       (F_API *FSOUND_CD_Eject)(char drive);
+    signed char       (F_API *FSOUND_CD_GetPaused)(char drive);
+    int               (F_API *FSOUND_CD_GetTrack)(char drive);
+    int               (F_API *FSOUND_CD_GetNumTracks)(char drive);
+    int               (F_API *FSOUND_CD_GetVolume)(char drive);
+    int               (F_API *FSOUND_CD_GetTrackLength)(char drive, int track); 
+    int               (F_API *FSOUND_CD_GetTrackTime)(char drive);
+    FSOUND_DSPUNIT *  (F_API *FSOUND_DSP_Create)(FSOUND_DSPCALLBACK callback, int priority, int param);
+    void              (F_API *FSOUND_DSP_Free)(FSOUND_DSPUNIT *unit);
+    void              (F_API *FSOUND_DSP_SetPriority)(FSOUND_DSPUNIT *unit, int priority);
+    int               (F_API *FSOUND_DSP_GetPriority)(FSOUND_DSPUNIT *unit);
+    void              (F_API *FSOUND_DSP_SetActive)(FSOUND_DSPUNIT *unit, signed char active);
+    signed char       (F_API *FSOUND_DSP_GetActive)(FSOUND_DSPUNIT *unit);
+    FSOUND_DSPUNIT *  (F_API *FSOUND_DSP_GetClearUnit)();
+    FSOUND_DSPUNIT *  (F_API *FSOUND_DSP_GetSFXUnit)();
+    FSOUND_DSPUNIT *  (F_API *FSOUND_DSP_GetMusicUnit)();
+    FSOUND_DSPUNIT *  (F_API *FSOUND_DSP_GetFFTUnit)();
+    FSOUND_DSPUNIT *  (F_API *FSOUND_DSP_GetClipAndCopyUnit)();
+    signed char       (F_API *FSOUND_DSP_MixBuffers)(void *destbuffer, void *srcbuffer, int len, int freq, int vol, int pan, unsigned int mode);
+    void              (F_API *FSOUND_DSP_ClearMixBuffer)();
+    int               (F_API *FSOUND_DSP_GetBufferLength)();      /* Length of each DSP update */
+    int               (F_API *FSOUND_DSP_GetBufferLengthTotal)(); /* Total buffer length due to FSOUND_SetBufferSize */
+    float *           (F_API *FSOUND_DSP_GetSpectrum)();          /* Array of 512 floats - call FSOUND_DSP_SetActive(FSOUND_DSP_GetFFTUnit(), TRUE)) for this to work. */
+    signed char       (F_API *FSOUND_Reverb_SetProperties)(FSOUND_REVERB_PROPERTIES *prop);
+    signed char       (F_API *FSOUND_Reverb_GetProperties)(FSOUND_REVERB_PROPERTIES *prop);
+    signed char       (F_API *FSOUND_Reverb_SetChannelProperties)(int channel, FSOUND_REVERB_CHANNELPROPERTIES *prop);
+    signed char       (F_API *FSOUND_Reverb_GetChannelProperties)(int channel, FSOUND_REVERB_CHANNELPROPERTIES *prop);
+    signed char       (F_API *FSOUND_Record_SetDriver)(int outputtype);
+    int               (F_API *FSOUND_Record_GetNumDrivers)();
+    signed char *     (F_API *FSOUND_Record_GetDriverName)(int id);
+    int               (F_API *FSOUND_Record_GetDriver)();
+    signed char       (F_API *FSOUND_Record_StartSample)(FSOUND_SAMPLE *sptr, signed char loop);
+    signed char       (F_API *FSOUND_Record_Stop)();
+    int               (F_API *FSOUND_Record_GetPosition)();  
+    FMUSIC_MODULE *   (F_API *FMUSIC_LoadSong)(const char *name);
+    FMUSIC_MODULE *   (F_API *FMUSIC_LoadSongEx)(const char *name_or_data, int offset, int length, unsigned int mode, int *samplelist, int samplelistnum);
+    int               (F_API *FMUSIC_GetOpenState)(FMUSIC_MODULE *mod);
+    signed char       (F_API *FMUSIC_FreeSong)(FMUSIC_MODULE *mod);
+    signed char       (F_API *FMUSIC_PlaySong)(FMUSIC_MODULE *mod);
+    signed char       (F_API *FMUSIC_StopSong)(FMUSIC_MODULE *mod);
+    void              (F_API *FMUSIC_StopAllSongs)();
+    signed char       (F_API *FMUSIC_SetZxxCallback)(FMUSIC_MODULE *mod, FMUSIC_CALLBACK callback);
+    signed char       (F_API *FMUSIC_SetRowCallback)(FMUSIC_MODULE *mod, FMUSIC_CALLBACK callback, int rowstep);
+    signed char       (F_API *FMUSIC_SetOrderCallback)(FMUSIC_MODULE *mod, FMUSIC_CALLBACK callback, int orderstep);
+    signed char       (F_API *FMUSIC_SetInstCallback)(FMUSIC_MODULE *mod, FMUSIC_CALLBACK callback, int instrument);
+    signed char       (F_API *FMUSIC_SetSample)(FMUSIC_MODULE *mod, int sampno, FSOUND_SAMPLE *sptr);
+    signed char       (F_API *FMUSIC_SetUserData)(FMUSIC_MODULE *mod, unsigned int userdata);
+    signed char       (F_API *FMUSIC_OptimizeChannels)(FMUSIC_MODULE *mod, int maxchannels, int minvolume);
+    signed char       (F_API *FMUSIC_SetReverb)(signed char reverb);             /* MIDI only */
+    signed char       (F_API *FMUSIC_SetLooping)(FMUSIC_MODULE *mod, signed char looping);
+    signed char       (F_API *FMUSIC_SetOrder)(FMUSIC_MODULE *mod, int order);
+    signed char       (F_API *FMUSIC_SetPaused)(FMUSIC_MODULE *mod, signed char pause);
+    signed char       (F_API *FMUSIC_SetMasterVolume)(FMUSIC_MODULE *mod, int volume);
+    signed char       (F_API *FMUSIC_SetMasterSpeed)(FMUSIC_MODULE *mode, float speed);
+    signed char       (F_API *FMUSIC_SetPanSeperation)(FMUSIC_MODULE *mod, float pansep);
+    char *            (F_API *FMUSIC_GetName)(FMUSIC_MODULE *mod);
+    int               (F_API *FMUSIC_GetType)(FMUSIC_MODULE *mod);
+    int               (F_API *FMUSIC_GetNumOrders)(FMUSIC_MODULE *mod);
+    int               (F_API *FMUSIC_GetNumPatterns)(FMUSIC_MODULE *mod);
+    int               (F_API *FMUSIC_GetNumInstruments)(FMUSIC_MODULE *mod);
+    int               (F_API *FMUSIC_GetNumSamples)(FMUSIC_MODULE *mod);
+    int               (F_API *FMUSIC_GetNumChannels)(FMUSIC_MODULE *mod);
+    FSOUND_SAMPLE *   (F_API *FMUSIC_GetSample)(FMUSIC_MODULE *mod, int sampno);
+    int               (F_API *FMUSIC_GetPatternLength)(FMUSIC_MODULE *mod, int orderno);
+    signed char       (F_API *FMUSIC_IsFinished)(FMUSIC_MODULE *mod);
+    signed char       (F_API *FMUSIC_IsPlaying)(FMUSIC_MODULE *mod);
+    int               (F_API *FMUSIC_GetMasterVolume)(FMUSIC_MODULE *mod);
+    int               (F_API *FMUSIC_GetGlobalVolume)(FMUSIC_MODULE *mod);
+    int               (F_API *FMUSIC_GetOrder)(FMUSIC_MODULE *mod);
+    int               (F_API *FMUSIC_GetPattern)(FMUSIC_MODULE *mod);
+    int               (F_API *FMUSIC_GetSpeed)(FMUSIC_MODULE *mod);
+    int               (F_API *FMUSIC_GetBPM)(FMUSIC_MODULE *mod);
+    int               (F_API *FMUSIC_GetRow)(FMUSIC_MODULE *mod);
+    signed char       (F_API *FMUSIC_GetPaused)(FMUSIC_MODULE *mod);
+    int               (F_API *FMUSIC_GetTime)(FMUSIC_MODULE *mod);
+    int               (F_API *FMUSIC_GetRealChannel)(FMUSIC_MODULE *mod, int modchannel);
+    unsigned int      (F_API *FMUSIC_GetUserData)(FMUSIC_MODULE *mod);
+} FMOD_INSTANCE;
+
+
+static FMOD_INSTANCE *FMOD_CreateInstance(char *dllName)
+{
+    FMOD_INSTANCE *instance;
+
+    instance = (FMOD_INSTANCE *)calloc(sizeof(FMOD_INSTANCE), 1);
+    if (!instance)
+    {
+        return NULL;
+    }
+
+#ifdef WIN32
+    instance->module = LoadLibrary(dllName);
+#else
+    instance->module = dlopen(dllName, RTLD_LAZY);
+#endif
+    if (!instance->module)
+    {
+        free(instance);
+        return NULL;
+    }
+
+#ifdef WIN32
+    #define F_GETPROC(_x, _y)                                                                       \
+    {                                                                                             \
+        *((unsigned int *)&instance->_x) = (unsigned int)GetProcAddress((HMODULE)instance->module, _y);    \
+        if (!instance->_x)                                                                        \
+        {                                                                                         \
+            FreeLibrary((HMODULE)instance->module);                                                        \
+            free(instance);                                                                       \
+            return NULL;                                                                          \
+        }                                                                                         \
+    }
+#else
+    #define F_GETPROC(_x, _y)                                                                       \
+    {                                                                                             \
+        char tmp[] = _y;                                                                          \
+        *(strchr(tmp, '@')) = 0;                                                                  \
+        *((unsigned int *)&instance->_x) = (unsigned int)dlsym(instance->module, &tmp[1]);        \
+        if (!instance->_x)                                                                        \
+        {                                                                                         \
+            dlclose(instance->module);                                                            \
+            free(instance);                                                                       \
+            return NULL;                                                                          \
+        }                                                                                         \
+    }
+#endif
+
+    F_GETPROC(FSOUND_SetOutput, "_FSOUND_SetOutput@4");
+    F_GETPROC(FSOUND_SetDriver, "_FSOUND_SetDriver@4");
+    F_GETPROC(FSOUND_SetMixer, "_FSOUND_SetMixer@4");
+    F_GETPROC(FSOUND_SetBufferSize, "_FSOUND_SetBufferSize@4");
+    F_GETPROC(FSOUND_SetHWND, "_FSOUND_SetHWND@4");
+    F_GETPROC(FSOUND_SetMinHardwareChannels, "_FSOUND_SetMinHardwareChannels@4");
+    F_GETPROC(FSOUND_SetMaxHardwareChannels, "_FSOUND_SetMaxHardwareChannels@4");
+    F_GETPROC(FSOUND_SetMemorySystem, "_FSOUND_SetMemorySystem@20");
+    F_GETPROC(FSOUND_Init, "_FSOUND_Init@12");
+    F_GETPROC(FSOUND_Close, "_FSOUND_Close@0");
+    F_GETPROC(FSOUND_SetSFXMasterVolume, "_FSOUND_SetSFXMasterVolume@4");
+    F_GETPROC(FSOUND_SetPanSeperation, "_FSOUND_SetPanSeperation@4");
+    F_GETPROC(FSOUND_SetSpeakerMode, "_FSOUND_SetSpeakerMode@4");
+    F_GETPROC(FSOUND_GetError, "_FSOUND_GetError@0");
+    F_GETPROC(FSOUND_GetVersion, "_FSOUND_GetVersion@0");
+    F_GETPROC(FSOUND_GetOutput, "_FSOUND_GetOutput@0");
+    F_GETPROC(FSOUND_GetOutputHandle, "_FSOUND_GetOutputHandle@0");
+    F_GETPROC(FSOUND_GetDriver, "_FSOUND_GetDriver@0");
+    F_GETPROC(FSOUND_GetMixer, "_FSOUND_GetMixer@0");
+    F_GETPROC(FSOUND_GetNumDrivers, "_FSOUND_GetNumDrivers@0");
+    F_GETPROC(FSOUND_GetDriverName, "_FSOUND_GetDriverName@4");
+    F_GETPROC(FSOUND_GetDriverCaps, "_FSOUND_GetDriverCaps@8");
+    F_GETPROC(FSOUND_GetOutputRate, "_FSOUND_GetOutputRate@0");
+    F_GETPROC(FSOUND_GetMaxChannels, "_FSOUND_GetMaxChannels@0");
+    F_GETPROC(FSOUND_GetMaxSamples, "_FSOUND_GetMaxSamples@0");
+    F_GETPROC(FSOUND_GetSFXMasterVolume, "_FSOUND_GetSFXMasterVolume@0");
+    F_GETPROC(FSOUND_GetNumHardwareChannels, "_FSOUND_GetNumHardwareChannels@0");
+    F_GETPROC(FSOUND_GetChannelsPlaying, "_FSOUND_GetChannelsPlaying@0");
+    F_GETPROC(FSOUND_GetCPUUsage, "_FSOUND_GetCPUUsage@0");
+    F_GETPROC(FSOUND_GetMemoryStats, "_FSOUND_GetMemoryStats@8");
+    F_GETPROC(FSOUND_Sample_Load, "_FSOUND_Sample_Load@20");
+    F_GETPROC(FSOUND_Sample_Alloc, "_FSOUND_Sample_Alloc@28");
+    F_GETPROC(FSOUND_Sample_Free, "_FSOUND_Sample_Free@4");
+    F_GETPROC(FSOUND_Sample_Upload, "_FSOUND_Sample_Upload@12");
+    F_GETPROC(FSOUND_Sample_Lock, "_FSOUND_Sample_Lock@28");
+    F_GETPROC(FSOUND_Sample_Unlock, "_FSOUND_Sample_Unlock@20");
+    F_GETPROC(FSOUND_Sample_SetMode, "_FSOUND_Sample_SetMode@8");
+    F_GETPROC(FSOUND_Sample_SetLoopPoints, "_FSOUND_Sample_SetLoopPoints@12");
+    F_GETPROC(FSOUND_Sample_SetDefaults, "_FSOUND_Sample_SetDefaults@20");
+    F_GETPROC(FSOUND_Sample_SetMinMaxDistance, "_FSOUND_Sample_SetMinMaxDistance@12");
+    F_GETPROC(FSOUND_Sample_SetMaxPlaybacks, "_FSOUND_Sample_SetMaxPlaybacks@8");
+    F_GETPROC(FSOUND_Sample_Get, "_FSOUND_Sample_Get@4");
+    F_GETPROC(FSOUND_Sample_GetName, "_FSOUND_Sample_GetName@4");
+    F_GETPROC(FSOUND_Sample_GetLength, "_FSOUND_Sample_GetLength@4");
+    F_GETPROC(FSOUND_Sample_GetLoopPoints, "_FSOUND_Sample_GetLoopPoints@12");
+    F_GETPROC(FSOUND_Sample_GetDefaults, "_FSOUND_Sample_GetDefaults@20");
+    F_GETPROC(FSOUND_Sample_GetMode, "_FSOUND_Sample_GetMode@4");
+    F_GETPROC(FSOUND_PlaySound, "_FSOUND_PlaySound@8");
+    F_GETPROC(FSOUND_PlaySoundEx, "_FSOUND_PlaySoundEx@16");
+    F_GETPROC(FSOUND_StopSound, "_FSOUND_StopSound@4");
+    F_GETPROC(FSOUND_SetFrequency, "_FSOUND_SetFrequency@8");
+    F_GETPROC(FSOUND_SetVolume, "_FSOUND_SetVolume@8");
+    F_GETPROC(FSOUND_SetVolumeAbsolute, "_FSOUND_SetVolumeAbsolute@8");
+    F_GETPROC(FSOUND_SetPan, "_FSOUND_SetPan@8");
+    F_GETPROC(FSOUND_SetSurround, "_FSOUND_SetSurround@8");
+    F_GETPROC(FSOUND_SetMute, "_FSOUND_SetMute@8");
+    F_GETPROC(FSOUND_SetPriority, "_FSOUND_SetPriority@8");
+    F_GETPROC(FSOUND_SetReserved, "_FSOUND_SetReserved@8");
+    F_GETPROC(FSOUND_SetPaused, "_FSOUND_SetPaused@8");
+    F_GETPROC(FSOUND_SetLoopMode, "_FSOUND_SetLoopMode@8");
+    F_GETPROC(FSOUND_IsPlaying, "_FSOUND_IsPlaying@4");
+    F_GETPROC(FSOUND_GetFrequency, "_FSOUND_GetFrequency@4");
+    F_GETPROC(FSOUND_GetVolume, "_FSOUND_GetVolume@4");
+    F_GETPROC(FSOUND_GetPan, "_FSOUND_GetPan@4");
+    F_GETPROC(FSOUND_GetSurround, "_FSOUND_GetSurround@4");
+    F_GETPROC(FSOUND_GetMute, "_FSOUND_GetMute@4");
+    F_GETPROC(FSOUND_GetPriority, "_FSOUND_GetPriority@4");
+    F_GETPROC(FSOUND_GetReserved, "_FSOUND_GetReserved@4");
+    F_GETPROC(FSOUND_GetPaused, "_FSOUND_GetPaused@4");
+    F_GETPROC(FSOUND_GetLoopMode, "_FSOUND_GetLoopMode@4");
+    F_GETPROC(FSOUND_GetCurrentPosition, "_FSOUND_GetCurrentPosition@4");
+    F_GETPROC(FSOUND_SetCurrentPosition, "_FSOUND_SetCurrentPosition@8");
+    F_GETPROC(FSOUND_GetCurrentSample, "_FSOUND_GetCurrentSample@4");
+    F_GETPROC(FSOUND_GetCurrentLevels, "_FSOUND_GetCurrentLevels@12");
+    F_GETPROC(FSOUND_FX_Enable, "_FSOUND_FX_Enable@8");
+    F_GETPROC(FSOUND_FX_Disable, "_FSOUND_FX_Disable@4");
+    F_GETPROC(FSOUND_FX_SetChorus, "_FSOUND_FX_SetChorus@32");
+    F_GETPROC(FSOUND_FX_SetCompressor, "_FSOUND_FX_SetCompressor@28");
+    F_GETPROC(FSOUND_FX_SetDistortion, "_FSOUND_FX_SetDistortion@24");
+    F_GETPROC(FSOUND_FX_SetEcho, "_FSOUND_FX_SetEcho@24");
+    F_GETPROC(FSOUND_FX_SetFlanger, "_FSOUND_FX_SetFlanger@32");
+    F_GETPROC(FSOUND_FX_SetGargle, "_FSOUND_FX_SetGargle@12");
+    F_GETPROC(FSOUND_FX_SetI3DL2Reverb, "_FSOUND_FX_SetI3DL2Reverb@52");
+    F_GETPROC(FSOUND_FX_SetParamEQ, "_FSOUND_FX_SetParamEQ@16");
+    F_GETPROC(FSOUND_FX_SetWavesReverb, "_FSOUND_FX_SetWavesReverb@20");
+    F_GETPROC(FSOUND_Update, "_FSOUND_Update@0");
+    F_GETPROC(FSOUND_3D_SetAttributes, "_FSOUND_3D_SetAttributes@12");
+    F_GETPROC(FSOUND_3D_GetAttributes, "_FSOUND_3D_GetAttributes@12");
+    F_GETPROC(FSOUND_3D_Listener_SetCurrent, "_FSOUND_3D_Listener_SetCurrent@8");
+    F_GETPROC(FSOUND_3D_Listener_SetAttributes, "_FSOUND_3D_Listener_SetAttributes@32");
+    F_GETPROC(FSOUND_3D_Listener_GetAttributes, "_FSOUND_3D_Listener_GetAttributes@32");
+    F_GETPROC(FSOUND_3D_SetDopplerFactor, "_FSOUND_3D_SetDopplerFactor@4");
+    F_GETPROC(FSOUND_3D_SetDistanceFactor, "_FSOUND_3D_SetDistanceFactor@4");
+    F_GETPROC(FSOUND_3D_SetRolloffFactor, "_FSOUND_3D_SetRolloffFactor@4");
+    F_GETPROC(FSOUND_Stream_Open, "_FSOUND_Stream_Open@16");
+    F_GETPROC(FSOUND_Stream_Create, "_FSOUND_Stream_Create@20");
+    F_GETPROC(FSOUND_Stream_Play, "_FSOUND_Stream_Play@8");
+    F_GETPROC(FSOUND_Stream_PlayEx, "_FSOUND_Stream_PlayEx@16");
+    F_GETPROC(FSOUND_Stream_Stop, "_FSOUND_Stream_Stop@4");
+    F_GETPROC(FSOUND_Stream_Close, "_FSOUND_Stream_Close@4");
+    F_GETPROC(FSOUND_Stream_SetEndCallback, "_FSOUND_Stream_SetEndCallback@12");
+    F_GETPROC(FSOUND_Stream_SetSyncCallback, "_FSOUND_Stream_SetSyncCallback@12");
+    F_GETPROC(FSOUND_Stream_GetSample, "_FSOUND_Stream_GetSample@4");
+    F_GETPROC(FSOUND_Stream_CreateDSP, "_FSOUND_Stream_CreateDSP@16");
+    F_GETPROC(FSOUND_Stream_SetBufferSize, "_FSOUND_Stream_SetBufferSize@4");
+    F_GETPROC(FSOUND_Stream_SetPosition, "_FSOUND_Stream_SetPosition@8");
+    F_GETPROC(FSOUND_Stream_GetPosition, "_FSOUND_Stream_GetPosition@4");
+    F_GETPROC(FSOUND_Stream_SetTime, "_FSOUND_Stream_SetTime@8");
+    F_GETPROC(FSOUND_Stream_GetTime, "_FSOUND_Stream_GetTime@4");
+    F_GETPROC(FSOUND_Stream_GetLength, "_FSOUND_Stream_GetLength@4");
+    F_GETPROC(FSOUND_Stream_GetLengthMs, "_FSOUND_Stream_GetLengthMs@4");
+    F_GETPROC(FSOUND_Stream_SetMode, "_FSOUND_Stream_SetMode@8");
+    F_GETPROC(FSOUND_Stream_GetMode, "_FSOUND_Stream_GetMode@4");
+    F_GETPROC(FSOUND_Stream_SetSubStream, "_FSOUND_Stream_SetSubStream@8");
+    F_GETPROC(FSOUND_Stream_GetNumSubStreams, "_FSOUND_Stream_GetNumSubStreams@4");
+    F_GETPROC(FSOUND_Stream_SetSubStreamSentence, "_FSOUND_Stream_SetSubStreamSentence@12");
+    F_GETPROC(FSOUND_Stream_SetLoopPoints, "_FSOUND_Stream_SetLoopPoints@12");
+    F_GETPROC(FSOUND_Stream_SetLoopCount, "_FSOUND_Stream_SetLoopCount@8");
+    F_GETPROC(FSOUND_Stream_AddSyncPoint, "_FSOUND_Stream_AddSyncPoint@12");
+    F_GETPROC(FSOUND_Stream_DeleteSyncPoint, "_FSOUND_Stream_DeleteSyncPoint@4");
+    F_GETPROC(FSOUND_Stream_GetNumSyncPoints, "_FSOUND_Stream_GetNumSyncPoints@4");
+    F_GETPROC(FSOUND_Stream_GetSyncPoint, "_FSOUND_Stream_GetSyncPoint@8");
+    F_GETPROC(FSOUND_Stream_GetSyncPointInfo, "_FSOUND_Stream_GetSyncPointInfo@8");
+    F_GETPROC(FSOUND_Stream_GetOpenState, "_FSOUND_Stream_GetOpenState@4");
+    F_GETPROC(FSOUND_Stream_GetNumTagFields, "_FSOUND_Stream_GetNumTagFields@8");
+    F_GETPROC(FSOUND_Stream_GetTagField, "_FSOUND_Stream_GetTagField@24");
+    F_GETPROC(FSOUND_Stream_FindTagField, "_FSOUND_Stream_FindTagField@20");
+    F_GETPROC(FSOUND_Stream_Net_SetProxy, "_FSOUND_Stream_Net_SetProxy@4");
+    F_GETPROC(FSOUND_Stream_Net_GetLastServerStatus, "_FSOUND_Stream_Net_GetLastServerStatus@0");
+    F_GETPROC(FSOUND_Stream_Net_SetBufferProperties, "_FSOUND_Stream_Net_SetBufferProperties@12");
+    F_GETPROC(FSOUND_Stream_Net_GetBufferProperties, "_FSOUND_Stream_Net_GetBufferProperties@12");
+    F_GETPROC(FSOUND_Stream_Net_SetMetadataCallback, "_FSOUND_Stream_Net_SetMetadataCallback@12");
+    F_GETPROC(FSOUND_Stream_Net_GetStatus, "_FSOUND_Stream_Net_GetStatus@20");
+    F_GETPROC(FSOUND_CD_Play, "_FSOUND_CD_Play@8");
+    F_GETPROC(FSOUND_CD_SetPlayMode, "_FSOUND_CD_SetPlayMode@8");
+    F_GETPROC(FSOUND_CD_Stop, "_FSOUND_CD_Stop@4");
+    F_GETPROC(FSOUND_CD_SetPaused, "_FSOUND_CD_SetPaused@8");
+    F_GETPROC(FSOUND_CD_SetVolume, "_FSOUND_CD_SetVolume@8");
+    F_GETPROC(FSOUND_CD_SetTrackTime, "_FSOUND_CD_SetTrackTime@8");
+    F_GETPROC(FSOUND_CD_Eject, "_FSOUND_CD_Eject@4");
+    F_GETPROC(FSOUND_CD_GetPaused, "_FSOUND_CD_GetPaused@4");
+    F_GETPROC(FSOUND_CD_GetTrack, "_FSOUND_CD_GetTrack@4");
+    F_GETPROC(FSOUND_CD_GetNumTracks, "_FSOUND_CD_GetNumTracks@4");
+    F_GETPROC(FSOUND_CD_GetVolume, "_FSOUND_CD_GetVolume@4");
+    F_GETPROC(FSOUND_CD_GetTrackLength, "_FSOUND_CD_GetTrackLength@8");
+    F_GETPROC(FSOUND_CD_GetTrackTime, "_FSOUND_CD_GetTrackTime@4");
+    F_GETPROC(FSOUND_DSP_Create, "_FSOUND_DSP_Create@12");
+    F_GETPROC(FSOUND_DSP_Free, "_FSOUND_DSP_Free@4");
+    F_GETPROC(FSOUND_DSP_SetPriority, "_FSOUND_DSP_SetPriority@8");
+    F_GETPROC(FSOUND_DSP_GetPriority, "_FSOUND_DSP_GetPriority@4");
+    F_GETPROC(FSOUND_DSP_SetActive, "_FSOUND_DSP_SetActive@8");
+    F_GETPROC(FSOUND_DSP_GetActive, "_FSOUND_DSP_GetActive@4");
+    F_GETPROC(FSOUND_DSP_GetClearUnit, "_FSOUND_DSP_GetClearUnit@0");
+    F_GETPROC(FSOUND_DSP_GetSFXUnit, "_FSOUND_DSP_GetSFXUnit@0");
+    F_GETPROC(FSOUND_DSP_GetMusicUnit, "_FSOUND_DSP_GetMusicUnit@0");
+    F_GETPROC(FSOUND_DSP_GetClipAndCopyUnit, "_FSOUND_DSP_GetClipAndCopyUnit@0");
+    F_GETPROC(FSOUND_DSP_GetFFTUnit, "_FSOUND_DSP_GetFFTUnit@0");
+    F_GETPROC(FSOUND_DSP_MixBuffers, "_FSOUND_DSP_MixBuffers@28");
+    F_GETPROC(FSOUND_DSP_ClearMixBuffer, "_FSOUND_DSP_ClearMixBuffer@0");
+    F_GETPROC(FSOUND_DSP_GetBufferLength, "_FSOUND_DSP_GetBufferLength@0");
+    F_GETPROC(FSOUND_DSP_GetBufferLengthTotal, "_FSOUND_DSP_GetBufferLengthTotal@0");
+    F_GETPROC(FSOUND_DSP_GetSpectrum, "_FSOUND_DSP_GetSpectrum@0");
+    F_GETPROC(FSOUND_Reverb_SetProperties, "_FSOUND_Reverb_SetProperties@4");
+    F_GETPROC(FSOUND_Reverb_GetProperties, "_FSOUND_Reverb_GetProperties@4");
+    F_GETPROC(FSOUND_Reverb_SetChannelProperties, "_FSOUND_Reverb_SetChannelProperties@8");
+    F_GETPROC(FSOUND_Reverb_GetChannelProperties, "_FSOUND_Reverb_GetChannelProperties@8");
+    F_GETPROC(FSOUND_Record_SetDriver, "_FSOUND_Record_SetDriver@4");
+    F_GETPROC(FSOUND_Record_GetNumDrivers, "_FSOUND_Record_GetNumDrivers@0");
+    F_GETPROC(FSOUND_Record_GetDriverName, "_FSOUND_Record_GetDriverName@4");
+    F_GETPROC(FSOUND_Record_GetDriver, "_FSOUND_Record_GetDriver@0");
+    F_GETPROC(FSOUND_Record_StartSample, "_FSOUND_Record_StartSample@8");
+    F_GETPROC(FSOUND_Record_Stop, "_FSOUND_Record_Stop@0");
+    F_GETPROC(FSOUND_Record_GetPosition, "_FSOUND_Record_GetPosition@0");
+    F_GETPROC(FSOUND_File_SetCallbacks, "_FSOUND_File_SetCallbacks@20");
+    F_GETPROC(FMUSIC_LoadSong, "_FMUSIC_LoadSong@4");
+    F_GETPROC(FMUSIC_LoadSongEx, "_FMUSIC_LoadSongEx@24");
+    F_GETPROC(FMUSIC_GetOpenState, "_FMUSIC_GetOpenState@4");
+    F_GETPROC(FMUSIC_FreeSong, "_FMUSIC_FreeSong@4");
+    F_GETPROC(FMUSIC_PlaySong, "_FMUSIC_PlaySong@4");
+    F_GETPROC(FMUSIC_StopSong, "_FMUSIC_StopSong@4");
+    F_GETPROC(FMUSIC_StopAllSongs, "_FMUSIC_StopAllSongs@0");
+    F_GETPROC(FMUSIC_SetZxxCallback, "_FMUSIC_SetZxxCallback@8");
+    F_GETPROC(FMUSIC_SetRowCallback, "_FMUSIC_SetRowCallback@12");
+    F_GETPROC(FMUSIC_SetOrderCallback, "_FMUSIC_SetOrderCallback@12");
+    F_GETPROC(FMUSIC_SetInstCallback, "_FMUSIC_SetInstCallback@12");
+    F_GETPROC(FMUSIC_SetSample, "_FMUSIC_SetSample@12");
+    F_GETPROC(FMUSIC_SetUserData, "_FMUSIC_SetUserData@8");
+    F_GETPROC(FMUSIC_OptimizeChannels, "_FMUSIC_OptimizeChannels@12");
+    F_GETPROC(FMUSIC_SetReverb, "_FMUSIC_SetReverb@4");
+    F_GETPROC(FMUSIC_SetLooping, "_FMUSIC_SetLooping@8");
+    F_GETPROC(FMUSIC_SetOrder, "_FMUSIC_SetOrder@8");
+    F_GETPROC(FMUSIC_SetPaused, "_FMUSIC_SetPaused@8");
+    F_GETPROC(FMUSIC_SetMasterVolume, "_FMUSIC_SetMasterVolume@8");
+    F_GETPROC(FMUSIC_SetMasterSpeed, "_FMUSIC_SetMasterSpeed@8");
+    F_GETPROC(FMUSIC_SetPanSeperation, "_FMUSIC_SetPanSeperation@8");
+    F_GETPROC(FMUSIC_GetName, "_FMUSIC_GetName@4");
+    F_GETPROC(FMUSIC_GetType, "_FMUSIC_GetType@4");
+    F_GETPROC(FMUSIC_GetNumOrders, "_FMUSIC_GetNumOrders@4");
+    F_GETPROC(FMUSIC_GetNumPatterns, "_FMUSIC_GetNumPatterns@4");
+    F_GETPROC(FMUSIC_GetNumInstruments, "_FMUSIC_GetNumInstruments@4");
+    F_GETPROC(FMUSIC_GetNumSamples, "_FMUSIC_GetNumSamples@4");
+    F_GETPROC(FMUSIC_GetNumChannels, "_FMUSIC_GetNumChannels@4");
+    F_GETPROC(FMUSIC_GetSample, "_FMUSIC_GetSample@8");
+    F_GETPROC(FMUSIC_GetPatternLength, "_FMUSIC_GetPatternLength@8");
+    F_GETPROC(FMUSIC_IsFinished, "_FMUSIC_IsFinished@4");
+    F_GETPROC(FMUSIC_IsPlaying, "_FMUSIC_IsPlaying@4");
+    F_GETPROC(FMUSIC_GetMasterVolume, "_FMUSIC_GetMasterVolume@4");
+    F_GETPROC(FMUSIC_GetGlobalVolume, "_FMUSIC_GetGlobalVolume@4");
+    F_GETPROC(FMUSIC_GetOrder, "_FMUSIC_GetOrder@4");
+    F_GETPROC(FMUSIC_GetPattern, "_FMUSIC_GetPattern@4");
+    F_GETPROC(FMUSIC_GetSpeed, "_FMUSIC_GetSpeed@4");
+    F_GETPROC(FMUSIC_GetBPM, "_FMUSIC_GetBPM@4");
+    F_GETPROC(FMUSIC_GetRow, "_FMUSIC_GetRow@4");
+    F_GETPROC(FMUSIC_GetPaused, "_FMUSIC_GetPaused@4");
+    F_GETPROC(FMUSIC_GetTime, "_FMUSIC_GetTime@4");
+    F_GETPROC(FMUSIC_GetRealChannel, "_FMUSIC_GetRealChannel@8");
+    F_GETPROC(FMUSIC_GetUserData, "_FMUSIC_GetUserData@4");
+
+    return instance;
+}
+
+static void FMOD_FreeInstance(FMOD_INSTANCE *instance)
+{
+    if (instance)
+    {
+        if (instance->module)
+        {
+#ifdef WIN32
+            FreeLibrary((HMODULE)instance->module);
+#else
+            dlclose(instance->module);
+#endif
+        }
+        free(instance);
+    }
+}
+
+#endif
+
diff --git a/main/source/fmod/inc/wincompat.h b/main/source/fmod/inc/wincompat.h
new file mode 100644
index 00000000..f6600017
--- /dev/null
+++ b/main/source/fmod/inc/wincompat.h
@@ -0,0 +1,81 @@
+#if !defined(WINCOMPAT_INCLUDED) && !defined(PLATFORM_WINDOWS) && !defined(WIN32) && !defined(WINDOWS) && !defined(__WIN32__)
+#define WINCOMPAT_INCLUDED
+
+/**
+ * 
+ * Author: Magnus Naeslund (mag@fbab.net, mag@bahnhof.se)
+ * (c) 2000 Magnus Naeslund, all rights reserved
+ * 
+ */
+
+#include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <termios.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifndef TRUE
+  #define TRUE 1
+#endif
+#ifndef FALSE
+  #define FALSE 0
+#endif
+
+#define _kbhit kbhit
+#define stricmp strcasecmp
+#define strnicmp strncasecmp
+
+#define Sleep(x) usleep((x)*1000)
+
+static int            inited=0;
+static struct termios ori;
+
+static void tcatexit(){
+   tcsetattr(0,0,&ori);
+}
+
+static void init_terminal(){
+   struct termios t;
+   tcgetattr(0,&t);
+   tcgetattr(0,&ori);
+   t.c_lflag &= ~(ICANON);
+   tcsetattr(0,0,&t);
+   atexit(tcatexit);
+}
+
+static inline int kbhit(){
+  fd_set rfds;
+  struct timeval tv;
+
+   if (!inited){
+	  inited=1;
+	  init_terminal();
+   }
+   
+   FD_ZERO(&rfds);
+   FD_SET(0, &rfds);
+   tv.tv_sec = 0;
+   tv.tv_usec = 10*1000;
+   return select(1, &rfds, NULL, NULL, &tv)>0;
+}
+
+static inline int getch(){
+   fd_set rfds;
+   
+   if (!inited){
+	  inited=1;
+	  init_terminal();
+   }
+   
+   FD_ZERO(&rfds);
+   FD_SET(0, &rfds);
+   if (select(1, &rfds, NULL, NULL, NULL)>0)
+	 return getchar();
+   else{
+	  printf("wincompat.h: select() on fd 0 failed\n");
+	  return 0xDeadBeef;
+   }	 
+}
+
+#endif
diff --git a/main/source/fmod/lib/fmodvc.lib b/main/source/fmod/lib/fmodvc.lib
new file mode 100644
index 00000000..16186036
Binary files /dev/null and b/main/source/fmod/lib/fmodvc.lib differ
diff --git a/main/source/game_shared/bitvec.h b/main/source/game_shared/bitvec.h
new file mode 100644
index 00000000..a7f2b153
--- /dev/null
+++ b/main/source/game_shared/bitvec.h
@@ -0,0 +1,179 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef BITVEC_H
+#define BITVEC_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+
+#include <assert.h>
+
+
+class CBitVecAccessor
+{
+public:
+				CBitVecAccessor(unsigned long *pDWords, int iBit);
+
+	void		operator=(int val);
+				operator unsigned long();
+
+private:
+	unsigned long	*m_pDWords;
+	int				m_iBit;
+};
+	
+
+// CBitVec allows you to store a list of bits and do operations on them like they were 
+// an atomic type.
+template<int NUM_BITS>
+class CBitVec
+{
+public:
+	
+					CBitVec();
+
+	// Set all values to the specified value (0 or 1..)
+	void			Init(int val = 0);
+
+	// Access the bits like an array.
+	CBitVecAccessor	operator[](int i);
+
+	// Operations on other bit vectors.
+	CBitVec&		operator=(CBitVec<NUM_BITS> const &other);
+	bool			operator==(CBitVec<NUM_BITS> const &other);
+	bool			operator!=(CBitVec<NUM_BITS> const &other);
+
+	// Get underlying dword representations of the bits.
+	int				GetNumDWords();
+	unsigned long	GetDWord(int i);
+	void			SetDWord(int i, unsigned long val);
+
+	int				GetNumBits();
+
+private:
+
+	enum {NUM_DWORDS = NUM_BITS/32 + !!(NUM_BITS & 31)};
+	unsigned long	m_DWords[NUM_DWORDS];
+};
+
+
+
+// ------------------------------------------------------------------------ //
+// CBitVecAccessor inlines.
+// ------------------------------------------------------------------------ //
+
+inline CBitVecAccessor::CBitVecAccessor(unsigned long *pDWords, int iBit)
+{
+	m_pDWords = pDWords;
+	m_iBit = iBit;
+}
+
+
+inline void CBitVecAccessor::operator=(int val)
+{
+	if(val)
+		m_pDWords[m_iBit >> 5] |= (1 << (m_iBit & 31));
+	else
+		m_pDWords[m_iBit >> 5] &= ~(unsigned long)(1 << (m_iBit & 31));
+}
+
+inline CBitVecAccessor::operator unsigned long()
+{
+	return m_pDWords[m_iBit >> 5] & (1 << (m_iBit & 31));
+}
+
+
+
+// ------------------------------------------------------------------------ //
+// CBitVec inlines.
+// ------------------------------------------------------------------------ //
+
+template<int NUM_BITS>
+inline int CBitVec<NUM_BITS>::GetNumBits()
+{
+	return NUM_BITS;
+}
+
+
+template<int NUM_BITS>
+inline CBitVec<NUM_BITS>::CBitVec()
+{
+	for(int i=0; i < NUM_DWORDS; i++)
+		m_DWords[i] = 0;
+}
+
+
+template<int NUM_BITS>
+inline void CBitVec<NUM_BITS>::Init(int val)
+{
+	for(int i=0; i < GetNumBits(); i++)
+	{
+		(*this)[i] = val;
+	}
+}
+
+
+template<int NUM_BITS>
+inline CBitVec<NUM_BITS>& CBitVec<NUM_BITS>::operator=(CBitVec<NUM_BITS> const &other)
+{
+	memcpy(m_DWords, other.m_DWords, sizeof(m_DWords));
+	return *this;
+}
+
+
+template<int NUM_BITS>
+inline CBitVecAccessor CBitVec<NUM_BITS>::operator[](int i)	
+{
+	assert(i >= 0 && i < GetNumBits());
+	return CBitVecAccessor(m_DWords, i);
+}
+
+
+template<int NUM_BITS>
+inline bool CBitVec<NUM_BITS>::operator==(CBitVec<NUM_BITS> const &other)
+{
+	for(int i=0; i < NUM_DWORDS; i++)
+		if(m_DWords[i] != other.m_DWords[i])
+			return false;
+
+	return true;
+}
+
+
+template<int NUM_BITS>
+inline bool CBitVec<NUM_BITS>::operator!=(CBitVec<NUM_BITS> const &other)
+{
+	return !(*this == other);
+}
+
+
+template<int NUM_BITS>
+inline int CBitVec<NUM_BITS>::GetNumDWords()
+{
+	return NUM_DWORDS;
+}
+
+template<int NUM_BITS>
+inline unsigned long CBitVec<NUM_BITS>::GetDWord(int i)
+{
+	assert(i >= 0 && i < NUM_DWORDS);
+	return m_DWords[i];
+}
+
+
+template<int NUM_BITS>
+inline void CBitVec<NUM_BITS>::SetDWord(int i, unsigned long val)
+{
+	assert(i >= 0 && i < NUM_DWORDS);
+	m_DWords[i] = val;
+}
+
+
+#endif // BITVEC_H
+
diff --git a/main/source/game_shared/directorconst.h b/main/source/game_shared/directorconst.h
new file mode 100644
index 00000000..9c915f02
--- /dev/null
+++ b/main/source/game_shared/directorconst.h
@@ -0,0 +1,45 @@
+#ifndef DIRECTOR_CONST_H
+#define DIRECTOR_CONST_H
+
+// not needed anymore
+//#define	SVC_HLTV			50
+
+#define	SVC_DIRECTOR				51	// messsage for director module in proxy
+
+// sub commands of svc_director:
+#define DRC_CMD_NONE				0	// NULL director command
+#define DRC_CMD_START				1	// start director mode
+#define DRC_CMD_EVENT				2	// informs about director event
+#define DRC_CMD_MODE				3	// switches camera modes
+#define DRC_CMD_CAMERA				4	// sets camera registers
+#define DRC_CMD_TIMESCALE			5	// sets time scale
+#define DRC_CMD_MESSAGE				6	// send HUD centerprint
+#define DRC_CMD_SOUND				7	// plays a particular sound
+#define DRC_CMD_STATUS				8	// status info about broadcast
+#define DRC_CMD_BANNER				9	// banner file name for HLTV gui
+#define DRC_CMD_FADE				10	// send screen fade command
+#define DRC_CMD_SHAKE				11	// send screen shake command
+#define DRC_CMD_STUFFTEXT			12	// like the normal svc_stufftext but as director command
+#define DRC_CMD_LAST				12
+
+
+// HLTV_EVENT event flags
+#define DRC_FLAG_PRIO_MASK			0x0F		// priorities between 0 and 15 (15 most important)
+#define DRC_FLAG_SIDE				(1<<4)	// 
+#define DRC_FLAG_DRAMATIC			(1<<5)	// is a dramatic scene
+#define DRC_FLAG_SLOWMOTION			(1<<6)	// would look good in SloMo
+#define DRC_FLAG_FACEPLAYER			(1<<7)	// player is doning something (reload/defuse bomb etc)
+#define DRC_FLAG_INTRO				(1<<8)	// is a introduction scene
+#define DRC_FLAG_FINAL				(1<<9)	// is a final scene
+#define DRC_FLAG_NO_RANDOM			(1<<10)	// don't randomize event data
+
+// Size of message (command length in bytes = (1+2+2+4))
+#define DIRECTOR_MESSAGE_SIZE		9
+
+// prxoy director stuff
+//#define DRC_EVENT			3	// informs the dircetor about ann important game event
+
+#define DRC_FLAG_PRIO_MASK		0x0F	//	priorities between 0 and 15 (15 most important)
+#define DRC_FLAG_DRAMATIC		(1<<5)
+
+#endif
\ No newline at end of file
diff --git a/main/source/game_shared/teamconst.h b/main/source/game_shared/teamconst.h
new file mode 100644
index 00000000..72140967
--- /dev/null
+++ b/main/source/game_shared/teamconst.h
@@ -0,0 +1,35 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: teamconst.h $
+// $Date: 2002/07/23 16:49:42 $
+//
+//-------------------------------------------------------------------------------
+// $Log: teamconst.h,v $
+// Revision 1.2  2002/07/23 16:49:42  Flayra
+// - Added document header, new player constant
+//
+//===============================================================================
+#ifndef TEAM_CONST_H
+#define TEAM_CONST_H
+
+#define MAX_PLAYERS			32//voogru: Why was this 64?!
+
+#define MAX_PLAYERS_PER_TEAM	16
+
+//#define MAX_TEAMS			64
+#define MAX_TEAMS			6
+
+#define MAX_TEAM_NAME		16
+
+#define MAX_TEAMNAME_LENGTH	16
+
+#define TEAMPLAY_TEAMLISTLENGTH		MAX_TEAMS*MAX_TEAMNAME_LENGTH
+
+#endif
\ No newline at end of file
diff --git a/main/source/game_shared/vgui_checkbutton2.cpp b/main/source/game_shared/vgui_checkbutton2.cpp
new file mode 100644
index 00000000..b83090a2
--- /dev/null
+++ b/main/source/game_shared/vgui_checkbutton2.cpp
@@ -0,0 +1,202 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#include <stdarg.h>
+#include <stdio.h>
+#include "vgui_checkbutton2.h"
+#include "vgui_loadtga.h"
+
+
+#define EXTRA_X	5
+
+
+using namespace vgui;
+
+
+
+CCheckButton2::CCheckButton2() :
+	m_Label(""),
+	m_pChecked(NULL),
+	m_pUnchecked(NULL),
+	m_pHandler(NULL),
+	m_CheckboxPanel(NULL)
+{
+	m_bOwnImages = false;
+	m_bChecked = false;
+	m_pChecked = m_pUnchecked = NULL;
+	m_bCheckboxLeft = true;
+
+	m_Label.setParent(this);
+	m_Label.setFgColor(255,255,255,0);
+	m_Label.setBgColor(0,0,0,255);	// background is not drawn and foreground is white
+	m_Label.addInputSignal(this);
+
+	m_CheckboxPanel.setParent(this);
+	m_CheckboxPanel.addInputSignal(this);
+
+	setPaintBackgroundEnabled(false);
+}
+
+
+CCheckButton2::~CCheckButton2()
+{
+	DeleteImages();
+}
+
+
+void CCheckButton2::SetImages(char const *pChecked, char const *pUnchecked)
+{
+	DeleteImages();
+	
+	m_pChecked = vgui_LoadTGA(pChecked);
+	m_pUnchecked = vgui_LoadTGA(pUnchecked);
+	m_bOwnImages = true;
+
+	SetupControls();
+}
+
+
+void CCheckButton2::SetImages(Image *pChecked, Image *pUnchecked)
+{
+	DeleteImages();
+
+	m_pChecked = pChecked;
+	m_pUnchecked = pUnchecked;
+	m_bOwnImages = false;
+
+	SetupControls();
+}
+
+
+void CCheckButton2::DeleteImages()
+{
+	if(m_bOwnImages)
+	{
+		delete m_pChecked;
+		delete m_pUnchecked;
+	}
+
+	m_pChecked = NULL;
+	m_pUnchecked = NULL;
+	m_bOwnImages = false;
+
+	SetupControls();
+}
+
+
+void CCheckButton2::SetCheckboxLeft(bool bLeftAlign)
+{
+	m_bCheckboxLeft = bLeftAlign;
+	SetupControls();
+}
+
+
+bool CCheckButton2::GetCheckboxLeft()
+{
+	return m_bCheckboxLeft;
+}
+
+
+void CCheckButton2::SetText(char const *pText, ...)
+{
+	char str[512];
+	
+	va_list marker;
+	va_start(marker, pText);
+	_vsnprintf(str, sizeof(str), pText, marker);
+	va_end(marker);
+
+	m_Label.setText(str);
+	SetupControls();
+}
+
+
+void CCheckButton2::setFont(Font* font)
+{
+    m_Label.setFont(font);
+}
+
+void CCheckButton2::SetTextColor(int r, int g, int b, int a)
+{
+	m_Label.setFgColor(r, g, b, a);
+	repaint();
+}
+
+
+void CCheckButton2::SetHandler(ICheckButton2Handler *pHandler)
+{
+	m_pHandler = pHandler;
+}
+
+
+bool CCheckButton2::IsChecked()
+{
+	return m_bChecked;
+}
+
+
+void CCheckButton2::SetChecked(bool bChecked)
+{
+	m_bChecked = bChecked;
+	SetupControls();
+}
+
+
+void CCheckButton2::internalMousePressed(MouseCode code)
+{
+	m_bChecked = !m_bChecked;
+
+	if(m_pHandler)
+		m_pHandler->StateChanged(this);
+
+	SetupControls();
+}
+
+
+void CCheckButton2::SetupControls()
+{
+	// Initialize the checkbutton bitmap.
+	Image *pBitmap = m_bChecked ? m_pChecked : m_pUnchecked;
+
+	Panel *controls[2] = {&m_CheckboxPanel, &m_Label};
+	int controlSizes[2][2];
+	
+	controlSizes[0][0] = controlSizes[0][1] = 0;
+	if(pBitmap)
+		pBitmap->getSize(controlSizes[0][0], controlSizes[0][1]);
+	
+	m_CheckboxPanel.setImage(pBitmap);
+	m_CheckboxPanel.setSize(controlSizes[0][0], controlSizes[0][1]);
+
+	
+	// Get the label's size.
+	m_Label.getSize(controlSizes[1][0], controlSizes[1][1]);
+	m_Label.setContentAlignment(Label::a_west);
+
+
+	// Position the controls.
+	int iLeftControl = !m_bCheckboxLeft;
+	int iBiggestY = controlSizes[0][1] > controlSizes[1][0] ? 0 : 1;
+	controls[iLeftControl]->setPos(0, (controlSizes[iBiggestY][1] - controlSizes[iLeftControl][1]) / 2);
+	controls[!iLeftControl]->setPos(controlSizes[iLeftControl][0] + EXTRA_X, (controlSizes[iBiggestY][1] - controlSizes[!iLeftControl][1]) / 2);
+
+	
+	// Fit this control to the sizes of the subcontrols.
+	setSize(controlSizes[0][0] + controlSizes[1][0] + EXTRA_X, (controlSizes[0][1] > controlSizes[1][1]) ? controlSizes[0][1] : controlSizes[1][1]);
+	repaint();
+}
+
+
+void CCheckButton2::mousePressed(MouseCode code, Panel *panel)
+{
+	internalMousePressed(code);
+}
+
+
+
+
+
diff --git a/main/source/game_shared/vgui_checkbutton2.h b/main/source/game_shared/vgui_checkbutton2.h
new file mode 100644
index 00000000..2ce5e9d0
--- /dev/null
+++ b/main/source/game_shared/vgui_checkbutton2.h
@@ -0,0 +1,100 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_CHECKBUTTON2_H
+#define VGUI_CHECKBUTTON2_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+
+#include "vgui_label.h"
+#include "vgui_imagepanel.h"
+#include "vgui_defaultinputsignal.h"
+
+
+namespace vgui
+{
+
+
+class CCheckButton2;
+
+
+class ICheckButton2Handler
+{
+public:
+	virtual void	StateChanged(CCheckButton2 *pButton) = 0;
+};
+
+
+// VGUI checkbox class.
+// - Provides access to the checkbox images.
+// - Provides an easy callback mechanism for state changes.
+// - Default background is invisible, and default text color is white.
+class CCheckButton2 : public Panel, public CDefaultInputSignal
+{
+public:
+
+				CCheckButton2();
+				~CCheckButton2();
+	
+	// Initialize the button with these.
+	void		SetImages(char const *pChecked, char const *pUnchecked);
+	void		SetImages(Image *pChecked, Image *pUnchecked);		// If you use this, the button will never delete the images.
+	void		DeleteImages();
+
+	// The checkbox can be to the left or the right of the text (default is left).
+	void		SetCheckboxLeft(bool bLeftAlign);
+	bool		GetCheckboxLeft();
+	
+	// Set the label text.
+	void		SetText(char const *pText, ...);
+	void		SetTextColor(int r, int g, int b, int a);
+    void        setFont(Font* font);
+
+	// You can register for change notification here.
+	void		SetHandler(ICheckButton2Handler *pHandler);
+	
+	// Get/set the check state.
+	bool		IsChecked();
+	void		SetChecked(bool bChecked);
+
+// Panel overrides.
+public:
+
+	virtual void	internalMousePressed(MouseCode code);	
+
+
+protected:
+
+	void			SetupControls();
+
+
+// InputSignal overrides.
+protected:
+	virtual void mousePressed(MouseCode code,Panel* panel);
+
+
+public:
+	ICheckButton2Handler	*m_pHandler;
+
+	bool		m_bCheckboxLeft;
+	Label		m_Label;
+	ImagePanel	m_CheckboxPanel;
+	
+	Image		*m_pChecked;
+	Image		*m_pUnchecked;
+	bool		m_bOwnImages;
+
+	bool		m_bChecked;
+};
+
+
+}
+
+
+#endif // VGUI_CHECKBUTTON2_H
diff --git a/main/source/game_shared/vgui_defaultinputsignal.h b/main/source/game_shared/vgui_defaultinputsignal.h
new file mode 100644
index 00000000..7d9cecaf
--- /dev/null
+++ b/main/source/game_shared/vgui_defaultinputsignal.h
@@ -0,0 +1,39 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_DEFAULTINPUTSIGNAL_H
+#define VGUI_DEFAULTINPUTSIGNAL_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+
+#include "vgui_inputsignal.h"
+
+
+namespace vgui
+{
+	// This class derives from vgui::InputSignal and implements empty defaults for all of its functions.
+	class CDefaultInputSignal : public vgui::InputSignal
+	{
+	public:
+		virtual void cursorMoved(int x,int y,Panel* panel)				{}
+		virtual void cursorEntered(Panel* panel)						{}
+		virtual void cursorExited(Panel* panel)							{}
+		virtual void mousePressed(MouseCode code,Panel* panel)			{}
+		virtual void mouseDoublePressed(MouseCode code,Panel* panel)	{}
+		virtual void mouseReleased(MouseCode code,Panel* panel)			{}
+		virtual void mouseWheeled(int delta,Panel* panel)				{}
+		virtual void keyPressed(KeyCode code,Panel* panel)				{}
+		virtual void keyTyped(KeyCode code,Panel* panel)				{}
+		virtual void keyReleased(KeyCode code,Panel* panel)				{}
+		virtual void keyFocusTicked(Panel* panel)						{}
+	};
+}
+
+
+#endif // VGUI_DEFAULTINPUTSIGNAL_H
diff --git a/main/source/game_shared/vgui_grid.cpp b/main/source/game_shared/vgui_grid.cpp
new file mode 100644
index 00000000..2fc8cbad
--- /dev/null
+++ b/main/source/game_shared/vgui_grid.cpp
@@ -0,0 +1,398 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#include <assert.h>
+#include "vgui_grid.h"
+
+
+using namespace vgui;
+
+
+#define AssertCheck(expr, msg) \
+	if(!(expr))\
+	{\
+		assert(!msg);\
+		return 0;\
+	}
+
+
+
+// ------------------------------------------------------------------------------ //
+// CGrid::CGridEntry.
+// ------------------------------------------------------------------------------ //
+
+CGrid::CGridEntry::CGridEntry()
+{
+	m_pPanel = NULL;
+	m_bUnderline = false;
+}
+
+CGrid::CGridEntry::~CGridEntry()
+{
+}
+
+
+// ------------------------------------------------------------------------------ //
+// CGrid.
+// ------------------------------------------------------------------------------ //
+
+CGrid::CGrid()
+{
+	Clear();
+}
+
+
+CGrid::~CGrid()
+{
+	Term();
+}
+
+
+bool CGrid::SetDimensions(int xCols, int yRows)
+{
+	Term();
+
+	m_GridEntries = new CGridEntry[xCols * yRows];
+	m_Widths = new int[xCols*2 + yRows*2];
+	m_Heights = m_Widths + xCols;
+	m_ColOffsets = m_Heights + yRows;
+	m_RowOffsets = m_ColOffsets + xCols;
+
+	if(!m_GridEntries || !m_Widths)
+	{
+		Term();
+		return false;
+	}
+
+	memset(m_Widths, 0, sizeof(int) * (xCols*2 + yRows*2));
+
+	m_xCols = xCols;
+	m_yRows = yRows;
+	return true;
+}
+
+
+void CGrid::Term()
+{
+	delete [] m_GridEntries;
+	delete [] m_Widths;
+	Clear();
+}
+
+
+Panel* CGrid::GetEntry(int x, int y)
+{
+	return GridEntry(x, y)->m_pPanel;
+}
+
+
+bool CGrid::SetEntry(int x, int y, Panel *pPanel)
+{
+	CGridEntry *pEntry = GridEntry(x, y);
+	if(!pEntry)
+		return false;
+
+	if(pEntry->m_pPanel)
+		pEntry->m_pPanel->setParent(NULL);
+
+	pEntry->m_pPanel = pPanel;
+	if(pPanel)
+		pPanel->setParent(this);
+
+	m_bDirty = true;
+	return true;
+}
+
+
+int CGrid::GetXSpacing()
+{
+	return m_xSpacing;
+}
+
+
+int CGrid::GetYSpacing()
+{
+	return m_ySpacing;
+}
+
+
+void CGrid::SetSpacing(int xSpacing, int ySpacing)
+{
+	if(xSpacing != m_xSpacing)
+	{
+		m_xSpacing = xSpacing;
+		CalcColOffsets(0);
+		m_bDirty = true;
+	}
+
+	if(ySpacing != m_ySpacing)
+	{
+		m_ySpacing = ySpacing;
+		CalcRowOffsets(0);
+		m_bDirty = true;
+	}
+}
+
+
+bool CGrid::SetColumnWidth(int iColumn, int width)
+{
+	AssertCheck(iColumn >= 0 && iColumn < m_xCols, "CGrid::SetColumnWidth : invalid location specified");
+	m_Widths[iColumn] = width;
+	CalcColOffsets(iColumn+1);
+	m_bDirty = true;
+	return true;
+}
+
+
+bool CGrid::SetRowHeight(int iRow, int height)
+{
+	AssertCheck(iRow >= 0 && iRow < m_yRows, "CGrid::SetColumnWidth : invalid location specified");
+	m_Heights[iRow] = height;
+	CalcRowOffsets(iRow+1);
+	m_bDirty = true;
+	return true;
+}
+
+
+int CGrid::GetColumnWidth(int iColumn)
+{
+	AssertCheck(iColumn >= 0 && iColumn < m_xCols, "CGrid::GetColumnWidth: invalid location specified");
+	return m_Widths[iColumn];
+}
+
+
+int CGrid::GetRowHeight(int iRow)
+{
+	AssertCheck(iRow >= 0 && iRow < m_yRows, "CGrid::GetRowHeight: invalid location specified");
+	return m_Heights[iRow];
+}
+
+
+int CGrid::CalcFitColumnWidth(int iColumn)
+{
+	AssertCheck(iColumn >= 0 && iColumn < m_xCols, "CGrid::CalcFitColumnWidth: invalid location specified");
+
+	int maxSize = 0;
+	for(int i=0; i < m_yRows; i++)
+	{
+		Panel *pPanel = GridEntry(iColumn, i)->m_pPanel;
+		if(!pPanel)
+			continue;
+
+		int w, h;
+		pPanel->getSize(w,h);
+		if(w > maxSize)
+			maxSize = w;
+	}
+
+	return maxSize;
+}
+
+
+int CGrid::CalcFitRowHeight(int iRow)
+{
+	AssertCheck(iRow >= 0 && iRow < m_yRows, "CGrid::CalcFitRowHeight: invalid location specified");
+
+	int maxSize = 0;
+	for(int i=0; i < m_xCols; i++)
+	{
+		Panel *pPanel = GridEntry(i, iRow)->m_pPanel;
+		if(!pPanel)
+			continue;
+
+		int w, h;
+		pPanel->getSize(w,h);
+		if(h > maxSize)
+			maxSize = h;
+	}
+
+	return maxSize;
+}
+
+
+void CGrid::AutoSetRowHeights()
+{
+	for(int i=0; i < m_yRows; i++)
+		SetRowHeight(i, CalcFitRowHeight(i));
+}
+
+
+bool CGrid::GetEntryBox(
+	int col, int row, int &x, int &y, int &w, int &h)
+{
+	AssertCheck(col >= 0 && col < m_xCols && row >= 0 && row < m_yRows, "CGrid::GetEntryBox: invalid location specified");
+
+	x = m_ColOffsets[col];
+	w = m_Widths[col];
+
+	y = m_RowOffsets[row];
+	h = m_Heights[row];
+	return true;	
+}
+
+
+bool CGrid::CopyColumnWidths(CGrid *pOther)
+{
+	if(!pOther || pOther->m_xCols != m_xCols)
+		return false;
+
+	for(int i=0; i < m_xCols; i++)
+		m_Widths[i] = pOther->m_Widths[i];
+
+	CalcColOffsets(0);
+	m_bDirty = true;
+	return true;
+}
+
+
+void CGrid::RepositionContents()
+{
+	for(int x=0; x < m_xCols; x++)
+	{
+		for(int y=0; y < m_yRows; y++)
+		{
+			Panel *pPanel = GridEntry(x,y)->m_pPanel;
+			if(!pPanel)
+				continue;
+
+			pPanel->setBounds(
+				m_ColOffsets[x], 
+				m_RowOffsets[y],
+				m_Widths[x], 
+				m_Heights[y]);
+		}
+	}
+
+	m_bDirty = false;
+}
+
+
+int CGrid::CalcDrawHeight()
+{
+	if(m_yRows > 0)
+	{
+		return m_RowOffsets[m_yRows-1] + m_Heights[m_yRows - 1] + m_ySpacing;
+	}
+	else
+	{
+		return 0;
+	}
+}
+
+
+void CGrid::paint()
+{
+	if(m_bDirty)
+		RepositionContents();
+
+	Panel::paint();
+
+	// walk the grid looking for underlined rows
+	int x = 0, y = 0;
+	for (int row = 0; row < m_yRows; row++)
+	{
+		CGridEntry *cell = GridEntry(0, row);
+
+		y += cell->m_pPanel->getTall() + m_ySpacing;
+		if (cell->m_bUnderline)
+		{
+			drawSetColor(cell->m_UnderlineColor[0], cell->m_UnderlineColor[1], cell->m_UnderlineColor[2], cell->m_UnderlineColor[3]);
+			drawFilledRect(0, y - (cell->m_iUnderlineOffset + 1), getWide(), y - cell->m_iUnderlineOffset);
+		}
+	}
+}
+
+void CGrid::paintBackground()
+{
+	Panel::paintBackground();
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: sets underline color for a particular row
+//-----------------------------------------------------------------------------
+void CGrid::SetRowUnderline(int row, bool enabled, int offset, int r, int g, int b, int a)
+{
+	CGridEntry *cell = GridEntry(0, row);
+	cell->m_bUnderline = enabled;
+	if (enabled)
+	{
+		cell->m_iUnderlineOffset = offset;
+		cell->m_UnderlineColor[0] = r;
+		cell->m_UnderlineColor[1] = g;
+		cell->m_UnderlineColor[2] = b;
+		cell->m_UnderlineColor[3] = a;
+	}
+}
+
+void CGrid::Clear()
+{
+	m_xCols = m_yRows = 0;
+	m_Widths = NULL;
+	m_GridEntries = NULL;
+	m_xSpacing = m_ySpacing = 0;
+	m_bDirty = false;
+}
+
+
+CGrid::CGridEntry* CGrid::GridEntry(int x, int y)
+{
+	AssertCheck(x >= 0 && x < m_xCols && y >= 0 && y < m_yRows, "CGrid::GridEntry: invalid location specified");
+	return &m_GridEntries[y*m_xCols + x];
+}
+
+
+void CGrid::CalcColOffsets(int iStart)
+{
+	int cur = m_xSpacing;
+	if(iStart != 0)
+		cur += m_ColOffsets[iStart-1] + m_Widths[iStart-1];
+
+	for(int i=iStart; i < m_xCols; i++)
+	{
+		m_ColOffsets[i] = cur;
+		cur += m_Widths[i] + m_xSpacing;
+	}
+}
+
+
+void CGrid::CalcRowOffsets(int iStart)
+{
+	int cur = m_ySpacing;
+	if(iStart != 0)
+		cur += m_RowOffsets[iStart-1];
+
+	for(int i=iStart; i < m_yRows; i++)
+	{
+		m_RowOffsets[i] = cur;
+		cur += m_Heights[i] + m_ySpacing;
+	}
+}
+
+bool CGrid::getCellAtPoint(int worldX, int worldY, int &row, int &col)
+{
+	row = -1; col = -1;
+	for(int x=0; x < m_xCols; x++)
+	{
+		for(int y=0; y < m_yRows; y++)
+		{
+			Panel *pPanel = GridEntry(x,y)->m_pPanel;
+			if (!pPanel)
+				continue;
+
+			if (pPanel->isWithin(worldX, worldY))
+			{
+				col = x;
+				row = y;
+				return true;
+			}
+		}
+	}
+		
+	return false;
+}
+
+
diff --git a/main/source/game_shared/vgui_grid.h b/main/source/game_shared/vgui_grid.h
new file mode 100644
index 00000000..cfd93764
--- /dev/null
+++ b/main/source/game_shared/vgui_grid.h
@@ -0,0 +1,122 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_GRID_H
+#define VGUI_GRID_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+
+#include "vgui_panel.h"
+
+
+namespace vgui
+{
+
+// The grid control simply manages a grid of panels. You can adjust column sizes and spacings and 
+// configure and fill the panels however you want.
+// To use this control, call SetDimensions, SetSpacing and fill the controls.
+class CGrid : public Panel
+{
+public:
+						CGrid();
+	virtual				~CGrid();
+
+	bool				SetDimensions(int xCols, int yRows);		// Set how many columns and rows in the grid.
+	void				Term();
+
+	Panel*				GetEntry(int x, int y);						// Get the panel associated with a grid entry.
+	bool				SetEntry(int x, int y, Panel *pPanel);
+	
+	int					GetXSpacing();
+	int					GetYSpacing();
+	void				SetSpacing(int xSpacing, int ySpacing);		// Set spacing between rows and columns.
+
+	bool				SetColumnWidth(int iColumn, int width);		// Set a column's width.
+	bool				SetRowHeight(int iRow, int height);			// Set a row's height.
+
+	int					GetColumnWidth(int iColumn);
+	int					GetRowHeight(int iRow);
+
+	int					CalcFitColumnWidth(int iColumn);			// Returns the maximum width of all panels in the column.
+	int					CalcFitRowHeight(int iRow);					// Returns the maximum height of all panels in the row.
+
+	int					CalcDrawHeight();							// Returns how many pixels high the grid control should be
+																	// for all of its contents to be visible (based on its row heights
+																	// and y spacing).
+
+	void				AutoSetRowHeights();						// Just does SetRowHeight(iRow, CalcFitRowHeight(iRow)) for all rows.
+
+	bool				GetEntryBox(								// Returns the bounding box for the specified entry.
+		int col, int row, int &x, int &y, int &w, int &h);
+
+	bool				CopyColumnWidths(CGrid *pOther);			// Copy the column widths from the other grid. Fails if the 
+																	// column count is different.
+
+	void				RepositionContents();						// Sets the size and position of all the grid entries based
+																	// on current spacings and row/column widths.
+																	// You usually only want to call this while setting up the control
+																	// if you want to get the position or dimensions of the child  
+																	// controls. This will set them.
+
+	void				SetRowUnderline(int row, bool enabled, int offset, int r, int g, int b, int a);	// sets underline color for a particular row
+
+	// returns the true if found, false otherwise
+	bool					getCellAtPoint(int worldX, int worldY, int &row, int &col);
+
+// Panel overrides.
+public:
+	
+	virtual void		paint();
+	virtual void		paintBackground();
+
+protected:
+
+	class CGridEntry
+	{
+	public:
+				CGridEntry();
+				~CGridEntry();
+		
+		Panel	*m_pPanel;
+
+		bool	m_bUnderline;
+		short	m_UnderlineColor[4];
+		int		m_iUnderlineOffset;
+	};
+
+	void				Clear();
+	CGridEntry*			GridEntry(int x, int y);
+
+	void				CalcColOffsets(int iStart);
+	void				CalcRowOffsets(int iStart);
+
+
+protected:
+
+	bool		m_bDirty;	// Set when controls will need to be repositioned.
+
+	int			m_xCols;
+	int			m_yRows;
+	
+	int			m_xSpacing;
+	int			m_ySpacing;
+
+	int			*m_Widths;
+	int			*m_Heights;
+	int			*m_ColOffsets;
+	int			*m_RowOffsets;
+	
+	CGridEntry	*m_GridEntries;
+	
+};
+
+};
+
+
+#endif // VGUI_GRID_H
diff --git a/main/source/game_shared/vgui_helpers.cpp b/main/source/game_shared/vgui_helpers.cpp
new file mode 100644
index 00000000..c84ea107
--- /dev/null
+++ b/main/source/game_shared/vgui_helpers.cpp
@@ -0,0 +1,45 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#include "vgui_helpers.h"
+
+
+using namespace vgui;
+
+
+void AlignPanel(Panel *pChild, Panel *pParent, int alignment)
+{
+	int w, h, cw, ch;
+	pParent->getSize(w, h);
+	pChild->getSize(cw, ch);
+
+	int xCenter = (w - cw) / 2;
+	int yCenter = (h - ch) / 2;
+
+	if(alignment == Label::a_west)
+		pChild->setPos(0, yCenter);
+	else if(alignment == Label::a_northwest)
+		pChild->setPos(0,0);
+	else if(alignment == Label::a_north)
+		pChild->setPos(xCenter, 0);
+	else if(alignment == Label::a_northeast)
+		pChild->setPos(w - cw, 0);
+	else if(alignment == Label::a_east)
+		pChild->setPos(w - cw, yCenter);
+	else if(alignment == Label::a_southeast)
+		pChild->setPos(w - cw, h - ch);
+	else if(alignment == Label::a_south)
+		pChild->setPos(xCenter, h - ch);
+	else if(alignment == Label::a_southwest)
+		pChild->setPos(0, h - ch);
+	else if(alignment == Label::a_center)
+		pChild->setPos(xCenter, yCenter);
+}
+
+
+
+
diff --git a/main/source/game_shared/vgui_helpers.h b/main/source/game_shared/vgui_helpers.h
new file mode 100644
index 00000000..e79a06d6
--- /dev/null
+++ b/main/source/game_shared/vgui_helpers.h
@@ -0,0 +1,31 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_HELPERS_H
+#define VGUI_HELPERS_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+
+#include "vgui_panel.h"
+#include "vgui_label.h"
+
+
+inline int PanelTop(vgui::Panel *pPanel)	{int x,y,w,h; pPanel->getBounds(x,y,w,h); return y;}
+inline int PanelLeft(vgui::Panel *pPanel)	{int x,y,w,h; pPanel->getBounds(x,y,w,h); return x;}
+inline int PanelRight(vgui::Panel *pPanel)	{int x,y,w,h; pPanel->getBounds(x,y,w,h); return x+w;}
+inline int PanelBottom(vgui::Panel *pPanel)	{int x,y,w,h; pPanel->getBounds(x,y,w,h); return y+h;}
+inline int PanelWidth(vgui::Panel *pPanel)	{int x,y,w,h; pPanel->getBounds(x,y,w,h); return w;}
+inline int PanelHeight(vgui::Panel *pPanel)	{int x,y,w,h; pPanel->getBounds(x,y,w,h); return h;}
+
+// Places child at the requested position inside pParent. iAlignment is from Label::Alignment.
+void AlignPanel(vgui::Panel *pChild, vgui::Panel *pParent, int alignment);
+
+
+#endif // VGUI_HELPERS_H
+
diff --git a/main/source/game_shared/vgui_listbox.cpp b/main/source/game_shared/vgui_listbox.cpp
new file mode 100644
index 00000000..760a7f50
--- /dev/null
+++ b/main/source/game_shared/vgui_listbox.cpp
@@ -0,0 +1,201 @@
+
+#include "vgui_listbox.h"
+
+
+
+using namespace vgui;
+
+
+CListBox::CListBox() : Panel(0, 0, 0, 0),
+	m_ItemsPanel(0,0,0,0),
+	m_ScrollBar(0, 0, 0, 0, true),
+	m_Slider(0, 0, 10, 40, true)
+{
+	m_Signal.m_pListBox = this;
+
+	m_ItemsPanel.setParent(this);
+	m_ItemsPanel.setBgColor(0,0,0,255);
+ 
+	m_Slider.setRangeWindow(50);
+	m_Slider.setRangeWindowEnabled(true);
+
+	m_ScrollBar.setParent(this);
+	m_ScrollBar.addIntChangeSignal(&m_Signal);
+	m_ScrollBar.setSlider(&m_Slider);
+	m_ScrollBar.setButtonPressedScrollValue(1);
+
+	m_Items.m_pNext = m_Items.m_pPrev = &m_Items;
+	m_ItemOffset = 0;
+	m_iScrollMax = -1;
+}
+
+CListBox::~CListBox()
+{
+	Term();
+}
+
+void CListBox::Init()
+{
+	Term();
+}
+
+void CListBox::Term()
+{
+	m_ItemOffset = 0;
+
+	// Free the LBItems.
+	LBItem *pNext;
+	for(LBItem *pItem=m_Items.m_pNext; pItem != &m_Items; pItem=pNext)
+	{
+		pItem->m_pPanel->setParent(NULL);	// detach the panel from us
+		pNext = pItem->m_pNext;
+		delete pItem;
+	}
+	m_Items.m_pPrev = m_Items.m_pNext = &m_Items;
+}
+
+void CListBox::AddItem(Panel* panel)
+{
+	// Add the item.
+	LBItem *pItem = new LBItem;
+	if(!pItem)
+		return;
+
+	pItem->m_pPanel = panel;
+	pItem->m_pPanel->setParent(&m_ItemsPanel);
+
+	pItem->m_pPrev = m_Items.m_pPrev;
+	pItem->m_pNext = &m_Items;
+	pItem->m_pNext->m_pPrev = pItem->m_pPrev->m_pNext = pItem;	
+
+	m_ScrollBar.setRange(0, GetScrollMax());
+	m_Slider.setRangeWindow(50);
+	m_Slider.setRangeWindowEnabled(true);
+
+	InternalLayout();
+}
+
+int CListBox::GetNumItems()
+{
+	int count=0;
+	for(LBItem *pItem=m_Items.m_pNext; pItem != &m_Items; pItem=pItem->m_pNext)
+		++count;
+
+	return count;
+}
+
+int CListBox::GetItemWidth()
+{
+	int wide, tall;
+	m_ItemsPanel.getSize(wide, tall);
+	return wide;
+}
+
+int CListBox::GetScrollPos()
+{
+	return m_ItemOffset;
+}
+
+void CListBox::SetScrollPos(int pos)
+{
+	int maxItems = GetScrollMax();
+	if(maxItems < 0)
+		return;
+
+	m_ItemOffset = (pos < 0) ? 0 : ((pos > maxItems) ? maxItems : pos);
+	InternalLayout();
+}
+
+void CListBox::setPos(int x, int y)
+{
+	Panel::setPos(x, y);
+	InternalLayout();
+}
+
+void CListBox::setSize(int wide,int tall)
+{
+	Panel::setSize(wide,tall);
+	InternalLayout();
+}
+
+void CListBox::setPixelScroll(int value)
+{
+	m_ItemOffset = m_ScrollBar.getValue();
+	InternalLayout();
+}
+
+void CListBox::InternalLayout()
+{
+	int x, y, wide, tall;
+	getBounds(x, y, wide, tall);
+
+	// Reposition the main panel and the scrollbar.
+	m_ItemsPanel.setBounds(0, 0, wide-15, tall);
+	m_ScrollBar.setBounds(wide-15, 0, 15, tall);
+
+	bool bNeedScrollbar = false;
+
+	// Reposition the items.
+	int curItem = 0;
+	int curY = 0;
+	int maxItem = GetScrollMax();
+	for(LBItem *pItem=m_Items.m_pNext; pItem != &m_Items; pItem=pItem->m_pNext)
+	{
+		if(curItem < m_ItemOffset)
+		{
+			pItem->m_pPanel->setVisible(false);
+			bNeedScrollbar = true;
+		}
+		else if (curItem >= maxItem)
+		{
+			// item is past the end of the items we care about
+			pItem->m_pPanel->setVisible(false);
+		}
+		else
+		{
+			pItem->m_pPanel->setVisible(true);
+
+			int itemWidth, itemHeight;
+			pItem->m_pPanel->getSize(itemWidth, itemHeight);
+
+			// Don't change the item's height but change its width to fit the listbox.
+			pItem->m_pPanel->setBounds(0, curY, wide, itemHeight);
+
+			curY += itemHeight;
+
+			if (curY > tall)
+			{
+				bNeedScrollbar = true;
+			}
+		}
+
+		++curItem;
+	}
+
+	m_ScrollBar.setVisible(bNeedScrollbar);
+
+	repaint();
+}
+
+void CListBox::paintBackground()
+{
+}
+
+void CListBox::SetScrollRange(int maxScroll)
+{
+	m_iScrollMax = maxScroll;
+	m_ScrollBar.setRange(0, maxScroll);
+	InternalLayout();
+}
+
+int	CListBox::GetScrollMax()
+{
+	if (m_iScrollMax < 0)
+	{
+		return GetNumItems() - 1;
+	}
+
+	return m_iScrollMax;
+}
+
+
diff --git a/main/source/game_shared/vgui_listbox.h b/main/source/game_shared/vgui_listbox.h
new file mode 100644
index 00000000..f24a9473
--- /dev/null
+++ b/main/source/game_shared/vgui_listbox.h
@@ -0,0 +1,115 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VOICE_LISTBOX_H
+#define VOICE_LISTBOX_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+
+#include "VGUI_Panel.h"
+#include "VGUI_IntChangeSignal.h"
+
+#include "VGUI_Slider2.h"
+#include "VGUI_ScrollBar2.h"
+
+
+namespace vgui
+{
+
+// Listbox class used by voice code. Based off of vgui's list panel but with some modifications:
+// - This listbox clips its child items to its rectangle.
+// - You can access things like the scrollbar and find out the item width.
+// - The scrollbar scrolls one element at a time and the range is correct.
+
+// Note: this listbox does not provide notification when items are 
+class CListBox : public Panel
+{
+public:
+	
+					CListBox();
+					~CListBox();
+
+	void			Init();
+	void			Term();
+
+	// Add an item to the listbox. This automatically sets the item's parent to the listbox 
+	// and resizes the item's width to fit within the listbox.
+	void			AddItem(Panel *pPanel);
+
+	// Get the number of items currently in the listbox.
+	int				GetNumItems();
+
+	// Get the width that listbox items will be set to (this changes if you resize the listbox).
+	int				GetItemWidth();
+
+	// Get/set the scrollbar position (position says which element is at the top of the listbox).
+	int				GetScrollPos();
+	void			SetScrollPos(int pos);
+
+	// sets the last item the listbox should scroll to
+	// scroll to GetNumItems() if not set
+	void			SetScrollRange(int maxScroll);
+
+	// returns the maximum value the scrollbar can scroll to
+	int				GetScrollMax();
+
+// vgui overrides.
+public:
+	
+	virtual void	setPos(int x, int y);
+	virtual void	setSize(int wide,int tall);
+	virtual void	setPixelScroll(int value);
+	virtual void	paintBackground();
+
+
+protected:
+
+	class LBItem
+	{
+	public:
+		Panel	*m_pPanel;
+		LBItem	*m_pPrev, *m_pNext;
+	};
+
+	class ListBoxSignal : public IntChangeSignal
+	{
+	public:
+		void intChanged(int value,Panel* panel)
+		{
+			m_pListBox->setPixelScroll(-value);
+		}
+
+		vgui::CListBox	*m_pListBox;
+	};
+
+
+protected:
+	
+	void			InternalLayout();
+
+
+protected: 
+
+	// All the items..
+	LBItem			m_Items;
+
+	Panel			m_ItemsPanel;
+
+	int				m_ItemOffset;	// where we're scrolled to
+	Slider2			m_Slider;
+	ScrollBar2		m_ScrollBar;
+	ListBoxSignal	m_Signal;
+
+	int				m_iScrollMax;
+};
+
+}
+
+
+#endif // VOICE_LISTBOX_H
diff --git a/main/source/game_shared/vgui_loadtga.cpp b/main/source/game_shared/vgui_loadtga.cpp
new file mode 100644
index 00000000..fd905714
--- /dev/null
+++ b/main/source/game_shared/vgui_loadtga.cpp
@@ -0,0 +1,93 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#include "../cl_dll/wrect.h"
+#include "../cl_dll/cl_dll.h"
+#include "vgui.h"
+#include "vgui_loadtga.h"
+#include "vgui_inputstream.h"
+
+
+// ---------------------------------------------------------------------- //
+// Helper class for loading tga files.
+// ---------------------------------------------------------------------- //
+class MemoryInputStream : public vgui::InputStream
+{
+public:
+				MemoryInputStream()
+				{
+					m_pData = NULL;
+					m_DataLen = m_ReadPos = 0;
+				}
+		
+	virtual void  seekStart(bool& success)					{m_ReadPos=0; success=true;}
+	virtual void  seekRelative(int count,bool& success)		{m_ReadPos+=count; success=true;}
+	virtual void  seekEnd(bool& success)					{m_ReadPos=m_DataLen; success=true;}
+	virtual int   getAvailable(bool& success)				{success=false; return 0;} // This is what vgui does for files...
+	
+	virtual uchar readUChar(bool& success)					
+	{
+		if(m_ReadPos>=0 && m_ReadPos<m_DataLen)
+		{
+			success=true;
+			uchar ret = m_pData[m_ReadPos];
+			++m_ReadPos;
+			return ret;
+		}
+		else
+		{
+			success=false;
+			return 0;
+		}
+	}
+
+	virtual void  readUChar(uchar* buf,int count,bool& success)
+	{
+		for(int i=0; i < count; i++)
+			buf[i] = readUChar(success);
+	}
+
+	virtual void  close(bool& success) 
+	{
+		m_pData = NULL;
+		m_DataLen = m_ReadPos = 0;
+	}
+
+	uchar		*m_pData;
+	int			m_DataLen;
+	int			m_ReadPos;
+};
+
+vgui::BitmapTGA* vgui_LoadTGA(char const *pFilename)
+{
+	MemoryInputStream stream;
+	
+	stream.m_pData = gEngfuncs.COM_LoadFile((char*)pFilename, 5, &stream.m_DataLen);
+	if(!stream.m_pData)
+		return NULL;
+	
+	stream.m_ReadPos = 0;
+	vgui::BitmapTGA *pRet = new vgui::BitmapTGA(&stream, true);
+	gEngfuncs.COM_FreeFile(stream.m_pData);
+	
+	return pRet;
+}
+
+vgui::BitmapTGA* vgui_LoadTGANoInvertAlpha(char const *pFilename)
+{
+	MemoryInputStream stream;
+	
+	stream.m_pData = gEngfuncs.COM_LoadFile((char*)pFilename, 5, &stream.m_DataLen);
+	if(!stream.m_pData)
+		return NULL;
+	
+	stream.m_ReadPos = 0;
+	vgui::BitmapTGA *pRet = new vgui::BitmapTGA(&stream, false);
+	gEngfuncs.COM_FreeFile(stream.m_pData);
+	
+	return pRet;
+}
diff --git a/main/source/game_shared/vgui_loadtga.h b/main/source/game_shared/vgui_loadtga.h
new file mode 100644
index 00000000..2a9c0b24
--- /dev/null
+++ b/main/source/game_shared/vgui_loadtga.h
@@ -0,0 +1,22 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_LOADTGA_H
+#define VGUI_LOADTGA_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+
+#include "vgui_bitmaptga.h"
+
+
+vgui::BitmapTGA* vgui_LoadTGA(char const *pFilename);
+vgui::BitmapTGA* vgui_LoadTGANoInvertAlpha(char const *pFilename);
+
+
+#endif // VGUI_LOADTGA_H
diff --git a/main/source/game_shared/vgui_scrollbar2.cpp b/main/source/game_shared/vgui_scrollbar2.cpp
new file mode 100644
index 00000000..acfbb0d0
--- /dev/null
+++ b/main/source/game_shared/vgui_scrollbar2.cpp
@@ -0,0 +1,310 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+
+#include "VGUI_ScrollBar2.h"
+#include "VGUI_Slider2.h"
+#include "vgui_loadtga.h"
+
+#include<VGUI_IntChangeSignal.h>
+#include<VGUI_Button.h>
+#include<VGUI_ActionSignal.h>
+#include<VGUI_LineBorder.h>
+
+using namespace vgui;
+
+
+namespace
+{
+class FooDefaultScrollBarIntChangeSignal : public IntChangeSignal
+{
+public:
+	FooDefaultScrollBarIntChangeSignal(ScrollBar2* scrollBar)
+	{
+		_scrollBar=scrollBar;
+	}
+	virtual void intChanged(int value,Panel* panel)
+	{
+		_scrollBar->fireIntChangeSignal();
+	}
+protected:
+	ScrollBar2* _scrollBar;
+};
+
+class FooDefaultButtonSignal : public ActionSignal
+{
+public:
+	ScrollBar2* _scrollBar;
+	int        _buttonIndex;
+public:
+	FooDefaultButtonSignal(ScrollBar2* scrollBar,int buttonIndex)
+	{
+		_scrollBar=scrollBar;
+		_buttonIndex=buttonIndex;
+	}
+public:
+	virtual void actionPerformed(Panel* panel)
+	{
+		_scrollBar->doButtonPressed(_buttonIndex);
+	}
+};
+
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Default scrollbar button
+//			Draws in new scoreboard style
+//-----------------------------------------------------------------------------
+class ScrollBarButton : public Button
+{
+private:
+	LineBorder m_Border;
+
+public:
+	ScrollBarButton(const char *filename, int x, int y, int wide, int tall) : m_Border(Color(60, 60, 60, 0)), Button("", x, y, wide, tall)
+	{
+		Image *image = vgui_LoadTGA(filename);
+		if (image)
+		{
+			image->setColor(Color(140, 140, 140, 0));
+			setImage(image);
+		}
+
+		setBorder(&m_Border);
+	}
+
+	virtual void paintBackground()
+	{
+		int wide,tall;
+		getPaintSize(wide,tall);
+
+		// fill the background
+		drawSetColor(0, 0, 0, 0);
+		drawFilledRect(0, 0, wide, tall);
+	}
+};
+
+
+
+
+//-----------------------------------------------------------------------------
+// Purpose: Constructor
+// Input  : x - 
+//			y - 
+//			wide - 
+//			tall - 
+//			vertical - 
+//-----------------------------------------------------------------------------
+ScrollBar2::ScrollBar2(int x,int y,int wide,int tall,bool vertical) : Panel(x,y,wide,tall)
+{
+	_slider=null;
+	_button[0]=null;
+	_button[1]=null;
+	
+	if(vertical)
+	{
+		setSlider(new Slider2(0,wide-1,wide,(tall-(wide*2))+2,true));
+		setButton(new ScrollBarButton("gfx/vgui/arrowup.tga",0,0,wide,wide),0);
+		setButton(new ScrollBarButton("gfx/vgui/arrowdown.tga",0,tall-wide,wide,wide),1);
+	}
+	else
+	{
+		// untested code
+		setSlider(new Slider2(tall,0,wide-(tall*2),tall,false));
+		setButton(new ScrollBarButton("gfx/vgui/320_arrowlt.tga",0,0,tall+1,tall+1),0);
+		setButton(new ScrollBarButton("gfx/vgui/320_arrowrt.tga",wide-tall,0,tall+1,tall+1),1);
+	}
+
+	setPaintBorderEnabled(true);
+	setPaintBackgroundEnabled(true);
+	setPaintEnabled(true);
+	setButtonPressedScrollValue(15);
+
+	validate();
+ }
+
+void ScrollBar2::setSize(int wide,int tall)
+{
+	Panel::setSize(wide,tall);
+
+	if(_slider==null)
+	{
+		return;
+	}
+
+	if(_button[0]==null)
+	{
+		return;
+	}
+
+	if(_button[1]==null)
+	{
+		return;
+	}
+
+	getPaintSize(wide,tall);
+
+	if(_slider->isVertical())
+	{
+		_slider->setBounds(0,wide,wide,tall-(wide*2));
+		//_slider->setBounds(0,0,wide,tall);
+		_button[0]->setBounds(0,0,wide,wide);
+		_button[1]->setBounds(0,tall-wide,wide,wide);
+	}
+	else
+	{
+		_slider->setBounds(tall,0,wide-(tall*2),tall);
+		//_slider->setBounds(0,0,wide,tall);
+		_button[0]->setBounds(0,0,tall,tall);
+		_button[1]->setBounds((wide-tall),0,tall,tall);
+	}
+}
+
+void ScrollBar2::performLayout()
+{
+}
+
+void ScrollBar2::setValue(int value)
+{
+	_slider->setValue(value);
+}
+
+int ScrollBar2::getValue()
+{
+	return _slider->getValue();
+}
+
+void ScrollBar2::addIntChangeSignal(IntChangeSignal* s)
+{
+	_intChangeSignalDar.putElement(s);
+	_slider->addIntChangeSignal(new FooDefaultScrollBarIntChangeSignal(this));
+}
+
+void ScrollBar2::setRange(int min,int max)
+{
+	_slider->setRange(min,max);
+}
+
+void ScrollBar2::fireIntChangeSignal()
+{
+	for(int i=0;i<_intChangeSignalDar.getCount();i++)
+	{
+		_intChangeSignalDar[i]->intChanged(_slider->getValue(),this);
+	}
+}
+
+bool ScrollBar2::isVertical()
+{
+	return _slider->isVertical();
+}
+
+bool ScrollBar2::hasFullRange()
+{
+	return _slider->hasFullRange();
+}
+
+//LEAK: new and old slider will leak
+void ScrollBar2::setButton(Button* button,int index)
+{
+	if(_button[index]!=null)
+	{
+		removeChild(_button[index]);
+	}
+	_button[index]=button;
+	addChild(_button[index]);
+
+	_button[index]->addActionSignal(new FooDefaultButtonSignal(this,index));
+
+	validate();
+
+	//_button[index]->setVisible(false);
+}
+
+Button* ScrollBar2::getButton(int index)
+{
+	return _button[index];
+}
+
+//LEAK: new and old slider will leak
+void ScrollBar2::setSlider(Slider2 *slider)
+{
+	if(_slider!=null)
+	{
+		removeChild(_slider);
+	}
+	_slider=slider;
+	addChild(_slider);
+
+	_slider->addIntChangeSignal(new FooDefaultScrollBarIntChangeSignal(this));
+
+	validate();
+}
+
+Slider2 *ScrollBar2::getSlider()
+{
+	return _slider;
+}
+
+void ScrollBar2::doButtonPressed(int buttonIndex)
+{
+	if(buttonIndex==0)
+	{
+		_slider->setValue(_slider->getValue()-_buttonPressedScrollValue);
+	}
+	else
+	{
+		_slider->setValue(_slider->getValue()+_buttonPressedScrollValue);
+	}
+
+}
+
+void ScrollBar2::setButtonPressedScrollValue(int value)
+{
+	_buttonPressedScrollValue=value;
+}
+
+void ScrollBar2::setRangeWindow(int rangeWindow)
+{
+	_slider->setRangeWindow(rangeWindow);
+}
+
+void ScrollBar2::setRangeWindowEnabled(bool state)
+{
+	_slider->setRangeWindowEnabled(state);
+}
+
+void ScrollBar2::validate()
+{
+	if(_slider!=null)
+	{
+		int buttonOffset=0;
+
+		for(int i=0;i<2;i++)
+		{
+			if(_button[i]!=null)
+			{
+				if(_button[i]->isVisible())
+				{
+					if(_slider->isVertical())
+					{					
+						buttonOffset+=_button[i]->getTall();
+					}
+					else
+					{
+						buttonOffset+=_button[i]->getWide();
+					}
+				}
+			}
+		}
+
+		_slider->setButtonOffset(buttonOffset);
+	}
+
+	int wide,tall;
+	getSize(wide,tall);
+	setSize(wide,tall);
+}
diff --git a/main/source/game_shared/vgui_scrollbar2.h b/main/source/game_shared/vgui_scrollbar2.h
new file mode 100644
index 00000000..ba85bb65
--- /dev/null
+++ b/main/source/game_shared/vgui_scrollbar2.h
@@ -0,0 +1,62 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_SCROLLBAR2_H
+#define VGUI_SCROLLBAR2_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+class IntChangeSignal;
+class Button;
+class Slider2;
+
+//-----------------------------------------------------------------------------
+// Purpose: Hacked up version of the vgui scrollbar
+//-----------------------------------------------------------------------------
+class VGUIAPI ScrollBar2 : public Panel
+{
+public:
+	ScrollBar2(int x,int y,int wide,int tall,bool vertical);
+public:
+	virtual void    setValue(int value);
+	virtual int     getValue();
+	virtual void    addIntChangeSignal(IntChangeSignal* s); 
+	virtual void    setRange(int min,int max);
+	virtual void    setRangeWindow(int rangeWindow);
+	virtual void    setRangeWindowEnabled(bool state);
+	virtual void    setSize(int wide,int tall);
+	virtual bool    isVertical();
+	virtual bool    hasFullRange();
+	virtual void    setButton(Button *button,int index);
+	virtual Button* getButton(int index);
+	virtual void    setSlider(Slider2 *slider);
+	virtual Slider2 *getSlider();
+	virtual void 	doButtonPressed(int buttonIndex);
+	virtual void    setButtonPressedScrollValue(int value);
+	virtual void    validate();
+public: //bullshit public 
+	virtual void fireIntChangeSignal();
+protected:
+	virtual void performLayout();
+protected:
+	Button* _button[2];
+	Slider2 *_slider;
+	Dar<IntChangeSignal*> _intChangeSignalDar;
+	int     _buttonPressedScrollValue;
+};
+
+}
+
+#endif // VGUI_SCROLLBAR2_H
diff --git a/main/source/game_shared/vgui_slider2.cpp b/main/source/game_shared/vgui_slider2.cpp
new file mode 100644
index 00000000..c8af14b0
--- /dev/null
+++ b/main/source/game_shared/vgui_slider2.cpp
@@ -0,0 +1,436 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: New version of the slider bar
+//
+// $NoKeywords: $
+//=============================================================================
+
+#include "VGUI_Slider2.h"
+
+#include<VGUI_InputSignal.h>
+#include<VGUI_App.h>
+#include<VGUI_IntChangeSignal.h>
+#include<VGUI_MouseCode.h>
+
+using namespace vgui;
+
+namespace
+{
+class FooDefaultSliderSignal : public InputSignal
+{
+private:
+	Slider2* _slider;
+public:
+	FooDefaultSliderSignal(Slider2* slider)
+	{
+		_slider=slider;
+	}
+public:
+	void cursorMoved(int x,int y,Panel* panel)
+	{
+		_slider->privateCursorMoved(x,y,panel);
+	}
+	void cursorEntered(Panel* panel){}
+	void cursorExited(Panel* panel){}
+	void mouseDoublePressed(MouseCode code,Panel* panel){}
+	void mousePressed(MouseCode code,Panel* panel)
+	{
+		_slider->privateMousePressed(code,panel);
+	}
+	void mouseReleased(MouseCode code,Panel* panel)
+	{
+		_slider->privateMouseReleased(code,panel);
+	}
+	void mouseWheeled(int delta,Panel* panel){}
+	void keyPressed(KeyCode code,Panel* panel){}
+	void keyTyped(KeyCode code,Panel* panel){}
+	void keyReleased(KeyCode code,Panel* panel){}
+	void keyFocusTicked(Panel* panel){}
+};
+}
+
+Slider2::Slider2(int x,int y,int wide,int tall,bool vertical) : Panel(x,y,wide,tall)
+{
+	_vertical=vertical;	
+	_dragging=false;
+	_value=0;
+	_range[0]=0;
+	_range[1]=299;
+	_rangeWindow=0;
+	_rangeWindowEnabled=false;
+	_buttonOffset=0;
+	recomputeNobPosFromValue();
+	addInputSignal(new FooDefaultSliderSignal(this));
+}
+
+void Slider2::setSize(int wide,int tall)
+{
+	Panel::setSize(wide,tall);
+	recomputeNobPosFromValue();
+}
+
+bool Slider2::isVertical()
+{
+	return _vertical;
+}
+
+void Slider2::setValue(int value)
+{
+	int oldValue=_value;
+
+	if(value<_range[0])
+	{
+		value=_range[0];
+	}
+
+	if(value>_range[1])
+	{
+		value=_range[1];
+	}
+	
+	_value=value;
+	recomputeNobPosFromValue();
+
+	if(_value!=oldValue)
+	{
+		fireIntChangeSignal();
+	}
+}
+
+int Slider2::getValue()
+{
+	return _value;
+}
+
+void Slider2::recomputeNobPosFromValue()
+{
+	int wide,tall;
+
+	getPaintSize(wide,tall);
+
+	float fwide=(float)wide;
+	float ftall=(float)tall;
+	float frange=(float)(_range[1]-_range[0]);
+	float fvalue=(float)(_value-_range[0]);
+	float fper=fvalue/frange;
+	float frangewindow=(float)(_rangeWindow);
+	
+	if(frangewindow<0)
+	{
+		frangewindow=0;
+	}
+
+	if(!_rangeWindowEnabled)
+	{
+		frangewindow=frange;
+	}
+
+	if ( frangewindow > 0 )
+	{
+		if(_vertical)
+		{
+			float fnobsize=frangewindow;
+			float freepixels = ftall - fnobsize;
+
+			float firstpixel = freepixels * fper;
+
+			_nobPos[0]=(int)( firstpixel );
+			_nobPos[1]=(int)( firstpixel + fnobsize );
+
+			if(_nobPos[1]>tall)
+			{
+				_nobPos[0]=tall-((int)fnobsize);
+				_nobPos[1]=tall;
+			}
+		}
+		else
+		{
+			float fnobsize=frangewindow;
+			float freepixels = fwide - fnobsize;
+
+			float firstpixel = freepixels * fper;
+
+			_nobPos[0]=(int)( firstpixel );
+			_nobPos[1]=(int)( firstpixel + fnobsize );
+
+			if(_nobPos[1]>wide)
+			{
+				_nobPos[0]=wide-((int)fnobsize);
+				_nobPos[1]=wide;
+			}
+		}
+	}
+	
+	repaint();
+}
+
+void Slider2::recomputeValueFromNobPos()
+{
+	int wide,tall;
+	getPaintSize(wide,tall);
+
+	float fwide=(float)wide;
+	float ftall=(float)tall;
+	float frange=(float)(_range[1]-_range[0]);
+	float fvalue=(float)(_value-_range[0]);
+	float fnob=(float)_nobPos[0];
+	float frangewindow=(float)(_rangeWindow);
+
+	if(frangewindow<0)
+	{
+		frangewindow=0;
+	}
+
+	if(!_rangeWindowEnabled)
+	{
+		frangewindow=frange;
+	}
+
+	if ( frangewindow > 0 )
+	{
+		if(_vertical)
+		{
+			float fnobsize=frangewindow;
+			fvalue=frange*(fnob/(ftall-fnobsize));
+		}
+		else
+		{
+			float fnobsize=frangewindow;
+			fvalue=frange*(fnob/(fwide-fnobsize));
+		}
+	}
+	// Take care of rounding issues.
+	_value=(int)(fvalue+_range[0]+0.5);
+
+	// Clamp final result
+	_value = ( _value < _range[1] ) ? _value : _range[1];
+}
+
+bool Slider2::hasFullRange()
+{
+	int wide,tall;
+	getPaintSize(wide,tall);
+
+	float fwide=(float)wide;
+	float ftall=(float)tall;
+	float frange=(float)(_range[1]-_range[0]);
+	float frangewindow=(float)(_rangeWindow);
+
+	if(frangewindow<0)
+	{
+		frangewindow=0;
+	}
+
+	if(!_rangeWindowEnabled)
+	{
+		frangewindow=frange;
+	}
+
+	if ( frangewindow > 0 )
+	{
+		if(_vertical)
+		{
+			if( frangewindow <= ( ftall + _buttonOffset ) )
+			{
+				return true;
+			}
+		}
+		else
+		{
+			if( frangewindow <= ( fwide + _buttonOffset ) )
+			{
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+	
+void Slider2::addIntChangeSignal(IntChangeSignal* s)
+{
+	_intChangeSignalDar.putElement(s);
+}
+
+void Slider2::fireIntChangeSignal()
+{	
+	for(int i=0;i<_intChangeSignalDar.getCount();i++)
+	{
+		_intChangeSignalDar[i]->intChanged(getValue(),this);
+	}
+}
+
+void Slider2::paintBackground()
+{
+	int wide,tall;
+	getPaintSize(wide,tall);
+
+	if (_vertical)
+	{
+		// background behind slider
+		drawSetColor(40, 40, 40, 0);
+		drawFilledRect(0, 0, wide, tall);
+
+		// slider front
+		drawSetColor(0, 0, 0, 0);
+		drawFilledRect(0,_nobPos[0],wide,_nobPos[1]); 
+
+		// slider border
+		drawSetColor(60, 60, 60, 0);
+		drawFilledRect(0,_nobPos[0],wide,_nobPos[0]+1);      // top
+		drawFilledRect(0,_nobPos[1],wide,_nobPos[1]+1);      // bottom
+		drawFilledRect(0,_nobPos[0]+1,1,_nobPos[1]);         // left
+		drawFilledRect(wide-1,_nobPos[0]+1,wide,_nobPos[1]); // right
+	}
+	else
+	{
+		//!! doesn't work
+
+		drawSetColor(Scheme::sc_secondary3);
+		drawFilledRect(0,0,wide,tall);
+
+		drawSetColor(Scheme::sc_black);
+		drawOutlinedRect(0,0,wide,tall);
+
+		drawSetColor(Scheme::sc_primary2);
+		drawFilledRect(_nobPos[0],0,_nobPos[1],tall);
+		
+		drawSetColor(Scheme::sc_black);
+		drawOutlinedRect(_nobPos[0],0,_nobPos[1],tall);
+	}
+}
+
+void Slider2::setRange(int min,int max)
+{
+	if(max<min)
+	{
+		max=min;
+	}
+
+	if(min>max)
+	{
+		min=max;
+	}
+
+	_range[0]=min;
+	_range[1]=max;
+}
+
+void Slider2::getRange(int& min,int& max)
+{
+	min=_range[0];
+	max=_range[1];
+}
+
+void Slider2::privateCursorMoved(int x,int y,Panel* panel)
+{
+	if(!_dragging)
+	{
+		return;
+	}
+
+	getApp()->getCursorPos(x,y);
+	screenToLocal(x,y);
+
+	int wide,tall;
+	getPaintSize(wide,tall);
+
+	if(_vertical)
+	{
+		_nobPos[0]=_nobDragStartPos[0]+(y-_dragStartPos[1]);
+		_nobPos[1]=_nobDragStartPos[1]+(y-_dragStartPos[1]);
+
+		if(_nobPos[1]>tall)
+		{
+			_nobPos[0]=tall-(_nobPos[1]-_nobPos[0]);
+			_nobPos[1]=tall;
+		}
+		
+		if(_nobPos[0]<0)
+		{
+			_nobPos[1]=_nobPos[1]-_nobPos[0];
+			_nobPos[0]=0;
+		}
+	}
+	else
+	{
+		_nobPos[0]=_nobDragStartPos[0]+(x-_dragStartPos[0]);
+		_nobPos[1]=_nobDragStartPos[1]+(x-_dragStartPos[0]);
+
+		if(_nobPos[1]>wide)
+		{
+			_nobPos[0]=wide-(_nobPos[1]-_nobPos[0]);
+			_nobPos[1]=wide;
+		}
+		
+		if(_nobPos[0]<0)
+		{
+			_nobPos[1]=_nobPos[1]-_nobPos[0];
+			_nobPos[0]=0;
+		}
+	}
+
+	recomputeValueFromNobPos();
+	repaint();
+	fireIntChangeSignal();
+}
+
+void Slider2::privateMousePressed(MouseCode code,Panel* panel)
+{
+	int x,y;
+	getApp()->getCursorPos(x,y);
+	screenToLocal(x,y);
+
+	if(_vertical)
+	{
+		if((y>=_nobPos[0])&&(y<_nobPos[1]))
+		{
+			_dragging=true;
+			getApp()->setMouseCapture(this);
+			_nobDragStartPos[0]=_nobPos[0];
+			_nobDragStartPos[1]=_nobPos[1];
+			_dragStartPos[0]=x;
+			_dragStartPos[1]=y;
+		}
+	}
+	else
+	{
+		if((x>=_nobPos[0])&&(x<_nobPos[1]))
+		{
+			_dragging=true;
+			getApp()->setMouseCapture(this);
+			_nobDragStartPos[0]=_nobPos[0];
+			_nobDragStartPos[1]=_nobPos[1];
+			_dragStartPos[0]=x;
+			_dragStartPos[1]=y;
+		}
+	}
+
+}
+
+void Slider2::privateMouseReleased(MouseCode code,Panel* panel)
+{
+	_dragging=false;
+	getApp()->setMouseCapture(null);
+}
+
+void Slider2::getNobPos(int& min, int& max)
+{
+	min=_nobPos[0];
+	max=_nobPos[1];
+}
+
+void Slider2::setRangeWindow(int rangeWindow)
+{
+	_rangeWindow=rangeWindow;
+}
+
+void Slider2::setRangeWindowEnabled(bool state)
+{
+	_rangeWindowEnabled=state;
+}
+
+void Slider2::setButtonOffset(int buttonOffset)
+{
+	_buttonOffset=buttonOffset;
+}
\ No newline at end of file
diff --git a/main/source/game_shared/vgui_slider2.h b/main/source/game_shared/vgui_slider2.h
new file mode 100644
index 00000000..4f1d3f8c
--- /dev/null
+++ b/main/source/game_shared/vgui_slider2.h
@@ -0,0 +1,67 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_SLIDER2_H
+#define VGUI_SLIDER2_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+enum MouseCode;
+class IntChangeSignal;
+
+class VGUIAPI Slider2 : public Panel
+{
+private:
+	bool                  _vertical;
+	bool                  _dragging;
+	int                   _nobPos[2];
+	int                   _nobDragStartPos[2];
+	int                   _dragStartPos[2];
+	Dar<IntChangeSignal*> _intChangeSignalDar;
+	int                   _range[2];
+	int                   _value;
+	int                   _rangeWindow;
+	bool                  _rangeWindowEnabled;
+	int                   _buttonOffset;
+public:
+	Slider2(int x,int y,int wide,int tall,bool vertical);
+public:
+	virtual void setValue(int value);
+	virtual int  getValue();
+	virtual bool isVertical();
+	virtual void addIntChangeSignal(IntChangeSignal* s);
+    virtual void setRange(int min,int max);
+	virtual void getRange(int& min,int& max);
+	virtual void setRangeWindow(int rangeWindow);
+	virtual void setRangeWindowEnabled(bool state);
+	virtual void setSize(int wide,int tall);
+	virtual void getNobPos(int& min, int& max);
+	virtual bool hasFullRange();
+	virtual void setButtonOffset(int buttonOffset);
+private:
+	virtual void recomputeNobPosFromValue();
+	virtual void recomputeValueFromNobPos();
+public: //bullshit public
+	virtual void privateCursorMoved(int x,int y,Panel* panel);
+	virtual void privateMousePressed(MouseCode code,Panel* panel);
+	virtual void privateMouseReleased(MouseCode code,Panel* panel);
+protected:
+    virtual void fireIntChangeSignal();
+	virtual void paintBackground();
+};
+
+}
+
+#endif // VGUI_SLIDER2_H
diff --git a/main/source/game_shared/voice_banmgr.cpp b/main/source/game_shared/voice_banmgr.cpp
new file mode 100644
index 00000000..c48e45ff
--- /dev/null
+++ b/main/source/game_shared/voice_banmgr.cpp
@@ -0,0 +1,197 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#include <string.h>
+#include <stdio.h>
+#include "voice_banmgr.h"
+#include "dlls/extdll.h"
+
+#define BANMGR_FILEVERSION	1
+char const *g_pBanMgrFilename = "voice_ban.dt";
+
+
+
+// Hash a player ID to a byte.
+unsigned char HashPlayerID(char const playerID[16])
+{
+	unsigned char curHash = 0;
+
+	for(int i=0; i < 16; i++)
+		curHash += (unsigned char)playerID[i];
+
+	return curHash;
+}
+
+
+
+CVoiceBanMgr::CVoiceBanMgr()
+{
+	Clear();
+}
+
+
+CVoiceBanMgr::~CVoiceBanMgr()
+{
+	Term();
+}
+
+
+bool CVoiceBanMgr::Init(char const *pGameDir)
+{
+	Term();
+
+	char filename[512];
+	_snprintf(filename, sizeof(filename), "%s/%s", pGameDir, g_pBanMgrFilename);
+
+	// Load in the squelch file.
+	FILE *fp = fopen(filename, "rb");
+	if(fp)
+	{
+		int version;
+		fread(&version, 1, sizeof(version), fp);
+		if(version == BANMGR_FILEVERSION)
+		{
+			fseek(fp, 0, SEEK_END);
+			int nIDs = (ftell(fp) - sizeof(version)) / 16;
+			fseek(fp, sizeof(version), SEEK_SET);
+
+			for(int i=0; i < nIDs; i++)
+			{
+				char playerID[16];
+				fread(playerID, 1, 16, fp);
+				AddBannedPlayer(playerID);
+			}			
+		}
+
+		fclose(fp);
+	}
+
+	return true;
+}
+
+
+void CVoiceBanMgr::Term()
+{
+	// Free all the player structures.
+	for(int i=0; i < 256; i++)
+	{
+		BannedPlayer *pListHead = &m_PlayerHash[i];
+		BannedPlayer *pNext;
+		for(BannedPlayer *pCur=pListHead->m_pNext; pCur != pListHead; pCur=pNext)
+		{
+			pNext = pCur->m_pNext;
+			delete pCur;
+		}
+	}
+
+	Clear();
+}
+
+
+void CVoiceBanMgr::SaveState(char const *pGameDir)
+{
+	// Save the file out.
+	char filename[512];
+	_snprintf(filename, sizeof(filename), "%s/%s", pGameDir, g_pBanMgrFilename);
+
+	FILE *fp = fopen(filename, "wb");
+	if(fp)
+	{
+		int version = BANMGR_FILEVERSION;
+		fwrite(&version, 1, sizeof(version), fp);
+
+		for(int i=0; i < 256; i++)
+		{
+			BannedPlayer *pListHead = &m_PlayerHash[i];
+			for(BannedPlayer *pCur=pListHead->m_pNext; pCur != pListHead; pCur=pCur->m_pNext)
+			{
+				fwrite(pCur->m_PlayerID, 1, 16, fp);
+			}
+		}
+
+		fclose(fp);
+	}
+}
+
+
+bool CVoiceBanMgr::GetPlayerBan(char const playerID[16])
+{
+	return !!InternalFindPlayerSquelch(playerID);
+}
+
+
+void CVoiceBanMgr::SetPlayerBan(char const playerID[16], bool bSquelch)
+{
+	if(bSquelch)
+	{
+		// Is this guy already squelched?
+		if(GetPlayerBan(playerID))
+			return;
+	
+		AddBannedPlayer(playerID);
+	}
+	else
+	{
+		BannedPlayer *pPlayer = InternalFindPlayerSquelch(playerID);
+		if(pPlayer)
+		{
+			pPlayer->m_pPrev->m_pNext = pPlayer->m_pNext;
+			pPlayer->m_pNext->m_pPrev = pPlayer->m_pPrev;
+			delete pPlayer;
+		}
+	}
+}
+
+
+void CVoiceBanMgr::ForEachBannedPlayer(void (*callback)(char id[16]))
+{
+	for(int i=0; i < 256; i++)
+	{
+		for(BannedPlayer *pCur=m_PlayerHash[i].m_pNext; pCur != &m_PlayerHash[i]; pCur=pCur->m_pNext)
+		{
+			callback(pCur->m_PlayerID);
+		}
+	}
+}
+
+
+void CVoiceBanMgr::Clear()
+{
+	// Tie off the hash table entries.
+	for(int i=0; i < 256; i++)
+		m_PlayerHash[i].m_pNext = m_PlayerHash[i].m_pPrev = &m_PlayerHash[i];
+}
+
+
+CVoiceBanMgr::BannedPlayer* CVoiceBanMgr::InternalFindPlayerSquelch(char const playerID[16])
+{
+	int index = HashPlayerID(playerID);
+	BannedPlayer *pListHead = &m_PlayerHash[index];
+	for(BannedPlayer *pCur=pListHead->m_pNext; pCur != pListHead; pCur=pCur->m_pNext)
+	{
+		if(memcmp(playerID, pCur->m_PlayerID, 16) == 0)
+			return pCur;
+	}
+
+	return NULL;
+}
+
+
+CVoiceBanMgr::BannedPlayer* CVoiceBanMgr::AddBannedPlayer(char const playerID[16])
+{
+	BannedPlayer *pNew = new BannedPlayer;
+	if(!pNew)
+		return NULL;
+
+	int index = HashPlayerID(playerID);
+	memcpy(pNew->m_PlayerID, playerID, 16);
+	pNew->m_pNext = &m_PlayerHash[index];
+	pNew->m_pPrev = m_PlayerHash[index].m_pPrev;
+	pNew->m_pPrev->m_pNext = pNew->m_pNext->m_pPrev = pNew;
+	return pNew;
+}
+
diff --git a/main/source/game_shared/voice_banmgr.h b/main/source/game_shared/voice_banmgr.h
new file mode 100644
index 00000000..3db37b91
--- /dev/null
+++ b/main/source/game_shared/voice_banmgr.h
@@ -0,0 +1,57 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VOICE_BANMGR_H
+#define VOICE_BANMGR_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+
+// This class manages the (persistent) list of squelched players.
+class CVoiceBanMgr
+{
+public:
+
+				CVoiceBanMgr();
+				~CVoiceBanMgr();	
+
+	// Init loads the list of squelched players from disk.
+	bool		Init(char const *pGameDir);
+	void		Term();
+
+	// Saves the state into voice_squelch.dt.
+	void		SaveState(char const *pGameDir);
+
+	bool		GetPlayerBan(char const playerID[16]);
+	void		SetPlayerBan(char const playerID[16], bool bSquelch);
+
+	// Call your callback for each banned player.
+	void		ForEachBannedPlayer(void (*callback)(char id[16]));
+
+
+protected:
+
+	class BannedPlayer
+	{
+	public:
+		char			m_PlayerID[16];
+		BannedPlayer	*m_pPrev, *m_pNext;
+	};
+
+	void				Clear();
+	BannedPlayer*	InternalFindPlayerSquelch(char const playerID[16]);
+	BannedPlayer*	AddBannedPlayer(char const playerID[16]);
+
+
+protected:
+
+	BannedPlayer	m_PlayerHash[256];
+};
+
+
+#endif // VOICE_BANMGR_H
diff --git a/main/source/game_shared/voice_common.h b/main/source/game_shared/voice_common.h
new file mode 100644
index 00000000..abd49ef2
--- /dev/null
+++ b/main/source/game_shared/voice_common.h
@@ -0,0 +1,24 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VOICE_COMMON_H
+#define VOICE_COMMON_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+
+#include "bitvec.h"
+
+
+#define VOICE_MAX_PLAYERS		32	// (todo: this should just be set to MAX_CLIENTS).
+#define VOICE_MAX_PLAYERS_DW	((VOICE_MAX_PLAYERS / 32) + !!(VOICE_MAX_PLAYERS & 31))
+
+typedef CBitVec<VOICE_MAX_PLAYERS> CPlayerBitVec;
+
+
+#endif // VOICE_COMMON_H
diff --git a/main/source/game_shared/voice_gamemgr.cpp b/main/source/game_shared/voice_gamemgr.cpp
new file mode 100644
index 00000000..bb4da2ae
--- /dev/null
+++ b/main/source/game_shared/voice_gamemgr.cpp
@@ -0,0 +1,276 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#include "voice_gamemgr.h"
+#include <string.h>
+#include <assert.h>
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "player.h"
+
+
+
+#define UPDATE_INTERVAL	0.3
+
+
+// These are stored off as CVoiceGameMgr is created and deleted.
+CPlayerBitVec	g_PlayerModEnable;		// Set to 1 for each player if the player wants to use voice in this mod.
+										// (If it's zero, then the server reports that the game rules are saying the
+										// player can't hear anyone).
+
+CPlayerBitVec	g_BanMasks[VOICE_MAX_PLAYERS];	// Tells which players don't want to hear each other.
+												// These are indexed as clients and each bit represents a client
+												// (so player entity is bit+1).
+
+CPlayerBitVec	g_SentGameRulesMasks[VOICE_MAX_PLAYERS];	// These store the masks we last sent to each client so we can determine if
+CPlayerBitVec	g_SentBanMasks[VOICE_MAX_PLAYERS];			// we need to resend them.
+CPlayerBitVec	g_bWantModEnable;
+
+cvar_t voice_serverdebug = {"voice_serverdebug", "0"};
+
+// Set game rules to allow all clients to talk to each other.
+// Muted players still can't talk to each other.
+cvar_t sv_alltalk = {"sv_alltalk", "0"};
+
+// ------------------------------------------------------------------------ //
+// Static helpers.
+// ------------------------------------------------------------------------ //
+
+// Find a player with a case-insensitive name search.
+static CBasePlayer* FindPlayerByName(const char *pTestName)
+{
+	for(int i=1; i <= gpGlobals->maxClients; i++)
+	{
+		edict_t *pEdict = g_engfuncs.pfnPEntityOfEntIndex(i);
+		if(pEdict)
+		{
+			CBaseEntity *pEnt = CBaseEntity::Instance(pEdict);
+			if(pEnt && pEnt->IsPlayer())
+			{			
+				const char *pNetName = STRING(pEnt->pev->netname);
+				if(stricmp(pNetName, pTestName) == 0)
+				{
+					return (CBasePlayer*)pEnt;
+				}
+			}
+		}
+	}
+
+	return NULL;
+}
+
+static void VoiceServerDebug( char const *pFmt, ... )
+{
+	char msg[4096];
+	va_list marker;
+
+	if( !voice_serverdebug.value )
+		return;
+
+	va_start( marker, pFmt );
+	_vsnprintf( msg, sizeof(msg), pFmt, marker );
+	va_end( marker );
+
+	ALERT( at_console, "%s", msg );
+}
+
+
+
+// ------------------------------------------------------------------------ //
+// CVoiceGameMgr.
+// ------------------------------------------------------------------------ //
+
+CVoiceGameMgr::CVoiceGameMgr()
+{
+	m_UpdateInterval = 0;
+	m_nMaxPlayers = 0;
+}
+
+
+CVoiceGameMgr::~CVoiceGameMgr()
+{
+}
+
+
+bool CVoiceGameMgr::Init(
+	IVoiceGameMgrHelper *pHelper,
+	int maxClients)
+{		  
+	m_pHelper = pHelper;
+	m_nMaxPlayers = VOICE_MAX_PLAYERS < maxClients ? VOICE_MAX_PLAYERS : maxClients;
+	g_engfuncs.pfnPrecacheModel("sprites/voiceicon.spr");
+
+	m_msgPlayerVoiceMask = REG_USER_MSG( "VoiceMask", VOICE_MAX_PLAYERS_DW*4 * 2 );
+	m_msgRequestState = REG_USER_MSG( "ReqState", 0 );
+
+	// register voice_serverdebug if it hasn't been registered already
+	if ( !CVAR_GET_POINTER( "voice_serverdebug" ) )
+		CVAR_REGISTER( &voice_serverdebug );
+
+	if( !CVAR_GET_POINTER( "sv_alltalk" ) )
+		CVAR_REGISTER( &sv_alltalk );
+
+	return true;
+}
+
+
+void CVoiceGameMgr::SetHelper(IVoiceGameMgrHelper *pHelper)
+{
+	m_pHelper = pHelper;
+}
+
+
+void CVoiceGameMgr::Update(double frametime)
+{
+	// Only update periodically.
+	m_UpdateInterval += frametime;
+	if(m_UpdateInterval < UPDATE_INTERVAL)
+		return;
+
+	UpdateMasks();
+}
+
+
+void CVoiceGameMgr::ClientConnected(edict_t *pEdict)
+{
+	int index = ENTINDEX(pEdict) - 1;
+	
+	// Clear out everything we use for deltas on this guy.
+	g_bWantModEnable[index] = true;
+	g_SentGameRulesMasks[index].Init(0);
+	g_SentBanMasks[index].Init(0);
+}
+
+// Called to determine if the Receiver has muted (blocked) the Sender
+// Returns true if the receiver has blocked the sender
+bool CVoiceGameMgr::PlayerHasBlockedPlayer(CBasePlayer *pReceiver, CBasePlayer *pSender)
+{
+	int iReceiverIndex, iSenderIndex;
+
+	if ( !pReceiver || !pSender )
+		return false;
+
+	iReceiverIndex = pReceiver->entindex() - 1;
+	iSenderIndex   = pSender->entindex() - 1;
+
+	if ( iReceiverIndex < 0 || iReceiverIndex >= m_nMaxPlayers || iSenderIndex < 0 || iSenderIndex >= m_nMaxPlayers )
+		return false;
+
+	return ( g_BanMasks[iReceiverIndex][iSenderIndex] ? true : false );
+}
+
+bool CVoiceGameMgr::ClientCommand(CBasePlayer *pPlayer, const char *cmd)
+{
+	int playerClientIndex = pPlayer->entindex() - 1;
+	if(playerClientIndex < 0 || playerClientIndex >= m_nMaxPlayers)
+	{
+		VoiceServerDebug( "CVoiceGameMgr::ClientCommand: cmd %s from invalid client (%d)\n", cmd, playerClientIndex );
+		return true;
+	}
+
+	bool bBan = stricmp(cmd, "vban") == 0;
+	if(bBan && CMD_ARGC() >= 2)
+	{
+		for(int i=1; i < CMD_ARGC(); i++)
+		{
+			unsigned long mask = 0;
+			sscanf(CMD_ARGV(i), "%x", &mask);
+
+			if(i <= VOICE_MAX_PLAYERS_DW)
+			{
+				VoiceServerDebug( "CVoiceGameMgr::ClientCommand: vban (0x%x) from %d\n", mask, playerClientIndex );
+				g_BanMasks[playerClientIndex].SetDWord(i-1, mask);
+			}
+			else
+			{
+				VoiceServerDebug( "CVoiceGameMgr::ClientCommand: invalid index (%d)\n", i );
+			}
+		}
+
+		// Commented out UpdateMasks() because Mugsy said it was causing overflows in DOD 4/22
+		// Force it to update the masks now.
+		//UpdateMasks();		
+		return true;
+	}
+	else if(stricmp(cmd, "VModEnable") == 0 && CMD_ARGC() >= 2)
+	{
+		VoiceServerDebug( "CVoiceGameMgr::ClientCommand: VModEnable (%d)\n", !!atoi(CMD_ARGV(1)) );
+		g_PlayerModEnable[playerClientIndex] = !!atoi(CMD_ARGV(1));
+		g_bWantModEnable[playerClientIndex] = false;
+		// Commented out UpdateMasks() because Mugsy said it was causing overflows in DOD 4/22
+		//UpdateMasks();		
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+
+void CVoiceGameMgr::UpdateMasks()
+{
+	m_UpdateInterval = 0;
+
+	bool bAllTalk = !!g_engfuncs.pfnCVarGetFloat( "sv_alltalk" );
+
+	for(int iClient=0; iClient < m_nMaxPlayers; iClient++)
+	{
+		CBaseEntity *pEnt = UTIL_PlayerByIndex(iClient+1);
+		if(!pEnt || !pEnt->IsPlayer())
+			continue;
+
+		// Request the state of their "VModEnable" cvar.
+		if(g_bWantModEnable[iClient])
+		{
+			MESSAGE_BEGIN(MSG_ONE, m_msgRequestState, NULL, pEnt->pev);
+			MESSAGE_END();
+		}
+
+		CBasePlayer *pPlayer = (CBasePlayer*)pEnt;
+
+		CPlayerBitVec gameRulesMask;
+		if(g_PlayerModEnable[iClient])
+		{
+			// Build a mask of who they can hear based on the game rules.
+			for(int iOtherClient=0; iOtherClient < m_nMaxPlayers; iOtherClient++)
+			{
+				CBaseEntity *pEnt = UTIL_PlayerByIndex(iOtherClient+1);
+				if(pEnt && pEnt->IsPlayer() && 
+					(bAllTalk || m_pHelper->CanPlayerHearPlayer(pPlayer, (CBasePlayer*)pEnt)) )
+				{
+					gameRulesMask[iOtherClient] = true;
+				}
+			}
+		}
+
+		// If this is different from what the client has, send an update. 
+		if(gameRulesMask != g_SentGameRulesMasks[iClient] || 
+			g_BanMasks[iClient] != g_SentBanMasks[iClient])
+		{
+			g_SentGameRulesMasks[iClient] = gameRulesMask;
+			g_SentBanMasks[iClient] = g_BanMasks[iClient];
+
+			MESSAGE_BEGIN(MSG_ONE, m_msgPlayerVoiceMask, NULL, pPlayer->pev);
+				int dw;
+				for(dw=0; dw < VOICE_MAX_PLAYERS_DW; dw++)
+				{
+					WRITE_LONG(gameRulesMask.GetDWord(dw));
+					WRITE_LONG(g_BanMasks[iClient].GetDWord(dw));
+				}
+			MESSAGE_END();
+		}
+
+		// Tell the engine.
+		for(int iOtherClient=0; iOtherClient < m_nMaxPlayers; iOtherClient++)
+		{
+			bool bCanHear = gameRulesMask[iOtherClient] && !g_BanMasks[iClient][iOtherClient];
+			g_engfuncs.pfnVoice_SetClientListening(iClient+1, iOtherClient+1, bCanHear);
+		}
+	}
+}
diff --git a/main/source/game_shared/voice_gamemgr.h b/main/source/game_shared/voice_gamemgr.h
new file mode 100644
index 00000000..adfca6f6
--- /dev/null
+++ b/main/source/game_shared/voice_gamemgr.h
@@ -0,0 +1,79 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VOICE_GAMEMGR_H
+#define VOICE_GAMEMGR_H
+#pragma once
+
+
+#include "voice_common.h"
+
+
+class CGameRules;
+class CBasePlayer;
+
+
+class IVoiceGameMgrHelper
+{
+public:
+	virtual				~IVoiceGameMgrHelper() {}
+
+	// Called each frame to determine which players are allowed to hear each other.	This overrides
+	// whatever squelch settings players have.
+	virtual bool		CanPlayerHearPlayer(CBasePlayer *pListener, CBasePlayer *pTalker) = 0;
+};
+
+
+// CVoiceGameMgr manages which clients can hear which other clients.
+class CVoiceGameMgr
+{
+public:
+						CVoiceGameMgr();
+	virtual				~CVoiceGameMgr();
+	
+	bool				Init(
+		IVoiceGameMgrHelper *m_pHelper,
+		int maxClients
+		);
+
+	void				SetHelper(IVoiceGameMgrHelper *pHelper);
+
+	// Updates which players can hear which other players.
+	// If gameplay mode is DM, then only players within the PVS can hear each other.
+	// If gameplay mode is teamplay, then only players on the same team can hear each other.
+	// Player masks are always applied.
+	void				Update(double frametime);
+
+	// Called when a new client connects (unsquelches its entity for everyone).
+	void				ClientConnected(struct edict_s *pEdict);
+
+	// Called on ClientCommand. Checks for the squelch and unsquelch commands.
+	// Returns true if it handled the command.
+	bool				ClientCommand(CBasePlayer *pPlayer, const char *cmd);
+
+	// Called to determine if the Receiver has muted (blocked) the Sender
+	// Returns true if the receiver has blocked the sender
+	bool				PlayerHasBlockedPlayer(CBasePlayer *pReceiver, CBasePlayer *pSender);
+
+
+private:
+
+	// Force it to update the client masks.
+	void				UpdateMasks();
+
+
+private:
+	int					m_msgPlayerVoiceMask;
+	int					m_msgRequestState;
+
+	IVoiceGameMgrHelper	*m_pHelper;
+	int					m_nMaxPlayers;
+	double				m_UpdateInterval;						// How long since the last update.
+};
+
+
+#endif // VOICE_GAMEMGR_H
diff --git a/main/source/game_shared/voice_status.cpp b/main/source/game_shared/voice_status.cpp
new file mode 100644
index 00000000..743cdb50
--- /dev/null
+++ b/main/source/game_shared/voice_status.cpp
@@ -0,0 +1,875 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+// There are hud.h's coming out of the woodwork so this ensures that we get the right one.
+#include "../cl_dll/hud.h"
+
+#include "../cl_dll/cl_util.h"
+#include <assert.h>
+#include <string.h>
+#include <stdio.h>
+#include "../cl_dll/parsemsg.h"
+#include "../cl_dll/hud_servers.h"
+#include "../cl_dll/demo.h"
+#include "demo_api.h"
+#include "voice_status.h"
+#include "r_efx.h"
+#include "entity_types.h"
+#include "VGUI_ActionSignal.h"
+#include "VGUI_Scheme.h"
+#include "VGUI_TextImage.h"
+#include "vgui_loadtga.h"
+#include "vgui_helpers.h"
+#include "vgui_mousecode.h"
+#include "dlls/extdll.h"
+#include "mod/AvHClientUtil.h"
+#include "mod/AvHHudConstants.h"
+
+using namespace vgui;
+
+
+extern int cam_thirdperson;
+
+
+#define VOICE_MODEL_INTERVAL		0.3
+#define SCOREBOARD_BLINK_FREQUENCY	0.3	// How often to blink the scoreboard icons.
+#define SQUELCHOSCILLATE_PER_SECOND	2.0f
+
+
+extern BitmapTGA *LoadTGA( const char* pImageName );
+
+// Allow assignment within conditional
+#pragma warning (disable: 4706)
+
+// ---------------------------------------------------------------------- //
+// The voice manager for the client.
+// ---------------------------------------------------------------------- //
+CVoiceStatus g_VoiceStatus;
+
+CVoiceStatus* GetClientVoiceMgr()
+{
+	return &g_VoiceStatus;
+}
+
+
+
+// ---------------------------------------------------------------------- //
+// CVoiceStatus.
+// ---------------------------------------------------------------------- //
+
+static CVoiceStatus *g_pInternalVoiceStatus = NULL;
+
+int __MsgFunc_VoiceMask(const char *pszName, int iSize, void *pbuf)
+{
+	if(g_pInternalVoiceStatus)
+		g_pInternalVoiceStatus->HandleVoiceMaskMsg(iSize, pbuf);
+
+	return 1;
+}
+
+int __MsgFunc_ReqState(const char *pszName, int iSize, void *pbuf)
+{
+	if(g_pInternalVoiceStatus)
+		g_pInternalVoiceStatus->HandleReqStateMsg(iSize, pbuf);
+
+	return 1;
+}
+
+
+int g_BannedPlayerPrintCount;
+void ForEachBannedPlayer(char id[16])
+{
+	char str[256];
+	sprintf(str, "Ban %d: %2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x\n",
+		g_BannedPlayerPrintCount++,
+		id[0], id[1], id[2], id[3], 
+		id[4], id[5], id[6], id[7], 
+		id[8], id[9], id[10], id[11], 
+		id[12], id[13], id[14], id[15]
+		);
+	strupr(str);
+	gEngfuncs.pfnConsolePrint(str);
+}
+
+
+void ShowBannedCallback()
+{
+	if(g_pInternalVoiceStatus)
+	{
+		g_BannedPlayerPrintCount = 0;
+		gEngfuncs.pfnConsolePrint("------- BANNED PLAYERS -------\n");
+		g_pInternalVoiceStatus->m_BanMgr.ForEachBannedPlayer(ForEachBannedPlayer);
+		gEngfuncs.pfnConsolePrint("------------------------------\n");
+	}
+}
+
+
+// ---------------------------------------------------------------------- //
+// CVoiceStatus.
+// ---------------------------------------------------------------------- //
+
+CVoiceStatus::CVoiceStatus()
+{
+	m_bBanMgrInitialized = false;
+	m_LastUpdateServerState = 0;
+
+	m_pSpeakerLabelIcon = NULL;
+	m_pScoreboardNeverSpoken = NULL;
+	m_pScoreboardNotSpeaking = NULL;
+	m_pScoreboardSpeaking = NULL;
+	m_pScoreboardSpeaking2 = NULL;
+	m_pScoreboardSquelch = NULL;
+	m_pScoreboardBanned = NULL;
+	
+	m_pLocalBitmap = NULL;
+	m_pAckBitmap = NULL;
+
+	m_bTalking = m_bServerAcked = false;
+
+	memset(m_pBanButtons, 0, sizeof(m_pBanButtons));
+
+	m_bServerModEnable = -1;
+}
+
+
+CVoiceStatus::~CVoiceStatus()
+{
+	g_pInternalVoiceStatus = NULL;
+	
+	for(int i=0; i < MAX_VOICE_SPEAKERS; i++)
+	{
+		delete m_Labels[i].m_pLabel;
+		m_Labels[i].m_pLabel = NULL;
+
+		delete m_Labels[i].m_pIcon;
+		m_Labels[i].m_pIcon = NULL;
+		
+		delete m_Labels[i].m_pBackground;
+		m_Labels[i].m_pBackground = NULL;
+	}				
+
+	delete m_pLocalLabel;
+	m_pLocalLabel = NULL;
+
+	FreeBitmaps();
+
+	if(m_pchGameDir)
+	{
+		if(m_bBanMgrInitialized)
+		{
+			m_BanMgr.SaveState(m_pchGameDir);
+		}
+
+		free(m_pchGameDir);
+	}
+}
+
+
+int CVoiceStatus::Init(
+	IVoiceStatusHelper *pHelper,
+	Panel **pParentPanel)
+{
+	// Setup the voice_modenable cvar.
+	gEngfuncs.pfnRegisterVariable("voice_modenable", "1", FCVAR_ARCHIVE);
+
+	gEngfuncs.pfnRegisterVariable("voice_clientdebug", "0", 0);
+
+	gEngfuncs.pfnAddCommand("voice_showbanned", ShowBannedCallback);
+
+	if(gEngfuncs.pfnGetGameDirectory())
+	{
+		m_BanMgr.Init(gEngfuncs.pfnGetGameDirectory());
+		m_bBanMgrInitialized = true;
+	}
+
+	assert(!g_pInternalVoiceStatus);
+	g_pInternalVoiceStatus = this;
+
+	m_BlinkTimer = 0;
+	m_VoiceHeadModel = NULL;
+	memset(m_Labels, 0, sizeof(m_Labels));
+	
+	for(int i=0; i < MAX_VOICE_SPEAKERS; i++)
+	{
+		CVoiceLabel *pLabel = &m_Labels[i];
+
+		pLabel->m_pBackground = new Label("");
+
+		if(pLabel->m_pLabel = new Label(""))
+		{
+			pLabel->m_pLabel->setVisible( true );
+			pLabel->m_pLabel->setFont( Scheme::sf_primary2 );
+			pLabel->m_pLabel->setTextAlignment( Label::a_east );
+			pLabel->m_pLabel->setContentAlignment( Label::a_east );
+			pLabel->m_pLabel->setParent( pLabel->m_pBackground );
+		}
+
+		if( pLabel->m_pIcon = new ImagePanel( NULL ) )
+		{
+			pLabel->m_pIcon->setVisible( true );
+			pLabel->m_pIcon->setParent( pLabel->m_pBackground );
+		}
+
+		pLabel->m_clientindex = -1;
+	}
+
+	m_pLocalLabel = new ImagePanel(NULL);
+
+	m_bInSquelchMode = false;
+
+	m_pHelper = pHelper;
+	m_pParentPanel = pParentPanel;
+	gHUD.AddHudElem(this);
+	m_iFlags = HUD_ACTIVE;
+	HOOK_MESSAGE(VoiceMask);
+	HOOK_MESSAGE(ReqState);
+
+	// Cache the game directory for use when we shut down
+	const char *pchGameDirT = gEngfuncs.pfnGetGameDirectory();
+	m_pchGameDir = (char *)malloc(strlen(pchGameDirT) + 1);
+	strcpy(m_pchGameDir, pchGameDirT);
+
+	return 1;
+}
+
+
+int CVoiceStatus::VidInit()
+{
+	FreeBitmaps();
+
+
+	if( m_pLocalBitmap = vgui_LoadTGA("gfx/vgui/icntlk_pl.tga") )
+	{
+		m_pLocalBitmap->setColor(Color(255,255,255,135));
+	}
+
+	if( m_pAckBitmap = vgui_LoadTGA("gfx/vgui/icntlk_sv.tga") )
+	{
+		m_pAckBitmap->setColor(Color(255,255,255,135));	// Give just a tiny bit of translucency so software draws correctly.
+	}
+
+	m_pLocalLabel->setImage( m_pLocalBitmap );
+	m_pLocalLabel->setVisible( false );
+
+
+	if( m_pSpeakerLabelIcon = vgui_LoadTGANoInvertAlpha("gfx/vgui/speaker4.tga" ) )
+		m_pSpeakerLabelIcon->setColor( Color(255,255,255,1) );		// Give just a tiny bit of translucency so software draws correctly.
+
+	if (m_pScoreboardNeverSpoken = vgui_LoadTGANoInvertAlpha("gfx/vgui/640_speaker1.tga"))
+		m_pScoreboardNeverSpoken->setColor(Color(255,255,255,1));	// Give just a tiny bit of translucency so software draws correctly.
+
+	if(m_pScoreboardNotSpeaking = vgui_LoadTGANoInvertAlpha("gfx/vgui/640_speaker2.tga"))
+		m_pScoreboardNotSpeaking->setColor(Color(255,255,255,1));	// Give just a tiny bit of translucency so software draws correctly.
+	
+	if(m_pScoreboardSpeaking = vgui_LoadTGANoInvertAlpha("gfx/vgui/640_speaker3.tga"))
+		m_pScoreboardSpeaking->setColor(Color(255,255,255,1));	// Give just a tiny bit of translucency so software draws correctly.
+	
+	if(m_pScoreboardSpeaking2 = vgui_LoadTGANoInvertAlpha("gfx/vgui/640_speaker4.tga"))
+		m_pScoreboardSpeaking2->setColor(Color(255,255,255,1));	// Give just a tiny bit of translucency so software draws correctly.
+	
+	if(m_pScoreboardSquelch  = vgui_LoadTGA("gfx/vgui/icntlk_squelch.tga"))
+		m_pScoreboardSquelch->setColor(Color(255,255,255,1));	// Give just a tiny bit of translucency so software draws correctly.
+
+	if(m_pScoreboardBanned = vgui_LoadTGA("gfx/vgui/640_voiceblocked.tga"))
+		m_pScoreboardBanned->setColor(Color(255,255,255,1));	// Give just a tiny bit of translucency so software draws correctly.
+
+	// Figure out the voice head model height.
+	m_VoiceHeadModelHeight = 45;
+	char *pFile = (char *)gEngfuncs.COM_LoadFile("scripts/voicemodel.txt", 5, NULL);
+	if(pFile)
+	{
+		char token[4096];
+		gEngfuncs.COM_ParseFile(pFile, token);
+		if(token[0] >= '0' && token[0] <= '9')
+		{
+			m_VoiceHeadModelHeight = (float)atof(token);
+		}
+
+		gEngfuncs.COM_FreeFile(pFile);
+	}
+
+	m_VoiceHeadModel = gEngfuncs.pfnSPR_Load("sprites/voiceicon.spr");
+	return TRUE;
+}
+
+
+void CVoiceStatus::Frame(double frametime)
+{
+	// check server banned players once per second
+	if(gEngfuncs.GetClientTime() - m_LastUpdateServerState > 1)
+	{
+		UpdateServerState(false);
+	}
+
+	m_BlinkTimer += frametime;
+
+	// Update speaker labels.
+	if( m_pHelper->CanShowSpeakerLabels() )
+	{
+		for( int i=0; i < MAX_VOICE_SPEAKERS; i++ )
+			m_Labels[i].m_pBackground->setVisible( m_Labels[i].m_clientindex != -1 );
+	}
+	else
+	{
+		for( int i=0; i < MAX_VOICE_SPEAKERS; i++ )
+			m_Labels[i].m_pBackground->setVisible( false );
+	}
+
+	for(int i=0; i < VOICE_MAX_PLAYERS; i++)
+		UpdateBanButton(i);
+}
+
+
+void CVoiceStatus::CreateEntities()
+{
+	if(!m_VoiceHeadModel)
+		return;
+
+	cl_entity_t *localPlayer = gEngfuncs.GetLocalPlayer();
+
+	int iOutModel = 0;
+	for(int i=0; i < VOICE_MAX_PLAYERS; i++)
+	{
+		if(!m_VoicePlayers[i])
+			continue;
+		
+		cl_entity_s *pClient = gEngfuncs.GetEntityByIndex(i+1);
+		
+		// Don't show an icon if the player is not in our PVS.
+		if(!pClient || pClient->curstate.messagenum < localPlayer->curstate.messagenum)
+			continue;
+
+		// Don't show an icon for dead or spectating players (ie: invisible entities).
+		if(pClient->curstate.effects & EF_NODRAW)
+			continue;
+
+		// Don't show an icon for the local player unless we're in thirdperson mode.
+		if(pClient == localPlayer && !cam_thirdperson)
+			continue;
+
+		cl_entity_s *pEnt = &m_VoiceHeadModels[iOutModel];
+		++iOutModel;
+
+		memset(pEnt, 0, sizeof(*pEnt));
+
+		pEnt->curstate.rendermode = kRenderTransAdd;
+		pEnt->curstate.renderamt = 255;
+		pEnt->baseline.renderamt = 255;
+		pEnt->curstate.renderfx = kRenderFxNoDissipation;
+		pEnt->curstate.framerate = 1;
+		pEnt->curstate.frame = 0;
+		pEnt->model = (struct model_s*)gEngfuncs.GetSpritePointer(m_VoiceHeadModel);
+		pEnt->angles[0] = pEnt->angles[1] = pEnt->angles[2] = 0;
+		pEnt->curstate.scale = 0.5f;
+		
+		pEnt->origin[0] = pEnt->origin[1] = 0;
+		pEnt->origin[2] = AvHCUGetIconHeightForPlayer((AvHUser3)pClient->curstate.iuser3);
+
+		VectorAdd(pEnt->origin, pClient->origin, pEnt->origin);
+
+		// Tell the engine.
+		gEngfuncs.CL_CreateVisibleEntity(ET_NORMAL, pEnt);
+	}
+}
+
+
+void CVoiceStatus::UpdateSpeakerStatus(int entindex, qboolean bTalking)
+{
+	if(!*m_pParentPanel)
+		return;
+
+	if( gEngfuncs.pfnGetCvarFloat("voice_clientdebug") )
+	{
+		char msg[256];
+		_snprintf( msg, sizeof(msg), "CVoiceStatus::UpdateSpeakerStatus: ent %d talking = %d\n", entindex, bTalking );
+		gEngfuncs.pfnConsolePrint( msg );
+	}
+
+	// Is it the local player talking?
+	if( entindex == -1 )
+	{
+		m_bTalking = !!bTalking;
+		if( bTalking )
+		{
+			// Enable voice for them automatically if they try to talk.
+			gEngfuncs.pfnClientCmd( "voice_modenable 1" );
+		}
+	}
+	else if( entindex == -2 )
+	{
+		m_bServerAcked = !!bTalking;
+	}
+	else if(entindex >= 0 && entindex <= VOICE_MAX_PLAYERS)
+	{
+		int iClient = entindex - 1;
+		if(iClient < 0)
+			return;
+
+		CVoiceLabel *pLabel = FindVoiceLabel(iClient);
+		if(bTalking)
+		{
+			m_VoicePlayers[iClient] = true;
+			m_VoiceEnabledPlayers[iClient] = true;
+
+			// If we don't have a label for this guy yet, then create one.
+			if(!pLabel)
+			{
+				if(pLabel = GetFreeVoiceLabel())
+				{
+					// Get the name from the engine.
+					hud_player_info_t info;
+					memset(&info, 0, sizeof(info));
+					GetPlayerInfo(entindex, &info);
+
+					char paddedName[512];
+					_snprintf(paddedName, sizeof(paddedName), "%s   ", info.name);
+
+					int color[3];
+					m_pHelper->GetPlayerTextColor( entindex, color );
+
+					if( pLabel->m_pBackground )
+					{
+						pLabel->m_pBackground->setBgColor( color[0], color[1], color[2], 135 );
+						pLabel->m_pBackground->setParent( *m_pParentPanel );
+						pLabel->m_pBackground->setVisible( m_pHelper->CanShowSpeakerLabels() );
+					}
+
+					if( pLabel->m_pLabel )
+					{
+						pLabel->m_pLabel->setFgColor( 0, 0, 0, 0 );
+						pLabel->m_pLabel->setBgColor( 0, 0, 0, 255 );
+						pLabel->m_pLabel->setText( paddedName );
+					}
+					
+					pLabel->m_clientindex = iClient;
+				}
+			}
+		}
+		else
+		{
+			m_VoicePlayers[iClient] = false;
+
+			// If we have a label for this guy, kill it.
+			if(pLabel)
+			{
+				pLabel->m_pBackground->setVisible(false);
+				pLabel->m_clientindex = -1;
+			}
+		}
+	}
+
+	RepositionLabels();
+}
+
+
+void CVoiceStatus::UpdateServerState(bool bForce)
+{
+	// Can't do anything when we're not in a level.
+	char const *pLevelName = gEngfuncs.pfnGetLevelName();
+	if( pLevelName[0] == 0 )
+	{
+		if( gEngfuncs.pfnGetCvarFloat("voice_clientdebug") )
+		{
+			gEngfuncs.pfnConsolePrint( "CVoiceStatus::UpdateServerState: pLevelName[0]==0\n" );
+		}
+
+		return;
+	}
+	
+	int bCVarModEnable = !!gEngfuncs.pfnGetCvarFloat("voice_modenable");
+	if(bForce || m_bServerModEnable != bCVarModEnable)
+	{
+		m_bServerModEnable = bCVarModEnable;
+
+		char str[256];
+		_snprintf(str, sizeof(str), "VModEnable %d", m_bServerModEnable);
+		ServerCmd(str);
+
+		if(gEngfuncs.pfnGetCvarFloat("voice_clientdebug"))
+		{
+			char msg[256];
+			sprintf(msg, "CVoiceStatus::UpdateServerState: Sending '%s'\n", str);
+			gEngfuncs.pfnConsolePrint(msg);
+		}
+	}
+
+	char str[2048];
+	sprintf(str, "vban");
+	bool bChange = false;
+
+	for(unsigned long dw=0; dw < VOICE_MAX_PLAYERS_DW; dw++)
+	{	
+		unsigned long serverBanMask = 0;
+		unsigned long banMask = 0;
+		for(unsigned long i=0; i < 32; i++)
+		{
+			char playerID[16];
+			if(!gEngfuncs.GetPlayerUniqueID(i+1, playerID))
+				continue;
+
+			if(m_BanMgr.GetPlayerBan(playerID))
+				banMask |= 1 << i;
+
+			if(m_ServerBannedPlayers[dw*32 + i])
+				serverBanMask |= 1 << i;
+		}
+
+		if(serverBanMask != banMask)
+			bChange = true;
+
+		// Ok, the server needs to be updated.
+		char numStr[512];
+		sprintf(numStr, " %x", banMask);
+		strcat(str, numStr);
+	}
+
+	if(bChange || bForce)
+	{
+		if(gEngfuncs.pfnGetCvarFloat("voice_clientdebug"))
+		{
+			char msg[256];
+			sprintf(msg, "CVoiceStatus::UpdateServerState: Sending '%s'\n", str);
+			gEngfuncs.pfnConsolePrint(msg);
+		}
+
+		gEngfuncs.pfnServerCmdUnreliable(str);	// Tell the server..
+	}
+	else
+	{
+		if (gEngfuncs.pfnGetCvarFloat("voice_clientdebug"))
+		{
+			gEngfuncs.pfnConsolePrint( "CVoiceStatus::UpdateServerState: no change\n" );
+		}
+	}
+	
+	m_LastUpdateServerState = gEngfuncs.GetClientTime();
+}
+
+void CVoiceStatus::UpdateSpeakerImage(Label *pLabel, int iPlayer)
+{
+	m_pBanButtons[iPlayer-1] = pLabel;
+	UpdateBanButton(iPlayer-1);
+}
+
+void CVoiceStatus::UpdateBanButton(int iClient)
+{
+	Label *pPanel = m_pBanButtons[iClient];
+
+	if (!pPanel)
+		return;
+
+	char playerID[16];
+	extern bool HACK_GetPlayerUniqueID( int iPlayer, char playerID[16] );
+	if(!HACK_GetPlayerUniqueID(iClient+1, playerID))
+		return;
+
+	// Figure out if it's blinking or not.
+	bool bBlink   = fmod(m_BlinkTimer, SCOREBOARD_BLINK_FREQUENCY*2) < SCOREBOARD_BLINK_FREQUENCY;
+	bool bTalking = !!m_VoicePlayers[iClient];
+	bool bBanned  = m_BanMgr.GetPlayerBan(playerID);
+	bool bNeverSpoken = !m_VoiceEnabledPlayers[iClient];
+
+	// Get the appropriate image to display on the panel.
+	if (bBanned)
+	{
+		pPanel->setImage(m_pScoreboardBanned);
+	}
+	else if (bTalking)
+	{
+		if (bBlink)
+		{
+			pPanel->setImage(m_pScoreboardSpeaking2);
+		}
+		else
+		{
+			pPanel->setImage(m_pScoreboardSpeaking);
+		}
+		pPanel->setFgColor(255, 170, 0, 1);
+	}
+	else if (bNeverSpoken)
+	{
+		pPanel->setImage(m_pScoreboardNeverSpoken);
+		pPanel->setFgColor(100, 100, 100, 1);
+	}
+	else
+	{
+		pPanel->setImage(m_pScoreboardNotSpeaking);
+	}
+}
+
+
+void CVoiceStatus::HandleVoiceMaskMsg(int iSize, void *pbuf)
+{
+	BEGIN_READ( pbuf, iSize );
+
+	unsigned long dw;
+	for(dw=0; dw < VOICE_MAX_PLAYERS_DW; dw++)
+	{
+		m_AudiblePlayers.SetDWord(dw, (unsigned long)READ_LONG());
+		m_ServerBannedPlayers.SetDWord(dw, (unsigned long)READ_LONG());
+
+		if(gEngfuncs.pfnGetCvarFloat("voice_clientdebug"))
+		{
+			char str[256];
+			gEngfuncs.pfnConsolePrint("CVoiceStatus::HandleVoiceMaskMsg\n");
+			
+			sprintf(str, "    - m_AudiblePlayers[%d] = %lu\n", dw, m_AudiblePlayers.GetDWord(dw));
+			gEngfuncs.pfnConsolePrint(str);
+			
+			sprintf(str, "    - m_ServerBannedPlayers[%d] = %lu\n", dw, m_ServerBannedPlayers.GetDWord(dw));
+			gEngfuncs.pfnConsolePrint(str);
+		}
+	}
+
+	m_bServerModEnable = READ_BYTE();
+}
+
+void CVoiceStatus::HandleReqStateMsg(int iSize, void *pbuf)
+{
+	if(gEngfuncs.pfnGetCvarFloat("voice_clientdebug"))
+	{
+		gEngfuncs.pfnConsolePrint("CVoiceStatus::HandleReqStateMsg\n");
+	}
+
+	UpdateServerState(true);	
+}
+
+void CVoiceStatus::StartSquelchMode()
+{
+	if(m_bInSquelchMode)
+		return;
+
+	m_bInSquelchMode = true;
+	m_pHelper->UpdateCursorState();
+}
+
+void CVoiceStatus::StopSquelchMode()
+{
+	m_bInSquelchMode = false;
+	m_pHelper->UpdateCursorState();
+}
+
+bool CVoiceStatus::IsInSquelchMode()
+{
+	return m_bInSquelchMode;
+}
+
+CVoiceLabel* CVoiceStatus::FindVoiceLabel(int clientindex)
+{
+	for(int i=0; i < MAX_VOICE_SPEAKERS; i++)
+	{
+		if(m_Labels[i].m_clientindex == clientindex)
+			return &m_Labels[i];
+	}
+
+	return NULL;
+}
+
+
+CVoiceLabel* CVoiceStatus::GetFreeVoiceLabel()
+{
+	return FindVoiceLabel(-1);
+}
+
+
+void CVoiceStatus::RepositionLabels()
+{
+	// find starting position to draw from, along right-hand side of screen
+	int y = ScreenHeight() / 2;
+	
+	int iconWide = 8, iconTall = 8;
+	if( m_pSpeakerLabelIcon )
+	{
+		m_pSpeakerLabelIcon->getSize( iconWide, iconTall );
+	}
+	
+	// Reposition active labels.
+	for(int i = 0; i < MAX_VOICE_SPEAKERS; i++)
+	{
+		CVoiceLabel *pLabel = &m_Labels[i];
+
+		if( pLabel->m_clientindex == -1 || !pLabel->m_pLabel )
+		{
+			if( pLabel->m_pBackground )
+				pLabel->m_pBackground->setVisible( false );
+
+			continue;
+		}
+
+		int textWide, textTall;
+		pLabel->m_pLabel->getContentSize( textWide, textTall );
+
+		// Don't let it stretch too far across their screen.
+		if( textWide > (ScreenWidth()*2)/3 )
+			textWide = (ScreenWidth()*2)/3;
+
+		// Setup the background label to fit everything in.
+		int border = 2;
+		int bgWide = textWide + iconWide + border*3;
+		int bgTall = max( textTall, iconTall ) + border*2;
+		pLabel->m_pBackground->setBounds( ScreenWidth() - bgWide - 8, y, bgWide, bgTall );
+
+		// Put the text at the left.
+		pLabel->m_pLabel->setBounds( border, (bgTall - textTall) / 2, textWide, textTall );
+
+		// Put the icon at the right.
+		int iconLeft = border + textWide + border;
+		int iconTop = (bgTall - iconTall) / 2;
+		if( pLabel->m_pIcon )
+		{
+			pLabel->m_pIcon->setImage( m_pSpeakerLabelIcon );
+			pLabel->m_pIcon->setBounds( iconLeft, iconTop, iconWide, iconTall );
+		}
+
+		y += bgTall + 2;
+	}
+
+	if( m_pLocalBitmap && m_pAckBitmap && m_pLocalLabel && (m_bTalking || m_bServerAcked) )
+	{
+		m_pLocalLabel->setParent(*m_pParentPanel);
+		m_pLocalLabel->setVisible( true );
+
+		if( m_bServerAcked && !!gEngfuncs.pfnGetCvarFloat("voice_clientdebug") )
+			m_pLocalLabel->setImage( m_pAckBitmap );
+		else
+			m_pLocalLabel->setImage( m_pLocalBitmap );
+
+		int sizeX, sizeY;
+		m_pLocalBitmap->getSize(sizeX, sizeY);
+
+		int local_xPos = ScreenWidth() - sizeX - 10;
+		int local_yPos = m_pHelper->GetAckIconHeight() - sizeY;
+
+		// Move bar depending on role
+		switch(gHUD.GetHUDUser3())
+		{
+		case AVH_USER3_ALIEN_PLAYER1:
+		case AVH_USER3_ALIEN_PLAYER2:
+		case AVH_USER3_ALIEN_PLAYER3:
+		case AVH_USER3_ALIEN_PLAYER4:
+		case AVH_USER3_ALIEN_PLAYER5:
+			local_xPos -= kResourceEnergyBarWidth*ScreenWidth();
+			break;
+
+		case AVH_USER3_COMMANDER_PLAYER:
+			local_xPos -= kVoiceStatusCommanderRightEdgeInset*ScreenWidth();
+			local_yPos -= (1.0f - kVoiceStatusCommanderTopEdgeInset)*ScreenHeight();
+			break;
+
+		case AVH_USER3_MARINE_PLAYER:
+			local_xPos -= kVoiceStatusMarineRightEdgeInset*ScreenWidth();
+			break;
+		}
+		
+		m_pLocalLabel->setPos( local_xPos, local_yPos );
+	}
+	else
+	{
+		m_pLocalLabel->setVisible( false );
+	}
+}
+
+
+void CVoiceStatus::FreeBitmaps()
+{
+	// Delete all the images we have loaded.
+	delete m_pLocalBitmap;
+	m_pLocalBitmap = NULL;
+
+	delete m_pAckBitmap;
+	m_pAckBitmap = NULL;
+
+	delete m_pSpeakerLabelIcon;
+	m_pSpeakerLabelIcon = NULL;
+
+	delete m_pScoreboardNeverSpoken;
+	m_pScoreboardNeverSpoken = NULL;
+
+	delete m_pScoreboardNotSpeaking;
+	m_pScoreboardNotSpeaking = NULL;
+
+	delete m_pScoreboardSpeaking;
+	m_pScoreboardSpeaking = NULL;
+
+	delete m_pScoreboardSpeaking2;
+	m_pScoreboardSpeaking2 = NULL;
+
+	delete m_pScoreboardSquelch;
+	m_pScoreboardSquelch = NULL;
+
+	delete m_pScoreboardBanned;
+	m_pScoreboardBanned = NULL;
+
+	// Clear references to the images in panels.
+	for(int i=0; i < VOICE_MAX_PLAYERS; i++)
+	{
+		if (m_pBanButtons[i])
+		{
+			m_pBanButtons[i]->setImage(NULL);
+		}
+	}
+
+	if(m_pLocalLabel)
+		m_pLocalLabel->setImage(NULL);
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: returns true if the target client has been banned
+// Input  : playerID - 
+// Output : Returns true on success, false on failure.
+//-----------------------------------------------------------------------------
+bool CVoiceStatus::IsPlayerBlocked(int iPlayer)
+{
+	char playerID[16];
+	if (!gEngfuncs.GetPlayerUniqueID(iPlayer, playerID))
+		return false;
+
+	return m_BanMgr.GetPlayerBan(playerID);
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: returns true if the player can't hear the other client due to game rules (eg. the other team)
+// Input  : playerID - 
+// Output : Returns true on success, false on failure.
+//-----------------------------------------------------------------------------
+bool CVoiceStatus::IsPlayerAudible(int iPlayer)
+{
+	return !!m_AudiblePlayers[iPlayer-1];
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: blocks/unblocks the target client from being heard
+// Input  : playerID - 
+// Output : Returns true on success, false on failure.
+//-----------------------------------------------------------------------------
+void CVoiceStatus::SetPlayerBlockedState(int iPlayer, bool blocked)
+{
+	if (gEngfuncs.pfnGetCvarFloat("voice_clientdebug"))
+	{
+		gEngfuncs.pfnConsolePrint( "CVoiceStatus::SetPlayerBlockedState part 1\n" );
+	}
+
+	char playerID[16];
+	if (!gEngfuncs.GetPlayerUniqueID(iPlayer, playerID))
+		return;
+
+	if (gEngfuncs.pfnGetCvarFloat("voice_clientdebug"))
+	{
+		gEngfuncs.pfnConsolePrint( "CVoiceStatus::SetPlayerBlockedState part 2\n" );
+	}
+
+	// Squelch or (try to) unsquelch this player.
+	if (gEngfuncs.pfnGetCvarFloat("voice_clientdebug"))
+	{
+		char str[256];
+		sprintf(str, "CVoiceStatus::SetPlayerBlockedState: setting player %d ban to %d\n", iPlayer, !m_BanMgr.GetPlayerBan(playerID));
+		gEngfuncs.pfnConsolePrint(str);
+	}
+
+	m_BanMgr.SetPlayerBan( playerID, blocked );
+	UpdateServerState(false);
+}
diff --git a/main/source/game_shared/voice_status.h b/main/source/game_shared/voice_status.h
new file mode 100644
index 00000000..d4ad2ee6
--- /dev/null
+++ b/main/source/game_shared/voice_status.h
@@ -0,0 +1,228 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VOICE_STATUS_H
+#define VOICE_STATUS_H
+#pragma once
+
+
+#include "VGUI_Label.h"
+#include "VGUI_LineBorder.h"
+#include "VGUI_ImagePanel.h"
+#include "VGUI_BitmapTGA.h"
+#include "VGUI_InputSignal.h"
+#include "VGUI_Button.h"
+#include "voice_common.h"
+#include "cl_entity.h"
+#include "voice_banmgr.h"
+#include "vgui_checkbutton2.h"
+#include "vgui_defaultinputsignal.h"
+
+
+class CVoiceStatus;
+
+
+class CVoiceLabel
+{
+public:
+	vgui::Label			*m_pLabel;
+	vgui::Label			*m_pBackground;
+	vgui::ImagePanel	*m_pIcon;		// Voice icon next to player name.
+	int					m_clientindex;	// Client index of the speaker. -1 if this label isn't being used.
+};
+
+
+// This is provided by each mod to access data that may not be the same across mods.
+class IVoiceStatusHelper
+{
+public:
+	virtual					~IVoiceStatusHelper()	{}
+
+	// Get RGB color for voice status text about this player.
+	virtual void			GetPlayerTextColor(int entindex, int color[3]) = 0;
+
+	// Force it to update the cursor state.
+	virtual void			UpdateCursorState() = 0;
+
+	// Return the height above the bottom that the voice ack icons should be drawn at.
+	virtual int				GetAckIconHeight() = 0;
+
+	// Return true if the voice manager is allowed to show speaker labels
+	// (mods usually return false when the scoreboard is up).
+	virtual bool			CanShowSpeakerLabels() = 0;
+};
+
+//-----------------------------------------------------------------------------
+// Purpose: Holds a color for the shared image
+//-----------------------------------------------------------------------------
+class VoiceImagePanel : public vgui::ImagePanel
+{
+	virtual void paintBackground()
+	{
+		if (_image!=null)
+		{
+			vgui::Color col;
+			getFgColor(col);
+			_image->setColor(col);
+			_image->doPaint(this);
+		}
+	}
+};
+
+
+class CVoiceStatus : public CHudBase, public vgui::CDefaultInputSignal
+{
+public:
+				CVoiceStatus();
+	virtual		~CVoiceStatus();
+
+// CHudBase overrides.
+public:
+	
+	// Initialize the cl_dll's voice manager.
+	virtual int Init(
+		IVoiceStatusHelper *m_pHelper,
+		vgui::Panel **pParentPanel);
+	
+	// ackPosition is the bottom position of where CVoiceStatus will draw the voice acknowledgement labels.
+	virtual int VidInit();
+
+
+public:
+	
+	// Call from HUD_Frame each frame.
+	void	Frame(double frametime);
+
+	// Called when a player starts or stops talking.
+	// entindex is -1 to represent the local client talking (before the data comes back from the server). 
+	// When the server acknowledges that the local client is talking, then entindex will be gEngfuncs.GetLocalPlayer().
+	// entindex is -2 to represent the local client's voice being acked by the server.
+	void	UpdateSpeakerStatus(int entindex, qboolean bTalking);
+
+	// sets the correct image in the label for the player
+	void	UpdateSpeakerImage(vgui::Label *pLabel, int iPlayer);
+
+	// Call from the HUD_CreateEntities function so it can add sprites above player heads.
+	void	CreateEntities();
+
+	// Called when the server registers a change to who this client can hear.
+	void	HandleVoiceMaskMsg(int iSize, void *pbuf);
+
+	// The server sends this message initially to tell the client to send their state.
+	void	HandleReqStateMsg(int iSize, void *pbuf);
+
+
+// Squelch mode functions.
+public:
+
+	// When you enter squelch mode, pass in 
+	void	StartSquelchMode();
+	void	StopSquelchMode();
+	bool	IsInSquelchMode();
+
+	// returns true if the target client has been banned
+	// playerIndex is of range 1..maxplayers
+	bool	IsPlayerBlocked(int iPlayerIndex);
+
+	// returns false if the player can't hear the other client due to game rules (eg. the other team)
+	bool    IsPlayerAudible(int iPlayerIndex);
+
+	// blocks the target client from being heard
+	void	SetPlayerBlockedState(int iPlayerIndex, bool blocked);
+
+public:
+
+	CVoiceLabel*	FindVoiceLabel(int clientindex);	// Find a CVoiceLabel representing the specified speaker. 
+													// Returns NULL if none.
+													// entindex can be -1 if you want a currently-unused voice label.
+	CVoiceLabel*	GetFreeVoiceLabel();			// Get an unused voice label. Returns NULL if none.
+
+	void			RepositionLabels();
+
+	void			FreeBitmaps();
+
+	void			UpdateServerState(bool bForce);
+
+	// Update the button artwork to reflect the client's current state.
+	void			UpdateBanButton(int iClient);
+
+
+public:
+
+	enum			{MAX_VOICE_SPEAKERS=7};
+
+	float			m_LastUpdateServerState;		// Last time we called this function.
+	int				m_bServerModEnable;				// What we've sent to the server about our "voice_modenable" cvar.
+
+	vgui::Panel		**m_pParentPanel;
+	CPlayerBitVec	m_VoicePlayers;		// Who is currently talking. Indexed by client index.
+	
+	// This is the gamerules-defined list of players that you can hear. It is based on what teams people are on 
+	// and is totally separate from the ban list. Indexed by client index.
+	CPlayerBitVec	m_AudiblePlayers;
+
+	// Players who have spoken at least once in the game so far
+	CPlayerBitVec	m_VoiceEnabledPlayers;	
+
+	// This is who the server THINKS we have banned (it can become incorrect when a new player arrives on the server).
+	// It is checked periodically, and the server is told to squelch or unsquelch the appropriate players.
+	CPlayerBitVec	m_ServerBannedPlayers;
+
+	cl_entity_s		m_VoiceHeadModels[VOICE_MAX_PLAYERS];			// These aren't necessarily in the order of players. They are just
+																	// a place for it to put data in during CreateEntities.
+
+	IVoiceStatusHelper	*m_pHelper;		// Each mod provides an implementation of this.
+
+	
+	// Scoreboard icons.
+	double			m_BlinkTimer;			// Blink scoreboard icons..
+	vgui::BitmapTGA	*m_pScoreboardNeverSpoken;
+	vgui::BitmapTGA	*m_pScoreboardNotSpeaking;
+	vgui::BitmapTGA	*m_pScoreboardSpeaking;
+	vgui::BitmapTGA	*m_pScoreboardSpeaking2;
+	vgui::BitmapTGA	*m_pScoreboardSquelch;
+	vgui::BitmapTGA	*m_pScoreboardBanned;
+	
+	vgui::Label		   *m_pBanButtons[VOICE_MAX_PLAYERS];		// scoreboard buttons.
+
+	// Squelch mode stuff.
+	bool				m_bInSquelchMode;
+	
+	HSPRITE				m_VoiceHeadModel;		// Voice head model (goes above players who are speaking).
+	float				m_VoiceHeadModelHeight;	// Height above their head to place the model.
+
+	vgui::Image			*m_pSpeakerLabelIcon;	// Icon next to speaker labels.
+
+	// Lower-right icons telling when the local player is talking..
+	vgui::BitmapTGA		*m_pLocalBitmap;		// Represents the local client talking.
+	vgui::BitmapTGA		*m_pAckBitmap;			// Represents the server ack'ing the client talking.
+	vgui::ImagePanel	*m_pLocalLabel;			// Represents the local client talking.
+
+	bool				m_bTalking;				// Set to true when the client thinks it's talking.
+	bool				m_bServerAcked;			// Set to true when the server knows the client is talking.
+
+public:
+	
+	CVoiceBanMgr		m_BanMgr;				// Tracks which users we have squelched and don't want to hear.
+
+public:
+
+	bool				m_bBanMgrInitialized;
+
+	// Labels telling who is speaking.
+	CVoiceLabel			m_Labels[MAX_VOICE_SPEAKERS];
+
+	// Cache the game directory for use when we shut down
+	char *				m_pchGameDir;
+};
+
+
+// Get the (global) voice manager. 
+CVoiceStatus* GetClientVoiceMgr();
+
+
+#endif // VOICE_STATUS_H
diff --git a/main/source/game_shared/voice_vgui_tweakdlg.cpp b/main/source/game_shared/voice_vgui_tweakdlg.cpp
new file mode 100644
index 00000000..fd47f784
--- /dev/null
+++ b/main/source/game_shared/voice_vgui_tweakdlg.cpp
@@ -0,0 +1,289 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#include "../cl_dll/hud.h"
+#include "../cl_dll/cl_util.h"
+#include "../cl_dll/vgui_teamfortressviewport.h"
+
+
+#include "vgui_actionsignal.h"
+#include "voice_vgui_tweakdlg.h"
+#include "voice_vgui_tweakdlg.h"
+#include "vgui_panel.h"
+#include "vgui_scrollbar.h"
+#include "vgui_slider.h"
+#include "ivoicetweak.h"
+#include "vgui_button.h"
+#include "vgui_checkbutton2.h"
+#include "vgui_helpers.h"
+
+
+#define ITEM_BORDER					40	// Border between text and scrollbars on left and right.
+#define VOICETWEAK_TRANSPARENCY		150
+
+
+class TweakScroller
+{
+public:
+						TweakScroller();
+	void				Init(Panel *pParent, char *pText, int yPos);
+
+	// Get/set value. Values are 0-1.
+	float				GetValue();
+	void				SetValue(float val);
+
+public:	
+	Label				m_Label;
+	ScrollBar			m_Scroll;
+	Slider				m_Slider;
+};
+
+
+class CVoiceVGUITweakDlg : public CMenuPanel, public ICheckButton2Handler
+{
+typedef CMenuPanel BaseClass;
+
+public:
+						CVoiceVGUITweakDlg();
+						~CVoiceVGUITweakDlg();
+
+// CMenuPanel overrides.
+public:
+	virtual void		Open();
+	virtual void		Close();
+
+
+// ICheckButton2Handler overrides.
+public:
+
+	virtual void		StateChanged(CCheckButton2 *pButton);
+
+
+
+// Panel overrides.
+public:
+	virtual void		paintBackground();
+
+
+private:
+
+	int					m_DlgWidth;
+	int					m_DlgHeight;
+
+	Label				m_Label;		
+	
+	IVoiceTweak			*m_pVoiceTweak;		// Engine voice tweak API.
+
+	TweakScroller		m_MicVolume;
+	TweakScroller		m_SpeakerVolume;
+
+	CCheckButton2		m_VoiceModEnable;
+	
+	Button				m_Button_OK;
+};
+
+
+
+bool g_bTweakDlgOpen = false;
+
+bool IsTweakDlgOpen()
+{
+	return g_bTweakDlgOpen;
+}
+
+
+
+// ------------------------------------------------------------------------ //
+// Global functions.
+// ------------------------------------------------------------------------ //
+
+static CVoiceVGUITweakDlg g_VoiceTweakDlg;
+CMenuPanel* GetVoiceTweakDlg()
+{
+	return &g_VoiceTweakDlg;
+}
+
+
+class CVoiceTweakOKButton : public ActionSignal
+{
+public:
+	virtual void	actionPerformed(Panel *pPanel)
+	{
+		gViewPort->HideVGUIMenu();
+	}
+};
+CVoiceTweakOKButton g_OKButtonSignal;
+
+
+
+// ------------------------------------------------------------------------ //
+// TweakScroller
+// ------------------------------------------------------------------------ //
+
+TweakScroller::TweakScroller() :
+	m_Label(""),
+	m_Scroll(0,0,0,0,false),
+	m_Slider(0,0,10,10,false)
+{
+}
+
+
+void TweakScroller::Init(Panel *pParent, char *pText, int yPos)
+{
+	int parentWidth, parentHeight;
+	pParent->getSize(parentWidth, parentHeight);
+
+	// Setup the volume scroll bar.
+	m_Label.setParent(pParent);
+	m_Label.setFont(Scheme::sf_primary1);
+	m_Label.setContentAlignment(vgui::Label::a_northwest);
+	m_Label.setBgColor(0, 0, 0, 255);
+	m_Label.setFgColor(255,255,255,0);
+	m_Label.setPos(ITEM_BORDER, yPos);
+	m_Label.setSize(parentWidth/2-ITEM_BORDER, 20);
+	m_Label.setText(pText);
+	m_Label.setVisible(true);
+
+	m_Slider.setRangeWindow(10);
+	m_Slider.setRangeWindowEnabled(true);
+	
+	m_Scroll.setPos(parentWidth/2+ITEM_BORDER, yPos);
+	m_Scroll.setSize(parentWidth/2-ITEM_BORDER*2, 20);
+	m_Scroll.setSlider(&m_Slider);
+	m_Scroll.setParent(pParent);
+	m_Scroll.setRange(0, 100);
+	m_Scroll.setFgColor(255,255,255,0);
+	m_Scroll.setBgColor(255,255,255,0);
+}
+
+
+float TweakScroller::GetValue()
+{
+	return m_Scroll.getValue() / 100.0f;
+}
+
+
+void TweakScroller::SetValue(float val)
+{
+	m_Scroll.setValue((int)(val * 100.0f));
+}
+
+
+// ------------------------------------------------------------------------ //
+// CVoiceVGUITweakDlg implementation.
+// ------------------------------------------------------------------------ //
+
+CVoiceVGUITweakDlg::CVoiceVGUITweakDlg()
+	: CMenuPanel(VOICETWEAK_TRANSPARENCY, false, 0, 0, 0, 0),
+	m_Button_OK("",0,0),
+	m_Label("")
+{
+	m_pVoiceTweak = NULL;
+	m_Button_OK.addActionSignal(&g_OKButtonSignal);
+	m_Label.setBgColor(255,255,255,200);
+}
+
+
+CVoiceVGUITweakDlg::~CVoiceVGUITweakDlg()
+{
+}
+
+
+void CVoiceVGUITweakDlg::Open()
+{
+	if(g_bTweakDlgOpen)
+		return;
+	
+	g_bTweakDlgOpen = true;
+
+	m_DlgWidth = ScreenWidth();
+	m_DlgHeight = ScreenHeight();
+
+	m_pVoiceTweak = gEngfuncs.pVoiceTweak;
+
+	// Tell the engine to start voice tweak mode (pipe voice output right to speakers).
+	m_pVoiceTweak->StartVoiceTweakMode();
+
+	// Set our size.
+	setPos((ScreenWidth() - m_DlgWidth) / 2, (ScreenHeight() - m_DlgHeight) / 2);
+	setSize(m_DlgWidth, m_DlgHeight);
+
+	int curY = ITEM_BORDER;
+	m_MicVolume.Init(this, gHUD.m_TextMessage.BufferedLocaliseTextString("#Mic_Volume"), curY);
+	m_MicVolume.SetValue(m_pVoiceTweak->GetControlFloat(MicrophoneVolume));
+	curY = PanelBottom(&m_MicVolume.m_Label);
+
+	m_SpeakerVolume.Init(this, gHUD.m_TextMessage.BufferedLocaliseTextString("#Speaker_Volume"), curY);
+	m_SpeakerVolume.SetValue(m_pVoiceTweak->GetControlFloat(OtherSpeakerScale));
+	curY = PanelBottom(&m_SpeakerVolume.m_Label);
+
+	m_VoiceModEnable.setParent(this);
+	m_VoiceModEnable.SetImages("gfx/vgui/checked.tga", "gfx/vgui/unchecked.tga");
+	m_VoiceModEnable.SetText("Enable Voice In This Mod");
+	m_VoiceModEnable.setPos(ITEM_BORDER, curY);
+	m_VoiceModEnable.SetCheckboxLeft(false);
+	m_VoiceModEnable.SetChecked(!!gEngfuncs.pfnGetCvarFloat("voice_modenable"));
+	m_VoiceModEnable.SetHandler(this);
+
+	// Setup the OK button.
+	int buttonWidth, buttonHeight;
+	m_Button_OK.setText(gHUD.m_TextMessage.BufferedLocaliseTextString("#Menu_OK"));
+	m_Button_OK.getSize(buttonWidth, buttonHeight);
+	m_Button_OK.setPos((m_DlgWidth - buttonWidth) / 2, m_DlgHeight - buttonHeight - 3);
+	m_Button_OK.setParent(this);
+
+	// Put the label on the top.
+	m_Label.setBgColor(0, 0, 0, 255);
+	m_Label.setFgColor(255,255,255,0);
+	m_Label.setText(gHUD.m_TextMessage.BufferedLocaliseTextString("#Voice_Properties"));
+	int labelWidth, labelHeight;
+	m_Label.getSize(labelWidth, labelHeight);
+	m_Label.setPos((m_DlgWidth - labelWidth) / 2, 5);
+	m_Label.setParent(this);
+
+	BaseClass::Open();
+}
+
+
+void CVoiceVGUITweakDlg::Close()
+{
+	m_pVoiceTweak->EndVoiceTweakMode();
+	g_bTweakDlgOpen = false;
+
+	BaseClass::Close();
+}
+
+
+void CVoiceVGUITweakDlg::paintBackground()
+{
+	BaseClass::paintBackground();
+
+	// Draw our border.
+	int w,h;
+	getSize(w,h);
+
+	drawSetColor(128,128,128,1);
+	drawOutlinedRect(0, 0, w, h);
+
+	float volume = m_MicVolume.GetValue();
+	m_pVoiceTweak->SetControlFloat(MicrophoneVolume, volume);
+
+	m_pVoiceTweak->SetControlFloat(OtherSpeakerScale, m_SpeakerVolume.GetValue());
+}
+
+
+void CVoiceVGUITweakDlg::StateChanged(CCheckButton2 *pButton)
+{
+	if(pButton == &m_VoiceModEnable)
+	{
+		if(pButton->IsChecked())
+			gEngfuncs.pfnClientCmd("voice_modenable 1");
+		else
+			gEngfuncs.pfnClientCmd("voice_modenable 0");
+	}
+}
+
diff --git a/main/source/game_shared/voice_vgui_tweakdlg.h b/main/source/game_shared/voice_vgui_tweakdlg.h
new file mode 100644
index 00000000..94e55908
--- /dev/null
+++ b/main/source/game_shared/voice_vgui_tweakdlg.h
@@ -0,0 +1,25 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VOICE_VGUI_TWEAKDLG_H
+#define VOICE_VGUI_TWEAKDLG_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+
+class CMenuPanel;
+
+
+// Returns true if the tweak dialog is currently up.
+bool IsTweakDlgOpen();
+
+// Returns a global instance of the tweak dialog.
+CMenuPanel* GetVoiceTweakDlg();
+
+
+#endif // VOICE_VGUI_TWEAKDLG_H
diff --git a/main/source/getzip.bat b/main/source/getzip.bat
new file mode 100644
index 00000000..ea87555f
--- /dev/null
+++ b/main/source/getzip.bat
@@ -0,0 +1,5 @@
+@echo off
+pscp flayra@www.jarhedz.com:/home/flayra/build/linux/ns_i386.zip ..\dlls
+cd ..\dlls
+c:\"program files"\Winzip\wzunzip.exe ns_i386.zip
+cd ..\source
diff --git a/main/source/lib/readme.txt b/main/source/lib/readme.txt
new file mode 100644
index 00000000..015ec8cd
--- /dev/null
+++ b/main/source/lib/readme.txt
@@ -0,0 +1,10 @@
+This directory holds library files required for building the client and server. 
+
+There are two types of libraries being stored here: libraries built by the 
+Natural_Selection project, which aren't checked into source control, and 
+libraries built with external makefiles, which are source controlled.
+
+The "debug" and "release" subdirectories are targets for project builds, and any 
+libraries in those directories should *not* be placed under source control.  Any 
+libraries "external_debug" and "external_release" are built outside of the 
+repository, and *do* belong in source control.
\ No newline at end of file
diff --git a/main/source/linux/Makefile b/main/source/linux/Makefile
new file mode 100644
index 00000000..8d7b52c9
--- /dev/null
+++ b/main/source/linux/Makefile
@@ -0,0 +1,362 @@
+#
+# Half-Life ProSDK 2.0 hl_i386.so Makefile for i386 Linux
+#
+# April 2000 by Leon Hartwig (jehannum@planethalflife.com)
+#
+
+DLLNAME=ns
+
+ARCH=i386
+
+#make sure this is the correct compiler for your system
+CC=gcc
+LD=gcc
+
+CURL_SRCDIR=../curl/lib
+DLL_SRCDIR=../dlls
+GAME_SHARED_SRCDIR = ../game_shared
+LUA_SRCDIR = ../lua/src
+LUA_AUX_SRCDIR = ../lua/src/lib
+MOD_SRCDIR = ../mod
+PARTICLES_SRCDIR = ../particles
+PM_SHARED_SRCDIR=../pm_shared
+TEXT_SRCDIR = ../textrep
+UTIL_SRCDIR = ../util
+
+CURL_OBJDIR=$(CURL_SRCDIR)/obj
+DLL_OBJDIR=$(DLL_SRCDIR)/obj
+GAME_SHARED_OBJDIR=$(GAME_SHARED_SRCDIR)/obj
+LUA_OBJDIR=$(LUA_SRCDIR)/obj
+LUA_AUX_OBJDIR=$(LUA_AUX_SRCDIR)/obj
+MOD_OBJDIR=$(MOD_SRCDIR)/obj
+PARTICLES_OBJDIR=$(PARTICLES_SRCDIR)/obj
+PM_SHARED_OBJDIR=$(PM_SHARED_SRCDIR)/obj
+TEXT_OBJDIR=$(TEXT_SRCDIR)/obj
+UTIL_OBJDIR=$(UTIL_SRCDIR)/obj
+OUTPUT_DIR=../../hlds_l/ns/dlls
+
+BASE_CFLAGS=-Dstricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -DAVH_SERVER -DLINUX  -DVALVE_DLL -DQUIVER -DVOXEL -DQUAKE2 -DDEDICATED -DSWDS -D_STLP_USE_GLIBC
+
+#full optimization
+CFLAGS=$(BASE_CFLAGS) -w -Wall -nostdinc++ -fPIC -mcpu=i486 -O3 -pipe -fno-for-scope -funroll-loops -fdelayed-branch -malign-loops=4 -malign-jumps=4 -malign-functions=4  
+
+#use these when debugging 
+#CFLAGS=$(BASE_CFLAGS) -fPIC -fno-for-scope   
+
+# add base directory (CGC)
+
+INCLUDEDIRS=-I../stlport/stlport -I. -I../curl/include -I../dlls -I../engine -I../common -I../mod -I../game_shared -I../lua/include -I../pm_shared -I.. -I/usr/include/c++/3.2/i386-redhat-linux -I/usr/include/c++/3.2 -I/usr/include/c++ 
+LINKDIRS= -L../curl/lib/.libs -L../stlport/lib 
+
+SHLIBEXT=so
+
+LDPRELIBS= $(CFLAGS) -shared \
+           -Wl,-Map,ns_map.txt \
+           $(LINKDIRS)
+
+LDPOSTLIBS= -Wl,-Bstatic -lcurl -lstlport_gcc -lstdc++ -lsupc++ \
+	-Wl,-Bdynamic -lm -lgcc -lgcc_eh  -Wl,-Bstatic -lc
+# -lgcc -lgcc_eh -lelf
+DO_CC=$(CC) $(CFLAGS) $(INCLUDEDIRS) -o $@ -c $<
+
+#############################################################################
+# SETUP AND BUILD
+# GAME
+#############################################################################
+
+$(CURL_OBJDIR)/%.o: $(CURL_SRCDIR)/%.c
+	$(DO_CC)
+
+$(DLL_OBJDIR)/%.o: $(DLL_SRCDIR)/%.cpp
+	$(DO_CC)
+
+$(GAME_SHARED_OBJDIR)/%.o: $(GAME_SHARED_SRCDIR)/%.cpp
+	$(DO_CC)
+
+$(LUA_OBJDIR)/%.o: $(LUA_SRCDIR)/%.c
+	$(DO_CC)
+
+$(LUA_AUX_OBJDIR)/%.o: $(LUA_AUX_SRCDIR)/%.c
+	$(DO_CC)
+
+$(MOD_OBJDIR)/%.o: $(MOD_SRCDIR)/%.cpp
+	$(DO_CC)
+
+$(PARTICLES_OBJDIR)/%.o: $(PARTICLES_SRCDIR)/%.cpp
+	$(DO_CC)
+
+$(PM_SHARED_OBJDIR)/%.o: $(PM_SHARED_SRCDIR)/%.cpp
+	$(DO_CC)
+
+$(TEXT_OBJDIR)/%.o: $(TEXT_SRCDIR)/%.cpp
+	$(DO_CC)
+
+$(UTIL_OBJDIR)/%.o: $(UTIL_SRCDIR)/%.cpp
+	$(DO_CC)
+
+OBJ = \
+	$(DLL_OBJDIR)/animating.o \
+	$(DLL_OBJDIR)/animation.o \
+	$(DLL_OBJDIR)/bmodels.o \
+	$(DLL_OBJDIR)/buttons.o \
+	$(DLL_OBJDIR)/cbase.o \
+	$(DLL_OBJDIR)/client.o \
+	$(DLL_OBJDIR)/combat.o \
+	$(DLL_OBJDIR)/doors.o \
+	$(DLL_OBJDIR)/effects.o \
+	$(DLL_OBJDIR)/egon.o \
+	$(DLL_OBJDIR)/explode.o \
+	$(DLL_OBJDIR)/func_break.o \
+	$(DLL_OBJDIR)/func_tank.o \
+	$(DLL_OBJDIR)/game.o \
+	$(DLL_OBJDIR)/gamerules.o \
+	$(DLL_OBJDIR)/gauss.o \
+	$(DLL_OBJDIR)/globals.o \
+	$(DLL_OBJDIR)/ggrenade.o \
+	$(DLL_OBJDIR)/h_ai.o \
+	$(DLL_OBJDIR)/h_battery.o \
+	$(DLL_OBJDIR)/h_cycler.o \
+	$(DLL_OBJDIR)/h_export.o \
+	$(DLL_OBJDIR)/items.o \
+	$(DLL_OBJDIR)/lights.o \
+	$(DLL_OBJDIR)/maprules.o \
+	$(DLL_OBJDIR)/mpstubb.o \
+	$(DLL_OBJDIR)/multiplay_gamerules.o \
+	$(DLL_OBJDIR)/observer.o \
+	$(DLL_OBJDIR)/pathcorner.o \
+	$(DLL_OBJDIR)/plane.o \
+	$(DLL_OBJDIR)/plats.o \
+	$(DLL_OBJDIR)/player.o \
+	$(DLL_OBJDIR)/rpg.o \
+	$(DLL_OBJDIR)/satchel.o \
+	$(DLL_OBJDIR)/shotgun.o \
+	$(DLL_OBJDIR)/singleplay_gamerules.o \
+	$(DLL_OBJDIR)/skill.o \
+	$(DLL_OBJDIR)/sound.o \
+	$(DLL_OBJDIR)/soundent.o \
+	$(DLL_OBJDIR)/spectator.o \
+	$(DLL_OBJDIR)/squeakgrenade.o \
+	$(DLL_OBJDIR)/subs.o \
+	$(DLL_OBJDIR)/teamplay_gamerules.o \
+	$(DLL_OBJDIR)/triggers.o \
+	$(DLL_OBJDIR)/turret.o \
+	$(DLL_OBJDIR)/util.o \
+	$(DLL_OBJDIR)/weapons.o \
+	$(DLL_OBJDIR)/world.o \
+	$(DLL_OBJDIR)/xen.o \
+	$(GAME_SHARED_OBJDIR)/voice_banmgr.o \
+	$(GAME_SHARED_OBJDIR)/voice_gamemgr.o \
+	$(LUA_OBJDIR)/lapi.o \
+	$(LUA_AUX_OBJDIR)/lauxlib.o \
+	$(LUA_AUX_OBJDIR)/lbaselib.o \
+	$(LUA_OBJDIR)/lcode.o \
+	$(LUA_AUX_OBJDIR)/ldblib.o \
+	$(LUA_OBJDIR)/ldebug.o \
+	$(LUA_OBJDIR)/ldo.o \
+	$(LUA_OBJDIR)/lfunc.o \
+	$(LUA_OBJDIR)/lgc.o \
+	$(LUA_AUX_OBJDIR)/liolib.o \
+	$(LUA_OBJDIR)/llex.o \
+	$(LUA_AUX_OBJDIR)/lmathlib.o \
+	$(LUA_OBJDIR)/lmem.o \
+	$(LUA_OBJDIR)/lobject.o \
+	$(LUA_OBJDIR)/lparser.o \
+	$(LUA_OBJDIR)/lstate.o \
+	$(LUA_OBJDIR)/lstring.o \
+	$(LUA_AUX_OBJDIR)/lstrlib.o \
+	$(LUA_OBJDIR)/ltable.o \
+	$(LUA_OBJDIR)/ltests.o \
+	$(LUA_OBJDIR)/ltm.o \
+	$(LUA_OBJDIR)/lundump.o \
+	$(LUA_OBJDIR)/lvm.o \
+	$(LUA_OBJDIR)/lzio.o \
+	$(LUA_OBJDIR)/lopcodes.o \
+	$(LUA_OBJDIR)/ldump.o \
+	$(PM_SHARED_OBJDIR)/pm_debug.o \
+	$(PM_SHARED_OBJDIR)/pm_math.o \
+	$(PM_SHARED_OBJDIR)/pm_shared.o \
+	$(MOD_OBJDIR)/AnimationUtil.o \
+	$(MOD_OBJDIR)/AvHAcidRocketGun.o \
+	$(MOD_OBJDIR)/AvHAlienAbilities.o \
+	$(MOD_OBJDIR)/AvHAlienEquipment.o \
+	$(MOD_OBJDIR)/AvHAlienTurret.o \
+	$(MOD_OBJDIR)/AvHAlienWeapon.o \
+	$(MOD_OBJDIR)/AvHAssert.o \
+	$(MOD_OBJDIR)/AvHBalance.o \
+	$(MOD_OBJDIR)/AvHBaseBuildable.o \
+	$(MOD_OBJDIR)/AvHBaseInfoLocation.o \
+	$(MOD_OBJDIR)/AvHBasePlayerWeapon.o \
+	$(MOD_OBJDIR)/AvHBileBombGun.o \
+	$(MOD_OBJDIR)/AvHBite.o \
+	$(MOD_OBJDIR)/AvHBite2.o \
+	$(MOD_OBJDIR)/AvHBlink.o \
+	$(MOD_OBJDIR)/AvHBuildable.o \
+	$(MOD_OBJDIR)/AvHBuildingGun.o \
+	$(MOD_OBJDIR)/AvHClaws.o \
+	$(MOD_OBJDIR)/AvHCloakable.o \
+	$(MOD_OBJDIR)/AvHConsoleCommands.o \
+	$(MOD_OBJDIR)/AvHConstants.o \
+	$(MOD_OBJDIR)/AvHCombat.o \
+	$(MOD_OBJDIR)/AvHCurl.o \
+	$(MOD_OBJDIR)/AvHDevour.o \
+	$(MOD_OBJDIR)/AvHDivineWind.o \
+	$(MOD_OBJDIR)/AvHEntities.o \
+	$(MOD_OBJDIR)/AvHEntityHierarchy.o \
+	$(MOD_OBJDIR)/AvHGamerules.o \
+	$(MOD_OBJDIR)/AvHGrenade.o \
+	$(MOD_OBJDIR)/AvHGrenadeGun.o \
+	$(MOD_OBJDIR)/AvHHealingSpray.o \
+	$(MOD_OBJDIR)/AvHHeavyMachineGun.o \
+	$(MOD_OBJDIR)/AvHHive.o \
+	$(MOD_OBJDIR)/AvHItemInfo.o \
+	$(MOD_OBJDIR)/AvHKnife.o \
+	$(MOD_OBJDIR)/AvHMachineGun.o \
+	$(MOD_OBJDIR)/AvHMapExtents.o \
+	$(MOD_OBJDIR)/AvHMarineEquipment.o \
+	$(MOD_OBJDIR)/AvHMarineTurret.o \
+	$(MOD_OBJDIR)/AvHMarineWeapon.o \
+	$(MOD_OBJDIR)/AvHMetabolize.o \
+	$(MOD_OBJDIR)/AvHMine.o \
+	$(MOD_OBJDIR)/AvHMiniMap.o \
+	$(MOD_OBJDIR)/AvHMovementUtil.o \
+	$(MOD_OBJDIR)/AvHOrder.o \
+	$(MOD_OBJDIR)/AvHParasiteGun.o \
+	$(MOD_OBJDIR)/AvHParticleSystem.o \
+	$(MOD_OBJDIR)/AvHParticleSystemEntity.o \
+	$(MOD_OBJDIR)/AvHParticleSystemManager.o \
+	$(MOD_OBJDIR)/AvHParticleTemplate.o \
+	$(MOD_OBJDIR)/AvHParticleTemplateServer.o \
+	$(MOD_OBJDIR)/AvHPistol.o \
+	$(MOD_OBJDIR)/AvHPlayer.o  \
+	$(MOD_OBJDIR)/AvHPlayerUpgrade.o  \
+	$(MOD_OBJDIR)/AvHPrimalScream.o \
+	$(MOD_OBJDIR)/AvHPushableBuildable.o \
+	$(MOD_OBJDIR)/AvHReinforceable.o \
+	$(MOD_OBJDIR)/AvHResearchManager.o  \
+	$(MOD_OBJDIR)/AvHScriptManager.o \
+	$(MOD_OBJDIR)/AvHScriptServer.o \
+	$(MOD_OBJDIR)/AvHScriptShared.o \
+	$(MOD_OBJDIR)/AvHSelectionHelper.o \
+	$(MOD_OBJDIR)/AvHServerPlayerData.o \
+	$(MOD_OBJDIR)/AvHServerUtil.o \
+	$(MOD_OBJDIR)/AvHSharedMovementInfo.o \
+	$(MOD_OBJDIR)/AvHSharedUtil.o \
+	$(MOD_OBJDIR)/AvHSiegeTurret.o \
+	$(MOD_OBJDIR)/AvHSonicGun.o \
+	$(MOD_OBJDIR)/AvHSoundListManager.o \
+	$(MOD_OBJDIR)/AvHSpecials.o \
+	$(MOD_OBJDIR)/AvHSpikeGun.o \
+	$(MOD_OBJDIR)/AvHSpitGun.o \
+	$(MOD_OBJDIR)/AvHSpores.o \
+	$(MOD_OBJDIR)/AvHStomp.o \
+	$(MOD_OBJDIR)/AvHSwipe.o \
+	$(MOD_OBJDIR)/AvHTeam.o \
+	$(MOD_OBJDIR)/AvHTechNodes.o \
+	$(MOD_OBJDIR)/AvHTurret.o \
+	$(MOD_OBJDIR)/AvHUmbraGun.o \
+	$(MOD_OBJDIR)/AvHVisibleBlipList.o \
+	$(MOD_OBJDIR)/AvHVoiceHelper.o \
+	$(MOD_OBJDIR)/AvHWebSpinner.o \
+	$(MOD_OBJDIR)/AvHWeldable.o \
+	$(MOD_OBJDIR)/AvHWelder.o \
+	$(MOD_OBJDIR)/AvHWorldUpdate.o \
+	$(MOD_OBJDIR)/AvHTechSlotManager.o \
+	$(MOD_OBJDIR)/AvHSpawn.o \
+	$(MOD_OBJDIR)/CollisionUtil.o \
+	$(MOD_OBJDIR)/CollisionChecker.o \
+	$(MOD_OBJDIR)/CollisionChecker_ServerOnly.o \
+	$(MOD_OBJDIR)/NetworkMeter.o \
+	$(PARTICLES_OBJDIR)/action_api.o \
+	$(PARTICLES_OBJDIR)/actions.o \
+	$(PARTICLES_OBJDIR)/system.o \
+	$(TEXT_OBJDIR)/TRDescription.o \
+	$(TEXT_OBJDIR)/TRFactory.o \
+	$(UTIL_OBJDIR)/Checksum.o \
+	$(UTIL_OBJDIR)/LinuxSupport.o \
+	$(UTIL_OBJDIR)/Mat3.o \
+	$(UTIL_OBJDIR)/MathUtil.o \
+	$(UTIL_OBJDIR)/Quat.o \
+	$(UTIL_OBJDIR)/STLUtil.o \
+	$(UTIL_OBJDIR)/Tokenizer.o
+
+$(DLLNAME)_$(ARCH).$(SHLIBEXT) : neat $(OBJ)
+	$(LD) $(LDPRELIBS) -o $@ $(OBJ) $(LDPOSTLIBS) 
+	cp $(DLLNAME)_$(ARCH).$(SHLIBEXT) /usr/steam/hlds_l/ns/dlls/
+release: $(DLLNAME)_$(ARCH).$(SHLIBEXT)
+	strip $(DLLNAME)_$(ARCH).$(SHLIBEXT)
+	zip $(DLLNAME)_$(ARCH).zip $(DLLNAME)_$(ARCH).$(SHLIBEXT)
+curl:
+	./build-curl.sh
+neat:
+	-mkdir $(CURL_OBJDIR)
+	-mkdir $(DLL_OBJDIR)
+	-mkdir $(GAME_SHARED_OBJDIR)
+	-mkdir $(LUA_OBJDIR)
+	-mkdir $(LUA_AUX_OBJDIR)
+	-mkdir $(MOD_OBJDIR)
+	-mkdir $(PARTICLES_OBJDIR)
+	-mkdir $(PM_SHARED_OBJDIR)
+	-mkdir $(TEXT_OBJDIR)
+	-mkdir $(UTIL_OBJDIR)
+	-mkdir $(OUTPUT_DIR)
+clean:
+	-rm -f $(OBJ)
+	-rm -f $(DLLNAME)_$(ARCH).$(SHLIBEXT)
+spotless: clean
+	-rm -r $(CURL_OBJDIR)
+	-rm -r $(DLL_OBJDIR)
+	-rm -r $(GAME_SHARED_OBJDIR)
+	-rm -r $(LUA_OBJDIR)
+	-rm -r $(LUA_AUX_OBJDIR)
+	-rm -r $(MOD_OBJDIR)
+	-rm -r $(PARTICLES_OBJDIR)
+	-rm -r $(PM_SHARED_OBJDIR)
+	-rm -r $(TEXT_OBJDIR)
+	-rm -r $(UTIL_OBJDIR)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/main/source/linux/build-curl.sh b/main/source/linux/build-curl.sh
new file mode 100644
index 00000000..2c88a350
--- /dev/null
+++ b/main/source/linux/build-curl.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+cd ../curl
+#recode ibmpc:lat1 *
+chmod u+rwx *
+./configure --build=i686-linux --without-ssl --without-zlib --without-ca-bundle --with-gnu-ld --with-pic --disable-thread --disable-ftp --disable-file --disable-dict --disable-gopher --disable-telnet --disable-ipv6
+make clean
+make
diff --git a/main/source/localassert.h b/main/source/localassert.h
new file mode 100644
index 00000000..0ee07829
--- /dev/null
+++ b/main/source/localassert.h
@@ -0,0 +1,35 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: localassert.h $
+// $Date: 2002/08/16 02:22:41 $
+//
+//-------------------------------------------------------------------------------
+// $Log: localassert.h,v $
+// Revision 1.4  2002/08/16 02:22:41  Flayra
+// - Document header
+//
+//===============================================================================
+// Renamed this file for case-sensitivity issues under Linux
+#ifndef LOCAL_ASSERT_H
+#define LOCAL_ASSERT_H
+
+#include "util/nowarnings.h"
+#include "types.h"
+
+#ifdef	DEBUG
+void DBG_AssertFunction(bool fExpr, const char* szExpr, const char* szFile, int szLine, const char* szMessage);
+#define ASSERT(f)		DBG_AssertFunction(f, #f, __FILE__, __LINE__, NULL)
+#define ASSERTSZ(f, sz)	DBG_AssertFunction(f, #f, __FILE__, __LINE__, sz)
+#else	// !DEBUG
+#define ASSERT(f)
+#define ASSERTSZ(f, sz)
+#endif	// !DEBUG
+
+#endif
\ No newline at end of file
diff --git a/main/source/lua/etc/bin2c.c b/main/source/lua/etc/bin2c.c
new file mode 100644
index 00000000..ac7a70bb
--- /dev/null
+++ b/main/source/lua/etc/bin2c.c
@@ -0,0 +1,67 @@
+/*
+* bin2c.c
+* convert files to byte arrays for automatic loading with lua_dobuffer
+* Luiz Henrique de Figueiredo (lhf@tecgraf.puc-rio.br)
+* 02 Apr 2003 20:44:31
+*/
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+static void dump(FILE* f, int n)
+{
+ printf("static const unsigned char B%d[]={\n",n);
+ for (n=1;;n++)
+ {
+  int c=getc(f); 
+  if (c==EOF) break;
+  printf("%3u,",c);
+  if (n==20) { putchar('\n'); n=0; }
+ }
+ printf("\n};\n\n");
+}
+
+static void fdump(const char* fn, int n)
+{
+ FILE* f= fopen(fn,"rb");		/* must open in binary mode */
+ if (f==NULL)
+ {
+  fprintf(stderr,"bin2c: cannot open ");
+  perror(fn);
+  exit(1);
+ }
+ else
+ {
+  printf("/* %s */\n",fn);
+  dump(f,n);
+  fclose(f);
+ }
+}
+
+static void emit(const char* fn, int n)
+{
+ printf(" lua_dobuffer(L,(const char*)B%d,sizeof(B%d),\"%s\");\n",n,n,fn);
+}
+
+int main(int argc, char* argv[])
+{
+ printf("/* code automatically generated by bin2c -- DO NOT EDIT */\n");
+ printf("{\n");
+ if (argc<2)
+ {
+  dump(stdin,0);
+  emit("=stdin",0);
+ }
+ else
+ {
+  int i;
+  printf("/* #include'ing this file in a C program is equivalent to calling\n");
+  for (i=1; i<argc; i++) printf("  lua_dofile(L,\"%s\");\n",argv[i]);
+  printf("*/\n");
+  for (i=1; i<argc; i++) fdump(argv[i],i);
+  for (i=1; i<argc; i++) emit(argv[i],i);
+ }
+ printf("}\n");
+ return 0;
+}
diff --git a/main/source/lua/etc/min.c b/main/source/lua/etc/min.c
new file mode 100644
index 00000000..fe1acff8
--- /dev/null
+++ b/main/source/lua/etc/min.c
@@ -0,0 +1,46 @@
+/*
+* min.c -- a minimal Lua interpreter
+* loads stdin only with minimal error handling.
+* no interaction, and no standard library, only a "print" function.
+*/
+
+#include <stdio.h>
+#include "lua.h"
+
+static int print(lua_State *L)
+{
+ int n=lua_gettop(L);
+ int i;
+ for (i=1; i<=n; i++)
+ {
+  if (i>1) printf("\t");
+  if (lua_isstring(L,i))
+   printf("%s",lua_tostring(L,i));
+  else if (lua_isnil(L,i))
+   printf("%s","nil");
+  else if (lua_isboolean(L,i))
+   printf("%s",lua_toboolean(L,i) ? "true" : "false");
+  else
+   printf("%s:%p",lua_typename(L,lua_type(L,i)),lua_topointer(L,i));
+ }
+ printf("\n");
+ return 0;
+}
+
+static const char *getF(lua_State *L, void *ud, size_t *size)
+{
+ FILE *f=(FILE *)ud;
+ static char buff[512];
+ if (feof(f)) return NULL;
+ *size=fread(buff,1,sizeof(buff),f);
+ return (*size>0) ? buff : NULL;
+}
+
+int main(void)
+{
+ lua_State *L=lua_open();
+ lua_register(L,"print",print);
+ if (lua_load(L,getF,stdin,"=stdin") || lua_pcall(L,0,0,0))
+  fprintf(stderr,"%s\n",lua_tostring(L,-1));
+ return 0;
+}
diff --git a/main/source/lua/etc/trace.c b/main/source/lua/etc/trace.c
new file mode 100644
index 00000000..739565c1
--- /dev/null
+++ b/main/source/lua/etc/trace.c
@@ -0,0 +1,55 @@
+/*
+* trace.c -- a simple execution tracer for Lua
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include "lua.h"
+#include "lualib.h"
+#include "lauxlib.h"
+
+static FILE* LOG;		/* log file */
+static int I=0;			/* indentation level */
+
+static void hook(lua_State *L, lua_Debug *ar)
+{
+ const char* s="";
+ switch (ar->event)
+ {
+  case LUA_HOOKTAILRET: ar->event=LUA_HOOKRET;
+  case LUA_HOOKRET: s="return"; break;
+  case LUA_HOOKCALL: s="call"; break;
+  case LUA_HOOKLINE: s="line"; break;
+  default: break;
+ }
+ fprintf(LOG,"[%d]\t%*s%s\t-- %d\n",I,I,"",s,ar->currentline);
+ if (ar->event==LUA_HOOKCALL) ++I; else if (ar->event==LUA_HOOKRET) --I;
+}
+
+static void start_trace(lua_State *L, FILE* logfile)
+{
+ lua_sethook(L,hook,LUA_MASKCALL | LUA_MASKRET | LUA_MASKLINE, 0);
+ LOG=logfile;
+}
+
+static void stop_trace(lua_State *L)
+{
+ lua_sethook(L,NULL,0,0);
+ fclose(LOG);
+}
+
+int main(void)
+{
+ int rc;
+ lua_State *L=lua_open();
+ lua_baselibopen(L);
+ lua_tablibopen(L);
+ lua_iolibopen(L);
+ lua_strlibopen(L);
+ lua_mathlibopen(L);
+ lua_dblibopen(L);
+ start_trace(L,stderr);
+ rc=lua_dofile(L,NULL);
+ stop_trace(L);
+ return rc;
+}
diff --git a/main/source/lua/include/lauxlib.h b/main/source/lua/include/lauxlib.h
new file mode 100644
index 00000000..a56aa0bb
--- /dev/null
+++ b/main/source/lua/include/lauxlib.h
@@ -0,0 +1,145 @@
+/*
+** $Id: lauxlib.h,v 1.60 2003/04/03 13:35:34 roberto Exp $
+** Auxiliary functions for building Lua libraries
+** See Copyright Notice in lua.h
+*/
+
+
+#ifndef lauxlib_h
+#define lauxlib_h
+
+
+#include <stddef.h>
+#include <stdio.h>
+
+#include "lua.h"
+
+
+#ifndef LUALIB_API
+#define LUALIB_API	LUA_API
+#endif
+
+
+
+typedef struct luaL_reg {
+  const char *name;
+  lua_CFunction func;
+} luaL_reg;
+
+
+LUALIB_API void luaL_openlib (lua_State *L, const char *libname,
+                               const luaL_reg *l, int nup);
+LUALIB_API int luaL_getmetafield (lua_State *L, int obj, const char *e);
+LUALIB_API int luaL_callmeta (lua_State *L, int obj, const char *e);
+LUALIB_API int luaL_typerror (lua_State *L, int narg, const char *tname);
+LUALIB_API int luaL_argerror (lua_State *L, int numarg, const char *extramsg);
+LUALIB_API const char *luaL_checklstring (lua_State *L, int numArg, size_t *l);
+LUALIB_API const char *luaL_optlstring (lua_State *L, int numArg,
+                                           const char *def, size_t *l);
+LUALIB_API lua_Number luaL_checknumber (lua_State *L, int numArg);
+LUALIB_API lua_Number luaL_optnumber (lua_State *L, int nArg, lua_Number def);
+
+LUALIB_API void luaL_checkstack (lua_State *L, int sz, const char *msg);
+LUALIB_API void luaL_checktype (lua_State *L, int narg, int t);
+LUALIB_API void luaL_checkany (lua_State *L, int narg);
+
+LUALIB_API int   luaL_newmetatable (lua_State *L, const char *tname);
+LUALIB_API void  luaL_getmetatable (lua_State *L, const char *tname);
+LUALIB_API void *luaL_checkudata (lua_State *L, int ud, const char *tname);
+
+LUALIB_API void luaL_where (lua_State *L, int lvl);
+LUALIB_API int luaL_error (lua_State *L, const char *fmt, ...);
+
+LUALIB_API int luaL_findstring (const char *st, const char *const lst[]);
+
+LUALIB_API int luaL_ref (lua_State *L, int t);
+LUALIB_API void luaL_unref (lua_State *L, int t, int ref);
+
+LUALIB_API int luaL_getn (lua_State *L, int t);
+LUALIB_API void luaL_setn (lua_State *L, int t, int n);
+
+LUALIB_API int luaL_loadfile (lua_State *L, const char *filename);
+LUALIB_API int luaL_loadbuffer (lua_State *L, const char *buff, size_t sz,
+                                const char *name);
+
+
+
+/*
+** ===============================================================
+** some useful macros
+** ===============================================================
+*/
+
+#define luaL_argcheck(L, cond,numarg,extramsg) if (!(cond)) \
+                                               luaL_argerror(L, numarg,extramsg)
+#define luaL_checkstring(L,n)	(luaL_checklstring(L, (n), NULL))
+#define luaL_optstring(L,n,d)	(luaL_optlstring(L, (n), (d), NULL))
+#define luaL_checkint(L,n)	((int)luaL_checknumber(L, n))
+#define luaL_checklong(L,n)	((long)luaL_checknumber(L, n))
+#define luaL_optint(L,n,d)	((int)luaL_optnumber(L, n,(lua_Number)(d)))
+#define luaL_optlong(L,n,d)	((long)luaL_optnumber(L, n,(lua_Number)(d)))
+
+
+/*
+** {======================================================
+** Generic Buffer manipulation
+** =======================================================
+*/
+
+
+#ifndef LUAL_BUFFERSIZE
+#define LUAL_BUFFERSIZE	  BUFSIZ
+#endif
+
+
+typedef struct luaL_Buffer {
+  char *p;			/* current position in buffer */
+  int lvl;  /* number of strings in the stack (level) */
+  lua_State *L;
+  char buffer[LUAL_BUFFERSIZE];
+} luaL_Buffer;
+
+#define luaL_putchar(B,c) \
+  ((void)((B)->p < ((B)->buffer+LUAL_BUFFERSIZE) || luaL_prepbuffer(B)), \
+   (*(B)->p++ = (char)(c)))
+
+#define luaL_addsize(B,n)	((B)->p += (n))
+
+LUALIB_API void luaL_buffinit (lua_State *L, luaL_Buffer *B);
+LUALIB_API char *luaL_prepbuffer (luaL_Buffer *B);
+LUALIB_API void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l);
+LUALIB_API void luaL_addstring (luaL_Buffer *B, const char *s);
+LUALIB_API void luaL_addvalue (luaL_Buffer *B);
+LUALIB_API void luaL_pushresult (luaL_Buffer *B);
+
+
+/* }====================================================== */
+
+
+
+/*
+** Compatibility macros and functions
+*/
+
+LUALIB_API int   lua_dofile (lua_State *L, const char *filename);
+LUALIB_API int   lua_dostring (lua_State *L, const char *str);
+LUALIB_API int   lua_dobuffer (lua_State *L, const char *buff, size_t sz,
+                               const char *n);
+
+
+#define luaL_check_lstr 	luaL_checklstring
+#define luaL_opt_lstr 	luaL_optlstring 
+#define luaL_check_number 	luaL_checknumber 
+#define luaL_opt_number	luaL_optnumber
+#define luaL_arg_check	luaL_argcheck
+#define luaL_check_string	luaL_checkstring
+#define luaL_opt_string	luaL_optstring
+#define luaL_check_int	luaL_checkint
+#define luaL_check_long	luaL_checklong
+#define luaL_opt_int	luaL_optint
+#define luaL_opt_long	luaL_optlong
+
+
+#endif
+
+
diff --git a/main/source/lua/include/lua.h b/main/source/lua/include/lua.h
new file mode 100644
index 00000000..d166da7e
--- /dev/null
+++ b/main/source/lua/include/lua.h
@@ -0,0 +1,391 @@
+/*
+** $Id: lua.h,v 1.175 2003/03/18 12:31:39 roberto Exp $
+** Lua - An Extensible Extension Language
+** Tecgraf: Computer Graphics Technology Group, PUC-Rio, Brazil
+** http://www.lua.org	mailto:info@lua.org
+** See Copyright Notice at the end of this file
+*/
+
+
+#ifndef lua_h
+#define lua_h
+
+#include <stdarg.h>
+#include <stddef.h>
+
+
+#define LUA_VERSION	"Lua 5.0"
+#define LUA_COPYRIGHT	"Copyright (C) 1994-2003 Tecgraf, PUC-Rio"
+#define LUA_AUTHORS 	"R. Ierusalimschy, L. H. de Figueiredo & W. Celes"
+
+
+
+/* option for multiple returns in `lua_pcall' and `lua_call' */
+#define LUA_MULTRET	(-1)
+
+
+/*
+** pseudo-indices
+*/
+#define LUA_REGISTRYINDEX	(-10000)
+#define LUA_GLOBALSINDEX	(-10001)
+#define lua_upvalueindex(i)	(LUA_GLOBALSINDEX-(i))
+
+
+/* error codes for `lua_load' and `lua_pcall' */
+#define LUA_ERRRUN	1
+#define LUA_ERRFILE	2
+#define LUA_ERRSYNTAX	3
+#define LUA_ERRMEM	4
+#define LUA_ERRERR	5
+
+
+typedef struct lua_State lua_State;
+
+typedef int (*lua_CFunction) (lua_State *L);
+
+
+/*
+** functions that read/write blocks when loading/dumping Lua chunks
+*/
+typedef const char * (*lua_Chunkreader) (lua_State *L, void *ud, size_t *sz);
+
+typedef int (*lua_Chunkwriter) (lua_State *L, const void* p,
+                                size_t sz, void* ud);
+
+
+/*
+** basic types
+*/
+#define LUA_TNONE	(-1)
+
+#define LUA_TNIL	0
+#define LUA_TBOOLEAN	1
+#define LUA_TLIGHTUSERDATA	2
+#define LUA_TNUMBER	3
+#define LUA_TSTRING	4
+#define LUA_TTABLE	5
+#define LUA_TFUNCTION	6
+#define LUA_TUSERDATA	7
+#define LUA_TTHREAD	8
+
+
+/* minimum Lua stack available to a C function */
+#define LUA_MINSTACK	20
+
+
+/*
+** generic extra include file
+*/
+#ifdef LUA_USER_H
+#include LUA_USER_H
+#endif
+
+
+/* type of numbers in Lua */
+#ifndef LUA_NUMBER
+typedef double lua_Number;
+#else
+typedef LUA_NUMBER lua_Number;
+#endif
+
+
+/* mark for all API functions */
+#ifndef LUA_API
+#define LUA_API		extern
+#endif
+
+
+/*
+** state manipulation
+*/
+LUA_API lua_State *lua_open (void);
+LUA_API void       lua_close (lua_State *L);
+LUA_API lua_State *lua_newthread (lua_State *L);
+
+LUA_API lua_CFunction lua_atpanic (lua_State *L, lua_CFunction panicf);
+
+
+/*
+** basic stack manipulation
+*/
+LUA_API int   lua_gettop (lua_State *L);
+LUA_API void  lua_settop (lua_State *L, int idx);
+LUA_API void  lua_pushvalue (lua_State *L, int idx);
+LUA_API void  lua_remove (lua_State *L, int idx);
+LUA_API void  lua_insert (lua_State *L, int idx);
+LUA_API void  lua_replace (lua_State *L, int idx);
+LUA_API int   lua_checkstack (lua_State *L, int sz);
+
+LUA_API void  lua_xmove (lua_State *from, lua_State *to, int n);
+
+
+/*
+** access functions (stack -> C)
+*/
+
+LUA_API int             lua_isnumber (lua_State *L, int idx);
+LUA_API int             lua_isstring (lua_State *L, int idx);
+LUA_API int             lua_iscfunction (lua_State *L, int idx);
+LUA_API int             lua_isuserdata (lua_State *L, int idx);
+LUA_API int             lua_type (lua_State *L, int idx);
+LUA_API const char     *lua_typename (lua_State *L, int tp);
+
+LUA_API int            lua_equal (lua_State *L, int idx1, int idx2);
+LUA_API int            lua_rawequal (lua_State *L, int idx1, int idx2);
+LUA_API int            lua_lessthan (lua_State *L, int idx1, int idx2);
+
+LUA_API lua_Number      lua_tonumber (lua_State *L, int idx);
+LUA_API int             lua_toboolean (lua_State *L, int idx);
+LUA_API const char     *lua_tostring (lua_State *L, int idx);
+LUA_API size_t          lua_strlen (lua_State *L, int idx);
+LUA_API lua_CFunction   lua_tocfunction (lua_State *L, int idx);
+LUA_API void	       *lua_touserdata (lua_State *L, int idx);
+LUA_API lua_State      *lua_tothread (lua_State *L, int idx);
+LUA_API const void     *lua_topointer (lua_State *L, int idx);
+
+
+/*
+** push functions (C -> stack)
+*/
+LUA_API void  lua_pushnil (lua_State *L);
+LUA_API void  lua_pushnumber (lua_State *L, lua_Number n);
+LUA_API void  lua_pushlstring (lua_State *L, const char *s, size_t l);
+LUA_API void  lua_pushstring (lua_State *L, const char *s);
+LUA_API const char *lua_pushvfstring (lua_State *L, const char *fmt,
+                                                    va_list argp);
+LUA_API const char *lua_pushfstring (lua_State *L, const char *fmt, ...);
+LUA_API void  lua_pushcclosure (lua_State *L, lua_CFunction fn, int n);
+LUA_API void  lua_pushboolean (lua_State *L, int b);
+LUA_API void  lua_pushlightuserdata (lua_State *L, void *p);
+
+
+/*
+** get functions (Lua -> stack)
+*/
+LUA_API void  lua_gettable (lua_State *L, int idx);
+LUA_API void  lua_rawget (lua_State *L, int idx);
+LUA_API void  lua_rawgeti (lua_State *L, int idx, int n);
+LUA_API void  lua_newtable (lua_State *L);
+LUA_API void *lua_newuserdata (lua_State *L, size_t sz);
+LUA_API int   lua_getmetatable (lua_State *L, int objindex);
+LUA_API void  lua_getfenv (lua_State *L, int idx);
+
+
+/*
+** set functions (stack -> Lua)
+*/
+LUA_API void  lua_settable (lua_State *L, int idx);
+LUA_API void  lua_rawset (lua_State *L, int idx);
+LUA_API void  lua_rawseti (lua_State *L, int idx, int n);
+LUA_API int   lua_setmetatable (lua_State *L, int objindex);
+LUA_API int   lua_setfenv (lua_State *L, int idx);
+
+
+/*
+** `load' and `call' functions (load and run Lua code)
+*/
+LUA_API void  lua_call (lua_State *L, int nargs, int nresults);
+LUA_API int   lua_pcall (lua_State *L, int nargs, int nresults, int errfunc);
+LUA_API int lua_cpcall (lua_State *L, lua_CFunction func, void *ud);
+LUA_API int   lua_load (lua_State *L, lua_Chunkreader reader, void *dt,
+                        const char *chunkname);
+
+LUA_API int lua_dump (lua_State *L, lua_Chunkwriter writer, void *data);
+
+
+/*
+** coroutine functions
+*/
+LUA_API int  lua_yield (lua_State *L, int nresults);
+LUA_API int  lua_resume (lua_State *L, int narg);
+
+/*
+** garbage-collection functions
+*/
+LUA_API int   lua_getgcthreshold (lua_State *L);
+LUA_API int   lua_getgccount (lua_State *L);
+LUA_API void  lua_setgcthreshold (lua_State *L, int newthreshold);
+
+/*
+** miscellaneous functions
+*/
+
+LUA_API const char *lua_version (void);
+
+LUA_API int   lua_error (lua_State *L);
+
+LUA_API int   lua_next (lua_State *L, int idx);
+
+LUA_API void  lua_concat (lua_State *L, int n);
+
+
+
+/* 
+** ===============================================================
+** some useful macros
+** ===============================================================
+*/
+
+#define lua_boxpointer(L,u) \
+	(*(void **)(lua_newuserdata(L, sizeof(void *))) = (u))
+
+#define lua_unboxpointer(L,i)	(*(void **)(lua_touserdata(L, i)))
+
+#define lua_pop(L,n)		lua_settop(L, -(n)-1)
+
+#define lua_register(L,n,f) \
+	(lua_pushstring(L, n), \
+	 lua_pushcfunction(L, f), \
+	 lua_settable(L, LUA_GLOBALSINDEX))
+
+#define lua_pushcfunction(L,f)	lua_pushcclosure(L, f, 0)
+
+#define lua_isfunction(L,n)	(lua_type(L,n) == LUA_TFUNCTION)
+#define lua_istable(L,n)	(lua_type(L,n) == LUA_TTABLE)
+#define lua_islightuserdata(L,n)	(lua_type(L,n) == LUA_TLIGHTUSERDATA)
+#define lua_isnil(L,n)		(lua_type(L,n) == LUA_TNIL)
+#define lua_isboolean(L,n)	(lua_type(L,n) == LUA_TBOOLEAN)
+#define lua_isnone(L,n)		(lua_type(L,n) == LUA_TNONE)
+#define lua_isnoneornil(L, n)	(lua_type(L,n) <= 0)
+
+#define lua_pushliteral(L, s)	\
+	lua_pushlstring(L, "" s, (sizeof(s)/sizeof(char))-1)
+
+
+
+/*
+** compatibility macros and functions
+*/
+
+
+LUA_API int lua_pushupvalues (lua_State *L);
+
+#define lua_getregistry(L)	lua_pushvalue(L, LUA_REGISTRYINDEX)
+#define lua_setglobal(L,s)	\
+   (lua_pushstring(L, s), lua_insert(L, -2), lua_settable(L, LUA_GLOBALSINDEX))
+
+#define lua_getglobal(L,s)	\
+		(lua_pushstring(L, s), lua_gettable(L, LUA_GLOBALSINDEX))
+
+
+/* compatibility with ref system */
+
+/* pre-defined references */
+#define LUA_NOREF	(-2)
+#define LUA_REFNIL	(-1)
+
+#define lua_ref(L,lock)	((lock) ? luaL_ref(L, LUA_REGISTRYINDEX) : \
+      (lua_pushstring(L, "unlocked references are obsolete"), lua_error(L), 0))
+
+#define lua_unref(L,ref)	luaL_unref(L, LUA_REGISTRYINDEX, (ref))
+
+#define lua_getref(L,ref)	lua_rawgeti(L, LUA_REGISTRYINDEX, ref)
+
+
+
+/*
+** {======================================================================
+** useful definitions for Lua kernel and libraries
+** =======================================================================
+*/
+
+/* formats for Lua numbers */
+#ifndef LUA_NUMBER_SCAN
+#define LUA_NUMBER_SCAN		"%lf"
+#endif
+
+#ifndef LUA_NUMBER_FMT
+#define LUA_NUMBER_FMT		"%.14g"
+#endif
+
+/* }====================================================================== */
+
+
+/*
+** {======================================================================
+** Debug API
+** =======================================================================
+*/
+
+
+/*
+** Event codes
+*/
+#define LUA_HOOKCALL	0
+#define LUA_HOOKRET	1
+#define LUA_HOOKLINE	2
+#define LUA_HOOKCOUNT	3
+#define LUA_HOOKTAILRET 4
+
+
+/*
+** Event masks
+*/
+#define LUA_MASKCALL	(1 << LUA_HOOKCALL)
+#define LUA_MASKRET	(1 << LUA_HOOKRET)
+#define LUA_MASKLINE	(1 << LUA_HOOKLINE)
+#define LUA_MASKCOUNT	(1 << LUA_HOOKCOUNT)
+
+typedef struct lua_Debug lua_Debug;  /* activation record */
+
+typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
+
+
+LUA_API int lua_getstack (lua_State *L, int level, lua_Debug *ar);
+LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar);
+LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n);
+LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n);
+LUA_API const char *lua_getupvalue (lua_State *L, int funcindex, int n);
+LUA_API const char *lua_setupvalue (lua_State *L, int funcindex, int n);
+
+LUA_API int lua_sethook (lua_State *L, lua_Hook func, int mask, int count);
+LUA_API lua_Hook lua_gethook (lua_State *L);
+LUA_API int lua_gethookmask (lua_State *L);
+LUA_API int lua_gethookcount (lua_State *L);
+
+
+#define LUA_IDSIZE	60
+
+struct lua_Debug {
+  int event;
+  const char *name;	/* (n) */
+  const char *namewhat;	/* (n) `global', `local', `field', `method' */
+  const char *what;	/* (S) `Lua', `C', `main', `tail' */
+  const char *source;	/* (S) */
+  int currentline;	/* (l) */
+  int nups;		/* (u) number of upvalues */
+  int linedefined;	/* (S) */
+  char short_src[LUA_IDSIZE]; /* (S) */
+  /* private part */
+  int i_ci;  /* active function */
+};
+
+/* }====================================================================== */
+
+
+/******************************************************************************
+* Copyright (C) 1994-2003 Tecgraf, PUC-Rio.  All rights reserved.
+*
+* Permission is hereby granted, free of charge, to any person obtaining
+* a copy of this software and associated documentation files (the
+* "Software"), to deal in the Software without restriction, including
+* without limitation the rights to use, copy, modify, merge, publish,
+* distribute, sublicense, and/or sell copies of the Software, and to
+* permit persons to whom the Software is furnished to do so, subject to
+* the following conditions:
+*
+* The above copyright notice and this permission notice shall be
+* included in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+******************************************************************************/
+
+
+#endif
diff --git a/main/source/lua/include/luadebug.h b/main/source/lua/include/luadebug.h
new file mode 100644
index 00000000..41313000
--- /dev/null
+++ b/main/source/lua/include/luadebug.h
@@ -0,0 +1,46 @@
+/*
+** $Id: luadebug.h,v 1.1.1.1 2001/06/22 22:35:55 charlie Exp $
+** Debugging API
+** See Copyright Notice in lua.h
+*/
+
+
+#ifndef luadebug_h
+#define luadebug_h
+
+
+#include "lua.h"
+
+typedef struct lua_Debug lua_Debug;  /* activation record */
+typedef struct lua_Localvar lua_Localvar;
+
+typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
+
+
+LUA_API int lua_getstack (lua_State *L, int level, lua_Debug *ar);
+LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar);
+LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n);
+LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n);
+
+LUA_API lua_Hook lua_setcallhook (lua_State *L, lua_Hook func);
+LUA_API lua_Hook lua_setlinehook (lua_State *L, lua_Hook func);
+
+
+#define LUA_IDSIZE	60
+
+struct lua_Debug {
+  const char *event;     /* `call', `return' */
+  int currentline;       /* (l) */
+  const char *name;      /* (n) */
+  const char *namewhat;  /* (n) `global', `tag method', `local', `field' */
+  int nups;              /* (u) number of upvalues */
+  int linedefined;       /* (S) */
+  const char *what;      /* (S) `Lua' function, `C' function, Lua `main' */
+  const char *source;    /* (S) */
+  char short_src[LUA_IDSIZE]; /* (S) */
+  /* private part */
+  struct lua_TObject *_func;  /* active function */
+};
+
+
+#endif
diff --git a/main/source/lua/include/lualib.h b/main/source/lua/include/lualib.h
new file mode 100644
index 00000000..3edc6134
--- /dev/null
+++ b/main/source/lua/include/lualib.h
@@ -0,0 +1,56 @@
+/*
+** $Id: lualib.h,v 1.28 2003/03/18 12:24:26 roberto Exp $
+** Lua standard libraries
+** See Copyright Notice in lua.h
+*/
+
+
+#ifndef lualib_h
+#define lualib_h
+
+#include "lua.h"
+
+
+#ifndef LUALIB_API
+#define LUALIB_API	LUA_API
+#endif
+
+
+#define LUA_COLIBNAME	"coroutine"
+LUALIB_API int luaopen_base (lua_State *L);
+
+#define LUA_TABLIBNAME	"table"
+LUALIB_API int luaopen_table (lua_State *L);
+
+#define LUA_IOLIBNAME	"io"
+#define LUA_OSLIBNAME	"os"
+LUALIB_API int luaopen_io (lua_State *L);
+
+#define LUA_STRLIBNAME	"string"
+LUALIB_API int luaopen_string (lua_State *L);
+
+#define LUA_MATHLIBNAME	"math"
+LUALIB_API int luaopen_math (lua_State *L);
+
+#define LUA_DBLIBNAME	"debug"
+LUALIB_API int luaopen_debug (lua_State *L);
+
+
+LUALIB_API int luaopen_loadlib (lua_State *L);
+
+
+/* to help testing the libraries */
+#ifndef lua_assert
+#define lua_assert(c)		/* empty */
+#endif
+
+
+/* compatibility code */
+#define lua_baselibopen	luaopen_base
+#define lua_tablibopen	luaopen_table
+#define lua_iolibopen	luaopen_io
+#define lua_strlibopen	luaopen_string
+#define lua_mathlibopen	luaopen_math
+#define lua_dblibopen	luaopen_debug
+
+#endif
diff --git a/main/source/lua/lua.dsp b/main/source/lua/lua.dsp
new file mode 100644
index 00000000..f9e0c14b
--- /dev/null
+++ b/main/source/lua/lua.dsp
@@ -0,0 +1,280 @@
+# Microsoft Developer Studio Project File - Name="lua" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=lua - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "lua.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "lua.mak" CFG="lua - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "lua - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "lua - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "lua"
+# PROP Scc_LocalPath "."
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "lua - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /Ob2 /I ".." /I "include" /I "..lua/src" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lua.lib"
+
+!ELSEIF  "$(CFG)" == "lua - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /G5 /MTd /W3 /Gm /GX /ZI /Od /I ".." /I "include" /I "..lua/src" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lua.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "lua - Win32 Release"
+# Name "lua - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\src\lapi.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lib\lauxlib.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lib\lbaselib.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lcode.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lib\ldblib.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ldebug.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ldo.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ldump.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lfunc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lgc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lib\liolib.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\llex.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lib\lmathlib.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lmem.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lib\loadlib.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lobject.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lopcodes.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lparser.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lstate.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lstring.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lib\lstrlib.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ltable.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lib\ltablib.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ltests.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ltm.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lundump.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lvm.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lzio.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\src\lapi.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lcode.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ldebug.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ldo.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lfunc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lgc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\llex.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\llimits.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lmem.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lobject.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lopcodes.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lparser.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lstate.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lstring.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ltable.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ltm.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lundump.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lvm.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\lzio.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/main/source/lua/lua.vcproj b/main/source/lua/lua.vcproj
new file mode 100644
index 00000000..11488b18
--- /dev/null
+++ b/main/source/lua/lua.vcproj
@@ -0,0 +1,752 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="lua"
+	ProjectGUID="{C03B17AC-8484-4453-843B-B38EBA7C5775}"
+	SccProjectName=""
+	SccAuxPath=""
+	SccLocalPath=""
+	SccProvider="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)/"
+			IntermediateDirectory="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..,include,..lua/src"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Release/lua.pch"
+				AssemblerListingLocation="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ObjectFile="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ProgramDataBaseFileName="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(SolutionDir)\lib\$(ConfigurationName)\lua.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)/"
+			IntermediateDirectory="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				OptimizeForProcessor="1"
+				AdditionalIncludeDirectories="$(SolutionDir);include;src"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Debug/lua.pch"
+				AssemblerListingLocation="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ObjectFile="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ProgramDataBaseFileName="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(SolutionDir)\lib\$(ConfigurationName)\lua.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="src\lapi.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\lib\lauxlib.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\lib\lbaselib.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\lcode.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\lib\ldblib.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\ldebug.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\ldo.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\ldump.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\lfunc.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\lgc.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\lib\liolib.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\llex.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\lib\lmathlib.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\lmem.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\lib\loadlib.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\lobject.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\lopcodes.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\lparser.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\lstate.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\lstring.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\lib\lstrlib.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\ltable.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\lib\ltablib.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\ltests.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\ltm.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\lundump.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\lvm.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\lzio.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="src\lapi.h">
+			</File>
+			<File
+				RelativePath="src\lcode.h">
+			</File>
+			<File
+				RelativePath="src\ldebug.h">
+			</File>
+			<File
+				RelativePath="src\ldo.h">
+			</File>
+			<File
+				RelativePath="src\lfunc.h">
+			</File>
+			<File
+				RelativePath="src\lgc.h">
+			</File>
+			<File
+				RelativePath="src\llex.h">
+			</File>
+			<File
+				RelativePath="src\llimits.h">
+			</File>
+			<File
+				RelativePath="src\lmem.h">
+			</File>
+			<File
+				RelativePath="src\lobject.h">
+			</File>
+			<File
+				RelativePath="src\lopcodes.h">
+			</File>
+			<File
+				RelativePath="src\lparser.h">
+			</File>
+			<File
+				RelativePath="src\lstate.h">
+			</File>
+			<File
+				RelativePath="src\lstring.h">
+			</File>
+			<File
+				RelativePath="src\ltable.h">
+			</File>
+			<File
+				RelativePath="src\ltm.h">
+			</File>
+			<File
+				RelativePath="src\lundump.h">
+			</File>
+			<File
+				RelativePath="src\lvm.h">
+			</File>
+			<File
+				RelativePath="src\lzio.h">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/main/source/lua/src/lapi.c b/main/source/lua/src/lapi.c
new file mode 100644
index 00000000..011db58b
--- /dev/null
+++ b/main/source/lua/src/lapi.c
@@ -0,0 +1,922 @@
+/*
+** $Id: lapi.c,v 1.235 2003/04/07 14:36:08 roberto Exp $
+** Lua API
+** See Copyright Notice in lua.h
+*/
+
+
+#include <assert.h>
+#include <string.h>
+
+#define lapi_c
+
+#include "lua.h"
+
+#include "lapi.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+#include "lundump.h"
+#include "lvm.h"
+
+
+const char lua_ident[] =
+  "$Lua: " LUA_VERSION " " LUA_COPYRIGHT " $\n"
+  "$Authors: " LUA_AUTHORS " $\n"
+  "$URL: www.lua.org $\n";
+
+
+
+#ifndef api_check
+#define api_check(L, o)		/*{ assert(o); }*/
+#endif
+
+#define api_checknelems(L, n)	api_check(L, (n) <= (L->top - L->base))
+
+#define api_incr_top(L)   {api_check(L, L->top < L->ci->top); L->top++;}
+
+
+
+
+static TObject *negindex (lua_State *L, int idx) {
+  if (idx > LUA_REGISTRYINDEX) {
+    api_check(L, idx != 0 && -idx <= L->top - L->base);
+    return L->top+idx;
+  }
+  else switch (idx) {  /* pseudo-indices */
+    case LUA_REGISTRYINDEX: return registry(L);
+    case LUA_GLOBALSINDEX: return gt(L);
+    default: {
+      TObject *func = (L->base - 1);
+      idx = LUA_GLOBALSINDEX - idx;
+      lua_assert(iscfunction(func));
+      return (idx <= clvalue(func)->c.nupvalues)
+                ? &clvalue(func)->c.upvalue[idx-1]
+                : NULL;
+    }
+  }
+}
+
+
+static TObject *luaA_index (lua_State *L, int idx) {
+  if (idx > 0) {
+    api_check(L, idx <= L->top - L->base);
+    return L->base + idx - 1;
+  }
+  else {
+    TObject *o = negindex(L, idx);
+    api_check(L, o != NULL);
+    return o;
+  }
+}
+
+
+static TObject *luaA_indexAcceptable (lua_State *L, int idx) {
+  if (idx > 0) {
+    TObject *o = L->base+(idx-1);
+    api_check(L, idx <= L->stack_last - L->base);
+    if (o >= L->top) return NULL;
+    else return o;
+  }
+  else
+    return negindex(L, idx);
+}
+
+
+void luaA_pushobject (lua_State *L, const TObject *o) {
+  setobj2s(L->top, o);
+  incr_top(L);
+}
+
+
+LUA_API int lua_checkstack (lua_State *L, int size) {
+  int res;
+  lua_lock(L);
+  if ((L->top - L->base + size) > LUA_MAXCSTACK)
+    res = 0;  /* stack overflow */
+  else {
+    luaD_checkstack(L, size);
+    if (L->ci->top < L->top + size)
+      L->ci->top = L->top + size;
+    res = 1;
+  }
+  lua_unlock(L);
+  return res;
+}
+
+
+LUA_API void lua_xmove (lua_State *from, lua_State *to, int n) {
+  int i;
+  lua_lock(to);
+  api_checknelems(from, n);
+  from->top -= n;
+  for (i = 0; i < n; i++) {
+    setobj2s(to->top, from->top + i);
+    api_incr_top(to);
+  }
+  lua_unlock(to);
+}
+
+
+LUA_API lua_CFunction lua_atpanic (lua_State *L, lua_CFunction panicf) {
+  lua_CFunction old;
+  lua_lock(L);
+  old = G(L)->panic;
+  G(L)->panic = panicf;
+  lua_unlock(L);
+  return old;
+}
+
+
+LUA_API lua_State *lua_newthread (lua_State *L) {
+  lua_State *L1;
+  lua_lock(L);
+  luaC_checkGC(L);
+  L1 = luaE_newthread(L);
+  setthvalue(L->top, L1);
+  api_incr_top(L);
+  lua_unlock(L);
+  lua_userstateopen(L1);
+  return L1;
+}
+
+
+
+/*
+** basic stack manipulation
+*/
+
+
+LUA_API int lua_gettop (lua_State *L) {
+  return (L->top - L->base);
+}
+
+
+LUA_API void lua_settop (lua_State *L, int idx) {
+  lua_lock(L);
+  if (idx >= 0) {
+    api_check(L, idx <= L->stack_last - L->base);
+    while (L->top < L->base + idx)
+      setnilvalue(L->top++);
+    L->top = L->base + idx;
+  }
+  else {
+    api_check(L, -(idx+1) <= (L->top - L->base));
+    L->top += idx+1;  /* `subtract' index (index is negative) */
+  }
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_remove (lua_State *L, int idx) {
+  StkId p;
+  lua_lock(L);
+  p = luaA_index(L, idx);
+  while (++p < L->top) setobjs2s(p-1, p);
+  L->top--;
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_insert (lua_State *L, int idx) {
+  StkId p;
+  StkId q;
+  lua_lock(L);
+  p = luaA_index(L, idx);
+  for (q = L->top; q>p; q--) setobjs2s(q, q-1);
+  setobjs2s(p, L->top);
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_replace (lua_State *L, int idx) {
+  lua_lock(L);
+  api_checknelems(L, 1);
+  setobj(luaA_index(L, idx), L->top - 1);  /* write barrier */
+  L->top--;
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushvalue (lua_State *L, int idx) {
+  lua_lock(L);
+  setobj2s(L->top, luaA_index(L, idx));
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+
+/*
+** access functions (stack -> C)
+*/
+
+
+LUA_API int lua_type (lua_State *L, int idx) {
+  StkId o = luaA_indexAcceptable(L, idx);
+  return (o == NULL) ? LUA_TNONE : ttype(o);
+}
+
+
+LUA_API const char *lua_typename (lua_State *L, int t) {
+  UNUSED(L);
+  return (t == LUA_TNONE) ? "no value" : luaT_typenames[t];
+}
+
+
+LUA_API int lua_iscfunction (lua_State *L, int idx) {
+  StkId o = luaA_indexAcceptable(L, idx);
+  return (o == NULL) ? 0 : iscfunction(o);
+}
+
+
+LUA_API int lua_isnumber (lua_State *L, int idx) {
+  TObject n;
+  const TObject *o = luaA_indexAcceptable(L, idx);
+  return (o != NULL && tonumber(o, &n));
+}
+
+
+LUA_API int lua_isstring (lua_State *L, int idx) {
+  int t = lua_type(L, idx);
+  return (t == LUA_TSTRING || t == LUA_TNUMBER);
+}
+
+
+LUA_API int lua_isuserdata (lua_State *L, int idx) {
+  const TObject *o = luaA_indexAcceptable(L, idx);
+  return (o != NULL && (ttisuserdata(o) || ttislightuserdata(o)));
+}
+
+
+LUA_API int lua_rawequal (lua_State *L, int index1, int index2) {
+  StkId o1 = luaA_indexAcceptable(L, index1);
+  StkId o2 = luaA_indexAcceptable(L, index2);
+  return (o1 == NULL || o2 == NULL) ? 0  /* index out of range */
+                                    : luaO_rawequalObj(o1, o2);
+}
+
+
+LUA_API int lua_equal (lua_State *L, int index1, int index2) {
+  StkId o1, o2;
+  int i;
+  lua_lock(L);  /* may call tag method */
+  o1 = luaA_indexAcceptable(L, index1);
+  o2 = luaA_indexAcceptable(L, index2);
+  i = (o1 == NULL || o2 == NULL) ? 0  /* index out of range */
+                                 : equalobj(L, o1, o2);
+  lua_unlock(L);
+  return i;
+}
+
+
+LUA_API int lua_lessthan (lua_State *L, int index1, int index2) {
+  StkId o1, o2;
+  int i;
+  lua_lock(L);  /* may call tag method */
+  o1 = luaA_indexAcceptable(L, index1);
+  o2 = luaA_indexAcceptable(L, index2);
+  i = (o1 == NULL || o2 == NULL) ? 0  /* index out-of-range */
+                                 : luaV_lessthan(L, o1, o2);
+  lua_unlock(L);
+  return i;
+}
+
+
+
+LUA_API lua_Number lua_tonumber (lua_State *L, int idx) {
+  TObject n;
+  const TObject *o = luaA_indexAcceptable(L, idx);
+  if (o != NULL && tonumber(o, &n))
+    return nvalue(o);
+  else
+    return 0;
+}
+
+
+LUA_API int lua_toboolean (lua_State *L, int idx) {
+  const TObject *o = luaA_indexAcceptable(L, idx);
+  return (o != NULL) && !l_isfalse(o);
+}
+
+
+LUA_API const char *lua_tostring (lua_State *L, int idx) {
+  StkId o = luaA_indexAcceptable(L, idx);
+  if (o == NULL)
+    return NULL;
+  else if (ttisstring(o))
+    return svalue(o);
+  else {
+    const char *s;
+    lua_lock(L);  /* `luaV_tostring' may create a new string */
+    s = (luaV_tostring(L, o) ? svalue(o) : NULL);
+    luaC_checkGC(L);
+    lua_unlock(L);
+    return s;
+  }
+}
+
+
+LUA_API size_t lua_strlen (lua_State *L, int idx) {
+  StkId o = luaA_indexAcceptable(L, idx);
+  if (o == NULL)
+    return 0;
+  else if (ttisstring(o))
+    return tsvalue(o)->tsv.len;
+  else {
+    size_t l;
+    lua_lock(L);  /* `luaV_tostring' may create a new string */
+    l = (luaV_tostring(L, o) ? tsvalue(o)->tsv.len : 0);
+    lua_unlock(L);
+    return l;
+  }
+}
+
+
+LUA_API lua_CFunction lua_tocfunction (lua_State *L, int idx) {
+  StkId o = luaA_indexAcceptable(L, idx);
+  return (o == NULL || !iscfunction(o)) ? NULL : clvalue(o)->c.f;
+}
+
+
+LUA_API void *lua_touserdata (lua_State *L, int idx) {
+  StkId o = luaA_indexAcceptable(L, idx);
+  if (o == NULL) return NULL;
+  switch (ttype(o)) {
+    case LUA_TUSERDATA: return (uvalue(o) + 1);
+    case LUA_TLIGHTUSERDATA: return pvalue(o);
+    default: return NULL;
+  }
+}
+
+
+LUA_API lua_State *lua_tothread (lua_State *L, int idx) {
+  StkId o = luaA_indexAcceptable(L, idx);
+  return (o == NULL || !ttisthread(o)) ? NULL : thvalue(o);
+}
+
+
+LUA_API const void *lua_topointer (lua_State *L, int idx) {
+  StkId o = luaA_indexAcceptable(L, idx);
+  if (o == NULL) return NULL;
+  else {
+    switch (ttype(o)) {
+      case LUA_TTABLE: return hvalue(o);
+      case LUA_TFUNCTION: return clvalue(o);
+      case LUA_TTHREAD: return thvalue(o);
+      case LUA_TUSERDATA:
+      case LUA_TLIGHTUSERDATA:
+        return lua_touserdata(L, idx);
+      default: return NULL;
+    }
+  }
+}
+
+
+
+/*
+** push functions (C -> stack)
+*/
+
+
+LUA_API void lua_pushnil (lua_State *L) {
+  lua_lock(L);
+  setnilvalue(L->top);
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushnumber (lua_State *L, lua_Number n) {
+  lua_lock(L);
+  setnvalue(L->top, n);
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushlstring (lua_State *L, const char *s, size_t len) {
+  lua_lock(L);
+  luaC_checkGC(L);
+  setsvalue2s(L->top, luaS_newlstr(L, s, len));
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushstring (lua_State *L, const char *s) {
+  if (s == NULL)
+    lua_pushnil(L);
+  else
+    lua_pushlstring(L, s, strlen(s));
+}
+
+
+LUA_API const char *lua_pushvfstring (lua_State *L, const char *fmt,
+                                      va_list argp) {
+  const char *ret;
+  lua_lock(L);
+  luaC_checkGC(L);
+  ret = luaO_pushvfstring(L, fmt, argp);
+  lua_unlock(L);
+  return ret;
+}
+
+
+LUA_API const char *lua_pushfstring (lua_State *L, const char *fmt, ...) {
+  const char *ret;
+  va_list argp;
+  lua_lock(L);
+  luaC_checkGC(L);
+  va_start(argp, fmt);
+  ret = luaO_pushvfstring(L, fmt, argp);
+  va_end(argp);
+  lua_unlock(L);
+  return ret;
+}
+
+
+LUA_API void lua_pushcclosure (lua_State *L, lua_CFunction fn, int n) {
+  Closure *cl;
+  lua_lock(L);
+  luaC_checkGC(L);
+  api_checknelems(L, n);
+  cl = luaF_newCclosure(L, n);
+  cl->c.f = fn;
+  L->top -= n;
+  while (n--)
+    setobj2n(&cl->c.upvalue[n], L->top+n);
+  setclvalue(L->top, cl);
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushboolean (lua_State *L, int b) {
+  lua_lock(L);
+  setbvalue(L->top, (b != 0));  /* ensure that true is 1 */
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushlightuserdata (lua_State *L, void *p) {
+  lua_lock(L);
+  setpvalue(L->top, p);
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+
+/*
+** get functions (Lua -> stack)
+*/
+
+
+LUA_API void lua_gettable (lua_State *L, int idx) {
+  StkId t;
+  lua_lock(L);
+  t = luaA_index(L, idx);
+  setobj2s(L->top - 1, luaV_gettable(L, t, L->top - 1, 0));
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_rawget (lua_State *L, int idx) {
+  StkId t;
+  lua_lock(L);
+  t = luaA_index(L, idx);
+  api_check(L, ttistable(t));
+  setobj2s(L->top - 1, luaH_get(hvalue(t), L->top - 1));
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_rawgeti (lua_State *L, int idx, int n) {
+  StkId o;
+  lua_lock(L);
+  o = luaA_index(L, idx);
+  api_check(L, ttistable(o));
+  setobj2s(L->top, luaH_getnum(hvalue(o), n));
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_newtable (lua_State *L) {
+  lua_lock(L);
+  luaC_checkGC(L);
+  sethvalue(L->top, luaH_new(L, 0, 0));
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API int lua_getmetatable (lua_State *L, int objindex) {
+  const TObject *obj;
+  Table *mt = NULL;
+  int res;
+  lua_lock(L);
+  obj = luaA_indexAcceptable(L, objindex);
+  if (obj != NULL) {
+    switch (ttype(obj)) {
+      case LUA_TTABLE:
+        mt = hvalue(obj)->metatable;
+        break;
+      case LUA_TUSERDATA:
+        mt = uvalue(obj)->uv.metatable;
+        break;
+    }
+  }
+  if (mt == NULL || mt == hvalue(defaultmeta(L)))
+    res = 0;
+  else {
+    sethvalue(L->top, mt);
+    api_incr_top(L);
+    res = 1;
+  }
+  lua_unlock(L);
+  return res;
+}
+
+
+LUA_API void lua_getfenv (lua_State *L, int idx) {
+  StkId o;
+  lua_lock(L);
+  o = luaA_index(L, idx);
+  setobj2s(L->top, isLfunction(o) ? &clvalue(o)->l.g : gt(L));
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+/*
+** set functions (stack -> Lua)
+*/
+
+
+LUA_API void lua_settable (lua_State *L, int idx) {
+  StkId t;
+  lua_lock(L);
+  api_checknelems(L, 2);
+  t = luaA_index(L, idx);
+  luaV_settable(L, t, L->top - 2, L->top - 1);
+  L->top -= 2;  /* pop index and value */
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_rawset (lua_State *L, int idx) {
+  StkId t;
+  lua_lock(L);
+  api_checknelems(L, 2);
+  t = luaA_index(L, idx);
+  api_check(L, ttistable(t));
+  setobj2t(luaH_set(L, hvalue(t), L->top-2), L->top-1);  /* write barrier */
+  L->top -= 2;
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_rawseti (lua_State *L, int idx, int n) {
+  StkId o;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  o = luaA_index(L, idx);
+  api_check(L, ttistable(o));
+  setobj2t(luaH_setnum(L, hvalue(o), n), L->top-1);  /* write barrier */
+  L->top--;
+  lua_unlock(L);
+}
+
+
+LUA_API int lua_setmetatable (lua_State *L, int objindex) {
+  TObject *obj, *mt;
+  int res = 1;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  obj = luaA_index(L, objindex);
+  mt = (!ttisnil(L->top - 1)) ? L->top - 1 : defaultmeta(L);
+  api_check(L, ttistable(mt));
+  switch (ttype(obj)) {
+    case LUA_TTABLE: {
+      hvalue(obj)->metatable = hvalue(mt);  /* write barrier */
+      break;
+    }
+    case LUA_TUSERDATA: {
+      uvalue(obj)->uv.metatable = hvalue(mt);  /* write barrier */
+      break;
+    }
+    default: {
+      res = 0;  /* cannot set */
+      break;
+    }
+  }
+  L->top--;
+  lua_unlock(L);
+  return res;
+}
+
+
+LUA_API int lua_setfenv (lua_State *L, int idx) {
+  StkId o;
+  int res = 0;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  o = luaA_index(L, idx);
+  L->top--;
+  api_check(L, ttistable(L->top));
+  if (isLfunction(o)) {
+    res = 1;
+    clvalue(o)->l.g = *(L->top);
+  }
+  lua_unlock(L);
+  return res;
+}
+
+
+/*
+** `load' and `call' functions (run Lua code)
+*/
+
+LUA_API void lua_call (lua_State *L, int nargs, int nresults) {
+  StkId func;
+  lua_lock(L);
+  api_checknelems(L, nargs+1);
+  func = L->top - (nargs+1);
+  luaD_call(L, func, nresults);
+  lua_unlock(L);
+}
+
+
+
+/*
+** Execute a protected call.
+*/
+struct CallS {  /* data to `f_call' */
+  StkId func;
+  int nresults;
+};
+
+
+static void f_call (lua_State *L, void *ud) {
+  struct CallS *c = cast(struct CallS *, ud);
+  luaD_call(L, c->func, c->nresults);
+}
+
+
+
+LUA_API int lua_pcall (lua_State *L, int nargs, int nresults, int errfunc) {
+  struct CallS c;
+  int status;
+  ptrdiff_t func;
+  lua_lock(L);
+  func = (errfunc == 0) ? 0 : savestack(L, luaA_index(L, errfunc));
+  c.func = L->top - (nargs+1);  /* function to be called */
+  c.nresults = nresults;
+  status = luaD_pcall(L, f_call, &c, savestack(L, c.func), func);
+  lua_unlock(L);
+  return status;
+}
+
+
+/*
+** Execute a protected C call.
+*/
+struct CCallS {  /* data to `f_Ccall' */
+  lua_CFunction func;
+  void *ud;
+};
+
+
+static void f_Ccall (lua_State *L, void *ud) {
+  struct CCallS *c = cast(struct CCallS *, ud);
+  Closure *cl;
+  cl = luaF_newCclosure(L, 0);
+  cl->c.f = c->func;
+  setclvalue(L->top, cl);  /* push function */
+  incr_top(L);
+  setpvalue(L->top, c->ud);  /* push only argument */
+  incr_top(L);
+  luaD_call(L, L->top - 2, 0);
+}
+
+
+LUA_API int lua_cpcall (lua_State *L, lua_CFunction func, void *ud) {
+  struct CCallS c;
+  int status;
+  lua_lock(L);
+  c.func = func;
+  c.ud = ud;
+  status = luaD_pcall(L, f_Ccall, &c, savestack(L, L->top), 0);
+  lua_unlock(L);
+  return status;
+}
+
+
+LUA_API int lua_load (lua_State *L, lua_Chunkreader reader, void *data,
+                      const char *chunkname) {
+  ZIO z;
+  int status;
+  int c;
+  lua_lock(L);
+  if (!chunkname) chunkname = "?";
+  luaZ_init(&z, reader, data, chunkname);
+  c = luaZ_lookahead(&z);
+  status = luaD_protectedparser(L, &z, (c == LUA_SIGNATURE[0]));
+  lua_unlock(L);
+  return status;
+}
+
+
+LUA_API int lua_dump (lua_State *L, lua_Chunkwriter writer, void *data) {
+  int status;
+  TObject *o;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  o = L->top - 1;
+  if (isLfunction(o) && clvalue(o)->l.nupvalues == 0) {
+    luaU_dump(L, clvalue(o)->l.p, writer, data);
+    status = 1;
+  }
+  else
+    status = 0;
+  lua_unlock(L);
+  return status;
+}
+
+
+/*
+** Garbage-collection functions
+*/
+
+/* GC values are expressed in Kbytes: #bytes/2^10 */
+#define GCscalel(x)		((x)>>10)
+#define GCscale(x)		(cast(int, GCscalel(x)))
+#define GCunscale(x)		(cast(lu_mem, x)<<10)
+
+LUA_API int lua_getgcthreshold (lua_State *L) {
+  int threshold;
+  lua_lock(L);
+  threshold = GCscale(G(L)->GCthreshold);
+  lua_unlock(L);
+  return threshold;
+}
+
+LUA_API int lua_getgccount (lua_State *L) {
+  int count;
+  lua_lock(L);
+  count = GCscale(G(L)->nblocks);
+  lua_unlock(L);
+  return count;
+}
+
+LUA_API void lua_setgcthreshold (lua_State *L, int newthreshold) {
+  lua_lock(L);
+  if (cast(lu_mem, newthreshold) > GCscalel(MAX_LUMEM))
+    G(L)->GCthreshold = MAX_LUMEM;
+  else
+    G(L)->GCthreshold = GCunscale(newthreshold);
+  luaC_checkGC(L);
+  lua_unlock(L);
+}
+
+
+/*
+** miscellaneous functions
+*/
+
+
+LUA_API const char *lua_version (void) {
+  return LUA_VERSION;
+}
+
+
+LUA_API int lua_error (lua_State *L) {
+  lua_lock(L);
+  api_checknelems(L, 1);
+  luaG_errormsg(L);
+  lua_unlock(L);
+  return 0;  /* to avoid warnings */
+}
+
+
+LUA_API int lua_next (lua_State *L, int idx) {
+  StkId t;
+  int more;
+  lua_lock(L);
+  t = luaA_index(L, idx);
+  api_check(L, ttistable(t));
+  more = luaH_next(L, hvalue(t), L->top - 1);
+  if (more) {
+    api_incr_top(L);
+  }
+  else  /* no more elements */
+    L->top -= 1;  /* remove key */
+  lua_unlock(L);
+  return more;
+}
+
+
+LUA_API void lua_concat (lua_State *L, int n) {
+  lua_lock(L);
+  luaC_checkGC(L);
+  api_checknelems(L, n);
+  if (n >= 2) {
+    luaV_concat(L, n, L->top - L->base - 1);
+    L->top -= (n-1);
+  }
+  else if (n == 0) {  /* push empty string */
+    setsvalue2s(L->top, luaS_newlstr(L, NULL, 0));
+    api_incr_top(L);
+  }
+  /* else n == 1; nothing to do */
+  lua_unlock(L);
+}
+
+
+LUA_API void *lua_newuserdata (lua_State *L, size_t size) {
+  Udata *u;
+  lua_lock(L);
+  luaC_checkGC(L);
+  u = luaS_newudata(L, size);
+  setuvalue(L->top, u);
+  api_incr_top(L);
+  lua_unlock(L);
+  return u + 1;
+}
+
+
+LUA_API int lua_pushupvalues (lua_State *L) {
+  Closure *func;
+  int n, i;
+  lua_lock(L);
+  api_check(L, iscfunction(L->base - 1));
+  func = clvalue(L->base - 1);
+  n = func->c.nupvalues;
+  luaD_checkstack(L, n + LUA_MINSTACK);
+  for (i=0; i<n; i++) {
+    setobj2s(L->top, &func->c.upvalue[i]);
+    L->top++;
+  }
+  lua_unlock(L);
+  return n;
+}
+
+
+static const char *aux_upvalue (lua_State *L, int funcindex, int n,
+                                TObject **val) {
+  Closure *f;
+  StkId fi = luaA_index(L, funcindex);
+  if (!ttisfunction(fi)) return NULL;
+  f = clvalue(fi);
+  if (f->c.isC) {
+    if (n > f->c.nupvalues) return NULL;
+    *val = &f->c.upvalue[n-1];
+    return "";
+  }
+  else {
+    Proto *p = f->l.p;
+    if (n > p->sizeupvalues) return NULL;
+    *val = f->l.upvals[n-1]->v;
+    return getstr(p->upvalues[n-1]);
+  }
+}
+
+
+LUA_API const char *lua_getupvalue (lua_State *L, int funcindex, int n) {
+  const char *name;
+  TObject *val;
+  lua_lock(L);
+  name = aux_upvalue(L, funcindex, n, &val);
+  if (name) {
+    setobj2s(L->top, val);
+    api_incr_top(L);
+  }
+  lua_unlock(L);
+  return name;
+}
+
+
+LUA_API const char *lua_setupvalue (lua_State *L, int funcindex, int n) {
+  const char *name;
+  TObject *val;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  name = aux_upvalue(L, funcindex, n, &val);
+  if (name) {
+    L->top--;
+    setobj(val, L->top);  /* write barrier */
+  }
+  lua_unlock(L);
+  return name;
+}
+
diff --git a/main/source/lua/src/lapi.h b/main/source/lua/src/lapi.h
new file mode 100644
index 00000000..c8308879
--- /dev/null
+++ b/main/source/lua/src/lapi.h
@@ -0,0 +1,16 @@
+/*
+** $Id: lapi.h,v 1.21 2002/03/04 21:29:41 roberto Exp $
+** Auxiliary functions from Lua API
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lapi_h
+#define lapi_h
+
+
+#include "lobject.h"
+
+
+void luaA_pushobject (lua_State *L, const TObject *o);
+
+#endif
diff --git a/main/source/lua/src/lcode.c b/main/source/lua/src/lcode.c
new file mode 100644
index 00000000..309f88dc
--- /dev/null
+++ b/main/source/lua/src/lcode.c
@@ -0,0 +1,714 @@
+/*
+** $Id: lcode.c,v 1.117 2003/04/03 13:35:34 roberto Exp $
+** Code generator for Lua
+** See Copyright Notice in lua.h
+*/
+
+
+#include <stdlib.h>
+
+#define lcode_c
+
+#include "lua.h"
+
+#include "lcode.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "llex.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lparser.h"
+#include "ltable.h"
+
+
+#define hasjumps(e)	((e)->t != (e)->f)
+
+
+void luaK_nil (FuncState *fs, int from, int n) {
+  Instruction *previous;
+  if (fs->pc > fs->lasttarget &&  /* no jumps to current position? */
+      GET_OPCODE(*(previous = &fs->f->code[fs->pc-1])) == OP_LOADNIL) {
+    int pfrom = GETARG_A(*previous);
+    int pto = GETARG_B(*previous);
+    if (pfrom <= from && from <= pto+1) {  /* can connect both? */
+      if (from+n-1 > pto)
+        SETARG_B(*previous, from+n-1);
+      return;
+    }
+  }
+  luaK_codeABC(fs, OP_LOADNIL, from, from+n-1, 0);  /* else no optimization */
+}
+
+
+int luaK_jump (FuncState *fs) {
+  int jpc = fs->jpc;  /* save list of jumps to here */
+  int j;
+  fs->jpc = NO_JUMP;
+  j = luaK_codeAsBx(fs, OP_JMP, 0, NO_JUMP);
+  luaK_concat(fs, &j, jpc);  /* keep them on hold */
+  return j;
+}
+
+
+static int luaK_condjump (FuncState *fs, OpCode op, int A, int B, int C) {
+  luaK_codeABC(fs, op, A, B, C);
+  return luaK_jump(fs);
+}
+
+
+static void luaK_fixjump (FuncState *fs, int pc, int dest) {
+  Instruction *jmp = &fs->f->code[pc];
+  int offset = dest-(pc+1);
+  lua_assert(dest != NO_JUMP);
+  if (abs(offset) > MAXARG_sBx)
+    luaX_syntaxerror(fs->ls, "control structure too long");
+  SETARG_sBx(*jmp, offset);
+}
+
+
+/*
+** returns current `pc' and marks it as a jump target (to avoid wrong
+** optimizations with consecutive instructions not in the same basic block).
+*/
+int luaK_getlabel (FuncState *fs) {
+  fs->lasttarget = fs->pc;
+  return fs->pc;
+}
+
+
+static int luaK_getjump (FuncState *fs, int pc) {
+  int offset = GETARG_sBx(fs->f->code[pc]);
+  if (offset == NO_JUMP)  /* point to itself represents end of list */
+    return NO_JUMP;  /* end of list */
+  else
+    return (pc+1)+offset;  /* turn offset into absolute position */
+}
+
+
+static Instruction *getjumpcontrol (FuncState *fs, int pc) {
+  Instruction *pi = &fs->f->code[pc];
+  if (pc >= 1 && testOpMode(GET_OPCODE(*(pi-1)), OpModeT))
+    return pi-1;
+  else
+    return pi;
+}
+
+
+/*
+** check whether list has any jump that do not produce a value
+** (or produce an inverted value)
+*/
+static int need_value (FuncState *fs, int list, int cond) {
+  for (; list != NO_JUMP; list = luaK_getjump(fs, list)) {
+    Instruction i = *getjumpcontrol(fs, list);
+    if (GET_OPCODE(i) != OP_TEST || GETARG_C(i) != cond) return 1;
+  }
+  return 0;  /* not found */
+}
+
+
+static void patchtestreg (Instruction *i, int reg) {
+  if (reg == NO_REG) reg = GETARG_B(*i);
+  SETARG_A(*i, reg);
+}
+
+
+static void luaK_patchlistaux (FuncState *fs, int list,
+          int ttarget, int treg, int ftarget, int freg, int dtarget) {
+  while (list != NO_JUMP) {
+    int next = luaK_getjump(fs, list);
+    Instruction *i = getjumpcontrol(fs, list);
+    if (GET_OPCODE(*i) != OP_TEST) {
+      lua_assert(dtarget != NO_JUMP);
+      luaK_fixjump(fs, list, dtarget);  /* jump to default target */
+    }
+    else {
+      if (GETARG_C(*i)) {
+        lua_assert(ttarget != NO_JUMP);
+        patchtestreg(i, treg);
+        luaK_fixjump(fs, list, ttarget);
+      }
+      else {
+        lua_assert(ftarget != NO_JUMP);
+        patchtestreg(i, freg);
+        luaK_fixjump(fs, list, ftarget);
+      }
+    }
+    list = next;
+  }
+}
+
+
+static void luaK_dischargejpc (FuncState *fs) {
+  luaK_patchlistaux(fs, fs->jpc, fs->pc, NO_REG, fs->pc, NO_REG, fs->pc);
+  fs->jpc = NO_JUMP;
+}
+
+
+void luaK_patchlist (FuncState *fs, int list, int target) {
+  if (target == fs->pc)
+    luaK_patchtohere(fs, list);
+  else {
+    lua_assert(target < fs->pc);
+    luaK_patchlistaux(fs, list, target, NO_REG, target, NO_REG, target);
+  }
+}
+
+
+void luaK_patchtohere (FuncState *fs, int list) {
+  luaK_getlabel(fs);
+  luaK_concat(fs, &fs->jpc, list);
+}
+
+
+void luaK_concat (FuncState *fs, int *l1, int l2) {
+  if (l2 == NO_JUMP) return;
+  else if (*l1 == NO_JUMP)
+    *l1 = l2;
+  else {
+    int list = *l1;
+    int next;
+    while ((next = luaK_getjump(fs, list)) != NO_JUMP)  /* find last element */
+      list = next;
+    luaK_fixjump(fs, list, l2);
+  }
+}
+
+
+void luaK_checkstack (FuncState *fs, int n) {
+  int newstack = fs->freereg + n;
+  if (newstack > fs->f->maxstacksize) {
+    if (newstack >= MAXSTACK)
+      luaX_syntaxerror(fs->ls, "function or expression too complex");
+    fs->f->maxstacksize = cast(lu_byte, newstack);
+  }
+}
+
+
+void luaK_reserveregs (FuncState *fs, int n) {
+  luaK_checkstack(fs, n);
+  fs->freereg += n;
+}
+
+
+static void freereg (FuncState *fs, int reg) {
+  if (reg >= fs->nactvar && reg < MAXSTACK) {
+    fs->freereg--;
+    lua_assert(reg == fs->freereg);
+  }
+}
+
+
+static void freeexp (FuncState *fs, expdesc *e) {
+  if (e->k == VNONRELOC)
+    freereg(fs, e->info);
+}
+
+
+static int addk (FuncState *fs, TObject *k, TObject *v) {
+  const TObject *idx = luaH_get(fs->h, k);
+  if (ttisnumber(idx)) {
+    lua_assert(luaO_rawequalObj(&fs->f->k[cast(int, nvalue(idx))], v));
+    return cast(int, nvalue(idx));
+  }
+  else {  /* constant not found; create a new entry */
+    Proto *f = fs->f;
+    luaM_growvector(fs->L, f->k, fs->nk, f->sizek, TObject,
+                    MAXARG_Bx, "constant table overflow");
+    setobj2n(&f->k[fs->nk], v);
+    setnvalue(luaH_set(fs->L, fs->h, k), cast(lua_Number, fs->nk));
+    return fs->nk++;
+  }
+}
+
+
+int luaK_stringK (FuncState *fs, TString *s) {
+  TObject o;
+  setsvalue(&o, s);
+  return addk(fs, &o, &o);
+}
+
+
+int luaK_numberK (FuncState *fs, lua_Number r) {
+  TObject o;
+  setnvalue(&o, r);
+  return addk(fs, &o, &o);
+}
+
+
+static int nil_constant (FuncState *fs) {
+  TObject k, v;
+  setnilvalue(&v);
+  sethvalue(&k, fs->h);  /* cannot use nil as key; instead use table itself */
+  return addk(fs, &k, &v);
+}
+
+
+void luaK_setcallreturns (FuncState *fs, expdesc *e, int nresults) {
+  if (e->k == VCALL) {  /* expression is an open function call? */
+    SETARG_C(getcode(fs, e), nresults+1);
+    if (nresults == 1) {  /* `regular' expression? */
+      e->k = VNONRELOC;
+      e->info = GETARG_A(getcode(fs, e));
+    }
+  }
+}
+
+
+void luaK_dischargevars (FuncState *fs, expdesc *e) {
+  switch (e->k) {
+    case VLOCAL: {
+      e->k = VNONRELOC;
+      break;
+    }
+    case VUPVAL: {
+      e->info = luaK_codeABC(fs, OP_GETUPVAL, 0, e->info, 0);
+      e->k = VRELOCABLE;
+      break;
+    }
+    case VGLOBAL: {
+      e->info = luaK_codeABx(fs, OP_GETGLOBAL, 0, e->info);
+      e->k = VRELOCABLE;
+      break;
+    }
+    case VINDEXED: {
+      freereg(fs, e->aux);
+      freereg(fs, e->info);
+      e->info = luaK_codeABC(fs, OP_GETTABLE, 0, e->info, e->aux);
+      e->k = VRELOCABLE;
+      break;
+    }
+    case VCALL: {
+      luaK_setcallreturns(fs, e, 1);
+      break;
+    }
+    default: break;  /* there is one value available (somewhere) */
+  }
+}
+
+
+static int code_label (FuncState *fs, int A, int b, int jump) {
+  luaK_getlabel(fs);  /* those instructions may be jump targets */
+  return luaK_codeABC(fs, OP_LOADBOOL, A, b, jump);
+}
+
+
+static void discharge2reg (FuncState *fs, expdesc *e, int reg) {
+  luaK_dischargevars(fs, e);
+  switch (e->k) {
+    case VNIL: {
+      luaK_nil(fs, reg, 1);
+      break;
+    }
+    case VFALSE:  case VTRUE: {
+      luaK_codeABC(fs, OP_LOADBOOL, reg, e->k == VTRUE, 0);
+      break;
+    }
+    case VK: {
+      luaK_codeABx(fs, OP_LOADK, reg, e->info);
+      break;
+    }
+    case VRELOCABLE: {
+      Instruction *pc = &getcode(fs, e);
+      SETARG_A(*pc, reg);
+      break;
+    }
+    case VNONRELOC: {
+      if (reg != e->info)
+        luaK_codeABC(fs, OP_MOVE, reg, e->info, 0);
+      break;
+    }
+    default: {
+      lua_assert(e->k == VVOID || e->k == VJMP);
+      return;  /* nothing to do... */
+    }
+  }
+  e->info = reg;
+  e->k = VNONRELOC;
+}
+
+
+static void discharge2anyreg (FuncState *fs, expdesc *e) {
+  if (e->k != VNONRELOC) {
+    luaK_reserveregs(fs, 1);
+    discharge2reg(fs, e, fs->freereg-1);
+  }
+}
+
+
+static void luaK_exp2reg (FuncState *fs, expdesc *e, int reg) {
+  discharge2reg(fs, e, reg);
+  if (e->k == VJMP)
+    luaK_concat(fs, &e->t, e->info);  /* put this jump in `t' list */
+  if (hasjumps(e)) {
+    int final;  /* position after whole expression */
+    int p_f = NO_JUMP;  /* position of an eventual LOAD false */
+    int p_t = NO_JUMP;  /* position of an eventual LOAD true */
+    if (need_value(fs, e->t, 1) || need_value(fs, e->f, 0)) {
+      int fj = NO_JUMP;  /* first jump (over LOAD ops.) */
+      if (e->k != VJMP)
+        fj = luaK_jump(fs);
+      p_f = code_label(fs, reg, 0, 1);
+      p_t = code_label(fs, reg, 1, 0);
+      luaK_patchtohere(fs, fj);
+    }
+    final = luaK_getlabel(fs);
+    luaK_patchlistaux(fs, e->f, p_f, NO_REG, final, reg, p_f);
+    luaK_patchlistaux(fs, e->t, final, reg, p_t, NO_REG, p_t);
+  }
+  e->f = e->t = NO_JUMP;
+  e->info = reg;
+  e->k = VNONRELOC;
+}
+
+
+void luaK_exp2nextreg (FuncState *fs, expdesc *e) {
+  luaK_dischargevars(fs, e);
+  freeexp(fs, e);
+  luaK_reserveregs(fs, 1);
+  luaK_exp2reg(fs, e, fs->freereg - 1);
+}
+
+
+int luaK_exp2anyreg (FuncState *fs, expdesc *e) {
+  luaK_dischargevars(fs, e);
+  if (e->k == VNONRELOC) {
+    if (!hasjumps(e)) return e->info;  /* exp is already in a register */ 
+    if (e->info >= fs->nactvar) {  /* reg. is not a local? */
+      luaK_exp2reg(fs, e, e->info);  /* put value on it */
+      return e->info;
+    }
+  }
+  luaK_exp2nextreg(fs, e);  /* default */
+  return e->info;
+}
+
+
+void luaK_exp2val (FuncState *fs, expdesc *e) {
+  if (hasjumps(e))
+    luaK_exp2anyreg(fs, e);
+  else
+    luaK_dischargevars(fs, e);
+}
+
+
+int luaK_exp2RK (FuncState *fs, expdesc *e) {
+  luaK_exp2val(fs, e);
+  switch (e->k) {
+    case VNIL: {
+      if (fs->nk + MAXSTACK <= MAXARG_C) {  /* constant fit in argC? */
+        e->info = nil_constant(fs);
+        e->k = VK;
+        return e->info + MAXSTACK;
+      }
+      else break;
+    }
+    case VK: {
+      if (e->info + MAXSTACK <= MAXARG_C)  /* constant fit in argC? */
+        return e->info + MAXSTACK;
+      else break;
+    }
+    default: break;
+  }
+  /* not a constant in the right range: put it in a register */
+  return luaK_exp2anyreg(fs, e);
+}
+
+
+void luaK_storevar (FuncState *fs, expdesc *var, expdesc *exp) {
+  switch (var->k) {
+    case VLOCAL: {
+      freeexp(fs, exp);
+      luaK_exp2reg(fs, exp, var->info);
+      return;
+    }
+    case VUPVAL: {
+      int e = luaK_exp2anyreg(fs, exp);
+      luaK_codeABC(fs, OP_SETUPVAL, e, var->info, 0);
+      break;
+    }
+    case VGLOBAL: {
+      int e = luaK_exp2anyreg(fs, exp);
+      luaK_codeABx(fs, OP_SETGLOBAL, e, var->info);
+      break;
+    }
+    case VINDEXED: {
+      int e = luaK_exp2RK(fs, exp);
+      luaK_codeABC(fs, OP_SETTABLE, var->info, var->aux, e);
+      break;
+    }
+    default: {
+      lua_assert(0);  /* invalid var kind to store */
+      break;
+    }
+  }
+  freeexp(fs, exp);
+}
+
+
+void luaK_self (FuncState *fs, expdesc *e, expdesc *key) {
+  int func;
+  luaK_exp2anyreg(fs, e);
+  freeexp(fs, e);
+  func = fs->freereg;
+  luaK_reserveregs(fs, 2);
+  luaK_codeABC(fs, OP_SELF, func, e->info, luaK_exp2RK(fs, key));
+  freeexp(fs, key);
+  e->info = func;
+  e->k = VNONRELOC;
+}
+
+
+static void invertjump (FuncState *fs, expdesc *e) {
+  Instruction *pc = getjumpcontrol(fs, e->info);
+  lua_assert(testOpMode(GET_OPCODE(*pc), OpModeT) &&
+             GET_OPCODE(*pc) != OP_TEST);
+  SETARG_A(*pc, !(GETARG_A(*pc)));
+}
+
+
+static int jumponcond (FuncState *fs, expdesc *e, int cond) {
+  if (e->k == VRELOCABLE) {
+    Instruction ie = getcode(fs, e);
+    if (GET_OPCODE(ie) == OP_NOT) {
+      fs->pc--;  /* remove previous OP_NOT */
+      return luaK_condjump(fs, OP_TEST, NO_REG, GETARG_B(ie), !cond);
+    }
+    /* else go through */
+  }
+  discharge2anyreg(fs, e);
+  freeexp(fs, e);
+  return luaK_condjump(fs, OP_TEST, NO_REG, e->info, cond);
+}
+
+
+void luaK_goiftrue (FuncState *fs, expdesc *e) {
+  int pc;  /* pc of last jump */
+  luaK_dischargevars(fs, e);
+  switch (e->k) {
+    case VK: case VTRUE: {
+      pc = NO_JUMP;  /* always true; do nothing */
+      break;
+    }
+    case VFALSE: {
+      pc = luaK_jump(fs);  /* always jump */
+      break;
+    }
+    case VJMP: {
+      invertjump(fs, e);
+      pc = e->info;
+      break;
+    }
+    default: {
+      pc = jumponcond(fs, e, 0);
+      break;
+    }
+  }
+  luaK_concat(fs, &e->f, pc);  /* insert last jump in `f' list */
+}
+
+
+void luaK_goiffalse (FuncState *fs, expdesc *e) {
+  int pc;  /* pc of last jump */
+  luaK_dischargevars(fs, e);
+  switch (e->k) {
+    case VNIL: case VFALSE: {
+      pc = NO_JUMP;  /* always false; do nothing */
+      break;
+    }
+    case VTRUE: {
+      pc = luaK_jump(fs);  /* always jump */
+      break;
+    }
+    case VJMP: {
+      pc = e->info;
+      break;
+    }
+    default: {
+      pc = jumponcond(fs, e, 1);
+      break;
+    }
+  }
+  luaK_concat(fs, &e->t, pc);  /* insert last jump in `t' list */
+}
+
+
+static void codenot (FuncState *fs, expdesc *e) {
+  luaK_dischargevars(fs, e);
+  switch (e->k) {
+    case VNIL: case VFALSE: {
+      e->k = VTRUE;
+      break;
+    }
+    case VK: case VTRUE: {
+      e->k = VFALSE;
+      break;
+    }
+    case VJMP: {
+      invertjump(fs, e);
+      break;
+    }
+    case VRELOCABLE:
+    case VNONRELOC: {
+      discharge2anyreg(fs, e);
+      freeexp(fs, e);
+      e->info = luaK_codeABC(fs, OP_NOT, 0, e->info, 0);
+      e->k = VRELOCABLE;
+      break;
+    }
+    default: {
+      lua_assert(0);  /* cannot happen */
+      break;
+    }
+  }
+  /* interchange true and false lists */
+  { int temp = e->f; e->f = e->t; e->t = temp; }
+}
+
+
+void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k) {
+  t->aux = luaK_exp2RK(fs, k);
+  t->k = VINDEXED;
+}
+
+
+void luaK_prefix (FuncState *fs, UnOpr op, expdesc *e) {
+  if (op == OPR_MINUS) {
+    luaK_exp2val(fs, e);
+    if (e->k == VK && ttisnumber(&fs->f->k[e->info]))
+      e->info = luaK_numberK(fs, -nvalue(&fs->f->k[e->info]));
+    else {
+      luaK_exp2anyreg(fs, e);
+      freeexp(fs, e);
+      e->info = luaK_codeABC(fs, OP_UNM, 0, e->info, 0);
+      e->k = VRELOCABLE;
+    }
+  }
+  else  /* op == NOT */
+    codenot(fs, e);
+}
+
+
+void luaK_infix (FuncState *fs, BinOpr op, expdesc *v) {
+  switch (op) {
+    case OPR_AND: {
+      luaK_goiftrue(fs, v);
+      luaK_patchtohere(fs, v->t);
+      v->t = NO_JUMP;
+      break;
+    }
+    case OPR_OR: {
+      luaK_goiffalse(fs, v);
+      luaK_patchtohere(fs, v->f);
+      v->f = NO_JUMP;
+      break;
+    }
+    case OPR_CONCAT: {
+      luaK_exp2nextreg(fs, v);  /* operand must be on the `stack' */
+      break;
+    }
+    default: {
+      luaK_exp2RK(fs, v);
+      break;
+    }
+  }
+}
+
+
+static void codebinop (FuncState *fs, expdesc *res, BinOpr op,
+                       int o1, int o2) {
+  if (op <= OPR_POW) {  /* arithmetic operator? */
+    OpCode opc = cast(OpCode, (op - OPR_ADD) + OP_ADD);  /* ORDER OP */
+    res->info = luaK_codeABC(fs, opc, 0, o1, o2);
+    res->k = VRELOCABLE;
+  }
+  else {  /* test operator */
+    static const OpCode ops[] = {OP_EQ, OP_EQ, OP_LT, OP_LE, OP_LT, OP_LE};
+    int cond = 1;
+    if (op >= OPR_GT) {  /* `>' or `>='? */
+      int temp;  /* exchange args and replace by `<' or `<=' */
+      temp = o1; o1 = o2; o2 = temp;  /* o1 <==> o2 */
+    }
+    else if (op == OPR_NE) cond = 0;
+    res->info = luaK_condjump(fs, ops[op - OPR_NE], cond, o1, o2);
+    res->k = VJMP;
+  }
+}
+
+
+void luaK_posfix (FuncState *fs, BinOpr op, expdesc *e1, expdesc *e2) {
+  switch (op) {
+    case OPR_AND: {
+      lua_assert(e1->t == NO_JUMP);  /* list must be closed */
+      luaK_dischargevars(fs, e2);
+      luaK_concat(fs, &e1->f, e2->f);
+      e1->k = e2->k; e1->info = e2->info; e1->aux = e2->aux; e1->t = e2->t;
+      break;
+    }
+    case OPR_OR: {
+      lua_assert(e1->f == NO_JUMP);  /* list must be closed */
+      luaK_dischargevars(fs, e2);
+      luaK_concat(fs, &e1->t, e2->t);
+      e1->k = e2->k; e1->info = e2->info; e1->aux = e2->aux; e1->f = e2->f;
+      break;
+    }
+    case OPR_CONCAT: {
+      luaK_exp2val(fs, e2);
+      if (e2->k == VRELOCABLE && GET_OPCODE(getcode(fs, e2)) == OP_CONCAT) {
+        lua_assert(e1->info == GETARG_B(getcode(fs, e2))-1);
+        freeexp(fs, e1);
+        SETARG_B(getcode(fs, e2), e1->info);
+        e1->k = e2->k; e1->info = e2->info;
+      }
+      else {
+        luaK_exp2nextreg(fs, e2);
+        freeexp(fs, e2);
+        freeexp(fs, e1);
+        e1->info = luaK_codeABC(fs, OP_CONCAT, 0, e1->info, e2->info);
+        e1->k = VRELOCABLE;
+      }
+      break;
+    }
+    default: {
+      int o1 = luaK_exp2RK(fs, e1);
+      int o2 = luaK_exp2RK(fs, e2);
+      freeexp(fs, e2);
+      freeexp(fs, e1);
+      codebinop(fs, e1, op, o1, o2);
+    }
+  }
+}
+
+
+void luaK_fixline (FuncState *fs, int line) {
+  fs->f->lineinfo[fs->pc - 1] = line;
+}
+
+
+int luaK_code (FuncState *fs, Instruction i, int line) {
+  Proto *f = fs->f;
+  luaK_dischargejpc(fs);  /* `pc' will change */
+  /* put new instruction in code array */
+  luaM_growvector(fs->L, f->code, fs->pc, f->sizecode, Instruction,
+                  MAX_INT, "code size overflow");
+  f->code[fs->pc] = i;
+  /* save corresponding line information */
+  luaM_growvector(fs->L, f->lineinfo, fs->pc, f->sizelineinfo, int,
+                  MAX_INT, "code size overflow");
+  f->lineinfo[fs->pc] = line;
+  return fs->pc++;
+}
+
+
+int luaK_codeABC (FuncState *fs, OpCode o, int a, int b, int c) {
+  lua_assert(getOpMode(o) == iABC);
+  return luaK_code(fs, CREATE_ABC(o, a, b, c), fs->ls->lastline);
+}
+
+
+int luaK_codeABx (FuncState *fs, OpCode o, int a, unsigned int bc) {
+  lua_assert(getOpMode(o) == iABx || getOpMode(o) == iAsBx);
+  return luaK_code(fs, CREATE_ABx(o, a, bc), fs->ls->lastline);
+}
+
diff --git a/main/source/lua/src/lcode.h b/main/source/lua/src/lcode.h
new file mode 100644
index 00000000..2d797bcc
--- /dev/null
+++ b/main/source/lua/src/lcode.h
@@ -0,0 +1,74 @@
+/*
+** $Id: lcode.h,v 1.38 2002/12/11 12:34:22 roberto Exp $
+** Code generator for Lua
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lcode_h
+#define lcode_h
+
+#include "llex.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lparser.h"
+
+
+/*
+** Marks the end of a patch list. It is an invalid value both as an absolute
+** address, and as a list link (would link an element to itself).
+*/
+#define NO_JUMP (-1)
+
+
+/*
+** grep "ORDER OPR" if you change these enums
+*/
+typedef enum BinOpr {
+  OPR_ADD, OPR_SUB, OPR_MULT, OPR_DIV, OPR_POW,
+  OPR_CONCAT,
+  OPR_NE, OPR_EQ,
+  OPR_LT, OPR_LE, OPR_GT, OPR_GE,
+  OPR_AND, OPR_OR,
+  OPR_NOBINOPR
+} BinOpr;
+
+#define binopistest(op)	((op) >= OPR_NE)
+
+typedef enum UnOpr { OPR_MINUS, OPR_NOT, OPR_NOUNOPR } UnOpr;
+
+
+#define getcode(fs,e)	((fs)->f->code[(e)->info])
+
+#define luaK_codeAsBx(fs,o,A,sBx)	luaK_codeABx(fs,o,A,(sBx)+MAXARG_sBx)
+
+int luaK_code (FuncState *fs, Instruction i, int line);
+int luaK_codeABx (FuncState *fs, OpCode o, int A, unsigned int Bx);
+int luaK_codeABC (FuncState *fs, OpCode o, int A, int B, int C);
+void luaK_fixline (FuncState *fs, int line);
+void luaK_nil (FuncState *fs, int from, int n);
+void luaK_reserveregs (FuncState *fs, int n);
+void luaK_checkstack (FuncState *fs, int n);
+int luaK_stringK (FuncState *fs, TString *s);
+int luaK_numberK (FuncState *fs, lua_Number r);
+void luaK_dischargevars (FuncState *fs, expdesc *e);
+int luaK_exp2anyreg (FuncState *fs, expdesc *e);
+void luaK_exp2nextreg (FuncState *fs, expdesc *e);
+void luaK_exp2val (FuncState *fs, expdesc *e);
+int luaK_exp2RK (FuncState *fs, expdesc *e);
+void luaK_self (FuncState *fs, expdesc *e, expdesc *key);
+void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k);
+void luaK_goiftrue (FuncState *fs, expdesc *e);
+void luaK_goiffalse (FuncState *fs, expdesc *e);
+void luaK_storevar (FuncState *fs, expdesc *var, expdesc *e);
+void luaK_setcallreturns (FuncState *fs, expdesc *var, int nresults);
+int luaK_jump (FuncState *fs);
+void luaK_patchlist (FuncState *fs, int list, int target);
+void luaK_patchtohere (FuncState *fs, int list);
+void luaK_concat (FuncState *fs, int *l1, int l2);
+int luaK_getlabel (FuncState *fs);
+void luaK_prefix (FuncState *fs, UnOpr op, expdesc *v);
+void luaK_infix (FuncState *fs, BinOpr op, expdesc *v);
+void luaK_posfix (FuncState *fs, BinOpr op, expdesc *v1, expdesc *v2);
+
+
+#endif
diff --git a/main/source/lua/src/ldebug.c b/main/source/lua/src/ldebug.c
new file mode 100644
index 00000000..39dc415d
--- /dev/null
+++ b/main/source/lua/src/ldebug.c
@@ -0,0 +1,585 @@
+/*
+** $Id: ldebug.c,v 1.150 2003/03/19 21:24:04 roberto Exp $
+** Debug Interface
+** See Copyright Notice in lua.h
+*/
+
+
+#include <stdlib.h>
+#include <string.h>
+
+#define ldebug_c
+
+#include "lua.h"
+
+#include "lapi.h"
+#include "lcode.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+#include "lvm.h"
+
+
+
+static const char *getfuncname (CallInfo *ci, const char **name);
+
+
+#define isLua(ci)	(!((ci)->state & CI_C))
+
+
+static int currentpc (CallInfo *ci) {
+  if (!isLua(ci)) return -1;  /* function is not a Lua function? */
+  if (ci->state & CI_HASFRAME)  /* function has a frame? */
+    ci->u.l.savedpc = *ci->u.l.pc;  /* use `pc' from there */
+  /* function's pc is saved */
+  return pcRel(ci->u.l.savedpc, ci_func(ci)->l.p);
+}
+
+
+static int currentline (CallInfo *ci) {
+  int pc = currentpc(ci);
+  if (pc < 0)
+    return -1;  /* only active lua functions have current-line information */
+  else
+    return getline(ci_func(ci)->l.p, pc);
+}
+
+
+void luaG_inithooks (lua_State *L) {
+  CallInfo *ci;
+  for (ci = L->ci; ci != L->base_ci; ci--)  /* update all `savedpc's */
+    currentpc(ci);
+  L->hookinit = 1;
+}
+
+
+/*
+** this function can be called asynchronous (e.g. during a signal)
+*/
+LUA_API int lua_sethook (lua_State *L, lua_Hook func, int mask, int count) {
+  if (func == NULL || mask == 0) {  /* turn off hooks? */
+    mask = 0;
+    func = NULL;
+  }
+  L->hook = func;
+  L->basehookcount = count;
+  resethookcount(L);
+  L->hookmask = cast(lu_byte, mask);
+  L->hookinit = 0;
+  return 1;
+}
+
+
+LUA_API lua_Hook lua_gethook (lua_State *L) {
+  return L->hook;
+}
+
+
+LUA_API int lua_gethookmask (lua_State *L) {
+  return L->hookmask;
+}
+
+
+LUA_API int lua_gethookcount (lua_State *L) {
+  return L->basehookcount;
+}
+
+
+LUA_API int lua_getstack (lua_State *L, int level, lua_Debug *ar) {
+  int status;
+  CallInfo *ci;
+  lua_lock(L);
+  for (ci = L->ci; level > 0 && ci > L->base_ci; ci--) {
+    level--;
+    if (!(ci->state & CI_C))  /* Lua function? */
+      level -= ci->u.l.tailcalls;  /* skip lost tail calls */
+  }
+  if (level > 0 || ci == L->base_ci) status = 0;  /* there is no such level */
+  else if (level < 0) {  /* level is of a lost tail call */
+    status = 1;
+    ar->i_ci = 0;
+  }
+  else {
+    status = 1;
+    ar->i_ci = ci - L->base_ci;
+  }
+  lua_unlock(L);
+  return status;
+}
+
+
+static Proto *getluaproto (CallInfo *ci) {
+  return (isLua(ci) ? ci_func(ci)->l.p : NULL);
+}
+
+
+LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n) {
+  const char *name;
+  CallInfo *ci;
+  Proto *fp;
+  lua_lock(L);
+  name = NULL;
+  ci = L->base_ci + ar->i_ci;
+  fp = getluaproto(ci);
+  if (fp) {  /* is a Lua function? */
+    name = luaF_getlocalname(fp, n, currentpc(ci));
+    if (name)
+      luaA_pushobject(L, ci->base+(n-1));  /* push value */
+  }
+  lua_unlock(L);
+  return name;
+}
+
+
+LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n) {
+  const char *name;
+  CallInfo *ci;
+  Proto *fp;
+  lua_lock(L);
+  name = NULL;
+  ci = L->base_ci + ar->i_ci;
+  fp = getluaproto(ci);
+  L->top--;  /* pop new value */
+  if (fp) {  /* is a Lua function? */
+    name = luaF_getlocalname(fp, n, currentpc(ci));
+    if (!name || name[0] == '(')  /* `(' starts private locals */
+      name = NULL;
+    else
+      setobjs2s(ci->base+(n-1), L->top);
+  }
+  lua_unlock(L);
+  return name;
+}
+
+
+static void funcinfo (lua_Debug *ar, StkId func) {
+  Closure *cl = clvalue(func);
+  if (cl->c.isC) {
+    ar->source = "=[C]";
+    ar->linedefined = -1;
+    ar->what = "C";
+  }
+  else {
+    ar->source = getstr(cl->l.p->source);
+    ar->linedefined = cl->l.p->lineDefined;
+    ar->what = (ar->linedefined == 0) ? "main" : "Lua";
+  }
+  luaO_chunkid(ar->short_src, ar->source, LUA_IDSIZE);
+}
+
+
+static const char *travglobals (lua_State *L, const TObject *o) {
+  Table *g = hvalue(gt(L));
+  int i = sizenode(g);
+  while (i--) {
+    Node *n = gnode(g, i);
+    if (luaO_rawequalObj(o, gval(n)) && ttisstring(gkey(n)))
+      return getstr(tsvalue(gkey(n)));
+  }
+  return NULL;
+}
+
+
+static void info_tailcall (lua_State *L, lua_Debug *ar) {
+  ar->name = ar->namewhat = "";
+  ar->what = "tail";
+  ar->linedefined = ar->currentline = -1;
+  ar->source = "=(tail call)";
+  luaO_chunkid(ar->short_src, ar->source, LUA_IDSIZE);
+  ar->nups = 0;
+  setnilvalue(L->top);
+}
+
+
+static int auxgetinfo (lua_State *L, const char *what, lua_Debug *ar,
+                    StkId f, CallInfo *ci) {
+  int status = 1;
+  for (; *what; what++) {
+    switch (*what) {
+      case 'S': {
+        funcinfo(ar, f);
+        break;
+      }
+      case 'l': {
+        ar->currentline = (ci) ? currentline(ci) : -1;
+        break;
+      }
+      case 'u': {
+        ar->nups = clvalue(f)->c.nupvalues;
+        break;
+      }
+      case 'n': {
+        ar->namewhat = (ci) ? getfuncname(ci, &ar->name) : NULL;
+        if (ar->namewhat == NULL) {
+          /* try to find a global name */
+          if ((ar->name = travglobals(L, f)) != NULL)
+            ar->namewhat = "global";
+          else ar->namewhat = "";  /* not found */
+        }
+        break;
+      }
+      case 'f': {
+        setobj2s(L->top, f);
+        break;
+      }
+      default: status = 0;  /* invalid option */
+    }
+  }
+  return status;
+}
+
+
+LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar) {
+  int status = 1;
+  lua_lock(L);
+  if (*what == '>') {
+    StkId f = L->top - 1;
+    if (!ttisfunction(f))
+      luaG_runerror(L, "value for `lua_getinfo' is not a function");
+    status = auxgetinfo(L, what + 1, ar, f, NULL);
+    L->top--;  /* pop function */
+  }
+  else if (ar->i_ci != 0) {  /* no tail call? */
+    CallInfo *ci = L->base_ci + ar->i_ci;
+    lua_assert(ttisfunction(ci->base - 1));
+    status = auxgetinfo(L, what, ar, ci->base - 1, ci);
+  }
+  else
+    info_tailcall(L, ar);
+  if (strchr(what, 'f')) incr_top(L);
+  lua_unlock(L);
+  return status;
+}
+
+
+/*
+** {======================================================
+** Symbolic Execution and code checker
+** =======================================================
+*/
+
+#define check(x)		if (!(x)) return 0;
+
+#define checkjump(pt,pc)	check(0 <= pc && pc < pt->sizecode)
+
+#define checkreg(pt,reg)	check((reg) < (pt)->maxstacksize)
+
+
+
+static int precheck (const Proto *pt) {
+  check(pt->maxstacksize <= MAXSTACK);
+  check(pt->sizelineinfo == pt->sizecode || pt->sizelineinfo == 0);
+  lua_assert(pt->numparams+pt->is_vararg <= pt->maxstacksize);
+  check(GET_OPCODE(pt->code[pt->sizecode-1]) == OP_RETURN);
+  return 1;
+}
+
+
+static int checkopenop (const Proto *pt, int pc) {
+  Instruction i = pt->code[pc+1];
+  switch (GET_OPCODE(i)) {
+    case OP_CALL:
+    case OP_TAILCALL:
+    case OP_RETURN: {
+      check(GETARG_B(i) == 0);
+      return 1;
+    }
+    case OP_SETLISTO: return 1;
+    default: return 0;  /* invalid instruction after an open call */
+  }
+}
+
+
+static int checkRK (const Proto *pt, int r) {
+  return (r < pt->maxstacksize || (r >= MAXSTACK && r-MAXSTACK < pt->sizek));
+}
+
+
+static Instruction luaG_symbexec (const Proto *pt, int lastpc, int reg) {
+  int pc;
+  int last;  /* stores position of last instruction that changed `reg' */
+  last = pt->sizecode-1;  /* points to final return (a `neutral' instruction) */
+  check(precheck(pt));
+  for (pc = 0; pc < lastpc; pc++) {
+    const Instruction i = pt->code[pc];
+    OpCode op = GET_OPCODE(i);
+    int a = GETARG_A(i);
+    int b = 0;
+    int c = 0;
+    checkreg(pt, a);
+    switch (getOpMode(op)) {
+      case iABC: {
+        b = GETARG_B(i);
+        c = GETARG_C(i);
+        if (testOpMode(op, OpModeBreg)) {
+          checkreg(pt, b);
+        }
+        else if (testOpMode(op, OpModeBrk))
+          check(checkRK(pt, b));
+        if (testOpMode(op, OpModeCrk))
+          check(checkRK(pt, c));
+        break;
+      }
+      case iABx: {
+        b = GETARG_Bx(i);
+        if (testOpMode(op, OpModeK)) check(b < pt->sizek);
+        break;
+      }
+      case iAsBx: {
+        b = GETARG_sBx(i);
+        break;
+      }
+    }
+    if (testOpMode(op, OpModesetA)) {
+      if (a == reg) last = pc;  /* change register `a' */
+    }
+    if (testOpMode(op, OpModeT)) {
+      check(pc+2 < pt->sizecode);  /* check skip */
+      check(GET_OPCODE(pt->code[pc+1]) == OP_JMP);
+    }
+    switch (op) {
+      case OP_LOADBOOL: {
+        check(c == 0 || pc+2 < pt->sizecode);  /* check its jump */
+        break;
+      }
+      case OP_LOADNIL: {
+        if (a <= reg && reg <= b)
+          last = pc;  /* set registers from `a' to `b' */
+        break;
+      }
+      case OP_GETUPVAL:
+      case OP_SETUPVAL: {
+        check(b < pt->nups);
+        break;
+      }
+      case OP_GETGLOBAL:
+      case OP_SETGLOBAL: {
+        check(ttisstring(&pt->k[b]));
+        break;
+      }
+      case OP_SELF: {
+        checkreg(pt, a+1);
+        if (reg == a+1) last = pc;
+        break;
+      }
+      case OP_CONCAT: {
+        /* `c' is a register, and at least two operands */
+        check(c < MAXSTACK && b < c);
+        break;
+      }
+      case OP_TFORLOOP:
+        checkreg(pt, a+c+5);
+        if (reg >= a) last = pc;  /* affect all registers above base */
+        /* go through */
+      case OP_FORLOOP:
+        checkreg(pt, a+2);
+        /* go through */
+      case OP_JMP: {
+        int dest = pc+1+b;
+	check(0 <= dest && dest < pt->sizecode);
+        /* not full check and jump is forward and do not skip `lastpc'? */
+        if (reg != NO_REG && pc < dest && dest <= lastpc)
+          pc += b;  /* do the jump */
+        break;
+      }
+      case OP_CALL:
+      case OP_TAILCALL: {
+        if (b != 0) {
+          checkreg(pt, a+b-1);
+        }
+        c--;  /* c = num. returns */
+        if (c == LUA_MULTRET) {
+          check(checkopenop(pt, pc));
+        }
+        else if (c != 0)
+          checkreg(pt, a+c-1);
+        if (reg >= a) last = pc;  /* affect all registers above base */
+        break;
+      }
+      case OP_RETURN: {
+        b--;  /* b = num. returns */
+        if (b > 0) checkreg(pt, a+b-1);
+        break;
+      }
+      case OP_SETLIST: {
+        checkreg(pt, a + (b&(LFIELDS_PER_FLUSH-1)) + 1);
+        break;
+      }
+      case OP_CLOSURE: {
+        int nup;
+        check(b < pt->sizep);
+        nup = pt->p[b]->nups;
+        check(pc + nup < pt->sizecode);
+        for (; nup>0; nup--) {
+          OpCode op1 = GET_OPCODE(pt->code[pc+nup]);
+          check(op1 == OP_GETUPVAL || op1 == OP_MOVE);
+        }
+        break;
+      }
+      default: break;
+    }
+  }
+  return pt->code[last];
+}
+
+#undef check
+#undef checkjump
+#undef checkreg
+
+/* }====================================================== */
+
+
+int luaG_checkcode (const Proto *pt) {
+  return luaG_symbexec(pt, pt->sizecode, NO_REG);
+}
+
+
+static const char *kname (Proto *p, int c) {
+  c = c - MAXSTACK;
+  if (c >= 0 && ttisstring(&p->k[c]))
+    return svalue(&p->k[c]);
+  else
+    return "?";
+}
+
+
+static const char *getobjname (CallInfo *ci, int stackpos, const char **name) {
+  if (isLua(ci)) {  /* a Lua function? */
+    Proto *p = ci_func(ci)->l.p;
+    int pc = currentpc(ci);
+    Instruction i;
+    *name = luaF_getlocalname(p, stackpos+1, pc);
+    if (*name)  /* is a local? */
+      return "local";
+    i = luaG_symbexec(p, pc, stackpos);  /* try symbolic execution */
+    lua_assert(pc != -1);
+    switch (GET_OPCODE(i)) {
+      case OP_GETGLOBAL: {
+        int g = GETARG_Bx(i);  /* global index */
+        lua_assert(ttisstring(&p->k[g]));
+        *name = svalue(&p->k[g]);
+        return "global";
+      }
+      case OP_MOVE: {
+        int a = GETARG_A(i);
+        int b = GETARG_B(i);  /* move from `b' to `a' */
+        if (b < a)
+          return getobjname(ci, b, name);  /* get name for `b' */
+        break;
+      }
+      case OP_GETTABLE: {
+        int k = GETARG_C(i);  /* key index */
+        *name = kname(p, k);
+        return "field";
+      }
+      case OP_SELF: {
+        int k = GETARG_C(i);  /* key index */
+        *name = kname(p, k);
+        return "method";
+      }
+      default: break;
+    }
+  }
+  return NULL;  /* no useful name found */
+}
+
+
+static const char *getfuncname (CallInfo *ci, const char **name) {
+  Instruction i;
+  if ((isLua(ci) && ci->u.l.tailcalls > 0) || !isLua(ci - 1))
+    return NULL;  /* calling function is not Lua (or is unknown) */
+  ci--;  /* calling function */
+  i = ci_func(ci)->l.p->code[currentpc(ci)];
+  if (GET_OPCODE(i) == OP_CALL || GET_OPCODE(i) == OP_TAILCALL)
+    return getobjname(ci, GETARG_A(i), name);
+  else
+    return NULL;  /* no useful name can be found */
+}
+
+
+/* only ANSI way to check whether a pointer points to an array */
+static int isinstack (CallInfo *ci, const TObject *o) {
+  StkId p;
+  for (p = ci->base; p < ci->top; p++)
+    if (o == p) return 1;
+  return 0;
+}
+
+
+void luaG_typeerror (lua_State *L, const TObject *o, const char *op) {
+  const char *name = NULL;
+  const char *t = luaT_typenames[ttype(o)];
+  const char *kind = (isinstack(L->ci, o)) ?
+                         getobjname(L->ci, o - L->base, &name) : NULL;
+  if (kind)
+    luaG_runerror(L, "attempt to %s %s `%s' (a %s value)",
+                op, kind, name, t);
+  else
+    luaG_runerror(L, "attempt to %s a %s value", op, t);
+}
+
+
+void luaG_concaterror (lua_State *L, StkId p1, StkId p2) {
+  if (ttisstring(p1)) p1 = p2;
+  lua_assert(!ttisstring(p1));
+  luaG_typeerror(L, p1, "concatenate");
+}
+
+
+void luaG_aritherror (lua_State *L, const TObject *p1, const TObject *p2) {
+  TObject temp;
+  if (luaV_tonumber(p1, &temp) == NULL)
+    p2 = p1;  /* first operand is wrong */
+  luaG_typeerror(L, p2, "perform arithmetic on");
+}
+
+
+int luaG_ordererror (lua_State *L, const TObject *p1, const TObject *p2) {
+  const char *t1 = luaT_typenames[ttype(p1)];
+  const char *t2 = luaT_typenames[ttype(p2)];
+  if (t1[2] == t2[2])
+    luaG_runerror(L, "attempt to compare two %s values", t1);
+  else
+    luaG_runerror(L, "attempt to compare %s with %s", t1, t2);
+  return 0;
+}
+
+
+static void addinfo (lua_State *L, const char *msg) {
+  CallInfo *ci = L->ci;
+  if (isLua(ci)) {  /* is Lua code? */
+    char buff[LUA_IDSIZE];  /* add file:line information */
+    int line = currentline(ci);
+    luaO_chunkid(buff, getstr(getluaproto(ci)->source), LUA_IDSIZE);
+    luaO_pushfstring(L, "%s:%d: %s", buff, line, msg);
+  }
+}
+
+
+void luaG_errormsg (lua_State *L) {
+  if (L->errfunc != 0) {  /* is there an error handling function? */
+    StkId errfunc = restorestack(L, L->errfunc);
+    if (!ttisfunction(errfunc)) luaD_throw(L, LUA_ERRERR);
+    setobjs2s(L->top, L->top - 1);  /* move argument */
+    setobjs2s(L->top - 1, errfunc);  /* push function */
+    incr_top(L);
+    luaD_call(L, L->top - 2, 1);  /* call it */
+  }
+  luaD_throw(L, LUA_ERRRUN);
+}
+
+
+void luaG_runerror (lua_State *L, const char *fmt, ...) {
+  va_list argp;
+  va_start(argp, fmt);
+  addinfo(L, luaO_pushvfstring(L, fmt, argp));
+  va_end(argp);
+  luaG_errormsg(L);
+}
+
diff --git a/main/source/lua/src/ldebug.h b/main/source/lua/src/ldebug.h
new file mode 100644
index 00000000..62b4abc3
--- /dev/null
+++ b/main/source/lua/src/ldebug.h
@@ -0,0 +1,31 @@
+/*
+** $Id: ldebug.h,v 1.32 2002/11/18 11:01:55 roberto Exp $
+** Auxiliary functions from Debug Interface module
+** See Copyright Notice in lua.h
+*/
+
+#ifndef ldebug_h
+#define ldebug_h
+
+
+#include "lstate.h"
+
+
+#define pcRel(pc, p)	(cast(int, (pc) - (p)->code) - 1)
+
+#define getline(f,pc)	(((f)->lineinfo) ? (f)->lineinfo[pc] : 0)
+
+#define resethookcount(L)	(L->hookcount = L->basehookcount)
+
+
+void luaG_inithooks (lua_State *L);
+void luaG_typeerror (lua_State *L, const TObject *o, const char *opname);
+void luaG_concaterror (lua_State *L, StkId p1, StkId p2);
+void luaG_aritherror (lua_State *L, const TObject *p1, const TObject *p2);
+int luaG_ordererror (lua_State *L, const TObject *p1, const TObject *p2);
+void luaG_runerror (lua_State *L, const char *fmt, ...);
+void luaG_errormsg (lua_State *L);
+int luaG_checkcode (const Proto *pt);
+
+
+#endif
diff --git a/main/source/lua/src/ldo.c b/main/source/lua/src/ldo.c
new file mode 100644
index 00000000..80fb517b
--- /dev/null
+++ b/main/source/lua/src/ldo.c
@@ -0,0 +1,458 @@
+/*
+** $Id: ldo.c,v 1.217 2003/04/03 13:35:34 roberto Exp $
+** Stack and Call structure of Lua
+** See Copyright Notice in lua.h
+*/
+
+
+#include <setjmp.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ldo_c
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lparser.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+#include "lundump.h"
+#include "lvm.h"
+#include "lzio.h"
+
+
+
+
+/*
+** {======================================================
+** Error-recovery functions (based on long jumps)
+** =======================================================
+*/
+
+
+/* chain list of long jump buffers */
+struct lua_longjmp {
+  struct lua_longjmp *previous;
+  jmp_buf b;
+  volatile int status;  /* error code */
+};
+
+
+static void seterrorobj (lua_State *L, int errcode, StkId oldtop) {
+  switch (errcode) {
+    case LUA_ERRMEM: {
+      setsvalue2s(oldtop, luaS_new(L, MEMERRMSG));
+      break;
+    }
+    case LUA_ERRERR: {
+      setsvalue2s(oldtop, luaS_new(L, "error in error handling"));
+      break;
+    }
+    case LUA_ERRSYNTAX:
+    case LUA_ERRRUN: {
+      setobjs2s(oldtop, L->top - 1);  /* error message on current top */
+      break;
+    }
+  }
+  L->top = oldtop + 1;
+}
+
+
+void luaD_throw (lua_State *L, int errcode) {
+  if (L->errorJmp) {
+    L->errorJmp->status = errcode;
+    longjmp(L->errorJmp->b, 1);
+  }
+  else {
+    G(L)->panic(L);
+    exit(EXIT_FAILURE);
+  }
+}
+
+
+int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud) {
+  struct lua_longjmp lj;
+  lj.status = 0;
+  lj.previous = L->errorJmp;  /* chain new error handler */
+  L->errorJmp = &lj;
+  if (setjmp(lj.b) == 0)
+    (*f)(L, ud);
+  L->errorJmp = lj.previous;  /* restore old error handler */
+  return lj.status;
+}
+
+
+static void restore_stack_limit (lua_State *L) {
+  L->stack_last = L->stack+L->stacksize-1;
+  if (L->size_ci > LUA_MAXCALLS) {  /* there was an overflow? */
+    int inuse = (L->ci - L->base_ci);
+    if (inuse + 1 < LUA_MAXCALLS)  /* can `undo' overflow? */
+      luaD_reallocCI(L, LUA_MAXCALLS);
+  }
+}
+
+/* }====================================================== */
+
+
+static void correctstack (lua_State *L, TObject *oldstack) {
+  CallInfo *ci;
+  GCObject *up;
+  L->top = (L->top - oldstack) + L->stack;
+  for (up = L->openupval; up != NULL; up = up->gch.next)
+    gcotouv(up)->v = (gcotouv(up)->v - oldstack) + L->stack;
+  for (ci = L->base_ci; ci <= L->ci; ci++) {
+    ci->top = (ci->top - oldstack) + L->stack;
+    ci->base = (ci->base - oldstack) + L->stack;
+  }
+  L->base = L->ci->base;
+}
+
+
+void luaD_reallocstack (lua_State *L, int newsize) {
+  TObject *oldstack = L->stack;
+  luaM_reallocvector(L, L->stack, L->stacksize, newsize, TObject);
+  L->stacksize = newsize;
+  L->stack_last = L->stack+newsize-1-EXTRA_STACK;
+  correctstack(L, oldstack);
+}
+
+
+void luaD_reallocCI (lua_State *L, int newsize) {
+  CallInfo *oldci = L->base_ci;
+  luaM_reallocvector(L, L->base_ci, L->size_ci, newsize, CallInfo);
+  L->size_ci = cast(unsigned short, newsize);
+  L->ci = (L->ci - oldci) + L->base_ci;
+  L->end_ci = L->base_ci + L->size_ci;
+}
+
+
+void luaD_growstack (lua_State *L, int n) {
+  if (n <= L->stacksize)  /* double size is enough? */
+    luaD_reallocstack(L, 2*L->stacksize);
+  else
+    luaD_reallocstack(L, L->stacksize + n + EXTRA_STACK);
+}
+
+
+static void luaD_growCI (lua_State *L) {
+  if (L->size_ci > LUA_MAXCALLS)  /* overflow while handling overflow? */
+    luaD_throw(L, LUA_ERRERR);
+  else {
+    luaD_reallocCI(L, 2*L->size_ci);
+    if (L->size_ci > LUA_MAXCALLS)
+      luaG_runerror(L, "stack overflow");
+  }
+}
+
+
+void luaD_callhook (lua_State *L, int event, int line) {
+  lua_Hook hook = L->hook;
+  if (hook && L->allowhook) {
+    ptrdiff_t top = savestack(L, L->top);
+    ptrdiff_t ci_top = savestack(L, L->ci->top);
+    lua_Debug ar;
+    ar.event = event;
+    ar.currentline = line;
+    if (event == LUA_HOOKTAILRET)
+      ar.i_ci = 0;  /* tail call; no debug information about it */
+    else
+      ar.i_ci = L->ci - L->base_ci;
+    luaD_checkstack(L, LUA_MINSTACK);  /* ensure minimum stack size */
+    L->ci->top = L->top + LUA_MINSTACK;
+    L->allowhook = 0;  /* cannot call hooks inside a hook */
+    lua_unlock(L);
+    (*hook)(L, &ar);
+    lua_lock(L);
+    lua_assert(!L->allowhook);
+    L->allowhook = 1;
+    L->ci->top = restorestack(L, ci_top);
+    L->top = restorestack(L, top);
+  }
+}
+
+
+static void adjust_varargs (lua_State *L, int nfixargs, StkId base) {
+  int i;
+  Table *htab;
+  TObject nname;
+  int actual = L->top - base;  /* actual number of arguments */
+  if (actual < nfixargs) {
+    luaD_checkstack(L, nfixargs - actual);
+    for (; actual < nfixargs; ++actual)
+      setnilvalue(L->top++);
+  }
+  actual -= nfixargs;  /* number of extra arguments */
+  htab = luaH_new(L, actual, 1);  /* create `arg' table */
+  for (i=0; i<actual; i++)  /* put extra arguments into `arg' table */
+    setobj2n(luaH_setnum(L, htab, i+1), L->top - actual + i);
+  /* store counter in field `n' */
+  setsvalue(&nname, luaS_newliteral(L, "n"));
+  setnvalue(luaH_set(L, htab, &nname), cast(lua_Number, actual));
+  L->top -= actual;  /* remove extra elements from the stack */
+  sethvalue(L->top, htab);
+  incr_top(L);
+}
+
+
+static StkId tryfuncTM (lua_State *L, StkId func) {
+  const TObject *tm = luaT_gettmbyobj(L, func, TM_CALL);
+  StkId p;
+  ptrdiff_t funcr = savestack(L, func);
+  if (!ttisfunction(tm))
+    luaG_typeerror(L, func, "call");
+  /* Open a hole inside the stack at `func' */
+  for (p = L->top; p > func; p--) setobjs2s(p, p-1);
+  incr_top(L);
+  func = restorestack(L, funcr);  /* previous call may change stack */
+  setobj2s(func, tm);  /* tag method is the new function to be called */
+  return func;
+}
+
+
+StkId luaD_precall (lua_State *L, StkId func) {
+  LClosure *cl;
+  ptrdiff_t funcr = savestack(L, func);
+  if (!ttisfunction(func)) /* `func' is not a function? */
+    func = tryfuncTM(L, func);  /* check the `function' tag method */
+  if (L->ci + 1 == L->end_ci) luaD_growCI(L);
+  else condhardstacktests(luaD_reallocCI(L, L->size_ci));
+  cl = &clvalue(func)->l;
+  if (!cl->isC) {  /* Lua function? prepare its call */
+    CallInfo *ci;
+    Proto *p = cl->p;
+    if (p->is_vararg)  /* varargs? */
+      adjust_varargs(L, p->numparams, func+1);
+    luaD_checkstack(L, p->maxstacksize);
+    ci = ++L->ci;  /* now `enter' new function */
+    L->base = L->ci->base = restorestack(L, funcr) + 1;
+    ci->top = L->base + p->maxstacksize;
+    ci->u.l.savedpc = p->code;  /* starting point */
+    ci->u.l.tailcalls = 0;
+    ci->state = CI_SAVEDPC;
+    while (L->top < ci->top)
+      setnilvalue(L->top++);
+    L->top = ci->top;
+    return NULL;
+  }
+  else {  /* if is a C function, call it */
+    CallInfo *ci;
+    int n;
+    luaD_checkstack(L, LUA_MINSTACK);  /* ensure minimum stack size */
+    ci = ++L->ci;  /* now `enter' new function */
+    L->base = L->ci->base = restorestack(L, funcr) + 1;
+    ci->top = L->top + LUA_MINSTACK;
+    ci->state = CI_C;  /* a C function */
+    if (L->hookmask & LUA_MASKCALL)
+      luaD_callhook(L, LUA_HOOKCALL, -1);
+    lua_unlock(L);
+#ifdef LUA_COMPATUPVALUES
+    lua_pushupvalues(L);
+#endif
+    n = (*clvalue(L->base - 1)->c.f)(L);  /* do the actual call */
+    lua_lock(L);
+    return L->top - n;
+  }
+}
+
+
+static StkId callrethooks (lua_State *L, StkId firstResult) {
+  ptrdiff_t fr = savestack(L, firstResult);  /* next call may change stack */
+  luaD_callhook(L, LUA_HOOKRET, -1);
+  if (!(L->ci->state & CI_C)) {  /* Lua function? */
+    while (L->ci->u.l.tailcalls--)  /* call hook for eventual tail calls */
+      luaD_callhook(L, LUA_HOOKTAILRET, -1);
+  }
+  return restorestack(L, fr);
+}
+
+
+void luaD_poscall (lua_State *L, int wanted, StkId firstResult) { 
+  StkId res;
+  if (L->hookmask & LUA_MASKRET)
+    firstResult = callrethooks(L, firstResult);
+  res = L->base - 1;  /* res == final position of 1st result */
+  L->ci--;
+  L->base = L->ci->base;  /* restore base */
+  /* move results to correct place */
+  while (wanted != 0 && firstResult < L->top) {
+    setobjs2s(res++, firstResult++);
+    wanted--;
+  }
+  while (wanted-- > 0)
+    setnilvalue(res++);
+  L->top = res;
+}
+
+
+/*
+** Call a function (C or Lua). The function to be called is at *func.
+** The arguments are on the stack, right after the function.
+** When returns, all the results are on the stack, starting at the original
+** function position.
+*/ 
+void luaD_call (lua_State *L, StkId func, int nResults) {
+  StkId firstResult;
+  lua_assert(!(L->ci->state & CI_CALLING));
+  if (++L->nCcalls >= LUA_MAXCCALLS) {
+    if (L->nCcalls == LUA_MAXCCALLS)
+      luaG_runerror(L, "C stack overflow");
+    else if (L->nCcalls >= (LUA_MAXCCALLS + (LUA_MAXCCALLS>>3)))
+      luaD_throw(L, LUA_ERRERR);  /* error while handing stack error */
+  }
+  firstResult = luaD_precall(L, func);
+  if (firstResult == NULL)  /* is a Lua function? */
+    firstResult = luaV_execute(L);  /* call it */
+  luaD_poscall(L, nResults, firstResult);
+  L->nCcalls--;
+  luaC_checkGC(L);
+}
+
+
+static void resume (lua_State *L, void *ud) {
+  StkId firstResult;
+  int nargs = *cast(int *, ud);
+  CallInfo *ci = L->ci;
+  if (ci == L->base_ci) {  /* no activation record? */
+    if (nargs >= L->top - L->base)
+      luaG_runerror(L, "cannot resume dead coroutine");
+    luaD_precall(L, L->top - (nargs + 1));  /* start coroutine */
+  }
+  else if (ci->state & CI_YIELD) {  /* inside a yield? */
+    if (ci->state & CI_C) {  /* `common' yield? */
+      /* finish interrupted execution of `OP_CALL' */
+      int nresults;
+      lua_assert((ci-1)->state & CI_SAVEDPC);
+      lua_assert(GET_OPCODE(*((ci-1)->u.l.savedpc - 1)) == OP_CALL ||
+                 GET_OPCODE(*((ci-1)->u.l.savedpc - 1)) == OP_TAILCALL);
+      nresults = GETARG_C(*((ci-1)->u.l.savedpc - 1)) - 1;
+      luaD_poscall(L, nresults, L->top - nargs);  /* complete it */
+      if (nresults >= 0) L->top = L->ci->top;
+    }
+    else {  /* yielded inside a hook: just continue its execution */
+      ci->state &= ~CI_YIELD;
+    }
+  }
+  else
+    luaG_runerror(L, "cannot resume non-suspended coroutine");
+  firstResult = luaV_execute(L);
+  if (firstResult != NULL)   /* return? */
+    luaD_poscall(L, LUA_MULTRET, firstResult);  /* finalize this coroutine */
+}
+
+
+LUA_API int lua_resume (lua_State *L, int nargs) {
+  int status;
+  lu_byte old_allowhooks;
+  lua_lock(L);
+  old_allowhooks = L->allowhook;
+  lua_assert(L->errfunc == 0 && L->nCcalls == 0);
+  status = luaD_rawrunprotected(L, resume, &nargs);
+  if (status != 0) {  /* error? */
+    L->ci = L->base_ci;  /* go back to initial level */
+    L->base = L->ci->base;
+    L->nCcalls = 0;
+    luaF_close(L, L->base);  /* close eventual pending closures */
+    seterrorobj(L, status, L->base);
+    L->allowhook = old_allowhooks;
+    restore_stack_limit(L);
+  }
+  lua_unlock(L);
+  return status;
+}
+
+
+LUA_API int lua_yield (lua_State *L, int nresults) {
+  CallInfo *ci;
+  lua_lock(L);
+  ci = L->ci;
+  if (L->nCcalls > 0)
+    luaG_runerror(L, "attempt to yield across metamethod/C-call boundary");
+  if (ci->state & CI_C) {  /* usual yield */
+    if ((ci-1)->state & CI_C)
+      luaG_runerror(L, "cannot yield a C function");
+    if (L->top - nresults > L->base) {  /* is there garbage in the stack? */
+      int i;
+      for (i=0; i<nresults; i++)  /* move down results */
+        setobjs2s(L->base + i, L->top - nresults + i);
+      L->top = L->base + nresults;
+    }
+  } /* else it's an yield inside a hook: nothing to do */
+  ci->state |= CI_YIELD;
+  lua_unlock(L);
+  return -1;
+}
+
+
+int luaD_pcall (lua_State *L, Pfunc func, void *u,
+                ptrdiff_t old_top, ptrdiff_t ef) {
+  int status;
+  unsigned short oldnCcalls = L->nCcalls;
+  ptrdiff_t old_ci = saveci(L, L->ci);
+  lu_byte old_allowhooks = L->allowhook;
+  ptrdiff_t old_errfunc = L->errfunc;
+  L->errfunc = ef;
+  status = luaD_rawrunprotected(L, func, u);
+  if (status != 0) {  /* an error occurred? */
+    StkId oldtop = restorestack(L, old_top);
+    luaF_close(L, oldtop);  /* close eventual pending closures */
+    seterrorobj(L, status, oldtop);
+    L->nCcalls = oldnCcalls;
+    L->ci = restoreci(L, old_ci);
+    L->base = L->ci->base;
+    L->allowhook = old_allowhooks;
+    restore_stack_limit(L);
+  }
+  L->errfunc = old_errfunc;
+  return status;
+}
+
+
+
+/*
+** Execute a protected parser.
+*/
+struct SParser {  /* data to `f_parser' */
+  ZIO *z;
+  Mbuffer buff;  /* buffer to be used by the scanner */
+  int bin;
+};
+
+static void f_parser (lua_State *L, void *ud) {
+  struct SParser *p;
+  Proto *tf;
+  Closure *cl;
+  luaC_checkGC(L);
+  p = cast(struct SParser *, ud);
+  tf = p->bin ? luaU_undump(L, p->z, &p->buff) : luaY_parser(L, p->z, &p->buff);
+  cl = luaF_newLclosure(L, 0, gt(L));
+  cl->l.p = tf;
+  setclvalue(L->top, cl);
+  incr_top(L);
+}
+
+
+int luaD_protectedparser (lua_State *L, ZIO *z, int bin) {
+  struct SParser p;
+  int status;
+  ptrdiff_t oldtopr = savestack(L, L->top);  /* save current top */
+  p.z = z; p.bin = bin;
+  luaZ_initbuffer(L, &p.buff);
+  status = luaD_rawrunprotected(L, f_parser, &p);
+  luaZ_freebuffer(L, &p.buff);
+  if (status != 0) {  /* error? */
+    StkId oldtop = restorestack(L, oldtopr);
+    seterrorobj(L, status, oldtop);
+  }
+  return status;
+}
+
+
diff --git a/main/source/lua/src/ldo.h b/main/source/lua/src/ldo.h
new file mode 100644
index 00000000..2b43f18c
--- /dev/null
+++ b/main/source/lua/src/ldo.h
@@ -0,0 +1,60 @@
+/*
+** $Id: ldo.h,v 1.56 2002/12/04 17:29:32 roberto Exp $
+** Stack and Call structure of Lua
+** See Copyright Notice in lua.h
+*/
+
+#ifndef ldo_h
+#define ldo_h
+
+
+#include "lobject.h"
+#include "lstate.h"
+#include "lzio.h"
+
+
+/*
+** macro to control inclusion of some hard tests on stack reallocation
+*/ 
+#ifndef HARDSTACKTESTS
+#define condhardstacktests(x)	{ /* empty */ }
+#else
+#define condhardstacktests(x)	x
+#endif
+
+
+#define luaD_checkstack(L,n)	\
+  if ((char *)L->stack_last - (char *)L->top <= (n)*(int)sizeof(TObject)) \
+    luaD_growstack(L, n); \
+  else condhardstacktests(luaD_reallocstack(L, L->stacksize));
+
+
+#define incr_top(L) {luaD_checkstack(L,1); L->top++;}
+
+#define savestack(L,p)		((char *)(p) - (char *)L->stack)
+#define restorestack(L,n)	((TObject *)((char *)L->stack + (n)))
+
+#define saveci(L,p)		((char *)(p) - (char *)L->base_ci)
+#define restoreci(L,n)		((CallInfo *)((char *)L->base_ci + (n)))
+
+
+/* type of protected functions, to be ran by `runprotected' */
+typedef void (*Pfunc) (lua_State *L, void *ud);
+
+void luaD_resetprotection (lua_State *L);
+int luaD_protectedparser (lua_State *L, ZIO *z, int bin);
+void luaD_callhook (lua_State *L, int event, int line);
+StkId luaD_precall (lua_State *L, StkId func);
+void luaD_call (lua_State *L, StkId func, int nResults);
+int luaD_pcall (lua_State *L, Pfunc func, void *u,
+                ptrdiff_t oldtop, ptrdiff_t ef);
+void luaD_poscall (lua_State *L, int wanted, StkId firstResult);
+void luaD_reallocCI (lua_State *L, int newsize);
+void luaD_reallocstack (lua_State *L, int newsize);
+void luaD_growstack (lua_State *L, int n);
+
+void luaD_throw (lua_State *L, int errcode);
+int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud);
+
+
+#endif
diff --git a/main/source/lua/src/ldump.c b/main/source/lua/src/ldump.c
new file mode 100644
index 00000000..84c93fdf
--- /dev/null
+++ b/main/source/lua/src/ldump.c
@@ -0,0 +1,170 @@
+/*
+** $Id: ldump.c,v 1.4 2003/02/11 23:52:12 lhf Exp $
+** save bytecodes
+** See Copyright Notice in lua.h
+*/
+
+#include <stddef.h>
+
+#define ldump_c
+
+#include "lua.h"
+
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lstate.h"
+#include "lundump.h"
+
+#define DumpVector(b,n,size,D)	DumpBlock(b,(n)*(size),D)
+#define DumpLiteral(s,D)	DumpBlock("" s,(sizeof(s))-1,D)
+
+typedef struct {
+ lua_State* L;
+ lua_Chunkwriter write;
+ void* data;
+} DumpState;
+
+static void DumpBlock(const void* b, size_t size, DumpState* D)
+{
+ lua_unlock(D->L);
+ (*D->write)(D->L,b,size,D->data);
+ lua_lock(D->L);
+}
+
+static void DumpByte(int y, DumpState* D)
+{
+ char x=(char)y;
+ DumpBlock(&x,sizeof(x),D);
+}
+
+static void DumpInt(int x, DumpState* D)
+{
+ DumpBlock(&x,sizeof(x),D);
+}
+
+static void DumpSize(size_t x, DumpState* D)
+{
+ DumpBlock(&x,sizeof(x),D);
+}
+
+static void DumpNumber(lua_Number x, DumpState* D)
+{
+ DumpBlock(&x,sizeof(x),D);
+}
+
+static void DumpString(TString* s, DumpState* D)
+{
+ if (s==NULL || getstr(s)==NULL)
+  DumpSize(0,D);
+ else
+ {
+  size_t size=s->tsv.len+1;		/* include trailing '\0' */
+  DumpSize(size,D);
+  DumpBlock(getstr(s),size,D);
+ }
+}
+
+static void DumpCode(const Proto* f, DumpState* D)
+{
+ DumpInt(f->sizecode,D);
+ DumpVector(f->code,f->sizecode,sizeof(*f->code),D);
+}
+
+static void DumpLocals(const Proto* f, DumpState* D)
+{
+ int i,n=f->sizelocvars;
+ DumpInt(n,D);
+ for (i=0; i<n; i++)
+ {
+  DumpString(f->locvars[i].varname,D);
+  DumpInt(f->locvars[i].startpc,D);
+  DumpInt(f->locvars[i].endpc,D);
+ }
+}
+
+static void DumpLines(const Proto* f, DumpState* D)
+{
+ DumpInt(f->sizelineinfo,D);
+ DumpVector(f->lineinfo,f->sizelineinfo,sizeof(*f->lineinfo),D);
+}
+
+static void DumpUpvalues(const Proto* f, DumpState* D)
+{
+ int i,n=f->sizeupvalues;
+ DumpInt(n,D);
+ for (i=0; i<n; i++) DumpString(f->upvalues[i],D);
+}
+
+static void DumpFunction(const Proto* f, const TString* p, DumpState* D);
+
+static void DumpConstants(const Proto* f, DumpState* D)
+{
+ int i,n;
+ DumpInt(n=f->sizek,D);
+ for (i=0; i<n; i++)
+ {
+  const TObject* o=&f->k[i];
+  DumpByte(ttype(o),D);
+  switch (ttype(o))
+  {
+   case LUA_TNUMBER:
+	DumpNumber(nvalue(o),D);
+	break;
+   case LUA_TSTRING:
+	DumpString(tsvalue(o),D);
+	break;
+   case LUA_TNIL:
+	break;
+   default:
+	lua_assert(0);			/* cannot happen */
+	break;
+  }
+ }
+ DumpInt(n=f->sizep,D);
+ for (i=0; i<n; i++) DumpFunction(f->p[i],f->source,D);
+}
+
+static void DumpFunction(const Proto* f, const TString* p, DumpState* D)
+{
+ DumpString((f->source==p) ? NULL : f->source,D);
+ DumpInt(f->lineDefined,D);
+ DumpByte(f->nups,D);
+ DumpByte(f->numparams,D);
+ DumpByte(f->is_vararg,D);
+ DumpByte(f->maxstacksize,D);
+ DumpLines(f,D);
+ DumpLocals(f,D);
+ DumpUpvalues(f,D);
+ DumpConstants(f,D);
+ DumpCode(f,D);
+}
+
+static void DumpHeader(DumpState* D)
+{
+ DumpLiteral(LUA_SIGNATURE,D);
+ DumpByte(VERSION,D);
+ DumpByte(luaU_endianness(),D);
+ DumpByte(sizeof(int),D);
+ DumpByte(sizeof(size_t),D);
+ DumpByte(sizeof(Instruction),D);
+ DumpByte(SIZE_OP,D);
+ DumpByte(SIZE_A,D);
+ DumpByte(SIZE_B,D);
+ DumpByte(SIZE_C,D);
+ DumpByte(sizeof(lua_Number),D);
+ DumpNumber(TEST_NUMBER,D);
+}
+
+/*
+** dump function as precompiled chunk
+*/
+void luaU_dump (lua_State* L, const Proto* Main, lua_Chunkwriter w, void* data)
+{
+ DumpState D;
+ D.L=L;
+ D.write=w;
+ D.data=data;
+ DumpHeader(&D);
+ DumpFunction(Main,NULL,&D);
+}
+
diff --git a/main/source/lua/src/lfunc.c b/main/source/lua/src/lfunc.c
new file mode 100644
index 00000000..290e8ebe
--- /dev/null
+++ b/main/source/lua/src/lfunc.c
@@ -0,0 +1,135 @@
+/*
+** $Id: lfunc.c,v 1.67 2003/03/18 12:50:04 roberto Exp $
+** Auxiliary functions to manipulate prototypes and closures
+** See Copyright Notice in lua.h
+*/
+
+
+#include <stdlib.h>
+
+#define lfunc_c
+
+#include "lua.h"
+
+#include "lfunc.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+
+
+#define sizeCclosure(n)	(cast(int, sizeof(CClosure)) + \
+                         cast(int, sizeof(TObject)*((n)-1)))
+
+#define sizeLclosure(n)	(cast(int, sizeof(LClosure)) + \
+                         cast(int, sizeof(TObject *)*((n)-1)))
+
+
+
+Closure *luaF_newCclosure (lua_State *L, int nelems) {
+  Closure *c = cast(Closure *, luaM_malloc(L, sizeCclosure(nelems)));
+  luaC_link(L, valtogco(c), LUA_TFUNCTION);
+  c->c.isC = 1;
+  c->c.nupvalues = cast(lu_byte, nelems);
+  return c;
+}
+
+
+Closure *luaF_newLclosure (lua_State *L, int nelems, TObject *e) {
+  Closure *c = cast(Closure *, luaM_malloc(L, sizeLclosure(nelems)));
+  luaC_link(L, valtogco(c), LUA_TFUNCTION);
+  c->l.isC = 0;
+  c->l.g = *e;
+  c->l.nupvalues = cast(lu_byte, nelems);
+  return c;
+}
+
+
+UpVal *luaF_findupval (lua_State *L, StkId level) {
+  GCObject **pp = &L->openupval;
+  UpVal *p;
+  UpVal *v;
+  while ((p = ngcotouv(*pp)) != NULL && p->v >= level) {
+    if (p->v == level) return p;
+    pp = &p->next;
+  }
+  v = luaM_new(L, UpVal);  /* not found: create a new one */
+  v->tt = LUA_TUPVAL;
+  v->marked = 1;  /* open upvalues should not be collected */
+  v->v = level;  /* current value lives in the stack */
+  v->next = *pp;  /* chain it in the proper position */
+  *pp = valtogco(v);
+  return v;
+}
+
+
+void luaF_close (lua_State *L, StkId level) {
+  UpVal *p;
+  while ((p = ngcotouv(L->openupval)) != NULL && p->v >= level) {
+    setobj(&p->value, p->v);  /* save current value (write barrier) */
+    p->v = &p->value;  /* now current value lives here */
+    L->openupval = p->next;  /* remove from `open' list */
+    luaC_link(L, valtogco(p), LUA_TUPVAL);
+  }
+}
+
+
+Proto *luaF_newproto (lua_State *L) {
+  Proto *f = luaM_new(L, Proto);
+  luaC_link(L, valtogco(f), LUA_TPROTO);
+  f->k = NULL;
+  f->sizek = 0;
+  f->p = NULL;
+  f->sizep = 0;
+  f->code = NULL;
+  f->sizecode = 0;
+  f->sizelineinfo = 0;
+  f->sizeupvalues = 0;
+  f->nups = 0;
+  f->upvalues = NULL;
+  f->numparams = 0;
+  f->is_vararg = 0;
+  f->maxstacksize = 0;
+  f->lineinfo = NULL;
+  f->sizelocvars = 0;
+  f->locvars = NULL;
+  f->lineDefined = 0;
+  f->source = NULL;
+  return f;
+}
+
+
+void luaF_freeproto (lua_State *L, Proto *f) {
+  luaM_freearray(L, f->code, f->sizecode, Instruction);
+  luaM_freearray(L, f->p, f->sizep, Proto *);
+  luaM_freearray(L, f->k, f->sizek, TObject);
+  luaM_freearray(L, f->lineinfo, f->sizelineinfo, int);
+  luaM_freearray(L, f->locvars, f->sizelocvars, struct LocVar);
+  luaM_freearray(L, f->upvalues, f->sizeupvalues, TString *);
+  luaM_freelem(L, f);
+}
+
+
+void luaF_freeclosure (lua_State *L, Closure *c) {
+  int size = (c->c.isC) ? sizeCclosure(c->c.nupvalues) :
+                          sizeLclosure(c->l.nupvalues);
+  luaM_free(L, c, size);
+}
+
+
+/*
+** Look for n-th local variable at line `line' in function `func'.
+** Returns NULL if not found.
+*/
+const char *luaF_getlocalname (const Proto *f, int local_number, int pc) {
+  int i;
+  for (i = 0; i<f->sizelocvars && f->locvars[i].startpc <= pc; i++) {
+    if (pc < f->locvars[i].endpc) {  /* is variable active? */
+      local_number--;
+      if (local_number == 0)
+        return getstr(f->locvars[i].varname);
+    }
+  }
+  return NULL;  /* not found */
+}
+
diff --git a/main/source/lua/src/lfunc.h b/main/source/lua/src/lfunc.h
new file mode 100644
index 00000000..bef5b87c
--- /dev/null
+++ b/main/source/lua/src/lfunc.h
@@ -0,0 +1,25 @@
+/*
+** $Id: lfunc.h,v 1.21 2003/03/18 12:50:04 roberto Exp $
+** Auxiliary functions to manipulate prototypes and closures
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lfunc_h
+#define lfunc_h
+
+
+#include "lobject.h"
+
+
+Proto *luaF_newproto (lua_State *L);
+Closure *luaF_newCclosure (lua_State *L, int nelems);
+Closure *luaF_newLclosure (lua_State *L, int nelems, TObject *e);
+UpVal *luaF_findupval (lua_State *L, StkId level);
+void luaF_close (lua_State *L, StkId level);
+void luaF_freeproto (lua_State *L, Proto *f);
+void luaF_freeclosure (lua_State *L, Closure *c);
+
+const char *luaF_getlocalname (const Proto *func, int local_number, int pc);
+
+
+#endif
diff --git a/main/source/lua/src/lgc.c b/main/source/lua/src/lgc.c
new file mode 100644
index 00000000..4e83a1fa
--- /dev/null
+++ b/main/source/lua/src/lgc.c
@@ -0,0 +1,493 @@
+/*
+** $Id: lgc.c,v 1.171 2003/04/03 13:35:34 roberto Exp $
+** Garbage Collector
+** See Copyright Notice in lua.h
+*/
+
+#include <string.h>
+
+#define lgc_c
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+
+
+typedef struct GCState {
+  GCObject *tmark;  /* list of marked objects to be traversed */
+  GCObject *wk;  /* list of traversed key-weak tables (to be cleared) */
+  GCObject *wv;  /* list of traversed value-weak tables */
+  GCObject *wkv;  /* list of traversed key-value weak tables */
+  global_State *g;
+} GCState;
+
+
+/*
+** some userful bit tricks
+*/
+#define setbit(x,b)	((x) |= (1<<(b)))
+#define resetbit(x,b)	((x) &= cast(lu_byte, ~(1<<(b))))
+#define testbit(x,b)	((x) & (1<<(b)))
+
+#define unmark(x)	resetbit((x)->gch.marked, 0)
+#define ismarked(x)	((x)->gch.marked & ((1<<4)|1))
+
+#define stringmark(s)	setbit((s)->tsv.marked, 0)
+
+
+#define isfinalized(u)		(!testbit((u)->uv.marked, 1))
+#define markfinalized(u)	resetbit((u)->uv.marked, 1)
+
+
+#define KEYWEAKBIT    1
+#define VALUEWEAKBIT  2
+#define KEYWEAK         (1<<KEYWEAKBIT)
+#define VALUEWEAK       (1<<VALUEWEAKBIT)
+
+
+
+#define markobject(st,o) { checkconsistency(o); \
+  if (iscollectable(o) && !ismarked(gcvalue(o))) reallymarkobject(st,gcvalue(o)); }
+
+#define condmarkobject(st,o,c) { checkconsistency(o); \
+  if (iscollectable(o) && !ismarked(gcvalue(o)) && (c)) \
+    reallymarkobject(st,gcvalue(o)); }
+
+#define markvalue(st,t) { if (!ismarked(valtogco(t))) \
+		reallymarkobject(st, valtogco(t)); }
+
+
+
+static void reallymarkobject (GCState *st, GCObject *o) {
+  lua_assert(!ismarked(o));
+  setbit(o->gch.marked, 0);  /* mark object */
+  switch (o->gch.tt) {
+    case LUA_TUSERDATA: {
+      markvalue(st, gcotou(o)->uv.metatable);
+      break;
+    }
+    case LUA_TFUNCTION: {
+      gcotocl(o)->c.gclist = st->tmark;
+      st->tmark = o;
+      break;
+    }
+    case LUA_TTABLE: {
+      gcotoh(o)->gclist = st->tmark;
+      st->tmark = o;
+      break;
+    }
+    case LUA_TTHREAD: {
+      gcototh(o)->gclist = st->tmark;
+      st->tmark = o;
+      break;
+    }
+    case LUA_TPROTO: {
+      gcotop(o)->gclist = st->tmark;
+      st->tmark = o;
+      break;
+    }
+    default: lua_assert(o->gch.tt == LUA_TSTRING);
+  }
+}
+
+
+static void marktmu (GCState *st) {
+  GCObject *u;
+  for (u = st->g->tmudata; u; u = u->gch.next) {
+    unmark(u);  /* may be marked, if left from previous GC */
+    reallymarkobject(st, u);
+  }
+}
+
+
+/* move `dead' udata that need finalization to list `tmudata' */
+void luaC_separateudata (lua_State *L) {
+  GCObject **p = &G(L)->rootudata;
+  GCObject *curr;
+  GCObject *collected = NULL;  /* to collect udata with gc event */
+  GCObject **lastcollected = &collected;
+  while ((curr = *p) != NULL) {
+    lua_assert(curr->gch.tt == LUA_TUSERDATA);
+    if (ismarked(curr) || isfinalized(gcotou(curr)))
+      p = &curr->gch.next;  /* don't bother with them */
+
+    else if (fasttm(L, gcotou(curr)->uv.metatable, TM_GC) == NULL) {
+      markfinalized(gcotou(curr));  /* don't need finalization */
+      p = &curr->gch.next;
+    }
+    else {  /* must call its gc method */
+      *p = curr->gch.next;
+      curr->gch.next = NULL;  /* link `curr' at the end of `collected' list */
+      *lastcollected = curr;
+      lastcollected = &curr->gch.next;
+    }
+  }
+  /* insert collected udata with gc event into `tmudata' list */
+  *lastcollected = G(L)->tmudata;
+  G(L)->tmudata = collected;
+}
+
+
+static void removekey (Node *n) {
+  setnilvalue(gval(n));  /* remove corresponding value ... */
+  if (iscollectable(gkey(n)))
+    setttype(gkey(n), LUA_TNONE);  /* dead key; remove it */
+}
+
+
+static void traversetable (GCState *st, Table *h) {
+  int i;
+  int weakkey = 0;
+  int weakvalue = 0;
+  const TObject *mode;
+  markvalue(st, h->metatable);
+  lua_assert(h->lsizenode || h->node == st->g->dummynode);
+  mode = gfasttm(st->g, h->metatable, TM_MODE);
+  if (mode && ttisstring(mode)) {  /* is there a weak mode? */
+    weakkey = (strchr(svalue(mode), 'k') != NULL);
+    weakvalue = (strchr(svalue(mode), 'v') != NULL);
+    if (weakkey || weakvalue) {  /* is really weak? */
+      GCObject **weaklist;
+      h->marked &= ~(KEYWEAK | VALUEWEAK);  /* clear bits */
+      h->marked |= cast(lu_byte, (weakkey << KEYWEAKBIT) |
+                                 (weakvalue << VALUEWEAKBIT));
+      weaklist = (weakkey && weakvalue) ? &st->wkv :
+                              (weakkey) ? &st->wk :
+                                          &st->wv;
+      h->gclist = *weaklist;  /* must be cleared after GC, ... */
+      *weaklist = valtogco(h);  /* ... so put in the appropriate list */
+    }
+  }
+  if (!weakvalue) {
+    i = h->sizearray;
+    while (i--)
+      markobject(st, &h->array[i]);
+  }
+  i = sizenode(h);
+  while (i--) {
+    Node *n = gnode(h, i);
+    if (!ttisnil(gval(n))) {
+      lua_assert(!ttisnil(gkey(n)));
+      condmarkobject(st, gkey(n), !weakkey);
+      condmarkobject(st, gval(n), !weakvalue);
+    }
+  }
+}
+
+
+static void traverseproto (GCState *st, Proto *f) {
+  int i;
+  stringmark(f->source);
+  for (i=0; i<f->sizek; i++) {  /* mark literal strings */
+    if (ttisstring(f->k+i))
+      stringmark(tsvalue(f->k+i));
+  }
+  for (i=0; i<f->sizeupvalues; i++)  /* mark upvalue names */
+    stringmark(f->upvalues[i]);
+  for (i=0; i<f->sizep; i++)  /* mark nested protos */
+    markvalue(st, f->p[i]);
+  for (i=0; i<f->sizelocvars; i++)  /* mark local-variable names */
+    stringmark(f->locvars[i].varname);
+  lua_assert(luaG_checkcode(f));
+}
+
+
+
+static void traverseclosure (GCState *st, Closure *cl) {
+  if (cl->c.isC) {
+    int i;
+    for (i=0; i<cl->c.nupvalues; i++)  /* mark its upvalues */
+      markobject(st, &cl->c.upvalue[i]);
+  }
+  else {
+    int i;
+    lua_assert(cl->l.nupvalues == cl->l.p->nups);
+    markvalue(st, hvalue(&cl->l.g));
+    markvalue(st, cl->l.p);
+    for (i=0; i<cl->l.nupvalues; i++) {  /* mark its upvalues */
+      UpVal *u = cl->l.upvals[i];
+      if (!u->marked) {
+        markobject(st, &u->value);
+        u->marked = 1;
+      }
+    }
+  }
+}
+
+
+static void checkstacksizes (lua_State *L, StkId max) {
+  int used = L->ci - L->base_ci;  /* number of `ci' in use */
+  if (4*used < L->size_ci && 2*BASIC_CI_SIZE < L->size_ci)
+    luaD_reallocCI(L, L->size_ci/2);  /* still big enough... */
+  else condhardstacktests(luaD_reallocCI(L, L->size_ci));
+  used = max - L->stack;  /* part of stack in use */
+  if (4*used < L->stacksize && 2*(BASIC_STACK_SIZE+EXTRA_STACK) < L->stacksize)
+    luaD_reallocstack(L, L->stacksize/2);  /* still big enough... */
+  else condhardstacktests(luaD_reallocstack(L, L->stacksize));
+}
+
+
+static void traversestack (GCState *st, lua_State *L1) {
+  StkId o, lim;
+  CallInfo *ci;
+  markobject(st, gt(L1));
+  lim = L1->top;
+  for (ci = L1->base_ci; ci <= L1->ci; ci++) {
+    lua_assert(ci->top <= L1->stack_last);
+    lua_assert(ci->state & (CI_C | CI_HASFRAME | CI_SAVEDPC));
+    if (!(ci->state & CI_C) && lim < ci->top)
+      lim = ci->top;
+  }
+  for (o = L1->stack; o < L1->top; o++)
+    markobject(st, o);
+  for (; o <= lim; o++)
+    setnilvalue(o);
+  checkstacksizes(L1, lim);
+}
+
+
+static void propagatemarks (GCState *st) {
+  while (st->tmark) {  /* traverse marked objects */
+    switch (st->tmark->gch.tt) {
+      case LUA_TTABLE: {
+        Table *h = gcotoh(st->tmark);
+        st->tmark = h->gclist;
+        traversetable(st, h);
+        break;
+      }
+      case LUA_TFUNCTION: {
+        Closure *cl = gcotocl(st->tmark);
+        st->tmark = cl->c.gclist;
+        traverseclosure(st, cl);
+        break;
+      }
+      case LUA_TTHREAD: {
+        lua_State *th = gcototh(st->tmark);
+        st->tmark = th->gclist;
+        traversestack(st, th);
+        break;
+      }
+      case LUA_TPROTO: {
+        Proto *p = gcotop(st->tmark);
+        st->tmark = p->gclist;
+        traverseproto(st, p);
+        break;
+      }
+      default: lua_assert(0);
+    }
+  }
+}
+
+
+static int valismarked (const TObject *o) {
+  if (ttisstring(o))
+    stringmark(tsvalue(o));  /* strings are `values', so are never weak */
+  return !iscollectable(o) || testbit(o->value.gc->gch.marked, 0);
+}
+
+
+/*
+** clear collected keys from weaktables
+*/
+static void cleartablekeys (GCObject *l) {
+  while (l) {
+    Table *h = gcotoh(l);
+    int i = sizenode(h);
+    lua_assert(h->marked & KEYWEAK);
+    while (i--) {
+      Node *n = gnode(h, i);
+      if (!valismarked(gkey(n)))  /* key was collected? */
+        removekey(n);  /* remove entry from table */
+    }
+    l = h->gclist;
+  }
+}
+
+
+/*
+** clear collected values from weaktables
+*/
+static void cleartablevalues (GCObject *l) {
+  while (l) {
+    Table *h = gcotoh(l);
+    int i = h->sizearray;
+    lua_assert(h->marked & VALUEWEAK);
+    while (i--) {
+      TObject *o = &h->array[i];
+      if (!valismarked(o))  /* value was collected? */
+        setnilvalue(o);  /* remove value */
+    }
+    i = sizenode(h);
+    while (i--) {
+      Node *n = gnode(h, i);
+      if (!valismarked(gval(n)))  /* value was collected? */
+        removekey(n);  /* remove entry from table */
+    }
+    l = h->gclist;
+  }
+}
+
+
+static void freeobj (lua_State *L, GCObject *o) {
+  switch (o->gch.tt) {
+    case LUA_TPROTO: luaF_freeproto(L, gcotop(o)); break;
+    case LUA_TFUNCTION: luaF_freeclosure(L, gcotocl(o)); break;
+    case LUA_TUPVAL: luaM_freelem(L, gcotouv(o)); break;
+    case LUA_TTABLE: luaH_free(L, gcotoh(o)); break;
+    case LUA_TTHREAD: {
+      lua_assert(gcototh(o) != L && gcototh(o) != G(L)->mainthread);
+      luaE_freethread(L, gcototh(o));
+      break;
+    }
+    case LUA_TSTRING: {
+      luaM_free(L, o, sizestring(gcotots(o)->tsv.len));
+      break;
+    }
+    case LUA_TUSERDATA: {
+      luaM_free(L, o, sizeudata(gcotou(o)->uv.len));
+      break;
+    }
+    default: lua_assert(0);
+  }
+}
+
+
+static int sweeplist (lua_State *L, GCObject **p, int limit) {
+  GCObject *curr;
+  int count = 0;  /* number of collected items */
+  while ((curr = *p) != NULL) {
+    if (curr->gch.marked > limit) {
+      unmark(curr);
+      p = &curr->gch.next;
+    }
+    else {
+      count++;
+      *p = curr->gch.next;
+      freeobj(L, curr);
+    }
+  }
+  return count;
+}
+
+
+static void sweepstrings (lua_State *L, int all) {
+  int i;
+  for (i=0; i<G(L)->strt.size; i++) {  /* for each list */
+    G(L)->strt.nuse -= sweeplist(L, &G(L)->strt.hash[i], all);
+  }
+}
+
+
+static void checkSizes (lua_State *L) {
+  /* check size of string hash */
+  if (G(L)->strt.nuse < cast(ls_nstr, G(L)->strt.size/4) &&
+      G(L)->strt.size > MINSTRTABSIZE*2)
+    luaS_resize(L, G(L)->strt.size/2);  /* table is too big */
+  /* check size of buffer */
+  if (luaZ_sizebuffer(&G(L)->buff) > LUA_MINBUFFER*2) {  /* buffer too big? */
+    size_t newsize = luaZ_sizebuffer(&G(L)->buff) / 2;
+    luaZ_resizebuffer(L, &G(L)->buff, newsize);
+  }
+  G(L)->GCthreshold = 2*G(L)->nblocks;  /* new threshold */
+}
+
+
+static void do1gcTM (lua_State *L, Udata *udata) {
+  const TObject *tm = fasttm(L, udata->uv.metatable, TM_GC);
+  if (tm != NULL) {
+    setobj2s(L->top, tm);
+    setuvalue(L->top+1, udata);
+    L->top += 2;
+    luaD_call(L, L->top - 2, 0);
+  }
+}
+
+
+void luaC_callGCTM (lua_State *L) {
+  lu_byte oldah = L->allowhook;
+  L->allowhook = 0;  /* stop debug hooks during GC tag methods */
+  L->top++;  /* reserve space to keep udata while runs its gc method */
+  while (G(L)->tmudata != NULL) {
+    GCObject *o = G(L)->tmudata;
+    Udata *udata = gcotou(o);
+    G(L)->tmudata = udata->uv.next;  /* remove udata from `tmudata' */
+    udata->uv.next = G(L)->rootudata;  /* return it to `root' list */
+    G(L)->rootudata = o;
+    setuvalue(L->top - 1, udata);  /* keep a reference to it */
+    unmark(o);
+    markfinalized(udata);
+    do1gcTM(L, udata);
+  }
+  L->top--;
+  L->allowhook = oldah;  /* restore hooks */
+}
+
+
+void luaC_sweep (lua_State *L, int all) {
+  if (all) all = 256;  /* larger than any mark */
+  sweeplist(L, &G(L)->rootudata, all);
+  sweepstrings(L, all);
+  sweeplist(L, &G(L)->rootgc, all);
+}
+
+
+/* mark root set */
+static void markroot (GCState *st, lua_State *L) {
+  global_State *g = st->g;
+  markobject(st, defaultmeta(L));
+  markobject(st, registry(L));
+  traversestack(st, g->mainthread);
+  if (L != g->mainthread)  /* another thread is running? */
+    markvalue(st, L);  /* cannot collect it */
+}
+
+
+static void mark (lua_State *L) {
+  GCState st;
+  GCObject *wkv;
+  st.g = G(L);
+  st.tmark = NULL;
+  st.wkv = st.wk = st.wv = NULL;
+  markroot(&st, L);
+  propagatemarks(&st);  /* mark all reachable objects */
+  cleartablevalues(st.wkv);
+  cleartablevalues(st.wv);
+  wkv = st.wkv;  /* keys must be cleared after preserving udata */
+  st.wkv = NULL;
+  st.wv = NULL;
+  luaC_separateudata(L);  /* separate userdata to be preserved */
+  marktmu(&st);  /* mark `preserved' userdata */
+  propagatemarks(&st);  /* remark, to propagate `preserveness' */
+  cleartablekeys(wkv);
+  /* `propagatemarks' may resuscitate some weak tables; clear them too */
+  cleartablekeys(st.wk);
+  cleartablevalues(st.wv);
+  cleartablekeys(st.wkv);
+  cleartablevalues(st.wkv);
+}
+
+
+void luaC_collectgarbage (lua_State *L) {
+  mark(L);
+  luaC_sweep(L, 0);
+  checkSizes(L);
+  luaC_callGCTM(L);
+}
+
+
+void luaC_link (lua_State *L, GCObject *o, lu_byte tt) {
+  o->gch.next = G(L)->rootgc;
+  G(L)->rootgc = o;
+  o->gch.marked = 0;
+  o->gch.tt = tt;
+}
+
diff --git a/main/source/lua/src/lgc.h b/main/source/lua/src/lgc.h
new file mode 100644
index 00000000..9fc593a2
--- /dev/null
+++ b/main/source/lua/src/lgc.h
@@ -0,0 +1,25 @@
+/*
+** $Id: lgc.h,v 1.19 2003/02/28 19:45:15 roberto Exp $
+** Garbage Collector
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lgc_h
+#define lgc_h
+
+
+#include "lobject.h"
+
+
+#define luaC_checkGC(L) { lua_assert(!(L->ci->state & CI_CALLING)); \
+	if (G(L)->nblocks >= G(L)->GCthreshold) luaC_collectgarbage(L); }
+
+
+void luaC_separateudata (lua_State *L);
+void luaC_callGCTM (lua_State *L);
+void luaC_sweep (lua_State *L, int all);
+void luaC_collectgarbage (lua_State *L);
+void luaC_link (lua_State *L, GCObject *o, lu_byte tt);
+
+
+#endif
diff --git a/main/source/lua/src/lib/lauxlib.c b/main/source/lua/src/lib/lauxlib.c
new file mode 100644
index 00000000..422368c7
--- /dev/null
+++ b/main/source/lua/src/lib/lauxlib.c
@@ -0,0 +1,591 @@
+/*
+** $Id: lauxlib.c,v 1.100 2003/04/07 14:35:00 roberto Exp $
+** Auxiliary functions for building Lua libraries
+** See Copyright Notice in lua.h
+*/
+
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+
+
+/* This file uses only the official API of Lua.
+** Any function declared here could be written as an application function.
+*/
+
+#define lauxlib_c
+
+#include "lua.h"
+
+#include "lauxlib.h"
+
+
+/* number of prereserved references (for internal use) */
+#define RESERVED_REFS	2
+
+/* reserved references */
+#define FREELIST_REF	1	/* free list of references */
+#define ARRAYSIZE_REF	2	/* array sizes */
+
+
+/* convert a stack index to positive */
+#define abs_index(L, i)		((i) > 0 || (i) <= LUA_REGISTRYINDEX ? (i) : \
+					lua_gettop(L) + (i) + 1)
+
+
+/*
+** {======================================================
+** Error-report functions
+** =======================================================
+*/
+
+
+LUALIB_API int luaL_argerror (lua_State *L, int narg, const char *extramsg) {
+  lua_Debug ar;
+  lua_getstack(L, 0, &ar);
+  lua_getinfo(L, "n", &ar);
+  if (strcmp(ar.namewhat, "method") == 0) {
+    narg--;  /* do not count `self' */
+    if (narg == 0)  /* error is in the self argument itself? */
+      return luaL_error(L, "calling `%s' on bad self (%s)", ar.name, extramsg);
+  }
+  if (ar.name == NULL)
+    ar.name = "?";
+  return luaL_error(L, "bad argument #%d to `%s' (%s)",
+                        narg, ar.name, extramsg);
+}
+
+
+LUALIB_API int luaL_typerror (lua_State *L, int narg, const char *tname) {
+  const char *msg = lua_pushfstring(L, "%s expected, got %s",
+                                    tname, lua_typename(L, lua_type(L,narg)));
+  return luaL_argerror(L, narg, msg);
+}
+
+
+static void tag_error (lua_State *L, int narg, int tag) {
+  luaL_typerror(L, narg, lua_typename(L, tag)); 
+}
+
+
+LUALIB_API void luaL_where (lua_State *L, int level) {
+  lua_Debug ar;
+  if (lua_getstack(L, level, &ar)) {  /* check function at level */
+    lua_getinfo(L, "Snl", &ar);  /* get info about it */
+    if (ar.currentline > 0) {  /* is there info? */
+      lua_pushfstring(L, "%s:%d: ", ar.short_src, ar.currentline);
+      return;
+    }
+  }
+  lua_pushliteral(L, "");  /* else, no information available... */
+}
+
+
+LUALIB_API int luaL_error (lua_State *L, const char *fmt, ...) {
+  va_list argp;
+  va_start(argp, fmt);
+  luaL_where(L, 1);
+  lua_pushvfstring(L, fmt, argp);
+  va_end(argp);
+  lua_concat(L, 2);
+  return lua_error(L);
+}
+
+/* }====================================================== */
+
+
+LUALIB_API int luaL_findstring (const char *name, const char *const list[]) {
+  int i;
+  for (i=0; list[i]; i++)
+    if (strcmp(list[i], name) == 0)
+      return i;
+  return -1;  /* name not found */
+}
+
+
+LUALIB_API int luaL_newmetatable (lua_State *L, const char *tname) {
+  lua_pushstring(L, tname);
+  lua_rawget(L, LUA_REGISTRYINDEX);  /* get registry.name */
+  if (!lua_isnil(L, -1))  /* name already in use? */
+    return 0;  /* leave previous value on top, but return 0 */
+  lua_pop(L, 1);
+  lua_newtable(L);  /* create metatable */
+  lua_pushstring(L, tname);
+  lua_pushvalue(L, -2);
+  lua_rawset(L, LUA_REGISTRYINDEX);  /* registry.name = metatable */
+  lua_pushvalue(L, -1);
+  lua_pushstring(L, tname);
+  lua_rawset(L, LUA_REGISTRYINDEX);  /* registry[metatable] = name */
+  return 1;
+}
+
+
+LUALIB_API void  luaL_getmetatable (lua_State *L, const char *tname) {
+  lua_pushstring(L, tname);
+  lua_rawget(L, LUA_REGISTRYINDEX);
+}
+
+
+LUALIB_API void *luaL_checkudata (lua_State *L, int ud, const char *tname) {
+  const char *tn;
+  if (!lua_getmetatable(L, ud)) return NULL;  /* no metatable? */
+  lua_rawget(L, LUA_REGISTRYINDEX);  /* get registry[metatable] */
+  tn = lua_tostring(L, -1);
+  if (tn && (strcmp(tn, tname) == 0)) {
+    lua_pop(L, 1);
+    return lua_touserdata(L, ud);
+  }
+  else {
+    lua_pop(L, 1);
+    return NULL;
+  }
+}
+
+
+LUALIB_API void luaL_checkstack (lua_State *L, int space, const char *mes) {
+  if (!lua_checkstack(L, space))
+    luaL_error(L, "stack overflow (%s)", mes);
+}
+
+
+LUALIB_API void luaL_checktype (lua_State *L, int narg, int t) {
+  if (lua_type(L, narg) != t)
+    tag_error(L, narg, t);
+}
+
+
+LUALIB_API void luaL_checkany (lua_State *L, int narg) {
+  if (lua_type(L, narg) == LUA_TNONE)
+    luaL_argerror(L, narg, "value expected");
+}
+
+
+LUALIB_API const char *luaL_checklstring (lua_State *L, int narg, size_t *len) {
+  const char *s = lua_tostring(L, narg);
+  if (!s) tag_error(L, narg, LUA_TSTRING);
+  if (len) *len = lua_strlen(L, narg);
+  return s;
+}
+
+
+LUALIB_API const char *luaL_optlstring (lua_State *L, int narg,
+                                        const char *def, size_t *len) {
+  if (lua_isnoneornil(L, narg)) {
+    if (len)
+      *len = (def ? strlen(def) : 0);
+    return def;
+  }
+  else return luaL_checklstring(L, narg, len);
+}
+
+
+LUALIB_API lua_Number luaL_checknumber (lua_State *L, int narg) {
+  lua_Number d = lua_tonumber(L, narg);
+  if (d == 0 && !lua_isnumber(L, narg))  /* avoid extra test when d is not 0 */
+    tag_error(L, narg, LUA_TNUMBER);
+  return d;
+}
+
+
+LUALIB_API lua_Number luaL_optnumber (lua_State *L, int narg, lua_Number def) {
+  if (lua_isnoneornil(L, narg)) return def;
+  else return luaL_checknumber(L, narg);
+}
+
+
+LUALIB_API int luaL_getmetafield (lua_State *L, int obj, const char *event) {
+  if (!lua_getmetatable(L, obj))  /* no metatable? */
+    return 0;
+  lua_pushstring(L, event);
+  lua_rawget(L, -2);
+  if (lua_isnil(L, -1)) {
+    lua_pop(L, 2);  /* remove metatable and metafield */
+    return 0;
+  }
+  else {
+    lua_remove(L, -2);  /* remove only metatable */
+    return 1;
+  }
+}
+
+
+LUALIB_API int luaL_callmeta (lua_State *L, int obj, const char *event) {
+  obj = abs_index(L, obj);
+  if (!luaL_getmetafield(L, obj, event))  /* no metafield? */
+    return 0;
+  lua_pushvalue(L, obj);
+  lua_call(L, 1, 1);
+  return 1;
+}
+
+
+LUALIB_API void luaL_openlib (lua_State *L, const char *libname,
+                              const luaL_reg *l, int nup) {
+  if (libname) {
+    lua_pushstring(L, libname);
+    lua_gettable(L, LUA_GLOBALSINDEX);  /* check whether lib already exists */
+    if (lua_isnil(L, -1)) {  /* no? */
+      lua_pop(L, 1);
+      lua_newtable(L);  /* create it */
+      lua_pushstring(L, libname);
+      lua_pushvalue(L, -2);
+      lua_settable(L, LUA_GLOBALSINDEX);  /* register it with given name */
+    }
+    lua_insert(L, -(nup+1));  /* move library table to below upvalues */
+  }
+  for (; l->name; l++) {
+    int i;
+    lua_pushstring(L, l->name);
+    for (i=0; i<nup; i++)  /* copy upvalues to the top */
+      lua_pushvalue(L, -(nup+1));
+    lua_pushcclosure(L, l->func, nup);
+    lua_settable(L, -(nup+3));
+  }
+  lua_pop(L, nup);  /* remove upvalues */
+}
+
+
+
+/*
+** {======================================================
+** getn-setn: size for arrays
+** =======================================================
+*/
+
+static int checkint (lua_State *L, int topop) {
+  int n = (int)lua_tonumber(L, -1);
+  if (n == 0 && !lua_isnumber(L, -1)) n = -1;
+  lua_pop(L, topop);
+  return n;
+}
+
+
+static void getsizes (lua_State *L) {
+  lua_rawgeti(L, LUA_REGISTRYINDEX, ARRAYSIZE_REF);
+  if (lua_isnil(L, -1)) {  /* no `size' table? */
+    lua_pop(L, 1);  /* remove nil */
+    lua_newtable(L);  /* create it */
+    lua_pushvalue(L, -1);  /* `size' will be its own metatable */
+    lua_setmetatable(L, -2);
+    lua_pushliteral(L, "__mode");
+    lua_pushliteral(L, "k");
+    lua_rawset(L, -3);  /* metatable(N).__mode = "k" */
+    lua_pushvalue(L, -1);
+    lua_rawseti(L, LUA_REGISTRYINDEX, ARRAYSIZE_REF);  /* store in register */
+  }
+}
+
+
+void luaL_setn (lua_State *L, int t, int n) {
+  t = abs_index(L, t);
+  lua_pushliteral(L, "n");
+  lua_rawget(L, t);
+  if (checkint(L, 1) >= 0) {  /* is there a numeric field `n'? */
+    lua_pushliteral(L, "n");  /* use it */
+    lua_pushnumber(L, (lua_Number)n);
+    lua_rawset(L, t);
+  }
+  else {  /* use `sizes' */
+    getsizes(L);
+    lua_pushvalue(L, t);
+    lua_pushnumber(L, (lua_Number)n);
+    lua_rawset(L, -3);  /* sizes[t] = n */
+    lua_pop(L, 1);  /* remove `sizes' */
+  }
+}
+
+
+int luaL_getn (lua_State *L, int t) {
+  int n;
+  t = abs_index(L, t);
+  lua_pushliteral(L, "n");  /* try t.n */
+  lua_rawget(L, t);
+  if ((n = checkint(L, 1)) >= 0) return n;
+  getsizes(L);  /* else try sizes[t] */
+  lua_pushvalue(L, t);
+  lua_rawget(L, -2);
+  if ((n = checkint(L, 2)) >= 0) return n;
+  for (n = 1; ; n++) {  /* else must count elements */
+    lua_rawgeti(L, t, n);
+    if (lua_isnil(L, -1)) break;
+    lua_pop(L, 1);
+  }
+  lua_pop(L, 1);
+  return n - 1;
+}
+
+/* }====================================================== */
+
+
+
+/*
+** {======================================================
+** Generic Buffer manipulation
+** =======================================================
+*/
+
+
+#define bufflen(B)	((B)->p - (B)->buffer)
+#define bufffree(B)	((size_t)(LUAL_BUFFERSIZE - bufflen(B)))
+
+#define LIMIT	(LUA_MINSTACK/2)
+
+
+static int emptybuffer (luaL_Buffer *B) {
+  size_t l = bufflen(B);
+  if (l == 0) return 0;  /* put nothing on stack */
+  else {
+    lua_pushlstring(B->L, B->buffer, l);
+    B->p = B->buffer;
+    B->lvl++;
+    return 1;
+  }
+}
+
+
+static void adjuststack (luaL_Buffer *B) {
+  if (B->lvl > 1) {
+    lua_State *L = B->L;
+    int toget = 1;  /* number of levels to concat */
+    size_t toplen = lua_strlen(L, -1);
+    do {
+      size_t l = lua_strlen(L, -(toget+1));
+      if (B->lvl - toget + 1 >= LIMIT || toplen > l) {
+        toplen += l;
+        toget++;
+      }
+      else break;
+    } while (toget < B->lvl);
+    lua_concat(L, toget);
+    B->lvl = B->lvl - toget + 1;
+  }
+}
+
+
+LUALIB_API char *luaL_prepbuffer (luaL_Buffer *B) {
+  if (emptybuffer(B))
+    adjuststack(B);
+  return B->buffer;
+}
+
+
+LUALIB_API void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l) {
+  while (l--)
+    luaL_putchar(B, *s++);
+}
+
+
+LUALIB_API void luaL_addstring (luaL_Buffer *B, const char *s) {
+  luaL_addlstring(B, s, strlen(s));
+}
+
+
+LUALIB_API void luaL_pushresult (luaL_Buffer *B) {
+  emptybuffer(B);
+  lua_concat(B->L, B->lvl);
+  B->lvl = 1;
+}
+
+
+LUALIB_API void luaL_addvalue (luaL_Buffer *B) {
+  lua_State *L = B->L;
+  size_t vl = lua_strlen(L, -1);
+  if (vl <= bufffree(B)) {  /* fit into buffer? */
+    memcpy(B->p, lua_tostring(L, -1), vl);  /* put it there */
+    B->p += vl;
+    lua_pop(L, 1);  /* remove from stack */
+  }
+  else {
+    if (emptybuffer(B))
+      lua_insert(L, -2);  /* put buffer before new value */
+    B->lvl++;  /* add new value into B stack */
+    adjuststack(B);
+  }
+}
+
+
+LUALIB_API void luaL_buffinit (lua_State *L, luaL_Buffer *B) {
+  B->L = L;
+  B->p = B->buffer;
+  B->lvl = 0;
+}
+
+/* }====================================================== */
+
+
+LUALIB_API int luaL_ref (lua_State *L, int t) {
+  int ref;
+  t = abs_index(L, t);
+  if (lua_isnil(L, -1)) {
+    lua_pop(L, 1);  /* remove from stack */
+    return LUA_REFNIL;  /* `nil' has a unique fixed reference */
+  }
+  lua_rawgeti(L, t, FREELIST_REF);  /* get first free element */
+  ref = (int)lua_tonumber(L, -1);  /* ref = t[FREELIST_REF] */
+  lua_pop(L, 1);  /* remove it from stack */
+  if (ref != 0) {  /* any free element? */
+    lua_rawgeti(L, t, ref);  /* remove it from list */
+    lua_rawseti(L, t, FREELIST_REF);  /* (t[FREELIST_REF] = t[ref]) */
+  }
+  else {  /* no free elements */
+    ref = luaL_getn(L, t);
+    if (ref < RESERVED_REFS)
+      ref = RESERVED_REFS;  /* skip reserved references */
+    ref++;  /* create new reference */
+    luaL_setn(L, t, ref);
+  }
+  lua_rawseti(L, t, ref);
+  return ref;
+}
+
+
+LUALIB_API void luaL_unref (lua_State *L, int t, int ref) {
+  if (ref >= 0) {
+    t = abs_index(L, t);
+    lua_rawgeti(L, t, FREELIST_REF);
+    lua_rawseti(L, t, ref);  /* t[ref] = t[FREELIST_REF] */
+    lua_pushnumber(L, (lua_Number)ref);
+    lua_rawseti(L, t, FREELIST_REF);  /* t[FREELIST_REF] = ref */
+  }
+}
+
+
+
+/*
+** {======================================================
+** Load functions
+** =======================================================
+*/
+
+typedef struct LoadF {
+  FILE *f;
+  char buff[LUAL_BUFFERSIZE];
+} LoadF;
+
+
+static const char *getF (lua_State *L, void *ud, size_t *size) {
+  LoadF *lf = (LoadF *)ud;
+  (void)L;
+  if (feof(lf->f)) return NULL;
+  *size = fread(lf->buff, 1, LUAL_BUFFERSIZE, lf->f);
+  return (*size > 0) ? lf->buff : NULL;
+}
+
+
+static int errfile (lua_State *L, int fnameindex) {
+  const char *filename = lua_tostring(L, fnameindex) + 1;
+  lua_pushfstring(L, "cannot read %s: %s", filename, strerror(errno));
+  lua_remove(L, fnameindex);
+  return LUA_ERRFILE;
+}
+
+
+LUALIB_API int luaL_loadfile (lua_State *L, const char *filename) {
+  LoadF lf;
+  int status, readstatus;
+  int c;
+  int fnameindex = lua_gettop(L) + 1;  /* index of filename on the stack */
+  if (filename == NULL) {
+    lua_pushliteral(L, "=stdin");
+    lf.f = stdin;
+  }
+  else {
+    lua_pushfstring(L, "@%s", filename);
+    lf.f = fopen(filename, "r");
+  }
+  if (lf.f == NULL) return errfile(L, fnameindex);  /* unable to open file */
+  c = ungetc(getc(lf.f), lf.f);
+  if (!(isspace(c) || isprint(c)) && lf.f != stdin) {  /* binary file? */
+    fclose(lf.f);
+    lf.f = fopen(filename, "rb");  /* reopen in binary mode */
+    if (lf.f == NULL) return errfile(L, fnameindex); /* unable to reopen file */
+  }
+  status = lua_load(L, getF, &lf, lua_tostring(L, -1));
+  readstatus = ferror(lf.f);
+  if (lf.f != stdin) fclose(lf.f);  /* close file (even in case of errors) */
+  if (readstatus) {
+    lua_settop(L, fnameindex);  /* ignore results from `lua_load' */
+    return errfile(L, fnameindex);
+  }
+  lua_remove(L, fnameindex);
+  return status;
+}
+
+
+typedef struct LoadS {
+  const char *s;
+  size_t size;
+} LoadS;
+
+
+static const char *getS (lua_State *L, void *ud, size_t *size) {
+  LoadS *ls = (LoadS *)ud;
+  (void)L;
+  if (ls->size == 0) return NULL;
+  *size = ls->size;
+  ls->size = 0;
+  return ls->s;
+}
+
+
+LUALIB_API int luaL_loadbuffer (lua_State *L, const char *buff, size_t size,
+                                const char *name) {
+  LoadS ls;
+  ls.s = buff;
+  ls.size = size;
+  return lua_load(L, getS, &ls, name);
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** compatibility code
+** =======================================================
+*/
+
+
+static void callalert (lua_State *L, int status) {
+  if (status != 0) {
+    lua_getglobal(L, "_ALERT");
+    if (lua_isfunction(L, -1)) {
+      lua_insert(L, -2);
+      lua_call(L, 1, 0);
+    }
+    else {  /* no _ALERT function; print it on stderr */
+      fprintf(stderr, "%s\n", lua_tostring(L, -2));
+      lua_pop(L, 2);  /* remove error message and _ALERT */
+    }
+  }
+}
+
+
+static int aux_do (lua_State *L, int status) {
+  if (status == 0) {  /* parse OK? */
+    status = lua_pcall(L, 0, LUA_MULTRET, 0);  /* call main */
+  }
+  callalert(L, status);
+  return status;
+}
+
+
+LUALIB_API int lua_dofile (lua_State *L, const char *filename) {
+  return aux_do(L, luaL_loadfile(L, filename));
+}
+
+
+LUALIB_API int lua_dobuffer (lua_State *L, const char *buff, size_t size,
+                          const char *name) {
+  return aux_do(L, luaL_loadbuffer(L, buff, size, name));
+}
+
+
+LUALIB_API int lua_dostring (lua_State *L, const char *str) {
+  return lua_dobuffer(L, str, strlen(str), str);
+}
+
+/* }====================================================== */
diff --git a/main/source/lua/src/lib/lbaselib.c b/main/source/lua/src/lib/lbaselib.c
new file mode 100644
index 00000000..efdd89ab
--- /dev/null
+++ b/main/source/lua/src/lib/lbaselib.c
@@ -0,0 +1,674 @@
+/*
+** $Id: lbaselib.c,v 1.130 2003/04/03 13:35:34 roberto Exp $
+** Basic library
+** See Copyright Notice in lua.h
+*/
+
+
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define lbaselib_c
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+
+
+/*
+** If your system does not support `stdout', you can just remove this function.
+** If you need, you can define your own `print' function, following this
+** model but changing `fputs' to put the strings at a proper place
+** (a console window or a log file, for instance).
+*/
+static int luaB_print (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  int i;
+  lua_getglobal(L, "tostring");
+  for (i=1; i<=n; i++) {
+    const char *s;
+    lua_pushvalue(L, -1);  /* function to be called */
+    lua_pushvalue(L, i);   /* value to print */
+    lua_call(L, 1, 1);
+    s = lua_tostring(L, -1);  /* get result */
+    if (s == NULL)
+      return luaL_error(L, "`tostring' must return a string to `print'");
+    if (i>1) fputs("\t", stdout);
+    fputs(s, stdout);
+    lua_pop(L, 1);  /* pop result */
+  }
+  fputs("\n", stdout);
+  return 0;
+}
+
+
+static int luaB_tonumber (lua_State *L) {
+  int base = luaL_optint(L, 2, 10);
+  if (base == 10) {  /* standard conversion */
+    luaL_checkany(L, 1);
+    if (lua_isnumber(L, 1)) {
+      lua_pushnumber(L, lua_tonumber(L, 1));
+      return 1;
+    }
+  }
+  else {
+    const char *s1 = luaL_checkstring(L, 1);
+    char *s2;
+    unsigned long n;
+    luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range");
+    n = strtoul(s1, &s2, base);
+    if (s1 != s2) {  /* at least one valid digit? */
+      while (isspace((unsigned char)(*s2))) s2++;  /* skip trailing spaces */
+      if (*s2 == '\0') {  /* no invalid trailing characters? */
+        lua_pushnumber(L, (lua_Number)n);
+        return 1;
+      }
+    }
+  }
+  lua_pushnil(L);  /* else not a number */
+  return 1;
+}
+
+
+static int luaB_error (lua_State *L) {
+  int level = luaL_optint(L, 2, 1);
+  luaL_checkany(L, 1);
+  if (!lua_isstring(L, 1) || level == 0)
+    lua_pushvalue(L, 1);  /* propagate error message without changes */
+  else {  /* add extra information */
+    luaL_where(L, level);
+    lua_pushvalue(L, 1);
+    lua_concat(L, 2);
+  }
+  return lua_error(L);
+}
+
+
+static int luaB_getmetatable (lua_State *L) {
+  luaL_checkany(L, 1);
+  if (!lua_getmetatable(L, 1)) {
+    lua_pushnil(L);
+    return 1;  /* no metatable */
+  }
+  luaL_getmetafield(L, 1, "__metatable");
+  return 1;  /* returns either __metatable field (if present) or metatable */
+}
+
+
+static int luaB_setmetatable (lua_State *L) {
+  int t = lua_type(L, 2);
+  luaL_checktype(L, 1, LUA_TTABLE);
+  luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2,
+                    "nil or table expected");
+  if (luaL_getmetafield(L, 1, "__metatable"))
+    luaL_error(L, "cannot change a protected metatable");
+  lua_settop(L, 2);
+  lua_setmetatable(L, 1);
+  return 1;
+}
+
+
+static void getfunc (lua_State *L) {
+  if (lua_isfunction(L, 1)) lua_pushvalue(L, 1);
+  else {
+    lua_Debug ar;
+    int level = luaL_optint(L, 1, 1);
+    luaL_argcheck(L, level >= 0, 1, "level must be non-negative");
+    if (lua_getstack(L, level, &ar) == 0)
+      luaL_argerror(L, 1, "invalid level");
+    lua_getinfo(L, "f", &ar);
+    if (lua_isnil(L, -1))
+      luaL_error(L, "no function environment for tail call at level %d",
+                    level);
+  }
+}
+
+
+static int aux_getfenv (lua_State *L) {
+  lua_getfenv(L, -1);
+  lua_pushliteral(L, "__fenv");
+  lua_rawget(L, -2);
+  return !lua_isnil(L, -1);
+}
+
+
+static int luaB_getfenv (lua_State *L) {
+  getfunc(L);
+  if (!aux_getfenv(L))  /* __fenv not defined? */
+    lua_pop(L, 1);  /* remove it, to return real environment */
+  return 1;
+}
+
+
+static int luaB_setfenv (lua_State *L) {
+  luaL_checktype(L, 2, LUA_TTABLE);
+  getfunc(L);
+  if (aux_getfenv(L))  /* __fenv defined? */
+    luaL_error(L, "`setfenv' cannot change a protected environment");
+  else
+    lua_pop(L, 2);  /* remove __fenv and real environment table */
+  lua_pushvalue(L, 2);
+  if (lua_isnumber(L, 1) && lua_tonumber(L, 1) == 0)
+    lua_replace(L, LUA_GLOBALSINDEX);
+  else if (lua_setfenv(L, -2) == 0)
+    luaL_error(L, "`setfenv' cannot change environment of given function");
+  return 0;
+}
+
+
+static int luaB_rawequal (lua_State *L) {
+  luaL_checkany(L, 1);
+  luaL_checkany(L, 2);
+  lua_pushboolean(L, lua_rawequal(L, 1, 2));
+  return 1;
+}
+
+
+static int luaB_rawget (lua_State *L) {
+  luaL_checktype(L, 1, LUA_TTABLE);
+  luaL_checkany(L, 2);
+  lua_rawget(L, 1);
+  return 1;
+}
+
+static int luaB_rawset (lua_State *L) {
+  luaL_checktype(L, 1, LUA_TTABLE);
+  luaL_checkany(L, 2);
+  luaL_checkany(L, 3);
+  lua_rawset(L, 1);
+  return 1;
+}
+
+
+static int luaB_gcinfo (lua_State *L) {
+  lua_pushnumber(L, (lua_Number)lua_getgccount(L));
+  lua_pushnumber(L, (lua_Number)lua_getgcthreshold(L));
+  return 2;
+}
+
+
+static int luaB_collectgarbage (lua_State *L) {
+  lua_setgcthreshold(L, luaL_optint(L, 1, 0));
+  return 0;
+}
+
+
+static int luaB_type (lua_State *L) {
+  luaL_checkany(L, 1);
+  lua_pushstring(L, lua_typename(L, lua_type(L, 1)));
+  return 1;
+}
+
+
+static int luaB_next (lua_State *L) {
+  luaL_checktype(L, 1, LUA_TTABLE);
+  lua_settop(L, 2);  /* create a 2nd argument if there isn't one */
+  if (lua_next(L, 1))
+    return 2;
+  else {
+    lua_pushnil(L);
+    return 1;
+  }
+}
+
+
+static int luaB_pairs (lua_State *L) {
+  luaL_checktype(L, 1, LUA_TTABLE);
+  lua_pushliteral(L, "next");
+  lua_rawget(L, LUA_GLOBALSINDEX);  /* return generator, */
+  lua_pushvalue(L, 1);  /* state, */
+  lua_pushnil(L);  /* and initial value */
+  return 3;
+}
+
+
+static int luaB_ipairs (lua_State *L) {
+  lua_Number i = lua_tonumber(L, 2);
+  luaL_checktype(L, 1, LUA_TTABLE);
+  if (i == 0 && lua_isnone(L, 2)) {  /* `for' start? */
+    lua_pushliteral(L, "ipairs");
+    lua_rawget(L, LUA_GLOBALSINDEX);  /* return generator, */
+    lua_pushvalue(L, 1);  /* state, */
+    lua_pushnumber(L, 0);  /* and initial value */
+    return 3;
+  }
+  else {  /* `for' step */
+    i++;  /* next value */
+    lua_pushnumber(L, i);
+    lua_rawgeti(L, 1, (int)i);
+    return (lua_isnil(L, -1)) ? 0 : 2;
+  }
+}
+
+
+static int load_aux (lua_State *L, int status) {
+  if (status == 0)  /* OK? */
+    return 1;
+  else {
+    lua_pushnil(L);
+    lua_insert(L, -2);  /* put before error message */
+    return 2;  /* return nil plus error message */
+  }
+}
+
+
+static int luaB_loadstring (lua_State *L) {
+  size_t l;
+  const char *s = luaL_checklstring(L, 1, &l);
+  const char *chunkname = luaL_optstring(L, 2, s);
+  return load_aux(L, luaL_loadbuffer(L, s, l, chunkname));
+}
+
+
+static int luaB_loadfile (lua_State *L) {
+  const char *fname = luaL_optstring(L, 1, NULL);
+  return load_aux(L, luaL_loadfile(L, fname));
+}
+
+
+static int luaB_dofile (lua_State *L) {
+  const char *fname = luaL_optstring(L, 1, NULL);
+  int status = luaL_loadfile(L, fname);
+  if (status != 0) lua_error(L);
+  lua_call(L, 0, LUA_MULTRET);
+  return lua_gettop(L) - 1;
+}
+
+
+static int luaB_assert (lua_State *L) {
+  luaL_checkany(L, 1);
+  if (!lua_toboolean(L, 1))
+    return luaL_error(L, "%s", luaL_optstring(L, 2, "assertion failed!"));
+  lua_settop(L, 1);
+  return 1;
+}
+
+
+static int luaB_unpack (lua_State *L) {
+  int n, i;
+  luaL_checktype(L, 1, LUA_TTABLE);
+  n = luaL_getn(L, 1);
+  luaL_checkstack(L, n, "table too big to unpack");
+  for (i=1; i<=n; i++)  /* push arg[1...n] */
+    lua_rawgeti(L, 1, i);
+  return n;
+}
+
+
+static int luaB_pcall (lua_State *L) {
+  int status;
+  luaL_checkany(L, 1);
+  status = lua_pcall(L, lua_gettop(L) - 1, LUA_MULTRET, 0);
+  lua_pushboolean(L, (status == 0));
+  lua_insert(L, 1);
+  return lua_gettop(L);  /* return status + all results */
+}
+
+
+static int luaB_xpcall (lua_State *L) {
+  int status;
+  luaL_checkany(L, 2);
+  lua_settop(L, 2);
+  lua_insert(L, 1);  /* put error function under function to be called */
+  status = lua_pcall(L, 0, LUA_MULTRET, 1);
+  lua_pushboolean(L, (status == 0));
+  lua_replace(L, 1);
+  return lua_gettop(L);  /* return status + all results */
+}
+
+
+static int luaB_tostring (lua_State *L) {
+  char buff[64];
+  luaL_checkany(L, 1);
+  if (luaL_callmeta(L, 1, "__tostring"))  /* is there a metafield? */
+    return 1;  /* use its value */
+  switch (lua_type(L, 1)) {
+    case LUA_TNUMBER:
+      lua_pushstring(L, lua_tostring(L, 1));
+      return 1;
+    case LUA_TSTRING:
+      lua_pushvalue(L, 1);
+      return 1;
+    case LUA_TBOOLEAN:
+      lua_pushstring(L, (lua_toboolean(L, 1) ? "true" : "false"));
+      return 1;
+    case LUA_TTABLE:
+      sprintf(buff, "table: %p", lua_topointer(L, 1));
+      break;
+    case LUA_TFUNCTION:
+      sprintf(buff, "function: %p", lua_topointer(L, 1));
+      break;
+    case LUA_TUSERDATA:
+    case LUA_TLIGHTUSERDATA:
+      sprintf(buff, "userdata: %p", lua_touserdata(L, 1));
+      break;
+    case LUA_TTHREAD:
+      sprintf(buff, "thread: %p", (void *)lua_tothread(L, 1));
+      break;
+    case LUA_TNIL:
+      lua_pushliteral(L, "nil");
+      return 1;
+  }
+  lua_pushstring(L, buff);
+  return 1;
+}
+
+
+static int luaB_newproxy (lua_State *L) {
+  lua_settop(L, 1);
+  lua_newuserdata(L, 0);  /* create proxy */
+  if (lua_toboolean(L, 1) == 0)
+    return 1;  /* no metatable */
+  else if (lua_isboolean(L, 1)) {
+    lua_newtable(L);  /* create a new metatable `m' ... */
+    lua_pushvalue(L, -1);  /* ... and mark `m' as a valid metatable */
+    lua_pushboolean(L, 1);
+    lua_rawset(L, lua_upvalueindex(1));  /* weaktable[m] = true */
+  }
+  else {
+    int validproxy = 0;  /* to check if weaktable[metatable(u)] == true */
+    if (lua_getmetatable(L, 1)) {
+      lua_rawget(L, lua_upvalueindex(1));
+      validproxy = lua_toboolean(L, -1);
+      lua_pop(L, 1);  /* remove value */
+    }
+    luaL_argcheck(L, validproxy, 1, "boolean or proxy expected");
+    lua_getmetatable(L, 1);  /* metatable is valid; get it */
+  }
+  lua_setmetatable(L, 2);
+  return 1;
+}
+
+
+/*
+** {======================================================
+** `require' function
+** =======================================================
+*/
+
+
+/* name of global that holds table with loaded packages */
+#define REQTAB		"_LOADED"
+
+/* name of global that holds the search path for packages */
+#define LUA_PATH	"LUA_PATH"
+
+#ifndef LUA_PATH_SEP
+#define LUA_PATH_SEP	';'
+#endif
+
+#ifndef LUA_PATH_MARK
+#define LUA_PATH_MARK	'?'
+#endif
+
+#ifndef LUA_PATH_DEFAULT
+#define LUA_PATH_DEFAULT	"?;?.lua"
+#endif
+
+
+static const char *getpath (lua_State *L) {
+  const char *path;
+  lua_getglobal(L, LUA_PATH);  /* try global variable */
+  path = lua_tostring(L, -1);
+  lua_pop(L, 1);
+  if (path) return path;
+  path = getenv(LUA_PATH);  /* else try environment variable */
+  if (path) return path;
+  return LUA_PATH_DEFAULT;  /* else use default */
+}
+
+
+static const char *pushnextpath (lua_State *L, const char *path) {
+  const char *l;
+  if (*path == '\0') return NULL;  /* no more paths */
+  if (*path == LUA_PATH_SEP) path++;  /* skip separator */
+  l = strchr(path, LUA_PATH_SEP);  /* find next separator */
+  if (l == NULL) l = path+strlen(path);
+  lua_pushlstring(L, path, l - path);  /* directory name */
+  return l;
+}
+
+
+static void pushcomposename (lua_State *L) {
+  const char *path = lua_tostring(L, -1);
+  const char *wild;
+  int n = 1;
+  while ((wild = strchr(path, LUA_PATH_MARK)) != NULL) {
+    /* is there stack space for prefix, name, and eventual last sufix? */
+    luaL_checkstack(L, 3, "too many marks in a path component");
+    lua_pushlstring(L, path, wild - path);  /* push prefix */
+    lua_pushvalue(L, 1);  /* push package name (in place of MARK) */
+    path = wild + 1;  /* continue after MARK */
+    n += 2;
+  }
+  lua_pushstring(L, path);  /* push last sufix (`n' already includes this) */
+  lua_concat(L, n);
+}
+
+
+static int luaB_require (lua_State *L) {
+  const char *path;
+  int status = LUA_ERRFILE;  /* not found (yet) */
+  luaL_checkstring(L, 1);
+  lua_settop(L, 1);
+  lua_getglobal(L, REQTAB);
+  if (!lua_istable(L, 2)) return luaL_error(L, "`" REQTAB "' is not a table");
+  path = getpath(L);
+  lua_pushvalue(L, 1);  /* check package's name in book-keeping table */
+  lua_rawget(L, 2);
+  if (lua_toboolean(L, -1))  /* is it there? */
+    return 1;  /* package is already loaded; return its result */
+  else {  /* must load it */
+    while (status == LUA_ERRFILE) {
+      lua_settop(L, 3);  /* reset stack position */
+      if ((path = pushnextpath(L, path)) == NULL) break;
+      pushcomposename(L);
+      status = luaL_loadfile(L, lua_tostring(L, -1));  /* try to load it */
+    }
+  }
+  switch (status) {
+    case 0: {
+      lua_getglobal(L, "_REQUIREDNAME");  /* save previous name */
+      lua_insert(L, -2);  /* put it below function */
+      lua_pushvalue(L, 1);
+      lua_setglobal(L, "_REQUIREDNAME");  /* set new name */
+      lua_call(L, 0, 1);  /* run loaded module */
+      lua_insert(L, -2);  /* put result below previous name */
+      lua_setglobal(L, "_REQUIREDNAME");  /* reset to previous name */
+      if (lua_isnil(L, -1)) {  /* no/nil return? */
+        lua_pushboolean(L, 1);
+        lua_replace(L, -2);  /* replace to true */
+      }
+      lua_pushvalue(L, 1);
+      lua_pushvalue(L, -2);
+      lua_rawset(L, 2);  /* mark it as loaded */
+      return 1;  /* return value */
+    }
+    case LUA_ERRFILE: {  /* file not found */
+      return luaL_error(L, "could not load package `%s' from path `%s'",
+                            lua_tostring(L, 1), getpath(L));
+    }
+    default: {
+      return luaL_error(L, "error loading package `%s' (%s)",
+                           lua_tostring(L, 1), lua_tostring(L, -1));
+    }
+  }
+}
+
+/* }====================================================== */
+
+
+static const luaL_reg base_funcs[] = {
+  {"error", luaB_error},
+  {"getmetatable", luaB_getmetatable},
+  {"setmetatable", luaB_setmetatable},
+  {"getfenv", luaB_getfenv},
+  {"setfenv", luaB_setfenv},
+  {"next", luaB_next},
+  {"ipairs", luaB_ipairs},
+  {"pairs", luaB_pairs},
+  {"print", luaB_print},
+  {"tonumber", luaB_tonumber},
+  {"tostring", luaB_tostring},
+  {"type", luaB_type},
+  {"assert", luaB_assert},
+  {"unpack", luaB_unpack},
+  {"rawequal", luaB_rawequal},
+  {"rawget", luaB_rawget},
+  {"rawset", luaB_rawset},
+  {"pcall", luaB_pcall},
+  {"xpcall", luaB_xpcall},
+  {"collectgarbage", luaB_collectgarbage},
+  {"gcinfo", luaB_gcinfo},
+  {"loadfile", luaB_loadfile},
+  {"dofile", luaB_dofile},
+  {"loadstring", luaB_loadstring},
+  {"require", luaB_require},
+  {NULL, NULL}
+};
+
+
+/*
+** {======================================================
+** Coroutine library
+** =======================================================
+*/
+
+static int auxresume (lua_State *L, lua_State *co, int narg) {
+  int status;
+  if (!lua_checkstack(co, narg))
+    luaL_error(L, "too many arguments to resume");
+  lua_xmove(L, co, narg);
+  status = lua_resume(co, narg);
+  if (status == 0) {
+    int nres = lua_gettop(co);
+    if (!lua_checkstack(L, nres))
+      luaL_error(L, "too many results to resume");
+    lua_xmove(co, L, nres);  /* move yielded values */
+    return nres;
+  }
+  else {
+    lua_xmove(co, L, 1);  /* move error message */
+    return -1;  /* error flag */
+  }
+}
+
+
+static int luaB_coresume (lua_State *L) {
+  lua_State *co = lua_tothread(L, 1);
+  int r;
+  luaL_argcheck(L, co, 1, "coroutine expected");
+  r = auxresume(L, co, lua_gettop(L) - 1);
+  if (r < 0) {
+    lua_pushboolean(L, 0);
+    lua_insert(L, -2);
+    return 2;  /* return false + error message */
+  }
+  else {
+    lua_pushboolean(L, 1);
+    lua_insert(L, -(r + 1));
+    return r + 1;  /* return true + `resume' returns */
+  }
+}
+
+
+static int luaB_auxwrap (lua_State *L) {
+  lua_State *co = lua_tothread(L, lua_upvalueindex(1));
+  int r = auxresume(L, co, lua_gettop(L));
+  if (r < 0) {
+    if (lua_isstring(L, -1)) {  /* error object is a string? */
+      luaL_where(L, 1);  /* add extra info */
+      lua_insert(L, -2);
+      lua_concat(L, 2);
+    }
+    lua_error(L);  /* propagate error */
+  }
+  return r;
+}
+
+
+static int luaB_cocreate (lua_State *L) {
+  lua_State *NL = lua_newthread(L);
+  luaL_argcheck(L, lua_isfunction(L, 1) && !lua_iscfunction(L, 1), 1,
+    "Lua function expected");
+  lua_pushvalue(L, 1);  /* move function to top */
+  lua_xmove(L, NL, 1);  /* move function from L to NL */
+  return 1;
+}
+
+
+static int luaB_cowrap (lua_State *L) {
+  luaB_cocreate(L);
+  lua_pushcclosure(L, luaB_auxwrap, 1);
+  return 1;
+}
+
+
+static int luaB_yield (lua_State *L) {
+  return lua_yield(L, lua_gettop(L));
+}
+
+
+static int luaB_costatus (lua_State *L) {
+  lua_State *co = lua_tothread(L, 1);
+  luaL_argcheck(L, co, 1, "coroutine expected");
+  if (L == co) lua_pushliteral(L, "running");
+  else {
+    lua_Debug ar;
+    if (lua_getstack(co, 0, &ar) == 0 && lua_gettop(co) == 0)
+      lua_pushliteral(L, "dead");
+    else
+      lua_pushliteral(L, "suspended");
+  }
+  return 1;
+}
+
+
+static const luaL_reg co_funcs[] = {
+  {"create", luaB_cocreate},
+  {"wrap", luaB_cowrap},
+  {"resume", luaB_coresume},
+  {"yield", luaB_yield},
+  {"status", luaB_costatus},
+  {NULL, NULL}
+};
+
+/* }====================================================== */
+
+
+
+static void base_open (lua_State *L) {
+  lua_pushliteral(L, "_G");
+  lua_pushvalue(L, LUA_GLOBALSINDEX);
+  luaL_openlib(L, NULL, base_funcs, 0);  /* open lib into global table */
+  lua_pushliteral(L, "_VERSION");
+  lua_pushliteral(L, LUA_VERSION);
+  lua_rawset(L, -3);  /* set global _VERSION */
+  /* `newproxy' needs a weaktable as upvalue */
+  lua_pushliteral(L, "newproxy");
+  lua_newtable(L);  /* new table `w' */
+  lua_pushvalue(L, -1);  /* `w' will be its own metatable */
+  lua_setmetatable(L, -2);
+  lua_pushliteral(L, "__mode");
+  lua_pushliteral(L, "k");
+  lua_rawset(L, -3);  /* metatable(w).__mode = "k" */
+  lua_pushcclosure(L, luaB_newproxy, 1);
+  lua_rawset(L, -3);  /* set global `newproxy' */
+  lua_rawset(L, -1);  /* set global _G */
+}
+
+
+LUALIB_API int luaopen_base (lua_State *L) {
+  base_open(L);
+  luaL_openlib(L, LUA_COLIBNAME, co_funcs, 0);
+  lua_newtable(L);
+  lua_setglobal(L, REQTAB);
+  return 0;
+}
+
diff --git a/main/source/lua/src/lib/ldblib.c b/main/source/lua/src/lib/ldblib.c
new file mode 100644
index 00000000..ead8484c
--- /dev/null
+++ b/main/source/lua/src/lib/ldblib.c
@@ -0,0 +1,299 @@
+/*
+** $Id: ldblib.c,v 1.80 2003/04/03 13:35:34 roberto Exp $
+** Interface from Lua to its debug API
+** See Copyright Notice in lua.h
+*/
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ldblib_c
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+
+static void settabss (lua_State *L, const char *i, const char *v) {
+  lua_pushstring(L, i);
+  lua_pushstring(L, v);
+  lua_rawset(L, -3);
+}
+
+
+static void settabsi (lua_State *L, const char *i, int v) {
+  lua_pushstring(L, i);
+  lua_pushnumber(L, (lua_Number)v);
+  lua_rawset(L, -3);
+}
+
+
+static int getinfo (lua_State *L) {
+  lua_Debug ar;
+  const char *options = luaL_optstring(L, 2, "flnSu");
+  if (lua_isnumber(L, 1)) {
+    if (!lua_getstack(L, (int)(lua_tonumber(L, 1)), &ar)) {
+      lua_pushnil(L);  /* level out of range */
+      return 1;
+    }
+  }
+  else if (lua_isfunction(L, 1)) {
+    lua_pushfstring(L, ">%s", options);
+    options = lua_tostring(L, -1);
+    lua_pushvalue(L, 1);
+  }
+  else
+    return luaL_argerror(L, 1, "function or level expected");
+  if (!lua_getinfo(L, options, &ar))
+    return luaL_argerror(L, 2, "invalid option");
+  lua_newtable(L);
+  for (; *options; options++) {
+    switch (*options) {
+      case 'S':
+        settabss(L, "source", ar.source);
+        settabss(L, "short_src", ar.short_src);
+        settabsi(L, "linedefined", ar.linedefined);
+        settabss(L, "what", ar.what);
+        break;
+      case 'l':
+        settabsi(L, "currentline", ar.currentline);
+        break;
+      case 'u':
+        settabsi(L, "nups", ar.nups);
+        break;
+      case 'n':
+        settabss(L, "name", ar.name);
+        settabss(L, "namewhat", ar.namewhat);
+        break;
+      case 'f':
+        lua_pushliteral(L, "func");
+        lua_pushvalue(L, -3);
+        lua_rawset(L, -3);
+        break;
+    }
+  }
+  return 1;  /* return table */
+}
+    
+
+static int getlocal (lua_State *L) {
+  lua_Debug ar;
+  const char *name;
+  if (!lua_getstack(L, luaL_checkint(L, 1), &ar))  /* level out of range? */
+    return luaL_argerror(L, 1, "level out of range");
+  name = lua_getlocal(L, &ar, luaL_checkint(L, 2));
+  if (name) {
+    lua_pushstring(L, name);
+    lua_pushvalue(L, -2);
+    return 2;
+  }
+  else {
+    lua_pushnil(L);
+    return 1;
+  }
+}
+
+
+static int setlocal (lua_State *L) {
+  lua_Debug ar;
+  if (!lua_getstack(L, luaL_checkint(L, 1), &ar))  /* level out of range? */
+    return luaL_argerror(L, 1, "level out of range");
+  luaL_checkany(L, 3);
+  lua_pushstring(L, lua_setlocal(L, &ar, luaL_checkint(L, 2)));
+  return 1;
+}
+
+
+static int auxupvalue (lua_State *L, int get) {
+  const char *name;
+  int n = luaL_checkint(L, 2);
+  luaL_checktype(L, 1, LUA_TFUNCTION);
+  if (lua_iscfunction(L, 1)) return 0;  /* cannot touch C upvalues from Lua */
+  name = get ? lua_getupvalue(L, 1, n) : lua_setupvalue(L, 1, n);
+  if (name == NULL) return 0;
+  lua_pushstring(L, name);
+  lua_insert(L, -(get+1));
+  return get + 1;
+}
+
+
+static int getupvalue (lua_State *L) {
+  return auxupvalue(L, 1);
+}
+
+
+static int setupvalue (lua_State *L) {
+  luaL_checkany(L, 3);
+  return auxupvalue(L, 0);
+}
+
+
+
+static const char KEY_HOOK = 'h';
+
+
+static void hookf (lua_State *L, lua_Debug *ar) {
+  static const char *const hooknames[] =
+    {"call", "return", "line", "count", "tail return"};
+  lua_pushlightuserdata(L, (void *)&KEY_HOOK);
+  lua_rawget(L, LUA_REGISTRYINDEX);
+  if (lua_isfunction(L, -1)) {
+    lua_pushstring(L, hooknames[(int)ar->event]);
+    if (ar->currentline >= 0)
+      lua_pushnumber(L, (lua_Number)ar->currentline);
+    else lua_pushnil(L);
+    lua_assert(lua_getinfo(L, "lS", ar));
+    lua_call(L, 2, 0);
+  }
+  else
+    lua_pop(L, 1);  /* pop result from gettable */
+}
+
+
+static int makemask (const char *smask, int count) {
+  int mask = 0;
+  if (strchr(smask, 'c')) mask |= LUA_MASKCALL;
+  if (strchr(smask, 'r')) mask |= LUA_MASKRET;
+  if (strchr(smask, 'l')) mask |= LUA_MASKLINE;
+  if (count > 0) mask |= LUA_MASKCOUNT;
+  return mask;
+}
+
+
+static char *unmakemask (int mask, char *smask) {
+  int i = 0;
+  if (mask & LUA_MASKCALL) smask[i++] = 'c';
+  if (mask & LUA_MASKRET) smask[i++] = 'r';
+  if (mask & LUA_MASKLINE) smask[i++] = 'l';
+  smask[i] = '\0';
+  return smask;
+}
+
+
+static int sethook (lua_State *L) {
+  if (lua_isnoneornil(L, 1)) {
+    lua_settop(L, 1);
+    lua_sethook(L, NULL, 0, 0);  /* turn off hooks */
+  }
+  else {
+    const char *smask = luaL_checkstring(L, 2);
+    int count = luaL_optint(L, 3, 0);
+    luaL_checktype(L, 1, LUA_TFUNCTION);
+    lua_sethook(L, hookf, makemask(smask, count), count);
+  }
+  lua_pushlightuserdata(L, (void *)&KEY_HOOK);
+  lua_pushvalue(L, 1);
+  lua_rawset(L, LUA_REGISTRYINDEX);  /* set new hook */
+  return 0;
+}
+
+
+static int gethook (lua_State *L) {
+  char buff[5];
+  int mask = lua_gethookmask(L);
+  lua_Hook hook = lua_gethook(L);
+  if (hook != NULL && hook != hookf)  /* external hook? */
+    lua_pushliteral(L, "external hook");
+  else {
+    lua_pushlightuserdata(L, (void *)&KEY_HOOK);
+    lua_rawget(L, LUA_REGISTRYINDEX);   /* get hook */
+  }
+  lua_pushstring(L, unmakemask(mask, buff));
+  lua_pushnumber(L, (lua_Number)lua_gethookcount(L));
+  return 3;
+}
+
+
+static int debug (lua_State *L) {
+  for (;;) {
+    char buffer[250];
+    fputs("lua_debug> ", stderr);
+    if (fgets(buffer, sizeof(buffer), stdin) == 0 ||
+        strcmp(buffer, "cont\n") == 0)
+      return 0;
+    lua_dostring(L, buffer);
+    lua_settop(L, 0);  /* remove eventual returns */
+  }
+}
+
+
+#define LEVELS1	12	/* size of the first part of the stack */
+#define LEVELS2	10	/* size of the second part of the stack */
+
+static int errorfb (lua_State *L) {
+  int level = 1;  /* skip level 0 (it's this function) */
+  int firstpart = 1;  /* still before eventual `...' */
+  lua_Debug ar;
+  if (lua_gettop(L) == 0)
+    lua_pushliteral(L, "");
+  else if (!lua_isstring(L, 1)) return 1;  /* no string message */
+  else lua_pushliteral(L, "\n");
+  lua_pushliteral(L, "stack traceback:");
+  while (lua_getstack(L, level++, &ar)) {
+    if (level > LEVELS1 && firstpart) {
+      /* no more than `LEVELS2' more levels? */
+      if (!lua_getstack(L, level+LEVELS2, &ar))
+        level--;  /* keep going */
+      else {
+        lua_pushliteral(L, "\n\t...");  /* too many levels */
+        while (lua_getstack(L, level+LEVELS2, &ar))  /* find last levels */
+          level++;
+      }
+      firstpart = 0;
+      continue;
+    }
+    lua_pushliteral(L, "\n\t");
+    lua_getinfo(L, "Snl", &ar);
+    lua_pushfstring(L, "%s:", ar.short_src);
+    if (ar.currentline > 0)
+      lua_pushfstring(L, "%d:", ar.currentline);
+    switch (*ar.namewhat) {
+      case 'g':  /* global */ 
+      case 'l':  /* local */
+      case 'f':  /* field */
+      case 'm':  /* method */
+        lua_pushfstring(L, " in function `%s'", ar.name);
+        break;
+      default: {
+        if (*ar.what == 'm')  /* main? */
+          lua_pushfstring(L, " in main chunk");
+        else if (*ar.what == 'C' || *ar.what == 't')
+          lua_pushliteral(L, " ?");  /* C function or tail call */
+        else
+          lua_pushfstring(L, " in function <%s:%d>",
+                             ar.short_src, ar.linedefined);
+      }
+    }
+    lua_concat(L, lua_gettop(L));
+  }
+  lua_concat(L, lua_gettop(L));
+  return 1;
+}
+
+
+static const luaL_reg dblib[] = {
+  {"getlocal", getlocal},
+  {"getinfo", getinfo},
+  {"gethook", gethook},
+  {"getupvalue", getupvalue},
+  {"sethook", sethook},
+  {"setlocal", setlocal},
+  {"setupvalue", setupvalue},
+  {"debug", debug},
+  {"traceback", errorfb},
+  {NULL, NULL}
+};
+
+
+LUALIB_API int luaopen_debug (lua_State *L) {
+  luaL_openlib(L, LUA_DBLIBNAME, dblib, 0);
+  lua_pushliteral(L, "_TRACEBACK");
+  lua_pushcfunction(L, errorfb);
+  lua_settable(L, LUA_GLOBALSINDEX);
+  return 1;
+}
+
diff --git a/main/source/lua/src/lib/liolib.c b/main/source/lua/src/lib/liolib.c
new file mode 100644
index 00000000..ecb9d5c4
--- /dev/null
+++ b/main/source/lua/src/lib/liolib.c
@@ -0,0 +1,750 @@
+/*
+** $Id: liolib.c,v 2.39 2003/03/19 21:16:12 roberto Exp $
+** Standard I/O (and system) library
+** See Copyright Notice in lua.h
+*/
+
+
+#include <errno.h>
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#define liolib_c
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+
+/*
+** by default, gcc does not get `tmpname'
+*/
+#ifndef USE_TMPNAME
+#ifdef __GNUC__
+#define USE_TMPNAME	0
+#else
+#define USE_TMPNAME	1
+#endif
+#endif
+
+
+/*
+** by default, posix systems get `popen'
+*/
+#ifndef USE_POPEN
+#ifdef _POSIX_C_SOURCE
+#if _POSIX_C_SOURCE >= 2
+#define USE_POPEN	1
+#endif
+#endif
+#endif
+
+#ifndef USE_POPEN
+#define USE_POPEN	0
+#endif
+
+
+
+
+/*
+** {======================================================
+** FILE Operations
+** =======================================================
+*/
+
+
+#if !USE_POPEN
+#define pclose(f)    (-1)
+#endif
+
+
+#define FILEHANDLE		"FILE*"
+
+#define IO_INPUT		"_input"
+#define IO_OUTPUT		"_output"
+
+
+static int pushresult (lua_State *L, int i, const char *filename) {
+  if (i) {
+    lua_pushboolean(L, 1);
+    return 1;
+  }
+  else {
+    lua_pushnil(L);
+    if (filename)
+      lua_pushfstring(L, "%s: %s", filename, strerror(errno));
+    else
+      lua_pushfstring(L, "%s", strerror(errno));
+    lua_pushnumber(L, errno);
+    return 3;
+  }
+}
+
+
+static FILE **topfile (lua_State *L, int findex) {
+  FILE **f = (FILE **)luaL_checkudata(L, findex, FILEHANDLE);
+  if (f == NULL) luaL_argerror(L, findex, "bad file");
+  return f;
+}
+
+
+static int io_type (lua_State *L) {
+  FILE **f = (FILE **)luaL_checkudata(L, 1, FILEHANDLE);
+  if (f == NULL) lua_pushnil(L);
+  else if (*f == NULL)
+    lua_pushliteral(L, "closed file");
+  else
+    lua_pushliteral(L, "file");
+  return 1;
+}
+
+
+static FILE *tofile (lua_State *L, int findex) {
+  FILE **f = topfile(L, findex);
+  if (*f == NULL)
+    luaL_error(L, "attempt to use a closed file");
+  return *f;
+}
+
+
+
+/*
+** When creating file handles, always creates a `closed' file handle
+** before opening the actual file; so, if there is a memory error, the
+** file is not left opened.
+*/
+static FILE **newfile (lua_State *L) {
+  FILE **pf = (FILE **)lua_newuserdata(L, sizeof(FILE *));
+  *pf = NULL;  /* file handle is currently `closed' */
+  luaL_getmetatable(L, FILEHANDLE);
+  lua_setmetatable(L, -2);
+  return pf;
+}
+
+
+/*
+** assumes that top of the stack is the `io' library, and next is
+** the `io' metatable
+*/
+static void registerfile (lua_State *L, FILE *f, const char *name,
+                                                 const char *impname) {
+  lua_pushstring(L, name);
+  *newfile(L) = f;
+  if (impname) {
+    lua_pushstring(L, impname);
+    lua_pushvalue(L, -2);
+    lua_settable(L, -6);  /* metatable[impname] = file */
+  }
+  lua_settable(L, -3);  /* io[name] = file */
+}
+
+
+static int aux_close (lua_State *L) {
+  FILE *f = tofile(L, 1);
+  if (f == stdin || f == stdout || f == stderr)
+    return 0;  /* file cannot be closed */
+  else {
+    int ok = (pclose(f) != -1) || (fclose(f) == 0);
+    if (ok)
+      *(FILE **)lua_touserdata(L, 1) = NULL;  /* mark file as closed */
+    return ok;
+  }
+}
+
+
+static int io_close (lua_State *L) {
+  if (lua_isnone(L, 1)) {
+    lua_pushstring(L, IO_OUTPUT);
+    lua_rawget(L, lua_upvalueindex(1));
+  }
+  return pushresult(L, aux_close(L), NULL);
+}
+
+
+static int io_gc (lua_State *L) {
+  FILE **f = topfile(L, 1);
+  if (*f != NULL)  /* ignore closed files */
+    aux_close(L);
+  return 0;
+}
+
+
+static int io_tostring (lua_State *L) {
+  char buff[32];
+  FILE **f = topfile(L, 1);
+  if (*f == NULL)
+    strcpy(buff, "closed");
+  else
+    sprintf(buff, "%p", lua_touserdata(L, 1));
+  lua_pushfstring(L, "file (%s)", buff);
+  return 1;
+}
+
+
+static int io_open (lua_State *L) {
+  const char *filename = luaL_checkstring(L, 1);
+  const char *mode = luaL_optstring(L, 2, "r");
+  FILE **pf = newfile(L);
+  *pf = fopen(filename, mode);
+  return (*pf == NULL) ? pushresult(L, 0, filename) : 1;
+}
+
+
+static int io_popen (lua_State *L) {
+#if !USE_POPEN
+  luaL_error(L, "`popen' not supported");
+  return 0;
+#else
+  const char *filename = luaL_checkstring(L, 1);
+  const char *mode = luaL_optstring(L, 2, "r");
+  FILE **pf = newfile(L);
+  *pf = popen(filename, mode);
+  return (*pf == NULL) ? pushresult(L, 0, filename) : 1;
+#endif
+}
+
+
+static int io_tmpfile (lua_State *L) {
+  FILE **pf = newfile(L);
+  *pf = tmpfile();
+  return (*pf == NULL) ? pushresult(L, 0, NULL) : 1;
+}
+
+
+static FILE *getiofile (lua_State *L, const char *name) {
+  lua_pushstring(L, name);
+  lua_rawget(L, lua_upvalueindex(1));
+  return tofile(L, -1);
+}
+
+
+static int g_iofile (lua_State *L, const char *name, const char *mode) {
+  if (!lua_isnoneornil(L, 1)) {
+    const char *filename = lua_tostring(L, 1);
+    lua_pushstring(L, name);
+    if (filename) {
+      FILE **pf = newfile(L);
+      *pf = fopen(filename, mode);
+      if (*pf == NULL) {
+        lua_pushfstring(L, "%s: %s", filename, strerror(errno));
+        luaL_argerror(L, 1, lua_tostring(L, -1));
+      }
+    }
+    else {
+      tofile(L, 1);  /* check that it's a valid file handle */
+      lua_pushvalue(L, 1);
+    }
+    lua_rawset(L, lua_upvalueindex(1));
+  }
+  /* return current value */
+  lua_pushstring(L, name);
+  lua_rawget(L, lua_upvalueindex(1));
+  return 1;
+}
+
+
+static int io_input (lua_State *L) {
+  return g_iofile(L, IO_INPUT, "r");
+}
+
+
+static int io_output (lua_State *L) {
+  return g_iofile(L, IO_OUTPUT, "w");
+}
+
+
+static int io_readline (lua_State *L);
+
+
+static void aux_lines (lua_State *L, int idx, int close) {
+  lua_pushliteral(L, FILEHANDLE);
+  lua_rawget(L, LUA_REGISTRYINDEX);
+  lua_pushvalue(L, idx);
+  lua_pushboolean(L, close);  /* close/not close file when finished */
+  lua_pushcclosure(L, io_readline, 3);
+}
+
+
+static int f_lines (lua_State *L) {
+  tofile(L, 1);  /* check that it's a valid file handle */
+  aux_lines(L, 1, 0);
+  return 1;
+}
+
+
+static int io_lines (lua_State *L) {
+  if (lua_isnoneornil(L, 1)) {  /* no arguments? */
+    lua_pushstring(L, IO_INPUT);
+    lua_rawget(L, lua_upvalueindex(1));  /* will iterate over default input */
+    return f_lines(L);
+  }
+  else {
+    const char *filename = luaL_checkstring(L, 1);
+    FILE **pf = newfile(L);
+    *pf = fopen(filename, "r");
+    luaL_argcheck(L, *pf, 1,  strerror(errno));
+    aux_lines(L, lua_gettop(L), 1);
+    return 1;
+  }
+}
+
+
+/*
+** {======================================================
+** READ
+** =======================================================
+*/
+
+
+static int read_number (lua_State *L, FILE *f) {
+  lua_Number d;
+  if (fscanf(f, LUA_NUMBER_SCAN, &d) == 1) {
+    lua_pushnumber(L, d);
+    return 1;
+  }
+  else return 0;  /* read fails */
+}
+
+
+static int test_eof (lua_State *L, FILE *f) {
+  int c = getc(f);
+  ungetc(c, f);
+  lua_pushlstring(L, NULL, 0);
+  return (c != EOF);
+}
+
+
+static int read_line (lua_State *L, FILE *f) {
+  luaL_Buffer b;
+  luaL_buffinit(L, &b);
+  for (;;) {
+    size_t l;
+    char *p = luaL_prepbuffer(&b);
+    if (fgets(p, LUAL_BUFFERSIZE, f) == NULL) {  /* eof? */
+      luaL_pushresult(&b);  /* close buffer */
+      return (lua_strlen(L, -1) > 0);  /* check whether read something */
+    }
+    l = strlen(p);
+    if (p[l-1] != '\n')
+      luaL_addsize(&b, l);
+    else {
+      luaL_addsize(&b, l - 1);  /* do not include `eol' */
+      luaL_pushresult(&b);  /* close buffer */
+      return 1;  /* read at least an `eol' */
+    }
+  }
+}
+
+
+static int read_chars (lua_State *L, FILE *f, size_t n) {
+  size_t rlen;  /* how much to read */
+  size_t nr;  /* number of chars actually read */
+  luaL_Buffer b;
+  luaL_buffinit(L, &b);
+  rlen = LUAL_BUFFERSIZE;  /* try to read that much each time */
+  do {
+    char *p = luaL_prepbuffer(&b);
+    if (rlen > n) rlen = n;  /* cannot read more than asked */
+    nr = fread(p, sizeof(char), rlen, f);
+    luaL_addsize(&b, nr);
+    n -= nr;  /* still have to read `n' chars */
+  } while (n > 0 && nr == rlen);  /* until end of count or eof */
+  luaL_pushresult(&b);  /* close buffer */
+  return (n == 0 || lua_strlen(L, -1) > 0);
+}
+
+
+static int g_read (lua_State *L, FILE *f, int first) {
+  int nargs = lua_gettop(L) - 1;
+  int success;
+  int n;
+  if (nargs == 0) {  /* no arguments? */
+    success = read_line(L, f);
+    n = first+1;  /* to return 1 result */
+  }
+  else {  /* ensure stack space for all results and for auxlib's buffer */
+    luaL_checkstack(L, nargs+LUA_MINSTACK, "too many arguments");
+    success = 1;
+    for (n = first; nargs-- && success; n++) {
+      if (lua_type(L, n) == LUA_TNUMBER) {
+        size_t l = (size_t)lua_tonumber(L, n);
+        success = (l == 0) ? test_eof(L, f) : read_chars(L, f, l);
+      }
+      else {
+        const char *p = lua_tostring(L, n);
+        luaL_argcheck(L, p && p[0] == '*', n, "invalid option");
+        switch (p[1]) {
+          case 'n':  /* number */
+            success = read_number(L, f);
+            break;
+          case 'l':  /* line */
+            success = read_line(L, f);
+            break;
+          case 'a':  /* file */
+            read_chars(L, f, ~((size_t)0));  /* read MAX_SIZE_T chars */
+            success = 1; /* always success */
+            break;
+          case 'w':  /* word */
+            return luaL_error(L, "obsolete option `*w' to `read'");
+          default:
+            return luaL_argerror(L, n, "invalid format");
+        }
+      }
+    }
+  }
+  if (!success) {
+    lua_pop(L, 1);  /* remove last result */
+    lua_pushnil(L);  /* push nil instead */
+  }
+  return n - first;
+}
+
+
+static int io_read (lua_State *L) {
+  return g_read(L, getiofile(L, IO_INPUT), 1);
+}
+
+
+static int f_read (lua_State *L) {
+  return g_read(L, tofile(L, 1), 2);
+}
+
+
+static int io_readline (lua_State *L) {
+  FILE *f = *(FILE **)lua_touserdata(L, lua_upvalueindex(2));
+  if (f == NULL)  /* file is already closed? */
+    luaL_error(L, "file is already closed");
+  if (read_line(L, f)) return 1;
+  else {  /* EOF */
+    if (lua_toboolean(L, lua_upvalueindex(3))) {  /* generator created file? */
+      lua_settop(L, 0);
+      lua_pushvalue(L, lua_upvalueindex(2));
+      aux_close(L);  /* close it */
+    }
+    return 0;
+  }
+}
+
+/* }====================================================== */
+
+
+static int g_write (lua_State *L, FILE *f, int arg) {
+  int nargs = lua_gettop(L) - 1;
+  int status = 1;
+  for (; nargs--; arg++) {
+    if (lua_type(L, arg) == LUA_TNUMBER) {
+      /* optimization: could be done exactly as for strings */
+      status = status &&
+          fprintf(f, LUA_NUMBER_FMT, lua_tonumber(L, arg)) > 0;
+    }
+    else {
+      size_t l;
+      const char *s = luaL_checklstring(L, arg, &l);
+      status = status && (fwrite(s, sizeof(char), l, f) == l);
+    }
+  }
+  return pushresult(L, status, NULL);
+}
+
+
+static int io_write (lua_State *L) {
+  return g_write(L, getiofile(L, IO_OUTPUT), 1);
+}
+
+
+static int f_write (lua_State *L) {
+  return g_write(L, tofile(L, 1), 2);
+}
+
+
+static int f_seek (lua_State *L) {
+  static const int mode[] = {SEEK_SET, SEEK_CUR, SEEK_END};
+  static const char *const modenames[] = {"set", "cur", "end", NULL};
+  FILE *f = tofile(L, 1);
+  int op = luaL_findstring(luaL_optstring(L, 2, "cur"), modenames);
+  long offset = luaL_optlong(L, 3, 0);
+  luaL_argcheck(L, op != -1, 2, "invalid mode");
+  op = fseek(f, offset, mode[op]);
+  if (op)
+    return pushresult(L, 0, NULL);  /* error */
+  else {
+    lua_pushnumber(L, ftell(f));
+    return 1;
+  }
+}
+
+
+static int io_flush (lua_State *L) {
+  return pushresult(L, fflush(getiofile(L, IO_OUTPUT)) == 0, NULL);
+}
+
+
+static int f_flush (lua_State *L) {
+  return pushresult(L, fflush(tofile(L, 1)) == 0, NULL);
+}
+
+
+static const luaL_reg iolib[] = {
+  {"input", io_input},
+  {"output", io_output},
+  {"lines", io_lines},
+  {"close", io_close},
+  {"flush", io_flush},
+  {"open", io_open},
+  {"popen", io_popen},
+  {"read", io_read},
+  {"tmpfile", io_tmpfile},
+  {"type", io_type},
+  {"write", io_write},
+  {NULL, NULL}
+};
+
+
+static const luaL_reg flib[] = {
+  {"flush", f_flush},
+  {"read", f_read},
+  {"lines", f_lines},
+  {"seek", f_seek},
+  {"write", f_write},
+  {"close", io_close},
+  {"__gc", io_gc},
+  {"__tostring", io_tostring},
+  {NULL, NULL}
+};
+
+
+static void createmeta (lua_State *L) {
+  luaL_newmetatable(L, FILEHANDLE);  /* create new metatable for file handles */
+  /* file methods */
+  lua_pushliteral(L, "__index");
+  lua_pushvalue(L, -2);  /* push metatable */
+  lua_rawset(L, -3);  /* metatable.__index = metatable */
+  luaL_openlib(L, NULL, flib, 0);
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Other O.S. Operations
+** =======================================================
+*/
+
+static int io_execute (lua_State *L) {
+  lua_pushnumber(L, system(luaL_checkstring(L, 1)));
+  return 1;
+}
+
+
+static int io_remove (lua_State *L) {
+  const char *filename = luaL_checkstring(L, 1);
+  return pushresult(L, remove(filename) == 0, filename);
+}
+
+
+static int io_rename (lua_State *L) {
+  const char *fromname = luaL_checkstring(L, 1);
+  const char *toname = luaL_checkstring(L, 2);
+  return pushresult(L, rename(fromname, toname) == 0, fromname);
+}
+
+
+static int io_tmpname (lua_State *L) {
+#if !USE_TMPNAME
+  luaL_error(L, "`tmpname' not supported");
+  return 0;
+#else
+  char buff[L_tmpnam];
+  if (tmpnam(buff) != buff)
+    return luaL_error(L, "unable to generate a unique filename in `tmpname'");
+  lua_pushstring(L, buff);
+  return 1;
+#endif
+}
+
+
+static int io_getenv (lua_State *L) {
+  lua_pushstring(L, getenv(luaL_checkstring(L, 1)));  /* if NULL push nil */
+  return 1;
+}
+
+
+static int io_clock (lua_State *L) {
+  lua_pushnumber(L, ((lua_Number)clock())/(lua_Number)CLOCKS_PER_SEC);
+  return 1;
+}
+
+
+/*
+** {======================================================
+** Time/Date operations
+** { year=%Y, month=%m, day=%d, hour=%H, min=%M, sec=%S,
+**   wday=%w+1, yday=%j, isdst=? }
+** =======================================================
+*/
+
+static void setfield (lua_State *L, const char *key, int value) {
+  lua_pushstring(L, key);
+  lua_pushnumber(L, value);
+  lua_rawset(L, -3);
+}
+
+static void setboolfield (lua_State *L, const char *key, int value) {
+  lua_pushstring(L, key);
+  lua_pushboolean(L, value);
+  lua_rawset(L, -3);
+}
+
+static int getboolfield (lua_State *L, const char *key) {
+  int res;
+  lua_pushstring(L, key);
+  lua_gettable(L, -2);
+  res = lua_toboolean(L, -1);
+  lua_pop(L, 1);
+  return res;
+}
+
+
+static int getfield (lua_State *L, const char *key, int d) {
+  int res;
+  lua_pushstring(L, key);
+  lua_gettable(L, -2);
+  if (lua_isnumber(L, -1))
+    res = (int)(lua_tonumber(L, -1));
+  else {
+    if (d == -2)
+      return luaL_error(L, "field `%s' missing in date table", key);
+    res = d;
+  }
+  lua_pop(L, 1);
+  return res;
+}
+
+
+static int io_date (lua_State *L) {
+  const char *s = luaL_optstring(L, 1, "%c");
+  time_t t = (time_t)(luaL_optnumber(L, 2, -1));
+  struct tm *stm;
+  if (t == (time_t)(-1))  /* no time given? */
+    t = time(NULL);  /* use current time */
+  if (*s == '!') {  /* UTC? */
+    stm = gmtime(&t);
+    s++;  /* skip `!' */
+  }
+  else
+    stm = localtime(&t);
+  if (stm == NULL)  /* invalid date? */
+    lua_pushnil(L);
+  else if (strcmp(s, "*t") == 0) {
+    lua_newtable(L);
+    setfield(L, "sec", stm->tm_sec);
+    setfield(L, "min", stm->tm_min);
+    setfield(L, "hour", stm->tm_hour);
+    setfield(L, "day", stm->tm_mday);
+    setfield(L, "month", stm->tm_mon+1);
+    setfield(L, "year", stm->tm_year+1900);
+    setfield(L, "wday", stm->tm_wday+1);
+    setfield(L, "yday", stm->tm_yday+1);
+    setboolfield(L, "isdst", stm->tm_isdst);
+  }
+  else {
+    char b[256];
+    if (strftime(b, sizeof(b), s, stm))
+      lua_pushstring(L, b);
+    else
+      return luaL_error(L, "`date' format too long");
+  }
+  return 1;
+}
+
+
+static int io_time (lua_State *L) {
+  if (lua_isnoneornil(L, 1))  /* called without args? */
+    lua_pushnumber(L, time(NULL));  /* return current time */
+  else {
+    time_t t;
+    struct tm ts;
+    luaL_checktype(L, 1, LUA_TTABLE);
+    lua_settop(L, 1);  /* make sure table is at the top */
+    ts.tm_sec = getfield(L, "sec", 0);
+    ts.tm_min = getfield(L, "min", 0);
+    ts.tm_hour = getfield(L, "hour", 12);
+    ts.tm_mday = getfield(L, "day", -2);
+    ts.tm_mon = getfield(L, "month", -2) - 1;
+    ts.tm_year = getfield(L, "year", -2) - 1900;
+    ts.tm_isdst = getboolfield(L, "isdst");
+    t = mktime(&ts);
+    if (t == (time_t)(-1))
+      lua_pushnil(L);
+    else
+      lua_pushnumber(L, t);
+  }
+  return 1;
+}
+
+
+static int io_difftime (lua_State *L) {
+  lua_pushnumber(L, difftime((time_t)(luaL_checknumber(L, 1)),
+                             (time_t)(luaL_optnumber(L, 2, 0))));
+  return 1;
+}
+
+/* }====================================================== */
+
+
+static int io_setloc (lua_State *L) {
+  static const int cat[] = {LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY,
+                      LC_NUMERIC, LC_TIME};
+  static const char *const catnames[] = {"all", "collate", "ctype", "monetary",
+     "numeric", "time", NULL};
+  const char *l = lua_tostring(L, 1);
+  int op = luaL_findstring(luaL_optstring(L, 2, "all"), catnames);
+  luaL_argcheck(L, l || lua_isnoneornil(L, 1), 1, "string expected");
+  luaL_argcheck(L, op != -1, 2, "invalid option");
+  lua_pushstring(L, setlocale(cat[op], l));
+  return 1;
+}
+
+
+static int io_exit (lua_State *L) {
+  exit(luaL_optint(L, 1, EXIT_SUCCESS));
+  return 0;  /* to avoid warnings */
+}
+
+static const luaL_reg syslib[] = {
+  {"clock",     io_clock},
+  {"date",      io_date},
+  {"difftime",  io_difftime},
+  {"execute",   io_execute},
+  {"exit",      io_exit},
+  {"getenv",    io_getenv},
+  {"remove",    io_remove},
+  {"rename",    io_rename},
+  {"setlocale", io_setloc},
+  {"time",      io_time},
+  {"tmpname",   io_tmpname},
+  {NULL, NULL}
+};
+
+/* }====================================================== */
+
+
+
+LUALIB_API int luaopen_io (lua_State *L) {
+  luaL_openlib(L, LUA_OSLIBNAME, syslib, 0);
+  createmeta(L);
+  lua_pushvalue(L, -1);
+  luaL_openlib(L, LUA_IOLIBNAME, iolib, 1);
+  /* put predefined file handles into `io' table */
+  registerfile(L, stdin, "stdin", IO_INPUT);
+  registerfile(L, stdout, "stdout", IO_OUTPUT);
+  registerfile(L, stderr, "stderr", NULL);
+  return 1;
+}
+
diff --git a/main/source/lua/src/lib/lmathlib.c b/main/source/lua/src/lib/lmathlib.c
new file mode 100644
index 00000000..2162c93a
--- /dev/null
+++ b/main/source/lua/src/lib/lmathlib.c
@@ -0,0 +1,246 @@
+/*
+** $Id: lmathlib.c,v 1.56 2003/03/11 12:30:37 roberto Exp $
+** Standard mathematical library
+** See Copyright Notice in lua.h
+*/
+
+
+#include <stdlib.h>
+#include <math.h>
+
+#define lmathlib_c
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+#undef PI
+#define PI (3.14159265358979323846)
+#define RADIANS_PER_DEGREE (PI/180.0)
+
+
+
+/*
+** If you want Lua to operate in degrees (instead of radians),
+** define USE_DEGREES
+*/
+#ifdef USE_DEGREES
+#define FROMRAD(a)	((a)/RADIANS_PER_DEGREE)
+#define TORAD(a)	((a)*RADIANS_PER_DEGREE)
+#else
+#define FROMRAD(a)	(a)
+#define TORAD(a)	(a)
+#endif
+
+
+static int math_abs (lua_State *L) {
+  lua_pushnumber(L, fabs(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_sin (lua_State *L) {
+  lua_pushnumber(L, sin(TORAD(luaL_checknumber(L, 1))));
+  return 1;
+}
+
+static int math_cos (lua_State *L) {
+  lua_pushnumber(L, cos(TORAD(luaL_checknumber(L, 1))));
+  return 1;
+}
+
+static int math_tan (lua_State *L) {
+  lua_pushnumber(L, tan(TORAD(luaL_checknumber(L, 1))));
+  return 1;
+}
+
+static int math_asin (lua_State *L) {
+  lua_pushnumber(L, FROMRAD(asin(luaL_checknumber(L, 1))));
+  return 1;
+}
+
+static int math_acos (lua_State *L) {
+  lua_pushnumber(L, FROMRAD(acos(luaL_checknumber(L, 1))));
+  return 1;
+}
+
+static int math_atan (lua_State *L) {
+  lua_pushnumber(L, FROMRAD(atan(luaL_checknumber(L, 1))));
+  return 1;
+}
+
+static int math_atan2 (lua_State *L) {
+  lua_pushnumber(L, FROMRAD(atan2(luaL_checknumber(L, 1), luaL_checknumber(L, 2))));
+  return 1;
+}
+
+static int math_ceil (lua_State *L) {
+  lua_pushnumber(L, ceil(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_floor (lua_State *L) {
+  lua_pushnumber(L, floor(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_mod (lua_State *L) {
+  lua_pushnumber(L, fmod(luaL_checknumber(L, 1), luaL_checknumber(L, 2)));
+  return 1;
+}
+
+static int math_sqrt (lua_State *L) {
+  lua_pushnumber(L, sqrt(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_pow (lua_State *L) {
+  lua_pushnumber(L, pow(luaL_checknumber(L, 1), luaL_checknumber(L, 2)));
+  return 1;
+}
+
+static int math_log (lua_State *L) {
+  lua_pushnumber(L, log(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_log10 (lua_State *L) {
+  lua_pushnumber(L, log10(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_exp (lua_State *L) {
+  lua_pushnumber(L, exp(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_deg (lua_State *L) {
+  lua_pushnumber(L, luaL_checknumber(L, 1)/RADIANS_PER_DEGREE);
+  return 1;
+}
+
+static int math_rad (lua_State *L) {
+  lua_pushnumber(L, luaL_checknumber(L, 1)*RADIANS_PER_DEGREE);
+  return 1;
+}
+
+static int math_frexp (lua_State *L) {
+  int e;
+  lua_pushnumber(L, frexp(luaL_checknumber(L, 1), &e));
+  lua_pushnumber(L, e);
+  return 2;
+}
+
+static int math_ldexp (lua_State *L) {
+  lua_pushnumber(L, ldexp(luaL_checknumber(L, 1), luaL_checkint(L, 2)));
+  return 1;
+}
+
+
+
+static int math_min (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  lua_Number dmin = luaL_checknumber(L, 1);
+  int i;
+  for (i=2; i<=n; i++) {
+    lua_Number d = luaL_checknumber(L, i);
+    if (d < dmin)
+      dmin = d;
+  }
+  lua_pushnumber(L, dmin);
+  return 1;
+}
+
+
+static int math_max (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  lua_Number dmax = luaL_checknumber(L, 1);
+  int i;
+  for (i=2; i<=n; i++) {
+    lua_Number d = luaL_checknumber(L, i);
+    if (d > dmax)
+      dmax = d;
+  }
+  lua_pushnumber(L, dmax);
+  return 1;
+}
+
+
+static int math_random (lua_State *L) {
+  /* the `%' avoids the (rare) case of r==1, and is needed also because on
+     some systems (SunOS!) `rand()' may return a value larger than RAND_MAX */
+  lua_Number r = (lua_Number)(rand()%RAND_MAX) / (lua_Number)RAND_MAX;
+  switch (lua_gettop(L)) {  /* check number of arguments */
+    case 0: {  /* no arguments */
+      lua_pushnumber(L, r);  /* Number between 0 and 1 */
+      break;
+    }
+    case 1: {  /* only upper limit */
+      int u = luaL_checkint(L, 1);
+      luaL_argcheck(L, 1<=u, 1, "interval is empty");
+      lua_pushnumber(L, (int)floor(r*u)+1);  /* int between 1 and `u' */
+      break;
+    }
+    case 2: {  /* lower and upper limits */
+      int l = luaL_checkint(L, 1);
+      int u = luaL_checkint(L, 2);
+      luaL_argcheck(L, l<=u, 2, "interval is empty");
+      lua_pushnumber(L, (int)floor(r*(u-l+1))+l);  /* int between `l' and `u' */
+      break;
+    }
+    default: return luaL_error(L, "wrong number of arguments");
+  }
+  return 1;
+}
+
+
+static int math_randomseed (lua_State *L) {
+  srand(luaL_checkint(L, 1));
+  return 0;
+}
+
+
+static const luaL_reg mathlib[] = {
+  {"abs",   math_abs},
+  {"sin",   math_sin},
+  {"cos",   math_cos},
+  {"tan",   math_tan},
+  {"asin",  math_asin},
+  {"acos",  math_acos},
+  {"atan",  math_atan},
+  {"atan2", math_atan2},
+  {"ceil",  math_ceil},
+  {"floor", math_floor},
+  {"mod",   math_mod},
+  {"frexp", math_frexp},
+  {"ldexp", math_ldexp},
+  {"sqrt",  math_sqrt},
+  {"min",   math_min},
+  {"max",   math_max},
+  {"log",   math_log},
+  {"log10", math_log10},
+  {"exp",   math_exp},
+  {"deg",   math_deg},
+  {"pow",   math_pow},
+  {"rad",   math_rad},
+  {"random",     math_random},
+  {"randomseed", math_randomseed},
+  {NULL, NULL}
+};
+
+
+/*
+** Open math library
+*/
+LUALIB_API int luaopen_math (lua_State *L) {
+  luaL_openlib(L, LUA_MATHLIBNAME, mathlib, 0);
+  lua_pushliteral(L, "pi");
+  lua_pushnumber(L, PI);
+  lua_settable(L, -3);
+  lua_pushliteral(L, "__pow");
+  lua_pushcfunction(L, math_pow);
+  lua_settable(L, LUA_GLOBALSINDEX);
+  return 1;
+}
+
diff --git a/main/source/lua/src/lib/loadlib.c b/main/source/lua/src/lib/loadlib.c
new file mode 100644
index 00000000..98825e5a
--- /dev/null
+++ b/main/source/lua/src/lib/loadlib.c
@@ -0,0 +1,205 @@
+/*
+** $Id: loadlib.c,v 1.4 2003/04/07 20:11:53 roberto Exp $
+** Dynamic library loader for Lua
+** See Copyright Notice in lua.h
+*
+* This  Lua library  exports a  single function,  called loadlib,  which is
+* called from Lua  as loadlib(lib,init), where lib is the  full name of the
+* library to be  loaded (including the complete path) and  init is the name
+* of a function  to be called after the library  is loaded. Typically, this
+* function will register other functions,  thus making the complete library
+* available  to Lua.  The init  function is  *not* automatically  called by
+* loadlib. Instead,  loadlib returns  the init function  as a  Lua function
+* that the client  can call when it  thinks is appropriate. In  the case of
+* errors,  loadlib  returns  nil  and two  strings  describing  the  error.
+* The  first string  is  supplied by  the operating  system;  it should  be
+* informative and useful  for error messages. The second  string is "open",
+* "init", or  "absent" to identify  the error and is  meant to be  used for
+* making  decisions without  having to  look into  the first  string (whose
+* format is system-dependent).
+*
+* This module contains  an implementation of loadlib for  Unix systems that
+* have dlfcn, an implementation for Windows,  and a stub for other systems.
+* See  the list  at  the end  of  this  file for  some  links to  available
+* implementations of dlfcn  and interfaces to other  native dynamic loaders
+* on top of which loadlib could be implemented.
+*
+*/
+
+#include "lua.h"
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+#undef LOADLIB
+
+
+#ifdef USE_DLOPEN
+#define LOADLIB
+/*
+* This is an implementation of loadlib based on the dlfcn interface.
+* The dlfcn interface is available in Linux, SunOS, Solaris, IRIX, FreeBSD,
+* NetBSD, AIX 4.2, HPUX 11, and  probably most other Unix flavors, at least
+* as an emulation layer on top of native functions.
+*/
+
+#include <dlfcn.h>
+
+static int loadlib(lua_State *L)
+{
+ const char *path=luaL_checkstring(L,1);
+ const char *init=luaL_checkstring(L,2);
+ void *lib=dlopen(path,RTLD_NOW);
+ if (lib!=NULL)
+ {
+  lua_CFunction f=(lua_CFunction) dlsym(lib,init);
+  if (f!=NULL)
+  {
+   lua_pushlightuserdata(L,lib);
+   lua_pushcclosure(L,f,1);
+   return 1;
+  }
+ }
+ /* else return appropriate error messages */
+ lua_pushnil(L);
+ lua_pushstring(L,dlerror());
+ lua_pushstring(L,(lib!=NULL) ? "init" : "open");
+ if (lib!=NULL) dlclose(lib);
+ return 3;
+}
+
+#endif
+
+
+
+/*
+** In Windows, default is to use dll; otherwise, default is not to use dll
+*/
+#ifndef USE_DLL
+#ifdef _WIN32
+#define USE_DLL	1
+#else
+#define USE_DLL	0
+#endif
+#endif
+
+
+#if USE_DLL
+#define LOADLIB
+/*
+* This is an implementation of loadlib for Windows using native functions.
+*/
+
+#include <windows.h>
+
+static void pusherror(lua_State *L)
+{
+ int error=GetLastError();
+ char buffer[128];
+ if (FormatMessage(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM,
+	0, error, 0, buffer, sizeof(buffer), 0))
+  lua_pushstring(L,buffer);
+ else
+  lua_pushfstring(L,"system error %d\n",error);
+}
+
+static int loadlib(lua_State *L)
+{
+ const char *path=luaL_checkstring(L,1);
+ const char *init=luaL_checkstring(L,2);
+ HINSTANCE lib=LoadLibrary(path);
+ if (lib!=NULL)
+ {
+  lua_CFunction f=(lua_CFunction) GetProcAddress(lib,init);
+  if (f!=NULL)
+  {
+   lua_pushlightuserdata(L,lib);
+   lua_pushcclosure(L,f,1);
+   return 1;
+  }
+ }
+ lua_pushnil(L);
+ pusherror(L);
+ lua_pushstring(L,(lib!=NULL) ? "init" : "open");
+ if (lib!=NULL) FreeLibrary(lib);
+ return 3;
+}
+
+#endif
+
+
+
+#ifndef LOADLIB
+/* Fallback for other systems */
+
+/*
+** Those systems support dlopen, so they should have defined USE_DLOPEN.
+** The default (no)implementation gives them a special error message.
+*/
+#ifdef linux
+#define LOADLIB
+#endif
+
+#ifdef sun
+#define LOADLIB
+#endif
+
+#ifdef sgi
+#define LOADLIB
+#endif
+
+#ifdef BSD
+#define LOADLIB
+#endif
+
+#ifdef _WIN32
+#define LOADLIB
+#endif
+
+#ifdef LOADLIB
+#undef LOADLIB
+#define LOADLIB	"`loadlib' not installed (check your Lua configuration)"
+#else
+#define LOADLIB	"`loadlib' not supported"
+#endif
+
+static int loadlib(lua_State *L)
+{
+ lua_pushnil(L);
+ lua_pushliteral(L,LOADLIB);
+ lua_pushliteral(L,"absent");
+ return 3;
+}
+#endif
+
+LUALIB_API int luaopen_loadlib (lua_State *L)
+{
+ lua_register(L,"loadlib",loadlib);
+ return 0;
+}
+
+/*
+* Here are some links to available implementations of dlfcn and
+* interfaces to other native dynamic loaders on top of which loadlib
+* could be implemented. Please send contributions and corrections to us.
+*
+* AIX
+* Starting with AIX 4.2, dlfcn is included in the base OS.
+* There is also an emulation package available.
+* http://www.faqs.org/faqs/aix-faq/part4/section-21.html
+*
+* HPUX 
+* HPUX 11 has dlfcn. For HPUX 10 use shl_*.
+* http://www.geda.seul.org/mailinglist/geda-dev37/msg00094.html
+* http://www.stat.umn.edu/~luke/xls/projects/dlbasics/dlbasics.html
+*
+* Macintosh, Windows
+* http://www.stat.umn.edu/~luke/xls/projects/dlbasics/dlbasics.html
+*
+* Mac OS X/Darwin
+* http://www.opendarwin.org/projects/dlcompat/
+*
+* GLIB has wrapper code for BeOS, OS2, Unix and Windows
+* http://cvs.gnome.org/lxr/source/glib/gmodule/
+*
+*/
diff --git a/main/source/lua/src/lib/lstrlib.c b/main/source/lua/src/lib/lstrlib.c
new file mode 100644
index 00000000..d8fc9497
--- /dev/null
+++ b/main/source/lua/src/lib/lstrlib.c
@@ -0,0 +1,770 @@
+/*
+** $Id: lstrlib.c,v 1.98 2003/04/03 13:35:34 roberto Exp $
+** Standard library for string operations and pattern-matching
+** See Copyright Notice in lua.h
+*/
+
+
+#include <ctype.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define lstrlib_c
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+/* macro to `unsign' a character */
+#ifndef uchar
+#define uchar(c)        ((unsigned char)(c))
+#endif
+
+
+typedef long sint32;	/* a signed version for size_t */
+
+
+static int str_len (lua_State *L) {
+  size_t l;
+  luaL_checklstring(L, 1, &l);
+  lua_pushnumber(L, (lua_Number)l);
+  return 1;
+}
+
+
+static sint32 posrelat (sint32 pos, size_t len) {
+  /* relative string position: negative means back from end */
+  return (pos>=0) ? pos : (sint32)len+pos+1;
+}
+
+
+static int str_sub (lua_State *L) {
+  size_t l;
+  const char *s = luaL_checklstring(L, 1, &l);
+  sint32 start = posrelat(luaL_checklong(L, 2), l);
+  sint32 end = posrelat(luaL_optlong(L, 3, -1), l);
+  if (start < 1) start = 1;
+  if (end > (sint32)l) end = (sint32)l;
+  if (start <= end)
+    lua_pushlstring(L, s+start-1, end-start+1);
+  else lua_pushliteral(L, "");
+  return 1;
+}
+
+
+static int str_lower (lua_State *L) {
+  size_t l;
+  size_t i;
+  luaL_Buffer b;
+  const char *s = luaL_checklstring(L, 1, &l);
+  luaL_buffinit(L, &b);
+  for (i=0; i<l; i++)
+    luaL_putchar(&b, tolower(uchar(s[i])));
+  luaL_pushresult(&b);
+  return 1;
+}
+
+
+static int str_upper (lua_State *L) {
+  size_t l;
+  size_t i;
+  luaL_Buffer b;
+  const char *s = luaL_checklstring(L, 1, &l);
+  luaL_buffinit(L, &b);
+  for (i=0; i<l; i++)
+    luaL_putchar(&b, toupper(uchar(s[i])));
+  luaL_pushresult(&b);
+  return 1;
+}
+
+static int str_rep (lua_State *L) {
+  size_t l;
+  luaL_Buffer b;
+  const char *s = luaL_checklstring(L, 1, &l);
+  int n = luaL_checkint(L, 2);
+  luaL_buffinit(L, &b);
+  while (n-- > 0)
+    luaL_addlstring(&b, s, l);
+  luaL_pushresult(&b);
+  return 1;
+}
+
+
+static int str_byte (lua_State *L) {
+  size_t l;
+  const char *s = luaL_checklstring(L, 1, &l);
+  sint32 pos = posrelat(luaL_optlong(L, 2, 1), l);
+  if (pos <= 0 || (size_t)(pos) > l)  /* index out of range? */
+    return 0;  /* no answer */
+  lua_pushnumber(L, uchar(s[pos-1]));
+  return 1;
+}
+
+
+static int str_char (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  int i;
+  luaL_Buffer b;
+  luaL_buffinit(L, &b);
+  for (i=1; i<=n; i++) {
+    int c = luaL_checkint(L, i);
+    luaL_argcheck(L, uchar(c) == c, i, "invalid value");
+    luaL_putchar(&b, uchar(c));
+  }
+  luaL_pushresult(&b);
+  return 1;
+}
+
+
+static int writer (lua_State *L, const void* b, size_t size, void* B) {
+  (void)L;
+  luaL_addlstring((luaL_Buffer*) B, (const char *)b, size);
+  return 1;
+}
+
+
+static int str_dump (lua_State *L) {
+  luaL_Buffer b;
+  luaL_checktype(L, 1, LUA_TFUNCTION);
+  luaL_buffinit(L,&b);
+  if (!lua_dump(L, writer, &b))
+    luaL_error(L, "unable to dump given function");
+  luaL_pushresult(&b);
+  return 1;
+}
+
+
+
+/*
+** {======================================================
+** PATTERN MATCHING
+** =======================================================
+*/
+
+#ifndef MAX_CAPTURES
+#define MAX_CAPTURES 32  /* arbitrary limit */
+#endif
+
+
+#define CAP_UNFINISHED	(-1)
+#define CAP_POSITION	(-2)
+
+typedef struct MatchState {
+  const char *src_init;  /* init of source string */
+  const char *src_end;  /* end (`\0') of source string */
+  lua_State *L;
+  int level;  /* total number of captures (finished or unfinished) */
+  struct {
+    const char *init;
+    sint32 len;
+  } capture[MAX_CAPTURES];
+} MatchState;
+
+
+#define ESC		'%'
+#define SPECIALS	"^$*+?.([%-"
+
+
+static int check_capture (MatchState *ms, int l) {
+  l -= '1';
+  if (l < 0 || l >= ms->level || ms->capture[l].len == CAP_UNFINISHED)
+    return luaL_error(ms->L, "invalid capture index");
+  return l;
+}
+
+
+static int capture_to_close (MatchState *ms) {
+  int level = ms->level;
+  for (level--; level>=0; level--)
+    if (ms->capture[level].len == CAP_UNFINISHED) return level;
+  return luaL_error(ms->L, "invalid pattern capture");
+}
+
+
+static const char *luaI_classend (MatchState *ms, const char *p) {
+  switch (*p++) {
+    case ESC: {
+      if (*p == '\0')
+        luaL_error(ms->L, "malformed pattern (ends with `%')");
+      return p+1;
+    }
+    case '[': {
+      if (*p == '^') p++;
+      do {  /* look for a `]' */
+        if (*p == '\0')
+          luaL_error(ms->L, "malformed pattern (missing `]')");
+        if (*(p++) == ESC && *p != '\0')
+          p++;  /* skip escapes (e.g. `%]') */
+      } while (*p != ']');
+      return p+1;
+    }
+    default: {
+      return p;
+    }
+  }
+}
+
+
+static int match_class (int c, int cl) {
+  int res;
+  switch (tolower(cl)) {
+    case 'a' : res = isalpha(c); break;
+    case 'c' : res = iscntrl(c); break;
+    case 'd' : res = isdigit(c); break;
+    case 'l' : res = islower(c); break;
+    case 'p' : res = ispunct(c); break;
+    case 's' : res = isspace(c); break;
+    case 'u' : res = isupper(c); break;
+    case 'w' : res = isalnum(c); break;
+    case 'x' : res = isxdigit(c); break;
+    case 'z' : res = (c == 0); break;
+    default: return (cl == c);
+  }
+  return (islower(cl) ? res : !res);
+}
+
+
+static int matchbracketclass (int c, const char *p, const char *ec) {
+  int sig = 1;
+  if (*(p+1) == '^') {
+    sig = 0;
+    p++;  /* skip the `^' */
+  }
+  while (++p < ec) {
+    if (*p == ESC) {
+      p++;
+      if (match_class(c, *p))
+        return sig;
+    }
+    else if ((*(p+1) == '-') && (p+2 < ec)) {
+      p+=2;
+      if (uchar(*(p-2)) <= c && c <= uchar(*p))
+        return sig;
+    }
+    else if (uchar(*p) == c) return sig;
+  }
+  return !sig;
+}
+
+
+static int luaI_singlematch (int c, const char *p, const char *ep) {
+  switch (*p) {
+    case '.': return 1;  /* matches any char */
+    case ESC: return match_class(c, *(p+1));
+    case '[': return matchbracketclass(c, p, ep-1);
+    default:  return (uchar(*p) == c);
+  }
+}
+
+
+static const char *match (MatchState *ms, const char *s, const char *p);
+
+
+static const char *matchbalance (MatchState *ms, const char *s,
+                                   const char *p) {
+  if (*p == 0 || *(p+1) == 0)
+    luaL_error(ms->L, "unbalanced pattern");
+  if (*s != *p) return NULL;
+  else {
+    int b = *p;
+    int e = *(p+1);
+    int cont = 1;
+    while (++s < ms->src_end) {
+      if (*s == e) {
+        if (--cont == 0) return s+1;
+      }
+      else if (*s == b) cont++;
+    }
+  }
+  return NULL;  /* string ends out of balance */
+}
+
+
+static const char *max_expand (MatchState *ms, const char *s,
+                                 const char *p, const char *ep) {
+  sint32 i = 0;  /* counts maximum expand for item */
+  while ((s+i)<ms->src_end && luaI_singlematch(uchar(*(s+i)), p, ep))
+    i++;
+  /* keeps trying to match with the maximum repetitions */
+  while (i>=0) {
+    const char *res = match(ms, (s+i), ep+1);
+    if (res) return res;
+    i--;  /* else didn't match; reduce 1 repetition to try again */
+  }
+  return NULL;
+}
+
+
+static const char *min_expand (MatchState *ms, const char *s,
+                                 const char *p, const char *ep) {
+  for (;;) {
+    const char *res = match(ms, s, ep+1);
+    if (res != NULL)
+      return res;
+    else if (s<ms->src_end && luaI_singlematch(uchar(*s), p, ep))
+      s++;  /* try with one more repetition */
+    else return NULL;
+  }
+}
+
+
+static const char *start_capture (MatchState *ms, const char *s,
+                                    const char *p, int what) {
+  const char *res;
+  int level = ms->level;
+  if (level >= MAX_CAPTURES) luaL_error(ms->L, "too many captures");
+  ms->capture[level].init = s;
+  ms->capture[level].len = what;
+  ms->level = level+1;
+  if ((res=match(ms, s, p)) == NULL)  /* match failed? */
+    ms->level--;  /* undo capture */
+  return res;
+}
+
+
+static const char *end_capture (MatchState *ms, const char *s,
+                                  const char *p) {
+  int l = capture_to_close(ms);
+  const char *res;
+  ms->capture[l].len = s - ms->capture[l].init;  /* close capture */
+  if ((res = match(ms, s, p)) == NULL)  /* match failed? */
+    ms->capture[l].len = CAP_UNFINISHED;  /* undo capture */
+  return res;
+}
+
+
+static const char *match_capture (MatchState *ms, const char *s, int l) {
+  size_t len;
+  l = check_capture(ms, l);
+  len = ms->capture[l].len;
+  if ((size_t)(ms->src_end-s) >= len &&
+      memcmp(ms->capture[l].init, s, len) == 0)
+    return s+len;
+  else return NULL;
+}
+
+
+static const char *match (MatchState *ms, const char *s, const char *p) {
+  init: /* using goto's to optimize tail recursion */
+  switch (*p) {
+    case '(': {  /* start capture */
+      if (*(p+1) == ')')  /* position capture? */
+        return start_capture(ms, s, p+2, CAP_POSITION);
+      else
+        return start_capture(ms, s, p+1, CAP_UNFINISHED);
+    }
+    case ')': {  /* end capture */
+      return end_capture(ms, s, p+1);
+    }
+    case ESC: {
+      switch (*(p+1)) {
+        case 'b': {  /* balanced string? */
+          s = matchbalance(ms, s, p+2);
+          if (s == NULL) return NULL;
+          p+=4; goto init;  /* else return match(ms, s, p+4); */
+        }
+        case 'f': {  /* frontier? */
+          const char *ep; char previous;
+          p += 2;
+          if (*p != '[')
+            luaL_error(ms->L, "missing `[' after `%%f' in pattern");
+          ep = luaI_classend(ms, p);  /* points to what is next */
+          previous = (s == ms->src_init) ? '\0' : *(s-1);
+          if (matchbracketclass(uchar(previous), p, ep-1) ||
+             !matchbracketclass(uchar(*s), p, ep-1)) return NULL;
+          p=ep; goto init;  /* else return match(ms, s, ep); */
+        }
+        default: {
+          if (isdigit(uchar(*(p+1)))) {  /* capture results (%0-%9)? */
+            s = match_capture(ms, s, *(p+1));
+            if (s == NULL) return NULL;
+            p+=2; goto init;  /* else return match(ms, s, p+2) */
+          }
+          goto dflt;  /* case default */
+        }
+      }
+    }
+    case '\0': {  /* end of pattern */
+      return s;  /* match succeeded */
+    }
+    case '$': {
+      if (*(p+1) == '\0')  /* is the `$' the last char in pattern? */
+        return (s == ms->src_end) ? s : NULL;  /* check end of string */
+      else goto dflt;
+    }
+    default: dflt: {  /* it is a pattern item */
+      const char *ep = luaI_classend(ms, p);  /* points to what is next */
+      int m = s<ms->src_end && luaI_singlematch(uchar(*s), p, ep);
+      switch (*ep) {
+        case '?': {  /* optional */
+          const char *res;
+          if (m && ((res=match(ms, s+1, ep+1)) != NULL))
+            return res;
+          p=ep+1; goto init;  /* else return match(ms, s, ep+1); */
+        }
+        case '*': {  /* 0 or more repetitions */
+          return max_expand(ms, s, p, ep);
+        }
+        case '+': {  /* 1 or more repetitions */
+          return (m ? max_expand(ms, s+1, p, ep) : NULL);
+        }
+        case '-': {  /* 0 or more repetitions (minimum) */
+          return min_expand(ms, s, p, ep);
+        }
+        default: {
+          if (!m) return NULL;
+          s++; p=ep; goto init;  /* else return match(ms, s+1, ep); */
+        }
+      }
+    }
+  }
+}
+
+
+
+static const char *lmemfind (const char *s1, size_t l1,
+                               const char *s2, size_t l2) {
+  if (l2 == 0) return s1;  /* empty strings are everywhere */
+  else if (l2 > l1) return NULL;  /* avoids a negative `l1' */
+  else {
+    const char *init;  /* to search for a `*s2' inside `s1' */
+    l2--;  /* 1st char will be checked by `memchr' */
+    l1 = l1-l2;  /* `s2' cannot be found after that */
+    while (l1 > 0 && (init = (const char *)memchr(s1, *s2, l1)) != NULL) {
+      init++;   /* 1st char is already checked */
+      if (memcmp(init, s2+1, l2) == 0)
+        return init-1;
+      else {  /* correct `l1' and `s1' to try again */
+        l1 -= init-s1;
+        s1 = init;
+      }
+    }
+    return NULL;  /* not found */
+  }
+}
+
+
+static void push_onecapture (MatchState *ms, int i) {
+  int l = ms->capture[i].len;
+  if (l == CAP_UNFINISHED) luaL_error(ms->L, "unfinished capture");
+  if (l == CAP_POSITION)
+    lua_pushnumber(ms->L, (lua_Number)(ms->capture[i].init - ms->src_init + 1));
+  else
+    lua_pushlstring(ms->L, ms->capture[i].init, l);
+}
+
+
+static int push_captures (MatchState *ms, const char *s, const char *e) {
+  int i;
+  luaL_checkstack(ms->L, ms->level, "too many captures");
+  if (ms->level == 0 && s) {  /* no explicit captures? */
+    lua_pushlstring(ms->L, s, e-s);  /* return whole match */
+    return 1;
+  }
+  else {  /* return all captures */
+    for (i=0; i<ms->level; i++)
+      push_onecapture(ms, i);
+    return ms->level;  /* number of strings pushed */
+  }
+}
+
+
+static int str_find (lua_State *L) {
+  size_t l1, l2;
+  const char *s = luaL_checklstring(L, 1, &l1);
+  const char *p = luaL_checklstring(L, 2, &l2);
+  sint32 init = posrelat(luaL_optlong(L, 3, 1), l1) - 1;
+  if (init < 0) init = 0;
+  else if ((size_t)(init) > l1) init = (sint32)l1;
+  if (lua_toboolean(L, 4) ||  /* explicit request? */
+      strpbrk(p, SPECIALS) == NULL) {  /* or no special characters? */
+    /* do a plain search */
+    const char *s2 = lmemfind(s+init, l1-init, p, l2);
+    if (s2) {
+      lua_pushnumber(L, (lua_Number)(s2-s+1));
+      lua_pushnumber(L, (lua_Number)(s2-s+l2));
+      return 2;
+    }
+  }
+  else {
+    MatchState ms;
+    int anchor = (*p == '^') ? (p++, 1) : 0;
+    const char *s1=s+init;
+    ms.L = L;
+    ms.src_init = s;
+    ms.src_end = s+l1;
+    do {
+      const char *res;
+      ms.level = 0;
+      if ((res=match(&ms, s1, p)) != NULL) {
+        lua_pushnumber(L, (lua_Number)(s1-s+1));  /* start */
+        lua_pushnumber(L, (lua_Number)(res-s));   /* end */
+        return push_captures(&ms, NULL, 0) + 2;
+      }
+    } while (s1++<ms.src_end && !anchor);
+  }
+  lua_pushnil(L);  /* not found */
+  return 1;
+}
+
+
+static int gfind_aux (lua_State *L) {
+  MatchState ms;
+  const char *s = lua_tostring(L, lua_upvalueindex(1));
+  size_t ls = lua_strlen(L, lua_upvalueindex(1));
+  const char *p = lua_tostring(L, lua_upvalueindex(2));
+  const char *src;
+  ms.L = L;
+  ms.src_init = s;
+  ms.src_end = s+ls;
+  for (src = s + (size_t)lua_tonumber(L, lua_upvalueindex(3));
+       src <= ms.src_end;
+       src++) {
+    const char *e;
+    ms.level = 0;
+    if ((e = match(&ms, src, p)) != NULL) {
+      int newstart = e-s;
+      if (e == src) newstart++;  /* empty match? go at least one position */
+      lua_pushnumber(L, (lua_Number)newstart);
+      lua_replace(L, lua_upvalueindex(3));
+      return push_captures(&ms, src, e);
+    }
+  }
+  return 0;  /* not found */
+}
+
+
+static int gfind (lua_State *L) {
+  luaL_checkstring(L, 1);
+  luaL_checkstring(L, 2);
+  lua_settop(L, 2);
+  lua_pushnumber(L, 0);
+  lua_pushcclosure(L, gfind_aux, 3);
+  return 1;
+}
+
+
+static void add_s (MatchState *ms, luaL_Buffer *b,
+                   const char *s, const char *e) {
+  lua_State *L = ms->L;
+  if (lua_isstring(L, 3)) {
+    const char *news = lua_tostring(L, 3);
+    size_t l = lua_strlen(L, 3);
+    size_t i;
+    for (i=0; i<l; i++) {
+      if (news[i] != ESC)
+        luaL_putchar(b, news[i]);
+      else {
+        i++;  /* skip ESC */
+        if (!isdigit(uchar(news[i])))
+          luaL_putchar(b, news[i]);
+        else {
+          int level = check_capture(ms, news[i]);
+          push_onecapture(ms, level);
+          luaL_addvalue(b);  /* add capture to accumulated result */
+        }
+      }
+    }
+  }
+  else {  /* is a function */
+    int n;
+    lua_pushvalue(L, 3);
+    n = push_captures(ms, s, e);
+    lua_call(L, n, 1);
+    if (lua_isstring(L, -1))
+      luaL_addvalue(b);  /* add return to accumulated result */
+    else
+      lua_pop(L, 1);  /* function result is not a string: pop it */
+  }
+}
+
+
+static int str_gsub (lua_State *L) {
+  size_t srcl;
+  const char *src = luaL_checklstring(L, 1, &srcl);
+  const char *p = luaL_checkstring(L, 2);
+  int max_s = luaL_optint(L, 4, srcl+1);
+  int anchor = (*p == '^') ? (p++, 1) : 0;
+  int n = 0;
+  MatchState ms;
+  luaL_Buffer b;
+  luaL_argcheck(L,
+    lua_gettop(L) >= 3 && (lua_isstring(L, 3) || lua_isfunction(L, 3)),
+    3, "string or function expected");
+  luaL_buffinit(L, &b);
+  ms.L = L;
+  ms.src_init = src;
+  ms.src_end = src+srcl;
+  while (n < max_s) {
+    const char *e;
+    ms.level = 0;
+    e = match(&ms, src, p);
+    if (e) {
+      n++;
+      add_s(&ms, &b, src, e);
+    }
+    if (e && e>src) /* non empty match? */
+      src = e;  /* skip it */
+    else if (src < ms.src_end)
+      luaL_putchar(&b, *src++);
+    else break;
+    if (anchor) break;
+  }
+  luaL_addlstring(&b, src, ms.src_end-src);
+  luaL_pushresult(&b);
+  lua_pushnumber(L, (lua_Number)n);  /* number of substitutions */
+  return 2;
+}
+
+/* }====================================================== */
+
+
+/* maximum size of each formatted item (> len(format('%99.99f', -1e308))) */
+#define MAX_ITEM	512
+/* maximum size of each format specification (such as '%-099.99d') */
+#define MAX_FORMAT	20
+
+
+static void luaI_addquoted (lua_State *L, luaL_Buffer *b, int arg) {
+  size_t l;
+  const char *s = luaL_checklstring(L, arg, &l);
+  luaL_putchar(b, '"');
+  while (l--) {
+    switch (*s) {
+      case '"': case '\\': case '\n': {
+        luaL_putchar(b, '\\');
+        luaL_putchar(b, *s);
+        break;
+      }
+      case '\0': {
+        luaL_addlstring(b, "\\000", 4);
+        break;
+      }
+      default: {
+        luaL_putchar(b, *s);
+        break;
+      }
+    }
+    s++;
+  }
+  luaL_putchar(b, '"');
+}
+
+
+static const char *scanformat (lua_State *L, const char *strfrmt,
+                                 char *form, int *hasprecision) {
+  const char *p = strfrmt;
+  while (strchr("-+ #0", *p)) p++;  /* skip flags */
+  if (isdigit(uchar(*p))) p++;  /* skip width */
+  if (isdigit(uchar(*p))) p++;  /* (2 digits at most) */
+  if (*p == '.') {
+    p++;
+    *hasprecision = 1;
+    if (isdigit(uchar(*p))) p++;  /* skip precision */
+    if (isdigit(uchar(*p))) p++;  /* (2 digits at most) */
+  }
+  if (isdigit(uchar(*p)))
+    luaL_error(L, "invalid format (width or precision too long)");
+  if (p-strfrmt+2 > MAX_FORMAT)  /* +2 to include `%' and the specifier */
+    luaL_error(L, "invalid format (too long)");
+  form[0] = '%';
+  strncpy(form+1, strfrmt, p-strfrmt+1);
+  form[p-strfrmt+2] = 0;
+  return p;
+}
+
+
+static int str_format (lua_State *L) {
+  int arg = 1;
+  size_t sfl;
+  const char *strfrmt = luaL_checklstring(L, arg, &sfl);
+  const char *strfrmt_end = strfrmt+sfl;
+  luaL_Buffer b;
+  luaL_buffinit(L, &b);
+  while (strfrmt < strfrmt_end) {
+    if (*strfrmt != '%')
+      luaL_putchar(&b, *strfrmt++);
+    else if (*++strfrmt == '%')
+      luaL_putchar(&b, *strfrmt++);  /* %% */
+    else { /* format item */
+      char form[MAX_FORMAT];  /* to store the format (`%...') */
+      char buff[MAX_ITEM];  /* to store the formatted item */
+      int hasprecision = 0;
+      if (isdigit(uchar(*strfrmt)) && *(strfrmt+1) == '$')
+        return luaL_error(L, "obsolete option (d$) to `format'");
+      arg++;
+      strfrmt = scanformat(L, strfrmt, form, &hasprecision);
+      switch (*strfrmt++) {
+        case 'c':  case 'd':  case 'i': {
+          sprintf(buff, form, luaL_checkint(L, arg));
+          break;
+        }
+        case 'o':  case 'u':  case 'x':  case 'X': {
+          sprintf(buff, form, (unsigned int)(luaL_checknumber(L, arg)));
+          break;
+        }
+        case 'e':  case 'E': case 'f':
+        case 'g': case 'G': {
+          sprintf(buff, form, luaL_checknumber(L, arg));
+          break;
+        }
+        case 'q': {
+          luaI_addquoted(L, &b, arg);
+          continue;  /* skip the `addsize' at the end */
+        }
+        case 's': {
+          size_t l;
+          const char *s = luaL_checklstring(L, arg, &l);
+          if (!hasprecision && l >= 100) {
+            /* no precision and string is too long to be formatted;
+               keep original string */
+            lua_pushvalue(L, arg);
+            luaL_addvalue(&b);
+            continue;  /* skip the `addsize' at the end */
+          }
+          else {
+            sprintf(buff, form, s);
+            break;
+          }
+        }
+        default: {  /* also treat cases `pnLlh' */
+          return luaL_error(L, "invalid option to `format'");
+        }
+      }
+      luaL_addlstring(&b, buff, strlen(buff));
+    }
+  }
+  luaL_pushresult(&b);
+  return 1;
+}
+
+
+static const luaL_reg strlib[] = {
+  {"len", str_len},
+  {"sub", str_sub},
+  {"lower", str_lower},
+  {"upper", str_upper},
+  {"char", str_char},
+  {"rep", str_rep},
+  {"byte", str_byte},
+  {"format", str_format},
+  {"dump", str_dump},
+  {"find", str_find},
+  {"gfind", gfind},
+  {"gsub", str_gsub},
+  {NULL, NULL}
+};
+
+
+/*
+** Open string library
+*/
+LUALIB_API int luaopen_string (lua_State *L) {
+  luaL_openlib(L, LUA_STRLIBNAME, strlib, 0);
+  return 1;
+}
+
diff --git a/main/source/lua/src/lib/ltablib.c b/main/source/lua/src/lib/ltablib.c
new file mode 100644
index 00000000..6b533da3
--- /dev/null
+++ b/main/source/lua/src/lib/ltablib.c
@@ -0,0 +1,250 @@
+/*
+** $Id: ltablib.c,v 1.21 2003/04/03 13:35:34 roberto Exp $
+** Library for Table Manipulation
+** See Copyright Notice in lua.h
+*/
+
+
+#include <stddef.h>
+
+#define ltablib_c
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+#define aux_getn(L,n)	(luaL_checktype(L, n, LUA_TTABLE), luaL_getn(L, n))
+
+
+static int luaB_foreachi (lua_State *L) {
+  int i;
+  int n = aux_getn(L, 1);
+  luaL_checktype(L, 2, LUA_TFUNCTION);
+  for (i=1; i<=n; i++) {
+    lua_pushvalue(L, 2);  /* function */
+    lua_pushnumber(L, (lua_Number)i);  /* 1st argument */
+    lua_rawgeti(L, 1, i);  /* 2nd argument */
+    lua_call(L, 2, 1);
+    if (!lua_isnil(L, -1))
+      return 1;
+    lua_pop(L, 1);  /* remove nil result */
+  }
+  return 0;
+}
+
+
+static int luaB_foreach (lua_State *L) {
+  luaL_checktype(L, 1, LUA_TTABLE);
+  luaL_checktype(L, 2, LUA_TFUNCTION);
+  lua_pushnil(L);  /* first key */
+  for (;;) {
+    if (lua_next(L, 1) == 0)
+      return 0;
+    lua_pushvalue(L, 2);  /* function */
+    lua_pushvalue(L, -3);  /* key */
+    lua_pushvalue(L, -3);  /* value */
+    lua_call(L, 2, 1);
+    if (!lua_isnil(L, -1))
+      return 1;
+    lua_pop(L, 2);  /* remove value and result */
+  }
+}
+
+
+static int luaB_getn (lua_State *L) {
+  lua_pushnumber(L, (lua_Number)aux_getn(L, 1));
+  return 1;
+}
+
+
+static int luaB_setn (lua_State *L) {
+  luaL_checktype(L, 1, LUA_TTABLE);
+  luaL_setn(L, 1, luaL_checkint(L, 2));
+  return 0;
+}
+
+
+static int luaB_tinsert (lua_State *L) {
+  int v = lua_gettop(L);  /* number of arguments */
+  int n = aux_getn(L, 1) + 1;
+  int pos;  /* where to insert new element */
+  if (v == 2)  /* called with only 2 arguments */
+    pos = n;  /* insert new element at the end */
+  else {
+    pos = luaL_checkint(L, 2);  /* 2nd argument is the position */
+    if (pos > n) n = pos;  /* `grow' array if necessary */
+    v = 3;  /* function may be called with more than 3 args */
+  }
+  luaL_setn(L, 1, n);  /* new size */
+  while (--n >= pos) {  /* move up elements */
+    lua_rawgeti(L, 1, n);
+    lua_rawseti(L, 1, n+1);  /* t[n+1] = t[n] */
+  }
+  lua_pushvalue(L, v);
+  lua_rawseti(L, 1, pos);  /* t[pos] = v */
+  return 0;
+}
+
+
+static int luaB_tremove (lua_State *L) {
+  int n = aux_getn(L, 1);
+  int pos = luaL_optint(L, 2, n);
+  if (n <= 0) return 0;  /* table is `empty' */
+  luaL_setn(L, 1, n-1);  /* t.n = n-1 */
+  lua_rawgeti(L, 1, pos);  /* result = t[pos] */
+  for ( ;pos<n; pos++) {
+    lua_rawgeti(L, 1, pos+1);
+    lua_rawseti(L, 1, pos);  /* t[pos] = t[pos+1] */
+  }
+  lua_pushnil(L);
+  lua_rawseti(L, 1, n);  /* t[n] = nil */
+  return 1;
+}
+
+
+static int str_concat (lua_State *L) {
+  luaL_Buffer b;
+  size_t lsep;
+  const char *sep = luaL_optlstring(L, 2, "", &lsep);
+  int i = luaL_optint(L, 3, 1);
+  int n = luaL_optint(L, 4, 0);
+  luaL_checktype(L, 1, LUA_TTABLE);
+  if (n == 0) n = luaL_getn(L, 1);
+  luaL_buffinit(L, &b);
+  for (; i <= n; i++) {
+    lua_rawgeti(L, 1, i);
+    luaL_argcheck(L, lua_isstring(L, -1), 1, "table contains non-strings");
+    luaL_addvalue(&b);
+    if (i != n)
+      luaL_addlstring(&b, sep, lsep);
+  }
+  luaL_pushresult(&b);
+  return 1;
+}
+
+
+
+/*
+** {======================================================
+** Quicksort
+** (based on `Algorithms in MODULA-3', Robert Sedgewick;
+**  Addison-Wesley, 1993.)
+*/
+
+
+static void set2 (lua_State *L, int i, int j) {
+  lua_rawseti(L, 1, i);
+  lua_rawseti(L, 1, j);
+}
+
+static int sort_comp (lua_State *L, int a, int b) {
+  if (!lua_isnil(L, 2)) {  /* function? */
+    int res;
+    lua_pushvalue(L, 2);
+    lua_pushvalue(L, a-1);  /* -1 to compensate function */
+    lua_pushvalue(L, b-2);  /* -2 to compensate function and `a' */
+    lua_call(L, 2, 1);
+    res = lua_toboolean(L, -1);
+    lua_pop(L, 1);
+    return res;
+  }
+  else  /* a < b? */
+    return lua_lessthan(L, a, b);
+}
+
+static void auxsort (lua_State *L, int l, int u) {
+  while (l < u) {  /* for tail recursion */
+    int i, j;
+    /* sort elements a[l], a[(l+u)/2] and a[u] */
+    lua_rawgeti(L, 1, l);
+    lua_rawgeti(L, 1, u);
+    if (sort_comp(L, -1, -2))  /* a[u] < a[l]? */
+      set2(L, l, u);  /* swap a[l] - a[u] */
+    else
+      lua_pop(L, 2);
+    if (u-l == 1) break;  /* only 2 elements */
+    i = (l+u)/2;
+    lua_rawgeti(L, 1, i);
+    lua_rawgeti(L, 1, l);
+    if (sort_comp(L, -2, -1))  /* a[i]<a[l]? */
+      set2(L, i, l);
+    else {
+      lua_pop(L, 1);  /* remove a[l] */
+      lua_rawgeti(L, 1, u);
+      if (sort_comp(L, -1, -2))  /* a[u]<a[i]? */
+        set2(L, i, u);
+      else
+        lua_pop(L, 2);
+    }
+    if (u-l == 2) break;  /* only 3 elements */
+    lua_rawgeti(L, 1, i);  /* Pivot */
+    lua_pushvalue(L, -1);
+    lua_rawgeti(L, 1, u-1);
+    set2(L, i, u-1);
+    /* a[l] <= P == a[u-1] <= a[u], only need to sort from l+1 to u-2 */
+    i = l; j = u-1;
+    for (;;) {  /* invariant: a[l..i] <= P <= a[j..u] */
+      /* repeat ++i until a[i] >= P */
+      while (lua_rawgeti(L, 1, ++i), sort_comp(L, -1, -2)) {
+        if (i>u) luaL_error(L, "invalid order function for sorting");
+        lua_pop(L, 1);  /* remove a[i] */
+      }
+      /* repeat --j until a[j] <= P */
+      while (lua_rawgeti(L, 1, --j), sort_comp(L, -3, -1)) {
+        if (j<l) luaL_error(L, "invalid order function for sorting");
+        lua_pop(L, 1);  /* remove a[j] */
+      }
+      if (j<i) {
+        lua_pop(L, 3);  /* pop pivot, a[i], a[j] */
+        break;
+      }
+      set2(L, i, j);
+    }
+    lua_rawgeti(L, 1, u-1);
+    lua_rawgeti(L, 1, i);
+    set2(L, u-1, i);  /* swap pivot (a[u-1]) with a[i] */
+    /* a[l..i-1] <= a[i] == P <= a[i+1..u] */
+    /* adjust so that smaller half is in [j..i] and larger one in [l..u] */
+    if (i-l < u-i) {
+      j=l; i=i-1; l=i+2;
+    }
+    else {
+      j=i+1; i=u; u=j-2;
+    }
+    auxsort(L, j, i);  /* call recursively the smaller one */
+  }  /* repeat the routine for the larger one */
+}
+
+static int luaB_sort (lua_State *L) {
+  int n = aux_getn(L, 1);
+  luaL_checkstack(L, 40, "");  /* assume array is smaller than 2^40 */
+  if (!lua_isnoneornil(L, 2))  /* is there a 2nd argument? */
+    luaL_checktype(L, 2, LUA_TFUNCTION);
+  lua_settop(L, 2);  /* make sure there is two arguments */
+  auxsort(L, 1, n);
+  return 0;
+}
+
+/* }====================================================== */
+
+
+static const luaL_reg tab_funcs[] = {
+  {"concat", str_concat},
+  {"foreach", luaB_foreach},
+  {"foreachi", luaB_foreachi},
+  {"getn", luaB_getn},
+  {"setn", luaB_setn},
+  {"sort", luaB_sort},
+  {"insert", luaB_tinsert},
+  {"remove", luaB_tremove},
+  {NULL, NULL}
+};
+
+
+LUALIB_API int luaopen_table (lua_State *L) {
+  luaL_openlib(L, LUA_TABLIBNAME, tab_funcs, 0);
+  return 1;
+}
+
diff --git a/main/source/lua/src/llex.c b/main/source/lua/src/llex.c
new file mode 100644
index 00000000..9bbe62ea
--- /dev/null
+++ b/main/source/lua/src/llex.c
@@ -0,0 +1,417 @@
+/*
+** $Id: llex.c,v 1.119 2003/03/24 12:39:34 roberto Exp $
+** Lexical Analyzer
+** See Copyright Notice in lua.h
+*/
+
+
+#include <ctype.h>
+#include <string.h>
+
+#define llex_c
+
+#include "lua.h"
+
+#include "ldo.h"
+#include "llex.h"
+#include "lobject.h"
+#include "lparser.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "lzio.h"
+
+
+
+#define next(LS) (LS->current = zgetc(LS->z))
+
+
+
+/* ORDER RESERVED */
+static const char *const token2string [] = {
+    "and", "break", "do", "else", "elseif",
+    "end", "false", "for", "function", "if",
+    "in", "local", "nil", "not", "or", "repeat",
+    "return", "then", "true", "until", "while", "*name",
+    "..", "...", "==", ">=", "<=", "~=",
+    "*number", "*string", "<eof>"
+};
+
+
+void luaX_init (lua_State *L) {
+  int i;
+  for (i=0; i<NUM_RESERVED; i++) {
+    TString *ts = luaS_new(L, token2string[i]);
+    luaS_fix(ts);  /* reserved words are never collected */
+    lua_assert(strlen(token2string[i])+1 <= TOKEN_LEN);
+    ts->tsv.reserved = cast(lu_byte, i+1);  /* reserved word */
+  }
+}
+
+
+#define MAXSRC          80
+
+
+void luaX_checklimit (LexState *ls, int val, int limit, const char *msg) {
+  if (val > limit) {
+    msg = luaO_pushfstring(ls->L, "too many %s (limit=%d)", msg, limit);
+    luaX_syntaxerror(ls, msg);
+  }
+}
+
+
+void luaX_errorline (LexState *ls, const char *s, const char *token, int line) {
+  lua_State *L = ls->L;
+  char buff[MAXSRC];
+  luaO_chunkid(buff, getstr(ls->source), MAXSRC);
+  luaO_pushfstring(L, "%s:%d: %s near `%s'", buff, line, s, token); 
+  luaD_throw(L, LUA_ERRSYNTAX);
+}
+
+
+static void luaX_error (LexState *ls, const char *s, const char *token) {
+  luaX_errorline(ls, s, token, ls->linenumber);
+}
+
+
+void luaX_syntaxerror (LexState *ls, const char *msg) {
+  const char *lasttoken;
+  switch (ls->t.token) {
+    case TK_NAME:
+      lasttoken = getstr(ls->t.seminfo.ts);
+      break;
+    case TK_STRING:
+    case TK_NUMBER:
+      lasttoken = luaZ_buffer(ls->buff);
+      break;
+    default:
+      lasttoken = luaX_token2str(ls, ls->t.token);
+      break;
+  }
+  luaX_error(ls, msg, lasttoken);
+}
+
+
+const char *luaX_token2str (LexState *ls, int token) {
+  if (token < FIRST_RESERVED) {
+    lua_assert(token == (unsigned char)token);
+    return luaO_pushfstring(ls->L, "%c", token);
+  }
+  else
+    return token2string[token-FIRST_RESERVED];
+}
+
+
+static void luaX_lexerror (LexState *ls, const char *s, int token) {
+  if (token == TK_EOS)
+    luaX_error(ls, s, luaX_token2str(ls, token));
+  else
+    luaX_error(ls, s, luaZ_buffer(ls->buff));
+}
+
+
+static void inclinenumber (LexState *LS) {
+  next(LS);  /* skip `\n' */
+  ++LS->linenumber;
+  luaX_checklimit(LS, LS->linenumber, MAX_INT, "lines in a chunk");
+}
+
+
+void luaX_setinput (lua_State *L, LexState *LS, ZIO *z, TString *source) {
+  LS->L = L;
+  LS->lookahead.token = TK_EOS;  /* no look-ahead token */
+  LS->z = z;
+  LS->fs = NULL;
+  LS->linenumber = 1;
+  LS->lastline = 1;
+  LS->source = source;
+  next(LS);  /* read first char */
+  if (LS->current == '#') {
+    do {  /* skip first line */
+      next(LS);
+    } while (LS->current != '\n' && LS->current != EOZ);
+  }
+}
+
+
+
+/*
+** =======================================================
+** LEXICAL ANALYZER
+** =======================================================
+*/
+
+
+/* use buffer to store names, literal strings and numbers */
+
+/* extra space to allocate when growing buffer */
+#define EXTRABUFF	32
+
+/* maximum number of chars that can be read without checking buffer size */
+#define MAXNOCHECK	5
+
+#define checkbuffer(LS, len)	\
+    if (((len)+MAXNOCHECK)*sizeof(char) > luaZ_sizebuffer((LS)->buff)) \
+      luaZ_openspace((LS)->L, (LS)->buff, (len)+EXTRABUFF)
+
+#define save(LS, c, l) \
+	(luaZ_buffer((LS)->buff)[l++] = cast(char, c))
+#define save_and_next(LS, l)  (save(LS, LS->current, l), next(LS))
+
+
+static size_t readname (LexState *LS) {
+  size_t l = 0;
+  checkbuffer(LS, l);
+  do {
+    checkbuffer(LS, l);
+    save_and_next(LS, l);
+  } while (isalnum(LS->current) || LS->current == '_');
+  save(LS, '\0', l);
+  return l-1;
+}
+
+
+/* LUA_NUMBER */
+static void read_numeral (LexState *LS, int comma, SemInfo *seminfo) {
+  size_t l = 0;
+  checkbuffer(LS, l);
+  if (comma) save(LS, '.', l);
+  while (isdigit(LS->current)) {
+    checkbuffer(LS, l);
+    save_and_next(LS, l);
+  }
+  if (LS->current == '.') {
+    save_and_next(LS, l);
+    if (LS->current == '.') {
+      save_and_next(LS, l);
+      save(LS, '\0', l);
+      luaX_lexerror(LS,
+                 "ambiguous syntax (decimal point x string concatenation)",
+                 TK_NUMBER);
+    }
+  }
+  while (isdigit(LS->current)) {
+    checkbuffer(LS, l);
+    save_and_next(LS, l);
+  }
+  if (LS->current == 'e' || LS->current == 'E') {
+    save_and_next(LS, l);  /* read `E' */
+    if (LS->current == '+' || LS->current == '-')
+      save_and_next(LS, l);  /* optional exponent sign */
+    while (isdigit(LS->current)) {
+      checkbuffer(LS, l);
+      save_and_next(LS, l);
+    }
+  }
+  save(LS, '\0', l);
+  if (!luaO_str2d(luaZ_buffer(LS->buff), &seminfo->r))
+    luaX_lexerror(LS, "malformed number", TK_NUMBER);
+}
+
+
+static void read_long_string (LexState *LS, SemInfo *seminfo) {
+  int cont = 0;
+  size_t l = 0;
+  checkbuffer(LS, l);
+  save(LS, '[', l);  /* save first `[' */
+  save_and_next(LS, l);  /* pass the second `[' */
+  if (LS->current == '\n')  /* string starts with a newline? */
+    inclinenumber(LS);  /* skip it */
+  for (;;) {
+    checkbuffer(LS, l);
+    switch (LS->current) {
+      case EOZ:
+        save(LS, '\0', l);
+        luaX_lexerror(LS, (seminfo) ? "unfinished long string" :
+                                   "unfinished long comment", TK_EOS);
+        break;  /* to avoid warnings */
+      case '[':
+        save_and_next(LS, l);
+        if (LS->current == '[') {
+          cont++;
+          save_and_next(LS, l);
+        }
+        continue;
+      case ']':
+        save_and_next(LS, l);
+        if (LS->current == ']') {
+          if (cont == 0) goto endloop;
+          cont--;
+          save_and_next(LS, l);
+        }
+        continue;
+      case '\n':
+        save(LS, '\n', l);
+        inclinenumber(LS);
+        if (!seminfo) l = 0;  /* reset buffer to avoid wasting space */
+        continue;
+      default:
+        save_and_next(LS, l);
+    }
+  } endloop:
+  save_and_next(LS, l);  /* skip the second `]' */
+  save(LS, '\0', l);
+  if (seminfo)
+    seminfo->ts = luaS_newlstr(LS->L, luaZ_buffer(LS->buff) + 2, l - 5);
+}
+
+
+static void read_string (LexState *LS, int del, SemInfo *seminfo) {
+  size_t l = 0;
+  checkbuffer(LS, l);
+  save_and_next(LS, l);
+  while (LS->current != del) {
+    checkbuffer(LS, l);
+    switch (LS->current) {
+      case EOZ:
+        save(LS, '\0', l);
+        luaX_lexerror(LS, "unfinished string", TK_EOS);
+        break;  /* to avoid warnings */
+      case '\n':
+        save(LS, '\0', l);
+        luaX_lexerror(LS, "unfinished string", TK_STRING);
+        break;  /* to avoid warnings */
+      case '\\':
+        next(LS);  /* do not save the `\' */
+        switch (LS->current) {
+          case 'a': save(LS, '\a', l); next(LS); break;
+          case 'b': save(LS, '\b', l); next(LS); break;
+          case 'f': save(LS, '\f', l); next(LS); break;
+          case 'n': save(LS, '\n', l); next(LS); break;
+          case 'r': save(LS, '\r', l); next(LS); break;
+          case 't': save(LS, '\t', l); next(LS); break;
+          case 'v': save(LS, '\v', l); next(LS); break;
+          case '\n': save(LS, '\n', l); inclinenumber(LS); break;
+          case EOZ: break;  /* will raise an error next loop */
+          default: {
+            if (!isdigit(LS->current))
+              save_and_next(LS, l);  /* handles \\, \", \', and \? */
+            else {  /* \xxx */
+              int c = 0;
+              int i = 0;
+              do {
+                c = 10*c + (LS->current-'0');
+                next(LS);
+              } while (++i<3 && isdigit(LS->current));
+              if (c > UCHAR_MAX) {
+                save(LS, '\0', l);
+                luaX_lexerror(LS, "escape sequence too large", TK_STRING);
+              }
+              save(LS, c, l);
+            }
+          }
+        }
+        break;
+      default:
+        save_and_next(LS, l);
+    }
+  }
+  save_and_next(LS, l);  /* skip delimiter */
+  save(LS, '\0', l);
+  seminfo->ts = luaS_newlstr(LS->L, luaZ_buffer(LS->buff) + 1, l - 3);
+}
+
+
+int luaX_lex (LexState *LS, SemInfo *seminfo) {
+  for (;;) {
+    switch (LS->current) {
+
+      case '\n': {
+        inclinenumber(LS);
+        continue;
+      }
+      case '-': {
+        next(LS);
+        if (LS->current != '-') return '-';
+        /* else is a comment */
+        next(LS);
+        if (LS->current == '[' && (next(LS), LS->current == '['))
+          read_long_string(LS, NULL);  /* long comment */
+        else  /* short comment */
+          while (LS->current != '\n' && LS->current != EOZ)
+            next(LS);
+        continue;
+      }
+      case '[': {
+        next(LS);
+        if (LS->current != '[') return '[';
+        else {
+          read_long_string(LS, seminfo);
+          return TK_STRING;
+        }
+      }
+      case '=': {
+        next(LS);
+        if (LS->current != '=') return '=';
+        else { next(LS); return TK_EQ; }
+      }
+      case '<': {
+        next(LS);
+        if (LS->current != '=') return '<';
+        else { next(LS); return TK_LE; }
+      }
+      case '>': {
+        next(LS);
+        if (LS->current != '=') return '>';
+        else { next(LS); return TK_GE; }
+      }
+      case '~': {
+        next(LS);
+        if (LS->current != '=') return '~';
+        else { next(LS); return TK_NE; }
+      }
+      case '"':
+      case '\'': {
+        read_string(LS, LS->current, seminfo);
+        return TK_STRING;
+      }
+      case '.': {
+        next(LS);
+        if (LS->current == '.') {
+          next(LS);
+          if (LS->current == '.') {
+            next(LS);
+            return TK_DOTS;   /* ... */
+          }
+          else return TK_CONCAT;   /* .. */
+        }
+        else if (!isdigit(LS->current)) return '.';
+        else {
+          read_numeral(LS, 1, seminfo);
+          return TK_NUMBER;
+        }
+      }
+      case EOZ: {
+        return TK_EOS;
+      }
+      default: {
+        if (isspace(LS->current)) {
+          next(LS);
+          continue;
+        }
+        else if (isdigit(LS->current)) {
+          read_numeral(LS, 0, seminfo);
+          return TK_NUMBER;
+        }
+        else if (isalpha(LS->current) || LS->current == '_') {
+          /* identifier or reserved word */
+          size_t l = readname(LS);
+          TString *ts = luaS_newlstr(LS->L, luaZ_buffer(LS->buff), l);
+          if (ts->tsv.reserved > 0)  /* reserved word? */
+            return ts->tsv.reserved - 1 + FIRST_RESERVED;
+          seminfo->ts = ts;
+          return TK_NAME;
+        }
+        else {
+          int c = LS->current;
+          if (iscntrl(c))
+            luaX_error(LS, "invalid control char",
+                           luaO_pushfstring(LS->L, "char(%d)", c));
+          next(LS);
+          return c;  /* single-char tokens (+ - / ...) */
+        }
+      }
+    }
+  }
+}
+
+#undef next
diff --git a/main/source/lua/src/llex.h b/main/source/lua/src/llex.h
new file mode 100644
index 00000000..79620e81
--- /dev/null
+++ b/main/source/lua/src/llex.h
@@ -0,0 +1,75 @@
+/*
+** $Id: llex.h,v 1.47 2003/02/28 17:19:47 roberto Exp $
+** Lexical Analyzer
+** See Copyright Notice in lua.h
+*/
+
+#ifndef llex_h
+#define llex_h
+
+#include "lobject.h"
+#include "lzio.h"
+
+
+#define FIRST_RESERVED	257
+
+/* maximum length of a reserved word */
+#define TOKEN_LEN	(sizeof("function")/sizeof(char))
+
+
+/*
+* WARNING: if you change the order of this enumeration,
+* grep "ORDER RESERVED"
+*/
+enum RESERVED {
+  /* terminal symbols denoted by reserved words */
+  TK_AND = FIRST_RESERVED, TK_BREAK,
+  TK_DO, TK_ELSE, TK_ELSEIF, TK_END, TK_FALSE, TK_FOR, TK_FUNCTION,
+  TK_IF, TK_IN, TK_LOCAL, TK_NIL, TK_NOT, TK_OR, TK_REPEAT,
+  TK_RETURN, TK_THEN, TK_TRUE, TK_UNTIL, TK_WHILE,
+  /* other terminal symbols */
+  TK_NAME, TK_CONCAT, TK_DOTS, TK_EQ, TK_GE, TK_LE, TK_NE, TK_NUMBER,
+  TK_STRING, TK_EOS
+};
+
+/* number of reserved words */
+#define NUM_RESERVED	(cast(int, TK_WHILE-FIRST_RESERVED+1))
+
+
+typedef union {
+  lua_Number r;
+  TString *ts;
+} SemInfo;  /* semantics information */
+
+
+typedef struct Token {
+  int token;
+  SemInfo seminfo;
+} Token;
+
+
+typedef struct LexState {
+  int current;  /* current character (charint) */
+  int linenumber;  /* input line counter */
+  int lastline;  /* line of last token `consumed' */
+  Token t;  /* current token */
+  Token lookahead;  /* look ahead token */
+  struct FuncState *fs;  /* `FuncState' is private to the parser */
+  struct lua_State *L;
+  ZIO *z;  /* input stream */
+  Mbuffer *buff;  /* buffer for tokens */
+  TString *source;  /* current source name */
+  int nestlevel;  /* level of nested non-terminals */
+} LexState;
+
+
+void luaX_init (lua_State *L);
+void luaX_setinput (lua_State *L, LexState *LS, ZIO *z, TString *source);
+int luaX_lex (LexState *LS, SemInfo *seminfo);
+void luaX_checklimit (LexState *ls, int val, int limit, const char *msg);
+void luaX_syntaxerror (LexState *ls, const char *s);
+void luaX_errorline (LexState *ls, const char *s, const char *token, int line);
+const char *luaX_token2str (LexState *ls, int token);
+
+
+#endif
diff --git a/main/source/lua/src/llimits.h b/main/source/lua/src/llimits.h
new file mode 100644
index 00000000..bcf69ebd
--- /dev/null
+++ b/main/source/lua/src/llimits.h
@@ -0,0 +1,185 @@
+/*
+** $Id: llimits.h,v 1.52 2003/02/20 19:33:23 roberto Exp $
+** Limits, basic types, and some other `installation-dependent' definitions
+** See Copyright Notice in lua.h
+*/
+
+#ifndef llimits_h
+#define llimits_h
+
+
+#include <limits.h>
+#include <stddef.h>
+
+
+#include "lua.h"
+
+
+/*
+** try to find number of bits in an integer
+*/
+#ifndef BITS_INT
+/* avoid overflows in comparison */
+#if INT_MAX-20 < 32760
+#define	BITS_INT	16
+#else
+#if INT_MAX > 2147483640L
+/* machine has at least 32 bits */
+#define BITS_INT	32
+#else
+#error "you must define BITS_INT with number of bits in an integer"
+#endif
+#endif
+#endif
+
+
+/*
+** the following types define integer types for values that may not
+** fit in a `small int' (16 bits), but may waste space in a
+** `large long' (64 bits). The current definitions should work in
+** any machine, but may not be optimal.
+*/
+
+/* an unsigned integer to hold hash values */
+typedef unsigned int lu_hash;
+/* its signed equivalent */
+typedef int ls_hash;
+
+/* an unsigned integer big enough to count the total memory used by Lua; */
+/* it should be at least as large as size_t */
+typedef unsigned long lu_mem;
+
+#define MAX_LUMEM	ULONG_MAX
+
+
+/* an integer big enough to count the number of strings in use */
+typedef long ls_nstr;
+
+/* chars used as small naturals (so that `char' is reserved for characters) */
+typedef unsigned char lu_byte;
+
+
+#define MAX_SIZET	((size_t)(~(size_t)0)-2)
+
+
+#define MAX_INT (INT_MAX-2)  /* maximum value of an int (-2 for safety) */
+
+/*
+** conversion of pointer to integer
+** this is for hashing only; there is no problem if the integer
+** cannot hold the whole pointer value
+*/
+#define IntPoint(p)  ((lu_hash)(p))
+
+
+
+/* type to ensure maximum alignment */
+#ifndef LUSER_ALIGNMENT_T
+typedef union { double u; void *s; long l; } L_Umaxalign;
+#else
+typedef LUSER_ALIGNMENT_T L_Umaxalign;
+#endif
+
+
+/* result of `usual argument conversion' over lua_Number */
+#ifndef LUA_UACNUMBER
+typedef double l_uacNumber;
+#else
+typedef LUA_UACNUMBER l_uacNumber;
+#endif
+
+
+#ifndef lua_assert
+#define lua_assert(c)		/* empty */
+#endif
+
+
+#ifndef check_exp
+#define check_exp(c,e)	(e)
+#endif
+
+
+#ifndef UNUSED
+#define UNUSED(x)	((void)(x))	/* to avoid warnings */
+#endif
+
+
+#ifndef cast
+#define cast(t, exp)	((t)(exp))
+#endif
+
+
+
+/*
+** type for virtual-machine instructions
+** must be an unsigned with (at least) 4 bytes (see details in lopcodes.h)
+*/
+typedef unsigned long Instruction;
+
+
+/* maximum depth for calls (unsigned short) */
+#ifndef LUA_MAXCALLS
+#define LUA_MAXCALLS        4096
+#endif
+
+
+/*
+** maximum depth for C calls (unsigned short): Not too big, or may
+** overflow the C stack...
+*/
+
+#ifndef LUA_MAXCCALLS
+#define LUA_MAXCCALLS        200
+#endif
+
+
+/* maximum size for the C stack */
+#ifndef LUA_MAXCSTACK
+#define LUA_MAXCSTACK        2048
+#endif
+
+
+/* maximum stack for a Lua function */
+#define MAXSTACK	250
+
+
+/* maximum number of variables declared in a function */
+#ifndef MAXVARS
+#define MAXVARS 200           /* arbitrary limit (<MAXSTACK) */
+#endif
+
+
+/* maximum number of upvalues per function */
+#ifndef MAXUPVALUES
+#define MAXUPVALUES	32
+#endif
+
+
+/* maximum number of parameters in a function */
+#ifndef MAXPARAMS
+#define MAXPARAMS 100           /* arbitrary limit (<MAXLOCALS) */
+#endif
+
+
+/* minimum size for the string table (must be power of 2) */
+#ifndef MINSTRTABSIZE
+#define MINSTRTABSIZE	32
+#endif
+
+
+/* minimum size for string buffer */
+#ifndef LUA_MINBUFFER
+#define LUA_MINBUFFER	32
+#endif
+
+
+/*
+** maximum number of syntactical nested non-terminals: Not too big,
+** or may overflow the C stack...
+*/
+#ifndef LUA_MAXPARSERLEVEL
+#define LUA_MAXPARSERLEVEL	200
+#endif
+
+
+#endif
diff --git a/main/source/lua/src/lmem.c b/main/source/lua/src/lmem.c
new file mode 100644
index 00000000..87b9dffe
--- /dev/null
+++ b/main/source/lua/src/lmem.c
@@ -0,0 +1,91 @@
+/*
+** $Id: lmem.c,v 1.61 2002/12/04 17:38:31 roberto Exp $
+** Interface to Memory Manager
+** See Copyright Notice in lua.h
+*/
+
+
+#include <stdlib.h>
+
+#define lmem_c
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+
+
+
+/*
+** definition for realloc function. It must assure that l_realloc(NULL,
+** 0, x) allocates a new block (ANSI C assures that). (`os' is the old
+** block size; some allocators may use that.)
+*/
+#ifndef l_realloc
+#define l_realloc(b,os,s)	realloc(b,s)
+#endif
+
+/*
+** definition for free function. (`os' is the old block size; some
+** allocators may use that.)
+*/
+#ifndef l_free
+#define l_free(b,os)	free(b)
+#endif
+
+
+#define MINSIZEARRAY	4
+
+
+void *luaM_growaux (lua_State *L, void *block, int *size, int size_elems,
+                    int limit, const char *errormsg) {
+  void *newblock;
+  int newsize = (*size)*2;
+  if (newsize < MINSIZEARRAY)
+    newsize = MINSIZEARRAY;  /* minimum size */
+  else if (*size >= limit/2) {  /* cannot double it? */
+    if (*size < limit - MINSIZEARRAY)  /* try something smaller... */
+      newsize = limit;  /* still have at least MINSIZEARRAY free places */
+    else luaG_runerror(L, errormsg);
+  }
+  newblock = luaM_realloc(L, block,
+                          cast(lu_mem, *size)*cast(lu_mem, size_elems),
+                          cast(lu_mem, newsize)*cast(lu_mem, size_elems));
+  *size = newsize;  /* update only when everything else is OK */
+  return newblock;
+}
+
+
+/*
+** generic allocation routine.
+*/
+void *luaM_realloc (lua_State *L, void *block, lu_mem oldsize, lu_mem size) {
+  lua_assert((oldsize == 0) == (block == NULL));
+  if (size == 0) {
+    if (block != NULL) {
+      l_free(block, oldsize);
+      block = NULL;
+    }
+    else return NULL;  /* avoid `nblocks' computations when oldsize==size==0 */
+  }
+  else if (size >= MAX_SIZET)
+    luaG_runerror(L, "memory allocation error: block too big");
+  else {
+    block = l_realloc(block, oldsize, size);
+    if (block == NULL) {
+      if (L)
+        luaD_throw(L, LUA_ERRMEM);
+      else return NULL;  /* error before creating state! */
+    }
+  }
+  if (L) {
+    lua_assert(G(L) != NULL && G(L)->nblocks > 0);
+    G(L)->nblocks -= oldsize;
+    G(L)->nblocks += size;
+  }
+  return block;
+}
+
diff --git a/main/source/lua/src/lmem.h b/main/source/lua/src/lmem.h
new file mode 100644
index 00000000..bc855d49
--- /dev/null
+++ b/main/source/lua/src/lmem.h
@@ -0,0 +1,44 @@
+/*
+** $Id: lmem.h,v 1.26 2002/05/01 20:40:42 roberto Exp $
+** Interface to Memory Manager
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lmem_h
+#define lmem_h
+
+
+#include <stddef.h>
+
+#include "llimits.h"
+#include "lua.h"
+
+#define MEMERRMSG	"not enough memory"
+
+
+void *luaM_realloc (lua_State *L, void *oldblock, lu_mem oldsize, lu_mem size);
+
+void *luaM_growaux (lua_State *L, void *block, int *size, int size_elem,
+                    int limit, const char *errormsg);
+
+#define luaM_free(L, b, s)	luaM_realloc(L, (b), (s), 0)
+#define luaM_freelem(L, b)	luaM_realloc(L, (b), sizeof(*(b)), 0)
+#define luaM_freearray(L, b, n, t)	luaM_realloc(L, (b), \
+                                      cast(lu_mem, n)*cast(lu_mem, sizeof(t)), 0)
+
+#define luaM_malloc(L, t)	luaM_realloc(L, NULL, 0, (t))
+#define luaM_new(L, t)          cast(t *, luaM_malloc(L, sizeof(t)))
+#define luaM_newvector(L, n,t)  cast(t *, luaM_malloc(L, \
+                                         cast(lu_mem, n)*cast(lu_mem, sizeof(t))))
+
+#define luaM_growvector(L,v,nelems,size,t,limit,e) \
+          if (((nelems)+1) > (size)) \
+            ((v)=cast(t *, luaM_growaux(L,v,&(size),sizeof(t),limit,e)))
+
+#define luaM_reallocvector(L, v,oldn,n,t) \
+   ((v)=cast(t *, luaM_realloc(L, v,cast(lu_mem, oldn)*cast(lu_mem, sizeof(t)), \
+                                    cast(lu_mem, n)*cast(lu_mem, sizeof(t)))))
+
+
+#endif
+
diff --git a/main/source/lua/src/lobject.c b/main/source/lua/src/lobject.c
new file mode 100644
index 00000000..7ad4742b
--- /dev/null
+++ b/main/source/lua/src/lobject.c
@@ -0,0 +1,195 @@
+/*
+** $Id: lobject.c,v 1.97 2003/04/03 13:35:34 roberto Exp $
+** Some generic functions over Lua objects
+** See Copyright Notice in lua.h
+*/
+
+#include <ctype.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define lobject_c
+
+#include "lua.h"
+
+#include "ldo.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "lvm.h"
+
+
+/* function to convert a string to a lua_Number */
+#ifndef lua_str2number
+#define lua_str2number(s,p)     strtod((s), (p))
+#endif
+
+
+const TObject luaO_nilobject = {LUA_TNIL, {NULL}};
+
+
+/*
+** converts an integer to a "floating point byte", represented as
+** (mmmmmxxx), where the real value is (xxx) * 2^(mmmmm)
+*/
+int luaO_int2fb (unsigned int x) {
+  int m = 0;  /* mantissa */
+  while (x >= (1<<3)) {
+    x = (x+1) >> 1;
+    m++;
+  }
+  return (m << 3) | cast(int, x);
+}
+
+
+int luaO_log2 (unsigned int x) {
+  static const lu_byte log_8[255] = {
+    0,
+    1,1,
+    2,2,2,2,
+    3,3,3,3,3,3,3,3,
+    4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+    5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+    6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+    6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
+  };
+  if (x >= 0x00010000) {
+    if (x >= 0x01000000) return log_8[((x>>24) & 0xff) - 1]+24;
+    else return log_8[((x>>16) & 0xff) - 1]+16;
+  }
+  else {
+    if (x >= 0x00000100) return log_8[((x>>8) & 0xff) - 1]+8;
+    else if (x) return log_8[(x & 0xff) - 1];
+    return -1;  /* special `log' for 0 */
+  }
+}
+
+
+int luaO_rawequalObj (const TObject *t1, const TObject *t2) {
+  if (ttype(t1) != ttype(t2)) return 0;
+  else switch (ttype(t1)) {
+    case LUA_TNIL:
+      return 1;
+    case LUA_TNUMBER:
+      return nvalue(t1) == nvalue(t2);
+    case LUA_TBOOLEAN:
+      return bvalue(t1) == bvalue(t2);  /* boolean true must be 1 !! */
+    case LUA_TLIGHTUSERDATA:
+      return pvalue(t1) == pvalue(t2);
+    default:
+      lua_assert(iscollectable(t1));
+      return gcvalue(t1) == gcvalue(t2);
+  }
+}
+
+
+int luaO_str2d (const char *s, lua_Number *result) {
+  char *endptr;
+  lua_Number res = lua_str2number(s, &endptr);
+  if (endptr == s) return 0;  /* no conversion */
+  while (isspace((unsigned char)(*endptr))) endptr++;
+  if (*endptr != '\0') return 0;  /* invalid trailing characters? */
+  *result = res;
+  return 1;
+}
+
+
+
+static void pushstr (lua_State *L, const char *str) {
+  setsvalue2s(L->top, luaS_new(L, str));
+  incr_top(L);
+}
+
+
+/* this function handles only `%d', `%c', %f, and `%s' formats */
+const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) {
+  int n = 1;
+  pushstr(L, "");
+  for (;;) {
+    const char *e = strchr(fmt, '%');
+    if (e == NULL) break;
+    setsvalue2s(L->top, luaS_newlstr(L, fmt, e-fmt));
+    incr_top(L);
+    switch (*(e+1)) {
+      case 's':
+        pushstr(L, va_arg(argp, char *));
+        break;
+      case 'c': {
+        char buff[2];
+        buff[0] = cast(char, va_arg(argp, int));
+        buff[1] = '\0';
+        pushstr(L, buff);
+        break;
+      }
+      case 'd':
+        setnvalue(L->top, cast(lua_Number, va_arg(argp, int)));
+        incr_top(L);
+        break;
+      case 'f':
+        setnvalue(L->top, cast(lua_Number, va_arg(argp, l_uacNumber)));
+        incr_top(L);
+        break;
+      case '%':
+        pushstr(L, "%");
+        break;
+      default: lua_assert(0);
+    }
+    n += 2;
+    fmt = e+2;
+  }
+  pushstr(L, fmt);
+  luaV_concat(L, n+1, L->top - L->base - 1);
+  L->top -= n;
+  return svalue(L->top - 1);
+}
+
+
+const char *luaO_pushfstring (lua_State *L, const char *fmt, ...) {
+  const char *msg;
+  va_list argp;
+  va_start(argp, fmt);
+  msg = luaO_pushvfstring(L, fmt, argp);
+  va_end(argp);
+  return msg;
+}
+
+
+void luaO_chunkid (char *out, const char *source, int bufflen) {
+  if (*source == '=') {
+    strncpy(out, source+1, bufflen);  /* remove first char */
+    out[bufflen-1] = '\0';  /* ensures null termination */
+  }
+  else {  /* out = "source", or "...source" */
+    if (*source == '@') {
+      int l;
+      source++;  /* skip the `@' */
+      bufflen -= sizeof(" `...' ");
+      l = strlen(source);
+      strcpy(out, "");
+      if (l>bufflen) {
+        source += (l-bufflen);  /* get last part of file name */
+        strcat(out, "...");
+      }
+      strcat(out, source);
+    }
+    else {  /* out = [string "string"] */
+      int len = strcspn(source, "\n");  /* stop at first newline */
+      bufflen -= sizeof(" [string \"...\"] ");
+      if (len > bufflen) len = bufflen;
+      strcpy(out, "[string \"");
+      if (source[len] != '\0') {  /* must truncate? */
+        strncat(out, source, len);
+        strcat(out, "...");
+      }
+      else
+        strcat(out, source);
+      strcat(out, "\"]");
+    }
+  }
+}
diff --git a/main/source/lua/src/lobject.h b/main/source/lua/src/lobject.h
new file mode 100644
index 00000000..c73a52e0
--- /dev/null
+++ b/main/source/lua/src/lobject.h
@@ -0,0 +1,336 @@
+/*
+** $Id: lobject.h,v 1.159 2003/03/18 12:50:04 roberto Exp $
+** Type definitions for Lua objects
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lobject_h
+#define lobject_h
+
+
+#include "llimits.h"
+#include "lua.h"
+
+
+/* tags for values visible from Lua */
+#define NUM_TAGS	LUA_TTHREAD
+
+
+/*
+** Extra tags for non-values
+*/
+#define LUA_TPROTO	(NUM_TAGS+1)
+#define LUA_TUPVAL	(NUM_TAGS+2)
+
+
+/*
+** Union of all collectable objects
+*/
+typedef union GCObject GCObject;
+
+
+/*
+** Common Header for all collectable objects (in macro form, to be
+** included in other objects)
+*/
+#define CommonHeader	GCObject *next; lu_byte tt; lu_byte marked
+
+
+/*
+** Common header in struct form
+*/
+typedef struct GCheader {
+  CommonHeader;
+} GCheader;
+
+
+
+
+/*
+** Union of all Lua values
+*/
+typedef union {
+  GCObject *gc;
+  void *p;
+  lua_Number n;
+  int b;
+} Value;
+
+
+/*
+** Lua values (or `tagged objects')
+*/
+typedef struct lua_TObject {
+  int tt;
+  Value value;
+} TObject;
+
+
+/* Macros to test type */
+#define ttisnil(o)	(ttype(o) == LUA_TNIL)
+#define ttisnumber(o)	(ttype(o) == LUA_TNUMBER)
+#define ttisstring(o)	(ttype(o) == LUA_TSTRING)
+#define ttistable(o)	(ttype(o) == LUA_TTABLE)
+#define ttisfunction(o)	(ttype(o) == LUA_TFUNCTION)
+#define ttisboolean(o)	(ttype(o) == LUA_TBOOLEAN)
+#define ttisuserdata(o)	(ttype(o) == LUA_TUSERDATA)
+#define ttisthread(o)	(ttype(o) == LUA_TTHREAD)
+#define ttislightuserdata(o)	(ttype(o) == LUA_TLIGHTUSERDATA)
+
+/* Macros to access values */
+#define ttype(o)	((o)->tt)
+#define gcvalue(o)	check_exp(iscollectable(o), (o)->value.gc)
+#define pvalue(o)	check_exp(ttislightuserdata(o), (o)->value.p)
+#define nvalue(o)	check_exp(ttisnumber(o), (o)->value.n)
+#define tsvalue(o)	check_exp(ttisstring(o), &(o)->value.gc->ts)
+#define uvalue(o)	check_exp(ttisuserdata(o), &(o)->value.gc->u)
+#define clvalue(o)	check_exp(ttisfunction(o), &(o)->value.gc->cl)
+#define hvalue(o)	check_exp(ttistable(o), &(o)->value.gc->h)
+#define bvalue(o)	check_exp(ttisboolean(o), (o)->value.b)
+#define thvalue(o)	check_exp(ttisthread(o), &(o)->value.gc->th)
+
+#define l_isfalse(o)	(ttisnil(o) || (ttisboolean(o) && bvalue(o) == 0))
+
+/* Macros to set values */
+#define setnvalue(obj,x) \
+  { TObject *i_o=(obj); i_o->tt=LUA_TNUMBER; i_o->value.n=(x); }
+
+#define chgnvalue(obj,x) \
+	check_exp(ttype(obj)==LUA_TNUMBER, (obj)->value.n=(x))
+
+#define setpvalue(obj,x) \
+  { TObject *i_o=(obj); i_o->tt=LUA_TLIGHTUSERDATA; i_o->value.p=(x); }
+
+#define setbvalue(obj,x) \
+  { TObject *i_o=(obj); i_o->tt=LUA_TBOOLEAN; i_o->value.b=(x); }
+
+#define setsvalue(obj,x) \
+  { TObject *i_o=(obj); i_o->tt=LUA_TSTRING; \
+    i_o->value.gc=cast(GCObject *, (x)); \
+    lua_assert(i_o->value.gc->gch.tt == LUA_TSTRING); }
+
+#define setuvalue(obj,x) \
+  { TObject *i_o=(obj); i_o->tt=LUA_TUSERDATA; \
+    i_o->value.gc=cast(GCObject *, (x)); \
+    lua_assert(i_o->value.gc->gch.tt == LUA_TUSERDATA); }
+
+#define setthvalue(obj,x) \
+  { TObject *i_o=(obj); i_o->tt=LUA_TTHREAD; \
+    i_o->value.gc=cast(GCObject *, (x)); \
+    lua_assert(i_o->value.gc->gch.tt == LUA_TTHREAD); }
+
+#define setclvalue(obj,x) \
+  { TObject *i_o=(obj); i_o->tt=LUA_TFUNCTION; \
+    i_o->value.gc=cast(GCObject *, (x)); \
+    lua_assert(i_o->value.gc->gch.tt == LUA_TFUNCTION); }
+
+#define sethvalue(obj,x) \
+  { TObject *i_o=(obj); i_o->tt=LUA_TTABLE; \
+    i_o->value.gc=cast(GCObject *, (x)); \
+    lua_assert(i_o->value.gc->gch.tt == LUA_TTABLE); }
+
+#define setnilvalue(obj) ((obj)->tt=LUA_TNIL)
+
+
+
+/*
+** for internal debug only
+*/
+#define checkconsistency(obj) \
+  lua_assert(!iscollectable(obj) || (ttype(obj) == (obj)->value.gc->gch.tt))
+
+
+#define setobj(obj1,obj2) \
+  { const TObject *o2=(obj2); TObject *o1=(obj1); \
+    checkconsistency(o2); \
+    o1->tt=o2->tt; o1->value = o2->value; }
+
+
+/*
+** different types of sets, according to destination
+*/
+
+/* from stack to (same) stack */
+#define setobjs2s	setobj
+/* to stack (not from same stack) */
+#define setobj2s	setobj
+#define setsvalue2s	setsvalue
+/* from table to same table */
+#define setobjt2t	setobj
+/* to table */
+#define setobj2t	setobj
+/* to new object */
+#define setobj2n	setobj
+#define setsvalue2n	setsvalue
+
+#define setttype(obj, tt) (ttype(obj) = (tt))
+
+
+#define iscollectable(o)	(ttype(o) >= LUA_TSTRING)
+
+
+
+typedef TObject *StkId;  /* index to stack elements */
+
+
+/*
+** String headers for string table
+*/
+typedef union TString {
+  L_Umaxalign dummy;  /* ensures maximum alignment for strings */
+  struct {
+    CommonHeader;
+    lu_byte reserved;
+    lu_hash hash;
+    size_t len;
+  } tsv;
+} TString;
+
+
+#define getstr(ts)	cast(const char *, (ts) + 1)
+#define svalue(o)       getstr(tsvalue(o))
+
+
+
+typedef union Udata {
+  L_Umaxalign dummy;  /* ensures maximum alignment for `local' udata */
+  struct {
+    CommonHeader;
+    struct Table *metatable;
+    size_t len;
+  } uv;
+} Udata;
+
+
+
+
+/*
+** Function Prototypes
+*/
+typedef struct Proto {
+  CommonHeader;
+  TObject *k;  /* constants used by the function */
+  Instruction *code;
+  struct Proto **p;  /* functions defined inside the function */
+  int *lineinfo;  /* map from opcodes to source lines */
+  struct LocVar *locvars;  /* information about local variables */
+  TString **upvalues;  /* upvalue names */
+  TString  *source;
+  int sizeupvalues;
+  int sizek;  /* size of `k' */
+  int sizecode;
+  int sizelineinfo;
+  int sizep;  /* size of `p' */
+  int sizelocvars;
+  int lineDefined;
+  GCObject *gclist;
+  lu_byte nups;  /* number of upvalues */
+  lu_byte numparams;
+  lu_byte is_vararg;
+  lu_byte maxstacksize;
+} Proto;
+
+
+typedef struct LocVar {
+  TString *varname;
+  int startpc;  /* first point where variable is active */
+  int endpc;    /* first point where variable is dead */
+} LocVar;
+
+
+
+/*
+** Upvalues
+*/
+
+typedef struct UpVal {
+  CommonHeader;
+  TObject *v;  /* points to stack or to its own value */
+  TObject value;  /* the value (when closed) */
+} UpVal;
+
+
+/*
+** Closures
+*/
+
+#define ClosureHeader \
+	CommonHeader; lu_byte isC; lu_byte nupvalues; GCObject *gclist
+
+typedef struct CClosure {
+  ClosureHeader;
+  lua_CFunction f;
+  TObject upvalue[1];
+} CClosure;
+
+
+typedef struct LClosure {
+  ClosureHeader;
+  struct Proto *p;
+  TObject g;  /* global table for this closure */
+  UpVal *upvals[1];
+} LClosure;
+
+
+typedef union Closure {
+  CClosure c;
+  LClosure l;
+} Closure;
+
+
+#define iscfunction(o)	(ttype(o) == LUA_TFUNCTION && clvalue(o)->c.isC)
+#define isLfunction(o)	(ttype(o) == LUA_TFUNCTION && !clvalue(o)->c.isC)
+
+
+/*
+** Tables
+*/
+
+typedef struct Node {
+  TObject i_key;
+  TObject i_val;
+  struct Node *next;  /* for chaining */
+} Node;
+
+
+typedef struct Table {
+  CommonHeader;
+  lu_byte flags;  /* 1<<p means tagmethod(p) is not present */ 
+  lu_byte lsizenode;  /* log2 of size of `node' array */
+  struct Table *metatable;
+  TObject *array;  /* array part */
+  Node *node;
+  Node *firstfree;  /* this position is free; all positions after it are full */
+  GCObject *gclist;
+  int sizearray;  /* size of `array' array */
+} Table;
+
+
+
+/*
+** `module' operation for hashing (size is always a power of 2)
+*/
+#define lmod(s,size) \
+	check_exp((size&(size-1))==0, (cast(int, (s) & ((size)-1))))
+
+
+#define twoto(x)	(1<<(x))
+#define sizenode(t)	(twoto((t)->lsizenode))
+
+
+
+extern const TObject luaO_nilobject;
+
+int luaO_log2 (unsigned int x);
+int luaO_int2fb (unsigned int x);
+#define fb2int(x)	(((x) & 7) << ((x) >> 3))
+
+int luaO_rawequalObj (const TObject *t1, const TObject *t2);
+int luaO_str2d (const char *s, lua_Number *result);
+
+const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp);
+const char *luaO_pushfstring (lua_State *L, const char *fmt, ...);
+void luaO_chunkid (char *out, const char *source, int len);
+
+
+#endif
diff --git a/main/source/lua/src/lopcodes.c b/main/source/lua/src/lopcodes.c
new file mode 100644
index 00000000..afcb9665
--- /dev/null
+++ b/main/source/lua/src/lopcodes.c
@@ -0,0 +1,102 @@
+/*
+** $Id: lopcodes.c,v 1.22 2002/12/04 17:38:31 roberto Exp $
+** extracted automatically from lopcodes.h by mkprint.lua
+** DO NOT EDIT
+** See Copyright Notice in lua.h
+*/
+
+
+#define lopcodes_c
+
+#include "lua.h"
+
+#include "lobject.h"
+#include "lopcodes.h"
+
+
+#ifdef LUA_OPNAMES
+
+const char *const luaP_opnames[] = {
+  "MOVE",
+  "LOADK",
+  "LOADBOOL",
+  "LOADNIL",
+  "GETUPVAL",
+  "GETGLOBAL",
+  "GETTABLE",
+  "SETGLOBAL",
+  "SETUPVAL",
+  "SETTABLE",
+  "NEWTABLE",
+  "SELF",
+  "ADD",
+  "SUB",
+  "MUL",
+  "DIV",
+  "POW",
+  "UNM",
+  "NOT",
+  "CONCAT",
+  "JMP",
+  "EQ",
+  "LT",
+  "LE",
+  "TEST",
+  "CALL",
+  "TAILCALL",
+  "RETURN",
+  "FORLOOP",
+  "TFORLOOP",
+  "TFORPREP",
+  "SETLIST",
+  "SETLISTO",
+  "CLOSE",
+  "CLOSURE"
+};
+
+#endif
+
+#define opmode(t,b,bk,ck,sa,k,m) (((t)<<OpModeT) | \
+   ((b)<<OpModeBreg) | ((bk)<<OpModeBrk) | ((ck)<<OpModeCrk) | \
+   ((sa)<<OpModesetA) | ((k)<<OpModeK) | (m))
+
+
+const lu_byte luaP_opmodes[NUM_OPCODES] = {
+/*       T  B Bk Ck sA  K  mode			   opcode    */
+  opmode(0, 1, 0, 0, 1, 0, iABC)		/* OP_MOVE */
+ ,opmode(0, 0, 0, 0, 1, 1, iABx)		/* OP_LOADK */
+ ,opmode(0, 0, 0, 0, 1, 0, iABC)		/* OP_LOADBOOL */
+ ,opmode(0, 1, 0, 0, 1, 0, iABC)		/* OP_LOADNIL */
+ ,opmode(0, 0, 0, 0, 1, 0, iABC)		/* OP_GETUPVAL */
+ ,opmode(0, 0, 0, 0, 1, 1, iABx)		/* OP_GETGLOBAL */
+ ,opmode(0, 1, 0, 1, 1, 0, iABC)		/* OP_GETTABLE */
+ ,opmode(0, 0, 0, 0, 0, 1, iABx)		/* OP_SETGLOBAL */
+ ,opmode(0, 0, 0, 0, 0, 0, iABC)		/* OP_SETUPVAL */
+ ,opmode(0, 0, 1, 1, 0, 0, iABC)		/* OP_SETTABLE */
+ ,opmode(0, 0, 0, 0, 1, 0, iABC)		/* OP_NEWTABLE */
+ ,opmode(0, 1, 0, 1, 1, 0, iABC)		/* OP_SELF */
+ ,opmode(0, 0, 1, 1, 1, 0, iABC)		/* OP_ADD */
+ ,opmode(0, 0, 1, 1, 1, 0, iABC)		/* OP_SUB */
+ ,opmode(0, 0, 1, 1, 1, 0, iABC)		/* OP_MUL */
+ ,opmode(0, 0, 1, 1, 1, 0, iABC)		/* OP_DIV */
+ ,opmode(0, 0, 1, 1, 1, 0, iABC)		/* OP_POW */
+ ,opmode(0, 1, 0, 0, 1, 0, iABC)		/* OP_UNM */
+ ,opmode(0, 1, 0, 0, 1, 0, iABC)		/* OP_NOT */
+ ,opmode(0, 1, 0, 1, 1, 0, iABC)		/* OP_CONCAT */
+ ,opmode(0, 0, 0, 0, 0, 0, iAsBx)		/* OP_JMP */
+ ,opmode(1, 0, 1, 1, 0, 0, iABC)		/* OP_EQ */
+ ,opmode(1, 0, 1, 1, 0, 0, iABC)		/* OP_LT */
+ ,opmode(1, 0, 1, 1, 0, 0, iABC)		/* OP_LE */
+ ,opmode(1, 1, 0, 0, 1, 0, iABC)		/* OP_TEST */
+ ,opmode(0, 0, 0, 0, 0, 0, iABC)		/* OP_CALL */
+ ,opmode(0, 0, 0, 0, 0, 0, iABC)		/* OP_TAILCALL */
+ ,opmode(0, 0, 0, 0, 0, 0, iABC)		/* OP_RETURN */
+ ,opmode(0, 0, 0, 0, 0, 0, iAsBx)		/* OP_FORLOOP */
+ ,opmode(1, 0, 0, 0, 0, 0, iABC)		/* OP_TFORLOOP */
+ ,opmode(0, 0, 0, 0, 0, 0, iAsBx)		/* OP_TFORPREP */
+ ,opmode(0, 0, 0, 0, 0, 0, iABx)		/* OP_SETLIST */
+ ,opmode(0, 0, 0, 0, 0, 0, iABx)		/* OP_SETLISTO */
+ ,opmode(0, 0, 0, 0, 0, 0, iABC)		/* OP_CLOSE */
+ ,opmode(0, 0, 0, 0, 1, 0, iABx)		/* OP_CLOSURE */
+};
+
diff --git a/main/source/lua/src/lopcodes.h b/main/source/lua/src/lopcodes.h
new file mode 100644
index 00000000..2eb6175e
--- /dev/null
+++ b/main/source/lua/src/lopcodes.h
@@ -0,0 +1,238 @@
+/*
+** $Id: lopcodes.h,v 1.102 2002/08/21 18:56:09 roberto Exp $
+** Opcodes for Lua virtual machine
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lopcodes_h
+#define lopcodes_h
+
+#include "llimits.h"
+
+
+/*===========================================================================
+  We assume that instructions are unsigned numbers.
+  All instructions have an opcode in the first 6 bits.
+  Instructions can have the following fields:
+	`A' : 8 bits
+	`B' : 9 bits
+	`C' : 9 bits
+	`Bx' : 18 bits (`B' and `C' together)
+	`sBx' : signed Bx
+
+  A signed argument is represented in excess K; that is, the number
+  value is the unsigned value minus K. K is exactly the maximum value
+  for that argument (so that -max is represented by 0, and +max is
+  represented by 2*max), which is half the maximum for the corresponding
+  unsigned argument.
+===========================================================================*/
+
+
+enum OpMode {iABC, iABx, iAsBx};  /* basic instruction format */
+
+
+/*
+** size and position of opcode arguments.
+*/
+#define SIZE_C		9
+#define SIZE_B		9
+#define SIZE_Bx		(SIZE_C + SIZE_B)
+#define SIZE_A		8
+
+#define SIZE_OP		6
+
+#define POS_C		SIZE_OP
+#define POS_B		(POS_C + SIZE_C)
+#define POS_Bx		POS_C
+#define POS_A		(POS_B + SIZE_B)
+
+
+/*
+** limits for opcode arguments.
+** we use (signed) int to manipulate most arguments,
+** so they must fit in BITS_INT-1 bits (-1 for sign)
+*/
+#if SIZE_Bx < BITS_INT-1
+#define MAXARG_Bx        ((1<<SIZE_Bx)-1)
+#define MAXARG_sBx        (MAXARG_Bx>>1)         /* `sBx' is signed */
+#else
+#define MAXARG_Bx        MAX_INT
+#define MAXARG_sBx        MAX_INT
+#endif
+
+
+#define MAXARG_A        ((1<<SIZE_A)-1)
+#define MAXARG_B        ((1<<SIZE_B)-1)
+#define MAXARG_C        ((1<<SIZE_C)-1)
+
+
+/* creates a mask with `n' 1 bits at position `p' */
+#define MASK1(n,p)	((~((~(Instruction)0)<<n))<<p)
+
+/* creates a mask with `n' 0 bits at position `p' */
+#define MASK0(n,p)	(~MASK1(n,p))
+
+/*
+** the following macros help to manipulate instructions
+*/
+
+#define GET_OPCODE(i)	(cast(OpCode, (i)&MASK1(SIZE_OP,0)))
+#define SET_OPCODE(i,o)	((i) = (((i)&MASK0(SIZE_OP,0)) | cast(Instruction, o)))
+
+#define GETARG_A(i)	(cast(int, (i)>>POS_A))
+#define SETARG_A(i,u)	((i) = (((i)&MASK0(SIZE_A,POS_A)) | \
+		((cast(Instruction, u)<<POS_A)&MASK1(SIZE_A,POS_A))))
+
+#define GETARG_B(i)	(cast(int, ((i)>>POS_B) & MASK1(SIZE_B,0)))
+#define SETARG_B(i,b)	((i) = (((i)&MASK0(SIZE_B,POS_B)) | \
+		((cast(Instruction, b)<<POS_B)&MASK1(SIZE_B,POS_B))))
+
+#define GETARG_C(i)	(cast(int, ((i)>>POS_C) & MASK1(SIZE_C,0)))
+#define SETARG_C(i,b)	((i) = (((i)&MASK0(SIZE_C,POS_C)) | \
+		((cast(Instruction, b)<<POS_C)&MASK1(SIZE_C,POS_C))))
+
+#define GETARG_Bx(i)	(cast(int, ((i)>>POS_Bx) & MASK1(SIZE_Bx,0)))
+#define SETARG_Bx(i,b)	((i) = (((i)&MASK0(SIZE_Bx,POS_Bx)) | \
+		((cast(Instruction, b)<<POS_Bx)&MASK1(SIZE_Bx,POS_Bx))))
+
+#define GETARG_sBx(i)	(GETARG_Bx(i)-MAXARG_sBx)
+#define SETARG_sBx(i,b)	SETARG_Bx((i),cast(unsigned int, (b)+MAXARG_sBx))
+
+
+#define CREATE_ABC(o,a,b,c)	(cast(Instruction, o) \
+			| (cast(Instruction, a)<<POS_A) \
+			| (cast(Instruction, b)<<POS_B) \
+			| (cast(Instruction, c)<<POS_C))
+
+#define CREATE_ABx(o,a,bc)	(cast(Instruction, o) \
+			| (cast(Instruction, a)<<POS_A) \
+			| (cast(Instruction, bc)<<POS_Bx))
+
+
+
+
+/*
+** invalid register that fits in 8 bits
+*/
+#define NO_REG		MAXARG_A
+
+
+/*
+** R(x) - register
+** Kst(x) - constant (in constant table)
+** RK(x) == if x < MAXSTACK then R(x) else Kst(x-MAXSTACK)
+*/
+
+
+/*
+** grep "ORDER OP" if you change these enums
+*/
+
+typedef enum {
+/*----------------------------------------------------------------------
+name		args	description
+------------------------------------------------------------------------*/
+OP_MOVE,/*	A B	R(A) := R(B)					*/
+OP_LOADK,/*	A Bx	R(A) := Kst(Bx)					*/
+OP_LOADBOOL,/*	A B C	R(A) := (Bool)B; if (C) PC++			*/
+OP_LOADNIL,/*	A B	R(A) := ... := R(B) := nil			*/
+OP_GETUPVAL,/*	A B	R(A) := UpValue[B]				*/
+
+OP_GETGLOBAL,/*	A Bx	R(A) := Gbl[Kst(Bx)]				*/
+OP_GETTABLE,/*	A B C	R(A) := R(B)[RK(C)]				*/
+
+OP_SETGLOBAL,/*	A Bx	Gbl[Kst(Bx)] := R(A)				*/
+OP_SETUPVAL,/*	A B	UpValue[B] := R(A)				*/
+OP_SETTABLE,/*	A B C	R(A)[RK(B)] := RK(C)				*/
+
+OP_NEWTABLE,/*	A B C	R(A) := {} (size = B,C)				*/
+
+OP_SELF,/*	A B C	R(A+1) := R(B); R(A) := R(B)[RK(C)]		*/
+
+OP_ADD,/*	A B C	R(A) := RK(B) + RK(C)				*/
+OP_SUB,/*	A B C	R(A) := RK(B) - RK(C)				*/
+OP_MUL,/*	A B C	R(A) := RK(B) * RK(C)				*/
+OP_DIV,/*	A B C	R(A) := RK(B) / RK(C)				*/
+OP_POW,/*	A B C	R(A) := RK(B) ^ RK(C)				*/
+OP_UNM,/*	A B	R(A) := -R(B)					*/
+OP_NOT,/*	A B	R(A) := not R(B)				*/
+
+OP_CONCAT,/*	A B C	R(A) := R(B).. ... ..R(C)			*/
+
+OP_JMP,/*	sBx	PC += sBx					*/
+
+OP_EQ,/*	A B C	if ((RK(B) == RK(C)) ~= A) then pc++		*/
+OP_LT,/*	A B C	if ((RK(B) <  RK(C)) ~= A) then pc++  		*/
+OP_LE,/*	A B C	if ((RK(B) <= RK(C)) ~= A) then pc++  		*/
+
+OP_TEST,/*	A B C	if (R(B) <=> C) then R(A) := R(B) else pc++	*/ 
+
+OP_CALL,/*	A B C	R(A), ... ,R(A+C-2) := R(A)(R(A+1), ... ,R(A+B-1)) */
+OP_TAILCALL,/*	A B C	return R(A)(R(A+1), ... ,R(A+B-1))		*/
+OP_RETURN,/*	A B	return R(A), ... ,R(A+B-2)	(see note)	*/
+
+OP_FORLOOP,/*	A sBx	R(A)+=R(A+2); if R(A) <?= R(A+1) then PC+= sBx	*/
+
+OP_TFORLOOP,/*	A C	R(A+2), ... ,R(A+2+C) := R(A)(R(A+1), R(A+2)); 
+                        if R(A+2) ~= nil then pc++			*/
+OP_TFORPREP,/*	A sBx	if type(R(A)) == table then R(A+1):=R(A), R(A):=next;
+			PC += sBx					*/
+
+OP_SETLIST,/*	A Bx	R(A)[Bx-Bx%FPF+i] := R(A+i), 1 <= i <= Bx%FPF+1	*/
+OP_SETLISTO,/*	A Bx							*/
+
+OP_CLOSE,/*	A 	close all variables in the stack up to (>=) R(A)*/
+OP_CLOSURE/*	A Bx	R(A) := closure(KPROTO[Bx], R(A), ... ,R(A+n))	*/
+} OpCode;
+
+
+#define NUM_OPCODES	(cast(int, OP_CLOSURE+1))
+
+
+
+/*===========================================================================
+  Notes:
+  (1) In OP_CALL, if (B == 0) then B = top. C is the number of returns - 1,
+      and can be 0: OP_CALL then sets `top' to last_result+1, so
+      next open instruction (OP_CALL, OP_RETURN, OP_SETLIST) may use `top'.
+
+  (2) In OP_RETURN, if (B == 0) then return up to `top'
+
+  (3) For comparisons, B specifies what conditions the test should accept.
+
+  (4) All `skips' (pc++) assume that next instruction is a jump
+===========================================================================*/
+
+
+/*
+** masks for instruction properties
+*/  
+enum OpModeMask {
+  OpModeBreg = 2,       /* B is a register */
+  OpModeBrk,		/* B is a register/constant */
+  OpModeCrk,           /* C is a register/constant */
+  OpModesetA,           /* instruction set register A */
+  OpModeK,              /* Bx is a constant */
+  OpModeT		/* operator is a test */
+  
+};
+
+
+extern const lu_byte luaP_opmodes[NUM_OPCODES];
+
+#define getOpMode(m)            (cast(enum OpMode, luaP_opmodes[m] & 3))
+#define testOpMode(m, b)        (luaP_opmodes[m] & (1 << (b)))
+
+
+#ifdef LUA_OPNAMES
+extern const char *const luaP_opnames[];  /* opcode names */
+#endif
+
+
+
+/* number of list items to accumulate before a SETLIST instruction */
+/* (must be a power of 2) */
+#define LFIELDS_PER_FLUSH	32
+
+
+#endif
diff --git a/main/source/lua/src/lparser.c b/main/source/lua/src/lparser.c
new file mode 100644
index 00000000..efd5c1e3
--- /dev/null
+++ b/main/source/lua/src/lparser.c
@@ -0,0 +1,1329 @@
+/*
+** $Id: lparser.c,v 1.208 2003/04/03 13:35:34 roberto Exp $
+** Lua Parser
+** See Copyright Notice in lua.h
+*/
+
+
+#include <string.h>
+
+#define lparser_c
+
+#include "lua.h"
+
+#include "lcode.h"
+#include "ldebug.h"
+#include "lfunc.h"
+#include "llex.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lparser.h"
+#include "lstate.h"
+#include "lstring.h"
+
+
+
+
+#define getlocvar(fs, i)	((fs)->f->locvars[(fs)->actvar[i]])
+
+
+#define enterlevel(ls)	if (++(ls)->nestlevel > LUA_MAXPARSERLEVEL) \
+		luaX_syntaxerror(ls, "too many syntax levels");
+#define leavelevel(ls)	((ls)->nestlevel--)
+
+
+/*
+** nodes for block list (list of active blocks)
+*/
+typedef struct BlockCnt {
+  struct BlockCnt *previous;  /* chain */
+  int breaklist;  /* list of jumps out of this loop */
+  int nactvar;  /* # active local variables outside the breakable structure */
+  int upval;  /* true if some variable in the block is an upvalue */
+  int isbreakable;  /* true if `block' is a loop */
+} BlockCnt;
+
+
+
+/*
+** prototypes for recursive non-terminal functions
+*/
+static void chunk (LexState *ls);
+static void expr (LexState *ls, expdesc *v);
+
+
+
+static void next (LexState *ls) {
+  ls->lastline = ls->linenumber;
+  if (ls->lookahead.token != TK_EOS) {  /* is there a look-ahead token? */
+    ls->t = ls->lookahead;  /* use this one */
+    ls->lookahead.token = TK_EOS;  /* and discharge it */
+  }
+  else
+    ls->t.token = luaX_lex(ls, &ls->t.seminfo);  /* read next token */
+}
+
+
+static void lookahead (LexState *ls) {
+  lua_assert(ls->lookahead.token == TK_EOS);
+  ls->lookahead.token = luaX_lex(ls, &ls->lookahead.seminfo);
+}
+
+
+static void error_expected (LexState *ls, int token) {
+  luaX_syntaxerror(ls,
+         luaO_pushfstring(ls->L, "`%s' expected", luaX_token2str(ls, token)));
+}
+
+
+static int testnext (LexState *ls, int c) {
+  if (ls->t.token == c) {
+    next(ls);
+    return 1;
+  }
+  else return 0;
+}
+
+
+static void check (LexState *ls, int c) {
+  if (!testnext(ls, c))
+    error_expected(ls, c);
+}
+
+
+#define check_condition(ls,c,msg)	{ if (!(c)) luaX_syntaxerror(ls, msg); }
+
+
+
+static void check_match (LexState *ls, int what, int who, int where) {
+  if (!testnext(ls, what)) {
+    if (where == ls->linenumber)
+      error_expected(ls, what);
+    else {
+      luaX_syntaxerror(ls, luaO_pushfstring(ls->L,
+             "`%s' expected (to close `%s' at line %d)",
+              luaX_token2str(ls, what), luaX_token2str(ls, who), where));
+    }
+  }
+}
+
+
+static TString *str_checkname (LexState *ls) {
+  TString *ts;
+  check_condition(ls, (ls->t.token == TK_NAME), "<name> expected");
+  ts = ls->t.seminfo.ts;
+  next(ls);
+  return ts;
+}
+
+
+static void init_exp (expdesc *e, expkind k, int i) {
+  e->f = e->t = NO_JUMP;
+  e->k = k;
+  e->info = i;
+}
+
+
+static void codestring (LexState *ls, expdesc *e, TString *s) {
+  init_exp(e, VK, luaK_stringK(ls->fs, s));
+}
+
+
+static void checkname(LexState *ls, expdesc *e) {
+  codestring(ls, e, str_checkname(ls));
+}
+
+
+static int luaI_registerlocalvar (LexState *ls, TString *varname) {
+  FuncState *fs = ls->fs;
+  Proto *f = fs->f;
+  luaM_growvector(ls->L, f->locvars, fs->nlocvars, f->sizelocvars,
+                  LocVar, MAX_INT, "");
+  f->locvars[fs->nlocvars].varname = varname;
+  return fs->nlocvars++;
+}
+
+
+static void new_localvar (LexState *ls, TString *name, int n) {
+  FuncState *fs = ls->fs;
+  luaX_checklimit(ls, fs->nactvar+n+1, MAXVARS, "local variables");
+  fs->actvar[fs->nactvar+n] = luaI_registerlocalvar(ls, name);
+}
+
+
+static void adjustlocalvars (LexState *ls, int nvars) {
+  FuncState *fs = ls->fs;
+  fs->nactvar += nvars;
+  for (; nvars; nvars--) {
+    getlocvar(fs, fs->nactvar - nvars).startpc = fs->pc;
+  }
+}
+
+
+static void removevars (LexState *ls, int tolevel) {
+  FuncState *fs = ls->fs;
+  while (fs->nactvar > tolevel)
+    getlocvar(fs, --fs->nactvar).endpc = fs->pc;
+}
+
+
+static void new_localvarstr (LexState *ls, const char *name, int n) {
+  new_localvar(ls, luaS_new(ls->L, name), n);
+}
+
+
+static void create_local (LexState *ls, const char *name) {
+  new_localvarstr(ls, name, 0);
+  adjustlocalvars(ls, 1);
+}
+
+
+static int indexupvalue (FuncState *fs, TString *name, expdesc *v) {
+  int i;
+  Proto *f = fs->f;
+  for (i=0; i<f->nups; i++) {
+    if (fs->upvalues[i].k == v->k && fs->upvalues[i].info == v->info) {
+      lua_assert(fs->f->upvalues[i] == name);
+      return i;
+    }
+  }
+  /* new one */
+  luaX_checklimit(fs->ls, f->nups + 1, MAXUPVALUES, "upvalues");
+  luaM_growvector(fs->L, fs->f->upvalues, f->nups, fs->f->sizeupvalues,
+                  TString *, MAX_INT, "");
+  fs->f->upvalues[f->nups] = name;
+  fs->upvalues[f->nups] = *v;
+  return f->nups++;
+}
+
+
+static int searchvar (FuncState *fs, TString *n) {
+  int i;
+  for (i=fs->nactvar-1; i >= 0; i--) {
+    if (n == getlocvar(fs, i).varname)
+      return i;
+  }
+  return -1;  /* not found */
+}
+
+
+static void markupval (FuncState *fs, int level) {
+  BlockCnt *bl = fs->bl;
+  while (bl && bl->nactvar > level) bl = bl->previous;
+  if (bl) bl->upval = 1;
+}
+
+
+static void singlevaraux (FuncState *fs, TString *n, expdesc *var, int base) {
+  if (fs == NULL)  /* no more levels? */
+    init_exp(var, VGLOBAL, NO_REG);  /* default is global variable */
+  else {
+    int v = searchvar(fs, n);  /* look up at current level */
+    if (v >= 0) {
+      init_exp(var, VLOCAL, v);
+      if (!base)
+        markupval(fs, v);  /* local will be used as an upval */
+    }
+    else {  /* not found at current level; try upper one */
+      singlevaraux(fs->prev, n, var, 0);
+      if (var->k == VGLOBAL) {
+        if (base)
+          var->info = luaK_stringK(fs, n);  /* info points to global name */
+      }
+      else {  /* LOCAL or UPVAL */
+        var->info = indexupvalue(fs, n, var);
+        var->k = VUPVAL;  /* upvalue in this level */
+      }
+    }
+  }
+}
+
+
+static TString *singlevar (LexState *ls, expdesc *var, int base) {
+  TString *varname = str_checkname(ls);
+  singlevaraux(ls->fs, varname, var, base);
+  return varname;
+}
+
+
+static void adjust_assign (LexState *ls, int nvars, int nexps, expdesc *e) {
+  FuncState *fs = ls->fs;
+  int extra = nvars - nexps;
+  if (e->k == VCALL) {
+    extra++;  /* includes call itself */
+    if (extra <= 0) extra = 0;
+    else luaK_reserveregs(fs, extra-1);
+    luaK_setcallreturns(fs, e, extra);  /* call provides the difference */
+  }
+  else {
+    if (e->k != VVOID) luaK_exp2nextreg(fs, e);  /* close last expression */
+    if (extra > 0) {
+      int reg = fs->freereg;
+      luaK_reserveregs(fs, extra);
+      luaK_nil(fs, reg, extra);
+    }
+  }
+}
+
+
+static void code_params (LexState *ls, int nparams, int dots) {
+  FuncState *fs = ls->fs;
+  adjustlocalvars(ls, nparams);
+  luaX_checklimit(ls, fs->nactvar, MAXPARAMS, "parameters");
+  fs->f->numparams = cast(lu_byte, fs->nactvar);
+  fs->f->is_vararg = cast(lu_byte, dots);
+  if (dots)
+    create_local(ls, "arg");
+  luaK_reserveregs(fs, fs->nactvar);  /* reserve register for parameters */
+}
+
+
+static void enterblock (FuncState *fs, BlockCnt *bl, int isbreakable) {
+  bl->breaklist = NO_JUMP;
+  bl->isbreakable = isbreakable;
+  bl->nactvar = fs->nactvar;
+  bl->upval = 0;
+  bl->previous = fs->bl;
+  fs->bl = bl;
+  lua_assert(fs->freereg == fs->nactvar);
+}
+
+
+static void leaveblock (FuncState *fs) {
+  BlockCnt *bl = fs->bl;
+  fs->bl = bl->previous;
+  removevars(fs->ls, bl->nactvar);
+  if (bl->upval)
+    luaK_codeABC(fs, OP_CLOSE, bl->nactvar, 0, 0);
+  lua_assert(bl->nactvar == fs->nactvar);
+  fs->freereg = fs->nactvar;  /* free registers */
+  luaK_patchtohere(fs, bl->breaklist);
+}
+
+
+static void pushclosure (LexState *ls, FuncState *func, expdesc *v) {
+  FuncState *fs = ls->fs;
+  Proto *f = fs->f;
+  int i;
+  luaM_growvector(ls->L, f->p, fs->np, f->sizep, Proto *,
+                  MAXARG_Bx, "constant table overflow");
+  f->p[fs->np++] = func->f;
+  init_exp(v, VRELOCABLE, luaK_codeABx(fs, OP_CLOSURE, 0, fs->np-1));
+  for (i=0; i<func->f->nups; i++) {
+    OpCode o = (func->upvalues[i].k == VLOCAL) ? OP_MOVE : OP_GETUPVAL;
+    luaK_codeABC(fs, o, 0, func->upvalues[i].info, 0);
+  }
+}
+
+
+static void open_func (LexState *ls, FuncState *fs) {
+  Proto *f = luaF_newproto(ls->L);
+  fs->f = f;
+  fs->prev = ls->fs;  /* linked list of funcstates */
+  fs->ls = ls;
+  fs->L = ls->L;
+  ls->fs = fs;
+  fs->pc = 0;
+  fs->lasttarget = 0;
+  fs->jpc = NO_JUMP;
+  fs->freereg = 0;
+  fs->nk = 0;
+  fs->h = luaH_new(ls->L, 0, 0);
+  fs->np = 0;
+  fs->nlocvars = 0;
+  fs->nactvar = 0;
+  fs->bl = NULL;
+  f->source = ls->source;
+  f->maxstacksize = 2;  /* registers 0/1 are always valid */
+}
+
+
+static void close_func (LexState *ls) {
+  lua_State *L = ls->L;
+  FuncState *fs = ls->fs;
+  Proto *f = fs->f;
+  removevars(ls, 0);
+  luaK_codeABC(fs, OP_RETURN, 0, 1, 0);  /* final return */
+  luaM_reallocvector(L, f->code, f->sizecode, fs->pc, Instruction);
+  f->sizecode = fs->pc;
+  luaM_reallocvector(L, f->lineinfo, f->sizelineinfo, fs->pc, int);
+  f->sizelineinfo = fs->pc;
+  luaM_reallocvector(L, f->k, f->sizek, fs->nk, TObject);
+  f->sizek = fs->nk;
+  luaM_reallocvector(L, f->p, f->sizep, fs->np, Proto *);
+  f->sizep = fs->np;
+  luaM_reallocvector(L, f->locvars, f->sizelocvars, fs->nlocvars, LocVar);
+  f->sizelocvars = fs->nlocvars;
+  luaM_reallocvector(L, f->upvalues, f->sizeupvalues, f->nups, TString *);
+  f->sizeupvalues = f->nups;
+  lua_assert(luaG_checkcode(f));
+  lua_assert(fs->bl == NULL);
+  ls->fs = fs->prev;
+}
+
+
+Proto *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff) {
+  struct LexState lexstate;
+  struct FuncState funcstate;
+  lexstate.buff = buff;
+  lexstate.nestlevel = 0;
+  luaX_setinput(L, &lexstate, z, luaS_new(L, zname(z)));
+  open_func(&lexstate, &funcstate);
+  next(&lexstate);  /* read first token */
+  chunk(&lexstate);
+  check_condition(&lexstate, (lexstate.t.token == TK_EOS), "<eof> expected");
+  close_func(&lexstate);
+  lua_assert(funcstate.prev == NULL);
+  lua_assert(funcstate.f->nups == 0);
+  lua_assert(lexstate.nestlevel == 0);
+  return funcstate.f;
+}
+
+
+
+/*============================================================*/
+/* GRAMMAR RULES */
+/*============================================================*/
+
+
+static void luaY_field (LexState *ls, expdesc *v) {
+  /* field -> ['.' | ':'] NAME */
+  FuncState *fs = ls->fs;
+  expdesc key;
+  luaK_exp2anyreg(fs, v);
+  next(ls);  /* skip the dot or colon */
+  checkname(ls, &key);
+  luaK_indexed(fs, v, &key);
+}
+
+
+static void luaY_index (LexState *ls, expdesc *v) {
+  /* index -> '[' expr ']' */
+  next(ls);  /* skip the '[' */
+  expr(ls, v);
+  luaK_exp2val(ls->fs, v);
+  check(ls, ']');
+}
+
+
+/*
+** {======================================================================
+** Rules for Constructors
+** =======================================================================
+*/
+
+
+struct ConsControl {
+  expdesc v;  /* last list item read */
+  expdesc *t;  /* table descriptor */
+  int nh;  /* total number of `record' elements */
+  int na;  /* total number of array elements */
+  int tostore;  /* number of array elements pending to be stored */
+};
+
+
+static void recfield (LexState *ls, struct ConsControl *cc) {
+  /* recfield -> (NAME | `['exp1`]') = exp1 */
+  FuncState *fs = ls->fs;
+  int reg = ls->fs->freereg;
+  expdesc key, val;
+  if (ls->t.token == TK_NAME) {
+    luaX_checklimit(ls, cc->nh, MAX_INT, "items in a constructor");
+    cc->nh++;
+    checkname(ls, &key);
+  }
+  else  /* ls->t.token == '[' */
+    luaY_index(ls, &key);
+  check(ls, '=');
+  luaK_exp2RK(fs, &key);
+  expr(ls, &val);
+  luaK_codeABC(fs, OP_SETTABLE, cc->t->info, luaK_exp2RK(fs, &key),
+                                             luaK_exp2RK(fs, &val));
+  fs->freereg = reg;  /* free registers */
+}
+
+
+static void closelistfield (FuncState *fs, struct ConsControl *cc) {
+  if (cc->v.k == VVOID) return;  /* there is no list item */
+  luaK_exp2nextreg(fs, &cc->v);
+  cc->v.k = VVOID;
+  if (cc->tostore == LFIELDS_PER_FLUSH) {
+    luaK_codeABx(fs, OP_SETLIST, cc->t->info, cc->na-1);  /* flush */
+    cc->tostore = 0;  /* no more items pending */
+    fs->freereg = cc->t->info + 1;  /* free registers */
+  }
+}
+
+
+static void lastlistfield (FuncState *fs, struct ConsControl *cc) {
+  if (cc->tostore == 0) return;
+  if (cc->v.k == VCALL) {
+    luaK_setcallreturns(fs, &cc->v, LUA_MULTRET);
+    luaK_codeABx(fs, OP_SETLISTO, cc->t->info, cc->na-1);
+  }
+  else {
+    if (cc->v.k != VVOID)
+      luaK_exp2nextreg(fs, &cc->v);
+    luaK_codeABx(fs, OP_SETLIST, cc->t->info, cc->na-1);
+  }
+  fs->freereg = cc->t->info + 1;  /* free registers */
+}
+
+
+static void listfield (LexState *ls, struct ConsControl *cc) {
+  expr(ls, &cc->v);
+  luaX_checklimit(ls, cc->na, MAXARG_Bx, "items in a constructor");
+  cc->na++;
+  cc->tostore++;
+}
+
+
+static void constructor (LexState *ls, expdesc *t) {
+  /* constructor -> ?? */
+  FuncState *fs = ls->fs;
+  int line = ls->linenumber;
+  int pc = luaK_codeABC(fs, OP_NEWTABLE, 0, 0, 0);
+  struct ConsControl cc;
+  cc.na = cc.nh = cc.tostore = 0;
+  cc.t = t;
+  init_exp(t, VRELOCABLE, pc);
+  init_exp(&cc.v, VVOID, 0);  /* no value (yet) */
+  luaK_exp2nextreg(ls->fs, t);  /* fix it at stack top (for gc) */
+  check(ls, '{');
+  do {
+    lua_assert(cc.v.k == VVOID || cc.tostore > 0);
+    testnext(ls, ';');  /* compatibility only */
+    if (ls->t.token == '}') break;
+    closelistfield(fs, &cc);
+    switch(ls->t.token) {
+      case TK_NAME: {  /* may be listfields or recfields */
+        lookahead(ls);
+        if (ls->lookahead.token != '=')  /* expression? */
+          listfield(ls, &cc);
+        else
+          recfield(ls, &cc);
+        break;
+      }
+      case '[': {  /* constructor_item -> recfield */
+        recfield(ls, &cc);
+        break;
+      }
+      default: {  /* constructor_part -> listfield */
+        listfield(ls, &cc);
+        break;
+      }
+    }
+  } while (testnext(ls, ',') || testnext(ls, ';'));
+  check_match(ls, '}', '{', line);
+  lastlistfield(fs, &cc);
+  SETARG_B(fs->f->code[pc], luaO_int2fb(cc.na)); /* set initial array size */
+  SETARG_C(fs->f->code[pc], luaO_log2(cc.nh)+1);  /* set initial table size */
+}
+
+/* }====================================================================== */
+
+
+
+static void parlist (LexState *ls) {
+  /* parlist -> [ param { `,' param } ] */
+  int nparams = 0;
+  int dots = 0;
+  if (ls->t.token != ')') {  /* is `parlist' not empty? */
+    do {
+      switch (ls->t.token) {
+        case TK_DOTS: dots = 1; next(ls); break;
+        case TK_NAME: new_localvar(ls, str_checkname(ls), nparams++); break;
+        default: luaX_syntaxerror(ls, "<name> or `...' expected");
+      }
+    } while (!dots && testnext(ls, ','));
+  }
+  code_params(ls, nparams, dots);
+}
+
+
+static void body (LexState *ls, expdesc *e, int needself, int line) {
+  /* body ->  `(' parlist `)' chunk END */
+  FuncState new_fs;
+  open_func(ls, &new_fs);
+  new_fs.f->lineDefined = line;
+  check(ls, '(');
+  if (needself)
+    create_local(ls, "self");
+  parlist(ls);
+  check(ls, ')');
+  chunk(ls);
+  check_match(ls, TK_END, TK_FUNCTION, line);
+  close_func(ls);
+  pushclosure(ls, &new_fs, e);
+}
+
+
+static int explist1 (LexState *ls, expdesc *v) {
+  /* explist1 -> expr { `,' expr } */
+  int n = 1;  /* at least one expression */
+  expr(ls, v);
+  while (testnext(ls, ',')) {
+    luaK_exp2nextreg(ls->fs, v);
+    expr(ls, v);
+    n++;
+  }
+  return n;
+}
+
+
+static void funcargs (LexState *ls, expdesc *f) {
+  FuncState *fs = ls->fs;
+  expdesc args;
+  int base, nparams;
+  int line = ls->linenumber;
+  switch (ls->t.token) {
+    case '(': {  /* funcargs -> `(' [ explist1 ] `)' */
+      if (line != ls->lastline)
+        luaX_syntaxerror(ls,"ambiguous syntax (function call x new statement)");
+      next(ls);
+      if (ls->t.token == ')')  /* arg list is empty? */
+        args.k = VVOID;
+      else {
+        explist1(ls, &args);
+        luaK_setcallreturns(fs, &args, LUA_MULTRET);
+      }
+      check_match(ls, ')', '(', line);
+      break;
+    }
+    case '{': {  /* funcargs -> constructor */
+      constructor(ls, &args);
+      break;
+    }
+    case TK_STRING: {  /* funcargs -> STRING */
+      codestring(ls, &args, ls->t.seminfo.ts);
+      next(ls);  /* must use `seminfo' before `next' */
+      break;
+    }
+    default: {
+      luaX_syntaxerror(ls, "function arguments expected");
+      return;
+    }
+  }
+  lua_assert(f->k == VNONRELOC);
+  base = f->info;  /* base register for call */
+  if (args.k == VCALL)
+    nparams = LUA_MULTRET;  /* open call */
+  else {
+    if (args.k != VVOID)
+      luaK_exp2nextreg(fs, &args);  /* close last argument */
+    nparams = fs->freereg - (base+1);
+  }
+  init_exp(f, VCALL, luaK_codeABC(fs, OP_CALL, base, nparams+1, 2));
+  luaK_fixline(fs, line);
+  fs->freereg = base+1;  /* call remove function and arguments and leaves
+                            (unless changed) one result */
+}
+
+
+
+
+/*
+** {======================================================================
+** Expression parsing
+** =======================================================================
+*/
+
+
+static void prefixexp (LexState *ls, expdesc *v) {
+  /* prefixexp -> NAME | '(' expr ')' */
+  switch (ls->t.token) {
+    case '(': {
+      int line = ls->linenumber;
+      next(ls);
+      expr(ls, v);
+      check_match(ls, ')', '(', line);
+      luaK_dischargevars(ls->fs, v);
+      return;
+    }
+    case TK_NAME: {
+      singlevar(ls, v, 1);
+      return;
+    }
+#ifdef LUA_COMPATUPSYNTAX
+    case '%': {  /* for compatibility only */
+      TString *varname;
+      int line = ls->linenumber;
+      next(ls);  /* skip `%' */
+      varname = singlevar(ls, v, 1);
+      if (v->k != VUPVAL)
+        luaX_errorline(ls, "global upvalues are obsolete",
+                           getstr(varname), line);
+      return;
+    }
+#endif
+    default: {
+      luaX_syntaxerror(ls, "unexpected symbol");
+      return;
+    }
+  }
+}
+
+
+static void primaryexp (LexState *ls, expdesc *v) {
+  /* primaryexp ->
+        prefixexp { `.' NAME | `[' exp `]' | `:' NAME funcargs | funcargs } */
+  FuncState *fs = ls->fs;
+  prefixexp(ls, v);
+  for (;;) {
+    switch (ls->t.token) {
+      case '.': {  /* field */
+        luaY_field(ls, v);
+        break;
+      }
+      case '[': {  /* `[' exp1 `]' */
+        expdesc key;
+        luaK_exp2anyreg(fs, v);
+        luaY_index(ls, &key);
+        luaK_indexed(fs, v, &key);
+        break;
+      }
+      case ':': {  /* `:' NAME funcargs */
+        expdesc key;
+        next(ls);
+        checkname(ls, &key);
+        luaK_self(fs, v, &key);
+        funcargs(ls, v);
+        break;
+      }
+      case '(': case TK_STRING: case '{': {  /* funcargs */
+        luaK_exp2nextreg(fs, v);
+        funcargs(ls, v);
+        break;
+      }
+      default: return;
+    }
+  }
+}
+
+
+static void simpleexp (LexState *ls, expdesc *v) {
+  /* simpleexp -> NUMBER | STRING | NIL | constructor | FUNCTION body
+               | primaryexp */
+  switch (ls->t.token) {
+    case TK_NUMBER: {
+      init_exp(v, VK, luaK_numberK(ls->fs, ls->t.seminfo.r));
+      next(ls);  /* must use `seminfo' before `next' */
+      break;
+    }
+    case TK_STRING: {
+      codestring(ls, v, ls->t.seminfo.ts);
+      next(ls);  /* must use `seminfo' before `next' */
+      break;
+    }
+    case TK_NIL: {
+      init_exp(v, VNIL, 0);
+      next(ls);
+      break;
+    }
+    case TK_TRUE: {
+      init_exp(v, VTRUE, 0);
+      next(ls);
+      break;
+    }
+    case TK_FALSE: {
+      init_exp(v, VFALSE, 0);
+      next(ls);
+      break;
+    }
+    case '{': {  /* constructor */
+      constructor(ls, v);
+      break;
+    }
+    case TK_FUNCTION: {
+      next(ls);
+      body(ls, v, 0, ls->linenumber);
+      break;
+    }
+    default: {
+      primaryexp(ls, v);
+      break;
+    }
+  }
+}
+
+
+static UnOpr getunopr (int op) {
+  switch (op) {
+    case TK_NOT: return OPR_NOT;
+    case '-': return OPR_MINUS;
+    default: return OPR_NOUNOPR;
+  }
+}
+
+
+static BinOpr getbinopr (int op) {
+  switch (op) {
+    case '+': return OPR_ADD;
+    case '-': return OPR_SUB;
+    case '*': return OPR_MULT;
+    case '/': return OPR_DIV;
+    case '^': return OPR_POW;
+    case TK_CONCAT: return OPR_CONCAT;
+    case TK_NE: return OPR_NE;
+    case TK_EQ: return OPR_EQ;
+    case '<': return OPR_LT;
+    case TK_LE: return OPR_LE;
+    case '>': return OPR_GT;
+    case TK_GE: return OPR_GE;
+    case TK_AND: return OPR_AND;
+    case TK_OR: return OPR_OR;
+    default: return OPR_NOBINOPR;
+  }
+}
+
+
+static const struct {
+  lu_byte left;  /* left priority for each binary operator */
+  lu_byte right; /* right priority */
+} priority[] = {  /* ORDER OPR */
+   {6, 6}, {6, 6}, {7, 7}, {7, 7},  /* arithmetic */
+   {10, 9}, {5, 4},                 /* power and concat (right associative) */
+   {3, 3}, {3, 3},                  /* equality */
+   {3, 3}, {3, 3}, {3, 3}, {3, 3},  /* order */
+   {2, 2}, {1, 1}                   /* logical (and/or) */
+};
+
+#define UNARY_PRIORITY	8  /* priority for unary operators */
+
+
+/*
+** subexpr -> (simplexep | unop subexpr) { binop subexpr }
+** where `binop' is any binary operator with a priority higher than `limit'
+*/
+static BinOpr subexpr (LexState *ls, expdesc *v, int limit) {
+  BinOpr op;
+  UnOpr uop;
+  enterlevel(ls);
+  uop = getunopr(ls->t.token);
+  if (uop != OPR_NOUNOPR) {
+    next(ls);
+    subexpr(ls, v, UNARY_PRIORITY);
+    luaK_prefix(ls->fs, uop, v);
+  }
+  else simpleexp(ls, v);
+  /* expand while operators have priorities higher than `limit' */
+  op = getbinopr(ls->t.token);
+  while (op != OPR_NOBINOPR && cast(int, priority[op].left) > limit) {
+    expdesc v2;
+    BinOpr nextop;
+    next(ls);
+    luaK_infix(ls->fs, op, v);
+    /* read sub-expression with higher priority */
+    nextop = subexpr(ls, &v2, cast(int, priority[op].right));
+    luaK_posfix(ls->fs, op, v, &v2);
+    op = nextop;
+  }
+  leavelevel(ls);
+  return op;  /* return first untreated operator */
+}
+
+
+static void expr (LexState *ls, expdesc *v) {
+  subexpr(ls, v, -1);
+}
+
+/* }==================================================================== */
+
+
+
+/*
+** {======================================================================
+** Rules for Statements
+** =======================================================================
+*/
+
+
+static int block_follow (int token) {
+  switch (token) {
+    case TK_ELSE: case TK_ELSEIF: case TK_END:
+    case TK_UNTIL: case TK_EOS:
+      return 1;
+    default: return 0;
+  }
+}
+
+
+static void block (LexState *ls) {
+  /* block -> chunk */
+  FuncState *fs = ls->fs;
+  BlockCnt bl;
+  enterblock(fs, &bl, 0);
+  chunk(ls);
+  lua_assert(bl.breaklist == NO_JUMP);
+  leaveblock(fs);
+}
+
+
+/*
+** structure to chain all variables in the left-hand side of an
+** assignment
+*/
+struct LHS_assign {
+  struct LHS_assign *prev;
+  expdesc v;  /* variable (global, local, upvalue, or indexed) */
+};
+
+
+/*
+** check whether, in an assignment to a local variable, the local variable
+** is needed in a previous assignment (to a table). If so, save original
+** local value in a safe place and use this safe copy in the previous
+** assignment.
+*/
+static void check_conflict (LexState *ls, struct LHS_assign *lh, expdesc *v) {
+  FuncState *fs = ls->fs;
+  int extra = fs->freereg;  /* eventual position to save local variable */
+  int conflict = 0;
+  for (; lh; lh = lh->prev) {
+    if (lh->v.k == VINDEXED) {
+      if (lh->v.info == v->info) {  /* conflict? */
+        conflict = 1;
+        lh->v.info = extra;  /* previous assignment will use safe copy */
+      }
+      if (lh->v.aux == v->info) {  /* conflict? */
+        conflict = 1;
+        lh->v.aux = extra;  /* previous assignment will use safe copy */
+      }
+    }
+  }
+  if (conflict) {
+    luaK_codeABC(fs, OP_MOVE, fs->freereg, v->info, 0);  /* make copy */
+    luaK_reserveregs(fs, 1);
+  }
+}
+
+
+static void assignment (LexState *ls, struct LHS_assign *lh, int nvars) {
+  expdesc e;
+  check_condition(ls, VLOCAL <= lh->v.k && lh->v.k <= VINDEXED,
+                      "syntax error");
+  if (testnext(ls, ',')) {  /* assignment -> `,' primaryexp assignment */
+    struct LHS_assign nv;
+    nv.prev = lh;
+    primaryexp(ls, &nv.v);
+    if (nv.v.k == VLOCAL)
+      check_conflict(ls, lh, &nv.v);
+    assignment(ls, &nv, nvars+1);
+  }
+  else {  /* assignment -> `=' explist1 */
+    int nexps;
+    check(ls, '=');
+    nexps = explist1(ls, &e);
+    if (nexps != nvars) {
+      adjust_assign(ls, nvars, nexps, &e);
+      if (nexps > nvars)
+        ls->fs->freereg -= nexps - nvars;  /* remove extra values */
+    }
+    else {
+      luaK_setcallreturns(ls->fs, &e, 1);  /* close last expression */
+      luaK_storevar(ls->fs, &lh->v, &e);
+      return;  /* avoid default */
+    }
+  }
+  init_exp(&e, VNONRELOC, ls->fs->freereg-1);  /* default assignment */
+  luaK_storevar(ls->fs, &lh->v, &e);
+}
+
+
+static void cond (LexState *ls, expdesc *v) {
+  /* cond -> exp */
+  expr(ls, v);  /* read condition */
+  if (v->k == VNIL) v->k = VFALSE;  /* `falses' are all equal here */
+  luaK_goiftrue(ls->fs, v);
+  luaK_patchtohere(ls->fs, v->t);
+}
+
+
+/*
+** The while statement optimizes its code by coding the condition
+** after its body (and thus avoiding one jump in the loop).
+*/
+
+/*
+** maximum size of expressions for optimizing `while' code
+*/
+#ifndef MAXEXPWHILE
+#define MAXEXPWHILE	100
+#endif
+
+/*
+** the call `luaK_goiffalse' may grow the size of an expression by
+** at most this:
+*/
+#define EXTRAEXP	5
+
+static void whilestat (LexState *ls, int line) {
+  /* whilestat -> WHILE cond DO block END */
+  Instruction codeexp[MAXEXPWHILE + EXTRAEXP];
+  int lineexp;
+  int i;
+  int sizeexp;
+  FuncState *fs = ls->fs;
+  int whileinit, blockinit, expinit;
+  expdesc v;
+  BlockCnt bl;
+  next(ls);  /* skip WHILE */
+  whileinit = luaK_jump(fs);  /* jump to condition (which will be moved) */
+  expinit = luaK_getlabel(fs);
+  expr(ls, &v);  /* parse condition */
+  if (v.k == VK) v.k = VTRUE;  /* `trues' are all equal here */
+  lineexp = ls->linenumber;
+  luaK_goiffalse(fs, &v);
+  luaK_concat(fs, &v.f, fs->jpc);
+  fs->jpc = NO_JUMP;
+  sizeexp = fs->pc - expinit;  /* size of expression code */
+  if (sizeexp > MAXEXPWHILE) 
+    luaX_syntaxerror(ls, "`while' condition too complex");
+  for (i = 0; i < sizeexp; i++)  /* save `exp' code */
+    codeexp[i] = fs->f->code[expinit + i];
+  fs->pc = expinit;  /* remove `exp' code */
+  enterblock(fs, &bl, 1);
+  check(ls, TK_DO);
+  blockinit = luaK_getlabel(fs);
+  block(ls);
+  luaK_patchtohere(fs, whileinit);  /* initial jump jumps to here */
+  /* move `exp' back to code */
+  if (v.t != NO_JUMP) v.t += fs->pc - expinit;
+  if (v.f != NO_JUMP) v.f += fs->pc - expinit;
+  for (i=0; i<sizeexp; i++)
+    luaK_code(fs, codeexp[i], lineexp);
+  check_match(ls, TK_END, TK_WHILE, line);
+  leaveblock(fs);
+  luaK_patchlist(fs, v.t, blockinit);  /* true conditions go back to loop */
+  luaK_patchtohere(fs, v.f);  /* false conditions finish the loop */
+}
+
+
+static void repeatstat (LexState *ls, int line) {
+  /* repeatstat -> REPEAT block UNTIL cond */
+  FuncState *fs = ls->fs;
+  int repeat_init = luaK_getlabel(fs);
+  expdesc v;
+  BlockCnt bl;
+  enterblock(fs, &bl, 1);
+  next(ls);
+  block(ls);
+  check_match(ls, TK_UNTIL, TK_REPEAT, line);
+  cond(ls, &v);
+  luaK_patchlist(fs, v.f, repeat_init);
+  leaveblock(fs);
+}
+
+
+static int exp1 (LexState *ls) {
+  expdesc e;
+  int k;
+  expr(ls, &e);
+  k = e.k;
+  luaK_exp2nextreg(ls->fs, &e);
+  return k;
+}
+
+
+static void forbody (LexState *ls, int base, int line, int nvars, int isnum) {
+  BlockCnt bl;
+  FuncState *fs = ls->fs;
+  int prep, endfor;
+  adjustlocalvars(ls, nvars);  /* scope for all variables */
+  check(ls, TK_DO);
+  enterblock(fs, &bl, 1);  /* loop block */
+  prep = luaK_getlabel(fs);
+  block(ls);
+  luaK_patchtohere(fs, prep-1);
+  endfor = (isnum) ? luaK_codeAsBx(fs, OP_FORLOOP, base, NO_JUMP) :
+                     luaK_codeABC(fs, OP_TFORLOOP, base, 0, nvars - 3);
+  luaK_fixline(fs, line);  /* pretend that `OP_FOR' starts the loop */
+  luaK_patchlist(fs, (isnum) ? endfor : luaK_jump(fs), prep);
+  leaveblock(fs);
+}
+
+
+static void fornum (LexState *ls, TString *varname, int line) {
+  /* fornum -> NAME = exp1,exp1[,exp1] DO body */
+  FuncState *fs = ls->fs;
+  int base = fs->freereg;
+  new_localvar(ls, varname, 0);
+  new_localvarstr(ls, "(for limit)", 1);
+  new_localvarstr(ls, "(for step)", 2);
+  check(ls, '=');
+  exp1(ls);  /* initial value */
+  check(ls, ',');
+  exp1(ls);  /* limit */
+  if (testnext(ls, ','))
+    exp1(ls);  /* optional step */
+  else {  /* default step = 1 */
+    luaK_codeABx(fs, OP_LOADK, fs->freereg, luaK_numberK(fs, 1));
+    luaK_reserveregs(fs, 1);
+  }
+  luaK_codeABC(fs, OP_SUB, fs->freereg - 3, fs->freereg - 3, fs->freereg - 1);
+  luaK_jump(fs);
+  forbody(ls, base, line, 3, 1);
+}
+
+
+static void forlist (LexState *ls, TString *indexname) {
+  /* forlist -> NAME {,NAME} IN explist1 DO body */
+  FuncState *fs = ls->fs;
+  expdesc e;
+  int nvars = 0;
+  int line;
+  int base = fs->freereg;
+  new_localvarstr(ls, "(for generator)", nvars++);
+  new_localvarstr(ls, "(for state)", nvars++);
+  new_localvar(ls, indexname, nvars++);
+  while (testnext(ls, ','))
+    new_localvar(ls, str_checkname(ls), nvars++);
+  check(ls, TK_IN);
+  line = ls->linenumber;
+  adjust_assign(ls, nvars, explist1(ls, &e), &e);
+  luaK_checkstack(fs, 3);  /* extra space to call generator */
+  luaK_codeAsBx(fs, OP_TFORPREP, base, NO_JUMP);
+  forbody(ls, base, line, nvars, 0);
+}
+
+
+static void forstat (LexState *ls, int line) {
+  /* forstat -> fornum | forlist */
+  FuncState *fs = ls->fs;
+  TString *varname;
+  BlockCnt bl;
+  enterblock(fs, &bl, 0);  /* block to control variable scope */
+  next(ls);  /* skip `for' */
+  varname = str_checkname(ls);  /* first variable name */
+  switch (ls->t.token) {
+    case '=': fornum(ls, varname, line); break;
+    case ',': case TK_IN: forlist(ls, varname); break;
+    default: luaX_syntaxerror(ls, "`=' or `in' expected");
+  }
+  check_match(ls, TK_END, TK_FOR, line);
+  leaveblock(fs);
+}
+
+
+static void test_then_block (LexState *ls, expdesc *v) {
+  /* test_then_block -> [IF | ELSEIF] cond THEN block */
+  next(ls);  /* skip IF or ELSEIF */
+  cond(ls, v);
+  check(ls, TK_THEN);
+  block(ls);  /* `then' part */
+}
+
+
+static void ifstat (LexState *ls, int line) {
+  /* ifstat -> IF cond THEN block {ELSEIF cond THEN block} [ELSE block] END */
+  FuncState *fs = ls->fs;
+  expdesc v;
+  int escapelist = NO_JUMP;
+  test_then_block(ls, &v);  /* IF cond THEN block */
+  while (ls->t.token == TK_ELSEIF) {
+    luaK_concat(fs, &escapelist, luaK_jump(fs));
+    luaK_patchtohere(fs, v.f);
+    test_then_block(ls, &v);  /* ELSEIF cond THEN block */
+  }
+  if (ls->t.token == TK_ELSE) {
+    luaK_concat(fs, &escapelist, luaK_jump(fs));
+    luaK_patchtohere(fs, v.f);
+    next(ls);  /* skip ELSE (after patch, for correct line info) */
+    block(ls);  /* `else' part */
+  }
+  else
+    luaK_concat(fs, &escapelist, v.f);
+  luaK_patchtohere(fs, escapelist);
+  check_match(ls, TK_END, TK_IF, line);
+}
+
+
+static void localfunc (LexState *ls) {
+  expdesc v, b;
+  new_localvar(ls, str_checkname(ls), 0);
+  init_exp(&v, VLOCAL, ls->fs->freereg++);
+  adjustlocalvars(ls, 1);
+  body(ls, &b, 0, ls->linenumber);
+  luaK_storevar(ls->fs, &v, &b);
+}
+
+
+static void localstat (LexState *ls) {
+  /* stat -> LOCAL NAME {`,' NAME} [`=' explist1] */
+  int nvars = 0;
+  int nexps;
+  expdesc e;
+  do {
+    new_localvar(ls, str_checkname(ls), nvars++);
+  } while (testnext(ls, ','));
+  if (testnext(ls, '='))
+    nexps = explist1(ls, &e);
+  else {
+    e.k = VVOID;
+    nexps = 0;
+  }
+  adjust_assign(ls, nvars, nexps, &e);
+  adjustlocalvars(ls, nvars);
+}
+
+
+static int funcname (LexState *ls, expdesc *v) {
+  /* funcname -> NAME {field} [`:' NAME] */
+  int needself = 0;
+  singlevar(ls, v, 1);
+  while (ls->t.token == '.')
+    luaY_field(ls, v);
+  if (ls->t.token == ':') {
+    needself = 1;
+    luaY_field(ls, v);
+  }
+  return needself;
+}
+
+
+static void funcstat (LexState *ls, int line) {
+  /* funcstat -> FUNCTION funcname body */
+  int needself;
+  expdesc v, b;
+  next(ls);  /* skip FUNCTION */
+  needself = funcname(ls, &v);
+  body(ls, &b, needself, line);
+  luaK_storevar(ls->fs, &v, &b);
+  luaK_fixline(ls->fs, line);  /* definition `happens' in the first line */
+}
+
+
+static void exprstat (LexState *ls) {
+  /* stat -> func | assignment */
+  FuncState *fs = ls->fs;
+  struct LHS_assign v;
+  primaryexp(ls, &v.v);
+  if (v.v.k == VCALL) {  /* stat -> func */
+    luaK_setcallreturns(fs, &v.v, 0);  /* call statement uses no results */
+  }
+  else {  /* stat -> assignment */
+    v.prev = NULL;
+    assignment(ls, &v, 1);
+  }
+}
+
+
+static void retstat (LexState *ls) {
+  /* stat -> RETURN explist */
+  FuncState *fs = ls->fs;
+  expdesc e;
+  int first, nret;  /* registers with returned values */
+  next(ls);  /* skip RETURN */
+  if (block_follow(ls->t.token) || ls->t.token == ';')
+    first = nret = 0;  /* return no values */
+  else {
+    nret = explist1(ls, &e);  /* optional return values */
+    if (e.k == VCALL) {
+      luaK_setcallreturns(fs, &e, LUA_MULTRET);
+      if (nret == 1) {  /* tail call? */
+        SET_OPCODE(getcode(fs,&e), OP_TAILCALL);
+        lua_assert(GETARG_A(getcode(fs,&e)) == fs->nactvar);
+      }
+      first = fs->nactvar;
+      nret = LUA_MULTRET;  /* return all values */
+    }
+    else {
+      if (nret == 1)  /* only one single value? */
+        first = luaK_exp2anyreg(fs, &e);
+      else {
+        luaK_exp2nextreg(fs, &e);  /* values must go to the `stack' */
+        first = fs->nactvar;  /* return all `active' values */
+        lua_assert(nret == fs->freereg - first);
+      }
+    }
+  }
+  luaK_codeABC(fs, OP_RETURN, first, nret+1, 0);
+}
+
+
+static void breakstat (LexState *ls) {
+  /* stat -> BREAK [NAME] */
+  FuncState *fs = ls->fs;
+  BlockCnt *bl = fs->bl;
+  int upval = 0;
+  next(ls);  /* skip BREAK */
+  while (bl && !bl->isbreakable) {
+    upval |= bl->upval;
+    bl = bl->previous;
+  }
+  if (!bl)
+    luaX_syntaxerror(ls, "no loop to break");
+  if (upval)
+    luaK_codeABC(fs, OP_CLOSE, bl->nactvar, 0, 0);
+  luaK_concat(fs, &bl->breaklist, luaK_jump(fs));
+}
+
+
+static int statement (LexState *ls) {
+  int line = ls->linenumber;  /* may be needed for error messages */
+  switch (ls->t.token) {
+    case TK_IF: {  /* stat -> ifstat */
+      ifstat(ls, line);
+      return 0;
+    }
+    case TK_WHILE: {  /* stat -> whilestat */
+      whilestat(ls, line);
+      return 0;
+    }
+    case TK_DO: {  /* stat -> DO block END */
+      next(ls);  /* skip DO */
+      block(ls);
+      check_match(ls, TK_END, TK_DO, line);
+      return 0;
+    }
+    case TK_FOR: {  /* stat -> forstat */
+      forstat(ls, line);
+      return 0;
+    }
+    case TK_REPEAT: {  /* stat -> repeatstat */
+      repeatstat(ls, line);
+      return 0;
+    }
+    case TK_FUNCTION: {
+      funcstat(ls, line);  /* stat -> funcstat */
+      return 0;
+    }
+    case TK_LOCAL: {  /* stat -> localstat */
+      next(ls);  /* skip LOCAL */
+      if (testnext(ls, TK_FUNCTION))  /* local function? */
+        localfunc(ls);
+      else
+        localstat(ls);
+      return 0;
+    }
+    case TK_RETURN: {  /* stat -> retstat */
+      retstat(ls);
+      return 1;  /* must be last statement */
+    }
+    case TK_BREAK: {  /* stat -> breakstat */
+      breakstat(ls);
+      return 1;  /* must be last statement */
+    }
+    default: {
+      exprstat(ls);
+      return 0;  /* to avoid warnings */
+    }
+  }
+}
+
+
+static void chunk (LexState *ls) {
+  /* chunk -> { stat [`;'] } */
+  int islast = 0;
+  enterlevel(ls);
+  while (!islast && !block_follow(ls->t.token)) {
+    islast = statement(ls);
+    testnext(ls, ';');
+    lua_assert(ls->fs->freereg >= ls->fs->nactvar);
+    ls->fs->freereg = ls->fs->nactvar;  /* free registers */
+  }
+  leavelevel(ls);
+}
+
+/* }====================================================================== */
diff --git a/main/source/lua/src/lparser.h b/main/source/lua/src/lparser.h
new file mode 100644
index 00000000..52c89857
--- /dev/null
+++ b/main/source/lua/src/lparser.h
@@ -0,0 +1,71 @@
+/*
+** $Id: lparser.h,v 1.47 2003/02/11 10:46:24 roberto Exp $
+** Lua Parser
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lparser_h
+#define lparser_h
+
+#include "llimits.h"
+#include "lobject.h"
+#include "ltable.h"
+#include "lzio.h"
+
+
+/*
+** Expression descriptor
+*/
+
+typedef enum {
+  VVOID,	/* no value */
+  VNIL,
+  VTRUE,
+  VFALSE,
+  VK,		/* info = index of constant in `k' */
+  VLOCAL,	/* info = local register */
+  VUPVAL,       /* info = index of upvalue in `upvalues' */
+  VGLOBAL,	/* info = index of table; aux = index of global name in `k' */
+  VINDEXED,	/* info = table register; aux = index register (or `k') */
+  VJMP,		/* info = instruction pc */
+  VRELOCABLE,	/* info = instruction pc */
+  VNONRELOC,	/* info = result register */
+  VCALL		/* info = result register */
+} expkind;
+
+typedef struct expdesc {
+  expkind k;
+  int info, aux;
+  int t;  /* patch list of `exit when true' */
+  int f;  /* patch list of `exit when false' */
+} expdesc;
+
+
+struct BlockCnt;  /* defined in lparser.c */
+
+
+/* state needed to generate code for a given function */
+typedef struct FuncState {
+  Proto *f;  /* current function header */
+  Table *h;  /* table to find (and reuse) elements in `k' */
+  struct FuncState *prev;  /* enclosing function */
+  struct LexState *ls;  /* lexical state */
+  struct lua_State *L;  /* copy of the Lua state */
+  struct BlockCnt *bl;  /* chain of current blocks */
+  int pc;  /* next position to code (equivalent to `ncode') */
+  int lasttarget;   /* `pc' of last `jump target' */
+  int jpc;  /* list of pending jumps to `pc' */
+  int freereg;  /* first free register */
+  int nk;  /* number of elements in `k' */
+  int np;  /* number of elements in `p' */
+  int nlocvars;  /* number of elements in `locvars' */
+  int nactvar;  /* number of active local variables */
+  expdesc upvalues[MAXUPVALUES];  /* upvalues */
+  int actvar[MAXVARS];  /* declared-variable stack */
+} FuncState;
+
+
+Proto *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff);
+
+
+#endif
diff --git a/main/source/lua/src/lstate.c b/main/source/lua/src/lstate.c
new file mode 100644
index 00000000..4b2fa5ea
--- /dev/null
+++ b/main/source/lua/src/lstate.c
@@ -0,0 +1,220 @@
+/*
+** $Id: lstate.c,v 1.123 2003/04/03 13:35:34 roberto Exp $
+** Global State
+** See Copyright Notice in lua.h
+*/
+
+
+#include <stdlib.h>
+
+#define lstate_c
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "llex.h"
+#include "lmem.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+
+
+/*
+** macro to allow the inclusion of user information in Lua state
+*/
+#ifndef LUA_USERSTATE
+#define EXTRASPACE	0
+#else
+union UEXTRASPACE {L_Umaxalign a; LUA_USERSTATE b;};
+#define EXTRASPACE (sizeof(union UEXTRASPACE))
+#endif
+
+
+
+/*
+** you can change this function through the official API:
+** call `lua_setpanicf'
+*/
+static int default_panic (lua_State *L) {
+  UNUSED(L);
+  return 0;
+}
+
+
+static lua_State *mallocstate (lua_State *L) {
+  lu_byte *block = (lu_byte *)luaM_malloc(L, sizeof(lua_State) + EXTRASPACE);
+  if (block == NULL) return NULL;
+  else {
+    block += EXTRASPACE;
+    return cast(lua_State *, block);
+  }
+}
+
+
+static void freestate (lua_State *L, lua_State *L1) {
+  luaM_free(L, cast(lu_byte *, L1) - EXTRASPACE,
+               sizeof(lua_State) + EXTRASPACE);
+}
+
+
+static void stack_init (lua_State *L1, lua_State *L) {
+  L1->stack = luaM_newvector(L, BASIC_STACK_SIZE + EXTRA_STACK, TObject);
+  L1->stacksize = BASIC_STACK_SIZE + EXTRA_STACK;
+  L1->top = L1->stack;
+  L1->stack_last = L1->stack+(L1->stacksize - EXTRA_STACK)-1;
+  L1->base_ci = luaM_newvector(L, BASIC_CI_SIZE, CallInfo);
+  L1->ci = L1->base_ci;
+  L1->ci->state = CI_C;  /*  not a Lua function */
+  setnilvalue(L1->top++);  /* `function' entry for this `ci' */
+  L1->base = L1->ci->base = L1->top;
+  L1->ci->top = L1->top + LUA_MINSTACK;
+  L1->size_ci = BASIC_CI_SIZE;
+  L1->end_ci = L1->base_ci + L1->size_ci;
+}
+
+
+static void freestack (lua_State *L, lua_State *L1) {
+  luaM_freearray(L, L1->base_ci, L1->size_ci, CallInfo);
+  luaM_freearray(L, L1->stack, L1->stacksize, TObject);
+}
+
+
+/*
+** open parts that may cause memory-allocation errors
+*/
+static void f_luaopen (lua_State *L, void *ud) {
+  /* create a new global state */
+  global_State *g = luaM_new(NULL, global_State);
+  UNUSED(ud);
+  if (g == NULL) luaD_throw(L, LUA_ERRMEM);
+  L->l_G = g;
+  g->mainthread = L;
+  g->GCthreshold = 0;  /* mark it as unfinished state */
+  g->strt.size = 0;
+  g->strt.nuse = 0;
+  g->strt.hash = NULL;
+  setnilvalue(defaultmeta(L));
+  setnilvalue(registry(L));
+  luaZ_initbuffer(L, &g->buff);
+  g->panic = default_panic;
+  g->rootgc = NULL;
+  g->rootudata = NULL;
+  g->tmudata = NULL;
+  setnilvalue(gkey(g->dummynode));
+  setnilvalue(gval(g->dummynode));
+  g->dummynode->next = NULL;
+  g->nblocks = sizeof(lua_State) + sizeof(global_State);
+  stack_init(L, L);  /* init stack */
+  /* create default meta table with a dummy table, and then close the loop */
+  defaultmeta(L)->tt = LUA_TTABLE;
+  sethvalue(defaultmeta(L), luaH_new(L, 0, 0));
+  hvalue(defaultmeta(L))->metatable = hvalue(defaultmeta(L));
+  sethvalue(gt(L), luaH_new(L, 0, 4));  /* table of globals */
+  sethvalue(registry(L), luaH_new(L, 4, 4));  /* registry */
+  luaS_resize(L, MINSTRTABSIZE);  /* initial size of string table */
+  luaT_init(L);
+  luaX_init(L);
+  luaS_fix(luaS_newliteral(L, MEMERRMSG));
+  g->GCthreshold = 4*G(L)->nblocks;
+}
+
+
+static void preinit_state (lua_State *L) {
+  L->stack = NULL;
+  L->stacksize = 0;
+  L->errorJmp = NULL;
+  L->hook = NULL;
+  L->hookmask = L->hookinit = 0;
+  L->basehookcount = 0;
+  L->allowhook = 1;
+  resethookcount(L);
+  L->openupval = NULL;
+  L->size_ci = 0;
+  L->nCcalls = 0;
+  L->base_ci = L->ci = NULL;
+  L->errfunc = 0;
+  setnilvalue(gt(L));
+}
+
+
+static void close_state (lua_State *L) {
+  luaF_close(L, L->stack);  /* close all upvalues for this thread */
+  if (G(L)) {  /* close global state */
+    luaC_sweep(L, 1);  /* collect all elements */
+    lua_assert(G(L)->rootgc == NULL);
+    lua_assert(G(L)->rootudata == NULL);
+    luaS_freeall(L);
+    luaZ_freebuffer(L, &G(L)->buff);
+  }
+  freestack(L, L);
+  if (G(L)) {
+    lua_assert(G(L)->nblocks == sizeof(lua_State) + sizeof(global_State));
+    luaM_freelem(NULL, G(L));
+  }
+  freestate(NULL, L);
+}
+
+
+lua_State *luaE_newthread (lua_State *L) {
+  lua_State *L1 = mallocstate(L);
+  luaC_link(L, valtogco(L1), LUA_TTHREAD);
+  preinit_state(L1);
+  L1->l_G = L->l_G;
+  stack_init(L1, L);  /* init stack */
+  setobj2n(gt(L1), gt(L));  /* share table of globals */
+  return L1;
+}
+
+
+void luaE_freethread (lua_State *L, lua_State *L1) {
+  luaF_close(L1, L1->stack);  /* close all upvalues for this thread */
+  lua_assert(L1->openupval == NULL);
+  freestack(L, L1);
+  freestate(L, L1);
+}
+
+
+LUA_API lua_State *lua_open (void) {
+  lua_State *L = mallocstate(NULL);
+  if (L) {  /* allocation OK? */
+    L->tt = LUA_TTHREAD;
+    L->marked = 0;
+    L->next = L->gclist = NULL;
+    preinit_state(L);
+    L->l_G = NULL;
+    if (luaD_rawrunprotected(L, f_luaopen, NULL) != 0) {
+      /* memory allocation error: free partial state */
+      close_state(L);
+      L = NULL;
+    }
+  }
+  lua_userstateopen(L);
+  return L;
+}
+
+
+static void callallgcTM (lua_State *L, void *ud) {
+  UNUSED(ud);
+  luaC_callGCTM(L);  /* call GC metamethods for all udata */
+}
+
+
+LUA_API void lua_close (lua_State *L) {
+  lua_lock(L);
+  L = G(L)->mainthread;  /* only the main thread can be closed */
+  luaF_close(L, L->stack);  /* close all upvalues for this thread */
+  luaC_separateudata(L);  /* separate udata that have GC metamethods */
+  L->errfunc = 0;  /* no error function during GC metamethods */
+  do {  /* repeat until no more errors */
+    L->ci = L->base_ci;
+    L->base = L->top = L->ci->base;
+    L->nCcalls = 0;
+  } while (luaD_rawrunprotected(L, callallgcTM, NULL) != 0);
+  lua_assert(G(L)->tmudata == NULL);
+  close_state(L);
+}
+
diff --git a/main/source/lua/src/lstate.h b/main/source/lua/src/lstate.h
new file mode 100644
index 00000000..84903d1b
--- /dev/null
+++ b/main/source/lua/src/lstate.h
@@ -0,0 +1,195 @@
+/*
+** $Id: lstate.h,v 1.109 2003/02/27 11:52:30 roberto Exp $
+** Global State
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lstate_h
+#define lstate_h
+
+#include "lua.h"
+
+#include "lobject.h"
+#include "ltm.h"
+#include "lzio.h"
+
+
+/*
+** macros for thread synchronization inside Lua core machine:
+** all accesses to the global state and to global objects are synchronized.
+** Because threads can read the stack of other threads
+** (when running garbage collection),
+** a thread must also synchronize any write-access to its own stack.
+** Unsynchronized accesses are allowed only when reading its own stack,
+** or when reading immutable fields from global objects
+** (such as string values and udata values). 
+*/
+#ifndef lua_lock
+#define lua_lock(L)	((void) 0)
+#endif
+
+#ifndef lua_unlock
+#define lua_unlock(L)	((void) 0)
+#endif
+
+
+#ifndef lua_userstateopen
+#define lua_userstateopen(l)
+#endif
+
+
+
+struct lua_longjmp;  /* defined in ldo.c */
+
+
+/* default meta table (both for tables and udata) */
+#define defaultmeta(L)	(&G(L)->_defaultmeta)
+
+/* table of globals */
+#define gt(L)	(&L->_gt)
+
+/* registry */
+#define registry(L)	(&G(L)->_registry)
+
+
+/* extra stack space to handle TM calls and some other extras */
+#define EXTRA_STACK   5
+
+
+#define BASIC_CI_SIZE           8
+
+#define BASIC_STACK_SIZE        (2*LUA_MINSTACK)
+
+
+
+typedef struct stringtable {
+  GCObject **hash;
+  ls_nstr nuse;  /* number of elements */
+  int size;
+} stringtable;
+
+
+/*
+** informations about a call
+*/
+typedef struct CallInfo {
+  StkId base;  /* base for called function */
+  StkId	top;  /* top for this function */
+  int state;  /* bit fields; see below */
+  union {
+    struct {  /* for Lua functions */
+      const Instruction *savedpc;
+      const Instruction **pc;  /* points to `pc' variable in `luaV_execute' */
+      int tailcalls;  /* number of tail calls lost under this entry */
+    } l;
+    struct {  /* for C functions */
+      int dummy;  /* just to avoid an empty struct */
+    } c;
+  } u;
+} CallInfo;
+
+
+/*
+** bit fields for `CallInfo.state'
+*/
+#define CI_C		(1<<0)  /* 1 if function is a C function */
+/* 1 if (Lua) function has an active `luaV_execute' running it */
+#define CI_HASFRAME	(1<<1)
+/* 1 if Lua function is calling another Lua function (and therefore its
+   `pc' is being used by the other, and therefore CI_SAVEDPC is 1 too) */
+#define CI_CALLING	(1<<2)
+#define CI_SAVEDPC	(1<<3)  /* 1 if `savedpc' is updated */
+#define CI_YIELD	(1<<4)  /* 1 if thread is suspended */
+
+
+#define ci_func(ci)	(clvalue((ci)->base - 1))
+
+
+/*
+** `global state', shared by all threads of this state
+*/
+typedef struct global_State {
+  stringtable strt;  /* hash table for strings */
+  GCObject *rootgc;  /* list of (almost) all collectable objects */
+  GCObject *rootudata;   /* (separated) list of all userdata */
+  GCObject *tmudata;  /* list of userdata to be GC */
+  Mbuffer buff;  /* temporary buffer for string concatentation */
+  lu_mem GCthreshold;
+  lu_mem nblocks;  /* number of `bytes' currently allocated */
+  lua_CFunction panic;  /* to be called in unprotected errors */
+  TObject _registry;
+  TObject _defaultmeta;
+  struct lua_State *mainthread;
+  Node dummynode[1];  /* common node array for all empty tables */
+  TString *tmname[TM_N];  /* array with tag-method names */
+} global_State;
+
+
+/*
+** `per thread' state
+*/
+struct lua_State {
+  CommonHeader;
+  StkId top;  /* first free slot in the stack */
+  StkId base;  /* base of current function */
+  global_State *l_G;
+  CallInfo *ci;  /* call info for current function */
+  StkId stack_last;  /* last free slot in the stack */
+  StkId stack;  /* stack base */
+  int stacksize;
+  CallInfo *end_ci;  /* points after end of ci array*/
+  CallInfo *base_ci;  /* array of CallInfo's */
+  unsigned short size_ci;  /* size of array `base_ci' */
+  unsigned short nCcalls;  /* number of nested C calls */
+  lu_byte hookmask;
+  lu_byte allowhook;
+  lu_byte hookinit;
+  int basehookcount;
+  int hookcount;
+  lua_Hook hook;
+  TObject _gt;  /* table of globals */
+  GCObject *openupval;  /* list of open upvalues in this stack */
+  GCObject *gclist;
+  struct lua_longjmp *errorJmp;  /* current error recover point */
+  ptrdiff_t errfunc;  /* current error handling function (stack index) */
+};
+
+
+#define G(L)	(L->l_G)
+
+
+/*
+** Union of all collectable objects
+*/
+union GCObject {
+  GCheader gch;
+  union TString ts;
+  union Udata u;
+  union Closure cl;
+  struct Table h;
+  struct Proto p;
+  struct UpVal uv;
+  struct lua_State th;  /* thread */
+};
+
+
+/* macros to convert a GCObject into a specific value */
+#define gcotots(o)	check_exp((o)->gch.tt == LUA_TSTRING, &((o)->ts))
+#define gcotou(o)	check_exp((o)->gch.tt == LUA_TUSERDATA, &((o)->u))
+#define gcotocl(o)	check_exp((o)->gch.tt == LUA_TFUNCTION, &((o)->cl))
+#define gcotoh(o)	check_exp((o)->gch.tt == LUA_TTABLE, &((o)->h))
+#define gcotop(o)	check_exp((o)->gch.tt == LUA_TPROTO, &((o)->p))
+#define gcotouv(o)	check_exp((o)->gch.tt == LUA_TUPVAL, &((o)->uv))
+#define ngcotouv(o) \
+	check_exp((o) == NULL || (o)->gch.tt == LUA_TUPVAL, &((o)->uv))
+#define gcototh(o)	check_exp((o)->gch.tt == LUA_TTHREAD, &((o)->th))
+
+/* macro to convert any value into a GCObject */
+#define valtogco(v)	(cast(GCObject *, (v)))
+
+
+lua_State *luaE_newthread (lua_State *L);
+void luaE_freethread (lua_State *L, lua_State *L1);
+
+#endif
+
diff --git a/main/source/lua/src/lstring.c b/main/source/lua/src/lstring.c
new file mode 100644
index 00000000..6472c34f
--- /dev/null
+++ b/main/source/lua/src/lstring.c
@@ -0,0 +1,102 @@
+/*
+** $Id: lstring.c,v 1.78 2002/12/04 17:38:31 roberto Exp $
+** String table (keeps all strings handled by Lua)
+** See Copyright Notice in lua.h
+*/
+
+
+#include <string.h>
+
+#define lstring_c
+
+#include "lua.h"
+
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+
+
+
+void luaS_freeall (lua_State *L) {
+  lua_assert(G(L)->strt.nuse==0);
+  luaM_freearray(L, G(L)->strt.hash, G(L)->strt.size, TString *);
+}
+
+
+void luaS_resize (lua_State *L, int newsize) {
+  GCObject **newhash = luaM_newvector(L, newsize, GCObject *);
+  stringtable *tb = &G(L)->strt;
+  int i;
+  for (i=0; i<newsize; i++) newhash[i] = NULL;
+  /* rehash */
+  for (i=0; i<tb->size; i++) {
+    GCObject *p = tb->hash[i];
+    while (p) {  /* for each node in the list */
+      GCObject *next = p->gch.next;  /* save next */
+      lu_hash h = gcotots(p)->tsv.hash;
+      int h1 = lmod(h, newsize);  /* new position */
+      lua_assert(cast(int, h%newsize) == lmod(h, newsize));
+      p->gch.next = newhash[h1];  /* chain it */
+      newhash[h1] = p;
+      p = next;
+    }
+  }
+  luaM_freearray(L, tb->hash, tb->size, TString *);
+  tb->size = newsize;
+  tb->hash = newhash;
+}
+
+
+static TString *newlstr (lua_State *L, const char *str, size_t l, lu_hash h) {
+  TString *ts = cast(TString *, luaM_malloc(L, sizestring(l)));
+  stringtable *tb;
+  ts->tsv.len = l;
+  ts->tsv.hash = h;
+  ts->tsv.marked = 0;
+  ts->tsv.tt = LUA_TSTRING;
+  ts->tsv.reserved = 0;
+  memcpy(ts+1, str, l*sizeof(char));
+  ((char *)(ts+1))[l] = '\0';  /* ending 0 */
+  tb = &G(L)->strt;
+  h = lmod(h, tb->size);
+  ts->tsv.next = tb->hash[h];  /* chain new entry */
+  tb->hash[h] = valtogco(ts);
+  tb->nuse++;
+  if (tb->nuse > cast(ls_nstr, tb->size) && tb->size <= MAX_INT/2)
+    luaS_resize(L, tb->size*2);  /* too crowded */
+  return ts;
+}
+
+
+TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
+  GCObject *o;
+  lu_hash h = (lu_hash)l;  /* seed */
+  size_t step = (l>>5)+1;  /* if string is too long, don't hash all its chars */
+  size_t l1;
+  for (l1=l; l1>=step; l1-=step)  /* compute hash */
+    h = h ^ ((h<<5)+(h>>2)+(unsigned char)(str[l1-1]));
+  for (o = G(L)->strt.hash[lmod(h, G(L)->strt.size)];
+       o != NULL;
+       o = o->gch.next) {
+    TString *ts = gcotots(o);
+    if (ts->tsv.len == l && (memcmp(str, getstr(ts), l) == 0))
+      return ts;
+  }
+  return newlstr(L, str, l, h);  /* not found */
+}
+
+
+Udata *luaS_newudata (lua_State *L, size_t s) {
+  Udata *u;
+  u = cast(Udata *, luaM_malloc(L, sizeudata(s)));
+  u->uv.marked = (1<<1);  /* is not finalized */
+  u->uv.tt = LUA_TUSERDATA;
+  u->uv.len = s;
+  u->uv.metatable = hvalue(defaultmeta(L));
+  /* chain it on udata list */
+  u->uv.next = G(L)->rootudata;
+  G(L)->rootudata = valtogco(u);
+  return u;
+}
+
diff --git a/main/source/lua/src/lstring.h b/main/source/lua/src/lstring.h
new file mode 100644
index 00000000..752dcd96
--- /dev/null
+++ b/main/source/lua/src/lstring.h
@@ -0,0 +1,33 @@
+/*
+** $Id: lstring.h,v 1.37 2002/08/16 14:45:55 roberto Exp $
+** String table (keep all strings handled by Lua)
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lstring_h
+#define lstring_h
+
+
+#include "lobject.h"
+#include "lstate.h"
+
+
+
+#define sizestring(l)	(cast(lu_mem, sizeof(union TString))+ \
+                         (cast(lu_mem, l)+1)*sizeof(char))
+
+#define sizeudata(l)	(cast(lu_mem, sizeof(union Udata))+(l))
+
+#define luaS_new(L, s)	(luaS_newlstr(L, s, strlen(s)))
+#define luaS_newliteral(L, s)	(luaS_newlstr(L, "" s, \
+                                 (sizeof(s)/sizeof(char))-1))
+
+#define luaS_fix(s)	((s)->tsv.marked |= (1<<4))
+
+void luaS_resize (lua_State *L, int newsize);
+Udata *luaS_newudata (lua_State *L, size_t s);
+void luaS_freeall (lua_State *L);
+TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
+
+
+#endif
diff --git a/main/source/lua/src/ltable.c b/main/source/lua/src/ltable.c
new file mode 100644
index 00000000..cb467d56
--- /dev/null
+++ b/main/source/lua/src/ltable.c
@@ -0,0 +1,509 @@
+/*
+** $Id: ltable.c,v 1.132 2003/04/03 13:35:34 roberto Exp $
+** Lua tables (hash)
+** See Copyright Notice in lua.h
+*/
+
+
+/*
+** Implementation of tables (aka arrays, objects, or hash tables).
+** Tables keep its elements in two parts: an array part and a hash part.
+** Non-negative integer keys are all candidates to be kept in the array
+** part. The actual size of the array is the largest `n' such that at
+** least half the slots between 0 and n are in use.
+** Hash uses a mix of chained scatter table with Brent's variation.
+** A main invariant of these tables is that, if an element is not
+** in its main position (i.e. the `original' position that its hash gives
+** to it), then the colliding element is in its own main position.
+** In other words, there are collisions only when two elements have the
+** same main position (i.e. the same hash values for that table size).
+** Because of that, the load factor of these tables can be 100% without
+** performance penalties.
+*/
+
+#include <string.h>
+
+#define ltable_c
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "ltable.h"
+
+
+/*
+** max size of array part is 2^MAXBITS
+*/
+#if BITS_INT > 26
+#define MAXBITS		24
+#else
+#define MAXBITS		(BITS_INT-2)
+#endif
+
+/* check whether `x' < 2^MAXBITS */
+#define toobig(x)	((((x)-1) >> MAXBITS) != 0)
+
+
+/* function to convert a lua_Number to int (with any rounding method) */
+#ifndef lua_number2int
+#define lua_number2int(i,n)	((i)=(int)(n))
+#endif
+
+
+#define hashpow2(t,n)      (gnode(t, lmod((n), sizenode(t))))
+  
+#define hashstr(t,str)  hashpow2(t, (str)->tsv.hash)
+#define hashboolean(t,p)        hashpow2(t, p)
+
+
+/*
+** for some types, it is better to avoid modulus by power of 2, as
+** they tend to have many 2 factors.
+*/
+#define hashmod(t,n)	(gnode(t, ((n) % ((sizenode(t)-1)|1))))
+
+
+#define hashpointer(t,p)	hashmod(t, IntPoint(p))
+
+
+/*
+** number of ints inside a lua_Number
+*/
+#define numints		cast(int, sizeof(lua_Number)/sizeof(int))
+
+
+/*
+** hash for lua_Numbers
+*/
+static Node *hashnum (const Table *t, lua_Number n) {
+  unsigned int a[numints];
+  int i;
+  n += 1;  /* normalize number (avoid -0) */
+  lua_assert(sizeof(a) <= sizeof(n));
+  memcpy(a, &n, sizeof(a));
+  for (i = 1; i < numints; i++) a[0] += a[i];
+  return hashmod(t, cast(lu_hash, a[0]));
+}
+
+
+
+/*
+** returns the `main' position of an element in a table (that is, the index
+** of its hash value)
+*/
+Node *luaH_mainposition (const Table *t, const TObject *key) {
+  switch (ttype(key)) {
+    case LUA_TNUMBER:
+      return hashnum(t, nvalue(key));
+    case LUA_TSTRING:
+      return hashstr(t, tsvalue(key));
+    case LUA_TBOOLEAN:
+      return hashboolean(t, bvalue(key));
+    case LUA_TLIGHTUSERDATA:
+      return hashpointer(t, pvalue(key));
+    default:
+      return hashpointer(t, gcvalue(key));
+  }
+}
+
+
+/*
+** returns the index for `key' if `key' is an appropriate key to live in
+** the array part of the table, -1 otherwise.
+*/
+static int arrayindex (const TObject *key) {
+  if (ttisnumber(key)) {
+    int k;
+    lua_number2int(k, (nvalue(key)));
+    if (cast(lua_Number, k) == nvalue(key) && k >= 1 && !toobig(k))
+      return k;
+  }
+  return -1;  /* `key' did not match some condition */
+}
+
+
+/*
+** returns the index of a `key' for table traversals. First goes all
+** elements in the array part, then elements in the hash part. The
+** beginning and end of a traversal are signalled by -1.
+*/
+static int luaH_index (lua_State *L, Table *t, StkId key) {
+  int i;
+  if (ttisnil(key)) return -1;  /* first iteration */
+  i = arrayindex(key);
+  if (0 <= i && i <= t->sizearray) {  /* is `key' inside array part? */
+    return i-1;  /* yes; that's the index (corrected to C) */
+  }
+  else {
+    const TObject *v = luaH_get(t, key);
+    if (v == &luaO_nilobject)
+      luaG_runerror(L, "invalid key for `next'");
+    i = cast(int, (cast(const lu_byte *, v) -
+                   cast(const lu_byte *, gval(gnode(t, 0)))) / sizeof(Node));
+    return i + t->sizearray;  /* hash elements are numbered after array ones */
+  }
+}
+
+
+int luaH_next (lua_State *L, Table *t, StkId key) {
+  int i = luaH_index(L, t, key);  /* find original element */
+  for (i++; i < t->sizearray; i++) {  /* try first array part */
+    if (!ttisnil(&t->array[i])) {  /* a non-nil value? */
+      setnvalue(key, cast(lua_Number, i+1));
+      setobj2s(key+1, &t->array[i]);
+      return 1;
+    }
+  }
+  for (i -= t->sizearray; i < sizenode(t); i++) {  /* then hash part */
+    if (!ttisnil(gval(gnode(t, i)))) {  /* a non-nil value? */
+      setobj2s(key, gkey(gnode(t, i)));
+      setobj2s(key+1, gval(gnode(t, i)));
+      return 1;
+    }
+  }
+  return 0;  /* no more elements */
+}
+
+
+/*
+** {=============================================================
+** Rehash
+** ==============================================================
+*/
+
+
+static void computesizes  (int nums[], int ntotal, int *narray, int *nhash) {
+  int i;
+  int a = nums[0];  /* number of elements smaller than 2^i */
+  int na = a;  /* number of elements to go to array part */
+  int n = (na == 0) ? -1 : 0;  /* (log of) optimal size for array part */
+  for (i = 1; a < *narray && *narray >= twoto(i-1); i++) {
+    if (nums[i] > 0) {
+      a += nums[i];
+      if (a >= twoto(i-1)) {  /* more than half elements in use? */
+        n = i;
+        na = a;
+      }
+    }
+  }
+  lua_assert(na <= *narray && *narray <= ntotal);
+  *nhash = ntotal - na;
+  *narray = (n == -1) ? 0 : twoto(n);
+  lua_assert(na <= *narray && na >= *narray/2);
+}
+
+
+static void numuse (const Table *t, int *narray, int *nhash) {
+  int nums[MAXBITS+1];
+  int i, lg;
+  int totaluse = 0;
+  /* count elements in array part */
+  for (i=0, lg=0; lg<=MAXBITS; lg++) {  /* for each slice [2^(lg-1) to 2^lg) */
+    int ttlg = twoto(lg);  /* 2^lg */
+    if (ttlg > t->sizearray) {
+      ttlg = t->sizearray;
+      if (i >= ttlg) break;
+    }
+    nums[lg] = 0;
+    for (; i<ttlg; i++) {
+      if (!ttisnil(&t->array[i])) {
+        nums[lg]++;
+        totaluse++;
+      }
+    }
+  }
+  for (; lg<=MAXBITS; lg++) nums[lg] = 0;  /* reset other counts */
+  *narray = totaluse;  /* all previous uses were in array part */
+  /* count elements in hash part */
+  i = sizenode(t);
+  while (i--) {
+    Node *n = &t->node[i];
+    if (!ttisnil(gval(n))) {
+      int k = arrayindex(gkey(n));
+      if (k >= 0) {  /* is `key' an appropriate array index? */
+        nums[luaO_log2(k-1)+1]++;  /* count as such */
+        (*narray)++;
+      }
+      totaluse++;
+    }
+  }
+  computesizes(nums, totaluse, narray, nhash);
+}
+
+
+static void setarrayvector (lua_State *L, Table *t, int size) {
+  int i;
+  luaM_reallocvector(L, t->array, t->sizearray, size, TObject);
+  for (i=t->sizearray; i<size; i++)
+     setnilvalue(&t->array[i]);
+  t->sizearray = size;
+}
+
+
+static void setnodevector (lua_State *L, Table *t, int lsize) {
+  int i;
+  int size = twoto(lsize);
+  if (lsize > MAXBITS)
+    luaG_runerror(L, "table overflow");
+  if (lsize == 0) {  /* no elements to hash part? */
+    t->node = G(L)->dummynode;  /* use common `dummynode' */
+    lua_assert(ttisnil(gkey(t->node)));  /* assert invariants: */
+    lua_assert(ttisnil(gval(t->node)));
+    lua_assert(t->node->next == NULL);  /* (`dummynode' must be empty) */
+  }
+  else {
+    t->node = luaM_newvector(L, size, Node);
+    for (i=0; i<size; i++) {
+      t->node[i].next = NULL;
+      setnilvalue(gkey(gnode(t, i)));
+      setnilvalue(gval(gnode(t, i)));
+    }
+  }
+  t->lsizenode = cast(lu_byte, lsize);
+  t->firstfree = gnode(t, size-1);  /* first free position to be used */
+}
+
+
+static void resize (lua_State *L, Table *t, int nasize, int nhsize) {
+  int i;
+  int oldasize = t->sizearray;
+  int oldhsize = t->lsizenode;
+  Node *nold;
+  Node temp[1];
+  if (oldhsize)
+    nold = t->node;  /* save old hash ... */
+  else {  /* old hash is `dummynode' */
+    lua_assert(t->node == G(L)->dummynode);
+    temp[0] = t->node[0];  /* copy it to `temp' */
+    nold = temp;
+    setnilvalue(gkey(G(L)->dummynode));  /* restate invariant */
+    setnilvalue(gval(G(L)->dummynode));
+    lua_assert(G(L)->dummynode->next == NULL);
+  }
+  if (nasize > oldasize)  /* array part must grow? */
+    setarrayvector(L, t, nasize);
+  /* create new hash part with appropriate size */
+  setnodevector(L, t, nhsize);  
+  /* re-insert elements */
+  if (nasize < oldasize) {  /* array part must shrink? */
+    t->sizearray = nasize;
+    /* re-insert elements from vanishing slice */
+    for (i=nasize; i<oldasize; i++) {
+      if (!ttisnil(&t->array[i]))
+        setobjt2t(luaH_setnum(L, t, i+1), &t->array[i]);
+    }
+    /* shrink array */
+    luaM_reallocvector(L, t->array, oldasize, nasize, TObject);
+  }
+  /* re-insert elements in hash part */
+  for (i = twoto(oldhsize) - 1; i >= 0; i--) {
+    Node *old = nold+i;
+    if (!ttisnil(gval(old)))
+      setobjt2t(luaH_set(L, t, gkey(old)), gval(old));
+  }
+  if (oldhsize)
+    luaM_freearray(L, nold, twoto(oldhsize), Node);  /* free old array */
+}
+
+
+static void rehash (lua_State *L, Table *t) {
+  int nasize, nhsize;
+  numuse(t, &nasize, &nhsize);  /* compute new sizes for array and hash parts */
+  resize(L, t, nasize, luaO_log2(nhsize)+1);
+}
+
+
+
+/*
+** }=============================================================
+*/
+
+
+Table *luaH_new (lua_State *L, int narray, int lnhash) {
+  Table *t = luaM_new(L, Table);
+  luaC_link(L, valtogco(t), LUA_TTABLE);
+  t->metatable = hvalue(defaultmeta(L));
+  t->flags = cast(lu_byte, ~0);
+  /* temporary values (kept only if some malloc fails) */
+  t->array = NULL;
+  t->sizearray = 0;
+  t->lsizenode = 0;
+  t->node = NULL;
+  setarrayvector(L, t, narray);
+  setnodevector(L, t, lnhash);
+  return t;
+}
+
+
+void luaH_free (lua_State *L, Table *t) {
+  if (t->lsizenode)
+    luaM_freearray(L, t->node, sizenode(t), Node);
+  luaM_freearray(L, t->array, t->sizearray, TObject);
+  luaM_freelem(L, t);
+}
+
+
+#if 0
+/*
+** try to remove an element from a hash table; cannot move any element
+** (because gc can call `remove' during a table traversal)
+*/
+void luaH_remove (Table *t, Node *e) {
+  Node *mp = luaH_mainposition(t, gkey(e));
+  if (e != mp) {  /* element not in its main position? */
+    while (mp->next != e) mp = mp->next;  /* find previous */
+    mp->next = e->next;  /* remove `e' from its list */
+  }
+  else {
+    if (e->next != NULL) ??
+  }
+  lua_assert(ttisnil(gval(node)));
+  setnilvalue(gkey(e));  /* clear node `e' */
+  e->next = NULL;
+}
+#endif
+
+
+/*
+** inserts a new key into a hash table; first, check whether key's main 
+** position is free. If not, check whether colliding node is in its main 
+** position or not: if it is not, move colliding node to an empty place and 
+** put new key in its main position; otherwise (colliding node is in its main 
+** position), new key goes to an empty position. 
+*/
+static TObject *newkey (lua_State *L, Table *t, const TObject *key) {
+  TObject *val;
+  Node *mp = luaH_mainposition(t, key);
+  if (!ttisnil(gval(mp))) {  /* main position is not free? */
+    Node *othern = luaH_mainposition(t, gkey(mp));  /* `mp' of colliding node */
+    Node *n = t->firstfree;  /* get a free place */
+    if (othern != mp) {  /* is colliding node out of its main position? */
+      /* yes; move colliding node into free position */
+      while (othern->next != mp) othern = othern->next;  /* find previous */
+      othern->next = n;  /* redo the chain with `n' in place of `mp' */
+      *n = *mp;  /* copy colliding node into free pos. (mp->next also goes) */
+      mp->next = NULL;  /* now `mp' is free */
+      setnilvalue(gval(mp));
+    }
+    else {  /* colliding node is in its own main position */
+      /* new node will go into free position */
+      n->next = mp->next;  /* chain new position */
+      mp->next = n;
+      mp = n;
+    }
+  }
+  setobj2t(gkey(mp), key);  /* write barrier */
+  lua_assert(ttisnil(gval(mp)));
+  for (;;) {  /* correct `firstfree' */
+    if (ttisnil(gkey(t->firstfree)))
+      return gval(mp);  /* OK; table still has a free place */
+    else if (t->firstfree == t->node) break;  /* cannot decrement from here */
+    else (t->firstfree)--;
+  }
+  /* no more free places; must create one */
+  setbvalue(gval(mp), 0);  /* avoid new key being removed */
+  rehash(L, t);  /* grow table */
+  val = cast(TObject *, luaH_get(t, key));  /* get new position */
+  lua_assert(ttisboolean(val));
+  setnilvalue(val);
+  return val;
+}
+
+
+/*
+** generic search function
+*/
+static const TObject *luaH_getany (Table *t, const TObject *key) {
+  if (ttisnil(key)) return &luaO_nilobject;
+  else {
+    Node *n = luaH_mainposition(t, key);
+    do {  /* check whether `key' is somewhere in the chain */
+      if (luaO_rawequalObj(gkey(n), key)) return gval(n);  /* that's it */
+      else n = n->next;
+    } while (n);
+    return &luaO_nilobject;
+  }
+}
+
+
+/*
+** search function for integers
+*/
+const TObject *luaH_getnum (Table *t, int key) {
+  if (1 <= key && key <= t->sizearray)
+    return &t->array[key-1];
+  else {
+    lua_Number nk = cast(lua_Number, key);
+    Node *n = hashnum(t, nk);
+    do {  /* check whether `key' is somewhere in the chain */
+      if (ttisnumber(gkey(n)) && nvalue(gkey(n)) == nk)
+        return gval(n);  /* that's it */
+      else n = n->next;
+    } while (n);
+    return &luaO_nilobject;
+  }
+}
+
+
+/*
+** search function for strings
+*/
+const TObject *luaH_getstr (Table *t, TString *key) {
+  Node *n = hashstr(t, key);
+  do {  /* check whether `key' is somewhere in the chain */
+    if (ttisstring(gkey(n)) && tsvalue(gkey(n)) == key)
+      return gval(n);  /* that's it */
+    else n = n->next;
+  } while (n);
+  return &luaO_nilobject;
+}
+
+
+/*
+** main search function
+*/
+const TObject *luaH_get (Table *t, const TObject *key) {
+  switch (ttype(key)) {
+    case LUA_TSTRING: return luaH_getstr(t, tsvalue(key));
+    case LUA_TNUMBER: {
+      int k;
+      lua_number2int(k, (nvalue(key)));
+      if (cast(lua_Number, k) == nvalue(key))  /* is an integer index? */
+        return luaH_getnum(t, k);  /* use specialized version */
+      /* else go through */
+    }
+    default: return luaH_getany(t, key);
+  }
+}
+
+
+TObject *luaH_set (lua_State *L, Table *t, const TObject *key) {
+  const TObject *p = luaH_get(t, key);
+  t->flags = 0;
+  if (p != &luaO_nilobject)
+    return cast(TObject *, p);
+  else {
+    if (ttisnil(key)) luaG_runerror(L, "table index is nil");
+    else if (ttisnumber(key) && nvalue(key) != nvalue(key))
+      luaG_runerror(L, "table index is NaN");
+    return newkey(L, t, key);
+  }
+}
+
+
+TObject *luaH_setnum (lua_State *L, Table *t, int key) {
+  const TObject *p = luaH_getnum(t, key);
+  if (p != &luaO_nilobject)
+    return cast(TObject *, p);
+  else {
+    TObject k;
+    setnvalue(&k, cast(lua_Number, key));
+    return newkey(L, t, &k);
+  }
+}
+
diff --git a/main/source/lua/src/ltable.h b/main/source/lua/src/ltable.h
new file mode 100644
index 00000000..663d1e59
--- /dev/null
+++ b/main/source/lua/src/ltable.h
@@ -0,0 +1,31 @@
+/*
+** $Id: ltable.h,v 1.44 2003/03/18 12:50:04 roberto Exp $
+** Lua tables (hash)
+** See Copyright Notice in lua.h
+*/
+
+#ifndef ltable_h
+#define ltable_h
+
+#include "lobject.h"
+
+
+#define gnode(t,i)	(&(t)->node[i])
+#define gkey(n)		(&(n)->i_key)
+#define gval(n)		(&(n)->i_val)
+
+
+const TObject *luaH_getnum (Table *t, int key);
+TObject *luaH_setnum (lua_State *L, Table *t, int key);
+const TObject *luaH_getstr (Table *t, TString *key);
+const TObject *luaH_get (Table *t, const TObject *key);
+TObject *luaH_set (lua_State *L, Table *t, const TObject *key);
+Table *luaH_new (lua_State *L, int narray, int lnhash);
+void luaH_free (lua_State *L, Table *t);
+int luaH_next (lua_State *L, Table *t, StkId key);
+
+/* exported only for debugging */
+Node *luaH_mainposition (const Table *t, const TObject *key);
+
+
+#endif
diff --git a/main/source/lua/src/ltests.c b/main/source/lua/src/ltests.c
new file mode 100644
index 00000000..73f884a8
--- /dev/null
+++ b/main/source/lua/src/ltests.c
@@ -0,0 +1,852 @@
+/*
+** $Id: ltests.c,v 1.158 2003/04/07 14:35:00 roberto Exp $
+** Internal Module for Debugging of the Lua Implementation
+** See Copyright Notice in lua.h
+*/
+
+
+#include <ctype.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ltests_c
+
+#include "lua.h"
+
+#include "lapi.h"
+#include "lauxlib.h"
+#include "lcode.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lmem.h"
+#include "lopcodes.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "lualib.h"
+
+
+
+/*
+** The whole module only makes sense with LUA_DEBUG on
+*/
+#ifdef LUA_DEBUG
+
+
+#define lua_pushintegral(L,i)	lua_pushnumber(L, cast(lua_Number, (i)))
+
+
+static lua_State *lua_state = NULL;
+
+int islocked = 0;
+
+
+#define func_at(L,k)	(L->ci->base+(k) - 1)
+
+
+static void setnameval (lua_State *L, const char *name, int val) {
+  lua_pushstring(L, name);
+  lua_pushintegral(L, val);
+  lua_settable(L, -3);
+}
+
+
+/*
+** {======================================================================
+** Controlled version for realloc.
+** =======================================================================
+*/
+
+#define MARK		0x55  /* 01010101 (a nice pattern) */
+
+#ifndef EXTERNMEMCHECK
+/* full memory check */
+#define HEADER	(sizeof(L_Umaxalign)) /* ensures maximum alignment for HEADER */
+#define MARKSIZE	16  /* size of marks after each block */
+#define blockhead(b)	(cast(char *, b) - HEADER)
+#define setsize(newblock, size)	(*cast(size_t *, newblock) = size)
+#define checkblocksize(b, size) (size == (*cast(size_t *, blockhead(b))))
+#define fillmem(mem,size)	memset(mem, -MARK, size)
+#else
+/* external memory check: don't do it twice */
+#define HEADER		0
+#define MARKSIZE	0
+#define blockhead(b)	(b)
+#define setsize(newblock, size)	/* empty */
+#define checkblocksize(b,size)	(1)
+#define fillmem(mem,size)	/* empty */
+#endif
+
+unsigned long memdebug_numblocks = 0;
+unsigned long memdebug_total = 0;
+unsigned long memdebug_maxmem = 0;
+unsigned long memdebug_memlimit = ULONG_MAX;
+
+
+static void *checkblock (void *block, size_t size) {
+  void *b = blockhead(block);
+  int i;
+  for (i=0;i<MARKSIZE;i++)
+    lua_assert(*(cast(char *, b)+HEADER+size+i) == MARK+i); /* corrupted block? */
+  return b;
+}
+
+
+static void freeblock (void *block, size_t size) {
+  if (block) {
+    lua_assert(checkblocksize(block, size));
+    block = checkblock(block, size);
+    fillmem(block, size+HEADER+MARKSIZE);  /* erase block */
+    free(block);  /* free original block */
+    memdebug_numblocks--;
+    memdebug_total -= size;
+  }
+}
+
+
+void *debug_realloc (void *block, size_t oldsize, size_t size) {
+  lua_assert(oldsize == 0 || checkblocksize(block, oldsize));
+  /* ISO does not specify what realloc(NULL, 0) does */
+  lua_assert(block != NULL || size > 0);
+  if (size == 0) {
+    freeblock(block, oldsize);
+    return NULL;
+  }
+  else if (size > oldsize && memdebug_total+size-oldsize > memdebug_memlimit)
+    return NULL;  /* to test memory allocation errors */
+  else {
+    void *newblock;
+    int i;
+    size_t realsize = HEADER+size+MARKSIZE;
+    size_t commonsize = (oldsize < size) ? oldsize : size;
+    if (realsize < size) return NULL;  /* overflow! */
+    newblock = malloc(realsize);  /* alloc a new block */
+    if (newblock == NULL) return NULL;
+    if (block) {
+      memcpy(cast(char *, newblock)+HEADER, block, commonsize);
+      freeblock(block, oldsize);  /* erase (and check) old copy */
+    }
+    /* initialize new part of the block with something `weird' */
+    fillmem(cast(char *, newblock)+HEADER+commonsize, size-commonsize);
+    memdebug_total += size;
+    if (memdebug_total > memdebug_maxmem)
+      memdebug_maxmem = memdebug_total;
+    memdebug_numblocks++;
+    setsize(newblock, size);
+    for (i=0;i<MARKSIZE;i++)
+      *(cast(char *, newblock)+HEADER+size+i) = cast(char, MARK+i);
+    return cast(char *, newblock)+HEADER;
+  }
+}
+
+
+/* }====================================================================== */
+
+
+
+/*
+** {======================================================
+** Disassembler
+** =======================================================
+*/
+
+
+static char *buildop (Proto *p, int pc, char *buff) {
+  Instruction i = p->code[pc];
+  OpCode o = GET_OPCODE(i);
+  const char *name = luaP_opnames[o];
+  int line = getline(p, pc);
+  sprintf(buff, "(%4d) %4d - ", line, pc);
+  switch (getOpMode(o)) {  
+    case iABC:
+      sprintf(buff+strlen(buff), "%-12s%4d %4d %4d", name,
+              GETARG_A(i), GETARG_B(i), GETARG_C(i));
+      break;
+    case iABx:
+      sprintf(buff+strlen(buff), "%-12s%4d %4d", name, GETARG_A(i), GETARG_Bx(i));
+      break;
+    case iAsBx:
+      sprintf(buff+strlen(buff), "%-12s%4d %4d", name, GETARG_A(i), GETARG_sBx(i));
+      break;
+  }
+  return buff;
+}
+
+
+#if 0
+void luaI_printcode (Proto *pt, int size) {
+  int pc;
+  for (pc=0; pc<size; pc++) {
+    char buff[100];
+    printf("%s\n", buildop(pt, pc, buff));
+  }
+  printf("-------\n");
+}
+#endif
+
+
+static int listcode (lua_State *L) {
+  int pc;
+  Proto *p;
+  luaL_argcheck(L, lua_isfunction(L, 1) && !lua_iscfunction(L, 1),
+                 1, "Lua function expected");
+  p = clvalue(func_at(L, 1))->l.p;
+  lua_newtable(L);
+  setnameval(L, "maxstack", p->maxstacksize);
+  setnameval(L, "numparams", p->numparams);
+  for (pc=0; pc<p->sizecode; pc++) {
+    char buff[100];
+    lua_pushintegral(L, pc+1);
+    lua_pushstring(L, buildop(p, pc, buff));
+    lua_settable(L, -3);
+  }
+  return 1;
+}
+
+
+static int listk (lua_State *L) {
+  Proto *p;
+  int i;
+  luaL_argcheck(L, lua_isfunction(L, 1) && !lua_iscfunction(L, 1),
+                 1, "Lua function expected");
+  p = clvalue(func_at(L, 1))->l.p;
+  lua_newtable(L);
+  for (i=0; i<p->sizek; i++) {
+    lua_pushintegral(L, i+1);
+    luaA_pushobject(L, p->k+i);
+    lua_settable(L, -3);
+  }
+  return 1;
+}
+
+
+static int listlocals (lua_State *L) {
+  Proto *p;
+  int pc = luaL_checkint(L, 2) - 1;
+  int i = 0;
+  const char *name;
+  luaL_argcheck(L, lua_isfunction(L, 1) && !lua_iscfunction(L, 1),
+                 1, "Lua function expected");
+  p = clvalue(func_at(L, 1))->l.p;
+  while ((name = luaF_getlocalname(p, ++i, pc)) != NULL)
+    lua_pushstring(L, name);
+  return i-1;
+}
+
+/* }====================================================== */
+
+
+
+
+static int get_limits (lua_State *L) {
+  lua_newtable(L);
+  setnameval(L, "BITS_INT", BITS_INT);
+  setnameval(L, "LFPF", LFIELDS_PER_FLUSH);
+  setnameval(L, "MAXVARS", MAXVARS);
+  setnameval(L, "MAXPARAMS", MAXPARAMS);
+  setnameval(L, "MAXSTACK", MAXSTACK);
+  setnameval(L, "MAXUPVALUES", MAXUPVALUES);
+  return 1;
+}
+
+
+static int mem_query (lua_State *L) {
+  if (lua_isnone(L, 1)) {
+    lua_pushintegral(L, memdebug_total);
+    lua_pushintegral(L, memdebug_numblocks);
+    lua_pushintegral(L, memdebug_maxmem);
+    return 3;
+  }
+  else {
+    memdebug_memlimit = luaL_checkint(L, 1);
+    return 0;
+  }
+}
+
+
+static int hash_query (lua_State *L) {
+  if (lua_isnone(L, 2)) {
+    luaL_argcheck(L, lua_type(L, 1) == LUA_TSTRING, 1, "string expected");
+    lua_pushintegral(L, tsvalue(func_at(L, 1))->tsv.hash);
+  }
+  else {
+    TObject *o = func_at(L, 1);
+    Table *t;
+    luaL_checktype(L, 2, LUA_TTABLE);
+    t = hvalue(func_at(L, 2));
+    lua_pushintegral(L, luaH_mainposition(t, o) - t->node);
+  }
+  return 1;
+}
+
+
+static int stacklevel (lua_State *L) {
+  unsigned long a = 0;
+  lua_pushintegral(L, (int)(L->top - L->stack));
+  lua_pushintegral(L, (int)(L->stack_last - L->stack));
+  lua_pushintegral(L, (int)(L->ci - L->base_ci));
+  lua_pushintegral(L, (int)(L->end_ci - L->base_ci));
+  lua_pushintegral(L, (unsigned long)&a);
+  return 5;
+}
+
+
+static int table_query (lua_State *L) {
+  const Table *t;
+  int i = luaL_optint(L, 2, -1);
+  luaL_checktype(L, 1, LUA_TTABLE);
+  t = hvalue(func_at(L, 1));
+  if (i == -1) {
+    lua_pushintegral(L, t->sizearray);
+    lua_pushintegral(L, sizenode(t));
+    lua_pushintegral(L, t->firstfree - t->node);
+  }
+  else if (i < t->sizearray) {
+    lua_pushintegral(L, i);
+    luaA_pushobject(L, &t->array[i]);
+    lua_pushnil(L); 
+  }
+  else if ((i -= t->sizearray) < sizenode(t)) {
+    if (!ttisnil(gval(gnode(t, i))) ||
+        ttisnil(gkey(gnode(t, i))) ||
+        ttisnumber(gkey(gnode(t, i)))) {
+      luaA_pushobject(L, gkey(gnode(t, i)));
+    }
+    else
+      lua_pushstring(L, "<undef>");
+    luaA_pushobject(L, gval(gnode(t, i)));
+    if (t->node[i].next)
+      lua_pushintegral(L, t->node[i].next - t->node);
+    else
+      lua_pushnil(L);
+  }
+  return 3;
+}
+
+
+static int string_query (lua_State *L) {
+  stringtable *tb = &G(L)->strt;
+  int s = luaL_optint(L, 2, 0) - 1;
+  if (s==-1) {
+    lua_pushintegral(L ,tb->nuse);
+    lua_pushintegral(L ,tb->size);
+    return 2;
+  }
+  else if (s < tb->size) {
+    GCObject *ts;
+    int n = 0;
+    for (ts = tb->hash[s]; ts; ts = ts->gch.next) {
+      setsvalue2s(L->top, gcotots(ts));
+      incr_top(L);
+      n++;
+    }
+    return n;
+  }
+  return 0;
+}
+
+
+static int tref (lua_State *L) {
+  int level = lua_gettop(L);
+  int lock = luaL_optint(L, 2, 1);
+  luaL_checkany(L, 1);
+  lua_pushvalue(L, 1);
+  lua_pushintegral(L, lua_ref(L, lock));
+  assert(lua_gettop(L) == level+1);  /* +1 for result */
+  return 1;
+}
+
+static int getref (lua_State *L) {
+  int level = lua_gettop(L);
+  lua_getref(L, luaL_checkint(L, 1));
+  assert(lua_gettop(L) == level+1);
+  return 1;
+}
+
+static int unref (lua_State *L) {
+  int level = lua_gettop(L);
+  lua_unref(L, luaL_checkint(L, 1));
+  assert(lua_gettop(L) == level);
+  return 0;
+}
+
+static int metatable (lua_State *L) {
+  luaL_checkany(L, 1);
+  if (lua_isnone(L, 2)) {
+    if (lua_getmetatable(L, 1) == 0)
+      lua_pushnil(L);
+  }
+  else {
+    lua_settop(L, 2);
+    luaL_checktype(L, 2, LUA_TTABLE);
+    lua_setmetatable(L, 1);
+  }
+  return 1;
+}
+
+
+static int upvalue (lua_State *L) {
+  int n = luaL_checkint(L, 2);
+  luaL_checktype(L, 1, LUA_TFUNCTION);
+  if (lua_isnone(L, 3)) {
+    const char *name = lua_getupvalue(L, 1, n);
+    if (name == NULL) return 0;
+    lua_pushstring(L, name);
+    return 2;
+  }
+  else {
+    const char *name = lua_setupvalue(L, 1, n);
+    lua_pushstring(L, name);
+    return 1;
+  }
+}
+
+
+static int newuserdata (lua_State *L) {
+  size_t size = luaL_checkint(L, 1);
+  char *p = cast(char *, lua_newuserdata(L, size));
+  while (size--) *p++ = '\0';
+  return 1;
+}
+
+
+static int pushuserdata (lua_State *L) {
+  lua_pushlightuserdata(L, cast(void *, luaL_checkint(L, 1)));
+  return 1;
+}
+
+
+static int udataval (lua_State *L) {
+  lua_pushintegral(L, cast(int, lua_touserdata(L, 1)));
+  return 1;
+}
+
+
+static int doonnewstack (lua_State *L) {
+  lua_State *L1 = lua_newthread(L);
+  size_t l;
+  const char *s = luaL_checklstring(L, 1, &l);
+  int status = luaL_loadbuffer(L1, s, l, s);
+  if (status == 0)
+    status = lua_pcall(L1, 0, 0, 0);
+  lua_pushintegral(L, status);
+  return 1;
+}
+
+
+static int s2d (lua_State *L) {
+  lua_pushnumber(L, *cast(const double *, luaL_checkstring(L, 1)));
+  return 1;
+}
+
+static int d2s (lua_State *L) {
+  double d = luaL_checknumber(L, 1);
+  lua_pushlstring(L, cast(char *, &d), sizeof(d));
+  return 1;
+}
+
+
+static int newstate (lua_State *L) {
+  lua_State *L1 = lua_open();
+  if (L1) {
+    lua_userstateopen(L1);  /* init lock */
+    lua_pushintegral(L, (unsigned long)L1);
+  }
+  else
+    lua_pushnil(L);
+  return 1;
+}
+
+
+static int loadlib (lua_State *L) {
+  static const luaL_reg libs[] = {
+    {"mathlibopen", luaopen_math},
+    {"strlibopen", luaopen_string},
+    {"iolibopen", luaopen_io},
+    {"tablibopen", luaopen_table},
+    {"dblibopen", luaopen_debug},
+    {"baselibopen", luaopen_base},
+    {NULL, NULL}
+  };
+  lua_State *L1 = cast(lua_State *,
+                       cast(unsigned long, luaL_checknumber(L, 1)));
+  lua_pushvalue(L1, LUA_GLOBALSINDEX);
+  luaL_openlib(L1, NULL, libs, 0);
+  return 0;
+}
+
+static int closestate (lua_State *L) {
+  lua_State *L1 = cast(lua_State *, cast(unsigned long, luaL_checknumber(L, 1)));
+  lua_close(L1);
+  lua_unlock(L);  /* close cannot unlock that */
+  return 0;
+}
+
+static int doremote (lua_State *L) {
+  lua_State *L1 = cast(lua_State *,cast(unsigned long,luaL_checknumber(L, 1)));
+  size_t lcode;
+  const char *code = luaL_checklstring(L, 2, &lcode);
+  int status;
+  lua_settop(L1, 0);
+  status = luaL_loadbuffer(L1, code, lcode, code);
+  if (status == 0)
+    status = lua_pcall(L1, 0, LUA_MULTRET, 0);
+  if (status != 0) {
+    lua_pushnil(L);
+    lua_pushintegral(L, status);
+    lua_pushstring(L, lua_tostring(L1, -1));
+    return 3;
+  }
+  else {
+    int i = 0;
+    while (!lua_isnone(L1, ++i))
+      lua_pushstring(L, lua_tostring(L1, i));
+    lua_pop(L1, i-1);
+    return i-1;
+  }
+}
+
+
+static int log2_aux (lua_State *L) {
+  lua_pushintegral(L, luaO_log2(luaL_checkint(L, 1)));
+  return 1;
+}
+
+static int int2fb_aux (lua_State *L) {
+  int b = luaO_int2fb(luaL_checkint(L, 1));
+  lua_pushintegral(L, b);
+  lua_pushintegral(L, fb2int(b));
+  return 2;
+}
+
+
+static int test_do (lua_State *L) {
+  const char *p = luaL_checkstring(L, 1);
+  if (*p == '@')
+    lua_dofile(L, p+1);
+  else
+    lua_dostring(L, p);
+  return lua_gettop(L);
+}
+
+
+
+/*
+** {======================================================
+** function to test the API with C. It interprets a kind of assembler
+** language with calls to the API, so the test can be driven by Lua code
+** =======================================================
+*/
+
+static const char *const delimits = " \t\n,;";
+
+static void skip (const char **pc) {
+  while (**pc != '\0' && strchr(delimits, **pc)) (*pc)++;
+}
+
+static int getnum_aux (lua_State *L, const char **pc) {
+  int res = 0;
+  int sig = 1;
+  skip(pc);
+  if (**pc == '.') {
+    res = cast(int, lua_tonumber(L, -1));
+    lua_pop(L, 1);
+    (*pc)++;
+    return res;
+  }
+  else if (**pc == '-') {
+    sig = -1;
+    (*pc)++;
+  }
+  while (isdigit(cast(int, **pc))) res = res*10 + (*(*pc)++) - '0';
+  return sig*res;
+}
+  
+static const char *getname_aux (char *buff, const char **pc) {
+  int i = 0;
+  skip(pc);
+  while (**pc != '\0' && !strchr(delimits, **pc))
+    buff[i++] = *(*pc)++;
+  buff[i] = '\0';
+  return buff;
+}
+
+
+#define EQ(s1)	(strcmp(s1, inst) == 0)
+
+#define getnum	(getnum_aux(L, &pc))
+#define getname	(getname_aux(buff, &pc))
+
+
+static int testC (lua_State *L) {
+  char buff[30];
+  const char *pc = luaL_checkstring(L, 1);
+  for (;;) {
+    const char *inst = getname;
+    if EQ("") return 0;
+    else if EQ("isnumber") {
+      lua_pushintegral(L, lua_isnumber(L, getnum));
+    }
+    else if EQ("isstring") {
+      lua_pushintegral(L, lua_isstring(L, getnum));
+    }
+    else if EQ("istable") {
+      lua_pushintegral(L, lua_istable(L, getnum));
+    }
+    else if EQ("iscfunction") {
+      lua_pushintegral(L, lua_iscfunction(L, getnum));
+    }
+    else if EQ("isfunction") {
+      lua_pushintegral(L, lua_isfunction(L, getnum));
+    }
+    else if EQ("isuserdata") {
+      lua_pushintegral(L, lua_isuserdata(L, getnum));
+    }
+    else if EQ("isudataval") {
+      lua_pushintegral(L, lua_islightuserdata(L, getnum));
+    }
+    else if EQ("isnil") {
+      lua_pushintegral(L, lua_isnil(L, getnum));
+    }
+    else if EQ("isnull") {
+      lua_pushintegral(L, lua_isnone(L, getnum));
+    }
+    else if EQ("tonumber") {
+      lua_pushnumber(L, lua_tonumber(L, getnum));
+    }
+    else if EQ("tostring") {
+      const char *s = lua_tostring(L, getnum);
+      lua_pushstring(L, s);
+    }
+    else if EQ("strlen") {
+      lua_pushintegral(L, lua_strlen(L, getnum));
+    }
+    else if EQ("tocfunction") {
+      lua_pushcfunction(L, lua_tocfunction(L, getnum));
+    }
+    else if EQ("return") {
+      return getnum;
+    }
+    else if EQ("gettop") {
+      lua_pushintegral(L, lua_gettop(L));
+    }
+    else if EQ("settop") {
+      lua_settop(L, getnum);
+    }
+    else if EQ("pop") {
+      lua_pop(L, getnum);
+    }
+    else if EQ("pushnum") {
+      lua_pushintegral(L, getnum);
+    }
+    else if EQ("pushnil") {
+      lua_pushnil(L);
+    }
+    else if EQ("pushbool") {
+      lua_pushboolean(L, getnum);
+    }
+    else if EQ("tobool") {
+      lua_pushintegral(L, lua_toboolean(L, getnum));
+    }
+    else if EQ("pushvalue") {
+      lua_pushvalue(L, getnum);
+    }
+    else if EQ("pushcclosure") {
+      lua_pushcclosure(L, testC, getnum);
+    }
+    else if EQ("pushupvalues") {
+      lua_pushupvalues(L);
+    }
+    else if EQ("remove") {
+      lua_remove(L, getnum);
+    }
+    else if EQ("insert") {
+      lua_insert(L, getnum);
+    }
+    else if EQ("replace") {
+      lua_replace(L, getnum);
+    }
+    else if EQ("gettable") {
+      lua_gettable(L, getnum);
+    }
+    else if EQ("settable") {
+      lua_settable(L, getnum);
+    }
+    else if EQ("next") {
+      lua_next(L, -2);
+    }
+    else if EQ("concat") {
+      lua_concat(L, getnum);
+    }
+    else if EQ("lessthan") {
+      int a = getnum;
+      lua_pushboolean(L, lua_lessthan(L, a, getnum));
+    }
+    else if EQ("equal") {
+      int a = getnum;
+      lua_pushboolean(L, lua_equal(L, a, getnum));
+    }
+    else if EQ("rawcall") {
+      int narg = getnum;
+      int nres = getnum;
+      lua_call(L, narg, nres);
+    }
+    else if EQ("call") {
+      int narg = getnum;
+      int nres = getnum;
+      lua_pcall(L, narg, nres, 0);
+    }
+    else if EQ("loadstring") {
+      size_t sl;
+      const char *s = luaL_checklstring(L, getnum, &sl);
+      luaL_loadbuffer(L, s, sl, s);
+    }
+    else if EQ("loadfile") {
+      luaL_loadfile(L, luaL_checkstring(L, getnum));
+    }
+    else if EQ("setmetatable") {
+      lua_setmetatable(L, getnum);
+    }
+    else if EQ("getmetatable") {
+      if (lua_getmetatable(L, getnum) == 0)
+        lua_pushnil(L);
+    }
+    else if EQ("type") {
+      lua_pushstring(L, lua_typename(L, lua_type(L, getnum)));
+    }
+    else if EQ("getn") {
+      int i = getnum;
+      lua_pushintegral(L, luaL_getn(L, i));
+    }
+    else if EQ("setn") {
+      int i = getnum;
+      int n = cast(int, lua_tonumber(L, -1));
+      luaL_setn(L, i, n);
+      lua_pop(L, 1);
+    }
+    else luaL_error(L, "unknown instruction %s", buff);
+  }
+  return 0;
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** tests for yield inside hooks
+** =======================================================
+*/
+
+static void yieldf (lua_State *L, lua_Debug *ar) {
+  lua_yield(L, 0);
+}
+
+static int setyhook (lua_State *L) {
+  if (lua_isnoneornil(L, 1))
+    lua_sethook(L, NULL, 0, 0);  /* turn off hooks */
+  else {
+    const char *smask = luaL_checkstring(L, 1);
+    int count = luaL_optint(L, 2, 0);
+    int mask = 0;
+    if (strchr(smask, 'l')) mask |= LUA_MASKLINE;
+    if (count > 0) mask |= LUA_MASKCOUNT;
+    lua_sethook(L, yieldf, mask, count);
+  }
+  return 0;
+}
+
+
+static int coresume (lua_State *L) {
+  int status;
+  lua_State *co = lua_tothread(L, 1);
+  luaL_argcheck(L, co, 1, "coroutine expected");
+  status = lua_resume(co, 0);
+  if (status != 0) {
+    lua_pushboolean(L, 0);
+    lua_insert(L, -2);
+    return 2;  /* return false + error message */
+  }
+  else {
+    lua_pushboolean(L, 1);
+    return 1;
+  }
+}
+
+/* }====================================================== */
+
+
+
+static const struct luaL_reg tests_funcs[] = {
+  {"hash", hash_query},
+  {"limits", get_limits},
+  {"listcode", listcode},
+  {"listk", listk},
+  {"listlocals", listlocals},
+  {"loadlib", loadlib},
+  {"stacklevel", stacklevel},
+  {"querystr", string_query},
+  {"querytab", table_query},
+  {"doit", test_do},
+  {"testC", testC},
+  {"ref", tref},
+  {"getref", getref},
+  {"unref", unref},
+  {"d2s", d2s},
+  {"s2d", s2d},
+  {"metatable", metatable},
+  {"upvalue", upvalue},
+  {"newuserdata", newuserdata},
+  {"pushuserdata", pushuserdata},
+  {"udataval", udataval},
+  {"doonnewstack", doonnewstack},
+  {"newstate", newstate},
+  {"closestate", closestate},
+  {"doremote", doremote},
+  {"log2", log2_aux},
+  {"int2fb", int2fb_aux},
+  {"totalmem", mem_query},
+  {"resume", coresume},
+  {"setyhook", setyhook},
+  {NULL, NULL}
+};
+
+
+static void fim (void) {
+  if (!islocked)
+    lua_close(lua_state);
+  lua_assert(memdebug_numblocks == 0);
+  lua_assert(memdebug_total == 0);
+}
+
+
+static int l_panic (lua_State *L) {
+  UNUSED(L);
+  fprintf(stderr, "unable to recover; exiting\n");
+  return 0;
+}
+
+
+int luaB_opentests (lua_State *L) {
+  lua_atpanic(L, l_panic);
+  lua_userstateopen(L);  /* init lock */
+  lua_state = L;  /* keep first state to be opened */
+  luaL_openlib(L, "T", tests_funcs, 0);
+  atexit(fim);
+  return 0;
+}
+
+
+#undef main
+int main (int argc, char *argv[]) {
+  char *limit = getenv("MEMLIMIT");
+  if (limit)
+    memdebug_memlimit = strtoul(limit, NULL, 10);
+  l_main(argc, argv);
+  return 0;
+}
+
+#endif
diff --git a/main/source/lua/src/ltm.c b/main/source/lua/src/ltm.c
new file mode 100644
index 00000000..48ba62ad
--- /dev/null
+++ b/main/source/lua/src/ltm.c
@@ -0,0 +1,70 @@
+/*
+** $Id: ltm.c,v 1.106 2003/04/03 13:35:34 roberto Exp $
+** Tag methods
+** See Copyright Notice in lua.h
+*/
+
+
+#include <string.h>
+
+#define ltm_c
+
+#include "lua.h"
+
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+
+
+
+const char *const luaT_typenames[] = {
+  "nil", "boolean", "userdata", "number",
+  "string", "table", "function", "userdata", "thread"
+};
+
+
+void luaT_init (lua_State *L) {
+  static const char *const luaT_eventname[] = {  /* ORDER TM */
+    "__index", "__newindex",
+    "__gc", "__mode", "__eq",
+    "__add", "__sub", "__mul", "__div",
+    "__pow", "__unm", "__lt", "__le",
+    "__concat", "__call"
+  };
+  int i;
+  for (i=0; i<TM_N; i++) {
+    G(L)->tmname[i] = luaS_new(L, luaT_eventname[i]);
+    luaS_fix(G(L)->tmname[i]);  /* never collect these names */
+  }
+}
+
+
+/*
+** function to be used with macro "fasttm": optimized for absence of
+** tag methods
+*/
+const TObject *luaT_gettm (Table *events, TMS event, TString *ename) {
+  const TObject *tm = luaH_getstr(events, ename);
+  lua_assert(event <= TM_EQ);
+  if (ttisnil(tm)) {  /* no tag method? */
+    events->flags |= cast(lu_byte, 1u<<event);  /* cache this fact */
+    return NULL;
+  }
+  else return tm;
+}
+
+
+const TObject *luaT_gettmbyobj (lua_State *L, const TObject *o, TMS event) {
+  TString *ename = G(L)->tmname[event];
+  switch (ttype(o)) {
+    case LUA_TTABLE:
+      return luaH_getstr(hvalue(o)->metatable, ename);
+    case LUA_TUSERDATA:
+      return luaH_getstr(uvalue(o)->uv.metatable, ename);
+    default:
+      return &luaO_nilobject;
+  }
+}
+
diff --git a/main/source/lua/src/ltm.h b/main/source/lua/src/ltm.h
new file mode 100644
index 00000000..029ecc4c
--- /dev/null
+++ b/main/source/lua/src/ltm.h
@@ -0,0 +1,51 @@
+/*
+** $Id: ltm.h,v 1.41 2002/11/14 11:51:50 roberto Exp $
+** Tag methods
+** See Copyright Notice in lua.h
+*/
+
+#ifndef ltm_h
+#define ltm_h
+
+
+#include "lobject.h"
+
+
+/*
+* WARNING: if you change the order of this enumeration,
+* grep "ORDER TM"
+*/
+typedef enum {
+  TM_INDEX,
+  TM_NEWINDEX,
+  TM_GC,
+  TM_MODE,
+  TM_EQ,  /* last tag method with `fast' access */
+  TM_ADD,
+  TM_SUB,
+  TM_MUL,
+  TM_DIV,
+  TM_POW,
+  TM_UNM,
+  TM_LT,
+  TM_LE,
+  TM_CONCAT,
+  TM_CALL,
+  TM_N		/* number of elements in the enum */
+} TMS;
+
+
+
+#define gfasttm(g,et,e) \
+  (((et)->flags & (1u<<(e))) ? NULL : luaT_gettm(et, e, (g)->tmname[e]))
+
+#define fasttm(l,et,e)	gfasttm(G(l), et, e)
+
+
+const TObject *luaT_gettm (Table *events, TMS event, TString *ename);
+const TObject *luaT_gettmbyobj (lua_State *L, const TObject *o, TMS event);
+void luaT_init (lua_State *L);
+
+extern const char *const luaT_typenames[];
+
+#endif
diff --git a/main/source/lua/src/lua/lua.c b/main/source/lua/src/lua/lua.c
new file mode 100644
index 00000000..4466e935
--- /dev/null
+++ b/main/source/lua/src/lua/lua.c
@@ -0,0 +1,438 @@
+/*
+** $Id: lua.c,v 1.122 2003/04/03 13:34:42 roberto Exp $
+** Lua stand-alone interpreter
+** See Copyright Notice in lua.h
+*/
+
+
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define lua_c
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+/*
+** generic extra include file
+*/
+#ifdef LUA_USERCONFIG
+#include LUA_USERCONFIG
+#endif
+
+
+/*
+** definition of `isatty'
+*/
+#ifdef _POSIX_C_SOURCE
+#include <unistd.h>
+#define stdin_is_tty()	isatty(0)
+#else
+#define stdin_is_tty()	1  /* assume stdin is a tty */
+#endif
+
+
+
+#ifndef PROMPT
+#define PROMPT		"> "
+#endif
+
+
+#ifndef PROMPT2
+#define PROMPT2		">> "
+#endif
+
+#ifndef PROGNAME
+#define PROGNAME	"lua"
+#endif
+
+#ifndef lua_userinit
+#define lua_userinit(L)		openstdlibs(L)
+#endif
+
+
+#ifndef LUA_EXTRALIBS
+#define LUA_EXTRALIBS	/* empty */
+#endif
+
+
+static lua_State *L = NULL;
+
+static const char *progname = PROGNAME;
+
+
+
+static const luaL_reg lualibs[] = {
+  {"base", luaopen_base},
+  {"table", luaopen_table},
+  {"io", luaopen_io},
+  {"string", luaopen_string},
+  {"math", luaopen_math},
+  {"debug", luaopen_debug},
+  {"loadlib", luaopen_loadlib},
+  /* add your libraries here */
+  LUA_EXTRALIBS
+  {NULL, NULL}
+};
+
+
+
+static void lstop (lua_State *l, lua_Debug *ar) {
+  (void)ar;  /* unused arg. */
+  lua_sethook(l, NULL, 0, 0);
+  luaL_error(l, "interrupted!");
+}
+
+
+static void laction (int i) {
+  signal(i, SIG_DFL); /* if another SIGINT happens before lstop,
+                              terminate process (default action) */
+  lua_sethook(L, lstop, LUA_MASKCALL | LUA_MASKRET | LUA_MASKCOUNT, 1);
+}
+
+
+static void print_usage (void) {
+  fprintf(stderr,
+  "usage: %s [options] [script [args]].\n"
+  "Available options are:\n"
+  "  -        execute stdin as a file\n"
+  "  -e stat  execute string `stat'\n"
+  "  -i       enter interactive mode after executing `script'\n"
+  "  -l name  load and run library `name'\n"
+  "  -v       show version information\n"
+  "  --       stop handling options\n" ,
+  progname);
+}
+
+
+static void l_message (const char *pname, const char *msg) {
+  if (pname) fprintf(stderr, "%s: ", pname);
+  fprintf(stderr, "%s\n", msg);
+}
+
+
+static int report (int status) {
+  const char *msg;
+  if (status) {
+    msg = lua_tostring(L, -1);
+    if (msg == NULL) msg = "(error with no message)";
+    l_message(progname, msg);
+    lua_pop(L, 1);
+  }
+  return status;
+}
+
+
+static int lcall (int narg, int clear) {
+  int status;
+  int base = lua_gettop(L) - narg;  /* function index */
+  lua_pushliteral(L, "_TRACEBACK");
+  lua_rawget(L, LUA_GLOBALSINDEX);  /* get traceback function */
+  lua_insert(L, base);  /* put it under chunk and args */
+  signal(SIGINT, laction);
+  status = lua_pcall(L, narg, (clear ? 0 : LUA_MULTRET), base);
+  signal(SIGINT, SIG_DFL);
+  lua_remove(L, base);  /* remove traceback function */
+  return status;
+}
+
+
+static void print_version (void) {
+  l_message(NULL, LUA_VERSION "  " LUA_COPYRIGHT);
+}
+
+
+static void getargs (char *argv[], int n) {
+  int i;
+  lua_newtable(L);
+  for (i=0; argv[i]; i++) {
+    lua_pushnumber(L, i - n);
+    lua_pushstring(L, argv[i]);
+    lua_rawset(L, -3);
+  }
+  /* arg.n = maximum index in table `arg' */
+  lua_pushliteral(L, "n");
+  lua_pushnumber(L, i-n-1);
+  lua_rawset(L, -3);
+}
+
+
+static int docall (int status) {
+  if (status == 0) status = lcall(0, 1);
+  return report(status);
+}
+
+
+static int file_input (const char *name) {
+  return docall(luaL_loadfile(L, name));
+}
+
+
+static int dostring (const char *s, const char *name) {
+  return docall(luaL_loadbuffer(L, s, strlen(s), name));
+}
+
+
+static int load_file (const char *name) {
+  lua_pushliteral(L, "require");
+  lua_rawget(L, LUA_GLOBALSINDEX);
+  if (!lua_isfunction(L, -1)) {  /* no `require' defined? */
+    lua_pop(L, 1);
+    return file_input(name);
+  }
+  else {
+    lua_pushstring(L, name);
+    return report(lcall(1, 1));
+  }
+}
+
+
+/*
+** this macro can be used by some `history' system to save lines
+** read in manual input
+*/
+#ifndef lua_saveline
+#define lua_saveline(L,line)	/* empty */
+#endif
+
+
+/*
+** this macro defines a function to show the prompt and reads the
+** next line for manual input
+*/
+#ifndef lua_readline
+#define lua_readline(L,prompt)		readline(L,prompt)
+
+/* maximum length of an input line */
+#ifndef MAXINPUT
+#define MAXINPUT	512
+#endif
+
+
+static int readline (lua_State *l, const char *prompt) {
+  static char buffer[MAXINPUT];
+  if (prompt) {
+    fputs(prompt, stdout);
+    fflush(stdout);
+  }
+  if (fgets(buffer, sizeof(buffer), stdin) == NULL)
+    return 0;  /* read fails */
+  else {
+    lua_pushstring(l, buffer);
+    return 1;
+  }
+}
+
+#endif
+
+
+static const char *get_prompt (int firstline) {
+  const char *p = NULL;
+  lua_pushstring(L, firstline ? "_PROMPT" : "_PROMPT2");
+  lua_rawget(L, LUA_GLOBALSINDEX);
+  p = lua_tostring(L, -1);
+  if (p == NULL) p = (firstline ? PROMPT : PROMPT2);
+  lua_pop(L, 1);  /* remove global */
+  return p;
+}
+
+
+static int incomplete (int status) {
+  if (status == LUA_ERRSYNTAX &&
+         strstr(lua_tostring(L, -1), "near `<eof>'") != NULL) {
+    lua_pop(L, 1);
+    return 1;
+  }
+  else
+    return 0;
+}
+
+
+static int load_string (void) {
+  int status;
+  lua_settop(L, 0);
+  if (lua_readline(L, get_prompt(1)) == 0)  /* no input? */
+    return -1;
+  if (lua_tostring(L, -1)[0] == '=') {  /* line starts with `=' ? */
+    lua_pushfstring(L, "return %s", lua_tostring(L, -1)+1);/* `=' -> `return' */
+    lua_remove(L, -2);  /* remove original line */
+  }
+  for (;;) {  /* repeat until gets a complete line */
+    status = luaL_loadbuffer(L, lua_tostring(L, 1), lua_strlen(L, 1), "=stdin");
+    if (!incomplete(status)) break;  /* cannot try to add lines? */
+    if (lua_readline(L, get_prompt(0)) == 0)  /* no more input? */
+      return -1;
+    lua_concat(L, lua_gettop(L));  /* join lines */
+  }
+  lua_saveline(L, lua_tostring(L, 1));
+  lua_remove(L, 1);  /* remove line */
+  return status;
+}
+
+
+static void manual_input (void) {
+  int status;
+  const char *oldprogname = progname;
+  progname = NULL;
+  while ((status = load_string()) != -1) {
+    if (status == 0) status = lcall(0, 0);
+    report(status);
+    if (status == 0 && lua_gettop(L) > 0) {  /* any result to print? */
+      lua_getglobal(L, "print");
+      lua_insert(L, 1);
+      if (lua_pcall(L, lua_gettop(L)-1, 0, 0) != 0)
+        l_message(progname, lua_pushfstring(L, "error calling `print' (%s)",
+                                               lua_tostring(L, -1)));
+    }
+  }
+  lua_settop(L, 0);  /* clear stack */
+  fputs("\n", stdout);
+  progname = oldprogname;
+}
+
+
+static int handle_argv (char *argv[], int *interactive) {
+  if (argv[1] == NULL) {  /* no more arguments? */
+    if (stdin_is_tty()) {
+      print_version();
+      manual_input();
+    }
+    else
+      file_input(NULL);  /* executes stdin as a file */
+  }
+  else {  /* other arguments; loop over them */
+    int i;
+    for (i = 1; argv[i] != NULL; i++) {
+      if (argv[i][0] != '-') break;  /* not an option? */
+      switch (argv[i][1]) {  /* option */
+        case '-': {  /* `--' */
+          if (argv[i][2] != '\0') {
+            print_usage();
+            return 1;
+          }
+          i++;  /* skip this argument */
+          goto endloop;  /* stop handling arguments */
+        }
+        case '\0': {
+          file_input(NULL);  /* executes stdin as a file */
+          break;
+        }
+        case 'i': {
+          *interactive = 1;
+          break;
+        }
+        case 'v': {
+          print_version();
+          break;
+        }
+        case 'e': {
+          const char *chunk = argv[i] + 2;
+          if (*chunk == '\0') chunk = argv[++i];
+          if (chunk == NULL) {
+            print_usage();
+            return 1;
+          }
+          if (dostring(chunk, "=<command line>") != 0)
+            return 1;
+          break;
+        }
+        case 'l': {
+          const char *filename = argv[i] + 2;
+          if (*filename == '\0') filename = argv[++i];
+          if (filename == NULL) {
+            print_usage();
+            return 1;
+          }
+          if (load_file(filename))
+            return 1;  /* stop if file fails */
+          break;
+        }
+        case 'c': {
+          l_message(progname, "option `-c' is deprecated");
+          break;
+        }
+        case 's': {
+          l_message(progname, "option `-s' is deprecated");
+          break;
+        }
+        default: {
+          print_usage();
+          return 1;
+        }
+      }
+    } endloop:
+    if (argv[i] != NULL) {
+      const char *filename = argv[i];
+      getargs(argv, i);  /* collect arguments */
+      lua_setglobal(L, "arg");
+      return file_input(filename);  /* stop scanning arguments */
+    }
+  }
+  return 0;
+}
+
+
+static void openstdlibs (lua_State *l) {
+  const luaL_reg *lib = lualibs;
+  for (; lib->func; lib++) {
+    lib->func(l);  /* open library */
+    lua_settop(l, 0);  /* discard any results */
+  }
+}
+
+
+static int handle_luainit (void) {
+  const char *init = getenv("LUA_INIT");
+  if (init == NULL) return 0;  /* status OK */
+  else if (init[0] == '@')
+    return file_input(init+1);
+  else
+    return dostring(init, "=LUA_INIT");
+}
+
+
+struct Smain {
+  int argc;
+  char **argv;
+  int status;
+};
+
+
+static int pmain (lua_State *l) {
+  struct Smain *s = (struct Smain *)lua_touserdata(l, 1);
+  int status;
+  int interactive = 0;
+  if (s->argv[0] && s->argv[0][0]) progname = s->argv[0];
+  L = l;
+  lua_userinit(l);  /* open libraries */
+  status = handle_luainit();
+  if (status == 0) {
+    status = handle_argv(s->argv, &interactive);
+    if (status == 0 && interactive) manual_input();
+  }
+  s->status = status;
+  return 0;
+}
+
+
+int main (int argc, char *argv[]) {
+  int status;
+  struct Smain s;
+  lua_State *l = lua_open();  /* create state */
+  if (l == NULL) {
+    l_message(argv[0], "cannot create state: not enough memory");
+    return EXIT_FAILURE;
+  }
+  s.argc = argc;
+  s.argv = argv;
+  status = lua_cpcall(l, &pmain, &s);
+  report(status);
+  lua_close(l);
+  return (status || s.status) ? EXIT_FAILURE : EXIT_SUCCESS;
+}
+
diff --git a/main/source/lua/src/lundump.c b/main/source/lua/src/lundump.c
new file mode 100644
index 00000000..4f78c80a
--- /dev/null
+++ b/main/source/lua/src/lundump.c
@@ -0,0 +1,286 @@
+/*
+** $Id: lundump.c,v 1.49 2003/04/07 20:34:20 lhf Exp $
+** load pre-compiled Lua chunks
+** See Copyright Notice in lua.h
+*/
+
+#define lundump_c
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "lfunc.h"
+#include "lmem.h"
+#include "lopcodes.h"
+#include "lstring.h"
+#include "lundump.h"
+#include "lzio.h"
+
+#define	LoadByte	(lu_byte) ezgetc
+
+typedef struct {
+ lua_State* L;
+ ZIO* Z;
+ Mbuffer* b;
+ int swap;
+ const char* name;
+} LoadState;
+
+static void unexpectedEOZ (LoadState* S)
+{
+ luaG_runerror(S->L,"unexpected end of file in %s",S->name);
+}
+
+static int ezgetc (LoadState* S)
+{
+ int c=zgetc(S->Z);
+ if (c==EOZ) unexpectedEOZ(S);
+ return c;
+}
+
+static void ezread (LoadState* S, void* b, int n)
+{
+ int r=luaZ_read(S->Z,b,n);
+ if (r!=0) unexpectedEOZ(S);
+}
+
+static void LoadBlock (LoadState* S, void* b, size_t size)
+{
+ if (S->swap)
+ {
+  char* p=(char*) b+size-1;
+  int n=size;
+  while (n--) *p--=(char)ezgetc(S);
+ }
+ else
+  ezread(S,b,size);
+}
+
+static void LoadVector (LoadState* S, void* b, int m, size_t size)
+{
+ if (S->swap)
+ {
+  char* q=(char*) b;
+  while (m--)
+  {
+   char* p=q+size-1;
+   int n=size;
+   while (n--) *p--=(char)ezgetc(S);
+   q+=size;
+  }
+ }
+ else
+  ezread(S,b,m*size);
+}
+
+static int LoadInt (LoadState* S)
+{
+ int x;
+ LoadBlock(S,&x,sizeof(x));
+ if (x<0) luaG_runerror(S->L,"bad integer in %s",S->name);
+ return x;
+}
+
+static size_t LoadSize (LoadState* S)
+{
+ size_t x;
+ LoadBlock(S,&x,sizeof(x));
+ return x;
+}
+
+static lua_Number LoadNumber (LoadState* S)
+{
+ lua_Number x;
+ LoadBlock(S,&x,sizeof(x));
+ return x;
+}
+
+static TString* LoadString (LoadState* S)
+{
+ size_t size=LoadSize(S);
+ if (size==0)
+  return NULL;
+ else
+ {
+  char* s=luaZ_openspace(S->L,S->b,size);
+  ezread(S,s,size);
+  return luaS_newlstr(S->L,s,size-1);		/* remove trailing '\0' */
+ }
+}
+
+static void LoadCode (LoadState* S, Proto* f)
+{
+ int size=LoadInt(S);
+ f->code=luaM_newvector(S->L,size,Instruction);
+ f->sizecode=size;
+ LoadVector(S,f->code,size,sizeof(*f->code));
+}
+
+static void LoadLocals (LoadState* S, Proto* f)
+{
+ int i,n;
+ n=LoadInt(S);
+ f->locvars=luaM_newvector(S->L,n,LocVar);
+ f->sizelocvars=n;
+ for (i=0; i<n; i++)
+ {
+  f->locvars[i].varname=LoadString(S);
+  f->locvars[i].startpc=LoadInt(S);
+  f->locvars[i].endpc=LoadInt(S);
+ }
+}
+
+static void LoadLines (LoadState* S, Proto* f)
+{
+ int size=LoadInt(S);
+ f->lineinfo=luaM_newvector(S->L,size,int);
+ f->sizelineinfo=size;
+ LoadVector(S,f->lineinfo,size,sizeof(*f->lineinfo));
+}
+
+static void LoadUpvalues (LoadState* S, Proto* f)
+{
+ int i,n;
+ n=LoadInt(S);
+ if (n!=0 && n!=f->nups) 
+  luaG_runerror(S->L,"bad nupvalues in %s: read %d; expected %d",
+		S->name,n,f->nups);
+ f->upvalues=luaM_newvector(S->L,n,TString*);
+ f->sizeupvalues=n;
+ for (i=0; i<n; i++) f->upvalues[i]=LoadString(S);
+}
+
+static Proto* LoadFunction (LoadState* S, TString* p);
+
+static void LoadConstants (LoadState* S, Proto* f)
+{
+ int i,n;
+ n=LoadInt(S);
+ f->k=luaM_newvector(S->L,n,TObject);
+ f->sizek=n;
+ for (i=0; i<n; i++)
+ {
+  TObject* o=&f->k[i];
+  int t=LoadByte(S);
+  switch (t)
+  {
+   case LUA_TNUMBER:
+	setnvalue(o,LoadNumber(S));
+	break;
+   case LUA_TSTRING:
+	setsvalue2n(o,LoadString(S));
+	break;
+   case LUA_TNIL:
+   	setnilvalue(o);
+	break;
+   default:
+	luaG_runerror(S->L,"bad constant type (%d) in %s",t,S->name);
+	break;
+  }
+ }
+ n=LoadInt(S);
+ f->p=luaM_newvector(S->L,n,Proto*);
+ f->sizep=n;
+ for (i=0; i<n; i++) f->p[i]=LoadFunction(S,f->source);
+}
+
+static Proto* LoadFunction (LoadState* S, TString* p)
+{
+ Proto* f=luaF_newproto(S->L);
+ f->source=LoadString(S); if (f->source==NULL) f->source=p;
+ f->lineDefined=LoadInt(S);
+ f->nups=LoadByte(S);
+ f->numparams=LoadByte(S);
+ f->is_vararg=LoadByte(S);
+ f->maxstacksize=LoadByte(S);
+ LoadLines(S,f);
+ LoadLocals(S,f);
+ LoadUpvalues(S,f);
+ LoadConstants(S,f);
+ LoadCode(S,f);
+#ifndef TRUST_BINARIES
+ if (!luaG_checkcode(f)) luaG_runerror(S->L,"bad code in %s",S->name);
+#endif
+ return f;
+}
+
+static void LoadSignature (LoadState* S)
+{
+ const char* s=LUA_SIGNATURE;
+ while (*s!=0 && ezgetc(S)==*s)
+  ++s;
+ if (*s!=0) luaG_runerror(S->L,"bad signature in %s",S->name);
+}
+
+static void TestSize (LoadState* S, int s, const char* what)
+{
+ int r=LoadByte(S);
+ if (r!=s)
+  luaG_runerror(S->L,"virtual machine mismatch in %s: "
+	"size of %s is %d but read %d",S->name,what,s,r);
+}
+
+#define TESTSIZE(s,w)	TestSize(S,s,w)
+#define V(v)		v/16,v%16
+
+static void LoadHeader (LoadState* S)
+{
+ int version;
+ lua_Number x,tx=TEST_NUMBER;
+ LoadSignature(S);
+ version=LoadByte(S);
+ if (version>VERSION)
+  luaG_runerror(S->L,"%s too new: "
+	"read version %d.%d; expected at most %d.%d",
+	S->name,V(version),V(VERSION));
+ if (version<VERSION0)				/* check last major change */
+  luaG_runerror(S->L,"%s too old: "
+	"read version %d.%d; expected at least %d.%d",
+	S->name,V(version),V(VERSION0));
+ S->swap=(luaU_endianness()!=LoadByte(S));	/* need to swap bytes? */
+ TESTSIZE(sizeof(int),"int");
+ TESTSIZE(sizeof(size_t), "size_t");
+ TESTSIZE(sizeof(Instruction), "Instruction");
+ TESTSIZE(SIZE_OP, "OP");
+ TESTSIZE(SIZE_A, "A");
+ TESTSIZE(SIZE_B, "B");
+ TESTSIZE(SIZE_C, "C");
+ TESTSIZE(sizeof(lua_Number), "number");
+ x=LoadNumber(S);
+ if ((long)x!=(long)tx)		/* disregard errors in last bits of fraction */
+  luaG_runerror(S->L,"unknown number format in %s",S->name);
+}
+
+static Proto* LoadChunk (LoadState* S)
+{
+ LoadHeader(S);
+ return LoadFunction(S,NULL);
+}
+
+/*
+** load precompiled chunk
+*/
+Proto* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff)
+{
+ LoadState S;
+ const char* s=zname(Z);
+ if (*s=='@' || *s=='=')
+  S.name=s+1;
+ else if (*s==LUA_SIGNATURE[0])
+  S.name="binary string";
+ else
+  S.name=s;
+ S.L=L;
+ S.Z=Z;
+ S.b=buff;
+ return LoadChunk(&S);
+}
+
+/*
+** find byte order
+*/
+int luaU_endianness (void)
+{
+ int x=1;
+ return *(char*)&x;
+}
diff --git a/main/source/lua/src/lundump.h b/main/source/lua/src/lundump.h
new file mode 100644
index 00000000..fef1e49b
--- /dev/null
+++ b/main/source/lua/src/lundump.h
@@ -0,0 +1,34 @@
+/*
+** $Id: lundump.h,v 1.30 2003/04/07 20:34:20 lhf Exp $
+** load pre-compiled Lua chunks
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lundump_h
+#define lundump_h
+
+#include "lobject.h"
+#include "lzio.h"
+
+/* load one chunk; from lundump.c */
+Proto* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff);
+
+/* find byte order; from lundump.c */
+int luaU_endianness (void);
+
+/* dump one chunk; from ldump.c */
+void luaU_dump (lua_State* L, const Proto* Main, lua_Chunkwriter w, void* data);
+
+/* print one chunk; from print.c */
+void luaU_print (const Proto* Main);
+
+/* definitions for headers of binary files */
+#define	LUA_SIGNATURE	"\033Lua"	/* binary files start with "<esc>Lua" */
+#define	VERSION		0x50		/* last format change was in 5.0 */
+#define	VERSION0	0x50		/* last major  change was in 5.0 */
+
+/* a multiple of PI for testing native format */
+/* multiplying by 1E7 gives non-trivial integer values */
+#define	TEST_NUMBER	((lua_Number)3.14159265358979323846E7)
+
+#endif
diff --git a/main/source/lua/src/lvm.c b/main/source/lua/src/lvm.c
new file mode 100644
index 00000000..3c6bcf97
--- /dev/null
+++ b/main/source/lua/src/lvm.c
@@ -0,0 +1,780 @@
+/*
+** $Id: lvm.c,v 1.284 2003/04/03 13:35:34 roberto Exp $
+** Lua virtual machine
+** See Copyright Notice in lua.h
+*/
+
+
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* needed only when `lua_number2str' uses `sprintf' */
+#include <stdio.h>
+
+#define lvm_c
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+#include "lvm.h"
+
+
+
+/* function to convert a lua_Number to a string */
+#ifndef lua_number2str
+#define lua_number2str(s,n)     sprintf((s), LUA_NUMBER_FMT, (n))
+#endif
+
+
+/* limit for table tag-method chains (to avoid loops) */
+#define MAXTAGLOOP	100
+
+
+const TObject *luaV_tonumber (const TObject *obj, TObject *n) {
+  lua_Number num;
+  if (ttisnumber(obj)) return obj;
+  if (ttisstring(obj) && luaO_str2d(svalue(obj), &num)) {
+    setnvalue(n, num);
+    return n;
+  }
+  else
+    return NULL;
+}
+
+
+int luaV_tostring (lua_State *L, StkId obj) {
+  if (!ttisnumber(obj))
+    return 0;
+  else {
+    char s[32];  /* 16 digits, sign, point and \0  (+ some extra...) */
+    lua_number2str(s, nvalue(obj));
+    setsvalue2s(obj, luaS_new(L, s));
+    return 1;
+  }
+}
+
+
+static void traceexec (lua_State *L) {
+  lu_byte mask = L->hookmask;
+  if (mask > LUA_MASKLINE) {  /* instruction-hook set? */
+    if (L->hookcount == 0) {
+      resethookcount(L);
+      luaD_callhook(L, LUA_HOOKCOUNT, -1);
+      return;
+    }
+  }
+  if (mask & LUA_MASKLINE) {
+    CallInfo *ci = L->ci;
+    Proto *p = ci_func(ci)->l.p;
+    int newline = getline(p, pcRel(*ci->u.l.pc, p));
+    if (!L->hookinit) {
+      luaG_inithooks(L);
+      return;
+    }
+    lua_assert(ci->state & CI_HASFRAME);
+    if (pcRel(*ci->u.l.pc, p) == 0)  /* tracing may be starting now? */
+      ci->u.l.savedpc = *ci->u.l.pc;  /* initialize `savedpc' */
+    /* calls linehook when enters a new line or jumps back (loop) */
+    if (*ci->u.l.pc <= ci->u.l.savedpc ||
+        newline != getline(p, pcRel(ci->u.l.savedpc, p))) {
+      luaD_callhook(L, LUA_HOOKLINE, newline);
+      ci = L->ci;  /* previous call may reallocate `ci' */
+    }
+    ci->u.l.savedpc = *ci->u.l.pc;
+  }
+}
+
+
+static void callTMres (lua_State *L, const TObject *f,
+                       const TObject *p1, const TObject *p2) {
+  setobj2s(L->top, f);  /* push function */
+  setobj2s(L->top+1, p1);  /* 1st argument */
+  setobj2s(L->top+2, p2);  /* 2nd argument */
+  luaD_checkstack(L, 3);  /* cannot check before (could invalidate p1, p2) */
+  L->top += 3;
+  luaD_call(L, L->top - 3, 1);
+  L->top--;  /* result will be in L->top */
+}
+
+
+
+static void callTM (lua_State *L, const TObject *f,
+                    const TObject *p1, const TObject *p2, const TObject *p3) {
+  setobj2s(L->top, f);  /* push function */
+  setobj2s(L->top+1, p1);  /* 1st argument */
+  setobj2s(L->top+2, p2);  /* 2nd argument */
+  setobj2s(L->top+3, p3);  /* 3th argument */
+  luaD_checkstack(L, 4);  /* cannot check before (could invalidate p1...p3) */
+  L->top += 4;
+  luaD_call(L, L->top - 4, 0);
+}
+
+
+static const TObject *luaV_index (lua_State *L, const TObject *t,
+                                  TObject *key, int loop) {
+  const TObject *tm = fasttm(L, hvalue(t)->metatable, TM_INDEX);
+  if (tm == NULL) return &luaO_nilobject;  /* no TM */
+  if (ttisfunction(tm)) {
+    callTMres(L, tm, t, key);
+    return L->top;
+  }
+  else return luaV_gettable(L, tm, key, loop);
+}
+
+static const TObject *luaV_getnotable (lua_State *L, const TObject *t,
+                                       TObject *key, int loop) {
+  const TObject *tm = luaT_gettmbyobj(L, t, TM_INDEX);
+  if (ttisnil(tm))
+    luaG_typeerror(L, t, "index");
+  if (ttisfunction(tm)) {
+    callTMres(L, tm, t, key);
+    return L->top;
+  }
+  else return luaV_gettable(L, tm, key, loop);
+}
+
+
+/*
+** Function to index a table.
+** Receives the table at `t' and the key at `key'.
+** leaves the result at `res'.
+*/
+const TObject *luaV_gettable (lua_State *L, const TObject *t, TObject *key,
+                              int loop) {
+  if (loop > MAXTAGLOOP)
+    luaG_runerror(L, "loop in gettable");
+  if (ttistable(t)) {  /* `t' is a table? */
+    Table *h = hvalue(t);
+    const TObject *v = luaH_get(h, key);  /* do a primitive get */
+    if (!ttisnil(v)) return v;
+    else return luaV_index(L, t, key, loop+1);
+  }
+  else return luaV_getnotable(L, t, key, loop+1);
+}
+
+
+/*
+** Receives table at `t', key at `key' and value at `val'.
+*/
+void luaV_settable (lua_State *L, const TObject *t, TObject *key, StkId val) {
+  const TObject *tm;
+  int loop = 0;
+  do {
+    if (ttistable(t)) {  /* `t' is a table? */
+      Table *h = hvalue(t);
+      TObject *oldval = luaH_set(L, h, key); /* do a primitive set */
+      if (!ttisnil(oldval) ||  /* result is no nil? */
+          (tm = fasttm(L, h->metatable, TM_NEWINDEX)) == NULL) { /* or no TM? */
+        setobj2t(oldval, val);  /* write barrier */
+        return;
+      }
+      /* else will try the tag method */
+    }
+    else if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_NEWINDEX)))
+      luaG_typeerror(L, t, "index");
+    if (ttisfunction(tm)) {
+      callTM(L, tm, t, key, val);
+      return;
+    }
+    t = tm;  /* else repeat with `tm' */ 
+  } while (++loop <= MAXTAGLOOP);
+  luaG_runerror(L, "loop in settable");
+}
+
+
+static int call_binTM (lua_State *L, const TObject *p1, const TObject *p2,
+                       StkId res, TMS event) {
+  ptrdiff_t result = savestack(L, res);
+  const TObject *tm = luaT_gettmbyobj(L, p1, event);  /* try first operand */
+  if (ttisnil(tm))
+    tm = luaT_gettmbyobj(L, p2, event);  /* try second operand */
+  if (!ttisfunction(tm)) return 0;
+  callTMres(L, tm, p1, p2);
+  res = restorestack(L, result);  /* previous call may change stack */
+  setobjs2s(res, L->top);
+  return 1;
+}
+
+
+static const TObject *get_compTM (lua_State *L, Table *mt1, Table *mt2,
+                                  TMS event) {
+  const TObject *tm1 = fasttm(L, mt1, event);
+  const TObject *tm2;
+  if (tm1 == NULL) return NULL;  /* no metamethod */
+  if (mt1 == mt2) return tm1;  /* same metatables => same metamethods */
+  tm2 = fasttm(L, mt2, event);
+  if (tm2 == NULL) return NULL;  /* no metamethod */
+  if (luaO_rawequalObj(tm1, tm2))  /* same metamethods? */
+    return tm1;
+  return NULL;
+}
+
+
+static int call_orderTM (lua_State *L, const TObject *p1, const TObject *p2,
+                         TMS event) {
+  const TObject *tm1 = luaT_gettmbyobj(L, p1, event);
+  const TObject *tm2;
+  if (ttisnil(tm1)) return -1;  /* no metamethod? */
+  tm2 = luaT_gettmbyobj(L, p2, event);
+  if (!luaO_rawequalObj(tm1, tm2))  /* different metamethods? */
+    return -1;
+  callTMres(L, tm1, p1, p2);
+  return !l_isfalse(L->top);
+}
+
+
+static int luaV_strcmp (const TString *ls, const TString *rs) {
+  const char *l = getstr(ls);
+  size_t ll = ls->tsv.len;
+  const char *r = getstr(rs);
+  size_t lr = rs->tsv.len;
+  for (;;) {
+    int temp = strcoll(l, r);
+    if (temp != 0) return temp;
+    else {  /* strings are equal up to a `\0' */
+      size_t len = strlen(l);  /* index of first `\0' in both strings */
+      if (len == lr)  /* r is finished? */
+        return (len == ll) ? 0 : 1;
+      else if (len == ll)  /* l is finished? */
+        return -1;  /* l is smaller than r (because r is not finished) */
+      /* both strings longer than `len'; go on comparing (after the `\0') */
+      len++;
+      l += len; ll -= len; r += len; lr -= len;
+    }
+  }
+}
+
+
+int luaV_lessthan (lua_State *L, const TObject *l, const TObject *r) {
+  int res;
+  if (ttype(l) != ttype(r))
+    return luaG_ordererror(L, l, r);
+  else if (ttisnumber(l))
+    return nvalue(l) < nvalue(r);
+  else if (ttisstring(l))
+    return luaV_strcmp(tsvalue(l), tsvalue(r)) < 0;
+  else if ((res = call_orderTM(L, l, r, TM_LT)) != -1)
+    return res;
+  return luaG_ordererror(L, l, r);
+}
+
+
+static int luaV_lessequal (lua_State *L, const TObject *l, const TObject *r) {
+  int res;
+  if (ttype(l) != ttype(r))
+    return luaG_ordererror(L, l, r);
+  else if (ttisnumber(l))
+    return nvalue(l) <= nvalue(r);
+  else if (ttisstring(l))
+    return luaV_strcmp(tsvalue(l), tsvalue(r)) <= 0;
+  else if ((res = call_orderTM(L, l, r, TM_LE)) != -1)  /* first try `le' */
+    return res;
+  else if ((res = call_orderTM(L, r, l, TM_LT)) != -1)  /* else try `lt' */
+    return !res;
+  return luaG_ordererror(L, l, r);
+}
+
+
+int luaV_equalval (lua_State *L, const TObject *t1, const TObject *t2) {
+  const TObject *tm;
+  lua_assert(ttype(t1) == ttype(t2));
+  switch (ttype(t1)) {
+    case LUA_TNIL: return 1;
+    case LUA_TNUMBER: return nvalue(t1) == nvalue(t2);
+    case LUA_TBOOLEAN: return bvalue(t1) == bvalue(t2);  /* true must be 1 !! */
+    case LUA_TLIGHTUSERDATA: return pvalue(t1) == pvalue(t2);
+    case LUA_TUSERDATA: {
+      if (uvalue(t1) == uvalue(t2)) return 1;
+      tm = get_compTM(L, uvalue(t1)->uv.metatable, uvalue(t2)->uv.metatable,
+                         TM_EQ);
+      break;  /* will try TM */
+    }
+    case LUA_TTABLE: {
+      if (hvalue(t1) == hvalue(t2)) return 1;
+      tm = get_compTM(L, hvalue(t1)->metatable, hvalue(t2)->metatable, TM_EQ);
+      break;  /* will try TM */
+    }
+    default: return gcvalue(t1) == gcvalue(t2);
+  }
+  if (tm == NULL) return 0;  /* no TM? */
+  callTMres(L, tm, t1, t2);  /* call TM */
+  return !l_isfalse(L->top);
+}
+
+
+void luaV_concat (lua_State *L, int total, int last) {
+  do {
+    StkId top = L->base + last + 1;
+    int n = 2;  /* number of elements handled in this pass (at least 2) */
+    if (!tostring(L, top-2) || !tostring(L, top-1)) {
+      if (!call_binTM(L, top-2, top-1, top-2, TM_CONCAT))
+        luaG_concaterror(L, top-2, top-1);
+    } else if (tsvalue(top-1)->tsv.len > 0) {  /* if len=0, do nothing */
+      /* at least two string values; get as many as possible */
+      lu_mem tl = cast(lu_mem, tsvalue(top-1)->tsv.len) +
+                  cast(lu_mem, tsvalue(top-2)->tsv.len);
+      char *buffer;
+      int i;
+      while (n < total && tostring(L, top-n-1)) {  /* collect total length */
+        tl += tsvalue(top-n-1)->tsv.len;
+        n++;
+      }
+      if (tl > MAX_SIZET) luaG_runerror(L, "string size overflow");
+      buffer = luaZ_openspace(L, &G(L)->buff, tl);
+      tl = 0;
+      for (i=n; i>0; i--) {  /* concat all strings */
+        size_t l = tsvalue(top-i)->tsv.len;
+        memcpy(buffer+tl, svalue(top-i), l);
+        tl += l;
+      }
+      setsvalue2s(top-n, luaS_newlstr(L, buffer, tl));
+    }
+    total -= n-1;  /* got `n' strings to create 1 new */
+    last -= n-1;
+  } while (total > 1);  /* repeat until only 1 result left */
+}
+
+
+static void Arith (lua_State *L, StkId ra,
+                   const TObject *rb, const TObject *rc, TMS op) {
+  TObject tempb, tempc;
+  const TObject *b, *c;
+  if ((b = luaV_tonumber(rb, &tempb)) != NULL &&
+      (c = luaV_tonumber(rc, &tempc)) != NULL) {
+    switch (op) {
+      case TM_ADD: setnvalue(ra, nvalue(b) + nvalue(c)); break;
+      case TM_SUB: setnvalue(ra, nvalue(b) - nvalue(c)); break;
+      case TM_MUL: setnvalue(ra, nvalue(b) * nvalue(c)); break;
+      case TM_DIV: setnvalue(ra, nvalue(b) / nvalue(c)); break;
+      case TM_POW: {
+        const TObject *f = luaH_getstr(hvalue(gt(L)), G(L)->tmname[TM_POW]);
+        ptrdiff_t res = savestack(L, ra);
+        if (!ttisfunction(f))
+          luaG_runerror(L, "`__pow' (`^' operator) is not a function");
+        callTMres(L, f, b, c);
+        ra = restorestack(L, res);  /* previous call may change stack */
+        setobjs2s(ra, L->top);
+        break;
+      }
+      default: lua_assert(0); break;
+    }
+  }
+  else if (!call_binTM(L, rb, rc, ra, op))
+    luaG_aritherror(L, rb, rc);
+}
+
+
+
+/*
+** some macros for common tasks in `luaV_execute'
+*/
+
+#define runtime_check(L, c)	{ if (!(c)) return 0; }
+
+#define RA(i)	(base+GETARG_A(i))
+/* to be used after possible stack reallocation */
+#define XRA(i)	(L->base+GETARG_A(i))
+#define RB(i)	(base+GETARG_B(i))
+#define RKB(i)	((GETARG_B(i) < MAXSTACK) ? RB(i) : k+GETARG_B(i)-MAXSTACK)
+#define RC(i)	(base+GETARG_C(i))
+#define RKC(i)	((GETARG_C(i) < MAXSTACK) ? RC(i) : k+GETARG_C(i)-MAXSTACK)
+#define KBx(i)	(k+GETARG_Bx(i))
+
+
+#define dojump(pc, i)	((pc) += (i))
+
+
+StkId luaV_execute (lua_State *L) {
+  LClosure *cl;
+  TObject *k;
+  const Instruction *pc;
+ callentry:  /* entry point when calling new functions */
+  L->ci->u.l.pc = &pc;
+  if (L->hookmask & LUA_MASKCALL)
+    luaD_callhook(L, LUA_HOOKCALL, -1);
+ retentry:  /* entry point when returning to old functions */
+  lua_assert(L->ci->state == CI_SAVEDPC ||
+             L->ci->state == (CI_SAVEDPC | CI_CALLING));
+  L->ci->state = CI_HASFRAME;  /* activate frame */
+  pc = L->ci->u.l.savedpc;
+  cl = &clvalue(L->base - 1)->l;
+  k = cl->p->k;
+  /* main loop of interpreter */
+  for (;;) {
+    const Instruction i = *pc++;
+    StkId base, ra;
+    if ((L->hookmask & (LUA_MASKLINE | LUA_MASKCOUNT)) &&
+        (--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) {
+      traceexec(L);
+      if (L->ci->state & CI_YIELD) {  /* did hook yield? */
+        L->ci->u.l.savedpc = pc - 1;
+        L->ci->state = CI_YIELD | CI_SAVEDPC;
+        return NULL;
+      }
+    }
+    /* warning!! several calls may realloc the stack and invalidate `ra' */
+    base = L->base;
+    ra = RA(i);
+    lua_assert(L->ci->state & CI_HASFRAME);
+    lua_assert(base == L->ci->base);
+    lua_assert(L->top <= L->stack + L->stacksize && L->top >= base);
+    lua_assert(L->top == L->ci->top ||
+         GET_OPCODE(i) == OP_CALL ||   GET_OPCODE(i) == OP_TAILCALL ||
+         GET_OPCODE(i) == OP_RETURN || GET_OPCODE(i) == OP_SETLISTO);
+    switch (GET_OPCODE(i)) {
+      case OP_MOVE: {
+        setobjs2s(ra, RB(i));
+        break;
+      }
+      case OP_LOADK: {
+        setobj2s(ra, KBx(i));
+        break;
+      }
+      case OP_LOADBOOL: {
+        setbvalue(ra, GETARG_B(i));
+        if (GETARG_C(i)) pc++;  /* skip next instruction (if C) */
+        break;
+      }
+      case OP_LOADNIL: {
+        TObject *rb = RB(i);
+        do {
+          setnilvalue(rb--);
+        } while (rb >= ra);
+        break;
+      }
+      case OP_GETUPVAL: {
+        int b = GETARG_B(i);
+        setobj2s(ra, cl->upvals[b]->v);
+        break;
+      }
+      case OP_GETGLOBAL: {
+        TObject *rb = KBx(i);
+        const TObject *v;
+        lua_assert(ttisstring(rb) && ttistable(&cl->g));
+        v = luaH_getstr(hvalue(&cl->g), tsvalue(rb));
+        if (!ttisnil(v)) { setobj2s(ra, v); }
+        else
+          setobj2s(XRA(i), luaV_index(L, &cl->g, rb, 0));
+        break;
+      }
+      case OP_GETTABLE: {
+        StkId rb = RB(i);
+        TObject *rc = RKC(i);
+        if (ttistable(rb)) {
+          const TObject *v = luaH_get(hvalue(rb), rc);
+          if (!ttisnil(v)) { setobj2s(ra, v); }
+          else
+            setobj2s(XRA(i), luaV_index(L, rb, rc, 0));
+        }
+        else
+          setobj2s(XRA(i), luaV_getnotable(L, rb, rc, 0));
+        break;
+      }
+      case OP_SETGLOBAL: {
+        lua_assert(ttisstring(KBx(i)) && ttistable(&cl->g));
+        luaV_settable(L, &cl->g, KBx(i), ra);
+        break;
+      }
+      case OP_SETUPVAL: {
+        int b = GETARG_B(i);
+        setobj(cl->upvals[b]->v, ra);  /* write barrier */
+        break;
+      }
+      case OP_SETTABLE: {
+        luaV_settable(L, ra, RKB(i), RKC(i));
+        break;
+      }
+      case OP_NEWTABLE: {
+        int b = GETARG_B(i);
+        b = fb2int(b);
+        sethvalue(ra, luaH_new(L, b, GETARG_C(i)));
+        luaC_checkGC(L);
+        break;
+      }
+      case OP_SELF: {
+        StkId rb = RB(i);
+        TObject *rc = RKC(i);
+        runtime_check(L, ttisstring(rc));
+        setobjs2s(ra+1, rb);
+        if (ttistable(rb)) {
+          const TObject *v = luaH_getstr(hvalue(rb), tsvalue(rc));
+          if (!ttisnil(v)) { setobj2s(ra, v); }
+          else
+            setobj2s(XRA(i), luaV_index(L, rb, rc, 0));
+        }
+        else
+          setobj2s(XRA(i), luaV_getnotable(L, rb, rc, 0));
+        break;
+      }
+      case OP_ADD: {
+        TObject *rb = RKB(i);
+        TObject *rc = RKC(i);
+        if (ttisnumber(rb) && ttisnumber(rc)) {
+          setnvalue(ra, nvalue(rb) + nvalue(rc));
+        }
+        else
+          Arith(L, ra, rb, rc, TM_ADD);
+        break;
+      }
+      case OP_SUB: {
+        TObject *rb = RKB(i);
+        TObject *rc = RKC(i);
+        if (ttisnumber(rb) && ttisnumber(rc)) {
+          setnvalue(ra, nvalue(rb) - nvalue(rc));
+        }
+        else
+          Arith(L, ra, rb, rc, TM_SUB);
+        break;
+      }
+      case OP_MUL: {
+        TObject *rb = RKB(i);
+        TObject *rc = RKC(i);
+        if (ttisnumber(rb) && ttisnumber(rc)) {
+          setnvalue(ra, nvalue(rb) * nvalue(rc));
+        }
+        else
+          Arith(L, ra, rb, rc, TM_MUL);
+        break;
+      }
+      case OP_DIV: {
+        TObject *rb = RKB(i);
+        TObject *rc = RKC(i);
+        if (ttisnumber(rb) && ttisnumber(rc)) {
+          setnvalue(ra, nvalue(rb) / nvalue(rc));
+        }
+        else
+          Arith(L, ra, rb, rc, TM_DIV);
+        break;
+      }
+      case OP_POW: {
+        Arith(L, ra, RKB(i), RKC(i), TM_POW);
+        break;
+      }
+      case OP_UNM: {
+        const TObject *rb = RB(i);
+        TObject temp;
+        if (tonumber(rb, &temp)) {
+          setnvalue(ra, -nvalue(rb));
+        }
+        else {
+          setnilvalue(&temp);
+          if (!call_binTM(L, RB(i), &temp, ra, TM_UNM))
+            luaG_aritherror(L, RB(i), &temp);
+        }
+        break;
+      }
+      case OP_NOT: {
+        int res = l_isfalse(RB(i));  /* next assignment may change this value */
+        setbvalue(ra, res);
+        break;
+      }
+      case OP_CONCAT: {
+        int b = GETARG_B(i);
+        int c = GETARG_C(i);
+        luaV_concat(L, c-b+1, c);  /* may change `base' (and `ra') */
+        base = L->base;
+        setobjs2s(RA(i), base+b);
+        luaC_checkGC(L);
+        break;
+      }
+      case OP_JMP: {
+        dojump(pc, GETARG_sBx(i));
+        break;
+      }
+      case OP_EQ: {
+        if (equalobj(L, RKB(i), RKC(i)) != GETARG_A(i)) pc++;
+        else dojump(pc, GETARG_sBx(*pc) + 1);
+        break;
+      }
+      case OP_LT: {
+        if (luaV_lessthan(L, RKB(i), RKC(i)) != GETARG_A(i)) pc++;
+        else dojump(pc, GETARG_sBx(*pc) + 1);
+        break;
+      }
+      case OP_LE: {
+        if (luaV_lessequal(L, RKB(i), RKC(i)) != GETARG_A(i)) pc++;
+        else dojump(pc, GETARG_sBx(*pc) + 1);
+        break;
+      }
+      case OP_TEST: {
+        TObject *rb = RB(i);
+        if (l_isfalse(rb) == GETARG_C(i)) pc++;
+        else {
+          setobjs2s(ra, rb);
+          dojump(pc, GETARG_sBx(*pc) + 1);
+        }
+        break;
+      }
+      case OP_CALL:
+      case OP_TAILCALL: {
+        StkId firstResult;
+        int b = GETARG_B(i);
+        int nresults;
+        if (b != 0) L->top = ra+b;  /* else previous instruction set top */
+        nresults = GETARG_C(i) - 1;
+        firstResult = luaD_precall(L, ra);
+        if (firstResult) {
+          if (firstResult > L->top) {  /* yield? */
+            lua_assert(L->ci->state == (CI_C | CI_YIELD));
+            (L->ci - 1)->u.l.savedpc = pc;
+            (L->ci - 1)->state = CI_SAVEDPC;
+            return NULL;
+          }
+          /* it was a C function (`precall' called it); adjust results */
+          luaD_poscall(L, nresults, firstResult);
+          if (nresults >= 0) L->top = L->ci->top;
+        }
+        else {  /* it is a Lua function */
+          if (GET_OPCODE(i) == OP_CALL) {  /* regular call? */
+            (L->ci-1)->u.l.savedpc = pc;  /* save `pc' to return later */
+            (L->ci-1)->state = (CI_SAVEDPC | CI_CALLING);
+          }
+          else {  /* tail call: put new frame in place of previous one */
+            int aux;
+            base = (L->ci - 1)->base;  /* `luaD_precall' may change the stack */
+            ra = RA(i);
+            if (L->openupval) luaF_close(L, base);
+            for (aux = 0; ra+aux < L->top; aux++)  /* move frame down */
+              setobjs2s(base+aux-1, ra+aux);
+            (L->ci - 1)->top = L->top = base+aux;  /* correct top */
+            lua_assert(L->ci->state & CI_SAVEDPC);
+            (L->ci - 1)->u.l.savedpc = L->ci->u.l.savedpc;
+            (L->ci - 1)->u.l.tailcalls++;  /* one more call lost */
+            (L->ci - 1)->state = CI_SAVEDPC;
+            L->ci--;  /* remove new frame */
+            L->base = L->ci->base;
+          }
+          goto callentry;
+        }
+        break;
+      }
+      case OP_RETURN: {
+        CallInfo *ci = L->ci - 1;  /* previous function frame */
+        int b = GETARG_B(i);
+        if (b != 0) L->top = ra+b-1;
+        lua_assert(L->ci->state & CI_HASFRAME);
+        if (L->openupval) luaF_close(L, base);
+        L->ci->state = CI_SAVEDPC;  /* deactivate current function */
+        L->ci->u.l.savedpc = pc;
+        /* previous function was running `here'? */
+        if (!(ci->state & CI_CALLING)) {
+          lua_assert((ci->state & CI_C) || ci->u.l.pc != &pc);
+          return ra;  /* no: return */
+        }
+        else {  /* yes: continue its execution */
+          int nresults;
+          lua_assert(ci->u.l.pc == &pc &&
+                     ttisfunction(ci->base - 1) &&
+                     (ci->state & CI_SAVEDPC));
+          lua_assert(GET_OPCODE(*(ci->u.l.savedpc - 1)) == OP_CALL);
+          nresults = GETARG_C(*(ci->u.l.savedpc - 1)) - 1;
+          luaD_poscall(L, nresults, ra);
+          if (nresults >= 0) L->top = L->ci->top;
+          goto retentry;
+        }
+      }
+      case OP_FORLOOP: {
+        lua_Number step, idx, limit;
+        const TObject *plimit = ra+1;
+        const TObject *pstep = ra+2;
+        if (!ttisnumber(ra))
+          luaG_runerror(L, "`for' initial value must be a number");
+        if (!tonumber(plimit, ra+1))
+          luaG_runerror(L, "`for' limit must be a number");
+        if (!tonumber(pstep, ra+2))
+          luaG_runerror(L, "`for' step must be a number");
+        step = nvalue(pstep);
+        idx = nvalue(ra) + step;  /* increment index */
+        limit = nvalue(plimit);
+        if (step > 0 ? idx <= limit : idx >= limit) {
+          dojump(pc, GETARG_sBx(i));  /* jump back */
+          chgnvalue(ra, idx);  /* update index */
+        }
+        break;
+      }
+      case OP_TFORLOOP: {
+        int nvar = GETARG_C(i) + 1;
+        StkId cb = ra + nvar + 2;  /* call base */
+        setobjs2s(cb, ra);
+        setobjs2s(cb+1, ra+1);
+        setobjs2s(cb+2, ra+2);
+        L->top = cb+3;  /* func. + 2 args (state and index) */
+        luaD_call(L, cb, nvar);
+        L->top = L->ci->top;
+        ra = XRA(i) + 2;  /* final position of first result */
+        cb = ra + nvar;
+        do {  /* move results to proper positions */
+          nvar--;
+          setobjs2s(ra+nvar, cb+nvar);
+        } while (nvar > 0);
+        if (ttisnil(ra))  /* break loop? */
+          pc++;  /* skip jump (break loop) */
+        else
+          dojump(pc, GETARG_sBx(*pc) + 1);  /* jump back */
+        break;
+      }
+      case OP_TFORPREP: {  /* for compatibility only */
+        if (ttistable(ra)) {
+          setobjs2s(ra+1, ra);
+          setobj2s(ra, luaH_getstr(hvalue(gt(L)), luaS_new(L, "next")));
+        }
+        dojump(pc, GETARG_sBx(i));
+        break;
+      }
+      case OP_SETLIST:
+      case OP_SETLISTO: {
+        int bc;
+        int n;
+        Table *h;
+        runtime_check(L, ttistable(ra));
+        h = hvalue(ra);
+        bc = GETARG_Bx(i);
+        if (GET_OPCODE(i) == OP_SETLIST)
+          n = (bc&(LFIELDS_PER_FLUSH-1)) + 1;
+        else {
+          n = L->top - ra - 1;
+          L->top = L->ci->top;
+        }
+        bc &= ~(LFIELDS_PER_FLUSH-1);  /* bc = bc - bc%FPF */
+        for (; n > 0; n--)
+          setobj2t(luaH_setnum(L, h, bc+n), ra+n);  /* write barrier */
+        break;
+      }
+      case OP_CLOSE: {
+        luaF_close(L, ra);
+        break;
+      }
+      case OP_CLOSURE: {
+        Proto *p;
+        Closure *ncl;
+        int nup, j;
+        p = cl->p->p[GETARG_Bx(i)];
+        nup = p->nups;
+        ncl = luaF_newLclosure(L, nup, &cl->g);
+        ncl->l.p = p;
+        for (j=0; j<nup; j++, pc++) {
+          if (GET_OPCODE(*pc) == OP_GETUPVAL)
+            ncl->l.upvals[j] = cl->upvals[GETARG_B(*pc)];
+          else {
+            lua_assert(GET_OPCODE(*pc) == OP_MOVE);
+            ncl->l.upvals[j] = luaF_findupval(L, base + GETARG_B(*pc));
+          }
+        }
+        setclvalue(ra, ncl);
+        luaC_checkGC(L);
+        break;
+      }
+    }
+  }
+}
+
diff --git a/main/source/lua/src/lvm.h b/main/source/lua/src/lvm.h
new file mode 100644
index 00000000..a159c6fd
--- /dev/null
+++ b/main/source/lua/src/lvm.h
@@ -0,0 +1,35 @@
+/*
+** $Id: lvm.h,v 1.47 2002/11/14 16:16:21 roberto Exp $
+** Lua virtual machine
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lvm_h
+#define lvm_h
+
+
+#include "ldo.h"
+#include "lobject.h"
+#include "ltm.h"
+
+
+#define tostring(L,o) ((ttype(o) == LUA_TSTRING) || (luaV_tostring(L, o)))
+
+#define tonumber(o,n)	(ttype(o) == LUA_TNUMBER || \
+                         (((o) = luaV_tonumber(o,n)) != NULL))
+
+#define equalobj(L,o1,o2) \
+	(ttype(o1) == ttype(o2) && luaV_equalval(L, o1, o2))
+
+
+int luaV_lessthan (lua_State *L, const TObject *l, const TObject *r);
+int luaV_equalval (lua_State *L, const TObject *t1, const TObject *t2);
+const TObject *luaV_tonumber (const TObject *obj, TObject *n);
+int luaV_tostring (lua_State *L, StkId obj);
+const TObject *luaV_gettable (lua_State *L, const TObject *t, TObject *key,
+                              int loop);
+void luaV_settable (lua_State *L, const TObject *t, TObject *key, StkId val);
+StkId luaV_execute (lua_State *L);
+void luaV_concat (lua_State *L, int total, int last);
+
+#endif
diff --git a/main/source/lua/src/lzio.c b/main/source/lua/src/lzio.c
new file mode 100644
index 00000000..85ba6e7f
--- /dev/null
+++ b/main/source/lua/src/lzio.c
@@ -0,0 +1,81 @@
+/*
+** $Id: lzio.c,v 1.24 2003/03/20 16:00:56 roberto Exp $
+** a generic input stream interface
+** See Copyright Notice in lua.h
+*/
+
+
+#include <string.h>
+
+#define lzio_c
+
+#include "lua.h"
+
+#include "llimits.h"
+#include "lmem.h"
+#include "lzio.h"
+
+
+int luaZ_fill (ZIO *z) {
+  size_t size;
+  const char *buff = z->reader(NULL, z->data, &size);
+  if (buff == NULL || size == 0) return EOZ;
+  z->n = size - 1;
+  z->p = buff;
+  return char2int(*(z->p++));
+}
+
+
+int luaZ_lookahead (ZIO *z) {
+  if (z->n == 0) {
+    int c = luaZ_fill(z);
+    if (c == EOZ) return c;
+    z->n++;
+    z->p--;
+  }
+  return char2int(*z->p);
+}
+
+
+void luaZ_init (ZIO *z, lua_Chunkreader reader, void *data, const char *name) {
+  z->reader = reader;
+  z->data = data;
+  z->name = name;
+  z->n = 0;
+  z->p = NULL;
+}
+
+
+/* --------------------------------------------------------------- read --- */
+size_t luaZ_read (ZIO *z, void *b, size_t n) {
+  while (n) {
+    size_t m;
+    if (z->n == 0) {
+      if (luaZ_fill(z) == EOZ)
+        return n;  /* return number of missing bytes */
+      else {
+        ++z->n;  /* filbuf removed first byte; put back it */
+        --z->p;
+      }
+    }
+    m = (n <= z->n) ? n : z->n;  /* min. between n and z->n */
+    memcpy(b, z->p, m);
+    z->n -= m;
+    z->p += m;
+    b = (char *)b + m;
+    n -= m;
+  }
+  return 0;
+}
+
+/* ------------------------------------------------------------------------ */
+char *luaZ_openspace (lua_State *L, Mbuffer *buff, size_t n) {
+  if (n > buff->buffsize) {
+    if (n < LUA_MINBUFFER) n = LUA_MINBUFFER;
+    luaM_reallocvector(L, buff->buffer, buff->buffsize, n, char);
+    buff->buffsize = n;
+  }
+  return buff->buffer;
+}
+
+
diff --git a/main/source/lua/src/lzio.h b/main/source/lua/src/lzio.h
new file mode 100644
index 00000000..88b766d3
--- /dev/null
+++ b/main/source/lua/src/lzio.h
@@ -0,0 +1,64 @@
+/*
+** $Id: lzio.h,v 1.15 2003/03/20 16:00:56 roberto Exp $
+** Buffered streams
+** See Copyright Notice in lua.h
+*/
+
+
+#ifndef lzio_h
+#define lzio_h
+
+#include "lua.h"
+
+
+#define EOZ	(-1)			/* end of stream */
+
+typedef struct Zio ZIO;
+
+
+#define char2int(c)	cast(int, cast(unsigned char, (c)))
+
+#define zgetc(z)  (((z)->n--)>0 ?  char2int(*(z)->p++) : luaZ_fill(z))
+
+#define zname(z)	((z)->name)
+
+void luaZ_init (ZIO *z, lua_Chunkreader reader, void *data, const char *name);
+size_t luaZ_read (ZIO* z, void* b, size_t n);	/* read next n bytes */
+int luaZ_lookahead (ZIO *z);
+
+
+
+typedef struct Mbuffer {
+  char *buffer;
+  size_t buffsize;
+} Mbuffer;
+
+
+char *luaZ_openspace (lua_State *L, Mbuffer *buff, size_t n);
+
+#define luaZ_initbuffer(L, buff) ((buff)->buffer = NULL, (buff)->buffsize = 0)
+
+#define luaZ_sizebuffer(buff)	((buff)->buffsize)
+#define luaZ_buffer(buff)	((buff)->buffer)
+
+#define luaZ_resizebuffer(L, buff, size) \
+	(luaM_reallocvector(L, (buff)->buffer, (buff)->buffsize, size, char), \
+	(buff)->buffsize = size)
+
+#define luaZ_freebuffer(L, buff)	luaZ_resizebuffer(L, buff, 0)
+
+
+/* --------- Private Part ------------------ */
+
+struct Zio {
+  size_t n;			/* bytes still unread */
+  const char *p;		/* current position in buffer */
+  lua_Chunkreader reader;
+  void* data;			/* additional data */
+  const char *name;
+};
+
+
+int luaZ_fill (ZIO *z);
+
+#endif
diff --git a/main/source/mod/AnimationUtil.cpp b/main/source/mod/AnimationUtil.cpp
new file mode 100644
index 00000000..a8c431b3
--- /dev/null
+++ b/main/source/mod/AnimationUtil.cpp
@@ -0,0 +1,668 @@
+#include <math.h>
+#include "types.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#include "cl_dll/r_studioint.h"
+#include "common/com_model.h"
+#include "common/cl_entity.h"
+#include "common/vec_op.h"
+#include "cl_dll/studio_util.h"
+
+extern engine_studio_api_t IEngineStudio;
+
+#endif
+
+#ifdef AVH_SERVER
+#include "common/mathlib.h"
+#include "common/const.h"
+#include "engine/eiface.h"
+#include "engine/edict.h"
+#include "dlls/enginecallback.h"
+#endif
+
+#include "mod/AnimationUtil.h"
+#include "mod/AvHSpecials.h"
+#include "util/MathUtil.h"
+
+#define PITCH   0
+#define YAW     1
+#define ROLL    2 
+
+//-----------------------------------------------------------------------------
+
+void NS_AngleMatrix (const float *angles, float (*matrix)[4] )
+{
+	float		angle;
+	float		sr, sp, sy, cr, cp, cy;
+	
+	angle = angles[YAW] * (float(M_PI)*2 / 360);
+	sy = sinf(angle);
+	cy = cosf(angle);
+	angle = angles[PITCH] * (float(M_PI)*2 / 360);
+	sp = sinf(angle);
+	cp = cosf(angle);
+	angle = angles[ROLL] * (float(M_PI)*2 / 360);
+	sr = sinf(angle);
+	cr = cosf(angle);
+
+	// matrix = (YAW * PITCH) * ROLL
+	matrix[0][0] = cp*cy;
+	matrix[1][0] = cp*sy;
+	matrix[2][0] = -sp;
+	matrix[0][1] = sr*sp*cy+cr*-sy;
+	matrix[1][1] = sr*sp*sy+cr*cy;
+	matrix[2][1] = sr*cp;
+	matrix[0][2] = (cr*sp*cy+-sr*-sy);
+	matrix[1][2] = (cr*sp*sy+-sr*cy);
+	matrix[2][2] = cr*cp;
+	matrix[0][3] = 0.0;
+	matrix[1][3] = 0.0;
+	matrix[2][3] = 0.0;
+}
+
+//-----------------------------------------------------------------------------
+
+#ifdef AVH_SERVER
+
+bool NS_GetEntityAnimationData(int inEntityIndex, NS_AnimationData& outAnimationData)
+{
+
+    edict_t* theEdict = g_engfuncs.pfnPEntityOfEntIndex(inEntityIndex);
+    
+    if (theEdict == NULL)
+    {
+        return false;
+    }
+
+    vec3_t theAngles;
+
+    if (theEdict->v.iuser3 == AVH_USER3_ALIEN_PLAYER1)  
+    {  
+        VectorCopy(theEdict->v.vuser1, theAngles);
+    }
+    else
+    {
+        VectorCopy(theEdict->v.angles, theAngles);
+    }
+
+    NS_AngleMatrix(theAngles, outAnimationData.mMatrix);
+
+    outAnimationData.mMatrix[0][3] = theEdict->v.origin[0];
+    outAnimationData.mMatrix[1][3] = theEdict->v.origin[1];
+    outAnimationData.mMatrix[2][3] = theEdict->v.origin[2];
+
+	outAnimationData.mTime         = theEdict->v.animtime;
+    outAnimationData.mFrame        = theEdict->v.frame;
+    outAnimationData.mFrameRate    = theEdict->v.framerate;
+    outAnimationData.mModelHeader  = (studiohdr_t*)(GET_MODEL_PTR(theEdict));
+    outAnimationData.mSequence     = theEdict->v.sequence;
+    outAnimationData.mGaitSequence = theEdict->v.gaitsequence;
+
+    // Get the bounding box for the sequence.
+
+    studiohdr_t* theModelHeader = outAnimationData.mModelHeader;
+
+    if (outAnimationData.mModelHeader != NULL)
+    {
+        
+        mstudioseqdesc_t* theSequence = (mstudioseqdesc_t*)((byte*)theModelHeader + theModelHeader->seqindex) + outAnimationData.mSequence;
+
+        VectorCopy(theSequence->bbmin, outAnimationData.mMins);
+        VectorCopy(theSequence->bbmax, outAnimationData.mMaxs);
+    
+    }
+
+    return true;
+
+}
+
+#endif
+
+//-----------------------------------------------------------------------------
+
+#ifdef AVH_CLIENT
+
+bool NS_GetEntityAnimationData(int inEntityIndex, NS_AnimationData& outAnimationData)
+{
+
+    cl_entity_t* theEntity = gEngfuncs.GetEntityByIndex(inEntityIndex);
+
+    if (theEntity == NULL || theEntity->model == NULL)
+    {
+        return false;
+    }
+
+    vec3_t theAngles;
+
+    if (theEntity->curstate.iuser3 == AVH_USER3_ALIEN_PLAYER1)  
+    {  
+        VectorCopy(theEntity->curstate.vuser1, theAngles);
+    }
+    else
+    {
+        VectorCopy(theEntity->curstate.angles, theAngles);
+    }
+
+    NS_AngleMatrix(theAngles, outAnimationData.mMatrix);
+
+    outAnimationData.mMatrix[0][3] = theEntity->curstate.origin[0];
+    outAnimationData.mMatrix[1][3] = theEntity->curstate.origin[1];
+    outAnimationData.mMatrix[2][3] = theEntity->curstate.origin[2];
+    
+    outAnimationData.mTime         = theEntity->curstate.animtime;
+    outAnimationData.mFrame        = theEntity->curstate.frame;
+    outAnimationData.mFrameRate    = theEntity->curstate.framerate;
+    outAnimationData.mModelHeader  = (studiohdr_t *)IEngineStudio.Mod_Extradata(theEntity->model);
+    outAnimationData.mSequence     = theEntity->curstate.sequence;
+    outAnimationData.mGaitSequence = theEntity->curstate.gaitsequence;
+
+    // Get the bounding box for the sequence.
+
+    studiohdr_t* theModelHeader = outAnimationData.mModelHeader;
+
+    if (outAnimationData.mModelHeader != NULL)
+    {
+
+        mstudioseqdesc_t* theSequence = (mstudioseqdesc_t*)((byte*)theModelHeader + theModelHeader->seqindex) + outAnimationData.mSequence;
+
+        VectorCopy(theSequence->bbmin, outAnimationData.mMins);
+        VectorCopy(theSequence->bbmax, outAnimationData.mMaxs);
+    
+    }
+
+    return true;
+
+}
+
+#endif
+
+//-----------------------------------------------------------------------------
+
+void NS_AngleQuaternion( float *angles, vec4_t quaternion )
+{
+	float		angle;
+	float		sr, sp, sy, cr, cp, cy;
+
+	// FIXME: rescale the inputs to 1/2 angle
+	angle = angles[2] * 0.5f;
+	sy = sinf(angle);
+	cy = cosf(angle);
+	angle = angles[1] * 0.5f;
+	sp = sinf(angle);
+	cp = cosf(angle);
+	angle = angles[0] * 0.5f;
+	sr = sinf(angle);
+	cr = cosf(angle);
+
+	quaternion[0] = sr*cp*cy-cr*sp*sy; // X
+	quaternion[1] = cr*sp*cy+sr*cp*sy; // Y
+	quaternion[2] = cr*cp*sy-sr*sp*cy; // Z
+	quaternion[3] = cr*cp*cy+sr*sp*sy; // W
+}
+
+//-----------------------------------------------------------------------------
+
+void NS_QuaternionSlerp( vec4_t p, vec4_t q, float t, vec4_t qt )
+{
+    
+    int i;
+	float	omega, cosom, sinom, sclp, sclq;
+
+	// decide if one of the quaternions is backwards
+	float a = 0;
+	float b = 0;
+
+	for (i = 0; i < 4; i++)
+	{
+		a += (p[i]-q[i])*(p[i]-q[i]);
+		b += (p[i]+q[i])*(p[i]+q[i]);
+	}
+	if (a > b)
+	{
+		for (i = 0; i < 4; i++)
+		{
+			q[i] = -q[i];
+		}
+	}
+
+	cosom = p[0]*q[0] + p[1]*q[1] + p[2]*q[2] + p[3]*q[3];
+
+	if ((1.0 + cosom) > 0.000001f)
+	{
+		if ((1.0 - cosom) > 0.000001f)
+		{
+			omega = acosf( cosom );
+			sinom = sinf( omega );
+			sclp = sinf( (1.0f - t)*omega) / sinom;
+			sclq = sinf( t*omega ) / sinom;
+		}
+		else
+		{
+			sclp = 1.0f - t;
+			sclq = t;
+		}
+		for (i = 0; i < 4; i++) {
+			qt[i] = sclp * p[i] + sclq * q[i];
+		}
+	}
+	else
+	{
+		qt[0] = -q[1];
+		qt[1] = q[0];
+		qt[2] = -q[3];
+		qt[3] = q[2];
+		sclp = sinf( (1.0f - t) * (0.5f * float(M_PI)));
+		sclq = sinf( t * (0.5f * float(M_PI)));
+		for (i = 0; i < 3; i++)
+		{
+			qt[i] = sclp * p[i] + sclq * qt[i];
+		}
+	}
+}
+
+//-----------------------------------------------------------------------------
+
+void NS_QuaternionMatrix( vec4_t quaternion, float (*matrix)[4] )
+{
+	matrix[0][0] = 1.0f - 2.0f * quaternion[1] * quaternion[1] - 2.0f * quaternion[2] * quaternion[2];
+	matrix[1][0] = 2.0f * quaternion[0] * quaternion[1] + 2.0f * quaternion[3] * quaternion[2];
+	matrix[2][0] = 2.0f * quaternion[0] * quaternion[2] - 2.0f * quaternion[3] * quaternion[1];
+
+	matrix[0][1] = 2.0f * quaternion[0] * quaternion[1] - 2.0f * quaternion[3] * quaternion[2];
+	matrix[1][1] = 1.0f - 2.0f * quaternion[0] * quaternion[0] - 2.0f * quaternion[2] * quaternion[2];
+	matrix[2][1] = 2.0f * quaternion[1] * quaternion[2] + 2.0f * quaternion[3] * quaternion[0];
+
+	matrix[0][2] = 2.0f * quaternion[0] * quaternion[2] + 2.0f * quaternion[3] * quaternion[1];
+	matrix[1][2] = 2.0f * quaternion[1] * quaternion[2] - 2.0f * quaternion[3] * quaternion[0];
+	matrix[2][2] = 1.0f - 2.0f * quaternion[0] * quaternion[0] - 2.0f * quaternion[1] * quaternion[1];
+}
+
+//-----------------------------------------------------------------------------
+
+void NS_ConcatTransforms (const float in1[3][4], const float in2[3][4], float out[3][4])
+{
+	out[0][0] = in1[0][0] * in2[0][0] + in1[0][1] * in2[1][0] +
+				in1[0][2] * in2[2][0];
+	out[0][1] = in1[0][0] * in2[0][1] + in1[0][1] * in2[1][1] +
+				in1[0][2] * in2[2][1];
+	out[0][2] = in1[0][0] * in2[0][2] + in1[0][1] * in2[1][2] +
+				in1[0][2] * in2[2][2];
+	out[0][3] = in1[0][0] * in2[0][3] + in1[0][1] * in2[1][3] +
+				in1[0][2] * in2[2][3] + in1[0][3];
+	out[1][0] = in1[1][0] * in2[0][0] + in1[1][1] * in2[1][0] +
+				in1[1][2] * in2[2][0];
+	out[1][1] = in1[1][0] * in2[0][1] + in1[1][1] * in2[1][1] +
+				in1[1][2] * in2[2][1];
+	out[1][2] = in1[1][0] * in2[0][2] + in1[1][1] * in2[1][2] +
+				in1[1][2] * in2[2][2];
+	out[1][3] = in1[1][0] * in2[0][3] + in1[1][1] * in2[1][3] +
+				in1[1][2] * in2[2][3] + in1[1][3];
+	out[2][0] = in1[2][0] * in2[0][0] + in1[2][1] * in2[1][0] +
+				in1[2][2] * in2[2][0];
+	out[2][1] = in1[2][0] * in2[0][1] + in1[2][1] * in2[1][1] +
+				in1[2][2] * in2[2][1];
+	out[2][2] = in1[2][0] * in2[0][2] + in1[2][1] * in2[1][2] +
+				in1[2][2] * in2[2][2];
+	out[2][3] = in1[2][0] * in2[0][3] + in1[2][1] * in2[1][3] +
+				in1[2][2] * in2[2][3] + in1[2][3];
+}
+
+//-----------------------------------------------------------------------------
+
+void NS_CalcBonePosition(int frame, float s, mstudiobone_t* pbone, mstudioanim_t* panim, float* adj, float* pos)
+{
+	
+    // This is ripped out of StudioModelRenderer.
+        
+    int					j, k;
+	mstudioanimvalue_t	*panimvalue;
+
+	for (j = 0; j < 3; j++)
+	{
+		pos[j] = pbone->value[j]; // default;
+		if (panim->offset[j] != 0)
+		{
+			panimvalue = (mstudioanimvalue_t *)((byte *)panim + panim->offset[j]);
+			/*
+			if (i == 0 && j == 0)
+				Con_DPrintf("%d  %d:%d  %f\n", frame, panimvalue->num.valid, panimvalue->num.total, s );
+			*/
+			
+			k = frame;
+			// DEBUG
+			if (panimvalue->num.total < panimvalue->num.valid)
+				k = 0;
+			// find span of values that includes the frame we want
+			while (panimvalue->num.total <= k)
+			{
+				k -= panimvalue->num.total;
+				panimvalue += panimvalue->num.valid + 1;
+  				// DEBUG
+				if (panimvalue->num.total < panimvalue->num.valid)
+					k = 0;
+			}
+			// if we're inside the span
+			if (panimvalue->num.valid > k)
+			{
+				// and there's more data in the span
+				if (panimvalue->num.valid > k + 1)
+				{
+					pos[j] += (panimvalue[k+1].value * (1.0f - s) + s * panimvalue[k+2].value) * pbone->scale[j];
+				}
+				else
+				{
+					pos[j] += panimvalue[k+1].value * pbone->scale[j];
+				}
+			}
+			else
+			{
+				// are we at the end of the repeating values section and there's another section with data?
+				if (panimvalue->num.total <= k + 1)
+				{
+					pos[j] += (panimvalue[panimvalue->num.valid].value * (1.0f - s) + s * panimvalue[panimvalue->num.valid + 2].value) * pbone->scale[j];
+				}
+				else
+				{
+					pos[j] += panimvalue[panimvalue->num.valid].value * pbone->scale[j];
+				}
+			}
+		}
+		if ( pbone->bonecontroller[j] != -1 && adj )
+		{
+			pos[j] += adj[pbone->bonecontroller[j]];
+		}
+	}
+}
+
+//-----------------------------------------------------------------------------
+
+void NS_CalcBoneAngles( int frame, float s, mstudiobone_t *pbone, mstudioanim_t *panim, float *adj, float *q )
+{
+	int					j, k;
+	vec4_t				q1, q2;
+	vec3_t				angle1, angle2;
+	mstudioanimvalue_t	*panimvalue;
+
+	for (j = 0; j < 3; j++)
+	{
+		if (panim->offset[j+3] == 0)
+		{
+			angle2[j] = angle1[j] = pbone->value[j+3]; // default;
+		}
+		else
+		{
+			panimvalue = (mstudioanimvalue_t *)((byte *)panim + panim->offset[j+3]);
+			k = frame;
+			// DEBUG
+			if (panimvalue->num.total < panimvalue->num.valid)
+				k = 0;
+			while (panimvalue->num.total <= k)
+			{
+				k -= panimvalue->num.total;
+				panimvalue += panimvalue->num.valid + 1;
+				// DEBUG
+				if (panimvalue->num.total < panimvalue->num.valid)
+					k = 0;
+			}
+			// Bah, missing blend!
+			if (panimvalue->num.valid > k)
+			{
+				angle1[j] = panimvalue[k+1].value;
+
+				if (panimvalue->num.valid > k + 1)
+				{
+					angle2[j] = panimvalue[k+2].value;
+				}
+				else
+				{
+					if (panimvalue->num.total > k + 1)
+						angle2[j] = angle1[j];
+					else
+						angle2[j] = panimvalue[panimvalue->num.valid+2].value;
+				}
+			}
+			else
+			{
+				angle1[j] = panimvalue[panimvalue->num.valid].value;
+				if (panimvalue->num.total > k + 1)
+				{
+					angle2[j] = angle1[j];
+				}
+				else
+				{
+					angle2[j] = panimvalue[panimvalue->num.valid + 2].value;
+				}
+			}
+			angle1[j] = pbone->value[j+3] + angle1[j] * pbone->scale[j+3];
+			angle2[j] = pbone->value[j+3] + angle2[j] * pbone->scale[j+3];
+		}
+
+        /*
+		if (pbone->bonecontroller[j+3] != -1)
+		{
+			angle1[j] += adj[pbone->bonecontroller[j+3]];
+			angle2[j] += adj[pbone->bonecontroller[j+3]];
+		}
+        */
+
+	}
+
+	if (!VectorCompare( angle1, angle2 ))
+	{
+		NS_AngleQuaternion( angle1, q1 );
+		NS_AngleQuaternion( angle2, q2 );
+		NS_QuaternionSlerp( q1, q2, s, q );
+	}
+	else
+	{
+		NS_AngleQuaternion( angle1, q );
+	}
+}
+
+//-----------------------------------------------------------------------------
+
+float NS_StudioEstimateFrame( mstudioseqdesc_t *pseqdesc, const NS_AnimationData& inAnimationData, float time, float inFrame)
+{
+	
+    float dfdt;
+    float f;
+
+	if ( /*m_fDoInterp*/ 1 )
+	{
+		if ( time < inAnimationData.mTime  )
+		{
+			dfdt = 0;
+		}
+		else
+		{
+			dfdt = (time - inAnimationData.mTime) * inAnimationData.mFrameRate * pseqdesc->fps;
+
+		}
+	}
+	else
+	{
+		dfdt = 0;
+	}
+
+	if (pseqdesc->numframes <= 1)
+	{
+		f = 0;
+	}
+	else
+	{
+		f = (inFrame * (pseqdesc->numframes - 1)) / 256.0f;
+	}
+ 	
+	f += dfdt;
+	
+	if (pseqdesc->flags & STUDIO_LOOPING) 
+	{
+		if (pseqdesc->numframes > 1)
+		{
+			f -= (int)(f / (pseqdesc->numframes - 1)) *  (pseqdesc->numframes - 1);
+		}
+		if (f < 0) 
+		{
+			f += (pseqdesc->numframes - 1);
+		}
+	}
+	else 
+	{
+		if (f >= pseqdesc->numframes - 1.001f) 
+		{
+			f = pseqdesc->numframes - 1.001f;
+		}
+		if (f < 0.0) 
+		{
+			f = 0.0;
+		}
+	}
+	
+    // This logic is from CStudioModelRenderer::StudioCalcRotations.
+
+	if (f > pseqdesc->numframes - 1)
+	{
+		f = 0;
+	}
+	else if (f < -0.01f)
+	{
+		f = -0.01f;
+	}    
+    
+    return f;
+
+}
+
+//-----------------------------------------------------------------------------
+
+mstudioanim_t* NS_GetAnimation(studiohdr_t* inModelHeader, mstudioseqdesc_t* inSequence)
+{
+	mstudioseqgroup_t* theSequenceGroup = (mstudioseqgroup_t*)((byte *)inModelHeader + inModelHeader->seqgroupindex) + inSequence->seqgroup;
+	// joev: 0000573
+	// Unless we actually check for null, we can get null references... 
+	if (theSequenceGroup) { 
+		return (mstudioanim_t*)((byte*)inModelHeader + theSequenceGroup->data + inSequence->animindex);
+	}
+	else {
+		return NULL;
+	}
+	// :joev
+}
+
+//-----------------------------------------------------------------------------
+
+void NS_GetBoneMatrices(const NS_AnimationData& inAnimationData, float time, NS_Matrix3x4 outBoneMatrix[])
+{
+	if (!inAnimationData.mModelHeader || inAnimationData.mSequence < 0 || inAnimationData.mFrame < 0)
+    {
+        return;
+    }
+
+    studiohdr_t* theModelHeader = inAnimationData.mModelHeader;
+
+    // Get the world to object space transformation for the entity.
+
+    mstudioseqdesc_t* theSequence = (mstudioseqdesc_t*)((byte*)theModelHeader + theModelHeader->seqindex) + inAnimationData.mSequence;
+
+	if (!theSequence) {
+		return;
+	}
+
+    float f = NS_StudioEstimateFrame(theSequence, inAnimationData, time, inAnimationData.mFrame);
+
+	int frame = (int)f;
+	float s = (f - frame);
+
+    mstudiobone_t* theBones	= (mstudiobone_t*)((byte*)theModelHeader + theModelHeader->boneindex);
+    mstudiobbox_t* theHitBoxes = (mstudiobbox_t*)((byte*)theModelHeader + theModelHeader->hitboxindex);
+    
+	// joev: 0000573
+	// Unless we actually check for null, we can get null references... 
+	// Regardless if the model is borked, the server shouldn't crash.
+	// Also, why have NS_GetAnimation when it's not used? 
+	mstudioanim_t* theAnimation = NS_GetAnimation(theModelHeader,theSequence);
+
+	if (!theBones|| !theHitBoxes|| !theAnimation) 
+	{
+		return;
+	}
+	// :joev
+
+    // Get the position and orientation of all of the bones in the skeleton.
+    
+    vec3_t theBonePos[MAXSTUDIOBONES];
+    vec4_t theBoneAngles[MAXSTUDIOBONES];
+
+    int i;
+
+    for (i = 0; i < theModelHeader->numbones; ++i)
+    {
+        NS_CalcBonePosition(frame, s, &theBones[i], &theAnimation[i], NULL, theBonePos[i]);
+        NS_CalcBoneAngles(frame, s, &theBones[i], &theAnimation[i], NULL, theBoneAngles[i]);
+    }
+
+    // Take the gait sequence into account.
+
+	if (inAnimationData.mGaitSequence != 0 && inAnimationData.mGaitSequence != 255)
+	{
+
+        int theGaitSequenceIndex = max(min(inAnimationData.mGaitSequence, theModelHeader->numseq - 1), 0);
+
+        mstudioseqdesc_t* theGaitSequence = (mstudioseqdesc_t*)((byte*)theModelHeader + theModelHeader->seqindex) + theGaitSequenceIndex;
+        mstudioanim_t* theGaitAnimation = NS_GetAnimation(theModelHeader, theGaitSequence);
+
+        // Compute the frame in the gait animation.
+
+        float theGaitFrame = time * theGaitSequence->fps;
+
+        while (theGaitFrame >= theGaitSequence->numframes)
+        {
+            theGaitFrame -= theGaitSequence->numframes;
+        }
+
+        theGaitFrame = theGaitFrame * 256 / (theGaitSequence->numframes - 1);
+        
+        float f = NS_StudioEstimateFrame(theGaitSequence, inAnimationData, time, theGaitFrame);
+
+    	int frame = (int)f;
+    	float s = (f - frame);
+
+		for (i = 0; i < theModelHeader->numbones; i++)
+		{
+
+            if (strcmp(theBones[i].name, "Bip01 Spine") == 0)
+            {
+				break;
+            }
+
+            NS_CalcBonePosition(frame, s, &theBones[i], &theGaitAnimation[i], NULL, theBonePos[i]);
+            NS_CalcBoneAngles(frame, s, &theBones[i], &theGaitAnimation[i], NULL, theBoneAngles[i]);
+			
+		}        
+        
+	}
+
+    for (i = 0; i < theModelHeader->numbones; i++) 
+	{
+        
+        NS_Matrix3x4 theRelMatrix;
+		NS_QuaternionMatrix(theBoneAngles[i], theRelMatrix);
+
+		theRelMatrix[0][3] = theBonePos[i][0];
+		theRelMatrix[1][3] = theBonePos[i][1];
+    	theRelMatrix[2][3] = theBonePos[i][2];
+
+		if (theBones[i].parent == -1) 
+		{
+            NS_ConcatTransforms(inAnimationData.mMatrix, theRelMatrix, outBoneMatrix[i]);
+		}
+		else 
+		{
+			NS_ConcatTransforms(outBoneMatrix[theBones[i].parent], theRelMatrix, outBoneMatrix[i]);
+		}
+        
+    }
+
+}
\ No newline at end of file
diff --git a/main/source/mod/AnimationUtil.h b/main/source/mod/AnimationUtil.h
new file mode 100644
index 00000000..c4066842
--- /dev/null
+++ b/main/source/mod/AnimationUtil.h
@@ -0,0 +1,37 @@
+#ifndef ANIMATION_UTIL_H
+#define ANIMATION_UTIL_H
+
+#include "engine/studio.h"
+
+/**
+ *
+ */
+typedef float NS_Matrix3x4[3][4];
+
+/**
+ *
+ */
+struct NS_AnimationData
+{
+    NS_Matrix3x4    mMatrix;
+	float           mTime;
+	float           mFrame;
+    float           mFrameRate;
+    studiohdr_t*    mModelHeader;
+    int             mSequence;
+    int             mGaitSequence;
+    vec3_t          mMins;
+    vec3_t          mMaxs;
+};
+
+/**
+ * Returns false if the animation data could not be retrieved for the specified entity.
+ */
+bool NS_GetEntityAnimationData(int inEntityIndex, NS_AnimationData& outAnimationData);
+
+/**
+ * outBoneMatrix array should have as many elements as there are bones in the model (MAXSTUDIOBONES)
+ */
+void NS_GetBoneMatrices(const NS_AnimationData& inAnimationData, float time, NS_Matrix3x4 outBoneMatrix[]);
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHAcidRocketGun.cpp b/main/source/mod/AvHAcidRocketGun.cpp
new file mode 100644
index 00000000..26b35baf
--- /dev/null
+++ b/main/source/mod/AvHAcidRocketGun.cpp
@@ -0,0 +1,279 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHAcidRocketGun.cpp $
+// $Date: 2002/11/22 21:28:15 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHAcidRocketGun.cpp,v $
+// Revision 1.8  2002/11/22 21:28:15  Flayra
+// - mp_consistency changes
+//
+// Revision 1.7  2002/10/16 20:50:53  Flayra
+// - Fixed problem where projectile hit player
+//
+// Revision 1.6  2002/08/16 02:32:09  Flayra
+// - Added damage types
+// - Swapped umbra and bile bomb
+//
+// Revision 1.5  2002/07/24 18:55:51  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.4  2002/07/24 18:45:40  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.3  2002/07/23 16:54:23  Flayra
+// - Updates for new viewmodel artwork
+//
+// Revision 1.2  2002/07/01 21:11:59  Flayra
+// - Removed unneeded linking entity to classname
+//
+// Revision 1.1  2002/06/25 17:23:02  Flayra
+// - Level 4 projectile
+//
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#endif
+
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHConstants.h"
+
+
+LINK_ENTITY_TO_CLASS(kwAcidRocketGun, AvHAcidRocketGun);
+void V_PunchAxis( int axis, float punch );
+
+
+#ifdef AVH_SERVER
+
+#include "mod/AvHGamerules.h"
+#include "mod/AvHServerUtil.h"
+
+void AvHAcidRocket::Precache(void)
+{
+	CBaseEntity::Precache();
+
+	PRECACHE_UNMODIFIED_MODEL(kAcidRocketProjectileModel);
+}
+
+void AvHAcidRocket::SetDamage(float inDamage)
+{
+	this->mDamage = inDamage;
+}
+
+void AvHAcidRocket::Spawn()
+{
+	this->Precache();
+	CBaseEntity::Spawn();
+	
+	this->pev->movetype = MOVETYPE_FLY;
+	this->pev->classname = MAKE_STRING(kwsAcidRocket);
+	
+	SET_MODEL(ENT(this->pev), kAcidRocketProjectileModel);
+	this->pev->solid = SOLID_BBOX;
+	this->mDamage = 0.0f;
+	
+	// Comment out effects line, uncomment next four, then comment out creation of temp entity in EV_AcidGun to see server side Acid for testing
+	if(!GetGameRules()->GetDrawInvisibleEntities())
+	{
+		this->pev->effects = EF_NODRAW;
+	}
+	else
+	{
+		this->pev->frame = 0;
+		this->pev->scale = 0.5;
+		this->pev->rendermode = kRenderTransAlpha;
+		this->pev->renderamt = 255;
+	}
+	
+	//UTIL_SetSize(this->pev, Vector( 0, 0, 0), Vector(0, 0, 0));
+//	UTIL_SetSize(this->pev, Vector( -16, -16, -16), Vector(16, 16, 16));
+	//UTIL_SetSize(this->pev, Vector( -50, -50, -50), Vector(50, 50, 50));
+	
+	SetTouch(&AvHAcidRocket::AcidRocketTouch);
+
+//	// Enforce short range
+//	SetThink(AcidRocketDeath);
+//	this->pev->nextthink = gpGlobals->time + kAcidRocketLifetime;
+}
+
+void AvHAcidRocket::AcidRocketDeath()
+{
+}
+
+void AvHAcidRocket::AcidRocketTouch(CBaseEntity* pOther)
+{
+	edict_t* theRocketOwner = this->pev->owner;
+	CBaseEntity* theAttacker = CBaseEntity::Instance(theRocketOwner);
+
+	//float theForceScalar = BALANCE_FVAR(kAcidRocketForceScalar)*this->mDamage;
+	//AvHSUExplosiveForce(this->pev->origin, kAcidRocketRadius, theForceScalar, theAttacker);
+
+	// Explode with splash damage
+	RadiusDamage(this->pev->origin, this->pev, VARS(theRocketOwner), this->mDamage, BALANCE_IVAR(kAcidRocketRadius), CLASS_NONE, NS_DMG_ACID);
+
+	// Kill the Acid entity
+	UTIL_Remove(this);
+}
+#endif
+
+
+
+
+void AvHAcidRocketGun::Init()
+{
+	this->mRange = kAcidRocketRange;
+	this->mDamage = BALANCE_IVAR(kAcidRocketDamage);
+}
+
+void AvHAcidRocketGun::FireProjectiles(void)
+{
+	#ifdef AVH_SERVER
+	
+	// Spawn AcidRocket
+	AvHAcidRocket* theAcidRocket = GetClassPtr((AvHAcidRocket*)NULL );
+	theAcidRocket->Spawn();
+	
+	UTIL_MakeVectors(this->m_pPlayer->pev->v_angle);
+
+	Vector vecAiming = gpGlobals->v_forward;
+
+	// TODO: Make rocket appear to come from arm
+	Vector theRocketOrigin;
+	VectorMA(this->m_pPlayer->GetGunPosition(), this->GetBarrelLength(), vecAiming, theRocketOrigin);
+	
+	UTIL_SetOrigin(theAcidRocket->pev, theRocketOrigin);
+
+	// This needs to be the same as in EV_AcidRocketGun
+	Vector theBaseVelocity;
+	VectorScale(this->pev->velocity, kAcidRocketParentVelocityScalar, theBaseVelocity);
+	
+	Vector theStartVelocity;
+	VectorMA(theBaseVelocity, kAcidRocketVelocity, vecAiming, theStartVelocity);
+
+	VectorCopy(theStartVelocity, theAcidRocket->pev->velocity);
+
+	// Set owner
+	theAcidRocket->pev->owner = ENT(this->m_pPlayer->pev);
+
+	// Set AcidRocket's team :)
+	theAcidRocket->pev->team = this->m_pPlayer->pev->team;
+
+	// Set amount of damage it will do
+	float theDamage = this->mDamage*AvHPlayerUpgrade::GetAlienRangedDamageUpgrade(this->m_pPlayer->pev->iuser4);
+	theAcidRocket->SetDamage(theDamage);
+
+	#endif	
+}
+
+int	AvHAcidRocketGun::GetBarrelLength() const
+{
+	return kAcidRocketBarrelLength;
+}
+
+int	AvHAcidRocketGun::GetIdleAnimation() const
+{
+	return UTIL_SharedRandomLong(this->m_pPlayer->random_seed, 14, 15);
+}
+
+float AvHAcidRocketGun::GetRateOfFire() const
+{
+    return BALANCE_FVAR(kAcidRocketROF);
+}
+
+int	AvHAcidRocketGun::GetDeployAnimation() const
+{
+	// Look at most recently used weapon and see if we can transition from it
+	int theDeployAnimation = 6;
+	
+	AvHWeaponID thePreviousID = this->GetPreviousWeaponID();
+	
+	switch(thePreviousID)
+	{
+	case AVH_WEAPON_ACIDROCKET:
+		theDeployAnimation = -1;
+		break;
+
+	case AVH_WEAPON_SWIPE:
+	case AVH_WEAPON_BLINK:
+		theDeployAnimation = 8;
+		break;
+
+	case AVH_WEAPON_METABOLIZE:
+		theDeployAnimation = 13;
+		break;
+	}
+	
+	return theDeployAnimation;
+}
+
+bool AvHAcidRocketGun::GetFiresUnderwater() const
+{
+	return true;
+}
+
+bool AvHAcidRocketGun::GetIsDroppable() const
+{
+	return false;
+}
+
+bool AvHAcidRocketGun::GetMustPressTriggerForEachShot() const
+{
+	return true;
+}
+
+int	AvHAcidRocketGun::GetShootAnimation() const
+{
+	return 16;
+}
+
+char* AvHAcidRocketGun::GetViewModel() const
+{
+	return kLevel4ViewModel;
+}
+
+void AvHAcidRocketGun::Precache()
+{
+	AvHAlienWeapon::Precache();
+
+	PRECACHE_UNMODIFIED_MODEL(kAcidRocketProjectileModel);
+	PRECACHE_UNMODIFIED_SOUND(kAcidRocketFireSound);
+	PRECACHE_UNMODIFIED_SOUND(kAcidRocketHitSound);
+
+	this->mEvent = PRECACHE_EVENT(1, kAcidRocketShootEventName);
+}
+
+
+void AvHAcidRocketGun::Spawn() 
+{ 
+    AvHAlienWeapon::Spawn(); 
+
+	Precache();
+
+	this->m_iId = AVH_WEAPON_ACIDROCKET;
+
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsAcidRocketGun);
+
+	SET_MODEL(ENT(this->pev), kNullModel);
+
+	FallInit();// get ready to fall down.
+} 
+
diff --git a/main/source/mod/AvHActionButtons.cpp b/main/source/mod/AvHActionButtons.cpp
new file mode 100644
index 00000000..021333ba
--- /dev/null
+++ b/main/source/mod/AvHActionButtons.cpp
@@ -0,0 +1,731 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHActionButtons.cpp$
+// $Date: 2002/06/10 19:47:55 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHActionButtons.cpp,v $
+// Revision 1.11  2002/06/10 19:47:55  Flayra
+// - Removed accelerator character, now these are bindable via commands
+//
+// Revision 1.10  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//
+//===============================================================================
+#include "mod/AvHActionButtons.h"
+#include "ui/UITags.h"
+#include "ui/UIUtil.h"
+#include "util/STLUtil.h"
+#include "mod/AvHMessage.h"
+#include "mod/AvHClientUtil.h"
+#include "mod/AvHClientVariables.h"
+#include "mod/AvHSharedUtil.h"
+
+const int	kLineWidth = 1;
+//const char	kAcceleratorCharacter = '-';
+
+ActionButton::ActionButton(const char* text,int x,int y) : StaticLabel(0, 0) //Button(text, x, y)
+{
+	this->mMessageID = MESSAGE_NULL;
+	this->mCost = 0;
+	this->mTechEnabled = true;
+	this->mCostMet = true;
+//	this->mResearched = false;
+	this->mBusy = false;
+	this->mMouseOver = false;
+	this->mButtonIndex = 0;
+}
+
+void ActionButton::cursorEntered()
+{
+	this->mMouseOver = true;
+}
+
+void ActionButton::cursorExited()
+{
+	this->mMouseOver = false;
+}
+
+void ActionButton::getPos(int& x, int& y)
+{
+	Panel* theParent = this->getParent();
+
+	theParent->getPos(x, y);
+
+	int theLocalX, theLocalY;
+	StaticLabel::getPos(theLocalX, theLocalY);
+
+	x += theLocalX;
+	y += theLocalY;
+}
+
+bool ActionButton::GetBusy() const
+{
+	return this->mBusy;
+}
+
+bool ActionButton::GetMouseOver() const
+{
+	return this->mMouseOver;
+}
+
+bool ActionButton::GetCostMet() const
+{
+	return this->mCostMet;
+}
+
+string ActionButton::GetHelpText() const
+{
+	return this->mHelpText;
+}
+
+bool ActionButton::GetTechEnabled() const
+{
+	return this->mTechEnabled;
+}
+
+AvHMessageID ActionButton::GetMessageID() const
+{
+	return this->mMessageID;
+}
+
+bool ActionButton::GetLabelForMessage(AvHMessageID inMessage, string& outLabel)
+{
+	bool theSuccess = false;
+
+	// Localize prereq, without IT's prereq
+	string theKey = string(kTechNodeLabelPrefix) + MakeStringFromInt((int)inMessage);
+	if(LocalizeString(theKey.c_str(), outLabel))
+	{
+		// Remove it's accelerator if it has one
+		//std::remove(outLabel.begin(), outLabel.end(), kAcceleratorCharacter);
+		theSuccess = true;
+	}
+	else
+	{
+		int a = 0;
+	}
+	return theSuccess;
+}
+
+void ActionButton::UpdateEnabledAndResearchState(const AvHTechNodes& inTechNodes)
+{
+	// Get cost
+	bool theResearchable;
+	float theTime;
+	inTechNodes.GetResearchInfo(this->mMessageID, theResearchable, this->mCost, theTime);
+	this->mTechEnabled = theResearchable;
+	
+	this->mResearched = false;
+	AvHTechID theTechID = TECH_NULL;
+	if(inTechNodes.GetTechForMessage(this->mMessageID, theTechID))
+	{
+		this->mResearched = inTechNodes.GetIsTechResearched(theTechID);
+	}
+}
+
+// Run through the tech nodes and look up their label and help text, storing them for drawing
+void ActionButton::Localize(const AvHTechNodes& inTechNodes)
+{
+	if(this->mMessageID == MESSAGE_NULL)
+	{
+		this->setText("");
+		this->mHelpText = "";
+		this->mCost = 0;
+	}
+	else
+	{
+		char theNumber[8];
+		sprintf(theNumber, "%d", (int)this->mMessageID);
+		string theNumberString(theNumber);
+
+		// If localize string fails, set the label to "<no desc>"
+		string theText;
+		string theKey = string(kTechNodeLabelPrefix) + theNumberString;
+		LocalizeString(theKey.c_str(), theText);
+		
+		// Localize help string
+		this->mHelpText = "";
+
+		if(gHUD.GetHelpForMessage(this->mMessageID, this->mHelpText))
+		{
+			// Add hotkey accelerator
+			if(this->mButtonIndex >= 0)
+			{
+				char theHotkeyChar = ' ';
+				int theCol = this->mButtonIndex % kNumActionButtonCols;
+				int theRow = this->mButtonIndex / kNumActionButtonCols;
+				if(AvHActionButtons::ButtonIndexToHotKey(theCol, theRow, theHotkeyChar))
+				{
+					// Display as caps, looks nicer
+					theHotkeyChar = toupper(theHotkeyChar);
+					string theHotkeyText = string("(") + theHotkeyChar + string(")");
+					this->mHelpText += string(" ");
+					this->mHelpText += theHotkeyText;
+				}
+			}
+
+			// new line after hotkey
+			this->mHelpText += " \n";
+
+			bool theFirstPrereq = true;
+
+			// If there is a prerequisite that isn't researched, add this to help message
+			AvHTechID thePrereqID1;
+			AvHTechID thePrereqID2;
+			if(inTechNodes.GetPrequisiteForMessage(this->mMessageID, thePrereqID1, thePrereqID2))
+			{
+				for(int i = 0; i < 2; i++)
+				{
+					AvHTechID theCurrentPrereq = ((i == 0) ? thePrereqID1 : thePrereqID2);
+					if(theCurrentPrereq != TECH_NULL)
+					{
+						if(!inTechNodes.GetIsTechResearched(theCurrentPrereq))
+						{
+							//this->mTechEnabled = false;
+						
+							// Localize "prerequisite:"
+							string thePrequisiteText;
+							if(LocalizeString(kPrerequisitePrefix, thePrequisiteText))
+							{
+								// Get message from this tech
+								AvHMessageID theMessageWithThisTech = MESSAGE_NULL;
+								if(inTechNodes.GetMessageForTech(theCurrentPrereq, theMessageWithThisTech))
+								{
+									string thePrereqTech;
+									if(GetLabelForMessage(theMessageWithThisTech, thePrereqTech))
+									{
+										// Add extra blank line before first prereq
+										if(theFirstPrereq)
+										{
+											this->mHelpText += " \n";
+											this->mHelpText += kTooltipBoldPreString;
+											this->mHelpText += thePrequisiteText;
+											this->mHelpText += "\n";
+											theFirstPrereq = false;
+										}
+
+										// Prereqs draw as bold
+										this->mHelpText += kTooltipBoldPreString;
+										this->mHelpText += " - ";
+										this->mHelpText += thePrereqTech;
+										this->mHelpText += "\n";
+									}
+								}
+								else
+								{
+									int a = 0;
+								}
+							}
+						}
+					}
+				}
+			}
+
+			// Blank line between hotkey/prereq and description
+			this->mHelpText += " \n";
+
+			// Add description
+			AvHUser3 theUser3 = AVH_USER3_NONE;
+			if(AvHSHUMessageIDToUser3(this->mMessageID, theUser3))
+			{
+				string theDescription;
+				if(gHUD.GetTranslatedUser3Description(theUser3, true, theDescription))
+				{
+					this->mHelpText += theDescription;
+
+					this->mHelpText += " \n";
+				}
+			}
+		}
+	}	
+}
+
+void ActionButton::SetBusy(bool inBusy)
+{
+	this->mBusy = false;
+}
+
+void ActionButton::SetButtonIndex(int inButtonIndex)
+{
+	this->mButtonIndex = inButtonIndex;
+}
+
+void ActionButton::SetEnabledState(bool inEnabledState)
+{
+	this->mTechEnabled = inEnabledState;
+}
+
+void ActionButton::SetMessageID(AvHMessageID inMessageID)
+{
+	this->mMessageID = inMessageID;
+}
+
+void ActionButton::UpdateEnabledState(int inCurrentPoints, int inEnergy)
+{
+	bool theCostsEnergy = AvHSHUGetDoesTechCostEnergy(this->mMessageID);
+	int theValue = theCostsEnergy ? inEnergy : inCurrentPoints;
+
+	if(theValue >= this->mCost)
+	{
+		this->mCostMet = true;
+	}
+	else
+	{
+		this->mCostMet = false;
+	}
+}
+
+// TODO: Change how it draws when enabled or not
+void ActionButton::paint()
+{
+	//if(!this->mResearched && !this->mBusy)
+	//{
+		if(this->mMessageID != MESSAGE_NULL)
+		{
+			StaticLabel::paint();
+		}
+	//}
+}
+
+void ActionButton::paintBackground()
+{
+//	if(!this->mTechEnabled || !this->mEnoughPoints)
+//	{
+//		int theX, theY;
+//		this->getPos(theX, theY);
+//
+//		int theWidth, theHeight;
+//		this->getSize(theWidth, theHeight);
+//
+//		//FillRGBA(theX, theY, theWidth, theHeight, 200, 100, 100, 100);
+//		FillRGBA(0, 0, theWidth, theHeight, 200, 100, 100, 100);
+//		//vguiSimpleBox(theX, theY, theX + theWidth, theY + theHeight, 200, 100, 100, 100);
+//	}
+}
+
+
+
+AvHActionButtons::AvHActionButtons() : mTextImage("")
+{
+	this->mTechFont = NULL;
+	this->mResources = 0;
+	this->mEnergy = 0;
+	this->mBusy = false;
+
+	this->mButtonArray = new ActionButton*[kNumActionButtonRows*kNumActionButtonCols];
+	for(int i = 0; i < kNumActionButtonRows*kNumActionButtonCols; i++)
+	{
+		// Every button is parented to the action buttons component
+		string theText = string("tech: ") + MakeStringFromInt(i+1);
+		this->mButtonArray[i] = new ActionButton(theText.c_str(), 0, 0);
+		this->mButtonArray[i]->setParent(this);
+		this->mButtonArray[i]->SetButtonIndex(i);
+	}
+}
+
+AvHActionButtons::~AvHActionButtons()
+{
+	for(int i = 0; i < kNumActionButtonRows*kNumActionButtonCols; i++)
+	{
+		delete this->mButtonArray[i];
+	}
+	delete [] this->mButtonArray;
+}
+
+void AvHActionButtons::ClearButtons()
+{
+	for(int i = 0; i < kNumActionButtonRows*kNumActionButtonCols; i++)
+	{
+		this->mButtonArray[i]->SetMessageID(MESSAGE_NULL);
+	}
+}
+
+// 4x3 array
+const int kMaxNumActionButtons = 12;
+char kHotKeyAKA[kMaxNumActionButtons] = {'q', 'w', 'e', 'r', 'a', 's', 'd', 'f', 'z', 'x', 'c', 'v'};
+
+const char* AvHActionButtons::GetHotKeyAKA()
+{
+	char* theHotKeyAKA = kHotKeyAKA;
+
+	char* theCustomHotKeyAKA = cl_cmhotkeys->string;
+	if(strlen(theCustomHotKeyAKA) >= kMaxNumActionButtons)
+	{
+		theHotKeyAKA = theCustomHotKeyAKA;
+	}
+
+	return theHotKeyAKA;
+}
+
+bool AvHActionButtons::ButtonIndexToHotKey(int inCol, int inRow, char& outChar)
+{
+	bool theSuccess = false;
+
+	const char* theHotKeyAKA = AvHActionButtons::GetHotKeyAKA();
+
+	if((inCol >= 0) && (inCol < kNumActionButtonCols) && (inRow >= 0) && (inRow < kNumActionButtonRows))
+	{
+		int theIndex = inCol + inRow*kNumActionButtonCols;
+		ASSERT(theIndex >= 0);
+		ASSERT(theIndex < kMaxNumActionButtons);
+
+		outChar = theHotKeyAKA[theIndex];
+
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+// Hard-code hotkeys to be in analagous key array
+bool AvHActionButtons::HotKeyToButtonIndex(char inChar, int& outCol, int& outRow)
+{
+	bool theSuccess = false;
+
+	int theChar = tolower(inChar);
+	const char* theHotKeyAKA = AvHActionButtons::GetHotKeyAKA();
+	
+	for(int i = 0; i < kMaxNumActionButtons; i++)
+	{
+		if(theChar == theHotKeyAKA[i])
+		{
+			outCol = i % kNumActionButtonCols;
+			outRow = i / kNumActionButtonCols;
+			theSuccess = true;
+			break;
+		}
+	}
+	
+	return theSuccess;
+}
+
+int	AvHActionButtons::GetNumCols() const
+{
+	return kNumActionButtonCols;
+}
+
+int	AvHActionButtons::GetNumRows() const
+{
+	return kNumActionButtonRows;
+}
+
+ActionButton* AvHActionButtons::GetActionButtonAtPos(int inCol, int inRow)
+{
+	ASSERT(inCol >= 0);
+	ASSERT(inRow >= 0);
+	ASSERT(inCol < kNumActionButtonCols);
+	ASSERT(inRow < kNumActionButtonRows);
+
+	int theIndex = inCol + inRow*kNumActionButtonCols;
+	return this->mButtonArray[theIndex];
+}
+
+
+// Run through the tech nodes and look up their label and help text, storing them for drawing
+void AvHActionButtons::Localize()
+{
+	for(int i = 0; i < kNumActionButtonRows*kNumActionButtonCols; i++)
+	{
+		this->mButtonArray[i]->Localize(this->mTechNodes);
+	}
+	this->SetButtonsToGrid();	
+}
+
+bool AvHActionButtons::SetButton(int inButtonOffset, AvHMessageID inMessageID)
+{
+	bool theSuccess = false;
+	
+	if(inButtonOffset < kNumActionButtonRows*kNumActionButtonCols)
+	{
+		ActionButton* theCurrentActionButton = this->mButtonArray[inButtonOffset];
+		theCurrentActionButton->SetMessageID(inMessageID);
+		theSuccess = true;
+	}
+	
+	return theSuccess;
+}
+
+// Sets the button to the research tech, unless the tech has already been researched, in case it will set it to TECH_NULL
+//bool AvHActionButtons::SetResearchButton(int inButtonOffset, AvHMessageID inMessageID)
+//{
+//	// If researched, set it to MESSAGE_NULL so it isn't displayed
+//	AvHMessageID theAdjustedID = inMessageID;
+//
+//	bool theIsResearched = this->mTechNodes.GetIsTechResearched(inTechID);
+//	if(theIsResearched)
+//	{
+//		theAdjustedID = MESSAGE_NULL;
+//	}
+//
+//	return this->SetButton(inButtonOffset, theAdjustedID);
+//}
+
+//bool AvHActionButtons::SetTechIfOtherTechResearched(int inButtonOffset, AvHTechID inTechID, AvHTechID inResearchedTech)
+//{
+//	// If other tech isn't researched, don't display
+//	bool theSuccess = false;
+//	if(inButtonOffset < kNumActionButtonRows*kNumActionButtonCols)
+//	{
+//		ActionButton* theCurrentActionButton = this->mButtonArray[inButtonOffset];
+//
+//		bool theOtherTechIsResearched = this->mTechNodes.GetIsTechResearched(inResearchedTech);
+//		theCurrentActionButton->SetTechID(inTechID, theOtherTechIsResearched);
+//
+//		theSuccess = true;
+//	}
+//
+//	return theSuccess;
+//}
+
+void AvHActionButtons::SetTechNodes(const AvHTechNodes& inTechNodes)
+{
+	if(this->mTechNodes != inTechNodes)
+	{
+		this->mTechNodes = inTechNodes;
+		this->UpdateEnabledState();
+	}
+}
+
+void AvHActionButtons::SetEnergy(int inEnergy)
+{
+	this->mEnergy = inEnergy;
+}
+
+void AvHActionButtons::SetResources(int inResources)
+{
+	this->mResources = inResources;
+//	this->UpdateEnabledState();
+}
+
+void AvHActionButtons::UpdateEnabledState()
+{
+	for(int i = 0; i < kNumActionButtonRows*kNumActionButtonCols; i++)
+	{
+		this->mButtonArray[i]->UpdateEnabledState(this->mResources, this->mEnergy);
+	}
+}
+
+void AvHActionButtons::UpdateEnabledAndResearchState()
+{
+	for(int i = 0; i < kNumActionButtonRows*kNumActionButtonCols; i++)
+	{
+		this->mButtonArray[i]->UpdateEnabledAndResearchState(this->mTechNodes);
+	}
+}
+
+
+void AvHActionButtons::addInputSignal(InputSignal* s)
+{
+	Panel::addInputSignal(s);
+	
+	for(int i = 0; i < kNumActionButtonRows*kNumActionButtonCols; i++)
+	{
+		this->mButtonArray[i]->addInputSignal(s);
+	}
+}
+
+void AvHActionButtons::setFgColor(int r,int g,int b,int a)
+{
+	Panel::setFgColor(r, g, b, a);
+	
+	for(int i = 0; i < kNumActionButtonRows*kNumActionButtonCols; i++)
+	{
+		this->mButtonArray[i]->setFgColor(r, g, b, a);
+	}
+}
+
+void AvHActionButtons::setBgColor(int r,int g,int b,int a)
+{
+	Panel::setBgColor(r, g, b, a);
+	
+	for(int i = 0; i < kNumActionButtonRows*kNumActionButtonCols; i++)
+	{
+		this->mButtonArray[i]->setBgColor(r, g, b, a);
+	}
+}
+
+void AvHActionButtons::setFont(Font* inFont)
+{
+	this->mTechFont = inFont;
+	
+	for(int i = 0; i < kNumActionButtonRows*kNumActionButtonCols; i++)
+	{
+		this->mButtonArray[i]->setFont(inFont);
+	}
+}
+
+void AvHActionButtons::setFont(Scheme::SchemeFont schemeFont)
+{
+	for(int i = 0; i < kNumActionButtonRows*kNumActionButtonCols; i++)
+	{
+		this->mButtonArray[i]->setFont(schemeFont);
+	}
+}
+
+
+void AvHActionButtons::setPos(int inX, int inY)
+{
+	Panel::setPos(inX, inY);
+	
+	// TODO: Tell every button what it's new pos is
+}
+
+void AvHActionButtons::SetButtonsToGrid()
+{
+	int theWidth, theHeight;
+	Panel::getSize(theWidth, theHeight);
+
+	int theButtonWidth = theWidth/kNumActionButtonCols;
+	int theButtonHeight = theHeight/kNumActionButtonRows;
+	
+	// Tell every button what it's new size is
+	for(int theRow = 0; theRow < kNumActionButtonRows; theRow++)
+	{
+		for(int theCol = 0; theCol < kNumActionButtonCols; theCol++)
+		{
+			int i = theCol + theRow*kNumActionButtonCols;
+			this->mButtonArray[i]->SetStaticSize(theButtonWidth, theButtonHeight);
+			//this->mButtonArray[i]->setSize(theButtonWidth, theButtonHeight);
+			this->mButtonArray[i]->setPos(theCol*theButtonWidth, theRow*theButtonHeight);
+		}
+	}
+}
+
+void AvHActionButtons::setSize(int inWidth,int inHeight)
+{
+	Panel::setSize(inWidth, inHeight);
+
+	this->SetButtonsToGrid();	
+}
+
+void AvHActionButtons::setVisible(bool inState)
+{
+	Panel::setVisible(inState);
+	
+	for(int i = 0; i < kNumActionButtonRows*kNumActionButtonCols; i++)
+	{
+		this->mButtonArray[i]->setVisible(inState);
+	}
+}
+
+void AvHActionButtons::paint()
+{
+	//	for(int i = 0; i < kNumActionButtonRows*kNumActionButtonCols; i++)
+	//	{
+	//		this->mButtonArray[i]->paint();
+	//	}
+}
+
+void AvHActionButtons::paintBackground()
+{
+	//	Color theColor;
+	//	this->getBgColor(theColor);
+	//	
+	//	int r, g, b, a;
+	//	theColor.getColor(r, g, b, a);
+	//  
+	//	a = 255 - a;
+	//
+	//	int theWidth, theHeight;
+	//	this->getSize(theWidth, theHeight);
+	//
+	//	// Draw grid, but not edges, only middle lines (not first or last)
+	//	for(int theCol = 1; theCol < kNumActionButtonCols; theCol++)
+	//	{
+	//		int theX = ((float)theCol/kNumActionButtonCols)*theWidth;
+	//		FillRGBA(theX, 0, 1, theHeight, r, g, b, a);
+	//	}
+	//	
+	//	for(int theRow = 1; theRow < kNumActionButtonRows; theRow++)
+	//	{
+	//		int theY = ((float)theRow/kNumActionButtonRows)*theHeight;
+	//		FillRGBA(0, theY, theWidth, 1, r, g, b, a);
+	//	}
+}
+
+void AvHActionButtons::SetBusy(bool inBusy)
+{
+	this->mBusy = inBusy;
+	
+	for(int i = 0; i < kNumActionButtonRows*kNumActionButtonCols; i++)
+	{
+		ActionButton* theButton = this->mButtonArray[i];
+		ASSERT(theButton);
+		theButton->SetBusy(inBusy);
+	}
+}
+
+void AvHActionButtons::SetEnabledState(int inButtonOffset, bool inEnabledState)
+{
+	if(inButtonOffset < kNumActionButtonRows*kNumActionButtonCols)
+	{
+		ActionButton* theCurrentActionButton = this->mButtonArray[inButtonOffset];
+		theCurrentActionButton->SetEnabledState(inEnabledState);
+	}
+}
+
+
+
+AvHUIActionButtons::AvHUIActionButtons(void)
+{
+    this->mType = "ActionButtons";
+}
+
+void AvHUIActionButtons::AllocateComponent(const TRDescription& inDescription)
+{
+    this->mActionButtonsComponent = new AvHActionButtons();
+}
+                            
+// Destructor automatically removes component from the engine
+AvHUIActionButtons::~AvHUIActionButtons(void)
+{
+    delete this->mActionButtonsComponent;
+    this->mActionButtonsComponent = NULL;
+}
+
+Panel* AvHUIActionButtons::GetComponentPointer(void)
+{
+    return this->mActionButtonsComponent;
+}
+
+const string& AvHUIActionButtons::GetType(void) const
+{
+    return this->mType;
+}
+
+bool AvHUIActionButtons::SetClassProperties(const TRDescription& inDesc, Panel* inComponent, CSchemeManager* inSchemeManager)
+{
+    bool theSuccess = false;
+    AvHActionButtons* theActionButtons = dynamic_cast<AvHActionButtons*>(inComponent);
+	ASSERT(theActionButtons);
+
+    // read custom attributes here
+    UIPanel::SetClassProperties(inDesc, inComponent, inSchemeManager);
+
+    // Get tech font to use
+    std::string theSchemeName;
+    if(inDesc.GetTagValue(UITagScheme, theSchemeName))
+    {
+		const char* theSchemeCString = theSchemeName.c_str();
+		SchemeHandle_t theSchemeHandle = inSchemeManager->getSchemeHandle(theSchemeCString);
+		Font* theFont = inSchemeManager->getFont(theSchemeHandle);
+		if(theFont)
+		{
+			theActionButtons->setFont(theFont);
+		}
+		
+		theSuccess = true;
+    }
+	
+    return theSuccess;
+}
+
diff --git a/main/source/mod/AvHActionButtons.h b/main/source/mod/AvHActionButtons.h
new file mode 100644
index 00000000..6364a4e7
--- /dev/null
+++ b/main/source/mod/AvHActionButtons.h
@@ -0,0 +1,151 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHActionButtons.h $
+// $Date: 2002/05/23 02:34:00 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHActionButtons.h,v $
+// Revision 1.4  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVHACTIONBUTTONS_H
+#define AVHACTIONBUTTONS_H
+
+#include "vgui_Panel.h"
+#include "ui/UIComponents.h"
+#include "mod/AvHTechNodes.h"
+#include "ui/StaticLabel.h"
+
+const int kNumActionButtonRows = 3;
+const int kNumActionButtonCols = 4;
+
+class ActionButton : public StaticLabel //public vgui::Button
+{
+public:
+						ActionButton(const char* text,int x,int y);
+	bool				GetBusy() const;
+	bool				GetMouseOver() const;
+	bool				GetCostMet() const;
+	string				GetHelpText() const;
+	bool				GetTechEnabled() const;
+	AvHMessageID		GetMessageID() const;
+	void				Localize(const AvHTechNodes& inTechNodes);
+	void				SetBusy(bool inBusy);
+	void				SetButtonIndex(int inButtonIndex);
+	void				SetEnabledState(bool inEnabledState);
+	void				SetMessageID(AvHMessageID inMessageID);
+	void				UpdateEnabledState(int inCurrentPoints, int inEnergy);
+	void				UpdateEnabledAndResearchState(const AvHTechNodes& inTechNodes);
+	
+	static bool			GetLabelForMessage(AvHMessageID inMessageID, string& outLabel);
+
+	void				cursorEntered();
+	void				cursorExited();
+	virtual void		getPos(int& x, int& y);
+	
+protected:
+	virtual void		paint();
+	virtual void		paintBackground();
+	
+private:
+	bool				mTechEnabled;
+	bool				mCostMet;
+	bool				mResearched;
+	AvHMessageID		mMessageID;
+	int					mCost;
+	string				mHelpText;
+	bool				mBusy;
+	bool				mMouseOver;
+	int					mButtonIndex;
+};
+
+class AvHActionButtons : public vgui::Panel
+{
+public:
+	static const char*	GetHotKeyAKA();
+	static bool			ButtonIndexToHotKey(int inCol, int inRow, char& outChar);
+	static bool			HotKeyToButtonIndex(char inChar, int& outCol, int& outRow);
+
+						AvHActionButtons();
+						~AvHActionButtons();
+
+	void				ClearButtons();
+	void				Localize();
+	bool				SetButton(int inButtonOffset, AvHMessageID inTechID);
+	//bool				SetResearchButton(int inButtonOffset, AvHMessageID inTechID);
+	//bool				SetTechIfOtherTechResearched(int inButtonOffset, AvHTechID inTechID, AvHTechID inResearchedTech);
+
+	int					GetNumCols() const;
+	int					GetNumRows() const;
+	ActionButton*		GetActionButtonAtPos(int inCol, int inRow);
+	
+	virtual void		addInputSignal(InputSignal* s);
+	void				setFont(Font* inFont);
+	void				setFont(Scheme::SchemeFont schemeFont);
+
+	virtual void		setFgColor(int r,int g,int b,int a);
+	virtual void		setBgColor(int r,int g,int b,int a);
+	
+	virtual void		setPos(int inX, int inY);
+	virtual void		setSize(int inWidth, int inHeight);
+	virtual void		setVisible(bool inState);
+
+	void				SetBusy(bool inBusy);
+	void				SetEnabledState(int inButtonOffset, bool inEnabledState);
+
+	void				SetTechNodes(const AvHTechNodes& inTechNodes);
+	void				SetResources(int inResources);
+	void				SetEnergy(int inEnergy);
+	void				UpdateEnabledState();
+	void				UpdateEnabledAndResearchState();
+	
+protected:
+	virtual void		paint();
+	virtual void		paintBackground();
+	void				SetButtonsToGrid();
+
+	TextImage			mTextImage;
+	Font*				mTechFont;
+	ActionButton**		mButtonArray;
+	AvHTechNodes		mTechNodes;
+	int					mResources;
+	int					mEnergy;
+	bool				mBusy;
+};
+
+
+
+
+class AvHUIActionButtons : public UIPanel
+{
+public:
+							AvHUIActionButtons(void);
+	
+	// Destructor automatically removes component from the engine
+	virtual					~AvHUIActionButtons(void);
+	
+	virtual Panel*			GetComponentPointer(void);
+	
+	virtual const string&	GetType(void) const;
+	
+	virtual bool			SetClassProperties(const TRDescription& inDescription, Panel* inComponent, CSchemeManager* inSchemeManager);
+	
+private:
+	
+	void                    AllocateComponent(const TRDescription& inDescription);
+	
+    AvHActionButtons*		mActionButtonsComponent;
+	
+    string                  mType;
+	
+};
+
+#endif
diff --git a/main/source/mod/AvHAlert.h b/main/source/mod/AvHAlert.h
new file mode 100644
index 00000000..a32a70c8
--- /dev/null
+++ b/main/source/mod/AvHAlert.h
@@ -0,0 +1,54 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile:  $
+// $Date: $
+//
+//-------------------------------------------------------------------------------
+// $Log: $
+//===============================================================================
+#ifndef AVH_ALERT_H
+#define AVH_ALERT_H
+
+#include "types.h"
+#include "mod/AvHConstants.h"
+
+// Lookup: entity index -> time of alert, type of alert
+class AvHAlert 
+{
+public:
+					AvHAlert() : mAlertType(ALERT_NONE), mEntityIndex(-1), mAlertTime(-1), mPlayedAudio(false) {}
+
+					AvHAlert(AvHAlertType inAlertType, float inTime) : mAlertType(inAlertType), mAlertTime(inTime)
+					{
+						mEntityIndex = -1;
+						mPlayedAudio = false;
+					}
+
+					AvHAlert(AvHAlertType inAlertType, float inTime, EntityInfo inEntityIndex) : mAlertType(inAlertType), mAlertTime(inTime), mEntityIndex(inEntityIndex)
+					{
+						mPlayedAudio = false;
+					}
+
+	AvHAlertType	GetAlertType() const { return this->mAlertType; }
+	EntityInfo		GetEntityIndex() const {	return this->mEntityIndex; }
+	float			GetTime() const { return this->mAlertTime; }
+	bool			GetPlayedAudio() const { return this->mPlayedAudio; }
+	void			SetPlayedAudio(bool inPlayedAudio) { this->mPlayedAudio = inPlayedAudio; }
+	
+private:
+	AvHAlertType	mAlertType;
+	EntityInfo		mEntityIndex;
+	float			mAlertTime;
+	bool			mPlayedAudio;
+};
+
+typedef	vector<AvHAlert> AlertListType;
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHAlienAbilities.cpp b/main/source/mod/AvHAlienAbilities.cpp
new file mode 100644
index 00000000..affafc6a
--- /dev/null
+++ b/main/source/mod/AvHAlienAbilities.cpp
@@ -0,0 +1,300 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHAlienAbilities.cpp $
+// $Date: 2002/11/22 21:28:15 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHAlienAbilities.cpp,v $
+// Revision 1.13  2002/11/22 21:28:15  Flayra
+// - mp_consistency changes
+//
+// Revision 1.12  2002/10/16 00:43:58  Flayra
+// - Removed blink fail event
+//
+// Revision 1.11  2002/09/23 22:06:33  Flayra
+// - Updated anims for new view model artwork
+//
+// Revision 1.10  2002/08/09 00:52:51  Flayra
+// - Speed up deploying of charge and leap, removed old hard-coded number
+//
+// Revision 1.9  2002/07/26 23:03:08  Flayra
+// - New artwork
+//
+// Revision 1.8  2002/07/23 16:54:36  Flayra
+// - Updates for new viewmodel artwork
+//
+// Revision 1.7  2002/07/08 16:42:38  Flayra
+// - Refactoring for cheat protection, moved blinking in here from separate class
+//
+// Revision 1.6  2002/06/25 17:25:56  Flayra
+// - Regular update for leap and charge
+//
+// Revision 1.5  2002/06/10 19:49:06  Flayra
+// - Updated with new alien view model artwork (with running anims)
+//
+// Revision 1.4  2002/06/03 16:20:11  Flayra
+// - Proper anims for alien abilities
+//
+// Revision 1.3  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHAlienAbilities.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHAlienAbilityConstants.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHSpecials.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/hud.h"
+#include "mod/AvHHud.h"
+extern int g_runfuncs;
+#endif
+
+LINK_ENTITY_TO_CLASS(kwLeap, AvHLeap);
+
+BOOL AvHLeap::Deploy()
+{
+	BOOL theSuccess = DefaultDeploy(kLevel1ViewModel, kLeapPModel, this->GetDeployAnimation(), this->GetAnimationExtension());
+
+	// Super-fast deploy time
+	this->m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + this->GetDeployTime();
+
+	return theSuccess;
+}
+
+AvHMessageID AvHLeap::GetAbilityImpulse() const
+{
+	return ALIEN_ABILITY_LEAP;
+}
+
+int	AvHLeap::GetBarrelLength() const
+{
+	return 0;
+}
+
+int	AvHLeap::GetDeployAnimation() const
+{
+	return 6;
+}
+
+float AvHLeap::GetDeployTime() const
+{
+	// Supa-fast!
+	return 0.0f;
+}
+
+int	AvHLeap::GetIdleAnimation() const
+{
+	// TODO: Add idle here
+	return 0;
+}
+
+int AvHLeap::GetShootAnimation() const
+{
+	return 3;
+}
+
+bool AvHLeap::GetFiresUnderwater() const
+{
+	return true;
+}
+	
+bool AvHLeap::GetIsDroppable() const
+{
+	return false;
+}
+
+void AvHLeap::Precache(void)
+{
+	AvHAlienAbilityWeapon::Precache();
+	
+	PRECACHE_UNMODIFIED_MODEL(kLevel1ViewModel);
+	PRECACHE_UNMODIFIED_MODEL(kLeapPModel);
+	
+	PRECACHE_UNMODIFIED_SOUND(kLeapSound);
+	PRECACHE_UNMODIFIED_SOUND(kLeapHitSound1);
+	PRECACHE_UNMODIFIED_SOUND(kLeapKillSound);
+	
+	this->mEvent = PRECACHE_EVENT(1, kLeapEventName);
+	this->mAbilityEvent = PRECACHE_EVENT(1, kAbilityEventName);
+}
+
+void AvHLeap::Spawn()
+{
+    AvHAlienAbilityWeapon::Spawn(); 
+	
+	Precache();
+	
+	this->m_iId = AVH_ABILITY_LEAP;
+	
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsLeap);
+
+	SET_MODEL(ENT(this->pev), kNullModel);
+	
+	FallInit();// get ready to fall down.
+}
+
+bool AvHLeap::UsesAmmo(void) const
+{
+	return false;
+}
+
+void AvHLeap::FireProjectiles(void)
+{
+#ifdef AVH_SERVER
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this->m_pPlayer);
+	if(thePlayer)
+	{
+		thePlayer->TriggerUncloak();
+	}
+#endif
+#ifdef AVH_CLIENT
+	if(g_runfuncs)
+	{
+		gHUD.SetAlienAbility(this->GetAbilityImpulse());
+	}
+#endif
+}
+
+void AvHLeap::Init()
+{
+
+}
+
+LINK_ENTITY_TO_CLASS(kwCharge, AvHCharge);
+
+BOOL AvHCharge::Deploy()
+{
+	BOOL theSuccess = DefaultDeploy(kLevel5ViewModel, kNullModel, this->GetDeployAnimation(), this->GetAnimationExtension());
+	
+	// Super-fast deploy time
+	this->m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + this->GetDeployTime();
+	
+	return theSuccess;
+}
+
+AvHMessageID AvHCharge::GetAbilityImpulse() const
+{
+	return ALIEN_ABILITY_CHARGE;
+}
+
+int	AvHCharge::GetBarrelLength() const
+{
+	return 0;
+}
+
+int	AvHCharge::GetDeployAnimation() const
+{
+	// Look at most recently used weapon and see if we can transition from it
+	int theDeployAnimation = 5;
+	
+	AvHWeaponID thePreviousID = this->GetPreviousWeaponID();
+	
+	switch(thePreviousID)
+	{
+	case AVH_WEAPON_CLAWS:
+		theDeployAnimation = 5;
+		break;
+
+	case AVH_WEAPON_DEVOUR:
+		theDeployAnimation = 18;
+		break;
+
+	case AVH_WEAPON_STOMP:
+		theDeployAnimation = 15;
+		break;
+	}
+	
+	return theDeployAnimation;
+}
+
+float AvHCharge::GetDeployTime() const
+{
+	return .6f;
+}
+
+bool AvHCharge::GetFiresUnderwater() const
+{
+	return false;
+}
+
+int AvHCharge::GetIdleAnimation() const
+{
+	return 1;
+}
+
+bool AvHCharge::GetIsDroppable() const
+{
+	return false;
+}
+
+int AvHCharge::GetShootAnimation() const
+{
+	return 22;
+}
+
+void AvHCharge::Precache(void)
+{
+	AvHAlienAbilityWeapon::Precache();
+	
+	PRECACHE_UNMODIFIED_MODEL(kLevel5ViewModel);
+	PRECACHE_UNMODIFIED_MODEL(kNullModel);
+	
+	PRECACHE_UNMODIFIED_SOUND(kChargeSound);
+	PRECACHE_UNMODIFIED_SOUND(kChargeKillSound);
+	
+	this->mEvent = PRECACHE_EVENT(1, kChargeEventName);
+	this->mAbilityEvent = PRECACHE_EVENT(1, kAbilityEventName);
+}
+
+void AvHCharge::Spawn()
+{
+    AvHAlienAbilityWeapon::Spawn(); 
+	
+	Precache();
+	
+	this->m_iId = AVH_ABILITY_CHARGE;
+
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsCharge);
+	
+	SET_MODEL(ENT(this->pev), kNullModel);
+	
+	FallInit();// get ready to fall down.
+}
+
+bool AvHCharge::UsesAmmo(void) const
+{
+	return false;
+}
+
+void AvHCharge::FireProjectiles(void)
+{
+	// Event is played back.  Mark pmove with proper flag so the alien Charges forward.
+	PLAYBACK_EVENT_FULL(0, this->m_pPlayer->edict(), this->mAbilityEvent, 0, this->m_pPlayer->pev->origin, (float *)&g_vecZero, 0.0, 0.0, this->GetAbilityImpulse(), 0, 1, 0 );
+	
+	// Send fire anim
+	//SendWeaponAnim(5);
+	this->PlaybackEvent(this->mWeaponAnimationEvent, 5);
+}
+
+void AvHCharge::Init()
+{
+}
+
+float AvHCharge::GetRateOfFire() const
+{
+	// Approximate length of charge sound
+    return 5.0f;
+}
+
diff --git a/main/source/mod/AvHAlienAbilities.h b/main/source/mod/AvHAlienAbilities.h
new file mode 100644
index 00000000..01812fbd
--- /dev/null
+++ b/main/source/mod/AvHAlienAbilities.h
@@ -0,0 +1,186 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHAlienAbilities.h $
+// $Date: 2002/09/23 22:06:33 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHAlienAbilities.h,v $
+// Revision 1.9  2002/09/23 22:06:33  Flayra
+// - Updated anims for new view model artwork
+//
+// Revision 1.8  2002/08/09 00:52:57  Flayra
+// - Speed up deploying of charge and leap, removed old hard-coded number
+//
+// Revision 1.7  2002/07/26 23:03:08  Flayra
+// - New artwork
+//
+// Revision 1.6  2002/07/08 16:42:38  Flayra
+// - Refactoring for cheat protection, moved blinking in here from separate class
+//
+// Revision 1.5  2002/06/25 17:25:56  Flayra
+// - Regular update for leap and charge
+//
+// Revision 1.4  2002/06/03 16:20:11  Flayra
+// - Proper anims for alien abilities
+//
+// Revision 1.3  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVHALIENABILITIES_H
+#define AVHALIENABILITIES_H
+
+#include "util/nowarnings.h"
+#include "dlls/weapons.h"
+#include "mod/AvHAlienWeapons.h" 
+
+class AvHAlienAbilityWeapon : public AvHAlienWeapon
+{
+public:
+	virtual AvHMessageID		GetAbilityImpulse() const = 0;
+	int							mAbilityEvent;
+};
+
+class AvHLeap : public AvHAlienAbilityWeapon 
+{ 
+public: 
+				    AvHLeap()
+				        { this->Init(); } 
+
+    virtual BOOL    Deploy();
+
+	virtual int		GetBarrelLength() const;
+
+	virtual int		GetDeployAnimation() const;
+
+	virtual float	GetDeployTime() const;
+		
+	virtual bool	GetFiresUnderwater() const;
+
+	virtual int		GetIdleAnimation() const;
+	
+	AvHMessageID	GetAbilityImpulse() const;
+	
+	virtual bool	GetIsDroppable() const;
+
+	int				GetItemInfo(ItemInfo *p) const;
+
+	virtual int		GetShootAnimation() const;
+
+	virtual int		iItemSlot(void);
+
+	virtual void	Precache(void);
+
+	virtual void	Spawn();
+
+	virtual bool	UsesAmmo(void) const;
+	virtual BOOL	GetTakesEnergy() { return FALSE; }
+
+protected: 
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+};
+
+class AvHBlinkGun : public AvHAlienAbilityWeapon
+{ 
+public: 
+	AvHBlinkGun()
+	{ this->Init(); } 
+	
+    virtual BOOL    Deploy();
+	
+	AvHMessageID	GetAbilityImpulse() const;
+	
+	virtual int		GetBarrelLength() const;
+
+    virtual float	GetRateOfFire() const;
+	
+	virtual int		GetDeployAnimation() const;
+	
+	virtual bool	GetFiresUnderwater() const;
+
+	virtual int		GetIdleAnimation() const;
+	
+	virtual bool	GetIsDroppable() const;
+	
+	int				GetItemInfo(ItemInfo *p) const;
+	
+	virtual bool	GetMustPressTriggerForEachShot() const;
+	
+	virtual int		GetShootAnimation() const;
+	
+	virtual char*	GetViewModel() const;
+	
+	virtual int		iItemSlot(void);
+	
+	virtual void	ItemPostFrame(void);
+	
+	virtual void	Precache(void);
+	
+	virtual void	Spawn();
+	
+	virtual bool	UsesAmmo(void) const;
+	virtual BOOL	GetTakesEnergy() { return FALSE; }
+protected: 
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+	
+	float			mTimeOfNextBlinkEvent;
+	
+	int				mBlinkSuccessEvent;
+};
+
+class AvHCharge : public AvHAlienAbilityWeapon 
+{ 
+public: 
+					AvHCharge()
+						{ this->Init(); } 
+	
+    virtual BOOL    Deploy();
+	
+	AvHMessageID	GetAbilityImpulse() const;
+	
+	virtual int		GetBarrelLength() const;
+	
+	virtual int		GetDeployAnimation() const;
+
+	virtual float	GetDeployTime() const;
+		
+	virtual bool	GetFiresUnderwater() const;
+	
+	virtual int		GetIdleAnimation() const;
+		
+	virtual bool	GetIsDroppable() const;
+	
+	int				GetItemInfo(ItemInfo *p) const;
+	
+	virtual int		GetShootAnimation() const;
+	
+	virtual int		iItemSlot(void);
+	
+	virtual void	Precache(void);
+	
+	virtual void	Spawn();
+	
+	virtual bool	UsesAmmo(void) const;
+    	
+    virtual float	GetRateOfFire() const;
+	
+protected: 
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+};
+
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHAlienAbilityConstants.h b/main/source/mod/AvHAlienAbilityConstants.h
new file mode 100644
index 00000000..5a7b79cf
--- /dev/null
+++ b/main/source/mod/AvHAlienAbilityConstants.h
@@ -0,0 +1,68 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHAlienAbilityConstants.h$
+// $Date: 2002/11/22 22:01:00 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHAlienAbilityConstants.h,v $
+// Revision 1.8  2002/11/22 22:01:00  Flayra
+// - Case-sensitive problem that is now an issue for linux with mp_consistency
+//
+// Revision 1.7  2002/10/16 00:45:44  Flayra
+// - Toned down leap and charge damage (is this frame-rate dependent?)
+//
+// Revision 1.6  2002/08/16 02:31:01  Flayra
+// - Big balance change: all weapons reduced by 20% damage
+//
+// Revision 1.5  2002/06/25 17:26:29  Flayra
+// - Regular update for leap and charge
+//
+// Revision 1.4  2002/06/03 16:20:35  Flayra
+// - Removed outdated v_leap.mdl (!)
+//
+// Revision 1.3  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_ALIEN_ABILITY_CONSTANTS_H
+#define AVH_ALIEN_ABILITY_CONSTANTS_H
+
+// Leap constants.
+const int		kLeapRange				= 600;
+const float		kLeapPunch				= 2.5;
+#define			kLeapSound				"weapons/leap1.wav"
+#define			kLeapHitSound1			"weapons/leaphit1.wav"
+#define			kLeapKillSound			"weapons/leapkill.wav"
+#define			kLeapEventName			"events/Leap.sc"
+#define			kLeapPModel				"models/null.mdl"
+const float		kLeapROF				= 1.5f;
+const float		kLeapDuration			= 1.0f;
+
+// Charge constants.
+const float		kChargePunch			= 2.5;
+#define			kChargeSound			"weapons/charge1.wav"
+#define			kChargeKillSound		"weapons/chargekill.wav"
+#define			kChargeEventName		"events/Charge.sc"
+const float		kChargeROF				= 5.0f;
+
+#define			kAlienSightOnSound		"misc/aliensighton.wav"
+#define			kAlienSightOffSound		"misc/aliensightoff.wav"
+
+const int		kAlienCloakRenderMode			= kRenderTransTexture;
+const int		kAlienCloakAmount				= 25;
+const int		kAlienStructureCloakAmount		= 10;
+
+const int		kAlienSelfCloakingBaseOpacity	= 130;
+
+const int		kAlienCloakViewModelRenderMode	= kRenderTransAdd;
+const int		kAlienCloakViewModelAmount		= 35;
+const int		kAlienCloakViewModelLevelAmount	= 10;
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHAlienEquipment.cpp b/main/source/mod/AvHAlienEquipment.cpp
new file mode 100644
index 00000000..18ef746c
--- /dev/null
+++ b/main/source/mod/AvHAlienEquipment.cpp
@@ -0,0 +1,679 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHAlienEquipment.cpp $
+// $Date: 2002/11/22 21:28:15 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHAlienEquipment.cpp,v $
+// Revision 1.17  2002/11/22 21:28:15  Flayra
+// - mp_consistency changes
+//
+// Revision 1.16  2002/11/15 04:47:30  Flayra
+// - Def chambers only up to three targets per tick
+//
+// Revision 1.15  2002/10/16 00:46:51  Flayra
+// - Movement chambers not useable until 3 seconds after built
+// - Moved and removed some building sounds, added one for chamber death
+// - Don't allow using movement chamber while gestating
+//
+// Revision 1.14  2002/10/03 18:31:29  Flayra
+// - Movement chambers now teleport you to the farthest hive
+//
+// Revision 1.13  2002/09/25 20:42:14  Flayra
+// - Defensive chamber performance/gameplay tweak
+//
+// Revision 1.12  2002/09/23 22:07:11  Flayra
+// - Removed alien building fading
+// - Removed bug where builders got rewarded twice for building a structure
+//
+// Revision 1.11  2002/09/09 19:47:47  Flayra
+// - Alien buildings now animate
+// - Sensory chamber no longer hurts players when touched
+//
+// Revision 1.10  2002/08/31 18:01:00  Flayra
+// - Work at VALVe
+//
+// Revision 1.9  2002/08/16 02:32:09  Flayra
+// - Added damage types
+// - Swapped umbra and bile bomb
+//
+//===============================================================================
+#include "mod/AvHAlienEquipment.h"
+#include "mod/AvHAlienEquipmentConstants.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHTeam.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHSharedUtil.h"
+#include "util/MathUtil.h"
+#include "mod/AvHAlienAbilityConstants.h"
+#include "mod/AvHAlienEquipmentConstants.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHMovementUtil.h"
+
+LINK_ENTITY_TO_CLASS(kwAlienResourceTower, AvHAlienResourceTower);
+
+AvHAlienResourceTower::AvHAlienResourceTower() : AvHResourceTower(TECH_ALIEN_RESOURCE_NODE, ALIEN_BUILD_RESOURCES, kwsAlienResourceTower)
+{
+	this->SetAverageUseSoundLength(kAverageAlienUseSoundLength);
+}
+
+int	AvHAlienResourceTower::GetSequenceForBoundingBox() const
+{
+	return 2;
+}
+
+int	AvHAlienResourceTower::GetActiveAnimation() const
+{
+	int theAnim = AvHBaseBuildable::GetActiveAnimation();
+
+	int theRandomNumber = RANDOM_LONG(0, 10);
+	if(theRandomNumber == 10)
+	{
+		theAnim = 3;
+	}
+	else if(theRandomNumber > 7)
+	{
+		theAnim	= 2;
+	}
+
+	return theAnim;
+}
+
+char* AvHAlienResourceTower::GetDeploySound() const
+{
+    return kChamberDeploySound;
+}
+
+bool AvHAlienResourceTower::GetIsOrganic() const
+{
+	return true;
+}
+
+int	AvHAlienResourceTower::GetPointValue() const
+{
+	return 3;
+}
+
+char* AvHAlienResourceTower::GetModelName() const
+{
+	return kAlienResourceTowerModel;
+}
+
+char* AvHAlienResourceTower::GetActiveSoundList() const
+{
+	char* theActiveSoundList = NULL;
+
+	// Don't play active sounds until kAlienResourceTowerSoundDelayTime seconds have passed, to prevent marines from knowing where aliens start
+	int theTimeToWaitBeforeSounds = BALANCE_IVAR(kAlienResourceTowerSoundDelayTime);
+	int theGameTime = GetGameRules()->GetGameTime();
+	if((theGameTime > 0) && (theGameTime >= theTimeToWaitBeforeSounds))
+	{
+		theActiveSoundList = kAlienResourceTowerSoundList;
+	}
+	else
+	{
+		int a = 0;
+	}
+
+	return theActiveSoundList;
+}
+
+void AvHAlienResourceTower::Killed(entvars_t* pevAttacker, int iGib)
+{
+	EMIT_SOUND(this->edict(), CHAN_AUTO, kChamberDieSound, 1.0f, ATTN_NORM);
+
+	AvHResourceTower::Killed(pevAttacker, iGib);
+}
+
+void AvHAlienResourceTower::Precache()
+{
+	AvHResourceTower::Precache();
+
+	PRECACHE_UNMODIFIED_SOUND(kChamberDieSound);
+}
+
+void AvHAlienResourceTower::AlienResourceThink()
+{
+	if(!this->GetIsBuilt())
+	{
+		this->UpdateAutoBuild(kAlienBuildingThinkInterval*kAutoBuildScalar);
+		
+		this->pev->nextthink = gpGlobals->time + kAlienBuildingThinkInterval;
+	}
+}
+
+void AvHAlienResourceTower::Materialize()
+{
+	AvHResourceTower::Materialize();
+
+	this->pev->iuser3 = AVH_USER3_ALIENRESTOWER;
+	
+	SetThink(&AvHAlienResourceTower::AlienResourceThink);
+	this->pev->nextthink = gpGlobals->time + kAlienBuildingThinkInterval;
+}
+
+
+void AvHAlienResourceTower::Spawn()
+{
+	AvHResourceTower::Spawn();
+}
+
+
+
+
+AvHAlienUpgradeBuilding::AvHAlienUpgradeBuilding(AvHMessageID inMessageID, AvHTechID inTechID, char* inClassName, AvHUser3 inUser3) : AvHBaseBuildable(inTechID, inMessageID, inClassName, inUser3)
+{
+	this->SetAverageUseSoundLength(kAverageAlienUseSoundLength);
+}
+
+bool AvHAlienUpgradeBuilding::GetIsOrganic() const
+{
+	return true;
+}
+
+int AvHAlienUpgradeBuilding::GetPointValue() const
+{
+	return BALANCE_IVAR(kScoringAlienUpgradeChamberValue);
+}
+
+void AvHAlienUpgradeBuilding::Killed(entvars_t* pevAttacker, int iGib)
+{
+	//AvHSUExplodeEntity(this, matFlesh);
+	EMIT_SOUND(this->edict(), CHAN_AUTO, kChamberDieSound, 1.0f, ATTN_NORM);
+	
+	if(this->GetIsBuilt())
+	{
+		// Get team
+		AvHTeamNumber theTeamNumber = AvHTeamNumber(this->pev->team);
+		AvHTeam* theTeam = GetGameRules()->GetTeam(theTeamNumber);
+		ASSERT(theTeam);
+		theTeam->RemoveAlienUpgradeCategory(this->GetUpgradeCategory());
+	}
+
+	AvHBaseBuildable::Killed(pevAttacker, iGib);
+}
+
+void AvHAlienUpgradeBuilding::AlienBuildingThink()
+{
+	if(!this->GetIsBuilt())
+	{
+		this->UpdateAutoBuild(kAlienBuildingThinkInterval*kAutoBuildScalar);
+		
+		this->pev->nextthink = gpGlobals->time + kAlienBuildingThinkInterval;
+	}
+	else
+	{
+		SetThink(&AvHBaseBuildable::AnimateThink);
+		this->pev->nextthink = gpGlobals->time + .1f;
+	}
+}
+
+void AvHAlienUpgradeBuilding::Precache()
+{
+	AvHBaseBuildable::Precache();
+		
+	PRECACHE_UNMODIFIED_SOUND(kChamberDieSound);
+}
+
+void AvHAlienUpgradeBuilding::Materialize()
+{
+	//Vector theMinSize, theMaxSize;
+	//if(AvHSHUGetSizeForTech(this->GetMessageID(), theMinSize, theMaxSize))
+	//{
+	//	UTIL_SetSize(this->pev, theMinSize, theMaxSize);
+	//}
+
+	AvHBaseBuildable::Materialize();
+	
+	SetThink(&AvHAlienUpgradeBuilding::AlienBuildingThink);
+	this->pev->nextthink = gpGlobals->time + kAlienBuildingThinkInterval;
+	
+	this->pev->rendermode = kRenderNormal;
+	this->pev->renderamt = 0;
+	
+	//	SET_MODEL(ENT(this->pev), this->GetModelName());
+	//	
+	//	this->pev->solid = SOLID_BBOX;
+	//	this->pev->movetype = MOVETYPE_TOSS;
+	//	
+	//	//UTIL_SetSize(pev, kResourceMinSize, kResourceMaxSize); 
+	//	
+	//    this->pev->classname = MAKE_STRING(this->GetClassName());
+	//	
+	//	this->pev->takedamage = DAMAGE_YES;
+	//	SetBits(this->pev->flags, FL_MONSTER);
+	//	
+	//	this->pev->iuser3 = AVH_USER3_BUILDABLE;
+	//	this->pev->fuser1 = 0.0f;
+	//	//this->pev->iuser4 = AVH_USER4_RESTOWER;
+	//	
+	//	// Start animating
+	//	this->pev->sequence	= 0;
+	//	this->pev->frame = 0;
+	//	ResetSequenceInfo();
+	//	AvHSUSetCollisionBoxFromSequence(this->pev);
+}
+
+void AvHAlienUpgradeBuilding::Spawn()
+{
+	AvHBaseBuildable::Spawn();
+}
+
+void AvHAlienUpgradeBuilding::SetHasBeenBuilt()
+{
+	AvHBaseBuildable::SetHasBeenBuilt();
+
+	AvHAlienUpgradeCategory theCategory = this->GetUpgradeCategory();
+	
+	// Find the team associated with the building
+	AvHTeamNumber theTeamNumber = AvHTeamNumber(this->pev->team);
+	AvHTeam* theTeam = GetGameRules()->GetTeam(theTeamNumber);
+	ASSERT(theTeam);
+	theTeam->AddTeamUpgrade(theCategory);
+
+	//this->SetHasBeenBuilt();
+	
+	//this->pev->rendermode = kRenderNormal;
+	//this->pev->renderamt = 0;
+}
+	
+
+//LINK_ENTITY_TO_CLASS(kwOffenseChamber, AvHOffenseChamber);
+//AvHOffenseChamber::AvHOffenseChamber() : AvHAlienUpgradeBuilding(ALIEN_BUILD_OFFENSE_CHAMBER, kwsOffenseChamber)
+//{
+//}
+//
+//char* AvHOffenseChamber::GetDeploySound() const
+//{
+//	return kChamberDeploySound;
+//}
+//
+//char* AvHOffenseChamber::GetModelName() const
+//{
+//	return kOffenseChamberModel;
+//}
+//
+//
+//
+//AvHAlienUpgradeCategory	AvHOffenseChamber::GetUpgradeCategory() const
+//{
+//	return ALIEN_UPGRADE_CATEGORY_OFFENSE;
+//}
+
+//LINK_ENTITY_TO_CLASS(kwOffenseChamber, AvHOffenseChamber);
+//AvHOffenseChamber::AvHOffenseChamber() : AvHTurret(TECH_NULL, ALIEN_BUILD_OFFENSE_CHAMBER, kwsOffenseChamber, AVH_USER3_NONE)
+//{
+//}
+//
+//char* AvHOffenseChamber::GetActiveSound() const
+//{
+//	return NULL;
+//}
+//
+//char* AvHOffenseChamber::GetAlertSound() const
+//{
+//	return NULL;
+//}
+//
+//char* AvHOffenseChamber::GetPingSound() const
+//{
+//	return NULL;
+//}
+
+//int	AvHOffenseChamber::GetActiveAnimation() const;
+//int	AvHOffenseChamber::GetDeployAnimation() const;
+//int	AvHOffenseChamber::GetIdle1Animation() const;
+//int	AvHOffenseChamber::GetIdle2Animation() const;
+//int	AvHOffenseChamber::GetKilledAnimation() const;
+//int	AvHOffenseChamber::GetSpawnAnimation() const;
+//int	AvHOffenseChamber::GetTakeDamageAnimation() const;
+//bool AvHOffenseChamber::GetIsValidTarget(CBaseEntity* inEntity) const;
+//int	AvHOffenseChamber::IRelationship(CBaseEntity* inTarget);
+	
+//int	AvHOffenseChamber::GetRange() const
+//{
+//	return 100;
+//}
+//
+//void AvHOffenseChamber::Shoot(Vector &vecSrc, Vector &vecDirToEnemy)
+//{
+//}
+//
+//void AvHOffenseChamber::Spawn()
+//{
+//	AvHTurret::Spawn();
+//
+//	// TODO: Set any other variables?
+//}
+
+LINK_ENTITY_TO_CLASS(kwDefenseChamber, AvHDefenseChamber);
+AvHDefenseChamber::AvHDefenseChamber() : AvHAlienUpgradeBuilding(ALIEN_BUILD_DEFENSE_CHAMBER, TECH_DEFENSE_CHAMBER, kwsDefenseChamber, AVH_USER3_DEFENSE_CHAMBER)
+{
+}
+
+char* AvHDefenseChamber::GetDeploySound() const
+{
+	return kChamberDeploySound;
+}
+
+char* AvHDefenseChamber::GetModelName() const
+{
+	return kDefenseChamberModel;
+}
+
+void AvHDefenseChamber::SetHasBeenBuilt()
+{
+	AvHAlienUpgradeBuilding::SetHasBeenBuilt();
+	
+	SetThink(&AvHDefenseChamber::RegenAliensThink);
+	this->pev->nextthink = gpGlobals->time + BALANCE_IVAR(kDefenseChamberThinkInterval);
+}
+
+void AvHDefenseChamber::RegenAliensThink()
+{
+	// Loop through all players
+	CBaseEntity* theBaseEntity = NULL;
+	int theNumEntsHealed = 0;
+	
+	while(((theBaseEntity = UTIL_FindEntityInSphere(theBaseEntity, this->pev->origin, BALANCE_IVAR(kDefensiveChamberHealRange))) != NULL) && (theNumEntsHealed < BALANCE_IVAR(kAlienChamberMaxPlayers)))
+	{
+		if(theBaseEntity->pev->team == this->pev->team)
+		{
+			AvHBaseBuildable* theBuildable = dynamic_cast<AvHBaseBuildable*>(theBaseEntity);
+			AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theBaseEntity);
+			if(thePlayer && thePlayer->IsAlive())
+			{
+				if(thePlayer->Heal(BALANCE_IVAR(kDefensiveChamberRegenAmount)))
+				{
+					theNumEntsHealed++;
+				}
+			}
+			else if(theBuildable && theBuildable->GetIsBuilt() && (theBuildable != this))
+			{
+				if(theBuildable->Regenerate(BALANCE_IVAR(kDefensiveChamberRegenAmount)))
+				{
+					theNumEntsHealed++;
+				}
+			}
+		}
+	}
+	
+	// Set next think
+	this->pev->nextthink = gpGlobals->time + BALANCE_IVAR(kDefenseChamberThinkInterval);
+	
+	// Play a random idle animation
+	int theIdle = this->GetIdle1Animation();
+	
+	if(RANDOM_LONG(0, 1))
+	{
+		theIdle = this->GetIdle2Animation();
+	}
+	
+	this->PlayAnimationAtIndex(theIdle);
+}
+
+
+AvHAlienUpgradeCategory	AvHDefenseChamber::GetUpgradeCategory() const
+{
+	return ALIEN_UPGRADE_CATEGORY_DEFENSE;
+}
+
+
+
+
+LINK_ENTITY_TO_CLASS(kwSensoryChamber, AvHSensoryChamber);
+AvHSensoryChamber::AvHSensoryChamber() : AvHAlienUpgradeBuilding(ALIEN_BUILD_SENSORY_CHAMBER, TECH_SENSORY_CHAMBER, kwsSensoryChamber, AVH_USER3_SENSORY_CHAMBER)
+{
+}
+	
+char* AvHSensoryChamber::GetDeploySound() const
+{
+	return kChamberDeploySound;
+}
+
+bool AvHSensoryChamber::GetIsEntityInSight(CBaseEntity* inEntity)
+{
+	bool theEntityIsInSight = false;
+
+	// Do a traceline from sensory chamber to entity
+	TraceResult tr;
+	UTIL_TraceLine(this->pev->origin, inEntity->pev->origin, ignore_monsters, dont_ignore_glass, this->edict(), &tr);
+	if(tr.flFraction == 1.0f)
+	{
+		theEntityIsInSight = true;
+	}
+
+	return theEntityIsInSight;
+}
+
+char* AvHSensoryChamber::GetModelName() const
+{
+	return kSensoryChamberModel;
+}
+
+
+
+AvHAlienUpgradeCategory	AvHSensoryChamber::GetUpgradeCategory() const
+{
+	return ALIEN_UPGRADE_CATEGORY_SENSORY;
+}
+
+void AvHSensoryChamber::Precache()
+{
+	AvHAlienUpgradeBuilding::Precache();
+
+	//PRECACHE_UNMODIFIED_SOUND(kParasiteHitSound);
+}
+
+void AvHSensoryChamber::SetHasBeenBuilt()
+{
+	AvHAlienUpgradeBuilding::SetHasBeenBuilt();
+}
+
+
+
+
+
+LINK_ENTITY_TO_CLASS(kwMovementChamber, AvHMovementChamber);
+AvHMovementChamber::AvHMovementChamber() : AvHAlienUpgradeBuilding(ALIEN_BUILD_MOVEMENT_CHAMBER, TECH_MOVEMENT_CHAMBER, kwsMovementChamber, AVH_USER3_MOVEMENT_CHAMBER)
+{
+	this->mLastTimeScannedHives = -1;
+	this->mTeleportHiveIndex = -1;
+}
+
+char* AvHMovementChamber::GetDeploySound() const
+{
+	return kChamberDeploySound;
+}
+
+char* AvHMovementChamber::GetModelName() const
+{
+	return kMovementChamberModel;
+}
+
+void AvHMovementChamber::ResetEntity()
+{
+	AvHAlienUpgradeBuilding::ResetEntity();
+
+	this->mLastTimeScannedHives = -1;
+	this->mTeleportHiveIndex = -1;
+}
+
+
+AvHAlienUpgradeCategory	AvHMovementChamber::GetUpgradeCategory() const
+{
+	return ALIEN_UPGRADE_CATEGORY_MOVEMENT;
+}
+
+void AvHMovementChamber::Precache()
+{
+	AvHAlienUpgradeBuilding::Precache();
+
+	PRECACHE_UNMODIFIED_SOUND(kAlienSightOffSound);
+	PRECACHE_UNMODIFIED_SOUND(kAlienSightOnSound);
+	PRECACHE_UNMODIFIED_SOUND(kAlienEnergySound);
+}
+
+void AvHMovementChamber::SetHasBeenBuilt()
+{
+	AvHAlienUpgradeBuilding::SetHasBeenBuilt();
+	
+	// TODO: Include a "warm-up" time so movement chambers don't teleport the builder immediately
+	//SetThink(&AvHMovementChamber::TeleportUseThink);
+
+	SetThink(&AvHMovementChamber::EnergyAliensThink);
+	this->pev->nextthink = gpGlobals->time + BALANCE_IVAR(kMovementChamberThinkInterval);
+}
+
+void AvHMovementChamber::EnergyAliensThink()
+{
+	// Don't teleport until it's "warmed up"
+	SetUse(&AvHMovementChamber::TeleportUse);
+
+	// Loop through all players
+	CBaseEntity* theBaseEntity = NULL;
+	int theNumEntsProcessed = 0;
+	
+	while(((theBaseEntity = UTIL_FindEntityInSphere(theBaseEntity, this->pev->origin, BALANCE_IVAR(kMovementChamberEnergyRange))) != NULL) && (theNumEntsProcessed < BALANCE_IVAR(kAlienChamberMaxPlayers)))
+	{
+		if(theBaseEntity->pev->team == this->pev->team)
+		{
+			float theEnergizeAmount = BALANCE_FVAR(kMovementChamberEnergyAmount);
+			AvHBaseBuildable* theBuildable = dynamic_cast<AvHBaseBuildable*>(theBaseEntity);
+			AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theBaseEntity);
+			if(thePlayer && thePlayer->IsAlive())
+			{
+				if(thePlayer->Energize(theEnergizeAmount))
+				{
+					theNumEntsProcessed++;
+				}
+			}
+			// Energize alien buildables
+//			else if(theBuildable)
+//			{
+//				if(theBuildable->Energize(theEnergizeAmount))
+//				{
+//					theNumEntsProcessed++;
+//				}
+//			}
+		}
+	}
+
+	// Play an animation (spin the arms if energizing)
+	int theIdle = this->GetIdle2Animation();
+
+	// Play sound
+	if(theNumEntsProcessed > 0)
+	{
+		EMIT_SOUND(this->edict(), CHAN_AUTO, kAlienEnergySound, 1.0f, ATTN_NORM);
+
+		theIdle = this->GetIdle1Animation();
+	}
+
+	this->PlayAnimationAtIndex(theIdle);
+	
+	// Set next think
+	this->pev->nextthink = gpGlobals->time + BALANCE_IVAR(kMovementChamberThinkInterval);
+}
+
+
+
+void AvHMovementChamber::TeleportUse(CBaseEntity* inActivator, CBaseEntity* inCaller, USE_TYPE inUseType, float inValue)
+{
+	const float kHiveScanInterval = 1.0f;
+
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inActivator);
+	if(thePlayer && (thePlayer->pev->team == this->pev->team) && (thePlayer->GetUser3() != AVH_USER3_ALIEN_EMBRYO))
+	{
+		if((this->mLastTimeScannedHives == -1) || (gpGlobals->time > (this->mLastTimeScannedHives + kHiveScanInterval)))
+		{
+			this->mTeleportHiveIndex = -1;
+			float theFarthestDistance = 0.0f; //sqrt((kMaxMapDimension*2)*(kMaxMapDimension*2));
+			bool theIsDone = false;
+		
+			// Loop through the hives for this team, look for the farthest one (hives under attack take precedence)
+			FOR_ALL_ENTITIES(kesTeamHive, AvHHive*)
+				if((theEntity->pev->team == this->pev->team) && !theIsDone)
+				{
+					bool theHiveIsUnderAttack = GetGameRules()->GetIsEntityUnderAttack(theEntity->entindex());
+
+					if(theEntity->GetIsActive() || theHiveIsUnderAttack)
+					{
+						float theCurrentDistance = VectorDistance(theEntity->pev->origin, inActivator->pev->origin);
+						bool theHiveIsFarther = (theCurrentDistance > theFarthestDistance);
+
+						// Undefined which attacked hive is chosen if multiples are under attack
+						if((this->mTeleportHiveIndex == -1) || theHiveIsFarther || theHiveIsUnderAttack)
+						{
+							this->mTeleportHiveIndex = theEntity->entindex();
+							theFarthestDistance = theCurrentDistance;
+
+							// If there's a hive under attack, we're done
+							if(theHiveIsUnderAttack)
+							{
+								theIsDone = true;
+							}
+						}
+					}
+				}
+			END_FOR_ALL_ENTITIES(kesTeamHive)
+		
+			this->mLastTimeScannedHives = gpGlobals->time;
+		}
+		
+		// If we have a valid hive index, jump the player to it
+		if(this->mTeleportHiveIndex != -1)
+		{
+			// Play sound at this entity
+			EMIT_SOUND(this->edict(), CHAN_AUTO, kAlienSightOnSound, 1.0f, ATTN_NORM);
+		
+			// Move him to it!
+			AvHHive* theHive = NULL;
+			AvHSUGetEntityFromIndex(this->mTeleportHiveIndex, theHive);
+			if(theHive)
+			{
+				CBaseEntity* theSpawnEntity = GetGameRules()->GetRandomHiveSpawnPoint(thePlayer, theHive->pev->origin, theHive->GetMaxSpawnDistance());
+				if(theSpawnEntity)
+				{
+					Vector theMinSize;
+					Vector theMaxSize;
+					thePlayer->GetSize(theMinSize, theMaxSize);
+
+					int theOffset = AvHMUGetOriginOffsetForUser3(AvHUser3(thePlayer->pev->iuser3));
+					Vector theOriginToSpawn = theSpawnEntity->pev->origin;
+					theOriginToSpawn.z += theOffset;
+
+					if(AvHSUGetIsEnoughRoomForHull(theOriginToSpawn, AvHMUGetHull(false, thePlayer->pev->iuser3), thePlayer->edict()))
+					{
+						thePlayer->SetPosition(theOriginToSpawn);
+						thePlayer->pev->velocity = Vector(0, 0, 0);
+
+						// Play teleport sound before and after
+						EMIT_SOUND(inActivator->edict(), CHAN_AUTO, kAlienSightOffSound, 1.0f, ATTN_NORM);
+					}
+				}
+			}
+		}
+	}
+}
+
+void AvHMovementChamber::TeleportUseThink()
+{
+	// Set our new use, don't set next think
+	SetUse(&AvHMovementChamber::TeleportUse);
+
+	// Start animating
+	SetThink(&AvHBaseBuildable::AnimateThink);
+	this->pev->nextthink = gpGlobals->time + .1f;
+}
+
+
+
diff --git a/main/source/mod/AvHAlienEquipment.h b/main/source/mod/AvHAlienEquipment.h
new file mode 100644
index 00000000..11247c3a
--- /dev/null
+++ b/main/source/mod/AvHAlienEquipment.h
@@ -0,0 +1,202 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHAlienEquipment.h $
+// $Date: 2002/10/16 00:46:51 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHAlienEquipment.h,v $
+// Revision 1.13  2002/10/16 00:46:51  Flayra
+// - Movement chambers not useable until 3 seconds after built
+// - Moved and removed some building sounds, added one for chamber death
+// - Don't allow using movement chamber while gestating
+//
+// Revision 1.12  2002/09/09 19:47:47  Flayra
+// - Alien buildings now animate
+// - Sensory chamber no longer hurts players when touched
+//
+// Revision 1.11  2002/08/31 18:01:00  Flayra
+// - Work at VALVe
+//
+// Revision 1.10  2002/08/16 02:32:09  Flayra
+// - Added damage types
+// - Swapped umbra and bile bomb
+//
+// Revision 1.9  2002/07/25 16:57:59  flayra
+// - Linux changes
+//
+// Revision 1.8  2002/07/23 16:55:36  Flayra
+// - Alien buildings now have an iuser3 type (used for "resource tower is under attack")
+//
+// Revision 1.7  2002/07/01 21:13:03  Flayra
+// - Added auto-build to all alien buildings, added new parasiting ability to sensory chambers
+//
+// Revision 1.6  2002/06/03 16:22:45  Flayra
+// - Movement chamber needs to be used to teleport, get points for building resource tower, defense chambers heal buildables too, improved sensory chamber (still has problems though), removed duplicate hive classname
+//
+// Revision 1.5  2002/05/28 17:11:39  Flayra
+// - Added new turret instead of old offensive upgrades chamber, added secondary functions
+//
+// Revision 1.4  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_ALIEN_EQUIPMENT_H
+#define AVH_ALIEN_EQUIPMENT_H
+
+#include "util/nowarnings.h"
+#include "dlls/weapons.h"
+#include "mod/AvHBasePlayerWeapon.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHEntities.h"
+#include "mod/AvHBuildable.h"
+#include "mod/AvHEntities.h"
+#include "mod/AvHTurret.h"
+
+class AvHAlienResourceTower : public AvHResourceTower
+{
+public:
+					AvHAlienResourceTower();
+
+	virtual int		GetActiveAnimation() const;
+
+	virtual char*	GetDeploySound() const;
+
+	virtual bool	GetIsOrganic() const;
+	
+	virtual int		GetPointValue() const;
+
+	virtual char*	GetModelName() const;
+
+	virtual int		GetSequenceForBoundingBox() const;
+
+	char*			GetActiveSoundList() const;
+
+	void			Killed(entvars_t* pevAttacker, int iGib);
+
+	virtual void	Materialize();
+
+	void			Precache();
+
+	virtual void	Spawn();
+
+private:
+	void EXPORT		AlienResourceThink();
+	
+};
+
+class AvHAlienUpgradeBuilding : public AvHBaseBuildable
+{
+public:
+					AvHAlienUpgradeBuilding(AvHMessageID inMessageID, AvHTechID inTechID, char* inClassName, AvHUser3 inUser3);
+
+	virtual char*	GetDeploySound() const = 0;
+
+	virtual bool	GetIsOrganic() const;
+
+	virtual int		GetPointValue() const;
+	
+	virtual AvHAlienUpgradeCategory	GetUpgradeCategory() const = 0;
+
+	virtual void	Killed(entvars_t* pevAttacker, int iGib);
+
+	virtual void	Materialize();
+
+	virtual void	Precache();
+
+	virtual void	SetHasBeenBuilt();
+	
+	virtual void	Spawn();
+
+private:
+	void EXPORT		AlienBuildingThink();
+
+};
+
+//class AvHOffenseChamber : public AvHTurret
+//{
+//public:
+//					AvHOffenseChamber();
+//
+//	virtual char*	GetActiveSound() const;
+//	virtual char*	GetAlertSound() const;
+//	virtual char*	GetPingSound() const;
+//
+//	virtual int		GetRange() const;
+//
+//	virtual void	Precache();
+//
+//	virtual void	Spawn();
+//};
+
+class AvHDefenseChamber : public AvHAlienUpgradeBuilding
+{
+public:
+					AvHDefenseChamber();
+
+	virtual char*	GetDeploySound() const;
+	
+	virtual char*	GetModelName() const;
+
+	void EXPORT		RegenAliensThink();
+
+	virtual void	SetHasBeenBuilt();
+
+	virtual AvHAlienUpgradeCategory	GetUpgradeCategory() const;
+};
+
+class AvHSensoryChamber : public AvHAlienUpgradeBuilding
+{
+public:
+					AvHSensoryChamber();
+
+	virtual char*	GetDeploySound() const;
+	
+	bool			GetIsEntityInSight(CBaseEntity* inEntity);
+
+	virtual char*	GetModelName() const;
+	
+	virtual AvHAlienUpgradeCategory	GetUpgradeCategory() const;
+
+	virtual void	Precache();
+
+	virtual void	SetHasBeenBuilt();
+
+};
+
+class AvHMovementChamber : public AvHAlienUpgradeBuilding
+{
+public:
+					AvHMovementChamber();
+
+	virtual char*	GetDeploySound() const;
+	
+	virtual char*	GetModelName() const;
+
+	virtual void	Precache();
+
+	virtual void	ResetEntity();
+
+	virtual void	SetHasBeenBuilt();
+
+	void EXPORT		EnergyAliensThink();
+
+	void EXPORT		TeleportUse(CBaseEntity* inActivator, CBaseEntity* inCaller, USE_TYPE inUseType, float inValue);
+
+	void EXPORT		TeleportUseThink();
+
+	virtual AvHAlienUpgradeCategory	GetUpgradeCategory() const;
+
+private:
+	float			mLastTimeScannedHives;
+	int				mTeleportHiveIndex;
+};
+
+
+#endif
diff --git a/main/source/mod/AvHAlienEquipmentConstants.h b/main/source/mod/AvHAlienEquipmentConstants.h
new file mode 100644
index 00000000..f11f7ff0
--- /dev/null
+++ b/main/source/mod/AvHAlienEquipmentConstants.h
@@ -0,0 +1,130 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHAlienEquipmentConstants.h$
+// $Date: 2002/11/12 02:21:19 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHAlienEquipmentConstants.h,v $
+// Revision 1.19  2002/11/12 02:21:19  Flayra
+// - Removed ancient egg class name
+//
+// Revision 1.18  2002/10/16 00:47:16  Flayra
+// - Moved and removed some building sounds, added one for chamber death
+//
+// Revision 1.17  2002/09/23 22:07:30  Flayra
+// - Updated to reflect 2D nature of sensory chamber detection
+//
+// Revision 1.16  2002/09/09 19:48:05  Flayra
+// - Regular update
+// - Sensory chambers detect enemies in range
+//
+// Revision 1.15  2002/08/31 18:01:00  Flayra
+// - Work at VALVe
+//
+// Revision 1.14  2002/08/16 02:31:40  Flayra
+// - Big balance change: all weapons reduced by 20% damage
+//
+// Revision 1.13  2002/08/02 21:57:53  Flayra
+// - Increased alien turret speed
+//
+// Revision 1.12  2002/07/28 19:21:28  Flayra
+// - Balance changes after/during RC4a
+//
+// Revision 1.11  2002/07/23 16:57:05  Flayra
+// - Alien turret refactoring and fixing (the view offset in spawn() was causing them to always miss crouched players)
+//
+// Revision 1.10  2002/07/01 21:13:25  Flayra
+// - Regular update
+//
+// Revision 1.9  2002/06/25 17:30:01  Flayra
+// - Regular update
+//
+// Revision 1.8  2002/06/03 16:23:34  Flayra
+// - Moved chamber firing into an event, added turret constants
+//
+// Revision 1.7  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef ALIEN_EQUIPMENT_CONSTANTS_H
+#define ALIEN_EQUIPMENT_CONSTANTS_H
+
+#define			kPrimalScreamResponseSound	"player/primalscreaming.wav"
+
+#define			kEggDestroyedSound		"misc/egg_die.wav"
+#define			kEggIdleSound			"misc/egg_idle.wav"
+#define			kEggModel				"models/egg.mdl"
+const int		kEggHitPoints =			200;
+
+const int		kWebHitPoints =			20;
+const int		kMaxWebDistance =		600;
+const float		kWebThinkInterval =		.1f;
+#define			kWebStrandSprite		"sprites/webstrand.spr"
+const int		kWebStrandWidth =		60;
+const int		kWebStrandLifetime =	50;
+#define			kWebStrandBreakSound	"misc/web_break.wav"
+
+#define			kAlienResourceTowerModel			"models/ba_resource.mdl"
+
+// Hive stuff
+#define			kHiveModel					"models/hive.mdl"
+#define			kHiveSpawnSound				"misc/hive_spawn.wav"
+#define			kHiveAmbientSound			"misc/hive_ambient.wav"
+#define			kHiveDeathSound				"misc/hive_death.wav"
+
+// Movement chamber energize
+#define			kAlienEnergySound			"misc/energy.wav"
+
+// Doesn't jitter but a bit too tall
+//#define			kHiveMinSize				Vector(-80, -80, -135)
+//#define			kHiveMaxSize				Vector(80, 80, 50)
+#define			kHiveMinSize				Vector(-80, -80, -145)
+#define			kHiveMaxSize				Vector(80, 80, 50)
+
+#define			kAlienResourceTowerSoundList		"misc/a_resource_idle"
+const float		kAverageAlienUseSoundLength			= 1.1f;
+
+#define			kwsAlienResourceTower				"alienresourcetower"
+#define			kwAlienResourceTower				alienresourcetower
+
+#define			kwsOffenseChamber					"offensechamber"
+#define			kwOffenseChamber					offensechamber
+
+#define			kwsDefenseChamber					"defensechamber"
+#define			kwDefenseChamber					defensechamber
+
+#define			kwsSensoryChamber					"sensorychamber"
+#define			kwSensoryChamber					sensorychamber
+
+#define			kwsMovementChamber					"movementchamber"
+#define			kwMovementChamber					movementchamber
+
+#define			kChamberDeploySound					"misc/alien_chamber_deploy.wav"
+#define			kChamberDieSound					"misc/alien_chamber_die.wav"
+
+#define			kSpikeProjectileClassName			"spikeprojectile"
+#define			kSpikeLifetime						10
+
+#define			kOffenseChamberModel				"models/ba_offense.mdl"
+#define			kDefenseChamberModel				"models/ba_defense.mdl"
+#define			kSensoryChamberModel				"models/ba_sensory.mdl"
+#define			kMovementChamberModel				"models/ba_movement.mdl"
+
+#define			kOffenseChamberEventName			"events/OffenseChamber.sc"
+#define			kOffenseChamberSpikeVelocity		1500
+
+#define			kAlienTurretFire1					"turret/aturret-1.wav"
+#define			kAlienTurretDeploy					"misc/alien_chamber_deploy.wav"
+#define			kAlienTurretProjectileVelocity		3000
+#define			kAlienTurretSprite					"sprites/bigspit.spr"
+const float		kAlienBuildingThinkInterval			= .5f;
+const float		kAutoBuildScalar					= .2f;
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHAlienTurret.cpp b/main/source/mod/AvHAlienTurret.cpp
new file mode 100644
index 00000000..54018652
--- /dev/null
+++ b/main/source/mod/AvHAlienTurret.cpp
@@ -0,0 +1,411 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHAlienTurret.cpp $
+// $Date: 2002/11/22 21:28:15 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHAlienTurret.cpp,v $
+// Revision 1.8  2002/11/22 21:28:15  Flayra
+// - mp_consistency changes
+//
+// Revision 1.7  2002/10/24 21:20:49  Flayra
+// - Alien turrets now credit their owner with kills
+//
+// Revision 1.6  2002/09/23 22:08:14  Flayra
+// - Removed damage upgrades for alien turrets (used to be needed for offensive upgrades)
+//
+// Revision 1.5  2002/07/24 18:45:40  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.4  2002/07/23 16:57:05  Flayra
+// - Alien turret refactoring and fixing (the view offset in spawn() was causing them to always miss crouched players)
+//
+// Revision 1.3  2002/07/01 21:14:21  Flayra
+// - Added auto-building, added damage upgrade (from primal scream), added vertical FOV (doesn't work yet)
+//
+// Revision 1.2  2002/06/03 16:24:08  Flayra
+// - Moved chamber firing into an event, added turret constants
+//
+// Revision 1.1  2002/05/28 17:12:17  Flayra
+// - Offensive chamber that shoots spit
+//
+//===============================================================================
+#include "mod/AvHAlienTurret.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHAlienEquipmentConstants.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHAlienWeapons.h"
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHGamerules.h"
+#include "util/MathUtil.h"
+
+// Temporary
+#include "mod/AvHMarineTurret.h"
+#include "mod/AvHMarineEquipment.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+
+
+
+LINK_ENTITY_TO_CLASS(kwOffenseChamber, AvHAlienTurret);
+
+#ifdef AVH_SERVER
+
+LINK_ENTITY_TO_CLASS(kwSpikeProjectile, AvHSpike);
+
+void AvHSpike::Precache(void)
+{
+	CBaseEntity::Precache();
+	
+	PRECACHE_UNMODIFIED_MODEL(kSpikeProjectileModel);
+}
+
+void AvHSpike::SetDamage(float inDamage)
+{
+	this->mDamage = inDamage;
+}
+
+void AvHSpike::Spawn()
+{
+	this->Precache();
+	CBaseEntity::Spawn();
+	
+	this->pev->movetype = MOVETYPE_FLY;
+	this->pev->classname = MAKE_STRING(kSpikeProjectileClassName);
+	
+	SET_MODEL(ENT(this->pev), kSpikeProjectileModel);
+	this->pev->solid = SOLID_BBOX;
+	this->mDamage = 0.0f;
+	
+	// Comment out effects line, uncomment next four, then comment out creation of temp entity in EV_SpikeGun to see server side Spike for testing
+	if(!GetGameRules()->GetDrawInvisibleEntities())
+	{
+		this->pev->effects = EF_NODRAW;
+	}
+	else
+	{
+		this->pev->frame = 0;
+		this->pev->scale = 0.5;
+		this->pev->rendermode = kRenderTransAlpha;
+		this->pev->renderamt = 255;
+	}
+	
+	//UTIL_SetSize(this->pev, Vector( 0, 0, 0), Vector(0, 0, 0));
+//	UTIL_SetSize(this->pev, Vector( -16, -16, -16), Vector(16, 16, 16));
+	//UTIL_SetSize(this->pev, Vector( -50, -50, -50), Vector(50, 50, 50));
+	
+	SetTouch(&AvHSpike::SpikeTouch);
+	
+	// Enforce short range
+	SetThink(&AvHSpike::SpikeDeath);
+	this->pev->nextthink = gpGlobals->time + kSpikeLifetime;
+}
+
+void AvHSpike::SpikeDeath()
+{
+	// Kill the Spike entity
+	UTIL_Remove(this);
+	
+	//	SetThink(SUB_Remove);
+	//	this->pev->nextthink = gpGlobals->time + 0.01f;
+}
+
+void AvHSpike::SpikeTouch(CBaseEntity* pOther)
+{
+	CBaseEntity* theSpikeOwner = CBaseEntity::Instance(this->pev->owner);
+	if((pOther != theSpikeOwner) && (theSpikeOwner != NULL))
+	{
+		float theScalar = 1.0f;
+		if(GetGameRules()->CanEntityDoDamageTo(this, pOther, &theScalar))
+		{
+			float theDamage = this->mDamage*theScalar;
+
+			// Give credit to the spike owner's owner (spike's owner is OC, OC's owner is player)
+			CBaseEntity* theSpikeOwnerOwner = NULL;
+			entvars_t* theSpikeOwnerOwnerEntVars = NULL;
+			if(theSpikeOwner)
+			{
+				AvHTurret* theTurret = dynamic_cast<AvHTurret*>(theSpikeOwner);
+				if(theTurret)
+				{
+					theSpikeOwnerOwner = theTurret->GetAttacker();
+				}
+			}
+
+			if(!theSpikeOwnerOwner)
+			{
+				theSpikeOwnerOwner = theSpikeOwner;
+			}
+
+			if(theSpikeOwnerOwner)
+			{
+				theSpikeOwnerOwnerEntVars = theSpikeOwnerOwner->pev;
+			}
+
+			// Apply damage to receiver
+			pOther->TakeDamage(theSpikeOwner->pev, theSpikeOwnerOwnerEntVars, theDamage, NS_DMG_LIGHT);
+		}
+		
+		// Kill it off
+		this->SpikeDeath();
+	}
+}
+#endif
+
+
+AvHAlienTurret::AvHAlienTurret() : AvHTurret(TECH_OFFENSE_CHAMBER, ALIEN_BUILD_OFFENSE_CHAMBER, kwsOffenseChamber, AVH_USER3_OFFENSE_CHAMBER)
+{
+}
+
+AvHAlienTurret::AvHAlienTurret(AvHTechID inTechID, AvHMessageID inMessageID, char* inClassName, int inUser3) : AvHTurret(inTechID, inMessageID, inClassName, inUser3)
+{
+}
+
+// Energy from movement chambers subtracts off the rate of fire
+bool AvHAlienTurret::Energize(float inEnergyAmount)
+{
+	bool theSuccess = false;
+
+	if(this->GetIsBuilt() && (this->mEnergy < 1.0f))
+	{
+		if(this->m_hEnemy != NULL)
+		{
+			this->mEnergy = max(0.0f, min(1.0f, this->mEnergy + inEnergyAmount));
+			theSuccess = true;
+		}
+	}
+
+	return theSuccess;
+}
+
+char* AvHAlienTurret::GetDeploySound() const
+{
+	return kAlienTurretDeploy;
+}
+
+bool AvHAlienTurret::GetIsOrganic() const
+{
+	return true;
+}
+
+int AvHAlienTurret::GetPointValue(void) const
+{
+	return 2;
+}
+
+int	AvHAlienTurret::GetXYRange() const
+{
+	return 700;
+}
+
+void AvHAlienTurret::Precache()
+{
+	PRECACHE_UNMODIFIED_MODEL(kOffenseChamberModel);
+	PRECACHE_UNMODIFIED_MODEL(kSpikeProjectileModel);
+	PRECACHE_UNMODIFIED_SOUND(kAlienTurretFire1);
+	PRECACHE_UNMODIFIED_SOUND(kAlienTurretDeploy);
+	PRECACHE_UNMODIFIED_MODEL(kAlienTurretSprite);
+	this->mEvent = PRECACHE_EVENT(1, kOffenseChamberEventName);
+}
+
+int	AvHAlienTurret::GetVerticalFOV() const
+{
+	return AvHTurret::GetVerticalFOV();
+}
+
+void AvHAlienTurret::PreBuiltThink()
+{
+	if(!this->GetIsBuilt())
+		this->UpdateAutoBuild(kAlienBuildingThinkInterval*kAutoBuildScalar);
+	else
+		this->SetHasBeenBuilt();
+
+	this->pev->nextthink = gpGlobals->time + kAlienBuildingThinkInterval;
+}
+
+
+void AvHAlienTurret::Shoot(const Vector &inOrigin, const Vector &inToEnemy, const Vector& inVecEnemyVelocity)
+{
+	// Spawn spike
+	AvHSpike* theSpike = GetClassPtr((AvHSpike*)NULL );
+	theSpike->Spawn();
+
+	// Make it invisible
+	if(!GetGameRules()->GetDrawInvisibleEntities())
+	{
+		theSpike->pev->effects = EF_NODRAW;
+	}
+	else
+	{
+		theSpike->pev->effects = 0;
+		theSpike->pev->frame = 0;
+		theSpike->pev->scale = 0.5;
+		theSpike->pev->rendermode = kRenderTransAlpha;
+		theSpike->pev->renderamt = 255;
+	}
+
+	// Predict where enemy will be when the spike hits and shoot that way
+	float theTimeToReachEnemy = inToEnemy.Length()/(float)kOffenseChamberSpikeVelocity;
+	Vector theEnemyPosition;
+	VectorAdd(this->pev->origin, inToEnemy, theEnemyPosition);
+
+	float theVelocityLength = inVecEnemyVelocity.Length();
+	Vector theEnemyNormVelocity = inVecEnemyVelocity.Normalize();
+
+	// Don't always hit very fast moving targets (jetpackers)
+	const float kVelocityFactor = .7f;
+
+	Vector thePredictedPosition;
+	VectorMA(theEnemyPosition, theVelocityLength*kVelocityFactor*theTimeToReachEnemy, theEnemyNormVelocity, thePredictedPosition);
+
+	Vector theOrigin = inOrigin;
+	
+	//Vector theDirToEnemy = inDirToEnemy.Normalize();
+
+	Vector theDirToPredictedEnemy;
+	VectorSubtract(thePredictedPosition, this->pev->origin, theDirToPredictedEnemy);
+	Vector theDirToEnemy = theDirToPredictedEnemy.Normalize();
+
+	//Vector theAttachOrigin, theAttachAngles;
+	//GetAttachment(0, theAttachOrigin, theAttachAngles);
+	
+	//UTIL_SetOrigin(theSpike->pev, theStartPos);
+	//VectorCopy(theStartPos, theSpike->pev->origin);
+	VectorCopy(inOrigin, theSpike->pev->origin);
+
+	// Pass this velocity to event
+	int theVelocityScalar = kOffenseChamberSpikeVelocity;
+
+	Vector theInitialVelocity;
+	VectorScale(theDirToEnemy, theVelocityScalar, theInitialVelocity);
+	
+	// Set spike owner to OC so it doesn't collide with it
+	theSpike->pev->owner = this->edict();
+
+	// Set Spike's team :)
+	theSpike->pev->team = this->pev->team;
+
+	VectorCopy(theInitialVelocity, theSpike->pev->velocity);
+
+	// Set amount of damage it will do
+	theSpike->SetDamage(BALANCE_IVAR(kOffenseChamberDamage));
+
+	// Take into account network precision
+	Vector theNetworkDirToEnemy;
+	VectorScale(theDirToEnemy, 100.0f, theNetworkDirToEnemy);
+
+	PLAYBACK_EVENT_FULL(0, this->edict(), this->mEvent, 0, theOrigin, theNetworkDirToEnemy, 1.0f, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+
+	// Play attack anim
+	this->PlayAnimationAtIndex(6, true);
+
+	this->Uncloak();
+}
+
+bool AvHAlienTurret::GetBaseClassAnimatesTurret() const
+{
+	return false;
+}
+
+int AvHAlienTurret::MoveTurret(void)
+{
+	// Set animation, without overriding
+	int theAnimation = this->GetIdle1Animation();
+	if(RANDOM_LONG(0, 1) == 0)
+	{
+		theAnimation = this->GetIdle2Animation();
+	}
+	this->PlayAnimationAtIndex(theAnimation, false);
+	
+	return AvHTurret::MoveTurret();
+}
+
+
+int	AvHAlienTurret::GetIdle1Animation() const
+{
+	int theAnimation = -1;
+	
+	if(this->GetIsBuilt())
+	{
+		if(RANDOM_LONG(0, 5) == 0)
+		{
+			theAnimation = 4;
+		}
+		else
+		{
+			theAnimation = 2;
+		}
+	}
+	
+	return theAnimation;
+}
+
+int	AvHAlienTurret::GetIdle2Animation() const
+{
+	int theAnimation = -1;
+	
+	if(this->GetIsBuilt())
+	{
+		theAnimation = 3;
+	}
+	
+	return theAnimation;
+}
+
+int	AvHAlienTurret::GetTakeDamageAnimation() const
+{
+    int theAnimation = -1;
+    
+    if(this->GetIsBuilt())
+    {
+        theAnimation = 7;
+    }
+
+	return theAnimation;
+}
+
+char* AvHAlienTurret::GetModelName() const
+{
+	return kOffenseChamberModel;
+}
+
+float AvHAlienTurret::GetRateOfFire() const
+{
+	return .5f + RANDOM_FLOAT(0.0f, (1.0f - this->mEnergy));
+}
+
+void AvHAlienTurret::ResetEntity()
+{
+	AvHTurret::ResetEntity();
+
+	this->mEnergy = 0;
+}
+
+void AvHAlienTurret::Spawn()
+{
+	this->mEnergy = 0.0f;
+
+	AvHTurret::Spawn();
+
+	SetThink(&AvHAlienTurret::PreBuiltThink);
+	this->pev->nextthink = gpGlobals->time + kAlienBuildingThinkInterval;
+}
+
+void AvHAlienTurret::SetNextAttack()
+{
+	AvHTurret::SetNextAttack();
+
+	this->mEnergy = 0.0f;
+}
+
diff --git a/main/source/mod/AvHAlienTurret.h b/main/source/mod/AvHAlienTurret.h
new file mode 100644
index 00000000..7d56d5e4
--- /dev/null
+++ b/main/source/mod/AvHAlienTurret.h
@@ -0,0 +1,86 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHAlienTurret.h $
+// $Date: 2002/07/23 16:57:05 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHAlienTurret.h,v $
+// Revision 1.4  2002/07/23 16:57:05  Flayra
+// - Alien turret refactoring and fixing (the view offset in spawn() was causing them to always miss crouched players)
+//
+//===============================================================================
+#ifndef AVH_ALIEN_TURRET_H
+#define AVH_ALIEN_TURRET_H
+
+#include "mod/AvHTurret.h"
+#include "mod/AvHAlienEquipmentConstants.h"
+
+#ifdef AVH_SERVER
+class AvHSpike : public CBaseEntity
+{
+public:
+	virtual void	Precache(void);
+	
+	virtual void	Spawn(void);
+	
+	void EXPORT		SpikeTouch(CBaseEntity *pOther);
+	
+	void EXPORT		SpikeDeath();
+	
+	void			SetDamage(float inDamage);
+	
+private:
+	float			mDamage;
+};
+#endif
+
+
+class AvHAlienTurret : public AvHTurret
+{
+public:
+					AvHAlienTurret();
+					AvHAlienTurret(AvHTechID inTechID, AvHMessageID inMessageID, char* inClassName, int inUser3);
+
+	virtual bool	Energize(float inEnergyAmount);
+					
+	virtual char*	GetDeploySound() const;
+	char*			GetModelName() const;
+
+	virtual	bool	GetIsOrganic() const;
+
+	int				GetIdle1Animation() const;
+	int				GetIdle2Animation() const;
+	
+	virtual int		GetPointValue(void) const;
+	virtual int		GetXYRange() const;
+	virtual int		GetVerticalFOV() const;
+	virtual int		MoveTurret(void);
+	virtual bool	GetBaseClassAnimatesTurret() const;
+
+	virtual int		GetTakeDamageAnimation() const;
+
+	virtual void	ResetEntity();
+	virtual void	Precache(void);
+	virtual void	SetNextAttack();
+	virtual void	Shoot(const Vector &inOrigin, const Vector &inToEnemy, const Vector& inVecEnemyVelocity);
+	virtual void	Spawn();
+
+protected:
+	virtual float	GetRateOfFire() const;
+	
+private:
+	void EXPORT		PreBuiltThink();
+
+	int				mEvent;	
+
+	float			mEnergy;
+};
+
+#endif
diff --git a/main/source/mod/AvHAlienWeapon.cpp b/main/source/mod/AvHAlienWeapon.cpp
new file mode 100644
index 00000000..2c227913
--- /dev/null
+++ b/main/source/mod/AvHAlienWeapon.cpp
@@ -0,0 +1,287 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHAlienWeapon.cpp $
+// $Date: 2002/10/03 18:37:32 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHAlienWeapon.cpp,v $
+// Revision 1.9  2002/10/03 18:37:32  Flayra
+// - Moved alien energy to fuser3
+//
+// Revision 1.8  2002/09/23 22:08:59  Flayra
+// - Updates to allow marine weapons stick around
+//
+// Revision 1.7  2002/08/31 18:01:00  Flayra
+// - Work at VALVe
+//
+// Revision 1.6  2002/08/16 02:32:09  Flayra
+// - Added damage types
+// - Swapped umbra and bile bomb
+//
+// Revision 1.5  2002/07/08 16:43:26  Flayra
+// - Web change?
+//
+// Revision 1.4  2002/06/25 17:29:56  Flayra
+// - Better default behavior
+//
+// Revision 1.3  2002/06/03 16:25:10  Flayra
+// - Switch alien weapons quickly, renamed CheckValidAttack()
+//
+// Revision 1.2  2002/05/28 17:37:14  Flayra
+// - Reduced times where alien weapons are dropped and picked up again (but didn't eliminate, they are still being instantiated somewhere)
+//
+// Revision 1.1  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHAlienWeapon.h"
+#include "mod/AvHMovementUtil.h"
+#include "mod/AvHSpecials.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+extern int g_runfuncs;
+#include "cl_dll/com_weapons.h"
+
+#include "pm_defs.h"
+#include "pm_shared.h"
+#include "pm_movevars.h"
+extern playermove_t *pmove;
+#endif
+
+#include "mod/AvHSharedUtil.h"
+
+AvHAlienWeapon::AvHAlienWeapon()
+{
+	#ifdef AVH_SERVER
+	this->SetGroundLifetime(0);
+	#endif
+}
+
+bool AvHAlienWeapon::ProcessValidAttack(void)
+{
+	bool theCanAttack = false;
+	
+	if(AvHBasePlayerWeapon::ProcessValidAttack())
+	{
+		if(this->IsUseable())
+		{
+			theCanAttack = true;
+		}
+	}
+	
+	return theCanAttack;
+}
+
+void AvHAlienWeapon::DeductCostForShot(void)
+{
+	if(this->GetTakesEnergy())
+	{
+		AvHBasePlayerWeapon::DeductCostForShot();
+
+		float theEnergyCost = this->GetEnergyForAttack();
+		float& theFuser = this->GetEnergyLevel();
+		AvHMUDeductAlienEnergy(theFuser, theEnergyCost);
+	}
+}
+
+// Cannot ever drop alien weapons
+void AvHAlienWeapon::Drop(void) 
+{
+	int a = 0;
+}
+
+bool AvHAlienWeapon::GetAllowedForUser3(AvHUser3 inUser3)
+{
+	bool theAllowed = false;
+	
+	// Alien weapons for aliens.  Don't take into account exact roles until needed (and until weapons have stabilized)
+	switch(inUser3)
+	{
+	case AVH_USER3_ALIEN_PLAYER1:
+	case AVH_USER3_ALIEN_PLAYER2:
+	case AVH_USER3_ALIEN_PLAYER3:
+	case AVH_USER3_ALIEN_PLAYER4:
+	case AVH_USER3_ALIEN_PLAYER5:
+		theAllowed = true;
+		break;
+	}
+	
+	return theAllowed;
+}
+
+int	AvHAlienWeapon::GetDamageType() const
+{
+	// Assume melee attack, piercing
+	//return NS_DMG_PIERCING;
+	return NS_DMG_NORMAL;
+}
+
+float AvHAlienWeapon::GetDeployTime() const
+{
+	// Aliens are Quake-style/arcadey, make weapon switch fast
+	return .1f;
+}
+
+float AvHAlienWeapon::GetEnergyForAttack() const
+{
+	float theEnergy = 0.0f;
+
+	AvHMUGetEnergyCost((AvHWeaponID)(this->m_iId), theEnergy);
+
+	return theEnergy;
+}
+
+bool AvHAlienWeapon::GetFiresUnderwater() const
+{
+	return true;
+}
+
+// Never live on ground
+int	AvHAlienWeapon::GetGroundLifetime() const
+{
+	return 0;
+}
+
+float& AvHAlienWeapon::GetEnergyLevel()
+{
+#ifdef AVH_CLIENT
+	float& theFuser = pmove->fuser3;
+#endif
+	
+#ifdef AVH_SERVER
+	float& theFuser = this->m_pPlayer->pev->fuser3;
+#endif
+	
+	return theFuser;
+}
+
+bool AvHAlienWeapon::GetIsDroppable() const
+{
+	return false;
+}
+
+bool AvHAlienWeapon::GetIsGunPositionValid() const
+{
+    // Check to make sure our gun barrel isn't coming out on the other side of a wall.
+    
+    vec3_t theBarrelOrigin;
+    vec3_t theBarrelEnd;
+    
+#ifdef AVH_CLIENT
+    
+    extern vec3_t v_view_ofs; // In view.cpp
+    extern vec3_t v_cl_angles;
+    
+    cl_entity_s* thePlayer = gHUD.GetVisiblePlayer();
+    
+    VectorAdd(thePlayer->curstate.origin, v_view_ofs, theBarrelOrigin);
+    
+    vec3_t theBarrelDirection;
+    AngleVectors(v_angles, theBarrelDirection, NULL, NULL);
+    
+    VectorMA(theBarrelOrigin, GetBarrelLength(), theBarrelDirection, theBarrelEnd);
+    
+#endif
+    
+#ifdef AVH_SERVER
+    
+    VectorCopy(m_pPlayer->GetGunPosition(), theBarrelOrigin);
+    VectorCopy(GetWorldBarrelPoint(), theBarrelEnd);
+    
+#endif
+    
+    return AvHTraceLineAgainstWorld(theBarrelOrigin, theBarrelEnd) == 1;
+}
+
+float AvHAlienWeapon::ComputeAttackInterval() const
+{
+	float theROF = this->GetRateOfFire();
+	
+	int theUser4 = this->m_pPlayer->pev->iuser4;
+	
+	#ifdef AVH_CLIENT
+	cl_entity_t* theLocalPlayer = gEngfuncs.GetLocalPlayer();
+	if(theLocalPlayer)
+	{
+		theUser4 = theLocalPlayer->curstate.iuser4;
+	}
+	#endif
+
+	// Speed attack if in range of primal scream
+	if(GetHasUpgrade(theUser4, MASK_BUFFED))
+	{
+		float thePrimalScreamROFFactor = 1.0f + BALANCE_FVAR(kPrimalScreamROFFactor);
+		theROF /= thePrimalScreamROFFactor;
+	}
+
+	// Check for focus
+    if(AvHSHUGetIsWeaponFocusable(AvHWeaponID(this->m_iId)))
+    {
+	    int theFocusLevel = AvHGetAlienUpgradeLevel(theUser4, MASK_UPGRADE_8);
+	    if(theFocusLevel > 0)
+	    {
+		    // Slow down ROF by x% for each level
+		    const float theFocusROFPercentSlowdownPerLevel = BALANCE_FVAR(kFocusROFPercentSlowdownPerLevel);
+		    float theSlowDownPercentage = 1.0f + theFocusLevel*theFocusROFPercentSlowdownPerLevel;
+		    
+		    theROF *= theSlowDownPercentage;
+	    }
+    }
+
+	return theROF;
+}
+
+void AvHAlienWeapon::Precache(void)
+{
+	AvHBasePlayerWeapon::Precache();
+}
+
+void AvHAlienWeapon::Spawn()
+{
+	AvHBasePlayerWeapon::Spawn();
+	
+	this->pev->iuser3 = AVH_USER3_NONE;
+	
+	#ifdef AVH_SERVER
+	this->SetGroundLifetime(0);
+	#endif
+}
+
+
+BOOL AvHAlienWeapon::IsUseable(void)
+{
+	BOOL theIsUseable = FALSE;
+
+	// Make sure we have enough energy for this attack
+	float theEnergyCost = this->GetEnergyForAttack();
+	float& theFuser = this->GetEnergyLevel();
+	
+	if(AvHMUHasEnoughAlienEnergy(theFuser, theEnergyCost) && this->GetEnabledState())
+	{
+		theIsUseable = TRUE;
+	}
+
+	return theIsUseable;
+}
+
+bool AvHAlienWeapon::UsesAmmo(void) const
+{
+	return false;
+}
+
+BOOL AvHAlienWeapon::UseDecrement(void)
+{
+	return true;
+}
+
diff --git a/main/source/mod/AvHAlienWeapon.h b/main/source/mod/AvHAlienWeapon.h
new file mode 100644
index 00000000..839a605d
--- /dev/null
+++ b/main/source/mod/AvHAlienWeapon.h
@@ -0,0 +1,90 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHAlienWeapon.h $
+// $Date: 2002/09/23 22:08:59 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHAlienWeapon.h,v $
+// Revision 1.6  2002/09/23 22:08:59  Flayra
+// - Updates to allow marine weapons stick around
+//
+// Revision 1.5  2002/08/16 02:32:09  Flayra
+// - Added damage types
+// - Swapped umbra and bile bomb
+//
+// Revision 1.4  2002/06/25 17:29:56  Flayra
+// - Better default behavior
+//
+// Revision 1.3  2002/06/03 16:25:10  Flayra
+// - Switch alien weapons quickly, renamed CheckValidAttack()
+//
+// Revision 1.2  2002/05/28 17:37:14  Flayra
+// - Reduced times where alien weapons are dropped and picked up again (but didn't eliminate, they are still being instantiated somewhere)
+//
+// Revision 1.1  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_ALIEN_WEAPON_H
+#define AVH_ALIEN_WEAPON_H
+
+#include "util/nowarnings.h"
+#include "dlls/weapons.h"
+#include "mod/AvHBasePlayerWeapon.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHMessage.h"
+
+class AvHAlienWeapon : public AvHBasePlayerWeapon 
+{
+public:
+	AvHAlienWeapon();
+
+    virtual float   ComputeAttackInterval() const;
+
+	virtual void	DeductCostForShot(void);
+	
+	// Cannot ever drop alien weapons
+	virtual void	Drop(void);
+
+	bool			GetAllowedForUser3(AvHUser3 inUser3);
+
+	virtual int		GetDamageType() const;
+		
+	virtual float	GetDeployTime() const;
+		
+	virtual float	GetEnergyForAttack() const;
+
+	virtual bool	GetFiresUnderwater() const;
+
+	virtual int		GetGroundLifetime() const;
+
+	virtual bool	GetIsDroppable() const;
+
+    virtual bool    GetIsGunPositionValid() const;
+
+	virtual BOOL	IsUseable(void);
+
+	virtual void	Precache(void);
+
+    virtual bool	ProcessValidAttack(void);
+
+	virtual void	Spawn(void);
+	
+	virtual bool	UsesAmmo(void) const;
+
+	virtual BOOL	UseDecrement(void);
+	virtual BOOL	GetTakesEnergy() { return true; }
+
+private:
+	float&			GetEnergyLevel();
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHAlienWeaponConstants.h b/main/source/mod/AvHAlienWeaponConstants.h
new file mode 100644
index 00000000..a7f62f59
--- /dev/null
+++ b/main/source/mod/AvHAlienWeaponConstants.h
@@ -0,0 +1,386 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHAlienWeaponConstants.h$
+// $Date: 2002/11/05 06:17:25 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHAlienWeaponConstants.h,v $
+// Revision 1.29  2002/11/05 06:17:25  Flayra
+// - Balance changes
+//
+// Revision 1.28  2002/10/28 20:33:11  Flayra
+// - Increased claw range so the onos can hit ground targets without crouching
+//
+// Revision 1.27  2002/10/20 02:36:14  Flayra
+// - Regular update
+//
+// Revision 1.26  2002/10/18 22:17:03  Flayra
+// - Balance
+//
+// Revision 1.25  2002/10/16 20:51:06  Flayra
+// - Fixed problem where projectile hit player
+// - Added paralysis projectile
+//
+// Revision 1.24  2002/10/16 00:47:56  Flayra
+// - Removed unneeded bite2 sounds
+// - Removed blink fail
+// - Lowered blink ROF in case that was causing the spam of particle systems
+//
+// Revision 1.23  2002/10/03 18:38:04  Flayra
+// - Toned down primal scream (rate of fire, energy acquisition, +30% damage instead of %40%)
+//
+// Revision 1.22  2002/09/25 20:42:26  Flayra
+// - Balance changes
+//
+// Revision 1.21  2002/09/23 22:09:07  Flayra
+// - Regular update
+//
+// Revision 1.20  2002/09/09 19:48:15  Flayra
+// - Spit damage adjusted
+//
+// Revision 1.19  2002/08/31 18:01:00  Flayra
+// - Work at VALVe
+//
+// Revision 1.18  2002/08/16 02:31:23  Flayra
+// - Big balance change: all weapons reduced by 20% damage
+//
+// Revision 1.17  2002/08/09 00:54:56  Flayra
+// - Regular update
+//
+// Revision 1.16  2002/07/26 23:03:08  Flayra
+// - New artwork
+//
+// Revision 1.15  2002/07/23 16:57:52  Flayra
+// - Lots of tweaks (new artwork, balance/feel)
+//
+// Revision 1.14  2002/07/08 16:45:24  Flayra
+// - Spit gun and bites were shooting through walls, balance changes
+//
+// Revision 1.13  2002/07/01 21:15:02  Flayra
+// - Added new alien abilities (primal scream, babblers, bilebomb, umbra)
+//
+// Revision 1.12  2002/06/25 17:28:55  Flayra
+// - Consolidated view models, correct animations for player models, removed ancient weapons
+//
+// Revision 1.11  2002/06/10 19:49:37  Flayra
+// - Updated with new alien view model artwork (with running anims)
+//
+// Revision 1.10  2002/06/03 16:25:34  Flayra
+// - Removed outdated v_leap.mdl (!)
+//
+// Revision 1.9  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVHALIENWEAPONCONSTANTS_H
+#define AVHALIENWEAPONCONSTANTS_H
+
+#include "mod/AvHBasePlayerWeaponConstants.h"
+
+// Alien view models
+#define			kLevel1ViewModel		"models/v_lvl1.mdl"
+#define			kLevel2ViewModel		"models/v_lvl2.mdl"
+#define			kLevel3ViewModel		"models/v_lvl3.mdl"
+#define			kLevel4ViewModel		"models/v_lvl4.mdl"
+#define			kLevel5ViewModel		"models/v_lvl5.mdl"
+
+// Spit gun constants.
+const int		kSpitGRange			= 400; // range not used
+const float		kSpitLifetime		= 2.0f;
+const float		kSpitGXPunch		= 1.4f;
+const float		kSpitParentVelocityScalar = .1f;
+const int		kSpitVelocity		= 1500;
+#define			kSpitGunSprite		"sprites/bigspit.spr"
+#define			kSpitHitSound1		"weapons/spithit1.wav"
+#define			kSpitHitSound2		"weapons/spithit2.wav"
+#define			kSpitGEventName		"events/SpitGun.sc"
+#define			kSpitGAnimExt		"ability1"
+#define			kSpitGFireSound1	"weapons/spit-1.wav"
+#define			kSpitGFireSound2	"weapons/spit-2.wav"
+const int		kSpitGBarrelLength	= 20;
+#define			kSpitClassName		"spitgunspit"
+
+// The spit size must be small so that the collision results on the server
+// are close to the collision results for the temp entity on the client.
+const float		kSpitSize			= 1;
+
+
+// Swipe constants.
+const int		kSwipeRange			= 60;
+const float		kSwipePunch			= 4.0;
+#define			kSwipeSound1		"weapons/swipe1.wav"
+#define			kSwipeSound2		"weapons/swipe2.wav"
+#define			kSwipeSound3		"weapons/swipe3.wav"
+#define			kSwipeSound4		"weapons/swipe4.wav"
+#define			kSwipeHitSound1		"weapons/swipehit1.wav"
+#define			kSwipeHitSound2		"weapons/swipehit2.wav"
+#define			kSwipeKillSound		"weapons/swipekill.wav"
+
+#define			kSwipeEventName		"events/Swipe.sc"
+#define			kSwipeAnimExt		"ability1"
+#define			kSwipeFireSound1	"weapons/swipe-1.wav"
+#define			kSwipeFireSound2	"weapons/swipe-2.wav"
+const int		kSwipeBarrelLength	= 30;
+
+// Claws constants.
+const int		kClawsRange			= 90;
+const float		kClawsPunch			= 10.0;
+#define			kClawsSound1		"weapons/claws1.wav"
+#define			kClawsSound2		"weapons/claws2.wav"
+#define			kClawsSound3		"weapons/claws3.wav"
+#define			kClawsHitSound1		"weapons/clawshit1.wav"
+#define			kClawsHitSound2		"weapons/clawshit2.wav"
+#define			kClawsKillSound		"weapons/clawskill.wav"
+#define			kClawsEventName		"events/Claws.sc"
+#define			kClawsAnimExt		"ability1"
+#define			kClawsFireSound1	"weapons/claws-1.wav"
+#define			kClawsFireSound2	"weapons/claws-2.wav"
+const int		kClawsBarrelLength	= 30;
+const int		kClawsAdrenPitchFactor	= 50;
+
+// Spores constants.
+const int		kSporeRange			= 60;
+const float		kSporePunch			= 2.0;
+
+const float		kSporeParentVelocityScalar = .1f;
+const int		kShootCloudVelocity	= 1100;
+#define			kSporeSprite		"sprites/spore.spr"
+#define			kClientSporeSprite	"sprites/spore2.spr"
+
+#define			kSporeFireSound			"weapons/sporefire.wav"
+#define			kSporeCloudSound		"weapons/sporecloud.wav"
+#define			kSporeShootEventName	"events/ShootSpores.sc"
+#define			kSporeCloudEventName	"events/SporeCloud.sc"
+#define			kSporeAnimExt			"ability2"
+const int		kSporeBarrelLength		= 30;
+const int		kSporePointCost			= 2;
+
+
+// Spike gun constants.
+const int		kSpikeRange				= 8012;
+const float		kSpikePunch				= 4.0;
+
+#define			kSpikeSpread			VECTOR_CONE_3DEGREES
+#define			kSpikeFireSound			"weapons/spikefire.wav"
+#define			kSpikeProjectileModel	"models/spike.mdl"
+#define			kSpikeShootEventName	"events/SpikeGun.sc"
+#define			kSpikeAnimExt			"ability2"
+const int		kSpikeBarrelLength		= 30;
+const int		kSpikeVelocity			= 3500;
+#define			kSpikeGunHitSprite		"sprites/spikehit.spr"
+
+
+// Paralysis gun constants.
+const int		kParalysisRange			= 8012;
+const float		kParalysisPunch			= 2.0;
+
+#define			kParalysisFireSound			"weapons/paralysisfire.wav"
+#define			kParalysisHitSound			"weapons/paralysishit.wav"
+#define			kParalysisShootEventName	"events/ParalysisGun.sc"
+#define			kParalysisStartEventName	"events/ParalysisStart.sc"
+#define			kParalysisProjectileModel	"models/paralysis.mdl"
+#define			kParalysisAnimExt			"ability3"
+const float		kParalysisROF				= 1.0f;
+const int		kParalysisDamage			= 0;
+const int		kParalysisBarrelLength		= 200;
+const int		kParalysisVelocity			= 3500;
+
+const int		kParalysisMaxClip			= 10;
+const int		kParalysisStartClip			= 10;
+
+// Bite constants.
+const float		kBitePunch				= 2.5;
+#define			kBiteSound				"weapons/bite.wav"
+#define			kBiteHitSound1			"weapons/bitehit1.wav"
+#define			kBiteHitSound2			"weapons/bitehit2.wav"
+#define			kBiteKillSound			"weapons/bitekill.wav"
+#define			kBiteEventName			"events/Bite.sc"
+#define			kBiteAnimExt			"ability1"
+#define			kBiteFireSound1			"weapons/bite-1.wav"
+#define			kBiteFireSound2			"weapons/bite-2.wav"
+const int		kBiteBarrelLength		= 20;
+
+// Bite2 constants.
+const int		kBite2Range				= 60;
+const float		kBite2Punch				= 2.5;
+#define			kBite2Sound				"weapons/bite2.wav"
+#define			kBite2EventName			"events/Bite2.sc"
+#define			kBite2AnimExt			"ability1"
+#define			kBite2FireSound1		"weapons/bite2-1.wav"
+#define			kBite2FireSound2		"weapons/bite2-2.wav"
+const int		kBite2BarrelLength		= 20;
+
+// Healing spray constants.
+const int		kHealingSprayRange			= 300;
+#define			kHealingSpraySound			"weapons/alien_spray.wav"
+#define			kHealingSprayEventName		"events/HealingSpray.sc"
+#define			kHealingSprayAnimExt		"ability2"
+const int		kHealingSprayBarrelLength	= 30;
+
+// Metabolize constants
+#define			kMetabolizeEventName		"events/Metabolize.sc"
+#define			kMetabolizeSuccessEventName	"events/MetabolizeSuccess.sc"
+//#define			kMetabolizeFireSound		"weapons/metabolize_fire.wav"
+#define			kMetabolizeFireSound1		"weapons/metabolize1.wav"
+#define			kMetabolizeFireSound2		"weapons/metabolize2.wav"
+#define			kMetabolizeFireSound3		"weapons/metabolize3.wav"
+#define			kMetabolizeSuccessSound		"weapons/metabolize_success.wav"
+
+// Web spinning constants.
+const int		kWebSpinnerRange			= 500;
+#define			kWebSpinnerShootEventName	"events/SpinWeb.sc"
+#define			kWebProjectileSprite		"sprites/webprojectile.spr"
+#define			kWebSpinnerAnimExt			"ability4"
+#define			kWebSpinSound1				"weapons/webspin1.wav"
+#define			kWebSpinSound2				"weapons/webspin2.wav"
+const int		kWebSpinnerBarrelLength		= 20;
+#define			kWebProjectileClassName		"webgunproj"
+const float		kWebProjectileParentVelocityScalar		= .05f;
+const int		kWebProjectileVelocity					= 1000;
+const float		kWebGXPunch					= 2.0;
+
+// Babbler gun constants.
+const int		kBabblerGunRange			= 400;
+#define			kBabblerGunSound			"player/role3_spawn1.wav"
+#define			kBabblerGunEventName		"events/BabblerGun.sc"
+#define			kBabblerGunAnimExt			"ability4"
+//#define			kBabblerModel				"models/w_babbler.mdl"
+#define			kBabblerModel				"models/player/alien1/alien1.mdl"
+const float		kBabblerGunROF				= 1.0f;
+const int		kBabblerGunBarrelLength		= 50;
+const int		kBabblerBiteDamage			= 20;
+const int		kBabblerExplodeDamage		= 40;
+const float		kBabblerXPunch				= 8.0;
+#define			kBabblerHunt1Sound			"player/role3_idle1.wav"
+#define			kBabblerHunt2Sound			"player/role3_move1.wav"
+#define			kBabblerHunt3Sound			"player/role3_move1.wav"
+#define			kBabblerBiteSound			"weapons/bite.wav"
+#define			kBabblerDieSound			"player/role3_die1.wav"
+#define			kBabblerBlastSound			"weapons/divinewindexplode.wav"
+
+// Primal scream constants.
+#define			kPrimalScreamShootEventName	"events/PrimalScream.sc"
+#define			kStopPrimalScreamSoundEvent	"events/StopScream.sc"
+#define			kPrimalScreamAnimExt		"ability4"
+#define			kPrimalScreamSound			"weapons/primalscream.wav"
+const int		kPrimalScreamBarrelLength	= 100;
+
+// Building gun constants.
+const int		kBuildingGunRange			= 50;
+const float		kBuildingGunPunch			= 2.5;
+#define			kBuildingGunEventName		"events/Build.sc"
+#define			kBuildingGunAnimExt			"ability6"
+#define			kBuildingGunSound1			"weapons/build1.wav"
+#define			kBuildingGunSound2			"weapons/build2.wav"
+const float		kBuildingGunROF				= 1.0f;
+const int		kBuildingGunDamage			= 50;
+const int		kBuildingGunBarrelLength	= 100;
+const int		kBuildingGunPointCost		= 3;
+
+// Parasite gun constants.
+const int		kParasiteRange			= 2048;
+const float		kParasitePunch			= .5;
+
+#define			kParasiteFireSound		"weapons/parasitefire.wav"
+#define			kParasiteHitSound		"weapons/parasitehit.wav"
+#define			kParasiteShootEventName	"events/ParasiteGun.sc"
+#define			kParasiteProjectileModel	"models/parasite.mdl"
+#define			kParasiteAnimExt		"ability2"
+const int		kParasiteBarrelLength	= 10;
+const int		kParasiteVelocity		= 2500;
+
+// Umbra gun constants.
+const int		kUmbraRange				= 8012;
+const float		kUmbraPunch				= 2.0;
+const int		kUmbraVelocity			= 1100;
+#define			kUmbraSprite			"sprites/umbra.spr"
+#define			kClientUmbraSprite		"sprites/umbra2.spr"
+
+#define			kUmbraFireSound			"weapons/umbrafire.wav"
+#define			kUmbraBlockedSound		"weapons/umbrablocked.wav"
+#define			kUmbraCloudEventName	"events/UmbraCloud.sc"
+#define			kUmbraShootEventName	"events/UmbraGun.sc"
+#define			kUmbraAnimExt			"ability3"
+const int		kUmbraBarrelLength		= 30;
+
+// Blink gun constants.
+const float		kBlinkPunch				= 2.0;
+
+#define			kBlinkSuccessSound		"weapons/blinksuccess.wav"
+#define			kBlinkEffectSuccessEventName	"events/BlinkSuccess.sc"
+#define			kBlinkAnimExt			"ability2"
+
+// DivineWind gun constants.
+const int		kDivineWindRange				= 8012;
+const float		kDivineWindPunch				= 2.0;
+
+#define			kDivineWindFireSound		"weapons/divinewindfire.wav"
+#define			kDivineWindExplodeSound		"weapons/divinewindexplode.wav"
+#define			kDivineWindShootEventName	"events/DivineWind.sc"
+#define			kDivineWindAnimExt			"ability4"
+
+// Bile bomb
+const int		kBileBombRange				= 9214;
+const float		kBileBombPunch				= 8.0;
+
+#define			kBileBombFireSound			"weapons/bilebombfire.wav"
+#define			kBileBombHitSound			"weapons/bilebombhit.wav"
+#define			kBileBombShootEventName		"events/BileBomb.sc"
+#define			kBileBombVModel				"models/v_lvl3.mdl"
+#define			kBileBombAnimExt			"ability3"
+#define			kBileBombProjectileModel	"models/bilebomb.mdl"
+
+const int		kBileBombBarrelLength		= 20;
+const float		kBileBombFrictionConstant	= .8f;
+const int		kBileBombVelocity			= 750;
+
+// The bile bomb size must be small so that the collision results on the server
+// are close to the collision results for the temp entity on the client.
+const float		kBileBombSize				= 1;
+
+// Acid rocket
+const int		kAcidRocketRange					= 8012;
+const float		kAcidRocketPunch					= 2.0;
+const float		kAcidRocketParentVelocityScalar		= .1f;
+const int		kAcidRocketVelocity			= 2000;
+#define			kAcidRocketFireSound		"weapons/acidrocketfire.wav"
+#define			kAcidRocketHitSound			"weapons/acidrockethit.wav"
+#define			kAcidRocketShootEventName	"events/AcidRocket.sc"
+#define			kAcidRocketVModel			"models/v_lvl4.mdl"
+#define			kAcidRocketProjectileModel	"models/acidrocket.mdl"
+#define			kAcidRocketAnimExt			"ability4"
+
+const int		kAcidRocketBarrelLength		= 40;
+
+// Devour gun constants.
+const float		kDevourPunch				= 2.0;
+
+#define			kDevourFireSound			"weapons/devour.wav"
+#define			kDevourSwallowSound			"weapons/devourswallow.wav"
+#define			kDevourCompleteSound		"weapons/devourcomplete.wav"
+#define			kDevourCancelSound			"weapons/devourcancel.wav"
+#define			kDevourShootEventName		"events/Devour.sc"
+#define			kDevourAnimExt				"ability3"
+
+
+// Stomp gun constants.
+#define			kStompFireSound				"weapons/stomp.wav"
+#define			kStompShootEventName		"events/Stomp.sc"
+//#define			kStompProjectileModel		"sprites/shockwave.spr"
+#define			kStompProjectileModel		"models/stomp.mdl"
+#define			kwsStompProjectile			"stompprojectile"
+const int		kStompBarrelLength			= 30;
+const float		kStompProjectileLifetime	= 1.2f;
+const int		kStompModelRenderAmount		= 180;
+const int		kStompProjectileVelocity	= 600;
+#define			kStompAnimExt				"ability2"
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHAlienWeapons.h b/main/source/mod/AvHAlienWeapons.h
new file mode 100644
index 00000000..c303201e
--- /dev/null
+++ b/main/source/mod/AvHAlienWeapons.h
@@ -0,0 +1,1227 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHAlienWeapons.h$
+// $Date: 2002/10/16 00:48:10 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHAlienWeapons.h,v $
+// Revision 1.17  2002/10/16 00:48:10  Flayra
+// - Removed unneeded sprite
+//
+// Revision 1.16  2002/08/16 02:32:09  Flayra
+// - Added damage types
+// - Swapped umbra and bile bomb
+//
+// Revision 1.15  2002/07/26 23:03:08  Flayra
+// - New artwork
+//
+// Revision 1.14  2002/07/23 16:58:09  Flayra
+// - Updates for new viewmodel artwork
+//
+// Revision 1.13  2002/07/08 16:45:15  Flayra
+// - Refactoring for cheat protection, moved blinking in here from separate class
+//
+// Revision 1.12  2002/07/01 21:15:27  Flayra
+// - Added new alien abilities (primal scream, babblers, bilebomb, umbra)
+//
+// Revision 1.11  2002/06/25 17:29:50  Flayra
+// - Better default behavior, removed building weapons
+//
+// Revision 1.10  2002/06/10 19:50:01  Flayra
+// - Updated with new alien view model artwork (with running anims)
+//
+// Revision 1.9  2002/06/03 16:27:05  Flayra
+// - Animation constants and changes with new artwork
+//
+// Revision 1.8  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVHALIENWEAPONS_H
+#define AVHALIENWEAPONS_H
+
+#include "mod/AvHAlienWeapon.h"
+
+
+#ifdef AVH_SERVER
+class AvHSpit : public CBaseEntity
+{
+public:
+	virtual void	Precache(void);
+
+	virtual void	Spawn(void);
+
+	void EXPORT		SpitTouch(CBaseEntity *pOther);
+
+	void EXPORT		SpitDeath();
+
+	void			SetDamage(float inDamage);
+
+private:
+	float			mDamage;
+};
+#endif
+
+class AvHSpitGun : public AvHAlienWeapon 
+{ 
+public: 
+				    AvHSpitGun()
+				        { this->Init(); } 
+
+	virtual int		GetBarrelLength() const;
+
+    virtual float	GetRateOfFire() const;
+
+	virtual int		GetDamageType() const;
+	
+	virtual int		GetDeployAnimation() const;
+
+	virtual bool	GetFiresUnderwater() const;
+	
+	virtual bool	GetIsDroppable() const;
+
+	int				GetItemInfo(ItemInfo *p) const;
+
+	virtual int		GetShootAnimation() const;
+
+	virtual char*	GetViewModel() const;
+
+	virtual int		iItemSlot(void);
+
+	virtual void	Precache(void);
+
+	virtual void	Spawn();
+
+	virtual bool	UsesAmmo(void) const;
+
+protected: 
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+};
+
+
+class AvHClaws : public AvHAlienWeapon 
+{ 
+public: 
+					AvHClaws()
+						{ this->Init(); } 
+	
+	virtual int		GetBarrelLength() const;
+
+    virtual bool    GetIsGunPositionValid() const;
+
+    virtual float	GetRateOfFire() const;
+
+	virtual int		GetDamageType() const;
+	
+	virtual int		GetDeployAnimation() const;
+	
+	virtual float	GetDeployTime() const;
+		
+	virtual bool	GetFiresUnderwater() const;
+
+	virtual int		GetIdleAnimation() const;
+		
+	virtual bool	GetIsDroppable() const;
+	
+	int				GetItemInfo(ItemInfo *p) const;
+
+	virtual bool	GetMustPressTriggerForEachShot() const
+						{ return true;	}
+	
+	virtual int		iItemSlot(void);
+
+	virtual int		GetShootAnimation() const;
+		
+	virtual char*	GetViewModel() const;
+	
+	virtual void	Precache(void);
+	
+	virtual void	Spawn();
+	
+	virtual bool	UsesAmmo(void) const;
+
+	virtual BOOL	UseDecrement(void);
+	
+protected: 
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+};
+
+class AvHSwipe : public AvHAlienWeapon 
+{ 
+public: 
+					AvHSwipe()
+						{ this->Init(); } 
+	
+	virtual int		GetBarrelLength() const;
+
+    virtual bool    GetIsGunPositionValid() const;
+
+    virtual float	GetRateOfFire() const;
+
+	virtual int		GetDamageType() const;
+	
+	virtual bool	GetFiresUnderwater() const;
+	
+	virtual int		GetDeployAnimation() const;
+
+	virtual int		GetIdleAnimation() const;
+
+	virtual int		GetShootAnimation() const;
+		
+	virtual char*	GetViewModel() const;
+
+	virtual bool	GetIsDroppable() const;
+	
+	int				GetItemInfo(ItemInfo *p) const;
+
+	virtual bool	GetMustPressTriggerForEachShot() const
+						{ return true;	}
+	
+	virtual int		iItemSlot(void);
+	
+	virtual void	Precache(void);
+	
+	virtual void	Spawn();
+	
+	virtual bool	UsesAmmo(void) const;
+	
+	virtual BOOL	UseDecrement(void);
+	
+protected: 
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+};
+
+
+#ifdef AVH_SERVER
+class AvHSporeProjectile : public CBaseEntity
+{
+public:
+					AvHSporeProjectile();
+
+	virtual void	Precache(void);
+
+	virtual void	SetDamage(float inDamage);
+	
+	virtual void	Spawn(void);
+	
+	void EXPORT		SporeCloudThink();
+
+	void EXPORT		SporeTouch(CBaseEntity *pOther);
+
+private:
+	float			mTimeHit;
+	float			mDamage;
+
+};
+#endif
+
+class AvHSpore : public AvHAlienWeapon 
+{ 
+public: 
+					AvHSpore()
+						{ this->Init(); } 
+	
+	virtual int		GetBarrelLength() const;
+
+    virtual float	GetRateOfFire() const;
+
+	virtual int		GetDamageType() const;
+	
+	virtual int		GetDeployAnimation() const;
+
+	virtual float	GetDeployTime() const;
+	
+	virtual bool	GetFiresUnderwater() const;
+	
+	virtual int		GetIdleAnimation() const;
+
+	virtual bool	GetIsDroppable() const;
+
+	int				GetItemInfo(ItemInfo *p) const;
+	
+	virtual int		GetShootAnimation() const;
+
+	virtual char*	GetViewModel() const;
+
+	virtual int		iItemSlot(void);
+	
+	virtual void	Precache(void);
+	
+	virtual void	Spawn();
+	
+	virtual bool	UsesAmmo(void) const;
+	
+protected: 
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+};
+
+class AvHBite : public AvHAlienWeapon 
+{ 
+public: 
+					AvHBite()
+						{ this->Init(); } 
+	
+	virtual int		GetBarrelLength() const;
+    
+    virtual bool    GetIsGunPositionValid() const;
+    
+    virtual float	GetRateOfFire() const;
+
+	virtual char*	GetBiteSound() const;
+
+	virtual int		GetDeployAnimation() const;
+
+	virtual bool	GetFiresUnderwater() const;
+
+	virtual int		GetIdleAnimation() const;
+
+	virtual int		GetShootAnimation() const;
+	
+	virtual bool	GetIsDroppable() const;
+	
+	int				GetItemInfo(ItemInfo *p) const;
+
+	virtual bool	GetMustPressTriggerForEachShot() const
+						{ return true;	}
+
+	virtual char*	GetViewModel() const;
+	
+	virtual int		iItemSlot(void);
+	
+	virtual void	Precache(void);
+	
+	virtual void	Spawn();
+	
+	virtual bool	UsesAmmo(void) const;
+
+	virtual BOOL	UseDecrement(void);
+	
+protected: 
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+};
+
+class AvHBite2 : public AvHBite 
+{
+public:
+                    AvHBite2()
+                        { this->Init(); } 
+
+	virtual int		GetBarrelLength() const;
+
+    virtual bool    GetIsGunPositionValid() const;
+
+    virtual float	GetRateOfFire() const;
+
+	virtual int		GetDamageType() const;
+		
+	virtual int		GetDeployAnimation() const;
+
+	virtual float	GetDeployTime() const;
+
+	virtual int		GetIdleAnimation() const;
+
+	int				GetItemInfo(ItemInfo *p) const;
+
+	virtual int		GetShootAnimation() const;
+
+	virtual char*	GetViewModel() const;
+
+	virtual int		iItemSlot(void);
+
+	virtual void	Precache();
+
+	virtual void	Spawn();
+
+protected:
+    
+	virtual void	Init();
+
+};
+
+
+class AvHSpikeGun : public AvHAlienWeapon 
+{ 
+public: 
+					AvHSpikeGun()
+						{ this->Init(); } 
+	
+	virtual int		GetBarrelLength() const;
+
+    virtual float	GetRateOfFire() const;
+
+	virtual int		GetDamageType() const;
+	
+	virtual int		GetDeployAnimation() const;
+
+	virtual float	GetDeployTime() const;
+
+	virtual int		GetIdleAnimation() const;
+
+	virtual bool	GetFiresUnderwater() const;
+
+	virtual bool	GetIsDroppable() const;
+
+	int				GetItemInfo(ItemInfo *p) const;
+
+	virtual int		GetShootAnimation() const;
+
+	virtual char*	GetViewModel() const;
+	
+	virtual int		iItemSlot(void);
+	
+	virtual void	Precache(void);
+	
+	virtual void	Spawn();
+
+    //virtual void    WeaponIdle();
+	
+protected: 
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+
+	//int				mFramesSinceMoreAmmo;
+};
+
+class AvHHealingSpray : public AvHAlienWeapon 
+{ 
+public: 
+					AvHHealingSpray()
+						{ this->Init(); } 
+	
+	virtual int		GetBarrelLength() const;
+
+    virtual float	GetRateOfFire() const;
+
+	virtual int		GetDamageType() const;
+	
+	virtual int		GetDeployAnimation() const;
+
+	virtual int		GetIdleAnimation() const;
+
+	virtual int		GetShootAnimation() const;
+	
+	int				GetItemInfo(ItemInfo *p) const;
+
+	virtual char*	GetViewModel() const;
+	
+	virtual int		iItemSlot(void);
+	
+	virtual void	Precache(void);
+	
+	virtual void	Spawn();
+	
+protected: 
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+};
+
+class AvHMetabolize : public AvHAlienWeapon 
+{ 
+public: 
+					AvHMetabolize()
+						{ this->Init(); } 
+	
+    virtual void	DeductCostForShot(void);
+
+	virtual BOOL    Deploy();
+
+	virtual int		GetBarrelLength() const;
+        
+    virtual float	GetRateOfFire() const;
+	
+	virtual int		GetDeployAnimation() const;
+	
+	virtual int		GetIdleAnimation() const;
+
+	#ifdef AVH_SERVER
+	virtual int		GetResourceCost() const;
+	#endif
+	
+	virtual int		GetShootAnimation() const;
+	
+	int				GetItemInfo(ItemInfo *p) const;
+	
+	virtual char*	GetViewModel() const;
+	
+	virtual int		iItemSlot(void);
+	
+	virtual void	ItemPostFrame(void);
+
+	virtual void	Precache(void);
+
+	virtual void	Spawn();
+	
+protected: 
+    virtual void    FireProjectiles(void);
+
+    virtual void	Init();
+
+    virtual void    SetAnimationAndSound(void);
+
+	float			mTimeOfLastMetabolizeViewAnim;
+};
+
+class AvHWebSpinner : public AvHAlienWeapon 
+{ 
+public: 
+					AvHWebSpinner()
+						{ this->Init(); } 
+	
+    virtual BOOL    Deploy();
+	
+	virtual int		GetBarrelLength() const;
+
+    virtual float	GetRateOfFire() const;
+
+	virtual int		GetDeployAnimation() const;
+
+	virtual float	GetDeployTime() const;
+	
+	virtual int		GetIdleAnimation() const;
+
+	virtual int		GetShootAnimation() const;
+
+	virtual bool	GetFiresUnderwater() const;
+
+	#ifdef AVH_SERVER
+	virtual bool	GetLastPoint(vec3_t& outLastPoint) const;
+
+	virtual void	SetLastPoint(vec3_t& inLastPoint);
+	#endif
+	
+	virtual bool	GetIsDroppable() const;
+	
+	int				GetItemInfo(ItemInfo *p) const;
+	
+	virtual char*	GetViewModel() const;
+
+	virtual int		iItemSlot(void);
+	
+	virtual void	Precache(void);
+	
+	virtual void	Spawn();
+	
+	virtual bool	UsesAmmo(void) const;
+	
+protected: 
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+
+	#ifdef AVH_SERVER
+	bool			mPlacedValidWebPointSinceDeploy;
+	vec3_t			mLastValidWebPoint;
+	//vec3_t			mLastValidWebNormal;
+	#endif
+
+};
+
+#ifdef AVH_SERVER
+class AvHWebProjectile : public CBaseEntity
+{
+public:
+	virtual bool	CreateWeb();
+	
+	virtual void	Precache(void);
+	
+	virtual void	Spawn(void);
+	
+	void EXPORT		WebTouch(CBaseEntity *pOther);
+
+private:
+	bool			GetWebSpinner(AvHWebSpinner*& outSpinner);
+	
+};
+#endif
+
+class AvHBabblerGun : public AvHAlienWeapon 
+{ 
+public: 
+					AvHBabblerGun()
+						{ this->Init(); } 
+	
+	virtual int		GetBarrelLength() const;
+
+	virtual int		GetDeployAnimation() const;
+
+	virtual int		GetIdleAnimation() const;
+
+	virtual int		GetShootAnimation() const;
+	
+	int				GetItemInfo(ItemInfo *p) const;
+
+	virtual char*	GetViewModel() const;
+	
+	virtual int		iItemSlot(void);
+	
+	virtual void	Precache(void);
+	
+	virtual void	Spawn();
+	
+protected: 
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+};
+
+
+class AvHPrimalScream : public AvHAlienWeapon 
+{ 
+public: 
+					AvHPrimalScream()
+						{ this->Init(); } 
+	
+	virtual int		GetBarrelLength() const;
+
+    virtual float	GetRateOfFire() const;
+	
+	virtual bool	GetFiresUnderwater() const;
+	
+	virtual bool	GetIsDroppable() const;
+
+	virtual int		GetDeployAnimation() const;
+	
+	virtual float	GetDeployTime() const;
+	
+	virtual int		GetIdleAnimation() const;
+
+	virtual int		GetShootAnimation() const;
+	
+	int				GetItemInfo(ItemInfo *p) const;
+	
+	virtual char*	GetViewModel() const;
+
+	virtual int		iItemSlot(void);
+	
+	virtual void	Precache(void);
+	
+	virtual void	Spawn();
+	
+	virtual bool	UsesAmmo(void) const;
+	
+protected: 
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+};
+
+
+//class AvHBuildingGun : public AvHAlienWeapon 
+//{ 
+//public: 
+//					AvHBuildingGun()
+//						{ this->Init(); } 
+//
+//	virtual CBaseEntity*	CreateBuilding(const Vector& inLocation) const;
+//					
+//	virtual int		GetBarrelLength() const;
+//
+//	virtual char*	GetBuildingClassName() const = 0;
+//	
+//	virtual AvHMessageID	GetBuildingMessageID() const = 0;
+//
+//	virtual int		GetBuildingPointCost() const = 0;
+//
+//	virtual int		GetDeployAnimation() const;
+//
+//	virtual float	GetDeployTime() const;
+//
+//	virtual int		GetIdleAnimation() const;
+//
+//	virtual int		GetShootAnimation() const;
+//
+//	virtual int		GetMaxAllowed() const;
+//
+//	virtual int		GetBuildingRadius() const = 0;
+//	
+//	virtual bool	GetFiresUnderwater() const;
+//	
+//	virtual bool	GetIsDroppable() const;
+//
+//	virtual bool	GetMustPressTriggerForEachShot() const;
+//
+//	virtual float	GetRange() const;
+//
+//	virtual char*	GetViewModel() const;
+//	
+//	virtual void	Precache(void);
+//	
+//	virtual void	Spawn() = 0;
+//	
+//	virtual bool	UsesAmmo(void) const;
+//
+//protected: 
+//    virtual void    FireProjectiles(void);
+//	
+//    virtual void	Init();
+//};
+//
+//class AvHResourceTowerGun : public AvHBuildingGun
+//{
+//public:
+//
+//	virtual AvHMessageID	GetBuildingMessageID() const;
+//
+//	virtual char*	GetBuildingClassName() const;
+//	
+//	virtual int		GetBuildingPointCost() const;
+//
+//	virtual int		GetBuildingRadius() const;
+//
+//	virtual int		GetItemInfo(ItemInfo *p);
+//	
+//	virtual int		GetMaxAllowed() const;
+//
+//	virtual int		iItemSlot(void);
+//
+//	virtual void	Spawn();
+//	
+//};
+//
+//
+//class AvHOffenseChamberGun : public AvHBuildingGun
+//{
+//public:
+//	
+//	virtual AvHMessageID	GetBuildingMessageID() const;
+//	
+//	virtual char*	GetBuildingClassName() const;
+//	
+//	virtual int		GetBuildingPointCost() const;
+//	
+//	virtual int		GetBuildingRadius() const;
+//	
+//	virtual int		GetItemInfo(ItemInfo *p);
+//	
+//	virtual int		iItemSlot(void);
+//	
+//	virtual void	Spawn();
+//	
+//};
+//
+//
+//class AvHDefenseChamberGun : public AvHBuildingGun
+//{
+//public:
+//	
+//	virtual AvHMessageID	GetBuildingMessageID() const;
+//	
+//	virtual char*	GetBuildingClassName() const;
+//	
+//	virtual int		GetBuildingPointCost() const;
+//	
+//	virtual int		GetBuildingRadius() const;
+//	
+//	virtual int		GetItemInfo(ItemInfo *p);
+//	
+//	virtual int		iItemSlot(void);
+//	
+//	virtual void	Spawn();
+//	
+//};
+//
+//class AvHSensoryChamberGun : public AvHBuildingGun
+//{
+//public:
+//	
+//	virtual AvHMessageID	GetBuildingMessageID() const;
+//	
+//	virtual char*	GetBuildingClassName() const;
+//	
+//	virtual int		GetBuildingPointCost() const;
+//	
+//	virtual int		GetBuildingRadius() const;
+//	
+//	virtual int		GetItemInfo(ItemInfo *p);
+//	
+//	virtual int		iItemSlot(void);
+//	
+//	virtual void	Spawn();
+//	
+//};
+//
+//class AvHMovementChamberGun : public AvHBuildingGun
+//{
+//public:
+//	
+//	virtual AvHMessageID	GetBuildingMessageID() const;
+//	
+//	virtual char*	GetBuildingClassName() const;
+//	
+//	virtual int		GetBuildingPointCost() const;
+//	
+//	virtual int		GetBuildingRadius() const;
+//	
+//	virtual int		GetItemInfo(ItemInfo *p);
+//	
+//	virtual int		iItemSlot(void);
+//	
+//	virtual void	Spawn();
+//	
+//};
+//
+//class AvHHiveGun : public AvHAlienWeapon 
+//{
+//public:
+//
+//	virtual int		GetBarrelLength() const;
+//
+//	virtual bool	GetFiresUnderwater() const;
+//	
+//	virtual bool	GetIsDroppable() const;
+//	
+//	virtual int		GetItemInfo(ItemInfo *p);
+//
+//	virtual char*	GetViewModel() const;
+//
+//	virtual int		iItemSlot(void);
+//	
+//	virtual void	Precache(void);
+//
+//	virtual void	Spawn();
+//
+//	virtual bool	UsesAmmo(void) const;
+//	
+//protected:
+//    virtual void    FireProjectiles(void);
+//
+//    virtual void	Init();
+//	
+//};
+
+class AvHParalysisGun : public AvHAlienWeapon 
+{ 
+public: 
+					AvHParalysisGun()
+						{ this->Init(); } 
+	
+	virtual int		GetBarrelLength() const;
+
+	virtual int		GetDeployAnimation() const;
+
+	virtual float	GetDeployTime() const;
+
+	virtual int		GetIdleAnimation() const;
+
+	virtual int		GetShootAnimation() const;
+	
+	virtual bool	GetFiresUnderwater() const;
+	
+	virtual bool	GetIsDroppable() const;
+	
+	int				GetItemInfo(ItemInfo *p) const;
+	
+	virtual char*	GetViewModel() const;
+
+	virtual int		iItemSlot(void);
+
+	virtual void	Precache(void);
+	
+	virtual void	Spawn();
+	
+	virtual bool	UsesAmmo(void) const;
+	
+protected: 
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+};
+
+
+class AvHParasiteGun : public AvHAlienWeapon 
+{ 
+public: 
+					AvHParasiteGun()
+						{ this->Init(); } 
+	
+	virtual int		GetBarrelLength() const;
+
+    virtual float	GetRateOfFire() const;
+
+	virtual int		GetDamageType() const;
+		
+	virtual int		GetDeployAnimation() const;
+
+	virtual bool	GetFiresUnderwater() const;
+	
+	virtual bool	GetIsDroppable() const;
+
+	virtual	int		GetShootAnimation() const;
+	
+	int				GetItemInfo(ItemInfo *p) const;
+
+	virtual char*	GetViewModel() const;
+	
+	virtual int		iItemSlot(void);
+	
+	virtual void	Precache(void);
+	
+	virtual void	Spawn();
+	
+	virtual bool	UsesAmmo(void) const;
+	
+protected: 
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+};
+
+#ifdef AVH_SERVER
+class AvHUmbraCloud : public CBaseEntity
+{
+public:
+					AvHUmbraCloud();
+
+	virtual void	Precache(void);
+
+	virtual void	Spawn(void);
+	
+private:
+	float			mTimeHit;
+};
+
+class AvHUmbraProjectile : public CBaseEntity
+{
+public:
+	virtual void	Spawn(void);
+	
+	void EXPORT		UmbraTouch(CBaseEntity* inOther);
+	
+};
+#endif
+
+
+class AvHUmbraGun : public AvHAlienWeapon 
+{ 
+public: 
+					AvHUmbraGun()
+						{ this->Init(); } 
+	
+	virtual int		GetBarrelLength() const;
+
+    virtual float	GetRateOfFire() const;
+ 
+	virtual int		GetDeployAnimation() const;
+		
+	virtual bool	GetFiresUnderwater() const;
+
+	virtual int		GetIdleAnimation() const;
+
+	virtual int		GetShootAnimation() const;
+		
+	virtual bool	GetIsDroppable() const;
+	
+	int				GetItemInfo(ItemInfo *p) const;
+	
+	virtual char*	GetViewModel() const;
+
+	virtual int		iItemSlot(void);
+	
+	virtual void	Precache(void);
+	
+	virtual void	Spawn();
+	
+	virtual bool	UsesAmmo(void) const;
+	
+protected: 
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+};
+
+
+class AvHDivineWind : public AvHAlienWeapon 
+{ 
+public: 
+					AvHDivineWind()
+						{ this->Init(); } 
+
+	virtual BOOL	CanHolster(void);
+					
+	virtual int		GetBarrelLength() const;
+
+	virtual float	GetRateOfFire() const;
+
+	virtual int		GetDeployAnimation() const;
+	
+	virtual bool	GetFiresUnderwater() const;
+	
+	virtual bool	GetIsDroppable() const;
+
+	virtual int		GetShootAnimation() const;
+	
+	int				GetItemInfo(ItemInfo *p) const;
+
+	virtual char*	GetViewModel() const;
+	
+	virtual int		iItemSlot(void);
+	
+	virtual BOOL	IsUseable(void);
+	
+	virtual void	Precache(void);
+	
+	virtual void	Spawn();
+	
+	virtual bool	UsesAmmo(void) const;
+
+	void EXPORT		Explode(void);
+	
+protected: 
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+
+	bool			mPrimed;
+};
+
+#ifdef AVH_SERVER
+class AvHBileBomb : public CBaseEntity
+{
+public:
+	virtual void	Spawn(void);
+
+	void EXPORT		BileBombTouch(CBaseEntity *pOther);
+
+	virtual void	Precache(void);
+
+	void			SetDamage(float inDamage);
+
+private:
+	float			mDamage;
+	//float			mExplodeSprite;
+};
+#endif
+
+class AvHBileBombGun : public AvHAlienWeapon 
+{ 
+public: 
+					AvHBileBombGun()
+						{ this->Init(); } 
+	
+	virtual int		GetBarrelLength() const;
+
+    virtual float   GetRateOfFire() const;
+
+	virtual int		GetDamageType() const;
+
+	virtual int		GetDeployAnimation() const;
+
+	virtual int		GetShootAnimation() const;
+		
+	int				GetItemInfo(ItemInfo *p) const;
+	
+	virtual char*	GetViewModel() const;
+
+	virtual int		iItemSlot(void);
+	
+	virtual void	Precache(void);
+	
+	virtual void	Spawn();
+	
+protected: 
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+};
+
+#ifdef AVH_SERVER
+class AvHAcidRocket : public CBaseEntity
+{
+public:
+	virtual void	Precache(void);
+
+	virtual void	Spawn(void);
+
+	void EXPORT		AcidRocketTouch(CBaseEntity *pOther);
+
+	void EXPORT		AcidRocketDeath();
+
+	void			SetDamage(float inDamage);
+
+private:
+	float			mDamage;
+};
+#endif
+
+
+class AvHAcidRocketGun : public AvHAlienWeapon 
+{ 
+public: 
+					AvHAcidRocketGun()
+						{ this->Init(); } 
+	
+	virtual int		GetBarrelLength() const;
+	virtual float   GetRateOfFire() const;
+
+	virtual int		GetDeployAnimation() const;
+		
+	virtual bool	GetFiresUnderwater() const;
+
+	virtual bool	GetIsDroppable() const;
+
+	virtual int		GetIdleAnimation() const;
+
+	int				GetItemInfo(ItemInfo *p) const;
+
+	virtual bool	GetMustPressTriggerForEachShot() const;
+
+	virtual int		GetShootAnimation() const;
+		
+	virtual char*	GetViewModel() const;
+	
+	virtual int		iItemSlot(void);
+	
+	virtual void	Precache(void);
+	
+	virtual void	Spawn();
+	
+protected: 
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+};
+
+class AvHDevour : public AvHAlienWeapon 
+{ 
+public: 
+					AvHDevour()
+						{ this->Init(); } 
+	
+	virtual BOOL	CanHolster(void);
+ 
+	virtual int		GetBarrelLength() const;
+
+    virtual float	GetRateOfFire() const;
+
+	virtual bool	GetIsCapableOfFiring() const;
+	
+	virtual int		GetDeployAnimation() const;
+
+	virtual float	GetDeployTime() const;
+	
+	virtual bool	GetFiresUnderwater() const;
+	
+	virtual int		GetIdleAnimation() const;
+
+	virtual bool	GetIsDroppable() const;
+
+	virtual int		GetShootAnimation() const;
+	
+	int				GetItemInfo(ItemInfo *p) const;
+	
+	virtual char*	GetViewModel() const;
+	
+	virtual int		iItemSlot(void);
+
+	virtual void	Precache(void);
+	
+	virtual void	Spawn();
+	
+	virtual bool	UsesAmmo(void) const;
+	
+protected: 
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+
+    virtual bool    ProcessValidAttack(void);
+
+};
+
+#ifdef AVH_SERVER
+class AvHStompProjectile : public CBaseEntity
+{
+public:
+	AvHStompProjectile();
+	
+	virtual void	Precache(void);
+
+	virtual void	SetStunTime(float inStunTime);
+
+	virtual void	Spawn(void);
+	
+	void EXPORT		StompTouch(CBaseEntity* inOther);
+
+	Vector			mSpawnLocation;
+
+private:
+	float			mStunTime;
+	
+};
+#endif
+
+class AvHStomp : public AvHAlienWeapon 
+{ 
+public: 
+	AvHStomp()
+	{ this->Init(); } 
+
+	virtual BOOL	CanHolster(void);
+	
+	virtual int		GetBarrelLength() const;
+
+    virtual float	GetRateOfFire() const;
+	
+	virtual int		GetDeployAnimation() const;
+	
+	virtual float	GetDeployTime() const;
+
+	virtual void	GetEventAngles(Vector& outAngles) const;
+
+	virtual void	GetEventOrigin(Vector& outOrigin) const;
+
+	virtual bool	GetFiresUnderwater() const;
+	
+	virtual bool	GetIsDroppable() const;
+	
+	virtual int		GetShootAnimation() const;
+	
+	int				GetItemInfo(ItemInfo *p) const;
+	
+	virtual char*	GetViewModel() const;
+	
+	virtual int		iItemSlot(void);
+
+	virtual BOOL	IsUseable(void);
+	
+	virtual void	Precache(void);
+	
+	virtual void	Spawn();
+	
+	virtual bool	UsesAmmo(void) const;
+	
+protected: 
+	virtual void	GetStompOrigin(Vector& outOrigin) const;
+
+	virtual void	GetStompVelocity(Vector& outVelocity) const;
+
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+	
+};
+
+
+
+#endif
+
+
diff --git a/main/source/mod/AvHAmbientSound.cpp b/main/source/mod/AvHAmbientSound.cpp
new file mode 100644
index 00000000..07942265
--- /dev/null
+++ b/main/source/mod/AvHAmbientSound.cpp
@@ -0,0 +1,108 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHAmbientSound.cpp $
+// $Date: 2002/07/10 14:38:50 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHAmbientSound.cpp,v $
+// Revision 1.5  2002/07/10 14:38:50  Flayra
+// - Fixed bug where sound volume wasn't being set for omnipresent sounds, added document headers
+//
+//===============================================================================
+#include "mod/AvHAmbientSound.h"
+#include "cl_dll/hud.h"
+#include "common/vec_op.h"
+#include <stdlib.h>
+#include "cl_dll/cl_util.h"
+
+AvHAmbientSound::AvHAmbientSound(const string& inRelativeSoundName, int inVolume, int inFadeDistance, bool inLooping, const Vector& inPosition, int inEntIndex, float inTimeElapsed)
+{
+	this->mInitialized = false;
+	this->mStream = NULL;
+	this->mChannel = 0;
+	this->mVolume = inVolume;
+	this->mLooping = inLooping;
+	this->mFadeDistance = inFadeDistance;
+	VectorCopy(inPosition, this->mPosition);
+	this->mEntityIndex = inEntIndex;
+	this->mTimeElapsed = inTimeElapsed;
+	
+	// Start playing the song
+	string theSoundName = string(getModDirectory()) + "/" + string(inRelativeSoundName);
+	this->mSoundName = theSoundName;
+}
+
+AvHAmbientSound::AvHAmbientSound(const AvHAmbientSound& inSource)
+{
+	// Don't re-init, just copy values
+	this->mInitialized = inSource.mInitialized;
+	this->mStream = inSource.mStream;
+	this->mChannel = inSource.mChannel;
+	this->mVolume = inSource.mVolume;
+	this->mLooping = inSource.mLooping;
+	this->mSoundName = inSource.mSoundName;
+	this->mFadeDistance = inSource.mFadeDistance;
+	VectorCopy(inSource.mPosition, this->mPosition);
+	this->mEntityIndex = inSource.mEntityIndex;
+}
+
+void AvHAmbientSound::ClearData()
+{
+	if(this->mInitialized)
+	{
+		gHUD.ClearStream(this->mStream);
+	}
+}
+
+int	AvHAmbientSound::GetEntityIndex() const
+{
+	return this->mEntityIndex;
+}
+
+void AvHAmbientSound::SetPosition(const Vector& inPosition)
+{
+	VectorCopy(inPosition, this->mPosition);
+}
+
+void AvHAmbientSound::StartPlayingIfNot()
+{
+	if(!this->mInitialized)
+	{
+		int theBytesInSong;
+		this->mInitialized = gHUD.PlaySong(this->mSoundName, this->mVolume, this->mLooping, this->mStream, this->mChannel, theBytesInSong, this->mTimeElapsed);
+	}
+}
+
+void AvHAmbientSound::UpdateVolume(const Vector& inListenerPosition)
+{
+	if(this->mInitialized)
+	{
+		Vector theDistanceVector = inListenerPosition - this->mPosition;
+		float theDistance = sqrt(theDistanceVector[0]*theDistanceVector[0] + theDistanceVector[1]*theDistanceVector[1] + theDistanceVector[2]*theDistanceVector[2]);
+
+		//FSOUND_SetPan(this->mChannel, FSOUND_STEREOPAN);
+		int theVolume = this->mVolume;
+
+		if(this->mFadeDistance > 0)
+		{
+			theVolume = this->mVolume - this->mVolume*(theDistance/(float)this->mFadeDistance);
+		}
+
+		theVolume = min(max(0, theVolume), 255);
+
+        FMOD_INSTANCE* theFMOD = gHUD.GetFMOD();
+
+        if (theFMOD)
+        {
+    		theFMOD->FSOUND_SetVolume(this->mChannel, theVolume);
+        }
+
+	}
+}
diff --git a/main/source/mod/AvHAmbientSound.h b/main/source/mod/AvHAmbientSound.h
new file mode 100644
index 00000000..63ed7392
--- /dev/null
+++ b/main/source/mod/AvHAmbientSound.h
@@ -0,0 +1,66 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHAmbientSound.h $
+// $Date: 2002/07/10 14:38:51 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHAmbientSound.h,v $
+// Revision 1.5  2002/07/10 14:38:51  Flayra
+// - Fixed bug where sound volume wasn't being set for omnipresent sounds, added document headers
+//
+//===============================================================================
+#ifndef AVH_AMBIENT_SOUND_H
+#define AVH_AMBIENT_SOUND_H
+
+#include "types.h"
+#include "fmod.h"
+#include "ui/UIHud.h"
+#include "mod/AvHSharedTypes.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHParticleSystem.h"
+#include "common/entity_state.h"
+#include "VGUI_ProgressBar.h"
+#include "ui/MarqueeComponent.h"
+#include "mod/AvHOrder.h"
+#include "mod/AvHMessage.h"
+
+class AvHAmbientSound
+{
+public:
+						AvHAmbientSound(const string& inRelativeSoundName, int inVolume, int inFadeDistance, bool inLooping, const Vector& inPosition, int inEntIndex, float inTimeElapsed = -1);
+						AvHAmbientSound(const AvHAmbientSound& inSource);
+
+	void				ClearData();
+
+	int					GetEntityIndex() const;
+
+	void				SetPosition(const Vector& inPosition);
+
+	void				StartPlayingIfNot();
+
+	void				UpdateVolume(const Vector& inListenerPosition);
+
+private:
+	// Changing or adding data?  Don't forget to put it in the copy constructor!
+	FSOUND_STREAM*		mStream;
+	int					mChannel;
+	bool				mInitialized;
+
+	string				mSoundName;
+	int					mVolume;
+	int					mFadeDistance;
+	bool				mLooping;
+	Vector				mPosition;
+	int					mEntityIndex;
+	float				mTimeElapsed;
+	
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHAssert.cpp b/main/source/mod/AvHAssert.cpp
new file mode 100644
index 00000000..ad132c6b
--- /dev/null
+++ b/main/source/mod/AvHAssert.cpp
@@ -0,0 +1,77 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHAssert.cpp $
+// $Date: 2002/07/24 19:01:51 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHAssert.cpp,v $
+// Revision 1.7  2002/07/24 19:01:51  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.6  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "util/nowarnings.h"
+#include <string.h>
+#include <stdio.h>
+#include "util/Zassert.h"
+
+#ifdef AVH_SERVER
+#include "extdll.h"
+#include "dlls/util.h"
+#include "cbase.h"
+extern cvar_t avh_assert;
+#endif
+
+#ifdef AVH_CLIENT
+#endif
+
+#include "assert.h"
+
+#ifdef	DEBUG
+	void
+DBG_AssertFunction(
+	bool		fExpr,
+	const char*	szExpr,
+	const char*	szFile,
+	int			szLine,
+	const char*	szMessage)
+	{
+	if (fExpr)
+		return;
+	char szOut[512];
+	if (szMessage != NULL)
+		sprintf(szOut, "ASSERT FAILED: %s (%s@%d)\n%s", szExpr, szFile, szLine, szMessage);
+	else
+		sprintf(szOut, "ASSERT FAILED: %s (%s@%d)\n", szExpr, szFile, szLine);
+
+	#ifdef AVH_SERVER
+	ALERT(at_logged, szOut);
+	
+	// Ability to disable ASSERTs on server
+	if(avh_assert.value == 0.0f)
+	{
+		UTIL_ClientPrintAll(HUD_PRINTNOTIFY, szOut); 
+		return;
+	}
+	ALERT(at_console, szOut);
+	#endif
+	
+	#ifdef WIN32
+	_assert((void*)szExpr, (void*)szFile, szLine);
+	#else
+	assert(fExpr);
+	#endif
+
+	}
+#endif	// DEBUG
+
+
diff --git a/main/source/mod/AvHBabblerGun.cpp b/main/source/mod/AvHBabblerGun.cpp
new file mode 100644
index 00000000..a5ecc069
--- /dev/null
+++ b/main/source/mod/AvHBabblerGun.cpp
@@ -0,0 +1,572 @@
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "monsters.h"
+#include "weapons.h"
+#include "nodes.h"
+#include "player.h"
+#include "soundent.h"
+#include "gamerules.h"
+
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHHulls.h"
+
+// Allow assignment within conditional
+#pragma warning (disable: 4706)
+
+#ifdef AVH_SERVER
+
+enum w_squeak_e {
+	WSQUEAK_IDLE1 = 0,
+	WSQUEAK_FIDGET,
+	WSQUEAK_JUMP,
+	WSQUEAK_RUN,
+};
+
+enum squeak_e {
+	SQUEAK_IDLE1 = 0,
+	SQUEAK_FIDGETFIT,
+	SQUEAK_FIDGETNIP,
+	SQUEAK_DOWN,
+	SQUEAK_UP,
+	SQUEAK_THROW
+};
+
+
+class BabblerProjectile : public CGrenade
+{
+	void Spawn( void );
+	void Precache( void );
+	//int  Classify( void );
+	virtual int	IRelationship(CBaseEntity* inTarget);
+
+	void EXPORT SuperBounceTouch( CBaseEntity *pOther );
+	void EXPORT HuntThink( void );
+	int  BloodColor( void ) { return BLOOD_COLOR_YELLOW; }
+	void Killed( entvars_t *pevAttacker, int iGib );
+	void GibMonster( void );
+	int	TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType);
+
+	static float m_flNextBounceSoundTime;
+
+	// CBaseEntity *m_pTarget;
+	float m_flDie;
+	Vector m_vecTarget;
+	float m_flNextHunt;
+	float m_flNextHit;
+	Vector m_posPrev;
+	EHANDLE m_hOwner;
+	int  m_iMyClass;
+};
+
+float BabblerProjectile::m_flNextBounceSoundTime = 0;
+
+LINK_ENTITY_TO_CLASS(kwBabblerProjectile, BabblerProjectile);
+
+//TYPEDESCRIPTION	BabblerProjectile::m_SaveData[] = 
+//{
+//	DEFINE_FIELD( BabblerProjectile, m_flDie, FIELD_TIME ),
+//	DEFINE_FIELD( BabblerProjectile, m_vecTarget, FIELD_VECTOR ),
+//	DEFINE_FIELD( BabblerProjectile, m_flNextHunt, FIELD_TIME ),
+//	DEFINE_FIELD( BabblerProjectile, m_flNextHit, FIELD_TIME ),
+//	DEFINE_FIELD( BabblerProjectile, m_posPrev, FIELD_POSITION_VECTOR ),
+//	DEFINE_FIELD( BabblerProjectile, m_hOwner, FIELD_EHANDLE ),
+//};
+//
+//IMPLEMENT_SAVERESTORE( BabblerProjectile, CGrenade );
+
+#define SQUEEK_DETONATE_DELAY	15.0
+
+//int BabblerProjectile :: Classify ( void )
+//{
+//	if (m_iMyClass != 0)
+//		return m_iMyClass; // protect against recursion
+//
+//	if (m_hEnemy != NULL)
+//	{
+//		m_iMyClass = CLASS_INSECT; // no one cares about it
+//		switch( m_hEnemy->Classify( ) )
+//		{
+//			case CLASS_PLAYER:
+//			case CLASS_HUMAN_PASSIVE:
+//			case CLASS_HUMAN_MILITARY:
+//				m_iMyClass = 0;
+//				return CLASS_ALIEN_MILITARY; // barney's get mad, grunts get mad at it
+//		}
+//		m_iMyClass = 0;
+//	}
+//
+//	return CLASS_ALIEN_BIOWEAPON;
+//}
+
+int BabblerProjectile::IRelationship(CBaseEntity* inTarget)
+{
+	int theRelationship = R_NO;
+
+	// Don't attack cloaked players
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inTarget);
+	if(thePlayer && thePlayer->GetIsCloaked())
+	{
+		theRelationship = R_NO;
+	}
+	else
+	{
+		// Attack all monsters that aren't on our team
+		CBaseMonster* theMonsterPointer = dynamic_cast<CBaseMonster*>(inTarget);
+		if(theMonsterPointer && (theMonsterPointer->pev->team != this->pev->team))
+		{
+			theRelationship = R_DL;
+		}
+		else
+		{
+			// Look at own team vs. incoming team
+			AvHTeamNumber inTeam = (AvHTeamNumber)inTarget->pev->team;
+			if(inTeam != TEAM_IND)
+			{
+				if(inTeam == this->pev->team)
+				{
+					theRelationship = R_AL;
+				}
+				else
+				{
+					// Don't keep switching targets constantly
+					theRelationship = R_DL;
+				}
+			}
+		}
+	}
+	
+	return theRelationship;
+}
+
+void BabblerProjectile::Spawn( void )
+{
+	Precache( );
+	// motor
+	pev->movetype = MOVETYPE_BOUNCE;
+	pev->solid = SOLID_BBOX;
+	pev->classname = MAKE_STRING(kwsBabblerProjectile);
+
+	SET_MODEL(ENT(pev), kBabblerModel);
+	//UTIL_SetSize(pev, Vector( -4, -4, 0), Vector(4, 4, 8));
+	UTIL_SetSize(pev, Vector(HULL1_MINX, HULL1_MINY, HULL1_MINZ), Vector(HULL1_MAXX, HULL1_MAXY, HULL1_MAXZ));
+	UTIL_SetOrigin( pev, pev->origin );
+
+	SetTouch( &BabblerProjectile::SuperBounceTouch );
+	SetThink( &BabblerProjectile::HuntThink );
+	pev->nextthink = gpGlobals->time + 0.1;
+	m_flNextHunt = gpGlobals->time + 1E6;
+
+	pev->flags |= FL_MONSTER;
+	pev->takedamage		= DAMAGE_AIM;
+	pev->health			= gSkillData.snarkHealth;
+	pev->gravity		= 0.5;
+	pev->friction		= 0.5;
+
+	m_flDie = gpGlobals->time + SQUEEK_DETONATE_DELAY;
+
+	m_flFieldOfView = 0; // 180 degrees
+
+	if ( pev->owner )
+		m_hOwner = Instance( pev->owner );
+
+	m_flNextBounceSoundTime = gpGlobals->time;// reset each time a snark is spawned.
+
+	//pev->sequence = WSQUEAK_RUN;
+	pev->sequence = 4;
+	ResetSequenceInfo( );
+}
+
+void BabblerProjectile::Precache( void )
+{
+	PRECACHE_UNMODIFIED_MODEL(kBabblerModel);
+	
+	PRECACHE_UNMODIFIED_SOUND(kBabblerBlastSound);
+	PRECACHE_UNMODIFIED_SOUND(kBabblerDieSound);
+	PRECACHE_UNMODIFIED_SOUND(kBabblerHunt1Sound);
+	PRECACHE_UNMODIFIED_SOUND(kBabblerHunt2Sound);
+	PRECACHE_UNMODIFIED_SOUND(kBabblerHunt3Sound);
+	PRECACHE_UNMODIFIED_SOUND(kBabblerBiteSound);
+	PRECACHE_UNMODIFIED_SOUND("common/bodysplat.wav");
+}
+
+
+void BabblerProjectile :: Killed( entvars_t *pevAttacker, int iGib )
+{
+	pev->model = iStringNull;// make invisible
+	SetThink( &BabblerProjectile::SUB_Remove );
+	SetTouch( NULL );
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	// since squeak grenades never leave a body behind, clear out their takedamage now.
+	// Squeaks do a bit of radius damage when they pop, and that radius damage will
+	// continue to call this function unless we acknowledge the Squeak's death now. (sjb)
+	pev->takedamage = DAMAGE_NO;
+
+	// play squeek blast
+	EMIT_SOUND_DYN(ENT(pev), CHAN_ITEM, kBabblerBlastSound, 1, 0.5, 0, PITCH_NORM);	
+
+	CSoundEnt::InsertSound ( bits_SOUND_COMBAT, pev->origin, SMALL_EXPLOSION_VOLUME, 3.0 );
+
+	UTIL_BloodDrips( pev->origin, g_vecZero, BloodColor(), 80 );
+
+	if (m_hOwner != NULL)
+		RadiusDamage ( pev, m_hOwner->pev, kBabblerExplodeDamage, CLASS_NONE, NS_DMG_BLAST);
+	else
+		RadiusDamage ( pev, pev, kBabblerExplodeDamage, CLASS_NONE, NS_DMG_BLAST );
+
+	// reset owner so death message happens
+	if (m_hOwner != NULL)
+		pev->owner = m_hOwner->edict();
+
+	CBaseMonster :: Killed( pevAttacker, GIB_ALWAYS );
+}
+
+void BabblerProjectile :: GibMonster( void )
+{
+	EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, "common/bodysplat.wav", 0.75, ATTN_NORM, 0, 200);		
+}
+
+int	BabblerProjectile::TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType)
+{
+	if(!pevAttacker)
+	{
+		pevAttacker = pevInflictor;
+	}
+	
+	if(!pevInflictor)
+	{
+		pevInflictor = pevAttacker;
+	}
+
+	// Note: NS_DMG_ORGANIC should affect us fully
+
+	return CGrenade::TakeDamage(pevInflictor, pevAttacker, flDamage, bitsDamageType);
+}
+
+
+void BabblerProjectile::HuntThink( void )
+{
+	// ALERT( at_console, "think\n" );
+
+	if (!IsInWorld())
+	{
+		SetTouch( NULL );
+		UTIL_Remove( this );
+		return;
+	}
+	
+	StudioFrameAdvance( );
+	pev->nextthink = gpGlobals->time + 0.1;
+
+	// explode when ready
+	if (gpGlobals->time >= m_flDie)
+	{
+		g_vecAttackDir = pev->velocity.Normalize( );
+		pev->health = -1;
+		Killed( pev, 0 );
+		return;
+	}
+
+	// float
+	if (pev->waterlevel != 0)
+	{
+		if (pev->movetype == MOVETYPE_BOUNCE)
+		{
+			pev->movetype = MOVETYPE_FLY;
+		}
+		pev->velocity = pev->velocity * 0.9;
+		pev->velocity.z += 8.0;
+	}
+	else if (pev->movetype = MOVETYPE_FLY)
+	{
+		pev->movetype = MOVETYPE_BOUNCE;
+	}
+
+	// return if not time to hunt
+	if (m_flNextHunt > gpGlobals->time)
+		return;
+
+	m_flNextHunt = gpGlobals->time + 2.0;
+	
+	CBaseEntity *pOther = NULL;
+	Vector vecDir;
+	TraceResult tr;
+
+	Vector vecFlat = pev->velocity;
+	vecFlat.z = 0;
+	vecFlat = vecFlat.Normalize( );
+
+	UTIL_MakeVectors( pev->angles );
+
+	if (m_hEnemy == NULL || !m_hEnemy->IsAlive())
+	{
+		// find target, bounce a bit towards it.
+		Look( 512 );
+		m_hEnemy = BestVisibleEnemy( );
+	}
+
+	// squeek if it's about time blow up
+	if ((m_flDie - gpGlobals->time <= 0.5) && (m_flDie - gpGlobals->time >= 0.3))
+	{
+		EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, kBabblerDieSound, 1, ATTN_NORM, 0, 100 + RANDOM_LONG(0,0x3F));
+		CSoundEnt::InsertSound ( bits_SOUND_COMBAT, pev->origin, 256, 0.25 );
+	}
+
+	// higher pitch as squeeker gets closer to detonation time
+	float flpitch = 155.0 - 60.0 * ((m_flDie - gpGlobals->time) / SQUEEK_DETONATE_DELAY);
+	if (flpitch < 80)
+		flpitch = 80;
+
+	if (m_hEnemy != NULL)
+	{
+		if (FVisible( m_hEnemy ))
+		{
+			vecDir = m_hEnemy->EyePosition() - pev->origin;
+			m_vecTarget = vecDir.Normalize( );
+		}
+
+		float flVel = pev->velocity.Length();
+		float flAdj = 50.0 / (flVel + 10.0);
+
+		if (flAdj > 1.2)
+			flAdj = 1.2;
+		
+		// ALERT( at_console, "think : enemy\n");
+
+		// ALERT( at_console, "%.0f %.2f %.2f %.2f\n", flVel, m_vecTarget.x, m_vecTarget.y, m_vecTarget.z );
+
+		pev->velocity = pev->velocity * flAdj + m_vecTarget * 300;
+	}
+
+	if (pev->flags & FL_ONGROUND)
+	{
+		pev->avelocity = Vector( 0, 0, 0 );
+	}
+	else
+	{
+		if (pev->avelocity == Vector( 0, 0, 0))
+		{
+			pev->avelocity.x = RANDOM_FLOAT( -100, 100 );
+			pev->avelocity.z = RANDOM_FLOAT( -100, 100 );
+		}
+	}
+
+	if ((pev->origin - m_posPrev).Length() < 1.0)
+	{
+		pev->velocity.x = RANDOM_FLOAT( -100, 100 );
+		pev->velocity.y = RANDOM_FLOAT( -100, 100 );
+	}
+	m_posPrev = pev->origin;
+
+	pev->angles = UTIL_VecToAngles( pev->velocity );
+	pev->angles.z = 0;
+	pev->angles.x = 0;
+}
+
+
+void BabblerProjectile::SuperBounceTouch( CBaseEntity *pOther )
+{
+	float	flpitch;
+
+	TraceResult tr = UTIL_GetGlobalTrace( );
+
+	// don't hit the guy that launched this grenade
+	if ( pev->owner && pOther->edict() == pev->owner )
+		return;
+
+	// at least until we've bounced once
+	pev->owner = NULL;
+
+	pev->angles.x = 0;
+	pev->angles.z = 0;
+
+	// avoid bouncing too much
+	if (m_flNextHit > gpGlobals->time)
+		return;
+
+	// higher pitch as squeeker gets closer to detonation time
+	flpitch = 155.0 - 60.0 * ((m_flDie - gpGlobals->time) / SQUEEK_DETONATE_DELAY);
+
+	if ( pOther->pev->takedamage && m_flNextAttack < gpGlobals->time )
+	{
+		// attack!
+
+		// make sure it's me who has touched them
+		if (tr.pHit == pOther->edict())
+		{
+			// and it's not another squeakgrenade
+			if (tr.pHit->v.modelindex != pev->modelindex)
+			{
+				// ALERT( at_console, "hit enemy\n");
+				ClearMultiDamage( );
+				pOther->TraceAttack(pev, kBabblerBiteDamage, gpGlobals->v_forward, &tr, NS_DMG_BLAST); 
+				if (m_hOwner != NULL)
+					ApplyMultiDamage( pev, m_hOwner->pev );
+				else
+					ApplyMultiDamage( pev, pev );
+
+				// m_flDie += 2.0; // add more life
+
+				// make bite sound
+				EMIT_SOUND(ENT(pev), CHAN_WEAPON, kBabblerBiteSound, 1.0, ATTN_NORM);//, (int)flpitch);
+				//EMIT_SOUND_DYN(ENT(pev), CHAN_WEAPON, kBabblerBiteSound, 1.0, ATTN_NORM, 0, (int)flpitch);
+				m_flNextAttack = gpGlobals->time + 0.5;
+			}
+		}
+		else
+		{
+			// ALERT( at_console, "been hit\n");
+		}
+	}
+
+	m_flNextHit = gpGlobals->time + 0.1;
+	m_flNextHunt = gpGlobals->time;
+
+	// Limit how often snarks can make their bounce sounds to prevent overflows.
+	if ( gpGlobals->time < m_flNextBounceSoundTime )
+	{
+		// too soon!
+		return;
+	}
+
+	if (!(pev->flags & FL_ONGROUND))
+	{
+		// play bounce sound
+		float flRndSound = RANDOM_FLOAT ( 0 , 1 );
+
+		if ( flRndSound <= 0.33 )
+			EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, kBabblerHunt1Sound, 1, ATTN_NORM, 0, (int)flpitch);		
+		else if (flRndSound <= 0.66)
+			EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, kBabblerHunt2Sound, 1, ATTN_NORM, 0, (int)flpitch);
+		else 
+			EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, kBabblerHunt3Sound, 1, ATTN_NORM, 0, (int)flpitch);
+		CSoundEnt::InsertSound ( bits_SOUND_COMBAT, pev->origin, 256, 0.25 );
+	}
+	else
+	{
+		// skittering sound
+		CSoundEnt::InsertSound ( bits_SOUND_COMBAT, pev->origin, 100, 0.1 );
+	}
+
+	m_flNextBounceSoundTime = gpGlobals->time + 0.5;// half second.
+}
+
+#endif
+
+
+
+
+
+LINK_ENTITY_TO_CLASS(kwBabblerGun, AvHBabblerGun);
+
+void AvHBabblerGun::Init()
+{
+	this->mRange = kBabblerGunRange;
+	this->mROF = kBabblerGunROF;
+}
+
+int	AvHBabblerGun::GetBarrelLength() const
+{
+	return kBabblerGunBarrelLength;
+}
+
+int	AvHBabblerGun::GetDeployAnimation() const
+{
+	return 7;
+}
+
+int	AvHBabblerGun::GetIdleAnimation() const
+{
+	// Must be odd
+	int theAnimation = UTIL_SharedRandomLong(this->m_pPlayer->random_seed, 0, 1);
+	return theAnimation;
+}
+
+int	AvHBabblerGun::GetShootAnimation() const
+{
+	return 4;
+}
+
+char* AvHBabblerGun::GetViewModel() const
+{
+	return kLevel2ViewModel;
+}
+
+void AvHBabblerGun::Precache()
+{
+	AvHAlienWeapon::Precache();
+
+	PRECACHE_UNMODIFIED_SOUND(kBabblerGunSound);
+
+	UTIL_PrecacheOther(kwsBabblerProjectile);
+	
+	this->mEvent = PRECACHE_EVENT(1, kBabblerGunEventName);
+}
+
+
+void AvHBabblerGun::Spawn() 
+{ 
+    AvHAlienWeapon::Spawn(); 
+	
+	this->Precache();
+	
+	this->m_iId = AVH_WEAPON_BABBLER;
+	
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsBabblerGun);
+	
+	SET_MODEL(ENT(this->pev), kNullModel);
+	
+	FallInit();// get ready to fall down.
+} 
+
+
+void AvHBabblerGun::FireProjectiles(void)
+{
+	#ifdef AVH_SERVER
+
+	// TODO: Make sure we don't have too many already?  Play a sound if we have too many?
+
+	UTIL_MakeVectors( this->m_pPlayer->pev->v_angle );
+	TraceResult tr;
+	Vector trace_origin;
+
+	// HACK HACK:  Ugly hacks to handle change in origin based on new physics code for players
+	// Move origin up if crouched and start trace a bit outside of body ( 20 units instead of 16 )
+	trace_origin = this->m_pPlayer->pev->origin + this->m_pPlayer->pev->view_ofs;
+//	if(this->m_pPlayer->pev->flags & FL_DUCKING)
+//	{
+//		trace_origin = trace_origin - (VEC_HULL_MIN - VEC_DUCK_HULL_MIN);
+//	}
+
+	// find place to toss monster
+	UTIL_TraceLine( trace_origin + gpGlobals->v_forward * 20, trace_origin + gpGlobals->v_forward * 64, dont_ignore_monsters, NULL, &tr );
+
+	if ( tr.fAllSolid == 0 && tr.fStartSolid == 0 && tr.flFraction > 0.25 )
+	{
+		CBaseEntity* theProjectile = CBaseEntity::Create(kwsBabblerProjectile, tr.vecEndPos, this->m_pPlayer->pev->v_angle, this->m_pPlayer->edict() );
+		theProjectile->pev->velocity = gpGlobals->v_forward * 200 + this->m_pPlayer->pev->velocity;
+		theProjectile->pev->team = this->m_pPlayer->pev->team;
+		theProjectile->pev->owner = this->m_pPlayer->edict();
+	}
+
+	#endif	
+}
+
diff --git a/main/source/mod/AvHBalance.cpp b/main/source/mod/AvHBalance.cpp
new file mode 100644
index 00000000..c6aff18c
--- /dev/null
+++ b/main/source/mod/AvHBalance.cpp
@@ -0,0 +1,761 @@
+#include "build.h"
+#include "util/nowarnings.h"
+#include "mod/AvHConstants.h"
+
+#ifdef AVH_SERVER
+#include "extdll.h"
+#include "dlls/util.h"
+#include "cbase.h"
+#include "player.h"
+#include "weapons.h"
+#include "mod/AvHGamerules.h"
+#include "util/STLUtil.h"
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHServerUtil.h"
+#endif
+
+#ifdef AVH_CLIENT
+#include "cl_dll/hud.h"
+#include "mod/AvHHud.h"
+#endif
+
+#ifdef AVH_PLAYTEST_BUILD
+
+int AvHGetBalanceInt(const BalanceIntListType& inBalanceInts, const string& inName)
+{
+	int theBalanceValue = 0;
+
+	// Look it up
+	bool theFoundIt = false;
+
+	if(inBalanceInts.size() > 0)
+	{
+		for(BalanceIntListType::const_iterator theIter = inBalanceInts.begin(); theIter != inBalanceInts.end(); theIter++)
+		{
+			if(theIter->first == inName)
+			{
+				theBalanceValue = theIter->second;
+				theFoundIt = true;
+				break;
+			}
+		}
+	}
+
+	if(!theFoundIt)
+	{
+		#ifdef AVH_SERVER
+		char theErrorString[512];
+		sprintf(theErrorString, "Couldn't find balance key %s\r\n", inName.c_str());
+		ALERT(at_logged, theErrorString);
+		#endif
+	}
+
+	return theBalanceValue;
+}
+
+float AvHGetBalanceFloat(const BalanceFloatListType& inBalanceFloats, const string& inName)
+{
+	float theBalanceValue = 0;
+	
+	// Look it up
+	bool theFoundIt = false;
+
+	if(inBalanceFloats.size() > 0)
+	{
+		for(BalanceFloatListType::const_iterator theIter = inBalanceFloats.begin(); theIter != inBalanceFloats.end(); theIter++)
+		{
+			if(theIter->first == inName)
+			{
+				theBalanceValue = theIter->second;
+				theFoundIt = true;
+				break;
+			}
+		}
+	}
+	
+	if(!theFoundIt)
+	{
+		#ifdef AVH_SERVER
+		char theErrorString[512];
+		sprintf(theErrorString, "Couldn't find balance key %s\r\n", inName.c_str());
+		ALERT(at_logged, theErrorString);
+		#endif
+	}
+	
+	return theBalanceValue;
+}
+
+// Lookup current value of variable
+int GetBalanceInt(const string& inName)
+{
+	int theValue = 0;
+
+	#ifdef AVH_SERVER
+	// Look up variable via gamerules
+	theValue = GetGameRules()->GetBalanceInt(inName);
+	#endif
+
+	#ifdef AVH_CLIENT
+	const BalanceIntListType& theBalanceInts = gHUD.GetBalanceInts();
+	theValue = AvHGetBalanceInt(theBalanceInts, inName);
+	#endif
+
+	return theValue;
+}
+
+float GetBalanceFloat(const string& inName)
+{
+	float theValue = 0.0f;
+
+	#ifdef AVH_SERVER
+	// Look up variable via gamerules
+	theValue = GetGameRules()->GetBalanceFloat(inName);
+	#endif
+
+	#ifdef AVH_CLIENT
+	const BalanceFloatListType& theBalanceFloats = gHUD.GetBalanceFloats();
+	theValue = AvHGetBalanceFloat(theBalanceFloats, inName);
+	#endif
+
+	return theValue;
+}
+#endif
+
+#ifdef AVH_SERVER
+
+#ifdef AVH_PLAYTEST_BUILD
+
+// Playtest functionality
+int	AvHGamerules::GetBalanceInt(const string& inName) const
+{
+	int theBalanceValue = 0;
+
+	theBalanceValue = AvHGetBalanceInt(this->mBalanceInts, inName);
+
+	return theBalanceValue;
+}
+
+float AvHGamerules::GetBalanceFloat(const string& inName) const
+{
+	float theBalanceValue = 0;
+
+	theBalanceValue = AvHGetBalanceFloat(this->mBalanceFloats, inName);
+	
+	return theBalanceValue;
+}
+
+const BalanceIntListType& AvHGamerules::GetBalanceInts() const
+{
+	return this->mBalanceInts;
+}
+
+const BalanceFloatListType&	AvHGamerules::GetBalanceFloats() const
+{
+	return this->mBalanceFloats;
+}
+
+void AvHGamerules::BalanceChanged()
+{
+	this->mTeamOne.BalanceChanged();
+	this->mTeamTwo.BalanceChanged();
+
+	// Tell all players to update their weapons
+	FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+		theEntity->SendWeaponUpdate();
+	END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+}
+#endif
+
+static string theBalanceFileName = string(getModDirectory()) + "/Balance.txt";
+
+#ifdef AVH_PLAYTEST_BUILD
+
+void AvHGamerules::ReadBalanceData()
+{
+	this->mBalanceInts.clear();
+	this->mBalanceFloats.clear();
+
+    fstream inFile;
+    inFile.open(theBalanceFileName.c_str(), ios::in);
+	
+    if(inFile.is_open())
+    {
+		const int kMaxLineLength = 512;
+		char theLineCStr[kMaxLineLength];
+		bool theIsDone = false;
+
+		while(!theIsDone)
+		{
+			inFile.getline(theLineCStr, kMaxLineLength);
+			
+			string theLine(theLineCStr);
+
+			if(theLine.length() > 0)
+			{
+				// Check for comment
+				if(theLine[0] != '/')
+				{
+					StringVector theTokens;
+					if(Tokenizer::split(theLine, " \t", theTokens) == 3)
+					{
+						// "define" "variablename" "value"
+						string theStringName = theTokens[1];
+						string theStringValue = theTokens[2];
+					
+						bool theIsFloat = (std::find(theStringValue.begin(), theStringValue.end(), '.') != theStringValue.end());
+						if(theIsFloat)
+						{
+							float theFloatValue = MakeFloatFromString(theStringValue);
+							this->mBalanceFloats[theStringName] = theFloatValue;
+						}
+						else
+						{
+							int theIntValue = MakeIntFromString(theStringValue);
+							this->mBalanceInts[theStringName] = theIntValue;
+						}
+					}
+					else
+					{
+						char theErrorString[512];
+						sprintf(theErrorString, "Balance.txt line: %s couldn't be parsed.\r\n", theLine);
+						ALERT(at_logged, theErrorString);
+					}
+				}
+			}
+
+			if(inFile.eof())
+			{
+				theIsDone = true;
+			}
+		}
+
+		inFile.close();
+	}
+}
+
+void AvHGamerules::RecordBalanceData()
+{
+    fstream theOutfile;
+    theOutfile.open(theBalanceFileName.c_str(), ios::out);
+    if(theOutfile.is_open())
+	{
+		// Write out header
+		string theFirstLine("// Automatically generated file. Last created ");
+		string theTimeDateString = AvHSHUGetTimeDateString();
+		theOutfile << theFirstLine << theTimeDateString << string(".") << std::endl;
+
+		// Now write out #defines for each int
+		string theIntHeader("// Integer data");
+		theOutfile << std::endl << theIntHeader << std::endl;
+
+		for(BalanceIntListType::const_iterator theIntIter = this->mBalanceInts.begin(); theIntIter != this->mBalanceInts.end(); theIntIter++)
+		{
+			string theLine = "#define " + theIntIter->first + string(" ") + MakeStringFromInt(theIntIter->second);
+			theOutfile << theLine << std::endl;
+		}
+
+		string theFloatHeader("// Float data (up to three decimal places)");
+		theOutfile << std::endl << theFloatHeader << std::endl;
+
+		// Now write out #defines for each float
+		for(BalanceFloatListType::const_iterator theFloatIter = this->mBalanceFloats.begin(); theFloatIter != this->mBalanceFloats.end(); theFloatIter++)
+		{
+			string theLine = "#define " + theFloatIter->first + string(" ") + MakeStringFromFloat(theFloatIter->second, 2);
+			theOutfile << theLine << std::endl;
+		}
+		
+        theOutfile.close();
+	}
+}
+#endif
+
+int	AvHGamerules::GetBaseHealthForMessageID(AvHMessageID inMessageID) const
+{
+	int	theBaseHealth = 100;
+
+	switch(inMessageID)
+	{
+		case MESSAGE_NULL:
+		case BUILD_RECYCLE:
+			theBaseHealth = 0;
+			break;
+		
+		// Structures
+		case BUILD_INFANTRYPORTAL:
+			theBaseHealth = BALANCE_IVAR(kInfantryPortalHealth);
+			break;
+		case BUILD_RESOURCES:
+			theBaseHealth = BALANCE_IVAR(kResourceTowerHealth);
+			break;
+		case BUILD_TURRET_FACTORY:
+		case TURRET_FACTORY_UPGRADE:
+			theBaseHealth = BALANCE_IVAR(kTurretFactoryHealth);
+			break;
+		case BUILD_ARMSLAB:
+			theBaseHealth = BALANCE_IVAR(kArmsLabHealth);
+			break;
+		case BUILD_PROTOTYPE_LAB:
+			theBaseHealth = BALANCE_IVAR(kPrototypeLabHealth);
+			break;
+		case BUILD_ARMORY:
+			theBaseHealth = BALANCE_IVAR(kArmoryHealth);
+			break;
+		case ARMORY_UPGRADE:
+			theBaseHealth = BALANCE_IVAR(kAdvArmoryHealth);
+			break;
+		case BUILD_OBSERVATORY:
+			theBaseHealth = BALANCE_IVAR(kObservatoryHealth);
+			break;
+
+		case BUILD_PHASEGATE:
+			theBaseHealth = BALANCE_IVAR(kPhaseGateHealth);
+			break;
+		case BUILD_TURRET:
+			theBaseHealth = BALANCE_IVAR(kSentryHealth);
+			break;
+		case BUILD_SIEGE:
+			theBaseHealth = BALANCE_IVAR(kSiegeHealth);
+			break;
+		case BUILD_COMMANDSTATION:
+			theBaseHealth = BALANCE_IVAR(kCommandStationHealth);
+			break;
+		
+		// Weapons and items
+		case ALIEN_BUILD_RESOURCES:
+			theBaseHealth = BALANCE_IVAR(kAlienResourceTowerHealth);
+			break;
+		case ALIEN_BUILD_OFFENSE_CHAMBER:
+			theBaseHealth = BALANCE_IVAR(kOffenseChamberHealth);
+			break;
+		case ALIEN_BUILD_DEFENSE_CHAMBER:
+			theBaseHealth = BALANCE_IVAR(kDefenseChamberHealth);
+			break;
+		case ALIEN_BUILD_SENSORY_CHAMBER:
+			theBaseHealth = BALANCE_IVAR(kSensoryChamberHealth);
+			break;
+		case ALIEN_BUILD_MOVEMENT_CHAMBER:
+			theBaseHealth = BALANCE_IVAR(kMovementChamberHealth);
+			break;
+		case ALIEN_BUILD_HIVE:
+			theBaseHealth = BALANCE_IVAR(kHiveHealth);
+			break;
+	}
+	
+	return theBaseHealth;
+}
+
+
+int	AvHGamerules::GetBuildTimeForMessageID(AvHMessageID inMessageID) const
+{
+	int	theBuildTime = 0;
+	const float theCombatModeScalar = this->GetIsCombatMode() ? BALANCE_FVAR(kCombatModeTimeScalar) : 1.0f;
+	const float theCombatModeGestationScalar = this->GetIsCombatMode() ? BALANCE_FVAR(kCombatModeGestationTimeScalar) : 1.0f;
+
+	switch(inMessageID)
+	{
+		// Research
+		case RESEARCH_ELECTRICAL:
+			theBuildTime = BALANCE_IVAR(kElectricalUpgradeResearchTime);
+			break;
+		case RESEARCH_ARMOR_ONE:
+			theBuildTime = BALANCE_IVAR(kArmorOneResearchTime);
+			break;
+		case RESEARCH_ARMOR_TWO:
+			theBuildTime = BALANCE_IVAR(kArmorTwoResearchTime);
+			break;
+		case RESEARCH_ARMOR_THREE:
+			theBuildTime = BALANCE_IVAR(kArmorThreeResearchTime);
+			break;
+		case RESEARCH_WEAPONS_ONE:
+			theBuildTime = BALANCE_IVAR(kWeaponsOneResearchTime);
+			break;
+		case RESEARCH_WEAPONS_TWO:
+			theBuildTime = BALANCE_IVAR(kWeaponsTwoResearchTime);
+			break;
+		case RESEARCH_WEAPONS_THREE:
+			theBuildTime = BALANCE_IVAR(kWeaponsThreeResearchTime);
+			break;
+
+        case RESEARCH_CATALYSTS:
+            theBuildTime = BALANCE_IVAR(kCatalystResearchTime);
+            break;
+            
+        case RESEARCH_GRENADES:
+            theBuildTime = BALANCE_IVAR(kGrenadesResearchTime);
+            break;
+
+		case TURRET_FACTORY_UPGRADE:
+			theBuildTime = BALANCE_IVAR(kTurretFactoryUpgradeTime);
+			break;
+
+		case RESEARCH_JETPACKS:
+			theBuildTime = BALANCE_IVAR(kJetpacksResearchTime);
+			break;
+		case RESEARCH_HEAVYARMOR:
+			theBuildTime = BALANCE_IVAR(kHeavyArmorResearchTime);
+			break;
+		// Distress beacon (should be the same length as misc/distressbeacon.wav)
+		case RESEARCH_DISTRESSBEACON:
+			theBuildTime = BALANCE_IVAR(kDistressBeaconTime);
+			break;
+
+		case RESEARCH_HEALTH:
+			theBuildTime = BALANCE_IVAR(kHealthResearchTime);
+			break;
+
+		case RESEARCH_MOTIONTRACK:
+			theBuildTime = BALANCE_IVAR(kMotionTrackingResearchTime);
+			break;
+
+		case RESEARCH_PHASETECH:
+			theBuildTime = BALANCE_IVAR(kPhaseTechResearchTime);
+			break;
+
+		// Structures
+		case BUILD_INFANTRYPORTAL:
+			theBuildTime = BALANCE_IVAR(kInfantryPortalBuildTime);
+			break;
+		case BUILD_RESOURCES:
+			theBuildTime = BALANCE_IVAR(kResourceTowerBuildTime);
+			break;
+		case BUILD_TURRET_FACTORY:
+			theBuildTime = BALANCE_IVAR(kTurretFactoryBuildTime);
+			break;
+		case BUILD_ARMSLAB:
+			theBuildTime = BALANCE_IVAR(kArmsLabBuildTime);
+			break;
+		case BUILD_PROTOTYPE_LAB:
+			theBuildTime = BALANCE_IVAR(kPrototypeLabBuildTime);
+			break;
+		case BUILD_ARMORY:
+			theBuildTime = BALANCE_IVAR(kArmoryBuildTime);
+			break;
+		case ARMORY_UPGRADE:
+			theBuildTime = BALANCE_IVAR(kArmoryUpgradeTime);
+			break;
+		case BUILD_OBSERVATORY:
+			theBuildTime = BALANCE_IVAR(kObservatoryBuildTime);
+			break;
+		// Scan duration
+		case BUILD_SCAN:
+			theBuildTime = BALANCE_IVAR(kScanDuration);
+			break;
+	
+		case BUILD_PHASEGATE:
+			theBuildTime = BALANCE_IVAR(kPhaseGateBuildTime);
+			break;
+		case BUILD_TURRET:
+			theBuildTime = BALANCE_IVAR(kSentryBuildTime);
+			break;
+		case BUILD_SIEGE:
+			theBuildTime = BALANCE_IVAR(kSiegeBuildTime);
+			break;
+		case BUILD_COMMANDSTATION:
+			theBuildTime = BALANCE_IVAR(kCommandStationBuildTime);
+			break;
+		
+		// Weapons and items
+		case ALIEN_BUILD_RESOURCES:
+			theBuildTime = BALANCE_IVAR(kAlienResourceTowerBuildTime);
+			break;
+		case ALIEN_BUILD_OFFENSE_CHAMBER:
+			theBuildTime = BALANCE_IVAR(kOffenseChamberBuildTime);
+			break;
+		case ALIEN_BUILD_DEFENSE_CHAMBER:
+			theBuildTime = BALANCE_IVAR(kDefenseChamberBuildTime);
+			break;
+		case ALIEN_BUILD_SENSORY_CHAMBER:
+			theBuildTime = BALANCE_IVAR(kSensoryChamberBuildTime);
+			break;
+		case ALIEN_BUILD_MOVEMENT_CHAMBER:
+			theBuildTime = BALANCE_IVAR(kMovementChamberBuildTime);
+			break;
+		case ALIEN_BUILD_HIVE:
+			theBuildTime = BALANCE_IVAR(kHiveBuildTime);
+			break;
+
+		// Alien menu items
+		case ALIEN_EVOLUTION_ONE:
+		case ALIEN_EVOLUTION_TWO:
+		case ALIEN_EVOLUTION_THREE:
+		case ALIEN_EVOLUTION_SEVEN:
+		case ALIEN_EVOLUTION_EIGHT:
+		case ALIEN_EVOLUTION_NINE:
+		case ALIEN_EVOLUTION_TEN:
+		case ALIEN_EVOLUTION_ELEVEN:
+		case ALIEN_EVOLUTION_TWELVE:
+        case ALIEN_HIVE_TWO_UNLOCK:
+        case ALIEN_HIVE_THREE_UNLOCK:
+			theBuildTime = max(1, BALANCE_IVAR(kEvolutionGestateTime)*theCombatModeScalar);
+			break;
+	
+		// Alien lifeforms
+		case ALIEN_LIFEFORM_ONE:
+			theBuildTime = BALANCE_IVAR(kSkulkGestateTime)*theCombatModeGestationScalar;
+			break;
+		case ALIEN_LIFEFORM_TWO:
+			theBuildTime = BALANCE_IVAR(kGorgeGestateTime)*theCombatModeGestationScalar;
+			break;
+		case ALIEN_LIFEFORM_THREE:
+			theBuildTime = BALANCE_IVAR(kLerkGestateTime)*theCombatModeGestationScalar;
+			break;
+		case ALIEN_LIFEFORM_FOUR:
+			theBuildTime = BALANCE_IVAR(kFadeGestateTime)*theCombatModeGestationScalar;
+			break;
+		case ALIEN_LIFEFORM_FIVE:
+			theBuildTime = BALANCE_IVAR(kOnosGestateTime)*theCombatModeGestationScalar;
+			break;
+	}
+
+	if(this->GetCheatsEnabled() && !this->GetIsCheatEnabled(kcSlowResearch))
+	{
+		theBuildTime = min(theBuildTime, 2.0f);
+	}
+
+    // For testing
+    //theBuildTime = 10;
+	
+	return theBuildTime;
+}
+
+int	AvHGamerules::GetCostForMessageID(AvHMessageID inMessageID) const
+{
+	// This is point cost or energy cost in NS, or number of levels in Combat
+	int	theCost = 0;
+
+	if(this->GetIsCombatMode())
+    {
+        switch(inMessageID)
+        {
+		case ALIEN_LIFEFORM_TWO:
+        case ALIEN_EVOLUTION_ONE:
+        case ALIEN_EVOLUTION_TWO:
+        case ALIEN_EVOLUTION_THREE:
+        case ALIEN_EVOLUTION_SEVEN:
+        case ALIEN_EVOLUTION_EIGHT:
+        case ALIEN_EVOLUTION_NINE:
+        case ALIEN_EVOLUTION_TEN:
+        case ALIEN_EVOLUTION_TWELVE:
+        case BUILD_RESUPPLY:
+        case RESEARCH_ARMOR_ONE:
+        case RESEARCH_ARMOR_TWO:
+        case RESEARCH_ARMOR_THREE:
+        case RESEARCH_WEAPONS_ONE:
+        case RESEARCH_WEAPONS_TWO:
+        case RESEARCH_WEAPONS_THREE:
+        case BUILD_CAT:
+        case RESEARCH_MOTIONTRACK:
+        case RESEARCH_GRENADES:
+        case BUILD_SCAN:
+        case BUILD_MINES:
+        case BUILD_WELDER:
+        case BUILD_SHOTGUN:
+        case BUILD_HMG:
+        case BUILD_GRENADE_GUN:
+        case ALIEN_HIVE_TWO_UNLOCK:
+            theCost = 1;
+            break;
+
+		case ALIEN_LIFEFORM_THREE:
+        case BUILD_HEAVY:
+        case BUILD_JETPACK:
+        case ALIEN_HIVE_THREE_UNLOCK:
+		case ALIEN_EVOLUTION_ELEVEN:
+            theCost = 2;
+            break;
+
+        case ALIEN_LIFEFORM_FOUR:
+			theCost = 3;
+			break;
+
+        case ALIEN_LIFEFORM_FIVE:
+			theCost = 4;
+			break;
+        }
+    }
+    else
+	{
+		switch(inMessageID)
+		{
+			// Research
+			case RESEARCH_ELECTRICAL:
+				theCost = BALANCE_IVAR(kElectricalUpgradeResearchCost);
+				break;
+			case RESEARCH_ARMOR_ONE:
+				theCost = BALANCE_IVAR(kArmorOneResearchCost);
+				break;
+			case RESEARCH_ARMOR_TWO:
+				theCost = BALANCE_IVAR(kArmorTwoResearchCost);
+				break;
+			case RESEARCH_ARMOR_THREE:
+				theCost = BALANCE_IVAR(kArmorThreeResearchCost);
+				break;
+			case RESEARCH_WEAPONS_ONE:
+				theCost = BALANCE_IVAR(kWeaponsOneResearchCost);
+				break;
+			case RESEARCH_WEAPONS_TWO:
+				theCost = BALANCE_IVAR(kWeaponsTwoResearchCost);
+				break;
+			case RESEARCH_WEAPONS_THREE:
+				theCost = BALANCE_IVAR(kWeaponsThreeResearchCost);
+				break;
+            case RESEARCH_CATALYSTS:
+                theCost = BALANCE_IVAR(kCatalystResearchCost);
+                break;
+            case RESEARCH_GRENADES:
+                theCost = BALANCE_IVAR(kGrenadesResearchCost);
+                break;
+			case TURRET_FACTORY_UPGRADE:
+				theCost = BALANCE_IVAR(kTurretFactoryUpgradeCost);
+				break;
+
+			case RESEARCH_JETPACKS:
+				theCost = BALANCE_IVAR(kJetpacksResearchCost);
+				break;
+			case RESEARCH_HEAVYARMOR:
+				theCost = BALANCE_IVAR(kHeavyArmorResearchCost);
+				break;
+			case RESEARCH_HEALTH:
+				theCost = BALANCE_IVAR(kHealthResearchCost);
+				break;
+			case RESEARCH_MOTIONTRACK:
+				theCost = BALANCE_IVAR(kMotionTrackingResearchCost);
+				break;
+			case RESEARCH_PHASETECH:
+				theCost = BALANCE_IVAR(kPhaseTechResearchCost);
+				break;
+			case RESEARCH_DISTRESSBEACON:
+				theCost = BALANCE_IVAR(kDistressBeaconCost);
+				break;
+		
+			// Structures
+			case BUILD_HEAVY:
+				theCost = BALANCE_IVAR(kHeavyArmorCost);
+				break;
+			case BUILD_JETPACK:
+				theCost = BALANCE_IVAR(kJetpackCost);
+				break;
+			case BUILD_INFANTRYPORTAL:
+				theCost = BALANCE_IVAR(kInfantryPortalCost);
+				break;
+			case BUILD_RESOURCES:
+				theCost = BALANCE_IVAR(kResourceTowerCost);
+				break;
+			case BUILD_TURRET_FACTORY:
+				theCost = BALANCE_IVAR(kTurretFactoryCost);
+				break;
+			case BUILD_ARMSLAB:
+				theCost = BALANCE_IVAR(kArmsLabCost);
+				break;
+			case BUILD_PROTOTYPE_LAB:
+				theCost = BALANCE_IVAR(kPrototypeLabCost);
+				break;
+			case BUILD_ARMORY:
+				theCost = BALANCE_IVAR(kArmoryCost);
+				break;
+			case ARMORY_UPGRADE:
+				theCost = BALANCE_IVAR(kArmoryUpgradeCost);
+				break;
+			case BUILD_OBSERVATORY:
+				theCost = BALANCE_IVAR(kObservatoryCost);
+				break;
+		
+			case BUILD_PHASEGATE:
+				theCost = BALANCE_IVAR(kPhaseGateCost);
+				break;
+			case BUILD_TURRET:
+				theCost = BALANCE_IVAR(kSentryCost);
+				break;
+			case BUILD_SIEGE:
+				theCost = BALANCE_IVAR(kSiegeCost);
+				break;
+			case BUILD_COMMANDSTATION:
+				theCost = BALANCE_IVAR(kCommandStationCost);
+				break;
+			
+			// Weapons and items
+			case BUILD_HEALTH:
+				theCost = BALANCE_IVAR(kHealthCost);
+				break;
+			case BUILD_AMMO:
+				theCost = BALANCE_IVAR(kAmmoCost);
+				break;
+            case BUILD_CAT:
+                theCost = BALANCE_IVAR(kCatalystCost);
+				break;
+			case BUILD_MINES:
+				theCost = BALANCE_IVAR(kMineCost);
+				break;
+			case BUILD_WELDER:
+				theCost = BALANCE_IVAR(kWelderCost);
+				break;
+			case BUILD_SHOTGUN:
+				theCost = BALANCE_IVAR(kShotgunCost);
+				break;
+			case BUILD_HMG:
+				theCost = BALANCE_IVAR(kHMGCost);
+				break;
+			case BUILD_GRENADE_GUN:
+				theCost = BALANCE_IVAR(kGrenadeLauncherCost);
+				break;
+		
+			case ALIEN_BUILD_RESOURCES:
+				theCost = BALANCE_IVAR(kAlienResourceTowerCost);
+				break;
+			case ALIEN_BUILD_OFFENSE_CHAMBER:
+				theCost = BALANCE_IVAR(kOffenseChamberCost);
+				break;
+			case ALIEN_BUILD_DEFENSE_CHAMBER:
+				theCost = BALANCE_IVAR(kDefenseChamberCost);
+				break;
+			case ALIEN_BUILD_SENSORY_CHAMBER:
+				theCost = BALANCE_IVAR(kSensoryChamberCost);
+				break;
+			case ALIEN_BUILD_MOVEMENT_CHAMBER:
+				theCost = BALANCE_IVAR(kMovementChamberCost);
+				break;
+			case ALIEN_BUILD_HIVE:
+				theCost = BALANCE_IVAR(kHiveCost);
+				break;
+
+			// Alien menu items
+			case ALIEN_EVOLUTION_ONE:
+			case ALIEN_EVOLUTION_TWO:
+			case ALIEN_EVOLUTION_THREE:
+			case ALIEN_EVOLUTION_SEVEN:
+			case ALIEN_EVOLUTION_EIGHT:
+			case ALIEN_EVOLUTION_NINE:
+			case ALIEN_EVOLUTION_TEN:
+			case ALIEN_EVOLUTION_ELEVEN:
+			case ALIEN_EVOLUTION_TWELVE:
+				theCost = BALANCE_IVAR(kEvolutionCost);
+				break;
+		
+			// Alien lifeforms
+			case ALIEN_LIFEFORM_ONE:
+				theCost = BALANCE_IVAR(kSkulkCost);
+				break;
+			case ALIEN_LIFEFORM_TWO:
+				theCost = BALANCE_IVAR(kGorgeCost);
+				break;
+			case ALIEN_LIFEFORM_THREE:
+				theCost = BALANCE_IVAR(kLerkCost);
+				break;
+			case ALIEN_LIFEFORM_FOUR:
+				theCost = BALANCE_IVAR(kFadeCost);
+				break;
+			case ALIEN_LIFEFORM_FIVE:
+				theCost = BALANCE_IVAR(kOnosCost);
+				break;
+
+			// Energy costs
+			case BUILD_SCAN:
+				theCost = BALANCE_IVAR(kScanEnergyCost);
+				break;
+		}
+	}
+	
+	return theCost;
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHBalance.h b/main/source/mod/AvHBalance.h
new file mode 100644
index 00000000..d59996f1
--- /dev/null
+++ b/main/source/mod/AvHBalance.h
@@ -0,0 +1,46 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile:  $
+// $Date: $
+//
+//-------------------------------------------------------------------------------
+// $Log: $
+//===============================================================================
+#ifndef AVH_BALANCE_H
+#define AVH_BALANCE_H
+
+// Header to wrap #defines in AvHBalance.txt
+#include "build.h"
+#include <string>
+
+	// If we're not playtesting, use #defines for variable names
+	#ifndef AVH_PLAYTEST_BUILD 
+		#include "../Balance.txt"
+		#define BALANCE_IVAR(inName) inName
+		#define BALANCE_FVAR(inName) inName
+	#endif	
+
+	// If we're playtesting, lookup dynamic value of variable
+	#ifdef AVH_PLAYTEST_BUILD 
+		
+		int GetBalanceInt(const string& inName);
+		float GetBalanceFloat(const string& inName);
+
+		#define BALANCE_IVAR(inName) GetBalanceInt(#inName)
+		#define BALANCE_FVAR(inName) GetBalanceFloat(#inName)
+		
+	#endif
+
+	#ifdef AVH_PLAYTEST_BUILD
+	typedef map<string, int>	BalanceIntListType;
+	typedef map<string, float>	BalanceFloatListType;
+	#endif
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHBalanceAnalysis.cpp b/main/source/mod/AvHBalanceAnalysis.cpp
new file mode 100644
index 00000000..a5a11cc1
--- /dev/null
+++ b/main/source/mod/AvHBalanceAnalysis.cpp
@@ -0,0 +1,407 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHBalanceAnalysis.cpp $
+// $Date: $
+//
+//-------------------------------------------------------------------------------
+// $Log: $
+//===============================================================================
+#include "util/nowarnings.h"
+#include "mod/AvHBalanceAnalysis.h"
+#include "mod/AvHBalance.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHMarineWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "math.h"
+
+#ifdef AVH_CLIENT
+#include "mod/AvHHud.h"
+extern AvHHud gHUD;
+#endif
+
+AvHEconomy::AvHEconomy(const AvHTechNodes& inTechNodes, int inInitialResources, int inInitialTowers, bool inMarine, MessageIDListType inTargetTechList)
+{
+	mTechNodes = inTechNodes;
+	mInitialResources = inInitialResources;
+	mInitialTowers = inInitialTowers;
+	mMarine = inMarine;
+	mTargetTech = inTargetTechList;
+
+	mResultTime = mResultTowers = mResultResources = 0;
+}
+
+void AvHEconomy::CalculateFastestTime()
+{
+	int theMinNodeAmount = 0;
+	float theMinTime = 10000;
+
+	// 7 nodes is realistic map maximum
+	for(int i = 0; i < 7; i++)
+	{
+		this->Simulate(i);
+		float theResultTime = (float)this->GetResultTime();
+
+		if(theResultTime < theMinTime)
+		{
+			theMinTime = theResultTime;
+			theMinNodeAmount = i;
+		}
+	}
+
+	// Use the minimum results
+	this->Simulate(theMinNodeAmount);
+}
+
+int	AvHEconomy::GetBuildNodeCost() const
+{
+	int theCost = 0;
+
+	if(this->mMarine)
+	{
+		theCost = BALANCE_IVAR(kResourceTowerCost);
+	}
+	else
+	{
+		theCost = BALANCE_IVAR(kAlienResourceTowerCost);
+	}
+
+	return theCost;
+}
+
+int AvHEconomy::GetResultTime() const
+{
+	return this->mResultTime;
+}
+
+int	AvHEconomy::GetResultTowers() const
+{
+	return this->mResultTowers;
+}
+
+int	AvHEconomy::GetResultResources() const
+{
+	return this->mResultResources;
+}
+
+// Assumes nodes build instantly, doesn't account for travel time, assumes there is always an available node to be built
+void AvHEconomy::Simulate(int inBuildXNodes)
+{
+	int theResourceInjectionInterval = BALANCE_IVAR(kFuncResourceInjectionTime);
+	int theBuildNodeInterval = BALANCE_IVAR(kBalanceFuncResourceTime);
+
+	// Start simulating
+	int theTimeOfLastNode = 0;
+	bool theIsDone = false;
+	int theNumNodes = this->mInitialTowers;
+	float theTimeOfNextResearchComplete = 0;
+
+	// Initialize results
+	this->mResultTowers = this->mInitialTowers;
+	this->mResultResources = this->mInitialResources;
+	this->mResultTime = 0;
+
+	// Use copy of tech nodes
+	AvHTechNodes theTechNodes = this->mTechNodes;
+	MessageIDListType theTargetTech = this->mTargetTech;
+
+	if(theResourceInjectionInterval > 0)
+	{
+		// While not done
+		while(!theIsDone)
+		{
+			AvHMessageID theTargetTechID = (*theTargetTech.begin());
+		
+			// If we have more nodes to build and we have enough resources
+			if(inBuildXNodes > 0)
+			{
+				// Build the node (increment num nodes, decrement resources)
+				int theNodeCost = this->GetBuildNodeCost();
+				if(this->mResultResources >= theNodeCost)
+				{
+					if(this->mResultTime > (theTimeOfLastNode + theBuildNodeInterval))
+					{
+						theTimeOfLastNode = this->mResultTime;
+						this->mResultResources -= theNodeCost;
+						this->mResultTowers++;
+						inBuildXNodes--;
+					}
+				}
+			}
+		
+			// Find bottleneck technology
+			AvHMessageID theBottleNeck = theTechNodes.GetNextMessageNeededFor(theTargetTechID);
+		
+			if(theTimeOfNextResearchComplete == 0)
+			{
+				// If we have enough resources to research/buy it
+				int theCost = 0;
+				float theTime = 0.0f;
+				bool theIsResearchable = false;
+				if(theTechNodes.GetResearchInfo(theBottleNeck, theIsResearchable, theCost, theTime))
+				{
+					// Pay for it
+					if(this->mResultResources >= theCost)
+					{
+						// Remember when we'll be done with it
+						this->mResultResources -= theCost;
+						theTimeOfNextResearchComplete = this->mResultTime + theTime;
+					}
+				}
+				else
+				{
+					this->mResultResources = -1;
+					theIsDone = true;
+				}
+			}
+			// Is our bottleneck technology done?
+			else if(this->mResultTime >= theTimeOfNextResearchComplete)
+			{
+				// Set it researched
+				theTechNodes.SetResearchDone(theBottleNeck, true);
+		
+				// Is this technology our final tech?
+				if(theBottleNeck == theTargetTechID)
+				{
+					MessageIDListType::iterator theFindIter = std::find(theTargetTech.begin(), theTargetTech.end(), theTargetTechID);
+					if(theFindIter != theTargetTech.end())
+					{
+						theTargetTech.erase(theFindIter);
+					}
+		
+				}
+		
+				if(theTargetTech.size() == 0)
+				{
+					// We're done
+					theIsDone = true;
+				}
+				else
+				{
+					theTimeOfNextResearchComplete = 0;
+				}
+			}
+		
+			// Add resources from current towers to our resources
+			this->mResultResources += this->mResultTowers*BALANCE_IVAR(kFuncResourceInjectionAmount);
+			
+			// Increment current time by interval
+			this->mResultTime += theResourceInjectionInterval;
+		}
+	}
+}
+
+void GetSimulatedAnalysisFor(MessageIDListType inMessageIDList, bool inMarine, StringList& outList, string inNote)
+{
+	outList.push_back(inNote);
+
+	int theStartingResources = inMarine ? BALANCE_IVAR(kNumInitialMarinePoints) : BALANCE_IVAR(kNumInitialAlienPoints);
+
+	// Get tech nodes
+	const AvHTechNodes& theTechNodes = gHUD.GetTechNodes();
+	
+	AvHEconomy theEconomy(theTechNodes, theStartingResources, 1, inMarine, inMessageIDList);
+	
+	theEconomy.CalculateFastestTime();
+
+	// Add message to log
+	int theResultTime = theEconomy.GetResultTime();
+	char theTimeString[128];
+	sprintf(theTimeString, "%d:%.2d", theResultTime/60, theResultTime%60);
+
+	int theNodesBuilt = theEconomy.GetResultTowers() - 1;
+	int theResultResources = theEconomy.GetResultResources();
+	string theLogMessage = "  " + MakeStringFromInt(theNodesBuilt) + " nodes built -> Time: " + string(theTimeString) + " Resources: " + MakeStringFromInt(theResultResources);
+	outList.push_back(theLogMessage);
+}
+
+void GetSimulatedAnalysisFor(AvHMessageID inMessageID, bool inMarine, StringList& outList, string inNote)
+{
+	MessageIDListType theMessageIDList;
+	theMessageIDList.push_back(inMessageID);
+	GetSimulatedAnalysisFor(theMessageIDList, inMarine, outList, inNote);
+}
+
+
+//void GetHiveAnalysis(StringList& outList)
+//{
+//	// Assume gorges are all building res towers
+//
+//	// Find time that one gorge has enough to build hive
+//
+//	// Add hive build time
+//}
+
+
+int SimulateDamage(AvHUser3 inUser3, int inUser4, float inDamage, int inNumHives)
+{
+	int theNumBullets = 0;
+
+	// Initialize health and armor
+	float theArmorLevel = (float)(AvHPlayerUpgrade::GetMaxArmorLevel(inUser4, inUser3));
+	float theHealth = (float)(AvHPlayerUpgrade::GetMaxHealth(inUser4, inUser3));
+	bool theDone = false;
+
+	// While lifeform is still alive
+	if(inDamage > 0)
+	{
+		while(!theDone)
+		{
+			// Simulate bullet hit
+			float theHealthToRemove = AvHPlayerUpgrade::CalculateDamageLessArmor(inUser3, inUser4, inDamage, theArmorLevel, NS_DMG_NORMAL, inNumHives);
+		
+			theHealth -= theHealthToRemove;
+		
+			// Increment number bullets
+			theNumBullets++;
+
+			// We're dead when our health cast to an int is 0 (for HL reasons, see CBaseEntity::TakeDamage for more info)
+			if(((int)theHealth) <= 0)
+			{
+				theDone = true;
+			}
+		}
+	}
+	else
+	{
+		theNumBullets = -1;
+	}
+
+	return theNumBullets;
+}
+
+void SimulateWeaponVsLifeform(float inDamage, string& inPrependString, string& inLifeformName, AvHUser3 inLifeform, StringList& outList)
+{
+	for(int theNumHives = 1; theNumHives <= 3; theNumHives++)
+	//int theNumHives = 1;
+	{
+		for(int i = 0; i < 4; i++)
+		{
+			float theDamage = inDamage;
+
+			switch(i)
+			{
+			case 1:
+				theDamage *= (1.0f + (float)BALANCE_FVAR(kWeaponDamageLevelOne));
+				break;
+			case 2:
+				theDamage *= (1.0f + (float)BALANCE_FVAR(kWeaponDamageLevelTwo));
+				break;
+			case 3:
+				theDamage *= (1.0f + (float)BALANCE_FVAR(kWeaponDamageLevelThree));
+				break;
+			}
+			
+			string theResult = string(inPrependString + " L" + MakeStringFromInt(i) + " (" + MakeStringFromFloat(theDamage) + ") vs. " + MakeStringFromInt(theNumHives) + "-hive " + inLifeformName + ": ");
+			theResult += MakeStringFromInt(SimulateDamage(inLifeform, MASK_NONE, theDamage, theNumHives));
+			theResult += "/" + MakeStringFromInt(SimulateDamage(inLifeform, MASK_UPGRADE_1, theDamage, theNumHives));
+			theResult += "/" + MakeStringFromInt(SimulateDamage(inLifeform, MASK_UPGRADE_1 | MASK_UPGRADE_10, theDamage, theNumHives));
+			theResult += "/" + MakeStringFromInt(SimulateDamage(inLifeform, MASK_UPGRADE_1 | MASK_UPGRADE_11, theDamage, theNumHives));
+			
+			outList.push_back(theResult);
+		}
+	}
+}
+
+void SimulateWeaponVsLifeforms(float inDamage, string& inPrependString, StringList& outList)
+{
+	SimulateWeaponVsLifeform(inDamage, inPrependString, string("Skulk"), AVH_USER3_ALIEN_PLAYER1, outList);
+	SimulateWeaponVsLifeform(inDamage, inPrependString, string("Gorge"), AVH_USER3_ALIEN_PLAYER2, outList);
+	SimulateWeaponVsLifeform(inDamage, inPrependString, string("Lerk"), AVH_USER3_ALIEN_PLAYER3, outList);
+	SimulateWeaponVsLifeform(inDamage, inPrependString, string("Fade"), AVH_USER3_ALIEN_PLAYER4, outList);
+	SimulateWeaponVsLifeform(inDamage, inPrependString, string("Onos"), AVH_USER3_ALIEN_PLAYER5, outList);
+	SimulateWeaponVsLifeform(inDamage, inPrependString, string("Marine"), AVH_USER3_MARINE_PLAYER, outList);
+}
+
+void AvHBAComputeAnalysis(StringList& outList)
+{
+	// Num bile bombs to kill a resource tower
+	int theBileBombDamage = BALANCE_IVAR(kBileBombDamage);
+	int theResourceTowerHealth = BALANCE_IVAR(kResourceTowerHealth);
+	int theNumShots = (int)(ceil((float)theResourceTowerHealth/theBileBombDamage));
+	outList.push_back("# bile bombs to kill resource tower: " + MakeStringFromInt(theNumShots));
+
+	// Bite vs. resource tower
+	int theBiteDamage = BALANCE_IVAR(kBiteDamage);
+	theNumShots = (int)(ceil((float)theResourceTowerHealth/theBiteDamage));
+	float theTime = theNumShots*BALANCE_FVAR(kBiteROF);
+	outList.push_back("# bites to kill resource tower: " + MakeStringFromInt(theNumShots) + " (time: " + MakeStringFromFloat(theTime) + ")");
+
+	// Shotgun vs. hive
+	int theSGDamage = BALANCE_IVAR(kSGDamage);
+	int theNumSGPellets = BALANCE_IVAR(kSGBulletsPerShot);
+	int theHiveHealth = BALANCE_IVAR(kHiveHealth);
+	theNumShots = (int)(ceil((float)theHiveHealth/((float)theSGDamage*theNumSGPellets)));
+	outList.push_back("# shotgun blasts to kill hive: " + MakeStringFromInt(theNumShots));
+
+	// Grenades vs. alien resource tower (blast damage)
+	int theGGDamage = 2*BALANCE_IVAR(kGrenadeDamage);
+	int theAlienTowerHealth = BALANCE_IVAR(kAlienResourceTowerHealth);
+	theNumShots = (int)(ceil((float)theAlienTowerHealth/theGGDamage));
+	outList.push_back("# grenades to kill alien resource tower: " + MakeStringFromInt(theNumShots));
+
+	// Machine gun vs. alien res tower
+	int theMGDamage = BALANCE_IVAR(kMGDamage);
+	theNumShots = (int)(ceil((float)theAlienTowerHealth/theMGDamage));
+	outList.push_back("# mg bullets to kill alien resource tower: " + MakeStringFromInt(theNumShots));
+
+	GetSimulatedAnalysisFor(BUILD_HMG, true, outList, "First HMG:");
+	GetSimulatedAnalysisFor(BUILD_GRENADE_GUN, true, outList, "First GL:");
+	GetSimulatedAnalysisFor(BUILD_JETPACK, true, outList, "First jetpack:");
+	GetSimulatedAnalysisFor(BUILD_HEAVY, true, outList, "First heavy armor:");
+	GetSimulatedAnalysisFor(BUILD_SIEGE, true, outList, "First ASC:");
+	GetSimulatedAnalysisFor(RESEARCH_MOTIONTRACK, true, outList, "Motion-tracking:");
+
+	MessageIDListType theTech;
+	theTech.push_back(BUILD_PHASEGATE);
+	theTech.push_back(BUILD_PHASEGATE);
+	GetSimulatedAnalysisFor(theTech, true, outList, "Two phase gates:");
+	theTech.clear();
+
+	theTech.push_back(RESEARCH_ARMOR_THREE);
+	theTech.push_back(RESEARCH_WEAPONS_THREE);
+	GetSimulatedAnalysisFor(theTech, true, outList, "Level 3 armor + weapons:");
+	theTech.clear();
+
+	for(int i = 0; i < BALANCE_IVAR(kBalanceAverageTeamSize); i++)
+	{
+		theTech.push_back(BUILD_SHOTGUN);
+	}
+	GetSimulatedAnalysisFor(theTech, true, outList, "Full squad of shotguns:");
+	theTech.clear();
+
+	for(i = 0; i < BALANCE_IVAR(kBalanceAverageTeamSize); i++)
+	{
+		theTech.push_back(BUILD_HMG);
+	}
+	GetSimulatedAnalysisFor(theTech, true, outList, "Full squad of HMGs:");
+	theTech.clear();
+	
+	//GetSimulatedAnalysisFor(ALIEN_BUILD_HIVE, false, outList, "Second hive:");
+	//GetSimulatedAnalysisFor(ALIEN_LIFEFORM_FIVE, false, outList, "First Onos:");
+
+//	GetHiveAnalysis(outList);
+//
+//	GetMGSkulkAnalysis(outList);
+
+	// HMG vs. hive
+	SimulateWeaponVsLifeforms((float)BALANCE_IVAR(kMGDamage), string("mg"), outList);
+	SimulateWeaponVsLifeforms((float)BALANCE_IVAR(kHGDamage), string("pistol"), outList);
+	SimulateWeaponVsLifeforms((float)BALANCE_IVAR(kSGDamage), string("shotty"), outList);
+	SimulateWeaponVsLifeforms((float)BALANCE_IVAR(kHMGDamage), string("hmg"), outList);
+	SimulateWeaponVsLifeforms((float)BALANCE_IVAR(kMineDamage), string("mine"), outList);
+	SimulateWeaponVsLifeforms((float)BALANCE_IVAR(kGrenadeDamage), string("gl"), outList);
+	SimulateWeaponVsLifeforms((float)BALANCE_IVAR(kBiteDamage), string("bite"), outList);
+
+//	outList.push_back("MG vs. Skulk: 1/2/3/4");
+//	outList.push_back("MG vs. Skulk (cara 1): 2/3/4/5");
+//	outList.push_back("MG vs. Skulk (cara 2): 3/4/5/6");
+
+	outList.push_back("");
+}
\ No newline at end of file
diff --git a/main/source/mod/AvHBalanceAnalysis.h b/main/source/mod/AvHBalanceAnalysis.h
new file mode 100644
index 00000000..a28ad706
--- /dev/null
+++ b/main/source/mod/AvHBalanceAnalysis.h
@@ -0,0 +1,54 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile:  $
+// $Date: $
+//
+//-------------------------------------------------------------------------------
+// $Log: $
+//===============================================================================
+#ifndef AVH_BALANCE_ANALYSIS_H
+#define AVH_BALANCE_ANALYSIS_H
+
+#include "util/STLUtil.h"
+#include "mod/AvHTechNodes.h"
+
+void AvHBAComputeAnalysis(StringList& outList);
+
+typedef vector<AvHMessageID> MessageIDListType;
+
+class AvHEconomy
+{
+public:
+	AvHEconomy(const AvHTechNodes& inTechNodes, int inInitialResources, int inInitialTowers, bool inMarine, MessageIDListType inTargetTechList);
+	
+	// Finds the fastest way to get to goal
+	void			CalculateFastestTime();
+	void			Simulate(int inBuildXNodes);
+	
+	int				GetBuildNodeCost() const;
+	int				GetResultTime() const;
+	int				GetResultTowers() const;
+	int				GetResultResources() const;
+	
+private:
+		
+	AvHTechNodes	mTechNodes;
+	int				mInitialResources;
+	int				mInitialTowers;
+	bool			mMarine;
+
+	MessageIDListType				mTargetTech;
+	
+	int				mResultTime;
+	int				mResultTowers;
+	int				mResultResources;
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHBaseBuildable.cpp b/main/source/mod/AvHBaseBuildable.cpp
new file mode 100644
index 00000000..3e57a415
--- /dev/null
+++ b/main/source/mod/AvHBaseBuildable.cpp
@@ -0,0 +1,1460 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHBaseBuildable.cpp$
+// $Date: 2002/11/22 21:28:15 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHBaseBuildable.cpp,v $
+// Revision 1.19  2002/11/22 21:28:15  Flayra
+// - mp_consistency changes
+//
+// Revision 1.18  2002/11/15 04:47:11  Flayra
+// - Regenerate now returns bool if healed or not, for def chamber tweak
+//
+// Revision 1.17  2002/11/12 02:22:35  Flayra
+// - Removed draw damage from public build
+// - Don't allow +use to speed research
+//
+// Revision 1.16  2002/11/06 01:38:24  Flayra
+// - Added ability for buildings to be enabled and disabled, for turrets to be shut down
+// - Damage refactoring (TakeDamage assumes caller has already adjusted for friendly fire, etc.)
+//
+// Revision 1.15  2002/10/24 21:21:49  Flayra
+// - Added code to award attacker a frag when destroying a building but thought better of it
+//
+// Revision 1.14  2002/10/16 00:49:35  Flayra
+// - Reworked build times so they are real numbers
+//
+// Revision 1.13  2002/10/03 18:38:56  Flayra
+// - Fixed problem where regenerating builders via healing spray wasn't updating health ring
+// - Allow buildings to play custom damage alerts (for towers)
+//
+// Revision 1.12  2002/09/23 22:10:14  Flayra
+// - Removed progress bar when building
+// - Removed vestiges of fading building as building
+// - Changed point costs
+//
+// Revision 1.11  2002/09/09 19:49:09  Flayra
+// - Buildables now play animations better, without interrupting previous anims
+//
+// Revision 1.10  2002/08/31 18:01:00  Flayra
+// - Work at VALVe
+//
+// Revision 1.9  2002/08/16 02:32:45  Flayra
+// - Added damage types
+// - Added visual health for commander and marines
+//
+// Revision 1.8  2002/08/02 22:02:09  Flayra
+// - New alert system
+//
+// Revision 1.7  2002/07/26 23:03:56  Flayra
+// - Don't play "hurt/wound" sounds when we don't actually take damage (GetCanEntityDoDamageTo)
+// - Generate numerical feedback for damage events
+//
+// Revision 1.6  2002/07/23 16:58:38  Flayra
+// - Auto-build can't happen before game starts
+//
+// Revision 1.5  2002/07/01 21:15:46  Flayra
+// - Added auto-build capability
+//
+// Revision 1.4  2002/06/25 17:31:24  Flayra
+// - Regular update, don't assume anything about player building, renamed arsenal to armory
+//
+// Revision 1.3  2002/06/03 16:27:59  Flayra
+// - Allow alien buildings to regenerate, renamed weapons factory and armory
+//
+// Revision 1.2  2002/05/28 17:37:27  Flayra
+// - Added building recycling, mark mapper placed buildables so they aren't destroyed at the end of the round
+//
+// Revision 1.1  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHBaseBuildable.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHServerVariables.h"
+#include "mod/AvHParticleConstants.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "mod/AvHSoundListManager.h"
+#include "mod/AvHAlienEquipmentConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "dlls/animation.h"
+#include "mod/AvHMovementUtil.h"
+
+const int kBaseBuildableSpawnAnimation = 0;
+const int kBaseBuildableDeployAnimation = 1;
+const int kBaseBuildableIdle1Animation = 2;
+const int kBaseBuildableIdle2Animation = 3;
+const int kBaseBuildableResearchingAnimation = 4;
+const int kBaseBuildableActiveAnimation = 5;
+const int kBaseBuildableFireAnimation = 6;
+const int kBaseBuildableTakeDamageAnimation = 7;
+const int kBaseBuildableDieForwardAnimation = 8;
+const int kBaseBuildableDieLeftAnimation = 9;
+const int kBaseBuildableDieBackwardAnimation = 10;
+const int kBaseBuildableDieRightAnimation = 11;
+const int kBaseBuildableSpecialAnimation = 12;
+
+extern int gRegenerationEventID;
+extern AvHSoundListManager		gSoundListManager;
+
+AvHBaseBuildable::AvHBaseBuildable(AvHTechID inTechID, AvHMessageID inMessageID, char* inClassName, int inUser3) : AvHBuildable(inTechID), kStartAlpha(128), mAverageUseSoundLength(.5f)
+{
+	this->mClassName = inClassName;
+	this->mMessageID = inMessageID;
+
+	this->mBaseHealth = GetGameRules()->GetBaseHealthForMessageID(inMessageID);
+
+	char* theModelName = AvHSHUGetBuildTechModelName(inMessageID);
+	ASSERT(theModelName);
+	this->mModelName = theModelName;
+
+	this->mSelectID = inUser3;
+	this->mTimeToConstruct = GetGameRules()->GetBuildTimeForMessageID(inMessageID);
+
+	// Very important that this doesn't go in Init(), else mapper-placed structures disappear on map-reset
+	this->mPersistent = false;
+
+	this->Init();
+}
+
+void AvHBaseBuildable::Init()
+{
+	if(this->pev)
+	{
+		InitializeBuildable(this->pev->iuser3, this->pev->iuser4, this->pev->fuser1, this->mSelectID);
+	}
+	
+	this->mTimeAnimationDone = 0;
+	this->mLastAnimationPlayed = -1;
+	this->mIsResearching = false;
+	this->mTimeOfLastAutoHeal = -1;
+	this->mInternalSetConstructionComplete = false;
+	this->mKilled = false;
+	this->mTimeOfLastDamageEffect = -1;
+	this->mTimeOfLastDamageUpdate = -1;
+	this->mTimeRecycleStarted = -1;
+	this->mTimeRecycleDone = -1;
+
+	SetThink(NULL);
+}
+
+const float kAnimateThinkTime = .1f;
+
+void AvHBaseBuildable::AnimateThink()
+{
+	int theSequence = this->GetResearchAnimation();
+	if(!this->mIsResearching)
+	{
+		// Play a random idle animation
+		theSequence = this->GetIdleAnimation();
+	}
+	else
+	{
+		int a = 0;
+	}
+
+	this->PlayAnimationAtIndex(theSequence);
+
+	// Set our next think
+	float theUpdateTime = this->GetTimeForAnimation(theSequence);
+	this->pev->nextthink = gpGlobals->time + theUpdateTime;
+}
+
+int	AvHBaseBuildable::BloodColor( void ) 
+{ 
+	int theBloodColor = DONT_BLEED;
+
+	if(this->GetIsOrganic())
+	{
+		theBloodColor = BLOOD_COLOR_GREEN;
+	}
+
+	return theBloodColor; 
+}
+
+void AvHBaseBuildable::BuildableTouch(CBaseEntity* inEntity)
+{
+    if(inEntity->pev->team != this->pev->team)
+    {
+        this->Uncloak();
+    }
+}
+
+void AvHBaseBuildable::CheckEnabledState()
+{
+}
+
+void AvHBaseBuildable::ConstructUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	bool theSuccess = false;
+	bool theIsBuilding = false;
+	bool theIsResearching = false;
+	float thePercentage = 0.0f;
+
+	AvHSHUGetBuildResearchState(this->pev->iuser3, this->pev->iuser4, this->pev->fuser1, theIsBuilding, theIsResearching, thePercentage);
+	
+	// Only allow players to help along building, not researching
+	if(theIsBuilding)
+	{
+		// Only allow users from same team as turret deployer
+		float thePercentage = this->GetNormalizedBuildPercentage();
+		if(pActivator->pev->team == this->pev->team && (thePercentage < 1.0f))
+		{
+			AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(pActivator);
+			ASSERT(thePlayer);
+	
+			// Only soldiers and builders can build
+			if(thePlayer->GetIsAbleToAct() && ((thePlayer->pev->iuser3 == AVH_USER3_MARINE_PLAYER) || (thePlayer->pev->iuser3 == AVH_USER3_ALIEN_PLAYER2)))
+			{
+                AvHBasePlayerWeapon* theWeapon = dynamic_cast<AvHBasePlayerWeapon*>(thePlayer->m_pActiveItem);
+                if(!theWeapon || theWeapon->CanHolster())
+                {
+				    thePlayer->PlayerConstructUse();
+	    
+				    bool thePlaySound = false;
+				    
+				    // Ensure that buildings are never absolutely painful to create
+				    int theBuildTime = max(GetGameRules()->GetBuildTimeForMessageID(this->mMessageID), 1);
+	    
+				    if(GetGameRules()->GetIsTesting() || GetGameRules()->GetCheatsEnabled())
+				    {
+					    theBuildTime = 2;
+				    }
+	    
+				    // Make non-frame-rate dependent
+				    const float kDefaultInterval = .1f;
+				    float theTimeOfLastConstructUse = thePlayer->GetTimeOfLastConstructUse();
+				    
+				    float theInterval = min(max(gpGlobals->time - theTimeOfLastConstructUse, 0), kDefaultInterval);
+				    thePercentage += (theInterval/(float)theBuildTime);
+
+				    thePlayer->SetTimeOfLastConstructUse(gpGlobals->time);
+	    
+				    if(gpGlobals->time > (this->mLastTimePlayedSound + this->mAverageUseSoundLength))
+				    {
+					    AvHSUPlayRandomConstructionEffect(thePlayer, this);
+					    this->mLastTimePlayedSound = gpGlobals->time;
+				    }
+				    
+				    // Given the number of constructors, what's chance of starting a new sound?
+				    float theChanceForNewSound = (gpGlobals->frametime/(this->mAverageUseSoundLength));//  /2.0f));
+				    float theRandomFloat = RANDOM_FLOAT(0.0f, 1.0f);
+				    if(theRandomFloat < theChanceForNewSound)
+				    {
+					    AvHSUPlayRandomConstructionEffect(thePlayer, this);
+				    }
+				    
+				    //if(RANDOM_LONG(0, 20) == 0)
+				    //{
+				    //	char theMessage[128];
+				    //	sprintf(theMessage, "Time passed: %f, ticks: %d, rate: %f\n", theTimePassed, this->mPreThinkTicks, this->mPreThinkFrameRate);
+				    //	UTIL_SayText(theMessage, this);
+				    //}
+					    
+				    this->SetNormalizedBuildPercentage(thePercentage);
+
+				    theSuccess = true;
+                }
+			}
+		}
+	}
+
+	// Clear out +use sound when ineffective
+	if(!theSuccess)
+	{
+		EMIT_SOUND(pActivator->edict(), CHAN_ITEM, "common/null.wav", 1.0, ATTN_NORM);
+	}
+}
+
+bool AvHBaseBuildable::Energize(float inEnergyAmount)
+{
+	return false;
+}
+
+int	AvHBaseBuildable::GetBaseHealth() const
+{
+	return this->mBaseHealth;
+}
+
+char* AvHBaseBuildable::GetClassName() const
+{
+	return this->mClassName;
+}
+
+int AvHBaseBuildable::GetIdleAnimation() const
+{
+	int theAnimation = this->GetIdle1Animation();
+	
+	if(RANDOM_LONG(0, 1))
+	{
+		theAnimation = this->GetIdle2Animation();
+	}
+
+	return theAnimation;
+}
+
+char* AvHBaseBuildable::GetDeploySound() const
+{
+	return NULL;
+}
+
+bool AvHBaseBuildable::GetIsBuilt() const
+{
+    return this->mInternalSetConstructionComplete;
+}
+
+bool AvHBaseBuildable::GetIsOrganic() const
+{
+	return false;
+}
+
+char* AvHBaseBuildable::GetKilledSound() const
+{
+	return NULL;
+}
+
+float AvHBaseBuildable::GetNormalizedBuildPercentage() const
+{
+	//return this->pev->fuser1/kNormalizationNetworkFactor;
+
+	bool theIsBuilding;
+	bool theIsResearching;
+	float thePercentage;
+	AvHSHUGetBuildResearchState(this->pev->iuser3, this->pev->iuser4, this->pev->fuser1, theIsBuilding, theIsResearching, thePercentage);
+
+	// Check for energy special case
+	if(theIsBuilding && theIsResearching)
+	{
+		thePercentage = 1.0f;
+	}
+
+	return thePercentage;
+}
+
+float AvHBaseBuildable::GetTimeForAnimation(int inIndex) const
+{
+	return GetSequenceDuration(GET_MODEL_PTR(ENT(pev)), this->pev);
+}
+
+int AvHBaseBuildable::GetStartAlpha() const
+{
+	return kStartAlpha;
+}
+
+void AvHBaseBuildable::FireDeathTarget() const
+{
+	if(this->mTargetOnDeath != "")
+	{
+		FireTargets(this->mTargetOnDeath.c_str(), NULL, NULL, USE_TOGGLE, 0.0f);
+	}
+}
+
+void AvHBaseBuildable::FireSpawnTarget() const
+{
+	if(this->mTargetOnSpawn != "")
+	{
+		FireTargets(this->mTargetOnSpawn.c_str(), NULL, NULL, USE_TOGGLE, 0.0f);
+	}
+}
+
+void AvHBaseBuildable::KeyValue(KeyValueData* pkvd)
+{
+	// Any entity placed by the mapper is persistent
+	this->SetPersistent();
+
+	if(FStrEq(pkvd->szKeyName, "targetonspawn"))
+	{
+		this->mTargetOnSpawn = pkvd->szValue;
+		pkvd->fHandled = TRUE;
+	}
+	else if(FStrEq(pkvd->szKeyName, "targetondeath"))
+	{
+		this->mTargetOnDeath = pkvd->szValue;
+		pkvd->fHandled = TRUE;
+	}
+	else if(FStrEq(pkvd->szKeyName, "teamchoice"))
+	{
+		//this->mTeam = (AvHTeamNumber)(atoi(pkvd->szValue));
+		this->pev->team = (AvHTeamNumber)(atoi(pkvd->szValue));
+		
+		pkvd->fHandled = TRUE;
+	}
+	else if(FStrEq(pkvd->szKeyName, "angles"))
+	{
+		// TODO: Insert code here
+		//pkvd->fHandled = TRUE;
+		int a = 0;
+	}
+	else
+	{
+		CBaseAnimating::KeyValue(pkvd);
+	}
+}
+
+void AvHBaseBuildable::PlayAnimationAtIndex(int inIndex, bool inForce, float inFrameRate)
+{
+	// Only play animations on buildings that we have artwork for
+	bool thePlayAnim = false;
+
+	if(inIndex >= 0)
+	{
+		switch(this->mMessageID)
+		{
+		case BUILD_RESOURCES:
+		case BUILD_ARMSLAB:
+		case BUILD_COMMANDSTATION:
+		case BUILD_INFANTRYPORTAL:
+		case BUILD_TURRET_FACTORY:
+		case TURRET_FACTORY_UPGRADE:
+		case BUILD_ARMORY:
+		case ARMORY_UPGRADE:
+		case BUILD_OBSERVATORY:
+		case BUILD_TURRET:
+		case BUILD_SIEGE:
+		case BUILD_PROTOTYPE_LAB:
+		case ALIEN_BUILD_HIVE:
+		case ALIEN_BUILD_RESOURCES:
+		case ALIEN_BUILD_OFFENSE_CHAMBER:
+		case ALIEN_BUILD_DEFENSE_CHAMBER:
+		case ALIEN_BUILD_SENSORY_CHAMBER:
+		case ALIEN_BUILD_MOVEMENT_CHAMBER:
+			thePlayAnim = true;
+		}
+	}
+
+	// Make sure we're not interrupting another animation
+	if(thePlayAnim)
+	{
+		// Allow forcing of new animation, but it's better to complete current animation then interrupt it and play it again
+		float theCurrentTime = gpGlobals->time;
+		if((theCurrentTime >= this->mTimeAnimationDone) || (inForce && (inIndex != this->mLastAnimationPlayed)))
+		{
+			this->pev->sequence	= inIndex;
+			this->pev->frame = 0;
+			ResetSequenceInfo();
+
+            this->pev->framerate = inFrameRate;
+
+            // Set to last frame to play backwards
+            if(this->pev->framerate < 0)
+            {
+                this->pev->frame = 255;
+            }
+
+			this->mLastAnimationPlayed = inIndex;
+			float theTimeForAnim = this->GetTimeForAnimation(inIndex);
+			this->mTimeAnimationDone = theCurrentTime + theTimeForAnim;
+			
+			// Recalculate size
+			//Vector theMinSize, theMaxSize;
+			//this->ExtractBbox(this->pev->sequence, (float*)&theMinSize, (float*)&theMaxSize);
+			//UTIL_SetSize(this->pev, theMinSize, theMaxSize); 
+		}
+	}
+}
+
+void AvHBaseBuildable::SetNormalizedBuildPercentage(float inPercentage, bool inForceIfComplete)
+{
+	// Get previous build percentage so we can add hitpoints as structure is building.  This means that structures that are hurt while building finish hurt.
+	bool theIsBuilding, theIsResearching;
+	float theNormalizedBuildPercentage = 0.0f;
+	AvHSHUGetBuildResearchState(this->pev->iuser3, this->pev->iuser4, this->pev->fuser1, theIsBuilding, theIsResearching, theNormalizedBuildPercentage);
+
+	float theDiff = inPercentage - theNormalizedBuildPercentage;
+	if(theDiff > 0)
+	{
+		this->pev->health += theDiff*(1.0f - kBaseHealthPercentage)*this->mBaseHealth;
+		this->pev->health = min(max(0.0f, this->pev->health), this->mBaseHealth);
+	}
+	else
+	{
+		int a = 0;
+	}
+
+	// Set new build state
+	AvHSHUSetBuildResearchState(this->pev->iuser3, this->pev->iuser4, this->pev->fuser1, true, inPercentage);
+
+	if(inPercentage >= 1.0f)
+	{
+		this->InternalSetConstructionComplete(inForceIfComplete);
+	}
+	
+	this->HealthChanged();
+}
+
+void AvHBaseBuildable::UpdateOnRecycle()
+{
+	// empty, override to add events on recycle for buildings
+}
+
+void AvHBaseBuildable::StartRecycle()
+{
+	if(!GetHasUpgrade(this->pev->iuser4, MASK_RECYCLING))
+	{
+        int theRecycleTime = (GetGameRules()->GetCheatsEnabled() && !GetGameRules()->GetIsCheatEnabled(kcSlowResearch)) ? 2 : BALANCE_IVAR(kRecycleTime);
+
+        // Play recycle animation in reverse (would like to play them slower according to recycle time, but it doesn't work for all structures, seems dependent on # of keyframes)
+        int theAnimation = this->GetRecycleAnimation();
+        float theTimeForAnim = this->GetTimeForAnimation(theAnimation);
+        float theFrameRate = -1;//-theTimeForAnim/theRecycleTime;
+        this->PlayAnimationAtIndex(theAnimation, true, theFrameRate);
+		
+		// Schedule time to give points back
+		SetThink(&AvHBaseBuildable::RecycleComplete);
+
+		this->mTimeRecycleStarted = gpGlobals->time;
+		
+		this->mTimeRecycleDone = gpGlobals->time + theRecycleTime;
+		
+		this->pev->nextthink = this->mTimeRecycleDone;
+
+		float theVolume = .5f;
+		EMIT_SOUND(this->edict(), CHAN_AUTO, kBuildableRecycleSound, theVolume, ATTN_NORM);
+
+        SetUpgradeMask(&this->pev->iuser4, MASK_RECYCLING);
+
+		// run any events for this class on recycling the structure
+		this->UpdateOnRecycle();
+
+        // Remove tech immediately, so research or building isn't started using this tech
+        this->TriggerRemoveTech();
+	}
+}
+
+bool AvHBaseBuildable::GetIsRecycling() const
+{
+	return GetHasUpgrade(this->pev->iuser4, MASK_RECYCLING);
+}
+
+bool AvHBaseBuildable::GetIsTechActive() const
+{
+	bool theIsActive = false;
+
+	if(this->GetIsBuilt() && (this->pev->health > 0) && !GetHasUpgrade(this->pev->iuser4, MASK_RECYCLING))
+	{
+		theIsActive = true;
+	}
+
+	return theIsActive;
+}
+
+int	AvHBaseBuildable::GetActiveAnimation() const
+{
+	return kBaseBuildableActiveAnimation;
+}
+
+CBaseEntity* AvHBaseBuildable::GetAttacker()
+{
+	CBaseEntity* theAttacker = this;
+	
+	AvHBuildable* theBuildable = dynamic_cast<AvHBuildable*>(this);
+	if(theBuildable)
+	{
+		int theBuilderIndex = theBuildable->GetBuilder();
+		CBaseEntity* theBuilderEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theBuilderIndex));
+		if(theBuilderEntity)
+		{
+			theAttacker = theBuilderEntity;
+		}
+	}
+	
+	return theAttacker;
+}
+
+int	AvHBaseBuildable::GetDeployAnimation() const
+{
+	return kBaseBuildableDeployAnimation;
+}
+
+int	AvHBaseBuildable::GetIdle1Animation() const
+{
+	return kBaseBuildableIdle1Animation;
+}
+
+int	AvHBaseBuildable::GetIdle2Animation() const
+{
+	return kBaseBuildableIdle2Animation;
+}
+
+int AvHBaseBuildable::GetKilledAnimation() const
+{
+	return kBaseBuildableDieForwardAnimation;
+}
+
+AvHMessageID AvHBaseBuildable::GetMessageID() const
+{
+	return this->mMessageID;
+}
+
+int	AvHBaseBuildable::GetMoveType() const
+{
+	return MOVETYPE_TOSS;
+}
+
+bool AvHBaseBuildable::GetTriggerAlertOnDamage() const
+{
+	return true;
+}
+
+float AvHBaseBuildable::GetTimeAnimationDone() const
+{
+	return this->mTimeAnimationDone;
+}
+
+int	AvHBaseBuildable::GetResearchAnimation() const
+{
+	return kBaseBuildableResearchingAnimation;
+}
+
+// Play deploy animation backwards
+int	AvHBaseBuildable::GetRecycleAnimation() const
+{
+    int theAnimation = -1;
+    
+    if(this->GetIsBuilt())
+    {
+        theAnimation = this->GetDeployAnimation();
+    }
+
+	return theAnimation;
+}
+
+char* AvHBaseBuildable::GetModelName() const
+{
+	return this->mModelName;
+}
+
+int	AvHBaseBuildable::GetSpawnAnimation() const
+{
+	return kBaseBuildableSpawnAnimation;
+}
+
+int	AvHBaseBuildable::GetTakeDamageAnimation() const
+{
+    int theAnimation = -1;
+    
+    if(this->GetIsBuilt())
+    {
+        theAnimation = kBaseBuildableTakeDamageAnimation;
+    }
+
+	return theAnimation;
+}
+
+
+AvHTeamNumber AvHBaseBuildable::GetTeamNumber() const
+{
+	return (AvHTeamNumber)this->pev->team;
+}
+
+void AvHBaseBuildable::Killed(entvars_t* pevAttacker, int iGib)
+{
+	AvHBaseBuildable::SetHasBeenKilled();
+
+	this->mKilled = true;
+    this->mInternalSetConstructionComplete = false;
+
+	this->TriggerDeathAudioVisuals();
+
+	if(!this->GetIsOrganic())
+	{
+		Vector vecSrc = Vector( (float)RANDOM_FLOAT( pev->absmin.x, pev->absmax.x ), (float)RANDOM_FLOAT( pev->absmin.y, pev->absmax.y ), (float)0 );
+		vecSrc = vecSrc + Vector( (float)0, (float)0, (float)RANDOM_FLOAT( pev->origin.z, pev->absmax.z ) );
+		UTIL_Sparks(vecSrc);
+	}
+
+	this->TriggerRemoveTech();
+
+	AvHSURemoveEntityFromHotgroupsAndSelection(this->entindex());
+
+	if(pevAttacker)
+	{
+		const char* theClassName = STRING(this->pev->classname);
+		AvHPlayer* inPlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(ENT(pevAttacker)));
+		if(inPlayer && theClassName)
+		{
+			inPlayer->LogPlayerAction("structure_destroyed", theClassName);
+			GetGameRules()->RewardPlayerForKill(inPlayer, this);
+		}
+	}
+	
+	if(this->GetIsPersistent())
+	{
+        this->SetInactive();
+	}
+	else
+	{
+		CBaseAnimating::Killed(pevAttacker, iGib);
+	}
+}
+
+void AvHBaseBuildable::SetActive()
+{
+    this->pev->effects &= ~EF_NODRAW;
+}
+
+void AvHBaseBuildable::SetInactive()
+{
+	this->pev->health = 0;
+    this->pev->effects |= EF_NODRAW;
+    this->pev->solid = SOLID_NOT;
+    this->pev->takedamage = DAMAGE_NO;
+	SetUpgradeMask(&this->pev->iuser4, MASK_PARASITED, false);//voogru: remove parasite flag to prevent phantom parasites.
+    //this->pev->deadflag = DEAD_DEAD;
+    SetThink(NULL);
+}
+
+int	AvHBaseBuildable::ObjectCaps(void)
+{
+	return FCAP_CONTINUOUS_USE;
+}
+
+void AvHBaseBuildable::Precache(void)
+{
+	CBaseAnimating::Precache();
+
+	char* theDeploySound = this->GetDeploySound();
+	if(theDeploySound)
+	{
+		PRECACHE_UNMODIFIED_SOUND(theDeploySound);
+	}
+	char* theKilledSound = this->GetKilledSound();
+	if(theKilledSound)
+	{
+		PRECACHE_UNMODIFIED_SOUND(theKilledSound);
+	}
+	
+	PRECACHE_UNMODIFIED_MODEL(this->mModelName);
+	
+	PRECACHE_UNMODIFIED_SOUND(kBuildableRecycleSound);
+	//PRECACHE_UNMODIFIED_SOUND(kBuildableHurt1Sound);
+	//PRECACHE_UNMODIFIED_SOUND(kBuildableHurt2Sound);
+
+	this->mElectricalSprite = PRECACHE_UNMODIFIED_MODEL(kElectricalSprite);
+}
+
+void AvHBaseBuildable::RecycleComplete()
+{
+	// Look at whether it has been built and health to determine how many points to give back
+	float thePercentage = BALANCE_FVAR(kRecycleResourcePercentage);
+
+	if(!this->GetIsBuilt())
+	{
+		thePercentage = .8f;
+	}
+
+	// Make sure the building is still alive, can't get points back if it's dead
+	if(this->pev->health <= 0)
+	{
+		thePercentage = 0.0f;
+	}
+
+	// Look up team
+	AvHTeam* theTeam = GetGameRules()->GetTeam((AvHTeamNumber)this->pev->team);
+	if(theTeam)
+	{
+		bool theIsEnergyTech = AvHSHUGetDoesTechCostEnergy(this->mMessageID);
+		ASSERT(!theIsEnergyTech);
+
+		float thePointsBack = GetGameRules()->GetCostForMessageID(this->mMessageID)*thePercentage;
+		theTeam->SetTeamResources(theTeam->GetTeamResources() + thePointsBack);
+
+        // Play "+ resources" event
+        AvHSUPlayNumericEventAboveStructure(thePointsBack, this);
+
+		this->Killed(this->pev, 0);
+	}
+}
+
+// Sets the template iuser3 for this buildable.  This is stored outside of the actual iuser3 because sometimes the pev isn't allocated yet.
+void AvHBaseBuildable::SetSelectID(int inSelectID)
+{
+	this->mSelectID = inSelectID;
+}
+
+bool AvHBaseBuildable::Regenerate(float inRegenerationAmount, bool inPlaySound)
+{
+	bool theDidHeal = false;
+	
+	float theMaxHealth = this->mBaseHealth;
+
+	if(!this->GetIsBuilt())
+	{
+		float theNormalizedBuildPercentage = this->GetNormalizedBuildPercentage();
+
+		theMaxHealth = (kBaseHealthPercentage + theNormalizedBuildPercentage*(1.0f - kBaseHealthPercentage))*this->mBaseHealth;
+	}
+
+	// If we aren't at full health, heal health
+	if(this->pev->health < theMaxHealth)
+	{
+		this->pev->health = min(theMaxHealth, this->pev->health + inRegenerationAmount);
+		this->HealthChanged();
+		theDidHeal = true;
+	}
+	
+	// Play regen event
+	if(theDidHeal)
+	{
+		if(inPlaySound)
+		{
+			// Play regeneration event
+			PLAYBACK_EVENT_FULL(0, this->edict(), gRegenerationEventID, 0, this->pev->origin, (float *)&g_vecZero, 1.0f, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+		}
+	}
+
+	return theDidHeal;
+}
+
+void AvHBaseBuildable::ResetEntity()
+{
+	CBaseAnimating::ResetEntity();
+
+	this->Init();
+
+	this->Materialize();
+
+	this->pev->effects = 0;
+
+	// Build it if marked as starting built
+	if(this->pev->spawnflags & 1)
+		this->SetConstructionComplete(true);
+
+	this->mKilled = false;
+}
+
+void AvHBaseBuildable::InternalSetConstructionComplete(bool inForce)
+{
+	if(!this->mInternalSetConstructionComplete || inForce)
+	{
+		// Fully built items are no longer marked as buildable
+		SetUpgradeMask(&this->pev->iuser4, MASK_BUILDABLE, false);
+		
+		this->pev->rendermode = kRenderNormal;
+		this->pev->renderamt = 255;
+		
+		this->SetHasBeenBuilt();
+
+        this->SetActive();
+        
+        this->mInternalSetConstructionComplete = true;
+
+		this->TriggerAddTech();
+		
+		char* theDeploySound = this->GetDeploySound();
+		if(theDeploySound)
+		{
+			EMIT_SOUND(ENT(this->pev), CHAN_WEAPON, theDeploySound, 1, ATTN_NORM);
+		}
+		
+		int theDeployAnimation = this->GetDeployAnimation();
+		
+		this->PlayAnimationAtIndex(theDeployAnimation, true);
+	}
+}
+
+void AvHBaseBuildable::SetConstructionComplete(bool inForce)
+{
+	this->SetNormalizedBuildPercentage(1.0f, inForce);
+}
+
+void AvHBaseBuildable::SetAverageUseSoundLength(float inLength)
+{
+	this->mAverageUseSoundLength = inLength;
+}
+
+void AvHBaseBuildable::SetResearching(bool inState)
+{
+	int theSequence = this->GetResearchAnimation();
+
+	if(!inState)
+	{
+		theSequence = this->GetIdleAnimation();
+	}
+
+	this->PlayAnimationAtIndex(theSequence, true);
+
+	this->mIsResearching = inState;
+}
+
+// Requires mSelectID and mMessageID to be set
+// Sets the pev user variables, mBaseHealth, pev->health and pev->armorvalue
+void AvHBaseBuildable::InternalInitializeBuildable()
+{
+	// Always buildable
+	InitializeBuildable(this->pev->iuser3, this->pev->iuser4, this->pev->fuser1, this->mSelectID);
+	this->mBaseHealth = GetGameRules()->GetBaseHealthForMessageID(this->mMessageID);
+	this->pev->health = this->mBaseHealth*kBaseHealthPercentage;
+	this->pev->max_health = this->mBaseHealth;
+
+	// Store max health in armorvalue
+	//this->pev->armorvalue = GetGameRules()->GetBaseHealthForMessageID(this->mMessageID);
+}
+
+const float kFallThinkInterval = .1f;
+
+void AvHBaseBuildable::Spawn()
+{
+	this->Precache();
+
+	CBaseAnimating::Spawn();
+
+	// Get building size in standard way
+	SET_MODEL(ENT(this->pev), this->mModelName);
+
+	pev->movetype = this->GetMoveType();
+	pev->solid = SOLID_BBOX;
+	
+	UTIL_SetOrigin( pev, pev->origin );
+
+	this->Materialize();
+
+    SetTouch(&AvHBaseBuildable::BuildableTouch);
+
+	if(this->pev->spawnflags & 1)
+		this->SetConstructionComplete(true);
+}
+
+
+void AvHBaseBuildable::FallThink()
+{
+	pev->nextthink = gpGlobals->time + kFallThinkInterval;
+	
+	if ( pev->flags & FL_ONGROUND )
+	{
+		this->Materialize();
+
+		// Start animating
+		SetThink(&AvHBaseBuildable::AnimateThink);
+		this->pev->nextthink = gpGlobals->time + kAnimateThinkTime;
+	}
+}
+
+int	AvHBaseBuildable::GetSequenceForBoundingBox() const
+{
+	return 0;
+}
+
+void AvHBaseBuildable::Materialize()
+{
+	this->pev->solid = SOLID_BBOX;
+	this->pev->movetype = this->GetMoveType();
+	
+	this->pev->classname = MAKE_STRING(this->mClassName);
+	
+	this->pev->takedamage = DAMAGE_YES;
+	SetBits(this->pev->flags, FL_MONSTER);
+	
+	// Always buildable
+	this->InternalInitializeBuildable();
+	
+	this->SetNormalizedBuildPercentage(0.0f);
+	
+	// NOTE: fuser2 is used for repairing structures
+
+	Vector theMinSize, theMaxSize;
+	//int theSequence = this->GetSequenceForBoundingBox();
+
+	// Get height needed for model
+	//this->ExtractBbox(theSequence, (float*)&theMinSize, (float*)&theMaxSize);
+	//float theHeight = theMaxSize.z - theMinSize.z;
+
+	AvHSHUGetSizeForTech(this->GetMessageID(), theMinSize, theMaxSize);
+
+	UTIL_SetSize(pev, theMinSize, theMaxSize);
+
+	this->PlayAnimationAtIndex(this->GetSpawnAnimation(), true);
+		
+	SetUse(&AvHBaseBuildable::ConstructUse);
+}
+
+int	AvHBaseBuildable::TakeDamage(entvars_t* inInflictor, entvars_t* inAttacker, float inDamage, int inBitsDamageType)
+{
+	//Even out the damage
+	//inDamage = ceil(inDamage);
+
+	if(GetGameRules()->GetIsCheatEnabled(kcHighDamage))
+	{
+		inDamage *= 50;
+	}
+
+	if(!inAttacker)
+	{
+		inAttacker = inInflictor;
+	}
+	
+	if(!inInflictor)
+	{
+		inInflictor = inAttacker;
+	}
+
+	// Take into account handicap
+	AvHTeam* theTeam = GetGameRules()->GetTeam(AvHTeamNumber(inAttacker->team));
+	if(theTeam)
+	{
+		float theHandicap = theTeam->GetHandicap();
+		inDamage *= theHandicap;
+	}
+	
+	CBaseEntity* inInflictorEntity = CBaseEntity::Instance(inInflictor);
+	float theDamage = 0;
+
+	// Take half damage from piercing
+	if(inBitsDamageType & NS_DMG_PIERCING)
+	{
+		inDamage /= 2.0f;
+	}
+
+	// Take double damage from blast
+	if(inBitsDamageType & NS_DMG_BLAST)
+	{
+		inDamage *= 2.0f;
+	}
+	
+	if((inBitsDamageType & NS_DMG_ORGANIC) && !this->GetIsOrganic())
+	{
+		inDamage = 0.0f;
+	}
+
+	theDamage = AvHPlayerUpgrade::CalculateDamageLessArmor((AvHUser3)this->pev->iuser3, this->pev->iuser4, inDamage, this->pev->armorvalue, inBitsDamageType, GetGameRules()->GetNumActiveHives((AvHTeamNumber)this->pev->team));
+	if(theDamage > 0)
+	{
+        int theAnimationIndex = this->GetTakeDamageAnimation();
+        if(theAnimationIndex >= 0)
+        {
+            this->PlayAnimationAtIndex(theAnimationIndex, true);
+        }
+
+        // Award experience to attacker
+        CBaseEntity* theEntity = CBaseEntity::Instance(ENT(inAttacker));
+        AvHPlayer* inAttacker = dynamic_cast<AvHPlayer*>(theEntity);
+        if(inAttacker && (inAttacker->pev->team != this->pev->team))
+        {
+            inAttacker->AwardExperienceForObjective(theDamage, this->GetMessageID());
+        }
+	}
+	
+	int theReturnValue = 0;
+	
+	if(theDamage > 0.0f)
+	{
+		if(this->GetTriggerAlertOnDamage())
+			GetGameRules()->TriggerAlert((AvHTeamNumber)this->pev->team, ALERT_UNDER_ATTACK, this->entindex());
+		
+		theDamage = CBaseAnimating::TakeDamage(inInflictor, inAttacker, inDamage, inBitsDamageType);
+
+		bool theDrawDamage = (CVAR_GET_FLOAT(kvDrawDamage) > 0);
+
+		#ifdef DEBUG
+		#ifndef	AVH_EXTERNAL_BUILD
+		theDrawDamage = true;
+		#endif
+		#endif
+
+		if(theDrawDamage)
+		{
+			Vector theMinSize;
+			Vector theMaxSize;
+			AvHSHUGetSizeForTech(this->GetMessageID(), theMinSize, theMaxSize);
+			
+			Vector theStartPos = this->pev->origin;
+			theStartPos.z += theMaxSize.z;
+			
+			// Draw for everyone (team is 0 after inDamage parameter)
+			AvHSUPlayNumericEvent(-inDamage, this->edict(), theStartPos, 0, kNumericalInfoHealthEvent, 0);
+		}
+	}
+
+	// Structures uncloak when damaged
+	this->Uncloak();
+
+	this->HealthChanged();
+	
+	return theDamage;
+}
+
+void AvHBaseBuildable::TechnologyBuilt(AvHMessageID inMessageID)
+{
+}
+
+void AvHBaseBuildable::WorldUpdate()
+{
+	this->UpdateTechSlots();
+
+	// Organic buildings heal themselves
+	if(this->GetIsOrganic())
+	{
+		this->UpdateAutoHeal();
+	}
+	else
+	{
+		//this->UpdateDamageEffects();
+	}
+
+	// If we're electrified, set render mode
+	if(GetHasUpgrade(this->pev->iuser4, MASK_UPGRADE_11))
+	{
+		// Base marine building
+		const int kElectrifyRenderMode = kRenderFxGlowShell;
+		const int kElectrifyRenderAmount = 40;
+
+		this->pev->renderfx = kElectrifyRenderMode;
+		this->pev->renderamt = kElectrifyRenderAmount;
+		this->pev->rendercolor.x = kTeamColors[this->pev->team][0];
+		this->pev->rendercolor.y = kTeamColors[this->pev->team][1];
+		this->pev->rendercolor.z = kTeamColors[this->pev->team][2];
+
+		// Check for enemy players/structures nearby
+		CBaseEntity* theBaseEntity = NULL;
+		int theNumEntsDamaged = 0;
+		
+		while(((theBaseEntity = UTIL_FindEntityInSphere(theBaseEntity, this->pev->origin, BALANCE_IVAR(kElectricalRange))) != NULL) && (theNumEntsDamaged < BALANCE_IVAR(kElectricalMaxTargets)))
+		{
+			// When "electric" cheat is enabled, shock all non-self entities, else shock enemies
+			if((GetGameRules()->GetIsCheatEnabled(kcElectric) && (theBaseEntity != this)) || ((theBaseEntity->pev->team != this->pev->team) && theBaseEntity->IsAlive()))
+			{
+				// Make sure it's not blocked
+				TraceResult theTraceResult;
+				UTIL_TraceLine(this->pev->origin, theBaseEntity->pev->origin, ignore_monsters, dont_ignore_glass, this->edict(), &theTraceResult);
+				if(theTraceResult.flFraction == 1.0f)
+				{
+					CBaseEntity* theAttacker = this->GetAttacker();
+					ASSERT(theAttacker);
+
+					if(theBaseEntity->TakeDamage(this->pev, theAttacker->pev, BALANCE_IVAR(kElectricalDamage), DMG_GENERIC) > 0)
+					//if(theBaseEntity->IsPlayer())
+					{
+					//	AvHPlayer* theBasePlayer = dynamic_cast<AvHPlayer*>(theBaseEntity);
+					//	if(theBasePlayer && theBasePlayer->GetIsAlien())
+					//	{
+					//		// Deduct energy
+					//		float theEnergyLoss = BALANCE_FVAR(kElectricalEnergyLoss);
+					//		AvHMUDeductAlienEnergy(theBasePlayer->pev->fuser3, theEnergyLoss, true);
+
+							MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+								WRITE_BYTE(TE_BEAMENTPOINT);
+								WRITE_SHORT(theBaseEntity->entindex());
+								WRITE_COORD( this->pev->origin.x);
+								WRITE_COORD( this->pev->origin.y);
+								WRITE_COORD( this->pev->origin.z);
+						
+								WRITE_SHORT( this->mElectricalSprite );
+								WRITE_BYTE( 0 ); // framestart
+								WRITE_BYTE( (int)15); // framerate
+								WRITE_BYTE( (int)(2) ); // life
+								WRITE_BYTE( 60 );  // width
+								WRITE_BYTE( 15 );   // noise
+								WRITE_BYTE( (int)this->pev->rendercolor.x );   // r, g, b
+								WRITE_BYTE( (int)this->pev->rendercolor.y );   // r, g, b
+								WRITE_BYTE( (int)this->pev->rendercolor.z );   // r, g, b
+								WRITE_BYTE( 200 );	// brightness
+								WRITE_BYTE( 10 );	// speed
+							MESSAGE_END();
+						
+							gSoundListManager.PlaySoundInList(kElectricSparkSoundList, this, CHAN_AUTO, .7f);
+						
+							UTIL_Sparks(theBaseEntity->pev->origin);
+						
+							theNumEntsDamaged++;
+					//	}
+					}
+				}
+//				else
+//				{
+//					char theString[512];
+//					sprintf(theString, "Entity %s blocked from zap by %s.\r\n", STRING(theBaseEntity->pev->classname), STRING(ENT(theTraceResult.pHit)->v.classname));
+//					ALERT(at_logged, theString);
+//				}
+			}
+		}
+	}
+}
+
+bool AvHBaseBuildable::GetHasBeenKilled() const
+{
+	return this->mKilled;
+}
+
+bool AvHBaseBuildable::GetIsTechnologyAvailable(AvHMessageID inMessageID) const
+{
+	bool theTechnologyAvailable = false;
+	
+	const AvHTeam* theTeam = GetGameRules()->GetTeam((AvHTeamNumber)this->pev->team);
+	if(theTeam)
+	{
+        // Don't allow electrical upgrade if we're already electrified
+        if((inMessageID != RESEARCH_ELECTRICAL) || !GetHasUpgrade(this->pev->iuser4, MASK_UPGRADE_11))
+        {
+            theTechnologyAvailable = (theTeam->GetIsTechnologyAvailable(inMessageID) && this->GetIsBuilt() && !GetHasUpgrade(this->pev->iuser4, MASK_RECYCLING));
+
+            // Enable recycle button for unbuilt structures
+            if(!this->GetIsBuilt() && (inMessageID == BUILD_RECYCLE))
+            {
+                theTechnologyAvailable = true;
+            }
+        }
+	}	
+	return theTechnologyAvailable;
+}
+
+
+void AvHBaseBuildable::UpdateTechSlots()
+{
+	// Get tech slot for this structure
+	AvHGamerules* theGameRules = GetGameRules();
+	const AvHTeam* theTeam = theGameRules->GetTeam((AvHTeamNumber)this->pev->team);
+	if(theTeam)
+	{
+		// Update tech slots
+		AvHTechSlots theTechSlots;
+		if(theTeam->GetTechSlotManager().GetTechSlotList((AvHUser3)this->pev->iuser3, theTechSlots))
+		{
+			// Clear the existing slots
+			int theMasks[kNumTechSlots] = {MASK_UPGRADE_1, MASK_UPGRADE_2, MASK_UPGRADE_3, MASK_UPGRADE_4, MASK_UPGRADE_5, MASK_UPGRADE_6, MASK_UPGRADE_7, MASK_UPGRADE_8};
+			
+			// Each slot if we technology is available
+			for(int i = 0; i < kNumTechSlots; i++)
+			{
+				int theCurrentMask = theMasks[i];
+				this->pev->iuser4 &= ~theCurrentMask;
+				
+				AvHMessageID theMessage = theTechSlots.mTechSlots[i];
+				if(theMessage != MESSAGE_NULL)
+				{
+					if(this->GetIsTechnologyAvailable(theMessage))
+					{
+						this->pev->iuser4 |= theCurrentMask;
+					}
+				}
+			}
+		}
+
+		// Update recycling status bar
+		if(GetHasUpgrade(this->pev->iuser4, MASK_RECYCLING))
+		{
+			float theNormalizedRecyclingFactor = (gpGlobals->time - this->mTimeRecycleStarted)/(this->mTimeRecycleDone - this->mTimeRecycleStarted);
+			theNormalizedRecyclingFactor = min(max(theNormalizedRecyclingFactor, 0.0f), 1.0f);
+			
+			//theResearchEntity->pev->fuser1 = (kResearchFuser1Base + theNormalizedResearchFactor)*kNormalizationNetworkFactor;
+			AvHSHUSetBuildResearchState(this->pev->iuser3, this->pev->iuser4, this->pev->fuser1, false, theNormalizedRecyclingFactor);
+		}
+	}
+}
+
+void AvHBaseBuildable::TriggerDeathAudioVisuals()
+{
+	AvHClassType theTeamType = AVH_CLASS_TYPE_UNDEFINED;
+	AvHTeam* theTeam = GetGameRules()->GetTeam((AvHTeamNumber)this->pev->team);
+	if(theTeam)
+	{
+		theTeamType = theTeam->GetTeamType();
+	}
+	
+	switch(theTeamType)
+	{
+	case AVH_CLASS_TYPE_ALIEN:
+		AvHSUPlayParticleEvent(kpsChamberDeath, this->edict(), this->pev->origin);
+		break;
+		
+	case AVH_CLASS_TYPE_MARINE:
+		// lots of smoke
+		MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+		WRITE_BYTE( TE_SMOKE );
+		WRITE_COORD( RANDOM_FLOAT( pev->absmin.x, pev->absmax.x ) );
+		WRITE_COORD( RANDOM_FLOAT( pev->absmin.y, pev->absmax.y ) );
+		WRITE_COORD( RANDOM_FLOAT( pev->absmin.z, pev->absmax.z ) );
+		WRITE_SHORT( g_sModelIndexSmoke );
+		WRITE_BYTE( 25 ); // scale * 10
+		WRITE_BYTE( 10 ); // framerate
+		MESSAGE_END();
+		break;
+	}
+	
+	char* theKilledSound = this->GetKilledSound();
+	if(theKilledSound)
+	{
+		EMIT_SOUND(ENT(this->pev), CHAN_AUTO, theKilledSound, 1.0, ATTN_IDLE);
+	}
+}
+
+void AvHBaseBuildable::UpdateAutoBuild(float inTimePassed)
+{
+	if(GetGameRules()->GetGameStarted())
+	{
+		// TF2 snippet for making sure players don't get stuck in buildings
+		if(this->pev->solid == SOLID_NOT)
+		{
+			//trace_t tr;
+			//UTIL_TraceHull(this->pev->origin, this->pev->origin, this->pev->mins, this->pev->maxs, this->pev, &tr);
+			//if(!tr.startsolid && !tr.allsolid )
+			//if(AvHSHUGetIsAreaFree(this->pev->origin, this->pev->mins, this->pev->maxs, this->edict()))
+
+			// Check point contents for corner points
+			float theMinX = this->pev->origin.x + this->pev->mins.x;
+			float theMinY = this->pev->origin.y + this->pev->mins.y;
+			float theMinZ = this->pev->origin.z + this->pev->mins.z;
+			float theMaxX = this->pev->origin.x + this->pev->maxs.x;
+			float theMaxY = this->pev->origin.y + this->pev->maxs.y;
+			float theMaxZ = this->pev->origin.z + this->pev->maxs.z;
+
+			// Do tracelines between the corners, to make sure there's no geometry inside the box
+			Vector theMinVector(theMinX, theMinY, theMinZ);
+			Vector theMaxVector(theMaxX, theMaxY, theMaxZ);
+			if(AvHSHUTraceLineIsAreaFree(theMinVector, theMaxVector, this->edict()))
+			{
+			  theMinVector = Vector(theMaxX, theMinY, theMinZ);
+			  theMaxVector = Vector(theMinX, theMaxY, theMaxZ);
+				if(AvHSHUTraceLineIsAreaFree(theMinVector, theMaxVector, this->edict()))
+				{
+				  theMinVector = Vector(theMaxX, theMaxY, theMinZ);
+				  theMaxVector = Vector(theMinX, theMinY, theMaxZ);
+					if(AvHSHUTraceLineIsAreaFree(theMinVector, theMaxVector, this->edict()))
+					{
+						this->pev->solid = SOLID_BBOX;
+
+						// Relink into world (not sure if this is necessary)
+						UTIL_SetOrigin(this->pev, this->pev->origin);
+					}
+				}
+			}
+		}
+		else
+		{
+			// If it's not fully built, build more
+			bool theIsBuilding, theIsResearching;
+			float thePercentage;
+			AvHSHUGetBuildResearchState(this->pev->iuser3, this->pev->iuser4, this->pev->fuser1, theIsBuilding, theIsResearching, thePercentage);
+			
+			float theBuildTime = GetGameRules()->GetBuildTimeForMessageID(this->GetMessageID());
+			float theBuildPercentage = inTimePassed/theBuildTime;
+			
+			float theNewPercentage = min(thePercentage + theBuildPercentage, 1.0f);
+			this->SetNormalizedBuildPercentage(theNewPercentage);
+			
+//			// Increase built time if not fully built
+//			if(!this->GetHasBeenBuilt() && (theNewPercentage >= 1.0f))
+//			{
+//				this->SetConstructionComplete();
+//			}
+////			else
+////			{
+////				this->pev->rendermode = kRenderTransTexture;
+////				int theStartAlpha = this->GetStartAlpha();
+////				this->pev->renderamt = theStartAlpha + theNewPercentage*(255 - theStartAlpha);
+////			}
+//
+//			AvHSHUSetBuildResearchState(this->pev->iuser3, this->pev->iuser4, this->pev->fuser1, true, theNewPercentage);
+			
+			// TODO: Heal self?
+			// TODO: Play ambient sounds?
+		}
+	}
+}
+
+void AvHBaseBuildable::UpdateAutoHeal()
+{
+	if(GetGameRules()->GetGameStarted() && this->GetIsBuilt())
+	{
+		if((this->mTimeOfLastAutoHeal != -1) && (gpGlobals->time > this->mTimeOfLastAutoHeal))
+		{
+			float theMaxHealth = GetGameRules()->GetBaseHealthForMessageID(this->GetMessageID());
+			if(this->pev->health < theMaxHealth)
+			{
+				float theTimePassed = (gpGlobals->time - this->mTimeOfLastAutoHeal);
+				float theHitPointsToGain = theTimePassed*BALANCE_IVAR(kOrganicStructureHealRate);
+			
+				this->pev->health += theHitPointsToGain;
+				this->pev->health = min(this->pev->health, theMaxHealth);
+			
+				this->HealthChanged();
+			}
+		}
+
+		this->mTimeOfLastAutoHeal = gpGlobals->time;
+	}
+}
+
+void AvHBaseBuildable::UpdateDamageEffects()
+{
+	if(GetGameRules()->GetGameStarted() && this->GetIsBuilt())
+	{
+		// Add special effects for structures that are hurt or almost dead
+		float theMaxHealth = GetGameRules()->GetBaseHealthForMessageID(this->GetMessageID());
+		float theHealthScalar = this->pev->health/theMaxHealth;
+		float theTimeInterval = max(gpGlobals->time - this->mTimeOfLastDamageUpdate, .1f);
+
+		const float kParticleSystemLifetime = 5.0f;
+		int theAverageSoundInterval = -1;
+		
+		// If we're at 25% health or less, emit black smoke
+		if(gpGlobals->time > (this->mTimeOfLastDamageEffect + kParticleSystemLifetime))
+		{
+			if(theHealthScalar < .25f)
+			{
+				AvHSUPlayParticleEvent(kpsBuildableLightDamage, this->edict(), this->pev->origin);
+				this->mTimeOfLastDamageEffect = gpGlobals->time;
+				theAverageSoundInterval = 3;
+			}
+			// If we're at 50% health or less, emit light smoke
+			else if(theHealthScalar < .5f)
+			{
+				AvHSUPlayParticleEvent(kpsBuildableLightDamage, this->edict(), this->pev->origin);
+				this->mTimeOfLastDamageEffect = gpGlobals->time;
+				theAverageSoundInterval = 5;
+			}
+		}
+		
+		// If we're at less then 75% health, spark occasionally
+		if(theHealthScalar < .75f)
+		{
+			int theRandomChance = RANDOM_LONG(0, (float)8/theTimeInterval);
+			if(theRandomChance == 0)
+			{
+				UTIL_Sparks(this->pev->origin);
+				UTIL_Sparks(this->pev->origin);
+
+				const char* theHurtSoundToPlay = kBuildableHurt1Sound;
+				if(RANDOM_LONG(0, 1) == 1)
+				{
+					theHurtSoundToPlay = kBuildableHurt2Sound;
+				}
+				
+				float theVolume = .3f;
+				EMIT_SOUND(this->edict(), CHAN_AUTO, theHurtSoundToPlay, theVolume, ATTN_NORM);
+			}
+		}
+		
+		this->mTimeOfLastDamageUpdate = gpGlobals->time;
+	}
+}
+
+
+void AvHBaseBuildable::HealthChanged()
+{
+	int theMaxHealth = this->mBaseHealth;//this->pev->armorvalue;
+	int theCurrentHealth = this->pev->health;
+		
+	float theNewHealthPercentage = (float)theCurrentHealth/theMaxHealth;
+	this->pev->fuser2 = theNewHealthPercentage*kNormalizationNetworkFactor;
+}
+
+bool AvHBaseBuildable::GetIsPersistent() const
+{
+	return this->mPersistent;
+}
+
+void AvHBaseBuildable::SetPersistent()
+{
+	this->mPersistent = true;
+}
+
diff --git a/main/source/mod/AvHBaseBuildable.h b/main/source/mod/AvHBaseBuildable.h
new file mode 100644
index 00000000..deff170d
--- /dev/null
+++ b/main/source/mod/AvHBaseBuildable.h
@@ -0,0 +1,260 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHBaseBuildable.h$
+// $Date: 2002/11/15 04:47:11 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHBaseBuildable.h,v $
+// Revision 1.11  2002/11/15 04:47:11  Flayra
+// - Regenerate now returns bool if healed or not, for def chamber tweak
+//
+// Revision 1.10  2002/11/06 01:38:24  Flayra
+// - Added ability for buildings to be enabled and disabled, for turrets to be shut down
+// - Damage refactoring (TakeDamage assumes caller has already adjusted for friendly fire, etc.)
+//
+// Revision 1.9  2002/10/03 18:38:56  Flayra
+// - Fixed problem where regenerating builders via healing spray wasn't updating health ring
+// - Allow buildings to play custom damage alerts (for towers)
+//
+// Revision 1.8  2002/09/23 22:10:14  Flayra
+// - Removed progress bar when building
+// - Removed vestiges of fading building as building
+// - Changed point costs
+//
+// Revision 1.7  2002/09/09 19:49:09  Flayra
+// - Buildables now play animations better, without interrupting previous anims
+//
+// Revision 1.6  2002/08/31 18:01:01  Flayra
+// - Work at VALVe
+//
+// Revision 1.5  2002/08/16 02:32:45  Flayra
+// - Added damage types
+// - Added visual health for commander and marines
+//
+// Revision 1.4  2002/07/01 21:15:46  Flayra
+// - Added auto-build capability
+//
+// Revision 1.3  2002/06/03 16:27:59  Flayra
+// - Allow alien buildings to regenerate, renamed weapons factory and armory
+//
+// Revision 1.2  2002/05/28 17:37:27  Flayra
+// - Added building recycling, mark mapper placed buildables so they aren't destroyed at the end of the round
+//
+// Revision 1.1  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_BASE_BUILDABLE_H
+#define AVH_BASE_BUILDABLE_H
+
+#include "util/nowarnings.h"
+#include "extdll.h"
+#include "util.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHBuildable.h"
+#include "dlls/cbase.h"
+#include "mod/AvHMessage.h"
+#include "mod/AvHSpecials.h"
+#include "mod/AvHPlayer.h"
+#include "mod/AvHCloakable.h"
+
+class AvHBaseBuildable : public CBaseAnimating, public AvHBuildable, public AvHCloakable
+{
+public:
+					AvHBaseBuildable(AvHTechID inTechID, AvHMessageID inMessageID, char* inClassName, int inUser3 = AVH_USER3_NONE);
+
+	void EXPORT		AnimateThink();
+
+	virtual int		BloodColor(void);
+
+    void EXPORT		BuildableTouch(CBaseEntity* inEntity);
+
+	virtual void	CheckEnabledState();
+					
+	void EXPORT		ConstructUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+	virtual bool	Energize(float inEnergyAmount);
+
+	void EXPORT		FallThink(void);
+
+	virtual void	FireDeathTarget() const;
+
+	virtual void	FireSpawnTarget() const;
+
+	virtual int		GetBaseHealth() const;
+
+	virtual int		GetIdleAnimation() const;
+
+	virtual bool	GetIsRecycling() const;
+	
+	virtual CBaseEntity* GetAttacker();
+
+	virtual char*	GetClassName() const;
+
+	virtual char*	GetDeploySound() const;
+
+	virtual bool	GetIsBuilt(void) const;
+
+	virtual bool	GetIsOrganic() const;
+
+	virtual bool	GetIsTechActive() const;
+
+	virtual char*	GetKilledSound() const;
+
+	virtual int		GetActiveAnimation() const;
+
+	virtual int		GetDeployAnimation() const;
+
+	virtual int		GetIdle1Animation() const;
+
+	virtual int		GetIdle2Animation() const;
+
+    virtual bool	GetIsTechnologyAvailable(AvHMessageID inMessageID) const;
+
+	virtual int		GetKilledAnimation() const;
+
+	virtual AvHMessageID	GetMessageID() const;
+
+	virtual int		GetMoveType() const;
+
+	virtual int		GetSequenceForBoundingBox() const;
+
+	virtual bool	GetTriggerAlertOnDamage() const;
+
+	virtual float	GetTimeAnimationDone() const;
+
+	virtual int		GetRecycleAnimation() const;
+
+	virtual int		GetResearchAnimation() const;
+
+	virtual int		GetSpawnAnimation() const;
+
+	virtual int		GetTakeDamageAnimation() const;
+		
+	virtual char*	GetModelName() const;
+	
+	virtual float	GetNormalizedBuildPercentage() const;
+
+	virtual float	GetTimeForAnimation(int inIndex) const;
+	
+	virtual void	SetResearching(bool inState);
+
+	virtual bool	GetIsPersistent() const;
+	
+	virtual AvHTeamNumber	GetTeamNumber() const;
+
+	virtual void	HealthChanged();
+		
+	virtual void	KeyValue(KeyValueData* pkvd);
+
+	virtual void	Killed(entvars_t* pevAttacker, int iGib);
+
+	virtual int		ObjectCaps(void);
+
+    // Pass -1 to play an animation backwards
+	virtual void	PlayAnimationAtIndex(int inIndex, bool inForce = false, float inFrameRate = 1.0f);
+				
+	virtual void	Precache(void);
+
+	virtual bool	Regenerate(float inRegenerationAmount, bool inPlaySound = true);
+	
+	virtual void	ResetEntity();
+
+	virtual void	SetConstructionComplete(bool inForce = false);
+
+	virtual void	SetAverageUseSoundLength(float inLength);
+
+	virtual void	StartRecycle();
+				
+	virtual void	Spawn();
+
+	virtual int		TakeDamage(entvars_t* inInflictor, entvars_t* inAttacker, float inDamage, int inBitsDamageType);
+
+	virtual void	TechnologyBuilt(AvHMessageID inMessageID);
+
+	virtual void	WorldUpdate();
+
+	virtual void	UpdateOnRecycle();
+
+protected:
+	virtual bool	GetHasBeenKilled() const;
+
+	int				GetStartAlpha() const;
+
+	void			Init();
+
+	void			InternalInitializeBuildable();
+
+	void			InternalSetConstructionComplete(bool inForce = false);
+
+	virtual void	Materialize();
+
+	void EXPORT		RecycleComplete();
+    
+    // Called when a persistent buildable is killed
+    virtual void	SetActive();
+    virtual void    SetInactive();
+
+	virtual void	SetNormalizedBuildPercentage(float inPercentage, bool inForceIfComplete = false);
+
+	void			SetPersistent();
+
+	void			SetSelectID(int inSelectID);
+
+	virtual void	TriggerDeathAudioVisuals();
+
+	void			UpdateAutoBuild(float inTimePassed);
+
+	void			UpdateAutoHeal();
+
+	void			UpdateDamageEffects();
+
+	virtual void	UpdateTechSlots();
+
+	int				mBaseHealth;
+	AvHMessageID	mMessageID;
+	
+private:
+	
+	char*			mClassName;
+	char*			mModelName;
+	int				mSelectID;
+	
+	//float			mPercentageBuilt;
+	float			mLastTimePlayedSound;
+	float			mTimeToConstruct;
+	const int		kStartAlpha;
+
+	float			mAverageUseSoundLength;
+
+	int				mLastAnimationPlayed;
+	float			mTimeAnimationDone;
+
+	// Marks entity to not be removed on level reset
+	bool			mPersistent;
+	int				mElectricalSprite;
+	bool			mIsResearching;
+
+	string			mTargetOnSpawn;
+	string			mTargetOnDeath;
+
+	float			mTimeOfLastAutoHeal;
+	bool			mInternalSetConstructionComplete;
+
+	float			mTimeOfLastDamageEffect;
+	float			mTimeOfLastDamageUpdate;
+
+	float			mTimeRecycleStarted;
+	float			mTimeRecycleDone;
+
+	bool			mKilled;
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHBaseInfoLocation.cpp b/main/source/mod/AvHBaseInfoLocation.cpp
new file mode 100644
index 00000000..f40b97dd
--- /dev/null
+++ b/main/source/mod/AvHBaseInfoLocation.cpp
@@ -0,0 +1,44 @@
+#include "mod/AvHBaseInfoLocation.h"
+
+AvHBaseInfoLocation::AvHBaseInfoLocation()
+{
+	this->mMinExtent = this->mMaxExtent = vec3_t(0, 0, 0);
+}
+
+AvHBaseInfoLocation::AvHBaseInfoLocation(const string& inLocationName, const vec3_t& inMaxExtent, const vec3_t& inMinExtent)
+{
+	this->mLocationName = inLocationName;
+	this->mMaxExtent = inMaxExtent;
+	this->mMinExtent = inMinExtent;
+}
+
+bool AvHBaseInfoLocation::GetIsPointInRegion(const vec3_t& inPoint) const
+{
+	bool thePointIsWithin = false;
+
+	if((inPoint.x > this->mMinExtent.x) && (inPoint.y > this->mMinExtent.y) /*&& (inPoint.z > this->mMinExtent.z)*/)
+	{
+		if((inPoint.x < this->mMaxExtent.x) && (inPoint.y < this->mMaxExtent.y) /*&& (inPoint.z < this->mMaxExtent.z)*/)
+		{
+			thePointIsWithin = true;
+		}
+	}
+
+	return thePointIsWithin;
+}
+
+string AvHBaseInfoLocation::GetLocationName() const
+{
+	return this->mLocationName;
+}
+
+vec3_t AvHBaseInfoLocation::GetMaxExtent() const
+{
+	return this->mMaxExtent;
+}
+
+vec3_t AvHBaseInfoLocation::GetMinExtent() const
+{
+	return this->mMinExtent;
+}
+
diff --git a/main/source/mod/AvHBaseInfoLocation.h b/main/source/mod/AvHBaseInfoLocation.h
new file mode 100644
index 00000000..97e32fa7
--- /dev/null
+++ b/main/source/mod/AvHBaseInfoLocation.h
@@ -0,0 +1,44 @@
+#ifndef AVH_BASEINFO_LOCATION_H
+#define AVH_BASEINFO_LOCATION_H
+
+#include "util/nowarnings.h"
+#include "types.h"
+#include "mod/AvHConstants.h"
+
+#ifdef AVH_CLIENT
+#include "common/triangleapi.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#ifdef AVH_SERVER
+#include "extdll.h"
+class CBaseEntity;
+#endif
+
+#include "types.h"
+
+class AvHBaseInfoLocation
+{
+public:
+					AvHBaseInfoLocation();
+
+					AvHBaseInfoLocation(const string& inLocationName, const vec3_t& inMaxExtent, const vec3_t& inMinExtent);
+
+	bool			GetIsPointInRegion(const vec3_t& inPoint) const;
+
+	string			GetLocationName() const;
+
+	vec3_t			GetMaxExtent() const;
+
+	vec3_t			GetMinExtent() const;
+
+protected:
+	string			mLocationName;
+	vec3_t			mMinExtent;
+	vec3_t			mMaxExtent;
+};
+
+typedef vector<AvHBaseInfoLocation>	AvHBaseInfoLocationListType;
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHBasePlayerWeapon.cpp b/main/source/mod/AvHBasePlayerWeapon.cpp
new file mode 100644
index 00000000..72bc5603
--- /dev/null
+++ b/main/source/mod/AvHBasePlayerWeapon.cpp
@@ -0,0 +1,1331 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHBasePlayerWeapon.cpp$
+// $Date: 2002/11/22 21:28:15 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHBasePlayerWeapon.cpp,v $
+// Revision 1.38  2002/11/22 21:28:15  Flayra
+// - mp_consistency changes
+//
+// Revision 1.37  2002/11/03 04:47:23  Flayra
+// - Moved weapon expiring into .dll out of .cfg
+//
+// Revision 1.36  2002/10/24 21:22:10  Flayra
+// - Fixes muzzle-flash showing when firing an empty weapon
+//
+// Revision 1.35  2002/10/17 17:34:14  Flayra
+// - Part 2 of persistent weapons fix (found with Grendel)
+//
+// Revision 1.34  2002/10/16 20:51:17  Flayra
+// - Fixed problem where acid projectile hit player
+//
+// Revision 1.33  2002/10/03 18:39:24  Flayra
+// - Added heavy view models
+//
+// Revision 1.32  2002/09/23 22:10:46  Flayra
+// - Weapons now stick around the way they should (forever when dropped by commander, weapon stay time when dropped by player)
+//
+// Revision 1.31  2002/08/16 02:33:12  Flayra
+// - Added damage types
+//
+// Revision 1.30  2002/07/24 19:11:45  Flayra
+// - Linux issues
+//
+// Revision 1.29  2002/07/24 18:45:40  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.28  2002/07/08 16:47:31  Flayra
+// - Reworked bullet firing to add random spread (bug #236), temporarily hacked shotty player animation, removed old adrenaline, don't allow using weapons when invulnerable
+//
+// Revision 1.27  2002/07/01 21:17:13  Flayra
+// - Removed outdated adrenaline concept, made ROF generic for primal scream
+//
+// Revision 1.26  2002/06/25 17:41:13  Flayra
+// - Reworking for correct player animations and new enable/disable state
+//
+// Revision 1.25  2002/06/10 19:50:37  Flayra
+// - First-pass at level 1 animated view model (different anims when running and walking)
+//
+// Revision 1.24  2002/06/03 16:29:53  Flayra
+// - Added resupply (from arsenal), better animation support (for both view model and player model)
+//
+// Revision 1.23  2002/05/28 17:37:33  Flayra
+// - Max entities fix, added animation empty fire
+//
+// Revision 1.22  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifdef AVH_CLIENT
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+#include "cl_dll/ammo.h"
+#include "cl_dll/ammohistory.h"
+extern int g_runfuncs;
+#endif
+
+#include "util/nowarnings.h"
+#include "mod/AvHBasePlayerWeapon.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayer.h"
+#include "common/usercmd.h"
+#include "pm_shared/pm_defs.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "mod/AvHMarineWeapons.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHGamerules.h"
+
+extern int				gWelderConstEventID;
+#endif
+
+#ifdef AVH_CLIENT
+#include "cl_dll/com_weapons.h"
+#endif
+
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHSharedUtil.h"
+#include "types.h"						
+#include "common/vector_util.h"
+#include "util/MathUtil.h"
+
+// extern "C" this guy because delcared in pm_shared.c, not pm_shared.cpp
+extern playermove_t*	pmove;
+extern cvar_t			weaponstay;
+
+Vector UTIL_GetRandomSpreadDir(unsigned int inSeed, int inShotNumber, const Vector& inBaseDirection, const Vector& inRight, const Vector& inUp, const Vector& inSpread)
+{
+	// Use player's random seed.
+	// get circular gaussian spread
+	float x = UTIL_SharedRandomFloat( inSeed + inShotNumber, -0.5, 0.5 ) + UTIL_SharedRandomFloat( inSeed + ( 1 + inShotNumber ) , -0.5, 0.5 );
+	float y = UTIL_SharedRandomFloat( inSeed + ( 2 + inShotNumber ), -0.5, 0.5 ) + UTIL_SharedRandomFloat( inSeed + ( 3 + inShotNumber ), -0.5, 0.5 );
+	float z = x * x + y * y;
+	
+	Vector theRandomDir = inBaseDirection + x * inSpread.x * inRight + y * inSpread.y * inUp;
+	
+	return theRandomDir;
+}
+
+
+AvHBasePlayerWeapon::AvHBasePlayerWeapon()
+{
+    // reasonable defaults for everything else
+    this->mEvent = 0;
+	this->mWeaponAnimationEvent = 0;
+    this->mStartEvent = 0;
+    this->mEndEvent = 0;
+	this->mRange = 8012;
+	this->mDamage = 10;
+	this->mAttackButtonDownLastFrame = false;
+	this->mTimeOfLastResupply = -1;
+    this->mTimeOfLastPrime = -1;
+    this->mWeaponPrimeStarted = false;
+
+#ifdef AVH_SERVER
+	this->mInOverwatch = false;
+	this->mIsPersistent = false;
+	this->mLifetime = -1;
+#endif
+}
+void AvHBasePlayerWeapon::PrintWeaponToClient(CBaseEntity *theAvHPlayer) {
+	char msg[1024];
+	ItemInfo theItemInfo;
+	this->GetItemInfo(&theItemInfo);
+	sprintf(msg, "%s iuser3=%d\tenabled = %d\n", theItemInfo.pszName, this->pev->iuser3, this->m_iEnabled);
+	ClientPrint(theAvHPlayer->pev, HUD_PRINTNOTIFY, msg);
+}
+
+int	AvHBasePlayerWeapon::AddToPlayer( CBasePlayer *pPlayer )
+{
+	// Can we predict weapon pick-ups?  I bet we can.
+	int theAddedToPlayer = 0;
+	
+#ifdef AVH_SERVER
+	AvHPlayer* inPlayer = dynamic_cast<AvHPlayer*>(pPlayer);
+	ASSERT(inPlayer != NULL);
+
+	if(this->GetAllowedForUser3(inPlayer->GetUser3()))
+	{
+		// Make sure player doesn't have this weapon already
+		if(!pPlayer->HasItem(this))
+		{
+			// If weapon was placed by mapper
+			if(this->GetIsPersistent())
+			{
+				// Create a new weapon and give it to the player
+				pPlayer->GiveNamedItem(STRING(this->pev->classname));
+				
+				this->DestroyItem();
+			}
+			else
+			{
+				theAddedToPlayer = CBasePlayerWeapon::AddToPlayer(pPlayer);
+				if(theAddedToPlayer)
+				{
+					// Make sure it's not set for expiration
+					SetThink(NULL);
+				}
+			}
+		}
+	}
+#endif
+	
+	return theAddedToPlayer;
+}
+
+BOOL AvHBasePlayerWeapon::Deploy()
+{
+	char* theDeploySound = this->GetDeploySound();
+	if(theDeploySound)
+	{
+		EMIT_SOUND(ENT(this->pev), CHAN_WEAPON, this->GetDeploySound(), this->GetDeploySoundVolume(), ATTN_NORM);
+	}
+
+	char* theAnimExt = this->GetAnimationExtension();
+
+	BOOL theSuccess = DefaultDeploy(this->GetActiveViewModel(), this->GetPlayerModel(), this->GetDeployAnimation(), theAnimExt);
+
+	// Set a player animatiom here?
+	//this->m_pPlayer->SetAnimation(PLAYER_ANIM(iAnim));
+
+	// Set deploy time
+	this->m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + this->GetDeployTime();
+
+    this->mTimeOfLastPrime = -1;
+    this->mWeaponPrimeStarted = false;
+
+	return theSuccess;
+}
+
+BOOL AvHBasePlayerWeapon::DefaultDeploy( char *szViewModel, char *szWeaponModel, int iAnim, char *szAnimExt, int skiplocal, int body)
+{
+	if (!CanDeploy( ))
+		return FALSE;
+	
+	m_pPlayer->TabulateAmmo();
+
+    // This was causing a crash from hl_weapons.cpp only when connected to a dedicated server and switching weapons
+	//#ifdef AVH_SERVER
+    //m_pPlayer->pev->viewmodel = MAKE_STRING(szViewModel);
+    //#endif
+
+#ifdef AVH_SERVER
+    m_pPlayer->pev->viewmodel = MAKE_STRING(szViewModel);
+    m_pPlayer->pev->weaponmodel = MAKE_STRING(szWeaponModel);
+#else
+    gEngfuncs.CL_LoadModel( szViewModel, &m_pPlayer->pev->viewmodel );    
+    gEngfuncs.CL_LoadModel( szWeaponModel, &m_pPlayer->pev->weaponmodel );    
+#endif
+
+	strcpy( m_pPlayer->m_szAnimExtention, szAnimExt );
+	//SendWeaponAnim( iAnim, skiplocal, body );
+	this->SendWeaponAnim(iAnim);
+	
+	// Set the player animation as well
+	//this->m_pPlayer->SetAnimation(PLAYER_ANIM(iAnim));
+	
+	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + this->GetDeployTime();
+	m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + this->GetDeployTime() + kDeployIdleInterval;
+	
+	return TRUE;
+}
+
+BOOL AvHBasePlayerWeapon::DefaultReload( int iClipSize, int iAnim, float fDelay, int body)
+{
+	if (m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] <= 0)
+		return FALSE;
+
+	// Don't reload while we're resupplying
+	if(this->mTimeOfLastResupply > 0)
+	{
+		return FALSE;
+	}
+	
+	int j = min(iClipSize - m_iClip, m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType]);	
+	
+	if (j == 0)
+		return FALSE;
+	
+	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + fDelay;
+	
+	//!!UNDONE -- reload sound goes here !!!
+	//SendWeaponAnim( iAnim, UseDecrement() ? 1 : 0 );
+	this->SendWeaponAnim(iAnim);
+
+	// Send reload to all players.  Reloads are initiated server-side, so send down to local client as well
+	this->m_pPlayer->pev->weaponanim = iAnim;
+	this->PlaybackEvent(this->mWeaponAnimationEvent, iAnim, FEV_RELIABLE);
+
+	// Player model reload animation
+	this->m_pPlayer->SetAnimation(PLAYER_RELOAD);
+	
+	m_fInReload = TRUE;
+	
+	m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + kDeployIdleInterval;
+	
+	return TRUE;
+}
+
+
+
+char* AvHBasePlayerWeapon::GetActiveViewModel() const
+{
+	return this->GetViewModel();
+}
+
+//BOOL AvHBasePlayerWeapon::Deploy(char *szViewModel, char *szWeaponModel, int iAnim, char *szAnimExt, float inNextAttackTime, int skiplocal)
+//{
+//	BOOL theSuccess = FALSE;
+//
+//	if(CanDeploy())
+//	{
+//		this->m_pPlayer->TabulateAmmo();
+//		this->m_pPlayer->pev->viewmodel = MAKE_STRING(szViewModel);
+//		this->m_pPlayer->pev->weaponmodel = MAKE_STRING(szWeaponModel);
+//		strcpy( m_pPlayer->m_szAnimExtention, szAnimExt );
+//		SendWeaponAnim( iAnim, skiplocal );
+//		
+//		this->m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + inNextAttackTime;
+//		this->m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 1.0;
+//
+//		theSuccess = TRUE;
+//	}
+//	
+//	return theSuccess;
+//}
+
+char* AvHBasePlayerWeapon::GetAnimationExtension() const
+{
+	char* theAnimExt = NULL;
+
+	AvHWeaponID theWeaponID = (AvHWeaponID)this->m_iId;
+	switch(theWeaponID)
+	{
+		case AVH_WEAPON_BITE:
+		case AVH_WEAPON_SPIT:
+		case AVH_WEAPON_SPIKE:
+		case AVH_WEAPON_BITE2:
+		case AVH_WEAPON_SWIPE:
+		case AVH_WEAPON_CLAWS:
+		theAnimExt = "ability1";
+		break;
+
+		case AVH_WEAPON_PARASITE:
+		case AVH_WEAPON_HEALINGSPRAY:
+		case AVH_WEAPON_SPORES:
+		case AVH_WEAPON_BLINK:
+		case AVH_WEAPON_STOMP:
+		theAnimExt = "ability2";
+		break;
+		
+		case AVH_ABILITY_LEAP:
+		case AVH_WEAPON_BILEBOMB:
+		case AVH_WEAPON_UMBRA:
+		case AVH_WEAPON_METABOLIZE:
+		case AVH_WEAPON_DEVOUR:
+		theAnimExt = "ability3";
+		break;
+
+		case AVH_WEAPON_DIVINEWIND:
+		case AVH_WEAPON_WEBSPINNER:
+		case AVH_WEAPON_PRIMALSCREAM:
+		case AVH_WEAPON_ACIDROCKET:
+		case AVH_ABILITY_CHARGE:
+		theAnimExt = "ability4";
+		break;
+		
+		case AVH_WEAPON_KNIFE:
+			theAnimExt = "knife";
+			break;
+		case AVH_WEAPON_PISTOL:
+			theAnimExt = "pistol";
+			break;
+		case AVH_WEAPON_MG:
+			theAnimExt = "lmg";
+			break;
+		case AVH_WEAPON_SONIC:
+			theAnimExt = "shotgun";
+			break;
+		case AVH_WEAPON_HMG:
+			theAnimExt = "hmg";
+			break;
+		case AVH_WEAPON_WELDER:
+			theAnimExt = "welder";
+			break;
+		case AVH_WEAPON_MINE:
+			theAnimExt = "tripmine";
+			break;
+		case AVH_WEAPON_GRENADE_GUN:
+			theAnimExt = "grenadegun";
+			break;
+        case AVH_WEAPON_GRENADE:
+            theAnimExt = "handgrenade";
+            break;
+		default:
+			ASSERT(false);
+			break;
+	}
+	return theAnimExt;
+}
+
+int	AvHBasePlayerWeapon::GetClipSize() const
+{
+	ItemInfo theItemInfo;
+	this->GetItemInfo(&theItemInfo);
+	int theClipSize = theItemInfo.iMaxClip;
+
+	return theClipSize;
+}
+
+int AvHBasePlayerWeapon::GetPrimaryAmmoAmount() const
+{
+    int theAmmo = 0;
+
+    if(this->m_pPlayer && (m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] > 0))
+    {
+        theAmmo = this->m_pPlayer->m_rgAmmo[this->m_iPrimaryAmmoType];
+    }
+
+    return theAmmo;
+}
+
+int	AvHBasePlayerWeapon::GetDamageType() const
+{
+	return NS_DMG_NORMAL;
+}
+
+char* AvHBasePlayerWeapon::GetDeploySound() const
+{
+	return NULL;
+}
+
+float AvHBasePlayerWeapon::GetDeploySoundVolume() const
+{
+	return 1.0f;
+}
+
+int	AvHBasePlayerWeapon::GetEmptyShootAnimation() const
+{
+	return kShootEmptyAnimation;
+}
+
+void AvHBasePlayerWeapon::GetEventOrigin(Vector& outOrigin) const
+{
+	VectorCopy(this->m_pPlayer->pev->origin, outOrigin);
+}
+
+void AvHBasePlayerWeapon::GetEventAngles(Vector& outAngles) const
+{
+	outAngles = this->pev->v_angle + this->pev->punchangle;
+}
+
+bool AvHBasePlayerWeapon::GetFiresUnderwater() const
+{
+	return false;
+}
+
+bool AvHBasePlayerWeapon::GetIsFiring() const
+{
+	return this->mAttackButtonDownLastFrame;
+}
+
+bool AvHBasePlayerWeapon::GetHasMuzzleFlash() const
+{
+	return false;
+}
+
+bool AvHBasePlayerWeapon::GetIsCapableOfFiring() const
+{
+	return !this->UsesAmmo() || (this->m_iClip > 0);
+}
+
+
+int	AvHBasePlayerWeapon::GetDeployAnimation() const
+{
+	return kDeployAnimation;
+}
+
+int	AvHBasePlayerWeapon::GetIdleAnimation() const
+{
+	int iAnim;
+	int theRandomNum = UTIL_SharedRandomLong(this->m_pPlayer->random_seed, 0, 1);
+
+	switch(theRandomNum)
+	{
+	case 0:	
+		iAnim = kIdleAnimationOne;	
+		break;
+		
+	default:
+	case 1:
+        iAnim = kIdleAnimationTwo;
+		break;
+	}
+
+	return iAnim;
+}
+
+Vector AvHBasePlayerWeapon::GetProjectileSpread() const
+{
+	return VECTOR_CONE_0DEGREES;
+}
+
+float AvHBasePlayerWeapon::ComputeAttackInterval() const
+{
+    return this->GetRateOfFire();
+}
+
+float AvHBasePlayerWeapon::GetRateOfFire() const
+{
+    return 1;
+}
+
+int	AvHBasePlayerWeapon::GetShootAnimation() const
+{
+	return kShootAnimation;
+}
+
+int	AvHBasePlayerWeapon::GetShotsInClip() const
+{
+	int theShotsInClip = -1;
+
+	if(this->UsesAmmo())
+	{
+		theShotsInClip = this->m_iClip;
+	}
+
+	return theShotsInClip;
+}
+
+bool AvHBasePlayerWeapon::GetIsDroppable() const
+{
+	return true;
+}
+
+bool AvHBasePlayerWeapon::GetIsPlayerMoving() const
+{
+	bool thePlayerIsMoving = false;
+
+//	float kMovingThresholdVelocity = 100;
+//	float theCurrentVelocity = 0;
+//
+//	#ifdef AVH_SERVER
+//	theCurrentVelocity = this->m_pPlayer->pev->velocity.Length();
+//	#endif
+//	
+//	#ifdef AVH_CLIENT
+//	cl_entity_t* theLocalPlayer = gEngfuncs.GetLocalPlayer();
+//	if(theLocalPlayer)
+//	{
+//		theCurrentVelocity = theLocalPlayer->curstate.velocity.Length();
+//	}
+//	#endif
+//
+//	if(theCurrentVelocity > kMovingThresholdVelocity)
+//	{
+//		thePlayerIsMoving = true;
+//	}
+
+	return thePlayerIsMoving;
+}
+
+int	AvHBasePlayerWeapon::GetMaxClipsCouldReceive()
+{
+	int theMaxClips = 0;
+	
+	ItemInfo theItemInfo;
+	this->GetItemInfo(&theItemInfo);
+	int theClipSize = theItemInfo.iMaxClip;
+
+	if(theClipSize > 0 && this->UsesAmmo())
+	{
+		theMaxClips = ((theItemInfo.iMaxAmmo1 - this->m_iClip)/theClipSize) + 1;
+	}
+
+	return theMaxClips;
+}
+
+AvHWeaponID	AvHBasePlayerWeapon::GetPreviousWeaponID() const
+{
+	AvHWeaponID theID = AVH_WEAPON_NONE;
+
+	// Look at most recently used weapon and see if we can transition from it
+	AvHBasePlayerWeapon* theWeapon = dynamic_cast<AvHBasePlayerWeapon*>(this->m_pPlayer->m_pLastItem);
+	if(theWeapon)
+	{
+		theID = (AvHWeaponID)(theWeapon->m_iId);
+	}
+
+	return theID;
+}
+
+
+float AvHBasePlayerWeapon::GetRange() const
+{
+	return this->mRange;
+}
+
+vec3_t AvHBasePlayerWeapon::GetWorldBarrelPoint() const
+{
+	ASSERT(this->m_pPlayer);
+
+	Vector vecAiming = gpGlobals->v_forward;
+	Vector theWorldBarrelPoint = this->m_pPlayer->GetGunPosition() + vecAiming*this->GetBarrelLength();
+
+	return theWorldBarrelPoint;
+
+}
+
+char* AvHBasePlayerWeapon::GetPlayerModel() const
+{
+	return kNullModel;
+}
+
+char* AvHBasePlayerWeapon::GetPrimeSound() const
+{
+    return NULL;
+}
+
+float AvHBasePlayerWeapon::GetPrimeSoundVolume() const
+{
+    return 1.0f;
+}
+
+char* AvHBasePlayerWeapon::GetViewModel() const
+{
+	return kNullModel;
+}
+
+char* AvHBasePlayerWeapon::GetWorldModel() const
+{
+	return kNullModel;
+}
+
+void AvHBasePlayerWeapon::Holster( int skiplocal)
+{
+	CBasePlayerWeapon::Holster(skiplocal);
+
+	#ifdef AVH_SERVER
+	this->mInOverwatch = false;
+	#endif
+}
+
+float AvHBasePlayerWeapon::GetTimePassedThisTick() const
+{
+	float theClientTimePassedThisTick = (pmove->cmd.msec/1000.0f);
+	return theClientTimePassedThisTick;
+}
+
+void AvHBasePlayerWeapon::ItemPostFrame( void )
+{
+	CBasePlayerWeapon::ItemPostFrame();
+	
+	float theClientTimePassedThisTick = this->GetTimePassedThisTick();
+
+	this->m_flNextPrimaryAttack -= theClientTimePassedThisTick;
+	this->m_flTimeWeaponIdle -= theClientTimePassedThisTick;
+	this->mTimeOfLastResupply -= theClientTimePassedThisTick;
+    this->mTimeOfLastPrime -= theClientTimePassedThisTick;
+}
+
+void AvHBasePlayerWeapon::Precache(void)
+{                  
+	CBasePlayerWeapon::Precache();
+
+	char* theDeploySound = this->GetDeploySound();
+	if(theDeploySound)
+	{
+		PRECACHE_UNMODIFIED_SOUND(theDeploySound);
+	}
+    char* thePrimeSound = this->GetPrimeSound();
+    if(thePrimeSound)
+    {
+        PRECACHE_UNMODIFIED_SOUND(thePrimeSound);
+    }
+	char* thePlayerModel = this->GetPlayerModel();
+	if(thePlayerModel)
+	{
+		PRECACHE_UNMODIFIED_MODEL(thePlayerModel);
+	}
+	char* theViewModel = this->GetViewModel();
+	if(theViewModel)
+	{
+		PRECACHE_UNMODIFIED_MODEL(theViewModel);
+	}
+	char* theWorldModel = this->GetWorldModel();
+	if(theWorldModel)
+	{
+		PRECACHE_UNMODIFIED_MODEL(theWorldModel);
+	}
+
+	this->mWeaponAnimationEvent = PRECACHE_EVENT(1, kWeaponAnimationEvent);
+}
+
+bool AvHBasePlayerWeapon::ProcessValidAttack(void)
+{
+    bool theAttackIsValid = false;
+	
+//#ifdef AVH_CLIENT
+//	char sz[ 128 ];
+//	sprintf(sz, "during check valid, clip is %d\n", this->m_iClip);
+//	gEngfuncs.pfnCenterPrint( sz );
+//	
+//	//gEngfuncs.Con_Printf("during idle, clip is %d\n", sz);
+//#endif
+
+//#ifdef AVH_CLIENT
+//	if(gHUD.GetInTopDownMode())
+//	{
+//		return false;
+//	}
+//#endif
+//
+//#ifdef AVH_SERVER
+//	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this->m_pPlayer);
+//	if(thePlayer->GetIsInTopDownMode())
+//	{
+//		return false;
+//	}
+//#endif
+
+	// Only shoot if deployed and enabled (iuser3 is 0 when disabled, 1 when enabled <from m_fireState>)
+
+	// puzl: 497 call GetEnabledState instead of testing directly
+	int enabledState=this->GetEnabledState();
+
+	if(this->m_pPlayer->pev->viewmodel && ( enabledState == 1))
+	{
+		// don't fire underwater
+		if((this->m_pPlayer->pev->waterlevel == 3) && !this->GetFiresUnderwater())
+		{
+			this->PlayEmptySound();
+			
+			//this->m_flNextPrimaryAttack = gpGlobals->time + this->mROF;
+			this->m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + this->ComputeAttackInterval();
+		}
+		else if(this->UsesAmmo())
+		{
+			ASSERT(this->m_iPrimaryAmmoType >= 0);
+			if(this->m_iClip > 0)
+			{
+				if(this->m_flNextPrimaryAttack <= 0)
+				{
+					if(!this->GetMustPressTriggerForEachShot() || (!this->mAttackButtonDownLastFrame))
+					{
+						theAttackIsValid = true;
+					}
+				}
+				else
+				{
+					// Does this ever happen?
+					int a = 0;
+				}
+
+			}
+			else
+			{
+				// Definitely not firing this pull of the trigger
+				theAttackIsValid = false;
+				
+				BOOL theHasAmmo = 0;
+				
+				if ( pszAmmo1() )
+				{
+					theHasAmmo |= (this->m_pPlayer->m_rgAmmo[this->m_iPrimaryAmmoType] != 0);
+				}
+				if ( pszAmmo2() )
+				{
+					theHasAmmo |= (this->m_pPlayer->m_rgAmmo[this->m_iSecondaryAmmoType] != 0);
+				}
+				if (this->m_iClip > 0)
+				{
+					theHasAmmo |= 1;
+				}
+				
+				if(theHasAmmo)
+				{
+					// Trigger reload
+					this->Reload();
+				}
+				else
+				{
+					this->PlayEmptySound();
+
+					this->SendWeaponAnim(this->GetEmptyShootAnimation());
+
+					//this->m_pPlayer->SetAnimation(PLAYER_ATTACK1);
+				}
+			}
+		}
+		else
+		{
+			theAttackIsValid = true;
+		}
+	}
+	else
+	{
+		//ALERT(at_console, "Can't attack %d\n", enabledState);
+		int a = 0;	
+	}
+
+    return theAttackIsValid;
+
+}
+
+bool AvHBasePlayerWeapon::GetIsGunPositionValid() const
+{
+    return true;
+}
+
+void AvHBasePlayerWeapon::DeductCostForShot(void)
+{
+	this->m_iClip--;
+
+	// On a successful attack, decloak the player if needed
+	#ifdef AVH_SERVER
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this->m_pPlayer);
+	if(thePlayer)
+	{
+		thePlayer->TriggerUncloak();
+	}
+
+	int theResourceCost = this->GetResourceCost();
+	if(theResourceCost > 0)
+	{
+		float theNewResources = (thePlayer->GetResources(false) - theResourceCost);
+		theNewResources = max(theNewResources, 0.0f);
+		thePlayer->SetResources(theNewResources);
+	}
+
+	#endif
+}
+
+float AvHBasePlayerWeapon::GetReloadTime(void) const
+{
+	// TODO: Allow weapons to have different reload times
+	return 1.5f;
+}
+
+int	AvHBasePlayerWeapon::GetReloadAnimation() const
+{
+	return kReloadAnimation;
+}
+
+void AvHBasePlayerWeapon::PlaybackEvent(unsigned short inEvent, int inIparam2, int inFlags) const
+{
+	unsigned short theEvent = inEvent;
+	if(theEvent != 0)
+	{
+		// Playback event, sending along enough data so client knows who triggered this event!
+		int theWeaponIndex = 0;
+		AvHUser3 theUser3 = AVH_USER3_NONE;
+		int theUpgrades = 0;
+		
+		// When predicting weapons, play the event locally, then tell everyone else but us to play it back later
+		int flags = inFlags;
+		edict_t* theEdict;
+
+		// Pass player random seed to event, so it chooses the right direction for spread
+		int theRandomNumber = this->m_pPlayer->random_seed;
+		
+#if defined( AVH_CLIENT )
+		theUser3 = gHUD.GetHUDUser3();
+		theUpgrades = gHUD.GetHUDUpgrades();
+		theEdict = NULL;
+#else
+		theUser3 = dynamic_cast<AvHPlayer*>(this->m_pPlayer)->GetUser3();
+		theUpgrades = this->m_pPlayer->pev->iuser4;
+		theEdict = this->m_pPlayer->edict();
+#endif
+
+		// For bullet spread
+		//theRandomNumber = UTIL_SharedRandomLong(this->m_pPlayer->random_seed, 1, kBulletSpreadGranularity*kBulletSpreadGranularity);
+		
+		// When in overwatch, the weapon is fired on the server, so the client firing the weapon won't be firing it locally first
+#if defined(AVH_SERVER)
+		if(this->mInOverwatch)
+		{
+			flags = 0;
+		}
+#endif
+
+		// Allow weapon to specify some parameters, so they are available on both client and server
+		Vector theEventOrigin;
+		this->GetEventOrigin(theEventOrigin);
+
+		Vector theEventAngles;
+		this->GetEventAngles(theEventAngles);
+
+		float theVolume = AvHPlayerUpgrade::GetSilenceVolumeLevel(theUser3, theUpgrades);
+		
+		//( int flags, const edict_t *pInvoker, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 );
+		PLAYBACK_EVENT_FULL(flags, this->m_pPlayer->edict(), theEvent, 0, (float *)&theEventOrigin, (float *)&theEventAngles, theVolume, 0.0, theRandomNumber, inIparam2, 0, 0 );
+	}
+}
+
+void AvHBasePlayerWeapon::SetAnimationAndSound(void)
+{
+	this->m_pPlayer->m_iWeaponVolume = NORMAL_GUN_VOLUME;
+	this->m_pPlayer->m_iWeaponFlash = NORMAL_GUN_FLASH;
+
+	// player "shoot" animation
+	//SendWeaponAnim(this->GetShootAnimation());
+
+	this->m_pPlayer->SetAnimation(PLAYER_ATTACK1);
+
+	if(this->GetHasMuzzleFlash())
+	{
+		this->m_pPlayer->pev->effects = (int)(this->m_pPlayer->pev->effects) | EF_MUZZLEFLASH;
+	}
+}
+
+void AvHBasePlayerWeapon::FireProjectiles(void)
+{
+	Vector vecSrc = this->m_pPlayer->GetGunPosition();
+	Vector vecAiming = this->m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES );
+
+	// Fire the bullets and apply damage
+	int theRange = this->mRange;
+	float theDamage = this->mDamage;
+
+	int theTracerFreq;
+	float theDamageMultiplier;
+	AvHPlayerUpgrade::GetWeaponUpgrade(this->m_pPlayer->pev->iuser3, this->m_pPlayer->pev->iuser4, &theDamageMultiplier, &theTracerFreq);
+	theDamage *= theDamageMultiplier;
+
+	Vector theSpread = this->GetProjectileSpread();
+	this->m_pPlayer->FireBulletsPlayer(1, vecSrc, vecAiming, theSpread, theRange, BULLET_PLAYER_MP5, theTracerFreq, theDamage, this->m_pPlayer->pev, this->m_pPlayer->random_seed);
+
+    this->mWeaponPrimeStarted = false;
+}
+
+int AvHBasePlayerWeapon::GetPrimeAnimation() const
+{
+    return -1;
+}
+
+float AvHBasePlayerWeapon::GetWeaponPrimeTime() const
+{ 
+    return -1.0f; 
+}
+
+void AvHBasePlayerWeapon::PrimeWeapon()
+{
+    float thePrimeTime = this->GetWeaponPrimeTime();
+    if(thePrimeTime > 0.0f)
+    {
+        if(!this->GetIsWeaponPriming())
+        {
+            char* thePrimeSound = this->GetPrimeSound();
+            if(thePrimeSound)
+            {
+                EMIT_SOUND(ENT(this->pev), CHAN_WEAPON, thePrimeSound, this->GetPrimeSoundVolume(), ATTN_NORM);
+            }
+
+            this->PlaybackEvent(this->mWeaponAnimationEvent, this->GetPrimeAnimation());
+
+            this->mTimeOfLastPrime = UTIL_WeaponTimeBase() + thePrimeTime;
+
+            this->mWeaponPrimeStarted = true;
+        }
+    }
+}
+
+BOOL AvHBasePlayerWeapon::GetIsWeaponPrimed() const
+{ 
+    return ((this->GetWeaponPrimeTime() > 0.0f) && this->mWeaponPrimeStarted && (UTIL_WeaponTimeBase() > this->mTimeOfLastPrime));
+}
+
+BOOL AvHBasePlayerWeapon::GetIsWeaponPriming() const
+{ 
+    return ((this->GetWeaponPrimeTime() > 0.0f) && this->mWeaponPrimeStarted && (UTIL_WeaponTimeBase() < this->mTimeOfLastPrime));
+}
+
+void AvHBasePlayerWeapon::SetNextAttack(void)
+{
+//	this->m_flNextPrimaryAttack += this->mROF;
+//
+//	if(this->m_flNextPrimaryAttack < 0)
+//		this->m_flNextPrimaryAttack = this->mROF;
+
+	float theRateOfFire = this->ComputeAttackInterval();
+
+    this->m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + theRateOfFire;
+
+	if(this->m_flNextPrimaryAttack < 0)
+	{
+		this->m_flNextPrimaryAttack = theRateOfFire;
+	}
+	
+	this->SetNextIdle();
+}
+
+
+void AvHBasePlayerWeapon::PrimaryAttack(void)
+{
+    if (this->ProcessValidAttack())
+    {
+        
+        if (!this->mAttackButtonDownLastFrame)
+        {
+            this->PlaybackEvent(this->mStartEvent);
+            this->mAttackButtonDownLastFrame = true;
+        }
+    		
+        this->PlaybackEvent(this->mEvent, this->GetShootAnimation());
+        this->SetAnimationAndSound();
+	
+        // If player is too close to a wall, don't actually fire the projectile
+        if(this->GetIsGunPositionValid())
+        {
+            this->FireProjectiles();
+        }
+        else
+        {
+            #ifdef DEBUG
+            #ifdef AVH_SERVER
+            char theMessage[256];
+            sprintf(theMessage, "Gun position is not valid, skipping call to FireProjectiles.\n");
+            ALERT(at_console, theMessage);
+            #endif
+            #endif
+        }
+
+        this->DeductCostForShot();
+        this->SetNextAttack();
+        
+    }
+}
+
+void AvHBasePlayerWeapon::Reload(void)
+{
+    // Move clip sounds out
+	int theReloadAnimation = this->GetReloadAnimation();
+	float theReloadTime = this->GetReloadTime();
+	int theClipSize = this->GetClipSize();
+
+	this->DefaultReload(theClipSize, theReloadAnimation, theReloadTime);
+
+	// Don't idle for a bit
+	this->SetNextIdle();
+}
+
+bool AvHBasePlayerWeapon::GetCanBeResupplied() const
+{
+    bool theCanBeResupplied = false;
+    
+    if(this->UsesAmmo())
+    {
+        ItemInfo theItemInfo;
+        this->GetItemInfo(&theItemInfo);
+        
+        int theCurrentPrimary = this->m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType];
+        int theMaxPrimary = theItemInfo.iMaxAmmo1;
+        
+        // Add some to primary store
+        if(theCurrentPrimary < theMaxPrimary)
+        {
+            theCanBeResupplied = true;
+        }
+    }
+    
+    return theCanBeResupplied;
+}
+
+bool AvHBasePlayerWeapon::Resupply()
+{
+	bool theResupplied = false;
+
+    if(this->GetCanBeResupplied())
+    {
+        ItemInfo theItemInfo;
+        this->GetItemInfo(&theItemInfo);
+
+        // Get amount to add
+        int theMaxClip = theItemInfo.iMaxClip;
+        
+        // Add half the clip each time, rounding up (roughly 3 seconds per clip ()
+        int theAmountToAdd = max((theMaxClip+1)/2, 1);
+
+        int theCurrentPrimary = this->m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType];
+        int theMaxPrimary = theItemInfo.iMaxAmmo1;
+
+        // Add ammo
+        this->m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] = min(theCurrentPrimary + theAmountToAdd, theMaxPrimary);
+
+        const float theDelay = 1.0f;
+		//bugfix - don't let resupply shorten reload time
+        this->m_pPlayer->m_flNextAttack = max(this->m_pPlayer->m_flNextAttack,UTIL_WeaponTimeBase() + theDelay);
+        this->mTimeOfLastResupply = UTIL_WeaponTimeBase() + theDelay;
+	}
+
+	return theResupplied;
+}
+
+void AvHBasePlayerWeapon::SendWeaponAnim(int inAnimation, int skiplocal, int body)
+{
+	if(inAnimation >= 0)
+	{
+		this->m_pPlayer->pev->weaponanim = inAnimation;
+
+		this->PlaybackEvent(this->mWeaponAnimationEvent, inAnimation);
+	}
+	else
+	{
+		int a = 0;
+	}
+}
+
+void AvHBasePlayerWeapon::SecondaryAttack(void)
+{
+}
+
+void AvHBasePlayerWeapon::Spawn()
+{
+	CBasePlayerWeapon::Spawn();
+
+	this->pev->solid = SOLID_BBOX;
+	this->pev->movetype = MOVETYPE_TOSS;
+	UTIL_SetOrigin(this->pev, this->pev->origin);
+	UTIL_SetSize(this->pev, kMarineItemMinSize, kMarineItemMaxSize);
+	
+	this->pev->iuser3 = AVH_USER3_MARINEITEM;
+
+	#ifdef AVH_SERVER
+	if(!this->GetIsPersistent())
+	{
+		this->mLifetime = AvHSUGetWeaponStayTime();
+	}
+	#endif
+}
+
+bool AvHBasePlayerWeapon::GetEnabledState() const
+{
+	bool result=false;
+#ifdef AVH_SERVER
+	result= (this->m_iEnabled == 1);		
+#else
+	// puzl: 497 client now uses the enabled state in the appropriate WEAPON
+	ItemInfo theItemInfo;
+	this->GetItemInfo(&theItemInfo);
+	WEAPON *pWeapon = gWR.GetWeapon( theItemInfo.iId );
+	if ( pWeapon != 0 ) {
+		result=(pWeapon->iEnabled == 1);
+	}
+#endif
+	return result;
+}
+
+#ifdef AVH_SERVER
+void AvHBasePlayerWeapon::VirtualMaterialize(void)
+{
+	int theLifetime = this->GetGroundLifetime();
+	
+	if(theLifetime >= 0)
+	{
+		SetThink(&AvHBasePlayerWeapon::DestroyItem);
+		this->pev->nextthink = gpGlobals->time + theLifetime;
+	}
+}
+
+int	AvHBasePlayerWeapon::GetGroundLifetime() const
+{
+	return this->mLifetime;
+}
+
+// -1 means never expire
+void AvHBasePlayerWeapon::SetGroundLifetime(int inGroundLifetime)
+{
+	this->mLifetime = inGroundLifetime;
+}
+
+int	AvHBasePlayerWeapon::GetResourceCost() const
+{
+	return 0;
+}
+
+void AvHBasePlayerWeapon::VirtualDestroyItem(void)
+{
+	if(this->GetIsPersistent())
+	{
+		// Make this weapon invisible until map reset
+		this->pev->effects |= EF_NODRAW;
+		this->pev->solid = SOLID_NOT;
+		this->pev->takedamage = DAMAGE_NO;
+		SetThink(NULL);
+	}
+	else
+	{
+		CBasePlayerItem::VirtualDestroyItem();
+	}
+}
+
+void AvHBasePlayerWeapon::ResetEntity()
+{
+	CBasePlayerWeapon::ResetEntity();
+
+	this->pev->effects = 0;
+	this->pev->solid = SOLID_BBOX;
+	this->pev->movetype = MOVETYPE_TOSS;
+	
+	this->pev->takedamage = DAMAGE_YES;
+
+	this->VirtualMaterialize();
+}
+
+void AvHBasePlayerWeapon::SetOverwatchState(bool inState)
+{
+	this->mInOverwatch = inState;
+}
+
+void AvHBasePlayerWeapon::UpdateInventoryEnabledState(int inNumActiveHives)
+{
+	// Process here
+	int theEnabledState = 1;
+				
+	ItemInfo theItemInfo;
+	if(this->GetItemInfo(&theItemInfo) != 0)
+	{
+		int theWeaponFlags = theItemInfo.iFlags;
+		AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this->m_pPlayer);
+		ASSERT(thePlayer);
+	
+		// If we don't have the hives required, or we're ensnared
+		if	(/*thePlayer->GetIsTemporarilyInvulnerable() ||*/
+			!thePlayer->GetIsAbleToAct() || 
+			((inNumActiveHives < 1) && (theWeaponFlags & ONE_HIVE_REQUIRED)) ||
+			((inNumActiveHives < 2) && (theWeaponFlags & TWO_HIVES_REQUIRED)) ||
+			((inNumActiveHives < 3) && (theWeaponFlags & THREE_HIVES_REQUIRED)) ||
+			(this->GetResourceCost() > thePlayer->GetResources(false)) )
+		{
+			// Disable it
+			theEnabledState = 0;
+		}
+		else
+		{
+			int a = 0;
+		}
+	}
+	
+	// puzl: 497 save the state for when we send the CurWeapon message
+	this->m_iEnabled =  theEnabledState;
+}
+
+void AvHBasePlayerWeapon::KeyValue(KeyValueData* pkvd)
+{
+	// Any entity placed by the mapper is persistent
+	this->SetPersistent();
+	
+	if(FStrEq(pkvd->szKeyName, "teamchoice"))
+	{
+		//this->mTeam = (AvHTeamNumber)(atoi(pkvd->szValue));
+		this->pev->team = (AvHTeamNumber)(atoi(pkvd->szValue));
+		
+		pkvd->fHandled = TRUE;
+	}
+	else if(FStrEq(pkvd->szKeyName, "angles"))
+	{
+		// TODO: Insert code here
+		//pkvd->fHandled = TRUE;
+		int a = 0;
+	}
+	else if(FStrEq(pkvd->szKeyName, "lifetime"))
+	{
+		this->mLifetime = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+	{
+		CBasePlayerWeapon::KeyValue(pkvd);
+	}
+}
+
+// 0 means never expire, -1 means no value was set so use default
+int AvHBasePlayerWeapon::GetLifetime() const
+{
+	int theLifetime = this->mLifetime;
+	
+	if(theLifetime < 0)
+	{
+		theLifetime = AvHSUGetWeaponStayTime();
+	}
+	
+	return theLifetime;
+}
+
+bool AvHBasePlayerWeapon::GetIsPersistent() const
+{
+	return this->mIsPersistent;
+}
+
+void AvHBasePlayerWeapon::SetPersistent()
+{
+	this->mIsPersistent = true;
+}
+#endif
+
+void AvHBasePlayerWeapon::SetNextIdle(void)
+{
+	float theRandomIdle = UTIL_SharedRandomFloat(this->m_pPlayer->random_seed, 10, 15);
+
+	this->m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + theRandomIdle;
+	
+	// Just added these next two lines 8/8/01 (trying to fix prediction wackiness)
+	if(this->m_flTimeWeaponIdle < 0)
+	{
+		this->m_flTimeWeaponIdle = theRandomIdle;
+	}
+}
+
+BOOL AvHBasePlayerWeapon::UseDecrement( void )
+{ 
+	// If we're predicting, return true
+	return TRUE;
+}
+
+
+void AvHBasePlayerWeapon::WeaponIdle(void)
+{
+//#ifdef AVH_CLIENT
+//	char sz[ 128 ];
+//	sprintf(sz, "during idle, clip is %d\n", this->m_iClip);
+//	gEngfuncs.pfnCenterPrint( sz );
+//	
+//	//gEngfuncs.Con_Printf("during idle, clip is %d\n", sz);
+//#endif
+
+	if(this->mAttackButtonDownLastFrame)
+	{
+		this->PlaybackEvent(this->mEndEvent);
+		this->mAttackButtonDownLastFrame = false;
+	}
+	
+	ResetEmptySound();
+
+	this->m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES );
+
+	if(this->m_flTimeWeaponIdle <= UTIL_WeaponTimeBase())
+	{
+		this->SendWeaponAnim(this->GetIdleAnimation());
+			
+		this->m_pPlayer->SetAnimation(PLAYER_IDLE);
+			
+		this->SetNextIdle();
+	}
+}
+
+bool AvHBasePlayerWeapon::UsesAmmo(void) const
+{
+	return true;
+}
diff --git a/main/source/mod/AvHBasePlayerWeapon.h b/main/source/mod/AvHBasePlayerWeapon.h
new file mode 100644
index 00000000..3138a448
--- /dev/null
+++ b/main/source/mod/AvHBasePlayerWeapon.h
@@ -0,0 +1,265 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHBasePlayerWeapon.h $
+// $Date: 2002/10/03 18:39:24 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHBasePlayerWeapon.h,v $
+// Revision 1.24  2002/10/03 18:39:24  Flayra
+// - Added heavy view models
+//
+// Revision 1.23  2002/09/23 22:10:46  Flayra
+// - Weapons now stick around the way they should (forever when dropped by commander, weapon stay time when dropped by player)
+//
+// Revision 1.22  2002/08/16 02:33:12  Flayra
+// - Added damage types
+//
+// Revision 1.21  2002/07/26 01:52:03  Flayra
+// - Linux support for FindFirst/FindNext
+//
+// Revision 1.20  2002/07/08 16:47:31  Flayra
+// - Reworked bullet firing to add random spread (bug #236), temporarily hacked shotty player animation, removed old adrenaline, don't allow using weapons when invulnerable
+//
+// Revision 1.19  2002/07/01 21:17:13  Flayra
+// - Removed outdated adrenaline concept, made ROF generic for primal scream
+//
+// Revision 1.18  2002/06/25 17:41:13  Flayra
+// - Reworking for correct player animations and new enable/disable state
+//
+// Revision 1.17  2002/06/10 19:50:37  Flayra
+// - First-pass at level 1 animated view model (different anims when running and walking)
+//
+// Revision 1.16  2002/06/03 16:29:53  Flayra
+// - Added resupply (from arsenal), better animation support (for both view model and player model)
+//
+// Revision 1.15  2002/05/28 17:37:33  Flayra
+// - Max entities fix, added animation empty fire
+//
+// Revision 1.14  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVHBASEPLAYERWEAPON_H
+#define AVHBASEPLAYERWEAPON_H
+
+#include "dlls/weapons.h"
+#include "dlls/extdll.h"
+#include "util.h"
+#include "dlls/cbase.h"
+#include "dlls/monsters.h"
+#include "dlls/weapons.h"
+#include "dlls/nodes.h"
+#include "dlls/player.h"
+#include "dlls/soundent.h"
+#include "dlls/gamerules.h"
+#include "util/CString.h"
+#include "mod/AvHBasePlayerWeaponConstants.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHBalance.h"
+#include "mod/AvHSpecials.h"
+
+const int kIdleAnimationOne = 0;
+const int kIdleAnimationTwo = 1;
+const int kReloadAnimation = 2;
+const int kShootAnimation = 3;
+const int kShootEmptyAnimation = 4;
+const int kDeployAnimation = 5;
+
+Vector UTIL_GetRandomSpreadDir(unsigned int inSeed, int inShotNumber, const Vector& inBaseDirection, const Vector& inRight, const Vector& inUp, const Vector& inSpread);
+
+class AvHBasePlayerWeapon : public CBasePlayerWeapon
+{
+public:
+                    AvHBasePlayerWeapon();
+	virtual void	PrintWeaponToClient(CBaseEntity *theAvHPlayer);
+	virtual int		AddToPlayer( CBasePlayer *pPlayer );
+
+    virtual float   ComputeAttackInterval() const;
+
+	virtual void	DeductCostForShot(void);
+
+	virtual BOOL	DefaultDeploy(char *szViewModel, char *szWeaponModel, int iAnim, char *szAnimExt, int skiplocal = 0, int body = 0);
+
+	virtual int		DefaultReload(int iClipSize, int iAnim, float fDelay, int body = 0);
+
+    virtual BOOL    Deploy();
+
+	virtual char*	GetActiveViewModel() const;
+	
+	virtual char*	GetAnimationExtension() const;
+	
+	virtual int		GetBarrelLength() const = 0;
+
+    virtual bool    GetCanBeResupplied() const;
+
+	virtual int		GetClipSize() const;
+
+    virtual bool    GetIsGunPositionValid() const;
+
+    virtual int     GetPrimaryAmmoAmount() const;
+
+	virtual int		GetDamageType() const;
+
+	virtual int		GetDeployAnimation() const;
+
+	virtual int		GetEmptyShootAnimation() const;
+
+	virtual char*	GetDeploySound() const;
+
+	virtual float	GetDeploySoundVolume() const;
+
+	virtual bool	GetEnabledState() const;
+
+	virtual void	GetEventOrigin(Vector& outOrigin) const;
+
+	virtual void	GetEventAngles(Vector& outAngles) const;
+
+	virtual bool	GetIsFiring() const;
+
+	virtual bool	GetMustPressTriggerForEachShot() const
+						{ return false;	}
+
+	virtual bool	GetHasMuzzleFlash() const;
+
+	virtual bool	GetIsCapableOfFiring() const;
+	
+	virtual bool	GetIsPlayerMoving() const;
+
+	virtual bool	GetFiresUnderwater() const;
+
+	virtual int		GetIdleAnimation() const;
+
+	virtual Vector	GetProjectileSpread() const;
+
+	virtual float	GetRateOfFire() const;
+
+	virtual char*	GetPlayerModel() const;
+
+    virtual char*   GetPrimeSound() const;
+
+    virtual float	GetPrimeSoundVolume() const;
+
+	virtual int		GetShootAnimation() const;
+
+	virtual char*	GetViewModel() const;
+
+	virtual char*	GetWorldModel() const;
+
+	virtual bool	GetIsDroppable() const;
+	
+	virtual int		GetMaxClipsCouldReceive();
+
+    // Priming functions
+    virtual float   GetWeaponPrimeTime() const;
+    virtual void    PrimeWeapon();
+    virtual BOOL    GetIsWeaponPrimed() const;
+    virtual BOOL    GetIsWeaponPriming() const;
+    virtual int     GetPrimeAnimation() const;
+
+	virtual float	GetRange() const;
+
+	virtual int		GetReloadAnimation() const;
+
+	virtual vec3_t	GetWorldBarrelPoint() const;
+
+	virtual void	Holster( int skiplocal = 0 );
+
+	virtual void	ItemPostFrame( void );	// called each frame by the player PostThink
+
+	virtual void    Precache();
+
+	virtual void    PrimaryAttack();
+
+    virtual void    Reload();
+
+    virtual bool	Resupply();
+
+	virtual void	SendWeaponAnim(int inAnimation, int skiplocal = 1, int body = 0);
+
+	// Only to be used on server
+	#ifdef AVH_SERVER
+	virtual int		GetGroundLifetime() const;
+	
+	virtual void	SetGroundLifetime(int inGroundLifetime);
+
+	virtual int		GetResourceCost() const;
+
+	virtual void	SetOverwatchState(bool inState);
+
+	virtual void	UpdateInventoryEnabledState(int inNumActiveHives);
+
+	// Methods for placing in the map
+	void EXPORT		VirtualDestroyItem(void);
+	virtual int		GetLifetime() const;
+	virtual bool	GetIsPersistent() const;
+	virtual void	SetPersistent();
+	virtual void	KeyValue(KeyValueData* pkvd);
+	virtual void	ResetEntity();
+	virtual void	VirtualMaterialize(void);
+	#endif
+
+	virtual void    SecondaryAttack();
+
+	virtual void	Spawn();
+
+	virtual bool	UsesAmmo(void) const;
+
+	virtual BOOL	UseDecrement(void);
+
+	virtual void    WeaponIdle();
+
+protected:
+	//BOOL			Deploy(char *szViewModel, char *szWeaponModel, int iAnim, char *szAnimExt, float inNextAttackTime, int skiplocal = 0);
+		
+	virtual bool	GetAllowedForUser3(AvHUser3 inUser3) = 0;
+
+	virtual int		GetShotsInClip() const;
+
+	virtual AvHWeaponID		GetPreviousWeaponID() const;
+
+    virtual bool    ProcessValidAttack(void);
+	virtual float	GetReloadTime(void) const;
+	virtual float	GetTimePassedThisTick() const;
+
+    virtual void    PlaybackEvent(unsigned short inEvent, int inIparam2 = 0, int inFlags = FEV_NOTHOST) const;
+    
+    virtual void    SetAnimationAndSound(void);
+
+    virtual void    FireProjectiles(void);
+
+    virtual void    SetNextAttack(void);
+
+	virtual void	SetNextIdle(void);
+
+	unsigned short          mEvent;
+	unsigned short			mWeaponAnimationEvent;
+	unsigned short          mStartEvent;
+	unsigned short          mEndEvent;
+
+	float					mRange;
+	float					mDamage;
+	bool					mAttackButtonDownLastFrame;
+	float					mTimeOfLastResupply;
+    
+    float                   mTimeOfLastPrime;
+    bool                    mWeaponPrimeStarted;
+	
+	#ifdef AVH_SERVER
+	bool					mInOverwatch;
+	bool					mIsPersistent;
+	int						mLifetime;
+	#endif
+	
+    // sounds               
+    CStringList				mFireSounds;
+};
+
+#endif
+
diff --git a/main/source/mod/AvHBasePlayerWeaponConstants.h b/main/source/mod/AvHBasePlayerWeaponConstants.h
new file mode 100644
index 00000000..78fa218a
--- /dev/null
+++ b/main/source/mod/AvHBasePlayerWeaponConstants.h
@@ -0,0 +1,88 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHBasePlayerWeaponConstants.h$
+// $Date: 2002/07/01 21:17:38 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHBasePlayerWeaponConstants.h,v $
+// Revision 1.18  2002/07/01 21:17:38  Flayra
+// - Added babbler id
+//
+// Revision 1.17  2002/06/25 17:42:02  Flayra
+// - Removed building weapons, added new weapons
+//
+// Revision 1.16  2002/06/03 16:29:53  Flayra
+// - Added resupply (from arsenal), better animation support (for both view model and player model)
+//
+// Revision 1.15  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+// Revision 1.16  2002/05/14 19:03:01  Charlie
+//===============================================================================
+#ifndef AVHBASEPLAYERWEAPONCONSTANTS_H
+#define AVHBASEPLAYERWEAPONCONSTANTS_H
+
+typedef enum
+{
+	AVH_WEAPON_NONE = 0,
+
+	// Alien weapons
+	AVH_WEAPON_CLAWS,
+	AVH_WEAPON_SPIT,
+	AVH_WEAPON_SPORES,
+	AVH_WEAPON_SPIKE,
+	AVH_WEAPON_BITE,		// Level 1 bite
+	AVH_WEAPON_BITE2,		// Level 3 bite
+	AVH_WEAPON_SWIPE,
+	AVH_WEAPON_WEBSPINNER,
+	AVH_WEAPON_METABOLIZE,
+	AVH_WEAPON_PARASITE,
+	AVH_WEAPON_BLINK,
+	AVH_WEAPON_DIVINEWIND,
+
+	// Adding a new weapon?  Don't forget to add it's weight in AvHGamerules::GetWeightForItemAndAmmo(AvHWeaponID inWeapon, int inNumRounds)
+	AVH_WEAPON_KNIFE,
+	AVH_WEAPON_PISTOL,
+	AVH_WEAPON_MG,
+	AVH_WEAPON_SONIC,
+	AVH_WEAPON_HMG,
+	AVH_WEAPON_WELDER,
+	AVH_WEAPON_MINE,
+	AVH_WEAPON_GRENADE_GUN,
+
+	// Abilities
+	AVH_ABILITY_LEAP,
+	AVH_ABILITY_CHARGE,
+
+	AVH_WEAPON_UMBRA,
+	AVH_WEAPON_PRIMALSCREAM,
+	AVH_WEAPON_BILEBOMB,
+	AVH_WEAPON_ACIDROCKET,
+	AVH_WEAPON_HEALINGSPRAY,
+	AVH_WEAPON_GRENADE,
+	AVH_WEAPON_STOMP,
+	AVH_WEAPON_DEVOUR,
+
+	// Can't go over 32 (client.cpp, GetWeaponData())
+
+	AVH_WEAPON_MAX
+}
+AvHWeaponID;
+
+#define			kWeaponMinSize			Vector(-16, -16, 0)
+#define			kWeaponMaxSize			Vector(16, 16, 28)
+
+#define			kGenericWallpuff		"sprites/wallpuff.spr"
+#define			kNullModel				"models/null.mdl"
+#define			kGenericAnimExt			"mp5"
+
+const float		kDeployIdleInterval		= 10.0;
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHBileBombGun.cpp b/main/source/mod/AvHBileBombGun.cpp
new file mode 100644
index 00000000..a17f937b
--- /dev/null
+++ b/main/source/mod/AvHBileBombGun.cpp
@@ -0,0 +1,300 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHBileBombGun.cpp $
+// $Date: 2002/11/22 21:28:16 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHBileBombGun.cpp,v $
+// Revision 1.9  2002/11/22 21:28:16  Flayra
+// - mp_consistency changes
+//
+// Revision 1.8  2002/10/16 00:50:04  Flayra
+// - Updated effects to get rid of cheesy effect and use nice particle effect
+//
+// Revision 1.7  2002/08/31 18:01:01  Flayra
+// - Work at VALVe
+//
+// Revision 1.6  2002/08/16 02:33:12  Flayra
+// - Added damage types
+//
+// Revision 1.5  2002/07/24 19:09:16  Flayra
+// - Linux issues
+//
+// Revision 1.4  2002/07/24 18:55:51  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.3  2002/07/24 18:45:40  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.2  2002/07/01 21:18:01  Flayra
+// - Implemented bile bomb
+//
+// Revision 1.1  2002/06/25 17:23:53  Flayra
+// - Level 3 bomb attack
+//
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHParticleConstants.h"
+
+LINK_ENTITY_TO_CLASS(kwBileBombGun, AvHBileBombGun);
+void V_PunchAxis( int axis, float punch );
+
+
+#ifdef AVH_SERVER
+
+LINK_ENTITY_TO_CLASS(kwBileBomb, AvHBileBomb);
+
+#include "mod/AvHGamerules.h"
+
+void AvHBileBomb::SetDamage(float inDamage)
+{
+	this->mDamage = inDamage;
+}
+
+void AvHBileBomb::Precache()
+{
+	CBaseEntity::Precache();
+	//this->mExplodeSprite = PRECACHE_MODEL("sprites/lgtning.spr");
+}
+
+void AvHBileBomb::Spawn()
+{
+	this->Precache();
+	CBaseEntity::Spawn();
+	
+	this->pev->movetype = MOVETYPE_TOSS;
+	//this->pev->movetype = MOVETYPE_FLY;//MOVETYPE_BOUNCE;
+	this->pev->classname = MAKE_STRING(kwsBileBomb);
+	
+	this->pev->solid = SOLID_BBOX;
+	this->mDamage = 0.0f;
+
+	SET_MODEL(ENT(this->pev), kBileBombProjectileModel);
+
+
+	// Comment out effects line, uncomment next four, then comment out creation of temp entity in EV_AcidGun to see server side Acid for testing
+	if(!GetGameRules()->GetDrawInvisibleEntities())
+	{
+		this->pev->effects = EF_NODRAW;
+	}
+	else
+	{
+		this->pev->frame = 0;
+		this->pev->scale = 0.2;
+		this->pev->rendermode = kRenderTransAlpha;
+		this->pev->renderamt = 255;
+	}
+
+	//UTIL_SetSize(this->pev, Vector( 0, 0, 0), Vector(0, 0, 0));
+	UTIL_SetSize(this->pev, Vector( -kBileBombSize, -kBileBombSize, -kBileBombSize), Vector(kBileBombSize, kBileBombSize, kBileBombSize));
+
+
+	// Must use default gravity, so event syncs up (event flags only allow default gravity, or half that)
+//	this->pev->gravity = 1.0f;
+	this->pev->friction = kBileBombFrictionConstant;
+	this->pev->angles = g_vecZero;
+
+	SetTouch(&AvHBileBomb::BileBombTouch);
+}
+
+void AvHBileBomb::BileBombTouch(CBaseEntity* pOther)
+{
+	CBaseEntity* theHitEntity = CBaseEntity::Instance(ENT(this->pev->owner));
+	if(pOther != theHitEntity)
+	{
+//		// Play view shake here
+//		float theShakeAmplitude = 30;
+//		float theShakeFrequency = 40;
+//		float theShakeDuration = .5f;
+//		float theShakeRadius = kBileBombRadius*1.5;
+//		UTIL_ScreenShake(this->pev->origin, theShakeAmplitude, theShakeFrequency, theShakeDuration, theShakeRadius);
+	
+		//EMIT_SOUND(this->edict(), CHAN_WEAPON, kBileBombHitSound, 1.0f, ATTN_IDLE);
+	
+		// Explode with splash damage (also change in GetDamageType() above)
+		int theRadius = BALANCE_IVAR(kBileBombRadius);
+		RadiusDamage(this->pev->origin, this->pev, VARS(this->pev->owner), this->mDamage, theRadius, CLASS_NONE, NS_DMG_STRUCTURAL);
+	
+	//	MESSAGE_BEGIN(MSG_PAS, SVC_TEMPENTITY, this->pev->origin);
+	//		WRITE_BYTE(TE_LAVASPLASH);
+	//		WRITE_COORD(this->pev->origin.x);
+	//		WRITE_COORD(this->pev->origin.y);
+	//		WRITE_COORD(this->pev->origin.z + 16);
+	//
+	////		WRITE_BYTE( TE_BEAMTORUS);
+	////		WRITE_COORD(pev->origin.x);
+	////		WRITE_COORD(pev->origin.y);
+	////		WRITE_COORD(pev->origin.z + 32);
+	////		WRITE_COORD(pev->origin.x);
+	////		WRITE_COORD(pev->origin.y);
+	////		WRITE_COORD(pev->origin.z + 32 + pev->dmg * 2 / .2); // reach damage radius over .3 seconds
+	////		WRITE_SHORT(this->mExplodeSprite );
+	////		WRITE_BYTE( 0 ); // startframe
+	////		WRITE_BYTE( 0 ); // framerate
+	////		WRITE_BYTE( 2 ); // life
+	////		WRITE_BYTE( 12 );  // width
+	////		WRITE_BYTE( 0 );   // noise
+	////		WRITE_BYTE( 255 );   // r, g, b
+	////		WRITE_BYTE( 160 );   // r, g, b
+	////		WRITE_BYTE( 100 );   // r, g, b
+	////		WRITE_BYTE( 255 );	// brightness
+	////		WRITE_BYTE( 0 );		// speed
+	//
+	////		WRITE_BYTE(TE_IMPLOSION);
+	////		WRITE_COORD(this->pev->origin.x);
+	////		WRITE_COORD(this->pev->origin.y);
+	////		WRITE_COORD(this->pev->origin.z + 16);
+	////		WRITE_BYTE(255);
+	////		WRITE_BYTE(10);
+	////		WRITE_BYTE(8);
+	//
+	//	MESSAGE_END();
+
+		SetTouch(NULL);
+
+		UTIL_Remove(this);
+	}
+}
+#endif
+
+
+
+void AvHBileBombGun::Init()
+{
+	this->mRange = kBileBombRange;
+	this->mDamage = BALANCE_IVAR(kBileBombDamage);
+	//this->mFramesSinceMoreAmmo = 0;
+}
+
+void AvHBileBombGun::FireProjectiles(void)
+{
+	#ifdef AVH_SERVER
+	
+	// Spawn AcidRocket
+	AvHBileBomb* theBileBomb = GetClassPtr((AvHBileBomb*)NULL );
+	theBileBomb->Spawn();
+	
+	UTIL_MakeVectors(this->m_pPlayer->pev->v_angle);
+
+	Vector vecAiming = gpGlobals->v_forward;// + gpGlobals->v_up;
+	VectorNormalize(vecAiming);
+
+	Vector vecSrc;
+	//VectorMA(this->pev->origin, this->GetBarrelLength(), vecAiming, vecSrc);
+	this->GetEventOrigin(vecSrc);
+	
+	UTIL_SetOrigin(theBileBomb->pev, vecSrc);
+
+	// This needs to be the same as in EV_BileBombGun
+	//VectorMA(this->m_pPlayer->pev->velocity, kBileBombVelocity, vecAiming, theBileBomb->pev->velocity);
+	VectorMA(Vector(0, 0, 0), kBileBombVelocity, vecAiming, theBileBomb->pev->velocity);
+
+	// Set owner
+	theBileBomb->pev->owner = ENT(this->m_pPlayer->pev);
+	theBileBomb->pev->gravity = 0.0f;
+
+	// Set BileBomb's team :)
+	theBileBomb->pev->team = this->m_pPlayer->pev->team;
+
+	// Set amount of damage it will do
+	float theDamage = this->mDamage*AvHPlayerUpgrade::GetAlienRangedDamageUpgrade(this->m_pPlayer->pev->iuser4);
+	theBileBomb->SetDamage(theDamage);
+	#endif	
+}
+
+int	AvHBileBombGun::GetBarrelLength() const
+{
+	return kBileBombBarrelLength;
+}
+
+float AvHBileBombGun::GetRateOfFire() const
+{
+	return BALANCE_FVAR(kBileBombROF);
+}
+
+int	AvHBileBombGun::GetDeployAnimation() const
+{
+	// Look at most recently used weapon and see if we can transition from it
+	int theDeployAnimation = -1;
+	
+	AvHWeaponID thePreviousID = this->GetPreviousWeaponID();
+	
+	switch(thePreviousID)
+	{
+		// Healing spray and web look the same
+	case AVH_WEAPON_HEALINGSPRAY:
+	case AVH_WEAPON_WEBSPINNER:
+		theDeployAnimation = 7;
+		break;
+	}
+	
+	return theDeployAnimation;
+}
+
+int	AvHBileBombGun::GetShootAnimation() const
+{
+	return 3;
+}
+
+// Also change in RadiusDamage below
+int AvHBileBombGun::GetDamageType() const
+{
+	return NS_DMG_STRUCTURAL;
+}
+
+char* AvHBileBombGun::GetViewModel() const
+{
+	return kLevel2ViewModel;
+}
+
+void AvHBileBombGun::Precache()
+{
+	AvHAlienWeapon::Precache();
+
+	PRECACHE_UNMODIFIED_MODEL(kBileBombProjectileModel);
+	PRECACHE_UNMODIFIED_SOUND(kBileBombFireSound);
+	PRECACHE_UNMODIFIED_SOUND(kBileBombHitSound);
+	this->mEvent = PRECACHE_EVENT(1, kBileBombShootEventName);
+}
+
+
+void AvHBileBombGun::Spawn() 
+{ 
+    AvHAlienWeapon::Spawn(); 
+
+	Precache();
+
+	this->m_iId = AVH_WEAPON_BILEBOMB;
+
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsBileBombGun);
+
+	SET_MODEL(ENT(this->pev), kNullModel);
+
+	FallInit();// get ready to fall down.
+} 
+
diff --git a/main/source/mod/AvHBite.cpp b/main/source/mod/AvHBite.cpp
new file mode 100644
index 00000000..3a93a2bd
--- /dev/null
+++ b/main/source/mod/AvHBite.cpp
@@ -0,0 +1,249 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHBite.cpp $
+// $Date: 2002/11/22 21:28:16 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHBite.cpp,v $
+// Revision 1.15  2002/11/22 21:28:16  Flayra
+// - mp_consistency changes
+//
+// Revision 1.14  2002/11/06 01:38:37  Flayra
+// - Added ability for buildings to be enabled and disabled, for turrets to be shut down
+// - Damage refactoring (TakeDamage assumes caller has already adjusted for friendly fire, etc.)
+//
+// Revision 1.13  2002/08/16 02:33:13  Flayra
+// - Added damage types
+//
+// Revision 1.12  2002/07/24 18:45:40  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.11  2002/07/08 16:48:26  Flayra
+// - Melee weapons don't play hit sounds or punchangle target if they didn't damage them
+//
+// Revision 1.10  2002/07/01 21:21:15  Flayra
+// - Removed adrenaline
+//
+// Revision 1.9  2002/06/25 17:50:59  Flayra
+// - Reworking for correct player animations and new enable/disable state, new view model artwork, alien weapon refactoring
+//
+// Revision 1.8  2002/06/10 19:49:06  Flayra
+// - Updated with new alien view model artwork (with running anims)
+//
+// Revision 1.7  2002/06/03 16:27:05  Flayra
+// - Animation constants and changes with new artwork
+//
+// Revision 1.6  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHGamerules.h"
+#include "mod/AvHServerUtil.h"
+#endif
+
+#include "mod/AvHSharedUtil.h"
+
+LINK_ENTITY_TO_CLASS(kwBiteGun, AvHBite);
+void V_PunchAxis( int axis, float punch );
+
+void AvHBite::Init()
+{
+	this->mRange = BALANCE_IVAR(kBiteRange);
+	this->mDamage = BALANCE_IVAR(kBiteDamage);
+}
+
+int	AvHBite::GetBarrelLength() const
+{
+	return kBiteBarrelLength;
+}
+
+bool AvHBite::GetIsGunPositionValid() const
+{
+    return true;
+}
+    
+float AvHBite::GetRateOfFire() const
+{
+	return BALANCE_FVAR(kBiteROF);
+}
+
+char* AvHBite::GetBiteSound() const
+{
+	return kBiteSound;
+}
+
+int	AvHBite::GetDeployAnimation() const
+{
+	// Only play deploy anim when changing to skulk
+	int theDeployAnimation = 5;
+	
+	AvHWeaponID thePreviousID = this->GetPreviousWeaponID();
+	
+	switch(thePreviousID)
+	{
+	case AVH_WEAPON_BITE:
+	case AVH_WEAPON_PARASITE:
+	case AVH_ABILITY_LEAP:
+	case AVH_WEAPON_DIVINEWIND:
+		theDeployAnimation = -1;
+		break;
+	}
+	
+	return theDeployAnimation;
+}
+
+int	AvHBite::GetIdleAnimation() const
+{
+	//int theBaseOffset = this->GetIsPlayerMoving() ? 5 : 2;
+	//int theAnimation = theBaseOffset + UTIL_SharedRandomFloat(this->m_pPlayer->random_seed, 0, 1);
+
+	// Must be odd
+	int theAnimation = 0;
+	const int kMax = 41;
+	int theRandomNumber = UTIL_SharedRandomLong(this->m_pPlayer->random_seed, 0, kMax);
+
+	if(theRandomNumber == kMax)
+	{
+		// Return flavor anim
+		theAnimation = 2;
+	} 
+	else if(theRandomNumber < (kMax-1)/2)
+	{
+		theAnimation = 0;
+	}
+	else
+	{
+		theAnimation = 1;
+	}
+
+	return theAnimation;
+}
+
+int	AvHBite::GetShootAnimation() const
+{
+	return 4;
+}
+
+char* AvHBite::GetViewModel() const
+{
+	return kLevel1ViewModel;
+}
+
+void AvHBite::Precache()
+{
+	AvHAlienWeapon::Precache();
+
+	char* theBiteSound = this->GetBiteSound();
+	if(theBiteSound)
+	{
+		PRECACHE_UNMODIFIED_SOUND(theBiteSound);
+	}
+	PRECACHE_UNMODIFIED_SOUND(kBiteHitSound1);
+	PRECACHE_UNMODIFIED_SOUND(kBiteHitSound2);
+	PRECACHE_UNMODIFIED_SOUND(kBiteKillSound);
+	
+	this->mEvent = PRECACHE_EVENT(1, kBiteEventName);
+}
+
+
+void AvHBite::Spawn() 
+{ 
+    AvHAlienWeapon::Spawn(); 
+	
+	this->Precache();
+	
+	this->m_iId = AVH_WEAPON_BITE;
+	
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsBiteGun);
+	
+	SET_MODEL(ENT(this->pev), kNullModel);
+	
+	FallInit();// get ready to fall down.
+} 
+
+
+void AvHBite::FireProjectiles(void)
+{
+#ifdef AVH_SERVER
+	
+	// TODO: Check team
+	float theDamage = this->mDamage*AvHPlayerUpgrade::GetAlienMeleeDamageUpgrade(this->m_pPlayer->pev->iuser4, AvHSHUGetIsWeaponFocusable(AvHWeaponID(this->m_iId)));
+
+	// Do trace hull here
+	Vector theTestAiming = this->m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES );
+	
+	CBaseEntity* pHurt = this->m_pPlayer->CheckTraceHullAttack(this->mRange, theDamage, this->GetDamageType());
+	if(pHurt)
+	{
+		if(pHurt->pev->flags & (FL_MONSTER | FL_CLIENT))
+		{
+			AvHSUKnockPlayerAbout(CBaseEntity::Instance(this->m_pPlayer->edict()), pHurt, 225);
+
+			int theSoundIndex = RANDOM_LONG(0, 1);
+			char* theSoundToPlay = "";
+			switch(theSoundIndex)
+			{
+			case 0:
+				theSoundToPlay = kBiteHitSound1;
+				break;
+			case 1:
+				theSoundToPlay = kBiteHitSound2;
+				break;
+			}
+			
+			if(pHurt->pev->health <= 0)
+			{
+				theSoundToPlay = kBiteKillSound;
+			}
+			
+			EMIT_SOUND(ENT(pev), CHAN_WEAPON, theSoundToPlay, 1.0, ATTN_NORM);
+		}
+	}
+#endif	
+}
+
+bool AvHBite::GetFiresUnderwater() const
+{
+	return true;
+}
+
+bool AvHBite::GetIsDroppable() const
+{
+	return false;
+}
+
+bool AvHBite::UsesAmmo(void) const
+{
+	return false;
+}
+
+BOOL AvHBite::UseDecrement(void)
+{
+	return true;
+}
diff --git a/main/source/mod/AvHBite2.cpp b/main/source/mod/AvHBite2.cpp
new file mode 100644
index 00000000..b577e3ec
--- /dev/null
+++ b/main/source/mod/AvHBite2.cpp
@@ -0,0 +1,135 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHBite2.cpp $
+// $Date: 2002/08/16 02:33:13 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHBite2.cpp,v $
+// Revision 1.3  2002/08/16 02:33:13  Flayra
+// - Added damage types
+//
+// Revision 1.2  2002/07/24 18:45:40  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.1  2002/06/25 17:24:09  Flayra
+// - Level 3 bite attack
+//
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHConstants.h"
+
+LINK_ENTITY_TO_CLASS(kwBite2Gun, AvHBite2);
+void V_PunchAxis( int axis, float punch );
+
+void AvHBite2::Init()
+{
+	this->mRange = kBite2Range;
+	this->mDamage = BALANCE_IVAR(kBite2Damage);
+}
+
+bool AvHBite2::GetIsGunPositionValid() const
+{
+    return true;
+}
+
+int	AvHBite2::GetBarrelLength() const
+{
+	return kBite2BarrelLength;
+}
+    
+float AvHBite2::GetRateOfFire() const
+{
+	return BALANCE_FVAR(kBite2ROF);
+}
+
+int	AvHBite2::GetDeployAnimation() const
+{
+	// Look at most recently used weapon and see if we can transition from it
+	int theDeployAnimation = 1;
+
+	AvHWeaponID thePreviousID = this->GetPreviousWeaponID();
+
+	switch(thePreviousID)
+	{
+	case AVH_WEAPON_UMBRA:
+	case AVH_WEAPON_SPORES:
+	//case AVH_WEAPON_PRIMALSCREAM:
+		theDeployAnimation = 12;
+		break;
+	}
+
+	return theDeployAnimation;
+}
+
+int AvHBite2::GetDamageType() const
+{
+	return AvHBite::GetDamageType();
+}
+
+float AvHBite2::GetDeployTime() const
+{
+	return .2f;
+}
+
+int	AvHBite2::GetIdleAnimation() const
+{
+	return 1;
+}
+
+int	AvHBite2::GetShootAnimation() const
+{
+	return 4;
+}
+
+char* AvHBite2::GetViewModel() const
+{
+	return kLevel3ViewModel;
+}
+
+void AvHBite2::Precache()
+{
+	AvHBite::Precache();
+	
+	this->mEvent = PRECACHE_EVENT(1, kBite2EventName);
+}
+
+void AvHBite2::Spawn() 
+{ 
+    AvHBite::Spawn(); 
+	
+	this->Precache();
+	
+	this->m_iId = AVH_WEAPON_BITE2;
+	
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsBite2Gun);
+	
+	SET_MODEL(ENT(this->pev), kNullModel);
+	
+	FallInit();// get ready to fall down.
+} 
+
+
+
diff --git a/main/source/mod/AvHBlink.cpp b/main/source/mod/AvHBlink.cpp
new file mode 100644
index 00000000..5b847367
--- /dev/null
+++ b/main/source/mod/AvHBlink.cpp
@@ -0,0 +1,170 @@
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHSpecials.h"
+
+#include "pm_shared/pm_defs.h"
+extern playermove_t*	pmove;
+
+#ifdef AVH_SERVER
+#include "mod/AvHPlayer.h"
+#endif
+
+#ifdef AVH_CLIENT
+#include "cl_dll/hud.h"
+#include "mod/AvHHud.h"
+extern int g_runfuncs;
+#endif
+
+#include "mod/AvHAlienAbilities.h"
+
+LINK_ENTITY_TO_CLASS(kwBlinkGun, AvHBlinkGun);
+
+void AvHBlinkGun::Init()
+{
+	this->mRange = 0;
+	this->mDamage = 0;
+	this->mTimeOfNextBlinkEvent = 0;
+}
+
+int	AvHBlinkGun::GetBarrelLength() const
+{
+	return 0;
+}
+
+float AvHBlinkGun::GetRateOfFire() const
+{
+	return BALANCE_FVAR(kBlinkROF);
+}
+
+BOOL AvHBlinkGun::Deploy()
+{
+	return AvHAlienWeapon::Deploy();
+}
+
+void AvHBlinkGun::ItemPostFrame(void)
+{
+	AvHAlienWeapon::ItemPostFrame();
+
+	float theClientTimePassedThisTick = (pmove->cmd.msec/1000.0f);
+	this->mTimeOfNextBlinkEvent -= theClientTimePassedThisTick;
+}
+
+int	AvHBlinkGun::GetDeployAnimation() const
+{
+	// Look at most recently used weapon and see if we can transition from it
+	int theDeployAnimation = 7;
+	
+	AvHWeaponID thePreviousID = this->GetPreviousWeaponID();
+	
+	switch(thePreviousID)
+	{
+	case AVH_WEAPON_BLINK:
+	case AVH_WEAPON_METABOLIZE:
+		theDeployAnimation = -1;
+		break;
+		
+	case AVH_WEAPON_SWIPE:
+		theDeployAnimation = 9;
+		break;
+		
+	case AVH_WEAPON_ACIDROCKET:
+	case AVH_WEAPON_BILEBOMB:
+		theDeployAnimation = 11;
+		break;
+	}
+	
+	return theDeployAnimation;
+}
+
+int	AvHBlinkGun::GetIdleAnimation() const
+{
+	int theAnimation = UTIL_SharedRandomLong(this->m_pPlayer->random_seed, 17, 18);
+	return theAnimation;
+}
+
+int	AvHBlinkGun::GetShootAnimation() const
+{
+	return -1;
+}
+
+bool AvHBlinkGun::GetFiresUnderwater() const
+{
+	return true;
+}
+
+bool AvHBlinkGun::GetIsDroppable() const
+{
+	return false;
+}
+
+AvHMessageID AvHBlinkGun::GetAbilityImpulse() const
+{
+	return ALIEN_ABILITY_BLINK;
+}
+
+void AvHBlinkGun::FireProjectiles(void)
+{
+#ifdef AVH_CLIENT
+	if(g_runfuncs)
+	{
+		gHUD.SetAlienAbility(this->GetAbilityImpulse());
+	}
+#endif
+#ifdef AVH_SERVER
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this->m_pPlayer);
+	if(thePlayer)
+	{
+		thePlayer->TriggerUncloak();
+	}
+#endif
+	if(this->mTimeOfNextBlinkEvent <= 0)
+	{
+		const float kEventDelay = 2.0f;
+		this->PlaybackEvent(this->mBlinkSuccessEvent, this->GetShootAnimation());
+		this->mTimeOfNextBlinkEvent = UTIL_WeaponTimeBase() + kEventDelay;
+	}
+}
+
+bool AvHBlinkGun::GetMustPressTriggerForEachShot() const
+{ 
+	return false;
+}
+
+char* AvHBlinkGun::GetViewModel() const
+{
+	return kLevel4ViewModel;
+}
+
+void AvHBlinkGun::Precache()
+{
+	AvHAlienWeapon::Precache();
+	
+	PRECACHE_UNMODIFIED_SOUND(kBlinkSuccessSound);
+	
+	// No event for firing, only on success or failure
+	this->mEvent = 0;
+	this->mBlinkSuccessEvent = PRECACHE_EVENT(1, kBlinkEffectSuccessEventName);
+}
+
+void AvHBlinkGun::Spawn() 
+{ 
+    AvHAlienWeapon::Spawn(); 
+	
+	Precache();
+	
+	this->m_iId = AVH_WEAPON_BLINK;
+	
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsBlinkGun);
+	
+	SET_MODEL(ENT(this->pev), kNullModel);
+	
+	FallInit();// get ready to fall down.
+} 
+
+bool AvHBlinkGun::UsesAmmo(void) const
+{
+	return false;
+}
+
+
diff --git a/main/source/mod/AvHBlipConstants.h b/main/source/mod/AvHBlipConstants.h
new file mode 100644
index 00000000..4e780b2d
--- /dev/null
+++ b/main/source/mod/AvHBlipConstants.h
@@ -0,0 +1,34 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHBlipConstants.h $
+// $Date: $
+//
+//-------------------------------------------------------------------------------
+// $Log: $
+//===============================================================================
+#ifndef AVH_BLIPCONSTANTS_H
+#define	AVH_BLIPCONSTANTS_H
+
+// Make sure to change BlipStatus_* in titles.txt when changing these
+#define		kNumBlipTypes						9
+#define		kBlipSprite							"blip"
+const int	kEnemyBlipStatus					= 0;
+const int	kVulnerableEnemyBlipStatus			= 1;
+const int	kFriendlyBlipStatus					= 2;
+const int	kVulnerableFriendlyBlipStatus		= 3;
+const int	kMarineEnemyBlipStatus				= 4;
+const int	kGorgeBlipStatus					= 5;
+const int	kHiveBlipStatus						= 6;
+const int	kEnemyStructureBlipsStatus			= 7;
+const int	kUnbuiltHiveBlipsStatus				= 8;
+
+const int	kBaseBlipInfoOffset					= 32;
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHBuildable.cpp b/main/source/mod/AvHBuildable.cpp
new file mode 100644
index 00000000..f5c88a1a
--- /dev/null
+++ b/main/source/mod/AvHBuildable.cpp
@@ -0,0 +1,87 @@
+#include "mod/AvHBuildable.h"
+#include "util/nowarnings.h"
+#include "dlls/extdll.h"
+#include "dlls/util.h"
+#include "dlls/cbase.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHTeam.h"
+
+AvHBuildable::AvHBuildable(AvHTechID inTechID)
+{
+	this->mTechID = inTechID;
+	this->mHasBeenBuilt = false;
+	this->mBuilder = -1;
+}
+
+int	AvHBuildable::GetBuilder() const
+{
+	return this->mBuilder;
+}
+
+bool AvHBuildable::GetHasBeenBuilt() const
+{
+	return this->mHasBeenBuilt;
+}
+
+bool AvHBuildable::GetSupportsTechID(AvHTechID inTechID) const
+{
+	return (inTechID == this->mTechID);
+}
+
+AvHTechID AvHBuildable::GetTechID() const
+{
+	return this->mTechID;
+}
+
+void AvHBuildable::SetTechID(AvHTechID inTechID)
+{
+	this->mTechID = inTechID;
+}
+
+void AvHBuildable::SetHasBeenKilled()
+{
+	GetGameRules()->BuildableKilled(this);
+}
+
+void AvHBuildable::SetBuilder(int inEntIndex)
+{
+	this->mBuilder = inEntIndex;
+}
+
+void AvHBuildable::SetConstructionComplete(bool inForce)
+{
+}
+
+void AvHBuildable::SetHasBeenBuilt()
+{
+	this->mHasBeenBuilt = true;
+
+	GetGameRules()->BuildableBuilt(this);
+}
+
+void AvHBuildable::SetResearching(bool inState)
+{
+}
+
+void AvHBuildable::TriggerAddTech() const
+{
+	AvHTeamNumber theTeamNumber = this->GetTeamNumber();
+	AvHTeam* theTeam = GetGameRules()->GetTeam(theTeamNumber);
+	
+	if(theTeam)
+	{
+		theTeam->TriggerAddTech(this->mTechID);
+	}
+}
+
+void AvHBuildable::TriggerRemoveTech() const
+{
+	AvHTeamNumber theTeamNumber = this->GetTeamNumber();
+	AvHTeam* theTeam = GetGameRules()->GetTeam(theTeamNumber);
+	
+	if(theTeam)
+	{
+		theTeam->TriggerRemoveTech(this->mTechID);
+	}
+}
+
diff --git a/main/source/mod/AvHBuildable.h b/main/source/mod/AvHBuildable.h
new file mode 100644
index 00000000..26d740c9
--- /dev/null
+++ b/main/source/mod/AvHBuildable.h
@@ -0,0 +1,49 @@
+#ifndef AVH_BUILDABLE_H
+#define AVH_BUILDABLE_H
+
+#include "mod/AvHTechID.h"
+#include "mod/AvHConstants.h"
+
+// Interface type class, don't inherit off anything
+class AvHBuildable
+{
+public:
+							AvHBuildable(AvHTechID inTechID);
+
+	virtual int				GetBuilder() const;
+
+	virtual bool			GetHasBeenBuilt() const;
+
+	virtual bool			GetIsTechActive() const = 0;
+
+	virtual bool			GetSupportsTechID(AvHTechID	inTechID) const;
+	
+	virtual AvHTeamNumber	GetTeamNumber() const = 0;
+
+	virtual AvHTechID		GetTechID() const;
+
+	virtual void			SetTechID(AvHTechID inTechID);
+
+	virtual void			SetConstructionComplete(bool inForce = false) = 0;
+
+	virtual void			SetHasBeenKilled();
+
+	virtual void			SetBuilder(int inEntIndex);
+	
+	virtual void			SetHasBeenBuilt();
+
+	virtual void			SetResearching(bool inState);
+				
+	virtual void			TriggerAddTech() const;
+
+	virtual void			TriggerRemoveTech() const;
+
+private:
+	AvHTechID				mTechID;
+
+	int						mBuilder;
+
+	bool					mHasBeenBuilt;
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHBuildingGun.cpp b/main/source/mod/AvHBuildingGun.cpp
new file mode 100644
index 00000000..68701b8d
--- /dev/null
+++ b/main/source/mod/AvHBuildingGun.cpp
@@ -0,0 +1,473 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHBuildingGun.cpp$
+// $Date: 2002/07/24 18:55:51 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHBuildingGun.cpp,v $
+// Revision 1.10  2002/07/24 18:55:51  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.9  2002/07/24 18:45:40  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.8  2002/06/25 17:43:21  Flayra
+// - Removed this
+//
+// Revision 1.7  2002/06/10 19:47:16  Flayra
+// - New level 2 view model
+//
+// Revision 1.6  2002/06/03 16:39:09  Flayra
+// - Added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.5  2002/05/28 17:37:38  Flayra
+// - Don't perform max # check for offense chambers (only for upgrade buildings)
+//
+// Revision 1.4  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHAlienEquipmentConstants.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHTitles.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHSharedUtil.h"
+#endif
+
+//int	AvHBuildingGun::GetBarrelLength() const
+//{
+//	return kBuildingGunBarrelLength;
+//}
+//
+//int	AvHBuildingGun::GetDeployAnimation() const
+//{
+//	// Look at most recently used weapon and see if we can transition from it
+//	int theDeployAnimation = 7;
+//
+//	AvHWeaponID thePreviousID = this->GetPreviousWeaponID();
+//
+//	switch(thePreviousID)
+//	{
+//	case AVH_WEAPON_SPIT:
+//		theDeployAnimation = 4;
+//		break;
+//	case AVH_WEAPON_WEBSPINNER:
+//	case AVH_WEAPON_RESOURCE_TOWER:
+//	case AVH_WEAPON_OFFENSE_CHAMBER:
+//	case AVH_WEAPON_DEFENSE_CHAMBER:
+//	case AVH_WEAPON_SENSORY_CHAMBER:
+//	case AVH_WEAPON_MOVEMENT_CHAMBER:
+//	case AVH_WEAPON_HIVE:
+//		theDeployAnimation = -1;
+//		break;
+//	}
+//
+//	return theDeployAnimation;
+//}
+//
+//float AvHBuildingGun::GetDeployTime() const
+//{
+//	return 1.0f;
+//}
+//
+//int	AvHBuildingGun::GetIdleAnimation() const
+//{
+//	int theBaseOffset = 0;
+//	int theAnimation = theBaseOffset + UTIL_SharedRandomFloat(this->m_pPlayer->random_seed, 0, 2);
+//	return theAnimation;
+//}
+//
+//int	AvHBuildingGun::GetShootAnimation() const
+//{
+//	return 5;
+//}
+//
+//bool AvHBuildingGun::GetFiresUnderwater() const
+//{
+//	return true;
+//}
+//
+//bool AvHBuildingGun::GetIsDroppable() const
+//{
+//	return false;
+//}
+//	
+//void AvHBuildingGun::Init()
+//{
+//	this->mRange = kBuildingGunRange;
+//	this->mROF = kBuildingGunROF;
+//}
+//
+//char* AvHBuildingGun::GetViewModel() const
+//{
+//	return kLevel2ViewModel;
+//}
+//
+//void AvHBuildingGun::Precache(void)
+//{
+//	AvHAlienWeapon::Precache();
+//	
+//	PRECACHE_SOUND(kBuildingGunSound1);
+//	PRECACHE_SOUND(kBuildingGunSound2);
+//	
+//	this->mEvent = PRECACHE_EVENT(1, kBuildingGunEventName);
+//	//this->mEvent = PRECACHE_EVENT(1, kSpitGEventName);
+//}
+//
+//void AvHBuildingGun::Spawn()
+//{
+//    AvHAlienWeapon::Spawn(); 
+//}
+//
+//bool AvHBuildingGun::UsesAmmo(void) const
+//{
+//	return false;
+//}
+//
+//CBaseEntity* AvHBuildingGun::CreateBuilding(const Vector& inLocation) const
+//{
+//	Vector theAngles;
+//	CBaseEntity* theEntity = CBaseEntity::Create(this->GetBuildingClassName(), inLocation, theAngles);
+//	ASSERT(theEntity);
+//	return theEntity;
+//}
+//
+//int	AvHBuildingGun::GetMaxAllowed() const
+//{
+//	return 3;
+//}
+//
+//void AvHBuildingGun::FireProjectiles(void)
+//{
+//	#ifdef AVH_SERVER
+//	// Make sure we have enough points to shoot this thing
+//	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this->m_pPlayer);
+//	ASSERT(thePlayer);
+//
+//	int theBuildingPointCost = this->GetBuildingPointCost();
+//
+//	// Make sure we haven't exceeded the limit
+//	int theNumBuildings = 0;
+//	FOR_ALL_ENTITIES(this->GetBuildingClassName(), CBaseEntity*)
+//		if(theEntity->pev->team == thePlayer->pev->team)
+//		{
+//			theNumBuildings++;
+//		}
+//	END_FOR_ALL_ENTITIES(this->GetBuildingClassName());
+//
+//	int theMaxBuildings = this->GetMaxAllowed();
+//	if(!strcmp(this->GetBuildingClassName(), kwsOffenseChamber))
+//	{
+//		theMaxBuildings = -1;
+//	}
+//
+//	if((theMaxBuildings == -1) || (theNumBuildings < theMaxBuildings))
+//	{
+//		if(thePlayer->GetResources() > theBuildingPointCost)
+//		{
+//			// Now check to make sure the space is big enough to hold the building
+//			UTIL_MakeVectors(this->m_pPlayer->pev->v_angle);
+//		
+//			Vector theStart = this->m_pPlayer->GetGunPosition();
+//			Vector theEnd = theStart + gpGlobals->v_forward*this->GetRange(); 
+//		
+//			// Collide with world to find potential build site
+//			TraceResult theTR;
+//			UTIL_TraceLine(theStart, theEnd, dont_ignore_monsters, thePlayer->edict(), &theTR);
+//		
+//			Vector theLocation = theTR.vecEndPos;
+//		
+//			// Check if collision point is valid for building
+//			if(AvHSHUGetIsSiteValidForBuild(this->GetBuildingMessageID(), &theLocation, thePlayer->edict()))
+//			//if(AvHSUIsAreaFree(vecSrc, this->GetBuildingRadius(), this->m_pPlayer))
+//			{
+//				// Decrement theBuildingPointCost points
+//				thePlayer->SetResources(thePlayer->GetResources() - theBuildingPointCost);
+//		
+//				// Create the new building
+//				CBaseEntity* theEntity = this->CreateBuilding(theLocation);
+//		
+//				AvHSUBuildingJustCreated(this->GetBuildingMessageID(), theEntity, thePlayer);
+//				
+//				// Set owner (this prevents collisions between the entity and it's owner though)
+//				//theEntity->pev->owner = ENT(this->m_pPlayer->pev);
+//				
+//				// Set building's team
+//				theEntity->pev->team = this->m_pPlayer->pev->team;
+//			}
+//		}
+//		else
+//		{
+//			thePlayer->PlayHUDSound(HUD_SOUND_ALIEN_MORE);
+//		}
+//	}
+//	else
+//	{
+//		thePlayer->SendMessage(kTooManyBuildings, true);
+//	}
+//#endif	
+//}
+//
+//// Build distance for all buildings
+//float AvHBuildingGun::GetRange() const
+//{
+//	return 48;
+//}
+//
+//bool AvHBuildingGun::GetMustPressTriggerForEachShot() const
+//{
+//	return true;
+//}
+//
+//
+//
+//LINK_ENTITY_TO_CLASS(kwResourceTowerGun, AvHResourceTowerGun);
+//
+//char* AvHResourceTowerGun::GetBuildingClassName() const
+//{
+//	return kwsAlienResourceTower;
+//}
+//
+//AvHMessageID AvHResourceTowerGun::GetBuildingMessageID() const
+//{
+//	return ALIEN_BUILD_RESOURCES;	
+//}
+//
+//int	AvHResourceTowerGun::GetBuildingPointCost() const
+//{
+//	int theCost = 0;
+//
+//	#ifdef AVH_SERVER
+//	theCost = GetGameRules()->GetPointCostForMessageID(this->GetBuildingMessageID());
+//	#endif
+//
+//	return theCost;
+//}
+//
+//int AvHResourceTowerGun::GetBuildingRadius() const
+//{
+//	return 40;
+//}
+//
+//int	AvHResourceTowerGun::GetMaxAllowed() const
+//{
+//	return -1;
+//}
+//
+//void AvHResourceTowerGun::Spawn()
+//{
+//	AvHBuildingGun::Spawn(); 
+//	
+//	Precache();
+//	
+//	this->m_iId = AVH_WEAPON_RESOURCE_TOWER;
+//	
+//	  // Set our class name
+//	this->pev->classname = MAKE_STRING(kwsResourceTowerGun);
+//	
+//	SET_MODEL(ENT(this->pev), kNullModel);
+//	
+//	FallInit();// get ready to fall down.
+//}
+//
+//
+//
+//
+//
+//
+//LINK_ENTITY_TO_CLASS(kwOffenseChamberGun, AvHOffenseChamberGun);
+//
+//char* AvHOffenseChamberGun::GetBuildingClassName() const
+//{
+//	return kwsOffenseChamber;
+//}
+//
+//AvHMessageID AvHOffenseChamberGun::GetBuildingMessageID() const
+//{
+//	return ALIEN_BUILD_OFFENSE_CHAMBER;	
+//}
+//
+//int	AvHOffenseChamberGun::GetBuildingPointCost() const
+//{
+//	return 5;
+//}
+//
+//int AvHOffenseChamberGun::GetBuildingRadius() const
+//{
+//	return 40;
+//}
+//
+//void AvHOffenseChamberGun::Spawn()
+//{
+//	AvHBuildingGun::Spawn(); 
+//	
+//	Precache();
+//	
+//	this->m_iId = AVH_WEAPON_OFFENSE_CHAMBER;
+//	
+//	// Set our class name
+//	this->pev->classname = MAKE_STRING(kwsOffenseChamberGun);
+//	
+//	SET_MODEL(ENT(this->pev), kNullModel);
+//	
+//	FallInit();// get ready to fall down.
+//}
+//
+//
+//
+//
+//
+//
+//LINK_ENTITY_TO_CLASS(kwDefenseChamberGun, AvHDefenseChamberGun);
+//
+//char* AvHDefenseChamberGun::GetBuildingClassName() const
+//{
+//	return kwsDefenseChamber;
+//}
+//
+//AvHMessageID AvHDefenseChamberGun::GetBuildingMessageID() const
+//{
+//	return ALIEN_BUILD_DEFENSE_CHAMBER;	
+//}
+//
+//int	AvHDefenseChamberGun::GetBuildingPointCost() const
+//{
+//	return 5;
+//}
+//
+//int AvHDefenseChamberGun::GetBuildingRadius() const
+//{
+//	return 40;
+//}
+//
+//void AvHDefenseChamberGun::Spawn()
+//{
+//	AvHBuildingGun::Spawn(); 
+//	
+//	Precache();
+//	
+//	this->m_iId = AVH_WEAPON_DEFENSE_CHAMBER;
+//	
+//	// Set our class name
+//	this->pev->classname = MAKE_STRING(kwsDefenseChamberGun);
+//	
+//	SET_MODEL(ENT(this->pev), kNullModel);
+//	
+//	FallInit();// get ready to fall down.
+//}
+//
+//
+//
+//
+//LINK_ENTITY_TO_CLASS(kwSensoryChamberGun, AvHSensoryChamberGun);
+//
+//char* AvHSensoryChamberGun::GetBuildingClassName() const
+//{
+//	return kwsSensoryChamber;
+//}
+//
+//AvHMessageID AvHSensoryChamberGun::GetBuildingMessageID() const
+//{
+//	return ALIEN_BUILD_SENSORY_CHAMBER;	
+//}
+//
+//int	AvHSensoryChamberGun::GetBuildingPointCost() const
+//{
+//	return 5;
+//}
+//
+//int AvHSensoryChamberGun::GetBuildingRadius() const
+//{
+//	return 40;
+//}
+//
+//void AvHSensoryChamberGun::Spawn()
+//{
+//	AvHBuildingGun::Spawn(); 
+//	
+//	Precache();
+//	
+//	this->m_iId = AVH_WEAPON_SENSORY_CHAMBER;
+//	
+//	// Set our class name
+//	this->pev->classname = MAKE_STRING(kwsSensoryChamberGun);
+//	
+//	SET_MODEL(ENT(this->pev), kNullModel);
+//	
+//	FallInit();// get ready to fall down.
+//}
+//
+//
+//
+//
+//LINK_ENTITY_TO_CLASS(kwMovementChamberGun, AvHMovementChamberGun);
+//
+//char* AvHMovementChamberGun::GetBuildingClassName() const
+//{
+//	//return kwsDeployedTurret;
+//	return kwsMovementChamber;
+//}
+//
+//AvHMessageID AvHMovementChamberGun::GetBuildingMessageID() const
+//{
+//	return ALIEN_BUILD_MOVEMENT_CHAMBER;	
+//}
+//
+//int	AvHMovementChamberGun::GetBuildingPointCost() const
+//{
+//	return 5;
+//}
+//
+//int AvHMovementChamberGun::GetBuildingRadius() const
+//{
+//	return 40;
+//}
+//
+//void AvHMovementChamberGun::Spawn()
+//{
+//	AvHBuildingGun::Spawn(); 
+//	
+//	Precache();
+//	
+//	this->m_iId = AVH_WEAPON_MOVEMENT_CHAMBER;
+//	
+//	// Set our class name
+//	this->pev->classname = MAKE_STRING(kwsMovementChamberGun);
+//	
+//	SET_MODEL(ENT(this->pev), kNullModel);
+//	
+//	FallInit();// get ready to fall down.
+//}
+
+
+
+
+
+
+
diff --git a/main/source/mod/AvHClaws.cpp b/main/source/mod/AvHClaws.cpp
new file mode 100644
index 00000000..6dd2d415
--- /dev/null
+++ b/main/source/mod/AvHClaws.cpp
@@ -0,0 +1,246 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHClaws.cpp $
+// $Date: 2002/11/22 21:28:16 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHClaws.cpp,v $
+// Revision 1.19  2002/11/22 21:28:16  Flayra
+// - mp_consistency changes
+//
+// Revision 1.18  2002/11/06 01:38:37  Flayra
+// - Added ability for buildings to be enabled and disabled, for turrets to be shut down
+// - Damage refactoring (TakeDamage assumes caller has already adjusted for friendly fire, etc.)
+//
+// Revision 1.17  2002/09/23 22:10:56  Flayra
+// - New onos view model artwork
+//
+// Revision 1.16  2002/08/16 02:33:13  Flayra
+// - Added damage types
+//
+// Revision 1.15  2002/07/26 23:03:08  Flayra
+// - New artwork
+//
+// Revision 1.14  2002/07/24 18:55:51  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.13  2002/07/24 18:45:40  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.12  2002/07/08 16:48:26  Flayra
+// - Melee weapons don't play hit sounds or punchangle target if they didn't damage them
+//
+// Revision 1.11  2002/07/01 21:21:15  Flayra
+// - Removed adrenaline
+//
+// Revision 1.10  2002/06/25 17:50:59  Flayra
+// - Reworking for correct player animations and new enable/disable state, new view model artwork, alien weapon refactoring
+//
+// Revision 1.9  2002/06/03 16:39:09  Flayra
+// - Added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.8  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHGamerules.h"
+#include "mod/AvHServerUtil.h"
+#endif
+
+#include "mod/AvHSharedUtil.h"
+
+LINK_ENTITY_TO_CLASS(kwClaws, AvHClaws);
+
+int	AvHClaws::GetBarrelLength() const
+{
+	return kSpitGBarrelLength;
+}
+
+bool AvHClaws::GetIsGunPositionValid() const
+{
+    return true;
+}
+
+float AvHClaws::GetRateOfFire() const
+{
+	return BALANCE_FVAR(kClawsROF);
+}
+
+int	AvHClaws::GetDeployAnimation() const
+{
+	// Look at most recently used weapon and see if we can transition from it
+	int theDeployAnimation = 9;
+	
+	AvHWeaponID thePreviousID = this->GetPreviousWeaponID();
+	
+	switch(thePreviousID)
+	{
+	case AVH_ABILITY_CHARGE:
+		theDeployAnimation = 9;
+		break;
+	case AVH_WEAPON_DEVOUR:
+		theDeployAnimation = 18;
+		break;
+	case AVH_WEAPON_STOMP:
+		theDeployAnimation = 15;
+		break;
+	}
+	
+	return theDeployAnimation;
+}
+
+float AvHClaws::GetDeployTime() const
+{
+	return .5f;
+}
+
+int AvHClaws::GetIdleAnimation() const
+{
+	return 0;
+}
+
+int	AvHClaws::GetShootAnimation() const
+{
+	return 21;
+}
+
+
+bool AvHClaws::GetFiresUnderwater() const
+{
+	return true;
+}
+	
+bool AvHClaws::GetIsDroppable() const
+{
+	return false;
+}
+
+void AvHClaws::Init()
+{
+	this->mRange = kClawsRange;
+	this->mDamage = BALANCE_IVAR(kClawsDamage);
+}
+
+int AvHClaws::GetDamageType() const
+{
+	return NS_DMG_BLAST;
+}
+
+char* AvHClaws::GetViewModel() const
+{
+	return kLevel5ViewModel;
+}
+
+void AvHClaws::Precache(void)
+{
+	AvHAlienWeapon::Precache();
+	
+	PRECACHE_UNMODIFIED_SOUND(kClawsSound1);
+	PRECACHE_UNMODIFIED_SOUND(kClawsSound2);
+	PRECACHE_UNMODIFIED_SOUND(kClawsSound3);
+
+	PRECACHE_UNMODIFIED_SOUND(kClawsHitSound1);
+	PRECACHE_UNMODIFIED_SOUND(kClawsHitSound2);
+	PRECACHE_UNMODIFIED_SOUND(kClawsKillSound);
+	
+	this->mEvent = PRECACHE_EVENT(1, kClawsEventName);
+}
+
+void AvHClaws::Spawn()
+{
+    AvHAlienWeapon::Spawn(); 
+	
+	Precache();
+	
+	this->m_iId = AVH_WEAPON_CLAWS;
+	
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsClaws);
+	
+	SET_MODEL(ENT(this->pev), kNullModel);
+	
+	FallInit();// get ready to fall down.
+	
+}
+
+bool AvHClaws::UsesAmmo(void) const
+{
+	return false;
+}
+
+BOOL AvHClaws::UseDecrement(void)
+{
+	return true;
+}
+
+void AvHClaws::FireProjectiles(void)
+{
+	#ifdef AVH_SERVER
+
+	// TODO: Check team
+
+	float theDamage = this->mDamage*AvHPlayerUpgrade::GetAlienMeleeDamageUpgrade(this->m_pPlayer->pev->iuser4, AvHSHUGetIsWeaponFocusable(AvHWeaponID(this->m_iId)));
+	
+	// Do trace hull here
+	CBaseEntity* pHurt = this->m_pPlayer->CheckTraceHullAttack(kClawsRange, theDamage, this->GetDamageType());
+	if(pHurt)
+	{
+		if(pHurt->pev->flags & (FL_MONSTER | FL_CLIENT))
+		{
+            AvHSUKnockPlayerAbout(CBaseEntity::Instance(this->m_pPlayer->edict()), pHurt, 300);
+			
+			int theSoundIndex = RANDOM_LONG(0, 1);
+			char* theSoundToPlay = "";
+			switch(theSoundIndex)
+			{
+			case 0:
+				theSoundToPlay = kClawsHitSound1;
+				break;
+			case 1:
+				theSoundToPlay = kClawsHitSound2;
+				break;
+			}
+			
+			if(pHurt->pev->health <= 0)
+			{
+				theSoundToPlay = kClawsKillSound;
+			}
+
+			// Throw nearby players around!
+			float theForceScalar = theDamage*.2f;
+			CBaseEntity* theAttacker = this->m_pPlayer;
+			AvHSUExplosiveForce(pHurt->pev->origin, 100, theForceScalar, theAttacker, theAttacker);
+			
+			// Played in event now
+			//EMIT_SOUND_DYN(ENT(pev), CHAN_WEAPON, theSoundToPlay, 1.0, ATTN_NORM, 0, 100 + theAdrenalineFactor*30 + RANDOM_LONG(-3,3) );
+		}
+	}
+
+	#endif	
+}
+
diff --git a/main/source/mod/AvHClientUtil.cpp b/main/source/mod/AvHClientUtil.cpp
new file mode 100644
index 00000000..1b2069e2
--- /dev/null
+++ b/main/source/mod/AvHClientUtil.cpp
@@ -0,0 +1,165 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHClientUtil.cpp $
+// $Date: 2002/07/24 18:45:41 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHClientUtil.cpp,v $
+// Revision 1.5  2002/07/24 18:45:41  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.4  2002/07/23 16:59:41  Flayra
+// - AvHCUWorldToScreen now returns true if the position is in front of player
+//
+// Revision 1.3  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHClientUtil.h"
+#include "mod/AvHSpecials.h"
+#include "common/vector_util.h"
+#include "common/com_model.h"
+#include "cl_dll/studio_util.h"
+#include "cl_dll/r_studioint.h"
+#include "engine/studio.h"
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+#include "common/cl_entity.h"
+#include "common/triangleapi.h"
+#include "cl_dll/vgui_TeamFortressViewport.h"
+#include "util/STLUtil.h"
+
+extern engine_studio_api_t	IEngineStudio;
+
+int AvHCUGetIconHeightForPlayer(AvHUser3 theUser3)
+{
+	int theIconHeight = 45;
+	
+	switch(theUser3)
+	{
+	case AVH_USER3_ALIEN_EMBRYO:
+	case AVH_USER3_ALIEN_PLAYER1:
+	case AVH_USER3_ALIEN_PLAYER2:
+	case AVH_USER3_ALIEN_PLAYER3:
+		theIconHeight = 25;
+		break;
+		
+	case AVH_USER3_ALIEN_PLAYER4:
+		theIconHeight = 60;
+		break;
+	case AVH_USER3_ALIEN_PLAYER5:
+		theIconHeight = 80;
+		break;
+	}
+	
+	return theIconHeight;
+}
+
+void AvHCUGetViewAngles(cl_entity_t* inEntity, float* outViewAngles)
+{
+	VectorCopy(inEntity->curstate.angles, outViewAngles);
+	
+	if(GetHasUpgrade(inEntity->curstate.iuser4, MASK_BUILDABLE))
+	{
+		if(inEntity->curstate.iuser3 == AVH_USER3_TURRET)
+		{
+			studiohdr_t* m_pStudioHeader = (studiohdr_t *)IEngineStudio.Mod_Extradata(inEntity->model);
+			mstudiobonecontroller_t* pbonecontroller = (mstudiobonecontroller_t *)((byte *)m_pStudioHeader + m_pStudioHeader->bonecontrollerindex);
+			
+			// Get attachment 0 for angles
+			//int theAngle = pbone->bonecontroller[0];
+			mstudiobone_t* pbone = (mstudiobone_t *)((byte *)m_pStudioHeader + m_pStudioHeader->boneindex);
+			pbone = pbone + pbonecontroller->bone;
+			int theAngle = (int)(pbone->value[0]);
+			if(theAngle != -1)
+			{
+				outViewAngles[1] = (float)theAngle;
+			}
+		}
+	}
+}
+
+void AvHCUGetViewOrigin(cl_entity_t* inEntity, float* outViewOrigin)
+{
+	VectorCopy(inEntity->origin, outViewOrigin);
+	
+	if(GetHasUpgrade(inEntity->curstate.iuser4, MASK_BUILDABLE))
+	{
+		if(inEntity->curstate.iuser3 == AVH_USER3_TURRET)
+		{
+		}
+	}
+}
+
+bool AvHCUWorldToScreen(float* inWorldCoords, float* outScreenCoords)
+{
+	bool theIsOnScreen = false;
+	
+	ASSERT(inWorldCoords);
+	ASSERT(outScreenCoords);
+	
+	if(!gEngfuncs.pTriAPI->WorldToScreen(inWorldCoords, outScreenCoords))
+	{
+		outScreenCoords[0] = XPROJECT(outScreenCoords[0]);
+		outScreenCoords[1] = YPROJECT(outScreenCoords[1]);
+		outScreenCoords[2] = 0.0f;
+		
+		theIsOnScreen = true;
+	}
+	
+	return theIsOnScreen;
+}
+
+bool AvHCUGetIsEntityInPVSAndVisible(int inEntityIndex)
+{
+	bool theReturnCode = false;
+
+	cl_entity_t* theLocalPlayer = gEngfuncs.GetLocalPlayer();
+	cl_entity_s* theClient = gEngfuncs.GetEntityByIndex(inEntityIndex);
+	if(theLocalPlayer && theClient)
+	{
+		// Don't show an icon if the player is not in our PVS.
+		if(theClient->curstate.messagenum >= theLocalPlayer->curstate.messagenum)
+		{
+			// Don't show an icon for dead or spectating players (ie: invisible entities).
+			if(!(theClient->curstate.effects & EF_NODRAW))
+			{
+				theReturnCode = true;
+			}
+		}
+	}
+	
+	return theReturnCode;
+}
+
+void AvHCUTrimExtraneousLocationText(string& ioTranslatedString)
+{
+	// Trim extra whitespace, carriage-returns and newlines
+	TrimString(ioTranslatedString);
+
+	// Now trim off the "Hive location" before hand, everything up to the -
+	string theChoppedTranslatedLocationName;
+	int theStartChopIndex = ioTranslatedString.find_first_of("-") + 1;
+	if((theStartChopIndex < 0) || (theStartChopIndex >= (int)(ioTranslatedString.length())))
+	{
+		theStartChopIndex = 0;
+	}
+
+	int theLength = ioTranslatedString.length() - theStartChopIndex;
+	if(theLength > 0)
+	{
+		theChoppedTranslatedLocationName = ioTranslatedString.substr(theStartChopIndex, theLength);
+	}
+
+	ioTranslatedString = theChoppedTranslatedLocationName;
+
+	// Remove any more spaces
+	TrimString(ioTranslatedString);
+}
\ No newline at end of file
diff --git a/main/source/mod/AvHClientUtil.h b/main/source/mod/AvHClientUtil.h
new file mode 100644
index 00000000..189a2a19
--- /dev/null
+++ b/main/source/mod/AvHClientUtil.h
@@ -0,0 +1,42 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHClientUtil.h $
+// $Date: 2002/07/23 16:59:41 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHClientUtil.h,v $
+// Revision 1.3  2002/07/23 16:59:41  Flayra
+// - AvHCUWorldToScreen now returns true if the position is in front of player
+//
+// Revision 1.2  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_CLIENTUTIL_H
+#define AVH_CLIENTUTIL_H
+
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#include "cl_dll/ammo.h"
+#include "cl_dll/chudmisc.h"
+#include "util/nowarnings.h"
+#include "common/cl_entity.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHMessage.h"
+#include "mod/AvHSpecials.h"
+
+int AvHCUGetIconHeightForPlayer(AvHUser3 theUser3);
+void AvHCUGetViewAngles(cl_entity_t* inEntity, float* outViewAngles);
+void AvHCUGetViewOrigin(cl_entity_t* inEntity, float* outViewOrigin);
+bool AvHCUWorldToScreen(float* inWorldCoords, float* outScreenCoords);
+bool AvHCUGetIsEntityInPVSAndVisible(int inEntityIndex);
+void AvHCUTrimExtraneousLocationText(string& ioTranslatedString);
+
+#endif
diff --git a/main/source/mod/AvHClientVariables.h b/main/source/mod/AvHClientVariables.h
new file mode 100644
index 00000000..640fb639
--- /dev/null
+++ b/main/source/mod/AvHClientVariables.h
@@ -0,0 +1,53 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHClientVariables.h $
+// $Date: 2002/08/02 22:02:02 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHClientVariables.h,v $
+// Revision 1.6  2002/08/02 22:02:02  Flayra
+// - Renamed centerid variable (because it tells info about everything, not just players)
+//
+// Revision 1.5  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_CLIENTVARIABLES_H
+#define AVH_CLIENTVARIABLES_H
+
+#include "common/cvardef.h"
+
+extern cvar_t*	cl_cmhotkeys;
+extern cvar_t*	cl_highdetail;
+extern cvar_t*	cl_musicenabled;
+extern cvar_t*	cl_musicdelay;
+extern cvar_t*	cl_musicvolume;
+extern cvar_t*	cl_particleinfo;
+extern cvar_t*	cl_quickselecttime;
+extern cvar_t*	cl_musicdir;
+
+// Variables
+#define kvAutoHelp			"cl_autohelp"
+#define	kvCMHotKeys			"cl_cmhotkeys"
+#define	kvForceDefaultFOV	"cl_forcedefaultfov"
+#define kvCenterEntityID	"cl_centerentityid"
+#define kvHighDetail		"cl_highdetail"
+#define kvCMHotkeys			"cl_cmhotkeys"
+#define kvMusicEnabled		"cl_musicenabled"
+#define kvMusicDirectory	"cl_musicdirectory"
+#define kvMusicDelay		"cl_musicdelay"
+#define kvMusicVolume		"cl_musicvolume"
+#define kvParticleInfo		"cl_particleinfo"
+#define kvQuickSelectTime	"cl_quickselecttime"
+
+#define kvDynamicLights		"cl_dynamiclights"
+#define kvBuildMessages		"cl_buildmessages"
+
+#endif
diff --git a/main/source/mod/AvHCloakable.cpp b/main/source/mod/AvHCloakable.cpp
new file mode 100644
index 00000000..c40bd357
--- /dev/null
+++ b/main/source/mod/AvHCloakable.cpp
@@ -0,0 +1,139 @@
+#include "mod/AvHCloakable.h"
+#include "dlls/extdll.h"
+#include "dlls/util.h"
+#include "mod/AvHBalance.h"
+
+AvHCloakable::AvHCloakable()
+{
+	this->Init();
+}
+
+void AvHCloakable::Init()
+{
+	this->mCurrentSpeed = 0.0f;
+	this->mMaxSpeed = 0.0f;
+	this->mMaxWalkSpeed = 0.0f;
+	this->mTimeOfLastCloak = -1;
+	this->mTimeOfLastUncloak = -1;
+	this->mOpacity = 1.0f;
+	this->mTimeOfLastUpdate = 0;
+}
+
+bool AvHCloakable::GetCanCloak() const
+{
+    bool theCanCloak = ((this->mTimeOfLastUncloak == -1) || (this->GetTime() > this->mTimeOfLastUncloak + this->GetUncloakTime()));
+
+    if(!theCanCloak)
+    {
+        int a = 0;
+    }
+
+    return theCanCloak;
+}
+
+float AvHCloakable::GetCloakTime() const
+{
+	return BALANCE_FVAR(kCloakTime);
+}
+
+bool AvHCloakable::GetIsCloaked() const
+{
+	return (this->mOpacity < 0.1f);
+}
+
+bool AvHCloakable::GetIsPartiallyCloaked() const
+{
+	return (this->mOpacity < 0.6f);
+}
+
+float AvHCloakable::GetUncloakTime() const
+{
+	return BALANCE_FVAR(kUncloakTime);
+}
+
+void AvHCloakable::ResetCloaking()
+{
+	this->Init();
+}
+
+void AvHCloakable::Update()
+{
+	float theCurrentTime = this->GetTime();
+
+	float theTimePassed = theCurrentTime - this->mTimeOfLastUpdate;
+
+	float theOldOpacity=this->mOpacity;
+	if((this->mTimeOfLastCloak != -1) || (this->mTimeOfLastUncloak != -1))
+	{
+		if( this->mTimeOfLastCloak > this->mTimeOfLastUncloak  )
+		{
+			// Cloaking
+			this->mOpacity -= theTimePassed/this->GetCloakTime();
+			if ( this->mOpacity < 0.45f && this->mCurrentSpeed > this->mMaxWalkSpeed ) 
+			{
+				float theExtraSpeed = max(0.0f, this->mCurrentSpeed - this->mMaxWalkSpeed);
+				float theSpeedRange = max(0.0f, this->mMaxSpeed - this->mMaxWalkSpeed);
+				float thePercent=theExtraSpeed/theSpeedRange;
+				this->mOpacity=0.30f * thePercent;
+				if ( this->mCurrentSpeed > this->mMaxSpeed  ) {
+					//ALERT(at_console, "exceeded the speed limit %f\n", this->mCurrentSpeed);
+					this->mOpacity=0.30f + 0.30f * ((this->mCurrentSpeed - this->mMaxSpeed) / this->mMaxSpeed / 2.0f );
+				}
+				this->mOpacity = min(max(0.0f, this->mOpacity), 0.45f);
+			}
+		}
+		else 
+		{
+			// Uncloaking
+			this->mOpacity += theTimePassed/this->GetUncloakTime();
+		}
+
+		this->mOpacity = min(max(0.0f, this->mOpacity), 1.0f);
+	}
+	this->mTimeOfLastUpdate = theCurrentTime;
+}
+
+float AvHCloakable::GetOpacity() const
+{
+	return this->mOpacity;
+}
+
+void AvHCloakable::SetSpeeds(float inCurrentSpeed, float inMaxSpeed, float inMaxWalkSpeed) 
+{
+	this->mCurrentSpeed=inCurrentSpeed;
+	this->mMaxSpeed=inMaxSpeed;
+	this->mMaxWalkSpeed=inMaxWalkSpeed;
+}
+
+void AvHCloakable::Cloak(bool inNoFade)
+{
+	// puzl: 864
+	if ( (this->GetTime() > this->mTimeOfLastUncloak + BALANCE_FVAR(kRecloakTime)) || inNoFade ) {
+		if(this->GetCanCloak())
+		{
+			this->mTimeOfLastCloak = this->GetTime();
+			this->mTimeOfLastUncloak = -1;
+
+			if(inNoFade)
+			{
+				this->mOpacity = 0.0f;
+			}
+		}
+	}
+}
+
+void AvHCloakable::Uncloak(bool inNoFade)
+{
+	this->mTimeOfLastUncloak = this->GetTime();
+	this->mTimeOfLastCloak = -1;
+
+	if(inNoFade)
+	{
+		this->mOpacity = 1.0f;
+	}
+}
+
+float AvHCloakable::GetTime() const
+{
+	return gpGlobals->time;
+}
diff --git a/main/source/mod/AvHCloakable.h b/main/source/mod/AvHCloakable.h
new file mode 100644
index 00000000..b09d29e3
--- /dev/null
+++ b/main/source/mod/AvHCloakable.h
@@ -0,0 +1,49 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile:  $
+// $Date: $
+//
+//-------------------------------------------------------------------------------
+// $Log: $
+//===============================================================================
+#ifndef AVH_CLOAKABLE_H
+#define AVH_CLOAKABLE_H
+
+class AvHCloakable
+{
+public:
+						AvHCloakable();
+
+	virtual bool		GetCanCloak() const;
+	virtual float		GetCloakTime() const;
+	virtual bool		GetIsCloaked() const;
+	bool				GetIsPartiallyCloaked() const;
+	virtual float		GetUncloakTime() const;
+	virtual float		GetOpacity() const;
+	void				SetSpeeds(float inCurrentSpeed, float inMaxSpeed, float inMaxWalkSpeed);
+	virtual void		Cloak(bool inNoFade = false);
+	virtual void		Uncloak(bool inNoFade = false);
+
+	virtual void		ResetCloaking();
+	virtual void		Update();
+
+private:
+	float				GetTime() const;
+	void				Init();
+	float				mCurrentSpeed;
+	float				mMaxSpeed;
+	float				mMaxWalkSpeed;
+	float				mTimeOfLastCloak;
+	float				mTimeOfLastUncloak;
+	float				mOpacity;
+	float				mTimeOfLastUpdate;
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHCocoon.cpp b/main/source/mod/AvHCocoon.cpp
new file mode 100644
index 00000000..9d903d9b
--- /dev/null
+++ b/main/source/mod/AvHCocoon.cpp
@@ -0,0 +1,158 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHCocoon.cpp $
+// $Date: 2002/07/24 19:09:16 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHCocoon.cpp,v $
+// Revision 1.6  2002/07/24 19:09:16  Flayra
+// - Linux issues
+//
+// Revision 1.5  2002/07/24 18:55:51  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.4  2002/07/24 18:45:41  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.3  2002/06/03 16:39:09  Flayra
+// - Added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.2  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienEquipmentConstants.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHConstants.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHEntities.h"
+#include "mod/AvHGamerules.h"
+#endif
+
+LINK_ENTITY_TO_CLASS(kwCocoon, AvHCocoon);
+
+BOOL AvHCocoon::Deploy()
+{
+	return DefaultDeploy(kCocoonVModel, kCocoonPModel, this->GetDeployAnimation(), kCocoonAnimExt);
+}
+
+int	AvHCocoon::GetBarrelLength() const
+{
+	return kCocoonBarrelLength;
+}
+
+bool AvHCocoon::GetFiresUnderwater() const
+{
+	return true;
+}
+
+bool AvHCocoon::GetIsDroppable() const
+{
+	return false;
+}
+	
+void AvHCocoon::Init()
+{
+	this->mRange = kCocoonRange;
+	this->mROF = kCocoonROF;
+}
+
+void AvHCocoon::Precache(void)
+{
+	AvHAlienWeapon::Precache();
+	
+	PRECACHE_MODEL(kCocoonVModel);
+	PRECACHE_MODEL(kCocoonPModel);
+	PRECACHE_MODEL(kAlienGunWModel);
+
+	PRECACHE_SOUND(kCocoonSound1);
+	PRECACHE_SOUND(kCocoonSound2);
+	
+	this->mEvent = PRECACHE_EVENT(1, kCocoonShootEventName);
+}
+
+void AvHCocoon::Spawn()
+{
+    AvHAlienWeapon::Spawn(); 
+	
+	Precache();
+	
+	this->m_iId = -1;//AVH_WEAPON_COCOON;
+	
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsCocoon);
+	
+	SET_MODEL(ENT(this->pev), kAlienGunWModel);
+	
+	FallInit();// get ready to fall down.
+	
+}
+
+bool AvHCocoon::UsesAmmo(void) const
+{
+	return false;
+}
+
+void AvHCocoon::FireProjectiles(void)
+{
+#ifdef AVH_SERVER
+	
+	// Make sure we have enough points to shoot this thing
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this->m_pPlayer);
+	ASSERT(thePlayer);
+	
+	vec3_t theNewPoint = this->pev->origin;
+	TraceResult	tr;
+	
+	// Do a traceline to see who to cocoon
+	UTIL_MakeVectors(this->pev->angles);
+
+	Vector theForwardDir = (gpGlobals->v_forward + gpGlobals->v_right + gpGlobals->v_up);
+	UTIL_TraceLine(this->pev->origin + this->pev->view_ofs, this->pev->origin + this->pev->view_ofs + theForwardDir*128, dont_ignore_monsters, ENT(this->m_pPlayer->pev), &tr);
+	if(tr.flFraction != 1.0)
+	{
+		CBaseEntity* theEntity = CBaseEntity::Instance(tr.pHit);
+		if(theEntity)
+		{
+			AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntity);
+			if(thePlayer /*&& (thePlayer->pev->team != this->pev->team)*/ && (thePlayer->GetRole() != ROLE_GESTATING) && (thePlayer->GetRole() != ROLE_COCOONED))
+			{
+				GetGameRules()->MarkDramaticEvent(kCocoonPriority, thePlayer, this->m_pPlayer);
+
+				// Play successful cocoon sound!
+				EMIT_SOUND_DYN(ENT(pev), CHAN_WEAPON, kCocoonSound2, 1.0, ATTN_NORM, 0, 100 + RANDOM_LONG(-3,3) );
+				
+				// Yes!
+				thePlayer->StartCocooning();
+			}
+		}
+	}
+				
+	#endif	
+}
+
diff --git a/main/source/mod/AvHCombat.cpp b/main/source/mod/AvHCombat.cpp
new file mode 100644
index 00000000..d512917e
--- /dev/null
+++ b/main/source/mod/AvHCombat.cpp
@@ -0,0 +1,707 @@
+#include "build.h"
+#include "types.h"
+#include "mod/AvHPlayer.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHMarineEquipment.h"
+#include "mod/AvHSharedUtil.h"
+
+extern int gLevelUpEventID;
+
+bool AvHPlayer::GiveCombatModeUpgrade(AvHMessageID inMessageID, bool inInstantaneous)
+{
+	bool theSuccess = false;
+	bool theEffectivePlayerClassChanged = false;	
+
+	// Process every upgrade here
+	AvHUser3 theUser3 = (AvHUser3)this->pev->iuser3;
+	int thePlayerLevel = this->GetExperienceLevel();
+	float theHealthPercentage = this->pev->health/AvHPlayerUpgrade::GetMaxHealth(this->pev->iuser4, theUser3, thePlayerLevel);
+	float theArmorPercentage = this->pev->armorvalue/AvHPlayerUpgrade::GetMaxArmorLevel(this->pev->iuser4, theUser3);
+	bool thePreserveHealthArmorPercentage = true;
+    CBasePlayerItem* theCreatedItem = NULL;
+
+	// Marine upgrades
+	if(this->GetIsMarine())
+	{
+		Vector thePlayerMinSize, thePlayerMaxSize;
+		this->GetSize(thePlayerMinSize, thePlayerMaxSize);
+
+		Vector thePlayersFeet = this->pev->origin;
+		thePlayersFeet.z += thePlayerMinSize.z;
+
+		switch(inMessageID)
+		{
+		case BUILD_SHOTGUN:
+		case BUILD_GRENADE_GUN:
+		case BUILD_HMG:
+		case BUILD_WELDER: 
+		case BUILD_MINES:
+		case BUILD_JETPACK:
+		case BUILD_HEAVY:
+			//voogru: spawn the weapon in the middle of nowhere to prevent anyone else from getting it.
+			theCreatedItem = dynamic_cast<CBasePlayerItem*>(AvHSUBuildTechForPlayer(inMessageID, Vector(9999,9999,9999), this));
+			
+			 ASSERT(theCreatedItem);
+
+			if((inMessageID == BUILD_JETPACK) || (inMessageID == BUILD_HEAVY))
+			{
+				theEffectivePlayerClassChanged = true;
+			}
+           
+			theSuccess = true; 
+			break;
+
+		case BUILD_SCAN:
+			AvHSUBuildTechForPlayer(inMessageID, thePlayersFeet, this);
+			theSuccess = true;
+			break;
+
+//		case RESEARCH_DISTRESSBEACON:
+//			AvHSUResearchStarted(this, inMessageID);
+//			AvHSUResearchComplete(this, inMessageID);
+//			theSuccess = true;
+//			break;
+
+		// Give upgrades
+		case RESEARCH_ARMOR_ONE:
+			this->GiveTeamUpgrade(RESEARCH_ARMOR_ONE);
+			theSuccess = true;
+			break;
+
+		case RESEARCH_ARMOR_TWO:
+			this->GiveTeamUpgrade(RESEARCH_ARMOR_ONE);
+			this->GiveTeamUpgrade(RESEARCH_ARMOR_TWO);
+			theSuccess = true;
+			break;
+
+		case RESEARCH_ARMOR_THREE:
+			this->GiveTeamUpgrade(RESEARCH_ARMOR_ONE);
+			this->GiveTeamUpgrade(RESEARCH_ARMOR_TWO);
+			this->GiveTeamUpgrade(RESEARCH_ARMOR_THREE);
+			theSuccess = true;
+			break;
+		
+		case RESEARCH_WEAPONS_ONE:
+			this->GiveTeamUpgrade(RESEARCH_WEAPONS_ONE);
+			theSuccess = true;
+			break;
+
+		case RESEARCH_WEAPONS_TWO:
+			this->GiveTeamUpgrade(RESEARCH_WEAPONS_ONE);
+			this->GiveTeamUpgrade(RESEARCH_WEAPONS_TWO);
+			theSuccess = true;
+			break;
+
+		case RESEARCH_WEAPONS_THREE:
+			this->GiveTeamUpgrade(RESEARCH_WEAPONS_ONE);
+			this->GiveTeamUpgrade(RESEARCH_WEAPONS_TWO);
+			this->GiveTeamUpgrade(RESEARCH_WEAPONS_THREE);
+			theSuccess = true;
+			break;
+
+        case RESEARCH_GRENADES:
+            this->GiveNamedItem(kwsGrenade);
+            // NOTE: Fall through below
+
+		case RESEARCH_MOTIONTRACK:
+			this->GiveTeamUpgrade(inMessageID);
+			theSuccess = true;
+			break;
+
+		//case BUILD_AMMO:
+		//case BUILD_HEALTH:
+		case BUILD_RESUPPLY:
+			// Find all friendly players nearby (right now this just resupplies current player)
+			// Give them health and ammo, equal to # of current level
+			AvHSUResupplyFriendliesInRange(1, this);
+			thePreserveHealthArmorPercentage = false;
+			theSuccess = true;
+
+			// Add new tech node to allow us to buy it again
+			//AvHTechNode theTechNode(BUILD_RESUPPLY, TECH_FOUR_LEVEL_TWO, TECH_FOUR_LEVEL_TWO, TECH_NULL, 0, 0, true);
+			//this->mCombatNodes.AddTechNode(theTechNode);
+			break;
+
+        case BUILD_CAT:
+            // Don't give out cat-packs every time
+            AvHCatalyst::GiveCatalyst(this);
+            theSuccess = true;
+            break;
+		}
+	}
+	else if(this->GetIsAlien())
+	{
+        theSuccess = this->ExecuteAlienMorphMessage(inMessageID, inInstantaneous);
+        thePreserveHealthArmorPercentage = false;
+	}
+
+	if(thePreserveHealthArmorPercentage)
+	{
+		this->pev->health = theHealthPercentage*AvHPlayerUpgrade::GetMaxHealth(this->pev->iuser4, theUser3, thePlayerLevel);
+		this->pev->armorvalue = theArmorPercentage*AvHPlayerUpgrade::GetMaxArmorLevel(this->pev->iuser4, theUser3);
+	}
+
+	if(theEffectivePlayerClassChanged)
+	{
+		this->EffectivePlayerClassChanged();
+	}
+
+	return theSuccess;
+}
+
+float AvHPlayer::GetExperience() const
+{
+	return this->mExperience;
+}
+
+int AvHPlayer::GetExperienceLevelsSpent() const
+{
+    return this->mExperienceLevelsSpent;
+}
+
+void AvHPlayer::SetExperienceLevelsSpent(int inSpentLevels)
+{
+    this->mExperienceLevelsSpent = inSpentLevels;
+}
+
+void AvHPlayer::AwardExperienceForObjective(float inHealthChange, AvHMessageID inMessageID)
+{
+    bool theAwardExperience = false;
+
+    if(GetGameRules()->GetIsCombatMode())
+    {
+        switch(inMessageID)
+        {
+        case ALIEN_BUILD_HIVE:
+        case BUILD_COMMANDSTATION:
+            theAwardExperience = true;
+            break;
+        }
+    }
+
+    if(theAwardExperience)
+    {
+        int theMaxHealth = GetGameRules()->GetBaseHealthForMessageID(inMessageID);
+        float thePercentageOfHealth = inHealthChange/theMaxHealth;
+        int theCombatObjectiveExperienceScalar = BALANCE_IVAR(kCombatObjectiveExperienceScalar);
+        float theExperienceGained = thePercentageOfHealth*theCombatObjectiveExperienceScalar;
+        this->SetExperience(this->GetExperience() + theExperienceGained);
+    }
+}
+
+void AvHPlayer::SetExperience(float inExperience)
+{
+	if(GetGameRules()->GetIsCombatMode())
+	{
+		int theCurrentLevel = AvHPlayerUpgrade::GetPlayerLevel(this->GetExperience());
+		
+		this->mExperience = inExperience;
+
+		// Update server player data in case we get disconnected
+		AvHTeam* theTeam = this->GetTeamPointer();
+		if(theTeam)
+		{
+			AvHServerPlayerData* theServerPlayerData = this->GetServerPlayerData();
+			if(theServerPlayerData)
+			{
+				theServerPlayerData->SetExperience(this->mExperience);
+			}
+		}
+		
+		int theNewLevel = AvHPlayerUpgrade::GetPlayerLevel(this->GetExperience());
+		
+		if(theCurrentLevel != theNewLevel)
+		{
+			int theIsMarine = this->GetIsMarine();
+			PLAYBACK_EVENT_FULL(0, this->edict(), gLevelUpEventID, 0, this->pev->origin, (float *)&g_vecZero, 0.0, 0.0, theIsMarine, 0, 0, 0 );
+			
+			// Give player health and armor back on level-up, to allow more soloing, heroics, and reduce dependence on hives/resupply
+			AvHUser3 theUser3 = AvHUser3(this->pev->iuser3);
+            float theMaxHealth = AvHPlayerUpgrade::GetMaxHealth(this->pev->iuser4, theUser3, theCurrentLevel);
+			float theHealthPercentage = this->pev->health/theMaxHealth;
+			
+            float theLevelUpHealthPercentage = BALANCE_IVAR(kCombatLevelupHealthIncreasePercent)/100.0f;
+            theHealthPercentage = min(theHealthPercentage + theLevelUpHealthPercentage, 1.0f);
+			this->pev->health = theHealthPercentage*theMaxHealth;
+
+            float theMaxArmor = AvHPlayerUpgrade::GetMaxArmorLevel(this->pev->iuser4, theUser3);
+            float theArmorPercentage = this->pev->armorvalue/theMaxArmor;
+
+            float theLevelUpArmorPercentage = BALANCE_IVAR(kCombatLevelupArmorIncreasePercent)/100.0f;
+            theArmorPercentage = min(theArmorPercentage + theLevelUpArmorPercentage, 1.0f);
+			this->pev->armorvalue = theArmorPercentage*theMaxArmor;
+			
+			// Unlock tiers as player levels up
+	//		if(theNewLevel >= 4)
+	//		{
+	//			this->mCombatNodes.SetResearchDone(COMBAT_TIER2_UNLOCK);
+	//		}
+	//		if(theNewLevel >= 7)
+	//		{
+	//			this->mCombatNodes.SetResearchDone(COMBAT_TIER3_UNLOCK);
+	//		}
+		}
+	}
+}
+
+int	AvHPlayer::GetExperienceLevel() const
+{
+	int theLevel = 1;
+	
+	if(GetGameRules()->GetIsCombatMode())
+	{
+		theLevel = AvHPlayerUpgrade::GetPlayerLevel(this->GetExperience());
+	}
+	
+	return theLevel;
+}
+
+AvHTechNodes& AvHPlayer::GetCombatNodes()
+{
+	return this->mCombatNodes;
+}
+
+MessageIDListType& AvHPlayer::GetPurchasedCombatUpgrades()
+{
+	return this->mPurchasedCombatUpgrades;
+}
+
+void AvHPlayer::SetCombatNodes(const AvHTechNodes& inTechNodes)
+{
+	this->mCombatNodes = inTechNodes;
+}
+
+void AvHPlayer::GiveCombatUpgradesOnSpawn()
+{
+	// Save off previously-spent upgrades and respend them
+	MessageIDListType theUpgrades = this->mGiveCombatUpgrades;
+
+	// Need to run through these in order
+	for(MessageIDListType::iterator theIter = theUpgrades.begin(); theIter != theUpgrades.end(); theIter++)
+	{
+		AvHMessageID theCurrentCombatUpgrade = *theIter;
+		if(theCurrentCombatUpgrade != MESSAGE_NULL)
+		{
+            this->GiveCombatModeUpgrade(theCurrentCombatUpgrade, true);
+		}
+	}
+}
+
+void AvHPlayer::PurchaseCombatUpgrade(AvHMessageID inMessageID)
+{
+	this->mPurchasedCombatUpgrades.push_back(inMessageID);
+	//this->mExperienceLevelsSpent++;
+
+    // Remove any upgrades that this prempts
+    bool theOneShot = false;
+    switch(inMessageID)
+    {
+    case BUILD_AMMO:
+    case BUILD_HEALTH:
+    case BUILD_RESUPPLY:
+    case BUILD_CAT:
+    case BUILD_SCAN:
+    //case BUILD_MINES:	
+    //case RESEARCH_DISTRESSBEACON:
+    	theOneShot = true;
+    	break;
+    }
+    
+    // Don't add it as a permanent upgrade to get every time we spawn
+    if(!theOneShot)
+    {
+        this->mGiveCombatUpgrades.push_back(inMessageID);
+    }
+
+    this->RemoveCombatUpgradesPremptedBy(inMessageID);
+}
+
+void AvHPlayer::RemoveCombatUpgrade(AvHMessageID inMessageID)
+{
+    MessageIDListType::iterator theIter = std::find(this->mGiveCombatUpgrades.begin(), this->mGiveCombatUpgrades.end(), inMessageID);
+    if(theIter != this->mGiveCombatUpgrades.end())
+    {
+        this->mGiveCombatUpgrades.erase(theIter);
+
+        // Take away the upgrade
+        this->GiveTeamUpgrade(inMessageID, false);
+    }
+}
+
+void AvHPlayer::RemoveCombatUpgradesPremptedBy(AvHMessageID inMessageID)
+{
+    switch(inMessageID)
+    {
+    case BUILD_JETPACK:
+        this->RemoveCombatUpgrade(BUILD_HEAVY);
+        break;
+    case BUILD_HEAVY:
+        this->RemoveCombatUpgrade(BUILD_JETPACK);
+        break;
+    case BUILD_HMG:
+        this->RemoveCombatUpgrade(BUILD_SHOTGUN);
+        this->RemoveCombatUpgrade(BUILD_GRENADE_GUN);
+        break;
+    case BUILD_GRENADE_GUN:
+        this->RemoveCombatUpgrade(BUILD_SHOTGUN);
+        this->RemoveCombatUpgrade(BUILD_HMG);
+        break;
+    case ALIEN_LIFEFORM_TWO:
+        this->RemoveCombatUpgrade(ALIEN_LIFEFORM_ONE);
+        break;
+    case ALIEN_LIFEFORM_THREE:
+        this->RemoveCombatUpgrade(ALIEN_LIFEFORM_TWO);
+        break;
+    case ALIEN_LIFEFORM_FOUR:
+        this->RemoveCombatUpgrade(ALIEN_LIFEFORM_THREE);
+        break;
+    case ALIEN_LIFEFORM_FIVE:
+        this->RemoveCombatUpgrade(ALIEN_LIFEFORM_FOUR);
+        break;
+
+    //case BUILD_WELDER
+    //    this->RemoveCombatUpgrade(BUILD_MINES);
+    //    break;
+    //case BUILD_MINES:
+    //    this->RemoveCombatUpgrade(BUILD_WELDER);
+    //    break;
+    }
+}
+
+void AvHPlayer::ProcessCombatDeath()
+{
+	// Unspend lifeform (return to skulk, but get the levels spent on lifeform back)
+	if(this->GetIsAlien())
+	{
+		AvHMessageID theLifeformID = MESSAGE_NULL;
+		AvHUser3 theUser3 = this->GetUser3(false);
+		if(theUser3 == AVH_USER3_ALIEN_EMBRYO)
+		{
+			// Use the last lifeform we were, unless we're evolving into a new one (assumes only one lifeform change per life)
+			theUser3 = this->GetPreviousUser3(false);
+			switch(this->mEvolution)
+			{
+			case ALIEN_LIFEFORM_TWO:
+				theUser3 = AVH_USER3_ALIEN_PLAYER2;
+				break;
+			case ALIEN_LIFEFORM_THREE:
+				theUser3 = AVH_USER3_ALIEN_PLAYER3;
+				break;
+			case ALIEN_LIFEFORM_FOUR:
+				theUser3 = AVH_USER3_ALIEN_PLAYER4;
+				break;
+			case ALIEN_LIFEFORM_FIVE:
+				theUser3 = AVH_USER3_ALIEN_PLAYER5;
+				break;
+			}
+		}
+
+		AvHSHUUser3ToMessageID(theUser3, theLifeformID);
+		ASSERT(theLifeformID != MESSAGE_NULL);
+
+		int theLifeformCost = GetGameRules()->GetCostForMessageID(theLifeformID);
+		this->SetExperienceLevelsSpent(this->GetExperienceLevelsSpent() - theLifeformCost);
+
+		this->RemoveCombatUpgrade(theLifeformID);
+
+		// Make all lifeforms chooseable again
+		this->SetLifeformCombatNodesAvailable(true);
+	}
+}
+
+void AvHPlayer::SetLifeformCombatNodesAvailable(bool inAvailable)
+{
+	MessageIDListType theLifeformList;
+	theLifeformList.push_back(ALIEN_LIFEFORM_ONE);
+	theLifeformList.push_back(ALIEN_LIFEFORM_TWO);
+	theLifeformList.push_back(ALIEN_LIFEFORM_THREE);
+	theLifeformList.push_back(ALIEN_LIFEFORM_FOUR);
+	theLifeformList.push_back(ALIEN_LIFEFORM_FIVE);
+
+	for(MessageIDListType::iterator theIter = theLifeformList.begin(); theIter != theLifeformList.end(); theIter++)
+	{
+		AvHMessageID theLifeformID = *theIter;
+		this->mCombatNodes.SetIsResearchable(theLifeformID, inAvailable);
+		this->mCombatNodes.SetResearchDone(theLifeformID, !inAvailable);
+	}
+}
+
+bool AvHPlayer::ExecuteCombatMessage(AvHMessageID inMessageID, bool& outIsAvailable, bool inForce)
+{
+	bool theMessageExecuted = false;
+
+    // Only explicitly deny messages in the tech tree, let the others fall back to NS-mode handling
+    if(this->mCombatNodes.GetIsMessageInTechTree(inMessageID))
+    {
+	    if(this->mCombatNodes.GetIsMessageAvailable(inMessageID) || inForce)
+	    {
+		    if(this->GiveCombatModeUpgrade(inMessageID))
+		    {
+			    theMessageExecuted = true;
+		    }
+	    }
+	    else
+	    {
+		    // Explicitly deny
+		    outIsAvailable = false;
+	    }
+    }
+
+	return theMessageExecuted;
+}
+
+bool AvHPlayer::GetHasCombatModeUpgrade(AvHMessageID inMessageID) const
+{
+	bool theHasUpgrade = false;
+
+	MessageIDListType::const_iterator theIter = std::find(this->mPurchasedCombatUpgrades.begin(), this->mPurchasedCombatUpgrades.end(), inMessageID);
+	if(theIter != this->mPurchasedCombatUpgrades.end())
+	{
+		theHasUpgrade = true;
+	}
+
+	return theHasUpgrade;
+}
+
+void AvHPlayer::InternalCombatThink()
+{
+	// Only update every so often
+	if(GetGameRules()->GetIsCombatMode())
+	{
+        // Save our data in case we get kicked off
+        AvHServerPlayerData* theServerPlayerData = this->GetServerPlayerData();
+        if(theServerPlayerData)
+        {
+            theServerPlayerData->SetCombatNodes(this->mCombatNodes);
+            theServerPlayerData->SetPurchasedCombatUpgrades(this->mPurchasedCombatUpgrades);
+            theServerPlayerData->SetExperienceLevelsSpent(this->mExperienceLevelsSpent);
+        }
+
+        // If it's time for an update
+        float theCurrentTime = gpGlobals->time;
+        const float theCombatThinkInterval = BALANCE_FVAR(kCombatThinkInterval);
+        
+		// Give support from a fake commander
+		if(this->GetIsMarine() && this->GetIsRelevant() && !this->GetIsBeingDigested())
+		{
+			if(this->mTimeOfLastCombatThink == 0 || (theCurrentTime > (this->mTimeOfLastCombatThink + theCombatThinkInterval)))
+			{
+				// Only allow one upgrade per think
+				bool theSuccess = false;
+
+				// Does player have resupply upgrade?
+				if(this->GetHasCombatModeUpgrade(BUILD_RESUPPLY))
+				{
+					// Do they need it?
+					float theHealthPercentage = this->pev->health/AvHPlayerUpgrade::GetMaxHealth(this->pev->iuser4, (AvHUser3)this->pev->iuser3, this->GetExperienceLevel());
+					// float theAmmoPercentage = this->GetCurrentWeaponAmmoPercentage(); // changed to fix #542
+					bool theAmmoResupply = this->GetShouldResupplyAmmo(); 
+
+					if((theHealthPercentage < BALANCE_FVAR(kCombatResupplyHealthPercentage)) || theAmmoResupply) //(theAmmoPercentage < BALANCE_FVAR(kCombatResupplyAmmoPercentage)))
+					{
+						// Resupply player
+						this->GiveCombatModeUpgrade(BUILD_RESUPPLY);
+						theSuccess = true;
+					}
+				}
+
+                // Does player have resupply upgrade?
+                if(this->GetHasCombatModeUpgrade(BUILD_CAT))
+                {
+                    // Catalyst player after he gets a kill
+                    if(this->pev->frags > this->mSavedCombatFrags)
+                    {
+                        //if(RANDOM_LONG(0, 1) == 0)
+                        //{
+                            AvHCatalyst::GiveCatalyst(this);
+                            theSuccess = true;
+                        //}
+                    }
+                }
+                this->mSavedCombatFrags = this->pev->frags;
+
+				// Does player have scan upgrade?
+				if(!theSuccess && this->GetHasCombatModeUpgrade(BUILD_SCAN) && !this->GetIsBeingDigested())
+				{
+					// Needed if there is a cloaked enemy nearby
+					bool theCloakedEnemyNearby = false;
+
+					// Look in sphere for cloakables
+					CBaseEntity* theSphereEntity = NULL;
+					while ((theSphereEntity = UTIL_FindEntityInSphere(theSphereEntity, this->pev->origin, BALANCE_IVAR(kScanRadius))) != NULL)
+					{
+						if(!AvHSUGetIsExternalClassName(STRING(theSphereEntity->pev->classname)))
+						{
+							AvHCloakable* theCloakable = dynamic_cast<AvHCloakable*>(theSphereEntity);
+							if(theCloakable && theCloakable->GetIsPartiallyCloaked() && (theSphereEntity->pev->team != this->pev->team))
+							{
+								//if(this->GetIsEntityInSight(theSphereEntity))
+								//{
+									theCloakedEnemyNearby = true;
+									break;
+								//}
+							}
+						}
+					}
+
+					// Lucky enough to receive?
+					if(theCloakedEnemyNearby /*&& (RANDOM_LONG(0, 1) == 0)*/)
+					{
+						// Scan
+						this->GiveCombatModeUpgrade(BUILD_SCAN);
+						theSuccess = true;
+					}
+				}
+
+//				// Does player have distress beacon?
+//				if(!theSuccess && this->GetHasCombatModeUpgrade(RESEARCH_DISTRESSBEACON))
+//				{
+//					// Needed?
+//					int theNumTeammatesWaitingToSpawn = 0;
+//					FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*);
+//					if(theEntity->GetTeam() == this->GetTeam())
+//					{
+//						if(theEntity->GetPlayMode() == PLAYMODE_AWAITINGREINFORCEMENT)
+//						{
+//							theNumTeammatesWaitingToSpawn++;
+//						}
+//					}
+//					END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+//
+//					// Lucky enough?
+//					int theNumPlayersOnTeam = 0;
+//					AvHTeam* theTeamPointer = this->GetTeamPointer();
+//					if(theTeamPointer)
+//					{
+//						theNumPlayersOnTeam = theTeamPointer->GetPlayerCount();
+//					}
+//
+//					float theDeadPercentage = (float)theNumTeammatesWaitingToSpawn/theNumPlayersOnTeam;
+//					if(theDeadPercentage > BALANCE_FVAR(kCombatDistressBeaconDeadPercentage))
+//					{
+//						// Distress!
+//						this->GiveCombatModeUpgrade(RESEARCH_DISTRESSBEACON);
+//						theSuccess = true;
+//					}
+//				}
+				
+				// Update time
+				this->mTimeOfLastCombatThink = theCurrentTime;
+			}
+		}
+        else if(this->GetIsAlien() && this->GetIsRelevant())
+        {
+            // Give aliens experience slowly over time
+            if(this->mTimeOfLastCombatThink == 0 || (theCurrentTime > (this->mTimeOfLastCombatThink + theCombatThinkInterval)))
+            {
+                float theExperienceRate = BALANCE_FVAR(kCombatExperienceAlienGrowthRate);
+                float theExperienceGained = theCombatThinkInterval*theExperienceRate;
+                this->SetExperience(this->GetExperience() + theExperienceGained);
+
+                // Update time
+                this->mTimeOfLastCombatThink = theCurrentTime;
+            }
+        }
+	}
+}
+
+
+void AvHTeam::InitializeCombatTechNodes()
+{
+	// If team is marine
+	if(this->mTeamType == AVH_CLASS_TYPE_MARINE)
+	{
+		this->AddTechNode(RESEARCH_WEAPONS_ONE, TECH_ONE_LEVEL_ONE, TECH_NULL, TECH_NULL, false);
+		this->AddTechNode(RESEARCH_WEAPONS_TWO, TECH_ONE_LEVEL_TWO, TECH_ONE_LEVEL_ONE, TECH_NULL, false);
+		this->AddTechNode(RESEARCH_WEAPONS_THREE, TECH_NULL, TECH_ONE_LEVEL_TWO, TECH_NULL, false);
+		this->AddTechNode(BUILD_SHOTGUN, TECH_ONE_LEVEL_THREE, TECH_ONE_LEVEL_ONE, TECH_NULL, false);
+		this->AddTechNode(BUILD_GRENADE_GUN, TECH_NULL, TECH_ONE_LEVEL_THREE, TECH_NULL, false);
+		this->AddTechNode(BUILD_HMG, TECH_NULL, TECH_ONE_LEVEL_THREE, TECH_NULL, false);
+		
+		this->AddTechNode(RESEARCH_ARMOR_ONE, TECH_TWO_LEVEL_ONE, TECH_NULL, TECH_NULL, false);
+		this->AddTechNode(RESEARCH_ARMOR_TWO, TECH_TWO_LEVEL_TWO, TECH_TWO_LEVEL_ONE, TECH_NULL, false);
+		this->AddTechNode(RESEARCH_ARMOR_THREE, TECH_NULL, TECH_TWO_LEVEL_TWO, TECH_NULL, false);
+		this->AddTechNode(BUILD_JETPACK, TECH_NULL, TECH_TWO_LEVEL_TWO, TECH_NULL, false);
+		this->AddTechNode(BUILD_HEAVY, TECH_NULL, TECH_TWO_LEVEL_TWO, TECH_NULL, false);
+		
+		this->AddTechNode(BUILD_SCAN, TECH_THREE_LEVEL_ONE, TECH_NULL, TECH_NULL, false, false);
+        this->AddTechNode(RESEARCH_MOTIONTRACK, TECH_THREE_LEVEL_ONE, TECH_NULL, TECH_NULL, false);
+        //this->AddTechNode(RESEARCH_DISTRESSBEACON, TECH_THREE_LEVEL_ONE, TECH_NULL, TECH_NULL, true, false);
+
+        this->AddTechNode(BUILD_RESUPPLY, TECH_THREE_LEVEL_ONE, TECH_NULL, TECH_NULL, false, false);
+        this->AddTechNode(BUILD_CAT, TECH_THREE_LEVEL_ONE, TECH_NULL, TECH_NULL, false, false);
+		
+		this->AddTechNode(BUILD_WELDER, TECH_THREE_LEVEL_ONE, TECH_NULL, TECH_NULL, false, false);
+		this->AddTechNode(BUILD_MINES, TECH_THREE_LEVEL_ONE, TECH_NULL, TECH_NULL, false, false);
+        this->AddTechNode(RESEARCH_GRENADES, TECH_THREE_LEVEL_ONE, TECH_NULL, TECH_NULL, false, false);
+	}
+	else
+	{
+        
+        // Deny skulks so that player can't "re-evolve" to skulks.        
+        this->AddTechNode(ALIEN_LIFEFORM_ONE, TECH_NULL, TECH_PLAYER_UNAVAILABLE, TECH_NULL, false);
+        
+        this->AddTechNode(ALIEN_LIFEFORM_TWO, TECH_ONE_LEVEL_ONE, TECH_NULL, TECH_NULL, false);
+		this->AddTechNode(ALIEN_LIFEFORM_THREE, TECH_ONE_LEVEL_TWO, TECH_NULL, TECH_NULL, false);
+		this->AddTechNode(ALIEN_LIFEFORM_FOUR, TECH_ONE_LEVEL_THREE, TECH_NULL, TECH_NULL, false);
+		this->AddTechNode(ALIEN_LIFEFORM_FIVE, TECH_ONE_LEVEL_FOUR, TECH_NULL, TECH_NULL, false);
+				
+		this->AddTechNode(ALIEN_HIVE_TWO_UNLOCK, TECH_TWO_LEVEL_ONE, TECH_NULL, TECH_NULL, false);
+		this->AddTechNode(ALIEN_HIVE_THREE_UNLOCK, TECH_THREE_LEVEL_TWO, TECH_TWO_LEVEL_ONE, TECH_NULL, false);
+				
+		this->AddTechNode(ALIEN_EVOLUTION_ONE, TECH_THREE_LEVEL_ONE, TECH_NULL, TECH_NULL, false);
+		this->AddTechNode(ALIEN_EVOLUTION_TWO, TECH_THREE_LEVEL_ONE, TECH_NULL, TECH_NULL, false);
+		this->AddTechNode(ALIEN_EVOLUTION_THREE, TECH_THREE_LEVEL_ONE, TECH_NULL, TECH_NULL, false);
+				
+		this->AddTechNode(ALIEN_EVOLUTION_TEN, TECH_FOUR_LEVEL_ONE, TECH_NULL, TECH_NULL, false);
+		this->AddTechNode(ALIEN_EVOLUTION_TWELVE, TECH_FOUR_LEVEL_ONE, TECH_NULL, TECH_NULL, false);
+		this->AddTechNode(ALIEN_EVOLUTION_ELEVEN, TECH_FOUR_LEVEL_ONE, TECH_NULL, TECH_NULL, false);
+				
+		this->AddTechNode(ALIEN_EVOLUTION_SEVEN, TECH_FIVE_LEVEL_ONE, TECH_NULL, TECH_NULL, false);
+		this->AddTechNode(ALIEN_EVOLUTION_EIGHT, TECH_FIVE_LEVEL_ONE, TECH_NULL, TECH_NULL, false);
+		this->AddTechNode(ALIEN_EVOLUTION_NINE, TECH_FIVE_LEVEL_ONE, TECH_NULL, TECH_NULL, false);
+	}
+}
+
+void AvHGamerules::AwardExperience(AvHPlayer* inPlayer, int inTargetLevel, bool inAwardFriendliesInRange)
+{
+	PlayerListType thePlayerList;
+	thePlayerList.push_back(inPlayer);
+
+	if(inAwardFriendliesInRange)
+	{
+		// Award experience to player, and any other players nearby
+		int theExperienceRadius = BALANCE_IVAR(kCombatFriendlyNearbyRange);
+
+		// Make list of players to split it between.  If a player is at full experience, extra is wasted.
+		CBaseEntity* theEntity = NULL;
+		while ((theEntity = UTIL_FindEntityInSphere(theEntity, inPlayer->pev->origin, theExperienceRadius)) != NULL)
+		{
+			const char* theClassName = STRING(theEntity->pev->classname);
+			if(!AvHSUGetIsExternalClassName(theClassName))
+			{
+				AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntity);
+				if(thePlayer && (thePlayer != inPlayer) && (thePlayer->pev->team == inPlayer->pev->team) && thePlayer->GetIsRelevant() && !thePlayer->GetIsBeingDigested())
+				{
+					thePlayerList.push_back(thePlayer);
+				}
+			}
+		}
+	}
+	
+	ASSERT(thePlayerList.size() > 0);
+
+	float theExperienceFactor = GetGameRules()->GetIsIronMan() ? BALANCE_FVAR(kCombatIronManExperienceScalar) : 1.0f;
+
+	int theExperienceToAward = BALANCE_IVAR(kCombatExperienceBaseAward) + inTargetLevel*BALANCE_IVAR(kCombatExperienceLevelAward);
+
+	float theExperienceForEach = (theExperienceToAward/(float)thePlayerList.size() + BALANCE_IVAR(kCombatExperienceCrowdAward))*theExperienceFactor;
+
+	for(PlayerListType::iterator thePlayerIter = thePlayerList.begin(); thePlayerIter != thePlayerList.end(); thePlayerIter++)
+	{
+		AvHPlayer* theCurrentPlayer = (*thePlayerIter);
+		theCurrentPlayer->SetExperience(theCurrentPlayer->GetExperience() + theExperienceForEach);
+	}
+}
diff --git a/main/source/mod/AvHCommandConstants.h b/main/source/mod/AvHCommandConstants.h
new file mode 100644
index 00000000..cc4594c7
--- /dev/null
+++ b/main/source/mod/AvHCommandConstants.h
@@ -0,0 +1,115 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile:  $
+// $Date: $
+//
+//-------------------------------------------------------------------------------
+// $Log: $
+//===============================================================================
+#ifndef AVH_COMMAND_CONSTANTS_H
+#define AVH_COMMAND_CONSTANTS_H
+
+// Commands
+//#define kcBuyReinforcements			"buyreinforcements"
+#define kcReadyRoom					"readyroom"
+#define kcJoinTeamOne				"jointeamone"
+#define kcJoinTeamTwo				"jointeamtwo"
+#define kcSpectate					"spectate"
+#define kcAutoAssign				"autoassign"
+#define kcPlayHUDSound				"playhudsound"
+#define kcStartGame					"startgame"
+#define kcSwitch					"switch"
+#define kcSetTeam					"setteam"
+#define kcEndGame					"endgame"
+#define kcAdjustScore				"adjustscore"
+#define kcGivePoints				"givepoints"
+#define kcGiveUpgrade				"giveupgrade"
+#define kcRemoveUpgrade				"removeupgrade"
+#define kcSetRole					"setrole"
+#define kcSpawnEnemy				"spawnenemy"
+#define kcEquipOne					"equip1"
+#define kcEquipTwo					"equip2"
+#define kcEquipThree				"equip3"
+#define kcKillAlien					"killalien"
+#define kcGiveArmor					"givearmor"
+#define kcGlobalChat				"messagemode"
+#define kcTeamChat					"messagemode2"
+#define kcNearbyChat				"messagemode3"
+#define kcSetGamma					"setgamma"
+#define kcStartCommandMode			"startcommandermode"
+#define kcStopCommandMode			"stopcommandermode"
+#define kcSetCullDistance			"setculldistance"
+#define kcRun						"run"
+#define kcClientRun					"clientrun"
+#define kcListPS					"listps"
+#define kcEditPS					"editps"
+#define kcCrash						"crash"
+#define kcAssert					"assert"
+#define kcBuildMiniMap				"buildminimap"
+#define kcNetScreenShot				"netscreenshot"
+#define	kcAddCat					"addcat"
+#define	kcRemoveCat					"removecat"
+#define	kcTestEvent					"testevent"
+#define kcRestart					"sv_restart"
+#define kcRestartRound				"sv_restartround"
+#define kcGetNumPlayers				"getnumplayers"
+#define kcKillHive					"killhive"
+#define kcKillCS					"killcs"
+#define kcAttackCS					"attackcs"
+#define kcSpawnHive					"spawnhive"
+#define kcAlert						"alert"
+#define kcBigDig					"bigdig"
+#define kcLowCost					"lowcost"
+#define kcHighDamage				"highdamage"
+#define kcHighTech					"hightech"
+#define kcSlowResearch				"slowresearch"
+#define kcDetectAll					"detectall"
+#define kcInvul						"invul"
+#define kcNumInfos					"numinfos"
+#define kcNumSpawns					"numspawns"
+#define kcMapUtilNumEnts			"maputil_numents"
+#define kcMapUtilEntityInfo			"maputil_entityinfo"
+#define kcEntityInfo				"entityinfo"
+#define kcOrderSelf					"orderself"
+#define	kcParasite					"parasite"
+#define kcKillAll					"killall"
+#define kcStun						"stun"
+#define kcBoxes						"boxes"
+#define kcOverflow					"overflow"
+#define kcSendMessage				"sendmessage"
+#define kcTooltip					"tt"
+#define kcHurt						"hurt"
+#define kcWeb						"web"
+#define kcEndGame1					"endgame1"
+#define kcEndGame2					"endgame2"
+#define kcDeathMessage				"deathmessage"
+#define kcSetSkin					"setskin"
+#define kcAuth						"auth"
+#define kcSetAuth					"setauth"
+#define kcNumEnts					"numents"
+#define kcRedeem					"redeem"
+#define kcElectric					"electric"
+#define kcViewAll					"viewall"
+#define kcHighSpeed					"highspeed"
+#define kcRoomType					"roomtype"
+#define kcDigest					"digest"
+#ifdef USE_UPP
+#  define kcUPPPing					"upp_ping"
+#  define kcUPPToggle				"upp_toggle"
+#  define kcUPPToggleProfiling		"upp_toggle_profiling"
+#else
+#  define kcForceUplink				"forceuplink"
+#endif
+#define kcSetBalanceVar				"setbalancevar"
+#define kcNSChangeLevel				"nschangelevel"
+#define kcTournyMode				"tournymode"
+//#define kcSendParticleTemplates		"sendparticletemplates"
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHCommanderModeHandler.cpp b/main/source/mod/AvHCommanderModeHandler.cpp
new file mode 100644
index 00000000..92fede7d
--- /dev/null
+++ b/main/source/mod/AvHCommanderModeHandler.cpp
@@ -0,0 +1,918 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHCommanderModeHandler.cpp$
+// $Date: 2002/10/24 21:22:19 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHCommanderModeHandler.cpp,v $
+// Revision 1.25  2002/10/24 21:22:19  Flayra
+// - Remove resource tower upgrade icon
+//
+// Revision 1.24  2002/10/16 20:51:27  Flayra
+// - Phase gates are now recyclable
+//
+// Revision 1.23  2002/10/16 00:50:17  Flayra
+// - Phase gates can be recycled now
+//
+// Revision 1.22  2002/09/23 22:11:28  Flayra
+// - Command UI is now a 4x4 matrix
+// - Updated for new droppable jetpacks and heavy armor
+//
+// Revision 1.21  2002/08/31 18:01:01  Flayra
+// - Work at VALVe
+//
+// Revision 1.20  2002/08/09 00:55:56  Flayra
+// - Fixed bug where pressing the equip menu button sometimes caused menu to reset (bug still exists when selecting some things)
+//
+// Revision 1.19  2002/07/23 17:00:40  Flayra
+// - Lots of UI changes, new upgrades, selectable siege
+//
+// Revision 1.18  2002/06/25 17:45:07  Flayra
+// - Renamed some buildings, armory is now upgraded
+//
+// Revision 1.17  2002/06/10 19:51:06  Flayra
+// - New commander UI
+//
+// Revision 1.16  2002/06/03 16:40:24  Flayra
+// - Renamed weapons factory and armory
+//
+// Revision 1.15  2002/05/28 17:37:43  Flayra
+// - Added recycling, added fix for occasional crash when selecting command station with some lag
+//
+// Revision 1.14  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "util/nowarnings.h"
+#include "VGUI_Panel.h"
+#include "cl_dll/chud.h"
+#include "cdll_int.h"
+#include "cl_dll/cl_util.h"
+#include "mod/AvHCommanderModeHandler.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHLogoutComponent.h"
+#include "mod/AvHSpecials.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHTitles.h"
+#include "mod/AvHTechImpulsePanel.h"
+#include "mod/AvHCommandConstants.h"
+#include "util/STLUtil.h"
+
+AvHCommanderModeHandler::AvHCommanderModeHandler()
+{
+	this->Init();
+}
+
+void AvHCommanderModeHandler::Init()
+{
+	this->mTechNodePressed = false;
+	this->mMoveToWorldX = this->mMoveToWorldY = 0;
+	this->mHasMoveToPosition = false;
+	this->mDefaultOrderWorldX = this->mDefaultOrderWorldY = 0;
+	this->mHasDefaultOrderPosition = false;
+	this->mMouseOneDown = false;
+	this->mMouseTwoDown = false;
+	this->mMouseOneDownOnActionButtons = false;
+	this->mMouseOneDownOnLogoutButton = false;
+	this->mDisplayMenu = AVH_USER3_MENU_BUILD;
+	this->mDisplayMenuMessageID = MENU_BUILD;
+
+	this->mSelected.clear();
+	this->mTechHelpText = "";
+	this->mBuildResearchText = "";
+}
+
+void AvHCommanderModeHandler::CancelHit()
+{
+//	this->SetBaseMenu();
+}
+
+void AvHCommanderModeHandler::ClearDefaultOrderPosition()
+{
+	this->mHasDefaultOrderPosition = false;
+}
+
+void AvHCommanderModeHandler::ClearMoveToPosition()
+{
+	this->mHasMoveToPosition = false;
+}
+
+bool AvHCommanderModeHandler::GetAndClearTechNodePressed(AvHMessageID& outMessageID, bool inClear)
+{
+	bool theSuccess = false;
+
+	if(this->mTechNodePressed)
+	{
+		outMessageID = this->mLastTechPressed;
+		theSuccess = true;
+
+		if(inClear)
+		{
+			this->mTechNodePressed = false;
+		}
+	}
+
+	return theSuccess;
+}
+
+AvHMessageID AvHCommanderModeHandler::GetDisplayMenuMessageID() const
+{
+	return this->mDisplayMenuMessageID;
+}
+
+bool AvHCommanderModeHandler::GetDefaultOrderPosition(float& outWorldX, float& outWorldY) const
+{
+	bool theSuccess = false;
+	
+	if(this->mHasDefaultOrderPosition)
+	{
+		outWorldX = this->mDefaultOrderWorldX;
+		outWorldY = this->mDefaultOrderWorldY;
+		theSuccess = true;
+	}
+	
+	return theSuccess;
+}
+
+bool AvHCommanderModeHandler::GetMoveToWorldPosition(float& outWorldX, float& outWorldY) const
+{
+	bool theSuccess = false;
+	
+	if(this->mHasMoveToPosition)
+	{
+		outWorldX = this->mMoveToWorldX;
+		outWorldY = this->mMoveToWorldY;
+		theSuccess = true;
+	}
+	
+	return theSuccess;
+	
+}
+
+bool AvHCommanderModeHandler::GetMouseOneDown() const
+{
+	return this->mMouseOneDown;
+}
+
+string AvHCommanderModeHandler::GetBuildResearchText() const
+{
+	return this->mBuildResearchText;
+}
+
+string AvHCommanderModeHandler::GetTechHelpText() const
+{
+	return this->mTechHelpText;
+}
+
+AvHMessageID AvHCommanderModeHandler::HotKeyHit(char inChar)
+{
+	AvHMessageID theMessageID = MESSAGE_NULL;
+
+	// Map hotkey to index
+	int theCol, theRow;
+	if(AvHActionButtons::HotKeyToButtonIndex(inChar, theCol, theRow))
+	{
+		AvHActionButtons* theActionButtons = NULL;
+		if(gHUD.GetManager().GetVGUIComponentNamed(kActionButtonsComponents, theActionButtons))
+		{
+			//ActionButton* theActionButton = theActionButtons->GetActionButtonWithHotKey(inChar);
+			ActionButton* theActionButton = theActionButtons->GetActionButtonAtPos(theCol, theRow);
+			if(theActionButton)
+			{
+				this->ActionButtonActivated(theActionButton);
+				theMessageID = theActionButton->GetMessageID();
+			}
+		}
+	}
+
+	return theMessageID;
+}
+
+void AvHCommanderModeHandler::DefaultOrderToLastMousePosition(AvHTeamHierarchy* inHierarchy)
+{
+	ASSERT(inHierarchy);
+	inHierarchy->GetWorldPosFromMouse(this->mLastMouseX, this->mLastMouseY, this->mDefaultOrderWorldX, this->mDefaultOrderWorldY);
+	this->mHasDefaultOrderPosition = true;
+}
+
+void AvHCommanderModeHandler::MoveToLastMousePosition(AvHTeamHierarchy* inHierarchy)
+{
+	ASSERT(inHierarchy);
+	inHierarchy->GetWorldPosFromMouse(this->mLastMouseX, this->mLastMouseY, this->mMoveToWorldX, this->mMoveToWorldY);
+	gHUD.GetOverviewMap().SetWorldPosition(this->mMoveToWorldX, this->mMoveToWorldY);
+	this->mHasMoveToPosition = true;
+}
+
+// Look at currently selected units and set our help text.  This is only used for research currently
+void AvHCommanderModeHandler::RecalculateBuildResearchText()
+{
+	this->mBuildResearchText = "";
+
+	if(this->mSelected.size() == 1)
+	{
+		// Get entity
+		int theEntityIndex = *this->mSelected.begin();
+		cl_entity_s* theEntity = gEngfuncs.GetEntityByIndex(theEntityIndex);
+		if(theEntity)
+		{
+			bool theIsBuilding, theIsResearching;
+			float thePercentage;
+			string theHelpPrefix;
+
+			AvHSHUGetBuildResearchState(theEntity->curstate.iuser3, theEntity->curstate.iuser4, theEntity->curstate.fuser1, theIsBuilding, theIsResearching, thePercentage);
+
+			// Special-case for energy
+			if(theIsBuilding && theIsResearching && (thePercentage > 0.0f))
+			{
+				LocalizeString(kEnergyPrefix, theHelpPrefix);
+			
+				// Read energy
+				int theEnergy = thePercentage*kMarineStructureMaxEnergy;
+				this->mBuildResearchText = theHelpPrefix + string(" ") + MakeStringFromInt(theEnergy);
+			}
+			// Check if it's recycling
+			else if(!theIsBuilding && theIsResearching && GetHasUpgrade(theEntity->curstate.iuser4, MASK_RECYCLING))
+			{
+				LocalizeString("Recycling", this->mBuildResearchText);
+			}
+			// Check to see if it's being built
+			else if((theIsBuilding || theIsResearching) && (thePercentage < 1.0f))
+			{
+				if(theIsBuilding)
+				{
+					// Set help text to "Building: <tech name>"
+					LocalizeString(kBuildingPrefix, theHelpPrefix);
+				}
+				else if(theIsResearching)
+				{
+					// Set help text to "Researching: <tech name>"
+					LocalizeString(kResearchingPrefix, theHelpPrefix);
+				}
+				
+				string theHelpText;
+				AvHMessageID theResearchID = (AvHMessageID)(theEntity->curstate.iuser2);
+				if(theResearchID != MESSAGE_NULL)
+				{
+					if(ActionButton::GetLabelForMessage(theResearchID, theHelpText))
+					{
+						string theFinalMessage = theHelpPrefix + theHelpText;
+						this->mBuildResearchText = theFinalMessage;
+					}
+				}
+			}
+			else
+			{
+				if(GetHasUpgrade(theEntity->curstate.iuser4, MASK_BUILDABLE))
+				{
+					// Look up name for entity and show it
+					AvHMessageID theResearchID = (AvHMessageID)(theEntity->curstate.iuser2);
+					if(theResearchID != MESSAGE_NULL)
+					{
+						ActionButton::GetLabelForMessage(theResearchID, this->mBuildResearchText);
+					}
+				}
+				// If we have a resource selected, set the resource level
+				else if(theEntity->curstate.iuser3 == AVH_USER3_FUNC_RESOURCE)
+				{
+					int theResources = (int)(theEntity->curstate.fuser1/kNormalizationNetworkFactor);
+					if(theResources > 0)
+					{
+						if(LocalizeString(kResourcesTitle, this->mBuildResearchText))
+						{
+							char theResourceMessage[64];
+							sprintf(theResourceMessage, "%d", theResources);
+							this->mBuildResearchText += string(theResourceMessage);
+						}
+					}
+					else
+					{
+						LocalizeString(kResourcesDepletedTitle, this->mBuildResearchText);
+					}
+				}
+				else if(theEntity->curstate.iuser3 == AVH_USER3_INFANTRYPORTAL)
+				{
+//					int the = (int)(theEntity->curstate.fuser1/kNormalizationNetworkFactor);
+//					if(theResources > 0)
+//					{
+						if(LocalizeString(kReinforcementsTitle, this->mBuildResearchText))
+						{
+							// TODO: Read this number correctly
+							//char theMessage[64];
+							//sprintf(theMessage, "%d", 100);
+							//this->mBuildResearchText += string(theMessage);
+						}
+//					}
+//					else
+//					{
+//						LocalizeString(kResourcesDepletedTitle, this->mBuildResearchText);
+//					}
+				}
+			}
+		}
+	}
+}
+
+// Player isn't commanding, make sure UI is reset
+void AvHCommanderModeHandler::Reset()
+{
+	//EntityListType theEmptySelection;
+	//this->SetSelectedUnits(theEmptySelection);
+
+	this->Init();
+
+	this->RecalculateMenus();
+}
+
+// Look at currently selected units and set up our menus
+void AvHCommanderModeHandler::RecalculateMenus()
+{
+	bool theSuccess = false;
+	int theUser4 = 0;
+	float theFuser1 = 0;
+
+	// If we have only one thing selected, it can be a building
+	int theNumUnits = this->mSelected.size();
+	if(theNumUnits > 0)
+	{
+		// Assumes all of selected is of same type
+		int theIndex = *this->mSelected.begin();
+		cl_entity_s* theEntity = gEngfuncs.GetEntityByIndex(theIndex);
+		if(theEntity)
+		{
+			// Display icons for this type of structure
+			AvHUser3 theUser3 = (AvHUser3)(theEntity->curstate.iuser3);
+			
+			if((theUser3 == AVH_USER3_MARINE_PLAYER) || GetHasUpgrade(theEntity->curstate.iuser4, MASK_RECYCLING))
+			{
+				// Set to base marine menu if current isn't compatible with it
+				switch(this->mDisplayMenu)
+				{
+				case AVH_USER3_MENU_BUILD:
+				case AVH_USER3_MENU_BUILD_ADVANCED:
+				case AVH_USER3_MENU_ASSIST:
+				case AVH_USER3_MENU_EQUIP:
+					// Do nothing, keep current menu
+					break;
+
+				default:
+					this->mDisplayMenu = AVH_USER3_MENU_BUILD;
+				}
+				theSuccess = true;
+			}
+			else
+			{
+				this->mDisplayMenu = theUser3;
+				theUser4 = theEntity->curstate.iuser4;
+				theFuser1 = theEntity->curstate.fuser1;
+				theSuccess = true;
+			}
+		}
+	}
+
+	// Menu takes precedence over player selection, to allow ordering selected players to construct
+//	else if(this->mDisplayMenu == AVH_USER3_NONE)
+//	{
+//		int theCommonUser4 = 0;
+//		if(this->GetIsSelectionAllPlayers(&theCommonUser4))
+//		{
+//			this->mDisplayMenu = AVH_USER3_COMMANDER_PLAYER;
+//			theUser4 = theCommonUser4;
+//		}
+//	}
+
+	if(this->mDisplayMenu == AVH_USER3_NONE)
+	{
+		this->mDisplayMenu = AVH_USER3_MENU_BUILD;
+	}
+
+	// Recalculate iuser4 for special menu options
+	int theMenuTechSlots = gHUD.GetMenuTechSlots();
+	switch(this->mDisplayMenu)
+	{
+	case AVH_USER3_MENU_BUILD:
+	//case AVH_USER3_COMMANDER_PLAYER:
+		theUser4 = theMenuTechSlots << 3;
+		break;
+	case AVH_USER3_MENU_BUILD_ADVANCED:
+		theUser4 = theMenuTechSlots >> 5;
+		break;
+	case AVH_USER3_MENU_ASSIST:
+		theUser4 = theMenuTechSlots >> 13;
+		break;
+	case AVH_USER3_MENU_EQUIP:
+		theUser4 = theMenuTechSlots >> 21;
+		break;
+	}
+
+	// Show menu according to our current mode and data
+	this->SetMenuFromUserVariables(this->mDisplayMenu, theUser4, theFuser1);
+}
+
+bool AvHCommanderModeHandler::GetIsSelectionAllPlayers(int* outCommonUser4) const
+{
+	bool theSuccess = false;
+
+	if(outCommonUser4)
+	{
+		*outCommonUser4 = 0xFFFFFFFF;
+	}
+
+	for(EntityListType::const_iterator theIter = this->mSelected.begin(); theIter != this->mSelected.end(); theIter++)
+	{
+		theSuccess = true;
+
+		// Lookup class name for player
+//		string theClassName;
+//		if(this->LookupClassNameForEntity(*theIter, theClassName))
+//		{
+//			if(theClassName != kAvHPlayerClassName)
+//			{
+		cl_entity_s* theEntity = gEngfuncs.GetEntityByIndex(*theIter);
+		if(!theEntity || (((AvHUser3)theEntity->curstate.iuser3) != AVH_USER3_MARINE_PLAYER))
+		{
+			theSuccess = false;
+			break;
+		}
+
+		// AND all the user4's together to see what actions are applicable to this group (may not be used)
+		if(theEntity && outCommonUser4)
+		{
+			*outCommonUser4 &= theEntity->curstate.iuser4;
+		}
+	}
+
+	return theSuccess;
+}
+
+void AvHCommanderModeHandler::SetSelectedUnits(const EntityListType& inUnits)
+{
+	this->mSelected = inUnits;
+
+//	if(this->mSelected.size() > 0)
+//	{
+//		this->mDisplayMenu = AVH_USER3_NONE;
+//	}
+
+	this->RecalculateMenus();
+}
+
+void AvHCommanderModeHandler::SetResearchingMenu()
+{
+	AvHActionButtons* theActionButtons = NULL;
+	if(gHUD.GetManager().GetVGUIComponentNamed(kActionButtonsComponents, theActionButtons))
+	{
+		theActionButtons->ClearButtons();
+
+		theActionButtons->SetButton(0, MENU_BUILD);
+		theActionButtons->SetButton(1, MENU_BUILD_ADVANCED);
+		theActionButtons->SetButton(2, MENU_ASSIST);
+		theActionButtons->SetButton(3, MENU_EQUIP);
+
+		theActionButtons->SetButton(kNumTechSlots - 1, MESSAGE_CANCEL);
+
+		theActionButtons->Localize();
+	}
+}
+
+bool AvHCommanderModeHandler::SetMenuFromUserVariables(int inUser3, int inUser4, float inFuser1)
+{
+	bool theSuccess = false;
+
+	AvHTechSlots theTechSlots;
+	if(gHUD.GetTechSlotManager().GetTechSlotList((AvHUser3)inUser3, theTechSlots))
+	{
+		this->SetMenuFromTechSlots(theTechSlots, inUser3, inUser4, inFuser1);
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+void AvHCommanderModeHandler::SetMenuFromTechSlots(const AvHTechSlots& inTechSlots, int inUser3, int inUser4, float inFuser1)
+{
+	AvHActionButtons* theActionButtons = NULL;
+	if(gHUD.GetManager().GetVGUIComponentNamed(kActionButtonsComponents, theActionButtons))
+	{
+		//string theNotFullyBuiltText;
+		//if(LocalizeString(kNotFullyBuilt, theNotFullyBuiltText))
+
+		theActionButtons->ClearButtons();
+
+		bool theIsBuilding, theIsResearching;
+		float thePercentage;
+		AvHSHUGetBuildResearchState(inUser3, inUser4, inFuser1, theIsBuilding, theIsResearching, thePercentage);
+
+		bool theDisplayingSpecialMenu = false;
+		switch(inUser3)
+		{
+		case AVH_USER3_MENU_BUILD:
+		case AVH_USER3_MENU_BUILD_ADVANCED:
+		case AVH_USER3_MENU_ASSIST:
+		case AVH_USER3_MENU_EQUIP:
+			theDisplayingSpecialMenu = true;
+			break;
+		}
+
+		// if recycling, draw nothing (check if something is selected, as otherwise inUser3 could be MENU_ something and MASK_RECYCLING won't make sense)
+		if(!theDisplayingSpecialMenu && (this->mSelected.size() > 0) && GetHasUpgrade(inUser4, MASK_RECYCLING))
+		{
+			int a = 0;
+		}
+		// else if we're placing a building or researching, don't display anything but cancel
+		else if((gHUD.GetGhostBuilding() != MESSAGE_NULL) || (theIsResearching && !theIsBuilding))
+		{
+			// Set last button as cancel
+			theActionButtons->SetButton(0, MENU_BUILD);
+			theActionButtons->SetButton(1, MENU_BUILD_ADVANCED);
+			theActionButtons->SetButton(2, MENU_ASSIST);
+			theActionButtons->SetButton(3, MENU_EQUIP);
+
+			theActionButtons->SetButton(kNumActionButtonRows*kNumActionButtonCols - 1, MESSAGE_CANCEL);
+		}
+		// else use the menu the server specifies
+		else
+		{
+			// Set hard-coded top bar
+			theActionButtons->SetButton(0, MENU_BUILD);
+			theActionButtons->SetButton(1, MENU_BUILD_ADVANCED);
+			theActionButtons->SetButton(2, MENU_ASSIST);
+			theActionButtons->SetButton(3, MENU_EQUIP);
+			
+			const int kBaseButtonIndex = 4;
+
+			// else, query for rest of state
+			for(int i=0; i < kNumTechSlots; i++)
+			{
+				AvHMessageID theMessageID = inTechSlots.mTechSlots[i];
+				if(theMessageID != MESSAGE_NULL)
+				{
+					int theCurrentButtonIndex = kBaseButtonIndex + i;
+					theActionButtons->SetButton(theCurrentButtonIndex, theMessageID);
+			
+					// Now set it's enabled state generically
+					bool theEnabledState = AvHGetTechSlotEnabled(i, inUser4);
+					theActionButtons->SetEnabledState(theCurrentButtonIndex, theEnabledState);
+				}
+			}
+		}
+
+		theActionButtons->Localize();
+	}
+}
+
+bool AvHCommanderModeHandler::GetIsPointInPanel(Panel* inPanel, int x, int y) const
+{
+
+    int theWidth;
+    int theHeight;
+
+    inPanel->getSize(theWidth, theHeight);
+
+    return (x >= 0 && y >= 0 && x < theWidth && y < theHeight);
+
+}
+
+void AvHCommanderModeHandler::Update(const AvHTechNodes& inTechNodes, int inNumPoints)
+{
+	AvHActionButtons* theActionButtons = NULL;
+	if(gHUD.GetManager().GetVGUIComponentNamed(kActionButtonsComponents, theActionButtons))
+	{
+		theActionButtons->SetTechNodes(inTechNodes);
+		theActionButtons->SetResources(inNumPoints);
+
+		int theEnergy = 0;
+		if(this->mSelected.size() > 0)
+		{
+			int theEntityIndex = *this->mSelected.begin();
+			cl_entity_s* theEntity = gEngfuncs.GetEntityByIndex(theEntityIndex);
+			if(theEntity)
+			{
+				bool theIsBuilding, theIsResearching;
+				float thePercentage;
+				string theHelpPrefix;
+				
+				AvHSHUGetBuildResearchState(theEntity->curstate.iuser3, theEntity->curstate.iuser4, theEntity->curstate.fuser1, theIsBuilding, theIsResearching, thePercentage);
+				
+				// Special-case for energy
+				if(theIsBuilding && theIsResearching && (thePercentage > 0.0f))
+				{
+					// Read energy
+					theEnergy = thePercentage*kMarineStructureMaxEnergy;
+				}
+			}
+		}
+		theActionButtons->SetEnergy(theEnergy);
+
+		theActionButtons->UpdateEnabledState();
+		
+		// Enable tech buttons
+		theActionButtons->SetBusy(false);
+
+		theActionButtons->UpdateEnabledAndResearchState();
+
+		// Update prereqs and things, they could've changed if research just completed
+		theActionButtons->Localize();
+		
+		// Look at the current selection
+//		if(this->mSelected.size() > 0)
+//		{
+//			int theEntityIndex = *this->mSelected.begin();
+//			cl_entity_s* theEntity = gEngfuncs.GetEntityByIndex(theEntityIndex);
+//			if(theEntity)
+//			{
+//				bool theIsBuilding, theIsResearching;
+//				float thePercentage;
+//				
+//				// If it's building or researching, disable it temporarily
+//				AvHSHUGetBuildResearchState(theEntity->curstate.iuser3, theEntity->curstate.fuser1, theIsBuilding, theIsResearching, thePercentage);
+//				if(theIsResearching)
+//				{
+//					this->SetResearchingMenu();
+//				}
+//				else if(theIsBuilding)
+//				{
+//					this->SetBaseMenu();
+//				}
+//				//theActionButtons->SetBusy(true);
+//			}
+//		}
+		this->RecalculateMenus();
+	}
+}
+
+void AvHCommanderModeHandler::cursorMoved(int x, int y, Panel* inPanel)
+{
+	
+    bool theFoundTechNode = false;
+
+//	char theDebugString[128];
+//	sprintf(theDebugString, "norm X/Y: %f, %f", (float)x/ScreenWidth, (float)y/ScreenHeight);
+//	CenterPrint(theDebugString);
+
+	this->mLastMouseX = x;
+	this->mLastMouseY = y;
+
+	// Show help text for every research node
+//	AvHTechButtons* theTechButtons = dynamic_cast<AvHTechButtons*>(inPanel);
+//	if(theTechButtons)
+//	{
+//		AvHTechNode theTechNode;
+//		if(theTechButtons->GetTechNodeAtPos(x, y, theTechNode))
+//		{
+//			this->mTechHelpText = theTechNode.GetHelpText();
+//			theFoundTechNode = true;
+//
+//			this->mLastTechNodeMouseX = x;
+//			this->mLastTechNodeMouseY = y;
+//		}
+//	}
+
+    if (!gHUD.GetIsSelecting())
+    {
+
+	    ActionButton* theActionButton = dynamic_cast<ActionButton*>(inPanel);
+
+	    if(theActionButton)
+	    {
+		
+            // We don't get proper exit notification when we've got the mouse captured
+            // so generate it every mouse move.
+
+            if (GetIsPointInPanel(inPanel, x, y))
+            {
+                theActionButton->cursorEntered();
+            }
+            else
+            {
+                theActionButton->cursorExited();
+            }
+            
+            this->mTechHelpText = theActionButton->GetHelpText();
+		    this->mLastTechNodeMouseX = x;
+		    this->mLastTechNodeMouseY = y;
+		    theFoundTechNode = true;
+
+	    }
+	    else
+	    {
+		    // Clear help text otherwise
+		    this->mTechHelpText = "";
+	    }
+
+	    AvHTeamHierarchy* theHierarchy = dynamic_cast<AvHTeamHierarchy*>(inPanel);
+	    if(theHierarchy)
+	    {
+		    if(this->mMouseOneDown)
+		    {
+			    //theHierarchy->setAsMouseArena(true);
+			    this->MoveToLastMousePosition(theHierarchy);
+		    }
+	    }
+    
+    }
+	
+	//	// Clear help text otherwise
+	//	if(!theFoundTechNode)
+	//	{
+	//		this->mTechHelpText = "";
+	//	}
+}
+
+void AvHCommanderModeHandler::cursorEntered(Panel* inPanel)
+{
+
+    if (!gHUD.GetIsSelecting())
+    {
+
+	    ActionButton* theActionButton = dynamic_cast<ActionButton*>(inPanel);
+	    if(theActionButton)
+	    {
+		    theActionButton->cursorEntered();
+	    }
+    
+    }
+
+}
+
+void AvHCommanderModeHandler::cursorExited(Panel* inPanel)
+{
+
+    if (!gHUD.GetIsSelecting())
+    {
+
+	    ActionButton* theActionButton = dynamic_cast<ActionButton*>(inPanel);
+	    if(theActionButton)
+	    {
+		    theActionButton->cursorExited();
+	    }
+    
+    }
+
+}
+
+void AvHCommanderModeHandler::mousePressed(MouseCode code, Panel* inPanel)
+{
+
+    // Capture the mouse input so that we receive the mouseRelease event even
+    // if the cursor is no longer on the panel.
+    App::getInstance()->setMouseCapture(inPanel);
+
+	if(code == MOUSE_LEFT)
+	{
+		this->mMouseOneDown = true;
+
+		AvHTeamHierarchy* theHierarchy = dynamic_cast<AvHTeamHierarchy*>(inPanel);
+		if(theHierarchy)
+		{
+			this->MoveToLastMousePosition(theHierarchy);
+		}
+
+		// Remember which component the mouse clicked so we don't allow any old mouse up
+		if(dynamic_cast<ActionButton*>(inPanel) || dynamic_cast<AvHActionButtons*>(inPanel))
+		{
+			this->mMouseOneDownOnActionButtons = true;
+		}
+		if(dynamic_cast<AvHLogoutComponent*>(inPanel))
+		{
+			this->mMouseOneDownOnLogoutButton = true;
+		}
+
+		AvHTechImpulsePanel* theImpulsePanel = dynamic_cast<AvHTechImpulsePanel*>(inPanel);
+		if(theImpulsePanel)
+		{
+			this->mLastTechPressed = theImpulsePanel->GetMessageID();
+			this->mTechNodePressed = true;
+		}
+	}
+	else if(code == MOUSE_RIGHT)
+	{
+		this->mMouseTwoDown = true;
+
+		AvHTeamHierarchy* theHierarchy = dynamic_cast<AvHTeamHierarchy*>(inPanel);
+		if(theHierarchy)
+		{
+			//this->DefaultOrderToLastMousePosition(theHierarchy);
+		}
+	}
+}
+
+void AvHCommanderModeHandler::mouseDoublePressed(MouseCode code, Panel* inPanel)
+{
+}
+
+void AvHCommanderModeHandler::ActionButtonActivated(ActionButton* inActionButton)
+{
+	if(!inActionButton->GetBusy())
+	{
+		gHUD.PlayHUDSound(HUD_SOUND_SELECT);
+
+		bool theSuccess = false;
+		
+		AvHMessageID theMessageID = inActionButton->GetMessageID();
+		switch(theMessageID)
+		{
+		case MENU_BUILD:
+			this->mDisplayMenu = AVH_USER3_MENU_BUILD;
+			theSuccess = true;
+			break;
+		case MENU_BUILD_ADVANCED:
+			this->mDisplayMenu = AVH_USER3_MENU_BUILD_ADVANCED;
+			theSuccess = true;
+			break;
+		case MENU_ASSIST:
+			this->mDisplayMenu = AVH_USER3_MENU_ASSIST;
+			theSuccess = true;
+			break;
+		case MENU_EQUIP:
+			this->mDisplayMenu = AVH_USER3_MENU_EQUIP;
+			theSuccess = true;
+			break;
+		default:
+			// See if they pressed a button
+			if(inActionButton->GetTechEnabled())
+			{
+				this->mLastTechPressed = theMessageID;
+				this->mTechNodePressed = true;
+			}
+			break;
+		}
+
+		if(theSuccess)
+		{
+			this->mDisplayMenuMessageID = theMessageID;
+
+			// If our selection isn't all players, remove the selection.
+			if(!this->GetIsSelectionAllPlayers())
+			{
+				gHUD.ClearSelection();
+			}
+		}
+	}
+}
+
+void AvHCommanderModeHandler::mouseReleased(MouseCode code, Panel* inPanel)
+{
+
+    App::getInstance()->setMouseCapture(NULL);
+
+    if(code == MOUSE_LEFT)
+	{
+
+        if (GetIsPointInPanel(inPanel, mLastMouseX, mLastMouseY))
+        {
+        
+            ActionButton* theActionButton = dynamic_cast<ActionButton*>(inPanel);
+
+		    if(theActionButton && this->mMouseOneDownOnActionButtons)
+		    {
+			    this->ActionButtonActivated(theActionButton);
+		    }
+		    else if(dynamic_cast<AvHLogoutComponent*>(inPanel) && this->mMouseOneDownOnLogoutButton)
+		    {
+			    if(gHUD.GetUIMode() == MAIN_MODE)
+			    {
+				    ClientCmd(kcStopCommandMode);
+				    this->mDisplayMenu = AVH_USER3_MENU_BUILD;
+				    this->mDisplayMenuMessageID = MENU_BUILD;
+			    }
+		    }
+        
+        }
+
+		this->mMouseOneDown = false;
+		this->mMouseOneDownOnActionButtons = false;
+		this->mMouseOneDownOnLogoutButton = false;
+	}
+	else if(code == MOUSE_RIGHT)
+	{
+		this->mMouseTwoDown = false;
+	}
+}		
+
+void AvHCommanderModeHandler::mouseWheeled(int delta, Panel* inPanel)
+{
+}
+
+void AvHCommanderModeHandler::keyPressed(KeyCode code, Panel* inPanel)
+{
+}
+
+void AvHCommanderModeHandler::keyTyped(KeyCode code, Panel* inPanel)
+{
+}
+
+void AvHCommanderModeHandler::keyReleased(KeyCode code, Panel* inPanel)
+{
+}
+
+void AvHCommanderModeHandler::keyFocusTicked(Panel* inPanel)
+{
+}
diff --git a/main/source/mod/AvHCommanderModeHandler.h b/main/source/mod/AvHCommanderModeHandler.h
new file mode 100644
index 00000000..23909a3f
--- /dev/null
+++ b/main/source/mod/AvHCommanderModeHandler.h
@@ -0,0 +1,131 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHCommanderModeHandler.h $
+// $Date: 2002/10/16 00:50:17 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHCommanderModeHandler.h,v $
+// Revision 1.15  2002/10/16 00:50:17  Flayra
+// - Phase gates can be recycled now
+//
+// Revision 1.14  2002/06/25 17:45:07  Flayra
+// - Renamed some buildings, armory is now upgraded
+//
+// Revision 1.13  2002/06/10 19:51:06  Flayra
+// - New commander UI
+//
+// Revision 1.12  2002/06/03 16:40:24  Flayra
+// - Renamed weapons factory and armory
+//
+// Revision 1.11  2002/05/28 17:37:43  Flayra
+// - Added recycling, added fix for occasional crash when selecting command station with some lag
+//
+// Revision 1.10  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVHCOMMANDERMODEHANDLER_H
+#define AVHCOMMANDERMODEHANDLER_H
+
+#include <VGUI_InputSignal.h>
+#include "types.h"
+#include "mod/AvHTeamHierarchy.h"
+#include "mod/AvHActionButtons.h"
+#include "mod/AvHTechSlotManager.h"
+
+using namespace vgui;
+
+class AvHCommanderModeHandler : public InputSignal
+{
+public:
+					AvHCommanderModeHandler();
+
+			void	ActionButtonActivated(ActionButton* inActionButton);
+			void	CancelHit();
+			void	ClearDefaultOrderPosition();
+			void	ClearMoveToPosition();
+			bool	GetAndClearTechNodePressed(AvHMessageID& outMessageID, bool inClear = true);
+	AvHMessageID	GetDisplayMenuMessageID() const;
+			bool	GetDefaultOrderPosition(float& outWorldX, float& outWorldY) const;
+			bool	GetMoveToWorldPosition(float& outWorldX, float& outWorldY) const;
+			bool	GetMouseOneDown() const;
+			string	GetBuildResearchText() const;
+			string	GetTechHelpText() const;
+	AvHMessageID	HotKeyHit(char inChar);
+			void	RecalculateBuildResearchText();
+			void	Reset();
+			void	SetSelectedUnits(const EntityListType& inUnits);
+			void	Update(const AvHTechNodes& inTechNodes, int inNumPoints);
+
+	virtual void	cursorMoved(int x,int y,Panel* panel);
+	virtual void	cursorEntered(Panel* panel);
+	virtual void	cursorExited(Panel* panel);
+	virtual void	mousePressed(MouseCode code,Panel* panel);
+	virtual void	mouseDoublePressed(MouseCode code,Panel* panel);
+	virtual void	mouseReleased(MouseCode code,Panel* panel);
+	virtual void	mouseWheeled(int delta,Panel* panel);
+	virtual void	keyPressed(KeyCode code,Panel* panel);
+	virtual void	keyTyped(KeyCode code,Panel* panel);
+	virtual void	keyReleased(KeyCode code,Panel* panel);
+	virtual void	keyFocusTicked(Panel* panel);
+
+private:
+	void			Init();
+	void			DefaultOrderToLastMousePosition(AvHTeamHierarchy* inHierarchy);
+	void			MoveToLastMousePosition(AvHTeamHierarchy* inHierarchy);
+	bool			GetIsSelectionAllPlayers(int* outCommonUser4 = NULL) const;
+
+//	bool			LookupClassNameForEntity(int inEntityIndex, string& outClassName) const;
+	void			RecalculateMenus();
+	void			SetResearchingMenu();
+	void			SetBaseMenu(bool inForce = false);
+	
+	void			SetGenericBuildingMenu();
+
+	void			SetMenuFromTechSlots(const AvHTechSlots& inTechSlots, int inUser3, int inUser4, float inFuser1);
+    bool			SetMenuFromUserVariables(int inUser3, int inUser4 = 0, float inFuser1 = 0);
+
+    bool            GetIsPointInPanel(Panel* inPanel, int x, int y) const; // Client space.
+
+	int				mLastTechNodeMouseX;
+	int				mLastTechNodeMouseY;
+
+	int				mLastMouseX;
+	int				mLastMouseY;
+
+	bool			mMouseOneDown;
+	bool			mMouseOneDownOnActionButtons;
+	bool			mMouseOneDownOnLogoutButton;
+
+	bool			mMouseTwoDown;
+
+	bool			mHasMoveToPosition;
+	float			mMoveToWorldX;
+	float			mMoveToWorldY;
+
+	bool			mHasDefaultOrderPosition;
+	float			mDefaultOrderWorldX;
+	float			mDefaultOrderWorldY;
+
+	EntityListType	mSelected;
+
+	//AvHTechNode		mLastTechNodePressed;
+	AvHMessageID	mLastTechPressed;
+	bool			mTechNodePressed;
+
+	string			mTechHelpText;
+	string			mBuildResearchText;
+
+	AvHUser3		mDisplayMenu;
+	AvHMessageID	mDisplayMenuMessageID;
+
+};
+
+#endif
diff --git a/main/source/mod/AvHConsoleCommands.cpp b/main/source/mod/AvHConsoleCommands.cpp
new file mode 100644
index 00000000..83f4eebc
--- /dev/null
+++ b/main/source/mod/AvHConsoleCommands.cpp
@@ -0,0 +1,1706 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHConsoleCommands.cpp$
+// $Date: 2002/11/22 21:28:16 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHConsoleCommands.cpp,v $
+// Revision 1.31  2002/11/22 21:28:16  Flayra
+// - mp_consistency changes
+//
+// Revision 1.30  2002/11/15 04:46:53  Flayra
+// - Utility command
+//
+// Revision 1.29  2002/11/03 04:49:56  Flayra
+// - Team balance fixes
+//
+// Revision 1.28  2002/10/28 20:33:55  Flayra
+// - Added confirmation to auth command
+//
+// Revision 1.27  2002/10/24 21:22:40  Flayra
+// - Commented out adjust score cheat for release (even with cheats on, this is abusive)
+//
+// Revision 1.26  2002/10/20 16:45:19  Flayra
+// - Linux update
+//
+// Revision 1.25  2002/10/20 16:35:46  Flayra
+// - Added hack code to create a fake client to test profiling
+//
+// Revision 1.24  2002/10/18 22:17:12  Flayra
+// - Added redeem cheat
+//
+// Revision 1.23  2002/10/16 00:51:33  Flayra
+// - Added auth command and setauth cheat
+// - Require cheats for some dev commands (oops)
+//
+// Revision 1.22  2002/10/03 18:41:35  Flayra
+// - Allow setskin to work without chets, for testing
+//
+// Revision 1.21  2002/09/23 22:11:46  Flayra
+// - Regular update
+//
+// Revision 1.20  2002/09/09 19:49:25  Flayra
+// - Added deathmessage cheat
+//
+// Revision 1.19  2002/08/16 02:33:32  Flayra
+// - Added endgame cheat to end game for either team (to test endgame music)
+//
+// Revision 1.18  2002/08/09 00:56:11  Flayra
+// - Added "adjustscore" cheat for testing new scoreboard
+//
+// Revision 1.17  2002/08/02 22:01:27  Flayra
+// - Added some new cheats, refactored cheat names, changes for new alert system
+//
+// Revision 1.16  2002/07/10 14:39:24  Flayra
+// - Added "overflow" cheat for debugging
+//
+// Revision 1.15  2002/07/08 16:49:34  Flayra
+// - Unhacked this to fix some random bug
+//
+// Revision 1.14  2002/06/03 16:41:19  Flayra
+// - Added "invul" cheat
+//
+// Revision 1.13  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "build.h"
+#include "util/nowarnings.h"
+#include "extdll.h"
+#include "dlls/util.h"
+#include "cbase.h"
+#include "player.h"
+#include "weapons.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "mod/AvHEntities.h"
+#include "mod/AvHParticleTemplateServer.h"
+#include "mod/AvHPlayer.h"
+#include "dlls/client.h"
+#include "dlls/game.h"
+#include "dlls/util.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHServerVariables.h"
+#include "mod/AvHMessage.h"
+#include "mod/AvHSoundListManager.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHTitles.h"
+#include "mod/AvHParticleSystemManager.h"
+#include "mod/AvHMarineEquipment.h"
+#include "mod/AvHMovementUtil.h"
+#include "mod/AvHSharedUtil.h"
+#include "textrep/TRFactory.h"
+#include "mod/AvHEntities.h"
+#include "mod/AvHScriptManager.h"
+#include "mod/AvHCommandConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include <stdio.h>
+#include "voice_gamemgr.h"
+#include "mod/UPPUtil.h"
+
+extern AvHParticleTemplateListServer	gParticleTemplateList;
+extern int								gmsgEditPS;
+extern int								gmsgListPS;
+//extern int								gmsgNetScreenShot;
+extern int								gmsgDeathMsg;
+extern int								gmsgShowMenu;
+extern CVoiceGameMgr					g_VoiceGameMgr;
+extern int								gCommanderPointsAwardedEventID;
+extern cvar_t							allow_spectators;
+extern cvar_t							avh_tournamentmode;
+#ifdef USE_UPP
+extern cvar_t							avh_uplink;
+#endif
+extern int                              kNumEntsProcessedForPlayerOne;
+
+#ifdef WIN32
+// this is the LINK_ENTITY_TO_CLASS function that creates a player (bot)
+HINSTANCE h_Library = NULL;
+typedef void (*LINK_ENTITY_FUNC)(entvars_t *);
+
+void player( entvars_t *pev )
+{
+	if(!h_Library)
+	{
+		string libName = string(getModDirectory()) + "\\dlls\\ns.dll";
+		h_Library = LoadLibrary(libName.c_str());
+	}
+	   
+	static LINK_ENTITY_FUNC otherClassName = NULL;
+	if (otherClassName == NULL)
+		otherClassName = (LINK_ENTITY_FUNC)GetProcAddress(h_Library, "player");
+	if (otherClassName != NULL)
+	{
+		(*otherClassName)(pev);
+	}
+}
+#endif
+
+//------------------------------------------------------------------
+// begin future MapUtils.h / MapUtils.cpp
+//------------------------------------------------------------------
+typedef std::pair<string,int> EntityInfoNodeType;
+typedef std::map<string,int> EntityInfoMapType;
+typedef std::vector<EntityInfoNodeType> EntityInfoVectorType;
+
+bool EntityInfoSortFunction(const EntityInfoNodeType& left,const EntityInfoNodeType& right)
+{
+	if(left.second > right.second)
+	{ return true; }
+	if(left.first.compare(right.first) < 0)
+	{ return true; }
+	return false;
+}
+
+bool EntityInfoShouldCount(const string& inClassName)
+{
+	bool theShouldCount = true;
+	if(inClassName.empty()) // unassigned player slot
+	{
+		theShouldCount = false;
+	}
+	else if(inClassName.compare(0,7,"weapon_") == 0)
+	{
+		theShouldCount = false;
+	}
+	else if(inClassName.compare("bodyque") == 0)
+	{
+		theShouldCount = false;
+	}
+	else if(inClassName.compare("player") == 0)
+	{
+		theShouldCount = false;
+	}
+	return theShouldCount;
+}
+
+EntityInfoVectorType EntityInfoGetVector(void)
+{
+	EntityInfoMapType theMap;
+	const char* theClassName;
+	string theClassNameString;
+
+	for(int index = 0; index < gpGlobals->maxEntities; ++index)
+	{
+		edict_t* theEdict = INDEXENT(index);
+		if(!FNullEnt(theEdict))
+		{
+			theClassName = STRING(theEdict->v.classname);
+			if(theClassName)
+			{
+				++theMap[string(theClassName)]; 
+			}
+		}
+	}
+
+	EntityInfoVectorType theVector;
+
+	EntityInfoMapType::iterator end = theMap.end();
+	for(EntityInfoMapType::iterator current = theMap.begin(); current != end; ++current)
+	{
+		if(EntityInfoShouldCount(current->first))
+		{
+			theVector.push_back(EntityInfoNodeType(current->first,current->second));
+		}
+	}
+
+	//sort it
+	sort(theVector.begin(),theVector.end(),EntityInfoSortFunction);
+
+	return theVector;
+}
+
+int EntityInfoGetCount()
+{
+	int theCount = 0;
+	EntityInfoVectorType theVector = EntityInfoGetVector();
+	EntityInfoVectorType::iterator end = theVector.end();
+	for(EntityInfoVectorType::iterator current = theVector.begin(); current != end; ++current)
+	{
+		theCount += current->second;
+	}
+	return theCount;
+}
+//------------------------------------------------------------------
+// end future MapUtils.h / MapUtils.cpp
+//------------------------------------------------------------------
+
+
+void ReportPlayer(CBasePlayer* inPlayer, const char* inCommand)
+{
+	#ifdef AVH_PLAYTEST_BUILD
+
+	// Tell the server that this player executed x message
+	char* theMessage = UTIL_VarArgs("%s initiated command \"%s\"\n", STRING(inPlayer->pev->netname), inCommand);
+	UTIL_ClientPrintAll(HUD_PRINTNOTIFY, theMessage);
+	UTIL_LogPrintf(theMessage);
+
+	#endif
+}
+
+BOOL AvHGamerules::ClientCommand( CBasePlayer *pPlayer, const char *pcmd )
+{
+	AvHPlayer*	theAvHPlayer = dynamic_cast<AvHPlayer*>(pPlayer);
+	AvHTeam*	theTeam = NULL;
+	bool		theSuccess = false;
+	bool		theIsDeveloper = false;
+	bool		theIsGuide = false;
+	bool		theIsServerOp = false;
+	bool		theIsPlaytester = false;
+	bool		theIsPlayerHelper = false;
+	bool		theIsPlaytest = false;
+	bool		theReportPlayer = false;
+	bool		theIsDedicatedServer = false;
+	bool		theIsDebug = false;
+
+	#ifdef DEBUG
+	theIsDebug = true;
+	#endif
+
+	if(theAvHPlayer)
+	{
+		theTeam = theAvHPlayer->GetTeamPointer();
+		theIsDeveloper = (theAvHPlayer->GetAuthenticationMask() & PLAYERAUTH_DEVELOPER);
+		theIsGuide = theAvHPlayer->GetAuthenticationMask() & PLAYERAUTH_GUIDE;
+		theIsPlaytester = theAvHPlayer->GetAuthenticationMask() & PLAYERAUTH_PLAYTESTER;
+				
+		theIsPlayerHelper = theIsDeveloper || theIsGuide || theIsPlaytester;
+
+		#ifdef AVH_PLAYTEST_BUILD
+		theIsPlaytest = (theAvHPlayer->GetAuthenticationMask() & PLAYERAUTH_PLAYTESTER) || (theAvHPlayer->GetAuthenticationMask() & PLAYERAUTH_VETERAN) || theIsDeveloper;
+		#endif
+
+		#ifdef AVH_LAN_PLAYTEST_BUILD
+		theIsPlaytest = true;
+		#endif
+
+		#ifdef DEBUG
+		#ifndef	AVH_EXTERNAL_BUILD
+		theIsDeveloper = true;
+		theIsServerOp = true;
+		#endif
+		#endif
+	}
+	else
+	{
+		theIsDedicatedServer = true;
+	}
+
+	if(!theAvHPlayer || (theAvHPlayer->GetAuthenticationMask() & PLAYERAUTH_SERVEROP))
+	{
+		theIsServerOp = true;
+	}
+
+	if(g_VoiceGameMgr.ClientCommand(pPlayer, pcmd))
+	{
+		theSuccess = true;
+	}
+	else if ( FStrEq( pcmd, kcJoinTeamOne ) )
+	{
+		if(theAvHPlayer)
+		{
+			this->AttemptToJoinTeam(theAvHPlayer, TEAM_ONE, true);
+			theSuccess = true;
+		}
+	}
+	else if ( FStrEq( pcmd, kcJoinTeamTwo ) )
+	{
+		if(theAvHPlayer)
+		{
+			this->AttemptToJoinTeam(theAvHPlayer, TEAM_TWO, true);
+			theSuccess = true;
+		}
+	}
+	else if ( FStrEq( pcmd, kcAutoAssign ) )
+	{
+		if(theAvHPlayer)
+		{
+			this->AutoAssignPlayer(theAvHPlayer);
+			theSuccess = true;
+		}
+	}
+	else if ( FStrEq( pcmd, kcReadyRoom ) )
+	{
+		if(theAvHPlayer)
+		{
+			if(!(theAvHPlayer->pev->flags & FL_FAKECLIENT))
+			{
+				if(!theAvHPlayer->GetIsBeingDigested())
+				{
+					theAvHPlayer->SetPlayMode(PLAYMODE_READYROOM, true);
+				}
+
+				theSuccess = true;
+			}
+		}
+		theSuccess = true;
+	}
+	else if (FStrEq(pcmd, kcStartGame))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			this->SetGameStarted(true);
+		}
+		theSuccess = true;
+	}
+	else if(FStrEq(pcmd, kcSwitch))
+	{
+		if(this->GetCheatsEnabled() || theIsPlaytest)
+		{
+			AvHTeamNumber thePlayerTeam = theAvHPlayer->GetTeam();
+			if(thePlayerTeam != TEAM_IND)
+			{
+				ReportPlayer(theAvHPlayer, kcSwitch);
+
+				// Get other team
+				AvHTeamNumber theOtherTeamNumber = (thePlayerTeam == TEAM_ONE) ? TEAM_TWO : TEAM_ONE;
+				
+				// Remember current position, add a little for good measure
+				Vector theCurrentPosition = theAvHPlayer->pev->origin;
+				theCurrentPosition.z += 30;
+
+				Vector theCurrentAngles = theAvHPlayer->pev->angles;
+
+				// Switch teams
+				theAvHPlayer->SetPlayMode(PLAYMODE_READYROOM, true);
+				this->AttemptToJoinTeam(theAvHPlayer, theOtherTeamNumber, false);
+
+				// Set our position again
+				theAvHPlayer->pev->origin = theCurrentPosition;
+				theAvHPlayer->pev->angles = theCurrentAngles;
+				theAvHPlayer->pev->fixangle = 1;
+			}
+
+			theSuccess = true;
+		}
+	}
+	else if(FStrEq(pcmd, "givexp"))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theAvHPlayer->GetSpectatingEntity());
+			if(!thePlayer)
+			{
+				thePlayer = theAvHPlayer;
+			}
+
+			if(thePlayer && thePlayer->GetIsRelevant())
+			{
+				int theTargetLevel = 1;
+
+				int theNumArgs = CMD_ARGC();
+				if(theNumArgs == 2)
+				{
+					sscanf(CMD_ARGV(1), "%d", &theTargetLevel);
+				}
+
+				GetGameRules()->AwardExperience(thePlayer, theTargetLevel);
+
+				theSuccess = true;
+			}
+		}
+	}
+	else if(FStrEq(pcmd, kcRestartRound) || FStrEq(pcmd, kcRestart))
+	{
+		if(!theAvHPlayer || theIsServerOp || theIsPlaytest || theIsDedicatedServer || theIsDebug || this->GetCheatsEnabled())
+		{
+            if(theAvHPlayer)
+            {
+                ReportPlayer(theAvHPlayer, pcmd);
+            }
+
+			// Reset game world
+			this->ResetGame(true);
+		}
+		theSuccess = true;
+	}
+	#ifdef USE_UPP
+	else if(FStrEq(pcmd, kcUPPPing))
+	{
+		if(theIsDeveloper)
+		{
+			UPP::requestConnectionSpeedTest();
+		}
+		theSuccess = true;
+	}
+	else if(FStrEq(pcmd, kcUPPToggleProfiling))
+	{
+		if(theIsDeveloper)
+		{
+			UPP::setGeneratePerformanceData(!UPP::getGeneratePerformanceData());
+			if(UPP::getGeneratePerformanceData())
+			{
+				UTIL_SayText("UPP Profiling is now ON", theAvHPlayer);
+			}
+			else
+			{
+				UTIL_SayText("UPP Profiling is now OFF", theAvHPlayer);
+			}
+		}
+		theSuccess = true;
+	}
+	#endif
+	#ifdef AVH_PLAYTEST_BUILD
+	# ifndef USE_UPP
+	else if(FStrEq(pcmd, kcForceUplink))
+	{
+		if(theIsDeveloper || theIsDedicatedServer)
+		{
+			this->InitializeAuthentication();
+			UTIL_SayText("Initialized authentication.", theAvHPlayer);
+		}
+		theSuccess = true;
+	}
+	# endif
+	else if(FStrEq(pcmd, kcTournyMode))
+	{
+		if(theIsPlaytest)
+		{
+			char theCommand[128];
+			sprintf(theCommand, "%s %d\n", kvTournamentMode, !((int)avh_tournamentmode.value));
+			SERVER_COMMAND(theCommand);
+			
+			theSuccess = true;
+		}
+	}
+	else if(FStrEq(pcmd, kcSetBalanceVar))
+	{
+		if(theIsDeveloper)
+		{
+			bool theChangedValue = false;
+
+			// Read variable name then value
+			char theVariableName[1024];
+			if(sscanf(CMD_ARGV(1), "%s", theVariableName) == 1)
+			{
+				float theNewValue = 0.0f;
+				if(sscanf(CMD_ARGV(2), "%f", &theNewValue) == 1)
+				{
+					float theOldValue;
+					bool theMadeFloatChange = false;
+					
+					// Search through ints then floats
+					for(BalanceIntListType::iterator theIter = this->mBalanceInts.begin(); theIter != this->mBalanceInts.end(); theIter++)
+					{
+						string theComparison(theIter->first);
+						if(theComparison == string(theVariableName))
+						{
+							theOldValue = theIter->second;
+							theNewValue = (int)theNewValue;
+							theIter->second = theNewValue;
+							theChangedValue = true;
+							break;
+						}
+					}
+					
+					if(!theChangedValue)
+					{
+						for(BalanceFloatListType::iterator theIter = this->mBalanceFloats.begin(); theIter != this->mBalanceFloats.end(); theIter++)
+						{
+							if(theIter->first == string(theVariableName))
+							{
+								theOldValue = theIter->second;
+								theIter->second = theNewValue;
+								theChangedValue = true;
+								theMadeFloatChange = true;
+								break;
+							}
+						}
+					}
+
+					if(theChangedValue)
+					{
+						string theTimeDateString = AvHSHUGetTimeDateString();
+						string theVerb = (theNewValue > theOldValue) ? "increased" : "lowered";
+						const char* theNumberFormat = theMadeFloatChange ? "%.2f" : "%d";
+						const char* thePlayerCStrName = STRING(theAvHPlayer->pev->netname);
+						string theFormatString = string("Balance change: \"%s\" %s from ") + string(theNumberFormat) + string(" to ") + string(theNumberFormat) + string(" by %s <") + theTimeDateString + string(">.\n");
+
+						char theMessage[1024];
+						if(theMadeFloatChange)
+						{
+							sprintf(theMessage, theFormatString.c_str(), theVariableName, theVerb.c_str(), theOldValue, theNewValue, thePlayerCStrName);
+						}
+						else
+						{
+							sprintf(theMessage, theFormatString.c_str(), theVariableName, theVerb.c_str(), (int)theOldValue, (int)theNewValue, thePlayerCStrName);
+						}
+
+						UTIL_SayTextAll(theMessage, theAvHPlayer);
+
+						// Log balance change
+						ALERT(at_logged, theMessage);
+
+						this->BalanceChanged();
+
+						// Save data
+						this->RecordBalanceData();
+					}
+				}
+			}
+
+			if(!theChangedValue)
+			{
+				char theMessage[1024];
+				sprintf(theMessage, "SetBalanceVar command not understood.\n");
+				UTIL_SayTextAll(theMessage, theAvHPlayer);
+			}
+
+			theSuccess = true;
+		}
+	}
+	#endif
+	else if(FStrEq(pcmd, kcNSChangeLevel))
+	{
+		if(theIsServerOp || theIsPlaytest)
+		{
+			char theLevelName[1024];
+			if(sscanf(CMD_ARGV(1), "%s", theLevelName) == 1)
+			{
+				ReportPlayer(theAvHPlayer, pcmd);
+				CHANGE_LEVEL(theLevelName, NULL );
+			}
+			else
+			{
+				UTIL_SayText("Usage: changelevel <mapname>", theAvHPlayer);
+			}
+		}
+		else
+		{
+			UTIL_SayText("You're not authorized to changelevel.", theAvHPlayer);
+		}
+
+		theSuccess = true;
+	}
+	else if (FStrEq(pcmd, kcTestEvent))
+	{
+		if(theAvHPlayer && this->GetCheatsEnabled())
+		{
+			vec3_t theOrigin = theAvHPlayer->pev->origin;
+			theOrigin.z -= 500;
+			int theFlags = 0;//FEV_GLOBAL;// | FEV_HOSTONLY;
+			PLAYBACK_EVENT_FULL(theFlags, theAvHPlayer->edict(), gCommanderPointsAwardedEventID, 0, theOrigin, (float *)&g_vecZero, 0.0, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+			theSuccess = true;
+		}
+	}
+	else if (FStrEq(pcmd, kcGetNumPlayers))
+	{
+		if(theAvHPlayer && this->GetCheatsEnabled())
+		{
+			int theNumPlayers = GetGameRules()->GetNumberOfPlayers();
+			char theMessage[128];
+			sprintf(theMessage, "Num players: %d\n", theNumPlayers);
+			UTIL_SayText(theMessage, theAvHPlayer);
+			theSuccess = true;
+		}
+	}
+	else if (FStrEq(pcmd, kcAddCat))
+	{
+		if(theAvHPlayer && (this->GetCheatsEnabled() || theIsPlaytest))
+		{
+			AvHTeam* theTeam = theAvHPlayer->GetTeamPointer();
+			if(theTeam && (theTeam->GetTeamType() == AVH_CLASS_TYPE_ALIEN))
+			{
+				ReportPlayer(theAvHPlayer, pcmd);
+
+				int theCategory = 0;
+				sscanf(CMD_ARGV(1), "%d", &theCategory);
+				AvHAlienUpgradeCategory theUpgradeCategory = AvHAlienUpgradeCategory(theCategory);
+				
+				theTeam->AddTeamUpgrade(theUpgradeCategory);
+				
+				theSuccess = true;
+			}
+		}
+	}
+	else if (FStrEq(pcmd, kcSendMessage))
+	{
+		if(theAvHPlayer)
+		{
+			if(this->GetCheatsEnabled())
+			{
+				if(CMD_ARGC() >= 3)
+				{
+					char theTooltipText[512];
+					sscanf(CMD_ARGV(1), "%s", theTooltipText);
+					
+					int theMode = 0;
+					sscanf(CMD_ARGV(2), "%d", &theMode);
+
+					if(theMode == 0)
+					{
+						UTIL_ShowMessage(theTooltipText, theAvHPlayer);
+					}
+					else if(theMode == 1)
+					{
+						UTIL_Error(theAvHPlayer, theTooltipText);
+					}
+					else
+					{
+						bool theIsToolTip = (theMode == 2);
+
+						theAvHPlayer->SendMessage(theTooltipText, theIsToolTip);
+					}
+					
+					theSuccess = true;
+				}
+			}
+		}
+	}
+	else if (FStrEq(pcmd, kcTooltip))
+	{
+		if(theAvHPlayer && theIsPlayerHelper)
+		{
+			char thePlayerName[512];
+			sscanf(CMD_ARGV(1), "%s", thePlayerName);
+
+			// Read first word as target player
+			AvHPlayer* theTargetPlayer = NULL;
+
+			FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+				const char* thePlayerCStrName = STRING(theEntity->pev->netname);
+				if(!strcmp(thePlayerCStrName, thePlayerName))
+				{
+					theTargetPlayer = theEntity;
+				}
+			END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+			
+			if(theTargetPlayer)
+			{
+				string theToolTip;
+				theToolTip = string(STRING(theAvHPlayer->pev->netname));
+				theToolTip += ":";
+
+				int theNumArgs = CMD_ARGC();
+				
+				for(int i=0; i < theNumArgs - 2; i++)
+				{
+					theToolTip += string(" ");
+					char theTooltipText[512];
+					sscanf(CMD_ARGV(i+2), "%s ", theTooltipText);
+					theToolTip += string(theTooltipText);
+
+					// For some reason, some punctuation comes through as separate arguments
+					//if(strcmp(theTooltipText, ","))
+					//{
+					//	theToolTip += string(" ");
+					//}
+				}
+				
+				theTargetPlayer->SendMessage(theToolTip.c_str(), true);
+				theSuccess = true;
+			}
+			else
+			{
+				char theErrorMessage[1024];
+				sprintf(theErrorMessage, "Player \"%s\" not found.  Usage: %s CaseSensitivePlayerName Message goes here.\n", thePlayerName, kcTooltip);
+				UTIL_SayText(theErrorMessage, theAvHPlayer);
+			}
+		}
+	}
+	else if (FStrEq(pcmd, kcRemoveCat))
+	{
+		if(theAvHPlayer)
+		{
+			if(this->GetCheatsEnabled() || theIsPlaytest)
+			{
+				AvHTeam* theTeam = theAvHPlayer->GetTeamPointer();
+				if(theTeam && (theTeam->GetTeamType() == AVH_CLASS_TYPE_ALIEN))
+				{
+					ReportPlayer(theAvHPlayer, pcmd);
+
+					int theCategory = 0;
+					sscanf(CMD_ARGV(1), "%d", &theCategory);
+					AvHAlienUpgradeCategory theUpgradeCategory = AvHAlienUpgradeCategory(theCategory);
+					
+					theTeam->RemoveAlienUpgradeCategory(theUpgradeCategory);
+					
+					theSuccess = true;
+				}
+			}
+		}
+	}
+	else if (FStrEq(pcmd, kcEndGame))
+	{
+		// Put this back in when doing larger scale playtesting
+		if(this->GetCheatsEnabled() || theIsServerOp || theIsPlaytest)
+		{
+			ReportPlayer(theAvHPlayer, pcmd);
+
+			string theCheat = kcEndGame1;
+			
+			int theTeam = 0;
+			sscanf(CMD_ARGV(1), "%d", &theTeam);
+			
+			if(theTeam == 2)
+			{
+				theCheat = kcEndGame2;
+			}
+			
+			this->SetCheatEnabled(theCheat);
+			
+			//this->mVictoryTeam = theTeamNumber;
+			//this->mVictoryTime = gpGlobals->time;
+			////this->mVictoryDraw = true;
+		}
+		theSuccess = true;
+	}
+	else if (FStrEq(pcmd, kcStartCommandMode))
+	{
+		if(this->GetCheatsEnabled() && theAvHPlayer)
+		{
+			//theAvHPlayer->StartTopDownMode();
+			this->AttemptToJoinTeam(theAvHPlayer, TEAM_ONE);
+			
+			// Find position of command station
+			FOR_ALL_ENTITIES(kwsTeamCommand, AvHCommandStation*)
+				//if(theEntity->pev->team == theAvHPlayer->pev->team)
+				//{
+				// Get command station point
+				Vector theCommandStationOrigin;
+			theCommandStationOrigin.x = (theEntity->pev->absmax.x + theEntity->pev->absmin.x)/2.0f;
+			theCommandStationOrigin.y = (theEntity->pev->absmax.y + theEntity->pev->absmin.y)/2.0f;
+			theCommandStationOrigin.z = (theEntity->pev->absmax.z + theEntity->pev->absmin.z)/2.0f;
+			
+			// Circle the station, trying points around it to see if there's room
+			for(int i = 0; i < 8; i++)
+			{
+				const int kDistance = 100;
+				Vector theOffset;
+				float theAngle = (i/(float)360)*2*M_PI;
+				theOffset.x = cos(theAngle)*kDistance;
+				theOffset.y = sin(theAngle)*kDistance;
+				theOffset.z = 20;
+				
+				Vector thePosition = theCommandStationOrigin + theOffset;
+				
+				if(AvHSUGetIsEnoughRoomForHull(thePosition, AvHMUGetHull(false, theAvHPlayer->pev->iuser3), NULL))
+				{
+					// Teleport to this place
+					theAvHPlayer->pev->origin = thePosition;
+					theSuccess = true;
+					break;
+				}
+			}
+			//}
+			END_FOR_ALL_ENTITIES(kwsTeamCommand)
+		}
+	}
+	else if (FStrEq(pcmd, kcHurt))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			theAvHPlayer->TakeDamage(theAvHPlayer->pev, theAvHPlayer->pev, 100, DMG_GENERIC);
+			theSuccess = true;
+		}
+	}
+	else if (FStrEq(pcmd, kcSetCullDistance))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			float theCullDistance = 0.0f;
+			if(sscanf(CMD_ARGV(1), "%f", &theCullDistance) == 1)
+			{
+				this->mMapExtents.SetTopDownCullDistance(theCullDistance);
+				theSuccess = true;
+			}
+		}
+	}
+	else if (FStrEq(pcmd, kcSetGamma))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			sscanf(CMD_ARGV(1), "%f", &this->mMapGamma);
+		}
+		theSuccess = true;
+	}
+	else if (FStrEq(pcmd, kcStopCommandMode))
+	{
+		// Fixes problem where players can bind "stopcommandermode" and execute in ready room or maybe as spectator to get weapon
+		if(theAvHPlayer && theAvHPlayer->GetIsInTopDownMode())
+		{
+			theAvHPlayer->SetUser3(AVH_USER3_MARINE_PLAYER);
+			
+			// Cheesy way to make sure player class change is sent to everyone
+			theAvHPlayer->EffectivePlayerClassChanged();
+			
+			theSuccess = true;
+		}
+		else
+		{
+			int a = 0;
+		}
+	}
+	else if(FStrEq(pcmd, kcBigDig))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			bool theNewState = !GetGameRules()->GetIsCheatEnabled(kcBigDig);
+			GetGameRules()->SetCheatEnabled(kcBigDig, theNewState);
+			theSuccess = true;
+		}
+	}
+	else if(FStrEq(pcmd, kcLowCost))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			bool theNewState = !GetGameRules()->GetIsCheatEnabled(kcLowCost);
+			GetGameRules()->SetCheatEnabled(kcLowCost, theNewState);
+			theSuccess = true;
+		}
+	}
+	else if(FStrEq(pcmd, kcHighDamage))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			GetGameRules()->SetCheatEnabled(kcHighDamage);
+			theSuccess = true;
+		}
+	}
+	else if(FStrEq(pcmd, kcHighTech))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			GetGameRules()->SetCheatEnabled(kcHighTech);
+			theSuccess = true;
+		}
+	}
+	else if(FStrEq(pcmd, kcSlowResearch))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			GetGameRules()->SetCheatEnabled(kcSlowResearch);
+			theSuccess = true;
+		}
+	}
+	else if(FStrEq(pcmd, kcDetectAll))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			GetGameRules()->SetCheatEnabled(kcDetectAll);
+			theSuccess = true;
+		}
+	}
+	else if(FStrEq(pcmd, kcNumInfos))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			int theNumInfos = this->mInfoLocations.size();
+
+			char theNumInfosString[128];
+			sprintf(theNumInfosString, "Num infos: %d\n", theNumInfos);
+			UTIL_SayText(theNumInfosString, theAvHPlayer);
+			theSuccess = true;
+		}
+	}
+	else if(FStrEq(pcmd, kcNumSpawns))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			int theNumSpawns = this->mSpawnList.size();
+			
+			char theNumSpawnsString[128];
+			sprintf(theNumSpawnsString, "Num spawns: %d\n", theNumSpawns);
+			UTIL_SayText(theNumSpawnsString, theAvHPlayer);
+			theSuccess = true;
+		}
+	}
+	else if(FStrEq(pcmd, kcEntityInfo) || FStrEq(pcmd, kcMapUtilEntityInfo))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			EntityInfoVectorType theEntityInfo = EntityInfoGetVector();
+
+			ALERT(at_console, "------------------------------------------------------\n");
+			ALERT(at_logged, "------------------------------------------------------\nEntityInfo Report:\n------------------------------------------------------\n");
+			
+			char theEntityMessage[1024];
+			EntityInfoVectorType::iterator end = theEntityInfo.end();
+			for(EntityInfoVectorType::iterator current = theEntityInfo.begin(); current != end; ++current)
+			{
+				sprintf(theEntityMessage, "\t%3d \"%s\" entities\n", current->second, current->first.c_str());
+				ALERT(at_console, theEntityMessage);
+				ALERT(at_logged, theEntityMessage);
+			}
+
+			ALERT(at_console, "------------------------------------------------------\n");
+			ALERT(at_logged, "------------------------------------------------------\n");
+
+			theSuccess = true;
+		}
+	}
+	else if(FStrEq(pcmd, kcInvul))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			if(theAvHPlayer->pev->takedamage == DAMAGE_AIM)
+			{
+				theAvHPlayer->pev->takedamage = DAMAGE_NO;
+				UTIL_SayText("Invul ON", theAvHPlayer);
+			}
+			else
+			{
+				theAvHPlayer->pev->takedamage = DAMAGE_AIM;
+				UTIL_SayText("Invul OFF", theAvHPlayer);
+			}
+			theSuccess = true;
+		}
+	}
+	else if (FStrEq(pcmd, kcEditPS))
+	{
+		if(this->GetCheatsEnabled() && theAvHPlayer)
+		{
+			const char* theName = CMD_ARGV(1);
+			uint32 theParticleIndex;
+			if(gParticleTemplateList.GetTemplateIndexWithName(theName, theParticleIndex))
+			{
+				theAvHPlayer->SendMessage(kEditingParticleSystem, true);
+				
+				MESSAGE_BEGIN(MSG_ONE, gmsgEditPS, NULL, theAvHPlayer->pev);
+				WRITE_SHORT(theParticleIndex);
+				MESSAGE_END();
+			}
+			else
+			{
+				theAvHPlayer->SendMessage(kNoParticleSystem, true);
+			}
+			theSuccess = true;
+		}
+	}
+	else if (FStrEq(pcmd, kcListPS))
+	{
+		if(this->GetCheatsEnabled() && theAvHPlayer)
+		{
+			int theNumTemplates = gParticleTemplateList.GetNumberTemplates();
+			
+			// Send num templates
+			//WRITE_SHORT(theNumTemplates);
+			
+			// For each one, send the name
+			for(int i = 0; i < theNumTemplates; i++)
+			{
+				MESSAGE_BEGIN(MSG_ONE, gmsgListPS, NULL, theAvHPlayer->pev);
+				
+				string theTemplateName("<system not found>");
+				const AvHParticleTemplate* theTemplate = gParticleTemplateList.GetTemplateAtIndex(i);
+				if(theTemplate)
+				{
+					theTemplateName = theTemplate->GetName();
+				}
+				theTemplateName += "\n";
+				WRITE_STRING(theTemplateName.c_str());
+				
+				MESSAGE_END();
+			}
+			theSuccess = true;
+		}
+	}
+	else if(FStrEq(pcmd, kcRedeem))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			theAvHPlayer->Redeem();
+			theSuccess = true;
+		}
+	}
+	else if (FStrEq(pcmd, kcBuildMiniMap))
+	{
+		if(this->GetCheatsEnabled() && theAvHPlayer)
+		{
+			const char* theCStrLevelName = STRING(gpGlobals->mapname);
+			if(theCStrLevelName && !FStrEq(theCStrLevelName, ""))
+			{
+				GetGameRules()->BuildMiniMap(theAvHPlayer);
+				theSuccess = true;
+			}
+		}
+	}
+    else if(FStrEq(pcmd, "votemap"))
+    {
+        if(theAvHPlayer)
+        {
+            // If map number passed
+            int theMapNumber = 0;
+            if(sscanf(CMD_ARGV(1), "%d", &theMapNumber) == 1)
+            {
+                // Add vote to this map.  Server might change maps immediately.
+                GetGameRules()->VoteMap(theAvHPlayer->entindex(), theMapNumber);
+            }
+            else
+            {
+                // Print the list of maps and votes to the player
+                StringList theMapVoteList;
+                GetGameRules()->GetMapVoteStrings(theMapVoteList);
+
+                for(StringList::iterator theIter = theMapVoteList.begin(); theIter != theMapVoteList.end(); theIter++)
+                {
+                    ClientPrint(theAvHPlayer->pev, HUD_PRINTNOTIFY, theIter->c_str());
+                }
+            }
+            
+            theSuccess = true;
+        }
+    }
+	else if(FStrEq(pcmd, "weapondebug"))
+	{
+		//                     ClientPrint(theAvHPlayer->pev, HUD_PRINTNOTIFY, theIter->c_str());
+        if(theAvHPlayer)
+        {
+			ClientPrint(theAvHPlayer->pev, HUD_PRINTNOTIFY, "weapondebug\n");
+			FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+				theEntity->PrintWeaponListToClient(theAvHPlayer);
+			END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+			theSuccess = true;
+		}
+	}
+#ifdef DEBUG
+	else if(FStrEq(pcmd, kcSetAuth))
+	{
+		int theAuth = 0;
+		if(sscanf(CMD_ARGV(1), "%d", &theAuth) == 1)
+		{
+			theAvHPlayer->SetAuthCheatMask(theAuth);
+			theAvHPlayer->EffectivePlayerClassChanged();
+			theSuccess = true;
+		}
+	}
+    else if(FStrEq(pcmd, "catalyst"))
+    {
+        if(this->GetCheatsEnabled())
+        {
+            if(AvHCatalyst::GiveCatalyst(theAvHPlayer))
+            {
+                theSuccess = true;
+            }
+        }
+    }
+	else if(FStrEq(pcmd, "showmenu"))
+	{
+		short theSlots = 0x1f;
+		char theDisplayTime = -1;
+		bool theNeedMore = false;
+		char* theString = NULL;
+		
+		char theMenuText[1024];
+		if(sscanf(CMD_ARGV(1), "%s", theMenuText) == 1)
+		{
+			MESSAGE_BEGIN(MSG_ONE, gmsgShowMenu, NULL, theAvHPlayer->edict());
+			WRITE_SHORT(theSlots);
+			WRITE_CHAR(theDisplayTime);
+			WRITE_BYTE(theNeedMore);
+			WRITE_STRING(theMenuText);
+			MESSAGE_END();
+		}
+		
+		theSuccess = true;
+	}
+    else if(FStrEq(pcmd, "calcxp"))
+    {
+        if(theAvHPlayer)
+        {
+            char theString[512];
+			sprintf(theString, "Experience for levels:\n");
+            
+            for(int i=1; i <= 10; i++)
+            {
+                float theExperienceForLevel = AvHPlayerUpgrade::GetExperienceForLevel(i);
+                char theExpString[128];
+                sprintf(theExpString, "\t%d/%d\n", i, (int)theExperienceForLevel);
+                strcat(theString, theExpString);
+            }
+
+            ALERT(at_logged, theString);
+            theSuccess = true;
+        }
+    }
+    else if(FStrEq(pcmd, "calcspawn"))
+    {
+        if(theAvHPlayer)
+        {
+            char theString[512];
+            sprintf(theString, "Spawn times (marines):\n");
+
+            char theResult[128];
+            sprintf(theResult, "1v1 -> low: %f  high: %f\n", AvHSUCalcCombatSpawnTime(AVH_CLASS_TYPE_MARINE, 1, 1, 0), AvHSUCalcCombatSpawnTime(AVH_CLASS_TYPE_MARINE, 1, 1, 9));
+            strcat(theString, theResult);
+
+            sprintf(theResult, "16v16 -> low: %f  high: %f\n", AvHSUCalcCombatSpawnTime(AVH_CLASS_TYPE_MARINE, 16, 1, 0), AvHSUCalcCombatSpawnTime(AVH_CLASS_TYPE_MARINE, 16, 16, 9));
+            strcat(theString, theResult);
+
+            ALERT(at_logged, theString);
+            theSuccess = true;
+        }
+    }
+	else if(FStrEq(pcmd, "testscores"))
+	{
+		PlayerListType thePlayerList;
+		
+		FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+			if(UTIL_IsValidEntity(theEntity->edict()))
+			{
+				thePlayerList.push_back(theEntity);
+			}
+		END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+			
+		// Find random player
+		if(thePlayerList.size() > 0)
+		{
+			AvHPlayer* thePlayer = thePlayerList[RANDOM_LONG(0, thePlayerList.size() - 1)];
+			ASSERT(thePlayer);
+
+			// Changes scores
+			int theChangeType = RANDOM_LONG(0, 2);
+			int theSign = RANDOM_LONG(0, 1) ? 1 : -1;
+			int theAmount = RANDOM_LONG(0, 5);
+
+			switch(theChangeType)
+            {
+            case 0:
+                thePlayer->SetScore(thePlayer->GetScore() + theSign*theAmount);
+                break;
+            case 1:
+                thePlayer->pev->frags += theSign*theAmount;
+                break;
+            case 2:
+                thePlayer->m_iDeaths += theSign*theAmount;
+                break;
+			}
+
+			thePlayer->EffectivePlayerClassChanged();
+
+			theSuccess = true;
+		}
+	}
+#endif
+	else if(FStrEq(pcmd, kcOrderSelf))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			GetGameRules()->SetCheatEnabled(kcOrderSelf);
+			theSuccess = true;
+		}
+	}
+#ifdef DEBUG
+	else if(FStrEq(pcmd, kcAdjustScore))
+	{
+		if(theAvHPlayer)
+		{
+			AvHTeam* theTeam = theAvHPlayer->GetTeamPointer();
+			if(theTeam)
+			{
+				int theAmount = 0;
+				sscanf(CMD_ARGV(1), "%d", &theAmount);
+				
+				theAvHPlayer->AddPoints(theAmount, TRUE);
+				theAvHPlayer->EffectivePlayerClassChanged();
+				
+				theSuccess = true;
+			}
+		}
+	}
+	else if(FStrEq(pcmd, kcAttackCS))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			FOR_ALL_ENTITIES(kwsTeamCommand, AvHCommandStation*)
+				if(theEntity->pev->team == theAvHPlayer->pev->team)
+				{
+					GetGameRules()->TriggerAlert((AvHTeamNumber)theAvHPlayer->pev->team, ALERT_UNDER_ATTACK, theEntity->entindex());
+					theSuccess = true;
+					break;
+				}
+				END_FOR_ALL_ENTITIES(kwsTeamCommand);
+		}
+	}
+	else if (FStrEq(pcmd, kcPlayHUDSound))
+	{
+		if(theAvHPlayer && GetGameRules()->GetCheatsEnabled())
+		{
+			AvHHUDSound theHUDSound = HUD_SOUND_INVALID;
+			if(sscanf(CMD_ARGV(1), "%d", &theHUDSound) == 1)
+			{
+				theSuccess = theAvHPlayer->PlayHUDSound(theHUDSound);
+			}
+		}
+	}
+	else if(FStrEq(pcmd, kcHighSpeed))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			// Toggle hispeed cheat
+			bool theHiSpeedEnabled = GetGameRules()->GetIsCheatEnabled(kcHighSpeed);
+			GetGameRules()->SetCheatEnabled(kcHighSpeed, !theHiSpeedEnabled);
+			theSuccess = true;
+		}
+	}
+	else if (FStrEq(pcmd, kcCrash))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			char* theCrashString = NULL;
+			*theCrashString = 1;
+		}
+	}
+	else if (FStrEq(pcmd, kcAssert))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			ASSERT(false);
+			theSuccess = true;
+		}
+	}
+	else if (FStrEq(pcmd, kcRun))
+	{
+		if(this->GetCheatsEnabled() /*|| theIsDeveloper*/)
+		{
+			const char* theScriptName = CMD_ARGV(1);
+			if(theScriptName)
+			{
+				AvHScriptManager::Instance()->RunScript(theScriptName);
+				theSuccess = true;
+			}
+		}
+	}
+	else if (FStrEq(pcmd, kcClientRun))
+	{
+		if(this->GetCheatsEnabled() /*|| theIsDeveloper*/)
+		{
+			const char* theScriptName = CMD_ARGV(1);
+			if(theAvHPlayer && theScriptName)
+			{
+				theAvHPlayer->RunClientScript(theScriptName);
+				theSuccess = true;
+			}
+		}
+	}
+	else if(FStrEq(pcmd, kcParasite))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			SetUpgradeMask(&theAvHPlayer->pev->iuser4, MASK_PARASITED);
+		}
+	}
+	else if(FStrEq( pcmd, kcStun) )
+	{
+		if(this->GetCheatsEnabled() && theAvHPlayer)
+		{
+			theAvHPlayer->SetIsStunned(true, 4.0f);
+			theSuccess = true;
+		}
+	}
+	else if (FStrEq(pcmd, kcWeb))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			theAvHPlayer->SetEnsnareState(true);
+			theSuccess = true;
+		}
+	}
+	else if(FStrEq(pcmd, kcDigest))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			int theDevourerIndex = 0;
+			int theDevoureeIndex = 0;
+			if((sscanf(CMD_ARGV(1), "%d", &theDevourerIndex) == 1) && (sscanf(CMD_ARGV(2), "%d", &theDevoureeIndex) == 1))
+			{
+				AvHPlayer* theDevourerPlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theDevourerIndex)));
+				AvHPlayer* theDevoureePlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theDevoureeIndex)));
+				if(theDevourerPlayer && theDevoureePlayer)
+				{
+					if(!theDevoureePlayer->GetIsBeingDigested())
+					{
+						theDevourerPlayer->StartDigestion(theDevoureePlayer->entindex());
+					}
+					else
+					{
+						theDevourerPlayer->StopDigestion(false);
+					}
+				}
+			}
+			theSuccess = true;
+		}
+	}
+	else if(FStrEq(pcmd, kcBoxes))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			FOR_ALL_BASEENTITIES()
+				AvHBaseBuildable* theBuildable = dynamic_cast<AvHBaseBuildable*>(theBaseEntity);
+			if(theBuildable)
+			{
+				vec3_t theMinPosition = theBuildable->pev->origin + theBuildable->pev->mins;
+				vec3_t theMaxPosition = theBuildable->pev->origin + theBuildable->pev->maxs;
+				
+				MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+				
+				WRITE_BYTE(TE_BOX);
+				
+				WRITE_COORD(theMinPosition.x);
+				WRITE_COORD(theMinPosition.y);
+				WRITE_COORD(theMinPosition.x);
+				
+				WRITE_COORD(theMaxPosition.x);
+				WRITE_COORD(theMaxPosition.y);
+				WRITE_COORD(theMaxPosition.z);
+				
+				WRITE_SHORT(100);
+				
+				WRITE_BYTE(0);
+				WRITE_BYTE(255);
+				WRITE_BYTE(0);
+				
+				MESSAGE_END();
+			}
+			
+			END_FOR_ALL_BASEENTITIES();
+			
+			theSuccess = true;
+		}
+	}
+	else if(FStrEq(pcmd, kcOverflow))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			// Force an overflow
+			for(int i = 0; i < 100; i++)
+			{
+				theAvHPlayer->ForceClientDllUpdate();
+			}
+			theSuccess = true;
+		}
+	}
+	else if ( FStrEq( pcmd, kcViewAll) )
+	{
+		// Allow even with cheats off right now, put this back in for first beta
+		if(this->GetCheatsEnabled() && theAvHPlayer)
+		{
+			GetGameRules()->SetCheatEnabled(kcViewAll);
+			theSuccess = true;
+		}
+	}
+	else if(FStrEq(pcmd, kcDeathMessage))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			const char* theWeaponName = CMD_ARGV(1);
+			
+			MESSAGE_BEGIN(MSG_ALL, gmsgDeathMsg);
+			WRITE_BYTE(theAvHPlayer->entindex());	// Killer
+			WRITE_BYTE(theAvHPlayer->entindex());	// Victim
+			WRITE_STRING(theWeaponName);
+			MESSAGE_END();
+		}
+	}
+	else if(FStrEq(pcmd, kcSetSkin))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			int theSkin = 0;
+			if(sscanf(CMD_ARGV(1), "%d", &theSkin) == 1)
+			{
+				theAvHPlayer->SetSkin(theSkin);
+				
+				theSuccess = true;
+			}
+		}
+	}
+	else if(FStrEq(pcmd, kcElectric))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			bool theNewValue = !GetGameRules()->GetIsCheatEnabled(kcElectric);
+			GetGameRules()->SetCheatEnabled(kcElectric, theNewValue);
+		}
+	}
+	else if(FStrEq(pcmd, kcRoomType))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			int theRoomType = 0;
+			if(sscanf(CMD_ARGV(1), "%d", &theRoomType) == 1)
+			{
+				MESSAGE_BEGIN( MSG_ONE, SVC_ROOMTYPE, NULL, theAvHPlayer->pev);
+				WRITE_SHORT( (short)theRoomType );
+				MESSAGE_END();
+				
+				char theString[128];
+				sprintf(theString, "Set room type to %d.\n", theRoomType);
+				UTIL_SayText(theString, theAvHPlayer);
+				
+				theSuccess = true;
+			}
+		}
+	}
+	#ifdef WIN32
+	else if(FStrEq(pcmd, "createfake"))
+	{
+		if(this->GetCheatsEnabled())
+		{
+			char theFakeClientName[256];
+			sprintf(theFakeClientName, "Bot%d", RANDOM_LONG(0, 2000));
+			edict_t* BotEnt = (*g_engfuncs.pfnCreateFakeClient)(theFakeClientName);
+			
+			// create the player entity by calling MOD's player function
+			// (from LINK_ENTITY_TO_CLASS for player object)
+			player( VARS(BotEnt) );
+			
+			char ptr[128];  // allocate space for message from ClientConnect
+			ClientConnect( BotEnt, theFakeClientName, "127.0.0.1", ptr );
+			
+			// Pieter van Dijk - use instead of DispatchSpawn() - Hip Hip Hurray!
+			ClientPutInServer( BotEnt );
+			
+			BotEnt->v.flags |= FL_FAKECLIENT;
+		}
+	}
+	#endif
+#endif
+    else if( FStrEq( pcmd, kcGiveUpgrade) )
+    {
+        // Allow even with cheats off right now, put this back in for first beta
+        if(this->GetCheatsEnabled())
+        {
+            ReportPlayer(theAvHPlayer, pcmd);
+            
+            int theUpgrade = 0;
+            sscanf(CMD_ARGV(1), "%d", &theUpgrade);
+            AvHMessageID theNewUpgrade = AvHMessageID(theUpgrade);
+            
+            AvHTeam* theVisibleTeam = theAvHPlayer->GetTeamPointer(true);
+            if(theVisibleTeam)
+            {
+                theVisibleTeam->GetTechNodes().SetResearchDone(theNewUpgrade);
+                this->ProcessTeamUpgrade(theNewUpgrade, theAvHPlayer->GetTeam(true), 0, true);
+            }	
+            theSuccess = true;
+        }
+    }
+    else if( FStrEq( pcmd, kcRemoveUpgrade) )
+    {
+        // Allow even with cheats off right now, put this back in for first beta
+        if(this->GetCheatsEnabled())
+        {
+            ReportPlayer(theAvHPlayer, pcmd);
+            
+            int theUpgrade = 0;
+            sscanf(CMD_ARGV(1), "%d", &theUpgrade);
+            AvHMessageID theNewUpgrade = AvHMessageID(theUpgrade);
+            
+            AvHTeam* theVisibleTeam = theAvHPlayer->GetTeamPointer(true);
+            if(theVisibleTeam)
+            {
+                theVisibleTeam->GetTechNodes().SetResearchDone(theNewUpgrade, false);
+                this->ProcessTeamUpgrade(theNewUpgrade, theAvHPlayer->GetTeam(true), 0, false);
+            }
+            
+            theSuccess = true;
+        }
+    }
+	else if ( FStrEq( pcmd, kcSpectate ) )
+	{
+		if(theAvHPlayer)
+		{
+#ifdef USE_UPP
+			if(!theAvHPlayer->GetAuthorized())
+			{
+				UPPUtil_HandleUnauthorizedJoinTeamAttempt(theAvHPlayer,TEAM_SPECT);
+			}
+			else if(allow_spectators.value)
+#else
+			if(allow_spectators.value && GetGameRules()->PerformHardAuthorization(theAvHPlayer))
+#endif
+			{
+				if(theAvHPlayer->GetPlayMode() == PLAYMODE_READYROOM)
+				{
+					theAvHPlayer->SetPlayMode(PLAYMODE_OBSERVER);
+					//this->PutPlayerIntoSpectateMode(theAvHPlayer);
+				}
+			}
+			else
+			{
+				theAvHPlayer->SendMessage(kSpectatorsNotAllowed, true);
+			}
+			theSuccess = true;
+		}
+	}
+	else if ( FStrEq( pcmd, kcGivePoints) )
+	{
+		// Allow even with cheats off right now, put this back in for first beta
+		if(this->GetCheatsEnabled() && theAvHPlayer)
+		{
+			int theAmount = 20;
+
+			theAvHPlayer->SetResources(theAvHPlayer->GetResources() + theAmount, true);
+
+			if(theTeam)
+			{
+				theTeam->AddResourcesGathered(theAmount);
+			}
+
+			theSuccess = true;
+		}
+	}
+	else if(FStrEq( pcmd, kcKillCS) )
+	{
+		if(this->GetCheatsEnabled())
+		{
+			if(theTeam)
+			{
+				theTeam->KillCS();
+				theSuccess = true;
+			}
+		}
+	}
+	else if(FStrEq( pcmd, kcKillHive) )
+	{
+		if(this->GetCheatsEnabled() || theIsPlaytest)
+		{
+			if(theTeam)
+			{
+				ReportPlayer(theAvHPlayer, pcmd);
+				theTeam->KillHive();
+				theSuccess = true;
+			}
+		}
+	}
+	else if(FStrEq( pcmd, kcSpawnHive) )
+	{
+		if(this->GetCheatsEnabled() || theIsPlaytest)
+		{
+			AvHTeam* theHiveTeam = GetGameRules()->GetTeam(TEAM_TWO);
+			if(theHiveTeam)
+			{
+				ReportPlayer(theAvHPlayer, pcmd);
+				theHiveTeam->SpawnHive();
+				theSuccess = true;
+			}
+		}
+	}
+	else if(FStrEq( pcmd, kcAlert) )
+	{
+		if(this->GetCheatsEnabled() && theAvHPlayer)
+		{
+			AvHTeam* theTeam = theAvHPlayer->GetTeamPointer(true);
+			if(theTeam)
+			{
+				if(theTeam->GetTeamType() == AVH_CLASS_TYPE_ALIEN)
+				{
+					// Look for random hive, set it under attack
+					AvHHive* theHive = AvHSUGetRandomActiveHive(theTeam->GetTeamNumber());
+					if(theHive)
+					{
+                        AvHAlertType theRandomAlert = (RANDOM_LONG(0, 1) == 0) ? ALERT_HIVE_DYING : ALERT_UNDER_ATTACK;
+						GetGameRules()->TriggerAlert(theTeam->GetTeamNumber(), theRandomAlert, theHive->entindex());
+					}
+				}
+				else
+				{
+					if(this->GetIsCombatMode())
+					{
+						// Find Command station, trigger alert (to test for soldiers on ground)
+						int theCCEntityIndex = 0;
+						FOR_ALL_ENTITIES(kwsTeamCommand, AvHCommandStation*)
+							theCCEntityIndex = theEntity->entindex();
+							break;
+						END_FOR_ALL_ENTITIES(kwsTeamCommand);
+
+						if(theCCEntityIndex > 0)
+						{
+							this->TriggerAlert(theTeam->GetTeamNumber(), ALERT_UNDER_ATTACK, theCCEntityIndex);
+						}
+					}
+					else
+					{
+						int theRandomEntity = RANDOM_LONG(1, 500);
+						
+						AvHAlertType theRandomAlert = AvHAlertType(RANDOM_LONG(0, ALERT_MAX_ALERTS-1));
+						GetGameRules()->TriggerAlert(theTeam->GetTeamNumber(), theRandomAlert, theRandomEntity);
+					}
+				}
+				
+				theSuccess = true;
+			}
+		}
+	}
+	else if(FStrEq( pcmd, kcKillAll) )
+	{
+		if(this->GetCheatsEnabled())
+		{
+			FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+				theEntity->TakeDamage(theAvHPlayer->pev, theAvHPlayer->pev, 2000, DMG_GENERIC | DMG_ALWAYSGIB);
+			END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+			
+			theSuccess = true;
+		}
+	}
+    #ifndef AVH_SECURE_PRERELEASE_BUILD
+	else if(FStrEq(pcmd, kcAuth))
+	{
+		// Toggle auth mask
+		bool theNewState = !theAvHPlayer->GetAllowAuth();
+		theAvHPlayer->SetAllowAuth(theNewState);
+
+		if(theNewState)
+		{
+			UTIL_SayText("Authentication ON\n", theAvHPlayer);
+		}
+		else
+		{
+			UTIL_SayText("Authentication OFF\n", theAvHPlayer);
+		}
+		
+		theSuccess = true;
+	}
+    #endif
+	else if(FStrEq(pcmd, kcNumEnts))
+	{
+        bool theEnableNumEnts = GetGameRules()->GetCheatsEnabled();
+
+        #ifdef AVH_SECURE_PRERELEASE_BUILD
+        theEnableNumEnts = true;
+        #endif
+
+        if(theEnableNumEnts)
+        {
+			if(theAvHPlayer)
+			{
+				ReportPlayer(theAvHPlayer, pcmd);
+			}
+
+			int theEntityCount = this->GetNumEntities();
+
+		    char theNumEntsString[1024];
+		    sprintf(theNumEntsString, "Total entity count: %d\n", theEntityCount);
+            ALERT(at_console, theNumEntsString);
+            ALERT(at_logged, theNumEntsString);
+		}
+
+        theSuccess = true;
+	}
+	else if(FStrEq(pcmd, kcMapUtilNumEnts))
+	{
+        if(GetGameRules()->GetCheatsEnabled())
+        {
+			int theEntityCount = EntityInfoGetCount();
+
+		    char theNumEntsString[1024];
+		    sprintf(theNumEntsString, "Total map related entity count: %d\n", theEntityCount);
+            ALERT(at_console, theNumEntsString);
+            ALERT(at_logged, theNumEntsString);
+        }
+
+        theSuccess = true;
+    }
+
+    return theSuccess;
+}
+
diff --git a/main/source/mod/AvHConstants.cpp b/main/source/mod/AvHConstants.cpp
new file mode 100644
index 00000000..a8a8ec45
--- /dev/null
+++ b/main/source/mod/AvHConstants.cpp
@@ -0,0 +1,42 @@
+#include "AvHConstants.h"
+#include <cstring>
+
+const int slashchr =  '\\';
+#define kAvHModDir					((const char*)("ns"))
+
+const char* getModDirectory(void)
+{
+//#ifdef __linux__
+//	return kAvHModDir;
+//#else
+//	static char theModDirectory[512];
+//	static bool theIsComputed = false;
+//	#define thisFileString __FILE__
+
+//	if(!theIsComputed)
+//	{
+//		const char* thisFileName = thisFileString;
+//		strcpy(theModDirectory,thisFileName);
+//		//theModDirectory = <blah>/[mod_directory]/source/mod/AvHConstants.cpp
+//		char* pos = strrchr(theModDirectory,slashchr);
+//		for(int counter = 0; counter < 3; ++counter) //remove three slahses and everything that comes after
+//		{
+//			*pos = '\0';
+//			pos = strrchr(theModDirectory,slashchr); //point to next slash
+//		}
+		//theModDirectory = <blah>/[mod_directory]
+		//pos+1 = [mod_directory]
+//		char temp[512];
+//		strcpy(temp,pos+1); //use temp so we don't overwrite ourselves on copy.
+//		strcpy(theModDirectory,temp); //theModDirectory now holds the correct directory name
+//		theIsComputed = true; //don't compute this again
+//	}
+//	return theModDirectory;
+//#endif
+	return "ns";
+}
+
+const char* getModName(void)
+{
+	return kAvHGameName;
+}
diff --git a/main/source/mod/AvHConstants.h b/main/source/mod/AvHConstants.h
new file mode 100644
index 00000000..215f193a
--- /dev/null
+++ b/main/source/mod/AvHConstants.h
@@ -0,0 +1,989 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHConstants.h$
+// $Date: 2002/11/12 02:23:01 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHConstants.h,v $
+// Revision 1.61  2002/11/12 02:23:01  Flayra
+// - Renamed avhplayer for 3rd party compatibility (adminmod, etc.)
+//
+// Revision 1.60  2002/11/06 01:39:48  Flayra
+// - Regeneration now heals a percentage
+//
+// Revision 1.59  2002/11/05 06:17:25  Flayra
+// - Balance changes
+//
+// Revision 1.58  2002/11/03 04:50:19  Flayra
+// - Hard-coded gameplay constants instead of putting in skill.cfg
+//
+// Revision 1.57  2002/10/24 21:23:01  Flayra
+// - Reworked jetpacks
+// - Added alien easter eggs
+//
+// Revision 1.56  2002/10/18 22:18:44  Flayra
+// - Added alien easter egg sayings
+// - Added sensory chamber sayings
+// - Limit number of buildings in radius
+// - Fixed motd.txt length crash
+//
+// Revision 1.55  2002/10/16 20:51:44  Flayra
+// - Hive health while gestating
+//
+// Revision 1.54  2002/10/16 00:52:45  Flayra
+// - Added "need order" alert
+// - Added authentication mask
+// - Updated alien building sounds
+// - Removed a couple unneeded sounds
+//
+// Revision 1.53  2002/10/03 18:41:58  Flayra
+// - Added alien HUD sounds
+// - Added more order sounds
+//
+// Revision 1.52  2002/09/25 20:43:40  Flayra
+// - Removed use order, sound update
+//
+// Revision 1.51  2002/09/23 22:12:07  Flayra
+// - New CC sounds
+// - Regular update
+//
+// Revision 1.50  2002/09/09 19:49:25  Flayra
+// - Added deathmessage cheat
+//
+// Revision 1.49  2002/08/31 18:01:01  Flayra
+// - Work at VALVe
+//
+// Revision 1.48  2002/08/16 02:33:57  Flayra
+// - Regular update
+//
+// Revision 1.47  2002/08/09 00:56:18  Flayra
+// - Added "adjustscore" cheat for testing new scoreboard
+//
+// Revision 1.46  2002/08/02 22:01:04  Flayra
+// - Regular update
+//
+// Revision 1.45  2002/07/28 19:38:59  Flayra
+// - Linux path fixes
+//
+// Revision 1.44  2002/07/26 23:04:08  Flayra
+// - Generate numerical feedback for damage events
+//
+// Revision 1.43  2002/07/23 17:01:02  Flayra
+// - Regular update
+//
+// Revision 1.42  2002/07/08 16:50:20  Flayra
+// - Reworked team colors, #define a few more sounds, weapon spread
+//
+// Revision 1.41  2002/07/01 22:41:40  Flayra
+// - Removed outdated overwatch target and tension events
+//
+// Revision 1.40  2002/07/01 21:25:26  Flayra
+// - Added new alien weapons, added build ranges
+//
+// Revision 1.39  2002/06/25 17:53:19  Flayra
+// - Regular update (cleanup, new entities, new classnames)
+//
+// Revision 1.38  2002/06/10 19:51:29  Flayra
+// - Regular update
+//
+// Revision 1.37  2002/06/03 16:41:50  Flayra
+// - Removed duplicate hive class name, added more player class types for scoreboard info
+//
+// Revision 1.36  2002/05/28 17:37:48  Flayra
+// - Reinforcment refactoring, renamed role sounds to be less confusing
+//
+// Revision 1.35  2002/05/23 02:34:00  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVHCONSTANTS_H
+#define AVHCONSTANTS_H
+
+#include "types.h"
+#include "game_shared/teamconst.h"
+
+// Basic constants
+const   int								kMaxPlayers = 32;
+const	int								kMaxEntities = 1500;
+const	int								kSelectionStartRange = 50;
+const	int								kSelectionEndRange = 8012;
+const	int								kSelectionExtreme = 8012;
+const	float							kSelectionNetworkConstant = 1000.0f;
+const	float							kBuildInvalidRangeMultiplier = 2.0f;
+const	float							kWorldPosNetworkConstant = 6.0f;
+const	float							kNumericNetworkConstant = 100.0f;
+const	int								kWorldMinimumZ = -4096;
+const	int								kMaxGroundPlayerSpeed = 1200;
+const	int								kNumHotkeyGroups = 5;
+const	int								kSelectAllHotGroup = kNumHotkeyGroups + 1;
+
+const	int								kNumRequestTypes = 3;
+const	int								kPendingIdleSoldiers = (kNumHotkeyGroups + 1);
+const	int								kPendingAmmoRequests = (kNumHotkeyGroups + 2);
+const	int								kPendingHealthRequests = (kNumHotkeyGroups + 3);
+
+const	int								kMaxHives = 3;
+const	int								kMaxUpgradeCategories = 3;
+const	int								kMaxUpgradeLevel = 3;
+
+const	int								kFuncResourceMaxResources = 300;
+//const	float							kPlayerResourceScalar = 2.0f; // 1.5 might be better
+const	int								kVictoryIntermission = 12;
+const	int								kResetPlayersPerSecond = 8;
+const	float							kBuildingUseWarmupTime = 2.0f;
+const   float                           kRedeemInvulnerableTime = 1.0f;
+
+const	float							kMaxBuildingDropSlope = 1.0f;
+const	float							kMaxEquipmentDropSlope = 1.0f;
+
+// Used to be cl_forwardspeed, cl_backspeed, cl_sidespeed.
+const   float                           kForwardSpeed = 1000.0f;
+const   float                           kBackSpeed = 1000.0f;
+const   float                           kSideSpeed = 1000.0f;
+
+// Name this guy for custom propagation, maybe
+typedef int									EntityInfo;
+typedef vector<EntityInfo>					EntityListType;
+typedef pair<EntityInfo, float>				EntityFloatPairType;
+typedef vector<EntityFloatPairType>			EntityFloatPairListType;
+typedef map<int, EntityInfo>				EntityMap;
+typedef vector<int>							IntList;
+
+#define kAvHGameName					((const char*)("Natural Selection"))
+#define kAvHGameAcronymn				((const char*)("NS"))
+#define kInvalidTeamName				"Invalid team name"
+#define kAvHPlayerClassName				"player"
+#define	kwsWeldableClassName			"avhweldable"
+#define kwsMapInfoClassName				"avhmapinfo"
+#define kwsGameplayClassName			"avhgameplay"
+#define kwsGammaClassName				"avhgamma"
+
+#define	kNumAlienLifeforms				5
+#define	kNumAlienUpgrades				12
+#define	kNumAlienUpgradeCategories		3
+#define kNumUpgradesInCategory			3
+#define kNumUpgradeLevelsInCategory		3
+
+#define kMaxAlienHives					3
+#define kMaxAlienEnergy					100
+#define kMaxAlienResources				100
+
+typedef enum
+{
+	AVH_CLASS_TYPE_UNDEFINED = 0,
+	AVH_CLASS_TYPE_MARINE = 1,
+	AVH_CLASS_TYPE_ALIEN = 2,
+	AVH_CLASS_TYPE_AUTOASSIGN = 3
+} AvHClassType;
+
+typedef enum
+{
+	MAP_MODE_UNDEFINED = 0,
+	MAP_MODE_NS = 1,
+	MAP_MODE_CS = 2,
+	MAP_MODE_DM = 3,
+	MAP_MODE_CO = 4
+}
+AvHMapMode;
+
+#define kUndefinedTeam					"undefinedteam"
+#define kMarine1Team					"marine1team"
+#define kAlien1Team						"alien1team"
+#define kMarine2Team					"marine2team"
+#define kAlien2Team						"alien2team"
+#define kSpectatorTeam					"spectatorteam"
+#define kTeamString						"undefinedteam;marine1team;alien1team;marine2team;alien2team;spectatorteam"
+
+#define kMarinePrettyName				"Frontiersmen"
+#define kAlienPrettyName				"Kharaa"
+#define kUndefPrettyName				"Undefined"
+typedef enum
+{
+	PLAYMODE_UNDEFINED = 0,
+	PLAYMODE_READYROOM = 1,
+	PLAYMODE_PLAYING = 2,
+	PLAYMODE_AWAITINGREINFORCEMENT = 3,	// Player is dead and waiting in line to get back in
+	PLAYMODE_REINFORCING = 4,			// Player is in the process of coming back into the game
+	PLAYMODE_OBSERVER = 5,
+	PLAYMODE_REINFORCINGCOMPLETE = 6	// Combat only: 'press fire to respawn'
+} AvHPlayMode;
+
+typedef enum
+{
+	TEAM_IND = 0,
+	TEAM_ONE = 1,
+	TEAM_TWO = 2,
+	TEAM_THREE = 3,
+	TEAM_FOUR = 4,
+	TEAM_SPECT = 5
+} AvHTeamNumber;
+
+typedef enum
+{
+	ALERT_NONE = 0,
+	ALERT_PLAYER_ENGAGE = 1,
+	ALERT_UNDER_ATTACK = 2,
+	ALERT_RESEARCH_COMPLETE = 3,
+	ALERT_UPGRADE_COMPLETE = 4,
+	ALERT_LOW_RESOURCES = 5,
+	ALERT_SOLDIER_NEEDS_AMMO = 6,
+	ALERT_SOLDIER_NEEDS_HEALTH = 7,
+	ALERT_PLAYER_DIED = 8,
+	ALERT_SENTRY_FIRING = 9,
+	ALERT_SENTRY_DAMAGED = 10,
+	ALERT_HIVE_COMPLETE = 11,
+	ALERT_HIVE_DYING = 12,
+	ALERT_NEW_TRAIT = 13,
+	ALERT_ORDER_NEEDED = 14,
+	ALERT_ORDER_COMPLETE = 15,
+	ALERT_MAX_ALERTS = 16
+} AvHAlertType;
+
+typedef enum
+{
+	PLAYERCLASS_NONE = 0,
+	PLAYERCLASS_ALIVE_MARINE,
+	PLAYERCLASS_ALIVE_JETPACK_MARINE,
+	PLAYERCLASS_ALIVE_HEAVY_MARINE,
+	PLAYERCLASS_ALIVE_LEVEL1,
+	PLAYERCLASS_ALIVE_LEVEL2,
+	PLAYERCLASS_ALIVE_LEVEL3,
+	PLAYERCLASS_ALIVE_LEVEL4,
+	PLAYERCLASS_ALIVE_LEVEL5,
+	PLAYERCLASS_ALIVE_DIGESTING,
+	PLAYERCLASS_ALIVE_GESTATING,
+	PLAYERCLASS_DEAD_MARINE,
+	PLAYERCLASS_DEAD_ALIEN,
+	PLAYERCLASS_COMMANDER,
+	PLAYERCLASS_REINFORCING,
+	PLAYERCLASS_SPECTATOR,
+	PLAYERCLASS_REINFORCINGCOMPLETE
+} AvHPlayerClass;
+
+// This is a mask because players can have more then one of these
+typedef enum
+{
+	PLAYERAUTH_NONE = 0,
+	PLAYERAUTH_DEVELOPER = 1,
+	PLAYERAUTH_GUIDE = 2,
+	PLAYERAUTH_SERVEROP = 4,
+	PLAYERAUTH_PLAYTESTER = 8,
+	PLAYERAUTH_CONTRIBUTOR = 16,
+	PLAYERAUTH_CHEATINGDEATH = 32,
+	PLAYERAUTH_VETERAN = 64,
+	PLAYERAUTH_BETASERVEROP = 128,
+	PLAYERAUTH_PENDING = 256,
+	PLAYERAUTH_CUSTOM = 512,
+	PLAYERAUTH_UPP_MODE = 16384
+} AvHPlayerAuthentication;
+
+typedef enum 
+{
+	HUD_SOUND_INVALID = 0,
+	HUD_SOUND_POINTS_SPENT,
+	HUD_SOUND_COUNTDOWN,
+	HUD_SOUND_SELECT,
+	HUD_SOUND_SQUAD1,
+	HUD_SOUND_SQUAD2,
+	HUD_SOUND_SQUAD3,
+	HUD_SOUND_SQUAD4,
+	HUD_SOUND_SQUAD5,
+	HUD_SOUND_PLACE_BUILDING,
+	HUD_SOUND_MARINE_RESEARCHCOMPLETE,
+	HUD_SOUND_MARINE_SOLDIER_UNDER_ATTACK,
+	HUD_SOUND_MARINE_BASE_UNDER_ATTACK,
+	HUD_SOUND_MARINE_UPGRADE_COMPLETE,
+	HUD_SOUND_MARINE_MORE,
+	HUD_SOUND_MARINE_SOLDIERLOST,
+	HUD_SOUND_MARINE_CCONLINE,
+	HUD_SOUND_MARINE_CCUNDERATTACK,
+	HUD_SOUND_MARINE_COMMANDER_EJECTED,
+	HUD_SOUND_MARINE_RESOURCES_LOW,
+	HUD_SOUND_MARINE_NEEDS_AMMO,
+	HUD_SOUND_MARINE_NEEDS_HEALTH,
+	HUD_SOUND_MARINE_NEEDS_ORDER,
+	HUD_SOUND_MARINE_POINTS_RECEIVED,
+	HUD_SOUND_MARINE_SOLDIER_LOST,
+	HUD_SOUND_MARINE_SENTRYFIRING,
+	HUD_SOUND_MARINE_SENTRYDAMAGED,
+	HUD_SOUND_MARINE_GIVEORDERS,
+	HUD_SOUND_MARINE_NEEDPORTAL,
+	HUD_SOUND_MARINE_GOTOALERT,
+	HUD_SOUND_MARINE_COMMANDERIDLE,
+	HUD_SOUND_MARINE_ARMORYUPGRADING,
+
+	HUD_SOUND_ALIEN_ENEMY_APPROACHES,
+	HUD_SOUND_ALIEN_GAMEOVERMAN,
+	HUD_SOUND_ALIEN_HIVE_ATTACK,
+	HUD_SOUND_ALIEN_HIVE_COMPLETE,
+	HUD_SOUND_ALIEN_HIVE_DYING,
+	HUD_SOUND_ALIEN_LIFEFORM_ATTACK,
+	HUD_SOUND_ALIEN_RESOURCES_LOW,
+	HUD_SOUND_ALIEN_MESS,
+	HUD_SOUND_ALIEN_MORE,
+	HUD_SOUND_ALIEN_NEED_BETTER,
+	HUD_SOUND_ALIEN_NEED_BUILDERS,
+	HUD_SOUND_ALIEN_NEW_TRAIT,
+	HUD_SOUND_ALIEN_NOW_DONCE,
+	HUD_SOUND_ALIEN_POINTS_RECEIVED,
+	HUD_SOUND_ALIEN_RESOURCES_ATTACK,
+	HUD_SOUND_ALIEN_STRUCTURE_ATTACK,
+	HUD_SOUND_ALIEN_UPGRADELOST,
+	
+	HUD_SOUND_ORDER_MOVE,
+	HUD_SOUND_ORDER_ATTACK,
+	HUD_SOUND_ORDER_BUILD,
+	HUD_SOUND_ORDER_WELD,
+	HUD_SOUND_ORDER_GUARD,
+	HUD_SOUND_ORDER_GET,
+	HUD_SOUND_ORDER_COMPLETE,
+	
+	HUD_SOUND_GAMESTART,
+	HUD_SOUND_YOU_WIN,
+	HUD_SOUND_YOU_LOSE,
+	HUD_SOUND_TOOLTIP,
+	// joev: bug 0000767
+	HUD_SOUND_PLAYERJOIN,
+	// :joev
+	HUD_SOUND_MAX
+} AvHHUDSound;
+
+typedef vector<AvHHUDSound>		HUDSoundListType;
+
+//typedef enum
+//{
+//	ARMOR_BASE = 1,
+//	ARMOR_HEAVY = 2,
+//	ARMOR_LIFESUPPORT = 4,
+//	ARMOR_JETPACK = 8,
+//	ARMOR_MOTIONTRACK = 16
+//} AvHMarineArmor;
+
+// Location orders, global orders
+typedef enum
+{
+	ORDERTYPE_UNDEFINED = 0,
+	ORDERTYPEL_DEFAULT,
+	ORDERTYPEL_MOVE,
+
+	ORDERTYPET_ATTACK,
+	ORDERTYPET_BUILD,
+	ORDERTYPET_GUARD,
+	ORDERTYPET_WELD,
+	ORDERTYPET_GET,
+
+	ORDERTYPEG_HOLD_POSITION,
+	ORDERTYPEG_CODE_DEPLOY_MINES,
+	ORDERTYPEG_CODE_GREEN,
+	ORDERTYPEG_CODE_YELLOW,
+	ORDERTYPEG_CODE_RED,
+
+	ORDERTYPE_MAX
+}
+AvHOrderType;
+
+typedef enum
+{
+	ORDERTARGETTYPE_UNDEFINED = 0,
+	ORDERTARGETTYPE_GLOBAL = 1,
+	ORDERTARGETTYPE_LOCATION = 2,
+	ORDERTARGETTYPE_TARGET = 3
+}
+AvHOrderTargetType;
+
+extern const char* getModDirectory(void);
+extern const char* getModName(void);
+
+#define kSpriteDirectory			"sprites"
+#define kMiniMapSpritesDirectory	"sprites/minimaps"
+#define	kTechTreeSpriteDirectory	"sprites/techtree"
+#define kTechTreeSpritePrefix		"tech"
+#define kScriptsDirectory			"scripts"
+#define kSoundDirectory				"sound"
+#define kMapDirectory				"maps"
+#define kMusicDirectory				"music"
+#define kBasePSName					"ns.ps"
+
+// Entities
+#define kesDeathMatchStart			"info_player_deathmatch"
+#define kesTerroristStart			"info_player_deathmatch"
+#define kesCounterTerroristStart	"info_player_start"
+
+#define kesFuncDoor					"func_door"
+#define kesFuncWall					"func_wall"
+#define kesEnvSprite				"env_sprite"
+#define kesFuncIllusionary			"func_illusionary"
+
+#define kesReadyRoomStart			"info_player_start"
+#define keTeamStart					info_team_start
+#define kesTeamStart				"info_team_start"
+#define keLeaveGame					info_leave_game
+#define keJoinTeam					info_join_team
+#define keSpectate					info_spectate
+#define keAutoAssign				info_join_autoassign
+#define keMapInfo					info_mapinfo
+#define kesMapInfo					"info_mapinfo"
+#define keGameplay					info_gameplay
+#define kesGameplay					"info_gameplay"
+
+//#define keGlow						glow
+#define keGamma						env_gamma
+#define kesGamma					"env_gamma"
+#define keParticles					env_particles
+#define kesParticles				"env_particles"
+#define keParticlesCustom			env_particles_custom
+#define kesParticlesCustom			"env_particles_custom"
+
+//#define keResource					resource
+#define	keWeldable					func_weldable
+#define	kesWeldable					"func_weldable"
+
+#define	keSeethrough				func_seethrough
+#define	kesSeethrough				"func_seethrough"
+
+#define	keSeethroughDoor			func_seethroughdoor
+#define	kesSeethroughDoor			"func_seethroughdoor"
+
+//#define keWaypoint					func_waypoint
+//#define kesWaypoint					"func_waypoint"
+
+#define keNoBuild					func_nobuild
+#define kesNoBuild					"func_nobuild"
+
+#define keFuncResource				func_resource
+#define kesFuncResource				"func_resource"
+
+#define keMP3Audio					target_mp3audio
+#define kesMP3Audio					"target_mp3audio"
+
+#define keFog						env_fog
+#define kesFog						"env_fog"
+
+#define keInfoLocation				info_location
+#define kesInfoLocation				"info_location"
+
+#define keTeamHive					team_hive
+#define kesTeamHive					"team_hive"
+
+#define keTeamEgg					team_egg
+#define kesTeamEgg					"team_egg"
+
+#define keTriggerRandom				trigger_random
+#define kesTriggerRandom			"trigger_random"
+
+#define keTriggerPresence			trigger_presence
+#define kesTriggerPresence			"trigger_presence"
+
+#define keTriggerScript				trigger_script
+#define kesTriggerScript			"trigger_script"
+
+#define keTeamWebStrand				team_webstrand
+#define kesTeamWebStrand			"team_webstrand"
+
+// Targets fired by game
+#define ktGameStartedStatus			"gamestartedstatus"
+#define ktGameReset					"gamereset"
+									
+// Weapons/Equipment				
+#define kwsKnife					"weapon_knife"
+#define kwKnife						weapon_knife
+#define kwsGrenade					"weapon_grenade"
+#define kwGrenade					weapon_grenade
+#define kwsMachineGun				"weapon_machinegun"
+#define kwMachineGun				weapon_machinegun
+#define kwsPistol					"weapon_pistol"
+#define kwPistol					weapon_pistol
+#define kwsShotGun					"weapon_shotgun"
+#define kwShotGun					weapon_shotgun
+#define kwsHeavyMachineGun			"weapon_heavymachinegun"
+#define kwHeavyMachineGun			weapon_heavymachinegun
+#define kwsGrenadeGun				"weapon_grenadegun"
+#define kwGrenadeGun				weapon_grenadegun
+#define kwsNukeGun					"weapon_nukegun"
+#define kwNukeGun					weapon_nukegun
+#define kwsFlameGun					"weapon_flamegun"
+#define kwFlameGun					weapon_flamegun
+
+// Weapon that dispenses mines
+#define kwsMine						"weapon_mine"
+#define kwMine						weapon_mine
+
+// Deployed mines
+#define	kwDeployedMine				item_mine
+#define	kwsDeployedMine				"item_mine"
+
+#define kwsDeployedTurret			"turret"
+#define kwDeployedTurret			turret
+
+#define kwsHealth					"item_health"
+#define kwHealth					item_health
+
+#define kwsCatalyst                 "item_catalyst"
+#define kwCatalyst                 item_catalyst
+
+#define kwsGenericAmmo				"item_genericammo"
+#define kwGenericAmmo				item_genericammo
+
+#define	kwsHeavyArmor				"item_heavyarmor"
+#define	kwHeavyArmor				item_heavyarmor
+
+#define	kwsJetpack					"item_jetpack"
+#define	kwJetpack					item_jetpack
+
+#define	kwsAmmoPack					"item_ammopack"
+#define	kwAmmoPack					item_ammopack
+
+// Alien weapons
+#define kwsParalysisGun				"weapon_paralysis"
+#define kwParalysisGun				weapon_paralysis
+
+#define kwsSpitGun					"weapon_spit"
+#define kwSpitGun					weapon_spit
+
+#define kwClaws						weapon_claws
+#define kwsClaws					"weapon_claws"
+
+#define kwSwipe						weapon_swipe
+#define kwsSwipe					"weapon_swipe"
+
+#define kwSporeGun					weapon_spore
+#define kwsSporeGun					"weapon_spore"
+
+// Alien projectiles
+#define kwsSpitProjectile			"spitgunprojectile"
+#define kwSpitProjectile			spitgunprojectile
+
+#define kwSporeProjectile			sporegunprojectile
+#define kwsSporeProjectile			"sporegunprojectile"
+
+#define kwSpikeGun					weapon_spikegun
+#define kwsSpikeGun					"weapon_spikegun"
+
+#define kwBiteGun					weapon_bitegun
+#define kwsBiteGun					"weapon_bitegun"
+
+#define kwBite2Gun					weapon_bite2gun
+#define kwsBite2Gun					"weapon_bite2gun"
+
+#define kwResourceTowerGun			weapon_resourcetowergun
+#define kwsResourceTowerGun			"weapon_resourcetowergun"
+
+#define kwOffenseChamberGun			weapon_offensechambergun
+#define kwsOffenseChamberGun		"weapon_offensechambergun"
+
+#define kwDefenseChamberGun			weapon_defensechambergun
+#define kwsDefenseChamberGun		"weapon_defensechambergun"
+
+#define kwSensoryChamberGun			weapon_sensorychambergun
+#define kwsSensoryChamberGun		"weapon_sensorychambergun"
+
+#define kwMovementChamberGun		weapon_movementchambergun
+#define kwsMovementChamberGun		"weapon_movementchambergun"
+
+#define kwHiveGun					weapon_hivegun
+#define kwsHiveGun					"weapon_hivegun"
+
+#define kwHealingSpray				weapon_healingspray
+#define kwsHealingSpray				"weapon_healingspray"
+
+#define kwMetabolize				weapon_metabolize
+#define kwsMetabolize				"weapon_metabolize"
+
+#define kwWebSpinner				weapon_webspinner
+#define kwsWebSpinner				"weapon_webspinner"
+
+#define kwsWebProjectile			"webgunprojectile"
+#define kwWebProjectile				webgunprojectile
+
+#define kwBabblerGun				weapon_babblergun
+#define kwsBabblerGun				"weapon_babblergun"
+
+#define kwBabblerProjectile			weapon_babblerprojectile
+#define kwsBabblerProjectile		"weapon_babblerprojectile"
+
+#define kwPrimalScream				weapon_primalscream
+#define kwsPrimalScream				"weapon_primalscream"
+
+#define kwLeap						weapon_leap
+#define kwsLeap						"weapon_leap"
+
+#define kwAmplify					weapon_amplify
+#define kwsAmplify					"weapon_amplify"
+
+#define kwStomp						weapon_stomp
+#define kwsStomp					"weapon_stomp"
+
+#define kwStompProjectile			stompprojectile
+#define kwsStompProjectile			"stompprojectile"
+		  
+#define kwDevour					weapon_devour
+#define kwsDevour					"weapon_devour"
+
+#define kwCharge					weapon_charge
+#define kwsCharge					"weapon_charge"
+
+#define kwsParasiteGun				"weapon_parasite"
+#define kwParasiteGun				weapon_parasite
+
+#define kwsUmbraCloud				"umbracloud"
+#define kwUmbraCloud				umbracloud
+#define kwsUmbraProjectile			"umbraprojectile"
+#define kwUmbraProjectile			umbraprojectile
+
+#define kwsUmbraGun					"weapon_umbra"
+#define kwUmbraGun					weapon_umbra
+
+#define kwsBlinkGun					"weapon_blink"
+#define kwBlinkGun					weapon_blink
+
+#define kwsDivineWind				"weapon_divinewind"
+#define kwDivineWind				weapon_divinewind
+
+#define kwBileBomb					weapon_bilebomb
+#define kwsBileBomb					"weapon_bilebomb"
+
+#define kwBileBombGun				weapon_bilebombgun
+#define kwsBileBombGun				"weapon_bilebombgun"
+
+#define kwAcidRocket				weapon_acidrocket
+#define kwsAcidRocket				"weapon_acidrocket"
+
+#define kwAcidRocketGun				weapon_acidrocketgun
+#define kwsAcidRocketGun			"weapon_acidrocketgun"
+
+// Debug item
+#define kwsDebugEntity				"item_genericammo"
+
+// Filenames
+#define kMOTDName					"motd.txt"
+
+// Tech node prefix (skill.cfg)
+#define kTechCostPrefix				"avh_techcost_"
+#define kTechHealthPrefix			"avh_techhealth_"
+#define kTechTimePrefix				"avh_techtime_"
+
+// Player models
+#define	kNullModel					"models/null.mdl"
+#define kReadyRoomModel				"models/player.mdl"
+#define kMarineSoldierModel			"models/player/soldier/soldier.mdl"
+#define kHeavySoldierModel			"models/player/heavy/heavy.mdl"
+#define kMarineCommanderModel		"models/player/commander/commander.mdl"
+#define kAlienLevelOneModel			"models/player/alien1/alien1.mdl"
+#define kAlienLevelTwoModel			"models/player/alien2/alien2.mdl"
+#define kAlienLevelThreeModel		"models/player/alien3/alien3.mdl"
+#define kAlienLevelFourModel		"models/player/alien4/alien4.mdl"
+#define kAlienLevelFiveModel		"models/player/alien5/alien5.mdl"
+#define kAlienGestateModel		    "models/player/gestate/gestate.mdl"
+
+//#define kAlienAbilitiesGrantedSound	"misc/a-abilities_granted.wav"
+//#define kAlienAbilitiesLostSound	"misc/a-abilities_lost.wav"
+#define	kAlienBuildingSound1		"misc/a-build1.wav"
+#define	kAlienBuildingSound2		"misc/a-build2.wav"
+#define kDistressBeaconSound		"misc/distressbeacon.wav"
+
+#define kBuildableRecycleSound		"misc/b_recycle.wav"
+#define kBuildableHurt1Sound		"misc/b_hurt1.wav"
+#define kBuildableHurt2Sound		"misc/b_hurt2.wav"
+#define kElectricalSprite			"sprites/lgtning.spr"
+
+// Model names for key
+#define kSoldierName				"soldier"
+#define kHeavyName					"heavy"
+#define kCommanderName				"commander"
+#define kAlien1Name					"alien1"
+#define kAlien2Name					"alien2"
+#define kAlien3Name					"alien3"
+#define kAlien4Name					"alien4"
+#define kAlien5Name					"alien5"
+#define kAlienGestationName			"gestate"
+
+// Sound lists
+#define kPlayerLevelAttackSoundList	"player/role%d_attack"
+#define kPlayerLevelDieSoundList	"player/role%d_die"
+#define kPlayerLevelIdleSoundList	"player/role%d_idle"
+#define kPlayerLevelMoveSoundList	"player/role%d_move"
+#define kPlayerLevelPainSoundList	"player/role%d_pain"
+#define kPlayerLevelSpawnSoundList	"player/role%d_spawn"
+#define kPlayerLevelWoundSoundList	"player/role%d_wound"
+#define kHiveWoundSoundList			"misc/hive_wound"
+
+#define kFallPainSoundFormat	"player/pl_fallpain3-%d.wav"
+
+
+#define	kDigestingSound				"player/digesting.wav"
+
+// Not quite a sound list
+//#define kHiveWoundSoundPrefix		"misc/hive_wound"
+
+#define kPieSelectForwardSound		"hud/select_node_forward.wav"
+#define kPieSelectBackwardSound		"hud/select_node_backward.wav"
+#define kPieSelectForwardAlienSound		"hud/select_node_forward-a.wav"
+#define kPieSelectBackwardAlienSound	"hud/select_node_backward-a.wav"
+#define kSelectSound				"hud/select.wav"
+#define kSelectAlienSound			"hud/select-a.wav"
+#define kSquad1Sound				"hud/squad1.wav"
+#define kSquad2Sound				"hud/squad2.wav"
+#define kSquad3Sound				"hud/squad3.wav"
+#define kSquad4Sound				"hud/squad4.wav"
+#define kSquad5Sound				"hud/squad5.wav"
+
+#define kMarineSquad1Sound			"hud/m-squad1.wav"
+#define kMarineSquad2Sound			"hud/m-squad2.wav"
+#define kMarineSquad3Sound			"hud/m-squad3.wav"
+#define kMarineSquad4Sound			"hud/m-squad4.wav"
+#define kMarineSquad5Sound			"hud/m-squad5.wav"
+
+#define kPlaceBuildingSound			"hud/place_building.wav"
+#define kCountdownSound				"hud/countdown.wav"
+#define kPointsSpentSound			"hud/points_spent.wav"
+#define kAlienPointsReceivedSound	"hud/alien_points_received.wav"
+#define kMarinePointsReceivedSound	"hud/marine_points_received.wav"
+
+#define kMarineResearchComplete		"hud/marine_research_complete.wav"
+#define kMarineSoldierUnderAttack	"hud/marine_soldierunderattack.wav"
+#define kMarineCCOnline1			"hud/marine_cconline1.wav"
+#define kMarineCCOnline2			"hud/marine_cconline2.wav"
+#define kMarineCCUnderAttack1		"hud/marine_ccunderattack1.wav"
+#define kMarineCCUnderAttack2		"hud/marine_ccunderattack2.wav"
+#define kMarineCommanderEjected		"hud/marine_commander_ejected.wav"
+#define kMarineBaseUnderAttack1		"hud/marine_baseattack1.wav"
+#define kMarineBaseUnderAttack2		"hud/marine_baseattack2.wav"
+#define kMarineMoreResources		"hud/marine_more.wav"
+#define kMarineLowResources			"hud/marine_lowresources.wav"
+#define kMarineNeedsAmmo1			"hud/marine_needsammo1.wav"
+#define kMarineNeedsAmmo2			"hud/marine_needsammo2.wav"
+#define kMarineNeedsHealth1			"hud/marine_needshealth1.wav"
+#define kMarineNeedsHealth2			"hud/marine_needshealth2.wav"
+#define kMarineNeedsOrder1			"hud/marine_needsorder1.wav"
+#define kMarineNeedsOrder2			"hud/marine_needsorder2.wav"
+#define kMarineSoldierLost1			"hud/marine_soldierlost1.wav"
+#define kMarineSoldierLost2			"hud/marine_soldierlost2.wav"
+#define kMarineSentryFiring1		"hud/marine_sentryfiring1.wav"
+#define kMarineSentryFiring2		"hud/marine_sentryfiring2.wav"
+#define kMarineSentryTakingDamage1	"hud/marine_sentrytakingdamage1.wav"
+#define kMarineSentryTakingDamage2	"hud/marine_sentrytakingdamage2.wav"
+#define kMarineUpgradeComplete		"hud/marine_upgradecomplete.wav"
+#define kMarineGiveOrders			"hud/marine_giveorders.wav"
+#define kMarineNeedPortal1			"hud/marine_needportal1.wav"
+#define kMarineNeedPortal2			"hud/marine_needportal2.wav"
+#define kMarineGotoAlert			"hud/marine_gotoalert.wav"
+#define kMarineCommanderIdle1		"hud/marine_commanderidle1.wav"
+#define kMarineCommanderIdle2		"hud/marine_commanderidle2.wav"
+#define kMarineArmoryUpgrading		"hud/marine_armoryupgrading.wav"
+
+#define kAlienEnemyApproaches1		"hud/alien_enemyapproaches1.wav"
+#define kAlienEnemyApproaches2		"hud/alien_enemyapproaches2.wav"
+#define kAlienGameOverMan			"hud/alien_gameoverman.wav"
+#define kAlienHiveAttack			"hud/alien_hiveattack.wav"
+#define kAlienHiveComplete1			"hud/alien_hivecomplete1.wav"
+#define kAlienHiveComplete2			"hud/alien_hivecomplete2.wav"
+#define kAlienHiveDying1			"hud/alien_hivedying1.wav"
+#define kAlienHiveDying2			"hud/alien_hivedying2.wav"
+#define kAlienLifeformAttack1		"hud/alien_lifeformattack1.wav"
+#define kAlienLifeformAttack2		"hud/alien_lifeformattack2.wav"
+#define kAlienLowResources			"hud/alien_lowresources.wav"
+#define kAlienMess					"hud/alien_mess.wav"
+#define kAlienMoreResources1		"hud/alien_more1.wav"
+#define kAlienMoreResources2		"hud/alien_more2.wav"
+#define kAlienNeedBetter			"hud/alien_needbetter.wav"
+#define kAlienNeedBuilders1			"hud/alien_needbuilders1.wav"
+#define kAlienNeedBuilders2			"hud/alien_needbuilders2.wav"
+#define kAlienNewTrait1				"hud/alien_newtrait1.wav"
+#define kAlienNewTrait2				"hud/alien_newtrait2.wav"
+#define kAlienNowDonce				"hud/alien_now.wav"
+#define kAlienResourceAttack1		"hud/alien_resourceattack1.wav"
+#define kAlienResourceAttack2		"hud/alien_resourceattack2.wav"
+#define kAlienSeeDead				"hud/alien_seedead.wav"
+#define kAlienStructureAttack1		"hud/alien_structureattack1.wav"
+#define kAlienStructureAttack2		"hud/alien_structureattack2.wav"
+#define kAlienUpgradeLost			"hud/alien_upgrade_lost.wav"
+
+#define kSoundOrderMove1			"hud/marine_order_move1.wav"
+#define kSoundOrderMove2			"hud/marine_order_move2.wav"
+#define kSoundOrderMove3			"hud/marine_order_move3.wav"
+#define kSoundOrderMove4			"hud/marine_order_move4.wav"
+#define kSoundOrderAttack			"hud/marine_order_attack.wav"
+#define kSoundOrderBuild			"hud/marine_order_build.wav"
+#define kSoundOrderWeld				"hud/marine_order_weld.wav"
+#define kSoundOrderGuard			"hud/marine_order_guard.wav"
+#define	kSoundOrderGet				"hud/marine_order_get.wav"
+#define	kSoundOrderComplete1		"hud/marine_order_complete1.wav"
+#define	kSoundOrderComplete2		"hud/marine_order_complete2.wav"
+#define	kSoundOrderComplete3		"hud/marine_order_complete3.wav"
+#define	kSoundOrderComplete4		"hud/marine_order_complete4.wav"
+#define	kSoundOrderComplete5		"hud/marine_order_complete5.wav"
+#define	kSoundOrderComplete6		"hud/marine_order_complete6.wav"
+
+#define kAlienGameStart1			"hud/alien_gamestart1.wav"
+#define kAlienGameStart2			"hud/alien_gamestart2.wav"
+#define kMarineGameStart1			"hud/marine_gamestart1.wav"
+#define kMarineGameStart2			"hud/marine_gamestart2.wav"
+#define kYouWinSound				"hud/you_win.wav"
+#define kYouLoseSound				"hud/you_lose.wav"
+#define kTooltipSound				"hud/tooltip.wav"
+#define	kMyHiveEasterEgg			"hud/alien_myhive.wav"
+
+// Tech category names				
+#define kWeaponTechCategory			"WeaponCategory"
+#define kArmorTechCategory			"ArmorCategory"
+#define kBuildTechCategory			"BuildCategory"
+#define kRadioTechCategory			"RadioCategory"
+
+// Tech button components are the category plus this suffix
+//#define kMessageButtonsSuffix		"Buttons"
+#define kTechNodeLabelPrefix		"TechNodeLabel_"
+#define kTechNodeHelpPrefix			"TechNodeHelp_"
+#define kPrerequisitePrefix			"Prerequisite"
+#define kUser3Name					"User3Name_"
+#define kUser3Description			"User3Desc_"
+#define kUser3FriendlyDescription	"User3FriendlyDesc_"
+#define kUser3CommanderDescription	"User3CommanderDesc_"
+#define kBlipStatusPrefix			"BlipStatus_"
+#define kMessageButtonCost			"Cost"
+#define kNotFullyBuilt				"NotFullyBuilt"
+#define kPointsSuffix				"Points"
+
+const float kSquadHierarchyScaleFactor = .0001f;
+const float kCommanderHierarchyScaleFactor = .0002f;
+
+// Sayings
+#define kSoldierSayingList			"vox/ssay%d"
+#define kCommanderSayingList		"vox/csay%d"
+#define kAlienSayingList			"vox/asay%d"
+
+#define kSoldierOrderRequestList	"vox/sreq"
+#define kSoldierOrderAckList		"vox/sack"
+
+// Other sounds
+#define kJetpackSound				"misc/jetpack.wav"
+//#define kAdrenalineSound			"misc/adren.wav"
+#define kGestationSound				"misc/gestate.wav"
+#define kConnectSound				"misc/connect.wav"
+//#define kDisconnectSound			"misc/disconnect.wav"
+#define kEmptySound					"weapons/357_cock1.wav"
+#define kInvalidSound				"misc/invalid.wav"
+#define kLevelUpMarineSound			"misc/levelup.wav"
+#define kLevelUpAlienSound			"misc/a-levelup.wav"
+// joev: bug 0000767
+#define kPlayerJoinedSound			"player/jointeam.wav"
+// :joev
+
+// Events
+#define kJetpackEvent				"events/Jetpack.sc"
+#define kStartOverwatchEvent		"events/StartOverwatch.sc"
+#define kEndOverwatchEvent			"events/EndOverwatch.sc"
+
+#define	kStopVoiceSoundEvent		"events/StopVoice.sc"
+
+#define kRegenerationEvent			"events/Regeneration.sc"
+#define kStartCloakEvent			"events/StartCloak.sc"
+#define kEndCloakEvent				"events/EndCloak.sc"
+
+#define kWallJumpEvent				"events/WallJump.sc"
+#define kFlightEvent				"events/Flight.sc"
+#define kTeleportEvent				"events/Teleport.sc"
+#define kSiegeHitEvent				"events/SiegeHit.sc"
+#define kSiegeViewHitEvent			"events/SiegeViewHit.sc"
+#define kPhaseInEvent				"events/PhaseIn.sc"
+#define kCommanderPointsAwardedEvent	"events/CommandPoints.sc"
+#define kEmptySoundEvent			"events/Empty.sc"
+#define kNumericalInfoEvent			"events/NumericalInfo.sc"
+#define kAlienSightOnEvent			"events/AlienSightOn.sc"
+#define kAlienSightOffEvent			"events/AlienSightOff.sc"
+#define kInvalidActionEvent			"events/InvalidAction.sc"
+#define kParticleEvent				"events/Particle.sc"
+#define kDistressBeaconEvent		"events/DistressBeacon.sc"
+#define kWeaponAnimationEvent		"events/WeaponAnimation.sc"
+#define kLevelUpEvent				"events/LevelUp.sc"
+#define	kAbilityEventName			"events/Ability.sc"
+
+// Targets
+#define	kTargetCommandStationUseTeamOne				"commandstationuse1"
+#define	kTargetCommandStationUseTeamTwo				"commandstationuse2"
+
+#define	kTargetCommandStationLogoutTeamOne			"commandstationlogout1"
+#define	kTargetCommandStationLogoutTeamTwo			"commandstationlogout2"
+
+#define	kTargetCommandStationDestroyedTeamOne		"commandstationdestroyed1"
+#define	kTargetCommandStationDestroyedTeamTwo		"commandstationdestroyed2"
+
+#define kReadyNotification			"ready"
+#define kNotReadyNotification		"notready"
+
+const int	kOverwatchBreakingVelocity					= 5;
+const float kOverwatchAcquireTime						= 6.0f;
+const float	kOverwatchLostTargetTime					= 4.0f;
+const float	kOverwatchKeepFiringAfterMissingTargetTime	= 1.0f;
+const float	kSpeakingTime								= 4.0f;
+const float	kEnemySightedTime							= 2.0f;
+
+const int	kDefaultViewHeight							= 0;
+const float kDefaultMinMapExtent						= -4000;
+const float kDefaultMaxMapExtent						= 4000;
+
+// Energy constants for marine structures
+const float kMarineStructureEnergyRate = .33f;
+const float kMarineStructureMaxEnergy = 100;
+
+const int	kShellRenderAmount							= 50;
+const int	kInvulShellRenderAmount						= 15;
+
+// This is one less then 4096 because we need top bit for sign.
+// Only allow map dimensions of this size or lower
+const float kMaxMapDimension							= 4095;
+
+const float kDefaultMapGamma							= 1.0f;
+
+const float kNormalizationNetworkFactor					= 1000.0f;
+const float kHotKeyNetworkFactor						= 100.0f;
+
+const int kDetectionDistance							= 500;
+const float kMaxRelevantCullDistance					= 1024;
+
+const int kHiveXYDistanceTolerance						= 400;
+const float	kBaseHealthPercentage						= .5f;
+
+const float kHUDSoundVolume								= .3f;
+
+#define	kHotKeyPrefix									"hotkey"
+
+// How many directions can bullets travel in within spread vector?
+//const int kBulletSpreadGranularity						= 15;
+
+const int		iNumberOfTeamColors = 6;
+extern int		kTeamColors[iNumberOfTeamColors][3];
+extern float	kFTeamColors[iNumberOfTeamColors][3];
+
+// Random resource constants
+const int		kNumSharesPerPlayer = 3;
+const int		kTotalShares = MAX_PLAYERS_PER_TEAM*kNumSharesPerPlayer;
+
+const int		kNumericalInfoResourcesEvent			= 0;
+const int		kNumericalInfoHealthEvent				= 1;
+const int		kNumericalInfoResourcesDonatedEvent		= 2;
+const int		kNumericalInfoAmmoEvent					= 3;
+
+const int		kGameStatusReset						= 0;
+const int		kGameStatusResetNewMap					= 1;
+const int		kGameStatusEnded						= 2;
+const int		kGameStatusGameTime						= 3;
+const int		kGameStatusUnspentLevels				= 4;
+
+// Max message length is 192, take into account rest of message
+const int		kMaxPlayerSendMessageLength				= 160;
+
+const int		kTopDownYaw = 90;
+const int		kTopDownPitch = 0;
+const int		kTopDownRoll = -90;
+
+// Extra fudge factor to make sure players don't get stuck when respawning
+const int		kRespawnFudgeFactorHeight = 1;
+
+#endif
diff --git a/main/source/mod/AvHCurl.cpp b/main/source/mod/AvHCurl.cpp
new file mode 100644
index 00000000..995f0785
--- /dev/null
+++ b/main/source/mod/AvHCurl.cpp
@@ -0,0 +1,546 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHCurl.cpp $
+// $Date: $
+//
+//-------------------------------------------------------------------------------
+// $Log: $
+//===============================================================================
+
+#include "build.h"
+
+#if !defined(USE_UPP) // forget entire file if we're using UPP instead
+
+#include "util/nowarnings.h"
+#include "extdll.h"
+#include "dlls/util.h"
+#include "util/Tokenizer.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHServerUtil.h"
+#include "curl/include/curl/curl.h"
+
+extern cvar_t							avh_serverops;
+extern unsigned int						gTimeLastUpdatedUplink;
+extern AuthMaskListType					gAuthMaskList;
+
+extern const char* kSteamIDPending;
+extern const char* kSteamIDPrefix;
+
+//const char* kWebStatusURL = "https://www.natural-selection.org/cgi-bin/VictoryStats.pl";
+//const char* kWebStatusURL = "http://www.natural-selection.org/cgi-bin/ikonboard/ikonboard.cgi";
+
+void AvHGamerules::PostVictoryStatsToWeb(const string& inFormParams) const
+{
+//	CURL* curl;
+//	CURLcode res;
+//	
+//	curl = curl_easy_init();
+//	if(curl) 
+//	{
+//		/* First set the URL that is about to receive our POST. This URL can
+//		   just as well be a https:// URL if that is what should receive the
+//		   data. */
+//		curl_easy_setopt(curl, CURLOPT_URL, kWebStatusURL);
+//
+//		/* Now specify the POST data */
+//		curl_easy_setopt(curl, CURLOPT_POSTFIELDS, inFormParams.c_str());
+//		
+//		/* Perform the request, res will get the return code */
+//		res = curl_easy_perform(curl);
+//		
+//		/* always cleanup */
+//		curl_easy_cleanup(curl);
+//	}
+
+    //struct soap soap;	// allocate gSOAP runtime environment
+    //soap;
+
+/*
+    char *sym;
+    float q;
+    if (argc <= 1)
+        sym = "IBM";
+    else
+        sym = argv[1];
+    soap_init(&soap);	// must initialize
+    if (soap_call_ns__getQuote(&soap, "http://services.xmethods.net/soap", "", sym, &q) == 0)
+        printf("\nCompany - %s    Quote - %f\n", sym, q);
+    else
+    {
+        soap_print_fault(&soap, stderr);
+        soap_print_fault_location(&soap, stderr);
+    }
+*/
+}
+
+// This authID could be either a WONID or a STEAMID
+int	AvHGamerules::GetAuthenticationMask(const string& inAuthID) const
+{
+	// Iterate through each mask type, oring it into the mask if id is found
+	int theMask = 0;
+
+	if(inAuthID == kSteamIDPending)
+	{
+		theMask = PLAYERAUTH_PENDING;
+	}
+	else
+	{
+		// Error check the incoming authID
+		if(AvHSUGetIsValidAuthID(inAuthID))
+		{
+			for(AuthMaskListType::const_iterator theIter = gAuthMaskList.begin(); theIter != gAuthMaskList.end(); theIter++)
+			{
+				const AuthIDListType& theAuthIDList = theIter->second;
+
+				for(AuthIDListType::const_iterator theAuthListIter = theAuthIDList.begin(); theAuthListIter != theAuthIDList.end(); theAuthListIter++)
+				{
+					// Check if incoming authID is equal to this record's WONID _or_ STEAMID.  This is kind of sloppy, but it allows backwards compatibility.
+					if((theAuthListIter->first == inAuthID) || (theAuthListIter->second == inAuthID))
+					{
+						AvHPlayerAuthentication theCurrentAuthMask = theIter->first;
+						theMask |= theCurrentAuthMask;
+						break;
+					}
+				}
+			}
+
+			// Check if any players are server ops
+			const AuthIDListType& theServerOps = this->GetServerOpList();
+			for(AuthIDListType::const_iterator theAuthListIter = theServerOps.begin(); theAuthListIter != theServerOps.end(); theAuthListIter++)
+			{
+				if((inAuthID == theAuthListIter->first) || (inAuthID == theAuthListIter->second))
+				{
+					theMask |= PLAYERAUTH_SERVEROP;
+					break;
+				}
+			}
+		}
+	}
+	
+	return theMask;
+}
+
+void AvHGamerules::AddAuthStatus(AvHPlayerAuthentication inAuthMask, const string& inWONID, const string& inSteamID)
+{
+//	int theData = 0;
+
+	// Not sure why this is needed, but it seems to ("warning, decorated name length exceeded)
+	#pragma warning (disable: 4503)
+
+	AuthIDListType& theAuthList = gAuthMaskList[inAuthMask];
+
+	bool theFoundEntry = false;
+
+	for(AuthIDListType::iterator theIter = theAuthList.begin(); theIter != theAuthList.end(); theIter++)
+	{
+        // Allow duplicate WONids but not SteamIDs
+		if(inSteamID == theIter->second)
+		{
+			theFoundEntry = true;
+			break;
+		}
+	}
+
+	if(!theFoundEntry)
+	{
+		// Add entry for this id
+		theAuthList.push_back( make_pair(inWONID, inSteamID) );
+	}
+}
+
+struct MemoryStruct {
+	char *memory;
+	size_t size;
+};
+
+size_t WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data)
+{
+	register int realsize = size * nmemb;
+	struct MemoryStruct *mem = (struct MemoryStruct *)data;
+	
+	mem->memory = (char *)realloc(mem->memory, mem->size + realsize + 1);
+	if (mem->memory) {
+		memcpy(&(mem->memory[mem->size]), ptr, realsize);
+		mem->size += realsize;
+		mem->memory[mem->size] = 0;
+	}
+	return realsize;
+}
+
+bool TagToAuthMask(const string& inTag, AvHPlayerAuthentication& outMask)
+{
+	bool theSuccess = false;
+
+	if(inTag == "dev")
+	{
+		outMask = PLAYERAUTH_DEVELOPER;
+		theSuccess = true;
+	}
+	else if(inTag == "guide")
+	{
+		outMask = PLAYERAUTH_GUIDE;
+		theSuccess = true;
+	}
+	else if(inTag == "op")
+	{
+		outMask = PLAYERAUTH_SERVEROP;
+		theSuccess = true;
+	}
+	else if(inTag == "pt")
+	{
+		outMask = PLAYERAUTH_PLAYTESTER;
+		theSuccess = true;
+	}
+	else if(inTag == "const")
+	{
+		outMask = PLAYERAUTH_CONTRIBUTOR;
+		theSuccess = true;
+	}
+	else if(inTag == "vet")
+	{
+		outMask = PLAYERAUTH_VETERAN;
+		theSuccess = true;
+	}
+	else if(inTag == "betaop")
+	{
+		outMask = PLAYERAUTH_BETASERVEROP;
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+// Build string in obfuscated procedural way so it can't be scanned for and hacked.  Build URL using IP instead of domain to 
+// make sure proxy can't change it either.
+string BuildAuthenticationURL()
+{
+	// "http://www.natural-selection.org/auth.php";
+	// (backwards-compatibly for pre-2.1 servers use: (http://www.natural-selection.org/auth/)
+	string kAuthURL = "h";
+
+	kAuthURL += "t";
+	kAuthURL += "t";
+	kAuthURL += "p";
+	//kAuthURL += "s";
+	kAuthURL += ":";
+	kAuthURL += "/";
+	kAuthURL += "/";
+	kAuthURL += "w";
+	kAuthURL += "w";
+	kAuthURL += "w";
+	kAuthURL += ".";
+	kAuthURL += "n";
+	kAuthURL += "a";
+	kAuthURL += "t";
+	kAuthURL += "u";
+	kAuthURL += "r";
+	kAuthURL += "a";
+	kAuthURL += "l";
+	kAuthURL += "-";
+	kAuthURL += "s";
+	kAuthURL += "e";
+	kAuthURL += "l";
+	kAuthURL += "e";
+	kAuthURL += "c";
+	kAuthURL += "t";
+	kAuthURL += "i";
+	kAuthURL += "o";
+	kAuthURL += "n";
+	kAuthURL += ".";
+	kAuthURL += "o";
+	kAuthURL += "r";
+	kAuthURL += "g";
+	kAuthURL += "/";
+	kAuthURL += "a";
+	kAuthURL += "u";
+	kAuthURL += "t";
+	kAuthURL += "h";
+	kAuthURL += "/";
+	kAuthURL += "a";
+	kAuthURL += "u";
+	kAuthURL += "t";
+	kAuthURL += "h";
+	kAuthURL += ".";
+	kAuthURL += "p";
+	kAuthURL += "h";
+	kAuthURL += "p";
+
+	return kAuthURL;
+}
+
+string BuildVersionURL()
+{
+	// "http://207.44.144.68/auth.txt";
+	string kAuthURL = "h";
+	
+	kAuthURL += "t";
+	kAuthURL += "t";
+	kAuthURL += "p";
+	//kAuthURL += "s";
+	kAuthURL += ":";
+	kAuthURL += "/";
+	kAuthURL += "/";
+	kAuthURL += "w";
+	kAuthURL += "w";
+	kAuthURL += "w";
+	kAuthURL += ".";
+	kAuthURL += "n";
+	kAuthURL += "a";
+	kAuthURL += "t";
+	kAuthURL += "u";
+	kAuthURL += "r";
+	kAuthURL += "a";
+	kAuthURL += "l";
+	kAuthURL += "-";
+	kAuthURL += "s";
+	kAuthURL += "e";
+	kAuthURL += "l";
+	kAuthURL += "e";
+	kAuthURL += "c";
+	kAuthURL += "t";
+	kAuthURL += "i";
+	kAuthURL += "o";
+	kAuthURL += "n";
+	kAuthURL += ".";
+	kAuthURL += "o";
+	kAuthURL += "r";
+	kAuthURL += "g";
+	kAuthURL += "/";
+	kAuthURL += "a";
+	kAuthURL += "u";
+	kAuthURL += "t";
+	kAuthURL += "h";
+	kAuthURL += "/";
+	kAuthURL += "v";
+	kAuthURL += "e";
+	kAuthURL += "r";
+	kAuthURL += "s";
+	kAuthURL += "i";
+	kAuthURL += "o";
+	kAuthURL += "n";
+	kAuthURL += ".";
+	kAuthURL += "t";
+	kAuthURL += "x";
+	kAuthURL += "t";
+	
+	return kAuthURL;
+}
+
+string BuildUserPassword()
+{
+	string theUserPassword;
+
+	// auth:mnbv5tgb
+	theUserPassword += "a";
+	theUserPassword += "u";
+	theUserPassword += "t";
+	theUserPassword += "h";
+	theUserPassword += ":";
+	theUserPassword += "m";
+	theUserPassword += "n";
+	theUserPassword += "b";
+	theUserPassword += "v";
+	theUserPassword += "5";
+	theUserPassword += "t";
+	theUserPassword += "g";
+	theUserPassword += "b";
+	
+	return theUserPassword;
+}
+
+CURLcode PopulateChunkFromURL(const string& inURL, MemoryStruct& outChunk)
+{
+	const int kCurlTimeout = 5;
+
+	// init the curl session
+	CURL* theCurlHandle = curl_easy_init();
+	
+	// specify URL to get
+	curl_easy_setopt(theCurlHandle, CURLOPT_URL, inURL.c_str());
+	
+	// send all data to this function
+	curl_easy_setopt(theCurlHandle, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
+
+	// Ignore header and progress so there isn't extra stuff at the beginning of the data returned
+	//curl_easy_setopt(theCurlHandle, CURLOPT_HEADER, 0);
+	//curl_easy_setopt(theCurlHandle, CURLOPT_NOPROGRESS, 1);
+    //curl_easy_setopt(theCurlHandle, CURLOPT_VERBOSE, 0);
+    //curl_easy_setopt(theCurlHandle, CURLOPT_NOBODY, 1);
+
+	// timeout (3 seconds)
+	curl_easy_setopt(theCurlHandle, CURLOPT_CONNECTTIMEOUT, kCurlTimeout);
+	curl_easy_setopt(theCurlHandle, CURLOPT_TIMEOUT, kCurlTimeout);
+	curl_easy_setopt(theCurlHandle, CURLOPT_NOSIGNAL, true);
+	// CURLOPT_LOW_SPEED_LIMIT?
+	// CURLOPT_LOW_SPEED_TIME?
+
+	// Specify the user name and password
+	string kUserPassword = BuildUserPassword();
+	curl_easy_setopt(theCurlHandle, CURLOPT_USERPWD, kUserPassword.c_str());
+	
+	// we pass our 'theChunk' struct to the callback function
+	outChunk.memory=NULL; /* we expect realloc(NULL, size) to work */
+	outChunk.size = 0;    /* no data at this point */
+	curl_easy_setopt(theCurlHandle, CURLOPT_FILE, (void *)&outChunk);
+	
+	// get it!
+	CURLcode theCode = curl_easy_perform(theCurlHandle);
+	
+	// cleanup curl stuff
+	curl_easy_cleanup(theCurlHandle);
+   
+	return theCode;
+}
+
+void AvHGamerules::InitializeAuthentication()
+{
+	bool theSuccess = false;
+
+	ALERT(at_console, "\tReading authentication data...");
+
+    struct MemoryStruct theChunk;
+	CURLcode theCode = PopulateChunkFromURL(BuildAuthenticationURL(), theChunk);
+	
+	// Now parse data and add users for each mask
+	if((theCode == CURLE_OK) && theChunk.memory)
+	{
+        // Clear existing authentication data, only after lookup succeeds
+        gAuthMaskList.clear();
+
+		string theString(theChunk.memory);
+		string theDelimiters("\r\n");
+		StringVector theLines;
+		Tokenizer::split(theString, theDelimiters, theLines);
+		
+		// Run through each line
+		int theNumConstellationMembers = 0;
+		for(StringVector::const_iterator theIter = theLines.begin(); theIter != theLines.end(); theIter++)
+		{
+			// If it's not empty and not a comment
+			char theFirstChar = (*theIter)[0];
+			if((theFirstChar != '/') && (theFirstChar != '#'))
+			{
+				// Split up tag and number
+				StringVector theTokens;
+				if(Tokenizer::split(*theIter, " ", theTokens) == 3)
+				{
+					// Translate tag to auth mask
+					string theTag = theTokens[0];
+					string theWONID = theTokens[1];
+					string theSteamID = theTokens[2];
+
+                    // Upper-case prefix
+                    UppercaseString(theSteamID);
+
+                    // Make sure it starts with "STEAM_X:Y"
+					if(strncmp(theSteamID.c_str(), kSteamIDPrefix, strlen(kSteamIDPrefix)))
+                    {
+                        string theNewSteamID = kSteamIDPrefix + theSteamID;
+                        theSteamID = theNewSteamID;
+                    }
+
+					// Add auth status
+					AvHPlayerAuthentication theMask = PLAYERAUTH_NONE;
+					if(TagToAuthMask(theTag, theMask))
+					{
+						// Count Constellation members fyi
+						if(theMask & PLAYERAUTH_CONTRIBUTOR)
+						{
+							theNumConstellationMembers++;
+						}
+
+						if((theWONID != "") || (theSteamID != ""))
+						{
+#ifdef DEBUG
+							char theMessage[512];
+							sprintf(theMessage, "	Adding auth mask: %s %s %s\n", theTag.c_str(), theWONID.c_str(), theSteamID.c_str());
+							ALERT(at_logged, theMessage);
+#endif
+							
+							this->AddAuthStatus(theMask, theWONID, theSteamID);
+							theSuccess = true;
+						}
+					}
+				}
+			}
+		}
+
+		// Breakpoint to see how many Constellation members there are (don't even think of printing or logging)
+		int a = 0;
+	}
+    else
+    {
+        int a = 0;
+    }
+
+	// Now build server op list
+	this->mServerOpList.clear();
+		
+	// Parse contents server op variable
+	string theServerOpsString(avh_serverops.string);
+	
+	// Tokenize string
+	StringVector theServerOpsStrings;
+	Tokenizer::split(theServerOpsString, ";", theServerOpsStrings);
+	
+	// For each in list, add as an int to our list
+	for(StringVector::const_iterator theIter = theServerOpsStrings.begin(); theIter != theServerOpsStrings.end(); theIter++)
+	{
+		// Add whatever the put in this line as both the WONID and SteamID
+		string theCurrentAuthID = *theIter;
+		this->mServerOpList.push_back( make_pair(theCurrentAuthID, theCurrentAuthID));
+	}
+	
+	if(theSuccess)
+	{
+		ALERT(at_console, "success.\n");
+	}
+	else
+	{
+		ALERT(at_console, "failure.\n");
+	}
+	gTimeLastUpdatedUplink = AvHSUTimeGetTime();
+}
+
+void AvHGamerules::DisplayVersioning()
+{
+	struct MemoryStruct theChunk;
+	CURLcode theCode = PopulateChunkFromURL(BuildVersionURL(), theChunk);
+
+	// Now parse data and add users for each mask
+	if((theCode == CURLE_OK) && theChunk.memory)
+	{
+		string theString(theChunk.memory, theChunk.size);
+
+		string theDelimiters("\r\n");
+		StringVector theLines;
+		Tokenizer::split(theString, theDelimiters, theLines);
+
+		if(theLines.size() > 0)
+		{
+			string theCurrentVersion(theLines[0]);
+			string theCurrentGameVersion = AvHSUGetGameVersionString();
+
+			char theMessage[1024];
+			if(theCurrentGameVersion != theCurrentVersion)
+			{
+				sprintf(theMessage, "\tServer out of date.  NS version %s is now available!\n", theCurrentVersion.c_str());
+				ALERT(at_console, theMessage);
+			}
+			else
+			{
+				sprintf(theMessage, "\tServer version is up to date.\n");
+				ALERT(at_console, theMessage);
+			}
+		}
+	}
+}
+
+#endif //!defined(USE_UPP)
\ No newline at end of file
diff --git a/main/source/mod/AvHDebugUtil.h b/main/source/mod/AvHDebugUtil.h
new file mode 100644
index 00000000..7fb26403
--- /dev/null
+++ b/main/source/mod/AvHDebugUtil.h
@@ -0,0 +1,25 @@
+#ifndef AVH_DEBUG_UTIL_H
+#define AVH_DEBUG_UTIL_H
+
+#include <windows.h>
+#include <iostream>
+
+/**
+ * Writes the call stack for a context to the stream.
+ */
+void LogStack(std::ostream& stream, CONTEXT& c, HANDLE hThread);
+
+/**
+ * Writes information about an exception to the stream.
+ */
+void LogException(std::ostream& stream, EXCEPTION_POINTERS* pExp);
+
+/**
+ * Sends an e-mail. Line breaks in the message should be specified with a
+ * carriage return character followed by a new line character. If the mail
+ * could not be sent the function returns false.
+ */
+bool SendMail(const char* serverName, const char* fromAddress, const char* fromName,
+    const char* toAddress, const char* subject, const char* message);
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHDevour.cpp b/main/source/mod/AvHDevour.cpp
new file mode 100644
index 00000000..4cb96e72
--- /dev/null
+++ b/main/source/mod/AvHDevour.cpp
@@ -0,0 +1,220 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHDevour.cpp $
+// $Date: $
+//
+//-------------------------------------------------------------------------------
+// $Log: $
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+#include "mod/AvHConstants.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHGamerules.h"
+#include "mod/AvHServerUtil.h"
+#endif
+
+#include "mod/AvHParticleConstants.h"
+
+LINK_ENTITY_TO_CLASS(kwDevour, AvHDevour);
+
+BOOL AvHDevour::CanHolster(void)
+{
+	return true;
+}
+
+void AvHDevour::Init()
+{
+	this->mRange = BALANCE_IVAR(kDevourRange);
+}
+
+int	AvHDevour::GetBarrelLength() const
+{
+	return 0;
+}
+
+float AvHDevour::GetRateOfFire() const
+{
+	return BALANCE_FVAR(kDevourROF);
+}
+
+int	AvHDevour::GetDeployAnimation() const
+{
+	// Look at most recently used weapon and see if we can transition from it
+	int theDeployAnimation = 8;
+	
+	AvHWeaponID thePreviousID = this->GetPreviousWeaponID();
+	
+	switch(thePreviousID)
+	{
+	case AVH_WEAPON_CLAWS:
+		theDeployAnimation = 8;
+		break;
+	case AVH_ABILITY_CHARGE:
+		theDeployAnimation = 12;
+		break;
+	case AVH_WEAPON_STOMP:
+		theDeployAnimation = 17;
+		break;
+	}
+	
+	return theDeployAnimation;
+}
+
+float AvHDevour::GetDeployTime() const
+{
+	return .6f;
+}
+
+bool AvHDevour::GetFiresUnderwater() const
+{
+	return true;
+}
+
+bool AvHDevour::GetIsCapableOfFiring() const
+{
+	bool theIsCapableOfFiring = false;
+
+    if(!GetHasUpgrade(this->m_pPlayer->pev->iuser4, MASK_DIGESTING))
+	{
+		theIsCapableOfFiring = true;
+	}
+	else
+	{
+		int a = 0;
+	}
+
+	return theIsCapableOfFiring;
+}
+
+int AvHDevour::GetIdleAnimation() const
+{
+	int theIdle = 4;
+    
+	if(GetHasUpgrade(this->m_pPlayer->pev->iuser4, MASK_DIGESTING))
+	{
+		theIdle = 26;
+	}
+
+	return theIdle;
+}
+
+bool AvHDevour::GetIsDroppable() const
+{
+	return false;
+}
+
+int AvHDevour::GetShootAnimation() const
+{
+	return 25;
+}
+
+void AvHDevour::FireProjectiles(void)
+{
+#ifdef AVH_SERVER
+	// If we're not already digesting a player
+	if(this->GetIsCapableOfFiring())
+	{
+		UTIL_MakeVectors(this->m_pPlayer->pev->v_angle);
+		
+		// Look for enemy player in front of us
+		Vector vecAiming = gpGlobals->v_forward;
+		Vector vecSrc = this->m_pPlayer->GetGunPosition( ) + vecAiming;
+		Vector vecEnd = vecSrc + vecAiming*this->mRange;
+
+		TraceResult theTraceResult;
+		UTIL_TraceLine(vecSrc, vecEnd, dont_ignore_monsters, this->m_pPlayer->edict(), &theTraceResult);
+
+		edict_t* theEntityHit = theTraceResult.pHit;
+		AvHPlayer* theDigestee = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(theEntityHit));
+		if(theDigestee && theDigestee->GetCanBeAffectedByEnemies() && GetGameRules()->CanEntityDoDamageTo(this->m_pPlayer, theDigestee))
+		{
+			// Never devour friends or gestating players
+			if((theDigestee->GetTeam() != this->m_pPlayer->pev->team) && theDigestee->IsAlive() && (theDigestee->GetUser3() != AVH_USER3_ALIEN_EMBRYO))
+			{
+				AvHPlayer* theDigester = dynamic_cast<AvHPlayer*>(this->m_pPlayer);
+				ASSERT(theDigester);
+
+				theDigester->StartDigestion(theDigestee->entindex());
+			}
+		}
+	}
+#endif	
+
+	// Immediately play idle after attack animation is done (either "full" or "empty" idle)
+	this->m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + this->GetRateOfFire();
+}
+
+char* AvHDevour::GetViewModel() const
+{
+	return kLevel5ViewModel;
+}
+
+void AvHDevour::Precache()
+{
+	AvHAlienWeapon::Precache();
+
+	PRECACHE_UNMODIFIED_SOUND(kDevourFireSound);
+	PRECACHE_UNMODIFIED_SOUND(kDevourSwallowSound);
+	PRECACHE_UNMODIFIED_SOUND(kDevourCompleteSound);
+	PRECACHE_UNMODIFIED_SOUND(kDevourCancelSound);
+
+	this->mEvent = PRECACHE_EVENT(1, kDevourShootEventName);
+}
+
+bool AvHDevour::ProcessValidAttack(void)
+{
+	bool theReturnCode = AvHAlienWeapon::ProcessValidAttack();
+
+	if(theReturnCode)
+	{
+		theReturnCode = this->GetIsCapableOfFiring();
+	}
+
+	return theReturnCode;
+}
+
+
+void AvHDevour::Spawn() 
+{ 
+    AvHAlienWeapon::Spawn(); 
+
+	Precache();
+
+	this->m_iId = AVH_WEAPON_DEVOUR;
+
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsDevour);
+
+	SET_MODEL(ENT(this->pev), kNullModel);
+
+	FallInit();// get ready to fall down.
+} 
+
+bool AvHDevour::UsesAmmo(void) const
+{
+	return false;
+}
+
diff --git a/main/source/mod/AvHDivineWind.cpp b/main/source/mod/AvHDivineWind.cpp
new file mode 100644
index 00000000..b7f3b0c4
--- /dev/null
+++ b/main/source/mod/AvHDivineWind.cpp
@@ -0,0 +1,238 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHDivineWind.cpp$
+// $Date: 2002/11/22 21:28:16 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHDivineWind.cpp,v $
+// Revision 1.11  2002/11/22 21:28:16  Flayra
+// - mp_consistency changes
+//
+// Revision 1.10  2002/10/16 00:52:55  Flayra
+// - Plays cool effect now
+//
+// Revision 1.9  2002/09/23 22:12:20  Flayra
+// - Removed offensive upgrade awareness
+//
+// Revision 1.8  2002/08/16 02:44:10  Flayra
+// - New damage types
+//
+// Revision 1.7  2002/07/24 19:09:16  Flayra
+// - Linux issues
+//
+// Revision 1.6  2002/07/24 18:55:51  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.5  2002/07/24 18:45:41  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.4  2002/06/25 17:50:59  Flayra
+// - Reworking for correct player animations and new enable/disable state, new view model artwork, alien weapon refactoring
+//
+// Revision 1.3  2002/06/10 19:49:06  Flayra
+// - Updated with new alien view model artwork (with running anims)
+//
+// Revision 1.2  2002/06/03 16:27:06  Flayra
+// - Animation constants and changes with new artwork
+//
+// Revision 1.1  2002/05/23 02:33:41  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHGamerules.h"
+#include "mod/AvHServerUtil.h"
+#endif
+
+#include "mod/AvHParticleConstants.h"
+#include "mod/AvHSharedUtil.h"
+
+LINK_ENTITY_TO_CLASS(kwDivineWind, AvHDivineWind);
+extern int gDivineWindStartEventID;
+
+BOOL AvHDivineWind::CanHolster(void)
+{
+	return true;
+}
+
+void AvHDivineWind::Init()
+{
+	this->mRange = kDivineWindRange;
+	this->mDamage = BALANCE_IVAR(kDivineWindDamage);
+	this->mPrimed = false;
+}
+
+int	AvHDivineWind::GetBarrelLength() const
+{
+	return 0;
+}
+
+float AvHDivineWind::GetRateOfFire() const
+{
+	return BALANCE_FVAR(kDivineWindROF);
+}
+
+int	AvHDivineWind::GetDeployAnimation() const
+{
+	return 13;
+}
+
+bool AvHDivineWind::GetFiresUnderwater() const
+{
+	return true;
+}
+
+bool AvHDivineWind::GetIsDroppable() const
+{
+	return false;
+}
+
+int AvHDivineWind::GetShootAnimation() const
+{
+	return -1;
+}
+
+BOOL AvHDivineWind::IsUseable(void)
+{
+	BOOL theIsUseable = FALSE;
+	
+	if(AvHAlienWeapon::IsUseable())
+	{
+		theIsUseable = !this->mPrimed;
+	}
+
+	return theIsUseable;
+}
+
+void AvHDivineWind::Explode(void)
+{
+#ifdef AVH_SERVER
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this->m_pPlayer);
+	ASSERT(thePlayer);
+	
+	if(thePlayer->GetCanBeAffectedByEnemies())
+	{
+		// Treat damage upgrade as modifier onto DivineWind
+		//int theTracerFreq;
+		//float theDamageMultiplier;
+		//AvHPlayerUpgrade::GetWeaponUpgrade(thePlayer->pev->iuser4, &theDamageMultiplier, &theTracerFreq);
+		
+		// Explode!
+		EMIT_SOUND(thePlayer->edict(), CHAN_AUTO, kDivineWindExplodeSound, 1.0f, ATTN_NORM);
+
+		// Kill ourself (set team to 0 so we always take damage)
+		this->pev->team = 0;
+		thePlayer->TakeDamage(this->pev, this->pev, 1000, NS_DMG_NORMAL | DMG_ALWAYSGIB);
+
+		// Add explosive force
+		float theDamage = this->mDamage * AvHPlayerUpgrade::GetAlienRangedDamageUpgrade(this->m_pPlayer->pev->iuser4);
+
+        if(AvHSHUGetIsWeaponFocusable(AvHWeaponID(this->m_iId)))
+        {
+            theDamage *= AvHPlayerUpgrade::GetFocusDamageUpgrade(this->m_pPlayer->pev->iuser4);
+        }
+
+		float theForceScalar = .05f*theDamage;
+        int theRadius = BALANCE_IVAR(kDivineWindRadius);
+		AvHSUExplosiveForce(this->pev->origin, theRadius, theForceScalar, thePlayer);
+
+		// Make sure weapon team is the same as player team so we don't damage friends when friendly fire is off
+		this->pev->team = thePlayer->pev->team;
+		::RadiusDamage(thePlayer->pev->origin, this->pev, thePlayer->pev, theDamage, theRadius, CLASS_NONE, NS_DMG_NORMAL);
+		
+		// Shake view of those around us!
+		float theShakeAmplitude = 30;
+		float theShakeFrequency = 100;
+		float theShakeDuration = 1.5f;
+		float theShakeRadius = theRadius;
+		UTIL_ScreenShake(thePlayer->pev->origin, theShakeAmplitude, theShakeFrequency, theShakeDuration, theShakeRadius);
+
+		AvHSUPlayParticleEvent(kpsXenocide, this->edict(), this->pev->origin);
+
+		// Increment our score so it doesn't count as suicide
+		//thePlayer->pev->frags++;
+	}
+#endif
+}
+
+// This is currently the length of kDivineWindFireSound
+const float kExplodeTime = 1.7f;
+
+void AvHDivineWind::FireProjectiles(void)
+{
+#ifdef AVH_SERVER
+	// If we haven't already been activated
+	if(!this->mPrimed)
+	{
+		// Make it so weapon can't be switched away from
+		this->mPrimed = true;
+
+		// Play "about to go off" sound (this is the fire sound)
+
+		// Set think to be a small time from now
+		SetThink(&AvHDivineWind::Explode);
+		this->pev->nextthink = gpGlobals->time + kExplodeTime;
+	}
+#endif	
+}
+
+char* AvHDivineWind::GetViewModel() const
+{
+	return kLevel1ViewModel;
+}
+
+void AvHDivineWind::Precache()
+{
+	AvHAlienWeapon::Precache();
+
+	PRECACHE_UNMODIFIED_SOUND(kDivineWindFireSound);
+	PRECACHE_UNMODIFIED_SOUND(kDivineWindExplodeSound);
+
+	this->mEvent = PRECACHE_EVENT(1, kDivineWindShootEventName);
+}
+
+void AvHDivineWind::Spawn() 
+{ 
+    AvHAlienWeapon::Spawn(); 
+
+	Precache();
+
+	this->m_iId = AVH_WEAPON_DIVINEWIND;
+
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsDivineWind);
+
+	SET_MODEL(ENT(this->pev), kNullModel);
+
+	FallInit();// get ready to fall down.
+} 
+
+bool AvHDivineWind::UsesAmmo(void) const
+{
+	return false;
+}
+
diff --git a/main/source/mod/AvHDramaticPriority.h b/main/source/mod/AvHDramaticPriority.h
new file mode 100644
index 00000000..316e14a0
--- /dev/null
+++ b/main/source/mod/AvHDramaticPriority.h
@@ -0,0 +1,59 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHDramaticPriority.h $
+// $Date: 2002/11/12 02:23:10 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHDramaticPriority.h,v $
+// Revision 1.4  2002/11/12 02:23:10  Flayra
+// - New priorities for HLTV
+//
+// Revision 1.3  2002/05/23 02:33:41  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_DRAMATIC_PRIORITY_H
+#define AVH_DRAMATIC_PRIORITY_H
+
+// Defined in SDK docs
+const int kMinDramaticPriority = 1;
+const int kMaxDramaticPriority = 15;
+
+const int kGestateDeathPriority = 6;
+const int kGorgeDeathPriority = 6;
+const int kLerkDeathPriority = 8;
+const int kFadeDeathPriority = 10;
+const int kOnosDeathPriority = 13;
+const int kHeavyDeathPriority = 9;
+
+const int kCocoonPriority = 14;
+
+const int kReinforcementsPriority = 6;
+const int kHiveSpawnPriority = 6;
+const int kEggSpawnPriority = 6;
+const int kJoinTeamPriority = 15;
+const int kCCDeathPriority = 12;
+const int kIPDeathPriority = 10;
+const int kPGDeathPriority = 8;
+const int kCCEjectPriority = 5;
+const int kCCNewCommanderPriority = 7;
+
+const int kMineExplodePriority = 8;
+const int kMinePlacePriority = 4;
+
+const int kEvolveLevelOnePriority = 3;
+const int kEvolveLevelTwoPriority = 4;
+const int kEvolveLevelThreePriority = 5;
+const int kEvolveLevelFourPriority = 6;
+const int kEvolveLevelFivePriority = 7;
+
+const int kEvolveUpgradePriority = 2;
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHEggLayer.cpp b/main/source/mod/AvHEggLayer.cpp
new file mode 100644
index 00000000..dc0d9fc6
--- /dev/null
+++ b/main/source/mod/AvHEggLayer.cpp
@@ -0,0 +1,152 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHEggLayer.cpp $
+// $Date: 2002/07/24 19:09:16 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHEggLayer.cpp,v $
+// Revision 1.7  2002/07/24 19:09:16  Flayra
+// - Linux issues
+//
+// Revision 1.6  2002/07/24 18:55:51  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.5  2002/06/03 16:39:09  Flayra
+// - Added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.4  2002/05/23 02:33:41  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHServerUtil.h"
+
+LINK_ENTITY_TO_CLASS(kwEggLayer, AvHEggLayer);
+
+BOOL AvHEggLayer::Deploy()
+{
+	return DefaultDeploy(kEggLayerVModel, kEggLayerPModel, this->GetDeployAnimation(), kEggLayerAnimExt);
+}
+
+
+int	AvHEggLayer::GetBarrelLength() const
+{
+	return kEggLayerBarrelLength;
+}
+
+bool AvHEggLayer::GetFiresUnderwater() const
+{
+	return true;
+}
+
+bool AvHEggLayer::GetIsDroppable() const
+{
+	return false;
+}
+	
+void AvHEggLayer::Init()
+{
+	this->mRange = kEggLayerRange;
+	this->mROF = kEggLayerROF;
+}
+
+void AvHEggLayer::Precache(void)
+{
+	AvHAlienWeapon::Precache();
+	
+	PRECACHE_MODEL(kEggLayerVModel);
+	PRECACHE_MODEL(kEggLayerPModel);
+	PRECACHE_MODEL(kAlienGunWModel);
+
+	PRECACHE_SOUND(kEggLaySound1);
+	PRECACHE_SOUND(kEggLaySound2);
+	
+	this->mEvent = PRECACHE_EVENT(1, kEggLayerShootEventName);
+	//this->mEvent = PRECACHE_EVENT(1, kSpitGEventName);
+}
+
+void AvHEggLayer::Spawn()
+{
+    AvHAlienWeapon::Spawn(); 
+	
+	Precache();
+	
+	this->m_iId = AVH_WEAPON_EGGLAYER;
+	
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsEggLayer);
+	
+	SET_MODEL(ENT(this->pev), kAlienGunWModel);
+	
+	FallInit();// get ready to fall down.
+	
+}
+
+bool AvHEggLayer::UsesAmmo(void) const
+{
+	return false;
+}
+
+void AvHEggLayer::FireProjectiles(void)
+{
+	#ifdef AVH_SERVER
+	// Make sure we have enough points to shoot this thing
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this->m_pPlayer);
+	ASSERT(thePlayer);
+	
+	if(thePlayer->GetResources() > kEggLayerPointCost)
+	{
+		// Now check to make sure the space is big enough to hold the egg
+		UTIL_MakeVectors(this->m_pPlayer->pev->v_angle);
+		
+		//Vector vecAiming = gpGlobals->v_forward;
+		Vector vecSrc = this->m_pPlayer->GetGunPosition();// + vecAiming;
+
+		if(AvHSUIsAreaFree(vecSrc, kEggRadius, this->m_pPlayer))
+		{
+			// Decrement kEggLayerPointCost points
+			thePlayer->SetResources(thePlayer->GetResources() - kEggLayerPointCost);
+			
+			AvHEgg* theEgg = GetClassPtr((AvHEgg*)NULL );
+			theEgg->Spawn();
+			
+			theEgg->pev->angles.x = 0;
+			theEgg->pev->angles.z = 0;
+			//theEgg->pev->velocity = gpGlobals->v_forward * 300 + gpGlobals->v_forward * 100;
+
+			UTIL_SetOrigin(theEgg->pev, vecSrc);
+			
+			// Set owner
+			//theEgg->pev->owner = ENT(this->m_pPlayer->pev);
+			
+			// Set egg's team
+			theEgg->pev->team = this->m_pPlayer->pev->team;
+		}
+	}
+	#endif	
+}
+
diff --git a/main/source/mod/AvHEnsnare.cpp b/main/source/mod/AvHEnsnare.cpp
new file mode 100644
index 00000000..7405efd6
--- /dev/null
+++ b/main/source/mod/AvHEnsnare.cpp
@@ -0,0 +1,218 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHEnsnare.cpp $
+// $Date: 2002/07/24 19:09:16 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHEnsnare.cpp,v $
+// Revision 1.7  2002/07/24 19:09:16  Flayra
+// - Linux issues
+//
+// Revision 1.6  2002/07/24 18:55:52  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.5  2002/06/03 16:39:09  Flayra
+// - Added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.4  2002/05/23 02:33:41  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHAlienWeaponConstants.h"
+
+LINK_ENTITY_TO_CLASS(kwEnsnareGun, AvHEnsnare);
+
+
+#ifdef AVH_SERVER
+LINK_ENTITY_TO_CLASS(kwEnsnareGunProjectile, AvHEnsnareProjectile);
+extern int gEnsnareHitEventID;
+
+void AvHEnsnareProjectile::Precache(void)
+{
+	CBaseEntity::Precache();
+	
+	PRECACHE_MODEL(kEnsnareSprite);
+}
+
+void AvHEnsnareProjectile::Spawn(void)
+{
+	this->Precache();
+	CBaseEntity::Spawn();
+	
+	this->pev->movetype = MOVETYPE_FLY;
+	this->pev->classname = MAKE_STRING(kwsEnsnareGunProjectile);
+	
+	SET_MODEL(ENT(this->pev), kEnsnareSprite);
+	this->pev->solid = SOLID_BBOX;
+	
+	// Comment out effects line, uncomment next four, then comment out creation of temp entity in EV_ShootEnsnare to see server side ensnare for testing
+	if(!GetGameRules()->GetDrawInvisibleEntities())
+	{		
+		this->pev->effects = EF_NODRAW;
+	}
+	else
+	{
+		this->pev->frame = 0;
+		this->pev->scale = 0.5;
+		this->pev->rendermode = kRenderTransAlpha;
+		this->pev->renderamt = 255;
+	}
+	
+	UTIL_SetSize(this->pev, Vector( 0, 0, 0), Vector(0, 0, 0));
+	
+	SetTouch(EnsnareTouch);
+}
+
+void AvHEnsnareProjectile::EnsnareTouch(CBaseEntity *pOther)
+{
+	// Never hit the player who fired it
+	if(pOther != CBaseEntity::Instance(this->pev->owner))
+	{
+		// If not in tourny mode, pass through friends
+		if(pOther->pev->team != this->pev->team)
+		{
+			// Kill the ensnare projectile
+			SetThink(SUB_Remove);
+			this->pev->nextthink = gpGlobals->time + 0.01f;
+
+			AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(pOther);
+			if(thePlayer)
+			{
+				PLAYBACK_EVENT_FULL(0, this->edict(), gEnsnareHitEventID, 0, pOther->pev->origin, (float *)&g_vecZero, 0.0, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+				thePlayer->SetIsEnsnared();
+			}
+		}
+	}
+}
+#endif
+
+
+BOOL AvHEnsnare::Deploy()
+{
+	return DefaultDeploy(kEnsnareVModel, kEnsnarePModel, this->GetDeployAnimation(), kEnsnareAnimExt);
+}
+
+int	AvHEnsnare::GetBarrelLength() const
+{
+	return kEnsnareBarrelLength;
+}
+
+bool AvHEnsnare::GetFiresUnderwater() const
+{
+	return true;
+}
+
+bool AvHEnsnare::GetIsDroppable() const
+{
+	return false;
+}
+	
+void AvHEnsnare::Init()
+{
+	this->mRange = kEnsnareRange;
+	this->mDamage = kEnsnareDamage;
+	this->mROF = kEnsnareROF;
+}
+
+void AvHEnsnare::Precache(void)
+{
+	AvHAlienWeapon::Precache();
+	
+	PRECACHE_MODEL(kEnsnareVModel);
+	PRECACHE_MODEL(kEnsnarePModel);
+	PRECACHE_MODEL(kAlienGunWModel);
+	
+	PRECACHE_SOUND(kEnsnareFireSound);
+	PRECACHE_SOUND(kEnsnareHitSound);
+	
+	this->mEvent = PRECACHE_EVENT(1, kEnsnareShootEventName);
+	//this->mEvent = PRECACHE_EVENT(1, kSpitGEventName);
+}
+
+void AvHEnsnare::Spawn()
+{
+    AvHAlienWeapon::Spawn(); 
+	
+	Precache();
+	
+	this->m_iId = AVH_WEAPON_ENSNARE;
+	
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsEnsnareGun);
+	
+	SET_MODEL(ENT(this->pev), kAlienGunWModel);
+	
+	FallInit();// get ready to fall down.
+	
+}
+
+bool AvHEnsnare::UsesAmmo(void) const
+{
+	return false;
+}
+
+void AvHEnsnare::FireProjectiles(void)
+{
+	#ifdef AVH_SERVER
+	// Make sure we have enough points to shoot this thing
+//	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this->m_pPlayer);
+//	ASSERT(thePlayer);
+//	
+//	if(thePlayer->GetResources() > kEnsnarePointCost)
+//	{
+//		// Decrement kEnsnarePointCost points
+//		thePlayer->SetResources(thePlayer->GetResources() - kEnsnarePointCost);
+		
+		// Create hidden projectile that creates a huge Ensnare cloud where it hits
+		AvHEnsnareProjectile* theEnsnare = GetClassPtr((AvHEnsnareProjectile*)NULL );
+		theEnsnare->Spawn();
+		
+		UTIL_MakeVectors(this->m_pPlayer->pev->v_angle);
+		
+		Vector vecAiming = gpGlobals->v_forward;
+		Vector vecSrc = this->m_pPlayer->GetGunPosition( ) + vecAiming;
+		
+		UTIL_SetOrigin(theEnsnare->pev, vecSrc);
+		
+		// This needs to be the same as in EV_EnsnareGun
+		Vector theBaseVelocity;
+		VectorScale(this->pev->velocity, kEnsnareParentVelocityScalar, theBaseVelocity);
+		
+		Vector theStartVelocity;
+		VectorMA(theBaseVelocity, kEnsnareVelocity, vecAiming, theStartVelocity);
+		
+		VectorCopy(theStartVelocity, theEnsnare->pev->velocity);
+		
+		// Set owner
+		theEnsnare->pev->owner = ENT(this->m_pPlayer->pev);
+		
+		// Set Ensnare's team :)
+		theEnsnare->pev->team = this->m_pPlayer->pev->team;
+//	}
+	#endif	
+}
+
diff --git a/main/source/mod/AvHEntities.cpp b/main/source/mod/AvHEntities.cpp
new file mode 100644
index 00000000..b350782b
--- /dev/null
+++ b/main/source/mod/AvHEntities.cpp
@@ -0,0 +1,2430 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHEntities.cpp$
+// $Date: 2002/11/22 21:26:25 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHEntities.cpp,v $
+// Revision 1.44  2002/11/22 21:26:25  Flayra
+// - mp_consistency changes
+// - Fixes to allow NULL owner
+//
+// Revision 1.43  2002/11/12 02:23:22  Flayra
+// - Removed ancient egg
+//
+// Revision 1.42  2002/11/03 04:47:56  Flayra
+// - Moved constants into .dll out of .cfg
+//
+// Revision 1.41  2002/10/20 21:10:14  Flayra
+// - Optimizations
+//
+// Revision 1.40  2002/10/18 22:19:01  Flayra
+// - Fixed bug where resources were still getting destroyed
+//
+// Revision 1.39  2002/10/16 00:53:16  Flayra
+// - Play marine tower harvesting sound louder so it can be heard
+//
+// Revision 1.38  2002/10/03 18:42:31  Flayra
+// - func_resources now are destroyed if a resource tower is destroyed
+//
+// Revision 1.37  2002/09/23 22:12:31  Flayra
+// - Resource towers give 3 points to team in general
+//
+// Revision 1.36  2002/08/16 02:34:23  Flayra
+// - Webs no longer affect friendlies in tourny mode
+//
+// Revision 1.35  2002/07/24 18:45:41  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.34  2002/07/23 17:01:33  Flayra
+// - Updated resource model, removed old junk
+//
+// Revision 1.33  2002/07/10 14:40:04  Flayra
+// - Fixed bug where .mp3s weren't being processed client-side
+//
+// Revision 1.32  2002/07/08 16:55:35  Flayra
+// - Added max ensnare, can't remember why I'm tagging team starts, changed resources functions to floats (for proper handicapping)
+//
+// Revision 1.31  2002/07/01 21:26:41  Flayra
+// - Toned down resource tower sounds (moved to CHAN_BODY to cut down on multiples playing)
+//
+// Revision 1.30  2002/06/25 17:54:20  Flayra
+// - New info_location entity, make resource tower sounds very quiet
+//
+// Revision 1.29  2002/06/10 19:52:31  Flayra
+// - Marked non-visible entities as nodraw, fixes visible entities problems!
+//
+// Revision 1.28  2002/05/28 17:37:01  Flayra
+// - Track number of web strands to enforce limit, reworking of webs in general, removed duplicate code for AvHResourceTower
+//
+// Revision 1.27  2002/05/23 02:33:41  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHEntities.h"
+#include "dlls/player.h"
+#include "dlls/gamerules.h"
+#include "dlls/explode.h"
+#include "dlls/soundent.h"
+#include "dlls/weapons.h"
+#include "dlls/cpushable.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "mod/AvHAlienEquipmentConstants.h"
+#include "mod/AvHServerVariables.h"
+#include "mod/AvHPlayer.h"
+#include "mod/AvHTitles.h"
+#include "mod/AvHSoundListManager.h"
+#include "mod/AvHParticleTemplateServer.h"
+#include "mod/AvHParticleConstants.h"
+#include "mod/AvHParticleSystemEntity.h"
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHHulls.h"
+#include "engine/studio.h"
+#include "mod/AvHBaseBuildable.h"
+#include "mod/AvHScriptManager.h"
+#include "dlls/animation.h"
+#include "util/MathUtil.h"
+
+extern DLL_GLOBAL CGameRules*	g_pGameRules;
+BOOL IsSpawnPointValid( CBaseEntity *pPlayer, CBaseEntity *pSpot );
+
+LINK_ENTITY_TO_CLASS( keSpectate, AvHSpectateEntity );
+LINK_ENTITY_TO_CLASS( keJoinTeam, AvHJoinTeamEntity );
+//LINK_ENTITY_TO_CLASS( keLeaveGame, AvHLeaveGameEntity );
+LINK_ENTITY_TO_CLASS( keTeamStart, AvHTeamStartEntity );
+LINK_ENTITY_TO_CLASS( keAutoAssign, AvHAutoAssignEntity );
+LINK_ENTITY_TO_CLASS( keMapInfo, AvHMapInfo );
+LINK_ENTITY_TO_CLASS( keGameplay, AvHGameplay );
+
+LINK_ENTITY_TO_CLASS( keSeethrough, AvHSeeThrough);
+LINK_ENTITY_TO_CLASS( keSeethroughDoor, AvHSeeThroughDoor);
+
+//LINK_ENTITY_TO_CLASS( keWaypoint, AvHWaypoint);
+LINK_ENTITY_TO_CLASS( keNoBuild, AvHNoBuild);
+LINK_ENTITY_TO_CLASS( keFuncResource, AvHFuncResource);
+
+LINK_ENTITY_TO_CLASS( keGamma, AvHGamma );
+
+LINK_ENTITY_TO_CLASS( keMP3Audio, AvHMP3Audio);
+
+LINK_ENTITY_TO_CLASS( keTriggerPresence, TriggerPresence);
+LINK_ENTITY_TO_CLASS( keTriggerRandom, AvHTriggerRandom );
+LINK_ENTITY_TO_CLASS( keTriggerScript, AvHTriggerScript);
+
+//LINK_ENTITY_TO_CLASS( keTeamEgg, AvHEgg );
+LINK_ENTITY_TO_CLASS( keTeamWebStrand, AvHWebStrand );
+
+LINK_ENTITY_TO_CLASS( keFog, AvHFog);
+
+LINK_ENTITY_TO_CLASS(kwResourceTower, AvHResourceTower);
+
+LINK_ENTITY_TO_CLASS(keInfoLocation, AvHInfoLocation);
+
+// Dummy initializer
+StringList AvHMP3Audio::sSoundList;
+
+extern AvHSoundListManager				gSoundListManager;
+extern AvHParticleTemplateListServer	gParticleTemplateList;
+const float kFallThinkInterval = .1f;
+
+AvHBaseEntity::AvHBaseEntity()
+{
+	//this->mTeam = TEAM_IND;
+}
+
+AvHTeamNumber AvHBaseEntity::GetTeamNumber() const
+{
+	//return this->mTeam;
+	return (AvHTeamNumber)this->pev->team;
+}
+
+void AvHBaseEntity::FallThink(void)
+{
+	this->pev->nextthink = gpGlobals->time + kFallThinkInterval;
+	
+	if(this->pev->flags & FL_ONGROUND)
+	{
+		// clatter if we have an owner (i.e., dropped by someone)
+		// don't clatter if the gun is waiting to respawn (if it's waiting, it is invisible!)
+		//if ( !FNullEnt( this->pev->owner ) )
+		//{
+		//	int pitch = 95 + RANDOM_LONG(0,29);
+		//	EMIT_SOUND_DYN(ENT(this->pev), CHAN_VOICE, "items/weapondrop1.wav", 1, ATTN_NORM, 0, pitch);	
+		//}
+		
+		// lie flat
+		this->pev->angles.x = 0;
+		this->pev->angles.z = 0;
+		
+		UTIL_SetOrigin( pev, pev->origin );// link into world.
+	}
+}
+
+void AvHBaseEntity::KeyValue( KeyValueData* pkvd )
+{
+	if(FStrEq(pkvd->szKeyName, "teamchoice"))
+	{
+		//this->mTeam = (AvHTeamNumber)(atoi(pkvd->szValue));
+		this->pev->team = (AvHTeamNumber)(atoi(pkvd->szValue));
+		pkvd->fHandled = TRUE;
+	}
+	else
+	{
+		CBaseEntity::KeyValue(pkvd);
+	}
+}
+
+void AvHBaseEntity::NotifyUpgrade(AvHUpgradeMask inUpgradeMask)
+{
+}
+
+AvHClientCommandEntity::AvHClientCommandEntity()
+{
+}
+
+void AvHClientCommandEntity::ClientCommandTouch( CBaseEntity *pOther )
+{
+	// If incoming entity is a player
+	CBasePlayer* theBasePlayer = dynamic_cast<CBasePlayer*>(pOther);
+	if(theBasePlayer)
+	{
+		// execute client command for that player
+		g_pGameRules->ClientCommand(theBasePlayer, this->GetClientCommand());
+	}
+}
+
+void AvHClientCommandEntity::Spawn(void)
+{
+	pev->movetype = MOVETYPE_NONE;
+	pev->solid = SOLID_TRIGGER;
+	pev->iuser3 = AVH_USER3_CLIENT_COMMAND;
+
+	SET_MODEL( ENT(pev), STRING(pev->model) );
+	this->pev->effects = EF_NODRAW;
+
+	SetTouch(&AvHClientCommandEntity::ClientCommandTouch);
+}
+
+const char*	AvHJoinTeamEntity::GetClientCommand()
+{ 
+	const char* theCommand = "";
+
+	AvHTeamNumber theTeamNumber = this->GetTeamNumber();
+	if(theTeamNumber == TEAM_ONE)
+	{
+		theCommand = kcJoinTeamOne;
+	}
+	else if(theTeamNumber == TEAM_TWO)
+	{
+		theCommand = kcJoinTeamTwo;
+	}
+
+	return theCommand; 
+}
+
+void AvHTeamStartEntity::KeyValue( KeyValueData* pkvd )
+{
+	AvHBaseEntity::KeyValue(pkvd);
+}
+
+void AvHTeamStartEntity::Spawn(void)
+{
+	AvHBaseEntity::Spawn();
+
+	this->pev->effects |= EF_NODRAW;
+
+	// Mark with special iuser3
+	AvHUser3 theUser3 = AVH_USER3_SPAWN_READYROOM;
+
+	AvHTeamNumber theTeamNumber = this->GetTeamNumber();
+	switch(theTeamNumber)
+	{
+	case TEAM_ONE:
+		theUser3 = AVH_USER3_SPAWN_TEAMONE;
+		break;
+	case TEAM_TWO:
+		theUser3 = AVH_USER3_SPAWN_TEAMTWO;
+		break;
+	default:
+		ASSERT(false);
+		break;
+	}
+
+	this->pev->iuser3 = theUser3;
+}
+
+
+
+//void AvHBuildableAnimating::BuildUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+//{
+//	// Check teams to see if right person is using it
+//	if(this->pev->team == pActivator->pev->team)
+//	{
+//		if(!this->GetIsBuilt())
+//		{
+//			if(AvHSUPlayerCanBuild(pActivator->pev))
+//			{
+//				this->mTimeLastUsed = gpGlobals->time;
+//				
+//				if(RANDOM_LONG(0, 4) == 0)
+//				{
+//					// Set health, taking into account upgrade
+//					this->SetNormalizedBuildPercentage(this->GetNormalizedBuildPercentage() + 1.0f);
+//					this->pev->health = this->GetMinHitPoints() + (this->GetNormalizedBuildPercentage())*(this->GetMaxHitPoints() - this->GetMinHitPoints());
+//					//this->pev->armorvalue = this->mMaxArmor;
+//					this->pev->rendermode = kRenderTransTexture;
+//					this->pev->renderamt = (this->pev->health/this->GetMaxHitPoints())*255;
+//				}
+//				
+//				//this->PlayBuildSound();
+//				AvHSUPlayRandomConstructionEffect(this);
+//				
+//				if(this->GetIsBuilt())
+//				{
+//					this->SetConstructionComplete();
+//				}
+//				
+//				AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(pActivator);
+//				if(thePlayer && !this->GetIsBuilt())
+//				{
+//					thePlayer->TriggerProgressBar(this->entindex(), 1);
+//					//this->pev->fuser1 = this->GetNormalizedBuildPercentage()*kNormalizationNetworkFactor;
+//				}
+//			}
+//		}
+//	}
+//}
+//
+//int AvHBuildableAnimating::GetMinHitPoints() const
+//{
+//	return .5f*this->GetMaxHitPoints();
+//}
+//
+//int	AvHBuildableAnimating::GetMaxHitPoints() const
+//{
+//	return 200;
+//}
+//
+//bool AvHBuildableAnimating::GetIsBuilt() const
+//{
+//	return (this->GetNormalizedBuildPercentage() >= 1.0f);
+//}
+//
+//void AvHBuildableAnimating::SetIsBuilt()
+//{
+//	this->SetNormalizedBuildPercentage(1.0f);
+//}
+//
+//float AvHBuildableAnimating::GetNormalizedBuildPercentage() const
+//{
+//	return this->pev->fuser1/kNormalizationNetworkFactor;
+//}
+//
+//void AvHBuildableAnimating::SetNormalizedBuildPercentage(float inPercentage)
+//{
+//	this->pev->fuser1 = inPercentage*kNormalizationNetworkFactor;
+//}
+//
+//
+//void AvHBuildableAnimating::Spawn(void)
+//{
+//	CBaseAnimating::Spawn();
+//
+//	SetUse(BuildUse);
+//
+//	this->pev->iuser3 = AVH_USER3_BUILDABLE;
+//	this->pev->fuser1 = 0.0f;
+//	this->mTimeLastUsed = -1;
+//}
+
+
+//// Build site entities
+//AvHResource::AvHResource(AvHTechID inTechID, AvHMessageID inMessageID, char* inClassName, int inHealth, AvHSelectableUser4 inUser4) : mThinkInterval(.1f)
+//{
+//	this->mBuildRange = 0.0f;
+//	this->mResourceRating = 0;
+//	this->mHasResource = false;
+//	this->mStartAlreadyBuilt = false;
+//	this->mValidTeams = 0;
+//	this->mBuildSoundPlaying = false;
+//	this->mTimeLastContributed = -1;
+//}
+//
+//int	AvHResource::BloodColor( void )
+//{ 
+//	return DONT_BLEED; 
+//}
+//
+//float AvHResource::GetBuildRange(void) const
+//{
+//	return this->mBuildRange;
+//}
+//
+//bool AvHResource::GetIsActive(void) const
+//{
+//	return this->GetIsBuilt() && (this->pev->health > 0);
+//}
+//
+//float AvHResource::GetTimeLastContributed()
+//{
+//	return this->mTimeLastContributed;
+//}
+//
+//void AvHResource::SetTimeLastContributed(float inTime)
+//{
+//	this->mTimeLastContributed = inTime;
+//}
+//
+//void AvHResource::Killed( entvars_t *pevAttacker, int iGib )
+//{
+//	// lots of smoke
+//	MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
+//	WRITE_BYTE( TE_SMOKE );
+//	WRITE_COORD( RANDOM_FLOAT( pev->absmin.x, pev->absmax.x ) );
+//	WRITE_COORD( RANDOM_FLOAT( pev->absmin.y, pev->absmax.y ) );
+//	WRITE_COORD( pev->origin.z );
+//	WRITE_SHORT( g_sModelIndexSmoke );
+//	WRITE_BYTE( 25 ); // scale * 10
+//	WRITE_BYTE( 10 ); // framerate
+//	MESSAGE_END();
+//	
+//	if (pev->dmgtime + RANDOM_FLOAT( 0, 5 ) > gpGlobals->time)
+//	{
+//		Vector vecSrc = Vector( (float)RANDOM_FLOAT( pev->absmin.x, pev->absmax.x ), (float)RANDOM_FLOAT( pev->absmin.y, pev->absmax.y ), (float)0 );
+//		vecSrc = vecSrc + Vector( (float)0, (float)0, (float)RANDOM_FLOAT( pev->origin.z, pev->absmax.z ) );
+//		
+//		UTIL_Sparks( vecSrc );
+//	}
+//
+//	CBaseAnimating::Killed(pevAttacker, iGib);
+//}
+//
+//
+////void AvHResource::LoopSound(void) const
+////{
+////	//UTIL_EmitAmbientSound( ENT(this->pev), pev->origin, kResourceHum, 100.0f, ATTN_NORM, SND_SPAWNING, RANDOM_LONG( 50, 100 ));
+////	UTIL_EmitAmbientSound( ENT(this->pev), pev->origin, kResourceHum, 1, 1.25, SND_SPAWNING, 100);
+////}
+//
+//int	AvHResource::ObjectCaps( void ) 
+//{ 
+//	return FCAP_CONTINUOUS_USE;
+//}
+//
+////void AvHResource::PlayBuildSound(void)
+////{
+////	if(!this->mBuildSoundPlaying)
+////	{
+////		UTIL_EmitAmbientSound( ENT(this->pev), this->pev->origin, kResourceBuildSound, 100.0f, ATTN_NORM, 0, RANDOM_LONG( 50, 100 ));
+////		this->mBuildSoundPlaying = true;
+////	}
+////}
+////
+////void AvHResource::StopBuildSound(void)
+////{
+////	if(this->mBuildSoundPlaying)
+////	{
+////		UTIL_EmitAmbientSound(ENT(this->pev), this->pev->origin, kResourceBuildSound, 0, 0, SND_STOP, 0);
+////		this->mBuildSoundPlaying = false;
+////	}
+////}
+//
+//void AvHResource::Precache( void )
+//{
+//	CBaseAnimating::Precache();
+//
+//	//PRECACHE_SOUND(kResourceHum);
+//	//PRECACHE_SOUND(kResourceBuildSound);
+//
+//	if(pev->model)
+//	{
+//		PRECACHE_MODEL( (char *)STRING(pev->model) );
+//	}
+//}
+//
+//void AvHResource::ResourceThink(void)
+//{
+////	if((gpGlobals->time - this->mTimeLastUsed > .2f) && this->mBuildSoundPlaying)
+////	{
+////		this->StopBuildSound();
+////	}
+//	pev->nextthink = gpGlobals->time + this->mThinkInterval;
+//}
+//
+//void AvHResource::ResourceTouch( CBaseEntity *pOther )
+//{
+//}
+//
+////void AvHResource::ResourceUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+////{
+////}
+//
+//void AvHResource::SetConstructionComplete()
+//{
+//	//SetUse(NULL);
+//	this->SetIsBuilt();
+//	//this->LoopSound();
+//	this->pev->health = this->GetMaxHitPoints();
+//	this->pev->rendermode = kRenderNormal;
+//	this->pev->renderamt = 0;
+//	this->pev->takedamage = 1;
+//	pev->solid = SOLID_SLIDEBOX;
+//
+//	this->mTimeLastContributed = gpGlobals->time;
+//}
+//
+//void AvHResource::Spawn(void)
+//{
+//	this->Precache();
+//
+//    pev->classname	= MAKE_STRING(kAvHResourceClassName);
+//	
+//	pev->movetype	= MOVETYPE_FLY;
+//
+//	SET_MODEL( ENT(pev), STRING(pev->model) );
+//
+//	if(this->mStartAlreadyBuilt)
+//	{
+//		this->SetIsBuilt();
+//		this->pev->health = this->GetMaxHitPoints();
+//		this->pev->rendermode = kRenderNormal;
+//		SetUse(NULL);
+//		//this->LoopSound();
+//		this->pev->solid = SOLID_SLIDEBOX;
+//	}
+//	else
+//	{
+//		this->pev->fuser1 = 0;
+//		this->pev->rendermode = kRenderTransTexture;
+//		this->pev->solid = SOLID_NOT;
+//		this->pev->health = this->GetMinHitPoints();
+//		//SetTouch(ResourceTouch);
+//		//SetUse(ResourceUse);
+//	}
+//
+//	SetThink(ResourceThink);
+//	pev->nextthink = gpGlobals->time + this->mThinkInterval;
+//
+//	this->mTimeLastContributed = gpGlobals->time;
+//}
+//
+//int	AvHResource::TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType )
+//{
+//	int theReturnCode = 0;
+//
+//	if (pev->takedamage )
+//	{
+//		// Resources have armor too, get protection from upgrades
+//		float theNewDamage = AvHSUCalculateDamageLessArmor(this->pev, flDamage, bitsDamageType, GetGameRules()->IsMultiplayer());
+//		theReturnCode = CBaseAnimating::TakeDamage(pevInflictor, pevAttacker, theNewDamage, bitsDamageType);
+//
+////		pev->health -= theNewDamage;
+////		if (pev->health <= 0)
+////		{
+////			pev->health = 0;
+////			pev->takedamage = DAMAGE_NO;
+////			pev->dmgtime = gpGlobals->time;
+////			
+////			ClearBits (pev->flags, FL_MONSTER); // why are they set in the first place???
+////			
+////			SetUse(NULL);
+////
+////			// SetThink?
+////
+////			//SUB_UseTargets( this, USE_ON, 0 ); // wake up others
+////		}
+//	}
+//
+//	return theReturnCode;
+//}
+
+
+
+
+
+
+
+
+AvHSeeThrough::AvHSeeThrough()
+{
+	this->mCommanderAlpha = 0;
+	this->mPlayerAlpha = 255;
+}
+
+void AvHSeeThrough::KeyValue( KeyValueData* pkvd )
+{
+	if(FStrEq(pkvd->szKeyName, "commanderAlpha") || FStrEq(pkvd->szKeyName, "seeThroughAlpha"))
+	{
+		int theAlpha = atoi(pkvd->szValue);
+		this->mCommanderAlpha = min(max(0, theAlpha), 255);
+		pkvd->fHandled = TRUE;
+	}
+	if(FStrEq(pkvd->szKeyName, "playerAlpha"))
+	{
+		int theAlpha = atoi(pkvd->szValue);
+		this->mPlayerAlpha = min(max(0, theAlpha), 255);
+		pkvd->fHandled = TRUE;
+	}
+	else
+	{
+		CBaseEntity::KeyValue(pkvd);
+	}
+}
+
+void AvHSeeThrough::Spawn()
+{
+	this->Precache();
+	CBaseEntity::Spawn();
+
+	this->pev->solid = SOLID_BSP;
+	this->pev->movetype = MOVETYPE_PUSH;
+	SET_MODEL( ENT(pev), STRING(pev->model) );
+	
+    this->pev->classname = MAKE_STRING(kesSeethrough);
+	
+	this->pev->iuser3 = AVH_USER3_ALPHA;
+	this->pev->fuser1 = this->mCommanderAlpha;
+	this->pev->fuser2 = this->mPlayerAlpha;
+}
+
+
+
+AvHSeeThroughDoor::AvHSeeThroughDoor()
+{
+	this->mCommanderAlpha = 0;
+	this->mPlayerAlpha = 255;
+}
+
+void AvHSeeThroughDoor::KeyValue( KeyValueData* pkvd )
+{
+	// For backwards compatibility with old AvHSeeThrough
+	if(FStrEq(pkvd->szKeyName, "commanderAlpha") || FStrEq(pkvd->szKeyName, "seeThroughAlpha"))
+	{
+		int theAlpha = atoi(pkvd->szValue);
+		this->mCommanderAlpha = min(max(0, theAlpha), 255);
+		pkvd->fHandled = TRUE;
+	}
+	if(FStrEq(pkvd->szKeyName, "playerAlpha"))
+	{
+		int theAlpha = atoi(pkvd->szValue);
+		this->mPlayerAlpha = min(max(0, theAlpha), 255);
+		pkvd->fHandled = TRUE;
+	}
+	else
+	{
+		CBaseDoor::KeyValue(pkvd);
+	}
+}
+
+
+void AvHSeeThroughDoor::Spawn()
+{
+	this->Precache();
+	CBaseDoor::Spawn();
+	
+	this->pev->solid = SOLID_BSP;
+	this->pev->movetype = MOVETYPE_PUSH;
+	SET_MODEL( ENT(pev), STRING(pev->model) );
+	
+    this->pev->classname = MAKE_STRING(kesSeethroughDoor);
+
+	this->pev->iuser3 = AVH_USER3_ALPHA;
+	this->pev->fuser1 = this->mCommanderAlpha;
+	this->pev->fuser2 = this->mPlayerAlpha;
+}
+
+
+
+AvHNoBuild::AvHNoBuild()
+{
+}
+
+void AvHNoBuild::KeyValue(KeyValueData* pkvd)
+{
+	AvHBaseEntity::KeyValue(pkvd);
+}
+
+void AvHNoBuild::Spawn()
+{
+	this->Precache();
+	AvHBaseEntity::Spawn();
+	
+	this->pev->solid = SOLID_BSP;
+	this->pev->movetype = MOVETYPE_PUSH;
+
+	//this->pev->solid = SOLID_TRIGGER;
+	//this->pev->movetype = MOVETYPE_NONE;
+
+	SET_MODEL( ENT(pev), STRING(pev->model) );
+	
+    this->pev->classname = MAKE_STRING(kesNoBuild);
+	this->pev->iuser3 = AVH_USER3_NOBUILD;
+	
+	this->pev->rendermode = kRenderTransAdd;
+	this->pev->renderamt = 0;
+	this->pev->effects = EF_NODRAW;
+}
+
+
+
+
+AvHMP3Audio::AvHMP3Audio()
+{
+	this->mUseState = false;
+	this->mSoundVolume = 255;
+	this->mLooping = false;
+}
+
+int AvHMP3Audio::GetFadeDistance() const
+{
+	return this->mFadeDistance;
+}
+
+void AvHMP3Audio::KeyValue( KeyValueData* pkvd )
+{
+	if(FStrEq(pkvd->szKeyName, "soundname"))
+	{
+		this->mSoundName = pkvd->szValue;
+		pkvd->fHandled = TRUE;
+	}
+	else if(FStrEq(pkvd->szKeyName, "soundvolume"))
+	{
+		this->mSoundVolume = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if(FStrEq(pkvd->szKeyName, "fadedistance"))
+	{
+		this->mFadeDistance = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+	{
+		AvHBaseEntity::KeyValue(pkvd);
+	}
+}
+
+void AvHMP3Audio::Precache()
+{
+	CBaseEntity::Precache();
+	PRECACHE_UNMODIFIED_MODEL(kNullModel);
+}
+
+void AvHMP3Audio::Spawn()
+{
+	Precache();
+	
+	AvHBaseEntity::Spawn();
+	
+	// Set spawn flags
+	if(this->pev->spawnflags & 1)
+	{
+		// Don't fade sound with position, treat as HUD sound
+		this->mFadeDistance = 0;
+	}
+	if(this->pev->spawnflags & 2)
+	{
+		this->mLooping = true;
+	}
+	if(this->pev->spawnflags & 4)
+	{
+		this->pev->iuser3 = AVH_USER3_AUDIO_ON; 
+	}
+	else
+	{
+		this->pev->iuser3 = AVH_USER3_AUDIO_OFF;
+	}
+	
+	// Set model
+    pev->classname = MAKE_STRING(kesMP3Audio);
+	
+	this->pev->solid = SOLID_NOT;
+	this->pev->movetype = MOVETYPE_NONE;
+
+	//this->pev->effects |= EF_NODRAW;
+
+	//SET_MODEL(ENT(pev), STRING(pev->model));
+	SET_MODEL(ENT(this->pev), kNullModel);
+	UTIL_SetOrigin(pev, pev->origin);
+	
+	// Set use so it can be toggled on and off like a switch, not used by the player 
+	SetUse(&AvHMP3Audio::SpecialSoundUse);
+
+	// Add sound name to global registry (relative path without mod directory).  
+	// This is pushing back duplicates.  Do we care?  If SoundList changes to a hash, this could break.
+	int theListSize = sSoundList.size();
+	sSoundList.push_back(this->mSoundName);
+	theListSize = sSoundList.size();
+	
+	// The sound index is the position in this list (assume we're adding to end)
+	int theSoundIndexOffset = sSoundList.size() - 1;
+	
+	// Set up variables
+	ASSERT(theSoundIndexOffset >= 0);
+	ASSERT(theSoundIndexOffset < 256);
+	int theValue = (theSoundIndexOffset << 8);
+
+	int theEntIndex = this->entindex();
+	theValue |= (theEntIndex << 16);
+	ASSERT(theEntIndex == (theValue >> 16));
+	this->pev->fuser1 = theValue;
+	//memcpy(&this->pev->fuser1, &theValue, sizeof(float));
+	int theConvertedFuser1 = (int)(this->pev->fuser1);
+	//int theConvertedFuser1 = 0;
+	//memcpy(&theConvertedFuser1, &this->pev->fuser1, sizeof(float));
+	ASSERT(theConvertedFuser1 == theValue);
+	this->pev->fuser2 = gpGlobals->time;
+
+	// Mash all these little ints into iuser4 (fade distance is max of 16-bits)
+	theValue = this->mFadeDistance;
+	theValue |= (this->mSoundVolume << 16);
+	theValue |= (this->pev->spawnflags << 24);
+	this->pev->iuser4 = theValue;
+}
+
+void AvHMP3Audio::ClearSoundNameList()
+{
+	sSoundList.clear();
+}
+
+StringList AvHMP3Audio::GetSoundNameList()
+{
+	return sSoundList;
+}
+
+
+void AvHMP3Audio::SpecialSoundUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	bool theOldUseState = this->mUseState;
+
+	// Can't toggle it once it's been welded
+	switch(useType)
+	{
+	case USE_OFF:
+		this->mUseState = false;
+		break;
+		
+	case USE_ON:
+		this->mUseState = true;
+		break;
+		
+	case USE_SET:
+		// Handle this?
+		break;
+		
+	case USE_TOGGLE:
+		this->mUseState = !this->mUseState;
+		break;
+	}
+
+	// Just turned on or off?
+	if(theOldUseState != this->mUseState)
+	{
+		// Update time of action
+		this->pev->fuser2 = gpGlobals->time;
+		
+		// Update type of action
+		if(this->mUseState)
+		{
+			this->pev->iuser3 = AVH_USER3_AUDIO_ON;
+		}
+		else
+		{
+			this->pev->iuser3 = AVH_USER3_AUDIO_OFF;
+		}
+	}
+}
+
+
+
+AvHMapInfo::AvHMapInfo()
+{
+	this->mMapExtents.ResetMapExtents();
+}
+
+const AvHMapExtents& AvHMapInfo::GetMapExtents() const
+{
+	return this->mMapExtents;
+}
+
+void AvHMapInfo::KeyValue( KeyValueData* pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "viewheight"))
+	{
+		this->mMapExtents.SetMaxViewHeight(atoi(pkvd->szValue));
+		pkvd->fHandled = TRUE;
+	}
+	if (FStrEq(pkvd->szKeyName, "minviewheight"))
+	{
+		this->mMapExtents.SetMinViewHeight(atoi(pkvd->szValue));
+		pkvd->fHandled = TRUE;
+	}
+	if (FStrEq(pkvd->szKeyName, "minx"))
+	{
+		this->mMapExtents.SetMinMapX(atoi(pkvd->szValue));
+		pkvd->fHandled = TRUE;
+	}
+	if (FStrEq(pkvd->szKeyName, "miny"))
+	{
+		this->mMapExtents.SetMinMapY(atoi(pkvd->szValue));
+		pkvd->fHandled = TRUE;
+	}
+	if (FStrEq(pkvd->szKeyName, "maxx"))
+	{
+		this->mMapExtents.SetMaxMapX(atoi(pkvd->szValue));
+		pkvd->fHandled = TRUE;
+	}
+	if (FStrEq(pkvd->szKeyName, "maxy"))
+	{
+		this->mMapExtents.SetMaxMapY(atoi(pkvd->szValue));
+		pkvd->fHandled = TRUE;
+	}
+	if (FStrEq(pkvd->szKeyName, "culldistance"))
+	{
+		this->mMapExtents.SetTopDownCullDistance(atoi(pkvd->szValue));
+		pkvd->fHandled = TRUE;
+	}
+	else
+	{
+		AvHBaseEntity::KeyValue(pkvd);
+	}
+}
+
+void AvHMapInfo::Spawn()
+{
+	AvHBaseEntity::Spawn();
+
+    this->pev->classname = MAKE_STRING(kwsMapInfoClassName);
+	this->pev->solid = SOLID_NOT;
+	this->pev->movetype = MOVETYPE_NONE;
+	this->pev->effects = EF_NODRAW;
+
+	// Did mapper check "don't draw background" flag?
+	if(pev->spawnflags & 1)
+	{
+		this->mMapExtents.SetDrawMapBG(false);
+	}
+}
+
+AvHGameplay::AvHGameplay()
+{
+	this->mTeamOneType = AVH_CLASS_TYPE_UNDEFINED;
+	this->mTeamTwoType = AVH_CLASS_TYPE_UNDEFINED;
+	
+	this->mInitialHives = 1;
+}
+
+AvHClassType AvHGameplay::GetTeamOneType() const
+{
+	return this->mTeamOneType;
+}
+
+AvHClassType AvHGameplay::GetTeamTwoType() const
+{
+	return this->mTeamTwoType;
+}
+
+int	AvHGameplay::GetInitialHives() const
+{
+	return this->mInitialHives;
+}
+
+int	AvHGameplay::GetInitialAlienPoints() const
+{
+	return BALANCE_IVAR(kNumInitialAlienPoints);
+}
+
+int	AvHGameplay::GetInitialMarinePoints() const
+{
+	return BALANCE_IVAR(kNumInitialMarinePoints);
+}
+
+int	AvHGameplay::GetAlienRespawnCost() const
+{
+	return 0;
+}
+
+int	AvHGameplay::GetMarineRespawnCost() const
+{
+	return 0;
+}
+
+// Not used currently
+int	AvHGameplay::GetAlienRespawnTime() const
+{
+	float theTimeToRespawn = BALANCE_IVAR(kAlienRespawnTime);
+
+	if(GetGameRules()->GetIsTesting() || GetGameRules()->GetCheatsEnabled())
+	{
+		theTimeToRespawn = 2.0f;
+	}
+
+	return theTimeToRespawn;
+}
+
+int	AvHGameplay::GetTowerInjectionTime() const
+{
+	return BALANCE_IVAR(kFuncResourceInjectionTime);
+}
+
+int	AvHGameplay::GetTowerInjectionAmount() const
+{
+	return BALANCE_IVAR(kFuncResourceInjectionAmount);
+}
+
+
+void AvHGameplay::KeyValue( KeyValueData* pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "teamone"))
+	{
+		this->mTeamOneType = (AvHClassType)(atoi(pkvd->szValue));
+		pkvd->fHandled = TRUE;
+	}
+	if (FStrEq(pkvd->szKeyName, "teamtwo"))
+	{
+		this->mTeamTwoType = (AvHClassType)(atoi(pkvd->szValue));
+		pkvd->fHandled = TRUE;
+	}
+	else
+	{
+		AvHBaseEntity::KeyValue(pkvd);
+	}
+}
+
+void AvHGameplay::Reset()
+{
+	// This should have all the correct defaults (same as ns.fgd)
+	this->mTeamOneType = AVH_CLASS_TYPE_MARINE;
+	this->mTeamTwoType = AVH_CLASS_TYPE_ALIEN;
+	
+	this->mInitialHives = 1;
+
+//	this->mHiveInjectionTime = (int)(avh_hiveinjectiontime.value);
+//	this->mHiveInjectionAmount = (int)(avh_hiveinjectionamount.value);
+//
+//	#ifndef AVH_MAPPER_BUILD
+//	this->mInitialAlienPoints = (int)(avh_initialalienpoints.value);
+//	this->mInitialMarinePoints = (int)(avh_initialmarinepoints.value);
+//	#else
+//	this->mInitialAlienPoints = 1000;
+//	this->mInitialMarinePoints = 1000;
+//	#endif
+//	
+//	this->mAlienRespawnCost = (int)(avh_alienrespawncost.value);
+//	this->mAlienRespawnTime = (int)(avh_alienrespawntime.value);
+//	
+//	this->mMarineResourceInjectionTime = (int)(avh_marineresourcetime.value);
+//	this->mMarineResourceInjectionAmount = (int)(avh_marineresourceamount.value);
+}
+
+// Should we even do this?
+void AvHGameplay::Spawn()
+{
+	AvHBaseEntity::Spawn();
+	
+    this->pev->classname = MAKE_STRING(kwsGameplayClassName);
+	this->pev->solid = SOLID_NOT;
+	this->pev->movetype = MOVETYPE_NONE;
+	this->pev->effects = EF_NODRAW;
+}
+
+
+
+AvHGamma::AvHGamma()
+{
+	this->mGammaScalar = 1.0f;
+}
+	
+void AvHGamma::KeyValue(KeyValueData* pkvd)
+{
+	if(FStrEq(pkvd->szKeyName, "desiredgamma"))
+	{
+		this->mGammaScalar = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+	{
+		AvHBaseEntity::KeyValue(pkvd);
+	}
+}
+	
+float AvHGamma::GetGamma() const
+{
+	return this->mGammaScalar;
+}
+
+
+void AvHGamma::Spawn()
+{
+	AvHBaseEntity::Spawn();
+    this->pev->classname = MAKE_STRING(kwsGammaClassName);
+	this->pev->effects = EF_NODRAW;
+}
+
+
+
+
+
+//AvHEgg::AvHEgg()
+//{
+//}
+//
+//void AvHEgg::EggThink(void)
+//{
+//	// If we're not touching any 
+//	//FallThink();
+//	this->pev->nextthink = gpGlobals->time + kFallThinkInterval;
+//	
+//	if(this->pev->flags & FL_ONGROUND)
+//	{
+//		// lie flat
+//		this->pev->angles.x = 0;
+//		this->pev->angles.z = 0;
+//
+//		this->pev->solid = SOLID_BBOX;
+//		this->pev->movetype = MOVETYPE_TOSS;
+//
+//		// Now it's big enough to block
+//		this->pev->takedamage = DAMAGE_YES;
+//
+//		Vector theFinalPos = this->pev->origin;
+//		//theFinalPos.z += 50;
+//
+//		UTIL_SetSize(this->pev, Vector( -32, -32, -50), Vector(32, 32, 64) );
+//		UTIL_SetOrigin(this->pev, theFinalPos);// link into world.
+//		SetThink (NULL);
+//
+//		// Start animating
+//		this->pev->sequence	= 0;
+//		this->pev->frame = 0;
+//		//ResetSequenceInfo();
+//		//AvHSUSetCollisionBoxFromSequence(this->pev);
+//	}
+//}
+//
+//void AvHEgg::Hatch()
+//{
+//}
+//
+//void AvHEgg::Killed( entvars_t *pevAttacker, int iGib )
+//{
+//	AvHSUExplodeEntity(this, matFlesh);
+//
+//	EMIT_SOUND(ENT(this->pev), CHAN_AUTO, kEggDestroyedSound, 1.0, ATTN_IDLE);	
+//
+//	//AvHBaseEntity::Killed(pevAttacker, iGib);
+//	//CBaseAnimating::Killed(pevAttacker, iGib);
+//	CBaseEntity::Killed(pevAttacker, iGib);
+//}
+//
+//void AvHEgg::Precache(void)
+//{
+//	PRECACHE_SOUND(kEggDestroyedSound);
+//	PRECACHE_MODEL(kEggModel);
+//}
+//
+//void AvHEgg::Spawn()
+//{
+//	this->Precache( );
+//
+//	this->pev->solid = SOLID_BBOX;
+//	this->pev->movetype = MOVETYPE_TOSS;
+//	//this->pev->flags &= ~FL_ONGROUND;
+//	//this->pev->velocity = Vector(0, 0, 8);
+//	
+//	SET_MODEL( ENT(this->pev), kEggModel);
+//	UTIL_SetOrigin(pev, pev->origin);               // set size and link into world
+//
+//	DROP_TO_FLOOR(ENT(pev));
+//
+//	this->pev->classname = MAKE_STRING(kwsEggClassName);
+//	this->pev->health = AvHPlayerUpgrade::GetMaxHealth(0, ROLE_GESTATING);
+//	this->pev->max_health = pev->health;
+//	this->pev->takedamage = DAMAGE_YES;
+//	//this->pev->view_ofs = Vector(0,0,22);
+//
+//	this->pev->sequence = 0;
+//	this->pev->frame = 0;
+//	ResetSequenceInfo();
+//	AvHSUSetCollisionBoxFromSequence(this->pev);
+//}
+//
+//void AvHEgg::SpawnPlayer()
+//{
+//	// Bring origin up a bit, so when the player spawns he won't be stuck in the ground
+//	this->pev->origin.z += 50;
+//
+//	AvHSUExplodeEntity(this, matFlesh);
+//
+//	SetThink(SUB_Remove);
+//
+//	this->pev->nextthink = gpGlobals->time + .3f;
+//}
+//
+//int	AvHEgg::TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType )
+//{
+//	//return CBaseAnimating::TakeDamage(pevInflictor, pevAttacker, flDamage, bitsDamageType);
+//	return CBaseEntity::TakeDamage(pevInflictor, pevAttacker, flDamage, bitsDamageType);
+//}
+
+
+const float kTriggerPresenceThinkInterval = .05f;
+
+TriggerPresence::TriggerPresence()
+{
+	this->mEnabled = true;
+	this->mPresence = false;
+	this->mPlayersDontActivate = false;
+	this->mMonstersDontActivate = false;
+	this->mPushablesDontActivate = false;
+	this->mTeamOneOnly = false;
+	this->mTeamTwoOnly = false;
+	
+	this->mTimeOfLastTouch = -1;
+	this->mTimeBeforeLeave = .5f;
+	this->mMomentaryOpenTime = 1.0f;
+	this->mMomentaryCloseTime = 1.0f;
+}
+
+void TriggerPresence::KeyValue(KeyValueData* pkvd)
+{
+	pkvd->fHandled = FALSE;
+	
+	if(FStrEq(pkvd->szKeyName, "master"))
+	{
+		this->mMaster = pkvd->szValue;
+		pkvd->fHandled = TRUE;
+	} 
+	else if(FStrEq(pkvd->szKeyName, "targetenter"))
+	{
+		this->mTargetEnter = pkvd->szValue;
+		pkvd->fHandled = TRUE;
+	} 
+	else if(FStrEq(pkvd->szKeyName, "targetleave"))
+	{
+		this->mTargetLeave = pkvd->szValue;
+		pkvd->fHandled = TRUE;
+	} 
+	else if(FStrEq(pkvd->szKeyName, "momentarytarget"))
+	{
+		this->mMomentaryTarget = pkvd->szValue;
+		pkvd->fHandled = TRUE;
+	} 
+	else if(FStrEq(pkvd->szKeyName, "timebeforeleave"))
+	{
+		this->mTimeBeforeLeave = max(atof(pkvd->szValue), 0.0f);
+		pkvd->fHandled = TRUE;
+	} 
+	else if(FStrEq(pkvd->szKeyName, "momentaryopentime"))
+	{
+		this->mMomentaryOpenTime = max(atof(pkvd->szValue), 0.01f);
+		pkvd->fHandled = TRUE;
+	} 
+	else if(FStrEq(pkvd->szKeyName, "momentaryclosetime"))
+	{
+		this->mMomentaryCloseTime = max(atof(pkvd->szValue), 0.01f);
+		pkvd->fHandled = TRUE;
+	} 
+	else if(FStrEq(pkvd->szKeyName, "spawnflags"))
+	{
+		pkvd->fHandled = TRUE;
+	}
+	else
+	{
+		CBaseEntity::KeyValue(pkvd);
+	}
+}
+
+void TriggerPresence::Precache(void)
+{
+}
+
+//void TriggerPresence::ResetEntity(void)
+//{
+	// Not sure if this should be here or not...think
+	//this->mTimeOfLastTouch = -1;
+	//this->SetPresence(false);
+	//this->mEnabled = false;
+//}
+
+void TriggerPresence::SetPresence(bool inPresence)
+{
+	// If we current have presence and inPresence is false
+	if(this->mPresence && !inPresence)
+	{
+		// fire mTargetLeave
+		FireTargets(this->mTargetLeave.c_str(), this, this, USE_TOGGLE, 0.0f);
+	}
+	// else if we don't have presence and inPresence is true
+	else if(!this->mPresence && inPresence)
+	{
+		// fire mTargetEnter
+		if(this->mTargetEnter != "")
+		{
+			FireTargets(this->mTargetEnter.c_str(), this, this, USE_TOGGLE, 0.0f);
+		}
+	}
+	
+	// Set mPresence to inPresence
+	this->mPresence = inPresence;
+}
+
+void TriggerPresence::Spawn(void)
+{
+	this->Precache();
+	
+	CBaseEntity::Spawn();
+	
+	// Spawn code
+	this->SetTouch(&TriggerPresence::TriggerTouch);
+
+	this->pev->movetype = MOVETYPE_NONE;
+	this->pev->solid = SOLID_TRIGGER;
+	
+	SET_MODEL(ENT(pev), STRING(pev->model));
+	this->pev->effects = EF_NODRAW;
+	
+	// Set spawn flags
+	if(this->pev->spawnflags & 1)
+	{
+		this->mPlayersDontActivate = true;
+	}
+	if(this->pev->spawnflags & 2)
+	{
+		this->mMonstersDontActivate = true;
+	}
+	if(this->pev->spawnflags & 4)
+	{
+		this->mPushablesDontActivate = true;
+	}
+	if(this->pev->spawnflags & 8)
+	{
+		this->mTeamOneOnly = true;
+	}
+	if(this->pev->spawnflags & 16)
+	{
+		this->mTeamTwoOnly = true;
+	}
+	
+	// Don't start enabled if a master was specified
+	if(this->mMaster != "")
+	{
+		this->mEnabled = false;
+	}
+
+	SetThink(&TriggerPresence::TriggerThink);
+	this->pev->nextthink = gpGlobals->time + kTriggerPresenceThinkInterval;
+}
+
+void TriggerPresence::TriggerThink()
+{
+	if(this->mEnabled)
+	{
+		// If we have presence and haven't received a touch for a certain amount of time
+		if(this->mPresence)
+		{
+			if(gpGlobals->time > this->mTimeOfLastTouch + this->mTimeBeforeLeave)
+			{
+				this->SetPresence(false);
+			}
+		}
+
+		// Keep firing momentary target if presence detected
+		if(this->mMomentaryTarget != "")
+		{
+			// Update the value if we're opening or closing
+			float theDifference = this->mPresence ? kTriggerPresenceThinkInterval/this->mMomentaryOpenTime : -kTriggerPresenceThinkInterval/this->mMomentaryCloseTime;
+			this->mMomentaryValue += theDifference;
+			this->mMomentaryValue = min(max(this->mMomentaryValue, 0.0f), 1.0f);
+				
+			//float theAmount = RANDOM_FLOAT(0, 1);
+			FireTargets(this->mMomentaryTarget.c_str(), this, this, USE_SET, this->mMomentaryValue);
+		}
+	}
+	
+	this->pev->nextthink = gpGlobals->time + kTriggerPresenceThinkInterval;
+}
+
+void TriggerPresence::TriggerTouch(CBaseEntity *pOther)
+{
+	if(this->mEnabled)
+	{
+		// If players activate and is player
+		CBasePlayer* thePlayer = dynamic_cast<CBasePlayer*>(pOther);
+		CBaseMonster* theMonster = dynamic_cast<CBaseMonster*>(pOther);
+		CPushable* thePushable = dynamic_cast<CPushable*>(pOther);
+		
+		bool theTriggerFires = true;
+		
+		if(thePlayer && this->mPlayersDontActivate)
+		{
+			theTriggerFires = false;
+		}
+		if(theMonster && this->mMonstersDontActivate)
+		{
+			theTriggerFires = false;
+		}
+		if(thePushable && this->mPushablesDontActivate)
+		{
+			theTriggerFires = false;
+		}
+		if(this->mTeamOneOnly && (pOther->pev->team != 1))
+		{
+			theTriggerFires = false;
+		}
+		if(this->mTeamTwoOnly && (pOther->pev->team != 2))
+		{
+			theTriggerFires = false;
+		}
+		
+		//if(thePlayer)
+		//{
+		//	ClientPrint(thePlayer->pev, HUD_PRINTCONSOLE, "Player touch\n");
+		//}
+
+		if(theTriggerFires)
+		{
+			this->SetPresence(true);
+			this->mTimeOfLastTouch = gpGlobals->time;
+		}
+	}
+}
+
+void TriggerPresence::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE inUseType, float inValue)
+{
+	switch(inUseType)
+	{
+	case USE_OFF:
+		this->mEnabled = false;
+		break;
+	case USE_ON:
+		this->mEnabled = true;
+		break;
+	case USE_SET:
+		this->mEnabled = (bool)inValue;
+		break;
+	case USE_TOGGLE:
+		this->mEnabled = !this->mEnabled;
+		break;
+	}
+}
+
+
+AvHTriggerRandom::AvHTriggerRandom()
+{
+	this->mMinFireTime = 0;
+	this->mMaxFireTime = 1;
+	this->mWaitBeforeReset = 3;
+
+	this->mStartOn = false;
+	this->mToggle = false;
+	this->mRemoveOnFire = false;
+
+	this->mFiredAtLeastOnce = false;
+	this->mToggleableAndOn = false;
+	this->mTimeOfLastActivation = -1;
+	this->mTimeOfLastTrigger = -1;
+}
+
+
+void AvHTriggerRandom::KeyValue( KeyValueData* pkvd )
+{
+	pkvd->fHandled = FALSE;
+
+	if (FStrEq(pkvd->szKeyName, "minfiretime"))
+	{
+		this->mMinFireTime = atof( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	} 
+	else if (FStrEq(pkvd->szKeyName, "maxfiretime"))
+	{
+		this->mMaxFireTime = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "wait"))
+	{
+		this->mWaitBeforeReset = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "spawnflags"))
+	{
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "balancedtarget"))
+	{
+		this->mBalancedTarget = pkvd->szValue;
+		pkvd->fHandled = TRUE;
+	}
+	else
+	{
+		// Else it's a target name, add it as a target
+		this->mTargetList.push_back(pkvd->szKeyName);
+		pkvd->fHandled = TRUE;
+	}
+}
+
+void AvHTriggerRandom::ResetEntity()
+{
+	this->mFiredAtLeastOnce = false;
+	this->mTimeOfLastActivation = -1;
+	this->mTimeOfLastTrigger = -1;
+	this->mToggleableAndOn = false;
+	
+	// Fire first if necessary
+	if(this->mStartOn)
+	{
+		this->Use(NULL, NULL, USE_TOGGLE, 0.0f);
+	}
+}
+
+void AvHTriggerRandom::SetNextTrigger()
+{
+	float theRandomTime = RANDOM_FLOAT(this->mMinFireTime, this->mMaxFireTime);
+	this->pev->nextthink = gpGlobals->time + theRandomTime;
+	this->mTimeOfLastTrigger = this->pev->nextthink;
+}
+
+
+void AvHTriggerRandom::Spawn(void)
+{
+	this->Precache();
+
+    this->pev->classname = MAKE_STRING(kesTriggerRandom);
+	this->pev->effects = EF_NODRAW;
+	
+	// Start on
+	if(pev->spawnflags & 1)
+	{
+		this->mStartOn = true;
+	}
+	// Toggle
+	if(pev->spawnflags & 2)
+	{
+		this->mToggle = true;
+	}
+	// Remove on fire
+	if(pev->spawnflags & 4)
+	{
+		this->mRemoveOnFire = true;
+	}
+
+	if(this->mTargetList.size() == 0)
+	{
+		ALERT(at_warning, "No targets found in trigger_random (%s)", STRING(this->pev->targetname));
+	}
+}
+
+void AvHTriggerRandom::TriggerTargetThink(void)
+{
+	// Pick random target in list
+	int theNumTargetsToChooseFrom = this->mTargetList.size();
+	if(theNumTargetsToChooseFrom > 0)
+	{
+		// Fire targets with this entity name
+		string theTargetName;
+
+		if(GetGameRules()->GetIsTournamentMode() && (this->mBalancedTarget != ""))
+		{
+			theTargetName = this->mBalancedTarget;
+		}
+		else
+		{
+			int theRandomIndex = RANDOM_LONG(0, theNumTargetsToChooseFrom - 1);
+			theTargetName = this->mTargetList[theRandomIndex];
+		}
+
+		FireTargets(theTargetName.c_str(), NULL, NULL, USE_TOGGLE, 0.0f);
+
+		if(this->mToggleableAndOn)
+		{
+			this->SetNextTrigger();
+		}
+		else
+		{
+			// Set think to NULL
+			SetThink(NULL);
+		}
+	}
+}
+
+void AvHTriggerRandom::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value)
+{
+	// Don't activate if it's a one shot trigger
+	if(!this->mRemoveOnFire || (!this->mFiredAtLeastOnce && (this->mTimeOfLastActivation == -1)))
+	{
+		// If haven't been triggered yet, or is toggleable
+		if(!this->mFiredAtLeastOnce || this->mToggle)
+		{
+			// Don't trigger faster than wait time
+			float theCurrentTime = gpGlobals->time;
+			if((this->mTimeOfLastActivation == -1) || theCurrentTime >= (this->mTimeOfLastActivation + this->mWaitBeforeReset))
+			{
+				// Pick random time between min and max for think
+				SetThink(&AvHTriggerRandom::TriggerTargetThink);
+				this->SetNextTrigger();
+				this->mTimeOfLastActivation = theCurrentTime;
+				
+				if(this->mToggle)
+				{
+					this->mToggleableAndOn = !this->mToggleableAndOn;
+				}
+			}
+		}
+	}
+}
+
+
+
+AvHTriggerScript::AvHTriggerScript()
+{
+	this->mStartOn = false;
+	this->mTriggered = false;
+}
+
+void AvHTriggerScript::KeyValue(KeyValueData* pkvd)
+{
+	if(FStrEq(pkvd->szKeyName, "scriptname"))
+	{
+		const char* theCStrLevelName = STRING(gpGlobals->mapname);
+		if(theCStrLevelName && !FStrEq(theCStrLevelName, ""))
+		{
+			string theLevelName = theCStrLevelName;
+			this->mScriptName = AvHSHUBuildExecutableScriptName(string(pkvd->szValue), theLevelName);
+		
+			pkvd->fHandled = TRUE;
+		}
+	}
+	else
+	{
+		CBaseEntity::KeyValue(pkvd);
+	}
+	
+}
+
+void AvHTriggerScript::ResetEntity()
+{
+	if(this->mStartOn)
+	{
+		this->Trigger();
+	}
+}
+
+void AvHTriggerScript::Spawn()
+{
+	this->Precache();
+	
+	this->pev->classname = MAKE_STRING(kesTriggerScript);
+	
+	// Start on
+	if(this->pev->spawnflags & 1)
+	{
+		this->mStartOn = true;
+	}
+}
+
+void AvHTriggerScript::Trigger()
+{
+	AvHScriptManager::Instance()->RunScript(this->mScriptName);
+}
+
+
+void AvHTriggerScript::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE inUseType, float inValue)
+{
+	bool theNewState = false;
+
+	switch(inUseType)
+	{
+	case USE_OFF:
+		theNewState = false;
+		break;
+	case USE_ON:
+		theNewState = true;
+		break;
+	case USE_SET:
+		theNewState = (bool)inValue;
+		break;
+	case USE_TOGGLE:
+		theNewState = !this->mTriggered;
+		break;
+	}
+
+	// Trigger if necessary
+	if((this->mTriggered != theNewState) && theNewState)
+	{
+		this->Trigger();
+	}
+
+	// Update triggered state
+	this->mTriggered = theNewState;
+}
+
+
+AvHWebStrand::AvHWebStrand()
+{
+}
+
+void AvHWebStrand::Break()
+{
+	EMIT_SOUND(ENT(this->pev), CHAN_AUTO, kWebStrandBreakSound, 1.0, ATTN_IDLE);
+	UTIL_Remove(this);
+
+	// Decrement number of strands
+	AvHTeam* theTeam = GetGameRules()->GetTeam((AvHTeamNumber)this->pev->team);
+	ASSERT(theTeam);
+	theTeam->SetNumWebStrands(theTeam->GetNumWebStrands() - 1);
+}
+
+void AvHWebStrand::Killed(entvars_t *pevAttacker, int iGib)
+{
+	this->Break();
+
+	CBeam::Killed(pevAttacker, iGib);
+}
+
+void AvHWebStrand::Precache(void)
+{
+	// Precache web strand sprite
+	PRECACHE_UNMODIFIED_MODEL(kWebStrandSprite);
+	PRECACHE_UNMODIFIED_SOUND(kWebStrandBreakSound);
+}
+
+void AvHWebStrand::Setup(const Vector& inPointOne, const Vector& inPointTwo)
+{
+	// Create a new entity with CBeam private data
+	this->BeamInit(kWebStrandSprite, kWebStrandWidth);
+
+	this->PointsInit(inPointOne, inPointTwo);
+	this->SetColor( 255, 255, 255 );
+	this->SetScrollRate( 0 );
+	//this->SetBrightness( 64 );
+	this->SetBrightness( 8 );
+
+	this->pev->classname = MAKE_STRING(kesTeamWebStrand);
+}
+
+void AvHWebStrand::Spawn(void)
+{
+	this->Precache();
+
+	CBeam::Spawn();
+
+	// Spawn code
+	this->SetTouch(&AvHWebStrand::StrandTouch);
+	this->pev->solid = SOLID_TRIGGER;
+	//this->pev->solid = SOLID_BBOX;
+	this->pev->health = kWebHitPoints;
+	this->pev->takedamage = DAMAGE_YES;
+
+	//SetBits(this->pev->flags, FL_MONSTER);
+	
+	this->RelinkBeam();
+
+	//SetThink(StrandExpire);
+	//this->pev->nextthink = gpGlobals->time + kWebStrandLifetime;
+}
+
+void AvHWebStrand::StrandExpire()
+{
+	this->Break();
+}
+
+
+void AvHWebStrand::StrandTouch( CBaseEntity *pOther )
+{
+	// Webs can never break on friendlies
+	//if(GetGameRules()->CanEntityDoDamageTo(this, pOther))
+	if(pOther->pev->team != this->pev->team)
+	{
+		AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(pOther);
+		if(thePlayer && thePlayer->GetCanBeAffectedByEnemies())
+		{
+			// Break web and ensnare player if possible (players can't be too webbed)
+			if(thePlayer->SetEnsnareState(true))
+			{
+				this->Break();
+			}
+		}
+	}
+}
+
+int	AvHWebStrand::TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType )
+{
+	float theDamage = 0;
+	
+	//if(bitsDamageType == DMG_SLASH)
+	//{
+		theDamage = flDamage;
+	//}
+
+	if(!pevAttacker)
+	{
+		pevAttacker = pevInflictor;
+	}
+	
+	if(!pevInflictor)
+	{
+		pevInflictor = pevAttacker;
+	}
+	
+	return CBeam::TakeDamage(pevInflictor, pevAttacker, theDamage, bitsDamageType);
+}
+
+
+
+const float kResourceThinkInterval = 1.0f;
+
+AvHFuncResource::AvHFuncResource()
+{
+	this->mParticleSystemIndex = -1;
+	this->mOccupied = false;
+	this->mLastTimeDrawnUpon = -1;
+}
+
+void AvHFuncResource::DeleteParticleSystem()
+{
+	int theParticleSystemIndex = this->GetParticleSystemIndex();
+	if(theParticleSystemIndex != -1)
+	{
+		AvHParticleSystemEntity* theParticleSystemEntity = NULL;
+		if(AvHSUGetEntityFromIndex(theParticleSystemIndex, theParticleSystemEntity))
+		{
+			ASSERT(theParticleSystemEntity);
+			
+			UTIL_Remove(theParticleSystemEntity);
+			this->mParticleSystemIndex = -1;
+		}
+	}
+}
+
+//int	AvHFuncResource::ObjectCaps(void) 
+//{ 
+//	return FCAP_CONTINUOUS_USE;
+//}
+
+void AvHFuncResource::DrawUse(CBaseEntity* inActivator, CBaseEntity* inCaller, USE_TYPE useType, float value)
+{
+	// If nozzle is unoccupied
+	if(!this->mOccupied)
+	{
+		// Check if gorge is using nozzle
+		AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inActivator);
+		if(thePlayer && thePlayer->GetIsRelevant() && (thePlayer->GetUser3() == AVH_USER3_ALIEN_PLAYER2))
+		{
+			// Check interval.  It slows down as the gorge becomes full.  Automatically allows multiple gorges feeding off the same node to balance out (guy with less will hog node, then they should ping back and forth).
+			float thePlayerResources = thePlayer->GetResources();
+			float theDrawMinInterval = BALANCE_FVAR(kDrawMinInterval);
+			float theDrawMaxInterval = BALANCE_FVAR(kDrawMaxInterval);
+			float theDrawInterval = theDrawMinInterval + (theDrawMaxInterval - theDrawMinInterval)*(thePlayerResources/kMaxAlienResources);
+			if((this->mLastTimeDrawnUpon == -1) || (gpGlobals->time > (this->mLastTimeDrawnUpon + theDrawInterval)))
+			{
+				// Give gorge some resources
+				float theDrawAmount = BALANCE_FVAR(kDrawAmount);
+				thePlayer->SetResources(thePlayer->GetResources() + theDrawAmount);
+
+				// Play animation
+				thePlayer->PlayerConstructUse();
+
+				// Play sound
+				AvHSUPlayRandomConstructionEffect(thePlayer, this);
+			
+				// Remember this
+				this->mLastTimeDrawnUpon = gpGlobals->time;
+			}
+		}
+	}
+}
+
+void AvHFuncResource::TurnOffParticleSystem()
+{
+	int theParticleSystemIndex = this->GetParticleSystemIndex();
+	if(theParticleSystemIndex != -1)
+	{
+		AvHParticleSystemEntity* theParticleSystemEntity = NULL;
+		if(AvHSUGetEntityFromIndex(theParticleSystemIndex, theParticleSystemEntity))
+		{
+			ASSERT(theParticleSystemEntity);
+			theParticleSystemEntity->SetUseState(USE_OFF);
+				
+			//UTIL_Remove(theParticleSystemEntity);
+			//this->mParticleSystemIndex = -1;
+		}
+	}
+}
+
+void AvHFuncResource::TurnOnParticleSystem()
+{
+	int theParticleSystemIndex = this->GetParticleSystemIndex();
+	if(theParticleSystemIndex == -1)
+	{
+		uint32 theTemplateIndex;
+		if(gParticleTemplateList.GetTemplateIndexWithName(kpsResourceEmission, theTemplateIndex))
+		{
+			edict_t	*pent;
+			AvHParticleSystemEntity* thePSEntity;
+			
+			pent = CREATE_NAMED_ENTITY(MAKE_STRING(kesParticles));
+			if ( FNullEnt( pent ) )
+			{
+				ALERT ( at_console, "NULL Ent in Create!\n" );
+				ASSERT(false);
+			}
+			
+			thePSEntity = dynamic_cast<AvHParticleSystemEntity*>(CBaseEntity::Instance(pent));
+			ASSERT(thePSEntity);
+			thePSEntity->SetTemplateIndex(theTemplateIndex);
+			
+			Vector thePosition;
+			thePosition.x = (this->pev->absmax.x + this->pev->absmin.x)/2.0f;
+			thePosition.y = (this->pev->absmax.y + this->pev->absmin.y)/2.0f;
+			thePosition.z = (this->pev->absmax.z + this->pev->absmin.z)/2.0f;
+			
+			thePSEntity->pev->origin = thePosition;
+			thePSEntity->pev->angles = this->pev->angles;
+			
+			DispatchSpawn(thePSEntity->edict());
+			
+			this->mParticleSystemIndex = thePSEntity->entindex();
+		}
+	}
+
+	if(theParticleSystemIndex != -1)
+	{
+		AvHParticleSystemEntity* theParticleSystemEntity = NULL;
+		if(AvHSUGetEntityFromIndex(theParticleSystemIndex, theParticleSystemEntity))
+		{
+			ASSERT(theParticleSystemEntity);
+			theParticleSystemEntity->SetUseState(USE_ON);
+			
+			//UTIL_Remove(theParticleSystemEntity);
+			//this->mParticleSystemIndex = -1;
+		}
+	}
+}
+
+void AvHFuncResource::FuncResourceThink()
+{
+	// If we don't have a resource tower, and we haven't created a particle system
+	if(!this->mOccupied)
+	{
+		this->TurnOnParticleSystem();
+	}
+
+	//SetUse(&AvHFuncResource::DrawUse);
+
+	this->pev->nextthink = gpGlobals->time + kResourceThinkInterval;
+}
+
+bool AvHFuncResource::GetIsActive() const
+{
+	return this->mActive;
+}
+
+
+bool AvHFuncResource::GetIsOccupied() const
+{
+	return this->mOccupied;
+}
+
+int	AvHFuncResource::GetParticleSystemIndex() const
+{
+	return this->mParticleSystemIndex;
+}
+
+void AvHFuncResource::KeyValue( KeyValueData* pkvd )
+{
+	if (FStrEq(pkvd->szKeyName, "targetOnBuild"))
+	{
+		this->mTargetOnBuild = pkvd->szValue;
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "targetOnDestroy"))
+	{
+		this->mTargetOnDestroy = pkvd->szValue;
+		pkvd->fHandled = TRUE;
+	}
+	else
+	{
+		CBaseEntity::KeyValue(pkvd);
+	}
+}
+
+void AvHFuncResource::Precache()
+{
+	CBaseAnimating::Precache();
+	PRECACHE_UNMODIFIED_MODEL((char*)STRING(this->pev->model));
+}
+
+void AvHFuncResource::ResetEntity()
+{
+	// Set user3 in case it was removed when resource was destroyed
+	this->pev->iuser3 = AVH_USER3_FUNC_RESOURCE;
+
+	// Reset our properties back to original unharvested settings
+	this->mOccupied = false;
+	this->DeleteParticleSystem();
+
+	this->mLastTimeDrawnUpon = -1;
+}
+
+void AvHFuncResource::Spawn()
+{
+	this->Precache();
+
+	this->pev->solid = SOLID_BBOX;
+	this->pev->movetype = MOVETYPE_TOSS;
+	
+	SET_MODEL(ENT(this->pev), STRING(this->pev->model));
+	// set size and link into world
+//	UTIL_SetOrigin(pev, pev->origin);               
+	
+//	DROP_TO_FLOOR(ENT(pev));
+
+	//this->pev->solid = SOLID_TRIGGER;
+	
+    this->pev->classname = MAKE_STRING(kesFuncResource);
+
+	// Set health greater then 0 so it seems "alive" (won't be needed when buildings can be selected, allows research to continue)
+	this->pev->health = 1;
+	this->pev->max_health = pev->health;
+	this->pev->takedamage = DAMAGE_NO;
+	
+	// For some reason, drop before setting size
+	DROP_TO_FLOOR(ENT(pev));
+
+	UTIL_SetOrigin(this->pev, this->pev->origin);
+	UTIL_SetSize(this->pev, kFuncResourceMinSize, kFuncResourceMaxSize);
+	
+	this->pev->iuser3 = AVH_USER3_FUNC_RESOURCE;
+
+	SetUpgradeMask(&this->pev->iuser4, MASK_SELECTABLE);
+
+	SetThink(&AvHFuncResource::FuncResourceThink);
+	this->pev->nextthink = gpGlobals->time + kResourceThinkInterval;
+}
+
+void AvHFuncResource::TriggerOccupy()
+{
+	this->mOccupied = true;
+}
+
+void AvHFuncResource::TriggerBuild()
+{
+	this->mActive = true;
+	if(this->mTargetOnBuild != "")
+	{
+		FireTargets(this->mTargetOnBuild.c_str(), NULL, NULL, USE_TOGGLE, 0.0f);
+	}
+
+	this->TurnOffParticleSystem();
+}
+
+void AvHFuncResource::TriggerDestroy()
+{
+	this->mActive = false;
+	this->mOccupied = false;
+
+	if(this->mTargetOnDestroy != "")
+	{
+		FireTargets(this->mTargetOnDestroy.c_str(), NULL, NULL, USE_TOGGLE, 0.0f);
+	}
+}
+
+
+AvHFog::AvHFog()
+{
+	this->mFogColor[0] = this->mFogColor[1] = this->mFogColor[2] = 255;
+	this->mFogStart = 0;
+	this->mFogEnd = 1000;
+	this->mFogExpireTime = 1.0f;
+}
+
+void AvHFog::KeyValue(KeyValueData* pkvd)
+{
+	if(FStrEq(pkvd->szKeyName, "fogcolor"))
+	{
+		if(sscanf(pkvd->szValue, "%d %d %d", this->mFogColor + 0, this->mFogColor + 1, this->mFogColor + 2) == 3)
+		{
+			pkvd->fHandled = TRUE;
+		}
+	}
+	else if(FStrEq(pkvd->szKeyName, "fogstart"))
+	{
+		if(sscanf(pkvd->szValue, "%f", &this->mFogStart) == 1)
+		{
+			pkvd->fHandled = TRUE;
+		}
+	}
+	else if(FStrEq(pkvd->szKeyName, "fogend"))
+	{
+		if(sscanf(pkvd->szValue, "%f", &this->mFogEnd) == 1)
+		{
+			pkvd->fHandled = TRUE;
+		}
+	}
+	else if(FStrEq(pkvd->szKeyName, "fogexpire"))
+	{
+		if(sscanf(pkvd->szValue, "%f", &this->mFogExpireTime) == 1)
+		{
+			pkvd->fHandled = TRUE;
+		}
+	}
+	else
+	{
+		CBaseEntity::KeyValue(pkvd);
+	}
+}
+
+void AvHFog::FogTouch(CBaseEntity* inEntity)
+{
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inEntity);
+	if(thePlayer)
+	{
+		thePlayer->TriggerFog(this->entindex(), this->mFogExpireTime);
+	}
+}
+
+void AvHFog::GetFogColor(int& outRed, int& outGreen, int& outBlue) const
+{
+	outRed = this->mFogColor[0];
+	outGreen = this->mFogColor[1];
+	outBlue = this->mFogColor[2];
+}
+
+float AvHFog::GetFogEnd() const
+{
+	return this->mFogEnd;
+}
+
+float AvHFog::GetFogStart() const
+{
+	return this->mFogStart;
+}
+
+void AvHFog::Spawn()
+{
+	this->Precache();
+
+	// Don't show model but still allow triggering of it
+	CBaseEntity::Spawn();
+	
+	this->pev->movetype = MOVETYPE_NONE;
+	this->pev->solid = SOLID_TRIGGER;
+	
+	SET_MODEL(ENT(pev), STRING(pev->model));
+	this->pev->effects = EF_NODRAW;
+
+	// Set touch
+	SetTouch(&AvHFog::FogTouch);
+}
+
+
+
+AvHResourceTower::AvHResourceTower() : AvHBaseBuildable(TECH_NULL, BUILD_RESOURCES, kwsResourceTower, AVH_USER3_RESTOWER)
+{
+	this->mResourceEntityIndex = -1;
+	this->mTechLevel = 1;
+	this->mTimeLastContributed = -1;
+	this->mTimeOfLastSound = -1;
+	this->mActivateTime = 0;
+}
+
+AvHResourceTower::AvHResourceTower(AvHTechID inTechID, AvHMessageID inMessageID, char* inClassName, int inUser4) : AvHBaseBuildable(inTechID, inMessageID, inClassName, inUser4)
+{
+	this->mResourceEntityIndex = -1;
+	this->mTechLevel = 1;
+}
+
+int	AvHResourceTower::GetSequenceForBoundingBox() const
+{
+	return 1;
+}
+
+// Called at end of deploy animation
+void AvHResourceTower::ActivateThink()
+{
+	// Set regular think, but don't start for a little bit
+	SetThink(&AvHResourceTower::ResourceTowerThink);
+	this->pev->nextthink = gpGlobals->time + 4.0f;
+	this->mTimeOfLastSound = -1;
+	this->mScannedForFuncResource = false;
+}
+
+float AvHResourceTower::GetTimeLastContributed()
+{
+	return this->mTimeLastContributed;
+}
+
+char* AvHResourceTower::GetActiveSoundList() const
+{
+	return kResourceTowerSoundList;
+}
+
+int	AvHResourceTower::GetPointValue() const
+{
+	return BALANCE_IVAR(kScoringResourceTowerValue);
+}
+
+void AvHResourceTower::SetTimeLastContributed(float inTime)
+{
+	this->mTimeLastContributed = inTime;
+}
+
+int AvHResourceTower::GetIdleAnimation() const
+{
+	int theIdleAnimation = -1;
+
+	if(this->GetIsBuilt())
+	{
+		theIdleAnimation = this->GetActiveAnimation();
+	}
+
+	return theIdleAnimation;
+}
+
+void AvHResourceTower::ResourceTowerThink(void)
+{
+	if(this->GetIsBuilt())
+	{
+		// Check if
+		if((this->mTimeOfLastSound == -1) || ((gpGlobals->time - this->mTimeOfLastSound) > kResourceTowerMinSoundInterval))
+		{
+			if(RANDOM_LONG(0, 3) == 1)
+			{
+				char* theSoundList = this->GetActiveSoundList();
+				if(theSoundList)
+				{
+					gSoundListManager.PlaySoundInList(theSoundList, this, CHAN_BODY, .2f);
+					this->mTimeOfLastSound = gpGlobals->time;
+				}
+				else
+				{
+					int a = 0;
+				}
+			}
+		}
+
+		AvHFuncResource* theFuncResource= this->GetHostResource();
+		if(theFuncResource)
+		{
+			theFuncResource->TriggerBuild();
+		}
+
+		AvHBaseBuildable::AnimateThink();
+	}
+	
+	this->pev->nextthink = gpGlobals->time + .05f;
+}
+
+AvHFuncResource* AvHResourceTower::GetHostResource() const
+{
+	AvHFuncResource* theFuncResource = NULL;
+
+	if(this->mResourceEntityIndex > 0)
+	{
+		// Look up func_resource
+		edict_t* theEdict = g_engfuncs.pfnPEntityOfEntIndex(this->mResourceEntityIndex);
+		if(!theEdict->free)
+		{
+			CBaseEntity* theEntity = CBaseEntity::Instance(theEdict);
+			if(theEntity)
+			{
+				theFuncResource = dynamic_cast<AvHFuncResource*>(theEntity);
+			}
+		}
+	}
+
+	return theFuncResource;
+}
+
+bool AvHResourceTower::GetIsActive() const
+{
+	bool theIsActive = false;
+
+	if(this->GetIsBuilt() && this->pev && !GetHasUpgrade(this->pev->iuser4, MASK_RECYCLING))
+	{
+		theIsActive = true;
+	}
+
+	return theIsActive;
+}
+
+
+int	AvHResourceTower::GetMaxHitPoints() const
+{
+	return 200;
+}
+
+int	AvHResourceTower::GetResourceEntityIndex() const
+{
+	return this->mResourceEntityIndex;
+}
+
+int	AvHResourceTower::GetTechLevel() const
+{
+	return this->mTechLevel;
+}
+
+void AvHResourceTower::Killed(entvars_t* pevAttacker, int iGib)
+{
+	AvHBaseBuildable::Killed(pevAttacker, iGib);
+
+	// Look up AvHFuncResource and tell it to reset
+	AvHFuncResource* theHostResource = this->GetHostResource();
+	if(theHostResource)
+	{
+		theHostResource->TriggerDestroy();
+	}
+
+	// Play death sequence
+	this->PlayAnimationAtIndex(this->GetKilledAnimation());
+}
+
+void AvHResourceTower::Precache(void)
+{
+	AvHBaseBuildable::Precache();
+
+	//PRECACHE_SOUND(this->GetHarvestSound());
+	PRECACHE_UNMODIFIED_SOUND(this->GetDeploySound());
+	PRECACHE_UNMODIFIED_MODEL(this->GetModelName());
+}
+
+void AvHResourceTower::SetActivateTime(int inTime)
+{
+	this->mActivateTime = inTime;
+}
+
+void AvHResourceTower::SetHasBeenBuilt()
+{
+	AvHBuildable::SetHasBeenBuilt();
+	
+	// Set time for end of animation
+	SetThink(&AvHResourceTower::ActivateThink);
+	//this->pev->nextthink = gpGlobals->time + 8.0f;
+
+	this->mTimeLastContributed = this->pev->nextthink = (gpGlobals->time + this->mActivateTime);
+}
+
+void AvHResourceTower::Spawn()
+{
+	AvHBaseBuildable::Spawn();
+
+	this->mTimeLastContributed = gpGlobals->time;
+
+	this->mActivateTime = BALANCE_IVAR(kResourceTowerActivateTime);
+
+	//Claim ourselves a func_resource immediately and set it occupied
+	if(!this->mScannedForFuncResource && (this->mResourceEntityIndex <= 0))
+	{
+		float theNearestDistance = 10000000;
+		int theFuncResourceID = -1;
+		
+		// Find nearest unoccupied func_resource and set the building's resource id
+		FOR_ALL_ENTITIES(kesFuncResource, AvHFuncResource*)
+		float theDistance = VectorDistance(theEntity->pev->origin, this->pev->origin);
+		if(theDistance < theNearestDistance)
+		{
+			theNearestDistance = theDistance;
+			theFuncResourceID = theEntity->entindex();
+		}
+		END_FOR_ALL_ENTITIES(kesFuncResource)
+			
+		if(theFuncResourceID != -1)
+		{
+			this->mResourceEntityIndex = theFuncResourceID;
+
+			AvHFuncResource* theFuncResource= this->GetHostResource();
+			if(theFuncResource)
+			{
+				theFuncResource->TriggerOccupy();
+			}
+		}
+
+		this->mScannedForFuncResource = true;
+	}
+}
+
+void AvHResourceTower::Upgrade()
+{
+	AvHFuncResource* theFuncResource = this->GetHostResource();
+	
+	// Increment our tech level
+	this->mTechLevel++;
+}
+
+char* AvHResourceTower::GetClassName() const
+{
+	return kwsResourceTower;
+}
+
+//char* AvHResourceTower::GetHarvestSound() const
+//{
+//	return kResourceTowerHarvestSound;
+//}
+
+char* AvHResourceTower::GetDeploySound() const
+{
+	return kResourceTowerDeploySound;
+}
+
+char* AvHResourceTower::GetModelName() const
+{
+	return kResourceTowerModel;
+}
+
+
+void AvHInfoLocation::KeyValue(KeyValueData* pkvd)
+{
+	// Look for name
+	if(FStrEq(pkvd->szKeyName, "locationname"))
+	{
+		if(pkvd->szValue != "")
+		{
+			this->mLocationName = string(pkvd->szValue);
+			pkvd->fHandled = TRUE;
+		}
+	}
+	else
+	{
+		CBaseEntity::KeyValue(pkvd);
+	}
+}
+
+void AvHInfoLocation::Spawn()
+{
+	// If we have a valid name
+	if(this->mLocationName != "")
+	{
+		// Set model, size, hook into world
+		SET_MODEL(ENT(this->pev), STRING(this->pev->model));
+		this->pev->movetype = MOVETYPE_NONE;
+		this->pev->solid = SOLID_NOT;
+		UTIL_SetOrigin(this->pev, this->pev->origin);
+
+		// Set as nodraw
+		this->pev->effects |= EF_NODRAW;
+
+		// Compute min and max
+		this->mMaxExtent = this->pev->maxs;
+		this->mMinExtent = this->pev->mins;
+	}
+	else
+	{
+		// Mark for removal
+		UTIL_Remove(this);
+	}
+}
+
+void AvHInfoLocation::UpdateOnRemove(void)
+{
+	int a = 0;
+}
+
diff --git a/main/source/mod/AvHEntities.h b/main/source/mod/AvHEntities.h
new file mode 100644
index 00000000..3c12b0ea
--- /dev/null
+++ b/main/source/mod/AvHEntities.h
@@ -0,0 +1,679 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHEntities.h$
+// $Date: 2002/11/12 02:23:22 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHEntities.h,v $
+// Revision 1.32  2002/11/12 02:23:22  Flayra
+// - Removed ancient egg
+//
+// Revision 1.31  2002/10/03 18:42:31  Flayra
+// - func_resources now are destroyed if a resource tower is destroyed
+//
+// Revision 1.30  2002/09/23 22:12:36  Flayra
+// - Resource towers give 3 points to team in general
+//
+// Revision 1.29  2002/07/23 17:01:33  Flayra
+// - Updated resource model, removed old junk
+//
+// Revision 1.28  2002/07/10 14:40:04  Flayra
+// - Fixed bug where .mp3s weren't being processed client-side
+//
+// Revision 1.27  2002/07/08 16:55:35  Flayra
+// - Added max ensnare, can't remember why I'm tagging team starts, changed resources functions to floats (for proper handicapping)
+//
+// Revision 1.26  2002/06/25 17:54:20  Flayra
+// - New info_location entity, make resource tower sounds very quiet
+//
+// Revision 1.25  2002/05/28 17:37:01  Flayra
+// - Track number of web strands to enforce limit, reworking of webs in general, removed duplicate code for AvHResourceTower
+//
+// Revision 1.24  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_ENTITIES_H
+#define AVH_ENTITIES_H
+
+#include "util/nowarnings.h"
+#include "extdll.h"
+#include "util.h"
+#include "dlls/cbase.h"
+#include "mod/AvHConstants.h"
+#include "dlls/func_break.h"
+#include "mod/AvHSpecials.h"
+#include "dlls/cbasedoor.h"
+#include "dlls/effects.h"
+#include "mod/AvHMapExtents.h"
+#include "mod/AvHBuildable.h"
+#include "mod/AvHPlayer.h"
+#include "mod/AvHBaseBuildable.h"
+#include "mod/AvHBaseInfoLocation.h"
+#include "mod/AvHCommandConstants.h"
+
+void ExplodeEntity(CBaseEntity* inEntity, Materials inMaterial);
+
+class AvHBaseEntity : public CBaseEntity
+{
+public:
+						AvHBaseEntity();
+
+	AvHTeamNumber		GetTeamNumber() const;
+
+	void EXPORT			FallThink(void);
+	
+	virtual void		KeyValue( KeyValueData* pkvd );
+
+	virtual void		NotifyUpgrade(AvHUpgradeMask inUpgradeMask);
+
+private:
+	//AvHTeamNumber		mTeam;
+};
+
+
+class AvHClientCommandEntity : public AvHBaseEntity
+{
+public:
+						AvHClientCommandEntity();
+
+	void EXPORT			ClientCommandTouch( CBaseEntity *pOther );
+
+	//virtual void		KeyValue( KeyValueData* pkvd );
+
+	virtual const char*	GetClientCommand() = 0;
+
+	virtual void		Spawn(void);
+
+private:
+};
+
+class AvHJoinTeamEntity : public AvHClientCommandEntity
+{
+public:
+	virtual const char*	GetClientCommand();
+};
+
+class AvHSpectateEntity : public AvHClientCommandEntity
+{
+public:
+	virtual const char*	GetClientCommand()
+							{ return kcSpectate; }
+
+};
+
+//class AvHLeaveGameEntity : public AvHClientCommandEntity
+//{
+//public:
+//	virtual const char*	GetClientCommand()
+//							{ return kcReadyRoom; }
+//
+//};
+
+class AvHTeamStartEntity : public AvHBaseEntity
+{
+public:
+	virtual void	KeyValue( KeyValueData* pkvd );
+
+	virtual void	Spawn(void);
+	
+	
+};
+
+class AvHAutoAssignEntity : public AvHClientCommandEntity
+{
+public:
+	virtual const char*	GetClientCommand()
+							{ return kcAutoAssign; }
+
+};
+//
+//class AvHBuildableAnimating : public CBaseAnimating
+//{
+//public:
+//	void EXPORT			BuildUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+//
+//	virtual int			GetMinHitPoints() const;
+//
+//	virtual int			GetMaxHitPoints() const;
+//	
+//	virtual bool		GetIsBuilt() const;
+//
+//	virtual void		SetIsBuilt();
+//
+//	virtual float		GetNormalizedBuildPercentage() const;
+//
+//	virtual void		SetNormalizedBuildPercentage(float inPercentage);
+//
+//	virtual void		Spawn(void);
+//
+//private:
+//	float				mTimeLastUsed;
+//	
+//};
+
+
+// Build site entities
+//class AvHResource : public AvHBaseEntity
+//class AvHResource : public AvHBaseBuildable //CBaseAnimating
+//{
+//public:
+//						AvHResource(AvHTechID inTechID, AvHMessageID inMessageID, char* inClassName, int inHealth, AvHSelectableUser4 inUser4);
+//	
+//	int					BloodColor( void );
+//	virtual float		GetBuildRange(void) const;
+//	virtual bool		GetIsActive(void) const;
+//
+//	virtual void		Killed( entvars_t *pevAttacker, int iGib );
+//	virtual int			ObjectCaps(void);
+//	virtual void		Precache(void);
+//
+//	virtual float		GetTimeLastContributed();
+//	virtual void		SetTimeLastContributed(float inTime);
+//
+//	void EXPORT			ResourceThink(void);
+//	void EXPORT			ResourceTouch( CBaseEntity *pOther );
+//	//void EXPORT			ResourceUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+//
+//	virtual void		SetConstructionComplete();
+//	virtual void		Spawn(void);
+//	virtual int			TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType );
+//
+//private:
+//	//void				LoopSound(void) const;
+//	//void				PlayBuildSound(void);
+//	//void				StopBuildSound(void);
+//
+//	const float			mThinkInterval;
+//	bool				mBuildSoundPlaying;
+//	int					mBuildRange;
+//	int					mResourceRating;
+//	bool				mHasResource;
+//	bool				mStartAlreadyBuilt;
+//	int					mValidTeams;
+//	float				mTimeLastContributed;
+//};
+
+class AvHSeeThrough : public CBaseEntity
+{
+public:
+					AvHSeeThrough();
+	
+	virtual void	KeyValue( KeyValueData* pkvd );
+	
+	virtual void	Spawn();
+	
+private:
+	int				mCommanderAlpha;
+	int				mPlayerAlpha;
+};
+
+class AvHSeeThroughDoor : public CBaseDoor
+{
+public:
+					AvHSeeThroughDoor();
+	
+	virtual void	KeyValue( KeyValueData* pkvd );
+	
+	virtual void	Spawn();
+	
+private:
+	int				mCommanderAlpha;
+	int				mPlayerAlpha;
+};
+
+
+class AvHNoBuild : public AvHBaseEntity
+{
+public:
+					AvHNoBuild();
+	
+	virtual void	KeyValue( KeyValueData* pkvd );
+	
+	virtual void	Spawn();
+	
+private:
+};
+
+
+class AvHMP3Audio : public AvHBaseEntity
+{
+public:
+					AvHMP3Audio();
+
+	int				GetFadeDistance() const;
+						
+	virtual void	KeyValue( KeyValueData* pkvd );
+
+	virtual void	Precache();
+			
+	virtual void	Spawn();
+
+	void EXPORT		SpecialSoundUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+	static void			ClearSoundNameList();
+	static StringList	GetSoundNameList();
+
+private:
+	static StringList	sSoundList;
+
+	string			mSoundName;
+	int				mSoundVolume;
+	int				mFadeDistance;
+	bool			mUseState;
+	bool			mLooping;
+};
+
+class AvHMapInfo : public AvHBaseEntity
+{
+public:
+					AvHMapInfo();
+
+	const AvHMapExtents&	GetMapExtents() const;
+
+	virtual void	KeyValue( KeyValueData* pkvd );
+	
+	virtual void	Spawn();
+	
+private:
+	AvHMapExtents	mMapExtents;
+};
+
+class AvHGameplay : public AvHBaseEntity
+{
+public:
+					AvHGameplay();
+
+	int				GetInitialHives() const;
+
+	int				GetInitialAlienPoints() const;
+
+	int				GetInitialMarinePoints() const;
+
+	int				GetAlienRespawnCost() const;
+
+	int				GetAlienRespawnTime() const;
+
+	int				GetTowerInjectionTime() const;
+
+	int				GetTowerInjectionAmount() const;
+
+	int				GetMarineRespawnCost() const;
+
+	AvHClassType	GetTeamOneType() const;
+		
+	AvHClassType	GetTeamTwoType() const;
+
+	virtual void	KeyValue( KeyValueData* pkvd );
+
+	virtual void	Reset();
+
+	virtual void	Spawn();
+	
+private:
+
+	AvHClassType	mTeamOneType;
+	AvHClassType	mTeamTwoType;
+	
+	int				mInitialHives;
+
+	//int				mInitialAlienPoints;
+	//int				mInitialMarinePoints;
+	
+	//int				mAlienRespawnCost;
+	//int				mAlienRespawnTime;
+	
+	//int				mMarineResourceInjectionTime;
+	//int				mMarineResourceInjectionAmount;
+	
+};
+
+class AvHGamma : public AvHBaseEntity
+{
+public:
+					AvHGamma();
+
+	virtual void	KeyValue( KeyValueData* pkvd );
+
+	virtual float	GetGamma() const;
+
+	virtual void	Spawn();
+					
+private:
+	float			mGammaScalar;
+
+};
+
+
+//class AvHCommandStation : public AvHBaseEntity
+//{
+//public:
+//	void EXPORT			CommandTouch( CBaseEntity *pOther );
+//
+//	void EXPORT			CommandUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+//
+//	virtual int			ObjectCaps(void);
+//	
+//	virtual void		Precache(void);
+//
+//	virtual void		ResetEntity();
+//
+//	virtual void		SetInactive();
+//
+//	virtual void		Spawn(void);
+//
+//	virtual int			TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType );
+//	
+//
+//private:
+//	void EXPORT			CommanderUsingThink(void);
+//};
+//
+
+class TriggerPresence : public CBaseEntity
+{
+public:
+	TriggerPresence();
+	
+	virtual void	KeyValue(KeyValueData* pkvd);
+	
+	virtual void	Precache(void);
+	
+	virtual void	Spawn(void);
+	
+	void EXPORT		TriggerThink();
+	
+	void EXPORT		TriggerTouch(CBaseEntity *pOther);
+	
+	virtual void	Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value);
+	
+private:
+	void			SetPresence(bool inPresence);
+	
+	// Settings
+	string			mMaster;
+	string			mTargetEnter;
+	string			mTargetLeave;
+	string			mMomentaryTarget;
+	bool			mPlayersDontActivate;
+	bool			mMonstersDontActivate;
+	bool			mPushablesDontActivate;
+	bool			mTeamOneOnly;
+	bool			mTeamTwoOnly;
+
+	float			mTimeBeforeLeave;
+	float			mMomentaryOpenTime;
+	float			mMomentaryCloseTime;
+	
+	// Run-time
+	bool			mEnabled;
+	bool			mPresence;
+	float			mTimeOfLastTouch;
+	float			mMomentaryValue;
+};
+
+class AvHTriggerRandom : public AvHBaseEntity
+{
+public:
+	AvHTriggerRandom();
+	
+	virtual void		KeyValue(KeyValueData* pkvd);
+	
+	virtual void		ResetEntity();
+	
+	virtual void		Spawn(void);
+	
+	virtual void		Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value);
+	
+private:
+	void				SetNextTrigger();
+	
+	void EXPORT			TriggerTargetThink(void);
+	
+	// "template" variables (don't change with each game)
+	float				mMaxFireTime;
+	float				mMinFireTime;
+	int					mWaitBeforeReset;
+	
+	bool				mStartOn;
+	bool				mToggle;
+	bool				mRemoveOnFire;
+	
+	StringList			mTargetList;
+	string				mBalancedTarget;
+	
+	// State variables (change with each game)
+	bool				mFiredAtLeastOnce;
+	bool				mToggleableAndOn;
+	float				mTimeOfLastActivation;
+	float				mTimeOfLastTrigger;
+};
+
+class AvHTriggerScript : public AvHBaseEntity
+{
+public:
+						AvHTriggerScript();
+	
+	virtual void		KeyValue(KeyValueData* pkvd);
+	
+	virtual void		ResetEntity();
+
+	virtual void		Spawn();
+
+	virtual void		Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value);
+	
+private:
+	void				Trigger();
+
+	bool				mStartOn;
+	bool				mTriggered;
+
+	string				mScriptName;
+};
+
+
+//class AvHEgg : public CBaseAnimating
+//{
+//public:
+//					AvHEgg();
+//
+//	virtual void	Hatch();
+//					
+//	virtual void	Killed( entvars_t *pevAttacker, int iGib );
+//
+//	virtual void	Precache(void);
+//	
+//	virtual void	Spawn();
+//
+//	virtual void	SpawnPlayer();
+//
+//	virtual int		TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType );
+//
+//	void EXPORT		EggThink(void);
+//	
+//private:
+//};
+
+
+class AvHWebStrand : public CBeam
+{
+public:
+					AvHWebStrand();
+
+	void			Break();
+
+	virtual void	Killed(entvars_t *pevAttacker, int iGib);
+					
+	virtual void	Precache(void);
+
+	void			Setup(const Vector& inPointOne, const Vector& inPointTwo);
+
+	virtual void	Spawn(void);
+	
+	void EXPORT		StrandTouch( CBaseEntity *pOther );
+
+	void EXPORT		StrandExpire();
+	
+	virtual int		TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType );
+
+private:
+};
+
+class AvHFuncResource : public CBaseAnimating
+{
+public:
+					AvHFuncResource();
+
+	bool			GetIsActive() const;
+
+	bool			GetIsOccupied() const;
+
+	int				GetParticleSystemIndex() const;
+
+	void EXPORT		DrawUse(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value);
+
+	//int				ObjectCaps(void);
+
+	virtual void	KeyValue(KeyValueData* pkvd);
+	
+	virtual void	Precache();
+	
+	virtual void	ResetEntity();
+
+	virtual void	Spawn();
+
+	virtual void	TriggerOccupy();
+
+	virtual void	TriggerBuild();
+
+	virtual void	TriggerDestroy();
+
+private:
+	void			DeleteParticleSystem();
+	void			TurnOffParticleSystem();
+	void			TurnOnParticleSystem();
+	void EXPORT		FuncResourceThink();
+
+	string			mTargetOnBuild;
+
+	string			mTargetOnDestroy;
+
+	bool			mOccupied;
+	bool			mActive;
+
+	int				mParticleSystemIndex;
+
+	float			mLastTimeDrawnUpon;
+	
+};
+
+class AvHFog : public CBaseEntity
+{
+public:
+					AvHFog();
+
+	virtual void	KeyValue( KeyValueData* pkvd );
+					
+	void EXPORT		FogTouch(CBaseEntity* inEntity);
+
+	void			GetFogColor(int& outRed, int& outGreen, int& outBlue) const;
+	float			GetFogEnd() const;
+	float			GetFogStart() const;
+	
+	virtual void	Spawn();
+	
+private:
+	int				mFogColor[3];
+	float			mFogStart;
+	float			mFogEnd;
+	float			mFogExpireTime;
+	
+};
+
+
+class AvHResourceTower : public AvHBaseBuildable
+{
+public:
+					AvHResourceTower();
+
+					// For subclassing
+					AvHResourceTower(AvHTechID inTechID, AvHMessageID inMessageID, char* inClassName, int inUser3 = AVH_USER3_NONE);
+	
+	void EXPORT		ResourceTowerThink(void);
+	
+	virtual AvHFuncResource*	GetHostResource() const;
+
+	virtual int		GetIdleAnimation() const;
+
+	virtual bool	GetIsActive() const;
+	
+	virtual int		GetResourceEntityIndex() const;
+
+	virtual int		GetSequenceForBoundingBox() const;
+	
+	virtual int		GetPointValue() const;
+		
+	virtual int		GetTechLevel() const;
+
+	virtual float	GetTimeLastContributed();
+
+	virtual void	SetTimeLastContributed(float inTime);
+	
+	virtual void	Killed(entvars_t *pevAttacker, int iGib);
+	
+	virtual void	Precache(void);
+
+	virtual void	SetActivateTime(int inTime);
+
+	virtual void	SetHasBeenBuilt();
+	
+	virtual void	Spawn();
+	
+	virtual void	Upgrade();
+
+	virtual char*	GetClassName() const;
+	//virtual char*	GetHarvestSound() const;
+	virtual char*	GetDeploySound() const;
+	virtual char*	GetModelName() const;
+
+	virtual char*	GetActiveSoundList() const;
+
+private:
+	void EXPORT		ActivateThink();
+	
+	virtual int		GetMaxHitPoints() const;
+	
+	float			mTimeOfLastSound;
+	//float			mTimeOfNextActiveAnim;
+	
+	int				mTechLevel;
+	
+	int				mResourceEntityIndex;
+
+	int				mActivateTime;
+
+	float			mTimeLastContributed;
+
+	bool			mScannedForFuncResource;
+};
+
+
+class AvHInfoLocation : public CBaseEntity, public AvHBaseInfoLocation
+{
+public:
+	virtual void	KeyValue(KeyValueData* pkvd);
+
+	virtual void	Spawn();
+
+	virtual void	UpdateOnRemove(void);
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHEntityHierarchy.cpp b/main/source/mod/AvHEntityHierarchy.cpp
new file mode 100644
index 00000000..b3def392
--- /dev/null
+++ b/main/source/mod/AvHEntityHierarchy.cpp
@@ -0,0 +1,570 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHEntityHierarchy.cpp $
+// $Date: 2002/10/16 00:53:31 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHEntityHierarchy.cpp,v $
+// Revision 1.10  2002/10/16 00:53:31  Flayra
+// - Updated with new infinite loop data
+//
+// Revision 1.9  2002/07/25 16:57:59  flayra
+// - Linux changes
+//
+// Revision 1.8  2002/07/24 21:16:36  Flayra
+// - Linux issues
+//
+// Revision 1.7  2002/07/24 20:05:22  Flayra
+// - Linux issues
+//
+// Revision 1.6  2002/07/24 19:44:05  Flayra
+// - Linux issues
+//
+// Revision 1.5  2002/07/24 18:55:52  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.4  2002/07/08 16:56:12  Flayra
+// - Workaround to infinite loop encountered during playtest: look into this more
+//
+// Revision 1.3  2002/06/25 17:55:49  Flayra
+// - Quick fix during playtesting...why is this happening?
+//
+//===============================================================================
+#include "util/nowarnings.h"
+#include "mod/AvHEntityHierarchy.h"
+
+#ifdef AVH_SERVER
+#include "extdll.h"
+#include "util.h"
+#include "mod/AvHPlayer.h"
+#include "mod/AvHTeam.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHMarineEquipment.h"
+#include "mod/AvHSharedUtil.h"
+#include "util/MathUtil.h"
+#endif
+
+#ifdef AVH_CLIENT
+#include "cl_dll/chud.h"
+#include "cl_dll/parsemsg.h"
+#include "cl_dll/cl_util.h"
+#endif
+
+extern int gmsgUpdateEntityHierarchy;
+
+////////////
+// Shared //
+////////////
+AvHEntityHierarchy::AvHEntityHierarchy()
+{
+	this->Clear();
+}
+
+void AvHEntityHierarchy::Clear()
+{
+	this->mEntityList.clear();
+}
+
+bool AvHEntityHierarchy::operator!=(const AvHEntityHierarchy& inHierarchy) const
+{
+	return !this->operator==(inHierarchy);
+}
+
+bool AvHEntityHierarchy::operator==(const AvHEntityHierarchy& inHierarchy) const
+{
+	bool theAreEqual = false;
+
+	// NOTE: This could cause problems if entity hierarchy is stored in a hash or something
+	if(this->mEntityList == inHierarchy.mEntityList)
+	{
+		theAreEqual = true;
+	}
+
+	return theAreEqual;
+}
+
+// Gets a list of all entity infos, with each one being a muxed entity index and flags
+void AvHEntityHierarchy::GetEntityInfoList(MapEntityMap& outList) const
+{
+    outList = mEntityList;
+}
+
+////////////////
+// end shared //
+////////////////
+
+
+////////////
+// Server //
+////////////
+#ifdef AVH_SERVER
+
+int GetHotkeyGroupContainingPlayer(AvHPlayer* player)
+{
+
+    AvHTeam* theTeam = player->GetTeamPointer();
+    if(theTeam)
+	{
+		for (int i = 0; i < kNumHotkeyGroups; ++i)
+		{
+
+			EntityListType theGroup = theTeam->GetGroup(i);
+    
+			for (int j = 0; j < (signed)theGroup.size(); ++j)
+			{
+				if (theGroup[j] == player->entindex())
+				{
+					return i;
+				}
+			}
+		}    
+    }
+
+    return -1;
+
+}
+
+
+void AvHEntityHierarchy::BuildFromTeam(const AvHTeam* inTeam, BaseEntityListType& inBaseEntityList)
+{
+
+	this->Clear();
+
+  	if (inTeam->GetTeamType() == AVH_CLASS_TYPE_MARINE ||
+        inTeam->GetTeamType() == AVH_CLASS_TYPE_ALIEN)
+	{
+
+		// Loop through all entities in the world
+		for(BaseEntityListType::iterator theIter = inBaseEntityList.begin(); theIter != inBaseEntityList.end(); theIter++)
+		{
+			
+            CBaseEntity* theBaseEntity = *theIter;
+
+			int  theEntityIndex = theBaseEntity->entindex();
+			bool theEntityIsVisible = (theBaseEntity->pev->team == (int)(inTeam->GetTeamNumber())) ||
+                                       GetHasUpgrade(theBaseEntity->pev->iuser4, MASK_VIS_SIGHTED);
+			bool theEntityIsDetected = GetHasUpgrade(theBaseEntity->pev->iuser4, MASK_VIS_DETECTED);
+
+			// Don't send ammo, health, weapons, or scans
+			bool theIsTransient = ((AvHUser3)(theBaseEntity->pev->iuser3) == AVH_USER3_MARINEITEM) || (theBaseEntity->pev->classname == MAKE_STRING(kwsScan));
+		
+            MapEntity mapEntity;
+
+            mapEntity.mX     = theBaseEntity->pev->origin.x;
+            mapEntity.mY     = theBaseEntity->pev->origin.y;
+            mapEntity.mUser3 = (AvHUser3)(theBaseEntity->pev->iuser3);
+
+			// Don't draw detected blips as their real selves
+			if(!theEntityIsVisible && theEntityIsDetected)
+				mapEntity.mUser3 = AVH_USER3_UNKNOWN;
+
+            mapEntity.mAngle = theBaseEntity->pev->angles[1];
+            mapEntity.mTeam  = (AvHTeamNumber)(theBaseEntity->pev->team);
+            mapEntity.mSquadNumber = 0;
+
+            bool sendEntity = false;
+
+            if (mapEntity.mUser3 == AVH_USER3_HIVE)
+            {
+                if (!theEntityIsVisible)
+                {
+                    mapEntity.mTeam = TEAM_IND;
+                }
+                sendEntity = true;
+            }
+            else if (mapEntity.mUser3 == AVH_USER3_WELD)
+            {
+				vec3_t theEntityOrigin = AvHSHUGetRealLocation(theBaseEntity->pev->origin, theBaseEntity->pev->mins, theBaseEntity->pev->maxs);
+                mapEntity.mX = theEntityOrigin.x;
+                mapEntity.mY = theEntityOrigin.y;
+                sendEntity = true;
+            }
+            else if (mapEntity.mUser3 == AVH_USER3_FUNC_RESOURCE)
+            {
+                sendEntity = true;
+            }
+            else if ((theEntityIsVisible || theEntityIsDetected) && !(theBaseEntity->pev->effects & EF_NODRAW) && !theIsTransient)
+            {
+                
+                AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theBaseEntity);
+                
+                if (thePlayer)
+                {
+                    ASSERT(theEntityIndex > 0);
+                    ASSERT(theEntityIndex <= 32);
+                    mapEntity.mSquadNumber = GetHotkeyGroupContainingPlayer(thePlayer) + 1;
+
+                    if ((thePlayer->GetPlayMode() == PLAYMODE_PLAYING) && !thePlayer->GetIsSpectator())
+                    {
+
+                        sendEntity = true;
+
+                        // If the player has the heavy armor upgrade switch the
+                        // user3 to something that will let us reconstruct that later.
+ 
+                        if (thePlayer->pev->iuser3 == AVH_USER3_MARINE_PLAYER && 
+                            GetHasUpgrade(thePlayer->pev->iuser4, MASK_UPGRADE_13))
+                        {
+                            mapEntity.mUser3 = AVH_USER3_HEAVY;
+                        }
+                       
+                    }
+
+                }
+                else
+                {
+                    if (mapEntity.mUser3 != AVH_USER3_HEAVY)
+                    {
+                        sendEntity = true;
+                    }
+                }
+                
+            }
+
+            if (sendEntity)
+            {
+
+	            const AvHMapExtents& theMapExtents = GetGameRules()->GetMapExtents();
+	            float theMinMapX = theMapExtents.GetMinMapX();
+	            float theMinMapY = theMapExtents.GetMinMapY();
+
+                mapEntity.mX -= theMinMapX;
+                mapEntity.mY -= theMinMapY; 
+                
+                mEntityList[theEntityIndex] = mapEntity;
+
+            }
+        
+        }
+    }
+
+}
+
+// Returns true when something was sent
+bool AvHEntityHierarchy::SendToNetworkStream(AvHEntityHierarchy& inClientHierarchy, entvars_t* inPlayer)
+{
+
+	bool theDataSent = false;
+			
+	// This is calculated from the size of each entity sent (6 bytes), and the max network message size (around 192)
+	const int kMaxEntitiesToSend = 30;
+	bool theMessageStarted = false;
+
+	// Get iterators for both hierarchies
+
+	MapEntityMap::const_iterator clientIter; 
+	MapEntityMap::const_iterator serverIter;
+	
+	clientIter = inClientHierarchy.mEntityList.begin();
+	serverIter = mEntityList.begin();
+
+	int numSubMessagesSent = 0;
+	
+	while (clientIter != inClientHierarchy.mEntityList.end() && serverIter != mEntityList.end())
+	{
+
+		MapEntity	theEntityInfo;
+		int			theEntityIndex	= 0;
+        bool        deleteFlag      = false;
+		bool		sendFlag		= false;
+
+		if (serverIter->first < clientIter->first)
+		{
+			
+			// Send add
+			theEntityIndex = serverIter->first;
+			theEntityInfo  = serverIter->second;
+			sendFlag       = true;
+		
+			++serverIter;
+		
+		}
+		// If server entity index is greater, then send delete for client index
+		else if (serverIter->first > clientIter->first)
+		{
+		
+			theEntityIndex = clientIter->first;
+            theEntityInfo  = clientIter->second;
+			sendFlag       = true;
+            deleteFlag     = true;
+
+			++clientIter;
+		
+		}
+		else	
+		{
+			if (clientIter->second != serverIter->second)
+			{	
+			
+				// Send update
+				theEntityIndex = serverIter->first;
+				theEntityInfo  = serverIter->second;
+				sendFlag       = true;
+
+			}
+
+			++serverIter;
+			++clientIter;
+		
+		}
+
+		if (sendFlag)
+		{
+
+			if (numSubMessagesSent == 0)
+			{
+				MESSAGE_BEGIN(MSG_ONE, gmsgUpdateEntityHierarchy, NULL, inPlayer);
+			}
+
+            WriteEntity(theEntityIndex, theEntityInfo, deleteFlag);
+            
+			++numSubMessagesSent;
+			theDataSent = true;
+
+			if (numSubMessagesSent == kMaxEntitiesToSend)
+			{
+				MESSAGE_END();
+				numSubMessagesSent = 0;
+			}
+
+		}
+	}
+
+    while (serverIter != mEntityList.end())
+    {
+        
+		// Send add
+     
+		if (numSubMessagesSent == 0)
+		{
+			MESSAGE_BEGIN(MSG_ONE, gmsgUpdateEntityHierarchy, NULL, inPlayer);
+		}
+
+        WriteEntity(serverIter->first, serverIter->second, false);
+
+        ++numSubMessagesSent;
+		theDataSent = true;
+
+		if (numSubMessagesSent == kMaxEntitiesToSend)
+		{
+			MESSAGE_END();
+			numSubMessagesSent = 0;
+		}
+        
+        ++serverIter;
+
+    }
+
+    while (clientIter != inClientHierarchy.mEntityList.end())
+    {
+        
+		// Send delete.
+
+		EntityInfo	theEntityInfo  = 0; // 0 entity info means delete.
+		int			theEntityIndex = clientIter->first;
+     
+		if (numSubMessagesSent == 0)
+		{
+			MESSAGE_BEGIN(MSG_ONE, gmsgUpdateEntityHierarchy, NULL, inPlayer);
+		}
+
+        WriteEntity(clientIter->first, clientIter->second, true);
+
+		++numSubMessagesSent;
+		theDataSent = true;
+
+		if (numSubMessagesSent == kMaxEntitiesToSend)
+		{
+			MESSAGE_END();
+			numSubMessagesSent = 0;
+		}
+        
+        ++clientIter;
+
+    }
+
+    if (numSubMessagesSent != 0)
+	{
+		MESSAGE_END();
+	}
+
+	return theDataSent;
+
+}
+
+
+void AvHEntityHierarchy::WriteEntity(int theEntityIndex, const MapEntity& theEntityInfo, bool deleteFlag)
+{
+
+    short s;
+    long  l;
+
+    if (deleteFlag)
+    {
+        l = 0;
+    }
+    else
+    {
+
+	    ASSERT(theEntityInfo.mUser3 < pow(2, kNumStatusBits));
+
+	    int theX = theEntityInfo.mX / kPositionNetworkConstant;
+	    int theY = theEntityInfo.mY / kPositionNetworkConstant;
+
+	    ASSERT(theX < pow(2, kNumPositionCoordinateBits));
+	    ASSERT(theY < pow(2, kNumPositionCoordinateBits));
+
+	    int px = theX << (kNumStatusBits + kNumPositionCoordinateBits + kNumTeamBits);
+	    int py = theY << (kNumStatusBits + kNumTeamBits);
+
+        ASSERT(theEntityInfo.mTeam < pow(2, kNumTeamBits));
+
+        l = px | py | (theEntityInfo.mTeam << kNumStatusBits) | theEntityInfo.mUser3;
+
+    }
+
+    if (theEntityInfo.mUser3 == AVH_USER3_MARINE_PLAYER ||
+	    theEntityInfo.mUser3 == AVH_USER3_COMMANDER_PLAYER  ||
+	    theEntityInfo.mUser3 == AVH_USER3_ALIEN_PLAYER1 ||
+	    theEntityInfo.mUser3 == AVH_USER3_ALIEN_PLAYER2 ||
+	    theEntityInfo.mUser3 == AVH_USER3_ALIEN_PLAYER3 ||
+	    theEntityInfo.mUser3 == AVH_USER3_ALIEN_PLAYER4 ||
+	    theEntityInfo.mUser3 == AVH_USER3_ALIEN_PLAYER5 ||
+	    theEntityInfo.mUser3 == AVH_USER3_ALIEN_EMBRYO)
+    {
+        
+        int i = theEntityIndex;
+        ASSERT(i > 0 && i <= 32);
+
+        int a = (WrapFloat(theEntityInfo.mAngle, 0, 360) / 360.0f) * 16;
+        ASSERT(a >= 0 && a < 16);
+
+        int h = theEntityInfo.mSquadNumber;
+        ASSERT(h >= 0 && h < 8);
+        
+        s = (h << 10) | (a << 6) | (i << 1) | 1;
+
+    }
+    else
+    {
+        s = (theEntityIndex << 1) | 0;
+    }
+
+    WRITE_LONG(l);
+    WRITE_SHORT(s);
+    
+
+}
+
+
+#endif
+////////////////
+// end server //
+////////////////
+
+////////////
+// Client //
+////////////
+#ifdef AVH_CLIENT
+
+void AvHEntityHierarchy::ReadEntity(int& outEntityIndex, MapEntity& outEntity, bool& outDeleteFlag)
+{
+
+    long  l = READ_LONG();
+    short s = READ_SHORT();
+
+    if (l == 0)
+    {
+        outDeleteFlag = true;
+    }
+    else
+    {
+        outDeleteFlag = false;
+        
+        outEntity.mX = ((l >> (kNumStatusBits + kNumPositionCoordinateBits + kNumTeamBits)) & kPositionCoordinateMask)*kPositionNetworkConstant;
+        outEntity.mY = ((l >> (kNumStatusBits + kNumTeamBits)) & kPositionCoordinateMask)*kPositionNetworkConstant;
+        outEntity.mUser3 = (AvHUser3)(l & kStatusMask);
+        outEntity.mTeam  = (AvHTeamNumber)((l >> kNumStatusBits) & kTeamMask);
+    
+    }
+
+    if (s & 0x1)
+    {
+        // Player.
+        outEntityIndex = (s >> 1) & 31;
+        outEntity.mAngle = ((s >> 6) & 15) * 360.0f / 16.0f;
+        outEntity.mSquadNumber = (s >> 10) & 7;
+    }
+    else
+    {
+        outEntityIndex = (s >> 1);
+        outEntity.mAngle = 0;
+        outEntity.mSquadNumber = 0;
+    }
+
+}
+
+
+int	AvHEntityHierarchy::ReceiveFromNetworkStream(int iSize, void *pbuf)
+{
+
+	int theBytesRead = 0;
+	BEGIN_READ(pbuf, iSize);
+
+	while (theBytesRead < iSize)
+	{
+
+		ASSERT(iSize - theBytesRead >= 6);
+
+        int       theEntityIndex;
+        MapEntity theEntityInfo;
+        bool      deleteFlag;
+        
+        ReadEntity(theEntityIndex, theEntityInfo, deleteFlag);
+		theBytesRead += 6;
+        
+        if (deleteFlag)
+		{
+			// Delete the entity.
+
+			MapEntityMap::iterator entityIter = mEntityList.find(theEntityIndex);
+			//ASSERT(entityIter != mEntityList.end());
+			
+			if(entityIter == mEntityList.end())
+			{
+				char theErrorMessage[512];
+				sprintf(theErrorMessage, "ent %d can't be deleted", theEntityIndex);
+				CenterPrint(theErrorMessage);
+			}
+			else
+			{
+				mEntityList.erase(entityIter);
+			}
+		
+		}
+		else
+		{
+			// Add or update the entity.
+			mEntityList[theEntityIndex] = theEntityInfo;
+			//mEntityList.insert(MapEntityMap::value_type(theEntityIndex, theEntityInfo));
+		}
+
+	}
+
+	return theBytesRead;
+
+}
+
+#endif
+////////////////
+// end client //
+////////////////
+
diff --git a/main/source/mod/AvHEntityHierarchy.h b/main/source/mod/AvHEntityHierarchy.h
new file mode 100644
index 00000000..524b2ec4
--- /dev/null
+++ b/main/source/mod/AvHEntityHierarchy.h
@@ -0,0 +1,141 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHEntityHierarchy.h $
+// $Date: 2002/06/25 17:55:49 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHEntityHierarchy.h,v $
+// Revision 1.3  2002/06/25 17:55:49  Flayra
+// - Quick fix during playtesting...why is this happening?
+//
+//===============================================================================
+#ifndef AVH_ENTITYHIERARCHY_H
+#define AVH_ENTITYHIERARCHY_H
+
+#include "types.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHSpecials.h"
+
+#ifdef AVH_SERVER
+#include "util/nowarnings.h"
+#include "extdll.h"
+#include "dlls/util.h"
+#include "cbase.h"
+#include "mod/AvHTeam.h"
+#endif
+
+// Store flags in lower flag bits, big enough for 16 blip states (used for deciding color or sprite)
+const int		kNumStatusBits = 6;
+const int		kStatusMask = 0x3F;
+
+const int       kNumTeamBits = 2;
+const int       kTeamMask = 0x03;
+
+// Assume flags will fire once, then die out after half a second or a second.
+// Only need to send them if they weren't on last update and they are now
+// Note that kFriendlyStatus needs to be greater then zero, so an EntityInfo of 0 can be used to send a "delete" message
+const int		kFriendlyStatus = 1;
+const int		kFriendlyPlayerStatus = 2;
+const int		kEnemyStatus = 3;
+const int		kEnemyPlayerStatus = 4;
+const int		kFriendlyFiringStatus = 5;
+const int		kFriendlyEnemySightedStatus = 6;
+const int		kFriendlyOverwatchStatus = 7;
+const int		kFriendlyRequestPendingStatus = 8;
+const int		kFriendlyTakingDamageStatus = 9;
+const int		kFriendlyDeadStatus = 10;
+const int		kWeldableStatus = 11;
+const int		kResourceNodeStatus = 12;
+const int		kFriendlyBase = 13;
+const int		kUnseenEnemyBase = 14;
+const int		kVisibleEnemyBase = 15;
+const int		kNumStatusTypes = 15;
+
+// Entity is 9 bits, big enough for 512 entities (this probably doesn't need to be sent, remove?)
+//const int		kNumEntityBits = 9;
+//const int		kEntityMask = 0x3FE0;
+
+// Position bits
+// Need 512x512 resolution, so at least 9 bits for x, 9 bits for y, but the more the better (use top 18 bits)
+// Position is encoded between min and max map extents
+const int		kNumPositionCoordinateBits = 12;
+const int		kNumPositionBits = kNumPositionCoordinateBits*2;
+const int		kPositionCoordinateMask  = 0xFFF;
+
+const int		kPositionNetworkConstant = 25;
+
+struct MapEntity
+{
+    AvHUser3        mUser3;
+    AvHTeamNumber   mTeam;
+    float           mX;
+    float           mY;
+    float           mAngle;
+    int             mSquadNumber;
+
+    bool operator==(const MapEntity& e) const
+    {
+        return mUser3       == e.mUser3 &&
+               mTeam        == e.mTeam  &&
+               mX           == e.mX     &&
+               mY           == e.mY     &&
+               mAngle       == e.mAngle &&
+               mSquadNumber == e.mSquadNumber;
+    }
+
+    bool operator!=(const MapEntity& e) const
+    {
+        return !(*this == e);
+    }
+
+};
+
+
+typedef map<int, MapEntity> MapEntityMap;
+
+// EntityInfo
+// 18-bits position, 2 bits unused, 6 bits entity index, 6 bits flags
+
+class AvHEntityHierarchy
+{
+public:
+
+				AvHEntityHierarchy();
+	void		Clear();
+				
+	#ifdef AVH_SERVER
+	void		BuildFromTeam(const AvHTeam* inTeam, BaseEntityListType& inBaseEntityList);
+	bool		SendToNetworkStream(AvHEntityHierarchy& inClientHierarchy, entvars_t* inPlayer);
+    void        WriteEntity(int theEntityIndex, const MapEntity& theEntityInfo, bool deleteFlag);
+	#endif
+
+	#ifdef AVH_CLIENT
+	int			ReceiveFromNetworkStream(int iSize, void *pbuf);
+    void ReadEntity(int& outEntityIndex, MapEntity& outEntity, bool& outDeleteFlag);	
+    #endif
+
+	bool		GetHasBaseLineBeenSent() const;
+	void		SetBaseLineSent();
+
+	void		GetEntityInfoList(MapEntityMap& outList) const;
+	
+	bool		operator!=(const AvHEntityHierarchy& inHierarchy) const;
+	bool		operator==(const AvHEntityHierarchy& inHierarchy) const;
+	
+private:
+   
+
+	// The encoded entity info that has been sent to clients
+
+	MapEntityMap    mEntityList;
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHEvents.cpp b/main/source/mod/AvHEvents.cpp
new file mode 100644
index 00000000..25d0b8ed
--- /dev/null
+++ b/main/source/mod/AvHEvents.cpp
@@ -0,0 +1,3894 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: AvH event declarations 
+//
+// $Workfile: AvHEvents.cpp$
+// $Date: 2002/10/24 21:23:37 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHEvents.cpp,v $
+// Revision 1.47  2002/10/24 21:23:37  Flayra
+// - Reworked jetpacks
+// - Removed bullet casing from grenade launcher
+//
+// Revision 1.46  2002/10/16 20:52:34  Flayra
+// - Removed weapon upgrade sounds
+// - Fixed acid projectile hitting player
+// - Play HMG firing at full volume
+// - Added paralysis projectile
+// - Fixed spike orientation
+//
+// Revision 1.45  2002/10/16 00:54:44  Flayra
+// - Removed unneeded events
+// - Commented out broken parasite projectile
+// - Added general particle event
+// - Added distress beacon event
+//
+// Revision 1.44  2002/09/25 20:43:53  Flayra
+// - Effects update
+//
+// Revision 1.43  2002/09/23 22:13:38  Flayra
+// - Fixed bug where damage upgrades were applying when they shouldn't (for aliens)
+// - Updated spike effect
+// - Removed jetpack effect until it can be done properly
+// - Lots of sound and effects changes
+//
+// Revision 1.42  2002/09/09 19:50:29  Flayra
+// - Reworking jetpack effects, still needs more work
+//
+// Revision 1.41  2002/08/31 18:01:01  Flayra
+// - Work at VALVe
+//
+// Revision 1.40  2002/08/16 02:34:42  Flayra
+// - Removed ASSERTs when creating temporary entities, it can fail in big firefights
+//
+// Revision 1.39  2002/08/09 00:56:38  Flayra
+// - Added particle system back when phasing in items from commander mode
+//
+// Revision 1.38  2002/08/02 22:00:53  Flayra
+// - Removed old HL events, add correct bullet types for new bullet effects
+//
+// Revision 1.37  2002/07/26 23:04:14  Flayra
+// - Generate numerical feedback for damage events
+//
+// Revision 1.36  2002/07/23 17:02:23  Flayra
+// - Turret velocity is constructed on client in same way as server, instead of being sent across as calculated (network precision issues)
+//
+// Revision 1.35  2002/07/10 14:40:23  Flayra
+// - Added special spike hit effect
+//
+// Revision 1.34  2002/07/08 16:57:19  Flayra
+// - Added "invalid action" event, reworking for random spread for bullet fire
+//
+// Revision 1.33  2002/07/01 22:41:40  Flayra
+// - Removed outdated overwatch target and tension events
+//
+// Revision 1.32  2002/07/01 21:31:49  Flayra
+// - Regular update
+//
+// Revision 1.31  2002/06/25 17:57:15  Flayra
+// - Removed old events, added new events, fixed infinite loop crash in PlayMeleeHitEffects, added parasite projectile
+//
+// Revision 1.30  2002/06/03 16:44:27  Flayra
+// - Moved offense chamber firing into event, fixed duplicate empty sound (now it's an event, not server-side), weapons play view model anim in weapon (not event), started to add grenade event for grenade gun
+//
+// Revision 1.29  2002/05/28 17:36:55  Flayra
+// - Don't play machine gun or pistol sounds louder when upgraded, changed welder from looping sound to periodic sound
+//
+// Revision 1.28  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+
+//#include "mod/AvHMarineWeapons.h"
+//#include "mod/AvHAlienWeapons.h"
+//#include "mod/AvHAlienAbilities.h"
+
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/ev_hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/dlight.h"
+#include "r_efx.h"
+#include "mod/AvHMarineWeaponConstants.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHParticleSystemManager.h"
+#include "pm_shared/pm_defs.h"
+#include "mod/AvHSpecials.h"
+#include "mod/AvHEvents.h"
+#include "mod/AvHSelectionHelper.h"
+#include "pm_defs.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHParticleConstants.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "mod/AvHAlienAbilityConstants.h"
+#include "mod/AvHAlienEquipmentConstants.h"
+#include "mod/AvHParticleTemplate.h"
+#include "mod/AvHParticleTemplateClient.h"
+#include "mod/AvHClientVariables.h"
+#include "util/MathUtil.h"
+#include "mod/AvHHulls.h"
+
+//extern AvHKnife				gKnife;
+//extern AvHMachineGun		gMachineGun;
+//extern AvHPistol			gPistol;
+//extern AvHSonicGun			gSonicGun;
+//extern AvHHeavyMachineGun	gHeavyMachineGun;
+//extern AvHGrenadeGun		gGrenadeGun;
+//extern AvHWelder			gWelder;
+//extern AvHMine				gMine;
+//extern AvHSpitGun			gSpitGun;
+//extern AvHClaws				gClaws;
+//extern AvHSpore				gSpores;
+//extern AvHBite				gBite;
+//extern AvHBite2				gBite2;
+//extern AvHSpikeGun			gSpikeGun;
+//extern AvHSwipe				gSwipe;
+//extern AvHWebSpinner		gWebSpinner;
+//extern AvHPrimalScream		gPrimalScream;
+//extern AvHParasiteGun		gParasite;
+//extern AvHUmbraGun			gUmbra;
+//extern AvHBlinkGun			gBlink;
+//extern AvHDivineWind		gDivineWind;
+//extern AvHParalysisGun		gParalysisGun;
+//extern AvHBileBombGun		gBileBomb;
+//extern AvHAcidRocketGun		gAcidRocket;
+//extern AvHHealingSpray		gHealingSpray;
+//extern AvHBabblerGun		gBabblerGun;
+
+// Alien abilities
+//extern AvHLeap				gLeap;
+//extern AvHCharge			gCharge;
+
+
+// The sound constants are stored here, even though it's used on client
+#define SND_CHANGE_PITCH	(1<<7)		// duplicated in protocol.h change sound pitch
+#define SND_CHANGE_VOL		(1<<6)		// duplicated in protocol.h change sound vol
+
+void V_PunchAxis( int axis, float punch );
+//extern double gClientTimeLastUpdate;
+void DrawCircleOnGroundAtPoint(vec3_t inOrigin, int inNumSides, int inStartAngle, int inRadius, float inR, float inG, float inB, float inA, bool inUseRedInstead, float inInnerRadius);
+
+extern void ComputeGrenadeVelocity(Vector& inForward, Vector& inVelocity, Vector& outVelocity);
+
+class LightType
+{
+public:
+	LightType(int inIndex, dlight_t* inLight) : mIndex(inIndex), mLight(inLight)
+		{}
+
+	int			mIndex;
+	dlight_t*	mLight;
+};
+
+typedef vector<LightType>				DLightListType;
+
+DLightListType							gJetpackLights;
+const float								kArbitraryLargeLightTime = 2000.0f;
+//SelectionListType						gSelectionList;
+extern playermove_t*					pmove;
+
+#include "pm_shared/pm_debug.h"
+extern DebugPointListType				gTriDebugLocations;
+extern DebugPointListType				gSquareDebugLocations;
+extern DebugEntityListType				gCubeDebugEntities;
+
+#ifdef AVH_PREDICT_SELECT
+AvHSelectionHelper						gSelectionHelper;
+#endif
+extern AvHParticleTemplateListClient	gParticleTemplateList;
+
+extern const Vector						g_vecZero;
+
+//
+// Macros to make these things easier, less error-prone and clearer
+//
+#define AVH_DECLARE_EVENT(s) \
+extern "C" \
+{\
+void EV_##s(struct event_args_s *args); \
+}
+
+extern "C" Vector						gPredictedPlayerOrigin;
+
+#define AVH_NAME_TO_EVENT(s) "events/"#s".sc"
+
+#define AVH_HOOK_EVENT(s) \
+    gEngfuncs.pfnHookEvent(AVH_NAME_TO_EVENT(s), EV_##s)
+
+//#define AVH_DEFINE_EVENT(s, Class) \
+//void EV_##s(struct event_args_s *args) \
+//{\
+//    static Class theWeapon(AVH_NAME_TO_EVENT(s));
+
+//#define AVH_DEFINE_EVENT_END \
+///* TODO: Add cleanup or other default behavior? */ \
+//} 
+
+//physent_t* GetEntity(int inPhysIndex);
+
+//
+// Declare events
+//
+
+//// Marine weapon events
+AVH_DECLARE_EVENT(Knife)
+AVH_DECLARE_EVENT(MachineGun)
+AVH_DECLARE_EVENT(Pistol)
+AVH_DECLARE_EVENT(SonicGun)
+AVH_DECLARE_EVENT(HeavyMachineGun)
+AVH_DECLARE_EVENT(GrenadeGun)
+AVH_DECLARE_EVENT(Grenade)
+
+// Alien weapon events
+AVH_DECLARE_EVENT(SpitGun)
+AVH_DECLARE_EVENT(OffenseChamber)
+AVH_DECLARE_EVENT(Claws)
+AVH_DECLARE_EVENT(Swipe)
+//AVH_DECLARE_EVENT(EnsnareShoot)
+//AVH_DECLARE_EVENT(EnsnareHit)
+
+AVH_DECLARE_EVENT(SporeShoot)
+AVH_DECLARE_EVENT(SporeCloud)
+AVH_DECLARE_EVENT(UmbraGun)
+AVH_DECLARE_EVENT(UmbraCloud)
+
+AVH_DECLARE_EVENT(Bite)
+AVH_DECLARE_EVENT(Bite2)
+AVH_DECLARE_EVENT(SpikeGun)
+//AVH_DECLARE_EVENT(LayEgg)
+AVH_DECLARE_EVENT(BuildGun)
+AVH_DECLARE_EVENT(HealingSpray)
+AVH_DECLARE_EVENT(Metabolize)
+AVH_DECLARE_EVENT(MetabolizeSuccess)
+AVH_DECLARE_EVENT(SpinWeb)
+//AVH_DECLARE_EVENT(Babbler)
+AVH_DECLARE_EVENT(PrimalScream)
+AVH_DECLARE_EVENT(Cocoon)
+
+AVH_DECLARE_EVENT(Jetpack)
+AVH_DECLARE_EVENT(Welder)
+AVH_DECLARE_EVENT(WelderConst)
+AVH_DECLARE_EVENT(WelderStart)
+AVH_DECLARE_EVENT(WelderEnd)
+//AVH_DECLARE_EVENT(OverwatchStart)
+//AVH_DECLARE_EVENT(OverwatchTarget)
+//AVH_DECLARE_EVENT(OverwatchTension)
+//AVH_DECLARE_EVENT(OverwatchEnd)
+AVH_DECLARE_EVENT(Regeneration)
+AVH_DECLARE_EVENT(StartCloak);
+AVH_DECLARE_EVENT(EndCloak);
+//AVH_DECLARE_EVENT(WallJump)
+AVH_DECLARE_EVENT(Flight)
+AVH_DECLARE_EVENT(Select)
+AVH_DECLARE_EVENT(Teleport)
+AVH_DECLARE_EVENT(PhaseIn)
+AVH_DECLARE_EVENT(SiegeHit)
+AVH_DECLARE_EVENT(SiegeViewHit)
+AVH_DECLARE_EVENT(StopScream)
+AVH_DECLARE_EVENT(CommandPoints)
+AVH_DECLARE_EVENT(AlienSightOn)
+AVH_DECLARE_EVENT(AlienSightOff)
+//AVH_DECLARE_EVENT(ParalysisGun)
+//AVH_DECLARE_EVENT(ParalysisStart)
+AVH_DECLARE_EVENT(ParasiteGun)
+AVH_DECLARE_EVENT(BlinkSuccess)
+AVH_DECLARE_EVENT(DivineWind)
+AVH_DECLARE_EVENT(BileBomb)
+AVH_DECLARE_EVENT(AcidRocket)
+AVH_DECLARE_EVENT(Stomp);
+AVH_DECLARE_EVENT(Devour);
+AVH_DECLARE_EVENT(InvalidAction)
+AVH_DECLARE_EVENT(Particle)
+AVH_DECLARE_EVENT(DistressBeacon)
+AVH_DECLARE_EVENT(LevelUp)
+
+// Alien abilities
+AVH_DECLARE_EVENT(Leap);
+AVH_DECLARE_EVENT(Charge);
+//AVH_DECLARE_EVENT(HiveHit)
+AVH_DECLARE_EVENT(EmptySound)
+AVH_DECLARE_EVENT(NumericalInfo)
+AVH_DECLARE_EVENT(WeaponAnimation)
+AVH_DECLARE_EVENT(Ability);
+
+//extern "C"
+//{
+//void EV_FireGlock1( struct event_args_s *args  );
+//void EV_FireGlock2( struct event_args_s *args  );
+//}
+
+//
+// Hook 'em on Initialize
+//
+void Game_HookEvents( void )
+{
+//	gEngfuncs.pfnHookEvent( "events/glock1.sc",					EV_FireGlock1 );
+//	gEngfuncs.pfnHookEvent( "events/glock2.sc",					EV_FireGlock2 );
+	
+    // Hook marine weapon events
+	gEngfuncs.pfnHookEvent( kKNEventName, EV_Knife );
+	gEngfuncs.pfnHookEvent( kMGEventName, EV_MachineGun );
+	gEngfuncs.pfnHookEvent( kHGEventName, EV_Pistol );
+	gEngfuncs.pfnHookEvent( kSGEventName, EV_SonicGun );
+	gEngfuncs.pfnHookEvent( kHMGEventName, EV_HeavyMachineGun );
+	gEngfuncs.pfnHookEvent( kGGEventName, EV_GrenadeGun );
+    gEngfuncs.pfnHookEvent( kGREventName, EV_Grenade );
+
+	// Alien weapon events
+	gEngfuncs.pfnHookEvent( kSpitGEventName, EV_SpitGun );
+	gEngfuncs.pfnHookEvent( kOffenseChamberEventName, EV_OffenseChamber);
+	gEngfuncs.pfnHookEvent( kClawsEventName, EV_Claws );
+	gEngfuncs.pfnHookEvent( kSwipeEventName, EV_Swipe );
+	//gEngfuncs.pfnHookEvent( kEnsnareShootEventName, EV_EnsnareShoot);
+	//gEngfuncs.pfnHookEvent( kEnsnareHitEventName, EV_EnsnareHit);
+	
+	gEngfuncs.pfnHookEvent( kSporeShootEventName, EV_SporeShoot);
+	gEngfuncs.pfnHookEvent( kSporeCloudEventName, EV_SporeCloud);
+	gEngfuncs.pfnHookEvent( kUmbraShootEventName, EV_UmbraGun);
+	gEngfuncs.pfnHookEvent( kUmbraCloudEventName, EV_UmbraCloud);
+
+	gEngfuncs.pfnHookEvent( kSpikeShootEventName, EV_SpikeGun);
+	gEngfuncs.pfnHookEvent( kBiteEventName, EV_Bite);
+	gEngfuncs.pfnHookEvent( kBite2EventName, EV_Bite2);
+	//gEngfuncs.pfnHookEvent( kEggLayerShootEventName, EV_LayEgg);
+	gEngfuncs.pfnHookEvent( kBuildingGunEventName, EV_BuildGun);
+	gEngfuncs.pfnHookEvent( kHealingSprayEventName, EV_HealingSpray);
+	gEngfuncs.pfnHookEvent( kMetabolizeEventName, EV_Metabolize);
+	gEngfuncs.pfnHookEvent( kMetabolizeSuccessEventName, EV_MetabolizeSuccess);
+	gEngfuncs.pfnHookEvent( kWebSpinnerShootEventName, EV_SpinWeb);
+//	gEngfuncs.pfnHookEvent( kBabblerGunEventName, EV_Babbler);
+	gEngfuncs.pfnHookEvent( kPrimalScreamShootEventName, EV_PrimalScream);
+	gEngfuncs.pfnHookEvent( kStopPrimalScreamSoundEvent, EV_StopScream);
+	
+	gEngfuncs.pfnHookEvent( kJetpackEvent, EV_Jetpack );
+	gEngfuncs.pfnHookEvent( kWelderEventName, EV_Welder );
+	gEngfuncs.pfnHookEvent( kWelderStartEventName, EV_WelderStart );
+	gEngfuncs.pfnHookEvent( kWelderEndEventName, EV_WelderEnd );
+	gEngfuncs.pfnHookEvent( kWelderConstEventName, EV_WelderConst );
+	//gEngfuncs.pfnHookEvent( kStartOverwatchEvent, EV_OverwatchStart );
+	//gEngfuncs.pfnHookEvent( kEndOverwatchEvent, EV_OverwatchEnd );
+	gEngfuncs.pfnHookEvent( kRegenerationEvent, EV_Regeneration );
+	gEngfuncs.pfnHookEvent( kStartCloakEvent, EV_StartCloak );
+	gEngfuncs.pfnHookEvent( kEndCloakEvent, EV_EndCloak );
+	//gEngfuncs.pfnHookEvent( kWallJumpEvent, EV_WallJump );
+	gEngfuncs.pfnHookEvent( kFlightEvent, EV_Flight );
+	gEngfuncs.pfnHookEvent( kTeleportEvent, EV_Teleport );
+	gEngfuncs.pfnHookEvent( kPhaseInEvent, EV_PhaseIn );
+	gEngfuncs.pfnHookEvent( kSiegeHitEvent, EV_SiegeHit );
+	gEngfuncs.pfnHookEvent( kSiegeViewHitEvent, EV_SiegeViewHit );
+	gEngfuncs.pfnHookEvent( kCommanderPointsAwardedEvent, EV_CommandPoints );
+	gEngfuncs.pfnHookEvent( kAlienSightOnEvent, EV_AlienSightOn);
+	gEngfuncs.pfnHookEvent( kAlienSightOffEvent, EV_AlienSightOff);
+//	gEngfuncs.pfnHookEvent( kParalysisShootEventName, EV_ParalysisGun);
+//	gEngfuncs.pfnHookEvent( kParalysisStartEventName, EV_ParalysisStart);
+	gEngfuncs.pfnHookEvent( kParasiteShootEventName, EV_ParasiteGun);
+	gEngfuncs.pfnHookEvent( kBlinkEffectSuccessEventName, EV_BlinkSuccess);
+	gEngfuncs.pfnHookEvent( kDivineWindShootEventName, EV_DivineWind);
+	gEngfuncs.pfnHookEvent( kBileBombShootEventName, EV_BileBomb);
+	gEngfuncs.pfnHookEvent( kAcidRocketShootEventName, EV_AcidRocket);
+	gEngfuncs.pfnHookEvent( kStompShootEventName, EV_Stomp);
+	gEngfuncs.pfnHookEvent( kDevourShootEventName, EV_Devour);
+				
+	gEngfuncs.pfnHookEvent( kLeapEventName, EV_Leap);
+	gEngfuncs.pfnHookEvent( kChargeEventName, EV_Charge);
+	gEngfuncs.pfnHookEvent( kAbilityEventName, EV_Ability);
+	
+	//gEngfuncs.pfnHookEvent( kHiveHitEvent, EV_HiveHit );
+	gEngfuncs.pfnHookEvent( kEmptySoundEvent, EV_EmptySound );
+	gEngfuncs.pfnHookEvent( kNumericalInfoEvent, EV_NumericalInfo );
+	gEngfuncs.pfnHookEvent( kInvalidActionEvent, EV_InvalidAction);
+	gEngfuncs.pfnHookEvent( kParticleEvent, EV_Particle);
+	gEngfuncs.pfnHookEvent( kDistressBeaconEvent, EV_DistressBeacon);
+	gEngfuncs.pfnHookEvent( kWeaponAnimationEvent, EV_WeaponAnimation);
+	gEngfuncs.pfnHookEvent( kLevelUpEvent, EV_LevelUp);
+}
+
+#define LOUD_GUN_VOLUME			1000
+#define NORMAL_GUN_VOLUME		600
+#define QUIET_GUN_VOLUME		200
+
+#define	BRIGHT_GUN_FLASH		512
+#define NORMAL_GUN_FLASH		256
+#define	DIM_GUN_FLASH			128
+
+#define BIG_EXPLOSION_VOLUME	2048
+#define NORMAL_EXPLOSION_VOLUME	1024
+#define SMALL_EXPLOSION_VOLUME	512
+
+#define	WEAPON_ACTIVITY_VOLUME	64
+
+#define VECTOR_CONE_1DEGREES	Vector( 0.00873, 0.00873, 0.00873 )
+#define VECTOR_CONE_2DEGREES	Vector( 0.01745, 0.01745, 0.01745 )
+#define VECTOR_CONE_3DEGREES	Vector( 0.02618, 0.02618, 0.02618 )
+#define VECTOR_CONE_4DEGREES	Vector( 0.03490, 0.03490, 0.03490 )
+#define VECTOR_CONE_5DEGREES	Vector( 0.04362, 0.04362, 0.04362 )
+#define VECTOR_CONE_6DEGREES	Vector( 0.05234, 0.05234, 0.05234 )
+#define VECTOR_CONE_7DEGREES	Vector( 0.06105, 0.06105, 0.06105 )
+#define VECTOR_CONE_8DEGREES	Vector( 0.06976, 0.06976, 0.06976 )
+#define VECTOR_CONE_9DEGREES	Vector( 0.07846, 0.07846, 0.07846 )
+#define VECTOR_CONE_10DEGREES	Vector( 0.08716, 0.08716, 0.08716 )
+#define VECTOR_CONE_15DEGREES	Vector( 0.13053, 0.13053, 0.13053 )
+#define VECTOR_CONE_20DEGREES	Vector( 0.17365, 0.17365, 0.17365 )
+
+// <<< cgc >>>
+// This is duplicated here, make sure it's up to date
+//#define SND_CHANGE_PITCH	(1<<7)		// duplicated in protocol.h change sound pitch
+
+int& GetUpgradeState(int inIndex)
+{
+	cl_entity_t* thePlayer = GetEntity(inIndex);
+	return thePlayer->curstate.iuser4;
+}
+
+// From Counter-strike
+#define MAX_DEAD_PLAYER_MODELS 64
+TEMPENTITY* g_DeadPlayerModels[MAX_DEAD_PLAYER_MODELS];
+#define MAX_BODY_TIME 5
+#define FTENT_BODYTRACE			0x00100000
+#define FTENT_BODYGRAVITY		0x00200000
+
+void RemoveAllDecals()
+{
+	for ( int har = 0; har < (int)CVAR_GET_FLOAT( "r_decals" ); har++ )
+		gEngfuncs.pEfxAPI->R_DecalRemoveAll ( har );
+
+	//if ( g_pParticleMan )
+	//	 g_pParticleMan->ResetParticles();
+
+	if ( g_DeadPlayerModels == NULL )
+		 return;
+
+	// Is the dead player model list already clean?
+	if ( g_DeadPlayerModels[0] == NULL )
+		return;
+
+	// Clear dead player model list
+	for ( int i = 0; i < MAX_DEAD_PLAYER_MODELS; i++ )
+	{
+		if ( g_DeadPlayerModels[i] )
+		{
+			g_DeadPlayerModels[i]->die = 0;
+			g_DeadPlayerModels[i] = 0;
+		}
+	}
+}
+
+// lowers body into ground
+void RemoveBody(TEMPENTITY* te, float frametime, float current_time)
+{
+	if ( current_time >= te->entity.curstate.fuser2 + MAX_BODY_TIME + CVAR_GET_FLOAT( "cl_corpsestay" ) )
+		 te->entity.origin[2] -= frametime * 5;
+}
+
+// Play a sound? Through up some smoke?
+void HitBody( TEMPENTITY *ent, struct pmtrace_s *ptr )
+{
+	if ( ptr->plane.normal.z > 0 )
+		ent->flags |= FTENT_BODYGRAVITY;
+}
+
+// From Counter-strike
+void CreateCorpse ( Vector vOrigin, Vector vAngles, const char *pModel, float flAnimTime, int iSequence, int iBody )
+{
+	int framecount = 255;
+
+	int iModelIndex = gEngfuncs.pEventAPI->EV_FindModelIndex ( pModel );
+	TEMPENTITY *pBody = gEngfuncs.pEfxAPI->R_TempModel( vOrigin, Vector( 0, 0, 0 ), vAngles, 100, gEngfuncs.pEventAPI->EV_FindModelIndex ( pModel ), 0 );
+
+	if ( pBody == NULL)
+		return;
+
+	pBody->flags |=  FTENT_COLLIDEWORLD | FTENT_CLIENTCUSTOM | FTENT_SPRANIMATE | FTENT_BODYTRACE | FTENT_PERSIST;
+	pBody->frameMax = framecount;
+
+	pBody->entity.curstate.animtime = flAnimTime;
+	pBody->entity.curstate.framerate = 1;
+	pBody->entity.curstate.sequence = iSequence;
+	pBody->entity.curstate.frame = 0;
+	pBody->entity.curstate.body = iBody;
+	pBody->entity.curstate.renderamt = 255;
+	pBody->entity.curstate.fuser1 = gHUD.m_flTime + 1;
+	pBody->entity.curstate.fuser2 = gHUD.m_flTime + CVAR_GET_FLOAT ("cl_corpsestay");	// estimated end time of animation
+
+	// let entity sink 5 seconds then kill it after cl_corpsestay is over
+	pBody->die = gEngfuncs.GetClientTime() + pBody->entity.curstate.fuser2 + 5;
+	pBody->callback = RemoveBody;
+	pBody->hitcallback = HitBody;
+	pBody->bounceFactor = 0;
+
+	// Save body to list so we can remove after round ends
+	for ( int i = 0; i < 64; i ++ )
+	{
+		if ( g_DeadPlayerModels[ i ] == NULL )
+		{
+			g_DeadPlayerModels[ i ] = pBody;
+			break;
+		}
+	}
+}
+
+void PlayMeleeHitEffects(struct event_args_s* inArgs, int inRange, const string& inSoundName)
+{
+	int thePlayer = inArgs->entindex;
+
+	vec3_t theForward, theRight, theUp;
+	gEngfuncs.pfnAngleVectors(inArgs->angles, theForward, theRight, theUp);
+
+	vec3_t theAimingDir;
+	for(int i = 0; i < 3; i++)
+	{
+		theAimingDir[i] = theForward[i];// + theRight[i] + theUp[i];
+	}
+	VectorNormalize(theAimingDir);
+
+	// Do a trace within certain range, ignoring ourselves
+	gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction( false, true );
+
+	gEngfuncs.pEventAPI->EV_PushPMStates();
+	
+	gEngfuncs.pEventAPI->EV_SetSolidPlayers(-1);
+
+	gEngfuncs.pEventAPI->EV_SetTraceHull( 2 );
+
+	Vector theStartPos;
+	//VectorMA(inArgs->origin, 17, theAimingDir, theStartPos);
+	VectorCopy(inArgs->origin, theStartPos);
+	//gTriDebugLocations.push_back(DebugPoint(theStartPos[0], theStartPos[1], theStartPos[2]));
+	//gTriDebugLocations.push_back(DebugPoint(theStartPos[0] + theAimingDir[0]*inRange, theStartPos[1]+ theAimingDir[1]*inRange, theStartPos[2] + theAimingDir[2]*inRange));
+	
+	Vector theEndPos;
+	VectorMA(theStartPos, inRange, theAimingDir, theEndPos);
+	//gTriDebugLocations.push_back(DebugPoint(theEndPos[0], theEndPos[1], theEndPos[2]));
+	
+	pmtrace_t tr;
+	bool theDone = false;
+	int theNumIterations = 0;
+
+	do
+	{
+		gEngfuncs.pEventAPI->EV_PlayerTrace(theStartPos, theEndPos, PM_NORMAL, thePlayer, &tr);
+	
+		// Did we hit something marked as enemy?
+		int theHit = gEngfuncs.pEventAPI->EV_IndexFromTrace(&tr);
+		if(theHit == thePlayer)
+		{
+			// tr.endpos: -71.1894, 3274.23, -527.888
+			// theStartPos: -71.20, 3274.02, -517.89
+			// theAimingDir: -0.01169, -0.02157, .99969
+			// Infinite loop: this next line doesn't changea anything
+			VectorMA(tr.endpos, kHitOffsetAmount, theAimingDir, theStartPos);
+		}
+		else if(tr.fraction < 1.0f)
+		{
+			Vector theHitPos = tr.endpos;
+			
+			// Play sound
+			gEngfuncs.pEventAPI->EV_PlaySound(thePlayer, theHitPos, CHAN_AUTO, inSoundName.c_str(), 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+
+			// Play generic damage effect
+			//AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsMeleeDamage, theHitPos, &(tr.plane.normal));
+			
+			theDone = true;
+		}
+		else
+		{
+			theDone = true;
+		}
+
+		// Prevent infinite loop
+		theNumIterations++;
+
+		if(theNumIterations > 20)
+		{
+			theDone = true;
+		}
+
+	} while(!theDone);
+
+	gEngfuncs.pEventAPI->EV_PopPMStates();
+}
+
+//
+// Define them
+//
+void EV_Knife(struct event_args_s* inArgs)
+{
+	int idx = inArgs->entindex;
+	
+	// Play attack sound
+	char* theSoundToPlay = "";
+	
+	int theRandomSound = gEngfuncs.pfnRandomLong(0, 1);
+	switch(theRandomSound)
+	{
+	case 0:
+		theSoundToPlay = kKNFireSound1;
+		break;
+	case 1:
+		theSoundToPlay = kKNFireSound2;
+		break;
+	}
+	gEngfuncs.pEventAPI->EV_PlaySound(idx, inArgs->origin, CHAN_WEAPON, theSoundToPlay, inArgs->fparam1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+
+	// TODO: Now do a trace line and if we hit a wall, play the wall sound, if we hit a person, play a hit-flesh sound
+	// TODO: Add sparks where it hit
+	
+	// General x-punch axis
+	if (EV_IsLocal(idx))
+	{
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+		/*
+		float theHalfSpread = kKNXPunch/2.0f;
+		if(theHalfSpread > 0.0f)
+		{
+			V_PunchAxis(0, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+			V_PunchAxis(1, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+		}
+		*/
+	}
+}
+
+//void EV_Grenade(struct event_args_s* inArgs)
+//{
+//	int idx = inArgs->entindex;
+//	vec3_t up, right, forward;
+//	gEngfuncs.pfnAngleVectors(inArgs->angles, forward, right, up);
+//	
+//	// Play attack sound
+//	char* theSoundToPlay = kKNFireSound1;
+//	gEngfuncs.pEventAPI->EV_PlaySound(idx, inArgs->origin, CHAN_WEAPON, theSoundToPlay, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+//
+//	// Create a temporary entity that bounces and dies after a certain amount of time
+//	int theModelIndex;
+//	struct model_s* theModel = gEngfuncs.CL_LoadModel("models/w_grenade.mdl", &theModelIndex);
+//	ASSERT(theModel);
+//	TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->CL_TempEntAlloc(gPredictedPlayerOrigin, theModel);
+//	ASSERT(theTempEntity);
+//	if(theTempEntity)
+//	{
+//		vec3_t theStartPos, theEndPos, vecSrc;
+//		EV_GetGunPosition(inArgs, vecSrc, inArgs->origin);
+//		VectorMA(vecSrc, kGBarrelLength, forward, theStartPos);
+//		
+//		VectorCopy(theStartPos, theTempEntity->entity.origin);
+//		VectorCopy(theStartPos, theTempEntity->entity.prevstate.origin);
+//		VectorCopy(theStartPos, theTempEntity->entity.curstate.origin);
+//		theTempEntity->die += kGrenDetonateTime;
+//		//theTempEntity->hitcallback = SpitHit;
+//		theTempEntity->flags |= (FTENT_COLLIDEALL | FTENT_PERSIST);
+//
+//		vec3_t theSourceVelocity;
+//		VectorCopy(inArgs->velocity, theSourceVelocity);
+//
+//		vec3_t theVelocity;
+//		ComputeGrenadeVelocity(forward, theSourceVelocity, theVelocity);
+//
+//		VectorCopy(theVelocity, theTempEntity->entity.baseline.origin);
+//		VectorCopy(theVelocity, theTempEntity->entity.baseline.velocity);
+//	}
+//
+//	// General x-punch axis
+////	if (EV_IsLocal(idx))
+////	{
+////		gEngfuncs.pEventAPI->EV_WeaponAnimation(ANIM_FIRE1 + gEngfuncs.pfnRandomLong(0,2), 2);
+////	}
+//}
+
+void EV_MachineGun(struct event_args_s* args)
+{
+    // What to do about this static member?
+    static int tracerCount[ 32 ];
+	
+    // Figure out which weapon description to assocate this weapon with
+    int theWeaponIndex = args->iparam1;
+	
+	// Play attack animation and add muzzle flash
+	int idx;
+	vec3_t origin;
+	vec3_t angles;
+	vec3_t velocity;
+	
+	vec3_t vecSrc, vecAiming;
+	vec3_t up, right, forward;
+	
+	idx = args->entindex;
+	VectorCopy( args->origin, origin );
+	VectorCopy( args->angles, angles );
+	VectorCopy( args->velocity, velocity );
+	
+	//AngleVectors( angles, forward, right, up );
+	gEngfuncs.pfnAngleVectors(angles, forward, right, up);
+
+	// Get upgrade
+	int theTracerFreq;
+	int theUpgradeLevel = AvHPlayerUpgrade::GetWeaponUpgrade(AVH_USER3_MARINE_PLAYER, GetUpgradeState(idx), NULL, &theTracerFreq);
+
+	// Vary flange effect more with higher upgrade
+	int theUpperBound = theUpgradeLevel*10;
+	int thePitch = 100 + (gEngfuncs.pfnRandomLong(0, theUpperBound) - theUpperBound);
+
+	if ( EV_IsLocal( idx ) )
+	{
+		// Add muzzle flash to current weapon model
+		if(theUpgradeLevel > 0)
+		{
+			EV_MuzzleFlash();
+		}
+		
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(args->iparam2, 2);
+	}
+	
+	// General ejecting ammo if any
+	int shell = gEngfuncs.pEventAPI->EV_FindModelIndex(kMGEjectModel);
+	vec3_t ShellVelocity;
+	vec3_t ShellOrigin;
+	
+	EV_GetDefaultShellInfo(args, origin, velocity, ShellVelocity, ShellOrigin, forward, right, up, 20, -12, 4 );
+	
+	// Only eject brass when upgraded
+	//if(theUpgradeLevel > 0)
+	//{
+	//	VectorScale(ShellVelocity, theUpgradeLevel, ShellVelocity);
+		EV_EjectBrass(ShellOrigin, ShellVelocity, angles[ YAW ], shell, TE_BOUNCE_SHELL); 
+	//}
+	
+	// Play one of basic attack sounds
+	float theVolume = args->fparam1;
+	float theAttenuation = .8f + .3*theUpgradeLevel;
+	
+	char* theSoundToPlay = kMGFireSound1;
+
+	#ifdef AVH_UPGRADE_SOUNDS
+	switch(theUpgradeLevel)
+	{
+	case 1:
+		theSoundToPlay = kMGFireSound2;
+		break;
+	case 2:
+		theSoundToPlay = kMGFireSound3;
+		break;
+	case 3:
+		theSoundToPlay = kMGFireSound4;
+		break;
+	}
+	#endif
+	
+	gEngfuncs.pEventAPI->EV_PlaySound(idx, origin, CHAN_WEAPON, theSoundToPlay, theVolume, theAttenuation, 0, thePitch);
+	
+	EV_GetGunPosition( args, vecSrc, origin );
+	VectorCopy( forward, vecAiming );
+
+	//EV_HLDM_FireBullets( idx, forward, right, up, 1, vecSrc, vecAiming, VECTOR_CONE_6DEGREES, kMGRange, BULLET_PLAYER_MP5, 2, &tracerCount[idx-1] );
+	EV_HLDM_FireBulletsPlayer( idx, forward, right, up, 1, vecSrc, vecAiming, kMGRange, BULLET_PLAYER_MP5, theTracerFreq, &tracerCount[idx-1], kMGSpread, args->iparam1);
+	
+	// General x-punch axis
+	if ( EV_IsLocal( idx ) )
+	{
+		// Multiply punch by upgrade level
+		float theHalfSpread = (kMGXPunch/4.0f)*(theUpgradeLevel+1);
+		if(theHalfSpread > 0.0f)
+		{
+			V_PunchAxis( 0, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+		}
+	}
+}
+
+
+void EV_Pistol(struct event_args_s* args)
+{
+    // What to do about this static member?
+    static int tracerCount[ 32 ];
+	
+    // Figure out which weapon description to assocate this weapon with
+    int theWeaponIndex = args->iparam1;
+	
+	// Play attack animation and add muzzle flash
+	int idx;
+	vec3_t origin;
+	vec3_t angles;
+	vec3_t velocity;
+	
+	vec3_t vecSrc, vecAiming;
+	vec3_t up, right, forward;
+	
+	idx = args->entindex;
+	VectorCopy( args->origin, origin );
+	VectorCopy( args->angles, angles );
+	VectorCopy( args->velocity, velocity );
+	
+	//AngleVectors( angles, forward, right, up );
+	gEngfuncs.pfnAngleVectors(angles, forward, right, up);
+	
+	// Get upgrade
+	int theTracerFreq;
+	int theUpgradeLevel = AvHPlayerUpgrade::GetWeaponUpgrade(AVH_USER3_MARINE_PLAYER, GetUpgradeState(idx), NULL, &theTracerFreq);
+	
+	// Vary flange effect more with higher upgrade
+	int theUpperBound = theUpgradeLevel*10;
+	int thePitch = 100 + (gEngfuncs.pfnRandomLong(0, theUpperBound) - theUpperBound);
+	
+	if ( EV_IsLocal( idx ) )
+	{
+		// Add muzzle flash to current weapon model
+		if(theUpgradeLevel > 0)
+		{
+			EV_MuzzleFlash();
+		}
+		
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(args->iparam2, 2);
+	}
+	
+	// General ejecting ammo if any
+	int shell = gEngfuncs.pEventAPI->EV_FindModelIndex(kHGEjectModel);
+	vec3_t ShellVelocity;
+	vec3_t ShellOrigin;
+	
+	EV_GetDefaultShellInfo(args, origin, velocity, ShellVelocity, ShellOrigin, forward, right, up, 20, -12, 4 );
+	
+	// Only eject brass when upgraded
+	//if(theUpgradeLevel > 0)
+	//{
+	//	VectorScale(ShellVelocity, theUpgradeLevel, ShellVelocity);
+	EV_EjectBrass(ShellOrigin, ShellVelocity, angles[ YAW ], shell, TE_BOUNCE_SHELL); 
+	//}
+	
+	// Play one of basic attack sounds
+	float theVolume = args->fparam1;
+	float theAttenuation = .8f + .3*theUpgradeLevel;
+	
+	char* theSoundToPlay = kHGFireSound1;
+	
+	#ifdef AVH_UPGRADE_SOUNDS
+	switch(theUpgradeLevel)
+	{
+	case 1:
+		theSoundToPlay = kHGFireSound2;
+		break;
+	case 2:
+		theSoundToPlay = kHGFireSound3;
+		break;
+	case 3:
+		theSoundToPlay = kHGFireSound4;
+		break;
+	default:
+		theSoundToPlay = kHGFireSound1;
+		break;
+	}
+	#endif
+	
+	gEngfuncs.pEventAPI->EV_PlaySound(idx, origin, CHAN_WEAPON, theSoundToPlay, theVolume, theAttenuation, 0, thePitch);
+	
+	EV_GetGunPosition( args, vecSrc, origin );
+	VectorCopy( forward, vecAiming );
+	
+	//EV_HLDM_FireBullets( idx, forward, right, up, 1, vecSrc, vecAiming, VECTOR_CONE_6DEGREES, kHGRange, BULLET_PLAYER_MP5, 2, &tracerCount[idx-1] );
+	EV_HLDM_FireBulletsPlayer( idx, forward, right, up, 1, vecSrc, vecAiming, kHGRange, BULLET_PLAYER_357, theTracerFreq, &tracerCount[idx-1], kHGSpread, args->iparam1);
+	
+	// General x-punch axis
+	if ( EV_IsLocal( idx ) )
+	{
+		// Multiply punch by upgrade level
+		float theHalfSpread = (kHGXPunch/3.0f)*(theUpgradeLevel+1);
+		if(theHalfSpread > 0.0f)
+		{
+			V_PunchAxis( 0, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+		}
+	}
+}
+
+void EV_SonicGun(struct event_args_s* args)
+{
+    // What to do about this static member?
+    static int tracerCount[ 32 ];
+	
+    // Figure out which weapon description to assocate this weapon with
+    int theWeaponIndex = args->iparam1;
+	
+	// Play attack animation and add muzzle flash
+	int idx;
+	vec3_t origin;
+	vec3_t angles;
+	vec3_t velocity;
+	
+	vec3_t vecSrc, vecAiming;
+	vec3_t up, right, forward;
+	
+	idx = args->entindex;
+	VectorCopy( args->origin, origin );
+	VectorCopy( args->angles, angles );
+	VectorCopy( args->velocity, velocity );
+	
+	//AngleVectors( angles, forward, right, up );
+	gEngfuncs.pfnAngleVectors(angles, forward, right, up);
+	
+	// Get upgrade
+	int theUpgradeLevel = AvHPlayerUpgrade::GetWeaponUpgrade(AVH_USER3_MARINE_PLAYER, GetUpgradeState(idx));
+	
+	if ( EV_IsLocal( idx ) )
+	{
+		// Add muzzle flash to current weapon model
+		if(theUpgradeLevel > 0)
+		{
+			EV_MuzzleFlash();
+		}
+
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(args->iparam2, 2);
+	}
+	
+	// General ejecting ammo if any
+	int shell = gEngfuncs.pEventAPI->EV_FindModelIndex(kSGEjectModel);
+	vec3_t ShellVelocity;
+	vec3_t ShellOrigin;
+	
+	EV_GetDefaultShellInfo(args, origin, velocity, ShellVelocity, ShellOrigin, forward, right, up, 20, -12, 4 );
+	
+	//if(theUpgradeLevel > 0)
+	//{
+	//	VectorScale(ShellVelocity, theUpgradeLevel, ShellVelocity);
+		EV_EjectBrass(ShellOrigin, ShellVelocity, angles[ YAW ], shell, TE_BOUNCE_SHELL); 
+	//}
+
+	float theAttenuation = .8f + .2*theUpgradeLevel;
+	//float theVolume = min(.85f + .05*theUpgradeLevel, 1.0f);
+	float theVolume = args->fparam1;
+	
+	// TODO: Synch up with propagated random seed?  
+	// Play one of basic attack sounds
+	//if(gEngfuncs.pfnRandomLong(0, 1) == 0)
+	char* theSoundToPlay = kSGFireSound1;
+	
+	#ifdef AVH_UPGRADE_SOUNDS
+	switch(theUpgradeLevel)
+	{
+	case 1:
+		theSoundToPlay = kSGFireSound2;
+		break;
+	case 2:
+		theSoundToPlay = kSGFireSound3;
+		break;
+	case 3:
+		theSoundToPlay = kSGFireSound4;
+		break;
+	}
+	#endif
+
+	gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, theSoundToPlay, theVolume, theAttenuation, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+	
+	EV_GetGunPosition( args, vecSrc, origin );
+	VectorCopy( forward, vecAiming );
+	
+	//if ( gEngfuncs.GetMaxClients() > 1 )
+	//{
+		vec3_t theBarrelOffset, theBarrelTip;
+		VectorScale(forward, 30, theBarrelOffset);
+		VectorAdd(vecSrc, theBarrelOffset, theBarrelTip);
+
+//		if(theUpgradeLevel > 0)
+//		{
+//			AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsShotgun, theBarrelTip);
+//		}
+		//EV_HLDM_FireBullets( idx, forward, right, up, kSGBulletsPerShot, vecSrc, vecAiming, kSGRange, BULLET_PLAYER_BUCKSHOT, 0, &tracerCount[idx-1], VECTOR_CONE_20DEGREES.x, VECTOR_CONE_20DEGREES.y);
+		EV_HLDM_FireBulletsPlayer( idx, forward, right, up, BALANCE_IVAR(kSGBulletsPerShot), vecSrc, vecAiming, kSGRange, BULLET_PLAYER_BUCKSHOT, 0, &tracerCount[idx-1], kSGSpread, args->iparam1);
+		//}
+	
+	// General x-punch axis
+	if ( EV_IsLocal( idx ) )
+	{
+		float theHalfSpread = (kSGXPunch/3.0f)*(theUpgradeLevel+1);
+		if(theHalfSpread > 0.0f)
+		{
+			V_PunchAxis( 0, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+		}
+	}
+}
+
+void EV_HeavyMachineGun(struct event_args_s* args)
+{
+    // What to do about this static member?
+    static int tracerCount[ 32 ];
+	
+    // Figure out which weapon description to assocate this weapon with
+    int theWeaponIndex = args->iparam1;
+	
+	// Play attack animation and add muzzle flash
+	int idx;
+	vec3_t origin;
+	vec3_t angles;
+	vec3_t velocity;
+	
+	vec3_t vecSrc, vecAiming;
+	vec3_t up, right, forward;
+	
+	idx = args->entindex;
+	VectorCopy( args->origin, origin );
+	VectorCopy( args->angles, angles );
+	VectorCopy( args->velocity, velocity );
+	
+	//AngleVectors( angles, forward, right, up );
+	gEngfuncs.pfnAngleVectors(angles, forward, right, up);
+
+	int theTracerLevel;
+	int theUpgradeLevel = AvHPlayerUpgrade::GetWeaponUpgrade(AVH_USER3_MARINE_PLAYER, GetUpgradeState(idx), NULL, &theTracerLevel);
+	
+	if ( EV_IsLocal( idx ) )
+	{
+		if(theUpgradeLevel > 0)
+		{
+			// Add muzzle flash to current weapon model
+			EV_MuzzleFlash();
+		}
+
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(args->iparam2, 2);
+	}
+	
+	// General ejecting ammo if any
+	int shell = gEngfuncs.pEventAPI->EV_FindModelIndex(kHMGEjectModel);
+	vec3_t ShellVelocity;
+	vec3_t ShellOrigin;
+	
+	EV_GetDefaultShellInfo(args, origin, velocity, ShellVelocity, ShellOrigin, forward, right, up, 20, -12, 4 );
+	
+	//if(theUpgradeLevel > 0)
+	//{
+	//	VectorScale(ShellVelocity, theUpgradeLevel, ShellVelocity);
+		EV_EjectBrass(ShellOrigin, ShellVelocity, angles[ YAW ], shell, TE_BOUNCE_SHELL); 
+	//}
+	
+	// TODO: Synch up with propagated random seed?  
+	// Play one of basic attack sounds
+	int theHighIndex = theUpgradeLevel;
+	//int theRandomLong = gEngfuncs.pfnRandomLong(0, theHighIndex);
+	//float theVolume = min(.6 + .2*theUpgradeLevel, 1.0f);
+	float theVolume = args->fparam1;
+	float theAttenuation = .8f + .2*theUpgradeLevel;
+	int thePitch = 100;
+	if(theUpgradeLevel > 0)
+	{
+		int theVariance = theUpgradeLevel*6;
+		thePitch += (gEngfuncs.pfnRandomLong( 0, theVariance))/(theVariance/2);
+	}
+	
+	char* theSoundToPlay = kHMGFireSound1;
+	
+	#ifdef AVH_UPGRADE_SOUNDS
+	switch(theUpgradeLevel)
+	{
+	case 1:
+		theSoundToPlay = kHMGFireSound2;
+		break;
+	case 2:
+		theSoundToPlay = kHMGFireSound3;
+		break;
+	case 3:
+		theSoundToPlay = kHMGFireSound4;
+		break;
+	}
+	#endif
+
+	gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, theSoundToPlay, theVolume, theAttenuation, 0, thePitch);
+	
+	EV_GetGunPosition( args, vecSrc, origin );
+	VectorCopy( forward, vecAiming );
+	
+	//EV_HLDM_FireBullets( idx, forward, right, up, 1, vecSrc, vecAiming, kHMGRange, BULLET_PLAYER_357, theTracerLevel, &tracerCount[idx-1], theSpreadX, theSpreadY);
+	EV_HLDM_FireBulletsPlayer( idx, forward, right, up, 1, vecSrc, vecAiming, kHMGRange, BULLET_PLAYER_MP5, theTracerLevel, &tracerCount[idx-1], kHMGSpread, args->iparam1);
+	
+//	if(theUpgradeLevel > 1)
+//	{
+//		if(gEngfuncs.pfnRandomLong(0, 1) == 0)
+//		{
+//			vec3_t theBarrelOffset, theBarrelTip;
+//			VectorScale(forward, 100, theBarrelOffset);
+//			VectorAdd(vecSrc, theBarrelOffset, theBarrelTip);
+//			
+//			AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsHeavyMGSmoke, vecSrc);
+//		}
+//	}
+	
+	// General x-punch axis
+	if ( EV_IsLocal( idx ) )
+	{
+		float theHalfSpread = (kHMGXPunch/4.0f)*(theUpgradeLevel+1);
+		if(theHalfSpread > 0.0f)
+		{
+			V_PunchAxis( 0, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+		}
+	}
+}
+
+void GrenadeHit(struct tempent_s* ent, struct pmtrace_s* ptr)
+{
+	char* theSoundToPlay = kGRHitSound;
+
+	gEngfuncs.pEventAPI->EV_PlaySound(ent->entity.index, ptr->endpos, CHAN_AUTO, theSoundToPlay, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+	//ASSERT(ptr);
+	//ASSERT(ent);
+	//ent->die = gEngfuncs.GetClientTime();
+}
+
+void EV_GrenadeGun(struct event_args_s* inArgs)
+{
+    // What to do about this static member?
+    static int tracerCount[ 32 ];
+	
+    // Figure out which weapon description to assocate this weapon with
+    int theWeaponIndex = inArgs->iparam1;
+	
+	// Play attack animation and add muzzle flash
+	int idx;
+	vec3_t origin;
+	vec3_t angles;
+	vec3_t velocity;
+	
+	vec3_t vecSrc, vecAiming;
+	vec3_t up, right, forward;
+	
+	idx = inArgs->entindex;
+	VectorCopy( inArgs->origin, origin );
+	VectorCopy( inArgs->angles, angles );
+	VectorCopy( inArgs->velocity, velocity );
+	
+	//AngleVectors( angles, forward, right, up );
+	gEngfuncs.pfnAngleVectors(angles, forward, right, up);
+
+	int theUpgradeLevel = AvHPlayerUpgrade::GetWeaponUpgrade(AVH_USER3_MARINE_PLAYER, GetUpgradeState(idx));
+	
+	if ( EV_IsLocal( idx ) )
+	{
+		// Add muzzle flash to current weapon model
+		if(theUpgradeLevel > 0)
+		{
+			EV_MuzzleFlash();
+		}
+		
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+	}
+	
+//	// General ejecting ammo if any
+//	int shell = gEngfuncs.pEventAPI->EV_FindModelIndex(kGGEjectModel);
+//	vec3_t ShellVelocity;
+//	vec3_t ShellOrigin;
+//	
+//	EV_GetDefaultShellInfo(inArgs, origin, velocity, ShellVelocity, ShellOrigin, forward, right, up, 20, -12, 4 );
+//	
+//	//if(theUpgradeLevel > 0)
+//	//{
+//	//	VectorScale(ShellVelocity, theUpgradeLevel, ShellVelocity);
+//		EV_EjectBrass(ShellOrigin, ShellVelocity, angles[ YAW ], shell, TE_BOUNCE_SHELL); 
+//	//}
+	
+	char* theSoundToPlay = kGGFireSound1;
+	
+	#ifdef AVH_UPGRADE_SOUNDS
+	switch(theUpgradeLevel)
+	{
+	case 1:
+		theSoundToPlay = kGGFireSound2;
+		break;
+	case 2:
+		theSoundToPlay = kGGFireSound3;
+		break;
+	case 3:
+		theSoundToPlay = kGGFireSound4;
+		break;
+	}
+	#endif
+
+	gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, theSoundToPlay, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+	
+	EV_GetGunPosition( inArgs, vecSrc, origin );
+	VectorCopy( forward, vecAiming );
+	
+	// General x-punch axis
+	if ( EV_IsLocal( idx ) )
+	{
+		float theHalfSpread = (kGGXPunch/2.0f)*(theUpgradeLevel+1);
+		if(theHalfSpread > 0.0f)
+		{
+			V_PunchAxis( 0, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+		}
+	}
+
+	// Create temp entity for grenade (assumes grenade is created at inArgs->origin, with velocity inArgs->angles)
+//	ASSERT(inArgs);
+//
+//	Vector theStartPos;
+//	VectorCopy(inArgs->origin, theStartPos);
+//
+//	// Fire grenade
+//	int theModelIndex;
+//	struct model_s* theModel = gEngfuncs.CL_LoadModel(kGGAmmoModel, &theModelIndex);
+//	if(theModel)
+//	{
+//		TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->CL_TempEntAlloc(gPredictedPlayerOrigin, theModel);
+//		if(theTempEntity)
+//		{
+//			VectorCopy(theStartPos, theTempEntity->entity.origin);
+//			VectorCopy(theStartPos, theTempEntity->entity.prevstate.origin);
+//			VectorCopy(theStartPos, theTempEntity->entity.curstate.origin);
+//			theTempEntity->die += kSpitLifetime;
+//			theTempEntity->hitcallback = GrenadeHit;
+//			theTempEntity->flags |= (FTENT_COLLIDEALL | FTENT_PERSIST | FTENT_GRAVITY| FTENT_SPRANIMATE | FTENT_SPRANIMATELOOP);
+//			theTempEntity->entity.curstate.framerate = 30;
+//			theTempEntity->frameMax = 4;//theModel->numframes;
+//		
+//			// Read origin as origin, and angles as velocity (from AvHAlienTurret::Shoot())
+//			Vector theStartVelocity;
+//			VectorCopy(inArgs->angles, theStartVelocity);
+//			
+//			// Temp entities interpret baseline origin as velocity.
+//			VectorCopy(theStartVelocity, theTempEntity->entity.baseline.origin);
+//			VectorCopy(theStartVelocity, theTempEntity->entity.baseline.velocity);
+//		}
+//	}
+}
+
+void EV_Grenade(struct event_args_s* inArgs)
+{
+    // What to do about this static member?
+    static int tracerCount[ 32 ];
+	
+    // Figure out which weapon description to assocate this weapon with
+    int theWeaponIndex = inArgs->iparam1;
+	
+	// Play attack animation and add muzzle flash
+	int idx;
+	vec3_t origin;
+	vec3_t angles;
+	vec3_t velocity;
+	
+	vec3_t vecSrc, vecAiming;
+	vec3_t up, right, forward;
+	
+	idx = inArgs->entindex;
+	VectorCopy( inArgs->origin, origin );
+	VectorCopy( inArgs->angles, angles );
+	VectorCopy( inArgs->velocity, velocity );
+	
+	//AngleVectors( angles, forward, right, up );
+	gEngfuncs.pfnAngleVectors(angles, forward, right, up);
+
+	int theUpgradeLevel = AvHPlayerUpgrade::GetWeaponUpgrade(AVH_USER3_MARINE_PLAYER, GetUpgradeState(idx));
+	
+	if ( EV_IsLocal( idx ) )
+	{
+
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+	}
+	
+	char* theSoundToPlay = NULL;
+
+	switch(inArgs->iparam2)
+	{
+	case 4:
+	case 7:
+		theSoundToPlay = kGRFireSound1;
+		break;
+	case 3:
+	case 6:
+		theSoundToPlay = kGRPrimeSound;
+		break;
+	}
+
+	if(theSoundToPlay)
+		gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, theSoundToPlay, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+
+//	EV_GetGunPosition( inArgs, vecSrc, origin );
+//	VectorCopy( forward, vecAiming );
+//
+//    // Create grenade temp entity
+//    int theModelIndex;
+//    struct model_s* theModel = gEngfuncs.CL_LoadModel(kGRWModel, &theModelIndex);
+//    if(theModel)
+//    {
+//        TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->CL_TempEntAlloc(gPredictedPlayerOrigin, theModel);
+//        if(theTempEntity)
+//        {
+//            vec3_t theStartPos, theEndPos;
+//            EV_GetGunPosition(inArgs, vecSrc, inArgs->origin);
+//            VectorMA(vecSrc, kGRBarrelLength, forward, theStartPos);
+//            
+//            VectorCopy(theStartPos, theTempEntity->entity.origin);
+//            VectorCopy(theStartPos, theTempEntity->entity.prevstate.origin);
+//            VectorCopy(theStartPos, theTempEntity->entity.curstate.origin);
+//            theTempEntity->die += BALANCE_IVAR(kGrenDetonateTime);
+//            theTempEntity->hitcallback = GrenadeHit;
+//            theTempEntity->flags |= (FTENT_COLLIDEALL | FTENT_GRAVITY | FTENT_ROTATE | FTENT_PERSIST);
+//            theTempEntity->clientIndex = inArgs->entindex;	// Entity to ignore collisions with
+//
+//            theTempEntity->entity.baseline.angles[0] = rand()%360;
+//
+//            //theTempEntity->entity.curstate.framerate = 30;
+//            //theTempEntity->frameMax = 4;//theModel->numframes;
+//            
+//            // Temp entities interpret baseline origin as velocity.
+//            Vector theBaseVelocity;
+//            VectorScale(inArgs->velocity, kGrenadeParentVelocityScalar, theBaseVelocity);
+//            
+//            Vector theStartVelocity;
+//            VectorMA(theBaseVelocity, kGrenadeVelocity, forward, theStartVelocity);
+//            
+//            VectorCopy(theStartVelocity, theTempEntity->entity.baseline.origin);
+//            VectorCopy(theStartVelocity, theTempEntity->entity.baseline.velocity);
+//        }
+//    }
+}
+
+char *EV_HLDM_DamageDecal( physent_t *pe );
+
+void CreateDecal(struct pmtrace_s* inTrace)
+{
+	physent_t *pe;
+	pe = gEngfuncs.pEventAPI->EV_GetPhysent( inTrace->ent );
+	if(pe)
+	{
+		char* inDecalName = EV_HLDM_DamageDecal( pe );
+		
+		// Only decal brush models such as the world etc.
+		if (  inDecalName && inDecalName[0] && pe && ( pe->solid == SOLID_BSP || pe->movetype == MOVETYPE_PUSHSTEP ) )
+		{
+			if ( CVAR_GET_FLOAT( "r_decals" ) )
+			{
+				gEngfuncs.pEfxAPI->R_DecalShoot( 
+					gEngfuncs.pEfxAPI->Draw_DecalIndex( gEngfuncs.pEfxAPI->Draw_DecalIndexFromName( inDecalName) ), 
+					gEngfuncs.pEventAPI->EV_IndexFromTrace( inTrace ), 0, inTrace->endpos, 0 );
+			}
+		}
+	}
+}
+
+void SpitHit(struct tempent_s* ent, struct pmtrace_s* ptr)
+{
+	char* theSoundToPlay = kSpitHitSound1;
+	if(gEngfuncs.pfnRandomLong(0, 1) == 0)
+	{
+		theSoundToPlay = kSpitHitSound2;
+	}
+
+	gEngfuncs.pEventAPI->EV_PlaySound(ent->entity.index, ptr->endpos, CHAN_AUTO, theSoundToPlay, .6f, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+	if(ptr && ent)
+	{
+		ent->die = gEngfuncs.GetClientTime();
+		
+		AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsSpitHit, ptr->endpos, &(ptr->plane.normal));
+		
+		// Create splat here too
+		CreateDecal(ptr);
+	}
+}
+
+void EV_SpitGun(struct event_args_s* inArgs)
+{
+	ASSERT(inArgs);
+
+    // Figure out which weapon description to assocate this weapon with
+    int theWeaponIndex = inArgs->iparam1;
+	
+	// Play attack animation and add muzzle flash
+	int idx;
+	vec3_t origin;
+	vec3_t angles;
+	vec3_t velocity;
+	
+	vec3_t vecSrc, vecAiming;
+	vec3_t up, right, forward;
+	
+	idx = inArgs->entindex;
+	VectorCopy( inArgs->origin, origin );
+	VectorCopy( inArgs->angles, angles );
+	VectorCopy( inArgs->velocity, velocity );
+	
+	//AngleVectors( angles, forward, right, up );
+	gEngfuncs.pfnAngleVectors(angles, forward, right, up);
+	
+	// Play attack sound
+	char* theSoundToPlay = kSpitGFireSound1;
+	if(gEngfuncs.pfnRandomLong(0, 1) == 0)
+	{
+		theSoundToPlay = kSpitGFireSound2;
+	}
+	
+	gEngfuncs.pEventAPI->EV_PlaySound(idx, origin, CHAN_WEAPON, theSoundToPlay, inArgs->fparam1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+  
+	// Fire spit glob
+	int theModelIndex;
+	struct model_s* theModel = gEngfuncs.CL_LoadModel(kSpitGunSprite, &theModelIndex);
+	if(theModel)
+	{
+		TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->CL_TempEntAlloc(gPredictedPlayerOrigin, theModel);
+		if(theTempEntity)
+		{
+			vec3_t theStartPos, theEndPos;
+			EV_GetGunPosition(inArgs, vecSrc, inArgs->origin);
+			VectorMA(vecSrc, kSpitGBarrelLength, forward, theStartPos);
+			
+			// Create tiny spittle where it leaves
+			AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsSpitShoot, theStartPos);
+			
+			VectorCopy(theStartPos, theTempEntity->entity.origin);
+			VectorCopy(theStartPos, theTempEntity->entity.prevstate.origin);
+			VectorCopy(theStartPos, theTempEntity->entity.curstate.origin);
+			theTempEntity->die += kSpitLifetime;
+			theTempEntity->hitcallback = SpitHit;
+			theTempEntity->flags |= (FTENT_COLLIDEALL | FTENT_SPRANIMATE | FTENT_SPRANIMATELOOP/* | FTENT_PERSIST*/);
+			theTempEntity->clientIndex = inArgs->entindex;	// Entity to ignore collisions with
+			theTempEntity->entity.curstate.framerate = 30;
+			theTempEntity->frameMax = 4;//theModel->numframes;
+			
+			// Temp entities interpret baseline origin as velocity.
+			Vector theBaseVelocity;
+			VectorScale(inArgs->velocity, kSpitParentVelocityScalar, theBaseVelocity);
+			
+			Vector theStartVelocity;
+			VectorMA(theBaseVelocity, kSpitVelocity, forward, theStartVelocity);
+			
+			VectorCopy(theStartVelocity, theTempEntity->entity.baseline.origin);
+			VectorCopy(theStartVelocity, theTempEntity->entity.baseline.velocity);
+		}
+	}
+	
+	// General x-punch axis
+	if ( EV_IsLocal( idx ) )
+	{
+		float theHalfSpread = kSpitGXPunch/2.0f;
+		if(theHalfSpread > 0.0f)
+		{
+			V_PunchAxis( 0, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+		}
+		
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+	}
+}
+
+void SpikeHit(struct tempent_s* ent, struct pmtrace_s* ptr)
+{
+	//EV_HLDM_DecalGunshot( &tr, iBulletType );
+	
+	//int theSprite = gEngfuncs.pEventAPI->EV_FindModelIndex(kSpikeGunHitSprite);
+	//TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->R_TempSprite(ptr->endpos, vec3_origin, .6f, theSprite, kRenderTransAdd, kRenderFxNoDissipation, .5f, .4f, FTENT_COLLIDEALL | FTENT_SPRANIMATE | FTENT_SPRANIMATELOOP | FTENT_PERSIST);
+	//if(theTempEntity)
+	//{
+	//	theTempEntity->entity.curstate.framerate = 30;
+	//}
+	
+	// Play spike ricochet sounds
+	char* theRandomSound = NULL;
+	
+	switch (gEngfuncs.pfnRandomLong(0, 2))
+	{
+	case 0:
+		theRandomSound = "weapons/a_ric1.wav";
+		break;
+	case 1:
+		theRandomSound = "weapons/a_ric2.wav";
+		break;
+	case 2:
+		theRandomSound = "weapons/a_ric3.wav";
+		break;
+	}
+	
+	const float kAlienRicochetVolume = .25f;
+	ASSERT(theRandomSound);
+	gEngfuncs.pEventAPI->EV_PlaySound( 0, ptr->endpos, CHAN_STATIC, theRandomSound, kAlienRicochetVolume, ATTN_NORM, 0, 96 + gEngfuncs.pfnRandomLong(0,0xf) );
+	
+	// Create spike hit particle system
+	AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsSpikeHitEffect, ptr->endpos);
+
+	// Kill off temp ent
+	ent->die = -1;
+}
+
+void EV_OffenseChamber(struct event_args_s* inArgs)
+{
+    //static int theTracerCount[ 32 ];
+	
+	// Play attack animation and add muzzle flash
+	int idx;
+	vec3_t origin;
+	vec3_t velocity;
+	
+	vec3_t vecSrc, vecAiming;
+	vec3_t up, right, forward;
+	
+	idx = inArgs->entindex;
+	VectorCopy( inArgs->origin, origin );
+	VectorCopy( inArgs->velocity, velocity );
+	
+	// Play one of basic attack sounds
+	float theVolume = inArgs->fparam1;
+	float theAttenuation = 1.2f;
+	
+	char* theSoundToPlay = kAlienTurretFire1;
+	
+	int theUpperBound = 30;
+	int thePitch = 100 + (gEngfuncs.pfnRandomLong(0, theUpperBound) - theUpperBound/2);
+	gEngfuncs.pEventAPI->EV_PlaySound(idx, origin, CHAN_WEAPON, theSoundToPlay, theVolume, theAttenuation, 0, thePitch);
+	
+	// Read origin as origin, and angles as direction (from AvHAlienTurret::Shoot())
+	Vector theStartPos;
+	VectorCopy(inArgs->origin, theStartPos);
+
+	Vector theNetworkDirToEnemy;
+	VectorCopy(inArgs->angles, theNetworkDirToEnemy);
+
+	// Take into account network precision
+	Vector theDirToEnemy;
+	VectorScale(theNetworkDirToEnemy, 1/100.0f, theDirToEnemy);
+
+	Vector theDirToEnemyAngles;
+	VectorAngles(theDirToEnemy, theDirToEnemyAngles);
+
+	Vector theInitialVelocity;
+	VectorScale(theDirToEnemy, kOffenseChamberSpikeVelocity, theInitialVelocity);
+	
+	// Create spike projectile
+	TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->R_TempModel(theStartPos, theDirToEnemy, theDirToEnemyAngles, 100, gEngfuncs.pEventAPI->EV_FindModelIndex(kSpikeProjectileModel), 0);
+	if(theTempEntity)
+	{
+		//vec3_t theStartPos, theEndPos;
+		//EV_GetGunPosition(inArgs, vecSrc, inArgs->origin);
+		//VectorMA(vecSrc, kSpikeBarrelLength, forward, theStartPos);
+		
+		VectorCopy(theStartPos, theTempEntity->entity.origin);
+		VectorCopy(theStartPos, theTempEntity->entity.prevstate.origin);
+		VectorCopy(theStartPos, theTempEntity->entity.curstate.origin);
+		theTempEntity->hitcallback = SpikeHit;
+		theTempEntity->flags = (FTENT_COLLIDEALL | FTENT_PERSIST | FTENT_COLLIDEKILL);
+		theTempEntity->die += kSpikeLifetime;
+		theTempEntity->clientIndex = inArgs->entindex;	// Entity to ignore collisions with
+
+		//theTempEntity->entity.curstate.framerate = 30;
+		//theTempEntity->frameMax = 4;//theModel->numframes;
+		
+		// Temp entities interpret baseline origin as velocity.
+		VectorCopy(theInitialVelocity, theTempEntity->entity.baseline.origin);
+		VectorCopy(theInitialVelocity, theTempEntity->entity.baseline.velocity);
+		
+		// Set orientation
+		//VectorCopy(inArgs->angles, theTempEntity->entity.angles);
+	}
+	
+	
+//
+//
+//	ASSERT(inArgs);
+//	
+//	// Play attack animation and add muzzle flash
+//	int idx = inArgs->entindex;
+//	
+//	Vector theStartPos;
+//	VectorCopy(inArgs->origin, theStartPos);
+//	
+//	// Play attack sound
+//	gEngfuncs.pEventAPI->EV_PlaySound(idx, theStartPos, CHAN_WEAPON, kAlienTurretFire1, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+//	
+//	// Fire spit glob
+//	int theModelIndex;
+//	struct model_s* theModel = gEngfuncs.CL_LoadModel(kAlienTurretSprite, &theModelIndex);
+//	if(theModel)
+//	{
+//		TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->CL_TempEntAlloc(gPredictedPlayerOrigin, theModel);
+//		if(theTempEntity)
+//		{
+//			// Create tiny spittle where it leaves
+//			AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsSpitShoot, theStartPos);
+//			
+//			VectorCopy(theStartPos, theTempEntity->entity.origin);
+//			VectorCopy(theStartPos, theTempEntity->entity.prevstate.origin);
+//			VectorCopy(theStartPos, theTempEntity->entity.curstate.origin);
+//			theTempEntity->die += kSpitLifetime;
+//			theTempEntity->hitcallback = SpitHit;
+//			theTempEntity->flags |= (FTENT_COLLIDEALL | FTENT_SPRANIMATE | FTENT_SPRANIMATELOOP/* | FTENT_PERSIST*/);
+//			theTempEntity->entity.curstate.framerate = 30;
+//			theTempEntity->frameMax = 4;//theModel->numframes;
+//			
+//			// Read origin as origin, and angles as direction (from AvHAlienTurret::Shoot())
+//			Vector theDirToEnemy;
+//			VectorCopy(inArgs->angles, theDirToEnemy);
+//			
+//			Vector theStartVelocity;
+//			VectorScale(theDirToEnemy, kAlienTurretProjectileVelocity, theStartVelocity);
+//			
+//			// Temp entities interpret baseline origin as velocity.
+//			VectorCopy(theStartVelocity, theTempEntity->entity.baseline.origin);
+//			VectorCopy(theStartVelocity, theTempEntity->entity.baseline.velocity);
+//		}
+//	}
+}
+
+void EV_Claws(struct event_args_s* inArgs)
+{
+	int idx = inArgs->entindex;
+	
+	// Play attack sound
+	char* theSoundToPlay = "";
+	
+	int theRandomSound = gEngfuncs.pfnRandomLong(0, 2);
+	switch(theRandomSound)
+	{
+	case 0:
+		theSoundToPlay = kClawsSound1;
+		break;
+	case 1:
+		theSoundToPlay = kClawsSound2;
+		break;
+	case 2:
+		theSoundToPlay = kClawsSound3;
+		break;
+	}
+
+	const int kBasePitch = 94;
+	const int kVariablePitchRange = 0xF;
+
+	int theRandomPitch = gEngfuncs.pfnRandomLong( 0, kVariablePitchRange );
+	int thePitch = kBasePitch + (inArgs->fparam1*kClawsAdrenPitchFactor) + theRandomPitch;
+	gEngfuncs.pEventAPI->EV_PlaySound(idx, inArgs->origin, CHAN_WEAPON, theSoundToPlay, inArgs->fparam1, ATTN_NORM, 0, thePitch);
+	
+	// General x-punch axis
+	if (EV_IsLocal(idx))
+	{
+	
+		/*
+		float theHalfSpread = (inArgs->fparam1*kClawsPunch)/2.0f;
+		if(theHalfSpread > 0.0f)
+		{
+			V_PunchAxis(0, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+			V_PunchAxis(1, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+		}
+		*/
+
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+	}
+
+	int theRandomLong = gEngfuncs.pfnRandomLong(0, 1);
+	if(theRandomLong == 0)
+	{
+		PlayMeleeHitEffects(inArgs, kClawsRange, kClawsHitSound1);
+	}
+	else
+	{
+		PlayMeleeHitEffects(inArgs, kClawsRange, kClawsHitSound2);
+	}
+}
+
+
+void EV_Swipe(struct event_args_s* inArgs)
+{
+	int idx = inArgs->entindex;
+	
+	// Play attack sound
+	char* theSoundToPlay = "";
+	
+	int theRandomSound = gEngfuncs.pfnRandomLong(0, 3);
+	switch(theRandomSound)
+	{
+	case 0:
+		theSoundToPlay = kSwipeSound1;
+		break;
+	case 1:
+		theSoundToPlay = kSwipeSound2;
+		break;
+	case 2:
+		theSoundToPlay = kSwipeSound3;
+		break;
+	case 3:
+		theSoundToPlay = kSwipeSound4;
+		break;
+	}
+	gEngfuncs.pEventAPI->EV_PlaySound(idx, inArgs->origin, CHAN_WEAPON, theSoundToPlay, inArgs->fparam1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+	
+	// General x-punch axis
+	if (EV_IsLocal(idx))
+	{
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+		
+		/*
+		float theHalfSpread = kSwipePunch/2.0f;
+		if(theHalfSpread > 0.0f)
+		{
+			V_PunchAxis(0, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+			V_PunchAxis(1, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+		}
+		*/
+	}
+
+	if(gEngfuncs.pfnRandomLong(0, 1) == 0)
+	{
+		PlayMeleeHitEffects(inArgs, kSwipeRange, kSwipeHitSound1);
+	}
+	else
+	{
+		PlayMeleeHitEffects(inArgs, kSwipeRange, kSwipeHitSound2);
+	}
+}
+
+//void EnsnareHit(struct tempent_s* ent, struct pmtrace_s* ptr)
+//{
+//	ent->die = gEngfuncs.GetClientTime();
+//}
+//
+//void EV_EnsnareShoot(struct event_args_s* inArgs)
+//{
+//	int idx = inArgs->entindex;
+//	gEngfuncs.pEventAPI->EV_PlaySound(idx, inArgs->origin, CHAN_WEAPON, kEnsnareFireSound, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+//	
+//	vec3_t up, right, forward;
+//	gEngfuncs.pfnAngleVectors(inArgs->angles, forward, right, up);
+//	
+//	// Fire spit glob
+//	int theModelIndex;
+//	struct model_s* theModel = gEngfuncs.CL_LoadModel(kEnsnareSprite, &theModelIndex);
+//	ASSERT(theModel);
+//	TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->CL_TempEntAlloc(gPredictedPlayerOrigin, theModel);
+//	if(theTempEntity)
+//	{
+//		vec3_t vecSrc, vecAiming;
+//		vec3_t theStartPos, theEndPos;
+//		EV_GetGunPosition(inArgs, vecSrc, inArgs->origin);
+//		VectorMA(vecSrc, kEnsnareBarrelLength, forward, theStartPos);
+//		
+//		// Create tiny ensnare bits where it leaves
+//		AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsEnsnareShoot, theStartPos);
+//		
+//		VectorCopy(theStartPos, theTempEntity->entity.origin);
+//		VectorCopy(theStartPos, theTempEntity->entity.prevstate.origin);
+//		VectorCopy(theStartPos, theTempEntity->entity.curstate.origin);
+//		theTempEntity->die += 10.0f;
+//		theTempEntity->hitcallback = EnsnareHit;
+//		theTempEntity->flags |= (FTENT_COLLIDEALL | FTENT_SPRANIMATE | FTENT_SPRANIMATELOOP | FTENT_PERSIST);
+//		theTempEntity->entity.curstate.framerate = 30;
+//		theTempEntity->frameMax = 4;//theModel->numframes;
+//		
+//		// Temp entities interpret baseline origin as velocity.
+//		Vector theBaseVelocity;
+//		VectorScale(inArgs->velocity, kEnsnareParentVelocityScalar, theBaseVelocity);
+//		
+//		Vector theStartVelocity;
+//		VectorMA(theBaseVelocity, kEnsnareVelocity, forward, theStartVelocity);
+//		
+//		VectorCopy(theStartVelocity, theTempEntity->entity.baseline.origin);
+//		VectorCopy(theStartVelocity, theTempEntity->entity.baseline.velocity);
+//	}
+//}
+//
+//void EV_EnsnareHit(struct event_args_s* inArgs)
+//{
+//	int idx = inArgs->entindex;
+//	gEngfuncs.pEventAPI->EV_PlaySound(idx, inArgs->origin, CHAN_WEAPON, kEnsnareHitSound, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+//
+//	AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsEnsnareHit, inArgs->origin);
+//}
+
+void ShootCloud(struct event_args_s* inArgs, const char* inSpriteName)
+{
+	int idx = inArgs->entindex;
+	gEngfuncs.pEventAPI->EV_PlaySound(idx, inArgs->origin, CHAN_WEAPON, kSporeFireSound, inArgs->fparam1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+	
+	if (EV_IsLocal(idx))
+	{
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+	}
+	
+	// Create temp cloud projectile
+	int theModelIndex;
+	struct model_s* theModel = gEngfuncs.CL_LoadModel(inSpriteName, &theModelIndex);
+	if(theModel)
+	{
+		TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->CL_TempEntAlloc(gPredictedPlayerOrigin, theModel);
+		if(theTempEntity)
+		{
+			vec3_t angles;
+			VectorCopy( inArgs->angles, angles );
+			
+			//vec3_t velocity
+			//VectorCopy( inArgs->velocity, velocity );
+			
+			vec3_t forward, right, up;
+			gEngfuncs.pfnAngleVectors(angles, forward, right, up);
+			
+			vec3_t theStartPos, theEndPos, vecSrc;
+			EV_GetGunPosition(inArgs, vecSrc, inArgs->origin);
+			VectorMA(vecSrc, kSporeBarrelLength, forward, theStartPos);
+			
+			VectorCopy(theStartPos, theTempEntity->entity.origin);
+			VectorCopy(theStartPos, theTempEntity->entity.prevstate.origin);
+			VectorCopy(theStartPos, theTempEntity->entity.curstate.origin);
+			//theTempEntity->die += kSpitLifetime;
+			//theTempEntity->hitcallback = SpitHit;
+			theTempEntity->flags |= (FTENT_COLLIDEALL | FTENT_SPRANIMATE | FTENT_SPRANIMATELOOP | FTENT_COLLIDEKILL);
+			theTempEntity->entity.curstate.framerate = 20;
+			theTempEntity->frameMax = 17;//theModel->numframes;
+			
+			// Temp entities interpret baseline origin as velocity.
+			Vector theStartVelocity(0, 0, 0);
+			VectorMA(theStartVelocity, kShootCloudVelocity, forward, theStartVelocity);
+			
+			VectorCopy(theStartVelocity, theTempEntity->entity.baseline.origin);
+			VectorCopy(theStartVelocity, theTempEntity->entity.baseline.velocity);
+		}
+	}
+}
+
+void EV_SporeShoot(struct event_args_s* inArgs)
+{
+	AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsSporeShoot, inArgs->origin);
+
+	ShootCloud(inArgs, kClientSporeSprite);
+}
+
+void EV_SporeCloud(struct event_args_s* inArgs)
+{
+	int idx = inArgs->entindex;
+	gEngfuncs.pEventAPI->EV_PlaySound(idx, inArgs->origin, CHAN_AUTO, kSporeCloudSound, inArgs->fparam1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+
+	AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsSporeCloud, inArgs->origin);
+}
+
+void EV_UmbraGun(struct event_args_s* inArgs)
+{
+	ShootCloud(inArgs, kClientUmbraSprite);
+	
+//	if (EV_IsLocal(inArgs->entindex))
+//	{
+//		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+//	}
+}
+
+void EV_UmbraCloud(struct event_args_s* inArgs)
+{
+	int thePitch = gEngfuncs.pfnRandomLong(75, 150);
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_AUTO, kUmbraFireSound, inArgs->fparam1, ATTN_IDLE, 0, thePitch);
+	
+	AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsUmbraCloud, inArgs->origin);
+}
+
+void ParticleCallback( struct particle_s* particle, float frametime )
+{
+	int i;
+
+	for ( i = 0; i < 3; i++ )
+	{
+		particle->org[ i ] += particle->vel[ i ] * frametime;
+	}
+}
+
+
+void EV_Jetpack(struct event_args_s* inArgs)
+{
+ 	AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsJetpackEffect, inArgs->origin);
+
+	// Update jetpack sound every once in awhile
+	if(gEngfuncs.pfnRandomLong(0, 3) == 0)
+	{
+		gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_BODY, kJetpackSound, .5f, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+	}
+
+	// Use this as index instead?
+	//args->entindex;
+
+//	// Create a dlight for jetpack
+//	int theIndexToUse = gJetpackLights.size();
+//	dlight_t*	dl = gEngfuncs.pEfxAPI->CL_AllocDlight(theIndexToUse);
+//	VectorCopy (args->origin, dl->origin);
+//	dl->radius = 180;
+//	dl->color.r = 180;
+//	dl->color.g = 180;
+//	dl->color.b = 250;
+//
+//	// don't die for forseeable future
+//	dl->die = gEngfuncs.GetClientTime() + kArbitraryLargeLightTime;
+//	//dl->die += kArbitraryLargeLightTime;
+//
+//	gJetpackLights.push_back(LightType(args->entindex, dl));
+//
+//	gEngfuncs.pEventAPI->EV_PlaySound( args->entindex, args->origin, CHAN_BODY, kJetpackSound, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+	
+	// Create temporary smoke trail!
+	//void		( *R_Sprite_Trail )				( int type, float * start, float * end, int modelIndex, int count, float life, float size, float amplitude, int renderamt, float speed );
+	//int theSmokeModelIndex = gEngfuncs.pEventAPI->EV_FindModelIndex( "sprites/smoke.spr" );
+	//gEngfuncs.pEfxAPI->R_PlayerSprites(args->entindex, theSmokeModelIndex, 20, 100);
+	
+	//gEngfuncs.pEfxAPI->R_Sprite_Trail( TE_SPRITETRAIL, tr.endpos, fwd, theSmokeModelIndex, (int)(n * flDamage * 0.3), 0.1, gEngfuncs.pfnRandomFloat( 10, 20 ) / 100.0, 100, 255, 200 );
+	
+}
+
+// Passing no param resets all sounds
+void EndJetpackEffects(int inIndex)
+{
+	for(DLightListType::iterator theIter = gJetpackLights.begin(); theIter != gJetpackLights.end(); theIter++)
+	{
+		if((theIter->mIndex == inIndex) || (inIndex == -1))
+		{
+			// Mark it for deletion by telling it to die a long time ago
+			if(theIter->mLight)
+			{
+				theIter->mLight->die = 0;
+			}
+			gJetpackLights.erase(theIter);
+
+			vec3_t theOrigin;
+			gEngfuncs.pEventAPI->EV_PlaySound(inIndex, theOrigin, CHAN_BODY, "common/null.wav", 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+		}
+	}
+}
+
+void EV_EndJetpack(struct event_args_s* args)
+{
+	// find dlight in list
+	//int theIndex = args->entindex;
+	//EndJetpackEffects(theIndex);
+}
+
+void DrawCircleOnGroundAtPoint(vec3_t inOrigin, int inNumSides, int inStartAngle, int inRadius, float inR, float inG, float inB, float inA, bool inUseRedInstead, float inInnerRadius)
+{
+	static HSPRITE theGreenSprite = 0;
+	if(!theGreenSprite)
+		theGreenSprite = Safe_SPR_Load("sprites/green.spr");
+	
+	static HSPRITE theRedSprite = 0;
+	if(!theRedSprite)
+		theRedSprite = Safe_SPR_Load("sprites/red.spr");
+	
+	HSPRITE theSprite = theGreenSprite;
+	if(inUseRedInstead)
+		theSprite = theRedSprite;
+	
+	if(gEngfuncs.pTriAPI->SpriteTexture((struct model_s *)gEngfuncs.GetSpritePointer(theSprite), 0))
+	{
+		gEngfuncs.pTriAPI->CullFace( TRI_NONE );
+		
+		gEngfuncs.pTriAPI->RenderMode( kRenderGlow  );
+		//gEngfuncs.pTriAPI->RenderMode( kRenderTransTexture );
+		gEngfuncs.pTriAPI->Color4f(inR, inG, inB, inA);
+		
+		gEngfuncs.pTriAPI->Begin( TRI_TRIANGLES );
+		float theAngleIncrement = (2*M_PI)/inNumSides;
+		float theStartAngle = (2*M_PI)*(inStartAngle/360.0f);
+		
+		for(int i = 0; i < inNumSides; i++)
+		{
+			for(int j = 0; j < 3; j++)
+			{
+				float thePoint[3];
+				float theCurrentPointAngle = theStartAngle + i*theAngleIncrement;
+				thePoint[0] = inOrigin[0] + inRadius*cos(theCurrentPointAngle);
+				thePoint[1] = inOrigin[1] + inRadius*sin(theCurrentPointAngle);
+				thePoint[2] = inOrigin[2];
+				
+				float theNextPoint[3];
+				float theNextPointAngle = theStartAngle + (i+1)*theAngleIncrement;
+				theNextPoint[0] = inOrigin[0] + inRadius*cos(theNextPointAngle);
+				theNextPoint[1] = inOrigin[1] + inRadius*sin(theNextPointAngle);
+				theNextPoint[2] = inOrigin[2];
+				
+				//gEngfuncs.pTriAPI->Color4f(inR, inG, inB, 1.0f);
+				//gEngfuncs.pTriAPI->Brightness( 1 );
+				gEngfuncs.pTriAPI->TexCoord2f(0, 0);
+				gEngfuncs.pTriAPI->Vertex3f( inOrigin[0], inOrigin[1], inOrigin[2] );
+				
+				//gEngfuncs.pTriAPI->Color4f(inR, inG, inB, inA);
+				//gEngfuncs.pTriAPI->Brightness( 1 );
+				gEngfuncs.pTriAPI->TexCoord2f(0, 1);
+				gEngfuncs.pTriAPI->Vertex3f( theNextPoint[0], theNextPoint[1], theNextPoint[2] );
+				
+				//gEngfuncs.pTriAPI->Color4f(inR, inG, inB, inA);
+				//gEngfuncs.pTriAPI->Brightness( 1 );
+				gEngfuncs.pTriAPI->TexCoord2f(1, 1);
+				gEngfuncs.pTriAPI->Vertex3f( thePoint[0], thePoint[1], thePoint[2] );
+				
+			}
+		}
+		gEngfuncs.pTriAPI->End();
+		gEngfuncs.pTriAPI->RenderMode( kRenderNormal );
+	}
+}
+
+//void DrawOrderDirectionIndicator(const AvHOrder& inOrder)
+//{
+//	static HSPRITE theSprite = 0;
+//	if(!theSprite)
+//		theSprite = Safe_SPR_Load("sprites/320questionmark.spr");
+//	
+//	int theCurrentFrame = 0;
+//	
+//	// 
+//	vec3_t theScreenPos;
+//	vec3_t theWorldPos;
+//	inOrder.GetLocation(theWorldPos);
+	
+//	gEngfuncs.pTriAPI->WorldToScreen((float*)theWorldPos, (float*)theScreenPos);
+//
+//	int theBaseX = theScreenPos.x*ScreenWidth;
+//	int theBaseY = theScreenPos.y*ScreenHeight;
+//
+//	int theSpriteWidth = SPR_Width(theSprite, theCurrentFrame);
+//	int theSpriteHeight = SPR_Height(theSprite, theCurrentFrame);
+//	
+//	int theX = min(max(theSpriteWidth, theBaseX), ScreenWidth - theSpriteWidth);
+//	int theY = min(max(theSpriteHeight, theBaseY), ScreenHeight - theSpriteHeight);
+//	
+//	SPR_Set(theSprite, 255, 255, 255);
+//	SPR_DrawHoles((int)0, theX, theY, NULL);
+
+//	gHUD.SetOrderPos(theWorldPos);
+//}
+
+//void DrawOrdersForPlayers(EntityListType& inPlayerList)
+//{
+//	OrderListType theOrders = gHUD.GetOrderList();
+//
+//	gHUD.ClearOrderPos();
+//	
+//	// Run through the order list type
+//	for(OrderListType::iterator theIter = theOrders.begin(); theIter != theOrders.end(); theIter++)
+//	{
+//		// For each one, if the order is for a player in the inPlayerList, draw it
+//		vec3_t theOrderLocation;
+//		theIter->GetLocation(theOrderLocation);
+//
+//		if(theIter->GetOrderTargetType() == ORDERTARGETTYPE_TARGET)
+//		{
+//			int theTargetIndex = theIter->GetTargetIndex();
+//			cl_entity_s* theEntity = gEngfuncs.GetEntityByIndex(theTargetIndex);
+//			if(theEntity)
+//			{
+//				VectorCopy(theEntity->origin, theOrderLocation);
+//			}
+//		}
+//
+//		// Draw dotted line or something from relevant player to dest?
+//		bool theDrawWaypoint = false;
+//		EntityListType thePlayerList = theIter->GetReceivers();
+//		for(EntityListType::iterator thePlayerIter = thePlayerList.begin(); thePlayerIter != thePlayerList.end(); thePlayerIter++)
+//		{
+//			cl_entity_s* theEntity = gEngfuncs.GetEntityByIndex(*thePlayerIter);
+//			if(theEntity)
+//			{
+//				EntityListType::iterator theSearchIter = std::find(inPlayerList.begin(), inPlayerList.end(), *thePlayerIter);
+//				if(theSearchIter != inPlayerList.end())
+//				{
+//					//gEngfuncs.pEfxAPI->R_ParticleLine((float*)theEntity->origin, (float*)theOrderLocation, 0, 255, 0, .05f);
+//					theDrawWaypoint = true;
+//				}
+//			}
+//		}
+//		if(theDrawWaypoint)
+//		{
+//			float r, g, b, a;
+//			theIter->GetOrderColor(r, g, b, a);
+//
+//			// This doesn't really use the color yet
+//			DrawCircleOnGroundAtPoint(theOrderLocation, 11, 0, 20, r, g, b, a, false, 0.0f);
+//
+//			// Draw HUD indicator at this position
+//			DrawOrderDirectionIndicator(*theIter);
+//		}
+//	}
+//}
+
+//void DrawBlips(const pVector& inView)
+//{
+//	// Get enemy blips from HUD and draw 'em
+//	AvHVisibleBlipList& theEnemyBlipList = gHUD.GetEnemyBlipList();
+//	theEnemyBlipList.Draw(inView);
+//
+//	// Get friendly blips from HUD and draw 'em
+//	AvHVisibleBlipList& theFriendlyBlipList = gHUD.GetFriendlyBlipList();
+//	theFriendlyBlipList.Draw(inView);
+//}
+
+void DrawDebugEffects()
+{
+	for(DebugPointListType::iterator theIter = gTriDebugLocations.begin(); theIter != gTriDebugLocations.end(); theIter++)
+	{
+		vec3_t thePosition;
+		thePosition.x = theIter->x;
+		thePosition.y = theIter->y;
+		thePosition.z = theIter->z;
+		int theRadius = theIter->mSize;
+		DrawCircleOnGroundAtPoint(thePosition, 3, 0, theRadius, 1, 1, 0, .5f, false, 0.0f);
+	}
+	for(theIter = gSquareDebugLocations.begin(); theIter != gSquareDebugLocations.end(); theIter++)
+	{
+		vec3_t thePosition;
+		thePosition.x = theIter->x;
+		thePosition.y = theIter->y;
+		thePosition.z = theIter->z;
+		int theRadius = theIter->mSize;
+		DrawCircleOnGroundAtPoint(thePosition, 4, 0, theRadius, 1, 1, 0, .5f, false, 0.0f);
+	}
+	gSquareDebugLocations.clear();
+	
+	// Run through particle systems, drawing a box around each one
+	
+	//	for(DebugEntityListType::iterator theCubeIter = gCubeDebugEntities.begin(); theCubeIter != gCubeDebugEntities.end(); theCubeIter++)
+	//	{
+	//		cl_entity_s* theEntity = gEngfuncs.GetEntityByIndex(*theCubeIter);
+	//		if(theEntity)
+	//		{
+	//			Vector theStartPos = theEntity->curstate.origin + theEntity->curstate.mins;
+	//			Vector theEndPos = theEntity->curstate.origin + theEntity->curstate.maxs;
+	//			//gEngfuncs.pEfxAPI->R_ParticleBox( (float *)&(theStartPos), (float *)&(theEndPos), 5.0, 0, 255, .5f );
+	//			float theMiddleX = (theStartPos.x + theEndPos.x)/2.0f;
+	//			float theMiddleY = (theStartPos.y + theEndPos.y)/2.0f;
+	//			Vector thePoint;
+	//			thePoint.x = theMiddleX;
+	//			thePoint.y = theMiddleY;
+	//			thePoint.z = theStartPos.z;
+	//			DrawCircleOnGroundAtPoint(thePoint, 4, 45, 64, .8f, .8f, .8f, .5f, false, 0.0f);
+	//
+	//			thePoint.z = theEndPos.z;
+	//			DrawCircleOnGroundAtPoint(thePoint, 4, 45, 64, .8f, .8f, .8f, .5f, false, 0.0f);
+	//		}
+	//	}
+}
+
+void DrawMarineLight(const pVector& inView, vec3_t& inStartPos, vec3_t& inEndPos)
+{
+	gEngfuncs.pEfxAPI->R_RocketTrail(inStartPos, inEndPos, 1);
+
+//	// Draw triangle strip that faces camera
+//	const float kBeamAlpha = .7f;
+//	const float kBeamWidth = 10;
+//
+//	pVector up(0, 0, 1);
+//	pVector right = inView ^ up;
+//	right.normalize();
+//	pVector nup = right ^ inView;
+//	//pVector nup = inView ^ right;
+//
+//	// The particles should face you unless constrained (this is for rain and the like)
+//	if(this->mConstrainPitch)
+//		nup = up;
+//
+//	//right *= size_scale/2.0f;
+//	//nup *= size_scale/2.0f;
+//
+//	// Quad draws v0, v1, v2, v3
+//	//pVector V0 = -(right + nup);
+//
+//	// Upper left
+//	pVector V0 = -(right + nup);
+//	//V0 = -(right - nup);
+//	V0 = nup - right;
+//
+//	// Lower left
+//	pVector V1 = -(right + nup);
+//
+//	// Lower right
+//	pVector V2 = right + nup;
+//	V2 = right - nup;
+//
+//	// Upper right
+//	pVector V3 = right - nup;
+//	V3 = right + nup;
+//
+//	// Tri draws v0, v4, v3
+//	//pVector V4 = nup;
+//	pVector V4 = -nup;
+//
+//	// Load red sprite
+//	//if(gEngfuncs.pTriAPI->SpriteTexture((struct model_s *)gEngfuncs.GetSpritePointer(this->mSprite), theTextureOffsetToUse))
+//	//{
+//		gEngfuncs.pTriAPI->Begin( TRI_TRIANGLES );
+//
+//		gEngfuncs.pTriAPI->Color4f(1.0f, 0.0f, 0.0f, kBeamAlpha);
+//		
+//			//gEngfuncs.pTriAPI->TexCoord2f(0,0);
+//			pVector ver = p + sV0;
+//			gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+//			
+//			//gEngfuncs.pTriAPI->TexCoord2f(.5,1);
+//			ver = p + sV4;
+//			gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+//			
+//			//gEngfuncs.pTriAPI->TexCoord2f(1,0);
+//			ver = p + sV3;
+//			gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+//
+//		gEngfuncs.pTriAPI->End();
+//	//}
+}
+
+void DrawMarineLights(const pVector& inView)
+{
+	gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction( false, false );
+	
+	// Store off the old count
+	gEngfuncs.pEventAPI->EV_PushPMStates();
+	
+	// Now add in all of the players.
+	gEngfuncs.pEventAPI->EV_SetSolidPlayers(-1);
+	
+	physent_t* theEntity = NULL;
+	int theNumEnts = pmove->numphysent;
+	for (int i = 0; i < theNumEnts; i++)
+	{
+		theEntity = gEngfuncs.pEventAPI->EV_GetPhysent(i);
+		
+		// If player is a marine
+		if(theEntity->iuser3 == AVH_USER3_MARINE_PLAYER)
+		{
+			// Get middle of head
+			//theEntity->model->
+			//model->attachment = model->origin;
+			
+			// Get eyepiece attachment
+			cl_entity_t* theClientEntity = gEngfuncs.GetEntityByIndex(theEntity->info);
+			if(theClientEntity)
+			{
+				Vector theHeadPos = theClientEntity->attachment[2];
+
+				// Get look direction
+				Vector theForward, theRight, theUp;
+
+				gEngfuncs.pfnAngleVectors(theClientEntity->angles, theForward, theRight, theUp);
+				Vector theAiming;
+				for(int i = 0; i < 3; i++)
+				{
+					theAiming[i] = theForward[i] + theRight[i] + theUp[i];
+				}
+				
+				// Build this line
+				Vector theStartPos = theHeadPos;
+				Vector theEndPos;
+				VectorMA(theStartPos, 8000, theAiming, theEndPos);
+				
+				// Perform trace, ignore glass (!), ignore ourself
+				gEngfuncs.pEventAPI->EV_SetTraceHull(2);
+				//int theFoundEntity = theEntity->info;
+				int theFoundEntity = -1;
+				pmtrace_t tr;
+				
+				bool theDone = false;
+				do
+				{
+					// NOTE: ** When implementing this again, put in check for infinite loop condition! **
+
+					// Run a traceline along this line until it hits
+					gEngfuncs.pEventAPI->EV_PlayerTrace(theStartPos, theEndPos, PM_GLASS_IGNORE, theFoundEntity, &tr);
+				
+					//if((tr.fraction >= (1.0f - kFloatTolerance)) || (tr.fraction == 0.0f)/*|| (theNumIterations > 100)*//* || (tr.fraction < kFloatTolerance)*/)
+					//{
+					//	theDone = true;
+					//}
+					//else
+					//{
+					//	// Offset a bit so we don't hit again
+					//	VectorMA(tr.endpos, kHitOffsetAmount, theForward, theStartPos);
+					//}
+
+					if(tr.startsolid)
+					{
+						VectorMA(tr.endpos, kHitOffsetAmount, theForward, theStartPos);
+					}
+					else
+					{
+						theDone = true;
+					}
+
+				} while(!theDone);
+					
+				// Draw red additive light along this line
+				DrawMarineLight(inView, theStartPos, tr.endpos);
+			}
+		}
+	}
+
+	gEngfuncs.pEventAPI->EV_PopPMStates();
+}
+
+//void DrawRangeIndicator()
+//{
+//	Vector theCenter;
+//	bool theIsValid;
+//	float theRadius;
+//	
+//	if(gHUD.GetRangeDrawingInfo(theCenter, theRadius, theIsValid))
+//	{
+//		const float theCircleWidth = 20.0f;
+//		float theInnerRadius = theRadius - theCircleWidth;
+//
+//		static theAngle = 0;
+//		DrawCircleOnGroundAtPoint(theCenter, theRadius/200, theAngle++, theRadius, 1.0f, 1.0f, 1.0f, 1.0f, !theIsValid, theInnerRadius);
+//	}
+//}
+
+//void UpdateJetpackLights()
+//{
+//	for(DLightListType::iterator theIter = gJetpackLights.begin(); theIter != gJetpackLights.end(); theIter++)
+//	{
+//		// Treat locally differently
+//		int theIndex = theIter->mIndex;
+//		vec3_t theOrigin;
+//
+//		if(theIndex == 0)
+//		{
+//			VectorCopy(gPredictedPlayerOrigin, theOrigin);
+//		}
+//		else
+//		{
+//			cl_entity_t* thePlayer = gEngfuncs.GetEntityByIndex(theIndex);
+//			if(thePlayer)
+//			{
+//				// Get known position of entity
+//				VectorCopy(thePlayer->origin, theOrigin);
+//			}
+//			else
+//			{
+//				ASSERT(false);
+//			}
+//		}
+//		
+//		VectorCopy(theOrigin, theIter->mLight->origin);
+//		
+//		// Make sure it still won't die
+//		theIter->mLight->die = gEngfuncs.GetClientTime() + kArbitraryLargeLightTime;
+//		
+//		// Update jetpack sound every once in awhile
+//		if(gEngfuncs.pfnRandomLong(0, 70) == 0)
+//		{
+//			gEngfuncs.pEventAPI->EV_PlaySound( theIndex, theOrigin, CHAN_BODY, kJetpackSound, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+//		}
+//	}
+//}
+
+void EV_WelderGeneralEffects(struct event_args_s* inArgs, const Vector& thePos)
+{
+	int theIndex = inArgs->entindex;
+	cl_entity_t* thePlayer = GetEntity(theIndex);
+	
+	// Play welding sound when target is hit
+	/*if(gEngfuncs.pfnRandomLong(0, 20) == 0)
+	{
+		gEngfuncs.pEventAPI->EV_PlaySound(theIndex, thePlayer->origin, CHAN_WEAPON, kWeldingHitSound, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+	}*/
+
+	// Don't play flashing effects if player is photosensitive
+	if(CVAR_GET_FLOAT(kvDynamicLights))
+	{
+		// Make flashing lights
+		int theLightIndex = 20; /* TODO: What do to about this index? */
+		dlight_t* theLight = gEngfuncs.pEfxAPI->CL_AllocDlight(theLightIndex);
+		VectorCopy (thePlayer->origin, theLight->origin);
+		
+		int theUpgradeLevel = AvHPlayerUpgrade::GetWeaponUpgrade(AVH_USER3_MARINE_PLAYER, GetUpgradeState(theIndex));
+		
+		theLight->radius = 180 + theUpgradeLevel*15;
+		theLight->color.r = 220;
+		theLight->color.g = 220;
+		theLight->color.b = 255;
+		
+		// Have it die before it fires again, so it flickers on and off
+		theLight->die = gEngfuncs.GetClientTime() + BALANCE_FVAR(kWelderROF)/2.2f;
+	}
+	
+	// TODO: Apply burn mark
+	//gEngfuncs.pEfxAPI->R_DecalShoot( gEngfuncs.pEfxAPI->Draw_DecalIndex( gEngfuncs.pEfxAPI->Draw_DecalIndexFromName( "{shot1" ) ), 
+	//								gEngfuncs.pEventAPI->EV_IndexFromTrace(&theTraceResult), 
+	//								0, 
+	//								theTraceResult.endpos, 
+	//								0 );
+	
+	// emit heavy smoke
+	if(gEngfuncs.pfnRandomLong(0, 1) == 0)
+	{
+		AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsWelderSmoke, thePos);
+	}
+}
+
+void EV_WelderHitEffects(struct event_args_s* inArgs, const Vector& thePos)
+{
+	int theIndex = inArgs->entindex;
+	cl_entity_t* thePlayer = GetEntity(theIndex);
+	
+	// Fire sparks
+	//Vector theVector(inPev->origin);
+	//float theRandomFloat = RANDOM_FLOAT(0.5F, 1.0f);
+	//float theHeight = theRandomFloat*(inPev->absmax.z - inPev->absmin.z);
+	
+	//gEngfuncs.pEfxAPI->R_SparkShower(theTraceResult.endpos);
+	//gEngfuncs.pEfxAPI->R_SparkShower(theTraceResult.endpos);
+	
+	// Fire heavy smoke
+	//if(gEngfuncs.pfnRandomLong(0, 1) == 0)
+	//{
+	//	AvHParticleSystemManager::Instance()->CreateParticleSystem(5, theTraceResult.endpos);
+	//}
+	
+	// Generate still plasma
+	if(gEngfuncs.pfnRandomLong(0, 1) == 0)
+	{
+		AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsWelderBluePlasma, thePos);
+	}
+	
+	// Generate plasma shower
+	if(gEngfuncs.pfnRandomLong(0, 8) == 0)
+	{
+		AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsWelderBluePlasmaDrops, thePos);
+	}
+	
+	// Generate spark shower
+	float theFloatVec[3];
+	thePos.CopyToArray(theFloatVec);
+
+	int theUpgradeLevel = AvHPlayerUpgrade::GetWeaponUpgrade(AVH_USER3_MARINE_PLAYER, GetUpgradeState(theIndex));
+	for(int i = 0; i < theUpgradeLevel+1; i++)
+	{
+		gEngfuncs.pEfxAPI->R_SparkShower(theFloatVec);
+	}
+}
+
+void EV_Welder(struct event_args_s* inArgs)
+{
+	// This event means the welder is on, but we don't know if we're hitting anything or are constructing
+	int theIndex = inArgs->entindex;
+	cl_entity_t* thePlayer = GetEntity(theIndex);
+
+	// Hot blue flame
+	
+	// See if we're hitting something and playback smoke and sparks if so
+	// Trace to see where the sparks should emanate from
+	vec3_t vecSrc;
+	vec3_t origin;
+	vec3_t forward, right, up;
+	
+	gEngfuncs.pfnAngleVectors(inArgs->angles, forward, right, up);
+	
+	// Calculate theStartPos, taking into account the welder barrel length
+	vec3_t theStartPos, theEndPos;
+	EV_GetGunPosition(inArgs, vecSrc, inArgs->origin);
+	VectorMA(vecSrc, kWelderBarrelLength, forward, theStartPos);
+
+	// Play welder sound
+	//gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, theStartPos, CHAN_WEAPON, kWeldingSound, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+
+	// Calculate theEndPos, welder range along facing
+	theEndPos = theStartPos + forward * BALANCE_IVAR(kWelderRange);
+
+	gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction( false, true );
+	
+	// Store off the old count
+	gEngfuncs.pEventAPI->EV_PushPMStates();
+	
+	// Now add in all of the players.
+	//int theNumPlayers = gEngfuncs.GetMaxClients();
+	//gEngfuncs.pEventAPI->EV_SetSolidPlayers ( -1 );
+
+	gEngfuncs.pEventAPI->EV_SetTraceHull( 2 );
+
+	// General x-punch axis
+	if (EV_IsLocal(theIndex))
+	{
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+	}
+
+	// Don't hit ourselves, but how?  Setting this to theIndex isn't right, we need the other kind of index, but how to get it?
+	// For now this function will cause the welder to hit the player using the welder when aiming down, sigh
+	int theEntityToIngore = -1;
+
+	struct pmtrace_s theTraceResult;
+	gEngfuncs.pEventAPI->EV_PlayerTrace(theStartPos, theEndPos, PM_NORMAL, theEntityToIngore, &theTraceResult);
+	if(theTraceResult.fraction != 1.0f)
+	{
+		// Adjust the trace so it's offset a bit towards us so particles aren't clipped away
+		//Vector theResult = theTraceResult.endpos;//theStartPos + forward*(theTraceResult.fraction - 0.001);
+		Vector theResult = theStartPos + forward*((theTraceResult.fraction - 0.1f)*BALANCE_IVAR(kWelderRange));
+		
+		EV_WelderGeneralEffects(inArgs, theResult);
+		EV_WelderHitEffects(inArgs, theResult);
+		
+		// Update status bar if possible
+		physent_t* thePhysEnt = gEngfuncs.pEventAPI->EV_GetPhysent( theTraceResult.ent );
+		//if(!thePhysEnt || !thePhysEnt->player)
+		if(thePhysEnt /*&& !thePhysEnt->player*/)
+		{
+			bool theIsBuilding;
+			bool theIsResearching;
+			float thePercentage;
+			AvHSHUGetBuildResearchState(thePhysEnt->iuser3, thePhysEnt->iuser4, thePhysEnt->fuser1, theIsBuilding, theIsResearching, thePercentage);
+
+			if(thePhysEnt->iuser3 == AVH_USER3_WELD)
+			{
+				if((thePercentage < 1.0f) && (thePercentage != -1))
+				{
+					gHUD.SetProgressStatus(thePercentage);
+				}
+				else
+				{
+					gHUD.HideProgressStatus();
+				}
+			}
+		}
+	}
+	// Fire light smoke from muzzle
+	else //if(gEngfuncs.pfnRandomLong(0, 1) == 0)
+	{
+		// TODO: emit this from the actual end of the barrel
+		//AvHParticleSystemManager::Instance()->CreateParticleSystem(5, theStartPos + forward*10);
+		
+		EV_WelderGeneralEffects(inArgs, theStartPos + (forward*(.3f*BALANCE_IVAR(kWelderRange))));
+		
+		// Stop playing hit sound
+		//gEngfuncs.pEventAPI->EV_StopSound( theIndex, CHAN_WEAPON, kWeldingHitSound);
+	}
+	
+	gEngfuncs.pEventAPI->EV_PopPMStates();
+}
+
+//void ClientPlayRandomConstructionSound(struct event_args_s* inArgs)
+//{
+//	int theRandomInteger = gEngfuncs.pfnRandomLong(1, 5);
+//	char theSoundName[128];
+//	sprintf(theSoundName, kMarineConstructionSounds, theRandomInteger);
+//	
+//	int thePitch = gEngfuncs.pfnRandomLong(100, 125);
+//	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_BODY, theSoundName, 1, ATTN_NORM, SND_CHANGE_PITCH | SND_CHANGE_VOL, thePitch);
+//}
+
+// This event means the welder is constructing something, it's fired by the server
+void EV_WelderConst(struct event_args_s* inArgs)
+{
+	int theIndex = inArgs->entindex;
+	cl_entity_t* thePlayer = GetEntity(theIndex);
+
+	switch(inArgs->iparam1)
+	{
+	case 0://Start playing loop sound.
+		gEngfuncs.pEventAPI->EV_PlaySound( inArgs->entindex, thePlayer->origin, CHAN_BODY, kWeldingHitSound, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+		break;
+	case 1://Stop playing loop sound.
+		gEngfuncs.pEventAPI->EV_StopSound( inArgs->entindex, CHAN_BODY, kWeldingHitSound);
+		gEngfuncs.pEventAPI->EV_PlaySound( inArgs->entindex, thePlayer->origin, CHAN_AUTO, kWeldingStopSound, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+		break;
+	}
+	/*
+	// Play construction sounds
+	//if(gEngfuncs.pfnRandomLong(0, 3) == 0)
+	//{
+	//	ClientPlayRandomConstructionSound(inArgs);
+	//}
+	
+		int theIndex = inArgs->entindex;
+		cl_entity_t* thePlayer = GetEntity(theIndex);
+		
+		 //Hot blue flame
+		
+		 //See if we're hitting something and playback smoke and sparks if so
+		 //Trace to see where the sparks should emanate from
+		vec3_t vecSrc;
+		vec3_t origin;
+		vec3_t forward, right, up;
+		
+		gEngfuncs.pfnAngleVectors(inArgs->angles, forward, right, up);
+		
+		 //Calculate theStartPos
+		vec3_t theStartPos, theEndPos;
+		VectorCopy(inArgs->origin, theStartPos);
+		EV_GetGunPosition(inArgs, vecSrc, theStartPos);
+		VectorCopy(vecSrc, theStartPos);
+		
+		 //Calculate theEndPos, welder range along facing
+		theEndPos = theStartPos + forward*kWelderRange;
+		
+		struct pmtrace_s theTraceResult;
+		gEngfuncs.pEventAPI->EV_PlayerTrace(theStartPos, theEndPos, PM_NORMAL, -1, &theTraceResult);
+		if(theTraceResult.fraction != 1.0f)
+		{
+			// Fire sparks
+			Vector theVector(inPev->origin);
+			float theRandomFloat = RANDOM_FLOAT(0.5F, 1.0f);
+			float theHeight = theRandomFloat*(inPev->absmax.z - inPev->absmin.z);
+
+		// Occasionals sparks
+		for(int i = 0; i < gEngfuncs.pfnRandomLong(0, 4); i++)
+		{
+			gEngfuncs.pEfxAPI->R_SparkShower(theTraceResult.endpos);
+		}
+	}*/
+
+}
+
+void EV_WelderStart(struct event_args_s* inArgs)
+{
+	int theIndex = inArgs->entindex;
+	cl_entity_t* thePlayer = GetEntity(theIndex);
+	
+	gEngfuncs.pEventAPI->EV_PlaySound( inArgs->entindex, thePlayer->origin, CHAN_WEAPON, kWeldingSound, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+}
+
+void EV_WelderEnd(struct event_args_s* inArgs)
+{
+	gEngfuncs.pEventAPI->EV_StopSound( inArgs->entindex, CHAN_WEAPON, kWeldingSound);
+	
+	// Hide the status, it will be shown below if possible
+	gHUD.HideProgressStatus();
+}
+
+//void EV_OverwatchStart(struct event_args_s* inArgs)
+//{
+//	cl_entity_t* thePlayer = GetEntity(inArgs->entindex);
+//	gEngfuncs.pEventAPI->EV_PlaySound( inArgs->entindex, thePlayer->origin, CHAN_VOICE, kOverwatchStartSound, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+//}
+//
+//void EV_OverwatchEnd(struct event_args_s* inArgs)
+//{
+//	cl_entity_t* thePlayer = GetEntity(inArgs->entindex);
+//	gEngfuncs.pEventAPI->EV_PlaySound( inArgs->entindex, thePlayer->origin, CHAN_VOICE, kOverwatchEndSound, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+//}
+
+void EV_Regeneration(struct event_args_s* inArgs)
+{
+	cl_entity_t* thePlayer = GetEntity(inArgs->entindex);
+	ASSERT(thePlayer);
+	
+	float theVolume = inArgs->fparam1;
+	
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, thePlayer->origin, CHAN_AUTO, kRegenerationSound, theVolume, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+}
+
+void EV_StartCloak(struct event_args_s* inArgs)
+{
+	cl_entity_t* thePlayer = GetEntity(inArgs->entindex);
+	ASSERT(thePlayer);
+
+	float theVolume = inArgs->fparam1;
+
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, thePlayer->origin, CHAN_AUTO, kStartCloakSound, theVolume, .4, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+}
+
+void EV_EndCloak(struct event_args_s* inArgs)
+{
+	cl_entity_t* thePlayer = GetEntity(inArgs->entindex);
+	ASSERT(thePlayer);
+
+	float theVolume = inArgs->fparam1;
+
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, thePlayer->origin, CHAN_AUTO, kEndCloakSound, theVolume, .4, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+}
+
+//void EV_WallJump(struct event_args_s* inArgs)
+//{
+//	cl_entity_t* thePlayer = GetEntity(inArgs->entindex);
+//	gEngfuncs.pEventAPI->EV_PlaySound( inArgs->entindex, thePlayer->origin, CHAN_VOICE, kWallJumpSound, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+//}
+
+void EV_Flight(struct event_args_s* inArgs)
+{
+	cl_entity_t* thePlayer = GetEntity(inArgs->entindex);
+
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, thePlayer->origin, CHAN_AUTO, kEndCloakSound, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+	
+ 	//gEngfuncs.pEventAPI->EV_PlaySound( inArgs->entindex, thePlayer->origin, CHAN_AUTO, kStartCloakSound/*kWingFlapSound*/, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+}
+
+void TeleportCallback( struct tempent_s *ent, float frametime, float currenttime)
+{
+}
+
+void EV_Teleport(struct event_args_s* inArgs)
+{
+	// Create a temp entity of this player and fade him out!
+	cl_entity_t* thePlayer = GetEntity(inArgs->entindex);
+
+//	// Kill earlier effect so the sound plays right?
+//	int idx = inArgs->entindex;
+//	gEngfuncs.pEventAPI->EV_KillEvents(idx, kTeleportEvent);
+		
+//	TEMPENTITY* theTempEnt = gEngfuncs.pEfxAPI->CL_TentEntAllocCustom( (float*)inArgs->origin, thePlayer->model, 0, TeleportCallback);
+//	if(theTempEnt)
+//	{
+//		VectorCopy(inArgs->origin, theTempEnt->entity.origin);
+//		VectorCopy(inArgs->angles, theTempEnt->entity.angles);
+//
+//		theTempEnt->flags |= FTENT_FADEOUT;
+//		theTempEnt->entity.baseline.renderamt = 255;
+//		theTempEnt->entity.curstate.renderfx = kRenderFxStrobeFaster;
+//		theTempEnt->fadeSpeed = 1.3f;
+//		theTempEnt->entity.curstate.movetype = MOVETYPE_NONE;
+//
+//		theTempEnt->entity.curstate.modelindex = thePlayer->curstate.modelindex;
+//		theTempEnt->entity.curstate.frame = thePlayer->curstate.frame;
+//		theTempEnt->entity.curstate.colormap = thePlayer->curstate.colormap;
+//		theTempEnt->entity.curstate.skin = thePlayer->curstate.skin;
+//		theTempEnt->entity.curstate.framerate = thePlayer->curstate.framerate;
+//		theTempEnt->entity.curstate.body = thePlayer->curstate.body;
+//		theTempEnt->entity.curstate.weaponmodel = thePlayer->curstate.weaponmodel;
+//		theTempEnt->entity.curstate.sequence = thePlayer->curstate.sequence;
+//		theTempEnt->entity.curstate.gaitsequence = thePlayer->curstate.gaitsequence;
+//		theTempEnt->entity.curstate.usehull = thePlayer->curstate.usehull;
+//		theTempEnt->entity.curstate.playerclass = thePlayer->curstate.playerclass;
+//		theTempEnt->entity.curstate.animtime = thePlayer->curstate.animtime;
+//		
+//		memcpy(&theTempEnt->entity.curstate.controller[0], &thePlayer->curstate.controller[0], 4 * sizeof( byte ));
+//		memcpy(&theTempEnt->entity.curstate.blending[0], &thePlayer->curstate.blending[0], 2 * sizeof( byte ));
+
+		if(CVAR_GET_FLOAT(kvDynamicLights))
+		{
+			dlight_t* theDLight = gEngfuncs.pEfxAPI->CL_AllocDlight(1);
+			VectorCopy(inArgs->origin, theDLight->origin);
+			theDLight->radius = 200;
+			theDLight->color.r = 180;
+			theDLight->color.g = 180;
+			theDLight->color.b = 250;
+			
+			// don't die for forseeable future
+			theDLight->die = gEngfuncs.GetClientTime() + .25f;
+		}
+
+		// Draw cool particle system
+		AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsTeleport, inArgs->origin);
+		//	}
+}
+
+void EV_PhaseIn(struct event_args_s* inArgs)
+{
+	// Create a temp entity of this player and fade him out!
+	cl_entity_t* thePlayer = GetEntity(inArgs->entindex);
+	
+	int thePitch = gEngfuncs.pfnRandomLong(75, 150);
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_AUTO, kPhaseInSound, 1, ATTN_NORM, 0, thePitch);
+	
+	if(CVAR_GET_FLOAT(kvDynamicLights))
+	{
+		dlight_t* theDLight = gEngfuncs.pEfxAPI->CL_AllocDlight(1);
+		VectorCopy(inArgs->origin, theDLight->origin);
+		theDLight->radius = 200;
+		theDLight->color.r = 180;
+		theDLight->color.g = 180;
+		theDLight->color.b = 250;
+		
+		// don't die for forseeable future
+		theDLight->die = gEngfuncs.GetClientTime() + 1.0f;
+	}
+	
+	// Draw cool particle system
+	AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsPhaseIn, inArgs->origin);
+}
+
+void EV_SiegeHit(struct event_args_s* inArgs)
+{
+	char* theSoundToPlay = kSiegeHitSound1;
+	if(gEngfuncs.pfnRandomLong(0, 1) == 1)
+	{
+		theSoundToPlay = kSiegeHitSound2;
+	}
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_BODY, theSoundToPlay, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+	
+	gEngfuncs.pEfxAPI->R_BlobExplosion(inArgs->origin);
+}
+
+void EV_SiegeViewHit(struct event_args_s* inArgs)
+{
+	const float kPunchRange = 5.0f;
+	
+	V_PunchAxis(0, gEngfuncs.pfnRandomFloat(-kPunchRange, kPunchRange));
+	V_PunchAxis(1, gEngfuncs.pfnRandomFloat(-kPunchRange, kPunchRange));
+	V_PunchAxis(2, gEngfuncs.pfnRandomFloat(-kPunchRange, kPunchRange));
+}	
+
+void EV_CommandPoints(struct event_args_s* inArgs)
+{
+	if(CVAR_GET_FLOAT(kvDynamicLights))
+	{
+		dlight_t* theDLight = gEngfuncs.pEfxAPI->CL_AllocDlight(1);
+		VectorCopy(inArgs->origin, theDLight->origin);
+		theDLight->radius = 60;
+		theDLight->color.r = 100;
+		theDLight->color.g = 250;
+		theDLight->color.b = 100;
+		
+		// don't die for forseeable future
+		theDLight->die = gEngfuncs.GetClientTime() + 1.0f;
+	}
+}
+
+void EV_AlienSightOn(struct event_args_s* inArgs)
+{
+	int thePitch = gEngfuncs.pfnRandomLong(75, 150);
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_AUTO, kAlienSightOnSound, inArgs->fparam1, ATTN_IDLE, 0, thePitch);
+}
+
+void EV_AlienSightOff(struct event_args_s* inArgs)
+{
+	int thePitch = gEngfuncs.pfnRandomLong(75, 150);
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_AUTO, kAlienSightOffSound, inArgs->fparam1, ATTN_IDLE, 0, thePitch);
+}
+
+//void ParalysisHit(struct tempent_s* ent, struct pmtrace_s* ptr)
+//{
+//	int a = 0;
+//}
+//
+//void EV_ParalysisGun(struct event_args_s* inArgs)
+//{
+//	int thePitch = gEngfuncs.pfnRandomLong(75, 150);
+//	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_AUTO, kParalysisFireSound, inArgs->fparam1, ATTN_IDLE, 0, thePitch);
+//
+//	vec3_t forward, right, up;
+//	gEngfuncs.pfnAngleVectors(inArgs->angles, forward, right, up);
+//	
+//	vec3_t theProjectileAngles;
+//	VectorAngles(forward, theProjectileAngles);
+//	
+//	// Projectile is rotated a bit
+//	TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->R_TempModel(gPredictedPlayerOrigin, forward, theProjectileAngles, 100, gEngfuncs.pEventAPI->EV_FindModelIndex(kParalysisProjectileModel), 0);
+//	if(theTempEntity)
+//	{
+//		vec3_t theStartPos, theEndPos;
+//		//EV_GetGunPosition(inArgs, vecSrc, inArgs->origin);
+//		VectorMA(inArgs->origin, kParalysisBarrelLength, forward, theStartPos);
+//		
+//		VectorCopy(theStartPos, theTempEntity->entity.origin);
+//		VectorCopy(theStartPos, theTempEntity->entity.prevstate.origin);
+//		VectorCopy(theStartPos, theTempEntity->entity.curstate.origin);
+//		theTempEntity->hitcallback = ParalysisHit;
+//		theTempEntity->flags = (FTENT_COLLIDEALL | FTENT_COLLIDEKILL | FTENT_PERSIST | FTENT_ROTATE);
+//		theTempEntity->entity.curstate.framerate = 30;
+//		theTempEntity->frameMax = 4;//theModel->numframes;
+//
+//		// Temp entities interpret baseline origin as velocity.
+//		Vector theStartVelocity;
+//		VectorScale(forward, kParalysisVelocity, theStartVelocity);
+//		
+//		VectorCopy(theStartVelocity, theTempEntity->entity.baseline.origin);
+//		VectorCopy(theStartVelocity, theTempEntity->entity.baseline.velocity);
+//
+//		// Make the projectile spin
+//		// baseline.angles		- angle velocity
+//		const float kSpread = 1000.0f;
+//		theTempEntity->entity.baseline.angles.x = gEngfuncs.pfnRandomFloat(-kSpread, kSpread);
+//		theTempEntity->entity.baseline.angles.y = gEngfuncs.pfnRandomFloat(-kSpread, kSpread);
+//		theTempEntity->entity.baseline.angles.z = gEngfuncs.pfnRandomFloat(-kSpread, kSpread);
+//	}
+//	
+//	// General x-punch axis
+//	if ( EV_IsLocal( inArgs->entindex ) )
+//	{
+//		float theHalfSpread = kParalysisPunch/2.0f;
+//		if(theHalfSpread > 0.0f)
+//		{
+//			V_PunchAxis( 0, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+//		}
+//
+//		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+//	}
+//	
+//}
+
+//void EV_ParalysisStart(struct event_args_s* inArgs)
+//{
+//	int thePitch = gEngfuncs.pfnRandomLong(75, 150);
+//	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_AUTO, kParalysisHitSound, 1, ATTN_IDLE, 0, thePitch);
+//}
+
+void EV_ParasiteGun(struct event_args_s* inArgs)
+{
+	// Sharp falloff, so it's only heard at very close and by the firer
+	int thePitch = gEngfuncs.pfnRandomLong(75, 150);
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_AUTO, kParasiteFireSound, .4f*inArgs->fparam1, .2, 0, thePitch);
+
+	if (EV_IsLocal(inArgs->entindex))
+	{
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+	}
+
+//	// Create fast moving parasite projectile
+//	//vec3_t theEntStartPos = gPredictedPlayerOrigin;
+//	vec3_t vecSrc, vecAiming;
+//	vec3_t up, right, forward;
+//	gEngfuncs.pfnAngleVectors(inArgs->angles, forward, right, up);
+//
+//	vec3_t theStartPos, theEndPos;
+//	EV_GetGunPosition(inArgs, vecSrc, inArgs->origin);
+//	VectorMA(vecSrc, kParasiteBarrelLength, forward, theStartPos);
+//
+//	vec3_t theParasiteAngles;
+//	VectorAngles(forward, theParasiteAngles);
+//	
+//	//TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->CL_TempEntAlloc(theEntStartPos, theModel);
+//	TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->R_TempModel(theStartPos, forward, theParasiteAngles, 100, gEngfuncs.pEventAPI->EV_FindModelIndex(kParasiteProjectileModel), 0);
+//	if(theTempEntity)
+//	{
+//		VectorCopy(theStartPos, theTempEntity->entity.origin);
+//		VectorCopy(theStartPos, theTempEntity->entity.prevstate.origin);
+//		VectorCopy(theStartPos, theTempEntity->entity.curstate.origin);
+//		theTempEntity->flags |= (FTENT_COLLIDEALL | FTENT_COLLIDEKILL | FTENT_PERSIST);
+//		theTempEntity->clientIndex = inArgs->entindex;
+//		
+//		// Temp entities interpret baseline origin as velocity.
+//		Vector theStartVelocity;
+//		VectorScale(forward, kParasiteVelocity, theStartVelocity);
+//		
+//		VectorCopy(theStartVelocity, theTempEntity->entity.baseline.origin);
+//		VectorCopy(theStartVelocity, theTempEntity->entity.baseline.velocity);
+//
+//		// Set orientation
+//		//VectorCopy(inArgs->angles, theTempEntity->entity.angles);
+//	}
+}
+
+void EV_BlinkSuccess(struct event_args_s* inArgs)
+{
+	// Create particle at origin, but also at angles (interpret as dest)
+	//AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsBlinkEffect, inArgs->origin);
+	//AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsBlinkEffect, inArgs->angles);
+	
+	int thePitch = gEngfuncs.pfnRandomLong(75, 150);
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_AUTO, kBlinkSuccessSound, inArgs->fparam1, ATTN_IDLE, 0, thePitch);
+	//gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->angles, CHAN_WEAPON, kBlinkSuccessSound, inArgs->fparam1, ATTN_IDLE, 0, thePitch);
+}
+
+void EV_DivineWind(struct event_args_s* inArgs)
+{
+	cl_entity_t* thePlayer = GetEntity(inArgs->entindex);
+
+	float theSilenceVolumeFactor = AvHPlayerUpgrade::GetSilenceVolumeLevel((AvHUser3)thePlayer->curstate.iuser3, thePlayer->curstate.iuser4);
+	int thePitch = gEngfuncs.pfnRandomLong(75, 150);
+
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_AUTO, kDivineWindFireSound, theSilenceVolumeFactor, ATTN_IDLE, 0, thePitch);
+
+	if (EV_IsLocal(inArgs->entindex))
+	{
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+	}
+}
+
+void BileBombHit(struct tempent_s* ent, struct pmtrace_s* ptr)
+{
+	gEngfuncs.pEventAPI->EV_PlaySound(ent->entity.index, ptr->endpos, CHAN_AUTO, kBileBombHitSound, 1, ATTN_IDLE, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+
+	AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsBilebomb, ptr->endpos, &(ptr->plane.normal));
+}
+
+void EV_BileBomb(struct event_args_s* inArgs)
+{
+	ASSERT(inArgs);
+
+    // Figure out which weapon description to assocate this weapon with
+    int theWeaponIndex = inArgs->iparam1;
+	
+	// Play attack animation and add muzzle flash
+	int idx;
+	vec3_t origin;
+	vec3_t angles;
+	vec3_t velocity;
+	
+	vec3_t vecSrc, vecAiming;
+	vec3_t up, right, forward;
+	
+	idx = inArgs->entindex;
+	VectorCopy( inArgs->origin, origin );
+	VectorCopy( inArgs->angles, angles );
+	VectorCopy( inArgs->velocity, velocity );
+	
+	//AngleVectors( angles, forward, right, up );
+	gEngfuncs.pfnAngleVectors(angles, forward, right, up);
+	
+	int thePitch = gEngfuncs.pfnRandomLong(75, 150);
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_AUTO, kBileBombFireSound, inArgs->fparam1, ATTN_IDLE, 0, thePitch);
+
+	vec3_t theBombAngles;
+	VectorAngles(forward, theBombAngles);
+
+	theBombAngles.y -= 90;
+
+	// Fire bomb
+	TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->R_TempModel(inArgs->origin, forward, theBombAngles, 100, gEngfuncs.pEventAPI->EV_FindModelIndex(kBileBombProjectileModel), 0);
+	if(theTempEntity)
+	{
+		theTempEntity->hitcallback = BileBombHit;
+		theTempEntity->flags = (FTENT_GRAVITY | FTENT_COLLIDEALL | FTENT_COLLIDEKILL | FTENT_PERSIST);
+		theTempEntity->die += 5;
+		theTempEntity->entity.curstate.framerate = 30;
+		//theTempEntity->frameMax = 4;//theModel->numframes;
+		theTempEntity->clientIndex = inArgs->entindex;	// Entity to ignore collisions with
+		
+		Vector theAiming = forward;// + up;
+		VectorNormalize(theAiming);
+		
+		Vector theStartVelocity;
+		VectorMA(Vector(0, 0, 0), kBileBombVelocity, theAiming, theStartVelocity);
+		
+		VectorCopy(theStartVelocity, theTempEntity->entity.baseline.origin);
+		VectorCopy(theStartVelocity, theTempEntity->entity.baseline.velocity);
+	}
+
+	// General x-punch axis
+	if ( EV_IsLocal( idx ) )
+	{
+		float theHalfSpread = kBileBombPunch/2.0f;
+		if(theHalfSpread > 0.0f)
+		{
+			V_PunchAxis( 0, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+		}
+
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+	}
+
+}
+
+void AcidRocketHit(struct tempent_s* ent, struct pmtrace_s* ptr)
+{
+	char* theSoundToPlay = kAcidRocketHitSound;
+	gEngfuncs.pEventAPI->EV_PlaySound(ent->entity.index, ptr->endpos, CHAN_AUTO, theSoundToPlay, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+
+	AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsAcidHitEffect, ptr->endpos, &(ptr->plane.normal));
+	
+//	int theModelIndex;
+//	struct model_s* theModel = gEngfuncs.CL_LoadModel(kSpitGunSprite, &theModelIndex);
+//	if(theModel)
+//	{
+//		//if(gEngfuncs.pfnRandomLong(0, 1) == 0)
+//		//{
+//			// Make acid splash
+//			int theVelocity = gEngfuncs.pfnRandomLong(50, 100) + gEngfuncs.pfnRandomLong(50, 100);
+//			int theRandomness = gEngfuncs.pfnRandomLong(20, 30) + gEngfuncs.pfnRandomLong(20, 30);
+//			int theNumGlobs = gEngfuncs.pfnRandomLong(5, 10);
+//			gEngfuncs.pEfxAPI->R_Sprite_Spray(ptr->endpos, ptr->plane.normal, theModelIndex, theNumGlobs, theVelocity, theRandomness);
+//		//}
+//		//else
+//		//{
+//			//gEngfuncs.pEfxAPI->R_BlobExplosion(ptr->endpos);
+//			//gEngfuncs.pEfxAPI->R_LavaSplash(ptr->endpos);
+//			//gEngfuncs.pEfxAPI->R_TeleportSplash(ptr->endpos);
+//		//	vec3_t theEnd = ptr->endpos;
+//		//	theEnd[2] += 100;
+//		//	gEngfuncs.pEfxAPI->R_BeamLightning(ptr->endpos, theEnd, theModelIndex, 2.0f, 50, 2.0f, 1.0f, 10);
+//		//}
+//	}
+}
+
+void EV_AcidRocket(struct event_args_s* inArgs)
+{
+	ASSERT(inArgs);
+	
+    // Figure out which weapon description to assocate this weapon with
+    int theWeaponIndex = inArgs->iparam1;
+	
+	// Play attack animation and add muzzle flash
+	int idx;
+	vec3_t origin;
+	vec3_t angles;
+	vec3_t velocity;
+	
+	vec3_t vecSrc, vecAiming;
+	vec3_t up, right, forward;
+	
+	idx = inArgs->entindex;
+	VectorCopy( inArgs->origin, origin );
+	VectorCopy( inArgs->angles, angles );
+	VectorCopy( inArgs->velocity, velocity );
+	
+	//AngleVectors( angles, forward, right, up );
+	gEngfuncs.pfnAngleVectors(angles, forward, right, up);
+	
+	int thePitch = gEngfuncs.pfnRandomLong(75, 150);
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_AUTO, kAcidRocketFireSound, inArgs->fparam1, ATTN_IDLE, 0, thePitch);
+
+	// Fire rocket
+	//int theModelIndex;
+	//struct model_s* theModel = gEngfuncs.CL_LoadModel(kAcidRocketProjectileModel, &theModelIndex);
+	//if(theModel)
+	//{
+	//	TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->CL_TempEntAlloc(gPredictedPlayerOrigin, theModel);
+
+	vec3_t theRocketAngles;
+	VectorAngles(forward, theRocketAngles);
+
+	vec3_t theGunPosition;
+	EV_GetGunPosition(inArgs, theGunPosition, inArgs->origin);
+
+	Vector theRocketOrigin;
+	VectorMA(theGunPosition, kAcidRocketBarrelLength, forward, theRocketOrigin);
+	
+	// Projectile is rotated a bit
+	TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->R_TempModel(theRocketOrigin, forward, theRocketAngles, 100, gEngfuncs.pEventAPI->EV_FindModelIndex(kAcidRocketProjectileModel), 0);
+	if(theTempEntity)
+	{
+		//vec3_t theStartPos, theEndPos;
+		////EV_GetGunPosition(inArgs, vecSrc, inArgs->origin);
+		//VectorMA(inArgs->origin, kAcidRocketBarrelLength, forward, theStartPos);
+		
+		//VectorCopy(theStartPos, theTempEntity->entity.origin);
+		//VectorCopy(theStartPos, theTempEntity->entity.prevstate.origin);
+		//VectorCopy(theStartPos, theTempEntity->entity.curstate.origin);
+		theTempEntity->hitcallback = AcidRocketHit;
+		theTempEntity->flags = (FTENT_COLLIDEALL | FTENT_COLLIDEKILL | FTENT_PERSIST);
+		theTempEntity->entity.curstate.framerate = 30;
+		theTempEntity->frameMax = 4;//theModel->numframes;
+		
+		// Temp entities interpret baseline origin as velocity.
+		Vector theBaseVelocity;
+		VectorScale(inArgs->velocity, kAcidRocketParentVelocityScalar, theBaseVelocity);
+		
+		Vector theStartVelocity;
+		VectorMA(theBaseVelocity, kAcidRocketVelocity, forward, theStartVelocity);
+		
+		VectorCopy(theStartVelocity, theTempEntity->entity.baseline.origin);
+		VectorCopy(theStartVelocity, theTempEntity->entity.baseline.velocity);
+	
+		// Orient projectile according to direction
+////		Vector theDirection;
+////		VectorCopy(theBaseVelocity, theDirection);
+////		VectorNormalize(theDirection);
+////
+//		Vector theAngles;
+//		VectorAngles(theDirection, theAngles);
+//	
+//		VectorCopy(angles, theAngles);
+//	
+//		VectorCopy(theAngles, theTempEntity->entity.baseline.angles);
+//		VectorCopy(theAngles, theTempEntity->entity.curstate.angles);
+//		VectorCopy(theAngles, theTempEntity->entity.angles);
+	}
+	
+	// General x-punch axis
+	if ( EV_IsLocal( idx ) )
+	{
+		float theHalfSpread = kAcidRocketPunch/2.0f;
+		if(theHalfSpread > 0.0f)
+		{
+			V_PunchAxis( 0, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+		}
+
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+	}
+}
+
+void UpdateStomp(TEMPENTITY* inEntity, float frametime, float inCurrentTime)
+{
+	float theTimeScalar = (inCurrentTime - inEntity->entity.curstate.fuser1)/(inEntity->entity.curstate.fuser2/inEntity->entity.curstate.fuser1);
+	theTimeScalar = max(min(theTimeScalar, 1.0f), 0.0f);
+
+	// Fade it out according to lifetime
+	int theAlpha = (1.0f - theTimeScalar)*kStompModelRenderAmount;
+	inEntity->entity.curstate.renderamt = theAlpha;
+
+	// Don't create at end of trail
+	if(theTimeScalar < .7f)
+	{
+		// Every once in a awhile, create a smoke puff
+		if(gEngfuncs.pfnRandomLong(0, 1) == 0)
+		{
+			AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsStompSmoke, inEntity->entity.origin);
+		}
+	}
+}
+
+void EV_Stomp(struct event_args_s* inArgs)
+{
+	ASSERT(inArgs);
+
+	Vector theStartPos;
+	VectorCopy(inArgs->origin, theStartPos);
+
+	// Not sure why this is necessary, AvHStomp::GetStompOrigin() should take care of it
+	if (EV_IsLocal(inArgs->entindex))
+	{
+		cl_entity_s* theLocalPlayer = gEngfuncs.GetLocalPlayer();
+		if(theLocalPlayer)
+		{
+			float theZOffset = theLocalPlayer->curstate.mins.z;
+			theStartPos.z += theZOffset;
+		}
+	}
+
+	// Initial velocity store in angles, to make sure event and server entity match up
+	Vector theStartVelocity;
+	VectorCopy(inArgs->angles, theStartVelocity);
+
+	char* theSoundToPlay = kStompFireSound;
+	
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, theStartPos, CHAN_WEAPON, theSoundToPlay, inArgs->fparam1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+	
+	if (EV_IsLocal(inArgs->entindex))
+	{
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+	}
+
+	vec3_t up, right, forward, vecSrc;//, origin;
+
+//	VectorCopy( inArgs->origin, origin );
+	gEngfuncs.pfnAngleVectors(inArgs->angles, forward, right, up);
+
+	// Create stomp projectile that flies forward, going through objects and stunning anyone it touches
+
+	vec3_t theStompAngles;
+	VectorAngles(forward, theStompAngles);
+
+	// Always draw level
+	theStompAngles.x = 0;
+
+	// Projectile artwork is oriented down the wrong axis
+	theStompAngles.y -= 180;
+	
+	TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->R_TempModel(theStartPos, forward, theStompAngles, 100, gEngfuncs.pEventAPI->EV_FindModelIndex(kStompProjectileModel), 0);
+	if(theTempEntity)
+	{
+//		vec3_t theStartPos, theEndPos;
+//		EV_GetGunPosition(inArgs, vecSrc, inArgs->origin);
+//		VectorMA(vecSrc, kStompBarrelLength, forward, theStartPos);
+		
+		VectorCopy(theStartPos, theTempEntity->entity.origin);
+		VectorCopy(theStartPos, theTempEntity->entity.prevstate.origin);
+		VectorCopy(theStartPos, theTempEntity->entity.curstate.origin);
+		//theTempEntity->hitcallback = StompHit;
+		theTempEntity->flags = (FTENT_PERSIST | FTENT_CLIENTCUSTOM/*| FTENT_SMOKETRAIL | FTENT_FADEOUT*/);
+		theTempEntity->callback = UpdateStomp;
+
+		// Set time created and time to expire so we can blend it in UpdateStomp
+		theTempEntity->entity.curstate.fuser1 = gHUD.m_flTime;
+		theTempEntity->entity.curstate.fuser2 = gHUD.m_flTime + kStompProjectileLifetime;	// estimated end time of animation
+
+		theTempEntity->die = gEngfuncs.GetClientTime() + kStompProjectileLifetime;
+		theTempEntity->bounceFactor = 0;
+
+		theTempEntity->entity.curstate.rendermode = kRenderTransAdd;
+		theTempEntity->entity.curstate.renderamt = kStompModelRenderAmount;
+
+		//theTempEntity->entity.curstate.framerate = 30;
+		//theTempEntity->frameMax = 4;//theModel->numframes;
+		
+		// Temp entities interpret baseline origin as velocity.
+
+		// Zero out vertical component as it's a ground stomp
+		forward[2] = 0.0f;
+
+		// Send shockwave in direction player is looking, but always make it go kStompProjectilVelocity
+		VectorNormalize(forward);
+
+		Vector theStartVelocity;
+		VectorScale(forward, kStompProjectileVelocity, theStartVelocity);
+		
+		VectorCopy(theStartVelocity, theTempEntity->entity.baseline.origin);
+		VectorCopy(theStartVelocity, theTempEntity->entity.baseline.velocity);
+	
+		// Set orientation
+		//VectorCopy(inArgs->angles, theTempEntity->entity.angles);
+	}
+
+	// Create stomp effect at Onos
+	AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsStompEffect, theStartPos);
+}
+
+void EV_Devour(struct event_args_s* inArgs)
+{
+	ASSERT(inArgs);
+
+	char* theSoundToPlay = kDevourFireSound;
+	
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_WEAPON, theSoundToPlay, inArgs->fparam1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+	
+	if (EV_IsLocal(inArgs->entindex))
+	{
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+	}
+}
+
+void EV_Leap(struct event_args_s* inArgs)
+{
+	char* theSoundToPlay = kLeapSound;
+	
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_WEAPON, theSoundToPlay, inArgs->fparam1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+
+	if (EV_IsLocal(inArgs->entindex))
+	{
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+	}
+}
+
+void EV_Charge(struct event_args_s* inArgs)
+{
+	char* theSoundToPlay = kChargeSound;
+	
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_WEAPON, theSoundToPlay, inArgs->fparam1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+
+	if (EV_IsLocal(inArgs->entindex))
+	{
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+	}
+}
+
+//We're sending a leap event.
+void EV_Ability(struct event_args_s* inArgs)
+{
+	if (EV_IsLocal(inArgs->entindex))
+		gHUD.SetAlienAbility((AvHMessageID)inArgs->iparam1);
+}
+
+
+
+//physent_t* GetEntity(int inPhysIndex)
+//{
+//	return gEngfuncs.pEventAPI->EV_GetPhysent( inPhysIndex );
+//}
+
+
+void EV_Select(struct event_args_s* args)
+{
+	#ifdef AVH_PREDICT_SELECT
+	gSelectionHelper.ProcessPendingSelections();
+	#endif
+}
+
+
+void EV_Bite(struct event_args_s* inArgs)
+{
+	int idx = inArgs->entindex;
+	
+	// Play attack sound
+	char* theSoundToPlay = "";
+	
+	int theRandomSound = gEngfuncs.pfnRandomLong(0, 1);
+	switch(theRandomSound)
+	{
+	case 0:
+	case 1:
+		theSoundToPlay = kBiteSound;
+		break;
+	//case 1:
+	//	theSoundToPlay = kBiteSound2;
+	//	break;
+	}
+
+
+	const int kBasePitch = 80;
+	const int kVariablePitchRange = 0x0;
+
+	const int kBiteAdrenPitchFactor = 30;
+	
+	int theRandomPitch = gEngfuncs.pfnRandomLong( 0, kVariablePitchRange );
+	int thePitch = kBasePitch + (inArgs->fparam1*kBiteAdrenPitchFactor) + theRandomPitch;
+	gEngfuncs.pEventAPI->EV_PlaySound(idx, inArgs->origin, CHAN_WEAPON, theSoundToPlay, inArgs->fparam1, ATTN_NORM, 0, thePitch);
+
+	// General x-punch axis
+	if (EV_IsLocal(idx))
+	{
+		float theHalfSpread = kBitePunch/2.0f;
+		if(theHalfSpread > 0.0f)
+		{
+			V_PunchAxis(0, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+			V_PunchAxis(1, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+		}
+
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+	}
+
+	if(gEngfuncs.pfnRandomLong(0, 1) == 0)
+	{
+		PlayMeleeHitEffects(inArgs, BALANCE_IVAR(kBiteRange), kBiteHitSound1);
+	}
+	else
+	{
+		PlayMeleeHitEffects(inArgs, BALANCE_IVAR(kBiteRange), kBiteHitSound2);
+	}
+}
+
+
+void EV_Bite2(struct event_args_s* inArgs)
+{
+	int idx = inArgs->entindex;
+	
+	// Play attack sound
+	char* theSoundToPlay = "";
+	
+	int theRandomSound = gEngfuncs.pfnRandomLong(0, 1);
+	switch(theRandomSound)
+	{
+	case 0:
+	case 1:
+		theSoundToPlay = kBite2Sound;
+		break;
+	//case 1:
+	//	theSoundToPlay = kBiteSound2;
+	//	break;
+	}
+
+
+	const int kBasePitch = 80;
+	const int kVariablePitchRange = 0x0;
+
+	const int kBiteAdrenPitchFactor = 30;
+	
+	int theRandomPitch = gEngfuncs.pfnRandomLong( 0, kVariablePitchRange );
+	int thePitch = kBasePitch + (inArgs->fparam1*kBiteAdrenPitchFactor) + theRandomPitch;
+	gEngfuncs.pEventAPI->EV_PlaySound(idx, inArgs->origin, CHAN_WEAPON, theSoundToPlay, inArgs->fparam1, ATTN_NORM, 0, thePitch);
+
+	// General x-punch axis
+	if (EV_IsLocal(idx))
+	{
+//		gEngfuncs.pEventAPI->EV_WeaponAnimation(ANIM_FIRE1 + gEngfuncs.pfnRandomLong(0,2), 2);
+		
+		float theHalfSpread = kBitePunch/2.0f;
+		if(theHalfSpread > 0.0f)
+		{
+			V_PunchAxis(0, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+			V_PunchAxis(1, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+		}
+
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+	}
+
+	if(gEngfuncs.pfnRandomLong(0, 1) == 0)
+	{
+		PlayMeleeHitEffects(inArgs, BALANCE_IVAR(kBiteRange), kBiteHitSound1);
+	}
+	else
+	{
+		PlayMeleeHitEffects(inArgs, BALANCE_IVAR(kBiteRange), kBiteHitSound2);
+	}
+}
+
+
+void EV_BuildGun(struct event_args_s* inArgs)
+{
+	int idx = inArgs->entindex;
+	
+	// Play attack sound
+	char* theSoundToPlay = "";
+	
+	int theRandomSound = gEngfuncs.pfnRandomLong(0, 1);
+	switch(theRandomSound)
+	{
+	case 0:
+		theSoundToPlay = kBuildingGunSound1;
+		break;
+	case 1:
+		theSoundToPlay = kBuildingGunSound2;
+		break;
+	}
+	gEngfuncs.pEventAPI->EV_PlaySound(idx, inArgs->origin, CHAN_WEAPON, theSoundToPlay, inArgs->fparam1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+	
+	// General x-punch axis
+	if (EV_IsLocal(idx))
+	{
+//		gEngfuncs.pEventAPI->EV_WeaponAnimation(ANIM_FIRE1 + gEngfuncs.pfnRandomLong(0,2), 2);
+		
+		float theHalfSpread = kBuildingGunPunch/2.0f;
+		if(theHalfSpread > 0.0f)
+		{
+			V_PunchAxis(0, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+			V_PunchAxis(1, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+		}
+	}
+}
+
+void EV_HealingSpray(struct event_args_s* inArgs)
+{
+	ASSERT(inArgs);
+	
+	// Play attack animation and add muzzle flash
+	int idx;
+	vec3_t origin;
+	vec3_t angles;
+	vec3_t velocity;
+	
+	vec3_t vecSrc, vecAiming;
+	vec3_t up, right, forward;
+	
+	idx = inArgs->entindex;
+	VectorCopy( inArgs->origin, origin );
+	VectorCopy( inArgs->angles, angles );
+	VectorCopy( inArgs->velocity, velocity );
+	
+	//AngleVectors( angles, forward, right, up );
+	gEngfuncs.pfnAngleVectors(angles, forward, right, up);
+	
+	// Play attack sound
+	gEngfuncs.pEventAPI->EV_PlaySound(idx, origin, CHAN_WEAPON, kHealingSpraySound, inArgs->fparam1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+
+	// Load model
+	//int theModelIndex;
+	//struct model_s* theModel = gEngfuncs.CL_LoadModel(kWebProjectileSprite, &theModelIndex);
+	//if(theModel)
+	//{
+		// Create some spray effect
+		//gEngfuncs.pEfxAPI->R_Sprite_Spray(inArgs->origin, forward, theModelIndex, 15, 100, 2);
+		//vec3_t theEndPoint;
+		//VectorMA(inArgs->origin, kHealingSprayRange, forward, theEndPoint);
+		//gEngfuncs.pEfxAPI->R_BeamLightning(inArgs->origin, theEndPoint, theModelIndex, .5f, 10, 1.0f, 1.0f, 1.0f);
+	//}
+
+
+	vec3_t theStartPos;
+	EV_GetGunPosition(inArgs, vecSrc, inArgs->origin);
+	VectorMA(vecSrc, kHealingSprayBarrelLength, forward, theStartPos);
+	
+	AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsBacteriaSpray, theStartPos);
+
+	if (EV_IsLocal(inArgs->entindex))
+	{
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+	}
+}
+
+void EV_Metabolize(struct event_args_s* inArgs)
+{
+	char* theSoundToPlay = "";
+	
+	int theRandomSound = gEngfuncs.pfnRandomLong(0, 2);
+	switch(theRandomSound)
+	{
+	case 0:
+		theSoundToPlay = kMetabolizeFireSound1;
+		break;
+	case 1:
+		theSoundToPlay = kMetabolizeFireSound2;
+		break;
+	case 2:
+		theSoundToPlay = kMetabolizeFireSound3;
+		break;
+	}
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_WEAPON, theSoundToPlay, inArgs->fparam1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+	
+//	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_WEAPON, kMetabolizeFireSound, inArgs->fparam1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+
+	if (EV_IsLocal(inArgs->entindex))
+	{
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+	}
+}
+
+void EV_MetabolizeSuccess(struct event_args_s* inArgs)
+{
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_WEAPON, kMetabolizeSuccessSound, inArgs->fparam1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+	
+	if (EV_IsLocal(inArgs->entindex))
+	{
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+	}
+}
+
+void WebHit(struct tempent_s* ent, struct pmtrace_s* ptr)
+{
+	gEngfuncs.pEventAPI->EV_PlaySound(ent->entity.index, ptr->endpos, CHAN_AUTO, kWebSpinSound1, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+	if(ptr && ent)
+	{
+		ent->die = gEngfuncs.GetClientTime();
+		
+		//AvHParticleSystemManager::Instance()->CreateParticleSystem(kpsSpitHit, ptr->endpos, &(ptr->plane.normal));
+		
+		// Create splat here too
+		CreateDecal(ptr);
+	}
+}
+
+
+void EV_SpinWeb(struct event_args_s* inArgs)
+{
+	ASSERT(inArgs);
+	
+	// Play attack animation and add muzzle flash
+	int idx;
+	vec3_t origin;
+	vec3_t angles;
+	vec3_t velocity;
+	
+	vec3_t vecSrc, vecAiming;
+	vec3_t up, right, forward;
+	
+	idx = inArgs->entindex;
+	VectorCopy( inArgs->origin, origin );
+	VectorCopy( inArgs->angles, angles );
+	VectorCopy( inArgs->velocity, velocity );
+	
+	//AngleVectors( angles, forward, right, up );
+	gEngfuncs.pfnAngleVectors(angles, forward, right, up);
+	
+	if( EV_IsLocal( idx ) )
+	{
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+	}
+	
+	// Play attack sound
+	gEngfuncs.pEventAPI->EV_PlaySound(idx, origin, CHAN_WEAPON, kWebSpinSound1, inArgs->fparam1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+	
+	// Fire spit glob
+	int theModelIndex;
+	struct model_s* theModel = gEngfuncs.CL_LoadModel(kWebProjectileSprite, &theModelIndex);
+	if(theModel)
+	{
+		TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->CL_TempEntAlloc(gPredictedPlayerOrigin, theModel);
+		if(theTempEntity)
+		{
+			vec3_t theStartPos, theEndPos;
+			EV_GetGunPosition(inArgs, vecSrc, inArgs->origin);
+			VectorMA(vecSrc, kSpitGBarrelLength, forward, theStartPos);
+			
+			VectorCopy(theStartPos, theTempEntity->entity.origin);
+			VectorCopy(theStartPos, theTempEntity->entity.prevstate.origin);
+			VectorCopy(theStartPos, theTempEntity->entity.curstate.origin);
+			//theTempEntity->die += kSpitLifetime;
+			theTempEntity->hitcallback = WebHit;
+			theTempEntity->flags |= (FTENT_COLLIDEALL | FTENT_SPRANIMATE | FTENT_SPRANIMATELOOP/* | FTENT_PERSIST*/);
+			theTempEntity->clientIndex = inArgs->entindex;	// Entity to ignore collisions with
+			theTempEntity->entity.curstate.framerate = 30;
+			theTempEntity->frameMax = 4;//theModel->numframes;
+			
+			// Temp entities interpret baseline origin as velocity.
+			Vector theBaseVelocity;
+			VectorScale(inArgs->velocity, kWebProjectileParentVelocityScalar, theBaseVelocity);
+			
+			Vector theStartVelocity;
+			VectorMA(theBaseVelocity, kWebProjectileVelocity, forward, theStartVelocity);
+			
+			VectorCopy(theStartVelocity, theTempEntity->entity.baseline.origin);
+			VectorCopy(theStartVelocity, theTempEntity->entity.baseline.velocity);
+		}
+	}
+	
+	// General x-punch axis
+	if ( EV_IsLocal( idx ) )
+	{
+		float theHalfSpread = kWebGXPunch/2.0f;
+		if(theHalfSpread > 0.0f)
+		{
+			V_PunchAxis( 0, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+		}
+	}
+}
+
+//void EV_Babbler(struct event_args_s* inArgs)
+//{
+//	ASSERT(inArgs);
+//	
+//	// Play attack animation and add muzzle flash
+//	int idx = inArgs->entindex;
+//	
+//	// Play attack sound
+//	gEngfuncs.pEventAPI->EV_PlaySound(idx, inArgs->origin, CHAN_WEAPON, kBabblerGunSound, inArgs->fparam1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+//	
+//	if ( EV_IsLocal( idx ) )
+//	{
+//		float theHalfSpread = kBabblerXPunch/2.0f;
+//		if(theHalfSpread > 0.0f)
+//		{
+//			V_PunchAxis( 0, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+//		}
+//
+//		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+//	}
+//}
+
+
+
+void EV_PrimalScream(struct event_args_s* inArgs)
+{
+	int idx = inArgs->entindex;
+	
+	// Play attack sound
+	
+	// You can hear this waaay far off
+	float theFalloffFactor = .5f;
+	gEngfuncs.pEventAPI->EV_PlaySound(idx, inArgs->origin, CHAN_VOICE, kPrimalScreamSound, 1.0f, theFalloffFactor, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+
+	if (EV_IsLocal(inArgs->entindex))
+	{
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+	}
+}
+
+void EV_StopScream(struct event_args_s* inArgs)
+{
+	int idx = inArgs->entindex;
+	
+	gEngfuncs.pEventAPI->EV_StopSound(idx, CHAN_VOICE, kPrimalScreamSound);
+}
+
+
+void EV_SpikeGun(struct event_args_s* inArgs)
+{
+    //static int theTracerCount[ 32 ];
+
+	// Play attack animation and add muzzle flash
+	int idx;
+	vec3_t origin;
+	vec3_t angles;
+	vec3_t velocity;
+	
+	vec3_t vecSrc, vecAiming;
+	vec3_t up, right, forward;
+	
+	idx = inArgs->entindex;
+	VectorCopy( inArgs->origin, origin );
+	VectorCopy( inArgs->angles, angles );
+	VectorCopy( inArgs->velocity, velocity );
+	
+	//AngleVectors( angles, forward, right, up );
+	gEngfuncs.pfnAngleVectors(angles, forward, right, up);
+	
+//	if ( EV_IsLocal( idx ) )
+//	{
+//		gEngfuncs.pEventAPI->EV_WeaponAnimation(5 + + gEngfuncs.pfnRandomLong(0,2), 2);
+//	}
+	
+	// Play one of basic attack sounds
+	float theVolume = inArgs->fparam1;
+	float theAttenuation = 1.2f;
+	
+	char* theSoundToPlay = kSpikeFireSound;
+	
+	int theUpperBound = 30;
+	int thePitch = 100 + (gEngfuncs.pfnRandomLong(0, theUpperBound) - theUpperBound/2);
+	gEngfuncs.pEventAPI->EV_PlaySound(idx, origin, CHAN_WEAPON, theSoundToPlay, theVolume, theAttenuation, 0, thePitch);
+	
+	EV_GetGunPosition( inArgs, vecSrc, origin );
+	VectorCopy( forward, vecAiming );
+
+	// Create ricochet and spike hit decals
+	EV_HLDM_FireBulletsPlayer( idx, forward, right, up, 1, vecSrc, vecAiming, kSpikeRange, BULLET_MONSTER_9MM, 0, NULL, kSpikeSpread, inArgs->iparam1);
+
+//	// Create two spike projectiles, flying forward until they hit something
+//	//for(int i = 0; i < 2; i++)
+//	//{
+//		vec3_t theEntStartPos = gPredictedPlayerOrigin;
+//	
+//		//TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->CL_TempEntAlloc(theEntStartPos, theModel);
+//		vec3_t theSpikeAngles;
+//		VectorAngles(forward, theSpikeAngles);
+//		
+//		TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->R_TempModel(gPredictedPlayerOrigin, forward, theSpikeAngles, 100, gEngfuncs.pEventAPI->EV_FindModelIndex(kSpikeProjectileModel), 0);
+//		if(theTempEntity)
+//		{
+//			vec3_t theStartPos, theEndPos;
+//			EV_GetGunPosition(inArgs, vecSrc, inArgs->origin);
+//			VectorMA(vecSrc, kSpikeBarrelLength, forward, theStartPos);
+//			
+//			VectorCopy(theStartPos, theTempEntity->entity.origin);
+//			VectorCopy(theStartPos, theTempEntity->entity.prevstate.origin);
+//			VectorCopy(theStartPos, theTempEntity->entity.curstate.origin);
+//			theTempEntity->hitcallback = SpikeHit;
+//			theTempEntity->flags |= (FTENT_COLLIDEALL | FTENT_COLLIDEKILL/* | FTENT_PERSIST*/);
+//			//theTempEntity->entity.curstate.framerate = 30;
+//			//theTempEntity->frameMax = 4;//theModel->numframes;
+//			
+//			// Temp entities interpret baseline origin as velocity.
+//			Vector theStartVelocity;
+//			VectorScale(forward, kSpikeVelocity, theStartVelocity);
+//			
+//			VectorCopy(theStartVelocity, theTempEntity->entity.baseline.origin);
+//			VectorCopy(theStartVelocity, theTempEntity->entity.baseline.velocity);
+//
+//			// Set orientation
+//			//VectorCopy(inArgs->angles, theTempEntity->entity.angles);
+//		}
+//	//}
+	
+	////EV_HLDM_FireBullets( idx, forward, right, up, 1, vecSrc, vecAiming, kMGRange, BULLET_PLAYER_MP5, theTracerFreq, &tracerCount[idx-1] );
+	//EV_HLDM_FireBullets( idx, forward, right, up, 1, vecSrc, vecAiming, kSpikeRange, BULLET_MONSTER_9MM, 0, NULL /* &theTracerCount[0]*/, 0.0f, 0.0f);
+	
+	// General x-punch axis
+	if ( EV_IsLocal( idx ) )
+	{
+		// Multiply punch by upgrade level
+		float theHalfSpread = (kSpikePunch/2.0f);
+		if(theHalfSpread > 0.0f)
+		{
+			V_PunchAxis( 0, gEngfuncs.pfnRandomFloat( -theHalfSpread, theHalfSpread ) );
+		}
+
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(inArgs->iparam2, 2);
+	}
+}
+
+//void EV_HiveHit(struct event_args_s* inArgs)
+//{
+//	// when a hive comes under attack, let all the minions know it
+//
+//	// iparam1 is the hurt sound to play
+//
+//
+//
+//	const float kPunchRange = 3.0f;
+//	
+//	V_PunchAxis(0, gEngfuncs.pfnRandomFloat(-kPunchRange, kPunchRange));
+//	V_PunchAxis(1, gEngfuncs.pfnRandomFloat(-kPunchRange, kPunchRange));
+//	V_PunchAxis(2, gEngfuncs.pfnRandomFloat(-kPunchRange, kPunchRange));
+//}	
+
+void EV_EmptySound(struct event_args_s* inArgs)
+{
+	int thePitch = 100;
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_WEAPON, kEmptySound, .8f, ATTN_NORM, 0, thePitch);
+}
+
+void EV_NumericalInfo(struct event_args_s* inArgs)
+{
+	// Can't send easily send events to one team only, so only draw them for the right team
+	cl_entity_s* theLocalPlayer = gEngfuncs.GetLocalPlayer();
+	if(theLocalPlayer)
+	{
+		int theTeamNumber = inArgs->iparam2;
+		if((theLocalPlayer->curstate.team == theTeamNumber) || (theTeamNumber == 0))
+		{
+			float theNumber = inArgs->fparam1;
+			int theEventType = inArgs->iparam1;
+			gHUD.AddNumericalInfoMessage(inArgs->origin, theNumber, theEventType);
+		}
+	}
+}
+
+void EV_InvalidAction(struct event_args_s* inArgs)
+{
+	int thePitch = 100;
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_WEAPON, kInvalidSound, .8f, ATTN_NORM, 0, thePitch);
+}
+
+void EV_Particle(struct event_args_s* inArgs)
+{
+	// Read template
+	uint32 theTemplateIndex = inArgs->iparam1;
+	
+	// Lookup template
+	const AvHParticleTemplate* theTemplate = gParticleTemplateList.GetTemplateAtIndex(theTemplateIndex);
+	if(theTemplate)
+	{
+		string theTemplateName = theTemplate->GetName();
+		AvHParticleSystemManager::Instance()->CreateParticleSystem(theTemplateName, inArgs->origin);
+	}
+}
+
+void EV_DistressBeacon(struct event_args_s* inArgs)
+{
+	// Play distress beacon sound
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_BODY, kDistressBeaconSound, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+	
+	// Read time before distress beacon will end
+	int theDuration = inArgs->iparam1;
+
+	// Create blinking light that will die in that time
+	if(CVAR_GET_FLOAT(kvDynamicLights))
+	{
+		dlight_t* theLight = gEngfuncs.pEfxAPI->CL_AllocDlight(21);
+		VectorCopy(inArgs->origin, theLight->origin);
+		theLight->radius = 250;
+		theLight->color.r = 250;
+		theLight->color.g = 180;
+		theLight->color.b = 180;
+		
+		// don't die for forseeable future
+		theLight->die = gEngfuncs.GetClientTime() + theDuration;
+	}
+}
+
+void EV_WeaponAnimation(struct event_args_s* inArgs)
+{
+	// General x-punch axis
+	if(EV_IsLocal(inArgs->entindex))
+	{
+		int theAnimation = max(inArgs->iparam2, 0);
+		gEngfuncs.pEventAPI->EV_WeaponAnimation(theAnimation, 2);
+	}
+}
+
+
+void EV_LevelUp(struct event_args_s* inArgs)
+{
+	// General x-punch axis
+	if(EV_IsLocal(inArgs->entindex))
+	{
+	}
+	
+
+	cl_entity_t* thePlayer = GetEntity(inArgs->entindex);
+	// Play sound
+	int theIsMarine = inArgs->iparam1;
+	const char* theSound = theIsMarine ? kLevelUpMarineSound : kLevelUpAlienSound;
+
+	float theSilenceVolumeFactor = theIsMarine ? 1.0 : AvHPlayerUpgrade::GetSilenceVolumeLevel((AvHUser3)thePlayer->curstate.iuser3, thePlayer->curstate.iuser4);
+
+	gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, inArgs->origin, CHAN_VOICE, theSound, theSilenceVolumeFactor, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+	
+	// Play nice particle effect?
+}
diff --git a/main/source/mod/AvHEvents.h b/main/source/mod/AvHEvents.h
new file mode 100644
index 00000000..8d182083
--- /dev/null
+++ b/main/source/mod/AvHEvents.h
@@ -0,0 +1,39 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHEvents.h$
+// $Date: 2002/10/24 21:23:44 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHEvents.h,v $
+// Revision 1.11  2002/10/24 21:23:44  Flayra
+// - Reworked jetpacks
+//
+// Revision 1.10  2002/09/09 19:50:35  Flayra
+// - Reworking jetpack effects, still needs more work
+//
+// Revision 1.9  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVHEVENTS_H
+#define AVHEVENTS_H
+
+#include "mod/AvHConstants.h"
+#include "particles/p_vector.h"
+
+void DrawBlips(const pVector& inView);
+void DrawDebugEffects();
+void DrawMarineLights(const pVector& inView);
+void DrawOrdersForPlayers(EntityListType& inPlayerList);
+void DrawRangeIndicator();
+//void EndJetpackEffects(int inIndex = -1);
+//void UpdateJetpackLights();
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHFlameGun.cpp b/main/source/mod/AvHFlameGun.cpp
new file mode 100644
index 00000000..f0292abe
--- /dev/null
+++ b/main/source/mod/AvHFlameGun.cpp
@@ -0,0 +1,115 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHFlameGun.cpp $
+// $Date: 2002/06/03 16:39:09 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHFlameGun.cpp,v $
+// Revision 1.7  2002/06/03 16:39:09  Flayra
+// - Added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.6  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHMarineWeapons.h"
+#include "mod/AvHPlayer.h"
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "cl_dll/vector_util.h"
+#include "mod/AvHMarineWeapons.h"
+
+LINK_ENTITY_TO_CLASS(kwFlameGun, AvHFlameGun);
+void V_PunchAxis( int axis, float punch );
+
+BOOL AvHFlameGun::Deploy()
+{
+	return DefaultDeploy(kFGVModel, kFGPModel, this->GetDeployAnimation(), kFGAnimExt);
+}
+
+void AvHFlameGun::Init()
+{
+	this->mRange = kFGRange;
+	this->mDamage = kFGDamage;
+	this->mROF = kFGROF;
+}
+
+int	AvHFlameGun::GetBarrelLength() const
+{
+	return kFGBarrelLength;
+}
+
+int AvHFlameGun::GetItemInfo(ItemInfo *p)
+{
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = "FGAmmo";
+	p->iMaxAmmo1 = kFGMaxAmmo;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = -1;
+	p->iMaxClip = kFGMaxClip;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY;
+	p->iSlot = 1;
+	p->iPosition = 5;
+
+	//p->iId = m_iId = AVH_WEAPON_FLAMER;
+	p->iId = m_iId = AVH_WEAPON_GRENADE_GUN;
+	ASSERT(false);
+		
+	p->iWeight = 10;
+
+	return 1;
+}
+
+int	AvHFlameGun::iItemSlot(void)
+{
+	return 2;
+}
+
+void AvHFlameGun::Precache()
+{
+	AvHMarineWeapon::Precache();
+
+	PRECACHE_MODEL(kFGVModel);
+	PRECACHE_MODEL(kFGWModel);
+	PRECACHE_MODEL(kFGPModel);
+	PRECACHE_MODEL(kFGEjectModel);
+
+	PRECACHE_SOUND(kFGFireSound1);
+	PRECACHE_SOUND(kFGFireSound2);
+	PRECACHE_SOUND(kFGFireSound3);
+	PRECACHE_SOUND(kFGFireSound4);
+
+	PRECACHE_SOUND(kFGReloadSound);
+
+	this->mEvent = PRECACHE_EVENT(1, kFGEventName);
+}
+
+void AvHFlameGun::Spawn() 
+{ 
+    AvHMarineWeapon::Spawn(); 
+
+	Precache();
+
+	//this->m_iId = AVH_WEAPON_FLAMER;
+	ASSERT(false);
+	this->m_iDefaultAmmo = kFGMaxClip;
+
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsFlameGun);
+
+	SET_MODEL(ENT(this->pev), kFGWModel);
+
+	FallInit();// get ready to fall down.
+} 
diff --git a/main/source/mod/AvHFont.cpp b/main/source/mod/AvHFont.cpp
new file mode 100644
index 00000000..dff0da42
--- /dev/null
+++ b/main/source/mod/AvHFont.cpp
@@ -0,0 +1,195 @@
+#include "mod/AvHFont.h"
+#include "mod/AvHSpriteAPI.h"
+#include "mod/AvHConstants.h"
+
+#include "cl_dll/cl_util.h"
+
+// Number of characters per row in the font sprite.
+const int kNumCharsPerRow = 16;
+
+AvHFont::AvHFont()
+{
+    mSprite = 0;
+    mSpriteWidth = 0;
+    mSpriteHeight = 0;
+}
+
+bool AvHFont::Load(const char* inFileName)
+{
+    
+    std::string theSpriteFileName;
+    theSpriteFileName  = inFileName;
+    theSpriteFileName += ".spr";
+
+    std::string theWidthFileName;
+    theWidthFileName  = getModDirectory();
+    theWidthFileName += "/";
+    theWidthFileName += inFileName;
+    theWidthFileName += ".dat";
+    
+    FILE* file = fopen(theWidthFileName.c_str(), "rb");
+
+    if (file != NULL)
+    {
+
+        struct LABC
+        {
+            long a;
+            long b;
+            long c;
+        };
+
+        LABC labc[256];
+        fread(labc, sizeof(LABC), 256, file);
+
+        for (int i = 0; i < 256; ++i)
+        {
+            mCharWidth[i].a = labc[i].a;
+            mCharWidth[i].b = labc[i].b;
+            mCharWidth[i].c = labc[i].c;
+        }
+        
+        fclose(file);
+    }
+    else
+    {
+        return false;
+    }
+
+    mSprite = Safe_SPR_Load(theSpriteFileName.c_str());
+
+    if (mSprite != 0)
+    {
+        mSpriteWidth  = SPR_Width(mSprite, 0);
+        mSpriteHeight = SPR_Height(mSprite, 0);
+    }
+    
+    return mSprite != 0;
+
+}
+
+int AvHFont::GetStringWidth(const char* inString) const
+{
+
+    int theWidth = 0;
+
+    for (int i = 0; inString[i] != 0 && inString[i] != '\n'; ++i)
+    {
+        char c = inString[i];
+        
+        if (c < 32)
+        {
+            // Unprintable.
+            continue;
+        }
+
+        theWidth += mCharWidth[c].a + mCharWidth[c].b + mCharWidth[c].c;
+    }
+
+    return theWidth;
+
+}
+
+int AvHFont::GetCharacterWidth(char c) const
+{
+    return mCharWidth[c].a + mCharWidth[c].b + mCharWidth[c].c;
+}
+
+int AvHFont::GetStringHeight() const
+{
+    return 16;
+}
+
+int AvHFont::DrawString(int inX, int inY, const char* inString, int r, int g, int b, int inRenderMode) const
+{
+
+    int theX = inX;
+    int theY = inY;
+        
+    int theCharHeight = GetStringHeight();
+
+    AvHSpriteBeginFrame();
+
+    AvHSpriteSetVGUIOffset(0,0);
+
+    AvHSpriteSetRenderMode(inRenderMode);
+    AvHSpriteSetColor(r / 256.0f, g / 256.0f, b / 256.0f);
+
+    int charWidth  = mSpriteWidth / 16;
+    int charHeight = mSpriteHeight / 16;
+
+    for (int i = 0; inString[i] != 0 && inString[i] != '\n'; ++i)
+    {
+
+        unsigned char c = inString[i];
+
+        if (c < 32)
+        {
+            // Unprintable.
+            continue;
+        }
+
+        theX += mCharWidth[c].a;
+        
+        float theU = ((c % kNumCharsPerRow) * charWidth) / float(mSpriteWidth);
+        float theV = ((c / kNumCharsPerRow) * charHeight) / float(mSpriteHeight);
+
+        AvHSpriteDraw(mSprite, 0, theX, theY, theX + mCharWidth[c].b, theY + theCharHeight,
+            theU, theV, theU + mCharWidth[c].b / 256.0f, theV + theCharHeight / 256.0f);
+        
+        theX += mCharWidth[c].b + mCharWidth[c].c;
+
+    }
+    
+    AvHSpriteEndFrame();
+    AvHSpriteSetColor(1, 1, 1);
+
+    return theX;
+
+}
+
+int AvHFont::DrawStringReverse(int inX, int inY, const char* inString, int r, int g, int b, int inRenderMode) const
+{
+
+    int length = strlen(inString) - 1;
+
+    int theX = inX;
+    int theY = inY;
+        
+    int theCharHeight = GetStringHeight();
+
+    AvHSpriteBeginFrame();
+    AvHSpriteSetRenderMode(inRenderMode);
+    AvHSpriteSetColor(r / 256.0f, g / 256.0f, b / 256.0f);
+
+    int charWidth  = mSpriteWidth / 16;
+    int charHeight = mSpriteHeight / 16;
+
+    for (int i = length; i >= 0; --i)
+    {
+        
+        char c = inString[i];
+
+        if (c < 32)
+        {
+            // Unprintable.
+            continue;
+        }
+
+        theX -= mCharWidth[c].c + mCharWidth[c].b;
+        
+        float theU = ((c % kNumCharsPerRow) * charWidth) / float(mSpriteWidth);
+        float theV = ((c / kNumCharsPerRow) * charHeight) / float(mSpriteHeight);
+
+        AvHSpriteDraw(mSprite, 0, theX, theY, theX + mCharWidth[c].b, theY + theCharHeight,
+            theU, theV, theU + mCharWidth[c].b / 256.0f, theV + theCharHeight / 256.0f);
+
+        theX -= mCharWidth[c].a;
+
+    }
+
+    AvHSpriteEndFrame();
+
+    return theX;
+
+}
\ No newline at end of file
diff --git a/main/source/mod/AvHFont.h b/main/source/mod/AvHFont.h
new file mode 100644
index 00000000..a3255a0b
--- /dev/null
+++ b/main/source/mod/AvHFont.h
@@ -0,0 +1,69 @@
+#ifndef AVH_FONT_H
+#define AVH_FONT_H
+
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+
+class AvHFont
+{
+
+public:
+
+    /**
+     * Constructor.
+     */
+    AvHFont();
+
+    /**
+     * Loads the font. Returns true if the font was loaded or false if
+     * otherwise.
+     */
+    bool Load(const char* inFileName);
+
+    /**
+     * Returns the number of pixels wide a particlar string is when
+     * rendered to the screen.
+     */
+    int GetStringWidth(const char* inString) const;
+
+    /**
+     * Returns the number of pixels wide a particlar c is when
+     * rendered to the screen.
+     */
+    int GetCharacterWidth(char c) const;
+
+    /**
+     * Returns the number of pixels wide a string is when rendered to
+     * the screen.
+     */
+    int GetStringHeight() const;
+
+    /**
+     *
+     */
+    int DrawString(int inX, int inY, const char* inString, int r, int g, int b, int inRenderMode = kRenderTransAdd) const;
+
+    /**
+     *
+     */
+    int DrawStringReverse(int inX, int inY, const char* inString, int r, int g, int b, int inRenderMode = kRenderTransAdd) const;
+
+private:
+
+    HSPRITE mSprite;
+
+    int mSpriteWidth;
+    int mSpriteHeight;
+
+    struct CharWidth
+    {
+        int a;
+        int b;
+        int c;
+    };
+
+    CharWidth mCharWidth[256];
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHGamerules.cpp b/main/source/mod/AvHGamerules.cpp
new file mode 100644
index 00000000..7f66cb74
--- /dev/null
+++ b/main/source/mod/AvHGamerules.cpp
@@ -0,0 +1,4479 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: NS high-level game rules
+//
+// $Workfile: AvHGamerules.cpp $
+// $Date: 2002/11/22 21:23:55 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHGamerules.cpp,v $
+// Revision 1.79  2002/11/22 21:23:55  Flayra
+// - Players can't switch teams after seeing a team
+// - Adminmod fixes
+// - Fixed bug where players were only doing friendly-fire damage to world entities (ie, 33% to doors and breakables)
+// - Changed allowed team discrepancy from 2 to 1.  Affects casual model only.
+// - Fixes for timelimit
+// - A team now automatically wins if they have 4 or more players then another team (generally because the losing team starts quitting).  Affects casual mode only.
+//
+// Revision 1.78  2002/11/15 23:41:52  Flayra
+// - Spectators get end-game victory sound and message
+//
+// Revision 1.77  2002/11/15 23:31:12  Flayra
+// - Added "ready" verification for tourny mode
+//
+// Revision 1.76  2002/11/15 04:46:18  Flayra
+// - Changes to for profiling and for improving AddToFullPack performance
+//
+// Revision 1.75  2002/11/12 18:44:10  Flayra
+// - Allow team unbalancing in tourny mode (assume everyone knows what they're doing)
+//
+// Revision 1.74  2002/11/12 06:21:12  Flayra
+// - More AdminMod fixes
+//
+// Revision 1.73  2002/11/12 02:24:50  Flayra
+// - HLTV updates
+// - Remove babblers on level clean up
+// - Don't dynamic_cast all entities, it's causes AdminMod to crash
+// - Log end-game stats in standard way
+// - Potential fix for server overflow after big games
+//
+// Revision 1.72  2002/11/06 01:40:01  Flayra
+// - Damage refactoring (TakeDamage assumes caller has already adjusted for friendly fire, etc.)
+//
+// Revision 1.71  2002/11/05 06:17:25  Flayra
+// - Balance changes
+//
+// Revision 1.70  2002/11/03 04:49:44  Flayra
+// - Moved constants into .dll out of .cfg
+// - Particle systems update much less often, big optimization
+// - Team balance fixes
+//
+// Revision 1.69  2002/10/28 20:34:53  Flayra
+// - Reworked game reset slightly, to meter out network usage during game reset
+//
+// Revision 1.68  2002/10/24 21:25:42  Flayra
+// - Skin fixes (random number generator returning all 0s at some stages of the engine)
+// - Builders don't get points for building anymore
+// - Removed code that was never getting called in ClientConnected (AvHPlayer isn't built yet)
+// - Remove armor and jetpacks on round reset
+// - Update particle systems again, for particle culling
+// - Unbuilt hives show up on hive sight
+//
+// Revision 1.67  2002/10/20 21:10:41  Flayra
+// - Optimizations
+//
+// Revision 1.66  2002/10/20 17:24:41  Flayra
+// - Redid performance improvement (agh)
+//
+// Revision 1.65  2002/10/20 16:36:09  Flayra
+// - Added #ifdef for network metering
+// - Added particles back in
+//
+// Revision 1.64  2002/10/19 22:33:44  Flayra
+// - Various server optimizations
+//
+// Revision 1.63  2002/10/18 22:19:11  Flayra
+// - Add sensory chamber saying
+//
+// Revision 1.62  2002/10/16 20:52:46  Flayra
+// - Fixed bug introduced with secondary weapons
+//
+// Revision 1.61  2002/10/16 00:56:22  Flayra
+// - Prototyped curl support for NS stats
+// - Added player auth stuff (server string)
+// - Added concept of secondary weapons
+// - Removed disconnect sound
+// - Fixed MOTD
+// - Added "order needed" alert
+//
+// Revision 1.60  2002/10/07 17:49:50  Flayra
+// - Play marine building alerts properly
+//
+// Revision 1.59  2002/10/03 18:44:03  Flayra
+// - Play disconnected sound quieter because of mass exodus effect
+// - Added functionality to allow players to join a team and run around freely before game countdown starts.  Game resets when countdown starts.
+// - Added new alien alerts
+//
+// Revision 1.58  2002/09/25 20:44:22  Flayra
+// - Removed old LOS code
+// - Added extra alerts, allow alien code to peacefully coexist
+//
+// Revision 1.57  2002/09/23 22:16:01  Flayra
+// - Added game victory status logging
+// - Fixed commander alerts
+// - Added new alerts
+// - Particle system changes, only send them down when connecting or map changes
+//
+// Revision 1.56  2002/09/09 19:51:13  Flayra
+// - Removed gamerules dictating alien respawn time, now it's in server variable
+//
+// Revision 1.55  2002/08/31 18:01:01  Flayra
+// - Work at VALVe
+//
+// Revision 1.54  2002/08/16 02:35:09  Flayra
+// - Blips now update once per second, instead of once per player per second
+//
+// Revision 1.53  2002/08/09 00:58:35  Flayra
+// - Removed error condition for map validity, allow marines to have only one primary weapon, adjust weapon weights
+//
+// Revision 1.52  2002/08/02 22:00:24  Flayra
+// - New alert system that's not so annoying and is more helpful.  Tweaks for new help system.
+//
+// Revision 1.51  2002/07/25 16:57:59  flayra
+// - Linux changes
+//
+// Revision 1.50  2002/07/24 18:45:41  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.49  2002/07/23 17:03:20  Flayra
+// - Resource model changes, refactoring spawning to fix level 5 redemption bug without code duplication
+//
+// Revision 1.48  2002/07/10 14:40:48  Flayra
+// - Profiling and performance tweaks
+//
+// Revision 1.47  2002/07/08 16:59:14  Flayra
+// - Don't pick up empty weapons, added handicapping, check map validity when loaded, reset players just like all other entities, fixed spawn bug code where it was counting non-team spawns
+//
+// Revision 1.46  2002/07/01 21:32:43  Flayra
+// - Visibility update now updates world for primal scream and umbra, don't update reliable network messages every tick (big optimization)
+//
+// Revision 1.45  2002/06/25 17:59:03  Flayra
+// - Added timelimit (switches map after a game finishes), added info_locations, tried adding team balance (not sure it works yet), give resources for kills
+//
+// Revision 1.44  2002/06/10 19:54:29  Flayra
+// - New minimap support, more attempts to fix picking up of alien weapons
+//
+// Revision 1.43  2002/06/03 16:45:20  Flayra
+// - Breakables and buttons take damage like they should, points added for buildables correctly, weapon weights tweaked
+//
+// Revision 1.42  2002/05/28 17:40:32  Flayra
+// - Minimap refactoring, hive sight "under attack", reinforcement refactoring, don't delete entities marked as permanent (it was deleting hives!), allow players to join the opposite team until this can be fixed for real (server retry gets around this code so this is just an inconvenience), things build fast with cheats
+//
+// Revision 1.41  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "build.h"
+#include "util/nowarnings.h"
+#include "extdll.h"
+#include "dlls/util.h"
+#include "cbase.h"
+#include "player.h"
+#include "weapons.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHAlienEquipmentConstants.h"
+#include "mod/AvHEntities.h"
+#include "mod/AvHParticleTemplateServer.h"
+#include "mod/AvHPlayer.h"
+#include "dlls/client.h"
+#include "dlls/game.h"
+#include "dlls/util.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHServerVariables.h"
+#include "mod/AvHMessage.h"
+#include "mod/AvHSoundListManager.h"
+#include "mod/AvHMovementUtil.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHTitles.h"
+#include "mod/AvHParticleSystemManager.h"
+#include "mod/AvHMarineEquipment.h"
+#include "mod/AvHEntities.h"
+#include "mod/AvHVoiceHelper.h"
+#include "common/director_cmds.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHDramaticPriority.h"
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHHulls.h"
+#include "textrep/TRFactory.h"
+#include <stdio.h>
+#include "mod/NetworkMeter.h"
+#include "mod/AvHScriptManager.h"
+#include "mod/AvHCloakable.h"
+#include "mod/AvHCommandConstants.h"
+#include "mod/AvHAlert.h"
+#include "mod/AvHParticleConstants.h"
+#include "util/MathUtil.h"
+#include "mod/UPPUtil.h"
+
+AvHSoundListManager						gSoundListManager;
+extern int								gmsgUpdateCountdown;
+extern int								gmsgSetGammaRamp;
+extern int								gmsgServerName;
+extern int								gmsgGameStatus;
+extern int								gmsgGameMode;
+extern int                              gmsgServerVar;
+extern int                              gmsgTeamInfo;
+extern AvHVoiceHelper					gVoiceHelper;
+CVoiceGameMgr							g_VoiceGameMgr;
+extern cvar_t							allow_spectators;
+extern cvar_t							avh_autoconcede;
+extern cvar_t							avh_limitteams;
+//extern cvar_t							avh_teamsizehandicapping;
+extern cvar_t							avh_team1damagepercent;
+extern cvar_t							avh_team2damagepercent;
+extern cvar_t							avh_drawinvisible;
+extern cvar_t							avh_uplink;
+extern cvar_t							avh_gametime;
+extern cvar_t							avh_ironman;
+extern cvar_t                           avh_mapvoteratio;
+
+#ifndef USE_UPP
+AuthMaskListType						gAuthMaskList;
+#endif
+
+extern const char* kSteamIDPending;
+extern const char* kSteamIDLocal;
+extern const char* kSteamIDBot;
+extern const char* kSteamIDInvalidID;
+extern const char* kSteamIDDefault;
+
+BOOL IsSpawnPointValid( CBaseEntity *pPlayer, CBaseEntity *pSpot );
+inline int FNullEnt( CBaseEntity *ent ) { return (ent == NULL) || FNullEnt( ent->edict() ); }
+//extern void ResetCachedEntities();
+
+// Allow assignment within conditional
+#pragma warning (disable: 4706)
+
+// Quick way to define or undefine security
+extern AvHParticleTemplateListServer	gParticleTemplateList;
+extern cvar_t							avh_deathmatchmode;
+extern cvar_t							avh_countdowntime;
+extern int								gCommanderPointsAwardedEventID;
+extern cvar_t							avh_networkmeterrate;
+
+std::string gPlayerNames[128];
+cvar_t* cocName;
+cvar_t* cocExp;
+int gStartPlayerID = 0;
+int gServerTick = 0;
+int gUpdateEntitiesTick = 0;
+bool gServerUpdate = false;
+float kPVSCoherencyTime = 1.0f;
+extern int kNumReturn0;
+extern int kNumReturn1;
+extern int kNumCached;
+extern int kNumComputed;
+extern int kMaxE;
+int kServerFrameRate = 0;
+
+#ifdef PROFILE_BUILD
+extern cvar_t avh_performance;
+int kProfileRunConfig = 0xFFFFFFFF;
+#endif
+
+const AvHMapExtents& GetMapExtents()
+{
+	return GetGameRules()->GetMapExtents();
+}
+
+void InstallGameRules( void )
+{
+	SERVER_COMMAND( "exec game.cfg\n" );
+	SERVER_EXECUTE( );
+
+    // TODO: Add in check for tourny rules here
+
+	//	if ( !gpGlobals->deathmatch )
+	//	{
+	//		// generic half-life
+	//		return new CHalfLifeRules;
+	//	}
+	//	else
+	//	{
+	//		if ( CVAR_GET_FLOAT( "mp_teamplay" ) > 0 )
+	//		{
+	//			// teamplay
+	//			return new CHalfLifeTeamplay;
+	//		}
+	//		if ((int)gpGlobals->deathmatch == 1)
+	//		{
+	//			// vanilla deathmatch
+	//			return new CHalfLifeMultiplay;
+	//		}
+	//		else
+	//		{
+	//			// vanilla deathmatch??
+	//			return new CHalfLifeMultiplay;
+	//		}
+	//	}
+
+    AvHGamerules* theNewGamerules = new AvHGamerules;
+	SetGameRules(theNewGamerules);
+}
+
+static AvHGamerules* sGameRules = NULL;
+
+// Global initializer, because we don't want it to be reset when game rules are recreated
+unsigned int gTimeLastUpdatedUplink = 0;
+
+AvHGamerules* GetGameRules()
+{
+	if(!g_pGameRules)
+	{
+		InstallGameRules();
+	}
+
+	if(!sGameRules)
+	{
+		sGameRules = dynamic_cast<AvHGamerules*>(g_pGameRules);
+	}
+	ASSERT(sGameRules);
+
+	return sGameRules;
+}
+
+void SetGameRules(AvHGamerules* inGameRules)
+{
+	sGameRules = inGameRules;
+	g_pGameRules = inGameRules;
+}
+
+AvHGamerules::AvHGamerules() : mTeamOne(TEAM_ONE), mTeamTwo(TEAM_TWO)
+{
+	this->mGameStarted = false;
+	this->mPreserveTeams = false;
+
+	this->mTeamOne.SetTeamType(AVH_CLASS_TYPE_MARINE);
+	this->mTeamTwo.SetTeamType(AVH_CLASS_TYPE_ALIEN);
+
+	this->mVictoryTime = -1;
+	this->mMapMode = MAP_MODE_UNDEFINED;
+	this->mLastParticleUpdate = -1;
+	this->mLastNetworkUpdate = -1;
+	this->mLastWorldEntityUpdate = -1;
+	this->mLastMapChange = -1;
+	this->mTimeOfLastPlaytestUpdate = -1;
+	this->mTimeOfLastHandicapUpdate = -1;
+	this->mMapGamma = kDefaultMapGamma;
+	this->mCombatAttackingTeamNumber = TEAM_IND;
+	this->mCheats.clear();
+	this->mSpawnEntity = NULL;
+
+    RegisterServerVariable(kvBlockScripts);
+	RegisterServerVariable(kvTournamentMode);
+    RegisterServerVariable(kvTeam1DamagePercent);
+    RegisterServerVariable(kvTeam2DamagePercent);
+    RegisterServerVariable("sv_cheats");
+
+	g_VoiceGameMgr.Init(&gVoiceHelper, gpGlobals->maxClients);
+
+	#ifdef DEBUG
+	avh_drawinvisible.value = 1;
+	#endif
+
+	#ifdef AVH_PLAYTEST_BUILD
+	this->ReadBalanceData();
+	#endif
+
+	this->ResetGame();
+}
+
+AvHGamerules::~AvHGamerules()
+{
+	int a = 0;
+}
+
+
+int	AvHGamerules::AmmoShouldRespawn( CBasePlayerAmmo *pAmmo )
+{
+	return GR_AMMO_RESPAWN_NO;
+}
+
+int	AvHGamerules::WeaponShouldRespawn(CBasePlayerItem *pWeapon)
+{
+	return GR_WEAPON_RESPAWN_NO;
+}
+
+#ifndef USE_UPP //players are authorized by UPP now.
+bool AvHGamerules::PerformHardAuthorization(AvHPlayer* inPlayer) const
+{
+	bool theAuthorized = true;
+
+	#ifdef AVH_SECURE_PRERELEASE_BUILD
+	if(!this->GetIsClientAuthorizedToPlay(inPlayer->edict(), false, true))
+	{
+		char* theMessage = UTIL_VarArgs(
+			"%s<%s> is not authorized to play on beta NS servers.\n",
+			STRING(inPlayer->pev->netname),
+			AvHSUGetPlayerAuthIDString(inPlayer->edict()).c_str()
+			);
+		ALERT(at_logged, theMessage);
+
+		// Boot player off server
+		inPlayer->Kick();
+
+		theAuthorized = false;
+	}
+	#endif
+
+	return theAuthorized;
+}
+#endif
+// Sets the player up to join the team, though they may not respawn in immediately depending
+// on the ruleset and the state of the game.  Assumes 1 or a 2 for team number
+bool AvHGamerules::AttemptToJoinTeam(AvHPlayer* inPlayer, AvHTeamNumber inTeamToJoin, bool inDisplayErrorMessage)
+{
+	bool theSuccess = false;
+	string theErrorString;
+
+    if(inPlayer->pev->flags & FL_FAKECLIENT)
+    {
+        int a = 0;
+    }
+    else
+    {
+        int a = 0;
+    }
+
+	// Check authorization in secure build
+#ifdef USE_UPP
+	if(!inPlayer->GetAuthorized())
+	{
+		UPPUtil_HandleUnauthorizedJoinTeamAttempt(inPlayer,inTeamToJoin);
+	}
+	else
+#else
+	if(this->PerformHardAuthorization(inPlayer))
+#endif
+	{
+		AvHTeamNumber theOtherTeam = TEAM_IND;
+		if(inTeamToJoin == TEAM_ONE)
+		{
+			theOtherTeam = TEAM_TWO;
+		}
+		else if(inTeamToJoin == TEAM_TWO)
+		{
+			theOtherTeam = TEAM_ONE;
+		}
+
+		if(inPlayer->GetTeam() != TEAM_IND)
+		{
+			theErrorString = kAlreadyOnTeam;
+		}
+		// Can't join teams during the victory intermission (required by AvHPlayer::InternalCommonThink() for gradual player reset)
+		else if(this->mVictoryTeam != TEAM_IND)
+		{
+			int a = 0;
+		}
+		else if(this->GetCanJoinTeamInFuture(inPlayer, inTeamToJoin, theErrorString))
+		{
+            this->JoinTeam(inPlayer, inTeamToJoin, inDisplayErrorMessage, false);
+
+			this->MarkDramaticEvent(kJoinTeamPriority, inPlayer->entindex());
+			theSuccess = true;
+		}
+
+		// Print error message to HUD
+		if(!theSuccess)
+		{
+			if(inDisplayErrorMessage)
+			{
+				// Display error string
+				inPlayer->SendMessage(theErrorString.c_str());
+			}
+		}
+		else
+		{
+			// joev: Bug 0000767
+			// Tell the other players that this player is joining a team.
+			if (!this->GetCheatsEnabled()) {
+				AvHTeam* theTeam = GetTeam(inTeamToJoin);
+				// ensure that the sound only plays if the game already has started
+				if (this->mGameStarted == true) {
+					theTeam->PlayHUDSoundForAlivePlayers(HUD_SOUND_PLAYERJOIN);
+				}
+				char* theMessage = UTIL_VarArgs("%s has joined the %s\n",STRING(inPlayer->pev->netname),theTeam->GetTeamPrettyName());
+				UTIL_ClientPrintAll(HUD_PRINTTALK, theMessage);
+				UTIL_LogPrintf(theMessage);
+			}
+			// :joev
+		}
+	}
+	return theSuccess;
+}
+
+// Pick a team for the player to join.  Choose the team with less players.
+// If both teams have the same number of player, pick a team randomly
+void AvHGamerules::AutoAssignPlayer(AvHPlayer* inPlayer)
+{
+	int theTeamNumber = 0;
+	int theTeamOneCount = this->mTeamOne.GetPlayerCount();
+	int theTeamTwoCount = this->mTeamTwo.GetPlayerCount();
+
+	if(theTeamOneCount > theTeamTwoCount)
+		theTeamNumber = 2;
+
+	if(theTeamTwoCount > theTeamOneCount)
+		theTeamNumber = 1;
+
+	if(theTeamNumber == 0)
+		theTeamNumber = 1 + RANDOM_LONG(0,1);
+
+	AvHTeamNumber theTeam = (theTeamNumber == 1 ? TEAM_ONE : TEAM_TWO);
+
+	// Try to join the first team, but don't emit an error if it fails
+	if(!this->AttemptToJoinTeam(inPlayer, theTeam, false))
+	{
+		// If it failed, try the other team and emit an error if it too fails
+		theTeam = (theTeam == TEAM_ONE ? TEAM_TWO : TEAM_ONE);
+		this->AttemptToJoinTeam(inPlayer, theTeam, true);
+	}
+}
+void AvHGamerules::RewardPlayerForKill(AvHPlayer* inPlayer, CBaseEntity* inTarget, entvars_t* inInflictor)
+{
+	ASSERT(inPlayer);
+	ASSERT(inTarget);
+
+	// Doesn't count targets of TEAM_IND
+	if(inPlayer->pev->team != inTarget->pev->team && (inTarget->pev->team != TEAM_IND))
+	{
+		// Team could be NULL if spectating and using cheats
+		AvHTeam* theTeamPointer = inPlayer->GetTeamPointer();
+
+		// Only award resources for killing players
+		if(theTeamPointer && inTarget->IsPlayer())
+		{
+			if(!this->GetIsCombatMode())
+			{
+				int theResourceValue = 0;
+				int theMin = BALANCE_IVAR(kKillRewardMin);
+				int theMax = BALANCE_IVAR(kKillRewardMax);
+				theResourceValue = RANDOM_LONG(theMin, theMax);
+
+				if(theResourceValue > 0)
+				{
+					// Send killing player a message and sound, telling him he just got the kill and is getting the points
+					AvHClassType theClassType = inPlayer->GetClassType();
+					if(theClassType == AVH_CLASS_TYPE_MARINE)
+					{
+						inPlayer->SendMessageOnce(kMarinePointsAwarded, true);
+
+						// Play particle effect as nanites "reclaim" energy
+						//AvHSUPlayParticleEvent(kpsPhaseIn, inTarget->edict(), inTarget->pev->origin);
+
+						//				// Tell commander, if any
+						//				AvHPlayer* theCommander = inPlayer->GetCommander();
+						//				if(theCommander)
+						//				{
+						//					theCommander->SendMessage(kMarinePointsAwardedToCommander);
+						//				}
+					}
+					else if(theClassType == AVH_CLASS_TYPE_ALIEN)
+					{
+						inPlayer->SendMessageOnce(kAlienPointsAwarded, true);
+
+						//inPlayer->AddPoints(thePointReward, TRUE);
+					}
+
+					// Increment resource score in tourny mode
+					theTeamPointer->AddResourcesGathered(theResourceValue);
+
+					AvHSUPlayNumericEvent(theResourceValue, inTarget->edict(), inTarget->pev->origin, 0, kNumericalInfoResourcesEvent, inPlayer->pev->team);
+
+					inPlayer->SetResources(inPlayer->GetResources() + theResourceValue, true);
+				}
+			}
+			else
+			{
+                // Mine kills don't share experience
+                bool theShareExperience = true;
+                if(inInflictor)
+                {
+                    const char* theClassName = STRING(inInflictor->classname);
+                    if(theClassName && FStrEq(theClassName, kwsDeployedMine))
+                    {
+                        theShareExperience = false;
+                    }
+                }
+
+				AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inPlayer);
+				ASSERT(thePlayer);
+				this->AwardExperience(inPlayer, thePlayer->GetExperienceLevel(), theShareExperience);
+			}
+		}
+
+		// Give points or frags for kill
+		int thePointReward = inTarget->GetPointValue();
+		if(thePointReward != 0)
+		{
+			inPlayer->SetScore(inPlayer->GetScore() + thePointReward);
+
+			if(inTarget->IsPlayer())
+				inPlayer->pev->frags += 1;
+			inPlayer->EffectivePlayerClassChanged();
+		}
+	}
+}
+
+int AvHGamerules::IPointsForKill(CBasePlayer *pAttacker, CBasePlayer *pKilled)
+{
+	// Return 0 because we increment our points via RewardPlayerForKill()
+	return 0;
+}
+
+void AvHGamerules::BuildableBuilt(AvHBuildable* inBuildable)
+{
+	// Get player owner from buildable
+	edict_t* theEdict = g_engfuncs.pfnPEntityOfEntIndex(inBuildable->GetBuilder());
+	if(theEdict != NULL)
+	{
+		CBaseEntity* theEntity = CBaseEntity::Instance(theEdict);
+		AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntity);
+		if(thePlayer)
+		{
+			AvHBaseBuildable* theBaseBuildable = dynamic_cast<AvHBaseBuildable*>(inBuildable);
+			if(theBaseBuildable)
+			{
+				thePlayer->AddPoints(theBaseBuildable->GetPointValue(), TRUE);
+			}
+		}
+	}
+}
+
+void AvHGamerules::BuildableKilled(AvHBuildable* inBuildable)
+{
+	// Get player owner from buildable
+	//edict_t* theEdict = g_engfuncs.pfnPEntityOfEntIndex(inBuildable->GetBuilder());
+	//if(theEdict != NULL)
+	//{
+	//	CBaseEntity* theEntity = CBaseEntity::Instance(theEdict);
+	//	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntity);
+	//	if(thePlayer)
+	//	{
+	//		thePlayer->AddPoints(-1, TRUE);
+	//	}
+	//}
+}
+
+void AvHGamerules::BuildMiniMap(AvHPlayer* inPlayer)
+{
+	const char* theCStrLevelName = STRING(gpGlobals->mapname);
+	if(theCStrLevelName && !FStrEq(theCStrLevelName, ""))
+	{
+		this->mMiniMap.BuildMiniMap(theCStrLevelName, inPlayer, this->mMapExtents);
+	}
+}
+
+BOOL AvHGamerules::CanHaveAmmo( CBasePlayer *pPlayer, const char *pszAmmoName, int iMaxCarry )
+{
+	BOOL theCanHaveIt = false;
+
+	// Check if ammo isn't special ammo name
+	//if(!strcmp(pszAmmoName, kwsGenericAmmo))
+	//{
+   	//	// Are we carrying at least one weapon without full ammo?
+   	//	AvHPlayer* inPlayer = dynamic_cast<AvHPlayer*>(pPlayer);
+   	//	ASSERT(inPlayer);
+   	//	theCanHaveIt = inPlayer->CanHaveAmmoCannister();
+   	//}
+   	//else
+   	//{
+	theCanHaveIt = CHalfLifeTeamplay::CanHaveAmmo(pPlayer, pszAmmoName, iMaxCarry);
+    //}
+	return theCanHaveIt;
+}
+
+// The player is touching an CBasePlayerItem, do I give it to him?
+BOOL AvHGamerules::CanHavePlayerItem(CBasePlayer *pPlayer, CBasePlayerItem *pWeapon)
+{
+	BOOL theCanHaveIt = FALSE;
+
+	// Allow it if we don't already have it
+	if(CHalfLifeTeamplay::CanHavePlayerItem(pPlayer, pWeapon) && !pPlayer->HasItem(pWeapon))
+	{
+		// Don't allow players to have more then one primary weapon
+		ItemInfo theItemInfo;
+		pWeapon->GetItemInfo(&theItemInfo);
+		int theWeaponFlags = theItemInfo.iFlags;
+
+		// Check primary and secondary weapons (assumes we only have one, but should work even with both)
+		int theCurrentFlag = (theWeaponFlags & (PRIMARY_WEAPON | SECONDARY_WEAPON));
+		CBasePlayerItem* theCurrentItem = NULL;
+		bool theHasWeaponWithFlag = pPlayer->HasItemWithFlag(theCurrentFlag, theCurrentItem);
+
+		if(theHasWeaponWithFlag)
+		{
+			if(theCurrentItem->iWeight() < pWeapon->iWeight())
+			{
+				theCanHaveIt = TRUE;
+			}
+			else if(this->GetIsCombatMode())
+			{
+				theCanHaveIt = TRUE;
+			}
+		}
+		else
+		{
+			theCanHaveIt = TRUE;
+		}
+	}
+
+	return theCanHaveIt;
+}
+
+bool AvHGamerules::CanPlayerBeKilled(CBasePlayer* inPlayer)
+{
+	bool theCanBeKilled = false;
+
+	// Don't allow players that are being digested to suicide
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inPlayer);
+	if(thePlayer)
+	{
+		if(thePlayer->GetCanBeAffectedByEnemies() && this->GetGameStarted() && !thePlayer->GetIsBeingDigested())
+		{
+			theCanBeKilled = true;
+		}
+	}
+
+	return theCanBeKilled;
+}
+
+void AvHGamerules::CalculateMapGamma()
+{
+	// Set defaults
+	this->mCalculatedMapGamma = kDefaultMapGamma;
+
+	//AvHSUPrintDevMessage("Calculating map gamma \n");
+
+	// Fetch from map extents entity if the map has one
+	FOR_ALL_ENTITIES(kwsGammaClassName, AvHGamma*)
+		this->mMapGamma = theEntity->GetGamma();
+	END_FOR_ALL_ENTITIES(kwsGammaClassName)
+
+	this->mCalculatedMapGamma = true;
+}
+
+#ifndef USE_UPP
+BOOL AvHGamerules::GetIsClientAuthorizedToPlay(edict_t* inEntity, bool inDisplayMessage, bool inForcePending) const
+{
+	BOOL theIsAuthorized = false;
+
+	#ifndef AVH_SECURE_PRERELEASE_BUILD
+	theIsAuthorized = true;
+	#endif
+
+	#ifdef AVH_SECURE_PRERELEASE_BUILD
+	string theAuthID = AvHSUGetPlayerAuthIDString(inEntity);
+	const char* thePlayerName = STRING(inEntity->v.netname);
+	if(!strcmp(thePlayerName, ""))
+	{
+		thePlayerName = "unknown";
+	}
+
+    // Allow only select players to play
+	int theSecurityMask = PLAYERAUTH_DEVELOPER | PLAYERAUTH_PLAYTESTER  |  PLAYERAUTH_CONTRIBUTOR;
+
+	// If any of these bits are set, allow them to play
+    int theAuthMask = 0;
+
+    // Get the auth mask the cheap way if possible
+    AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(inEntity));
+    if(thePlayer)
+    {
+        theAuthMask = thePlayer->GetAuthenticationMask();
+    }
+    else
+    {
+        theAuthMask = GetGameRules()->GetAuthenticationMask(theAuthID);
+    }
+
+	if(theAuthMask & theSecurityMask)
+	{
+		if(inDisplayMessage)
+		{
+			char theAuthenticateString[512];
+			sprintf(theAuthenticateString, "Player (%s -> %s) authenticated as privileged player.\r\n", thePlayerName, theAuthID.c_str());
+			ALERT(at_logged, theAuthenticateString);
+		}
+
+		theIsAuthorized = true;
+	}
+	// Pending
+	else if(theAuthID == kSteamIDPending)
+	{
+		if(!inForcePending)
+		{
+			// The player is authorized
+			theIsAuthorized = true;
+		}
+	}
+	// Local players or bots are always allowed
+	else if((theAuthID == kSteamIDLocal) || (theAuthID == kSteamIDBot))
+	{
+		theIsAuthorized = true;
+	}
+
+	// Display message on failure
+	if(!theIsAuthorized && inDisplayMessage)
+	{
+		char theAuthenticateString[512];
+		sprintf(theAuthenticateString, "Player (%s -> %s) failed authentication.\r\n", thePlayerName, theAuthID.c_str());
+		ALERT(at_logged, theAuthenticateString);
+	}
+
+	#endif
+
+	return theIsAuthorized;
+}
+#endif
+
+BOOL AvHGamerules::ClientConnected( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[ 128 ] )
+{
+	bool theAllowedToConnect = true;
+	BOOL theSuccess = false;
+
+	#ifdef AVH_SECURE_PRERELEASE_BUILD
+	this->UpdateUplink();
+	#endif
+
+#ifdef USE_UPP
+	UPPUtil_ConnectPlayer(pEntity,pszName,pszAddress);
+#endif
+
+	#ifdef AVH_SECURE_PRERELEASE_BUILD
+	theAllowedToConnect = false;
+	theAllowedToConnect = this->GetIsClientAuthorizedToPlay(pEntity, true, false);
+	#endif
+
+	if(theAllowedToConnect)
+	{
+		g_VoiceGameMgr.ClientConnected(pEntity);
+
+		// Play connect sound
+		EMIT_SOUND(pEntity, CHAN_AUTO, kConnectSound, 0.8, ATTN_NORM);
+
+		theSuccess = CHalfLifeTeamplay::ClientConnected(pEntity, pszName, pszAddress, szRejectReason);
+	}
+	else
+	{
+		sprintf(szRejectReason, "Only privileged players can join beta NS servers.\n");
+	}
+
+	return theSuccess;
+}
+
+
+void AvHGamerules::ClientDisconnected( edict_t *pClient )
+{
+	// Call down to base class
+	CHalfLifeTeamplay::ClientDisconnected(pClient);
+
+	// Play disconnect sound (don't play, it encourages other people to leave)
+	//EMIT_SOUND(pClient, CHAN_AUTO, kDisconnectSound, 0.5, ATTN_NORM);
+
+	// Remove him from whatever team he was on (does the player get killed first?)
+	CBaseEntity* theEntity = CBaseEntity::Instance(ENT(pClient));
+	AvHPlayer* theAvHPlayer = dynamic_cast<AvHPlayer*>(theEntity);
+	if(theAvHPlayer)
+	{
+		#ifdef USE_UPP
+			UPP::reportPlayerExited(UPPUtil_GetPlayerInfo(theAvHPlayer));
+		#endif
+		theAvHPlayer->ClientDisconnected();
+	}
+
+#ifdef AVH_PLAYTEST_BUILD
+	// If server is shutting down, write out balance data
+	if(this->GetNumberOfPlayers() == 1)
+	{
+		this->RecordBalanceData();
+	}
+#endif
+
+	// trigger a votemap check
+	this->RemovePlayerFromVotemap(theEntity->entindex());
+}
+
+void AvHGamerules::ClientKill( edict_t *pEntity )
+{
+}
+
+void AvHGamerules::ClientUserInfoChanged(CBasePlayer *pPlayer, char *infobuffer)
+{
+	// NOTE: Not currently calling down to parent CHalfLifeTeamplay //
+	//	char text[1024];
+
+	// prevent skin/color/model changes
+	//char *mdls = g_engfuncs.pfnInfoKeyValue( infobuffer, "model" );
+
+//	char* theModelName = dynamic_cast<AvHPlayer*>(pPlayer)->GetPlayerModel();
+//
+//	//if(!stricmp( mdls, theModelName))
+//	//	return;
+//
+//	char* theInfoBuffer = g_engfuncs.pfnGetInfoKeyBuffer(pPlayer->edict());
+//	g_engfuncs.pfnSetClientKeyValue(pPlayer->entindex(), theInfoBuffer, "model", theModelName);
+
+	//if ( defaultteam.value )
+	//{
+	//	int clientIndex = pPlayer->entindex();
+	//
+	//	g_engfuncs.pfnSetClientKeyValue( clientIndex, g_engfuncs.pfnGetInfoKeyBuffer( pPlayer->edict() ), "model", pPlayer->TeamID() );
+	//	g_engfuncs.pfnSetClientKeyValue( clientIndex, g_engfuncs.pfnGetInfoKeyBuffer( pPlayer->edict() ), "team", pPlayer->TeamID() );
+	//	sprintf( text, "* Not allowed to change teams in this game!\n" );
+	//	UTIL_SayText( text, pPlayer );
+	//	return;
+	//}
+
+//	if ( defaultteam.value || !IsValidTeam( mdls ) )
+//	{
+//		int clientIndex = pPlayer->entindex();
+//
+//		g_engfuncs.pfnSetClientKeyValue( clientIndex, g_engfuncs.pfnGetInfoKeyBuffer( pPlayer->edict() ), "model", pPlayer->TeamID() );
+//		sprintf( text, "* Can't change team to \'%s\'\n", mdls );
+//		UTIL_SayText( text, pPlayer );
+//		sprintf( text, "* Server limits teams to \'%s\'\n", m_szTeamList );
+//		UTIL_SayText( text, pPlayer );
+//		return;
+//	}
+
+	// notify everyone of the team change
+//	sprintf( text, "* %s has changed to team \'%s\'\n", STRING(pPlayer->pev->netname), mdls );
+//	UTIL_SayTextAll( text, pPlayer );
+//
+//	UTIL_LogPrintf( "\"%s<%i>\" changed to team %s\n", STRING( pPlayer->pev->netname ), GETPLAYERUSERID( pPlayer->edict() ), mdls );
+
+//	ChangePlayerTeam( pPlayer, mdls, TRUE, TRUE );
+//	// recound stuff
+//	RecountTeams();
+}
+
+void AvHGamerules::ChangePlayerTeam( CBasePlayer *pPlayer, const char *pTeamName, BOOL bKill, BOOL bGib )
+{
+	CHalfLifeTeamplay::ChangePlayerTeam(pPlayer, pTeamName, bKill, bGib);
+}
+
+
+int	AvHGamerules::DeadPlayerAmmo( CBasePlayer *pPlayer )
+{
+	return GR_PLR_DROP_AMMO_NO;
+}
+
+int	AvHGamerules::DeadPlayerWeapons(CBasePlayer* inPlayer)
+{
+	int theReturnCode = GR_PLR_DROP_GUN_NO;
+
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inPlayer);
+	ASSERT(thePlayer);
+	if(thePlayer->GetIsMarine())
+	{
+		theReturnCode = GR_PLR_DROP_GUN_ACTIVE;
+	}
+
+	return theReturnCode;
+}
+
+void AvHGamerules::DeathNotice(CBasePlayer* pVictim, entvars_t* pKiller, entvars_t* pInflictor)
+{
+	// TODO: do something here?  Call CHalfLifeMultiplay::DeathNotice() to get normal death notices back
+	CHalfLifeTeamplay::DeathNotice(pVictim, pKiller, pInflictor);
+}
+
+void AvHGamerules::DeleteAndResetEntities()
+{
+	// Print reset message at console
+	char theResetString[256];
+
+	sprintf(theResetString, "Game reset started.\n");
+	ALERT(at_logged, theResetString);
+
+	//ResetCachedEntities();
+
+	//FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+	//	theEntity->Reset();
+	//END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+
+	// Clear out alien weapons
+	AvHSURemoveAllEntities(kwsBiteGun);
+	AvHSURemoveAllEntities(kwsParasiteGun);
+	AvHSURemoveAllEntities(kwsLeap);
+	AvHSURemoveAllEntities(kwsDivineWind);
+	AvHSURemoveAllEntities(kwsSpitGun);
+	AvHSURemoveAllEntities(kwsHealingSpray);
+	AvHSURemoveAllEntities(kwsBileBombGun);
+	AvHSURemoveAllEntities(kwsWebSpinner);
+	AvHSURemoveAllEntities(kwsSpikeGun);
+	AvHSURemoveAllEntities(kwsSporeGun);
+	AvHSURemoveAllEntities(kwsUmbraGun);
+	AvHSURemoveAllEntities(kwsPrimalScream);
+	AvHSURemoveAllEntities(kwsSwipe);
+	AvHSURemoveAllEntities(kwsBlinkGun);
+	AvHSURemoveAllEntities(kwsAcidRocketGun);
+	AvHSURemoveAllEntities(kwsMetabolize);
+	AvHSURemoveAllEntities(kwsClaws);
+	AvHSURemoveAllEntities(kwsDevour);
+	AvHSURemoveAllEntities(kwsStomp);
+	AvHSURemoveAllEntities(kwsCharge);
+
+	// Clear out marine weapons
+	AvHSURemoveAllEntities(kwsMachineGun);
+	AvHSURemoveAllEntities(kwsPistol);
+	AvHSURemoveAllEntities(kwsShotGun);
+	AvHSURemoveAllEntities(kwsHeavyMachineGun);
+	AvHSURemoveAllEntities(kwsGrenadeGun);
+	AvHSURemoveAllEntities(kwsMine);
+	AvHSURemoveAllEntities(kwsWelder);
+	AvHSURemoveAllEntities(kwsKnife);
+
+	// Remove alien items and projectiles
+	AvHSURemoveAllEntities(kwsAcidRocket);
+	AvHSURemoveAllEntities(kwsBileBomb);
+	AvHSURemoveAllEntities(kwsBabblerProjectile);
+	AvHSURemoveAllEntities(kwsSpitProjectile);
+	AvHSURemoveAllEntities(kwsSporeProjectile);
+	AvHSURemoveAllEntities(kwsStomp);
+	AvHSURemoveAllEntities(kwsUmbraCloud);
+	AvHSURemoveAllEntities(kwsUmbraProjectile);
+	AvHSURemoveAllEntities(kesTeamWebStrand);
+
+	// Remove marine items and projectiles
+	AvHSURemoveAllEntities(kwsDeployedMine);
+	AvHSURemoveAllEntities(kwsHeavyArmor);
+	AvHSURemoveAllEntities(kwsJetpack);
+	AvHSURemoveAllEntities(kwsGrenade);
+	AvHSURemoveAllEntities(kwsScan);
+	AvHSURemoveAllEntities(kwsGenericAmmo);
+	AvHSURemoveAllEntities(kwsHealth);
+	AvHSURemoveAllEntities(kwsWelder);
+	AvHSURemoveAllEntities(kwsCatalyst);
+	AvHSURemoveAllEntities(kwsAmmoPack);
+
+	// Remove all non-persistent entities marked buildable
+	//AvHSUPrintDevMessage("FOR_ALL_BASEENTITIES: AvHGamerules::DeleteAndResetEntities\n");
+
+	FOR_ALL_BASEENTITIES();
+		AvHBaseBuildable* theBuildable = dynamic_cast<AvHBaseBuildable*>(theBaseEntity);
+		if(GetHasUpgrade(theBaseEntity->pev->iuser4, MASK_BUILDABLE) && (!theBuildable || !theBuildable->GetIsPersistent()))
+		{
+			ASSERT(theBaseEntity->pev->iuser3 != AVH_USER3_HIVE);
+			if(theBaseEntity->pev->iuser3 == AVH_USER3_HIVE)
+			{
+				int a = 0;
+			}
+			UTIL_Remove(theBaseEntity);
+		}
+	END_FOR_ALL_BASEENTITIES();
+
+	// Delete all non-persistent base buildables.
+	//AvHSUPrintDevMessage("FOR_ALL_BASEENTITIES: AvHGamerules::DeleteAndResetEntities#2\n");
+
+	FOR_ALL_BASEENTITIES();
+		AvHBaseBuildable* theBuildable = dynamic_cast<AvHBaseBuildable*>(theBaseEntity);
+		if(theBuildable && !theBuildable->GetIsPersistent())
+		{
+			UTIL_Remove(theBuildable);
+		}
+	END_FOR_ALL_BASEENTITIES();
+
+	// TODO: Remove decals
+
+	this->ResetEntities();
+
+	FireTargets(ktGameReset, NULL, NULL, USE_TOGGLE, 0.0f);
+
+	sprintf(theResetString, "Game reset complete.\n");
+	ALERT(at_logged, theResetString);
+}
+
+BOOL AvHGamerules::FAllowMonsters( void )
+{
+	return TRUE;
+}
+
+BOOL AvHGamerules::FPlayerCanRespawn( CBasePlayer *pPlayer )
+{
+	bool theCanRespawn = false;
+
+//	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(pPlayer);
+//	AvHTeam* theTeam = thePlayer->GetTeamPointer();
+//	if(theTeam)
+//	{
+//		AvHClassType theTeamType = theTeam->GetTeamType();
+//
+//		if(theTeamType == AVH_CLASS_TYPE_MARINE)
+//		{
+//			if(theTeam->GetReinforcements() > 0)
+//			{
+//				theCanRespawn = true;
+//			}
+//		}
+//		else if(theTeamType == AVH_CLASS_TYPE_ALIEN)
+//		{
+//			// If there are are any eggs for this team
+//			FOR_ALL_ENTITIES(kwsEggClassName, AvHEgg*)
+//			if(theEntity->pev->team == pPlayer->pev->team)
+//			{
+//				theCanRespawn = true;
+//				break;
+//			}
+//			END_FOR_ALL_ENTITIES(kwsEggClassName)
+//
+//			if(!theCanRespawn)
+//			{
+//				// OR, if there is at least one hive, and we have enough points
+//				int theRespawnCost = thePlayer->GetRespawnCost();
+//				if(thePlayer->GetResources() >= theRespawnCost)
+//				{
+//					int theNumActiveHives = 0;
+//
+//					AvHTeam* theTeamPointer = thePlayer->GetTeamPointer();
+//					if(theTeamPointer)
+//					{
+//						theNumActiveHives = theTeamPointer->GetNumActiveHives();
+//					}
+//
+//					if(theNumActiveHives > 0)
+//					{
+//						theCanRespawn = true;
+//					}
+//				}
+//			}
+//		}
+//	}
+//	else
+//	{
+//		// This only happens when there aren't enough spawns, so players die in the ready room.  Fix?
+//		theCanRespawn = true;
+//	}
+
+	return theCanRespawn;
+}
+
+bool AvHGamerules::CanEntityDoDamageTo(const CBaseEntity* inAttacker, const CBaseEntity* inReceiver, float* outScalar)
+{
+	bool theCanDoDamage = false;
+
+	if(inAttacker && inReceiver)
+	{
+		AvHTeamNumber theAttackerTeam = (AvHTeamNumber)inAttacker->pev->team;
+		AvHTeamNumber theReceiverTeam = (AvHTeamNumber)inReceiver->pev->team;
+		bool theTeamsAreDifferent = (theAttackerTeam != theReceiverTeam);
+		bool theTeamsAreOpposing = theTeamsAreDifferent && (theAttackerTeam != TEAM_IND) && (theReceiverTeam != TEAM_IND);
+		bool theGameHasStarted = this->GetGameStarted();
+		bool theIsBreakable = (inReceiver->pev->iuser3 == AVH_USER3_BREAKABLE);
+		bool theIsDoor = !strcmp(STRING(inReceiver->pev->classname), kesFuncDoor) || !strcmp(STRING(inReceiver->pev->classname), "func_door_rotating") || !strcmp(STRING(inReceiver->pev->classname), "func_button");
+		bool theAttackerIsSiege = inAttacker->pev->classname == MAKE_STRING(kwsSiegeTurret);
+		bool theAttackerIsMine = inAttacker->pev->classname == MAKE_STRING(kwsDeployedMine);
+		bool theReceiverIsMine = inReceiver->pev->classname == MAKE_STRING(kwsDeployedMine);
+        bool theIsFriendlyFireEnabled = friendlyfire.value;
+		bool theAttackerIsWorld = false;
+		bool theReceiverIsPlayer = false;
+		bool theAttackerIsReceiver = false;
+		float theScalar = 1.0f;
+		bool theReceiverIsWorld = false;
+
+		// Never dynamic_cast any entities that could be non-NS entities
+		if(!AvHSUGetIsExternalClassName(STRING(inAttacker->pev->classname)))
+		{
+			theAttackerIsWorld = (dynamic_cast<const CWorld*>(inAttacker) != NULL);
+		}
+
+ 		if(!AvHSUGetIsExternalClassName(STRING(inAttacker->pev->classname)))
+ 		{
+			theReceiverIsPlayer = (dynamic_cast<const AvHPlayer *>(inReceiver) != NULL);
+		}
+
+		if(!AvHSUGetIsExternalClassName(STRING(inReceiver->pev->classname)))
+		{
+			theReceiverIsWorld = (dynamic_cast<const CWorld*>(inReceiver) != NULL);
+		}
+
+		if(!theReceiverIsWorld)
+		{
+			if((inAttacker == inReceiver) || (CBaseEntity::Instance(inAttacker->pev->owner) == inReceiver))
+			{
+				theAttackerIsReceiver = true;
+			}
+
+			// If we're in tournament mode and two teams are different, yes
+			if(theGameHasStarted)
+			{
+				if(theTeamsAreOpposing || theIsFriendlyFireEnabled || theIsBreakable || theIsDoor || theAttackerIsWorld || theAttackerIsReceiver || ( theAttackerIsMine && theTeamsAreDifferent ))
+				{
+					theCanDoDamage = true;
+					// Do less damage with friendly fire
+					if(theAttackerTeam == theReceiverTeam)
+					{
+						theScalar = .33f;
+					}
+
+					if(theAttackerIsReceiver)
+					{
+						theScalar = .5f;
+					}
+				}
+			}
+		}
+
+		// Mines never blow up friendly mines or anything else
+		if(theAttackerIsMine)
+		{
+			// Check if teams are the same
+			if( (inAttacker->pev->team == inReceiver->pev->team) )
+			{
+				theCanDoDamage = false;
+			}
+		}
+
+		// Mines can't be blown up by anonymous sources (prevents mines from blowing up other mines)
+		if(theReceiverIsMine && theAttackerIsWorld)
+		{
+			theCanDoDamage = false;
+		}
+
+		if(inReceiver->pev->takedamage == DAMAGE_NO)
+		{
+			theCanDoDamage = false;
+		}
+		if ( theAttackerIsSiege && theReceiverIsPlayer )
+		{
+			theCanDoDamage = false;
+		}
+		if(theCanDoDamage && outScalar)
+		{
+			*outScalar = theScalar;
+		}
+	}
+	return theCanDoDamage;
+}
+
+
+BOOL AvHGamerules::FPlayerCanTakeDamage( CBasePlayer *pPlayer, CBaseEntity *pAttacker )
+{
+	BOOL theCanTakeDamage = TRUE;
+
+	if(!this->GetDeathMatchMode() && pAttacker)
+	{
+		AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(pPlayer);
+		if(thePlayer->GetInReadyRoom())
+		{
+			theCanTakeDamage = FALSE;
+		}
+		// Friendly fire only in tournament mode (allow players to damage themselves)
+		else if((pPlayer != pAttacker) && this->PlayerRelationship(pPlayer, pAttacker) == GR_TEAMMATE)
+		{
+			if(!(friendlyfire.value))
+			{
+				theCanTakeDamage = FALSE;
+			}
+		}
+	}
+
+	return theCanTakeDamage;
+}
+
+void AvHGamerules::ComputeWorldChecksum(Checksum& outChecksum) const
+{
+	// Run through all entities in the world, adding their checksum
+	//AvHSUPrintDevMessage("FOR_ALL_BASEENTITIES: AvHGamerules::ComputeWorldChecksum\n");
+
+	FOR_ALL_BASEENTITIES();
+		theBaseEntity->AddChecksum(outChecksum);
+	END_FOR_ALL_BASEENTITIES();
+}
+
+bool AvHGamerules::GetArePlayersAllowedToJoinImmediately(void) const
+{
+	bool thePlayerIsAllowedToJoinImmediately = false;
+
+	// if the game hasn't started
+	if(!this->mGameStarted)
+	{
+		thePlayerIsAllowedToJoinImmediately = true;
+	}
+	// if cheats are enabled
+	else if(this->GetCheatsEnabled())
+	{
+		thePlayerIsAllowedToJoinImmediately = true;
+	}
+	else
+	{
+		// if it's not tournament mode and it's within x seconds of game start
+		float theLateJoinSeconds = CVAR_GET_FLOAT(kvLateJoinTime)*60;
+
+		if(!this->GetIsTournamentMode() && (gpGlobals->time < (this->mTimeGameStarted + theLateJoinSeconds)))
+		{
+			thePlayerIsAllowedToJoinImmediately = true;
+		}
+	}
+
+	return thePlayerIsAllowedToJoinImmediately;
+}
+
+bool AvHGamerules::GetCanJoinTeamInFuture(AvHPlayer* inPlayer, AvHTeamNumber inTeamNumber, string& outString) const
+{
+	// You can switch teams, unless
+	bool theCanJoinTeam = false;
+
+	// You can always go back to ready room
+	if(inTeamNumber == TEAM_IND)
+	{
+        theCanJoinTeam = true;
+	}
+
+	// You can always join before the game has started
+	// Don't allow team switching once the game has started, or ever in tourny mode
+	else if((inPlayer->GetTeam() != inTeamNumber) /*&& (inPlayer->GetTeam() != TEAM_IND)*/)
+	{
+		// Server ops can always switch teams
+		if(inPlayer->GetAuthenticationMask() & PLAYERAUTH_SERVEROP)
+        {
+            theCanJoinTeam = true;
+        }
+        else
+		{
+			// Check to see if teams are wildly unbalanced
+			const AvHTeam* theTeam = this->GetTeam(inTeamNumber);
+			if(theTeam)
+			{
+				int theWouldBeNumPlayersOnTeam = theTeam->GetPlayerCount() + 1;
+
+				AvHTeamNumber theOtherTeamNumber = (inTeamNumber == TEAM_ONE) ? TEAM_TWO : TEAM_ONE;
+				const AvHTeam* theOtherTeam = this->GetTeam(theOtherTeamNumber);
+				if(theOtherTeam)
+				{
+					int theWouldBeNumPlayersOnOtherTeam = theOtherTeam->GetPlayerCount();
+
+					// Subtract ourselves off
+					if(AvHTeamNumber(inPlayer->pev->team) == theOtherTeam->GetTeamNumber())
+					{
+						theWouldBeNumPlayersOnTeam--;
+					}
+
+					int theDiscrepancyAllowed = max(1, avh_limitteams.value);
+					if(((theWouldBeNumPlayersOnTeam - theWouldBeNumPlayersOnOtherTeam) <= theDiscrepancyAllowed) || this->GetIsTournamentMode() || this->GetCheatsEnabled())
+					{
+						// tankefugl: 0000953
+						if (!(this->GetCheatsEnabled()) && !(inPlayer->JoinTeamCooledDown(BALANCE_FVAR(kJoinTeamCooldown))))
+							outString = kJoinTeamTooFast;
+						else
+						// :tankefugl
+							theCanJoinTeam = true;
+					}
+					else
+					{
+						outString = kTooManyPlayersOnTeam;
+					}
+				}
+			}
+		}
+	}
+
+	return theCanJoinTeam;
+}
+
+AvHBaseInfoLocationListType AvHGamerules::GetInfoLocations() const
+{
+	return mInfoLocations;
+}
+
+bool AvHGamerules::GetCheatsEnabled(void) const
+{
+	float theCheatsEnabled = CVAR_GET_FLOAT( "sv_cheats" );
+	return (theCheatsEnabled == 1.0f);
+}
+
+float AvHGamerules::GetFirstScanThinkTime() const 
+{
+	return this->GetIsCombatMode() ? 0.25f : 0.5f;
+}
+
+bool AvHGamerules::GetDrawInvisibleEntities() const
+{
+	bool theDrawInvisible = false;
+
+	#ifdef DEBUG
+	if(CVAR_GET_FLOAT(kvDrawInvisible) > 0)
+	{
+		theDrawInvisible = true;
+	}
+	#endif
+
+	return theDrawInvisible;
+}
+
+bool AvHGamerules::GetDeathMatchMode(void) const
+{
+	bool theInDMMode = false;
+
+	// deathmatch mode means there is no ready room
+	if(avh_deathmatchmode.value == 1.0f)
+	{
+		theInDMMode = true;
+	}
+
+	return theInDMMode;
+}
+
+bool AvHGamerules::GetEntityExists(const char* inName) const
+{
+	bool theSuccess = false;
+
+	edict_t* theEnt = FIND_ENTITY_BY_CLASSNAME(NULL, inName);
+	if(!FNullEnt(theEnt))
+	{
+		theSuccess = true;
+	}
+	else
+	{
+		// Look in spawns
+		for(SpawnListType::const_iterator theIter = this->mSpawnList.begin(); theIter != this->mSpawnList.end(); theIter++)
+		{
+			if(!strcmp(theIter->GetClassName().c_str(), inName))
+			{
+				theSuccess = true;
+				break;
+			}
+		}
+	}
+
+	return theSuccess;
+}
+
+const char* AvHGamerules::GetGameDescription(void)
+{
+    static char sGameDescription[512];
+
+    sprintf(sGameDescription, "%s %s", kAvHGameAcronymn, AvHSUGetGameVersionString());
+
+    return sGameDescription;
+}
+
+//edict_t* AvHGamerules::GetPlayerSpawnSpot( CBasePlayer *pPlayer )
+//{
+//}
+
+bool AvHGamerules::GetCountdownStarted() const
+{
+	return this->mStartedCountdown;
+}
+
+bool AvHGamerules::GetGameStarted() const
+{
+    return this->mGameStarted;
+}
+
+int AvHGamerules::GetGameTime() const
+{
+	int theGameTime = 0;
+
+	if(this->GetGameStarted())
+	{
+		theGameTime = (gpGlobals->time - this->mTimeGameStarted);
+	}
+
+	return theGameTime;
+}
+
+float AvHGamerules::GetMapGamma()
+{
+	if(!this->mCalculatedMapGamma)
+	{
+		this->CalculateMapGamma();
+	}
+
+	return this->mMapGamma;
+}
+
+const AvHGameplay& AvHGamerules::GetGameplay() const
+{
+	return this->mGameplay;
+}
+
+bool AvHGamerules::GetIsMapperBuild() const
+{
+	bool theIsMapperBuild = false;
+
+	#ifdef AVH_MAPPER_BUILD
+	theIsMapperBuild = true;
+	#endif
+
+	return theIsMapperBuild;
+}
+
+bool AvHGamerules::GetIsTesting(void) const
+{
+	return CVAR_GET_FLOAT(kvTesting) > 0;
+}
+
+bool AvHGamerules::GetIsTournamentMode(void) const
+{
+	return (CVAR_GET_FLOAT(kvTournamentMode) == 1.0f);
+}
+
+bool AvHGamerules::GetIsCombatMode(void) const
+{
+	return (this->GetMapMode() == MAP_MODE_CO);
+}
+
+AvHTeamNumber AvHGamerules::GetCombatAttackingTeamNumber() const
+{
+	return this->mCombatAttackingTeamNumber;
+}
+
+bool AvHGamerules::GetIsNSMode(void) const
+{
+    return (this->GetMapMode() == MAP_MODE_NS);
+}
+
+bool AvHGamerules::GetIsHamboneMode() const
+{
+    return this->GetIsCombatMode() && (CVAR_GET_FLOAT(kvIronMan) == 2);
+}
+
+bool AvHGamerules::GetIsIronMan(void) const
+{
+	return this->GetIsCombatMode() && (CVAR_GET_FLOAT(kvIronMan) == 1);
+}
+
+bool AvHGamerules::GetIsTrainingMode(void) const
+{
+	return (CVAR_GET_FLOAT(kvTrainingMode) == 1.0f);
+}
+
+AvHMapMode AvHGamerules::GetMapMode(void) const
+{
+	return this->mMapMode;
+}
+
+const AvHMapExtents& AvHGamerules::GetMapExtents()
+{
+	this->mMapExtents.CalculateMapExtents();
+
+	return this->mMapExtents;
+}
+
+AvHEntityHierarchy& AvHGamerules::GetEntityHierarchy(AvHTeamNumber inTeam)
+{
+	if(inTeam == TEAM_ONE)
+	{
+		return this->mTeamOneEntityHierarchy;
+	}
+	else if(inTeam == TEAM_TWO)
+	{
+		return this->mTeamTwoEntityHierarchy;
+	}
+	else
+	{
+		ASSERT(false);
+	}
+	return this->mTeamOneEntityHierarchy;
+}
+
+bool AvHGamerules::GetIsPlayerSelectableByPlayer(AvHPlayer* inTargetPlayer, AvHPlayer* inByPlayer)
+{
+	ASSERT(inTargetPlayer);
+	ASSERT(inByPlayer);
+
+	bool thePlayerIsSelectable = false;
+
+	if(inTargetPlayer && inTargetPlayer->IsAlive() && (inTargetPlayer != inByPlayer))
+	{
+		if(inTargetPlayer->pev->team == inByPlayer->pev->team)
+		{
+			if(!inTargetPlayer->IsObserver())
+			{
+				thePlayerIsSelectable = true;
+			}
+		}
+	}
+
+	return thePlayerIsSelectable;
+}
+
+const AuthIDListType& AvHGamerules::GetServerOpList() const
+{
+	return this->mServerOpList;
+}
+
+int	AvHGamerules::GetServerTick() const
+{
+	return gServerTick;
+}
+
+const char*	AvHGamerules::GetSpawnEntityName(AvHPlayer* inPlayer) const
+{
+	// Come back to ready room by default (in case there is a bug, go back to ready room, don't crash)
+	const char* theSpawnEntityName = kesReadyRoomStart;
+
+	AvHClassType theClassType = inPlayer->GetClassType();
+
+	// If there is no no avh start points, try to start up as CS.  If that doesn't look
+	// right, always return DM spawns.
+	if((this->mMapMode == MAP_MODE_NS) || (this->mMapMode == MAP_MODE_CO))
+	{
+		// The different cases:
+		// Player just connected to server and hasn't done anything yet OR
+		// Player is leaving game and going back to ready room
+		if(theClassType == AVH_CLASS_TYPE_UNDEFINED)
+		{
+			// Use ready room spawn
+			theSpawnEntityName = kesReadyRoomStart;
+		}
+		else
+		{
+			theSpawnEntityName = kesTeamStart;
+		}
+//		// Player has requested a team but is currently in spectator mode OR
+//		// the player is in the ready room and has walked through a door to choose team
+//		else if(inPlayer->IsObserver() || theClassType == AVH_CLASS_TYPE_UNDEFINED)
+//		{
+//			// Look at class type to determine spawn entity name
+//			if(theClassType == AVH_CLASS_TYPE_MARINE)
+//			{
+//				theSpawnEntityName = kesTeamOneStart;
+//			}
+//			else if(theClassType == AVH_CLASS_TYPE_ALIEN)
+//			{
+//				theSpawnEntityName = kesTeamTwoStart;
+//			}
+//		}
+//		// Player just died and is coming back normally
+//		else
+//		{
+//			// Use current class type to determine spawn entity name
+//			if(theClassType == AVH_CLASS_TYPE_MARINE)
+//			{
+//				theSpawnEntityName = kesTeamOneStart;
+//			}
+//			else if(theClassType == AVH_CLASS_TYPE_ALIEN)
+//			{
+//				theSpawnEntityName = kesTeamTwoStart;
+//			}
+//		}
+	}
+	else if(this->mMapMode == MAP_MODE_CS)
+	{
+		switch(theClassType)
+		{
+		// "CT"
+		case AVH_CLASS_TYPE_MARINE:
+			theSpawnEntityName = kesCounterTerroristStart;
+			inPlayer->SetPendingCommand(kcJoinTeamOne);
+			break;
+
+		// "T"
+		case AVH_CLASS_TYPE_ALIEN:
+			theSpawnEntityName = kesTerroristStart;
+			inPlayer->SetPendingCommand(kcJoinTeamTwo);
+			break;
+
+		// Random
+		case AVH_CLASS_TYPE_UNDEFINED:
+		case AVH_CLASS_TYPE_AUTOASSIGN:
+			if(RANDOM_LONG(0, 1) == 0)
+			{
+				theSpawnEntityName = kesCounterTerroristStart;
+				inPlayer->SetPendingCommand(kcJoinTeamOne);
+			}
+			else
+			{
+				theSpawnEntityName = kesTerroristStart;
+				inPlayer->SetPendingCommand(kcJoinTeamTwo);
+			}
+			break;
+		}
+	}
+	else if(this->mMapMode == MAP_MODE_DM)
+	{
+		theSpawnEntityName = kesDeathMatchStart;
+	}
+
+	return theSpawnEntityName;
+}
+
+float AvHGamerules::GetTimeGameStarted() const
+{
+	return this->mTimeGameStarted;
+}
+
+int AvHGamerules::GetTimeLimit() const
+{
+	float theMinutes = CVAR_GET_FLOAT("mp_timelimit");
+
+	if(this->GetIsCombatMode())
+	{
+		theMinutes = CVAR_GET_FLOAT(kvCombatTime);
+	}
+
+	int theTimeLimit = (int)(theMinutes*60);
+
+	return theTimeLimit;
+}
+
+const AvHTeam* AvHGamerules::GetTeam(AvHTeamNumber inTeamNumber) const
+{
+	const AvHTeam* theTeam = NULL;
+
+	ASSERT((inTeamNumber == TEAM_IND) || (inTeamNumber == TEAM_ONE) || (inTeamNumber == TEAM_TWO));
+
+	if(inTeamNumber == TEAM_ONE)
+	{
+		theTeam = &this->mTeamOne;
+	}
+	else if(inTeamNumber == TEAM_TWO)
+	{
+		theTeam = &this->mTeamTwo;
+	}
+	else
+	{
+		// TODO: emit error?
+	}
+	return theTeam;
+}
+
+AvHTeam* AvHGamerules::GetTeam(AvHTeamNumber inTeamNumber)
+{
+	AvHTeam* theTeam = NULL;
+	if(inTeamNumber == TEAM_ONE)
+	{
+		theTeam = &this->mTeamOne;
+	}
+	else if(inTeamNumber == TEAM_TWO)
+	{
+		theTeam = &this->mTeamTwo;
+	}
+	else
+	{
+		// TODO: emit error?
+	}
+	return theTeam;
+}
+
+AvHTeamNumber AvHGamerules::GetVictoryTeam() const
+{
+	return this->mVictoryTeam;
+}
+
+float AvHGamerules::GetVictoryTime() const
+{
+	return this->mVictoryTime;
+}
+
+// Assumes full encumbered weight around 50
+int	AvHGamerules::GetMaxWeight(void) const
+{
+	return 30;
+}
+
+int	AvHGamerules::GetNumCommandersOnTeam(AvHTeamNumber inTeam)
+{
+	const AvHTeam* theTeam = this->GetTeam(inTeam);
+	ASSERT(theTeam);
+
+	int theNumCommanders = (theTeam->GetCommander() == -1 ? 0 : 1);
+	return theNumCommanders;
+}
+
+int AvHGamerules::GetNumActiveHives(AvHTeamNumber inTeam) const
+{
+    int theNumHives = 0;
+
+    const AvHTeam* theTeam = this->GetTeam(inTeam);
+    if(theTeam)
+    {
+        theNumHives = theTeam->GetNumActiveHives();
+    }
+
+    return theNumHives;
+}
+
+int	AvHGamerules::GetNumEntities() const
+{
+	int theNumEntities = 0;
+
+	//AvHSUPrintDevMessage("FOR_ALL_BASEENTITIES: AvHGamerules::GetNumEntities\n");
+
+//	FOR_ALL_BASEENTITIES();
+//		theNumEntities++;
+//	END_FOR_ALL_BASEENTITIES();
+
+    theNumEntities = g_engfuncs.pfnNumberOfEntities();
+
+	return theNumEntities;
+}
+
+int	AvHGamerules::GetWeightForItemAndAmmo(AvHWeaponID inWeapon, int inNumRounds) const
+{
+	// Assumes full encumbered weight around 50
+
+	int theWeight = 0;
+	ASSERT(inNumRounds >= 0);
+
+	switch(inWeapon)
+	{
+	case AVH_WEAPON_NONE:
+		break;
+
+	case AVH_WEAPON_MG:
+		theWeight += 4;
+		theWeight += (inNumRounds/100.0f)*1;
+		break;
+
+	case AVH_WEAPON_PISTOL:
+		theWeight += 2;
+		theWeight += (inNumRounds/8.0f)*.5;
+		break;
+
+	case AVH_WEAPON_KNIFE:
+		// No weight for the knife
+		break;
+
+	case AVH_WEAPON_SONIC:
+		theWeight += 5;
+		theWeight += (inNumRounds/10.0f)*2;
+		break;
+
+	case AVH_WEAPON_HMG:
+		theWeight += 7;
+		theWeight += (inNumRounds/150.0f)*2;
+		break;
+
+	case AVH_WEAPON_GRENADE_GUN:
+		theWeight += 7;
+		theWeight += (inNumRounds/4.0f)*1;
+		break;
+
+	case AVH_WEAPON_WELDER:
+		theWeight += 4;
+		break;
+
+//	case AVH_WEAPON_NUKE:
+//		theWeight += 18;
+//		theWeight += (inNumRounds/5.0f)*8;
+//		break;
+
+	//case AVH_WEAPON_FLAMER:
+	//	theWeight += 10;
+	//	break;
+
+	case AVH_WEAPON_MINE:
+		// Only judge by amount of ammo
+		theWeight += inNumRounds;
+		break;
+	}
+
+	return theWeight;
+}
+
+BOOL AvHGamerules::IsMultiplayer( void )
+{
+	return TRUE;
+}
+
+BOOL AvHGamerules::IsDeathmatch( void )
+{
+	return FALSE;
+}
+
+BOOL AvHGamerules::IsCoOp( void )
+{
+	return FALSE;
+}
+
+void AvHGamerules::InitHUD( CBasePlayer *pPlayer )
+{
+	// Call down to base class first (this may need to be changed later but make sure to update spectator cam)
+	CHalfLifeTeamplay::InitHUD(pPlayer);
+#ifdef USE_UPP
+	UPPUtil_InitializePlayer(pPlayer);
+#endif
+	// notify other clients of player joining the game
+	UTIL_ClientPrintAll( HUD_PRINTNOTIFY, UTIL_VarArgs( "%s has joined the game\n", ( pPlayer->pev->netname && STRING(pPlayer->pev->netname)[0] != 0 ) ? STRING(pPlayer->pev->netname) : "unconnected" ) );
+}
+
+
+void GetMapNamesFromMapCycle(StringList& outMapNameList);
+
+void AvHGamerules::InitializeMapVoteList()
+{
+    // Add each map
+    this->mMapVoteList.clear();
+    this->mPlayersVoted.clear();
+	this->mPlayersVoteTime.clear();
+
+    StringList theMapNames;
+    GetMapNamesFromMapCycle(theMapNames);
+
+    // Traverse list
+    for(StringList::iterator theIter = theMapNames.begin(); theIter != theMapNames.end(); theIter++)
+    {
+        this->mMapVoteList.push_back( make_pair(*theIter, 0) );
+    }
+}
+
+void AvHGamerules::PlayerGotWeapon(CBasePlayer *pPlayer, CBasePlayerItem *pWeapon)
+{
+	ItemInfo theItemInfo;
+	pWeapon->GetItemInfo(&theItemInfo);
+	int theWeaponFlags = theItemInfo.iFlags;
+	//bool theDroppedWeapon = false;
+
+	for(int i = 0; i < 2; i++)
+	{
+		int theCurrentFlag = (i == 0 ? PRIMARY_WEAPON : SECONDARY_WEAPON);
+
+		CBasePlayerItem* theCurrentItem = NULL;
+		bool theHasWeaponWithFlag = pPlayer->HasItemWithFlag(theCurrentFlag, theCurrentItem);
+
+		if(((theWeaponFlags & theCurrentFlag) && pPlayer->HasItemWithFlag(theCurrentFlag, theCurrentItem)))
+		{
+			// Discard the one we have
+			char theWeaponName[256];
+			const char* theCurrentWeaponName = theCurrentItem->pszName();
+			ASSERT(theCurrentWeaponName);
+
+			strcpy(theWeaponName, theCurrentWeaponName);
+			AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(pPlayer);
+			if(thePlayer)
+			{
+				if(GetGameRules()->GetIsCombatMode())
+				{
+					thePlayer->RemovePlayerItem(theCurrentItem);
+                    theCurrentItem->DestroyItem();
+				}
+				else
+				{
+					thePlayer->DropItem(theWeaponName);
+				}
+			}
+			//theDroppedWeapon = true;
+		}
+	}
+
+	//if(!theDroppedWeapon)
+	//{
+		CHalfLifeTeamplay::PlayerGotWeapon(pPlayer, pWeapon);
+	//}
+
+	if(GetGameRules()->GetIsCombatMode())
+	{
+		if(!AvHSUGetIsExternalClassName(STRING(pWeapon->pev->classname)))
+		{
+			AvHBasePlayerWeapon* theWeapon = dynamic_cast<AvHBasePlayerWeapon*>(pWeapon);
+			if(theWeapon)
+			{
+				// Spawn with default ammo
+				ItemInfo theItemInfo;
+				if(theWeapon->UsesAmmo() && theWeapon->GetItemInfo(&theItemInfo) && theWeapon->GetCanBeResupplied())
+				{
+					//int theMaxPrimary = theItemInfo.iMaxAmmo1;
+					int theStartAmmo = theItemInfo.iMaxClip*BALANCE_IVAR(kCombatSpawnClips);
+
+					// Add some to primary store
+					pPlayer->m_rgAmmo[theWeapon->m_iPrimaryAmmoType] = theStartAmmo;
+				}
+			}
+		}
+	}
+}
+
+Vector AvHGamerules::GetSpawnAreaCenter(AvHTeamNumber inTeamNumber) const
+{
+	Vector theCenter(0, 0, 0);
+	int theNumSpawns = 0;
+
+	for(SpawnListType::const_iterator theIter = this->mSpawnList.begin(); theIter != this->mSpawnList.end(); theIter++)
+	{
+		if(theIter->GetTeamNumber() == inTeamNumber)
+		{
+			VectorAdd(theIter->GetOrigin(), theCenter, theCenter);
+			theNumSpawns++;
+		}
+	}
+
+	if(theNumSpawns > 0)
+	{
+		VectorScale(theCenter, 1.0f/theNumSpawns, theCenter);
+	}
+
+	return theCenter;
+}
+
+void AvHGamerules::PerformMapValidityCheck()
+{
+	// Perform check to see that we have enough of all the entities
+	int theNumReadyRoomSpawns = 0;
+	int theNumTeamOneSpawns = 0;
+	int theNumTeamTwoSpawns = 0;
+//	CBaseEntity* theSpawn = NULL;
+//	while((theSpawn = UTIL_FindEntityByClassname(theSpawn, kesReadyRoomStart)) != NULL)
+//	{
+//		theNumReadyRoomSpawns++;
+//	}
+
+	for(SpawnListType::const_iterator theIter = this->mSpawnList.begin(); theIter != this->mSpawnList.end(); theIter++)
+	{
+		if(!strcmp(theIter->GetClassName().c_str(), kesReadyRoomStart))
+		{
+			theNumReadyRoomSpawns++;
+		}
+		else if(theIter->GetTeamNumber() == TEAM_ONE)
+		{
+			theNumTeamOneSpawns++;
+		}
+		else if(theIter->GetTeamNumber() == TEAM_TWO)
+		{
+			theNumTeamTwoSpawns++;
+		}
+	}
+
+	int theNumDesiredReadyRoomSpawns = 32;
+	int theNumDesiredTeamOneSpawns = this->mTeamOne.GetDesiredSpawnCount();
+	int theNumDesiredTeamTwoSpawns = this->mTeamTwo.GetDesiredSpawnCount();
+
+	if((theNumReadyRoomSpawns < theNumDesiredReadyRoomSpawns) || (theNumTeamOneSpawns < theNumDesiredTeamOneSpawns) || (theNumTeamTwoSpawns < theNumDesiredTeamTwoSpawns))
+	{
+		ALERT(at_logged, "Map validity check failure: %d/%d ready room spawns, %d/%d team one spawns, %d/%d team two spawns.\n", theNumReadyRoomSpawns, theNumDesiredReadyRoomSpawns, theNumTeamOneSpawns, theNumDesiredTeamOneSpawns, theNumTeamTwoSpawns, theNumDesiredTeamTwoSpawns);
+	}
+	else
+	{
+		ALERT(at_logged, "Map validity check success.\n");
+	}
+}
+
+void AvHGamerules::PostWorldPrecacheInitParticles()
+{
+	// When a player first connects, send down all particle info
+	ASSERT(gParticleTemplateList.GetCreatedTemplates());
+
+	// Make sure client clears out all particle systems first
+	int theNumberTemplates = gParticleTemplateList.GetNumberTemplates();
+	for(int i = 0; i < theNumberTemplates; i++)
+	{
+		AvHParticleTemplate* theTemplate = gParticleTemplateList.GetTemplateAtIndex(i);
+		gParticleTemplateList.LinkToEntities(theTemplate);
+	}
+}
+
+void AvHGamerules::PreWorldPrecacheInitParticles()
+{
+	// Reset templates and everything
+	AvHParticleSystemManager::Instance()->Reset();
+
+	// Load up the particle systems from modname.ps then levelname.ps
+	TRDescriptionList theDescriptionList;
+	string theLevelBaseSystemFile = string(getModDirectory()) + "/" + kBasePSName;
+    if(TRFactory::ReadDescriptions(theLevelBaseSystemFile, theDescriptionList))
+	{
+		gParticleTemplateList.CreateTemplates(theDescriptionList);
+	}
+	theDescriptionList.clear();
+
+	// TODO: the level name isn't populated yet for some reason
+	const char* theCStrLevelName = STRING(gpGlobals->mapname);
+	if(theCStrLevelName && !FStrEq(theCStrLevelName, ""))
+	{
+		string theLevelName = theCStrLevelName;
+		string theLevelParticleSystemFile = string(getModDirectory()) + string("/") + theLevelName + string(".ps");
+		if(TRFactory::ReadDescriptions(theLevelParticleSystemFile, theDescriptionList))
+		{
+			gParticleTemplateList.CreateTemplates(theDescriptionList);
+		}
+	}
+}
+
+// Emit line to log indicating victory status
+void AvHGamerules::TallyVictoryStats() const
+{
+	int theGameLength = (int)(gpGlobals->time - this->mTimeGameStarted);
+	int theGameLengthMinutes = theGameLength/60;
+	int theGameLengthSeconds = theGameLength % 60;
+
+	const char* thePrintableMapName = "ns_?";
+	const char* theMapName = STRING(gpGlobals->mapname);
+	if(theMapName)
+	{
+		thePrintableMapName = theMapName;
+	}
+
+	const AvHTeam* theVictoryTeam = &this->mTeamOne;
+	const AvHTeam* theLosingTeam = &this->mTeamTwo;
+
+	if(this->mVictoryTeam == TEAM_TWO)
+	{
+		theVictoryTeam = &this->mTeamTwo;
+		theLosingTeam = &this->mTeamOne;
+	}
+
+	ALERT(at_logged, "Team \"%d\" scored \"%d\" with \"%d\" players\n", TEAM_ONE, (int)this->mTeamOne.GetTotalResourcesGathered(), (int)this->mTeamOne.GetPlayerCount());
+	ALERT(at_logged, "Team \"%d\" scored \"%d\" with \"%d\" players\n", TEAM_TWO, (int)this->mTeamTwo.GetTotalResourcesGathered(), (int)this->mTeamTwo.GetPlayerCount());
+
+	if(!this->mVictoryDraw)
+	{
+		ALERT(at_logged, "(map_name \"%s\") (game_version \"%s\") (game_time \"%02d:%02d\") (victory_team \"%s\") (losing_team \"%s\") (winning_teamsize \"%d\") (losing_teamsize \"%d\")\n",
+			thePrintableMapName,
+			AvHSUGetGameVersionString(),
+			theGameLengthMinutes,
+			theGameLengthSeconds,
+			theVictoryTeam->GetTeamTypeString(),
+			theLosingTeam->GetTeamTypeString(),
+			theVictoryTeam->GetPlayerCount(),
+			theLosingTeam->GetPlayerCount());
+	}
+	else
+	{
+		ALERT(at_logged, "(map_name \"%s\") (game_version \"%s\") (game_time \"%02d:%02d\") (victory_team \"draw\") (losing_team \"draw\")\n",
+			thePrintableMapName,
+			AvHSUGetGameVersionString(),
+			theGameLengthMinutes,
+			theGameLengthSeconds);
+	}
+
+	//sprintf(theVictoryString, "%d?%s?%d?%d?%s?%s?%d?%d", this->mVictoryTeam, theTeamTypeString.c_str(), theNumTeamOnePlayers, theNumTeamTwoPlayers, thePrintableMapName, kGameVersion, theGameMinutes, theExtraSeconds, kGameVersion);
+	//this->PostVictoryStatsToWeb(string(theVictoryString));
+}
+
+void AvHGamerules::InitializeTechNodes()
+{
+	this->mTeamOne.InitializeTechNodes();
+	this->mTeamTwo.InitializeTechNodes();
+}
+
+void AvHGamerules::PlayerDeathEnd(AvHPlayer* inPlayer)
+{
+	ASSERT(inPlayer);
+
+//	if(!this->FPlayerCanRespawn(inPlayer))
+//	{
+	if(inPlayer->GetPlayMode() == PLAYMODE_PLAYING)
+	{
+		inPlayer->pev->nextthink = -1;
+		inPlayer->SetPlayMode(PLAYMODE_AWAITINGREINFORCEMENT, true);
+	}
+	//	}
+//	else
+//	{
+//		this->RespawnPlayer(inPlayer);
+//	}
+}
+
+void AvHGamerules::PlayerKilled( CBasePlayer *pVictim, entvars_t *pKiller, entvars_t *pInflictor )
+{
+	// Tell gamerules
+	CHalfLifeTeamplay::PlayerKilled(pVictim, pKiller, pInflictor);
+
+	CBaseEntity* theBaseKiller = CBaseEntity::Instance(pKiller);
+	AvHPlayer* theKiller = dynamic_cast<AvHPlayer*>(theBaseKiller);
+	if(!theKiller)
+	{
+		CBaseEntity* theOwner = CBaseEntity::Instance(theBaseKiller->pev->owner);
+		theKiller = dynamic_cast<AvHPlayer*>(theOwner);
+	}
+
+	if(theKiller)
+	{
+		this->RewardPlayerForKill(theKiller, pVictim, pInflictor);
+	}
+}
+
+
+// From CHalfLifeMultiplay::PlayerSpawn
+void AvHGamerules::PlayerSpawn( CBasePlayer *pPlayer )
+{
+	AvHPlayer*		theAvHPlayer = dynamic_cast<AvHPlayer*>(pPlayer);
+	BOOL			addDefault;
+	CBaseEntity*	pWeaponEntity = NULL;
+
+	pPlayer->pev->weapons |= (1<<WEAPON_SUIT);
+
+	addDefault = TRUE;
+
+	while ( pWeaponEntity = UTIL_FindEntityByClassname( pWeaponEntity, "game_player_equip" ))
+	{
+		pWeaponEntity->Touch( pPlayer );
+		addDefault = FALSE;
+	}
+
+	// Old-school spawn effect
+//	MESSAGE_BEGIN(MSG_BROADCAST, SVC_TEMPENTITY);
+//	WRITE_BYTE(TE_TELEPORT);
+//	WRITE_COORD(pPlayer->pev->origin.x);
+//	WRITE_COORD(pPlayer->pev->origin.y);
+//	WRITE_COORD(pPlayer->pev->origin.z);
+//	MESSAGE_END();
+
+	if ( addDefault )
+	{
+		theAvHPlayer->pev->team = theAvHPlayer->GetTeam();
+		//theAvHPlayer->InitializeFromTeam();
+		//this->GetTeam(theAvHPlayer->GetTeam())->AddPlayer(theAvHPlayer->entindex(), theAvHPlayer->GetRole());
+	}
+}
+
+void AvHGamerules::PlayerThink( CBasePlayer *pPlayer )
+{
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(pPlayer);
+
+	// Update base
+	CHalfLifeTeamplay::PlayerThink(pPlayer);
+}
+
+// Reset all players, remove weapons off the ground, etc.
+void AvHGamerules::PostWorldPrecacheReset(bool inNewMap)
+{
+	#ifdef AVH_PLAYTEST_BUILD
+	this->ReadBalanceData();
+	#endif
+
+    EntityListType theJoinedTeamOne;
+    EntityListType theJoinedTeamTwo;
+    EntityListType theSpectating;
+
+	// If we're preserving teams
+	if(this->mPreserveTeams)
+	{
+		// Remember the players that had already joined
+		FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+			int theEntityIndex = theEntity->entindex();
+
+			if(theEntity->pev->team == TEAM_ONE)
+			{
+				theJoinedTeamOne.push_back(theEntityIndex);
+			}
+			else if(theEntity->pev->team == TEAM_TWO)
+			{
+				theJoinedTeamTwo.push_back(theEntityIndex);
+			}
+			else if(theEntity->pev->team == TEAM_IND)
+			{
+				if(theEntity->GetPlayMode() == PLAYMODE_OBSERVER)
+				{
+					theSpectating.push_back(theEntityIndex);
+				}
+			}
+
+			theEntity->SendMessageNextThink(kGameStarting);
+
+		END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+	}
+
+	// Stop running all scripts
+	AvHScriptManager::Instance()->Reset();
+
+	this->DeleteAndResetEntities();
+
+	gServerTick = 0;
+	gServerUpdate = false;
+	this->mTimeUpdatedScripts = -1;
+
+	// Reset game on teams
+	this->mGameplay.Reset();
+
+	// Find gameplay entity if it exists
+	FOR_ALL_ENTITIES(kwsGameplayClassName, AvHGameplay*)
+		this->mGameplay = *theEntity;
+	END_FOR_ALL_ENTITIES(kwsMapInfoClassName)
+
+	this->mTeamOne.ResetGame();
+	this->mTeamTwo.ResetGame();
+
+	this->mTeamOneEntityHierarchy.Clear();
+	this->mTeamTwoEntityHierarchy.Clear();
+
+	// Set up both sides
+	this->mTeamOne.SetTeamType(this->mGameplay.GetTeamOneType());
+	this->mTeamTwo.SetTeamType(this->mGameplay.GetTeamTwoType());
+
+	// Set team numbers differently if teams are the same, so their colors change
+	// Marines vs. marines will be team 1 vs, team 3, aliens vs. aliens will be team 2 vs. team 4
+	if(this->mTeamOne.GetTeamType() == this->mTeamTwo.GetTeamType())
+	{
+		if(this->mTeamOne.GetTeamType() == AVH_CLASS_TYPE_MARINE)
+		{
+			this->mTeamOne.SetTeamNumber(TEAM_ONE);
+			this->mTeamTwo.SetTeamNumber(TEAM_THREE);
+			this->mTeamTwo.SetTeamName(kMarine2Team);
+			this->mTeamTwo.SetTeamPrettyName(kMarinePrettyName);
+		}
+		else
+		{
+			this->mTeamOne.SetTeamNumber(TEAM_TWO);
+			this->mTeamTwo.SetTeamNumber(TEAM_FOUR);
+			this->mTeamTwo.SetTeamName(kAlien2Team);
+			this->mTeamTwo.SetTeamPrettyName(kAlienPrettyName);
+		}
+	}
+
+	this->InitializeTechNodes();
+
+	this->PostWorldPrecacheInitParticles();
+
+	// Set round as not started
+	this->InternalResetGameRules();
+
+	this->mEntitiesUnderAttack.clear();
+
+	this->mMapExtents.ResetMapExtents();
+
+	this->mCalculatedMapGamma = false;
+
+	// TODO: Clear min/max map sizes?  Others?
+
+	// Find info location entities, store our own internal representation, then delete them for efficiency
+	if(inNewMap || (this->mSpawnList.size() == 0))
+	{
+		this->mInfoLocations.clear();
+
+		FOR_ALL_ENTITIES(kesInfoLocation, AvHInfoLocation*)
+			AvHBaseInfoLocation theLocation(*theEntity);
+			this->mInfoLocations.push_back(theLocation);
+			UTIL_Remove(theEntity);
+		END_FOR_ALL_ENTITIES(kesInfoLocation);
+
+		// Clear spawns on a new map only
+		this->mSpawnList.clear();
+		if(this->mSpawnEntity)
+		{
+			UTIL_Remove(this->mSpawnEntity);
+		}
+
+		FOR_ALL_ENTITIES(kesReadyRoomStart, CPointEntity*)
+			string theClassName(STRING(theEntity->pev->classname));
+			this->RegisterSpawnPoint(theClassName, theEntity->pev->origin, theEntity->pev->angles, TEAM_IND);
+			UTIL_Remove(theEntity);
+		END_FOR_ALL_ENTITIES(kesReadyRoomStart);
+
+		FOR_ALL_ENTITIES(kesTeamStart, AvHTeamStartEntity*)
+			string theClassName(STRING(theEntity->pev->classname));
+			this->RegisterSpawnPoint(theClassName, theEntity->pev->origin, theEntity->pev->angles, theEntity->GetTeamNumber());
+			UTIL_Remove(theEntity);
+		END_FOR_ALL_ENTITIES(kesTeamStart);
+
+		// Create dummy entity we can use to return from SelectSpawnPoint
+		this->mSpawnEntity = CBaseEntity::Create(kesReadyRoomStart, Vector(), Vector());
+		ASSERT(this->mSpawnEntity);
+
+		// Added by mmcguire.
+        this->mSpawnEntity->pev->effects |= EF_NODRAW;
+
+        // Clear map voting on a level change
+        this->mMapVoteList.clear();
+        this->mPlayersVoted.clear();
+		this->mPlayersVoteTime.clear();
+	}
+
+	// Must happen after processing spawn entities
+	this->RecalculateMapMode();
+
+	// Loop through all players that are playing and respawn them
+
+	bool theJustResetGameAtCountdownStart = false;
+
+	// Now tell those players to all join again
+	for(EntityListType::iterator theIter = theJoinedTeamOne.begin(); theIter != theJoinedTeamOne.end(); theIter++)
+	{
+		AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(*theIter)));
+		if(thePlayer)
+		{
+			GetGameRules()->JoinTeam(thePlayer, TEAM_ONE, false, true);
+		}
+		theJustResetGameAtCountdownStart = true;
+	}
+	theJoinedTeamOne.clear();
+
+	// Now tell those players to all join again
+	for(theIter = theJoinedTeamTwo.begin(); theIter != theJoinedTeamTwo.end(); theIter++)
+	{
+		AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(*theIter)));
+		if(thePlayer)
+		{
+			GetGameRules()->JoinTeam(thePlayer, TEAM_TWO, false, true);
+		}
+		theJustResetGameAtCountdownStart = true;
+	}
+	theJoinedTeamTwo.clear();
+
+	// Rejoin spectators
+	for(theIter = theSpectating.begin(); theIter != theSpectating.end(); theIter++)
+	{
+		AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(*theIter)));
+		if(thePlayer)
+		{
+			thePlayer->SetPlayMode(PLAYMODE_OBSERVER);
+		}
+		theJustResetGameAtCountdownStart = true;
+	}
+	theSpectating.clear();
+
+	if(theJustResetGameAtCountdownStart)
+	{
+		this->mTimeCountDownStarted = this->mSavedTimeCountDownStarted;
+		this->mStartedCountdown = true;
+	}
+
+	//gVoiceHelper.Reset();
+}
+
+void AvHGamerules::JoinTeam(AvHPlayer* inPlayer, AvHTeamNumber inTeamToJoin, bool inDisplayErrorMessage, bool inForce)
+{
+    // Report new player status
+	#ifdef USE_UPP
+		UPP::reportPlayerChangingTeams(UPPUtil_GetPlayerInfo(inPlayer),inTeamToJoin);
+	#endif
+
+	int thePrevTeam = inPlayer->pev->team;
+	inPlayer->pev->team = inTeamToJoin;
+
+	inPlayer->InitializeFromTeam();
+
+	AvHServerPlayerData* theServerPlayerData = inPlayer->GetServerPlayerData();
+
+	bool thePlayerCanJoinImmediately = this->GetArePlayersAllowedToJoinImmediately() && this->SelectSpawnPoint(inPlayer) || inForce;
+
+	if(theServerPlayerData
+		&& theServerPlayerData->GetHasJoinedTeam()
+		&& GetGameRules()->GetGameStarted()
+		&& !inForce
+		&& inTeamToJoin != TEAM_IND
+		&& !GetGameRules()->GetCheatsEnabled())
+		thePlayerCanJoinImmediately = false;
+
+	if(thePlayerCanJoinImmediately)
+	{
+		inPlayer->SetPlayMode(PLAYMODE_PLAYING);
+	}
+	else
+	{
+		inPlayer->SetPlayMode(PLAYMODE_AWAITINGREINFORCEMENT);
+		inPlayer->SendMessage(kJoinSoon);
+	}
+
+	if(inTeamToJoin != TEAM_IND)
+	{
+		UTIL_LogPrintf("\"%s<%d><%s>\" joined team \"%s\"\n",
+			STRING(inPlayer->pev->netname),
+			GETPLAYERUSERID(inPlayer->edict()),
+			AvHSUGetPlayerAuthIDString(inPlayer->edict()).c_str(),
+			AvHSUGetTeamName(inPlayer->pev->team));
+
+		if(theServerPlayerData)
+			theServerPlayerData->SetHasJoinedTeam(true);
+	}
+}
+
+// This is called before any entities are spawned, every time the map changes, including the first time
+void AvHGamerules::PreWorldPrecacheReset()
+{
+	gParticleTemplateList.Clear();
+	AvHMP3Audio::ClearSoundNameList();
+	this->PreWorldPrecacheInitParticles();
+}
+
+void AvHGamerules::ProcessRespawnCostForPlayer(AvHPlayer* inPlayer)
+{
+	AvHTeam* theTeam = inPlayer->GetTeamPointer();
+	if(theTeam)
+	{
+		AvHClassType theTeamType = theTeam->GetTeamType();
+		if(theTeamType == AVH_CLASS_TYPE_ALIEN)
+		{
+			// It costs an egg, or points
+			//			AvHEgg* theEgg = this->FindEggForTeam(inPlayer->GetTeam());
+			//			if(!theEgg)
+			//			{
+			//				// Deduct point cost
+			//				int theRespawnCost = inPlayer->GetRespawnCost();
+			//				ASSERT(inPlayer->GetResources() >= theRespawnCost);
+			//				inPlayer->SetResources(inPlayer->GetResources() - theRespawnCost);
+			//
+			//				this->MarkDramaticEvent(kHiveSpawnPriority, inPlayer);
+			//			}
+			//			else
+			//			{
+			//				this->MarkDramaticEvent(kEggSpawnPriority, inPlayer, theEgg);
+			//			}
+		}
+		else if(theTeamType == AVH_CLASS_TYPE_MARINE)
+		{
+			// It costs a reinforcement for a marine
+			//			int theNumReinforcements = theTeam->GetReinforcements();
+			//			ASSERT(theNumReinforcements > 0);
+			//			theTeam->SetReinforcements(theNumReinforcements - 1);
+
+			this->MarkDramaticEvent(kReinforcementsPriority, inPlayer);
+		}
+	}
+	// No team?  Player died in the ready room...fix?
+}
+
+void AvHGamerules::ProcessTeamUpgrade(AvHMessageID inUpgrade, AvHTeamNumber inNumber, int inEntity, bool inGive)
+{
+	AvHTeam* theTeam = this->GetTeam(inNumber);
+	if(theTeam && (theTeam->GetTeamType() == AVH_CLASS_TYPE_MARINE))
+	{
+		//AvHSUPrintDevMessage("FOR_ALL_BASEENTITIES: AvHGamerules::ProcessTeamUpgrade\n");
+
+		// Add or remove the upgrade from every entity that's on the team
+		FOR_ALL_BASEENTITIES();
+		if(theBaseEntity->pev->team == inNumber)
+		{
+			AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theBaseEntity);
+			if(thePlayer)
+			{
+				thePlayer->GiveTeamUpgrade(inUpgrade, inGive);
+			}
+			else
+			{
+				ProcessGenericUpgrade(theBaseEntity->pev->iuser4, inUpgrade, inGive);
+			}
+		}
+		END_FOR_ALL_BASEENTITIES();
+
+		// Store it in the team too, so new players and entities can be initialized properly
+		theTeam->ProcessTeamUpgrade(inUpgrade, inGive);
+	}
+}
+
+bool AvHGamerules::ReadyToStartCountdown()
+{
+	bool theReadyToStartCountdown = false;
+
+	int theTeamOnePlayerCount = this->mTeamOne.GetPlayerCount();
+    int theTeamTwoPlayerCount = this->mTeamTwo.GetPlayerCount();
+
+	bool theAtLeastOneOnTeamOne = theTeamOnePlayerCount > 0;
+	bool theAtLeastOneOnTeamTwo = theTeamTwoPlayerCount > 0;
+
+	if(this->GetCheatsEnabled())
+	{
+		if(theAtLeastOneOnTeamOne || theAtLeastOneOnTeamTwo)
+		{
+			theReadyToStartCountdown = true;
+		}
+	}
+	else
+	{
+		if(this->GetIsTournamentMode())
+		{
+			// Don't start unless both sides are equal and both sides have said their team is ready
+			if(theAtLeastOneOnTeamOne && theAtLeastOneOnTeamTwo /*&& (theTeamOnePlayerCount == theTeamTwoPlayerCount)*/)
+			{
+				if(this->mTeamOne.GetIsReady() && this->mTeamTwo.GetIsReady())
+				{
+					theReadyToStartCountdown = true;
+				}
+			}
+		}
+		else if(theAtLeastOneOnTeamOne && theAtLeastOneOnTeamTwo)
+		{
+			theReadyToStartCountdown = true;
+		}
+	}
+
+	return theReadyToStartCountdown;
+}
+
+void AvHGamerules::RecalculateHandicap()
+{
+    const float kHandicapMax = 100.0f;
+
+	// Teams can enforce their own handicaps if they want (cap to valid values)
+	float theBaseTeam1Handicap = max(min(kHandicapMax, avh_team1damagepercent.value), 0.0f);
+	float theBaseTeam2Handicap = max(min(kHandicapMax, avh_team2damagepercent.value), 0.0f);
+
+    // Set handicap scalars
+	this->mTeamOne.SetHandicap(theBaseTeam1Handicap/kHandicapMax);
+	this->mTeamTwo.SetHandicap(theBaseTeam2Handicap/kHandicapMax);
+
+	avh_team1damagepercent.value = theBaseTeam1Handicap;
+	avh_team2damagepercent.value = theBaseTeam2Handicap;
+}
+
+// Called when dedicated server exits
+void AvHGamerules::ServerExit()
+{
+	#ifdef USE_UPP
+		UPP::disconnect();
+	#endif
+}
+
+void AvHGamerules::VoteMap(int inPlayerIndex, int inMapIndex)
+{
+	// check to remove votemap spam
+	map< int, float >::iterator thePlayerVoteTime = this->mPlayersVoteTime.find(inPlayerIndex);
+
+	if (thePlayerVoteTime != this->mPlayersVoteTime.end())
+	{
+		if (thePlayerVoteTime->second + 3.0f > gpGlobals->time)
+			return;
+
+		thePlayerVoteTime->second = gpGlobals->time;
+	}
+	else
+	{
+		this->mPlayersVoteTime.insert(pair < int, float >(inPlayerIndex, gpGlobals->time));
+	}
+
+    if(avh_mapvoteratio.value != -1)
+    {
+        if(this->mMapVoteList.size() == 0)
+        {
+            this->InitializeMapVoteList();
+        }
+
+        // If this is a valid map
+		if((inMapIndex > 0) && (inMapIndex <= (signed)this->mMapVoteList.size()))
+		{
+
+			PlayerMapVoteListType::iterator theMappedPlayer = this->mPlayersVoted.find(inPlayerIndex);
+			
+            // Increment votes for map
+            MapVoteListType::iterator theIter = (MapVoteListType::iterator)&this->mMapVoteList[inMapIndex-1];
+            int theVotes = ++theIter->second;
+
+			// If player has already voted, decrement previous map and update which map the player has voted
+			if(theMappedPlayer != this->mPlayersVoted.end()) {
+				((MapVoteListType::iterator)&this->mMapVoteList[theMappedPlayer->second - 1])->second--;
+				theMappedPlayer->second = inMapIndex;
+			}
+			// else, remember the "new" player's vote
+			else
+			{
+				this->mPlayersVoted.insert(pair < int, int >(inPlayerIndex, inMapIndex));
+			}
+
+            // Tell everyone
+            CBaseEntity* theVotingPlayer = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(inPlayerIndex));
+            ASSERT(theVotingPlayer);
+            char* theMessage = UTIL_VarArgs("%s executed votemap %d (%s %d/%d)\n", STRING(theVotingPlayer->pev->netname), inMapIndex, theIter->first.c_str(), theIter->second, this->GetVotesNeededForMapChange());
+            UTIL_ClientPrintAll(HUD_PRINTTALK, theMessage);
+            UTIL_LogPrintf(theMessage);
+
+            // Does this map enough votes to change?
+            if(theVotes >= this->GetVotesNeededForMapChange())
+            {
+                // Changelevel now
+                char theLevelName[256];
+                strcpy(theLevelName, theIter->first.c_str());
+                CHANGE_LEVEL(theLevelName, NULL);
+            }
+			
+		}
+	}
+}
+
+// remove a player's vote from the votemap list and trigger a mapchange check
+void AvHGamerules::RemovePlayerFromVotemap(int inPlayerIndex)
+{
+	PlayerMapVoteListType::iterator theMappedPlayer = this->mPlayersVoted.find(inPlayerIndex);
+
+	// If player has voted, decrement the map voted for
+	if(theMappedPlayer != this->mPlayersVoted.end()) {
+		((MapVoteListType::iterator)&this->mMapVoteList[theMappedPlayer->second - 1])->second--;
+		this->mPlayersVoted.erase(inPlayerIndex);
+	}
+
+	// trigger mapchange check
+	int theVotesNeeded = this->GetVotesNeededForMapChange();
+	for(MapVoteListType::iterator theMapIterator = this->mMapVoteList.begin(); 
+		theMapIterator != this->mMapVoteList.end(); 
+		theMapIterator++)
+	{
+		if (theMapIterator->second >= theVotesNeeded)
+		{
+            // Changelevel now
+            char theLevelName[256];
+            strcpy(theLevelName, theMapIterator->first.c_str());
+            CHANGE_LEVEL(theLevelName, NULL);
+			break;
+		}
+	}
+}
+
+bool AvHGamerules::GetMapVoteStrings(StringList& outMapVoteList)
+{
+    bool theSuccess = false;
+
+    if(avh_mapvoteratio.value != -1)
+    {
+        if(this->mMapVoteList.size() == 0)
+        {
+            this->InitializeMapVoteList();
+        }
+
+        int theMapIndex = 1;
+        outMapVoteList.clear();
+
+        for(MapVoteListType::iterator theIter = this->mMapVoteList.begin(); theIter != this->mMapVoteList.end(); theIter++)
+        {
+            string theOutputString = MakeStringFromInt(theMapIndex) + ") " + theIter->first + " (" + MakeStringFromInt(theIter->second) + "/" + MakeStringFromInt(this->GetVotesNeededForMapChange()) + ")\n";
+            outMapVoteList.push_back(theOutputString);
+            theMapIndex++;
+        }
+
+        theSuccess = true;
+    }
+
+    return theSuccess;
+}
+
+int AvHGamerules::GetVotesNeededForMapChange()
+{
+    int theNumVotes = -1;
+
+    float theMapVoteRatio = avh_mapvoteratio.value;
+    if(theMapVoteRatio > 0)
+    {
+        theMapVoteRatio = min(max(0.0f, theMapVoteRatio), 1.0f);
+        theNumVotes = max(theMapVoteRatio*this->GetNumberOfPlayers(), 1);
+    }
+
+    return theNumVotes;
+}
+
+void AvHGamerules::RegisterSpawnPoint(const string& inClassName, const Vector& inOrigin, const Vector& inAngles, const AvHTeamNumber& inTeamNumber)
+{
+	AvHSpawn theSpawnPoint(inClassName, inOrigin, inAngles, inTeamNumber);
+	this->mSpawnList.push_back(theSpawnPoint);
+}
+
+void AvHGamerules::RespawnPlayer(AvHPlayer* inPlayer)
+{
+	bool thePlayerCanRespawn = this->FPlayerCanRespawn(inPlayer);
+	ASSERT(thePlayerCanRespawn);
+
+	this->ProcessRespawnCostForPlayer(inPlayer);
+
+	// Clear alien upgrades, they must be repurchased.  Soldier upgrades stick.
+	AvHTeam* theTeam = inPlayer->GetTeamPointer();
+	if(theTeam)
+	{
+		if(theTeam->GetTeamType() == AVH_CLASS_TYPE_ALIEN)
+		{
+			inPlayer->pev->iuser4 = 0;
+		}
+
+		respawn(inPlayer->pev, !(inPlayer->m_afPhysicsFlags & PFLAG_OBSERVER));// don't copy a corpse if we're in deathcam.
+		inPlayer->pev->nextthink = -1;
+
+		// Bring us back in the game
+		if(theTeam->GetTeamType() == AVH_CLASS_TYPE_MARINE)
+		{
+			inPlayer->SetUser3(AVH_USER3_MARINE_PLAYER, true);
+		}
+		else if(theTeam->GetTeamType() == AVH_CLASS_TYPE_ALIEN)
+		{
+			inPlayer->SetUser3(AVH_USER3_ALIEN_PLAYER1, true);
+		}
+	}
+}
+
+void AvHGamerules::ResetGame(bool inPreserveTeams)
+{
+	// Reset game rules
+	this->mFirstUpdate = true;
+	this->mPreserveTeams = inPreserveTeams;
+
+	// Reset all players
+//	FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+//		theEntity->Reset();
+//	END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+}
+
+void AvHGamerules::RecalculateMapMode( void )
+{
+	// Recalculate map mode we're in.  MAP_MODE_UNDEFINED means just try to spawn somewhere.
+
+	// Check for AVH entities
+	if((this->GetEntityExists(kesReadyRoomStart)) && (this->GetEntityExists(kesTeamStart)))
+	{
+		const char* theCStrLevelName = STRING(gpGlobals->mapname);
+		if(theCStrLevelName && (strlen(theCStrLevelName) > 3))
+		{
+			if(!strnicmp(theCStrLevelName, "ns_", 3))
+			{
+				if(this->GetEntityExists(kesTeamHive))
+				{
+					if(this->GetEntityExists(kwsTeamCommand))
+					{
+						this->mMapMode = MAP_MODE_NS;
+						this->PerformMapValidityCheck();
+					}
+				}
+			}
+			else if(!strnicmp(theCStrLevelName, "co_", 3))
+			{
+				this->mMapMode = MAP_MODE_CO;
+			}
+		}
+	}
+	// Check for CS entities
+	else if(this->GetEntityExists(kesTerroristStart) && this->GetEntityExists(kesCounterTerroristStart))
+	{
+		this->mMapMode = MAP_MODE_CS;
+	}
+	else if(this->GetEntityExists(kesDeathMatchStart))
+	{
+		this->mMapMode = MAP_MODE_DM;
+	}
+}
+
+bool AvHGamerules::RoamingAllowedForPlayer(CBasePlayer* inPlayer) const
+{
+	AvHPlayer*		thePlayer = dynamic_cast<AvHPlayer*>(inPlayer);
+	bool			theRoamingAllowed = false;
+
+	if(thePlayer)
+	{
+		if((thePlayer->GetPlayMode() == PLAYMODE_OBSERVER))
+		{
+			theRoamingAllowed = true;
+		}
+
+		const AvHTeam* theTeam = this->GetTeam(thePlayer->GetTeam());
+		if(theTeam)
+		{
+			if(theTeam->GetPlayerCount() == 0)
+			{
+				theRoamingAllowed = true;
+			}
+		}
+		else
+		{
+			theTeam = this->GetTeam( (thePlayer->GetTeam() == TEAM_ONE ? TEAM_TWO : TEAM_ONE) );
+			if(theTeam)
+			{
+				if(theTeam->GetPlayerCount() == 0)
+				{
+					theRoamingAllowed = true;
+				}
+			}
+		}
+	}
+
+	return theRoamingAllowed;
+}
+
+//AvHEgg*	AvHGamerules::FindEggForTeam(AvHTeamNumber inTeamNumber) const
+//{
+//	AvHEgg* theEgg = NULL;
+//
+//	FOR_ALL_ENTITIES(kwsEggClassName, AvHEgg*)
+//	if(theEntity->pev->team == inTeamNumber)
+//	{
+//		theEgg = theEntity;
+//		break;
+//	}
+//	END_FOR_ALL_ENTITIES(kwsEggClassName)
+//
+//	return theEgg;
+//}
+
+BOOL AvHGamerules::FShouldSwitchWeapon(CBasePlayer* inPlayer, CBasePlayerItem* inWeapon)
+{
+	BOOL theShouldSwitch = CHalfLifeTeamplay::FShouldSwitchWeapon(inPlayer, inWeapon);
+	if(theShouldSwitch)
+	{
+		AvHBasePlayerWeapon* theWeapon = dynamic_cast<AvHBasePlayerWeapon*>(inWeapon);
+		if(theWeapon && !theWeapon->GetIsCapableOfFiring())
+		{
+			theShouldSwitch = false;
+		}
+	}
+	return theShouldSwitch;
+}
+
+void AvHGamerules::MarkDramaticEvent(int inPriority, CBaseEntity* inPrimaryEntity, bool inDramatic, CBaseEntity* inSecondaryEntity) const
+{
+	ASSERT(inPrimaryEntity);
+	short inPrimaryEntityIndex = ENTINDEX(inPrimaryEntity->edict());
+	short inSecondaryEntityIndex = !inSecondaryEntity ? 0 : ENTINDEX(inSecondaryEntity->edict());
+
+	this->MarkDramaticEvent(inPriority, inPrimaryEntityIndex, inDramatic, inSecondaryEntityIndex);
+}
+
+void AvHGamerules::MarkDramaticEvent(int inPriority, short inPrimaryEntityIndex, bool inDramatic, short inSecondaryEntityIndex) const
+{
+	ASSERT(inPriority >= kMinDramaticPriority);
+	ASSERT(inPriority <= kMaxDramaticPriority);
+
+	MESSAGE_BEGIN(MSG_SPEC, SVC_DIRECTOR);
+		WRITE_BYTE(DIRECTOR_MESSAGE_SIZE);
+		WRITE_BYTE(DRC_CMD_EVENT);
+		WRITE_SHORT(inPrimaryEntityIndex);
+		WRITE_SHORT(inSecondaryEntityIndex);
+
+		int thePriority = inPriority;
+		if(inDramatic)
+		{
+			thePriority |= DRC_FLAG_DRAMATIC;
+		}
+
+		WRITE_LONG(thePriority);
+	MESSAGE_END();
+}
+
+void AvHGamerules::MarkDramaticEvent(int inPriority, short inPrimaryEntityIndex, bool inDramatic, entvars_t* inSecondaryEntity) const
+{
+	// Changed by mmcguire. Sometimes the attacker is NULL (e.g. when a
+	// player creates a turret and then leaves the game), so we need to
+	// handle that case.
+	short secondaryEntityIndex = 0;
+
+	if (inSecondaryEntity != NULL)
+	{
+		secondaryEntityIndex = OFFSET(inSecondaryEntity);
+	}
+
+	this->MarkDramaticEvent(inPriority, inPrimaryEntityIndex, secondaryEntityIndex);
+}
+
+void AvHGamerules::ResetEntities()
+{
+	// Now reset all the world entities and mark useable ones with AVH_USER3_USEABLE
+	//AvHSUPrintDevMessage("FOR_ALL_BASEENTITIES: AvHGamerules::ResetEntities\n");
+
+	FOR_ALL_BASEENTITIES();
+
+	// Reset the entity.  Assumes that players in the ready room have already been reset recently.
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theBaseEntity);
+	if(thePlayer && (thePlayer->GetPlayMode() == PLAYMODE_READYROOM))
+	{
+		int theUser3 = thePlayer->pev->iuser3;
+		int theUser4 = thePlayer->pev->iuser4;
+		int thePlayMode = thePlayer->pev->playerclass;
+		int thePlayerTeam = thePlayer->pev->team;
+		int theSolidType = thePlayer->pev->solid;
+
+		thePlayer->ResetEntity();
+
+		thePlayer->pev->iuser3 = theUser3;
+		thePlayer->pev->iuser4 = theUser4;
+		thePlayer->pev->playerclass = thePlayMode;
+		thePlayer->pev->team = thePlayerTeam;
+		thePlayer->pev->solid = theSolidType;
+	}
+	else
+	{
+		theBaseEntity->ResetEntity();
+	}
+
+	// Don't mark commander stations as useable in this case
+	AvHCommandStation* theCommandStation = dynamic_cast<AvHCommandStation*>(theBaseEntity);
+	if(!theCommandStation)
+	{
+		int	theObjectCaps = theBaseEntity->ObjectCaps();
+		if(theObjectCaps & (FCAP_IMPULSE_USE | FCAP_CONTINUOUS_USE | FCAP_ONOFF_USE))
+		{
+			// After playing once, this is no longer zero
+			//ASSERT(theBaseEntity->pev->iuser3 == 0);
+			if(theBaseEntity->pev->iuser3 == 0)
+			{
+				theBaseEntity->pev->iuser3 = AVH_USER3_USEABLE;
+
+				// Now also mark the target entity as useable!
+				if (!FStringNull(theBaseEntity->pev->target))
+				{
+					CBaseEntity* theTarget = NULL;
+
+					while(theTarget = UTIL_FindEntityByTargetname(theTarget, STRING(theBaseEntity->pev->target)))
+					{
+						theTarget->pev->iuser3 = AVH_USER3_USEABLE;
+					}
+				}
+			}
+		}
+	}
+	END_FOR_ALL_BASEENTITIES();
+}
+
+void AvHGamerules::InternalResetGameRules()
+{
+	#ifdef USE_UPP
+	if(UPP::isRecordingGame())
+	{
+		UPP::reportGameCancelled();
+	}
+	#endif
+	this->mGameStarted = false;
+	this->mTimeCountDownStarted = 0;
+	this->mTimeGameStarted = -1;
+	this->mTimeOfLastGameTimeUpdate = -1;
+    this->mTimeOfLastHLTVProxyUpdate = -1;
+	this->mTimeSentCountdown = 0;
+	this->mTimeLastWontStartMessageSent = 0;
+	this->mStartedCountdown = false;
+	this->mSentCountdownMessage = false;
+	this->mTimeWorldReset = gpGlobals->time;
+	this->mCombatAttackingTeamNumber = TEAM_IND;
+
+	if(this->mLastMapChange == -1)
+	{
+		this->mLastMapChange = gpGlobals->time;
+	}
+
+	this->mVictoryTeam = TEAM_IND;
+	this->mVictoryDraw = false;
+	this->mVictoryTime = 0;
+	this->mCheats.clear();
+	this->mLastParticleUpdate = -1;
+	this->mLastNetworkUpdate = -1;
+	this->mLastWorldEntityUpdate = -1;
+	this->mLastCloakableUpdate = -1;
+	this->mLastVictoryUpdate = -1;
+#ifndef USE_UPP //under UPP, we don't want to reestablish a connection with each new game
+	this->mUpdatedUplink = false;
+#endif
+}
+
+void AvHGamerules::CopyDataToSpawnEntity(const AvHSpawn& inSpawnEntity) const
+{
+	VectorCopy(inSpawnEntity.GetOrigin(), this->mSpawnEntity->pev->origin);
+	VectorCopy(inSpawnEntity.GetAngles(), this->mSpawnEntity->pev->angles);
+	VectorCopy(inSpawnEntity.GetAngles(), this->mSpawnEntity->pev->v_angle);
+	this->mSpawnEntity->pev->team = inSpawnEntity.GetTeamNumber();
+//	VectorCopy(g_vecZero, this->mSpawnEntity->pev->v_angle);
+	//this->mSpawnEntity->pev->classname = inSpawnEntity
+}
+
+// Look for spawns in radius
+CBaseEntity* AvHGamerules::GetRandomHiveSpawnPoint(CBaseEntity* inPlayer, const Vector& inOrigin, float inMaxDistance) const
+{
+	CBaseEntity*			theSpawnPoint = NULL;
+
+	typedef vector<int>		EntityIndexListType;
+	EntityIndexListType		theSpawnIndexList;
+
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inPlayer);
+	ASSERT(thePlayer);
+
+	// Loop through all spawns, looking for valid spawns within range
+	int theIndex = 0;
+	SpawnListType::const_iterator theIter;
+	for(theIter = this->mSpawnList.begin(); theIter != this->mSpawnList.end(); theIter++, theIndex++)
+	{
+		// Found one in range?  Add it's index to the list
+		if(theIter->GetTeamNumber() == AvHTeamNumber(thePlayer->pev->team))
+		{
+			Vector theSpawnOrigin = theIter->GetOrigin();
+			float theDistanceToSpawn = VectorDistance(theSpawnOrigin, inOrigin);
+			if(theDistanceToSpawn <= inMaxDistance)
+			{
+				int theOffset = AvHMUGetOriginOffsetForUser3(AvHUser3(thePlayer->pev->iuser3));
+				theSpawnOrigin.z += theOffset;
+
+				if(AvHSUGetIsEnoughRoomForHull(theSpawnOrigin, AvHMUGetHull(false, inPlayer->pev->iuser3), inPlayer->edict()))
+				{
+					theSpawnIndexList.push_back(theIndex);
+				}
+			}
+		}
+	}
+
+	// If index list has more then one entry
+	int theNumValidSpawns = theSpawnIndexList.size();
+	if(theNumValidSpawns > 0)
+	{
+		// Pick random index
+		int theRandomIndex = RANDOM_LONG(0, theNumValidSpawns - 1);
+		ASSERT(theRandomIndex >= 0);
+		ASSERT(theRandomIndex < theNumValidSpawns);
+		ASSERT(this->mSpawnEntity);
+
+		// Copy data into spawn entity
+		int theSpawnIndex = theSpawnIndexList[theRandomIndex];
+		const AvHSpawn& theSpawn = this->mSpawnList[theSpawnIndex];
+		this->CopyDataToSpawnEntity(theSpawn);
+
+		// Return it
+		theSpawnPoint = this->mSpawnEntity;
+	}
+
+	return theSpawnPoint;
+}
+bool AvHGamerules::CanPlayerBeacon(CBaseEntity *inPlayer) 
+{
+	bool result=true;
+	SpawnListType::const_iterator theSpawnIter;
+
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inPlayer);
+	ASSERT(thePlayer);
+	AvHTeamNumber thePlayerTeamNumber = thePlayer->GetTeam();
+	for(theSpawnIter = this->mSpawnList.begin(); theSpawnIter != this->mSpawnList.end(); theSpawnIter++)
+	{
+		string theClassName = theSpawnIter->GetClassName();
+		if(theClassName == kesTeamStart)
+		{
+			if(theSpawnIter->GetTeamNumber() == thePlayerTeamNumber && 
+				VectorDistance(theSpawnIter->GetOrigin(), inPlayer->pev->origin) < BALANCE_IVAR(kDistressBeaconRange))
+			{
+				result=false;
+			}
+		}
+	}
+	return result;
+}
+edict_t* AvHGamerules::SelectSpawnPoint(CBaseEntity* inPlayer, const string& inSpawnEntityName) const
+{
+	bool theDone = false;
+	edict_t* theResult = NULL;
+	CBaseEntity* theSpot = NULL;
+
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inPlayer);
+	ASSERT(thePlayer);
+
+	// Handle alien spawns differently than others.
+	AvHTeamNumber theTeamNumber = thePlayer->GetTeam();
+	const AvHTeam* theTeam = this->GetTeam(theTeamNumber);
+	if(theTeam && (theTeam->GetTeamType() == AVH_CLASS_TYPE_ALIEN) && (inSpawnEntityName == kesTeamStart))
+	{
+		// Get a random active hive
+		AvHHive* theHive = AvHSUGetRandomActiveHive(theTeamNumber);
+		if(theHive)
+		{
+			theSpot = this->GetRandomHiveSpawnPoint(inPlayer, theHive->pev->origin, theHive->GetMaxSpawnDistance());
+		}
+
+		// If we still didn't find one and cheats are on, try a spawn not near a hive
+		if(!theSpot && this->GetCheatsEnabled())
+		{
+			theSpot = this->SelectRandomSpawn(inPlayer, inSpawnEntityName);
+		}
+	}
+	else
+	{
+		theSpot = this->SelectRandomSpawn(inPlayer, inSpawnEntityName);
+	}
+
+	if(!FNullEnt(theSpot))
+	{
+		int theOffset = AvHMUGetOriginOffsetForUser3(AvHUser3(thePlayer->pev->iuser3));
+		Vector theSpawnOrigin = theSpot->pev->origin;
+		theSpawnOrigin.z += theOffset;
+
+		if(AvHSUGetIsEnoughRoomForHull(theSpawnOrigin, AvHMUGetHull(false, inPlayer->pev->iuser3), inPlayer->edict()))
+		{
+			theResult = theSpot->edict();
+			theDone = true;
+		}
+	}
+
+	if(!theDone)
+	{
+		char theErrorString[256];
+		sprintf(theErrorString, "AvHGamerules::SelectSpawnPoint(): all spawns full\n");
+		ALERT(at_logged, theErrorString);
+		theResult = NULL;
+	}
+
+	return theResult;
+}
+
+void AvHGamerules::UpdateHLTVProxy()
+{
+    // Check if HLTV proxy is connected to server
+    bool theHLTVProxyConnected = false;
+
+    // Every so often, send out team for all players (needed for late joiners)
+    for (int i = 1; i <= gpGlobals->maxClients; i++ )
+    {
+        CBasePlayer *plr = (CBasePlayer*)UTIL_PlayerByIndex( i );
+        if ( plr && (plr->pev->flags & FL_PROXY))
+        {
+            theHLTVProxyConnected = true;
+            break;
+        }
+    }
+
+    // Update proxy if connected
+    if(theHLTVProxyConnected)
+    {
+        const float kHLTVProxyUpdateTime = 6.0f;
+
+        if((this->mTimeOfLastHLTVProxyUpdate == -1) || (gpGlobals->time > (this->mTimeOfLastHLTVProxyUpdate + kHLTVProxyUpdateTime)))
+        {
+            //char theMessage[256];
+            //sprintf(theMessage, "AvHGamerules::UpdateHLTVProxy...\n");
+            //ALERT(at_console, theMessage);
+
+            // Every so often, send out team for all players (needed for late joiners)
+            for (int i = 1; i <= gpGlobals->maxClients; i++ )
+            {
+                CBasePlayer *plr = (CBasePlayer*)UTIL_PlayerByIndex( i );
+                if ( plr && GetGameRules()->IsValidTeam( plr->TeamID() ) )
+                {
+                    MESSAGE_BEGIN(MSG_SPEC, gmsgTeamInfo);
+                        WRITE_BYTE(plr->entindex() );
+                        WRITE_STRING(plr->TeamID() );
+                    MESSAGE_END();
+                }
+            }
+
+            // Send messages to HLTV viewers
+            float theMapGamma = GetGameRules()->GetMapGamma();
+            MESSAGE_BEGIN(MSG_SPEC, gmsgSetGammaRamp);
+                WRITE_COORD(theMapGamma*kNormalizationNetworkFactor);
+            MESSAGE_END();
+
+            this->mTimeOfLastHLTVProxyUpdate = gpGlobals->time;
+        }
+    }
+}
+
+void AvHGamerules::UpdateGameMode(CBasePlayer* inPlayer)
+{
+	// Sort scoreboard
+	MESSAGE_BEGIN( MSG_ONE, gmsgGameMode, NULL, inPlayer->edict() );
+		WRITE_BYTE(1);  // game mode teamplay
+	MESSAGE_END();
+}
+
+void AvHGamerules::UpdatePlaytesting()
+{
+	if(this->GetGameStarted() && !this->GetIsCombatMode())
+	{
+		const int theActiveNodesMessageUpdateTime = BALANCE_IVAR(kActiveNodesMessageUpdateTime);
+		if((theActiveNodesMessageUpdateTime > 0) && !this->GetIsTournamentMode())
+		{
+			if((this->mTimeOfLastPlaytestUpdate == -1) || (gpGlobals->time > (this->mTimeOfLastPlaytestUpdate + theActiveNodesMessageUpdateTime)))
+			{
+				int theTeamOneTowers = 0;
+				int theTeamTwoTowers = 0;
+
+				//AvHSUPrintDevMessage("FOR_ALL_BASEENTITIES: AvHGamerules::UpdatePlaytesting\n");
+
+				FOR_ALL_BASEENTITIES();
+				AvHResourceTower* theResourceTower = dynamic_cast<AvHResourceTower*>(theBaseEntity);
+				if(theResourceTower && theResourceTower->GetIsActive())
+				{
+					if(theResourceTower->pev->team == TEAM_ONE)
+					{
+						theTeamOneTowers++;
+					}
+					else if(theResourceTower->pev->team == TEAM_TWO)
+					{
+						theTeamTwoTowers++;
+					}
+				}
+				END_FOR_ALL_BASEENTITIES();
+
+				// Count how many active towers each team has, and tell the world
+				char* theMessage = UTIL_VarArgs( "Active resource nodes:  Marines: %d  Aliens: %d\n", theTeamOneTowers, theTeamTwoTowers);
+				UTIL_ClientPrintAll(HUD_PRINTTALK, theMessage);
+				UTIL_LogPrintf(theMessage);
+
+				this->mTimeOfLastPlaytestUpdate = gpGlobals->time;
+			}
+		}
+
+/*
+		const int theHandicapUpdateTime = BALANCE_IVAR(kHandicapUpdateTime);
+		if((theHandicapUpdateTime > 0) / *&& this->GetIsTournamentMode()* /)
+		{
+			if((this->mTimeOfLastHandicapUpdate == -1) || (gpGlobals->time > (this->mTimeOfLastHandicapUpdate + theHandicapUpdateTime)))
+			{
+				float theTeamOneHandicap = this->GetTeam(TEAM_ONE)->GetHandicap();
+				float theTeamTwoHandicap = this->GetTeam(TEAM_TWO)->GetHandicap();
+
+				if((theTeamOneHandicap < 1.0f) || (theTeamTwoHandicap < 1.0f))
+				{
+					char theMessage[512];
+					sprintf(theMessage, "Handicap active (damage reduction): Marines: %.2f  Aliens: %.2f\n", theTeamOneHandicap, theTeamTwoHandicap);
+					UTIL_ClientPrintAll(HUD_PRINTNOTIFY, theMessage);
+					UTIL_LogPrintf(theMessage);
+
+					this->mTimeOfLastHandicapUpdate = gpGlobals->time;
+				}
+			}
+		}
+*/
+	}
+}
+
+void AvHGamerules::UpdateUplink()
+{
+#ifdef USE_UPP
+	#ifdef AVH_SECURE_PRERELEASE_BUILD
+	avh_uplink.value = 1;
+	#endif
+
+	UPPUtil_ProcessResponses();
+
+	if(UPP::isConnected() != (avh_uplink.value != 0))
+	{
+		if(avh_uplink.value)
+		{
+			UPPUtil_Connect();
+		}
+		else
+		{
+			UPPUtil_Disconnect();
+		}
+	}
+#else
+	#ifdef AVH_SECURE_PRERELEASE_BUILD
+	avh_uplink.value = 1;
+	#endif
+
+	// If authentication is enabled
+	if(!this->mUpdatedUplink && (avh_uplink.value > 0))
+	{
+		// Only allow it once every day -> 500 servers == num queries per hour = 500*75k =  1,500k per hour -> just over a 1 gig a month
+		unsigned int theCurrentSystemTime = AvHSUTimeGetTime();
+		int theUpdateUplinkInterval = (60*60*1000)*24;
+
+		#ifdef AVH_SECURE_PRERELEASE_BUILD
+		theUpdateUplinkInterval = (60*60*1000)/30; // every 30 minutes or so while testing
+		#endif
+
+        #ifdef DEBUG
+        theUpdateUplinkInterval = 0;
+        #endif
+
+		if((gTimeLastUpdatedUplink == 0) || (theCurrentSystemTime > (gTimeLastUpdatedUplink + theUpdateUplinkInterval)))
+		{
+			// Initialize it
+			ALERT(at_logged, "Contacting www.natural-selection.org...\n");
+			this->InitializeAuthentication();
+			//this->DisplayVersioning();
+		}
+		else
+		{
+			//ALERT(at_logged, "You must wait longer before uplinking again.\n");
+		}
+	}
+
+	// If it just turned off, clear auth masks
+	if(this->mUpdatedUplink && !avh_uplink.value)
+	{
+		gAuthMaskList.clear();
+		ALERT(at_logged, "Authentication disabled.\n");
+	}
+
+	this->mUpdatedUplink = avh_uplink.value;
+#endif
+}
+
+edict_t* AvHGamerules::SelectSpawnPoint(CBaseEntity* inPlayer) const
+{
+	const char*		theSpawnName = kesReadyRoomStart;
+	edict_t*		theResult = NULL;
+
+	// Get name of spawn entity from player
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inPlayer);
+	if(thePlayer)
+	{
+		// Set name of spawn point accordingly
+		theSpawnName = this->GetSpawnEntityName(thePlayer);
+	}
+
+	theResult = this->SelectSpawnPoint(inPlayer, theSpawnName);
+
+   	return theResult;
+}
+
+const char*	AvHGamerules::SetDefaultPlayerTeam(CBasePlayer *pPlayer)
+{
+	// By default, do nothing.  We start in the ready room, we don't join a team
+	return NULL;
+}
+
+CBaseEntity* AvHGamerules::SelectRandomSpawn(CBaseEntity* inPlayer, const string& inSpawnName) const
+{
+	CBaseEntity* theSpawn = NULL;
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inPlayer);
+	ASSERT(thePlayer);
+	AvHTeamNumber thePlayerTeamNumber = thePlayer->GetTeam();
+
+	// Count how many spawns of this type
+	int theNumSpawns = 0;
+
+	SpawnListType::const_iterator theSpawnIter;
+
+	for(theSpawnIter = this->mSpawnList.begin(); theSpawnIter != this->mSpawnList.end(); theSpawnIter++)
+	{
+		string theClassName = theSpawnIter->GetClassName();
+		if(theClassName == inSpawnName)
+		{
+			if(theSpawnIter->GetTeamNumber() == thePlayerTeamNumber)
+			{
+				theNumSpawns++;
+			}
+		}
+	}
+
+	bool theSuccess = false;
+	int theSpawnListSize = this->mSpawnList.size();
+	if(theSpawnListSize > 0)
+	{
+        int theNumTries = 0;
+
+		do
+		{
+            int theOffset = RANDOM_LONG(0, theSpawnListSize-1);
+
+			//theSpawnIter = &this->mSpawnList[theCurrentOffset];
+			const AvHSpawn& theSpawn = this->mSpawnList[theOffset];
+			if(theSpawn.GetClassName() == inSpawnName)
+			{
+				if(theSpawn.GetTeamNumber() == thePlayerTeamNumber)
+				{
+					// Copy data into current spawn point
+					ASSERT(this->mSpawnEntity);
+
+					this->CopyDataToSpawnEntity(theSpawn);
+
+					if(IsSpawnPointValid(inPlayer, this->mSpawnEntity))
+					{
+						theSuccess = true;
+					}
+				}
+			}
+
+        // Put a limit to the number of tries, to avoid an infinite loop when mapper didn't create the right type of spawns
+		} while((theNumTries++ < 100) && !theSuccess);
+	}
+
+	if(theSuccess)
+	{
+		theSpawn = this->mSpawnEntity;
+	}
+	else
+	{
+		theSpawn = NULL;
+	}
+
+	return theSpawn;
+}
+
+void AvHGamerules::SetGameStarted(bool inGameStarted)
+{
+	if(!this->mGameStarted && inGameStarted)
+	{
+		FireTargets(ktGameStartedStatus, NULL, NULL, USE_TOGGLE, 0.0f);
+		#ifdef USE_UPP
+			UPP::reportGameStarted(UPPUtil_GetGameInfo());
+		#endif
+	}
+	this->mGameStarted = inGameStarted;
+	this->mTimeGameStarted = gpGlobals->time;
+
+	// Choose a random defending team in Combat
+	if(this->GetIsCombatMode())
+	{
+		int theTeamIndex = 1;// + (rand()%2);
+		AvHTeamNumber theAttackingTeamNumber = AvHTeamNumber(theTeamIndex);
+		this->mCombatAttackingTeamNumber = theAttackingTeamNumber;
+	}
+
+	this->mTeamOne.SetGameStarted(inGameStarted);
+	this->mTeamTwo.SetGameStarted(inGameStarted);
+}
+
+void AvHGamerules::SendMOTDToClient( edict_t *client )
+{
+	// Only send MOTD in valid game for ease of debugging
+	//if(!this->GetCheatsEnabled())
+	//{
+		// read from the MOTD.txt file
+		int				length, char_count = 0;
+		char*			pFileList;
+		char*			aFileList = pFileList = (char*)LOAD_FILE_FOR_ME( kMOTDName, &length );
+
+		// send the server name
+		MESSAGE_BEGIN( MSG_ONE, gmsgServerName, NULL, client );
+		WRITE_STRING( CVAR_GET_STRING("hostname") );
+		MESSAGE_END();
+
+		AvHPlayer*		thePlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(client));
+		ASSERT(thePlayer);
+//		thePlayer->SendTeletype(pFileList);
+//		thePlayer->SendMessage(pFileList);
+
+		UTIL_ShowMessage(pFileList, thePlayer);
+
+		FREE_FILE( aFileList );
+	//}
+}
+
+int AvHGamerules::GetNumberOfPlayers() const
+{
+	int theNumberOfPlayers = 0;
+
+	FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+	// GetIsRelevant()?
+	//if(!inPlayingGame || (inEntity->GetPlayMode() == PLAYMODE_PLAYING))
+	//{
+	if(UTIL_IsValidEntity(theEntity->edict()))
+	{
+		theNumberOfPlayers++;
+	}
+	//}
+	END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+
+	return theNumberOfPlayers;
+}
+
+char gLastKnownMapName[256] = "";
+
+void AvHGamerules::Think(void)
+{
+	PROFILE_START()
+
+	float theTime = gpGlobals->time;
+	float theTimePassed = gpGlobals->frametime;
+
+	if(this->mFirstUpdate)
+	{
+		const char* theCStrLevelName = STRING(gpGlobals->mapname);
+		bool theNewMap = !gLastKnownMapName || !theCStrLevelName || strcmp(theCStrLevelName, gLastKnownMapName);
+
+		PROFILE_START();
+		this->PostWorldPrecacheReset(theNewMap);
+		PROFILE_END(kUpdatePrecacheResetProfile);
+
+		strcpy(gLastKnownMapName, theCStrLevelName);
+
+		// Tell all HUDs to reset
+		int theStatus = /*theNewMap ? kGameStatusResetNewMap :*/ kGameStatusReset;
+
+		FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+			MESSAGE_BEGIN(MSG_ONE, gmsgGameStatus, NULL, theEntity->pev);
+			WRITE_BYTE(theStatus);
+			WRITE_BYTE(this->mMapMode);
+			MESSAGE_END();
+		END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+
+		this->mFirstUpdate = false;
+	}
+
+	// Handle queued network messages
+	#ifdef USE_NETWORK_METERING
+	const float kNetworkUpdateInterval = .1f;
+	if((this->mLastNetworkUpdate == -1) || (theTime > (this->mLastNetworkUpdate + kNetworkUpdateInterval)))
+	{
+		PROFILE_START();
+		int theBytesPerSecond = 100000;//(int)(avh_networkmeterrate.value);
+		NetworkMeter::Instance()->SetBufferAmount(theBytesPerSecond);
+		NetworkMeter::Instance()->ProcessQueuedMessages();
+		PROFILE_END(kUpdateNetworkMeterProfile);
+	}
+	#endif
+
+	#ifdef PROFILE_BUILD
+	kProfileRunConfig = (int)(avh_performance.value);
+	#endif
+
+	PROFILE_START();
+	this->RecalculateHandicap();
+	//this->UpdateScripts();
+	this->UpdateUplink();
+	this->UpdatePlaytesting();
+    this->UpdateHLTVProxy();
+	PROFILE_END(kUpdateMisc);
+
+	const float kWorldEntityUpdateInterval = 1.0f;
+	if((this->mLastWorldEntityUpdate == -1) || (theTime > (this->mLastWorldEntityUpdate + kWorldEntityUpdateInterval)))
+	{
+		if(GET_RUN_CODE(1))
+		{
+			// Update world entities
+			PROFILE_START()
+			this->UpdateWorldEntities();
+			this->mLastWorldEntityUpdate = theTime;
+			PROFILE_END(kUpdateWorldEntitiesProfile)
+		}
+
+		// Don't need to update cheats every tick, as they can be expensive
+		this->UpdateCheats();
+	}
+
+	this->mMiniMap.Process();
+
+	PROFILE_START();
+	g_VoiceGameMgr.Update(gpGlobals->frametime);
+	PROFILE_END(kUpdateVoiceManagerProfile);
+
+	const float kParticleUpdateInterval = 2.0f;
+	if((this->mLastParticleUpdate == -1) || (theTime > (this->mLastParticleUpdate + kParticleUpdateInterval)))
+	{
+		if(GET_RUN_CODE(2))
+		{
+			PROFILE_START();
+			AvHParticleSystemManager::Instance()->Update(theTimePassed);
+			this->mLastParticleUpdate = theTime;
+			PROFILE_END(kUpdateParticleSystemManager)
+		}
+
+		#ifdef DEBUG
+		int theUseCaching = BALANCE_IVAR(kDebugServerCaching);
+		if(theUseCaching)
+		{
+			PROFILE_START()
+
+			char theMessage[128];
+			int theReturnTotal = kNumReturn0 + kNumReturn1;
+			float theNumReturnedPercentage = 0.0f;
+			float theNumCachedPercentage = 0.0f;
+			float theComputedPercentage = 0.0f;
+
+			if(theReturnTotal > 0)
+			{
+				theNumReturnedPercentage = kNumReturn1/((float)theReturnTotal);
+				theNumCachedPercentage = kNumCached/((float)theReturnTotal);
+				theComputedPercentage = kNumComputed/((float)theReturnTotal);
+			}
+
+			kPVSCoherencyTime = BALANCE_FVAR(kDebugPVSCoherencyTime);
+
+			//sprintf(theMessage, "Num ents: %d, Num humans: %d, Percentage returned: %f (%d/%d), Max E: %d, Server updates: %d, Percentage cached: %f\n", GetGameRules()->GetNumEntities(), AvHSUGetNumHumansInGame(), theNumReturnedPercentage, kNumReturn1, theReturnTotal, kMaxE, kServerFrameRate, theNumCachedPercentage /*, kNumCached, theReturnTotal*/);
+			//sprintf(theMessage, "Percentage cached: %f (%d/%d)\n", theNumCachedPercentage, kNumCached, theReturnTotal);
+
+			sprintf(theMessage, "Percentage entities propagated: %f (%d/%d) (compute percentage: %f) (pvs time: %f)\n", theNumReturnedPercentage, kNumReturn1, theReturnTotal, theComputedPercentage, kPVSCoherencyTime);
+			UTIL_LogPrintf(theMessage);
+
+			//AvHSUPrintDevMessage(theMessage);
+
+			PROFILE_END(kUpdateDebugShowEntityLog)
+		}
+		#endif
+
+		kServerFrameRate = 0;
+		kNumReturn0 = kNumReturn1 = kNumCached = kNumComputed = 0;
+	}
+	else
+	{
+		int a = 0;
+	}
+
+	this->UpdateServerCommands();
+	this->UpdateGameTime();
+
+    if(GET_RUN_CODE(4))
+    {
+	    if(!this->GetGameStarted())
+	    {
+		    if(!this->GetIsTournamentMode())
+		    {
+			    this->UpdateTimeLimit();
+		    }
+
+		    this->UpdateCountdown(theTime);
+
+		    PROFILE_START();
+		    // Try to join any players that are waiting for a spot (bypass cost of reinforcements before game starts)
+		    // Players are put into reinforcement mode if there are no available spawns
+		    FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+			    if(theEntity->GetPlayMode() == PLAYMODE_AWAITINGREINFORCEMENT)
+			    {
+				    AvHTeamNumber theTeamNumber = theEntity->GetTeam();
+				    if(theTeamNumber != TEAM_IND)
+				    {
+					    this->AttemptToJoinTeam(theEntity, theTeamNumber, false);
+				    }
+			    }
+		    END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+		    PROFILE_END(kUpdateReinforcementsProfile);
+	    }
+	    else
+        {
+		    //this->ProcessTeamUpgrades();
+		    this->UpdateEntitiesUnderAttack();
+
+		    // Has a side won?
+		    if(this->mVictoryTeam != TEAM_IND)
+		    {
+			    // Let players bask in their victory, don't update the world normally
+			    PROFILE_START()
+			    this->UpdateVictory();
+			    PROFILE_END(kUpdateVictoryProfile)
+		    }
+		    else
+		    {
+			    PROFILE_START()
+			    this->mTeamOne.Update();
+			    PROFILE_END(kTeamOneUpdate)
+
+			    PROFILE_START()
+			    this->mTeamTwo.Update();
+			    PROFILE_END(kTeamTwoUpdate)
+		    }
+
+		    PROFILE_START()
+		    // Don't update every frame for performance reasons
+		    const float kVictoryUpdateInterval = 1.0f;
+		    if((this->mLastVictoryUpdate == -1) || (theTime > (this->mLastVictoryUpdate + kVictoryUpdateInterval)))
+		    {
+			    this->UpdateVictoryStatus();
+			    this->mLastVictoryUpdate = theTime;
+		    }
+		    PROFILE_END(kUpdateVictoryStatusProfile)
+	    }
+    }
+
+    gServerTick++;
+	if((gServerTick % 5) == 0)
+	{
+		gServerUpdate = true;
+	}
+	else
+	{
+		gServerUpdate = false;
+	}
+    PROFILE_END(kUpdateGamerulesProfile)
+
+}
+
+void AvHGamerules::RegisterServerVariable(const char* inName)
+{
+    mServerVariableList.push_back(inName);
+}
+
+int AvHGamerules::GetNumServerVariables() const
+{
+    return mServerVariableList.size();
+}
+
+const std::string& AvHGamerules::GetServerVariable(int i) const
+{
+    return mServerVariableList[i];
+}
+
+bool AvHGamerules::GetIsEntityUnderAttack(int inEntityIndex) const
+{
+	bool theEntityIsUnderAttack = false;
+
+	// If entity is in list, it's being attacked
+	for(EntityUnderAttackListType::const_iterator theIter = this->mEntitiesUnderAttack.begin(); theIter != this->mEntitiesUnderAttack.end(); theIter++)
+	{
+		if(inEntityIndex == theIter->first)
+		{
+			theEntityIsUnderAttack = true;
+			break;
+		}
+	}
+
+	return theEntityIsUnderAttack;
+}
+
+void AvHGamerules::TriggerAlert(AvHTeamNumber inTeamNumber, AvHAlertType inAlertType, int inEntIndex, AvHMessageID inMessageID)
+{
+	AvHTeam* theTeam = this->GetTeam(inTeamNumber);
+	if(theTeam)
+	{
+		// Don't play audio alerts too often.  This also allows neat tactics where players can time strikes to prevent the other team from instant notification of an alert, ala RTS
+		float theTimeOfLastAlert = -1;
+        AvHAlertType theLastAlertType = ALERT_NONE;
+
+        const AvHAlert* theLastAlert = theTeam->GetLastAudioAlert();
+        if(theLastAlert)
+        {
+            theTimeOfLastAlert = theLastAlert->GetTime();
+            theLastAlertType = theLastAlert->GetAlertType();
+        }
+
+        // Play alerts when enough time has passed
+        bool theIsRepeatAlert = (inAlertType == theLastAlertType);
+        const float kBaseAlertInterval = theTeam->GetAudioAlertInterval();
+        float theAlertInterval = theIsRepeatAlert ? 2.0f*kBaseAlertInterval : kBaseAlertInterval;
+
+        bool theAlertIntervalTimePassed = (gpGlobals->time - theTimeOfLastAlert > theAlertInterval);
+		bool thePlayAlertSound = ((theTimeOfLastAlert == -1) || theAlertIntervalTimePassed);
+
+        // Always play urgent alerts, but only when they're new (so you don't get 'hive under attack' twice in quick succession)
+        if(AvHSUGetIsUrgentAlert(inAlertType) && (!AvHSUGetIsOftRepeatedAlert(inAlertType) && !theIsRepeatAlert))
+        {
+            thePlayAlertSound = true;
+        }
+
+		// Add it, remembering if we triggered sound for it
+		AvHAlert theNewAlert(inAlertType, gpGlobals->time, inEntIndex);
+		theNewAlert.SetPlayedAudio(thePlayAlertSound);
+		theTeam->AddAlert(theNewAlert, inMessageID);
+
+		if(thePlayAlertSound)
+		{
+			AvHHUDSound theSound = HUD_SOUND_INVALID;
+			CBaseEntity* theAlertEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(inEntIndex));
+
+			// If team type is marines, play sound for commander
+			AvHClassType theTeamType = theTeam->GetTeamType();
+			if(theTeamType == AVH_CLASS_TYPE_MARINE)
+			{
+				// Get commander for team, if any
+				int theCommanderIndex = theTeam->GetCommander();
+
+				if(this->GetIsTesting())
+				{
+					theCommanderIndex = 1;
+				}
+
+				if(theCommanderIndex != -1)
+				{
+					CBaseEntity* theBaseEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theCommanderIndex));
+					AvHPlayer* theCommander = dynamic_cast<AvHPlayer*>(theBaseEntity);
+					if(theCommander /*&& thePlayAudioAlert*/)
+					{
+						if(inAlertType == ALERT_RESEARCH_COMPLETE)
+						{
+							theSound = HUD_SOUND_MARINE_RESEARCHCOMPLETE;
+						}
+						else if(inAlertType == ALERT_UPGRADE_COMPLETE)
+						{
+							theSound = HUD_SOUND_MARINE_UPGRADE_COMPLETE;
+						}
+						else if(inAlertType == ALERT_LOW_RESOURCES)
+						{
+							theSound = HUD_SOUND_MARINE_RESOURCES_LOW;
+						}
+						// Special sound for the CC, always play it no matter where the commander is
+						else if(inAlertType == ALERT_UNDER_ATTACK)
+						{
+							if(dynamic_cast<AvHCommandStation*>(theAlertEntity))
+							{
+								theSound = HUD_SOUND_MARINE_CCUNDERATTACK;
+							}
+							else
+							{
+								theSound = HUD_SOUND_MARINE_BASE_UNDER_ATTACK;
+							}
+						}
+						else if(inAlertType == ALERT_ORDER_COMPLETE)
+						{
+							theSound = HUD_SOUND_ORDER_COMPLETE;
+						}
+						// Check for positional alerts (only send them if they are out of commander's sight)
+						else
+						{
+							if(theAlertEntity)
+							{
+								vec3_t theDistanceToAlert;
+								VectorSubtract(theCommander->pev->origin, theAlertEntity->pev->origin, theDistanceToAlert);
+								float theXYDistanceToAlert = theDistanceToAlert.Length2D();
+
+								if(theXYDistanceToAlert > this->GetMapExtents().GetTopDownCullDistance())
+								{
+									if(inAlertType == ALERT_PLAYER_ENGAGE)
+									{
+										theSound = HUD_SOUND_MARINE_SOLDIER_UNDER_ATTACK;
+									}
+									else if(inAlertType == ALERT_UNDER_ATTACK)
+									{
+										theSound = HUD_SOUND_MARINE_BASE_UNDER_ATTACK;
+									}
+									else if(inAlertType == ALERT_SOLDIER_NEEDS_AMMO)
+									{
+										theSound = HUD_SOUND_MARINE_NEEDS_AMMO;
+									}
+									else if(inAlertType == ALERT_SOLDIER_NEEDS_HEALTH)
+									{
+										theSound = HUD_SOUND_MARINE_NEEDS_HEALTH;
+									}
+									else if(inAlertType == ALERT_ORDER_NEEDED)
+									{
+										theSound = HUD_SOUND_MARINE_NEEDS_ORDER;
+									}
+									else if(inAlertType == ALERT_PLAYER_DIED)
+									{
+										theSound = HUD_SOUND_MARINE_SOLDIER_LOST;
+									}
+									else if(inAlertType == ALERT_SENTRY_FIRING)
+									{
+										theSound = HUD_SOUND_MARINE_SENTRYFIRING;
+									}
+									else if(inAlertType == ALERT_SENTRY_DAMAGED)
+									{
+										theSound = HUD_SOUND_MARINE_SENTRYDAMAGED;
+									}
+								}
+							}
+						}
+
+						if(theSound != HUD_SOUND_INVALID)
+						{
+							if (theAlertEntity != NULL)
+                            {
+                                // Added by mmcguire.
+                                theCommander->PlayHUDSound(theSound, theAlertEntity->pev->origin[0], theAlertEntity->pev->origin[1]);
+                            }
+                            else
+                            {
+                                theCommander->PlayHUDSound(theSound);
+                            }
+						}
+					}
+				}
+				else
+				{
+					// Play "command station under attack" sound for all players on team
+					if(inAlertType == ALERT_UNDER_ATTACK)
+					{
+						if(dynamic_cast<AvHCommandStation*>(theAlertEntity))
+						{
+							// For all players on this team, play the sound
+							FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+								if((theEntity->pev->team == inTeamNumber) || this->GetIsTesting() || (theEntity->GetIsSpectatingTeam(inTeamNumber)))
+								{
+									theEntity->PlayHUDSound(HUD_SOUND_MARINE_CCUNDERATTACK);
+								}
+							END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+						}
+					}
+				}
+			}
+			// Else it's aliens, play hive under attack sound
+			else if(theTeamType == AVH_CLASS_TYPE_ALIEN)
+			{
+				// When adding alien alerts, don't always play audio notification, it gets annoying
+				if(thePlayAlertSound)
+				{
+					// Tell everyone where attack is
+					if(inAlertType == ALERT_PLAYER_ENGAGE)
+					{
+						theSound = HUD_SOUND_ALIEN_LIFEFORM_ATTACK;
+					}
+					else if(inAlertType == ALERT_UNDER_ATTACK)
+					{
+						// If it's a resource tower
+						if(theAlertEntity)
+						{
+							switch(theAlertEntity->pev->iuser3)
+							{
+							case AVH_USER3_ALIENRESTOWER:
+								theSound = HUD_SOUND_ALIEN_RESOURCES_ATTACK;
+								break;
+							case AVH_USER3_HIVE:
+								theSound = HUD_SOUND_ALIEN_HIVE_ATTACK;
+								break;
+							default:
+								theSound = HUD_SOUND_ALIEN_STRUCTURE_ATTACK;
+								break;
+							}
+						}
+					}
+					else if(inAlertType == ALERT_HIVE_COMPLETE)
+					{
+						theSound = HUD_SOUND_ALIEN_HIVE_COMPLETE;
+					}
+					else if(inAlertType == ALERT_HIVE_DYING)
+					{
+						theSound = HUD_SOUND_ALIEN_HIVE_DYING;
+					}
+					else if(inAlertType == ALERT_LOW_RESOURCES)
+					{
+						theSound = HUD_SOUND_ALIEN_RESOURCES_LOW;
+					}
+					else if(inAlertType == ALERT_NEW_TRAIT)
+					{
+						theSound = HUD_SOUND_ALIEN_NEW_TRAIT;
+					}
+
+					if(theSound != HUD_SOUND_INVALID)
+					{
+						int a = 0;
+
+						// For all players on this team, play the sound
+						FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+							if((theEntity->pev->team == inTeamNumber) || this->GetIsTesting() || (theEntity->GetIsSpectatingTeam(inTeamNumber)))
+							{
+								theEntity->PlayHUDSound(theSound);
+							}
+						END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+					}
+				}
+			}
+			else
+			{
+				ASSERT(false);
+			}
+		}
+
+		// Add entity to our list of entities that are under attack
+		if(((inAlertType == ALERT_UNDER_ATTACK) || (inAlertType == ALERT_PLAYER_ENGAGE) || (inAlertType == ALERT_HIVE_DYING)) && (inEntIndex > 0))
+		{
+			// This will update current time longer if continually attacked
+			const float kUnderAttackDuration = 5.0f;
+			this->mEntitiesUnderAttack[inEntIndex] = gpGlobals->time + kUnderAttackDuration;
+		}
+	}
+}
+
+bool AvHGamerules::GetIsCheatEnabled(const string& inCheatName) const
+{
+	bool theCheatIsEnabled = false;
+
+	bool theAllowCheats = this->GetCheatsEnabled();
+
+	#ifdef AVH_PLAYTEST_BUILD
+	theAllowCheats = true;
+	#endif
+
+	if(theAllowCheats)
+	{
+		StringList::const_iterator theIter = std::find(this->mCheats.begin(), this->mCheats.end(), inCheatName);
+		if(theIter != this->mCheats.end())
+		{
+			theCheatIsEnabled = true;
+		}
+	}
+
+	return theCheatIsEnabled;
+}
+
+void AvHGamerules::SetCheatEnabled(const string& inCheatName, bool inEnabledState)
+{
+	if(this->GetCheatsEnabled())
+	{
+		StringList::iterator theIter = std::find(this->mCheats.begin(), this->mCheats.end(), inCheatName);
+		if(theIter == this->mCheats.end())
+		{
+			if(inEnabledState)
+			{
+				this->mCheats.push_back(inCheatName);
+			}
+		}
+		else
+		{
+			if(!inEnabledState)
+			{
+				this->mCheats.erase(theIter);
+			}
+		}
+	}
+}
+
+void AvHGamerules::UpdateCheats()
+{
+	if(this->GetCheatsEnabled())
+	{
+		// If bigdig is enabled
+		if(this->GetIsCheatEnabled(kcBigDig))
+		{
+			// Run through all buildables, set them to complete
+			//AvHSUPrintDevMessage("FOR_ALL_BASEENTITIES: AvHGamerules::UpdateCheats\n");
+
+			FOR_ALL_BASEENTITIES();
+				AvHBuildable* theBuildable = dynamic_cast<AvHBuildable*>(theBaseEntity);
+				if(theBuildable && !theBuildable->GetHasBeenBuilt() && !GetHasUpgrade(theBaseEntity->pev->iuser4, MASK_RECYCLING) && (theBaseEntity->pev->team != TEAM_IND))
+				{
+					theBuildable->SetConstructionComplete(true);
+				}
+//				AvHDeployedTurret* theTurret = dynamic_cast<AvHDeployedTurret*>(theBaseEntity);
+//				if(theTurret && !theTurret->GetIsBuilt())
+//				{
+//					theTurret->SetConstructionComplete();
+//				}
+			END_FOR_ALL_BASEENTITIES();
+		}
+	}
+}
+
+void AvHGamerules::UpdateCountdown(float inTime)
+{
+	const float kTimeWontStartInterval = 8.0f;
+	int kSecondsToCountdown = 5;
+
+	#ifdef DEBUG
+	kSecondsToCountdown = 1;
+	#endif
+
+	// Time to start counting down?
+	if(this->ReadyToStartCountdown())
+	{
+		if(!this->mStartedCountdown)
+		{
+			//FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+			//	theEntity->SendMessageNextThink(kGameStarting);
+			//END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+
+			// If there is at least one person on one team, start counting
+			this->mTimeCountDownStarted = inTime;
+			this->mStartedCountdown = true;
+
+			// Reset server and respawn everyone
+			this->ResetGame(true);
+
+			this->mSavedTimeCountDownStarted = this->mTimeCountDownStarted;
+		}
+	}
+	else
+	{
+		if(!this->GetIsTrainingMode())
+		{
+			#ifndef AVH_MAPPER_BUILD
+			if((this->mTimeLastWontStartMessageSent == 0) || (inTime > (this->mTimeLastWontStartMessageSent + kTimeWontStartInterval)))
+			{
+				const char* theMessage = kGameWontStart;
+				if(this->GetIsTournamentMode())
+				{
+					theMessage = kGameWontStartUntilReady;
+				}
+
+				FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+					theEntity->SendMessageOnce(theMessage, true);
+				END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+
+				this->mTimeLastWontStartMessageSent = inTime;
+			}
+			#endif
+		}
+	}
+
+	if(this->mStartedCountdown)
+	{
+		if(inTime - this->mTimeCountDownStarted > (avh_countdowntime.value*60 - kSecondsToCountdown) && !this->mSentCountdownMessage)
+		{
+			// Send update to everyone
+			MESSAGE_BEGIN(MSG_ALL, gmsgUpdateCountdown);
+				WRITE_BYTE(kSecondsToCountdown);
+			MESSAGE_END();
+
+			this->mTimeSentCountdown = gpGlobals->time;
+			this->mSentCountdownMessage = true;
+		}
+
+		if(this->mSentCountdownMessage)
+		{
+			if(gpGlobals->time - this->mTimeSentCountdown >= kSecondsToCountdown)
+			{
+				this->SetGameStarted(true);
+			}
+		}
+	}
+}
+
+void AvHGamerules::UpdateEntitiesUnderAttack()
+{
+	// Expire entities under attack
+	for(EntityUnderAttackListType::iterator theIter = this->mEntitiesUnderAttack.begin(); theIter != this->mEntitiesUnderAttack.end(); /* no increment*/)
+	{
+		if(gpGlobals->time >= theIter->second)
+		{
+			EntityUnderAttackListType::iterator theTempIter = theIter;
+			theTempIter++;
+			this->mEntitiesUnderAttack.erase(theIter);
+			theIter = theTempIter;
+		}
+		else
+		{
+			theIter++;
+		}
+	}
+}
+
+void AvHGamerules::SendGameTimeUpdate(bool inReliable)
+{
+	int theGameTime = this->GetGameTime();
+	int theTimeLimit = this->GetTimeLimit();
+	int theSendMode = inReliable ? MSG_ALL : MSG_BROADCAST;
+
+	//  Send down game time to clients periodically
+	MESSAGE_BEGIN(theSendMode, gmsgGameStatus);
+		WRITE_BYTE(kGameStatusGameTime);
+		WRITE_BYTE(this->mMapMode);
+		WRITE_SHORT(theGameTime);
+		WRITE_SHORT(theTimeLimit);
+		WRITE_BYTE(this->mCombatAttackingTeamNumber);
+	MESSAGE_END();
+
+	this->mTimeOfLastGameTimeUpdate = gpGlobals->time;
+}
+
+void AvHGamerules::UpdateGameTime()
+{
+	// Send periodic game time updates to everyone (needed for HLTV spectators)
+	if(this->GetGameStarted() && (this->GetVictoryTeam() == TEAM_IND))
+	{
+		// Only reason why this isn't longer is to make sure late-joiners see time on scoreboard after reasonable period, without causing needless bandwidth
+		const float kGameTimeUpdateInterval = 8;
+		if((this->mTimeOfLastGameTimeUpdate == -1) || (gpGlobals->time > (this->mTimeOfLastGameTimeUpdate + kGameTimeUpdateInterval)))
+		{
+			this->SendGameTimeUpdate();
+		}
+	}
+}
+
+
+void AvHGamerules::UpdateScripts()
+{
+	const float kUpdateScriptsInterval = 1.0f;
+
+	// If server scripts are enabled
+	if(CVAR_GET_FLOAT(kvServerScripts))
+	{
+//		const char* theCStrLevelName = STRING(gpGlobals->mapname);
+//		if(theCStrLevelName && !FStrEq(theCStrLevelName, ""))
+//		{
+//			string theLevelName = theCStrLevelName;
+//			string theLevelScript = string(kModDirectory) + string("/") + kScriptsDirectory + string("/") + theLevelName + string(".bin");
+//
+//			if((this->mTimeUpdatedScripts == -1) || (gpGlobals->time > this->mTimeUpdatedScripts + kUpdateScriptsInterval))
+//			{
+//				// Execute the script
+//				AvHLUADoFile(theLevelScript.c_str());
+//			}
+//
+//		}
+		AvHScriptManager::Instance()->Update(gpGlobals->time);
+	}
+}
+
+void AvHGamerules::UpdateServerCommands()
+{
+	//float theAirAccelerate = CVAR_GET_FLOAT("sv_airaccelerate");
+	//float theAirMove = CVAR_GET_FLOAT("sv_airmove");
+
+	// TODO: Disguises these strings somehow to prevent hacking?
+	SERVER_COMMAND("sv_airaccelerate 10\n");
+	SERVER_COMMAND("sv_airmove 1\n");
+}
+
+void AvHGamerules::UpdateTimeLimit()
+{
+	// Only update time limit after world has been reset.  Give some time to make sure all clients get the game status message.
+	#ifdef DEBUG
+	const float kIntermissionTime = 2;
+	#else
+	const float kIntermissionTime = 5;
+	#endif
+
+	if(gpGlobals->time > (this->mTimeWorldReset + kIntermissionTime))
+	{
+		float theTimeLimit = timelimit.value * 60;
+
+		if((theTimeLimit > 0) && (gpGlobals->time >= (theTimeLimit + this->mLastMapChange)))
+		{
+			this->ChangeLevel();
+		}
+	}
+}
+
+//void AvHGamerules::PutPlayerIntoSpectateMode(AvHPlayer* inPlayer) const
+//{
+//	char text[50];	// Our text to be displayed
+//	if ( allow_spectators.value )
+//	{
+//		if(!inPlayer->IsObserver())
+//		{
+//			// Start at marine start
+//			inPlayer->pev->team = 1;
+//			edict_t* pentSpawnSpot = EntSelectSpawnPoint( inPlayer );
+//			inPlayer->pev->team = 0;
+//
+//			inPlayer->StartObserver( VARS(pentSpawnSpot)->origin, VARS(pentSpawnSpot)->angles);
+//
+//			// TODO: Move observer to observer_start entity
+//
+//			sprintf(text,"Observer mode enabled.");
+//		}
+//	}
+//	else
+//	{
+//		sprintf(text,"Spectating not allowed on this server.");
+//	}
+//	ClientPrint(inPlayer->pev, HUD_PRINTTALK, text);	// Show it to the player
+//}
+
+void AvHGamerules::UpdateVictory()
+{
+	if((gpGlobals->time - this->mVictoryTime) > (kVictoryIntermission + kMaxPlayers/kResetPlayersPerSecond))
+	{
+		this->ResetGame();
+	}
+}
+
+void AvHGamerules::UpdateVictoryStatus(void)
+{
+	bool theCheckVictoryWithCheats = !this->GetCheatsEnabled() || this->GetIsCheatEnabled(kcEndGame1) || this->GetIsCheatEnabled(kcEndGame2);
+
+	if((this->mVictoryTeam == TEAM_IND) && this->mGameStarted && theCheckVictoryWithCheats && !this->GetIsTrainingMode())
+	{
+		char* theVictoryMessage = NULL;
+		bool theTeamOneLost = this->mTeamOne.GetHasTeamLost();
+		bool theTeamTwoLost = this->mTeamTwo.GetHasTeamLost();
+		bool theDrawGame = false;
+
+		int theTeamOnePlayers = this->mTeamOne.GetPlayerCount();
+		int theTeamTwoPlayers = this->mTeamTwo.GetPlayerCount();
+
+		bool theTimeLimitHit = false;
+		int theTimeLimitSeconds = this->GetTimeLimit();
+
+		if(this->GetIsCombatMode())
+		{
+			if(this->GetIsIronMan())
+			{
+				theTimeLimitSeconds = CVAR_GET_FLOAT(kvIronManTime)*60;
+			}
+		}
+
+		if((theTimeLimitSeconds > 0) && ((gpGlobals->time - GetGameRules()->GetTimeGameStarted()) > theTimeLimitSeconds))
+		{
+			theTimeLimitHit = true;
+		}
+
+		if(this->GetIsCheatEnabled(kcEndGame1))
+		{
+			theTeamTwoLost = true;
+		}
+		else if(this->GetIsCheatEnabled(kcEndGame2))
+		{
+			theTeamOneLost = true;
+		}
+		else if(this->GetIsCombatMode())
+		{
+			// Alien victory if time limit is hit
+			if(theTimeLimitHit)
+			{
+				if(this->mCombatAttackingTeamNumber == TEAM_ONE)
+				{
+					theTeamOneLost = true;
+				}
+				else if(this->mCombatAttackingTeamNumber == TEAM_TWO)
+				{
+					theTeamTwoLost = true;
+				}
+			}
+		}
+		else if(this->GetIsTournamentMode() && !this->GetIsCombatMode())
+		{
+			// If timelimit has elapsed in tourny mode, the victor is the team with the most resources
+			if(theTimeLimitHit)
+			{
+				// Don't count fractional resources.  If it's that close, it was a tie.
+				int theTeamOneResources = this->mTeamOne.GetTotalResourcesGathered();
+				int theTeamTwoResources = this->mTeamTwo.GetTotalResourcesGathered();
+				if(theTeamOneResources > theTeamTwoResources)
+				{
+					theTeamTwoLost = true;
+				}
+				else if(theTeamTwoResources > theTeamOneResources)
+				{
+					theTeamOneLost = true;
+				}
+				else
+				{
+					// It's a draw
+					theDrawGame = true;
+				}
+			}
+		}
+		else if(this->GetIsIronMan())
+		{
+			if(theTimeLimitHit)
+			{
+				// Aliens win.  If both teams are the same, it's a draw.
+				if(this->mTeamOne.GetTeamType() == this->mTeamTwo.GetTeamType())
+				{
+					theDrawGame = true;
+				}
+				else
+				{
+					if(this->mTeamOne.GetTeamType() == AVH_CLASS_TYPE_ALIEN)
+					{
+						theTeamTwoLost = true;
+					}
+					else if(this->mTeamTwo.GetTeamType() == AVH_CLASS_TYPE_ALIEN)
+					{
+						theTeamOneLost = true;
+					}
+				}
+			}
+			else if(!this->mTeamOne.GetHasAtLeastOneActivePlayer())
+			{
+				theTeamOneLost = true;
+			}
+			else if(!this->mTeamTwo.GetHasAtLeastOneActivePlayer())
+			{
+				theTeamTwoLost = true;
+			}
+		}
+		else if(!this->GetIsTournamentMode())
+		{
+			// Check for automatic concession, if teams are suddenly unbalanced (generally because a team realizes it's futile and leaves)
+			const int kAutoConcedeNumPlayers = (int)(avh_autoconcede.value);
+			if(kAutoConcedeNumPlayers > 0)
+			{
+				if((theTeamOnePlayers - theTeamTwoPlayers) >= kAutoConcedeNumPlayers)
+				{
+					theTeamTwoLost = true;
+				}
+				else if((theTeamTwoPlayers - theTeamOnePlayers) >= kAutoConcedeNumPlayers)
+				{
+					theTeamOneLost = true;
+				}
+			}
+		}
+
+		if((theTeamOneLost && theTeamTwoLost) || theDrawGame)
+		{
+			// Draw!
+			this->mVictoryTime = gpGlobals->time;
+			this->mVictoryTeam = TEAM_ONE;
+			this->mVictoryDraw = true;
+			theVictoryMessage = kGameDraw;
+			theDrawGame = true;
+		}
+
+		if(theTeamOneLost)
+		{
+			// If there is a victory, set mVictoryTime and mVictoryTeam
+			this->mVictoryTime = gpGlobals->time;
+			this->mVictoryTeam = TEAM_TWO;
+			theVictoryMessage = kTeamTwoWon;
+		}
+		else if(theTeamTwoLost)
+		{
+			// If there is a victory, set mVictoryTime and mVictoryTeam
+			this->mVictoryTime = gpGlobals->time;
+			this->mVictoryTeam = TEAM_ONE;
+			theVictoryMessage = kTeamOneWon;
+		}
+
+		//if(!theAtLeastOneTeamOneMemberLeft || !theAtLeastOneTeamTwoMemberLeft)
+		if(this->mVictoryTeam != TEAM_IND)
+		{
+			this->TallyVictoryStats();
+			#ifdef USE_UPP
+				UPP::reportGameFinished(UPPUtil_GetGameResultInfo(this->mVictoryTeam));
+			#endif
+
+			// Tell everyone that the game ended
+			FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+				AvHTeam* theTeam = theEntity->GetTeamPointer();
+				AvHHUDSound theHUDSound = HUD_SOUND_YOU_LOSE;
+				if((theTeam && (theTeam->GetTeamNumber() == this->mVictoryTeam)) || (theEntity->GetPlayMode() == PLAYMODE_OBSERVER) || (theEntity->pev->team == TEAM_IND) || theDrawGame)
+				{
+					theHUDSound = HUD_SOUND_YOU_WIN;
+				}
+				else if(!this->GetIsCombatMode())
+				{
+					// Fade losers out to black
+					Vector theFadeColor;
+					theFadeColor.x = 0;
+					theFadeColor.y = 0;
+					theFadeColor.z = 0;
+					UTIL_ScreenFade(theEntity, theFadeColor, 1.0f, 0.0f, 255, FFADE_OUT | FFADE_STAYOUT);
+				}
+				theEntity->PlayHUDSound(theHUDSound);
+				theEntity->SendMessage(theVictoryMessage);
+
+				// Tell each player that the game ended
+				MESSAGE_BEGIN(MSG_ONE, gmsgGameStatus, NULL, theEntity->pev);
+					WRITE_BYTE(kGameStatusEnded);
+					WRITE_BYTE(this->mMapMode);
+				MESSAGE_END();
+
+				// Final game time update to all clients have same winning time
+				this->SendGameTimeUpdate(true);
+
+				// Send final score to everyone if needed
+				this->mTeamOne.SendResourcesGatheredScore(false);
+				this->mTeamTwo.SendResourcesGatheredScore(false);
+
+			END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+
+			#ifdef AVH_PLAYTEST_BUILD
+			this->RecordBalanceData();
+			#endif
+		}
+	}
+}
+
diff --git a/main/source/mod/AvHGamerules.h b/main/source/mod/AvHGamerules.h
new file mode 100644
index 00000000..c888c12d
--- /dev/null
+++ b/main/source/mod/AvHGamerules.h
@@ -0,0 +1,430 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: NS high-level game rules
+//
+// $Workfile: AvHGamerules.h $
+// $Date: 2002/11/15 04:46:18 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHGamerules.h,v $
+// Revision 1.52  2002/11/15 04:46:18  Flayra
+// - Changes to for profiling and for improving AddToFullPack performance
+//
+// Revision 1.51  2002/11/12 02:24:57  Flayra
+// - HLTV updates
+//
+// Revision 1.50  2002/11/06 01:40:01  Flayra
+// - Damage refactoring (TakeDamage assumes caller has already adjusted for friendly fire, etc.)
+//
+// Revision 1.49  2002/11/03 04:49:45  Flayra
+// - Moved constants into .dll out of .cfg
+// - Particle systems update much less often, big optimization
+// - Team balance fixes
+//
+// Revision 1.48  2002/10/28 20:34:53  Flayra
+// - Reworked game reset slightly, to meter out network usage during game reset
+//
+// Revision 1.47  2002/10/20 21:10:41  Flayra
+// - Optimizations
+//
+// Revision 1.46  2002/10/16 00:56:22  Flayra
+// - Prototyped curl support for NS stats
+// - Added player auth stuff (server string)
+// - Added concept of secondary weapons
+// - Removed disconnect sound
+// - Fixed MOTD
+// - Added "order needed" alert
+//
+// Revision 1.45  2002/10/03 18:44:03  Flayra
+// - Play disconnected sound quieter because of mass exodus effect
+// - Added functionality to allow players to join a team and run around freely before game countdown starts.  Game resets when countdown starts.
+// - Added new alien alerts
+//
+// Revision 1.44  2002/09/23 22:16:01  Flayra
+// - Added game victory status logging
+// - Fixed commander alerts
+// - Added new alerts
+// - Particle system changes, only send them down when connecting or map changes
+//
+// Revision 1.43  2002/09/09 19:51:13  Flayra
+// - Removed gamerules dictating alien respawn time, now it's in server variable
+//
+// Revision 1.42  2002/08/16 02:35:09  Flayra
+// - Blips now update once per second, instead of once per player per second
+//
+// Revision 1.41  2002/08/09 01:01:42  Flayra
+// - Removed error condition for map validity, allow marines to have only one primary weapon, adjust weapon weights
+//
+// Revision 1.40  2002/08/02 22:00:23  Flayra
+// - New alert system that's not so annoying and is more helpful.  Tweaks for new help system.
+//
+// Revision 1.39  2002/07/24 18:45:41  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.38  2002/07/23 17:03:21  Flayra
+// - Resource model changes, refactoring spawning to fix level 5 redemption bug without code duplication
+//
+// Revision 1.37  2002/07/08 16:59:14  Flayra
+// - Don't pick up empty weapons, added handicapping, check map validity when loaded, reset players just like all other entities, fixed spawn bug code where it was counting non-team spawns
+//
+// Revision 1.36  2002/07/01 21:32:44  Flayra
+// - Visibility update now updates world for primal scream and umbra, don't update reliable network messages every tick (big optimization)
+//
+// Revision 1.35  2002/06/25 17:59:03  Flayra
+// - Added timelimit (switches map after a game finishes), added info_locations, tried adding team balance (not sure it works yet), give resources for kills
+//
+// Revision 1.34  2002/06/10 19:54:30  Flayra
+// - New minimap support, more attempts to fix picking up of alien weapons
+//
+// Revision 1.33  2002/05/28 17:40:32  Flayra
+// - Minimap refactoring, hive sight "under attack", reinforcement refactoring, don't delete entities marked as permanent (it was deleting hives!), allow players to join the opposite team until this can be fixed for real (server retry gets around this code so this is just an inconvenience), things build fast with cheats
+//
+// Revision 1.32  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_GAMERULES_H
+#define AVH_GAMERULES_H
+
+#include "dlls/gamerules.h"
+//#include "mod/AvHCOCRuleset.h"
+#include "mod/AvHTeam.h"
+#include "mod/AvHMarineWeapons.h"
+#include "types.h"
+#include "mod/AvHMessage.h"
+#include "mod/AvHEntityHierarchy.h"
+#include "mod/AvHEntities.h"
+#include "mod/AvHMiniMap.h"
+#include "dlls/teamplay_gamerules.h"
+#include "mod/AvHDramaticPriority.h"
+#include "mod/AvHMapExtents.h"
+#include "util/Tokenizer.h"
+#include "mod/AvHSpawn.h"
+
+class AvHPlayer;
+
+class TeamPurchase
+{
+public:
+	TeamPurchase(edict_t* inPlayer, AvHMessageID inMessageID) : mPlayer(inPlayer), mUpgrade(inMessageID)
+		{}
+
+	edict_t*		mPlayer;
+	AvHMessageID	mUpgrade;
+};
+
+typedef vector< pair<string, string> >					AuthIDListType;
+typedef map<AvHPlayerAuthentication, AuthIDListType>	AuthMaskListType;
+
+class AvHGamerules : public CHalfLifeTeamplay //public CHalfLifeMultiplay/*, public AvHCOCRuleset*/
+{
+public:
+						AvHGamerules();
+    virtual				~AvHGamerules();
+
+    // this is the game name that gets seen in the server browser
+	virtual int			AmmoShouldRespawn( CBasePlayerAmmo *pAmmo );
+	virtual void		BuildableBuilt(AvHBuildable* inBuildable);
+	virtual void		BuildableKilled(AvHBuildable* inBuildable);
+	virtual void		BuildMiniMap(AvHPlayer* inPlayer);
+	virtual BOOL		CanHavePlayerItem(CBasePlayer *pPlayer, CBasePlayerItem *pWeapon);
+	virtual void		ClientUserInfoChanged( CBasePlayer *pPlayer, char *infobuffer );
+	virtual const char* GetGameDescription(void);
+
+#ifndef USE_UPP    
+	virtual BOOL		GetIsClientAuthorizedToPlay(edict_t* inEntity, bool inDisplayMessage, bool inForcePending = false) const;
+	virtual bool		PerformHardAuthorization(AvHPlayer* inPlayer) const;
+#endif
+
+	virtual int			WeaponShouldRespawn( CBasePlayerItem *pWeapon );
+	virtual void		DeathNotice( CBasePlayer *pVictim, entvars_t *pKiller, entvars_t *pInflictor);
+
+	virtual BOOL		FShouldSwitchWeapon(CBasePlayer* inPlayer, CBasePlayerItem* inWeapon);
+
+#ifndef USE_UPP
+	virtual int			GetAuthenticationMask(const string& inAuthID) const;
+#endif
+    virtual bool        GetCountdownStarted(void) const;
+    virtual bool        GetGameStarted(void) const;
+	virtual int			GetGameTime() const;
+	virtual void		SetGameStarted(bool inGameStarted);
+	AvHEntityHierarchy& GetEntityHierarchy(AvHTeamNumber inTeam);
+	bool				GetIsPlayerSelectableByPlayer(AvHPlayer* inTargetPlayer, AvHPlayer* inByPlayer);
+	const AuthIDListType&	GetServerOpList() const;
+	virtual int			IPointsForKill(CBasePlayer *pAttacker, CBasePlayer *pKilled);
+	void				ProcessTeamUpgrade(AvHMessageID inUpgrade, AvHTeamNumber inNumber, int inEntity, bool inGive = true);
+
+	#ifdef AVH_PLAYTEST_BUILD
+	// Playtest functionality
+	void				BalanceChanged();
+	int					GetBalanceInt(const string& inName) const;
+	float				GetBalanceFloat(const string& inName) const;
+	#endif
+
+    // This isn't called yet, add in hooks?
+    void                ClientKill( edict_t *pEntity );
+	virtual BOOL		CanHaveAmmo( CBasePlayer *pPlayer, const char *pszAmmoName, int iMaxCarry );// can this player take more of this ammo?
+	virtual bool		CanPlayerBeKilled(CBasePlayer* inPlayer);
+
+	virtual void		ChangePlayerTeam(CBasePlayer *pPlayer, const char *pTeamName, BOOL bKill, BOOL bGib);
+	virtual BOOL		ClientCommand( CBasePlayer *pPlayer, const char *pcmd );
+	virtual BOOL        ClientConnected( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[ 128 ] );
+	virtual void        ClientDisconnected( edict_t *pClient );
+
+	virtual int			DeadPlayerAmmo( CBasePlayer *pPlayer );
+	virtual int			DeadPlayerWeapons( CBasePlayer *pPlayer );
+
+	virtual BOOL		FAllowMonsters( void );
+    virtual BOOL        FPlayerCanRespawn( CBasePlayer *pPlayer );
+	virtual BOOL		FPlayerCanTakeDamage( CBasePlayer *pPlayer, CBaseEntity *pAttacker );
+
+	// TODO: Add splash damage parameter and outgoing float percentage damage?  This way splash damage could do some damage in non-tourny mode?
+	virtual bool		CanEntityDoDamageTo(const CBaseEntity* inAttacker, const CBaseEntity* inReceiver, float* outScalar = NULL);
+
+	//virtual edict_t*    GetPlayerSpawnSpot( CBasePlayer *pPlayer );
+	virtual void		PlayerThink( CBasePlayer *pPlayer );
+
+	void				ComputeWorldChecksum(Checksum& outChecksum) const;
+	float				GetMapGamma();
+	int					GetNumCommandersOnTeam(AvHTeamNumber inTeam);
+    int                 GetNumActiveHives(AvHTeamNumber inTeam) const;
+	int					GetNumEntities() const;
+	const AvHGameplay&		GetGameplay() const;
+	const AvHMapExtents&	GetMapExtents();
+	
+	virtual BOOL		IsMultiplayer( void );
+	virtual BOOL		IsDeathmatch( void );
+	virtual BOOL		IsCoOp( void );
+
+	virtual void		InitHUD( CBasePlayer *pPlayer );
+	virtual void		PlayerGotWeapon(CBasePlayer *pPlayer, CBasePlayerItem *pWeapon);
+	virtual void		PlayerKilled( CBasePlayer *pVictim, entvars_t *pKiller, entvars_t *pInflictor );
+	virtual void		PlayerSpawn( CBasePlayer *pPlayer );
+	virtual void		ProcessRespawnCostForPlayer(AvHPlayer* inPlayer);
+	
+    virtual void		RewardPlayerForKill(AvHPlayer* inPlayer, CBaseEntity* inTarget, entvars_t* inInflictor = NULL);
+	bool				RoamingAllowedForPlayer(CBasePlayer* inPlayer) const;
+	virtual void		Think(void);
+    
+    void                RegisterServerVariable(const char* inName);
+    int                 GetNumServerVariables() const;
+    const std::string&  GetServerVariable(int i) const;
+
+	bool				GetCheatsEnabled(void) const;
+	bool				GetIsCheatEnabled(const string& inCheatName) const;
+	void				SetCheatEnabled(const string& inCheatName, bool inEnabledState = true);
+	
+	float				GetFirstScanThinkTime() const;
+	bool				GetDrawInvisibleEntities() const;
+	bool				GetEntityExists(const char* inName) const;
+	bool				GetIsMapperBuild() const;
+	bool				GetIsTesting(void) const;
+	bool				GetIsValidFutureTeam(AvHPlayer inPlayer, int inTeamNumber) const;
+	bool				GetCanJoinTeamInFuture(AvHPlayer* inPlayer, AvHTeamNumber theTeamNumber, string& outString) const;
+	AvHBaseInfoLocationListType		GetInfoLocations() const;
+	int					GetMaxWeight(void) const;
+	const char*			GetSpawnEntityName(AvHPlayer* inPlayer) const;
+	Vector				GetSpawnAreaCenter(AvHTeamNumber inTeamNumber) const;
+	float				GetTimeGameStarted() const;
+	int					GetTimeLimit() const;
+	int					GetWeightForItemAndAmmo(AvHWeaponID inWeapon, int inNumRounds) const;
+	bool				AttemptToJoinTeam(AvHPlayer* inPlayer, AvHTeamNumber theTeamNumber, bool inDisplayErrorMessage = true);
+	const AvHTeam*		GetTeam(AvHTeamNumber inTeamNumber) const;
+	AvHTeam*			GetTeam(AvHTeamNumber inTeamNumber);
+    AvHMapMode			GetMapMode(void) const;
+	int					GetServerTick() const;
+	AvHTeamNumber		GetVictoryTeam() const;
+	float				GetVictoryTime() const;
+	//void				QueueTeamUpgrade(edict_t* inPlayer, AvHMessageID inUpgrade);
+	void				DeleteAndResetEntities();
+	void				PlayerDeathEnd(AvHPlayer* inPlayer);
+	void				PostWorldPrecacheReset(bool inNewMap);
+	void				PreWorldPrecacheReset();
+	void				RegisterSpawnPoint(const string& inClassName, const Vector& inOrigin, const Vector& inAngles, const AvHTeamNumber& inTeamNumber);
+	void				RespawnPlayer(AvHPlayer* inPlayer);
+	void				UpdateUplink();
+
+	void				TriggerAlert(AvHTeamNumber inTeamNumber, AvHAlertType inAlertType, int inEntIndex, AvHMessageID inMessageID = MESSAGE_NULL);
+	bool				GetIsEntityUnderAttack(int inEntityIndex) const;
+
+    virtual bool		GetArePlayersAllowedToJoinImmediately(void) const;
+	virtual bool		GetIsTournamentMode(void) const;
+	virtual bool		GetIsHamboneMode(void) const;
+    virtual bool		GetIsIronMan(void) const;
+	virtual bool		GetIsCombatMode(void) const;
+	virtual AvHTeamNumber	GetCombatAttackingTeamNumber() const;
+    virtual bool		GetIsNSMode(void) const;
+	virtual bool		GetIsTrainingMode(void) const;
+	virtual void		UpdateGameMode(CBasePlayer* inPlayer);
+
+	int					GetBaseHealthForMessageID(AvHMessageID inMessageID) const;
+	int					GetBuildTimeForMessageID(AvHMessageID inMessageID) const;
+	int					GetCostForMessageID(AvHMessageID inMessageID) const;
+	
+	CBaseEntity*		GetRandomHiveSpawnPoint(CBaseEntity* inPlayer, const Vector& inOrigin, float inMaxDistance) const;
+	virtual edict_t*	SelectSpawnPoint(CBaseEntity* inPlayer) const;
+	bool				CanPlayerBeacon(CBaseEntity *inPlayer);
+	edict_t*			SelectSpawnPoint(CBaseEntity* inEntity, const string& inSpawnEntityName) const;
+	const char*			SetDefaultPlayerTeam(CBasePlayer *pPlayer);
+	
+	void				MarkDramaticEvent(int inPriority, CBaseEntity* inPrimaryEntity, bool inDramatic = false, CBaseEntity* inSecondaryEntity = NULL) const;
+	void				MarkDramaticEvent(int inPriority, short inPrimaryEntityIndex, bool inDramatic = false, short inSecondaryEntityIndex = 0) const;
+	void				MarkDramaticEvent(int inPriority, short inPrimaryEntityIndex, bool inDramatic, entvars_t* inSecondaryEntity) const;
+
+	virtual void		RecalculateHandicap(void);
+    void                ServerExit();
+    
+    void                VoteMap(int inPlayerIndex, int inMapIndex);
+    bool                GetMapVoteStrings(StringList& outMapVoteList);
+	void				RemovePlayerFromVotemap(int inPlayerIndex);
+
+#ifdef AVH_PLAYTEST_BUILD
+	const BalanceIntListType&	GetBalanceInts() const;
+	const BalanceFloatListType&	GetBalanceFloats() const;
+#endif
+
+protected:
+	void				AutoAssignPlayer(AvHPlayer* inPlayer);
+	void				PerformMapValidityCheck();
+	virtual void		RecalculateMapMode( void );
+	bool				GetDeathMatchMode(void) const;
+	//void				PutPlayerIntoSpectateMode(AvHPlayer* inPlayer) const;
+	virtual void		SendMOTDToClient( edict_t *client );
+
+private:
+#ifndef USE_UPP
+	void				AddAuthStatus(AvHPlayerAuthentication inAuthMask, const string& inWONID, const string& inSteamID);
+#endif
+	void				AwardExperience(AvHPlayer* inPlayer, int inTargetLevel, bool inAwardFriendliesInRange = true);
+	void				CalculateMapExtents();
+	void				CalculateMapGamma();
+	void				CopyDataToSpawnEntity(const AvHSpawn& inSpawnEntity) const;
+    void                JoinTeam(AvHPlayer* inPlayer, AvHTeamNumber theTeamNumber, bool inDisplayErrorMessage, bool inForce);
+	void				PreWorldPrecacheInitParticles();
+	void				PostWorldPrecacheInitParticles();
+#ifndef USE_UPP
+	void				DisplayVersioning();
+	void				InitializeAuthentication();
+#endif
+    void                InitializeMapVoteList();
+    int                 GetVotesNeededForMapChange();
+	void				InitializeTechNodes();
+	void				InternalResetGameRules();
+	int					GetNumberOfPlayers() const;
+	void				TallyVictoryStats() const;
+	void				PostVictoryStatsToWeb(const string& inFormParams) const;
+	bool				ReadyToStartCountdown();
+	void				ResetGame(bool inPreserveTeams = false);
+	void				SendGameTimeUpdate(bool inReliable = false);
+	void				ProcessTeamUpgrades();
+	void				ResetEntities();
+	CBaseEntity*		SelectRandomSpawn(CBaseEntity* inPlayer, const string& inSpawnName) const;
+	void				UpdateCheats();
+    void                UpdateHLTVProxy();
+	void				UpdatePlaytesting();
+	void				UpdateCountdown(float inTime);
+	void				UpdateEntitiesUnderAttack();
+	void				UpdateGameTime();
+	void				UpdateLOS();
+	void				UpdateScripts();
+	void				UpdateServerCommands();
+	void				UpdateTimeLimit();
+	void				UpdateWorldEntities();
+	void				UpdateVictory(void);
+	void				UpdateVictoryStatus(void);
+
+	bool				mFirstUpdate;
+	bool				mPreserveTeams;
+	bool				mGameStarted;
+	AvHTeamNumber		mVictoryTeam;
+	float				mTimeCountDownStarted;
+	float				mTimeGameStarted;
+    float				mTimeOfLastHLTVProxyUpdate;
+	float				mTimeOfLastGameTimeUpdate;
+	float				mTimeSentCountdown;
+	float				mTimeLastWontStartMessageSent;
+	float				mTimeWorldReset;
+	bool				mStartedCountdown;
+	bool				mSentCountdownMessage;
+	bool				mVictoryDraw;
+	AvHTeam				mTeamOne;
+	AvHTeam				mTeamTwo;
+	float				mVictoryTime;
+    AvHMapMode			mMapMode;
+#ifndef USE_UPP
+	bool				mUpdatedUplink;
+#endif
+
+	float				mLastParticleUpdate;
+	float				mLastNetworkUpdate;
+	float				mLastWorldEntityUpdate;
+	float				mLastCloakableUpdate;
+	float				mLastVictoryUpdate;
+	float				mLastMapChange;
+
+	float				mTimeOfLastPlaytestUpdate;
+	float				mTimeOfLastHandicapUpdate;
+
+	float				mTimeUpdatedScripts;
+	
+	typedef vector<TeamPurchase>	TeamPurchaseListType;
+	TeamPurchaseListType			mPendingTeamUpgrades;
+
+	// Potentially marines vs. marines
+	AvHEntityHierarchy	mTeamOneEntityHierarchy;
+	AvHEntityHierarchy	mTeamTwoEntityHierarchy;
+
+	AvHGameplay			mGameplay;
+
+	bool				mCalculatedMapGamma;
+	float				mMapGamma;
+
+	typedef map<int, float>		EntityUnderAttackListType;
+	EntityUnderAttackListType	mEntitiesUnderAttack;
+
+	AvHMiniMap			mMiniMap;
+
+	AvHMapExtents		mMapExtents;
+
+	StringList			mCheats;
+
+	AvHBaseInfoLocationListType	mInfoLocations;
+
+	float				mSavedTimeCountDownStarted;
+
+	AuthIDListType		mServerOpList;
+
+	SpawnListType				mSpawnList;
+	mutable CBaseEntity*		mSpawnEntity;
+
+	// Balancing stuff
+	#ifdef AVH_PLAYTEST_BUILD
+	void						ReadBalanceData();
+	void						RecordBalanceData();
+
+	BalanceIntListType			mBalanceInts;
+	BalanceFloatListType		mBalanceFloats;
+	#endif
+
+    // Map voting
+    typedef vector< pair <string, int> >	MapVoteListType;
+    MapVoteListType                         mMapVoteList;
+	typedef map< int, int >					PlayerMapVoteListType;
+	PlayerMapVoteListType					mPlayersVoted;
+	map< int, float >						mPlayersVoteTime; 
+
+    std::vector<std::string> mServerVariableList;
+
+	AvHTeamNumber				mCombatAttackingTeamNumber;
+
+};
+
+AvHGamerules* GetGameRules();
+void SetGameRules(AvHGamerules* inGameRules);
+
+#endif
diff --git a/main/source/mod/AvHGrenade.cpp b/main/source/mod/AvHGrenade.cpp
new file mode 100644
index 00000000..089bdb5d
--- /dev/null
+++ b/main/source/mod/AvHGrenade.cpp
@@ -0,0 +1,459 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHGrenade.cpp $
+// $Date: 2002/11/22 21:28:16 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHGrenade.cpp,v $
+// Revision 1.6  2002/11/22 21:28:16  Flayra
+// - mp_consistency changes
+//
+// Revision 1.5  2002/07/24 19:09:16  Flayra
+// - Linux issues
+//
+// Revision 1.4  2002/06/03 16:37:56  Flayra
+// - Added different deploy times (this should be refactored a bit more), refactored grenades
+//
+// Revision 1.3  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHMarineWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHMarineWeapons.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHGamerules.h"
+#include "mod/AvHServerUtil.h"
+#endif
+
+#include "dlls/util.h"
+
+LINK_ENTITY_TO_CLASS(kwGrenade, AvHGrenade);
+
+const int		kGrenadeVelocity                = 800;
+const int		kGrenadeRollVelocity            = 350;
+const float		kGrenadeParentVelocityScalar    = .4f;
+const float     kGrenadeGravity                 = .8f;
+const float     kGrenadeElasticity              = 0.6f;
+
+const float     kGrenadePrimeAnimationLength    = 2.3f;
+const float     kGrenadeThrowTimeBeforeRelease	= .3f;
+const float     kGrenadeThrowAnimationLength    = 1.5f;
+
+BOOL AvHGrenade::Deploy()
+{
+	// This has three values:
+	//   0 means inactive
+	//   1 means trigger throw
+	//	 -1 means throw has been recently triggered
+    m_flStartThrow   =  0;
+
+	// -1 means inactive
+	// UTIL_TimeBase or higher means time to throw (>= 0)
+    m_flReleaseThrow = -1;
+
+    return AvHMarineWeapon::Deploy();
+}
+
+int	AvHGrenade::GetBarrelLength() const
+{
+    return kGRBarrelLength;
+}
+
+float AvHGrenade::GetRateOfFire() const
+{
+	return kGrenadePrimeAnimationLength + kGrenadeThrowTimeBeforeRelease;
+}
+
+bool AvHGrenade::GetCanBeResupplied() const
+{
+    return false;
+}
+
+void AvHGrenade::Init()
+{
+    this->mRange = kGGRange;
+    this->mDamage = BALANCE_IVAR(kHandGrenadeDamage);
+}
+
+int AvHGrenade::GetDeployAnimation() const
+{
+    return 5;
+}
+
+char* AvHGrenade::GetDeploySound() const
+{
+    return kGRDeploySound;
+}
+
+float AvHGrenade::GetDeployTime() const
+{
+    return AvHBasePlayerWeapon::GetDeployTime();
+}
+
+bool AvHGrenade::GetFiresUnderwater() const
+{
+    return true;
+}
+
+char* AvHGrenade::GetHeavyViewModel() const
+{
+    return kGRHVVModel;
+}
+
+int	AvHGrenade::GetIdleAnimation() const
+{
+	int theAnim = -1;
+
+	if( m_flStartThrow == 0 && m_flReleaseThrow == -1)
+	{
+		theAnim = UTIL_SharedRandomLong(this->m_pPlayer->random_seed, 0, 2);
+	}
+
+    return theAnim;
+}
+
+bool AvHGrenade::GetIsDroppable() const
+{
+    return false;
+}
+
+BOOL AvHGrenade::GetIsWeaponPrimed() const
+{
+    return false;
+}
+
+BOOL AvHGrenade::GetIsWeaponPriming() const
+{
+    return false;
+}
+
+bool AvHGrenade::GetMustPressTriggerForEachShot() const
+{
+    return false;
+}
+
+bool AvHGrenade::ShouldRollGrenade(void) const
+{
+	// If player is crouched, roll grenade instead
+	return (this->m_pPlayer && FBitSet(this->m_pPlayer->pev->flags, FL_DUCKING));
+}
+
+int	AvHGrenade::GetShootAnimation() const
+{
+    
+    int theAnimation = 4;
+
+    // If player is crouched, play roll animation
+    if(this->ShouldRollGrenade())
+    {
+        theAnimation = 7;
+    }
+
+    return theAnimation;
+
+}
+
+char* AvHGrenade::GetPlayerModel() const
+{
+    return kGRPModel;
+}
+
+int AvHGrenade::GetPrimeAnimation() const
+{
+        
+    int theAnimation = 3;
+
+    // If player is crouched, play roll animation
+    if(this->m_pPlayer && FBitSet(this->m_pPlayer->pev->flags, FL_DUCKING))
+    {
+        theAnimation = 6;
+    }
+
+    return theAnimation;
+
+}
+
+char* AvHGrenade::GetPrimeSound() const
+{
+    return kGRPrimeSound;
+}
+
+char* AvHGrenade::GetViewModel() const
+{
+    return kGRVModel;
+}
+
+char* AvHGrenade::GetWorldModel() const
+{
+    return kGRWModel;
+}
+
+void AvHGrenade::Holster(int skiplocal)
+{
+    
+    // Important that this goes first to avoid infinite recursion when removing
+    // the item from the player.
+
+    AvHMarineWeapon::Holster(skiplocal);
+
+    m_flStartThrow = 0;
+    m_flReleaseThrow = -1;
+
+    if(!this->m_iClip)
+    {
+        SetThink(&AvHGrenade::DestroyItem);
+        this->pev->nextthink = gpGlobals->time + 0.1f;
+    }
+
+    EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "common/null.wav", 1.0, ATTN_NORM);
+
+}
+
+
+BOOL AvHGrenade::IsUseable(void)
+{
+    // TODO:
+    return TRUE;
+}
+
+
+void AvHGrenade::PrimaryAttack(void)
+{
+ 
+    if (this->ProcessValidAttack())
+    {
+
+        if (!this->mAttackButtonDownLastFrame)
+        {
+            this->PlaybackEvent(this->mStartEvent);
+            this->mAttackButtonDownLastFrame = true;
+        }
+    		
+	    if (m_flStartThrow == 0)
+	    {
+		    m_flStartThrow = 1;
+			
+            this->PlaybackEvent(this->mEvent, this->GetPrimeAnimation());
+            
+            // Set the animation and sound.
+	            
+	        this->m_pPlayer->m_iWeaponVolume = NORMAL_GUN_VOLUME;
+	        this->m_pPlayer->m_iWeaponFlash = NORMAL_GUN_FLASH;
+
+	        this->m_pPlayer->SetAnimation(PLAYER_PRIME);
+
+			// Don't idle/fire until we've finished prime animation
+            m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + kGrenadePrimeAnimationLength;
+	    }
+    }
+}
+
+void AvHGrenade::FireProjectiles(void)
+{
+}
+
+int AvHGrenade::GetEmptyShootAnimation() const
+{
+    return -1;
+}
+
+float AvHGrenade::GetWeaponPrimeTime() const
+{ 
+    return BALANCE_FVAR(kHandGrenadePrimeTime); 
+}
+
+
+BOOL AvHGrenade::PlayEmptySound()
+{
+    // None
+    return 0;
+}
+
+void AvHGrenade::Precache(void)
+{
+    AvHMarineWeapon::Precache();
+    
+    PRECACHE_UNMODIFIED_SOUND(kGRFireSound1);
+    PRECACHE_UNMODIFIED_SOUND(kGRDeploySound);
+    PRECACHE_UNMODIFIED_SOUND(kGRExplodeSound);
+    PRECACHE_UNMODIFIED_SOUND(kGRHitSound);
+    
+    this->mEvent = PRECACHE_EVENT(1, kGREventName);
+}
+
+bool AvHGrenade::Resupply()
+{
+    return false;
+}
+
+void AvHGrenade::SetNextIdle(void)
+{
+    // Idle is treated specially for grenade
+    if( m_flStartThrow == 0 && m_flReleaseThrow == -1)
+    {
+        AvHMarineWeapon::SetNextIdle();
+    }
+}
+
+void AvHGrenade::Spawn()
+{
+    AvHMarineWeapon::Spawn();
+    
+    Precache();
+    
+    this->m_iId = AVH_WEAPON_GRENADE;
+    this->m_iDefaultAmmo = 1;
+    
+    // Set our class name
+    this->pev->classname = MAKE_STRING(kwsGrenade);
+    
+    SET_MODEL(ENT(this->pev), kGRWModel);
+    
+    FallInit();// get ready to fall down.
+}
+
+bool AvHGrenade::UsesAmmo(void) const
+{
+    return true;
+}
+
+BOOL AvHGrenade::UseDecrement(void)
+{
+    return true;
+}
+
+void AvHGrenade::CreateProjectile()
+{
+	#ifdef AVH_SERVER
+
+	// Set position and velocity like we do in client event
+	vec3_t theStartPosition;
+	UTIL_MakeVectors(this->m_pPlayer->pev->v_angle + this->m_pPlayer->pev->punchangle);
+	VectorMA(this->m_pPlayer->GetGunPosition(), kGRBarrelLength, gpGlobals->v_forward, theStartPosition);
+	
+	// Offset it to the right a bit, so it emanates from your hand instead of the center of your body
+	VectorMA(theStartPosition, 5, gpGlobals->v_right, theStartPosition);
+	VectorMA(theStartPosition, 8, gpGlobals->v_up, theStartPosition);
+	
+	// Inherit player velocity for extra skill and finesse
+	
+	Vector theVelocity;
+	Vector theInheritedVelocity;
+	VectorScale(this->m_pPlayer->pev->velocity, kGrenadeParentVelocityScalar, theInheritedVelocity);
+	
+	if(!this->ShouldRollGrenade())
+	{
+		VectorMA(theInheritedVelocity, kGrenadeVelocity, gpGlobals->v_forward, theVelocity);
+	}
+	else
+	{
+		Vector theTossVelocity(0, 0, 40);
+		VectorAdd(theInheritedVelocity, theTossVelocity, theInheritedVelocity);
+		VectorMA(theInheritedVelocity, kGrenadeRollVelocity, gpGlobals->v_forward, theVelocity);
+	}
+
+	// How to handle this?  Only generate entity on server, but we should do SOMETHING on the client, no?
+	CGrenade* theGrenade = AvHSUShootServerGrenade(this->m_pPlayer->pev, theStartPosition, theVelocity, BALANCE_IVAR(kGrenDetonateTime), true);
+	ASSERT(theGrenade);
+
+	theGrenade->pev->dmg = this->mDamage;
+
+	// Make the grenade not very bouncy
+	theGrenade->pev->gravity = kGrenadeGravity;
+	theGrenade->pev->friction = 1 - kGrenadeElasticity;
+
+	SET_MODEL(ENT(theGrenade->pev), this->GetWorldModel());
+
+	theGrenade->pev->avelocity.x = RANDOM_LONG(-300, -200);
+	
+	// Rotate the grenade to the orientation it would be if it was thrown.
+	VectorCopy(m_pPlayer->pev->angles, theGrenade->pev->angles);
+	theGrenade->pev->angles[1] += 100;
+
+	#endif
+}
+
+void AvHGrenade::ItemPostFrame(void)
+{
+	AvHMarineWeapon::ItemPostFrame();
+	float theTimeBase = UTIL_WeaponTimeBase();
+
+	if(this->m_flReleaseThrow > theTimeBase)
+	{
+		float theClientTimePassedThisTick = this->GetTimePassedThisTick();
+		this->m_flReleaseThrow = max(this->m_flReleaseThrow - theClientTimePassedThisTick, theTimeBase);
+	}
+}
+
+void AvHGrenade::WeaponIdle()
+{
+
+    if ( m_flTimeWeaponIdle > UTIL_WeaponTimeBase() )
+    {
+		return;
+    }
+
+	if (m_flStartThrow == 1)
+	{
+		// Throw it
+		this->PlaybackEvent(this->mEvent, GetShootAnimation());
+
+		// Set the animation and sound.
+		this->m_pPlayer->m_iWeaponVolume = NORMAL_GUN_VOLUME;
+		this->m_pPlayer->m_iWeaponFlash = NORMAL_GUN_FLASH;
+
+		this->m_pPlayer->SetAnimation(PLAYER_ATTACK1);
+
+		// Set time to shoot projectile, so it looks right with throw animation
+		float theTimeToCreateGrenade = UTIL_WeaponTimeBase() + kGrenadeThrowTimeBeforeRelease;
+		m_flReleaseThrow = theTimeToCreateGrenade;
+
+		m_flStartThrow = -1;
+	}
+	else if ((m_flStartThrow == -1) && (m_flReleaseThrow == UTIL_WeaponTimeBase()))
+	{
+		this->CreateProjectile();
+
+		this->DeductCostForShot();
+
+		// Finish throw animation
+		float theAnimationEnd = UTIL_WeaponTimeBase() + kGrenadeThrowAnimationLength;
+		m_flNextSecondaryAttack = theAnimationEnd;
+		m_flNextPrimaryAttack = theAnimationEnd;
+		m_flTimeWeaponIdle = theAnimationEnd;
+
+		// We've finished the throw, don't do it again (set both inactive)
+        m_flStartThrow = 0;
+		m_flReleaseThrow = -1;
+	}
+    else
+    {
+        AvHMarineWeapon::WeaponIdle();
+
+		if(!this->m_iClip)
+        {
+            this->m_pPlayer->SelectLastItem();
+        }
+    }
+}
diff --git a/main/source/mod/AvHGrenadeGun.cpp b/main/source/mod/AvHGrenadeGun.cpp
new file mode 100644
index 00000000..c09ef1e5
--- /dev/null
+++ b/main/source/mod/AvHGrenadeGun.cpp
@@ -0,0 +1,311 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHGrenadeGun.cpp $
+// $Date: 2002/11/22 21:28:16 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHGrenadeGun.cpp,v $
+// Revision 1.17  2002/11/22 21:28:16  Flayra
+// - mp_consistency changes
+//
+// Revision 1.16  2002/10/16 20:53:09  Flayra
+// - Removed weapon upgrade sounds
+//
+// Revision 1.15  2002/10/03 18:46:26  Flayra
+// - Added heavy view model
+//
+// Revision 1.14  2002/07/24 19:09:16  Flayra
+// - Linux issues
+//
+// Revision 1.13  2002/07/24 18:45:41  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.12  2002/06/25 17:50:59  Flayra
+// - Reworking for correct player animations and new enable/disable state, new view model artwork, alien weapon refactoring
+//
+// Revision 1.11  2002/06/03 16:37:56  Flayra
+// - Added different deploy times (this should be refactored a bit more), refactored grenades
+//
+// Revision 1.10  2002/05/28 17:44:58  Flayra
+// - Tweak weapon deploy volume, as Valve's sounds weren't normalized
+//
+// Revision 1.9  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHMarineWeapons.h"
+#include "mod/AvHMarineWeaponConstants.h"
+#include "mod/AvHServerUtil.h"
+
+LINK_ENTITY_TO_CLASS(kwGrenadeGun, AvHGrenadeGun);
+void V_PunchAxis( int axis, float punch );
+
+void AvHGrenadeGun::Init()
+{
+	this->mRange = kGGRange;
+	this->mDamage = BALANCE_IVAR(kGrenadeDamage);
+}
+
+int	AvHGrenadeGun::GetBarrelLength() const
+{
+	return kGGBarrelLength;
+}
+
+float AvHGrenadeGun::GetRateOfFire() const
+{
+	return BALANCE_FVAR(kGGROF);
+}
+
+int	AvHGrenadeGun::GetDeployAnimation() const
+{
+	int theAnimation = -1;
+	
+	int theShotsInClip = this->GetShotsInClip();
+	
+	switch(theShotsInClip)
+	{
+	case 4:
+	case 0:
+		theAnimation = 13;
+		break;
+	case 3:
+		theAnimation = 14;
+		break;
+	case 2:
+		theAnimation = 15;
+		break;
+	case 1:
+		theAnimation = 16;
+		break;
+	}
+	
+	return theAnimation;
+}
+
+char* AvHGrenadeGun::GetDeploySound() const
+{
+	return kGGDeploySound;
+}
+
+float AvHGrenadeGun::GetReloadTime(void) const
+{
+	int theShotsToLoad = BALANCE_IVAR(kGGMaxClip) - this->GetShotsInClip();
+
+	float theBaseReloadTime = BALANCE_FVAR(kGrenadeLauncherBaseReloadTime);
+	float theGrenadeReloadTime = BALANCE_FVAR(kGrenadeLauncherGrenadeReloadTime);
+	float theEndReloadTime = BALANCE_FVAR(kGrenadeLauncherEndReloadTime);
+
+	return theBaseReloadTime + theShotsToLoad*theGrenadeReloadTime + theEndReloadTime;
+}
+
+bool AvHGrenadeGun::GetHasMuzzleFlash() const
+{
+	return true;
+}
+
+void AvHGrenadeGun::GetEventOrigin(Vector& outOrigin) const
+{
+	Vector theGunPosition = this->m_pPlayer->GetGunPosition();
+	VectorCopy(theGunPosition, outOrigin);
+}
+
+void AvHGrenadeGun::GetEventAngles(Vector& outAngles) const
+{
+	float theGrenadeForce = BALANCE_IVAR(kGrenadeForce);
+
+	Vector theAiming = this->m_pPlayer->GetAutoaimVector(AUTOAIM_5DEGREES);
+
+	Vector theVelocity = theAiming*theGrenadeForce + this->m_pPlayer->pev->velocity;
+
+	VectorCopy(theVelocity, outAngles);
+}
+
+char* AvHGrenadeGun::GetHeavyViewModel() const
+{
+	return kGGHVVModel;
+}
+
+int	AvHGrenadeGun::GetIdleAnimation() const
+{
+	int theAnimation = -1;
+
+	int theShotsInClip = this->GetShotsInClip();
+
+	switch(theShotsInClip)
+	{
+	case 0:
+	case 4:
+		theAnimation = 0;
+		break;
+
+	case 1:
+		theAnimation = 3;
+		break;
+
+	case 2:
+		theAnimation = 2;
+		break;
+
+	case 3:
+		theAnimation = 1;
+		break;
+	}
+
+	return theAnimation;
+}
+
+char* AvHGrenadeGun::GetPlayerModel() const
+{
+	return kGGPModel;
+}
+
+int	AvHGrenadeGun::GetReloadAnimation() const
+{
+	int theAnimation = -1;
+	
+	int theShotsInClip = this->GetShotsInClip();
+	
+	switch(theShotsInClip)
+	{
+	case 0:
+		theAnimation = 7;
+		break;
+		
+	case 1:
+		theAnimation = 6;
+		break;
+		
+	case 2:
+		theAnimation = 5;
+		break;
+		
+	case 3:
+		theAnimation = 4;
+		break;
+	}
+	
+	return theAnimation;
+}
+
+int	AvHGrenadeGun::GetEmptyShootAnimation() const
+{
+	return 12;
+}
+
+int	AvHGrenadeGun::GetShootAnimation() const
+{
+	int theAnimation = -1;
+	
+	int theShotsInClip = this->GetShotsInClip();
+	
+	switch(theShotsInClip)
+	{
+	case 4:
+		theAnimation = 8;
+		break;
+	case 3:
+		theAnimation = 9;
+		break;
+	case 2:
+		theAnimation = 10;
+		break;
+	case 1:
+		theAnimation = 11;
+		break;
+	case 0:
+		theAnimation = 12;
+		break;
+	}
+	
+	return theAnimation;
+}
+
+char* AvHGrenadeGun::GetViewModel() const
+{
+	return kGGVModel;
+}
+
+char* AvHGrenadeGun::GetWorldModel() const
+{
+	return kGGWModel;
+}
+
+void AvHGrenadeGun::FireProjectiles(void)
+{
+	#ifdef AVH_SERVER
+
+	Vector theOrigin;
+	this->GetEventOrigin(theOrigin);
+
+	// Grenade gun uses velocity here instead of angles, assumes angles are the player angles (for both the server grenade and the client temp entity)
+	Vector theVelocity;
+	this->GetEventAngles(theVelocity);
+
+	// How to handle this?  Only generate entity on server, but we should do SOMETHING on the client, no?
+	CGrenade* theGrenade = AvHSUShootServerGrenade(this->m_pPlayer->pev, theOrigin, theVelocity, BALANCE_IVAR(kGrenDetonateTime), false);
+    ASSERT(theGrenade);
+    theGrenade->pev->dmg = this->mDamage;
+
+	#endif
+}
+
+void AvHGrenadeGun::Precache()
+{
+	AvHMarineWeapon::Precache();
+
+	PRECACHE_UNMODIFIED_MODEL(kGGEjectModel);
+	PRECACHE_UNMODIFIED_MODEL(kGGAmmoModel);
+
+	PRECACHE_UNMODIFIED_SOUND(kGrenadeBounceSound1);
+	PRECACHE_UNMODIFIED_SOUND(kGrenadeBounceSound2);
+	PRECACHE_UNMODIFIED_SOUND(kGrenadeBounceSound3);
+
+	PRECACHE_UNMODIFIED_SOUND(kGGFireSound1);
+	
+	#ifdef AVH_UPGRADE_SOUNDS
+	PRECACHE_UNMODIFIED_SOUND(kGGFireSound2);
+	PRECACHE_UNMODIFIED_SOUND(kGGFireSound3);
+	PRECACHE_UNMODIFIED_SOUND(kGGFireSound4);
+	#endif
+
+	PRECACHE_UNMODIFIED_SOUND(kGGReloadSound);
+	
+	this->mEvent = PRECACHE_EVENT(1, kGGEventName);
+}
+
+void AvHGrenadeGun::Spawn() 
+{ 
+    AvHMarineWeapon::Spawn(); 
+
+	Precache();
+
+	this->m_iId = AVH_WEAPON_GRENADE_GUN;
+	m_iDefaultAmmo = BALANCE_IVAR(kGGMaxClip);
+
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsGrenadeGun);
+
+	SET_MODEL(ENT(this->pev), kGGWModel);
+
+	FallInit();// get ready to fall down.
+} 
diff --git a/main/source/mod/AvHHealingSpray.cpp b/main/source/mod/AvHHealingSpray.cpp
new file mode 100644
index 00000000..7847d84c
--- /dev/null
+++ b/main/source/mod/AvHHealingSpray.cpp
@@ -0,0 +1,248 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHHealingSpray.cpp $
+// $Date: 2002/11/22 21:28:16 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHHealingSpray.cpp,v $
+// Revision 1.11  2002/11/22 21:28:16  Flayra
+// - mp_consistency changes
+//
+// Revision 1.10  2002/11/12 02:25:14  Flayra
+// - Healing spray no longer heals unbuilt structures
+//
+// Revision 1.9  2002/10/03 18:48:16  Flayra
+// - Healing spray only damages players
+//
+// Revision 1.8  2002/09/23 22:16:13  Flayra
+// - Healing spray no longer goes through walls
+//
+// Revision 1.7  2002/09/09 19:51:44  Flayra
+// - Healing spray heals players more generically, playing sound when effective
+//
+// Revision 1.6  2002/08/31 18:01:01  Flayra
+// - Work at VALVe
+//
+// Revision 1.5  2002/08/16 02:35:35  Flayra
+// - New damage types
+// - Healing spray can affect enemy non-player organics (buildings, babblers)
+//
+// Revision 1.4  2002/07/24 19:09:16  Flayra
+// - Linux issues
+//
+// Revision 1.3  2002/07/24 18:45:41  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.2  2002/07/23 17:04:06  Flayra
+// - Spray only hurts players (prevents builders from easily taking out mines)
+//
+// Revision 1.1  2002/06/25 17:24:29  Flayra
+// - Level 2 healing ability
+//
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#ifdef AVH_SERVER
+#include "mod/AvHBaseBuildable.h"
+#include "mod/AvHGamerules.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHSharedUtil.h"
+
+LINK_ENTITY_TO_CLASS(kwHealingSpray, AvHHealingSpray);
+
+void AvHHealingSpray::Init()
+{
+	this->mRange = kHealingSprayRange;
+	this->mDamage = BALANCE_IVAR(kHealingSprayDamage);
+}
+
+int	AvHHealingSpray::GetBarrelLength() const
+{
+	return kHealingSprayBarrelLength;
+}
+
+float AvHHealingSpray::GetRateOfFire() const
+{
+	return BALANCE_FVAR(kHealingSprayROF);
+}
+
+int	AvHHealingSpray::GetDamageType() const
+{
+//	return NS_DMG_ORGANIC;
+	return NS_DMG_NORMAL;
+}
+
+int	AvHHealingSpray::GetDeployAnimation() const
+{
+	int theDeployAnimation = -1;
+	
+	AvHWeaponID thePreviousID = this->GetPreviousWeaponID();
+	
+	switch(thePreviousID)
+	{
+		// Spit and bile bomb look the same
+	case AVH_WEAPON_SPIT:
+	case AVH_WEAPON_BILEBOMB:
+		theDeployAnimation = 5;
+		break;
+	}
+	
+	return theDeployAnimation;
+}
+
+int	AvHHealingSpray::GetIdleAnimation() const
+{
+	return 2;
+}
+
+int	AvHHealingSpray::GetShootAnimation() const
+{
+	return 4;
+}
+
+char* AvHHealingSpray::GetViewModel() const
+{
+	return kLevel2ViewModel;
+}
+
+void AvHHealingSpray::Precache()
+{
+	AvHAlienWeapon::Precache();
+
+	PRECACHE_UNMODIFIED_SOUND(kHealingSpraySound);
+	
+	this->mEvent = PRECACHE_EVENT(1, kHealingSprayEventName);
+}
+
+
+void AvHHealingSpray::Spawn() 
+{ 
+    AvHAlienWeapon::Spawn(); 
+	
+	this->Precache();
+	
+	this->m_iId = AVH_WEAPON_HEALINGSPRAY;
+	
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsHealingSpray);
+	
+	SET_MODEL(ENT(this->pev), kNullModel);
+	
+	FallInit();// get ready to fall down.
+} 
+
+
+void AvHHealingSpray::FireProjectiles(void)
+{
+	#ifdef AVH_SERVER
+	
+	// Look for entities in cone
+	CBaseEntity* theCurrentEntity = NULL;
+	vec3_t theOriginatingPosition = this->m_pPlayer->GetGunPosition();
+
+	while((theCurrentEntity = UTIL_FindEntityInSphere(theCurrentEntity, theOriginatingPosition, kHealingSprayRange)) != NULL)
+	{
+		// Can't affect self
+		if(theCurrentEntity != this->m_pPlayer)
+		{
+			// If entity is in view cone, and within range
+			if(this->m_pPlayer->FInViewCone(&theCurrentEntity->pev->origin))
+			{
+				// UTIL_FindEntityInSphere doesn't seem to take height into account.  Make sure the entity is within range.
+                float theMaxEntitySize = max(Length(theCurrentEntity->pev->mins), Length(theCurrentEntity->pev->maxs));
+
+                vec3_t theVectorDiff;
+                VectorSubtract(theCurrentEntity->pev->origin, theOriginatingPosition, theVectorDiff);
+				float theDiff = Length(theVectorDiff) - theMaxEntitySize;
+
+                if(theDiff < kHealingSprayRange/2)
+				{
+					// Make sure entity is in line of fire
+					TraceResult tr;
+					UTIL_TraceLine(theOriginatingPosition, theCurrentEntity->Center(), dont_ignore_monsters, dont_ignore_glass, ENT(pev)/*pentIgnore*/, &tr);
+
+					CBaseEntity* theBlockedByEntity = CBaseEntity::Instance(tr.pHit);
+
+					if((tr.flFraction == 1.0) || (theBlockedByEntity == theCurrentEntity))
+					{
+						// Heal friendly player or building in range 
+                        float theFocusAmount = 1.0f;
+                        if(AvHSHUGetIsWeaponFocusable(AvHWeaponID(this->m_iId)))
+                        {
+                            theFocusAmount = AvHPlayerUpgrade::GetFocusDamageUpgrade(this->m_pPlayer->pev->iuser4);
+                        }
+                        
+						float theDamage = this->mDamage*theFocusAmount;
+						AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theCurrentEntity);
+						
+						if(theCurrentEntity->pev->team == this->m_pPlayer->pev->team)
+						{
+							// Players and buildables heal armor too
+							AvHBaseBuildable* theBuildable = dynamic_cast<AvHBaseBuildable*>(theCurrentEntity);
+							const int theBuildableHealingSprayScalar = BALANCE_IVAR(kHealingSprayBuildableScalar);
+							if(thePlayer)
+							{
+								// Players heal by base amount, plus percentage of health
+								float thePercentage = BALANCE_IVAR(kHealingSprayPlayerPercent)/100.0f;
+								theDamage += thePercentage*theCurrentEntity->pev->max_health;
+								thePlayer->Heal(theDamage, true);
+							}
+							else if(theBuildable)
+							{
+								// Structures heal base amount times scalar
+                                float theAmount = theDamage*(float)theBuildableHealingSprayScalar;
+								if(theBuildable->Regenerate(theAmount, true))
+                                {
+                                    // Award experience for healing the hive.  Might award a little more if barely wounded, but that seems OK.
+                                    if(GetGameRules()->GetIsCombatMode() && (theBuildable->pev->iuser3 == AVH_USER3_HIVE))
+                                    {
+                                        AvHPlayer* theHealsprayingPlayer = dynamic_cast<AvHPlayer*>(this->m_pPlayer);
+                                        if(theHealsprayingPlayer && (theHealsprayingPlayer->pev->team == theBuildable->pev->team))
+                                        {
+                                            float theCombatHealExperienceScalar = BALANCE_FVAR(kCombatHealExperienceScalar);
+                                            theHealsprayingPlayer->AwardExperienceForObjective(theAmount*theCombatHealExperienceScalar, theBuildable->GetMessageID());
+                                        }
+                                    }
+                                }
+							}
+							else
+							{
+								theCurrentEntity->TakeHealth(theDamage, this->GetDamageType());
+							}
+						}
+						else if(thePlayer)
+						{
+							thePlayer->TakeDamage(this->pev, this->m_pPlayer->pev, theDamage, this->GetDamageType());
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	#endif	
+}
+
diff --git a/main/source/mod/AvHHeavyMachineGun.cpp b/main/source/mod/AvHHeavyMachineGun.cpp
new file mode 100644
index 00000000..d567d456
--- /dev/null
+++ b/main/source/mod/AvHHeavyMachineGun.cpp
@@ -0,0 +1,260 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHHeavyMachineGun.cpp $
+// $Date: 2002/11/22 21:28:16 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHHeavyMachineGun.cpp,v $
+// Revision 1.23  2002/11/22 21:28:16  Flayra
+// - mp_consistency changes
+//
+// Revision 1.22  2002/10/18 22:19:22  Flayra
+// - Fixed bug where HMG never ran out of ammo
+//
+// Revision 1.21  2002/10/16 20:53:09  Flayra
+// - Removed weapon upgrade sounds
+//
+// Revision 1.20  2002/10/16 00:56:44  Flayra
+// - Removed velocity change and ground restrictions (too confusing and felt buggy)
+//
+// Revision 1.19  2002/10/03 18:46:20  Flayra
+// - Added heavy view model
+//
+// Revision 1.18  2002/09/23 22:16:31  Flayra
+// - HMG can only be fired from the ground, and slows down firer
+//
+// Revision 1.17  2002/08/09 01:02:00  Flayra
+// - Made HMG faster to deploy
+//
+// Revision 1.16  2002/07/24 19:09:16  Flayra
+// - Linux issues
+//
+// Revision 1.15  2002/07/24 18:45:41  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.14  2002/07/08 16:59:48  Flayra
+// - Updated anims and timing for new artwork
+//
+// Revision 1.13  2002/07/01 21:33:06  Flayra
+// - Tweaks for new artwork
+//
+// Revision 1.12  2002/06/25 17:50:59  Flayra
+// - Reworking for correct player animations and new enable/disable state, new view model artwork, alien weapon refactoring
+//
+// Revision 1.11  2002/06/03 16:37:31  Flayra
+// - Constants and tweaks to make weapon anims and times correct with new artwork, added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.10  2002/05/28 17:44:58  Flayra
+// - Tweak weapon deploy volume, as Valve's sounds weren't normalized
+//
+// Revision 1.9  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHMarineWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHMarineWeapons.h"
+#include "dlls/util.h"
+
+LINK_ENTITY_TO_CLASS(kwHeavyMachineGun, AvHHeavyMachineGun);
+void V_PunchAxis( int axis, float punch );
+
+void AvHHeavyMachineGun::Init()
+{
+	this->mRange = kHMGRange;
+	this->mDamage = BALANCE_IVAR(kHMGDamage);
+}
+
+int	AvHHeavyMachineGun::GetBarrelLength() const
+{
+	return kHMGBarrelLength;
+}
+
+float AvHHeavyMachineGun::GetRateOfFire() const
+{
+	return BALANCE_FVAR(kHMGROF);
+}
+
+int	AvHHeavyMachineGun::GetDeployAnimation() const
+{
+	return 7;
+}
+
+char* AvHHeavyMachineGun::GetDeploySound() const
+{
+	return kHMGDeploySound;
+}
+
+float AvHHeavyMachineGun::GetDeployTime() const
+{
+	return .6f;
+}
+
+int AvHHeavyMachineGun::GetDamageType() const
+{
+	return NS_DMG_PIERCING;
+}
+
+bool AvHHeavyMachineGun::GetHasMuzzleFlash() const
+{
+	return true;
+}
+
+int	AvHHeavyMachineGun::GetIdleAnimation() const
+{
+	const int kMaxRandom = 30;
+	int iAnim;
+	int theRandomNum = UTIL_SharedRandomLong(this->m_pPlayer->random_seed, 0, kMaxRandom);
+
+	if(theRandomNum == 0)
+	{
+		// Pet machine gun every once in awhile
+		iAnim = 1;
+	}
+	else if(theRandomNum < kMaxRandom/2)
+	{
+		iAnim = 0;
+	}
+	else
+	{
+		iAnim = 2;
+	}
+	
+	return iAnim;
+}
+
+
+void AvHHeavyMachineGun::FireProjectiles(void)
+{
+	// Assumes we're on the ground
+//	const float kSlowDownScalar = .2f;
+//	vec3_t theXYVelocity;
+//	VectorCopy(this->m_pPlayer->pev->velocity, theXYVelocity);
+//
+//	VectorScale(theXYVelocity, kSlowDownScalar, theXYVelocity);
+//	theXYVelocity.z = this->m_pPlayer->pev->velocity.z;
+//
+//	VectorCopy(theXYVelocity, this->m_pPlayer->pev->velocity);
+
+	AvHMarineWeapon::FireProjectiles();
+}
+
+char* AvHHeavyMachineGun::GetHeavyViewModel() const
+{
+	return kHMGHVVModel;
+}
+
+char* AvHHeavyMachineGun::GetPlayerModel() const
+{
+	return kHMGPModel;
+}
+
+Vector AvHHeavyMachineGun::GetProjectileSpread() const
+{
+	return kHMGSpread;
+}
+
+char* AvHHeavyMachineGun::GetViewModel() const
+{
+	return kHMGVModel;
+}
+
+char* AvHHeavyMachineGun::GetWorldModel() const
+{
+	return kHMGWModel;
+}
+
+int	AvHHeavyMachineGun::GetReloadAnimation() const
+{
+	return 3;
+}
+
+float AvHHeavyMachineGun::GetReloadTime(void) const
+{
+	return 6.3f;
+}
+
+int	AvHHeavyMachineGun::GetShootAnimation() const
+{
+	int theShootAnim = 4;
+
+	if(this->m_iClip % 2)
+	{
+		theShootAnim = 5;
+	}
+
+	return theShootAnim;
+}
+
+int	AvHHeavyMachineGun::GetEmptyShootAnimation() const
+{
+	return 6;
+}
+
+void AvHHeavyMachineGun::Precache()
+{
+	AvHMarineWeapon::Precache();
+
+	PRECACHE_UNMODIFIED_MODEL(kHMGEjectModel);
+
+	PRECACHE_UNMODIFIED_SOUND(kHMGFireSound1);
+	
+	#ifdef AVH_UPGRADE_SOUNDS
+	PRECACHE_UNMODIFIED_SOUND(kHMGFireSound2);
+	PRECACHE_UNMODIFIED_SOUND(kHMGFireSound3);
+	PRECACHE_UNMODIFIED_SOUND(kHMGFireSound4);
+	#endif
+
+	PRECACHE_UNMODIFIED_SOUND(kHMGReloadSound);
+	
+	this->mEvent = PRECACHE_EVENT(1, kHMGEventName);
+}
+
+bool AvHHeavyMachineGun::ProcessValidAttack(void)
+{
+	bool theValidAttack = false;
+
+	if(AvHMarineWeapon::ProcessValidAttack() /*&& (this->m_pPlayer->pev->flags & FL_ONGROUND)*/)
+	{
+		theValidAttack = true;
+	}
+
+	return theValidAttack;
+}
+
+
+void AvHHeavyMachineGun::Spawn() 
+{ 
+    AvHMarineWeapon::Spawn(); 
+
+	Precache();
+
+	this->m_iId = AVH_WEAPON_HMG;
+	this->m_iDefaultAmmo = BALANCE_IVAR(kHMGMaxClip);
+
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsHeavyMachineGun);
+
+	SET_MODEL(ENT(this->pev), kHMGWModel);
+
+	FallInit();// get ready to fall down.
+} 
diff --git a/main/source/mod/AvHHelp.cpp b/main/source/mod/AvHHelp.cpp
new file mode 100644
index 00000000..32a021a7
--- /dev/null
+++ b/main/source/mod/AvHHelp.cpp
@@ -0,0 +1,666 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: Pop-up context sensitive help ("there's an active hive nearby...destroy it!")
+//
+// $Workfile: AvHHelp.cpp $
+// $Date: 2002/10/24 21:25:58 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHHelp.cpp,v $
+// Revision 1.17  2002/10/24 21:25:58  Flayra
+// - Completely reworked help to be client-side
+//
+// Revision 1.16  2002/10/03 18:49:57  Flayra
+// - Play game objective hints
+//
+// Revision 1.15  2002/09/25 20:45:02  Flayra
+// - Only emit phase gate message when built
+// - Removed use order
+// - Frame-rate independent updating
+//
+// Revision 1.14  2002/08/31 18:01:01  Flayra
+// - Work at VALVe
+//
+// Revision 1.13  2002/08/02 22:51:17  Flayra
+// - Don't show pop-up menu help for commander
+//
+// Revision 1.12  2002/08/02 21:59:55  Flayra
+// - Tons of new help messages for new tooltip system
+//
+// Revision 1.11  2002/07/25 16:57:59  flayra
+// - Linux changes
+//
+// Revision 1.10  2002/07/24 18:45:41  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.9  2002/06/25 17:59:39  Flayra
+// - Removed help for building gun, renamed arsenal to armory
+//
+// Revision 1.8  2002/06/03 16:46:02  Flayra
+// - Help for arsenal, help for alien building secondary functions (help me, I need to be rewritten!)
+//
+// Revision 1.7  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+// Revision 1.8  2002/05/14 19:24:16  Charlie
+//===============================================================================
+#include "mod/AvHHud.h"
+#include "mod/AvHTitles.h"
+#include "mod/AvHBasePlayerWeaponConstants.h"
+#include "mod/AvHClientVariables.h"
+#include "mod/AvHServerVariables.h"
+
+#include "common/const.h"
+#include "common/event_api.h"
+#include "pm_shared/pm_defs.h"
+#include "pm_shared/pm_shared.h"
+#include "pm_shared/pm_movevars.h"
+#include "cl_dll/cl_util.h"
+
+bool AvHHud::ProcessEntityHelp()
+{
+	bool theDisplayedTooltip = false;
+
+	int theNumCommandersOnTeam = (this->GetCommanderIndex() > 0) ? 1 : 0;
+	bool theIsCommander = (this->GetHUDUser3() == AVH_USER3_COMMANDER_PLAYER);
+	bool theIsInTrainingMode = false;
+
+	if(this->GetIsCombatMode())
+	{
+		// TODO: Add combat mode tooltips
+	}
+	else if(!theIsInTrainingMode)
+	{
+		for(EntityListType::iterator theHelpIter = this->mHelpEnts.begin(); (theHelpIter != this->mHelpEnts.end()) && !theDisplayedTooltip ; theHelpIter++)
+		{
+			bool theEntityIsFriendly = false;
+			bool theEntityIsEnemy = false;
+
+			physent_t* theEntity = gEngfuncs.pEventAPI->EV_GetPhysent(*theHelpIter);
+			if(theEntity)
+			{
+				bool theIsBuildable = GetHasUpgrade(theEntity->iuser4, MASK_BUILDABLE);
+				bool theIsBuilt = !theIsBuildable;
+					
+				int theUser3 = theEntity->iuser3;
+
+				if(theEntity->team == this->GetHUDTeam())
+				{
+					theEntityIsFriendly = true;
+				}
+				else if(theEntity->team != 0)
+				{
+					theEntityIsEnemy = true;
+				}
+				
+				// Handle commander separately
+				if(theIsCommander)
+				{
+				}
+				else
+				{
+					// TODO: Make sure we're facing it?
+
+					// If the team has no commander, and this player is near his team's command station
+					if(theUser3 == AVH_USER3_COMMANDER_STATION)
+					{
+						if(theEntityIsFriendly)
+						{
+							if(theNumCommandersOnTeam == 0)
+							{
+								if(this->AddTooltipOnce(kHelpTextCSAttractMode))
+								{
+									theDisplayedTooltip = true;
+									continue;
+								}
+							}
+						}
+						else if(this->AddTooltipOnce(kHelpTextAttackNearbyStation))
+						{
+							theDisplayedTooltip = true;
+							continue;
+						}
+					}
+					
+					// Check if there are any non fully built buildings on our team (this gets turrets and siege turrets of course)
+					if((theUser3 == AVH_USER3_TURRET) || (theUser3 == AVH_USER3_SIEGETURRET))
+					{
+						if(theIsBuildable && theEntityIsFriendly)
+						{
+							if(this->AddTooltipOnce(kHelpTextBuildTurret))
+							{
+								theDisplayedTooltip = true;
+								continue;
+							}
+						}
+					}
+				
+					// Near an armory?  Tell player about getting ammo from it.
+					if(theUser3 == AVH_USER3_ARMORY)
+					{
+						if(!theIsBuildable && theEntityIsFriendly)
+						{
+							if(this->AddTooltipOnce(kHelpTextArmoryResupply))
+							{
+								theDisplayedTooltip = true;
+								continue;
+							}
+						}
+					}
+				
+					
+					
+					if(theUser3 == AVH_USER3_RESTOWER)
+					{
+						if(!theEntityIsFriendly)
+						{
+							if(this->AddTooltipOnce(kHelpTextAttackTower))
+							{
+								theDisplayedTooltip = true;
+								continue;
+							}
+						}
+						else if(theIsBuildable)
+						{
+							this->AddTooltip(kHelpTextBuildTower);
+							theDisplayedTooltip = true;
+							continue;
+						}
+						else
+						{
+							if(this->AddTooltipOnce(kHelpTextExplainTower))
+							{
+								theDisplayedTooltip = true;
+								continue;
+							}
+						}
+					}
+					
+					// Near a phase gate?
+					if((theUser3 == AVH_USER3_PHASEGATE) && theIsBuilt)
+					{
+						if(this->AddTooltipOnce(kHelpTextPhaseGate))
+						{
+							theDisplayedTooltip = true;
+							continue;
+						}
+					}
+					
+					// Hive?
+					if((theUser3 == AVH_USER3_HIVE) && (theEntity->team != 0))
+					{
+						if(theEntityIsFriendly)
+						{
+						}
+						else if(theEntityIsEnemy)
+						{
+							this->AddTooltip(kHelpTextAttackNearbyHive);
+							theDisplayedTooltip = true;
+							continue;
+						}
+					}
+				
+					// If we're near an unbuilt alien structure, tell the player how to build it
+					if((this->GetHUDUser3() == AVH_USER3_ALIEN_PLAYER2) && theIsBuildable && theEntityIsFriendly)
+					{
+						if(this->AddTooltipOnce(kHelpTextAlienEnergy))
+						{
+							theDisplayedTooltip = true;
+							continue;
+						}
+					}
+				
+					// Movement chamber
+					if((theUser3 == AVH_USER3_MOVEMENT_CHAMBER) && theIsBuilt)
+					{
+						if(theEntityIsFriendly)
+						{
+							this->AddTooltip(kHelpTextFriendlyMovementChamber);
+							theDisplayedTooltip = true;
+							continue;
+						}
+						else if(theEntityIsEnemy)
+						{
+							this->AddTooltip(kHelpTextAttackMovementChamber);
+							theDisplayedTooltip = true;
+							continue;
+						}
+					}
+				
+					// Defensive chamber
+					if((theUser3 == AVH_USER3_DEFENSE_CHAMBER) && theIsBuilt)
+					{
+						if(theEntityIsFriendly)
+						{
+							this->AddTooltip(kHelpTextFriendlyDefensiveChamber);
+							theDisplayedTooltip = true;
+							continue;
+						}
+						else if(theEntityIsEnemy)
+						{
+							this->AddTooltip(kHelpTextAttackDefensiveChamber);
+							theDisplayedTooltip = true;
+							continue;
+						}
+					}
+				
+					// Sensory chamber
+					if((theUser3 == AVH_USER3_SENSORY_CHAMBER) && theIsBuilt)
+					{
+						if(theEntityIsFriendly)
+						{
+							this->AddTooltip(kHelpTextFriendlySensoryChamber);
+							theDisplayedTooltip = true;
+							continue;
+						}
+						else if(theEntityIsEnemy)
+						{
+							this->AddTooltip(kHelpTextAttackSensoryChamber);
+							theDisplayedTooltip = true;
+							continue;
+						}
+					}
+				
+					// Offensive chamber
+					if((theUser3 == AVH_USER3_OFFENSE_CHAMBER) && theIsBuilt)
+					{
+						if(theEntityIsFriendly)
+						{
+							this->AddTooltip(kHelpTextFriendlyOffensiveChamber);
+							theDisplayedTooltip = true;
+							continue;
+						}
+						else if(theEntityIsEnemy)
+						{
+							this->AddTooltip(kHelpTextAttackOffensiveChamber);
+							theDisplayedTooltip = true;
+							continue;
+						}
+					}
+				
+//					if(this->GetIsMarine())
+//					{
+//						if(theWeldable && theWeldable->GetCanBeWelded() && (theWeldable->GetNormalizedBuildPercentage() < 1.0f))
+//						{
+//							if(theWeldable->GetWeldOpens())
+//							{
+//								if(this->AddTooltip(kHelpTextOpenWeldable))
+//								{
+//									theDisplayedTooltip = true;
+//								}
+//							}
+//							else
+//							{
+//								if(this->AddTooltip(kHelpTextCloseWeldable))
+//								{
+//									theDisplayedTooltip = true;
+//								}
+//							}
+//						}
+//					}
+				}
+			}
+		}
+	}
+	return theDisplayedTooltip;
+}
+
+bool AvHHud::ProcessGeneralHelp()
+{
+	const float kTimeBeforeUpgradeHelp = 500;
+	const float kTimeBeforeLifeformHelp = 200;
+
+	int theTimeSinceGameStarted = this->GetGameTime();
+	bool theDisplayedTooltip = false;
+	AvHTeamNumber theEnemyTeamNumber = (this->GetHUDTeam() == TEAM_ONE) ? TEAM_TWO : TEAM_ONE;
+	
+	if(!theDisplayedTooltip && this->AddTooltipOnce(kHelpTextPopupMenu))
+	{
+		theDisplayedTooltip = true;
+	}
+//	else if(theEnemyTeam && (theEnemyTeam->GetTeamType() == AVH_CLASS_TYPE_ALIEN) && this->AddTooltipOnce(kObjectivesVsAliens))
+//	{
+//		theDisplayedTooltip = true;
+//	}
+//	else if(theEnemyTeam && (theEnemyTeam->GetTeamType() == AVH_CLASS_TYPE_MARINE) && this->AddTooltipOnce(kObjectivesVsMarines))
+//	{
+//		theDisplayedTooltip = true;
+//	}
+	// Don't sent these messages until the game has been going for a bit...don't want to overwhelm players
+	else if(!theDisplayedTooltip && this->GetIsAlien() && (theTimeSinceGameStarted > kTimeBeforeLifeformHelp) && this->AddTooltipOnce(kHelpTextBuyLifeform))
+	{
+		theDisplayedTooltip = true;
+	}
+	//else if(!theDisplayedTooltip && this->GetIsAlien() && (theTimeSinceGameStarted > kTimeBeforeUpgradeHelp) && this->AddTooltipOnce(kHelpTextBuyUpgrade))
+	//{
+	//	theDisplayedTooltip = true;
+	//}
+	else if(this->GetHasJetpack() && !this->GetIsInTopDownMode() && this->AddTooltipOnce(kHelpTextJetpacks))
+	{
+		theDisplayedTooltip = true;
+	}
+	else if(this->GetIsAlien() && this->AddTooltipOnce(kHelpTextAlienPopupMenu))
+	{
+		theDisplayedTooltip = true;
+	}
+	else if(this->GetIsMarine() && !this->GetIsInTopDownMode() && this->AddTooltipOnce(kHelpTextMarinePopupMenu))
+	{
+		theDisplayedTooltip = true;
+	}
+	else if(this->AddTooltipOnce(kHelpTextDisableHelp))
+	{
+		theDisplayedTooltip = true;
+	}
+	// Else if we have an order
+	else if(this->GetDoesPlayerHaveOrder())
+	{
+		if(this->AddTooltipOnce(kHelpTextOrder))
+		{
+			theDisplayedTooltip = true;
+		}
+	}
+	
+	return theDisplayedTooltip;
+}
+
+bool AvHHud::ProcessWeaponsHelp()
+{
+	bool theDisplayedTooltip = false;
+
+	if((this->mCurrentWeaponID >= 0) && this->mCurrentWeaponEnabled)
+	{
+		if(!theDisplayedTooltip && (this->mCurrentWeaponID == AVH_WEAPON_BITE))
+		{
+			if(this->AddTooltipOnce(kHelpTextBite))
+			{
+				theDisplayedTooltip = true;
+			}
+		}
+		if(!theDisplayedTooltip && (this->mCurrentWeaponID == AVH_WEAPON_WEBSPINNER))
+		{
+			if(this->AddTooltipOnce(kHelpTextWeb))
+			{
+				theDisplayedTooltip = true;
+			}
+		}
+		if(!theDisplayedTooltip && (this->mCurrentWeaponID == AVH_WEAPON_SPORES))
+		{
+			if(this->AddTooltipOnce(kHelpTextSpores))
+			{
+				theDisplayedTooltip = true;
+			}
+		}
+	}
+
+	return theDisplayedTooltip;
+}
+
+bool AvHHud::ProcessAlienHelp()
+{
+	bool theDisplayedTooltip = false;
+
+	// Have we explained resources?
+	if(this->AddTooltipOnce(kHelpTextAlienWeapons))
+	{
+		theDisplayedTooltip = true;
+	}
+	else if(this->AddTooltipOnce(kHelpTextAlienResources))
+	{
+		theDisplayedTooltip = true;
+	}
+	// Have we explained energy?
+	else if(this->AddTooltipOnce(kHelpTextAlienEnergy))
+	{
+		theDisplayedTooltip = true;
+	}
+	// Do we have upgrades pending?
+	else if(this->GetHasAlienUpgradesAvailable())
+	{
+		if(this->AddTooltipOnce(kHelpTextAlienPendingUpgrades))
+		{
+			theDisplayedTooltip = true;
+		}
+	}
+	else if(this->AddTooltipOnce(kHelpTextAlienHiveSight))
+	{
+		theDisplayedTooltip = true;
+	}
+	else if(this->AddTooltipOnce(kHelpTextAlienVisionMode))
+	{
+		theDisplayedTooltip = true;
+	}
+	
+	if(!theDisplayedTooltip)
+	{
+		switch(this->GetHUDUser3())
+		{
+		// If we're a level 1 alien and we're holding crouch, tell them they can wall-walk
+		case AVH_USER3_ALIEN_PLAYER1:
+			if(this->AddTooltipOnce(kHelpTextWallwalking))
+			{
+				theDisplayedTooltip = true;
+				break;
+			}
+			// TODO: More level 1 help here
+			break;
+		
+		case AVH_USER3_ALIEN_PLAYER2:
+			if(this->AddTooltipOnce(kHelpTextBuilder))
+			{
+				theDisplayedTooltip = true;
+				break;
+			}
+			if(this->AddTooltipOnce(kHelpTextAlienBuildStructure))
+			{
+				theDisplayedTooltip = true;
+				break;
+			}
+			break;
+		
+		case AVH_USER3_ALIEN_PLAYER3:
+			// If level 3 jumps, tell player about flying
+			if(this->AddTooltipOnce(kHelpTextFlight))
+			{
+				theDisplayedTooltip = true;
+				break;
+			}
+			// TODO: More level 3 help here
+			break;
+			
+		case AVH_USER3_ALIEN_PLAYER4:
+			break;
+			
+		case AVH_USER3_ALIEN_PLAYER5:
+			break;
+		}
+	}
+	
+	return theDisplayedTooltip;
+}
+
+bool AvHHud::ProcessOrderHelp()
+{
+	bool theDisplayedTooltip = false;
+	
+//	vec3_t theOrderPosition;
+//	int theEntIndex = -1;
+//	AvHUser3 theUser3 = AVH_USER3_NONE;
+//
+//	AvHOrderType theOrder = AvHGetDefaultOrderType(this->GetTeam(), this->GetVisualOrigin(), this->mMouseWorldPos, theEntIndex, theOrderPosition, theUser3);
+//	if(theOrder == ORDERTYPET_BUILD)
+//	{
+//		if(this->AddTooltipOnce(kHelpTextCommanderBuild))
+//		{
+//			theDisplayedTooltip = true;
+//		}
+//	}
+////	else if(theOrder == ORDERTYPEL_USE)
+////	{
+////		if(this->AddTooltipOnce(kHelpTextCommanderUse))
+////		{
+////			theDisplayedTooltip = true;
+////		}
+////	}
+//	else if(theOrder == ORDERTYPET_ATTACK)
+//	{
+//		if(this->AddTooltipOnce(kHelpTextCommanderAttack))
+//		{
+//			theDisplayedTooltip = true;
+//		}
+//	}
+//	else if(theOrder == ORDERTYPET_WELD)
+//	{
+//		if(this->AddTooltipOnce(kHelpTextCommanderWeld))
+//		{
+//			theDisplayedTooltip = true;
+//		}
+//	}
+//	else if(theOrder == ORDERTYPET_GET)
+//	{
+//		if(this->AddTooltipOnce(kHelpTextCommanderGet))
+//		{
+//			theDisplayedTooltip = true;
+//		}
+//	}
+	
+	return theDisplayedTooltip;
+}
+
+void AvHHud::UpdateHelpText()
+{
+	const float kHelpTextInterval = 20.0f;
+	bool theDisplayedTooltip = false;
+
+	bool theIsCommander = (this->GetHUDUser3() == AVH_USER3_COMMANDER_PLAYER);
+	bool theIsAlien = this->GetIsAlien();
+
+	bool theAutoHelpEnabled = gEngfuncs.pfnGetCvarFloat(kvAutoHelp);
+
+	if(theAutoHelpEnabled)
+	{
+		// Has it been a little bit since we sent the last help message?
+		if((this->mTimeOfLastHelpText == -1) || (this->mTimeOfLastHelpText + kHelpTextInterval < gEngfuncs.GetClientTime()))
+		{
+			if(this->GetIsRelevant() && this->GetGameStarted() && !this->GetIsCombatMode())
+			{
+				// Process general help first
+				theDisplayedTooltip = this->ProcessGeneralHelp();
+				if(!theDisplayedTooltip)
+				{
+					theDisplayedTooltip = this->ProcessWeaponsHelp();
+					if(!theDisplayedTooltip)
+					{
+						// Search around us
+						theDisplayedTooltip = this->ProcessEntityHelp();
+						
+						// If there is nothing around us to trigger something
+						if(!theDisplayedTooltip)
+						{
+							// If we are alien and a friendly hive is being attacked
+							//kHelpTextHiveAttacked
+							
+//							AvHAlertType theAlertType;
+//							float theTimeOfLastAlert = theTeam->GetLastAlertTime(-1, &theAlertType);
+//							if(theTimeOfLastAlert > 0)
+//							{
+//								if(theIsAlien && (theAlertType == ALERT_UNDER_ATTACK))
+//								{
+//									if(this->AddTooltipOnce(kHelpTextAlienUnderAttack))
+//									{
+//										theDisplayedTooltip = true;
+//									}
+//								}
+//								else if(theIsCommander)
+//								{
+//									if(theAlertType == ALERT_UNDER_ATTACK)
+//									{
+//										if(this->AddTooltipOnce(kHelpTextCommanderUnderAttack))
+//										{
+//											theDisplayedTooltip = true;
+//										}
+//									}
+//								}
+//								else if(theAlertType == ALERT_RESEARCH_COMPLETE)
+//								{
+//									if(this->AddTooltipOnce(kHelpTextCommanderResearchComplete))
+//									{
+//										theDisplayedTooltip = true;
+//									}
+//								}
+//								else if(theAlertType == ALERT_UPGRADE_COMPLETE)
+//								{
+//									if(this->AddTooltipOnce(kHelpTextCommanderUpgradeComplete))
+//									{
+//										theDisplayedTooltip = true;
+//									}
+//								}
+//							}
+						}
+						
+						if(!theDisplayedTooltip)
+						{
+							// If the player has never used the command menu
+							//kHelpTextMarineCommandMenu
+							//kHelpTextAlienCommandMenu
+							switch(this->GetHUDUser3())
+							{
+							case AVH_USER3_MARINE_PLAYER:
+								//if(this->AddTooltipOnce(kHelpTextPopupMenu))
+								//{
+								//	theDisplayedTooltip = true;
+								//}
+								break;
+								
+							case AVH_USER3_COMMANDER_PLAYER:
+								if(this->mSelected.size() > 0)
+								{
+									if(this->AddTooltipOnce(kHelpTextCommanderGiveOrders))
+									{
+										theDisplayedTooltip = true;
+										break;
+									}
+								}
+								else
+								{
+									if(this->AddTooltipOnce(kHelpTextCommanderSelectPlayers))
+									{
+										theDisplayedTooltip = true;
+										break;
+									}
+									else if(this->AddTooltipOnce(kHelpTextCommanderLogout))
+									{
+										theDisplayedTooltip = true;
+										break;
+									}
+								}
+							
+								theDisplayedTooltip = this->ProcessOrderHelp();
+								break;
+							
+							case AVH_USER3_ALIEN_PLAYER1:
+							case AVH_USER3_ALIEN_PLAYER2:
+							case AVH_USER3_ALIEN_PLAYER3:
+							case AVH_USER3_ALIEN_PLAYER4:
+							case AVH_USER3_ALIEN_PLAYER5:
+								theDisplayedTooltip = this->ProcessAlienHelp();
+								break;
+							
+							}
+						}
+					}
+				}
+			}
+		
+			if(theDisplayedTooltip)
+			{
+				this->mTimeOfLastHelpText = gEngfuncs.GetClientTime();
+			}
+		}
+	}
+}
+
diff --git a/main/source/mod/AvHHive.cpp b/main/source/mod/AvHHive.cpp
new file mode 100644
index 00000000..872bc97f
--- /dev/null
+++ b/main/source/mod/AvHHive.cpp
@@ -0,0 +1,899 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHHive.cpp $
+// $Date: 2002/11/22 21:28:16 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHHive.cpp,v $
+// Revision 1.20  2002/11/22 21:28:16  Flayra
+// - mp_consistency changes
+//
+// Revision 1.19  2002/11/06 01:38:37  Flayra
+// - Added ability for buildings to be enabled and disabled, for turrets to be shut down
+// - Damage refactoring (TakeDamage assumes caller has already adjusted for friendly fire, etc.)
+//
+// Revision 1.18  2002/11/03 04:50:26  Flayra
+// - Hard-coded gameplay constants instead of putting in skill.cfg
+//
+// Revision 1.17  2002/10/24 21:26:37  Flayra
+// - Fixed hive wound animation when dying
+// - Hives now choose a random spawn point instead of the first
+//
+// Revision 1.16  2002/10/16 20:53:21  Flayra
+// - Hives have more health while growing
+//
+// Revision 1.15  2002/10/16 00:57:19  Flayra
+// - Fixed hive not going solid sometimes (when player was in the way I think when construction complete)
+// - Fixed exploit where hives can be manually sped up (oops!)
+//
+// Revision 1.14  2002/10/03 18:50:27  Flayra
+// - Trigger "hive complete" alert
+// - Trigger "hive is dying" alert
+//
+// Revision 1.13  2002/09/23 22:16:44  Flayra
+// - Removed resource donation at hives
+//
+// Revision 1.12  2002/09/09 19:52:57  Flayra
+// - Animations play properly
+// - Hive can be hit once it starts gestating (hive becomes solid when gestating, not when complete)
+// - Respawn fixes
+//
+// Revision 1.11  2002/08/16 02:36:01  Flayra
+// - New damage system
+// - Fixed bug where hive was absorbing too much damage in armor
+//
+// Revision 1.10  2002/08/02 21:59:36  Flayra
+// - New alert system
+//
+// Revision 1.9  2002/07/26 23:04:19  Flayra
+// - Generate numerical feedback for damage events
+//
+// Revision 1.8  2002/07/23 17:06:09  Flayra
+// - Added ability for aliens to donate their resources at the hive, bind technology to a hive (so builders can choose the route), fixed bug where death animation played repeatedly
+//
+// Revision 1.7  2002/07/08 17:03:04  Flayra
+// - Refactored reinforcements
+//
+// Revision 1.6  2002/07/01 21:33:48  Flayra
+// - Hives can no longer be "used" to speed construction, wound sounds play on CHAN_BODY
+//
+// Revision 1.5  2002/06/25 18:00:14  Flayra
+// - Play sequence for non-active hives
+//
+// Revision 1.4  2002/06/03 16:47:49  Flayra
+// - Hives are base buildables now (bug with allowing use to speed building), added other hive anims for hurt, death, bad-touch, fixed bug where hives didn't get full health when they were initially built (after being killed once)
+//
+// Revision 1.3  2002/05/28 17:46:05  Flayra
+// - Mark hives as persistent so they aren't deleted on level cleanup, new hive sight support, reinforcement refactoring and fixes
+//
+// Revision 1.2  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHHive.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHAlienEquipmentConstants.h"
+#include "mod/AvHHulls.h"
+#include "mod/AvHSoundListManager.h"
+#include "mod/AvHServerVariables.h"
+#include "mod/AvHParticleConstants.h"
+#include "mod/AvHSpecials.h"
+#include "mod/AvHPlayerUpgrade.h"
+
+extern AvHSoundListManager				gSoundListManager;
+BOOL IsSpawnPointValid( CBaseEntity *pPlayer, CBaseEntity *pSpot );
+
+LINK_ENTITY_TO_CLASS( keTeamHive, AvHHive );
+
+extern int gRegenerationEventID;
+const int kScaredAnimationIndex = 9;
+
+AvHHive::AvHHive() : AvHBaseBuildable(TECH_HIVE, ALIEN_BUILD_HIVE, kesTeamHive, AVH_USER3_HIVE)
+{
+	// This value should be the default in the .fgd
+	this->mMaxSpawnDistance = 2000;
+	this->mMaxHitPoints = 0;
+	this->mActive = false;
+	this->mSolid = false;
+	this->mSpawning = false;
+	this->mTimeLastWoundSound = -1;
+	this->mTechnology = MESSAGE_NULL;	
+	this->mEnergy = 0.0f;
+}
+
+bool AvHHive::CanBecomeActive() const
+{
+	return !this->mActive;// && (!this->mHasBeenKilled || !GetGameRules()->GetIsTournamentMode() || GetGameRules()->GetCheatsEnabled());
+}
+
+void AvHHive::ConstructUse(CBaseEntity* inActivator, CBaseEntity* inCaller, USE_TYPE inUseType, float inValue)
+{
+	int a = 0;
+}
+
+void AvHHive::DonateUse(CBaseEntity* inActivator, CBaseEntity* inCaller, USE_TYPE inUseType, float inValue)
+{
+	// Player is trying to donate his resources to the pool
+	if(this->GetIsActive())
+	{
+		AvHPlayer* inActivatingPlayer = dynamic_cast<AvHPlayer*>(inActivator);
+		if(inActivatingPlayer && (inActivator->pev->team == this->pev->team))
+		{
+			// Take some resources, give some resources
+			const float kResourcesToDonatePerUse = .4f;
+			float theResourcesToGive = min(inActivatingPlayer->GetResources(), kResourcesToDonatePerUse);
+			
+			if(theResourcesToGive > 0.0f)
+			{
+				AvHTeam* theTeam = inActivatingPlayer->GetTeamPointer();
+				if(theTeam)
+				{
+					inActivatingPlayer->SetResources(inActivatingPlayer->GetResources() - theResourcesToGive);
+					theTeam->SetTeamResources(theTeam->GetTeamResources() + theResourcesToGive);
+
+					if(g_engfuncs.pfnRandomLong(0, 20) == 0)
+					{
+						PLAYBACK_EVENT_FULL(0, this->edict(), gRegenerationEventID, 0, this->pev->origin, (float *)&g_vecZero, 1.0f, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+
+						// Just say "resources donated"
+						inActivatingPlayer->PlaybackNumericalEvent(kNumericalInfoResourcesDonatedEvent, 0);
+					}
+				}
+			}
+		}
+	}
+}
+
+AvHTeamNumber AvHHive::GetTeamNumber() const
+{
+	return (AvHTeamNumber)this->pev->team;
+}
+
+bool AvHHive::GetIsActive() const
+{
+	return this->mActive;
+}
+
+bool AvHHive::GetIsOrganic() const
+{
+	return true;
+}
+
+bool AvHHive::GetIsSpawning() const
+{
+	return this->mSpawning;
+}
+
+int	AvHHive::GetMaxSpawnDistance() const
+{
+	return this->mMaxSpawnDistance;
+}
+
+int	AvHHive::GetMoveType() const
+{
+	return MOVETYPE_NONE;
+}
+
+float AvHHive::GetTimeLastContributed()
+{
+	return this->mTimeLastContributed;
+}
+
+void AvHHive::SetTimeLastContributed(float inTime)
+{
+	this->mTimeLastContributed = inTime;
+}
+
+int	AvHHive::GetIdle1Animation() const
+{
+	int theAnimation = -1;
+	
+	if(this->GetIsBuilt())
+	{
+		theAnimation = 2;
+	}
+	
+	return theAnimation;
+}
+
+int	AvHHive::GetIdle2Animation() const
+{
+	int theAnimation = -1;
+	
+	if(this->GetIsBuilt())
+	{
+		theAnimation = 3;
+	}
+	
+	return theAnimation;
+}
+
+int AvHHive::GetTakeDamageAnimation() const
+{
+	int theAnimation = -1;
+	
+	// Choose animation based on global time, so animation doesn't interrupt itself
+	float theTime = gpGlobals->time;
+	int theOffset = (int)(ceil(theTime) - theTime + .5f);
+
+	if(this->GetIsActive())
+	{
+		// Play wound animation.  
+		theAnimation = 5 + theOffset;
+	}
+    else
+    {
+        // Use still-building flinch anims
+        theAnimation = 7 + theOffset;
+    }
+
+	return theAnimation;
+}
+
+int	AvHHive::GetPointValue(void) const
+{
+	return BALANCE_IVAR(kScoringHiveValue);
+}
+
+int	AvHHive::GetSpawnAnimation() const
+{
+	return 0;
+}
+
+AvHMessageID AvHHive::GetTechnology() const
+{
+	return this->mTechnology;
+}
+
+void AvHHive::SetTechnology(AvHMessageID inMessageID)
+{
+	this->mTechnology = inMessageID;
+}
+
+void AvHHive::HiveAliveThink(void)
+{
+	// For some reason, velocity is non-zero when created (meant they were showing up on motion-tracking)
+	this->pev->velocity = Vector(0, 0, 0);
+
+	if(GetGameRules()->GetGameStarted())
+	{
+        if(!this->mActive)
+        {
+		    bool theIsBuilding, theIsResearching;
+		    float thePercentage;
+		    AvHSHUGetBuildResearchState(this->pev->iuser3, this->pev->iuser4, this->pev->fuser1, theIsBuilding, theIsResearching, thePercentage);
+		    
+		    float theBuildTime = GetGameRules()->GetBuildTimeForMessageID(this->GetMessageID());
+		    float theBuildPercentage = kHiveAliveThinkInterval/theBuildTime;
+		    
+		    float theNewPercentage = min(thePercentage + theBuildPercentage, 1.0f);
+            this->SetNormalizedBuildPercentage(theNewPercentage);
+        }
+        else
+		{
+			this->ProcessHealing();
+
+            // Play idle anims
+            AvHBaseBuildable::AnimateThink();
+		}
+
+		this->UpdateReinforcements();
+
+		//this->UpdateUmbra();
+	}
+	
+	// Set next think
+	this->pev->nextthink = gpGlobals->time + kHiveAliveThinkInterval;
+}
+
+void AvHHive::UpdateUmbra()
+{
+	bool theIsUnderAttack = GetGameRules()->GetIsEntityUnderAttack(this->entindex());
+	if(theIsUnderAttack)
+	{
+		if(this->mTimeOfNextUmbra == -1)
+		{
+			this->mTimeOfNextUmbra = gpGlobals->time + RANDOM_LONG(5, 15);
+		}
+	}
+
+	if((this->mTimeOfNextUmbra != -1) && (gpGlobals->time > this->mTimeOfNextUmbra))
+	{
+		// If we're under attack, sometimes create umbra at hive
+		vec3_t theUmbraOrigin = this->pev->origin;
+		
+		// else create umbra at random spawn
+//		if(!theIsUnderAttack)
+//		{
+//			CBaseEntity* theSpawnPoint = GetGameRules()->GetRandomHiveSpawnPoint(this, this->pev->origin, this->GetMaxSpawnDistance());
+//			if(theSpawnPoint)
+//			{
+//				VectorCopy(theSpawnPoint->pev->origin, theUmbraOrigin);
+//			}
+//		}
+
+		// Create umbra around it, play "scared" anim
+		//this->CreateUmbra(theUmbraOrigin);
+
+		this->PlayAnimationAtIndex(kScaredAnimationIndex, true);
+	}
+}
+
+void AvHHive::KeyValue(KeyValueData* pkvd)
+{
+	this->SetPersistent();
+
+	if(FStrEq(pkvd->szKeyName, "maxspawndistance"))
+	{
+		this->mMaxSpawnDistance = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+	{
+		AvHBaseBuildable::KeyValue(pkvd);
+	}
+}
+
+void AvHHive::TriggerDeathAudioVisuals()
+{
+    AvHSUPlayParticleEvent(kpsHiveDeath, this->edict(), this->pev->origin);
+    
+    AvHSUExplodeEntity(this, matFlesh);
+    
+    EMIT_SOUND(ENT(this->pev), CHAN_AUTO, kHiveDeathSound, 1.0, ATTN_IDLE);	
+
+    // Play death animation (increment time just to make sure there's no idle anim played after killed and before death)
+    const float kDeathAnimationLength = 1.2f;
+    
+    this->PlayAnimationAtIndex(10, true);
+    
+    // Then explode
+    //SetThink(&AvHHive::DeathThink);
+    //this->pev->nextthink = gpGlobals->time + kDeathAnimationLength; 
+
+    this->FireDeathTarget();
+}
+
+void AvHHive::Precache(void)
+{
+	AvHBaseBuildable::Precache();
+	
+	PRECACHE_UNMODIFIED_SOUND(kHiveSpawnSound);
+	PRECACHE_UNMODIFIED_SOUND(kHiveAmbientSound);
+	PRECACHE_UNMODIFIED_SOUND(kHiveDeathSound);
+	
+	PRECACHE_UNMODIFIED_MODEL(kHiveModel);
+	
+	CBreakable::PrecacheAll();
+}
+
+void AvHHive::ProcessHealing()
+{
+	// Regenerate nearby friendly aliens
+	CBaseEntity* theEntity = NULL;
+	const int theHiveHealRadius = BALANCE_IVAR(kHiveHealRadius);
+
+	while((theEntity = UTIL_FindEntityInSphere(theEntity, this->pev->origin, theHiveHealRadius)) != NULL)
+	{
+		AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntity);
+		if(thePlayer)
+		{
+			if(thePlayer->GetIsRelevant() && (thePlayer->GetTeam() == this->GetTeamNumber()) && !thePlayer->GetIsBeingDigested())
+			{
+                // Hive heals percentage of player health
+                float theRegenPercentage = BALANCE_FVAR(kHiveRegenerationPercentage);
+                int theMaxHealth = AvHPlayerUpgrade::GetMaxHealth(thePlayer->pev->iuser4, (AvHUser3)thePlayer->pev->iuser3, thePlayer->GetExperienceLevel());
+                float theRegenAmount = (theRegenPercentage*theMaxHealth);
+                thePlayer->Heal(theRegenAmount, true);
+			}
+		}
+	}
+	
+	// Regenerate self
+	bool theDidHeal = false;
+	
+	// If we aren't at full health, heal health
+	if(this->pev->health < this->mMaxHitPoints)
+	{
+        float theHiveRegenAmount = BALANCE_IVAR(kHiveRegenerationAmount);
+        float theCombatModeScalar = /*GetGameRules()->GetIsCombatMode() ? (1.0f/BALANCE_FVAR(kCombatModeTimeScalar)) :*/ 1.0f;
+
+		this->pev->health = min(this->mMaxHitPoints, this->pev->health + theHiveRegenAmount*theCombatModeScalar);
+		theDidHeal = true;
+	}
+	
+	// Play regen event
+	if(theDidHeal)
+	{
+		// Play regeneration event
+		PLAYBACK_EVENT_FULL(0, this->edict(), gRegenerationEventID, 0, this->pev->origin, (float *)&g_vecZero, 1.0f, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+	}
+}
+
+void AvHHive::ResetEntity(void)
+{
+	AvHReinforceable::ResetEntity();
+	AvHBaseBuildable::ResetEntity();
+
+	SetUse(&AvHHive::ConstructUse);
+
+	this->ResetCloaking();
+
+	this->SetInactive();
+
+	this->pev->health = this->mMaxHitPoints;
+	
+	this->pev->takedamage = DAMAGE_NO;
+
+	// Reset parasites, etc.
+	this->pev->iuser4 = 0;
+	this->SetPersistent();
+
+	this->mTimeOfNextUmbra = -1;
+
+	// Reset fuser1 progress
+	this->pev->fuser1 = 0;
+}
+
+void AvHHive::ResetReinforcingPlayer(bool inSuccess)
+{
+	AvHReinforceable::ResetReinforcingPlayer(inSuccess);
+
+	this->mEnergy = 0.0f;
+}
+
+bool AvHHive::SetSolid(bool inForce)
+{
+	// Check to make sure there aren't any players in the destination area
+	CBaseEntity* pList[128];
+	
+	// Crank up the area just to be safe
+	Vector theMinArea = this->pev->origin + kHiveMinSize;
+	Vector theMaxArea = this->pev->origin + kHiveMaxSize;
+	
+	// TODO: If players are blocking this area for too long, spawn hive and kill them
+	int theNumBlockingEntities = UTIL_EntitiesInBox(pList, 128, theMinArea, theMaxArea, FL_CLIENT);
+	if((theNumBlockingEntities == 0) || inForce)
+	{
+		this->pev->solid = SOLID_BBOX;
+		this->pev->movetype = MOVETYPE_NONE;
+			
+		UTIL_SetSize(this->pev, kHiveMinSize, kHiveMaxSize);
+			
+		//		pev->frame = 0;
+		//		pev->body = 3;
+		//		pev->sequence = 0;
+		//		// ResetSequenceInfo( );
+		//		pev->framerate = 0;
+		//		
+		//		UTIL_SetOrigin(pev, pev->origin);
+		//		UTIL_SetSize(pev, Vector(-20, -20, 0), Vector(20, 20, 28) ); 
+			
+		SetTouch(&AvHHive::HiveTouch);
+
+		this->mSolid = true;
+	}
+
+	return this->mSolid;
+}
+
+void AvHHive::SetHasBeenBuilt()
+{
+	AvHBuildable::SetHasBeenBuilt();
+
+	GetGameRules()->TriggerAlert((AvHTeamNumber)this->pev->team, ALERT_HIVE_COMPLETE, this->entindex());
+
+	// Make hive support any unassigned upgrade technologies (happens after a hive supporting a technology is destroyed and then rebuilt)
+	AvHTeamNumber theTeam = (AvHTeamNumber)this->pev->team;
+	AvHTeam* theTeamPointer = GetGameRules()->GetTeam(theTeam);
+	if(theTeamPointer)
+	{
+		AvHAlienUpgradeListType theUpgrades = theTeamPointer->GetAlienUpgrades();
+
+		if(AvHGetNumUpgradesInCategoryInList(theUpgrades, ALIEN_UPGRADE_CATEGORY_DEFENSE) > 0)
+		{
+			AvHSUUpdateHiveTechology(theTeam, ALIEN_BUILD_DEFENSE_CHAMBER);
+		}
+
+		if(AvHGetNumUpgradesInCategoryInList(theUpgrades, ALIEN_UPGRADE_CATEGORY_MOVEMENT) > 0)
+		{
+			AvHSUUpdateHiveTechology(theTeam, ALIEN_BUILD_MOVEMENT_CHAMBER);
+		}
+
+		if(AvHGetNumUpgradesInCategoryInList(theUpgrades, ALIEN_UPGRADE_CATEGORY_SENSORY) > 0)
+		{
+			AvHSUUpdateHiveTechology(theTeam, ALIEN_BUILD_SENSORY_CHAMBER);
+		}
+	}
+}
+
+bool AvHHive::StartSpawningForTeam(AvHTeamNumber inTeam, bool inForce)
+{
+	bool theSuccess = false;
+
+	if(this->SetSolid(inForce))
+	{
+		this->pev->team = inTeam;
+		this->pev->takedamage = DAMAGE_YES;
+
+		this->pev->rendermode = kRenderNormal;
+		this->pev->renderamt = 0;
+		
+		SetBits(pev->flags, FL_MONSTER);
+		SetUpgradeMask(&this->pev->iuser4, MASK_BUILDABLE);
+		
+		this->mSpawning = true;
+		this->pev->health = kBaseHealthPercentage*this->mBaseHealth;
+
+		// Looping, growing animation
+		this->pev->sequence	= 0;
+		this->pev->frame = 0;
+		ResetSequenceInfo();
+
+		this->pev->nextthink = gpGlobals->time + kHiveAliveThinkInterval;
+		SetThink(&AvHHive::HiveAliveThink);
+
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+
+void AvHHive::Spawn()
+{
+	this->Precache();
+	
+	AvHBaseBuildable::Spawn();
+    
+	this->pev->classname = MAKE_STRING(kesTeamHive);
+	//this->pev->movetype	= MOVETYPE_FLY;
+
+	this->pev->movetype	= MOVETYPE_FLY;
+	this->pev->solid = SOLID_NOT;
+	this->pev->flags = 0;
+	this->pev->iuser3 = AVH_USER3_HIVE;
+
+	this->mMaxHitPoints = GetGameRules()->GetBaseHealthForMessageID(ALIEN_BUILD_HIVE);
+	
+	SET_MODEL( ENT(this->pev), kHiveModel);
+	//this->pev->scale = 2;
+
+//	this->pev->sequence = 0;
+//	this->pev->frame = 0;
+//	ResetSequenceInfo();
+
+	this->ResetEntity();
+
+	SetUse(&AvHHive::ConstructUse);
+}
+
+void AvHHive::SetActive()
+{
+    AvHBaseBuildable::SetActive();
+
+    if(!this->mActive)
+    {
+        this->mActive = true;
+        this->mSpawning = false;
+        
+        this->mTimeLastContributed = gpGlobals->time;
+        
+        // Start animating
+        this->pev->sequence	= 1;
+        this->pev->frame = 0;
+        ResetSequenceInfo();
+        //AvHSUSetCollisionBoxFromSequence(this->pev);
+        
+        // Play spawn sound here
+        EMIT_SOUND(ENT(this->pev), CHAN_AUTO, kHiveSpawnSound, 1.0, ATTN_IDLE);	
+        
+        // Note: this isn't being created for the first hive because this sound plays before the map is totally up
+        UTIL_EmitAmbientSound(ENT(this->pev), this->pev->origin, kHiveAmbientSound, 1.0f, 2.0, 0, 100);
+        
+        this->FireSpawnTarget();
+        
+        //SetUse(&AvHHive::DonateUse);
+    }
+}
+
+void AvHHive::SetInactive()
+{
+    AvHBaseBuildable::SetInactive();
+
+    // Set this so hives can be drawn translucently at hive locations for aliens
+    this->pev->effects &= ~EF_NODRAW;
+
+    this->ResetReinforcingPlayer(false);
+
+	this->mActive = false;
+	this->mSpawning = false;
+	this->mSolid = false;
+	this->mTimeLastContributed = -1;
+	this->mTechnology = MESSAGE_NULL;
+
+	this->pev->health = 0;
+	this->pev->takedamage = DAMAGE_NO;
+	this->pev->dmgtime = gpGlobals->time;
+	this->pev->solid = SOLID_NOT;
+	this->pev->team = TEAM_IND; 
+	SetUpgradeMask(&this->pev->iuser4, MASK_BUILDABLE, false);
+	
+	this->pev->rendermode = kRenderTransAlpha;
+	this->pev->renderamt = 0;
+	
+	// Stop animation
+	this->pev->sequence	= 0;
+	this->pev->frame = 0;
+	this->pev->framerate = 0;
+
+	// No longer built at all
+	this->pev->fuser1 = 0.0f;
+	SetThink(NULL);
+
+	// Stop looping
+	UTIL_EmitAmbientSound(ENT(this->pev), this->pev->origin, kHiveAmbientSound, 1.0f, .5, SND_STOP, 100);
+
+	ClearBits (pev->flags, FL_MONSTER); // why are they set in the first place???
+
+	SetTouch(NULL);
+}
+
+int	AvHHive::TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType )
+{
+	const float kWoundSoundInterval = 1.0f;
+
+	int theReturnCode = 0;
+	
+	if(this->mActive || this->mSpawning)
+	{
+		//CBaseEntity* theAttackingEntity = CBaseEntity::Instance(pevAttacker);
+		//if(GetGameRules()->CanEntityDoDamageTo(theAttackingEntity, this))
+		//{
+			theReturnCode = AvHBaseBuildable::TakeDamage(pevInflictor, pevAttacker, flDamage, bitsDamageType);
+
+			if(theReturnCode > 0)
+			{	
+				const float kDyingThreshold = .4f;
+				if(this->pev->health < kDyingThreshold*this->mMaxHitPoints)
+				{
+					GetGameRules()->TriggerAlert((AvHTeamNumber)this->pev->team, ALERT_HIVE_DYING, this->entindex());
+				}
+				else
+				{
+					GetGameRules()->TriggerAlert((AvHTeamNumber)this->pev->team, ALERT_UNDER_ATTACK, this->entindex());
+				}
+
+				if((this->mTimeLastWoundSound == -1) || ((this->mTimeLastWoundSound + kWoundSoundInterval) < gpGlobals->time))
+				{
+					// Pick a random wound sound to play
+					//int theIndex = RANDOM_LONG(0, kNumWoundSounds - 1);
+					//char* theSoundToPlay = kWoundSoundList[theIndex];
+					//EMIT_SOUND(ENT(this->pev), CHAN_AUTO, kHiveDeathSound, 1.0, ATTN_IDLE);	
+					
+					//EMIT_SOUND(ENT(this->pev), CHAN_AUTO, "misc/hive_wound1.wav", 1.0, ATTN_IDLE);	
+					
+					// Emit hive damaged sound
+					gSoundListManager.PlaySoundInList(kHiveWoundSoundList, this, CHAN_BODY);
+					
+					this->mTimeLastWoundSound = gpGlobals->time;
+				}
+			}
+		//}
+	}
+	
+	return theReturnCode;
+}
+
+
+
+bool AvHHive::GetCanReinforce() const
+{
+	return (this->GetIsBuilt() && this->IsAlive() && !GetGameRules()->GetIsCombatMode());
+}
+
+bool AvHHive::GetSpawnLocationForPlayer(CBaseEntity* inPlayer, Vector& outLocation) const
+{
+	bool theSuccess = false;
+
+	CBaseEntity* theSpawnPoint = GetGameRules()->GetRandomHiveSpawnPoint(inPlayer, this->pev->origin, this->GetMaxSpawnDistance());
+	if(theSpawnPoint)
+	{
+		outLocation = theSpawnPoint->pev->origin;
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+bool AvHHive::GetTriggerAlertOnDamage() const
+{
+	return false;
+}
+
+AvHTeamNumber AvHHive::GetReinforceTeamNumber() const
+{
+	return AvHBaseBuildable::GetTeamNumber();
+}
+
+
+//void AvHHive::UpdateReinforcements()
+//{
+//	// If hive is active 
+//	if(this->GetIsActive())
+//	{
+//		// Test to make sure our reinforcing player is still valid
+//		AvHPlayer* theReinforcingPlayer = this->GetReinforcingPlayer();
+//		if(theReinforcingPlayer)
+//		{
+//			AvHPlayMode thePlayMode = theReinforcingPlayer->GetPlayMode();
+//			if((theReinforcingPlayer->pev->team != this->pev->team) || (thePlayMode == PLAYMODE_UNDEFINED) || (thePlayMode == PLAYMODE_READYROOM) || (thePlayMode == PLAYMODE_OBSERVER))
+//			{
+//				this->mReinforcingPlayer = -1;
+//			}
+//		}
+//
+//		// If hive isn't spawning a player in currently
+//		if(this->mReinforcingPlayer == -1)
+//		{
+//			// Find player on this team that's been waiting the longest
+//			AvHPlayer* thePlayerToSpawn = NULL;
+//			
+//			FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*);
+//			if(theEntity->GetTeam() == this->GetTeamNumber())
+//			{
+//				if(theEntity->GetPlayMode() == PLAYMODE_AWAITINGREINFORCEMENT)
+//				{
+//					if(!thePlayerToSpawn || (theEntity->GetTimeLastPlayModeSet() < thePlayerToSpawn->GetTimeLastPlayModeSet()))
+//					{
+//						thePlayerToSpawn = theEntity;
+//						break;
+//					}
+//				}
+//			}
+//			END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+//			
+//			// Spawn the one waiting the longest
+//			if(thePlayerToSpawn)
+//			{
+//				// Set the player to be reinforcing
+//				this->mReinforcingPlayer = thePlayerToSpawn->entindex();
+//				
+//				thePlayerToSpawn->SetPlayMode(PLAYMODE_REINFORCING);
+//				
+//				// Play hive animation, play effect for player?
+//				this->pev->sequence = 4;
+//				this->pev->frame = 0;
+//				ResetSequenceInfo();
+//			}
+//		}
+//		// else hive is spawning a player
+//		else
+//		{
+//			// Is player still valid, or has he left the server/team?
+//			AvHPlayer* thePlayer = this->GetReinforcingPlayer();
+//			if(thePlayer && (thePlayer->GetTeam() == this->GetTeamNumber()))
+//			{
+//				if(thePlayer->GetPlayMode() == PLAYMODE_REINFORCING)
+//				{
+//					// Has enough time passed to bring the player in?
+//					const float kHiveRespawnTime = GetGameRules()->GetAlienRespawnTime();
+//					
+//					if(gpGlobals->time > (thePlayer->GetTimeLastPlayModeSet() + kHiveRespawnTime))
+//					{
+//						this->ResetReinforcingPlayer(true);
+//					
+//						// Take away points from the player if possible
+//						float theNewPointTotal = max(thePlayer->GetResources() - GetGameRules()->GetGameplay().GetAlienRespawnCost(), 0.0f);
+//						thePlayer->SetResources(theNewPointTotal);
+//					}
+//				}
+//				else
+//				{
+//					this->mReinforcingPlayer = -1;
+//				}
+//			}
+//		}
+//	}
+//}
+
+void AvHHive::CreateUmbra(vec3_t& inOrigin)
+{
+	AvHSUCreateUmbraCloud(inOrigin, AvHTeamNumber(this->pev->team), this);
+
+	// Don't create another for a bit
+	this->mTimeOfNextUmbra = -1;
+}
+
+void AvHHive::CueRespawnEffect(AvHPlayer* inPlayer)
+{
+	// Play hive animation, play effect for player?
+	this->pev->sequence = 4;
+	this->pev->frame = 0;
+	ResetSequenceInfo();
+
+	// Create umbra around spawning players, but not until after late-join period (to avoid a ton of umbras all at once)
+	if(!GetGameRules()->GetArePlayersAllowedToJoinImmediately())
+	{
+		//this->CreateUmbra(inPlayer->pev->origin);
+	}
+}
+
+float AvHHive::GetReinforceTime() const
+{
+	const float kMaxRespawnTime = BALANCE_IVAR(kAlienRespawnTime);
+
+	float theRespawnTime = (kMaxRespawnTime - kMaxRespawnTime*this->mEnergy);
+
+	// puzl 0000854 
+	//  Decrease respawn wait time for aliens (NS: Classic)
+	//	With one hive, for every player above six on the alien team, 
+	//  reduce the per-player respawn wait time by two-thirds of a second. 
+	//  With two hives, make the reduction one-third of a second. 
+	//  With three (or more, in the case of weird custom maps) hives, do not apply it.
+
+	AvHTeam* theTeam = GetGameRules()->GetTeam(GetTeamNumber());
+	ASSERT(theTeam);
+
+	int thePlayerModifier = theTeam->GetPlayerCount() - BALANCE_IVAR(kAlienRespawnPlayerModifier);
+	int theHiveCount = GetGameRules()->GetNumActiveHives(GetTeamNumber());
+	
+	if ( thePlayerModifier > 0 && theHiveCount < 3 ) 
+	{
+		float theTimeModifier = BALANCE_FVAR(kAlienRespawnTimeModifier);
+
+		// For one hive double the modifier
+		if ( theHiveCount == 1 ) 
+		{
+			theTimeModifier *= 2.0f;
+		}
+
+		theRespawnTime -= theTimeModifier * (float)thePlayerModifier;
+	}
+
+	theRespawnTime = min(max(theRespawnTime, 0.0f), kMaxRespawnTime);
+
+	return theRespawnTime;
+}
+
+bool AvHHive::Energize(float inEnergyAmount)
+{
+	bool theSuccess = false;
+
+	// Only energize when a player is in the cue
+	if(this->GetIsBuilt() && this->GetReinforcingPlayer())
+	{
+		if(this->mEnergy < 1.0f)
+		{
+			this->mEnergy += inEnergyAmount;
+			this->mEnergy = min(max(0.0f, this->mEnergy), 1.0f);
+			theSuccess = true;
+		}
+	}
+
+	return theSuccess;
+}
+
+void AvHHive::HiveTouch(CBaseEntity* inOther)
+{
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inOther);
+	if(thePlayer && (thePlayer->pev->team != this->pev->team))
+	{
+		if(this->GetIsActive())
+		{
+			// Play scared animation, it recoils from human touch
+			this->PlayAnimationAtIndex(kScaredAnimationIndex, true);
+		}
+	}
+
+    AvHBaseBuildable::BuildableTouch(inOther);
+}
diff --git a/main/source/mod/AvHHive.h b/main/source/mod/AvHHive.h
new file mode 100644
index 00000000..2e6f5ec6
--- /dev/null
+++ b/main/source/mod/AvHHive.h
@@ -0,0 +1,184 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHHive.h $
+// $Date: 2002/10/24 21:26:44 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHHive.h,v $
+// Revision 1.10  2002/10/24 21:26:44  Flayra
+// - Fixed hive wound animation when dying
+// - Hives now choose a random spawn point instead of the first
+//
+// Revision 1.9  2002/10/03 18:50:34  Flayra
+// - Trigger "hive complete" alert
+// - Trigger "hive is dying" alert
+//
+// Revision 1.8  2002/09/09 19:52:57  Flayra
+// - Animations play properly
+// - Hive can be hit once it starts gestating (hive becomes solid when gestating, not when complete)
+// - Respawn fixes
+//
+// Revision 1.7  2002/08/16 02:36:01  Flayra
+// - New damage system
+// - Fixed bug where hive was absorbing too much damage in armor
+//
+// Revision 1.6  2002/07/23 17:06:09  Flayra
+// - Added ability for aliens to donate their resources at the hive, bind technology to a hive (so builders can choose the route), fixed bug where death animation played repeatedly
+//
+// Revision 1.5  2002/07/08 17:03:04  Flayra
+// - Refactored reinforcements
+//
+// Revision 1.4  2002/07/01 21:33:48  Flayra
+// - Hives can no longer be "used" to speed construction, wound sounds play on CHAN_BODY
+//
+// Revision 1.3  2002/06/03 16:47:49  Flayra
+// - Hives are base buildables now (bug with allowing use to speed building), added other hive anims for hurt, death, bad-touch, fixed bug where hives didn't get full health when they were initially built (after being killed once)
+//
+// Revision 1.2  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_HIVE_H
+#define AVH_HIVE_H
+
+#include "util/nowarnings.h"
+#include "extdll.h"
+#include "util.h"
+#include "dlls/cbase.h"
+#include "mod/AvHConstants.h"
+#include "dlls/func_break.h"
+#include "mod/AvHSpecials.h"
+#include "dlls/cbasedoor.h"
+#include "dlls/effects.h"
+#include "mod/AvHMapExtents.h"
+#include "mod/AvHBuildable.h"
+#include "mod/AvHPlayer.h"
+#include "mod/AvHBaseBuildable.h"
+#include "mod/AvHReinforceable.h"
+
+#define kHiveHitEvent		"events/HiveHit.sc"
+
+const float kHiveAliveThinkInterval = 1.0f;
+
+//const int kNumWoundSounds	= 2;
+//char** kWoundSoundList = 
+//{
+//	"sounds/misc/hive_wound1.wav",
+//	"sounds/misc/hive_wound2.wav",
+//}
+
+class AvHHive : public AvHBaseBuildable, public AvHReinforceable
+{
+public:
+					AvHHive();
+
+	virtual bool	CanBecomeActive() const;
+
+	void EXPORT		ConstructUse(CBaseEntity* inActivator, CBaseEntity* inCaller, USE_TYPE inUseType, float inValue);
+
+	void EXPORT		DonateUse(CBaseEntity* inActivator, CBaseEntity* inCaller, USE_TYPE inUseType, float inValue);
+
+	virtual bool	Energize(float inEnergyAmount);
+
+	AvHTeamNumber	GetTeamNumber() const;
+
+	int				GetIdle1Animation() const;
+
+	int				GetIdle2Animation() const;
+
+	virtual int		GetTakeDamageAnimation() const;
+
+	virtual bool	GetIsActive() const;
+
+	virtual bool	GetIsOrganic() const;
+	
+	virtual bool	GetIsSpawning() const;
+	
+	virtual int		GetMaxSpawnDistance() const;
+
+	virtual int		GetMoveType() const;
+
+	// From AvHReinforceable
+	virtual void	CueRespawnEffect(AvHPlayer* inPlayer);
+	
+	virtual bool	GetCanReinforce() const;
+	
+	virtual bool	GetSpawnLocationForPlayer(CBaseEntity* inPlayer, Vector& outLocation) const;
+
+	virtual bool	GetTriggerAlertOnDamage() const;
+	
+	virtual AvHTeamNumber	GetReinforceTeamNumber() const;
+	
+	
+
+	//virtual CBaseEntity*	GetRandomSpawnPointForPlayer(CBaseEntity* inPlayer) const;
+
+	virtual float	GetTimeLastContributed();
+
+	virtual int		GetPointValue(void) const;
+
+	virtual float	GetReinforceTime() const;
+	
+	virtual int		GetSpawnAnimation() const;
+
+	AvHMessageID	GetTechnology() const;
+
+	void			SetTechnology(AvHMessageID inMessageID);
+	
+	virtual void	SetTimeLastContributed(float inTime);
+
+	virtual void	KeyValue( KeyValueData* pkvd );
+
+	virtual void	Precache(void);
+
+	virtual void	ResetEntity(void);
+
+	void EXPORT		HiveTouch(CBaseEntity* inOther);
+
+	virtual void	SetActive();
+
+	virtual void	SetHasBeenBuilt();
+
+	virtual void	SetInactive();
+
+	virtual bool	StartSpawningForTeam(AvHTeamNumber inTeam, bool inForce = false);
+					
+	virtual int		TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType);
+
+    virtual void	TriggerDeathAudioVisuals();
+		
+	virtual void	Spawn();
+
+	//virtual void	UpdateReinforcements();
+
+protected:
+	virtual void	ResetReinforcingPlayer(bool inSuccess);
+					
+private:
+	void			CreateUmbra(vec3_t& inOrigin);
+	void			UpdateUmbra();
+	void EXPORT		HiveAliveThink(void);
+	void			ProcessHealing();
+	bool			SetSolid(bool inForce = false);
+	AvHMessageID	mTechnology;
+	
+	int				mMaxSpawnDistance;
+	int				mMaxHitPoints;
+
+	bool			mActive;
+	bool			mSolid;
+	bool			mSpawning;
+	float			mTimeLastContributed;
+	float			mTimeLastWoundSound;
+	float			mTimeOfNextUmbra;
+	float			mEnergy;
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHHiveGun.cpp b/main/source/mod/AvHHiveGun.cpp
new file mode 100644
index 00000000..87094d51
--- /dev/null
+++ b/main/source/mod/AvHHiveGun.cpp
@@ -0,0 +1,188 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHHiveGun.cpp $
+// $Date: 2002/07/24 19:09:17 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHHiveGun.cpp,v $
+// Revision 1.8  2002/07/24 19:09:17  Flayra
+// - Linux issues
+//
+// Revision 1.7  2002/07/24 18:55:52  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.6  2002/07/24 18:45:41  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.5  2002/06/25 18:00:56  Flayra
+// - Removed this
+//
+// Revision 1.4  2002/06/10 19:47:16  Flayra
+// - New level 2 view model
+//
+// Revision 1.3  2002/06/03 16:39:09  Flayra
+// - Added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.2  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHGamerules.h"
+#include "util/MathUtil.h"
+#include "mod/AvHTitles.h"
+#include "mod/AvHHive.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHSharedUtil.h"
+#endif
+
+//LINK_ENTITY_TO_CLASS(kwHiveGun, AvHHiveGun);
+//
+//int	AvHHiveGun::GetBarrelLength() const
+//{
+//	return kBuildingGunBarrelLength;
+//}
+//
+//bool AvHHiveGun::GetFiresUnderwater() const
+//{
+//	return true;
+//}
+//
+//bool AvHHiveGun::GetIsDroppable() const
+//{
+//	return false;
+//}
+//
+//void AvHHiveGun::FireProjectiles(void)
+//{
+//#ifdef AVH_SERVER
+//	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this->m_pPlayer);
+//	ASSERT(thePlayer);
+//	
+//	// See if there is an inactive hive within range
+//	UTIL_MakeVectors(thePlayer->pev->v_angle);
+//	
+//	Vector theStart = thePlayer->GetGunPosition();
+//	Vector theEnd = theStart + gpGlobals->v_forward*this->GetRange(); 
+//
+//	// Collide with world to find potential build site
+//	TraceResult theTR;
+//	UTIL_TraceLine(theStart, theEnd, dont_ignore_monsters, thePlayer->edict(), &theTR);
+//	
+//	Vector theLocation = theTR.vecEndPos;
+//
+//	// Do we have enough points?
+//	int thePointCost = GetGameRules()->GetPointCostForMessageID(ALIEN_BUILD_HIVE);
+//	if(thePlayer->GetResources() >= thePointCost)
+//	{
+//		if(AvHSHUGetIsSiteValidForBuild(ALIEN_BUILD_HIVE, &theLocation, thePlayer->edict()))
+//		{
+//			// Get the hive at this location
+//			CBaseEntity* theBaseEntity = NULL;
+//			AvHHive* theNearestHive = NULL;
+//
+//			// Find the nearest hive
+//			while((theBaseEntity = UTIL_FindEntityByClassname(theBaseEntity, kesTeamHive)) != NULL)
+//			{
+//				if(theBaseEntity)
+//				{
+//					AvHHive* theCurrentHive = dynamic_cast<AvHHive*>(theBaseEntity);
+//					if(theCurrentHive)
+//					{
+//						float theCurrentDistance = VectorDistance(theLocation, theCurrentHive->pev->origin);
+//						if(!theNearestHive || (theCurrentDistance < VectorDistance(theLocation, theNearestHive->pev->origin)))
+//						{
+//							theNearestHive = theCurrentHive;
+//						}
+//					}
+//				}
+//			}
+//
+//			if(theNearestHive)
+//			{
+//				// If so, set it as growing
+//				theNearestHive->StartSpawningForTeam(thePlayer->GetTeam());
+//
+//				// Decrement points
+//				thePlayer->SetResources(thePlayer->GetResources() - thePointCost);
+//			}
+//		}
+//		else
+//		{
+//			thePlayer->SendMessage(kHelpTextEmptyHiveNotNearby, true);
+//		}
+//	}
+//	else
+//	{
+//		thePlayer->PlayHUDSound(HUD_SOUND_ALIEN_MORE);
+//	}
+//#endif
+//}
+//
+//void AvHHiveGun::Init()
+//{
+//	this->mRange = kBuildingGunRange;
+//	this->mROF = kBuildingGunROF;
+//}	
+//
+//char* AvHHiveGun::GetViewModel() const
+//{
+//	return kLevel2ViewModel;
+//}
+//
+//void AvHHiveGun::Precache(void)
+//{
+//	AvHAlienWeapon::Precache();
+//	
+//	PRECACHE_SOUND(kBuildingGunSound1);
+//	PRECACHE_SOUND(kBuildingGunSound2);
+//	
+//	this->mEvent = PRECACHE_EVENT(1, kBuildingGunEventName);
+//	//this->mEvent = PRECACHE_EVENT(1, kSpitGEventName);
+//}
+//
+//
+//void AvHHiveGun::Spawn()
+//{
+//	Precache();
+//
+//	AvHAlienWeapon::Spawn();
+//	
+//	this->m_iId = AVH_WEAPON_HIVE;
+//	
+//	// Set our class name
+//	this->pev->classname = MAKE_STRING(kwsHiveGun);
+//	
+//	SET_MODEL(ENT(this->pev), kNullModel);
+//	
+//	FallInit();// get ready to fall down.
+//}
+//
+//bool AvHHiveGun::UsesAmmo(void) const
+//{
+//	return false;
+//}
+
diff --git a/main/source/mod/AvHHud.cpp b/main/source/mod/AvHHud.cpp
new file mode 100644
index 00000000..376d8dd6
--- /dev/null
+++ b/main/source/mod/AvHHud.cpp
@@ -0,0 +1,7641 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: Main NS NUD, also interface to client network messages
+//
+// $Workfile: AvHHud.cpp $
+// $Date: 2002/10/28 20:35:32 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHHud.cpp,v $
+// Revision 1.70  2002/10/28 20:35:32  Flayra
+// - Fix for gamma reset with VAC
+// - Info location fix after changelevel
+//
+// Revision 1.69  2002/10/25 21:49:10  Flayra
+// - Updated skin to sit in pev->skin
+// - Reset components every tick to fix problem with disappearing team resource label
+//
+// Revision 1.68  2002/10/24 21:29:49  Flayra
+// - Moved help client-side
+// - Fixed particle/changelevel crash
+// - Reworked marine upgrade drawing
+// - Added lots of utility functions for help system (mirrors functions on server)
+// - Removed gamma message unless it failed or if maxplayers is 1
+// - Fixed alien hive sight crash
+// - Show players under reticle while in ready room and spectating
+// - Removed ugly/too-prevalent user3 icons
+//
+// Revision 1.67  2002/10/18 22:19:49  Flayra
+// - Added alien easter egg sayings
+//
+// Revision 1.66  2002/10/16 20:53:41  Flayra
+// - Draw scan model specially so it looks right
+//
+// Revision 1.65  2002/10/16 00:58:02  Flayra
+// - Removed hotgroups
+// - Added "need order" alert
+//
+// Revision 1.64  2002/10/03 20:24:39  Flayra
+// - Changes for "more resources required"
+//
+// Revision 1.63  2002/10/03 18:54:30  Flayra
+// - Allow right-click to cancel building placement
+// - Fixed help icons
+// - Added a couple utility functions
+// - Reworked order notification
+// - Reworked blip network messages to avoid hard-coded limit
+// - Sent max resources down with current resources
+// - Countdown sound no longer prevents other hud sounds
+// - Alien trigger sounds
+// - New order sounds
+// - No longer disable nodes out of our cost range
+//
+// Revision 1.62  2002/09/25 20:47:19  Flayra
+// - Don't draw elements on HUD when dead
+// - UI refactoring
+// - Split reticle help into help text and reticle text
+// - Removed use order
+// - Added separate select sound for alien
+// - Multiple move sounds
+// - Only draw entity build/health status when under reticle (no more scanning around you)
+// - Added 3 new sayings
+//
+// Revision 1.61  2002/09/23 22:18:25  Flayra
+// - Added alien build circles
+// - Game status changes so particles aren't sent every time
+// - Demo playback changes (save restore basic data that HUD already has)
+// - New alert sounds
+// - Skin support
+//
+// Revision 1.60  2002/09/09 19:55:24  Flayra
+// - Added hive info indicator
+// - Fixed bug where reticle tooltip help text wasn't being set until a weapon was selected
+// - Fixed release mode bug where tooltips weren't expiring
+// - Fixed bug where marine upgrades blinked
+// - "No commander" indicator now blinks
+//
+// Revision 1.59  2002/08/31 18:01:01  Flayra
+// - Work at VALVe
+//
+// Revision 1.58  2002/08/16 02:37:49  Flayra
+// - HUD sounds no longer cut each other off (they won't play instead of cutting off another sound)
+// - Tooltip sounds
+// - Selection issues
+// - Draw rings around buildings that need to be built
+// - Removed old overwatch code
+//
+// Revision 1.57  2002/08/09 01:02:40  Flayra
+// - Added hooks for demo playback, removed prediction selection
+//
+// Revision 1.56  2002/08/02 21:59:12  Flayra
+// - Added reticle help, new tooltip system and much nicer order drawing!  Refactored view model drawing a bit, hoping to make texture blending work for it.
+//
+// Revision 1.55  2002/07/26 23:05:01  Flayra
+// - Generate numerical feedback for damage events
+// - Refactoring for more info when looking at something (instead of bad-looking player names only)
+//
+// Revision 1.54  2002/07/24 18:45:41  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.53  2002/07/23 17:07:36  Flayra
+// - Added visually-smooth energy level, added versatile location code, new hive sight info, refactored to remove extra sprites (128 HUD sprites bug), commander tech help fixes
+//
+// Revision 1.52  2002/07/10 14:41:55  Flayra
+// - Fixed bug where non-sighted particle systems weren't being drawn for players on the ground (bug #127)
+//
+// Revision 1.51  2002/07/08 17:07:56  Flayra
+// - Started to add display of marine upgrade sprite, fixed bug where building indicators aren't displayed after a map change, info_location drawing changes, primal scream color tweak, removed old hive drawing code
+//
+// Revision 1.50  2002/07/01 21:35:05  Flayra
+// - Removed lots of outdated sprites and sprite code, added building ranges, fixed ghost building problem (bug #82)
+//
+// Revision 1.49  2002/06/25 18:03:09  Flayra
+// - Added info_locations, removed old weapon help system, added smooth resource swelling, lots of alien UI usability changes, fixed problem with ghost building
+//
+// Revision 1.48  2002/06/10 19:55:36  Flayra
+// - New commander UI (bindable via hotkeys, added REMOVE_SELECTION for when clicking menu options when no players selected)
+//
+// Revision 1.47  2002/06/03 16:48:45  Flayra
+// - Help sprites moved into one animated sprite, select sound volume reduced (now that sound is normalized)
+//
+// Revision 1.46  2002/05/28 17:48:14  Flayra
+// - Minimap refactoring, reinforcement refactoring, new hive sight fixes, recycling support
+//
+// Revision 1.45  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHHud.h"
+#include "cl_dll/hud.h"
+#include "cl_dll/parsemsg.h"
+#include "cl_dll/cl_util.h"
+#include "vgui_label.h"
+#include "ui/PieMenu.h"
+#include "mod/AvHTeamHierarchy.h"
+#include "mod/AvHPieMenuHandler.h"
+#include "mod/AvHParticleTemplateClient.h"
+#include "mod/AvHParticleSystemManager.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHClientVariables.h"
+#include "mod/AvHSpecials.h"
+#include "ui/FadingImageLabel.h"
+#include "mod/AvHScrollHandler.h"
+#include "mod/AvHEvents.h"
+#include "pm_shared/pm_shared.h"
+#include "common/cl_entity.h"
+#include "mod/AvHCommanderModeHandler.h"
+#include "mod/AvHParticleEditorHandler.h"
+#include "mod/AvHTechNodes.h"
+#include "mod/AvHMovementUtil.h"
+#include "mod/AvHTitles.h"
+#include "mod/AvHSelectionHelper.h"
+#include "mod/AvHActionButtons.h"
+#include "pm_shared/pm_debug.h"
+#include "util/MathUtil.h"
+#include "util/STLUtil.h"
+#include "mod/AvHSharedUtil.h"
+#include "common/r_efx.h"
+#include "cl_dll/eventscripts.h"
+#include <stdlib.h>
+#include "mod/AvHSprites.h"
+#include "ui/UIUtil.h"
+#include "mod/AvHMiniMap.h"
+#include "types.h"
+#include <signal.h>
+#include "common/event_api.h"
+#include "mod/AvHHulls.h"
+#include "common/com_model.h"
+#include "mod/AvHBasePlayerWeaponConstants.h"
+#include "cl_dll/vgui_ScorePanel.h"
+#include "mod/AvHAlienAbilityConstants.h"
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHScriptManager.h"
+#include "mod/AvHHudConstants.h"
+#include "cl_dll/demo.h"
+#include "common/demo_api.h"
+#include "cl_dll/ammohistory.h"
+#include "mod/AvHTechImpulsePanel.h"
+#include "mod/AvHServerVariables.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHCommandConstants.h"
+#include "mod/AvHDebugUtil.h" 
+#include "engine/keydefs.h"
+#include "mod/ChatPanel.h"
+#include "cl_dll/r_studioint.h"
+#include "util/Tokenizer.h"
+#include <sstream>
+
+//#include "cl_dll/studio_util.h"
+//#include "cl_dll/r_studioint.h"
+
+void IN_GetMousePos( int *mx, int *my );
+extern playermove_t *pmove;
+void RemoveAllDecals();
+void ScorePanel_InitializeDemoRecording();
+
+// Include windows for GDI and gamma functions
+#include "windows.h"
+
+extern engine_studio_api_t IEngineStudio;
+
+AvHPieMenuHandler						gPieMenuHandler;
+AvHScrollHandler						gScrollHandler;
+AvHCommanderModeHandler					gCommanderHandler;
+AvHParticleEditorHandler				gParticleEditorHandler;
+extern AvHParticleTemplateListClient	gParticleTemplateList;
+extern DebugPointListType				gTriDebugLocations;
+extern extra_player_info_t				g_PlayerExtraInfo[MAX_PLAYERS+1];
+extern WeaponsResource					gWR;
+
+extern double							gClientTimeLastUpdate;
+extern "C" Vector						gPredictedPlayerOrigin;
+extern "C" Vector						gPredictedPlayerVOfs;
+extern void	__CmdFunc_Close(void);
+extern int CL_ButtonBits(int);
+extern int g_iVisibleMouse;
+
+GammaTable AvHHud::sPregameGammaTable;
+GammaTable AvHHud::sGameGammaTable;
+
+bool AvHHud::sShowMap = false;
+
+// Global because of global HUD complilation error
+AvHMiniMap	gMiniMap;
+
+#include "VGUI_RepaintSignal.h"
+
+//extern vec3_t		v_origin;
+//extern vec3_t		v_angles;
+//vec3_t				gPlayerOrigin;
+//vec3_t				gPlayerAngles;
+
+#ifdef AVH_PREDICT_SELECT
+extern AvHSelectionHelper				gSelectionHelper;
+#endif
+
+//#if defined( AVH_CLIENT )
+//extern "C"	float gOverwatchTargetRange;
+extern float gOverwatchTargetRange;
+//#endif
+
+extern bool gResetViewAngles;
+extern vec3_t gViewAngles;
+extern char sDebugString[128];
+
+float kOverwatchFlashInterval = 2.5f;
+const float kReticleInfoMaxAlpha = 50;
+int gVisibleMouse = 0;
+
+//voogru: cvar pointers, these should always remain valid once they are set.
+
+cvar_t *gl_monolights = NULL;
+cvar_t *gl_overbright = NULL;
+cvar_t *gl_clear = NULL;
+cvar_t *hud_draw = NULL;
+cvar_t *r_drawviewmodel = NULL;
+extern cvar_t *cl_movespeedkey;
+cvar_t *gl_d3dflip = NULL;
+cvar_t *s_show = NULL;
+cvar_t *lightgamma = NULL;
+cvar_t *r_detailtextures = NULL;
+
+const AvHMapExtents& GetMapExtents()
+{
+	return gHUD.GetMapExtents();
+}
+
+NumericalInfoEffect::NumericalInfoEffect(float inPosition[3], float inNumber, int inEventType, float inTimeCreated)
+{
+	this->mPosition[0] = inPosition[0];
+	this->mPosition[1] = inPosition[1];
+	this->mPosition[2] = inPosition[2];
+
+	this->mNumber = inNumber;
+	this->mEventType = inEventType;
+
+	this->mTimeCreated = inTimeCreated;
+}
+
+void NumericalInfoEffect::GetPosition(float* outPosition) const
+{
+	outPosition[0] = this->mPosition[0];
+	outPosition[1] = this->mPosition[1];
+	outPosition[2] = this->mPosition[2];
+}
+
+float NumericalInfoEffect::GetNumber() const
+{
+	return this->mNumber;
+}
+
+int NumericalInfoEffect::GetEventType() const
+{
+	return this->mEventType;
+}
+
+float NumericalInfoEffect::GetTimeCreated() const
+{
+	return this->mTimeCreated;
+}
+
+void NumericalInfoEffect::SetPosition(float inPosition[3])
+{
+	this->mPosition[0] = inPosition[0];
+	this->mPosition[1] = inPosition[1];
+	this->mPosition[2] = inPosition[2];
+}
+
+void AvHHud::OnActivateSteamUI()
+{
+    // Set the normal gamma so the Steam UI looks correct.
+    sPregameGammaTable.InitializeToVideoState();
+    mSteamUIActive = true;
+}
+
+void AvHHud::OnDeactivateSteamUI()
+{
+
+    // Set the special NS gamma.
+    SetGamma(mDesiredGammaSlope);
+    mSteamUIActive = false;
+
+    // The Steam UI screws up the mouse cursor so reset it.
+    if (gViewPort != NULL)
+    {
+        gViewPort->UpdateCursorState();
+    }
+
+}
+
+void AvHHud::OnLostFocus()
+{
+    sPregameGammaTable.InitializeToVideoState();
+}
+
+bool AvHHud::OnKeyEvent(int virtualKey, int scanCode, bool pressed)
+{
+
+    if (gViewPort != NULL && !mSteamUIActive)
+    {
+
+        ChatPanel* theChatPanel = gViewPort->GetChatPanel();
+
+        if (theChatPanel && theChatPanel->isVisible())
+        {
+            if (pressed)
+            {
+                theChatPanel->KeyDown(virtualKey, scanCode);
+                return true;        
+            }
+            else
+            {
+                // If the key wasn't pressed while the chat window was open,
+                // the key up needs to go to HL.
+                return theChatPanel->WasKeyPushed(virtualKey);
+            }
+        }
+       
+        if (virtualKey == VK_ESCAPE && GetInTopDownMode() && mGhostBuilding != MESSAGE_NULL)
+        {
+            if (pressed)
+            {
+                CancelBuilding();
+            }
+            return true;
+        }
+    
+    }
+
+    return false;
+
+}
+
+int AvHHud::GetGameTime() const
+{
+	int theGameTime = 0;
+
+	if(this->mGameTime > 0)
+	{
+		theGameTime = (int)(this->mGameTime);
+	}
+
+	return theGameTime;
+}
+
+int AvHHud::GetGameTimeLimit() const
+{	
+	return this->mTimeLimit;
+}
+
+int AvHHud::GetCombatAttackingTeamNumber() const
+{
+	return this->mCombatAttackingTeamNumber;
+}
+
+bool AvHHud::GetShowingMap()
+{
+	return sShowMap;
+}
+
+bool AvHHud::GetGameStarted() const
+{
+	return (this->mGameTime >= 0) && !this->mGameEnded;
+}
+
+bool AvHHud::GetIsAlive(bool inIncludeSpectating) const
+{
+	bool theIsAlive = false;
+
+	cl_entity_s* thePlayer = gEngfuncs.GetLocalPlayer();
+	if(inIncludeSpectating)
+	{
+		thePlayer = this->GetVisiblePlayer();
+	}
+	
+	if(thePlayer)
+	{
+		int thePlayerIndex = thePlayer->index;
+		if((thePlayerIndex) && (thePlayerIndex <= MAX_PLAYERS))
+		{
+			int thePlayerClass = g_PlayerExtraInfo[thePlayerIndex].playerclass;
+			switch(thePlayerClass)
+			{
+			case PLAYERCLASS_ALIVE_MARINE:
+			case PLAYERCLASS_ALIVE_HEAVY_MARINE:
+			case PLAYERCLASS_ALIVE_JETPACK_MARINE:
+			case PLAYERCLASS_ALIVE_LEVEL1:
+			case PLAYERCLASS_ALIVE_LEVEL2:
+			case PLAYERCLASS_ALIVE_LEVEL3:
+			case PLAYERCLASS_ALIVE_LEVEL4:
+			case PLAYERCLASS_ALIVE_LEVEL5:
+			case PLAYERCLASS_ALIVE_DIGESTING:
+			case PLAYERCLASS_ALIVE_GESTATING:
+			case PLAYERCLASS_COMMANDER:
+				theIsAlive = true;
+			}
+		}
+	}
+
+	return theIsAlive;
+}
+
+bool GetIsWithinRegion(float inNormX, float inNormY, float inLowX, float inLowY, float inHighX, float inHighY)
+{
+	bool inRegion = false;
+	
+	if((inNormX >= inLowX) && (inNormY >= inLowY) && (inNormX <= inHighX) && (inNormY < inHighY))
+	{
+		inRegion = true;
+	}
+	
+	return inRegion;
+}
+
+bool AvHHud::GetIsRegionBlockedByUI(float inNormX, float inNormY)
+{
+	bool theIsBlocked = true;
+	
+	if(	GetIsWithinRegion(inNormX, inNormY, 0, .061, .3017, .6797) ||
+		GetIsWithinRegion(inNormX, inNormY, .248, .0791, .7753, .6823) ||
+		GetIsWithinRegion(inNormX, inNormY, .748, .092, 1, .6575) ||
+		GetIsWithinRegion(inNormX, inNormY, .751, .645, .870, .678) ||
+		GetIsWithinRegion(inNormX, inNormY, .337, .679, .729, .754) ||
+		GetIsWithinRegion(inNormX, inNormY, .337, .717, .703, .823) )
+	{
+		theIsBlocked = false;
+
+		// Now check pending requests (the only HUD element not drawn as part of the outlying frame
+		for(PendingRequestListType::const_iterator theIterator = this->mPendingRequests.begin(); theIterator != this->mPendingRequests.end(); theIterator++)
+		{
+			AvHMessageID theMessageID = theIterator->first;
+			char theComponentName[256];
+			sprintf(theComponentName, kPendingImpulseSpecifier, (int)theMessageID);
+			
+			AvHTechImpulsePanel* theTechImpulsePanel = NULL;
+			if(this->GetManager().GetVGUIComponentNamed(theComponentName, theTechImpulsePanel))
+			{
+				int thePosX, thePosY;
+				theTechImpulsePanel->getPos(thePosX, thePosY);
+				
+				int theWidth, theHeight;
+				theTechImpulsePanel->getSize(theWidth, theHeight);
+				
+				int theHighX = thePosX + theWidth;
+				int theHighY = thePosY + theHeight;
+
+				float theScreenWidth = ScreenWidth();
+				float theScreenHeight = ScreenHeight();
+
+				if(GetIsWithinRegion(inNormX, inNormY, thePosX/theScreenWidth, thePosY/theScreenHeight, theHighX/theScreenWidth, theHighY/theScreenHeight))
+				{
+					theIsBlocked = true;
+					break;
+				}
+			}
+		}
+	}
+	
+	return theIsBlocked;
+}
+
+bool AvHHud::GetIsShowingMap() const
+{
+	return sShowMap;
+}
+
+void AvHHud::ClearSelection()
+{
+	// Clear our selection, make sure the server knows.
+//	this->mSelectionJustChanged = true;
+//	this->mSelected.clear();
+//
+//	// Create effects
+//	this->SetSelectionEffects(this->mSelected);
+//
+//	this->PlayHUDSound(HUD_SOUND_SELECT);
+//
+//	gCommanderHandler.SetSelectedUnits(this->mSelected);
+
+	#ifdef AVH_PREDICT_SELECT
+	gSelectionHelper.ClearSelection();
+	#endif
+	
+	this->mGroupEvent = COMMANDER_REMOVESELECTION;
+}
+
+
+void CLinkGhostBuildingCallback( struct tempent_s *ent, float frametime, float currenttime)
+{
+	gHUD.GhostBuildingCallback(ent, frametime, currenttime);
+}
+
+// For easily adding message functions
+#define BIND_MESSAGE(x) \
+    int __MsgFunc_##x(const char *pszName, int iSize, void *pbuf) \
+	{ \
+    	return gHUD.##x(pszName, iSize, pbuf ); \
+    }
+
+AvHHud::AvHHud(const string& inFilename, UIFactory* inFactory) : UIHud(inFilename, inFactory)
+{
+	this->ClearData();
+    mSteamUIActive = false;
+}
+
+void AvHHud::AddNumericalInfoMessage(float inOrigin[3], float inNumber, int inEventType)
+{
+	NumericalInfoEffect theEffect(inOrigin, inNumber, inEventType, this->mTimeOfLastUpdate);
+	this->mNumericalInfoEffects.push_back(theEffect);
+}
+
+void AvHHud::AddTooltip(const char* inMessageText, bool inIsToolTip, float inTooltipWidth)
+{
+	if(!gEngfuncs.pDemoAPI->IsPlayingback() && (strlen(inMessageText) > 0))
+	{
+		if(gEngfuncs.pfnGetCvarFloat(kvAutoHelp) || !inIsToolTip)
+		{
+			AvHTooltip theNewTooltip;
+			
+			theNewTooltip.SetText(string(inMessageText));
+			theNewTooltip.SetNormalizedScreenX(1.0f - inTooltipWidth - kHelpMessageLeftEdgeInset);
+			theNewTooltip.SetNormalizedScreenY(0.01f);
+			theNewTooltip.SetCentered(false);
+			theNewTooltip.SetIgnoreFadeForLifetime(true);
+			theNewTooltip.SetNormalizedMaxWidth(inTooltipWidth);
+			
+			if(inIsToolTip)
+			{
+				this->PlayHUDSound(HUD_SOUND_TOOLTIP);
+			}
+			
+			this->mTooltips.push_back(theNewTooltip);
+		}
+	}
+}
+
+bool AvHHud::AddTooltipOnce(const char* inMessageText, bool inIsToolTip)
+{
+	bool theAddedTooltip = false;
+	
+	string theMessage(inMessageText);
+	
+	// Check if message is in sent list
+	StringList::iterator theIter = std::find(this->mDisplayedToolTipList.begin(), this->mDisplayedToolTipList.end(), theMessage);
+	if(theIter == this->mDisplayedToolTipList.end())
+	{
+		// If not
+		// Call AddTooltip
+		this->AddTooltip(inMessageText, inIsToolTip);
+		theAddedTooltip = true;
+		
+		// Add message to list
+		this->mDisplayedToolTipList.push_back(theMessage);
+	}
+	
+	return theAddedTooltip;
+}
+
+
+void AvHHud::Cancel(void)
+{
+	ASSERT(this->mInTopDownMode);
+
+	gCommanderHandler.CancelHit();
+	//this->m_Ammo.UserCmd_Close();
+}
+
+void AvHHud::ClearData()
+{
+	this->mResources = 0;
+	
+	this->mHierarchy = NULL;
+	this->mShowMapHierarchy = NULL;
+	
+	this->mCommanderResourceLabel = NULL;
+	this->mGenericProgressBar = NULL;
+	this->mResearchProgressBar = NULL;
+	this->mAlienProgressBar = NULL;
+	this->mResearchLabel = NULL;
+	//this->mArmorLevel = ARMOR_BASE;
+	this->mTimeOfLastUpdate = 0.0;
+	this->mTimeOfNextHudSound = -1;
+    this->mLastHUDSoundPlayed = HUD_SOUND_INVALID;
+	this->mTimeOfLastEntityUpdate = -1;
+	this->mInTopDownMode = false;
+	this->mLeftMouseStarted = false;
+	this->mLeftMouseEnded = false;
+	this->mPlacingBuilding = false;
+	this->mRightMouseStarted = false;
+	this->mRightMouseEnded = false;
+	//this->mOrderMode = ORDERTYPE_UNDEFINED;
+	this->mTechEvent = MESSAGE_NULL;
+	this->mAlienAbility = MESSAGE_NULL;
+	this->mGroupEvent = MESSAGE_NULL;
+	this->mTrackingEntity = 0;
+	this->mNumLocalSelectEvents = 0;
+
+	this->mSelected.clear();
+	this->mSelectionJustChanged = false;
+	this->mMouseOneDown = false;
+	this->mMouseTwoDown = false;
+	this->mMouseOneStartX = 0;
+	this->mMouseOneStartY = 0;
+	this->mMouseTwoStartX = 0;
+	this->mMouseTwoStartY = 0;
+
+	this->mMouseCursorX = this->mMouseCursorY = 0;
+	this->mPieMenuControl = "";
+	
+	this->mPreviousHelpText = "";
+	this->mTimeLastHelpTextChanged = -1;
+	this->mCurrentCursorFrame = 0;
+
+	this->mMapExtents.ResetMapExtents();
+	this->mMapName = "";
+
+	this->mGhostBuilding = MESSAGE_NULL;
+	this->mValidatedBuilding = MESSAGE_NULL;
+	this->mCreatedGhost = false;
+	this->mCurrentGhostIsValid = false;
+
+	this->mAmbientSounds.clear();
+
+	if(gViewPort)
+	{
+		ScorePanel* theScoreBoard = gViewPort->GetScoreBoard();
+		if(theScoreBoard)
+			theScoreBoard->DeleteCustomIcons();
+	}
+}
+
+
+AvHHud::~AvHHud(void)
+{
+	//this->ResetGamma();
+	//delete [] sOriginalGammaTable;
+	//delete [] sGammaTable;
+	AvHHud::ResetGammaAtExit();
+}
+
+void DummyFunction()
+{
+}
+
+#ifdef DEBUG
+int gGlobalDebugAuth = 0;
+void TestIcon()
+{
+	gGlobalDebugAuth = rand() % 7;
+}
+
+typedef struct alias_t {
+	alias_t* next;
+	char name[32];
+ 	char* cmds;
+} alias_s;
+
+void TestAlias()
+{
+	alias_s* alias = *(alias_s**)0x2D5929C;
+	while(alias)
+	{
+		gEngfuncs.Con_Printf("name: %s\n%x - %x\n", alias->name, alias->name, gEngfuncs);
+		alias = alias->next;
+	}
+}
+#endif
+
+// Used for console command
+void AvHHud::PlayRandomSongHook()
+{
+	gHUD.PlayRandomSong();
+}
+
+void AvHHud::AddCommands()
+{
+    gEngfuncs.pfnAddCommand ("+popupmenu", AvHPieMenuHandler::OpenPieMenu);
+	gEngfuncs.pfnAddCommand ("-popupmenu", AvHPieMenuHandler::ClosePieMenu);
+
+    gEngfuncs.pfnAddCommand ("+mousepopupmenu", AvHPieMenuHandler::OpenPieMenu);
+	gEngfuncs.pfnAddCommand ("-mousepopupmenu", AvHPieMenuHandler::ClosePieMenu);
+	
+	// Add scrolling commands
+    gEngfuncs.pfnAddCommand ("+scrollup", AvHScrollHandler::ScrollUp);
+    gEngfuncs.pfnAddCommand ("-scrollup", AvHScrollHandler::StopScroll);
+	
+    gEngfuncs.pfnAddCommand ("+scrolldown", AvHScrollHandler::ScrollDown);
+    gEngfuncs.pfnAddCommand ("-scrolldown", AvHScrollHandler::StopScroll);
+	
+    gEngfuncs.pfnAddCommand ("+scrollleft", AvHScrollHandler::ScrollLeft);
+    gEngfuncs.pfnAddCommand ("-scrollleft", AvHScrollHandler::StopScroll);
+	
+    gEngfuncs.pfnAddCommand ("+scrollright", AvHScrollHandler::ScrollRight);
+    gEngfuncs.pfnAddCommand ("-scrollright", AvHScrollHandler::StopScroll);
+
+    gEngfuncs.pfnAddCommand ("toggleeditps", AvHParticleEditorHandler::ToggleEdit);
+
+    gEngfuncs.pfnAddCommand ("nexttrack", AvHHud::PlayRandomSongHook);
+
+	gEngfuncs.pfnAddCommand ("+showmap", AvHHud::ShowMap);
+	gEngfuncs.pfnAddCommand ("-showmap", AvHHud::HideMap);
+
+    gEngfuncs.pfnAddCommand ("playstream", AvHHud::PlayStream);
+    gEngfuncs.pfnAddCommand ("stopstream", AvHHud::StopStream);
+
+	#ifdef DEBUG
+	gEngfuncs.pfnAddCommand("testicon", TestIcon);
+	gEngfuncs.pfnAddCommand("testalias", TestAlias);
+	#endif
+
+	int i = 0;
+	char theBinding[128];
+	for(i = (int)(RESOURCE_UPGRADE); i <= (int)(BUILD_RECYCLE); i++)
+	{
+		sprintf(theBinding, "%s%d", kHotKeyPrefix, i);
+		gEngfuncs.pfnAddCommand(theBinding, DummyFunction);
+	}
+
+	for(i = (int)(MENU_BUILD); i <= (int)(MENU_EQUIP); i++)
+	{
+		sprintf(theBinding, "%s%d", kHotKeyPrefix, i);
+		gEngfuncs.pfnAddCommand(theBinding, DummyFunction);
+	}
+}
+
+void AvHHud::ClientProcessEntity(struct entity_state_s* inEntity)
+{
+	// Check if we need to create or destroy particle systems
+	int theIndex = inEntity->number;
+	bool theParticleOn = inEntity->iuser3 == AVH_USER3_PARTICLE_ON;
+	bool theParticleOff = inEntity->iuser3 == AVH_USER3_PARTICLE_OFF;
+	if(theParticleOn || theParticleOff)
+	{
+		int theHandle = -1;
+		if(theParticleOn)
+		{
+			// Ent index and template index stored in fuser1
+			int theValue = (int)(inEntity->fuser1);
+			int theGenEntIndex = (0xFFFF0000 & theValue) >> 16;
+			//int theTemplateIndex = (0x0000FFFF & theValue);
+			int theTemplateIndex = (((int(inEntity->fuser1)) & 0x0000FF00) >> 8);
+			
+			//int theTemplateIndex = theValue;
+			
+			// Handle stored in fuser2
+			theHandle = (int)(inEntity->fuser2);
+
+			// Don't create particle systems marked as high-detail if we don't have that option set.  Note, this could cause collision
+			// differences between the client and server if the particle system doesn't use this flag with care
+			const AvHParticleTemplate* theTemplate = gParticleTemplateList.GetTemplateAtIndex(theTemplateIndex);
+			if(theTemplate)
+			{
+				if(!theTemplate->GetHighDetailOnly() || gEngfuncs.pfnGetCvarFloat(kvHighDetail))
+				{
+					AvHParticleSystemManager::Instance()->CreateParticleSystemIfNotCreated(inEntity->number, theTemplateIndex, /*theEntIndex,*/ theHandle);
+				
+					// Update postion and visibility
+					if(theGenEntIndex > 0)
+					{
+						cl_entity_s* theGenEntity = gEngfuncs.GetEntityByIndex(theGenEntIndex);
+						if(theGenEntity)
+						{
+							AvHParticleSystemManager::Instance()->SetParticleSystemGenerationEntityExtents(theGenEntity->curstate.mins, theGenEntity->curstate.maxs, theHandle);
+						}
+					}
+					else
+					{
+						AvHParticleSystemManager::Instance()->SetParticleSystemPosition(inEntity->origin, theHandle);
+					}
+					
+					// Set the particle system custom data
+					//uint16 theCustomData = (uint16)(((int)inEntity->fuser3) >> 16);
+					//uint16 theCustomData = (uint16)(inEntity->fuser3);
+					uint16 theCustomData = (uint16)(inEntity->weaponmodel);
+					AvHParticleSystemManager::Instance()->SetParticleSystemCustomData(theCustomData, theHandle);
+				}
+			}
+		}
+		else if(theParticleOff)
+		{
+			theHandle = (int)(inEntity->fuser1);
+			//AvHParticleSystemManager::Instance()->DestroyParticleSystemIfNotDestroyed(inEntity->number, theHandle);
+			AvHParticleSystemManager::Instance()->MarkParticleSystemForDeletion(inEntity->number, theHandle);
+		}
+
+		// Always update visibility
+		bool theVisibilityState = false;
+		if(this->GetInTopDownMode())
+		{
+			if(GetHasUpgrade(inEntity->iuser4, MASK_VIS_SIGHTED))
+			{
+				theVisibilityState = true;
+			}
+			else
+			{
+				theVisibilityState = false;
+			}
+		}
+		else
+		{
+			theVisibilityState = true;
+		}
+		
+		AvHParticleSystemManager::Instance()->SetParticleSystemVisibility(theVisibilityState, theHandle);
+	}
+	else if((inEntity->iuser3 == AVH_USER3_AUDIO_ON) || (inEntity->iuser3 == AVH_USER3_AUDIO_OFF))
+	{
+		// Read values
+		int theEntIndex = (int)(inEntity->fuser1) >> 16;
+		//int theSoundIndex = (int)(inEntity->fuser1) & 0x0000FFFF;
+
+		// memcpy so value isn't interpreted
+		//int theSoundIndex = 0;
+		//memcpy(&theSoundIndex, &inEntity->fuser1, sizeof(float));
+		//theSoundIndex = theSoundIndex & 0x0000FFFF;
+		int theSoundIndex = (((int(inEntity->fuser1)) & 0x0000FF00) >> 8);
+
+		// Top byte is flags, next byte is volume, bottom two bytes are fade distance
+		int theFlags = inEntity->iuser4 >> 24;
+		int theVolume = (inEntity->iuser4 >> 16) & 0x00FF;
+		int theFadeDistance = (inEntity->iuser4) & 0x0000FFFF;
+
+		float theTimeOfAction = inEntity->fuser2;
+		
+		bool theSoundOn = (inEntity->iuser3 == AVH_USER3_AUDIO_ON);
+
+		this->ModifyAmbientSoundEntryIfChanged(theSoundOn, theSoundIndex, theEntIndex, theTimeOfAction, theVolume, theFadeDistance, theFlags, inEntity->origin);
+	}
+}
+
+string LookupAndTranslate(AvHMessageID inMessageID)
+{
+	string theKey = string(kTechNodeLabelPrefix) + MakeStringFromInt((int)inMessageID);
+
+	string theTranslatedTechName;
+	LocalizeString(theKey.c_str(), theTranslatedTechName);
+
+	return theTranslatedTechName;
+}
+
+void AvHHud::DisplayCombatUpgradeMenu(bool inVisible)
+{
+	if(inVisible)
+	{
+		// Parse current tech nodes and set text
+		const AvHTechID kLineStart[kNumUpgradeLines] = {TECH_ONE_LEVEL_ONE, TECH_TWO_LEVEL_ONE, TECH_THREE_LEVEL_ONE, TECH_FOUR_LEVEL_ONE, TECH_FIVE_LEVEL_ONE};
+
+		// Add "you are now x"!
+		string theYouAreNow;
+		LocalizeString(kYouAreNowA, theYouAreNow);
+
+		string theRankTitle = this->GetRankTitle(false);
+
+		string theExclamation;
+		LocalizeString(kExclamation, theExclamation);
+
+		string theChooseAnUpgrade;
+		LocalizeString(kChooseAnUpgrade, theChooseAnUpgrade);
+
+		string theFinalText = theYouAreNow + string(" ") + theRankTitle + theExclamation + string("\n");
+		theFinalText += theChooseAnUpgrade + string("\n\n");
+		
+		// Set the lines
+		this->mCombatUpgradeMenu.SetText(theFinalText);
+	}
+
+	// Parse text above every time, but only set position once so it doesn't keep animating
+	if(inVisible && !this->mDrawCombatUpgradeMenu)
+	{
+		// Start off screen, and scroll right
+		const float kWidth = .4f;
+		this->mCombatUpgradeMenu.SetNormalizedScreenX(-kWidth);
+		this->mCombatUpgradeMenu.SetNormalizedScreenY(.25f);
+		this->mCombatUpgradeMenu.SetNormalizedMaxWidth(kWidth);
+	}
+
+	this->mDrawCombatUpgradeMenu = inVisible;
+}
+
+void AvHHud::DisplayMessage(const char* inMessage)
+{
+	this->m_Message.MessageAdd(inMessage, this->m_flTime);
+
+	// Remember the time -- to fix up level transitions
+	//this->m_Message.m_parms.time = this->m_flTime;
+
+	// Turn on drawing
+	if ( !(this->m_Message.m_iFlags & HUD_ACTIVE) )
+		this->m_Message.m_iFlags |= HUD_ACTIVE;
+}
+
+//int	AvHHud::GetArmorLevel(void) const
+//{
+//	return this->mArmorLevel;
+//}
+
+int	AvHHud::GetFrameForOrderType(AvHOrderType inOrderType) const
+{
+	int theFrame = 0;
+	
+	switch(inOrderType)
+	{
+	case ORDERTYPEL_DEFAULT:
+		theFrame = 2;
+		break;
+
+	case ORDERTYPEL_MOVE:
+		theFrame = 2;
+		break;
+
+	case ORDERTYPET_ATTACK:
+		theFrame = 4;
+		break;
+
+	case ORDERTYPET_BUILD:
+		theFrame = 5;
+		break;
+
+	case ORDERTYPET_GUARD:
+		theFrame = 6;
+		break;
+
+	case ORDERTYPET_WELD:
+		theFrame = 7;
+		break;
+
+	case ORDERTYPET_GET:
+		theFrame = 8;
+		break;
+	}
+
+	return theFrame;
+}
+
+AvHPlayMode	AvHHud::GetPlayMode(void) const
+{
+	AvHPlayMode thePlayMode = PLAYMODE_UNDEFINED;
+
+	cl_entity_s* thePlayer = gEngfuncs.GetLocalPlayer();
+	if(thePlayer)
+	{
+        if(gEngfuncs.IsSpectateOnly())
+        {
+            thePlayMode = PLAYMODE_OBSERVER;
+        }
+        else
+        {
+            thePlayMode = AvHPlayMode(thePlayer->curstate.playerclass);
+        }
+	}
+
+	return thePlayMode;
+}
+
+AvHPlayMode	AvHHud::GetHUDPlayMode() const
+{
+	AvHPlayMode thePlayMode = this->GetPlayMode();
+	
+	cl_entity_s* thePlayer = this->GetVisiblePlayer();
+	if(thePlayer)
+	{
+		thePlayMode = AvHPlayMode(thePlayer->curstate.playerclass);
+	}
+	
+	return thePlayMode;
+}
+
+cl_entity_s* AvHHud::GetVisiblePlayer() const
+{
+	cl_entity_s* thePlayer = gEngfuncs.GetLocalPlayer();
+	if(g_iUser1 == OBS_IN_EYE)
+	{
+		cl_entity_t* theEnt = gEngfuncs.GetEntityByIndex(g_iUser2);
+		if(theEnt)
+		{
+			thePlayer = theEnt;
+		}
+	}
+
+	return thePlayer;
+}
+
+int	AvHHud::GetLocalUpgrades() const
+{
+	static int theUpgrades = 0;
+	
+	cl_entity_s* thePlayer = this->GetVisiblePlayer();
+	if(thePlayer)
+	{
+		theUpgrades = thePlayer->curstate.iuser4;
+	}
+
+	return theUpgrades;
+}
+
+// Players could hack their client dll and see all the orders on their team.  Minor cheat but definitely possible.
+EntityListType AvHHud::GetDrawPlayerOrders() const
+{
+	EntityListType theList;
+
+	cl_entity_s* theVisiblePlayer = this->GetVisiblePlayer();
+	if(theVisiblePlayer)
+	{
+		int theVisiblePlayerIndex = theVisiblePlayer->index;
+
+		if(this->GetHUDUser3() == AVH_USER3_MARINE_PLAYER)
+		{
+			// Only draw orders for us
+			theList.push_back(theVisiblePlayerIndex);
+		}
+		else if(this->GetHUDUser3() == AVH_USER3_COMMANDER_PLAYER)
+		{
+			// Add everyone that he has selected!
+			return this->mSelected;
+		}
+	}
+	
+	return theList;
+}
+
+bool AvHHud::GetInTopDownMode() const
+{
+	return this->mInTopDownMode;
+}
+
+bool AvHHud::GetIsSelecting() const
+{
+    return mSelectionBoxVisible;
+}
+
+OrderListType AvHHud::GetOrderList() const
+{
+	return this->mOrders;
+}
+
+//AvHOrderType AvHHud::GetOrderMode() const
+//{
+//	return this->mOrderMode;
+//}
+
+bool AvHHud::GetCenterPositionForGroup(int inGroupNumber, vec3_t& outCenterPosition) const
+{
+	bool theSuccess = false;
+	
+	if((inGroupNumber >= 1) && (inGroupNumber <= kNumHotkeyGroups))
+	{
+		vec3_t theCenterPosition;
+		VectorClear(theCenterPosition);
+
+		int theNumFound = 0;
+
+		const EntityListType& theGroup = this->mGroups[inGroupNumber - 1];
+		if(theGroup.size() > 0)
+		{
+			for(EntityListType::const_iterator theIter = theGroup.begin(); theIter != theGroup.end(); theIter++)
+			{
+				int theEntIndex = *theIter;
+					
+				Vector thePosition;
+				cl_entity_s* theEntity = gEngfuncs.GetEntityByIndex(theEntIndex);
+				if(theEntity)
+				{
+					thePosition = theEntity->curstate.origin;
+				}
+				
+				if(AvHSHUGetEntityLocation(theEntIndex, thePosition))
+				{
+					theCenterPosition.x += thePosition.x;
+					theCenterPosition.y += thePosition.y;
+					theNumFound++;
+				}
+			}
+
+			if(theNumFound > 0)
+			{
+				theCenterPosition.x /= theNumFound;
+				theCenterPosition.y /= theNumFound;
+				
+				outCenterPosition = theCenterPosition;
+				
+				theSuccess = true;
+			}
+		}
+	}
+
+	return theSuccess;
+}
+
+void AvHHud::GetMousePos(int& outX, int& outY) const
+{
+	gEngfuncs.GetMousePosition(&outX, &outY);
+	
+	// Clip mouse to window (weird)
+	outX = min(max(0, outX), ScreenWidth());
+	outY = min(max(0, outY), ScreenHeight());
+	
+	//char theMouseMessage[256];
+	//sprintf(theMouseMessage, "Mouse coords: %d, %d", outX, outY);
+	//CenterPrint(theMouseMessage);
+}
+
+bool AvHHud::GetAndClearTopDownScrollAmount(int& outX, int& outY, int& outZ)
+{
+	bool theSuccess = false;
+	outX = 0;
+	outY = 0;
+	outZ = 0;
+	
+    // Don't scroll if the the commander is dragging a selection box.
+    
+    if(this->GetInTopDownMode() && !GetIsSelecting())
+	{
+		const int kScreenWidth = ScreenWidth();
+		const int kScreenHeight = ScreenHeight();
+		const kScrollHorizontal = .0152f*kScreenWidth;
+		const kScrollVertical = .015f*kScreenHeight;
+
+		// Left side
+		if(this->GetIsMouseInRegion(0, 0, kScrollHorizontal, kScreenHeight) || (gScrollHandler.GetXScroll() < 0))
+		{
+			outX = -1;
+		}
+		// Right side
+		else if(this->GetIsMouseInRegion(kScreenWidth - kScrollHorizontal, 0, kScrollHorizontal, kScreenHeight) || (gScrollHandler.GetXScroll() > 0))
+		{
+			outX = 1;
+		}
+
+		// Top edge
+		if(this->GetIsMouseInRegion(0, 0, kScreenWidth, kScrollVertical) || (gScrollHandler.GetYScroll() > 0))
+		{
+			outY = 1;
+		}
+		// Bottom edge
+		else if(this->GetIsMouseInRegion(0, kScreenHeight - kScrollVertical, kScreenWidth, kScrollVertical) || (gScrollHandler.GetYScroll() < 0))
+		{
+			outY = -1;
+		}
+
+		// Only clear z scroll because of the way events work (invnext/invprev vs. holding a key down)
+		//gScrollHandler.ClearScrollHeight();
+		
+		theSuccess = true;
+	}
+	
+	return theSuccess;
+}
+
+bool AvHHud::GetAndClearSelectionEvent(vec3_t& outSelection, AvHMessageID& outMessageID)
+{
+	bool theSuccess = false;
+
+	// Return a build event if there is one, else return a COMMANDER_MOUSECOORD event
+	if(this->mLeftMouseStarted)
+	{
+		if(this->mValidatedBuilding == MESSAGE_NULL)
+		{
+			VectorCopy(this->mLeftMouseWorldStart, outSelection);
+			outMessageID = COMMANDER_MOUSECOORD;
+		}
+		else
+		{
+			VectorCopy(this->mNormBuildLocation, outSelection);
+			outMessageID = this->mValidatedBuilding;
+			this->mValidatedBuilding = this->mGhostBuilding = MESSAGE_NULL;
+			this->mPlacingBuilding = true;
+		}
+		theSuccess = true;
+	}
+	else if(this->mLeftMouseEnded)
+	{
+		if(!this->mPlacingBuilding)
+		{
+			outSelection = this->mLeftMouseWorldEnd;
+			outMessageID = COMMANDER_MOUSECOORD;
+			theSuccess = true;
+		}
+		this->mPlacingBuilding = false;
+	}
+	else if(this->mRightMouseStarted)
+	{
+		// Cancel building placement
+		if(this->mGhostBuilding != MESSAGE_NULL)
+		{
+            CancelBuilding();
+		}
+		else
+		{
+			outSelection = this->mRightMouseWorldStart;
+			outMessageID = COMMANDER_MOUSECOORD;
+			theSuccess = true;
+		}
+	}
+	else if(this->mRightMouseEnded)
+	{
+		outSelection = this->mRightMouseWorldEnd;
+		outMessageID = COMMANDER_MOUSECOORD;
+		theSuccess = true;
+	}
+	else
+	{
+		outSelection = this->mMouseWorldPosition;
+		outMessageID = COMMANDER_MOUSECOORD;
+		theSuccess = true;
+	}
+	
+	return theSuccess;
+}
+
+EntityListType AvHHud::GetSelected() const
+{
+	return this->mSelected;
+}
+
+const AvHTechSlotManager& AvHHud::GetTechSlotManager() const
+{
+	return this->mTechSlotManager;
+}
+
+bool AvHHud::GetAndClearAlienAbility(AvHMessageID& outMessageID)
+{
+	bool theAlienAbilityWaiting = false;
+	
+	if(this->mAlienAbility != MESSAGE_NULL)
+	{
+		outMessageID = this->mAlienAbility;
+		theAlienAbilityWaiting = true;
+		this->mAlienAbility = MESSAGE_NULL;
+	}
+	
+	return theAlienAbilityWaiting;
+}
+
+bool AvHHud::GetAndClearGroupEvent(AvHMessageID& outMessageID)
+{
+	bool theGroupEventWaiting = false;
+	
+	if(this->mGroupEvent != MESSAGE_NULL)
+	{
+		outMessageID = this->mGroupEvent;
+		theGroupEventWaiting = true;
+		
+//		if(!this->mIsTracking)
+//		{
+			this->mGroupEvent = MESSAGE_NULL;
+//		}
+	}
+	
+	return theGroupEventWaiting;
+}
+
+int	AvHHud::GetTrackingEntity() const
+{
+	return this->mTrackingEntity;
+}
+
+void AvHHud::ClearTrackingEntity()
+{
+	this->mTrackingEntity = 0;
+}
+
+void AvHHud::SetSelectionEffects(EntityListType& inUnitList)
+{
+	// Make sure we have an effect created for each unit in this list.  If there are units that
+	// have selection effects that aren't in this list, delete them.  This is called locally when the
+	// selection is predicted, then it's called again when the selection is confirmed.
+	this->mSelectionEffects.clear();
+	
+	for(EntityListType::iterator theIter = inUnitList.begin(); theIter != inUnitList.end(); theIter++)
+	{
+		SelectionEffect theNewEffect;
+		theNewEffect.mEntIndex = *theIter;
+		theNewEffect.mAngleOffset = 0;
+		this->mSelectionEffects.push_back(theNewEffect);
+	}
+}
+
+UIMode AvHHud::GetUIMode() const
+{
+	return this->mCurrentUIMode;
+}
+
+bool AvHHud::SwitchUIMode(UIMode inNewMode)
+{
+	bool theSuccess = false;
+
+	// Only allow switching to a non-main mode when we're in main, always allow switching back to main mode
+	if((inNewMode == MAIN_MODE) || (this->mCurrentUIMode == MAIN_MODE))
+	{
+		if(inNewMode != this->mCurrentUIMode)
+		{
+			// Move pop-up menu components away or back so they don't block other compoments...ugh
+			if(inNewMode != MAIN_MODE)
+			{
+				gHUD.GetManager().TranslateComponent(kSoldierMenu, true);
+				gHUD.GetManager().TranslateComponent(kSoldierCombatMenu, true);
+				gHUD.GetManager().TranslateComponent(kAlienMenu, true);
+				gHUD.GetManager().TranslateComponent(kAlienCombatMenu, true);
+				gHUD.GetManager().TranslateComponent(kAlienMembrane, true);
+				gHUD.GetManager().TranslateComponent(kScroller, true);
+				gHUD.GetManager().TranslateComponent(kSelectionText, true);
+				//CenterPrint("Pop-up controls moved off screen");
+			}
+			else
+			{
+				gHUD.GetManager().TranslateComponent(kSoldierMenu, false);
+				gHUD.GetManager().TranslateComponent(kSoldierCombatMenu, false);
+				gHUD.GetManager().TranslateComponent(kAlienMenu, false);
+				gHUD.GetManager().TranslateComponent(kAlienCombatMenu, false);
+				gHUD.GetManager().TranslateComponent(kAlienMembrane, false);
+				gHUD.GetManager().TranslateComponent(kScroller, false);
+				gHUD.GetManager().TranslateComponent(kSelectionText, false);
+				//CenterPrint("Pop-up controls moved on screen");
+			}
+
+			this->mCurrentUIMode = inNewMode;
+		}
+
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+bool AvHHud::Update(float inCurrentTime, string& outErrorString)
+{
+    bool theSuccess = false;
+
+	if(inCurrentTime > this->mTimeOfLastUpdate)
+	{
+
+        this->mTimeOfCurrentUpdate = inCurrentTime;
+
+		// Predict game time
+		if(this->GetGameStarted())
+		{
+			this->mGameTime += (inCurrentTime - this->mTimeOfLastUpdate);
+		}
+
+		AvHParticleSystemManager::Instance()->Start();
+
+		// This component must always be visible to allow us to hook mouse cursor sprite drawing
+		this->ResetComponentsForUser3();
+
+		this->UpdateDataFromVuser4(inCurrentTime);
+
+		this->UpdateSpectating();
+
+		this->GetManager().UnhideComponent(kLastComponent);
+
+		this->UpdateDemoRecordPlayback();
+		
+		theSuccess = UIHud::Update(inCurrentTime, outErrorString);
+        if(!theSuccess)
+        {
+            this->AddTooltip(outErrorString.c_str());
+        }
+
+		this->UpdateProgressBar();
+
+		this->UpdateCommonUI();
+
+		this->UpdateAlienUI(inCurrentTime);
+
+		this->UpdateMarineUI(inCurrentTime);
+		
+		this->UpdateCountdown(inCurrentTime);
+
+		this->UpdateExploitPrevention();
+		this->UpdateFromEntities(inCurrentTime);
+		
+		this->UpdateEntityID(inCurrentTime);
+
+		this->UpdateHelpText();
+
+		this->UpdateTooltips(inCurrentTime);
+
+		this->UpdateStructureNotification(inCurrentTime);
+
+		this->UpdateMusic(inCurrentTime);
+
+		this->UpdatePieMenuControl();
+
+		// Reset cursor every tick, update selection may change it
+		// This cursor is used when we're on the ground for pie menus as well
+		this->SetCursor(ORDERTYPE_UNDEFINED);
+
+		this->UpdateHierarchy();
+
+		this->UpdateInfoLocation();
+
+		if(this->GetInTopDownMode())
+		{
+			this->UpdateSelection();
+			gCommanderHandler.Update(this->mTechNodes, this->mResources);
+
+//			char theDebugString[128];
+//			sprintf(theDebugString, "norm X/Y: %f, %f", (float)this->mMouseCursorX/ScreenWidth, (float)this->mMouseCursorY/ScreenHeight);
+//			CenterPrint(theDebugString);
+		}
+		else
+		{
+			this->ResetTopDownUI();
+		}
+		
+		// Update orders
+		//for(OrderListType::iterator theIter = this->mOrders.begin(); theIter != this->mOrders.end(); theIter++)
+		//{
+		//	theIter->Update();
+		//}
+		
+		this->UpdateTechNodes();
+		
+		this->UpdateAmbientSounds();
+
+		this->UpdateViewModelEffects();
+
+        mOverviewMap.UpdateOrders(mOrders, GetDrawPlayerOrders());
+        mOverviewMap.Update(inCurrentTime);
+		
+		float theTimePassed = inCurrentTime - this->mTimeOfLastUpdate;
+		
+		AvHParticleSystemManager::Instance()->Update(theTimePassed);
+
+		AvHScriptManager::Instance()->ClientUpdate(theTimePassed);
+
+		this->UpdateResources(theTimePassed);
+
+		if((this->GetHUDPlayMode() == PLAYMODE_PLAYING) && !this->GetIsAlive())
+		{
+			this->mCommanderResourceLabel->setVisible(false);
+			this->mHierarchy->setVisible(false);
+			this->mShowMapHierarchy->setVisible(false);
+		}
+
+		if(cl_particleinfo->value)
+		{
+			char theDebugText[128];
+			int theNumVisible = AvHParticleSystemManager::Instance()->GetNumVisibleParticleSystems();
+			int theNum = AvHParticleSystemManager::Instance()->GetNumberParticleSystems();
+			int theNumTemplates = gParticleTemplateList.GetNumberTemplates();
+			sprintf(theDebugText, "(vis, total, list): %d, %d, %d", theNumVisible, theNum, theNumTemplates);
+			
+			//sprintf(theDebugText, "step interval: %d", pmove->flTimeStepSound);
+
+            /*
+			if(this->mMarineResourceLabel)
+			{
+				this->mMarineResourceLabel->setText(theDebugText);
+				this->mMarineResourceLabel->setVisible(true);
+			}
+            */
+
+		}
+
+		if(!gEngfuncs.pDemoAPI->IsPlayingback())
+		{
+			IN_GetMousePos(&this->mMouseCursorX, &this->mMouseCursorY);
+		}
+
+		// Update user3 and team
+		this->mLastUser3 = this->GetHUDUser3();
+		this->mLastTeamNumber = this->GetHUDTeam();
+		this->mLastPlayMode = this->GetPlayMode();
+		
+		this->mTimeOfLastUpdate = inCurrentTime;
+		
+		// Save view origin and angles before we do crazy viewport stuff
+		//		gPlayerOrigin = v_origin;
+		//		gPlayerAngles = v_angles;
+	}
+
+    return theSuccess;
+}
+
+//void AvHHud::UpdateSelectionEffects(float inTimePassed)
+//{
+//	// Radians/sec
+//	const float kSpinRate = 1.5f;
+//	for(SelectionListType::iterator theIter = this->mSelectionEffects.begin(); theIter != this->mSelectionEffects.end(); theIter++)
+//	{
+//		theIter->mAngleOffset = (theIter->mAngleOffset += inTimePassed*kSpinRate) % 360;
+//	}
+//}
+
+bool AvHHud::GetAndClearTechEvent(AvHMessageID& outMessageID)
+{
+	bool theTechEventWaiting = false;
+	
+	if(this->mTechEvent != MESSAGE_NULL)
+	{
+		outMessageID = this->mTechEvent;
+		theTechEventWaiting = true;
+		this->mTechEvent = MESSAGE_NULL;
+	}
+	
+	return theTechEventWaiting;
+}
+
+bool AvHHud::GetLastHotkeySelectionEvent(AvHMessageID& outMessageID)
+{
+	bool theSuccess = false;
+
+	switch(this->mLastHotkeySelectionEvent)
+	{
+	case GROUP_SELECT_1:
+	case GROUP_SELECT_2:
+	case GROUP_SELECT_3:
+	case GROUP_SELECT_4:
+	case GROUP_SELECT_5:
+		outMessageID = this->mLastHotkeySelectionEvent;
+		theSuccess = true;
+		break;
+	}
+
+	return theSuccess;
+}
+
+void AvHHud::SetLastHotkeySelectionEvent(AvHMessageID inMessageID)
+{
+	switch(inMessageID)
+	{
+	case MESSAGE_NULL:
+	case GROUP_CREATE_1:
+	case GROUP_CREATE_2:
+	case GROUP_CREATE_3:
+	case GROUP_CREATE_4:
+	case GROUP_CREATE_5:
+	case GROUP_SELECT_1:
+	case GROUP_SELECT_2:
+	case GROUP_SELECT_3:
+	case GROUP_SELECT_4:
+	case GROUP_SELECT_5:
+	case COMMANDER_REMOVESELECTION:
+		this->mLastHotkeySelectionEvent = inMessageID;
+		break;
+
+	default:
+		ASSERT(false);
+		break;
+	}
+}
+
+bool AvHHud::GetIsAlien() const
+{
+	bool theIsAlien = false;
+	
+	AvHUser3 theUser3 = this->GetHUDUser3();
+	
+	switch(theUser3)
+	{
+	case AVH_USER3_ALIEN_PLAYER1:
+	case AVH_USER3_ALIEN_PLAYER2:
+	case AVH_USER3_ALIEN_PLAYER3:
+	case AVH_USER3_ALIEN_PLAYER4:
+	case AVH_USER3_ALIEN_PLAYER5:
+	case AVH_USER3_ALIEN_EMBRYO:
+		theIsAlien = true;
+		break;
+	}
+	
+	return theIsAlien;
+}
+
+bool AvHHud::GetIsBeingDigested() const
+{
+	bool theIsBeingDigested = false;
+
+	int theUpgrades = this->GetHUDUpgrades();
+		
+	if(GetHasUpgrade(theUpgrades, MASK_DIGESTING))
+	{
+		cl_entity_t* theVisiblePlayer = this->GetVisiblePlayer();
+		if(theVisiblePlayer && (theVisiblePlayer->curstate.effects & EF_NODRAW))
+		{
+			theIsBeingDigested = true;
+		}
+	}
+
+	return theIsBeingDigested;
+}
+
+bool AvHHud::GetIsEnsnared() const
+{
+	int theUpgrades = this->GetHUDUpgrades();
+	return GetHasUpgrade(theUpgrades, MASK_ENSNARED);
+}
+
+bool AvHHud::GetIsStunned() const
+{
+    int theUpgrades = this->GetHUDUpgrades();
+    return GetHasUpgrade(theUpgrades, MASK_PLAYER_STUNNED);
+}
+
+bool AvHHud::GetIsDigesting() const
+{
+	bool theIsDigesting = false;
+	
+	int theUpgrades = this->GetHUDUpgrades();
+	
+	if(GetHasUpgrade(theUpgrades, MASK_DIGESTING))
+	{
+		cl_entity_t* theVisiblePlayer = this->GetVisiblePlayer();
+		if(theVisiblePlayer && !(theVisiblePlayer->curstate.effects & EF_NODRAW))
+		{
+			theIsDigesting = true;
+		}
+	}
+	
+	return theIsDigesting;
+}
+
+bool AvHHud::GetIsNotInControl() const
+{
+    return GetIsBeingDigested() || !IEngineStudio.IsHardware();
+}
+
+bool AvHHud::GetIsInTopDownMode() const
+{
+	bool theIsInTopDownMode = false;
+	
+	if(GetHasUpgrade(this->GetHUDUpgrades(), MASK_TOPDOWN))
+	{
+		theIsInTopDownMode = true;
+	}
+	
+	return theIsInTopDownMode;
+}
+
+int AvHHud::GetCommanderIndex() const
+{
+    int theCommanderIndex = -1;
+
+    for(int i = 1; i <= MAX_PLAYERS; i++)
+    {
+        extra_player_info_t* theExtraPlayerInfo = &g_PlayerExtraInfo[i];
+        ASSERT(theExtraPlayerInfo);
+        int thePlayerClass = theExtraPlayerInfo->playerclass;
+        if(thePlayerClass == PLAYERCLASS_COMMANDER)
+        {
+            theCommanderIndex = i;
+            break;
+        }
+    }
+
+    return theCommanderIndex;
+}
+
+
+bool AvHHud::GetHasJetpack() const
+{
+	int theLocalUpgrades = this->GetHUDUpgrades();
+	bool theHasJetpackUpgrade = GetHasUpgrade(theLocalUpgrades, MASK_UPGRADE_7) && this->GetIsMarine();
+	
+	return theHasJetpackUpgrade;
+}
+
+bool AvHHud::GetHasAlienUpgradesAvailable() const
+{
+	bool theHasUpgradesAvailable = false;
+
+	if(this->GetIsAlien() && this->GetIsRelevant() && !this->GetIsBeingDigested())
+	{
+		int theUpgradeVar = this->GetLocalUpgrades();
+		bool theHasDefensiveUpgradesAvailable = AvHGetHasUpgradeChoiceInCategory(ALIEN_UPGRADE_CATEGORY_DEFENSE, this->mUpgrades, theUpgradeVar);
+		bool theHasMovementUpgradesAvailable = AvHGetHasUpgradeChoiceInCategory(ALIEN_UPGRADE_CATEGORY_MOVEMENT, this->mUpgrades, theUpgradeVar);
+		bool theHasSensoryUpgradesAvailable = AvHGetHasUpgradeChoiceInCategory(ALIEN_UPGRADE_CATEGORY_SENSORY, this->mUpgrades, theUpgradeVar);
+
+		theHasUpgradesAvailable = theHasDefensiveUpgradesAvailable || theHasMovementUpgradesAvailable || theHasSensoryUpgradesAvailable;
+	}
+
+	return theHasUpgradesAvailable;
+}
+
+bool AvHHud::GetIsMarine() const
+{
+	bool theIsMarine = false;
+
+	AvHUser3 theUser3 = this->GetHUDUser3();
+
+	switch(theUser3)
+	{
+	case AVH_USER3_MARINE_PLAYER:
+	case AVH_USER3_COMMANDER_PLAYER:
+		theIsMarine = true;
+		break;
+	}
+	
+	return theIsMarine;
+}
+
+bool AvHHud::GetIsRelevant() const
+{
+	bool theIsRelevant = false;
+	
+	if(this->GetIsAlive() && (this->GetPlayMode() == PLAYMODE_PLAYING) /*&& !this->GetIsSpectator()*/)
+	{
+		theIsRelevant = true;
+	}
+	
+	return theIsRelevant;
+}
+
+vec3_t AvHHud::GetVisualOrigin() const
+{
+	vec3_t theVisualOrigin = gPredictedPlayerOrigin;
+
+	theVisualOrigin.z += gPredictedPlayerVOfs[2];
+
+	return theVisualOrigin;
+}
+
+AvHMessageID AvHHud::HotKeyHit(char inChar)
+{
+	return gCommanderHandler.HotKeyHit(inChar);
+}
+
+float AvHHud::GetGammaSlope() const
+{
+	return sGameGammaTable.GetGammaSlope();
+}
+
+string AvHHud::GetMapName(bool inLocalOnly) const
+{
+    string theMapName = this->mMapName;
+
+    if((theMapName == "") && !inLocalOnly )
+    {
+        const char* theLevelName = gEngfuncs.pfnGetLevelName();
+        if(theLevelName)
+        {
+            theMapName = string(theLevelName);
+
+            // Remove maps/ from the beginning and .bsp from the end.
+            StringVector theVector;
+            Tokenizer::split(theMapName, "/.", theVector);
+            if(theVector.size() >= 2)
+            {
+                theMapName = theVector[1];
+            }
+        }
+    }
+
+	return theMapName;
+}
+
+int AvHHud::GetNumActiveHives() const
+{
+	int theNumActiveHives = 0;
+
+	if(this->GetIsAlien())
+	{
+		for(HiveInfoListType::const_iterator theIter = this->mHiveInfoList.begin(); theIter != this->mHiveInfoList.end(); theIter++)
+		{
+			if(theIter->mStatus == kHiveInfoStatusBuilt)
+			{
+				theNumActiveHives++;
+			}
+		}
+	}
+
+	return theNumActiveHives;
+}
+
+int AvHHud::GetMaxAlienResources() const
+{
+	int theMaxAlienResources = kMaxAlienResources;
+
+	if(this->mMaxResources >= 0)
+	{
+		theMaxAlienResources = this->mMaxResources;
+	}
+
+	return theMaxAlienResources;
+}
+
+//void AvHHud::InitializeGammaTable()
+//{
+//	for(int j = 0; j < 3; j++)
+//	{
+//		for(int i = 0; i < 256; i++)
+//		{
+//			int theBaseOffset = j*256 + i;
+//			uint8 theNewColor = (uint8)i;
+//			uint16 theNewWord = theNewColor << 8;
+//			((uint16*)sOriginalGammaTable)[theBaseOffset] = theNewWord;
+//		}
+//	}
+//}
+//
+//void AvHHud::ProcessGammaTable(float inSlope)
+//{
+//	// Steepen and saturate, ala Q3
+//	uint8 kMaxValue = uint8(-1);
+//	for(int j = 0; j < 3; j++)
+//	{
+//		for(int i = 0; i < 256; i++)
+//		{
+//			int theBaseOffset = j*256 + i;
+//			uint16 theWord = ((uint16*)sGammaTable)[theBaseOffset];
+//			uint8 theBaseColor = (theWord & 0xFF00) >> 8;
+//			uint8 theNewColor = min(theBaseColor*inSlope, kMaxValue);
+//			uint16 theNewWord = theNewColor << 8;
+//			((uint16*)sGammaTable)[theBaseOffset] = theNewWord;
+//		}
+//	}
+//}
+
+//void AvHHud::ToggleGamma(void)
+//{
+//	AvHHud::ResetGamma();
+//
+//	if(!sGammaAltered)
+//	{
+//        float theGammaToTry = 2.05f;
+//        bool theSuccess = false;
+//        while(!theSuccess && (theGammaToTry > 1.0f))
+//        {
+//            theGammaToTry -= .05f;
+//            theSuccess = AvHHud::SetGamma(theGammaToTry);
+//        }
+//
+//        char theMessage[256];
+//        if(theSuccess)
+//        {
+//            sprintf(theMessage, "Gamma set to %f.", theGammaToTry);
+//			gNewGammaSlope = theGammaToTry;
+//        }
+//        else
+//        {
+//            sprintf(theMessage, "This display device doesn't appear to support downloadable gamma ramps.");
+//        }
+//        CenterPrint(theMessage);
+//	}
+//	else
+//	{
+//		sGammaAltered = false;
+//	}
+//}
+
+bool AvHHud::SetGamma(float inSlope)
+{
+    bool theSuccess = false;
+
+	// Disable gamma stuff in debug for sanity
+//	#ifndef DEBUG
+	
+	HDC theDC = GetDC(NULL);
+	if(theDC != 0)
+	{
+		const float kGammaIncrement = 0.05f;
+		float theGammaToTry = inSlope + kGammaIncrement;
+		while(!theSuccess && (theGammaToTry > 1.0f))
+		{
+			theGammaToTry -= kGammaIncrement;
+
+			sGameGammaTable.ProcessSlope(theGammaToTry);
+			if(sGameGammaTable.InitializeToVideoState())
+			{
+				// Tell UI components so they can change shading to look the same
+				this->GetManager().NotifyGammaChange(theGammaToTry);
+				
+				//float theColorBias = 1/this->mGammaSlope;
+				//
+				//if(this->mSoldierMenu)
+				//{
+				//	this->mSoldierMenu->SetColorBias(theColorBias);
+				//}
+				//
+				//if(this->mAlienMenu)
+				//{
+				//	this->mAlienMenu->SetColorBias(theColorBias);
+				//}
+				
+				// aww yeah
+				theSuccess = true;
+			}
+		}
+		
+		char theMessage[256];
+		if(theSuccess)
+		{
+			sprintf(theMessage, "Gamma set to %f.", theGammaToTry);
+		}
+		else
+		{
+			sprintf(theMessage, "Display doesn't support downloadable gamma ramps.");
+		}
+
+		if(!theSuccess || (gEngfuncs.GetMaxClients() == 1))
+		{
+			CenterPrint(theMessage);
+		}
+		
+		if(!ReleaseDC(NULL, theDC))
+		{
+			// emit error about leak
+		}
+	}
+
+	//#endif
+	
+    return theSuccess;
+}
+
+bool AvHHud::SlotInput(int inSlot)
+{
+	bool theHandled = false;
+
+	if(this->mInTopDownMode)
+	{
+		if((inSlot >= 0) && (inSlot < kNumHotkeyGroups))
+		{
+			// TODO: Read state of control/duck here
+			bool theCreateGroup = false;
+			
+			int theButtonBits = CL_ButtonBits(0);
+			if(theButtonBits & IN_DUCK)
+			{
+				theCreateGroup = true;
+			
+				//#ifdef AVH_PREDICT_SELECT
+				//this->PlayHUDSound(AvHHUDSound(HUD_SOUND_SQUAD1 + inSlot));
+				//#endif
+			}
+			
+			int theBaseOffset = theCreateGroup ? GROUP_CREATE_1 : GROUP_SELECT_1;
+			
+			this->mGroupEvent = (AvHMessageID)(theBaseOffset + inSlot);
+			
+			theHandled = true;
+		}
+	}
+//	else if(this->mDrawCombatUpgradeMenu)
+//	{
+//		if((inSlot >= 0) && (inSlot < kNumUpgradeLines))
+//		{
+//			AvHMessageID theImpulse = this->mMenuImpulses[inSlot];
+//			if(theImpulse > 0)
+//			{
+//				// Make menu go away
+//				char szbuf[32];
+//				sprintf(szbuf, "impulse %d\n", theImpulse);
+//				ClientCmd(szbuf);
+//				
+//				theHandled = true;
+//			}
+//		}
+//	}
+
+	return theHandled;
+}
+
+int AvHHud::Redraw( float flTime, int intermission )
+{
+
+	if (!gViewPort->IsOptionsMenuVisible() &&
+        !gParticleEditorHandler.GetInEditMode())
+	{
+		Render();
+	}
+
+    int theRC = UIHud::Redraw(flTime, intermission);
+
+    return theRC;
+}
+
+void AvHHud::ResetGammaAtExit()
+{
+	sPregameGammaTable.InitializeToVideoState();
+}
+
+int AvHHud::ResetGammaAtExitForOnExit()
+{
+	sPregameGammaTable.InitializeToVideoState();
+	return TRUE;
+}
+
+void AvHHud::ResetGammaAtExit(int inSig)
+{
+	AvHHud::ResetGammaAtExit();
+}
+
+void AvHHud::ResetTopDownUI()
+{
+	this->mGhostBuilding = MESSAGE_NULL;
+	this->mSelected.clear();
+	this->mSelectionEffects.clear();
+	
+	gCommanderHandler.Reset();
+
+	for(int i = 0; i < kNumHotkeyGroups; i++)
+	{
+		this->mGroups[i].clear();
+		this->mGroupTypes[i] = AVH_USER3_NONE;
+		this->mGroupAlerts[i] = ALERT_NONE;
+	}
+
+	this->mSelectAllGroup.clear();
+}
+
+void AvHHud::SetSelectingWeaponID(int inWeaponID, int inR, int inG, int inB)
+{
+	if(gEngfuncs.pfnGetCvarFloat(kvAutoHelp))
+	{
+		if(inR != -1)
+		{
+			this->mHelpMessage.SetR(inR);
+		}
+		if(inG != -1)
+		{
+			this->mHelpMessage.SetG(inG);
+		}
+		if(inB != -1)
+		{
+			this->mHelpMessage.SetB(inB);
+		}
+		
+		this->mSelectingWeaponID = inWeaponID;
+	}
+}
+
+void AvHHud::SetTechHelpText(const string& inTechHelpText)
+{
+	this->mTechHelpText = inTechHelpText;
+}
+
+BIND_MESSAGE(Countdown);
+int AvHHud::Countdown(const char* pszName, int iSize, void* pbuf)
+{
+	BEGIN_READ(pbuf, iSize);
+	byte theNumSecondsUntilStart = READ_BYTE();
+
+	this->mNumTicksToPlay = theNumSecondsUntilStart;
+	this->mLastTickPlayed = 1;
+	this->mCountDownClock = this->m_flTime;
+
+	return 1;
+}
+
+//BIND_MESSAGE(ChangeNode);
+//int	AvHHud::ChangeNode(const char* pszName, int iSize, void* pbuf)
+//{
+//	BEGIN_READ(pbuf, iSize);
+//    int theBytesRead = 1;
+//
+//	// Read new armor level
+//	this->mArmorLevel = READ_BYTE();
+//
+//	// Read old message id
+//	int theOldMessageID = READ_BYTE();
+//
+//	// Read new message id
+//	int theNewMessageID = READ_BYTE();
+//
+//	// Read string
+//	const char* theString = READ_STRING();
+//
+//	// Make the change
+//	this->ChangeUpgradeCosts(theOldMessageID, theNewMessageID, theString);
+//	
+//	// TODO: Is it ok to return this here?  2 bytes for the ids, one for the string?
+//	return 3;
+//}
+
+bool AvHHud::GetAmbientSoundNameFromIndex(string& outSoundName, int inSoundIndex) const
+{
+	bool theFoundName = false;
+
+	if(inSoundIndex < (int)(this->mSoundNameList.size()))
+	{
+		outSoundName = this->mSoundNameList[inSoundIndex];
+		theFoundName = true;
+	}
+	else
+	{
+		int a = 0;
+	}
+
+	return theFoundName;
+}
+
+void AvHHud::ModifyAmbientSoundEntryIfChanged(bool inSoundOn, int inSoundIndex, int inEntIndex, float inTimeStarted, int inVolume, int inFadeDistance, int inFlags, Vector inOrigin)
+{
+	bool theFoundSound = false;
+
+	// Look up sound using inSoundIndex
+	string theSoundName;
+	if(this->GetAmbientSoundNameFromIndex(theSoundName, inSoundIndex))
+	{
+		// Loop through current sounds
+		for(AmbientSoundListType::iterator theIter = this->mAmbientSounds.begin(); theIter != this->mAmbientSounds.end(); )
+		{
+			bool theErasedSound = false;
+			if(theIter->GetEntityIndex() == inEntIndex)
+			{
+				// If found, remember that we found it
+				theFoundSound = true;
+				
+				// Set position
+				theIter->SetPosition(inOrigin);
+				
+				// If we're turning off sound, kill the sound
+				if(!inSoundOn)
+				{
+					theIter->ClearData();
+					theIter = this->mAmbientSounds.erase(theIter);
+					theErasedSound = true;
+				}
+			}
+			if(!theErasedSound)
+			{
+				theIter++;
+			}
+		}
+		
+		// If we're turning a sound on, and we didn't find one
+		if(inSoundOn && !theFoundSound)
+		{
+			bool theLooping = inFlags & 2;
+			float theTimeElapsed = this->mTimeOfLastUpdate - inTimeStarted;
+			
+			// Add new entry with these values
+			this->mAmbientSounds.push_back(AvHAmbientSound(theSoundName, inVolume, inFadeDistance, theLooping, inOrigin, inEntIndex, theTimeElapsed));
+		}
+	}
+	else
+	{
+		// We may not have the sound list yet, it's OK
+		//ASSERT(false);
+	}
+}
+
+// Look at incoming order.  If we are one of the receivers, play a HUD sound
+// indicating our new order
+void AvHHud::OrderNotification(const AvHOrder& inOrder)
+{
+	//if(!inOrder.GetOrderCompleted())
+	//{
+		// If we are commander, or we are in receiver list
+		int theLocalPlayer = gEngfuncs.GetLocalPlayer()->index;
+		if((this->GetHUDUser3() == AVH_USER3_COMMANDER_PLAYER) || (inOrder.GetHasReceiver(theLocalPlayer)))
+		{
+			// Do a switch on the order type
+			AvHOrderType theOrderType = inOrder.GetOrderType();
+			AvHHUDSound theSound = HUD_SOUND_INVALID;
+			
+			// Play HUD sound depending on order
+			switch(theOrderType)
+			{
+			case ORDERTYPEL_MOVE:
+				theSound = HUD_SOUND_ORDER_MOVE;
+				break;
+				
+			case ORDERTYPET_ATTACK:
+				theSound = HUD_SOUND_ORDER_ATTACK;
+				break;
+				
+			case ORDERTYPET_BUILD:
+				theSound = HUD_SOUND_ORDER_BUILD;
+				break;
+				
+			case ORDERTYPET_GUARD:
+				theSound = HUD_SOUND_ORDER_GUARD;
+				break;
+				
+			case ORDERTYPET_WELD:
+				theSound = HUD_SOUND_ORDER_WELD;
+				break;
+				
+			case ORDERTYPET_GET:
+				theSound = HUD_SOUND_ORDER_GET;
+				break;
+			}
+
+			if((this->GetHUDUser3() == AVH_USER3_MARINE_PLAYER) && (inOrder.GetOrderCompleted()))
+			{
+				theSound = HUD_SOUND_ORDER_COMPLETE;
+			}
+
+			this->PlayHUDSound(theSound);
+		}
+	//}
+}
+
+void AvHHud::ResetComponentsForUser3()
+{
+
+	this->mPieMenuControl = "";
+	
+	this->GetManager().HideComponents();
+
+	if(gParticleEditorHandler.GetInEditMode())
+	{
+		gHUD.GetManager().UnhideComponent(kPSESizeSlider);
+		gHUD.GetManager().UnhideComponent(kPSESizeLabel);
+		
+		gHUD.GetManager().UnhideComponent(kPSEScaleSlider);
+		gHUD.GetManager().UnhideComponent(kPSEScaleLabel);
+		
+		gHUD.GetManager().UnhideComponent(kPSEGenerationRateSlider);
+		gHUD.GetManager().UnhideComponent(kPSEGenerationRateLabel);
+		
+		gHUD.GetManager().UnhideComponent(kPSEParticleLifetimeSlider);
+		gHUD.GetManager().UnhideComponent(kPSEParticleLifetimeLabel);
+		
+		gHUD.GetManager().UnhideComponent(kPSEParticleSystemLifetimeSlider);
+		gHUD.GetManager().UnhideComponent(kPSEParticleSystemLifetimeLabel);
+		
+		gHUD.GetManager().UnhideComponent(kPSEMaxParticlesSlider);
+		gHUD.GetManager().UnhideComponent(kPSEMaxParticlesLabel);
+		
+		gHUD.GetManager().UnhideComponent(kPSEDrawModeSlider);
+		gHUD.GetManager().UnhideComponent(kPSEDrawModeLabel);
+		
+		gHUD.GetManager().UnhideComponent(PSEGenVelToggleSlider);
+		gHUD.GetManager().UnhideComponent(kPSEGenVelToggleLabel);
+		
+		gHUD.GetManager().UnhideComponent(kPSEGenVelShapeSlider);
+		gHUD.GetManager().UnhideComponent(kPSEGenVelShapeLabel);
+		
+		gHUD.GetManager().UnhideComponent(kPSEGenVelParamNumSlider);
+		gHUD.GetManager().UnhideComponent(kPSEGenVelParamNumLabel);
+		
+		gHUD.GetManager().UnhideComponent(kPSEGenVelParamValueSlider);
+		gHUD.GetManager().UnhideComponent(kPSEGenVelParamValueLabel);
+	}
+	else
+	{
+		bool theIsCombatMode = (this->mMapMode == MAP_MODE_CO);
+		bool theIsNSMode = (this->mMapMode == MAP_MODE_NS);
+	
+		if((this->GetHUDPlayMode() == PLAYMODE_PLAYING) && !this->GetIsNotInControl() && !gViewPort->IsOptionsMenuVisible())
+		{
+			switch(this->GetHUDUser3())
+			{
+			case AVH_USER3_MARINE_PLAYER:
+				if(theIsCombatMode)
+				{
+					this->mPieMenuControl = kSoldierCombatMenu;
+				}
+				else if(theIsNSMode)
+				{
+					this->mPieMenuControl = kSoldierMenu;
+				}
+
+				if (g_iUser1 == OBS_NONE)
+				{
+					this->GetManager().UnhideComponent(mPieMenuControl.c_str());
+				}
+
+				// Removed these for recording footage until they look better
+				//this->GetManager().UnhideComponent(kReinforcementsLabel);
+				//this->GetManager().UnhideComponent(kResourceLabel);
+				//this->GetManager().UnhideComponent(kMouseCursorLabel);
+				//this->GetManager().UnhideComponent(kDebugCSPServerLabel);
+				//this->GetManager().UnhideComponent(kDebugCSPClientLabel);
+				break;
+				
+			case AVH_USER3_COMMANDER_PLAYER:
+				if(this->mInTopDownMode)
+				{
+					this->GetManager().UnhideComponent(kSelectionBox);
+					this->GetManager().UnhideComponent(kCommanderResourceLabel);
+					//this->GetManager().UnhideComponent(kMouseCursorLabel);
+					this->GetManager().UnhideComponent(kLeaveCommanderButton);
+					this->GetManager().UnhideComponent(kScroller);
+					this->GetManager().UnhideComponent(kTechHelpText);
+					this->GetManager().UnhideComponent(kHierarchy);
+					this->GetManager().UnhideComponent(kResearchBackgroundPanel);
+					this->GetManager().UnhideComponent(kActionButtonsComponents);
+					this->GetManager().UnhideComponent(kSelectAllImpulsePanel);
+					//this->GetManager().UnhideComponent(kTopDownHUDTopSpritePanel);
+					//this->GetManager().UnhideComponent(kTopDownHUDBottomSpritePanel);
+				}
+				//this->GetManager().UnhideComponent(kReinforcementsLabel);
+				break;
+				
+			case AVH_USER3_ALIEN_PLAYER1:
+			case AVH_USER3_ALIEN_PLAYER2:
+			case AVH_USER3_ALIEN_PLAYER3:
+			case AVH_USER3_ALIEN_PLAYER4:
+			case AVH_USER3_ALIEN_PLAYER5:
+				if(theIsCombatMode)
+				{
+					this->mPieMenuControl = kAlienCombatMenu;
+				}
+				else if(theIsNSMode)
+				{
+					this->mPieMenuControl = kAlienMenu;
+				}
+				
+				if (g_iUser1 == OBS_NONE)
+				{
+					this->GetManager().UnhideComponent(mPieMenuControl.c_str());
+				}
+
+				//this->GetManager().UnhideComponent(kMouseCursorLabel);
+				//this->GetManager().UnhideComponent(kDebugCSPServerLabel);
+				//this->GetManager().UnhideComponent(kDebugCSPClientLabel);
+				break;
+
+			case AVH_USER3_ALIEN_EMBRYO:
+				//this->GetManager().UnhideComponent(kAlienMembrane);
+				break;
+			}
+
+			if(sShowMap)
+			{
+				this->GetManager().UnhideComponent(kShowMapHierarchy);
+			}
+
+			mOverviewMap.SetUser3(this->GetHUDUser3());
+			
+			// Update command hierarchy so it can potentially display differently
+			if(this->mHierarchy)
+			{
+				this->mHierarchy->setPos(.0105f*ScreenWidth(), .728*ScreenHeight());
+				this->mHierarchy->setSize(.265*ScreenWidth(), .247*ScreenHeight());
+			}
+
+        }
+	}
+}
+
+#ifdef AVH_PLAYTEST_BUILD
+BIND_MESSAGE(BalanceVar);
+int AvHHud::BalanceVar(const char* pszName, int iSize, void* pbuf)
+{
+	int theBytesRead = 0;
+	BEGIN_READ(pbuf, iSize);
+
+	// Read string
+	char* theCString = READ_STRING();
+	theBytesRead += strlen(theCString);
+	string theString(theCString);
+
+	// Read byte indicating whether to be stored as a long or float
+	int theFloatData = READ_BYTE();
+	
+	// Read data
+    int theIntValue = READ_LONG();
+    theBytesRead += 4;
+
+	if(theFloatData)
+	{
+		float theFloatValue = theIntValue/kNormalizationNetworkFactor;
+		this->mBalanceFloats[theString] = theFloatValue;
+	}
+	else
+	{
+		this->mBalanceInts[theString] = theIntValue;
+	}
+
+	if(gViewPort)
+	{
+		gViewPort->mBalanceChanged = true;
+	}
+
+	return theBytesRead;
+}
+
+const BalanceIntListType& AvHHud::GetBalanceInts() const
+{
+	return this->mBalanceInts;
+}
+
+const BalanceFloatListType&	AvHHud::GetBalanceFloats() const
+{
+	return this->mBalanceFloats;
+}
+
+#endif
+
+BIND_MESSAGE(GameStatus);
+int AvHHud::GameStatus(const char* pszName, int iSize, void* pbuf)
+{
+	int theBytesRead = 0;
+	BEGIN_READ(pbuf, iSize);
+	
+	BYTE theStatusByte = READ_BYTE();
+	theBytesRead++;
+
+	this->mMapMode = (AvHMapMode)READ_BYTE();
+	theBytesRead++;
+
+	if((theStatusByte == kGameStatusReset) || (theStatusByte == kGameStatusResetNewMap))
+	{
+		if(this->mInTopDownMode)
+		{
+			this->ToggleMouse();
+
+			// Reset angles?
+//			gViewAngles[0] = READ_COORD();
+//			gViewAngles[1] = READ_COORD();
+//			gViewAngles[2] = READ_COORD();
+//			gResetViewAngles = true;
+		}
+		
+		bool theMapChange = false;
+		if(theStatusByte == kGameStatusResetNewMap)
+		{
+			theMapChange = true;
+		}
+
+		this->ResetGame(theMapChange);
+	}
+	// Victor determined, but we are still in the cooldown time
+	else if(theStatusByte == kGameStatusEnded)
+	{
+		// Stop research
+		this->mGameEnded = true;
+	}
+	else if(theStatusByte == kGameStatusGameTime)
+	{
+		// Authoritative game time from server (which we then increment every tick)
+		this->mGameTime = READ_SHORT();
+		this->mTimeLimit = READ_SHORT();
+		this->mCombatAttackingTeamNumber = READ_BYTE();
+		theBytesRead += 5;
+	}
+	else if(theStatusByte == kGameStatusUnspentLevels)
+	{
+		this->mExperienceLevelSpent = READ_BYTE();
+		theBytesRead++;
+	}
+	
+	return theBytesRead;
+}
+
+BIND_MESSAGE(MiniMap);
+int AvHHud::MiniMap(const char* pszName, int iSize, void* pbuf)
+{
+	int theBytesRead = 0;
+	BEGIN_READ(pbuf, iSize);
+
+	theBytesRead += gMiniMap.ReceiveFromNetworkStream();
+	
+	return theBytesRead;
+}
+
+
+BIND_MESSAGE(ServerVar);
+int AvHHud::ServerVar(const char* pszName, int iSize, void* pbuf)
+{
+    BEGIN_READ(pbuf, iSize);
+
+    std::string theVariableName  = READ_STRING();
+    std::string theVariableValue = READ_STRING();
+
+    mServerVariableMap[theVariableName] = theVariableValue;
+	
+	return 1;
+
+}
+
+
+//BIND_MESSAGE(NetSS);
+//int	AvHHud::NetSS(const char* pszName, int iSize, void* pbuf)
+//{
+//	int theBytesRead = 0;
+//	BEGIN_READ(pbuf, iSize);
+//	
+//	BYTE theStatusByte = READ_BYTE();
+//	theBytesRead++;
+//
+//	ClientCmd("snapshot");
+//
+//	return theBytesRead;
+//}
+
+BIND_MESSAGE(Progress);
+int AvHHud::Progress(const char* pszName, int iSize, void* pbuf)
+{
+	int theBytesRead = 0;
+	BEGIN_READ(pbuf, iSize);
+
+	this->mProgressBarEntityIndex = READ_SHORT();
+	theBytesRead += 2;
+
+	this->mProgressBarParam = READ_BYTE();
+	theBytesRead++;
+	
+	return theBytesRead;
+}
+
+// Start the game over.  Called after the game ends and also after a map change
+void AvHHud::ResetGame(bool inMapChanged)
+{
+	UIHud::ResetGame();
+
+	this->mResources = 0;
+	this->mMaxResources = -1;
+	this->mVisualResources = 0;
+	this->mUser2OfLastResourceMessage = 0;
+	this->mTimeOfLastEntityUpdate = -1;
+	this->mVisualEnergyLevel = 0;
+	this->mUser2OfLastEnergyLevel = 0;
+
+	// Don't use a menu yet
+	//this->ResetUpgradeCosts();
+	
+	// Reset armor as well.
+	//this->mArmorLevel = ARMOR_BASE;
+	
+	// Clear out all particle systems and templates
+	if(inMapChanged)
+	{
+		gParticleTemplateList.Clear();
+		this->mTimeOfLastUpdate = 0.0f;
+
+		this->mInfoLocationList.clear();
+
+		if(gViewPort)
+		{
+			ScorePanel* theScoreBoard = gViewPort->GetScoreBoard();
+			if(theScoreBoard)
+				theScoreBoard->DeleteCustomIcons();
+		}
+	}
+
+	AvHParticleSystemManager::Instance()->Reset();
+
+	this->mTechSlotManager.Clear();
+
+    this->mTechNodes.Clear();
+	
+	this->mTimeOfCurrentUpdate = 0.0f;
+
+	// On game reset, clear blips (happens on server as well)
+    
+	this->mEntityHierarchy.Clear();
+	
+	// Clear selection effects
+	this->mSelectionEffects.clear();
+
+	// End any jetpack effects
+	//EndJetpackEffects();
+
+	// Clear client scripts
+	AvHScriptManager::Instance()->Reset();
+	
+	// Selection and commander variables
+	this->mNumLocalSelectEvents = 0;
+	this->mMapMode = MAP_MODE_UNDEFINED;
+	this->mInTopDownMode = false;
+	this->mLeftMouseStarted = false;
+	this->mLeftMouseEnded = false;
+	this->mPlacingBuilding = false;
+
+	sShowMap = false;
+	
+	this->StopMusic();
+	
+	for(AmbientSoundListType::iterator theIter = this->mAmbientSounds.begin(); theIter != this->mAmbientSounds.end(); theIter++)
+	{
+		theIter->ClearData();
+	}
+	this->mAmbientSounds.clear();
+	
+	this->SetReinforcements(0);
+	
+	this->mOrders.clear();
+
+	this->mCurrentCursorFrame = 0;
+	this->mProgressBarEntityIndex = -1;
+	this->mProgressBarParam = -1;
+
+	this->mEnemyBlips.Clear();
+	this->mFriendlyBlips.Clear();
+
+	// Reset view angles (in case player was in commander mode)
+	gViewAngles.z = 0.0f;
+	gResetViewAngles = true;
+
+	// Clear location
+	this->mLocationText = "";
+
+	this->mUpgrades.clear();
+
+	this->mNumUpgradesAvailable = 0;
+	int i;
+	for(i = 0; i < ALIEN_UPGRADE_CATEGORY_MAX_PLUS_ONE; i++)
+	{
+		this->mCurrentUpgradeCategory[i] = ALIEN_UPGRADE_CATEGORY_INVALID;
+	}
+
+	// Remove all decals (no idea how to get the total decals)
+	//for(i = 0; i < 1024; i++)
+	//{
+	//	gEngfuncs.pEfxAPI->R_DecalRemoveAll(i);
+	//}
+	RemoveAllDecals();
+
+	// Remove temp ghost building
+	if(this->mLastGhostBuilding)
+	{
+		this->mLastGhostBuilding->die = -1;
+	}
+
+	this->mNumericalInfoEffects.clear();
+	this->mTimeOfNextHudSound = -1;
+    this->mLastHUDSoundPlayed = HUD_SOUND_INVALID;
+
+	//this->mTooltips.clear();
+
+	this->mHiveInfoList.clear();
+
+	this->mDesiredGammaSlope = kDefaultMapGamma;
+	this->mRecordingLastFrame = false;
+	this->mTimeOfLastHelpText = -1;
+	this->mDisplayedToolTipList.clear();
+	this->mCurrentWeaponID = -1;
+	this->mCurrentWeaponEnabled = false;
+
+	// Is this needed?
+	//this->mCurrentUIMode = MAIN_MODE;
+
+	this->mMenuTechSlots = 0;
+	this->mPendingRequests.clear();
+
+	for(i = 0; i < kNumHotkeyGroups; i++)
+	{
+		this->mGroups[i].clear();
+		this->mGroupTypes[i] = AVH_USER3_NONE;
+		this->mGroupAlerts[i] = ALERT_NONE;
+	}
+	this->mSelectAllGroup.clear();
+
+	this->mCurrentSquad = 0;
+	this->mBlinkingAlertType = 0;
+
+	this->mLastTeamSpectated = TEAM_IND;
+
+	this->mStructureNotificationList.clear();
+
+	this->mGameTime = -1;
+	this->mTimeLimit = -1;
+	this->mCombatAttackingTeamNumber = 0;
+	this->mGameEnded = false;
+
+	this->mExperience = 0;
+	this->mExperienceLevel = 1;
+	this->mExperienceLevelLastDrawn = 1;
+	this->mExperienceLevelSpent = 0;
+	this->mTimeOfLastLevelUp = -1;
+
+	memset(this->mMenuImpulses, MESSAGE_NULL, sizeof(AvHMessageID)*kNumUpgradeLines);
+}
+
+BIND_MESSAGE(SetGmma);
+int	AvHHud::SetGmma(const char* pszName, int iSize, void* pbuf)
+{
+	int theNumBytesRead = 0;
+	
+	BEGIN_READ( pbuf, iSize);
+	this->mDesiredGammaSlope = READ_COORD()/kNormalizationNetworkFactor;
+	theNumBytesRead += 2;
+	
+	// Set gamma here
+    if (!mSteamUIActive)
+    {
+	    this->SetGamma(this->mDesiredGammaSlope);
+    }
+	
+	return theNumBytesRead;
+}
+
+BIND_MESSAGE(BlipList);
+int	AvHHud::BlipList(const char* pszName, int iSize, void* pbuf)
+{
+	float theCurrentTime = gEngfuncs.GetClientTime();
+	
+    // Fetch new chain of command from network message
+    BEGIN_READ(pbuf, iSize);
+	int theBytesRead = 0;
+	
+	bool theReadingFriendlyBlips = READ_BYTE();
+	theBytesRead++;
+	
+	if(!theReadingFriendlyBlips)
+	{
+		this->mEnemyBlips.Clear();
+		
+		// Read number enemy blips
+		int theNumBlips = READ_BYTE();
+		
+		// For each enemy blip
+		for(int i = 0; i < theNumBlips; i++)
+		{
+			// Read angle/distance
+			float theX = READ_COORD();
+			float theY = READ_COORD();
+			float theZ = READ_COORD();
+			int8 theStatus = READ_BYTE();
+			this->mEnemyBlips.AddBlip(theX, theY, theZ, theStatus);
+			
+			// Increment bytes read
+			theBytesRead += 7;
+		}
+
+		this->mEnemyBlips.SetTimeBlipsReceived(theCurrentTime);
+	}
+	else
+	{
+		this->mFriendlyBlips.Clear();
+
+		// Read number friendly blips
+		int theNumBlips = READ_BYTE();
+		
+		// For each friendly blip
+		for(int i = 0; i < theNumBlips; i++)
+		{
+			// Read angle/distance
+			float theX = READ_COORD();
+			float theY = READ_COORD();
+			float theZ = READ_COORD();
+			int8 theStatus = READ_BYTE();
+			int8 theInfo = READ_BYTE();
+			this->mFriendlyBlips.AddBlip(theX, theY, theZ, theStatus, theInfo);
+			
+			// Increment bytes read
+			theBytesRead += 8;
+		}
+
+		this->mFriendlyBlips.SetTimeBlipsReceived(theCurrentTime);
+	}
+			
+	return theBytesRead;
+}
+
+BIND_MESSAGE(ClScript);
+int	AvHHud::ClScript(const char *pszName, int iSize, void *pbuf)
+{
+	int theBytesRead = 0;
+
+	BEGIN_READ(pbuf, iSize);
+	int theNumScripts = READ_BYTE();
+	theBytesRead++;
+
+	for(int i = 0; i < theNumScripts; i++)
+	{
+		string theScriptName = READ_STRING();
+		theBytesRead += theScriptName.length();
+
+		string theExecutableScriptName = AvHSHUBuildExecutableScriptName(theScriptName, this->GetMapName());
+
+		AvHScriptManager::Instance()->RunScript(theExecutableScriptName);
+	}
+
+	return theBytesRead;
+}
+
+BIND_MESSAGE(Particles);
+int AvHHud::Particles(const char *pszName, int iSize, void *pbuf)
+{
+    // Fetch new chain of command from network message
+    BEGIN_READ(pbuf, iSize);
+	int theBytesRead = gParticleTemplateList.ReceiveFromNetworkStream();
+	
+    return theBytesRead;
+}
+
+BIND_MESSAGE(SoundNames);
+int AvHHud::SoundNames(const char *pszName, int iSize, void *pbuf)
+{
+    // Fetch new chain of command from network message
+    BEGIN_READ(pbuf, iSize);
+	
+	bool theClearSoundList = READ_BYTE();
+	int theBytesRead = 1;
+	
+	if(theClearSoundList)
+	{
+		// Clear sound list
+		this->mSoundNameList.clear();
+	}
+	else
+	{
+		char* theString = READ_STRING();
+		theBytesRead += strlen(theString);
+		
+		string theSoundName(theString);
+		int theSize = this->mSoundNameList.size();
+		this->mSoundNameList.push_back(theString);
+		theSize = this->mSoundNameList.size();
+	}
+
+    return theBytesRead;
+}
+
+BIND_MESSAGE(SetSelect);
+int	AvHHud::SetSelect(const char* pszName, int iSize, void* pbuf)
+{
+	// Better not get this message unless it's appropriate
+	//ASSERT(this->GetInTopDownMode());
+
+	int theBytesRead = 0;
+
+	EntityListType theGroup;
+
+    BEGIN_READ(pbuf, iSize);
+
+	// Read whether this is a hotgroup or the current selection
+	int theHotGroupNumber = READ_BYTE();
+	theBytesRead++;
+
+	if((theHotGroupNumber <= (kNumHotkeyGroups)) || (theHotGroupNumber == kSelectAllHotGroup))
+	{
+		int theNumUnits = READ_BYTE();
+		theBytesRead += 1;
+		
+		for(int i = 0; i < theNumUnits; i++)
+		{
+			int theEntIndex = READ_SHORT();
+			theGroup.push_back(theEntIndex);
+			theBytesRead += 2;
+		}
+
+		if(theHotGroupNumber == 0)
+		{
+			// set flag to indicate selection just changed
+//			#ifdef AVH_PREDICT_SELECT
+//			this->mNumLocalSelectEvents--;
+//	
+//			// This will only be negative when the server sets the selection for us, like when becoming commander
+//			if(this->mNumLocalSelectEvents <= 0)
+//			{
+//			#endif
+
+			bool theIsTracking = READ_BYTE();
+			theBytesRead++;
+
+			if(theIsTracking)
+			{
+				this->mTrackingEntity = READ_SHORT();
+				theBytesRead += 2;
+			}
+			else
+			{
+				this->mTrackingEntity = 0;
+			}
+	
+			if(theGroup != this->mSelected)
+			{
+				this->mSelectionJustChanged = true;
+				this->mSelected = theGroup;
+			}
+//			this->mNumLocalSelectEvents = 0;
+//			#ifdef AVH_PREDICT_SELECT
+//			}
+//#endif
+		}
+		else
+		{
+			if(theHotGroupNumber <= kNumHotkeyGroups)
+			{
+				this->mGroups[theHotGroupNumber-1] = theGroup;
+				
+				this->mGroupTypes[theHotGroupNumber-1] = (AvHUser3)READ_BYTE();
+				theBytesRead++;
+				
+				mGroupAlerts[theHotGroupNumber-1] = (AvHAlertType)READ_BYTE();
+				theBytesRead++;
+			}
+			else
+			{
+				// Select all group
+				ASSERT(theHotGroupNumber == kSelectAllHotGroup);
+				this->mSelectAllGroup = theGroup;
+			}
+		}
+	}
+	else
+	{
+		// Read request type
+		AvHMessageID theRequestType = AvHMessageID(READ_BYTE());
+		theBytesRead++;
+
+		// Read either number of idle soldiers
+		int theNumberPendingRequests = READ_BYTE();
+		theBytesRead++;
+
+		// Save it
+		this->mPendingRequests[theRequestType] = theNumberPendingRequests;
+	}
+	
+	return theBytesRead;
+}
+
+BIND_MESSAGE(SetOrder);
+int	AvHHud::SetOrder(const char* pszName, int iSize, void* pbuf)
+{
+	int theBytesRead = 0;
+	
+    BEGIN_READ(pbuf, iSize);
+
+	// Read status, changed or new
+	//int theStatus = READ_BYTE();
+	//theBytesRead++;
+	
+	AvHOrder theNewOrder;
+	theBytesRead += theNewOrder.ReceiveFromNetworkStream();
+	
+	AvHChangeOrder(this->mOrders, theNewOrder);
+	
+	// Give feedback on order
+	this->OrderNotification(theNewOrder);
+	
+	// Run through orders, deleting any that are complete
+	for(OrderListType::iterator theIter = this->mOrders.begin(); theIter != this->mOrders.end(); /* no inc */)
+	{
+		if(theIter->GetOrderCompleted())
+		{
+			this->mOrders.erase(theIter);
+		}
+		else
+		{
+			theIter++;
+		}
+	}
+	
+	return theBytesRead;
+}
+
+//BIND_MESSAGE(CplteOrder);
+//int	AvHHud::CplteOrder(const char* pszName, int iSize, void* pbuf)
+//{
+//	int theBytesRead = 0;
+//	
+//    BEGIN_READ(pbuf, iSize);
+//
+//	int theNumPlayers = READ_BYTE();
+//	theBytesRead++;
+//
+//	for(int i = 0; i < theNumPlayers; i++)
+//	{
+//		int thePlayerIndex = READ_BYTE();
+//		theBytesRead++;
+//
+//		AvHRemovePlayerFromOrders(this->mOrders, thePlayerIndex);
+//	}
+//
+//	return theBytesRead;
+//}	
+
+BIND_MESSAGE(SetupMap);
+int	AvHHud::SetupMap(const char* pszName, int iSize, void* pbuf)
+{
+	int theBytesRead = 0;
+	
+    BEGIN_READ(pbuf, iSize);
+
+	int theMessageType = READ_BYTE();
+	theBytesRead++;
+
+	ASSERT((theMessageType == 0) || (theMessageType == 1));
+	if(theMessageType == 0)
+	{
+		// Read map name
+		char* theMapName = READ_STRING();
+		this->mMapName = string(theMapName);
+		theBytesRead += strlen(theMapName);
+		
+		// Read map extents if entering top down mode
+		theBytesRead += this->mMapExtents.ReceiveFromNetworkStream();
+	}
+	else if(theMessageType == 1)
+	{
+		// Receiving an info location
+		// Read string
+		char* theInfoLocationName = READ_STRING();
+		theBytesRead += strlen(theInfoLocationName);
+
+		// Read max extents
+		vec3_t theMaxExtent;
+		theMaxExtent.x = READ_COORD();
+		theMaxExtent.y = READ_COORD();
+		theMaxExtent.z = 0;//READ_COORD();
+		theBytesRead += 4;
+
+		// Read min extents
+		vec3_t theMinExtent;
+		theMinExtent.x = READ_COORD();
+		theMinExtent.y = READ_COORD();
+		theMinExtent.z = 0;//READ_COORD();
+		theBytesRead += 4;
+
+		// Save info location
+		string theLocationName(theInfoLocationName);
+		AvHBaseInfoLocation theLocation(theLocationName, theMaxExtent, theMinExtent);
+		this->mInfoLocationList.push_back(theLocation);
+	}
+	
+	return theBytesRead;
+}
+
+  
+BIND_MESSAGE(SetTopDown);
+int	AvHHud::SetTopDown(const char* pszName, int iSize, void* pbuf)
+{
+	int theBytesRead = 0;
+	
+    BEGIN_READ(pbuf, iSize);
+
+	bool theSendingTechSlots = READ_BYTE();
+
+	if(!theSendingTechSlots)
+	{
+		BYTE theTopDownMode = READ_BYTE();
+		theBytesRead += 1;
+		
+		if(this->mInTopDownMode && !theTopDownMode)
+		{
+			// Switch away from top down mode
+			this->mInTopDownMode = false;
+			this->ToggleMouse();
+		
+			// Reset angles
+			gViewAngles[0] = READ_COORD();
+			gViewAngles[1] = READ_COORD();
+			gViewAngles[2] = READ_COORD();
+			theBytesRead += 6;
+		
+			gResetViewAngles = true;
+		
+			this->mSelectionEffects.clear();
+		}
+		else if(!this->mInTopDownMode && theTopDownMode)
+		{
+			// Switch to top down mode!
+			this->mInTopDownMode = true;
+			this->ToggleMouse();
+		}
+		
+		if(theTopDownMode)
+		{
+			// Read new PAS
+			this->mCommanderPAS.x = READ_COORD();
+			this->mCommanderPAS.y = READ_COORD();
+			this->mCommanderPAS.z = READ_COORD();
+			theBytesRead += 6;
+		}
+	}
+	else
+	{
+		// Read data for commander menus
+		this->mMenuTechSlots = READ_LONG();
+		theBytesRead += 4;
+	}
+
+	return theBytesRead;
+}
+
+
+BIND_MESSAGE(EntHier);
+int AvHHud::EntHier(const char *pszName, int iSize, void *pbuf)
+{
+    // Fetch new chain of command from network message
+	int theBytesRead = this->mEntityHierarchy.ReceiveFromNetworkStream(iSize, pbuf);
+
+	// Print how much data we just received
+    //char theMessage[256];
+    //sprintf(theMessage, "EntityHierarchy, received %d bytes.", theBytesRead);
+	//CenterPrint(theMessage);
+
+    return theBytesRead;
+}
+
+BIND_MESSAGE(EditPS);
+int	AvHHud::EditPS(const char* pszName, int iSize, void* pbuf)
+{
+	int theNumBytesRead = 0;
+	
+    BEGIN_READ( pbuf, iSize);
+	
+	uint32 theEditParticleSystemIndex = (uint32)(READ_SHORT());
+	theNumBytesRead += 2;
+
+	AvHParticleEditorHandler::SetEditIndex(theEditParticleSystemIndex);
+
+	return theNumBytesRead;
+}
+
+BIND_MESSAGE(Fog);
+int	AvHHud::Fog(const char* pszName, int iSize, void* pbuf)
+{
+	int theNumBytesRead = 0;
+	
+    BEGIN_READ( pbuf, iSize);
+
+	// Read fog values
+	this->mFogActive = READ_BYTE();
+	theNumBytesRead++;
+
+	if(this->mFogActive)
+	{
+		this->mFogColor.x = READ_BYTE();
+		this->mFogColor.y = READ_BYTE();
+		this->mFogColor.z = READ_BYTE();
+		theNumBytesRead += 3;
+
+		this->mFogStart = READ_COORD();
+		this->mFogEnd = READ_COORD();
+		theNumBytesRead += 4;
+	}
+
+	return theNumBytesRead;
+}
+
+BIND_MESSAGE(ListPS);
+int	AvHHud::ListPS(const char* pszName, int iSize, void* pbuf)
+{
+	int theNumBytesRead = 0;
+	
+    BEGIN_READ( pbuf, iSize);
+	
+	//int theNumTemplates = READ_SHORT();
+	//theNumBytesRead += 2;
+
+	//for(int i = 0; i < theNumTemplates; i++)
+	//{
+		string theTemplateName = READ_STRING();
+		theNumBytesRead += theTemplateName.length();
+
+		this->m_SayText.SayTextPrint(theTemplateName.c_str(), 256, 0);
+	//}
+
+	return theNumBytesRead;
+}
+
+BIND_MESSAGE(Reinfor);
+int	AvHHud::Reinfor(const char* pszName, int iSize, void* pbuf)
+{
+	int theNumBytesRead = 0;
+	
+    BEGIN_READ( pbuf, iSize);
+	
+	int theReinforcements = READ_SHORT();
+	theNumBytesRead += 2;
+
+	this->SetReinforcements(theReinforcements);
+	
+	return theNumBytesRead;
+}
+
+BIND_MESSAGE(PlayHUDNot);
+int AvHHud::PlayHUDNot(const char* pszName, int iSize, void* pbuf)
+{
+	int theBytesRead = 0;
+    BEGIN_READ( pbuf, iSize);
+
+	int theHUDNotType = READ_BYTE();
+	theBytesRead++;
+
+	int theHUDNotData = READ_BYTE();
+	theBytesRead++;
+
+	if(theHUDNotType == 0)
+	{
+		AvHHUDSound theSound = (AvHHUDSound)theHUDNotData;
+
+		// Added by mmcguire.
+        float theX = READ_COORD();
+		float theY = READ_COORD();
+		theBytesRead += 4;
+		
+		// Hack to avoid adding another network message (at max)
+		if(!this->GetInTopDownMode())
+		{
+			switch(theSound)
+			{
+			case HUD_SOUND_SQUAD1:
+				this->mCurrentSquad = 1;
+				break;
+			case HUD_SOUND_SQUAD2:
+				this->mCurrentSquad = 2;
+				break;
+			case HUD_SOUND_SQUAD3:
+				this->mCurrentSquad = 3;
+				break;
+			case HUD_SOUND_SQUAD4:
+				this->mCurrentSquad = 4;
+				break;
+			case HUD_SOUND_SQUAD5:
+				this->mCurrentSquad = 5;
+				break;
+			}
+		}
+		else
+		{
+			switch(theSound)
+			{
+			// Danger
+			case HUD_SOUND_MARINE_SOLDIER_UNDER_ATTACK:
+			case HUD_SOUND_MARINE_BASE_UNDER_ATTACK:
+			case HUD_SOUND_MARINE_SENTRYDAMAGED:
+			case HUD_SOUND_MARINE_SOLDIERLOST:
+			case HUD_SOUND_MARINE_CCUNDERATTACK:
+				this->mBlinkingAlertType = 2;
+				AddMiniMapAlert(theX, theY);
+				break;
+		
+			// Just research or something like that
+			case HUD_SOUND_MARINE_UPGRADE_COMPLETE:
+			case HUD_SOUND_MARINE_RESEARCHCOMPLETE:
+				this->mBlinkingAlertType = 1;
+				AddMiniMapAlert(theX, theY);
+				break;
+			}
+		}
+		
+        this->PlayHUDSound(theSound);
+
+		//char theMessage[512];
+		//sprintf(theMessage, "Playing sound %d in HUD\n", theSound );
+		//ConsolePrint(theMessage);
+	
+	}
+	else
+	{
+		// Read byte for data (AvHUser3)
+		AvHMessageID theMessageID = AvHMessageID(theHUDNotData);
+
+		// Read byte for source player
+		//int theSourcePlayer = READ_BYTE();
+		//theBytesRead++;
+
+		// Location
+		float theX = READ_COORD();
+		float theY = READ_COORD();
+		theBytesRead += 4;
+
+		// Push back icon
+		HUDNotificationType theNotification;
+		theNotification.mStructureID = theMessageID;
+		theNotification.mTime = this->mTimeOfCurrentUpdate;
+		//theNotification.mPlayerIndex = theSourcePlayer;
+		theNotification.mLocation = Vector(theX, theY, 0.0f);
+
+		if(CVAR_GET_FLOAT(kvBuildMessages))
+		{
+			this->mStructureNotificationList.push_back(theNotification);
+		}
+	}
+
+	return theBytesRead;
+}
+
+BIND_MESSAGE(AlienInfo);
+int	AvHHud::AlienInfo(const char* pszName, int iSize, void* pbuf)
+{
+	int theNumBytesRead = 0;
+	
+    BEGIN_READ( pbuf, iSize);
+
+	// 0 means upgrades, 1 means hive info
+	int theMessageType = READ_BYTE();
+	theNumBytesRead++;
+
+	if(theMessageType == 0)
+	{
+		// Read upgrades
+		int theNumUpgrades = READ_BYTE();
+		theNumBytesRead++;
+		
+		this->mUpgrades.clear();
+		for(int i = 0; i < theNumUpgrades; i++)
+		{
+			AvHAlienUpgradeCategory theUpgradeCategory = AvHAlienUpgradeCategory(READ_BYTE());
+			this->mUpgrades.push_back(theUpgradeCategory);
+			theNumBytesRead++;
+		}
+	}
+	else if(theMessageType == 1)
+	{
+		// Read num hives
+		int theNumHives = READ_BYTE();
+		theNumBytesRead++;
+
+		// For each hive, read if it changed or not
+		for(int i = 0; i < theNumHives; i++)
+		{
+			int theHiveInfoChanged = READ_BYTE();
+			theNumBytesRead++;
+
+			if(theHiveInfoChanged)
+			{
+				float theX = 0;
+				float theY = 0;
+				float theZ = 0;
+
+				// Sending coords for hive?
+				int theSentCoords = READ_BYTE();
+				theNumBytesRead++;
+
+				if(theSentCoords)
+				{
+					theX = READ_COORD();
+					theY = READ_COORD();
+					theZ = READ_COORD();
+					theNumBytesRead += 6;
+				}
+				else if((int)this->mHiveInfoList.size() > i)
+				{
+					// Preserve existing coords
+					theX = this->mHiveInfoList[i].mPosX;
+					theY = this->mHiveInfoList[i].mPosY;
+					theZ = this->mHiveInfoList[i].mPosZ;
+				}
+				else
+				{
+					int a = 0;
+				}
+
+				AvHHiveInfo theHiveInfo;
+				theHiveInfo.mPosX = theX;
+				theHiveInfo.mPosY = theY;
+				theHiveInfo.mPosZ = theZ;
+
+				theHiveInfo.mStatus = READ_BYTE();
+				theHiveInfo.mUnderAttack = READ_BYTE();
+				theHiveInfo.mTechnology = READ_SHORT();
+				theNumBytesRead += 4;
+				
+				theHiveInfo.mHealthPercentage = READ_BYTE();
+				theNumBytesRead += 1;
+
+				
+				// Add or replace
+				if((int)this->mHiveInfoList.size() <= i)
+				{
+					this->mHiveInfoList.push_back(theHiveInfo);
+				}
+				else
+				{
+					this->mHiveInfoList[i] = theHiveInfo;
+				}
+			}
+		}
+	}
+	else
+	{
+		ASSERT(false);
+	}
+	
+	return theNumBytesRead;
+}
+
+void AvHHud::PlayHUDSound(const char *szSound, float vol, float inSoundLength) 
+{ 
+	if((this->mTimeOfNextHudSound == -1) || (this->mTimeOfCurrentUpdate > this->mTimeOfNextHudSound))
+	{
+		if(szSound)
+		{
+			char theSoundName[512];
+			strcpy(theSoundName, szSound);
+			gEngfuncs.pfnPlaySoundByName(theSoundName, vol); 
+			this->mTimeOfNextHudSound = this->mTimeOfCurrentUpdate + inSoundLength;
+		}
+	}
+}
+
+void AvHHud::PlayHUDSound(int iSound, float vol, float inSoundLength) 
+{ 
+	if((this->mTimeOfNextHudSound == -1) || (this->mTimeOfCurrentUpdate > this->mTimeOfNextHudSound))
+	{
+		gEngfuncs.pfnPlaySoundByIndex(iSound, vol); 
+		this->mTimeOfNextHudSound = this->mTimeOfCurrentUpdate + inSoundLength;
+	}
+}
+
+void AvHHud::PlayHUDSound(AvHHUDSound inSound)
+{
+	char* theSoundPtr = NULL;
+	float theVolume = 1.0f;
+
+    // Some sounds are forced, but don't allow them to be spammed or cut themselves off
+    bool theForceSound = AvHSHUGetForceHUDSound(inSound) && (inSound != this->mLastHUDSoundPlayed);
+
+	// tankefugl: 0000407
+	bool theAutoHelpEnabled = gEngfuncs.pfnGetCvarFloat(kvAutoHelp);
+	// :tankefugl
+
+	if((this->mTimeOfNextHudSound == -1) || (this->mTimeOfCurrentUpdate >= this->mTimeOfNextHudSound) || theForceSound)
+	{
+		float theSoundLength = 2.0f;
+
+		switch(inSound)
+		{
+		case HUD_SOUND_POINTS_SPENT:
+			theSoundPtr = kPointsSpentSound;
+			theSoundLength = .2f;
+			break;
+		case HUD_SOUND_COUNTDOWN:
+			theSoundPtr = kCountdownSound;
+			theSoundLength = 0.0f;
+			break;
+		case HUD_SOUND_SELECT:
+			if(gHUD.GetIsAlien())
+				theSoundPtr = kSelectAlienSound;
+			else
+				theSoundPtr = kSelectSound;
+			
+			// Set to 0 so it never blocks other sounds
+			theVolume = .2f;
+			theSoundLength = 0.0f;
+			break;
+		case HUD_SOUND_SQUAD1:
+			if(this->GetInTopDownMode())
+			{
+				theSoundPtr = kSquad1Sound;
+				theSoundLength = 1.2f;
+			}
+			else
+			{
+				theSoundPtr = kMarineSquad1Sound;
+				theSoundLength = 2.0f;
+			}
+			break;
+		case HUD_SOUND_SQUAD2:
+			if(this->GetInTopDownMode())
+			{
+				theSoundPtr = kSquad2Sound;
+				theSoundLength = 1.2f;
+			}
+			else
+			{
+				theSoundPtr = kMarineSquad2Sound;
+				theSoundLength = 2.0f;
+			}
+			break;
+		case HUD_SOUND_SQUAD3:
+			if(this->GetInTopDownMode())
+			{
+				theSoundPtr = kSquad3Sound;
+				theSoundLength = 1.2f;
+			}
+			else
+			{
+				theSoundPtr = kMarineSquad3Sound;
+				theSoundLength = 2.0f;
+			}
+			break;
+		case HUD_SOUND_SQUAD4:
+			if(this->GetInTopDownMode())
+			{
+				theSoundPtr = kSquad4Sound;
+				theSoundLength = 1.2f;
+			}
+			else
+			{
+				theSoundPtr = kMarineSquad4Sound;
+				theSoundLength = 2.0f;
+			}
+			break;
+		case HUD_SOUND_SQUAD5:
+			if(this->GetInTopDownMode())
+			{
+				theSoundPtr = kSquad5Sound;
+				theSoundLength = 1.2f;
+			}
+			else
+			{
+				theSoundPtr = kMarineSquad5Sound;
+				theSoundLength = 2.0f;
+			}
+			break;
+		case HUD_SOUND_PLACE_BUILDING:
+			theSoundPtr = kPlaceBuildingSound;
+			theSoundLength = .2f;
+			break;
+
+		case HUD_SOUND_MARINE_POINTS_RECEIVED:
+			theSoundPtr = kMarinePointsReceivedSound;
+			theSoundLength = 1.42f;
+			break;
+		
+		case HUD_SOUND_MARINE_RESEARCHCOMPLETE:
+			theSoundPtr = kMarineResearchComplete;
+			theSoundLength = 2.0f;
+			break;
+		case HUD_SOUND_MARINE_SOLDIER_UNDER_ATTACK:
+			theSoundPtr = kMarineSoldierUnderAttack;
+			theSoundLength = 3.0f;
+			break;
+		case HUD_SOUND_MARINE_CCONLINE:
+			if(rand() % 2)
+			{
+				theSoundPtr = kMarineCCOnline1;
+			}
+			else
+			{
+				theSoundPtr = kMarineCCOnline2;
+			}
+			theSoundLength = 2.3f;
+			break;
+		case HUD_SOUND_MARINE_CCUNDERATTACK:
+			if(rand() % 2)
+			{
+				theSoundPtr = kMarineCCUnderAttack1;
+			}
+			else
+			{
+				theSoundPtr = kMarineCCUnderAttack2;
+			}
+			theSoundLength = 3.0f;
+			break;
+		case HUD_SOUND_MARINE_COMMANDER_EJECTED:
+			theSoundPtr = kMarineCommanderEjected;
+			theSoundLength = 3.0f;
+			break;
+		case HUD_SOUND_MARINE_BASE_UNDER_ATTACK:
+			if(rand() % 2)
+			{
+				theSoundPtr = kMarineBaseUnderAttack1;
+			}
+			else
+			{
+				theSoundPtr = kMarineBaseUnderAttack2;
+			}
+			theSoundLength = 3.0f;
+			break;
+		case HUD_SOUND_MARINE_UPGRADE_COMPLETE:
+			theSoundPtr = kMarineUpgradeComplete;
+			theSoundLength = 1.0f;
+			break;
+		case HUD_SOUND_MARINE_MORE:
+			theSoundPtr = kMarineMoreResources;
+			theSoundLength = 1.8f;
+			break;
+		case HUD_SOUND_MARINE_RESOURCES_LOW:
+			theSoundPtr = kMarineLowResources;
+			theSoundLength = 2.0f;
+			break;
+		case HUD_SOUND_MARINE_NEEDS_AMMO:
+			if(rand() % 2)
+				theSoundPtr = kMarineNeedsAmmo1;
+			else
+				theSoundPtr = kMarineNeedsAmmo2;
+			theSoundLength = 1.5f;
+			break;
+		case HUD_SOUND_MARINE_NEEDS_HEALTH:
+			if(rand() % 2)
+				theSoundPtr = kMarineNeedsHealth1;
+			else
+				theSoundPtr = kMarineNeedsHealth2;
+			theSoundLength = 1.3f;
+			break;
+
+		case HUD_SOUND_MARINE_NEEDS_ORDER:
+			if(rand() % 2)
+				theSoundPtr = kMarineNeedsOrder1;
+			else
+				theSoundPtr = kMarineNeedsOrder2;
+			theSoundLength = 1.5f;
+			break;
+
+		case HUD_SOUND_MARINE_SOLDIER_LOST:
+			if(rand() % 2)
+				theSoundPtr = kMarineSoldierLost1;
+			else
+				theSoundPtr = kMarineSoldierLost2;
+			theSoundLength = 1.3f;
+			break;
+		case HUD_SOUND_MARINE_SENTRYFIRING:
+			if(rand() % 2)
+				theSoundPtr = kMarineSentryFiring1;
+			else
+				theSoundPtr = kMarineSentryFiring2;
+			theSoundLength = 1.3f;
+			break;
+		case HUD_SOUND_MARINE_SENTRYDAMAGED:
+			if(rand() % 2)
+				theSoundPtr = kMarineSentryTakingDamage1;
+			else
+				theSoundPtr = kMarineSentryTakingDamage2;
+			theSoundLength = 1.5f;
+			break;
+
+		case HUD_SOUND_MARINE_GIVEORDERS:
+			// tankefugl: 0000407
+			if (theAutoHelpEnabled) 
+			{
+				theSoundPtr = kMarineGiveOrders;
+				theSoundLength = 2.2f;
+			}
+			// :tankefugl
+			break;
+
+		case HUD_SOUND_MARINE_NEEDPORTAL:
+			// tankefugl: 0000407
+			if (theAutoHelpEnabled) 
+			{
+				if(rand() % 2)
+					theSoundPtr = kMarineNeedPortal1;
+				else
+					theSoundPtr = kMarineNeedPortal2;
+				theSoundLength = 1.8f;
+			}
+			// :tankefugl
+			break;
+
+		case HUD_SOUND_MARINE_GOTOALERT:
+			// tankefugl: 0000407
+			if (theAutoHelpEnabled) 
+			{
+				theSoundPtr = kMarineGotoAlert;
+				theSoundLength = 2.2f;
+			}
+			// :tankefugl
+			break;
+
+		case HUD_SOUND_MARINE_COMMANDERIDLE:
+			// tankefugl: 0000407
+			if (theAutoHelpEnabled) 
+			{
+				if(rand() % 2)
+					theSoundPtr = kMarineCommanderIdle1;
+				else
+					theSoundPtr = kMarineCommanderIdle2;
+				theSoundLength = 1.5f;
+			}
+			// :tankefugl
+			break;
+
+		case HUD_SOUND_MARINE_ARMORYUPGRADING:
+			theSoundPtr = kMarineArmoryUpgrading;
+			theSoundLength = 3.4;
+			break;
+
+		case HUD_SOUND_ALIEN_ENEMY_APPROACHES:
+			if(rand() %2)
+				theSoundPtr = kAlienEnemyApproaches1;
+			else
+				theSoundPtr = kAlienEnemyApproaches2;
+			theSoundLength = 1.6;
+			break;
+
+		case HUD_SOUND_ALIEN_GAMEOVERMAN:
+			theSoundPtr = kAlienGameOverMan;
+			theSoundLength = 2.2f;
+			break;
+
+		case HUD_SOUND_ALIEN_HIVE_ATTACK:
+			theSoundPtr = kAlienHiveAttack;
+			theSoundLength = 1.6f;
+			break;
+		case HUD_SOUND_ALIEN_HIVE_COMPLETE:
+			if(rand() % 2)
+				theSoundPtr = kAlienHiveComplete1;
+			else
+				theSoundPtr = kAlienHiveComplete2;
+			theSoundLength = 2.1f;
+			break;
+		case HUD_SOUND_ALIEN_HIVE_DYING:
+			if(rand() % 2)
+			{
+				theSoundPtr = kAlienHiveDying1;
+				theSoundLength = 1.7f;
+			}
+			else
+			{
+				theSoundPtr = kAlienHiveDying2;
+				theSoundLength = 2.4f;
+			}
+			break;
+		case HUD_SOUND_ALIEN_LIFEFORM_ATTACK:
+			if(rand() % 2)
+				theSoundPtr = kAlienLifeformAttack1;
+			else
+				theSoundPtr = kAlienLifeformAttack2;
+			theSoundLength = 1.8f;
+			break;
+		case HUD_SOUND_ALIEN_RESOURCES_LOW:
+			theSoundPtr = kAlienLowResources;
+			theSoundLength = 1.7f;
+			break;
+		case HUD_SOUND_ALIEN_MESS:
+			theSoundPtr = kAlienMess;
+			theSoundLength = 2.0f;
+			break;
+		case HUD_SOUND_ALIEN_MORE:
+			if(rand() % 2)
+				theSoundPtr = kAlienMoreResources1;
+			else
+				theSoundPtr = kAlienMoreResources2;
+			theSoundLength = 1.8f;
+			break;
+		case HUD_SOUND_ALIEN_NEED_BUILDERS:
+			if(rand() % 2)
+				theSoundPtr = kAlienNeedBuilders1;
+			else
+				theSoundPtr = kAlienNeedBuilders2;
+			theSoundLength = 1.4f;
+			break;
+
+		case HUD_SOUND_ALIEN_NEED_BETTER:
+			theSoundPtr = kAlienNeedBetter;
+			theSoundLength = 2.5f;
+			break;
+
+		case HUD_SOUND_ALIEN_NOW_DONCE:
+			theSoundPtr = kAlienNowDonce;
+			theSoundLength = 2.1f;
+			break;
+
+		case HUD_SOUND_ALIEN_NEW_TRAIT:
+			if(rand() % 2)
+				theSoundPtr = kAlienNewTrait1;
+			else
+				theSoundPtr = kAlienNewTrait2;
+			theSoundLength = 1.5f;
+			break;
+
+		case HUD_SOUND_ALIEN_POINTS_RECEIVED:
+			theSoundPtr = kAlienPointsReceivedSound;
+			theSoundLength = 1.57f;
+			break;
+
+		case HUD_SOUND_ALIEN_RESOURCES_ATTACK:
+			if(rand() % 2)
+				theSoundPtr = kAlienResourceAttack1;
+			else
+				theSoundPtr = kAlienResourceAttack2;
+			theSoundLength = 2.1f;
+			break;
+		case HUD_SOUND_ALIEN_STRUCTURE_ATTACK:
+			if(rand() % 2)
+				theSoundPtr = kAlienStructureAttack1;
+			else
+				theSoundPtr = kAlienStructureAttack2;
+			theSoundLength = 1.9f;
+			break;
+		case HUD_SOUND_ALIEN_UPGRADELOST:
+			theSoundPtr = kAlienUpgradeLost;
+			theSoundLength = 1.5f;
+			break;
+		
+		case HUD_SOUND_ORDER_MOVE:
+			switch(rand() % 4)
+			{
+			case 0:
+				theSoundPtr = kSoundOrderMove1;
+				theSoundLength = 1.8f;
+				break;
+			case 1:
+				theSoundPtr = kSoundOrderMove2;
+				theSoundLength = 2.3f;
+				break;
+			case 2:
+				theSoundPtr = kSoundOrderMove3;
+				theSoundLength = 1.9f;
+				break;
+			case 3:
+				theSoundPtr = kSoundOrderMove4;
+				theSoundLength = 2.3f;
+				break;
+			}
+			break;
+		case HUD_SOUND_ORDER_ATTACK:
+			theSoundPtr = kSoundOrderAttack;
+			break;
+		case HUD_SOUND_ORDER_BUILD:
+			theSoundPtr = kSoundOrderBuild;
+			break;
+		case HUD_SOUND_ORDER_WELD:
+			theSoundPtr = kSoundOrderWeld;
+			break;
+		case HUD_SOUND_ORDER_GUARD:
+			theSoundPtr = kSoundOrderGuard;
+			break;
+		case HUD_SOUND_ORDER_GET:
+			theSoundPtr = kSoundOrderGet;
+			break;
+
+		case HUD_SOUND_ORDER_COMPLETE:
+			switch(rand() % 6)
+			{
+			case 0:
+				theSoundPtr = kSoundOrderComplete1;
+				theSoundLength = 1.6f;
+				break;
+			case 1:
+				theSoundPtr = kSoundOrderComplete2;
+				theSoundLength = 1.9f;
+				break;
+			case 2:
+				theSoundPtr = kSoundOrderComplete3;
+				theSoundLength = 1.9f;
+				break;
+			case 3:
+				theSoundPtr = kSoundOrderComplete4;
+				theSoundLength = 1.4f;
+				break;
+			case 4:
+				theSoundPtr = kSoundOrderComplete5;
+				theSoundLength = 1.6f;
+				break;
+			case 5:
+				theSoundPtr = kSoundOrderComplete6;
+				theSoundLength = 1.4f;
+				break;
+			}
+			break;
+
+		case HUD_SOUND_GAMESTART:
+			if(this->GetIsMarine())
+			{
+				if(rand() % 2)
+					theSoundPtr = kMarineGameStart1;
+				else
+					theSoundPtr = kMarineGameStart2;
+				theSoundLength = 1.9f;
+			}
+			else if(this->GetIsAlien())
+			{
+				if(rand() % 2)
+					theSoundPtr = kAlienGameStart1;
+				else
+					theSoundPtr = kAlienGameStart2;
+				theSoundLength = 2.2f;
+			}
+			break;
+			
+		case HUD_SOUND_YOU_WIN:
+			theSoundPtr = kYouWinSound;
+			theSoundLength = 6.0f;
+			break;
+		case HUD_SOUND_YOU_LOSE:
+			theSoundPtr = kYouLoseSound;
+			theSoundLength = 6.0f;
+			break;
+		case HUD_SOUND_TOOLTIP:
+			theSoundPtr = kTooltipSound;
+			// Tooltip sounds should never stop other sounds
+			theSoundLength = -1.0f;
+			theVolume = .6f;
+			break;
+		// joev: bug 0000767
+		case HUD_SOUND_PLAYERJOIN:
+			theSoundPtr = kPlayerJoinedSound;
+			theSoundLength = 3.0f;
+			theVolume = 1.1;
+			break;
+		// :joev
+		}
+		
+		if(theSoundPtr)
+		{
+			gEngfuncs.pfnPlaySoundByName(theSoundPtr, theVolume);
+			// char theMessage[512];
+			// sprintf(theMessage, "Playing HUD sound %s, volume %f in HUD using gEngfuncs.pfnPlaySoundByName\n", theSoundPtr, theVolume );
+			// ConsolePrint(theMessage);
+			if(theSoundLength >= 0.0f)
+			{
+				this->mTimeOfNextHudSound = this->mTimeOfCurrentUpdate + theSoundLength;
+			}
+            this->mLastHUDSoundPlayed = inSound;
+		}
+	}
+}
+
+//BIND_MESSAGE(SetRole);
+//int AvHHud::SetRole(const char* pszName, int iSize, void* pbuf)
+//{
+//	int theBytesRead = 0;
+//
+//	// Fetch play mode from network message
+//    BEGIN_READ( pbuf, iSize);
+//    int theNewRole = READ_BYTE();
+//	this->mRole = AvHRole(theNewRole);
+//	theBytesRead++;
+//	
+//	AvHTeamNumber theTeam = (AvHTeamNumber)(READ_BYTE());
+//
+//	// When switching sides, zero out visible resources (prevents weird behavior when going from marine team to aliens especially)
+////	if(this->mTeam != theTeam)
+////	{
+////		this->mVisualResources = 0;
+////		this->mUser2OfLastResourceMessage = 0;
+////
+////		this->mVisualEnergyLevel = 0;
+////		this->mUser2OfLastEnergyLevel = 0;
+////
+////		// Remove HUD indication of current squad
+////		this->mCurrentSquad = 0;
+////	}
+////
+////	this->mTeam = theTeam;
+//	theBytesRead++;
+//
+//	// Resources always visible these days
+//	//if(this->mResourceLabel)
+//	//	this->mResourceLabel->setVisible(true);
+//
+//	this->mGhostBuilding = MESSAGE_NULL;
+//	
+//	this->mReticleInfoText = "";
+//
+//	// Set default color for tooltip
+////	int theR, theG, theB;
+////	this->GetPrimaryHudColor(theR, theG, theB);
+////	this->mReticleTooltip.SetR(theR);
+////	this->mReticleTooltip.SetG(theG);
+////	this->mReticleTooltip.SetB(theB);
+//	
+//	this->mTooltips.clear();
+//
+//	return theBytesRead;
+//}
+
+BIND_MESSAGE(SetTech);
+int	AvHHud::SetTech(const char* pszName, int iSize, void* pbuf)
+{
+	int theBytesRead = 0;
+
+    BEGIN_READ( pbuf, iSize);
+
+	//AvHTechNodes theTechNodes;
+	//theBytesRead += theTechNodes.ReceiveFromNetworkStream();
+	//
+	//this->mTechNodes = theTechNodes;
+
+	int theIndex = READ_SHORT();
+	theBytesRead += 2;
+
+	AvHTechNode theTechNode;
+	theBytesRead += theTechNode.ReceiveFromNetworkStream();
+
+	if(!this->mTechNodes.SetTechNode(theIndex, theTechNode))
+	{
+		ASSERT(false);
+	}
+
+	//AvHActionButtons* theActionButtons = NULL;
+	//if(this->GetManager().GetVGUIComponentNamed(kActionButtonsComponents, theActionButtons))
+	//{
+	//	theActionButtons->SetTechNodes(theTechNodes);
+	//}
+
+//	AvHTechButtons* theTechButtons = NULL;
+//	if(this->GetManager().GetVGUIComponentNamed(theCategoryName, theTechButtons))
+//	{
+//		theTechButtons->SetTechNodes(theTechNodes);
+//	}
+
+	return theBytesRead;
+}
+
+BIND_MESSAGE(TechSlots);
+int AvHHud::TechSlots(const char* pszName, int iSize, void* pbuf)
+{
+	int theBytesRead = 0;
+
+    BEGIN_READ( pbuf, iSize);
+
+	//int theIndex = READ_SHORT();
+	//theBytesRead += 2;
+
+	AvHTechSlots theNewTechSlots;
+	theBytesRead += theNewTechSlots.ReceiveFromNetworkStream();
+
+	this->mTechSlotManager.AddTechSlots(theNewTechSlots);
+
+	return theBytesRead;
+}
+
+BIND_MESSAGE(DebugCSP);
+int	AvHHud::DebugCSP(const char* pszName, int iSize, void* pbuf)
+{
+	int theBytesRead = 0;
+
+    BEGIN_READ( pbuf, iSize);
+
+	int theID = READ_LONG();
+	int theClip = READ_LONG();
+	theBytesRead += 8;
+
+	float theNextPrimaryAttack = READ_COORD();
+	float theTimeWeaponIdle = READ_COORD();
+	theBytesRead += 4;
+
+	float theNextAttack = READ_COORD();
+	theBytesRead += 2;
+
+	char theServerInfoString[512];
+	sprintf(theServerInfoString, "Server: id: %d, clip: %d, prim attack: %f, idle: %f, next attack: %f", theID, theClip, theNextPrimaryAttack, theTimeWeaponIdle, theNextAttack);
+		
+	vgui::Label* theLabel = NULL;
+	if(this->GetManager().GetVGUIComponentNamed(kDebugCSPServerLabel, theLabel))
+	{
+		theLabel->setText(theServerInfoString);
+	}
+	
+	return theBytesRead;
+}
+
+//BIND_MESSAGE(GivePlayerItem);
+//int AvHHud::GivePlayerItem(const char* pszName, int iSize, void *pbuf)
+//{
+//    BEGIN_READ( pbuf, iSize);
+//    int theItem = READ_LONG();
+//
+//    // Give player item
+//
+//    return 4;
+//}
+
+AvHVisibleBlipList&	AvHHud::GetEnemyBlipList()
+{
+	return this->mEnemyBlips;
+}
+
+AvHEntityHierarchy& AvHHud::GetEntityHierarchy()
+{
+	return this->mEntityHierarchy;
+}
+
+AvHVisibleBlipList&	AvHHud::GetFriendlyBlipList()
+{
+	return this->mFriendlyBlips;
+}
+
+bool AvHHud::GetMouseOneDown() const
+{
+	return this->mMouseOneDown;
+}
+
+bool AvHHud::GetMouseTwoDown() const
+{
+	return this->mMouseTwoDown;
+}
+
+void AvHHud::HideProgressStatus()
+{
+	if(this->mGenericProgressBar)
+	{
+		this->mGenericProgressBar->setVisible(false);
+	}
+
+	if(this->mAlienProgressBar)
+	{
+		this->mAlienProgressBar->setVisible(false);
+	}
+}
+
+void AvHHud::HideResearchProgressStatus()
+{
+	if(this->mResearchProgressBar)
+	{
+		this->mResearchProgressBar->setVisible(false);
+		this->mResearchLabel->setVisible(false);
+	}
+}
+
+void AvHHud::Init(void)
+{
+    UIHud::Init();
+
+    HOOK_MESSAGE(EntHier);
+	HOOK_MESSAGE(Particles);
+	HOOK_MESSAGE(SoundNames);
+	HOOK_MESSAGE(PlayHUDNot);
+//	HOOK_MESSAGE(ChangeNode);
+
+	#ifdef AVH_PLAYTEST_BUILD
+	HOOK_MESSAGE(BalanceVar);
+	#endif
+
+	HOOK_MESSAGE(GameStatus);
+	//HOOK_MESSAGE(NetSS);
+	HOOK_MESSAGE(Progress);
+	HOOK_MESSAGE(Countdown);
+	HOOK_MESSAGE(MiniMap);
+	HOOK_MESSAGE(SetOrder);
+	//HOOK_MESSAGE(CplteOrder);
+	HOOK_MESSAGE(SetSelect);
+	HOOK_MESSAGE(SetupMap);
+	HOOK_MESSAGE(SetTopDown);
+	HOOK_MESSAGE(SetTech);
+	HOOK_MESSAGE(EditPS);
+	HOOK_MESSAGE(Fog);
+	HOOK_MESSAGE(ListPS);
+	HOOK_MESSAGE(Reinfor);
+	HOOK_MESSAGE(SetGmma);
+	HOOK_MESSAGE(BlipList);
+	HOOK_MESSAGE(ClScript);
+	HOOK_MESSAGE(AlienInfo);
+	HOOK_MESSAGE(DebugCSP);
+	HOOK_MESSAGE(TechSlots);
+
+    HOOK_MESSAGE(ServerVar);
+	
+	this->AddCommands();
+
+	this->mCountDownClock = -1;
+
+    mOverviewMap.Clear();
+
+	this->mEntityHierarchy.Clear();
+	//this->mUpgradeCosts.clear();
+
+	sPregameGammaTable.InitializeFromVideoState();
+	sGameGammaTable.InitializeFromVideoState();
+
+	int theRC = atexit(AvHHud::ResetGammaAtExit);
+	_onexit_t theExit = _onexit(AvHHud::ResetGammaAtExitForOnExit);
+	
+	signal(SIGILL, AvHHud::ResetGammaAtExit);
+	signal(SIGFPE, AvHHud::ResetGammaAtExit);
+	signal(SIGSEGV, AvHHud::ResetGammaAtExit);
+	signal(SIGTERM, AvHHud::ResetGammaAtExit);
+	signal(SIGBREAK, AvHHud::ResetGammaAtExit);
+	signal(SIGABRT, AvHHud::ResetGammaAtExit);
+
+	//memset(this->mAlienUILifeforms, 0, sizeof(HSPRITE)*kNumAlienLifeforms);
+	this->mAlienUIUpgrades = 0;
+	this->mAlienUIUpgradeCategories = 0;
+	this->mOrderSprite = 0;
+	this->mCursorSprite = 0;
+	this->mMarineCursor = 0;
+	this->mAlienCursor = 0;
+
+	this->mMarineUIJetpackSprite = 0;
+	this->mMembraneSprite = 0;
+	this->mBackgroundSprite = 0;
+
+	this->mProgressBarEntityIndex = -1;
+	this->mProgressBarParam = -1;
+	this->mSelectedNodeResourceCost = -1;
+	this->mCurrentUseableEnergyLevel = 0;
+	this->mVisualEnergyLevel = 0.0f;
+
+	this->mFogActive = false;
+	this->mFogColor.x = this->mFogColor.y = this->mFogColor.z = 0;
+	this->mFogStart = 0;
+	this->mFogEnd = 0;
+
+	this->mLocationText = "";
+	this->mInfoLocationList.clear();
+	
+	this->mLastHotkeySelectionEvent = MESSAGE_NULL;
+	this->mUpgrades.clear();
+
+	this->mLastGhostBuilding = NULL;
+	this->mReticleInfoText = "";
+	this->mSelectingWeaponID = -1;
+	this->mSelectingNodeID = MESSAGE_NULL;
+	this->mDesiredGammaSlope = 1;
+	this->mTimeOfLastHelpText = -1;
+	this->mCurrentWeaponID = -1;
+	this->mCurrentWeaponEnabled = false;
+	this->mCurrentUIMode = MAIN_MODE;
+	this->mMenuTechSlots = 0;
+	this->mBlinkingAlertType = 0;
+	this->mLastUser3 = AVH_USER3_NONE;
+	this->mLastTeamNumber = TEAM_IND;
+	this->mLastPlayMode = PLAYMODE_UNDEFINED;
+
+    this->mCrosshairShowCount = 1;
+    this->mCrosshairSprite    = 0;
+    this->mCrosshairR         = 0;
+    this->mCrosshairG         = 0;
+    this->mCrosshairB         = 0;
+
+	this->mDrawCombatUpgradeMenu = false;
+
+	// Initialize viewport
+	this->mViewport[0] = this->mViewport[1] = this->mViewport[2] = this->mViewport[3] = 0;
+
+	gl_monolights = gEngfuncs.pfnGetCvarPointer("gl_monolights");
+	gl_overbright = gEngfuncs.pfnGetCvarPointer("gl_overbright");
+	gl_clear = gEngfuncs.pfnGetCvarPointer("gl_clear");
+	hud_draw = gEngfuncs.pfnGetCvarPointer("hud_draw");
+	r_drawviewmodel = gEngfuncs.pfnGetCvarPointer("r_drawviewmodel");
+	gl_d3dflip = gEngfuncs.pfnGetCvarPointer("gl_d3dflip");
+	s_show = gEngfuncs.pfnGetCvarPointer("s_show");
+	lightgamma = gEngfuncs.pfnGetCvarPointer("lightgamma");
+	r_detailtextures = gEngfuncs.pfnGetCvarPointer("r_detailtextures");
+}
+
+// This gives the HUD a chance to draw after the VGUI.  A component must allow itself to be hooked by calling this function
+// at the end of it's paint() routine.  This is done so the mouse cursor can draw on top of the other components.
+void AvHHud::ComponentJustPainted(Panel* inPanel)
+{
+//	if(this->GetInTopDownMode())
+//	{
+//		AvHTeamHierarchy* theComponent = dynamic_cast<AvHTeamHierarchy*>(inPanel);
+//		if(theComponent)
+//		{
+//			int theBasePosX;
+//			int theBasePosY;
+//			theComponent->getPos(theBasePosX, theBasePosY);
+//			this->DrawMouseCursor(theBasePosX, theBasePosY);
+//		}
+//	}
+//	else
+//	{
+//		PieMenu* theComponent = dynamic_cast<PieMenu*>(inPanel);
+//		if(theComponent)
+//		{
+//			int theBasePosX;
+//			int theBasePosY;
+//			theComponent->getPos(theBasePosX, theBasePosY);
+//			this->DrawMouseCursor(theBasePosX, theBasePosY);
+//		}
+//	}
+
+
+	DummyPanel* theComponent = dynamic_cast<DummyPanel*>(inPanel);
+	if(theComponent)
+	{
+		int theBasePosX;
+		int theBasePosY;
+		theComponent->getPos(theBasePosX, theBasePosY);
+		this->DrawMouseCursor(theBasePosX, theBasePosY);
+	}
+
+}
+
+bool AvHHud::SetCursor(AvHOrderType inOrderType)
+{
+	bool theSuccess = false;
+
+	if(!this->GetIsAlien())
+	{
+		this->mCursorSprite = this->mMarineCursor;
+
+		if((inOrderType >= 0) && (inOrderType < ORDERTYPE_MAX))
+		{
+			this->mCurrentCursorFrame = (int)(inOrderType);
+			theSuccess = true;
+		}
+		// Change cursor when over a valid choice
+		if(this->mSelectingNodeID > 0)
+		{
+			this->mCurrentCursorFrame = 1;
+			theSuccess = true;
+		}
+	}
+	else
+	{
+		this->mCursorSprite = this->mAlienCursor;
+		this->mCurrentCursorFrame = 0;
+
+		if(this->mSelectingNodeID > 0)
+		{
+			// Set cursor to lifeform to evolve to
+			switch(this->mSelectingNodeID)
+			{
+			case ALIEN_LIFEFORM_ONE:
+			case ALIEN_LIFEFORM_TWO:
+			case ALIEN_LIFEFORM_THREE:
+			case ALIEN_LIFEFORM_FOUR:
+			case ALIEN_LIFEFORM_FIVE:
+				this->mCurrentCursorFrame = 2 + (int)this->mSelectingNodeID - (int)ALIEN_LIFEFORM_ONE;
+				break;
+			
+			default:
+				this->mCurrentCursorFrame = 1;
+				break;
+			}
+		}
+
+		theSuccess = true;
+	}
+	
+	//	Scheme::SchemeCursor theSchemeCursor = Scheme::SchemeCursor::scu_arrow;
+	//	//Scheme::SchemeCursor theSchemeCursor = Scheme::SchemeCursor::scu_no;
+	//		
+	//	switch(inOrderType)
+	//	{
+	////	case ORDERTYPE_UNDEFINED:
+	////		theSchemeCursor = Scheme::SchemeCursor::scu_no;
+	////		theSuccess = true;
+	////		break;
+	//
+	//	//case ORDERTYPEL_MOVE:
+	//
+	//	case ORDERTYPET_ATTACK:
+	//	case ORDERTYPET_GUARD:
+	//	case ORDERTYPET_WELD:
+	//	case ORDERTYPET_BUILD:
+	//	case ORDERTYPEL_USE:
+	//	case ORDERTYPET_GET:
+	//		theSchemeCursor = Scheme::SchemeCursor::scu_hand;
+	//		theSuccess = true;
+	//		break;
+	//	}
+	//
+	//	App::getInstance()->setCursorOveride( App::getInstance()->getScheme()->getCursor(theSchemeCursor));
+	
+	return theSuccess;
+}
+
+void AvHHud::GetCursor(HSPRITE& outSprite, int& outFrame)
+{
+
+    if (g_iUser1 == 0)
+    {
+        outSprite = mCursorSprite;
+        outFrame  = mCurrentCursorFrame;
+    }
+    else
+    {
+        // Always use the marine cursor in spectator mode.
+        outSprite = mMarineCursor;
+        outFrame  = 0;
+    }
+
+}
+
+void AvHHud::SetHelpMessage(const string& inHelpText, bool inForce, float inNormX, float inNormY)
+{
+	if(inForce || gEngfuncs.pfnGetCvarFloat(kvAutoHelp))
+	{
+		float theReticleX = kHelpMessageLeftEdgeInset;
+		float theReticleY = kHelpMessageTopEdgeInset;
+		bool theCentered = false;
+
+		if(this->GetInTopDownMode())
+		{
+			int theMouseX, theMouseY;
+			this->GetMousePos(theMouseX, theMouseY);
+			theReticleX = theMouseX/(float)ScreenWidth();
+			theReticleY = theMouseY/(float)ScreenHeight();
+			
+			// Move text up a bit so it doesn't obscure
+			theReticleY -= .1f;
+			
+			theCentered = true;
+		}
+		// Alien HUD forces this to be inset a bit
+		else 
+		{
+			if(this->GetIsAlien())
+			{
+				theReticleX = kHelpMessageAlienLeftedgeInset;
+				theReticleY = kHelpMessageAlienTopEdgeInset;
+			}
+			
+			if(inNormX != -1)
+			{
+				theReticleX = inNormX;
+			}
+			if(inNormY != -1)
+			{
+				theReticleY = inNormY;
+			}
+		}
+		
+		this->mHelpMessage.SetText(inHelpText);
+		
+		this->mHelpMessage.SetNormalizedScreenX(theReticleX);
+		this->mHelpMessage.SetNormalizedScreenY(theReticleY);
+		this->mHelpMessage.SetCentered(theCentered);
+		this->mHelpMessage.SetNormalizedMaxWidth(kReticleMaxWidth);
+		//this->mHelpMessage.SetIgnoreFadeForLifetime(true);
+		
+		float theTimePassed = (this->mTimeOfCurrentUpdate - this->mTimeOfLastUpdate);
+		this->mHelpMessage.FadeText(theTimePassed, false);
+		
+		// Set color
+		int theR, theG, theB;
+		this->GetPrimaryHudColor(theR, theG, theB, true, false);
+		this->mHelpMessage.SetRGB(theR, theG, theB);
+	}
+}
+
+void AvHHud::SetActionButtonHelpMessage(const string& inHelpText)
+{
+	this->mTopDownActionButtonHelp.SetText(inHelpText);
+
+	const float kNormX = .73f;
+	this->mTopDownActionButtonHelp.SetNormalizedScreenX(kNormX);
+
+	// Treat this as the bottom of the tooltip.  Scale the tooltip so it's bottom is here.
+	const float kNormY = .68f;
+	int theHeight = this->mTopDownActionButtonHelp.GetScreenHeight();
+	float theNormalizedHeight = (float)theHeight/ScreenHeight();
+	this->mTopDownActionButtonHelp.SetNormalizedScreenY(kNormY - theNormalizedHeight);
+
+	this->mTopDownActionButtonHelp.SetBackgroundA(128);
+
+	this->mTopDownActionButtonHelp.SetCentered(false);
+	this->mTopDownActionButtonHelp.SetNormalizedMaxWidth(1.0f - kNormX - .01f);
+	//this->mTopDownActionButtonHelp.SetIgnoreFadeForLifetime(true);
+	
+	float theTimePassed = (this->mTimeOfCurrentUpdate - this->mTimeOfLastUpdate);
+	this->mTopDownActionButtonHelp.FadeText(theTimePassed, false);
+	
+	// Set color
+	int theR, theG, theB;
+	this->GetPrimaryHudColor(theR, theG, theB, true, false);
+	this->mTopDownActionButtonHelp.SetRGB(theR, theG, theB);
+}
+
+void AvHHud::SetReticleMessage(const string& inHelpText)
+{
+	float theReticleX;
+	float theReticleY;
+	bool theIsCentered;
+	this->GetReticleTextDrawingInfo(theReticleX, theReticleY, theIsCentered);
+	
+	this->mReticleMessage.SetText(inHelpText);
+	
+	this->mReticleMessage.SetNormalizedScreenX(theReticleX);
+	this->mReticleMessage.SetNormalizedScreenY(theReticleY);
+	this->mReticleMessage.SetCentered(theIsCentered);
+	this->mReticleMessage.SetNormalizedMaxWidth(kReticleMaxWidth);
+
+	// Need instant fade-in and slow fade down for player names and info
+	this->mReticleMessage.SetFadeDownSpeed(-100);
+	this->mReticleMessage.SetFadeUpSpeed(10000);
+	//this->mReticleMessage.SetIgnoreFadeForLifetime(true);
+	
+	float theTimePassed = (this->mTimeOfCurrentUpdate - this->mTimeOfLastUpdate);
+	this->mReticleMessage.FadeText(theTimePassed, false);
+}
+
+void AvHHud::SetCurrentUseableEnergyLevel(float inEnergyLevel)
+{
+	this->mCurrentUseableEnergyLevel = inEnergyLevel;
+}
+
+const AvHMapExtents& AvHHud::GetMapExtents()
+{
+	return this->mMapExtents;
+}
+
+void AvHHud::InitCommanderMode()
+{
+	Panel* thePanel = NULL;
+
+	if(this->GetManager().GetVGUIComponentNamed(kLeaveCommanderButton, thePanel))
+	{
+		thePanel->addInputSignal(&gCommanderHandler);
+	}
+
+	if(this->GetManager().GetVGUIComponentNamed(kHierarchy, thePanel))
+	{
+		thePanel->addInputSignal(&gCommanderHandler);
+	}
+
+	if(this->GetManager().GetVGUIComponentNamed(kActionButtonsComponents, thePanel))
+	{
+		thePanel->addInputSignal(&gCommanderHandler);
+	}
+
+	if(this->GetManager().GetVGUIComponentNamed(kSelectAllImpulsePanel, thePanel))
+	{
+		thePanel->addInputSignal(&gCommanderHandler);
+	}
+
+	// Add handler for all pending request buttons
+	for(int i = 0; i < MESSAGE_LAST; i++)
+	{
+		AvHMessageID theMessageID = AvHMessageID(i);
+
+		char theComponentName[256];
+		sprintf(theComponentName, kPendingImpulseSpecifier, (int)theMessageID);
+
+		AvHTechImpulsePanel* theTechImpulsePanel = NULL;
+		if(this->GetManager().GetVGUIComponentNamed(theComponentName, theTechImpulsePanel))
+		{
+			theTechImpulsePanel->addInputSignal(&gCommanderHandler);
+		}
+	}
+	
+	//this->GetManager().GetVGUIComponentNamed(kScroller, thePanel);
+	//if(thePanel)
+	//{
+	//	thePanel->addInputSignal(&gScrollHandler);
+	//}
+
+	// Get input from every control
+	this->GetManager().AddInputSignal(&gScrollHandler);
+	
+	// TODO: Add others here
+}
+
+// Read in base state from stream (called by Demo_ReadBuffer)
+int AvHHud::InitializeDemoPlayback(int inSize, unsigned char* inBuffer)
+{
+	// Read in base state
+	int theBytesRead = 0;
+	
+	// Read in num upgrades
+	int theNumUpgrades = 0;
+	//this->mUpgradeCosts.clear();
+	LoadData(&theNumUpgrades, inBuffer, sizeof(int), theBytesRead);
+
+	for(int i = 0; i < theNumUpgrades; i++)
+	{
+		// Read in upgrades (for backwards-compatibility)
+		int theFirst = 0;
+		LoadData(&theFirst, inBuffer, sizeof(int), theBytesRead);
+
+		int theSecond = 0;
+		LoadData(&theSecond, inBuffer, sizeof(int), theBytesRead);
+	}
+	
+	// Read in gamma
+	LoadData(&this->mDesiredGammaSlope, inBuffer, sizeof(this->mDesiredGammaSlope), theBytesRead);
+
+    if (!mSteamUIActive)
+    {
+        this->SetGamma(this->mDesiredGammaSlope);
+    }
+
+	// Read in resources
+	LoadData(&this->mResources, inBuffer, sizeof(this->mResources), theBytesRead);
+	
+	// Read in commander (TODO: REMOVE)
+    int theCommander;
+	LoadData(&theCommander, inBuffer, sizeof(theCommander), theBytesRead);
+	
+	// Read in number of hive infos
+	this->mHiveInfoList.clear();
+
+	int theNumHiveInfos = 0;
+	LoadData(&theNumHiveInfos, inBuffer, sizeof(int), theBytesRead);
+
+	// For each one, add a new hive info
+	for(i = 0; i < theNumHiveInfos; i++)
+	{
+		AvHHiveInfo theHiveInfo;
+		LoadData(&theHiveInfo, inBuffer, sizeof(AvHHiveInfo), theBytesRead);
+		this->mHiveInfoList.push_back(theHiveInfo);
+	}
+
+	// Load and set current pie menu control
+	int thePieMenuControlLength = 0;
+	LoadData(&thePieMenuControlLength, inBuffer, sizeof(int), theBytesRead);
+
+	char thePieMenuControl[256];
+	memset(thePieMenuControl, 0, 256);
+	LoadData(thePieMenuControl, inBuffer, thePieMenuControlLength, theBytesRead);
+	this->mPieMenuControl = string(thePieMenuControl);
+	
+	// Read in selected units size
+	this->mSelected.clear();
+	int theNumSelected = 0;
+	LoadData(&theNumSelected, inBuffer, sizeof(theNumSelected), theBytesRead);
+
+	for(i = 0; i < theNumSelected; i++)
+	{
+		// Read in selected units
+		EntityInfo theSelectedEntity = 0;
+		LoadData(&theSelectedEntity, inBuffer, sizeof(theSelectedEntity), theBytesRead);
+	}
+
+	ASSERT((theBytesRead + (int)sizeof(int)) == inSize);
+
+	// Clear existing particle system templates
+	gParticleTemplateList.Clear();
+	AvHParticleSystemManager::Instance()->Reset();
+
+	// Clear weapon info
+	gWR.Reset();
+
+	return theBytesRead;
+}
+
+int AvHHud::InitializeDemoPlayback2(int inSize, unsigned char* inBuffer)
+{
+	// Read in base state 2
+	int theBytesRead = 0;
+
+	LOAD_DATA(this->mTimeOfLastUpdate);
+	LOAD_DATA(this->mTimeOfNextHudSound);
+	LOAD_DATA(this->mTimeOfCurrentUpdate);
+	LOAD_DATA(this->mCountDownClock);
+	LOAD_DATA(this->mLastTickPlayed);
+	LOAD_DATA(this->mNumTicksToPlay);
+	LoadStringData(this->mMapName, inBuffer, theBytesRead);
+
+	float theMinViewHeight;
+	LOAD_DATA(theMinViewHeight);
+	this->mMapExtents.SetMinViewHeight(theMinViewHeight);
+
+	float theMaxViewHeight;
+	LOAD_DATA(theMaxViewHeight);
+	this->mMapExtents.SetMaxViewHeight(theMaxViewHeight);
+	
+	float theMinMapX;
+	LOAD_DATA(theMinMapX);
+	this->mMapExtents.SetMinMapX(theMinMapX);
+	
+	float theMaxMapX;
+	LOAD_DATA(theMaxMapX);
+	this->mMapExtents.SetMaxMapX(theMaxMapX);
+	
+	float theMinMapY;
+	LOAD_DATA(theMinMapY);
+	this->mMapExtents.SetMinMapY(theMinMapY);
+	
+	float theMaxMapY;
+	LOAD_DATA(theMaxMapY);
+	this->mMapExtents.SetMaxMapY(theMaxMapY);
+	
+	bool theDrawMapBG;
+	LOAD_DATA(theDrawMapBG);
+	this->mMapExtents.SetDrawMapBG(theDrawMapBG);
+
+	// Clear then load sound names
+	int theSoundNameListSize;
+	LOAD_DATA(theSoundNameListSize);
+	this->mSoundNameList.clear();
+
+	for(int i = 0; i < theSoundNameListSize; i++)
+	{
+		string theCurrentSoundName;
+		LoadStringData(theCurrentSoundName, inBuffer, theBytesRead);
+		this->mSoundNameList.push_back(theCurrentSoundName);
+	}
+
+	ASSERT((theBytesRead + (int)sizeof(int)) == inSize);
+	
+	return theBytesRead;
+}	
+
+// Write out base HUD data to stream
+void AvHHud::InitializeDemoRecording()
+{
+	// Figure out total size of buffer needed
+
+	// Write number of upgrades, then each upgrade
+	// No longer done, but need to add in upgrades for backwards compatibility
+	int theUpgrades = 0;
+	int theUpgradesSize = sizeof(theUpgrades);
+
+	// Gamma, resources
+	int theGammaSize = sizeof(this->mDesiredGammaSlope);
+	int theResourcesSizes = sizeof(this->mResources);
+    
+    // Save commander index (TODO: REMOVE)
+    int theCommanderIndex = this->GetCommanderIndex();
+	int theCommanderSize = sizeof(theCommanderIndex);
+
+	int theNumHiveInfoRecords = this->mHiveInfoList.size();
+	int theHiveInfoSize = sizeof(int) + theNumHiveInfoRecords*sizeof(AvHHiveInfo);
+
+	string thePieMenuControl = gPieMenuHandler.GetPieMenuControl();
+	int theCurrentPieMenuControlSize = sizeof(int) + thePieMenuControl.size();
+	
+	int theSelectedSize = sizeof(int) + this->mSelected.size()*sizeof(EntityInfo);
+
+	int theTotalSize = theUpgradesSize + theGammaSize + theResourcesSizes + theCommanderSize + theHiveInfoSize + theCurrentPieMenuControlSize + theSelectedSize;
+
+	// New a char array of this size
+	int theCounter = 0;
+
+	unsigned char* theCharArray = new unsigned char[theTotalSize];
+	if(theCharArray)
+	{
+		// Write out number of upgrades (for backwards-compatibility)
+		int theNumUpgradeCosts = 0;
+		SaveData(theCharArray, &theNumUpgradeCosts, sizeof(theNumUpgradeCosts), theCounter);
+
+		// Write out gamma
+		SaveData(theCharArray, &this->mDesiredGammaSlope, theGammaSize, theCounter);
+		SaveData(theCharArray, &this->mResources, theResourcesSizes, theCounter);
+		SaveData(theCharArray, &theCommanderIndex, theCommanderSize, theCounter);
+
+		// Write out num hive info records
+		SaveData(theCharArray, &theNumHiveInfoRecords, sizeof(int), theCounter);
+		for(HiveInfoListType::iterator theHiveInfoIter = this->mHiveInfoList.begin(); theHiveInfoIter != this->mHiveInfoList.end(); theHiveInfoIter++)
+		{
+			SaveData(theCharArray, &(*theHiveInfoIter), sizeof(AvHHiveInfo), theCounter);
+		}
+
+		// Save length of pie menu control name
+		int thePieMenuControlNameLength = thePieMenuControl.size();
+		SaveData(theCharArray, &thePieMenuControlNameLength, sizeof(int), theCounter);
+		SaveData(theCharArray, thePieMenuControl.c_str(), thePieMenuControlNameLength, theCounter);
+
+		// Save out size of selected
+		int theNumSelected = this->mSelected.size();
+		SaveData(theCharArray, &theNumSelected, sizeof(theNumSelected), theCounter);
+
+		for(EntityListType::const_iterator theSelectedIter = this->mSelected.begin(); theSelectedIter != this->mSelected.end(); theSelectedIter++)
+		{
+			EntityInfo theCurrentInfo = *theSelectedIter;
+			SaveData(theCharArray, &theCurrentInfo, sizeof(EntityInfo), theCounter);
+		}
+
+		ASSERT(theCounter == theTotalSize);
+
+		// Write it out
+		Demo_WriteBuffer(TYPE_BASESTATE, theTotalSize, theCharArray);
+
+		// Delete char array
+		delete [] theCharArray;
+		theCharArray = NULL;
+
+		// Save out particle templates
+		gParticleTemplateList.InitializeDemoRecording();
+	}
+
+	theTotalSize = theCounter = 0;
+	theTotalSize += sizeof(this->mTimeOfLastUpdate);
+	theTotalSize += sizeof(this->mTimeOfNextHudSound);
+	theTotalSize += sizeof(this->mTimeOfCurrentUpdate);
+	theTotalSize += sizeof(this->mCountDownClock);
+	theTotalSize += sizeof(this->mLastTickPlayed);
+	theTotalSize += sizeof(this->mNumTicksToPlay);
+	theTotalSize += GetDataSize(this->mMapName);
+	theTotalSize += sizeof(this->mMapExtents.GetMinViewHeight());
+	theTotalSize += sizeof(this->mMapExtents.GetMaxViewHeight());
+	theTotalSize += sizeof(this->mMapExtents.GetMinMapX());
+	theTotalSize += sizeof(this->mMapExtents.GetMaxMapX());
+	theTotalSize += sizeof(this->mMapExtents.GetMinMapY());
+	theTotalSize += sizeof(this->mMapExtents.GetMaxMapY());
+	theTotalSize += sizeof(this->mMapExtents.GetDrawMapBG());
+
+	// Save sound names
+	int theSoundNameListSize = this->mSoundNameList.size();
+	theTotalSize += sizeof(theSoundNameListSize);
+
+	for(int i = 0; i < theSoundNameListSize; i++)
+	{
+		string theCurrentSoundName = this->mSoundNameList[i];
+		theTotalSize += GetDataSize(theCurrentSoundName);
+	}
+	
+	theCharArray = new unsigned char[theTotalSize];
+	if(theCharArray)
+	{
+		SAVE_DATA(this->mTimeOfLastUpdate);
+		SAVE_DATA(this->mTimeOfNextHudSound);
+		SAVE_DATA(this->mTimeOfCurrentUpdate);
+		SAVE_DATA(this->mCountDownClock);
+		SAVE_DATA(this->mLastTickPlayed);
+		SAVE_DATA(this->mNumTicksToPlay);
+		SaveStringData(theCharArray, this->mMapName, theCounter);
+
+		float theMinViewHeight = this->mMapExtents.GetMinViewHeight();
+		SAVE_DATA(theMinViewHeight);
+		float theMaxViewHeight = this->mMapExtents.GetMaxViewHeight();
+		SAVE_DATA(theMaxViewHeight);
+		float theMinMapX = this->mMapExtents.GetMinMapX();
+		SAVE_DATA(theMinMapX);
+		float theMaxMapX = this->mMapExtents.GetMaxMapX();
+		SAVE_DATA(theMaxMapX);
+		float theMinMapY = this->mMapExtents.GetMinMapY();
+		SAVE_DATA(theMinMapY);
+		float theMaxMapY = this->mMapExtents.GetMaxMapY();
+		SAVE_DATA(theMaxMapY);
+		bool theDrawMapBG = this->mMapExtents.GetDrawMapBG();
+		SAVE_DATA(theDrawMapBG);
+
+		SAVE_DATA(theSoundNameListSize);
+		for(int i = 0; i < theSoundNameListSize; i++)
+		{
+			string theCurrentSoundName = this->mSoundNameList[i];
+			SaveStringData(theCharArray, theCurrentSoundName, theCounter);
+		}
+
+		// TODO: Save out locations?
+
+		ASSERT(theCounter == theTotalSize);
+
+		// Write out TYPE_BASESTATE2 chunk separately for backwards-compatibility
+		Demo_WriteBuffer(TYPE_BASESTATE2, theTotalSize, theCharArray);
+
+		delete [] theCharArray;
+		theCharArray = NULL;
+	}
+
+	ScorePanel_InitializeDemoRecording();
+
+	// Write out weapon info
+	for(i = 0; i < MAX_WEAPONS; i++)
+	{
+		WEAPON* theWeapon = gWR.GetWeapon(i);
+
+		theTotalSize = sizeof(theWeapon->szName) + sizeof(theWeapon->iAmmoType) + sizeof(theWeapon->iAmmo2Type) + sizeof(theWeapon->iMax1) + sizeof(theWeapon->iMax2) + sizeof(theWeapon->iSlot) + sizeof(theWeapon->iSlotPos) + sizeof(theWeapon->iFlags) + sizeof(theWeapon->iId) + sizeof(theWeapon->iClip) + sizeof(theWeapon->iCount);// + sizeof(int); // last one is for ammo
+		theCharArray = new unsigned char[theTotalSize];
+
+		int theWeaponCoreDataLength = theTotalSize;// - sizeof(int);
+		memcpy(theCharArray, theWeapon, theWeaponCoreDataLength); // Everything but ammo
+		//int theAmmo = gWR.GetAmmo(theWeapon->iId);
+		//memcpy(theCharArray + theWeaponCoreDataLength, &theAmmo, sizeof(int));
+
+		Demo_WriteBuffer(TYPE_WEAPONINFO, theTotalSize, (unsigned char*)theWeapon);
+
+		delete [] theCharArray;
+		theCharArray = NULL;
+	}
+}
+
+int	AvHHud::InitializeWeaponInfoPlayback(int inSize, unsigned char* inBuffer)
+{
+	// Make sure weapons are cleared out first
+	WEAPON theWeapon;
+	memset(&theWeapon, 0, sizeof(theWeapon));
+
+	int theWeaponCoreDataLength = inSize;// - sizeof(int);
+	memcpy(&theWeapon, inBuffer, theWeaponCoreDataLength);
+
+	if(theWeapon.iId)
+	{
+		gWR.AddWeapon( &theWeapon);
+		//int theAmmo = 0;
+		//memcpy(&theAmmo, inBuffer + theWeaponCoreDataLength, sizeof(int));
+		//gWR.SetAmmo(theWeapon.iId, theAmmo);
+	}
+
+	return inSize;
+}
+
+void AvHHud::InitMenu(const string& inMenuName)
+{
+	PieMenu* theMenu = NULL;
+    if(this->GetManager().GetVGUIComponentNamed(inMenuName, theMenu))
+	{
+		theMenu->AddInputSignalForNodes(&gPieMenuHandler);
+		//outMenu->DisableNodesGreaterThanCost(this->mResources);
+		this->GetManager().HideComponent(inMenuName);
+	}
+}
+
+void AvHHud::PostUIInit(void)
+{
+    this->InitMenu(kSoldierMenu);
+	this->InitMenu(kSoldierCombatMenu);
+	this->InitMenu(kAlienMenu);
+	this->InitMenu(kAlienCombatMenu);
+	
+	this->InitCommanderMode();
+	
+    this->GetManager().GetVGUIComponentNamed(kCommanderResourceLabel, this->mCommanderResourceLabel);
+    this->GetManager().GetVGUIComponentNamed(kGenericProgress, this->mGenericProgressBar);
+    this->GetManager().GetVGUIComponentNamed(kResearchProgress, this->mResearchProgressBar);
+	this->GetManager().GetVGUIComponentNamed(kAlienProgress, this->mAlienProgressBar);
+    this->GetManager().GetVGUIComponentNamed(kSelectionBox, this->mSelectionBox);
+	this->GetManager().GetVGUIComponentNamed(kResearchingLabel, this->mResearchLabel);
+
+    // Init particle editor
+	gParticleEditorHandler.Setup();
+	
+    if(this->GetManager().GetVGUIComponentNamed(kHierarchy, this->mHierarchy))
+    {
+        this->mHierarchy->setEnabled(false);
+    }
+	if(this->GetManager().GetVGUIComponentNamed(kShowMapHierarchy, this->mShowMapHierarchy))
+    {
+        this->mShowMapHierarchy->setEnabled(false);
+    }
+	
+	// Don't turn on gamma by default, it is annoying for testing
+	//this->SetGamma();
+}
+
+AvHMessageID AvHHud::GetGhostBuilding() const
+{
+	return this->mGhostBuilding;
+}
+
+void AvHHud::SetGhostBuildingMode(AvHMessageID inGhostBuilding)
+{
+	this->mGhostBuilding = inGhostBuilding;
+	this->mCreatedGhost = false;
+}
+
+void AvHHud::SetClientDebugCSP(weapon_data_t* inWeaponData, float inNextPlayerAttack)
+{
+	char theClientInfoString[512];
+	sprintf(theClientInfoString, "Client: id: %d, clip: %d, prim attack: %f, idle: %f, next attack: %f", inWeaponData->m_iId, inWeaponData->m_iClip, inWeaponData->m_flNextPrimaryAttack, inWeaponData->m_flTimeWeaponIdle, inNextPlayerAttack);
+	
+	vgui::Label* theLabel = NULL;
+	if(this->GetManager().GetVGUIComponentNamed(kDebugCSPClientLabel, theLabel))
+	{
+		theLabel->setText(theClientInfoString);
+	}
+}
+
+void AvHHud::SetCurrentWeaponData(int inCurrentWeaponID, bool inEnabled)
+{
+	this->mCurrentWeaponID = inCurrentWeaponID;
+	this->mCurrentWeaponEnabled = inEnabled;
+}
+
+int AvHHud::GetCurrentWeaponID(void)
+{
+	return this->mCurrentWeaponID;
+}
+
+void AvHHud::SetAlienAbility(AvHMessageID inAlienAbility)
+{
+	this->mAlienAbility = inAlienAbility;
+}
+
+void AvHHud::SetProgressStatus(float inPercentage)
+{
+	if(this->mGenericProgressBar)
+	{
+		this->mGenericProgressBar->setVisible(false);
+	}
+
+	if(this->mAlienProgressBar)
+	{
+		this->mAlienProgressBar->setVisible(false);
+	}
+
+	ProgressBar* theProgressBar = this->mGenericProgressBar;
+	if(this->GetIsAlien())
+	{
+		theProgressBar = this->mAlienProgressBar;
+	}
+
+	if(theProgressBar)
+	{
+		theProgressBar->setVisible(true);
+		
+		int theNumSegments = theProgressBar->getSegmentCount();
+		int theSegment = inPercentage*theNumSegments;
+		theProgressBar->setProgress(theSegment);
+	}
+}
+
+void AvHHud::SetReinforcements(int inReinforcements)
+{
+	Label* theLabel = NULL;
+	if(this->GetManager().GetVGUIComponentNamed(kReinforcementsLabel, theLabel))
+	{
+		string thePrefix;
+		if(LocalizeString(kReinforcementsText, thePrefix))
+		{
+			string theText = thePrefix + string(" ") + MakeStringFromInt(inReinforcements);
+			theLabel->setText(theText.c_str());
+		}
+	}
+}
+
+void AvHHud::SetResearchProgressStatus(float inPercentage)
+{
+	if(this->mResearchProgressBar)
+	{
+		this->mResearchProgressBar->setVisible(true);
+		
+		int theNumSegments = this->mResearchProgressBar->getSegmentCount();
+		int theSegment = inPercentage*theNumSegments;
+		this->mResearchProgressBar->setProgress(theSegment);
+		
+		this->mResearchLabel->setVisible(true);
+		
+		// Center research label
+		int theX, theY;
+		this->mResearchLabel->getPos(theX, theY);
+		int theTextWidth, theTextHeight;
+		this->mResearchLabel->getTextSize(theTextWidth, theTextHeight);
+		this->mResearchLabel->setPos(ScreenWidth()/2 - theTextWidth/2, theY);
+	}
+}
+
+void AvHHud::UpdateDemoRecordPlayback()
+{
+	// If the mouse is visible, allow it to work with demos
+	if(gEngfuncs.pDemoAPI->IsRecording())
+	{
+		// Write out first frame if needed
+		if(!this->mRecordingLastFrame)
+		{
+			this->InitializeDemoRecording();
+			this->mRecordingLastFrame = true;
+		}
+
+		// Write view origin (and angles?)
+		//Demo_WriteVector(TYPE_VIEWANGLES, v_angles);
+		//Demo_WriteVector(TYPE_VIEWORIGIN, v_origin);
+//		Demo_WriteByte(TYPE_MOUSEVIS, g_iVisibleMouse);
+//		
+//		if(g_iVisibleMouse)
+//		{
+//			int theMouseScreenX, theMouseScreenY;
+//			
+//			IN_GetMousePos(&theMouseScreenX, &theMouseScreenY);
+//			
+//			//theMouseScreenX += ScreenWidth/2;
+//			//theMouseScreenY += ScreenHeight/2;
+//			
+//			// Write mouse position
+//			float theNormX = (float)theMouseScreenX/ScreenWidth;
+//			float theNormY = (float)theMouseScreenY/ScreenHeight;
+//			
+//			Demo_WriteFloat(TYPE_MOUSEX, theNormX);
+//			Demo_WriteFloat(TYPE_MOUSEY, theNormY);
+//			
+//			//char theBuffer[256];
+//			//sprintf(theBuffer, "Saving mouse coords %f %f\n", theNormX, theNormY);
+//			//CenterPrint(theBuffer);
+//		}
+	}
+	else if(gEngfuncs.pDemoAPI->IsPlayingback())
+	{
+		//char theBuffer[256];
+		//sprintf(theBuffer, "Restoring mouse coords %f %f\n", gNormMouseX, gNormMouseY);
+		//CenterPrint(theBuffer);
+		
+		//int theCurrentMouseX = gNormMouseX*ScreenWidth;
+		//int theCurrentMouseY = gNormMouseY*ScreenHeight;
+		//
+		////App::getInstance()->setCursorPos(theCurrentMouseX, theCurrentMouseY);
+		//
+		//SetCursorPos(theCurrentMouseX, theCurrentMouseY);
+		//
+		//this->mMouseCursorX = theCurrentMouseX;
+		//this->mMouseCursorY = theCurrentMouseY;
+
+		this->mRecordingLastFrame = false;
+	}
+	else
+	{
+		this->mRecordingLastFrame = false;
+	}
+}
+
+void AvHHud::UpdateDataFromVuser4(float inCurrentTime)
+{
+	cl_entity_s* theLocalPlayer = gEngfuncs.GetLocalPlayer();
+	if(theLocalPlayer)
+	{
+		// Fetch data from vuser4
+		vec3_t theVUser = theLocalPlayer->curstate.vuser4;
+
+		//int theVUserVar0 = 0;
+		//int theVUserVar1 = 0;
+		//int theVUserVar2 = 0;
+		//
+		//memcpy(&theVUserVar0, (int*)(&theVUser.x), 4);
+		//memcpy(&theVUserVar1, (int*)(&theVUser.y), 4);
+		//memcpy(&theVUserVar2, (int*)(&theVUser.z), 4);
+
+		// Fetch new resource level
+		//theVUserVar2;// & 0x0000FFFF;
+
+		if(this->GetIsCombatMode())
+		{
+			this->mExperience = (int)ceil(theVUser.z/kNumericNetworkConstant);					
+			this->mExperienceLevel = AvHPlayerUpgrade::GetPlayerLevel(this->mExperience);
+
+			const float kShowMenuInterval = 5.0f;
+
+			// If we are at a level greater then we've drawn, set visible again to reparse
+			if(this->mExperienceLevel > this->mExperienceLevelLastDrawn)
+			{
+				this->DisplayCombatUpgradeMenu(true);
+				this->mTimeOfLastLevelUp = inCurrentTime;
+				this->mExperienceLevelLastDrawn = this->mExperienceLevel;
+			}
+			// else if we have no more levels to spend or if we've been displaying it longer then the time out (+1 because we start at level 1)
+			else if((this->mExperienceLevel == (this->mExperienceLevelSpent + 1)) || (inCurrentTime > (this->mTimeOfLastLevelUp + kShowMenuInterval)))
+			{
+				// stop displaying it
+				this->DisplayCombatUpgradeMenu(false);
+			}
+		}
+		else
+		{
+			int theNewValue = (int)ceil(theVUser.z/kNumericNetworkConstant);
+
+			if(theNewValue != this->mResources)
+			{
+				this->mResources = theNewValue;
+			}
+			
+			// Don't smooth resources nicely when switching targets
+			if((g_iUser1 == OBS_IN_EYE) && (g_iUser2 != this->mUser2OfLastResourceMessage))
+			{
+				this->mVisualResources = this->mResources;
+			}
+		}
+		this->mUser2OfLastResourceMessage = g_iUser2;
+	}
+}
+
+void AvHHud::UpdateSpectating()
+{
+    // If we're spectating and the team of our target switched, delete all blips
+	if((this->GetPlayMode() == PLAYMODE_AWAITINGREINFORCEMENT) || (this->GetPlayMode() == PLAYMODE_OBSERVER))
+	{
+		AvHTeamNumber theCurrentTargetTeam = TEAM_IND;
+		
+		int theCurrentTarget = g_iUser2;//thePlayer->curstate.iuser2;
+		cl_entity_s* theEntity = gEngfuncs.GetEntityByIndex(theCurrentTarget);
+		if(theEntity)
+		{
+			theCurrentTargetTeam = AvHTeamNumber(theEntity->curstate.team);
+		}
+
+		if((theCurrentTargetTeam != this->mLastTeamSpectated) && (theCurrentTargetTeam != TEAM_IND))
+		{
+			this->mEnemyBlips.Clear();
+			this->mFriendlyBlips.Clear();
+			this->mLastTeamSpectated = theCurrentTargetTeam;
+			//CenterPrint("Clearing blips.");
+		}
+	}
+}
+
+void AvHHud::UpdateCommonUI()
+{
+	// Find currently selected node and draw help text if it's been open for a little bit
+	PieMenu* thePieMenu = NULL;
+	AvHMessageID theCurrentNodeID = MESSAGE_NULL;
+
+	this->mSelectingNodeID = MESSAGE_NULL;
+
+	if(this->GetManager().GetVGUIComponentNamed(this->mPieMenuControl, thePieMenu))
+	{
+		this->UpdateUpgradeCosts();
+
+		PieNode* theCurrentNode = NULL;
+		if(thePieMenu && thePieMenu->GetSelectedNode(theCurrentNode))
+		{
+			theCurrentNodeID = (AvHMessageID)theCurrentNode->GetMessageID();
+		
+			if(theCurrentNodeID > 0)
+			{
+				this->mSelectingNodeID = theCurrentNodeID;
+			}
+		}
+	}
+
+	// Clear squad on team change
+	if(!this->GetIsMarine())
+	{
+		this->mCurrentSquad = 0;
+	}
+}
+
+#define FORCE_CVAR(a,b) if(a)a->value = b;
+
+void AvHHud::UpdateExploitPrevention()
+{
+	//Note: Sometimes some clients will not have these cvars, so be sure to check that they are not null.
+	FORCE_CVAR(gl_monolights, 0.0f);
+	FORCE_CVAR(gl_overbright, 0.0f);
+	FORCE_CVAR(gl_clear, 0.0f);
+	FORCE_CVAR(hud_draw, 1.0f);
+	FORCE_CVAR(r_drawviewmodel, 1.0f);
+	FORCE_CVAR(cl_movespeedkey, AvHMUGetWalkSpeedFactor(this->GetHUDUser3()));
+	FORCE_CVAR(gl_d3dflip, 1.0f);
+	FORCE_CVAR(s_show, 0.0f);
+	FORCE_CVAR(r_detailtextures, 0.0f);
+
+	if(lightgamma && lightgamma->value < 2.0)
+		lightgamma->value = 2.0f;
+}
+
+void AvHHud::UpdateAlienUI(float inCurrentTime)
+{
+	// Always hide it by default
+	this->GetManager().HideComponent(kPieHelpText);
+	
+	if(this->GetIsAlien() && this->GetIsAlive())
+	{
+		float theTimePassed = inCurrentTime - this->mTimeOfLastUpdate;
+//		int theNumFrames = SPR_Frames(this->mAlienUIHiveSprite);
+//			
+//		for(AnimatedSpriteListType::iterator theIter = this->mAlienUIHiveList.begin(); theIter != this->mAlienUIHiveList.end(); theIter++)
+//		{
+//			const float kAnimationSpeed = 16.0f;
+//		
+//			float theCurrentFrame = theIter->mCurrentFrame + theTimePassed*kAnimationSpeed;
+//			if(theCurrentFrame >= theNumFrames)
+//			{
+//				theCurrentFrame -= theNumFrames;
+//			}
+//			theIter->mCurrentFrame = theCurrentFrame;
+//		}
+		
+		// Check to see if we have any unspent upgrades.  If so, change the pie menu and HUD state to reflect this
+		this->mNumUpgradesAvailable = 0;
+		for(int i = 0; i < ALIEN_UPGRADE_CATEGORY_MAX_PLUS_ONE; i++)
+		{
+			this->mCurrentUpgradeCategory[i] = ALIEN_UPGRADE_CATEGORY_INVALID;
+		}
+
+		int theUpgradeVar = this->GetLocalUpgrades();
+
+		if(AvHGetHasUpgradeChoiceInCategory(ALIEN_UPGRADE_CATEGORY_SENSORY, this->mUpgrades, theUpgradeVar))
+		{
+			this->mCurrentUpgradeCategory[this->mNumUpgradesAvailable] = ALIEN_UPGRADE_CATEGORY_SENSORY;
+			this->mNumUpgradesAvailable += 1;
+		}
+		if(AvHGetHasUpgradeChoiceInCategory(ALIEN_UPGRADE_CATEGORY_MOVEMENT, this->mUpgrades, theUpgradeVar))
+		{
+			this->mCurrentUpgradeCategory[this->mNumUpgradesAvailable] = ALIEN_UPGRADE_CATEGORY_MOVEMENT;
+			this->mNumUpgradesAvailable += 1;
+		}
+		if(AvHGetHasUpgradeChoiceInCategory(ALIEN_UPGRADE_CATEGORY_OFFENSE, this->mUpgrades, theUpgradeVar))
+		{
+			this->mCurrentUpgradeCategory[this->mNumUpgradesAvailable] = ALIEN_UPGRADE_CATEGORY_OFFENSE;
+			this->mNumUpgradesAvailable += 1;
+		}
+		if(AvHGetHasUpgradeChoiceInCategory(ALIEN_UPGRADE_CATEGORY_DEFENSE, this->mUpgrades, theUpgradeVar))
+		{
+			this->mCurrentUpgradeCategory[this->mNumUpgradesAvailable] = ALIEN_UPGRADE_CATEGORY_DEFENSE;
+			this->mNumUpgradesAvailable += 1;
+		}
+	}
+}
+
+bool AvHHud::GetCommanderLabelText(std::string& outCommanderName) const
+{
+
+    int theCommander = this->GetCommanderIndex();
+	bool theHasCommander = (theCommander > 0) && (theCommander <= gEngfuncs.GetMaxClients());
+	
+	if(!theHasCommander)
+	{
+		LocalizeString(kNoCommander, outCommanderName);
+        return false; // No commander
+	}
+	else
+	{
+
+        std::stringstream theStream;
+
+		string theCommanderText;
+        LocalizeString(kCommander, theCommanderText);
+
+        theStream << theCommanderText;
+        theStream << ": ";
+        
+		hud_player_info_t thePlayerInfo;
+		gEngfuncs.pfnGetPlayerInfo(theCommander, &thePlayerInfo);
+
+		if(thePlayerInfo.name)
+		{
+			const int kMaxCommNameLen = 8;
+			theStream << string(thePlayerInfo.name).substr(0, kMaxCommNameLen);
+		}
+
+        outCommanderName = theStream.str();
+
+        return true;
+
+    }
+
+}
+
+void AvHHud::UpdateMarineUI(float inCurrentTime)
+{ 
+	// Find commander label
+	Label* theCommanderStatusLabel = NULL;
+
+
+	if(this->mMapMode == MAP_MODE_NS)
+	{
+
+		// Add handler for all pending request buttons (this does hotgroups too)
+		for(int i = 0; i < MESSAGE_LAST; i++)
+		{
+			AvHMessageID theMessageID = AvHMessageID(i);
+				
+			char theComponentName[256];
+			sprintf(theComponentName, kPendingImpulseSpecifier, (int)theMessageID);
+				
+			AvHTechImpulsePanel* theTechImpulsePanel = NULL;
+			if(this->GetManager().GetVGUIComponentNamed(theComponentName, theTechImpulsePanel))
+			{
+				bool theVisibility = false;
+		
+				// Do we have any requests pending?
+				if(this->GetIsInTopDownMode())
+				{
+					PendingRequestListType::iterator theIterator;
+					for(theIterator = this->mPendingRequests.begin(); theIterator != this->mPendingRequests.end(); theIterator++)
+					{
+						if(theIterator->first == theMessageID)
+						{
+							if(theIterator->second > 0)
+							{
+								theVisibility = true;
+							}
+						}
+					}
+
+					switch(theMessageID)
+					{
+					case GROUP_SELECT_1:
+					case GROUP_SELECT_2:
+					case GROUP_SELECT_3:
+					case GROUP_SELECT_4:
+					case GROUP_SELECT_5:
+					case COMMANDER_SELECTALL:
+						theVisibility = true;
+						break;
+					}
+				}
+		
+				theTechImpulsePanel->setVisible(theVisibility);
+			}
+		}
+	}
+}
+
+
+void AvHHud::UpdateCountdown(float inCurrentTime)
+{
+	if(this->mCountDownClock != -1)
+	{
+		if(inCurrentTime - this->mCountDownClock > this->mLastTickPlayed)
+		{
+			// Play tick
+			this->PlayHUDSound(HUD_SOUND_COUNTDOWN);
+			this->mLastTickPlayed++;
+		}
+
+		if(this->mLastTickPlayed > this->mNumTicksToPlay)
+		{
+			this->AddTooltip(kGameBegun, false);
+			this->mCountDownClock = -1;
+		}
+	}
+}
+
+void AvHHud::UpdateHierarchy()
+{
+
+    // Start the starting point on the map to our local position
+	this->mOverviewMap.SetMapExtents(this->GetMapName(), this->mMapExtents);
+	this->mOverviewMap.SetWorldPosition(gPredictedPlayerOrigin[0], gPredictedPlayerOrigin[1]);
+    
+    if(this->mHierarchy)
+	{
+		this->mHierarchy->SetFullScreen(this->GetHUDUser3() == AVH_USER3_COMMANDER_PLAYER);
+	}
+	if(this->mShowMapHierarchy)
+	{
+		this->mShowMapHierarchy->SetFullScreen(true);
+	}
+
+}
+
+string AvHHud::GetNameOfLocation(vec3_t inLocation) const
+{
+	string theLocationName;
+
+	AvHSHUGetNameOfLocation(this->mInfoLocationList, inLocation, theLocationName);
+
+	return theLocationName;
+}
+
+
+void AvHHud::UpdateInfoLocation()
+{
+	if(this->GetIsAlive() && this->GetHUDUser3() != AVH_USER3_ALIEN_EMBRYO)
+	{
+		// Don't clear our location, disconcerting to see our location disappear
+		//this->mLocationText = "";
+		
+		this->mLocationText = this->GetNameOfLocation(gPredictedPlayerOrigin);
+	}
+	else
+	{
+		this->mLocationText = "";
+	}
+}
+
+bool AvHHud::GetIsCombatMode() const
+{
+	return (this->mMapMode == MAP_MODE_CO);
+}
+
+bool AvHHud::GetIsNSMode() const
+{
+    return (this->mMapMode == MAP_MODE_NS);
+}
+
+bool AvHHud::GetIsMouseInRegion(int inX, int inY, int inWidth, int inHeight)
+{
+	bool theMouseIsInRegion = false;
+
+	if(this->GetInTopDownMode())
+	{
+		int theMouseX, theMouseY;
+		this->GetMousePos(theMouseX, theMouseY);
+		
+		if((theMouseX >= inX) && (theMouseX <= (inX + inWidth)))
+		{
+			if((theMouseY >= inY) && (theMouseY <= (inY + inHeight)))
+			{
+				theMouseIsInRegion = true;
+			}
+		}
+	}
+
+	return theMouseIsInRegion;
+}
+
+void AvHHud::TraceEntityID(int& outEntityID)
+{
+	pmtrace_t tr;
+	vec3_t up, right, forward;
+
+	// Trace forward to see if we see a player
+	gEngfuncs.pEventAPI->EV_PushPMStates();
+
+	// Now add in all of the players.
+	gEngfuncs.pEventAPI->EV_SetSolidPlayers (-1);	
+
+	gEngfuncs.pEventAPI->EV_SetTraceHull(2);
+
+	cl_entity_s* theLocalPlayer = gEngfuncs.GetLocalPlayer();
+	int theLocalPlayerIndex = theLocalPlayer->index;
+	//AngleVectors(theLocalPlayer->curstate.angles, forward, right, up);
+
+	pVector theRealView;
+	gEngfuncs.pfnAngleVectors(pmove->angles, forward, right, up);
+
+	Vector theStartTrace;
+	//VectorMA(gPredictedPlayerOrigin, kMaxPlayerHullWidth, forward, theStartTrace);
+	VectorCopy(gPredictedPlayerOrigin, theStartTrace);
+
+	Vector theEndTrace;
+	VectorMA(gPredictedPlayerOrigin, 8192, forward, theEndTrace);
+	bool theDone = false;
+
+	do
+	{
+		gEngfuncs.pEventAPI->EV_PlayerTrace(theStartTrace, theEndTrace, PM_NORMAL, -1, &tr);
+		
+		// Ignore local player, and ignore the player we're spectating
+		int theHit = gEngfuncs.pEventAPI->EV_IndexFromTrace(&tr);
+		if(theHit == theLocalPlayerIndex)
+		{
+			VectorMA(tr.endpos, kHitOffsetAmount, forward, theStartTrace);
+		}
+		// We hit something
+		else if(tr.fraction < 1.0)
+		{
+			physent_t* pe = gEngfuncs.pEventAPI->EV_GetPhysent( tr.ent ); 
+			if(pe)
+			{
+				int thePotentialEntity = pe->info;
+				//if((thePotentialEntity >= 1) && (thePotentialEntity < gEngfuncs.GetMaxClients()))
+				//{
+					outEntityID = pe->info;
+				//}
+			}
+			theDone = true;
+		}
+	} while(!theDone);
+	
+	gEngfuncs.pEventAPI->EV_PopPMStates();
+}
+
+bool AvHHud::GetAlienHelpForMessage(int inMessageID, string& outHelpText, int& outPointCost) const
+{
+	bool theSuccess = false;
+
+	char theNumber[8];
+	sprintf(theNumber, "%d", inMessageID);
+	string theNumberString(theNumber);
+	
+	string theTechHelpText;
+	string theKey = string(kTechNodeHelpPrefix) + theNumberString;
+	if(LocalizeString(theKey.c_str(), theTechHelpText))
+	{
+		string thePointString;
+		if(LocalizeString(kPointsSuffix, thePointString))
+		{
+/*
+			// Lookup point cost
+			for(UpgradeCostListType::const_iterator theIter = this->mPersonalUpgradeCosts.begin(); theIter != this->mPersonalUpgradeCosts.end(); theIter++)
+			{
+				if(theIter->first == inMessageID)
+				{
+					char theCostSuffix[128];
+					sprintf(theCostSuffix, " (%d %s)", theIter->second, thePointString.c_str());
+					outPointCost = theIter->second;
+					theTechHelpText += string(theCostSuffix);
+					outHelpText = theTechHelpText;
+					theSuccess = true;
+					break;
+				}
+			}
+*/
+		}
+	}
+	return theSuccess;
+}
+
+bool AvHHud::GetDoesPlayerHaveOrder() const
+{
+	bool thePlayerHasOrder = false;
+	
+	for(OrderListType::const_iterator theIter = this->mOrders.begin(); theIter != this->mOrders.end(); theIter++)
+	{
+		// Draw the order if the order is for any plays that are in our draw player list
+		EntityInfo theReceiverPlayer = theIter->GetReceiver();
+		
+		cl_entity_s* thePlayer = gEngfuncs.GetLocalPlayer();
+		if(thePlayer)
+		{
+			int thePlayerIndex = thePlayer->index;
+			if (thePlayerIndex == theReceiverPlayer )
+			{
+				thePlayerHasOrder = true;
+				break;
+			}
+		}
+	}
+
+	return thePlayerHasOrder;
+}
+
+		
+bool AvHHud::GetHelpForMessage(int inMessageID, string& outHelpText) const
+{
+	bool theSuccess = false;
+	
+	char theNumber[8];
+	sprintf(theNumber, "%d", (int)inMessageID);
+	string theNumberString(theNumber);
+
+	string theKey = string(kTechNodeLabelPrefix) + theNumberString;
+	string theTechNodeLabel;
+	if(LocalizeString(theKey.c_str(), theTechNodeLabel))
+	{
+		theKey = string(kTechNodeHelpPrefix) + theNumberString;
+		string theTechNodeHelp;
+		if(LocalizeString(theKey.c_str(), theTechNodeHelp))
+		{
+			outHelpText = /*theTechNodeLabel + " " +*/ theTechNodeLabel;
+			theSuccess = true;
+			
+			int theCost;
+			bool theResearchable;
+			float theTime;
+			this->mTechNodes.GetResearchInfo((AvHMessageID)(inMessageID), theResearchable, theCost, theTime);
+			
+			// Add cost
+			if(theCost > 0)
+			{
+				string theCostString;
+				if(AvHSHUGetDoesTechCostEnergy((AvHMessageID)inMessageID))
+				{
+					LocalizeString(kEnergyPrefix, theCostString);
+				}
+				else
+				{
+					LocalizeString(kMessageButtonCost, theCostString);
+				}
+
+				outHelpText += "  ";
+				outHelpText += theCostString;
+				outHelpText += " ";
+				outHelpText += MakeStringFromInt(theCost);
+
+				// Draw description below
+				//outHelpText += "\n";
+				//outHelpText += theTechNodeHelp;
+			}
+		}
+	}
+
+	return theSuccess;
+}
+
+void AvHHud::UpdateMusic(float inCurrentTime)
+{
+	bool theMusicEnabled = false;
+
+	if(this->GetGameStarted())
+	{
+		// If we're entering play mode and music is enabled, allow playing of music
+		if(this->GetHUDPlayMode() != PLAYMODE_READYROOM && (cl_musicenabled->value == 1.0f) && (cl_musicvolume->value > 0))
+		{
+			// Disable music when debugging
+//			#ifndef DEBUG
+			theMusicEnabled = true;
+//			#endif
+		}
+        else
+        {
+            int a = 0;
+        }
+	}
+
+	this->SetMusicAllowed(theMusicEnabled);
+
+	UIHud::UpdateMusic(inCurrentTime);
+}
+
+void AvHHud::UpdatePieMenuControl()
+{
+	// Set which pie menu to use ("" for none)
+	bool theScoreBoardIsOpen = false;
+	
+	ScorePanel* theScoreBoard = gViewPort->GetScoreBoard();
+	if(theScoreBoard && theScoreBoard->isVisible())
+	{
+		theScoreBoardIsOpen = true;
+	}
+	
+	if(theScoreBoardIsOpen)
+	{
+		AvHPieMenuHandler::SetPieMenuControl("");
+	}
+	else
+	{
+		AvHPieMenuHandler::SetPieMenuControl(this->mPieMenuControl);
+	}
+
+    // Clear all nodes in case VGUI didn't catch events (seems to happen with lag)
+    if(!gPieMenuHandler.GetIsPieMenuOpen())
+    {
+        PieMenu* theCurrentPieMenu = gPieMenuHandler.GetActivePieMenu();
+        if(theCurrentPieMenu)
+        {
+            theCurrentPieMenu->SetFadeState(false);
+        }
+    }
+
+    // If we're dead, make sure the popup menu is closed
+    if(!this->GetIsAlive(false))
+    {
+        gPieMenuHandler.ClosePieMenu();
+    }
+}
+
+bool AvHHud::GetEntityInfoString(int inEntityID, string& outEntityInfoString, bool& outIsEnemy)
+{
+	bool theSuccess = false;
+	bool theIsEnemy = false;
+
+	cl_entity_s* theEntity = gEngfuncs.GetEntityByIndex(inEntityID);
+	if(theEntity)
+	{
+		AvHTeamNumber theTeam = this->GetHUDTeam();
+
+		if((inEntityID >= 1) && (inEntityID <= gEngfuncs.GetMaxClients()))
+		{
+			hud_player_info_t thePlayerInfo;
+			gEngfuncs.pfnGetPlayerInfo(inEntityID, &thePlayerInfo);
+
+			string thePrePendString;
+
+			// Don't show cloaked enemies
+			if((theTeam != TEAM_IND) && !this->GetInTopDownMode() && ((theEntity->curstate.team == theTeam) || (theEntity->curstate.rendermode == kRenderNormal)))
+			{
+				//string thePostPendString;
+				if((theEntity->curstate.team == theTeam))
+				{
+					//LocalizeString(kFriendText, thePrePendString);
+					//sprintf(thePostPendString, " (health: %d)", theEntity->curstate.health);
+				}
+				else
+				{
+					LocalizeString(kEnemyText, thePrePendString);
+					theIsEnemy = true;
+				}
+
+				if(thePrePendString != "")
+				{
+					outEntityInfoString = thePrePendString + " - ";
+				}
+			}
+
+			if(thePlayerInfo.name)
+			{
+				outEntityInfoString += thePlayerInfo.name;// + thePostPendString;
+
+				// Get string from status bar and append it
+				const char* theStatusCStr = this->m_StatusBar.GetStatusString();
+				if(strlen(theStatusCStr) > 0)
+				{
+					outEntityInfoString += string(theStatusCStr);
+				}
+
+				outIsEnemy = theIsEnemy;
+				theSuccess = true;
+			}
+			
+			//	sprintf(thePlayerName, "%s (health: %d)", thePlayerInfo.name, thePlayer->curstate.health);
+			//}
+		}
+		else
+		{
+			bool theAutoHelpEnabled = gEngfuncs.pfnGetCvarFloat(kvAutoHelp);
+
+			// Return the type of thing it is
+			AvHUser3 theUser3 = (AvHUser3)(theEntity->curstate.iuser3);
+
+			if(this->GetTranslatedUser3Name(theUser3, outEntityInfoString))
+			{
+				if((theEntity->curstate.team != TEAM_IND) && (theEntity->curstate.team != theTeam))
+				{
+					outIsEnemy = true;
+				}
+
+				// Upper case first character
+				if(outEntityInfoString.length() > 0)
+				{
+					int theFirstChar = outEntityInfoString[0];
+					int theUpperFirstChar = toupper(theFirstChar);
+					outEntityInfoString[0] = theUpperFirstChar;
+				}
+
+				// Assume status bar set to health/armor/info data
+				const char* theStatusCStr = this->m_StatusBar.GetStatusString();
+				bool theHasStatusString = (strlen(theStatusCStr) > 0);
+				if(theHasStatusString)
+				{
+					outEntityInfoString += string(theStatusCStr);
+				}
+
+				if(theAutoHelpEnabled)
+				{
+					string theDescription;
+					bool theIsFriendly = (this->GetHUDTeam() == theEntity->curstate.team);
+					if(this->GetTranslatedUser3Description(theUser3, theIsFriendly, theDescription))
+					{
+						outEntityInfoString += " - " + theDescription;
+					}
+				}
+
+				// Only display help when asked for or important
+				if(theAutoHelpEnabled || theHasStatusString)
+				{
+					theSuccess = true;
+				}
+			}
+		}
+	}
+	
+	return theSuccess;
+}
+
+void AvHHud::UpdateEntityID(float inCurrentTime)
+{
+	this->mBuildingEffectsEntityList.clear();
+
+	bool theSetHelpMessage = false;
+	bool theSetReticleMessage = false;
+
+	//if(this->GetIsAlive())
+	//{
+		//char* theNewPlayerName = NULL;
+		int theEntityIndex = -1;
+		
+		if(this->GetHUDUser3() == AVH_USER3_COMMANDER_PLAYER)
+		{
+			int theCurrentX, theCurrentY;
+			this->GetMousePos(theCurrentX, theCurrentY);
+
+			// Don't show help when mouse is over the UI
+			float theNormX = ((float)theCurrentX)/(ScreenWidth());
+			float theNormY = ((float)theCurrentY)/(ScreenHeight());
+			if(!this->GetIsRegionBlockedByUI(theNormX, theNormY))
+			{
+				Vector theNormRay;
+				
+				CreatePickingRay(theCurrentX, theCurrentY, theNormRay);
+				
+				// Look for player and entities under/near the mouse
+				AvHSHUGetEntityAtRay(this->GetVisualOrigin(), theNormRay, theEntityIndex);
+			}
+			else
+			{
+				int a = 0;
+			}
+		}
+		else if(g_iUser1 != OBS_IN_EYE)
+		{
+			// Trace entity id in front of us
+			this->TraceEntityID(theEntityIndex);
+		}
+		
+		if(this->mSelectingWeaponID != -1)
+		{
+			// Look up help, set our current help to it
+			string theWeaponHelpKey;
+			sprintf(theWeaponHelpKey, kWeaponHelpText, this->mSelectingWeaponID);
+			
+			string theHelpText;
+			if(LocalizeString(theWeaponHelpKey.c_str(), theHelpText))
+			{
+				// Get damage amount from weapon
+				ASSERT(this->mSelectingWeaponID >= 0);
+				ASSERT(this->mSelectingWeaponID < 32);
+				WEAPON* theWeapon = gWR.GetWeapon(this->mSelectingWeaponID);
+				int theDamage = theWeapon->iMax2;
+
+				char theHelpTextWithDamage[1024];
+				sprintf(theHelpTextWithDamage, theHelpText.c_str(), theDamage);
+
+				this->SetHelpMessage(theHelpTextWithDamage);
+				theSetHelpMessage = true;
+			}
+		}
+		else if(this->mTechHelpText != "")
+		{
+			this->SetHelpMessage(this->mTechHelpText, false, .8f, .6f);
+			theSetHelpMessage = true;
+		}
+		else if(this->mSelectingNodeID > 0)
+		{
+			char theNumber[8];
+			sprintf(theNumber, "%d", this->mSelectingNodeID);
+			string theNumberString(theNumber);
+			
+			string theKey = string(kTechNodeHelpPrefix) + theNumberString;
+			if(LocalizeString(theKey.c_str(), this->mReticleInfoText))
+			{
+				string theCostString;
+				if(LocalizeString(kCostMarker, theCostString))
+				{
+					string thePointsString;
+					if(LocalizeString(kPointsSuffix, thePointsString))
+					{
+/*
+						// Lookup point cost
+						for(UpgradeCostListType::iterator theIter = this->mPersonalUpgradeCosts.begin(); theIter != this->mPersonalUpgradeCosts.end(); theIter++)
+						{
+							if(theIter->first == this->mSelectingNodeID)
+							{
+								this->mSelectedNodeResourceCost = theIter->second;
+								
+								char theCostSuffix[128];
+								sprintf(theCostSuffix, "  %s: %d %s", theCostString.c_str(), this->mSelectedNodeResourceCost, thePointsString.c_str());
+								this->mReticleInfoText += string(theCostSuffix);
+								break;
+							}
+						}
+*/
+					}
+					
+					// Don't draw marine sayings, as they are printed on the controls and the aliens are using the titles.txt entries
+					if(this->GetIsMarine())
+					{
+						switch(this->mSelectingNodeID)
+						{
+						case SAYING_1:
+						case SAYING_2:
+						case SAYING_3:
+						case SAYING_4:
+						case SAYING_5:
+						case SAYING_6:
+						case SAYING_7:
+						case SAYING_8:
+						case SAYING_9:
+							this->mReticleInfoText = "";
+							break;
+						}
+					}
+					
+					this->SetHelpMessage(this->mReticleInfoText);
+					theSetHelpMessage = true;
+				}
+			}
+		}
+		
+		if(theEntityIndex > 0)
+		{
+			// Don't draw info for cloaked structures
+			cl_entity_s* theProgressEntity = gEngfuncs.GetEntityByIndex(theEntityIndex);
+			if(theProgressEntity)
+			{
+				if((theProgressEntity->curstate.rendermode != kRenderTransTexture) || (theProgressEntity->curstate.renderamt > kAlienStructureCloakAmount))
+				{
+					if(std::find(this->mBuildingEffectsEntityList.begin(), this->mBuildingEffectsEntityList.end(), theEntityIndex) == this->mBuildingEffectsEntityList.end())
+					{
+						this->mBuildingEffectsEntityList.push_back(theEntityIndex);
+					}
+											
+					bool theEntityIsPlayer = ((theEntityIndex > 0) && (theEntityIndex <= gEngfuncs.GetMaxClients()));
+					
+					string theHelpText;
+					bool theIsEnemy = false;
+					
+					if(this->GetEntityInfoString(theEntityIndex, theHelpText, theIsEnemy))
+					{
+						// Set color to red if enemy, otherise to our HUD color
+						int theR, theG, theB;
+						if(theIsEnemy)
+						{
+							theR = 255;
+							theG = theB = 0;
+						}
+						else
+						{
+							this->GetPrimaryHudColor(theR, theG, theB, true, false);
+						}
+
+						// If we have auto help on, or we're in top down mode, display as help
+						if(gEngfuncs.pfnGetCvarFloat(kvAutoHelp) || this->GetInTopDownMode())
+						{
+							this->SetHelpMessage(theHelpText);
+							
+							this->mHelpMessage.SetRGB(theR, theG, theB);
+
+							theSetHelpMessage = true;
+						}
+						// else, display as reticle message
+						else
+						{
+							this->SetReticleMessage(theHelpText);
+							
+							this->mReticleMessage.SetRGB(theR, theG, theB);
+							
+							theSetReticleMessage = true;
+						}
+					}
+				}
+				else
+				{
+					//char theMessage[128];
+					//sprintf(theMessage, "Entity %d cloaked, not drawing circle.", theProgressEntity->curstate.iuser3);
+					//CenterPrint(theMessage);
+				}
+			}
+			else
+			{
+				int a = 0;
+			}
+		}
+		
+		//if(this->mReticleInfoColorA == 0)
+		//{
+		//	this->mReticleInfoText = "";
+		//}
+	//}
+
+	float theTimePassed = (inCurrentTime - this->mTimeOfLastUpdate);
+	if(!theSetHelpMessage)
+	{
+		this->mHelpMessage.FadeText(theTimePassed, true);
+	}
+	if(!theSetReticleMessage)
+	{
+		this->mReticleMessage.FadeText(theTimePassed, true);
+	}
+}
+
+int	AvHHud::GetMenuTechSlots() const
+{
+	return this->mMenuTechSlots;
+}
+
+const AvHTechNodes& AvHHud::GetTechNodes() const
+{
+	return this->mTechNodes;
+}
+
+void AvHHud::GetTooltipDrawingInfo(float& outNormX, float& outNormY) const
+{
+	outNormX = kHelpMessageLeftEdgeInset;
+	outNormY = kHelpMessageTopEdgeInset;
+
+	if(this->GetPlayMode() == PLAYMODE_READYROOM)
+	{
+		outNormY = 1.0f;
+	}
+	else if(this->GetInTopDownMode())
+	{
+		outNormY = kHelpMessageCommanderTopEdgeInset;
+	}
+	else if(this->GetIsAlien())
+	{
+		outNormY = kHelpMessageAlienTopEdgeInset;
+	}
+
+	outNormY -= kToolTipVerticalSpacing;
+}
+
+string AvHHud::GetRankTitle(bool inShowUnspentLevels) const
+{
+	string theText;
+
+	char* theTeamName = this->GetIsMarine() ? "Marine" : "Alien";
+	int theCurrentLevel = this->GetHUDExperienceLevel();
+
+	char theCharArray[512];
+	sprintf(theCharArray, kRankText, theTeamName, theCurrentLevel);
+	LocalizeString(theCharArray, theText);
+
+	// Add unspent levels, if any
+	int theUnspentLevels = (this->mExperienceLevel - this->mExperienceLevelSpent - 1);
+	if(inShowUnspentLevels && (theUnspentLevels > 0))
+	{
+		// We can't accurately draw player's unspent levels when we're dead, as we only know our own
+		if(this->GetIsAlive(false))
+		{
+			string theUnspentLevelText = "(+" + MakeStringFromInt(theUnspentLevels) + ")";
+			theText += theUnspentLevelText;
+		}
+	}
+	
+	return theText;
+}
+
+void AvHHud::GetReticleTextDrawingInfo(float& outNormX, float& outNormY, bool& outCentered) const
+{
+	outCentered = false;
+	
+	if(this->GetInTopDownMode())
+	{
+		int theCurrentX, theCurrentY;
+		this->GetMousePos(theCurrentX, theCurrentY);
+		outNormX = theCurrentX/(float)ScreenWidth();
+		outNormY = theCurrentY/(float)ScreenHeight();
+
+		// Move text up a bit so it doesn't obscure
+		outNormY -= .1f;
+
+		outCentered = true;
+	}
+	else
+	{
+		if(gEngfuncs.pfnGetCvarFloat(kvCenterEntityID))
+		{
+			outNormX = .5f;
+			outNormY = .5f;
+			outCentered = true;
+		}
+		else
+		{
+			outNormX = kHelpMessageLeftEdgeInset;
+			outNormY = kHelpMessageTopEdgeInset - kReticleMessageHeight;
+
+			// Alien HUD forces this to be inset a bit
+			if(this->GetIsAlien())
+			{
+				outNormX = kHelpMessageAlienLeftedgeInset + kReticleMessageAlienLeftInset;
+				outNormY = kHelpMessageAlienTopEdgeInset - kReticleMessageHeight;
+			}
+		}
+	}
+}
+
+// Assumes that the tooltips aren't centered
+void AvHHud::UpdateTooltips(float inCurrentTime)
+{
+	float theReticleX;
+	float theReticleY;
+	this->GetTooltipDrawingInfo(theReticleX, theReticleY);
+	
+	float theBottomMostY = theReticleY;
+	
+	float theTimePassed = inCurrentTime - this->mTimeOfLastUpdate;
+	float kMovement = 1.0f*theTimePassed;
+	
+	int theBottomScreenY = theBottomMostY*ScreenHeight();
+	
+	// Clear all tooltips on a role change, or on a playmode change
+	AvHUser3 theCurrentUser3 = this->GetHUDUser3();
+	AvHTeamNumber theCurrentTeam = this->GetHUDTeam();
+	AvHPlayMode thePlayMode = this->GetPlayMode();
+
+	if((theCurrentUser3 != this->mLastUser3) || (this->mLastTeamNumber != theCurrentTeam) || ((thePlayMode != this->mLastPlayMode) && (this->mLastPlayMode != PLAYMODE_UNDEFINED)) )
+	{
+		this->mTooltips.clear();
+	}
+
+	// Stuff to get reset on a team change
+	if(this->mLastTeamNumber != theCurrentTeam)
+	{
+		this->mExperienceLevelLastDrawn = 1;
+	}
+	
+	// Run through list, dropping them down as far as they can go.  Assumes the first one in the list is the bottommost one
+	for(AvHTooltipListType::iterator theIter = this->mTooltips.begin(); theIter != this->mTooltips.end(); /* no inc */)
+	{
+		// Recompute settings, if it hasn't been updated before
+		theIter->RecomputeIfNeccessary();
+		
+		// Get height of current tool tip
+		int theTooltipScreenHeight = theIter->GetScreenHeight();
+		
+		// Move it down towards the current limit
+		float theCurrentMinScreenY = theIter->GetNormalizedScreenY();
+		int theCurrentTipScreenBottom = (int)(theCurrentMinScreenY) + theTooltipScreenHeight;
+		
+		float theCurrentMaxNormY = (float)(theBottomScreenY - theTooltipScreenHeight)/ScreenHeight();
+		float theNewNormY = min(theCurrentMaxNormY, (theCurrentMinScreenY + kMovement));
+
+		// Now this is a crazy bug!  In release mode without the following two statements, theNewNormY isn't > theCurrentMinScreenY when it should be.
+		// It's as if a little time is needed between the computation of theNewNormY and using theNewNormY for it to work
+		char theMessage[256];
+		sprintf(theMessage, "theNewNormY %f, minScreenY: %f)", theNewNormY, theCurrentMinScreenY);
+		//CenterPrint(theMessage);
+		
+		// If we moved it down
+		if(theNewNormY > theCurrentMinScreenY)
+		{
+			// Fade it in while it's dropping
+			theIter->FadeText(theTimePassed, false);
+		}
+		else
+		{
+			if(theIter == this->mTooltips.begin())
+			{
+				// If it's at the bottom of the list, start fading it out
+				theIter->FadeText(theTimePassed, true);
+			}
+		}
+		
+		// Set the new position
+		theIter->SetNormalizedScreenY(theNewNormY);
+		
+		// Subtract it's height to the current limit
+		theBottomScreenY -= theTooltipScreenHeight;
+
+		// Subtract out small spacing amount
+		theBottomScreenY -= max(1, kToolTipVerticalSpacing*ScreenHeight());
+		
+		// If it's totally faded out, remove it from the list, else process next
+		int theAlpha = theIter->GetA();
+		if(theAlpha == 0)
+		{
+			theIter = this->mTooltips.erase(theIter);
+		}
+		else
+		{
+			theIter++;
+		}
+
+		//char theTempBuffer[256];
+		//sprintf(theTempBuffer, "UpdateTooltips, alpha: %d\n", theAlpha);
+		//CenterPrint(theTempBuffer);
+	}
+
+	// Update combat upgrade menu too
+	if(this->GetIsCombatMode())
+	{
+		const int kScrollDirection = this->mDrawCombatUpgradeMenu ? 1 : -1;
+		const float kScrollingSpeed = .7f*kScrollDirection;
+		
+		float theXDiff = (theTimePassed*kScrollingSpeed);
+		const float kNormalizedWidth = this->mCombatUpgradeMenu.GetNormalizedMaxWidth();
+
+		const float kLeftEdgeInset = .02f;
+		float theNewX = this->mCombatUpgradeMenu.GetNormalizedScreenX() + theXDiff;
+		theNewX = max(-kNormalizedWidth, theNewX);
+		theNewX = min(theNewX, kLeftEdgeInset);
+
+		this->mCombatUpgradeMenu.SetNormalizedScreenX(theNewX);
+	}
+}
+
+void AvHHud::UpdateStructureNotification(float inCurrentTime)
+{
+	const float kTimeToDisplayIcon = 6.0f;
+	const int kMaxIcons = 5;
+
+	for(StructureHUDNotificationListType::iterator theIter = this->mStructureNotificationList.begin(); theIter != this->mStructureNotificationList.end(); /* no inc */)
+	{
+		if((inCurrentTime > (theIter->mTime + kTimeToDisplayIcon)) || (this->mStructureNotificationList.size() > kMaxIcons))
+		{
+			theIter = this->mStructureNotificationList.erase(theIter);
+		}
+		else
+		{
+			theIter++;
+		}
+	}
+}
+
+
+//void AvHHud::FadeText(float inCurrentTime, bool inFadeDown)
+//{
+//	const float kReticleInfoFadeUpSpeed = 500;
+//	const float kReticleInfoFadeDownSpeed = -150;
+//	
+//	// Fade reticle nicely
+//	int theFadeSpeed = inFadeDown ? kReticleInfoFadeDownSpeed : kReticleInfoFadeUpSpeed;
+//
+//	float theTimePassed = (inCurrentTime - this->mTimeOfLastUpdate);
+//	float theNewAlpha = this->mReticleInfoColorA + theTimePassed*theFadeSpeed;
+//	this->mReticleInfoColorA = max(0, min(255, theNewAlpha));
+//}
+
+float AvHHud::GetTimeOfLastUpdate() const
+{
+	return this->mTimeOfLastUpdate;
+}
+
+void AvHHud::UpdateProgressBar()
+{
+	this->HideProgressStatus();
+	
+	float thePercentage;
+	if(gMiniMap.GetIsProcessing(&thePercentage))
+	{
+		if(gMiniMap.WriteSpritesIfJustFinished())
+		{
+			this->HideProgressStatus();
+		}
+		else
+		{
+			this->SetProgressStatus(thePercentage);
+		}
+	}
+//	else if(this->mProgressBarEntityIndex == -1)
+//	{
+//		this->HideGenericProgressStatus();
+//	}
+	else
+	{
+		// Look up entity, and set progress according to it's fuser1
+		cl_entity_s* theProgressEntity = gEngfuncs.GetEntityByIndex(this->mProgressBarEntityIndex);
+		if(theProgressEntity)
+		{
+			ASSERT(this->mProgressBarParam >= 1);
+			ASSERT(this->mProgressBarParam <= 4);
+
+			float theProgress = 0.0f;
+			switch(this->mProgressBarParam)
+			{
+			case 1:
+				theProgress = theProgressEntity->curstate.fuser1;
+				break;
+			case 2:
+				theProgress = theProgressEntity->curstate.fuser2;
+				break;
+			case 3:
+				theProgress = theProgressEntity->curstate.fuser3;
+				break;
+			case 4: // NOTE: check delta.lst for fuser4, it isn't propagated currently
+				theProgress = theProgressEntity->curstate.fuser4;
+				break;
+			}
+
+			if((this->GetHUDUser3() == AVH_USER3_ALIEN_EMBRYO) || this->GetIsDigesting())
+			{
+				theProgress = pmove->fuser3;
+			}
+			
+			thePercentage = theProgress/kNormalizationNetworkFactor;
+			if(thePercentage < 1.0f)
+			{
+				this->SetProgressStatus(thePercentage);
+			}
+//			else
+//			{
+//				this->HideGenericProgressStatus();
+//			}
+		}
+		else
+		{
+			// Look at selection.  If selection has research and research isn't done, draw research bar.  Else, hide research bar
+			if(this->mSelected.size() == 1)
+			{
+				cl_entity_s* theEntity = gEngfuncs.GetEntityByIndex(*this->mSelected.begin());
+				if(theEntity)
+				{
+					this->HideProgressStatus();
+					this->HideResearchProgressStatus();
+
+					bool theIsBuilding, theIsResearching;
+					float thePercentage;
+					AvHSHUGetBuildResearchState(theEntity->curstate.iuser3, theEntity->curstate.iuser4, theEntity->curstate.fuser1, theIsBuilding, theIsResearching, thePercentage);
+					
+					if(theIsBuilding && (thePercentage > 0.0f) && (thePercentage < 1.0f))
+					{
+						// Turned off progress bar now that we have circular build icons
+						//this->SetGenericProgressStatus(thePercentage);
+					}
+					else if(theIsResearching && (thePercentage > 0) && (thePercentage < 1.0f))
+					{
+						this->SetResearchProgressStatus(thePercentage);
+					}
+				}
+			}
+		}
+	}
+}
+
+void AvHHud::GhostBuildingCallback(struct tempent_s* inEntity, float inFrametime, float inCurrentTime)
+{
+	if(this->mGhostBuilding != MESSAGE_NULL)
+	{
+		// Don't let it die
+		inEntity->die = gClientTimeLastUpdate + 2.0f;
+		
+		// Update position to be where mouse is
+		VectorCopy(this->mGhostWorldLocation, inEntity->entity.origin);
+		
+		// Visually indicate whether this is a valid position or not
+		if(this->mCurrentGhostIsValid)
+		{
+			inEntity->entity.curstate.renderfx = kRenderFxGlowShell;
+			inEntity->entity.curstate.rendercolor.r = 0;
+			inEntity->entity.curstate.rendercolor.g = 255;
+			inEntity->entity.curstate.rendercolor.b = 0;
+			inEntity->entity.curstate.renderamt = kShellRenderAmount;
+		}
+		else
+		{
+			inEntity->entity.curstate.renderfx = kRenderFxGlowShell;
+			inEntity->entity.curstate.rendercolor.r = 255;
+			inEntity->entity.curstate.rendercolor.g = 0;
+			inEntity->entity.curstate.rendercolor.b = 0;
+			inEntity->entity.curstate.renderamt = kShellRenderAmount;
+		}
+	}
+	else
+	{
+		// Kill it off immediately
+		inEntity->die = gClientTimeLastUpdate;
+	}
+}
+
+void AvHHud::UpdateBuildingPlacement()
+{
+	if(this->mGhostBuilding != MESSAGE_NULL)
+	{
+		// Fetch current mouse up/down state from gScrollHandler and store
+		bool theMouseOneDown = gScrollHandler.GetMouseOneDown() && !gCommanderHandler.GetMouseOneDown();
+		bool theMouseTwoDown = gScrollHandler.GetMouseTwoDown();
+		
+		// If we haven't created the temp entity, create it
+		if(!this->mCreatedGhost)
+		{
+			// Create the temporary entity
+			int theModelIndex;
+			char* theModelName = AvHSHUGetBuildTechModelName(this->mGhostBuilding);
+			if(theModelName)
+			{
+				if(this->mLastGhostBuilding)
+				{
+					this->mLastGhostBuilding->die = -1;
+					this->mLastGhostBuilding = NULL;
+				}
+
+				vec3_t theOrigin = this->GetVisualOrigin();
+				struct model_s* theModel = gEngfuncs.CL_LoadModel(theModelName, &theModelIndex);
+				TEMPENTITY* theTempEntity = gEngfuncs.pEfxAPI->CL_TentEntAllocCustom(gPredictedPlayerOrigin, theModel, 0, CLinkGhostBuildingCallback);
+				if(theTempEntity)
+				{
+					theTempEntity->die += 10.0f;
+					theTempEntity->flags |= FTENT_PERSIST;
+					// Temp entities interpret baseline origin as velocity.
+					VectorCopy(vec3_origin, theTempEntity->entity.baseline.origin);
+
+					// Set special properties for some models
+					if(this->mGhostBuilding == BUILD_SCAN)
+					{
+						theTempEntity->entity.curstate.rendermode = kRenderTransAdd;
+						theTempEntity->entity.curstate.renderamt = 255;
+
+						theTempEntity->entity.baseline.rendermode = kRenderTransAdd;
+						theTempEntity->entity.baseline.renderamt = 255;
+					}
+
+					this->mCreatedGhost = true;
+				}
+
+				this->mLastGhostBuilding = theTempEntity;
+			}
+		}
+
+		// Update location we draw ghosted entity
+		int theMouseX, theMouseY;
+		this->GetMousePos(theMouseX, theMouseY);
+
+		Vector theNormMousePos;
+		CreatePickingRay(theMouseX, theMouseY, theNormMousePos);
+
+        //char theMessage[256];
+        //sprintf(theMessage, "Ghost: %f, %f, %f", this->mGhostWorldLocation[0], this->mGhostWorldLocation[1],this->mGhostWorldLocation[2]);
+		//CenterPrint(theMessage);
+		
+		// Was either mouse button pressed?
+		bool theMouseOneReleased = (theMouseOneDown && !this->mMouseOneDown);
+		bool theMouseTwoReleased = (theMouseTwoDown && !this->mMouseTwoDown);
+		if(theMouseOneReleased)
+		{
+			VectorCopy(this->mLeftMouseWorldStart, this->mNormBuildLocation);
+		}
+		else if(theMouseTwoReleased)
+		{
+			VectorCopy(this->mRightMouseWorldStart, this->mNormBuildLocation);
+		}
+
+		// Test to see if we're in a valid position
+		this->mCurrentGhostIsValid = false;
+		
+		vec3_t theLocation;
+		if(AvHSHUTraceAndGetIsSiteValidForBuild(this->mGhostBuilding, this->GetVisualOrigin(), theNormMousePos, &theLocation))
+		{
+			// Update with cost and research info
+			bool theIsResearchable;
+			int theCost;
+			float theTime;
+			if(this->mTechNodes.GetResearchInfo(this->mGhostBuilding, theIsResearchable, theCost, theTime))
+			{
+				// Ghost is valid if message available and 
+					// we have enough resources OR 
+					// tech takes energy and we have enough energy
+				this->mCurrentGhostIsValid = false;
+
+				if(this->mTechNodes.GetIsMessageAvailable(this->mGhostBuilding))
+				{
+					bool theTakesEnergy = AvHSHUGetDoesTechCostEnergy(this->mGhostBuilding);
+					if((theCost <= this->mResources) || (theTakesEnergy))
+					{
+						this->mCurrentGhostIsValid = true;
+					}
+				}
+			}
+		}
+
+		// Draw at selection start range * invalid range multiplier if invalid placement, draw on at target location if valid
+		//VectorMA(this->GetVisualOrigin(), kSelectionStartRange*kBuildInvalidRangeMultiplier, theNormMousePos, this->mGhostWorldLocation);
+		VectorMA(this->GetVisualOrigin(), kSelectionStartRange*8, theNormMousePos, this->mGhostWorldLocation);
+		//if(this->mCurrentGhostIsValid)
+		//{
+			VectorCopy(theLocation, this->mGhostWorldLocation);
+		//}
+
+		if((theMouseOneReleased) || (theMouseTwoReleased))
+		{
+			// If this is a valid location
+			if(this->mCurrentGhostIsValid)
+			{
+				// Play sound
+				this->PlayHUDSound(HUD_SOUND_PLACE_BUILDING);
+
+				// Remember it for input to grab
+				this->mValidatedBuilding = this->mGhostBuilding;
+			}
+		}
+	}
+}
+
+void AvHHud::CancelBuilding()
+{
+    SetGhostBuildingMode(MESSAGE_NULL);
+    this->mValidatedBuilding = MESSAGE_NULL;
+}
+
+void AvHHud::UpdateSelection()
+{
+	// Fetch current mouse up/down state from gScrollHandler and store
+	bool theMouseOneDown = gScrollHandler.GetMouseOneDown() && !gCommanderHandler.GetMouseOneDown();
+	bool theMouseTwoDown = gScrollHandler.GetMouseTwoDown();
+
+	int theCurrentX, theCurrentY;
+	this->GetMousePos(theCurrentX, theCurrentY);
+
+	CreatePickingRay(theCurrentX, theCurrentY, this->mMouseWorldPosition);
+	//ASSERT(this->mMouseWorldPosition.z < 0.0f);
+
+	// Left mouse button // 
+	// If mouse just pressed, set starting point
+	if(theMouseOneDown && !this->mMouseOneDown)
+	{
+		this->mMouseOneStartX = theCurrentX;
+		this->mMouseOneStartY = theCurrentY;
+		this->mLeftMouseStarted = true;
+
+		//CreatePickingRay(theCurrentX, theCurrentY, this->mLeftMouseWorldStart);
+		//ASSERT(this->mLeftMouseWorldStart.z < 0.0f);
+		VectorCopy(this->mMouseWorldPosition, this->mLeftMouseWorldStart);
+	}
+	else
+	{
+		this->mLeftMouseStarted = false;
+	}
+
+	// If mouse just released, set flag to indicate selection just changed
+	if(!theMouseOneDown && this->mMouseOneDown)
+	{
+		//CreatePickingRay(theCurrentX, theCurrentY, this->mLeftMouseWorldEnd);
+		//ASSERT(this->mLeftMouseWorldEnd.z < 0.0f);
+		VectorCopy(this->mMouseWorldPosition, this->mLeftMouseWorldEnd);
+		
+		//this->mSelectionJustChanged = true;
+		this->mLeftMouseEnded = true;
+	}
+	else
+	{
+		this->mLeftMouseEnded = false;
+	}
+
+	// Right mouse button // 
+	// If mouse two just pressed, set starting point
+	if(theMouseTwoDown && !this->mMouseTwoDown)
+	{
+		this->mMouseTwoStartX = theCurrentX;
+		this->mMouseTwoStartY = theCurrentY;
+		this->mRightMouseStarted = true;
+		
+		//CreatePickingRay(theCurrentX, theCurrentY, this->mRightMouseWorldStart);
+		//ASSERT(this->mRightMouseWorldStart.z < 0.0f);
+		VectorCopy(this->mMouseWorldPosition, this->mRightMouseWorldStart);
+	}
+	else
+	{
+		this->mRightMouseStarted = false;
+	}
+	
+	// If mouse just released, set flag to indicate selection just changed
+	if(!theMouseTwoDown && this->mMouseTwoDown)
+	{
+		//CreatePickingRay(theCurrentX, theCurrentY, this->mRightMouseWorldEnd);
+		//ASSERT(this->mRightMouseWorldEnd.z < 0.0f);
+		VectorCopy(this->mMouseWorldPosition, this->mRightMouseWorldEnd);
+		
+		//this->mSelectionJustChanged = true;
+		this->mRightMouseEnded = true;
+	}
+	else
+	{
+		this->mRightMouseEnded = false;
+	}
+
+	// Set extents of marquee control
+	this->mSelectionBox->SetStartPos(this->mMouseOneStartX, this->mMouseOneStartY);
+	this->mSelectionBox->SetEndPos(theCurrentX, theCurrentY);
+	
+	// Set visibility state of marquee control
+	//this->mSelectionBox->setVisible(theMouseOneDown);
+    this->mSelectionBox->setVisible(false);
+    
+    this->mSelectionBoxX1 = mMouseOneStartX;
+    this->mSelectionBoxY1 = mMouseOneStartY;
+    this->mSelectionBoxX2 = theCurrentX;
+    this->mSelectionBoxY2 = theCurrentY;
+    
+    this->mSelectionBoxVisible = theMouseOneDown;
+
+	// If we're just selecting stuff, don't want to hit this button by mistake
+	//gCommanderHandler.SetActive(!theMouseOneDown);
+
+	// Change context sensitive cursor depending on current position
+	//if(this->mSelected.size() > 0)
+	//{
+	if(this->mGhostBuilding == MESSAGE_NULL)
+	{
+		Vector theCurrentMouseRay;
+ 		CreatePickingRay(theCurrentX, theCurrentY, theCurrentMouseRay);
+
+		int theTargetIndex;
+		AvHOrderTargetType theTargetType;
+		Vector theTargetLocation;
+		AvHUser3 theUser3 = AVH_USER3_NONE;
+		AvHOrderType theOrderType = AvHGetDefaultOrderType(this->GetHUDTeam(), this->GetVisualOrigin(), theCurrentMouseRay, theTargetIndex, theTargetLocation, theUser3, theTargetType);
+		// Test UI blocking
+//		theOrderType = ORDERTYPEL_DEFAULT;
+//		if(!AvHSHUGetIsRegionBlockedByUI((float)theCurrentX/ScreenWidth, (float)theCurrentY/ScreenHeight))
+//		{
+//			theOrderType = ORDERTYPET_GUARD;
+//		}
+//		this->SetCursor(theOrderType);
+
+		// Change cursor depending on order type
+		//if(theOrderType != ORDERTYPEL_MOVE && this->mSelected.size() > 0 )
+		//{
+//			if(!this->GetIsRegionBlockedByUI(theCurrentX/ScreenWidth(), theCurrentY/ScreenHeight()))
+//			{
+				//this->SetCursor(theOrderType);
+//			}
+		//}
+	}
+	//}
+
+	#ifdef AVH_PREDICT_SELECT
+	if(this->mLeftMouseEnded)
+	{
+
+// Debug code to draw little triangles in the area that you marquee select.  Uncomment to test again.
+//		// Loop through set of points near our origin, adding an effect for each one if it is in the area
+//		gTriDebugLocations.clear();
+//		Vector theBasePoint;
+//		VectorCopy(gEngfuncs.GetLocalPlayer()->origin, theBasePoint);
+//		float thePlaneABCD[4];
+//		thePlaneABCD[0] = thePlaneABCD[1] = thePlaneABCD[4] = 0;
+//		thePlaneABCD[2] = 1;
+//
+//		const int kRange = 50;
+//		const float kMultiplier = 5.0f;
+//		for(int i = -kRange; i <= kRange; i++)
+//		{
+//			for(int j = -kRange; j <= kRange; j++)
+//			{
+//				float theZ = theBasePoint.z - 100;
+//				Vector theCurrentPoint(theBasePoint.x + i*kMultiplier, theBasePoint.y + j*kMultiplier, theZ);
+//
+//				Vector theEyeToEntity(theCurrentPoint.x - theBasePoint.x, theCurrentPoint.y - theBasePoint.y, theCurrentPoint.z - theBasePoint.z);
+//				VectorNormalize(theEyeToEntity);
+//
+//				if(IsVectorBetweenBoundingVectors(theBasePoint, theEyeToEntity, this->mLeftMouseWorldStart, this->mLeftMouseWorldEnd, thePlaneABCD))
+//				{
+//					DebugPoint theDebugPoint(theCurrentPoint.x, theCurrentPoint.y, theCurrentPoint.z);
+//					gTriDebugLocations.push_back(theDebugPoint);
+//				}
+//			}
+//		}
+
+
+		// Select all units at this click or in this area (but don't select when clicking a building down)
+		if(!this->mPlacingBuilding)
+		{
+			gSelectionHelper.QueueSelection(this->GetVisualOrigin(), this->mLeftMouseWorldStart, this->mLeftMouseWorldEnd, this->GetHUDTeam());
+			gSelectionHelper.ProcessPendingSelections();
+		}
+	}
+
+	if(gSelectionHelper.SelectionResultsWaiting())
+	{
+		EntityListType theNewSelection;
+		gSelectionHelper.GetAndClearSelection(theNewSelection);
+//		this->mNumLocalSelectEvents++;
+		
+		if(theNewSelection != this->mSelected)
+		{
+			this->mSelected = theNewSelection;
+			this->mSelectionJustChanged = true;
+		}
+
+		this->ClearTrackingEntity();
+	}
+	#endif
+
+	// If selection just changed, make sure we have selection effects for everyone
+	if(this->mSelectionJustChanged)
+	{
+		// Create effects
+		this->SetSelectionEffects(this->mSelected);
+
+		this->PlayHUDSound(HUD_SOUND_SELECT);
+
+		gCommanderHandler.SetSelectedUnits(this->mSelected);
+
+		// Clear flag
+		this->mSelectionJustChanged = false;
+		
+//		// Set default order mode
+//		if(this->mSelected.size() > 0)
+//		{
+//			this->mOrderMode = ORDERTYPEL_DEFAULT;
+//		}
+//		else
+//		{
+//			this->mOrderMode = ORDERTYPE_UNDEFINED;
+//		}
+	}
+
+	this->UpdateBuildingPlacement();
+				
+	// Store current mouse state
+	this->mMouseOneDown = theMouseOneDown;
+	this->mMouseTwoDown = theMouseTwoDown;
+}
+
+void AvHHud::UpdateBuildResearchText()
+{
+	// Hide unchanging ("unhelpful"?) help text after this amount of time
+	const float kHelpTextInterval = 2.5f;
+
+	if(this->GetHUDUser3() == AVH_USER3_COMMANDER_PLAYER)
+	{
+		Label* theHelpTextLabel = NULL;
+		if(this->GetManager().GetVGUIComponentNamed(kTechHelpText, theHelpTextLabel))
+		{
+			gCommanderHandler.RecalculateBuildResearchText();
+
+			// Display build/research text
+			string theBuildResearchText = gCommanderHandler.GetBuildResearchText();
+			theHelpTextLabel->setText(theBuildResearchText.c_str());
+				
+			// Center it
+			int theWidth, theHeight;
+			theHelpTextLabel->getTextSize(theWidth, theHeight);
+			
+			int theX, theY;
+			theHelpTextLabel->getPos(theX, theY);
+			
+			int theScreenWidth = ScreenWidth();
+			theHelpTextLabel->setPos(theScreenWidth/2 - theWidth/2, theY);
+			
+			// Vanish if no text (but keep build/research text visible)
+			theHelpTextLabel->setVisible(true);
+			if(theBuildResearchText.length() == 0)// || ((this->mTimeLastHelpTextChanged != -1) && (this->mTimeLastHelpTextChanged + kHelpTextInterval < this->mTimeOfLastUpdate)))
+			{
+				theHelpTextLabel->setVisible(false);
+			}
+
+			// Display action button tool tip
+			string theTechHelpText = gCommanderHandler.GetTechHelpText();
+			if(theTechHelpText != "")
+			{
+				this->SetActionButtonHelpMessage(theTechHelpText);
+			}
+
+			if(theTechHelpText != this->mPreviousHelpText)
+			{
+				this->mTimeLastHelpTextChanged = this->mTimeOfLastUpdate;
+			}
+
+			this->mPreviousHelpText = theTechHelpText;
+		}
+	}
+}
+
+void AvHHud::UpdateTechNodes()
+{
+	this->UpdateBuildResearchText();
+	
+	// Don't get new node until existing one has been processed
+	if(this->mTechEvent == MESSAGE_NULL)
+	{
+		//if(this->mGameStarted)
+		//{
+			//AvHTechNode theTechNode;
+			//if(gCommanderHandler.GetAndClearTechNodePressed(theTechNode))
+			AvHMessageID theMessageID;
+			if(gCommanderHandler.GetAndClearTechNodePressed(theMessageID))
+			{
+				// Check for grouping and request events and handle separately
+				if(this->mTechNodes.GetIsMessageAvailable(theMessageID))
+				{
+					bool theIsResearchable;
+					int theCost;
+					float theTime;
+					
+					if(this->mTechNodes.GetResearchInfo(theMessageID, theIsResearchable, theCost, theTime))
+					{
+						if(AvHSHUGetIsBuildTech(theMessageID))
+						{
+							// Don't check for enough points yet, they might get enough points before they put it down
+
+							// Get ready to build it, don't send a research message
+							this->SetGhostBuildingMode(theMessageID);
+						}
+						else if(AvHSHUGetIsResearchTech(theMessageID) && theIsResearchable)
+						{
+							// If we hit cancel, and we're in building mode, get out of build mode and throw event away
+							if((theMessageID == MESSAGE_CANCEL) && (this->GetGhostBuilding() != MESSAGE_NULL))
+							{
+								CancelBuilding();
+							}
+							else if(theCost <= this->mResources)
+							{
+								this->mTechEvent = theMessageID;
+							}
+							else
+							{
+								// Emit error message that you don't have the resources
+								this->PlayHUDSound(HUD_SOUND_MARINE_MORE);
+							}
+						}
+						else if(theMessageID == BUILD_RECYCLE)
+						{
+							this->mTechEvent = theMessageID;
+						}
+					}
+					else
+					{
+						this->mTechEvent = theMessageID;
+					}
+				}
+				else if((theMessageID >= SAYING_1) && (theMessageID <= SAYING_9))
+				{
+					this->mTechEvent = theMessageID;
+				}
+			}
+			//}
+	}
+}
+
+void AvHHud::UpdateAmbientSounds()
+{
+	Vector theListenerPosition;
+	VectorCopy(gPredictedPlayerOrigin, theListenerPosition);
+	
+	// Commanders have a different PAS then themselves
+	if(this->mInTopDownMode)
+	{
+		VectorCopy(this->mCommanderPAS, theListenerPosition);
+	}
+	
+	for(AmbientSoundListType::iterator theIter = this->mAmbientSounds.begin(); theIter != this->mAmbientSounds.end(); theIter++)
+	{
+		theIter->StartPlayingIfNot();
+		theIter->UpdateVolume(theListenerPosition);
+	}
+}
+
+void AvHHud::UpdateFromEntities(float inCurrentTime)
+{
+	// Only update every so often for performance reasons
+	const float kEntityUpdateInterval = .4f;
+	if(inCurrentTime > (this->mTimeOfLastEntityUpdate + kEntityUpdateInterval))
+	{
+		this->mHelpIcons.clear();
+		this->mHelpEnts.clear();
+		
+		bool theAutoHelpEnabled = gEngfuncs.pfnGetCvarFloat(kvAutoHelp);
+
+		// Clear help icons
+		this->mHelpEnts.clear();
+		
+		// Clear building effects
+		//this->mBuildingEffectsEntityList.clear();
+		
+		this->mTimeOfLastEntityUpdate = inCurrentTime;
+		
+		// Scan for entities, adding help icons
+		// Only draw if enabled
+		const int kHelpDistance = 350;
+		const int kBuildDistance = 500;
+		const int kHealthDistance = 125;
+			
+		// Look for entities that have help icons in front of us.  Don't search to far away, it could give players away.
+		EntityListType theHelpEntities;
+		AvHSHUGetEntities(-1, theHelpEntities);
+		
+		cl_entity_t* theLocalPlayer = gEngfuncs.GetLocalPlayer();
+		
+		for(EntityListType::iterator theIter = theHelpEntities.begin(); theIter != theHelpEntities.end(); theIter++)
+		{
+			vec3_t theLocation;
+			if(AvHSHUGetEntityLocation(*theIter, theLocation))
+			{
+				float theDistance = VectorDistance((float*)&theLocation, theLocalPlayer->origin);
+				if(theDistance < kHelpDistance)
+				{
+					// If iuser3 isn't 0, try looking up an icon for it
+					physent_t* theEntity = gEngfuncs.pEventAPI->EV_GetPhysent(*theIter);
+					if(theEntity)
+					{
+						// Don't add cloaked entities (I wish this could be more general purpose)
+						if((theEntity->team == this->GetHUDTeam()) || (theEntity->rendermode == kRenderNormal))
+						{
+							int theUser3 = theEntity->iuser3;
+							vec3_t theEntityOrigin = AvHSHUGetRealLocation(theEntity->origin, theEntity->mins, theEntity->maxs);
+
+							// Some entities always draw
+							bool theAlwaysDraw = false;
+							switch(theUser3)
+							{
+							case AVH_USER3_WELD:
+							//case AVH_USER3_COMMANDER_STATION:
+							//case AVH_USER3_HIVE:
+								theAlwaysDraw = true;
+								break;
+							}
+
+							if(theAutoHelpEnabled || theAlwaysDraw)
+							{
+								this->mHelpIcons.push_back( make_pair(theEntityOrigin, theUser3) );
+								
+								// Push back entity for displaying helpful tooltips
+								this->mHelpEnts.push_back(*theIter);
+							}
+							
+//							// If entity is buildable and within a certain distance, add it to have it's building effects potentially drawn
+//							if(!this->GetInTopDownMode())
+//							{
+//								// Draw if in large radius and unbuilt, or if close by whether it's built or not
+//								if((GetHasUpgrade(this->GetLocalUpgrades(), MASK_BUILDABLE) && (theDistance < kBuildDistance)) || (theDistance < kHealthDistance))
+//								{
+//									// Only put it in if it doesn't exist already
+//									int theEntity = *theIter;
+//									if(std::find(this->mBuildingEffectsEntityList.begin(), this->mBuildingEffectsEntityList.end(), theEntity) == this->mBuildingEffectsEntityList.end())
+//									{
+//										this->mBuildingEffectsEntityList.push_back(theEntity);
+//									}
+//								}
+//							}
+						}
+						else
+						{
+							int a = 0;
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+void AvHHud::UpdateViewModelEffects()
+{
+	cl_entity_t* theViewModel = GetViewEntity();
+	if(theViewModel)
+	{
+		int theRenderMode = kRenderNormal;
+		int theRenderAmount = 0;
+		int theRenderFx = theViewModel->curstate.renderfx;
+		color24 theRenderColor = theViewModel->curstate.rendercolor;
+		short theSkin = 0;
+
+		// Set the skin, stored in playerclass
+		
+        //cl_entity_s* theLocalPlayer = gEngfuncs.GetLocalPlayer();
+
+        // Use the visible player so that when we are spectating we can tell
+        // when the player is cloaked.
+        cl_entity_s* theLocalPlayer = GetVisiblePlayer();
+
+		if(theLocalPlayer)
+		{
+			
+			//theViewModel->curstate.skin = theLocalPlayer->curstate.skin;
+			theRenderMode = theLocalPlayer->curstate.rendermode;
+			theRenderAmount = theLocalPlayer->curstate.renderamt;
+			theRenderFx = theLocalPlayer->curstate.renderfx;
+			theRenderColor = theLocalPlayer->curstate.rendercolor;
+			theSkin = theLocalPlayer->curstate.skin;
+			// Hack to make cloaking work for viewmodels (if only view models rendered in additive properly).  
+			// Draw view model normally unless fully cloaked.
+			//bool theIsCloakedViaUpgrade = GetHasUpgrade(theLocalPlayer->curstate.iuser4, MASK_ALIEN_CLOAKED);
+			int old=theRenderAmount;
+			if((theRenderMode == kRenderTransTexture) /*|| theIsCloakedViaUpgrade*/)
+			{
+				theRenderFx = kRenderFxNone;
+				theRenderColor.r = theRenderColor.g = theRenderColor.b = 0;
+
+				if ( theRenderAmount ==  kAlienSelfCloakingBaseOpacity ) 
+				{
+					theRenderMode = kAlienCloakViewModelRenderMode;
+					theRenderAmount = 10;
+				}
+				else if( theRenderAmount > kAlienSelfCloakingBaseOpacity && theRenderAmount < 186)
+				{
+					theRenderMode = kAlienCloakViewModelRenderMode;
+					theRenderAmount = 40;
+				}
+				else if ( theRenderAmount == 186 )  {
+					theRenderMode = kAlienCloakViewModelRenderMode;
+					theRenderAmount = 50;
+				}
+				else
+				{
+					theRenderMode = kRenderNormal;
+					theRenderAmount = 255;
+				}
+			}
+
+
+			//char theMessage[128];
+			//sprintf(theMessage, "Setting view model mode: %d amount: %d\n", theRenderMode, theRenderAmount);
+			//CenterPrint(theMessage);
+		}
+
+//		if(GetHasUpgrade(this->GetLocalUpgrades(), MASK_ALIEN_CLOAKED))
+//		{
+//			theRenderMode = kAlienCloakViewModelRenderMode;
+//			int theCloakingLevel = AvHGetAlienUpgradeLevel(this->GetLocalUpgrades(), MASK_UPGRADE_7);
+//			theRenderAmount = kAlienCloakViewModelAmount - theCloakingLevel*kAlienCloakViewModelLevelAmount;
+//		
+//			// Put in color, because texture rendering needs it
+//			theRenderFx = kRenderFxNone;
+//			theRenderColor.r = theRenderColor.g = theRenderColor.b = 0;
+//		}
+		
+		if(this->mInTopDownMode)
+		{
+			theRenderMode = kRenderTransAdd;
+			theRenderAmount = 1;
+		}
+
+		theViewModel->curstate.skin = theSkin;
+		theViewModel->curstate.rendermode = theRenderMode;
+		theViewModel->curstate.renderamt = theRenderAmount;
+		theViewModel->curstate.renderfx = theRenderFx;
+		theViewModel->curstate.rendercolor = theRenderColor;
+	}
+}
+
+void AvHHud::UpdateResources(float inTimePassed)
+{
+	const float kResourceRate = this->GetMaxAlienResources()/50.0f;
+	int thePointsToMove = max(inTimePassed*kResourceRate, 1);
+
+	// Update visual resources if different this resources
+	if(this->mVisualResources != this->mResources)
+	{
+		if(abs(this->mVisualResources - this->mResources) <= thePointsToMove)
+		{
+			this->mVisualResources = this->mResources;
+		}
+		else
+		{
+			if(this->mVisualResources < this->mResources)
+			{
+				this->mVisualResources += thePointsToMove;
+			}
+			else
+			{
+				this->mVisualResources -= thePointsToMove;
+			}
+		}
+	}
+
+	// Smoothly adjust energy level
+	float theCurrentEnergyLevel = pmove->fuser3/kNormalizationNetworkFactor;
+
+	if((g_iUser1 == OBS_IN_EYE) && (g_iUser2 != this->mUser2OfLastEnergyLevel))
+	{
+		// This isn't working yet
+		this->mVisualEnergyLevel = theCurrentEnergyLevel;
+		this->mUser2OfLastEnergyLevel = g_iUser2;
+	}
+	else
+	{
+		float kEnergyRate = 1.0f;
+		float theEnergyToMove = inTimePassed*kEnergyRate;
+		if(this->mVisualEnergyLevel != theCurrentEnergyLevel)
+		{
+			float theDiff = fabs(this->mVisualEnergyLevel - theCurrentEnergyLevel);
+			if(theDiff <= theEnergyToMove)
+			{
+				this->mVisualEnergyLevel = theCurrentEnergyLevel;
+			}
+			else
+			{
+				if(this->mVisualEnergyLevel < theCurrentEnergyLevel)
+				{
+					this->mVisualEnergyLevel += theEnergyToMove;
+				}
+				else
+				{
+					this->mVisualEnergyLevel -= theEnergyToMove;
+				}
+			}
+		}
+	}
+	
+	string theResourceText;
+	char theResourceBuffer[64];
+	
+	if(this->GetInTopDownMode() && this->mCommanderResourceLabel)
+	{
+		LocalizeString(kMarineResourcePrefix, theResourceText);
+		sprintf(theResourceBuffer, "%s %d", theResourceText.c_str(), this->mVisualResources);
+		this->mCommanderResourceLabel->setText(64, theResourceBuffer);
+	}
+
+	// Update visual resource indicators, expiring old ones
+	const float kNumericalInfoEffectLifetime = 1.1f;
+	const float kNumericalInfoScrollSpeed = 24;
+	for(NumericalInfoEffectListType::iterator theIter = this->mNumericalInfoEffects.begin(); theIter != this->mNumericalInfoEffects.end(); /* no inc */)
+	{
+		if((theIter->GetTimeCreated() + kNumericalInfoEffectLifetime) < this->mTimeOfLastUpdate)
+		{
+			theIter = this->mNumericalInfoEffects.erase(theIter);
+		}
+		else
+		{
+			// Update position
+			float thePosition[3];
+			theIter->GetPosition(thePosition);
+
+			thePosition[2] += inTimePassed*kNumericalInfoScrollSpeed;
+
+			theIter->SetPosition(thePosition);
+
+			// Next
+			theIter++;
+		}
+	}
+}
+
+
+
+
+//void AvHHud::ChangeUpgradeCosts(int inOldMessageID, int inNewMessageID, const char* inText)
+//{
+//	this->ChangeUpgradeCostsForMenu(this->mSoldierMenu, inOldMessageID, inNewMessageID, inText);
+//	this->ChangeUpgradeCostsForMenu(this->mLeaderMenu, inOldMessageID, inNewMessageID, inText);
+//	this->ChangeUpgradeCostsForMenu(this->mCommanderMenu, inOldMessageID, inNewMessageID, inText);
+//
+//	this->UpdateUpgradeCosts();
+//}
+//
+//void AvHHud::ChangeUpgradeCostsForMenu(PieMenu* inMenu, int inOldMessageID, int inNewMessageID, const char* inText)
+//{
+//	if(inMenu)
+//	{
+//		inMenu->ChangeNode(inOldMessageID, inNewMessageID, string(inText));
+//	}
+//}
+//
+//void AvHHud::ResetUpgradeCosts()
+//{
+//	this->ResetUpgradeCostsForMenu(this->mSoldierMenu);
+//	this->ResetUpgradeCostsForMenu(this->mLeaderMenu);
+//	this->ResetUpgradeCostsForMenu(this->mCommanderMenu);
+//
+//	this->UpdateUpgradeCosts();
+//}
+
+//void AvHHud::ResetUpgradeCostsForMenu(PieMenu* inMenu)
+//{
+//	if(inMenu)
+//	{
+//		inMenu->ResetToDefaults();
+//	}
+//}
+
+bool AvHHud::GetParticlesVisible() const
+{
+    
+    if (g_iUser1 == OBS_NONE)
+    {
+        return true;
+    }
+    
+    if (m_Spectator.IsInOverviewMode())
+    {
+        return m_Spectator.m_iDrawCycle == 1;
+    }
+    else
+    {
+        return true;
+    }
+
+}
+
+// Sprite drawing on a level change is problematic and can cause crashing or disconcerting "no such sprite" error messages
+bool AvHHud::GetSafeForSpriteDrawing() const
+{
+	bool theSafeForDrawing = false;
+
+	const char* theLevelName = gEngfuncs.pfnGetLevelName();
+	string theCurrentMapName = this->GetMapName(true);
+	if(theLevelName && (theCurrentMapName != ""))
+	{
+		string theLevelNameString(theLevelName);
+		int thePos = theLevelNameString.find(theCurrentMapName);
+		if(thePos != string::npos)
+		{
+			theSafeForDrawing = true;
+		}
+		else
+		{
+			int a = 0;
+		}
+	}
+
+	return theSafeForDrawing;
+}
+
+bool AvHHud::GetShouldDisplayUser3(AvHUser3 inUser3) const
+{
+	bool theShouldDisplay = false;
+
+	if((inUser3 > AVH_USER3_NONE) && (inUser3 < AVH_USER3_MAX))
+	{
+		theShouldDisplay = true;
+
+		switch(inUser3)
+		{
+		case AVH_USER3_BREAKABLE:
+		case AVH_USER3_USEABLE:
+		case AVH_USER3_PARTICLE_ON:
+		case AVH_USER3_PARTICLE_OFF:
+		case AVH_USER3_ALPHA:
+		case AVH_USER3_WAYPOINT:
+		case AVH_USER3_NOBUILD:
+		case AVH_USER3_SPAWN_TEAMONE:
+		case AVH_USER3_SPAWN_TEAMTWO:
+			theShouldDisplay = false;
+			break;
+		}
+	}
+	
+	return theShouldDisplay;
+}
+
+bool AvHHud::GetTranslatedUser3Name(AvHUser3 inUser3, string& outString) const
+{
+	bool theSuccess = false;
+
+	if(this->GetShouldDisplayUser3(inUser3))
+	{
+		char theUser3String[512];
+		sprintf(theUser3String, "#%s%d", kUser3Name, inUser3);
+		theSuccess = LocalizeString(theUser3String, outString);
+	}
+	
+	return theSuccess;
+}
+
+bool AvHHud::GetTranslatedUser3Description(AvHUser3 inUser3, bool inFriendly, string& outString) const
+{
+	bool theSuccess = false;
+
+	if(this->GetShouldDisplayUser3(inUser3))
+	{
+		char theUser3String[512];
+		sprintf(theUser3String, "#%s%d", kUser3Description, inUser3);
+		theSuccess = LocalizeString(theUser3String, outString);
+
+		// If we're commanding, look for that description if it exists
+		if(this->GetInTopDownMode())
+		{
+			string theCommanderDescription;
+			sprintf(theUser3String, "#%s%d", kUser3CommanderDescription, inUser3);
+			if(LocalizeString(theUser3String, theCommanderDescription))
+			{
+				outString = theCommanderDescription;
+				theSuccess = true;
+			}
+		}
+		// Else look for a message that tell us what to do with this thing (assumes we're not commanding though)
+		else if(inFriendly)
+		{
+			string theFriendlyDescription;
+			sprintf(theUser3String, "#%s%d", kUser3FriendlyDescription, inUser3);
+			if(LocalizeString(theUser3String, theFriendlyDescription))
+			{
+				outString = theFriendlyDescription;
+				theSuccess = true;
+			}
+		}
+	}
+
+	return theSuccess;
+}
+
+
+void AvHHud::UpdateUpgradeCosts()
+{
+    PieMenu* theCurrentMenu = NULL;
+    if(this->GetManager().GetVGUIComponentNamed(this->mPieMenuControl, theCurrentMenu))
+    {
+        this->UpdateEnableState(theCurrentMenu);
+	}
+}
+
+void AvHHud::AddMiniMapAlert(float x, float y)
+{
+    mOverviewMap.AddAlert(x, y);
+}
+
+void AvHHud::UpdateEnableState(PieMenu* inMenu)
+{
+	if(inMenu)
+	{
+        int thePurchaseLevel = this->GetIsCombatMode() ? max(0, this->mExperienceLevel - this->mExperienceLevelSpent - 1) : this->mResources;
+        
+        inMenu->UpdateMenuFromTech(this->mTechNodes, thePurchaseLevel);
+
+//        if(this->GetIsNSMode())
+        //{
+            // Now disable any nodes whose children are all disabled (in NS, only end nodes can be chosen)
+            //inMenu->DisableNodesWhoseChildrenAreDisabled();
+        //}
+
+        inMenu->RecomputeVisibleSize();
+	}
+}
+
+void AvHHud::ShowMap()
+{
+    if (!sShowMap && gHUD.GetIsNSMode())
+    {	
+        sShowMap = true;
+        gHUD.HideCrosshair();
+	    gHUD.GetManager().UnhideComponent(kShowMapHierarchy);
+    }
+}
+
+void AvHHud::HideMap()
+{
+    if (sShowMap)
+    {
+        sShowMap = false;
+	    gHUD.GetManager().HideComponent(kShowMapHierarchy);
+	    gHUD.ShowCrosshair();
+    }
+}
+
+void AvHHud::GetSpriteForUser3(AvHUser3 inUser3, int& outSprite, int& outFrame, int& outRenderMode)
+{
+
+    switch (inUser3)
+    {
+
+    // Marines
+    case AVH_USER3_WAYPOINT:
+		outSprite = Safe_SPR_Load(kSmallOrderSprite);
+		outFrame  = 2;
+        outRenderMode = kRenderTransAdd;
+        break;
+    case AVH_USER3_MARINE_PLAYER:
+		outSprite = Safe_SPR_Load(kMarinePlayersSprite);
+		outFrame  = 0;
+        break;
+    case AVH_USER3_HEAVY: // This really means a marine with heavy armor, not a heavy armor object.
+		outSprite = Safe_SPR_Load(kMarinePlayersSprite);
+		outFrame  = 1;
+        break;
+    case AVH_USER3_COMMANDER_STATION:
+		outSprite = Safe_SPR_Load(kStructuresSprite);
+		outFrame  = 5;
+        break;
+    case AVH_USER3_TURRET_FACTORY: 
+    case AVH_USER3_ADVANCED_TURRET_FACTORY:
+		outSprite = Safe_SPR_Load(kStructuresSprite);
+		outFrame  = 6;
+        break;
+    case AVH_USER3_ARMORY:
+		outSprite = Safe_SPR_Load(kStructuresSprite);
+		outFrame  = 7;
+        break;
+	case AVH_USER3_ADVANCED_ARMORY:
+		outSprite = Safe_SPR_Load(kStructuresSprite);
+		outFrame  = 8;
+        break;
+    case AVH_USER3_ARMSLAB:
+		outSprite = Safe_SPR_Load(kStructuresSprite);
+		outFrame  = 9;
+        break;
+    case AVH_USER3_PROTOTYPE_LAB:
+		outSprite = Safe_SPR_Load(kStructuresSprite);
+		outFrame  = 10;
+        break;
+    case AVH_USER3_OBSERVATORY:
+		outSprite = Safe_SPR_Load(kStructuresSprite);
+		outFrame  = 11;
+        break;
+    case AVH_USER3_TURRET:
+		outSprite = Safe_SPR_Load(kStructuresSprite);
+		outFrame  = 12;
+        break;
+    case AVH_USER3_SIEGETURRET:
+		outSprite = Safe_SPR_Load(kStructuresSprite);
+		outFrame  = 13;
+        break;
+    case AVH_USER3_RESTOWER:
+		outSprite = Safe_SPR_Load(kStructuresSprite);
+		outFrame  = 14;
+        break;        
+    case AVH_USER3_INFANTRYPORTAL:
+		outSprite = Safe_SPR_Load(kStructuresSprite);
+		outFrame  = 15;
+        break;        
+    case AVH_USER3_PHASEGATE:
+		outSprite = Safe_SPR_Load(kStructuresSprite);
+		outFrame  = 16;
+        break;        
+        
+	// Aliens
+    case AVH_USER3_DEFENSE_CHAMBER:
+		outSprite = Safe_SPR_Load(kStructuresSprite);
+		outFrame  = 17;
+        break;
+    case AVH_USER3_MOVEMENT_CHAMBER:
+		outSprite = Safe_SPR_Load(kStructuresSprite);
+		outFrame  = 18;
+        break;
+    case AVH_USER3_OFFENSE_CHAMBER:
+		outSprite = Safe_SPR_Load(kStructuresSprite);
+		outFrame  = 19;
+        break;
+    case AVH_USER3_SENSORY_CHAMBER:
+		outSprite = Safe_SPR_Load(kStructuresSprite);
+		outFrame  = 20;
+        break;
+    case AVH_USER3_ALIENRESTOWER:
+		outSprite = Safe_SPR_Load(kStructuresSprite);
+		outFrame  = 21;
+        break;
+	case AVH_USER3_HIVE:
+		outSprite = Safe_SPR_Load(kStructuresSprite);
+		outFrame = 3;
+		break;
+	case AVH_USER3_ALIEN_PLAYER1:
+		outSprite = Safe_SPR_Load(kAlienPlayersSprite);
+		outFrame  = 0;
+        break;
+	case AVH_USER3_ALIEN_PLAYER2:
+		outSprite = Safe_SPR_Load(kAlienPlayersSprite);
+		outFrame  = 1;
+        break;
+	case AVH_USER3_ALIEN_PLAYER3:
+		outSprite = Safe_SPR_Load(kAlienPlayersSprite);
+		outFrame  = 2;
+        break;
+	case AVH_USER3_ALIEN_PLAYER4:
+		outSprite = Safe_SPR_Load(kAlienPlayersSprite);
+		outFrame  = 3;
+        break;
+	case AVH_USER3_ALIEN_PLAYER5:
+		outSprite = Safe_SPR_Load(kAlienPlayersSprite);
+		outFrame  = 4;
+        break;
+	case AVH_USER3_ALIEN_EMBRYO	:
+		outSprite = Safe_SPR_Load(kAlienPlayersSprite);
+		outFrame  = 5;
+        break;
+
+	case AVH_USER3_FUNC_RESOURCE:
+		outSprite = Safe_SPR_Load(kStructuresSprite);
+		outFrame = 4;
+		break;
+    case AVH_USER3_WELD:
+		outSprite = Safe_SPR_Load(kStructuresSprite);
+		outFrame  = 0;
+        break;
+    
+    default:
+        outSprite = 0;
+        outFrame  = 0;
+
+    }
+
+}
+
+int AvHHud::GetCurrentSquad() const
+{
+    return mCurrentSquad;
+}
+    
+AvHOverviewMap& AvHHud::GetOverviewMap()
+{
+    return mOverviewMap;
+}
+
+void AvHHud::ShowCrosshair()
+{
+    
+    ++mCrosshairShowCount;
+
+    if (mCrosshairShowCount > 0)
+    {
+        SetCrosshair(mCrosshairSprite, mCrosshairRect, mCrosshairR, mCrosshairG, mCrosshairB);
+    }
+
+}
+
+void AvHHud::HideCrosshair()
+{
+
+    --mCrosshairShowCount;
+
+    if (mCrosshairShowCount <= 0)
+    {
+        wrect_t nullrect = { 0, 0, 0, 0 };
+        SetCrosshair(0, nullrect, 0, 0, 0);
+    }
+
+}
+
+void AvHHud::SetCurrentCrosshair(HSPRITE hspr, wrect_t rc, int r, int g, int b)
+{
+    mCrosshairSprite = hspr;
+    mCrosshairRect   = rc;
+    mCrosshairR      = r;
+    mCrosshairG      = g;
+    mCrosshairB      = b;
+
+    if (mCrosshairShowCount > 0)
+    {
+        SetCrosshair(mCrosshairSprite, mCrosshairRect, mCrosshairR, mCrosshairG, mCrosshairB);
+    }
+
+}
+
+void AvHHud::SetViewport(const int inViewport[4])
+{
+    if (!m_Spectator.IsInOverviewMode())
+    {
+        mViewport[0] = inViewport[0];
+        mViewport[1] = inViewport[1];
+        mViewport[2] = inViewport[2];
+        mViewport[3] = inViewport[3];
+    }
+    else
+    {
+        mSpecialViewport[0] = inViewport[0];
+        mSpecialViewport[1] = inViewport[1];
+        mSpecialViewport[2] = inViewport[2];
+        mSpecialViewport[3] = inViewport[3];
+
+        mViewport[0] = 0;
+        mViewport[1] = 0;
+        mViewport[2] = ScreenWidth();
+        mViewport[3] = ScreenHeight();
+
+    }
+}
+
+void AvHHud::GetViewport(int outViewport[4]) const
+{
+    outViewport[0] = mViewport[0];
+    outViewport[1] = mViewport[1];
+    outViewport[2] = mViewport[2];
+    outViewport[3] = mViewport[3];
+}
+
+const AvHFont& AvHHud::GetSmallFont() const
+{
+    return mSmallFont;
+}
+
+void AvHHud::PlayStream()
+{
+    if(gEngfuncs.Cmd_Argc() <= 1)
+    {
+        gEngfuncs.Con_Printf( "usage:  playstream <url>\n" );
+    }
+    else
+    {
+        if ( gEngfuncs.Cmd_Argc() >= 2 )
+        {
+            // Read URL
+            string theURL;
+			theURL = string("http://") + string(gEngfuncs.Cmd_Argv(1));
+            
+            string theError;
+            if(!gHUD.PlayInternetStream(theURL, theError))
+			{
+				gHUD.AddTooltip(theError.c_str());
+			}
+        }
+    }
+}
+
+void AvHHud::StopStream()
+{
+    gHUD.StopInternetStream();
+}
+
+float AvHHud::GetServerVariableFloat(const char* inName) const
+{
+    ServerVariableMapType::const_iterator iterator;
+    iterator = mServerVariableMap.find(inName);
+
+    if ( iterator == mServerVariableMap.end() )
+    {
+        return 0;
+    }
+    else
+    {
+        return atof( iterator->second.c_str() );
+    }
+
+}
+
+
+/**
+ * Prints the call stack when an unhandled exception occurs.
+ */
+LONG WINAPI ExceptionFilter(EXCEPTION_POINTERS* pExp) 
+{
+
+    /*
+    // E-mail the exception log to the programmers.
+
+    std::stringstream buffer;
+    LogException(buffer, pExp);
+
+    const char* serverName  = "66.111.4.62";
+    const char* fromAddress = "noreply@overmind.com";
+
+    const char* programmerAddress[] =
+        {
+            "max_mcguire@yahoo.com",
+        };
+    
+    for (int i = 0; i < sizeof(programmerAddress) / sizeof(char*); ++i)
+    {
+        SendMail(serverName, fromAddress, fromAddress, programmerAddress[i],
+            "Exception Log", buffer.str().c_str());
+    }    
+    */
+
+    AvHHud::ResetGammaAtExit();
+
+    return EXCEPTION_EXECUTE_HANDLER;
+
+}
+
+// Added DLL entry point to try to reset gamma properly under VAC
+BOOL WINAPI DllMain(HINSTANCE hinstDLL,
+					DWORD fdwReason,
+					LPVOID lpvReserved)
+{
+	if (fdwReason == DLL_PROCESS_ATTACH)
+    {
+
+        // Install a crash handler.
+        //SetUnhandledExceptionFilter(ExceptionFilter);
+
+    }
+	else if (fdwReason == DLL_PROCESS_DETACH)
+    {
+		AvHHud::ResetGammaAtExit();
+    }
+	return TRUE;
+}
diff --git a/main/source/mod/AvHHud.h b/main/source/mod/AvHHud.h
new file mode 100644
index 00000000..ae23ea2f
--- /dev/null
+++ b/main/source/mod/AvHHud.h
@@ -0,0 +1,821 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: Main NS HUD, also interface to client network messages
+//
+// $Workfile: AvHHud.h $
+// $Date: 2002/10/24 21:29:49 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHHud.h,v $
+// Revision 1.60  2002/10/24 21:29:49  Flayra
+// - Moved help client-side
+// - Fixed particle/changelevel crash
+// - Reworked marine upgrade drawing
+// - Added lots of utility functions for help system (mirrors functions on server)
+// - Removed gamma message unless it failed or if maxplayers is 1
+// - Fixed alien hive sight crash
+// - Show players under reticle while in ready room and spectating
+// - Removed ugly/too-prevalent user3 icons
+//
+// Revision 1.59  2002/10/03 20:24:39  Flayra
+// - Changes for "more resources required"
+//
+// Revision 1.58  2002/10/03 18:54:31  Flayra
+// - Allow right-click to cancel building placement
+// - Fixed help icons
+// - Added a couple utility functions
+// - Reworked order notification
+// - Reworked blip network messages to avoid hard-coded limit
+// - Sent max resources down with current resources
+// - Countdown sound no longer prevents other hud sounds
+// - Alien trigger sounds
+// - New order sounds
+// - No longer disable nodes out of our cost range
+//
+// Revision 1.57  2002/09/25 20:47:22  Flayra
+// - Don't draw elements on HUD when dead
+// - UI refactoring
+// - Split reticle help into help text and reticle text
+// - Removed use order
+// - Added separate select sound for alien
+// - Multiple move sounds
+// - Only draw entity build/health status when under reticle (no more scanning around you)
+// - Added 3 new sayings
+//
+// Revision 1.56  2002/09/23 22:18:25  Flayra
+// - Added alien build circles
+// - Game status changes so particles aren't sent every time
+// - Demo playback changes (save restore basic data that HUD already has)
+// - New alert sounds
+// - Skin support
+//
+// Revision 1.55  2002/09/09 19:55:24  Flayra
+// - Added hive info indicator
+// - Fixed bug where reticle tooltip help text wasn't being set until a weapon was selected
+// - Fixed release mode bug where tooltips weren't expiring
+// - Fixed bug where marine upgrades blinked
+// - "No commander" indicator now blinks
+//
+// Revision 1.54  2002/08/31 18:01:01  Flayra
+// - Work at VALVe
+//
+// Revision 1.53  2002/08/16 02:37:49  Flayra
+// - HUD sounds no longer cut each other off (they won't play instead of cutting off another sound)
+// - Tooltip sounds
+// - Selection issues
+// - Draw rings around buildings that need to be built
+// - Removed old overwatch code
+//
+// Revision 1.52  2002/08/09 01:02:51  Flayra
+// - Added hooks for demo playback, removed prediction selection
+//
+// Revision 1.51  2002/08/02 22:51:28  Flayra
+// - Fixed memory overwrite...eek!
+//
+// Revision 1.50  2002/08/02 21:59:12  Flayra
+// - Added reticle help, new tooltip system and much nicer order drawing!  Refactored view model drawing a bit, hoping to make texture blending work for it.
+//
+// Revision 1.49  2002/07/26 23:05:01  Flayra
+// - Generate numerical feedback for damage events
+// - Refactoring for more info when looking at something (instead of bad-looking player names only)
+//
+// Revision 1.48  2002/07/23 17:07:37  Flayra
+// - Added visually-smooth energy level, added versatile location code, new hive sight info, refactored to remove extra sprites (128 HUD sprites bug), commander tech help fixes
+//
+// Revision 1.47  2002/07/08 17:07:56  Flayra
+// - Started to add display of marine upgrade sprite, fixed bug where building indicators aren't displayed after a map change, info_location drawing changes, primal scream color tweak, removed old hive drawing code
+//
+// Revision 1.46  2002/07/01 21:35:05  Flayra
+// - Removed lots of outdated sprites and sprite code, added building ranges, fixed ghost building problem (bug #82)
+//
+// Revision 1.45  2002/06/25 18:03:09  Flayra
+// - Added info_locations, removed old weapon help system, added smooth resource swelling, lots of alien UI usability changes, fixed problem with ghost building
+//
+// Revision 1.44  2002/06/10 19:55:36  Flayra
+// - New commander UI (bindable via hotkeys, added REMOVE_SELECTION for when clicking menu options when no players selected)
+//
+// Revision 1.43  2002/06/03 16:48:45  Flayra
+// - Help sprites moved into one animated sprite, select sound volume reduced (now that sound is normalized)
+//
+// Revision 1.42  2002/05/28 17:48:14  Flayra
+// - Minimap refactoring, reinforcement refactoring, new hive sight fixes, recycling support
+//
+// Revision 1.41  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVHHUD_H
+#define AVHHUD_H
+
+#include "ui/UIHud.h"
+#include "mod/AvHSharedTypes.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHParticleSystem.h"
+#include "common/entity_state.h"
+#include "VGUI_ProgressBar.h"
+#include "mod/AvHEntityHierarchy.h"
+#include "ui/MarqueeComponent.h"
+#include "mod/AvHOrder.h"
+#include "mod/AvHMessage.h"
+#include "mod/AvHAmbientSound.h"
+#include "mod/AvHTechNodes.h"
+#include "mod/AvHVisibleBlipList.h"
+#include "mod/AvHMapExtents.h"
+#include "mod/AvHSpecials.h"
+#include "util/GammaTable.h"
+#include "mod/AvHBaseInfoLocation.h"
+#include "mod/AvHTooltip.h"
+#include "mod/AvHTechSlotManager.h"
+#include "mod/AvHBalance.h"
+#include "mod/AvHHudConstants.h"
+#include "mod/AvHOverviewMap.h"
+
+class AvHTeamHierarchy;
+class PieMenu;
+class FadingImageLabel;
+using vgui::Cursor;
+
+struct AnimatedSprite
+{
+	float mCurrentFrame;
+	int mData;
+};
+
+class SelectionEffect
+{
+public:
+	SelectionEffect() : mEntIndex(-1), mAngleOffset(0)
+				{}
+	
+	int		mEntIndex;
+	int		mAngleOffset;
+};
+
+typedef enum
+{
+	MAIN_MODE,
+	EDITPS_MODE,
+	SCOREBOARD_MODE
+} UIMode;
+
+typedef vector<SelectionEffect>		SelectionListType;
+
+class NumericalInfoEffect
+{
+public:
+			NumericalInfoEffect(float inPosition[3], float inNumber, int inEventType, float inTimeCreated);
+	void	GetPosition(float* outPosition) const;
+	float	GetNumber() const;
+	int		GetEventType() const;
+	float	GetTimeCreated() const;
+	void	SetPosition(float inPosition[3]);
+	
+private:
+	float	mPosition[3];
+	float	mNumber;
+	int		mEventType;
+	float	mTimeCreated;
+};
+
+const int kNumUpgradeLines = 5;
+
+class AvHHud : public UIHud
+{
+public:
+					AvHHud(const string& inFilename, UIFactory* inFactory);
+    virtual			~AvHHud(void);
+
+    void            OnActivateSteamUI();
+    void            OnDeactivateSteamUI();
+    void            OnLostFocus();
+    bool            OnKeyEvent(int virtualKey, int scanCode, bool pressed);
+
+	void            AddMiniMapAlert(float x, float y);
+	void			AddNumericalInfoMessage(float inOrigin[3], float inNumber, int inEventType);
+	void			AddTooltip(const char* inMessageText, bool inIsToolTip = true, float inTooltipWidth = kToolTipMaxWidth);
+	bool			AddTooltipOnce(const char* inMessageText, bool inIsToolTip = true);
+	void			Cancel();
+	
+	void			ClearSelection();
+	
+	void			ClientProcessEntity(struct entity_state_s* inEntity);
+	
+	void			ComponentJustPainted(Panel* inPanel);
+
+	bool			GetAndClearAlienAbility(AvHMessageID& outMessageID);
+	bool			GetAndClearGroupEvent(AvHMessageID& outMessageID);
+	bool			GetAndClearTechEvent(AvHMessageID& outMessageID);
+	bool			GetLastHotkeySelectionEvent(AvHMessageID& outMessageID);
+	void			SetLastHotkeySelectionEvent(AvHMessageID inMessageID);
+	
+    // Returns true if particles should be rendered in the HUD.
+    bool            GetParticlesVisible() const;
+    bool			GetSafeForSpriteDrawing() const;
+
+	void			ClearTrackingEntity();
+	int				GetTrackingEntity() const;
+
+	bool			GetIsRegionBlockedByUI(float inNormX, float inNormY);
+	
+	//int				GetArmorLevel(void) const;
+    int             GetCommanderIndex() const;
+	bool			GetHasJetpack() const;
+	int				GetHelpIconFrameFromUser3(AvHUser3 inUser3);
+	HSPRITE			GetHelpSprite() const;
+	bool			GetHasAlienUpgradesAvailable() const;
+	bool			GetIsAlien() const;
+	bool			GetIsBeingDigested() const;
+    bool            GetIsEnsnared() const;
+	bool			GetIsDigesting() const;
+    bool            GetIsStunned() const;
+    bool            GetIsNotInControl() const;
+	bool			GetIsInTopDownMode() const;
+	bool			GetIsMarine() const;
+	bool			GetIsRelevant() const;
+	bool			GetIsShowingMap() const;
+	AvHPlayMode		GetPlayMode(void) const;
+	bool			GetAlienHelpForMessage(int inMessageID, string& outHelpText, int& outPointCost) const;
+	bool			GetDoesPlayerHaveOrder() const;
+	bool			GetHelpForMessage(int inMessageID, string& outHelpText) const;
+	bool			GetInTopDownMode() const;
+	bool			GetIsSelecting() const;
+	OrderListType	GetOrderList() const;
+	AvHOrderType	GetOrderMode() const;
+	bool			GetCenterPositionForGroup(int inGroupNumber, vec3_t& outCenterPosition) const;
+	bool			GetMouseOneDown() const;
+	bool			GetMouseTwoDown() const;
+	bool			GetAndClearTopDownScrollAmount(int& outX, int& outY, int& outZ);
+	bool			GetAndClearSelectionEvent(vec3_t& outSelectionXY, AvHMessageID& outMessageID);
+	EntityListType	GetSelected() const;
+	const AvHTechSlotManager&	GetTechSlotManager() const;
+	bool			GetTranslatedUser3Name(AvHUser3 inUser3, string& outString) const;
+	bool			GetTranslatedUser3Description(AvHUser3 inUser3, bool inFriendly, string& outString) const;
+	vec3_t			GetVisualOrigin() const;
+	
+	AvHMessageID	HotKeyHit(char inChar);
+	
+    virtual void	Init(void);
+	virtual void	PostUIInit(void);
+	virtual void	VidInit(void);
+	
+	bool			GetGameStarted() const;
+	int				GetGameTime() const;
+	int				GetGameTimeLimit() const;
+	int				GetCombatAttackingTeamNumber() const;
+	static bool		GetShowingMap();
+
+    static void     PlayStream();
+    static void     StopStream();
+
+	bool			GetIsAlive(bool inIncludeSpectating = true) const;
+	void			GhostBuildingCallback( struct tempent_s *ent, float frametime, float currenttime);
+    void            CancelBuilding();
+
+	void			PlayHUDSound(const char *szSound, float vol, float inSoundLength = 0.0f);
+	void			PlayHUDSound(int iSound, float vol, float inSoundLength = 0.0f);
+	void			PlayHUDSound(AvHHUDSound inSound);
+	
+	float			GetHUDExperience() const;
+	int				GetHUDExperienceLevel() const;
+	float			GetHUDHandicap() const;
+	AvHUser3		GetHUDUser3() const;
+	AvHPlayMode		GetHUDPlayMode() const;
+	AvHTeamNumber	GetHUDTeam() const;
+	int				GetHUDUpgrades() const;
+	int				GetHUDMaxArmor() const;
+	int				GetHUDMaxHealth() const;
+	void			GetPrimaryHudColor(int& outR, int& outG, int& outB, bool inIgnoreUpgrades = false, bool gammaCorrect = true) const;
+	float			GetTimeOfLastUpdate() const;
+	int				GetMenuTechSlots() const;
+
+	//void			GetVisibleBlips(VisibleBlipListType& outBlipList);
+	
+    virtual int		Redraw( float flTime, int intermission );
+	virtual void	ResetComponentsForUser3();
+	void			SetSelectingWeaponID(int inWeaponID, int inR = -1, int inG = -1, int inB = -1);
+	void			SetTechHelpText(const string& inTechHelpText);
+	void			DrawSelectionCircleOnGroundAtPoint(vec3_t inOrigin, int inRadius);
+	void			DrawBuildHealthEffectsForEntity(int inEntIndex);
+	void			DrawSelectionAndBuildEffects();
+	void			DrawHUDNumber(int inX, int inY, int inFlags, int inNumber);
+
+	int				InitializeDemoPlayback(int inSize, unsigned char* inBuffer);
+	int				InitializeDemoPlayback2(int inSize, unsigned char* inBuffer);
+	int				InitializeWeaponInfoPlayback(int inSize, unsigned char* inBuffer);
+	
+    virtual bool    Update(float inCurrentTime, string& outErrorString);
+	virtual void	UpdateMusic(float inCurrentTime);
+
+	bool			SlotInput(int inSlot);
+
+	const AvHMapExtents& GetMapExtents();
+	float			GetGammaSlope() const;
+	string			GetMapName(bool inLocalOnly = false) const;
+	int				GetMaxAlienResources() const;
+	int				GetNumActiveHives() const;
+	void			HideProgressStatus();
+	void			SetProgressStatus(float inPercentage);
+
+	AvHVisibleBlipList&	GetEnemyBlipList();
+	AvHVisibleBlipList&	GetFriendlyBlipList();
+
+	AvHEntityHierarchy& GetEntityHierarchy();
+
+	int				GetLocalUpgrades() const;
+	string			GetNameOfLocation(vec3_t inLocation) const;
+	const AvHTechNodes& GetTechNodes() const;
+
+	UIMode			GetUIMode() const;
+	bool			SwitchUIMode(UIMode inNewMode);
+	bool			GetIsCombatMode() const;
+    bool			GetIsNSMode() const;
+		
+	void			HideResearchProgressStatus();
+	void			SetResearchProgressStatus(float inPercentage);
+
+	AvHMessageID	GetGhostBuilding() const;
+	void			SetGhostBuildingMode(AvHMessageID inGhostBuilding);
+
+	void			SetAlienAbility(AvHMessageID inAlienAbility);
+	void			SetRenderingSelectionView(bool inState);
+		
+	void			SetClientDebugCSP(weapon_data_t* inWeaponData, float inNextPlayerAttack);
+	void			SetCurrentWeaponData(int inCurrentWeaponID, bool inEnabled);
+	int				GetCurrentWeaponID(void);
+
+	void			DrawTopDownBG();
+	void			DrawTranslatedString(int inX, int inY, const char* inStringToTranslate, bool inCentered = false, bool inIgnoreUpgrades = false, bool inTrimExtraInfo = false);
+	void			HandleFog();
+	void			PostModelRender(char* inModelName);
+	void			PreRenderFrame();
+	void			PostRenderFrame();
+	void			RenderNoZBuffering();
+
+    void            Render();
+    void            RenderCommonUI();
+    void            RenderMarineUI();
+    void            RenderCommanderUI();
+    void            RenderAlienUI();
+    void            RenderMiniMap(int inX, int inY, int inWidth, int inHeight);
+
+    void            RenderStructureRanges();
+    void            RenderStructureRange(vec3_t inOrigin, int inRadius, HSPRITE inSprite, int inRenderMode = kRenderNormal, int inFrame = 0, float inR = 0, float inG = 0.5, float inB = 0, float inAlpha = 1.0f);
+
+    void            DrawWarpedOverlaySprite(int spriteHandle, int numXFrames, int numYFrames,
+                        float inWarpXAmount = 0.0f, float inWarpYAmount = 0.0f,
+                        float inWarpXSpeed = 0.0f, float inWarpYSpeed = 0.0f);
+
+	void			DrawActionButtons();
+	void			DrawHotgroups();
+	void			DrawPendingRequests();
+
+	void			SetCurrentUseableEnergyLevel(float inEnergyLevel);
+	
+	// Network messages
+	int				AlienInfo(const char* pszName, int iSize, void* pbuf);
+	int				BlipList(const char* pszName, int iSize, void* pbuf);
+	//int				ChangeNode(const char* pszName, int iSize, void* pbuf);
+	int				ClScript(const char *pszName, int iSize, void *pbuf);
+	int				Countdown(const char* pszName, int iSize, void* pbuf);
+	int				DebugCSP(const char* pszName, int iSize, void* pbuf);
+	int				EditPS(const char* pszName, int iSize, void* pbuf);
+	int				EntHier(const char *pszName, int iSize, void *pbuf);
+	int				Fog(const char* pszName, int iSize, void* pbuf);
+	int				ListPS(const char* pszName, int iSize, void* pbuf);
+	int				Reinfor(const char* pszName, int iSize, void* pbuf);
+    int				Particles(const char *pszName, int iSize, void *pbuf);
+    int				SoundNames(const char *pszName, int iSize, void *pbuf);
+	int 			PlayHUDNot(const char* pszName, int iSize, void* pbuf);
+	//int				Research(const char* pszName, int iSize, void* pbuf);
+	
+	#ifdef AVH_PLAYTEST_BUILD
+	int				BalanceVar(const char* pszName, int iSize, void* pbuf);
+	#endif
+
+    int             ServerVar(const char* pszName, int iSize, void* pbuf);
+
+	int				GameStatus(const char* pszName, int iSize, void* pbuf);
+	int				MiniMap(const char* pszName, int iSize, void* pbuf);
+	//int				NetSS(const char* pszName, int iSize, void* pbuf);
+	int				Progress(const char* pszName, int iSize, void* pbuf);
+	int				SetGmma(const char* pszName, int iSize, void* pbuf);
+	int				SetSelect(const char* pszName, int iSize, void* pbuf);
+	int				SetOrder(const char* pszName, int iSize, void* pbuf);
+	//int				CplteOrder(const char* pszName, int iSize, void* pbuf);
+	int				SetupMap(const char* pszName, int iSize, void* pbuf);
+	int				SetTopDown(const char* pszName, int iSize, void* pbuf);
+	int				SetTech(const char* pszName, int iSize, void* pbuf);
+	int				TechSlots(const char* pszName, int iSize, void* pbuf);
+
+    void            GetSpriteForUser3(AvHUser3 inUser3, int& outSprite, int& outFrame, int& outRenderMode);
+
+#ifdef AVH_PLAYTEST_BUILD
+	const BalanceIntListType&	GetBalanceInts() const;
+	const BalanceFloatListType&	GetBalanceFloats() const;
+#endif
+
+    int             GetCurrentSquad() const;
+    AvHOverviewMap& GetOverviewMap();
+
+    void            ShowCrosshair();
+    void            HideCrosshair();
+
+    // This function should be used instead of the global SetCrosshair.
+    void            SetCurrentCrosshair(HSPRITE hspr, wrect_t rc, int r, int g, int b);
+
+	static void		ResetGammaAtExit();
+	static int		ResetGammaAtExitForOnExit();
+	static void		ResetGammaAtExit(int inSig);
+ 
+    void            SetViewport(const int inViewport[4]);
+    void            GetViewport(int outViewport[4]) const;
+
+    const AvHFont&  GetSmallFont() const;
+	cl_entity_s*	GetVisiblePlayer() const;
+
+    float           GetServerVariableFloat(const char* inName) const;
+
+private:
+
+    bool            GetCommanderLabelText(std::string& outCommanderName) const;
+
+	void			AddCommands();
+	void			ClearData();
+	void			DisplayCombatUpgradeMenu(bool inVisible);
+	void			DrawMouseCursor(int inBaseX, int inBaseY);
+	void			DrawOrders();
+	void			DrawHelpIcons();
+	void			DrawHUDStructureNotification();
+	void			DrawInfoLocationText();
+	void			DrawPlayerNames();
+	void			DrawReticleInfo();
+	void			DrawToolTips();
+	void			DrawWorldSprite(int inSpriteHandle, int inRenderMode, vec3_t inWorldPosition, int inFrame, float inWorldSize);
+	void			DrawOrderIcon(const AvHOrder& inOrder);
+	void			DrawOrderText(const AvHOrder& inOrder);
+	int				GetFrameForOrderType(AvHOrderType inOrderType) const;
+	void			GetReticleTextDrawingInfo(float& outNormX, float& outNormY, bool& outCentered) const;
+	void			DrawTechTreeSprite(AvHMessageID inMessageID, int inPosX, int inPosY, int inWidth, int inHeight, int inFrame);
+	int				GetTechTreeSprite(AvHMessageID inMessageID);
+	void			GetTooltipDrawingInfo(float& outNormX, float& outNormY) const;
+	string			GetRankTitle(bool inShowUnspentLevels = false) const;
+	bool			GetShouldDisplayUser3(AvHUser3 inUser3) const;
+	void			InitCommanderMode();
+	void			InitializeDemoRecording();
+	void			InitMenu(const string& inMenuName);
+	void			ChangeUpgradeCosts(int inOldMessageID, int inNewMessageID, const char* inText);
+	void			ChangeUpgradeCostsForMenu(PieMenu* inMenu, int inOldMessageID, int inNewMessageID, const char* inText);
+	void			DisplayMessage(const char* inMessage);
+	bool			GetAmbientSoundNameFromIndex(string& outSoundName, int inSoundIndex) const;
+	EntityListType	GetDrawPlayerOrders() const;
+	bool			GetEntityInfoString(int inEntityID, string& outEntityInfoString, bool& outIsEnemy);
+	void			ModifyAmbientSoundEntryIfChanged(bool inSoundOn, int inSoundIndex, int inEntIndex, float inTimeStarted, int inVolume, int inFadeDistance, int inFlags, Vector inOrigin);
+	void			ResetTopDownUI();
+	bool			SetGamma(float inSlope);
+	void			SetReinforcements(int inReinforcements);
+	void			SetHelpMessage(const string& inHelpText, bool inForce = false, float inNormX = -1, float inNormY = -1);
+	void			SetActionButtonHelpMessage(const string& inHelpText);
+	void			SetReticleMessage(const string& inHelpText);
+	void			OrderNotification(const AvHOrder& inOrder);
+	virtual void	ResetGame(bool inMapChanged = false);
+	
+    bool			SetCursor(AvHOrderType inOrderType);
+    void            GetCursor(HSPRITE& outSprite, int& outFrame);
+
+	void			SetSelectionEffects(EntityListType& inUnitList);
+	//void			UpdateSelectionEffects(float inTimePassed);
+	void			TraceEntityID(int& outEntityID);
+	bool			GetIsMouseInRegion(int inX, int inY, int inWidth, int inHeight);
+	void			GetMousePos(int& outX, int& outY) const;
+
+	// Help system
+	void			InternalHelpTextThink();
+	bool			ProcessAlien();
+	bool			ProcessAlienHelp();
+	bool			ProcessEntityHelp();
+	bool			ProcessGeneralHelp();
+	bool			ProcessOrderHelp();
+	bool			ProcessWeaponsHelp();
+		
+	//void			ResetUpgradeCosts();
+	//void			ResetUpgradeCostsForMenu(PieMenu* inMenu);
+	void			UpdateAlienUI(float inCurrentTime);
+	void			UpdateCommonUI();
+	void			UpdateDataFromVuser4(float inCurrentTime);
+	void			UpdateExploitPrevention();
+	void			UpdateMarineUI(float inCurrentTime);
+	void			UpdateUpgradeCosts();
+	void			UpdateEnableState(PieMenu* inMenu);
+	void			UpdateCountdown(float inCurrentTime);
+	void			UpdateHierarchy();
+	void			UpdateInfoLocation();
+	void			UpdatePieMenuControl();
+	void			UpdateEntityID(float inCurrentTime);
+	void			UpdateTooltips(float inCurrentTime);
+	void			UpdateStructureNotification(float inCurrentTime);
+	void			UpdateProgressBar();
+	void			UpdateDemoRecordPlayback();
+	void			UpdateBuildingPlacement();
+	void			UpdateResources(float inTimePassed);
+	void			UpdateSelection();
+	void			UpdateSpectating();
+	void			UpdateBuildResearchText();
+	void			UpdateHelpText();
+	void			UpdateTechNodes();
+	void			UpdateAmbientSounds();
+	void			UpdateFromEntities(float inCurrentTime);
+	void			UpdateViewModelEffects();
+	
+	int						mResources;
+	int						mUser2OfLastResourceMessage;
+	int						mMaxResources;
+	int						mVisualResources;
+	float					mExperience;
+	int						mExperienceLevel;
+	int						mExperienceLevelLastDrawn;
+	int						mExperienceLevelSpent;
+	float					mTimeOfLastLevelUp;
+	AvHMessageID			mMenuImpulses[kNumUpgradeLines];
+
+	float					mCountDownClock;
+	int						mLastTickPlayed;
+	int						mNumTicksToPlay;
+	float					mTimeOfLastUpdate;
+	float					mTimeOfNextHudSound;
+    AvHHUDSound             mLastHUDSoundPlayed;
+	float					mTimeOfCurrentUpdate;
+
+    AvHOverviewMap          mOverviewMap;
+
+    AvHTeamHierarchy*		mHierarchy;
+	AvHTeamHierarchy*		mShowMapHierarchy;
+    AvHEntityHierarchy		mEntityHierarchy;
+
+	EntityListType			mSelected;
+	EntityListType			mGroups[kNumHotkeyGroups];
+	EntityListType			mSelectAllGroup;
+	AvHUser3				mGroupTypes[kNumHotkeyGroups];
+	AvHAlertType			mGroupAlerts[kNumHotkeyGroups];
+
+	typedef map<AvHMessageID, int>	PendingRequestListType;
+	PendingRequestListType	mPendingRequests;
+
+	AvHUser3				mLastUser3;
+	AvHTeamNumber			mLastTeamNumber;
+	AvHPlayMode				mLastPlayMode;
+	
+	bool					mSelectionJustChanged;
+	bool					mMouseOneDown;
+	bool					mMouseTwoDown;
+	int						mMouseOneStartX;
+	int						mMouseOneStartY;
+	bool					mLeftMouseStarted;
+	bool					mLeftMouseEnded;
+	bool					mPlacingBuilding;
+	int						mMouseTwoStartX;
+	int						mMouseTwoStartY;
+	bool					mRightMouseStarted;
+	bool					mRightMouseEnded;
+	vec3_t					mMouseWorldPosition;
+	vec3_t					mLeftMouseWorldStart;
+	vec3_t					mLeftMouseWorldEnd;
+	vec3_t					mRightMouseWorldStart;
+	vec3_t					mRightMouseWorldEnd;
+	MarqueeComponent*		mSelectionBox;
+	int						mMouseCursorX;
+	int						mMouseCursorY;
+	string					mPieMenuControl;
+
+	OrderListType			mOrders;
+	//AvHOrderType			mOrderMode;
+
+	AvHMessageID			mTechEvent;
+	AvHMessageID			mAlienAbility;
+	AvHMessageID			mGroupEvent;
+	AvHMessageID			mLastHotkeySelectionEvent;
+	int						mTrackingEntity;
+
+	AvHAlienUpgradeListType	mUpgrades;
+	AvHAlienUpgradeCategory mCurrentUpgradeCategory[ALIEN_UPGRADE_CATEGORY_MAX_PLUS_ONE];
+	int						mNumUpgradesAvailable;
+
+	Label*					mCommanderResourceLabel;
+	Label*					mOverwatchRangeLabel;
+	ProgressBar*			mGenericProgressBar;
+	ProgressBar*			mResearchProgressBar;
+	ProgressBar*			mAlienProgressBar;
+	Label*					mResearchLabel;
+	string					mPreviousHelpText;
+	float					mTimeLastHelpTextChanged;
+
+	int						mSelectedNodeResourceCost;
+	float					mCurrentUseableEnergyLevel;
+	float					mVisualEnergyLevel;
+	int						mUser2OfLastEnergyLevel;
+
+	static void				PlayRandomSongHook();
+	static void				ShowMap();
+	static void				HideMap();
+
+	float					mTimeLastOverwatchPulse;
+	bool					mInTopDownMode;
+	int						mNumLocalSelectEvents;
+	AvHMapMode				mMapMode;
+
+	static GammaTable		sPregameGammaTable;
+	static GammaTable		sGameGammaTable;
+	float					mDesiredGammaSlope;
+	
+	typedef vector<AvHAmbientSound>	AmbientSoundListType;
+	AmbientSoundListType	mAmbientSounds;
+
+	AvHTechNodes			mTechNodes;
+
+	string					mMapName;
+	AvHMapExtents			mMapExtents;
+
+	// If this isn't MESSAGE_NULL, it means we are trying to build a building of this tech
+	AvHMessageID			mGhostBuilding;
+	AvHMessageID			mValidatedBuilding;
+	bool					mCreatedGhost;
+	bool					mCancelBuilding;
+	bool					mCurrentGhostIsValid;
+	vec3_t					mNormBuildLocation;
+	vec3_t					mGhostWorldLocation;
+
+    // Added by mmcguire.
+    int                     mSelectionBoxX1;
+    int                     mSelectionBoxY1;
+    int                     mSelectionBoxX2;
+    int                     mSelectionBoxY2;
+    bool                    mSelectionBoxVisible;
+
+	Vector					mCommanderPAS;
+
+	StringList				mSoundNameList;
+
+	AvHVisibleBlipList		mEnemyBlips;
+	AvHVisibleBlipList		mFriendlyBlips;
+	
+	bool					mMarineUIDrawUI;
+	HSPRITE					mMarineUIJetpackSprite;
+
+	HSPRITE					mAlienUIEnergySprite;
+
+	HSPRITE					mMembraneSprite;
+	HSPRITE					mDigestingSprite;
+	HSPRITE					mBackgroundSprite;
+	HSPRITE					mTopDownTopSprite;
+	HSPRITE					mTopDownBottomSprite;
+	HSPRITE					mMarineTopSprite;
+	HSPRITE					mLogoutSprite;
+	HSPRITE					mCommandButtonSprite;
+	HSPRITE					mCommandStatusSprite;
+	HSPRITE					mSelectAllSprite;
+
+	HSPRITE					mMarineOrderIndicator;
+	HSPRITE					mMarineUpgradesSprite;
+
+	typedef map<int, int>			SpriteListType;
+	SpriteListType					mActionButtonSprites;
+	//SpriteListType					mHelpSprites;
+	int						mHelpSprite;
+
+	typedef vector< pair<vec3_t, int> >		HelpIconListType;
+	HelpIconListType						mHelpIcons;
+	EntityListType							mHelpEnts;
+
+	EntityListType							mBuildingEffectsEntityList;
+	float									mTimeOfLastEntityUpdate;
+
+	HSPRITE					mAlienUIUpgrades;
+	HSPRITE					mAlienUIUpgradeCategories;
+
+	HSPRITE					mAlienBuildSprite;
+	HSPRITE					mMarineBuildSprite;
+
+	HSPRITE					mAlienHealthSprite;
+	HSPRITE					mMarineHealthSprite;
+
+	HSPRITE					mHealthEffectsSprite;
+	HSPRITE					mBuildCircleSprite;
+	//HSPRITE					mSiegeTurretSprite;
+	SelectionListType		mSelectionEffects;
+
+
+	//#ifdef AVH_MAPPER_BUILD
+	//HSPRITE					mMappingTechSprite;
+	//#endif
+
+	HSPRITE					mHiveInfoSprite;
+	HSPRITE					mHiveHealthSprite;
+	HSPRITE					mOrderSprite;
+	HSPRITE					mCursorSprite;
+	HSPRITE					mMarineCursor;
+	HSPRITE					mAlienCursor;
+	HSPRITE					mAlienLifeformsCursor;
+	int						mCurrentCursorFrame;
+
+	int						mProgressBarEntityIndex;
+	int						mProgressBarParam;
+
+	bool					mFogActive;
+	vec3_t					mFogColor;
+	float					mFogStart;
+	float					mFogEnd;
+
+	AvHBaseInfoLocationListType		mInfoLocationList;
+	string							mLocationText;
+
+	string					mReticleInfoText;
+	//int						mReticleInfoColorR;
+	//int						mReticleInfoColorG;
+	//int						mReticleInfoColorB;
+	//float					mReticleInfoColorA;
+	//int						mReticleInfoScreenX;
+	//int						mReticleInfoScreenY;
+	int						mSelectingWeaponID;
+	string					mTechHelpText;
+	AvHMessageID			mSelectingNodeID;
+
+	struct tempent_s*		mLastGhostBuilding;
+
+	typedef vector<NumericalInfoEffect>		NumericalInfoEffectListType;
+	NumericalInfoEffectListType				mNumericalInfoEffects;
+
+	AvHTooltip								mHelpMessage;
+	AvHTooltip								mReticleMessage;
+	AvHTooltip								mTopDownPlayerNameMessage;
+	AvHTooltip								mTopDownActionButtonHelp;
+	AvHTooltip								mCombatUpgradeMenu;
+	bool									mDrawCombatUpgradeMenu;
+
+	typedef vector<AvHTooltip>				AvHTooltipListType;
+	AvHTooltipListType						mTooltips;
+
+	HiveInfoListType		mHiveInfoList;
+
+	bool					mRecordingLastFrame;
+
+	float					mTimeOfLastHelpText;
+	StringList				mDisplayedToolTipList;
+
+	int						mCurrentWeaponID;
+	bool					mCurrentWeaponEnabled;
+
+	AvHTechSlotManager		mTechSlotManager;
+	UIMode					mCurrentUIMode;
+
+	int						mMenuTechSlots;
+	int						mCurrentSquad;
+	int						mBlinkingAlertType;
+
+	float					mGameTime;
+	int						mTimeLimit;
+	int						mCombatAttackingTeamNumber;
+	bool					mGameStarted;
+	bool					mGameEnded;
+
+	AvHTeamNumber			mLastTeamSpectated;
+
+	typedef struct
+	{
+		AvHMessageID	mStructureID;
+		float			mTime;
+		int				mPlayerIndex;
+		Vector			mLocation;
+	} HUDNotificationType;
+
+	typedef vector< HUDNotificationType >	StructureHUDNotificationListType;
+	StructureHUDNotificationListType		mStructureNotificationList;
+
+	#ifdef AVH_PLAYTEST_BUILD
+	BalanceIntListType			mBalanceInts;
+	BalanceFloatListType		mBalanceFloats;
+	#endif
+
+    int                     mCrosshairShowCount;
+    HSPRITE                 mCrosshairSprite;
+    wrect_t                 mCrosshairRect;
+    int                     mCrosshairR;
+    int                     mCrosshairG;
+    int                     mCrosshairB;
+
+	int		                mViewport[4];		// the viewport coordinates x ,y , width, height
+	int		                mSpecialViewport[4];		// the viewport coordinates x ,y , width, height
+
+    bool                    mSteamUIActive;
+
+    typedef std::map<std::string, std::string> ServerVariableMapType;
+    ServerVariableMapType   mServerVariableMap;
+
+    static bool             sShowMap;
+
+};
+
+#endif
diff --git a/main/source/mod/AvHHudConstants.h b/main/source/mod/AvHHudConstants.h
new file mode 100644
index 00000000..8a8230a3
--- /dev/null
+++ b/main/source/mod/AvHHudConstants.h
@@ -0,0 +1,140 @@
+#ifndef AVH_HUD_CONSTANTS_H
+#define AVH_HUD_CONSTANTS_H
+
+// Insets for drawing UI
+const int					kBaseRightXOffset = 5;
+const int					kBaseBottomYOffset = 5;
+const int					kZFightingOffset = 5;
+const float					kResourceEnergyBarWidth = .06f;
+const float					kResourceEnergyBarHeight = .38f;
+const						kAttackOrderZOffset = 15.0f;
+const float					kHelpIconDrawSize = 20;	// Size to draw help icons, in world coords
+
+const float                 kPIPWidth  = 0.375;
+const float                 kPIPHeight = 0.375;
+
+const float kHiveNormScreenX = .85f;
+const float kHiveNormScreenY = 0.0f;
+const float kHiveNormScreenWidth = .15f;
+const float kHiveNormScreenHeight = .075f;
+const float kHiveNormScreenVerticalSpacing = .11f;
+
+// Constants for drawing supporting technology inside hive info sprite
+
+// Percent of kHiveNormScreenWidth that icon starts
+const float kHiveTechnologyInsetXScalar = .65f;
+const float kHiveTechnologyInsetYScalar = .4f;
+
+// Percent of kHiveNormScreenWidth to use
+const float kHiveTechnologyInsetWidthScalar = .24f;
+const float kHiveTechnologyInsetHeightScalar = .4f;
+
+// "paralyzed", "webbed", "parasited"
+const float kPlayerStatusHorizontalCenteredInset = .5f;
+const float kPlayerStatusVerticalInset = .82f;
+const float kPlayerStatusStatusSpacing = .02f;
+
+// health armor inset (it is inset by the alien energy indicator for aliens)
+const float	kHealthLeftInset = .05f;
+const float	kArmorLeftInset = .2f;
+
+// blip size
+const float kWorldBlipScale = 100;
+
+// Tooltips, reticle and help message constants
+//const float kHelpMessageLeftEdgeInset = .005f;
+const float kHelpMessageLeftEdgeInset = .07f;
+const float kHelpMessageTopEdgeInset = .75f;
+
+const float kHelpMessageCommanderTopEdgeInset = .6f;
+const float kVoiceStatusCommanderTopEdgeInset = .9f;
+const float kVoiceStatusCommanderRightEdgeInset = .3f;
+
+const float kVoiceStatusMarineRightEdgeInset = .03f;
+
+const float kHelpMessageAlienTopEdgeInset = .63f;
+const float kHelpMessageAlienLeftedgeInset = .055f;
+
+const float kReticleMessageHeight = .05f;
+const float kReticleMessageAlienLeftInset = .03f;
+
+
+const float kToolTipMaxWidth = .25f;
+const float kMOTDToolTipMaxWidth = .35f;
+
+const float kReticleMaxWidth = .35f;
+
+const float kToolTipVerticalSpacing = .01f;
+
+// HUD spectator constants
+const float kHUDSpectatorDefaultWindowX = .02f;
+const float kHUDSpectatorDefaultWindowY = .02f;
+const float kHUDSpectatorDefaultWindowWidth = .23f;//240;
+const float kHUDSpectatorDefaultWindowHeight = .23f;//180;
+
+const float kHUDSpectatorSoldierWindowX = .79f;
+const float kHUDSpectatorSoldierWindowY = .013f;
+const float kHUDSpectatorSoldierWindowWidth = .202f;
+const float kHUDSpectatorSoldierWindowHeight = .202f;
+
+// UI
+#define kSoldierMenu				"SoldierMenu"
+#define kSoldierCombatMenu			"SoldierCombatMenu"
+#define kAlienMenu					"AlienMenu"
+#define kAlienCombatMenu			"AlienCombatMenu"
+#define kHierarchy					"Hierarchy"
+#define kShowMapHierarchy			"ShowMapHierarchy"
+#define kAlienMembrane				"AlienMembrane"
+#define kCommanderResourceLabel		"CommanderResources"
+#define kMarineResourceLabel		"MarineResources"
+#define kCommanderStatusLabel		"CommanderStatus"
+#define kGenericProgress			"GenericProgress"
+#define kAlienProgress				"AlienProgress"
+#define kResearchProgress			"ResearchProgress"
+#define kSelectionBox				"SelectionBox"
+#define kLeaveCommanderButton		"LogoutButton"
+#define kScroller					"Scroller"
+#define	kSelectionText				"SelectionText"
+#define	kTechHelpText				"TechHelpText"
+#define	kPieHelpText				"PieHelpText"
+#define kNumUpgradesAvailableText	"NumUpgradesAvailableText"
+#define kResearchingLabel			"ResearchingLabel"
+#define kResearchBackgroundPanel	"ResearchBackgroundPanel"
+#define kActionButtonsComponents	"ActionButtonsComponent"
+#define kReinforcementsLabel		"ReinforcementsLabel"
+#define kReinforcementsText			"ReinforcementsText"
+#define kTopDownHUDTopSpritePanel	"TopDownHUDTop"
+#define kTopDownHUDBottomSpritePanel	"TopDownHUDBottom"
+#define kPendingImpulseSpecifier	"PendingImpulse%dPanel"
+#define kSelectAllImpulsePanel		"SelectAllImpulsePanel"
+#define kLastComponent				"TheLastComponent"
+
+#define kDebugCSPServerLabel		"DebugCSPServerInfo"
+#define kDebugCSPClientLabel		"DebugCSPClientInfo"
+
+// Particle system editor controls
+#define kPSESizeSlider				"PSESizeSlider"
+#define kPSESizeLabel				"PSESizeLabel"
+#define kPSEScaleSlider				"PSEScaleSlider"
+#define kPSEScaleLabel				"PSEScaleLabel"
+#define kPSEGenerationRateSlider	"PSEGenerationRateSlider"
+#define kPSEGenerationRateLabel		"PSEGenerationRateLabel"
+#define kPSEParticleLifetimeSlider	"PSEParticleLifetimeSlider"
+#define kPSEParticleLifetimeLabel	"PSEParticleLifetimeLabel"
+#define kPSEParticleSystemLifetimeSlider	"PSEParticleSystemLifetimeSlider"
+#define kPSEParticleSystemLifetimeLabel		"PSEParticleSystemLifetimeLabel"
+#define kPSEMaxParticlesSlider		"PSEMaxParticlesSlider"
+#define kPSEMaxParticlesLabel		"PSEMaxParticlesLabel"
+#define kPSEDrawModeSlider			"PSEDrawModeSlider"
+#define kPSEDrawModeLabel			"PSEDrawModeLabel"
+
+#define PSEGenVelToggleSlider		"PSEGenVelToggleSlider"
+#define kPSEGenVelToggleLabel		"PSEGenVelToggleLabel"
+#define kPSEGenVelShapeSlider		"PSEGenVelShapeSlider"
+#define kPSEGenVelShapeLabel		"PSEGenVelShapeLabel"
+#define kPSEGenVelParamNumSlider	"PSEGenVelParamNumSlider"
+#define kPSEGenVelParamNumLabel		"PSEGenVelParamNumLabel"
+#define kPSEGenVelParamValueSlider	"PSEGenVelParamValueSlider"
+#define kPSEGenVelParamValueLabel	"PSEGenVelParamValueLabel"
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHHudRender.cpp b/main/source/mod/AvHHudRender.cpp
new file mode 100644
index 00000000..1cd422fd
--- /dev/null
+++ b/main/source/mod/AvHHudRender.cpp
@@ -0,0 +1,4182 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: All graphical HUD operations
+//
+// $Workfile: AvHHudRender.cpp $
+// $Date: 2002/10/24 21:31:13 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHHudRender.cpp,v $
+// Revision 1.25  2002/10/24 21:31:13  Flayra
+// - Removed some parts of energy drawing (unneeded clutter)
+// - New marine HUD artwork (mainhud.spr)
+// - Reworked upgrade drawing to only draw one of a type of upgrade (this was the last thing for v1.0, so it's a bit yucky)
+//
+// Revision 1.24  2002/10/18 22:20:14  Flayra
+// - Fixed alien mass crash when a player left the server
+//
+// Revision 1.23  2002/10/16 00:59:33  Flayra
+// - Added titles for umbra and primal scream
+// - Don't draw building circles for entities on the other team (not even for commander)
+// - Tried drawing building circles for ghost buildings, but it was confusing
+//
+// Revision 1.22  2002/10/03 18:56:10  Flayra
+// - Moved alien energy to fuser3
+// - Changed limits for energy and resources
+// - Draw order icons centered around order position
+// - Don't draw health rings for opposing teams
+//
+// Revision 1.21  2002/09/25 20:48:37  Flayra
+// - Allow more UI to draw when gestating
+// - Only draw text for blip closest to reticle
+// - Don't draw stuff when dead
+// - Changed order blinking
+//
+// Revision 1.20  2002/09/23 22:19:58  Flayra
+// - Added "paralyzed" indicator
+// - HUD element repositioning and refactoring
+// - Added alien build circles
+// - Added visible motion-tracking sprite to marine HUD
+// - Removed special siege sprite
+//
+// Revision 1.19  2002/09/09 19:57:33  Flayra
+// - Fixed black edges in D3D
+// - Added blinking "webbed" indicator
+// - Refactored UI constants
+// - Fixed help icons
+// - Added hive info indicator
+// - Draw more info as spectator
+//
+// Revision 1.18  2002/08/31 18:01:01  Flayra
+// - Work at VALVe
+//
+// Revision 1.17  2002/08/16 02:38:44  Flayra
+// - Draw "webbed" message
+// - Draw health for buildings and players
+// - Removed old overwatch code
+//
+// Revision 1.16  2002/08/09 01:03:36  Flayra
+// - Started refactoring for moving variable sprite hole drawing into TriAPI
+//
+// Revision 1.15  2002/08/02 21:56:54  Flayra
+// - Added reticle help, new tooltip system and much nicer order drawing!  Also changed jetpack label to use font, and refactored some sprite names.
+//
+// Revision 1.14  2002/07/26 23:05:06  Flayra
+// - Generate numerical feedback for damage events
+//
+// Revision 1.13  2002/07/23 17:09:41  Flayra
+// - Add ability to centered, translated strings, visually-smooth energy level, new hive sight info, draw parasited message, draw marine upgrades, new method of drawing alien upgrades (overlapping and offset)
+//
+// Revision 1.12  2002/07/10 14:42:26  Flayra
+// - Removed cl_particleinfo drawing differences
+//
+// Revision 1.11  2002/07/08 17:07:56  Flayra
+// - Started to add display of marine upgrade sprite, fixed bug where building indicators aren't displayed after a map change, info_location drawing changes, primal scream color tweak, removed old hive drawing code
+//
+// Revision 1.10  2002/07/01 21:36:23  Flayra
+// - Added primal scream effect, added building ranges for ghost buildings, removed outdated code, removed mapping build sprite, call vidinit() on hive sight sprites
+//
+// Revision 1.9  2002/06/25 18:03:09  Flayra
+// - Added info_locations, removed old weapon help system, added smooth resource swelling, lots of alien UI usability changes, fixed problem with ghost building
+//
+// Revision 1.8  2002/06/10 19:57:01  Flayra
+// - Allow drawing just a portion of a texture when scaling it, draw team hierarchy for soldiers
+//
+// Revision 1.7  2002/06/03 16:49:20  Flayra
+// - Help sprites moved into one animated sprite
+//
+// Revision 1.6  2002/05/28 17:49:06  Flayra
+// - Hive sight sprite changes
+//
+// Revision 1.5  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHHud.h"
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHClientVariables.h"
+#include "mod/AvHSpecials.h"
+#include "common/cl_entity.h"
+#include "mod/AvHTitles.h"
+#include "pm_shared/pm_debug.h"
+#include "util/MathUtil.h"
+#include "common/r_efx.h"
+#include "cl_dll/eventscripts.h"
+#include "mod/AvHSprites.h"
+#include "ui/UIUtil.h"
+#include "types.h"
+#include <signal.h>
+#include "common/com_model.h"
+#include "cl_dll/studio_util.h"
+#include "cl_dll/r_studioint.h"
+#include "mod/AvHMiniMap.h"
+#include "mod/AvHActionButtons.h"
+#include "util/STLUtil.h"
+#include "mod/AvHSharedUtil.h"
+#include "common/event_api.h"
+#include "mod/AvHScriptManager.h"
+#include "particles/p_vector.h"
+#include "particles/papi.h"
+#include "mod/AvHParticleSystemManager.h"
+#include "mod/AvHTeamHierarchy.h"
+#include "mod/AvHClientUtil.h"
+#include "mod/AvHTooltip.h"
+#include "cl_dll/demo.h"
+#include "common/demo_api.h"
+#include "mod/AvHHudConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHCommanderModeHandler.h"
+#include "common/ref_params.h"
+#include "mod/AvHTechImpulsePanel.h"
+#include "mod/AvHServerVariables.h"
+#include "mod/AvHSpriteAPI.h"
+#include "mod/AvHParticleEditorHandler.h"
+
+void IN_GetMousePos( int *mx, int *my );
+
+// Externs
+extern int					g_iVisibleMouse;
+extern playermove_t*		pmove;
+extern engine_studio_api_t	IEngineStudio;
+extern "C" Vector			gPredictedPlayerOrigin;
+extern vec3_t				v_origin;
+extern vec3_t				v_angles;
+
+//extern vec3_t gPlayerOrigin;
+//extern vec3_t gPlayerAngles;
+extern ref_params_s* pDemoRefParams;
+extern vec3_t gPlaybackViewOrigin;
+extern AvHCommanderModeHandler	gCommanderHandler;
+extern AvHParticleEditorHandler	gParticleEditorHandler;
+float kD3DErrorValue = 0.01f;
+
+
+vec3_t GetViewOrigin()
+{
+	vec3_t theOrigin = v_origin;
+
+	//cl_entity_t* theViewEntity = gEngfuncs.GetLocalPlayer();//gEngfuncs.GetViewModel();
+	//if(theViewEntity && /*pDemoRefParams &&*/ gEngfuncs.pDemoAPI->IsPlayingback())
+	//{
+	//	//theOrigin = pDemoRefParams->vieworg;
+	//	theOrigin = theViewEntity->origin;
+	//}
+
+	if(gEngfuncs.pDemoAPI->IsPlayingback())
+	{
+		theOrigin = gPlaybackViewOrigin;
+	}
+
+	return theOrigin;
+	//	return v_origin;
+}
+
+void BuildLerpedPoint(float inXPercentage, float inYPercentage, const Vector& inUpperLeft, const Vector& inUpperRight, const Vector& inLowerLeft, Vector& outPoint)
+{
+	ASSERT(inXPercentage >= 0.0f);
+	ASSERT(inXPercentage <= 1.0f);
+	ASSERT(inYPercentage >= 0.0f);
+	ASSERT(inYPercentage <= 1.0f);
+	
+	Vector theUpperLeftToUpperRight;
+	VectorSubtract(inUpperRight, inUpperLeft, theUpperLeftToUpperRight);
+	
+	Vector theUpperLeftToLowerLeft;
+	VectorSubtract(inLowerLeft, inUpperLeft, theUpperLeftToLowerLeft);
+	
+	Vector theXComp;
+	VectorScale(theUpperLeftToUpperRight, inXPercentage, theXComp);
+	
+	Vector theYComp;
+	VectorScale(theUpperLeftToLowerLeft, inYPercentage, theYComp);
+	
+	outPoint = inUpperLeft + theXComp + theYComp;
+	
+	//float theXPercentage = (outPoint.x - inUpperLeft.x)/(theXComp.x + theYComp.x);
+	//float theYPercentage = (outPoint.y - inUpperLeft.y)/(theXComp.y + theYComp.y);
+}
+
+void CalculatePlaneInfo(const Vector& inUpperLeft, const Vector& inUpperRight, const Vector& inLowerLeft, float& outD, Vector& outPlaneNormal)
+{
+	// Cross two vectors for plane normal
+	Vector theUpperRightToUpperLeft;
+	VectorSubtract(inUpperLeft, inUpperRight, theUpperRightToUpperLeft);
+	theUpperRightToUpperLeft = theUpperRightToUpperLeft.Normalize();
+	
+	Vector theUpperLeftToLowerLeft;
+	VectorSubtract(inLowerLeft, inUpperLeft, theUpperLeftToLowerLeft);
+	theUpperLeftToLowerLeft = theUpperLeftToLowerLeft.Normalize();
+
+	// Calculate plane normal
+	CrossProduct(theUpperRightToUpperLeft, theUpperLeftToLowerLeft, outPlaneNormal);
+	
+	// Plug in one of the points for D (Ax + By + Cz = -D)
+	outD = -(outPlaneNormal.x*inUpperLeft.x + outPlaneNormal.y*inUpperLeft.y + outPlaneNormal.z*inUpperLeft.z);
+}
+
+void CalculatePointOnPlane(int inXPos, int inYPos, const Vector& inOrigin, const Vector& inPlaneNormal, float inPlaneD, Vector& outPoint)
+{
+	Vector theRay;
+	CreatePickingRay(inXPos, inYPos, theRay);
+	
+	// Solve for parametric t
+	float thePlaneA = inPlaneNormal.x;
+	float thePlaneB = inPlaneNormal.y;
+	float thePlaneC = inPlaneNormal.z;
+	
+	float theT = -(thePlaneA*inOrigin.x + thePlaneB*inOrigin.y + thePlaneC*inOrigin.z + inPlaneD)/(thePlaneA*theRay.x + thePlaneB*theRay.y + thePlaneC*theRay.z);
+	
+	// Now we have t, solve for the endpoint
+	outPoint.x = inOrigin.x + theT*theRay.x;
+	outPoint.y = inOrigin.y + theT*theRay.y;
+	outPoint.z = inOrigin.z + theT*theRay.z;
+}
+
+void ProjectPointFromViewOrigin(int inDistanceToProject, int inScreenX, int inScreenY, Vector& outResult)
+{
+	Vector theRay;
+	CreatePickingRay(inScreenX, inScreenY, theRay);
+	
+	// project default distance along picking ray
+	VectorMA(GetViewOrigin(), inDistanceToProject, theRay, outResult);
+}
+
+void AvHHud::DrawTranslatedString(int inX, int inY, const char* inStringToTranslate, bool inCentered, bool inIgnoreUpgrades, bool inTrimExtraInfo)
+{
+	// Translate
+	string theTranslatedText;
+	LocalizeString(inStringToTranslate, theTranslatedText);
+	if(theTranslatedText[0] == '#')
+	{
+		theTranslatedText = theTranslatedText.substr(1, theTranslatedText.size());
+	}
+
+	if(inTrimExtraInfo)
+	{
+		AvHCUTrimExtraneousLocationText(theTranslatedText);
+	}
+
+	// Draw it
+	if(theTranslatedText != "")
+	{
+		int theR, theG, theB;
+		this->GetPrimaryHudColor(theR, theG, theB, inIgnoreUpgrades, false);
+
+		char theCharBuffer[512];
+		sprintf(theCharBuffer, "%s", theTranslatedText.c_str());
+
+		if(inCentered)
+		{
+			this->DrawHudStringCentered(inX, inY, ScreenWidth(), theCharBuffer, theR, theG, theB);
+		}
+		else
+		{
+			this->DrawHudString(inX, inY, ScreenWidth(), theCharBuffer, theR, theG, theB);
+		}
+	}
+}
+
+bool gWarpHUDSprites = false;
+float gWarpXAmount = 0.0f;
+float gWarpYAmount = 0.0f;
+float gWarpXSpeed = 0.0f;
+float gWarpYSpeed = 0.0f;
+
+void SetWarpHUDSprites(bool inMode, float inWarpXAmount = 0.0f, float inWarpYAmount = 0.0f, float inWarpXSpeed = 0.0f, float inWarpYSpeed = 0.0f)
+{
+	gWarpHUDSprites = inMode;
+	gWarpXAmount = inWarpXAmount;
+	gWarpYAmount = inWarpYAmount;
+	gWarpXSpeed = inWarpXSpeed;
+	gWarpYSpeed = inWarpYSpeed;
+}
+
+void DrawScaledHUDSprite(int inSpriteHandle, int inMode, int inRowsInSprite = 1, int inX = 0, int inY = 0, int inWidth = ScreenWidth(), int inHeight = ScreenHeight(), int inForceSpriteFrame = -1, float inStartU = 0.0f, float inStartV = 0.0f, float inEndU = 1.0f, float inEndV = 1.0f, float inRotateUVRadians = 0.0f, bool inUVWrapsOverFrames = false)
+{
+	// Count number of frames
+	int theNumFrames = SPR_Frames(inSpriteHandle);
+	
+	//int theSpriteWidth = SPR_Width(inSpriteHandle, 0);
+	//int theSpriteHeight = SPR_Height(inSpriteHandle, 0);
+	//float theAspectRatio = theSpriteWidth/theSpriteHeight;
+	
+	// ASSERT that the the number of rows makes sense for the number of frames 
+	ASSERT(theNumFrames > 0);
+	float theFloatNumCols = (float)theNumFrames/inRowsInSprite;
+	int theNumCols = (int)theFloatNumCols;
+	ASSERT(theNumCols == theFloatNumCols);
+
+	//int theNumRows = theNumFrames/theNumCols;
+	int theNumRows = inRowsInSprite;
+
+	// Allow scaling of one frame, without tiling
+	if(inForceSpriteFrame != -1)
+	{
+		theNumRows = theNumCols = 1;
+	}
+
+	// Make sure coords are bounded to allowable ranges
+	
+	inStartU = min(max(inStartU, kD3DErrorValue), 1.0f - kD3DErrorValue);
+	inStartV = min(max(inStartV, kD3DErrorValue), 1.0f - kD3DErrorValue);
+	inEndU = min(max(inEndU, kD3DErrorValue), 1.0f - kD3DErrorValue);
+	inEndV = min(max(inEndV, kD3DErrorValue), 1.0f - kD3DErrorValue);
+
+	if(inRotateUVRadians != 0.0f)
+	{
+		// Rotate all the UV coords
+		vec3_t theAngles(0.0f, 0.0f, inRotateUVRadians);
+		float theMatrix[3][4];
+		AngleMatrix(theAngles, theMatrix);
+
+		float theRotatedValues[3];
+
+		float theStartValues[3] = {inStartU, inStartV, 0.0f};
+		VectorRotate(theStartValues, theMatrix, theRotatedValues);
+		inStartU = theRotatedValues[0];
+		inStartV = theRotatedValues[1];
+
+		float theEndValues[3] = {inEndU, inEndV, 0.0f};
+		VectorRotate(theEndValues, theMatrix, theRotatedValues);
+		inEndU = theRotatedValues[0];
+		inEndV = theRotatedValues[1];
+	}
+	
+	// Calculate width and height of each quad
+	int theQuadScreenWidth = inWidth/theNumCols;
+	int theQuadScreenHeight = inHeight/theNumRows;
+	
+	//Vector thePickRay;
+	//int theHalfWidth = ScreenWidth/2;
+	//int theHalfHeight = ScreenHeight/2;
+	//CreatePickingRay(theHalfWidth, theHalfHeight, thePickRay);
+	
+	//char gDebugMessage[256];
+	//sprintf(gDebugMessage, "(%d, %d): %f, %f, %f", theHalfWidth, theHalfHeight, thePickRay.x, thePickRay.y, thePickRay.z);
+	//CenterPrint(gDebugMessage);
+	
+	//float theRenderOrigin[3];
+	//pVector theUp;
+	//pVector theRight;
+	//pVector theNormal;
+	//IEngineStudio.GetViewInfo(theRenderOrigin, (float*)&theUp, (float*)&theRight, (float*)&theNormal);
+
+	//Demo_WriteVector(TYPE_VIEWANGLES, v_angles);
+	//Demo_WriteVector(TYPE_VIEWORIGIN, v_origin);
+	
+	vec3_t theRenderOrigin;
+	VectorCopy(GetViewOrigin(), theRenderOrigin);
+
+	vec3_t theForward, theRight, theUp;
+	AngleVectors(v_angles, theForward, theRight, theUp);
+	
+	Vector theRenderOriginVector;
+	theRenderOriginVector.x = theRenderOrigin[0];
+	theRenderOriginVector.y = theRenderOrigin[1];
+	theRenderOriginVector.z = theRenderOrigin[2];
+
+	// This is the smallest value that displays and it still clips with the view model a little
+	const int kDistanceToProject = 10;
+	
+	// create picking ray for upper left of quad
+	Vector theUpperLeftRay;
+	//CreatePickingRay(inX, inY, theUpperLeftRay);
+	CreatePickingRay(0, 0, theUpperLeftRay);
+	
+	// create picking ray for lower left of quad
+	Vector theLowerLeftRay;
+	//CreatePickingRay(inX, inY+inHeight, theLowerLeftRay);
+	CreatePickingRay(0, ScreenHeight(), theLowerLeftRay);
+	
+	// create picking ray for upper right of quad
+	Vector theUpperRightRay;
+	//CreatePickingRay(inX+inWidth, inY, theUpperRightRay);
+	CreatePickingRay(ScreenWidth(), 0, theUpperRightRay);
+	
+	// project default distance along picking ray
+	Vector theUpperLeftWorldPos;
+	VectorMA(theRenderOrigin, kDistanceToProject, theUpperLeftRay, theUpperLeftWorldPos);
+	
+	Vector theUpperRightWorldPos;
+	VectorMA(theRenderOrigin, kDistanceToProject, theUpperRightRay, theUpperRightWorldPos);
+
+	Vector theLowerLeftWorldPos;
+	VectorMA(theRenderOrigin, kDistanceToProject, theLowerLeftRay, theLowerLeftWorldPos);
+
+	// Create formula for plane
+	float thePlaneD;
+	Vector thePlaneNormal;
+	CalculatePlaneInfo(theUpperLeftWorldPos, theUpperRightWorldPos, theLowerLeftWorldPos, thePlaneD, thePlaneNormal);
+	
+	// loop through screen height
+	int theCurrentFrame = 0;
+	
+	// Allow drawing of just one frame
+	if(inForceSpriteFrame != -1)
+	{
+		theCurrentFrame = inForceSpriteFrame;
+	}
+
+	for(int i = 0; i < theNumRows; i++)
+	{
+		// loop through screen width
+		for(int j = 0; j < theNumCols; j++)
+		{
+			// draw quad
+			gEngfuncs.pTriAPI->RenderMode(inMode);
+			gEngfuncs.pTriAPI->CullFace(TRI_NONE);
+			//gEngfuncs.pTriAPI->Brightness(1);
+			
+			if(gEngfuncs.pTriAPI->SpriteTexture((struct model_s*)gEngfuncs.GetSpritePointer(inSpriteHandle), theCurrentFrame))
+			{
+				gEngfuncs.pTriAPI->Begin( TRI_TRIANGLE_STRIP );
+				//gEngfuncs.pTriAPI->Color4f(1.0f, 1.0f, 1.0f, 1.0f);
+
+				bool theIsFirstRow = (i == 0);
+				bool theIsFirstCol = (j == 0);
+				bool theIsLastRow = (i == (theNumRows-1));
+				bool theIsLastCol = (j == (theNumCols-1));
+
+				float theStartU = inStartU;
+				float theStartV = inStartV;
+				float theEndU = inEndU;
+				float theEndV = inEndV;
+
+				if(inUVWrapsOverFrames)
+				{
+					if((theNumCols > 1) && !theIsFirstCol)
+					{
+						theStartU = 0.0f;
+					}
+					if((theNumRows > 1) && !theIsFirstRow)
+					{
+						theStartV = 0.0f;
+					}
+					if((theNumCols > 1) && !theIsLastCol)
+					{
+						theEndU = 1.0f;
+					}
+					if((theNumRows > 1) && !theIsLastRow)
+					{
+						theEndV = 1.0f;
+					}
+				}
+
+				// Optionally warp XY coords using current time
+				int theWarpXStartAmount = 0;
+				int theWarpYStartAmount = 0;
+				int theWarpXEndAmount = 0;
+				int theWarpYEndAmount = 0;
+
+				if(gWarpHUDSprites)
+				{
+					float theCurrentTime = gHUD.GetTimeOfLastUpdate();
+					float theNormXAmount = theCurrentTime*gWarpXSpeed - (int)(theCurrentTime*gWarpXSpeed); // Get fractional part of second
+					float theNormYAmount = theCurrentTime*gWarpYSpeed - (int)(theCurrentTime*gWarpYSpeed);
+					float theSinusoidalNormXAmount = cos(theNormXAmount*2.0f*M_PI);
+					float theSinusoidalNormYAmount = sin(theNormYAmount*2.0f*M_PI);
+					float theXAmount = theSinusoidalNormXAmount*gWarpXAmount;// - gWarpUAmount/2.0f;
+					float theYAmount = theSinusoidalNormYAmount*gWarpYAmount;// - gWarpVAmount/2.0f;
+
+					if(!theIsFirstCol)
+					{
+						theWarpXStartAmount = theXAmount*ScreenWidth();
+					}
+					if(!theIsLastCol)
+					{
+						theWarpXEndAmount = theXAmount*ScreenWidth();
+					}
+					if(!theIsFirstRow)
+					{
+						theWarpYStartAmount = theYAmount*ScreenHeight();
+					}
+					if(!theIsLastRow)
+					{
+						theWarpYEndAmount = theYAmount*ScreenHeight();
+					}
+				}
+	
+				// Compensate for gamma
+				float theGammaSlope = gHUD.GetGammaSlope();
+				float theColorComponent = 1.0f/theGammaSlope;
+				gEngfuncs.pTriAPI->Color4f(theColorComponent, theColorComponent, theColorComponent, 1.0f);
+				
+				Vector thePoint;
+	
+				//float theMinXPercentage = (float)j/theNumCols;
+				//float theMaxXPercentage = (float)(j+1)/theNumCols;
+	
+				//float theMinYPercentage = (float)i/theNumRows;
+				//float theMaxYPercentage = (float)(i+1)/theNumRows;
+	
+				int theMinXPos = inX + ((float)j/theNumCols)*inWidth + theWarpXStartAmount;
+				int theMinYPos = inY + ((float)i/theNumRows)*inHeight + theWarpYStartAmount;
+	
+				int theMaxXPos = inX + ((float)(j+1)/theNumCols)*inWidth + theWarpXEndAmount;
+				int theMaxYPos = inY + ((float)(i+1)/theNumRows)*inHeight + theWarpYEndAmount;
+				
+				// Lower left
+				Vector thePointOne;
+				//BuildLerpedPoint(theMinXPercentage, theMaxYPercentage, theUpperLeftWorldPos, theUpperRightWorldPos, theLowerLeftWorldPos, thePointOne);
+				CalculatePointOnPlane(theMinXPos, theMaxYPos, theRenderOriginVector, thePlaneNormal, thePlaneD, thePointOne);
+				float theU = theStartU;
+				float theV = theEndV;
+				gEngfuncs.pTriAPI->TexCoord2f(theU, theV);// 0,1
+				gEngfuncs.pTriAPI->Vertex3fv((float*)&thePointOne);
+				
+				// Upper left
+				Vector thePointTwo;
+				//BuildLerpedPoint(theMinXPercentage, theMinYPercentage, theUpperLeftWorldPos, theUpperRightWorldPos, theLowerLeftWorldPos, thePointTwo);
+				CalculatePointOnPlane(theMinXPos, theMinYPos, theRenderOriginVector, thePlaneNormal, thePlaneD, thePointTwo);
+				theU = theStartU;
+				theV = theStartV;
+				//gEngfuncs.pTriAPI->TexCoord2f(inStartU, inStartV); // 0,0
+				gEngfuncs.pTriAPI->TexCoord2f(theU, theV);// 0,1
+				gEngfuncs.pTriAPI->Vertex3fv((float*)&thePointTwo);
+				
+				// Lower right
+				Vector thePointFour;
+				//BuildLerpedPoint(theMaxXPercentage, theMaxYPercentage, theUpperLeftWorldPos, theUpperRightWorldPos, theLowerLeftWorldPos, thePointFour);
+				CalculatePointOnPlane(theMaxXPos, theMaxYPos, theRenderOriginVector, thePlaneNormal, thePlaneD, thePointFour);
+				theU = theEndU;
+				theV = theEndV;
+				//gEngfuncs.pTriAPI->TexCoord2f(inEndU, inEndV);// 1,1
+				gEngfuncs.pTriAPI->TexCoord2f(theU, theV);// 0,1
+				gEngfuncs.pTriAPI->Vertex3fv((float*)&thePointFour);
+
+				// Upper right
+				Vector thePointThree;
+				//BuildLerpedPoint(theMaxXPercentage, theMinYPercentage, theUpperLeftWorldPos, theUpperRightWorldPos, theLowerLeftWorldPos, thePointThree);
+				CalculatePointOnPlane(theMaxXPos, theMinYPos, theRenderOriginVector, thePlaneNormal, thePlaneD, thePointThree);
+				theU = theEndU;
+				theV = theStartV;
+				//gEngfuncs.pTriAPI->TexCoord2f(inEndU, inStartV); // 1,0
+				gEngfuncs.pTriAPI->TexCoord2f(theU, theV);// 0,1
+				gEngfuncs.pTriAPI->Vertex3fv((float*)&thePointThree);
+	
+				gEngfuncs.pTriAPI->End();
+			}
+	
+			// Increment frame
+			theCurrentFrame++;
+			
+			// Allow drawing of just one frame
+			if(inForceSpriteFrame != -1)
+			{
+				theCurrentFrame = inForceSpriteFrame;
+			}
+			
+			// increment current x and y
+			//theCurrentScreenX += theQuadScreenWidth;
+		}
+		//theCurrentScreenX = 0;
+		//theCurrentScreenY += theQuadScreenHeight;
+	}
+}
+
+void DrawVariableScaledHUDSprite(float inFactor, int inSpriteHandle, int inMode, int inX, int inY, int inWidth, int inHeight)
+{
+	// Draw as two scaled sprites, one for the level and one for the "empty" level
+	// Assumes that sprite has two frames, with the empty level being frame 0 and the full frame being frame 1
+	int theWidth = inWidth;
+	float theStartU = 0.0f;
+	float theEndU = 1.0f;
+
+	int theHeight = inFactor*inHeight;
+	float theStartV = 1.0f - inFactor;
+	float theEndV = 1.0f;
+	int theX = inX;
+	int theY = inY + inHeight - theHeight;
+	DrawScaledHUDSprite(inSpriteHandle, inMode, 1, theX, theY, theWidth, theHeight, 1, theStartU, theStartV, theEndU, theEndV);
+
+	// Draw background
+	theHeight = (1.0f - inFactor)*inHeight;
+	theY = inY;
+	theStartV = 0.0f;
+	theEndV = 1.0f - inFactor;
+	DrawScaledHUDSprite(inSpriteHandle, inMode, 1, theX, theY, theWidth, theHeight, 0, theStartU, theStartV, theEndU, theEndV);
+}
+
+void DrawSpriteOnGroundAtPoint(vec3_t inOrigin, int inRadius, HSPRITE inSprite, int inRenderMode = kRenderNormal, int inFrame = 0, float inAlpha = 1.0f)
+{
+	if(gEngfuncs.pTriAPI->SpriteTexture((struct model_s *)gEngfuncs.GetSpritePointer(inSprite), inFrame))
+	{
+		gEngfuncs.pTriAPI->CullFace(TRI_NONE);
+		
+		gEngfuncs.pTriAPI->RenderMode(inRenderMode);
+		
+		//gEngfuncs.pTriAPI->RenderMode( kRenderTransTexture );
+		//gEngfuncs.pTriAPI->Color4f(inR, inG, inB, inA);
+		
+		gEngfuncs.pTriAPI->Begin(TRI_TRIANGLE_STRIP);
+		
+		// Draw one quad
+		vec3_t thePoint = inOrigin;
+		
+		float theGammaSlope = gHUD.GetGammaSlope();
+		ASSERT(theGammaSlope > 0.0f);
+		float theColorComponent = 1.0f/theGammaSlope;
+		
+		gEngfuncs.pTriAPI->Color4f(theColorComponent, theColorComponent, theColorComponent, inAlpha);
+		gEngfuncs.pTriAPI->Brightness(1.6f);
+		
+		thePoint[0] = inOrigin[0] - inRadius;
+		thePoint[1] = inOrigin[1] - inRadius;
+		gEngfuncs.pTriAPI->TexCoord2f(0, 0);
+		gEngfuncs.pTriAPI->Vertex3f(thePoint[0], thePoint[1], thePoint[2]);
+		
+		thePoint[0] = inOrigin[0] - inRadius;
+		thePoint[1] = inOrigin[1] + inRadius;
+		gEngfuncs.pTriAPI->TexCoord2f(0, 1);
+		gEngfuncs.pTriAPI->Vertex3f(thePoint[0], thePoint[1], thePoint[2]);
+
+		thePoint[0] = inOrigin[0] + inRadius;
+		thePoint[1] = inOrigin[1] - inRadius;
+		gEngfuncs.pTriAPI->TexCoord2f(1, 0);
+		gEngfuncs.pTriAPI->Vertex3f(thePoint[0], thePoint[1], thePoint[2]);
+		
+		thePoint[0] = inOrigin[0] + inRadius;
+		thePoint[1] = inOrigin[1] + inRadius;
+		gEngfuncs.pTriAPI->TexCoord2f(1, 1);
+		gEngfuncs.pTriAPI->Vertex3f(thePoint[0], thePoint[1], thePoint[2]);
+		
+		gEngfuncs.pTriAPI->End();
+		gEngfuncs.pTriAPI->RenderMode( kRenderNormal );
+	}
+}
+
+void AvHHud::DrawPlayerNames()
+{
+	bool inReadyRoom = false;//(this->GetPlayMode() == PLAYMODE_READYROOM);
+	bool inTopDownMode = this->GetInTopDownMode();
+
+	if(inTopDownMode || inReadyRoom /*&& !gEngfuncs.pDemoAPI->IsPlayingback()*/)
+	{
+		cl_entity_s* theLocalPlayer = gEngfuncs.GetLocalPlayer();
+		if(theLocalPlayer)
+		{
+			int theLocalPlayerIndex = theLocalPlayer->index;
+
+			// Loop through all players
+			for(int i = 1; i <= kMaxPlayers; i++)
+			{
+				if((i != theLocalPlayerIndex) && AvHCUGetIsEntityInPVSAndVisible(i))
+				{
+					cl_entity_s* theCurrentPlayer = gEngfuncs.GetEntityByIndex(i);
+					bool theDrawEntity = (inReadyRoom || (theCurrentPlayer && theCurrentPlayer->player && (AvHTeamNumber(theCurrentPlayer->curstate.team) == this->GetHUDTeam()) && (i != theLocalPlayerIndex)) );
+					if(theDrawEntity)
+					{
+						string theEntityName;
+						bool theIsEnemy;
+						if(this->GetEntityInfoString(i, theEntityName, theIsEnemy))
+						{
+							vec3_t theEntityOrigin;
+							VectorCopy(theCurrentPlayer->curstate.origin, theEntityOrigin);
+							theEntityOrigin.z += AvHCUGetIconHeightForPlayer((AvHUser3)theCurrentPlayer->curstate.iuser3);
+						
+							// If they are on screen
+							Vector theScreenPos;
+							if(AvHCUWorldToScreen(theEntityOrigin, (float*)&theScreenPos))
+							{
+								// Set color
+								int theR, theG, theB;
+								this->GetPrimaryHudColor(theR, theG, theB, true, false);
+						
+								// If selected, draw in different color
+								if(inTopDownMode)
+								{
+									bool theIsSelected = (std::find(this->mSelected.begin(), this->mSelected.end(), i) != this->mSelected.end());
+									if(theIsSelected)
+									{
+										// Selected color
+										UnpackRGB(theR, theG, theB, RGB_MARINE_SELECTED);
+									
+										if(GetHasUpgrade(theCurrentPlayer->curstate.iuser4, MASK_PARASITED))
+										{
+											string thePrePendString;
+											LocalizeString(kParasited, thePrePendString);
+											theEntityName = string(theEntityName + " (" + thePrePendString + ")");
+									
+											// Set color to parasited color
+											UnpackRGB(theR, theG, theB, RGB_MARINE_PARASITED);
+										}
+									}
+								}
+						
+								// Set text color draw in different color
+								this->mTopDownPlayerNameMessage.SetRGB(theR, theG, theB);
+								this->mTopDownPlayerNameMessage.SetIgnoreFadeForLifetime(true);
+						
+								// Set the message info and draw it
+								this->mTopDownPlayerNameMessage.SetText(theEntityName);
+						
+								// Set position
+								Vector theNormPos;
+								float theNormX = theScreenPos.x/ScreenWidth();
+								
+								int theBoxHeight = this->mTopDownPlayerNameMessage.GetScreenHeight();
+								float theNormY = (theScreenPos.y - theBoxHeight)/ScreenHeight();
+						
+								if((inTopDownMode && !this->GetIsRegionBlockedByUI(theNormX, theNormY)) || inReadyRoom)
+								{
+									this->mTopDownPlayerNameMessage.SetNormalizedScreenX(theNormX);
+									this->mTopDownPlayerNameMessage.SetNormalizedScreenY(theNormY);
+									this->mTopDownPlayerNameMessage.SetCentered(true);
+									this->mTopDownPlayerNameMessage.SetNormalizedMaxWidth(kReticleMaxWidth);
+									this->mTopDownPlayerNameMessage.Draw();
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+//bool AvHHud::ChopStringOfMaxScreenWidth(int inMaxScreenWidth, string& ioBaseString, string& outChoppedString)
+//{
+//	// Loop backwards through the string, until we get a string that fits in this screen width
+//	int theCurrentLength = ioBaseString.length();
+//	int theMaxLength = ioBaseString.length();
+//	bool theSuccess = false;
+//
+//	while(!theSuccess)
+//	{
+//		string theCurrentString = ioBaseString.substr(0, theCurrentLength);
+//		int theCurrentStringScreenWidth = this->GetHudStringWidth(theCurrentString.c_str());
+//		if(theCurrentStringScreenWidth <= inMaxScreenWidth)
+//		{
+//			// Look for a word to break the line
+//			while((theCurrentLength > 0) && !theSuccess)
+//			{
+//				char theCurrentChar = ioBaseString[theCurrentLength-1];
+//				if((theCurrentChar == ' ') || (theCurrentLength == theMaxLength))
+//				{
+//					outChoppedString = ioBaseString.substr(0, theCurrentLength);
+//					ioBaseString = ioBaseString.substr(theCurrentLength, ioBaseString.length() - theCurrentLength);
+//					theSuccess = true;
+//					break;
+//				}
+//				else
+//				{
+//					theCurrentLength--;
+//				}
+//			}
+//		}
+//		else
+//		{
+//			theCurrentLength--;
+//		}
+//	}
+//
+//	return theSuccess;
+//}
+
+void AvHHud::DrawReticleInfo()
+{
+	this->mReticleMessage.Draw();
+	
+	//	if(this->mReticleInfoText != "")
+	//	{
+	//		const float kMaxWidth = .3f;
+	//		int kMaxScreenWidth = kMaxWidth*ScreenWidth;
+	//
+	//		StringList theStringList;
+	//		string theHelpString = this->mReticleInfoText;
+	//
+	//		do
+	//		{
+	//			string theNewString;
+	//			if(ChopStringOfMaxScreenWidth(kMaxScreenWidth, theHelpString, theNewString))
+	//			{
+	//				theStringList.push_back(theNewString);
+	//			}
+	//			else
+	//			{
+	//				theHelpString = "";
+	//			}
+	//		} 
+	//		while(theHelpString != "");
+	//		
+	//		// For each line, if the line contains any special markers, move them to their own lines
+	//		
+	//		// Compute max width of all the strings, add some extra for a frame
+	//		int theBoxWidth = 0;
+	//		StringList::iterator theStringListIter;
+	//		for(theStringListIter = theStringList.begin(); theStringListIter != theStringList.end(); theStringListIter++)
+	//		{
+	//			int theCurrentScreenWidth = this->GetHudStringWidth(theStringListIter->c_str());
+	//			theBoxWidth = max(theBoxWidth, theCurrentScreenWidth);
+	//		}
+	//		int theLineHSpacing = .01f*ScreenWidth;
+	//		theBoxWidth += 2*theLineHSpacing;
+	//
+	//		// Compute max height needed to contain all the strings, add some extra for a frame
+	//		int theLineVSpacing = .01f*ScreenHeight();
+	//		int theLineHeight = this->GetHudStringHeight();
+	//		int theBoxHeight = 2*theLineVSpacing + (theStringList.size()*theLineHeight);
+	//
+	//		int theFillStartX = this->mReticleInfoScreenX;
+	//		int theFillStartY = this->mReticleInfoScreenY;
+	//
+	//		theFillStartX -= theBoxWidth/2;	
+	//		theFillStartY -= theBoxHeight/2;
+	//
+	//		// Draw nice border and shaded background
+	//		const float kReticleInfoMaxAlpha = 25;
+	//		float theNormalizedAlpha = this->mReticleInfoColorA/255;
+	//		int theAlphaComponent = theNormalizedAlpha*kReticleInfoMaxAlpha;
+	//
+	//		FillRGBA(theFillStartX, theFillStartY, theBoxWidth, theBoxHeight, this->mReticleInfoColorR, this->mReticleInfoColorG, this->mReticleInfoColorB, theAlphaComponent);
+	//		vguiSimpleBox(theFillStartX, theFillStartY, theFillStartX + theBoxWidth, theFillStartY + theBoxHeight, this->mReticleInfoColorR, this->mReticleInfoColorG, this->mReticleInfoColorB, theAlphaComponent);
+	//
+	//		// Now draw each line, non-centered, left-aligned
+	//		int theLineNumber = 0;
+	//		for(theStringListIter = theStringList.begin(); theStringListIter != theStringList.end(); theStringListIter++)
+	//		{
+	//			int theR = this->mReticleInfoColorR;
+	//			int theG = this->mReticleInfoColorG;
+	//			int theB = this->mReticleInfoColorB;
+	//
+	//			// If the line starts with a marker, draw it in a special color
+	//			//string theDamageMarker(kDamageMarker);
+	//			//if(theStringListIter->substr(0, theDamageMarker.length()) == theDamageMarker)
+	//			//{
+	//			//	// Draw string in yellow
+	//			//	theR = theG = 255;
+	//			//	theB = 25;
+	//			//}
+	//
+	//			int theBaseY = theFillStartY + theLineVSpacing + theLineNumber*theLineHeight;
+	//			
+	//			// Draw message (DrawHudStringCentered only centers in x)
+	//			this->DrawHudString(theFillStartX + theLineHSpacing, theBaseY /*- theLineHeight/2*/, ScreenWidth, theStringListIter->c_str(), theR*theNormalizedAlpha, theG*theNormalizedAlpha, theB*theNormalizedAlpha);
+	//
+	//			theLineNumber++;
+	//		}
+	//	}
+}
+
+void AvHHud::DrawToolTips()
+{
+	if(!gEngfuncs.pDemoAPI->IsPlayingback())
+	{
+		this->mHelpMessage.Draw();
+		
+		// Draw each one
+		for(AvHTooltipListType::iterator theIter = this->mTooltips.begin(); theIter != this->mTooltips.end(); theIter++)
+		{
+			int theR, theG, theB;
+			this->GetPrimaryHudColor(theR, theG, theB, true, false);
+			theIter->SetRGB(theR, theG, theB);
+			theIter->Draw();
+		}
+	}
+}
+
+void AvHHud::DrawWorldSprite(int inSpriteHandle, int inRenderMode, vec3_t inWorldPosition, int inFrame, float inWorldSize)
+{
+	vec3_t theUpperLeft;
+	vec3_t theLowerRight;
+
+	vec3_t theForward, theRight, theUp;
+	AngleVectors(v_angles, theForward, theRight, theUp);
+
+	vec3_t theToUpperLeft;
+	VectorAdd(-theRight, theUp, theToUpperLeft);
+	VectorNormalize(theToUpperLeft);
+
+	VectorMA(inWorldPosition, inWorldSize, theToUpperLeft, theUpperLeft);
+
+	vec3_t theToLowerRight;
+	VectorAdd(theRight, -theUp, theToLowerRight);
+	VectorNormalize(theToLowerRight);
+
+	VectorMA(inWorldPosition, inWorldSize, theToLowerRight, theLowerRight);
+
+	vec3_t theScreenUpperLeft;
+	vec3_t theScreenLowerRight;
+
+	// World to screen returns true if the world pos is behind the viewer
+	if(!gEngfuncs.pTriAPI->WorldToScreen((float*)theUpperLeft, (float*)theScreenUpperLeft))
+	{
+		if(!gEngfuncs.pTriAPI->WorldToScreen((float*)theLowerRight, (float*)theScreenLowerRight))
+		{
+			// If the sprite is behind you, push it to the bottom or top of the screen
+//			cl_entity_t* theLocalPlayer = gEngfuncs.GetLocalPlayer();
+//			ASSERT(theLocalPlayer);
+//			
+//			vec3_t theDirectionToOrder;
+//			VectorSubtract(inWorldPosition, theLocalPlayer->origin, theDirectionToOrder);
+			
+			//		float theDotProduct = DotProduct(theDirectionToOrder, theLocalPlayer->angles);
+			//		if(theDotProduct < 0)
+			//		{
+			//			if(theWorldPos.z < theLocalPlayer->origin.z)
+			//			{
+			//				theY = theScreenHeight - theSpriteHeight - theScreenBorder;
+			//			}
+			//			else
+			//			{
+			//				theY = theScreenBorder;
+			//			}
+			
+			//			vec3_t theCrossProduct;
+			//			theCrossProduct = CrossProduct(theLocalPlayer->angles, theDirectionToOrder);
+			//
+			//			// It's to our right
+			//			if(theCrossProduct.z > 0)
+			//			{
+			//				theX = theScreenWidth - theSpriteWidth - theScreenBorder;
+			//			}
+			//			else
+			//			{
+			//				theX = theScreenBorder;
+			//			}
+			//		}
+			
+//			float theDistanceToLocation = (float)VectorDistance(inWorldPosition, theLocalPlayer->origin);
+//			const theMaxDistance = 1500;
+//			float theEffectiveDistance = min(theDistanceToLocation, theMaxDistance);
+//			const int theMinColorComponent = 100;
+//			int theColorComponent = max(theMinColorComponent, 255 - ((theEffectiveDistance/theMaxDistance)*255));
+			
+			//SPR_Set(inSpriteHandle, theColorComponent, theColorComponent, theColorComponent);
+			////SPR_DrawHoles((int)0, theX, theY, NULL);
+			//if(inRenderMode == kRenderNormal)
+			//{
+			//	SPR_Draw(inFrame, theX, theY, NULL);
+			//}
+			//else if(inRenderMode == kRenderTransAdd)
+			//{
+			//	SPR_DrawAdditive(inFrame, theX, theY, NULL);
+			//}
+
+			float theScreenX = XPROJECT(theScreenUpperLeft.x);
+			float theScreenY = YPROJECT(theScreenUpperLeft.y);
+			float theWidth = XPROJECT(theScreenLowerRight.x) - theScreenX;
+			float theHeight = YPROJECT(theScreenLowerRight.y) - theScreenY;
+
+            //DrawScaledHUDSprite(inSpriteHandle, inRenderMode, 1, theScreenX, theScreenY, theWidth, theHeight, inFrame);
+            
+            AvHSpriteSetColor(1, 1, 1);
+            AvHSpriteSetRenderMode(inRenderMode);
+            AvHSpriteDraw(inSpriteHandle, inFrame, theScreenX, theScreenY, theScreenX + theWidth, theScreenY + theHeight, 0, 0, 1, 1);
+            
+
+            
+		}
+	}
+}
+
+void AvHHud::DrawOrderIcon(const AvHOrder& inOrder)
+{
+	if(this->mOrderSprite)
+	{
+		int theNumFrames = SPR_Frames(this->mOrderSprite);
+		int theCurrentFrame = this->GetFrameForOrderType(inOrder.GetOrderType());
+		
+		if((theCurrentFrame >= 0) && (theCurrentFrame < theNumFrames))
+		{
+			vec3_t theWorldPos;
+			inOrder.GetLocation(theWorldPos);
+			if ( inOrder.GetOrderType() == ORDERTYPET_ATTACK  ) {
+				theWorldPos[2]+=kAttackOrderZOffset;
+			}
+
+			// Draw icon above pos, text below
+			theWorldPos.z += BALANCE_FVAR(kOrderIconDrawSize);
+			
+			this->DrawWorldSprite(this->mOrderSprite, kRenderTransAdd, theWorldPos, theCurrentFrame, BALANCE_FVAR(kOrderIconDrawSize));
+			
+			// If the order is our own order, draw the order indicator around it
+			if((this->GetHUDPlayMode() == PLAYMODE_PLAYING) && this->GetIsMarine() && !this->GetInTopDownMode())
+			{
+				this->DrawWorldSprite(this->mMarineOrderIndicator, kRenderTransAdd, theWorldPos, 0, BALANCE_FVAR(kOrderIconDrawSize));
+				//DrawScaledHUDSprite(theSpriteHandle, kRenderNormal, 1, thePosX, thePosY, theWidth, theHeight, theFrame, theStartU, theStartV, theEndU, theEndV);
+				
+			}
+		}
+		else
+		{
+			int a = 0;
+		}
+	}
+}
+
+void AvHHud::DrawOrderText(const AvHOrder& inOrder)
+{
+	int theIndex = (int)(inOrder.GetOrderType());
+
+	// Now draw text describing the waypoint
+	string theTitle;
+	sprintf(theTitle, "Order%d", theIndex);
+	
+	string theLocalizedTitle(" ");
+	LocalizeString(theTitle.c_str(), theLocalizedTitle);
+
+	if((theIndex == ORDERTYPET_BUILD) || (theIndex == ORDERTYPET_GUARD) || (theIndex == ORDERTYPET_GET))
+	{
+		AvHUser3 theUser3 = inOrder.GetTargetUser3Type();
+		string theUser3Name;
+		if(this->GetTranslatedUser3Name(theUser3, theUser3Name))
+		{
+			// "Get %s" -> "Get heavy machine gun"
+			// "Guard %s -> "Guard soldier"
+			// "Build %s" -> "Build sentry turret"
+			string theTitleWithTarget;
+			sprintf(theTitleWithTarget, theLocalizedTitle.c_str(), theUser3Name.c_str());
+			theLocalizedTitle = theTitleWithTarget;
+		}
+	}
+
+	vec3_t theOrderLocation;
+	inOrder.GetLocation(theOrderLocation);
+	
+	// Because the commander may not have information about the players heading to this waypoint (outside of his PVS), we
+	// can't draw a range for the commander
+	string theRangeDisplayString;
+	if(!this->GetInTopDownMode())
+	{
+		float theDistanceToWaypoint = VectorDistance(gPredictedPlayerOrigin, theOrderLocation);
+		int theVisibleDistance = max(1, (int)theDistanceToWaypoint/100);
+		
+		string theVisibleUnits;
+		if(LocalizeString("Range", theVisibleUnits))
+		{
+			sprintf(theRangeDisplayString, theVisibleUnits.c_str(), theVisibleDistance);
+		}
+	}
+	
+	string theLocationOfOrder;
+	theLocationOfOrder = this->GetNameOfLocation(theOrderLocation);
+
+	// It's OK if this fails, as only official maps will have these translated
+	string theTranslatedLocation = theLocationOfOrder;
+	LocalizeString(theLocationOfOrder.c_str(), theTranslatedLocation);
+	
+	Vector theScreenPos;
+	if(AvHCUWorldToScreen((float*)theOrderLocation, (float*)&theScreenPos))
+	{
+		float theNormX = theScreenPos.x/ScreenWidth();
+		float theNormY = theScreenPos.y/ScreenHeight();
+
+		if(!this->GetIsRegionBlockedByUI(theNormX, theNormY))
+		{
+			int theR, theG, theB;
+			this->GetPrimaryHudColor(theR, theG, theB, false, false);
+			
+			string theFirstLine = theLocalizedTitle;
+			if(theRangeDisplayString != "")
+			{
+				theFirstLine += string(" : ") + theRangeDisplayString;
+			}
+			
+			// Draw order (icon above world position, text below it)
+			int theBaseX = theScreenPos.x;
+			int theBaseY = theScreenPos.y;
+			int theStringHeight = this->GetHudStringHeight();
+			this->DrawHudStringCentered(theBaseX, theBaseY + theStringHeight, ScreenWidth(), theFirstLine.c_str(), theR, theG, theB);
+			
+			// Draw location below it
+			this->DrawHudStringCentered(theBaseX, theBaseY + 2*theStringHeight, ScreenWidth(), theTranslatedLocation.c_str(), theR, theG, theB);
+		}
+		else
+		{
+			int a = 0;
+		}
+	}
+}
+
+void AvHHud::DrawOrders()
+{
+	if(1/*!this->mIsRenderingSelectionView*/)
+	{
+		// Draw them blinking for soldiers, but always for commanders
+		float theFractionalLastUpdate = this->mTimeOfLastUpdate - (int)this->mTimeOfLastUpdate;
+		if((theFractionalLastUpdate > .25f) || (this->GetHUDUser3() == AVH_USER3_COMMANDER_PLAYER))
+		{
+			OrderListType theOrders = this->GetOrderList();
+			
+			EntityListType theDrawPlayerList = this->GetDrawPlayerOrders();
+			
+			// Run through the order list type
+			for(OrderListType::iterator theIter = theOrders.begin(); theIter != theOrders.end(); theIter++)
+			{
+				// For each one, if the order is for a player in the theDrawPlayerList, draw it
+				vec3_t theOrderLocation;
+				theIter->GetLocation(theOrderLocation);
+				
+				if(theIter->GetOrderTargetType() == ORDERTARGETTYPE_TARGET)
+				{
+					int theTargetIndex = theIter->GetTargetIndex();
+					cl_entity_s* theEntity = gEngfuncs.GetEntityByIndex(theTargetIndex);
+					if(theEntity)
+					{
+						//voogru: dont follow if they are cloaked, leave the waypoint active so they have a clue where they may be at, the wp should snap back to the baddy
+						//once they are spotted again.
+
+						if(theEntity->curstate.rendermode != kRenderTransTexture && theEntity->curstate.renderamt > 128)
+							VectorCopy(theEntity->origin, theOrderLocation);
+					}
+				}
+			
+				// Draw the order if the order is for any plays that are in our draw player list
+				bool theDrawWaypoint = false;
+				EntityInfo theReceiverPlayer = theIter->GetReceiver();
+				EntityListType::iterator theSearchIter = std::find(theDrawPlayerList.begin(), theDrawPlayerList.end(), theReceiverPlayer);
+				if(theSearchIter != theDrawPlayerList.end() && *theSearchIter == theReceiverPlayer)
+				{
+					//gEngfuncs.pEfxAPI->R_ParticleLine((float*)theEntity->origin, (float*)theOrderLocation, 0, 255, 0, .05f);
+					theDrawWaypoint = true;
+				}
+				if(theDrawWaypoint)
+				{
+					this->DrawOrderIcon(*theIter);
+					this->DrawOrderText(*theIter);
+				}
+			}
+		}
+	}
+}
+
+int AvHHud::GetHelpIconFrameFromUser3(AvHUser3 inUser3)
+{
+	int theFrame = -1;
+
+	switch(inUser3)
+	{
+	case AVH_USER3_WELD:
+		theFrame = 0;
+		break;
+	case AVH_USER3_MARINEITEM:
+		theFrame = 1;
+		break;
+	case AVH_USER3_HIVE:
+		theFrame = 2;
+		break;
+	//case AVH_USER3_USEABLE:
+	//	theFrame = 3;
+	//	break;
+	case AVH_USER3_COMMANDER_STATION:
+		theFrame = 4;
+		break;
+	//case AVH_USER3_BREAKABLE:
+	//	theFrame = 5;
+	//	break;
+	}
+
+	return theFrame;
+}
+
+HSPRITE	AvHHud::GetHelpSprite() const
+{
+	return this->mHelpSprite;
+}
+
+void AvHHud::DrawHelpIcons()
+{
+	// Lookup table
+
+	// Only draw if enabled
+	//if(gEngfuncs.pfnGetCvarFloat(kvAutoHelp))
+	//{
+		// Iterate through help icons, drawing each one if we have an sprite for it
+		for(HelpIconListType::iterator theIter = this->mHelpIcons.begin(); theIter != this->mHelpIcons.end(); theIter++)
+		{
+			int theUser3 = theIter->second;
+			int theFrame = GetHelpIconFrameFromUser3(AvHUser3(theUser3));
+						
+			// Lookup sprite to see if it's loaded
+//			if(this->mHelpSprites[theUser3] == 0)
+//			{
+//				string theIconName = string(kHelpIconPrefix) + MakeStringFromInt(theUser3) + ".spr";
+//				this->mHelpSprites[theUser3] = Safe_SPR_Load(theIconName.c_str());
+//			}
+//			
+//			int theSpriteHandle = this->mHelpSprites[theUser3];
+//			if(theSpriteHandle > 0)
+//			{
+//				// Draw icon at entity center
+//				this->DrawWorldSprite(theSpriteHandle, kRenderTransAdd, theIter->first, 0);
+//			}
+
+			if((theFrame >= 0) && this->mHelpSprite)
+			{
+				this->DrawWorldSprite(this->mHelpSprite, kRenderTransAdd, theIter->first, theFrame, kHelpIconDrawSize);
+			}
+		}
+	//}
+}
+
+// inDrawMode determines if we're drawing text or sprites
+void AvHHud::DrawHUDStructureNotification()
+{
+	const float	kHUDStructureNotificationStartX = .02f;
+	const float	kHUDStructureNotificationStartY = .11f;
+	const float	kHUDStructureNotificationIconWidth = .03f;
+	const float	kHUDStructureNotificationIconHeight = kHUDStructureNotificationIconWidth*1.333f;
+	const float	kHUDStructureNotificationIconHorizontalSpacing = .01f;
+	const float	kHUDStructureNotificationIconVerticalSpacing = kHUDStructureNotificationIconHorizontalSpacing*1.333f;
+	const float	kHUDStructureNotificationMaxTextWidth = .2f;
+
+	// Draw them all in order
+	if(this->GetIsAlive() && CVAR_GET_FLOAT(kvBuildMessages))
+	{
+		// Get starting coords
+		float theCurrentX = kHUDStructureNotificationStartX;
+		float theCurrentY = kHUDStructureNotificationStartY;
+
+		
+		for(StructureHUDNotificationListType::iterator theIter = this->mStructureNotificationList.begin(); theIter != this->mStructureNotificationList.end(); theIter++)
+		{
+			// Draw icon
+			AvHMessageID theIconTech = theIter->mStructureID;
+			int theFrame = 0;
+			this->DrawTechTreeSprite(theIconTech, theCurrentX*ScreenWidth(), theCurrentY*ScreenHeight(), kHUDStructureNotificationIconWidth*ScreenWidth(), kHUDStructureNotificationIconHeight*ScreenHeight(), theFrame);
+
+			string theLocationName = this->GetNameOfLocation(theIter->mLocation);
+			if(theLocationName != "")
+			{
+				int theStartX = (theCurrentX + kHUDStructureNotificationIconWidth + kHUDStructureNotificationIconHorizontalSpacing)*ScreenWidth();
+				this->DrawTranslatedString(theStartX, theCurrentY*ScreenHeight(), theLocationName.c_str(), false, true);
+			}
+            
+			// Increment coords
+			theCurrentY += (kHUDStructureNotificationIconHeight + kHUDStructureNotificationIconVerticalSpacing);
+		}
+		
+	}
+}
+
+void AvHHud::DrawInfoLocationText()
+{
+	string theTimeLeftText;
+
+	// Get drawing color and position
+	int theR, theG, theB;
+	this->GetPrimaryHudColor(theR, theG, theB, false, false);
+			
+	// Get position of health and draw to the right of it (must be left-justified)
+	int theX = 0;
+	int theY = 0;
+	if(this->GetInTopDownMode())
+	{
+		const float kLeftInset = .4f;
+		theX = mViewport[0] + kLeftInset*ScreenWidth();
+		theY = mViewport[1] + mViewport[3] - (1-.78f)*ScreenHeight();
+	}
+	// Draw info location text the same for aliens and marines
+	else if(this->GetHUDUser3() != AVH_USER3_ALIEN_EMBRYO)
+	{
+		const float kLeftInset = .08f;
+		theX = mViewport[0] + kLeftInset*ScreenWidth();
+		theY = mViewport[1] + mViewport[3] - (1-.88f)*ScreenHeight();
+	}
+	int theLeftEdge = theX;
+	
+	// Draw location text, translation if possible
+	string theLocalizedLocationText;
+	if(this->mLocationText != "")
+	{
+		LocalizeString(this->mLocationText.c_str(), theLocalizedLocationText);
+		if(theLocalizedLocationText[0] == '#')
+		{
+			theLocalizedLocationText = theLocalizedLocationText.substr(1, theLocalizedLocationText.size());
+		}
+
+		// Draw handicap text as well
+		int theHandicap = (int)this->GetHUDHandicap();
+		if(theHandicap < 100)
+		{
+			// draw "(handicap 70%)"
+			string theHandicapString;
+			if(LocalizeString(kHandicap, theHandicapString))
+			{
+				char theFormattedHandicapString[256];
+				sprintf(theFormattedHandicapString, " (%d%% %s)", theHandicap, theHandicapString.c_str());
+				theLocalizedLocationText += string(theFormattedHandicapString);
+			}
+		}
+
+		// Draw info location
+		if(theLocalizedLocationText != "")
+		{
+			char theCharArray[512];
+			sprintf(theCharArray, "%s", theLocalizedLocationText.c_str());
+			
+			this->DrawHudString(theX, theY, ScreenWidth(), theCharArray, theR, theG, theB);
+		}
+	}
+
+	// Don't draw time when playing back, it isn't right and not worth breaking backward-compatibility over.
+	// TODO: Draw time next time demo version changes
+	if(!gEngfuncs.pDemoAPI->IsPlayingback() && this->GetHUDUser3() != AVH_USER3_ALIEN_EMBRYO)
+	{
+		// Whether we draw first line or not, increment for second line below
+		theY += this->GetHudStringHeight();
+
+		// Optionally draw time left below it
+		int theTimeLimitSeconds = (int)this->GetGameTimeLimit();
+		int theTimeElapsed = this->GetGameTime();
+		int theMinutesElapsed = theTimeElapsed/60;
+		int theSecondsElapsed = theTimeElapsed%60;
+		int theTimeLeftSeconds = theTimeLimitSeconds - theTimeElapsed;
+		int theMinutesLeft = theTimeLeftSeconds/60;
+		int theSecondsLeft = theTimeLeftSeconds%60;
+		int theMinutesLimit = theTimeLimitSeconds/60;
+		int theSecondsLimit = theTimeLimitSeconds%60;
+
+		// If we're in tournament mode or playing Combat, draw the timelimit
+		bool theTournyMode = (gHUD.GetServerVariableFloat(kvTournamentMode) > 0);
+		bool theDisplayTimeLimit = theTournyMode || gHUD.GetIsCombatMode();
+
+		string theGameTimeText;
+		if(LocalizeString(kGameTime, theGameTimeText))
+		{
+			bool theTimeVisible = true;
+
+			// Flash time when we're almost out of time
+			if((theMinutesLeft < 1) && this->GetGameStarted() && theDisplayTimeLimit)
+			{
+				float theTime = gHUD.GetTimeOfLastUpdate();
+				float theTimeFraction = theTime - floor(theTime);
+				if(theTimeFraction < .5f)
+				{
+					theTimeVisible = false;
+				}
+			}
+
+			// Game time - 12:43
+			char theGameTimeCStr[256];
+			sprintf(theGameTimeCStr, " - %02d:%02d", theMinutesElapsed, theSecondsElapsed);
+			theGameTimeText += string(theGameTimeCStr);
+
+			if(theTimeVisible)
+			{
+				this->DrawHudString(theX, theY, ScreenWidth(), theGameTimeText.c_str(), theR, theG, theB);
+			}
+
+			// Increment X so time limit is drawn properly
+			theX += this->GetHudStringWidth(theGameTimeText.c_str());
+		}
+
+		if(theDisplayTimeLimit)
+		{
+			string theTimeLimitString;
+			if(LocalizeString(kTimeLimit, theTimeLimitString))
+			{
+				// Format: Time limit - 60:00
+				char theTimeLimitCStr[256];
+				sprintf(theTimeLimitCStr, "  %s - %02d:%02d", theTimeLimitString.c_str(), theMinutesLimit, theSecondsLimit);
+				
+				string theTimeLimitText = string(theTimeLimitCStr);
+
+				this->DrawHudString(theX, theY, ScreenWidth(), theTimeLimitText.c_str(), theR, theG, theB);
+			}
+
+			if(gHUD.GetIsCombatMode())
+			{
+				theY += this->GetHudStringHeight();
+				
+				// Draw "attacking" or "defending"
+				AvHTeamNumber theTeamNumber = this->GetHUDTeam();
+				string theDisplayString = "";
+				if(theTeamNumber != TEAM_IND)
+				{
+					if(theTeamNumber == this->GetCombatAttackingTeamNumber())
+					{
+						LocalizeString(kAttacking, theDisplayString);
+					}
+					else
+					{
+						LocalizeString(kDefending, theDisplayString);
+					}
+
+					this->DrawHudString(theLeftEdge, theY, ScreenWidth(), theDisplayString.c_str(), theR, theG, theB);
+				}
+			}
+		}
+	}
+}
+
+void AvHHud::DrawMouseCursor(int inBaseX, int inBaseY)
+{
+	if ( g_iVisibleMouse && !(this->GetInTopDownMode() && gEngfuncs.pDemoAPI->IsPlayingback()) )
+	{
+
+        HSPRITE theCursorSprite;
+        int theCursorFrame;
+
+        GetCursor(theCursorSprite, theCursorFrame);
+
+		if (theCursorSprite > 0)
+		{
+			float theGammaSlope = this->GetGammaSlope();
+			ASSERT(theGammaSlope > 0.0f);
+
+            /*
+			int theColorComponent = 255/theGammaSlope;
+			SPR_Set(this->mCursorSprite, theColorComponent, theColorComponent, theColorComponent);
+			
+			// Draw the logo at 20 fps
+			//SPR_DrawAdditive( 0, this->mMouseCursorX - inBaseX, this->mMouseCursorY - inBaseY, NULL );
+			const int kMouseHotSpotX = -1;
+			const int kMouseHotSpotY = -1;
+			SPR_DrawHoles(this->mCurrentCursorFrame, this->mMouseCursorX - inBaseX - kMouseHotSpotX, this->mMouseCursorY - inBaseY - kMouseHotSpotY, NULL );
+            */
+
+            // Draw the mouse cursor.
+
+			const int kMouseHotSpotX = -1;
+			const int kMouseHotSpotY = -1;
+            
+            AvHSpriteBeginFrame();
+
+            AvHSpriteEnableVGUI(true);
+            AvHSpriteSetVGUIOffset(inBaseX, inBaseY);
+
+            float x = this->mMouseCursorX - kMouseHotSpotX;
+            float y = this->mMouseCursorY - kMouseHotSpotY;
+
+            float w = SPR_Width(theCursorSprite, theCursorFrame);
+            float h = SPR_Height(theCursorSprite, theCursorFrame);
+
+            AvHSpriteSetRenderMode(kRenderTransAlpha);
+			AvHSpriteDraw(theCursorSprite, theCursorFrame, x, y, x + w, y + h, 0, 0, 1, 1);
+            
+            // Draw the marquee if it's visible.
+			
+            if (mSelectionBoxVisible)
+            {
+				
+                int sprite = Safe_SPR_Load(kWhiteSprite);
+                
+                int r, g, b;
+                GetPrimaryHudColor(r, g, b, true, false);
+				
+                AvHSpriteSetRenderMode(kRenderTransAdd);
+                AvHSpriteSetColor(r / 255.0, g / 255.0, b / 255.0, 0.3);
+				
+                AvHSpriteSetDrawMode(kSpriteDrawModeFilled);
+                AvHSpriteDraw(sprite, 0, mSelectionBoxX1 + 1, mSelectionBoxY1 + 1, mSelectionBoxX2 - 1, mSelectionBoxY2 - 1, 0, 0, 1, 1);
+				
+                AvHSpriteSetRenderMode(kRenderNormal);
+                AvHSpriteSetColor(1, 1, 1, 1);
+				
+                AvHSpriteSetDrawMode(kSpriteDrawModeBorder);
+                AvHSpriteDraw(sprite, 0, mSelectionBoxX1, mSelectionBoxY1, mSelectionBoxX2, mSelectionBoxY2, 0, 0, 1, 1);
+				
+            }            
+            
+            AvHSpriteEndFrame();
+
+        }
+	}
+}
+
+
+
+void AvHHud::DrawTopDownBG()
+{
+	// If we're in top down mode, draw a black background
+	float theDrawBackgroundHeight = -1;//cl_drawbg->value;
+	
+	// Draw the bottom plane at the map's min view height, unless overridden by cl_drawbg (this variable is for for testing purposes only)
+	if(theDrawBackgroundHeight == -1)
+	{
+		if(this->mMapExtents.GetDrawMapBG())
+		{
+			theDrawBackgroundHeight = this->mMapExtents.GetMinViewHeight();
+		}
+	}
+	
+	if(theDrawBackgroundHeight != -1)
+	{
+		if(this->mBackgroundSprite)
+		{
+			// Build three points on plane described by max world dimensions at the draw background height
+			Vector theUpperLeftWorldPos(-kMaxMapDimension, kMaxMapDimension, theDrawBackgroundHeight);
+			Vector theUpperRightWorldPos(kMaxMapDimension, kMaxMapDimension, theDrawBackgroundHeight);
+			Vector theLowerLeftWorldPos(-kMaxMapDimension, -kMaxMapDimension, theDrawBackgroundHeight);
+
+			// Calculate plane info
+			float thePlaneD;
+			Vector thePlaneNormal;
+			CalculatePlaneInfo(theUpperLeftWorldPos, theUpperRightWorldPos, theLowerLeftWorldPos, thePlaneD, thePlaneNormal);
+
+			gEngfuncs.pTriAPI->RenderMode( kRenderNormal );
+			gEngfuncs.pTriAPI->CullFace( TRI_NONE );
+			gEngfuncs.pTriAPI->Brightness( 1 );
+			
+			if(gEngfuncs.pTriAPI->SpriteTexture((struct model_s *)gEngfuncs.GetSpritePointer(this->mBackgroundSprite), 0))
+			{
+				gEngfuncs.pTriAPI->Begin( TRI_TRIANGLE_STRIP );
+				
+				gEngfuncs.pTriAPI->Color4f(1.0f, 1.0f, 1.0f, 1.0f);
+
+				Vector thePoint;
+
+				CalculatePointOnPlane(0, ScreenHeight(), GetViewOrigin(), thePlaneNormal, thePlaneD, thePoint);
+				gEngfuncs.pTriAPI->TexCoord2f(0, 1);
+				gEngfuncs.pTriAPI->Vertex3fv((float*)&thePoint);
+
+				CalculatePointOnPlane(0, 0, GetViewOrigin(), thePlaneNormal, thePlaneD, thePoint);
+				gEngfuncs.pTriAPI->TexCoord2f(0, 0);
+				gEngfuncs.pTriAPI->Vertex3fv((float*)&thePoint);
+				
+				CalculatePointOnPlane(ScreenWidth(), ScreenHeight(), GetViewOrigin(), thePlaneNormal, thePlaneD, thePoint);
+				gEngfuncs.pTriAPI->TexCoord2f(1, 1);
+				gEngfuncs.pTriAPI->Vertex3fv((float*)&thePoint);
+
+				CalculatePointOnPlane(ScreenWidth(), 0, GetViewOrigin(), thePlaneNormal, thePlaneD, thePoint);
+				gEngfuncs.pTriAPI->TexCoord2f(1, 0);
+				gEngfuncs.pTriAPI->Vertex3fv((float*)&thePoint);
+				
+				// Add in some buffer because of perspective
+//				pVector ver;
+//				ver.z = theDrawBackgroundHeight;
+//				
+//				// Lower left
+//				gEngfuncs.pTriAPI->TexCoord2f(0,1);
+//				ver.x = -kMaxMapDimension;
+//				ver.y = -kMaxMapDimension;
+//				gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+//				
+//				// Upper left
+//				gEngfuncs.pTriAPI->TexCoord2f(0,0);
+//				ver.x = -kMaxMapDimension;
+//				ver.y = kMaxMapDimension;
+//				gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+//				
+//				// Upper right
+//				gEngfuncs.pTriAPI->TexCoord2f(1,0);
+//				ver.x = kMaxMapDimension;
+//				ver.y = kMaxMapDimension;
+//				gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+//				
+//				// Lower right
+//				gEngfuncs.pTriAPI->TexCoord2f(1,1);
+//				ver.x = kMaxMapDimension;
+//				ver.y = -kMaxMapDimension;
+//				gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+				
+				gEngfuncs.pTriAPI->End();
+			}
+		}
+	}
+}
+
+void AvHHud::PostModelRender(char* inModelName)
+{
+
+	// Get our view model name
+	cl_entity_t* theViewEntity = gEngfuncs.GetViewModel();
+	if(theViewEntity)
+	{
+		// If this is our view model, that means we can now render our own stuff in screen space without z-buffering on top of everything else
+		if(theViewEntity->model)
+		{
+			if(!strcmp(theViewEntity->model->name, inModelName))
+			{
+				this->RenderNoZBuffering();
+			}
+		}
+	}
+    
+}
+
+float AvHHud::GetHUDExperience() const
+{
+	vec3_t theVUser4;
+	theVUser4.z = 0.0f;
+	
+	cl_entity_s* theLocalPlayer = gEngfuncs.GetLocalPlayer();
+	if(theLocalPlayer)
+	{
+		theVUser4 = theLocalPlayer->curstate.vuser4;
+	}
+	
+	if(g_iUser1 == OBS_IN_EYE)
+	{
+		cl_entity_t* theEnt = gEngfuncs.GetEntityByIndex(g_iUser2);
+		if(theEnt)
+		{
+			theVUser4 = theEnt->curstate.vuser4;
+		}
+	}
+
+	float theExperience = theVUser4.z/kNumericNetworkConstant;
+	
+	return theExperience;
+}
+
+int AvHHud::GetHUDExperienceLevel() const
+{
+	float theExperience = this->GetHUDExperience();
+	int theLevel = AvHPlayerUpgrade::GetPlayerLevel(theExperience);
+	return theLevel;
+}
+
+float AvHHud::GetHUDHandicap() const
+{
+	float theHandicap = 100.0f;
+
+    AvHTeamNumber theTeamNumber = this->GetHUDTeam();
+	switch(theTeamNumber)
+	{
+	case TEAM_ONE:
+		theHandicap = this->GetServerVariableFloat(kvTeam1DamagePercent);
+		break;
+		
+	case TEAM_TWO:
+		theHandicap = this->GetServerVariableFloat(kvTeam2DamagePercent);
+		break;
+	}
+	
+	return theHandicap;
+}
+
+AvHUser3 AvHHud::GetHUDUser3() const
+{
+	AvHUser3 theUser3 = AVH_USER3_NONE;
+
+	cl_entity_s* theLocalPlayer = gEngfuncs.GetLocalPlayer();
+	if(theLocalPlayer)
+	{
+		theUser3 = (AvHUser3)(theLocalPlayer->curstate.iuser3);
+	}
+
+	if(g_iUser1 == OBS_IN_EYE)
+	{
+		cl_entity_t* theEnt = gEngfuncs.GetEntityByIndex(g_iUser2);
+		if(theEnt)
+		{
+			theUser3 = (AvHUser3)(theEnt->curstate.iuser3);
+		}
+	}
+
+	return theUser3;
+}
+
+AvHTeamNumber AvHHud::GetHUDTeam() const
+{
+	AvHTeamNumber theTeamNumber = TEAM_IND;
+
+	cl_entity_s* thePlayer = this->GetVisiblePlayer();
+	if(thePlayer)
+	{
+		theTeamNumber = AvHTeamNumber(thePlayer->curstate.team);
+	}
+
+	return theTeamNumber;
+}
+
+int AvHHud::GetHUDUpgrades() const
+{
+	int theUpgrades = 0;
+
+	cl_entity_s* thePlayer = this->GetVisiblePlayer();
+	if(thePlayer)
+	{
+		theUpgrades = thePlayer->curstate.iuser4;
+	}
+
+	return theUpgrades;
+}
+
+int AvHHud::GetHUDMaxArmor() const
+{
+	int theHUDUpgrades = this->GetHUDUpgrades();
+	AvHUser3 theUser3 = this->GetHUDUser3();
+
+	int theMaxArmor = AvHPlayerUpgrade::GetMaxArmorLevel(theHUDUpgrades, theUser3);
+
+	#ifdef AVH_PLAYTEST_BUILD
+	theMaxArmor = 100;
+	#endif
+
+	return theMaxArmor;
+}
+
+int AvHHud::GetHUDMaxHealth()	const
+{
+	int theHUDUpgrades = this->GetHUDUpgrades();
+	AvHUser3 theUser3 = this->GetHUDUser3();
+	int theHUDExperienceLevel = this->GetHUDExperienceLevel();
+
+	int theMaxHealth = AvHPlayerUpgrade::GetMaxHealth(theHUDUpgrades, theUser3, theHUDExperienceLevel);
+
+	#ifdef AVH_PLAYTEST_BUILD
+	theMaxHealth = 100;
+	#endif
+
+	return theMaxHealth;
+}
+
+void AvHHud::GetPrimaryHudColor(int& outR, int& outG, int& outB, bool inIgnoreUpgrades, bool gammaCorrect) const
+{
+	if(this->GetIsMarine())
+	{
+		UnpackRGB(outR, outG, outB, RGB_MARINE_BLUE);
+	}
+	else
+	{
+		// HUD turns green when we're frenzying
+		//if(GetHasUpgrade(this->GetHUDUpgrades(), MASK_PRIMALSCREAM) && !inIgnoreUpgrades)
+		//{
+		//	UnpackRGB(outR, outG, outB, RGB_GREENISH);
+		//}
+		//else
+		//{
+			UnpackRGB(outR, outG, outB, RGB_YELLOWISH);
+		//}
+	}
+
+    if (gammaCorrect)
+    {
+	    // Take into account current gamma?
+	    float theGammaSlope = this->GetGammaSlope();
+	    outR /= theGammaSlope;
+	    outG /= theGammaSlope;
+	    outB /= theGammaSlope;
+    }
+
+}
+
+void AvHHud::HandleFog()
+{
+	float theFogColor[3];
+	theFogColor[0] = this->mFogColor.x;
+	theFogColor[1] = this->mFogColor.y;
+	theFogColor[2] = this->mFogColor.z;
+
+	gEngfuncs.pTriAPI->Fog(theFogColor, this->mFogStart, this->mFogEnd, this->mFogActive);
+}
+
+void AvHHud::PreRenderFrame()
+{
+	bool theRenderForTopDown = this->mInTopDownMode /*&& !this->mIsRenderingSelectionView*/;
+
+	if(!theRenderForTopDown)
+	{
+		this->HandleFog();
+	}
+	else
+	{
+		this->DrawTopDownBG();
+		
+		// Now draw commander HUD scaled
+		//void CreatePickingRay( int mousex, int mousey, Vector& outVecPickingRay )
+//		static int theCommanderHUDSprite = 0;
+//		if(!theCommanderHUDSprite)
+//		{
+//			theCommanderHUDSprite = Safe_SPR_Load("sprites/.spr");
+//		}
+//		
+//		if(theCommanderHUDSprite)
+//		{
+//			gEngfuncs.pTriAPI->RenderMode( kRenderNormal );
+//			gEngfuncs.pTriAPI->CullFace( TRI_NONE );
+//			gEngfuncs.pTriAPI->Brightness( 1 );
+//			
+//			if(gEngfuncs.pTriAPI->SpriteTexture((struct model_s *)gEngfuncs.GetSpritePointer(theCommanderHUDSprite), 0))
+//			{
+//				gEngfuncs.pTriAPI->Begin( TRI_QUADS );
+//				
+//				gEngfuncs.pTriAPI->Color4f(1.0f, 1.0f, 1.0f, .5f);
+//				
+//				pVector ver;
+//				
+//				// Lower left
+//				const float kMaxMapDimension = 4096;
+//				//ver.z = -kMaxMapDimension;
+//				ver.z = theDrawBackgroundHeight;
+//				
+//				gEngfuncs.pTriAPI->TexCoord2f(0,1);
+//				ver.x = -kMaxMapDimension;
+//				ver.y = -kMaxMapDimension;
+//				gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+//				
+//				// Upper left
+//				gEngfuncs.pTriAPI->TexCoord2f(0,0);
+//				ver.x = -kMaxMapDimension;
+//				ver.y = kMaxMapDimension;
+//				gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+//				
+//				// Upper right
+//				gEngfuncs.pTriAPI->TexCoord2f(1,0);
+//				ver.x = kMaxMapDimension;
+//				ver.y = kMaxMapDimension;
+//				gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+//				
+//				// Lower right
+//				gEngfuncs.pTriAPI->TexCoord2f(1,1);
+//				ver.x = kMaxMapDimension;
+//				ver.y = -kMaxMapDimension;
+//				gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+//				
+//				gEngfuncs.pTriAPI->End();
+//			}
+//		}
+	}
+
+	AvHScriptManager::Instance()->DrawNormal();
+}
+
+void AvHHud::PostRenderFrame()
+{
+	// Restore player angles and view position
+//	v_origin = gPlayerOrigin;
+//	v_angles = gPlayerAngles;
+}
+
+void AvHHud::DrawActionButtons()
+{
+	// Look up AvHActionButtons component
+	AvHActionButtons* theActionButtons = NULL;
+	if(this->GetManager().GetVGUIComponentNamed(kActionButtonsComponents, theActionButtons))
+	{
+		int theNumCols = theActionButtons->GetNumCols();
+		int theNumRows = theActionButtons->GetNumRows();
+
+		// Iterate through num cols
+		for(int theCol = 0; theCol < theNumCols; theCol++)
+		{
+			// Iterate through num rows
+			for(int theRow = 0; theRow < theNumRows; theRow++)
+			{
+				// Get current ActionButton
+				ActionButton* theActionButton = theActionButtons->GetActionButtonAtPos(theCol, theRow);
+				ASSERT(theActionButton);
+
+				// Get message ID for button
+				AvHMessageID theMessageID = theActionButton->GetMessageID();
+
+				// Find the group that it belongs to (20, 30, 40, etc.)
+				int theMessageNumber = (int)theMessageID - (theMessageID % 10);
+
+//				// Load sprite if not loaded
+//				bool theSpriteLoaded = (this->mActionButtonSprites[theMessageNumber] > 0);
+//				if(!theSpriteLoaded)
+//				{
+//					// Build sprite name for message ID
+//					char theMessageNumberString[16];
+//					sprintf(theMessageNumberString, "%d", (int)theMessageNumber);
+//					//string theSpriteName = kTechTreeSpriteDirectory + string("/") + kTechTreeSpritePrefix + string(theMessageIDString) + string(".spr");
+//					string theSpriteName = kTechTreeSpriteDirectory + string("/") + kTechTreeSpritePrefix + string(theMessageNumberString) + string("s.spr");
+//					int theSpriteHandle = Safe_SPR_Load(theSpriteName.c_str());
+//
+//					// Sprite handle can be 0, as I don't have sprites for all tech yet
+//					this->mActionButtonSprites[theMessageNumber] = theSpriteHandle;
+//				}
+
+				// Get pos and size for component
+				int thePosX, thePosY;
+				theActionButton->getPos(thePosX, thePosY);
+				
+				int theWidth, theHeight;
+				theActionButton->getSize(theWidth, theHeight);
+				
+				// Set sprite frame depending if button is available, active
+				bool theTechEnabled = theActionButton->GetTechEnabled();
+				bool theMouseOver = theActionButton->GetMouseOver();
+				bool theCostMet = theActionButton->GetCostMet();
+
+				// 0 = default
+				// 1 = highlighted
+				// 2 = dark
+				// 3 = red
+				int theFrame = 2;
+
+				// If it's enabled, or if it's an icon in the "menu navigation" category, allow it to be highlighted
+				if(theTechEnabled || (theMessageNumber == 80))
+				{
+					if(theCostMet)
+					{
+						if(theMouseOver)
+						{
+							theFrame = 1;
+						}
+						else
+						{
+							theFrame = 0;
+						}
+					}
+					else
+					{
+						theFrame = 3;
+					}
+				}
+
+				// Also highlight menu category headings for open menus, and for active nodes just pressed
+				if(gCommanderHandler.GetDisplayMenuMessageID() == theMessageID)
+				{
+					theFrame = 1;
+				}
+				else
+				{
+					AvHMessageID theMessageJustActivated = MESSAGE_NULL;
+					if(gCommanderHandler.GetAndClearTechNodePressed(theMessageJustActivated, false))
+					{
+						if(theMessageJustActivated == theMessageID)
+						{
+							if(theTechEnabled)
+							{
+								theFrame = 1;
+							}
+						}
+					}
+				}
+				
+				this->DrawTechTreeSprite(theMessageID, thePosX, thePosY, theWidth, theHeight, theFrame);
+			}
+		}
+	}
+}
+
+int AvHHud::GetTechTreeSprite(AvHMessageID inMessageID)
+{
+	// Find the group that it belongs to (20, 30, 40, etc.)
+	int theMessageNumber = (int)inMessageID - (inMessageID % 10);
+	
+	// Load sprite if not loaded
+	bool theSpriteLoaded = (this->mActionButtonSprites[theMessageNumber] > 0);
+	if(!theSpriteLoaded && (theMessageNumber != 0))
+	{
+		// Build sprite name for message ID
+		char theMessageNumberString[16];
+		sprintf(theMessageNumberString, "%d", (int)theMessageNumber);
+		//string theSpriteName = kTechTreeSpriteDirectory + string("/") + kTechTreeSpritePrefix + string(theMessageIDString) + string(".spr");
+		string theSpriteName = kTechTreeSpriteDirectory + string("/") + kTechTreeSpritePrefix + string(theMessageNumberString) + string("s.spr");
+		int theSpriteHandle = Safe_SPR_Load(theSpriteName.c_str());
+		
+		// Sprite handle can be 0, as I don't have sprites for all tech yet
+		this->mActionButtonSprites[theMessageNumber] = theSpriteHandle;
+	}
+	
+	// Fetch sprite handle
+	int theSpriteHandle = this->mActionButtonSprites[theMessageNumber];
+
+	return theSpriteHandle;
+}
+
+void AvHHud::DrawTechTreeSprite(AvHMessageID inMessageID, int inPosX, int inPosY, int inWidth, int inHeight, int inFrame)
+{
+	if(inMessageID != MESSAGE_NULL)
+	{
+		// Check for alien sprites
+		bool theIsAlienSprite = false;
+		int theSpriteHandle = 0;
+		int theRenderMode = kRenderTransAlpha; // kRenderNormal
+		
+		switch(inMessageID)
+		{
+		case ALIEN_BUILD_DEFENSE_CHAMBER:
+			theIsAlienSprite = true;
+			inFrame = 0;
+			break;
+		case ALIEN_BUILD_OFFENSE_CHAMBER:
+			theIsAlienSprite = true;
+			inFrame = 1;
+			break;
+		case ALIEN_BUILD_MOVEMENT_CHAMBER:
+			theIsAlienSprite = true;
+			inFrame = 2;
+			break;
+		case ALIEN_BUILD_SENSORY_CHAMBER:
+			theIsAlienSprite = true;
+			inFrame = 3;
+			break;
+		case ALIEN_BUILD_RESOURCES:
+			theIsAlienSprite = true;
+			inFrame = 4;
+			break;
+		case ALIEN_BUILD_HIVE:
+			theIsAlienSprite = true;
+			inFrame = 5;
+			break;
+		}
+
+		float theStartU = 0.0f;
+		float theStartV = 0.0f;
+		float theEndU = 1.0f;
+		float theEndV = 1.0f;
+
+		if(theIsAlienSprite)
+		{
+			theRenderMode = kRenderTransAlpha;
+			theSpriteHandle = this->mAlienUIUpgradeCategories;
+		}
+		else
+		{
+			// Fetch sprite handle
+			theSpriteHandle = this->GetTechTreeSprite(inMessageID);
+
+			int theIndex = inMessageID % 10;
+			int theXIndex = theIndex % 4;
+			int theYIndex = (theIndex / 4);
+			theStartU = theXIndex*.25f;
+			theStartV = theYIndex*.25f;
+			theEndU = (theXIndex+1)*.25f;
+			theEndV = (theYIndex+1)*.25f;
+		}
+
+		if(theSpriteHandle > 0)
+		{
+			// Draw sprite scaled here
+			AvHSpriteSetRenderMode(theRenderMode);
+			AvHSpriteDraw(theSpriteHandle, inFrame, inPosX, inPosY, inPosX + inWidth, inPosY + inHeight, theStartU, theStartV, theEndU, theEndV);
+		}
+	}
+}
+
+void AvHHud::DrawHotgroups()
+{
+	AvHMessageID theHotgroups[kNumHotkeyGroups] = {GROUP_SELECT_1, GROUP_SELECT_2, GROUP_SELECT_3, GROUP_SELECT_4, GROUP_SELECT_5};
+
+	// Run through list of hotgroups, drawing them if they exist
+	for(int i = 0; i < kNumHotkeyGroups; i++)
+	{
+		EntityListType& theHotgroup = this->mGroups[i];
+
+		if(theHotgroup.size() > 0)
+		{
+			// Get message ID to draw
+			AvHUser3 theGroupTypeUser3 = this->mGroupTypes[i];
+
+			// Default is marine face
+			AvHMessageID theHotgroupIcon = MENU_SOLDIER_FACE;
+			AvHSHUUser3ToMessageID(theGroupTypeUser3, theHotgroupIcon);
+
+			// Build component name ("PendingImpulseXPanel", where X is the impulse)
+			AvHMessageID theHotgroupMessageID = theHotgroups[i];
+			char theComponentName[256];
+			sprintf(theComponentName, kPendingImpulseSpecifier, (int)theHotgroupMessageID);
+			
+			AvHTechImpulsePanel* theTechImpulsePanel = NULL;
+			if(this->GetManager().GetVGUIComponentNamed(theComponentName, theTechImpulsePanel))
+			{
+				int thePosX, thePosY;
+				theTechImpulsePanel->getPos(thePosX, thePosY);
+
+				int theWidth, theHeight;
+				theTechImpulsePanel->getSize(theWidth, theHeight);
+
+				// Highlight if mouse is in region or if it's our current selection
+				bool theIsHighlighted = this->GetIsMouseInRegion(thePosX, thePosY, theWidth, theHeight) || (this->mSelected == theHotgroup);
+				int theFrame =  theIsHighlighted ? 1 : 0;
+
+				int theSecondOfLastUpdate = (int)this->mTimeOfLastUpdate;
+				if((this->mGroupAlerts[i] == ALERT_UNDER_ATTACK) && (theSecondOfLastUpdate % 2))
+				{
+					// Play blinking red frame when being attacked
+					theFrame = 3;
+				}
+
+				this->DrawTechTreeSprite(theHotgroupIcon, thePosX, thePosY, theWidth, theHeight, theFrame);
+
+				theTechImpulsePanel->SetVisualNumber(theHotgroup.size());
+			}
+		}
+	}
+}
+
+// Draw pending requests
+void AvHHud::DrawPendingRequests()
+{
+	// Run through list of requests and delete any entries with
+	PendingRequestListType::iterator theIterator;
+	for(theIterator = this->mPendingRequests.begin(); theIterator != this->mPendingRequests.end(); /* nothing */)
+	{
+		if(theIterator->second == 0)
+		{
+            PendingRequestListType::iterator theSavedIter = theIterator;
+            theSavedIter++;
+            this->mPendingRequests.erase(theIterator);
+            theIterator = theSavedIter;
+		}
+		else
+		{
+			theIterator++;
+		}
+	}
+
+	int theNumRequestsToDraw = this->mPendingRequests.size();
+	int theCounter = 0;
+	for(theIterator = this->mPendingRequests.begin(); theIterator != this->mPendingRequests.end(); theIterator++)
+	{
+		// Draw each one above the minimap
+		AvHMessageID theMessageID = theIterator->first;
+		int theNumRequests = theIterator->second;
+
+		// Build component name ("PendingImpulseXPanel", where X is the impulse)
+		char theComponentName[256];
+		sprintf(theComponentName, kPendingImpulseSpecifier, (int)theMessageID);
+
+		AvHTechImpulsePanel* theTechImpulsePanel = NULL;
+		if(this->GetManager().GetVGUIComponentNamed(theComponentName, theTechImpulsePanel))
+		{
+			// Get size of panel and draw tech sprite there
+			int thePosX, thePosY;
+			theTechImpulsePanel->getPos(thePosX, thePosY);
+
+			int theWidth, theHeight;
+			theTechImpulsePanel->getSize(theWidth, theHeight);
+
+			AvHMessageID theMessageToDraw = theMessageID;
+			switch(theMessageID)
+			{
+			case COMMANDER_NEXTIDLE:
+				theMessageToDraw = MENU_SOLDIER_FACE;
+				break;
+			case COMMANDER_NEXTAMMO:
+				theMessageToDraw = BUILD_AMMO;
+				break;
+			case COMMANDER_NEXTHEALTH:
+				theMessageToDraw = BUILD_HEALTH;
+				break;
+			}
+
+			int theFrame = this->GetIsMouseInRegion(thePosX, thePosY, theWidth, theHeight) ? 1 : 0;
+			this->DrawTechTreeSprite(theMessageToDraw, thePosX, thePosY, theWidth, theHeight, theFrame);
+
+			theTechImpulsePanel->SetVisualNumber(theNumRequests);
+			if(theNumRequests > 0)
+			{
+				theTechImpulsePanel->setVisible(true);
+			}
+			else
+			{
+				theTechImpulsePanel->setVisible(false);
+			}
+			
+			//this->DrawHUDNumber(thePosX + kTileWidth, thePosY + kTileHeight, DHN_2DIGITS, theNumRequests);
+		}
+
+		// Draw indicator on sprite showing how many requests there are
+		theCounter++;
+	}
+}
+
+
+void AvHHud::DrawBuildHealthEffectsForEntity(int inEntityIndex)
+{
+	// Get entity
+	int theUser3 = 0;
+	int theUser4 = 0;
+	float theFuser1 = 0.0f;
+	int theEntityTeam = 0;
+	vec3_t theOrigin;
+	vec3_t theMins;
+	vec3_t theMaxs;
+	bool theContinue = false;
+	float theHealthPercentage = 0.0f;
+	double theDistanceToEntity = 0;
+	
+	// Must treat these two cases differently, as rendering with no z-buffering happens in two different ways.  It's an awful hack but hey, I don't have access to the engine so I have to make do.
+//	if(!this->GetInTopDownMode())
+//	{
+//		physent_t* theEntity = gEngfuncs.pEventAPI->EV_GetPhysent(inEntityIndex);
+//		if(theEntity)
+//		{
+//			theUser3 = theEntity->iuser3;
+//			theUser4 = theEntity->iuser4;
+//			theFuser1 = theEntity->fuser1;
+//			theEntityTeam = theEntity->team;
+//			theOrigin = theEntity->origin;
+//			theMins = theEntity->mins;
+//			theMaxs = theEntity->maxs;
+//			theHealthPercentage = theEntity->fuser2/kNormalizationNetworkFactor;
+//			theContinue = true;
+//		}
+//	}
+//	else
+//	{
+		cl_entity_s* theEntity = gEngfuncs.GetEntityByIndex(inEntityIndex);
+		if(theEntity)
+		{
+			theUser3 = theEntity->curstate.iuser3;
+			theUser4 = theEntity->curstate.iuser4;
+			theFuser1 = theEntity->curstate.fuser1;
+			theEntityTeam = theEntity->curstate.team;
+			
+			//theOrigin = theEntity->curstate.origin;
+			theOrigin = AvHSHUGetRealLocation(theEntity->origin, theEntity->curstate.mins, theEntity->curstate.maxs);
+			if(theEntity->player)
+			{
+				// Subtract half-height to be at feet
+				float theHeight = theEntity->curstate.maxs[2] - theEntity->curstate.mins[2];
+				theOrigin[2] -= theHeight/2.0f;
+			}
+			theDistanceToEntity = VectorDistance(gPredictedPlayerOrigin, theOrigin);
+
+			theMins = theEntity->curstate.mins;
+			theMaxs = theEntity->curstate.maxs;
+			theHealthPercentage = theEntity->curstate.fuser2/kNormalizationNetworkFactor;
+			
+			theContinue = true;
+		}
+//	}
+
+	// Get local player
+	cl_entity_s* theLocalPlayer = gEngfuncs.GetLocalPlayer();
+	
+	bool theDrewBuildInProgress = false;
+	float theOversizeScalar = 1.0f;
+	bool theEntityIsPlayer = ((inEntityIndex > 0) && (inEntityIndex <= gEngfuncs.GetMaxClients()));
+    bool theIsOnOurTeam = (theEntityTeam == (int)this->GetHUDTeam());
+	
+	if(AvHSHUGetDrawRingsForUser3((AvHUser3)theUser3, theOversizeScalar))
+	{
+		if(theContinue && theLocalPlayer)
+		{
+			const kDrawEnemyBuildingDistance = 200;
+
+			// Draw effects if we are in top-down mode OR
+			if(	this->GetInTopDownMode() ||
+
+				// It's an unfriendly building that's very close OR
+				(!theEntityIsPlayer && (theDistanceToEntity < kDrawEnemyBuildingDistance)) ||
+
+				// It's a friendly entity and we're a builder
+				(theIsOnOurTeam && (this->GetHUDUser3() == AVH_USER3_ALIEN_PLAYER2))
+
+				)
+			{
+				
+			// If they're not on opposite teams
+			//if((theEntityTeam == theLocalPlayer->curstate.team) || (theEntityTeam == 0))
+			//{
+				// Get entity build/research state
+				bool theIsBuilding = false;
+				bool theIsResearching = false;
+				float theNormalizedPercentage = 0.0f;
+		
+				// Calculate percentage full
+				AvHSHUGetBuildResearchState(theUser3, theUser4, theFuser1, theIsBuilding, theIsResearching, theNormalizedPercentage);
+		
+				bool theDrawHealth = true;
+				int theSpriteToUse = this->GetIsAlien() ? this->mAlienHealthSprite : this->mMarineHealthSprite;
+                bool theDrawAsRecyling = (GetHasUpgrade(theUser4, MASK_RECYCLING) && theIsOnOurTeam);
+
+				if((theIsBuilding && (GetHasUpgrade(theUser4, MASK_BUILDABLE))) || theDrawAsRecyling)
+				{
+					theSpriteToUse = this->GetIsAlien() ? this->mAlienBuildSprite : this->mMarineBuildSprite;
+					theDrawHealth = false;
+
+                    // Draw progress inverted, as we're "undoing" the structure
+                    if(theDrawAsRecyling)
+                    {
+                        theNormalizedPercentage = (1.0f - theNormalizedPercentage);
+                    }
+				}
+				else
+				{
+					theNormalizedPercentage = theHealthPercentage;
+				}
+		
+				if(theDrawHealth || (theEntityTeam == theLocalPlayer->curstate.team))
+				{
+					// Draw it
+					int theNumFrames = SPR_Frames(theSpriteToUse);
+					ASSERT(theNumFrames > 0);
+					
+					int theCurrentFrame;
+					if ((theHealthPercentage < 1.0f) || theDrawAsRecyling)
+					{
+						theCurrentFrame = theNormalizedPercentage * (theNumFrames - 1);
+						// tankefugl: 0000893
+						// quick hack to eliminate 1 red bar shown for dead players
+						if (theEntity->player)
+                            theCurrentFrame = min(max(0, theCurrentFrame), theNumFrames - 1);
+						else
+							theCurrentFrame = min(max(1, theCurrentFrame), theNumFrames - 1);
+						// :tankefugl
+					}
+					else 
+					{
+						theCurrentFrame = theNumFrames - 1;
+					}
+					
+					// Get real position of entity
+					vec3_t thePosition;
+					thePosition = AvHSHUGetRealLocation(theOrigin, theMins, theMaxs);
+					
+					float theMaxX = theMaxs[0] - theMins[0];
+					float theMaxY = theMaxs[1] - theMins[1];
+					
+					float theRadius = max(theMaxX, theMaxY)*theOversizeScalar;
+
+					// Bring position off ground just a little to prevent z-fighting
+					thePosition.z += kZFightingOffset;
+					
+					//GetHasUpgrade(this->GetHUDUpgrades(), MASK_PARASITED)
+
+					DrawSpriteOnGroundAtPoint(thePosition, theRadius, theSpriteToUse, kRenderTransAdd, theCurrentFrame);
+					
+					theDrewBuildInProgress = true;
+				}
+			}
+		}
+	}
+	
+	if(!theDrewBuildInProgress)
+	{
+		int a = 0;
+	}
+}
+
+void AvHHud::DrawHUDNumber(int inX, int inY, int inFlags, int inNumber)
+{
+	// Draw number on HUD, in our HUD color
+	int theR, theG, theB;
+	this->GetPrimaryHudColor(theR, theG, theB, false, false);
+
+	int theGammaSlope = this->GetGammaSlope();
+	theR /= theGammaSlope;
+	theG /= theGammaSlope;
+	theB /= theGammaSlope;
+
+	this->DrawHudNumber(inX, inY, inFlags, inNumber, theR, theG, theB);
+}
+
+void AvHHud::DrawSelectionAndBuildEffects()
+{
+//	for(SelectionListType::iterator theIter = this->mSelectionEffects.begin(); theIter != this->mSelectionEffects.end(); theIter++)
+//	{
+//		// Draw selection effect around the entity
+//		int theEntIndex = theIter->mEntIndex;
+//		cl_entity_s* theEntity = gEngfuncs.GetEntityByIndex(theEntIndex);
+//		//physent_t* theEntity = GetEntity(theEntIndex);
+//		if(theEntity)
+//		{
+//			float theRadius = 17;
+//			
+//			// Draw spinning thingie around entity origin
+//			//float theAngle = (theIter->mAngleOffset/(M_PI))*180;
+//			int theAngle = theIter->mAngleOffset;
+//			vec3_t thePosition;
+//			
+//			//VectorCopy(theEntity->origin, thePosition);
+//			thePosition = AvHSHUGetRealLocation(theEntity->origin, theEntity->curstate.mins, theEntity->curstate.maxs);
+//			
+//			if(theEntity->player)
+//			{
+//				// Subtract half-height to be at feet
+//				float theHeight = theEntity->curstate.maxs[2] - theEntity->curstate.mins[2];
+//				thePosition[2] -= theHeight/2.0f;
+//			}
+//			//DrawCircleOnGroundAtPoint(thePosition, 9, theAngle, theRadius, 0, 1, 0, .5f, false, 0.0f);
+//			//DrawSelectionCircleOnGroundAtPoint(thePosition, theRadius);
+//
+//			for(int i = 0; i < 2; i++)
+//			{
+//				// First frame is circle inside, second is outline
+//				// Same opacity as the marquee component in ui.txt.
+//				float theAlpha = (i == 0 ? .2f : .6f);
+//				DrawSpriteOnGroundAtPoint(thePosition, theRadius, this->mSelectionCircleSprite, kRenderNormal, i, theAlpha);
+//			}
+//			
+//			theIter->mAngleOffset = theAngle + 1;
+//			
+//			//gEngfuncs.pEfxAPI->R_SparkShower(theEntity->origin);
+//		}
+//	}
+	
+	//	gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction(false, true);
+	//	
+	//	// Store off the old count
+	//	gEngfuncs.pEventAPI->EV_PushPMStates();
+	//
+	//	// Now add in all of the players.
+	//	gEngfuncs.pEventAPI->EV_SetSolidPlayers(-1);
+	//	gEngfuncs.pEventAPI->EV_SetTraceHull(2);
+	
+	// Draw build effects
+	for(SelectionListType::iterator theSelectIter = this->mSelectionEffects.begin(); theSelectIter != this->mSelectionEffects.end(); theSelectIter++)
+	{
+		// Draw selection effect around the entity
+		int theEntIndex = theSelectIter->mEntIndex;
+		this->DrawBuildHealthEffectsForEntity(theEntIndex);
+	}
+	
+	bool theDrawBuildingEffect = false;
+	for(EntityListType::iterator theBuildingIter = this->mBuildingEffectsEntityList.begin(); theBuildingIter != this->mBuildingEffectsEntityList.end(); theBuildingIter++)
+	{
+		int theEntIndex = *theBuildingIter;
+		this->DrawBuildHealthEffectsForEntity(theEntIndex);
+	}
+/*	
+	// Draw range for current ghost building, if applicable
+	EntityListType theEntities;
+	IntList theDistanceRequirements;
+	float theZAdjustment = 0.0f;
+	bool theSnapToLocation = false;
+	bool theDrewGhostRegions = false;
+	
+	AvHSHUGetBuildRegions(this->mGhostBuilding, theEntities, theDistanceRequirements, theZAdjustment, theSnapToLocation);
+
+	// For each entity to draw
+	int theDistanceCounter = 0;
+	for(EntityListType::iterator theRangeIter = theEntities.begin(); theRangeIter != theEntities.end(); theRangeIter++, theDistanceCounter++)
+	{
+		//cl_entity_s* theEntity = gEngfuncs.GetEntityByIndex(*theRangeIter);
+		physent_t* theEntity = gEngfuncs.pEventAPI->EV_GetPhysent(*theRangeIter);
+		if(theEntity)
+		{
+			vec3_t thePosition;
+			thePosition = AvHSHUGetRealLocation(theEntity->origin, theEntity->mins, theEntity->maxs);
+
+			//int theSprite = (theEntity->iuser3 == AVH_USER3_SIEGETURRET) ? this->mSiegeTurretSprite : this->mBuildCircleSprite;
+			int theSprite = this->mBuildCircleSprite;
+
+			int theDistanceRequirement = theDistanceRequirements[theDistanceCounter];
+			DrawSpriteOnGroundAtPoint(thePosition, theDistanceRequirement, theSprite, kRenderTransAdd, 0, .15f);
+
+			theDrewGhostRegions = true;
+		}
+	}
+
+    // Draw selection as well
+	for(EntityListType::iterator theSelectedIter = this->mSelected.begin(); theSelectedIter != this->mSelected.end(); theSelectedIter++)
+	{
+		cl_entity_s* theEntity = gEngfuncs.GetEntityByIndex(*theSelectedIter);
+		//physent_t* theEntity = gEngfuncs.pEventAPI->EV_GetPhysent(*theSelectedIter);
+		if(theEntity)
+		{
+			vec3_t thePosition;
+			thePosition = AvHSHUGetRealLocation(theEntity->curstate.origin, theEntity->curstate.mins, theEntity->curstate.maxs);
+			
+			AvHUser3 theUser3 = (AvHUser3)(theEntity->curstate.iuser3);
+			int theRange = AvHSHUGetDrawRangeForUser3(theUser3);
+			if(theRange > 0)
+			{
+				// Don't draw structures that are recycling and therefore inactive
+				if(!GetHasUpgrade(theEntity->curstate.iuser4, MASK_RECYCLING))
+				{
+					//int theSprite = (theEntity->curstate.iuser3 == AVH_USER3_SIEGETURRET) ? this->mSiegeTurretSprite : this->mBuildCircleSprite;
+					int theSprite = this->mBuildCircleSprite;
+					DrawSpriteOnGroundAtPoint(thePosition, theRange, theSprite, kRenderTransAdd, 0, .15f);
+				}
+				else
+				{
+					int a = 0;
+				}
+			}
+		}
+	}
+*/
+
+//	// Draw an additive circle above every structure
+//	if(this->GetInTopDownMode() /*&& !theDrewGhostRegions*/)
+//	{
+//		EntityListType theEntities;
+//		AvHSHUGetEntities(-1, theEntities);
+//		
+//		for(EntityListType::iterator theEntityIter = theEntities.begin(); theEntityIter != theEntities.end(); theEntityIter++)
+//		{
+//			// If entity is on our team and on-screen, draw a circle above it
+//			physent_t* theEntity = gEngfuncs.pEventAPI->EV_GetPhysent(*theEntityIter);
+//			if(theEntity && (theEntity->team == (int)(this->mTeam)) && !theEntity->player)
+//			{
+//				// Approach #1
+//				this->DrawBuildHealthEffectsForEntity(*theEntityIter);
+//
+//				// Approach #2
+//				AvHMessageID theMessageID = AvHCUUser3ToTechSprite((AvHUser3)theEntity->iuser3);
+//				if(theMessageID != MENU_ORDERS)
+//				{
+//					vec3_t thePosition;
+//					thePosition = AvHSHUGetRealLocation(theEntity->origin, theEntity->mins, theEntity->maxs);
+//
+//					vec3_t theMinSize, theMaxSize;
+//					AvHSHUGetSizeForTech(theMessageID, theMinSize, theMaxSize);
+//					thePosition.z += (theMaxSize.z - theMinSize.z);
+//					
+//					//int theSprite = (theEntity->iuser3 == AVH_USER3_SIEGETURRET) ? this->mSiegeTurretSprite : this->mBuildCircleSprite;
+//					int theSprite = this->mBuildCircleSprite;
+//
+//					float theRingScalar = 1.0f;
+//					if(AvHSHUGetDrawRingsForUser3((AvHUser3)(theEntity->iuser3), theRingScalar))
+//					{
+//						float theMaxX = theMaxSize[0] - theMinSize[0];
+//						float theMaxY = theMaxSize[1] - theMinSize[1];
+//						float theRadius = max(theMaxX, theMaxY)*theRingScalar;
+//						DrawSpriteOnGroundAtPoint(thePosition, (int)theRadius, theSprite, kRenderTransAdd, 0, .10f);
+//					}
+//				}
+//			}
+//		}
+//	}
+
+	// Draw circle for ghost building as well
+	//int theDistance = AvHSHUGetDrawRangeForMessageID(this->mGhostBuilding);
+	//if(theDistance > 0)
+	//{
+	//	DrawSpriteOnGroundAtPoint(this->mGhostWorldLocation, theDistance, this->mBuildCircleSprite, kRenderTransAdd, 0, .07f);
+	//}
+	
+	//	gEngfuncs.pEventAPI->EV_PopPMStates();
+}
+
+
+void AvHHud::Render()
+{
+
+    if (!IEngineStudio.IsHardware())
+    {
+
+        // Don't show anything in software mode.
+        
+        const char* theMessage = "Software mode is not supported by Natural Selection";
+
+        int theWidth;
+        int theHeight;
+
+	    float gammaScale = 1.0f / GetGammaSlope();
+
+        gEngfuncs.pfnDrawSetTextColor(0, gammaScale, 0);    
+        gEngfuncs.pfnDrawConsoleStringLen(theMessage, &theWidth, &theHeight);
+        gEngfuncs.pfnDrawConsoleString((ScreenWidth() - theWidth) / 2, (ScreenHeight() - theHeight) / 2, (char*)theMessage);
+        
+        return;
+
+    }
+
+    if (m_Spectator.IsInOverviewMode())
+    {
+        AvHSpriteSetViewport(mSpecialViewport[0], mSpecialViewport[1],
+            mSpecialViewport[0] + mSpecialViewport[2], mSpecialViewport[1] + mSpecialViewport[3]);
+    }
+
+    AvHSpriteBeginFrame();
+
+    if (mSteamUIActive)
+    {
+        // Use the old 2D method if we're in the Steam UI.
+        AvHSpriteEnableVGUI(false);
+    }
+    else
+    {
+        AvHSpriteEnableVGUI(true);
+        AvHSpriteSetVGUIOffset(0, 0);
+    }
+
+#ifdef DEBUG
+    if ( CVAR_GET_FLOAT( "hud_hideview" ) != 0 )
+    {
+
+        // Black out the screen
+        
+        int sprite = Safe_SPR_Load(kWhiteSprite);
+        AvHSpriteSetColor(0, 0, 0, 1);
+        AvHSpriteDraw(sprite, 0, 0, 0, ScreenWidth(), ScreenHeight(), 0, 0, 1, 1);
+        AvHSpriteSetColor(1, 1, 1, 1);
+
+    }
+#endif
+
+	// Don't draw the HUD while being digested.
+
+    if (GetIsBeingDigested())
+	{
+    
+		if (this->mDigestingSprite)
+        {
+            AvHSpriteSetColor(1,1,1);
+            AvHSpriteSetRenderMode(kRenderNormal);
+            DrawWarpedOverlaySprite(mDigestingSprite, 4, 3, .02, .02, .3, .15);
+        }        
+
+	}
+    else
+    {
+   
+        if (this->GetHUDPlayMode() == PLAYMODE_PLAYING ||
+            this->GetHUDPlayMode() == PLAYMODE_READYROOM)
+        {
+
+            if (!mSteamUIActive)
+            {
+		        this->DrawReticleInfo();
+	    	    this->DrawPlayerNames();
+		        this->DrawToolTips();
+            }
+
+        }
+
+        if (this->GetHUDPlayMode() == PLAYMODE_PLAYING)
+        {
+
+            RenderCommonUI();
+
+            if (GetIsMarine())
+            {
+                if (GetInTopDownMode())
+                {
+                    RenderCommanderUI();
+                }
+                else
+                {
+                    RenderMarineUI();
+                }
+            }
+            else if (GetIsAlien())
+            {
+                RenderAlienUI();
+            }
+        }
+
+    }
+
+    AvHSpriteEndFrame();
+    AvHSpriteClearViewport();
+
+}
+
+void AvHHud::RenderCommonUI()
+{
+
+
+    /*
+    // Draw the crosshair.
+
+    if (mCrosshairShowCount > 0 && mCrosshairSprite)
+    {
+
+        float x1 = mCrosshairRect.left;
+        float y1 = mCrosshairRect.top;
+        float x2 = mCrosshairRect.right;
+        float y2 = mCrosshairRect.bottom;
+
+	    //kRenderNormal,			// src
+	    //kRenderTransColor,		// c*a+dest*(1-a)
+	    //kRenderTransTexture,	// src*a+dest*(1-a)
+	    //kRenderGlow,			// src*a+dest -- No Z buffer checks
+	    //kRenderTransAlpha,		// src*srca+dest*(1-srca)
+	    //kRenderTransAdd,		// src*a+dest
+
+        AvHSpriteSetRenderMode(kRenderTransAlpha);
+        AvHSpriteDraw(mCrosshairSprite, 0, x1, y1, x2, y2, 0, 0, 1, 1);
+
+    }
+    */
+
+    if (!mSteamUIActive)
+    {
+        
+        if (gHUD.GetServerVariableFloat("sv_cheats") != 0 && CVAR_GET_FLOAT("cl_showspeed") != 0)
+        {
+
+            // Draw the speedometer.
+
+            int theR, theG, theB;
+            this->GetPrimaryHudColor(theR, theG, theB, true, false);
+
+            extern playermove_s* pmove;
+        
+            char buffer[1024];
+
+            sprintf(buffer, "Speed = %d", (int)Length(pmove->velocity));
+            mFont.DrawString(10, 10, buffer, theR, theG, theB);
+
+            float theGroundSpeed = sqrtf(pmove->velocity[0] * pmove->velocity[0] + pmove->velocity[1] * pmove->velocity[1]);
+
+            sprintf(buffer, "Ground speed = %d", (int)theGroundSpeed);
+            mFont.DrawString(10, 12 + mFont.GetStringHeight(), buffer, theR, theG, theB);
+            
+
+        }
+
+        DrawInfoLocationText();
+        DrawHUDStructureNotification();
+
+        this->DrawOrders();
+        this->DrawHelpIcons();
+
+        if (this->GetIsCombatMode())
+        {
+	        // If we're in combat mode, draw our rank
+	        const float kTitleYInset = (kPlayerStatusVerticalInset+5*kPlayerStatusStatusSpacing);
+
+	        string theTitleText = this->GetRankTitle(true);
+
+	        char theCharArray[512];
+	        sprintf(theCharArray, theTitleText.c_str());
+
+	        // Draw it
+
+	        int theX = mViewport[0] + kPlayerStatusHorizontalCenteredInset*(mViewport[2] - mViewport[0]);
+	        int theY = mViewport[1] + mViewport[3] - (1-kTitleYInset)*ScreenHeight();
+
+	        int theR, theG, theB;
+	        this->GetPrimaryHudColor(theR, theG, theB, true, false);
+
+	        this->DrawHudStringCentered(theX, theY, ScreenWidth(), theCharArray, theR, theG, theB);
+        }
+
+	    // If we're parasited, draw a message as such
+	    if (this->GetIsAlive())
+	    {
+		    string theText;
+		    char theCharArray[512];
+		    
+		    int theR, theG, theB;
+		    //UnpackRGB(theR, theG, theB, RGB_YELLOWISH);
+		    this->GetPrimaryHudColor(theR, theG, theB, true, false);
+
+		    int theSecondOfLastUpdate = (int)this->mTimeOfLastUpdate;
+		    
+		    // Draw blinking primal scream message
+		    if(GetHasUpgrade(this->GetHUDUpgrades(), MASK_BUFFED) && (theSecondOfLastUpdate % 2))
+		    {
+                if(this->GetIsAlien())
+                {
+                    LocalizeString(kPrimalScreamed, theText);
+                }
+                else if(this->GetIsMarine())
+                {
+                    LocalizeString(kCatalysted, theText);
+                }
+
+                // Draw it
+                sprintf(theCharArray, "%s", theText.c_str());
+                this->DrawHudStringCentered(kPlayerStatusHorizontalCenteredInset*ScreenWidth(), kPlayerStatusVerticalInset*ScreenHeight(), ScreenWidth(), theCharArray, theR, theG, theB);
+		    }
+
+		    // Draw parasited indicator
+		    if(GetHasUpgrade(this->GetHUDUpgrades(), MASK_PARASITED))
+		    {
+			    LocalizeString(kParasited, theText);
+			    sprintf(theCharArray, "%s", theText.c_str());
+			    
+			    // Draw it
+			    this->DrawHudStringCentered(kPlayerStatusHorizontalCenteredInset*ScreenWidth(), (kPlayerStatusVerticalInset+kPlayerStatusStatusSpacing)*ScreenHeight(), ScreenWidth(), theCharArray, theR, theG, theB);
+		    }
+
+		    // Draw umbraed indicator
+		    if(GetHasUpgrade(this->GetHUDUpgrades(), MASK_UMBRA))
+		    {
+			    LocalizeString(kUmbraed, theText);
+			    sprintf(theCharArray, "%s", theText.c_str());
+			    
+			    // Draw it
+			    this->DrawHudStringCentered(kPlayerStatusHorizontalCenteredInset*ScreenWidth(), (kPlayerStatusVerticalInset+2*kPlayerStatusStatusSpacing)*ScreenHeight(), ScreenWidth(), theCharArray, theR, theG, theB);
+		    }
+
+		    // Draw blinking "webbed" message
+		    if(GetHasUpgrade(this->GetHUDUpgrades(), MASK_ENSNARED) && (theSecondOfLastUpdate % 2))
+		    {
+			    LocalizeString(kWebbed, theText);
+			    sprintf(theCharArray, "%s", theText.c_str());
+			    
+			    // Draw it
+			    this->DrawHudStringCentered(kPlayerStatusHorizontalCenteredInset*ScreenWidth(), (kPlayerStatusVerticalInset+3*kPlayerStatusStatusSpacing)*ScreenHeight(), ScreenWidth(), theCharArray, theR, theG, theB);
+		    }
+
+		    // Draw "stunned" message (it's so fast, try not blinking it)
+		    if(GetHasUpgrade(this->GetHUDUpgrades(), MASK_PLAYER_STUNNED) /*&& (theSecondOfLastUpdate % 2)*/)
+		    {
+			    LocalizeString(kStunned, theText);
+			    sprintf(theCharArray, "%s", theText.c_str());
+			    
+			    // Draw it
+			    this->DrawHudStringCentered(kPlayerStatusHorizontalCenteredInset*ScreenWidth(), (kPlayerStatusVerticalInset+4*kPlayerStatusStatusSpacing)*ScreenHeight(), ScreenWidth(), theCharArray, theR, theG, theB);
+		    }
+
+		    // Draw "being digested" or "digesting" message
+		    if(this->GetIsBeingDigested() && (theSecondOfLastUpdate % 2))
+		    {
+			    LocalizeString(kDigested, theText);
+			    sprintf(theCharArray, "%s", theText.c_str());
+			    
+			    // Draw it
+			    this->DrawHudStringCentered(kPlayerStatusHorizontalCenteredInset*ScreenWidth(), (kPlayerStatusVerticalInset+5*kPlayerStatusStatusSpacing)*ScreenHeight(), ScreenWidth(), theCharArray, theR, theG, theB);
+		    }
+		    else if(this->GetIsDigesting() && (theSecondOfLastUpdate % 2))
+		    {
+			    // Look up player in progress entity
+			    if((this->mProgressBarEntityIndex >= 1) && (this->mProgressBarEntityIndex <= gEngfuncs.GetMaxClients()))
+			    {
+				    hud_player_info_t thePlayerInfo;
+				    gEngfuncs.pfnGetPlayerInfo(this->mProgressBarEntityIndex, &thePlayerInfo);
+
+				    char* thePlayerName = thePlayerInfo.name;
+				    if(thePlayerName)
+				    {
+					    LocalizeString(kDigestingPlayer, theText);
+					    sprintf(theCharArray, theText.c_str(), thePlayerName);
+				    }
+			    }
+			    
+			    // Draw it
+			    this->DrawHudStringCentered(kPlayerStatusHorizontalCenteredInset*ScreenWidth(), (kPlayerStatusVerticalInset+5*kPlayerStatusStatusSpacing)*ScreenHeight(), ScreenWidth(), theCharArray, theR, theG, theB);
+		    }
+		    
+		    // If we are in a squad, draw it on our HUD
+		    if(this->mCurrentSquad > 0)
+		    {
+			    string theSquadIndicator;
+			    if(LocalizeString(kSquadIndicator, theSquadIndicator))
+			    {
+				    sprintf(theCharArray, theSquadIndicator.c_str(), this->mCurrentSquad);
+				    
+				    // Draw it
+				    this->DrawHudStringCentered(kPlayerStatusHorizontalCenteredInset*ScreenWidth(), (kPlayerStatusVerticalInset+6*kPlayerStatusStatusSpacing)*ScreenHeight(), ScreenWidth(), theCharArray, theR, theG, theB);
+			    }
+		    }
+	    }
+
+	    // Draw the numerical effects.
+
+	    if(this->GetIsAlive())
+	    {
+		    for(NumericalInfoEffectListType::iterator theIter = this->mNumericalInfoEffects.begin(); theIter != this->mNumericalInfoEffects.end(); theIter++)
+		    {
+			    // Draw it
+			    Vector theScreenPos;
+			    float theWorldPosition[3];
+			    theIter->GetPosition(theWorldPosition);
+			    if(AvHCUWorldToScreen(theWorldPosition, (float*)&theScreenPos))
+			    {
+				    float theNormX = theScreenPos.x/ScreenWidth();
+				    float theNormY = theScreenPos.y/ScreenHeight();
+				    if(!this->GetInTopDownMode() || !this->GetIsRegionBlockedByUI(theNormX, theNormY))
+				    {
+					    float theNumber = theIter->GetNumber();
+					    string thePrependString("+");
+					    
+					    int theR, theG, theB;
+					    this->GetPrimaryHudColor(theR, theG, theB, true, false);
+					    if(theNumber < 0)
+					    {
+						    // Red, minus for negatives
+						    theR = 255;
+						    theG = 0;
+						    theB = 0;
+					    
+						    // The "-" is prepended by MakeStringFromInt when negative
+						    thePrependString = string("");
+					    }
+					    
+					    const char* thePostPendStringToTranslate = NULL;
+					    string thePostPendString;
+					    
+					    switch(theIter->GetEventType())
+					    {
+					    case kNumericalInfoResourcesEvent:
+						    thePostPendStringToTranslate = kNumericalEventResources;
+						    break;
+					    case kNumericalInfoHealthEvent:
+						    thePostPendStringToTranslate = kNumericalEventHealth;
+						    break;
+					    case kNumericalInfoResourcesDonatedEvent:
+						    thePostPendStringToTranslate = kNumericalEventResourcesDonated;
+						    break;
+					    case kNumericalInfoAmmoEvent:
+						    thePostPendStringToTranslate = kNumericalEventAmmo;
+						    break;
+					    }
+					    
+					    if(thePostPendStringToTranslate)
+					    {
+						    LocalizeString(thePostPendStringToTranslate, thePostPendString);
+					    }
+					    
+					    // Don't draw 0, so we can have other messages
+					    string theNumberString;
+					    if(theNumber != 0)
+					    {
+						    theNumberString = thePrependString + MakeStringFromFloat(theNumber) + " ";
+					    }
+					    
+					    string theDisplayString = theNumberString + thePostPendString;
+					    
+					    char theCharBuffer[512];
+					    sprintf(theCharBuffer, "%s", theDisplayString.c_str());
+					    
+					    this->DrawHudStringCentered(theScreenPos.x, theScreenPos.y, ScreenWidth(), theCharBuffer, theR, theG, theB);
+				    }
+			    }
+		    }
+	    }
+    
+    }
+
+	// Draw the combat HUD.
+	
+    if (this->GetIsCombatMode())
+	{
+		// Now draw our current experience level, so people know how close they are to the next level
+		// Load alien resource and energy sprites
+		string theSpriteName = UINameToSprite(kCombatExperienceSprite, ScreenWidth());
+		int theExperienceSprite = Safe_SPR_Load(theSpriteName.c_str());
+		
+		if(theExperienceSprite)
+		{
+			const float kNormalizedWidth = .1f;
+			const float kNormalizedYInset = .96f;
+			const float kNormalizedHeight = .025f;
+			const int kBaseIndex = this->GetIsMarine() ? 2 : 0;
+			
+			// Draw full background
+			const int kXStart = mViewport[0] + (.5f - kNormalizedWidth/2.0f)*(mViewport[2] - mViewport[0]);
+			const int kYStart = mViewport[1] + mViewport[3] - (1 - kNormalizedYInset)*ScreenHeight();
+			
+
+            AvHSpriteSetColor(1,1,1);
+            AvHSpriteSetRenderMode(kRenderTransAlpha);
+
+			AvHSpriteDraw(theExperienceSprite, kBaseIndex + 1, kXStart, kYStart, kXStart + kNormalizedWidth*ScreenWidth(), kYStart + kNormalizedHeight*ScreenHeight(), 0, 0, 1, 1);
+			
+			// Draw overlay showing amount of experience
+			float thePercentToNextLevel = AvHPlayerUpgrade::GetPercentToNextLevel(this->GetHUDExperience());
+			if((thePercentToNextLevel >= 0.0f) && (thePercentToNextLevel <= 1.0f))
+            {
+    			AvHSpriteDraw(theExperienceSprite, kBaseIndex, kXStart, kYStart, kXStart + thePercentToNextLevel*kNormalizedWidth*ScreenWidth(), kYStart + kNormalizedHeight*ScreenHeight(), 0, 0, thePercentToNextLevel, 1.0f);
+            }
+		}
+		
+		if(this->GetIsAlive(false))
+		{
+			int theR, theG, theB;
+			this->GetPrimaryHudColor(theR, theG, theB, false, false);
+			this->mCombatUpgradeMenu.SetR(theR);
+			this->mCombatUpgradeMenu.SetG(theG);
+			this->mCombatUpgradeMenu.SetB(theB);
+
+			this->mCombatUpgradeMenu.Draw();
+		}
+	}
+
+	// Draw top down help
+	if(this->GetInTopDownMode())
+	{
+		this->mTopDownActionButtonHelp.Draw();
+	}
+
+}
+
+void AvHHud::RenderMiniMap(int inX, int inY, int inWidth, int inHeight)
+{
+    
+    AvHOverviewMap& theOverviewMap = gHUD.GetOverviewMap();
+
+    AvHOverviewMap::DrawInfo theDrawInfo;
+    
+    theDrawInfo.mX          = inX;
+    theDrawInfo.mY          = inY;
+    theDrawInfo.mWidth      = inWidth;
+    theDrawInfo.mHeight     = inHeight;
+    theDrawInfo.mFullScreen = false;
+
+    float worldViewWidth = 800.0f;
+    
+    float aspectRatio = (float)(theDrawInfo.mHeight) / theDrawInfo.mWidth;
+
+    float thePlayerX;
+    float thePlayerY;
+
+    theOverviewMap.GetWorldPosition(thePlayerX, thePlayerY);
+
+    theDrawInfo.mViewWorldMinX = thePlayerX - worldViewWidth;
+    theDrawInfo.mViewWorldMinY = thePlayerY - worldViewWidth * aspectRatio;
+    theDrawInfo.mViewWorldMaxX = thePlayerX + worldViewWidth;
+    theDrawInfo.mViewWorldMaxY = thePlayerY + worldViewWidth * aspectRatio;
+
+    theOverviewMap.Draw(theDrawInfo);
+
+}
+
+void AvHHud::RenderMarineUI()
+{
+
+	int theR, theG, theB;
+	this->GetPrimaryHudColor(theR, theG, theB, false, false);
+
+
+    if (mMarineTopSprite && (this->mMapMode == MAP_MODE_NS))
+    {
+	    
+        float theX;
+        float theY;
+        float theWidth  = .75f*ScreenWidth();
+	    float theHeight = ((float)256/768)*ScreenHeight();
+
+        AvHSpriteSetRenderMode(kRenderTransAdd);
+        AvHSpriteSetColor(1,1,1);
+        AvHSpriteDrawTiles(mMarineTopSprite, 3, 1, mViewport[2] - theWidth + mViewport[0],
+            mViewport[1], mViewport[2] + mViewport[0], mViewport[1] + theHeight, 0, 0, 1, 1);
+
+        // Draw the minimap.
+
+        int theMiniMapX = mViewport[2] - 0.21f * ScreenWidth() + mViewport[0];
+        int theMiniMapY = mViewport[1] + 0.013 * ScreenHeight();
+        int theMiniMapWidth =  0.200 * ScreenWidth();
+        int theMiniMapHeight = 0.202 * ScreenHeight();
+
+        RenderMiniMap(theMiniMapX, theMiniMapY, theMiniMapWidth, theMiniMapHeight);
+
+        // Draw the resource label.
+		
+        theHeight = ScreenHeight() * 0.038;
+
+        std::string theResourceText;
+        char theResourceBuffer[64];
+        
+        LocalizeString(kMarineResourcePrefix, theResourceText);
+		_snprintf(theResourceBuffer, 64, "%s %d", theResourceText.c_str(), this->mVisualResources);
+        
+        theX = mViewport[0] + 0.3 * ScreenWidth();
+        theY = mViewport[1] + 0.007 * ScreenHeight() + (theHeight - GetSmallFont().GetStringHeight()) / 2;
+        
+        GetSmallFont().DrawString(theX, theY, theResourceBuffer, theR, theG, theB);
+
+        // Draw the commander status label.
+
+        std::string theCommanderName;
+        bool theCommanderNameVisible = true;
+        
+        if (!GetCommanderLabelText(theCommanderName))
+        {
+            // Blink if there is no commander.
+		    if ((int)this->mTimeOfLastUpdate % 2)
+		    {
+			    theCommanderNameVisible = false;
+		    }
+        }
+
+        if (theCommanderNameVisible)
+        {
+        
+            theX = mViewport[0] + 0.50 * ScreenWidth();
+            theY = mViewport[1] + 0.006 * ScreenHeight() + (theHeight - GetSmallFont().GetStringHeight()) / 2;
+        
+            GetSmallFont().DrawString(theX, theY, theCommanderName.c_str(), theR, theG, theB);
+        
+        }
+
+    }
+
+    AvHSpriteEnableClippingRect(false);
+
+    // TODO: Draw various marine upgrades (assumes 256x256 sprite, with each upgrade being 64x64, listed right to left, top to bottom, armor upgrades first, 
+	// weapon upgrades next, then motion-tracking, then jetpacks, then exoskeleton)
+	
+	// Do we have a jetpack?
+	if(GetHasUpgrade(this->GetHUDUpgrades(), MASK_UPGRADE_7))
+	{
+		// Draw jetpack energy indicator
+		if(this->mMarineUIJetpackSprite)
+		{
+			float theFactor = 1 - pmove->fuser3/kNormalizationNetworkFactor;
+			int theFrame = 0;
+	
+			string theOutputMessage;
+			if(LocalizeString(kJetpackEnergyHUDText, theOutputMessage))
+			{
+			
+                float theX = .9f*ScreenWidth();
+                float theY = .8f*ScreenHeight();
+                float theWidth = .02f*ScreenWidth();
+                float theHeight = .1f*ScreenHeight();
+
+                AvHSpriteSetRenderMode(kRenderTransAdd);
+                AvHSpriteSetColor(1,1,1);
+                                
+                AvHSpriteDraw(mMarineUIJetpackSprite, 0, theX, theY, theX + theWidth, theY + theHeight * theFactor, 0, 0, 1, theFactor);    
+                AvHSpriteDraw(mMarineUIJetpackSprite, 1, theX, theY + theHeight * theFactor, theX + theWidth, theY + theHeight, 0, theFactor, 1, 1);
+
+            }
+		}
+	}
+
+
+	const int kNumUpgradesToDraw = 4;
+	AvHUpgradeMask kUpgradeToMaskTable[kNumUpgradesToDraw] = {MASK_UPGRADE_4, MASK_UPGRADE_1, MASK_UPGRADE_8, MASK_UPGRADE_7};
+
+    const float kAspectRatio = ScreenWidth()/ScreenHeight();
+	
+	const float kNormalizedSpacing = 0.01f;
+	const int kBaseRightOffset = kNormalizedSpacing*ScreenWidth();
+	const int kVerticalUpgradeSpacing = kNormalizedSpacing*kAspectRatio*ScreenHeight();
+	int theUpgradeVar = this->GetHUDUpgrades();
+	const int kUpgradeFrame = 0;
+	const float kUpgradeSize = 0.05;
+	int theUpgradeWidth = kUpgradeSize*ScreenWidth();
+	int theUpgradeHeight = kUpgradeSize*kAspectRatio*ScreenHeight();
+    
+    for(int i = 0; i < kNumUpgradesToDraw; i++)
+	{
+		AvHUpgradeMask theUpgradeMask = kUpgradeToMaskTable[i];
+
+		// Draw highest ammo upgrade level
+		if(theUpgradeMask == MASK_UPGRADE_4)
+		{
+			if(GetHasUpgrade(theUpgradeVar, MASK_UPGRADE_5))
+			{
+				theUpgradeMask = MASK_UPGRADE_5;
+				
+				if(GetHasUpgrade(theUpgradeVar, MASK_UPGRADE_6))
+				{
+					theUpgradeMask = MASK_UPGRADE_6;
+				}
+			}
+		}
+
+		// Draw highest armor level
+		if(theUpgradeMask == MASK_UPGRADE_1)
+		{
+			if(GetHasUpgrade(theUpgradeVar, MASK_UPGRADE_2))
+			{
+				theUpgradeMask = MASK_UPGRADE_2;
+				
+				if(GetHasUpgrade(theUpgradeVar, MASK_UPGRADE_3))
+				{
+					theUpgradeMask = MASK_UPGRADE_3;
+				}
+			}
+		}
+
+		// Draw heavy armor instead of jetpacks if they have it
+		if(theUpgradeMask == MASK_UPGRADE_7)
+		{
+			if(GetHasUpgrade(theUpgradeVar, MASK_UPGRADE_13))
+			{
+				theUpgradeMask = MASK_UPGRADE_13;
+			}
+		}
+		
+		if(GetHasUpgrade(theUpgradeVar, theUpgradeMask))
+		{
+			int theFrame = 0;
+
+			switch(theUpgradeMask)
+			{
+			case MASK_UPGRADE_4:
+				theFrame = 0;
+				break;
+			case MASK_UPGRADE_5:
+				theFrame = 1;
+				break;
+			case MASK_UPGRADE_6:
+				theFrame = 2;
+				break;
+			case MASK_UPGRADE_1:
+				theFrame = 3;
+				break;
+			case MASK_UPGRADE_2:
+				theFrame = 4;
+				break;
+			case MASK_UPGRADE_3:
+				theFrame = 5;
+				break;
+			case MASK_UPGRADE_8:
+				theFrame = 6;
+				break;
+			case MASK_UPGRADE_7:
+				theFrame = 7;
+				break;
+			case MASK_UPGRADE_13:
+				theFrame = 8;
+				break;
+			}
+
+			float theStartU = (theFrame % 4)*.25f;
+			float theStartV = (theFrame / 4)*.333f;
+			float theEndU = theStartU + .25f;
+			float theEndV = theStartV + .333f;
+			
+			const int kBaseX = ScreenWidth() - .05*ScreenWidth();
+			const int kBaseY = .75*ScreenHeight();
+			const int kIconWidth = .05*ScreenWidth();
+			const int kIconHeight = .05*ScreenHeight();
+			
+            float x1 = kBaseX;
+            float y1 = kBaseY + i*kIconHeight;
+            float x2 = x1 + kIconWidth;
+            float y2 = y1 + kIconHeight;
+            
+			AvHSpriteSetRenderMode(kRenderTransAdd);
+			AvHSpriteEnableClippingRect(false);
+			AvHSpriteSetColor(1, 1, 1, this->GetGammaSlope());
+            AvHSpriteDraw(mMarineUpgradesSprite, 0, x1, y1, x2, y2, theStartU, theStartV, theEndU, theEndV);
+        
+        }
+	}
+
+}
+
+void AvHHud::RenderCommanderUI()
+{
+
+    RenderStructureRanges();
+
+	// Draw command button
+	if(this->mCommandButtonSprite)
+	{
+		// Animate the button unless the mouse is over it (?)
+		int kNumFrames = 16; // Last frame is highlighted, first frame seems off
+		const float kFramesPerSecond = 10;
+		const float kCycleTime = (1.0f/kFramesPerSecond)*kNumFrames;
+
+		float theNumCycles =  this->mTimeOfLastUpdate/kCycleTime;
+		int theFrame = 1 + (theNumCycles - (int)theNumCycles)*kNumFrames;
+
+		const int kStartX = 890;
+		int theX = (kStartX/1024.0f)*ScreenWidth();
+		int theY = (525/768.0f)*ScreenHeight();
+		
+		float theWidth = ((1024 - kStartX)/1024.0f)*ScreenWidth();
+		float theHeight = (38/768.0f)*ScreenHeight();
+
+        float x1 = theX;
+        float y1 = theY;
+        float x2 = x1 + theWidth;
+        float y2 = y1 + theHeight;
+
+        AvHSpriteSetRenderMode(kRenderTransAlpha);
+        AvHSpriteDraw(mCommandButtonSprite, theFrame, x1, y2, x2, y2, 0, 0, 1, 1);
+    
+    }
+
+	// Draw "select all" button
+	if(this->mSelectAllSprite)
+	{
+		AvHTechImpulsePanel* theTechImpulsePanel = NULL;
+		if(this->GetManager().GetVGUIComponentNamed(kSelectAllImpulsePanel, theTechImpulsePanel))
+		{
+			if(theTechImpulsePanel->isVisible())
+			{
+				int theX, theY;
+				theTechImpulsePanel->getPos(theX, theY);
+				
+				int theWidth, theHeight;
+				theTechImpulsePanel->getSize(theWidth, theHeight);
+				
+				// Draw unhighlighted, highlighted, or active
+				int theFrame = 0;
+				
+				// If mouse is over, use frame 1
+				if(this->GetIsMouseInRegion(theX, theY, theWidth, theHeight))
+				{
+					theFrame = 1;
+				}
+				
+				// If all troops selected, use frame 2
+				if((this->mSelected.size()) > 0 && (this->mSelected == this->mSelectAllGroup))
+				{
+					theFrame = 2;
+				}
+				
+                AvHSpriteSetRenderMode(kRenderTransAlpha);
+			    AvHSpriteDraw(mSelectAllSprite, theFrame, theX, theY, theX + theWidth, theY + theHeight, 0, 0, 1, 1);
+            
+            }
+		}
+	}
+	
+	// Draw blinking "under attack" indicator
+	if(this->mCommandStatusSprite)
+	{
+		int theFrame = 0;
+		
+		int theX = (725/1024.0f)*ScreenWidth();
+		int theY = (702/768.0f)*ScreenHeight();
+		
+		float theWidth = (61.5f/1024.0f)*ScreenWidth();
+		float theHeight = (66/768.0f)*ScreenHeight();
+		
+		// Blink button when an alert is set!
+		if(this->mBlinkingAlertType)
+		{
+			int theSecondOfLastUpdate = (int)this->mTimeOfLastUpdate;
+			if(theSecondOfLastUpdate % 2)
+			{
+				theFrame = this->mBlinkingAlertType;
+			}
+		}
+
+        AvHSpriteSetRenderMode(kRenderTransAlpha);
+	    AvHSpriteDraw(mCommandStatusSprite, theFrame, theX, theY, theX + theWidth, theY + theHeight, 0, 0, 1, 1);
+    
+    }
+	
+	if(this->mTopDownTopSprite)
+	{
+		float theHeight = ((float)128/768)*ScreenHeight();
+        AvHSpriteDrawTiles(mTopDownTopSprite, 4, 1, 0, 0, ScreenWidth(), theHeight, 0, 0, 1, 1);
+	}
+
+	if(this->mTopDownBottomSprite)
+	{
+		// The artwork is three 128s high
+		float theHeight = ((float)256/768)*ScreenHeight();
+        AvHSpriteSetRenderMode(kRenderTransAlpha);
+        AvHSpriteDrawTiles(mTopDownBottomSprite, 4, 1, 0, ScreenHeight()-theHeight, ScreenWidth(), ScreenHeight(), 0, 0, 1, 1);
+	}
+
+	// Draw scaled sprites for all ActionButtons
+	this->DrawActionButtons();
+
+	// Draw hotgroups
+	this->DrawHotgroups();
+
+	// Draw pending requests
+	this->DrawPendingRequests();
+	
+    // Draw logout button
+	if(this->mLogoutSprite)
+	{
+		int theFrame = 0;
+
+		int theX = .785*ScreenWidth();
+		int theY = .013*ScreenHeight();
+		
+		float theWidth = .197f*ScreenWidth();
+		float theHeight = .083f*ScreenHeight();
+
+		// Detect mouseover
+		if(this->GetIsMouseInRegion(theX, theY, theWidth, theHeight))
+		{
+			theFrame = 1;
+		}
+
+        AvHSpriteSetRenderMode(kRenderTransAlpha);
+        AvHSpriteDraw(mLogoutSprite, theFrame, theX, theY, theX + theWidth, theY + theHeight, 0, 0, 1, 1);
+    
+    }
+
+}
+
+void AvHHud::RenderStructureRanges()
+{
+
+    float theRangeR = 0;
+    float theRangeG = 1;
+    float theRangeB = 0;
+    float theRangeA = 0.2f;
+
+	// Draw range for current ghost building, if applicable
+	EntityListType theEntities;
+	IntList theDistanceRequirements;
+	float theZAdjustment = 0.0f;
+	bool theSnapToLocation = false;
+	bool theDrewGhostRegions = false;
+	
+	AvHSHUGetBuildRegions(this->mGhostBuilding, theEntities, theDistanceRequirements, theZAdjustment, theSnapToLocation);
+
+	// For each entity to draw
+	int theDistanceCounter = 0;
+	for(EntityListType::iterator theRangeIter = theEntities.begin(); theRangeIter != theEntities.end(); theRangeIter++, theDistanceCounter++)
+	{
+		//cl_entity_s* theEntity = gEngfuncs.GetEntityByIndex(*theRangeIter);
+		physent_t* theEntity = gEngfuncs.pEventAPI->EV_GetPhysent(*theRangeIter);
+		if(theEntity)
+		{
+			vec3_t thePosition;
+			thePosition = AvHSHUGetRealLocation(theEntity->origin, theEntity->mins, theEntity->maxs);
+
+			//int theSprite = (theEntity->iuser3 == AVH_USER3_SIEGETURRET) ? this->mSiegeTurretSprite : this->mBuildCircleSprite;
+			int theSprite = this->mBuildCircleSprite;
+
+			int theDistanceRequirement = theDistanceRequirements[theDistanceCounter];
+			RenderStructureRange(thePosition, theDistanceRequirement, theSprite, kRenderTransAdd, 0, theRangeR, theRangeG, theRangeB, theRangeA);
+
+			theDrewGhostRegions = true;
+		}
+	}
+
+    // Draw selection as well
+	for(EntityListType::iterator theSelectedIter = this->mSelected.begin(); theSelectedIter != this->mSelected.end(); theSelectedIter++)
+	{
+		cl_entity_s* theEntity = gEngfuncs.GetEntityByIndex(*theSelectedIter);
+		//physent_t* theEntity = gEngfuncs.pEventAPI->EV_GetPhysent(*theSelectedIter);
+		if(theEntity)
+		{
+			vec3_t thePosition;
+			thePosition = AvHSHUGetRealLocation(theEntity->curstate.origin, theEntity->curstate.mins, theEntity->curstate.maxs);
+			
+			AvHUser3 theUser3 = (AvHUser3)(theEntity->curstate.iuser3);
+			int theRange = AvHSHUGetDrawRangeForUser3(theUser3);
+			if(theRange > 0)
+			{
+				// Don't draw structures that are recycling and therefore inactive
+				if(!GetHasUpgrade(theEntity->curstate.iuser4, MASK_RECYCLING))
+				{
+					//int theSprite = (theEntity->curstate.iuser3 == AVH_USER3_SIEGETURRET) ? this->mSiegeTurretSprite : this->mBuildCircleSprite;
+					int theSprite = this->mBuildCircleSprite;
+					RenderStructureRange(thePosition, theRange, theSprite, kRenderTransAdd, 0, theRangeR, theRangeG, theRangeB, theRangeA);
+				}
+				else
+				{
+					int a = 0;
+				}
+			}
+		}
+	}
+
+    // Draw the minimum build radius violations.
+
+    EntityListType theBuildViolations;
+    AvHSHUGetMinBuildRadiusViolations(mGhostBuilding, mGhostWorldLocation, theBuildViolations);
+   
+
+
+	for (EntityListType::iterator theBuildViolationsIter = theBuildViolations.begin(); theBuildViolationsIter != theBuildViolations.end(); theBuildViolationsIter++)
+	{	
+		gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction( false, true );
+		
+		// Store off the old count
+		gEngfuncs.pEventAPI->EV_PushPMStates();
+		
+		// Now add in all of the players.
+		gEngfuncs.pEventAPI->EV_SetSolidPlayers (-1);
+
+		physent_t* theEntity = gEngfuncs.pEventAPI->EV_GetPhysent(*theBuildViolationsIter);
+
+		gEngfuncs.pEventAPI->EV_PopPMStates();
+			
+		if(theEntity)
+		{
+			vec3_t thePosition;
+			thePosition = AvHSHUGetRealLocation(theEntity->origin, theEntity->mins, theEntity->maxs);
+			
+			AvHUser3 theUser3 = (AvHUser3)(theEntity->iuser3);
+
+            vec3_t theMinSize, theMaxSize;
+
+            AvHSHUGetSizeForUser3(theUser3, theMinSize, theMaxSize);
+            float theMaxRadius2 = max(max(theMinSize.x, theMaxSize.x), max(theMinSize.y, theMaxSize.y));
+
+            int theSprite = this->mBuildCircleSprite;
+			// joev: 0000291 
+			// It's possible to place "on" marines if you're offset a little from center. This code and 
+			// associated changes above and in AvHSharedUtil.cpp is to enforce a build distance around marines,
+			// in the same way as structures, to prevent this exploit.
+ 			float theMinMarineBuildDistance;
+            if (theUser3 == AVH_USER3_MARINE_PLAYER) {
+				theMinMarineBuildDistance = BALANCE_FVAR(kMinMarinePlayerBuildDistance);
+			}
+			else 
+			{
+				theMinMarineBuildDistance = BALANCE_FVAR(kMinMarineBuildDistance);
+			}
+			// :joev
+			RenderStructureRange(thePosition, theMinMarineBuildDistance + theMaxRadius2, theSprite, kRenderTransAdd, 0, 1, 0, 0, 0.3f);
+
+		}
+	}
+}
+
+void AvHHud::RenderStructureRange(vec3_t inOrigin, int inRadius, HSPRITE inSprite, int inRenderMode, int inFrame, float inR, float inG, float inB, float inAlpha)
+{
+
+    vec3_t w1;
+    
+    w1[0] = inOrigin[0] - inRadius;
+    w1[1] = inOrigin[1] - inRadius;
+    w1[2] = inOrigin[2];
+    
+    vec3_t s1;
+    gEngfuncs.pTriAPI->WorldToScreen(w1, s1);
+
+    vec3_t w2;
+    
+    w2[0] = inOrigin[0] + inRadius;
+    w2[1] = inOrigin[1] + inRadius;
+    w2[2] = inOrigin[2];
+    
+    vec3_t s2;
+    gEngfuncs.pTriAPI->WorldToScreen(w2, s2);
+
+    float x1 = XPROJECT(s1[0]);
+    float y1 = YPROJECT(s1[1]);
+    float x2 = XPROJECT(s2[0]);
+    float y2 = YPROJECT(s2[1]);
+
+    AvHSpriteSetColor(inR, inG, inB, inAlpha);
+    AvHSpriteSetRenderMode(inRenderMode);
+    AvHSpriteDraw(inSprite, inFrame, x1, y1, x2, y2, 0, 0, 1, 1);
+    AvHSpriteSetColor(1, 1, 1, 1);
+
+}
+
+void AvHHud::RenderAlienUI()
+{
+
+	const float kAspectRatio = ScreenWidth()/ScreenHeight();
+
+    // Draw the embryo overlay if the player is gestating.
+
+    if (GetHUDUser3() == AVH_USER3_ALIEN_EMBRYO)
+    {
+		if (mMembraneSprite)
+		{
+            AvHSpriteSetRenderMode(kRenderTransAdd);
+            AvHSpriteSetColor(1,1,1);
+            DrawWarpedOverlaySprite(mMembraneSprite, 4, 3, .007 * 2, .002 * 2, .15, .3);
+		}
+        return;
+    }
+
+    AvHSpriteSetRenderMode(kRenderTransAlpha);
+
+    int theWidth = kResourceEnergyBarWidth*ScreenWidth();
+    int theHeight = kResourceEnergyBarHeight*ScreenHeight();
+
+    int theX = mViewport[0];
+    int theY = mViewport[3] - theHeight + mViewport[1];
+
+	// Draw resource text label.
+
+    if (!mSteamUIActive)
+    {
+
+	    const float kTextInset = kResourceEnergyBarWidth*.5f;
+	    const int kNumericYOffset = 1.5*this->GetHudStringHeight();
+
+        int theResourceLabelX = mViewport[0] + kTextInset*ScreenWidth();
+	    int theResourceLabelY = theY -  + .05f * ScreenHeight();
+	    
+		if(this->mMapMode == MAP_MODE_NS)
+		{
+			string theLocalizedResourceDescription;
+			if(LocalizeString(kAlienResourcePrefix, theLocalizedResourceDescription))
+			{
+				int theStringWidth = this->GetHudStringWidth(theLocalizedResourceDescription.c_str());
+				int theR, theG, theB;
+				this->GetPrimaryHudColor(theR, theG, theB, false, false);
+				this->DrawHudString(theResourceLabelX, theResourceLabelY, ScreenWidth(), theLocalizedResourceDescription.c_str(), theR, theG, theB);
+			}
+
+			// Draw amount we have
+			char theBuffer[128];
+			sprintf(theBuffer, "(%d/%d)", this->mVisualResources, this->GetMaxAlienResources());
+			this->DrawTranslatedString(theResourceLabelX, theResourceLabelY + kNumericYOffset, theBuffer);
+		}
+    }
+    
+    // Draw energy bar.
+
+    if (mAlienUIEnergySprite)
+    {
+        theX = mViewport[2] - theWidth + mViewport[0];
+
+        float theFactor = 1 - this->mVisualEnergyLevel;
+        
+        AvHSpriteSetColor(1,1,1);
+        AvHSpriteSetRenderMode(kRenderTransTexture);
+
+        AvHSpriteDraw(mAlienUIEnergySprite, 0, theX, theY, theX + theWidth, theY + theHeight * theFactor, 0, 0, 1, theFactor);    
+        AvHSpriteDraw(mAlienUIEnergySprite, 1, theX, theY + theHeight * theFactor, theX + theWidth, theY + theHeight, 0, theFactor, 1, 1);
+
+    }
+
+	// Draw hive indicators.
+
+    if (mHiveInfoSprite) //  && (this->mMapMode == MAP_MODE_NS)) // removed check to enable hive with health to be shown in combat
+    {
+
+	    int theHiveIndex = 0;
+
+	    for (HiveInfoListType::iterator theIter = this->mHiveInfoList.begin(); theIter != this->mHiveInfoList.end(); theIter++, theHiveIndex++)
+        {
+
+	        // For this hive, figure out which frame to draw
+
+		    int theFrame = theIter->mStatus;
+		    
+		    // If under attack, make it blink red
+		    int theSecondOfLastUpdate = (int)this->mTimeOfLastUpdate;
+		    if(theIter->mUnderAttack && (theSecondOfLastUpdate % 2))
+		    {
+			    theFrame = kHiveInfoStatusUnderAttack;
+		    }
+
+            int theHiveWidth = kHiveNormScreenWidth*ScreenWidth();
+
+		    // Draw hive
+		    //float theNormX = theHiveWidth;
+		    float theNormY = kHiveNormScreenY + kHiveNormScreenVerticalSpacing*theHiveIndex;
+		    
+            //DrawScaledHUDSprite(this->mHiveInfoSprite, kRenderTransAlpha, 1, theNormX*ScreenWidth, theNormY*ScreenHeight(), kHiveNormScreenWidth*ScreenWidth, kHiveNormScreenHeight*ScreenHeight(), theFrame);
+            
+            float x1 = mViewport[0] + mViewport[2] - theHiveWidth;
+            float y1 = mViewport[1] + theNormY*ScreenHeight();
+            float x2 = x1 + theHiveWidth;
+            float y2 = y1 + kHiveNormScreenHeight*ScreenHeight();
+            
+            AvHSpriteSetColor(1,1,1);
+            AvHSpriteSetRenderMode(kRenderTransTexture);
+            AvHSpriteDraw(mHiveInfoSprite, theFrame, x1, y1, x2, y2, 0, 0, 1, 1);
+
+//            AvHSpriteSetColor(1,1,1);
+//            AvHSpriteSetRenderMode(kRenderTransTexture);
+//			AvHSpriteDraw(mHiveHealthSprite, 0, x1, y1, x1+100, y1+100,  0, 0, 1, 1);
+
+			
+			// use the hive sprite height for the hivehealth sprite height and width
+			float theHealthSpriteHeight = (float)(kHiveNormScreenHeight) *ScreenHeight();
+			float theHealthSpriteWidth = theHealthSpriteHeight;
+			
+			AvHSpriteSetColor(1,1,1);
+            AvHSpriteSetRenderMode(kRenderTransTexture);
+
+			// adjust the position for the sprite -- to the left
+			float w1 = mViewport[0] + mViewport[2] - (kHiveNormScreenWidth + 0.02f)*ScreenWidth();
+
+			AvHSpriteDraw(mHiveHealthSprite, 0, w1, y1, w1 + theHealthSpriteWidth, y1 + theHealthSpriteHeight,  0, 0, 1, 1);
+			
+			if (theIter->mStatus > 0) {
+				if (theIter->mHealthPercentage < 100) {
+					AvHSpriteDraw(mHiveHealthSprite, 0, w1, y1, w1 + theHealthSpriteWidth, y1 + theHealthSpriteHeight,  0, 0, 1, 1);
+					AvHSpriteDraw(mHiveHealthSprite, 1, 
+						w1, y1 + theHealthSpriteHeight - theHealthSpriteHeight * ((float)(theIter->mHealthPercentage) * 0.92f / 100),
+						w1 + theHealthSpriteWidth, y1 + theHealthSpriteHeight,  
+						0, 1 - ((float)(theIter->mHealthPercentage) * 0.92f / 100), 
+						1, 1);
+				} else {
+					AvHSpriteDraw(mHiveHealthSprite, 1, w1, y1, w1 + theHealthSpriteWidth, y1 + theHealthSpriteHeight,  0, 0, 1, 1);
+				}
+			}
+
+
+
+		    // Draw technology it's supporting
+		    AvHMessageID theTechnology = (AvHMessageID)theIter->mTechnology;
+		    theFrame = -1;
+		    switch(theTechnology)
+		    {
+		    case ALIEN_BUILD_DEFENSE_CHAMBER:
+			    theFrame = 0;
+			    break;
+		    case ALIEN_BUILD_SENSORY_CHAMBER:
+			    theFrame = 3;
+			    break;
+		    case ALIEN_BUILD_MOVEMENT_CHAMBER:
+			    theFrame = 2;
+			    break;
+		    }
+
+		    // Draw it inset
+		    if(theFrame >= 0)
+		    {
+			    
+                float x1 = mViewport[0] + mViewport[2] - theHiveWidth + (kHiveTechnologyInsetXScalar*kHiveNormScreenWidth)*ScreenWidth();
+                float y1 = mViewport[1] + (theNormY + kHiveTechnologyInsetYScalar*kHiveNormScreenHeight)*ScreenHeight();
+                float x2 = x1 + kHiveTechnologyInsetWidthScalar*kHiveNormScreenWidth*ScreenWidth();
+                float y2 = y1 + kHiveTechnologyInsetHeightScalar*kHiveNormScreenHeight*ScreenHeight();
+                
+                AvHSpriteDraw(mAlienUIUpgradeCategories, theFrame, x1, y1, x2, y2, 0, 0, 1, 1);    
+
+		    }
+
+        }
+    
+    }
+
+    // Draw the upgrades.
+
+	const int kNumberXInset = 2;
+	const int kNumberYInset = 2;
+	
+	const int kBaseYOffset = .1*ScreenHeight();
+	
+	// Now draw alien upgrades
+	const float kNormalizedSpacing = 0.01f;
+	const int kBaseRightOffset = kNormalizedSpacing*ScreenWidth();
+	const int kVerticalUpgradeSpacing = kNormalizedSpacing*kAspectRatio*ScreenHeight();
+	int theUpgradeVar = this->GetHUDUpgrades();
+	const int kUpgradeFrame = 0;
+	const float kUpgradeSize = 0.05;
+	int theUpgradeWidth = kUpgradeSize*ScreenWidth();
+	int theUpgradeHeight = kUpgradeSize*kAspectRatio*ScreenHeight();
+	
+	// In Combat mode, we can have multiple upgrades in each category
+	int theNumDrawnInCategory[ALIEN_UPGRADE_CATEGORY_MAX_PLUS_ONE + 1];
+	memset(theNumDrawnInCategory, 0, sizeof(int)*(ALIEN_UPGRADE_CATEGORY_MAX_PLUS_ONE + 1));
+	
+	AvHUpgradeMask theUpgradeMasks[kNumAlienUpgrades] = {MASK_UPGRADE_1, MASK_UPGRADE_2, MASK_UPGRADE_3, MASK_NONE, MASK_NONE, MASK_NONE, MASK_UPGRADE_4, MASK_UPGRADE_5, MASK_UPGRADE_6, MASK_UPGRADE_7, MASK_UPGRADE_8, MASK_UPGRADE_9};
+	for(int i = 0; i < kNumAlienUpgrades; i++)
+	{
+		AvHUpgradeMask theUpgradeMask = theUpgradeMasks[i];
+		AvHAlienUpgradeCategory theCategory = ALIEN_UPGRADE_CATEGORY_INVALID;
+		AvHGetAlienUpgradeCategoryFromMask(theUpgradeMask, theCategory);
+		
+		int theCategoryNumber = (int)theCategory;
+		//int theRowNumber = i % (kNumAlienUpgrades/kNumAlienUpgradeCategories);
+
+		// Quick hack: treat defense as offense for drawing purposes, because offense has been (temporarily?) removed
+		int theCategoryNumberOffset = (int)(((theCategory == ALIEN_UPGRADE_CATEGORY_DEFENSE) ?  ALIEN_UPGRADE_CATEGORY_OFFENSE : theCategory));
+		int theX = ScreenWidth() - theUpgradeWidth - kBaseRightOffset;
+
+		// Inset drawing of multiple upgrades in same category (needed for Combat mode)
+		theX -= (theNumDrawnInCategory[theCategory]*theUpgradeWidth);
+		
+		int theEnergyHeight = kResourceEnergyBarHeight*ScreenHeight();
+
+		int theY = (3*kHiveNormScreenVerticalSpacing)*ScreenHeight() + kVerticalUpgradeSpacing + theCategoryNumberOffset*(kVerticalUpgradeSpacing + theUpgradeHeight);
+		
+		if(GetHasUpgrade(theUpgradeVar, theUpgradeMask))
+		{
+			theNumDrawnInCategory[theCategory]++;
+
+			int theLevelOfUpgrade = AvHGetAlienUpgradeLevel(theUpgradeVar, theUpgradeMask);
+			for(int theLevel = 0; theLevel < theLevelOfUpgrade; theLevel++)
+			{
+				// Draw them slightly overlapping
+				const float kOffset = .01f;
+			
+                float x1 = theX - theLevel*(kOffset*ScreenWidth());
+                float y1 = theY - theLevel*(kOffset*ScreenHeight());
+                float x2 = x1 + theUpgradeWidth;
+                float y2 = y1 + theUpgradeHeight;
+
+                AvHSpriteDraw(mAlienUIUpgrades, i, x1, y1, x2, y2, 0, 0, 1, 1);
+            }
+		}
+		else
+		{
+			if(this->GetGameStarted() && !this->GetIsCombatMode())
+			{
+				// If upgrade is pending, draw it blinking
+				for(int i = 0; i < this->mNumUpgradesAvailable; i++)
+				{
+					if(this->mCurrentUpgradeCategory[i] == theCategory)
+					{
+						int theSecondOfLastUpdate = (int)this->mTimeOfLastUpdate;
+						if(theSecondOfLastUpdate % 2)
+						{
+							int theFrame = theCategory-1;
+						
+							float x1 = theX;
+							float y1 = theY;
+							float x2 = x1 + theUpgradeWidth;
+							float y2 = y1 + theUpgradeHeight;
+
+							AvHSpriteDraw(mAlienUIUpgradeCategories, theFrame, x1, y1, x2, y2, 0, 0, 1, 1);
+                    	}
+						break;
+					}
+				}
+			}
+		}
+	}
+
+
+    if(this->GetIsAlien() && (this->GetHUDTeam() != TEAM_IND))
+	{
+		bool theIsGestating = (this->GetHUDUser3() == AVH_USER3_ALIEN_EMBRYO);
+		bool theIsBeingDigested = this->GetIsBeingDigested();
+
+		this->mSelectedNodeResourceCost = -1;
+		
+		// Find the blip nearest our view reticle
+		int theNearestBlip = -1;
+		float theDotProductOfClosestBlip = -1;
+		
+		// Get view vector
+		Vector theViewVector;
+		vec3_t theForward, theRight, theUp;
+		AngleVectors(v_angles, theForward, theRight, theUp);
+		VectorNormalize(theForward);
+
+		for(int theBlip = 0; theBlip < this->mFriendlyBlips.mNumBlips; theBlip++)
+		{
+			// Get vector to current blip
+			Vector theVectorToBlip;
+			VectorSubtract(this->mFriendlyBlips.mBlipPositions[theBlip], gPredictedPlayerOrigin, theVectorToBlip);
+			VectorNormalize(theVectorToBlip);
+
+			// Dot them
+			float theDotProduct = DotProduct(theForward, theVectorToBlip);
+
+			// Is dot product closer to 1 then best?
+			if(theDotProduct > theDotProductOfClosestBlip)
+			{
+				// Save new blip and dot product
+				theNearestBlip = theBlip;
+				theDotProductOfClosestBlip = theDotProduct;
+			}
+		}
+			
+		// Draw information about our friendly blips
+		theBlip = theNearestBlip;
+		if(theNearestBlip >= 0)
+		{
+			ASSERT(theNearestBlip < this->mFriendlyBlips.mNumBlips);
+
+			// Draw location when player under attack
+			int theBlipStatus = this->mFriendlyBlips.mBlipStatus[theBlip];
+			//if((theBlipStatus == kVulnerableFriendlyBlipStatus) || ((theBlipStatus >= kSayingOne) && (theBlipStatus <= kSayingSix)))
+			//{
+				// Get location
+				string theLocationName = this->GetNameOfLocation(this->mFriendlyBlips.mBlipPositions[theBlip]);
+				
+				// Get name of entity
+				string theBlipName;
+				
+				int theBlipInfo = this->mFriendlyBlips.mBlipInfo[theBlip];
+				if(theBlipInfo <= kBaseBlipInfoOffset)
+				{
+					hud_player_info_t thePlayerInfo;
+					gEngfuncs.pfnGetPlayerInfo(theBlipInfo, &thePlayerInfo);
+					if(thePlayerInfo.name)
+					{
+						theBlipName = thePlayerInfo.name;
+					}
+				}
+				else
+				{
+					AvHUser3 theUser3 = AvHUser3(theBlipInfo - kBaseBlipInfoOffset);
+					this->GetTranslatedUser3Name(theUser3, theBlipName);
+				}
+				
+				string theBlipStatusText;
+				char theBlipStatusString[512];
+				sprintf(theBlipStatusString, "#%s%d", kBlipStatusPrefix, theBlipStatus);
+				LocalizeString(theBlipStatusString, theBlipStatusText);
+				
+				Vector theScreenPos;
+				Vector theMessageWorldPos = this->mFriendlyBlips.mBlipPositions[theBlip];
+				const float kSpacingScalar = 1.2f;
+				theMessageWorldPos.z -= (kWorldBlipScale/2.0f)*kSpacingScalar;
+
+				if(AvHCUWorldToScreen(theMessageWorldPos, (float*)&theScreenPos))
+				{
+					if((theBlipName != "") && (theBlipStatusText != "") && (theLocationName != ""))
+					{
+						// "MonsieurEvil is under attack"
+						// "Resource tower is under attack"
+						char theFirstLine[512];
+						sprintf(theFirstLine, "%s %s\n", theBlipName.c_str(), theBlipStatusText.c_str());
+						this->DrawTranslatedString(theScreenPos[0], theScreenPos[1], theFirstLine, true, true);
+						
+						char theLocationNameCStr[512];
+						strcpy(theLocationNameCStr, theLocationName.c_str());
+						this->DrawTranslatedString(theScreenPos[0], theScreenPos[1] + .022f*ScreenHeight(), theLocationNameCStr, true, true, true);
+					}
+				}
+			
+            //}
+		}
+
+		// Draw hive locations under each hive indicator
+		if(!theIsGestating && !theIsBeingDigested && (this->mMapMode == MAP_MODE_NS))
+		{
+			int theHiveIndex = 0;
+			for(HiveInfoListType::iterator theIter = this->mHiveInfoList.begin(); theIter != this->mHiveInfoList.end(); theIter++, theHiveIndex++)
+			{
+				vec3_t theHivePosition(theIter->mPosX, theIter->mPosY, theIter->mPosZ);
+				string theLocationName = this->GetNameOfLocation(theHivePosition);
+			
+                int theHiveWidth = kHiveNormScreenWidth*ScreenWidth();
+
+                int theScreenPosX = mViewport[0] + mViewport[2] - theHiveWidth;
+				int theScreenPosY = mViewport[1] + (kHiveNormScreenY + theHiveIndex*kHiveNormScreenVerticalSpacing + kHiveNormScreenHeight)*ScreenHeight();
+
+				// Hack for nancy, because source is lost
+				if((this->mMapName == "ns_nancy") && (theLocationName == ""))
+				{
+					theLocationName = "nancy_mother";
+				}
+				
+				string theTranslatedLocationName;
+				LocalizeString(theLocationName.c_str(), theTranslatedLocationName);
+			
+				AvHCUTrimExtraneousLocationText(theTranslatedLocationName);
+			
+				int theR, theG, theB;
+				this->GetPrimaryHudColor(theR, theG, theB, false, false);
+			
+				// Draw text in greyscale if hive isn't building or active
+				if(theIter->mStatus == kHiveInfoStatusUnbuilt)
+				{
+					theR = theG = theB = 100;
+				}
+			
+				this->DrawHudStringReverse(mViewport[0] + mViewport[2] - 5, theScreenPosY, ScreenWidth(), (char*)theTranslatedLocationName.c_str(), theR, theG, theB);
+			
+				//char theLocationNameCStr[512];
+				//strcpy(theLocationNameCStr, theLocationName.c_str());
+				//this->DrawTranslatedString(theScreenPosX, theScreenPosY, theLocationNameCStr, false, false);
+			}
+		}
+	}
+
+
+}
+
+void AvHHud::DrawWarpedOverlaySprite(int spriteHandle, int numXFrames, int numYFrames, float inWarpXAmount, float inWarpYAmount, float inWarpXSpeed, float inWarpYSpeed)
+{
+    
+    float dx = ScreenWidth();
+    float dy = ScreenHeight();
+
+	float theCurrentTime = gHUD.GetTimeOfLastUpdate();
+	float theNormXAmount = theCurrentTime*inWarpXSpeed - (int)(theCurrentTime*inWarpXSpeed); // Get fractional part of second
+	float theNormYAmount = theCurrentTime*inWarpYSpeed - (int)(theCurrentTime*inWarpYSpeed);
+	float theSinusoidalNormXAmount = cos(theNormXAmount*2.0f*M_PI);
+	float theSinusoidalNormYAmount = sin(theNormYAmount*2.0f*M_PI);
+	float theXAmount = theSinusoidalNormXAmount*inWarpXAmount;
+	float theYAmount = theSinusoidalNormYAmount*inWarpYAmount;
+
+    for (int frameY = 0; frameY < numYFrames; ++frameY)
+    {
+        for (int frameX = 0; frameX < numXFrames; ++frameX)
+        {
+
+            float theWarpXStartAmount = 0;
+		    float theWarpYStartAmount = 0;
+		    float theWarpXEndAmount = 0;
+		    float theWarpYEndAmount = 0;
+            
+            int frame = frameX + frameY * numXFrames;
+
+            float pw = SPR_Width(spriteHandle, frame);
+            float ph = SPR_Height(spriteHandle, frame);
+            
+            float fx1 = ((float)(frameX)) / numXFrames;
+            float fy1 = ((float)(frameY)) / numYFrames;
+            
+            float fx2 = ((float)(frameX + 1)) / numXFrames;
+            float fy2 = ((float)(frameY + 1)) / numYFrames;
+
+			if(frameX > 0)
+			{
+				theWarpXStartAmount = theXAmount*ScreenWidth();
+			}
+			if(frameX < numXFrames - 1)
+			{
+				theWarpXEndAmount = theXAmount*ScreenWidth();
+			}
+			if(frameY > 0)
+			{
+				theWarpYStartAmount = theYAmount*ScreenHeight();
+			}
+			if(frameY < numYFrames - 1)
+			{
+				theWarpYEndAmount = theYAmount*ScreenHeight();
+			}
+            
+            AvHSpriteDraw(spriteHandle, frame,
+                 dx * fx1 + theWarpXStartAmount,
+                 dy * fy1 + theWarpYStartAmount,
+                 dx * fx2 + theWarpXEndAmount,
+                 dy * fy2 + theWarpYEndAmount,
+                 1 / pw, 1 / ph, 1 - 1 / pw, 1 - 1 / ph);
+
+        }
+    }
+
+}
+
+void AvHHud::RenderNoZBuffering()
+{
+
+    if (mSteamUIActive)
+    {
+        // Hack since the HUD doesn't get drawn while the Steam UI is open.
+        Render();
+    }
+
+	// Don't draw this stuff while being digested
+	if(this->GetIsBeingDigested() || gParticleEditorHandler.GetInEditMode())
+	{
+		return;
+	}
+
+	// Temporary, so we can make movies without having the UI flit around (known HL playback bug)
+	if(/*gEngfuncs.pDemoAPI->IsPlayingback() ||*/ gViewPort->IsOptionsMenuVisible())
+	{
+		return;
+	}
+
+	const int theDistance = 50;
+	
+	const float kAspectRatio = ScreenWidth()/ScreenHeight();
+	
+	float m_vRenderOrigin[3];
+	pVector m_vUp;
+	pVector m_vRight;
+	pVector m_vNormal;
+	
+	//vec3_t theViewAngles;
+	//gEngfuncs.GetViewAngles((float*)theViewAngles)
+	//gEngfuncs.GetView
+	
+	IEngineStudio.GetViewInfo( m_vRenderOrigin, (float*)&m_vUp, (float*)&m_vRight, (float*)&m_vNormal );
+	
+	//float m_fSoftwareXScale, m_fSoftwareYScale;
+	//IEngineStudio.GetAliasScale( &m_fSoftwareXScale, &m_fSoftwareYScale );
+	
+	//vec3_t theViewHeight;
+	//gEngfuncs.pEventAPI->EV_LocalPlayerViewheight(theViewHeight);
+	
+	//	pVector p;
+	//	p.x = m_vRenderOrigin[0] + m_vNormal.x*theDistance;
+	//	p.y = m_vRenderOrigin[1] + m_vNormal.y*theDistance;
+	//	p.z = m_vRenderOrigin[2] + m_vNormal.z*theDistance;
+	
+	//	pVector p;
+	//	p.x = m_vRenderOrigin[0];
+	//	p.y = m_vRenderOrigin[1];
+	//	p.z = m_vRenderOrigin[2];
+	//	p.x = v_origin[0];
+	//	p.y = v_origin[1];
+	//	p.z = v_origin[2];
+	
+	// Allow scripts to perform render
+	AvHScriptManager::Instance()->DrawNoZBuffering();
+	
+//	if(cl_particleinfo->value)
+//	{
+//		// Draw particles here for debugging
+//		pVector theRealView;
+//		vec3_t angles, up, right, forward;
+//		gEngfuncs.pfnAngleVectors(pmove->angles, forward, right, up);
+//		
+//		theRealView.x = forward[0];
+//		theRealView.y = forward[1];
+//		theRealView.z = forward[2];
+//
+//		AvHParticleSystemManager::Instance()->Draw(theRealView);
+//	}
+	
+	//if(this->mMappingTechSprite && !this->mIsRenderingSelectionView && !this->mGameStarted)
+	//{
+	//	float theXPercentage = 256/1024.0f;
+	//	float theYPercentage = 64/768.0f;
+	//	DrawScaledHUDSprite(this->mMappingTechSprite, kRenderTransColor, 1, 0, ScreenHeight/2, theXPercentage*ScreenWidth, theYPercentage*ScreenHeight());
+	//}
+
+	// Draw blips, orders, selection and build effects for spectators and demo watchers too
+	int theUpgradeVar = this->GetHUDUpgrades();
+	bool theHasHiveSightUpgrade = true;//GetHasUpgrade(theUpgradeVar, MASK_ALIEN_UPGRADE_11);
+
+	if(this->GetIsAlien())
+	{
+		if(theHasHiveSightUpgrade)
+		{
+			// Draw friendly blips
+			this->mFriendlyBlips.Draw(m_vNormal, kFriendlyBlipStatus);
+		}
+	}
+	
+	// Draw enemy blips
+	this->mEnemyBlips.Draw(m_vNormal, kEnemyBlipStatus);
+	
+	//this->DrawOrders(true);
+	this->DrawSelectionAndBuildEffects();
+	//this->DrawHelpIcons();
+
+}
+
+void AvHHud::VidInit(void)
+{
+	UIHud::VidInit();
+
+    mOverviewMap.VidInit();
+
+	int theScreenWidth = ScreenWidth();
+	string theSpriteName;
+	
+	//	theSpriteName = UINameToSprite(kEggSprite, theScreenWidth);
+	//	this->mAlienUIEggSprite = Safe_SPR_Load(theSpriteName.c_str());
+	
+	//	theSpriteName = UINameToSprite(kHiveSprite, theScreenWidth);
+	//	this->mAlienUIHiveSprite = Safe_SPR_Load(theSpriteName.c_str());
+	
+	int i = 0;
+	//	for(i = 0; i < kNumAlienLifeforms; i++)
+	//	{
+	//		char theBaseName[128];
+	//		sprintf(theBaseName, "%s%d", kLifeformSprite, i+1);
+	//		string theSpriteName = "sprites/level1_hud.spr";//UINameToSprite(theBaseName, theScreenWidth, true);
+	//		this->mAlienUILifeforms[i] = Safe_SPR_Load(theSpriteName.c_str());
+	//	}
+	
+	char theBaseName[128];
+	sprintf(theBaseName, "%s", kAlienUpgradeSprite);
+	theSpriteName = UINameToSprite(theBaseName, theScreenWidth);
+	this->mAlienUIUpgrades = Safe_SPR_Load(theSpriteName.c_str());
+	
+	sprintf(theBaseName, "%s", kAlienUpgradeCategory);
+	theSpriteName = UINameToSprite(theBaseName, theScreenWidth);
+	this->mAlienUIUpgradeCategories = Safe_SPR_Load(theSpriteName.c_str());
+	
+	// Load jetpack sprite
+	theSpriteName = UINameToSprite(kJetpackSprite, theScreenWidth);
+	this->mMarineUIJetpackSprite = Safe_SPR_Load(theSpriteName.c_str());
+
+	// Load alien energy sprite
+	theSpriteName = UINameToSprite(kAlienEnergySprite, theScreenWidth);
+	this->mAlienUIEnergySprite = Safe_SPR_Load(theSpriteName.c_str());
+
+	// Load background for topdown mode
+	this->mBackgroundSprite = Safe_SPR_Load(kTopDownBGSprite);
+
+	// Load HUD
+	this->mTopDownTopSprite = Safe_SPR_Load(kTopDownTopHUDSprite);
+	this->mTopDownBottomSprite = Safe_SPR_Load(kTopDownBottomHUDSprite);
+	this->mMarineTopSprite = Safe_SPR_Load(kMarineTopHUDSprite);
+
+	this->mLogoutSprite = Safe_SPR_Load(kLogoutSprite);
+	this->mCommandButtonSprite = Safe_SPR_Load(kCommandButtonSprite);
+	this->mCommandStatusSprite = Safe_SPR_Load(kCommandStatusSprite);
+	this->mSelectAllSprite = Safe_SPR_Load(kSelectAllSprite);
+
+	//this->mTopDownBottomSprite = Safe_SPR_Load("sprites/distorttest.spr");
+	//this->mTopDownBottomSprite = Safe_SPR_Load("sprites/ns.spr");
+	//this->mTopDownBottomSprite = Safe_SPR_Load("sprites/distorttest.spr");
+
+	// Load overlays
+	this->mMembraneSprite = Safe_SPR_Load(kMembraneSprite);
+	this->mDigestingSprite = Safe_SPR_Load(kDigestingSprite);
+	
+	// Load order sprite
+	theSpriteName = UINameToSprite(kOrdersSprite, theScreenWidth);
+	this->mOrderSprite = Safe_SPR_Load(theSpriteName.c_str());
+	this->mHiveInfoSprite = Safe_SPR_Load(kHiveInfoSprite);
+	this->mHiveHealthSprite = Safe_SPR_Load(kHiveHealthSprite);
+
+	// Load cursor sprite
+	this->mMarineCursor = Safe_SPR_Load(kCursorsSprite);
+	this->mAlienCursor = Safe_SPR_Load(kAlienCursorSprite);
+	this->mMarineOrderIndicator = Safe_SPR_Load(kMarineOrderSprite);
+	this->mMarineUpgradesSprite = Safe_SPR_Load(kMarineUpgradesSprite);
+	
+	//#ifdef AVH_MAPPER_BUILD
+	//this->mMappingTechSprite = Safe_SPR_Load("sprites/ns.spr");
+	//#endif
+
+	this->mAlienBuildSprite = Safe_SPR_Load(kAlienBuildSprite);
+	this->mMarineBuildSprite = Safe_SPR_Load(kMarineBuildSprite);
+
+	this->mAlienHealthSprite = Safe_SPR_Load(kAlienHealthSprite);
+	this->mMarineHealthSprite = Safe_SPR_Load(kMarineHealthSprite);
+
+	this->mBuildCircleSprite = Safe_SPR_Load(kBuildCircleSprite);
+	//this->mSiegeTurretSprite = Safe_SPR_Load(kSiegeTurretSprite);
+
+	this->mActionButtonSprites.clear();
+	//this->mHelpSprites.clear();
+
+	string theIconName = string(kHelpIconPrefix) + ".spr";
+	this->mHelpSprite = Safe_SPR_Load(theIconName.c_str());
+
+	this->mEnemyBlips.VidInit();
+	this->mFriendlyBlips.VidInit();
+}
+
+
diff --git a/main/source/mod/AvHHulls.h b/main/source/mod/AvHHulls.h
new file mode 100644
index 00000000..159005c2
--- /dev/null
+++ b/main/source/mod/AvHHulls.h
@@ -0,0 +1,72 @@
+#ifndef AVH_HULLS_H
+#define AVH_HULLS_H
+
+// HL hull values
+
+// IMPORTANT: If you're changing any of these, hulls.txt must be changed and all maps recompiled
+
+// Normal HL player
+const int kHLStandHullIndex = 0;
+#define HULL0_MINX -16
+#define HULL0_MINY -16
+#define HULL0_MINZ -36
+
+#define HULL0_MAXX 16
+#define HULL0_MAXY 16
+#define HULL0_MAXZ 36
+
+// Crouched HL player, also used for small aliens
+const int kHLCrouchHullIndex = 1;
+#define HULL1_MINX -16
+#define HULL1_MINY -16
+#define HULL1_MINZ -18
+
+#define HULL1_MAXX 16
+#define HULL1_MAXY 16
+#define HULL1_MAXZ 18
+
+// Point-hull, don't ever change
+const int kHLPointHullIndex = 2;
+#define HULL2_MINX 0
+#define HULL2_MINY 0
+#define HULL2_MINZ 0
+
+#define HULL2_MAXX 0
+#define HULL2_MAXY 0
+#define HULL2_MAXZ 0
+
+
+// Big alien hull
+const int kNSHugeHullIndex = 3;
+#define HULL3_MINX -32
+#define HULL3_MINY -32
+#define HULL3_MINZ -54
+
+#define HULL3_MAXX 32
+#define HULL3_MAXY 32
+#define HULL3_MAXZ 54
+
+const int kMaxPlayerHullWidth = 32;
+
+// Percentage of standing hull to set view height to (used in AvHPlayer::SetViewForRole() and PM_Duck/PM_Unduck)
+const float kStandingViewHeightPercentage = .77f;
+
+// Percentage of ducking hull to set view height to (used in AvHPlayer::SetViewForRole() and PM_Duck/PM_Unduck)
+const float kDuckingViewHeightPercentage = .66f;
+
+// Standard Half-life hulls, don't touch
+#define HULL0_MIN Vector(HULL0_MINX, HULL0_MINY, HULL0_MINZ)
+#define HULL0_MAX Vector(HULL0_MAXX, HULL0_MAXY, HULL0_MAXZ)
+
+#define HULL1_MIN Vector(HULL1_MINX, HULL1_MINY, HULL1_MINZ)
+#define HULL1_MAX Vector(HULL1_MAXX, HULL1_MAXY, HULL1_MAXZ)
+
+#define HULL2_MIN Vector(HULL2_MINX, HULL2_MINY, HULL2_MINZ)
+#define HULL2_MAX Vector(HULL2_MAXX, HULL2_MAXY, HULL2_MAXZ)
+
+// Custom NS hulls
+#define HULL3_MIN Vector(HULL3_MINX, HULL3_MINY, HULL3_MINZ)
+#define HULL3_MAX Vector(HULL3_MAXX, HULL3_MAXY, HULL3_MAXZ)
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHItemInfo.cpp b/main/source/mod/AvHItemInfo.cpp
new file mode 100644
index 00000000..3e030d5b
--- /dev/null
+++ b/main/source/mod/AvHItemInfo.cpp
@@ -0,0 +1,973 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: Controls placement and order of all weapons
+//
+// $Workfile: AvHItemInfo.cpp $
+// $Date: 2002/10/18 22:20:26 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHItemInfo.cpp,v $
+// Revision 1.21  2002/10/18 22:20:26  Flayra
+// - Don't auto pickup weapons so much
+//
+// Revision 1.20  2002/10/17 17:33:27  Flayra
+// - Fixed missing bacterial spray weapon caused by secondary weapons switch
+//
+// Revision 1.19  2002/10/16 20:54:02  Flayra
+// - Move secondary weapons to secondary slots
+//
+// Revision 1.18  2002/10/16 00:59:44  Flayra
+// - Added concept of secondary weapons
+//
+// Revision 1.17  2002/10/03 18:56:21  Flayra
+// - Swapped umbra and spores
+//
+// Revision 1.16  2002/08/16 02:38:59  Flayra
+// - Swapped around umbra, blink and bilebomb
+//
+// Revision 1.15  2002/08/09 01:04:13  Flayra
+// - Added concept of primary weapon
+// - Removed autoreloading for weapons that don't use it, fixing bugs where knife slashes immediately when drawing it, and others
+//
+// Revision 1.14  2002/07/24 19:09:17  Flayra
+// - Linux issues
+//
+// Revision 1.13  2002/07/24 18:45:41  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.12  2002/07/01 21:36:42  Flayra
+// - Regular update (new weapons, new placement)
+//
+// Revision 1.11  2002/06/25 18:03:56  Flayra
+// - Mark weapons with hive flags, deleted old weapons, added new weapons, fixed mines, changed weapon IDs
+//
+// Revision 1.10  2002/06/10 19:57:21  Flayra
+// - Regular update (moved alien upgrade chambers around)
+//
+// Revision 1.9  2002/05/28 17:49:39  Flayra
+// - Moved resource tower to second slot
+//
+// Revision 1.8  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHMarineWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHMarineWeapons.h"
+#include "mod/AvHMarineWeaponConstants.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHMarineEquipment.h"
+#include "mod/AvHAlienAbilities.h"
+#include "mod/AvHAlienAbilityConstants.h"
+#include "mod/AvHBalance.h"
+#include "util/MathUtil.h"
+
+typedef enum
+{
+	AVH_FIRST_SLOT = 0,
+	AVH_SECOND_SLOT = 1,
+	AVH_THIRD_SLOT = 2,
+	AVH_FOURTH_SLOT = 3,
+	AVH_FIFTH_SLOT = 4
+} AvHSlotType;
+
+// IMPORTANT NOTE:
+//   When moving weapons around, be sure to update AvHBasePlayerWeapon::GetAnimationExtension() also.
+//
+// AVH_FIRST_SLOT
+//	1: Machine gun
+//	2: Sonic
+//	3: HMG
+//	4: Bite
+//	5: Claws
+//	6: Swipe
+//	7: Builder spit
+//  8: GrenadeGun
+//	9: Bite2 //
+
+// AVH_SECOND_SLOT
+//	0: Pistol
+//	1: Builder bacterial spray
+//	2: 
+//	3: Parasite
+//	4: BlinkGun
+//	5: Devour
+//	6: Spore
+//	7: Spike
+//	8: 
+//	9: 
+
+// AVH_THIRD_SLOT
+//	0: None
+//	1: Knife
+//	2: Metabolize
+//	3: BileBomb
+//	4: Stomp
+//	5: Leap
+//	6: 
+//	7: Umbra
+//  8: 
+//	9: 
+
+// AVH_FOURTH_SLOT
+//	0: Mine
+//	1: Webspinner
+//	2: Grenade
+//	3: 
+//	4: PrimalScream
+//	5: DivineWind
+//	6: Charge
+//	7: Acid rocket
+//	8: Welder
+
+// AVH_FIFTH_SLOT
+//	0: None
+
+//order = special primary, primary, special secondary, secondary, tertiary (slot 4 except grenade), melee (slot3, not droppable), grenade (not droppable)
+const int kGrenadeWeaponWeight = 1;
+const int kMeleeWeaponWeight = 2;
+const int kDefaultTertiaryWeaponWeight = 3;
+const int kDefaultSecondaryWeaponWeight = 4;
+const int kSpecialSecondaryWeaponWeight = 5;
+const int kDefaultPrimaryWeaponWeight = 6;
+const int kSpecialPrimaryWeaponWeight = 7;
+
+int AvHKnife::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_THIRD_SLOT;
+	p->iPosition = 1;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;
+	p->iMaxAmmo1 = -1;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kKNDamage);
+	p->iMaxClip = WEAPON_NOCLIP;
+	//p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ITEM_FLAG_SELECTONEMPTY;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD;
+	p->iId = AVH_WEAPON_KNIFE;
+	p->iWeight = kMeleeWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHKnife::iItemSlot(void)
+{
+	return AVH_THIRD_SLOT + 1;
+}
+
+
+int AvHMine::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_FOURTH_SLOT;
+	p->iPosition = 0;
+
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = "MineAmmo";
+	p->iMaxAmmo1 = 0;//BALANCE_IVAR(kMineMaxAmmo);
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kMineDamage);
+	p->iMaxClip = BALANCE_IVAR(kMineMaxAmmo);
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY;//ITEM_FLAG_LIMITINWORLD | ITEM_FLAG_EXHAUSTIBLE;
+	p->iId = AVH_WEAPON_MINE;
+	p->iWeight = kDefaultTertiaryWeaponWeight;
+
+//	p->pszName = STRING(pev->classname);
+//	p->pszAmmo1 = "MineAmmo";
+//	p->iMaxAmmo1 = kMineMaxAmmo;
+//	p->pszAmmo2 = NULL;
+//	p->iMaxAmmo2 = -1;
+//	p->iMaxClip = WEAPON_NOCLIP;
+//	p->iFlags = ITEM_FLAG_LIMITINWORLD | ITEM_FLAG_EXHAUSTIBLE;
+//	p->iId = m_iId = AVH_WEAPON_MINE;
+//	p->iWeight = 5;
+	
+	return 1;
+}
+
+int	AvHMine::iItemSlot(void)
+{
+	return AVH_FOURTH_SLOT + 1;
+}
+
+
+int AvHWelder::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_FOURTH_SLOT;
+	p->iPosition = 8;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;
+	p->iMaxAmmo1 = -1;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kWelderDamage);
+	p->iMaxClip = WEAPON_NOCLIP;
+	//p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ITEM_FLAG_SELECTONEMPTY;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD;
+	p->iId = AVH_WEAPON_WELDER;
+	p->iWeight = kDefaultTertiaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHWelder::iItemSlot(void)
+{
+	return AVH_FOURTH_SLOT + 1;
+}
+
+
+
+int AvHMachineGun::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_FIRST_SLOT;
+	p->iPosition = 1;
+
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = "MGAmmo";
+	p->iMaxAmmo1 = BALANCE_IVAR(kMGMaxAmmo);
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kMGDamage);
+	p->iMaxClip = BALANCE_IVAR(kMGMaxClip);
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | PRIMARY_WEAPON;
+	p->iId = AVH_WEAPON_MG;
+	p->iWeight = kDefaultPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHMachineGun::iItemSlot(void)
+{
+	return AVH_FIRST_SLOT + 1;
+}
+
+int AvHPistol::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_SECOND_SLOT;
+	p->iPosition = 0;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = "HGAmmo";
+	p->iMaxAmmo1 = BALANCE_IVAR(kHGMaxAmmo);
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kHGDamage);
+	p->iMaxClip = BALANCE_IVAR(kHGMaxClip);
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | SECONDARY_WEAPON;
+	p->iId = AVH_WEAPON_PISTOL;
+	p->iWeight = kDefaultSecondaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHPistol::iItemSlot(void)
+{
+	return AVH_SECOND_SLOT + 1;
+}
+
+int AvHSonicGun::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_FIRST_SLOT;
+	p->iPosition = 2;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = "SonicAmmo";
+	p->iMaxAmmo1 = BALANCE_IVAR(kSGMaxAmmo);
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kSGDamage);
+	p->iMaxClip = BALANCE_IVAR(kSGMaxClip);
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | PRIMARY_WEAPON;
+	p->iId = AVH_WEAPON_SONIC;
+	p->iWeight = kSpecialPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHSonicGun::iItemSlot(void)
+{
+	return AVH_FIRST_SLOT + 1;
+}
+
+
+int AvHHeavyMachineGun::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_FIRST_SLOT;
+	p->iPosition = 3;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = "HMGAmmo";
+	p->iMaxAmmo1 = BALANCE_IVAR(kHMGMaxAmmo);
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kHMGDamage);
+	p->iMaxClip = BALANCE_IVAR(kHMGMaxClip);
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | PRIMARY_WEAPON;
+	p->iId = AVH_WEAPON_HMG;
+	p->iWeight = kSpecialPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHHeavyMachineGun::iItemSlot(void)
+{
+	return AVH_FIRST_SLOT + 1;
+}
+
+
+int AvHGrenadeGun::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_FIRST_SLOT;
+	p->iPosition = 8;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = "GrenadeAmmo";
+	p->iMaxAmmo1 = BALANCE_IVAR(kGGMaxAmmo);
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kGrenadeDamage);
+ 	p->iMaxClip = BALANCE_IVAR(kGGMaxClip);
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | PRIMARY_WEAPON;
+	p->iId = AVH_WEAPON_GRENADE_GUN;
+	p->iWeight = kSpecialPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHGrenadeGun::iItemSlot(void)
+{
+	return AVH_FIRST_SLOT + 1;
+}
+
+
+int AvHHealingSpray::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_SECOND_SLOT;
+	p->iPosition = 1;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;
+	p->iMaxAmmo1 = -1;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kHealingSprayDamage);
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ITEM_FLAG_SELECTONEMPTY | ONE_HIVE_REQUIRED;
+	p->iId = AVH_WEAPON_HEALINGSPRAY;
+	p->iWeight = kDefaultPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHHealingSpray::iItemSlot(void)
+{
+	return AVH_SECOND_SLOT + 1;
+}
+
+
+
+
+
+///////////////////
+// Alien weapons //
+///////////////////
+
+int AvHSpikeGun::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_SECOND_SLOT;
+	p->iPosition = 7;
+
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;//"SpikeAmmo";
+	p->iMaxAmmo1 = -1;//kSpikeMaxClip;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kSpikeDamage);
+	p->iMaxClip = WEAPON_NOCLIP;//kSpikeMaxClip;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ITEM_FLAG_SELECTONEMPTY;
+	p->iId = AVH_WEAPON_SPIKE;
+	p->iWeight = kDefaultPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHSpikeGun::iItemSlot(void)
+{
+	return AVH_SECOND_SLOT + 1;
+}
+
+
+int AvHUmbraGun::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_THIRD_SLOT;
+	p->iPosition = 7;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;
+	p->iMaxAmmo1 = -1;//kSpikeMaxClip;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kUmbraCloudDuration);
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ONE_HIVE_REQUIRED | TWO_HIVES_REQUIRED;
+	p->iId = AVH_WEAPON_UMBRA;
+	p->iWeight = kDefaultPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHUmbraGun::iItemSlot(void)
+{
+	return AVH_THIRD_SLOT + 1;
+}
+
+
+//int AvHBabblerGun::GetItemInfo(ItemInfo *p) const
+//{
+//	p->iSlot = AVH_FOURTH_SLOT;
+//	p->iPosition = 3;
+//
+//	p->pszName = STRING(pev->classname);
+//	p->pszAmmo1 = "BabblerAmmo";
+//	p->iMaxAmmo1 = -1;
+//	p->pszAmmo2 = NULL;
+//	p->iMaxAmmo2 = -1;
+//	p->iMaxClip = WEAPON_NOCLIP;
+//	p->iId = AVH_WEAPON_BABBLER;
+//	p->iWeight = kDefaultPrimaryWeaponWeight;
+//	p->iFlags =  ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ONE_HIVE_REQUIRED | TWO_HIVES_REQUIRED | THREE_HIVES_REQUIRED;
+//
+//	return 1;
+//}
+//
+//
+//int	AvHBabblerGun::iItemSlot(void)
+//{
+//	return AVH_FOURTH_SLOT + 1;
+//}
+
+
+int AvHBileBombGun::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_THIRD_SLOT;
+	p->iPosition = 3;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;
+	p->iMaxAmmo1 = -1;//kSpikeMaxClip;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kBileBombDamage);
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ONE_HIVE_REQUIRED | TWO_HIVES_REQUIRED;
+	p->iId = AVH_WEAPON_BILEBOMB;
+	p->iWeight = kDefaultPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHBileBombGun::iItemSlot(void)
+{
+	return AVH_THIRD_SLOT + 1;
+}
+
+
+
+int	AvHSwipe::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_FIRST_SLOT;
+	p->iPosition = 6;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;
+	p->iMaxAmmo1 = -1;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kSwipeDamage);
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ITEM_FLAG_SELECTONEMPTY;
+	p->iId = AVH_WEAPON_SWIPE;
+	p->iWeight = kDefaultPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHSwipe::iItemSlot(void)
+{
+	return AVH_FIRST_SLOT + 1;
+}
+
+
+
+
+int	AvHClaws::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_FIRST_SLOT;
+	p->iPosition = 5;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;
+	p->iMaxAmmo1 = -1;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kClawsDamage);
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ITEM_FLAG_SELECTONEMPTY;
+	p->iId = AVH_WEAPON_CLAWS;
+	p->iWeight = kDefaultPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHClaws::iItemSlot(void)
+{
+	return AVH_FIRST_SLOT + 1;
+}
+
+
+
+int AvHBite::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_FIRST_SLOT;
+	p->iPosition = 4;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;
+	p->iMaxAmmo1 = -1;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kBiteDamage);
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ITEM_FLAG_SELECTONEMPTY;
+	p->iId = AVH_WEAPON_BITE;
+	p->iWeight = kDefaultPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHBite::iItemSlot(void)
+{
+	return AVH_FIRST_SLOT + 1;
+}
+
+
+int AvHBite2::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_FIRST_SLOT;
+	p->iPosition = 9;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;
+	p->iMaxAmmo1 = -1;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kBite2Damage);
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ITEM_FLAG_SELECTONEMPTY;
+	p->iId = AVH_WEAPON_BITE2;
+	p->iWeight = kDefaultPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHBite2::iItemSlot(void)
+{
+	return AVH_FIRST_SLOT + 1;
+}
+
+
+//int	AvHResourceTowerGun::GetItemInfo(ItemInfo *p) const
+//{
+//	p->iSlot = AVH_FIRST_SLOT;
+//	p->iPosition = 7;
+//	
+//	p->pszName = STRING(pev->classname);
+//	p->pszAmmo1 = NULL;
+//	p->iMaxAmmo1 = -1;
+//	p->pszAmmo2 = NULL;
+//	p->iMaxAmmo2 = -1;
+//	p->iMaxClip = WEAPON_NOCLIP;
+//	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY + ITEM_FLAG_NOAUTORELOAD + ITEM_FLAG_SELECTONEMPTY;
+//	p->iId = AVH_WEAPON_RESOURCE_TOWER;
+//	p->iWeight = 7;
+//	
+//	return 1;
+//}
+//
+//int	AvHResourceTowerGun::iItemSlot(void)
+//{
+//	return AVH_FIRST_SLOT + 1;
+//}
+
+
+
+int AvHSpitGun::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_FIRST_SLOT;
+	p->iPosition = 7;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;
+	p->iMaxAmmo1 = -1;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kSpitGDamage);
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ITEM_FLAG_SELECTONEMPTY;
+	p->iId = AVH_WEAPON_SPIT;
+	p->iWeight = kDefaultPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHSpitGun::iItemSlot(void)
+{
+	return AVH_FIRST_SLOT + 1;
+}
+
+
+
+
+int	AvHSpore::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_SECOND_SLOT;
+	p->iPosition = 6;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;
+	p->iMaxAmmo1 = -1;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = (int)(BALANCE_IVAR(kSporeDamage)/BALANCE_FVAR(kSporeCloudThinkInterval));
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ITEM_FLAG_SELECTONEMPTY | ONE_HIVE_REQUIRED;
+	p->iId = AVH_WEAPON_SPORES;
+	p->iWeight = kDefaultPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHSpore::iItemSlot(void)
+{
+	return AVH_SECOND_SLOT + 1;
+}
+
+
+int	AvHParasiteGun::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_SECOND_SLOT;
+	p->iPosition = 3;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;
+	p->iMaxAmmo1 = -1;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kParasiteDamage);
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ITEM_FLAG_SELECTONEMPTY | ONE_HIVE_REQUIRED;
+	p->iId = AVH_WEAPON_PARASITE;
+	p->iWeight = kDefaultPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHParasiteGun::iItemSlot(void)
+{
+	return AVH_SECOND_SLOT + 1;
+}
+
+
+
+int	AvHGrenade::GetItemInfo(ItemInfo *p) const
+{
+    p->iSlot = AVH_FOURTH_SLOT;
+    p->iPosition = 2;
+
+    p->pszName = STRING(pev->classname);
+    p->pszAmmo1 = "HandGrenadeAmmo";
+    p->iMaxAmmo1 = BALANCE_IVAR(kHandGrenadeMaxAmmo);
+    p->pszAmmo2 = NULL;
+    p->iMaxAmmo2 = BALANCE_IVAR(kHandGrenadeDamage);
+    p->iMaxClip = 1;
+    p->iFlags = ITEM_FLAG_EXHAUSTIBLE;
+    p->iId = AVH_WEAPON_GRENADE;
+    p->iWeight = kGrenadeWeaponWeight;
+    
+    return 1;
+}
+
+int	AvHGrenade::iItemSlot(void)
+{
+    return AVH_FOURTH_SLOT + 1;
+}
+
+
+int	AvHWebSpinner::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_FOURTH_SLOT;
+	p->iPosition = 1;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;
+	p->iMaxAmmo1 = -1;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = -1;
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ITEM_FLAG_SELECTONEMPTY | ONE_HIVE_REQUIRED | TWO_HIVES_REQUIRED | THREE_HIVES_REQUIRED;
+	p->iId = AVH_WEAPON_WEBSPINNER;
+	p->iWeight = kDefaultPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHWebSpinner::iItemSlot(void)
+{
+	return AVH_FOURTH_SLOT + 1;
+}
+
+int AvHLeap::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_THIRD_SLOT;
+	p->iPosition = 5;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;
+	p->iMaxAmmo1 = -1;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kLeapDamage);
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ONE_HIVE_REQUIRED | TWO_HIVES_REQUIRED;
+	p->iId = AVH_ABILITY_LEAP;
+	p->iWeight = kDefaultPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHLeap::iItemSlot(void)
+{
+	return AVH_THIRD_SLOT + 1;
+}
+
+
+int AvHPrimalScream::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_FOURTH_SLOT;
+	p->iPosition = 4;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = "";
+	p->iMaxAmmo1 = -1;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kPrimalScreamRange);
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ONE_HIVE_REQUIRED | TWO_HIVES_REQUIRED | THREE_HIVES_REQUIRED;
+	p->iId = AVH_WEAPON_PRIMALSCREAM;
+	p->iWeight = kDefaultPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHPrimalScream::iItemSlot(void)
+{
+	return AVH_FOURTH_SLOT + 1;
+}
+
+int	AvHMetabolize::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_THIRD_SLOT;
+	p->iPosition = 2;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;
+	p->iMaxAmmo1 = -1;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = -1;
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ITEM_FLAG_SELECTONEMPTY | ONE_HIVE_REQUIRED | TWO_HIVES_REQUIRED;
+	p->iId = AVH_WEAPON_METABOLIZE;
+	p->iWeight = 7;
+	
+	return 1;
+}
+
+int	AvHMetabolize::iItemSlot(void)
+{
+	return AVH_THIRD_SLOT + 1;
+}
+
+
+
+//int	AvHParalysisGun::GetItemInfo(ItemInfo *p)
+//{
+//	p->iSlot = AVH_SECOND_SLOT;
+//	p->iPosition = 5;
+//	
+//	p->pszName = STRING(pev->classname);
+//	p->pszAmmo1 = NULL;
+//	p->iMaxAmmo1 = -1;
+//	p->pszAmmo2 = NULL;
+//	p->iMaxAmmo2 = -1;
+//	p->iMaxClip = WEAPON_NOCLIP;
+//	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ITEM_FLAG_SELECTONEMPTY | ONE_HIVE_REQUIRED | TWO_HIVES_REQUIRED;
+//	p->iId = AVH_WEAPON_PARALYSIS;
+//	p->iWeight = 7;
+//	
+//	return 1;
+//}
+//
+//int	AvHParalysisGun::iItemSlot(void)
+//{
+//	return AVH_SECOND_SLOT + 1;
+//}
+
+int	AvHAcidRocketGun::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_FOURTH_SLOT;
+	p->iPosition = 7;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;
+	p->iMaxAmmo1 = -1;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kAcidRocketDamage);
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ITEM_FLAG_SELECTONEMPTY | ONE_HIVE_REQUIRED | TWO_HIVES_REQUIRED | THREE_HIVES_REQUIRED;
+	p->iId = AVH_WEAPON_ACIDROCKET;
+	p->iWeight = kDefaultPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHAcidRocketGun::iItemSlot(void)
+{
+	return AVH_FOURTH_SLOT + 1;
+}
+
+
+
+int	AvHBlinkGun::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_SECOND_SLOT;
+	p->iPosition = 4;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;
+	p->iMaxAmmo1 = -1;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = -1;
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ITEM_FLAG_SELECTONEMPTY | ONE_HIVE_REQUIRED;
+	p->iId = AVH_WEAPON_BLINK;
+	p->iWeight = kDefaultPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHBlinkGun::iItemSlot(void)
+{
+	return AVH_SECOND_SLOT + 1;
+}
+
+
+int	AvHDivineWind::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_FOURTH_SLOT;
+	p->iPosition = 5;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;
+	p->iMaxAmmo1 = -1;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kDivineWindDamage);
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ITEM_FLAG_SELECTONEMPTY | ONE_HIVE_REQUIRED | TWO_HIVES_REQUIRED | THREE_HIVES_REQUIRED;
+	p->iId = AVH_WEAPON_DIVINEWIND;
+	p->iWeight = kDefaultPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHDivineWind::iItemSlot(void)
+{
+	return AVH_FOURTH_SLOT + 1;
+}
+
+
+
+int AvHCharge::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_FOURTH_SLOT;
+	p->iPosition = 6;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;
+	p->iMaxAmmo1 = -1;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kChargeDamage);
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ONE_HIVE_REQUIRED | TWO_HIVES_REQUIRED | THREE_HIVES_REQUIRED;
+	p->iId = AVH_ABILITY_CHARGE;
+	p->iWeight = kDefaultPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHCharge::iItemSlot(void)
+{
+	return AVH_FOURTH_SLOT + 1;
+}
+
+int AvHStomp::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_THIRD_SLOT;
+	p->iPosition = 4;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;
+	p->iMaxAmmo1 = -1;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = (int)BALANCE_FVAR(kStompTime);
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ONE_HIVE_REQUIRED | TWO_HIVES_REQUIRED;
+	p->iId = AVH_WEAPON_STOMP;
+	p->iWeight = kDefaultPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHStomp::iItemSlot(void)
+{
+	return AVH_THIRD_SLOT + 1;
+}
+
+
+int AvHDevour::GetItemInfo(ItemInfo *p) const
+{
+	p->iSlot = AVH_SECOND_SLOT;
+	p->iPosition = 5;
+	
+	p->pszName = STRING(pev->classname);
+	p->pszAmmo1 = NULL;
+	p->iMaxAmmo1 = -1;
+	p->pszAmmo2 = NULL;
+	p->iMaxAmmo2 = BALANCE_IVAR(kDevourDamage);
+	p->iMaxClip = WEAPON_NOCLIP;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHEMPTY | ITEM_FLAG_NOAUTORELOAD | ONE_HIVE_REQUIRED;
+	p->iId = AVH_WEAPON_DEVOUR;
+	p->iWeight = kDefaultPrimaryWeaponWeight;
+	
+	return 1;
+}
+
+int	AvHDevour::iItemSlot(void)
+{
+	return AVH_SECOND_SLOT + 1;
+}
+
+
+
+
diff --git a/main/source/mod/AvHKnife.cpp b/main/source/mod/AvHKnife.cpp
new file mode 100644
index 00000000..80e09661
--- /dev/null
+++ b/main/source/mod/AvHKnife.cpp
@@ -0,0 +1,263 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHKnife.cpp $
+// $Date: 2002/11/22 21:28:16 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHKnife.cpp,v $
+// Revision 1.17  2002/11/22 21:28:16  Flayra
+// - mp_consistency changes
+//
+// Revision 1.16  2002/11/06 01:38:37  Flayra
+// - Added ability for buildings to be enabled and disabled, for turrets to be shut down
+// - Damage refactoring (TakeDamage assumes caller has already adjusted for friendly fire, etc.)
+//
+// Revision 1.15  2002/10/03 18:45:33  Flayra
+// - Added heavy view models
+// - Added new flavor anim (knife flourish)
+//
+// Revision 1.14  2002/08/09 01:04:23  Flayra
+// - Knife is faster to deploy
+//
+// Revision 1.13  2002/07/24 19:09:17  Flayra
+// - Linux issues
+//
+// Revision 1.12  2002/07/24 18:55:52  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.11  2002/07/24 18:45:42  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.10  2002/07/08 16:48:42  Flayra
+// - Melee weapons don't play hit sounds or punchangle target if they didn't damage them
+//
+// Revision 1.9  2002/06/25 17:50:59  Flayra
+// - Reworking for correct player animations and new enable/disable state, new view model artwork, alien weapon refactoring
+//
+// Revision 1.8  2002/06/10 19:57:39  Flayra
+// - Updated with new knife artwork
+//
+// Revision 1.7  2002/06/03 16:37:31  Flayra
+// - Constants and tweaks to make weapon anims and times correct with new artwork, added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.6  2002/05/28 17:44:58  Flayra
+// - Tweak weapon deploy volume, as Valve's sounds weren't normalized
+//
+// Revision 1.5  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHMarineWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHMarineWeapons.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHGamerules.h"
+#include "mod/AvHServerUtil.h"
+#endif
+
+LINK_ENTITY_TO_CLASS(kwKnife, AvHKnife);
+void V_PunchAxis( int axis, float punch );
+
+int	AvHKnife::GetDeployAnimation() const
+{
+	return 4;
+}
+
+float AvHKnife::GetDeployTime() const
+{
+	return .25f;
+}
+
+char* AvHKnife::GetDeploySound() const
+{
+	return kKNDeploySound;
+}
+
+char* AvHKnife::GetHeavyViewModel() const
+{
+	return kKNHVVModel;
+}
+
+int	AvHKnife::GetIdleAnimation() const
+{
+	// Only play the poking-finger animation once in awhile and play the knife flourish once in a blue moon, it's a special treat
+	int iAnim;
+	int theRandomNum = UTIL_SharedRandomLong(this->m_pPlayer->random_seed, 0, 200);
+
+	if(theRandomNum == 0)
+	{
+		iAnim = 5;
+	}
+	else if(theRandomNum < 16)
+	{
+		iAnim = kIdleAnimationTwo;	
+	}
+	else
+	{
+		iAnim = kIdleAnimationOne;
+	}
+
+	return iAnim;
+}
+
+bool AvHKnife::GetMustPressTriggerForEachShot() const
+{ 
+	return true;
+}
+
+char* AvHKnife::GetPlayerModel() const
+{
+	return kKNPModel;
+}
+
+char* AvHKnife::GetViewModel() const
+{
+	return kKNVModel;
+}
+
+char* AvHKnife::GetWorldModel() const
+{
+	return kKNWModel;
+}
+
+void AvHKnife::Init()
+{
+	this->mRange = kKNRange;
+	this->mDamage = BALANCE_IVAR(kKNDamage);
+}
+
+void AvHKnife::FireProjectiles(void)
+{
+#ifdef AVH_SERVER
+	
+	// TODO: Check team
+	
+	// Do trace hull here
+	float theDamage = this->mDamage;
+	CBaseEntity* pHurt = this->m_pPlayer->CheckTraceHullAttack(kKNRange, theDamage, DMG_SLASH);
+	if(pHurt)
+	{
+		char* theSoundToPlay = NULL;
+
+		if(pHurt->pev->flags & (FL_MONSTER | FL_CLIENT))
+		{
+            //AvHSUKnockPlayerAbout(CBaseEntity::Instance(this->m_pPlayer->edict()), pHurt, 300);
+			
+			int theSoundIndex = RANDOM_LONG(0, 2);
+			switch(theSoundIndex)
+			{
+			case 0:
+				theSoundToPlay = kKNHitSound1;
+				break;
+			case 1:
+				theSoundToPlay = kKNHitSound2;
+				break;
+			}
+		}
+		else
+		{
+			theSoundToPlay = kKNHitWallSound;
+		}
+
+		if(theSoundToPlay)
+		{
+			EMIT_SOUND(ENT(pev), CHAN_WEAPON, theSoundToPlay, 1.0, ATTN_NORM);
+		}
+	}
+	
+#endif	
+}
+
+int	AvHKnife::GetBarrelLength() const
+{
+	return kKNBarrelLength;
+}
+
+float AvHKnife::GetRateOfFire() const
+{
+	return BALANCE_FVAR(kKNROF);
+}
+
+bool AvHKnife::GetFiresUnderwater() const
+{
+	return true;
+}
+
+bool AvHKnife::GetIsDroppable() const
+{
+	return false;
+}
+
+int	AvHKnife::GetShootAnimation() const
+{
+	// CS artwork
+	//return 5 + UTIL_SharedRandomLong(this->m_pPlayer->random_seed, 0, 2);
+	return 2 + UTIL_SharedRandomLong(this->m_pPlayer->random_seed, 0, 1);
+}
+
+BOOL AvHKnife::IsUseable(void)
+{
+	return true;
+}
+
+void AvHKnife::Precache()
+{
+	AvHMarineWeapon::Precache();
+
+	PRECACHE_UNMODIFIED_SOUND(kKNFireSound1);
+	PRECACHE_UNMODIFIED_SOUND(kKNFireSound2);
+	PRECACHE_UNMODIFIED_SOUND(kKNHitSound1);
+	PRECACHE_UNMODIFIED_SOUND(kKNHitSound2);
+	PRECACHE_UNMODIFIED_SOUND(kKNHitWallSound);
+
+	this->mEvent = PRECACHE_EVENT(1, kKNEventName);
+}
+
+void AvHKnife::Spawn() 
+{ 
+    AvHMarineWeapon::Spawn(); 
+
+	Precache();
+
+	this->m_iId = AVH_WEAPON_KNIFE;
+	//this->m_iDefaultAmmo = kKNMaxClip;
+	
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsKnife);
+	
+	SET_MODEL(ENT(this->pev), kNullModel);
+	
+	FallInit();// get ready to fall down.
+} 
+
+
+bool AvHKnife::UsesAmmo(void) const
+{
+	return false;
+}
+
+BOOL AvHKnife::UseDecrement(void)
+{
+	return true;
+}
+
diff --git a/main/source/mod/AvHLogoutComponent.cpp b/main/source/mod/AvHLogoutComponent.cpp
new file mode 100644
index 00000000..e6d1aefc
--- /dev/null
+++ b/main/source/mod/AvHLogoutComponent.cpp
@@ -0,0 +1,48 @@
+#include "mod/AvHLogoutComponent.h"
+#include "ui/UITags.h"
+
+////////////////////////////////////
+// AvHLogoutComponent -> StaticLabel //
+////////////////////////////////////
+void AvHUILogoutComponent::AllocateComponent(const TRDescription& inDesc)
+{
+    // Width and height (normalized screen coords)
+    float theWidth = UIDefaultWidth;
+    float theHeight = UIDefaultHeight;
+    inDesc.GetTagValue(UITagWidth, theWidth);
+    inDesc.GetTagValue(UITagHeight, theHeight);
+	
+    this->mLogoutComponent = new AvHLogoutComponent(theWidth*ScreenWidth(), theHeight*ScreenHeight());
+}
+
+Panel* AvHUILogoutComponent::GetComponentPointer(void)
+{
+	return this->mLogoutComponent;
+}
+
+bool AvHUILogoutComponent::SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager)
+{
+    AvHLogoutComponent* theLogoutComponent = (AvHLogoutComponent*)inPanel;
+	
+    bool theSuccess = UIStaticLabel::SetClassProperties(inDesc, inPanel, inSchemeManager);
+    
+    if(theSuccess)
+    {
+		// Get font to use
+		std::string theSchemeName;
+		if(inDesc.GetTagValue(UITagScheme, theSchemeName))
+		{
+			const char* theSchemeCString = theSchemeName.c_str();
+			SchemeHandle_t theSchemeHandle = inSchemeManager->getSchemeHandle(theSchemeCString);
+			Font* theFont = inSchemeManager->getFont(theSchemeHandle);
+			if(theFont)
+			{
+				theLogoutComponent->setFont(theFont);
+			}
+		}
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
diff --git a/main/source/mod/AvHLogoutComponent.h b/main/source/mod/AvHLogoutComponent.h
new file mode 100644
index 00000000..401b5ae5
--- /dev/null
+++ b/main/source/mod/AvHLogoutComponent.h
@@ -0,0 +1,30 @@
+#ifndef AVHLOGOUTCOMPONENT_H
+#define AVHLOGOUTCOMPONENT_H
+
+#include "ui/UIComponents.h"
+#include "ui/StaticLabel.h"
+
+class AvHLogoutComponent : public StaticLabel
+{
+public:
+		AvHLogoutComponent(int wide, int tall) : StaticLabel(wide, tall) {}
+};
+
+
+class AvHUILogoutComponent : public UIStaticLabel
+{
+public:
+	virtual Panel*			GetComponentPointer(void);
+
+    virtual bool			SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager);
+	
+private:
+	
+	void                    AllocateComponent(const TRDescription& inDescription);
+	
+    AvHLogoutComponent*		mLogoutComponent;
+};
+
+
+
+#endif
diff --git a/main/source/mod/AvHMG.cpp b/main/source/mod/AvHMG.cpp
new file mode 100644
index 00000000..49076cd8
--- /dev/null
+++ b/main/source/mod/AvHMG.cpp
@@ -0,0 +1,385 @@
+/***
+*
+*	Copyright (c) 1999, 2000 Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+#include "util/nowarnings.h"
+#include "mod/AvHBasePlayerWeapon.h"
+#include "textrep/TRFactory.h"
+#include "mod/AvHWeaponFactory.h"
+
+AvHWeaponFactory gWeaponFactory;
+
+enum avhmg_e
+{
+	MG_LONGIDLE = 0,
+	MG_IDLE1,
+	MG_LAUNCH,
+	MG_RELOAD,
+	MG_DEPLOY,
+	MG_FIRE1,
+	MG_FIRE2,
+	MG_FIRE3,
+};
+
+
+class MG : public AvHBasePlayerWeapon
+{
+public:
+    MG();
+//	void Spawn( void );
+//	void Precache( void );
+//	int iItemSlot( void ) { return 3; }
+//	int GetItemInfo(ItemInfo *p);
+//	int AddToPlayer( CBasePlayer *pPlayer );
+//
+//	void PrimaryAttack( void );
+//	void SecondaryAttack( void );
+//	int SecondaryAmmoIndex( void );
+//	BOOL Deploy( void );
+//	void Reload( void );
+//	void WeaponIdle( void );
+//	float m_flNextAnimTime;
+//	int m_iShell;
+//private:
+//	unsigned short m_usMP5;
+};
+//LINK_ENTITY_TO_CLASS( weapon_mp5, MG );
+LINK_ENTITY_TO_CLASS( MachineGun, MG );
+
+
+//=========================================================
+//=========================================================
+//int MG::SecondaryAmmoIndex( void )
+//{
+//	return m_iSecondaryAmmoType;
+//}
+
+MG::MG() : AvHBasePlayerWeapon("MachineGun")
+{
+}
+//
+//void MG::Spawn( )
+//{
+//	pev->classname = MAKE_STRING("MachineGun"); // hack to allow for old names
+//	Precache( );
+//	SET_MODEL(ENT(pev), "models/w_9mmAR.mdl");
+//	m_iId = WEAPON_MP5;
+//
+//	m_iDefaultAmmo = MG_DEFAULT_GIVE;
+//
+//	FallInit();// get ready to fall down.
+//}
+//
+//
+//void MG::Precache( void )
+//{
+//    // TODO: Put this next line back in ASAP
+//    AvHBasePlayerWeapon::Precache();
+//
+//    //m_iShell = PRECACHE_MODEL ("models/shell.mdl");// brass shellTE_MODEL
+//
+//	PRECACHE_MODEL("models/grenade.mdl");	// grenade
+//
+//	PRECACHE_MODEL("models/w_9mmARclip.mdl");
+//	PRECACHE_SOUND("items/9mmclip1.wav");              
+//
+//	PRECACHE_SOUND("items/clipinsert1.wav");
+//	PRECACHE_SOUND("items/cliprelease1.wav");
+//    //	PRECACHE_SOUND("items/guncock1.wav");
+//}
+
+//int MG::GetItemInfo(ItemInfo *p)
+//{
+//	p->pszName = STRING(pev->classname);
+//	p->pszAmmo1 = "9mm";
+//	p->iMaxAmmo1 = _9MM_MAX_CARRY;
+//	p->pszAmmo2 = "ARgrenades";
+//	p->iMaxAmmo2 = M203_GRENADE_MAX_CARRY;
+//	p->iMaxClip = MG_MAX_CLIP;
+//	p->iSlot = 2;
+//	p->iPosition = 0;
+//	p->iFlags = 0;
+//	p->iId = m_iId = WEAPON_MP5;
+//	p->iWeight = MG_WEIGHT;
+//
+//	return 1;
+//}
+//
+//int MG::AddToPlayer( CBasePlayer *pPlayer )
+//{
+//	if ( CBasePlayerWeapon::AddToPlayer( pPlayer ) )
+//	{
+//		MESSAGE_BEGIN( MSG_ONE, gmsgWeapPickup, NULL, pPlayer->pev );
+//			WRITE_BYTE( m_iId );
+//		MESSAGE_END();
+//		return TRUE;
+//	}
+//	return FALSE;
+//}
+//
+//BOOL MG::Deploy( )
+//{
+//	return DefaultDeploy( "models/v_9mmAR.mdl", "models/p_9mmAR.mdl", MG_DEPLOY, "mp5" );
+//}
+//
+//
+//void MG::PrimaryAttack()
+//{
+//	// don't fire underwater
+//	if (m_pPlayer->pev->waterlevel == 3)
+//	{
+//		PlayEmptySound( );
+//		m_flNextPrimaryAttack = gpGlobals->time + 0.15;
+//		return;
+//	}
+//
+//    // CGC:
+//	//if (m_iClip <= 0)
+//	//{
+//	//	PlayEmptySound();
+//	//	m_flNextPrimaryAttack = gpGlobals->time + 0.15;
+//	//	return;
+//	//}
+//
+//	PLAYBACK_EVENT( 0, m_pPlayer->edict(), m_usMP5 );
+//
+//	m_pPlayer->m_iWeaponVolume = NORMAL_GUN_VOLUME;
+//	m_pPlayer->m_iWeaponFlash = NORMAL_GUN_FLASH;
+//
+//    // CGC:
+//	//m_iClip--;
+//
+//	// player "shoot" animation
+//	m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
+//
+//	Vector vecSrc	 = m_pPlayer->GetGunPosition( );
+//	Vector vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES );
+//	
+//	if ( g_pGameRules->IsDeathmatch() )
+//	{
+//		// optimized multiplayer. Widened to make it easier to hit a moving player
+//		m_pPlayer->FireBullets( 1, vecSrc, vecAiming, VECTOR_CONE_6DEGREES, 8192, BULLET_PLAYER_MP5, 2 );
+//	}
+//	else
+//	{
+//		// single player spread
+//		m_pPlayer->FireBullets( 1, vecSrc, vecAiming, VECTOR_CONE_3DEGREES, 8192, BULLET_PLAYER_MP5, 2 );
+//	}
+//
+//	// CGC
+//    //if (!m_iClip && m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] <= 0)
+//	//	// HEV suit - indicate out of ammo condition
+//	//	m_pPlayer->SetSuitUpdate("!HEV_AMO0", FALSE, 0);
+//
+//	m_flNextPrimaryAttack = m_flNextPrimaryAttack + 0.1;
+//	if (m_flNextPrimaryAttack < gpGlobals->time)
+//		m_flNextPrimaryAttack = gpGlobals->time + 0.1;
+//
+//	m_flTimeWeaponIdle = gpGlobals->time + RANDOM_FLOAT ( 10, 15 );
+//}
+//
+//
+//
+//void MG::SecondaryAttack( void )
+//{
+//	// don't fire underwater
+//	if (m_pPlayer->pev->waterlevel == 3)
+//	{
+//		PlayEmptySound( );
+//		m_flNextPrimaryAttack = gpGlobals->time + 0.15;
+//		return;
+//	}
+//
+//	if (m_pPlayer->m_rgAmmo[m_iSecondaryAmmoType] == 0)
+//	{
+//		PlayEmptySound( );
+//		return;
+//	}
+//
+//	m_pPlayer->m_iWeaponVolume = NORMAL_GUN_VOLUME;
+//	m_pPlayer->m_iWeaponFlash = BRIGHT_GUN_FLASH;
+//
+//	m_pPlayer->m_iExtraSoundTypes = bits_SOUND_DANGER;
+//	m_pPlayer->m_flStopExtraSoundTime = gpGlobals->time + 0.2;
+//			
+//	m_pPlayer->m_rgAmmo[m_iSecondaryAmmoType]--;
+//
+//	SendWeaponAnim( MG_LAUNCH );
+//
+//	// player "shoot" animation
+//	m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
+//
+//	if ( RANDOM_LONG(0,1) )
+//	{
+//		// play this sound through BODY channel so we can hear it if player didn't stop firing MP3
+//		EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/glauncher.wav", 0.8, ATTN_NORM);
+//	}
+//	else
+//	{
+//		// play this sound through BODY channel so we can hear it if player didn't stop firing MP3
+//		EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/glauncher2.wav", 0.8, ATTN_NORM);
+//	}
+// 
+//	UTIL_MakeVectors( m_pPlayer->pev->v_angle + m_pPlayer->pev->punchangle );
+//
+//	// we don't add in player velocity anymore.
+//	CGrenade::ShootContact( m_pPlayer->pev, 
+//							m_pPlayer->pev->origin + m_pPlayer->pev->view_ofs + gpGlobals->v_forward * 16, 
+//							gpGlobals->v_forward * 800 );
+//	
+//	m_flNextPrimaryAttack = gpGlobals->time + 1;
+//	m_flNextSecondaryAttack = gpGlobals->time + 1;
+//	m_flTimeWeaponIdle = gpGlobals->time + 5;// idle pretty soon after shooting.
+//
+//	if (!m_pPlayer->m_rgAmmo[m_iSecondaryAmmoType])
+//		// HEV suit - indicate out of ammo condition
+//		m_pPlayer->SetSuitUpdate("!HEV_AMO0", FALSE, 0);
+//
+//	m_pPlayer->pev->punchangle.x -= 10;
+//}
+//
+//void MG::Reload( void )
+//{
+//	DefaultReload( MG_MAX_CLIP, MG_RELOAD, 1.5 );
+//}
+//
+//
+//
+//void MG::WeaponIdle( void )
+//{
+//	ResetEmptySound( );
+//
+//	m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES );
+//
+//	if (m_flTimeWeaponIdle > gpGlobals->time)
+//		return;
+//
+//	int iAnim;
+//	switch ( RANDOM_LONG( 0, 1 ) )
+//	{
+//	case 0:	
+//		iAnim = MG_LONGIDLE;	
+//		break;
+//	
+//	default:
+//	case 1:
+//		iAnim = MG_IDLE1;
+//		break;
+//	}
+//
+//	SendWeaponAnim( iAnim );
+//
+//	m_flTimeWeaponIdle = gpGlobals->time + RANDOM_FLOAT ( 10, 15 );// how long till we do this again.
+//}
+
+
+
+class MGAmmoClip : public CBasePlayerAmmo
+{
+	void Spawn( void )
+	{ 
+		Precache( );
+		SET_MODEL(ENT(pev), "models/w_9mmARclip.mdl");
+		CBasePlayerAmmo::Spawn( );
+	}
+	void Precache( void )
+	{
+		PRECACHE_MODEL ("models/w_9mmARclip.mdl");
+		PRECACHE_SOUND("items/9mmclip1.wav");
+	}
+	BOOL AddAmmo( CBaseEntity *pOther ) 
+	{ 
+		int bResult = (pOther->GiveAmmo( AMMO_MP5CLIP_GIVE, "9mm", _9MM_MAX_CARRY) != -1);
+		if (bResult)
+		{
+			EMIT_SOUND(ENT(pev), CHAN_ITEM, "items/9mmclip1.wav", 1, ATTN_NORM);
+		}
+		return bResult;
+	}
+};
+LINK_ENTITY_TO_CLASS( ammo_mp5clip, MGAmmoClip );
+LINK_ENTITY_TO_CLASS( ammo_9mmAR, MGAmmoClip );
+
+
+
+class MGChainammo : public CBasePlayerAmmo
+{
+	void Spawn( void )
+	{ 
+		Precache( );
+		SET_MODEL(ENT(pev), "models/w_chainammo.mdl");
+		CBasePlayerAmmo::Spawn( );
+	}
+	void Precache( void )
+	{
+		PRECACHE_MODEL ("models/w_chainammo.mdl");
+		PRECACHE_SOUND("items/9mmclip1.wav");
+	}
+	BOOL AddAmmo( CBaseEntity *pOther ) 
+	{ 
+		int bResult = (pOther->GiveAmmo( AMMO_CHAINBOX_GIVE, "9mm", _9MM_MAX_CARRY) != -1);
+		if (bResult)
+		{
+			EMIT_SOUND(ENT(pev), CHAN_ITEM, "items/9mmclip1.wav", 1, ATTN_NORM);
+		}
+		return bResult;
+	}
+};
+LINK_ENTITY_TO_CLASS( ammo_9mmbox, MGChainammo );
+
+
+class MGAmmoGrenade : public CBasePlayerAmmo
+{
+	void Spawn( void )
+	{ 
+		Precache( );
+		SET_MODEL(ENT(pev), "models/w_ARgrenade.mdl");
+		CBasePlayerAmmo::Spawn( );
+	}
+	void Precache( void )
+	{
+		PRECACHE_MODEL ("models/w_ARgrenade.mdl");
+		PRECACHE_SOUND("items/9mmclip1.wav");
+	}
+	BOOL AddAmmo( CBaseEntity *pOther ) 
+	{ 
+		int bResult = (pOther->GiveAmmo( AMMO_M203BOX_GIVE, "ARgrenades", M203_GRENADE_MAX_CARRY ) != -1);
+
+		if (bResult)
+		{
+			EMIT_SOUND(ENT(pev), CHAN_ITEM, "items/9mmclip1.wav", 1, ATTN_NORM);
+		}
+		return bResult;
+	}
+};
+LINK_ENTITY_TO_CLASS( ammo_mp5grenades, MGAmmoGrenade );
+LINK_ENTITY_TO_CLASS( ammo_ARgrenades, MGAmmoGrenade );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/main/source/mod/AvHMachineGun.cpp b/main/source/mod/AvHMachineGun.cpp
new file mode 100644
index 00000000..026d325d
--- /dev/null
+++ b/main/source/mod/AvHMachineGun.cpp
@@ -0,0 +1,182 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHMachineGun.cpp $
+// $Date: 2002/11/22 21:28:16 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHMachineGun.cpp,v $
+// Revision 1.23  2002/11/22 21:28:16  Flayra
+// - mp_consistency changes
+//
+// Revision 1.22  2002/10/16 20:53:09  Flayra
+// - Removed weapon upgrade sounds
+//
+// Revision 1.21  2002/10/03 18:46:11  Flayra
+// - Added heavy view model
+//
+// Revision 1.20  2002/08/31 18:01:02  Flayra
+// - Work at VALVe
+//
+// Revision 1.19  2002/08/16 02:44:11  Flayra
+// - New damage types
+//
+// Revision 1.18  2002/08/09 01:04:32  Flayra
+// - MG is faster to deploy
+//
+// Revision 1.17  2002/07/26 23:05:15  Flayra
+// - Tweak
+//
+// Revision 1.16  2002/07/24 19:09:17  Flayra
+// - Linux issues
+//
+// Revision 1.15  2002/07/24 18:45:42  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.14  2002/07/08 17:08:52  Flayra
+// - Tweaked for bullet spread
+//
+// Revision 1.13  2002/06/25 17:50:59  Flayra
+// - Reworking for correct player animations and new enable/disable state, new view model artwork, alien weapon refactoring
+//
+// Revision 1.12  2002/06/03 16:37:31  Flayra
+// - Constants and tweaks to make weapon anims and times correct with new artwork, added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.11  2002/05/28 17:44:58  Flayra
+// - Tweak weapon deploy volume, as Valve's sounds weren't normalized
+//
+// Revision 1.10  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHMarineWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHMarineWeapons.h"
+#include "dlls/util.h"
+#include "mod/AvHBalance.h"
+
+LINK_ENTITY_TO_CLASS(kwMachineGun, AvHMachineGun);
+void V_PunchAxis( int axis, float punch );
+
+void AvHMachineGun::Init()
+{
+	this->mRange = kMGRange;
+	this->mDamage = BALANCE_IVAR(kMGDamage);
+}
+
+int	AvHMachineGun::GetBarrelLength() const
+{
+	return kMGBarrelLength;
+}
+
+float AvHMachineGun::GetRateOfFire() const
+{
+	return BALANCE_FVAR(kMGROF);
+}
+
+int	AvHMachineGun::GetDamageType() const
+{
+	//return NS_DMG_PIERCING;
+	return NS_DMG_NORMAL;
+}
+
+char* AvHMachineGun::GetDeploySound() const
+{
+	return kMGDeploySound;
+}
+
+float AvHMachineGun::GetDeployTime() const
+{
+	return .4f;
+}
+
+bool AvHMachineGun::GetHasMuzzleFlash() const
+{
+	return true;
+}
+
+char* AvHMachineGun::GetHeavyViewModel() const
+{
+	return kMGHVVModel;
+}
+
+char* AvHMachineGun::GetPlayerModel() const
+{
+	return kMGPModel;
+}
+
+char* AvHMachineGun::GetViewModel() const
+{
+	return kMGVModel;
+}
+
+char* AvHMachineGun::GetWorldModel() const
+{
+	return kMGWModel;
+}
+
+float AvHMachineGun::GetReloadTime(void) const
+{
+	return 3.0f;
+}
+
+Vector AvHMachineGun::GetProjectileSpread() const
+{
+	return kMGSpread;
+}
+
+void AvHMachineGun::Precache()
+{
+	AvHMarineWeapon::Precache();
+
+	PRECACHE_UNMODIFIED_MODEL(kMGEjectModel);
+	
+	PRECACHE_UNMODIFIED_SOUND(kMGFireSound1);
+	PRECACHE_UNMODIFIED_SOUND(kMGReloadSound);
+	
+	#ifdef AVH_UPGRADE_SOUNDS
+	PRECACHE_UNMODIFIED_SOUND(kMGFireSound2);
+	PRECACHE_UNMODIFIED_SOUND(kMGFireSound3);
+	PRECACHE_UNMODIFIED_SOUND(kMGFireSound4);
+	#endif
+
+	PRECACHE_UNMODIFIED_MODEL(kGenericWallpuff);
+	
+	this->mEvent = PRECACHE_EVENT(1, kMGEventName);
+}
+
+
+void AvHMachineGun::Spawn() 
+{ 
+    AvHMarineWeapon::Spawn(); 
+
+	Precache();
+
+	this->m_iId = AVH_WEAPON_MG;
+	this->m_iDefaultAmmo = BALANCE_IVAR(kMGMaxClip)*BALANCE_IVAR(kMarineSpawnClips);
+
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsMachineGun);
+
+	SET_MODEL(ENT(this->pev), kMGWModel);
+
+	FallInit();// get ready to fall down.
+} 
diff --git a/main/source/mod/AvHMapExtents.cpp b/main/source/mod/AvHMapExtents.cpp
new file mode 100644
index 00000000..6000172f
--- /dev/null
+++ b/main/source/mod/AvHMapExtents.cpp
@@ -0,0 +1,195 @@
+#include "util/nowarnings.h"
+#include "types.h"
+#include "mod/AvHMapExtents.h"
+#include "mod/AvHConstants.h"
+
+#ifdef AVH_SERVER
+#include "dlls/extdll.h"
+#include "util.h"
+#include "dlls/cbase.h"
+#include "engine/shake.h"
+#include "dlls/decals.h"
+#include "dlls/gamerules.h"
+#include "mod/AvHServerUtil.h"
+#endif
+
+#ifdef AVH_CLIENT
+#include "cl_dll/parsemsg.h"
+#endif
+
+AvHMapExtents::AvHMapExtents()
+{
+	this->ResetMapExtents();
+}
+
+#ifdef AVH_SERVER
+void AvHMapExtents::CalculateMapExtents()
+{
+	if(!this->mCalculatedMapExtents)
+	{
+		// Fetch from map extents entity if the map has one
+		FOR_ALL_ENTITIES(kwsMapInfoClassName, AvHMapInfo*)
+			*this = theEntity->GetMapExtents();
+		END_FOR_ALL_ENTITIES(kwsMapInfoClassName)
+
+		this->mCalculatedMapExtents = true;
+	}
+}
+#endif
+
+void AvHMapExtents::ResetMapExtents()
+{
+	// Set defaults
+	this->mMaxViewHeight = kDefaultViewHeight;
+	this->mMinViewHeight = kDefaultMinMapExtent;
+	this->mMinMapX = this->mMinMapY = kDefaultMinMapExtent;
+	this->mMaxMapX = this->mMaxMapY = kDefaultMaxMapExtent;
+	this->mDrawMapBG = true;
+	this->mCalculatedMapExtents = false;
+	
+	#ifdef AVH_SERVER
+	this->mTopDownCullDistance = kMaxRelevantCullDistance;
+	#endif
+}
+
+float AvHMapExtents::GetMinViewHeight() const
+{
+	return this->mMinViewHeight;
+}
+
+float AvHMapExtents::GetMaxViewHeight() const
+{
+	return this->mMaxViewHeight;
+}
+
+void AvHMapExtents::SetMinViewHeight(float inViewHeight)
+{
+	this->mMinViewHeight = inViewHeight;
+}
+
+void AvHMapExtents::SetMaxViewHeight(float inViewHeight)
+{
+	this->mMaxViewHeight = inViewHeight;
+}
+
+
+
+float AvHMapExtents::GetMinMapX() const
+{
+	return this->mMinMapX;
+}
+
+float AvHMapExtents::GetMaxMapX() const
+{
+	return this->mMaxMapX;
+}
+
+void AvHMapExtents::SetMinMapX(float inMapX)
+{
+	this->mMinMapX = inMapX;
+	if(this->mMinMapX < -kMaxMapDimension)
+	{
+		this->mMinMapX = -kMaxMapDimension;
+	}
+}
+
+void AvHMapExtents::SetMaxMapX(float inMapX)
+{
+	this->mMaxMapX = inMapX;
+
+	if(this->mMaxMapX > kMaxMapDimension)
+	{
+		this->mMaxMapX = kMaxMapDimension;
+	}
+}
+
+
+float AvHMapExtents::GetMinMapY() const
+{
+	return this->mMinMapY;
+}
+
+float AvHMapExtents::GetMaxMapY() const
+{
+	return this->mMaxMapY;
+}
+
+void AvHMapExtents::SetMinMapY(float inMapY)
+{
+	this->mMinMapY = inMapY;
+	if(this->mMinMapY < -kMaxMapDimension)
+	{
+		this->mMinMapY = -kMaxMapDimension;
+	}
+}
+
+void AvHMapExtents::SetMaxMapY(float inMapY)
+{
+	this->mMaxMapY = inMapY;
+	if(this->mMaxMapY > kMaxMapDimension)
+	{
+		this->mMaxMapY = kMaxMapDimension;
+	}
+}
+
+
+bool AvHMapExtents::GetDrawMapBG() const
+{
+	return this->mDrawMapBG;
+}
+
+void AvHMapExtents::SetDrawMapBG(bool inDrawMapBG)
+{
+	this->mDrawMapBG = inDrawMapBG;
+}
+
+#ifdef AVH_SERVER
+float AvHMapExtents::GetTopDownCullDistance() const
+{
+	return this->mTopDownCullDistance;
+}
+
+void AvHMapExtents::SetTopDownCullDistance(float inCullDistance)
+{
+	ASSERT(inCullDistance > 0);
+	this->mTopDownCullDistance = inCullDistance;
+}
+
+
+void AvHMapExtents::SendToNetworkStream() const
+{
+	WRITE_COORD(this->mMinViewHeight);
+	WRITE_COORD(this->mMaxViewHeight);
+	
+	WRITE_COORD(this->mMinMapX);
+	WRITE_COORD(this->mMinMapY);
+	WRITE_COORD(this->mMaxMapX);
+	WRITE_COORD(this->mMaxMapY);
+	
+	WRITE_BYTE(this->mDrawMapBG);
+}
+#endif
+
+#ifdef AVH_CLIENT
+int	AvHMapExtents::ReceiveFromNetworkStream()
+{
+	int theBytesRead = 0;
+
+	this->mMinViewHeight = READ_COORD();
+	this->mMaxViewHeight = READ_COORD();
+
+	this->mMinMapX = READ_COORD();
+	this->mMinMapY = READ_COORD();
+
+	this->mMaxMapX = READ_COORD();
+	this->mMaxMapY = READ_COORD();
+	theBytesRead += 2*6;
+	
+	this->mDrawMapBG = READ_BYTE();
+	theBytesRead++;
+	
+	return theBytesRead;
+}
+#endif
+
+
diff --git a/main/source/mod/AvHMapExtents.h b/main/source/mod/AvHMapExtents.h
new file mode 100644
index 00000000..c6486c02
--- /dev/null
+++ b/main/source/mod/AvHMapExtents.h
@@ -0,0 +1,63 @@
+#ifndef AVH_MAP_EXTENTS_H
+#define AVH_MAP_EXTENTS_H
+
+class AvHMapExtents
+{
+public:
+						AvHMapExtents();
+
+	#ifdef AVH_SERVER
+	void				CalculateMapExtents();
+	#endif
+
+	void				ResetMapExtents();
+
+	float				GetMinViewHeight() const;
+	float				GetMaxViewHeight() const;
+
+	void				SetMinViewHeight(float inViewHeight);
+	void				SetMaxViewHeight(float inViewHeight);
+
+	float				GetMinMapX() const;
+	float				GetMaxMapX() const;
+
+	void				SetMinMapX(float inMapX);
+	void				SetMaxMapX(float inMapX);
+	
+	float				GetMinMapY() const;
+	float				GetMaxMapY() const;
+
+	void				SetMinMapY(float inMapY);
+	void				SetMaxMapY(float inMapY);
+
+	bool				GetDrawMapBG() const;
+	void				SetDrawMapBG(bool inDrawMapBG);
+	
+	#ifdef AVH_SERVER
+	float				GetTopDownCullDistance() const;
+	void				SetTopDownCullDistance(float inCullDistance);
+
+	void				SendToNetworkStream() const;
+	#endif
+
+	#ifdef AVH_CLIENT
+	int					ReceiveFromNetworkStream();
+	#endif
+	
+private:
+	bool				mCalculatedMapExtents;
+
+	float				mMinViewHeight;
+	float				mMaxViewHeight;
+	float				mMinMapX;
+	float				mMinMapY;
+	float				mMaxMapX;
+	float				mMaxMapY;
+	bool				mDrawMapBG;
+
+	#ifdef AVH_SERVER
+	float				mTopDownCullDistance;
+	#endif
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHMarineEquipment.cpp b/main/source/mod/AvHMarineEquipment.cpp
new file mode 100644
index 00000000..cce9b9b1
--- /dev/null
+++ b/main/source/mod/AvHMarineEquipment.cpp
@@ -0,0 +1,2920 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHMarineEquipment.cpp $
+// $Date: 2002/11/22 21:28:16 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHMarineEquipment.cpp,v $
+// Revision 1.50  2002/11/22 21:28:16  Flayra
+// - mp_consistency changes
+//
+// Revision 1.49  2002/11/12 02:25:29  Flayra
+// - HLTV updates
+//
+// Revision 1.48  2002/11/06 01:40:17  Flayra
+// - Turrets now need an active turret factory to keep firing
+//
+// Revision 1.47  2002/11/03 04:50:43  Flayra
+// - Hard-coded gameplay constants instead of putting in skill.cfg
+// - Ammo and health now expire
+//
+// Revision 1.46  2002/10/28 20:35:46  Flayra
+// - Allow HAs and jetpacks to only be picked up by marines
+//
+// Revision 1.45  2002/10/25 23:19:30  Flayra
+// -  Fixed bug where people were being telefragged improperly
+//
+// Revision 1.44  2002/10/24 21:32:09  Flayra
+// - All heavy armor to be given via console
+// - Fix for AFKers on inf portals, also for REIN players when recycling portals
+//
+// Revision 1.43  2002/10/20 21:10:48  Flayra
+// - Optimizations
+//
+// Revision 1.42  2002/10/19 22:33:44  Flayra
+// - Various server optimizations
+//
+// Revision 1.41  2002/10/18 22:20:49  Flayra
+// - Reduce llamability of placing phases near drops or hazards
+//
+// Revision 1.40  2002/10/16 20:54:30  Flayra
+// - Added phase gate sound
+// - Fixed ghostly command station view model problem after building it
+//
+// Revision 1.39  2002/10/16 01:00:14  Flayra
+// - Allow any jetpack to be picked up (needed for cheat, but this is the way all weapons work too, may need to be changed for marine vs. marine, not sure)
+//
+// Revision 1.38  2002/10/03 18:57:20  Flayra
+// - Picking up heavy armor holsters your weapon for view model switch
+// - Added "armory's upgrading, ammo not available" message but removed it for some reason (I think it was acting strange, like playing way too often)
+//
+// Revision 1.37  2002/09/25 21:12:26  Flayra
+// - Undid solidity change (causes Sys_Error)
+//
+// Revision 1.36  2002/09/25 20:48:47  Flayra
+// - Phase gates no longer solid
+//
+// Revision 1.35  2002/09/23 22:21:21  Flayra
+// - Added jetpack and heavy armor
+// - Added "cc online" sound
+// - Turret factories now upgrade to advanced turret factories for siege
+// - Added automatic resupply at armory, but removed it
+// - Observatories scan in 2D now, to match commander range overlay
+//
+// Revision 1.34  2002/09/09 19:59:31  Flayra
+// - Fixed up phase gates (no longer teleport you unless you have two, and they work properly now)
+// - Refactored reinforcements
+// - Fixed bug where secondary command station couldn't be built
+//
+// Revision 1.33  2002/08/31 18:01:02  Flayra
+// - Work at VALVe
+//
+// Revision 1.32  2002/08/16 02:39:14  Flayra
+// - Fixed command station problems after game ends
+//
+// Revision 1.31  2002/08/09 01:06:02  Flayra
+// - Removed ability for command station to be resurrected
+// - Fixed up phase gate effects
+//
+// Revision 1.30  2002/08/02 21:55:55  Flayra
+// - Allow phase teleport to fail nicely.  For some reason, players don't hear their own phase sound anymore, it seems to play at the point where they left instead of where they arrive
+//
+// Revision 1.29  2002/07/26 23:05:54  Flayra
+// - Numerical event feedback
+// - Started to add sparks when buildings were hit but didn't know the 3D point to play it at
+//
+// Revision 1.28  2002/07/24 18:45:42  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.27  2002/07/23 17:11:47  Flayra
+// - Phase gates must be built and can be destroyed, observatories decloak aliens, hooks for fast reinforcements upgrade, nuke damage increased, commander banning
+//
+// Revision 1.26  2002/07/08 17:02:57  Flayra
+// - Refactored reinforcements, updated entities for new artwork
+//
+// Revision 1.25  2002/07/01 21:29:59  Flayra
+// - Removed phase particles, added implosion instead, don't select command station on log-in (messy for drawing building radii)
+//
+// Revision 1.24  2002/06/25 18:04:43  Flayra
+// - Renamed some buildings, armory is now upgraded to advanced armory
+//
+// Revision 1.23  2002/06/10 19:58:17  Flayra
+// - Scan update happens more often, in case aliens go cloaked during scan
+//
+// Revision 1.22  2002/06/03 16:50:35  Flayra
+// - Renamed weapons factory and armory, added ammo resupplying
+//
+// Revision 1.21  2002/05/28 17:51:34  Flayra
+// - Tried to make nuke sound play, extended shake duration to sound length, reinforcement refactoring, mark command stations as mapper placed, so they aren't deleted on level cleanup, support for point-entity buildable command stations
+//
+// Revision 1.20  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHMarineEquipment.h"
+#include "mod/AvHPlayer.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHGamerules.h"
+#include "dlls/client.h"
+#include "common/vec_op.h"
+#include "common/vector_util.h"
+#include "mod/AvHSoundListManager.h"
+#include "dlls/weapons.h"
+#include "mod/AvHServerVariables.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHMovementUtil.h"
+#include "dlls/explode.h"
+#include "dlls/weapons.h"
+#include "util/MathUtil.h"
+#include "mod/AvHTitles.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHParticleConstants.h"
+#include "mod/AvHMarineTurret.h"
+#include "mod/AvHSiegeTurret.h"
+#include "mod/AvHHulls.h"
+
+//LINK_ENTITY_TO_CLASS(kwMine, AvHMine);
+//LINK_ENTITY_TO_CLASS(kwDeployedTurret, AvHDeployedTurret);
+//LINK_ENTITY_TO_CLASS(kwTurret, AvHTurret);
+LINK_ENTITY_TO_CLASS(kwDeployedMine, AvHDeployedMine);
+LINK_ENTITY_TO_CLASS(kwHealth, AvHHealth);
+LINK_ENTITY_TO_CLASS(kwCatalyst, AvHCatalyst);
+LINK_ENTITY_TO_CLASS(kwGenericAmmo, AvHGenericAmmo);
+LINK_ENTITY_TO_CLASS(kwJetpack, AvHJetpack);
+LINK_ENTITY_TO_CLASS(kwAmmoPack, AvHAmmoPack);
+LINK_ENTITY_TO_CLASS(kwHeavyArmor, AvHHeavyArmor);
+
+LINK_ENTITY_TO_CLASS(kwWelder, AvHWelder);
+LINK_ENTITY_TO_CLASS(kwScan, AvHScan);
+LINK_ENTITY_TO_CLASS(kwPhaseGate, AvHPhaseGate);
+//LINK_ENTITY_TO_CLASS(kwSiegeTurret, AvHSiegeTurret);
+LINK_ENTITY_TO_CLASS(kwNuke, AvHNuke);
+
+LINK_ENTITY_TO_CLASS(kwInfantryPortal, AvHInfantryPortal);
+LINK_ENTITY_TO_CLASS(kwTeamCommand, AvHCommandStation);
+LINK_ENTITY_TO_CLASS(kwTurretFactory, AvHTurretFactory);
+LINK_ENTITY_TO_CLASS(kwArmory, AvHArmory);
+LINK_ENTITY_TO_CLASS(kwAdvancedArmory, AvHArmory);
+//LINK_ENTITY_TO_CLASS(kwAdvancedArmory, AvHAdvancedArmory);
+LINK_ENTITY_TO_CLASS(kwArmsLab, AvHArmsLab);
+LINK_ENTITY_TO_CLASS(kwPrototypeLab, AvHPrototypeLab);
+LINK_ENTITY_TO_CLASS(kwObservatory, AvHObservatory);
+
+extern int						gTeleportEventID;
+extern int						gSiegeHitEventID;
+extern int						gSiegeViewHitEventID;
+extern AvHSoundListManager		gSoundListManager;
+
+//void AvHMine::Holster(int skiplocal)
+//{
+//	this->m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 0.5;
+//	
+//	if (!this->m_pPlayer->m_rgAmmo[this->m_iPrimaryAmmoType])
+//	{
+//		// out of mines
+//		this->m_pPlayer->pev->weapons &= ~(1<<AVH_WEAPON_MINE);
+//		SetThink( DestroyItem );
+//		this->pev->nextthink = gpGlobals->time + 0.1;
+//	}
+//	
+//	SendWeaponAnim( TRIPMINE_HOLSTER );
+//	EMIT_SOUND(ENT(this->m_pPlayer->pev), CHAN_WEAPON, "common/null.wav", 1.0, ATTN_NORM);
+//}
+//
+//
+//BOOL AvHMine::PlayEmptySound()
+//{
+//	// None
+//	return 0;
+//}
+//
+//void AvHMine::Spawn()
+//{
+//	this->Precache( );
+//	
+//    AvHMarineWeapon::Spawn(); 
+//
+//	m_iDefaultAmmo = kMineMaxClip;
+//	this->pev->classname = MAKE_STRING(kwsMine); 
+//	
+//	//this->m_pPlayer->m_rgAmmo[this->m_iPrimaryAmmoType] += kMineMaxClip;
+//
+//	this->m_iId = AVH_WEAPON_MINE;
+//
+//	this->pev->iuser3 = AVH_USER3_MARINEITEM;
+//}
+
+//char* AvHDeployedTurret::GetActiveSound() const
+//{
+//	return kTurretActive;
+//}
+//
+//char* AvHDeployedTurret::GetAlertSound() const
+//{
+//	return kTurretAlert;
+//}
+//
+//char* AvHDeployedTurret::GetDeploySound() const
+//{
+//	return kTurretDeploy;
+//}
+//
+//char* AvHDeployedTurret::GetPingSound() const
+//{
+//	return kTurretPing;
+//}
+//
+//int AvHDeployedTurret::GetPointValueOfTarget(void) const
+//{
+//	return 2;
+//}
+//
+//
+//int AvHDeployedTurret::IRelationship ( CBaseEntity *pTarget )
+//{
+//	int theRelationship = R_NO;
+//
+//	// Ignore the roaches for heaven's sake
+//	if(!FClassnameIs( pTarget->pev, "monster_cockroach" ))
+//	{
+//		// Don't shoot at cloaked players
+//		AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(pTarget);
+//		if(thePlayer && thePlayer->GetIsCloaked())
+//		{
+//			theRelationship = R_NO;
+//		}
+//		else
+//		{
+//			// Shoot all monsters that aren't on our team
+//			CBaseMonster* theMonsterPointer = dynamic_cast<CBaseMonster*>(pTarget);
+//			if(theMonsterPointer && (theMonsterPointer->pev->team != this->pev->team))
+//			{
+//				theRelationship = R_DL;
+//			}
+//			else
+//			{
+//				// Look at own team vs. incoming team
+//				AvHTeamNumber inTeam = (AvHTeamNumber)pTarget->pev->team;
+//				if(inTeam != TEAM_IND)
+//				{
+//					if(inTeam == this->pev->team)
+//					{
+//						theRelationship = R_AL;
+//					}
+//					else
+//					{
+//						// Don't keep switching targets constantly
+//						theRelationship = R_DL;
+//					}
+//				}
+//				else
+//				{
+//					theRelationship = CSentry::IRelationship(pTarget);
+//				}
+//			}
+//		}
+//	}
+//	return theRelationship;
+//}
+//
+//AvHDeployedTurret::AvHDeployedTurret() : kStartAlpha(128), kThinkInterval(.05f), kConstructorRate(0.012f), kAverageSoundLength(.4f)
+//{
+//	this->mDamage = (int)(avh_turretdamage.value);
+//	this->mPercentageBuilt = 0.0f;
+//	this->mLastTimePlayedSound = 0;
+//}
+//
+//void AvHDeployedTurret::ConstructUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+//{
+//	// Only allow users from same team as turret deployer
+//	if(pActivator->pev->team == this->pev->team)
+//	{
+//		if(this->mPercentageBuilt < 1.0f)
+//		{
+//			AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(pActivator);
+//			ASSERT(thePlayer);
+//			if(thePlayer->HolsterWeaponToUse())
+//			{
+//				bool thePlaySound = false;
+//
+//				if(this->mPercentageBuilt < 1.0f)
+//				{
+//					//thePlayer->TriggerProgressBar(this->entindex(), 1);
+//					
+//					float theConstructionRate = kConstructorRate;
+//					if(GetGameRules()->GetIsTesting() || GetGameRules()->GetIsDemoing())
+//					{
+//						theConstructionRate *= 4.0f;
+//					}
+//					
+//					this->mPercentageBuilt += (kThinkInterval/1.0f)*theConstructionRate;
+//					// TODO: Rework this a bit
+//					//mTimeToConstruct
+//				}
+//				
+//				if(gpGlobals->time > (this->mLastTimePlayedSound + kAverageSoundLength))
+//				{
+//					AvHSUPlayRandomConstructionEffect(thePlayer, this);
+//					this->mLastTimePlayedSound = gpGlobals->time;
+//
+//					//if(this->mPercentageBuilt == 1.0f)
+//					//{
+//					//	thePlayer->SetCarriedResources(thePlayer->GetCarriedResources() + 1);
+//					//}
+//				}
+//				
+//				// Given the number of constructors, what's chance of starting a new sound?
+//				float theChanceForNewSound = (kThinkInterval/(kAverageSoundLength/2.0f));
+//				float theRandomFloat = RANDOM_FLOAT(0.0f, 1.0f);
+//				if(theRandomFloat < theChanceForNewSound)
+//				{
+//					AvHSUPlayRandomConstructionEffect(thePlayer, this);
+//					
+//					//if(this->mPercentageBuilt == 1.0f)
+//					//{
+//					//	thePlayer->SetCarriedResources(thePlayer->GetCarriedResources() + 1);
+//					//}
+//				}
+//				
+//				this->pev->rendermode = kRenderTransTexture;
+//				this->pev->renderamt = kStartAlpha + this->mPercentageBuilt*(255 - kStartAlpha);
+//				if(this->mPercentageBuilt >= 1.0f)
+//				{
+//					this->SetConstructionComplete();
+//				}
+//				
+//				//this->pev->fuser1 = this->mPercentageBuilt*kNormalizationNetworkFactor;
+//				AvHSHUSetBuildResearchState(this->pev->iuser3, this->pev->iuser4, this->pev->fuser1, true, this->mPercentageBuilt);
+//			}
+//		}
+//	}
+//}
+//
+//bool AvHDeployedTurret::GetIsValidTarget(CBaseEntity* inEntity) const
+//{
+//	bool theTargetIsValid = false;
+//	
+//	if((inEntity->pev->team != this->pev->team) && (inEntity->pev->team != 0) && (inEntity->pev->takedamage))
+//	{
+//		float theDistanceToCurrentEnemy = AvHSUEyeToBodyDistance(this->pev, inEntity);
+//		if(theDistanceToCurrentEnemy <= this->GetRange())
+//		{
+//			theTargetIsValid = true;
+//		}
+//	}
+//	return theTargetIsValid;
+//}
+//
+//bool AvHDeployedTurret::GetIsBuilt() const
+//{
+//	return (this->mPercentageBuilt == 1.0f);
+//}
+//
+//int	AvHDeployedTurret::GetRange() const
+//{
+//	return (int)(avh_turretrange.value);
+//}
+//
+//int	AvHDeployedTurret::ObjectCaps(void)
+//{
+//	return FCAP_CONTINUOUS_USE;
+//}
+//
+//void AvHDeployedTurret::Precache()
+//{
+//	CSentry::Precache( );
+//
+//	// Are these needed?
+//	//PRECACHE_SOUND("weapons/hks1.wav");
+//	//PRECACHE_SOUND("weapons/hks2.wav");
+//	//PRECACHE_SOUND("weapons/hks3.wav");
+//
+//	PRECACHE_SOUND(kTurretFire1);
+//	PRECACHE_SOUND(kTurretFire2);
+//	PRECACHE_SOUND(kTurretFire3);
+//	PRECACHE_SOUND(kTurretFire4);
+//
+//	PRECACHE_SOUND(kTurretBuild1);
+//	PRECACHE_SOUND(kTurretBuild2);
+//	PRECACHE_SOUND(kTurretBuild3);
+//	PRECACHE_SOUND(kTurretBuild4);
+//	PRECACHE_SOUND(kTurretBuild5);
+//}
+//
+//
+//void AvHDeployedTurret::SetConstructionComplete()
+//{
+//	// Set think to turret search think
+//	this->mPercentageBuilt = 1.0f;
+//	//this->pev->fuser1 = 1.0f*kNormalizationNetworkFactor;
+//	AvHSHUSetBuildResearchState(this->pev->iuser3, this->pev->iuser4, this->pev->fuser1, true, this->mPercentageBuilt);
+//
+//	this->pev->rendermode = kRenderNormal;
+//	this->pev->renderamt = 255;
+//	m_flLastSight = gpGlobals->time;
+//
+//	//SetThink(AutoSearchThink);		
+//	this->m_flLastSight = gpGlobals->time;
+//	SetThink(Deploy);
+//	this->pev->nextthink = gpGlobals->time + kThinkInterval;
+//	EMIT_SOUND(ENT(this->pev), CHAN_WEAPON, kTurretDeploy, 1, ATTN_NORM);
+//}
+//
+//void AvHDeployedTurret::Shoot(Vector &vecSrc, Vector &vecDirToEnemy)
+//{
+////	CSentry::Shoot(vecSrc, vecDirToEnemy);
+//	// Target checking shouldn't be in this function but it's not easy to override base turret functionality
+//	//if(this->GetIsValidTarget(this->m_hEnemy))
+//	//{
+//		float theDamageModifier;
+//		int theTracerFreq;
+//		int theUpgradeLevel = AvHPlayerUpgrade::GetWeaponUpgrade(this->pev->iuser4, &theDamageModifier, &theTracerFreq);
+//		int theDamage = this->mDamage*theDamageModifier;
+//		
+//		this->FireBullets(1, vecSrc, vecDirToEnemy, VECTOR_CONE_3DEGREES, this->GetRange(), BULLET_MONSTER_MP5, theTracerFreq, theDamage);
+//		
+//		const char* theSoundToPlay = kTurretFire1;
+//		switch(theUpgradeLevel)
+//		{
+//		case 1:
+//			theSoundToPlay = kTurretFire2;
+//			break;
+//		case 2:
+//			theSoundToPlay = kTurretFire3;
+//			break;
+//		case 3:
+//			theSoundToPlay = kTurretFire4;
+//			break;
+//		}
+//		
+//		int thePitch = RANDOM_LONG(50, 150);
+//		EMIT_SOUND_DYN(ENT(this->pev), CHAN_WEAPON, theSoundToPlay, 1.0, ATTN_NORM, 0, thePitch);
+//		
+//		if(theUpgradeLevel > 0)
+//		{
+//			pev->effects = pev->effects | EF_MUZZLEFLASH;
+//		}
+////	}
+////	else
+////	{
+////		this->m_hEnemy = NULL;
+////	}
+//}
+//
+//void AvHDeployedTurret::Spawn()
+//{
+//	//this->m_iAutoStart = true;
+//	this->m_iAutoStart = false;
+//	CSentry::Spawn();
+//	this->Initialize();
+//	
+//	this->pev->rendermode = kRenderTransTexture;
+//	this->pev->renderamt = kStartAlpha + this->mPercentageBuilt*(255 - kStartAlpha);
+//	this->pev->classname = MAKE_STRING(kwsDeployedTurret); 
+//
+////	//this->pev->movetype = MOVETYPE_FLY;
+////	//this->pev->solid = SOLID_BBOX;
+////
+////	this->pev->movetype = MOVETYPE_PUSH;
+////	this->pev->solid = SOLID_BSP;
+////	this->pev->takedamage = DAMAGE_YES;
+//
+//	InitializeBuildable(this->pev->iuser3, this->pev->iuser4, AVH_USER3_TURRET);
+//	this->pev->fuser1 = this->mPercentageBuilt*kNormalizationNetworkFactor;
+//
+//	//AvHSetUser4(this->pev->iuser4, AVH_USER4_TURRET);
+//
+//	this->mTimeToConstruct = GetGameRules()->GetBuildTimeForMessageID(BUILD_TURRET);
+//	this->m_fTurnRate = 50;
+//
+//	SET_MODEL(ENT(pev), kDeployedTurretModel);
+//
+//	//this->pev->solid = SOLID_SLIDEBOX;//SOLID_BBOX;
+//	//this->pev->movetype = MOVETYPE_FLY;
+//
+//	this->pev->solid = SOLID_BBOX;
+//	this->pev->movetype = MOVETYPE_TOSS;
+//	
+//	pev->sequence		= 0;
+//	pev->frame			= 0;
+//
+//	UTIL_SetSize(pev, kTurretMinSize, kTurretMaxSize); 
+//
+//	this->pev->health = (int)(avh_turrethealth.value);
+//	this->pev->armorvalue = (int)(avh_turrethealth.value);
+//
+//	SetUse(ConstructUse);
+//}
+//
+//void AvHDeployedTurret::StopShooting()
+//{
+//	// Used to do this, changed turret back to fire normal wave sound
+//	//STOP_SOUND(ENT(pev), CHAN_WEAPON, "deployedturret.wav");
+//}
+//
+//int AvHDeployedTurret::TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType)
+//{
+//	int theReturnValue = 0;
+//
+//	if(flDamage > 0.0f)
+//	{
+//		// If malicious damage, trigger the alert
+//		if((pevInflictor->team != this->pev->team) || (GetGameRules()->GetIsTesting()))
+//		{
+//			GetGameRules()->TriggerAlert((AvHTeamNumber)this->pev->team, ALERT_UNDER_ATTACK, this->pev->origin.x, this->pev->origin.y);
+//		}
+//		
+//		// Account for armor
+//		float theNewDamage = AvHSUCalculateDamageLessArmor(this->pev, flDamage, bitsDamageType, GetGameRules()->IsMultiplayer());
+//		theReturnValue = CSentry::TakeDamage(pevInflictor, pevAttacker, theNewDamage, bitsDamageType);
+//	}
+//
+//	return theReturnValue;
+//}
+
+void AvHDeployedMine::Precache(void)
+{
+	PRECACHE_UNMODIFIED_MODEL(kTripmineWModel);
+	PRECACHE_UNMODIFIED_MODEL(kTripmineW2Model);
+	PRECACHE_UNMODIFIED_SOUND(kTripmineDeploySound);
+	PRECACHE_UNMODIFIED_SOUND(kTripmineActivateSound);
+	PRECACHE_UNMODIFIED_SOUND(kTripmineChargeSound);
+	PRECACHE_UNMODIFIED_SOUND(kTripmineStepOnSound);
+}
+
+void AvHDeployedMine::ActiveTouch(CBaseEntity* inOther)
+{
+	float kTimeBetweenBeeps = 3.0f;
+	
+	// Hack to circumvent the hack where owners can't collide.  If this isn't done, then mines will blowup when touching the world sometimes.
+	//edict_t* theTempOwner = this->pev->owner;
+	//this->pev->owner = this->m_pRealOwner;
+	bool theEntityCanDoDamage = GetGameRules()->CanEntityDoDamageTo(this, inOther);
+	//this->pev->owner = theTempOwner;
+	// Check team here and only emit warning beep for friendlies
+	if(theEntityCanDoDamage && (this->pev->team != inOther->pev->team))
+	{
+		GetGameRules()->MarkDramaticEvent(kMineExplodePriority, inOther, this);
+		this->Detonate();
+	}
+	else
+	{
+		if(gpGlobals->time > this->mLastTimeTouched + kTimeBetweenBeeps)
+		{
+			// Only players trigger this, not buildings or other mines
+			AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inOther);
+			if(thePlayer)
+			{
+				// Play warning proximity beep
+				EMIT_SOUND( ENT(pev), CHAN_BODY, kTripmineStepOnSound, 0.5, ATTN_NORM ); // shut off chargeup
+				this->mLastTimeTouched = gpGlobals->time;
+			}
+		}
+	}
+}
+
+// Ripped from old grenade
+void AvHDeployedMine::Explode(TraceResult* inTrace, int inBitsDamageType)
+{
+	float		flRndSound;// sound randomizer
+	
+	pev->model = iStringNull;//invisible
+	pev->solid = SOLID_NOT;// intangible
+	
+	float theDamageModifier;
+	int theUpgradeLevel = AvHPlayerUpgrade::GetWeaponUpgrade(this->pev->iuser3, this->pev->iuser4, &theDamageModifier);
+	float theDamage = this->pev->dmg*theDamageModifier;
+
+	pev->takedamage = DAMAGE_NO;
+
+	// TODO: Look at upgrade and mark up damage
+
+	// Pull out of the wall a bit
+	if ( inTrace->flFraction != 1.0 )
+	{
+		pev->origin = inTrace->vecEndPos + (inTrace->vecPlaneNormal * (theDamage - 24) * 0.6);
+	}
+
+	int iContents = UTIL_PointContents ( pev->origin );
+	
+	MESSAGE_BEGIN( MSG_PAS, SVC_TEMPENTITY, pev->origin );
+		WRITE_BYTE( TE_EXPLOSION );		// This makes a dynamic light and the explosion sprites/sound
+		WRITE_COORD( pev->origin.x );	// Send to PAS because of the sound
+		WRITE_COORD( pev->origin.y );
+		WRITE_COORD( pev->origin.z );
+		if (iContents != CONTENTS_WATER)
+		{
+			WRITE_SHORT( g_sModelIndexFireball );
+		}
+		else
+		{
+			WRITE_SHORT( g_sModelIndexWExplosion );
+		}
+		WRITE_BYTE( (theDamage - 50) * .60  ); // scale * 10
+		WRITE_BYTE( 15  ); // framerate
+		WRITE_BYTE( TE_EXPLFLAG_NONE );
+	MESSAGE_END();
+
+	CSoundEnt::InsertSound ( bits_SOUND_COMBAT, pev->origin, NORMAL_EXPLOSION_VOLUME, 3.0 );
+
+//	entvars_t* thePEVOwner = NULL;
+//	if(this->pev->owner )
+//	{
+//		thePEVOwner = VARS( pev->owner );
+//	}
+
+	// can't traceline attack owner if this is set
+//	this->pev->owner = NULL; 
+
+	//RadiusDamage(this->pev, this->pevOwner, theDamage, CLASS_NONE, inBitsDamageType);
+    int theRadius = BALANCE_IVAR(kMineRadius);
+	RadiusDamage(this->pev->origin, this->pev, this->mPlacer, theDamage, theRadius, CLASS_NONE, inBitsDamageType);
+
+	// Play view shake here
+	float theShakeAmplitude = 80;
+	float theShakeFrequency = 100;
+	float theShakeDuration = 1.0f;
+	float theShakeRadius = 700;
+	UTIL_ScreenShake(this->pev->origin, theShakeAmplitude, theShakeFrequency, theShakeDuration, theShakeRadius);
+
+	if ( RANDOM_FLOAT( 0 , 1 ) < 0.5 )
+	{
+		UTIL_DecalTrace( inTrace, DECAL_SCORCH1 );
+	}
+	else
+	{
+		UTIL_DecalTrace( inTrace, DECAL_SCORCH2 );
+	}
+
+	flRndSound = RANDOM_FLOAT( 0 , 1 );
+
+	switch ( RANDOM_LONG( 0, 2 ) )
+	{
+		case 0:	EMIT_SOUND(ENT(pev), CHAN_VOICE, "weapons/debris1.wav", 0.55, ATTN_NORM);	break;
+		case 1:	EMIT_SOUND(ENT(pev), CHAN_VOICE, "weapons/debris2.wav", 0.55, ATTN_NORM);	break;
+		case 2:	EMIT_SOUND(ENT(pev), CHAN_VOICE, "weapons/debris3.wav", 0.55, ATTN_NORM);	break;
+	}
+
+	pev->effects |= EF_NODRAW;
+	SetThink( &CGrenade::Smoke );
+	pev->velocity = g_vecZero;
+	pev->nextthink = gpGlobals->time + 0.3;
+
+	if (iContents != CONTENTS_WATER)
+	{
+		int sparkCount = RANDOM_LONG(0,3);
+		for ( int i = 0; i < sparkCount; i++ )
+			Create( "spark_shower", pev->origin, inTrace->vecPlaneNormal, NULL );
+	}
+}
+
+void AvHDeployedMine::Smoke(void)
+{
+	if (UTIL_PointContents(this->pev->origin ) == CONTENTS_WATER)
+	{
+		UTIL_Bubbles(this->pev->origin - Vector( 64, 64, 64 ), this->pev->origin + Vector( 64, 64, 64 ), 100 );
+	}
+	else
+	{
+		float theDamageModifier;
+		int theUpgradeLevel = AvHPlayerUpgrade::GetWeaponUpgrade(this->pev->iuser3, this->pev->iuser4, &theDamageModifier);
+		int theDamage = this->pev->dmg*theDamageModifier;
+		
+		MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, this->pev->origin);
+			WRITE_BYTE( TE_SMOKE );
+			WRITE_COORD( this->pev->origin.x );
+			WRITE_COORD( this->pev->origin.y );
+			WRITE_COORD( this->pev->origin.z );
+			WRITE_SHORT( g_sModelIndexSmoke );
+			WRITE_BYTE( (theDamage - 50) * 0.80 ); // scale * 10
+			WRITE_BYTE( 12  ); // framerate
+		MESSAGE_END();
+	}
+	UTIL_Remove( this );
+}
+
+void AvHDeployedMine::Killed(entvars_t* inAttacker, int inGib)
+{
+	this->Detonate();
+
+	CBasePlayerItem::Killed(inAttacker, inGib);
+}
+
+int	AvHDeployedMine::TakeDamage(entvars_t *inInflictor, entvars_t *inAttacker, float inDamage, int inBitsDamageType)
+{
+	// Don't include this for potential overflow reasons
+	//UTIL_Sparks(this->pev->origin);
+
+	return CBasePlayerItem::TakeDamage(inInflictor, inAttacker, inDamage, inBitsDamageType);
+}
+
+void AvHDeployedMine::Detonate()
+{
+	// Stop charging up
+	EMIT_SOUND(ENT(this->pev), CHAN_BODY, "common/null.wav", 0.5, ATTN_NORM ); 
+
+	if(!this->mDetonated && this->mPoweredUp)
+	{
+		TraceResult tr;
+		UTIL_TraceLine(this->pev->origin + this->mVecDir * 8, this->pev->origin - this->mVecDir * 64, dont_ignore_monsters, ENT(this->pev), &tr);
+		
+		this->Explode(&tr, NS_DMG_NORMAL);
+
+		this->mDetonated = true;
+	}
+}
+
+const float kTripmineActiveThinkTime = .8f;
+const float kTripminePowerUpThinkTime = .2f;
+const float kTripminePowerUpTime = 3.8f;
+const float kTripmineFailTime = 20.0f;
+
+void AvHDeployedMine::SetPlacer(entvars_t* inPlacer)
+{
+	this->mPlacer = inPlacer;
+}
+
+void AvHDeployedMine::PowerupThink()
+{
+	// Find an owner
+	if(this->mOwner == NULL)
+	{
+		edict_t* theOldOwner = this->pev->owner;
+		this->pev->owner = NULL;
+
+		TraceResult tr;
+		UTIL_TraceLine(this->pev->origin + this->mVecDir * 8, this->pev->origin - this->mVecDir * 32, dont_ignore_monsters, ENT(this->pev), &tr);
+
+		if (tr.fStartSolid || (theOldOwner && tr.pHit == theOldOwner))
+		{
+			this->pev->owner = theOldOwner;
+		}
+		else if (tr.flFraction < 1.0)
+		{
+			this->pev->owner = tr.pHit;
+			this->mOwner = CBaseEntity::Instance(this->pev->owner);
+			this->mOwnerOrigin = this->mOwner->pev->origin;
+			this->mOwnerAngles = this->mOwner->pev->angles;
+		}
+		else
+		{
+			STOP_SOUND(ENT(this->pev), CHAN_VOICE, kTripmineDeploySound);
+			STOP_SOUND(ENT(this->pev), CHAN_BODY, kTripmineChargeSound);
+
+			SetThink(&CBaseEntity::SUB_Remove);
+			this->pev->nextthink = gpGlobals->time + 0.1;
+
+			ALERT(at_console, "WARNING:Tripmine at %.0f, %.0f, %.0f removed\n", this->pev->origin.x, this->pev->origin.y, this->pev->origin.z);
+			//KillBeam();
+			return;
+		}
+	}
+	else
+	{
+		this->DetonateIfOwnerInvalid();
+	}
+
+	// Make sure no one is touching us, then set solid (don't want to trap anything inside the mine, but need to be solid to take damage)
+	// Set solid before powered up so they can take damage before they're enabled
+//	if(!this->mPoweredUp)
+//	{
+//		CBaseEntity* pList[128];
+//		
+//		Vector theMinArea = this->pev->origin + kMineMinSize;
+//		Vector theMaxArea = this->pev->origin + kMineMaxSize;
+//		
+//		int theNumBlockingEntities = UTIL_EntitiesInBox(pList, 128, theMinArea, theMaxArea, FL_CLIENT);
+//		if(theNumBlockingEntities == 0)
+//		{
+//			this->pev->solid = SOLID_BBOX;
+//			UTIL_SetOrigin(this->pev, this->pev->origin);
+//		}
+//		else if(gpGlobals->time > (this->mTimePlaced + kTripmineFailTime))
+//		{
+//			ALERT(at_console, "WARNING:Tripmine at %.0f, %.0f, %.0f removed\n", this->pev->origin.x, this->pev->origin.y, this->pev->origin.z);
+//			UTIL_Remove(this);
+//		}
+//	}
+
+	if(!this->mPoweredUp)
+	{
+		if(gpGlobals->time > (this->mTimePlaced + kTripminePowerUpTime))
+		{
+			//if(this->pev->solid == SOLID_BBOX)
+			//{
+				// play enabled sound
+				EMIT_SOUND_DYN( ENT(pev), CHAN_VOICE, kTripmineActivateSound, 0.5, ATTN_NORM, 1.0, 75 );
+				
+				SetTouch(&AvHDeployedMine::ActiveTouch);
+				
+				SetThink(&AvHDeployedMine::ActiveThink);
+				this->pev->nextthink = gpGlobals->time + kTripmineActiveThinkTime;
+					
+				this->mPoweredUp = true;
+			//}
+		}
+	}
+
+	if(!this->mPoweredUp)
+	{
+		this->pev->nextthink = gpGlobals->time + kTripminePowerUpThinkTime;
+	}
+}
+
+void AvHDeployedMine::DetonateIfOwnerInvalid()
+{
+	if((this->mOwner == NULL) || (this->mOwner->pev->origin != this->mOwnerOrigin) || (this->mOwner->pev->angles != this->mOwnerAngles))
+	{
+		this->Detonate();
+	}
+}
+
+// Check to see if our position is no longer valid
+void AvHDeployedMine::ActiveThink()
+{
+	this->DetonateIfOwnerInvalid();
+	this->pev->nextthink = gpGlobals->time + kTripmineActiveThinkTime;
+}
+
+void AvHDeployedMine::Spawn(void)
+{
+	this->Precache();
+
+	this->pev->movetype = MOVETYPE_FLY;
+	this->pev->solid = SOLID_BBOX;
+	this->pev->classname = MAKE_STRING(kwsDeployedMine);
+	this->pev->iuser3 = AVH_USER3_MINE;
+	
+	SET_MODEL(ENT(pev), kTripmineWModel);
+
+	UTIL_SetSize(this->pev, kMineMinSize, kMineMaxSize);
+	UTIL_SetOrigin(this->pev, this->pev->origin );
+
+	// Can't emit beep until active
+	this->mTimePlaced = gpGlobals->time;
+	this->mLastTimeTouched = this->mTimePlaced;
+	
+	SetThink(&AvHDeployedMine::PowerupThink);
+	this->pev->nextthink = gpGlobals->time + kTripminePowerUpThinkTime;
+
+	// give them hit points
+	this->pev->takedamage = DAMAGE_YES;
+	this->pev->health = BALANCE_IVAR(kMineHealth);
+	this->pev->dmg = BALANCE_IVAR(kMineDamage);
+	
+	// play deploy sound
+	EMIT_SOUND( ENT(this->pev), CHAN_VOICE, kTripmineDeploySound, .8f, ATTN_NORM );
+	EMIT_SOUND( ENT(this->pev), CHAN_BODY, kTripmineChargeSound, .5f, ATTN_NORM ); // chargeup
+
+	UTIL_MakeAimVectors(this->pev->angles);
+	this->mVecDir = gpGlobals->v_forward;
+	this->mVecEnd = this->pev->origin + this->mVecDir * 2048;
+
+	this->mDetonated = false;
+	this->mPoweredUp = false;
+	this->mOwner = NULL;
+	this->mPlacer = NULL;
+}
+
+AvHPlayerEquipment::AvHPlayerEquipment()
+{
+	this->mIsPersistent = false;
+	this->mLifetime = -1;
+}
+
+void AvHPlayerEquipment::KeyValue(KeyValueData* pkvd)
+{
+	// Any entity placed by the mapper is persistent
+	this->SetPersistent();
+	
+	if(FStrEq(pkvd->szKeyName, "teamchoice"))
+	{
+		//this->mTeam = (AvHTeamNumber)(atoi(pkvd->szValue));
+		this->pev->team = (AvHTeamNumber)(atoi(pkvd->szValue));
+		
+		pkvd->fHandled = TRUE;
+	}
+	else if(FStrEq(pkvd->szKeyName, "angles"))
+	{
+		// TODO: Insert code here
+		//pkvd->fHandled = TRUE;
+		int a = 0;
+	}
+	else if(FStrEq(pkvd->szKeyName, "lifetime"))
+	{
+		this->mLifetime = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+	{
+		CBasePlayerItem::KeyValue(pkvd);
+	}
+}
+
+// 0 means never expire, -1 means no value was set so use default
+int AvHPlayerEquipment::GetLifetime() const
+{
+	int theLifetime = this->mLifetime;
+
+	if(theLifetime < 0)
+	{
+		theLifetime = AvHSUGetWeaponStayTime();
+	}
+
+	return theLifetime;
+}
+
+bool AvHPlayerEquipment::GetIsPersistent() const
+{
+	return this->mIsPersistent;
+}
+
+void AvHPlayerEquipment::SetPersistent()
+{
+	this->mIsPersistent = true;
+}
+
+void AvHHealth::Precache(void)
+{
+	PRECACHE_UNMODIFIED_MODEL(kHealthModel);
+	PRECACHE_UNMODIFIED_SOUND(kHealthPickupSound);
+}
+
+void AvHHealth::Spawn(void)
+{
+	this->Precache();
+	
+	SET_MODEL(ENT(pev), kHealthModel);
+	this->pev->movetype = MOVETYPE_TOSS;
+	this->pev->solid = SOLID_TRIGGER;
+	this->pev->framerate = 1.0;
+	
+	UTIL_SetSize(pev, kHealthMinSize, kHealthMaxSize); 
+	UTIL_SetOrigin( pev, pev->origin );
+	
+	SetTouch(&AvHHealth::Touch);
+
+	// Expire after a time.
+	int theLifetime = this->GetLifetime();
+	if(theLifetime > 0)
+	{
+		SetThink(&AvHHealth::SUB_Remove);
+		this->pev->nextthink = gpGlobals->time + theLifetime;
+	}
+	
+	this->pev->iuser3 = AVH_USER3_MARINEITEM;
+}
+
+BOOL AvHHealth::GiveHealth(CBaseEntity* inOther)
+{
+	BOOL theSuccess = FALSE;
+
+	float thePointsPerHealth = BALANCE_IVAR(kPointsPerHealth);
+	
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inOther);
+	if(thePlayer && thePlayer->GetIsRelevant() && thePlayer->GetIsMarine())
+	{
+		float thePlayerMaxHealth = AvHPlayerUpgrade::GetMaxHealth(thePlayer->pev->iuser4, thePlayer->GetUser3(), thePlayer->GetExperienceLevel());
+		if(thePlayer->pev->health < thePlayerMaxHealth)
+		{
+			float thePointsGiven = min(thePointsPerHealth, (thePlayerMaxHealth - thePlayer->pev->health));
+			
+			thePlayer->pev->health += thePointsGiven;
+			
+			if(CVAR_GET_FLOAT(kvDrawDamage))
+			{
+				thePlayer->PlaybackNumericalEvent(kNumericalInfoHealthEvent, thePointsGiven);
+			}
+			
+			// Remove parasite if player has one
+			//int& theUser4 = thePlayer->pev->iuser4;
+			//SetUpgradeMask(&theUser4, MASK_PARASITED, false);
+			
+			EMIT_SOUND(ENT(inOther->pev), CHAN_ITEM, kHealthPickupSound, 1, ATTN_NORM);
+
+			theSuccess = TRUE;
+		}
+	}
+
+	return theSuccess;
+}
+
+void AvHHealth::Touch(CBaseEntity* inOther)
+{
+	if(AvHHealth::GiveHealth(inOther))
+	{
+		UTIL_Remove(this);
+	}
+}
+
+
+void AvHCatalyst::Precache(void)
+{
+    PRECACHE_UNMODIFIED_MODEL(kCatalystModel);
+    PRECACHE_UNMODIFIED_SOUND(kCatalystPickupSound);
+}
+
+void AvHCatalyst::Spawn(void)
+{
+    this->Precache();
+    
+    SET_MODEL(ENT(pev), kCatalystModel);
+    this->pev->movetype = MOVETYPE_TOSS;
+    this->pev->solid = SOLID_TRIGGER;
+    
+    UTIL_SetSize(pev, kCatalystMinSize, kCatalystMaxSize); 
+    UTIL_SetOrigin( pev, pev->origin );
+    
+    SetTouch(&AvHCatalyst::Touch);
+    
+    // Expire after a time.
+    int theLifetime = this->GetLifetime();
+    if(theLifetime > 0)
+    {
+        SetThink(&AvHCatalyst::SUB_Remove);
+        this->pev->nextthink = gpGlobals->time + theLifetime;
+    }
+    
+    this->pev->iuser3 = AVH_USER3_MARINEITEM;
+}
+
+BOOL AvHCatalyst::GiveCatalyst(CBaseEntity* inOther)
+{
+    BOOL theSuccess = FALSE;
+    
+    float theCatalystDuration = BALANCE_IVAR(kCatalystDuration);
+    
+    AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inOther);
+    if(thePlayer && thePlayer->GetIsRelevant() && thePlayer->GetIsMarine() && !thePlayer->GetIsCatalysted())
+    {
+        //// The player takes damage too
+        //float theDamagePercent = BALANCE_FVAR(kCatalystDamagePercent);
+        //float theMaxHealth = AvHPlayerUpgrade::GetMaxHealth(thePlayer->pev->iuser4, (AvHUser3)thePlayer->pev->iuser3);
+        //float theDamage = theDamagePercent*theMaxHealth;
+        //
+        //// Never kill the player
+        //theDamage = min(theDamage, thePlayer->pev->health - 1);
+        //thePlayer->TakeDamage(thePlayer->pev, thePlayer->pev, theDamage, DMG_GENERIC | DMG_IGNOREARMOR);
+
+        EMIT_SOUND(ENT(inOther->pev), CHAN_ITEM, kCatalystPickupSound, 1, ATTN_NORM);
+
+        thePlayer->SetIsCatalysted(true, theCatalystDuration);
+
+        theSuccess = TRUE;
+    }
+    
+    return theSuccess;
+}
+
+void AvHCatalyst::Touch(CBaseEntity* inOther)
+{
+    if(AvHCatalyst::GiveCatalyst(inOther))
+    {
+        UTIL_Remove(this);
+    }
+}
+
+void AvHHeavyArmor::Precache(void)
+{
+	PRECACHE_UNMODIFIED_MODEL(kHeavyModel);
+	PRECACHE_UNMODIFIED_SOUND(kHeavyPickupSound);
+}
+
+void AvHHeavyArmor::Spawn(void)
+{
+	this->Precache();
+	
+	SET_MODEL(ENT(pev), kHeavyModel);
+	this->pev->movetype = MOVETYPE_TOSS;
+	this->pev->solid = SOLID_TRIGGER;
+	UTIL_SetSize(pev, kHeavyMinSize, kHeavyMaxSize); 
+	UTIL_SetOrigin( pev, pev->origin );
+	
+	SetTouch(&AvHHeavyArmor::Touch);
+	
+	this->pev->iuser3 = AVH_USER3_HEAVY;
+}
+
+void AvHHeavyArmor::Touch(CBaseEntity* inOther)
+{
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inOther);
+	if(thePlayer && thePlayer->GetIsRelevant())
+	{
+		if(thePlayer->GetIsMarine())
+		{
+			// Check to make sure they don't have heavy armor or jetpack already
+			if((!thePlayer->GetHasJetpack() || GetGameRules()->GetIsCombatMode()) && !thePlayer->GetHasHeavyArmor())//voogru: ignore in combat mode since were trying to touch it.
+			{
+				// Needed because view model changes
+				if(thePlayer->HolsterWeaponToUse())
+				{
+					// Give player heavy armor
+					SetUpgradeMask(&thePlayer->pev->iuser4, MASK_UPGRADE_7, false);
+					SetUpgradeMask(&thePlayer->pev->iuser4, MASK_UPGRADE_13);
+
+					// Mark player with heavy armor
+					thePlayer->EffectivePlayerClassChanged();
+
+					// Set new armor value
+					thePlayer->pev->armorvalue = AvHPlayerUpgrade::GetMaxArmorLevel(thePlayer->pev->iuser4, (AvHUser3)thePlayer->pev->iuser3);
+
+					EMIT_SOUND(ENT(inOther->pev), CHAN_ITEM, kHeavyPickupSound, 1, ATTN_NORM);
+					
+					UTIL_Remove(this);
+				}
+			}
+		}
+	}
+}
+
+void AvHJetpack::Precache(void)
+{
+	PRECACHE_UNMODIFIED_MODEL(kJetpackModel);
+	PRECACHE_UNMODIFIED_SOUND(kJetpackPickupSound);
+}
+
+void AvHJetpack::Spawn(void)
+{
+	this->Precache();
+	
+	SET_MODEL(ENT(pev), kJetpackModel);
+	this->pev->movetype = MOVETYPE_TOSS;
+	this->pev->solid = SOLID_TRIGGER;
+	UTIL_SetSize(pev, kJetpackMinSize, kJetpackMaxSize); 
+	UTIL_SetOrigin( pev, pev->origin );
+	
+	SetTouch(&AvHJetpack::Touch);
+	
+	this->pev->iuser3 = AVH_USER3_JETPACK;
+}
+
+void AvHJetpack::Touch(CBaseEntity* inOther)
+{
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inOther);
+	if(thePlayer && thePlayer->GetIsRelevant())
+	{
+		if(thePlayer->GetIsMarine())
+		{
+			// Check to make sure they don't have heavy armor or jetpack already
+			if((!thePlayer->GetHasHeavyArmor() || GetGameRules()->GetIsCombatMode()) && !thePlayer->GetHasJetpack())//voogru: ignore in combat mode since were trying to touch it.
+			{
+                if(thePlayer->HolsterWeaponToUse())
+                {
+				    // Give player jetpack
+					SetUpgradeMask(&thePlayer->pev->iuser4, MASK_UPGRADE_13, false);
+				    SetUpgradeMask(&thePlayer->pev->iuser4, MASK_UPGRADE_7);
+				    
+					// Mark player with jetpack
+					thePlayer->EffectivePlayerClassChanged();
+
+					EMIT_SOUND(ENT(inOther->pev), CHAN_ITEM, kJetpackPickupSound, 1, ATTN_NORM);
+
+					// Set new armor value
+					thePlayer->pev->armorvalue = AvHPlayerUpgrade::GetMaxArmorLevel(thePlayer->pev->iuser4, (AvHUser3)thePlayer->pev->iuser3);
+
+				    // Set full energy to start
+				    thePlayer->pev->fuser3 = 1.0f*kNormalizationNetworkFactor;
+
+
+				    UTIL_Remove(this);
+                }
+			}
+		}
+	}
+}
+
+
+void AvHAmmoPack :: Precache( void )
+{
+	PRECACHE_UNMODIFIED_MODEL(kAmmoPackModel);
+	PRECACHE_UNMODIFIED_SOUND(kAmmoPackPickupSound);
+}
+
+void AvHAmmoPack :: Spawn( void )
+{
+	this->Precache();
+
+	SET_MODEL(ENT(pev), kAmmoPackModel);
+
+	this->pev->movetype = MOVETYPE_TOSS;
+	this->pev->solid = SOLID_TRIGGER;
+	this->m_flNoTouch = gpGlobals->time + 0.25;
+
+	UTIL_SetSize(pev, kAmmoPackMinSize, kAmmoPackMaxSize); 
+	UTIL_SetOrigin( pev, pev->origin );
+
+	SetTouch(&AvHAmmoPack::Touch);
+}
+
+void AvHAmmoPack :: Touch( CBaseEntity *inOther)
+{
+	if(this->m_flNoTouch > gpGlobals->time)
+		return;
+
+	//Dont touch non-players
+	if(!inOther->IsPlayer())
+		return;
+
+	AvHPlayer *thePlayer = dynamic_cast<AvHPlayer*>(inOther);
+
+	//if they dont have a weapon that uses this ammo, dont pick up the ammo pack.
+	if ( !(thePlayer->pev->weapons & (1<<m_iWeaponID)) )
+		return;
+
+	if( thePlayer->GiveAmmo(this->m_iAmmoAmt, this->m_szAmmoType, this->m_iMaxAmmo) != -1)
+	{
+		EMIT_SOUND(ENT(thePlayer->pev), CHAN_ITEM, kAmmoPackPickupSound, 1, ATTN_NORM);
+		thePlayer->PlaybackNumericalEvent(kNumericalInfoAmmoEvent, 0);
+		UTIL_Remove(this);
+	}
+}
+
+BOOL AvHGenericAmmo::GiveAmmo(CBaseEntity* inOther)
+{
+	// Give ammo to the player.  It will be added as generic ammo, added as one clip to 
+	// the player's current weapon.
+	if (inOther->GiveAmmo( 0, kwsGenericAmmo, 0 ) != -1)
+	{
+		EMIT_SOUND(ENT(inOther->pev), CHAN_ITEM, kAmmoPickupSound, 1, ATTN_NORM);
+		
+		AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inOther);
+		if(thePlayer)
+		{
+			// Just say "ammo received" instead of number of bullets, too confusing
+			thePlayer->PlaybackNumericalEvent(kNumericalInfoAmmoEvent, 0);
+		}
+		
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+BOOL AvHGenericAmmo::AddAmmo( CBaseEntity *pOther ) 
+{ 
+	if(this->mDropped)
+	{
+		return GiveAmmo(pOther);
+	}
+
+	return FALSE;
+}
+
+void AvHGenericAmmo::Dropped(void)
+{
+	this->mDropped = true;
+	SetThink(NULL);
+
+	// Expire after a time
+	SetThink(&AvHGenericAmmo::SUB_Remove);
+	this->pev->nextthink = gpGlobals->time + AvHSUGetWeaponStayTime();
+}
+
+void AvHGenericAmmo::Precache( void )
+{
+	PRECACHE_UNMODIFIED_MODEL(kAmmoModel);
+	PRECACHE_UNMODIFIED_SOUND(kAmmoPickupSound);
+}
+
+void AvHGenericAmmo::Spawn( void )
+{ 
+	Precache( );
+	SET_MODEL(ENT(pev), kAmmoModel);
+	UTIL_SetSize(pev, kAmmoMinSize, kAmmoMaxSize); 
+	
+	CBasePlayerAmmo::Spawn( );
+	this->mDropped = false;
+	SetThink(&AvHGenericAmmo::Dropped);
+	this->pev->nextthink = gpGlobals->time + .15f;
+
+	this->pev->iuser3 = AVH_USER3_MARINEITEM;
+}
+
+
+const float kScanThinkTime = .5f;
+
+AvHScan::AvHScan()
+{
+}
+
+void AvHScan::Precache(void)
+{
+	CBaseAnimating::Precache();
+	
+	PRECACHE_UNMODIFIED_MODEL(kScanModel);
+	PRECACHE_UNMODIFIED_SOUND(kScanSound);
+}
+
+void AvHScan::Spawn(void)
+{
+//	this->Precache();
+//	CBaseAnimating::Spawn();
+//	
+//	SET_MODEL(ENT(this->pev), kScanModel);
+//	
+//	this->pev->movetype = MOVETYPE_NONE;
+//	this->pev->solid = SOLID_NOT;
+//	
+//    this->pev->classname = MAKE_STRING(kwsScan);
+//	
+//	this->pev->takedamage = DAMAGE_NO;
+//	
+//	// Start animating
+//	this->pev->sequence	= 0;
+//	this->pev->frame = 0;
+//	ResetSequenceInfo();
+	
+	this->pev->effects |= (/*EF_BRIGHTFIELD |*/ EF_DIMLIGHT);
+	
+	this->mTimeCreated = gpGlobals->time;
+
+	SetThink(&AvHScan::ScanThink);
+	this->pev->nextthink = gpGlobals->time + GetGameRules()->GetFirstScanThinkTime();
+	
+	EMIT_SOUND(this->edict(), CHAN_AUTO, kScanSound, 1.0f, ATTN_NORM);
+
+	AvHSUPlayParticleEvent(kpsScanEffect, this->edict(), this->pev->origin);
+}
+
+void AvHScan::ScanThink()
+{
+	// Remove cloaking from nearby enemies
+	FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+		if(theEntity->GetIsRelevant() && (theEntity->pev->team != this->pev->team))
+		{
+			// Check that entity is in range of scan
+			float theDistance = VectorDistance(theEntity->pev->origin, this->pev->origin);
+			if(theDistance < BALANCE_IVAR(kScanRadius))
+			{
+				// Remove cloaking, if player has it
+				theEntity->TriggerUncloak();
+			}
+		}
+	END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+
+	// Look in sphere for cloakables
+	CBaseEntity* theSphereEntity = NULL;
+	while ((theSphereEntity = UTIL_FindEntityInSphere(theSphereEntity, this->pev->origin, BALANCE_IVAR(kScanRadius))) != NULL)
+	{
+		if(!AvHSUGetIsExternalClassName(STRING(theSphereEntity->pev->classname)))
+		{
+			// TODO: Check team here?
+			AvHCloakable* theCloakable = dynamic_cast<AvHCloakable*>(theSphereEntity);
+			if(theCloakable)
+			{
+				theCloakable->Uncloak();
+			}
+		}
+	}
+
+	float theScanTime = GetGameRules()->GetBuildTimeForMessageID(BUILD_SCAN);
+	if(gpGlobals->time < (this->mTimeCreated + theScanTime))
+	{
+		this->pev->nextthink = gpGlobals->time + kScanThinkTime;
+	}
+	else
+	{
+		UTIL_Remove(this);
+	}
+}
+
+
+
+AvHPhaseGate::AvHPhaseGate() : AvHMarineBaseBuildable(TECH_PHASE_GATE, BUILD_PHASEGATE, kwsPhaseGate, AVH_USER3_PHASEGATE)
+{
+	this->mEnabled = false;
+	this->mTimeOfLastDeparture=0.0f;
+	this->mHasWarmedUp=false;
+}
+
+int	AvHPhaseGate::GetSequenceForBoundingBox() const
+{
+	return 1;
+}
+
+void AvHPhaseGate::Killed(entvars_t* inAttacker, int inGib)
+{
+	this->SetEnabled(false);
+	
+	AvHMarineBaseBuildable::Killed(inAttacker, inGib);
+
+	GetGameRules()->MarkDramaticEvent(kPGDeathPriority, this->entindex(), inAttacker);
+}
+
+void AvHPhaseGate::Precache(void)
+{
+	CBaseAnimating::Precache();
+	
+	PRECACHE_UNMODIFIED_MODEL(kPhaseGateModel);
+	PRECACHE_UNMODIFIED_SOUND(kPhaseGateSound);
+	PRECACHE_UNMODIFIED_SOUND(kPhaseGateTransportSound);
+}
+
+void AvHPhaseGate::SetHasBeenBuilt()
+{
+	AvHBuildable::SetHasBeenBuilt();
+
+	// Include a "warm-up" time so movement chambers don't teleport the player immediately
+	// puzl - 555 - undoing this change because a) it didn't work, and b) we suspect it is triggering a crash.
+//	FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+//		if(theEntity->GetIsRelevant() && (theEntity->pev->team == this->pev->team))
+//		{
+//			float theDistanceToPlayer = VectorDistance(this->pev->origin, theEntity->pev->origin);
+//			if(theDistanceToPlayer < 30.0f)
+//			{
+//				theEntity->SetTimeOfLastTeleport(gpGlobals->time);
+//			}
+//		}
+//	END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+	this->mTimeOfLastDeparture=gpGlobals->time;
+	SetThink(&AvHPhaseGate::IdleThink);
+
+	this->pev->nextthink = gpGlobals->time + kBuildingUseWarmupTime;
+}
+
+int	AvHPhaseGate::GetIdleAnimation() const
+{
+	return 0;
+}
+
+void AvHPhaseGate::IdleThink()
+{
+	bool theIsEnabled = false;
+	this->mHasWarmedUp=true;
+	// Check if there are any other phase gates on our team and set our enabled state accordingly
+	bool theDone = false;
+	bool potentialDeadlock=false;
+	int theNumPhaseGates=0;
+	if(this->GetIsBuilt() && !this->GetIsRecycling())
+	{
+		edict_t* thePhaseGateEdict = ENT(this->pev);
+		
+		// Keep looping until we come back to ourself or we find another gate on our team to phase to
+		while(!theDone)
+		{
+			thePhaseGateEdict = FIND_ENTITY_BY_CLASSNAME(thePhaseGateEdict, kwsPhaseGate);
+			AvHPhaseGate* thePhaseGate = dynamic_cast<AvHPhaseGate*>(CBaseEntity::Instance(thePhaseGateEdict));
+			
+			// This assert fails in normal operation, seemingly harmlessly
+			//ASSERT(thePhaseGate);
+			
+			if(thePhaseGateEdict == ENT(this->pev))
+			{
+				theDone = true;
+			}
+			else if((thePhaseGateEdict->v.team == this->pev->team) && thePhaseGate && thePhaseGate->GetIsBuilt() && !thePhaseGate->GetIsRecycling() && thePhaseGate->HasWarmedUp() )
+			{
+				theIsEnabled = true;
+				theDone = true;
+			}
+			theNumPhaseGates++;
+		}
+	}
+
+	AvHBaseBuildable::AnimateThink();
+
+	this->SetEnabled(theIsEnabled);
+
+	this->pev->nextthink = gpGlobals->time + kPhaseGateIdleThink;
+}
+
+void AvHPhaseGate::ResetEntity()
+{
+	this->SetEnabled(false);
+
+	AvHMarineBaseBuildable::ResetEntity();
+}
+
+void AvHPhaseGate::SetEnabled(bool inEnabledState)
+{
+	if(inEnabledState != this->mEnabled)
+	{
+		if(inEnabledState)
+		{
+			// Start animating
+			this->pev->sequence	= 0;
+			this->pev->frame = 0;
+			ResetSequenceInfo();
+			
+			//this->pev->effects |= EF_BRIGHTLIGHT;
+			this->pev->effects |= EF_DIMLIGHT;
+		
+			UTIL_EmitAmbientSound( ENT(this->pev), this->pev->origin, kPhaseGateSound, 1.0f, ATTN_NORM, 0, 100);
+
+			SetUse(&AvHPhaseGate::TeleportUse);
+		
+			this->mEnabled = true;
+		}
+		else
+		{
+			// Stop animating
+			this->pev->sequence	= 1;
+			this->pev->frame = 0;
+			ResetSequenceInfo();
+		
+			this->pev->effects &= ~EF_DIMLIGHT;
+		
+			UTIL_EmitAmbientSound(ENT(this->pev), this->pev->origin, kPhaseGateSound, 1.0f, .5, SND_STOP, 100);
+
+			SetUse(NULL);
+		
+			this->mEnabled = false;
+		}
+	}
+}
+
+bool AvHPhaseGate::GetAreTeammatesBlocking(AvHPlayer* inPlayer, const Vector& inOrigin) const
+{
+	
+    // This is based off the logic of AvHSUKillPlayersTouchingPlayer so that
+    // the results are consistent.
+	
+    bool theResult = false;
+
+    FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+	if(theEntity->GetIsRelevant() && theEntity->pev->team == inPlayer->pev->team)
+	{
+		float theDistanceToPlayer = VectorDistance(inOrigin, theEntity->pev->origin);
+		if(theDistanceToPlayer < 30)
+		{
+            if (gpGlobals->time - theEntity->GetTimeOfLastTeleport() < kPhaseGateAmnestyTime)
+            {
+                theResult = true;
+            }
+		}
+	}
+	END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+
+    return theResult;
+
+}
+
+void AvHPhaseGate::KillBuildablesTouchingPlayer(AvHPlayer* inPlayer, entvars_t* inInflictor)
+{
+
+    FOR_ALL_BASEENTITIES();
+	AvHBaseBuildable* theBuildable = dynamic_cast<AvHBaseBuildable*>(theBaseEntity);
+	if(theBuildable)
+	{
+        if (theBuildable->pev->iuser3 != AVH_USER3_HIVE && theBuildable->pev->iuser3 != AVH_USER3_PHASEGATE)
+        {
+	        float theDistanceToPlayer = VectorDistance(inPlayer->pev->origin, theBuildable->pev->origin);
+		    if(theDistanceToPlayer < 50)
+		    {
+			    theBuildable->TakeDamage(inInflictor, theBuildable->pev, 10000, DMG_GENERIC);
+		    }
+        }
+    }
+    END_FOR_ALL_BASEENTITIES();
+
+}
+bool AvHPhaseGate::HasWarmedUp() const
+{
+	return this->mHasWarmedUp;
+}
+bool AvHPhaseGate::GetIsEnabled() const
+{
+	return this->GetIsBuilt() && this->mEnabled && !this->GetIsRecycling();
+}
+void AvHPhaseGate::SetTimeOfLastDeparture(float timeOfLastDeparture) 
+{
+	mTimeOfLastDeparture=timeOfLastDeparture;
+}
+bool AvHPhaseGate::IsReadyToUse()
+{
+	bool theReturn=false;
+	if ( (gpGlobals->time - mTimeOfLastDeparture) > BALANCE_FVAR(kPhaseGateDepartureInterval) ) 
+	{
+		theReturn=true;
+	}
+	return theReturn;
+}
+
+void AvHPhaseGate::TeleportUse(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value)
+{
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(pActivator);
+	CBasePlayerItem* thePlayerItem = dynamic_cast<CBasePlayerItem*>(pActivator);
+	
+	// Only players on the team of the person that created the phase gate can travel through,
+	bool theTeleportAllowed = (thePlayer != NULL) && (thePlayer->pev->team == this->pev->team) && thePlayer->GetIsAbleToAct();
+	//bool theTeleportAllowed = thePlayerItem || (thePlayer && ((pActivator->pev->team == this->pev->team) && (this->pev->team != 0)));
+	if(theTeleportAllowed && this->GetIsEnabled())
+	{
+		float theLastTeleportTime = thePlayer->GetTimeOfLastTeleport();
+		theTeleportAllowed = (theLastTeleportTime == -1) || ((gpGlobals->time - theLastTeleportTime) >= BALANCE_FVAR(kPhaseGateDelay));
+		if(theTeleportAllowed)
+		{
+			if(!GetGameRules()->GetIsTesting())
+			{
+				// Teleport to "next" gate.  If there isn't more then one gate, respawn the player
+				vec3_t theOrigin;
+				
+				bool theDone = false;
+				bool theSuccess = false;
+				edict_t* thePhaseGateEdict = ENT(this->pev);
+				AvHPhaseGate *theTargetGate=0;
+				// Keep looping until we come back to ourself or we find another gate on our team to phase to
+				while(!theDone)
+				{
+					thePhaseGateEdict = FIND_ENTITY_BY_CLASSNAME(thePhaseGateEdict, kwsPhaseGate);
+					AvHPhaseGate* thePhaseGate = dynamic_cast<AvHPhaseGate*>(CBaseEntity::Instance(thePhaseGateEdict));
+
+					// This assert fails in normal operation, seemingly harmlessly
+					//ASSERT(thePhaseGate);
+					
+					if(thePhaseGateEdict == ENT(this->pev))
+					{
+						theDone = true;
+					}
+					else if((thePhaseGateEdict->v.team == this->pev->team) && thePhaseGate && thePhaseGate->GetIsEnabled() && this->IsReadyToUse() )
+					{
+						// Players come through on top of phase gate, plus a little above
+						theOrigin = thePhaseGateEdict->v.origin;
+					
+						theOrigin.z +=kRespawnFudgeFactorHeight;
+
+						// Add in proper hull size so players don't get stuck
+						Vector thePlayerMinSize, thePlayerMaxSize;						
+						thePlayer->GetSize(thePlayerMinSize, thePlayerMaxSize);
+						theOrigin.z += -thePlayerMinSize.z;
+
+						//Elven Thief - Changed from AvHUGetHull(false to true to allow crouching marines access to phase gates.
+						// check out bug 487
+                        if(AvHSUGetIsEnoughRoomForHull(theOrigin, AvHMUGetHull(true, thePlayer->pev->iuser3), thePlayer->edict(), true, true))
+						{
+							theSuccess = true;
+							theDone = true;
+						}
+                        
+                        // Now check to see if there are any teammates blocking who just phased in.
+                        
+                        if (GetAreTeammatesBlocking(thePlayer, theOrigin))
+                        {
+                            theSuccess = false;
+                            theDone = true;
+                        }
+
+						if ( theDone == true )
+						{
+							theTargetGate=thePhaseGate;
+						}
+
+
+					}
+				}
+				
+				if(theSuccess)
+				{
+					// Mark the player as just having teleported so he doesn't teleport immediately again
+					thePlayer->SetPosition(theOrigin);
+
+					thePlayer->pev->velocity = g_vecZero;
+					thePlayer->SetTimeOfLastTeleport(gpGlobals->time);
+					
+					int theFlags = 0;//thePlayer ? FEV_NOTHOST : 0;
+					this->SetTimeOfLastDeparture(gpGlobals->time);
+					AvHSUPlayPhaseInEffect(theFlags, this, thePlayer);
+
+					AvHSUKillPlayersTouchingPlayer(thePlayer, this->pev);
+                    KillBuildablesTouchingPlayer(thePlayer, this->pev);
+					
+					Vector theFadeColor;
+					theFadeColor.x = 235;
+					theFadeColor.y = 255;
+					theFadeColor.z = 255;
+					UTIL_ScreenFade(thePlayer, theFadeColor, .9f, 0.0f, 255, FFADE_IN);
+
+    			}
+			}
+		}
+	}
+}
+
+void AvHPhaseGate::UpdateOnRecycle(void)
+{
+	this->SetEnabled(false);
+}
+
+void AvHPhaseGate::UpdateOnRemove(void)
+{
+	// Make sure sound gets turned off when round ends without it being killed
+	if(this->pev)
+	{
+		UTIL_EmitAmbientSound(ENT(this->pev), this->pev->origin, kPhaseGateSound, 1.0f, .5, SND_STOP, 100);
+	}
+}
+
+
+//AvHSiegeTurret::AvHSiegeTurret()
+//{
+//	float theStartTime = RANDOM_FLOAT(0, avh_siegerof.value);
+//	this->mTimeLastFired = gpGlobals->time - theStartTime;
+//	this->mTimeToConstruct = GetGameRules()->GetBuildTimeForMessageID(BUILD_SIEGE);
+//}
+//
+//CBaseEntity* AvHSiegeTurret::BestVisibleEnemy(void)
+//{
+//	CBaseEntity *theCurrentEnemy = NULL;
+//	CBaseEntity *theBestEnemy = NULL;
+//	float theDistanceToBestEnemy = -1;
+//	
+//	while((theCurrentEnemy = UTIL_FindEntityInSphere(theCurrentEnemy, this->pev->origin, avh_siegemaxrange.value)) != NULL)
+//	{
+//		// If entity is a valid target and within our valid range
+//		if(this->GetIsValidTarget(theCurrentEnemy))
+//		{
+//			// Is it closer than our current target?
+//			float theDistanceToCurrentEnemy = AvHSUEyeToBodyDistance(this->pev, theCurrentEnemy);
+//			if((theDistanceToBestEnemy == -1) || (theDistanceToCurrentEnemy < theDistanceToBestEnemy))
+//			{
+//				theBestEnemy = theCurrentEnemy;
+//				theDistanceToBestEnemy = theDistanceToCurrentEnemy;
+//			}
+//		}
+//	}
+//	return theBestEnemy;
+//}
+//
+//bool AvHSiegeTurret::GetIsValidTarget(CBaseEntity* inEntity) const
+//{
+//	bool theTargetIsValid = false;
+//	
+//	if(AvHDeployedTurret::GetIsValidTarget(inEntity))
+//	{
+//		float theDistanceToCurrentEnemy = AvHSUEyeToBodyDistance(this->pev, inEntity);
+//		if(theDistanceToCurrentEnemy >= this->GetMinimumRange())
+//		{
+//			// We have to see it as well
+//			Vector vecMid = this->pev->origin + this->pev->view_ofs;
+//			Vector vecMidEnemy = inEntity->BodyTarget(vecMid);
+//			if(FBoxVisible(this->pev, inEntity->pev, vecMidEnemy))
+//			{
+//				theTargetIsValid = true;
+//			}
+//		}
+//	}
+//	return theTargetIsValid;
+//}
+//
+//char* AvHSiegeTurret::GetActiveSound() const
+//{
+//	return kSiegeActive;
+//}
+//
+//char* AvHSiegeTurret::GetAlertSound() const
+//{
+//	return kSiegeAlert;
+//}
+//
+//char* AvHSiegeTurret::GetDeploySound() const
+//{
+//	return kSiegeDeploy;
+//}
+//
+//char* AvHSiegeTurret::GetPingSound() const
+//{
+//	return kSiegePing;
+//}
+//
+//int AvHSiegeTurret::GetPointValueOfTarget(void) const
+//{
+//	return 3;
+//}
+//
+//int	AvHSiegeTurret::GetMinimumRange() const
+//{
+//	return avh_siegeminrange.value;
+//}
+//
+//bool AvHSiegeTurret::NeedsLineOfSight() const
+//{
+//	return true;
+//}
+//
+//void AvHSiegeTurret::Precache(void)
+//{
+//	AvHDeployedTurret::Precache();
+//	
+//	PRECACHE_MODEL(kSiegeTurretModel);
+//	PRECACHE_SOUND(kSiegeTurretFire1);
+//}
+//
+//
+//void AvHSiegeTurret::Shoot(Vector &vecSrc, Vector &vecDirToEnemy)
+//{
+//	// Only fire once every few seconds...this is hacky but there's no way to override think functions so it must be done
+//	// I wish it was easier to change the update rate but it's not so...
+//	if((gpGlobals->time - this->mTimeLastFired) > avh_siegerof.value)
+//	{
+//		// Find enemy player in range, ignore walls and everything else
+//		if(this->m_hEnemy)
+//		{
+//			if(this->GetIsValidTarget(this->m_hEnemy))
+//			{
+//				// Apply damage, taking upgrade into account
+//				float theDamageMultiplier;
+//				AvHPlayerUpgrade::GetWeaponUpgrade(this->pev->iuser4, &theDamageMultiplier);
+//				float theDamage = theDamageMultiplier*avh_siegedamage.value;
+//				
+//				if(!GetGameRules()->GetIsTesting())
+//				{
+//					::RadiusDamage(this->m_hEnemy->pev->origin, this->pev, this->pev, theDamage, avh_siegesplashradius.value, CLASS_NONE, DMG_BLAST);
+//				}
+//				
+//				// Play fire sound
+//				EMIT_SOUND_DYN(ENT(this->pev), CHAN_AUTO, kSiegeTurretFire1, 1.0, ATTN_NORM, 0, PITCH_NORM);
+//				
+//				this->pev->effects &= ~EF_MUZZLEFLASH;
+//				
+//				// Send normal effect to all
+//				PLAYBACK_EVENT_FULL(0, this->m_hEnemy->edict(), gSiegeHitEventID, 0, this->m_hEnemy->pev->origin, this->m_hEnemy->pev->angles, 0.0, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+//				
+//				if(this->m_hEnemy->IsPlayer())
+//				{
+//					// Send personal view shake to recipient only (check for splash here, pass param to lessen effect for others?)
+//					// TODO: Use upgrade level to parameterize screen shake and fade?
+//					PLAYBACK_EVENT_FULL(FEV_HOSTONLY, this->m_hEnemy->edict(), gSiegeViewHitEventID, 0, this->m_hEnemy->pev->origin, this->m_hEnemy->pev->angles, 0.0, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+//					
+//					Vector theFadeColor;
+//					theFadeColor.x = 255;
+//					theFadeColor.y = 100;
+//					theFadeColor.z = 100;
+//					UTIL_ScreenFade(this->m_hEnemy, theFadeColor, .3f, 0.0f, 255, FFADE_OUT);
+//				}
+//			}
+//			else
+//			{
+//				this->m_hEnemy = NULL;
+//			}
+//		}
+//
+//		this->mTimeLastFired = gpGlobals->time;
+//	}
+//}
+//
+//void AvHSiegeTurret::Spawn()
+//{
+//	this->Precache();
+//	AvHDeployedTurret::Spawn();
+//	
+//	SET_MODEL(ENT(this->pev), kSiegeTurretModel);
+//	UTIL_SetSize(pev, kSiegeMinSize, kSiegeMaxSize); 
+//	
+//    this->pev->classname = MAKE_STRING(kwsSiegeTurret);
+//	
+//	this->pev->takedamage = 1;
+//	this->pev->health = (int)(avh_siegehealth.value);
+//	this->pev->armorvalue = (int)(avh_siegehealth.value);
+//}
+
+
+
+AvHMarineBaseBuildable::AvHMarineBaseBuildable(AvHTechID inTechID, AvHMessageID inMessageID, char* inClassName, int inUser4) : AvHBaseBuildable(inTechID, inMessageID, inClassName, inUser4)
+{
+	this->SetEnergy(0.0f);
+}
+
+char* AvHMarineBaseBuildable::GetDeploySound() const
+{
+	return kMarineBuildingDeploy;
+}
+
+bool AvHMarineBaseBuildable::GetIsTechnologyAvailable(AvHMessageID inMessageID) const
+{
+	bool theIsAvailable = AvHBaseBuildable::GetIsTechnologyAvailable(inMessageID);
+	
+	// Disable scanning if not enough energy
+	if(theIsAvailable && AvHSHUGetDoesTechCostEnergy(inMessageID))
+	{
+		int theEnergyCost = GetGameRules()->GetCostForMessageID(inMessageID);
+		if(this->mEnergy < theEnergyCost)
+		{
+			theIsAvailable = false;
+		}
+	}
+	
+	return theIsAvailable;
+}
+
+char* AvHMarineBaseBuildable::GetKilledSound() const
+{
+	return kMarineBuildingKilled;
+}
+
+int	AvHMarineBaseBuildable::GetPointValue() const
+{
+	return BALANCE_IVAR(kScoringMarineBuildableValue);
+}
+
+int AvHMarineBaseBuildable::GetTakeDamageAnimation() const
+{
+    return -1;
+}
+
+void AvHMarineBaseBuildable::ResetEntity()
+{
+	AvHBaseBuildable::ResetEntity();
+}
+
+void AvHMarineBaseBuildable::SetEnergy(float inEnergy)
+{
+	this->mEnergy = max(min(inEnergy, kMarineStructureMaxEnergy), 0.0f);
+	
+	float theNormValue = this->mEnergy/kMarineStructureMaxEnergy;
+
+	if(this->pev && this->GetIsBuilt())
+	{
+		AvHSHUSetEnergyState(this->pev->iuser3, this->pev->fuser1, theNormValue);
+	}
+}
+
+int AvHMarineBaseBuildable::TakeDamage(entvars_t* inInflictor, entvars_t* inAttacker, float inDamage, int inBitsDamageType)
+{
+	//UTIL_Sparks()
+
+	return AvHBaseBuildable::TakeDamage(inInflictor, inAttacker, inDamage, inBitsDamageType);
+}
+
+void AvHMarineBaseBuildable::TechnologyBuilt(AvHMessageID inMessageID)
+{
+	// Pay energy cost
+	if(AvHSHUGetDoesTechCostEnergy(inMessageID))
+	{
+		int theEnergyCost = GetGameRules()->GetCostForMessageID(inMessageID);
+		float theNewEnergy = max(this->mEnergy - theEnergyCost, 0.0f);
+		this->SetEnergy(theNewEnergy);
+
+		// Play animation?
+		this->PlayAnimationAtIndex(this->GetActiveAnimation(), true);
+	}
+}
+
+// Marine buildings
+const float kNukeThinkInterval = 1.5f;
+
+AvHNuke::AvHNuke() : AvHMarineBaseBuildable(TECH_NULL, BUILD_NUKE, kwsNuke, AVH_USER3_NUKE)
+{
+}
+
+void AvHNuke::Precache()
+{
+	AvHMarineBaseBuildable::Precache();
+	PRECACHE_UNMODIFIED_SOUND(kNukeActive);
+	PRECACHE_UNMODIFIED_SOUND(kNukeExplode);
+}
+
+void AvHNuke::ActiveThink()
+{
+	float theThinkInterval = kNukeThinkInterval;
+
+	// If not active
+	if(!this->mActive)
+	{
+		// Set construction complete
+		this->SetConstructionComplete();
+
+		// Play sounds
+
+		// Set active
+		this->mActive = true;
+
+		// Mark as a monster
+		SetBits(this->pev->flags, FL_MONSTER);
+
+		this->mTimeActivated = gpGlobals->time;
+	}
+	
+	// Emit higher and higher frequency sound
+	float theTimeToDetonate = GetGameRules()->GetBuildTimeForMessageID(this->GetMessageID());
+	
+	float thePercentDone = (gpGlobals->time - this->mTimeActivated)/theTimeToDetonate;
+	thePercentDone = min(max(0.0f, thePercentDone), 1.0f);
+	
+	int thePitch = 100 + thePercentDone*3;
+	EMIT_SOUND_DYN(ENT(pev), CHAN_BODY, kNukeActive, 1.0, ATTN_NORM, 0, thePitch);
+	
+	// If active
+	if(this->mActive)
+	{
+		// If enough time has passed
+		ASSERT(this->mTimeActivated != -1);
+		
+		if(gpGlobals->time > (this->mTimeActivated + theTimeToDetonate))
+		{
+			// Detonation visuals (any bigger magnitude then this and the explosion doesn't show up)
+			int theMagnitude = 300;
+			ExplosionCreate(this->pev->origin, this->pev->angles, this->edict(), theMagnitude, FALSE, this->pev->team);
+			
+			// Do damage (theDamage at epicenter, falls off from there, doesn't hurt people in water, only hurts people that can be seen by blast)
+			float theDamage = kNukeDamage;
+			float theRadius = kNukeRange;
+			::RadiusDamage(this->pev->origin, this->pev, this->pev, theDamage, theRadius, CLASS_NONE, DMG_BLAST);
+			
+			// Play view shake here
+			float theShakeAmplitude = 100;
+			float theShakeFrequency = 150;
+			float theShakeDuration = 10.0f;
+			float theShakeRadius = 2000;
+			UTIL_ScreenShake(this->pev->origin, theShakeAmplitude, theShakeFrequency, theShakeDuration, theShakeRadius);
+			
+			// Add white out effect for players in radius
+			FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+				if(theEntity->GetIsRelevant() && !theEntity->GetIsInTopDownMode())
+				{
+					// If near the epicenter, or if it's visible, we're blinded
+					bool theNearEpicenter = false;
+					float theDistance = VectorDistance(theEntity->pev->origin, this->pev->origin);
+					if(theDistance < theRadius/2)
+					{
+						theNearEpicenter = true;
+					}
+
+					bool theExplosionVisible = false;
+					if(theEntity->GetIsEntityInSight(this))
+					{
+						theExplosionVisible = true;
+					}
+
+					if(theNearEpicenter || theExplosionVisible)
+					{
+						Vector theFadeColor;
+						theFadeColor.x = 255;
+						theFadeColor.y = 255;
+						theFadeColor.z = 255;
+						UTIL_ScreenFade(theEntity, theFadeColor, 1.5f, .5f, 255, FFADE_IN);
+					}
+				}
+			END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+
+			//this->pev->flags |= EF_NODRAW;
+			SET_MODEL(ENT(pev), kNullModel);
+			this->pev->flags |= EF_BRIGHTFIELD;
+			this->pev->flags |= EF_BRIGHTLIGHT;
+				
+			// Remove entity
+			SetThink(&AvHNuke::DeathThink);
+			theThinkInterval = theShakeDuration;
+
+			// Play special nuke sound (not playing for some reason)
+			EMIT_SOUND(this->edict(), CHAN_BODY, kNukeExplode, 1.0f, ATTN_IDLE);
+		}
+	}
+	
+	this->pev->nextthink = gpGlobals->time + theThinkInterval;
+}
+
+void AvHNuke::DeathThink()
+{
+	UTIL_Remove(this);
+}
+
+void AvHNuke::Spawn()
+{
+	AvHBaseBuildable::Spawn();
+	
+	// Set ActiveThink
+	this->mActive = false;
+	this->mTimeActivated = -1;
+
+	SetThink(&AvHNuke::ActiveThink);
+	this->pev->nextthink = gpGlobals->time + kNukeThinkInterval;
+}
+
+char* AvHNuke::GetDeploySound() const
+{
+	return kNukeDeploy;
+}
+
+char* AvHNuke::GetKilledSound() const
+{
+	return kNukeKilled;
+}
+
+
+const float kInfantryPortalThinkTime = 1.0f;
+
+AvHInfantryPortal::AvHInfantryPortal() : AvHMarineBaseBuildable(TECH_INFANTRYPORTAL, BUILD_INFANTRYPORTAL, kwsInfantryPortal, AVH_USER3_INFANTRYPORTAL)
+{
+}
+
+void AvHInfantryPortal::Killed(entvars_t* inAttacker, int inGib)
+{
+	AvHBaseBuildable::Killed(inAttacker, inGib);
+
+	GetGameRules()->MarkDramaticEvent(kIPDeathPriority, this->entindex(), inAttacker);
+}
+
+float AvHInfantryPortal::GetReinforceTime() const
+{
+	float theReinforceTime = BALANCE_IVAR(kMarineRespawnTime);
+
+	if(GetGameRules()->GetCheatsEnabled())
+	{
+		theReinforceTime = 2;
+	}
+
+	theReinforceTime = max(0, theReinforceTime);
+
+	return theReinforceTime;
+}
+
+void AvHInfantryPortal::PortalThink()
+{
+	this->UpdateReinforcements();
+
+	AvHBaseBuildable::AnimateThink();
+
+	this->pev->nextthink = gpGlobals->time + kInfantryPortalThinkTime; 
+}
+
+
+void AvHInfantryPortal::ResetEntity()
+{
+	AvHMarineBaseBuildable::ResetEntity();
+	AvHReinforceable::ResetEntity();
+}
+
+void AvHInfantryPortal::SetHasBeenBuilt()
+{
+	AvHBuildable::SetHasBeenBuilt();
+
+	SetThink(&AvHInfantryPortal::PortalThink);
+	this->pev->nextthink = gpGlobals->time + kInfantryPortalThinkTime; 
+}
+
+void AvHInfantryPortal::Precache()
+{
+	AvHMarineBaseBuildable::Precache();
+
+	PRECACHE_UNMODIFIED_SOUND(kTransportSound);
+}
+
+
+void AvHInfantryPortal::CueRespawnEffect(AvHPlayer* inPlayer)
+{
+	// Playback teleporting event
+	PLAYBACK_EVENT_FULL(0, inPlayer->edict(), gTeleportEventID, 0, inPlayer->pev->origin, inPlayer->pev->angles, 0.0, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+
+	EMIT_SOUND(ENT(this->pev), CHAN_AUTO, kTransportSound, .8, ATTN_NORM);
+}
+
+bool AvHInfantryPortal::GetCanReinforce() const
+{
+	return this->GetIsBuilt() && !GetGameRules()->GetIsCombatMode();
+}
+
+bool AvHInfantryPortal::GetSpawnLocationForPlayer(CBaseEntity* inPlayer, Vector& outLocation) const
+{
+	// Set player position to on top of gate
+	vec3_t thePosition = AvHSHUGetRealLocation(this->pev->origin, this->pev->mins, this->pev->maxs);
+
+	Vector theIPMinSize, theIPMaxSize;
+	AvHSHUGetSizeForTech(BUILD_INFANTRYPORTAL, theIPMinSize, theIPMaxSize);
+	thePosition.z += theIPMaxSize.z;
+
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inPlayer);
+	ASSERT(thePlayer);
+
+	// Respawn player on top of portal
+	Vector thePlayerMinSize, thePlayerMaxSize;						
+	thePlayer->GetSize(thePlayerMinSize, thePlayerMaxSize);
+
+	thePosition.z += (-thePlayerMinSize.z + kRespawnFudgeFactorHeight);
+	
+	VectorCopy(thePosition, outLocation);
+	
+	return true;
+}
+
+AvHTeamNumber AvHInfantryPortal::GetReinforceTeamNumber() const
+{
+	return this->GetTeamNumber();
+}
+
+void AvHInfantryPortal::ResetReinforcingPlayer(bool inSuccess)
+{
+	// If we're respawning, we telefrag.  Make sure to telefrag after the player's new location has been set
+	bool theTelefrag = false;
+	AvHPlayer* thePlayer = this->GetReinforcingPlayer();
+	if(inSuccess && thePlayer)
+	{
+		theTelefrag = true;
+	}
+
+	AvHReinforceable::ResetReinforcingPlayer(inSuccess);
+
+	if(theTelefrag)
+	{
+		AvHSUKillPlayersTouchingPlayer(thePlayer, this->pev);
+	}
+}
+
+void AvHInfantryPortal::UpdateOnRecycle(void)
+{
+	this->ResetReinforcingPlayer(false);
+}
+
+void AvHInfantryPortal::UpdateOnRemove(void)
+{
+	this->ResetReinforcingPlayer(false);
+	SetThink(NULL);
+}
+
+int AvHInfantryPortal::GetIdleAnimation() const
+{
+	// AvHBaseBuildable randomly shows Idle2, which we don't have in this model.
+	return 2;
+}	
+
+int AvHInfantryPortal::GetIdle1Animation() const
+{
+	// AvHBaseBuildable randomly shows Idle2, which we don't have in this model.
+	return 2;
+}	
+
+int AvHInfantryPortal::GetIdle2Animation() const
+{
+	// AvHBaseBuildable randomly shows Idle2, which we don't have in this model.
+	return 2;
+}	
+
+const int kCommandStationExitAnimation = 12;
+
+AvHCommandStation::AvHCommandStation() : AvHMarineBaseBuildable(TECH_COMMAND_CENTER, BUILD_COMMANDSTATION, kwsTeamCommand, AVH_USER3_COMMANDER_STATION)
+{
+	this->mCommanderAtThisStation = -1;
+	this->mTimeToPlayOnlineSound = -1;
+}
+
+int	AvHCommandStation::GetIdleAnimation() const
+{
+	int theAnimation = 2;
+
+	// If we're in use
+	if(this->mCommanderAtThisStation != -1 || GetGameRules()->GetIsCombatMode())
+	{
+		theAnimation = 3;
+	}
+	else
+	{
+		int a = 0;
+	}
+
+	return theAnimation;
+}
+
+int AvHCommandStation::GetPointValue() const
+{
+	return BALANCE_IVAR(kScoringCCValue);
+}
+
+void AvHCommandStation::Killed( entvars_t *pevAttacker, int iGib )
+{
+    this->SetInactive();
+
+    AvHMarineBaseBuildable::Killed(pevAttacker, iGib);
+}
+
+int	AvHCommandStation::ObjectCaps( void ) 
+{ 
+	
+    // Recycled command stations cannot be used.
+
+    int theObjectCaps = 0;
+    
+    if ( !(pev->effects & EF_NODRAW) )
+    {
+        theObjectCaps |= FCAP_CONTINUOUS_USE;
+    }
+
+    return theObjectCaps;
+
+}
+
+void AvHCommandStation::CommandTouch(CBaseEntity* pOther)
+{
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(pOther);
+	if(thePlayer)
+	{
+		AvHTeamNumber theStationTeamNumber = this->GetTeamNumber();
+		if(thePlayer->pev->team == theStationTeamNumber)
+		{
+			// Check to see if we already have a commander and don't make the person a commander if so
+			if(GetGameRules()->GetNumCommandersOnTeam(theStationTeamNumber) == 0)
+			{
+				thePlayer->SendMessage(kHelpTextCSAttractMode, true);
+			}
+		}
+	}
+}
+
+void AvHCommandStation::CommandUse( CBaseEntity* pActivator, CBaseEntity* pCaller, USE_TYPE useType, float value )
+{
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(pActivator);
+
+	// Mapper-placed CCs can be killed but they don't go away
+	if(thePlayer && !(thePlayer->pev->flags & FL_FAKECLIENT) && !this->GetHasBeenKilled() && thePlayer->GetIsAbleToAct())
+	{
+		AvHTeam* theTeam = thePlayer->GetTeamPointer();
+		if(theTeam && (theTeam->GetTeamType() == AVH_CLASS_TYPE_MARINE))
+		{
+			AvHTeamNumber theStationTeamNumber = this->GetTeamNumber();
+			if(thePlayer->pev->team == theStationTeamNumber)
+			{
+				// Check to see if we already have a commander and don't make the person a commander if so
+				if(GetGameRules()->GetNumCommandersOnTeam(theStationTeamNumber) == 0)
+				{
+					string theErrorMessage;
+					if(thePlayer->GetCanCommand(theErrorMessage))
+					{
+						if(this->pev->health > 0 && !this->GetIsRecycling())
+						{
+							thePlayer->SetUser3(AVH_USER3_COMMANDER_PLAYER);
+							//thePlayer->SetSelection(this->entindex());
+						
+							EMIT_SOUND(ENT(this->pev), CHAN_AUTO, kCommandStationStartSound, .8, kCommandStationAttenuation);
+						
+							SetThink(&AvHCommandStation::CommanderUsingThink);
+							this->pev->nextthink = gpGlobals->time + kCommandStationThinkInterval;
+							
+							const char* theTarget = (theStationTeamNumber == TEAM_ONE) ? kTargetCommandStationUseTeamOne : kTargetCommandStationUseTeamTwo;
+							FireTargets(theTarget, NULL, NULL, USE_TOGGLE, 0.0f);
+						
+							this->mCommanderAtThisStation = thePlayer->entindex();
+
+							this->PlayAnimationAtIndex(5, true);
+							
+							this->mTimeToPlayOnlineSound = this->GetTimeAnimationDone();
+
+							GetGameRules()->MarkDramaticEvent(kCCNewCommanderPriority, thePlayer, this);
+						}
+						else
+						{
+							thePlayer->SendMessage(kCommandStationDestroyed, true);
+						}
+					}
+					else
+					{
+						thePlayer->SendMessage(theErrorMessage.c_str());
+					}
+				}
+				else
+				{
+					// The player somehow touches the command station while still a commander
+					if(thePlayer->GetUser3() != AVH_USER3_COMMANDER_PLAYER)
+					{
+						thePlayer->SendMessage(kCommandStationInUse, true);
+					}
+				}
+			}
+			else
+			{
+				thePlayer->SendMessage(kCommandStationForOtherTeam, true);
+			}
+		}
+	}
+}
+
+void AvHCommandStation::Precache(void)
+{
+	AvHMarineBaseBuildable::Precache();
+
+	PRECACHE_UNMODIFIED_MODEL(kCommandStationModel);
+	PRECACHE_UNMODIFIED_SOUND(kCommandStationStartSound);
+	PRECACHE_UNMODIFIED_SOUND(kCommandStationEndSound);
+}
+
+void AvHCommandStation::ActivateThink(void)
+{
+	// Don't allow use of the Command station in Combat mode
+	if(!GetGameRules()->GetIsCombatMode())
+	{
+		SetTouch(&AvHCommandStation::CommandTouch);
+		SetUse(&AvHCommandStation::CommandUse);
+	}
+	
+	SetThink(&AvHBaseBuildable::AnimateThink);
+	this->pev->nextthink = gpGlobals->time + .1f;
+}
+
+void AvHCommandStation::SetHasBeenBuilt()
+{
+	AvHBuildable::SetHasBeenBuilt();
+
+	SetThink(&AvHCommandStation::ActivateThink);
+	this->pev->nextthink = gpGlobals->time + 2.0f;
+}
+
+void AvHCommandStation::EjectCommander()
+{
+	// If this command station had a commander, log him out!
+	if(this->mCommanderAtThisStation != -1)
+	{
+		// if the command station is killed, kick out any commander
+		FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+			if(theEntity->pev->team == this->pev->team)
+			{
+				if(theEntity->GetUser3() == AVH_USER3_COMMANDER_PLAYER)
+				{
+					theEntity->StopTopDownMode();
+					theEntity->SetUser3(AVH_USER3_MARINE_PLAYER);
+					
+					this->PlayAnimationAtIndex(kCommandStationExitAnimation, true);
+
+					GetGameRules()->MarkDramaticEvent(kCCEjectPriority, theEntity, this);
+
+					break;
+				}
+			}
+			END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+	}
+	
+	this->mCommanderAtThisStation = -1;
+}
+
+char* AvHCommandStation::GetKilledSound() const
+{
+	return kCommandStationDeathSound;
+}
+
+
+void AvHCommandStation::SetInactive()
+{
+	AvHBaseBuildable::SetInactive();
+
+	this->EjectCommander();
+}
+
+void AvHCommandStation::Materialize()
+{
+	AvHMarineBaseBuildable::Materialize();
+
+	this->mCommanderAtThisStation = -1;
+	
+	//this->ResetEntity();
+}
+
+void AvHCommandStation::Spawn(void)
+{
+	AvHMarineBaseBuildable::Spawn();
+
+	this->Materialize();
+}
+
+int	AvHCommandStation::TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType )
+{
+	int theReturnCode = 0;
+
+	if(this->pev->health > 0)
+	{
+		theReturnCode = AvHBaseBuildable::TakeDamage(pevInflictor, pevAttacker, flDamage, bitsDamageType);
+
+		if(this->pev->health <= 0)
+		{
+			AvHTeamNumber theStationTeamNumber = (AvHTeamNumber)this->pev->team;
+			const char* theTarget = (theStationTeamNumber == TEAM_ONE) ? kTargetCommandStationDestroyedTeamOne : kTargetCommandStationDestroyedTeamTwo;
+			FireTargets(theTarget, NULL, NULL, USE_TOGGLE, 0.0f);
+
+			GetGameRules()->MarkDramaticEvent(kCCDeathPriority, this->entindex(), false, pevAttacker);
+		}
+	}
+	
+	return theReturnCode;
+}
+
+
+void AvHCommandStation::CommanderUsingThink(void)
+{
+	AvHTeamNumber theStationTeamNumber = this->GetTeamNumber();
+	
+	// Check to see if we already have a commander and don't make the person a commander if so
+	if(GetGameRules()->GetNumCommandersOnTeam(theStationTeamNumber) == 0)
+	{
+		this->mCommanderAtThisStation = -1;
+		this->mTimeToPlayOnlineSound = -1;
+		
+		EMIT_SOUND(ENT(this->pev), CHAN_AUTO, kCommandStationEndSound, .8, kCommandStationAttenuation);
+		this->PlayAnimationAtIndex(kCommandStationExitAnimation, true);
+
+		//SetThink(NULL);
+		SetThink(&AvHBaseBuildable::AnimateThink);
+		this->pev->nextthink = gpGlobals->time + .1f;
+	}
+	else
+	{
+		if(this->mTimeToPlayOnlineSound > 0.0f)
+		{
+			if(gpGlobals->time > this->mTimeToPlayOnlineSound)
+			{
+				ASSERT(this->mCommanderAtThisStation > 0);
+				
+				// If enough time has passed and we haven't played online sound, play it
+				AvHPlayer* theCommander = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(this->mCommanderAtThisStation)));
+				if(theCommander)
+				{
+					theCommander->PlayHUDSound(HUD_SOUND_MARINE_CCONLINE);
+				}
+				
+				this->mTimeToPlayOnlineSound = -1;
+			}
+		}
+	
+		AvHBaseBuildable::AnimateThink();
+		
+		this->pev->nextthink = gpGlobals->time + kCommandStationThinkInterval;
+	}
+}
+
+bool AvHCommandStation::GetIsTechnologyAvailable(AvHMessageID inMessageID) const
+{
+    bool theTechIsAvailable = AvHMarineBaseBuildable::GetIsTechnologyAvailable(inMessageID);
+
+    // Only allow CC to be recycled if it's unoccupied
+    if(inMessageID == BUILD_RECYCLE)
+    {
+        theTechIsAvailable = (this->mCommanderAtThisStation == -1);
+    }
+
+    return theTechIsAvailable;
+}
+
+AvHTurretFactory::AvHTurretFactory() : AvHMarineBaseBuildable(TECH_TURRET_FACTORY, BUILD_TURRET_FACTORY, kwsTurretFactory, AVH_USER3_TURRET_FACTORY)
+{
+}
+
+void AvHTurretFactory::CheckTurretEnabledState() const
+{
+	// Check to see if turrets should come online
+	FOR_ALL_ENTITIES(kwsDeployedTurret, AvHMarineTurret*)
+	if(theEntity->pev->team == this->pev->team)
+	{
+		theEntity->CheckEnabledState();
+	}
+	END_FOR_ALL_ENTITIES(kwsDeployedTurret);
+		
+	FOR_ALL_ENTITIES(kwsSiegeTurret, AvHSiegeTurret*)
+	if(theEntity->pev->team == this->pev->team)
+	{
+		theEntity->CheckEnabledState();
+	}
+	END_FOR_ALL_ENTITIES(kwsSiegeTurret)
+}
+
+void AvHTurretFactory::TriggerAddTech() const
+{
+	AvHBuildable::TriggerAddTech();
+
+	this->CheckTurretEnabledState();
+}
+
+void AvHTurretFactory::TriggerRemoveTech() const
+{
+	AvHBuildable::TriggerRemoveTech();
+
+	this->CheckTurretEnabledState();
+}
+
+int	AvHTurretFactory::GetIdle1Animation() const
+{
+	int theAnimation = 3;
+
+	// Different animation when electrified
+	if(GetHasUpgrade(this->pev->iuser4, MASK_UPGRADE_11))
+	{
+		theAnimation = 12;
+	}
+
+	return theAnimation;
+}
+
+int	AvHTurretFactory::GetIdle2Animation() const
+{
+	return this->GetIdle1Animation();
+}
+
+int AvHTurretFactory::GetResearchAnimation() const
+{
+	return 4;
+}
+
+void AvHTurretFactory::SetHasBeenBuilt()
+{
+	AvHBuildable::SetHasBeenBuilt();
+
+	// Animate
+	SetThink(&AvHBaseBuildable::AnimateThink);
+	this->pev->nextthink = gpGlobals->time + .1f;
+}
+
+bool AvHTurretFactory::GetSupportsTechID(AvHTechID	inTechID) const
+{
+	bool theSuccess = AvHBuildable::GetSupportsTechID(inTechID);
+	
+	if(this->GetTechID() == TECH_ADVANCED_TURRET_FACTORY)
+	{
+		if(!theSuccess)
+		{
+			// Adv. turret factory also counts as a turret factory
+			theSuccess = (inTechID == TECH_TURRET_FACTORY);
+		}
+	}
+	
+	return theSuccess;
+}
+
+void AvHTurretFactory::Upgrade()
+{
+	// Set iuser3
+	this->pev->iuser3 = AVH_USER3_ADVANCED_TURRET_FACTORY;
+
+	// Set classname
+	this->pev->classname = MAKE_STRING(kwsAdvancedTurretFactory);
+
+	this->mMessageID = TURRET_FACTORY_UPGRADE;
+	this->SetTechID(TECH_ADVANCED_TURRET_FACTORY);
+
+	this->SetSelectID(this->pev->iuser3);
+
+	this->SetConstructionComplete(true);
+
+	this->HealthChanged();
+}
+
+
+AvHArmory::AvHArmory() : AvHMarineBaseBuildable(TECH_ARMORY, BUILD_ARMORY, kwsArmory, AVH_USER3_ARMORY)
+{
+}
+
+int	AvHArmory::GetSequenceForBoundingBox() const
+{
+	return 2;
+}
+
+bool AvHArmory::GetSupportsTechID(AvHTechID	inTechID) const
+{
+	bool theSuccess = AvHBuildable::GetSupportsTechID(inTechID);
+
+	if(this->GetTechID() == TECH_ADVANCED_ARMORY)
+	{
+		// Adv. armory also counts as an armory
+		if(!theSuccess)
+		{
+			theSuccess = (inTechID == TECH_ARMORY);
+		}
+	}
+
+	return theSuccess;
+}
+
+int	AvHArmory::GetIdle1Animation() const
+{
+	int theAnim = 2;
+	if(this->pev->iuser3 == AVH_USER3_ADVANCED_ARMORY)
+	{
+		theAnim = 3;
+	}
+	return theAnim;
+}
+
+int	AvHArmory::GetIdle2Animation() const
+{
+	return this->GetIdle1Animation();
+}
+
+int	AvHArmory::GetActiveAnimation() const
+{
+	int theAnim = 5;
+	if(this->pev->iuser3 == AVH_USER3_ADVANCED_ARMORY)
+	{
+		theAnim = 12;
+	}
+	return theAnim;
+}
+
+int	AvHArmory::GetResearchAnimation() const
+{
+	return 5;
+}
+
+void AvHArmory::Precache()
+{
+	AvHMarineBaseBuildable::Precache();
+	
+	PRECACHE_UNMODIFIED_SOUND(kArmoryResupplySound);
+}
+
+void AvHArmory::ResupplyUse(CBaseEntity* inActivator, CBaseEntity* inCaller, USE_TYPE inUseType, float inValue)
+{
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inCaller);
+	
+	if(thePlayer && (thePlayer->pev->team == this->pev->team) && this->GetIsBuilt() && !this->GetIsRecycling() && thePlayer->GetIsAbleToAct())
+	{
+        if(thePlayer->GetCanBeResupplied())
+        {
+            // Give health back occasionally
+            bool theGiveHealthIfNeeded = (RANDOM_LONG(0, 3) == 0);
+            
+            thePlayer->Resupply(theGiveHealthIfNeeded);
+
+            // Always play "getting ammo" sound when ammo or health are needed, to indicate to player when to stop pressing +use
+            EMIT_SOUND(thePlayer->edict(), CHAN_WEAPON, kArmoryResupplySound, .3f, ATTN_NORM);
+        }
+	}
+}
+
+//const float kArmoryThinkTime = 1.0f;
+//const float kArmoryResupplyRadius = 100;
+//
+//void AvHArmory::ResupplyThink()
+//{
+//	bool theIsResearching = false;
+//
+//	// If we're not upgrading and building is fully built
+//	AvHTeam* theTeam = GetGameRules()->GetTeam(this->GetTeamNumber());
+//	if(this->GetIsBuilt() && theTeam && !theTeam->GetResearchManager().GetIsResearching(this->entindex()))
+//	{
+//		// Search in radius for friendly players
+//		CBaseEntity* theEntity = NULL;
+//		while((theEntity = UTIL_FindEntityInSphere(theEntity, this->pev->origin, kArmoryResupplyRadius)) != NULL)
+//		{
+//			AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntity);
+//			if(thePlayer)
+//			{
+//				if(thePlayer->GetIsRelevant() && (thePlayer->GetTeam() == this->GetTeamNumber()) && !thePlayer->GetIsInTopDownMode())
+//				{
+//					// If player has an active item
+//					AvHBasePlayerWeapon* theBaseWeapon = dynamic_cast<AvHBasePlayerWeapon*>(thePlayer->m_pActiveItem);
+//					if(theBaseWeapon && theBaseWeapon->UsesAmmo() && !theBaseWeapon->GetIsFiring())
+//					{
+//						if(theBaseWeapon->Resupply())
+//						{
+//							// Play "getting ammo" sound
+//							EMIT_SOUND(thePlayer->edict(), CHAN_WEAPON, kArmoryResupplySound, .3f, ATTN_NORM);
+//						}
+//					}
+//				}
+//			}
+//		}
+//	}
+//
+//	this->pev->nextthink = gpGlobals->time + kArmoryThinkTime;
+//}
+
+void AvHArmory::SetHasBeenBuilt()
+{
+	AvHBuildable::SetHasBeenBuilt();
+
+	SetUse(&AvHArmory::ResupplyUse);
+}
+
+void AvHArmory::Upgrade()
+{
+	// Set iuser3
+	this->pev->iuser3 = AVH_USER3_ADVANCED_ARMORY;
+
+	// Set classname
+	this->pev->classname = MAKE_STRING(kwsAdvancedArmory);
+
+	this->mMessageID = ARMORY_UPGRADE;
+	this->SetTechID(TECH_ADVANCED_ARMORY);
+
+	this->SetSelectID(this->pev->iuser3);
+
+	this->SetConstructionComplete(true);
+
+	this->HealthChanged();
+}
+
+
+AvHArmsLab::AvHArmsLab() : AvHMarineBaseBuildable(TECH_ARMSLAB, BUILD_ARMSLAB, kwsArmsLab, AVH_USER3_ARMSLAB)
+{
+}
+
+int	AvHArmsLab::GetResearchAnimation() const
+{
+	return 5;
+}
+
+int	AvHArmsLab::GetSequenceForBoundingBox() const
+{
+	return 1;
+}
+
+AvHPrototypeLab::AvHPrototypeLab() : AvHMarineBaseBuildable(TECH_PROTOTYPE_LAB, BUILD_PROTOTYPE_LAB, kwsPrototypeLab, AVH_USER3_PROTOTYPE_LAB)
+{
+}
+
+
+const float kObservatoryThinkTime = 1.0f;
+const float kObservatoryStartEnergy = 25;
+
+AvHObservatory::AvHObservatory() : AvHMarineBaseBuildable(TECH_OBSERVATORY, BUILD_OBSERVATORY, kwsObservatory, AVH_USER3_OBSERVATORY)
+{
+}
+
+int	AvHObservatory::GetSequenceForBoundingBox() const
+{
+	return 1;
+}
+
+void AvHObservatory::ObservatoryThink()
+{
+	// Remove cloaking from nearby enemies
+	if ( !this->GetIsRecycling() ) {
+		FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+		if(theEntity->GetIsRelevant() && (theEntity->pev->team != this->pev->team))
+		{
+			// Check that entity is in range of scan
+			float theDistance = VectorDistance2D(theEntity->pev->origin, this->pev->origin);
+			if(theDistance < BALANCE_IVAR(kObservatoryXYDetectionRadius))
+			{
+				// Remove cloaking, if player has it
+				theEntity->TriggerUncloak();
+			}
+		}
+		END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+	}
+
+	AvHBaseBuildable::AnimateThink();
+
+	// Update scanning energy
+	float theRate = kMarineStructureEnergyRate;
+	if(GetGameRules()->GetCheatsEnabled() && !GetGameRules()->GetIsCheatEnabled(kcSlowResearch))
+	{
+		theRate *= 6;
+	}
+
+	this->SetEnergy(this->mEnergy + (kObservatoryThinkTime*theRate));
+
+	this->pev->nextthink = gpGlobals->time + kObservatoryThinkTime;
+}
+
+void AvHObservatory::Materialize()
+{
+	AvHMarineBaseBuildable::Materialize();
+}
+
+void AvHObservatory::ResetEntity()
+{
+	AvHMarineBaseBuildable::ResetEntity();
+
+	this->SetEnergy(0);
+}
+
+void AvHObservatory::SetHasBeenBuilt()
+{
+	AvHBuildable::SetHasBeenBuilt();
+
+	SetThink(&AvHObservatory::ObservatoryThink);
+	this->pev->nextthink = gpGlobals->time + kObservatoryThinkTime;
+
+	this->SetEnergy(kObservatoryStartEnergy);
+}
+
+void AvHObservatory::Spawn()
+{
+	AvHMarineBaseBuildable::Spawn();
+}
+
+int	AvHObservatory::GetActiveAnimation() const
+{
+	return 2;
+}
+
+int	AvHObservatory::GetIdle1Animation() const
+{
+	return 3;
+}
+
+int	AvHObservatory::GetIdle2Animation() const
+{
+	return 3;
+}
+
+int	AvHObservatory::GetResearchAnimation() const
+{
+	return 4;
+}
+
+//AvHChemLab::AvHChemLab() : AvHMarineBaseBuildable(TECH_CHEMLAB, BUILD_CHEMLAB, kwsChemlab, AVH_USER3_CHEMLAB)
+//{
+//}
+
+//AvHMedLab::AvHMedLab() : AvHMarineBaseBuildable(TECH_MEDLAB, BUILD_MEDLAB, kwsMedlab, AVH_USER3_MEDLAB)
+//{
+//}
+
+//AvHNukePlant::AvHNukePlant() : AvHMarineBaseBuildable(TECH_NUKE_PLANT, BUILD_NUKE_PLANT, kwsNukePlant, AVH_USER3_NUKEPLANT)
+//{
+//}
+
diff --git a/main/source/mod/AvHMarineEquipment.h b/main/source/mod/AvHMarineEquipment.h
new file mode 100644
index 00000000..bcc2da03
--- /dev/null
+++ b/main/source/mod/AvHMarineEquipment.h
@@ -0,0 +1,566 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHMarineEquipment.h $
+// $Date: 2002/11/06 01:40:17 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHMarineEquipment.h,v $
+// Revision 1.29  2002/11/06 01:40:17  Flayra
+// - Turrets now need an active turret factory to keep firing
+//
+// Revision 1.28  2002/10/24 21:32:16  Flayra
+// - All heavy armor to be given via console
+// - Fix for AFKers on inf portals, also for REIN players when recycling portals
+//
+// Revision 1.27  2002/10/16 20:54:30  Flayra
+// - Added phase gate sound
+// - Fixed ghostly command station view model problem after building it
+//
+// Revision 1.26  2002/10/16 01:00:33  Flayra
+// - Phasegates play looping sound, and stop it when they are destroyed
+//
+// Revision 1.25  2002/09/23 22:21:21  Flayra
+// - Added jetpack and heavy armor
+// - Added "cc online" sound
+// - Turret factories now upgrade to advanced turret factories for siege
+// - Added automatic resupply at armory, but removed it
+// - Observatories scan in 2D now, to match commander range overlay
+//
+// Revision 1.24  2002/09/09 19:59:39  Flayra
+// - Fixed up phase gates (no longer teleport you unless you have two, and they work properly now)
+// - Refactored reinforcements
+// - Fixed bug where secondary command station couldn't be built
+//
+// Revision 1.23  2002/07/26 23:05:54  Flayra
+// - Numerical event feedback
+// - Started to add sparks when buildings were hit but didn't know the 3D point to play it at
+//
+// Revision 1.22  2002/07/23 17:11:47  Flayra
+// - Phase gates must be built and can be destroyed, observatories decloak aliens, hooks for fast reinforcements upgrade, nuke damage increased, commander banning
+//
+// Revision 1.21  2002/07/08 17:02:57  Flayra
+// - Refactored reinforcements, updated entities for new artwork
+//
+// Revision 1.20  2002/06/25 18:04:43  Flayra
+// - Renamed some buildings, armory is now upgraded to advanced armory
+//
+// Revision 1.19  2002/06/03 16:50:35  Flayra
+// - Renamed weapons factory and armory, added ammo resupplying
+//
+// Revision 1.18  2002/05/28 17:51:34  Flayra
+// - Tried to make nuke sound play, extended shake duration to sound length, reinforcement refactoring, mark command stations as mapper placed, so they aren't deleted on level cleanup, support for point-entity buildable command stations
+//
+// Revision 1.17  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVHMARINEEQUIPMENT_H
+#define AVHMARINEEQUIPMENT_H
+
+#include "util/nowarnings.h"
+#include "weapons.h"
+#include "mod/AvHBasePlayerWeapon.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHMarineWeapons.h"
+#include "weapons.h"
+#include "dlls/turret.h"
+#include "mod/AvHEntities.h"
+#include "dlls/ctripmine.h"
+#include "mod/AvHReinforceable.h"
+
+//class AvHMine : public CTripmine
+//{
+//public:
+//	int				GetItemInfo(ItemInfo *p);
+//	void			Holster( int skiplocal = 0 );
+//	virtual int		iItemSlot(void);
+//	virtual BOOL	PlayEmptySound(void);
+//	virtual void	Spawn();
+//
+//};
+
+//class AvHDeployedTurret : public CSentry
+//{
+//public:
+//					AvHDeployedTurret();
+//
+//	virtual char*	GetActiveSound() const;
+//	virtual char*	GetAlertSound() const;
+//	virtual char*	GetDeploySound() const;
+//	virtual char*	GetPingSound() const;
+//
+//	virtual bool	GetIsValidTarget(CBaseEntity* inEntity) const;
+//	virtual bool	GetIsBuilt() const;
+//	virtual int		GetPointValueOfTarget(void) const;
+//	virtual int		GetRange() const;
+//	
+//	virtual int		IRelationship ( CBaseEntity *pTarget );
+//	virtual int		ObjectCaps(void);
+//	virtual void	Precache(void);
+//	void EXPORT		ConstructUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+//	virtual void	SetConstructionComplete();
+//	virtual void	Shoot(Vector &vecSrc, Vector &vecDirToEnemy);
+//	virtual void	Spawn();
+//	virtual void	StopShooting();
+//	virtual int		TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType);
+//
+//protected:
+//	float			mTimeToConstruct;
+//
+//private:
+//	int				mDamage;
+//	float			mPercentageBuilt;
+//	float			mLastTimePlayedSound;
+//	const int		kStartAlpha;
+//	const float		kThinkInterval;
+//	const float		kConstructorRate;
+//	const float		kAverageSoundLength;
+//
+//};
+
+
+
+//class AvHTurret : public CBasePlayerWeapon
+//{
+//public:
+//	virtual int		iItemSlot(void);
+//	void			Spawn( void );
+//	void			Precache( void );
+//	int				GetItemInfo(ItemInfo *p);
+//
+//	void			PrimaryAttack( void );
+//	BOOL			Deploy( void );
+//	void			Holster( int skiplocal = 0 );
+//	void			WeaponIdle( void );
+//};
+
+class AvHDeployedMine : public CBasePlayerItem
+{
+public:
+	void EXPORT		ActiveThink();
+	void EXPORT		ActiveTouch(CBaseEntity* inOther);
+	void			Detonate();
+	void			Precache(void);
+	void EXPORT		PowerupThink();
+	void			SetPlacer(entvars_t* inPlacer);
+	void			Spawn(void);
+
+	void			Killed(entvars_t* inAttacker, int inGib);
+	int				TakeDamage(entvars_t *inInflictor, entvars_t *inAttacker, float inDamage, int inBitsDamageType);
+
+private:
+	void			DetonateIfOwnerInvalid();
+	void			Explode(TraceResult* inTrace, int inBitsDamageType);
+	void EXPORT		Smoke();
+
+	Vector			mVecDir;
+	Vector			mVecEnd;
+	Vector			mOwnerOrigin;
+	Vector			mOwnerAngles;
+
+	float			mTimePlaced;
+	float			mLastTimeTouched;
+	bool			mDetonated;
+	bool			mPoweredUp;
+	EHANDLE			mOwner;
+	entvars_t*		mPlacer;
+};
+
+class AvHPlayerEquipment : public CBasePlayerItem
+{
+public:
+					AvHPlayerEquipment();
+
+	virtual int		GetLifetime() const;
+
+	virtual bool	GetIsPersistent() const;
+	virtual void	SetPersistent();
+
+	virtual void	KeyValue(KeyValueData* pkvd);
+
+private:
+	bool			mIsPersistent;
+	int				mLifetime;
+};
+
+class AvHHealth : public AvHPlayerEquipment
+{
+public:
+	static BOOL GiveHealth(CBaseEntity* inOther);
+
+	void Precache( void );
+	void Spawn( void );
+	void EXPORT Touch(CBaseEntity* inOther);
+};
+
+class AvHCatalyst : public AvHPlayerEquipment
+{
+public:
+    static BOOL GiveCatalyst(CBaseEntity* inOther);
+    
+    void Precache( void );
+    void Spawn( void );
+    void EXPORT Touch(CBaseEntity* inOther);
+};
+
+class AvHGenericAmmo : public CBasePlayerAmmo
+{
+public:
+	static BOOL GiveAmmo(CBaseEntity* inOther);
+
+	BOOL AddAmmo( CBaseEntity *pOther );
+	void Precache( void );
+	void Spawn( void );
+
+	void EXPORT Dropped(void);
+
+private:
+	bool mDropped;
+};
+
+class AvHHeavyArmor : public AvHPlayerEquipment
+{
+public:
+	void Precache( void );
+	void Spawn( void );
+	void EXPORT Touch(CBaseEntity* inOther);
+};
+
+class AvHJetpack : public AvHPlayerEquipment
+{
+public:
+	void Precache( void );
+	void Spawn( void );
+	void EXPORT Touch(CBaseEntity* inOther);
+};
+
+class AvHAmmoPack : public AvHPlayerEquipment
+{
+public:
+	char m_szAmmoType[32];
+	int m_iMaxAmmo;
+	int	m_iAmmoAmt;
+	int	m_iWeaponID; //weapon id this is for.
+	float m_flNoTouch;	//Dont let anyone touch it while its falling
+
+	void Precache( void );
+	void Spawn( void );
+	void EXPORT Touch(CBaseEntity* inOther);
+};
+
+class AvHScan : public CBaseAnimating
+{
+public:
+					AvHScan();
+	void			Precache(void);
+	void			Spawn(void);
+	void			ScanThink();
+
+private:
+	float			mTimeCreated;
+
+};
+
+
+//class AvHSiegeTurret : public AvHDeployedTurret
+//{
+//public:
+//							AvHSiegeTurret();
+//
+//	virtual CBaseEntity*	BestVisibleEnemy (void);
+//
+//	virtual char*			GetActiveSound() const;
+//	virtual char*			GetAlertSound() const;
+//	virtual char*			GetDeploySound() const;
+//	virtual char*			GetPingSound() const;
+//
+//	virtual bool			GetIsValidTarget(CBaseEntity* inEntity) const;
+//	virtual int				GetPointValueOfTarget(void) const;
+//	
+//	virtual int				GetMinimumRange() const;
+//
+//	virtual bool			NeedsLineOfSight() const;
+//
+//	virtual void			Precache(void);
+//
+//	virtual void			Shoot(Vector &vecSrc, Vector &vecDirToEnemy);
+//
+//	virtual void			Spawn();
+//
+//private:
+//	float					mTimeLastFired;
+//};
+
+class AvHMarineBaseBuildable : public AvHBaseBuildable
+{
+public:
+							AvHMarineBaseBuildable(AvHTechID inTechID, AvHMessageID inMessageID, char* inClassName, int inUser3);
+
+	virtual char*			GetDeploySound() const;
+	virtual char*			GetKilledSound() const;
+	virtual int				GetPointValue() const;
+    virtual int             GetTakeDamageAnimation() const;
+	virtual void			ResetEntity();
+	virtual int				TakeDamage(entvars_t* inInflictor, entvars_t* inAttacker, float inDamage, int inBitsDamageType);
+	virtual bool			GetIsTechnologyAvailable(AvHMessageID inMessageID) const;
+	virtual void			TechnologyBuilt(AvHMessageID inMessageID);
+
+protected:
+	void					SetEnergy(float inEnergy);
+	float					mEnergy;
+	
+};
+
+const float kPhaseGateIdleThink = 1.0f;
+
+class AvHPhaseGate : public AvHMarineBaseBuildable
+{
+public:
+					AvHPhaseGate();
+	virtual int		GetIdleAnimation() const;
+	bool			GetIsEnabled() const;
+	virtual int		GetSequenceForBoundingBox() const;
+	void			Killed(entvars_t* inAttacker, int inGib);
+	void			Precache(void);
+	void EXPORT		IdleThink();
+	virtual void	ResetEntity();
+	virtual void	SetHasBeenBuilt();
+	void			SetTimeOfLastDeparture(float timeOfLastDeparture);
+	bool			IsReadyToUse();
+	bool			HasWarmedUp() const;
+	void EXPORT		TeleportUse(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value);
+	//void EXPORT		TeleportTouch(CBaseEntity *pOther);
+	virtual void	UpdateOnRecycle(void);
+	virtual void	UpdateOnRemove(void);
+
+private:
+
+    void            KillBuildablesTouchingPlayer(AvHPlayer* inPlayer, entvars_t* inInflictor);
+    bool            GetAreTeammatesBlocking(AvHPlayer* thePlayer, const Vector& inOrigin) const;
+	void			SetEnabled(bool inEnabledState);
+	bool			mEnabled;
+	bool			mHasWarmedUp;
+	float			mTimeOfLastDeparture;
+};
+
+class AvHNuke : public AvHMarineBaseBuildable
+{
+public:
+						AvHNuke();
+	
+	virtual void		Precache();
+	
+	void EXPORT			ActiveThink();
+
+	void EXPORT			DeathThink();
+
+	virtual char*		GetDeploySound() const;
+
+	virtual char*		GetKilledSound() const;
+
+	virtual void		Spawn();
+
+private:
+	bool				mActive;
+	float				mTimeActivated;
+	
+};
+
+class AvHInfantryPortal : public AvHMarineBaseBuildable, public AvHReinforceable
+{
+public:
+					AvHInfantryPortal();
+
+	virtual void	Killed(entvars_t* inAttacker, int inGib);
+
+	virtual float	GetReinforceTime() const;
+
+	void EXPORT		PortalThink();
+	
+	virtual void	Precache();
+
+	virtual void	ResetEntity();
+
+	virtual void	SetHasBeenBuilt();
+	
+	// From AvHReinforceable
+	virtual void	CueRespawnEffect(AvHPlayer* inPlayer);
+	
+	virtual bool	GetCanReinforce() const;
+	
+	virtual bool	GetSpawnLocationForPlayer(CBaseEntity* inPlayer, Vector& outLocation) const;
+	
+	virtual AvHTeamNumber	GetReinforceTeamNumber() const;
+
+	virtual void	UpdateOnRecycle(void);
+	virtual void	UpdateOnRemove(void);
+
+	virtual int	    GetIdleAnimation() const;
+	virtual int	    GetIdle1Animation() const;
+	virtual int	    GetIdle2Animation() const;
+
+protected:
+
+	virtual void	ResetReinforcingPlayer(bool inSuccess);
+	
+};
+
+class AvHCommandStation : public AvHMarineBaseBuildable
+{
+public:
+						AvHCommandStation();
+
+	void EXPORT			CommandTouch( CBaseEntity *pOther );
+	
+	void EXPORT			CommandUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+	virtual int			GetIdleAnimation() const;
+
+    virtual bool	    GetIsTechnologyAvailable(AvHMessageID inMessageID) const;
+    
+	virtual char*		GetKilledSound() const;
+
+	virtual int			GetPointValue() const;
+
+    virtual void        Killed( entvars_t *pevAttacker, int iGib );
+
+	virtual void		Materialize();
+
+	virtual int			ObjectCaps(void);
+	
+	virtual void		Precache(void);
+	
+	virtual void		SetHasBeenBuilt();
+
+	virtual void		SetInactive();
+	
+	virtual void		Spawn(void);
+	
+	virtual int			TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType );
+	
+private:
+	void EXPORT			ActivateThink(void);
+	void EXPORT			CommanderUsingThink(void);
+	void				EjectCommander();
+
+	int					mCommanderAtThisStation;
+	float				mTimeToPlayOnlineSound;
+	
+};
+
+
+class AvHTurretFactory : public AvHMarineBaseBuildable
+{
+public:
+	AvHTurretFactory();
+
+	virtual int		GetIdle1Animation() const;
+
+	virtual int		GetIdle2Animation() const;
+
+	virtual int		GetResearchAnimation() const;
+	
+	virtual bool	GetSupportsTechID(AvHTechID	inTechID) const;
+
+	virtual void	SetHasBeenBuilt();
+
+	virtual void	TriggerAddTech() const;
+
+	virtual void	TriggerRemoveTech() const;
+
+	virtual void	Upgrade();
+
+private:
+	virtual void	CheckTurretEnabledState() const;
+	
+};
+
+class AvHArmory : public AvHMarineBaseBuildable
+{
+public:
+	AvHArmory();
+
+	virtual int		GetActiveAnimation() const;
+
+	virtual int		GetIdle1Animation() const;
+	
+	virtual int		GetIdle2Animation() const;
+
+	virtual int		GetResearchAnimation() const;
+
+	virtual int		GetSequenceForBoundingBox() const;
+
+	virtual bool	GetSupportsTechID(AvHTechID	inTechID) const;
+		
+	virtual void	Precache();
+
+	//void EXPORT		ResupplyThink();
+	void EXPORT		ResupplyUse(CBaseEntity* inActivator, CBaseEntity* inCaller, USE_TYPE inUseType, float inValue);
+
+	virtual void	SetHasBeenBuilt();
+
+	virtual void	Upgrade();
+
+};
+
+class AvHArmsLab : public AvHMarineBaseBuildable
+{
+public:
+	AvHArmsLab();
+
+	virtual int		GetResearchAnimation() const;
+
+	virtual int		GetSequenceForBoundingBox() const;
+
+};
+
+class AvHPrototypeLab : public AvHMarineBaseBuildable
+{
+public:
+	AvHPrototypeLab();
+};
+
+class AvHObservatory : public AvHMarineBaseBuildable
+{
+public:
+					AvHObservatory();
+	virtual int		GetSequenceForBoundingBox() const;
+	virtual void	Materialize();
+	void EXPORT		ObservatoryThink();
+	virtual void	ResetEntity();
+	virtual void	SetHasBeenBuilt();
+	virtual void	Spawn();
+
+	virtual int		GetActiveAnimation() const;
+	virtual int		GetIdle1Animation() const;
+	virtual int		GetIdle2Animation() const;
+	virtual int		GetResearchAnimation() const;
+		
+};
+
+//class AvHChemLab : public AvHMarineBaseBuildable
+//{
+//public:
+//	AvHChemLab();
+//};
+//
+//class AvHMedLab : public AvHMarineBaseBuildable
+//{
+//public:
+//	AvHMedLab();
+//};
+//
+//class AvHNukePlant : public AvHMarineBaseBuildable
+//{
+//public:
+//	AvHNukePlant();
+//};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHMarineEquipmentConstants.h b/main/source/mod/AvHMarineEquipmentConstants.h
new file mode 100644
index 00000000..005e6a0c
--- /dev/null
+++ b/main/source/mod/AvHMarineEquipmentConstants.h
@@ -0,0 +1,323 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHMarineEquipmentConstants.h $
+// $Date: 2002/11/05 06:17:25 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHMarineEquipmentConstants.h,v $
+// Revision 1.42  2002/11/05 06:17:25  Flayra
+// - Balance changes
+//
+// Revision 1.41  2002/11/03 04:50:51  Flayra
+// - Hard-coded gameplay constants instead of putting in skill.cfg
+//
+// Revision 1.40  2002/10/25 21:48:21  Flayra
+// - Fixe for wrong player model when holding mines
+//
+// Revision 1.39  2002/10/24 21:32:35  Flayra
+// - Regular update (welders were taking down aliens and structures fairly regularly)
+//
+// Revision 1.38  2002/10/20 02:36:14  Flayra
+// - Regular update
+//
+// Revision 1.37  2002/10/18 22:21:01  Flayra
+// - Tweaked jetpacks to make them more useful
+//
+// Revision 1.36  2002/10/16 20:54:52  Flayra
+// - Put back in special hive sound (needed because of cue)
+//
+// Revision 1.35  2002/10/16 01:01:22  Flayra
+// - Removed unneeded sounds
+//
+// Revision 1.34  2002/10/03 18:57:38  Flayra
+// - Added heavy view models
+// - Tried to fix pickup item order by adding weapon sizes
+//
+// Revision 1.33  2002/09/23 22:21:49  Flayra
+// - Added heavy armor, jetpack and advanced turret factory
+//
+// Revision 1.32  2002/09/09 19:59:47  Flayra
+// - Regular update
+//
+// Revision 1.31  2002/08/31 18:01:02  Flayra
+// - Work at VALVe
+//
+// Revision 1.30  2002/08/16 02:39:38  Flayra
+// - Tweaked mine damage for new 20% less damage
+// - Tweaked jetpack so it's not totally nuts
+//
+// Revision 1.29  2002/08/09 01:07:43  Flayra
+// - Tweaked jetpack physics
+// - Tweaked flight physics
+//
+// Revision 1.28  2002/08/02 21:54:57  Flayra
+// - More flier air control
+//
+// Revision 1.27  2002/07/23 17:12:19  Flayra
+// - Turret tweaks, regular update
+//
+// Revision 1.26  2002/07/01 22:41:40  Flayra
+// - Removed outdated overwatch target and tension events
+//
+// Revision 1.25  2002/07/01 21:30:53  Flayra
+// - Removed outdated commandpoints event, added siege turret shockwave, tweaked ranges and damage
+//
+// Revision 1.24  2002/06/25 18:05:34  Flayra
+// - Renamed some buildings, armory is now upgraded to advanced armory, fixed mine ROF (why doesn't the compiler catch this?), updated player animations
+//
+// Revision 1.23  2002/06/03 16:51:03  Flayra
+// - Renamed weapons factory and armory, added ammo resupplying
+//
+// Revision 1.22  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_MARINE_EQUIPMENT_CONSTANTS_H
+#define AVH_MARINE_EQUIPMENT_CONSTANTS_H
+
+// Jetpack
+const float kJetpackForce					= 1250;
+const float	kJetpackLateralScalar			= 12;
+const float kJetpackEnergyGainRate			= .1f;
+const float kJetpackMinimumEnergyToJetpack	= .1f;
+const float kJetpackEnergyLossRate			= kJetpackEnergyGainRate*1.5f;
+
+// Welder constants
+#define			kWelderVModel				"models/v_welder.mdl"
+#define			kWelderHVVModel				"models/v_welder_hv.mdl"
+#define			kWelderWModel				"models/w_welder.mdl"
+#define			kWelderPModel				"models/p_welder.mdl"
+
+#define			kWeldingSound				"weapons/welderidle.wav"
+#define			kWeldingHitSound			"weapons/welderhit.wav"
+#define			kWeldingStopSound			"weapons/welderstop.wav"
+
+#define			kwsWelder					"weapon_welder"
+#define			kwWelder					weapon_welder
+#define			kWelderEventName			"events/Welder.sc"
+#define			kWelderStartEventName		"events/WelderStart.sc"
+#define			kWelderEndEventName			"events/WelderEnd.sc"
+#define			kWelderConstEventName		"events/WelderConst.sc"
+const float		kWelderThinkTime =			3.0f;
+const int		kWelderBarrelLength =		10;
+
+#define			kOverwatchStartSound		"misc/overwatchstart.wav"
+#define			kOverwatchEndSound			"misc/overwatchend.wav"
+
+#define			kRegenerationSound			"misc/regeneration.wav"
+#define			kStartCloakSound			"misc/startcloak.wav"
+#define			kEndCloakSound				"misc/endcloak.wav"
+
+//#define			kWallJumpSound				"player/walljump.wav"
+#define			kWingFlapSound1				"player/wingflap1.wav"
+#define			kWingFlapSound2				"player/wingflap2.wav"
+#define			kWingFlapSound3				"player/wingflap3.wav"
+const float		kWingFlapLateralScalar		= 215;
+const float		kWingFlapZVelocityScalar	= 1.0f;
+const float     kWingThrustForwardScalar    = .85f;
+const float     kWingThrustBackwardScalar   = .25f;
+
+const int		kMineBarrellLength			= 30;
+const int		kMineRange					= 128;
+const float		kMineROF					= 1.0f;
+#define			kTripmineVModel				"models/v_mine.mdl"
+#define			kTripmineHVVModel			"models/v_mine_hv.mdl"
+#define			kTripmineWModel				"models/w_mine.mdl"
+#define			kTripmineW2Model			"models/w_mine2.mdl"
+#define			kTripminePModel				"models/p_mine.mdl"
+#define			kTripmineDeploySound		"weapons/mine_deploy.wav"
+#define			kTripmineActivateSound		"weapons/mine_activate.wav"
+#define			kTripmineChargeSound		"weapons/mine_charge.wav"
+#define			kTripmineStepOnSound		"weapons/mine_step.wav"
+
+#define			kMineMinSize				Vector( -8, -8, 0)
+#define			kMineMaxSize				Vector(8, 8, 2)
+
+#define			kDeployedTurretModel		"models/b_sentry.mdl"
+
+#define			kTurretFire1				"turret/turret-1.wav"
+#define			kTurretFire2				"turret/turret-2.wav"
+#define			kTurretFire3				"turret/turret-3.wav"
+#define			kTurretFire4				"turret/turret-4.wav"
+#define			kTurretPing					"turret/turret_ping.wav"
+#define			kTurretDeploy				"turret/turret_deploy.wav"
+
+// Note, these must be concentric and only vary with the number
+// If these change, change kMarineConstructionSounds below also
+#define			kTurretBuild1				"misc/build1.wav"
+#define			kTurretBuild2				"misc/build2.wav"
+#define			kTurretBuild3				"misc/build3.wav"
+#define			kTurretBuild4				"misc/build4.wav"
+#define			kTurretBuild5				"misc/build5.wav"
+
+// Construction sounds
+#define			kMarineConstructionSoundList	"misc/build"
+#define			kAlienConstructionSoundList		"misc/a-build"
+#define			kMarineBuildingDeploy		"misc/b_marine_deploy.wav"
+#define			kMarineBuildingKilled		"misc/b_marine_killed.wav"
+
+// Electrical sounds
+#define			kElectricSparkSoundList		"misc/elecspark"
+
+// Resource stuff
+#define			kResourceTowerDeploySound	"misc/res_deploy.wav"
+#define			kFuncResourceMinSize		Vector(-16.0, -16.0, 0.0)
+#define			kFuncResourceMaxSize		Vector(16.0, 16.0, .1)
+
+// Health
+#define			kHealthModel				"models/w_health.mdl"
+#define			kHealthPickupSound			"items/health.wav"
+#define			kHealthMinSize				Vector(-16, -16, 0)
+#define			kHealthMaxSize				Vector(16, 16, 4)
+
+// Catalyst
+#define			kCatalystModel				"models/w_catalyst.mdl"
+#define			kCatalystPickupSound		"items/catalyst.wav"
+#define			kCatalystMinSize			Vector(-16, -16, 0)
+#define			kCatalystMaxSize			Vector(16, 16, 4)
+
+// Heavy armor
+#define			kHeavyModel					"models/w_heavy.mdl"
+#define			kHeavyPickupSound			"items/pickup_heavy.wav"
+#define			kHeavyMinSize				Vector(-16, -16, 0)
+#define			kHeavyMaxSize				Vector(16, 16, 28)
+
+// Jetpack
+#define			kJetpackModel				"models/w_jetpack.mdl"
+#define			kJetpackPickupSound			"items/pickup_jetpack.wav"
+#define			kJetpackMinSize				Vector(-16, -16, 0)
+#define			kJetpackMaxSize				Vector(16, 16, 28)
+
+// Ammo
+#define			kAmmoModel					"models/w_ammo.mdl"
+#define			kAmmoPickupSound			"items/9mmclip1.wav"
+#define			kAmmoMinSize				Vector(-16, -16, 0)
+#define			kAmmoMaxSize				Vector(16, 16, 28)
+
+// Ammo
+#define			kAmmoPackModel  				"models/w_ammopack.mdl"
+#define			kAmmoPackPickupSound			"items/9mmclip1.wav"
+#define			kAmmoPackMinSize				Vector(-16, -16, 0)
+#define			kAmmoPackMaxSize				Vector(16, 16, 24)
+
+// Phase gate!
+#define			kwPhaseGate					phasegate
+#define			kwsPhaseGate				"phasegate"
+#define			kPhaseGateModel				"models/b_phasegate.mdl"
+#define			kPhaseGateSound				"misc/phasegate.wav"
+#define			kPhaseGateTransportSound	"misc/transport2.wav"
+#define			kPhaseInSound				"misc/phasein.wav"
+const			float						kPhaseGateAmnestyTime = 2.0f;
+
+
+// Scan!
+#define			kwScan						scan
+#define			kwsScan						"scan"
+#define			kScanModel					"models/b_scan.mdl"
+#define			kScanSound					"misc/scan.wav"
+
+// Siege turret
+#define			kwsSiegeTurret				"siegeturret"
+#define			kwSiegeTurret				siegeturret
+const int		kSiegeSplashRadius			= 400;
+
+// Note: update siege turret selected sprite if changing this
+const float		kSiegeTurretMinRangeScalar	= .1f;
+
+#define			kSiegeTurretModel			"models/b_siege.mdl"
+#define			kSiegeTurretShockWave		"sprites/shockwave.spr"
+#define			kSiegeTurretFire1			"turret/st_fire1.wav"
+#define			kSiegeHitSound1				"turret/siegehit1.wav"
+#define			kSiegeHitSound2				"turret/siegehit2.wav"
+#define			kSiegePing					"turret/siege_ping.wav"
+#define			kSiegeDeploy				"turret/siege_deploy.wav"
+
+// Nuke
+#define kwsNuke								"nuke"
+#define kwNuke								nuke
+#define	kNukeDeploy							"misc/b_nuke_deploy.wav"
+#define	kNukeKilled							"misc/b_nuke_killed.wav"
+#define	kNukeActive							"misc/b_nuke_active.wav"
+#define	kNukeExplode						"misc/b_nuke_explode.wav"
+#define kNukeModel							"models/b_nuke.mdl"
+const float kNukeDamage =					4000;
+const float kNukeRange =					1000;
+
+// Special building class names
+#define	kwsInfantryPortal			"team_infportal"
+#define	kwInfantryPortal			team_infportal
+
+#define kwTeamCommand				team_command
+#define kwsTeamCommand				"team_command"
+
+#define kwsTurretFactory			"team_turretfactory"
+#define kwTurretFactory				team_turretfactory
+
+#define kwsAdvancedTurretFactory	"team_advturretfactory"
+#define kwAdvancedTurretFactory		team_advturretfactory
+
+#define kwsArmory					"team_armory"
+#define kwArmory					team_armory
+
+#define kwsAdvancedArmory			"team_advarmory"
+#define kwAdvancedArmory			team_advarmory
+
+#define kwsArmsLab					"team_armslab"
+#define kwArmsLab					team_armslab
+
+#define kwsPrototypeLab				"team_prototypelab"
+#define kwPrototypeLab				team_prototypelab
+
+#define kwsObservatory				"team_observatory"
+#define kwObservatory				team_observatory
+
+#define kwsChemlab					"team_chemlab"
+#define kwChemlab					team_chemlab
+
+#define kwsMedlab					"team_medlab"
+#define kwMedlab					team_medlab
+
+#define	kwsNukePlant				"team_nukeplant"
+#define	kwNukePlant					team_nukeplant
+
+// Resource tower								
+#define			kwsResourceTower				"resourcetower"
+#define			kwResourceTower					resourcetower
+#define			kResourceTowerModel				"models/b_resourcetower.mdl"
+#define			kResourceTowerSoundList			"misc/resource_idle"
+#define			kResourceTowerMinSoundInterval	1.5f
+const int		kResourceTowerSightRange	=	500;
+
+#define			kMarineItemMinSize				Vector(-16, -16, 0)
+#define			kMarineItemMaxSize				Vector(16, 16, 42) 
+
+// Command station constants
+const float		kCommandStationAttenuation		= 2.0f;
+const float		kCommandStationThinkInterval	= .1f;
+#define			kCommandStationModel			"models/b_commandstation.mdl"
+#define			kCommandStationStartSound		"misc/commstat-start.wav"
+#define			kCommandStationEndSound			"misc/commstat-end.wav"
+#define			kCommandStationDeathSound		"misc/commstat-die.wav"
+
+#define			kInfantryPortalModel			"models/b_infportal.mdl"
+#define			kTransportSound					"misc/transport.wav"
+
+#define			kTurretFactoryModel				"models/b_turretfactory.mdl"
+#define			kArmoryModel					"models/b_armory.mdl"
+#define			kAdvancedWeaponFactoryModel		"models/b_advweaponfactory.mdl"
+#define			kArmsLabModel					"models/b_armslab.mdl"
+#define			kPrototypeLabModel				"models/b_prototypelab.mdl"
+#define			kObservatoryModel				"models/b_observatory.mdl"
+//#define			kNukePlantModel					"models/b_nukeplant.mdl"
+
+// Misc build constants
+#define			kArmoryResupplySound			"misc/resupply.wav"
+
+#endif
diff --git a/main/source/mod/AvHMarineTurret.cpp b/main/source/mod/AvHMarineTurret.cpp
new file mode 100644
index 00000000..9a753dc4
--- /dev/null
+++ b/main/source/mod/AvHMarineTurret.cpp
@@ -0,0 +1,294 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: Marine sentry turret.
+//
+// $Workfile: AvHMarineTurret.cpp$
+// $Date: 2002/11/22 21:25:26 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHMarineTurret.cpp,v $
+// Revision 1.11  2002/11/22 21:25:26  Flayra
+// - Fixed turret factory abuse, where turrets became active after recycling the nearby turret factory before turret was fully contructed.
+// - Fixed bug where siege turrets became re-activated after building a regular turret factory nearby.
+// - mp_consistency changes
+//
+// Revision 1.10  2002/11/06 02:23:11  Flayra
+// - Turrets now need an active turret factory to keep firing (work with advanced turret factories too)
+//
+// Revision 1.9  2002/11/06 01:39:21  Flayra
+// - Turrets now need an active turret factory to be active
+//
+// Revision 1.8  2002/11/03 04:51:31  Flayra
+// - Hard-coded gameplay constants instead of putting in skill.cfg
+//
+// Revision 1.7  2002/10/24 21:33:21  Flayra
+// - Thought about crediting marine team for turret kills but decided against it
+//
+// Revision 1.6  2002/10/16 01:01:29  Flayra
+// - Removed unneeded sounds
+//
+// Revision 1.5  2002/09/23 23:36:41  Flayra
+// - Linux compatibility
+//
+// Revision 1.4  2002/09/23 22:22:30  Flayra
+// - Marine turrets send "sentry firing" and "sentry taking damage" alerts
+//
+// Revision 1.3  2002/07/23 17:13:18  Flayra
+// - Always draw muzzle flash, calculate range in 2D
+//
+// Revision 1.2  2002/07/01 21:37:26  Flayra
+// - Removed turret range from skill.cfg (for visible building placement ranges)
+//
+// Revision 1.1  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHMarineTurret.h"
+#include "mod/AvHMarineEquipment.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHParticleConstants.h"
+#include "util/MathUtil.h"
+
+LINK_ENTITY_TO_CLASS(kwDeployedTurret, AvHMarineTurret);
+
+
+AvHMarineTurret::AvHMarineTurret() : AvHTurret(TECH_NULL, BUILD_TURRET, kwsDeployedTurret, AVH_USER3_TURRET)
+{
+}
+
+AvHMarineTurret::AvHMarineTurret(AvHTechID inTechID, AvHMessageID inMessageID, char* inClassName, int inUser3) : AvHTurret(inTechID, inMessageID, inClassName, inUser3)
+{
+}
+
+void AvHMarineTurret::CheckEnabledState()
+{
+	bool theEnabledState = false;
+
+	if(this->GetHasBeenBuilt() && !this->GetIsRecycling())
+	{
+		// Search for turret factories in range
+		FOR_ALL_ENTITIES(kwsTurretFactory, AvHTurretFactory*)
+			if((theEntity->pev->team == this->pev->team) && theEntity->GetIsBuilt() && !GetHasUpgrade(theEntity->pev->iuser4, MASK_RECYCLING))
+			{
+				// If they are a friendly, alive, turret factory
+				float the2DDistance = VectorDistance2D(this->pev->origin, theEntity->pev->origin);
+
+				// Enabled state is true
+				if(the2DDistance <= BALANCE_IVAR(kTurretFactoryBuildDistance))
+				{
+					theEnabledState = true;
+					break;
+				}
+			}
+		END_FOR_ALL_ENTITIES(kwsTurretFactory)
+
+		if(!theEnabledState)
+		{
+			FOR_ALL_ENTITIES(kwsAdvancedTurretFactory, AvHTurretFactory*)
+			if((theEntity->pev->team == this->pev->team) && theEntity->GetIsBuilt() && !GetHasUpgrade(theEntity->pev->iuser4, MASK_RECYCLING))
+			{
+				// If they are a friendly, alive, turret factory
+				float the2DDistance = VectorDistance2D(this->pev->origin, theEntity->pev->origin);
+				
+				// Enabled state is true
+				if(the2DDistance <= BALANCE_IVAR(kTurretFactoryBuildDistance))
+				{
+					theEnabledState = true;
+					break;
+				}
+			}
+			END_FOR_ALL_ENTITIES(kwsAdvancedTurretFactory)
+		}
+	}
+	
+	// Set enabled state
+	this->SetEnabledState(theEnabledState);
+}
+
+int AvHMarineTurret::GetSetEnabledAnimation() const
+{
+    return 3;
+}
+
+char* AvHMarineTurret::GetDeploySound() const
+{
+	return kTurretDeploy;
+}
+
+char* AvHMarineTurret::GetPingSound() const
+{
+	return kTurretPing;
+}
+
+
+//void AvHMarineTurret::ConstructUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+//{
+//	// Only allow users from same team as turret deployer
+//	if(pActivator->pev->team == this->pev->team)
+//	{
+//		if(this->mPercentageBuilt < 1.0f)
+//		{
+//			AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(pActivator);
+//			ASSERT(thePlayer);
+//			if(thePlayer->HolsterWeaponToUse())
+//			{
+//				bool thePlaySound = false;
+//
+//				if(this->mPercentageBuilt < 1.0f)
+//				{
+//					//thePlayer->TriggerProgressBar(this->entindex(), 1);
+//					
+//					float theConstructionRate = kConstructorRate;
+//					if(GetGameRules()->GetIsTesting() || GetGameRules()->GetIsDemoing())
+//					{
+//						theConstructionRate *= 4.0f;
+//					}
+//					
+//					this->mPercentageBuilt += (this->mThinkInterval/1.0f)*theConstructionRate;
+//				}
+//				
+//				if(gpGlobals->time > (this->mLastTimePlayedSound + kAverageSoundLength))
+//				{
+//					AvHSUPlayRandomConstructionEffect(thePlayer, this);
+//					this->mLastTimePlayedSound = gpGlobals->time;
+//
+//					//if(this->mPercentageBuilt == 1.0f)
+//					//{
+//					//	thePlayer->SetCarriedResources(thePlayer->GetCarriedResources() + 1);
+//					//}
+//				}
+//				
+//				// Given the number of constructors, what's chance of starting a new sound?
+//				float theChanceForNewSound = (this->mThinkInterval/(kAverageSoundLength/2.0f));
+//				float theRandomFloat = RANDOM_FLOAT(0.0f, 1.0f);
+//				if(theRandomFloat < theChanceForNewSound)
+//				{
+//					AvHSUPlayRandomConstructionEffect(thePlayer, this);
+//					
+//					//if(this->mPercentageBuilt == 1.0f)
+//					//{
+//					//	thePlayer->SetCarriedResources(thePlayer->GetCarriedResources() + 1);
+//					//}
+//				}
+//				
+//				this->pev->rendermode = kRenderTransTexture;
+//				this->pev->renderamt = this->mStartAlpha + this->mPercentageBuilt*(255 - this->mStartAlpha);
+//				if(this->mPercentageBuilt >= 1.0f)
+//				{
+//					this->SetConstructionComplete();
+//				}
+//				
+//				//this->pev->fuser1 = this->mPercentageBuilt*kNormalizationNetworkFactor;
+//				AvHSHUSetBuildResearchState(this->pev->iuser3, this->pev->iuser4, this->pev->fuser1, true, this->mPercentageBuilt);
+//			}
+//		}
+//	}
+//}
+
+int	AvHMarineTurret::GetXYRange() const
+{
+	return BALANCE_IVAR(kTurretRange);
+}
+
+void AvHMarineTurret::Precache()
+{
+	PRECACHE_UNMODIFIED_SOUND(kTurretFire1);
+	PRECACHE_UNMODIFIED_SOUND(kTurretFire2);
+	PRECACHE_UNMODIFIED_SOUND(kTurretFire3);
+	PRECACHE_UNMODIFIED_SOUND(kTurretFire4);
+	PRECACHE_UNMODIFIED_SOUND(kTurretPing);
+	PRECACHE_UNMODIFIED_SOUND(kTurretDeploy);
+	
+	PRECACHE_UNMODIFIED_SOUND(kTurretBuild1);
+	PRECACHE_UNMODIFIED_SOUND(kTurretBuild2);
+	PRECACHE_UNMODIFIED_SOUND(kTurretBuild3);
+	PRECACHE_UNMODIFIED_SOUND(kTurretBuild4);
+	PRECACHE_UNMODIFIED_SOUND(kTurretBuild5);
+}
+
+void AvHMarineTurret::SetEnabledState(bool inState, bool inForce)
+{
+	if((inState != this->GetEnabledState()) || inForce)
+	{
+		AvHTurret::SetEnabledState(inState, inForce);
+		
+		// Power down
+		char* theDeploySound = this->GetDeploySound();
+		if(theDeploySound)
+		{
+			EMIT_SOUND(ENT(this->pev), CHAN_WEAPON, theDeploySound, 1, ATTN_NORM);
+		}
+	}
+}
+
+int AvHMarineTurret::GetRecycleAnimation() const
+{
+	return this->GetSpawnAnimation();
+}
+
+void AvHMarineTurret::Shoot(const Vector &inOrigin, const Vector &inToEnemy, const Vector& inVecEnemyVelocity)
+{
+	AvHTeam* theTeam = GetGameRules()->GetTeam(AvHTeamNumber(this->pev->team));
+	ASSERT(theTeam);
+
+	float theDamageModifier;
+	int theTracerFreq;
+	int theUpgradeLevel = AvHPlayerUpgrade::GetWeaponUpgrade(this->pev->iuser3, /*theTeam->GetTeamWideUpgrades()*/this->pev->iuser4, &theDamageModifier, &theTracerFreq);
+
+	float theDamage = (float)BALANCE_IVAR(kSentryDamage)*theDamageModifier;		
+
+	int theDamageType = this->GetDamageType();
+	Vector theDirToEnemy = inToEnemy.Normalize();
+	this->FireBullets(1, inOrigin, theDirToEnemy, VECTOR_CONE_3DEGREES, this->GetXYRange(), BULLET_MONSTER_MP5, theTracerFreq, theDamage, this->GetAttacker()->pev, theDamageType);
+		
+	const char* theSoundToPlay = kTurretFire1;
+	
+	switch(theUpgradeLevel)
+	{
+	case 1:	theSoundToPlay = kTurretFire2;break;
+	case 2:theSoundToPlay = kTurretFire3;break;
+	case 3:theSoundToPlay = kTurretFire4;break;
+	}
+	
+	int thePitch = RANDOM_LONG(50, 150);
+	EMIT_SOUND_DYN(ENT(this->pev), CHAN_WEAPON, theSoundToPlay, 1.0, ATTN_NORM, 0, thePitch);
+	
+	pev->effects = pev->effects | EF_MUZZLEFLASH;
+
+	int theRandomSmoke = RANDOM_LONG(0, 3);
+	if(theRandomSmoke == 0)
+	{
+		AvHSUPlayParticleEvent(kpsSmokePuffs, this->edict(), inOrigin);
+	}
+
+	GetGameRules()->TriggerAlert((AvHTeamNumber)this->pev->team, ALERT_SENTRY_FIRING, this->entindex());
+}
+
+void AvHMarineTurret::Spawn()
+{
+	AvHTurret::Spawn();
+
+    // Sentries and sieges need TFs nearby to become active
+    this->CheckEnabledState();
+}
+
+int AvHMarineTurret::TakeDamage(entvars_t* inInflictor, entvars_t* inAttacker, float inDamage, int inBitsDamageType)
+{
+	GetGameRules()->TriggerAlert((AvHTeamNumber)this->pev->team, ALERT_SENTRY_DAMAGED, this->entindex());
+
+	return AvHTurret::TakeDamage(inInflictor, inAttacker, inDamage, inBitsDamageType);
+}
+
+char* AvHMarineTurret::GetModelName() const
+{
+	return kDeployedTurretModel;
+}
+
diff --git a/main/source/mod/AvHMarineTurret.h b/main/source/mod/AvHMarineTurret.h
new file mode 100644
index 00000000..b5d9b909
--- /dev/null
+++ b/main/source/mod/AvHMarineTurret.h
@@ -0,0 +1,65 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: Marine sentry turret.
+//
+// $Workfile: AvHMarineTurret.h$
+// $Date: 2002/11/22 21:25:27 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHMarineTurret.h,v $
+// Revision 1.6  2002/11/22 21:25:27  Flayra
+// - Fixed turret factory abuse, where turrets became active after recycling the nearby turret factory before turret was fully contructed.
+// - Fixed bug where siege turrets became re-activated after building a regular turret factory nearby.
+// - mp_consistency changes
+//
+// Revision 1.5  2002/11/06 01:39:21  Flayra
+// - Turrets now need an active turret factory to be active
+//
+// Revision 1.4  2002/10/16 01:01:30  Flayra
+// - Removed unneeded sounds
+//
+// Revision 1.3  2002/09/23 22:22:30  Flayra
+// - Marine turrets send "sentry firing" and "sentry taking damage" alerts
+//
+// Revision 1.2  2002/07/23 17:13:18  Flayra
+// - Always draw muzzle flash, calculate range in 2D
+//
+// Revision 1.1  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_MARINE_TURRET_H
+#define AVH_MARINE_TURRET_H
+
+#include "mod/AvHTurret.h"
+
+class AvHMarineTurret : public AvHTurret
+{
+public:
+					AvHMarineTurret();
+					AvHMarineTurret(AvHTechID inTechID, AvHMessageID inMessageID, char* inClassName, int inUser3);
+
+	virtual void	CheckEnabledState();
+    virtual int     GetSetEnabledAnimation() const;
+					
+	virtual char*	GetDeploySound() const;
+	char*			GetModelName() const;
+	virtual char*	GetPingSound() const;
+	
+	virtual int		GetRecycleAnimation() const;
+	virtual int		GetXYRange() const;
+	
+	virtual void	Precache(void);
+	virtual void	SetEnabledState(bool inState, bool inForce = false);
+	virtual void	Shoot(const Vector &inOrigin, const Vector &inDirToEnemy, const Vector& inVecEnemyVelocity);
+	virtual void	Spawn();
+	virtual int		TakeDamage(entvars_t* inInflictor, entvars_t* inAttacker, float inDamage, int inBitsDamageType);
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHMarineWeapon.cpp b/main/source/mod/AvHMarineWeapon.cpp
new file mode 100644
index 00000000..57d7bb6a
--- /dev/null
+++ b/main/source/mod/AvHMarineWeapon.cpp
@@ -0,0 +1,243 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose:
+//
+// $Workfile: AvHMarineWeapon.cpp $
+// $Date: 2002/11/22 21:28:16 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHMarineWeapon.cpp,v $
+// Revision 1.4  2002/11/22 21:28:16  Flayra
+// - mp_consistency changes
+//
+// Revision 1.3  2002/10/03 18:58:15  Flayra
+// - Added heavy view models
+//
+// Revision 1.2  2002/06/25 17:50:59  Flayra
+// - Reworking for correct player animations and new enable/disable state, new view model artwork, alien weapon refactoring
+//
+// Revision 1.1  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHMarineWeapon.h"
+#include "mod/AvHMarineWeaponConstants.h"
+#include "mod/AvHSpecials.h"
+
+bool AvHMarineWeapon::GetAllowedForUser3(AvHUser3 inUser3)
+{
+	bool theAllowed = false;
+
+	// Alien weapons for aliens.  Don't take into account exact roles until needed (and until weapons have stabilized)
+	switch(inUser3)
+	{
+	case AVH_USER3_MARINE_PLAYER:
+		theAllowed = true;
+		break;
+	}
+
+	return theAllowed;
+}
+
+float AvHMarineWeapon::GetDeploySoundVolume() const
+{
+	return kDeployMarineWeaponVolume;
+}
+
+char* AvHMarineWeapon::GetHeavyViewModel() const
+{
+	return NULL;
+}
+
+float AvHMarineWeapon::ComputeAttackInterval() const
+{
+    float theROF = this->GetRateOfFire();
+
+    int theUser4 = this->m_pPlayer->pev->iuser4;
+
+    // Speed attack if in range of primal scream
+    if(GetHasUpgrade(theUser4, MASK_BUFFED))
+    {
+        float theCatalystROFFactor = 1.0f + BALANCE_FVAR(kCatalystROFFactor);
+        theROF /= theCatalystROFFactor;
+    }
+
+    return theROF;
+
+}
+
+char* AvHMarineWeapon::GetActiveViewModel() const
+{
+	char* theViewModel = this->GetViewModel();
+
+	// If we're a marine with heavy armor, use the heavy view model
+	if(this->m_pPlayer && (this->m_pPlayer->pev->iuser3 == AVH_USER3_MARINE_PLAYER || this->m_pPlayer->pev->iuser3 == AVH_USER3_COMMANDER_PLAYER) && (GetHasUpgrade(this->m_pPlayer->pev->iuser4, MASK_UPGRADE_13)))
+	{
+		char* theHeavyViewModel = this->GetHeavyViewModel();
+		if(theHeavyViewModel)
+		{
+			theViewModel = theHeavyViewModel;
+		}
+	}
+
+	return theViewModel;
+}
+
+void AvHMarineWeapon::Precache()
+{
+	AvHBasePlayerWeapon::Precache();
+
+	char* theHeavyViewModel = this->GetHeavyViewModel();
+	if(theHeavyViewModel)
+	{
+		PRECACHE_UNMODIFIED_MODEL(theHeavyViewModel);
+	}
+}
+
+
+// AvHReloadableMarineWeapon
+const int kSpecialReloadNone = 0;
+const int kSpecialReloadGotoReload = 1;
+const int kSpecialReloadReloadShell = 2;
+
+void AvHReloadableMarineWeapon::DeductCostForShot(void)
+{
+    AvHMarineWeapon::DeductCostForShot();
+
+    // Stop reload if we were in the middle of one
+    if(this->mSpecialReload != kSpecialReloadNone)
+    {
+        this->mSpecialReload = kSpecialReloadNone;
+    }
+}
+
+int	AvHReloadableMarineWeapon::DefaultReload( int iClipSize, int iAnim, float fDelay )
+{
+    // Needed to prevet super fast default reload
+    return FALSE;
+}
+
+void AvHReloadableMarineWeapon::Holster( int skiplocal)
+{
+    AvHMarineWeapon::Holster(skiplocal);
+
+    // Cancel any reload in progress.
+    this->mSpecialReload = kSpecialReloadNone;
+}
+
+void AvHReloadableMarineWeapon::Init()
+{
+    this->mSpecialReload = kSpecialReloadNone;
+    this->mNextReload = 0;
+}
+
+void AvHReloadableMarineWeapon::Reload(void)
+{
+    int theReloadAnimation = this->GetReloadAnimation();
+    float theReloadTime = this->GetReloadTime();
+    int theClipSize = this->GetClipSize();
+
+    if((this->m_pPlayer->m_rgAmmo[this->m_iPrimaryAmmoType] > 0) && (m_iClip < theClipSize))
+    {
+        // don't reload until recoil is done
+        if(this->m_flNextPrimaryAttack <= UTIL_WeaponTimeBase())
+        {
+            if(this->mSpecialReload == kSpecialReloadNone)
+            {
+                // Start reload
+                this->mSpecialReload = kSpecialReloadGotoReload;
+
+                this->SendWeaponAnim(this->GetGotoReloadAnimation());
+
+                float theGotoReloadAnimationTime = this->GetGotoReloadAnimationTime();
+
+                this->m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + theGotoReloadAnimationTime;
+                this->m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + theGotoReloadAnimationTime;
+
+                this->m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + theGotoReloadAnimationTime; // 1.0f
+                this->m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + theGotoReloadAnimationTime; // 1.0f
+				this->m_pPlayer->SetAnimation(PLAYER_RELOAD_START);
+			
+            }
+            else if(this->mSpecialReload == kSpecialReloadGotoReload)
+            {
+                if (m_flTimeWeaponIdle <= UTIL_WeaponTimeBase())
+                {
+                    // was waiting for gun to move to side
+                    this->mSpecialReload = kSpecialReloadReloadShell;
+
+                    this->SendWeaponAnim(this->GetShellReloadAnimation());
+
+                    float theShellReloadTime = this->GetShellReloadAnimationTime();
+
+                    this->mNextReload = UTIL_WeaponTimeBase() + theShellReloadTime;
+                    this->m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + theShellReloadTime;
+
+                    this->m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + theShellReloadTime;
+                    this->m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + theShellReloadTime;
+					this->m_pPlayer->SetAnimation(PLAYER_RELOAD_INSERT);
+
+                }
+            }
+            else if(this->mSpecialReload == kSpecialReloadReloadShell)
+            {
+                //DefaultReload(theClipSize, theReloadAnimation, theReloadTime);
+
+                // Don't idle for a bit
+                //this->SetNextIdle();
+
+                // Add them to the clip
+                this->m_iClip += 1;
+                this->m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] -= 1;
+                this->mSpecialReload = kSpecialReloadGotoReload;
+				this->m_pPlayer->SetAnimation(PLAYER_RELOAD_END);
+            }
+	
+			
+        }
+
+    }
+}
+
+
+void AvHReloadableMarineWeapon::WeaponIdle(void)
+{
+    if(this->m_flTimeWeaponIdle < UTIL_WeaponTimeBase())
+    {
+        if((this->m_iClip == 0) && (this->mSpecialReload == kSpecialReloadNone) && m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType])
+        {
+            this->Reload();
+        }
+        else if(this->mSpecialReload != kSpecialReloadNone)
+        {
+            if((m_iClip != this->GetClipSize()) && m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType])
+            {
+                this->Reload();
+            }
+            else
+            {
+                // reload debounce has timed out
+                this->mSpecialReload = kSpecialReloadNone;
+
+                this->SendWeaponAnim(this->GetEndReloadAnimation());
+
+                float theEndReloadAnimationTime = this->GetEndReloadAnimationTime();
+
+                m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + theEndReloadAnimationTime;
+            }
+        }
+        else
+        {
+            // Hack to prevent idle animation from playing mid-reload.  Not sure how to fix this right, but all this special reloading is happening server-side, client doesn't know about it
+            if(m_iClip == this->GetClipSize())
+            {
+                AvHMarineWeapon::WeaponIdle();
+            }
+        }
+    }
+}
diff --git a/main/source/mod/AvHMarineWeapon.h b/main/source/mod/AvHMarineWeapon.h
new file mode 100644
index 00000000..713df7d5
--- /dev/null
+++ b/main/source/mod/AvHMarineWeapon.h
@@ -0,0 +1,80 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHMarineWeapon.h $
+// $Date: 2002/10/03 18:58:15 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHMarineWeapon.h,v $
+// Revision 1.3  2002/10/03 18:58:15  Flayra
+// - Added heavy view models
+//
+// Revision 1.2  2002/06/25 17:50:59  Flayra
+// - Reworking for correct player animations and new enable/disable state, new view model artwork, alien weapon refactoring
+//
+// Revision 1.1  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_MARINE_WEAPON_H
+#define AVH_MARINE_WEAPON_H
+
+#include "mod/AvHBasePlayerWeapon.h"
+
+class AvHMarineWeapon : public AvHBasePlayerWeapon
+{
+public:
+    virtual float	ComputeAttackInterval() const;
+
+    virtual char*	GetActiveViewModel() const;
+
+	bool			GetAllowedForUser3(AvHUser3 inUser3);
+	
+	virtual float	GetDeploySoundVolume() const;
+
+	virtual char*	GetHeavyViewModel() const;
+
+	virtual void    Precache();
+	
+};
+
+class AvHReloadableMarineWeapon : public AvHMarineWeapon
+{
+public:
+    virtual void	DeductCostForShot(void);
+
+    virtual int		DefaultReload( int iClipSize, int iAnim, float fDelay );
+
+    virtual int     GetGotoReloadAnimation() const = 0;
+    
+    virtual float   GetGotoReloadAnimationTime() const = 0;
+
+    virtual int		GetShellReloadAnimation() const = 0;
+
+    virtual float   GetShellReloadAnimationTime() const = 0;
+
+    virtual int     GetEndReloadAnimation() const = 0;
+
+    virtual float   GetEndReloadAnimationTime() const = 0;
+
+    virtual void    Holster( int skiplocal);
+
+    virtual void	Reload(void);
+    
+    virtual void	WeaponIdle(void);
+
+protected:
+    virtual void	Init();
+
+private:
+    int				mSpecialReload;
+    float			mNextReload;
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHMarineWeaponConstants.h b/main/source/mod/AvHMarineWeaponConstants.h
new file mode 100644
index 00000000..de6d4bc5
--- /dev/null
+++ b/main/source/mod/AvHMarineWeaponConstants.h
@@ -0,0 +1,231 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHMarineWeaponConstants.h $
+// $Date: 2002/11/22 21:28:16 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHMarineWeaponConstants.h,v $
+// Revision 1.32  2002/11/22 21:28:16  Flayra
+// - mp_consistency changes
+//
+// Revision 1.31  2002/11/06 01:39:35  Flayra
+// - Regular update
+//
+// Revision 1.30  2002/11/05 06:17:26  Flayra
+// - Balance changes
+//
+// Revision 1.29  2002/10/24 21:33:31  Flayra
+// - Regular update
+//
+// Revision 1.28  2002/10/20 02:36:14  Flayra
+// - Regular update
+//
+// Revision 1.27  2002/10/16 01:01:38  Flayra
+// - Lowered shotty range
+//
+// Revision 1.26  2002/10/07 17:49:31  Flayra
+// - Shotty balance
+//
+// Revision 1.25  2002/10/03 18:58:41  Flayra
+// - Added heavy view models
+// - Grenade clip is now 6 instead of 4
+//
+// Revision 1.24  2002/09/23 22:22:39  Flayra
+// - Regular update
+//
+// Revision 1.23  2002/09/09 20:00:02  Flayra
+// - Balance changes
+//
+// Revision 1.22  2002/08/31 18:01:02  Flayra
+// - Work at VALVe
+//
+// Revision 1.20  2002/08/09 01:08:00  Flayra
+// - Lowered shotgun ROF to match animations
+// - Constants for shotgun sounds
+//
+// Revision 1.19  2002/08/02 21:53:56  Flayra
+// - Balance
+//
+// Revision 1.18  2002/07/28 19:21:28  Flayra
+// - Balance changes after/during RC4a
+//
+// Revision 1.17  2002/07/23 17:13:54  Flayra
+// - Marine weapons given back their mojo
+//
+// Revision 1.16  2002/07/08 17:10:22  Flayra
+// - Balance tweaks, bullet spread
+//
+// Revision 1.15  2002/07/01 22:41:29  Flayra
+// - Moved grenade damage to a constant
+//
+// Revision 1.14  2002/07/01 21:37:50  Flayra
+// - Balance changes, removed outdated grenade constants
+//
+// Revision 1.13  2002/06/25 18:07:13  Flayra
+// - Updated player animations, balance changes
+//
+// Revision 1.12  2002/06/10 19:58:45  Flayra
+// - MG clip size increased to 50, grenades toned down
+//
+// Revision 1.11  2002/06/03 16:51:32  Flayra
+// - Regular update
+//
+// Revision 1.10  2002/05/28 17:53:33  Flayra
+// - Removed extra knife sounds, tweaked HMG ROF for sound purposes, added marine deploy weapon volume so our sounds are normalized
+//
+// Revision 1.9  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+// Revision 1.10  2002/05/14 19:49:33  Charlie
+// - Pistol damage tweaked
+//
+// Revision 1.9  2002/05/01 02:17:05  Charlie
+// - Tweaked LMG
+//
+//===============================================================================
+#ifndef AVHMARINEWEAPONCONSTANTS_H
+#define AVHMARINEWEAPONCONSTANTS_H
+
+#include "mod/AvHBasePlayerWeaponConstants.h"
+
+// I would have much preferred they weren't all #defined outside of the class
+// like this but the precaching issues that assume constant string addresses are getting to be too much.
+
+// Knife constants.
+const int		kKNRange			= 35;
+const float		kKNXPunch			= .75f;
+#define			kKNEventName		"events/Knife.sc"
+#define			kKNVModel			"models/v_kn.mdl"
+#define			kKNHVVModel			"models/v_kn_hv.mdl"
+#define			kKNPModel			"models/p_kn.mdl"
+#define			kKNWModel			"models/w_kn.mdl"
+#define			kKNAnimExt			"knife"
+#define			kKNFireSound1		"weapons/kn-1.wav"
+#define			kKNFireSound2		"weapons/kn-2.wav"
+#define			kKNHitSound1		"weapons/kn-hit-1.wav"
+#define			kKNHitSound2		"weapons/kn-hit-2.wav"
+#define			kKNHitWallSound		"weapons/kn-hit-wall.wav"
+#define			kKNDeploySound		"weapons/kn-deploy.wav"
+const int		kKNBarrelLength		= 15;
+
+// Machine gun constants.
+const int		kMGRange			= 8192;
+const float		kMGXPunch			= 1.8f;
+#define			kMGEjectModel		"models/pshell.mdl"
+#define			kMGEventName		"events/MachineGun.sc"
+#define			kMGVModel			"models/v_mg.mdl"
+#define			kMGHVVModel			"models/v_mg_hv.mdl"
+#define			kMGWModel			"models/w_mg.mdl"
+#define			kMGPModel			"models/p_mg.mdl"
+#define			kMGFireSound1		"weapons/mg-1.wav"
+#define			kMGFireSound2		"weapons/mg-2.wav"
+#define			kMGFireSound3		"weapons/mg-3.wav"
+#define			kMGFireSound4		"weapons/mg-4.wav"
+#define			kMGReloadSound		"weapons/g_reload.wav"
+#define			kMGDeploySound		"weapons/mg-deploy.wav"
+const int		kMGBarrelLength		= 25;
+#define			kMGSpread			VECTOR_CONE_4DEGREES
+
+// Pistol constants.
+const int		kHGRange			= 8192;
+const float		kHGXPunch			= 1.8f;
+#define			kHGEjectModel		"models/shell.mdl"
+#define			kHGEventName		"events/Pistol.sc"
+#define			kHGVModel			"models/v_hg.mdl"
+#define			kHGHVVModel			"models/v_hg_hv.mdl"
+#define			kHGWModel			"models/w_hg.mdl"
+#define			kHGPModel			"models/p_hg.mdl"
+#define			kHGFireSound1		"weapons/hg-1.wav"
+#define			kHGFireSound2		"weapons/hg-2.wav"
+#define			kHGFireSound3		"weapons/hg-3.wav"
+#define			kHGFireSound4		"weapons/hg-4.wav"
+#define			kHGReloadSound		"weapons/g_reload.wav"
+#define			kHGDeploySound		"weapons/hg-deploy.wav"
+const int		kHGBarrelLength		= 10;
+#define			kHGSpread			VECTOR_CONE_1DEGREES
+
+// Sonic/Shot gun constants.
+const int		kSGRange			= 700;
+const float		kSGXPunch			= .8f;
+#define			kSGEjectModel		"models/shotshell.mdl"
+#define			kSGEventName		"events/SonicGun.sc"
+#define			kSGVModel			"models/v_sg.mdl"
+#define			kSGHVVModel			"models/v_sg_hv.mdl"
+#define			kSGWModel			"models/w_sg.mdl"
+#define			kSGPModel			"models/p_sg.mdl"
+#define			kSGFireSound1		"weapons/sg-1.wav"
+#define			kSGFireSound2		"weapons/sg-2.wav"
+#define			kSGFireSound3		"weapons/sg-3.wav"
+#define			kSGFireSound4		"weapons/sg-4.wav"
+#define			kSGReloadSound		"weapons/g_reload.wav"
+#define			kSGCockSound		"weapons/sg-cock.wav"
+#define			kSGDeploySound		"weapons/sg-deploy.wav"
+const int		kSGBarrelLength		= 25;
+#define			kSGSpread			VECTOR_CONE_20DEGREES
+
+// Heavy machine gun
+const int		kHMGRange			= 6000;
+const float		kHMGXPunch			= 2;
+#define			kHMGEjectModel		"models/pshell.mdl"
+#define			kHMGEventName		"events/HeavyMachineGun.sc"
+#define			kHMGVModel			"models/v_hmg.mdl"
+#define			kHMGHVVModel		"models/v_hmg_hv.mdl"
+#define			kHMGWModel			"models/w_hmg.mdl"
+#define			kHMGPModel			"models/p_hmg.mdl"
+#define			kHMGFireSound1		"weapons/hmg-1.wav"
+#define			kHMGFireSound2		"weapons/hmg-2.wav"
+#define			kHMGFireSound3		"weapons/hmg-3.wav"
+#define			kHMGFireSound4		"weapons/hmg-4.wav"
+#define			kHMGReloadSound		"weapons/g_reload.wav"
+#define			kHMGDeploySound		"weapons/hmg-deploy.wav"
+const int		kHMGBarrelLength	= 25;
+#define			kHMGSpread			VECTOR_CONE_8DEGREES
+
+// Grenade gun
+const int		kGGRange			= 2000;
+const float		kGGXPunch			= .6f;
+#define			kGGAmmoModel		"models/w_grenade.mdl"
+#define			kGGEjectModel		"models/grenade.mdl"
+#define			kGGEventName		"events/GrenadeGun.sc"
+#define			kGGVModel			"models/v_gg.mdl"
+#define			kGGHVVModel			"models/v_gg_hv.mdl"
+#define			kGGWModel			"models/w_gg.mdl"
+#define			kGGPModel			"models/p_gg.mdl"
+#define			kGrenadeBounceSound1	"weapons/grenade_hit1.wav"
+#define			kGrenadeBounceSound2	"weapons/grenade_hit2.wav"
+#define			kGrenadeBounceSound3	"weapons/grenade_hit3.wav"
+#define			kGGFireSound1		"weapons/gg-1.wav"
+#define			kGGFireSound2		"weapons/gg-2.wav"
+#define			kGGFireSound3		"weapons/gg-3.wav"
+#define			kGGFireSound4		"weapons/gg-4.wav"
+#define			kGGReloadSound		"weapons/g_reload.wav"
+#define			kGGDeploySound		"weapons/gg-deploy.wav"
+const int		kGGBarrelLength		= 25;
+
+// Grenade constants.
+const int		kGRRange			= 35;
+const float		kGRXPunch			= .75f;
+#define			kGREventName		"events/Grenade.sc"
+#define			kGRVModel			"models/v_gr.mdl"
+#define			kGRHVVModel			"models/v_gr_hv.mdl"
+#define			kGRPModel			"models/p_gr.mdl"
+#define			kGRWModel			"models/w_gr.mdl"
+#define			kGRAnimExt			"grenade"
+#define			kGRFireSound1		"weapons/grenade_throw.wav"
+#define			kGRDeploySound		"weapons/grenade_draw.wav"
+#define			kGRExplodeSound     "weapons/grenade_explode.wav"
+#define			kGRHitSound         "weapons/grenade_hit.wav"
+#define			kGRPrimeSound		"weapons/grenade_prime.wav"
+const int		kGRBarrelLength		= 15;
+
+// Misc.
+const float		kDeployMarineWeaponVolume	= .3f;
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHMarineWeapons.h b/main/source/mod/AvHMarineWeapons.h
new file mode 100644
index 00000000..6cf7d7f4
--- /dev/null
+++ b/main/source/mod/AvHMarineWeapons.h
@@ -0,0 +1,630 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHMarineWeapons.h $
+// $Date: 2002/10/24 21:33:52 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHMarineWeapons.h,v $
+// Revision 1.30  2002/10/24 21:33:52  Flayra
+// - Shotgun reloading fixes
+//
+// Revision 1.29  2002/10/16 20:55:04  Flayra
+// - Mine fixes
+//
+// Revision 1.28  2002/10/16 01:01:51  Flayra
+// - Fixed mines being resupplied from armory
+//
+// Revision 1.27  2002/10/03 18:58:51  Flayra
+// - Added heavy view models
+//
+// Revision 1.26  2002/09/23 22:22:52  Flayra
+// - HMG firing restrictions
+//
+// Revision 1.25  2002/08/16 02:44:11  Flayra
+// - New damage types
+//
+// Revision 1.24  2002/08/09 01:08:16  Flayra
+// - Support for new shotgun reload
+// - Regular update
+//
+// Revision 1.23  2002/07/26 23:06:09  Flayra
+// - New welder artwork
+//
+// Revision 1.22  2002/07/08 17:10:47  Flayra
+// - Bullet spread, new HMG artwork
+//
+// Revision 1.21  2002/07/01 21:38:09  Flayra
+// - Tweaks for new artwork
+//
+// Revision 1.20  2002/06/25 18:07:25  Flayra
+// - Refactoring, cleanup
+//
+// Revision 1.19  2002/06/10 19:59:04  Flayra
+// - Updated with new knife artwork
+//
+// Revision 1.18  2002/06/03 16:52:00  Flayra
+// - Constants and tweaks to make weapon anims and times correct with new artwork, added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.17  2002/05/28 17:54:03  Flayra
+// - Started to add special animations for shotgun
+//
+// Revision 1.16  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVHMARINEWEAPONS_H
+#define AVHMARINEWEAPONS_H
+
+#include "util/nowarnings.h"
+#include "dlls/weapons.h"
+#include "mod/AvHBasePlayerWeapon.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHMarineWeaponConstants.h"
+#include "mod/AvHMarineWeapon.h"
+
+//extern "C"
+//{
+//	void EV_MachineGun( struct event_args_s *args  );
+//	void EV_SonicGun( struct event_args_s *args  );
+//	void EV_HeavyMachineGun( struct event_args_s *args  );
+//	void EV_GrenadeGun( struct event_args_s *args  );
+//	void EV_NukeGun( struct event_args_s *args  );
+//	void EV_Jetpack( struct event_args_s *args  );
+//}
+
+class AvHKnife : public AvHMarineWeapon 
+{
+public:
+					AvHKnife()
+						{ this->Init(); } 
+	
+	virtual int		GetBarrelLength() const;
+
+    virtual float	GetRateOfFire() const;
+
+	virtual int		GetDeployAnimation() const;
+
+	virtual char*	GetDeploySound() const;
+
+	virtual float	GetDeployTime() const;
+
+	virtual bool	GetFiresUnderwater() const;
+
+	virtual char*	GetHeavyViewModel() const;
+	
+	virtual int		GetIdleAnimation() const;
+
+	virtual bool	GetIsDroppable() const;
+
+	int				GetItemInfo(ItemInfo *p) const;
+
+	bool			GetMustPressTriggerForEachShot() const;
+		
+	int				GetShootAnimation() const;
+
+	virtual char*	GetPlayerModel() const;
+
+	virtual char*	GetViewModel() const;
+
+	virtual char*	GetWorldModel() const;
+	
+	virtual int		iItemSlot(void);
+
+	virtual BOOL	IsUseable(void);
+	
+	virtual void	Precache(void);
+	
+	virtual void	Spawn();
+
+	virtual bool	UsesAmmo(void) const;
+	
+	virtual BOOL	UseDecrement(void);
+	
+protected: 
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+};
+
+//#ifdef AVH_SERVER
+//class AvHGrenadeProjectile : public CGrenade
+//{
+//public:
+//	virtual void	Precache(void);
+//	
+//	virtual void	Spawn(void);
+//	
+//	void EXPORT		GrenThink();
+//
+//private:
+//	float			mTimeCreated;
+//};
+//#endif
+
+
+class AvHMachineGun : public AvHMarineWeapon 
+{ 
+public: 
+				    AvHMachineGun()
+				        { this->Init(); } 
+
+	virtual int		GetBarrelLength() const;
+
+	virtual int		GetDamageType() const;
+
+	virtual char*	GetDeploySound() const;
+
+	virtual float	GetDeployTime() const;
+
+	virtual bool	GetHasMuzzleFlash() const;
+	
+	virtual char*	GetHeavyViewModel() const;
+
+	int				GetItemInfo(ItemInfo *p) const;
+
+	virtual char*	GetPlayerModel() const;
+
+	virtual Vector	GetProjectileSpread() const;
+
+	virtual char*	GetViewModel() const;
+
+	virtual char*	GetWorldModel() const;
+
+	float			GetReloadTime(void) const;
+
+	virtual int		iItemSlot(void);
+
+	virtual void	Precache(void);
+
+	virtual void	Spawn();
+
+	virtual float	GetRateOfFire() const;
+
+protected: 
+    virtual void	Init();
+};
+
+class AvHPistol : public AvHMarineWeapon 
+{ 
+public: 
+					AvHPistol()
+						{ this->Init(); } 
+	
+	virtual int		GetBarrelLength() const;
+
+    virtual float   GetRateOfFire() const;
+
+	virtual int		GetDeployAnimation() const;
+
+	virtual char*	GetDeploySound() const;
+
+	virtual float	GetDeployTime() const;
+
+	virtual int		GetEmptyShootAnimation() const;
+	
+	virtual bool	GetHasMuzzleFlash() const;
+	
+	virtual char*	GetHeavyViewModel() const;
+
+	int				GetItemInfo(ItemInfo *p) const;
+
+	bool			GetMustPressTriggerForEachShot() const;
+
+	virtual char*	GetPlayerModel() const;
+
+	virtual Vector	GetProjectileSpread() const;
+	
+	virtual char*	GetViewModel() const;
+
+	virtual char*	GetWorldModel() const;
+
+	virtual int		GetReloadAnimation() const;
+
+	virtual int		GetShootAnimation() const;
+		
+	virtual int		iItemSlot(void);
+	
+	virtual void	Precache(void);
+	
+	virtual void	Spawn();
+	
+protected: 
+    virtual void	Init();
+
+	virtual float	GetReloadTime(void) const;
+
+};
+
+class AvHSonicGun : public AvHReloadableMarineWeapon 
+{ 
+public: 
+				    AvHSonicGun() 
+				        { this->Init(); } 
+
+	virtual int		GetBarrelLength() const;
+
+    virtual float	GetRateOfFire() const;
+
+	virtual int		GetDamageType() const;
+	
+	virtual int		GetDeployAnimation() const;
+
+	virtual char*	GetDeploySound() const;
+
+	virtual float	GetDeployTime() const;
+
+	virtual int		GetEmptyShootAnimation() const;
+
+	virtual bool	GetHasMuzzleFlash() const;
+
+	virtual char*	GetHeavyViewModel() const;
+	
+	int				GetIdleAnimation() const;
+		
+	int				GetItemInfo(ItemInfo *p) const;
+	
+	virtual Vector	GetProjectileSpread() const;
+	
+	virtual char*	GetPlayerModel() const;
+
+	virtual char*	GetViewModel() const;
+
+	virtual char*	GetWorldModel() const;
+
+	virtual int		GetReloadAnimation() const;
+
+	virtual int		GetShootAnimation() const;
+
+	virtual int		iItemSlot(void);
+
+	virtual void	Precache(void);
+
+	virtual void	Spawn();
+
+    // pure functions from AvHReloadableMarineWeapon
+    virtual int     GetGotoReloadAnimation() const;
+    
+    virtual float   GetGotoReloadAnimationTime() const;
+    
+    virtual int		GetShellReloadAnimation() const;
+    
+    virtual float   GetShellReloadAnimationTime() const;
+    
+    virtual int     GetEndReloadAnimation() const;
+    
+    virtual float   GetEndReloadAnimationTime() const;
+
+protected: 
+	virtual void	FireProjectiles(void);
+	
+	virtual float	GetReloadTime(void) const;
+
+    virtual void	Init();
+};
+
+
+class AvHHeavyMachineGun : public AvHMarineWeapon 
+{ 
+public: 
+					AvHHeavyMachineGun()
+						{ this->Init(); } 
+
+	virtual int		GetBarrelLength() const;
+
+    virtual float	GetRateOfFire() const;
+
+	virtual int		GetDamageType() const;
+
+	virtual int		GetDeployAnimation() const;
+
+	virtual char*	GetDeploySound() const;
+
+	virtual float	GetDeployTime() const;
+
+	virtual int		GetEmptyShootAnimation() const;
+
+	virtual bool	GetHasMuzzleFlash() const;
+
+	virtual char*	GetHeavyViewModel() const;
+	
+	virtual int		GetIdleAnimation() const;
+		
+	int				GetItemInfo(ItemInfo *p) const;
+
+	virtual char*	GetPlayerModel() const;
+
+	virtual Vector	GetProjectileSpread() const;
+	
+	virtual int		GetReloadAnimation() const;
+
+	virtual int		GetShootAnimation() const;
+	
+	virtual char*	GetViewModel() const;
+
+	virtual char*	GetWorldModel() const;
+
+	virtual int		iItemSlot(void);
+
+	virtual void	Precache(void);
+
+	virtual void	Spawn();
+
+protected: 
+	virtual float	GetReloadTime(void) const;
+
+    virtual void	FireProjectiles(void);
+	
+    virtual void	Init();
+
+    virtual bool    ProcessValidAttack(void);
+};
+
+
+class AvHGrenadeGun : public AvHMarineWeapon 
+{ 
+public: 
+				    AvHGrenadeGun()
+						{ this->Init(); } 
+
+	virtual int		GetBarrelLength() const;
+
+    virtual float	GetRateOfFire() const;
+
+	virtual int		GetDeployAnimation() const;
+
+	virtual char*	GetDeploySound() const;
+
+	virtual int		GetEmptyShootAnimation() const;
+
+	virtual void	GetEventOrigin(Vector& outOrigin) const;
+
+	virtual void	GetEventAngles(Vector& outAngles) const;
+
+	virtual bool	GetHasMuzzleFlash() const;
+	
+	virtual char*	GetHeavyViewModel() const;
+	
+	virtual int		GetIdleAnimation() const;
+
+	int				GetItemInfo(ItemInfo *p) const;
+	
+	virtual char*	GetPlayerModel() const;
+
+	virtual int		GetReloadAnimation() const;
+
+	virtual int		GetShootAnimation() const;
+
+	virtual char*	GetViewModel() const;
+
+	virtual char*	GetWorldModel() const;
+
+	virtual int		iItemSlot(void);
+
+	virtual void	Precache(void);
+
+	virtual void	Spawn();
+
+protected: 
+    virtual void	FireProjectiles(void);
+	
+	virtual float	GetReloadTime(void) const;
+
+    virtual void	Init();
+};
+
+class AvHWelder : public AvHMarineWeapon
+{
+public:
+					AvHWelder()
+						{ this->Init(); } 
+
+	virtual int		GetBarrelLength() const;
+
+    virtual float	GetRateOfFire() const;
+
+	int				GetItemInfo(ItemInfo *p) const;
+	
+	virtual void	Holster( int skiplocal = 0 );
+
+	virtual int		GetDeployAnimation() const;
+
+	virtual float	GetDeployTime() const;
+
+	virtual char*	GetHeavyViewModel() const;
+	
+	virtual char*	GetPlayerModel() const;
+
+	virtual int		GetShootAnimation() const;
+		
+	virtual char*	GetViewModel() const;
+
+	virtual char*	GetWorldModel() const;
+
+	virtual int		iItemSlot(void);
+	
+	virtual BOOL	IsUseable(void);
+
+	virtual void	Precache(void);
+	
+	virtual void	Spawn();
+
+	virtual bool	UsesAmmo(void) const;
+
+	virtual void    WeaponIdle();
+
+	bool			GetIsWelding()						{ return mIsWelding; }
+	void			SetIsWelding(bool bWelding)			{ mIsWelding = bWelding;} 
+	
+protected: 
+	bool			mIsWelding;
+    virtual void	Init();
+
+    virtual void    FireProjectiles(void);
+
+	#ifdef AVH_SERVER
+	bool			RepairTarget(CBaseEntity* inEntity, float inROF);
+	#endif
+	
+	void EXPORT		WelderThink();
+
+};
+
+class AvHMine : public AvHMarineWeapon
+{
+public:
+					AvHMine()
+						{ this->Init(); } 
+	
+    virtual void    DeductCostForShot(void);
+
+	virtual int		GetBarrelLength() const;
+
+    virtual float	GetRateOfFire() const;
+
+    virtual bool    GetCanBeResupplied() const;
+    
+	virtual int		GetDeployAnimation() const;
+
+	virtual bool	GetFiresUnderwater() const;
+	
+	virtual char*	GetHeavyViewModel() const;
+	
+	int				GetItemInfo(ItemInfo *p) const;
+
+	virtual char*	GetPlayerModel() const;
+
+	virtual char*	GetWorldModel() const;
+	
+	virtual char*	GetViewModel() const;
+
+	virtual int		GetShootAnimation() const;
+
+	virtual void	Holster(int skiplocal = 0);
+	
+	virtual int		iItemSlot(void);
+
+	virtual BOOL	PlayEmptySound(void);
+		
+	virtual void	Precache(void);
+
+    virtual bool	Resupply();
+	
+	virtual void	Spawn();
+	
+	virtual bool	UsesAmmo(void) const;
+	
+	virtual BOOL	UseDecrement(void);
+	
+protected: 
+    virtual void    FireProjectiles(void);
+	
+    virtual void	Init();
+
+	virtual bool    ProcessValidAttack(void);
+
+#ifdef AVH_SERVER
+	bool			GetDropLocation(Vector& outLocation, Vector* outAngles = NULL) const;
+#endif
+};
+
+class AvHGrenade : public AvHMarineWeapon
+{
+public:
+                    AvHGrenade()
+                        { this->Init(); } 
+
+    virtual BOOL    Deploy();
+    
+    virtual int		GetBarrelLength() const;
+
+    virtual float	GetRateOfFire() const;
+ 
+    virtual bool    GetCanBeResupplied() const;
+    
+    virtual int		GetDeployAnimation() const;
+    
+    virtual char*	GetDeploySound() const;
+    
+    virtual float	GetDeployTime() const;
+    
+    virtual int		GetEmptyShootAnimation() const;
+
+    virtual bool	GetFiresUnderwater() const;
+    
+    virtual char*	GetHeavyViewModel() const;
+    
+    virtual int		GetIdleAnimation() const;
+    
+    virtual bool	GetIsDroppable() const;
+
+    virtual BOOL    GetIsWeaponPrimed() const;
+
+    virtual BOOL    GetIsWeaponPriming() const;
+    
+    int				GetItemInfo(ItemInfo *p) const;
+    
+    bool			GetMustPressTriggerForEachShot() const;
+    
+    int				GetShootAnimation() const;
+    
+    virtual char*	GetPlayerModel() const;
+
+    virtual int     GetPrimeAnimation() const;
+
+    virtual char*   GetPrimeSound() const;
+    
+    virtual char*	GetViewModel() const;
+
+    virtual float   GetWeaponPrimeTime() const;
+
+    virtual char*	GetWorldModel() const;
+
+    virtual void	Holster(int skiplocal = 0);
+    
+    virtual int		iItemSlot(void);
+    
+    virtual BOOL	IsUseable(void);
+    
+	virtual void	ItemPostFrame(void);
+
+    virtual BOOL	PlayEmptySound(void);
+
+    virtual void	Precache(void);
+
+    virtual bool	Resupply();
+
+    virtual void	Spawn();
+    
+    virtual bool	UsesAmmo(void) const;
+    
+    virtual BOOL	UseDecrement(void);
+
+    virtual void    WeaponIdle();
+
+    virtual void    PrimaryAttack(void);
+    
+protected: 
+
+			void	CreateProjectile(void);
+
+    virtual void    FireProjectiles(void);
+    
+    virtual void	Init();
+
+    virtual void	SetNextIdle(void);
+
+			bool	ShouldRollGrenade(void) const;
+
+};
+
+
+#endif
+
+
diff --git a/main/source/mod/AvHMessage.h b/main/source/mod/AvHMessage.h
new file mode 100644
index 00000000..ff6eee80
--- /dev/null
+++ b/main/source/mod/AvHMessage.h
@@ -0,0 +1,219 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: Messages/actions (impulses) from players
+//
+// $Workfile: AvHMessage.h $
+// $Date: 2002/09/25 20:48:56 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHMessage.h,v $
+// Revision 1.30  2002/09/25 20:48:56  Flayra
+// - Added 3 more sayings
+//
+// Revision 1.29  2002/09/23 22:23:14  Flayra
+// - Added heavy armor and jetpacks
+// - Removed power armor
+// - Added siege upgrade
+//
+// Revision 1.28  2002/07/23 17:14:26  Flayra
+// - Removed unused constants, new upgrades
+//
+// Revision 1.27  2002/07/08 17:11:42  Flayra
+// - Added admin commands, explicity defined HL impulses, removed offensive upgrades
+//
+// Revision 1.26  2002/06/25 18:07:59  Flayra
+// - Building rename, blinking change
+//
+// Revision 1.25  2002/06/10 19:59:25  Flayra
+// - Update for new commander UI
+//
+// Revision 1.24  2002/06/03 16:52:18  Flayra
+// - Renamed weapons factory and armory
+//
+// Revision 1.23  2002/05/28 17:54:19  Flayra
+// - Added support for recycling
+//
+// Revision 1.22  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVHMESSAGE_H
+#define AVHMESSAGE_H
+
+typedef enum
+{
+    // Special or misc. actions
+    MESSAGE_NULL = 0,
+
+    // Use an item or ability (these are currently forced to be less than 10 because it's
+    // used as an index into some weapons/equipment array <sigh>)
+    WEAPON_NEXT = 1,
+    WEAPON_RELOAD = 2,
+    WEAPON_DROP = 3,
+
+	// Admin commands
+	ADMIN_READYROOM = 5,
+	ADMIN_VOTEDOWNCOMMANDER = 6,
+
+    // Talk to your teammates
+    SAYING_1 = 7,
+    SAYING_2 = 8,
+    SAYING_3 = 9,
+    SAYING_4 = 10,
+    SAYING_5 = 11,
+    SAYING_6 = 12,
+    SAYING_7 = 13,
+    SAYING_8 = 14,
+    SAYING_9 = 15,
+
+	// Chat
+	COMM_CHAT_PUBLIC = 16,
+	COMM_CHAT_TEAM = 17,
+	COMM_CHAT_NEARBY = 18,
+
+	// Research
+	RESEARCH_ARMOR_ONE = 20,
+	RESEARCH_ARMOR_TWO = 21,
+	RESEARCH_ARMOR_THREE = 22,
+	RESEARCH_WEAPONS_ONE = 23,
+	RESEARCH_WEAPONS_TWO = 24,
+	RESEARCH_WEAPONS_THREE = 25,
+	TURRET_FACTORY_UPGRADE = 26,
+	BUILD_CAT = 27,
+	RESEARCH_JETPACKS = 28,
+	RESEARCH_HEAVYARMOR = 29,
+	RESEARCH_DISTRESSBEACON = 30,
+	MESSAGE_CANCEL = 32,
+	RESEARCH_MOTIONTRACK = 33,
+	RESEARCH_PHASETECH = 34,
+	RESOURCE_UPGRADE = 35,
+	RESEARCH_ELECTRICAL = 36,
+    RESEARCH_GRENADES = 37,
+	
+	// Buildings
+	BUILD_HEAVY = 38,
+	BUILD_JETPACK = 39,
+	BUILD_INFANTRYPORTAL = 40,
+	BUILD_RESOURCES = 41,
+	BUILD_TURRET_FACTORY = 43,
+	BUILD_ARMSLAB = 45,
+	BUILD_PROTOTYPE_LAB = 46,
+	RESEARCH_CATALYSTS = 47,
+	BUILD_ARMORY = 48,
+	ARMORY_UPGRADE = 49,
+	BUILD_NUKE_PLANT = 50,
+	BUILD_OBSERVATORY = 51,
+	RESEARCH_HEALTH = 52,
+
+	BUILD_SCAN = 53,
+	BUILD_PHASEGATE = 55,
+	BUILD_TURRET = 56,
+	BUILD_SIEGE = 57,
+	BUILD_COMMANDSTATION = 58,
+	
+	// Weapons and items
+	BUILD_HEALTH = 59,
+	BUILD_AMMO = 60,
+	BUILD_MINES = 61,
+	BUILD_WELDER = 62,
+	BUILD_UNUSED = 63,
+	BUILD_SHOTGUN = 64,
+	BUILD_HMG = 65,
+	BUILD_GRENADE_GUN = 66,
+	BUILD_NUKE = 67,
+
+	// Misc
+	BUILD_RECYCLE = 69,
+
+	GROUP_CREATE_1 = 70,
+	GROUP_CREATE_2 = 71,
+	GROUP_CREATE_3 = 72,
+	GROUP_CREATE_4 = 73,
+	GROUP_CREATE_5 = 74,
+
+	GROUP_SELECT_1 = 75,
+	GROUP_SELECT_2 = 76,
+	GROUP_SELECT_3 = 77,
+	GROUP_SELECT_4 = 78,
+	GROUP_SELECT_5 = 79,
+	
+	// Orders
+	ORDER_REQUEST = 80,
+	ORDER_ACK = 81,
+
+	// Commander mode 
+	COMMANDER_MOUSECOORD = 82,
+	COMMANDER_MOVETO = 83,
+	COMMANDER_SCROLL = 84,
+	COMMANDER_DEFAULTORDER = 104,
+	COMMANDER_SELECTALL = 105,
+	COMMANDER_REMOVESELECTION = 96,
+	
+	// Sub-menus
+	MENU_BUILD = 85,
+	MENU_BUILD_ADVANCED = 86,
+	MENU_ASSIST = 87,
+	MENU_EQUIP = 88,
+	MENU_SOLDIER_FACE = 89,
+
+	// These messages aren't sent as impulses, but are used internally in the shared code.  They can be removed if necessary with some work.
+	ALIEN_BUILD_RESOURCES = 90,
+	ALIEN_BUILD_OFFENSE_CHAMBER = 91,
+	ALIEN_BUILD_DEFENSE_CHAMBER = 92,
+	ALIEN_BUILD_SENSORY_CHAMBER = 93,
+	ALIEN_BUILD_MOVEMENT_CHAMBER = 94,
+	ALIEN_BUILD_HIVE = 95,
+
+	IMPULSE_LOGO = 99,
+	IMPULSE_FLASHLIGHT = 100,
+	IMPULSE_SPRAYPAINT = 201,
+	IMPULSE_DEMORECORD = 204,
+
+	// Alien menu items (there are assumptions that these are contiguous)
+	ALIEN_EVOLUTION_ONE = 101,		// Carapace
+	ALIEN_EVOLUTION_TWO = 102,		// Regeneration
+	ALIEN_EVOLUTION_THREE = 103,	// Redemption
+
+	ALIEN_EVOLUTION_SEVEN = 107,	// Celerity
+	ALIEN_EVOLUTION_EIGHT = 108,	// Adrenaline
+	ALIEN_EVOLUTION_NINE = 109,		// Silence
+	ALIEN_EVOLUTION_TEN = 110,		// Cloaking
+	ALIEN_EVOLUTION_ELEVEN = 111,	// Pheromones
+	ALIEN_EVOLUTION_TWELVE = 112,	// Scent of fear
+
+	// Alien lifeforms
+	ALIEN_LIFEFORM_ONE = 113,
+	ALIEN_LIFEFORM_TWO = 114,
+	ALIEN_LIFEFORM_THREE = 115,
+	ALIEN_LIFEFORM_FOUR = 116,
+	ALIEN_LIFEFORM_FIVE = 117,
+
+	// Unlock alien abilities in Combat mode
+	BUILD_RESUPPLY = 31,
+	ALIEN_HIVE_TWO_UNLOCK = 118,
+	ALIEN_HIVE_THREE_UNLOCK = 126,
+	COMBAT_TIER2_UNLOCK = 31,
+	COMBAT_TIER3_UNLOCK = 54,
+	
+	// Alien abilities
+	ALIEN_ABILITY_LEAP = 119,
+	ALIEN_ABILITY_BLINK = 120,
+	ALIEN_ABILITY_CHARGE = 122,
+
+	COMMANDER_NEXTIDLE = 123,
+	COMMANDER_NEXTAMMO = 124,
+	COMMANDER_NEXTHEALTH = 125,
+
+	MESSAGE_LAST = 127
+	
+	// NOTE: If this gets larger then a byte, AvHTechNode will have to change it's networking, possibly other code too
+	// NOTE: When changing any of these values, make sure to update titles.txt, skill.cfg and dlls\game.cpp, and tech*s.spr
+	
+} AvHMessageID;
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHMessageList.h b/main/source/mod/AvHMessageList.h
new file mode 100644
index 00000000..1c90eb40
--- /dev/null
+++ b/main/source/mod/AvHMessageList.h
@@ -0,0 +1,24 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile:  $
+// $Date: $
+//
+//-------------------------------------------------------------------------------
+// $Log: $
+//===============================================================================
+#ifndef AVHMESSAGELIST_H
+#define AVHMESSAGELIST_H
+
+#include <vector>
+using std::vector;
+
+typedef vector<AvHMessageID> MessageIDListType;
+
+#endif
diff --git a/main/source/mod/AvHMetabolize.cpp b/main/source/mod/AvHMetabolize.cpp
new file mode 100644
index 00000000..5d461c58
--- /dev/null
+++ b/main/source/mod/AvHMetabolize.cpp
@@ -0,0 +1,214 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHMetabolize.cpp $
+// $Date: $
+//
+//-------------------------------------------------------------------------------
+// $Log: $
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#ifdef AVH_SERVER
+#include "mod/AvHBaseBuildable.h"
+#endif
+
+#include "mod/AvHMovementUtil.h"
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHSharedUtil.h"
+
+#include "pm_shared/pm_defs.h"
+extern playermove_t*	pmove;
+
+LINK_ENTITY_TO_CLASS(kwMetabolize, AvHMetabolize);
+
+void AvHMetabolize::Init()
+{
+	this->mRange = 0;
+//	this->mTimeOfLastMetabolizeViewAnim = -1;
+}
+
+BOOL AvHMetabolize::Deploy()
+{
+//	this->mTimeOfLastMetabolizeViewAnim = -1;
+
+	return AvHAlienWeapon::Deploy();
+}
+
+int	AvHMetabolize::GetBarrelLength() const
+{
+	return 0;
+}
+
+float AvHMetabolize::GetRateOfFire() const
+{
+    return BALANCE_FVAR(kMetabolizeROF);
+}
+
+#ifdef AVH_SERVER
+int	AvHMetabolize::GetResourceCost() const
+{
+	return BALANCE_IVAR(kMetabolizeResourceCost);
+}
+#endif
+
+int	AvHMetabolize::GetDeployAnimation() const
+{
+	// Look at most recently used weapon and see if we can transition from it
+	int theDeployAnimation = 7;
+	
+	AvHWeaponID thePreviousID = this->GetPreviousWeaponID();
+	
+	switch(thePreviousID)
+	{
+	case AVH_WEAPON_BLINK:
+	case AVH_WEAPON_METABOLIZE:
+		theDeployAnimation = -1;
+		break;
+
+	case AVH_WEAPON_SWIPE:
+		theDeployAnimation = 9;
+		break;
+		
+	case AVH_WEAPON_ACIDROCKET:
+	case AVH_WEAPON_BILEBOMB:
+		theDeployAnimation = 11;
+		break;
+	}
+	
+	return theDeployAnimation;
+}
+
+int	AvHMetabolize::GetIdleAnimation() const
+{
+	int theAnimation = UTIL_SharedRandomLong(this->m_pPlayer->random_seed, 17, 18);
+	return theAnimation;
+}
+
+void AvHMetabolize::ItemPostFrame(void)
+{
+	AvHAlienWeapon::ItemPostFrame();
+
+	float theClientTimePassedThisTick = (pmove->cmd.msec/1000.0f);
+//	this->mTimeOfLastMetabolizeViewAnim -= theClientTimePassedThisTick;
+}
+
+int	AvHMetabolize::GetShootAnimation() const
+{
+	int theAnimation = UTIL_SharedRandomLong(this->m_pPlayer->random_seed, 19, 20);
+	return theAnimation;
+}
+
+char* AvHMetabolize::GetViewModel() const
+{
+	return kLevel4ViewModel;
+}
+
+void AvHMetabolize::Precache()
+{
+	AvHAlienWeapon::Precache();
+
+	PRECACHE_UNMODIFIED_SOUND(kMetabolizeFireSound1);
+	PRECACHE_UNMODIFIED_SOUND(kMetabolizeFireSound2);
+	PRECACHE_UNMODIFIED_SOUND(kMetabolizeFireSound3);
+	
+	this->mEvent = PRECACHE_EVENT(1, kMetabolizeEventName);
+}
+
+
+void AvHMetabolize::Spawn() 
+{ 
+    AvHAlienWeapon::Spawn(); 
+	
+	this->Precache();
+	
+	this->m_iId = AVH_WEAPON_METABOLIZE;
+	
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsMetabolize);
+	
+	SET_MODEL(ENT(this->pev), kNullModel);
+	
+	FallInit();// get ready to fall down.
+} 
+
+void AvHMetabolize::FireProjectiles(void)
+{
+	#ifdef AVH_SERVER
+//	// Don't allow moving while metabolizing
+//    if(this->m_pPlayer->pev->flags & FL_ONGROUND)
+//	{
+//		VectorScale(this->m_pPlayer->pev->velocity, 0.3, this->m_pPlayer->pev->velocity);
+//	}
+
+    // Get health back
+    float theFocusAmount = 1.0f;
+    if(AvHSHUGetIsWeaponFocusable(AvHWeaponID(this->m_iId)))
+    {
+        theFocusAmount *= AvHPlayerUpgrade::GetFocusDamageUpgrade(this->m_pPlayer->pev->iuser4);
+    }
+
+	// Get health back
+	int theRegenAmount = BALANCE_IVAR(kMetabolizeHealAmount)*theFocusAmount;
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this->m_pPlayer);
+	ASSERT(thePlayer);
+	thePlayer->Heal(theRegenAmount);
+
+	// Adjusts player's max speed
+	thePlayer->SetTimeOfMetabolizeEnd(gpGlobals->time + this->GetRateOfFire());
+	#endif	
+}
+
+void AvHMetabolize::DeductCostForShot(void)
+{
+    // Add energy back after it's deducted to make sure extra isn't wasted
+    AvHAlienWeapon::DeductCostForShot();
+
+    // Get energy back
+    float theFocusAmount = 1.0f;
+    if(AvHSHUGetIsWeaponFocusable(AvHWeaponID(this->m_iId)))
+    {
+        theFocusAmount *= AvHPlayerUpgrade::GetFocusDamageUpgrade(this->m_pPlayer->pev->iuser4);
+    }
+
+    float theEnergyAmount = BALANCE_FVAR(kMetabolizeEnergyAmount)*theFocusAmount;
+	AvHMUGiveAlienEnergy(this->m_pPlayer->pev->fuser3, theEnergyAmount);
+}
+
+void AvHMetabolize::SetAnimationAndSound(void)
+{
+	// Only play view model anim every so often
+//	const float kAnimInterval = 3.0f;
+//	if(this->mTimeOfLastMetabolizeViewAnim < 0.0f)
+//	{
+//		this->SendWeaponAnim(19);
+//		this->mTimeOfLastMetabolizeViewAnim = UTIL_WeaponTimeBase() + kAnimInterval;
+//	}
+
+	AvHAlienWeapon::SetAnimationAndSound();
+}
+
+
+
+
+
diff --git a/main/source/mod/AvHMine.cpp b/main/source/mod/AvHMine.cpp
new file mode 100644
index 00000000..e9f6ae79
--- /dev/null
+++ b/main/source/mod/AvHMine.cpp
@@ -0,0 +1,349 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: This is the weapon that marines use to deploy mines (not the mines themselves)
+//
+// $Workfile: AvHMine.cpp $
+// $Date: 2002/10/25 21:48:21 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHMine.cpp,v $
+// Revision 1.10  2002/10/25 21:48:21  Flayra
+// - Fixe for wrong player model when holding mines
+//
+// Revision 1.9  2002/10/16 20:53:09  Flayra
+// - Removed weapon upgrade sounds
+//
+// Revision 1.8  2002/10/16 01:01:58  Flayra
+// - Fixed mines being resupplied from armory
+//
+// Revision 1.7  2002/10/03 18:46:17  Flayra
+// - Added heavy view model
+//
+// Revision 1.6  2002/07/24 19:09:17  Flayra
+// - Linux issues
+//
+// Revision 1.5  2002/07/24 18:55:52  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.4  2002/07/24 18:45:42  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.3  2002/06/25 17:47:14  Flayra
+// - Fixed mine, refactored for new disabled/enabled state
+//
+// Revision 1.2  2002/06/03 16:37:31  Flayra
+// - Constants and tweaks to make weapon anims and times correct with new artwork, added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.1  2002/05/23 02:33:42  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHMarineWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHMarineWeapons.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHGamerules.h"
+#include "mod/AvHMarineEquipment.h"
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHServerUtil.h"
+#endif
+
+LINK_ENTITY_TO_CLASS(kwMine, AvHMine);
+
+void AvHMine::DeductCostForShot(void)
+{
+	AvHBasePlayerWeapon::DeductCostForShot();
+
+	//this->m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType]--;
+
+	//if(this->m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] <= 0)
+	if(!this->m_iClip)
+	{
+		// no more mines! 
+		RetireWeapon();
+	}
+
+}
+
+bool AvHMine::GetCanBeResupplied() const
+{
+    return false;
+}
+
+int	AvHMine::GetDeployAnimation() const
+{
+	return 2;
+}
+
+char* AvHMine::GetHeavyViewModel() const
+{
+	return kTripmineHVVModel;
+}
+
+char* AvHMine::GetPlayerModel() const
+{
+	return kTripminePModel;
+}
+
+char* AvHMine::GetWorldModel() const
+{
+	return kTripmineWModel;
+}
+
+char* AvHMine::GetViewModel() const
+{
+	return kTripmineVModel;
+}
+
+int	AvHMine::GetShootAnimation() const
+{
+	// Return deploy animation for now, this should play fire animation, then a little later, play the deploy animation
+	return 2;
+}
+
+void AvHMine::Holster(int skiplocal)
+{
+	if(!this->m_iClip)
+	{
+		// Out of mines
+		SetThink(&AvHMine::DestroyItem);
+		this->pev->nextthink = gpGlobals->time + 0.1;
+	}
+
+	AvHMarineWeapon::Holster(skiplocal);
+}
+
+void AvHMine::Init()
+{
+	this->mRange = kMineRange;
+	this->mDamage = 0; // What to do here?  Is it taking damage from CGrenade?
+}
+
+bool AvHMine::ProcessValidAttack(void)
+{
+	bool theSuccess = AvHMarineWeapon::ProcessValidAttack();
+
+    // This test is not necessary since the new collision code makes it so
+    // that interpenetrating objects are not a problem.
+
+    /*
+    if(theSuccess)
+	{
+		#ifdef AVH_SERVER
+		theSuccess = false;
+		
+		Vector theDropLocation;
+		Vector theDropAngles;
+		if(this->GetDropLocation(theDropLocation, &theDropAngles))
+		{
+			Vector theMineMinSize = Vector (kMineMinSize);
+			Vector theMineMaxSize = Vector (kMineMaxSize);
+
+			// TODO: Rotate extents by theDropAngles, to test bounding box extents as the mine would be placed
+
+			if(AvHSHUGetIsAreaFree(theDropLocation, theMineMinSize, theMineMaxSize))
+			{
+				theSuccess = true;
+			}
+		}
+		#endif
+	}
+    */
+#ifdef AVH_SERVER
+
+    if(theSuccess)
+    {
+
+    	Vector theMineOrigin;
+    	Vector theMineAngles;
+        
+        theSuccess = this->GetDropLocation(theMineOrigin, &theMineAngles);
+
+    }
+
+#endif
+
+	return theSuccess;
+}
+
+#ifdef AVH_SERVER
+bool AvHMine::GetDropLocation(Vector& outLocation, Vector* outAngles) const
+{
+	bool theSuccess = false;
+
+	UTIL_MakeVectors( m_pPlayer->pev->v_angle + m_pPlayer->pev->punchangle );
+	Vector vecSrc	 = m_pPlayer->GetGunPosition( );
+	Vector vecAiming = gpGlobals->v_forward;
+	
+	TraceResult tr;
+	
+	UTIL_TraceLine( vecSrc, vecSrc + vecAiming*this->mRange, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr );
+
+	if (tr.flFraction < 1.0)
+	{
+		CBaseEntity* theEntity = CBaseEntity::Instance( tr.pHit );
+		
+        if (!dynamic_cast<AvHDeployedMine*>(theEntity))
+        {
+    
+            int kOffset = 8;
+            Vector thePotentialOrigin = tr.vecEndPos + tr.vecPlaneNormal * kOffset;
+
+		    BaseEntityListType theEntityList;
+		    theEntityList.push_back(theEntity);
+
+		    // Make sure there isn't an entity nearby that this would block
+		    theEntity = NULL;
+		    const int kMineSearchRadius = 15;
+		    while((theEntity = UTIL_FindEntityInSphere(theEntity, thePotentialOrigin, kMineSearchRadius)) != NULL)
+		    {
+			    theEntityList.push_back(theEntity);
+		    }
+		    
+		    // For the mine placement to be valid, the entity it hit, and all the entities nearby must be valid and non-blocking
+		    theSuccess = true;
+		    for(BaseEntityListType::iterator theIter = theEntityList.begin(); theIter != theEntityList.end(); theIter++)
+		    {
+			    CBaseEntity* theCurrentEntity = *theIter;
+			    if(!theCurrentEntity || (theCurrentEntity->pev->flags & FL_CONVEYOR) || AvHSUGetIsExternalClassName(STRING(theCurrentEntity->pev->classname)) || dynamic_cast<CBaseDoor*>(theCurrentEntity) || dynamic_cast<CRotDoor*>(theCurrentEntity))
+			    {
+				    theSuccess = false;
+				    break;
+			    }
+		    }
+
+		    if(theSuccess)
+		    {
+			    VectorCopy(thePotentialOrigin, outLocation);
+			    if(outAngles)
+			    {
+				    VectorCopy(UTIL_VecToAngles( tr.vecPlaneNormal ), *outAngles)
+			    }
+		    }
+
+        }
+
+	}
+
+	return theSuccess;
+}
+#endif
+
+void AvHMine::FireProjectiles(void)
+{
+#ifdef AVH_SERVER
+	Vector theMineOrigin;
+	Vector theMineAngles;
+	if(this->GetDropLocation(theMineOrigin, &theMineAngles))
+	{
+		GetGameRules()->MarkDramaticEvent(kMinePlacePriority, this->m_pPlayer);
+
+		AvHDeployedMine* theMine = dynamic_cast<AvHDeployedMine*>(CBaseEntity::Create( kwsDeployedMine, theMineOrigin, theMineAngles, m_pPlayer->edict() ));
+		ASSERT(theMine);
+
+		// Set the team so it doesn't blow us up, remember the owner so proper credit can be given
+		theMine->pev->team = m_pPlayer->pev->team;
+		//theMine->pev->owner = m_pPlayer->edict();
+		theMine->SetPlacer(this->m_pPlayer->pev);
+
+		// Set it as a marine item so it gets damage upgrades
+        // Set any team-wide upgrades
+        AvHTeam* theTeam = GetGameRules()->GetTeam(AvHTeamNumber(m_pPlayer->pev->team));
+        ASSERT(theTeam);
+        theMine->pev->iuser4 |= theTeam->GetTeamWideUpgrades();
+	}
+#endif
+}
+
+int	AvHMine::GetBarrelLength() const
+{
+	return kMineBarrellLength;
+}
+
+float AvHMine::GetRateOfFire() const
+{
+    return kMineROF;
+}
+
+bool AvHMine::GetFiresUnderwater() const
+{
+	return true;
+}
+
+BOOL AvHMine::PlayEmptySound()
+{
+	// None
+	return 0;
+}
+
+void AvHMine::Precache()
+{
+	AvHMarineWeapon::Precache();
+
+	UTIL_PrecacheOther(kwsDeployedMine);
+
+	this->mEvent = PRECACHE_EVENT(1, kWeaponAnimationEvent);
+}
+
+bool AvHMine::Resupply()
+{
+ 	return false;
+}
+
+void AvHMine::Spawn() 
+{ 
+	this->Precache();
+	
+    AvHMarineWeapon::Spawn(); 
+
+	this->m_iId = AVH_WEAPON_MINE;
+	
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsMine);
+
+	SET_MODEL(ENT(pev), kTripmineW2Model);
+
+	FallInit();// get ready to fall down.
+
+    int theNumMines = BALANCE_IVAR(kMineMaxAmmo);
+    
+    #ifdef AVH_SERVER
+    if(GetGameRules()->GetIsCombatMode())
+    {
+        theNumMines = BALANCE_IVAR(kMineMaxAmmoCombat);
+    }
+    #endif
+
+	this->m_iDefaultAmmo = theNumMines;
+} 
+
+
+bool AvHMine::UsesAmmo(void) const
+{
+	return true;
+}
+
+BOOL AvHMine::UseDecrement(void)
+{
+	return true;
+}
+
diff --git a/main/source/mod/AvHMiniMap.cpp b/main/source/mod/AvHMiniMap.cpp
new file mode 100644
index 00000000..9c81a1c9
--- /dev/null
+++ b/main/source/mod/AvHMiniMap.cpp
@@ -0,0 +1,592 @@
+#include "mod/AvHMiniMap.h"
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHSpecials.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/parsemsg.h"
+#endif
+
+const int kHitWorldPaletteIndex = 0;
+const int kBorderPaletteIndexStart = 1;
+const int kBorderPaletteIndexEnd = 2;
+const int kGroundStartPaletteIndex = 3;
+const int kGroundEndPaletteIndex = 254;
+const int kHitNothingPaletteIndex = 255;
+
+#ifdef AVH_SERVER
+// Network message: 
+//	0: means start processing, pass map name then num samples to process, map width, map height
+//	1: means update, pass num pixels, then data
+//	2: means end processing
+extern int								gmsgBuildMiniMap;
+#endif
+
+void SafeWrite (FILE *f, void *buffer, int count)
+{
+	if (fwrite (buffer, 1, count, f) != (size_t)count)
+	{
+		ASSERT(false);
+	}
+}
+
+// Init class members
+AvHMiniMap::AvHMiniMap()
+{
+	this->mMap = NULL;
+
+	this->mIsProcessing = false;
+	this->mNumSamplesProcessed = 0;
+	this->mNumSamplesToProcess = 0;
+
+	this->mMinX = this->mMinY = this->mMaxX = this->mMaxY = 0;
+	this->mMinViewHeight = this->mMaxViewHeight = 0;
+
+	#ifdef AVH_SERVER
+	this->mPlayer = NULL;
+	#endif
+}
+
+AvHMiniMap::~AvHMiniMap()
+{
+	delete [] this->mMap;
+	this->mMap = NULL;
+}
+
+
+bool AvHMiniMap::GetIsProcessing(float* outPercentageDone) const
+{
+	bool theIsProcessing = false;
+	
+	if(this->mIsProcessing)
+	{
+		if(outPercentageDone)
+		{
+			*outPercentageDone = (float)this->mNumSamplesProcessed/this->mNumSamplesToProcess;
+		}
+		theIsProcessing = true;
+	}
+	
+	return theIsProcessing;
+}
+
+
+
+
+#ifdef AVH_SERVER
+void AvHMiniMap::BuildMiniMap(const char* inMapName, AvHPlayer* inPlayer, const AvHMapExtents& inMapExtents)
+{
+	const int kNumGroundFloorColors = 249;
+
+	this->mMapName = inMapName;
+	this->mPlayer = inPlayer;
+
+	// In base BuildMiniMap is called multiple times
+	delete [] this->mMap;
+
+	// New a hi-res version of the map (enough for the 1600 version)
+	this->mMapWidth = kSpriteWidth;
+	this->mMapHeight = kSpriteWidth;
+
+	this->mNumSamplesToProcess = this->mMapWidth*this->mMapHeight;
+
+	this->mMap = new uint8[this->mNumSamplesToProcess];
+	this->mNumSamplesProcessed = 0;
+
+	this->mMinX = inMapExtents.GetMinMapX();//inMinX;
+	this->mMinY = inMapExtents.GetMinMapY();//inMinY;
+	this->mMaxX = inMapExtents.GetMaxMapX();//inMaxX;
+	this->mMaxY = inMapExtents.GetMaxMapY();//inMaxY;
+
+	this->mMinViewHeight = inMapExtents.GetMinViewHeight();//inMinViewHeight;
+	this->mMaxViewHeight = inMapExtents.GetMaxViewHeight();//inMaxViewHeight;
+	
+	this->mIsProcessing = true;
+
+	// Tell player to rebuild minimap
+	MESSAGE_BEGIN(MSG_ONE, gmsgBuildMiniMap, NULL, this->mPlayer->pev);
+		WRITE_BYTE(0);
+		WRITE_STRING(this->mMapName.c_str());
+		WRITE_LONG(this->mNumSamplesToProcess);
+		WRITE_LONG(this->mMapWidth);
+		WRITE_LONG(this->mMapHeight);
+	MESSAGE_END();
+}
+
+bool AvHMiniMap::Process()
+{
+	bool theProcessingComplete = false;
+	
+	if(this->GetIsProcessing())
+	{
+		// Process x pixels
+		// If we've calculated them all, return true
+		
+		// positive y on component is down, but that means negative y in world
+		float theDiffY = this->mMaxY - this->mMinY;
+		
+		// left to right
+		float theDiffX = this->mMaxX - this->mMinX;
+		
+		// Preserve map aspect ratio
+		float theMapAspectRatio = (this->mMaxX - this->mMinX)/(this->mMaxY - this->mMinY);
+		
+		float theXScale, theYScale;
+		if(theMapAspectRatio > 1.0f)
+		{
+			theXScale = 1.0f;
+			theYScale = 1.0f/theMapAspectRatio;	
+		}
+		else
+		{
+			theXScale = 1.0f/theMapAspectRatio;	
+			theYScale = 1.0f;
+		}
+		
+		float theMapCenterX = (this->mMinX + this->mMaxX)/2.0f;
+		float theMapCenterY = (this->mMinY + this->mMaxY)/2.0f;
+
+		const int kNumPixelsPerCall = 50;
+		char theSampleArray[kNumPixelsPerCall];
+		memset(theSampleArray, 0, kNumPixelsPerCall);
+		
+		for(int i = 0; (i < kNumPixelsPerCall) && (this->mNumSamplesProcessed < this->mNumSamplesToProcess); i++)
+		{
+			int theSampleIndex = this->mNumSamplesProcessed;
+			int theX = theSampleIndex % this->mMapWidth;
+			int theY = theSampleIndex/this->mMapWidth;
+			
+			// Initialize the value to outside the map
+			int theValue = kHitNothingPaletteIndex;
+			
+			// Account for map center and aspect ratio
+			float theXComponent = (theX/(float)this->mMapWidth) - .5f;
+			float theYComponent = (theY/(float)this->mMapHeight) - .5f;
+			float theCurrentX = theMapCenterX + theXComponent*theDiffX*theXScale;
+			float theCurrentY = theMapCenterY - theYComponent*theDiffY*theYScale;
+			
+			// If the point is inside our map boundaries, do the trace
+			if((theCurrentX >= this->mMinX) && (theCurrentX <= this->mMaxX) && (theCurrentY >= this->mMinY) && (theCurrentY <= this->mMaxY))
+			{
+				// If we hit nothing, draw with the off map index
+				theValue = kHitNothingPaletteIndex;
+				int theUserThree = 0;
+				float theHitHeight;
+				float theHeightGradient = 0.0f;
+				
+				if(AvHSHUTraceVerticalTangible(theCurrentX, theCurrentY, this->mMaxViewHeight, theUserThree, theHitHeight))
+				{
+					// TODO: Modify trace to return world brushes that are hit
+					// Set color to "world brush hit", it will be changed if an entity was hit
+					theValue = kHitWorldPaletteIndex;
+					
+
+					theHitHeight = min(mMaxViewHeight, max(theHitHeight, mMinViewHeight));
+					theHeightGradient = 1.0f - (this->mMaxViewHeight - theHitHeight)/(this->mMaxViewHeight - this->mMinViewHeight);
+					theValue = kGroundStartPaletteIndex + (kGroundEndPaletteIndex - kGroundStartPaletteIndex)*theHeightGradient;
+			   
+				}
+			}
+			
+			int theIndex = theX + theY*this->mMapWidth;
+			ASSERT(theIndex < this->mNumSamplesToProcess);
+			this->mMap[theIndex] = theValue;
+
+			theSampleArray[i] = theValue;
+			
+			this->mNumSamplesProcessed++;
+		}
+
+		// This could be less than kNumPixelsPerCall if it's the last time through
+		int theNumSamples = i;
+
+		// Tell player to rebuild minimap
+		MESSAGE_BEGIN(MSG_ONE, gmsgBuildMiniMap, NULL, this->mPlayer->pev);
+			WRITE_BYTE(1);
+			WRITE_BYTE(theNumSamples);
+			for(int j = 0; j < theNumSamples; j++)
+			{
+				WRITE_BYTE(theSampleArray[j]);
+			}
+		MESSAGE_END();
+		
+		if(this->mNumSamplesProcessed == this->mNumSamplesToProcess)
+		{
+			theProcessingComplete = true;
+			this->mIsProcessing = false;
+
+			MESSAGE_BEGIN(MSG_ONE, gmsgBuildMiniMap, NULL, this->mPlayer->pev);
+				WRITE_BYTE(2);
+			MESSAGE_END();
+		}
+	}
+	
+	return theProcessingComplete;
+}
+
+#endif
+
+
+#ifdef AVH_CLIENT
+string AvHMiniMap::GetSpriteNameFromMap(int inSpriteWidth, const string& inMapName)
+{
+	char theWidthString[128];
+	sprintf(theWidthString, "%d", inSpriteWidth);
+	
+	string theMiniMapName = kMiniMapSpritesDirectory + string("/") /*+ string(theWidthString)*/ + inMapName + string(".spr");
+	//string theMiniMapName = kMiniMapSpritesDirectory + string("/") + inMapName + string(".spr");
+	return theMiniMapName;
+}
+
+void AvHMiniMap::InitializePalette()
+{
+	//	// Test data
+	//	memset(this->mMap, kTransparentPaletteIndex, theNumSamples);
+	//	for(int i = 0; i < this->mMapHeight; i++)
+	//	{
+	//		char theFillChar = i % 256;
+	//		memset(this->mMap + i*this->mMapWidth, theFillChar, this->mMapWidth);
+	//	}
+	//	
+	
+	// Set colors in image to use palette
+	memset(this->mPalette, 0, 256*3);
+
+	float theGradient = 0.0f;
+	
+	for(int i = 0; i < 256; i++)
+	{
+		const int kHitWorldR = 29;
+		const int kHitWorldG = 59;
+		const int kHitWorldB = 121;
+
+		const int kBorderR = 144;
+		const int kBorderG = 159;
+		const int kBorderB = 189;
+
+		uint8* theColor = this->mPalette + i*3;
+		
+		if (i >= kGroundStartPaletteIndex && i <= kGroundEndPaletteIndex)
+		{
+			// Ground start to end
+			
+			// Set color according to height, blending to hit world color
+			theGradient = (float)(i - kGroundStartPaletteIndex)/(kGroundEndPaletteIndex - kGroundStartPaletteIndex);
+			theColor[0] = (int)(theGradient*kHitWorldR);
+			theColor[1] = (int)(theGradient*kHitWorldG);
+			theColor[2] = (int)(theGradient*kHitWorldB);
+
+		}
+		else if (i >= kBorderPaletteIndexStart && i <= kBorderPaletteIndexEnd)
+		{
+
+			theGradient = (float)(i - kBorderPaletteIndexStart)/(kBorderPaletteIndexEnd - kBorderPaletteIndexStart);
+			theColor[0] = (int)(theGradient*kBorderR);
+			theColor[1] = (int)(theGradient*kBorderG);
+			theColor[2] = (int)(theGradient*kBorderB);
+
+		}
+		else
+		{
+		
+			switch(i)
+			{
+			// On map but inaccessible
+			case kHitNothingPaletteIndex:
+				theColor[0] = 255;
+                theColor[1] = 0;
+                theColor[2] = 0;
+				break;
+				
+			case kHitWorldPaletteIndex:
+				theColor[0] = kHitWorldR;
+				theColor[1] = kHitWorldG;
+				theColor[2] = kHitWorldB;
+				break;
+
+				/*
+			case kBorderPaletteIndex:
+				theColor[0] = 144;
+				theColor[1] = 159;
+				theColor[2] = 189;
+				break;
+				*/
+				
+			}
+
+		}
+
+	}
+
+}
+
+int AvHMiniMap::ReceiveFromNetworkStream()
+{
+	int theBytesRead = 0;
+
+	// Read status code
+	int theCode = READ_BYTE();
+	theBytesRead++;
+
+	if(theCode == 0)
+	{
+		// Starting to create a new minimap
+		char* theMapName = READ_STRING();
+		theBytesRead += strlen(theMapName);
+
+		// Receive num bytes needed for map
+		this->mNumSamplesToProcess = READ_LONG();
+		theBytesRead += 4;
+
+		// Read map with and height
+		this->mMapWidth = READ_LONG();
+		theBytesRead += 4;
+
+		this->mMapHeight = READ_LONG();
+		theBytesRead += 4;
+		
+		this->mMap = new uint8[this->mNumSamplesToProcess];
+		memset(this->mMap, 0, this->mNumSamplesToProcess);
+
+		this->mMapName = theMapName;
+		this->mNumSamplesProcessed = 0;
+		this->mIsProcessing = true;
+	}
+	else if(theCode == 1)
+	{
+		// Read num samples
+		int theNumSamples = READ_BYTE();
+		theBytesRead++;
+
+		// Read sample
+		for(int i = 0; i < theNumSamples; i++)
+		{
+			// Read the sample and store in the map
+			uint8 theSample = READ_BYTE();
+
+			ASSERT(this->mNumSamplesProcessed < this->mNumSamplesToProcess);
+
+			this->mMap[this->mNumSamplesProcessed++] = theSample;
+
+			theBytesRead++;
+		}
+	}
+	else if(theCode == 2)
+	{
+		// TODO: Verify that we are done
+		//ASSERT(this->mNumSamplesProcessed == this->mNumSamplesToProcess);
+	}
+
+	return theBytesRead;
+}
+
+bool AvHMiniMap::WriteMapToSprite()
+{
+	bool theSuccess = false;
+
+	if(!this->GetIsProcessing())
+	{
+		// Open file
+		string theSpriteFileName = string(getModDirectory()) + string("/") + GetSpriteNameFromMap(0, this->mMapName);
+		FILE* theFile = fopen(theSpriteFileName.c_str(), "wb");
+		if(theFile)
+		{
+			// Clear sprite data to transparent
+			memset(this->mSpriteData, 0, kSpriteDataPixels);
+
+			// Copy data
+			memcpy(this->mSpriteData, this->mMap, kSpriteWidth*kSpriteHeight);
+			
+			int theNumFrames = 1;
+			this->WriteMapToSprite(theFile);
+			
+			fclose(theFile);
+			
+			theSuccess = true;
+		}
+	}
+	
+	return theSuccess;	
+}
+
+void AvHMiniMap::WriteMapToSprite(FILE* inFileHandle)
+{
+
+	// Compute the number for frames based on the size of the sprite.
+
+    const int spriteWidth  = 256;
+    const int spriteHeight = 256;
+    
+    int numXFrames = mMapWidth / spriteWidth;
+    int numYFrames = mMapHeight / spriteHeight;
+
+    // The extra frame is the commander mode version of the map.
+    int numFrames = numXFrames * numYFrames + 1;
+
+    //
+	// write out the sprite header
+	//
+	dsprite_t spritetemp;
+	spritetemp.type = SPR_SINGLE;
+	spritetemp.texFormat = SPR_ALPHTEST;
+	spritetemp.boundingradius = sqrt((float)kSpriteWidth*kSpriteWidth);
+	spritetemp.width = spriteWidth;
+	spritetemp.height = spriteHeight;
+	spritetemp.numframes = numFrames;
+	spritetemp.beamlength = 0;// LittleFloat (this->sprite.beamlength);
+	spritetemp.synctype = ST_SYNC;
+	spritetemp.version = SPRITE_VERSION;
+	spritetemp.ident = IDSPRITEHEADER;
+	
+	SafeWrite(inFileHandle, &spritetemp, sizeof(spritetemp));
+	
+	short cnt = 256;
+	SafeWrite(inFileHandle, (void *) &cnt, sizeof(cnt));
+	SafeWrite(inFileHandle, this->mPalette, cnt*3);
+
+    for (int y = 0; y < numYFrames; ++y)
+    {
+        for (int x = 0; x < numXFrames; ++x)
+        {
+
+		    spriteframetype_t theType = SPR_SINGLE;
+		    SafeWrite ( inFileHandle, &theType,  sizeof(theType));
+		    
+		    dspriteframe_t	frametemp;
+		    
+		    frametemp.origin[0] = 0;
+		    frametemp.origin[1] = 0;
+		    frametemp.width = spriteWidth;
+		    frametemp.height = spriteHeight;
+		    
+		    SafeWrite (inFileHandle, &frametemp, sizeof (frametemp));
+
+            for (int i = 0; i < spriteHeight; ++i)
+            {
+                SafeWrite (inFileHandle, mSpriteData + (y * spriteHeight + i) * mMapWidth + x * spriteWidth, spriteWidth);
+            }
+
+        }
+    }
+
+	spriteframetype_t theType = SPR_SINGLE;
+	SafeWrite ( inFileHandle, &theType,  sizeof(theType));
+	
+	dspriteframe_t	frametemp;
+	
+	frametemp.origin[0] = 0;
+	frametemp.origin[1] = 0;
+	frametemp.width = kSpriteWidth / 2;
+	frametemp.height = kSpriteHeight / 2;
+	
+	SafeWrite (inFileHandle, &frametemp, sizeof (frametemp));
+    SafeWrite (inFileHandle, mCommanderSpriteData, kSpriteDataPixels / 4);
+
+
+}
+
+bool AvHMiniMap::WriteSpritesIfJustFinished()
+{
+	bool theSuccess = false;
+
+	if(this->GetIsProcessing() && (this->mNumSamplesProcessed == this->mNumSamplesToProcess))
+	{
+		this->mIsProcessing = false;
+
+		this->InitializePalette();
+
+        // Create the commander mode version of the sprite.
+
+        for (int x = 0; x < kSpriteWidth / 2; ++x)
+        {
+            for (int y = 0; y < kSpriteHeight / 2; ++y)
+            {
+                mCommanderSpriteData[x + y * (kSpriteWidth / 2)] = 
+                    mMap[(x * 2) + (y * 2) * kSpriteWidth];
+            }
+        }
+        
+        this->DrawEdges(mMap, kSpriteWidth, kSpriteHeight);
+        this->DrawEdges(mCommanderSpriteData, kSpriteWidth / 2, kSpriteHeight / 2);
+
+		if(this->WriteMapToSprite())
+		{
+			theSuccess = true;
+		}
+
+		this->mNumSamplesProcessed = this->mNumSamplesToProcess = 0;
+		this->mIsProcessing = false;
+	}
+	
+	// For each resolution
+	return theSuccess;
+}
+
+void AvHMiniMap::DrawEdges(uint8* inMap, int width, int height)
+{
+
+	const int numPixels = width * height;
+	uint8* newMap = new uint8[numPixels];
+
+    memset(newMap, kHitNothingPaletteIndex, numPixels);
+    
+    for (int y = 1; y < width - 1; ++y)
+	{
+		for (int x = 1; x < height - 1; ++x)
+		{
+
+			int baseIndex = x + y * width;
+			int color = inMap[baseIndex]; 
+
+			if (color == kHitNothingPaletteIndex)
+			{
+
+				int count = 0;
+
+				if (inMap[(x-1) + (y-1)*width] != kHitNothingPaletteIndex) ++count;
+				if (inMap[(x+0) + (y-1)*width] != kHitNothingPaletteIndex) ++count;
+				if (inMap[(x+1) + (y-1)*width] != kHitNothingPaletteIndex) ++count;
+
+				if (inMap[(x-1) + (y+0)*width] != kHitNothingPaletteIndex) ++count;
+				if (inMap[(x+1) + (y+0)*width] != kHitNothingPaletteIndex) ++count;
+
+				if (inMap[(x-1) + (y+1)*width] != kHitNothingPaletteIndex) ++count;
+				if (inMap[(x+0) + (y+1)*width] != kHitNothingPaletteIndex) ++count;
+				if (inMap[(x+1) + (y+1)*width] != kHitNothingPaletteIndex) ++count;
+
+
+				if (count > 0)
+				{
+					float i = pow((count / 8.0f), 0.5f);
+					//color = i * (kBorderPaletteIndexEnd - kBorderPaletteIndexStart) + kBorderPaletteIndexStart;
+                    color = kBorderPaletteIndexEnd;
+				}
+
+
+				/*
+				if (mMap[(x-1) + (y-1)*mMapWidth] != kHitNothingPaletteIndex ||
+					mMap[(x+0) + (y-1)*mMapWidth] != kHitNothingPaletteIndex ||
+					mMap[(x+1) + (y-1)*mMapWidth] != kHitNothingPaletteIndex ||
+					mMap[(x-1) + (y+0)*mMapWidth] != kHitNothingPaletteIndex ||
+					mMap[(x+1) + (y+0)*mMapWidth] != kHitNothingPaletteIndex ||
+					mMap[(x-1) + (y+1)*mMapWidth] != kHitNothingPaletteIndex ||
+					mMap[(x+0) + (y+1)*mMapWidth] != kHitNothingPaletteIndex ||
+					mMap[(x+1) + (y+1)*mMapWidth] != kHitNothingPaletteIndex)
+				{
+					color = kBorderPaletteIndex;
+				}
+				*/
+
+			}
+			
+			newMap[baseIndex] = color;
+
+		}
+	}
+
+	memcpy(inMap, newMap, numPixels);
+	delete [] newMap;
+
+}
+
+#endif
+
diff --git a/main/source/mod/AvHMiniMap.h b/main/source/mod/AvHMiniMap.h
new file mode 100644
index 00000000..0b6fb4eb
--- /dev/null
+++ b/main/source/mod/AvHMiniMap.h
@@ -0,0 +1,98 @@
+#ifndef AVH_MINIMAP_H
+#define AVH_MINIMAP_H
+
+#include "types.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHPlayer.h"
+#endif
+
+#ifdef AVH_CLIENT
+#include "utils/sprgen/spritegn.h"
+#include "cl_dll/hud.h"
+#include "common/const.h"
+#include "common/entity_state.h"
+#include "common/cl_entity.h"
+#endif
+
+#include "mod/AvHMapExtents.h"
+
+const int kMaxScreenWidth = 1600;
+const int kMaxScreenHeight = 1200;
+const int kSpriteWidth = 512;
+const int kSpriteHeight = 512;
+const int kSpriteDataPixels = kSpriteWidth*kSpriteHeight;
+
+class AvHMiniMap
+{
+public:
+					AvHMiniMap();
+	virtual			~AvHMiniMap();
+				
+	bool			GetIsProcessing(float* outPercentageDone = NULL) const;
+	
+	#ifdef AVH_SERVER
+	void			BuildMiniMap(const char* inMapName, AvHPlayer* inPlayer, const AvHMapExtents& inMapExtents);
+	bool			Process();
+	#endif
+
+	#ifdef AVH_CLIENT
+	static string	GetSpriteNameFromMap(int inSpriteWidth, const string& inMapName);
+	int				ReceiveFromNetworkStream();
+	bool			WriteSpritesIfJustFinished();
+	#endif
+
+		
+private:
+	#ifdef AVH_CLIENT
+	void			DrawEdges(uint8* inMap, int width, int height);
+	void			InitializePalette();
+	bool			WriteMapToSprite();
+	void			WriteMapToSprite(FILE* inFileHandle);
+	#endif
+					
+	uint8*			mMap;
+	int				mMapWidth;
+	int				mMapHeight;
+
+	#ifdef AVH_SERVER
+	AvHPlayer*		mPlayer;
+	#endif
+
+	#ifdef AVH_CLIENT
+	uint8			mPalette[256*3];
+	uint8			mSpriteData[kSpriteDataPixels];
+    uint8           mCommanderSpriteData[kSpriteDataPixels / 4];
+	#endif
+	
+	float			mMinX;
+	float			mMinY;
+	float			mMaxX;
+	float			mMaxY;
+	float			mMinViewHeight;
+	float			mMaxViewHeight;
+					
+	int				mNumSamplesToProcess;
+	int				mNumSamplesProcessed;
+	bool			mIsProcessing;
+
+	string			mMapName;
+
+	#ifdef AVH_CLIENT
+	// Sprite stuff
+	dsprite_t		sprite;
+	byte*			byteimage;
+	byte*			lbmpalette;
+	int				byteimagewidth;
+	int				byteimageheight;
+	byte*			lumpbuffer;
+	byte*			plump;
+	char			spritedir[1024];
+	char			spriteoutname[1024];
+	int				framesmaxs[2];
+	int				framecount;
+	#endif
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHMovementUtil.cpp b/main/source/mod/AvHMovementUtil.cpp
new file mode 100644
index 00000000..d32233a0
--- /dev/null
+++ b/main/source/mod/AvHMovementUtil.cpp
@@ -0,0 +1,377 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHMovementUtil.cpp $
+// $Date: 2002/10/24 21:34:02 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHMovementUtil.cpp,v $
+// Revision 1.20  2002/10/24 21:34:02  Flayra
+// - Less rockets
+//
+// Revision 1.19  2002/10/04 18:04:27  Flayra
+// - Fixed floating gestation sacs
+// - Aliens now fall all the way to ground during countdown (instead of floating and shaking)
+//
+// Revision 1.18  2002/10/03 18:59:04  Flayra
+// - Refactored energy
+//
+// Revision 1.17  2002/09/09 20:00:10  Flayra
+// - Balance changes
+//
+// Revision 1.16  2002/08/16 02:40:14  Flayra
+// - Regular balance update
+//
+// Revision 1.15  2002/08/09 01:08:30  Flayra
+// - Regular update
+//
+// Revision 1.14  2002/08/02 21:53:47  Flayra
+// - Various energy tweaks, so melee attacks don't run out when attacking buildings as often, and so fliers can fly and bite/spike
+//
+// Revision 1.13  2002/07/23 17:14:45  Flayra
+// - Energy updates
+//
+// Revision 1.12  2002/07/08 17:12:05  Flayra
+// - Regular update
+//
+// Revision 1.11  2002/07/01 21:38:46  Flayra
+// - Primal scream gives energy back faster, added energy usage for new weapons
+//
+// Revision 1.10  2002/06/25 18:08:40  Flayra
+// - Energy costs tweaking, added new weapons, added charging
+//
+// Revision 1.9  2002/06/03 16:52:36  Flayra
+// - Tweaked spike energy cost
+//
+// Revision 1.8  2002/05/28 17:54:45  Flayra
+// - Tweaked costs for swipe and web
+//
+// Revision 1.7  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHMovementUtil.h"
+#include "mod/AvHSpecials.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "mod/AvHHulls.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHBalance.h"
+#include "types.h"
+
+int AvHMUGetHull(bool inIsDucking, int inUserVar)
+{
+	int theHull = 0;
+
+	// For marines and level 4
+	theHull = inIsDucking ? kHLCrouchHullIndex : kHLStandHullIndex;
+	
+	// Set the hull for our special sized players
+	if(inUserVar == AVH_USER3_ALIEN_PLAYER1)
+	{
+		// Always use small hull, even when ducking
+		theHull = kHLCrouchHullIndex;
+	}
+	else if(inUserVar == AVH_USER3_ALIEN_PLAYER2)
+	{
+		theHull = kHLCrouchHullIndex;
+	}
+	else if(inUserVar == AVH_USER3_ALIEN_PLAYER3)
+	{
+		theHull = kHLCrouchHullIndex;
+	}
+	else if(inUserVar == AVH_USER3_ALIEN_EMBRYO)
+	{
+		theHull = kHLCrouchHullIndex;
+	}
+	else if(inUserVar == AVH_USER3_ALIEN_PLAYER5)
+	{
+		// Use human hull when ducking, largest otherwise
+		theHull = inIsDucking ? kHLStandHullIndex : kNSHugeHullIndex;
+	}
+	
+	return theHull;
+}
+
+int AvHMUGetOriginOffsetForUser3(AvHUser3 inUser3)
+{
+	int theOffset = 20;
+
+	if(inUser3 == AVH_USER3_ALIEN_PLAYER5)
+	{
+		theOffset = 40;
+	}
+	
+	return theOffset;
+}
+
+int AvHMUGetOriginOffsetForMessageID(AvHMessageID inMessageID)
+{
+	AvHUser3 theUser3 = AVH_USER3_NONE;
+	
+	if(inMessageID == ALIEN_LIFEFORM_FIVE)
+	{
+		theUser3 = AVH_USER3_ALIEN_PLAYER5;
+	}
+	
+	return AvHMUGetOriginOffsetForUser3(theUser3);
+}
+
+bool AvHMUGetCanDuck(int inUser3)
+{
+	bool theCanDuck = true;
+	
+	if((inUser3 == AVH_USER3_ALIEN_PLAYER1) || (inUser3 == AVH_USER3_ALIEN_PLAYER2) || (inUser3 == AVH_USER3_ALIEN_PLAYER3) || (inUser3 == AVH_USER3_ALIEN_EMBRYO) )
+	{
+		theCanDuck = false;
+	}
+	
+	return theCanDuck;
+}
+
+bool AvHMUDeductAlienEnergy(float& ioFuser, float inNormAmount)
+{
+	bool theSuccess = false;
+
+	if(AvHMUHasEnoughAlienEnergy(ioFuser, inNormAmount))
+	{
+		float theCurrentEnergy = ioFuser/kNormalizationNetworkFactor;
+
+		theCurrentEnergy -= inNormAmount;
+		theCurrentEnergy = max(theCurrentEnergy, 0.0f);
+		ioFuser = theCurrentEnergy*kNormalizationNetworkFactor;
+
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+bool AvHMUGiveAlienEnergy(float& ioFuser, float inNormAmount)
+{
+	bool theSuccess = false;
+
+	float theCurrentEnergy = ioFuser/kNormalizationNetworkFactor;
+
+	if(theCurrentEnergy < 1.0f)
+	{
+		theCurrentEnergy += inNormAmount;
+		theCurrentEnergy = min(max(theCurrentEnergy, 0.0f), 1.0f);
+		ioFuser = theCurrentEnergy*kNormalizationNetworkFactor;
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+bool AvHMUGetEnergyCost(AvHWeaponID inWeaponID, float& outEnergyCost)
+{
+	bool theSuccess = false;
+
+	float theCost = 0.0f;
+	switch(inWeaponID)
+	{
+	case AVH_WEAPON_CLAWS:
+		theCost = (float)BALANCE_FVAR(kClawsEnergyCost);
+		break;
+	case AVH_WEAPON_SPIT:
+		theCost = (float)BALANCE_FVAR(kSpitEnergyCost);
+		break;
+	case AVH_WEAPON_SPORES:
+		theCost = (float)BALANCE_FVAR(kSporesEnergyCost);
+		break;
+	case AVH_WEAPON_SPIKE:
+		theCost = (float)BALANCE_FVAR(kSpikeEnergyCost);
+		break;
+	case AVH_WEAPON_BITE:
+		theCost = (float)BALANCE_FVAR(kBiteEnergyCost);
+		break;
+    case AVH_WEAPON_BITE2:
+        theCost = (float)BALANCE_FVAR(kBite2EnergyCost);
+        break;
+	case AVH_WEAPON_SWIPE:
+		theCost = (float)BALANCE_FVAR(kSwipeEnergyCost);
+		break;
+	case AVH_WEAPON_BLINK:
+		theCost = (float)BALANCE_FVAR(kBlinkEnergyCost);
+		break;
+	case AVH_WEAPON_WEBSPINNER:
+		theCost = (float)BALANCE_FVAR(kWebEnergyCost);
+		break;
+	case AVH_WEAPON_PARASITE:
+		theCost = (float)BALANCE_FVAR(kParasiteEnergyCost);
+		break;
+	case AVH_WEAPON_DIVINEWIND:
+		theCost = (float)BALANCE_FVAR(kDivineWindEnergyCost);
+		break;
+	case AVH_WEAPON_HEALINGSPRAY:
+		theCost = (float)BALANCE_FVAR(kHealingSprayEnergyCost);
+		break;
+	case AVH_WEAPON_METABOLIZE:
+		theCost = (float)BALANCE_FVAR(kMetabolizeEnergyCost);
+		break;
+	case AVH_WEAPON_UMBRA:
+		theCost = (float)BALANCE_FVAR(kUmbraEnergyCost);
+		break;
+	case AVH_WEAPON_PRIMALSCREAM:
+		theCost = (float)BALANCE_FVAR(kPrimalScreamEnergyCost);
+		break;
+	case AVH_WEAPON_BILEBOMB:
+		theCost = (float)BALANCE_FVAR(kBileBombEnergyCost);
+		break;
+	case AVH_WEAPON_ACIDROCKET:
+		theCost = (float)BALANCE_FVAR(kAcidRocketEnergyCost);
+		break;
+	case AVH_WEAPON_STOMP:
+		theCost = (float)BALANCE_FVAR(kStompEnergyCost);
+		break;
+	case AVH_WEAPON_DEVOUR:
+		theCost = (float)BALANCE_FVAR(kDevourEnergyCost);
+		break;
+
+	// Abilities
+	case AVH_ABILITY_LEAP:
+		theCost = (float)BALANCE_FVAR(kLeapEnergyCost);
+		break;
+	case AVH_ABILITY_CHARGE:
+		theCost = (float)BALANCE_FVAR(kChargeEnergyCost);
+		break;
+
+	}
+
+	outEnergyCost = theCost;
+
+	if(theCost > 0.0f)
+	{
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+float AvHMUGetWalkSpeedFactor(AvHUser3 inUser3)
+{
+	float theMoveSpeed = .1f;
+	
+	switch(inUser3)
+	{
+	case AVH_USER3_MARINE_PLAYER:
+		theMoveSpeed = .095f;
+		break;
+	case AVH_USER3_ALIEN_PLAYER1:
+		//theMoveSpeed = .04f;
+		theMoveSpeed = .14f;
+		break;
+	case AVH_USER3_ALIEN_PLAYER2:
+		theMoveSpeed = .08f;
+		break;
+	case AVH_USER3_ALIEN_PLAYER3:
+		theMoveSpeed = .11f;
+		break;
+	case AVH_USER3_ALIEN_PLAYER4:
+		theMoveSpeed = .09f;
+		break;
+	case AVH_USER3_ALIEN_PLAYER5:
+		theMoveSpeed = .09f;
+		break;
+	}
+	
+	return theMoveSpeed;
+}
+
+bool AvHMUHasEnoughAlienEnergy(float& ioFuser, float inNormAmount)
+{
+	bool theSuccess = false;
+	
+	float theCurrentEnergy = ioFuser/kNormalizationNetworkFactor;
+	if(theCurrentEnergy >= inNormAmount)
+	{
+		theSuccess = true;
+	}
+	
+	return theSuccess;
+}
+
+void AvHMUUpdateAlienEnergy(float inTimePassed, int inUser3, int inUser4, float& ioFuser)
+{
+	if(	(inUser3 == AVH_USER3_ALIEN_PLAYER1) ||
+		(inUser3 == AVH_USER3_ALIEN_PLAYER2) ||
+		(inUser3 == AVH_USER3_ALIEN_PLAYER3) ||
+		(inUser3 == AVH_USER3_ALIEN_PLAYER4) ||
+		(inUser3 == AVH_USER3_ALIEN_PLAYER5))
+	{
+		if(!GetHasUpgrade(inUser4, MASK_PLAYER_STUNNED))
+		{
+			// Percentage (0-1) per second
+			float theAlienEnergyRate = (float)BALANCE_FVAR(kAlienEnergyRate);
+			//float kFadeChargingDeplectionRate = -2.8f*kAlienEnergyRate;
+			float kChargingDepletionRate = -BALANCE_FVAR(kChargingEnergyScalar)*theAlienEnergyRate;
+
+			const float kMultiplier = GetHasUpgrade(inUser4, MASK_BUFFED) ? (1.0f + BALANCE_FVAR(kPrimalScreamEnergyFactor)) : 1.0f;
+			if(kMultiplier > 1.0f)
+			{
+				int a = 0;
+			}
+			float theEnergyRate = theAlienEnergyRate*kMultiplier;
+
+			//if(inUser3 == AVH_USER3_ALIEN_PLAYER5)
+			//{
+			//	kAlienEnergyRate *= .6f;
+			//}
+			//else if(inUser3 == AVH_USER3_ALIEN_PLAYER1)
+			//{
+			//	kAlienEnergyRate *= 1.5f;
+			//}
+
+			float theUpgradeFactor = 1.0f;
+			int theNumLevels = AvHGetAlienUpgradeLevel(inUser4, MASK_UPGRADE_5);
+			if(theNumLevels > 0)
+			{
+
+				theUpgradeFactor += theNumLevels*BALANCE_FVAR(kAdrenalineEnergyPercentPerLevel);
+			}
+
+			float theCurrentEnergy = ioFuser/kNormalizationNetworkFactor;
+			
+			float theNewEnergy = theCurrentEnergy + inTimePassed*theAlienEnergyRate*theUpgradeFactor;
+
+			// If we're charging, reduce energy
+			if(GetHasUpgrade(inUser4, MASK_ALIEN_MOVEMENT))
+			{
+				if(inUser3 == AVH_USER3_ALIEN_PLAYER4)
+				{
+//					theNewEnergy += inTimePassed*kFadeChargingDeplectionRate;
+				}
+				else
+				{
+					theNewEnergy += inTimePassed*kChargingDepletionRate;
+				}
+			}
+			
+			theNewEnergy = min(max(theNewEnergy, 0.0f), 1.0f);
+			
+			ioFuser = theNewEnergy*kNormalizationNetworkFactor;
+		}
+	}
+}
+
+void AvHMUUpdateJetpackEnergy(bool inIsJetpacking, float theTimePassed, float& ioJetpackEnergy)
+{
+	if(inIsJetpacking)
+	{
+		ioJetpackEnergy -= theTimePassed*kJetpackEnergyLossRate;
+	}
+	else
+	{
+		ioJetpackEnergy += theTimePassed*kJetpackEnergyGainRate;
+	}
+	
+	ioJetpackEnergy = min(1.0f, ioJetpackEnergy);
+	ioJetpackEnergy = max(0.0f, ioJetpackEnergy);
+}
diff --git a/main/source/mod/AvHMovementUtil.h b/main/source/mod/AvHMovementUtil.h
new file mode 100644
index 00000000..ea5199f6
--- /dev/null
+++ b/main/source/mod/AvHMovementUtil.h
@@ -0,0 +1,42 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHMovementUtil.h $
+// $Date: 2002/10/03 18:59:04 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHMovementUtil.h,v $
+// Revision 1.4  2002/10/03 18:59:04  Flayra
+// - Refactored energy
+//
+// Revision 1.3  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef MOVEMENT_UTIL_H
+#define MOVEMENT_UTIL_H
+
+#include "mod/AvHBasePlayerWeaponConstants.h"
+#include "mod/AvHSpecials.h"
+
+int AvHMUGetHull(bool inIsDucking, int inUserVar);
+int AvHMUGetOriginOffsetForUser3(AvHUser3 inUser3);
+int AvHMUGetOriginOffsetForMessageID(AvHMessageID inMessageID);
+bool AvHMUGetCanDuck(int inUser3);
+
+bool AvHMUDeductAlienEnergy(float& ioFuser, float inNormAmount);
+bool AvHMUGiveAlienEnergy(float& ioFuser, float inNormAmount);
+
+bool AvHMUGetEnergyCost(AvHWeaponID inWeaponID, float& outEnergyCost);
+float AvHMUGetWalkSpeedFactor(AvHUser3 inUser3);
+bool AvHMUHasEnoughAlienEnergy(float& ioFuser, float inNormAmount);
+void AvHMUUpdateAlienEnergy(float inTimePassed, int inUser3, int inUser4, float& ioFuser);
+void AvHMUUpdateJetpackEnergy(bool inIsJetpacking, float theTimePassed, float& ioJetpackEnergy);
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHNukeGun.cpp b/main/source/mod/AvHNukeGun.cpp
new file mode 100644
index 00000000..2c40fef7
--- /dev/null
+++ b/main/source/mod/AvHNukeGun.cpp
@@ -0,0 +1,91 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHNukeGun.cpp $
+// $Date: 2002/06/03 16:39:09 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHNukeGun.cpp,v $
+// Revision 1.9  2002/06/03 16:39:09  Flayra
+// - Added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.8  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHMarineWeapons.h"
+#include "mod/AvHPlayer.h"
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "cl_dll/vector_util.h"
+#include "mod/AvHMarineWeapons.h"
+
+LINK_ENTITY_TO_CLASS(kwNukeGun, AvHNukeGun);
+void V_PunchAxis( int axis, float punch );
+
+BOOL AvHNukeGun::Deploy()
+{
+	return DefaultDeploy(kNGVModel, kNGPModel, this->GetDeployAnimation(), kNGAnimExt);
+}
+
+void AvHNukeGun::Init()
+{
+	this->mRange = kNGRange;
+	this->mDamage = kNGDamage;
+	this->mROF = kNGROF;
+}						   
+
+int	AvHNukeGun::GetBarrelLength() const
+{
+	return kNGBarrelLength;
+}
+
+void AvHNukeGun::Precache()
+{
+	AvHMarineWeapon::Precache();
+
+	PRECACHE_MODEL(kNGVModel);
+	PRECACHE_MODEL(kNGWModel);
+	PRECACHE_MODEL(kNGPModel);
+	PRECACHE_MODEL(kNGEjectModel);
+
+	PRECACHE_SOUND(kNGFireSound1);
+	PRECACHE_SOUND(kNGFireSound2);
+	PRECACHE_SOUND(kNGFireSound3);
+	PRECACHE_SOUND(kNGFireSound4);
+	PRECACHE_SOUND(kNGReloadSound);
+
+	this->mEvent = PRECACHE_EVENT(1, kNGEventName);
+}
+
+void AvHNukeGun::Spawn() 
+{ 
+    AvHMarineWeapon::Spawn(); 
+
+	Precache();
+
+	this->m_iId = -1;// AVH_WEAPON_NUKE
+	m_iDefaultAmmo = kNGMaxAmmo;
+
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsNukeGun);
+
+	SET_MODEL(ENT(this->pev), kNGWModel);
+
+	FallInit();// get ready to fall down.
+} 
+
+
+
+
diff --git a/main/source/mod/AvHOrder.cpp b/main/source/mod/AvHOrder.cpp
new file mode 100644
index 00000000..33835079
--- /dev/null
+++ b/main/source/mod/AvHOrder.cpp
@@ -0,0 +1,1020 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHOrder.cpp $
+// $Date: 2002/10/16 01:02:16 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHOrder.cpp,v $
+// Revision 1.17  2002/10/16 01:02:16  Flayra
+// - Added commander hacking particle effect, but it doesn't seem to play or be visible
+//
+// Revision 1.16  2002/10/03 18:59:46  Flayra
+// - Reworked orders
+//
+// Revision 1.15  2002/09/25 20:49:04  Flayra
+// - Removed use order
+//
+// Revision 1.14  2002/08/02 21:53:18  Flayra
+// - Added type to the order, so help can be displayed on the client
+//
+// Revision 1.13  2002/07/24 18:45:42  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.12  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHOrder.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/cl_util.h"
+#include "cl_dll/util_vector.h"
+#include "common/const.h"
+#include "engine/progdefs.h"
+#include "cl_dll/ev_hldm.h"
+#include "cl_dll/parsemsg.h"
+#include "common/vector_util.h"
+#include "common/r_efx.h"
+#endif
+
+#ifdef AVH_SERVER
+#include "extdll.h"
+#include "util.h"
+#include "common/vector_util.h"
+//#include "mod/AvHSelection.h"
+#include "mod/AvHSelectionHelper.h"
+#include "dlls/cbase.h"
+#include "mod/AvHPlayer.h"
+#include "mod/AvHWeldable.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHParticleConstants.h"
+#include "mod/AvHMarineEquipment.h"
+#include "mod/AvHPlayerUpgrade.h"
+#endif
+
+#include "pm_defs.h"
+#include "pm_shared.h"
+#include "pm_movevars.h"
+#include "pm_debug.h"
+#include <stdio.h>  // NULL
+#include <math.h>   // sqrt
+#include <string.h> // strcpy
+#include <stdlib.h> // atoi
+#include <ctype.h>  // isspace
+#include "mod/AvHSpecials.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "mod/AvHMessage.h"
+#include "util/MathUtil.h"
+extern playermove_t *pmove;
+#include "mod/AvHSelectionHelper.h"
+#include "mod/AvHSharedUtil.h"
+
+// Allow assignment within conditional
+#pragma warning (disable: 4706)
+
+#ifdef AVH_CLIENT
+int	AvHOrder::ReceiveFromNetworkStream()
+{
+	int theBytesReceived = 0;
+
+	// Receive player
+
+	this->mPlayer = READ_BYTE();
+	theBytesReceived += 1;
+
+
+	// Get order type
+	AvHOrderType theOrder = (AvHOrderType)(READ_BYTE());
+	theBytesReceived += 1;
+
+	ASSERT(theOrder > ORDERTYPE_UNDEFINED);
+	ASSERT(theOrder < ORDERTYPE_MAX);
+	this->mOrderType = theOrder;
+	
+	// Get order target type
+	AvHOrderTargetType theOrderTargetType = (AvHOrderTargetType)READ_BYTE();
+	theBytesReceived += 1;
+	
+	ASSERT(theOrderTargetType > ORDERTARGETTYPE_UNDEFINED);
+	ASSERT(theOrderTargetType <= ORDERTARGETTYPE_TARGET);
+	this->mOrderTargetType = theOrderTargetType;
+
+	// Read target location, if appropriate
+	if(this->mOrderTargetType == ORDERTARGETTYPE_LOCATION)
+	{
+		this->mLocation.x = READ_COORD();
+		this->mLocation.y = READ_COORD();
+		this->mLocation.z = READ_COORD();
+		theBytesReceived += 6;
+	}
+	
+	// Read target index, if appropriate
+	if(this->mOrderTargetType == ORDERTARGETTYPE_TARGET)
+	{
+		this->mTargetIndex = READ_SHORT();
+		theBytesReceived += 2;
+	}
+
+	this->mOrderTargetUser3 = (AvHUser3)READ_BYTE();
+	theBytesReceived += 1;
+
+	this->mOrderStatus = READ_BYTE();
+	theBytesReceived++;
+	
+	return theBytesReceived;
+}
+#endif
+
+// Server			
+#ifdef AVH_SERVER
+
+bool AvHOrder::operator==(const AvHOrder& inOrder) const
+{
+	bool theAreEqual = false;
+
+	if(this->mPlayer == inOrder.mPlayer)
+	{
+		if(this->mOrderType == inOrder.mOrderType)
+		{
+			if(this->mOrderTargetType == inOrder.mOrderTargetType)
+			{
+				if(this->mOrderTargetUser3 == inOrder.mOrderTargetUser3)
+				{
+					if(this->mLocation == inOrder.mLocation)
+					{
+						if(this->mTargetIndex == inOrder.mTargetIndex)
+						{
+							if(this->mOrderStatus == inOrder.mOrderStatus)
+							{
+								#ifdef AVH_SERVER
+								{
+									if(this->mTimeOrderCompleted == inOrder.mTimeOrderCompleted)
+									{
+										if(this->mOrderID == inOrder.mOrderID)
+										{
+								#endif
+											theAreEqual = true;
+								#ifdef AVH_SERVER
+										}
+									}
+								}
+								#endif
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+
+	return theAreEqual;
+}
+
+void AvHOrder::operator=(const AvHOrder& inOrder)
+{
+	this->mPlayer = inOrder.mPlayer;
+	this->mOrderType = inOrder.mOrderType;
+	this->mOrderTargetType = inOrder.mOrderTargetType;
+	this->mOrderTargetUser3 = inOrder.mOrderTargetUser3;
+	this->mLocation = inOrder.mLocation;
+	this->mTargetIndex = inOrder.mTargetIndex;
+	this->mOrderStatus = inOrder.mOrderStatus;
+#ifdef AVH_SERVER
+	this->mTimeOrderCompleted = inOrder.mTimeOrderCompleted;
+	this->mOrderID = inOrder.mOrderID;
+#endif
+	return;
+}
+
+bool AvHOrder::operator!=(const AvHOrder& inOrder) const
+{
+	return !this->operator==(inOrder);
+}
+
+bool AvHOrder::Update()
+{
+	bool theOrderJustCompleted = false;
+
+	ASSERT(this->GetReceiver() != -1 );
+	//ALERT(at_console, "AvHOrder Update %d : %d \n", this->mOrderType, this->mOrderStatus);
+	if(this->GetOrderActive())
+	{
+		bool theOrderIsComplete = false;
+		AvHPlayer* thePlayer = NULL;
+		vec3_t theOrderLocation;
+		this->GetLocation(theOrderLocation);
+		
+		EntityInfo theReceiver = this->GetReceiver();
+		float theDistance;
+		const float kMoveToDistance = 90;
+		const float kPickupDistance = 20;
+		
+		CBaseEntity* theTargetEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(this->mTargetIndex));
+		AvHBaseBuildable* theTargetBuildable = dynamic_cast<AvHBaseBuildable*>(theTargetEntity);
+		AvHPlayer* theTargetPlayer = dynamic_cast<AvHPlayer*>(theTargetEntity);
+		AvHWeldable* theWeldable = dynamic_cast<AvHWeldable*>(theTargetEntity);
+		switch(this->mOrderType)
+		{
+		case ORDERTYPE_UNDEFINED:
+		default:
+			break;
+		
+		case ORDERTYPEL_MOVE:
+			// set true if all receivers are within a certain distance of move to order
+			theTargetPlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theReceiver)));
+			if(theTargetPlayer)
+			{
+				theOrderIsComplete = true;
+				theDistance = VectorDistance(theTargetPlayer->pev->origin, theOrderLocation);
+				if(!theTargetPlayer->GetIsRelevant() || (theDistance > kMoveToDistance))
+				{
+					theOrderIsComplete = false;
+				}
+			}
+
+			if(theOrderIsComplete)
+			{
+				this->mOrderStatus = kOrderStatusComplete;
+			}
+			break;
+		
+		case ORDERTYPET_GET:
+			// set true if all receivers are within a certain distance of item
+			theTargetPlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theReceiver)));
+			if(theTargetPlayer)
+			{
+				// If one of the players in the group is near enough to pick it up
+				theDistance = VectorDistance(theTargetPlayer->pev->origin, theOrderLocation);
+				if(theTargetPlayer->GetIsRelevant() && (theDistance < kPickupDistance))
+				{
+					theOrderIsComplete = true;
+				}
+			}
+
+		
+			// If the item is gone, the order is done
+			if(!theTargetEntity)
+			{
+				this->mOrderStatus = kOrderStatusCancelled;
+			}
+			break;
+		
+		case ORDERTYPET_ATTACK:
+			// set true if target is dead or not relevant
+			if(!theTargetEntity || (theTargetPlayer && !theTargetPlayer->GetIsRelevant()))
+			{
+				this->mOrderStatus = kOrderStatusCancelled;
+				theOrderIsComplete = true;
+			}
+			else if(theTargetEntity && !theTargetEntity->IsAlive())
+			{
+				this->mOrderStatus = kOrderStatusComplete;
+				theOrderIsComplete = true;
+			}
+			break;
+		
+		case ORDERTYPET_BUILD:
+			if(!theTargetEntity || !theTargetEntity->IsAlive())
+			{
+				this->mOrderStatus = kOrderStatusCancelled;
+				theOrderIsComplete = true;
+			}
+			else if(theTargetBuildable && theTargetBuildable->GetIsBuilt())
+			{
+				this->mOrderStatus = kOrderStatusComplete;
+				theOrderIsComplete = true;
+			}
+			else
+			{
+				if(theTargetEntity)
+				{
+					bool theIsBuilding;
+					bool theIsResearching;
+					float thePercentage;
+		
+					AvHSHUGetBuildResearchState(theTargetEntity->pev->iuser3, theTargetEntity->pev->iuser4, theTargetEntity->pev->fuser1, theIsBuilding, theIsResearching, thePercentage);
+					if(!theIsBuilding && (thePercentage == 1.0f))
+					{
+						this->mOrderStatus = kOrderStatusComplete;
+						theOrderIsComplete = true;
+					}
+				}
+			}
+			break;
+		
+		case ORDERTYPET_GUARD:
+			theOrderIsComplete = false;
+		
+			if(!theTargetEntity ||!theTargetEntity->IsAlive())
+			{
+				this->mOrderStatus = kOrderStatusCancelled;
+				theOrderIsComplete = true;
+			}
+			break;
+		
+		case ORDERTYPET_WELD:
+			//ALERT(at_console, "Checking weldables ");
+			// set true when target is fully welded
+			if(!theTargetEntity ||!theTargetEntity->IsAlive())
+			{
+				this->mOrderStatus = kOrderStatusCancelled;
+				theOrderIsComplete = true;
+			}
+			if(theWeldable && theWeldable->GetIsWelded())
+			{
+				this->mOrderStatus = kOrderStatusComplete;
+				theOrderIsComplete = true;
+			} 
+//			else if(!theWeldable || !theWeldable->GetCanBeWelded())
+//			{
+//				this->mOrderStatus = kOrderStatusCancelled;
+//				theOrderIsComplete = true;
+//			}
+			else if ( !theWeldable ) 
+			{
+				if ( theTargetEntity->pev->iuser3 == AVH_USER3_MARINE_PLAYER )
+				{
+					// Players are welded if they have full armour
+					if ( theTargetEntity->pev->armorvalue == AvHPlayerUpgrade::GetMaxArmorLevel(theTargetEntity->pev->iuser4, (AvHUser3)theTargetEntity->pev->iuser3)) 
+					{
+						this->mOrderStatus = kOrderStatusComplete;
+						theOrderIsComplete = true;
+					}
+				}
+				else 
+				{
+					// Structures are welded if they have full health
+					if ( theTargetEntity->pev->health == theTargetEntity->pev->max_health ) 
+					{
+						this->mOrderStatus = kOrderStatusComplete;
+						theOrderIsComplete = true;
+					}
+				}
+			}
+			break;
+		}
+
+		if(theOrderIsComplete)
+		{
+			this->SetOrderCompleted();
+			theOrderJustCompleted = true;
+		}
+	}
+
+	return theOrderJustCompleted;
+}
+
+int	AvHOrder::SendToNetworkStream()
+{
+	int theBytesSent = 0;
+
+	WRITE_BYTE(this->mPlayer);
+	
+	// Send order type
+	WRITE_BYTE(this->mOrderType);
+	theBytesSent += 1;
+	
+	// Send order target type
+	WRITE_BYTE(this->mOrderTargetType);
+	theBytesSent += 1;
+	
+	// Send location, if appropriate
+	if(this->mOrderTargetType == ORDERTARGETTYPE_LOCATION)
+	{
+		WRITE_COORD(this->mLocation.x);
+		WRITE_COORD(this->mLocation.y);
+		WRITE_COORD(this->mLocation.z);
+		
+		theBytesSent += 6;
+	}
+
+	// Send target index, if appropriate
+	if(this->mOrderTargetType == ORDERTARGETTYPE_TARGET)
+	{
+		WRITE_SHORT(this->mTargetIndex);
+		theBytesSent += 2;
+	}
+
+	WRITE_BYTE(this->mOrderTargetUser3);
+	theBytesSent += 1;
+	
+	// Write completed or not
+	WRITE_BYTE(this->mOrderStatus);
+
+	return theBytesSent;
+}
+
+bool AvHOrder::SetReceiver(const EntityInfo& inPlayer)
+{
+	this->mPlayer = inPlayer;
+	return true;
+}
+#endif
+
+// Shared			
+AvHOrder::AvHOrder()
+{
+	this->mPlayer = -1;
+	this->mOrderType = ORDERTYPEL_DEFAULT;
+	this->mOrderTargetType = ORDERTARGETTYPE_GLOBAL;
+	this->mOrderTargetUser3 = AVH_USER3_NONE;
+	this->mTargetIndex = -1;
+	this->mOrderStatus = kOrderStatusActive;
+	
+	#ifdef AVH_SERVER
+	this->mTimeOrderCompleted = -1;
+	this->mOrderID = -1;
+	#endif
+}
+
+void AvHOrder::ClearReceiver()
+{
+	this->mPlayer = -1;
+}
+
+int	AvHOrder::GetTargetIndex() const
+{
+	return this->mTargetIndex;
+}
+
+
+AvHOrderType AvHOrder::GetOrderType() const
+{
+	return this->mOrderType;
+}
+
+AvHOrderTargetType AvHOrder::GetOrderTargetType() const
+{
+	return this->mOrderTargetType;
+}
+
+void AvHOrder::SetOrderTargetType(AvHOrderTargetType inTargetType)
+{
+	this->mOrderTargetType=inTargetType;
+}
+
+
+AvHUser3 AvHOrder::GetTargetUser3Type() const
+{
+	return this->mOrderTargetUser3;
+}
+
+bool AvHOrder::GetHasReceiver(int inIndex) const
+{
+	return ( inIndex == this->mPlayer );
+}
+
+EntityInfo AvHOrder::GetReceiver() const
+{
+	return this->mPlayer;
+}
+
+void AvHOrder::GetLocation(vec3_t& outLocation) const
+{
+	if(this->mTargetIndex != -1)
+	{
+		#ifdef AVH_SERVER
+		CBaseEntity* theTargetEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(this->mTargetIndex));
+		if(theTargetEntity)
+		{
+			VectorCopy(theTargetEntity->pev->origin, outLocation);
+		}
+		#endif
+
+		#ifdef AVH_CLIENT
+		cl_entity_s* theTargetEntity = gEngfuncs.GetEntityByIndex(this->mTargetIndex);
+		if(theTargetEntity)
+		{
+			VectorCopy(theTargetEntity->curstate.origin, outLocation);
+		}
+		#endif
+	}
+	else
+	{
+		VectorCopy(this->mLocation, outLocation);
+	}
+}
+
+void AvHOrder::GetOrderColor(float& outR, float& outG, float& outB, float& outA) const
+{
+	switch(this->mOrderType)
+	{
+	case ORDERTYPE_UNDEFINED:
+	default:
+		outR = outG = outB = outA = 1.0f;
+		break;
+	case ORDERTYPEL_MOVE:
+		outR = 0.0f; outG = 1.0f; outB = 0.0f; outA = .5f;
+		break;
+	case ORDERTYPET_ATTACK:
+		outR = 1.0f; outG = 0.0f; outB = 0.0f; outA = .5f;
+		break;
+	case ORDERTYPET_GUARD:
+		outR = 1.0f; outG = 1.0f; outB = 0.0f; outA = .5f;
+		break;
+	case ORDERTYPET_WELD:
+		outR = 0.0f; outG = 0.0f; outB = 1.0f; outA = .5f;
+		break;
+	}
+}
+
+
+bool AvHOrder::RemovePlayerFromReceivers(int inIndex)
+{
+	bool theSuccess = false;
+	
+	if ( inIndex == this->mPlayer ) 
+	{
+		this->mPlayer = -1;
+		theSuccess=true;
+	}
+
+	return theSuccess;
+}
+
+void AvHOrder::SetTargetIndex(int inTargetIndex)
+{
+	this->mTargetIndex = inTargetIndex;
+}
+
+void AvHOrder::SetOrderType(AvHOrderType inType)
+{
+	this->mOrderType = inType;
+
+	// TODO: Set target type from order type
+	switch(this->mOrderType)
+	{
+	case ORDERTYPEL_MOVE:
+	case ORDERTYPET_WELD:
+	default:
+		this->mOrderTargetType = ORDERTARGETTYPE_LOCATION;
+		break;
+	case ORDERTYPET_ATTACK:
+	case ORDERTYPET_GUARD:
+		this->mOrderTargetType = ORDERTARGETTYPE_TARGET;
+		break;
+	}
+}
+
+void AvHOrder::SetUser3TargetType(AvHUser3 inUser3)
+{
+	this->mOrderTargetUser3 = inUser3;
+}
+
+
+void AvHOrder::SetLocation(const vec3_t& inPosition)
+{
+	VectorCopy(inPosition, this->mLocation);
+}
+
+bool AvHOrder::GetOrderActive() const
+{
+	return (this->mOrderStatus == kOrderStatusActive);
+}
+
+bool AvHOrder::GetOrderCancelled() const
+{
+	return (this->mOrderStatus == kOrderStatusCancelled);
+}
+
+bool AvHOrder::GetOrderCompleted() const
+{
+	return (this->mOrderStatus == kOrderStatusComplete);
+}
+
+void AvHOrder::SetOrderCompleted()
+{
+#ifdef AVH_SERVER
+	this->mTimeOrderCompleted = gpGlobals->time;
+#endif
+}
+
+#ifdef AVH_SERVER
+int AvHOrder::GetOrderID() const
+{
+	return this->mOrderID;
+}
+
+
+void AvHOrder::SetOrderID()
+{
+	static int sOrderID=0;
+	this->mOrderID = ++sOrderID;
+}
+
+float AvHOrder::GetTimeOrderCompleted() const
+{
+	return this->mTimeOrderCompleted;
+}
+
+void AvHOrder::SetTimeOrderCompleted(float inTime)
+{
+	this->mTimeOrderCompleted = inTime;
+}
+#endif
+
+void AvHChangeOrder(OrderListType& inList, const AvHOrder& inOrder)
+{
+	EntityInfo theReceiver = inOrder.GetReceiver();
+	
+	// Run through list
+	ASSERT( theReceiver != -1 );
+	for(OrderListType::iterator theOrderListIter = inList.begin(); theOrderListIter != inList.end(); /* no increment */)
+	{
+		if ( theOrderListIter->GetHasReceiver(theReceiver) )
+		{
+			theOrderListIter = inList.erase(theOrderListIter);
+		}
+		else
+		{
+			theOrderListIter++;
+		}
+	}
+
+	// If the order has any receivers, add it (but we could be deleting it)
+	if(!inOrder.GetOrderCompleted())
+	{
+		// Add the order on to the end of the list
+		inList.push_back(inOrder);
+	}
+}
+
+//void AvHRemovePlayerFromOrders(OrderListType& inList, int inPlayerIndex)
+//{
+//	// Run through list
+//	for(OrderListType::iterator theOrderListIter = inList.begin(); theOrderListIter != inList.end(); /* no increment */)
+//	{
+//		theOrderListIter->RemovePlayerFromReceivers(inPlayerIndex);
+//		
+//		// If the order has no receivers, remove the order
+//		int theNumReceivers = theOrderListIter->GetReceivers().size();
+//		if(theNumReceivers == 0)
+//		{
+//			theOrderListIter = inList.erase(theOrderListIter);
+//		}
+//		else
+//		{
+//			theOrderListIter++;
+//		}
+//	}
+//}
+
+
+//bool AvHOrderTraceNonPlayers(AvHTeamNumber inTeam, const vec3_t& inOrigin, const vec3_t& inNormRay, AvHOrderType& outOrderType, int& outTargetIndex, vec3_t& outTargetPoint)
+//{
+//	vec3_t			theTraceStart;
+//	vec3_t			theTraceEnd;
+//	vec3_t			theForward;
+//	pmtrace_t*		theTrace = NULL;
+//	physent_t*		theTarget = NULL;
+//	float			theHeight = 175;
+//	qboolean		theDone = false;
+//	int				theEntityHit = -1;
+//	const int		kHitOffsetAmount = 10;
+//	bool			theSuccess = false;
+//	
+//	// Trace to get target enemy, target friendly and target location
+//	// Offset starting position a little so we don't select ourselves
+//	VectorCopy(inOrigin, theTraceStart);
+//	VectorMA(inOrigin, kSelectionEndRange, inNormRay, theTraceEnd);
+//	
+//	// While we haven't hit the floor
+//	do
+//	{
+//		//struct pmtrace_s *(*PM_TraceLine)( float *start, float *end, int flags, int usehull, int ignore_pe );
+//		theTrace = pmove->PM_TraceLine(theTraceStart, theTraceEnd, PM_TRACELINE_ANYVISIBLE, 2,  -1);
+//		
+//		// Find out if there are any view height entities at our x,y
+//		theEntityHit = theTrace->ent;
+//		
+//		theTarget = AvHSUGetEntity(theEntityHit);
+//		
+//		if(theTarget)
+//		{
+//			// Hit the ground?  Move to, we're done
+//			if(theTarget->iuser3 == AVH_USER3_WAYPOINT)
+//			{
+//				// Use it's center for the height
+//				VectorCopy(theTarget->origin, outTargetPoint);
+//				
+//				// We're done
+//				outOrderType = ORDERTYPEL_MOVE;
+//				theSuccess = true;
+//				theDone = true;
+//			}
+//		}
+//		
+//		if(!theTarget)
+//		{
+//			theDone = true;
+//		}
+//		
+//		// Do the trace again but starting at this point
+//		//VectorCopy(, theTraceStart);
+//		VectorMA(theTrace->endpos, kHitOffsetAmount, inNormRay, theTraceStart);
+//	}
+//	// While the end point is not a view entity and not below
+//	while((theTrace->fraction >= 0) && (theTrace->fraction <= 1.0f) && !theDone);
+//	
+//	return theSuccess;
+//}
+
+//bool AvHOrderTracePlayers(AvHTeamNumber inTeam, const vec3_t& inOrigin, const vec3_t& inNormRay, AvHOrderType& outOrderType, int& outTargetIndex)
+//{
+//	int theEntIndex = 0;
+//	bool theSuccess = false;
+//
+//	if(AvHSHUGetEntityAtRay(inOrigin, inNormRay, theEntIndex))
+//	{
+//		// TODO: Fetch team for player hit
+//		//AvHTeamNumber theTeamOfPlayerHit = TEAM_IND;
+//
+//		//#ifdef AVH_SERVER
+//		//CBaseEntity* theEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(*theIterator));
+//		//theTeamOfPlayerHit = (theEntity ? (AvHTeamNumber)(theEntity->pev->team) : TEAM_IND);
+//		//#endif
+//		physent_t* theEntity = AvHSUGetEntity(theEntIndex);
+//		if(theEntity)
+//		{
+//			AvHTeamNumber theTeamOfPlayerHit = AvHTeamNumber(theEntity->team);
+//			
+//			// Did we hit an enemy?  If so, issue an attack order on him, then we're done, it's highest priority
+////			if((theTeamOfPlayerHit != inTeam) && (theTeamOfPlayerHit != TEAM_IND))
+////			{
+//				outOrderType = ORDERTYPET_ATTACK;
+//				outTargetIndex = theEntIndex;
+//				theSuccess = true;
+////			}
+////			// Did we hit an entity on our team?  Repair/guard it, we're done
+////			else if((theTeamOfPlayerHit == inTeam) && (theTeamOfPlayerHit != TEAM_IND))
+////			{
+////				outOrderType = ORDERTYPET_GUARD;
+////				outTargetIndex = theEntIndex;
+////				theSuccess = true;
+////			}
+//		}
+//	}
+//	
+//	return theSuccess;
+//}
+
+// Used for context sensitive mouse and for processing right-click
+// Must be shared, uses prediction code
+// Fill in target index or target point, depending on type of order decided upon
+AvHOrderType AvHGetDefaultOrderType(AvHTeamNumber inTeam, const vec3_t& inOrigin, const vec3_t& inNormRay, int& outTargetIndex, vec3_t& outTargetPoint, AvHUser3& outUser3, AvHOrderTargetType& outTargetType)
+{
+	vec3_t			theTraceStart;
+	vec3_t			theTraceEnd;
+	AvHOrderType	theOrderType = ORDERTYPE_UNDEFINED;
+
+//	// Look for a player order
+//	if(!AvHOrderTracePlayers(inTeam, inOrigin, inNormRay, theOrderType, outTargetIndex))
+//	{
+//		// If couldn't find one, create a non-player order if possible
+//		//AvHOrderTraceNonPlayers(inTeam, inOrigin, inNormRay, theOrderType, outTargetIndex, outTargetPoint);
+//	}
+
+	
+	// Offset a little so we don't hit the commander
+	VectorMA(inOrigin, kSelectionStartRange, inNormRay, theTraceStart);
+	VectorMA(inOrigin, kSelectionEndRange, inNormRay, theTraceEnd);
+	int theFoundIndex = -1;
+	vec3_t theFoundLocation;
+	AvHTeamNumber theTeamOfThingHit;
+	bool thePlayerHit = false;
+	int theUserThree = 0;
+	int theUserFour = 0;
+	
+	if(AvHSHUTraceTangible(theTraceStart, theTraceEnd, theFoundIndex, theFoundLocation, theTeamOfThingHit, thePlayerHit, theUserThree, theUserFour))
+	{
+		float theHealthPercentage=100.0f;
+		float theArmorPercentage=100.0f;
+		bool theSighted=false;
+#ifdef AVH_SERVER
+		CBaseEntity *theEntity=AvHSUGetEntityFromIndex(theFoundIndex);
+		if ( theEntity ) 
+		{
+			theHealthPercentage=theEntity->pev->health/theEntity->pev->max_health;
+		}
+		else 
+		{
+			ALERT(at_console, "Not a buildable\n");
+		}
+		
+        theArmorPercentage = theEntity->pev->armorvalue/AvHPlayerUpgrade::GetMaxArmorLevel(theEntity->pev->iuser4, (AvHUser3)theEntity->pev->iuser3);
+		theSighted=GetHasUpgrade(theEntity->pev->iuser4, MASK_VIS_SIGHTED);
+#endif
+		if(theUserThree == AVH_USER3_MARINEITEM)
+		{
+			int a = 0;
+		}
+
+		// Did we hit an enemy?  If so, issue an attack order on him, then we're done, it's highest priority
+		if(thePlayerHit ) 
+		{
+//			if ( theTeamOfThingHit != inTeam && theSighted )
+//			{
+//				theOrderType = ORDERTYPET_ATTACK;
+//				outTargetIndex = theFoundIndex;
+//				outUser3 = (AvHUser3)theUserThree;
+//			}
+			// Did we hit a player on our team?  If so check for welding, if not guard
+			if((theTeamOfThingHit == inTeam ) && (theTeamOfThingHit != TEAM_IND) )
+			{
+				theOrderType = ORDERTYPET_GUARD;
+				if (  theArmorPercentage < 0.90f ) {
+					theOrderType = ORDERTYPET_WELD;
+					outTargetType = ORDERTARGETTYPE_TARGET;
+				}
+				outTargetIndex = theFoundIndex;
+				outUser3 = (AvHUser3)theUserThree;
+			}
+		}
+		// Something to pick up?
+		if(!thePlayerHit ) 
+		{
+//			if ( ( theTeamOfThingHit ) != inTeam && (theTeamOfThingHit != TEAM_IND) && theSighted )
+//			{
+//				// Use it's center for the height
+//				VectorCopy(theFoundLocation, outTargetPoint);
+//				theOrderType = ORDERTYPET_ATTACK;
+//				outTargetIndex = theFoundIndex;
+//				outUser3 = (AvHUser3)theUserThree;
+//				outTargetType = ORDERTARGETTYPE_LOCATION;
+//			}
+//			else 
+			if ( theUserThree == AVH_USER3_MARINEITEM) 
+			{
+				// Use it's center for the height
+				VectorCopy(theFoundLocation, outTargetPoint);
+				outTargetIndex = theFoundIndex;
+				outUser3 = (AvHUser3)theUserThree;
+				
+				// We're done
+				theOrderType = ORDERTYPET_GET;
+			}
+			// Buildable?
+			else if(GetHasUpgrade(theUserFour, MASK_BUILDABLE) && (theTeamOfThingHit == inTeam) && (theTeamOfThingHit != TEAM_IND))
+			{
+				// Use it's center for the height
+				VectorCopy(theFoundLocation, outTargetPoint);
+				outTargetIndex = theFoundIndex;
+				outUser3 = (AvHUser3)theUserThree;
+				
+				// We're done
+				theOrderType = ORDERTYPET_BUILD;
+			}
+			// Weldable?
+			else if(theUserThree == AVH_USER3_WELD )
+			{
+				// Use it's center for the height
+				VectorCopy(theFoundLocation, outTargetPoint);
+				outTargetIndex = theFoundIndex;
+				
+				// We're done
+				theOrderType = ORDERTYPET_WELD;
+			}
+			// Hit the ground?  Move to, we're done
+			else if(theUserThree == AVH_USER3_WAYPOINT || (( theTeamOfThingHit != inTeam) && !theSighted ))
+			{
+				// Use it's center for the height
+				VectorCopy(theFoundLocation, outTargetPoint);
+			
+				// We're done
+				theOrderType = ORDERTYPEL_MOVE;
+			}
+			// Did we hit an entity on our team?  Repair/guard it, we're done
+			else if((theTeamOfThingHit == inTeam) && (theTeamOfThingHit != TEAM_IND))
+			{
+				theOrderType = ORDERTYPET_GUARD;
+				if (  theHealthPercentage < 0.90f ) {
+					theOrderType = ORDERTYPET_WELD;
+					VectorCopy(theFoundLocation, outTargetPoint);
+					outTargetType = ORDERTARGETTYPE_LOCATION;
+				}
+				outTargetIndex = theFoundIndex;
+				outUser3 = (AvHUser3)theUserThree;
+			}
+		}
+//		else if(!thePlayerHit && (theUserThree == AVH_USER3_USEABLE))
+//		{
+//			// Use it's center for the height
+//			VectorCopy(theFoundLocation, outTargetPoint);
+//			outTargetIndex = theFoundIndex;
+//			
+//			// We're done
+//			theOrderType = ORDERTYPEL_USE;
+//		}
+	}
+	
+	return theOrderType;
+}
+
+#ifdef AVH_SERVER
+bool AvHCreateSpecificOrder(AvHTeamNumber inTeam, const vec3_t& inOrigin, AvHOrderType inOrder, const vec3_t& inNormRay, AvHOrder& outOrder)
+{
+	bool theSuccess = false;
+	int theTargetIndex = -1;
+	vec3_t theTargetLocation;
+	AvHOrderType theOrderType = inOrder;
+	AvHUser3 theUser3 = AVH_USER3_NONE;
+
+	vec3_t theStartPoint;
+	VectorMA(inOrigin, kSelectionStartRange, inNormRay, theStartPoint);
+	
+	vec3_t theEndPoint;
+	VectorMA(inOrigin, kSelectionEndRange, inNormRay, theEndPoint);
+
+	vec3_t theValidOrigin;
+	AvHSHUServerGetFirstNonSolidPoint(theStartPoint, theEndPoint, theValidOrigin);
+
+	AvHOrderTargetType theTargetType=ORDERTARGETTYPE_UNDEFINED;
+	// Create default order if passed in
+	if(inOrder == ORDERTYPEL_DEFAULT)
+	{
+		theOrderType = AvHGetDefaultOrderType(inTeam, theValidOrigin, inNormRay, theTargetIndex, theTargetLocation, theUser3, theTargetType);
+	}
+
+	if(theOrderType != ORDERTYPE_UNDEFINED)
+	{
+		// Init order with values it found
+		outOrder.SetOrderType(theOrderType);
+		outOrder.SetLocation(theTargetLocation);
+		outOrder.SetTargetIndex(theTargetIndex);
+		outOrder.SetUser3TargetType(theUser3);
+		if ( theTargetType != ORDERTARGETTYPE_UNDEFINED ) 
+			outOrder.SetOrderTargetType(theTargetType);
+		theSuccess = true;
+	}
+
+	outOrder.SetOrderID();
+	
+	return theSuccess;
+}
+
+bool AvHToggleUseable(CBaseEntity* inUser, const vec3_t& inOrigin, const vec3_t& inNormRay)
+{
+	bool	theSuccess = false;
+	vec3_t	theTraceStart;
+	vec3_t	theTraceEnd;
+	
+	// Offset a little so we don't hit the commander
+	VectorMA(inOrigin, 100, inNormRay, theTraceStart);
+	
+	VectorMA(inOrigin, kSelectionEndRange, inNormRay, theTraceEnd);
+	int theFoundIndex = -1;
+	vec3_t theFoundLocation;
+	AvHTeamNumber theTeamOfThingHit;
+	bool thePlayerHit = false;
+	int theUserThree = 0;
+	int theUserFour = 0;
+	
+	if(AvHSHUTraceTangible(theTraceStart, theTraceEnd, theFoundIndex, theFoundLocation, theTeamOfThingHit, thePlayerHit, theUserThree, theUserFour))
+	{
+		if(!thePlayerHit && (theUserThree == AVH_USER3_USEABLE))
+		{
+			// Find entity we clicked on, use it
+			//CBaseEntity* theEntity = CBaseEntity::Instance(ENT(theFoundIndex));
+			CBaseEntity* theEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theFoundIndex));
+			if(theEntity)
+			{
+				// For each entity with this target name (including this one), use it
+				if(theEntity->pev->targetname)
+				{
+					CBaseEntity* theTarget = NULL;
+					while(theTarget = UTIL_FindEntityByTargetname(theTarget, STRING(theEntity->pev->targetname)))
+					{
+						int	theObjectCaps = theTarget->ObjectCaps();
+						if((theObjectCaps & FCAP_IMPULSE_USE) || (FCAP_ONOFF_USE))
+						{
+							theTarget->Use(inUser, inUser, USE_TOGGLE, 0);
+						}
+					}
+				}
+				else if(FClassnameIs(theEntity->edict(), "func_button") && theEntity->pev->target) ////voogru: Its probably a button!, classname check to prevent any possible exploits
+				{
+					CBaseEntity* theTarget = NULL;
+					while(theTarget = UTIL_FindEntityByTargetname(theTarget, STRING(theEntity->pev->target)))
+					{
+						int	theObjectCaps = theTarget->ObjectCaps();
+						if((theObjectCaps & FCAP_IMPULSE_USE) || (FCAP_ONOFF_USE))
+						{
+							theTarget->Use(inUser, inUser, USE_TOGGLE, 0);
+						}
+					}
+				}
+				theSuccess = true;
+			}
+		}
+	}
+	return theSuccess;	
+}
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHOrder.h b/main/source/mod/AvHOrder.h
new file mode 100644
index 00000000..4b0fc321
--- /dev/null
+++ b/main/source/mod/AvHOrder.h
@@ -0,0 +1,103 @@
+#ifndef AVH_ORDER_H
+#define AVH_ORDER_H
+
+#include "util/nowarnings.h"
+#include "types.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHSpecials.h"
+
+#ifdef AVH_CLIENT
+#include "common/triangleapi.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#ifdef AVH_SERVER
+#include "extdll.h"
+class CBaseEntity;
+#endif
+
+const int kOrderStatusActive = 0;
+const int kOrderStatusComplete = 1;
+const int kOrderStatusCancelled = 2;
+
+class AvHOrder
+{
+public:
+	// Client
+						#ifdef AVH_CLIENT
+	int					ReceiveFromNetworkStream();
+						#endif
+						
+	// Server			
+						#ifdef AVH_SERVER
+	int					SendToNetworkStream();
+	bool				SetReceiver(const EntityInfo& entity);
+	bool				Update();
+	bool				operator==(const AvHOrder& inOrder) const;
+	bool				operator!=(const AvHOrder& inOrder) const;
+	void				operator=(const AvHOrder& inOrder);
+						#endif
+						
+	// Shared			
+						AvHOrder();
+	void				ClearReceiver();
+	bool				GetHasReceiver(int inPlayerIndex) const;
+	EntityInfo			GetReceiver() const;
+	int					GetTargetIndex() const;
+	AvHOrderType		GetOrderType() const;
+	AvHOrderTargetType	GetOrderTargetType() const;
+	AvHUser3			GetTargetUser3Type() const;
+	void				GetLocation(vec3_t& outPosition) const;
+	void				GetOrderColor(float& outR, float& outG, float& outB, float& outA) const;
+
+	bool				RemovePlayerFromReceivers(int inIndex);
+
+	bool				GetOrderActive() const;
+	bool				GetOrderCancelled() const;
+	bool				GetOrderCompleted() const;
+	void				SetOrderCompleted();
+
+	void				SetTargetIndex(int inTargetIndex);
+	void				SetOrderType(AvHOrderType inType);
+	void				SetOrderTargetType(AvHOrderTargetType inTargetType);
+	void				SetUser3TargetType(AvHUser3 inUser3);
+	void				SetLocation(const vec3_t& inPosition);
+
+	#ifdef AVH_SERVER
+	int					GetOrderID() const;
+	void				SetOrderID();
+
+	float				GetTimeOrderCompleted() const;
+	void				SetTimeOrderCompleted(float inTime);
+	#endif
+				
+private:
+	EntityInfo			mPlayer;
+	AvHOrderType		mOrderType;
+	AvHOrderTargetType	mOrderTargetType;
+	AvHUser3			mOrderTargetUser3;
+	vec3_t				mLocation;
+	int					mTargetIndex;
+	int					mOrderStatus;
+
+	#ifdef AVH_SERVER
+	float				mTimeOrderCompleted;
+	int					mOrderID;
+	#endif
+};
+
+typedef vector<AvHOrder> OrderListType;
+
+void AvHChangeOrder(OrderListType& inList, const AvHOrder& inOrder);
+//void AvHRemovePlayerFromOrders(OrderListType& inList, int inPlayerIndex);
+
+// Must be shared
+AvHOrderType AvHGetDefaultOrderType(AvHTeamNumber inTeam, const vec3_t& inOrigin, const vec3_t& inNormRay, int& outTargetIndex, vec3_t& outTargetPoint, AvHUser3& outUser3, AvHOrderTargetType& outTargetType);
+
+#ifdef AVH_SERVER
+bool AvHCreateSpecificOrder(AvHTeamNumber inTeam, const vec3_t& inOrigin, AvHOrderType inOrder, const vec3_t& inNormRay, AvHOrder& outOrder);
+bool AvHToggleUseable(CBaseEntity* inUser, const vec3_t& inNormRay, const vec3_t& inPosition);
+#endif
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHOverviewControl.cpp b/main/source/mod/AvHOverviewControl.cpp
new file mode 100644
index 00000000..a7cee4f6
--- /dev/null
+++ b/main/source/mod/AvHOverviewControl.cpp
@@ -0,0 +1,200 @@
+#include "mod/AvHOverviewControl.h"
+#include "mod/AvHOverviewMap.h"
+#include "mod/AvHSprites.h"
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+
+class AvHOverviewInputSignal : public InputSignal
+{
+
+public:
+
+    AvHOverviewInputSignal(AvHOverviewControl* inControl)
+    {
+        mControl = inControl;
+    }
+    
+	virtual void cursorMoved(int x,int y,Panel* panel)
+    {
+        mMouseX = x;
+        mMouseY = y;
+    }
+
+    virtual void mousePressed(MouseCode code,Panel* panel)
+    {
+        mControl->HandleMouseClick(mMouseX, mMouseY);
+    }
+	
+	virtual void mouseDoublePressed(MouseCode code,Panel* panel)
+    {
+        mControl->HandleMouseClick(mMouseX, mMouseY);
+    }
+    
+    virtual void cursorEntered(Panel* panel)                     {}
+    virtual void cursorExited(Panel* panel)                      {}
+	virtual void mouseReleased(MouseCode code,Panel* panel)      {}
+	virtual void mouseWheeled(int delta,Panel* panel)            {}
+	virtual void keyPressed(KeyCode code,Panel* panel)           {}
+	virtual void keyTyped(KeyCode code,Panel* panel)             {}
+	virtual void keyReleased(KeyCode code,Panel* panel)          {}
+	virtual void keyFocusTicked(Panel* panel)                    {}
+
+private:
+
+    AvHOverviewControl* mControl;
+
+    int mMouseX;
+    int mMouseY;
+
+};
+
+AvHOverviewControl::AvHOverviewControl()
+{
+    m_hsprWhite = Safe_SPR_Load(kWhiteSprite);
+    addInputSignal(new AvHOverviewInputSignal(this));
+}
+
+void AvHOverviewControl::paint()
+{
+
+    AvHOverviewMap& theOverviewMap = gHUD.GetOverviewMap();
+
+    AvHOverviewMap::DrawInfo theDrawInfo;
+    GetDrawInfo(theDrawInfo);
+
+    if (m_hsprWhite != NULL)
+    {
+
+        float bgColor[] = { 0.1, 0.1, 0.1, 1 };
+        float borderColor[] = { 1, 1, 1, 1 };
+
+        gEngfuncs.pTriAPI->RenderMode(kRenderNormal);
+        gEngfuncs.pTriAPI->CullFace(TRI_NONE);
+
+        gEngfuncs.pTriAPI->SpriteTexture((struct model_s*)(gEngfuncs.GetSpritePointer(m_hsprWhite)), 0);
+
+        float gammaScale = 1.0f / gHUD.GetGammaSlope();
+        
+        // Draw the background.
+        
+	    gEngfuncs.pTriAPI->Color4f(gammaScale * bgColor[0], gammaScale * bgColor[1], gammaScale * bgColor[2], bgColor[3]);
+
+        gEngfuncs.pTriAPI->Begin(TRI_QUADS);
+    
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX, theDrawInfo.mY, 1);
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX, theDrawInfo.mY + theDrawInfo.mHeight, 1);
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX + theDrawInfo.mWidth, theDrawInfo.mY + theDrawInfo.mHeight, 1);
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX + theDrawInfo.mWidth, theDrawInfo.mY, 1);
+    
+        gEngfuncs.pTriAPI->End();
+   
+        // Draw the overview map.
+
+        theOverviewMap.Draw(theDrawInfo);
+
+        // Draw the border on the overview map and the inset view.
+
+        gEngfuncs.pTriAPI->RenderMode(kRenderNormal);
+        gEngfuncs.pTriAPI->CullFace(TRI_NONE);
+
+        gEngfuncs.pTriAPI->SpriteTexture((struct model_s*)(gEngfuncs.GetSpritePointer(m_hsprWhite)), 0);
+        gEngfuncs.pTriAPI->Color4f(gammaScale * borderColor[0], gammaScale * borderColor[1], gammaScale * borderColor[2], borderColor[3]);
+
+        gEngfuncs.pTriAPI->Begin(TRI_LINES);
+    
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX, theDrawInfo.mY, 1);
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX, theDrawInfo.mY + theDrawInfo.mHeight, 1);
+
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX, theDrawInfo.mY + theDrawInfo.mHeight, 1);
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX + theDrawInfo.mWidth, theDrawInfo.mY + theDrawInfo.mHeight, 1);
+        
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX + theDrawInfo.mWidth, theDrawInfo.mY + theDrawInfo.mHeight, 1);
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX + theDrawInfo.mWidth, theDrawInfo.mY, 1);
+    
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX + theDrawInfo.mWidth, theDrawInfo.mY, 1);
+        gEngfuncs.pTriAPI->Vertex3f(theDrawInfo.mX, theDrawInfo.mY, 1);
+
+        gEngfuncs.pTriAPI->End();
+    
+    }
+
+}
+
+void AvHOverviewControl::HandleMouseClick(int inMouseX, int inMouseY)
+{
+
+    AvHOverviewMap& theOverviewMap = gHUD.GetOverviewMap();
+
+    AvHOverviewMap::DrawInfo theDrawInfo;
+    GetDrawInfo(theDrawInfo);
+    
+    float theWorldX;
+    float theWorldY;
+    
+    theOverviewMap.GetWorldPosFromMouse(theDrawInfo, inMouseX, inMouseY, theWorldX, theWorldY);
+
+    // Search for a player at the world position.
+
+    int theEntity = theOverviewMap.GetEntityAtWorldPosition(theWorldX, theWorldY, 150);
+
+    if (theEntity > 0 && theEntity <= 32)
+    {
+        char command[256];
+        sprintf(command, "follow %d", theEntity);
+
+        gEngfuncs.pfnClientCmd(command);
+    }
+
+
+}
+
+void AvHOverviewControl::GetDrawInfo(AvHOverviewMap::DrawInfo& outDrawInfo)
+{
+
+    AvHOverviewMap& theOverviewMap = gHUD.GetOverviewMap();
+
+    int theWidth;
+    int theHeight;
+    
+    getSize(theWidth, theHeight);
+
+    outDrawInfo.mX = 0;
+    outDrawInfo.mY = 0;
+    outDrawInfo.mWidth  = theWidth;
+    outDrawInfo.mHeight = theHeight;
+
+    AvHMapExtents theMapExtents;
+    theOverviewMap.GetMapExtents(theMapExtents);
+
+    outDrawInfo.mFullScreen = true;
+
+	float worldWidth  = theMapExtents.GetMaxMapX() - theMapExtents.GetMinMapX();
+	float worldHeight = theMapExtents.GetMaxMapY() - theMapExtents.GetMinMapY();
+
+	float xScale;
+	float yScale;
+
+	float aspect1 = worldWidth / worldHeight;
+    float aspect2 = ((float)outDrawInfo.mWidth) / outDrawInfo.mHeight; 
+    
+    if (aspect1 > aspect2)
+	{
+		xScale = 1;
+		yScale = 1 / aspect2;
+	}
+	else
+	{
+		xScale = aspect2;
+		yScale = 1;
+    }
+
+	float centerX = (theMapExtents.GetMinMapX() + theMapExtents.GetMaxMapX()) / 2;
+	float centerY = (theMapExtents.GetMinMapY() + theMapExtents.GetMaxMapY()) / 2;
+    
+    outDrawInfo.mViewWorldMinX = centerX - worldWidth  * xScale * 0.5;
+    outDrawInfo.mViewWorldMinY = centerY - worldHeight * yScale * 0.5;
+    outDrawInfo.mViewWorldMaxX = centerX + worldWidth  * xScale * 0.5;
+    outDrawInfo.mViewWorldMaxY = centerY + worldHeight * yScale * 0.5;
+
+
+}
\ No newline at end of file
diff --git a/main/source/mod/AvHOverviewControl.h b/main/source/mod/AvHOverviewControl.h
new file mode 100644
index 00000000..0e5d5f80
--- /dev/null
+++ b/main/source/mod/AvHOverviewControl.h
@@ -0,0 +1,32 @@
+#ifndef AVHOVERVIEWCONTROL_H
+#define AVHOVERVIEWCONTROL_H
+
+#include "VGUI_Panel.h"
+//#include "cl_dll/util_vector.h"
+//#include "cl_dll/wrect.h"
+//#include "engine/cdll_int.h"
+#include "mod/AvHHud.h"
+
+class AvHOverviewControl : public vgui::Panel
+{
+
+public:
+
+    AvHOverviewControl();
+
+    // Overridden from Panel.
+	virtual void paint();
+
+    void HandleMouseClick(int inX, int inY);
+
+protected:
+
+    void GetDrawInfo(AvHOverviewMap::DrawInfo& outDrawInfo);
+
+private:
+
+    HSPRITE m_hsprWhite;
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHOverviewMap.cpp b/main/source/mod/AvHOverviewMap.cpp
new file mode 100644
index 00000000..8849410d
--- /dev/null
+++ b/main/source/mod/AvHOverviewMap.cpp
@@ -0,0 +1,889 @@
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+#include "common/const.h"
+#include "common/entity_state.h"
+#include "common/cl_entity.h"
+#include "ui/UITags.h"
+#include "mod/AvHOverviewMap.h"
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHSpecials.h"
+#include "mod/AvHMiniMap.h"
+#include "ui/UIUtil.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHSpriteAPI.h"
+#include "mod/AvHSprites.h"
+
+using std::string;
+
+
+class DrawingOrderSort
+{
+
+public:
+	
+	bool operator()(const DrawableEntity& entity1, const DrawableEntity& entity2)
+	{
+		
+        // Draw resource nodes all the way on the bottom.
+
+		if (entity1.mUser3 == AVH_USER3_FUNC_RESOURCE)
+        {
+            if (entity2.mUser3 == AVH_USER3_FUNC_RESOURCE)
+            {
+                return entity1.mEntityNumber > entity2.mEntityNumber;
+            }
+            else
+            {
+                return true;
+            }
+        }
+		else if (entity2.mUser3 == AVH_USER3_FUNC_RESOURCE)
+        {
+            return false;
+        }
+
+        // Draw the local player on top of everything.
+
+		if (entity1.mIsLocalPlayer)
+		{
+			return false;
+		}
+		else if (entity2.mIsLocalPlayer)
+		{
+			return true;
+        }
+		
+        // Draw players on top of structures.
+
+        return (entity1.mEntityNumber > entity2.mEntityNumber);
+		
+	}
+	
+};
+
+AvHOverviewMap::AvHOverviewMap()
+{
+	this->Init();
+}
+
+void AvHOverviewMap::Init()
+{
+	this->mUser3 = AVH_USER3_NONE;
+    this->mTeam  = TEAM_IND;
+
+	this->mDrawableEntityList.clear();
+
+	// Approximately 1/max world dimension
+	this->mMapExtents.ResetMapExtents();
+
+	this->mMiniMapSprite = 0;
+	this->mReticleSprite = 0;
+
+	mLastUpdateTime = 0;
+}
+
+void AvHOverviewMap::Clear()
+{
+	this->Init();
+}
+
+void AvHOverviewMap::GetSpriteForEntity(const DrawableEntity& entity, int& outSprite, int& outFrame, int& outRenderMode)
+{
+    
+    outRenderMode = kRenderTransTexture;
+    
+    if ((this->mUser3 == AVH_USER3_COMMANDER_PLAYER) || (entity.mUser3 == AVH_USER3_UNKNOWN))
+    {
+        outSprite = Safe_SPR_Load(kCommBlipSprite);
+        outFrame  = 0;
+    }
+    else
+    {
+        gHUD.GetSpriteForUser3(entity.mUser3, outSprite, outFrame, outRenderMode);
+    }
+
+}
+
+void AvHOverviewMap::GetColorForEntity(const DrawableEntity& entity, float& outR, float& outG, float& outB)
+{
+
+    if (entity.mUser3 == AVH_USER3_WAYPOINT)
+    {
+        outR = 0.1;
+	    outG = 0.8;
+		outB = 1.0;
+    }
+    else if (entity.mTeam == TEAM_IND)
+    {
+        
+        if (entity.mUser3 == AVH_USER3_WELD)
+        {
+            outR = 1.0;
+            outG = 0.7;
+            outB = 0.0;
+        }
+        else
+        {
+            outR = 0.5;
+            outG = 0.5;
+            outB = 0.5;
+        }
+    }
+    else
+    {
+        if (entity.mTeam == mTeam)
+        {
+
+            if (entity.mUser3 == AVH_USER3_HIVE ||
+                entity.mUser3 == AVH_USER3_COMMANDER_STATION ||
+                entity.mUser3 == AVH_USER3_TURRET_FACTORY ||
+                entity.mUser3 == AVH_USER3_ARMORY ||
+                entity.mUser3 == AVH_USER3_ADVANCED_ARMORY ||
+                entity.mUser3 == AVH_USER3_ARMSLAB ||
+                entity.mUser3 == AVH_USER3_PROTOTYPE_LAB ||
+                entity.mUser3 == AVH_USER3_OBSERVATORY ||
+                entity.mUser3 == AVH_USER3_TURRET ||
+                entity.mUser3 == AVH_USER3_SIEGETURRET ||
+                entity.mUser3 == AVH_USER3_RESTOWER ||
+                entity.mUser3 == AVH_USER3_INFANTRYPORTAL ||
+                entity.mUser3 == AVH_USER3_PHASEGATE ||
+	            entity.mUser3 == AVH_USER3_DEFENSE_CHAMBER ||
+	            entity.mUser3 == AVH_USER3_MOVEMENT_CHAMBER  ||
+	            entity.mUser3 == AVH_USER3_OFFENSE_CHAMBER  ||
+	            entity.mUser3 == AVH_USER3_SENSORY_CHAMBER ||
+	            entity.mUser3 == AVH_USER3_ALIENRESTOWER ||
+	            entity.mUser3 == AVH_USER3_ADVANCED_TURRET_FACTORY)
+            {
+                outR = 0.5;
+	    	    outG = 0.8;
+		        outB = 1.0;
+            }
+            else
+            {
+
+    		    outR = 1.0;
+	    	    outG = 1.0;
+		        outB = 1.0;
+
+                // Color squads.
+
+                int localPlayerSquad;
+                
+                if (g_iUser1 == OBS_NONE)
+                {
+                    localPlayerSquad = gHUD.GetCurrentSquad();
+                }
+                else
+                {
+                    // We don't have access to the squad information for player's
+                    // we're spectating.
+                    localPlayerSquad = 0;
+                }
+
+                if (mUser3 != AVH_USER3_COMMANDER_PLAYER)
+                {
+                    if (entity.mIsLocalPlayer || 
+                        (entity.mSquadNumber != 0 &&
+                         entity.mSquadNumber == localPlayerSquad))
+                    {
+    		            outR = 0.5;
+	    	            outG = 1.0;
+		                outB = 0.5;
+                    }
+                }
+
+            }
+
+        }
+        else
+        {
+		    outR = 1.0;
+		    outG = 0.1;
+		    outB = 0.0;
+        }
+    }
+
+}
+
+void AvHOverviewMap::DrawMiniMapEntity(const DrawInfo& inDrawInfo, const DrawableEntity& inEntity)
+{
+	
+    if (!GetHasData())
+	{
+        return;
+    }
+
+	float theEntityPosX = inEntity.mX;
+	float theEntityPosY = inEntity.mY;
+
+	// Draw local player smoothly and predicted.
+
+	if (inEntity.mIsLocalPlayer)
+	{
+		theEntityPosX = this->mWorldPlayerX;
+		theEntityPosY = this->mWorldPlayerY;
+	}
+
+	int theSprite = 0;
+    int theFrame = 0;
+    int theRenderMode;
+
+	GetSpriteForEntity(inEntity, theSprite, theFrame, theRenderMode);
+	
+    if (theSprite > 0)
+	{
+        
+        int theSprWidth = SPR_Width(theSprite, theFrame);
+		int theSprHeight = SPR_Height(theSprite, theFrame);
+
+        int theX = inDrawInfo.mX;
+		int theY = inDrawInfo.mY;
+
+        int theWidth  = inDrawInfo.mWidth;
+		int theHeight = inDrawInfo.mHeight;
+
+        float viewWorldXSize = inDrawInfo.mViewWorldMaxX - inDrawInfo.mViewWorldMinX;
+        float viewWorldYSize = inDrawInfo.mViewWorldMaxY - inDrawInfo.mViewWorldMinY;
+
+        float scale = 0.75; // How much to scale the sprite.
+
+        bool isPlayer = inEntity.mUser3 == AVH_USER3_MARINE_PLAYER || inEntity.mUser3 == AVH_USER3_HEAVY; //heavy used for player in minimap system
+		bool theIsWaypoint = inEntity.mUser3 == AVH_USER3_WAYPOINT;
+	
+        float w = theSprWidth * scale;
+        float h = theSprHeight * scale;
+
+        float entityMiniMapX = theX + ((theEntityPosX - inDrawInfo.mViewWorldMinX) / viewWorldXSize) * theWidth;
+        float entityMiniMapY = theY + ((inDrawInfo.mViewWorldMaxY - theEntityPosY) / viewWorldYSize) * theHeight;
+
+        float x = entityMiniMapX - w / 2.0f;
+        float y = entityMiniMapY - h / 2.0f;
+        
+        if (theIsWaypoint)
+        {
+                
+            float theFractionalLastUpdate = mLastUpdateTime - (int)mLastUpdateTime;
+        
+            if (theFractionalLastUpdate < .25f) 
+            {
+    	        return;
+            }
+
+        }
+
+        // Perform gross culling of sprites.
+        if (x + w >= theX && y + h >= theY && x < theX + theWidth && y < theY + theHeight)
+        {
+
+            float r, g, b;
+            GetColorForEntity(inEntity, r, g, b);
+
+            AvHSpriteSetColor(r, g, b);
+            
+            // If it's the local player, draw the FOV.
+
+            if (inEntity.mIsLocalPlayer && mUser3 != AVH_USER3_COMMANDER_PLAYER)
+            {
+                
+                int theSprite = Safe_SPR_Load("sprites/fov.spr");
+                int theFrame  = 0;
+
+                int theSprWidth = SPR_Width(theSprite, theFrame);
+		        int theSprHeight = SPR_Height(theSprite, theFrame);
+
+                float w2 = theSprWidth * scale;
+                float h2 = theSprHeight * scale;
+
+                float x2 = entityMiniMapX;
+                float y2 = entityMiniMapY - h2 / 2;
+
+                AvHSpriteSetRotation(-inEntity.mAngleRadians * 180 / M_PI, x2, y2 + h2 / 2);
+                
+                AvHSpriteSetColor(1, 1, 1);
+                AvHSpriteSetRenderMode(kRenderTransAdd);
+                AvHSpriteDraw(theSprite, theFrame, x2, y2, x2 + w2, y2 + h2, 0, 0, 1, 1);
+
+            }
+
+		    if (mUser3 != AVH_USER3_COMMANDER_PLAYER)
+			{
+				AvHSpriteSetRotation(-inEntity.mAngleRadians * 180 / M_PI, x + w / 2, y + h / 2);
+			}
+			else
+			{
+				AvHSpriteSetRotation(0, 0, 0);
+			}
+
+            AvHSpriteSetColor(r, g, b);
+            AvHSpriteSetRenderMode(theRenderMode);
+            AvHSpriteDraw(theSprite, theFrame, x, y, x + w, y + h, 0, 0, 1, 1);
+
+        }
+
+        if (isPlayer || theIsWaypoint)
+        {
+
+            const float border = 2;
+
+            if (!(x + w / 2 >= theX && y + h / 2 >= theY && x + w / 2 < theX + theWidth && y + h / 2 < theY + theHeight))
+            {
+
+                // Draw friendly players as little arrows on the edge of the minimap.
+
+                int theSprite = Safe_SPR_Load(kMarinePlayersSprite);
+				int theFrame  = theIsWaypoint ? 4 : 3;
+
+                ASSERT(theSprite != 0);
+
+                int theSprWidth = SPR_Width(theSprite, theFrame);
+			    int theSprHeight = SPR_Height(theSprite, theFrame);
+
+                float tipX = entityMiniMapX;
+                float tipY = entityMiniMapY;
+
+                if (tipX < theX + border) tipX = theX + border;
+                if (tipY < theY + border) tipY = theY + border;
+                if (tipX > theX + theWidth - border)  tipX = theX + theWidth - border;
+                if (tipY > theY + theHeight - border) tipY = theY + theHeight - border;
+
+                float dx = tipX - entityMiniMapX;
+                float dy = tipY - entityMiniMapY;
+
+                float angle = atan2(dy, dx) * 180 / M_PI;
+
+                w = theSprWidth;
+                h = theSprHeight;
+
+                int renderMode = kRenderTransTexture;
+
+                if (theIsWaypoint)
+                {
+                    renderMode = kRenderTransAdd;
+                }
+
+                AvHSpriteSetRenderMode(renderMode);
+                
+                float r, g, b;
+                GetColorForEntity(inEntity, r, g, b);
+
+                AvHSpriteSetColor(r, g, b);
+                AvHSpriteSetRotation(angle, tipX, tipY);
+                AvHSpriteDraw(theSprite, theFrame, tipX, tipY - h / 2 , tipX + w, tipY + h / 2, 0, 0, 1, 1);
+
+            }
+
+        }
+	
+    }
+
+}
+
+bool AvHOverviewMap::GetHasData() const
+{
+	return this->mDrawableEntityList.size() > 0;
+}
+
+
+void AvHOverviewMap::GetWorldPosFromMouse(const DrawInfo& inDrawInfo, int inMouseX, int inMouseY, float& outWorldX, float& outWorldY)
+{
+
+    float viewWorldXSize = inDrawInfo.mViewWorldMaxX - inDrawInfo.mViewWorldMinX;
+    float viewWorldYSize = inDrawInfo.mViewWorldMaxY - inDrawInfo.mViewWorldMinY;
+
+    outWorldX = ((float)(inMouseX) / inDrawInfo.mWidth) * viewWorldXSize + inDrawInfo.mViewWorldMinX;
+    outWorldY =  inDrawInfo.mViewWorldMaxY - ((float)(inMouseY) / inDrawInfo.mHeight) * viewWorldYSize;
+
+}
+
+
+void AvHOverviewMap::KillOldAlerts(float inCurrentTime)
+{
+	for(MapAlertListType::iterator theIter = this->mAlertList.begin(); theIter != this->mAlertList.end(); /* no inc */)
+	{
+		if(inCurrentTime > theIter->mExpireTime)
+		{
+			theIter = this->mAlertList.erase(theIter);
+		}
+		else
+		{
+			++theIter;
+		}
+	}
+}
+
+void AvHOverviewMap::DrawMiniMap(const DrawInfo& inDrawInfo)
+{
+
+    // Load the mini-map sprite if it's not already loaded.
+
+    if (!mMiniMapSprite && (mMapName != ""))
+    {
+        string theMiniMapName = AvHMiniMap::GetSpriteNameFromMap(ScreenWidth(), mMapName);
+        mMiniMapSprite = Safe_SPR_Load(theMiniMapName.c_str());
+    }
+
+    if (!mMiniMapSprite)
+    {
+        return;
+    }
+
+    float mapXSize = mMapExtents.GetMaxMapX() - mMapExtents.GetMinMapX();
+    float mapYSize = mMapExtents.GetMaxMapY() - mMapExtents.GetMinMapY();
+
+    float mapXCenter = (mMapExtents.GetMaxMapX() + mMapExtents.GetMinMapX()) / 2;
+    float mapYCenter = (mMapExtents.GetMaxMapY() + mMapExtents.GetMinMapY()) / 2;
+
+	float aspectRatio = mapXSize / mapYSize;
+	
+    float xScale;
+    float yScale;
+
+    if(mapXSize > mapYSize)
+	{
+		xScale = 1.0f;
+		yScale = mapYSize / mapXSize;	
+	}
+	else
+	{
+		xScale = mapYSize / mapXSize;
+		yScale = 1.0f;
+	}
+
+
+    float x1 = mapXCenter - mapXSize * xScale / 2;
+    float y1 = mapYCenter + mapYSize * yScale / 2;
+
+    WorldToMiniMapCoords(inDrawInfo, x1, y1);
+
+    float x2 = mapXCenter + mapXSize * xScale / 2;
+    float y2 = mapYCenter - mapYSize * yScale / 2;
+
+    WorldToMiniMapCoords(inDrawInfo, x2, y2);
+
+    AvHSpriteSetRenderMode(kRenderTransTexture);
+    AvHSpriteSetRotation(0, 0, 0);
+
+    // TODO this should be based on a flag not the user3
+    
+    if (mUser3 == AVH_USER3_COMMANDER_PLAYER)
+    {
+        // Use the small map if it's the commander view.
+        AvHSpriteDraw(mMiniMapSprite, 4, x1, y1, x2, y2, 0, 0, 1, 1);
+    }
+    else
+    {
+        AvHSpriteDrawTiles(mMiniMapSprite, 2, 2, x1, y1, x2, y2,
+            0, 0, 1, 1);
+    }
+
+	// Reset orientation after potentially orienting above to make sure it doesn't affect subsequent code
+	AvHSpriteSetRotation(0, 0, 0);
+}
+
+void AvHOverviewMap::WorldToMiniMapCoords(const DrawInfo& inDrawInfo, float& x, float& y)
+{
+
+    float viewWorldXSize = inDrawInfo.mViewWorldMaxX - inDrawInfo.mViewWorldMinX;
+    float viewWorldYSize = inDrawInfo.mViewWorldMaxY - inDrawInfo.mViewWorldMinY;
+
+    x = inDrawInfo.mX + ((x - inDrawInfo.mViewWorldMinX) / viewWorldXSize) * inDrawInfo.mWidth;
+    y = inDrawInfo.mY + ((inDrawInfo.mViewWorldMaxY - y) / viewWorldYSize) * inDrawInfo.mHeight;
+
+}
+
+void AvHOverviewMap::DrawAlerts(const DrawInfo& inDrawInfo)
+{
+
+    int theX = inDrawInfo.mX;
+    int theY = inDrawInfo.mY;
+
+    int theWidth  = inDrawInfo.mWidth;
+    int theHeight = inDrawInfo.mHeight;
+    
+    AvHSpriteEnableClippingRect(true);
+    AvHSpriteSetClippingRect(theX, theY, theX + theWidth, theY + theHeight);
+
+    int theSprite = Safe_SPR_Load(kAlertSprite);
+	int theFrame  = 0;
+
+    ASSERT(theSprite != 0);
+
+    int theSprWidth = SPR_Width(theSprite, theFrame);
+	int theSprHeight = SPR_Height(theSprite, theFrame);
+
+    float viewWorldXSize = inDrawInfo.mViewWorldMaxX - inDrawInfo.mViewWorldMinX;
+    float viewWorldYSize = inDrawInfo.mViewWorldMaxY - inDrawInfo.mViewWorldMinY;
+
+    for (unsigned int i = 0; i < mAlertList.size(); ++i)
+    {
+        
+        float maxAlertSize = 5;
+		float minAlertSize = 0.4;
+
+		float transitionTime = 1;
+
+        float dt = (mLastUpdateTime - mAlertList[i].mStartTime) / transitionTime;
+
+        if (dt > 1) dt = 1;
+
+        float scale = (1 - sqrt(dt)) * (maxAlertSize - minAlertSize) + minAlertSize;
+
+        float w = theSprWidth * scale;
+        float h = theSprHeight * scale;
+        
+        float cx = mAlertList[i].mX;
+        float cy = mAlertList[i].mY;
+        
+        WorldToMiniMapCoords(inDrawInfo, cx, cy); 
+
+        float angle = dt * 180;
+
+		float fadeOutStartTime = mAlertList[i].mExpireTime - (transitionTime / 2);
+		float alpha = 1 - (mLastUpdateTime - fadeOutStartTime) / (transitionTime / 2);
+
+		if (alpha < 0)
+		{
+			alpha = 0;
+		}
+
+        AvHSpriteSetRenderMode(kRenderTransAdd);
+        AvHSpriteSetColor(1, 1, 1, alpha * 0.1);
+        AvHSpriteSetRotation(angle, cx, cy);
+        AvHSpriteDraw(theSprite, theFrame, cx - w / 2, cy - h / 2, cx + w / 2, cy + h / 2, 0, 0, 1, 1);
+    }
+    
+}
+
+void AvHOverviewMap::AddAlert(float x, float y)
+{
+    
+    MapAlert alert;
+
+    alert.mStartTime  = mLastUpdateTime;
+    alert.mExpireTime = mLastUpdateTime + BALANCE_FVAR(kAlertExpireTime) / 5;
+    
+    alert.mX = x;
+    alert.mY = y;
+    
+    mAlertList.push_back(alert);
+
+}
+
+void AvHOverviewMap::Draw(const DrawInfo& inDrawInfo)
+{
+
+    int theX = inDrawInfo.mX;
+    int theY = inDrawInfo.mY;
+    int theCompWidth  = inDrawInfo.mWidth;
+    int theCompHeight = inDrawInfo.mHeight;
+
+    AvHSpriteBeginFrame();
+
+    AvHSpriteEnableClippingRect(true);
+    AvHSpriteSetClippingRect(theX, theY, theX + theCompWidth, theY + theCompHeight);
+    
+    // Draw the minimap background.
+
+    DrawMiniMap(inDrawInfo);
+    
+    // Draw the entities on the minimap.
+
+    if (mUser3 == AVH_USER3_COMMANDER_PLAYER)
+    {
+        AvHSpriteEnableClippingRect(false);
+    }
+
+    for (DrawableEntityListType::const_iterator theIter = this->mDrawableEntityList.begin(); theIter != this->mDrawableEntityList.end(); theIter++)
+	{
+        DrawMiniMapEntity(inDrawInfo, *theIter);
+	}
+
+    // Draw the way points as entities.
+    
+    {
+    
+        for (MapOrderListType::const_iterator theIter = mMapOrderList.begin(); theIter != mMapOrderList.end(); theIter++)
+	    {
+            DrawableEntity drawableEntity;
+        
+            drawableEntity.mUser3 = AVH_USER3_WAYPOINT;
+            drawableEntity.mX = theIter->mX;
+            drawableEntity.mY = theIter->mY;
+        
+            DrawMiniMapEntity(inDrawInfo, drawableEntity);
+	    }
+    
+    }
+
+    // Draw the alerts.
+
+    DrawAlerts(inDrawInfo);
+  
+    // Draw the reticle.
+
+	if(this->mUser3 == AVH_USER3_COMMANDER_PLAYER)
+	{
+		
+        int theFrame = 0;
+		
+        if (!this->mReticleSprite)
+		{
+			this->mReticleSprite = Safe_SPR_Load(kReticleSprite);
+		}
+
+		if (this->mReticleSprite)
+		{
+
+            float x = mWorldPlayerX;
+            float y = mWorldPlayerY;
+
+            WorldToMiniMapCoords(inDrawInfo, x, y);
+
+            float w = SPR_Width(this->mReticleSprite, theFrame);
+            float h = SPR_Height(this->mReticleSprite, theFrame);
+
+            AvHSpriteSetRenderMode(kRenderTransAdd);
+            AvHSpriteSetColor(1, 1, 1);
+			AvHSpriteSetRotation(0, 0, 0);
+            AvHSpriteDraw(mReticleSprite, theFrame, x - w / 2, y - h / 2, x + w / 2, y + h / 2, 0, 0, 1, 1);
+
+		}
+    }
+
+	// Reset orientation after potentially orienting above to make sure it doesn't affect subsequent code
+	AvHSpriteSetRotation(0, 0, 0);
+
+    AvHSpriteEndFrame();
+
+}
+
+int AvHOverviewMap::GetEntityAtWorldPosition(float inWorldX, float inWorldY, float inRadius) const
+{
+
+	for (int i = 0; i < (int)mDrawableEntityList.size(); ++i)
+	{
+                
+        float dx = mDrawableEntityList[i].mX - inWorldX;
+        float dy = mDrawableEntityList[i].mY - inWorldY;
+        
+        if (dx * dx + dy * dy < inRadius * inRadius)
+        {
+            return mDrawableEntityList[i].mEntityNumber;
+        }
+	
+	}    
+
+    return 0;
+
+}
+
+void AvHOverviewMap::SetMapExtents(const string& inMapName, const AvHMapExtents& inMapExtents)
+{
+	this->mMapName = inMapName;
+	this->mMapExtents = inMapExtents;
+}
+
+void AvHOverviewMap::GetMapExtents(AvHMapExtents& outMapExtents)
+{
+    outMapExtents = mMapExtents;
+}
+
+void AvHOverviewMap::SetUser3(AvHUser3 inUser3)
+{
+	this->mUser3 = inUser3;
+}
+
+void AvHOverviewMap::SetWorldPosition(float inPlayerX, float inPlayerY)
+{
+	mWorldPlayerX = inPlayerX;
+	mWorldPlayerY = inPlayerY;
+}
+
+void AvHOverviewMap::GetWorldPosition(float& outWorldX, float& outWorldY)
+{
+    outWorldX = mWorldPlayerX;
+    outWorldY = mWorldPlayerY;
+}
+
+
+void AvHOverviewMap::Update(float inCurrentTime)
+{
+
+    mLastUpdateTime = inCurrentTime;
+
+//	if(gHUD.GetGameStarted())
+//	{
+//		this->mMap.Update(inCurrentTime, this->mMapExtents.GetMinMapX(), this->mMapExtents.GetMinMapY(), this->mMapExtents.GetMaxMapX(), this->mMapExtents.GetMaxMapY(), this->mViewHeight);
+//	}
+
+	// Get player data from engine and store for use during draw
+	this->UpdateDrawData(inCurrentTime);
+
+	// Kill off any old alerts
+	this->KillOldAlerts(inCurrentTime);
+}
+
+
+void AvHOverviewMap::UpdateDrawData(float inCurrentTime)
+{
+    
+    int theLocalPlayerIndex;
+    
+    if (g_iUser1 == OBS_NONE)
+    {
+	    cl_entity_s* thePlayer = gEngfuncs.GetLocalPlayer();
+	    theLocalPlayerIndex = thePlayer->index;    
+    }
+    else
+    {
+        theLocalPlayerIndex = g_iUser2;
+    }
+    
+    cl_entity_s* thePlayer = gEngfuncs.GetEntityByIndex(theLocalPlayerIndex);
+    mTeam = (AvHTeamNumber)(thePlayer->curstate.team);
+
+	// Clear list of drawable entities 
+	this->mDrawableEntityList.clear();
+	
+	// Get all entities
+	MapEntityMap theEntityList;
+	gHUD.GetEntityHierarchy().GetEntityInfoList(theEntityList);
+
+	// For each entity
+	for(MapEntityMap::iterator theIter = theEntityList.begin(); theIter != theEntityList.end(); theIter++)
+	{
+		// If the player has no leader, then he IS a leader
+		int theCurrentPlayerIndex = theIter->first;
+		bool theIsLocalPlayer = (theLocalPlayerIndex == theCurrentPlayerIndex);
+
+		DrawableEntity theDrawableEntity;
+		theDrawableEntity.mEntityNumber = theIter->first;
+
+        theDrawableEntity.mX = theIter->second.mX;
+        theDrawableEntity.mY = theIter->second.mY;
+        theDrawableEntity.mUser3  = theIter->second.mUser3;
+        theDrawableEntity.mTeam   = theIter->second.mTeam;
+        theDrawableEntity.mAngleRadians = theIter->second.mAngle * M_PI / 180;
+        theDrawableEntity.mSquadNumber  = theIter->second.mSquadNumber;
+
+		// Returns position relative to minimap, so add it back in
+		theDrawableEntity.mX += this->mMapExtents.GetMinMapX();
+		theDrawableEntity.mY += this->mMapExtents.GetMinMapY();
+		theDrawableEntity.mIsLocalPlayer = theIsLocalPlayer;
+
+        // Get additional information about the entity from the client state.
+
+		cl_entity_t* clientEntity = gEngfuncs.GetEntityByIndex(theDrawableEntity.mEntityNumber);        
+        
+        if(clientEntity)
+		{
+		
+			if (clientEntity->index >= 32)
+			{
+				theDrawableEntity.mAngleRadians = clientEntity->angles[1] * M_PI / 180;
+			}
+
+			// Update the information for this entity from the client information
+			// if they're in the local player's PVS.
+        
+			// We really want to check if the client data is more recent than the
+			// minimap data, but I don't know how to get the timestamp on the minimap
+			// data.
+			
+			if (clientEntity->curstate.messagenum >= thePlayer->curstate.messagenum)
+			{
+			
+				//theDrawableEntity.mUser3 = (AvHUser3)(clientEntity->curstate.iuser3);
+
+				// Brush entities don't have the correct position information, so
+				// don't update them from the client data.
+            
+
+				if (theDrawableEntity.mUser3 != AVH_USER3_WELD)
+				{
+					theDrawableEntity.mX = clientEntity->origin.x;
+					theDrawableEntity.mY = clientEntity->origin.y;
+					theDrawableEntity.mAngleRadians = clientEntity->angles[1] * M_PI / 180;
+				}
+
+			}
+			else
+			{
+			
+				// If the difference between the minimap position and the client data
+				// position is less than the minimap quantization error, then use
+				// the client position to avoid popping when the entity goes out of the
+				// PVS.
+			
+				float dx = fabs(theDrawableEntity.mX - clientEntity->origin.x);
+				float dy = fabs(theDrawableEntity.mY - clientEntity->origin.y);
+			
+				if (dx < kPositionNetworkConstant && dy < kPositionNetworkConstant)
+				{
+					theDrawableEntity.mX = clientEntity->origin.x;
+					theDrawableEntity.mY = clientEntity->origin.y;
+				}
+			
+			}
+
+			if (theDrawableEntity.mUser3 != AVH_USER3_COMMANDER_PLAYER)
+			{
+    			this->mDrawableEntityList.push_back(theDrawableEntity);
+			}
+		
+		}
+	}
+
+	std::sort(mDrawableEntityList.begin(), mDrawableEntityList.end(), DrawingOrderSort());
+
+}
+
+void AvHOverviewMap::UpdateOrders(const OrderListType& inOrderList, const EntityListType& inDrawPlayers)
+{
+
+    // Look for orders which apply to the players in the draw players list.
+
+    mMapOrderList.clear();
+
+    if (mUser3 == AVH_USER3_COMMANDER_PLAYER)
+    {
+        return;
+    }
+    
+    for (OrderListType::const_iterator theIter = inOrderList.begin(); theIter != inOrderList.end(); ++theIter)
+    {
+
+	    // Draw the order if the order is for any plays that are in our draw player list
+	    bool theDrawWaypoint = false;
+	    EntityInfo theReceiverPlayer = theIter->GetReceiver();
+	    EntityListType::const_iterator theSearchIter = std::find(inDrawPlayers.begin(), inDrawPlayers.end(), theReceiverPlayer);
+	    if(theSearchIter != inDrawPlayers.end())
+		{
+		    theDrawWaypoint = true;
+	    }
+    
+        if (theDrawWaypoint)
+        {
+
+            vec3_t position;
+            theIter->GetLocation(position);
+            
+            MapOrder mapOrder;
+
+            mapOrder.mX = position[0];
+            mapOrder.mY = position[1];
+            
+            mMapOrderList.push_back(mapOrder);
+
+        }
+
+    }
+
+}
+
+void AvHOverviewMap::VidInit(void)
+{
+	this->mMiniMapSprite = 0;
+	this->mReticleSprite = 0;
+	this->mMapName = "";
+}
\ No newline at end of file
diff --git a/main/source/mod/AvHOverviewMap.h b/main/source/mod/AvHOverviewMap.h
new file mode 100644
index 00000000..e5f3aa64
--- /dev/null
+++ b/main/source/mod/AvHOverviewMap.h
@@ -0,0 +1,129 @@
+#ifndef AVHOVERVIEWMAP_H
+#define AVHOVERVIEWMAP_H
+
+#include "mod/AvHEntityHierarchy.h"
+#include "mod/AvHMapExtents.h"
+#include "mod/AvHOrder.h"
+
+class DrawableEntity
+{
+public:
+	DrawableEntity() : mUser3(AVH_USER3_NONE), mIsAlive(true), mX(0), mY(0), mAngleRadians(0), mIsLocalPlayer(false), mEntityNumber(0), mTeam(TEAM_IND), mSquadNumber(0)
+	{}
+	
+	AvHUser3	    mUser3;
+	bool		    mIsAlive;
+	int			    mX;
+	int			    mY;
+    AvHTeamNumber   mTeam;
+	float	  	    mAngleRadians;
+	bool		    mIsLocalPlayer;
+	int			    mEntityNumber;
+    int             mSquadNumber;
+};
+
+class AvHOverviewMap
+{										                                                                                                            
+public:
+
+    struct DrawInfo
+    {
+
+        int mX;
+        int mY;
+        int mWidth;
+        int mHeight;
+    
+        float mViewWorldMinX;
+        float mViewWorldMinY;
+        float mViewWorldMaxX;
+        float mViewWorldMaxY;
+
+        bool mFullScreen;
+    
+    };
+                                    AvHOverviewMap();
+
+	void							Clear();
+
+	bool							GetHasData() const;
+	void							GetWorldPosFromMouse(const DrawInfo& inDrawInfo, int inMouseX, int inMouseY, float& outWorldX, float& outWorldY);
+	
+    void							SetMapExtents(const string& inMapName, const AvHMapExtents& inMapExtents);
+	void                            GetMapExtents(AvHMapExtents& outMapExtents);
+    
+    void							SetUser3(AvHUser3 inUser3);
+	void							SetWorldPosition(float inWorldX, float inWorldY);
+    void                            GetWorldPosition(float& outWorldX, float& outWorldY);
+	
+	void							Update(float inCurrentTime);
+	void                            UpdateOrders(const OrderListType& inOrderList, const EntityListType& inDrawPlayers);
+    void							VidInit(void);
+
+    void                            AddAlert(float x, float y);
+
+    void                            Draw(const DrawInfo& inDrawInfo);
+
+    int                             GetEntityAtWorldPosition(float inWorldX, float inWorldY, float inRadius) const;
+
+protected:
+	void							KillOldAlerts(float inCurrentTime);
+	
+    void							DrawMiniMap(const DrawInfo& inDrawInfo);
+	void							DrawMiniMapEntity(const DrawInfo& inDrawInfo, const DrawableEntity& inEntity);
+    void                            DrawAlerts(const DrawInfo& inDrawInfo);
+
+	AvHUser3						mUser3;
+    AvHTeamNumber                   mTeam;
+	
+private:
+	
+    void                            WorldToMiniMapCoords(const DrawInfo& inDrawInfo, float& x, float& y);
+
+	void							Init();
+    void                            GetSpriteForEntity(const DrawableEntity& entity, int& outSprite, int& outFrame, int& outRenderMode);
+    void                            GetColorForEntity(const DrawableEntity& entity, float& outR, float& outG, float& outB);
+    
+	void							UpdateDrawData(float inCurrentTime);
+
+	float							mWorldPlayerX;
+	float							mWorldPlayerY;
+
+	AvHMapExtents					mMapExtents;
+
+	string							mMapName;
+	int								mMiniMapSprite;
+
+	HSPRITE							mReticleSprite;
+	
+	typedef vector<DrawableEntity>	DrawableEntityListType;
+	DrawableEntityListType			mDrawableEntityList;
+
+    struct MapAlert
+    {
+        
+        float mStartTime;
+        float mExpireTime;
+        
+        float mX; // World space.
+        float mY;
+
+    };
+
+    typedef std::vector<MapAlert>	MapAlertListType;
+    MapAlertListType				mAlertList;
+
+    struct MapOrder
+    {
+        float mX; // World space.
+        float mY;
+    };
+
+    typedef std::vector<MapOrder>	MapOrderListType;
+    MapOrderListType				mMapOrderList;
+
+    float                           mLastUpdateTime;
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHParalysisGun.cpp b/main/source/mod/AvHParalysisGun.cpp
new file mode 100644
index 00000000..d1362d10
--- /dev/null
+++ b/main/source/mod/AvHParalysisGun.cpp
@@ -0,0 +1,202 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHParalysisGun.cpp $
+// $Date: 2002/11/22 21:28:16 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHParalysisGun.cpp,v $
+// Revision 1.11  2002/11/22 21:28:16  Flayra
+// - mp_consistency changes
+//
+// Revision 1.10  2002/10/16 20:55:15  Flayra
+// - Added visible paralysis projectile
+//
+// Revision 1.9  2002/09/23 22:23:55  Flayra
+// - Removed damage upgrades for paralysis
+// - Updated onos view model artwork
+//
+// Revision 1.8  2002/07/26 23:06:18  Flayra
+// - New artwork
+//
+// Revision 1.7  2002/07/24 19:09:17  Flayra
+// - Linux issues
+//
+// Revision 1.6  2002/07/24 18:55:52  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.5  2002/07/24 18:45:42  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.4  2002/06/25 17:50:59  Flayra
+// - Reworking for correct player animations and new enable/disable state, new view model artwork, alien weapon refactoring
+//
+// Revision 1.3  2002/06/03 16:39:09  Flayra
+// - Added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.2  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHGamerules.h"
+
+LINK_ENTITY_TO_CLASS(kwParalysisGun, AvHParalysisGun);
+extern int gParalysisStartEventID;
+
+void AvHParalysisGun::Init()
+{
+	this->mRange = kParalysisRange;
+	this->mDamage = kParalysisDamage;
+	this->mROF = kParalysisROF;
+}
+
+int	AvHParalysisGun::GetBarrelLength() const
+{
+	return kParalysisBarrelLength;
+}
+
+int	AvHParalysisGun::GetDeployAnimation() const
+{
+	// Look at most recently used weapon and see if we can transition from it
+	int theDeployAnimation = 10;
+	
+	AvHWeaponID thePreviousID = this->GetPreviousWeaponID();
+	
+	switch(thePreviousID)
+	{
+	case AVH_WEAPON_CLAWS:
+		theDeployAnimation = 4;
+		break;
+	case AVH_ABILITY_CHARGE:
+		theDeployAnimation = 6;
+		break;
+	}
+	
+	return theDeployAnimation;
+}
+
+float AvHParalysisGun::GetDeployTime() const
+{
+	return .5f;
+}
+
+int	AvHParalysisGun::GetIdleAnimation() const
+{
+	return 2;
+}
+
+int	AvHParalysisGun::GetShootAnimation() const
+{
+	return 11;
+}
+
+bool AvHParalysisGun::GetFiresUnderwater() const
+{
+	return true;
+}
+
+bool AvHParalysisGun::GetIsDroppable() const
+{
+	return false;
+}
+
+void AvHParalysisGun::FireProjectiles(void)
+{
+#ifdef AVH_SERVER
+	
+	UTIL_MakeVectors(this->m_pPlayer->pev->v_angle);
+	
+	Vector vecAiming = gpGlobals->v_forward;
+	Vector vecSrc = this->m_pPlayer->GetGunPosition( ) + vecAiming;
+	Vector vecEnd = vecSrc + vecAiming*kParalysisRange;
+	
+	const float kParalysisTime = 6;
+	
+	// Treat damage upgrade as modifier onto paralysis
+	//int theTracerFreq;
+	//float theDamageMultiplier;
+	//AvHPlayerUpgrade::GetWeaponUpgrade(this->m_pPlayer->pev->iuser4, &theDamageMultiplier, &theTracerFreq);
+
+	// Perform trace to hit victim
+	TraceResult tr;
+	UTIL_TraceLine(vecSrc, vecEnd, dont_ignore_monsters, dont_ignore_glass, this->m_pPlayer->edict(), &tr);
+	CBaseEntity* theEntityHit = CBaseEntity::Instance(tr.pHit);
+	if(theEntityHit)
+	{
+		AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntityHit);
+		if(thePlayer)
+		{
+			// Check teams (hit friendly in tourny mode)
+			if((thePlayer->pev->team != this->m_pPlayer->pev->team) || (GetGameRules()->GetIsTournamentMode()))
+			{
+				thePlayer->SetIsParalyzed(true, kParalysisTime/**theDamageMultiplier*/);
+
+				// Play hit event
+				PLAYBACK_EVENT_FULL(0, thePlayer->edict(), gParalysisStartEventID, 0, thePlayer->pev->origin, (float *)&g_vecZero, 0.0, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0);
+			}
+		}
+	}
+
+	#endif	
+}
+
+char* AvHParalysisGun::GetViewModel() const
+{
+	return kLevel5ViewModel;
+}
+
+
+void AvHParalysisGun::Precache()
+{
+	AvHAlienWeapon::Precache();
+
+	PRECACHE_UNMODIFIED_SOUND(kParalysisFireSound);
+	PRECACHE_UNMODIFIED_SOUND(kParalysisHitSound);
+	PRECACHE_UNMODIFIED_MODEL(kParalysisProjectileModel);
+
+	this->mEvent = PRECACHE_EVENT(1, kParalysisShootEventName);
+}
+
+void AvHParalysisGun::Spawn() 
+{ 
+    AvHAlienWeapon::Spawn(); 
+
+	Precache();
+
+	this->m_iId = AVH_WEAPON_PARALYSIS;
+
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsParalysisGun);
+
+	SET_MODEL(ENT(this->pev), kNullModel);
+
+	FallInit();// get ready to fall down.
+} 
+
+bool AvHParalysisGun::UsesAmmo(void) const
+{
+	return false;
+}
+
diff --git a/main/source/mod/AvHParasiteGun.cpp b/main/source/mod/AvHParasiteGun.cpp
new file mode 100644
index 00000000..f03bd6a9
--- /dev/null
+++ b/main/source/mod/AvHParasiteGun.cpp
@@ -0,0 +1,236 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHParasiteGun.cpp $
+// $Date: 2002/11/22 21:28:16 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHParasiteGun.cpp,v $
+// Revision 1.15  2002/11/22 21:28:16  Flayra
+// - mp_consistency changes
+//
+// Revision 1.14  2002/11/12 02:25:51  Flayra
+// - Parasite no longer does damage to teammates improperly
+//
+// Revision 1.13  2002/11/06 01:38:37  Flayra
+// - Added ability for buildings to be enabled and disabled, for turrets to be shut down
+// - Damage refactoring (TakeDamage assumes caller has already adjusted for friendly fire, etc.)
+//
+// Revision 1.12  2002/09/09 20:00:32  Flayra
+// - Parasite works on buildings now
+// - Parasite no longer changes score
+//
+// Revision 1.11  2002/08/31 18:01:02  Flayra
+// - Work at VALVe
+//
+// Revision 1.10  2002/08/16 02:40:36  Flayra
+// - Damage types
+// - Parasite can now affect organic enemy targets (babblers, alien buildings)
+//
+// Revision 1.9  2002/07/24 19:09:17  Flayra
+// - Linux issues
+//
+// Revision 1.8  2002/07/24 18:55:52  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.7  2002/07/24 18:45:42  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.6  2002/07/01 21:19:29  Flayra
+// - Removed hard-coded parasite damage
+//
+// Revision 1.5  2002/06/25 17:50:59  Flayra
+// - Reworking for correct player animations and new enable/disable state, new view model artwork, alien weapon refactoring
+//
+// Revision 1.4  2002/06/10 19:49:06  Flayra
+// - Updated with new alien view model artwork (with running anims)
+//
+// Revision 1.3  2002/06/03 16:27:06  Flayra
+// - Animation constants and changes with new artwork
+//
+// Revision 1.2  2002/05/28 17:58:08  Flayra
+// - Parasite works properly in tournament mode now
+//
+// Revision 1.1  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHGamerules.h"
+#endif
+
+LINK_ENTITY_TO_CLASS(kwParasiteGun, AvHParasiteGun);
+extern int gParasiteStartEventID;
+
+void AvHParasiteGun::Init()
+{
+	this->mRange = kParasiteRange;
+	this->mDamage = BALANCE_IVAR(kParasiteDamage);
+}
+
+int	AvHParasiteGun::GetBarrelLength() const
+{
+	return kParasiteBarrelLength;
+}
+
+float AvHParasiteGun::GetRateOfFire() const
+{
+    return BALANCE_FVAR(kParasiteROF);
+}
+
+int AvHParasiteGun::GetDamageType() const
+{
+	return NS_DMG_ORGANIC;
+	//return NS_DMG_NORMAL;
+}
+
+int	AvHParasiteGun::GetDeployAnimation() const
+{
+	return 6;
+}
+
+bool AvHParasiteGun::GetFiresUnderwater() const
+{
+	return true;
+}
+
+bool AvHParasiteGun::GetIsDroppable() const
+{
+	return false;
+}
+
+int AvHParasiteGun::GetShootAnimation() const
+{
+	return -1;
+}
+
+void AvHParasiteGun::FireProjectiles(void)
+{
+	#ifdef AVH_SERVER
+	
+	UTIL_MakeVectors(this->m_pPlayer->pev->v_angle);
+	
+	Vector vecAiming = gpGlobals->v_forward;
+	Vector vecSrc = this->m_pPlayer->GetGunPosition( ) + vecAiming;
+	Vector vecEnd = vecSrc + vecAiming*kParasiteRange;
+	
+	// Ignore damage upgrades
+	//int theTracerFreq;
+	//float theDamageMultiplier;
+	//AvHPlayerUpgrade::GetWeaponUpgrade(this->m_pPlayer->pev->iuser4, &theDamageMultiplier, &theTracerFreq);
+	
+	// Perform trace to hit victim
+	TraceResult tr;
+	UTIL_TraceLine(vecSrc, vecEnd, dont_ignore_monsters, dont_ignore_glass, this->m_pPlayer->edict(), &tr);
+	CBaseEntity* theEntityHit = CBaseEntity::Instance(tr.pHit);
+	if(theEntityHit)
+	{
+		float theScalar = 1.0f;
+
+		bool theCanDoDamageTo = GetGameRules()->CanEntityDoDamageTo(this->m_pPlayer, theEntityHit, &theScalar);
+		
+		theScalar *= AvHPlayerUpgrade::GetAlienRangedDamageUpgrade(this->m_pPlayer->pev->iuser4);
+
+		if(theCanDoDamageTo || (theEntityHit->pev->team == TEAM_IND))
+		{
+            AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntityHit);
+            if(!thePlayer || thePlayer->GetCanBeAffectedByEnemies())
+            {
+                bool thePlayEffect = false;
+
+                AvHBaseBuildable* theBuildable = dynamic_cast<AvHBaseBuildable*>(theEntityHit);
+			    if((thePlayer || theBuildable) && !GetHasUpgrade(theEntityHit->pev->iuser4, MASK_PARASITED))
+			    {
+				    // Increase score for guy who parasited
+				    //this->m_pPlayer->AddPoints(1, TRUE);
+
+				    // joev: bug 0000841 - Don't allow alien players/structures to actually be parasited.
+					// They can take the damage, just not have the "upgrade".
+					if (theEntityHit->pev->team != this->m_pPlayer->pev->team) {
+						SetUpgradeMask(&theEntityHit->pev->iuser4, MASK_PARASITED);
+					}
+					// :joev
+                    thePlayEffect = true;
+			    }
+
+                if(theCanDoDamageTo)
+			    {
+                    float theDamage = this->mDamage*theScalar;
+				    if(theEntityHit->TakeDamage(this->pev, this->m_pPlayer->pev, theDamage, this->GetDamageType()) > 0)
+                    {
+                        thePlayEffect = true;
+                    }
+			    }
+
+                if(thePlayEffect)
+                {
+                    // Play parasite-hit sound at player
+    			    EMIT_SOUND(theEntityHit->edict(), CHAN_AUTO, kParasiteHitSound, 1.0f, ATTN_NORM);
+                }
+            }
+		}
+	}
+
+	#endif	
+}
+
+char* AvHParasiteGun::GetViewModel() const
+{
+	return kLevel1ViewModel;
+}
+
+void AvHParasiteGun::Precache()
+{
+	AvHAlienWeapon::Precache();
+
+	PRECACHE_UNMODIFIED_SOUND(kParasiteFireSound);
+	PRECACHE_UNMODIFIED_SOUND(kParasiteHitSound);
+	PRECACHE_UNMODIFIED_MODEL(kParasiteProjectileModel);
+
+	this->mEvent = PRECACHE_EVENT(1, kParasiteShootEventName);
+}
+
+void AvHParasiteGun::Spawn() 
+{ 
+    AvHAlienWeapon::Spawn();
+
+	Precache();
+
+	this->m_iId = AVH_WEAPON_PARASITE;
+
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsParasiteGun);
+
+	SET_MODEL(ENT(this->pev), kNullModel);
+
+	FallInit();// get ready to fall down.
+} 
+
+bool AvHParasiteGun::UsesAmmo(void) const
+{
+	return false;
+}
+
diff --git a/main/source/mod/AvHParticleConstants.h b/main/source/mod/AvHParticleConstants.h
new file mode 100644
index 00000000..272b1b6f
--- /dev/null
+++ b/main/source/mod/AvHParticleConstants.h
@@ -0,0 +1,92 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: Constants for the particle system, also named particles from ns.ps
+//
+// $Workfile: AvHParticleConstants.h $
+// $Date: 2002/10/24 21:34:09 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHParticleConstants.h,v $
+// Revision 1.12  2002/10/24 21:34:09  Flayra
+// - Regular update
+//
+// Revision 1.11  2002/10/16 01:02:25  Flayra
+// - New effects!
+//
+// Revision 1.10  2002/09/25 20:49:12  Flayra
+// - New bacterial spray effect
+//
+// Revision 1.9  2002/09/23 22:24:04  Flayra
+// - Regular update
+//
+// Revision 1.8  2002/06/25 18:09:00  Flayra
+// - Added umbra effect
+//
+// Revision 1.7  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_PARTICLE_CONSTANTS_H
+#define AVH_PARTICLE_CONSTANTS_H
+
+#define	kpscSystemName				"pSystemName"
+#define kpscGenSource				"pGenSource"
+#define kpscGenShape				"pGenShape"
+#define kpscSprite					"pSprite"
+#define kpscSpriteNumFrames			"pSpriteNumFrames"
+#define kpscGenShapeParams			"pGenShapeParams"
+#define kpscNumParticles			"pNumParticles"
+#define kpscGenRate					"pGenRate"
+#define kpscSize					"pSize"
+#define kpscSystemLifetime			"pSystemLifetime"
+#define kpscParticleLifetime		"pLifetime"
+#define kpscVelocityShape			"pVelShape"
+#define kpscVelocityParams			"pVelParams"
+#define kpscScale					"pScale"
+#define kpscRendermode				"pRenderMode"
+#define kpscMaxAlpha				"pMaxAlpha"
+#define kpscSystemToGen				"pPSToGen"
+#define kpscSpawnFlags				"pSpawnFlags"
+
+// Not in .fgd, only in .ps.  Move into .fgd?
+//#define kpscBaseColor				"pBaseColor"
+#define kpscAnimationSpeed			"pAnimationSpeed"
+
+// Pre-defined particle systems
+#define kpsShotgun					"ShotgunSmoke"
+#define kpsWelderSmoke				"WelderLightSmoke"
+#define kpsWelderBluePlasma			"WelderBluePlasma"
+#define kpsWelderBluePlasmaDrops	"WelderBluePlasmaDrops"
+#define kpsPhaseIn					"PhaseInEffect"
+#define kpsTeleport					"TeleportEffect"
+#define kpsSpitShoot				"SpitShoot"
+#define kpsSpitHit					"SpitHit"
+#define kpsSporeShoot				"SporeShoot"
+#define kpsSporeCloud				"SporeCloud"
+#define kpsUmbraCloud				"UmbraCloud"
+#define kpsMeleeDamage				"MeleeDamage"
+#define kpsPhaseGateIdle			"PhaseGateIdle"
+#define kpsResourceEmission			"ResourceEmission"
+#define kpsSpikeHitEffect			"SpikeHit"
+#define kpsAcidHitEffect			"AcidHit"
+#define kpsBacteriaSpray			"BacteriaSpray"
+#define kpsXenocide					"Xenocide"
+#define kpsBilebomb					"BileBomb"
+#define kpsCommandHack				"CommandHack"
+#define kpsScanEffect				"ScanEffect"
+#define kpsJetpackEffect			"JetpackEffect"
+#define kpsSmokePuffs				"SmokePuffs"
+#define kpsChamberDeath				"ChamberDeath"
+#define kpsHiveDeath				"HiveDeath"
+#define kpsStompEffect				"StompEffect"
+#define kpsPheromoneEffect			"PheromoneEffect"
+#define kpsBuildableLightDamage		"BuildableLightDamage"
+#define kpsBuildableHeavyDamage		"BuildableHeavyDamage"
+#define kpsStompSmoke				"StompSmoke"
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHParticleEditorHandler.cpp b/main/source/mod/AvHParticleEditorHandler.cpp
new file mode 100644
index 00000000..ce56024a
--- /dev/null
+++ b/main/source/mod/AvHParticleEditorHandler.cpp
@@ -0,0 +1,753 @@
+#include "util/nowarnings.h"
+#include "mod/AvHParticleEditorHandler.h"
+#include "cl_dll/chud.h"
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHParticleTemplateClient.h"
+#include "mod/AvHParticleSystemManager.h"
+#include "VGUI_Label.h"
+#include "util/STLUtil.h"
+//#include "ui/SliderPlus.h"
+#include "game_shared/vgui_slider2.h"
+
+uint32 AvHParticleEditorHandler::sEditIndex = 0;
+bool AvHParticleEditorHandler::sInEditMode = false;
+
+extern AvHParticleTemplateListClient	gParticleTemplateList;
+
+AvHSizeHandler						gSizeHandler(kPSESizeSlider, kPSESizeLabel);
+AvHScaleHandler						gScaleHandler(kPSEScaleSlider, kPSEScaleLabel);
+AvHGenerationRateHandler			gGenerationRateHandler(kPSEGenerationRateSlider, kPSEGenerationRateLabel);
+AvHParticleLifetimeHandler			gParticleLifetimeHandler(kPSEParticleLifetimeSlider, kPSEParticleLifetimeLabel);
+AvHParticleSystemLifetimeHandler	gParticleSystemLifetimeHandler(kPSEParticleSystemLifetimeSlider, kPSEParticleSystemLifetimeLabel);
+AvHMaxParticlesHandler				gMaxParticlesHandler(kPSEMaxParticlesSlider, kPSEMaxParticlesLabel);
+AvHDrawModeHandler					gDrawModeHandler(kPSEDrawModeSlider, kPSEDrawModeLabel);
+AvHGenVelToggleHandler				gGenVelToggleHandler(PSEGenVelToggleSlider, kPSEGenVelToggleLabel);
+AvHGenVelShapeHandler				gGenVelShapeHandler(kPSEGenVelShapeSlider, kPSEGenVelShapeLabel);
+AvHGenVelParamNumHandler			gGenVelParamNumHandler(kPSEGenVelParamNumSlider, kPSEGenVelParamNumLabel);
+AvHGenVelParamsHandler				gGenVelParamsHandler(kPSEGenVelParamValueSlider, kPSEGenVelParamValueLabel);
+
+const int AvHSizeHandler::kScalar = 20;
+const int AvHScaleHandler::kScalar = 30;
+const int AvHGenerationRateHandler::kScalar = 5;
+const int AvHParticleLifetimeHandler::kScalar = 20;
+const int AvHParticleSystemLifetimeHandler::kScalar = 5;
+const int AvHMaxParticlesHandler::kScalar = 2;
+const int AvHDrawModeHandler::kScalar = 1;
+const int AvHGenVelToggleHandler::kScalar = 250;
+const int AvHGenVelShapeHandler::kScalar = 100;
+const int AvHGenVelParamNumHandler::kScalar = 1;
+const int AvHGenVelParamsHandler::kScalar = 1;
+
+AvHParticleTemplate* GetEdittedParticleTemplate()
+{
+	AvHParticleTemplate* theTemplate = NULL;
+	
+	theTemplate = gParticleTemplateList.GetTemplateAtIndex(AvHParticleEditorHandler::GetEditIndex());
+	
+	return theTemplate;
+}
+
+AvHParticleEditorHandler::AvHParticleEditorHandler()
+{
+}
+
+void AvHParticleEditorHandler::InitHandlers()
+{
+	gSizeHandler.Init();
+	gScaleHandler.Init();
+	gGenerationRateHandler.Init();
+	gParticleLifetimeHandler.Init();
+	gParticleSystemLifetimeHandler.Init();
+	gMaxParticlesHandler.Init();
+	gDrawModeHandler.Init();
+	gGenVelToggleHandler.Init();
+	gGenVelShapeHandler.Init();
+	gGenVelParamNumHandler.Init();
+	gGenVelParamsHandler.Init();
+}
+
+void AvHParticleEditorHandler::ToggleEdit()
+{
+	if(!gHUD.GetInTopDownMode() && gHUD.GetServerVariableFloat("sv_cheats"))
+	{
+		if(!sInEditMode)
+		{
+			if(gHUD.SwitchUIMode(EDITPS_MODE))
+			{
+				gHUD.ToggleMouse();
+				
+				AvHParticleEditorHandler::InitHandlers();
+				
+				sInEditMode = true;
+			}
+		}
+		else
+		{
+			if(gHUD.SwitchUIMode(MAIN_MODE))
+			{
+				gHUD.ToggleMouse();
+
+				// Set mouse position to center so it doesn't jar our view
+				gEngfuncs.pfnSetMousePos(gEngfuncs.GetWindowCenterX(), gEngfuncs.GetWindowCenterY());
+				
+				sInEditMode = false;
+			}
+		}
+	}
+}
+
+uint32 AvHParticleEditorHandler::GetEditIndex()
+{
+	return sEditIndex;
+}
+
+bool AvHParticleEditorHandler::GetInEditMode()
+{
+	return sInEditMode;
+}
+
+void AvHParticleEditorHandler::SetEditIndex(uint32 inIndex)
+{
+	bool theReloadValues = false;
+	if(sEditIndex != inIndex)
+	{
+		theReloadValues = true;
+	}
+	
+	sEditIndex = inIndex;
+
+	if(theReloadValues)
+	{
+		// Init handlers in case we are in edit mode currently
+		InitHandlers();
+	}
+}
+
+void AvHParticleEditorHandler::Setup()
+{
+	gSizeHandler.Setup();
+	gScaleHandler.Setup();
+	gGenerationRateHandler.Setup();
+	gParticleLifetimeHandler.Setup();
+	gParticleSystemLifetimeHandler.Setup();
+	gMaxParticlesHandler.Setup();
+	gDrawModeHandler.Setup();
+	gGenVelToggleHandler.Setup();
+	gGenVelShapeHandler.Setup();
+	gGenVelParamNumHandler.Setup();
+	gGenVelParamsHandler.Setup();
+}
+
+void AvHParticleEditorHandler::cursorMoved(int x,int y,Panel* panel)
+{
+}
+
+void AvHParticleEditorHandler::mousePressed(MouseCode code,Panel* panel)
+{
+}
+
+void AvHParticleEditorHandler::mouseReleased(MouseCode code,Panel* panel)
+{
+}
+
+void AvHParticleEditorHandler::mouseWheeled(int delta,Panel* panel)
+{
+}
+
+
+
+
+// Generic slider handler
+AvHSliderHandler::AvHSliderHandler(const string& inSliderName, const string& inLabelName)
+{
+	this->mSliderName = inSliderName;
+	this->mLabelName = inLabelName;
+}
+
+void AvHSliderHandler::Init()
+{
+	AvHParticleTemplate* theTemplate = GetEdittedParticleTemplate();
+	if(theTemplate)
+	{
+		this->InitFromTemplate(theTemplate);
+	}
+}
+
+void AvHSliderHandler::intChanged(int /*inValue*/, Panel* inPanel)
+{
+	AvHParticleTemplate* theTemplate = GetEdittedParticleTemplate();
+	if(theTemplate)
+	{
+		int theNewValue;
+		if(this->GetValue(theNewValue))
+		{
+			this->ChangeTemplateFromValue(theTemplate, theNewValue);
+			
+			AvHParticleSystemManager::Instance()->ReloadFromTemplates();
+
+			this->RecomputeDependencies(theTemplate);
+
+			this->SetText(theNewValue);
+		}
+	}
+}
+
+void AvHSliderHandler::SetText(int inValue)
+{
+	Label* theLabel;
+	if(gHUD.GetManager().GetVGUIComponentNamed(this->mLabelName, theLabel))
+	{
+		string theText = this->GetTextFromValue(inValue);
+		
+		theLabel->setText(theText.c_str());
+	}
+}
+
+bool AvHSliderHandler::Setup()
+{
+	bool theSuccess = false;
+	
+	Slider2* theSlider;
+	if(gHUD.GetManager().GetVGUIComponentNamed(this->mSliderName, theSlider))
+	{
+		theSlider->addIntChangeSignal(this);
+		theSuccess = true;
+	}
+	return theSuccess;
+}
+
+string AvHSliderHandler::GetSliderDebugInfo() const
+{
+	string theSliderDebugInfo("no slider");
+	
+	// Look up slider
+	Slider2* theSlider;
+	if(gHUD.GetManager().GetVGUIComponentNamed(this->mSliderName, theSlider))
+	{
+		// Build string using min, max, slider window
+		int theMin, theMax;
+		theSlider->getRange(theMin, theMax);
+
+		int theValue = theSlider->getValue();
+		//int theRangeWindow = theSlider->getRangeWindow();
+
+		char theInfo[128];
+		sprintf(theInfo, "%d %d %d", theMin, theMax, theValue);
+		theSliderDebugInfo = string(theInfo);
+
+	}
+	
+	// return it
+	return theSliderDebugInfo;
+}
+
+bool AvHSliderHandler::GetValue(int& outValue)
+{
+	bool theSuccess = false;
+
+	//Slider* theSlider;
+	Slider2* theSlider;
+	if(gHUD.GetManager().GetVGUIComponentNamed(this->mSliderName, theSlider))
+	{
+		outValue = theSlider->getValue();
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+void AvHSliderHandler::SetValue(int inValue)
+{
+	//SliderPlus* theSlider;
+	Slider2* theSlider;
+	if(gHUD.GetManager().GetVGUIComponentNamed(this->mSliderName, theSlider))
+	{
+		theSlider->setValue(inValue);
+	}
+}
+
+
+
+// Particle size
+void AvHSizeHandler::ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue)
+{
+	float theSize = inValue/(float)kScalar;
+	inTemplate->SetParticleSize(theSize);
+}
+
+string AvHSizeHandler::GetTextFromValue(int inValue)
+{
+	char theBuffer[256];
+	sprintf(theBuffer, "size: %d", (inValue/kScalar));
+
+	return string(theBuffer);	
+	//return this->GetSliderDebugInfo();
+}
+
+void AvHSizeHandler::InitFromTemplate(const AvHParticleTemplate* inTemplate)
+{
+	int theValue = inTemplate->GetParticleSize()*kScalar;
+	this->SetValue(theValue);
+	this->SetText(theValue);
+}
+
+// Particle scale
+void AvHScaleHandler::ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue)
+{
+	float theValue = inValue/(float)kScalar;
+	inTemplate->SetParticleScaling(theValue);
+}
+
+string AvHScaleHandler::GetTextFromValue(int inValue)
+{
+	float theValue = inValue/(float)kScalar;
+
+	char theBuffer[256];
+	sprintf(theBuffer, "scale: %.2f", theValue);
+	
+	return string(theBuffer);	
+	//return this->GetSliderDebugInfo();
+}
+
+void AvHScaleHandler::InitFromTemplate(const AvHParticleTemplate* inTemplate)
+{
+	int theValue = (int)(inTemplate->GetParticleScaling()*kScalar);
+	this->SetValue(theValue);
+	this->SetText(theValue);
+}
+
+// Generation rate
+void AvHGenerationRateHandler::ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue)
+{
+	int theGenerationRate = inValue/kScalar;
+	inTemplate->SetGenerationRate(theGenerationRate);
+//	Slider* theSlider;
+//	if(gHUD.GetManager().GetVGUIComponentNamed(kPSEScaleSlider, theSlider))
+//	{
+//		theSlider->setRangeWindow(true);
+//	  
+//		theSlider->setRangeWindow(inValue);
+//	}
+}
+
+string AvHGenerationRateHandler::GetTextFromValue(int inValue)
+{
+	char theBuffer[256];
+	sprintf(theBuffer, "gen rate: %d", (inValue/kScalar));
+	
+	return string(theBuffer);	
+	//return this->GetSliderDebugInfo();
+}
+
+void AvHGenerationRateHandler::InitFromTemplate(const AvHParticleTemplate* inTemplate)
+{
+	int theValue = inTemplate->GetGenerationRate()*kScalar;
+	this->SetValue(theValue);
+	this->SetText(theValue);
+}
+
+
+
+// Particle lifetime
+void AvHParticleLifetimeHandler::ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue)
+{
+	float theValue = inValue/(float)kScalar;
+	inTemplate->SetParticleLifetime(theValue);
+}
+
+string AvHParticleLifetimeHandler::GetTextFromValue(int inValue)
+{
+	float theValue = inValue/(float)kScalar;
+	
+	char theBuffer[256];
+	sprintf(theBuffer, "p life: %.1f", theValue);
+	
+	return string(theBuffer);	
+	//return this->GetSliderDebugInfo();
+}
+
+void AvHParticleLifetimeHandler::InitFromTemplate(const AvHParticleTemplate* inTemplate)
+{
+	int theValue = (int)(inTemplate->GetParticleLifetime()*kScalar);
+	this->SetValue(theValue);
+	this->SetText(theValue);
+}
+
+
+// Particle SYSTEM lifetime
+void AvHParticleSystemLifetimeHandler::ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue)
+{
+	if(this->mEditable)
+	{
+		float theValue = inValue/(float)kScalar;
+		inTemplate->SetParticleSystemLifetime(theValue);
+	}
+}
+
+string AvHParticleSystemLifetimeHandler::GetTextFromValue(int inValue)
+{
+	float theValue = inValue/(float)kScalar;
+	
+	char theBuffer[256];
+	if(this->mEditable)
+	{
+		sprintf(theBuffer, "ps life: %.1f", theValue);
+	}
+	else
+	{
+		sprintf(theBuffer, "ps can't die");
+	}
+	
+	return string(theBuffer);	
+	//return this->GetSliderDebugInfo();
+}
+
+void AvHParticleSystemLifetimeHandler::InitFromTemplate(const AvHParticleTemplate* inTemplate)
+{
+	int theValue = (int)(inTemplate->GetParticleSystemLifetime()*kScalar);
+	if(theValue > 0 || this->mEditable)
+	{
+		this->mEditable = true;
+		this->SetValue(theValue);
+		this->SetText(theValue);
+	}
+}
+
+
+// Max particles
+void AvHMaxParticlesHandler::ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue)
+{
+	int theMaxParticles = inValue/kScalar;
+	inTemplate->SetMaxParticles(theMaxParticles);
+}
+
+string AvHMaxParticlesHandler::GetTextFromValue(int inValue)
+{
+	char theBuffer[256];
+	sprintf(theBuffer, "max parts: %d", (inValue/kScalar));
+	
+	return string(theBuffer);	
+	//return this->GetSliderDebugInfo();
+}
+
+void AvHMaxParticlesHandler::InitFromTemplate(const AvHParticleTemplate* inTemplate)
+{
+	int theValue = inTemplate->GetMaxParticles()*kScalar;
+	this->SetValue(theValue);
+	this->SetText(theValue);
+}
+
+
+// Render mode
+void AvHDrawModeHandler::ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue)
+{
+	int theDrawMode = inValue/kScalar;
+	ASSERT(theDrawMode >= 0);
+	ASSERT(theDrawMode <= 5);
+
+	inTemplate->SetRenderMode(theDrawMode);
+}
+
+string AvHDrawModeHandler::GetTextFromValue(int inValue)
+{
+	string theString = "render: ";
+	
+	switch(inValue/kScalar)
+	{
+	case 0:
+		theString += "normal";
+		break;
+	case 1:
+		theString += "transColor";
+		break;
+	case 2:
+		theString += "transTexture";
+		break;
+	case 3:
+		theString += "glow";
+		break;
+	case 4:
+		theString += "transAlpha";
+		break;
+	case 5:
+		theString += "transAdd";
+		break;
+	}
+	return theString;
+	//return this->GetSliderDebugInfo();
+}
+
+void AvHDrawModeHandler::InitFromTemplate(const AvHParticleTemplate* inTemplate)
+{
+	int theValue = inTemplate->GetRenderMode()*kScalar;
+	this->SetValue(theValue);
+	this->SetText(theValue);
+}
+
+
+// Gen/Vel toggle
+void AvHGenVelToggleHandler::ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue)
+{
+	if(inValue < kScalar)
+	{
+		this->mGenVelMode = true;
+	}
+	else
+	{
+		this->mGenVelMode = false;
+	}
+
+//	// Trigger change
+//	gGenVelShapeHandler.InitFromTemplate(inTemplate);
+//	gGenVelParamNumHandler.InitFromTemplate(inTemplate);
+//	gGenVelParamsHandler.InitFromTemplate(inTemplate);
+}
+
+string AvHGenVelToggleHandler::GetTextFromValue(int inValue)
+{
+	string theString = "generation";
+
+	if(inValue >= kScalar)
+	{
+		theString = "velocity";
+	}
+		
+	return theString;
+	//return this->GetSliderDebugInfo();
+}
+
+void AvHGenVelToggleHandler::InitFromTemplate(const AvHParticleTemplate* inTemplate)
+{
+	// Assume edit generation shape to start
+	this->mGenVelMode = true;
+
+	this->SetValue(1);
+	this->SetText(1);
+}
+
+bool AvHGenVelToggleHandler::GetGenVelMode() const
+{
+	return this->mGenVelMode;
+}
+
+void AvHGenVelToggleHandler::RecomputeDependencies(AvHParticleTemplate* inReloadedTemplate)
+{
+	// Trigger change
+	gGenVelShapeHandler.InitFromTemplate(inReloadedTemplate);
+	gGenVelParamNumHandler.InitFromTemplate(inReloadedTemplate);
+	gGenVelParamsHandler.InitFromTemplate(inReloadedTemplate);
+}
+
+// GenVel shape
+void AvHGenVelShapeHandler::ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue)
+{
+	if(!this->mUsingEntity)
+	{
+		ParticleShape theShape = PS_Point;
+		switch(inValue/kScalar)
+		{
+		case 1:
+			theShape = PS_Point;
+			break;
+		case 2:
+			theShape = PS_Box;
+			break;
+		case 3:
+			theShape = PS_Sphere;
+			break;
+		case 4:
+			theShape = PS_Blob;
+			break;
+		default:
+			ASSERT(false);
+			break;
+			
+		}
+		if(gGenVelToggleHandler.GetGenVelMode())
+		{
+			inTemplate->SetGenerationShape(theShape);
+		}
+		else
+		{
+			inTemplate->SetStartingVelocityShape(theShape);
+		}
+	}
+}
+
+string AvHGenVelShapeHandler::GetTextFromValue(int inValue)
+{
+	string theShape;
+	if(this->mUsingEntity)
+	{
+		theShape = "Entity";
+	}
+	else
+	{
+		switch(inValue/kScalar)
+		{
+		default:
+		case 1:
+			theShape = "Point";
+			break;
+		case 2:
+			theShape = "Box";
+			break;
+		case 3:
+			theShape = "Sphere";
+			break;
+		case 4:
+			theShape = "Blob";
+			break;
+		}			
+	}
+	
+	return theShape;
+	//return this->GetSliderDebugInfo();
+}
+
+bool AvHGenVelShapeHandler::GetUsingEntity() const
+{
+	return this->mUsingEntity;
+}
+
+void AvHGenVelShapeHandler::InitFromTemplate(const AvHParticleTemplate* inTemplate)
+{
+	bool theIsInGenMode = gGenVelToggleHandler.GetGenVelMode();
+
+	int theGenerationEntityIndex = inTemplate->GetGenerationEntityIndex();
+	if((theGenerationEntityIndex == -1) || !theIsInGenMode)
+	{
+		this->mUsingEntity = false;
+
+		ShapeType theShape = inTemplate->GetGenerationShape();
+		if(!theIsInGenMode)
+		{
+			theShape = inTemplate->GetStartingVelocityShape();
+		}
+
+		int theShapeIndex = 0;
+	
+		switch((int)(theShape))
+		{
+		case 0:
+			theShapeIndex = 0;
+			break;
+		case 4:
+			theShapeIndex = 2;
+			break;
+		case 5:
+			theShapeIndex = 3;
+			break;
+		case 8:
+			theShapeIndex = 4;
+			break;
+		default:
+			ASSERT(false);
+			break;
+		}
+
+		int theValue = theShapeIndex*kScalar;
+		this->SetValue(theValue);
+		this->SetText(theValue);
+		
+		gGenVelParamsHandler.InitFromTemplate(inTemplate);
+	}
+	else
+	{
+		this->mUsingEntity = true;
+	}
+}
+
+
+// Param num
+void AvHGenVelParamNumHandler::ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue)
+{
+	this->mCurrentParamNum = (inValue/kScalar);
+	//gGenVelParamsHandler.InitFromTemplate(inTemplate);
+}
+
+int	AvHGenVelParamNumHandler::GetCurrentParamNum() const
+{
+	return this->mCurrentParamNum;
+}
+
+string AvHGenVelParamNumHandler::GetTextFromValue(int inValue)
+{
+	char theBuffer[256];
+	if(!gGenVelShapeHandler.GetUsingEntity())
+	{
+		sprintf(theBuffer, "param: %d", (inValue/kScalar));
+	}
+	else
+	{
+		sprintf(theBuffer, "<na>");
+	}
+	
+	return string(theBuffer);	
+	//return this->GetSliderDebugInfo();
+}
+
+void AvHGenVelParamNumHandler::InitFromTemplate(const AvHParticleTemplate* inTemplate)
+{
+	//	this->mCurrentParamNum = 1;
+}
+
+
+void AvHGenVelParamNumHandler::RecomputeDependencies(AvHParticleTemplate* inReloadedTemplate) 
+{
+	gGenVelParamsHandler.InitFromTemplate(inReloadedTemplate);
+}
+
+// GenVel params
+void AvHGenVelParamsHandler::ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue)
+{
+	int theValue = inValue/kScalar;
+	int theParamNum = gGenVelParamNumHandler.GetCurrentParamNum();
+	
+	if(theParamNum >= 1 && theParamNum <= 8)
+	{
+		this->mCurrentParams[theParamNum-1] = theValue;
+		if(gGenVelToggleHandler.GetGenVelMode())
+		{
+			inTemplate->SetGenerationParams(this->mCurrentParams);
+		}
+		else
+		{
+			inTemplate->SetStartingVelocityParams(this->mCurrentParams);
+		}
+	}
+}
+
+string AvHGenVelParamsHandler::GetTextFromValue(int inValue)
+{
+	string theParamString = "<na>";
+	if(!gGenVelShapeHandler.GetUsingEntity())
+	{
+		theParamString = "params:";
+		for(int i=0; i < 8; i++)
+		{
+			theParamString += " ";
+			theParamString += MakeStringFromInt(this->mCurrentParams[i]);
+		}
+	}	
+	return theParamString;
+	//return this->GetSliderDebugInfo();
+}
+
+void AvHGenVelParamsHandler::InitFromTemplate(const AvHParticleTemplate* inTemplate)
+{
+	inTemplate->GetGenerationParams(this->mCurrentParams);
+	if(!gGenVelToggleHandler.GetGenVelMode())
+	{
+		inTemplate->GetStartingVelocityParams(this->mCurrentParams);
+	}
+
+	int theCurrentParamNum = gGenVelParamNumHandler.GetCurrentParamNum();
+	int theValue = this->mCurrentParams[theCurrentParamNum-1]*kScalar;
+
+	this->SetValue(theValue);
+	this->SetText(theValue);
+}
+
diff --git a/main/source/mod/AvHParticleEditorHandler.h b/main/source/mod/AvHParticleEditorHandler.h
new file mode 100644
index 00000000..3e8e3050
--- /dev/null
+++ b/main/source/mod/AvHParticleEditorHandler.h
@@ -0,0 +1,209 @@
+#ifndef AVHPARTICLEEDITORHANDLER_H
+#define AVHPARTICLEEDITORHANDLER_H
+
+#include "types.h"
+#include <VGUI_InputSignal.h>
+#include <VGUI_IntChangeSignal.h>
+#include <VGUI_Slider.h>
+#include "mod/AvHParticleTemplate.h"
+
+using namespace vgui;
+
+class AvHParticleEditorHandler : public InputSignal
+{
+public:
+					AvHParticleEditorHandler();
+
+	static void		ToggleEdit();
+	static uint32	GetEditIndex();
+	static bool		GetInEditMode();
+	static void		InitHandlers();
+	static void		SetEditIndex(uint32 inIndex);
+	static void		Setup();
+	
+	virtual void	cursorMoved(int x,int y,Panel* panel);
+	virtual void	cursorEntered(Panel* panel) {}
+	virtual void	cursorExited(Panel* panel) {}
+	virtual void	mousePressed(MouseCode code,Panel* panel);
+	virtual void	mouseDoublePressed(MouseCode code,Panel* panel) {}
+	virtual void	mouseReleased(MouseCode code,Panel* panel);
+	virtual void	mouseWheeled(int delta,Panel* panel);
+	virtual void	keyPressed(KeyCode code,Panel* panel)  {}
+	virtual void	keyTyped(KeyCode code,Panel* panel)  {}
+	virtual void	keyReleased(KeyCode code,Panel* panel)  {}
+	virtual void	keyFocusTicked(Panel* panel)  {}
+
+private:
+	static uint32	sEditIndex;
+	static bool		sInEditMode;
+};
+
+class AvHSliderHandler : public IntChangeSignal
+{
+public:
+					AvHSliderHandler(const string& inSliderName, const string& inLabelName);
+				
+	virtual void	Init();
+	virtual void	intChanged(int value, Panel* panel);
+
+	virtual void	ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue) = 0;
+	virtual void	InitFromTemplate(const AvHParticleTemplate* inTemplate) = 0;
+
+	virtual string	GetSliderDebugInfo() const;
+
+	virtual string	GetTextFromValue(int inValue) = 0;
+
+	virtual bool	GetValue(int& outValue);
+
+	virtual void	RecomputeDependencies(AvHParticleTemplate* inReloadedTemplate) {}
+	
+	virtual void	SetText(int inValue);
+
+	virtual bool	Setup();
+
+	virtual void	SetValue(int inValue);
+	
+private:
+	string			mSliderName;
+	string			mLabelName;
+};
+
+class AvHSizeHandler : public AvHSliderHandler
+{
+public:
+					AvHSizeHandler(const string& inSliderName, const string& inLabelName) : AvHSliderHandler(inSliderName, inLabelName) {}
+	virtual void	ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue);
+	virtual string	GetTextFromValue(int inValue);
+	virtual void	InitFromTemplate(const AvHParticleTemplate* inTemplate);
+private:
+	static const int	kScalar;
+};
+
+class AvHScaleHandler : public AvHSliderHandler
+{
+public:
+					AvHScaleHandler(const string& inSliderName, const string& inLabelName) : AvHSliderHandler(inSliderName, inLabelName) {}
+	virtual void	ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue);
+	virtual string	GetTextFromValue(int inValue);
+	virtual void	InitFromTemplate(const AvHParticleTemplate* inTemplate);
+
+private:
+	static const int	kScalar;
+};
+
+class AvHGenerationRateHandler : public AvHSliderHandler
+{
+public:
+	AvHGenerationRateHandler(const string& inSliderName, const string& inLabelName) : AvHSliderHandler(inSliderName, inLabelName) {}
+	virtual void	ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue);
+	virtual string	GetTextFromValue(int inValue);
+	virtual void	InitFromTemplate(const AvHParticleTemplate* inTemplate);
+private:
+	static const int	kScalar;
+};
+
+class AvHParticleLifetimeHandler : public AvHSliderHandler
+{
+public:
+	AvHParticleLifetimeHandler(const string& inSliderName, const string& inLabelName) : AvHSliderHandler(inSliderName, inLabelName) {}
+	virtual void	ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue);
+	virtual string	GetTextFromValue(int inValue);
+	virtual void	InitFromTemplate(const AvHParticleTemplate* inTemplate);
+private:
+	static const int	kScalar;
+};
+
+class AvHParticleSystemLifetimeHandler : public AvHSliderHandler
+{
+public:
+	AvHParticleSystemLifetimeHandler(const string& inSliderName, const string& inLabelName) : AvHSliderHandler(inSliderName, inLabelName), mEditable(false) {}
+	virtual void	ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue);
+	virtual string	GetTextFromValue(int inValue);
+	virtual void	InitFromTemplate(const AvHParticleTemplate* inTemplate);
+private:
+	static const int	kScalar;
+	bool				mEditable;
+};
+
+class AvHMaxParticlesHandler : public AvHSliderHandler
+{
+public:
+	AvHMaxParticlesHandler(const string& inSliderName, const string& inLabelName) : AvHSliderHandler(inSliderName, inLabelName) {}
+	virtual void	ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue);
+	virtual string	GetTextFromValue(int inValue);
+	virtual void	InitFromTemplate(const AvHParticleTemplate* inTemplate);
+private:
+	static const int	kScalar;
+};
+
+class AvHDrawModeHandler : public AvHSliderHandler
+{
+public:
+	AvHDrawModeHandler(const string& inSliderName, const string& inLabelName) : AvHSliderHandler(inSliderName, inLabelName) {}
+	virtual void	ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue);
+	virtual string	GetTextFromValue(int inValue);
+	virtual void	InitFromTemplate(const AvHParticleTemplate* inTemplate);
+private:
+	static const int	kScalar;
+};
+
+class AvHGenVelToggleHandler : public AvHSliderHandler
+{
+public:
+	AvHGenVelToggleHandler(const string& inSliderName, const string& inLabelName) : AvHSliderHandler(inSliderName, inLabelName) { this->mGenVelMode = true; }
+	virtual void	ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue);
+	bool			GetGenVelMode() const;
+	virtual string	GetTextFromValue(int inValue);
+	virtual void	InitFromTemplate(const AvHParticleTemplate* inTemplate);
+	virtual void	RecomputeDependencies(AvHParticleTemplate* inReloadedTemplate);
+private:
+	bool				mGenVelMode;
+	static const int	kScalar;
+};
+
+class AvHGenVelShapeHandler : public AvHSliderHandler
+{
+public:
+	AvHGenVelShapeHandler(const string& inSliderName, const string& inLabelName) : AvHSliderHandler(inSliderName, inLabelName) { this->mCurrentShape = PS_Point; this->mUsingEntity = false; }
+	virtual void	ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue);
+	virtual string	GetTextFromValue(int inValue);
+	bool			GetUsingEntity() const;
+	virtual void	InitFromTemplate(const AvHParticleTemplate* inTemplate);
+	
+private:
+	ParticleShape		mCurrentShape;
+	bool				mUsingEntity;
+	static const int	kScalar;
+};
+
+class AvHGenVelParamNumHandler : public AvHSliderHandler
+{
+public:
+	AvHGenVelParamNumHandler(const string& inSliderName, const string& inLabelName) : AvHSliderHandler(inSliderName, inLabelName) { this->mCurrentParamNum = 1; }
+	virtual void	ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue);
+	int				GetCurrentParamNum() const;
+	virtual string	GetTextFromValue(int inValue);
+	virtual void	InitFromTemplate(const AvHParticleTemplate* inTemplate);
+	virtual void	RecomputeDependencies(AvHParticleTemplate* inReloadedTemplate);
+	
+private:
+	int					mCurrentParamNum;
+	static const int	kScalar;
+	
+};
+
+class AvHGenVelParamsHandler : public AvHSliderHandler
+{
+public:
+	AvHGenVelParamsHandler(const string& inSliderName, const string& inLabelName) : AvHSliderHandler(inSliderName, inLabelName) { memset(&this->mCurrentParams, 0, sizeof(this->mCurrentParams)); }
+	virtual void	ChangeTemplateFromValue(AvHParticleTemplate* inTemplate, int inValue);
+	virtual string	GetTextFromValue(int inValue);
+	virtual void	InitFromTemplate(const AvHParticleTemplate* inTemplate);
+private:
+	ParticleParams		mCurrentParams;
+	static const int	kScalar;
+	
+};
+
+
+#endif
diff --git a/main/source/mod/AvHParticleSystem.cpp b/main/source/mod/AvHParticleSystem.cpp
new file mode 100644
index 00000000..6c7478e1
--- /dev/null
+++ b/main/source/mod/AvHParticleSystem.cpp
@@ -0,0 +1,1130 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHParticleSystem.cpp $
+// $Date: 2002/10/24 21:34:32 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHParticleSystem.cpp,v $
+// Revision 1.20  2002/10/24 21:34:32  Flayra
+// - Tried to hunt down particle crash on changelevel, this is slightly cleaner though
+//
+// Revision 1.19  2002/10/16 01:03:04  Flayra
+// - Added new particle flag for particles to lie flat on ground ("faceup"), needed for scanner sweep
+//
+// Revision 1.18  2002/07/28 19:21:28  Flayra
+// - Balance changes after/during RC4a
+//
+// Revision 1.17  2002/07/25 16:57:59  flayra
+// - Linux changes
+//
+// Revision 1.16  2002/07/10 14:43:40  Flayra
+// - Visibility fixes (too many PSs drawing, now they expire when not visible for awhile), removed cl_particleinfo drawing
+//
+// Revision 1.15  2002/06/10 20:01:24  Flayra
+// - Updated extern references to drawing code (ugh)
+//
+// Revision 1.14  2002/05/28 17:58:44  Flayra
+// - Temporary fix for bast.  It was creating crazy amounts of particle systems and should be investigated immediately.
+//
+// Revision 1.13  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHParticleSystem.h"
+#include "mod/AvHParticleTemplate.h"
+
+#ifdef AVH_CLIENT
+  #include "cl_dll/cl_util.h"
+  #include "cl_dll/util_vector.h"
+  #include "common/renderingconst.h"
+  #include "common/const.h"
+  #include "engine/progdefs.h"
+  #include "engine/edict.h"
+  #include "pm_shared/pm_defs.h"
+  #include "engine/cdll_int.h"
+  #include "common/event_api.h"
+  #include "common/cl_entity.h"
+  #include "particles/particledefs.h"
+  #include "particles/p_vector.h"
+  #include "particles/papi.h"
+  #include "usercmd.h"
+  #include "pm_defs.h"
+  #include "pm_shared.h"
+  #include "pm_movevars.h"
+  #include "pm_debug.h"
+  #include "mod/AvHParticleSystemManager.h"
+  #include "cl_dll/ev_hldm.h"
+  #include "mod/AvHParticleTemplateClient.h"
+  extern AvHParticleTemplateListClient	gParticleTemplateList;
+  #include "mod/AvHClientVariables.h"
+  void DrawScaledHUDSprite(int inSpriteHandle, int inMode, int inRowsInSprite, int inX, int inY, int inWidth, int inHeight, int inForceSpriteFrame, float inStartU = 0.0f, float inStartV = 0.0f, float inEndU = 1.0f, float inEndV = 1.0f, float inRotateUVRadians = 0.0f, bool inUVWrapsOverFrames = false);
+  #include "mod/AvHClientUtil.h"
+#else
+  #include "extdll.h"
+  #include "util.h"
+  #include "particles/papi.h"
+
+  #ifdef WIN32
+  #include "common/cl_entity.h"
+  #endif
+
+#endif
+
+#include "util/MathUtil.h"
+
+
+const float kDefaultParticleSystemPhysicsUpdateRate = .05f;
+
+AvHParticleSystem::AvHParticleSystem(AvHParticleTemplate* inTemplate, uint32 inIndex)
+{
+	this->mTemplateIndex = inIndex;
+	this->mHandle = 0;
+	this->mGroup = 0;
+	this->mHasNormal = false;
+	this->mNormal.x = this->mNormal.y = this->mNormal.z = 0;
+
+	this->mGroupMaxParticles = inTemplate->GetMaxParticles();
+	this->mGroup = pGenParticleGroups(1, this->mGroupMaxParticles);
+	
+	#ifdef AVH_CLIENT
+	this->mSprite = 0;
+	#endif
+
+	memset(&this->mBaseEntityPos, 0, sizeof(this->mBaseEntityPos));
+	//this->mEntity = -1;
+	//memset(this->mOrigin, 0, sizeof(this->mOrigin));
+	memset(this->mGenerationEntityAbsMin, 0, sizeof(this->mGenerationEntityAbsMin));
+	memset(this->mGenerationEntityAbsMax, 0, sizeof(this->mGenerationEntityAbsMax));
+
+	this->mTimeCreated = -1;
+	this->mIsMarkedForDeletion = false;
+
+	this->mNumSpriteFrames = inTemplate->GetNumSpriteFrames();
+	this->mAnimationSpeed = inTemplate->GetAnimationSpeed();
+	
+	this->mGenerationEntityIndex = inTemplate->GetGenerationEntityIndex();
+	this->mGenerationEntityParam = inTemplate->GetGenerationEntityParameter();
+	this->mGenerationEntityVolumeFactor = 0.0f;
+	
+	this->mUpdateFirst = true;
+	this->mFadeIn = inTemplate->GetFadeIn();
+	this->mFadeOut = inTemplate->GetFadeOut();
+	this->mUseWorldGravity = inTemplate->GetUseWorldGravity();
+	inTemplate->GetGravity(this->mParticleGravity);
+	this->mUseDensity = inTemplate->GetUseDensity();
+	this->mUseTrisNotQuads = inTemplate->GetUseTrisNotQuads();
+	this->mMinimizeEdges = inTemplate->GetMinimizeEdges();
+	this->mMaxAlpha = inTemplate->GetMaxAlpha();
+	this->mConstrainPitch = inTemplate->GetConstrainPitch();
+	this->mFaceUp = inTemplate->GetFaceUp();
+	this->mCollide = inTemplate->GetCollide();
+	this->mParticleSystemIndexToGenerate = inTemplate->GetParticleSystemIndexToGenerate();
+
+	this->mHasGeneratedParticles = false;
+	this->mCustomData = 0;
+	
+#ifdef AVH_CLIENT
+	this->LoadSpriteIfNeeded(inTemplate);
+	this->mIsVisible = true;
+	this->mLastTimeVisibilitySetTrue = -1;
+#endif
+
+#ifdef AVH_SERVER
+	this->mTimeOfLastPhysicsUpdate = -1;
+	this->mPhysicsUpdateTime = kDefaultParticleSystemPhysicsUpdateRate;
+#endif
+
+	this->LoadFromTemplate(inTemplate);
+}
+
+#ifdef AVH_CLIENT
+//extern "C"
+//{
+	extern playermove_t* pmove;
+//}
+#endif
+
+void
+AvHParticleSystem::Collide(float inTime)
+{
+	#ifdef AVH_CLIENT
+	ParticleGroup* theCurrentGroup = pGetCurrentGroup();
+	if(theCurrentGroup)
+	{
+		// See which particles bounce.
+		for(int i = 0; i < theCurrentGroup->p_count; i++)
+		{
+			Particle& m = theCurrentGroup->list[i];
+			
+			// See if particle's current and next positions cross plane.
+			// If not, couldn't bounce, so keep going.
+			vec3_t pCurrent;
+			pCurrent[0] = m.pos.x;
+			pCurrent[1] = m.pos.y;
+			pCurrent[2] = m.pos.z;
+
+			pVector pnext(m.pos + m.vel * inTime);
+			vec3_t pNext;
+			pNext[0] = pnext.x;
+			pNext[1] = pnext.y;
+			pNext[2] = pnext.z;
+
+			struct pmtrace_s* trace = pmove->PM_TraceLine(pCurrent, pNext, PM_TRACELINE_ANYVISIBLE, 2 /*point sized hull*/, -1);
+			if(trace->fraction != 1.0)
+			{
+				// Play sound where particle hit 
+				//pmove->PM_PlaySound( CHAN_BODY, "player/pl_wade1.wav", 1, ATTN_NORM, 0, PITCH_NORM );
+				//EV_HLDM_DecalGunshot( trace, BULLET_PLAYER_9MM );
+
+				//if(gEngfuncs.pfnRandomLong( 0, 3 ) == 1)
+				//{
+				//	gEngfuncs.pEventAPI->EV_PlaySound(-1, trace->endpos, CHAN_AUTO, "drop.wav", .5f, ATTN_STATIC, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+				//}
+				
+				// Mark the particle for deletion
+				//m.age = -1;
+				theCurrentGroup->Remove(i);
+				
+				// Generate new particle system at point of impact, if specified
+				if(this->mParticleSystemIndexToGenerate != -1)
+				{
+					AvHParticleSystemManager::Instance()->CreateParticleSystem(this->mParticleSystemIndexToGenerate, trace->endpos);
+				}
+			}
+		}
+	}
+	#endif
+}
+
+void
+AvHParticleSystem::Draw(const pVector &inView)
+{
+	// only draw on client
+	#ifdef AVH_CLIENT
+	if(this->GetIsVisible())
+	{
+		AvHParticleTemplate* theTemplate = gParticleTemplateList.GetTemplateAtIndex(this->mTemplateIndex);
+		if(theTemplate)
+		{
+			string theParticleSystemName = theTemplate->GetName();
+
+			pCurrentGroup(this->mGroup);
+			
+			// Back face culling
+			gEngfuncs.pTriAPI->CullFace( TRI_FRONT );
+			
+			// Set render mode
+			gEngfuncs.pTriAPI->RenderMode( this->mRenderMode );
+			
+			// Draw it
+			this->DrawGroup(inView);
+			
+			// Reset render mode
+			gEngfuncs.pTriAPI->RenderMode( kRenderNormal );
+			
+		}
+	}
+	#endif
+}
+
+#ifdef AVH_CLIENT
+void
+AvHParticleSystem::DrawGroup(const pVector &inView)
+{
+	bool draw_tex = (this->mSprite != 0);
+	bool const_color = true;
+	bool const_size = false;
+	float size_scale = this->mParticleSize;
+
+	// Only support one group right now
+	int cnt = pGetGroupCount();
+	
+	if(cnt < 1)
+		return;
+
+    // TODO: Change these news to use vectors of maxParticleSize?  Get pGetParticleGroupRef working?
+	pVector *ppos = new pVector[cnt];
+	float* pAge = new float[cnt];
+	float *color = const_color ? NULL : new float[cnt * 4];
+	pVector *size = const_size ? NULL : new pVector[cnt];
+	pGetParticles(0, cnt, (float *)ppos, color, NULL, (float *)size, (float*)pAge);
+
+	//ParticleGroup* theParticleGroup = pGetParticleGroupRef(cnt - 1);
+	//if(!theParticleGroup)
+	//	return;
+	//
+	//pVector* ppos = NULL;
+	//float* color = NULL;
+	//pVector* size = NULL;
+
+	//ppos = &(theParticleGroup->list->pos);
+	//if(!const_color)
+	//	color = (float*)&(theParticleGroup->list->color);
+	//if(!const_size)
+	//	size = &(theParticleGroup->list->size);
+	
+	// Compute the vectors from the particle to the corners of its tri.
+	// 2
+	// |\      The particle is at the center of the x.
+	// |-\     V0, V1, and V2 go from there to the vertices.
+	// |x|\    The texcoords are (0,0), (2,0), and (0,2) respectively.
+	// 0-+-1   We clamp the texture so the rest is transparent.
+
+	pVector up(0, 0, 1);
+	pVector right = inView ^ up;
+	right.normalize();
+	pVector nup = right ^ inView;
+	//pVector nup = inView ^ right;
+
+	// The particles should face you unless constrained (this is for rain and the like)
+	if(this->mConstrainPitch)
+		nup = up;
+
+	// Particle should draw facing up
+	if(this->mFaceUp)
+	{
+		up = pVector(0, 1, 0);
+		right = pVector(-1, 0, 0);
+		nup  = pVector(0, -1, 0);
+	}
+
+	right *= size_scale/2.0f;
+	nup *= size_scale/2.0f;
+
+	// Quad draws v0, v1, v2, v3
+	//pVector V0 = -(right + nup);
+
+	// Lower left
+	pVector V0 = nup - right;
+
+	// Upper left
+	pVector V1 = -(right + nup);
+
+	// Upper right
+	pVector V2 = right - nup;
+
+	// Lower right
+	pVector V3 = right + nup;
+
+	// Tri draws v0, v4, v3
+	//pVector V4 = nup;
+	pVector V4 = -nup;
+
+	for(int i = 0; i < cnt; i++)
+	{
+		int theTextureOffsetToUse = 0;
+		float theAgeFactor = 0.0f;
+		float theParticleLifetime = this->GetParticleLifetime();
+		if(theParticleLifetime > 0)
+		{
+			// 0 - 1 value of nearness to death
+			theAgeFactor = pAge[i]/theParticleLifetime;
+
+			if(this->mNumSpriteFrames > 1)
+			{
+				// Read in number of frames, also read in speed so we can loop the same animation multiple times over their life!
+				int theNumSpriteFrames = this->mNumSpriteFrames;
+				theTextureOffsetToUse = this->mAnimationSpeed*(theAgeFactor)*(theNumSpriteFrames-1);
+				theTextureOffsetToUse = min(max(0, theTextureOffsetToUse), theNumSpriteFrames-1);
+			}
+		}
+
+		if(this->mSprite)
+		{
+			struct model_s* theSpriteModel = const_cast<struct model_s*>(gEngfuncs.GetSpritePointer(this->mSprite));
+			if(theSpriteModel && gEngfuncs.pTriAPI->SpriteTexture(theSpriteModel, theTextureOffsetToUse))
+			{
+				pVector &p = ppos[i];
+				
+				pVector sV0 = V0;
+				pVector sV1 = V1;
+				pVector sV2 = V2;
+				pVector sV3 = V3;
+				pVector sV4 = V4;
+				
+				if(this->GetParticleScale() != 1.0f && (theAgeFactor != 0.0f))
+				{
+					float theScaleFactor = 1 + (this->GetParticleScale() - 1)*theAgeFactor;
+					sV0 *= theScaleFactor;
+					sV1 *= theScaleFactor;
+					sV2 *= theScaleFactor;
+					sV3 *= theScaleFactor;
+					sV4 *= theScaleFactor;
+				}
+				
+				// Set alpha to max
+				float theAlpha = this->mMaxAlpha;
+				
+				// If the particles don't live forever and we can fade, calculate the alpha
+				if((this->mFadeIn || this->mFadeOut) && (theParticleLifetime > 0))
+				{
+					float theHalfLifetime = theParticleLifetime/2.0f;
+					if(this->mFadeIn && this->mFadeOut)
+						theAlpha = this->mMaxAlpha - this->mMaxAlpha*(fabs(pAge[i] - theHalfLifetime)/theHalfLifetime);
+					else if(this->mFadeIn)
+						theAlpha = this->mMaxAlpha*pAge[i]/theParticleLifetime;
+					else if(this->mFadeOut)
+						theAlpha = this->mMaxAlpha - this->mMaxAlpha*(pAge[i]/theParticleLifetime);
+					
+					theAlpha = max(min(this->mMaxAlpha, theAlpha), 0.0f);
+				}
+
+//				if(cl_particleinfo->value)
+//				{
+//					pVector theUpperLeftWorldPos = p + sV1;
+//					pVector theLowerRightWorldPos = p + sV3;
+//					pVector theUpperLeftScreenPos;
+//					pVector theLowerRightScreenPos;
+//
+//					AvHCUWorldToScreen((float*)&theUpperLeftWorldPos, (float*)&theUpperLeftScreenPos);
+//					AvHCUWorldToScreen((float*)&theLowerRightWorldPos, (float*)&theLowerRightScreenPos);
+//
+//					int theScreenX = theUpperLeftWorldPos.x;
+//					int theScreenY = theUpperLeftWorldPos.y;
+//					int theScreenWidth = theLowerRightScreenPos.x - theScreenX;
+//					int theScreenHeight = theLowerRightScreenPos.y - theScreenY;
+//
+//					DrawScaledHUDSprite(this->mSprite, this->mRenderMode, 1, theScreenX, theScreenY, theScreenWidth, theScreenHeight, theTextureOffsetToUse);
+//				}
+//				else
+//				{
+					if(this->mUseTrisNotQuads)
+					{
+						gEngfuncs.pTriAPI->Begin( TRI_TRIANGLES );
+						
+						gEngfuncs.pTriAPI->Color4f(1.0f, 1.0f, 1.0f, theAlpha);
+						
+						if(draw_tex) gEngfuncs.pTriAPI->TexCoord2f(0,0);
+						pVector ver = p + sV0;
+						gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+						
+						if(draw_tex) gEngfuncs.pTriAPI->TexCoord2f(.5,1);
+						ver = p + sV4;
+						gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+						
+						if(draw_tex) gEngfuncs.pTriAPI->TexCoord2f(1,0);
+						ver = p + sV3;
+						gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+						
+						gEngfuncs.pTriAPI->End();
+					}
+					else
+					{
+						gEngfuncs.pTriAPI->Begin( TRI_QUADS );
+						
+						gEngfuncs.pTriAPI->Color4f(1.0f, 1.0f, 1.0f, theAlpha);
+						
+						if(draw_tex) gEngfuncs.pTriAPI->TexCoord2f(0,0);
+						pVector ver = p + sV0;
+						gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+						
+						if(draw_tex) gEngfuncs.pTriAPI->TexCoord2f(1,0);
+						ver = p + sV3;
+						gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+						
+						if(draw_tex) gEngfuncs.pTriAPI->TexCoord2f(1,1);
+						ver = p + sV2;
+						gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+						
+						if(draw_tex) gEngfuncs.pTriAPI->TexCoord2f(0,1);
+						ver = p + sV1;
+						gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+						
+						gEngfuncs.pTriAPI->End();
+					}
+//				}
+			}
+		}
+	}
+
+	delete [] ppos;
+	if(color) delete [] color;
+	if(size) delete [] size;
+	if(pAge) delete [] pAge;
+}
+
+float AvHParticleSystem::GetLastTimeVisibilityLastSetTrue() const
+{
+	return this->mLastTimeVisibilitySetTrue;
+}
+
+#endif
+
+ParticleSystemHandle
+AvHParticleSystem::GetHandle() const
+{
+	return this->mHandle;
+}
+
+bool
+AvHParticleSystem::GetHasGeneratedParticles() const
+{
+	return this->mHasGeneratedParticles;
+}
+
+bool
+AvHParticleSystem::GetIsMarkedForDeletion(void) const
+{
+	return this->mIsMarkedForDeletion;
+}
+
+#ifdef AVH_CLIENT
+bool
+AvHParticleSystem::GetIsVisible() const
+{
+	return this->mIsVisible;
+}
+#endif
+
+int
+AvHParticleSystem::GetNumberOfParticles(void) const
+{
+	int theNumParticles = 0;
+
+	pCurrentGroup(this->mGroup);
+	theNumParticles = pGetGroupCount();
+
+	return theNumParticles;
+}
+
+float
+AvHParticleSystem::GetParticleSystemLifetime() const
+{
+	return this->mParticleSystemLifetime;
+}
+
+float
+AvHParticleSystem::GetParticleLifetime() const
+{
+	return this->mParticleLifetime + this->mCustomData*.2f;
+}
+
+uint32 
+AvHParticleSystem::GetTemplateIndex() const
+{
+	return this->mTemplateIndex;
+}
+
+float
+AvHParticleSystem::GetTimeCreated() const
+{
+	return this->mTimeCreated;
+}
+
+// Updating this function?  Change ::Update below for max particles?
+void
+AvHParticleSystem::Kill()
+{
+	//pCurrentGroup(this->mGroup);
+	pDeleteParticleGroups(this->mGroup);
+}
+
+void AvHParticleSystem::LoadFromTemplate(AvHParticleTemplate* inTemplate)
+{
+	this->mParticleSize = inTemplate->GetParticleSize();
+	this->mParticleScaling = inTemplate->GetParticleScaling();
+	this->mGenerationRate = inTemplate->GetGenerationRate();
+	this->mParticleLifetime = inTemplate->GetParticleLifetime();
+	this->mParticleSystemLifetime = inTemplate->GetParticleSystemLifetime();
+	this->mMaxParticles = inTemplate->GetMaxParticles();
+	this->mRenderMode = inTemplate->GetRenderMode();
+	this->mGenerationShape = inTemplate->GetGenerationShape();
+	inTemplate->GetGenerationParams(this->mGenerationParams);
+	this->mStartingVelocityShape = inTemplate->GetStartingVelocityShape();
+	inTemplate->GetStartingVelocityParams(this->mStartingVelocityParams);
+}
+
+#ifdef AVH_CLIENT
+void
+AvHParticleSystem::LoadSpriteIfNeeded(AvHParticleTemplate* inTemplate)
+{
+	if(!this->mSprite)
+	{
+		string theSprite = inTemplate->GetSprite();
+		if(theSprite != "")
+		{
+			this->mSprite = Safe_SPR_Load(theSprite.c_str());
+			if(this->mSprite != 0)
+			{
+				int theNumFrames = SPR_Frames(this->mSprite);
+				ASSERT(this->mNumSpriteFrames <= theNumFrames);
+			}
+			else			
+			{
+				char theErrorMessage[512];
+				sprintf(theErrorMessage, "Couldn't load sprite, deleting particle system: %s\n", theSprite.c_str());
+				DrawConsoleString(0, 0, theErrorMessage);
+				this->SetIsMarkedForDeletion();
+			}
+		}
+	}
+}
+#endif
+
+bool
+AvHParticleSystem::GetGenerationEntity(int &outIndex) const
+{
+	bool theSuccess = false;
+
+	if(this->mGenerationEntityIndex != -1)
+	{
+		outIndex = this->mGenerationEntityIndex;
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+//void
+//AvHParticleSystem::SetEntity(int inEntity)
+//{
+//	//this->mEntity = inEntity;
+//	this->mGenerationEntityIndex = inEntity;
+//}
+
+void
+AvHParticleSystem::SetHandle(ParticleSystemHandle inHandle)
+{
+	this->mHandle = inHandle;
+}
+
+void
+AvHParticleSystem::SetIsMarkedForDeletion(void)
+{
+	this->mIsMarkedForDeletion = true;
+}
+
+#ifdef AVH_CLIENT
+void
+AvHParticleSystem::SetIsVisible(bool inVisibilityState, float inTimeSet)
+{
+	this->mIsVisible = inVisibilityState;
+
+	if(inVisibilityState)
+	{
+		this->mLastTimeVisibilitySetTrue = inTimeSet;
+	}
+	
+	if(!this->mIsVisible)
+	{
+		AvHParticleTemplate* theTemplate = gParticleTemplateList.GetTemplateAtIndex(this->mTemplateIndex);
+		if(theTemplate)
+		{
+			string theParticleSystemName = theTemplate->GetName();
+			int a = 0;
+		}
+	}
+}
+#endif
+
+void AvHParticleSystem::SetNormal(const vec3_t& inOrigin)
+{
+	this->mHasNormal = true;
+	this->mNormal.x = inOrigin.x;
+	this->mNormal.y = inOrigin.y;
+	this->mNormal.z = inOrigin.z;
+}
+
+void
+AvHParticleSystem::SetParticleSystemLifetime(float inLifetime)
+{
+	this->mParticleSystemLifetime = inLifetime;
+}
+
+void
+AvHParticleSystem::SetParticleLifetime(float inLifetime)
+{
+	this->mParticleLifetime = inLifetime;
+}
+
+void
+AvHParticleSystem::SetPosition(vec3_t inOrigin)
+{
+	//memcpy(this->mOrigin, inOrigin, sizeof(vec3_t));
+	this->mBaseEntityPos.x = inOrigin.x;
+	this->mBaseEntityPos.y = inOrigin.y;
+	this->mBaseEntityPos.z = inOrigin.z;
+}
+
+void
+AvHParticleSystem::SetTimeCreated(float inTime)
+{
+	this->mTimeCreated = inTime;
+	
+	#ifdef AVH_CLIENT
+	if(this->mIsVisible)
+	{
+		this->mLastTimeVisibilitySetTrue = inTime;
+	}
+	#endif
+}
+
+void
+AvHParticleSystem::GenerateParticles(int inNumberParticles)
+{
+	PDomainEnum theDomain = (PDomainEnum)this->mGenerationShape;
+	if((inNumberParticles > 0) && (theDomain != PS_None))
+	{
+		ParticleParams theParams;
+		memset(theParams, 0, sizeof(ParticleParams));
+		float theEdgeInset = (this->mMinimizeEdges ? this->mParticleSize : 0.0f);
+		
+		if(this->mGenerationEntityIndex != -1)
+		{
+			if((theDomain == PS_Point) || (theDomain == PS_Blob) || (theDomain == PS_Sphere))
+			{
+				theParams[0] = (this->mGenerationEntityAbsMax[0] + this->mGenerationEntityAbsMin[0])/2.0f;
+				theParams[1] = (this->mGenerationEntityAbsMax[1] + this->mGenerationEntityAbsMin[1])/2.0f;
+				theParams[2] = (this->mGenerationEntityAbsMax[2] + this->mGenerationEntityAbsMin[2])/2.0f;
+
+				if(theDomain == PS_Blob)
+				{
+					theParams[3] = this->mGenerationEntityParam;
+				}
+				else if(theDomain == PS_Sphere)
+				{
+					float theRadius1 = fabs(this->mGenerationEntityAbsMax[0] - this->mGenerationEntityAbsMin[0])/2.0f;
+					theRadius1 = max(theRadius1 - theEdgeInset, 0);
+					float theRadius2 = this->mGenerationEntityParam;
+					theRadius2 = max(theRadius2 - theEdgeInset, 0);
+					theParams[3] = theRadius1;
+					theParams[4] = theRadius2;
+				}
+			}					  
+			else if(theDomain == PS_Box)
+			{
+				theParams[0] = this->mGenerationEntityAbsMin[0] + theEdgeInset;
+				theParams[1] = this->mGenerationEntityAbsMin[1] + theEdgeInset;
+				theParams[2] = this->mGenerationEntityAbsMin[2] + theEdgeInset;
+				theParams[3] = this->mGenerationEntityAbsMax[0] - theEdgeInset;
+				theParams[4] = this->mGenerationEntityAbsMax[1] - theEdgeInset;
+				theParams[5] = this->mGenerationEntityAbsMax[2] - theEdgeInset;
+			}
+		}
+		else
+		{
+			memcpy(theParams, this->mGenerationParams, sizeof(ParticleParams));
+
+			// Different domains have different meanings, generate points appropriately for each
+			if(theDomain == PS_Point)
+			{
+				theParams[0] += this->mBaseEntityPos.x;
+				theParams[1] += this->mBaseEntityPos.y;
+				theParams[2] += this->mBaseEntityPos.z;
+			}
+			else if((theDomain == PS_Cone) || (theDomain == PS_Box))
+			{
+				theParams[0] += this->mBaseEntityPos.x;
+				theParams[1] += this->mBaseEntityPos.y;
+				theParams[2] += this->mBaseEntityPos.z;
+				theParams[3] += this->mBaseEntityPos.x;
+				theParams[4] += this->mBaseEntityPos.y;
+				theParams[5] += this->mBaseEntityPos.z;
+			}
+		}
+
+		pSource(inNumberParticles, theDomain, theParams[0], theParams[1], theParams[2], theParams[3], theParams[4], theParams[5], theParams[6], theParams[7]);
+		this->mHasGeneratedParticles = true;
+	}
+}
+
+float AvHParticleSystem::GetParticleScale() const
+{
+	return this->mParticleScaling + this->mCustomData*.3f;
+}
+
+void AvHParticleSystem::SetCustomData(uint16 inCustomData)
+{
+	this->mCustomData = inCustomData;
+}
+
+void
+AvHParticleSystem::SetGenerationEntityExtents(vec3_t& inMin, vec3_t& inMax)
+{
+	ASSERT(inMin.x <= inMax.x);
+	ASSERT(inMin.y <= inMax.y);
+	ASSERT(inMin.z <= inMax.z);
+	
+	//memcpy(&this->mGenerationEntityAbsMin, &inMin, sizeof(vec3_t));
+	//memcpy(&this->mGenerationEntityAbsMax, &inMax, sizeof(vec3_t));
+	this->mGenerationEntityAbsMin.x = inMin.x;
+	this->mGenerationEntityAbsMin.y = inMin.y;
+	this->mGenerationEntityAbsMin.z = inMin.z;
+
+	this->mGenerationEntityAbsMax.x = inMax.x;
+	this->mGenerationEntityAbsMax.y = inMax.y;
+	this->mGenerationEntityAbsMax.z = inMax.z;
+	
+//	// Setting the generation entity also sets our base position
+////	this->mBaseEntityPos.x = (this->mGenerationEntityAbsMax[0] + this->mGenerationEntityAbsMin[0])/2.0f;
+////	this->mBaseEntityPos.y = (this->mGenerationEntityAbsMax[1] + this->mGenerationEntityAbsMin[1])/2.0f;
+////	this->mBaseEntityPos.z = (this->mGenerationEntityAbsMax[2] + this->mGenerationEntityAbsMin[2])/2.0f;
+//	this->mBaseEntityPos.x = (inMax.x + inMin.x)/2.0f;
+//	this->mBaseEntityPos.y = (inMax.y + inMin.y)/2.0f;
+//	this->mBaseEntityPos.z = (inMax.z + inMin.z)/2.0f;
+	
+	// Calculate approximate volume
+	float xDiff = fabs(this->mGenerationEntityAbsMax[0] - this->mGenerationEntityAbsMin[0]);
+	float yDiff = fabs(this->mGenerationEntityAbsMax[1] - this->mGenerationEntityAbsMin[1]);
+	float zDiff = fabs(this->mGenerationEntityAbsMax[2] - this->mGenerationEntityAbsMin[2]);
+	
+	this->mGenerationEntityVolumeFactor = (xDiff/100.0f)*(yDiff/100.0f)*(zDiff/100.0f);
+}
+
+void
+AvHParticleSystem::SetStartingVelocity()
+{
+	// Set starting velocity
+	PDomainEnum theDomain = (PDomainEnum)this->mStartingVelocityShape;
+	if(theDomain != PS_None)
+	{
+		// Attention: adding in mBaseEntityPos won't work for all domains...fix this up
+		pVelocityD(theDomain, this->mStartingVelocityParams[0], this->mStartingVelocityParams[1], this->mStartingVelocityParams[2], this->mStartingVelocityParams[3],
+			this->mStartingVelocityParams[4], this->mStartingVelocityParams[5], this->mStartingVelocityParams[6], this->mStartingVelocityParams[7]);
+	}
+}
+
+void
+AvHParticleSystem::Update(float inTime)
+{
+	// I could foresee problems with not updating unless we can see the system, so update always.  Check performance.
+	//#ifdef AVH_CLIENT
+	//if(this->GetIsVisible())
+	//{
+	//#endif
+		// If max particles changed, recreate particle group.  This should only happen during editing, so if
+		// it's a bit flaky or we lose memory or have glitches it might be OK
+		if(this->mGroupMaxParticles != this->mMaxParticles)
+		{
+			this->Kill();
+			
+			this->mGroupMaxParticles = this->mMaxParticles;
+			this->mGroup = pGenParticleGroups(1, this->mGroupMaxParticles);
+			
+			this->mUpdateFirst = true;
+		}
+		
+		// Set the current particle group
+		pCurrentGroup(this->mGroup);
+		
+		//this->UpdateFromWorld();
+		
+		if(this->mUpdateFirst)
+		{
+			this->UpdateFirst();
+			this->mUpdateFirst = false;
+		}
+		
+		// TODO: There should be nine params, not eight
+		// TODO: Some of this stuff should only be set once at creation
+		
+		// Set time passed
+		pTimeStep((float)inTime);
+		
+		// Generate particles as long as the system is alive
+		if(!this->GetIsMarkedForDeletion())
+		{
+			// Generate particles based on rate or density
+			int theGenerationRate = this->mGenerationRate + 15*this->mCustomData;
+			int theNumParticlesToGenerate = (this->mUseDensity ? this->mGenerationEntityVolumeFactor*theGenerationRate : theGenerationRate);
+			this->SetStartingVelocity();
+			this->GenerateParticles(theNumParticlesToGenerate);
+		}
+		
+		// Gravity.
+		if(this->mUseWorldGravity)
+		{
+			// Apply world gravity to particles
+			float flGravity = CVAR_GET_FLOAT( "sv_gravity" );
+			this->mParticleGravity[2] = -flGravity;
+		}
+		pGravity(this->mParticleGravity[0], this->mParticleGravity[1], this->mParticleGravity[2]);
+		
+		// Kill off particles that have lived their life
+		if(this->GetParticleLifetime() != -1)
+		{
+			pKillOld(this->GetParticleLifetime());
+		}
+		
+		// Kill particles that were marked for deletion
+		pKillOld(0, true);
+		
+		if(this->mCollide)
+		{
+			this->Collide(inTime);
+		}
+		
+		//if(this->mVortex)
+		//{
+		//	pVortex(this->mBaseEntityPos.x, this->mBaseEntityPos.y, this->mBaseEntityPos.z, 0, 0, 1, 10, P_EPS, 300);
+		//}
+		
+		// Move particles to their new positions.
+		pMove();
+		
+		//#ifdef AVH_CLIENT
+		//	}
+		//#endif
+}
+
+#ifdef AVH_SERVER
+void
+AvHParticleSystem::UpdatePhysics(entvars_t* inPEV)
+{
+	ASSERT(inPEV);
+	float theCurrentTime = (float)gpGlobals->time;
+
+	// First thing, either update the particle system entity postion with the generation entity, or update ourself with 
+	// the position of the entity (for particle systems that don't use generation entities)
+	if(this->mGenerationEntityIndex != -1)
+	{
+		// Set position of particle system entity to be at the center of the generation entity
+		entvars_t* theEntity = VARS(INDEXENT(this->mGenerationEntityIndex));
+		if(!FNullEnt(theEntity))
+		{
+			// I don't understand why theEntity->origin isn't the center of theEntity->absmin and theEntity->absmax.
+			vec3_t theEntityOrigin;
+			theEntityOrigin.x = (theEntity->absmin.x + theEntity->absmax.x)/2.0f;
+			theEntityOrigin.y = (theEntity->absmin.y + theEntity->absmax.y)/2.0f;
+			theEntityOrigin.z = (theEntity->absmin.z + theEntity->absmax.z)/2.0f;
+
+			UTIL_SetOrigin(inPEV, theEntityOrigin);
+
+			// Update our bounding area
+			this->SetGenerationEntityExtents(theEntity->absmin, theEntity->absmax);
+		}
+	} 
+	// Now update our position from entity.  When the particle system doesn't use a generation entity, the 
+	// position of the particle system is given by the "parent" entity.  Otherwise, our base entity position
+	// is given from the position of our generation entity
+	else
+	{
+		this->mBaseEntityPos.x = inPEV->origin.x;
+		this->mBaseEntityPos.y = inPEV->origin.y;
+		this->mBaseEntityPos.z = inPEV->origin.z;
+	}
+	
+	// Every x seconds, update bounding box
+	if((this->mTimeOfLastPhysicsUpdate == -1) || (theCurrentTime > this->mTimeOfLastPhysicsUpdate + this->mPhysicsUpdateTime))
+	{
+		// Only support one group right now
+		pCurrentGroup(this->mGroup);
+		
+		int theNumParticles = pGetGroupCount();
+		if(theNumParticles >= 1)
+		{
+			// Get all the particles
+			pVector* pPos = new pVector[theNumParticles];
+			pGetParticles(0, theNumParticles, (float*)pPos, NULL, NULL, NULL, NULL);
+			
+			// Make the default size bigger than a point
+			vec3_t theDefaultRadius(64, 64, 64);
+			vec3_t theMinCoord = inPEV->origin - theDefaultRadius;
+			vec3_t theMaxCoord = inPEV->origin + theDefaultRadius;
+
+			// Now set the size of the particle system.
+//			if(this->mGenerationEntityIndex != -1)
+//			{
+//				theMinCoord = this->mGenerationEntityAbsMin;
+//				theMaxCoord = this->mGenerationEntityAbsMax;
+//			} 
+			
+			// Run through particles (choose only every nth one?)
+			for(int i = 0; i < theNumParticles; i++)
+			{
+				// Get position of each, change the bounding box accordingly
+				pVector& theParticle = pPos[i];
+
+				float theX = theParticle.x;
+				float theY = theParticle.y;
+				float theZ = theParticle.z;
+
+				// Assumes particles are at max size
+				float theHalfSize = this->GetParticleScale()*(this->mParticleSize/2.0f);
+
+				theMinCoord[0] = min(theMinCoord[0], (theX - theHalfSize));
+				theMinCoord[1] = min(theMinCoord[1], (theY - theHalfSize));
+				theMinCoord[2] = min(theMinCoord[2], (theZ - theHalfSize));
+
+				theMaxCoord[0] = max(theMaxCoord[0], (theX + theHalfSize));
+				theMaxCoord[1] = max(theMaxCoord[1], (theY + theHalfSize));
+				theMaxCoord[2] = max(theMaxCoord[2], (theZ + theHalfSize));
+			}
+
+			// Set our new size
+			vec3_t theMinSize = theMinCoord - inPEV->origin;
+			vec3_t theMaxSize = theMaxCoord - inPEV->origin;
+			UTIL_SetSize(inPEV, theMinSize, theMaxSize);
+
+			// Update time
+			this->mTimeOfLastPhysicsUpdate = theCurrentTime;
+
+			delete [] pPos;
+		}
+	}
+
+//	// Now update our position from entity.  When the particle system doesn't use a generation entity, the 
+//	// position of the particle system is given by the "parent" entity.  Otherwise, our base entity position
+//	// is given from the position of our generation entity
+//	if(this->mGenerationEntityIndex == -1)
+//	{
+//		this->mBaseEntityPos.x = inPEV->origin.x;
+//		this->mBaseEntityPos.y = inPEV->origin.y;
+//		this->mBaseEntityPos.z = inPEV->origin.z;
+//	}
+//	else
+//	{
+//		//entvars_t* theEntity = VARS(INDEXENT(this->mEntity));
+//		entvars_t* theEntity = VARS(INDEXENT(this->mGenerationEntityIndex));
+//		if(!FNullEnt(theEntity))
+//		//if(theEntity)
+//		{
+//			// Set position to center of entity bounding box
+//			this->SetGenerationEntityExtents(theEntity->absmin, theEntity->absmax);
+//			
+//			// Update "parent" entity to follow the generation entity
+//			inPEV->origin.x = this->mBaseEntityPos.x;
+//			inPEV->origin.y = this->mBaseEntityPos.y;
+//			inPEV->origin.z = this->mBaseEntityPos.z;
+//		}
+//	}
+}
+#endif
+
+
+void
+AvHParticleSystem::UpdateFirst()
+{
+	this->SetStartingVelocity();
+	
+	//  Set size
+	pSize(this->mParticleSize);
+
+	// Set initial lifetime to be random so we don't have a huge mass of particles dying at once
+	int theParticleLifetime = this->GetParticleLifetime();
+	if(theParticleLifetime > 0)
+	{
+		pStartingAge(theParticleLifetime/2.0f, theParticleLifetime/2.0f);
+	}
+	
+	// Why was this here?
+	//int theNumParticles = inTemplate->GetMaxParticles();
+	//ASSERT(theNumParticles > 0);
+	//this->GenerateParticles(theNumParticles);
+	
+	// Reset starting age
+	if(theParticleLifetime > 0)
+	{
+		pStartingAge(0.0f, 0.0f);
+	}
+	
+	if(this->mHasNormal)
+	{
+		// Assumes that 0, 0, 1 is the base (ie, particle systems were defined assuming that they hit a normal of 0,0,1)
+
+		PDomainEnum theGenDomain = (PDomainEnum)this->mGenerationShape;
+
+		Vector theXAxis, theYAxis;
+		CreateOrthoNormalBasis(this->mNormal, theXAxis, theYAxis);
+
+		if((theGenDomain == PS_Point) || (theGenDomain == PS_Blob) || (theGenDomain == PS_Sphere) || (theGenDomain == PS_Box))
+		{
+			// Rotate the first three parameters as a point
+			vec3_t theGenerationVector((float)this->mGenerationParams[0], (float)this->mGenerationParams[1], (float)this->mGenerationParams[2]);
+			TransformVector(theGenerationVector, theXAxis, theYAxis, this->mNormal, theGenerationVector);
+			this->mGenerationParams[0] = (int)(theGenerationVector.x);
+			this->mGenerationParams[1] = (int)(theGenerationVector.y);
+			this->mGenerationParams[2] = (int)(theGenerationVector.z);
+		}
+
+		if((theGenDomain == PS_Box) || (theGenDomain == PS_Cone))
+		{
+			// Rotate the second three parameters as a point
+			vec3_t theGenerationVector((float)this->mGenerationParams[3], (float)this->mGenerationParams[4], (float)this->mGenerationParams[5]);
+			TransformVector(theGenerationVector, theXAxis, theYAxis, this->mNormal, theGenerationVector);
+			this->mGenerationParams[3] = (int)(theGenerationVector.x);
+			this->mGenerationParams[4] = (int)(theGenerationVector.y);
+			this->mGenerationParams[5] = (int)(theGenerationVector.z);
+		}
+
+		// If a normal was specified, rotate the starting velocity params by this amount
+		PDomainEnum theVelDomain = (PDomainEnum)this->mStartingVelocityShape;
+		if((theVelDomain == PS_Point) || (theVelDomain == PS_Blob) || (theVelDomain == PS_Sphere) || (theVelDomain == PS_Box))
+		{
+			// Rotate the first three parameters as a point
+			vec3_t theStartingVelocityVector((float)this->mStartingVelocityParams[0], (float)this->mStartingVelocityParams[1], (float)this->mStartingVelocityParams[2]);
+			TransformVector(theStartingVelocityVector, theXAxis, theYAxis, this->mNormal, theStartingVelocityVector);
+			this->mStartingVelocityParams[0] = (int)(theStartingVelocityVector.x);
+			this->mStartingVelocityParams[1] = (int)(theStartingVelocityVector.y);
+			this->mStartingVelocityParams[2] = (int)(theStartingVelocityVector.z);
+		}
+		
+		if((theVelDomain == PS_Box) || (theVelDomain == PS_Cone))
+		{
+			// Rotate the second three parameters as a point
+			vec3_t theStartingVelocityVector((float)this->mStartingVelocityParams[3], (float)this->mStartingVelocityParams[4], (float)this->mStartingVelocityParams[5]);
+			TransformVector(theStartingVelocityVector, theXAxis, theYAxis, this->mNormal, theStartingVelocityVector);
+			this->mStartingVelocityParams[3] = (int)(theStartingVelocityVector.x);
+			this->mStartingVelocityParams[4] = (int)(theStartingVelocityVector.y);
+			this->mStartingVelocityParams[5] = (int)(theStartingVelocityVector.z);
+		}
+	}
+}
+
+//void
+//AvHParticleSystem::UpdateFromWorld()
+//{
+////	if(this->mEntity != -1)
+////	{
+////#ifdef AVH_CLIENT
+////
+////		cl_entity_s* theEntity = gEngfuncs.GetEntityByIndex(this->mEntity);
+////		if(theEntity)
+////		{
+////			// Set position to center of entity bounding box
+////			this->mBaseEntityPos.x = theEntity->origin.x;
+////			this->mBaseEntityPos.y = theEntity->origin.y;
+////			this->mBaseEntityPos.z = theEntity->origin.z;
+////		}
+////
+////		// Update generation entity if there is one
+////		if(this->mGenerationEntityIndex != -1)
+////		{
+////			theEntity = gEngfuncs.GetEntityByIndex(this->mGenerationEntityIndex);
+////			if(theEntity)
+////			{
+////				this->SetGenerationEntityExtents(theEntity->curstate.mins, theEntity->curstate.mins);
+////			}
+////		}
+////		
+////#else
+//		
+//		entvars_t* theEntity = VARS(INDEXENT(this->mEntity));
+//		if(theEntity)
+//		{
+//			// Set position to center of entity bounding box
+//			this->SetGenerationEntityExtents(theEntity->absmin, theEntity->absmax);
+//			
+//			this->mBaseEntityPos.x = (this->mGenerationEntityAbsMax[0] + this->mGenerationEntityAbsMin[0])/2.0f;
+//			this->mBaseEntityPos.y = (this->mGenerationEntityAbsMax[1] + this->mGenerationEntityAbsMin[1])/2.0f;
+//			this->mBaseEntityPos.z = (this->mGenerationEntityAbsMax[2] + this->mGenerationEntityAbsMin[2])/2.0f;
+//		}
+//		
+////#endif
+////	}
+////	else
+////	{
+////		this->mBaseEntityPos.x = this->mOrigin[0];
+////		this->mBaseEntityPos.y = this->mOrigin[1];
+////		this->mBaseEntityPos.z = this->mOrigin[2];
+////	}
+//}
+
+
diff --git a/main/source/mod/AvHParticleSystem.h b/main/source/mod/AvHParticleSystem.h
new file mode 100644
index 00000000..c1915b3b
--- /dev/null
+++ b/main/source/mod/AvHParticleSystem.h
@@ -0,0 +1,208 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHParticleSystem.h $
+// $Date: 2002/10/16 01:03:04 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHParticleSystem.h,v $
+// Revision 1.11  2002/10/16 01:03:04  Flayra
+// - Added new particle flag for particles to lie flat on ground ("faceup"), needed for scanner sweep
+//
+// Revision 1.10  2002/07/10 14:43:40  Flayra
+// - Visibility fixes (too many PSs drawing, now they expire when not visible for awhile), removed cl_particleinfo drawing
+//
+//===============================================================================
+#ifndef AVH_PARTICLESYSTEM_H
+#define AVH_PARTICLESYSTEM_H
+
+#include "util/nowarnings.h"
+#include "types.h"
+
+#ifdef AVH_CLIENT
+#include "common/triangleapi.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#else
+  #include "extdll.h"
+#endif
+
+#include "particles/p_vector.h"
+#include "mod/AvHParticleTemplate.h"
+
+typedef uint32 ParticleSystemHandle;
+
+class AvHParticleTemplate;
+
+// Represents an instantiated, active particle system
+class AvHParticleSystem
+{
+public:
+							AvHParticleSystem(AvHParticleTemplate* inTemplate, uint32 inIndex);
+
+	void					Draw(const pVector &inView);
+
+	ParticleSystemHandle	GetHandle() const;
+
+	bool					GetHasGeneratedParticles() const;
+
+	bool					GetIsMarkedForDeletion(void) const;
+
+	#ifdef AVH_CLIENT
+	float					GetLastTimeVisibilityLastSetTrue() const;
+	
+	bool					GetIsVisible() const;
+	#endif
+
+	int						GetNumberOfParticles(void) const;
+
+	float					GetParticleSystemLifetime() const;
+
+	float					GetParticleLifetime() const;
+
+	uint32					GetTemplateIndex() const;
+
+	float					GetTimeCreated() const;
+
+	void					Kill();
+
+	void					LoadFromTemplate(AvHParticleTemplate* inTemplate);
+
+	bool					GetGenerationEntity(int& outIndex) const;
+	//void					SetEntity(int inEntity);
+
+	void					SetCustomData(uint16 inCustomData);
+
+	void					SetGenerationEntityExtents(vec3_t& inMin, vec3_t& inMax);
+
+	void					SetHandle(ParticleSystemHandle inHandle);
+
+	void					SetIsMarkedForDeletion(void);
+
+	#ifdef AVH_CLIENT
+	void					SetIsVisible(bool inVisibilityState, float inTime);
+	#endif
+
+	void					SetNormal(const vec3_t& inOrigin);
+	
+	void					SetParticleSystemLifetime(float inLifetime);
+
+	void					SetParticleLifetime(float inLifetime);
+
+	void					SetPosition(vec3_t inOrigin);
+
+	void					SetTimeCreated(float inTime);
+
+	void					Update(float inTime);
+
+	#ifdef AVH_SERVER
+	void					UpdatePhysics(entvars_t* inPEV);
+	#endif
+	
+private:
+
+	void					Collide(float inTime);
+
+	#ifdef AVH_CLIENT
+	void					DrawGroup(const pVector &inView);
+
+	void					LoadSpriteIfNeeded(AvHParticleTemplate* inTemplate);
+	#endif
+
+	void					GenerateParticles(int inNumberParticles);
+
+	float					GetParticleScale() const;
+
+	void					SetStartingVelocity();
+	
+	void					UpdateFromWorld();
+
+	void					UpdateFirst();
+
+	uint32					mGroup;
+
+	uint32					mTemplateIndex;
+
+	ParticleSystemHandle	mHandle;
+
+	pVector					mBaseEntityPos;
+
+	#ifdef AVH_CLIENT
+	HSPRITE					mSprite;
+	bool					mIsVisible;
+	float					mLastTimeVisibilitySetTrue;
+	#endif
+
+	#ifdef AVH_SERVER
+	float					mTimeOfLastPhysicsUpdate;
+	float					mPhysicsUpdateTime;
+	#endif
+
+	//int						mEntity;
+
+	//vec3_t					mOrigin;
+
+	float					mTimeCreated;
+
+	float					mParticleSystemLifetime;
+
+	float					mParticleLifetime;
+
+	bool					mIsMarkedForDeletion;
+
+	int						mNumSpriteFrames;
+
+	float					mAnimationSpeed;
+
+	float					mParticleScaling;
+
+	int						mRenderMode;
+
+	bool					mFadeIn;
+	bool					mFadeOut;
+	bool					mUseWorldGravity;
+	bool					mUseDensity;
+	bool					mUseTrisNotQuads;
+	bool					mMinimizeEdges;
+	bool					mConstrainPitch;
+	bool					mFaceUp;
+	bool					mCollide;
+
+	int						mParticleSystemIndexToGenerate;
+
+	ShapeType				mGenerationShape;
+	ParticleParams			mGenerationParams;
+	int						mGenerationEntityIndex;
+	int						mGenerationRate;
+	float					mGenerationEntityParam;
+	float					mGenerationEntityVolumeFactor;
+	float					mParticleSize;
+	float					mMaxAlpha;
+	bool					mHasGeneratedParticles;
+	PSVector				mParticleGravity;
+
+	int						mGroupMaxParticles;
+	int						mMaxParticles;
+
+	vec3_t					mGenerationEntityAbsMin;
+	vec3_t					mGenerationEntityAbsMax;
+
+	ShapeType				mStartingVelocityShape;
+	ParticleParams			mStartingVelocityParams;
+
+	bool					mHasNormal;
+	vec3_t					mNormal;
+
+	bool					mUpdateFirst;
+
+	uint16					mCustomData;
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHParticleSystemEntity.cpp b/main/source/mod/AvHParticleSystemEntity.cpp
new file mode 100644
index 00000000..19fc5a58
--- /dev/null
+++ b/main/source/mod/AvHParticleSystemEntity.cpp
@@ -0,0 +1,520 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHParticleSystemEntity.cpp $
+// $Date: 2002/11/22 21:28:16 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHParticleSystemEntity.cpp,v $
+// Revision 1.13  2002/11/22 21:28:16  Flayra
+// - mp_consistency changes
+//
+// Revision 1.12  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "util/nowarnings.h"
+#include "mod/AvHParticleSystemEntity.h"
+#include "mod/AvHParticleTemplateServer.h"
+#include "mod/AvHParticleSystemManager.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "mod/AvHSpecials.h"
+#include "mod/AvHParticleTemplate.h"
+#include "mod/AvHParticleConstants.h"
+
+extern AvHParticleTemplateListServer	gParticleTemplateList;
+extern int gmsgCreateTempParticleSystem;
+extern int gmsgDestroyTempParticleSystem;
+
+uint32 AvHParticleSystemEntity::sCurrentHandle = 1;
+const float kDefaultParticleSystemThinkRate = 0.05f;
+
+LINK_ENTITY_TO_CLASS( keParticles, AvHParticleSystemEntity );
+LINK_ENTITY_TO_CLASS( keParticlesCustom, AvHCustomParticleSystemEntity );
+
+AvHParticleSystemEntity::AvHParticleSystemEntity()
+{
+	this->mTemplateIndex = -1;
+	this->mIsOn = false;
+	//this->mClientIsOn = false;
+	this->mUseState = false;
+	this->mHandle = 0;
+	this->mCreatedTemplate = false;
+	this->mTimeParticlesCreated = 0;
+	this->mCustomData = 0;
+}
+
+void AvHParticleSystemEntity::SetTemplateIndex(int inTemplateIndex)
+{
+	this->mTemplateIndex = inTemplateIndex;
+}
+
+uint16 AvHParticleSystemEntity::GetCustomData() const
+{
+	return this->mCustomData;
+}
+
+void AvHParticleSystemEntity::SetCustomData(uint16 inCustomData)
+{
+	this->mCustomData = inCustomData;
+	this->pev->weaponmodel = this->mCustomData;
+}
+
+
+// Fetch template if we have a valid template index, create a new custom template if we don't
+AvHParticleTemplate*
+AvHParticleSystemEntity::GetCustomTemplate()
+{
+	AvHParticleTemplate* theTemplate = NULL;
+
+	if(!this->mCreatedTemplate)
+	{
+		if(this->mTemplateIndex == -1)
+		{
+			// Create a new template, none was specified in the name field
+			ASSERT(!this->mCreatedTemplate);
+			this->mTemplateIndex = gParticleTemplateList.CreateTemplateFromIndex();
+		}
+		//else
+		//{
+		//	// Create a template from our existing base template
+		//	this->mTemplateIndex = gParticleTemplateList.CreateTemplateFromIndex(this->mTemplateIndex);
+		//}
+		
+		// Set the name of our new custom particle system
+		theTemplate = gParticleTemplateList.GetTemplateAtIndex(this->mTemplateIndex);
+		ASSERT(theTemplate);
+		string theName = STRING(this->pev->targetname);
+		theTemplate->SetName(theName);
+		
+		this->mCreatedTemplate = true;
+	}
+	
+	ASSERT(this->mTemplateIndex != -1);
+	if(!theTemplate)
+		theTemplate = gParticleTemplateList.GetTemplateAtIndex(this->mTemplateIndex);
+	
+	return theTemplate;
+}
+
+void
+AvHParticleSystemEntity::KeyValue( KeyValueData* inPkvd )
+{
+	if(FStrEq(inPkvd->szKeyName, kpscSystemName))
+	{
+		uint32	theIndex;
+		if(gParticleTemplateList.GetTemplateIndexWithName(inPkvd->szValue, theIndex))
+		{
+			this->mTemplateIndex = theIndex;
+			inPkvd->fHandled = TRUE;
+		}
+	}
+	else
+	{
+		// Call down to base class
+		CBaseEntity::KeyValue(inPkvd);
+	}
+}
+
+void
+AvHParticleSystemEntity::ParticleThink()
+{
+	this->UpdateClientData();
+	
+	// Look up particle system
+	AvHParticleSystem* theParticleSystem = AvHParticleSystemManager::Instance()->GetParticleSystem(this->mHandle);
+	if(theParticleSystem)
+	{
+		// Call UpdatePhysics()
+		theParticleSystem->UpdatePhysics(this->pev);
+
+		// The actual entity's position is the regular position of the entity, unless it's using a generaton entity, then use it instead
+		//theParticleSystem->GetEffectiveOrigin(this->pev->origin);
+		////UTIL_SetOrigin(this->pev, theGenerationEntityOrigin);
+	}
+
+	this->pev->nextthink = gpGlobals->time + kDefaultParticleSystemThinkRate;
+}
+
+void
+AvHParticleSystemEntity::ParticleTouch( CBaseEntity* /*pOther*/ )
+{
+	//EMIT_SOUND(ENT(pev), CHAN_VOICE, "buttons/spark1.wav", 1.0f, ATTN_NORM);
+}
+
+void
+AvHParticleSystemEntity::ParticleUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	switch(useType)
+	{
+	case USE_OFF:
+		this->mUseState = false;
+		break;
+
+	case USE_ON:
+		this->mUseState = true;
+		break;
+
+	case USE_SET:
+		// Handle this?
+		break;
+
+	case USE_TOGGLE:
+		this->mUseState = !this->mUseState;
+		break;
+	}
+}
+
+void 
+AvHParticleSystemEntity::Precache(void)
+{
+	CBaseEntity::Precache();
+	PRECACHE_UNMODIFIED_MODEL(kNullModel);
+}
+
+void AvHParticleSystemEntity::SetUseState(USE_TYPE inUseType)
+{
+	this->ParticleUse(NULL, NULL, inUseType, 0.0f);
+}
+
+void
+AvHParticleSystemEntity::Spawn( void )
+{
+	// Just in case our class derives off of something else in the future
+	CBaseEntity::Spawn();
+	
+	this->Precache();
+	
+	this->pev->classname = MAKE_STRING(kesParticlesCustom);
+	this->pev->solid = SOLID_NOT;
+	this->pev->movetype = MOVETYPE_NONE;
+	//this->pev->movetype = MOVETYPE_PUSH;
+	//this->pev->effects = EF_BRIGHTLIGHT;
+	
+	this->SetTouch(&AvHParticleSystemEntity::ParticleTouch);
+	this->SetUse(&AvHParticleSystemEntity::ParticleUse);
+	
+	SET_MODEL(ENT(this->pev), kNullModel);
+	UTIL_SetOrigin(this->pev, this->pev->origin);
+	
+	// Set the other flags
+	AvHParticleTemplate* theTemplate = gParticleTemplateList.GetTemplateAtIndex(this->mTemplateIndex);
+	//ASSERT(theTemplate);
+	if(theTemplate)
+	{
+		//theTemplate->SetFlags(theSpawnFlags);
+		
+		string theTargetName = STRING(this->pev->targetname);
+		if(!FStrEq(theTargetName.c_str(), ""))
+		{
+			theTemplate->SetName(theTargetName);
+		}
+		
+		this->SetThink(&AvHParticleSystemEntity::ParticleThink);
+		pev->nextthink = gpGlobals->time + kDefaultParticleSystemThinkRate;
+		
+		// The spawn flags field is the only one that doesn't get set through KeyValue(), so
+		// we set it in the template this way
+		int theSpawnFlags = this->pev->spawnflags;
+		if(!theSpawnFlags)
+		{
+			theSpawnFlags = theTemplate->GetFlags();
+		}
+
+		// Did they check the "start on" flag?
+		if(theSpawnFlags & 1)
+		{
+			this->mUseState = true;
+		}
+
+		theTemplate->SetFlags(theSpawnFlags);
+	}
+	else
+	{
+		ALERT(at_logged, "Couldn't find particle system template: %d\n", this->mTemplateIndex);
+		UTIL_Remove(this);
+	}
+}
+
+void
+AvHParticleSystemEntity::UpdateClientData()
+{
+	// Turn the system on or off
+	if(this->mIsOn != this->mUseState)
+	{
+		this->mIsOn = this->mUseState;
+		
+		// set up entity so it's propagated correctly
+		if(this->mIsOn)
+		{
+			// TODO: Reset sCurrentHandle to 1 every time a new game starts?
+			this->mHandle = sCurrentHandle++;
+			
+			// Create server side system for collision only
+			int theEntIndex = this->entindex();
+			AvHParticleSystemManager::Instance()->CreateParticleSystemIfNotCreated(theEntIndex, this->mTemplateIndex, this->mHandle);
+			
+			// Replicate action to everyone
+			this->pev->iuser3 = AVH_USER3_PARTICLE_ON;
+			const AvHParticleTemplate* theTemplate = gParticleTemplateList.GetTemplateAtIndex(this->mTemplateIndex);
+			ASSERT(theTemplate);
+				
+			int theGenEntityIndex = theTemplate->GetGenerationEntityIndex();
+			if(theGenEntityIndex == -1)
+			{
+				theGenEntityIndex = 0;
+			}
+
+			//this->pev->fuser1 = /*this->mTemplateIndex;*/ (theGenEntityIndex << 16) | this->mTemplateIndex;
+
+			ASSERT(this->mTemplateIndex < 256);
+			this->pev->fuser1 = (theGenEntityIndex << 16) | ((this->mTemplateIndex & 0xFF) << 8);
+			this->pev->fuser2 = this->mHandle;
+
+			// Store our custom data
+			this->SetCustomData(this->mCustomData);
+			
+			this->mTimeParticlesCreated = gpGlobals->time;
+		}
+		else
+		{
+			// Destroy server side particle system
+			//AvHParticleSystemManager::Instance()->DestroyParticleSystemIfNotDestroyed(this->entindex(), this->mHandle);
+			AvHParticleSystemManager::Instance()->MarkParticleSystemForDeletion(this->entindex(), this->mHandle);
+			
+			// Replicate action to everyone
+			this->pev->iuser3 = AVH_USER3_PARTICLE_OFF;
+			this->pev->fuser1 = this->mHandle;
+		}
+	}
+	
+	if(this->mIsOn)
+	{
+		AvHParticleTemplate* theTemplate = gParticleTemplateList.GetTemplateAtIndex(this->mTemplateIndex);
+		ASSERT(theTemplate);
+		
+		// If particle system was set to expire, make sure to realize when it turns off
+		int theParticleSystemLifetime = theTemplate->GetParticleSystemLifetime();
+		if(theParticleSystemLifetime != -1)
+		{
+			if(gpGlobals->time - this->mTimeParticlesCreated >= theParticleSystemLifetime)
+			{
+				//this->mIsOn = false;
+				this->mUseState = false;
+			}
+		}
+	}
+}
+
+
+
+
+// Create a custom particle system.  Create a new template instead of reading
+// one off disk.
+void
+AvHCustomParticleSystemEntity::KeyValue( KeyValueData* inPkvd )
+{
+	// Read tag with ps name and create a new template using it
+	if(FStrEq(inPkvd->szKeyName, kpscSystemName))
+	{
+		// Custom particle systems shouldn't be specifying a system in the .ps to use
+		ASSERT(false);
+	}
+	else if(FStrEq(inPkvd->szKeyName, kpscGenSource) || FStrEq(inPkvd->szKeyName, "particleGenerationSource"))
+	{
+		char* theEntityName = inPkvd->szValue;
+		this->GetCustomTemplate()->SetGenerationEntityName(theEntityName);
+		inPkvd->fHandled = TRUE;
+	}
+	else if(FStrEq(inPkvd->szKeyName, kpscGenShape) || FStrEq(inPkvd->szKeyName, "particleGenerationShape"))
+	{
+		int theGenerationShape = 0;
+		if(sscanf(inPkvd->szValue, "%d", &theGenerationShape))
+		{
+			ShapeType theShape = PS_Point;
+			switch(theGenerationShape)
+			{
+			case 4:
+				theShape = PS_Box;
+				break;
+			case 5:
+				theShape = PS_Sphere;
+				break;
+			case 8:
+				theShape = PS_Blob;
+				break;
+			}
+			this->GetCustomTemplate()->SetGenerationShape(theShape);
+			inPkvd->fHandled = TRUE;
+		}
+	}
+	else if(FStrEq(inPkvd->szKeyName, kpscSprite) || FStrEq(inPkvd->szKeyName, "particleSprite"))
+	{								   
+		// relative path to sprite
+		string theSpriteName(inPkvd->szValue);
+		this->GetCustomTemplate()->SetSprite(theSpriteName);
+		inPkvd->fHandled = TRUE;
+	}
+	else if(FStrEq(inPkvd->szKeyName, kpscSpriteNumFrames) || FStrEq(inPkvd->szKeyName, "particleSpriteNumFrames"))
+	{
+		// int number of frames
+		int theNumFrames = 0;
+		if(sscanf(inPkvd->szValue, "%d", &theNumFrames) == 1)
+		{
+			this->GetCustomTemplate()->SetNumSpriteFrames(theNumFrames);
+			inPkvd->fHandled = TRUE;
+		}
+	}
+	else if(FStrEq(inPkvd->szKeyName, kpscGenShapeParams) || FStrEq(inPkvd->szKeyName, "particleGenerationShapeParams"))
+	{
+		float theParameter = 0;
+		if(sscanf(inPkvd->szValue, "%f", &theParameter) == 1)
+		{
+			this->GetCustomTemplate()->SetGenerationEntityParameter(theParameter);
+			inPkvd->fHandled = TRUE;
+		}
+	}
+	else if(FStrEq(inPkvd->szKeyName, kpscNumParticles) || FStrEq(inPkvd->szKeyName, "particleNumParticles"))
+	{
+		// max particles, or density
+		int theNumParticles = 0;
+		if(sscanf(inPkvd->szValue, "%d", &theNumParticles) == 1)
+		{
+		 	this->GetCustomTemplate()->SetMaxParticles(theNumParticles);
+			inPkvd->fHandled = TRUE;
+		}
+	}
+	else if(FStrEq(inPkvd->szKeyName, kpscGenRate) || FStrEq(inPkvd->szKeyName, "particleGenerationRate"))
+	{
+		// num particles per second
+		int theNumParticles = 0;
+		if(sscanf(inPkvd->szValue, "%d", &theNumParticles) == 1)
+		{
+			this->GetCustomTemplate()->SetGenerationRate(theNumParticles);
+			inPkvd->fHandled = TRUE;
+		}
+	}
+	else if(FStrEq(inPkvd->szKeyName, kpscSize) || FStrEq(inPkvd->szKeyName, "particleSize"))
+	{
+		// float particle size
+		float theParticleSize = 0;
+		if(sscanf(inPkvd->szValue, "%f", &theParticleSize) == 1)
+		{
+			this->GetCustomTemplate()->SetParticleSize(theParticleSize);
+			inPkvd->fHandled = TRUE;
+		}
+	}
+	else if(FStrEq(inPkvd->szKeyName, kpscSystemLifetime) || FStrEq(inPkvd->szKeyName, "particleSystemLifetime"))
+	{
+		// string system lifetime
+		float theLifetime = -1;
+		if(sscanf(inPkvd->szValue, "%f", &theLifetime) == 1)
+		{
+			this->GetCustomTemplate()->SetParticleSystemLifetime(theLifetime);
+			inPkvd->fHandled = TRUE;
+		}
+	}
+	else if(FStrEq(inPkvd->szKeyName, kpscAnimationSpeed) || FStrEq(inPkvd->szKeyName, "particleAnimationSpeed"))
+	{
+		// Sprite animation speed
+		float theAnimSpeed = 1.0f;
+		if(sscanf(inPkvd->szValue, "%f", &theAnimSpeed) == 1)
+		{
+			this->GetCustomTemplate()->SetAnimationSpeed(theAnimSpeed);
+			inPkvd->fHandled = TRUE;
+		}
+	}
+	else if(FStrEq(inPkvd->szKeyName, kpscParticleLifetime) || FStrEq(inPkvd->szKeyName, "particleLifetime"))
+	{
+		// string particle lifetime
+		float theLifetime = -1;
+		if(sscanf(inPkvd->szValue, "%f", &theLifetime) == 1)
+		{
+			this->GetCustomTemplate()->SetParticleLifetime(theLifetime);
+			inPkvd->fHandled = TRUE;
+		}
+	}
+	else if(FStrEq(inPkvd->szKeyName, kpscVelocityShape) || FStrEq(inPkvd->szKeyName, "particleStartingVelocityShape"))
+	{
+		int theVelocityShape = 0;
+		if(sscanf(inPkvd->szValue, "%d", &theVelocityShape))
+		{
+			ShapeType theShape = PS_Point;
+			switch(theVelocityShape)
+			{
+			case 1:
+				theShape = PS_Point;
+				break;
+			case 2:
+				theShape = PS_Box;
+				break;
+			case 3:
+				theShape = PS_Sphere;
+				break;
+			case 4:
+				theShape = PS_Blob;
+				break;
+			}
+			this->GetCustomTemplate()->SetStartingVelocityShape(theShape);
+			inPkvd->fHandled = TRUE;
+		}
+	}
+	else if(FStrEq(inPkvd->szKeyName, kpscVelocityParams) || FStrEq(inPkvd->szKeyName, "particleStartingVelParams"))
+	{
+		// string, 8 comma-delimited parms
+		ParticleParams theVelParms;
+		if(sscanf(inPkvd->szValue, "%d,%d,%d,%d,%d,%d,%d,%d", theVelParms + 0, theVelParms + 1, theVelParms + 2, theVelParms + 3, theVelParms + 4, theVelParms + 5, theVelParms + 6, theVelParms + 7) == 8)
+		{
+			this->GetCustomTemplate()->SetStartingVelocityParams(theVelParms);
+			inPkvd->fHandled = TRUE;
+		}
+	}
+	else if(FStrEq(inPkvd->szKeyName, kpscScale) || FStrEq(inPkvd->szKeyName, "particleScaling"))
+	{
+		// float/string particle scaling
+		float theScaling = 1.0f;
+		if(sscanf(inPkvd->szValue, "%f", &theScaling) == 1)
+		{
+			this->GetCustomTemplate()->SetParticleScaling(theScaling);
+			inPkvd->fHandled = TRUE;
+		}
+	}
+	else if(FStrEq(inPkvd->szKeyName, kpscRendermode) || FStrEq(inPkvd->szKeyName, "particleRenderMode"))
+	{
+		// 0-5 render mode
+		int theRenderMode = 0;
+		if(sscanf(inPkvd->szValue, "%d", &theRenderMode) == 1)
+		{
+			this->GetCustomTemplate()->SetRenderMode(theRenderMode);
+			inPkvd->fHandled = TRUE;
+		}
+	}
+	else if(FStrEq(inPkvd->szKeyName, kpscMaxAlpha) || FStrEq(inPkvd->szKeyName, "particleMaxAlpha"))
+	{
+		float theMaxAlpha = 1.0f;
+		if(sscanf(inPkvd->szValue, "%f", &theMaxAlpha) == 1)
+		{
+			this->GetCustomTemplate()->SetMaxAlpha(theMaxAlpha);
+			inPkvd->fHandled = TRUE;
+		}
+	}
+	else if(FStrEq(inPkvd->szKeyName, kpscSystemToGen) || FStrEq(inPkvd->szKeyName, "particleSystemToGenerate"))
+	{
+		string theSystemToGenerate = inPkvd->szValue;
+		this->GetCustomTemplate()->SetParticleSystemToGenerate(theSystemToGenerate);
+		inPkvd->fHandled = TRUE;
+	}
+	else
+	{
+		// Call down to base class
+		AvHParticleSystemEntity::KeyValue(inPkvd);
+	}
+}
+
diff --git a/main/source/mod/AvHParticleSystemEntity.h b/main/source/mod/AvHParticleSystemEntity.h
new file mode 100644
index 00000000..a0a63268
--- /dev/null
+++ b/main/source/mod/AvHParticleSystemEntity.h
@@ -0,0 +1,75 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHParticleSystemEntity.h $
+// $Date: 2002/05/23 02:33:20 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHParticleSystemEntity.h,v $
+// Revision 1.9  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_PARTICLE_SYSTEM_ENTITY_H
+#define AVH_PARTICLE_SYSTEM_ENTITY_H
+
+#include "dlls/extdll.h"
+#include "dlls/util.h"
+#include "dlls/cbase.h"
+#include "types.h"
+#include "mod/AvHParticleTemplate.h"
+#include "mod/AvHConstants.h"
+
+class AvHParticleSystemEntity : public CBaseEntity
+{
+public:
+					AvHParticleSystemEntity();
+
+	uint16			GetCustomData() const;
+	void			SetCustomData(uint16 inCustomData);
+
+	void			SetTemplateIndex(int inTemplateIndex);
+
+	virtual void	KeyValue( KeyValueData* pkvd );
+	virtual void	Precache(void);
+	virtual void	SetUseState(USE_TYPE inUseType);
+	virtual void	Spawn( void );
+	
+protected:
+	AvHParticleTemplate*	GetCustomTemplate();
+	
+private:
+	void EXPORT				ParticleUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void EXPORT				ParticleThink();
+	void EXPORT				ParticleTouch( CBaseEntity *pOther );
+	void					UpdateClientData();
+	
+	int32			mTemplateIndex;
+	bool			mIsOn;
+	//bool			mClientIsOn;
+	bool			mUseState;
+	bool			mCreatedTemplate;
+	uint32			mHandle;
+	float			mTimeParticlesCreated;
+	uint16			mCustomData;
+
+	static uint32	sCurrentHandle;
+	
+};
+
+
+// Custom particle systems.  It is identical to a particle system entity except it creates
+// a new particle template instead of reading one from a .ps.
+class AvHCustomParticleSystemEntity : public AvHParticleSystemEntity
+{
+public:
+	virtual void	KeyValue( KeyValueData* pkvd );
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHParticleSystemManager.cpp b/main/source/mod/AvHParticleSystemManager.cpp
new file mode 100644
index 00000000..5687d4ef
--- /dev/null
+++ b/main/source/mod/AvHParticleSystemManager.cpp
@@ -0,0 +1,590 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHParticleSystemManager.cpp $
+// $Date: 2002/10/28 20:36:06 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHParticleSystemManager.cpp,v $
+// Revision 1.14  2002/10/28 20:36:06  Flayra
+// - Tweaked particle culling time to work with umbra and spores
+//
+// Revision 1.13  2002/10/24 21:34:46  Flayra
+// - Fixes for particle culling again!
+//
+// Revision 1.12  2002/07/10 14:44:10  Flayra
+// - Visibility fixes (too many PSs drawing, now they expire when not visible for awhile)
+//
+// Revision 1.11  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHParticleSystemManager.h"
+
+#ifdef AVH_CLIENT
+  #include "cl_dll/hud.h"
+  #include "cl_dll/cl_util.h"
+
+  // Triangle rendering apis are in gEngfuncs.pTriAPI
+  #include "const.h"
+  #include "entity_state.h"
+  #include "cl_entity.h"
+  #include "triangleapi.h"
+  #include "particles/papi.h"
+  #include "mod/AvHParticleTemplateClient.h"
+  
+#else
+  #include "mod/AvHParticleTemplate.h"
+  #include "mod/AvHParticleTemplateServer.h"
+  #include "dlls/util.h"
+#endif
+
+#include "pm_shared/pm_debug.h"
+
+#ifdef AVH_CLIENT
+  AvHParticleTemplateListClient		gParticleTemplateList;
+  extern DebugEntityListType		gCubeDebugEntities;
+#else
+  //AvHParticleTemplateList			gParticleTemplateList;
+  AvHParticleTemplateListServer		gParticleTemplateList;
+#endif
+
+AvHParticleSystemManager*	AvHParticleSystemManager::sInstance = NULL;
+const float	kUpdateIncrement = 0.0f;
+
+AvHParticleSystemManager*
+AvHParticleSystemManager::Instance()
+{
+	if(!sInstance)
+	{
+		sInstance = new AvHParticleSystemManager();
+	}
+	return sInstance;
+}
+
+void AvHParticleSystemManager::Init()
+{
+	#ifdef AVH_CLIENT
+	this->mStarted = false;
+	#else
+	this->mStarted = true;
+	#endif
+
+	this->mReloadFromTemplates = false;
+	
+	this->mUpdatedTime = 0.0f;
+	this->mTimePassed = 0.0f;
+}
+
+AvHParticleSystemManager::AvHParticleSystemManager()
+{
+	this->Init();
+}
+
+void
+AvHParticleSystemManager::CreateParticleSystem(uint32 inTemplateIndex, int inParentEntityIndex, ParticleSystemHandle inHandle)
+{
+	this->mQueuedCreateList.push_back(QueuedParticleSystem(inTemplateIndex, this->GetTime(), inParentEntityIndex, inHandle));
+}
+
+void
+AvHParticleSystemManager::CreateParticleSystem(uint32 inTemplateIndex, vec3_t inOrigin, vec3_t* inNormal)
+{
+	QueuedParticleSystem theParticleSystem(inTemplateIndex, this->GetTime(), inOrigin);
+	if(inNormal)
+	{
+		theParticleSystem.SetNormal(*inNormal);
+	}
+ 	this->mQueuedCreateList.push_back(theParticleSystem);
+}
+
+bool
+AvHParticleSystemManager::CreateParticleSystem(const string& inTemplateName, vec3_t inOrigin, vec3_t* inNormal)
+{
+	bool theSuccess = false;
+
+	// Lookup template by name
+	uint32 theTemplateIndex = 0;
+
+	if(::gParticleTemplateList.GetTemplateIndexWithName(inTemplateName, theTemplateIndex))
+	{
+		this->CreateParticleSystem(theTemplateIndex, inOrigin, inNormal);
+		theSuccess = true;
+	}
+	
+	return theSuccess;
+}
+
+void 
+AvHParticleSystemManager::CreateParticleSystemIfNotCreated(int inIndex, int inTemplateIndex, int inHandle)
+{
+	bool theEntityHasParticles = false;
+	
+	// Look in list of entities, see if we've created one for this entity
+	for(ParticleEntityList::iterator theIter = this->mParticleEntities.begin(); theIter != this->mParticleEntities.end(); theIter++)
+	{
+		if(*theIter == inIndex)
+		{
+			theEntityHasParticles = true;
+			break;
+		}
+	}
+	
+	if(!theEntityHasParticles)
+	{
+		// If not, create one
+		this->CreateParticleSystem(inTemplateIndex, inIndex, (ParticleSystemHandle)inHandle);
+		
+		// Add entity to list
+		this->mParticleEntities.push_back(inIndex);
+	}
+}
+
+void 
+AvHParticleSystemManager::DestroyParticleSystemIfNotDestroyed(int inIndex, ParticleSystemHandle inHandle)
+{
+	// Look in list of entities, see if we've created one for this entity
+	for(ParticleEntityList::iterator theIter = this->mParticleEntities.begin(); theIter != this->mParticleEntities.end(); theIter++)
+	{
+		if(*theIter == inIndex)
+		{
+			// If so, destroy this particle system.  Note that this particle system could have already
+			// expired, that's ok.  The list of particle entities just needs to be kept up to date.
+			this->DestroyParticleSystem(inHandle);
+			
+			// Remove entity from list
+			this->mParticleEntities.erase(theIter);
+			
+			break;
+		}
+	}
+}
+
+void
+AvHParticleSystemManager::DestroyParticleSystem(ParticleSystemHandle inHandle)
+{
+	InternalDestroyParticleSystem(inHandle);
+}
+
+void
+AvHParticleSystemManager::Draw(const pVector& inView)
+{
+	if(this->mStarted)
+	{
+		ParticleSystemList::iterator theIterator;
+		for(theIterator = this->mParticleSystemList.begin(); theIterator != this->mParticleSystemList.end(); theIterator++)
+		{
+			theIterator->Draw(inView);
+		}
+	}
+}
+
+AvHParticleSystem*
+AvHParticleSystemManager::GetParticleSystem(ParticleSystemHandle inHandle)
+{
+	AvHParticleSystem* theParticleSystem = NULL;
+
+	for(ParticleSystemList::iterator theIterator = this->mParticleSystemList.begin(); theIterator != this->mParticleSystemList.end(); theIterator++)
+	{
+		if(theIterator->GetHandle() == inHandle)
+		{
+			theParticleSystem = &*theIterator;
+			break;
+		}
+	}
+
+	return theParticleSystem;
+}
+
+int
+AvHParticleSystemManager::GetNumberParticleSystems()
+{
+	return this->mParticleSystemList.size();
+}
+
+#ifdef AVH_CLIENT
+int	AvHParticleSystemManager::GetNumberVisibleParticleSystems()
+{
+ 	int theNumVisibleSystems = 0;
+
+	for(ParticleSystemList::iterator theIterator = this->mParticleSystemList.begin(); theIterator != this->mParticleSystemList.end(); theIterator++)
+	{
+		if(theIterator->GetIsVisible())
+		{
+			theNumVisibleSystems++;
+		}
+	}
+	return theNumVisibleSystems;
+}
+#endif
+
+float
+AvHParticleSystemManager::GetTime(void) const
+{
+	float theTime = 0;
+	
+#ifdef AVH_CLIENT
+	theTime = gEngfuncs.GetClientTime();
+#else
+	theTime = gpGlobals->time;
+#endif
+	
+	return theTime;
+}
+
+bool 
+AvHParticleSystemManager::InternalDestroyParticleSystem(ParticleSystemHandle inHandle)
+{
+	bool theDestroyed = false;
+	
+	for(ParticleSystemList::iterator theIterator = this->mParticleSystemList.begin(); theIterator != this->mParticleSystemList.end(); theIterator++)
+	{
+		if(theIterator->GetHandle() == inHandle)
+		{
+			// Tell it to kill its particles and clean up
+			theIterator->Kill();
+
+			// Remove it from the list
+			theIterator = this->mParticleSystemList.erase(theIterator);
+
+			// We're successful and done
+			theDestroyed = true;
+			break;
+		}
+	}
+
+	return theDestroyed;
+}
+
+bool
+AvHParticleSystemManager::InternalCreateParticleSystem(const QueuedParticleSystem& inParticleSystem)
+{
+	bool theSuccess = false;
+	
+	// add new particle system to list
+	AvHParticleTemplate* theTemplate = ::gParticleTemplateList.GetTemplateAtIndex(inParticleSystem.mTemplateIndex);
+	if(theTemplate)
+	{
+		AvHParticleSystem theNewParticleSystem(theTemplate, inParticleSystem.mTemplateIndex);
+		
+		// set it's template handle
+		int theHandle = inParticleSystem.mHandle;
+		if(theHandle)
+		{
+			theNewParticleSystem.SetHandle(theHandle);
+		}
+		else
+		{
+			// TODO: Check to be sure it has a lifetime, because it won't be able to be deleted
+		}
+		
+		// Bind it to an entity if it was specified
+		//if(inParticleSystem.mEntity)
+		//{
+		//	theNewParticleSystem.SetEntity(inParticleSystem.mEntity);
+		//}
+		
+		theNewParticleSystem.SetPosition(inParticleSystem.mOrigin);
+		
+		// Set time created
+		theNewParticleSystem.SetTimeCreated(this->GetTime());
+
+		// Set normal if specified
+		if(inParticleSystem.mHasNormal)
+		{
+			theNewParticleSystem.SetNormal(inParticleSystem.mNormal);
+		}
+		
+		this->mParticleSystemList.push_back(theNewParticleSystem);
+
+		#ifdef AVH_CLIENT
+		//int theGenerationEntityIndex;
+		//if(theNewParticleSystem.GetGenerationEntity(theGenerationEntityIndex))
+		//{
+		//	gCubeDebugEntities.push_back(theGenerationEntityIndex);
+		//}
+		//else
+		//{
+			int theParentEntityIndex = inParticleSystem.GetParentEntityIndex();
+			if(theParentEntityIndex > 0)
+			{
+				gCubeDebugEntities.push_back(theParentEntityIndex);
+			}
+		//}
+		#endif
+		
+		theSuccess = true;
+	}
+	
+	return theSuccess;
+}
+
+void
+AvHParticleSystemManager::ProcessQueuedList()
+{
+	// Process pending creates
+	for(QueuedCreateList::iterator theCreateIter = this->mQueuedCreateList.begin(); theCreateIter != this->mQueuedCreateList.end(); /* no increment */)
+	{
+		// Run through the list, creating each queued particle system.  If a system couldn't be created, we probably
+		// don't have that particle template yet, so just skip it for now and try to create it next frame.
+
+		// Add code that detects how long a queued particle system has been in?
+		const float kTimeOut = 20.0f;
+		float theCurrentTime = this->GetTime();
+		
+		bool theCreateTimedOut = theCurrentTime - theCreateIter->mTimeQueued > kTimeOut;
+		if(theCreateTimedOut)
+		{
+			//ASSERT(!theCreateTimedOut);
+			theCreateIter = this->mQueuedCreateList.erase(theCreateIter);
+		}
+		else
+		{
+			bool theCreated = this->InternalCreateParticleSystem(*theCreateIter);
+			if(theCreated)
+			{
+				theCreateIter = this->mQueuedCreateList.erase(theCreateIter);
+			}
+			else
+			{
+				theCreateIter++;
+			}
+		}
+	}
+	
+	// Process pending destroys
+	for(QueuedDestroyList::iterator theDestroyIter = this->mQueuedDestroyList.begin(); theDestroyIter != this->mQueuedDestroyList.end(); /* no increment */)
+	{
+		ParticleSystemHandle theHandle = *theDestroyIter;
+
+		// Try to delete it.  If it hasn't been created yet, keep the pending destruction around
+		bool theDestroyed = this->InternalDestroyParticleSystem(theHandle);
+		if(theDestroyed)
+		{
+			theDestroyIter = this->mQueuedDestroyList.erase(theDestroyIter);
+		}
+		else
+		{
+			theDestroyIter++;
+		}
+	}
+}
+
+void
+AvHParticleSystemManager::QueueParticleSystem(const QueuedParticleSystem& inParticleSystem)
+{
+	this->mQueuedCreateList.push_back(inParticleSystem);
+}
+
+void
+AvHParticleSystemManager::ReloadFromTemplates()
+{
+	this->mReloadFromTemplates = true;
+}
+
+void
+AvHParticleSystemManager::Reset()
+{
+	// Clear out alive particle systems 
+	for(ParticleSystemList::iterator theIterator = this->mParticleSystemList.begin(); theIterator != this->mParticleSystemList.end(); theIterator++)
+	{
+		theIterator->Kill();
+	}
+	this->mParticleSystemList.clear();
+	
+	// Clear out queued particle systems
+	this->mQueuedCreateList.clear();
+	this->mQueuedDestroyList.clear();
+	
+	// Clear entities we're tracking
+	this->mParticleEntities.clear();
+	
+	// Init list again so it's just like we just built a new one
+	this->Init();
+}
+
+bool AvHParticleSystemManager::SetParticleSystemCustomData(uint16 inCustomData, ParticleSystemHandle inHandle)
+{
+	bool theSuccess = false;
+
+	for(ParticleSystemList::iterator theIterator = this->mParticleSystemList.begin(); theIterator != this->mParticleSystemList.end(); theIterator++)
+	{
+		if(theIterator->GetHandle() == inHandle)
+		{
+			theIterator->SetCustomData(inCustomData);
+			theSuccess = true;
+			break;
+		}
+	}
+
+	return theSuccess;
+}
+
+void
+AvHParticleSystemManager::MarkParticleSystemForDeletion(int inIndex, ParticleSystemHandle inHandle)
+{
+	for(ParticleEntityList::iterator theIter = this->mParticleEntities.begin(); theIter != this->mParticleEntities.end(); theIter++)
+	{
+		if(*theIter == inIndex)
+		{
+			// Remove it from the list
+			theIter = this->mParticleEntities.erase(theIter);
+			break;
+		}
+	}
+
+	// Mark it for deletion
+	for(ParticleSystemList::iterator theIterator = this->mParticleSystemList.begin(); theIterator != this->mParticleSystemList.end(); theIterator++)
+	{
+		if(theIterator->GetHandle() == inHandle)
+		{
+			theIterator->SetIsMarkedForDeletion();
+			break;
+		}
+	}
+}
+
+#ifdef AVH_CLIENT
+int	AvHParticleSystemManager::GetNumVisibleParticleSystems() const
+{
+	int theNumVisible = 0;
+	
+	for(ParticleSystemList::const_iterator theIterator = this->mParticleSystemList.begin(); theIterator != this->mParticleSystemList.end(); theIterator++)
+	{
+		if(theIterator->GetIsVisible())
+		{
+			theNumVisible++;
+		}
+	}
+	
+	return theNumVisible;
+}
+
+void
+AvHParticleSystemManager::SetParticleSystemGenerationEntityExtents(vec3_t& inMin, vec3_t& inMax, ParticleSystemHandle inHandle)
+{
+	for(ParticleSystemList::iterator theIterator = this->mParticleSystemList.begin(); theIterator != this->mParticleSystemList.end(); theIterator++)
+	{
+		if(theIterator->GetHandle() == inHandle)
+		{
+			theIterator->SetGenerationEntityExtents(inMin, inMax);
+			break;
+		}
+	}
+}
+
+void
+AvHParticleSystemManager::SetParticleSystemPosition(vec3_t& inPos, ParticleSystemHandle inHandle)
+{
+	for(ParticleSystemList::iterator theIterator = this->mParticleSystemList.begin(); theIterator != this->mParticleSystemList.end(); theIterator++)
+	{
+		if(theIterator->GetHandle() == inHandle)
+		{
+			theIterator->SetPosition(inPos);
+			break;
+		}
+	}
+}
+
+void
+AvHParticleSystemManager::SetParticleSystemVisibility(bool inVisibility, ParticleSystemHandle inHandle)
+{
+	for(ParticleSystemList::iterator theIterator = this->mParticleSystemList.begin(); theIterator != this->mParticleSystemList.end(); theIterator++)
+	{
+		if(theIterator->GetHandle() == inHandle)
+		{
+			theIterator->SetIsVisible(inVisibility, this->GetTime());
+			break;
+		}
+	}
+}
+#endif
+
+void
+AvHParticleSystemManager::Start()
+{
+	if(!this->mStarted)
+	{
+		this->mStarted = true;
+		this->mUpdatedTime = this->mTimePassed = 0.0f;
+	}
+}
+
+void
+AvHParticleSystemManager::Update(double inTime)
+{
+	if(this->mStarted)
+	{
+		this->ProcessQueuedList();
+
+		ASSERT(inTime >= 0.0f);
+
+		this->mTimePassed += (float)inTime;
+		if(this->mTimePassed - this->mUpdatedTime > kUpdateIncrement)
+		{
+			float theTimeToUpdate = this->mTimePassed - this->mUpdatedTime;
+
+			// Run through list, updating each one
+			ParticleSystemList::iterator theIterator;
+			for(theIterator = this->mParticleSystemList.begin(); theIterator != this->mParticleSystemList.end(); /* notice: no increment */ )
+			{
+				if(this->mReloadFromTemplates)
+				{
+					AvHParticleTemplate* theTemplate = gParticleTemplateList.GetTemplateAtIndex(theIterator->GetTemplateIndex());
+					ASSERT(theTemplate);
+					theIterator->LoadFromTemplate(theTemplate);
+				}
+
+				// Always update particle systems
+				theIterator->Update(theTimeToUpdate);
+
+				// If the particle system has lived long enough, mark it for deletion
+				float theCurrentTime = this->GetTime();
+				float theParticleSystemLifetime = theIterator->GetParticleSystemLifetime();
+				if(!theIterator->GetIsMarkedForDeletion())
+				{
+					if((theParticleSystemLifetime != -1) && theIterator->GetHasGeneratedParticles())
+					{
+						if(theCurrentTime > (theIterator->GetTimeCreated() + theParticleSystemLifetime))
+						{
+							theIterator->SetIsMarkedForDeletion();
+						}
+					}
+				}
+
+				#ifdef AVH_CLIENT
+				// Expire visibility of particle systems.  The server sends down particle entities as they're updated, but we need
+				// a way to expire them.
+				if(theIterator->GetIsVisible())
+				{
+					const float kExpireTime = 6.0f;
+					if((theIterator->GetLastTimeVisibilityLastSetTrue() == -1) || (this->mTimePassed > (theIterator->GetLastTimeVisibilityLastSetTrue() + kExpireTime)))
+					{
+						theIterator->SetIsVisible(false, inTime);
+					}
+				}
+				#endif
+
+				// If a particle system is marked for deletion and it has no more particles, delete it
+				if(theIterator->GetIsMarkedForDeletion() && (theIterator->GetNumberOfParticles() == 0) )
+				{
+					theIterator->Kill();
+					theIterator = this->mParticleSystemList.erase(theIterator);
+				}
+				else
+				{
+					theIterator++;
+				}
+			}
+
+			this->mUpdatedTime = this->mTimePassed;
+		}
+	}
+	this->mReloadFromTemplates = false;
+}
\ No newline at end of file
diff --git a/main/source/mod/AvHParticleSystemManager.h b/main/source/mod/AvHParticleSystemManager.h
new file mode 100644
index 00000000..4d60e1f0
--- /dev/null
+++ b/main/source/mod/AvHParticleSystemManager.h
@@ -0,0 +1,172 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHParticleSystemManager.h $
+// $Date: 2002/05/23 02:33:20 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHParticleSystemManager.h,v $
+// Revision 1.10  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_PSMANAGER_H
+#define AVH_PSMANAGER_H
+
+#include "util/nowarnings.h"
+#include "types.h"
+#include "mod/AvHParticleSystem.h"
+
+class AvHParticleSystemManager;
+
+class QueuedParticleSystem
+{
+public:
+	friend class AvHParticleSystemManager;
+
+	QueuedParticleSystem(uint32 inTemplateIndex, float inTime, int inParentEntityIndex, ParticleSystemHandle inHandle) 
+	{
+		this->Init();
+		this->mTemplateIndex = inTemplateIndex;
+		this->mTimeQueued = inTime;
+		this->mParentEntityIndex = inParentEntityIndex;
+		this->mHandle = inHandle;
+		this->mHasNormal = false;
+	}
+
+	QueuedParticleSystem(uint32 inTemplateIndex, float inTime, vec3_t inOrigin)
+	{ 
+		this->Init();
+		this->mTemplateIndex = inTemplateIndex;
+		this->mTimeQueued = inTime;
+		this->mOrigin[0] = inOrigin[0];
+		this->mOrigin[1] = inOrigin[1];
+		this->mOrigin[2] = inOrigin[2];
+		this->mHasNormal = false;
+	}
+
+	void SetNormal(const vec3_t& inNormal)
+	{
+		this->mHasNormal = true;
+		this->mNormal.x = inNormal.x;
+		this->mNormal.y = inNormal.y;
+		this->mNormal.z = inNormal.z;
+	}
+
+	int GetParentEntityIndex() const
+	{
+		return this->mParentEntityIndex;
+	}
+	
+private:
+	void Init()
+	{
+		this->mTemplateIndex = 0;
+		this->mHandle = 0;
+		this->mParentEntityIndex = -1;
+		memset(this->mOrigin, 0, sizeof(this->mOrigin));
+		this->mTimeQueued = 0;
+	}
+
+	uint32					mTemplateIndex;
+	int						mParentEntityIndex;
+	ParticleSystemHandle	mHandle;
+	vec3_t					mOrigin;
+	float					mTimeQueued;
+	bool					mHasNormal;
+	vec3_t					mNormal;
+};
+
+class AvHParticleSystemManager
+{
+public:
+
+	void								CreateParticleSystem(uint32 inTemplateIndex, int inParentEntityIndex, ParticleSystemHandle inHandle = 0);
+
+	void								CreateParticleSystem(uint32 inTemplateIndex, vec3_t inOrigin, vec3_t* inNormal = NULL);
+
+	bool								CreateParticleSystem(const string& inTemplateName, vec3_t inOrigin, vec3_t* inNormal = NULL);
+
+	void								CreateParticleSystemIfNotCreated(int inIndex, int inTemplateIndex, int inHandle);
+
+	void								DestroyParticleSystem(ParticleSystemHandle inHandle);
+
+	void								DestroyParticleSystemIfNotDestroyed(int inIndex, ParticleSystemHandle inHandle);
+
+	void								Draw(const pVector &inView);
+
+	AvHParticleSystem*					GetParticleSystem(ParticleSystemHandle inHandle);
+
+	int									GetNumberParticleSystems();
+
+#ifdef AVH_CLIENT
+	int									GetNumberVisibleParticleSystems();
+#endif
+
+	static AvHParticleSystemManager*	Instance();
+
+	void								MarkParticleSystemForDeletion(int inIndex, ParticleSystemHandle inHandle);
+
+	void								ReloadFromTemplates();
+
+	void								Reset();
+
+	bool								SetParticleSystemCustomData(uint16 inCustomData, ParticleSystemHandle inHandle);
+	
+#ifdef AVH_CLIENT
+	int									GetNumVisibleParticleSystems() const;
+	void								SetParticleSystemGenerationEntityExtents(vec3_t& inMin, vec3_t& inMax, ParticleSystemHandle inHandle);
+	void								SetParticleSystemPosition(vec3_t& inPosition, ParticleSystemHandle inHandle);
+	void								SetParticleSystemVisibility(bool inVisibility, ParticleSystemHandle inHandle);
+#endif
+	
+	void								Start();
+	
+	void								Update(double inTime);
+	
+private:
+	
+	
+	AvHParticleSystemManager();
+	
+	void								Init();
+	
+	bool								InternalCreateParticleSystem(const QueuedParticleSystem& inParticleSystem);
+	
+	bool								InternalDestroyParticleSystem(ParticleSystemHandle inHandle);
+	
+	float								GetTime(void) const;
+	
+	void								ProcessQueuedList();
+	
+	void								QueueParticleSystem(const QueuedParticleSystem& inParticleSystem);
+	
+	static AvHParticleSystemManager*	sInstance;
+	
+	typedef vector<AvHParticleSystem>	ParticleSystemList;
+	ParticleSystemList					mParticleSystemList;
+	
+	bool								mStarted;
+	bool								mReloadFromTemplates;
+	
+	float								mTimePassed;
+	float								mUpdatedTime;
+	
+	typedef vector<QueuedParticleSystem>	QueuedCreateList;
+	QueuedCreateList						mQueuedCreateList;
+	
+	typedef vector<ParticleSystemHandle>	QueuedDestroyList;
+	QueuedDestroyList						mQueuedDestroyList;
+	
+	typedef vector<int>					ParticleEntityList;
+	ParticleEntityList					mParticleEntities;
+	
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHParticleTemplate.cpp b/main/source/mod/AvHParticleTemplate.cpp
new file mode 100644
index 00000000..1f810aa9
--- /dev/null
+++ b/main/source/mod/AvHParticleTemplate.cpp
@@ -0,0 +1,510 @@
+#include "util/nowarnings.h"
+#include "mod/AvHParticleTemplate.h"
+#include "common/renderingconst.h"
+
+AvHParticleTemplate::AvHParticleTemplate()
+{
+	// Populate with reasonable defaults
+	this->mMaxParticles = 10;
+	this->mParticleSize = 1.0f;
+	this->mBaseColor[0] = this->mBaseColor[1] = this->mBaseColor[2] = 1.0f;
+	this->mGravity[0] = this->mGravity[1] = this->mGravity[2] = 0.0f;
+
+	this->mGenerationShape = PS_Point;
+	memset(&this->mGenerationParams, 0, sizeof(this->mGenerationParams));
+
+	this->mDeathShape = PS_None;
+	memset(&this->mDeathParams, 0, sizeof(this->mDeathParams));
+	
+	this->mCollisionShape = PS_None;
+	memset(&this->mCollisionParams, 0, sizeof(this->mCollisionParams));
+
+	this->mStartingVelocityShape = PS_None;
+	memset(&this->mStartingVelocityParams, 0, sizeof(this->mStartingVelocityParams));
+
+	this->mMinSpeed = 0.0f;
+	this->mMaxSpeed = 100.0f;
+	this->mParticleSystemLifetime = -1;
+	this->mParticleLifetime = -1;
+	this->mNumSpriteFrames = 1;
+	this->mAnimationSpeed = 1.0f;
+	this->mParticleScaling = 1.0f;
+	this->mRenderMode = (int)kRenderNormal;
+	//this->mInitialParticles = 0;
+	this->mMaxAlpha = 1.0f;
+	this->mFadeIn = false;
+	this->mGenerationEntityParameter = 0.0f;
+	this->mGenerationEntityIndex = -1;
+	this->mFlags = 0;
+	this->mParticleSystemIndexToGenerate = -1;
+}
+
+//AvHParticleTemplate::AvHParticleTemplate(const AvHParticleTemplate& inTemplate)
+//{
+//	this->mMaxParticles = inTemplate.mMaxParticles;
+//	this->mName = inTemplate.mName;
+//	memcpy(&this->mBaseColor, &inTemplate.mBaseColor, sizeof(this->mBaseColor));
+//	memcpy(&this->mGravity, &inTemplate.mGravity, sizeof(this->mGravity));
+//
+//	this->mGenerationRate = inTemplate.mGenerationRate;
+//	this->mParticleSize = inTemplate.mParticleSize;
+//	this->mSprite = inTemplate.mSprite;
+//
+//	this->mGenerationShape = inTemplate.mGenerationShape;
+//	memcpy(&this->mGenerationParams, &inTemplate.mGenerationParams, sizeof(this->mGenerationParams));
+//
+//	this->mDeathShape = inTemplate.mDeathShape;
+//	memcpy(&this->mDeathParams, &inTemplate.mDeathParams, sizeof(this->mDeathParams));
+//	
+//	this->mCollisionShape = inTemplate.mCollisionShape;
+//	memcpy(&this->mCollisionParams, &inTemplate.mCollisionParams, sizeof(this->mCollisionParams));
+//	
+//	this->mMinSpeed = inTemplate.mMinSpeed;
+//	this->mMaxParticles = inTemplate.mMaxSpeed;
+//}
+
+
+bool
+AvHParticleTemplate::GetFadeIn() const
+{
+	return this->mFlags & 4;
+}
+
+bool
+AvHParticleTemplate::GetFadeOut() const
+{
+	return this->mFlags & 8;
+}
+
+bool 
+AvHParticleTemplate::GetUseDensity() const
+{
+	return this->mFlags & 2;
+}
+
+bool
+AvHParticleTemplate::GetUseWorldGravity() const
+{
+	return this->mFlags & 16;
+}
+
+bool
+AvHParticleTemplate::GetUseTrisNotQuads() const
+{
+	return this->mFlags & 32;
+}
+
+bool
+AvHParticleTemplate::GetMinimizeEdges() const
+{
+	return this->mFlags & 64;
+}
+
+bool
+AvHParticleTemplate::GetConstrainPitch() const
+{
+	return this->mFlags & 128;
+}
+
+bool
+AvHParticleTemplate::GetCollide() const
+{
+	return this->mFlags & 256;
+}
+
+bool
+AvHParticleTemplate::GetHighDetailOnly() const
+{
+	return this->mFlags & 512;
+}
+
+bool
+AvHParticleTemplate::GetFaceUp() const
+{
+	return this->mFlags & 1024;
+}
+
+int
+AvHParticleTemplate::GetFlags() const
+{
+	return this->mFlags;
+}
+
+void
+AvHParticleTemplate::SetFlags(int inFlags)
+{
+	this->mFlags = inFlags;
+}
+
+const string&
+AvHParticleTemplate::GetName() const
+{
+	return this->mName;
+}
+
+void
+AvHParticleTemplate::SetName(const string& inName)
+{
+	this->mName = inName;
+}
+
+//int 
+//AvHParticleTemplate::GetInitialParticles() const
+//{
+//	//return this->mInitialParticles;
+//	return this->mMaxParticles;
+//}
+
+//void 
+//AvHParticleTemplate::SetInitialParticles(int inInitialParticles)
+//{
+//	if(inInitialParticles < 0)
+//		inInitialParticles = 0;
+//
+//	this->mInitialParticles = inInitialParticles;
+//}
+
+uint32
+AvHParticleTemplate::GetMaxParticles() const
+{
+	return this->mMaxParticles;
+}
+
+float
+AvHParticleTemplate::GetParticleSize() const
+{
+	return this->mParticleSize;
+}
+
+float			
+AvHParticleTemplate::GetParticleSystemLifetime() const
+{
+	return this->mParticleSystemLifetime;
+}
+
+void
+AvHParticleTemplate::SetParticleSystemLifetime(float inNewLifetime)
+{
+	this->mParticleSystemLifetime = inNewLifetime;
+}
+
+float
+AvHParticleTemplate::GetParticleLifetime() const
+{
+	return this->mParticleLifetime;
+}
+
+void
+AvHParticleTemplate::SetParticleLifetime(float inNewLifetime)
+{
+	this->mParticleLifetime = inNewLifetime;
+}
+
+void
+AvHParticleTemplate::SetMaxParticles(uint32 inMaxParticles)
+{
+	this->mMaxParticles = inMaxParticles;
+}
+
+void
+AvHParticleTemplate::SetParticleSize(float inSize)
+{
+	this->mParticleSize = inSize;
+}
+
+string
+AvHParticleTemplate::GetSprite() const
+{
+	return this->mSprite;
+}
+
+void
+AvHParticleTemplate::SetSprite(string& inSpriteName)
+{
+	this->mSprite = inSpriteName;
+}
+
+ShapeType
+AvHParticleTemplate::GetGenerationShape() const
+{
+	return this->mGenerationShape;
+}
+
+void			
+AvHParticleTemplate::SetGenerationShape(ShapeType inShape)
+{
+	this->mGenerationShape = inShape;
+}
+
+string 
+AvHParticleTemplate::GetGenerationEntityName() const
+{
+	return this->mGenerationEntityName;
+}
+
+void
+AvHParticleTemplate::SetGenerationEntityName(const string& inName)
+{
+	this->mGenerationEntityName = inName;
+}
+
+string
+AvHParticleTemplate::GetParticleSystemToGenerate() const
+{
+	return this->mParticleSystemToGenerate;
+}
+
+void
+AvHParticleTemplate::SetParticleSystemToGenerate(const string& inName)
+{
+	this->mParticleSystemToGenerate = inName;
+}
+
+int
+AvHParticleTemplate::GetParticleSystemIndexToGenerate() const
+{
+	return this->mParticleSystemIndexToGenerate;
+}
+
+void
+AvHParticleTemplate::SetParticleSystemIndexToGenerate(int inIndex)
+{
+	this->mParticleSystemIndexToGenerate = inIndex;
+}
+
+int
+AvHParticleTemplate::GetGenerationEntityIndex() const
+{
+	return this->mGenerationEntityIndex;
+}
+
+void
+AvHParticleTemplate::SetGenerationEntityIndex(int inIndex)
+{
+	this->mGenerationEntityIndex = inIndex;
+}
+
+const float	
+AvHParticleTemplate::GetGenerationEntityParameter() const
+{
+	return this->mGenerationEntityParameter;
+}
+
+void
+AvHParticleTemplate::SetGenerationEntityParameter(float inEntityParameter)
+{
+	this->mGenerationEntityParameter = inEntityParameter;
+}
+
+void
+AvHParticleTemplate::GetGenerationParams(ParticleParams& outParams) const
+{
+	memcpy(outParams, this->mGenerationParams, sizeof(ParticleParams));
+}
+
+void			
+AvHParticleTemplate::SetGenerationParams(const ParticleParams& inParms)
+{
+	memcpy(this->mGenerationParams, inParms, sizeof(inParms));
+}
+
+uint32			
+AvHParticleTemplate::GetGenerationRate() const
+{
+	return this->mGenerationRate;
+}
+
+void			
+AvHParticleTemplate::SetGenerationRate(uint32 inGenRate)
+{
+	this->mGenerationRate = inGenRate;
+}
+
+void
+AvHParticleTemplate::GetGravity(PSVector& outGravity) const
+{
+	memcpy(&outGravity, &this->mGravity, sizeof(PSVector));
+}
+
+void			
+AvHParticleTemplate::SetGravity(const PSVector& inGravity)
+{
+	memcpy(&this->mGravity, &inGravity, sizeof(inGravity));
+}
+
+
+float			
+AvHParticleTemplate::GetAnimationSpeed() const
+{
+	return this->mAnimationSpeed;
+}
+
+void			
+AvHParticleTemplate::SetAnimationSpeed(float inSpeed)
+{
+	this->mAnimationSpeed = inSpeed;
+}
+
+int				
+AvHParticleTemplate::GetNumSpriteFrames(void) const
+{
+	return this->mNumSpriteFrames;
+}
+
+void			
+AvHParticleTemplate::SetNumSpriteFrames(int inFrames)
+{
+	this->mNumSpriteFrames = inFrames;
+}
+
+float 
+AvHParticleTemplate::GetMaxAlpha() const
+{
+	return this->mMaxAlpha;
+}
+
+void
+AvHParticleTemplate::SetMaxAlpha(float inMaxAlpha)
+{
+	if(inMaxAlpha > 1.0f)
+		inMaxAlpha = 1.0f;
+	if(inMaxAlpha < 0.0f)
+		inMaxAlpha = 0.0f;
+
+	this->mMaxAlpha = inMaxAlpha;
+}
+
+
+
+float
+AvHParticleTemplate::GetParticleScaling() const
+{
+	return this->mParticleScaling;
+}
+
+void
+AvHParticleTemplate::SetParticleScaling(float inScaling)
+{
+	this->mParticleScaling = inScaling;
+}
+
+int
+AvHParticleTemplate::GetRenderMode(void) const
+{
+	return this->mRenderMode;
+}
+
+void
+AvHParticleTemplate::SetRenderMode(int inRenderMode)
+{
+	this->mRenderMode = inRenderMode;
+}
+
+
+ShapeType
+AvHParticleTemplate::GetStartingVelocityShape() const
+{
+	return this->mStartingVelocityShape;
+}
+
+void
+AvHParticleTemplate::SetStartingVelocityShape(ShapeType inShape)
+{
+	this->mStartingVelocityShape = inShape;
+}
+
+void
+AvHParticleTemplate::GetStartingVelocityParams(ParticleParams& outParams) const
+{
+	memcpy(outParams, this->mStartingVelocityParams, sizeof(ParticleParams));
+}
+
+void
+AvHParticleTemplate::SetStartingVelocityParams(const ParticleParams& inParms)
+{
+	memcpy(this->mStartingVelocityParams, inParms, sizeof(inParms));
+}
+
+
+AvHParticleTemplateList::AvHParticleTemplateList()
+{
+}
+
+void 
+AvHParticleTemplateList::Clear()
+{
+	//for(ParticleTemplateListType::iterator theIter = this->mTemplateList.begin(); theIter != this->mTemplateList.end(); theIter++)
+	this->mTemplateList.clear();
+}
+
+int
+AvHParticleTemplateList::CreateTemplateFromIndex(int inBaseIndex)
+{
+	AvHParticleTemplate theNewTemplate;
+
+	if(inBaseIndex != -1)
+	{
+		ASSERT(inBaseIndex >= 0);
+		ASSERT(inBaseIndex < (signed)this->mTemplateList.size());
+		theNewTemplate = this->mTemplateList[inBaseIndex];
+	}
+
+	this->mTemplateList.push_back(theNewTemplate);
+	int theNewIndex = this->mTemplateList.size() - 1;
+		
+	return theNewIndex;
+}
+
+AvHParticleTemplate*
+AvHParticleTemplateList::GetTemplateAtIndex(uint32 inIndex)
+{
+	AvHParticleTemplate* theTemplate = NULL;
+
+	if(inIndex < this->mTemplateList.size())
+	{
+		theTemplate = &(this->mTemplateList[inIndex]);
+	}
+
+	return theTemplate;
+}
+
+const AvHParticleTemplate*
+AvHParticleTemplateList::GetTemplateAtIndex(uint32 inIndex) const
+{
+	const AvHParticleTemplate* theTemplate = NULL;
+
+	if(inIndex < this->mTemplateList.size())
+	{
+		theTemplate = &(this->mTemplateList[inIndex]);
+	}
+
+	return theTemplate;
+}
+
+bool
+AvHParticleTemplateList::GetTemplateIndexWithName(const string& inName, uint32& outIndex) const
+{
+	bool theSuccess = false;
+	uint32 theIndex = 0;
+	
+	ParticleTemplateListType::const_iterator theIter;
+
+	for(theIter = this->mTemplateList.begin(); theIter != this->mTemplateList.end(); theIter++, theIndex++)
+	{
+		if(theIter->GetName() == inName)
+		{
+			outIndex = theIndex;
+			theSuccess = true;
+			break;
+		}
+	}
+
+	return theSuccess;
+}
+
+uint32
+AvHParticleTemplateList::GetNumberTemplates() const
+{
+	return this->mTemplateList.size();
+}
+
diff --git a/main/source/mod/AvHParticleTemplate.h b/main/source/mod/AvHParticleTemplate.h
new file mode 100644
index 00000000..ac79aa72
--- /dev/null
+++ b/main/source/mod/AvHParticleTemplate.h
@@ -0,0 +1,202 @@
+#ifndef AVH_PARTICLE_TEMPLATE_H
+#define AVH_PARTICLE_TEMPLATE_H
+
+//
+// Describes a type of particle system
+// Exists both on client and server
+// Reads and writes from network stream
+// A list of these are created on the server after parsing modname.ps and mapname.ps
+// They are sent to the client on connect (they don't change during the game)
+// Order of list is identical on both client and server
+// Data and networking only, no particle behavior
+//
+#include "types.h"
+//#include "utils/common/mathlib.h"
+
+class AvHParticleTemplateList;
+
+// Data only, no behavior
+typedef enum
+{
+	PS_Point = 0,		// Single point
+	PS_Line = 1,		// Line segment
+	PS_Triangle = 2,	// Triangle
+	PS_Plane = 3,		// Arbitrarily-oriented plane
+	PS_Box = 4,			// Axis-aligned box
+	PS_Sphere = 5,		// Sphere
+	PS_Cylinder = 6,	// Cylinder
+	PS_Cone = 7,		// Cone
+	PS_Blob = 8,		// Gaussian blob
+	PS_Disc = 9,		// Arbitrarily-oriented disc
+	PS_Rectangle = 10,	// Rhombus-shaped planar region
+	PS_None = 11
+} ParticleShape;
+
+typedef	char		ShapeType;
+typedef	int32		ParticleParams[8];
+typedef float		PSVector[3];
+
+class AvHParticleTemplate
+{
+public:
+					AvHParticleTemplate();
+					//AvHParticleTemplate(const AvHParticleTemplate& inTemplate);
+
+	const string&	GetName() const;
+	void			SetName(const string& inName);
+
+	uint32			GetMaxParticles() const;
+	void			SetMaxParticles(uint32 inMaxParticles);
+
+	float			GetParticleSize() const;
+	void			SetParticleSize(float inSize);
+
+	float			GetParticleSystemLifetime() const;
+	void			SetParticleSystemLifetime(float inNewLifetime);
+
+	float			GetParticleLifetime() const;
+	void			SetParticleLifetime(float inNewLifetime);
+
+	string			GetSprite() const;
+	void			SetSprite(string& inSpriteName);
+
+	ShapeType		GetGenerationShape() const;
+	void			SetGenerationShape(ShapeType inShape);
+
+	string			GetGenerationEntityName() const;
+	void			SetGenerationEntityName(const string& inName);
+
+	string			GetParticleSystemToGenerate() const;
+	void			SetParticleSystemToGenerate(const string& inName);
+
+	int				GetParticleSystemIndexToGenerate() const;
+	void			SetParticleSystemIndexToGenerate(int inIndex);
+	
+	int				GetGenerationEntityIndex() const;
+	void			SetGenerationEntityIndex(int inIndex);
+
+	const float		GetGenerationEntityParameter() const;
+	void			SetGenerationEntityParameter(float inEntityParameter);
+	
+	ShapeType		GetStartingVelocityShape() const;
+	void			SetStartingVelocityShape(ShapeType inShape);
+
+	void			GetGenerationParams(ParticleParams& outParams) const;
+	void			SetGenerationParams(const ParticleParams& inParms);
+
+	void			GetStartingVelocityParams(ParticleParams& outParams) const;
+	void			SetStartingVelocityParams(const ParticleParams& inParms);
+
+	//int				GetInitialParticles() const;
+	//void			SetInitialParticles(int inInitialParticles);
+
+	uint32			GetGenerationRate() const;
+	void			SetGenerationRate(uint32 inGenRate);
+
+	bool			GetFadeIn() const;
+	bool			GetFadeOut() const;
+	bool			GetUseDensity() const;
+	bool			GetUseWorldGravity() const;
+	bool			GetUseTrisNotQuads() const;
+	bool			GetMinimizeEdges() const;
+	bool			GetConstrainPitch() const;
+	bool			GetCollide() const;
+	bool			GetHighDetailOnly() const;
+	bool			GetFaceUp() const;
+
+	int				GetFlags() const;
+	void			SetFlags(int inFlags);
+
+	void			GetGravity(PSVector& outGravity) const;
+	void			SetGravity(const PSVector& inGravity);
+
+	float			GetAnimationSpeed() const;
+	void			SetAnimationSpeed(float inSpeed);
+
+	int				GetNumSpriteFrames(void) const;
+	void			SetNumSpriteFrames(int inFrames);
+
+	float			GetParticleScaling() const;
+	void			SetParticleScaling(float inScaling);
+
+	int				GetRenderMode(void) const;
+	void			SetRenderMode(int inRenderMode);
+
+	float			GetMaxAlpha() const;
+	void			SetMaxAlpha(float inMaxAlpha);
+
+private:
+	string				mName;
+
+	uint32				mMaxParticles;
+
+	PSVector			mBaseColor;
+
+	string				mSprite;
+
+	float				mParticleSize;
+
+	float				mParticleSystemLifetime;
+
+	float				mParticleLifetime;
+
+	PSVector			mGravity;
+
+	uint32				mGenerationRate;
+
+	ShapeType			mGenerationShape;
+	ParticleParams		mGenerationParams;
+	int					mGenerationEntityIndex;
+	float				mGenerationEntityParameter;
+	string				mGenerationEntityName;
+	
+	ShapeType			mStartingVelocityShape;
+	ParticleParams		mStartingVelocityParams;
+
+	ShapeType			mDeathShape;
+	ParticleParams		mDeathParams;
+
+	ShapeType			mCollisionShape;
+	ParticleParams		mCollisionParams;
+
+	float				mMinSpeed;
+	float				mMaxSpeed;
+
+	int					mNumSpriteFrames;
+	float				mAnimationSpeed;
+	float				mParticleScaling;
+	int					mRenderMode;
+	float				mMaxAlpha;
+
+	//int					mInitialParticles;
+	bool				mFadeIn;
+	int					mFlags;
+	string				mParticleSystemToGenerate;
+	int					mParticleSystemIndexToGenerate;
+};
+
+// the template list creates all templates
+class AvHParticleTemplateList
+{
+public:
+								AvHParticleTemplateList();
+
+	virtual void				Clear();
+
+	int							CreateTemplateFromIndex(int inBaseIndex = -1);
+
+	AvHParticleTemplate*		GetTemplateAtIndex(uint32 inIndex);
+
+	const AvHParticleTemplate*	GetTemplateAtIndex(uint32 inIndex) const;
+
+	bool						GetTemplateIndexWithName(const string& inName, uint32& outIndex) const;
+
+	uint32						GetNumberTemplates() const;
+
+protected:
+
+	typedef vector<AvHParticleTemplate>		ParticleTemplateListType;
+	ParticleTemplateListType				mTemplateList;
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHParticleTemplateClient.cpp b/main/source/mod/AvHParticleTemplateClient.cpp
new file mode 100644
index 00000000..02506ba8
--- /dev/null
+++ b/main/source/mod/AvHParticleTemplateClient.cpp
@@ -0,0 +1,383 @@
+#include "AvHParticleTemplateClient.h"
+#include "cl_dll/hud.h"
+#include "cl_dll/parsemsg.h"
+#include "cl_dll/cl_util.h"
+#include "cl_dll/parsemsg.h"
+#include "cl_dll/demo.h"
+#include "common/demo_api.h"
+
+int	AvHParticleTemplateListClient::InitializeDemoPlayback(int inSize, unsigned char* inBuffer)
+{
+	// Read one particle template and add it to the list
+	int theBytesRead = 0;
+
+	AvHParticleTemplate theTemplate;
+
+	// Read all fields
+	string theTemplateName;
+	LoadStringData(theTemplateName, inBuffer, theBytesRead);
+	theTemplate.SetName(theTemplateName);
+
+	uint32 theMaxParticles;
+	LOAD_DATA(theMaxParticles);
+	theTemplate.SetMaxParticles(theMaxParticles);
+
+	float theParticleSize;
+	LOAD_DATA(theParticleSize);
+	theTemplate.SetParticleSize(theParticleSize);
+
+	float theParticleSystemLifetime;
+	LOAD_DATA(theParticleSystemLifetime);
+	theTemplate.SetParticleSystemLifetime(theParticleSystemLifetime);
+	
+	float theParticleLifetime;
+	LOAD_DATA(theParticleLifetime);
+	theTemplate.SetParticleLifetime(theParticleLifetime);
+	
+	string theSpriteName;
+	LoadStringData(theSpriteName, inBuffer, theBytesRead);
+	theTemplate.SetSprite(theSpriteName);
+
+	ShapeType theGenerationShape;
+	LOAD_DATA(theGenerationShape);
+	theTemplate.SetGenerationShape(theGenerationShape);
+
+	string theGenerationEntityName;
+	LoadStringData(theGenerationEntityName, inBuffer, theBytesRead);
+	theTemplate.SetGenerationEntityName(theGenerationEntityName);
+
+	string theParticleSystemToGenerate;
+	LoadStringData(theParticleSystemToGenerate, inBuffer, theBytesRead);
+	theTemplate.SetParticleSystemToGenerate(theParticleSystemToGenerate);
+
+	int theParticleSystemIndexToGenerate;
+	LOAD_DATA(theParticleSystemIndexToGenerate);
+	theTemplate.SetParticleSystemIndexToGenerate(theParticleSystemIndexToGenerate);
+
+	int theGenerationEntityIndex;
+	LOAD_DATA(theGenerationEntityIndex);
+	theTemplate.SetGenerationEntityIndex(theGenerationEntityIndex);
+	
+	float theGenerationEntityParameter;
+	LOAD_DATA(theGenerationEntityParameter);
+	theTemplate.SetGenerationEntityParameter(theGenerationEntityParameter);
+
+	ShapeType theStartingVelocityShape;
+	LOAD_DATA(theStartingVelocityShape);
+	theTemplate.SetStartingVelocityShape(theStartingVelocityShape);
+
+	ParticleParams theGenerationParams;
+	LOAD_DATA(theGenerationParams);
+	theTemplate.SetGenerationParams(theGenerationParams);
+
+	ParticleParams theStartingVelocityParams;
+	LOAD_DATA(theStartingVelocityParams);
+	theTemplate.SetStartingVelocityParams(theStartingVelocityParams);
+
+	uint32 theGenerationRate;
+	LOAD_DATA(theGenerationRate);
+	theTemplate.SetGenerationRate(theGenerationRate);
+
+	int theParticleFlags;
+	LOAD_DATA(theParticleFlags);
+	theTemplate.SetFlags(theParticleFlags);
+
+	PSVector theGravity;
+	LOAD_DATA(theGravity);
+	theTemplate.SetGravity(theGravity);
+
+	float theAnimationSpeed;
+	LOAD_DATA(theAnimationSpeed);
+	theTemplate.SetAnimationSpeed(theAnimationSpeed);
+
+	int theNumSpriteFrames;
+	LOAD_DATA(theNumSpriteFrames);
+	theTemplate.SetNumSpriteFrames(theNumSpriteFrames);
+
+	float theParticleScaling;
+	LOAD_DATA(theParticleScaling);
+	theTemplate.SetParticleScaling(theParticleScaling);
+
+	int theRenderMode;
+	LOAD_DATA(theRenderMode);
+	theTemplate.SetRenderMode(theRenderMode);
+
+	float theMaxAlpha;
+	LOAD_DATA(theMaxAlpha);
+	theTemplate.SetMaxAlpha(theMaxAlpha);
+
+	// Save the template
+	this->mTemplateList.push_back(theTemplate);
+
+	return theBytesRead;
+}
+
+void AvHParticleTemplateListClient::InitializeDemoRecording() const
+{
+	// Loop through all our particle templates, and write out each one 
+	int theNumTemplates = this->GetNumberTemplates();
+	for(int i = 0; i < theNumTemplates; i++)
+	{
+		const AvHParticleTemplate* theTemplate = this->GetTemplateAtIndex(i);
+		ASSERT(theTemplate);
+
+		int theTotalSize = 0;
+
+		// Calculate total size needed to store template
+		string theTemplateName = theTemplate->GetName();
+		theTotalSize += GetDataSize(theTemplateName);
+
+		uint32 theMaxParticles = theTemplate->GetMaxParticles();
+		theTotalSize += sizeof(theMaxParticles);
+
+		float theParticleSize = theTemplate->GetParticleSize();
+		theTotalSize += sizeof(theParticleSize);
+
+		float theParticleSystemLifetime = theTemplate->GetParticleSystemLifetime();
+		theTotalSize += sizeof(theParticleSystemLifetime);
+
+		float theParticleLifetime = theTemplate->GetParticleLifetime();
+		theTotalSize += sizeof(theParticleLifetime);
+
+		string theSpriteName = theTemplate->GetSprite();
+		theTotalSize += GetDataSize(theSpriteName);
+
+		ShapeType theGenerationShape = theTemplate->GetGenerationShape();
+		theTotalSize += sizeof(theGenerationShape);
+
+		string theGenerationEntityName = theTemplate->GetGenerationEntityName();
+		theTotalSize += GetDataSize(theGenerationEntityName);
+
+		string theParticleSystemToGenerate = theTemplate->GetParticleSystemToGenerate();
+		theTotalSize += GetDataSize(theParticleSystemToGenerate);
+
+		int theParticleSystemIndexToGenerate = theTemplate->GetParticleSystemIndexToGenerate();
+		theTotalSize += sizeof(theParticleSystemIndexToGenerate);
+
+		int theGenerationEntityIndex = theTemplate->GetGenerationEntityIndex();
+		theTotalSize += sizeof(theGenerationEntityIndex);
+
+		float theGenerationEntityParam = theTemplate->GetGenerationEntityParameter();
+		theTotalSize += sizeof(theGenerationEntityParam);
+
+		ShapeType theStartingVelocityShape = theTemplate->GetStartingVelocityShape();
+		theTotalSize += sizeof(theStartingVelocityShape);
+
+		ParticleParams theGenerationParams;
+		theTemplate->GetGenerationParams(theGenerationParams);
+		theTotalSize += sizeof(theGenerationParams);
+
+		ParticleParams theStartingVelocityParams;
+		theTemplate->GetStartingVelocityParams(theStartingVelocityParams);
+		theTotalSize += sizeof(theStartingVelocityParams);
+
+		uint32 theGenerationRate = theTemplate->GetGenerationRate();
+		theTotalSize += sizeof(theGenerationRate);
+
+		int theParticleFlags = theTemplate->GetFlags();
+		theTotalSize += sizeof(theParticleFlags);
+
+		PSVector theGravity;
+		theTemplate->GetGravity(theGravity);
+		theTotalSize += sizeof(theGravity);
+
+		float theAnimationSpeed = theTemplate->GetAnimationSpeed();
+		theTotalSize += sizeof(theAnimationSpeed);
+
+		int theNumSpriteFrames = theTemplate->GetNumSpriteFrames();
+		theTotalSize += sizeof(theNumSpriteFrames);
+
+		float theParticleScaling = theTemplate->GetParticleScaling();
+		theTotalSize += sizeof(theParticleScaling);
+
+		int theRenderMode = theTemplate->GetRenderMode();
+		theTotalSize += sizeof(theRenderMode);
+
+		float theMaxAlpha = theTemplate->GetMaxAlpha();
+		theTotalSize += sizeof(theMaxAlpha);
+
+		// New memory 
+		unsigned char* theCharArray = new unsigned char[theTotalSize];
+		ASSERT(theCharArray);
+		int theCounter = 0;
+
+		// Write out each field
+		SaveStringData(theCharArray, theTemplateName, theCounter);
+		SAVE_DATA(theMaxParticles);
+		SAVE_DATA(theParticleSize);
+		SAVE_DATA(theParticleSystemLifetime);
+		SAVE_DATA(theParticleLifetime);
+		SaveStringData(theCharArray, theSpriteName, theCounter);
+		SAVE_DATA(theGenerationShape);
+		SaveStringData(theCharArray, theGenerationEntityName, theCounter);
+		SaveStringData(theCharArray, theParticleSystemToGenerate, theCounter);
+		SAVE_DATA(theParticleSystemIndexToGenerate);
+		SAVE_DATA(theGenerationEntityIndex);
+		SAVE_DATA(theGenerationEntityParam);
+		SAVE_DATA(theStartingVelocityShape);
+		SAVE_DATA(theGenerationParams);
+		SAVE_DATA(theStartingVelocityParams);
+		SAVE_DATA(theGenerationRate);
+		SAVE_DATA(theParticleFlags);
+		SAVE_DATA(theGravity);
+		SAVE_DATA(theAnimationSpeed);
+		SAVE_DATA(theNumSpriteFrames);
+		SAVE_DATA(theParticleScaling);
+		SAVE_DATA(theRenderMode);
+		SAVE_DATA(theMaxAlpha);
+
+		// Make sure we wrote exact amount of data we were supposed to
+		ASSERT(theTotalSize == theCounter);
+		
+		Demo_WriteBuffer(TYPE_PARTICLES, theTotalSize, theCharArray);
+	}
+}
+
+// Clears out the templates and receives all new ones
+int32 
+AvHParticleTemplateListClient::ReceiveFromNetworkStream()
+{
+	int32 theBytesReceived = 0;
+
+	//this->mTemplateList.clear();
+
+	// Receive number of templates
+	//int theNumTemplates = READ_LONG();
+	//theBytesReceived += 4;
+
+	//for(int theLoop = 0; theLoop < theNumTemplates; theLoop++)
+	//{
+		// Read each one
+		AvHParticleTemplate theNewTemplate;
+
+		// Read name
+		char* theName = READ_STRING();
+		string theStringName = string(theName);
+		theNewTemplate.SetName(theStringName);
+		theBytesReceived += theStringName.length();
+
+		// Read max particles
+		uint32 theMaxParticles = READ_LONG();
+		theNewTemplate.SetMaxParticles(theMaxParticles);
+		theBytesReceived += 4;
+
+		// Read particle size
+		float theParticleSize = READ_COORD();
+		theNewTemplate.SetParticleSize(theParticleSize);
+		theBytesReceived += 4;
+
+		// Read sprite name
+		char* theStr = READ_STRING();
+		theStringName = theStr;
+		theNewTemplate.SetSprite(theStringName);
+		theBytesReceived += theStringName.length();
+
+		// Read particle SYSTEM lifetime
+		float theParticleSystemLifetime = (float)(READ_COORD());
+		theNewTemplate.SetParticleSystemLifetime(theParticleSystemLifetime);
+		theBytesReceived += 4;
+
+		// Read particle lifetime
+		float theParticleLifetime = (float)(READ_COORD());
+		theNewTemplate.SetParticleLifetime(theParticleLifetime);
+		theBytesReceived += 4;
+
+		// Animation speed
+		float theAnimSpeed = (float)READ_COORD();
+		theNewTemplate.SetAnimationSpeed(theAnimSpeed);
+		theBytesReceived += 4;
+
+		// Num frames in sprite
+		int theNumSpriteFrames = READ_BYTE();
+		theNewTemplate.SetNumSpriteFrames(theNumSpriteFrames);
+		theBytesReceived++;
+
+		// Scale particle over course of its life
+		float theParticleScaling = (float)READ_COORD();
+		theNewTemplate.SetParticleScaling(theParticleScaling);
+		theBytesReceived += 4;
+
+		// Render mode
+		int theRenderMode = READ_BYTE();
+		theNewTemplate.SetRenderMode(theRenderMode);
+		theBytesReceived++;
+
+		// Read gen rate as long
+		uint32 theGenRate = READ_LONG();
+		theNewTemplate.SetGenerationRate(theGenRate);
+		theBytesReceived += 4;
+
+		// Read gen shape
+		ShapeType theGenerationShape = READ_BYTE();
+		theNewTemplate.SetGenerationShape(theGenerationShape);
+		theBytesReceived += 1;
+
+		// Read the generation params as 8 longs
+		uint32 theInnerLoop;
+		ParticleParams theGenParams;
+		for(theInnerLoop = 0; theInnerLoop < 8; theInnerLoop++)
+		{
+			theGenParams[theInnerLoop] = READ_LONG();
+		}
+		theNewTemplate.SetGenerationParams(theGenParams);
+		theBytesReceived += 32;
+
+		// Read generation entity name (if any)
+		int theGenerationEntityIndex = READ_LONG();
+		theNewTemplate.SetGenerationEntityIndex(theGenerationEntityIndex);
+		theBytesReceived += 4;
+
+		// Read generation entity param
+		float theGenerationEntityParam = READ_COORD();
+		theNewTemplate.SetGenerationEntityParameter(theGenerationEntityParam);
+		theBytesReceived += 4;
+		
+		// Read starting velocity shape
+		ShapeType theStartingVelocityShape = READ_BYTE();
+		theNewTemplate.SetStartingVelocityShape(theStartingVelocityShape);
+		theBytesReceived += 1;
+		
+		// Read the starting velocity params as 8 longs
+		ParticleParams theVelParams;
+		for(theInnerLoop = 0; theInnerLoop < 8; theInnerLoop++)
+		{
+			theVelParams[theInnerLoop] = READ_LONG();
+		}
+		theNewTemplate.SetStartingVelocityParams(theVelParams);
+		theBytesReceived += 32;
+		
+		// Read gravity
+		PSVector theGravity;
+		for(theInnerLoop = 0; theInnerLoop < 3; theInnerLoop++)
+		{
+			theGravity[theInnerLoop] = READ_COORD();
+		}
+		theNewTemplate.SetGravity(theGravity);
+		theBytesReceived += 12;
+		
+		// Read number initial particles
+		//int theNumInitialParticles = READ_LONG();
+		//theNewTemplate.SetInitialParticles(theNumInitialParticles);
+		//theBytesReceived += 4;
+		
+		float theMaxAlpha = READ_COORD();
+		theNewTemplate.SetMaxAlpha(theMaxAlpha);
+		theBytesReceived += 4;
+		
+		// Read particle system to generate
+		int theParticleSystemIndexToGenerate = READ_LONG();
+		theNewTemplate.SetParticleSystemIndexToGenerate(theParticleSystemIndexToGenerate);
+		theBytesReceived += 4;
+		
+		// Read flags
+		int theFlags = READ_LONG();
+		theNewTemplate.SetFlags(theFlags);
+		theBytesReceived += 4;
+		
+		// Add it on the end
+		this->mTemplateList.insert(this->mTemplateList.end(), theNewTemplate);
+	//}
+
+	return theBytesReceived;
+}
+
diff --git a/main/source/mod/AvHParticleTemplateClient.h b/main/source/mod/AvHParticleTemplateClient.h
new file mode 100644
index 00000000..9178f7a8
--- /dev/null
+++ b/main/source/mod/AvHParticleTemplateClient.h
@@ -0,0 +1,19 @@
+#ifndef AVH_PARTICLETEMPLATECLIENT_H
+#define AVH_PARTICLETEMPLATECLIENT_H
+
+#include "mod/AvHParticleTemplate.h"
+
+class AvHParticleTemplateListClient : public AvHParticleTemplateList
+{
+public:
+	int						InitializeDemoPlayback(int inSize, unsigned char* inBuffer);
+	void					InitializeDemoRecording() const;
+	
+	// Clears out the templates and receives all new ones
+	int32					ReceiveFromNetworkStream();
+
+private:
+
+};
+
+#endif
diff --git a/main/source/mod/AvHParticleTemplateServer.cpp b/main/source/mod/AvHParticleTemplateServer.cpp
new file mode 100644
index 00000000..eb3e8284
--- /dev/null
+++ b/main/source/mod/AvHParticleTemplateServer.cpp
@@ -0,0 +1,405 @@
+#include "util/nowarnings.h"
+#include "mod/AvHParticleTemplateServer.h"
+#include "dlls/util.h"
+#include "util/STLUtil.h"
+#include "mod/AvHParticleConstants.h"
+
+void
+AvHParticleTemplateListServer::Clear()
+{
+	AvHParticleTemplateList::Clear();
+	this->mCreatedTemplates = false;
+}
+
+void
+AvHParticleTemplateListServer::AddTemplatesFromFile(const string& inRelativeFileName)
+{
+}
+
+bool
+AvHParticleTemplateListServer::AddAttributesToTemplate(uint32 inTemplateIndex, const KeyValueData* inData)
+{
+	// TODO: Implement this for avh_particles_custom entity
+	return false;
+}
+
+bool
+AvHParticleTemplateListServer::CreateTemplates(const TRDescriptionList& inDescriptions)
+{
+	bool theSuccess = false;
+
+	TRDescriptionList::const_iterator	theIterator;
+	for(theIterator = inDescriptions.begin(); theIterator != inDescriptions.end(); theIterator++)
+	{
+		if(theIterator->GetType() == kpscSystemName)
+		{
+			// Create named particle system
+			AvHParticleTemplate theTemplate;
+			theTemplate.SetName(theIterator->GetName());
+
+			int theMaxParticles;
+			if(theIterator->GetTagValue(kpscNumParticles, theMaxParticles))
+			{
+				theTemplate.SetMaxParticles((uint32)theMaxParticles);
+			}
+
+			int theFlags;
+			if(theIterator->GetTagValue(kpscSpawnFlags, theFlags))
+			{
+				theTemplate.SetFlags(theFlags);
+			}
+
+			float theParticleSize;
+			if(theIterator->GetTagValue(kpscSize, theParticleSize))
+			{
+				theTemplate.SetParticleSize(theParticleSize);
+			}
+
+			//string theBaseColor;
+			//if(theIterator->GetTagValue(kpscBaseColor, theBaseColor))
+			//{
+			//}
+
+			float theParticleAnimationSpeed;
+			if(theIterator->GetTagValue(kpscAnimationSpeed, theParticleAnimationSpeed))
+			{
+				theTemplate.SetAnimationSpeed(theParticleAnimationSpeed);
+			}
+
+			float theParticleNumSpriteFrames;
+			if(theIterator->GetTagValue(kpscSpriteNumFrames, theParticleNumSpriteFrames))
+			{
+				theTemplate.SetNumSpriteFrames(theParticleNumSpriteFrames);
+			}
+
+			float theParticleSystemLifetime;
+			if(theIterator->GetTagValue(kpscSystemLifetime, theParticleSystemLifetime))
+			{
+				theTemplate.SetParticleSystemLifetime(theParticleSystemLifetime);
+			}
+
+			float theParticleLifetime;
+			if(theIterator->GetTagValue(kpscParticleLifetime, theParticleLifetime))
+			{
+				theTemplate.SetParticleLifetime(theParticleLifetime);
+			}
+
+			string theSprite;
+			if(theIterator->GetTagValue(kpscSprite, theSprite))
+			{
+				theTemplate.SetSprite(theSprite);
+			}
+
+			float theParticleScaling;
+			if(theIterator->GetTagValue(kpscScale, theParticleScaling))
+			{
+				theTemplate.SetParticleScaling(theParticleScaling);
+			}
+
+			int theParticleRenderMode;
+			if(theIterator->GetTagValue(kpscRendermode, theParticleRenderMode))
+			{
+				theTemplate.SetRenderMode(theParticleRenderMode);
+			}
+
+			int theParticleGenerationRate;
+			if(theIterator->GetTagValue(kpscGenRate, theParticleGenerationRate))
+			{
+				theTemplate.SetGenerationRate(theParticleGenerationRate);
+			}
+
+			string theGenerationShape;
+			if(theIterator->GetTagValue(kpscGenShape, theGenerationShape))
+			{
+				ShapeType theShape;
+				if(this->GetShapeTypeFromValue(theGenerationShape, theShape))
+				{
+					theTemplate.SetGenerationShape(theShape);
+				}
+			}
+
+			string theGenerationParameters;
+			if(theIterator->GetTagValue(kpscGenShapeParams, theGenerationParameters))
+			{
+				ParticleParams theParticleParams;
+				if(8 == sscanf(theGenerationParameters.c_str(), "%d,%d,%d,%d,%d,%d,%d,%d", theParticleParams+0, theParticleParams+1, theParticleParams+2,theParticleParams+3, theParticleParams+4, theParticleParams+5, theParticleParams+6, theParticleParams+7))
+				{
+					theTemplate.SetGenerationParams(theParticleParams);
+				}
+			}
+
+			string theStartingVelocityShape;
+			if(theIterator->GetTagValue(kpscVelocityShape, theStartingVelocityShape))
+			{
+				ShapeType theShape;
+				if(this->GetShapeTypeFromValue(theStartingVelocityShape, theShape))
+				{
+					theTemplate.SetStartingVelocityShape(theShape);
+				}
+			}
+
+			string theStartingVelocityParameters;
+			if(theIterator->GetTagValue(kpscVelocityParams, theStartingVelocityParameters))
+			{
+				ParticleParams theParticleParams;
+				if(8 == sscanf(theStartingVelocityParameters.c_str(), "%d,%d,%d,%d,%d,%d,%d,%d", theParticleParams+0, theParticleParams+1, theParticleParams+2,theParticleParams+3, theParticleParams+4, theParticleParams+5, theParticleParams+6, theParticleParams+7))
+				{
+					theTemplate.SetStartingVelocityParams(theParticleParams);
+				}
+			}
+
+			float theMaxAlpha;
+			if(theIterator->GetTagValue(kpscMaxAlpha, theMaxAlpha))
+			{
+				theTemplate.SetMaxAlpha(theMaxAlpha);
+			}
+
+//			float theParticleMinSpeed;
+//			if(theIterator->GetTagValue("particleMinSpeed", theParticleMinSpeed))
+//			{
+//			}
+//
+//			float theParticleMaxSpeed;
+//			if(theIterator->GetTagValue("particleMaxSpeed", theParticleMaxSpeed))
+//			{
+//			}
+
+			//int theInitialParticles;
+			//if(theIterator->GetTagValue("particleInitialParticles", theInitialParticles))
+			//{
+			//	theTemplate.SetInitialParticles(theInitialParticles);
+			//}
+
+			// TODO: Add flags into .ps
+			//int theFadeIn;
+			//if(theIterator->GetTagValue("particleFadeIn", theFadeIn))
+			//{
+			//	if(theFadeIn)
+			//		theTemplate.SetFadeIn();
+			//}
+			
+			// Add it on the end
+			this->mTemplateList.insert(this->mTemplateList.end(), theTemplate);
+
+			theSuccess = true;
+		}
+	}
+
+	this->mCreatedTemplates = theSuccess;
+
+	return theSuccess;
+}
+
+
+bool
+AvHParticleTemplateListServer::CreateTemplate(const KeyValueData* inData, uint32& outIndex)
+{
+	// TODO: Implement this for avh_particles_custom entity
+	return false;
+}
+
+
+bool
+AvHParticleTemplateListServer::GetCreatedTemplates(void) const
+{
+	return this->mCreatedTemplates;
+}
+
+
+bool
+AvHParticleTemplateListServer::GetTemplateIndexWithName(const string& inName, uint32& outIndex) const
+{
+	ParticleTemplateListType::const_iterator	theIterator;
+	uint32										theIndex = 0;
+	bool										theSuccess = false;
+
+	string theLowercaseInName = LowercaseString(inName);
+
+	for(theIterator = this->mTemplateList.begin(); theIterator != this->mTemplateList.end(); theIterator++, theIndex++)
+	{
+		string theLowercaseTemplateName = LowercaseString(theIterator->GetName());
+
+		// Make case-insensitive?
+		if(theLowercaseInName == theLowercaseTemplateName)
+		{
+			outIndex = theIndex;
+			theSuccess = true;
+			break;
+		}
+	}
+	
+	return theSuccess;
+}
+
+bool
+AvHParticleTemplateListServer::GetShapeTypeFromValue(const string& inValueName, ShapeType& outShape)
+{
+	bool theSuccess = false;
+	
+	if(inValueName == "Point")
+	{
+		outShape = PS_Point;
+		theSuccess = true;
+	}
+	else if(inValueName == "Cone")
+	{
+		outShape = PS_Cone;
+		theSuccess = true;
+	}
+	else if(inValueName == "Box")
+	{
+		outShape = PS_Box;
+		theSuccess = true;
+	}
+				
+	return theSuccess;
+}
+
+void
+AvHParticleTemplateListServer::LinkToEntities(AvHParticleTemplate* inTemplate)
+{
+	// Look up entity names and matchup to indices	
+	string theEntityName = inTemplate->GetGenerationEntityName();
+	const char* theEntityNameCStr = theEntityName.c_str();
+	if(!FStrEq(theEntityNameCStr, ""))
+	{
+		edict_t* theEdict = FIND_ENTITY_BY_TARGETNAME(NULL, theEntityNameCStr);
+		if(!FNullEnt(theEdict))
+		{
+			int theEntityIndex = ENTINDEX(theEdict);
+			inTemplate->SetGenerationEntityIndex(theEntityIndex);
+		}
+	}
+
+	string theParticleSystemToGenerate = inTemplate->GetParticleSystemToGenerate();
+	if(!FStrEq(theParticleSystemToGenerate.c_str(), ""))
+	{
+		// Lookup particle system and remember index
+		uint32 theIndex = -1;
+		if(this->GetTemplateIndexWithName(theParticleSystemToGenerate, theIndex))
+		{
+			inTemplate->SetParticleSystemIndexToGenerate(theIndex);
+		}
+	}
+}
+
+bool
+AvHParticleTemplateListServer::SendToNetworkStream()
+{
+	bool theSuccess = false;
+
+	if(this->mCreatedTemplates)
+	{
+		int theNumTemplates = this->mTemplateList.size();
+		
+		// Send number of particle templates
+		WRITE_LONG(theNumTemplates);
+		
+		// For each one
+		for(int theLoop = 0; theLoop < theNumTemplates; theLoop++)
+		{
+			// Send it
+			const AvHParticleTemplate* theTemplate = this->GetTemplateAtIndex(theLoop);
+			if(theTemplate)
+			{
+				this->SendTemplateToNetworkStream(theTemplate);
+			}
+			else
+			{
+				// Emit some error
+			}
+			theSuccess = true;
+		}
+	}
+	return theSuccess;
+}
+
+
+void
+AvHParticleTemplateListServer::SendTemplateToNetworkStream(const AvHParticleTemplate* inTemplate)
+{
+	int theLoop;
+
+	// send name of PS...necessary?
+	WRITE_STRING(inTemplate->GetName().c_str());
+
+	// Send max particles
+	WRITE_LONG(inTemplate->GetMaxParticles());
+
+	// Send particle size
+	WRITE_COORD(inTemplate->GetParticleSize());
+
+	// Send sprite
+	WRITE_STRING(inTemplate->GetSprite().c_str());
+
+	// Write system lifetime
+	WRITE_COORD(inTemplate->GetParticleSystemLifetime());
+
+	// Write particle lifetime
+	WRITE_COORD(inTemplate->GetParticleLifetime());
+
+	// Animation speed
+	WRITE_COORD(inTemplate->GetAnimationSpeed());
+
+	// Num frames in sprite
+	WRITE_BYTE(inTemplate->GetNumSpriteFrames());
+
+	// Particle scaling
+	WRITE_COORD(inTemplate->GetParticleScaling());
+
+	// Render mode
+	WRITE_BYTE(inTemplate->GetRenderMode());
+
+	// Write gen rate as long
+	WRITE_LONG(inTemplate->GetGenerationRate());
+	
+	// Write shape as char
+	WRITE_BYTE((char)(inTemplate->GetGenerationShape()));
+
+	// Write the generation params as 8 longs
+	ParticleParams theGenParams;
+	inTemplate->GetGenerationParams(theGenParams);
+	for(theLoop = 0; theLoop < 8; theLoop++)
+	{
+		WRITE_LONG(theGenParams[theLoop]);
+	}
+
+	// Send generation entity name (if any)
+	WRITE_LONG(inTemplate->GetGenerationEntityIndex());
+
+	// Send generation entity param
+	WRITE_COORD(inTemplate->GetGenerationEntityParameter());
+
+	// Send starting velocity shape
+	WRITE_BYTE(inTemplate->GetStartingVelocityShape());
+
+	// Send starting velocity params
+	ParticleParams theVelParams;
+	inTemplate->GetStartingVelocityParams(theVelParams);
+	for(theLoop = 0; theLoop < 8; theLoop++)
+	{
+		WRITE_LONG(theVelParams[theLoop]);
+	}
+
+	// Write gravity as three floats
+	PSVector theGravity;
+	inTemplate->GetGravity(theGravity);
+	for(theLoop = 0; theLoop < 3; theLoop++)
+	{
+		WRITE_COORD(theGravity[theLoop]);
+	}
+
+	// Write number initial particles
+	//WRITE_LONG(inTemplate->GetInitialParticles());
+
+	float theMaxAlpha = inTemplate->GetMaxAlpha();
+	WRITE_COORD(theMaxAlpha);
+
+	// Send index of ps to generate
+	int theParticleSystemIndexToGenerate = inTemplate->GetParticleSystemIndexToGenerate();
+	WRITE_LONG(theParticleSystemIndexToGenerate);
+
+	// Write flags
+	int theFlags = inTemplate->GetFlags();
+	WRITE_LONG(theFlags);
+}
diff --git a/main/source/mod/AvHParticleTemplateServer.h b/main/source/mod/AvHParticleTemplateServer.h
new file mode 100644
index 00000000..d72bbb6d
--- /dev/null
+++ b/main/source/mod/AvHParticleTemplateServer.h
@@ -0,0 +1,42 @@
+#ifndef AVH_PARTICLETEMPLATESERVER_H
+#define AVH_PARTICLETEMPLATESERVER_H
+
+#include "mod/AvHParticleTemplate.h"
+#include "textrep/TRDescription.h"
+#include "dlls/extdll.h"
+#include "common/const.h"
+#include "engine/eiface.h"
+
+class AvHParticleTemplateListServer : public AvHParticleTemplateList
+{
+public:
+	void		Clear();
+	
+	void		AddTemplatesFromFile(const string& inRelativeFileName);
+
+	bool		AddAttributesToTemplate(uint32 inTemplateIndex, const KeyValueData* inData);
+
+	bool		CreateTemplates(const TRDescriptionList& inDescriptions);
+
+	bool		CreateTemplate(const KeyValueData* inData, uint32& outIndex);
+
+	bool		GetCreatedTemplates(void) const;
+
+	bool		GetTemplateIndexWithName(const string& inName, uint32& outIndex) const;
+
+	void		LinkToEntities(AvHParticleTemplate* inTemplate);
+
+    bool        SendToNetworkStream();
+
+	void		SendTemplateToNetworkStream(const AvHParticleTemplate* inTemplate);
+
+private:
+
+	bool		GetShapeTypeFromValue(const string& inValueName, ShapeType& outType);
+
+	bool		mCreatedTemplates;
+
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHPieMenuHandler.cpp b/main/source/mod/AvHPieMenuHandler.cpp
new file mode 100644
index 00000000..96e207b3
--- /dev/null
+++ b/main/source/mod/AvHPieMenuHandler.cpp
@@ -0,0 +1,419 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHPieMenuHandler.cpp $
+// $Date: 2002/09/25 20:49:23 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHPieMenuHandler.cpp,v $
+// Revision 1.23  2002/09/25 20:49:23  Flayra
+// - New select sound for aliens
+//
+// Revision 1.22  2002/09/23 22:24:16  Flayra
+// - Removed NSTR #ifdefs
+//
+// Revision 1.21  2002/09/09 20:00:56  Flayra
+// - Pop-up menu now stays open if you open and close it really fast (ie, right click)
+//
+// Revision 1.20  2002/08/31 18:01:02  Flayra
+// - Work at VALVe
+//
+// Revision 1.19  2002/08/16 02:40:51  Flayra
+// - HUD sounds no longer cut each other off (they won't play instead of cutting off another sound)
+//
+// Revision 1.18  2002/08/09 01:08:45  Flayra
+// - Debugging code
+//
+// Revision 1.17  2002/07/08 17:12:49  Flayra
+// - Renamed pop-up menu command, reworked it to be a regular bind
+//
+//===============================================================================
+#include "util/nowarnings.h"
+#include "ui/PieMenu.h"
+#include "ui/PieNode.h"
+#include "mod/AvHPieMenuHandler.h"
+#include "mod/AvHTeamHierarchy.h"
+#include "mod/AvHMessage.h"
+#include "mod/AvHClientVariables.h"
+#include "mod/AvHCommandConstants.h"
+#include "cdll_int.h"
+#include "types.h"
+#include <string>
+using std::string;
+
+#include "cl_dll/demo.h"
+#include "common/demo_api.h"
+
+void IN_ResetMouse();
+
+extern int g_weaponselect;
+extern int in_impulse;
+bool sTheDebugBool = false;
+
+PieNode* AvHPieMenuHandler::sLastNodeHighlighted = NULL;
+string AvHPieMenuHandler::sPieMenuName = "";
+float AvHPieMenuHandler::sTimeLastNodeHighlighted = 0.0f;
+float AvHPieMenuHandler::sTimeMenuOpened = 0.0f;
+bool AvHPieMenuHandler::sPieMenuOpen = false;
+
+bool AvHPieMenuHandler::GetIsPieMenuOpen(void)
+{
+    return sPieMenuOpen;
+}
+
+PieMenu* AvHPieMenuHandler::GetActivePieMenu()
+{
+    PieMenu* thePieMenu = NULL;
+
+    gHUD.GetManager().GetVGUIComponentNamed(sPieMenuName, thePieMenu);
+
+    return thePieMenu;
+}
+
+void AvHPieMenuHandler::ClosePieMenu(void)
+{
+
+    if (!sPieMenuOpen)
+    {
+        return;
+    }
+
+	//CenterPrint("AvHPieMenuHandler::closePieMenu.\n");
+
+	// If the action was really quick, choose the highlighted node so overshooting isn't a problem
+	PieNode* theNode = NULL;
+	
+	float theCurrentTime = gEngfuncs.GetClientTime();
+	float theQuickThreshold = cl_quickselecttime->value;
+	bool theReallyQuick = (theCurrentTime - sTimeLastNodeHighlighted < theQuickThreshold);
+	if(theReallyQuick)
+	{
+		//CenterPrint("Quick mode.\n");
+		PieMenu* thePieMenu = NULL;
+		if(gHUD.GetManager().GetVGUIComponentNamed(sPieMenuName, thePieMenu))
+		{
+			thePieMenu->GetSelectedNode(theNode);
+		}
+	}
+	else
+	{
+		//CenterPrint("Regular mode.\n");
+		theNode = dynamic_cast<PieNode*>(sLastNodeHighlighted);
+	}
+	
+	if(theNode)
+	{
+		NodeChosen(theNode->GetNodeName(), theNode->GetMessageID());
+	}
+	else
+	{
+		NodeCancelled();
+	}
+
+    // Reset the mouse cursor to the center of the screen so
+    // that the view doesn't jog once the pie menu is closed.
+
+	IN_ResetMouse();
+    gHUD.ShowCrosshair();
+
+    sPieMenuOpen = false;
+
+}
+
+void AvHPieMenuHandler::InternalClosePieMenu(void)
+{
+    PieMenu* theMarineMenu = NULL;
+
+    if(gHUD.GetManager().GetVGUIComponentNamed(sPieMenuName, theMarineMenu))
+    {
+        // TODO: Select option on menu before closing it!
+		if(!gHUD.GetInTopDownMode())
+		{
+			gHUD.GetManager().SetMouseVisibility(false);
+		}
+
+        theMarineMenu->SetFadeState(false);
+        if(sLastNodeHighlighted)
+        {
+            sLastNodeHighlighted->SetDrawSelected(false);
+        }
+        sLastNodeHighlighted = NULL;
+
+//        if(sTheDebugBool)
+//        {
+//            AvHTeamHierarchy* theHierarchyComponent = NULL;
+//            if(gHUD.GetManager().GetVGUIComponentNamed(kHierarchy, theHierarchyComponent))
+//            {
+//                theHierarchyComponent->setVisible(true);
+//            }
+//        }
+
+    }
+
+}
+
+void AvHPieMenuHandler::OpenPieMenu(void)
+{
+    PieMenu* theMarineMenu = NULL;
+
+	//CenterPrint("AvHPieMenuHandler::openPieMenu.\n");
+		
+	// Pie menu only active when playing
+	AvHUser3 theUser3 = gHUD.GetHUDUser3();
+	if(theUser3 > AVH_USER3_NONE && theUser3 <= AVH_USER3_ALIEN_PLAYER5)
+	{
+		if(gHUD.GetPlayMode() == PLAYMODE_PLAYING)
+		{
+			if(gHUD.GetManager().GetVGUIComponentNamed(sPieMenuName, theMarineMenu))
+			{
+				if(!gHUD.GetInTopDownMode())
+				{
+					gHUD.GetManager().SetMouseVisibility(true);
+				}
+
+                gHUD.HideCrosshair();
+                
+				// Only do this when in full screen
+				//App::getInstance()->setCursorPos(ScreenWidth/2, ScreenHeight/2);
+	
+				theMarineMenu->SetFadeState(true);
+				sLastNodeHighlighted = theMarineMenu->GetRootNode();
+				sLastNodeHighlighted->SetDrawSelected(true);
+				sTimeMenuOpened = gEngfuncs.GetClientTime();
+				sTimeLastNodeHighlighted = sTimeMenuOpened;
+                sPieMenuOpen = true;
+
+				
+				//        if(sTheDebugBool)
+				//        {
+				//            AvHTeamHierarchy* theHierarchyComponent = NULL;
+				//            if(gHUD.GetManager().GetVGUIComponentNamed(kHierarchy, theHierarchyComponent))
+				//            {
+				//                theHierarchyComponent->setVisible(false);
+				//            }
+				//        }
+			}
+		}
+	}
+}
+
+void AvHPieMenuHandler::NodeCancelled()
+{
+    InternalClosePieMenu();
+}
+
+void AvHPieMenuHandler::NodeChosen(const string& /*inNodeName*/, int inMessageID)
+{
+//	char* theSound = kSelectSound;
+//	if(gHUD.GetIsAlien())
+//	{
+//		theSound = kSelectAlienSound;
+//	}
+//	gHUD.PlayHUDSound(theSound, .3f);
+
+	gHUD.PlayHUDSound(HUD_SOUND_SELECT);
+
+	// Client-side effects
+	switch(inMessageID)
+	{
+		case COMM_CHAT_PUBLIC:
+			// TODO: Pop up message saying to hit enter to send or escape to cancel message
+			ClientCmd(kcGlobalChat);
+			break;
+		
+		case COMM_CHAT_TEAM:
+			// TODO: Pop up message saying to hit enter to send or escape to cancel message
+			ClientCmd(kcTeamChat);
+			break;
+
+		case COMM_CHAT_NEARBY:
+			ClientCmd(kcNearbyChat);
+			break;
+
+		default:
+		    in_impulse = inMessageID;
+			break;
+	}
+
+    InternalClosePieMenu();
+}
+
+void AvHPieMenuHandler::NodeActivated(const string& inNodeName)
+{
+}
+
+string AvHPieMenuHandler::GetPieMenuControl()
+{
+	return sPieMenuName;
+}
+
+void AvHPieMenuHandler::SetPieMenuControl(const string& inPieMenuName)
+{
+	sPieMenuName = inPieMenuName;
+}
+
+void AvHPieMenuHandler::cursorMoved(int x,int y,Panel* panel)
+{
+//	char theMessage[128];
+//	sprintf(theMessage, "AvHPieMenuHandler::cursorMoved %d, %d (panel ptr: %d).\n", x, y, (int)panel);
+//	CenterPrint(theMessage);
+}
+
+void AvHPieMenuHandler::cursorEntered(Panel* panel)
+{
+    PieNode* theNode = dynamic_cast<PieNode*>(panel);
+    if(theNode)
+    {
+        if(theNode->GetFadeState())
+        {
+            if((theNode->IsAdjacentTo(sLastNodeHighlighted)) || (theNode->GetIsAbove(sLastNodeHighlighted)))
+            {
+                //char theTempBuffer[256];
+                //sprintf(theTempBuffer, "Cursor entered %s.\n", theNode->GetNodeName().c_str());
+                //CenterPrint(theTempBuffer);
+
+				// Check if enabled
+				//if(theNode->GetEnabled())
+				//{
+					//theNode->SetAllChildrenFadeState(false);
+					if(theNode->HighlightNode())
+					{
+						if(!theNode->GetIsAbove(sLastNodeHighlighted))
+						{
+							if(gHUD.GetIsAlien())
+							{
+								gHUD.PlayHUDSound(kPieSelectForwardAlienSound, kHUDSoundVolume);
+							}
+							else
+							{
+								gHUD.PlayHUDSound(kPieSelectForwardSound, kHUDSoundVolume);
+							}
+						}
+						else
+						{
+							if(gHUD.GetIsAlien())
+							{
+								gHUD.PlayHUDSound(kPieSelectBackwardAlienSound, kHUDSoundVolume);
+							}
+							else
+							{
+								gHUD.PlayHUDSound(kPieSelectBackwardSound, kHUDSoundVolume);
+							}
+						}
+						
+						sLastNodeHighlighted->SetDrawSelected(false);
+						
+						sLastNodeHighlighted = theNode;
+
+						sTimeLastNodeHighlighted = gEngfuncs.GetClientTime();
+						
+						theNode->SetDrawSelected(true);
+					}
+				//}
+            }
+        }
+    }
+}
+
+void AvHPieMenuHandler::cursorExited(Panel* panel)
+{
+//	CenterPrint("AvHPieMenuHandler::cursorExited.\n");
+	
+//    PieNode* theNode = dynamic_cast<PieNode*>(panel);
+//    if(theNode)
+//    {
+//        char theTempBuffer[256];
+//        sprintf(theTempBuffer, "Cursor exited %s.\n", theNode->GetNodeName().c_str());
+//        CenterPrint(theTempBuffer);
+//
+//        theNode->SetNodeAndAdjacentChildrenFadeState(false);
+//    }
+}
+
+void AvHPieMenuHandler::mousePressed(MouseCode code,Panel* panel)
+{
+//	CenterPrint("AvHPieMenuHandler::mousePressed.\n");
+}
+
+void AvHPieMenuHandler::mouseDoublePressed(MouseCode code,Panel* panel)
+{
+//	CenterPrint("AvHPieMenuHandler::mouseDoublePressed.\n");
+}
+
+void AvHPieMenuHandler::mouseReleased(MouseCode code, Panel* inPanel)
+{
+
+    //	CenterPrint("AvHPieMenuHandler::mouseReleased.\n");
+	
+//	ClientCmd("-popupmenu");
+//	ClosePieMenu();
+//
+//    if(code == MOUSE_RIGHT)
+//    {
+//		// If the action was really quick, choose the highlighted node so overshooting isn't a problem
+		PieMenu* thePieMenu = NULL;
+		PieNode* theNode = NULL;
+
+		float theCurrentTime = gEngfuncs.GetClientTime();
+		float kQuickThreshold = cl_quickselecttime->value;
+		bool theReallyQuick = (theCurrentTime - sTimeLastNodeHighlighted < kQuickThreshold);
+		if(theReallyQuick)
+		{
+			//CenterPrint("Quick mode.\n");
+			if(gHUD.GetManager().GetVGUIComponentNamed(sPieMenuName, thePieMenu))
+			{
+				thePieMenu->GetSelectedNode(theNode);
+			}
+		}
+		else
+		{
+			//CenterPrint("Regular mode.\n");
+			theNode = dynamic_cast<PieNode*>(inPanel);
+		}
+
+		if(theNode)
+		{
+			// Don't close menu if they released over the root node and it was really quick
+			if(thePieMenu && (theNode == thePieMenu->GetRootNode()) && ((theCurrentTime -  sTimeMenuOpened) < .3f))
+			{
+				int a = 0;
+			}
+			else
+			{
+				NodeChosen(theNode->GetNodeName(), theNode->GetMessageID());
+			}
+		}
+        else
+        {
+            NodeCancelled();
+        }
+//    }
+}
+
+void AvHPieMenuHandler::mouseWheeled(int delta,Panel* panel)
+{
+}
+
+void AvHPieMenuHandler::keyPressed(KeyCode code,Panel* panel)
+{
+}
+
+void AvHPieMenuHandler::keyTyped(KeyCode code,Panel* panel)
+{
+}
+
+void AvHPieMenuHandler::keyReleased(KeyCode code,Panel* panel)
+{
+}
+
+void AvHPieMenuHandler::keyFocusTicked(Panel* panel)
+{
+}
+
+
diff --git a/main/source/mod/AvHPieMenuHandler.h b/main/source/mod/AvHPieMenuHandler.h
new file mode 100644
index 00000000..2fe2c400
--- /dev/null
+++ b/main/source/mod/AvHPieMenuHandler.h
@@ -0,0 +1,46 @@
+#ifndef AVHPIEMENUHANDLER_H
+#define AVHPIEMENUHANDLER_H
+
+#include <VGUI_InputSignal.h>
+
+using namespace vgui;
+class PieNode;
+
+class AvHPieMenuHandler : public InputSignal
+{
+public:
+    static void ClosePieMenu(void);
+    static void OpenPieMenu(void);
+    static bool GetIsPieMenuOpen(void);
+    static PieMenu* GetActivePieMenu(void);
+    
+    //static void MouseClosePieMenu(void);
+    //static void MouseOpenPieMenu(void);
+	
+    static void NodeCancelled(void);
+    static void NodeChosen(const string& inNodeName, int inMessageID);
+    static void NodeActivated(const string& inNodeName);
+	static string GetPieMenuControl();
+	static void SetPieMenuControl(const string& inPieMenuName);
+
+	virtual void cursorMoved(int x,int y,Panel* panel);
+	virtual void cursorEntered(Panel* panel);
+	virtual void cursorExited(Panel* panel);
+	virtual void mousePressed(MouseCode code,Panel* panel);
+	virtual void mouseDoublePressed(MouseCode code,Panel* panel);
+	virtual void mouseReleased(MouseCode code,Panel* panel);
+	virtual void mouseWheeled(int delta,Panel* panel);
+	virtual void keyPressed(KeyCode code,Panel* panel);
+	virtual void keyTyped(KeyCode code,Panel* panel);
+	virtual void keyReleased(KeyCode code,Panel* panel);
+	virtual void keyFocusTicked(Panel* panel);
+private:
+    static void InternalClosePieMenu(void);
+    static PieNode*		sLastNodeHighlighted;
+	static string		sPieMenuName;
+	static float		sTimeLastNodeHighlighted;
+	static float		sTimeMenuOpened;
+    static bool         sPieMenuOpen;
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHPistol.cpp b/main/source/mod/AvHPistol.cpp
new file mode 100644
index 00000000..89ede431
--- /dev/null
+++ b/main/source/mod/AvHPistol.cpp
@@ -0,0 +1,207 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHPistol.cpp $
+// $Date: 2002/11/22 21:28:17 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHPistol.cpp,v $
+// Revision 1.13  2002/11/22 21:28:17  Flayra
+// - mp_consistency changes
+//
+// Revision 1.12  2002/10/16 20:53:09  Flayra
+// - Removed weapon upgrade sounds
+//
+// Revision 1.11  2002/10/03 18:46:58  Flayra
+// - Added heavy view model
+//
+// Revision 1.10  2002/08/09 01:09:00  Flayra
+// - Made pistol faster to deploy
+//
+// Revision 1.9  2002/07/24 19:09:17  Flayra
+// - Linux issues
+//
+// Revision 1.8  2002/07/24 18:45:42  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.7  2002/07/08 17:08:52  Flayra
+// - Tweaked for bullet spread
+//
+// Revision 1.6  2002/06/25 17:50:59  Flayra
+// - Reworking for correct player animations and new enable/disable state, new view model artwork, alien weapon refactoring
+//
+// Revision 1.5  2002/06/03 16:37:31  Flayra
+// - Constants and tweaks to make weapon anims and times correct with new artwork, added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.4  2002/05/28 17:44:58  Flayra
+// - Tweak weapon deploy volume, as Valve's sounds weren't normalized
+//
+// Revision 1.3  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHMarineWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHMarineWeapons.h"
+#include "dlls/util.h"
+
+LINK_ENTITY_TO_CLASS(kwPistol, AvHPistol);
+void V_PunchAxis( int axis, float punch );
+
+void AvHPistol::Init()
+{
+	this->mRange = kHGRange;
+	this->mDamage = BALANCE_IVAR(kHGDamage);
+}
+
+int	AvHPistol::GetBarrelLength() const
+{
+	return kHGBarrelLength;
+}
+
+float AvHPistol::GetRateOfFire() const
+{
+    return BALANCE_FVAR(kHGROF);
+}
+
+int	AvHPistol::GetDeployAnimation() const
+{
+	return 6;
+}
+
+char* AvHPistol::GetDeploySound() const
+{
+	return kHGDeploySound;
+}
+
+float AvHPistol::GetDeployTime() const
+{
+	return .35f;
+}
+
+int	AvHPistol::GetEmptyShootAnimation() const
+{
+	return 5;
+}
+
+char* AvHPistol::GetHeavyViewModel() const
+{
+	return kHGHVVModel;
+}
+
+char* AvHPistol::GetPlayerModel() const
+{
+	return kHGPModel;
+}
+
+Vector AvHPistol::GetProjectileSpread() const
+{
+	return kHGSpread;
+}
+
+char* AvHPistol::GetViewModel() const
+{
+	return kHGVModel;
+}
+
+char* AvHPistol::GetWorldModel() const
+{
+	return kHGWModel;
+}
+
+int	AvHPistol::GetReloadAnimation() const
+{
+	int theReloadAnimation = 2;
+
+	// If empty, use empty reload
+	bool theHasAmmo = (this->m_iClip > 0);// || (this->m_pPlayer->m_rgAmmo[this->m_iPrimaryAmmoType] > 0);
+	if(!theHasAmmo)
+	{
+		theReloadAnimation = 3;
+	}
+	else
+	{
+		int a = 0;
+	}
+
+	return theReloadAnimation;
+}
+
+
+int	AvHPistol::GetShootAnimation() const
+{
+	return 4;
+}
+
+bool AvHPistol::GetHasMuzzleFlash() const
+{
+	return true;
+}
+
+bool AvHPistol::GetMustPressTriggerForEachShot() const
+{ 
+	return true;
+}
+
+float AvHPistol::GetReloadTime(void) const
+{
+	return 3.0f;
+}
+
+void AvHPistol::Precache()
+{
+	AvHMarineWeapon::Precache();
+
+	PRECACHE_UNMODIFIED_MODEL(kHGEjectModel);
+
+	PRECACHE_UNMODIFIED_SOUND(kHGFireSound1);
+	
+	#ifdef AVH_UPGRADE_SOUNDS
+	PRECACHE_UNMODIFIED_SOUND(kHGFireSound2);
+	PRECACHE_UNMODIFIED_SOUND(kHGFireSound3);
+	PRECACHE_UNMODIFIED_SOUND(kHGFireSound4);
+	#endif
+
+	PRECACHE_UNMODIFIED_SOUND(kHGReloadSound);
+
+	PRECACHE_UNMODIFIED_MODEL(kGenericWallpuff);
+	
+	this->mEvent = PRECACHE_EVENT(1, kHGEventName);
+}
+
+
+void AvHPistol::Spawn() 
+{ 
+    AvHMarineWeapon::Spawn(); 
+
+	Precache();
+
+	this->m_iId = AVH_WEAPON_PISTOL;
+	this->m_iDefaultAmmo = BALANCE_IVAR(kHGMaxClip)*BALANCE_IVAR(kMarineSpawnClips);
+
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsPistol);
+
+	SET_MODEL(ENT(this->pev), kHGWModel);
+
+	FallInit();// get ready to fall down.
+} 
+
diff --git a/main/source/mod/AvHPlayer.cpp b/main/source/mod/AvHPlayer.cpp
new file mode 100644
index 00000000..1e128288
--- /dev/null
+++ b/main/source/mod/AvHPlayer.cpp
@@ -0,0 +1,10965 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHPlayer.cpp $
+// $Date: 2002/11/22 21:18:24 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHPlayer.cpp,v $
+// Revision 1.86  2002/11/22 21:18:24  Flayra
+// - Potentially fixed strange Onos collision crash
+// - Don't allow player to join team after he's seen another team
+// - "lastinv" support
+// - Fixed perma-cloak bug after losing last sensory chamber whilst cloaked
+// - Started fixing commander PAS problem
+// - Fixed readyroom "ghost player" exploit when F4 during REIN
+// - Draw damage in debug, never otherwise
+//
+// Revision 1.85  2002/11/15 04:42:50  Flayra
+// - Regenerate now returns true if healing was successful
+// - Logging changes and fixes
+//
+// Revision 1.84  2002/11/13 01:49:08  Flayra
+// - Proper death message logging for Psychostats
+//
+// Revision 1.83  2002/11/12 22:39:25  Flayra
+// - Logging changes for Psychostats compatibility
+//
+// Revision 1.82  2002/11/12 18:44:54  Flayra
+// - Added mp_logdetail support for damage messages
+// - Changed the alien ability anti-exploit code to try to co-exist with scripters
+//
+// Revision 1.81  2002/11/12 02:28:39  Flayra
+// - Fixed problems with armor not being updated when armor upgrades completed
+// - Aliens now keep same percentage of health and armor when morphing
+// - Much better logging, up to standard
+// - Don't add enemy buildings to hive sight unless parasited (solves blip spam)
+// - Removed draw damage from public build
+// - Changes to minimap to less overflows at end of big games
+//
+// Revision 1.80  2002/11/06 01:38:54  Flayra
+// - Damage refactoring (TakeDamage assumes caller has already adjusted for friendly fire, etc.)
+// - Regeneration update
+//
+// Revision 1.79  2002/11/05 06:17:26  Flayra
+// - Balance changes
+//
+// Revision 1.78  2002/10/28 20:36:18  Flayra
+// - Updated auth mask
+//
+// Revision 1.77  2002/10/25 21:48:01  Flayra
+// - Added more auth masks
+// - Moved mSkin to pev->skin so playerclass could hold what used to be mPlayMode could be used to quickly perform culling, to try to prevent overflowage at the end of large games
+//
+// Revision 1.76  2002/10/24 21:40:02  Flayra
+// - Reworked jetpack effect
+// - Authicons update
+// - Set builder for alien buildings, so turret kills can credit builder
+// - Alien easter eggs
+// - Network optimizations after game reset on huge (20-32) player games
+// - Allow server ops to disable auth icons
+// - Alien energy tweaks
+// - Show unbuilt hives in hive sight
+// - Move alien energy updating fully into shared code
+// - Tried to fix full health ring showing for dead selected players
+// - Moved help text client-side
+// - Cache info_locations and gamma until map change
+// - Skin fixes
+//
+// Revision 1.75  2002/10/20 21:10:57  Flayra
+// - Optimizations
+//
+// Revision 1.74  2002/10/20 16:36:37  Flayra
+// - Code optimization!  Took forever to find.
+//
+// Revision 1.73  2002/10/20 02:36:14  Flayra
+// - Regular update
+//
+// Revision 1.72  2002/10/19 22:33:44  Flayra
+// - Various server optimizations
+//
+// Revision 1.71  2002/10/18 22:21:54  Flayra
+// - Limit alien buildings in sphere
+// - Fix various spawning problems (morphing as level 5, redemption for level 5)
+// - Max motd length fix
+//
+// Revision 1.70  2002/10/17 17:34:09  Flayra
+// - Authmask update
+// - Part 1 of persistent weapons fix (found with Grendel)
+//
+// Revision 1.69  2002/10/16 20:55:40  Flayra
+// - Debug code for tracking down death animation problems
+// - Updated auth masks
+//
+// Revision 1.68  2002/10/16 01:05:38  Flayra
+// - Sent health as short for big aliens
+// - Fixed sayings not triggering commander alerts
+// - Now name changes are queued until the next match
+// - Added authmask support
+// - Egg idle sounds play more frequently, refactored too
+// - Fixed preserving model in ready room after game end
+// - Profiling of AddToFullPack
+// - Fix for falling through lifts when morphing on them (untested)
+//
+// Revision 1.67  2002/10/04 18:04:07  Flayra
+// - Fixed floating gestation sacs
+// - Aliens now fall all the way to ground during countdown (instead of floating and shaking)
+//
+// Revision 1.66  2002/10/03 20:24:39  Flayra
+// - Changes for "more resources required"
+//
+// Revision 1.65  2002/10/03 19:32:06  Flayra
+// - Reworked orders completely
+// - Send max resources to players
+// - Heavy armor sped up slightly
+// - Kill players who illegally try to use alien abilities
+// - Moved energy to a new variable, send health for aliens
+// - Only freeze players during countdown
+// - Removed slowdown when taking damage
+// - Send blips in two messages, one friendly and one enemy (old bad hack)
+//
+// Revision 1.64  2002/09/25 20:50:03  Flayra
+// - Added 3 new sayings
+// - Frame-rate independent updating
+// - Don't allow player to kill self while commanding
+//
+// Revision 1.63  2002/09/23 22:27:52  Flayra
+// - Added skin support
+// - Added client connected/disconnected hooks for particle system propagation optimizations
+// - Removed power armor, added heavy armor
+// - Fixed death animations
+// - Added hook to see if commander has given an order and to see if he's idle
+// - Bound resources for aliens
+// - Soldiers asking for ammo and health trigger commander alert
+// - Added gestation anims
+// - Slowed down Onos movement
+// - When cheats are enabled, purchases are free
+//
+// Revision 1.62  2002/09/09 20:04:53  Flayra
+// - Added commander voting
+// - Commander score is now the average of the rest of his players (reverted back when he leaves CC)
+// - Fixed bug where upgrades were getting removed and then add repeatedly
+// - Added multiple skins for marines
+// - Play sound when aliens lose an upgrade
+// - Changed fov to 90 for all aliens for software compatibility
+// - Added hiveinfo drawing
+// - Tweaked marine and alien speeds (to compensate for loss of drastic alien fov)
+//
+// Revision 1.61  2002/08/31 18:01:02  Flayra
+// - Work at VALVe
+//
+// Revision 1.60  2002/08/16 02:42:57  Flayra
+// - New damage types
+// - Much more efficient blip calculation (at least it should be, I haven't measured it so who really knows)
+// - New way of representing ensnare state for shared code (disabling jumping, jetpacking)
+// - Removed old overwatch code
+// - Store health in fuser2 for drawing health for commander
+// - Swap bile bomb and umbra
+//
+// Revision 1.59  2002/08/09 01:10:30  Flayra
+// - Keep previous model when a game is over and going back to ready room
+// - Refactoring for scoreboard
+// - Support for "jump" animation
+// - Freeze player before game starts
+// - Reset score when leaving a team
+//
+// Revision 1.58  2002/08/02 21:52:18  Flayra
+// - Cleaned up jetpacks, made webbing useful again, help messages, added "orderself" cheat, changed gestation messages for new tooltip system, added GetHasAvailableUpgrades() for help system, removed particle template messages, slowed down particle template update rate to reduce overflows (woo!)
+//
+// Revision 1.57  2002/07/28 19:21:28  Flayra
+// - Balance changes after/during RC4a
+//
+// Revision 1.56  2002/07/26 23:07:53  Flayra
+// - Numerical feedback
+// - New artwork for marine, with jetpack as body group (this code doesn't work)
+// - Misc. fixes (alien vision mode not being preserved when it should, and staying when it shouldn't)
+//
+// Revision 1.55  2002/07/24 18:45:42  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.54  2002/07/23 17:17:57  Flayra
+// - Added power armor, added "talking" state for hive sight, changes for new resource model, removed max buildings, create buildings with random orientation, added stimpack, tweaked redemption, added new hive sight info
+//
+// Revision 1.53  2002/07/10 14:44:39  Flayra
+// - Draw chat text while dead (bug #280)
+//
+// Revision 1.52  2002/07/08 17:15:39  Flayra
+// - Added validation of all impulses (assumes invalid by default, instead of valid), reset players like all other entities, ensnaring fixes, players are temporarily invulnerable when they spawn, preserve health and armor when using command station, fixed up redemption, add hooks for commander voting and going back to the ready room, models can't be changed via the console anymore
+//
+// Revision 1.51  2002/07/01 22:41:40  Flayra
+// - Removed outdated overwatch target and tension events
+//
+// Revision 1.50  2002/07/01 21:43:16  Flayra
+// - Removed outdated adrenaline concept, added new alien sight mode, primal scream, removed flashlight battery message, fixed morphing problems for level 5 (and others), tweaked marine and alien speeds, fixed triple speed upgrade problem, disabled overwatch, moved player assets out of precache() (wasn't being called reliably), get full energy after a lifeform change, hive sight only draws out of sight now, added scent of fear
+//
+// Revision 1.49  2002/06/25 18:13:57  Flayra
+// - Added death animations, added more general animation support, leaps do damage, general construct effects, new alien inventory system, added charging, info_locations, galloping, new alien building code, better morphing system (prevents getting stuck), more builder error messages, clear deaths on game end, hide health while gestating
+//
+// Revision 1.48  2002/06/10 20:03:13  Flayra
+// - Updated for new minimap (remember killed position).  Updated blood so marines aren't bloody, and aliens emit yellow blood.  Removed slowing when hit (now players fly back when hit though), UpdateBlips() hack (fix when time)
+//
+// Revision 1.47  2002/06/03 16:54:59  Flayra
+// - Added more effective player classes for scoreboard, send player class every time role changes (more network usage, always updated), changed hive sight to always be visible when under attack, all entities added to hive sight, not just players
+//
+// Revision 1.46  2002/05/28 18:03:40  Flayra
+// - Refactored size for role code for movement chambers, deal with inventory properly (entity leak), increased web ensnaring effects (put weapon away!), reinforcement refactoring, tweaked speeds so marines are a little slower, and speed upgrade works properly again (now level 1 can generally outrun marines), added recycling support, play destroy egg sound when killed when morphing, new hive sight, EffectivePlayerClassChanged() refactoring
+//
+// Revision 1.45  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "util/nowarnings.h"
+#include "mod/AvHPlayer.h"
+#include "mod/AvHMessage.h"
+#include "mod/AvHParticleTemplateServer.h"
+#include "mod/AvHEntities.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHServerVariables.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHMarineWeapons.h"
+#include "dlls/client.h"
+#include "dlls/util.h"
+#include "mod/AvHSoundListManager.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHMarineEquipment.h"
+#include "mod/AvHTitles.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "mod/AvHParticleTemplate.h"
+#include "common/vector_util.h"
+#include "dlls/roach.h"
+#include "mod/AvHSelectionHelper.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHDramaticPriority.h"
+#include "mod/AvHHulls.h"
+#include "mod/AvHMovementUtil.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHParticleSystemEntity.h"
+#include "mod/AvHAlienAbilities.h"
+#include "mod/AvHAlienAbilityConstants.h"
+#include "mod/AvHAlienEquipmentConstants.h"
+#include "mod/AvHMarineTurret.h"
+#include "mod/AvHSiegeTurret.h"
+#include "mod/AvHBlipConstants.h"
+#include "mod/AvHParticleConstants.h"
+#include "mod/UPPUtil.h"
+#include "util/MathUtil.h"
+#include "types.h"
+
+extern int giPrecacheGrunt;
+extern int gmsgShake;
+extern int gmsgFade;
+extern int gmsgSelAmmo;
+//extern int gmsgFlashlight;
+//extern int gmsgFlashBattery;
+extern int gmsgResetHUD;
+extern int gmsgInitHUD;
+extern int gmsgShowGameTitle;
+extern int gmsgCurWeapon;
+extern int gmsgHealth;
+extern int gmsgDamage;
+extern int gmsgBattery;
+extern int gmsgTrain;
+extern int gmsgLogo;
+extern int gmsgWeaponList;
+extern int gmsgAmmoX;
+extern int gmsgTeamNames;
+extern int gmsgStatusText;
+extern int gmsgStatusValue;
+extern int gmsgHudText;
+extern int gmsgHudText2;
+extern int gmsgDeathMsg;
+extern int gmsgScoreInfo;
+extern int gmsgTeamInfo;
+extern int gmsgTeamScore;
+extern int gmsgGameMode;
+extern int gmsgMOTD;
+extern int gmsgServerName;
+extern int gmsgAmmoPickup;
+extern int gmsgWeapPickup;
+extern int gmsgItemPickup;
+extern int gmsgHideWeapon;
+extern int gmsgSetCurWeap;
+extern int gmsgSayText;
+extern int gmsgTextMsg;
+extern int gmsgSetFOV;
+extern int gmsgShowMenu;
+extern int gmsgGeigerRange;
+//extern int gmsgSendCorpse;
+
+// AvH message ids
+int gmsgUpdateEntityHierarchy;
+int gmsgSetParticleTemplates;
+int gmsgSetSoundNames;
+int gmsgPlayHUDNotification;
+//int gmsgChangeNodeCost;
+int gmsgGameStatus;
+int gmsgUpdateCountdown;
+int gmsgSetSelect;
+int gmsgSetOrder;
+//int gmsgCplteOrder;
+int gmsgSetTechNodes;
+int gmsgSetupMap;
+int gmsgSetTopDown;
+//int gmsgResearch;
+int gmsgEditPS;
+int gmsgListPS;
+int gmsgSetGammaRamp;
+int gmsgBlipList;
+int gmsgAlienInfo;
+int gmsgDebugCSP;
+//int gmsgNetScreenShot;
+int gmsgBuildMiniMap;
+int gmsgProgressBar;
+int gmsgFog;
+int gmsgClientScripts;
+int gmsgSetTechSlots;
+int gmsgBalanceVar;
+int gmsgServerVar;
+
+extern int gJetpackEventID;
+extern int gAlienSightOnEventID;
+extern int gAlienSightOffEventID;
+extern int gStartOverwatchEventID;
+extern int gEndOverwatchEventID;
+extern int gRegenerationEventID;
+extern int gStartCloakEventID;
+extern int gEndCloakEventID;
+extern int gNumFullPackCalls;
+extern int gWeaponAnimationEventID;
+extern int gMetabolizeSuccessEventID;
+extern int gPhaseInEventID;
+
+// Yucky globals
+extern AvHParticleTemplateListServer    gParticleTemplateList;
+extern AvHSoundListManager              gSoundListManager;
+extern cvar_t                           allow_spectators;
+extern cvar_t                           avh_marinereinforcementcost;
+extern cvar_t                           avh_uplink;
+
+#ifdef DEBUG
+extern cvar_t                           avh_spawninvulnerabletime;
+#endif
+
+AvHSelectionHelper                      gSelectionHelper;
+extern vec3_t                           gPMDebugPoint;
+extern void ResetPlayerPVS( edict_t *client, int clientnum );
+
+LINK_ENTITY_TO_CLASS( player, AvHPlayer );
+
+const float kTransitionFadeTime = .6f;
+const float kSpawnInFadeTime = .9f;
+
+void LinkUserMessages( void )
+{
+    // Already taken care of?
+    if ( gmsgSelAmmo )
+    {
+        return;
+    }
+
+    gmsgSelAmmo = REG_USER_MSG("SelAmmo", sizeof(SelAmmo));
+    gmsgCurWeapon = REG_USER_MSG("CurWeapon", 4);
+    gmsgGeigerRange = REG_USER_MSG("Geiger", 1);
+    //gmsgFlashlight = REG_USER_MSG("Flashlight", 2);
+    //gmsgFlashBattery = REG_USER_MSG("FlashBat", 1);
+    gmsgHealth = REG_USER_MSG( "Health", 2 );
+    gmsgDamage = REG_USER_MSG( "Damage", 12 );
+    gmsgBattery = REG_USER_MSG( "Battery", 2);
+    gmsgTrain = REG_USER_MSG( "Train", 1);
+    gmsgHudText = REG_USER_MSG( "HudText", -1 );
+    gmsgHudText2 = REG_USER_MSG( "HudText2", -1 );
+    gmsgSayText = REG_USER_MSG( "SayText", -1 );
+    gmsgTextMsg = REG_USER_MSG( "TextMsg", -1 );
+    gmsgWeaponList = REG_USER_MSG("WeaponList", -1);
+    gmsgResetHUD = REG_USER_MSG("ResetHUD", 1);     // called every respawn
+    gmsgInitHUD = REG_USER_MSG("InitHUD", 0 );      // called every time a new player joins the server
+    gmsgShowGameTitle = REG_USER_MSG("GameTitle", 1);
+    gmsgDeathMsg = REG_USER_MSG( "DeathMsg", -1 );
+    gmsgScoreInfo = REG_USER_MSG( "ScoreInfo", -1 );
+    gmsgTeamInfo = REG_USER_MSG( "TeamInfo", -1 );  // sets the name of a player's team
+    gmsgTeamScore = REG_USER_MSG( "TeamScore", -1 );  // sets the score of a team on the scoreboard
+    gmsgGameMode = REG_USER_MSG( "GameMode", 1 );
+    gmsgMOTD = REG_USER_MSG( "MOTD", -1 );
+    gmsgServerName = REG_USER_MSG( "ServerName", -1 );
+    gmsgAmmoPickup = REG_USER_MSG( "AmmoPickup", 2 );
+    gmsgWeapPickup = REG_USER_MSG( "WeapPickup", 1 );
+    gmsgItemPickup = REG_USER_MSG( "ItemPickup", -1 );
+    gmsgHideWeapon = REG_USER_MSG( "HideWeapon", 1 );
+    gmsgSetFOV = REG_USER_MSG( "SetFOV", 1 );
+    gmsgShowMenu = REG_USER_MSG( "ShowMenu", -1 );
+    gmsgShake = REG_USER_MSG("ScreenShake", sizeof(ScreenShake));
+    gmsgFade = REG_USER_MSG("ScreenFade", sizeof(ScreenFade));
+    gmsgAmmoX = REG_USER_MSG("AmmoX", 2);
+    gmsgTeamNames = REG_USER_MSG("TeamNames", -1 );
+    gmsgStatusText = REG_USER_MSG("StatusText", -1);
+    gmsgStatusValue = REG_USER_MSG("StatusValue", 3); 
+    //gmsgSendCorpse = REG_USER_MSG("CLCorpse", -1);
+    
+    // New messages
+    gmsgUpdateEntityHierarchy = REG_USER_MSG("EntHier", -1);
+    gmsgSetParticleTemplates = REG_USER_MSG("Particles", -1);
+    gmsgSetSoundNames = REG_USER_MSG("SoundNames", -1);
+    gmsgPlayHUDNotification = REG_USER_MSG("PlayHUDNot", -1);
+    gmsgGameStatus = REG_USER_MSG("GameStatus", -1);
+    gmsgUpdateCountdown = REG_USER_MSG("Countdown", 1);
+    gmsgSetSelect = REG_USER_MSG("SetSelect", -1);
+    gmsgSetOrder = REG_USER_MSG("SetOrder", -1);
+    //gmsgCplteOrder = REG_USER_MSG("CplteOrder", -1);
+    gmsgSetTechNodes = REG_USER_MSG("SetTech", -1);
+    gmsgSetupMap = REG_USER_MSG("SetupMap", -1);
+    gmsgSetTopDown = REG_USER_MSG("SetTopDown", -1);
+    //gmsgResearch = REG_USER_MSG("Research", -1);
+    gmsgEditPS = REG_USER_MSG("EditPS", 2);
+    gmsgListPS = REG_USER_MSG("ListPS", -1);
+    //gmsgReinforcements = REG_USER_MSG("Reinfor", 2);
+    gmsgSetGammaRamp = REG_USER_MSG("SetGmma", 2);
+    gmsgBlipList = REG_USER_MSG("BlipList", -1);
+    gmsgAlienInfo = REG_USER_MSG("AlienInfo", -1);
+    gmsgDebugCSP = REG_USER_MSG("DebugCSP", -1);
+    //gmsgNetScreenShot = REG_USER_MSG("NetSS", 1);
+    gmsgBuildMiniMap = REG_USER_MSG("MiniMap", -1);
+    gmsgProgressBar = REG_USER_MSG("Progress", 3);
+    gmsgFog = REG_USER_MSG("Fog", -1);
+    gmsgClientScripts = REG_USER_MSG("ClScript", -1);
+    gmsgSetTechSlots = REG_USER_MSG("TechSlots", -1);
+    gmsgBalanceVar = REG_USER_MSG("BalanceVar", -1);
+    gmsgServerVar  = REG_USER_MSG("ServerVar", -1);
+
+    // Four more messages allowed
+}
+
+AvHPlayer::AvHPlayer()
+{
+    this->Init();
+}
+
+void AvHPlayer::AddDebugEnemyBlip(float inX, float inY, float inZ)
+{
+    this->mEnemyBlips.AddBlip(inX, inY, inZ);
+}
+
+void AvHPlayer::AddPoints( int score, BOOL bAllowNegativeScore )
+{
+    // Positive score always adds
+    if ( score < 0 )
+    {
+        if ( !bAllowNegativeScore )
+        {
+            if ( this->mScore < 0 )		// Can't go more negative
+                return;
+            
+            if ( -score > this->mScore )	// Will this go negative?
+            {
+                score = -this->mScore;		// Sum will be 0
+            }
+        }
+    }
+    
+    this->mScore += score;
+    
+    this->EffectivePlayerClassChanged();
+}
+
+void AvHPlayer::AwardKill( entvars_t* inTargetPEV)
+{
+    // Don't award points in new resource model
+    //CBaseEntity* inTarget = CBaseEntity::Instance(inTargetPEV);
+    //GetGameRules()->AwardPointsToPlayer(this, inTarget);
+}
+
+int AvHPlayer::BloodColor(void)
+{
+    int theBloodColor = DONT_BLEED;
+
+    if(this->GetIsMarine() && !this->GetHasHeavyArmor())
+    {
+        theBloodColor = BLOOD_COLOR_RED;
+    }
+    else if(this->GetIsAlien())
+    {
+        theBloodColor = BLOOD_COLOR_YELLOW;
+    }
+
+    return theBloodColor;
+}
+
+void AvHPlayer::AcquireOverwatchTarget()
+{
+    ASSERT(this->mInOverwatch);
+    
+    // Find closest enemy in FOV
+
+    // Find cockroaches for now
+    CBaseEntity* theCurrentTarget = NULL;
+    float theCurrentRange = 1000000;
+
+    //FOR_ALL_ENTITIES(kRoachClassName, CRoach*)
+    FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+    if(this->pev->team != theEntity->pev->team)
+    {
+        float theDistance = (theEntity->pev->origin - this->pev->origin).Length();
+        if(this->GetIsEntityInSight(theEntity) && (theDistance <= theCurrentRange) && theEntity->GetIsRelevant())
+        {
+            theCurrentTarget = theEntity;
+        }
+    }
+    END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+    //END_FOR_ALL_ENTITIES(kRoachClassName)
+
+    if(theCurrentTarget)
+    {
+        this->mOverwatchTarget = ENTINDEX(theCurrentTarget->edict());
+        this->pev->fuser1 = this->mOverwatchTarget;
+        
+        // Playback target event
+        //PLAYBACK_EVENT_FULL(0, this->edict(), gTargetOverwatchEventID, 0, this->pev->origin, (float *)&g_vecZero, 0.0, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+    }
+}
+
+bool AvHPlayer::AttemptToBuildAlienStructure(AvHMessageID inMessageID)
+{
+    bool theSuccess = false;
+
+    string theErrorMessage;
+    int theBuildingPointCost = 0;
+    bool thePurchaseAllowed = this->GetPurchaseAllowed(inMessageID, theBuildingPointCost, &theErrorMessage);
+
+    if(thePurchaseAllowed)
+    {
+        if(inMessageID == ALIEN_BUILD_HIVE)
+        {
+            // See if there is an inactive hive within range
+            UTIL_MakeVectors(this->pev->v_angle);
+            
+            Vector theStart = this->GetGunPosition();
+            Vector theEnd = theStart + gpGlobals->v_forward*50;
+            
+            // Collide with world to find potential build site
+            TraceResult theTR;
+            UTIL_TraceLine(theStart, theEnd, dont_ignore_monsters, this->edict(), &theTR);
+            
+            Vector theLocation = theTR.vecEndPos;
+            
+            // Do we have enough points?
+            if(AvHSHUGetIsSiteValidForBuild(ALIEN_BUILD_HIVE, &theLocation, this->entindex()))
+            {
+                // Get the hive at this location
+                CBaseEntity* theBaseEntity = NULL;
+                AvHHive* theNearestHive = NULL;
+                
+                // Find the nearest hive
+                while((theBaseEntity = UTIL_FindEntityByClassname(theBaseEntity, kesTeamHive)) != NULL)
+                {
+                    if(theBaseEntity)
+                    {
+                        AvHHive* theCurrentHive = dynamic_cast<AvHHive*>(theBaseEntity);
+                        if(theCurrentHive)
+                        {
+                            float theCurrentDistance = VectorDistance(theLocation, theCurrentHive->pev->origin);
+                            if(!theNearestHive || (theCurrentDistance < VectorDistance(theLocation, theNearestHive->pev->origin)))
+                            {
+                                theNearestHive = theCurrentHive;
+                            }
+                        }
+                    }
+                }
+                
+                if(theNearestHive)
+                {
+                    // Make sure another hive isn't already building for this team
+                    bool theAnotherHiveBuilding = false;
+                    
+                    FOR_ALL_ENTITIES(kesTeamHive, AvHHive*)
+                        if((theEntity->pev->team == this->pev->team) && theEntity->GetIsSpawning())
+                        {
+                            theAnotherHiveBuilding = true;
+                            break;
+                        }
+                    END_FOR_ALL_ENTITIES(kesTeamHive);
+                        
+                    if(!theAnotherHiveBuilding)
+                    {
+                        // If so, set it as growing
+                        if(theNearestHive->StartSpawningForTeam(this->GetTeam()))
+                        {
+                            AvHSUBuildingJustCreated(inMessageID, theNearestHive, this);
+                            theSuccess = true;
+                        }
+                        else
+                        {
+                            this->SendMessage(kHelpTextHiveBlocked);
+                        }
+                    }
+                    else
+                    {
+                        this->SendMessage(kHelpTextOtherHiveBuilding);
+                    }
+                }
+            }
+            else
+            {
+                this->SendMessage(kHelpTextEmptyHiveNotNearby);
+            }
+        }
+        else
+        {
+            char* theClassName = NULL;
+            if(AvHSHUGetBuildTechClassName(inMessageID, theClassName))
+            {
+                // Make sure we haven't exceeded the limit
+                int theNumBuildings = 0;
+                FOR_ALL_ENTITIES(theClassName, CBaseEntity*)
+                    if(theEntity->pev->team == this->pev->team)
+                    {
+                        theNumBuildings++;
+                    }
+                END_FOR_ALL_ENTITIES(theClassName);
+                    
+                // Now check to make sure the space is big enough to hold the building
+                UTIL_MakeVectors(this->pev->v_angle);
+                
+                const int kAimRange = 48;
+                Vector theStart = this->GetGunPosition();
+                Vector theEnd = theStart + gpGlobals->v_forward*kAimRange;
+                
+                // Collide with world to find potential build site
+                TraceResult theTR;
+                UTIL_TraceLine(theStart, theEnd, dont_ignore_monsters, this->edict(), &theTR);
+                
+                Vector theLocation = theTR.vecEndPos;
+                  
+                // Check if collision point is valid for building
+                if(AvHSHUGetIsSiteValidForBuild(inMessageID, &theLocation))
+                {
+                    // Make sure there aren't too many buildings in this area already
+                    int theNumBuildingsNearby = UTIL_CountEntitiesInSphere(theLocation, BALANCE_IVAR(kBuildingVisibilityRadius), theClassName);
+                    if(theNumBuildingsNearby < BALANCE_IVAR(kNumSameAlienStructuresAllowedInRadius) || FStrEq(theClassName, kwsAlienResourceTower))//voogru: allow the building of rt's regardless of how many may be close by (for maps that have a lot of nodes close to each other)
+                    {
+                        // Create the new building
+                        CBaseEntity* theEntity = CBaseEntity::Create(theClassName, theLocation, AvHSUGetRandomBuildingAngles());
+                        
+                        // Set building's team
+                        theEntity->pev->team = this->pev->team;
+                        
+                        AvHSUBuildingJustCreated(inMessageID, theEntity, this);
+                        
+                        // Set owner (this prevents collisions between the entity and it's owner though)
+                        //theEntity->pev->owner = ENT(this->pev);
+
+						//voogru: I've moved this here because whats the point of playing the sound if the building didnt get placed? (it was after " Vector theLocation = theTR.vecEndPos;")
+						// Play sound
+						char* theSoundEffect = kAlienBuildingSound1;
+
+						if(RANDOM_LONG(0, 1) == 1)
+							theSoundEffect = kAlienBuildingSound2;
+
+						EMIT_SOUND(this->edict(), CHAN_AUTO, theSoundEffect, this->GetAlienAdjustedEventVolume(), ATTN_NORM);
+                        
+                        theSuccess = true;
+                    }
+                    else
+                    {
+                        this->SendMessage(kTooManyStructuresOfThisTypeNearby);
+                    }
+                }
+                else
+                {
+                    // Play hive easter egg sometimes when trying to build a hive where one already exists
+                    if(inMessageID == ALIEN_BUILD_HIVE)
+                    {
+                        //// If we are close to a hive we already own
+                        //AvHHive* theHive = AvHSUGetRandomActiveHive((AvHTeamNumber)this->pev->team);
+                        //if(theHive)
+                        //{
+                        //    float theDistance = VectorDistance(theHive->pev->origin, this->pev->origin);
+                        //    if(theDistance <= 300)
+                        //    {
+                        //        // Randomly play easter egg
+                        //        if(RANDOM_LONG(0, 10) == 0)
+                        //        {
+                        //            EMIT_SOUND(this->edict(), CHAN_AUTO, kMyHiveEasterEgg, 1.0f, ATTN_NORM);
+                        //        }
+                        //    }
+                        //}
+                    }
+                }
+            }
+            else
+            {
+                this->PlayHUDSound(HUD_SOUND_ALIEN_MORE);
+            }
+        }
+    }
+    else
+    {
+        this->SendMessage(theErrorMessage.c_str());
+    }
+    
+    return theSuccess;
+}
+
+bool AvHPlayer::BuildTech(AvHMessageID inBuildID, const Vector& inPickRay)
+{
+    bool theSuccess = false;
+
+    //AvHSUSetIsDebugging(true);
+
+    // If valid
+    if(AvHSHUGetIsBuildTech(inBuildID))
+    {
+        // Make sure this is a valid place to build
+        Vector theLocation;
+        if(AvHSHUTraceAndGetIsSiteValidForBuild(inBuildID, this->GetVisualOrigin(), inPickRay, &theLocation))
+        {
+            // Decrement resources
+            string theErrorMessage;
+            int theCost = 0;
+            bool thePurchaseAllowed = this->GetPurchaseAllowed(inBuildID, theCost, &theErrorMessage);
+            if(thePurchaseAllowed)
+            {
+                // Count how many entities on our team we have in area
+                int theNumFriendlyEntitiesInArea = 0;
+                CBaseEntity* theEntity = NULL;
+                while((theEntity = UTIL_FindEntityInSphere(theEntity, theLocation, BALANCE_IVAR(kBuildingVisibilityRadius))) != NULL)
+                {
+                    // Don't count players
+                    if(!theEntity->IsPlayer() && (theEntity->pev->team == this->pev->team))
+                    {
+                        theNumFriendlyEntitiesInArea++;
+                    }
+                }
+
+                if(theNumFriendlyEntitiesInArea < BALANCE_IVAR(kMaxMarineEntitiesAllowedInRadius))
+                {
+                    // Build it!
+                    theSuccess = (AvHSUBuildTechForPlayer(inBuildID, theLocation, this) != NULL);
+                
+                    // Inform structure about build if possible
+                    if(theSuccess)
+                    {
+                        if(this->mSelected.size() > 0)
+                        {
+                            // Get selected structure and inform
+                            int theFirstEntitySelected = *this->mSelected.begin();
+                            AvHBaseBuildable* theBaseBuildable = dynamic_cast<AvHBaseBuildable*>(CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theFirstEntitySelected)));
+                            if(theBaseBuildable)
+                            {
+                                theBaseBuildable->TechnologyBuilt(inBuildID);
+                            }
+                        }
+
+                        this->PayPurchaseCost(theCost);
+                    }
+                }
+                else
+                {
+                    this->SendMessage(kTooManyStructuresInArea);
+                }
+            }
+            else
+            {
+                this->PlayHUDSound(HUD_SOUND_MARINE_MORE);
+            }
+        }
+    }
+
+    //AvHSUSetIsDebugging(false);
+    
+    // If successful
+        // Send confirmation if needed
+    // else
+        // Send failure so client is updated
+    
+    return theSuccess;
+}
+
+bool AvHPlayer::GroupMessage(AvHMessageID inGroupMessage)
+{
+    bool theSuccess = false;
+
+    if((inGroupMessage >= GROUP_CREATE_1) && (inGroupMessage < (GROUP_CREATE_1 + kNumHotkeyGroups)))
+    {
+        int theOffset = (int)(inGroupMessage - GROUP_CREATE_1);
+        ASSERT(theOffset >= 0);
+        ASSERT(theOffset < kNumHotkeyGroups);
+        if(this->mSelected.size() > 0)
+        {
+            this->GetTeamPointer()->SetGroup(theOffset, this->mSelected);
+            AvHUser3 theUser3 = this->GetTeamPointer()->GetGroupType(theOffset);
+
+            AvHHUDSound theHudSound = HUD_SOUND_SELECT;
+            if(theUser3 == AVH_USER3_MARINE_PLAYER)
+            {
+                theHudSound = AvHHUDSound(HUD_SOUND_SQUAD1 + theOffset);
+            }
+
+            //#ifndef AVH_PREDICT_SELECT
+            this->PlayHUDSound(theHudSound);
+            //#endif
+
+            // If this is a squad, tell all the players in the squad also.  This also tells them they are in the squad.
+            if(theUser3 == AVH_USER3_MARINE_PLAYER)
+            {
+                // Loop through them
+                for(EntityListType::iterator theIter = this->mSelected.begin(); theIter != this->mSelected.end(); theIter++)
+                {
+                    AvHPlayer* thePlayer = NULL;
+                    AvHSUGetEntityFromIndex(*theIter, thePlayer);
+                    if(thePlayer)
+                    {
+                        thePlayer->PlayHUDSound(theHudSound);
+                    }
+                }
+            }
+
+            // Now run through all the hotgroups and remove these entities from them (entities can only be part of one group)
+            for(int theCurrentIndex = 0; theCurrentIndex < kNumHotkeyGroups; theCurrentIndex++)
+            {
+                if(theCurrentIndex != theOffset)
+                {
+                    //this->mGroups[theCurrentIndex];
+                    EntityListType theCurrentGroup = this->GetTeamPointer()->GetGroup(theCurrentIndex);
+
+                    // Remove all members of mSelected from this group
+                    for(EntityListType::iterator theIterator = theCurrentGroup.begin(); theIterator != theCurrentGroup.end(); /* nothing */)
+                    {
+                        // If the current entity is in selection
+                        EntityListType::iterator theFindIter = std::find(this->mSelected.begin(), this->mSelected.end(), *theIterator);
+                        bool theEntityInSelection = (theFindIter != this->mSelected.end());
+                        if(theEntityInSelection)
+                        {
+                            // Remove it from this list
+                            theIterator = theCurrentGroup.erase(theIterator);
+                        }
+                        else
+                        {
+                            // Else, increment
+                            theIterator++;
+                        }
+                    }
+
+                    // Set the group again
+                    this->GetTeamPointer()->SetGroup(theCurrentIndex, theCurrentGroup);
+                }
+            }
+        }
+        theSuccess = true;
+    }
+    else if((inGroupMessage >= GROUP_SELECT_1) && (inGroupMessage < (GROUP_SELECT_1 + kNumHotkeyGroups)))
+    {
+        int theOffset = (int)(inGroupMessage - GROUP_SELECT_1);
+        ASSERT(theOffset >= 0);
+        ASSERT(theOffset < kNumHotkeyGroups);
+
+        //const EntityListType& theGroup = this->mGroups[theOffset];
+        EntityListType theGroup = this->GetTeamPointer()->GetGroup(theOffset);
+        if(theGroup.size() > 0)
+        {
+            if(this->mSelected != theGroup)
+            {
+                this->mSelected = theGroup;
+                this->mTrackingEntity = 0;
+            }
+            else
+            {
+                // If we received the same select message twice in a row, go instead to the last place we went to
+                if(inGroupMessage == this->mLastSelectEvent)
+                {
+                    // Go to last saved position
+                    VectorCopy(this->mPositionBeforeLastGotoGroup, this->pev->origin);
+
+                    // Clear last select so hitting it again will go to group
+                    this->mLastSelectEvent = MESSAGE_NULL;
+                }
+                else
+                {
+                    // Find nearest entity in group and track it
+                    int theNearestGroupEntity = 0;
+                    float theClosestDistance = sqrt(2*kMaxMapDimension*kMaxMapDimension);
+                    for(EntityListType::const_iterator theIter = theGroup.begin(); theIter != theGroup.end(); theIter++)
+                    {
+                        CBaseEntity* theBaseEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(*theIter));
+                        ASSERT(theBaseEntity);
+                        float theCurrentDistance = VectorDistance(theBaseEntity->pev->origin, this->pev->origin);
+                        if(theCurrentDistance < theClosestDistance)
+                        {
+                            theNearestGroupEntity = *theIter;
+                            theClosestDistance = theCurrentDistance;
+                        }
+                    }
+                    
+                    this->mTrackingEntity = theNearestGroupEntity;
+                    
+                    // Move player in vicinity of player so entity is in PVS
+                    if(this->mTrackingEntity > 0)
+                    {
+                        CBaseEntity* theBaseEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(this->mTrackingEntity));
+                        if(theBaseEntity)
+                        {
+                            // Save last position so we can jump back to it easily
+                            VectorCopy(this->pev->origin, this->mPositionBeforeLastGotoGroup);
+                            this->mLastSelectEvent = inGroupMessage;
+                    
+                            // Goto group
+                            VectorCopy(theBaseEntity->pev->origin, this->pev->origin);
+                        }
+                    }
+                }
+            }
+        }
+
+        theSuccess = true;
+    }
+
+    return theSuccess;
+}
+
+bool AvHPlayer::GetCenterPositionForGroup(int inGroupNumber, float& outX, float& outY)
+{
+    bool theSuccess = false;
+        
+    if((inGroupNumber >= 1) && (inGroupNumber <= kNumHotkeyGroups))
+    {
+        int theNumFound = 0;
+        Vector theLocation;
+        theLocation.x = theLocation.y = theLocation.z = 0.0f;
+
+        //EntityListType& theGroup = this->mGroups[inGroupNumber-1];
+        EntityListType theGroup = this->GetTeamPointer()->GetGroup(inGroupNumber-1);
+        for(EntityListType::iterator theIter = theGroup.begin(); theIter != theGroup.end(); theIter++)
+        {
+            Vector theEntityLocation;
+            if(AvHSHUGetEntityLocation(*theIter, theEntityLocation))
+            {
+                theLocation.x += theEntityLocation.x;
+                theLocation.y += theEntityLocation.y;
+
+                theNumFound++;
+            }
+        }
+
+        if(theNumFound > 0)
+        {
+            outX = theLocation.x/theNumFound;
+            outY = theLocation.y/theNumFound;
+
+            theSuccess = true;
+        }
+    }
+
+    return theSuccess;
+}
+
+string AvHPlayer::GetNetworkID() const
+{
+    return this->mNetworkID;
+}
+
+void AvHPlayer::SetNetworkID(string& inNetworkID)
+{
+    this->mNetworkID = inNetworkID;
+}
+
+#ifdef USE_UPP
+string AvHPlayer::GetNetworkAddress() const
+{
+	return this->mNetworkAddress;
+}
+
+void AvHPlayer::SetNetworkAddress(string& inNetworkAddress)
+{
+	this->mNetworkAddress = inNetworkAddress;
+}
+#endif
+
+void AvHPlayer::ClearRoleAbilities()
+{
+    // Clear all abilities that don't stick around between changing role, like all alien purchaseable upgrades
+    //SetUpgradeMask(&this->pev->iuser4, ALIEN_ABILITY_2, false);
+    this->pev->iuser3 = AVH_USER3_NONE;
+    this->pev->iuser4 &= ~MASK_ALIEN_EMBRYO;
+    this->pev->iuser4 &= ~MASK_ALIEN_MOVEMENT;
+    this->mIsScreaming = false;
+    this->mAlienSightActive = false;
+    this->mDesiredRoomType = 0;
+}
+
+void AvHPlayer::ClearUserVariables()
+{
+    this->pev->iuser1 = 0;
+    this->pev->iuser2 = 0;
+    this->pev->iuser3 = 0;
+    this->pev->iuser4 = 0;
+    this->pev->fuser1 = 0;
+    this->pev->fuser2 = 0;
+    this->pev->fuser3 = 0;
+    this->pev->fuser4 = 0;
+}
+
+void AvHPlayer::SetScore(int inScore)
+{
+    this->mScore = inScore;
+}
+
+int AvHPlayer::GetScore() const
+{
+    return this->mScore;
+}
+
+CBaseEntity* AvHPlayer::CreateAndDrop(const char* inItemName)
+{
+	UTIL_MakeVectors(pev->v_angle);
+
+    CBaseEntity* theEntity = CBaseEntity::Create(inItemName, pev->origin + gpGlobals->v_forward * 10, pev->angles, edict() );
+    
+    theEntity->pev->angles.x = 0;
+    theEntity->pev->angles.z = 0;
+    //theEntity->PackWeapon( pWeapon );
+    theEntity->pev->velocity = gpGlobals->v_forward * 300 + gpGlobals->v_forward * 100;
+    
+    return theEntity;
+}
+
+void AvHPlayer::DeployCurrent()
+{
+    if(this->m_pActiveItem /*&& !this->GetIsBeingDigested()*/)
+    {
+        CBasePlayerWeapon* theCurrentWeapon = (CBasePlayerWeapon *)this->m_pActiveItem->GetWeaponPtr();
+        if(theCurrentWeapon && theCurrentWeapon->CanDeploy())
+        {
+            theCurrentWeapon->Deploy();
+        }
+    }
+    else
+    {
+        // No current weapon, so get the best weapon we have.
+        g_pGameRules->GetNextBestWeapon( this, NULL );
+    }
+}
+
+
+// Drop the current item, not weapon, if any.  
+bool AvHPlayer::DropItem(const char* inItemName)
+{
+    bool theSuccess = false;
+    
+    if(!GetGameRules()->GetIsCombatMode())
+    {
+        CBasePlayerItem* theItem = this->m_pActiveItem;
+        
+        if(inItemName)
+        {
+            bool theIsDone = false;
+			theItem = NULL; //we're looking for an item by name, don't bias with active item
+
+            // Find item with this name
+            for(int i = 0; (i < MAX_ITEM_TYPES) && !theIsDone; i++)
+            {
+                CBasePlayerItem* theCurrentItem = this->m_rgpPlayerItems[i];
+                while(theCurrentItem && !theIsDone)
+                {
+                    if(FStrEq(STRING(theCurrentItem->pev->classname), inItemName))
+                    {
+                        theIsDone = true;
+                        theItem = theCurrentItem;
+                    }
+                    theCurrentItem = theCurrentItem->m_pNext;
+                }
+            }
+        }
+
+        if(theItem)
+        {
+            AvHBasePlayerWeapon* theOriginalDroppedWeapon = dynamic_cast<AvHBasePlayerWeapon*>(theItem);
+            if(theOriginalDroppedWeapon && theOriginalDroppedWeapon->GetIsDroppable())      
+            {
+                // Dropping current weapon turns off overwatch
+                this->TurnOffOverwatch();
+                
+                //char theItemName[256];
+                //strcpy(theItemName, STRING(theItem->pev->classname));
+                //this->DropPlayerItem(theItemName);
+                
+                // Get ammo left, if it's a weapon
+                int theAmmoLeft = -1;
+                if(theOriginalDroppedWeapon)
+                {
+                    theAmmoLeft = theOriginalDroppedWeapon->m_iClip;
+                    GetGameRules()->GetNextBestWeapon(this, theItem);
+                }
+                
+                CBaseEntity* theDroppedEntity = this->CreateAndDrop(STRING(theItem->pev->classname));
+                if(theAmmoLeft != -1)
+                {
+                    CBasePlayerWeapon* theNewlyDroppedWeapon = dynamic_cast<CBasePlayerWeapon*>(theDroppedEntity);
+                    ASSERT(theNewlyDroppedWeapon);
+                    
+                    // Set ammo, make sure client ammo isn't the same so update is forced
+                    theNewlyDroppedWeapon->m_iClip = theAmmoLeft;
+                    theNewlyDroppedWeapon->m_iClientClip = theAmmoLeft - 1;
+                    
+                    // Means "only ammo is that in the clip"
+                    theNewlyDroppedWeapon->m_iDefaultAmmo = 0;
+
+					ItemInfo theItemInfo;
+
+					if(theOriginalDroppedWeapon->GetItemInfo(&theItemInfo) != 0)
+					{
+						int iAmmoIndex = GetAmmoIndex ( (char *) theItemInfo.pszAmmo1 ); 
+
+						if ( iAmmoIndex != -1 && m_rgAmmo[ iAmmoIndex ] > 0)
+							this->DropAmmo((char *)theItemInfo.pszAmmo1, m_rgAmmo[ iAmmoIndex ], theItemInfo.iMaxAmmo1, theItemInfo.iId, theNewlyDroppedWeapon->pev->angles);
+					}
+
+                }
+
+                // Finally remove the original
+                theOriginalDroppedWeapon->DestroyItem();
+
+                // Weak potential fix for occasional crash.  Saw this when someone hit "lastinv" while holding a knife,
+                // and m_pLastItem was garbage, not NULL
+                this->m_pLastItem = NULL;
+                SetAnimation(PLAYER_PRIME);  //Elven - hack to kill TPRA if we throw a weapon.
+                theSuccess = true;
+            }
+        }
+    }
+
+    return theSuccess;
+}
+
+void AvHPlayer :: DropAmmo(char *pszAmmoType, int iAmmoAmt, int iMax, int iWeaponID, Vector vecAngles)
+{
+	if(!pszAmmoType || !iAmmoAmt || !iMax || !iWeaponID)
+		return;
+
+	int iAmmoIndex = GetAmmoIndex ( pszAmmoType );
+
+	//Not a valid ammo type.
+	if(iAmmoIndex == -1)
+		return;
+
+	if(m_rgAmmo[ iAmmoIndex ] > 0)
+		m_rgAmmo[ iAmmoIndex ] -= iAmmoAmt;
+	else
+		return;
+
+	int theSubModel = -1;
+
+	switch(iWeaponID)
+	{
+	case AVH_WEAPON_PISTOL:		  theSubModel = 3; break;
+	case AVH_WEAPON_MG:			  theSubModel = 1; break;
+	case AVH_WEAPON_SONIC:		  theSubModel = 0; break;
+	case AVH_WEAPON_HMG:		  theSubModel = 2; break;
+	case AVH_WEAPON_GRENADE_GUN:  theSubModel = 4; break;
+	}
+
+	if(theSubModel == -1)
+		return;
+
+	CBaseEntity *theDroppedEntity = this->CreateAndDrop( kwsAmmoPack );
+	AvHAmmoPack *theRealAmmoPack = dynamic_cast<AvHAmmoPack*>(theDroppedEntity);
+
+	strncpy(theRealAmmoPack->m_szAmmoType, pszAmmoType, 31);
+	theRealAmmoPack->m_iMaxAmmo = iMax;
+	theRealAmmoPack->m_iAmmoAmt = iAmmoAmt;
+	theRealAmmoPack->m_iWeaponID = iWeaponID;
+	theRealAmmoPack->pev->body = theSubModel;
+	theRealAmmoPack->pev->angles = vecAngles;
+
+	theRealAmmoPack->SetThink( &CBaseEntity::SUB_Remove );
+	theRealAmmoPack->pev->nextthink = gpGlobals->time + AvHSUGetWeaponStayTime();
+}
+
+void AvHPlayer::EffectivePlayerClassChanged()
+{
+    this->mEffectivePlayerClassChanged = true;
+}
+
+void AvHPlayer::NeedsTeamUpdate()
+{
+    this->mNeedsTeamUpdate = true;
+}
+
+void AvHPlayer::SendTeamUpdate()
+{
+    this->mSendTeamUpdate = true;
+}
+
+bool AvHPlayer::ExecuteAlienMorphMessage(AvHMessageID inMessageID, bool inInstantaneous)
+{
+    bool theMessageExecuted = false;
+
+    string theErrorMessage;
+    bool theHadEnoughPoints = false;
+    
+    switch(inMessageID)
+    {
+    case ALIEN_LIFEFORM_ONE:
+    case ALIEN_LIFEFORM_TWO:
+    case ALIEN_LIFEFORM_THREE:
+    case ALIEN_LIFEFORM_FOUR:
+    case ALIEN_LIFEFORM_FIVE:
+        
+    case ALIEN_EVOLUTION_ONE:
+    case ALIEN_EVOLUTION_TWO:
+    case ALIEN_EVOLUTION_THREE:
+        //case ALIEN_EVOLUTION_FOUR:
+        //case ALIEN_EVOLUTION_FIVE:
+        //case ALIEN_EVOLUTION_SIX:
+    case ALIEN_EVOLUTION_SEVEN:
+    case ALIEN_EVOLUTION_EIGHT:
+    case ALIEN_EVOLUTION_NINE:
+    case ALIEN_EVOLUTION_TEN:
+    case ALIEN_EVOLUTION_ELEVEN:
+    case ALIEN_EVOLUTION_TWELVE:
+    case ALIEN_HIVE_TWO_UNLOCK:
+    case ALIEN_HIVE_THREE_UNLOCK:
+        
+        // Now only allow upgrading from level1
+        if(this->GetCanGestate(inMessageID, theErrorMessage))
+        {
+            // Stay as current lifeform by default
+            bool theCheckDucking = true;
+            int theTargetIuser3 = this->pev->iuser3;
+            switch(inMessageID)
+            {
+            case ALIEN_LIFEFORM_ONE:
+                theTargetIuser3 = AVH_USER3_ALIEN_PLAYER1;
+                break;
+            case ALIEN_LIFEFORM_TWO:
+                theTargetIuser3 = AVH_USER3_ALIEN_PLAYER2;
+                break;
+            case ALIEN_LIFEFORM_THREE:
+                theTargetIuser3 = AVH_USER3_ALIEN_PLAYER3;
+                break;
+            case ALIEN_LIFEFORM_FOUR:
+                theTargetIuser3 = AVH_USER3_ALIEN_PLAYER4;
+                break;
+            case ALIEN_LIFEFORM_FIVE:
+                theTargetIuser3 = AVH_USER3_ALIEN_PLAYER5;
+                theCheckDucking = false;
+                break;
+            }
+            
+            int theTargetHull = AvHMUGetHull(theCheckDucking, theTargetIuser3);
+            vec3_t theOrigin;
+            GetNewOrigin((AvHUser3)theTargetIuser3, theCheckDucking, theOrigin); 
+			
+			// removed by puzl to fix gestating in vents.
+			//theOrigin.z += 5;
+
+            bool theIsEnoughRoom = AvHSUGetIsEnoughRoomForHull(theOrigin, theTargetHull, this->edict());
+			//voogru: try again but higher
+			if(!theIsEnoughRoom)
+			{
+
+				theOrigin.z += AvHMUGetOriginOffsetForMessageID(inMessageID);
+
+				theIsEnoughRoom = AvHSUGetIsEnoughRoomForHull(theOrigin, theTargetHull, this->edict());
+			}
+
+            if(theIsEnoughRoom || inInstantaneous)
+            {
+                if(!theIsEnoughRoom)
+                {
+                    int a = 0;
+                }
+                
+                this->Evolve(inMessageID, inInstantaneous);
+                theMessageExecuted = true;
+            }
+            else
+            {
+                this->SendMessage(kNeedMoreRoomToGestate);
+            }
+        }
+        else
+        {
+            this->SendMessage(theErrorMessage.c_str());
+        }
+        break;
+    }
+
+    return theMessageExecuted;
+}
+
+bool AvHPlayer::ExecuteMessage(AvHMessageID inMessageID, bool inInstantaneous, bool inForce)
+{
+	bool theMessageExecuted = false;
+
+	AvHTeam* theTeam = this->GetTeamPointer();
+	string theErrorMessage;
+
+	// If valid
+	if((inMessageID != MESSAGE_NULL) && theTeam)
+	{
+		bool theIsMarine = theTeam->GetTeamType() == AVH_CLASS_TYPE_MARINE;
+		bool theIsAlien = theTeam->GetTeamType() == AVH_CLASS_TYPE_ALIEN;
+		bool theGameStarted = GetGameRules()->GetGameStarted();
+		bool theIsInTopDownMode = this->GetIsInTopDownMode();
+		bool theIsCombat = GetGameRules()->GetIsCombatMode();
+		bool theIsBeingDigested = this->GetIsBeingDigested();
+
+		// If we can purchase it
+		string theErrorMessage;
+		int theCost = 0;
+
+		if(this->GetPurchaseAllowed(inMessageID, theCost, &theErrorMessage) || inForce)
+		{
+			// If we're in Combat mode
+			bool theIsAvailable = true;
+
+			if(theIsCombat)
+			{
+				// Try to execute message
+				theMessageExecuted = this->ExecuteCombatMessage(inMessageID, theIsAvailable, inForce);
+				if(theMessageExecuted)
+				{
+					this->PurchaseCombatUpgrade(inMessageID);            
+				}
+			}
+
+			// If it's a fall-through alien upgrade, try it next
+			if(!theMessageExecuted && theIsAlien && !theIsBeingDigested)
+			{
+				// Try to morph or build
+				theMessageExecuted = this->ExecuteAlienMorphMessage(inMessageID, inInstantaneous);
+				if(!theMessageExecuted && !theIsCombat)
+				{
+					switch(inMessageID)
+					{
+					case ALIEN_BUILD_RESOURCES:
+					case ALIEN_BUILD_OFFENSE_CHAMBER:
+					case ALIEN_BUILD_DEFENSE_CHAMBER:
+					case ALIEN_BUILD_SENSORY_CHAMBER:
+					case ALIEN_BUILD_MOVEMENT_CHAMBER:
+					case ALIEN_BUILD_HIVE:
+						theMessageExecuted = this->AttemptToBuildAlienStructure(inMessageID);
+						break;
+					}
+				}
+			}
+
+			// Add upgrade to our list to be preserved on respawn
+			if(theMessageExecuted && theIsCombat)
+				this->mCombatNodes.SetResearchDone(inMessageID);
+
+			if(theMessageExecuted)
+				this->PayPurchaseCost(theCost);
+		}
+
+		if(theIsMarine 
+			&& !theIsInTopDownMode 
+			&& !theIsBeingDigested)
+		{
+			switch (inMessageID)
+			{
+			case WEAPON_RELOAD:
+				if(theGameStarted)
+					this->ReloadWeapon();
+				break;
+			case WEAPON_DROP:
+				if(!this->DropItem())
+					this->SendMessageOnce(kWeaponCantBeDropped, true);
+				break;
+
+			case ADMIN_VOTEDOWNCOMMANDER:
+				if(theTeam->PlayerVote(this->entindex(), theErrorMessage))
+					theMessageExecuted = true;
+				else
+					this->SendMessage(theErrorMessage.c_str());
+				break;
+				// Talk to your teammates
+			case SAYING_1:
+			case SAYING_2:
+			case SAYING_3:
+			case SAYING_4:
+			case SAYING_5:
+			case SAYING_6:
+			case SAYING_7:
+			case SAYING_8:
+			case SAYING_9:
+			case ORDER_REQUEST:
+			case ORDER_ACK:
+				if(this->PlaySaying(inMessageID))
+				{
+					AvHAlertType theAlertType = ALERT_NONE;
+					AvHMessageID theMessageID = MESSAGE_NULL;
+
+					if(this->GetIsMarine())
+					{
+						switch(inMessageID)
+						{
+						case SAYING_5:
+							theAlertType = ALERT_SOLDIER_NEEDS_AMMO;
+							theMessageID = COMMANDER_NEXTAMMO;
+							break;
+
+						case SAYING_4:
+							theAlertType = ALERT_SOLDIER_NEEDS_HEALTH;
+							theMessageID = COMMANDER_NEXTHEALTH;
+							break;
+
+						case ORDER_REQUEST:
+							theAlertType = ALERT_ORDER_NEEDED;
+							theMessageID = COMMANDER_NEXTIDLE;
+							break;
+						}
+
+						// Send alert for commander
+						if(theAlertType != ALERT_NONE)
+						{
+							GetGameRules()->TriggerAlert((AvHTeamNumber)this->pev->team, theAlertType, this->entindex(), theMessageID);
+						}
+					}
+
+					theMessageExecuted = true;
+				}
+				break;
+			}
+		}
+		else if(theIsAlien && !theIsBeingDigested)
+		{
+			switch (inMessageID)
+			{
+				// Talk to your teammates
+			case SAYING_1:
+			case SAYING_2:
+			case SAYING_3:
+			case SAYING_4:
+			case SAYING_5:
+			case SAYING_6:
+			case SAYING_7:
+			case SAYING_8:
+			case SAYING_9:
+				if(this->PlaySaying(inMessageID))
+					theMessageExecuted = true;
+				break;
+
+			case ALIEN_ABILITY_LEAP:
+				this->StartLeap();
+				break;
+			case 100:
+				// Eat flashlight event.  Add special mode for alien view here?
+				if(!this->mAlienSightActive)
+					PLAYBACK_EVENT_FULL(FEV_HOSTONLY, this->edict(), gAlienSightOnEventID, 0, this->pev->origin, (float *)&g_vecZero, this->GetAlienAdjustedEventVolume(), 0.0, 0, 0, 0, 0 );
+				else
+					PLAYBACK_EVENT_FULL(FEV_HOSTONLY, this->edict(), gAlienSightOffEventID, 0, this->pev->origin, (float *)&g_vecZero, this->GetAlienAdjustedEventVolume(), 0.0, 0, 0, 0, 0 );
+				this->mAlienSightActive = !this->mAlienSightActive;
+				theMessageExecuted = true;
+				break;
+			}
+		}
+
+		// Common messages here
+		if(!theMessageExecuted)
+		{
+			switch(inMessageID)
+			{
+			case WEAPON_NEXT:
+				this->NextWeapon();
+				theMessageExecuted = true;
+				break;
+			case ADMIN_READYROOM:
+				if(this->GetPlayMode() != PLAYMODE_READYROOM)
+				{
+					this->SetPlayMode(PLAYMODE_READYROOM);
+					theMessageExecuted = true;
+				}
+				break;
+			}
+		}
+	}
+    return theMessageExecuted;
+}
+
+bool AvHPlayer::GetIsAlienSightActive() const
+{
+    return this->mAlienSightActive;
+}
+
+void AvHPlayer::SetDesiredNetName(string inDesiredNetName)
+{
+    this->mDesiredNetName = inDesiredNetName;
+}
+
+void AvHPlayer::SetDesiredRoomType(int inRoomType, bool inForceUpdate)
+{
+    this->mDesiredRoomType = inRoomType;
+
+    if(inForceUpdate)
+    {
+        this->mClientDesiredRoomType = -1;
+    }
+}
+
+void AvHPlayer::ResetPlayerPVS()
+{
+    // Force recompute of PVS
+    ::ResetPlayerPVS(this->edict(), this->entindex());
+}
+
+void AvHPlayer::SetPosition(const Vector& inNewPosition)
+{
+    // Set new position
+    VectorCopy(inNewPosition, this->pev->origin);
+
+    this->ResetPlayerPVS();
+}
+
+// Play sounds quieter when the alien has the silence upgrade
+float AvHPlayer::GetAlienAdjustedEventVolume() const
+{
+    return AvHPlayerUpgrade::GetSilenceVolumeLevel((AvHUser3)this->pev->iuser3, this->pev->iuser4);
+}
+
+
+
+void AvHPlayer::GetAnimationForActivity(int inActivity, char outAnimation[64], bool inGaitSequence)
+{
+    strcpy(outAnimation, "");
+
+    bool theCanCrouch = !((this->GetUser3() == AVH_USER3_ALIEN_PLAYER1) || (this->GetUser3() == AVH_USER3_ALIEN_PLAYER2) || (this->GetUser3() == AVH_USER3_ALIEN_PLAYER3));
+    bool theIsCrouched = FBitSet(this->pev->flags, FL_DUCKING);
+    bool theIsAlien = this->GetIsAlien();
+    bool theIsGestating = (this->GetUser3() == AVH_USER3_ALIEN_EMBRYO);
+    bool theIsDeathAnim = false;
+    bool theIsReloading = false;
+    int theDebugAnimations = BALANCE_IVAR(kDebugAnimations);
+	
+    //bool theIsBlinking = this->GetIsBlinking();
+
+    switch(inActivity)
+    {
+    case ACT_RELOAD:
+        if(!theIsAlien)
+		{
+            strcat(outAnimation, this->m_szAnimExtention);
+			strcat(outAnimation, "_reload");
+	
+			theIsReloading = true;
+        };
+        break;
+	// updated by Elven for TPRAs
+     case ACT_RELOAD_START: 
+        if(!theIsAlien)
+        {
+			strcat(outAnimation, this->m_szAnimExtention);
+			strcat(outAnimation, "_reload_start");
+			theIsReloading = true;
+		};
+		break;
+	case ACT_RELOAD_INSERT:
+        if(!theIsAlien)
+        {
+			 strcat(outAnimation, this->m_szAnimExtention);
+			strcat(outAnimation, "_reload_insert");
+			theIsReloading = true;
+		};
+		break;
+	case ACT_RELOAD_END:
+        if(!theIsAlien)
+        {
+			strcat(outAnimation, this->m_szAnimExtention);
+			strcat(outAnimation, "_reload_end");
+			theIsReloading = true;
+		};
+		break;
+    case ACT_RANGE_PRIME:
+        if(theCanCrouch && theIsCrouched)
+        {
+            strcpy(outAnimation, "crouch_" );
+        }
+        strcat(outAnimation, this->m_szAnimExtention);
+        strcat(outAnimation, "_prime");
+        break;
+
+    case ACT_RANGE_ATTACK1:
+        if(theCanCrouch && theIsCrouched)
+        {
+            strcpy(outAnimation, "crouch_" );
+        }
+        strcat(outAnimation, this->m_szAnimExtention);
+        if(theIsAlien)
+        {
+            strcat(outAnimation, "_alien");
+        }
+        else
+        {
+            strcat(outAnimation, "_fire");
+        }
+        break;
+
+    case ACT_HOP:
+        strcat(outAnimation, "jump");
+        break;
+
+    case ACT_WALK:
+        if(inGaitSequence || !strcmp(this->m_szAnimExtention, ""))
+        {
+            strcat(outAnimation, "walk");
+        }
+        else
+        {
+            if(theCanCrouch && theIsCrouched)
+            {
+                strcpy(outAnimation, "crouch_" );
+            }
+            strcat(outAnimation, this->m_szAnimExtention);
+            if(theCanCrouch)
+            {
+                if(theIsReloading)
+                {
+                    strcat(outAnimation, "_reload");
+                }
+                else
+                {
+                    strcat(outAnimation, "_look");
+                }
+            }
+        }
+        break;
+
+    case ACT_RUN:
+        if(inGaitSequence || !strcmp(this->m_szAnimExtention, ""))
+        {
+            strcat(outAnimation, "run");
+        }
+        else
+        {
+            if(theCanCrouch && theIsCrouched)
+            {
+                strcpy(outAnimation, "crouch_" );
+            }
+            strcat(outAnimation, this->m_szAnimExtention);
+            if(theCanCrouch)
+            {
+                //if(theIsReloading)
+                //{
+                //  strcat(outAnimation, "_reload");
+                //}
+                //else
+                //{
+                if(theIsReloading)
+                {
+                    strcpy(outAnimation, this->m_szAnimExtention);
+                    strcat(outAnimation, "_reload");
+                }
+                else
+                {
+                    strcat(outAnimation, "_look");
+                }
+                //}
+            }
+        }
+        break;
+
+    case ACT_CROUCHIDLE:
+        if(theCanCrouch)
+        {
+            if(inGaitSequence)
+            {
+                strcat(outAnimation, "crouch_idle");
+            }
+        }
+        break;
+    case ACT_CROUCH:
+        if(theCanCrouch)
+        {
+            if(inGaitSequence)
+            {
+                strcat(outAnimation, "crawl");
+            }
+            else
+            {
+            }
+        }
+        break;
+    case ACT_IDLE:
+        // Weird hack/fix for gyrating and ready room spazzing
+        //if(this->GetPlayMode() != PLAYMODE_READYROOM)
+        //{
+            if(inGaitSequence)
+            {
+                if(theIsReloading)
+                {
+                    strcat(outAnimation, "_reload");
+                }
+                else
+                {
+                    strcat(outAnimation, "idle1");
+                }
+            }
+            else
+            {
+                strcat(outAnimation, "look_idle");
+            }
+        //}
+        break;
+
+    case ACT_DIESIMPLE:
+    case ACT_DIEVIOLENT:
+        if(this->pev->iuser3 == AVH_USER3_ALIEN_PLAYER3)
+        {
+            strcpy(outAnimation, "death1_die");
+        }
+        else
+        {
+            if(theIsCrouched)
+            {
+                strcpy(outAnimation, "crouch_die");
+            }
+            else
+            {
+                switch(RANDOM_LONG(0, 2))
+                {
+                case 0:
+                    strcpy(outAnimation, "death1_die");
+                    break;
+                case 1:
+                    strcpy(outAnimation, "death2_die");
+                    break;
+                case 2:
+                    strcpy(outAnimation, "death3_die");
+                    break;
+                }
+            }
+        }
+        theIsDeathAnim = true;
+        break;
+    case ACT_DIE_HEADSHOT:
+        strcpy(outAnimation, "head_die");
+        theIsDeathAnim = true;
+        break;
+    case ACT_DIE_GUTSHOT:
+        strcpy(outAnimation, "gut_die");
+        theIsDeathAnim = true;
+        break;
+    case ACT_DIEBACKWARD:
+        // Hack for skulk until artwork can be updated (it has no back_die)
+        if(this->pev->iuser3 != AVH_USER3_ALIEN_PLAYER1)
+        {
+            strcpy(outAnimation, "back_die");
+        }
+        else
+        {
+            strcpy(outAnimation, "gut_die");
+        }
+        theIsDeathAnim = true;
+        break;
+    case ACT_DIEFORWARD:
+        strcpy(outAnimation, "forward_die");
+        theIsDeathAnim = true;
+        break;
+    case ACT_SWIM:
+        // die
+        strcpy(outAnimation, "treadwater");
+        break;
+    }
+
+    if(theIsGestating)
+    {
+        float theFullTimeToGestate = GetGameRules()->GetBuildTimeForMessageID(this->mEvolution);
+        bool theAlmostDoneGestation = (gpGlobals->time > (this->mTimeGestationStarted + theFullTimeToGestate*.75f));
+
+        switch(inActivity)
+        {
+        case ACT_SMALL_FLINCH:
+        case ACT_BIG_FLINCH:
+        case ACT_FLINCH_HEAD:
+        case ACT_FLINCH_CHEST:
+        case ACT_FLINCH_STOMACH:
+        case ACT_FLINCH_LEFTARM:
+        case ACT_FLINCH_RIGHTARM:
+        case ACT_FLINCH_LEFTLEG:
+        case ACT_FLINCH_RIGHTLEG:
+            if(RANDOM_LONG(0, 1))
+            {
+                // flinch1
+                strcpy(outAnimation, "flinch1");
+            }
+            else
+            {
+                // flinch2
+                strcpy(outAnimation, "flinch2");
+            }
+            break;
+
+        case ACT_DIESIMPLE:
+        case ACT_DIEBACKWARD:
+        case ACT_DIEFORWARD:
+        case ACT_DIEVIOLENT:
+            // die
+            strcpy(outAnimation, "die");
+            theIsDeathAnim = true;
+            break;
+
+        default:
+            if(theAlmostDoneGestation)
+            {
+                // gestation_fast
+                strcpy(outAnimation, "gestation_fast");
+            }
+            else
+            {
+                // gestation
+                strcpy(outAnimation, "gestation");
+            }
+            break;
+        }
+    }
+//  else if(theIsBlinking)
+//  {
+//      switch(inActivity)
+//      {
+//      case ACT_DIESIMPLE:
+//      case ACT_DIEBACKWARD:
+//      case ACT_DIEFORWARD:
+//      case ACT_DIEVIOLENT:
+//          // Already should've chosen death anim
+//          break;
+//
+//      default:
+//          strcpy(outAnimation, "look_idle");
+//          break;
+//      }
+//  }
+
+    // Special case ready room anims, they aren't holding weapons ever
+//  if(this->mPlayMode == PLAYMODE_READYROOM)
+//  {
+//      if(theCanCrouch && FBitSet(this->pev->flags, FL_DUCKING))
+//      {
+//      }
+//  }
+
+#ifdef DEBUG
+    if(theDebugAnimations && theIsDeathAnim)
+    {
+        char theMessage[256];
+        sprintf(theMessage, "AvHPlayer::GetAnimationForActivity(death) returned %s\n", outAnimation);
+        ALERT(at_console, theMessage);
+    }
+#endif
+}
+
+bool AvHPlayer::GetCanGestate(AvHMessageID inMessageID, string& outErrorMessage)
+{
+    bool theCanGestate = false;
+
+    int theNumHives = this->GetTeamPointer()->GetNumActiveHives();
+    
+    if(this->pev->iuser3 != AVH_USER3_ALIEN_EMBRYO)
+    {
+        if(this->mDigestee <= 0)
+        {
+            bool theIsRangeRequirementMet = true;
+
+            // Uncomment to force aliens to gestate near hives
+/*			switch(inMessageID)
+			{
+			case ALIEN_LIFEFORM_ONE:
+			case ALIEN_LIFEFORM_TWO:
+			case ALIEN_LIFEFORM_THREE:
+			case ALIEN_LIFEFORM_FOUR:
+			case ALIEN_LIFEFORM_FIVE:
+				theIsRangeRequirementMet = false;
+				break;
+			}
+
+			// Check distance to hive
+			FOR_ALL_ENTITIES(kesTeamHive, AvHHive*)
+				if(theEntity->GetIsActive())
+				{
+					AvHTeamNumber theTeamNumber = (AvHTeamNumber)(theEntity->pev->team);
+					if(theTeamNumber == this->pev->team)
+					{
+						float theDistance = VectorDistance(theEntity->pev->origin, this->pev->origin);
+						if(theDistance < BALANCE_IVAR(kHiveHealRadius))
+						{
+							theIsRangeRequirementMet = true;
+							break;
+						}
+					}
+				}
+				END_FOR_ALL_ENTITIES(kesTeamHive);
+*/
+				if(theIsRangeRequirementMet)
+				{
+					theCanGestate = true;
+				}
+				else
+				{
+					// TODO: Add error message
+				}
+		}
+        else
+        {
+            outErrorMessage = kNotWhileDigesting;
+        }
+    }
+    
+    return theCanGestate;
+}
+
+bool AvHPlayer::GetCanCommand(string& outErrorMessage)
+{
+    bool theCanCommand = false;
+
+    // Jack up command station use time to avoid huge kick-everyone-off-server bug (I think this is an overflow issue)
+    // I think the overflow issue is fixed, but design-wise, this prevents annoying pop-out/pop-back in attacking (Reaver popping)
+    const int theCommandStationReuseTime = BALANCE_IVAR(kCommandStationReuseTime);
+    
+    // Have we been banned from the command station?
+    AvHServerPlayerData* theServerPlayerData = this->GetServerPlayerData();
+    if(!theServerPlayerData || (theServerPlayerData->GetTimeVotedDown() == -1))
+    {
+        //if(!this->GetCurrentWeaponCannotHolster())
+        if(this->m_pActiveItem)
+        {
+            CBasePlayerWeapon* theCurrentWeapon = (CBasePlayerWeapon *)this->m_pActiveItem->GetWeaponPtr();
+            if(theCurrentWeapon && theCurrentWeapon->CanHolster())
+            {
+                float theLastTime = this->GetLastTimeInCommandStation();
+                if((theLastTime == -1) || (gpGlobals->time > (theLastTime + theCommandStationReuseTime)))
+                {
+                    if(!this->GetIsEnsnared())
+                    {
+                        theCanCommand = true;
+                    }
+                }
+                else
+                {
+                    outErrorMessage = kCommandStationWaitTime;
+                }
+            }
+            else
+            {
+                outErrorMessage = kWeaponPreventingCommandStation;
+            }
+        }
+    }
+    else
+    {
+        outErrorMessage = kBannedFromCommand;
+    }
+
+    return theCanCommand;
+}
+
+bool AvHPlayer::GetCanReceiveResources() const
+{
+    bool theCanReceiveResources = true;
+
+    if(this->GetIsAlien())
+    {
+        theCanReceiveResources = false;
+
+        if(this->GetIsRelevant() && this->IsAlive())
+        {
+            theCanReceiveResources = true;
+        }
+    }
+
+    return theCanReceiveResources;
+}
+
+int AvHPlayer::GetEffectivePlayerClass()
+{
+    AvHPlayerClass theEffectivePlayerClass = PLAYERCLASS_NONE;
+    
+    if(this->GetUser3() == AVH_USER3_COMMANDER_PLAYER)
+    {
+        theEffectivePlayerClass = PLAYERCLASS_COMMANDER;
+    }
+    // Players can be both reinforcing and observer, but reinforcing takes precedence
+    else if(this->GetPlayMode() == PLAYMODE_REINFORCING)
+    {
+        theEffectivePlayerClass = PLAYERCLASS_REINFORCING;
+    }
+    // Digesting overrides other states
+    else if(this->GetIsBeingDigested())
+    {
+        theEffectivePlayerClass = PLAYERCLASS_ALIVE_DIGESTING;
+    }
+    else if((this->pev->team == 0) && this->IsObserver())
+    {
+        theEffectivePlayerClass = PLAYERCLASS_SPECTATOR;
+    }
+    else
+    {
+        // Check team type
+        if(this->GetIsMarine())
+        {
+            if(this->IsAlive())
+            {
+                if(this->GetHasHeavyArmor())
+                {
+                    theEffectivePlayerClass = PLAYERCLASS_ALIVE_HEAVY_MARINE;
+                }
+				else if (this->GetHasJetpack()) {
+					theEffectivePlayerClass = PLAYERCLASS_ALIVE_JETPACK_MARINE;
+				}
+                else
+                {
+                    theEffectivePlayerClass = PLAYERCLASS_ALIVE_MARINE;
+                }
+            }
+            else
+            {
+                theEffectivePlayerClass = PLAYERCLASS_DEAD_MARINE;
+            }
+        }
+        else if(this->GetIsAlien())
+        {
+            if(this->IsAlive())
+            {
+                switch(this->pev->iuser3)
+                {
+                case AVH_USER3_ALIEN_PLAYER1:
+                    theEffectivePlayerClass = PLAYERCLASS_ALIVE_LEVEL1;
+                    break;
+                case AVH_USER3_ALIEN_PLAYER2:
+                    theEffectivePlayerClass = PLAYERCLASS_ALIVE_LEVEL2;
+                    break;
+                case AVH_USER3_ALIEN_PLAYER3:
+                    theEffectivePlayerClass = PLAYERCLASS_ALIVE_LEVEL3;
+                    break;
+                case AVH_USER3_ALIEN_PLAYER4:
+                    theEffectivePlayerClass = PLAYERCLASS_ALIVE_LEVEL4;
+                    break;
+                case AVH_USER3_ALIEN_PLAYER5:
+                    theEffectivePlayerClass = PLAYERCLASS_ALIVE_LEVEL5;
+                    break;
+                case AVH_USER3_ALIEN_EMBRYO:
+                    theEffectivePlayerClass = PLAYERCLASS_ALIVE_GESTATING;
+                    break;
+                }
+            }
+            else
+            {
+                theEffectivePlayerClass = PLAYERCLASS_DEAD_ALIEN;
+            }
+        }
+    }
+    
+    return theEffectivePlayerClass;
+}
+
+AvHServerPlayerData* AvHPlayer::GetServerPlayerData()
+{
+    AvHServerPlayerData* theServerPlayerData = NULL;
+
+    AvHTeam* theTeam = this->GetTeamPointer();
+    if(theTeam)
+    {
+        theServerPlayerData = theTeam->GetServerPlayerData(this->edict());
+    }
+
+    return theServerPlayerData;
+}
+
+// Get the player's WON id, and see if this player has any status on the server
+#ifdef USE_UPP
+void AvHPlayer::SetAuthorized(bool inAuthorized)
+{
+	this->mAuthorized = inAuthorized;
+}
+
+bool AvHPlayer::GetAuthorized(void) const
+{
+	return this->mAuthorized;
+}
+
+void AvHPlayer::SetAuthenticationMask(int inAuthMask)
+{
+	this->mAuthMask = inAuthMask;
+}
+
+int AvHPlayer::GetAuthenticationMask() const
+{
+	int theMask = PLAYERAUTH_NONE;
+	
+	if(this->GetAllowAuth())
+	{ theMask = this->mAuthMask; }
+	
+	if(GetGameRules()->GetCheatsEnabled())
+	{ theMask |= this->mAuthCheatMask; }
+
+	return theMask;
+}
+
+bool AvHPlayer::GetAllowAuth() const
+{
+    return this->mAllowAuth;
+}
+
+void AvHPlayer::SetScoreboardIconName(const string& inIconName)
+{
+	this->mScoreboardIconName = inIconName;
+}
+
+string AvHPlayer::GetScoreboardIconName(void)
+{
+	return this->mScoreboardIconName;
+}
+
+int AvHPlayer::GetScoreboardIconColor(void)
+{
+	if(this->mScoreboardIconName.size() != 11 || this->mScoreboardIconName[4] != ':')
+	{ return 0; }
+	unsigned char theColorComponents[3] = {0,0,0};
+	MakeBytesFromHexPairs(this->mScoreboardIconName.substr(5,6),theColorComponents,3);
+
+	//get brightness shift
+	float theMaxComponent = max(theColorComponents[0],max(theColorComponents[1],theColorComponents[2]));
+	char theBrightnessShift = ((int)theMaxComponent%64)/16;
+
+	//compress components
+	theColorComponents[0] = (theColorComponents[0] - theBrightnessShift*16*theColorComponents[0]/theMaxComponent)/64;
+	theColorComponents[1] = (theColorComponents[1] - theBrightnessShift*16*theColorComponents[1]/theMaxComponent)/64;
+	theColorComponents[2] = (theColorComponents[2] - theBrightnessShift*16*theColorComponents[2]/theMaxComponent)/64;
+
+	//combine components and shift into single byte
+	int theColor = (theColorComponents[0] << 6) + (theColorComponents[1] << 4) + (theColorComponents[2] << 2) + theBrightnessShift;
+
+	return theColor;
+}
+
+short AvHPlayer::GetScoreboardIconNumber(void)
+{
+	if(this->mScoreboardIconName.size() != 11 || this->mScoreboardIconName[4] != ':')
+	{ return 0; }
+
+	short theNumber = 0;
+	MakeBytesFromHexPairs(this->mScoreboardIconName.substr(0,4),(unsigned char*)&theNumber,2);
+	return theNumber;
+}
+#else
+int AvHPlayer::GetAuthenticationMask()
+{
+    int theMask = 0;
+    
+    // Get WON id
+    if(this->GetAllowAuth())
+    {
+        // Use cached value if valid
+        theMask = this->mCachedAuthenticationMask;
+
+        // Look it up if uninitialized or Steam isn't ready yet
+        if((theMask == -1) || (theMask == PLAYERAUTH_PENDING))
+        {
+            string theAuthID = AvHSUGetPlayerAuthIDString(this->edict());
+            theMask = GetGameRules()->GetAuthenticationMask(theAuthID);
+
+            // Save cached value
+            this->mCachedAuthenticationMask = theMask;
+        }
+    }
+
+    bool theAllowAuthCheatMask = GetGameRules()->GetCheatsEnabled();
+
+    #ifdef AVH_LAN_PLAYTEST_BUILD
+    theAllowAuthCheatMask = true;
+    #endif
+
+    if(theAllowAuthCheatMask)
+    {
+        theMask |= this->mAuthCheatMask;
+    }
+    return theMask;
+}
+
+bool AvHPlayer::GetAllowAuth() const
+{
+    return (this->mAllowAuth && (avh_uplink.value > 0));
+}
+#endif
+
+void AvHPlayer::SetAllowAuth(bool inAllowAuth)
+{
+    this->mAllowAuth = inAllowAuth;
+}
+
+void AvHPlayer::SetAuthCheatMask(int inAuthCheatMask)
+{
+    this->mAuthCheatMask = inAuthCheatMask;
+}
+
+bool AvHPlayer::GetCurrentWeaponCannotHolster() const
+{
+    bool theCannotHolster = false;
+    
+    if(m_pActiveItem)
+    {
+        theCannotHolster = !this->m_pActiveItem->CanHolster();
+    }
+    
+    return theCannotHolster;
+}
+
+bool AvHPlayer::GetInReadyRoom() const
+{
+    return (this->GetPlayMode() == PLAYMODE_READYROOM);
+}
+
+bool AvHPlayer::GetIsAlien(bool inIncludeSpectating) const
+{
+    bool theIsAlien = false;
+    AvHTeam* theTeam = this->GetTeamPointer(inIncludeSpectating);
+
+    if(theTeam && (theTeam->GetTeamType() == AVH_CLASS_TYPE_ALIEN))
+    {
+        theIsAlien = true;
+    }
+
+    return theIsAlien;
+}
+
+bool AvHPlayer::GetIsMarine(bool inIncludeSpectating) const
+{
+    bool theIsMarine = false;
+    AvHTeam* theTeam = this->GetTeamPointer(inIncludeSpectating);
+    
+    if(theTeam && (theTeam->GetTeamType() == AVH_CLASS_TYPE_MARINE))
+    {
+        theIsMarine = true;
+    }
+    
+    return theIsMarine;
+}
+
+bool AvHPlayer::GetIsInTopDownMode(bool inIncludeSpectating) const
+{
+    return this->mInTopDownMode;
+}
+
+AvHPlayer* AvHPlayer::GetCommander(void)
+{
+    AvHPlayer* theCommander = NULL;
+    AvHTeam* theMarinesTeam = this->GetTeamPointer();
+    if(theMarinesTeam)
+    {
+        int theCommanderIndex = theMarinesTeam->GetCommander();
+        AvHSUGetEntityFromIndex(theCommanderIndex, theCommander);
+    }
+    
+    return theCommander;
+}
+
+bool AvHPlayer::GetHasBeenSpectator(void) const
+{
+    return this->mHasBeenSpectator;
+}
+
+AvHPlayMode AvHPlayer::GetPlayMode(bool inIncludeSpectating) const
+{
+    int theVarToUse = this->pev->playerclass;
+
+    if(inIncludeSpectating && (this->pev->iuser1 == OBS_IN_EYE))
+    {
+        AvHPlayer* theEntity = NULL;
+        if(AvHSUGetEntityFromIndex(this->pev->iuser2, theEntity))
+        {
+            theVarToUse = theEntity->pev->playerclass;
+        }
+    }
+
+    return (AvHPlayMode)theVarToUse;
+}
+
+bool AvHPlayer::GetIsValidReinforcementFor(AvHTeamNumber inTeam) const
+{
+    bool theSuccess = false;
+
+    if(this->GetPlayMode() == PLAYMODE_AWAITINGREINFORCEMENT)
+    {
+        if(this->pev->team == inTeam)
+        {
+            theSuccess = true;
+        }
+    }
+
+    return theSuccess;
+}
+
+int AvHPlayer::GetPointValue(void) const
+{
+    int thePointValue = BALANCE_IVAR(kScoringKillPlayer);
+
+    if(this->GetIsAlien())
+    {   
+        switch(this->pev->iuser3)
+        {
+        case AVH_USER3_ALIEN_PLAYER2:
+            thePointValue = BALANCE_IVAR(kScoringKillPlayerGorge);
+            break;
+        case AVH_USER3_ALIEN_PLAYER3:
+            thePointValue = BALANCE_IVAR(kScoringKillPlayerLerk);
+            break;
+        case AVH_USER3_ALIEN_PLAYER4:
+            thePointValue = BALANCE_IVAR(kScoringKillPlayerFade);
+            break;
+        case AVH_USER3_ALIEN_PLAYER5:
+            thePointValue = BALANCE_IVAR(kScoringKillPlayerOnos);
+            break;
+        }
+    }
+    else if(this->GetIsMarine())
+    {
+        if(this->GetHasJetpack())
+        {
+            thePointValue = BALANCE_IVAR(kScoringKillPlayerJetpack);
+        }
+        else if(this->GetHasHeavyArmor())
+        {
+            thePointValue = BALANCE_IVAR(kScoringKillPlayerHA);
+        }
+    }
+
+    return thePointValue;
+}
+
+vec3_t AvHPlayer::GetVisualOrigin() const
+{
+    vec3_t theOrigin = this->pev->origin;
+
+    //theOrigin[2] += this->pev->view_ofs[2];
+    if(this->mInTopDownMode)
+    {
+        theOrigin[2] = GetGameRules()->GetMapExtents().GetMaxViewHeight();
+    }
+    
+    return theOrigin;
+}
+
+
+int AvHPlayer::GetRespawnCost() const
+{
+    int theRespawnCost = 0;
+    const AvHGameplay& theGameplay = GetGameRules()->GetGameplay();
+    
+    if(this->GetClassType() == AVH_CLASS_TYPE_MARINE)
+    {
+        // This function shouldn't be used now that there are reinforcements...rework a bit?
+        theRespawnCost = 0;
+    }
+    else if(this->GetClassType() == AVH_CLASS_TYPE_ALIEN)
+    {
+        theRespawnCost = theGameplay.GetAlienRespawnCost();
+    }
+    return theRespawnCost;
+}
+
+bool AvHPlayer::GetHasItem(const char *szName)
+{
+    bool theHasItem = false;
+    
+    for(int i = 0; (i < MAX_ITEM_TYPES) && !theHasItem; i++)
+    {
+        CBasePlayerItem* theCurrentItem = this->m_rgpPlayerItems[i];
+        while(theCurrentItem && !theHasItem)
+        {
+            if(FStrEq(STRING(theCurrentItem->pev->classname), szName))
+            {
+                theHasItem = true;
+            }
+            theCurrentItem = theCurrentItem->m_pNext;
+        }
+    }
+    
+    return theHasItem;
+}
+
+void AvHPlayer::GiveNamedItem(const char *szName, bool inSendMessage)
+{
+    // Check to make sure we don't have this weapon before giving it.  Fixes potential problems where
+    // weapon settings would be reset if a duplicate weapon was given
+    if(!this->GetHasItem(szName))
+    {
+        // Send visible pickup message after game has started
+        bool theSendMessage = GetGameRules()->GetGameStarted();
+        CBasePlayer::GiveNamedItem(szName, theSendMessage);
+    }
+}
+
+int AvHPlayer::GetNumberOfItems()
+{
+    int theNumItems = 0;
+    
+    for(int i = 0; i < MAX_ITEM_TYPES; i++)
+    {
+        CBasePlayerItem* theCurrentItem = this->m_rgpPlayerItems[i];
+        while(theCurrentItem)
+        {
+            theNumItems++;
+            theCurrentItem = theCurrentItem->m_pNext;
+        }
+    }
+    
+    return theNumItems;
+}
+
+void AvHPlayer::GiveResources(float inResources)
+{
+    this->SetResources(this->GetResources() + inResources);
+}
+
+void AvHPlayer::StartLeap()
+{
+    // Make sure player has leap
+    if(this->pev->iuser3 == AVH_USER3_ALIEN_PLAYER1)
+    {
+        this->mTimeLeapEnd = gpGlobals->time + kLeapDuration;
+    }
+}
+
+void AvHPlayer::PlayerTouch(CBaseEntity* inOther)
+{
+    if(this && this->pev && inOther && this->m_pActiveItem && this->m_pActiveItem->pev)
+    {
+        // Uncloak when we touch enemy players to prevent blocking
+        if(inOther->IsPlayer() && inOther->IsAlive() && (inOther->pev->team != this->pev->team))
+        {
+            this->Uncloak();
+        }
+
+        // Don't do "touch" damage too quickly
+        float theTouchDamageInterval = BALANCE_FVAR(kTouchDamageInterval);
+        if((this->mTimeOfLastTouchDamage == -1) || (gpGlobals->time > (this->mTimeOfLastTouchDamage + theTouchDamageInterval)))
+        {
+			entvars_t* theAttacker = this->pev;
+			entvars_t* theInflictor = this->m_pActiveItem->pev;
+			            
+            float theScalar = 1.0f;
+            if((this->mTimeLeapEnd != -1) && (gpGlobals->time < this->mTimeLeapEnd))
+            {
+                // Do damage to entity
+                if(GetGameRules()->CanEntityDoDamageTo(this, inOther, &theScalar))
+                {
+                    float theDamage = BALANCE_IVAR(kLeapDamage)*theScalar*theTouchDamageInterval;
+                    inOther->TakeDamage(theInflictor, theAttacker, theDamage, NS_DMG_NORMAL);
+
+                    this->mTimeOfLastTouchDamage = gpGlobals->time;
+                }
+            }
+            
+            // Are we charging?
+            if(GetHasUpgrade(this->pev->iuser4, MASK_ALIEN_MOVEMENT) /*&& !this->GetIsBlinking()*/)
+            {
+                if(GetGameRules()->CanEntityDoDamageTo(this, inOther, &theScalar))
+                {
+                    float theDamage = BALANCE_IVAR(kChargeDamage)*theScalar*theTouchDamageInterval;
+
+                    inOther->TakeDamage(theInflictor, theAttacker, theDamage, NS_DMG_NORMAL);
+            
+                    if(inOther->IsPlayer() && !inOther->IsAlive())
+                    {
+                        EMIT_SOUND(ENT(this->pev), CHAN_WEAPON, kChargeKillSound, 1.0, ATTN_NORM);
+                    }
+
+                    this->mTimeOfLastTouchDamage = gpGlobals->time;
+                }
+            }
+        }
+    }
+}
+
+AvHTeamNumber AvHPlayer::GetTeam(bool inIncludeSpectating) const
+{
+    AvHTeamNumber theTeamNumber = (AvHTeamNumber)this->pev->team;
+
+    if(inIncludeSpectating)
+    {
+        CBaseEntity* theSpectatingEntity = this->GetSpectatingEntity();
+        if(theSpectatingEntity)
+        {
+            theTeamNumber = (AvHTeamNumber)theSpectatingEntity->pev->team;
+        }
+    }
+
+    ASSERT((theTeamNumber == TEAM_IND) || (theTeamNumber == TEAM_ONE) || (theTeamNumber == TEAM_TWO));
+
+    return theTeamNumber;
+}
+
+AvHTeam* AvHPlayer::GetTeamPointer(bool inIncludeSpectating) const
+{
+    AvHTeamNumber theTeamNumber = this->GetTeam(inIncludeSpectating);
+
+    AvHTeam* theTeamPointer = GetGameRules()->GetTeam(theTeamNumber);
+
+    return theTeamPointer;
+}
+
+float AvHPlayer::GetKilledX() const
+{
+    return this->mKilledX;
+}
+
+float AvHPlayer::GetKilledY() const
+{
+    return this->mKilledY;
+}
+
+AvHClassType AvHPlayer::GetClassType(void) const
+{
+    AvHClassType theClassType = AVH_CLASS_TYPE_UNDEFINED;
+
+    AvHTeamNumber theTeamNumber = (AvHTeamNumber)(this->pev->team);
+    const AvHTeam* theTeam = GetGameRules()->GetTeam(theTeamNumber);
+    if(theTeam)
+    {
+        theClassType = theTeam->GetTeamType();
+    }
+
+    ASSERT(theClassType >= AVH_CLASS_TYPE_UNDEFINED);
+    ASSERT(theClassType <= AVH_CLASS_TYPE_AUTOASSIGN);
+
+    return theClassType;
+}
+
+
+bool AvHPlayer::GetPurchaseAllowed(AvHMessageID inUpgrade, int& outCost, string* outErrorMessage) const
+{
+    bool thePurchaseAllowed = false;
+    bool theGameStarted = GetGameRules()->GetGameStarted();
+    bool theIsMarine = this->GetTeamPointer()->GetTeamType() == AVH_CLASS_TYPE_MARINE;
+    bool theIsAlien = this->GetIsAlien();
+    int theNumHives = this->GetTeamPointer()->GetNumActiveHives();
+    bool theIsBuilder = (this->pev->iuser3 == AVH_USER3_ALIEN_PLAYER2);
+    bool theIsResearchTech = AvHSHUGetIsResearchTech(inUpgrade);
+    bool theIsCombatMode = GetGameRules()->GetIsCombatMode();
+    string theErrorMessage;
+
+    // Check tech tree first
+    const AvHTechNodes* theTechNodes = &this->GetTeamPointer()->GetTechNodes();
+
+    // If combat, use Combat nodes
+    if(GetGameRules()->GetIsCombatMode())
+    {
+        theTechNodes = &this->mCombatNodes;
+    }
+
+    if(theTechNodes->GetIsMessageAvailable(inUpgrade))
+    {
+        if(theIsResearchTech && (this->pev->iuser3 == AVH_USER3_COMMANDER_PLAYER) && theIsMarine)
+        {
+            thePurchaseAllowed = true;
+        }
+        else
+        {
+            if(theIsCombatMode && (this->GetExperienceLevel() <= (this->mExperienceLevelsSpent + GetGameRules()->GetCostForMessageID(inUpgrade))))
+            {
+                return false;
+            }
+        
+            switch(inUpgrade)
+            {
+            case ALIEN_EVOLUTION_ONE:
+            case ALIEN_EVOLUTION_TWO:
+            case ALIEN_EVOLUTION_THREE:
+            //case ALIEN_EVOLUTION_FOUR:
+            //case ALIEN_EVOLUTION_FIVE:
+            //case ALIEN_EVOLUTION_SIX:
+            case ALIEN_EVOLUTION_SEVEN:
+            case ALIEN_EVOLUTION_EIGHT:
+            case ALIEN_EVOLUTION_NINE:
+            case ALIEN_EVOLUTION_TEN:
+            case ALIEN_EVOLUTION_ELEVEN:
+            case ALIEN_EVOLUTION_TWELVE:
+                // If we are an alien and we don't have the upgrade
+                if(theIsAlien)
+                {
+                    AvHUpgradeMask theUpgradeMask = MASK_NONE;
+                    if(AvHGetAlienUpgradeMask(inUpgrade, theUpgradeMask))
+                    {
+                        if(!GetHasUpgrade(this->pev->iuser4, theUpgradeMask))
+                        {
+                            AvHAlienUpgradeCategory theCategory = ALIEN_UPGRADE_CATEGORY_INVALID;
+                            if(AvHGetAlienUpgradeCategory(inUpgrade, theCategory))
+                            {
+                                // Now make sure we have an unspent upgrade available
+                                AvHTeam* theTeamPointer = this->GetTeamPointer();
+                                if(theTeamPointer && (AvHGetHasFreeUpgradeCategory(theCategory, theTeamPointer->GetAlienUpgrades(), this->pev->iuser4) || GetGameRules()->GetIsCombatMode()))
+                                {
+                                    thePurchaseAllowed = true;
+                                }
+                                else
+                                {
+                                    theErrorMessage = kUpgradeNotAvailable;
+                                }
+                            }
+                        }
+                    }
+                }
+                break;
+        
+            case ALIEN_LIFEFORM_ONE:
+                if(theIsAlien && theGameStarted && (this->GetUser3() != AVH_USER3_ALIEN_PLAYER1))
+                {
+                    thePurchaseAllowed = true;
+                }
+                break;
+            case ALIEN_LIFEFORM_TWO:
+                if(theIsAlien && theGameStarted && (this->GetUser3() != AVH_USER3_ALIEN_PLAYER2))
+                {
+                    thePurchaseAllowed = true;
+                }
+                break;
+            case ALIEN_LIFEFORM_THREE:
+                if(theIsAlien && theGameStarted && (this->GetUser3() != AVH_USER3_ALIEN_PLAYER3))
+                {
+    //              if(theNumHives >= 1)
+    //              {
+                        thePurchaseAllowed = true;
+    //              }
+    //              else
+    //              {
+    //                  outErrorMessage = kNeedOneHiveToGestate;
+    //              }
+                }
+                break;
+            case ALIEN_LIFEFORM_FOUR:
+                if(theIsAlien && theGameStarted && (this->GetUser3() != AVH_USER3_ALIEN_PLAYER4))
+                {
+    //              if(theNumHives >= 2)
+    //              {
+                        thePurchaseAllowed = true;
+    //              }
+    //              else
+    //              {
+    //                  outErrorMessage = kNeedTwoHivesToGestate;
+    //              }
+                }
+                break;
+            case ALIEN_LIFEFORM_FIVE:
+                if(theIsAlien && theGameStarted && (this->GetUser3() != AVH_USER3_ALIEN_PLAYER5))
+                {
+    //              if(theNumHives >= 3)
+    //              {
+                        thePurchaseAllowed = true;
+    //              }
+    //              else
+    //              {
+    //                  outErrorMessage = kNeedThreeHivesToGestate;
+    //              }
+                }
+                break;
+        
+            case ALIEN_BUILD_RESOURCES:
+            case ALIEN_BUILD_HIVE:
+                if(theIsBuilder)
+                {
+                    thePurchaseAllowed = true;
+                }
+                else
+                {
+                    theErrorMessage = kMustBeBuilder;
+                }
+                break;
+        
+            case ALIEN_BUILD_OFFENSE_CHAMBER:
+                if(theIsBuilder)
+                {
+                    if(theNumHives >= 1)
+                    {
+                        thePurchaseAllowed = true;
+                    }
+                    else
+                    {
+                        theErrorMessage = kNeedOneHiveForStructure;
+                    }
+                }
+                else
+                {
+                    theErrorMessage = kMustBeBuilder;
+                }
+                break;
+        
+            // Make sure we have a hive that can provide this tech
+            case ALIEN_BUILD_DEFENSE_CHAMBER:
+            case ALIEN_BUILD_MOVEMENT_CHAMBER:
+            case ALIEN_BUILD_SENSORY_CHAMBER:
+                if(theIsBuilder)
+                {
+                    FOR_ALL_ENTITIES(kesTeamHive, AvHHive*)
+                        if(theEntity && theEntity->GetIsActive() && (theEntity->pev->team == this->pev->team))
+                        {
+                            AvHMessageID theTechnology = theEntity->GetTechnology();
+                            if((theTechnology == inUpgrade) || (theTechnology == MESSAGE_NULL))
+                            {
+                                thePurchaseAllowed = true;
+                                break;
+                            }
+                        }
+                    END_FOR_ALL_ENTITIES(kesTeamHive);
+        
+                    if(!thePurchaseAllowed)
+                    {
+                        AvHTeam* theTeam = this->GetTeamPointer();
+                        if(theTeam)
+                        {
+    //                      int theNumHives = theTeam->GetNumActiveHives();
+    //                      switch(theNumHives)
+    //                      {
+    //                      case 0:
+    //                          outErrorMessage = kNeedOneHiveForStructure;
+    //                          break;
+    //                      case 1:
+    //                          outErrorMessage = kNeedTwoHivesForStructure;
+    //                          break;
+    //                      case 2:
+    //                          outErrorMessage = kNeedThreeHivesForStructure;
+    //                          break;
+    //                      }
+        
+                            theErrorMessage = kNeedsAnotherHiveForStructure;
+                        }
+                    }
+                }
+                else
+                {
+                    theErrorMessage = kMustBeBuilder;
+                }
+                break;
+        
+            default:
+                thePurchaseAllowed = true;
+                break;
+            }
+        }
+    }
+
+    if(thePurchaseAllowed)
+    {
+        // This is either resources, energy, or levels
+        int theCost = GetGameRules()->GetCostForMessageID(inUpgrade);
+    
+        if(GetGameRules()->GetIsCombatMode())
+        {
+            int theLevelsFree = max(this->GetExperienceLevel() - this->GetExperienceLevelsSpent() - 1, 0);
+            if(theCost > theLevelsFree)
+            {
+                thePurchaseAllowed = false;
+            }
+        }
+        else
+        {
+            if(AvHSHUGetDoesTechCostEnergy(inUpgrade) || GetGameRules()->GetIsCheatEnabled(kcLowCost))
+            {
+                theCost = 0;
+            }
+        
+            if(this->GetResources() < theCost)
+            {
+                thePurchaseAllowed = false;
+            }
+        }
+
+        outCost = theCost;
+    }
+
+    if(outErrorMessage)
+    {
+        *outErrorMessage = theErrorMessage;
+    }
+
+    return thePurchaseAllowed;
+}
+
+int AvHPlayer::GiveAmmo( int iAmount, char *szName, int iMax )
+{
+    int theReturnValue = -1;
+    int theRealAmount = iAmount;
+    string theRealName = szName;
+    char theRealNameArray[256];
+    int theRealMax = iMax;
+
+    // TODO: Change this to a more generic call on AvHBasePlayerWeapon for next client update
+    AvHBasePlayerWeapon* theBaseWeapon = dynamic_cast<AvHBasePlayerWeapon*>(this->m_pActiveItem);
+    if(theBaseWeapon != NULL && theBaseWeapon->GetCanBeResupplied())
+    {
+        if(FStrEq(szName, kwsGenericAmmo))
+        {
+            AvHBasePlayerWeapon* theWeaponToGiveTo = theBaseWeapon;
+            if(theBaseWeapon->UsesAmmo())
+            {
+                // Translate iAmount, szName and iMax into the ammo for our current weapon
+                ItemInfo theItemInfo;
+                if(this->m_pActiveItem->GetItemInfo(&theItemInfo) != 0)
+                {
+                    //theRealAmount = theBaseWeapon->m_iDefaultAmmo;
+                    theRealAmount = theItemInfo.iMaxClip;
+                    theRealName = theItemInfo.pszAmmo1;
+                    theRealMax = theItemInfo.iMaxAmmo1;
+                }
+            }
+        }
+    }
+    strcpy(theRealNameArray, theRealName.c_str());
+    theReturnValue = CBasePlayer::GiveAmmo(theRealAmount, theRealNameArray, theRealMax);
+
+    return theReturnValue;
+}
+
+
+bool AvHPlayer::GetShouldResupplyAmmo()
+{
+	bool theResupply = false;
+
+    if(this->GetIsMarine() && this->GetIsRelevant())
+    {
+        AvHBasePlayerWeapon* theBaseWeapon = dynamic_cast<AvHBasePlayerWeapon*>(this->m_pActiveItem);
+        if(theBaseWeapon != NULL && (theBaseWeapon->m_iId != AVH_WEAPON_MINE))
+        {
+            AvHBasePlayerWeapon* theWeaponToGiveTo = theBaseWeapon;
+            if(theBaseWeapon->UsesAmmo())
+            {
+                // Translate iAmount, szName and iMax into the ammo for our current weapon
+                ItemInfo theItemInfo;
+                if(this->m_pActiveItem->GetItemInfo(&theItemInfo) != 0)
+                {
+                    int theMaxAmmo = theItemInfo.iMaxAmmo1;
+                    if(theMaxAmmo > 0)
+                    {
+                        int i = GetAmmoIndex(theItemInfo.pszAmmo1);
+                        
+                        if ((i > 0) && (i < MAX_AMMO_SLOTS))
+                        {
+							
+							int theCurrentAmmo = this->m_rgAmmo[i];
+
+							if (theCurrentAmmo < theWeaponToGiveTo->GetClipSize()) {
+								theResupply = true;
+							}
+                        }
+                    }
+                }
+            }
+        }
+	}
+	return theResupply;
+}
+
+float AvHPlayer::GetCurrentWeaponAmmoPercentage() 
+{
+    float thePercentage = 1.0f;
+
+    if(this->GetIsMarine() && this->GetIsRelevant())
+    {
+        AvHBasePlayerWeapon* theBaseWeapon = dynamic_cast<AvHBasePlayerWeapon*>(this->m_pActiveItem);
+        if(theBaseWeapon != NULL && (theBaseWeapon->m_iId != AVH_WEAPON_MINE))
+        {
+            AvHBasePlayerWeapon* theWeaponToGiveTo = theBaseWeapon;
+            if(theBaseWeapon->UsesAmmo())
+            {
+                // Translate iAmount, szName and iMax into the ammo for our current weapon
+                ItemInfo theItemInfo;
+                if(this->m_pActiveItem->GetItemInfo(&theItemInfo) != 0)
+                {
+                    int theMaxAmmo = theItemInfo.iMaxAmmo1;
+                    if(theMaxAmmo > 0)
+                    {
+                        int i = GetAmmoIndex(theItemInfo.pszAmmo1);
+                        
+                        if ((i > 0) && (i < MAX_AMMO_SLOTS))
+                        {
+                            int theCurrentAmmo = this->m_rgAmmo[i];// + theWeaponToGiveTo->GetShotsInClip();
+                            thePercentage = (float)theCurrentAmmo/theMaxAmmo;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    return thePercentage;
+}
+
+bool AvHPlayer::GetEnemySighted(void) const
+{
+    return this->mEnemySighted;
+}
+
+bool AvHPlayer::GetIsFiring(void) const
+{
+    bool theIsFiring = false;
+    if(this->pev->button & IN_ATTACK)
+    {
+        AvHBasePlayerWeapon* theWeapon = dynamic_cast<AvHBasePlayerWeapon*>(this->m_pActiveItem);
+        if(theWeapon && theWeapon->m_iClip > 0)
+        {
+            theIsFiring = true;
+        }
+    }
+    return theIsFiring;
+}
+
+bool AvHPlayer::GetIsInOverwatch(void) const
+{
+    return this->mInOverwatch;
+}
+
+bool AvHPlayer::GetIsSpectatingTeam(AvHTeamNumber inTeamNumber) const
+{
+    bool theIsSpectatingTeam = false;
+
+    CBaseEntity* theSpectatingEntity = this->GetSpectatingEntity();
+    if(theSpectatingEntity)
+    {
+        if((AvHTeamNumber)theSpectatingEntity->pev->team == inTeamNumber)
+        {
+            theIsSpectatingTeam = true;
+        }
+    }
+
+    return theIsSpectatingTeam;
+}
+
+bool AvHPlayer::GetIsSpectatingPlayer(int inPlayerNumber) const
+{
+    bool theIsSpectatingPlayer = false;
+    
+    CBaseEntity* theSpectatingEntity = this->GetSpectatingEntity();
+    if(theSpectatingEntity)
+    {
+        if(theSpectatingEntity->entindex() == inPlayerNumber)
+        {
+            theIsSpectatingPlayer = true;
+        }
+    }
+    
+    return theIsSpectatingPlayer;
+}
+
+bool AvHPlayer::GetIsSpeaking(void) const
+{
+    return this->mIsSpeaking;
+}
+
+AvHMessageID AvHPlayer::GetLastSaying() const
+{
+    return this->mLastSaying;
+}
+
+bool AvHPlayer::GetOrdersRequested(void) const
+{
+    return this->mOrdersRequested;
+}
+
+bool AvHPlayer::GetOrderAcknowledged(void) const
+{
+    return this->mOrderAcknowledged;
+}
+
+string AvHPlayer::GetPlayerName() const
+{
+    string thePlayerName = (this->pev->netname && STRING(this->pev->netname)[0] != 0 ) ? STRING(this->pev->netname) : "unconnected" ;
+    return thePlayerName;
+}
+
+int AvHPlayer::GetRelevantWeight(void) const
+{
+    float theRelevantWeight = 0;
+
+    // Add current weapon if any
+    //CBasePlayerWeapon* theActiveWeapon = dynamic_cast<CBasePlayerWeapon*>(this->m_pActiveItem);
+    //if(theActiveWeapon)
+    //{
+    //  theRelevantWeight += this->GetRelevantWeightForWeapon(theActiveWeapon);
+    //}
+
+    // Run through items and tally up the ones that we count
+    for(int i = 0; i< MAX_ITEM_TYPES; i++)
+    {
+        AvHBasePlayerWeapon* theCurrentWeapon = dynamic_cast<AvHBasePlayerWeapon*>(this->m_rgpPlayerItems[i]);
+        while(theCurrentWeapon)
+        {
+            int theWeight = this->GetRelevantWeightForWeapon(theCurrentWeapon);
+
+            // Active items count full, count less when stowed
+            float theMultiplier = (theCurrentWeapon == this->m_pActiveItem) ? 1.0f : .7f;
+            theRelevantWeight += theWeight*theMultiplier;
+            theCurrentWeapon = dynamic_cast<AvHBasePlayerWeapon*>(theCurrentWeapon->m_pNext);
+        }
+    }
+
+    return (int)(theRelevantWeight);
+}
+
+int AvHPlayer::GetRelevantWeightForWeapon(AvHBasePlayerWeapon* inWeapon) const
+{
+    ASSERT(inWeapon != NULL);
+
+    AvHWeaponID theWeaponID = (AvHWeaponID)inWeapon->m_iId;
+    int theNumRounds = 0;
+    if(inWeapon->UsesAmmo())
+    {
+        int theAmmoIndex = inWeapon->PrimaryAmmoIndex();
+        ASSERT(theAmmoIndex >= 0);
+        ASSERT(theAmmoIndex < MAX_AMMO_SLOTS);
+        theNumRounds = max(inWeapon->m_iClip + this->m_rgAmmo[theAmmoIndex], 0);
+    }
+
+    return GetGameRules()->GetWeightForItemAndAmmo(theWeaponID, theNumRounds);
+}
+
+AvHUser3 AvHPlayer::GetPreviousUser3(bool inIncludeSpectating) const
+{
+    
+    AvHUser3 theUser3 = this->mPreviousUser3;
+
+    if(inIncludeSpectating)
+    {
+        const CBaseEntity* theSpectatingEntity = this->GetSpectatingEntity();
+        if(theSpectatingEntity)
+        {
+            const AvHPlayer* theSpectatingPlayer = dynamic_cast<const AvHPlayer*>(theSpectatingEntity);
+            if(theSpectatingPlayer)
+            {
+                theUser3 = theSpectatingPlayer->GetPreviousUser3();
+            }
+        }
+    }
+
+    return theUser3;
+
+}
+
+AvHUser3 AvHPlayer::GetUser3(bool inIncludeSpectating) const
+{
+    AvHUser3 theUser3 = (AvHUser3)this->pev->iuser3;
+
+    if(inIncludeSpectating)
+    {
+        const CBaseEntity* theSpectatingEntity = this->GetSpectatingEntity();
+        if(theSpectatingEntity)
+        {
+            const AvHPlayer* theSpectatingPlayer = dynamic_cast<const AvHPlayer*>(theSpectatingEntity);
+            if(theSpectatingPlayer)
+            {
+                theUser3 = theSpectatingPlayer->GetUser3();
+            }
+        }
+    }
+
+    return theUser3;
+}
+
+AvHMessageID AvHPlayer::GetEvolution(bool inIncludeSpectating) const
+{
+
+    AvHMessageID theEvolution = mEvolution;
+
+    if(inIncludeSpectating)
+    {
+        const CBaseEntity* theSpectatingEntity = this->GetSpectatingEntity();
+        if(theSpectatingEntity)
+        {
+            const AvHPlayer* theSpectatingPlayer = dynamic_cast<const AvHPlayer*>(theSpectatingEntity);
+            if(theSpectatingPlayer)
+            {
+                theEvolution = theSpectatingPlayer->GetEvolution();
+            }
+        }
+    }
+
+    return theEvolution;    
+    
+}
+
+bool AvHPlayer::GetSpecialPASOrigin(Vector& outOrigin)
+{
+    bool theUseSpecial = (this->GetUser3() == AVH_USER3_COMMANDER_PLAYER);
+
+    if(theUseSpecial)
+    {
+        VectorCopy(this->mSpecialPASOrigin, outOrigin);
+    }
+
+    return theUseSpecial;
+}
+
+// Don't check validity.  ASSERT if an error is encountered.
+void AvHPlayer::GiveUpgrade(AvHMessageID inUpgrade)
+{
+    #ifndef AVH_MAPPER_BUILD
+    
+    AvHTeam* theTeam = this->GetTeamPointer();
+
+//  switch(inUpgrade)
+//  {
+//  case BUY_SHOTGUN:
+//      this->CreateAndDrop(kwsShotGun);
+//      break;
+//  case BUY_MINES:
+//      this->GiveNamedItem(kwsMine);
+//      break;
+//
+//  case BUY_GRENADELAUNCHER:
+//      this->CreateAndDrop(kwsGrenadeGun);
+//      break;
+    // TODO: Upgrade from grenade launcher?
+    //case BUY_NUKE:
+    //  this->CreateAndDrop(kwsNukeGun);
+    //  break;
+
+//  case BUY_HEAVYMG:
+//      this->CreateAndDrop(kwsHeavyMachineGun);
+//      break;
+//
+//  case BUY_FLAMETHROWER:
+//      this->CreateAndDrop(kwsFlameGun);
+//      break;
+//      
+//  case BUY_WELDER:
+//      this->CreateAndDrop(kwsWelder);
+//      break;
+        
+        // TODO: Upgrade to siege turret?
+        //case BUY_SIEGE:
+        //  break;
+        
+//  case BUY_AMMO:
+//      this->CreateAndDrop(kwsGenericAmmo);
+//      break;
+        
+//  case BUY_REINFORCEMENTS:
+//      //this->SpawnReinforcements();
+//      if(theTeam && (theTeam->GetTeamType() == AVH_CLASS_TYPE_MARINE))
+//      {
+//          theTeam->SetReinforcements(theTeam->GetReinforcements() + 1);
+//      }
+//      break;
+//
+//  // Tech upgrades
+//  case TECH_TEAM:
+//  case TECH_BUILDINGS:
+//  case TECH_POWERUPS:
+//      this->ProcessTechUpgrade(inUpgrade);
+//      break;
+//  }
+
+    #endif
+}
+
+void AvHPlayer::GiveTeamUpgrade(AvHMessageID inUpgrade, bool inGive)
+{
+    AvHUser3 theUser3 = (AvHUser3)this->pev->iuser3;
+    int thePlayerLevel = this->GetExperienceLevel();
+    float theHealthPercentage = this->pev->health/AvHPlayerUpgrade::GetMaxHealth(this->pev->iuser4, theUser3, thePlayerLevel);
+    float theArmorPercentage = this->pev->armorvalue/AvHPlayerUpgrade::GetMaxArmorLevel(this->pev->iuser4, theUser3);
+
+    // If we're in combat mode, handle upgrades differently
+    
+    ProcessGenericUpgrade(this->pev->iuser4, inUpgrade, inGive);
+
+    //AvHTeam* theTeam = this->GetTeamPointer();
+    //if(theTeam && (theTeam->GetTeamType() == AVH_CLASS_TYPE_MARINE))
+    //{
+        AvHUpgradeMask theMask = ProcessGenericUpgrade(this->pev->iuser4, inUpgrade, inGive);
+
+        if(inUpgrade == BUILD_HEAVY)
+        {
+            this->EffectivePlayerClassChanged();
+        }
+    //}
+
+    this->pev->health = theHealthPercentage*AvHPlayerUpgrade::GetMaxHealth(this->pev->iuser4, theUser3, thePlayerLevel);
+    this->pev->armorvalue = theArmorPercentage*AvHPlayerUpgrade::GetMaxArmorLevel(this->pev->iuser4, theUser3);
+}
+
+float AvHPlayer::GetResources(bool inIncludeSpectating) const
+{
+    float theResources = this->mResources;
+
+    if(inIncludeSpectating && (this->pev->iuser1 == OBS_IN_EYE))
+    {
+        AvHPlayer* theEntity = NULL;
+        if(AvHSUGetEntityFromIndex(this->pev->iuser2, theEntity))
+        {
+            theResources = theEntity->GetResources(false);
+        }
+    }
+
+    const AvHTeam* theTeam = this->GetTeamPointer();
+    if(theTeam) 
+    {
+        if(theTeam->GetTeamType() == AVH_CLASS_TYPE_MARINE)
+        {
+            theResources = theTeam->GetTeamResources();
+        }
+    }
+    
+    return theResources;
+}
+
+void AvHPlayer::GetSpeeds(int& outBaseSpeed, int& outUnemcumberedSpeed) const
+{
+    // Use marine speed when in ready room (ie, AVH_CLASS_TYPE_UNDEFINED)
+    //int theBaseSpeed = 160;
+    // Counter-strike speeds are around 260 for knife running, and 215 with the para (according to Adrian's memory)
+    int theBaseSpeed = BALANCE_IVAR(kBasePlayerSpeed);
+    int theUnencumberedSpeed = BALANCE_IVAR(kUnencumberedPlayerSpeed);
+
+    if(this->IsObserver())
+    {
+        theBaseSpeed = theUnencumberedSpeed = 1000;
+    }
+    else if(this->GetClassType() == AVH_CLASS_TYPE_MARINE)
+    {
+        if(this->pev->iuser3 == AVH_USER3_COMMANDER_PLAYER)
+        {
+            if(this->mInTopDownMode)
+            {
+                // For scrolling
+                theBaseSpeed = theUnencumberedSpeed = BALANCE_IVAR(kCommanderPlayerSpeed);
+            }
+        }
+        else if(this->GetHasHeavyArmor())
+        {
+            float theHeavyMultiplier = BALANCE_FVAR(kHeavySpeedMultiplier);
+            theBaseSpeed *= theHeavyMultiplier;
+            theUnencumberedSpeed *= theHeavyMultiplier;
+        }
+        else if(this->GetHasJetpack())
+        {
+            float theJetpackMultiplier = BALANCE_FVAR(kJetpackSpeedMultiplier);
+            theBaseSpeed *= theJetpackMultiplier;
+            theUnencumberedSpeed *= theJetpackMultiplier;
+        }
+        
+        if(GetHasUpgrade(this->pev->iuser4, MASK_BUFFED))
+        {
+            const float kStimpackSpeedMultiplier = 1 + BALANCE_FVAR(kCatalystSpeedIncrease);
+            theBaseSpeed *= kStimpackSpeedMultiplier;
+            theUnencumberedSpeed *= kStimpackSpeedMultiplier;
+        }
+    }
+    else if(this->GetClassType() == AVH_CLASS_TYPE_ALIEN)
+    {
+        int theSpeedUpgradeLevel = 0;
+        if(GetHasUpgrade(this->pev->iuser4, MASK_UPGRADE_4))
+        {
+            theSpeedUpgradeLevel = 1;
+
+            if(GetHasUpgrade(this->pev->iuser4, MASK_UPGRADE_12))
+            {
+                theSpeedUpgradeLevel = 2;
+            }
+            else if(GetHasUpgrade(this->pev->iuser4, MASK_UPGRADE_13))
+            {
+                theSpeedUpgradeLevel = 3;
+            }
+        }
+
+        // When gestating
+        float theAlienBaseSpeed = 0;
+        int theSpeedUpgradeAmount = BALANCE_IVAR(kAlienCelerityBonus);
+        const float kChargingFactor = 2.0f;
+
+        switch(this->pev->iuser3)
+        {
+            // Take into account speed upgrade, if this player has it
+            case AVH_USER3_ALIEN_PLAYER1:
+                theAlienBaseSpeed = BALANCE_IVAR(kSkulkBaseSpeed);
+                break;
+
+            case AVH_USER3_ALIEN_PLAYER2:
+                theAlienBaseSpeed = BALANCE_IVAR(kGorgeBaseSpeed);
+                break;
+
+            case AVH_USER3_ALIEN_PLAYER3:
+                theAlienBaseSpeed = BALANCE_IVAR(kLerkBaseSpeed);
+                
+                // Compensate for airpseed multiplier, so lerk gets proper speed increase in main mode of locomotion
+                //theSpeedUpgradeAmount /= BALANCE_FVAR(kAirspeedMultiplier);
+                break;
+
+            case AVH_USER3_ALIEN_PLAYER4:
+                theAlienBaseSpeed = BALANCE_IVAR(kFadeBaseSpeed);
+                break;
+            
+            case AVH_USER3_ALIEN_PLAYER5:
+                //theAlienBaseSpeed = this->mMaxGallopSpeed;
+                theAlienBaseSpeed = BALANCE_IVAR(kOnosBaseSpeed);
+
+                if(GetHasUpgrade(this->pev->iuser4, MASK_ALIEN_MOVEMENT))
+                {
+                    theAlienBaseSpeed *= kChargingFactor;
+                    theSpeedUpgradeAmount *= kChargingFactor;
+                }
+                break;
+        }
+
+        theUnencumberedSpeed = theBaseSpeed = theAlienBaseSpeed + (theSpeedUpgradeLevel*theSpeedUpgradeAmount);
+
+        // Update kMaxPlayerSpeed to make sure footsteps are played correctly
+        ASSERT(theUnencumberedSpeed <= kMaxGroundPlayerSpeed);
+    }
+
+    outBaseSpeed = theBaseSpeed;
+    outUnemcumberedSpeed = theUnencumberedSpeed;
+
+    // Take into account ensnare
+    if(this->GetIsEnsnared())
+    {
+        float thePercentageComplete = (gpGlobals->time - this->mLastTimeEnsnared)/(this->mTimeToBeUnensnared - this->mLastTimeEnsnared);
+        thePercentageComplete = max(min(thePercentageComplete, 1.0f), 0.0f);
+        //ASSERT(thePercentageComplete >= 0.0f);
+        //ASSERT(thePercentageComplete <= 1.0f);
+        
+        float theSpeedFactor = min(BALANCE_FVAR(kEnsnareMinimumSpeedFactor) + (1.0f - BALANCE_FVAR(kEnsnareMinimumSpeedFactor))*thePercentageComplete, BALANCE_FVAR(kEnsnareMaximumSpeedFactor));
+        ASSERT(theSpeedFactor >= BALANCE_FVAR(kEnsnareMinimumSpeedFactor));
+        ASSERT(theSpeedFactor <= 1.0f);
+        
+        outBaseSpeed *= theSpeedFactor;
+        outUnemcumberedSpeed *= theSpeedFactor;
+    }
+
+    // Reduce speed a bit when player has carapace
+    if(this->GetIsAlien())
+    {
+        int theCarapaceLevel = AvHPlayerUpgrade::GetArmorUpgrade((AvHUser3)this->pev->iuser3, this->pev->iuser4);
+        float theSpeedFactor = (1.0f - BALANCE_FVAR(kCarapaceSlowFactor)*theCarapaceLevel);
+
+        outBaseSpeed *= theSpeedFactor;
+        outUnemcumberedSpeed *= theSpeedFactor;
+    }
+
+    if(this->GetIsMetabolizing())
+    {
+        float theMetabolizeSpeedFactor = BALANCE_FVAR(kMetabolizeSpeedFactor);
+        outBaseSpeed *= theMetabolizeSpeedFactor;
+        outUnemcumberedSpeed *= theMetabolizeSpeedFactor;
+    }
+
+    if(this->GetIsDigesting())
+    {
+        float theDigestingSpeedFactor = BALANCE_FVAR(kDigestingSpeedFactor);
+        outBaseSpeed *= theDigestingSpeedFactor;
+        outUnemcumberedSpeed *= theDigestingSpeedFactor;
+    }
+    
+    if(this->GetIsStunned())
+    {
+        // MUHAHAHA!
+        outBaseSpeed = outUnemcumberedSpeed = 0.0f;
+    }
+
+    // If we're a fade using blink, increase our speed massively
+//  if(this->GetIsBlinking())
+//  {
+//      outBaseSpeed *= 10.0f;
+//      outUnemcumberedSpeed = outBaseSpeed;
+//  }
+
+//    if(GetGameRules()->GetIsCombatMode())
+//    {
+//        int theSpeedIncrease = (this->GetExperienceLevel() - 1)*BALANCE_IVAR(kCombatLevelSpeedIncrease);
+//
+//        outBaseSpeed += theSpeedIncrease;
+//        outUnemcumberedSpeed += theSpeedIncrease;
+//    }
+
+    if(GetGameRules()->GetIsCheatEnabled(kcHighSpeed))
+    {
+        outBaseSpeed = outUnemcumberedSpeed = kMaxGroundPlayerSpeed*.7f;
+    }
+}
+
+int AvHPlayer::GetMaxWalkSpeed() const
+{
+    return this->mMaxWalkSpeed;
+}
+
+void AvHPlayer::PickSkin()
+{
+    int theSkin = 0;
+                   
+    if(this->GetIsMarine())
+    {
+        theSkin = RANDOM_LONG(0, 1);
+    }
+    
+    this->SetSkin(theSkin);
+}
+
+void AvHPlayer::SetSkin(int inSkin)
+{
+    if(this->pev)
+    {
+        this->pev->skin = inSkin;
+    }
+}
+
+void AvHPlayer::GiveOrderToSelection(AvHOrder& inOrder)
+{
+    // Set the player list as the selected players
+    EntityListType theReceivers = this->mSelected;
+    
+    // Set the order for the team
+    AvHTeam* theTeam = this->GetTeamPointer();
+    ASSERT(theTeam);
+
+	int theOrderID=inOrder.GetOrderID();
+	if(GetGameRules()->GetIsCheatEnabled(kcOrderSelf))
+    {
+		AvHOrder theOrder=inOrder;
+		int theSelfIndex = this->entindex();
+	    theOrder.SetReceiver(theSelfIndex);
+		theOrder.SetOrderID();
+	    theTeam->SetOrder(theOrder);
+
+	}
+	if ( this->mSelected.size() > 0 ) {
+		for(EntityListType::iterator theIter = theReceivers.begin(); theIter != theReceivers.end(); theIter++)
+		{
+			if ( inOrder.GetTargetIndex() != *theIter ) 
+			{
+				AvHOrder theOrder=inOrder;
+				theOrder.SetReceiver(*theIter);
+				theOrder.SetOrderID();
+				theTeam->SetOrder(theOrder);
+			}
+		}
+	}
+    
+
+    // set this to true to indicate they don't need help
+    this->mHasGivenOrder = true;
+}
+
+bool AvHPlayer::GiveOrderToSelection(AvHOrderType inOrder, Vector inNormRay)
+{
+    bool theSuccess = false;
+    AvHOrder theNewOrder;
+
+    Vector theOrigin = this->GetVisualOrigin();
+
+//  #ifdef DEBUG
+//  vec3_t theStartPoint;
+//  VectorMA(theOrigin, kSelectionStartRange, inNormRay, theStartPoint);
+//  
+//  vec3_t theEndPoint;
+//  VectorMA(theOrigin, kSelectionEndRange, inNormRay, theEndPoint);
+//  
+//  vec3_t theValidOrigin;
+//  AvHSHUServerGetFirstNonSolidPoint(theStartPoint, theEndPoint, theValidOrigin);
+//
+//  theValidOrigin.z -= BALANCE_IVAR(kBiteDamage);
+//
+//  CBaseEntity* pEnt = CBaseEntity::Create(kwsDebugEntity, theValidOrigin, Vector(0, 0, 0));
+//  ASSERT(pEnt);
+//  pEnt->pev->movetype = MOVETYPE_FLY;
+//  pEnt->pev->solid = SOLID_NOT;
+//  #endif
+
+    if(AvHCreateSpecificOrder((AvHTeamNumber)(this->pev->team), theOrigin, inOrder, inNormRay, theNewOrder))
+    {
+        this->GiveOrderToSelection(theNewOrder);
+
+        theSuccess = true;
+    }
+
+    return theSuccess;
+}
+
+void AvHPlayer::HolsterCurrent()
+{
+    if(this->m_pActiveItem)
+    {
+        
+        CBasePlayerWeapon* theCurrentWeapon = (CBasePlayerWeapon *)this->m_pActiveItem->GetWeaponPtr();
+
+        if(theCurrentWeapon && theCurrentWeapon->CanHolster())
+        {
+            theCurrentWeapon->Holster();
+        }
+
+    }
+}
+
+void AvHPlayer::Kick()
+{
+    char theCommandBuffer[256];
+    sprintf(theCommandBuffer, "kick \"%s\"\n", STRING(this->pev->netname));
+    SERVER_COMMAND(theCommandBuffer);
+}
+
+void AvHPlayer::ImpulseCommands()
+{
+    AvHMessageID theMessage = (AvHMessageID)pev->impulse;
+    
+    this->PlayerUse();
+
+    bool theHandledMessage = false;
+
+    if(theMessage != MESSAGE_NULL)
+    {
+        // These things can only happen during play, not in ready room, reinforcement or observer modes
+        if(this->GetPlayMode() == PLAYMODE_PLAYING || (GetGameRules()->GetCheatsEnabled()))
+        {
+            if(this->ExecuteMessage(theMessage))
+            {
+                theHandledMessage = true;
+            }
+        }
+        
+        if(!theHandledMessage)
+        {
+            CBasePlayer::ImpulseCommands();
+        }
+        
+        // Very important I found out
+        this->pev->impulse = 0;
+    }
+}
+
+void AvHPlayer::ItemPostFrame(void)
+{
+    // Check if player tried to do something while we were in the ready room.  If so, display tutorial message.
+    if(this->GetPlayMode() == PLAYMODE_READYROOM)
+    {
+        if((this->pev->button & IN_ATTACK) || (this->pev->button & IN_ATTACK2) || (this->pev->button & IN_RELOAD))
+        {
+            this->SendMessageOnce(kReadyRoomMessage, true);
+        }
+    }
+
+    if(!this->GetIsBeingDigested())
+    {
+        CBasePlayer::ItemPostFrame();
+    }
+    
+    this->UpdateAmbientSounds();
+}
+
+void AvHPlayer::Init()
+{
+
+    int i;
+    
+    // Copy the server variables from the game rules.
+
+    AvHGamerules* theGameRules = GetGameRules();
+
+    mServerVariableList.clear();
+    
+    for (i = 0; i < theGameRules->GetNumServerVariables(); ++i)
+    {
+        mServerVariableList.push_back(ServerVariable());
+        mServerVariableList.back().mName = theGameRules->GetServerVariable(i);
+    }
+    
+    // Reset to default team
+    strcpy(this->m_szTeamName, kUndefinedTeam);
+
+    this->mResources = 0;
+    this->mScore = 0;
+    this->mSavedCombatFrags = 0;
+#ifdef USE_UPP
+	this->mAuthorized = UPPUtil_GetDefaultAuthorization();
+	this->mAuthMask = UPPUtil_GetDefaultAuthMask();
+	this->mScoreboardIconName = UPPUtil_GetDefaultScoreboardIcon();
+#else
+	this->mCachedAuthenticationMask = -1;
+#endif
+    this->mLastModelIndex = -1;
+
+    this->mFirstUpdate = true;
+    this->mNewMap = true;
+
+    this->mHasSeenTeamOne = this->mHasSeenTeamTwo = false;
+
+    this->mPendingCommand = NULL;
+    this->mIsSpeaking = false;
+    this->mOrdersRequested = false;
+    this->mOrderAcknowledged = false;
+    this->mEnemySighted = false;
+    this->mTriggerUncloak = false;
+    this->mTimeOfLastSaying = 0;
+    this->mLastSaying = MESSAGE_NULL;
+    this->mTimeOfLastEnemySighting = 0;
+    this->mClientInTopDownMode = false;
+    this->mInTopDownMode = false;
+    this->mClientCommander = -1;
+
+    vec3_t theOrigin( 0, 0, 0 );
+    VectorCopy(theOrigin, this->mPositionBeforeTopDown);
+    VectorCopy(theOrigin, this->mAnglesBeforeTopDown);
+    VectorCopy(theOrigin, this->mViewAnglesBeforeTopDown);
+    VectorCopy(theOrigin, this->mViewOfsBeforeTopDown);
+    VectorCopy(theOrigin, this->mLastGallopViewDirection);
+    this->mAnimExtensionBeforeTopDown = "";
+    this->mTimeStartedTopDown = -1;
+
+    if(this->pev)
+    {
+        this->pev->team = TEAM_IND;
+        this->ClearUserVariables();
+
+        this->pev->rendermode = kRenderNormal;
+        this->pev->renderfx = kRenderFxNone;
+        this->pev->renderamt = 0;
+        this->pev->skin = 0;
+        this->pev->solid = SOLID_NOT;
+        this->pev->frags = 0;
+        this->m_iDeaths = 0;
+        this->pev->playerclass = PLAYMODE_UNDEFINED;
+    }
+
+    this->mClientInOverwatch = false;
+    this->mInOverwatch = false;
+    this->mOverwatchEnabled = true;
+    this->mOverwatchTarget = -1;
+    this->mTimeOfLastOverwatchPreventingAction = -1;
+    this->mTimeLastSeenOverwatchTarget = 0;
+    this->mOverwatchFiredThisThink = false;
+
+	// tankefugl: 0000953 
+	this->mTimeLastJoinTeam = -1;
+	// tankefugl
+
+    // alien upgrades
+    this->mTimeOfLastRegeneration = -1;
+    this->mTimeOfLastPheromone = -1;
+    this->mMaxGallopSpeed = 0;
+
+    this->mClientResearchingTech = MESSAGE_NULL;
+
+    this->mAttackOneDown = false;
+    this->mAttackTwoDown = false;
+    this->mPlacingBuilding = false;
+
+    this->mPreviousUser3 = AVH_USER3_NONE;
+    this->mSavedJetpackEnergy = 0;
+
+    this->mHasBeenSpectator = false;
+    this->mHasLeftReadyRoom = false;
+    this->mQueuedThinkMessage = "";
+
+    // Clear out tech nodes
+    this->mClientTechNodes.Clear();
+    this->mClientTechSlotList.clear();
+
+    // Clear out map locations
+    this->mClientInfoLocations.clear();
+
+    // Clear out hive info
+    this->mClientHiveInfo.clear();
+
+    this->mClientGamma = kDefaultMapGamma;
+    
+    // Clear sent message list
+    // Don't clear this message, don't keep sending tutorial messages
+    //this->mSentMessageList.clear();
+    
+    //this->mClientBlipList.clear();
+    //this->mBlipList.clear();
+
+    this->mAlienSightActive = false;
+    this->mNumHives = 0;
+
+    this->mSpecialPASOrigin.x = this->mSpecialPASOrigin.y = this->mSpecialPASOrigin.z = 0.0f;
+    this->mClientSpecialPASOrigin.x = this->mClientSpecialPASOrigin.y = this->mClientSpecialPASOrigin.z = 0.0f;
+    this->mTimeOfLastPASUpdate = -1;
+
+    this->mTimeOfLastTeleport = -1;
+    this->mTimeOfLastHelpText = -1;
+    this->mTimeOfLastUse = -1;
+    this->mTimeLeapEnd = -1;
+    this->mTimeOfLastRedeem = -1;
+
+    memset(&this->mClientDebugCSPInfo, 0, sizeof(weapon_data_t));
+    memset(&this->mDebugCSPInfo, 0, sizeof(weapon_data_t));
+    this->mClientNextAttack = 0;
+
+    this->mMaxWalkSpeed = CBasePlayer::GetMaxWalkSpeed();
+    this->mTimeToBeUnensnared = -1;
+    this->mLastTimeEnsnared = -1;
+    this->mLastTimeStartedPlaying = -1;
+
+    this->mTimeToBeFreeToMove = -1;
+    this->mTimeToEndCatalyst = -1;
+    
+    this->mLastTimeInCommandStation = -1;
+    this->mLastTimeRedemptionTriggered = -1;
+    this->mLastTimeCheckedRedemption = -1;
+
+    this->mJetpackEnergy = 1.0f;
+    this->mJetpacking = false;
+    this->mLastPowerArmorThink = -1;
+    this->mLastInventoryThink = -1;
+
+    this->mTimeLastPlaying = -1;
+    this->mTimeGestationStarted = -1;
+
+    this->mEvolution = MESSAGE_NULL;
+    this->mHealthPercentBefore = -1;
+    this->mArmorPercentBefore = -1;
+
+    this->mTimeStartedScream = -1;
+    //this->mNumParticleTemplatesSent = 0;
+    //this->mTimeOfLastParticleTemplateSending = -1;
+
+    this->mEnemyBlips.Clear();
+    this->mFriendlyBlips.Clear();
+
+    this->mSelected.clear();
+    this->mClientTrackingEntity = this->mTrackingEntity = 0;
+    this->mClientSelectAllGroup.clear();
+
+    for(i = 0; i < kNumHotkeyGroups; i++)
+    {
+        this->mClientGroups[i].clear();
+        this->mClientGroupAlerts[i] = ALERT_NONE;
+    }
+
+    this->mProgressBarEntityIndex = -1;
+    // Don't set this, must propagate
+    //this->mClientProgressBarEntityIndex = -1;
+    this->mProgressBarParam = -1;
+    this->mTimeProgressBarTriggered = -1;
+    this->mTimeOfLastFogTrigger = -1;
+    this->mFogExpireTime = -1;
+    this->mCurrentFogEntity = -1;
+
+    // Don't set this, we need to propagate lack of fog
+    //this->mClientCurrentFogEntity = -1;
+
+    //this->mUpgrades.clear();
+    this->mClientOrders.clear();
+    
+    this->mMouseWorldPos = this->mAttackOnePressedWorldPos = this->mAttackTwoPressedWorldPos = theOrigin;
+
+    this->mClientEntityHierarchy.Clear();
+
+    this->mKilledX = this->mKilledY = -1;
+
+    this->mHasGivenOrder = false;
+    this->mTimeOfLastSignificantCommanderAction = -1;
+    this->mPreThinkTicks = 0;
+
+    this->mDesiredNetName = "";
+    this->mAuthCheatMask = 0;
+    this->mAllowAuth = true;
+
+    this->mTimeOfLastClassAndTeamUpdate = -1;
+    this->mEffectivePlayerClassChanged = false;
+    this->mNeedsTeamUpdate = false;
+    this->mSendTeamUpdate = false;
+    this->mSendSpawnScreenFade = false;
+    this->mClientMenuTechSlots = 0;
+
+    memset(&this->mClientRequests, 0, sizeof(int)*kNumRequestTypes);
+
+    this->mDigestee = 0;
+    this->mTimeOfLastDigestDamage = 0;
+    this->mTimeOfLastCombatThink = 0;
+    this->mDesiredRoomType = this->mClientDesiredRoomType = 0;
+
+    this->mTimeOfLastConstructUseAnimation = 0;
+    this->mTimeOfLastConstructUse = -1;
+    this->mTimeOfLastResupply = 0;
+
+    this->mTimeOfMetabolizeEnd = -1;
+
+    this->m_DefaultSpectatingMode = OBS_IN_EYE;
+    this->m_DefaultSpectatingTarget = 1;
+
+    this->mLastSelectEvent = MESSAGE_NULL;
+    VectorCopy(g_vecZero, this->mPositionBeforeLastGotoGroup);
+
+    this->mTimeOfLastSporeDamage = -1;
+    this->mTimeOfLastTouchDamage = -1;
+
+    this->mLastMessageSent = "";
+
+    this->mExperience = 0.0;
+    this->mExperienceLevelsSpent = 0;
+    this->mClientExperienceLevelsSpent = 0;
+    this->mClientPercentToNextLevel = 0.0f;
+    this->mCombatNodes.Clear();
+    this->mPurchasedCombatUpgrades.clear();
+    this->mGiveCombatUpgrades.clear();
+}
+
+void AvHPlayer::InitializeFromTeam(float inHealthPercentage, float inArmorPercentage)
+{
+    // Set base health and armor
+    int theMaxHealth = AvHPlayerUpgrade::GetMaxHealth(this->pev->iuser4, (AvHUser3)this->pev->iuser3, this->GetExperienceLevel());
+    this->pev->health = this->pev->max_health = max(theMaxHealth*inHealthPercentage,1);//voogru: prevent bug with players evolving down from higher lifeform from getting negative health but still "alive"
+
+    this->pev->armorvalue = AvHPlayerUpgrade::GetMaxArmorLevel(this->pev->iuser4, (AvHUser3)this->pev->iuser3)*inArmorPercentage;
+    
+    AvHTeam* theTeam = this->GetTeamPointer();
+    if(theTeam)
+    {
+        ASSERT(theTeam);
+        
+        // If he's already on the team, this does nothing (his rank keeps over death)
+        if(theTeam->AddPlayer(this->entindex()))
+        {
+            GetGameRules()->RecalculateHandicap();
+        
+            float theStartingPoints = theTeam->GetInitialPlayerPoints(this->edict());
+            if(this->GetIsMarine())
+            {
+                theStartingPoints += this->GetResources();
+            }
+
+            // Set starting resources
+            this->SetResources(theStartingPoints, false);
+
+            // If we're in combat mode, we use our own tech nodes instead of our team's
+            if(GetGameRules()->GetIsCombatMode())
+            {
+                AvHTechNodes theInitialTechNodes = theTeam->GetTechNodes();
+
+                // Removed restoration of previous levels and experience due to abuse
+                //// Restore saved/spent nodes if we've already been playing
+                //AvHServerPlayerData* theServerPlayerData = this->GetServerPlayerData();
+                //if(theServerPlayerData)
+                //{
+                //    AvHTechNodes theSavedTechNodes = theServerPlayerData->GetCombatNodes();
+                //    if(theSavedTechNodes.GetNumNodes() > 0)
+                //    {
+                //        theInitialTechNodes = theSavedTechNodes;
+                //    }
+                //            
+                //    int a = this->mExperienceLevelsSpent;
+                //
+                //    this->SetExperienceLevelsSpent(theServerPlayerData->GetExperienceLevelsSpent());
+                //
+                //    MessageIDListType thePurchasedCombatUpgrades = theServerPlayerData->GetPurchasedCombatUpgrades();
+                //    for(MessageIDListType::iterator theIter = thePurchasedCombatUpgrades.begin(); theIter != thePurchasedCombatUpgrades.end(); theIter++)
+                //    {
+                //        this->PurchaseCombatUpgrade(*theIter);
+                //    }
+                //}
+
+                // Save it
+                this->SetCombatNodes(theInitialTechNodes);
+
+                // Set initial experience (restore old experience if player disconnected)
+                this->mExperience = theTeam->GetInitialExperience(this->edict());
+            }
+
+            // Random multiracial marines 
+            this->PickSkin();
+        }
+    }
+}
+
+bool AvHPlayer::GetIsRelevant(bool inIncludeSpectating) const
+{
+    bool theIsRelevant = false;
+
+    // Use ourself unless we're spectating
+    const AvHPlayer* thePlayer = this;
+
+    if(inIncludeSpectating)
+    {
+        const CBaseEntity* theSpectatingEntity = this->GetSpectatingEntity();
+        if(theSpectatingEntity)
+        {
+            const AvHPlayer* theSpectatingPlayer = dynamic_cast<const AvHPlayer*>(theSpectatingEntity);
+            if(theSpectatingPlayer)
+            {
+                thePlayer = theSpectatingPlayer;
+            }
+        }
+    }
+    
+    if(thePlayer->IsAlive() && (thePlayer->GetPlayMode() == PLAYMODE_PLAYING) && !thePlayer->GetIsSpectator() && (thePlayer->pev->team != TEAM_IND))
+    {
+        theIsRelevant = true;
+    }
+    
+    return theIsRelevant;
+}
+
+bool AvHPlayer::GetCanBeAffectedByEnemies() const
+{
+    bool theCanBeAffected = this->GetIsRelevant(false) && !this->GetIsTemporarilyInvulnerable() && !this->GetIsBeingDigested() && !this->GetIsInTopDownMode();
+    return theCanBeAffected;
+}
+
+float AvHPlayer::GetOpacity() const
+{
+    float theOpacity = AvHCloakable::GetOpacity();
+
+    //if(this->GetIsBlinking())
+    //{
+    //  theOpacity = .05f;
+    //}
+
+    return theOpacity;
+}
+
+bool AvHPlayer::GetIsMetabolizing() const
+{
+    bool theIsMetabolizing = false;
+
+    if((gpGlobals->time < this->mTimeOfMetabolizeEnd) && (this->pev->iuser3 == AVH_USER3_ALIEN_PLAYER4))
+    {
+        theIsMetabolizing = true;
+    }
+
+    return theIsMetabolizing;
+}
+
+void AvHPlayer::SetTimeOfMetabolizeEnd(float inTime)
+{
+    this->mTimeOfMetabolizeEnd = inTime;
+}
+
+bool AvHPlayer::GetIsSelected(int inEntityIndex) const
+{
+    bool theIsSelected = false;
+
+    for(EntityListType::const_iterator theIter = this->mSelected.begin(); theIter != this->mSelected.end(); theIter++)
+    {
+        if(*theIter == inEntityIndex)
+        {
+            theIsSelected = true;
+            break;
+        }
+    }
+
+    return theIsSelected;
+}
+
+bool AvHPlayer::RemoveSelection(int inEntityIndex)
+{
+    bool theSuccess = false;
+
+    EntityListType::iterator theFoundIter = std::find(this->mSelected.begin(), this->mSelected.end(), (EntityInfo)inEntityIndex);
+    if(theFoundIter != this->mSelected.end())
+    {
+        this->mSelected.erase(theFoundIter);
+        theSuccess = true;
+    }
+
+    return theSuccess;
+}
+
+void AvHPlayer::SetSelection(int inEntityIndex, bool inClearPreviousSelection)
+{
+    if(inClearPreviousSelection)
+    {
+        this->mSelected.clear();
+    }
+
+    this->mSelected.push_back(inEntityIndex);
+}
+
+
+bool AvHPlayer::GetIsSpectator() const
+{
+    return (this->pev->flags & FL_PROXY);
+}
+
+void AvHPlayer::SetIsSpectator()
+{
+    this->pev->flags |= FL_PROXY;
+}
+
+float AvHPlayer::GetLastTimeInCommandStation() const
+{
+    return this->mLastTimeInCommandStation;
+}
+
+// Clears the player's impulse and sends "invalid action" notification if not a legal action
+void AvHPlayer::ValidateClientMoveEvents()
+{
+    // If player tries to execute an alien ability that they don't have, stop them dead.
+    AvHMessageID theMessageID = (AvHMessageID)this->mCurrentCommand.impulse;
+
+    if(theMessageID != MESSAGE_NULL)
+    {
+        // Assume it's invalid
+        bool theIsValid = false;
+        this->mCurrentCommand.impulse = MESSAGE_NULL;
+        this->pev->impulse = MESSAGE_NULL;
+        const float kMinSayingInterval = 3.0f;
+
+        // Process universally allowable impulses
+        switch(theMessageID)
+        {
+        case COMM_CHAT_PUBLIC:
+        case COMM_CHAT_TEAM:
+        case COMM_CHAT_NEARBY:
+        case IMPULSE_FLASHLIGHT:
+        case IMPULSE_SPRAYPAINT:
+        case IMPULSE_DEMORECORD:
+        case ADMIN_READYROOM:
+            theIsValid = true;
+            break;
+
+        case SAYING_1:
+        case SAYING_2:
+        case SAYING_3:
+        case SAYING_4:
+        case SAYING_5:
+        case SAYING_6:
+        case SAYING_7:
+        case SAYING_8:
+        case SAYING_9:
+            if(GetGameRules()->GetCheatsEnabled() || (gpGlobals->time > (this->mTimeOfLastSaying + kMinSayingInterval)))
+            {
+                theIsValid = true;
+            }
+            else
+            {
+                int a = 0;
+            }
+            break;
+
+        default:
+            if(GetGameRules()->GetIsCombatMode())
+            {
+                theIsValid = true;
+            }
+            break;
+        }
+        
+        // If not universally allowable
+        AvHTeam* theTeam = this->GetTeamPointer();
+        if(!theIsValid && theTeam)
+        {
+            AvHUser3 theUser3 = this->GetUser3();
+        
+            // Marines
+            if(this->GetIsMarine())
+            {
+                // Soldiers
+                if((theUser3 == AVH_USER3_MARINE_PLAYER) && this->IsAlive())
+                {
+                    switch(theMessageID)
+                    {
+                    // Validate orders
+                    case ORDER_REQUEST:
+                    case ORDER_ACK:
+                        
+                    // Validate weapon switches
+                    case WEAPON_NEXT:
+                    case WEAPON_RELOAD:
+                    case WEAPON_DROP:
+
+                    // Only soldiers can vote
+                    case ADMIN_VOTEDOWNCOMMANDER:
+                        theIsValid = true;
+                    }
+                }
+                // Commanders
+                else if(theUser3 == AVH_USER3_COMMANDER_PLAYER)
+                {
+                    switch(theMessageID)
+                    {
+                    // Validate commander movement and input
+                    case COMMANDER_MOUSECOORD:
+                    case COMMANDER_MOVETO:
+                    case COMMANDER_SCROLL:
+                    case COMMANDER_DEFAULTORDER:
+                    case COMMANDER_SELECTALL:
+                    case COMMANDER_REMOVESELECTION:
+
+                    // Validate hotgroup creation and selection
+                    case GROUP_CREATE_1:
+                    case GROUP_CREATE_2:
+                    case GROUP_CREATE_3:
+                    case GROUP_CREATE_4:
+                    case GROUP_CREATE_5:
+                    case GROUP_SELECT_1:
+                    case GROUP_SELECT_2:
+                    case GROUP_SELECT_3:
+                    case GROUP_SELECT_4:
+                    case GROUP_SELECT_5:
+
+                    // Special impulses to handle requests
+                    case COMMANDER_NEXTIDLE:
+                    case COMMANDER_NEXTAMMO:
+                    case COMMANDER_NEXTHEALTH:
+                        theIsValid = true;
+                    }
+                    
+                    // Validate research and building
+                    // Make sure it comes from the commander and also that the right building is selected and not busy
+                    if(AvHSHUGetIsBuildTech(theMessageID) || AvHSHUGetIsResearchTech(theMessageID) || AvHSHUGetDoesTechCostEnergy(theMessageID) || (theMessageID == BUILD_RECYCLE))
+                    {
+                        if(theTeam->GetTechNodes().GetIsMessageAvailableForSelection(theMessageID, this->mSelected))
+                        {
+                            // Make sure only one structure is selected, and make sure the structure that's selected allows this action
+							if(AvHSHUGetIsBuildTech(theMessageID)) //doesn't depend on selection
+							{
+								theIsValid = true;
+							}
+							else
+							{
+								if(this->mSelected.size() == 1)
+								{
+									int theEntityIndex = *this->mSelected.begin();
+									CBaseEntity* theEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theEntityIndex));
+									AvHBaseBuildable* theBaseBuildable = dynamic_cast<AvHBaseBuildable*>(theEntity);
+									if(theBaseBuildable && theBaseBuildable->GetIsTechnologyAvailable(theMessageID))
+									{
+										theIsValid = true;
+									}
+								}
+                            }
+                        }
+                    }
+                }
+            }
+            // Aliens
+            else if(this->GetIsAlien() && this->IsAlive())
+            {
+                //AvHAlienAbilityWeapon* theAlienAbilityWeapon = dynamic_cast<AvHAlienAbilityWeapon*>(this->m_pActiveItem);
+                
+                switch(theMessageID)
+                {
+                    // Validate all alien abilities
+                case ALIEN_ABILITY_LEAP:
+                case ALIEN_ABILITY_CHARGE:
+                    // Check that weapon is active
+                    if(this->GetHasActiveAlienWeaponWithImpulse(theMessageID))
+					{
+                        // Check that we have enough energy, and that it's enabled
+                        //if(theAlienAbilityWeapon->IsUseable())
+                        //{
+                        // Deduct energy cost
+                        //ItemInfo theItemInfo;
+                        //theAlienAbilityWeapon->GetItemInfo(&theItemInfo);
+                        //float theEnergy = AvHMUGetEnergyCost(theItemInfo.iId);
+                        theIsValid = true;
+                        //}
+                    }
+
+                    // Removed by mmcguire.
+                    // This code is no longer needed because the pm_shared code
+                    // now ignores ability impulses that come from the console.
+                    
+                    /*
+                    else
+                    {
+                        // If players are trying to use the abilities when not equipped via the impulse key, stop them dead (or worse?)
+                        //VectorCopy(g_vecZero, this->pev->velocity);
+                        //this->pev->fixangle = TRUE;
+                        this->Killed(this->pev, 1);
+                        
+                        char theString[512];
+                        sprintf(theString, "Player \"%s\" executed impulse %d illegally and was killed.\n", STRING(this->pev->netname), theMessageID);
+                        ALERT(at_logged, theString);
+                    }
+                    */
+                    break;
+
+                case ALIEN_ABILITY_BLINK:
+                    theIsValid = true;
+                    break;
+                    
+                    // Validate lifeform changes and evolutions
+                case ALIEN_EVOLUTION_ONE:
+                case ALIEN_EVOLUTION_TWO:
+                case ALIEN_EVOLUTION_THREE:
+                case ALIEN_EVOLUTION_SEVEN:
+                case ALIEN_EVOLUTION_EIGHT:
+                case ALIEN_EVOLUTION_NINE:
+                case ALIEN_EVOLUTION_TEN:
+                case ALIEN_EVOLUTION_ELEVEN:
+                case ALIEN_EVOLUTION_TWELVE:
+                    
+                case ALIEN_LIFEFORM_ONE:
+                case ALIEN_LIFEFORM_TWO:
+                case ALIEN_LIFEFORM_THREE:
+                case ALIEN_LIFEFORM_FOUR:
+                case ALIEN_LIFEFORM_FIVE:
+                    
+                case ALIEN_BUILD_RESOURCES:
+                case ALIEN_BUILD_OFFENSE_CHAMBER:
+                case ALIEN_BUILD_DEFENSE_CHAMBER:
+                case ALIEN_BUILD_SENSORY_CHAMBER:
+                case ALIEN_BUILD_MOVEMENT_CHAMBER:
+                case ALIEN_BUILD_HIVE:
+                    
+                    // Validate weapon switches
+                case WEAPON_NEXT:
+                    theIsValid = true;
+                    break;
+                }
+            }
+        }
+        
+        if(theIsValid)
+        {
+            this->mCurrentCommand.impulse = theMessageID;
+            this->pev->impulse = theMessageID;
+        }
+    }
+}
+
+bool AvHPlayer::GetHasActiveAlienWeaponWithImpulse(AvHMessageID inMessageID) const
+{
+    bool theHasWeapon = false;
+    
+    for(int i = 0; (i < MAX_ITEM_TYPES) && !theHasWeapon; i++)
+    {
+        CBasePlayerItem* theCurrentItem = this->m_rgpPlayerItems[i];
+        if(theCurrentItem)
+        {
+            AvHAlienAbilityWeapon* theBaseWeapon = dynamic_cast<AvHAlienAbilityWeapon*>(theCurrentItem);
+            while(theBaseWeapon && !theHasWeapon)
+            {
+                if((theBaseWeapon->GetAbilityImpulse() == inMessageID) && theBaseWeapon->GetEnabledState() && theBaseWeapon->IsUseable())
+                {
+                    theHasWeapon = true;
+                }
+                theCurrentItem = theCurrentItem->m_pNext;
+                theBaseWeapon = dynamic_cast<AvHAlienAbilityWeapon*>(theCurrentItem);
+            }
+        }
+    }
+
+    return theHasWeapon;
+}
+
+bool AvHPlayer::GetHasSeenTeam(AvHTeamNumber inNumber)
+{
+    bool theHasBeenOnTeam = false;
+
+    if(inNumber == TEAM_ONE)
+    {
+        theHasBeenOnTeam = this->mHasSeenTeamOne;
+    }
+    else if(inNumber == TEAM_TWO)
+    {
+        theHasBeenOnTeam = this->mHasSeenTeamTwo;
+    }
+
+    return theHasBeenOnTeam;
+}
+
+void AvHPlayer::SetHasSeenTeam(AvHTeamNumber inNumber)
+{
+    if(inNumber == TEAM_ONE)
+    {
+        this->mHasSeenTeamOne = true;
+    }
+    else if(inNumber == TEAM_TWO)
+    {
+        this->mHasSeenTeamTwo = true;
+    }
+}
+
+float AvHPlayer::GetTimeOfLastSporeDamage() const
+{
+    return this->mTimeOfLastSporeDamage;
+}
+
+void AvHPlayer::SetTimeOfLastSporeDamage(float inTime)
+{
+    this->mTimeOfLastSporeDamage = inTime;
+}
+
+// Assumes that the current input is legal
+void AvHPlayer::HandleTopDownInput()
+{
+    // From CBasePlayer::PreThink():
+    bool theAttackOneDown = FBitSet(this->mCurrentCommand.buttons, IN_ATTACK);
+    bool theAttackTwoDown = FBitSet(this->mCurrentCommand.buttons, IN_ATTACK2);
+    bool theJumpHit = FBitSet(this->mCurrentCommand.buttons, IN_JUMP);
+    bool theCrouchDown = FBitSet(this->mCurrentCommand.buttons, IN_DUCK);
+    
+    // If we are a commander
+    if(this->pev->iuser3 == AVH_USER3_COMMANDER_PLAYER)
+    {
+        this->mLastTimeInCommandStation = gpGlobals->time;
+
+        // Fetch world x and world y from move.
+        // Note: there is some inaccuracy here for two reasons.  One, these values were propagated
+        // over the network and were optimized for it, and two, the selection assumes that the rays
+        // emanate from the CURRENT view origin.  When clicking on one unit, this is right.  When
+        // dragging a box around units, the view origin could have moved substantially.  This inaccuracy
+        // should really only be noticed when drag selecting huge groups of units.  Send view origin as well?
+        this->mMouseWorldPos.x = this->mCurrentCommand.upmove/kSelectionNetworkConstant;
+        this->mMouseWorldPos.y = this->mCurrentCommand.sidemove/kSelectionNetworkConstant;
+        this->mMouseWorldPos.z = this->mCurrentCommand.forwardmove/kSelectionNetworkConstant;
+
+        // Fetch potential world location of mouse click.  worldx -> cmd->upmove, worldy -> cmd->sidemove
+        //if(this->pev->impulse == COMMANDER_MOUSECOORD)
+        AvHMessageID theMessageID = (AvHMessageID)this->mCurrentCommand.impulse;
+
+        bool theIsBuildTech = AvHSHUGetIsBuildTech(theMessageID);
+        bool theIsResearchTech = AvHSHUGetIsResearchTech(theMessageID);
+        bool theIsRecycleMessage = (theMessageID == BUILD_RECYCLE);
+            
+        if(AvHSHUGetIsGroupMessage(theMessageID))
+        {
+            this->GroupMessage(theMessageID);
+        }
+        else if(theMessageID == COMMANDER_SELECTALL)
+        {
+            bool theClearSelection = true;
+                
+            // Run through all players on our team
+            FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+                if(theEntity->GetTeam() == this->GetTeam())
+                {
+                    if(/*theEntity->GetIsRelevant() &&*/ (theEntity != this))
+                    {
+                        this->SetSelection(theEntity->entindex(), theClearSelection);
+                        theClearSelection = false;
+                    }
+                }
+                
+            END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+
+            // Set "selectall" group
+            //this->mSelectAllGroup = this->mSelected;
+            this->GetTeamPointer()->SetSelectAllGroup(this->mSelected);
+        }
+        else if(theMessageID == COMMANDER_REMOVESELECTION)
+        {
+            // TODO:
+            gSelectionHelper.ClearSelection();
+            this->mTrackingEntity = 0;
+        }
+        else if((theMessageID == COMMANDER_NEXTIDLE) || (theMessageID == COMMANDER_NEXTAMMO) || (theMessageID == COMMANDER_NEXTHEALTH) || theJumpHit)
+        {
+            // Jump to first idle soldier and remove from list
+            bool theSuccess = false;
+            AvHTeam* theTeam = this->GetTeamPointer();
+            if(theTeam)
+            {
+                if(theJumpHit)
+                {
+                    theMessageID = MESSAGE_NULL;
+                }
+
+                AvHAlert theAlert;
+                if(theTeam->GetLastAlert(theAlert, true, theJumpHit, &theMessageID))
+                {
+                    int theEntityIndex = theAlert.GetEntityIndex();
+                    CBaseEntity* theBaseEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theEntityIndex));
+                    if(theBaseEntity)
+                    {
+                        VectorCopy(theBaseEntity->pev->origin, this->pev->origin);
+
+                        switch(theMessageID)
+                        {
+                        case COMMANDER_NEXTIDLE:
+                        case COMMANDER_NEXTAMMO:
+                        case COMMANDER_NEXTHEALTH:
+                            // Set selection to player
+                            this->mSelected.clear();
+                            this->mSelected.push_back(theEntityIndex);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        else if((theMessageID == COMMANDER_SCROLL) || (theMessageID == COMMANDER_MOVETO))
+        {
+            // Stop tracking
+            this->mTrackingEntity = 0;
+
+            // Commander didn't make a mistake when going to hotgroup, so clear event (so next group select will go to group, not to last position before)
+            this->mLastSelectEvent = MESSAGE_NULL;
+        }
+        else if((theMessageID == COMMANDER_MOUSECOORD) || theIsBuildTech || theIsResearchTech || theIsRecycleMessage /*|| (theMessageID == COMMANDER_DEFAULTORDER)*/)
+        {
+            bool theAttackOnePressed = (theAttackOneDown && !this->mAttackOneDown);
+            bool theAttackTwoPressed = (theAttackTwoDown && !this->mAttackTwoDown);
+            bool theAttackOneReleased = (!theAttackOneDown && this->mAttackOneDown);
+            bool theAttackTwoReleased = !theAttackTwoDown && this->mAttackTwoDown;
+            
+            // if left button is now down and it wasn't previously down
+            if(theAttackOnePressed)
+            {
+                // Save world location of press
+                this->mAttackOnePressedWorldPos = this->mMouseWorldPos;
+            }
+            
+            // if right button just down
+            if(theAttackTwoPressed)
+            {
+                // remember it's world location
+                this->mAttackTwoPressedWorldPos = this->mMouseWorldPos;
+            }
+            
+            Vector theReleasePosition;
+            if(theAttackOneReleased || theAttackTwoReleased)
+            {
+                // Save world position of release. 
+                theReleasePosition = this->mMouseWorldPos;
+                
+                //char theMessage[256];
+                //sprintf(theMessage, "LMB released, selecting\n");
+                //ClientPrint(this->pev, HUD_PRINTTALK, theMessage);
+            }
+            
+            // Watch for selection events
+            if(theMessageID == COMMANDER_MOUSECOORD)
+            {
+                if(theAttackOneReleased)
+                {
+                    if(!this->mPlacingBuilding)
+                    {
+                        if(!AvHToggleUseable(this, this->GetVisualOrigin(), this->mAttackOnePressedWorldPos))
+                        {
+                            // Clear existing selection
+                            //this->mSelected.clear();
+                            //this->mClientSelected.clear();
+                            
+                            gSelectionHelper.QueueSelection(this->GetVisualOrigin(), this->mAttackOnePressedWorldPos, theReleasePosition, (AvHTeamNumber)this->pev->team);
+                        }
+                        this->mTimeOfLastSignificantCommanderAction = gpGlobals->time;
+                    }
+                    this->mPlacingBuilding = false;
+                }
+                else if(theAttackTwoReleased)
+                {
+                    // Check to be sure that players are selected
+                    if(this->mSelected.size() > 0)
+                    {
+                        bool theNonPlayerSelected = false;
+                        for(EntityListType::iterator theIter = this->mSelected.begin(); theIter != this->mSelected.end(); theIter++)
+                        {
+                            AvHPlayer* thePlayer = NULL;
+                            AvHSUGetEntityFromIndex(*theIter, thePlayer);
+                            if(!thePlayer)
+                            {
+                                theNonPlayerSelected = true;
+                                break;
+                            }
+                        }
+
+						if(!theNonPlayerSelected || GetGameRules()->GetIsCheatEnabled(kcOrderSelf))
+                        {
+                            // Check if right-clicked a useable thing
+                            // Trace to see if the commander clicked a useable thing
+                            //if(!AvHToggleUseable(this, this->pev->origin, this->mAttackTwoPressedWorldPos))
+                            //{
+
+                            if(!this->GiveOrderToSelection(ORDERTYPEL_DEFAULT, this->mAttackTwoPressedWorldPos))
+                            {
+                                // This location better be off the map or something, default orders should nearly always go through
+                                this->SendMessage(kInvalidOrderGiven, true);
+                            }
+                            else
+                            {
+                                this->mTimeOfLastSignificantCommanderAction = gpGlobals->time;
+                            }
+                        }
+                    }
+                    //}
+                }
+            }
+            // Issue movement order to selection
+            //else if(theMessageID == COMMANDER_DEFAULTORDER)
+            //{
+            //  // Build order
+            //  AvHOrder theOrder;
+            //  theOrder.SetOrderType(ORDERTYPEL_DEFAULT);
+            //
+            //  float theWorldX = this->mCurrentCommand.upmove*kWorldPosNetworkConstant;
+            //  float theWorldY = this->mCurrentCommand.sidemove*kWorldPosNetworkConstant;
+            //  theOrder.SetLocation(vec3_t(theWorldX, theWorldY, 0.0f));
+            //
+            //  this->GiveOrderToSelection(theOrder);
+            //}
+            // Watch for build events
+            else if(theIsBuildTech)
+            {
+                this->mPlacingBuilding = true;
+
+                if(GetGameRules()->GetGameStarted())
+                {
+					// 551 puzl
+					// Hack to stop free scans.  This should be reworked as a generic solution for energy based build events.
+					bool theCanBuild=true;
+					if(this->mSelected.size() > 0) 
+					{
+						int theEntityForResearch = *this->mSelected.begin();
+						CBaseEntity* theEntity = AvHSUGetEntityFromIndex(theEntityForResearch);									
+
+						AvHObservatory* theObs = dynamic_cast<AvHObservatory*>(theEntity);
+						if ( theObs ) 
+						{
+							if ( theObs->GetIsTechnologyAvailable(BUILD_SCAN) == false ) 
+								theCanBuild = false;
+						}
+						if(!theObs && theMessageID == BUILD_SCAN) {
+							theCanBuild = false;
+						}
+					}
+
+					if ( theCanBuild ) {
+						// puzl
+						this->BuildTech(theMessageID, this->mAttackOnePressedWorldPos);
+						this->mTimeOfLastSignificantCommanderAction = gpGlobals->time;
+	                    
+						// If player(s) selected when something built, give default order to it (assumes that players can't be selected along with other non-players)
+						if(AvHSHUGetIsBuilding(theMessageID))
+						{
+							if(this->mSelected.size() > 0)
+							{
+								int theFirstEntitySelected = *this->mSelected.begin();
+								if((theFirstEntitySelected >= 1) && (theFirstEntitySelected <= gpGlobals->maxClients))
+								{
+									if(!this->GiveOrderToSelection(ORDERTYPEL_DEFAULT, this->mAttackOnePressedWorldPos))
+									{
+										this->SendMessage(kInvalidOrderGiven, true);
+									}
+								}
+							}
+						}
+					}
+                }
+            }
+            else if(theIsResearchTech)
+            {
+                if(GetGameRules()->GetGameStarted())
+                {
+                    AvHTeam* theTeam = this->GetTeamPointer();
+                    if(theTeam && (theTeam->GetResearchManager().GetIsMessageAvailable(theMessageID)))
+                    {
+                        if(this->mSelected.size() == 1)
+                        {
+								int theEntityForResearch = *this->mSelected.begin();
+								this->Research(theMessageID, theEntityForResearch);
+								this->mTimeOfLastSignificantCommanderAction = gpGlobals->time;
+                        }
+                    }
+                }
+            }
+            // Check for recycling action
+            else if(theIsRecycleMessage)
+            {
+                for(EntityListType::iterator theIter = this->mSelected.begin(); theIter != this->mSelected.end(); theIter++)
+                {
+                    AvHBaseBuildable* theBuildable = NULL;
+                    AvHSUGetEntityFromIndex(*theIter, theBuildable);
+                    if(theBuildable)
+                    {
+                        if((theBuildable->pev->team == this->pev->team) && (theBuildable->pev->team != 0))
+                        {
+                            theBuildable->StartRecycle();
+                            this->mTimeOfLastSignificantCommanderAction = gpGlobals->time;
+
+                            const char* theBuildableName = STRING(theBuildable->pev->classname);
+                            this->LogPlayerAction("recycle", theBuildableName);
+                        }
+                    }
+                }
+            }
+
+            // Update 
+            this->mAttackOneDown = theAttackOneDown;
+            this->mAttackTwoDown = theAttackTwoDown;
+        }
+    }
+    else
+    {
+        // TODO: Make sure we think this player is a commander to prevent cheating on client
+        // TODO: If they sent COMMANDER_MOUSECOORD and they aren't a commander, there's trouble
+    }
+    
+    // Process selections if waiting
+    gSelectionHelper.ProcessPendingSelections();
+
+    if(gSelectionHelper.SelectionResultsWaiting())
+    {
+        EntityListType theNewSelection;
+        gSelectionHelper.GetAndClearSelection(theNewSelection);
+
+        //string theMessage = "selecting: ";
+
+        // If crouch is down
+        bool theToggleSelection = theCrouchDown;
+        if(theToggleSelection)
+        {
+            bool theNewSelectionIsAllPlayers = true;
+
+            // Check to make sure the whole new selection is all players
+            for(EntityListType::iterator theIterator = theNewSelection.begin(); theIterator != theNewSelection.end(); theIterator++)
+            {
+                if(*theIterator > gpGlobals->maxClients)
+                {
+                    theNewSelectionIsAllPlayers = false;
+                }
+            }
+            
+            // If not, clear the current selection and clear crouch
+            if(!theNewSelectionIsAllPlayers)
+            {
+                theToggleSelection = false;
+            }
+        }
+
+        if(!theToggleSelection)
+        {
+            this->mSelected.clear();
+        }
+        
+        // Get player for each one, make sure it's selectable by this player
+        for(EntityListType::iterator theIterator = theNewSelection.begin(); theIterator != theNewSelection.end(); /* no increment*/)
+        {
+            // If this player is selectable
+            AvHPlayer* thePlayer = NULL;
+            AvHSUGetEntityFromIndex(*theIterator, thePlayer);
+            if(!thePlayer || GetGameRules()->GetIsPlayerSelectableByPlayer(thePlayer, this))
+            {
+                // Add to debug message
+                //char theNumber[16];
+                //sprintf(theNumber, "%d ", *theIterator);
+                //theMessage += string(theNumber);
+                int theCurrentEntity = *theIterator;
+
+                // Toggle selection of this player
+                if(theToggleSelection)
+                {
+                    // Is entity is already selected?
+                    EntityListType::iterator theFindIter = std::find(this->mSelected.begin(), this->mSelected.end(), theCurrentEntity);
+                    bool theEntityIsSelected = (theFindIter != this->mSelected.end());
+                    if(theEntityIsSelected)
+                    {
+                        this->mSelected.erase(theFindIter);
+                    }
+                    else
+                    {
+                        this->SetSelection(theCurrentEntity, false);
+                    }
+                }
+                else
+                {
+                    this->SetSelection(theCurrentEntity, false);
+                }
+
+                // Increment
+                theIterator++;
+
+                this->mTrackingEntity = 0;
+            }
+            else
+            {
+                // erase it from the list
+                theIterator = theNewSelection.erase(theIterator);
+            }
+        }
+
+        // If we selected at least one unit, display debug message
+//      if(this->mSelected.size() > 0)
+//      {
+//          theMessage += "\n";
+//          ClientPrint(this->pev, HUD_PRINTTALK, theMessage.c_str());
+//      }
+    }
+
+    // Temporary for fun
+//  AvHTeam* theTeam = this->GetTeamPointer();
+//  if(theTeam && (theTeam->GetTeamType() == AVH_CLASS_TYPE_ALIEN))
+//  {
+//      if(theAttackOneDown && (this->GetUser3() != ROLE_ALIEN2) && (this->GetUser3() != ROLE_ALIEN5))
+//      {
+//          this->PlayRandomRoleSound(kPlayerLevelAttackSoundList, CHAN_WEAPON);
+//      }
+//  }
+}
+
+void AvHPlayer::Jump()
+{
+    Vector      vecWallCheckDir;// direction we're tracing a line to find a wall when walljumping
+    Vector      vecAdjustedVelocity;
+    Vector      vecSpot;
+    TraceResult tr;
+    
+    if (FBitSet(pev->flags, FL_WATERJUMP))
+        return;
+    
+    if (pev->waterlevel >= 2)
+    {
+        return;
+    }
+
+    // If this isn't the first frame pressing the jump button, break out.
+    if ( !FBitSet( m_afButtonPressed, IN_JUMP ) )
+        return;         // don't pogo stick
+
+    if ( !(pev->flags & FL_ONGROUND) || !pev->groundentity )
+    {
+        return;
+    }
+
+// many features in this function use v_forward, so makevectors now.
+    UTIL_MakeVectors (pev->angles);
+
+    SetAnimation( PLAYER_JUMP );
+
+    if ( FBitSet(pev->flags, FL_DUCKING ) || FBitSet(m_afPhysicsFlags, PFLAG_DUCKING) )
+    {
+        //if ( m_fLongJump && (pev->button & IN_DUCK) && gpGlobals->time - m_flDuckTime < 1 && pev->velocity.Length() > 50 )
+        if ( (pev->button & IN_DUCK) && gpGlobals->time - m_flDuckTime < 1 && pev->velocity.Length() > 50 )
+        {// If jump pressed within a second of duck while moving, long jump!
+            SetAnimation( PLAYER_SUPERJUMP );
+        }
+    }
+    
+    // If you're standing on a conveyor, add it's velocity to yours (for momentum)
+    entvars_t *pevGround = VARS(pev->groundentity);
+    if ( pevGround && (pevGround->flags & FL_CONVEYOR) )
+    {
+        pev->velocity = pev->velocity + pev->basevelocity;
+    }
+}
+
+void AvHPlayer::Killed( entvars_t *pevAttacker, int iGib )
+{
+    if(this->GetUser3() != AVH_USER3_COMMANDER_PLAYER)
+    {
+        // Save death position
+        this->mKilledX = this->pev->origin.x;
+        this->mKilledY = this->pev->origin.y;
+        
+        this->mIsScreaming = false;
+
+        this->PackDeadPlayerItems();
+
+        //this->StopDigestion(false);
+        this->ResetBehavior(false);
+
+		if(GetGameRules()->GetIsCombatMode())
+		{
+			this->ProcessCombatDeath();
+		}
+
+        // Fade out already performed when we start being digested
+        bool theFadeOut = !this->GetIsBeingDigested();
+        #ifdef DEBUG
+        #ifndef AVH_EXTERNAL_BUILD
+        theFadeOut = false;
+        #endif
+        #endif
+
+        if(!this->GetIsBeingDigested())
+        {
+            if(theFadeOut)
+            {
+                Vector theFadeColor;
+                theFadeColor.x = 0;
+                theFadeColor.y = 0;
+                theFadeColor.z = 0;
+                UTIL_ScreenFade(this, theFadeColor, kTransitionFadeTime, 0.0f, 255, FFADE_OUT | FFADE_STAYOUT);
+            }
+        }
+        else
+        {
+            SetUpgradeMask(&this->pev->iuser4, MASK_DIGESTING, false);
+        }
+        
+        // This line caused a dynamic_cast failure when a shotty killed a flier, then it set it's ensnare state to false,
+        // which tried to deploy his current weapon, which got the most recent weapon it used, which was garbage for some reason
+        //this->SetEnsnareState(false);
+        SetUpgradeMask(&this->pev->iuser4, MASK_ENSNARED, false);
+        this->mTimeToBeUnensnared = -1;
+        this->mLastTimeEnsnared = -1;
+        
+        this->mAlienSightActive = false;
+        this->mEvolution = MESSAGE_NULL;
+		this->SetUsedKilled(false);
+        
+        this->PlayRandomRoleSound(kPlayerLevelDieSoundList);
+
+        this->Uncloak();
+        
+        int thePriority = 0;
+        bool theIsDramatic = false;
+        switch(this->GetUser3(false))
+        {
+        case AVH_USER3_ALIEN_EMBRYO:
+            thePriority = kGestateDeathPriority;
+            break;
+        case AVH_USER3_ALIEN_PLAYER2:
+            thePriority = kGorgeDeathPriority;
+            break;
+        case AVH_USER3_ALIEN_PLAYER3:
+            thePriority = kLerkDeathPriority;
+            break;
+        case AVH_USER3_ALIEN_PLAYER4:
+            thePriority = kFadeDeathPriority;
+            break;
+        case AVH_USER3_ALIEN_PLAYER5:
+            thePriority = kOnosDeathPriority;
+            theIsDramatic = true;
+            break;
+        }
+
+        if(this->GetHasHeavyArmor())
+        {
+            thePriority = kHeavyDeathPriority;
+        }
+
+        if(thePriority > 0)
+        {
+            GetGameRules()->MarkDramaticEvent(thePriority, this->entindex(), theIsDramatic, (entvars_t*)pevAttacker);
+        }       
+
+        // Added this to make player models fade out
+        this->pev->solid = SOLID_NOT;
+        
+        // We can only die when we're playing, not in ready room, reinforcement mode or observation
+        // (see ClientKill)
+        CBasePlayer::Killed(pevAttacker, iGib);
+
+		//voogru: remove parasite flag if they are a marine.
+		if(this->GetIsMarine())
+			SetUpgradeMask(&this->pev->iuser4, MASK_PARASITED, false); 
+        
+        this->EffectivePlayerClassChanged();
+
+        GetGameRules()->TriggerAlert((AvHTeamNumber)this->pev->team, ALERT_PLAYER_DIED, this->entindex());
+
+
+
+//      // Print death anim
+//      const char* theMainSequence = this->LookupSequence(this->pev->sequence);
+//      if(!theMainSequence)
+//      {
+//          theMainSequence = "None";
+//      }
+//
+//      const char* theGaitSequence = this->LookupSequence(this->pev->gaitsequence);
+//      if(!theGaitSequence)
+//      {
+//          theGaitSequence = "None";
+//      }
+//
+//      char theMessage[128];
+//      sprintf(theMessage, "Death animation: %s, %s", theMainSequence, theGaitSequence);
+//      UTIL_SayText(theMessage, this);
+    }
+}
+
+//Activity AvHPlayer::GetDeathActivity (void)
+//{
+//  Activity theDeathActivity = ACT_DIESIMPLE;
+//
+//  switch(RANDOM_LONG(0, 3))
+//  {
+//  case 1:
+//      theDeathActivity = ACT_DIEBACKWARD;
+//      break;
+//  case 2:
+//      theDeathActivity = ACT_DIEFORWARD;
+//      break;
+//  case 3:
+//      theDeathActivity = ACT_DIEVIOLENT;
+//      break;
+//  }
+//
+//  return theDeathActivity;
+//}
+
+
+void AvHPlayer::NextWeapon()
+{
+    if(this->GetIsAbleToAct())
+    {
+        CBasePlayerWeapon* theActiveWeapon = dynamic_cast<CBasePlayerWeapon*>(this->m_pActiveItem);
+        
+        if(theActiveWeapon)
+        {
+            CBasePlayerWeapon* theNextWeapon = dynamic_cast<CBasePlayerWeapon*>(theActiveWeapon->m_pNext);
+            if(theNextWeapon)
+            {
+                this->m_pLastItem = this->m_pActiveItem;
+                this->m_pActiveItem->Holster();
+                this->m_pActiveItem = theNextWeapon;
+                this->m_pActiveItem->Deploy();
+            }
+            else
+            {
+                int theSlot = theActiveWeapon->iItemSlot();
+                for(int i = 0; i < MAX_ITEM_TYPES; i++)
+                {
+                    theNextWeapon = dynamic_cast<CBasePlayerWeapon*>(this->m_rgpPlayerItems[(theSlot + i + 1) % MAX_ITEM_TYPES]);
+                    if(theNextWeapon)
+                    {
+                        this->m_pLastItem = this->m_pActiveItem;
+                        this->m_pActiveItem->Holster();
+                        this->m_pActiveItem = theNextWeapon;
+                        this->m_pActiveItem->Deploy();
+                        break;
+                    }
+                }
+            }
+        }
+    }
+}
+
+void AvHPlayer::ObserverModeIllegal()
+{
+    // Blackout screen or something if observers aren't allowed
+    UTIL_ScreenFade( CBaseEntity::Instance(this->edict()), Vector(128,0,0), 6, 15, 255, FFADE_OUT | FFADE_MODULATE );
+    this->SendMessage(kNoSpectating);
+}
+
+void AvHPlayer::PackDeadPlayerItems(void)
+{
+	//to do - drop everything that's not in the standard loadout + LMG.
+    this->DropItem(kwsMachineGun);
+    this->DropItem(kwsShotGun);
+	this->DropItem(kwsHeavyMachineGun);
+	this->DropItem(kwsGrenadeGun);
+	this->DropItem(kwsMine);
+	this->DropItem(kwsWelder);
+}
+
+void AvHPlayer::PlayRandomRoleSound(string inSoundListName, int inChannel, float inVolume)
+{
+    #ifndef AVH_MAPPER_BUILD
+    char theListName[256];
+    AvHUser3 theUser3 = this->GetUser3();
+    if(theUser3 != AVH_USER3_NONE)
+    {
+        sprintf(theListName, inSoundListName.c_str(), (int)theUser3);
+        gSoundListManager.PlaySoundInList(theListName, this, inChannel, inVolume);
+    }
+    #endif
+}
+
+float AvHPlayer::GetTimeOfLastConstructUse() const
+{
+    return this->mTimeOfLastConstructUse;
+}
+
+void AvHPlayer::SetTimeOfLastConstructUse(float inTime)
+{
+    this->mTimeOfLastConstructUse = inTime;
+}
+
+void AvHPlayer::PlayerConstructUse()
+{
+    AvHTeam* theTeam = this->GetTeamPointer();
+    ASSERT(theTeam);
+    if(theTeam->GetTeamType() == AVH_CLASS_TYPE_MARINE)
+    {
+        this->HolsterWeaponToUse();
+    }
+    else if(theTeam->GetTeamType() == AVH_CLASS_TYPE_ALIEN)
+    {
+        const float kConstructAnimationInterval = 1.1f;
+        const int kConstructAnimationIndex = 4;
+
+        if((this->mTimeOfLastConstructUseAnimation == 0) || (gpGlobals->time > (this->mTimeOfLastConstructUseAnimation + kConstructAnimationInterval)))
+        {
+            // Play special builder animation
+            PLAYBACK_EVENT_FULL(0, this->edict(), gWeaponAnimationEventID, 0, this->pev->origin, (float *)&g_vecZero, 0.0, 0.0, 0, kConstructAnimationIndex, 0, 0 );
+
+            // Delay idle
+            if(this->m_pActiveItem)
+            {
+                CBasePlayerWeapon* theCurrentWeapon = (CBasePlayerWeapon *)this->m_pActiveItem->GetWeaponPtr();
+                if(theCurrentWeapon)
+                {
+                    theCurrentWeapon->m_flTimeWeaponIdle += 2.0f;
+                }
+            }
+
+            this->mTimeOfLastConstructUseAnimation = gpGlobals->time;
+        }
+    }
+}
+
+bool AvHPlayer::PlaySaying(AvHMessageID inMessageID)
+{
+    bool thePlayedSaying = false;
+    char theSoundList[256];
+    memset(theSoundList, 0, 256*sizeof(char));
+
+    #ifndef AVH_MAPPER_BUILD
+    if(this->pev->iuser3 == AVH_USER3_MARINE_PLAYER)
+    {
+        switch(inMessageID)
+        {
+        case SAYING_1:
+        case SAYING_2:
+        case SAYING_3:
+        case SAYING_4:
+        case SAYING_5:
+        case SAYING_6:
+        case SAYING_7:
+        case SAYING_8:
+        case SAYING_9:
+            sprintf(theSoundList, kSoldierSayingList, (inMessageID - SAYING_1 + 1));
+            break;
+
+        case ORDER_REQUEST:
+            strcpy(theSoundList, kSoldierOrderRequestList);
+            break;
+
+        case ORDER_ACK:
+            strcpy(theSoundList, kSoldierOrderAckList);
+            break;
+        }
+    }
+    else if(this->pev->iuser3 == AVH_USER3_COMMANDER_PLAYER)
+    {
+        switch(inMessageID)
+        {
+        case SAYING_1:
+        case SAYING_2:
+        case SAYING_3:
+        case SAYING_4:
+        case SAYING_5:
+        case SAYING_6:
+        case SAYING_7:
+        case SAYING_8:
+        case SAYING_9:
+            sprintf(theSoundList, kCommanderSayingList, (inMessageID - SAYING_1 + 1));
+            break;
+        }
+    }
+    else if(this->GetIsAlien())
+    {
+        switch(inMessageID)
+        {
+        case SAYING_1:
+        case SAYING_2:
+        case SAYING_3:
+        case SAYING_4:
+        case SAYING_5:
+        case SAYING_6:
+            sprintf(theSoundList, kAlienSayingList, (inMessageID - SAYING_1 + 1));
+            break;
+        }
+    }
+
+    if(strcmp(theSoundList, ""))
+    {
+        if(inMessageID == ORDER_REQUEST)
+        {
+            this->mOrdersRequested = true;
+            this->mOrderAcknowledged = false;
+            this->mIsSpeaking = false;
+        }
+        else if(inMessageID == ORDER_ACK)
+        {
+            this->mOrderAcknowledged = true;
+            this->mIsSpeaking = false;
+            this->mOrdersRequested = false;
+        }
+        else
+        {
+            this->mIsSpeaking = true;
+            this->mOrderAcknowledged = false;
+            this->mOrdersRequested = false;
+        }
+
+        this->mTimeOfLastSaying = gpGlobals->time;
+        this->mLastSaying = inMessageID;
+
+        //int pitch = 95;// + RANDOM_LONG(0,29);
+        //EMIT_SOUND_DYN(ENT(pev), CHAN_VOICE, theSaying, 1, ATTN_NORM, 0, pitch);
+        gSoundListManager.PlaySoundInList(theSoundList, this, CHAN_VOICE, 1.0f);
+        
+        thePlayedSaying = true;
+    }
+    #endif
+
+    return thePlayedSaying;
+}
+
+bool AvHPlayer::PlayHUDSound(AvHHUDSound inSound) const
+{
+    bool theSuccess = false;
+    
+    if((inSound > HUD_SOUND_INVALID) && (inSound < HUD_SOUND_MAX))
+    {
+        MESSAGE_BEGIN(MSG_ONE, gmsgPlayHUDNotification, NULL, pev);
+        WRITE_BYTE(0);
+        WRITE_BYTE(inSound);
+        // Added by mmcguire.
+        WRITE_COORD(pev->origin[0]);
+        WRITE_COORD(pev->origin[1]);
+        MESSAGE_END();
+        
+		//char* theMessage = UTIL_VarArgs("Playing sound %d to %s on team %d\n", inSound, STRING(pev->netname), pev->team);
+		//UTIL_ClientPrintAll(HUD_PRINTTALK, theMessage);
+		
+		theSuccess = true;
+    }
+    
+    return theSuccess;
+}
+
+bool AvHPlayer::PlayHUDSound(AvHHUDSound inSound, float x, float y) const
+{
+    bool theSuccess = false;
+    
+    if((inSound > HUD_SOUND_INVALID) && (inSound < HUD_SOUND_MAX))
+    {
+        MESSAGE_BEGIN(MSG_ONE, gmsgPlayHUDNotification, NULL, pev);
+        WRITE_BYTE(0);
+        WRITE_BYTE(inSound);
+        // Added by mmcguire.
+        WRITE_COORD(x);
+        WRITE_COORD(y);
+        MESSAGE_END();
+        
+        theSuccess = true;
+    }
+    
+    return theSuccess;
+}
+
+void AvHPlayer::PlayHUDStructureNotification(AvHMessageID inMessageID, const Vector& inLocation)
+{
+    if(GetGameRules()->GetGameStarted())
+    {
+        // This player built a structure.  Tell all his teammates
+        FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+
+        if(theEntity->GetIsRelevant() && !theEntity->GetIsBeingDigested())
+        {
+            // Don't send our own messages to ourself unless cheats are enabled
+            if(GetGameRules()->GetCheatsEnabled() || (this != theEntity))
+            {
+                bool theShowNotification = false;
+
+                // Show to friendlies...
+                if(theEntity->pev->team == this->pev->team) 
+                {
+                    theShowNotification = true;
+                }
+                
+                // ... or enemies in range with pheromones upgrade 
+//                if(theEntity->GetIsAlien())
+//                {
+//                    int theSensoryLevel = AvHGetAlienUpgradeLevel(theEntity->pev->iuser4, MASK_UPGRADE_8);
+//                    if(theSensoryLevel > 0)
+//                    {
+//                        int theSensoryRange = BALANCE_IVAR(kPheromonesBaseDistance) + (theSensoryLevel - 1)*BALANCE_IVAR(kPheromonesLevelDistance);
+//                        int theCurrentRange = VectorDistance(theEntity->pev->origin, inLocation);
+//
+//                        if(theCurrentRange <= theSensoryRange)
+//                        {
+//                            theShowNotification = true;
+//                        }
+//                    }
+//                }
+    
+                if(theShowNotification)
+                {
+                    MESSAGE_BEGIN(MSG_ONE, gmsgPlayHUDNotification, NULL, theEntity->pev);
+                        WRITE_BYTE(1);
+                        WRITE_BYTE((int)inMessageID);
+                        //WRITE_BYTE(this->entindex());
+                        WRITE_COORD(inLocation.x);
+                        WRITE_COORD(inLocation.y);
+                    MESSAGE_END();
+                }
+            }
+        }
+        END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+    }
+}
+
+void AvHPlayer::ProcessEvolution()
+{
+	this->SaveHealthArmorPercentages();
+
+    UTIL_EmitAmbientSound(ENT(this->pev), this->pev->origin, kGestationSound, 1.0f, .5, SND_STOP, 100);
+
+    // Go back to the role we were before, unless we're morphing into a new lifeform
+    AvHUser3 theNewUser3 = this->mPreviousUser3;
+
+	bool theChangedLifeforms = false;
+    switch(this->mEvolution)
+    {
+    case ALIEN_LIFEFORM_ONE:
+        theNewUser3 = AVH_USER3_ALIEN_PLAYER1;
+		theChangedLifeforms = true;
+        break;
+    case ALIEN_LIFEFORM_TWO:
+        theNewUser3 = AVH_USER3_ALIEN_PLAYER2;
+		theChangedLifeforms = true;
+        break;
+    case ALIEN_LIFEFORM_THREE:
+        theNewUser3 = AVH_USER3_ALIEN_PLAYER3;
+		theChangedLifeforms = true;
+        break;
+    case ALIEN_LIFEFORM_FOUR:
+        theNewUser3 = AVH_USER3_ALIEN_PLAYER4;
+		theChangedLifeforms = true;
+        break;
+    case ALIEN_LIFEFORM_FIVE:
+        theNewUser3 = AVH_USER3_ALIEN_PLAYER5;
+		theChangedLifeforms = true;
+        break;
+    }
+
+    // This shouldn't be needed now that SetUser3 takes into account moving the origin.
+    // Position player a bit higher off the ground so he doesn't get stuck
+    //this->pev->origin.z += AvHMUGetOriginOffsetForUser3(theNewUser3);
+
+	if(theChangedLifeforms)
+	{
+		if(GetGameRules()->GetIsCombatMode())
+			this->SetLifeformCombatNodesAvailable(false); // Only allow one lifeform change
+		else
+		{
+			int iUpgrades = MASK_UPGRADE_1 
+				| MASK_UPGRADE_2 
+				| MASK_UPGRADE_3 
+				| MASK_UPGRADE_4 
+				| MASK_UPGRADE_5 
+				| MASK_UPGRADE_6 
+				| MASK_UPGRADE_7 
+				| MASK_UPGRADE_8 
+				| MASK_UPGRADE_9
+				| MASK_UPGRADE_10
+				| MASK_UPGRADE_11
+				| MASK_UPGRADE_12
+				| MASK_UPGRADE_13
+				| MASK_UPGRADE_14
+				| MASK_UPGRADE_15;
+
+			SetUpgradeMask(&this->pev->iuser4, (AvHUpgradeMask)iUpgrades, false);
+		}
+	}
+
+    this->SetUser3(theNewUser3, true);
+
+    //this->mPreviousUser3 = User3_UNDEFINED;
+    
+    //  int theMaxArmor = 0;
+    //  float theArmorPercentage = 0;
+    //  int theNewMaxArmor = 0;
+    
+    switch(this->mEvolution)
+    {
+    case ALIEN_EVOLUTION_ONE:
+    case ALIEN_EVOLUTION_TWO:
+    case ALIEN_EVOLUTION_THREE:
+    case ALIEN_EVOLUTION_SEVEN:
+    case ALIEN_EVOLUTION_EIGHT:
+    case ALIEN_EVOLUTION_NINE:
+    case ALIEN_EVOLUTION_TEN:
+    case ALIEN_EVOLUTION_ELEVEN:
+    case ALIEN_EVOLUTION_TWELVE:
+        
+        // If it's the exoskeleton upgrade, upgrade now
+        //      theMaxArmor = AvHPlayerUpgrade::GetMaxArmorLevel(this->pev->iuser4, this->mUser3);
+        //      theArmorPercentage = this->pev->armorvalue/theMaxArmor;
+        
+        ProcessGenericUpgrade(this->pev->iuser4, this->mEvolution);
+        
+        // If player has already decided on the direction to upgrade, spend any extra upgrade levels in that category.
+        // This has to happen immediately, or else spamming the upgrade button can get another evolution before this is called in InternalAlienUpgradesThink.
+        AvHTeam* theTeamPointer = this->GetTeamPointer();
+        ASSERT(theTeamPointer);
+        AvHAlienUpgradeListType theUpgrades = theTeamPointer->GetAlienUpgrades();
+        AvHAddHigherLevelUpgrades(theUpgrades, this->pev->iuser4);
+        
+        //this->PlayHUDSound(HUD_SOUND_ALIEN_UPGRADECOMPLETE);
+        
+//      if(this->mEvolution == ALIEN_EVOLUTION_TWO)
+//      {
+//          theNewMaxArmor = AvHPlayerUpgrade::GetMaxArmorLevel(this->pev->iuser4, this->mUser3);
+//          this->pev->armorvalue = theArmorPercentage*theNewMaxArmor;
+//      }
+        break;
+    }
+
+	this->PlayRandomRoleSound(kPlayerLevelSpawnSoundList, CHAN_ITEM, this->GetAlienAdjustedEventVolume());
+	this->pev->fuser3 = 1.0f*kNormalizationNetworkFactor;
+
+	this->RevertHealthArmorPercentages();    
+	this->mEvolution = MESSAGE_NULL;
+}
+
+void AvHPlayer::RevertHealthArmorPercentages()
+{
+    // Preserve armor and health percentages
+    int theMaxHealth = AvHPlayerUpgrade::GetMaxHealth(this->pev->iuser4, (AvHUser3)this->pev->iuser3, this->GetExperienceLevel());
+    this->pev->health = max(this->mHealthPercentBefore*theMaxHealth,1);//voogru: prevent bug with players evolving down from higher lifeform from getting negative health but still "alive"
+
+    int theMaxArmor = AvHPlayerUpgrade::GetMaxArmorLevel(this->pev->iuser4, (AvHUser3)this->pev->iuser3);
+    this->pev->armorvalue = max(this->mArmorPercentBefore*theMaxArmor, 0);
+
+	// Assumes a push/pop kind of deal
+	this->mHealthPercentBefore = this->mArmorPercentBefore = 1.0f;
+}
+
+void AvHPlayer::SaveHealthArmorPercentages()
+{
+    int theMaxHealth = AvHPlayerUpgrade::GetMaxHealth(this->pev->iuser4, (AvHUser3)this->pev->iuser3, this->GetExperienceLevel());
+    this->mHealthPercentBefore = this->pev->health/(float)theMaxHealth;
+    this->mHealthPercentBefore = min(max(0, this->mHealthPercentBefore), 1);
+    
+    int theMaxArmor = AvHPlayerUpgrade::GetMaxArmorLevel(this->pev->iuser4, (AvHUser3)this->pev->iuser3);
+    this->mArmorPercentBefore = this->pev->armorvalue/(float)theMaxArmor;
+    this->mArmorPercentBefore = min(max(0, this->mArmorPercentBefore), 1);
+}
+
+void AvHPlayer::ProcessResourceAdjustment(AvHMessageID inMessageID)
+{
+    // TODO: Mark cheater if this isn't the case?
+    if(this->pev->iuser3 == AVH_USER3_COMMANDER_PLAYER)
+    {
+        // Make sure we have resource tower selected
+        if(this->mSelected.size() == 1)
+        {
+            int theEntIndex = *this->mSelected.begin();
+            AvHFuncResource* theFuncResource;
+            if(AvHSUGetEntityFromIndex(theEntIndex, theFuncResource))
+            {
+                // Get particle system
+                int theParticleSystemIndex = theFuncResource->GetParticleSystemIndex();
+                AvHParticleSystemEntity* theParticleSystemEntity = NULL;
+                if(AvHSUGetEntityFromIndex(theParticleSystemIndex, theParticleSystemEntity))
+                {
+                    // Adjust particle system for resource tower
+                    
+                    // Get custom data
+                    uint16 theCustomData = theParticleSystemEntity->GetCustomData();
+                    
+                    // Adjust custom data by inMessageID
+                    ASSERT(false);
+                    //switch(inMessageID)
+                    //{
+                    //case RESOURCE_ADJUST_ONE_UP:
+                    //  theCustomData = min(theCustomData+1, 0xF);
+                    //  break;
+                    //case RESOURCE_ADJUST_ONE_DOWN:
+                    //  theCustomData = max(theCustomData-1, 0);
+                    //  break;
+                    //}
+                    
+                    // Set custom data again
+                    theParticleSystemEntity->SetCustomData(theCustomData);
+                }
+            }
+        }
+    }
+}
+
+//void AvHPlayer::ProcessTechUpgrade(AvHMessageID inMessageID)
+//{
+//  ASSERT((inMessageID == TECH_TEAM) || (inMessageID == TECH_BUILDINGS) || (inMessageID == TECH_POWERUPS));
+//
+//  int theOldID = inMessageID;
+//  int theNewID = 0;
+//  string theEmptyText;
+//
+//  MESSAGE_BEGIN(MSG_ONE, gmsgChangeNodeCost, NULL, pev);
+//      // send original armor level
+//      WRITE_BYTE(this->mArmorLevel);
+//
+//      // Send old id
+//      WRITE_BYTE(theOldID);
+//
+//      // Send new id
+//      WRITE_BYTE(theNewID);
+//
+//      // Send string
+//      WRITE_STRING(theEmptyText.c_str());
+//
+//  MESSAGE_END();
+//}
+
+void AvHPlayer::Evolve(AvHMessageID inMessageID, bool inInstantaneous)
+{
+    // TODO: Put in a waiting time or some other effects?
+    if(this->GetTeamPointer()->GetTeamType() == AVH_CLASS_TYPE_ALIEN)
+    {
+		this->PlayHUDSound(HUD_SOUND_POINTS_SPENT);
+
+        int theDramaticPriority = 0;
+        switch(inMessageID)
+        {
+        case ALIEN_LIFEFORM_ONE:
+            theDramaticPriority = kEvolveLevelOnePriority;
+            break;
+        case ALIEN_LIFEFORM_TWO:
+            theDramaticPriority = kEvolveLevelTwoPriority;
+            break;
+        case ALIEN_LIFEFORM_THREE:
+            theDramaticPriority = kEvolveLevelThreePriority;
+            break;
+        case ALIEN_LIFEFORM_FOUR:
+            theDramaticPriority = kEvolveLevelFourPriority;
+            break;
+        case ALIEN_LIFEFORM_FIVE:
+            theDramaticPriority = kEvolveLevelFivePriority;
+            break;
+        default:
+            theDramaticPriority = kEvolveUpgradePriority;
+            break;
+        }
+
+        if(!inInstantaneous)
+        {
+            GetGameRules()->MarkDramaticEvent(theDramaticPriority, this);
+            
+            this->mTimeGestationStarted = gpGlobals->time;
+            this->mPreviousUser3 = (AvHUser3)this->pev->iuser3;
+            this->mEvolution = inMessageID;
+      
+            this->SetUser3(AVH_USER3_ALIEN_EMBRYO);
+            this->BecomePod();
+        }
+        else
+        {
+            this->mPreviousUser3 = (AvHUser3)this->pev->iuser3;
+            this->mEvolution = inMessageID;
+            this->ProcessEvolution();
+        }
+    }
+}
+
+void AvHPlayer::LogEmitRoleChange()
+{
+	const char* theUser3Name = AvHSHUGetClassNameFromUser3((AvHUser3)this->pev->iuser3);
+	if(theUser3Name != NULL)
+	{
+		edict_t* pEntity = this->edict();
+		UTIL_LogPrintf("\"%s<%i><%s><%s>\" changed role to \"%s\"\n", 
+			STRING( pEntity->v.netname ), 
+			GETPLAYERUSERID( pEntity ), 
+			//voogru: this was using "this->GetNetworkID().c_str();", which didnt have anything
+#ifdef USE_UPP
+			UPPUtil_GetNetworkID( pEntity ).c_str(),
+#else
+			AvHSUGetPlayerAuthIDString(pEntity).c_str(), 
+#endif 
+			AvHSUGetTeamName(pEntity->v.team), 
+			theUser3Name);
+	}
+}
+
+void AvHPlayer::LogPlayerAction(const char* inActionDescription, const char* inActionData)
+{
+    edict_t* theActor = this->edict();
+    if(inActionDescription && inActionData)
+    {
+        UTIL_LogPrintf("\"%s<%i><%s><%s>\" triggered \"%s\" (type \"%s\")\n", 
+			STRING(theActor->v.netname), 
+			GETPLAYERUSERID(theActor), 
+			//voogru: this was using "this->GetNetworkID().c_str();", which didnt have anything
+#ifdef USE_UPP
+			UPPUtil_GetNetworkID( theActor ).c_str(),
+#else
+			AvHSUGetPlayerAuthIDString(theActor).c_str(), 
+#endif 
+			AvHSUGetTeamName(theActor->v.team), 
+			inActionDescription, 
+			inActionData);
+    }
+}
+
+void AvHPlayer::LogPlayerActionPlayer(CBasePlayer* inActionPlayer, const char* inAction)
+{
+    if(inAction)
+    {
+        edict_t* theActor = inActionPlayer->edict();
+        edict_t* theReceiver = this->edict();
+        
+        UTIL_LogPrintf(
+			"\"%s<%i><%s><%s>\" triggered \"%s\" against \"%s<%i><%u><%s>\"\n", 
+			STRING(theActor->v.netname), 
+			GETPLAYERUSERID(theActor), 
+#ifdef USE_UPP
+			UPPUtil_GetNetworkID(theActor).c_str(),
+#else
+			AvHSUGetPlayerAuthIDString(theActor).c_str(), 
+#endif
+			AvHSUGetTeamName(theActor->v.team), 
+			inAction, 
+			STRING(theReceiver->v.netname), 
+			GETPLAYERUSERID(theReceiver), 
+#ifdef USE_UPP
+			UPPUtil_GetNetworkID(theReceiver).c_str(),
+#else
+			AvHSUGetPlayerAuthIDString(theReceiver).c_str(), 
+#endif
+			AvHSUGetTeamName(theReceiver->v.team)
+		);
+    }
+}
+
+void AvHPlayer::LogPlayerAttackedPlayer(CBasePlayer* inAttackingPlayer, const char* inWeaponName, float inDamage)
+{
+    if(inWeaponName)
+    {
+        edict_t* theAttacker = inAttackingPlayer->edict();
+        edict_t* theReceiver = this->edict();
+
+        bool theLogAttack = false;
+        int theLogDetail = CVAR_GET_FLOAT(kvLogDetail);
+
+        if((theLogDetail > 0) && (theAttacker->v.team != theReceiver->v.team))
+        {
+            theLogAttack = true;
+        }
+        else if((theLogDetail > 1) && (theAttacker->v.team == theReceiver->v.team))
+        {
+            theLogAttack = true;
+        }
+        else if(theLogDetail > 2)
+        {
+            theLogAttack = true;
+        }
+        
+        if(theLogAttack)
+        {
+            // Remove "weapon_" prefix
+            string theKillerName(inWeaponName);
+            AvHSHUMakeViewFriendlyKillerName(theKillerName);
+            int theDamage = (int)inDamage;
+            
+            UTIL_LogPrintf(
+				"\"%s<%i><%u><%s>\" attacked \"%s<%i><%u><%s>\" with \"%s\" (damage \"%d\")\n", 
+				STRING(theAttacker->v.netname), 
+				GETPLAYERUSERID(theAttacker), 
+#ifdef USE_UPP
+				UPPUtil_GetNetworkID(theAttacker).c_str(),
+#else
+				AvHSUGetPlayerAuthIDString(theAttacker).c_str(), 
+#endif
+				AvHSUGetTeamName(theAttacker->v.team), 
+				STRING(theReceiver->v.netname), 
+				GETPLAYERUSERID(theReceiver), 
+#ifdef USE_UPP
+				UPPUtil_GetNetworkID(theReceiver).c_str(),
+#else
+				AvHSUGetPlayerAuthIDString(theReceiver).c_str(), 
+#endif
+				AvHSUGetTeamName(theReceiver->v.team), 
+				theKillerName.c_str(), 
+				theDamage
+			);
+        }
+    }
+}
+
+void AvHPlayer::LogPlayerKilledPlayer(CBasePlayer* inAttackingPlayer, const char* inWeaponName)
+{
+    if(inWeaponName)
+    {
+        edict_t* theAttacker = inAttackingPlayer->edict();
+        edict_t* theReceiver = this->edict();
+        
+        bool theLogAttack = false;
+        int theLogDetail = CVAR_GET_FLOAT(kvLogDetail);
+        
+        if((theLogDetail > 0) && (theAttacker->v.team != theReceiver->v.team))
+        {
+            theLogAttack = true;
+        }
+        else if((theLogDetail > 1) && (theAttacker->v.team == theReceiver->v.team))
+        {
+            theLogAttack = true;
+        }
+        else if(theLogDetail > 2)
+        {
+            theLogAttack = true;
+        }
+        
+        if(theLogAttack)
+        {
+            // Remove "weapon_" prefix
+            string theKillerName(inWeaponName);
+            AvHSHUMakeViewFriendlyKillerName(theKillerName);
+            
+            UTIL_LogPrintf(
+				"\"%s<%i><%u><%s>\" killed \"%s<%i><%u><%s>\" with \"%s\"\n", 
+				STRING(theAttacker->v.netname), 
+				GETPLAYERUSERID(theAttacker), 
+#ifdef USE_UPP
+				UPPUtil_GetNetworkID(theAttacker).c_str(),
+#else
+				AvHSUGetPlayerAuthIDString(theAttacker).c_str(), 
+#endif
+				AvHSUGetTeamName(theAttacker->v.team), 
+				STRING(theReceiver->v.netname), 
+				GETPLAYERUSERID(theReceiver), 
+#ifdef USE_UPP
+				UPPUtil_GetNetworkID(theReceiver).c_str(),
+#else
+				AvHSUGetPlayerAuthIDString(theReceiver).c_str(), 
+#endif
+				AvHSUGetTeamName(theReceiver->v.team), 
+				theKillerName.c_str());
+        }
+    }
+}
+
+void AvHPlayer::Research(AvHMessageID inUpgrade, int inEntityIndex)
+{
+    if(this->GetUser3() == AVH_USER3_COMMANDER_PLAYER)
+    {
+        bool theIsResearchable;
+        int theResearchCost;
+        float theResearchTime;
+        AvHTeam* theTeam = this->GetTeamPointer();
+
+        CBaseEntity* theEntity = AvHSUGetEntityFromIndex(inEntityIndex);
+
+        if(theEntity && theTeam && (theEntity->pev->team == this->pev->team))
+        {
+            AvHResearchManager& theResearchManager = theTeam->GetResearchManager();
+            if(inUpgrade == MESSAGE_CANCEL)
+            {
+                // Remember research tech and time done
+                float thePercentageComplete = 0.0f;
+                AvHMessageID theCancelledTechnology = MESSAGE_NULL;
+                if(theResearchManager.CancelResearch(inEntityIndex, thePercentageComplete, theCancelledTechnology))
+                {
+                    if(theResearchManager.GetResearchInfo(theCancelledTechnology, theIsResearchable, theResearchCost, theResearchTime))
+                    {
+                        ASSERT(thePercentageComplete >= 0.0f);
+                        ASSERT(thePercentageComplete < 1.0f);
+                        const float kRefundFactor = 1.0f;
+                        float theRefund = kRefundFactor*(1.0f - thePercentageComplete)*theResearchCost;
+                        theRefund = min(theRefund, theResearchCost);
+                        this->SetResources(this->GetResources() + theRefund);
+                    }
+
+                    char* theResearchName = NULL;
+                    if(AvHSHUGetResearchTechName(inUpgrade, theResearchName))
+                    {
+                        this->LogPlayerAction("research_cancel", theResearchName);
+                    }
+                }
+            }
+            else if(theResearchManager.GetResearchInfo(inUpgrade, theIsResearchable, theResearchCost, theResearchTime))
+            {
+                // Look up cost, deduct from player
+                if(this->GetResources() >= theResearchCost)
+                {
+                    // Remember research tech and time done
+                    if(theResearchManager.SetResearching(inUpgrade, inEntityIndex))
+                    {
+                        this->PayPurchaseCost(theResearchCost);
+						// Tell everyone on this team about research and time research done, so their
+						// HUD is updated, and so they can't then walk up to station and start researching something else
+						this->PlayHUDStructureNotification(inUpgrade, theEntity->pev->origin);
+                    
+	                    char* theResearchName = NULL;
+						if(AvHSHUGetResearchTechName(inUpgrade, theResearchName))
+						{
+							this->LogPlayerAction("research_start", theResearchName);
+						}
+					}
+                }
+                else
+                {
+                    this->PlayHUDSound(HUD_SOUND_MARINE_MORE);
+                }
+            }
+        }
+    }
+}
+
+// Digestion functions
+int AvHPlayer::GetDigestee() const
+{
+    return this->mDigestee;
+}
+
+void AvHPlayer::SetDigestee(int inPlayerID)
+{
+    this->mDigestee = inPlayerID;
+}
+
+void AvHPlayer::StartDigestion(int inDigestee)
+{
+    AvHPlayer* theDigestee = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(inDigestee)));
+    if(theDigestee)
+    {
+        theDigestee->SetBeingDigestedMode(true);
+        SetUpgradeMask(&this->pev->iuser4, MASK_DIGESTING, true);
+        
+        this->SetDigestee(inDigestee);
+
+        EMIT_SOUND(ENT(this->pev), CHAN_VOICE, kDevourSwallowSound, this->GetAlienAdjustedEventVolume(), ATTN_NORM);
+        
+        this->mTimeOfLastDigestDamage = gpGlobals->time;
+    }
+}
+
+void AvHPlayer::StopDigestion(bool inDigested)
+{
+    // Play digest complete sound and stop digestion
+    int theDigesteeIndex = this->GetDigestee();
+    this->SetDigestee(0);
+    
+    AvHPlayer* theDigestee = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theDigesteeIndex)));
+    if(theDigestee)
+    {
+        if(inDigested)
+        {
+            this->SetDesiredRoomType(0, true);
+
+			EMIT_SOUND(ENT(this->pev), CHAN_VOICE, kDevourCompleteSound, this->GetAlienAdjustedEventVolume(), ATTN_NORM);
+        }
+        else
+        {
+            theDigestee->SetBeingDigestedMode(false);
+            
+            EMIT_SOUND(ENT(this->pev), CHAN_VOICE, kDevourCancelSound, this->GetAlienAdjustedEventVolume(), ATTN_NORM);
+        }
+    }
+
+    SetUpgradeMask(&this->pev->iuser4, MASK_DIGESTING, false);
+
+}
+
+void AvHPlayer::InternalDigestionThink()
+{
+    // If we have a digestee
+    int theDigesteeIndex = this->GetDigestee();
+    AvHPlayer* theDigestee = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theDigesteeIndex)));
+    if(theDigestee)
+    {
+        bool thePlayerWasDigested = false;
+
+        // If digestee is alive and still in the game (hasn't disconnected or switched teams)
+        if(theDigestee->GetIsRelevant())
+        {
+			if(RANDOM_LONG(0, 110) == 0)
+			{
+				// Play digesting sound occasionally
+				EMIT_SOUND(this->edict(), CHAN_AUTO, kDigestingSound, this->GetAlienAdjustedEventVolume(), ATTN_NORM);
+			}
+
+            // Do damage to digestee 
+            float theTimePassed = gpGlobals->time - this->mTimeOfLastDigestDamage;
+            if(theTimePassed > 1.0f)
+            {
+                // Find devour weapon if we have one, so death message appears properly
+                entvars_t* theInflictor = this->pev;
+                CBasePlayerItem* theDevourWeapon = this->HasNamedPlayerItem(kwsDevour);
+                if(theDevourWeapon)
+                {
+                    theInflictor = theDevourWeapon->pev;
+                }
+
+				const float theCombatModeScalar = GetGameRules()->GetIsCombatMode() ? BALANCE_FVAR(kCombatModeTimeScalar) : 1.0f;
+                theDigestee->pev->takedamage = DAMAGE_YES;
+                float theDamage = theTimePassed*BALANCE_IVAR(kDevourDamage)*(1.0f/theCombatModeScalar);
+                theDigestee->TakeDamage(theInflictor, this->pev, theDamage, DMG_DROWN);
+                theDigestee->pev->takedamage = DAMAGE_NO;
+
+                // Get health back too
+                this->Heal(theDamage, false);
+        
+                this->mTimeOfLastDigestDamage = gpGlobals->time;
+            }
+
+            // Set the digestee's position to our own
+            VectorCopy(this->pev->origin, theDigestee->pev->origin);
+            VectorCopy(this->pev->angles, theDigestee->pev->angles);
+            
+            // Set status bar estimating how long before player will be digested (for both digestee and digester)
+            theDigestee->TriggerProgressBar(theDigesteeIndex, 3);
+            this->TriggerProgressBar(theDigesteeIndex, 3);
+            
+            // Set fuser3 appropriately
+            int theMaxHealth = AvHPlayerUpgrade::GetMaxHealth(theDigestee->pev->iuser4, theDigestee->GetUser3(), this->GetExperienceLevel());
+            float theDigestingScalar = (((float)theMaxHealth - theDigestee->pev->health)/(float)theMaxHealth);
+            /*this->pev->fuser3 =*/ theDigestee->pev->fuser3 = theDigestingScalar*kNormalizationNetworkFactor;
+
+            // Set sound effects as player gets more and more digested
+            int theDesiredRoomType = 26; // strange sounds right before you die
+            if(theDigestingScalar < .33f)
+            {
+                // Water 1
+                theDesiredRoomType = 14;
+            }
+            else if(theDigestingScalar < .66f)
+            {
+                // Water 2
+                theDesiredRoomType = 15;
+            }
+            else if(theDigestingScalar < .9f)
+            {
+                // Water 3
+                theDesiredRoomType = 16;
+            }
+            theDigestee->SetDesiredRoomType(theDesiredRoomType);
+
+            if(theDigestee->pev->health <= 0)
+            {
+                thePlayerWasDigested = true;
+            }
+        }
+        
+        // If digestee is dead and no longer relevant
+        if(!theDigestee->IsAlive() || !theDigestee->GetIsRelevant() || (theDigestee->GetTeam() == this->GetTeam()))
+        {
+            this->StopDigestion(thePlayerWasDigested);
+        }
+    }
+}
+
+bool AvHPlayer::GetDoesCurrentStateStopOverwatch() const
+{
+    AvHBasePlayerWeapon* theWeapon = dynamic_cast<AvHBasePlayerWeapon*>(this->m_pActiveItem);
+    const AvHTeam* theTeam = this->GetTeamPointer();
+
+    bool theCurrentStateStopsOverwatch = false;
+//  bool theCurrentStateStopsOverwatch = ((this->pev->button != 0 && !this->mOverwatchFiredThisThink) || /*(this->pev->velocity.Length() > kOverwatchBreakingVelocity) ||*/ !theWeapon || ((this->pev->iuser3 != AVH_USER3_MARINE_PLAYER) && !GetHasUpgrade(this->pev->iuser4, MASK_MARINE_OVERWATCH)));
+//
+//  // Overwatch not valid for alien players
+//  if(theTeam && (theTeam->GetTeamType() != AVH_CLASS_TYPE_MARINE))
+//  {
+//      theCurrentStateStopsOverwatch = true;
+//  }
+
+    return theCurrentStateStopsOverwatch;
+}
+
+bool AvHPlayer::GetIsEntityInSight(CBaseEntity* inEntity)
+{
+
+    bool theSuccess = false;
+	AvHTeam* theTeam = this->GetTeamPointer();
+	// Elven - we don't want marines who are being digested to be able to sight anything.
+    if(theTeam && (theTeam->GetTeamType() == AVH_CLASS_TYPE_MARINE) && GetHasUpgrade(this->pev->iuser4, MASK_DIGESTING))
+	{
+		return theSuccess;
+	}
+    // Check if the entitiy is in the player's view frustum.
+    UTIL_MakeVectors ( pev->v_angle );
+    
+    Vector center = inEntity->pev->origin + (inEntity->pev->maxs + inEntity->pev->mins) / 2;
+    Vector sightLine = center - (pev->origin + pev->view_ofs);
+    
+    Vector hSightLine = sightLine - DotProduct(sightLine, gpGlobals->v_up) * gpGlobals->v_up;
+    Vector vSightLine = sightLine - DotProduct(sightLine, gpGlobals->v_right) * gpGlobals->v_right;
+    
+    float hDot = DotProduct(hSightLine.Normalize(), gpGlobals->v_forward);
+    float vDot = DotProduct(vSightLine.Normalize(), gpGlobals->v_forward);
+    
+    float hAngle = acosf(hDot) * 180 / M_PI;
+    float vAngle = acosf(vDot) * 180 / M_PI;
+
+    if (hAngle > 180) hAngle -= 360;
+    if (vAngle > 180) vAngle -= 360;
+    
+    float aspect = 1.333; // 640/480
+
+    if (fabs(hAngle) <= pev->fov / 2 && fabs(vAngle) <= pev->fov / (2 * aspect))
+    {
+        if (FVisible(inEntity))
+        {
+			
+            theSuccess = true;
+        }
+    }
+
+//    if(GET_RUN_CODE(4096))
+//    {
+//        if (!theSuccess)
+//        {
+//
+//            UTIL_MakeVectors ( pev->v_angle );
+//
+//            const float kMaxDistanceForSighting = 10000;
+//
+//            // Trace a ray in the direction the player is aiming.
+//
+//            Vector theStart = EyePosition();
+//            Vector theEnd;
+//            VectorMA(theStart, kMaxDistanceForSighting, gpGlobals->v_forward, theEnd);
+//
+//	        TraceResult tr;
+//            UTIL_TraceLine(theStart, theEnd, dont_ignore_monsters, ignore_glass, ENT(pev), &tr);
+//
+//            if (tr.flFraction != 1 && tr.pHit == ENT(inEntity->pev))
+//            {
+//                int a = 0;
+//                theSuccess = true;
+//            }
+//    
+//        }
+//    }
+    // TODO: Make this better so we can see edges of things?  What about big aliens?
+
+    return theSuccess;
+
+}
+
+char* AvHPlayer::GetPlayerModelKeyName()
+{
+    // Default to marine in ready room
+    char* theModelKeyName = kSoldierName;
+
+    AvHUser3 theUser3 = this->GetUser3();
+
+    switch(theUser3)
+    {
+    case AVH_USER3_MARINE_PLAYER:
+        theModelKeyName = kSoldierName;
+        if(GetHasUpgrade(this->pev->iuser4, MASK_UPGRADE_13))
+        {
+            theModelKeyName = kHeavyName;
+        }
+        break;
+    case AVH_USER3_COMMANDER_PLAYER:
+        theModelKeyName = kCommanderName;
+        break;
+    case AVH_USER3_ALIEN_PLAYER1:
+        theModelKeyName = kAlien1Name;
+        break;
+    case AVH_USER3_ALIEN_PLAYER2:
+        theModelKeyName = kAlien2Name;
+        break;
+    case AVH_USER3_ALIEN_PLAYER3:
+        theModelKeyName = kAlien3Name;
+        break;
+    case AVH_USER3_ALIEN_PLAYER4:
+        theModelKeyName = kAlien4Name;
+        break;
+    case AVH_USER3_ALIEN_PLAYER5:
+        theModelKeyName = kAlien5Name;
+        break;
+    case AVH_USER3_ALIEN_EMBRYO:
+        theModelKeyName = kAlienGestationName;
+        break;
+    }
+
+    return theModelKeyName;
+}
+
+void AvHPlayer::HandleOverwatch(void)
+{
+    #ifndef AVH_MAPPER_BUILD
+
+    AvHTeam* theTeam = this->GetTeamPointer();
+    if(theTeam && (theTeam->GetTeamType() == AVH_CLASS_TYPE_MARINE))
+    {
+        this->mOverwatchFiredThisThink = false;
+        
+        // If in overwatch
+        if(this->mInOverwatch)
+        {
+            // do we have a target we're firing at?
+            if(this->mOverwatchTarget != -1)
+            {
+                // is target around?
+                edict_t* theTargetEdict = INDEXENT(this->mOverwatchTarget);
+                if(!FNullEnt(theTargetEdict))
+                {
+                    // if so, move aim toward it but not farther than x degrees from starting pos
+                    CBaseEntity* theTarget = CBaseEntity::Instance(theTargetEdict);
+                    this->TurnOverwatchTowardsTarget(theTarget);
+                    
+                    // is it within our weapon range?  
+                    float theTargetDistance = (theTarget->pev->origin - this->pev->origin).Length();
+                    AvHBasePlayerWeapon* theWeapon = dynamic_cast<AvHBasePlayerWeapon*>(this->m_pActiveItem);
+                    if(theWeapon)
+                    {
+                        if(theWeapon->GetRange() >= theTargetDistance)
+                        {
+                            // do we have a clear line of sight to it?
+                            bool theCanSeeTarget = this->GetIsEntityInSight(theTarget);
+                            if(theCanSeeTarget || (gpGlobals->time - this->mTimeLastSeenOverwatchTarget < kOverwatchKeepFiringAfterMissingTargetTime))
+                            {
+                                // do we have ammo left?
+                                if(!theWeapon->UsesAmmo() || (theWeapon->m_iClip > 0))
+                                {
+                                    // FIRE!
+                                    this->pev->button |= IN_ATTACK;
+                                    this->mOverwatchFiredThisThink = true;
+                                }
+                                
+                                // Update last time we saw our target
+                                if(theCanSeeTarget)
+                                {
+                                    this->mTimeLastSeenOverwatchTarget = gpGlobals->time;
+                                    
+                                    // Playback event to increase tension, but keep network usage down (once or twice a second?)
+                                    if(this->pev->fuser2 != -1)
+                                    {
+                                        //if(RANDOM_LONG(0, 100) == 0)
+                                        //{
+                                        //PLAYBACK_EVENT_FULL(0, this->edict(), gTensionOverwatchEventID, 0, this->pev->origin, (float *)&g_vecZero, 0.0, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+                                        //}
+                                    }
+                                }
+                            }
+                            
+                            // if not, has it been a long time since we've seen it, or did we see it die?  Reset.
+                            if( (gpGlobals->time - this->mTimeLastSeenOverwatchTarget > kOverwatchLostTargetTime) || 
+                                (theCanSeeTarget && !theTarget->IsAlive()))
+                            {
+                                this->ResetOverwatch();
+                            }
+                        }
+                    }
+                    else
+                    {
+                        // This can happen when dropping weapons or switching roles
+                        this->TurnOffOverwatch();
+                    }
+                }
+                else
+                {
+                    this->ResetOverwatch();
+                }
+            }
+            // is there a new target in range?
+            else
+            {
+                this->AcquireOverwatchTarget();
+            }
+            
+            // see if we moved so we're out
+            if(this->GetDoesCurrentStateStopOverwatch())
+            {
+                this->TurnOffOverwatch();
+            }
+        }
+        else
+        {
+            if(this->GetDoesCurrentStateStopOverwatch())
+            {
+                this->mTimeOfLastOverwatchPreventingAction = gpGlobals->time;
+            }
+            
+            // if overwatch is enabled, see if we've been still long enough to put us into it
+            if(this->mOverwatchEnabled && !(this->pev->flags & FL_FAKECLIENT))
+            {
+                if(this->mTimeOfLastOverwatchPreventingAction != -1)
+                {
+                    if(gpGlobals->time - this->mTimeOfLastOverwatchPreventingAction >= kOverwatchAcquireTime)
+                    {
+                        // if so, set overwatch on, make sure to set the current weapon into overwatch
+                        this->TurnOnOverwatch();
+                    }
+                }
+            }
+        }
+    }
+#endif
+}
+
+void AvHPlayer::InternalAlienUpgradesThink()
+{
+    // If we're an alien player
+    AvHTeam* theTeam = this->GetTeamPointer();
+
+    if(this->GetIsAlien())
+    {
+        if(theTeam && !GetGameRules()->GetIsCombatMode())
+        {
+            // Preserve health and armor percentages as we get and remove upgrades
+            float theHealthPercentage = this->pev->health/AvHPlayerUpgrade::GetMaxHealth(this->pev->iuser4, (AvHUser3)this->pev->iuser3, this->GetExperienceLevel());
+            float theArmorPercentage = this->pev->armorvalue/AvHPlayerUpgrade::GetMaxArmorLevel(this->pev->iuser4, (AvHUser3)this->pev->iuser3);
+
+            ASSERT(theTeam->GetTeamType() == AVH_CLASS_TYPE_ALIEN);
+            AvHAlienUpgradeListType theUpgrades = theTeam->GetAlienUpgrades();
+            
+            // If player has already decided on the direction to upgrade, spend any extra upgrade levels in that category
+            AvHAddHigherLevelUpgrades(theUpgrades, this->pev->iuser4);
+            
+            // If we have more upgrades then we should, remove one randomly
+            int theNumRemoved = AvHRemoveExcessUpgrades(theUpgrades, this->pev->iuser4);
+            if(theNumRemoved > 0)
+            {
+                // Play a sound indicating this has happened
+                this->PlayHUDSound(HUD_SOUND_ALIEN_UPGRADELOST);
+            }
+
+            // If we're cloaked, and we no longer have any sensory upgrades, trigger uncloak
+            //int theNumSensoryUpgrades = AvHGetNumUpgradesInCategoryInList(theUpgrades, ALIEN_UPGRADE_CATEGORY_SENSORY);
+            //if(GetHasUpgrade(this->pev->iuser4, MASK_ALIEN_CLOAKED) && (theNumSensoryUpgrades == 0))
+            //{
+            //  this->TriggerUncloak();
+            //}
+
+            this->pev->health = theHealthPercentage*AvHPlayerUpgrade::GetMaxHealth(this->pev->iuser4, (AvHUser3)this->pev->iuser3, this->GetExperienceLevel());
+            this->pev->armorvalue = theArmorPercentage*AvHPlayerUpgrade::GetMaxArmorLevel(this->pev->iuser4, (AvHUser3)this->pev->iuser3);
+        }
+        
+        if(theTeam && (theTeam->GetTeamType() == AVH_CLASS_TYPE_ALIEN) && this->IsAlive())
+        {
+            // If we have cloaking, update our cloak state
+            this->InternalAlienUpgradesCloakingThink();
+            
+            // If we have regeneration, heal us
+            this->InternalAlienUpgradesRegenerationThink();
+
+            // If we have pheromones, update them
+            //this->InternalAlienUpgradesPheromonesThink();
+        }
+    }
+    
+    // Update ensnare here
+    if(this->GetIsEnsnared())
+    {
+        if(gpGlobals->time > this->mTimeToBeUnensnared)
+        {
+            this->SetEnsnareState(false);
+        }
+    }
+    
+    // Update stun
+    if(this->GetIsStunned())
+    {
+        if(gpGlobals->time > this->mTimeToBeFreeToMove)
+        {
+            this->SetIsStunned(false);
+        }
+    }
+}
+
+bool AvHPlayer::GetIsCloaked() const
+{
+    bool theIsCloaked = false;
+
+    if( (this->GetOpacity() < 0.1f))
+    {
+        theIsCloaked = true;
+    }
+
+    return theIsCloaked;
+}
+
+bool AvHPlayer::GetIsPartiallyCloaked() const
+{
+    bool theIsCloaked = false;
+
+    if( (this->GetOpacity() < 0.6f))
+    {
+        theIsCloaked = true;
+    }
+
+    return theIsCloaked;
+}
+
+bool AvHPlayer::GetRandomGameStartedTick(float inApproximateFrameRate)
+{
+    bool theTimeToTick = false;
+    
+    if(GetGameRules()->GetGameStarted() && (inApproximateFrameRate > 0))
+    {
+        ASSERT(this->mPreThinkFrameRate > 0);
+        
+        int theUpperBound = (int)(this->mPreThinkFrameRate/inApproximateFrameRate);
+        if(RANDOM_LONG(1, theUpperBound) == 1)
+        {
+            theTimeToTick = true;
+        }
+    }
+    
+    return theTimeToTick;
+}
+
+void AvHPlayer::TriggerUncloak()
+{
+    AvHTeam* theTeam = this->GetTeamPointer();
+    if(theTeam && (theTeam->GetTeamType() == AVH_CLASS_TYPE_ALIEN) && this->IsAlive())
+    {
+        this->mTriggerUncloak = true;
+
+        SetUpgradeMask(&this->pev->iuser4, MASK_SENSORY_NEARBY, false);
+
+        this->Uncloak();
+    }
+}
+
+void AvHPlayer::InternalAlienUpgradesPheromonesThink()
+{
+    const float kPheromoneUpdateInterval = .4f;
+    const float kPheromoneBaseRange = 600;
+    const int kMaxPheromonePuffs = 3;
+
+    if(GetHasUpgrade(this->pev->iuser4, MASK_UPGRADE_8))
+    {
+        int theRange = kPheromoneBaseRange;
+
+        if(GetHasUpgrade(this->pev->iuser4, MASK_UPGRADE_14))
+        {
+            theRange *= 2;
+        }
+        else if(GetHasUpgrade(this->pev->iuser4, MASK_UPGRADE_15))
+        {
+            theRange *= 3;
+        }
+
+        if(this->mTimeOfLastPheromone == -1 || (gpGlobals->time > this->mTimeOfLastPheromone + kPheromoneUpdateInterval))
+        {
+            typedef std::map<EntityInfo, float> PlayerDistanceListType;
+            PlayerDistanceListType thePlayerDistanceList;
+
+            // Look for players in range to draw pheromones of
+            FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+                
+                // Find nearest distance to friendly and relevant player
+                if(theEntity->GetIsRelevant() && (theEntity->pev->team != this->pev->team) && !GetHasUpgrade(theEntity->pev->iuser4, MASK_TOPDOWN) && (theEntity != this) /*&& !this->GetIsEntityInSight(theEntity)*/)
+                {
+                    double theDistance = VectorDistance(theEntity->pev->origin, this->pev->origin);
+                    if(theDistance < theRange)
+                    {
+                        // Choose nearest x players to emit from
+                        thePlayerDistanceList[theEntity->entindex()] = theDistance;
+                    }
+                }
+            
+            END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+
+            for(int theNumPheromonePuffs = 0; (theNumPheromonePuffs < kMaxPheromonePuffs) && (thePlayerDistanceList.size() > 0); theNumPheromonePuffs++)
+            {
+                // Find the nearest entity
+                PlayerDistanceListType::iterator theClosestIter = thePlayerDistanceList.begin();
+                float theClosestDistance = sqrt(kMaxMapDimension*kMaxMapDimension + kMaxMapDimension*kMaxMapDimension);
+
+                for(PlayerDistanceListType::iterator theIter = thePlayerDistanceList.begin(); theIter != thePlayerDistanceList.end(); theIter++)
+                {
+                    float theCurrentRange = theIter->second;
+                    if(theCurrentRange < theClosestDistance)
+                    {
+                        theClosestDistance = theCurrentRange;
+                        theClosestIter = theIter;
+                    }
+                }
+                
+                // Play a puff for it
+                int theCurrentEntityIndex = theClosestIter->first;
+                CBaseEntity* theCurrentEntity = (CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theCurrentEntityIndex)));
+                ASSERT(theCurrentEntity);
+
+                AvHSUPlayParticleEvent(kpsPheromoneEffect, this->edict(), theCurrentEntity->pev->origin, FEV_HOSTONLY);
+
+                // Delete that entity
+                thePlayerDistanceList.erase(theClosestIter);
+            }
+
+            this->mTimeOfLastPheromone = gpGlobals->time;
+        }
+    }
+}
+
+float AvHPlayer::GetCloakTime() const
+{
+    float theCloakTime = AvHCloakable::GetCloakTime();
+
+    if(this->GetIsAlien())
+    {
+        // If we have cloaking upgrade, we cloak faster
+        int theCloakingLevel = AvHGetAlienUpgradeLevel(this->pev->iuser4, MASK_UPGRADE_7);
+        if(theCloakingLevel > 0)
+        {
+            theCloakTime = BALANCE_FVAR(kCloakTime)/theCloakingLevel;
+        }
+    }
+
+    return theCloakTime;
+}
+
+void AvHPlayer::InternalAlienUpgradesCloakingThink()
+{
+	// joev: 
+	// 0000342 - Cloaking no longer depends on speed. 
+
+	// For some reason the lerk moves faster when turning
+    //const float kWalkSpeedFactor = (this->pev->iuser3 == AVH_USER3_ALIEN_PLAYER3) ? .95f : .7f;
+	//const int kMaxSpeed = this->pev->maxspeed;
+    //elven - needs to update the speed factor here to count for celerity - see bug 342
+	//int theBaseSpeed, theUnencumberedSpeed;
+    //this->GetSpeeds(theBaseSpeed, theUnencumberedSpeed);
+    //const int kMaxSpeed = this->pev->maxspeed;
+	//const int kMaxSpeed = (theUnencumberedSpeed > this->pev->maxspeed ) ? theUnencumberedSpeed : this->pev->maxspeed;
+
+    //// If player moving too fast or trigger uncloak is set
+    //if( ( (this->pev->velocity.Length() > kMaxSpeed*kWalkSpeedFactor) && !GetHasUpgrade(this->pev->iuser4, MASK_SENSORY_NEARBY)) || this->mTriggerUncloak)
+    if(this->mTriggerUncloak)
+    {
+		//Uncloak
+        this->Uncloak();
+    }
+	// :joev
+	else
+    {
+        // If we have cloaking upgrade
+        int theCloakingLevel = AvHGetAlienUpgradeLevel(this->pev->iuser4, MASK_UPGRADE_7);
+        if(theCloakingLevel > 0)
+        {
+			// If time needed to cloak has passed
+			// puzl:  864
+			float theMaxWalkSpeed=this->pev->maxspeed * ((this->pev->iuser3 == AVH_USER3_ALIEN_PLAYER3) ? .95f : .7f);
+			float theSpeed=AvHGetAlienUpgradeLevel(this->pev->iuser4, MASK_SENSORY_NEARBY) ? 0.0f : this->pev->velocity.Length();
+			this->SetSpeeds(theSpeed, this->pev->maxspeed*1.05, theMaxWalkSpeed);
+//			if ( this->pev->velocity.Length() < theMaxWalkSpeed ) 
+//			{
+//				ALERT(at_console, "Cloaking\n");
+				this->Cloak();
+//			}
+        }
+    }
+    
+    this->mTriggerUncloak = false;
+}
+
+bool AvHPlayer::Redeem()
+{
+    bool theSuccess = false;
+
+    // Can only be pulled back if we have at least one active hive
+    AvHTeam* theTeam = this->GetTeamPointer();
+    if(theTeam && (theTeam->GetNumActiveHives() > 0))
+    {
+        // Bring player back
+        if(this->GetTeamPointer()->GetNumActiveHives() > 0)
+        {
+            // Play redeem effect where it happened so attackers know it happened
+            PLAYBACK_EVENT_FULL(0, this->edict(), gStartCloakEventID, 0, this->pev->origin, (float *)&g_vecZero, this->GetAlienAdjustedEventVolume(), 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+            
+            edict_t* theNewSpawnPoint = GetGameRules()->SelectSpawnPoint(this);
+            if(!FNullEnt(theNewSpawnPoint))
+            {
+                //// Create building here to test getting stuck
+                //const int kOffset = 20;
+                //Vector theBaseOrigin = theNewSpawnPoint->v.origin;
+                //Vector theRandomOffset(theBaseOrigin.x + RANDOM_LONG(-kOffset, kOffset), theBaseOrigin.y + RANDOM_LONG(-kOffset, kOffset), theBaseOrigin.z + RANDOM_LONG(-kOffset, kOffset));
+                //AvHSUBuildTechForPlayer(ALIEN_BUILD_MOVEMENT_CHAMBER, theRandomOffset, this);
+
+                theNewSpawnPoint = GetGameRules()->SelectSpawnPoint(this);
+                if(!FNullEnt(theNewSpawnPoint))
+                {
+                    if(this->GetIsDigesting())
+                    {
+                        this->StopDigestion(false);
+                    }
+
+                    mTimeOfLastRedeem = gpGlobals->time;
+
+                    // Respawn player normally
+                    this->InitPlayerFromSpawn(theNewSpawnPoint);
+                    
+                    PLAYBACK_EVENT_FULL(0, this->edict(), gStartCloakEventID, 0, this->pev->origin, (float *)&g_vecZero, this->GetAlienAdjustedEventVolume(), 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+                }
+
+                theSuccess = true;
+            }
+        }
+    }
+
+    return theSuccess;
+}
+
+void AvHPlayer::InternalAlienUpgradesRegenerationThink()
+{
+	// puzl - 0000856  - Add innate regeneration for all alien players.
+	// Add a small and silent innate health and armor regeneration for
+	// all alien players, similar to the innate regeneration of all alien
+	// chambers. If a player chooses the regeneration upgrade, it replaces
+	// the innate regeneration rather than adding to it.
+
+	// If enough time has elapsed to heal
+	if((this->mTimeOfLastRegeneration == -1) || (gpGlobals->time - this->mTimeOfLastRegeneration > BALANCE_FVAR(kAlienRegenerationTime)))
+	{
+		int theRegenLevel = AvHGetAlienUpgradeLevel(this->pev->iuser4, MASK_UPGRADE_2);
+		int theMaxHealth = AvHPlayerUpgrade::GetMaxHealth(this->pev->iuser4, (AvHUser3)this->pev->iuser3, this->GetExperienceLevel());
+
+		float theRegenAmount = 0.0f;
+		float theRegenPercentage = BALANCE_FVAR(kAlienInnateRegenerationPercentage);
+
+		//  If we have regeneration upgrade, multiply the amount by the regen level
+		if(theRegenLevel > 0)
+		{
+			theRegenPercentage = BALANCE_FVAR(kAlienRegenerationPercentage);
+			theRegenAmount = (theRegenPercentage*theMaxHealth)*theRegenLevel;
+		}
+
+		// Innate regeneration is at a fixed rate
+		else {
+			theRegenAmount = theRegenPercentage*(float)theMaxHealth;
+		}
+		// Always do at least 1 health of innate regeneration
+		theRegenAmount=max(theRegenAmount, 1.0f);
+
+		// Don't play a sound for innate regeneration
+		this->Regenerate(theRegenAmount, theRegenLevel > 0 );
+	}
+
+	// Do we have the redemption?
+    int theRedemptionLevel = AvHGetAlienUpgradeLevel(this->pev->iuser4, MASK_UPGRADE_3);
+    if(theRedemptionLevel > 0)
+    {
+        // Is the player really hurting?
+        int theMaxHealth = AvHPlayerUpgrade::GetMaxHealth(this->pev->iuser4, (AvHUser3)this->pev->iuser3, this->GetExperienceLevel());
+
+        if((this->pev->health < theMaxHealth*BALANCE_FVAR(kRedemptionThreshold)) && this->IsAlive())
+        {
+            const float kPullBackTime = 20.0f;
+            if((this->mLastTimeRedemptionTriggered == -1) || (gpGlobals->time > (this->mLastTimeRedemptionTriggered + kPullBackTime)))
+            {
+                // Chance per second
+                float theRedemptionChance = theRedemptionLevel*BALANCE_FVAR(kRedemptionChance);
+
+                // How many times is this being called per second?
+                float theThinkInterval = 1.0f;
+
+                if(this->mLastTimeCheckedRedemption > 0)
+                {
+                    // The longer the time between checks, the higher the chance of being redeemed
+                    theThinkInterval = (gpGlobals->time - this->mLastTimeCheckedRedemption);
+                }
+
+                // Chance per second times seconds elapsed
+                if(RANDOM_FLOAT(0, 1.0f) <= theRedemptionChance*theThinkInterval)
+                {
+                    if(this->Redeem())
+                    {
+                        this->mLastTimeRedemptionTriggered = gpGlobals->time;
+                    }
+                }
+            }
+        }
+    }
+
+    this->mLastTimeCheckedRedemption = gpGlobals->time;
+}
+
+void AvHPlayer::ProcessEntityBlip(CBaseEntity* inEntity)
+{
+    const float kAlienFriendlyBlipRange = 1500;
+    //const float kAlienEnemyBlipRange = 1500;
+    
+    // Is player alien?
+    bool theIsAlien = this->GetIsAlien(true);
+    
+    // Is player marine?
+    bool theIsMarine = this->GetIsMarine(true);
+    
+    ASSERT(theIsAlien || theIsMarine);
+    // Friendly?
+    bool theIsFriendly = ((inEntity->pev->team == 0) || (inEntity->pev->team == this->GetTeam())) ;
+	CBaseEntity* theSpectatingEntity = this->GetSpectatingEntity();
+	if(theSpectatingEntity)
+	{
+		theIsFriendly = ((theSpectatingEntity->pev->team == 0) || (theSpectatingEntity->pev->team == inEntity->pev->team));
+	}
+
+    // If this player in an alien
+    if(theIsAlien && this->IsAlive(true) && !GetHasUpgrade(inEntity->pev->iuser4, MASK_TOPDOWN))
+    {
+		// elven added - don't let digesting players get rendered on parasite
+		bool theEntityIsDigesting = GetHasUpgrade(inEntity->pev->iuser4, MASK_DIGESTING);
+		bool theEntityIsParasited = (theEntityIsDigesting) ? false : GetHasUpgrade(inEntity->pev->iuser4, MASK_PARASITED);
+		bool theEntityIsNearSensory = (theEntityIsDigesting) ? false : GetHasUpgrade(inEntity->pev->iuser4, MASK_SENSORY_NEARBY);
+		bool theEntityIsInHiveSight = (theEntityIsNearSensory || theEntityIsParasited || (GetHasUpgrade(inEntity->pev->iuser4, MASK_VIS_SIGHTED) && inEntity->IsPlayer()) || theIsFriendly || (inEntity->pev->iuser3 == AVH_USER3_HIVE));
+
+        //bool theHasHiveSightUpgrade = true;//GetHasUpgrade(this->pev->iuser4, MASK_ALIEN_UPGRADE_11) || GetGameRules()->GetIsTesting();
+        bool theEntityIsInSight = this->GetIsEntityInSight(inEntity);
+        
+        // If we're processing a relevant player
+        AvHPlayer* theOtherPlayer = dynamic_cast<AvHPlayer*>(inEntity);
+		bool theIsSpectatingEntity = this->GetIsSpectatingPlayer(inEntity->entindex());
+        if(theOtherPlayer && (theOtherPlayer != this) && !theIsSpectatingEntity && theOtherPlayer->GetIsRelevant())
+        {
+            // Calculate angle and distance to player
+            Vector theVectorToEntity = inEntity->pev->origin - this->pev->origin;
+            float theDistanceToEntity = theVectorToEntity.Length();
+
+            // If friendly
+            if(theEntityIsInHiveSight && theIsFriendly && !theEntityIsInSight)
+            {
+                int8 theBlipStatus = kFriendlyBlipStatus;
+                if(GetGameRules()->GetIsEntityUnderAttack(inEntity->entindex()))
+                {
+                    theBlipStatus = kVulnerableFriendlyBlipStatus;
+                }
+
+                if(theOtherPlayer->GetUser3() == AVH_USER3_ALIEN_PLAYER2)
+                {
+                    theBlipStatus = kGorgeBlipStatus;
+                }
+                    
+                //if(theOtherPlayer->GetEnemySighted())
+                //{
+                //  theBlipStatus = 1;
+                //}
+
+                if(theBlipStatus || (theDistanceToEntity < kAlienFriendlyBlipRange))
+                {
+                    // Info is the player index by default
+                    int theBlipInfo = theOtherPlayer->entindex();
+                    this->mFriendlyBlips.AddBlip(inEntity->pev->origin.x, inEntity->pev->origin.y, inEntity->pev->origin.z, theBlipStatus, theBlipInfo);
+                }
+            }
+            // else if enemy
+            else
+            {
+                // If it's in range
+                //if(theDistanceToEntity < kAlienEnemyBlipRange)
+                //{
+
+                int8 theBlipStatus = kEnemyBlipStatus;
+
+                bool theDrawBlip = false;
+
+                if(!theIsFriendly && !theEntityIsInSight)
+                {
+                    // If they're parasited
+                    if(theEntityIsParasited)
+                    {
+                        theDrawBlip = true;
+                    }
+
+                    // If we have scent of fear upgrade - don't render if being eaten. changed by elven.
+					if( (theEntityIsNearSensory || GetHasUpgrade(this->pev->iuser4, MASK_UPGRADE_9)) && !theEntityIsParasited && !GetHasUpgrade(inEntity->pev->iuser4, MASK_DIGESTING))
+                    {
+                        int theRange = BALANCE_IVAR(kScentOfFearRadiusPerLevel);
+                        if(GetHasUpgrade(this->pev->iuser4, MASK_UPGRADE_14))
+                        {
+                            theRange *= 2;
+                        }
+                        else if(GetHasUpgrade(this->pev->iuser4, MASK_UPGRADE_15))
+                        {
+                            theRange *= 3;
+                        }
+                            
+                        // ...and blip is within range
+							if( (theRange > theDistanceToEntity) || theEntityIsNearSensory )
+                        {
+//                          int theMaxHealth = AvHPlayerUpgrade::GetMaxHealth(theOtherPlayer->pev->iuser4, theOtherPlayer->GetUser3());
+//                  
+//                          // ...and blip is under attack or weak
+//                          if(GetGameRules()->GetIsEntityUnderAttack(theOtherPlayer->entindex()) || (theOtherPlayer->pev->health < (theMaxHealth/3)))
+//                          {
+                                theBlipStatus = kVulnerableEnemyBlipStatus;
+                                theDrawBlip = true;
+//                          }
+                        }
+                    }
+                }
+                
+                // Add it if it's in hive sight, or if we have scent of fear and he's marked
+                if(theDrawBlip)
+                {
+                    this->mEnemyBlips.AddBlip(inEntity->pev->origin.x, inEntity->pev->origin.y, inEntity->pev->origin.z, theBlipStatus);
+                }
+                //}
+            }
+        }
+        // else if we're processing a generic buildable
+        else
+        {
+            AvHBaseBuildable* theBaseBuildable = dynamic_cast<AvHBaseBuildable*>(inEntity);
+            if(theBaseBuildable)
+            {
+                // If friendly hive
+                if(theIsFriendly)
+                {
+                    // If not visible
+                    if(!theEntityIsInSight)
+                    {
+                        // If it's being hurt
+						bool theDrawBlip=false;
+                        AvHTeam* theTeam = this->GetTeamPointer();
+
+                        AvHAlertType theAlertType = ALERT_NONE;
+                        int8 theBlipStatus = kFriendlyBlipStatus;
+                        bool theIsUnderAttack = GetGameRules()->GetIsEntityUnderAttack(theBaseBuildable->entindex());
+                        if(theIsUnderAttack)
+                        {
+                            theBlipStatus = kVulnerableFriendlyBlipStatus;
+							theDrawBlip=true;
+                        }
+
+						// Add it if relevant
+                        AvHHive* theHive = dynamic_cast<AvHHive*>(inEntity);
+						if(theHive )
+                        {
+							theDrawBlip=true;
+							if(!theIsUnderAttack)
+                            {
+                                theBlipStatus = kHiveBlipStatus;
+                            }
+							if ( theHive && !theHive->GetIsBuilt() )
+							{
+								theBlipStatus=kUnbuiltHiveBlipsStatus;
+							}
+                        }
+						if ( theDrawBlip == true )
+						{
+                            // Info is the player index or the kBaseBlipInfoOffset + the iuser3
+                            int theBlipInfo = kBaseBlipInfoOffset + inEntity->pev->iuser3;
+                            if(theBlipInfo >= sizeof(char)*128)
+                            {
+                                ASSERT(false);
+                            }
+							this->mFriendlyBlips.AddBlip(inEntity->pev->origin.x, inEntity->pev->origin.y, inEntity->pev->origin.z, theBlipStatus, theBlipInfo);
+						}
+                    }
+                }
+                // If enemy
+                else
+                {
+                    // If it's in hive sight, but not visible
+                    if(!theEntityIsInSight && theEntityIsInHiveSight)
+                    {
+                        // If within range
+                        //if(theDistanceToEntity < kAlienEnemyBlipRange)
+                        //{
+		                // Add it
+                        this->mEnemyBlips.AddBlip(inEntity->pev->origin.x, inEntity->pev->origin.y, inEntity->pev->origin.z, kEnemyStructureBlipsStatus);
+                        //}
+							}
+						}
+            }
+        }
+    }
+    // else if this player is a marine 
+    else if(theIsMarine && this->IsAlive(true))
+    {
+        bool theTeamHasMotionTracking = GetHasUpgrade(this->pev->iuser4, MASK_UPGRADE_8);
+        
+        // If player is commander (or is any marine with motion tracking?)
+        if((this->GetUser3() == AVH_USER3_COMMANDER_PLAYER) || (theTeamHasMotionTracking))
+        {
+			
+             // If enemy, add it to enemy list if "detected" // Elven - we don't want motion blips on aliens visible to us.
+			// && !(inEntity->pev->iuser4 & MASK_VIS_SIGHTED) <- this won't work as if I see an alien, other marines won't see MT if they're in another room
+			bool visibleToThis = this->GetIsEntityInSight(inEntity);
+			if(!theIsFriendly && (inEntity->pev->iuser4 & MASK_VIS_DETECTED) && !visibleToThis && inEntity->IsAlive())//voogru: make sure there alive
+            {
+                this->mEnemyBlips.AddBlip(inEntity->pev->origin.x, inEntity->pev->origin.y, inEntity->pev->origin.z, kMarineEnemyBlipStatus);
+            }
+        }
+    }
+}
+
+void AvHPlayer::ClearBlips()
+{
+    this->mEnemyBlips.Clear();
+    this->mFriendlyBlips.Clear();
+}
+
+void AvHPlayer::ClientDisconnected()
+{
+    this->ResetGameNewMap();
+
+    this->ResetBehavior(true);
+
+    this->ResetEntity();
+    
+    #ifdef AVH_PLAYTEST_BUILD
+    this->mClientBalanceInts.clear();
+    this->mClientBalanceFloats.clear();
+    #endif
+}
+
+void AvHPlayer::ResetGameNewMap()
+{
+    this->mNumParticleTemplatesSent = 0;
+    this->mTimeOfLastParticleTemplateSending = -1;
+    this->mClientGamma = kDefaultMapGamma;
+    this->mNewMap = true;
+}
+
+void AvHPlayer::InternalCommanderThink()
+{
+    // Finally, if we are commander, set the special PAS origin to  use
+    if(this->GetUser3() == AVH_USER3_COMMANDER_PLAYER)
+    {
+        // Only update every so often
+        const float kUpdatePASInterval = 1.0f;
+        float theTime = gpGlobals->time;
+        if((this->mTimeOfLastPASUpdate == -1) || (theTime > (this->mTimeOfLastPASUpdate + kUpdatePASInterval)))
+        {
+            // Default to our last known "real-world" origin, in case there are no other players?
+            VectorCopy(this->mPositionBeforeTopDown, this->mSpecialPASOrigin);
+            
+            // Max map size is 8012x8012
+            double theShortestDistance = 64192144;
+            
+            // Loop through all players
+            FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+                
+                // Find nearest distance to friendly and relevant player
+                if(theEntity->GetIsRelevant() && (theEntity->pev->team == this->pev->team) && (theEntity != this))
+                {
+                    double theDistance = VectorDistance(theEntity->pev->origin, this->pev->origin);
+                    if(theDistance < theShortestDistance)
+                    {
+                        VectorCopy(theEntity->pev->origin, this->mSpecialPASOrigin);
+                        theShortestDistance = theDistance;
+
+                        //SET_VIEW(ENT(this->pev), ENT(theEntity->pev));
+                    }
+                }
+                
+            END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+                    
+            this->mTimeOfLastPASUpdate = theTime;
+        }
+    }
+}
+
+void AvHPlayer::InternalBoundResources()
+{
+    // Aliens have a max resource amount, put any that overflows back into the team
+    AvHTeam* theTeam = this->GetTeamPointer();
+    if(theTeam && this->GetIsAlien())   
+    {
+        float theMaxResources = theTeam->GetMaxResources((AvHUser3)this->pev->iuser3);
+        
+        float theExtraResources = this->mResources - theMaxResources;
+        if(theExtraResources > 0)
+        {
+            theTeam->SetTeamResources(theTeam->GetTeamResources() + theExtraResources);
+        }
+        
+        this->mResources = min(this->mResources, theMaxResources);
+    }
+
+    if(GetGameRules()->GetIsCombatMode())
+    {
+        this->mResources = 0;
+    }
+}
+
+bool AvHPlayer::QueryEnemySighted(CBaseEntity* inEntity)
+{
+    bool theSuccess = false;
+
+    if((this->pev->team != inEntity->pev->team) && (this->pev->team != TEAM_IND) && (inEntity->pev->team != TEAM_IND))
+    {
+        if(inEntity != this)
+        {
+            if(inEntity->IsAlive() && this->GetIsEntityInSight(inEntity))
+            {
+                AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inEntity);
+				//this->CompareToPlayer(inEntity); //voogru: WTF?
+                if(!thePlayer || (thePlayer->GetIsRelevant() && !thePlayer->GetIsCloaked()))
+                {
+                    this->mEnemySighted = true;
+                    this->mTimeOfLastEnemySighting = gpGlobals->time;
+                    theSuccess = true;
+                }
+            }
+        }
+    }
+    return theSuccess;
+}
+
+void AvHPlayer::InternalAlienThink()
+{
+    if(this->GetIsAlien() && this->IsAlive())
+    {
+        // Are we gestating?  Has enough time passed so we are something new?
+        if(this->pev->iuser3 == AVH_USER3_ALIEN_EMBRYO)
+        {
+            float theCurrentTime = gpGlobals->time;
+            float theFullTimeToGestate = GetGameRules()->GetBuildTimeForMessageID(this->mEvolution);
+            if(GetGameRules()->GetIsTesting())
+            {
+                theFullTimeToGestate = 1.0f;
+            } 
+            
+            this->TriggerProgressBar(this->entindex(), 3);
+
+            // If changing this, make sure to change spectator behavior in InternalCommonThink
+            float theTimeElapsed = theCurrentTime - this->mTimeGestationStarted;
+            this->pev->fuser3 = (theTimeElapsed/theFullTimeToGestate)*kNormalizationNetworkFactor;
+
+            if(theTimeElapsed >= theFullTimeToGestate)
+            {
+                this->ProcessEvolution();
+
+                // Set ourselves crouching so we have a smaller chance of getting stuck
+                if(AvHMUGetCanDuck(this->pev->iuser3))
+                {
+                    SetBits(this->pev->flags, FL_DUCKING);
+                }
+            }
+        }
+        
+        // Has enough time passed since we started screaming?
+        if(this->mIsScreaming)
+        {
+            if(gpGlobals->time > (this->mTimeStartedScream + BALANCE_FVAR(kPrimalScreamDuration)))
+            {
+                this->mIsScreaming = false;
+            }
+        }
+    }
+}
+
+void AvHPlayer::InternalCommonThink()
+{
+    if(GetGameRules()->GetGameStarted())
+    {
+        this->mPreThinkTicks++;
+        
+        float theTimePassed = gpGlobals->time - GetGameRules()->GetTimeGameStarted();
+        this->mPreThinkFrameRate = this->mPreThinkTicks/theTimePassed;
+        
+//      if(RANDOM_LONG(0, 125) == 0)
+//      {
+//          char theMessage[128];
+//          sprintf(theMessage, "Num ents: %d\n", GetGameRules()->GetNumEntities());
+//          //sprintf(theMessage, "Time passed: %f, ticks: %d, rate: %f, %d\n", theTimePassed, this->mPreThinkTicks, this->mPreThinkFrameRate, gNumFullPackCalls);
+//          UTIL_SayText(theMessage, this);
+//      }
+    }
+    else
+    {
+        this->mPreThinkTicks = 0;
+        this->mPreThinkFrameRate = 30;
+    }
+
+    // If we're not in the ready room, and the a victor has just been determined, see if it's time to reset us
+    // This has to be done at a different time per player, to avoid overflows
+    if((GetGameRules()->GetVictoryTeam() != TEAM_IND) && (this->GetPlayMode() != PLAYMODE_READYROOM))
+    {
+        // Get victory time, see if it's time to reset us
+        int thePlayerIndex = this->entindex();
+        int theSecondToReset = kVictoryIntermission - 1 - kMaxPlayers/kResetPlayersPerSecond + (thePlayerIndex - 1)/kResetPlayersPerSecond;
+        //ASSERT(theSecondToReset >= 0);
+        //ASSERT(theSecondToReset < kVictoryIntermission);
+
+        // NOTE: This depends on gamerules not allong players join a team after victory has been declared
+        float theVictoryTime = GetGameRules()->GetVictoryTime();
+        if(gpGlobals->time > (theVictoryTime + theSecondToReset))
+        {
+            this->SetPlayMode(PLAYMODE_READYROOM, true);
+        }
+    }
+    
+    // Must be called every frame to prevent exploiting
+    this->SetModelFromState();
+	
+    
+    AvHTeam* theTeam = this->GetTeamPointer();
+    if(theTeam)
+    {
+        // Clear existing upgrades for marines.  Aliens have their own individual upgrades.
+        if(this->GetIsMarine() && !GetGameRules()->GetIsCombatMode())
+        {
+            int theInvertedUpgradeMask = ~kUpgradeBitMask;
+            this->pev->iuser4 &= theInvertedUpgradeMask;
+        }
+        
+        // Set the current upgrades
+        this->pev->iuser4 |= theTeam->GetTeamWideUpgrades();
+    }
+    
+    // Update active and inactive inventory
+    const float kUpdateInventoryInterval = .5f;
+    if(gpGlobals->time > (this->mLastInventoryThink + kUpdateInventoryInterval))
+    {
+        this->UpdateInventoryEnabledState(this->mNumHives, true);
+        this->mLastInventoryThink = gpGlobals->time;
+    }
+    
+    // Remember last time we were playing
+    if(this->GetPlayMode() == PLAYMODE_PLAYING)
+    {
+        this->mTimeLastPlaying = gpGlobals->time;
+    }
+    
+    this->InternalBoundResources();
+
+    // Players keep their health in fuser2
+    int theMaxHealth = AvHPlayerUpgrade::GetMaxHealth(this->pev->iuser4, (AvHUser3)this->pev->iuser3, this->GetExperienceLevel());
+    int theCurrentHealth = max(0, this->pev->health);
+    int theMaxArmor = AvHPlayerUpgrade::GetMaxArmorLevel(this->pev->iuser4, (AvHUser3)this->pev->iuser3);
+    int theCurrentArmor = max(0, this->pev->armorvalue);
+
+    // Draw ring to take into account health and armor for aliens, just health for marines (so gorge and comm know when to heal)
+    float theScalar = (float)theCurrentHealth/theMaxHealth;
+    if(this->GetIsAlien())
+    {
+        theScalar = (theCurrentHealth + theCurrentArmor)/(float)(theMaxHealth + theMaxArmor);
+    }
+    this->pev->fuser2 = theScalar*kNormalizationNetworkFactor;
+    
+    //float theRandomAngle = RANDOM_FLOAT(0, 50);
+    //this->pev->v_angle.x = theRandomAngle;
+    //VectorCopy(this->pev->angles, this->mAnglesBeforeTopDown);
+    //VectorCopy(this->pev->v_angle, this->mViewAnglesBeforeTopDown);
+    
+    if(GetGameRules()->GetCountdownStarted() && !GetGameRules()->GetGameStarted() && (GetPlayMode() == PLAYMODE_PLAYING) && !GetGameRules()->GetCheatsEnabled())
+    {
+        this->pev->flags |= FL_FROZEN;
+        DROP_TO_FLOOR(this->edict());
+    }
+    else
+    {
+        this->pev->flags &= ~FL_FROZEN;
+    }
+
+    // If we have a different desired name, change to it
+    if(GetGameRules()->GetArePlayersAllowedToJoinImmediately())
+    {
+        // If our desired net name hasn't been set, set it now
+        if(this->mDesiredNetName != "")
+        {
+            char* theInfoBuffer = g_engfuncs.pfnGetInfoKeyBuffer(this->edict());
+
+            char theBuffer[256];
+            strcpy(theBuffer, this->mDesiredNetName.c_str());
+            g_engfuncs.pfnSetClientKeyValue(this->entindex(), theInfoBuffer, "name", theBuffer);
+
+            this->mDesiredNetName = "";
+        }
+    }
+
+    // If we're spectating a target, set our health and armorvalue to theirs
+    // For spectators that are tracking players, move to their location, to prevent problems outside of the PVS
+    AvHPlayer* theEntity = NULL;
+    if(AvHSUGetEntityFromIndex(this->pev->iuser2, theEntity))
+    {
+        // If entity is no longer spectatable, jump to the next target
+        if(theEntity->GetIsInTopDownMode() || (theEntity->GetPlayMode() != PLAYMODE_PLAYING))
+        {
+            this->Observer_FindNextPlayer();
+        }
+        else
+        {
+            this->pev->health = theEntity->pev->health;
+            this->pev->armorvalue = theEntity->pev->armorvalue;
+            this->pev->fuser3 = theEntity->pev->fuser3;
+
+            if((theEntity->GetUser3() == AVH_USER3_ALIEN_EMBRYO) || (theEntity->GetIsBeingDigested()))
+            {
+                this->TriggerProgressBar(theEntity->entindex(), 3);
+            }
+
+            // Hacky way to make sure player is in PVS of target
+            float theDistance = VectorDistance(theEntity->pev->origin, this->pev->origin);
+            if(theDistance > 700)
+            {
+                VectorCopy(theEntity->pev->origin, this->pev->origin);
+            }
+        }   
+    }
+
+    // If we are digesting a player, process him (process even for marines in case we're testing)
+    this->InternalDigestionThink();
+
+    // Update FOV and view height every tick, needed for first-person spectating
+    this->SetViewForUser3();
+
+    PropagateServerVariables();
+
+}
+
+void AvHPlayer::PropagateServerVariables()
+{
+
+    for (int i = 0; i < (signed)mServerVariableList.size(); ++i)
+    {
+
+        std::string theValue = CVAR_GET_STRING( mServerVariableList[i].mName.c_str() );
+        std::string lastValue = mServerVariableList[i].mLastValueSent;
+        
+        if ( mServerVariableList[i].mLastValueSent != theValue)
+        {
+
+            mServerVariableList[i].mLastValueSent = theValue;
+           
+            MESSAGE_BEGIN(MSG_ONE, gmsgServerVar, NULL, this->pev);
+
+            WRITE_STRING( mServerVariableList[i].mName.c_str() );
+            WRITE_STRING( mServerVariableList[i].mLastValueSent.c_str() );
+
+            MESSAGE_END();
+
+            break; // Only send one message per tick to avoid overflow.
+
+        }
+
+    }
+
+}
+
+void AvHPlayer::InternalMarineThink()
+{
+    if(this->GetIsMarine() && (this->pev->iuser3 != AVH_USER3_COMMANDER_PLAYER))
+    {
+        // Slowly heal power armor over time
+        if(this->GetHasPowerArmor())
+        {
+            if(this->mLastPowerArmorThink != -1)
+            {
+                float theTimePassed = gpGlobals->time - this->mLastPowerArmorThink;
+                if(theTimePassed > 0.0f)
+                {
+                    // Key regen to velocity to enhance leap-frogging, ala Halo
+                    float theVelocity = this->pev->velocity.Length();
+                    float theRegenFactor = .5f;
+                    if(theVelocity > 0)
+                    {
+                        //theRegenFactor = .3f - .3f*(theVelocity/kMaxGroundPlayerSpeed);
+                        theRegenFactor = 0.1f;
+                    }
+                    theRegenFactor = max(min(theRegenFactor, 1.0f), 0.0f);
+                    const float kPowerRegenRate = theRegenFactor*2.0f;
+                    
+                    int theMaxArmor = AvHPlayerUpgrade::GetMaxArmorLevel(this->pev->iuser4, (AvHUser3)this->pev->iuser3);
+                    if(this->pev->armorvalue < theMaxArmor)
+                    {
+                        this->pev->armorvalue = min(theMaxArmor, this->pev->armorvalue + kPowerRegenRate*theTimePassed);
+                    }
+                }
+            }
+            this->mLastPowerArmorThink = gpGlobals->time;
+        }
+
+        // Update buffed
+        if(this->GetIsCatalysted())
+        {
+            if(gpGlobals->time > this->mTimeToEndCatalyst)
+            {
+                this->SetIsCatalysted(false);
+            }
+        }
+    }
+}
+
+void AvHPlayer::InternalPreThink()
+{
+    PROFILE_START()
+    this->InternalCommonThink();
+    PROFILE_END(kPlayerCommonThink);
+
+    PROFILE_START()
+    this->InternalAlienThink();
+    PROFILE_END(kPlayerAlienThink)
+
+    PROFILE_START()
+    this->InternalMarineThink();
+    PROFILE_END(kPlayerMarineThink)
+
+    PROFILE_START()
+    this->InternalCommanderThink();
+    PROFILE_END(kPlayerCommanderThink)
+
+    PROFILE_START()
+    this->InternalAlienUpgradesThink();
+    PROFILE_END(kPlayerAlienUpgradesThink)
+
+    PROFILE_START()
+    this->InternalCombatThink();
+    PROFILE_END(kPlayerCombatThink)
+    //this->InternalEnemySightedPreThink(); 
+    
+    PROFILE_START()
+    this->InternalSpeakingThink();
+    PROFILE_END(kPlayerSpeakingThink)
+
+    PROFILE_START()
+    this->InternalProgressBarThink();
+    PROFILE_END(kPlayerProgressBarThink)
+
+    PROFILE_START()
+    this->InternalFogThink();
+    PROFILE_END(kPlayerFogThink)
+
+    PROFILE_START()
+    this->InternalHUDThink();
+    PROFILE_END(kPlayerHUDThink)
+}
+
+void AvHPlayer::InternalFogThink()
+{
+    if((this->mTimeOfLastFogTrigger != -1) && (gpGlobals->time > this->mTimeOfLastFogTrigger + this->mFogExpireTime))
+    {
+        this->mCurrentFogEntity = -1;
+    }
+}
+
+void AvHPlayer::InternalHUDThink()
+{
+    // Pull weapon out if we're done using something
+    if(this->mTimeOfLastUse != -1)
+    {
+        const float kUseTime = .5f;
+        if(gpGlobals->time > this->mTimeOfLastUse + kUseTime)
+        {
+            // Don't deploy while you're a commander (happens if you finish building something next to command station and immediately jump in)
+            if(!this->GetIsInTopDownMode() && !this->GetIsBeingDigested())
+            {
+                this->DeployCurrent();
+                this->mTimeOfLastUse = -1;
+            }
+        }
+    }
+
+    // Don't hide chat by default
+    int theHideHUD = HIDEHUD_WEAPONS | HIDEHUD_FLASHLIGHT | HIDEHUD_HEALTH;
+
+    // Use local player or player we're spectating
+    AvHPlayer* theVisiblePlayer = this;
+    if(this->pev->iuser1 == OBS_IN_EYE)
+    {
+        AvHPlayer* theEntity = NULL;
+        if(AvHSUGetEntityFromIndex(this->pev->iuser2, theEntity))
+        {
+            theVisiblePlayer = theEntity;
+        }
+    }
+
+    AvHPlayMode thePlayMode = theVisiblePlayer->GetPlayMode();
+    AvHUser3 theUser3 = theVisiblePlayer->GetUser3();
+
+    if((thePlayMode == PLAYMODE_READYROOM) || (thePlayMode == PLAYMODE_REINFORCING) || (thePlayMode == PLAYMODE_AWAITINGREINFORCEMENT))
+    {
+        theHideHUD = HIDEHUD_FLASHLIGHT | HIDEHUD_WEAPONS | HIDEHUD_HEALTH;
+
+        // Only hide health when not following a target
+        if((thePlayMode == PLAYMODE_AWAITINGREINFORCEMENT) && (this->pev->iuser1 == OBS_IN_EYE))
+        {
+            //theHideHUD &= ~HIDEHUD_WEAPONS;
+            theHideHUD &= ~HIDEHUD_HEALTH;
+        }
+    }
+    else if(thePlayMode == PLAYMODE_PLAYING)
+    {
+        theHideHUD = 0;
+
+        if(!GetGameRules()->FAllowFlashlight())
+        {
+            theHideHUD |= HIDEHUD_FLASHLIGHT;
+        }
+
+        if(!theVisiblePlayer->pev->viewmodel)
+        {
+            //theHideHUD |= HIDEHUD_WEAPONS | HIDEHUD_FLASHLIGHT;
+        }
+
+        if(theUser3 == AVH_USER3_ALIEN_EMBRYO)
+        {
+            //theHideHUD |= HIDEHUD_HEALTH;
+        }
+
+        if(GetHasUpgrade(theVisiblePlayer->pev->iuser4, MASK_TOPDOWN) || theVisiblePlayer->GetIsBeingDigested())
+        {
+            theHideHUD |= HIDEHUD_WEAPONS | HIDEHUD_FLASHLIGHT | HIDEHUD_HEALTH;
+        }
+        else
+        {
+            
+            // If we have no other weapons, hide ammo
+
+            if(!HasWeapons())
+            {
+                theHideHUD |= HIDEHUD_WEAPONS;
+                theHideHUD |= HIDEHUD_FLASHLIGHT;
+            }
+        
+            if(theUser3 == AVH_USER3_ALIEN_EMBRYO)
+            {
+                theHideHUD |= HIDEHUD_WEAPONS;
+                theHideHUD |= HIDEHUD_FLASHLIGHT;
+            }
+        }
+    }
+    else if(thePlayMode == PLAYMODE_OBSERVER)
+    {
+        theHideHUD = HIDEHUD_WEAPONS | HIDEHUD_FLASHLIGHT | HIDEHUD_HEALTH;
+
+        // Only hide health when not following a target
+        if((this->pev->iuser1 == OBS_IN_EYE))
+        {
+            //theHideHUD &= ~HIDEHUD_WEAPONS;
+            theHideHUD &= ~HIDEHUD_HEALTH;
+        }
+    }
+    else
+    {
+        int a = 0;
+    }
+    
+    this->m_iHideHUD = theHideHUD;
+}
+
+
+void AvHPlayer::InternalProgressBarThink()
+{
+    // If some time has passed since the progress bar was triggered, send down a message to kill it
+    const float kProgressBarTimeOut = .2f;
+    if(this->mTimeProgressBarTriggered != -1)
+    {
+        if(gpGlobals->time > this->mTimeProgressBarTriggered + kProgressBarTimeOut)
+        {
+            this->mTimeProgressBarTriggered = -1;
+            this->mProgressBarEntityIndex = -1;
+            this->mProgressBarParam = -1;
+        }
+    }
+}
+
+void AvHPlayer::InternalSpeakingThink()
+{
+    if((this->mIsSpeaking || this->mOrderAcknowledged || this->mOrdersRequested) && (gpGlobals->time - this->mTimeOfLastSaying >= kSpeakingTime))
+    {
+        this->mIsSpeaking = false;
+        this->mOrderAcknowledged = false;
+        this->mOrdersRequested = false;
+    }
+}
+
+void AvHPlayer::PreThink( void )
+{
+    // Get play mode
+    AvHPlayMode thePlayMode = this->GetPlayMode();
+    bool theRunThink =  ((thePlayMode == PLAYMODE_READYROOM) && GET_RUN_CODE(8)) || 
+        ((thePlayMode == PLAYMODE_OBSERVER) && (GET_RUN_CODE(16))) || 
+        (this->GetIsAlien() && GET_RUN_CODE(32)) ||
+        (this->GetIsMarine() && GET_RUN_CODE(64));
+    
+    if(theRunThink)
+    {
+        PROFILE_START()
+        CBasePlayer::PreThink();
+        PROFILE_END(kCBasePlayerPreThink)
+
+        PROFILE_START()
+        this->InternalPreThink();
+        PROFILE_END(kPlayerInternalPreThink)
+        
+        PROFILE_START()
+        this->ValidateClientMoveEvents();
+        PROFILE_END(kValidateClientMoveEvents)
+        
+        PROFILE_START()
+        this->HandleTopDownInput();
+        PROFILE_END(kHandleTopDownInput)
+        
+        PROFILE_START()
+        this->RecalculateSpeed();
+        PROFILE_END(kRecalculateSpeed)
+        
+        PROFILE_START()
+        if(this->mQueuedThinkMessage != "")
+        {
+            this->SendMessage(this->mQueuedThinkMessage.c_str(), true);
+            this->mQueuedThinkMessage = "";
+        }
+        if(this->mPendingCommand)
+        {
+            // Is this bad?
+            GetGameRules()->ClientCommand(this, this->mPendingCommand);
+            this->mPendingCommand = NULL;
+        }
+        PROFILE_END(kPlayerPreThinkMisc)
+    }
+}
+
+bool AvHPlayer::PayPurchaseCost(int inCost)
+{
+    bool theSuccess = false;
+
+    if(GetGameRules()->GetIsCombatMode())
+    {
+        if(inCost <= (this->GetExperienceLevel() - this->GetExperienceLevelsSpent() - 1))
+        {
+            this->SetExperienceLevelsSpent(this->GetExperienceLevelsSpent() + inCost);
+            theSuccess = true;
+        }
+    }
+    else
+    {
+        if(inCost <= this->GetResources())
+        {
+            this->SetResources(this->GetResources() - inCost);
+            theSuccess = true;
+        }
+    }
+
+    return theSuccess;
+}
+
+void AvHPlayer::RecalculateSpeed(void)
+{
+    // Look at inventory and set speed from weight
+    int theRelevantWeight = this->GetRelevantWeight();
+    
+    int theMaxWeight = GetGameRules()->GetMaxWeight();
+
+//  // The level 5 has a dynamic max speed, depending on how long he's been galloping and his change in facing
+//  if(this->pev->iuser3 == AVH_USER3_ALIEN_PLAYER5)
+//  {
+//      // Ever-increasing
+//      const int kBaseLevel5Speed = 200;
+//      this->mMaxGallopSpeed = max(kBaseLevel5Speed, this->mMaxGallopSpeed);
+//
+//      const int kMaxGallopSpeed = 350;
+//
+//      // Only add gallop if we're trying to move forward (no other keys allowed), while on the ground
+//      if((this->pev->button == IN_FORWARD) && FBitSet(this->pev->flags, FL_ONGROUND) && (this->pev->velocity.Length() > 0))
+//      {
+//          const int kSpeedIncrementPerTick = 5;
+//          this->mMaxGallopSpeed += kSpeedIncrementPerTick;
+//      }
+//      else
+//      {
+//          this->mMaxGallopSpeed = kBaseLevel5Speed;
+//      }
+//
+//      this->mMaxGallopSpeed = min(this->mMaxGallopSpeed, kMaxGallopSpeed);
+//
+//      // But we slow-down when we turn, this should encourage galloping in large smooth circles, like a bull!
+//      float theDotProduct = DotProduct(gpGlobals->v_forward, this->mLastGallopViewDirection);
+//      this->mMaxGallopSpeed *= theDotProduct;
+//
+//      // Save our view angle for level 5 galloping (see GetSpeeds())
+//      VectorCopy(gpGlobals->v_forward, this->mLastGallopViewDirection);
+//  }
+
+    int theBaseSpeed, theUnencumberedSpeed;
+    this->GetSpeeds(theBaseSpeed, theUnencumberedSpeed);
+    this->mMaxWalkSpeed = theUnencumberedSpeed*.75f;
+    
+    // Calculate the max speed
+    int theMaxSpeed = theUnencumberedSpeed - (theRelevantWeight/(float)theMaxWeight)*(theUnencumberedSpeed - theBaseSpeed);
+    theMaxSpeed = max(theMaxSpeed, theBaseSpeed);
+    theMaxSpeed = min(theMaxSpeed, theUnencumberedSpeed);
+    
+    // Set it but only if it changed (just in case there's a hidden performance or network cost)
+    if(this->pev->maxspeed != theMaxSpeed)
+    {
+        //char theMessage[256];
+        //sprintf(theMessage, "New weight is %d, setting speed to %d.\n", theRelevantWeight, theMaxSpeed);
+        //ClientPrint(this->pev, HUD_PRINTTALK, theMessage);
+
+        this->pev->maxspeed = theMaxSpeed;
+        g_engfuncs.pfnSetClientMaxspeed( ENT(this->pev), theMaxSpeed);
+    }
+}
+
+void AvHPlayer::ReloadWeapon(void)
+{
+    if(this->m_pActiveItem)
+    {
+        CBasePlayerWeapon* theGun = (CBasePlayerWeapon *)this->m_pActiveItem->GetWeaponPtr();
+        if(theGun)
+        {
+			//SetAnimation(PLAYER_RELOAD);
+            theGun->Reload();
+        }
+    }
+}
+
+// Reset stuff
+void AvHPlayer::ResetEntity(void)
+{
+    CBasePlayer::ResetEntity();
+
+    this->mHasSeenTeamOne = this->mHasSeenTeamTwo = false;
+
+    this->ResetBehavior(true);
+
+    this->UpdateTopDownMode();
+
+    // Save new map status, as Init() resets the player completely, but we want to preserve this one field
+    bool theSavedNewMap = this->mNewMap;
+    string theSavedDesiredNetName = this->mDesiredNetName;
+#ifdef USE_UPP
+	bool theAuthorized = this->mAuthorized;
+	int theAuthMask = this->mAuthMask;
+	string theIconName = this->mScoreboardIconName;
+#else
+    bool theAllowAuth = this->mAllowAuth;
+#endif
+    AvHBaseInfoLocationListType theClientInfoLocations = this->mClientInfoLocations;
+        
+    this->Init();
+        
+    this->mNewMap = theSavedNewMap;
+    this->mDesiredNetName = theSavedDesiredNetName;
+#ifdef USE_UPP
+	this->mAuthorized = theAuthorized;
+	this->mAuthMask = theAuthMask;
+	this->mScoreboardIconName = theIconName;
+#else
+    this->mAllowAuth = theAllowAuth;
+#endif
+    this->mClientInfoLocations = theClientInfoLocations;
+}
+
+void AvHPlayer::ResetOverwatch()
+{
+    // clear target
+    this->mOverwatchTarget = -1;
+    this->pev->fuser1 = -1;
+    this->pev->fuser2 = -1;
+    
+    // Set facing back to original facing
+    VectorCopy(this->mOverwatchFacing, this->pev->angles);
+    this->pev->fixangle = TRUE;
+}
+
+
+#include "engine/studio.h"
+
+void AvHPlayer::SetModelFromState()
+{
+    // Default to marine in ready room
+	char* theModelName = NULL;
+
+    AvHUser3 theUser3 = this->GetUser3();
+
+    switch(theUser3)
+	{
+	case AVH_USER3_MARINE_PLAYER:
+	    theModelName = kMarineSoldierModel;
+	    if(GetHasUpgrade(this->pev->iuser4, MASK_UPGRADE_13))
+	    {
+	        theModelName = kHeavySoldierModel;
+	    }
+	    break;
+	case AVH_USER3_COMMANDER_PLAYER:
+	    theModelName = kMarineCommanderModel;
+	    break;
+	case AVH_USER3_ALIEN_PLAYER1:
+	    theModelName = kAlienLevelOneModel;
+	    break;
+	case AVH_USER3_ALIEN_PLAYER2:
+	    theModelName = kAlienLevelTwoModel;
+	    break;
+	case AVH_USER3_ALIEN_PLAYER3:
+	    theModelName = kAlienLevelThreeModel;
+	    break;
+	case AVH_USER3_ALIEN_PLAYER4:
+	    theModelName = kAlienLevelFourModel;
+	    break;
+	case AVH_USER3_ALIEN_PLAYER5:
+	    theModelName = kAlienLevelFiveModel;
+	    break;
+	case AVH_USER3_ALIEN_EMBRYO:
+		theModelName = kAlienGestateModel;
+	    break;
+    default:
+        if(this->GetPlayMode() == PLAYMODE_READYROOM)
+        {
+            theModelName = kReadyRoomModel;
+        }
+        break;
+	}
+
+	//SET_MODEL(ENT(pev), theModelName);
+
+    // Alternative method of setting the model on the server:
+    if(theModelName)
+    {
+        pev->model = MAKE_STRING(theModelName);
+        this->mLastModelIndex = MODEL_INDEX(theModelName);
+    }
+
+    if(this->mLastModelIndex != 1)
+    {
+        pev->modelindex = mLastModelIndex;
+    }
+
+	// Set body group for marine armor
+	this->pev->body = 0;
+	if(this->GetHasJetpack())
+	{
+		this->pev->body = 1;
+	}
+}
+
+void AvHPlayer::SetMoveTypeForUser3()
+{
+    switch(this->pev->iuser3)
+    {
+    case AVH_USER3_ALIEN_EMBRYO:
+//      this->pev->movetype = MOVETYPE_PUSH;
+//      break;
+        
+    case AVH_USER3_NONE:
+    case AVH_USER3_MARINE_PLAYER:
+    case AVH_USER3_ALIEN_PLAYER1:
+    case AVH_USER3_ALIEN_PLAYER2:
+    case AVH_USER3_ALIEN_PLAYER3:
+    case AVH_USER3_ALIEN_PLAYER4:
+    case AVH_USER3_ALIEN_PLAYER5:
+        this->pev->movetype = MOVETYPE_WALK;
+        break;
+    }
+}
+
+void AvHPlayer::GetSize(Vector& outMinSize, Vector& outMaxSize) const
+{
+    bool theIsDucking = FBitSet(this->pev->flags, FL_DUCKING);
+    
+    AvHSHUGetSizeForPlayerUser3((AvHUser3)this->pev->iuser3, outMinSize, outMaxSize, theIsDucking);
+}
+
+void AvHPlayer::SetWeaponsForUser3()
+{
+    AvHUser3 theUser3 = (AvHUser3)this->pev->iuser3;
+
+    bool theTeamHasGrenades = false;
+
+    if(!GetGameRules()->GetIsCombatMode())
+    {
+        AvHTeam* theTeamPointer = this->GetTeamPointer(false);
+        if(theTeamPointer)
+        {
+            theTeamHasGrenades = theTeamPointer->GetResearchManager().GetTechNodes().GetIsTechResearched(TECH_RESEARCH_GRENADES);
+        }
+    }
+
+    switch(theUser3)
+    {
+    case AVH_USER3_NONE:
+        break;
+        
+    case AVH_USER3_MARINE_PLAYER:
+        if(this->mPreviousUser3 != AVH_USER3_COMMANDER_PLAYER)
+        {
+            this->GiveNamedItem(kwsMachineGun);
+            this->GiveNamedItem(kwsPistol);
+            this->GiveNamedItem(kwsKnife);
+
+            if(theTeamHasGrenades)
+            {
+                this->GiveNamedItem(kwsGrenade);
+            }
+        }
+        break;
+    case AVH_USER3_COMMANDER_PLAYER:
+        break;
+        
+        // NOTE: When moving weapons/abilities around, be sure to change AvHBasePlayerWeapon::GetAnimationExtension(), and AvHSHUGetIsWeaponFocusable().
+    case AVH_USER3_ALIEN_PLAYER1:
+        this->DestroyAllItems(FALSE);
+        this->GiveNamedItem(kwsBiteGun);
+        this->GiveNamedItem(kwsParasiteGun);
+        this->GiveNamedItem(kwsLeap);
+        this->GiveNamedItem(kwsDivineWind);
+        this->SwitchWeapon(kwsBiteGun);
+        break;
+        
+    case AVH_USER3_ALIEN_PLAYER2:
+        this->DestroyAllItems(FALSE);
+        this->GiveNamedItem(kwsHealingSpray);
+        this->GiveNamedItem(kwsSpitGun);
+        this->GiveNamedItem(kwsBileBombGun);
+        this->GiveNamedItem(kwsWebSpinner);
+        this->SwitchWeapon(kwsSpitGun);
+        break;
+        
+    case AVH_USER3_ALIEN_PLAYER3:
+        this->DestroyAllItems(FALSE);
+        this->GiveNamedItem(kwsBite2Gun);
+        //this->GiveNamedItem(kwsSpikeGun);
+        this->GiveNamedItem(kwsSporeGun);
+        this->GiveNamedItem(kwsUmbraGun);
+        this->GiveNamedItem(kwsPrimalScream);
+        this->SwitchWeapon(kwsBite2Gun);
+        break;
+        
+    case AVH_USER3_ALIEN_PLAYER4:
+        this->DestroyAllItems(FALSE);
+        this->GiveNamedItem(kwsSwipe);
+        this->GiveNamedItem(kwsBlinkGun);
+        this->GiveNamedItem(kwsAcidRocketGun);
+        this->GiveNamedItem(kwsMetabolize);
+        this->SwitchWeapon(kwsSwipe);
+        break;
+        
+    case AVH_USER3_ALIEN_PLAYER5:
+        this->DestroyAllItems(FALSE);
+        this->GiveNamedItem(kwsClaws);
+        this->GiveNamedItem(kwsDevour);
+        this->GiveNamedItem(kwsStomp);
+        this->GiveNamedItem(kwsCharge);
+        this->SwitchWeapon(kwsClaws);
+        break;
+        
+    case AVH_USER3_ALIEN_EMBRYO:
+        this->DestroyAllItems(FALSE);
+        break;
+    }
+}
+
+
+void AvHPlayer::SetSizeForUser3()
+{
+    AvHUser3 theUser3 = (AvHUser3)this->pev->iuser3;
+    Vector theMinSize;
+    Vector theMaxSize;
+
+    // Use our previous User3 if we're back in the ready room after a game
+    if(this->GetPlayMode() == PLAYMODE_READYROOM)
+    {
+        if(this->mPreviousUser3 != AVH_USER3_NONE)
+        {
+            theUser3 = this->mPreviousUser3;
+        }
+    }
+
+    this->GetSize(theMinSize, theMaxSize);
+
+    UTIL_SetSize(this->pev, theMinSize, theMaxSize);
+    UTIL_SetOrigin(this->pev, this->pev->origin );
+}
+
+void AvHPlayer::GetViewForUser3(AvHUser3 inUser3, bool inIsDucking, float& outFOV, float& outOffset) const
+{
+
+    switch(inUser3)
+    {
+    case AVH_USER3_NONE:
+    case AVH_USER3_MARINE_PLAYER:
+    case AVH_USER3_COMMANDER_PLAYER:
+    case AVH_USER3_ALIEN_PLAYER4:
+    default:
+        outFOV    = 90;
+        outOffset = inIsDucking ? kDuckingViewHeightPercentage*HULL1_MAXZ: kStandingViewHeightPercentage*HULL0_MAXZ;
+        break;
+
+    case AVH_USER3_ALIEN_PLAYER1:
+        outFOV    = 105;
+        outOffset =  0;
+        break;
+        
+    case AVH_USER3_ALIEN_EMBRYO:
+    case AVH_USER3_ALIEN_PLAYER2:
+        outFOV    = 100;
+        outOffset = 10;
+        break;
+        
+    case AVH_USER3_ALIEN_PLAYER3:
+        outFOV = 90;
+        outOffset = 10;
+        break;
+
+    case AVH_USER3_ALIEN_PLAYER5:
+        outFOV = 90;
+        outOffset = inIsDucking ? kDuckingViewHeightPercentage*HULL0_MAXZ: kStandingViewHeightPercentage*HULL3_MAXZ;
+        break;
+        
+    }
+
+}
+
+void AvHPlayer::SetViewForUser3()
+{
+    
+    AvHUser3 theEndUser3 = this->GetUser3(true);
+    bool theIsDucking = FBitSet(this->pev->flags, FL_DUCKING);
+
+    if (theEndUser3 == AVH_USER3_ALIEN_EMBRYO)
+    {
+    
+        bool theEndIsDucking = true;
+
+        switch(GetEvolution(true))
+        {
+        case ALIEN_LIFEFORM_ONE:
+            theEndUser3 = AVH_USER3_ALIEN_PLAYER1;
+            break;
+        case ALIEN_LIFEFORM_TWO:
+            theEndUser3 = AVH_USER3_ALIEN_PLAYER2;
+            break;
+        case ALIEN_LIFEFORM_THREE:
+            theEndUser3 = AVH_USER3_ALIEN_PLAYER3;
+            break;
+        case ALIEN_LIFEFORM_FOUR:
+            theEndUser3 = AVH_USER3_ALIEN_PLAYER4;
+            break;
+        case ALIEN_LIFEFORM_FIVE:
+            theEndUser3 = AVH_USER3_ALIEN_PLAYER5;
+            break;
+        default:
+            // For upgrades.
+            theEndUser3 = GetPreviousUser3(true);
+            break;
+        }
+        
+        // Linearly interpolate between the previous lifeform and the new lifeform.
+
+        float theStartFOV;
+        float theStartOffset;
+    
+        float theEndFOV;
+        float theEndOffset;
+
+        float amount = pev->fuser3 / kNormalizationNetworkFactor;
+        
+        AvHUser3 theStartUser3 = GetPreviousUser3(true);
+
+        GetViewForUser3(theStartUser3, theIsDucking, theStartFOV, theStartOffset);
+        GetViewForUser3(theEndUser3, true, theEndFOV, theEndOffset);
+
+        // Take into account that the origin will change for the offset.
+
+        Vector theStartMinSize;
+        Vector theStartMaxSize;
+
+        AvHSHUGetSizeForPlayerUser3(this->GetUser3(true), theStartMinSize, theStartMaxSize, theIsDucking);
+
+        Vector theEndMinSize;
+        Vector theEndMaxSize;
+
+        AvHSHUGetSizeForPlayerUser3(theEndUser3, theEndMinSize, theEndMaxSize, true);
+        theEndOffset += theStartMinSize.z - theEndMinSize.z;
+
+        pev->fov         = theStartFOV + amount * (theEndFOV - theStartFOV);
+        pev->view_ofs[2] = theStartOffset + amount * (theEndOffset - theStartOffset);
+
+    }
+    else
+    {
+        GetViewForUser3(theEndUser3, theIsDucking, pev->fov, pev->view_ofs[2]);
+    }
+
+
+
+}
+
+bool AvHPlayer::SendMessage(const char *pMessage, bool inIsToolTip)
+{
+    bool theSuccess = false;
+
+    int theNumChars = strlen(pMessage);
+    if((theNumChars > 0) && (theNumChars < kMaxPlayerSendMessageLength))
+    {
+        string theMessage(pMessage);
+        if(theMessage != this->mLastMessageSent)
+        {
+            UTIL_ShowMessage2(pMessage, this, inIsToolTip);
+            
+            this->mLastMessageSent = theMessage;
+            
+            theSuccess = true;
+        }
+        else
+        {
+            int a = 0;
+        }
+    }
+//  else
+//  {
+//      // Log error to console
+//      char theErrorMessage[10000];
+//      sprintf(theErrorMessage, "Can't send message \"%s\" of length %d, max size is %d", pMessage, theNumChars, kMaxPlayerSendMessageLength);
+//      ALERT(at_logged, theErrorMessage);
+//  }
+    
+    return theSuccess;
+}
+
+bool AvHPlayer::SendMessageOnce(const char *pMessage, bool inIsToolTip)
+{
+    bool theSentMessage = false;
+
+    string theMessage(pMessage);
+
+    // Check if message is in sent list
+    StringList::iterator theIter = std::find(this->mSentMessageList.begin(), this->mSentMessageList.end(), theMessage);
+    if(theIter == this->mSentMessageList.end())
+    {
+        // If not
+        // Call SendMessage
+        theSentMessage = this->SendMessage(pMessage, inIsToolTip);
+
+        this->mLastMessageSent = theMessage;
+
+        // Add message to list
+        this->mSentMessageList.push_back(theMessage);
+    }
+
+    return theSentMessage;
+}
+
+bool AvHPlayer::SendMessageNextThink(const char* pMessage)
+{
+    this->mQueuedThinkMessage = string(pMessage);
+    return true;
+}
+
+void AvHPlayer::SetCurrentCommand(const struct usercmd_s* inCommand)
+{
+    memcpy(&this->mCurrentCommand, inCommand, sizeof(*inCommand));
+}
+
+void AvHPlayer::SetDebugCSP(weapon_data_t* inWeaponData)
+{
+    CBasePlayerWeapon* theCurrentWeapon = dynamic_cast<CBasePlayerWeapon*>(this->m_pActiveItem);
+    if(theCurrentWeapon && (theCurrentWeapon->m_iId == inWeaponData->m_iId))
+    {
+        memcpy(&this->mDebugCSPInfo, inWeaponData, sizeof(weapon_data_t));
+    }
+}
+
+void AvHPlayer::StartObserver( Vector vecPosition, Vector vecViewAngle )
+{
+    Vector theFadeColor;
+    theFadeColor.x = 0;
+    theFadeColor.y = 0;
+    theFadeColor.z = 0;
+
+    UTIL_ScreenFade(this, theFadeColor, kTransitionFadeTime, 0.0f, 255, FFADE_IN);
+
+    CBasePlayer::StartObserver(vecPosition, vecViewAngle);
+}
+
+void AvHPlayer::ResetBehavior(bool inRemoveFromTeam)
+{
+    // remove observer mode if enabled
+    this->StopObserver();
+    
+    // Leave top down mode if in it
+    this->StopTopDownMode();
+    
+    // Stop digesting if you are
+    this->StopDigestion(false);
+
+    // Stop being digested
+    this->SetBeingDigestedMode(false);
+
+    // Reset room sounds
+    this->SetDesiredRoomType(0, true);
+    
+    // remove all equipment, but don't drop it (how to do this?)
+    this->DestroyAllItems(FALSE);
+
+    if(inRemoveFromTeam)
+    {
+        AvHTeam* theTeam = this->GetTeamPointer();
+        if(theTeam)
+        {
+            theTeam->RemovePlayer(this->entindex());
+        }
+
+        // Clear experience
+        this->mExperience = 0.0f;
+        this->mExperienceLevelsSpent = 0;
+        this->mCombatNodes.Clear();
+        this->mPurchasedCombatUpgrades.clear();
+        this->mGiveCombatUpgrades.clear();
+    }
+}
+
+void AvHPlayer::SetPlayMode(AvHPlayMode inPlayMode, bool inForceSpawn)
+{
+    if(this->pev->playerclass != inPlayMode || inForceSpawn)
+    {
+        bool theGoingToReadyRoom = (inPlayMode == PLAYMODE_READYROOM);
+
+#ifdef USE_UPP
+		//send signal before any state changes that occur in ResetBehavior below
+		switch(inPlayMode)
+		{
+		case PLAYMODE_OBSERVER:
+			UPP::reportPlayerChangingTeams(UPPUtil_GetPlayerInfo(this),TEAM_SPECT);
+			break;
+		case PLAYMODE_READYROOM:
+			UPP::reportPlayerChangingTeams(UPPUtil_GetPlayerInfo(this),TEAM_IND);
+			break;
+		}
+#endif
+
+        this->ResetBehavior(theGoingToReadyRoom);
+        
+        if(!theGoingToReadyRoom)
+        {
+            // Clear player
+            //this->Init();
+            this->ClearUserVariables();
+            this->pev->rendermode = kRenderNormal;
+            this->pev->renderfx = kRenderFxNone;
+            this->pev->renderamt = 0;
+        }
+
+        // Clear anim
+        this->m_szAnimExtention[0] = '\0';
+
+//      this->mUpgrades.clear();
+        
+        AvHTeamNumber theTeamNumber = AvHTeamNumber(this->pev->team);
+        AvHUser3 theUser3 = AVH_USER3_NONE;
+        bool theSetUser3 = false;
+        
+        string theMessage;
+
+        AvHTeam* theTeam = this->GetTeamPointer(false);
+        string theTeamName = kUndefinedTeam;
+
+        switch(inPlayMode)
+        {
+            // Initialize stuff
+        case PLAYMODE_UNDEFINED:
+            this->pev->iuser3 = AVH_USER3_NONE;
+            this->pev->playerclass = PLAYMODE_UNDEFINED;
+            this->pev->team = TEAM_IND;
+            respawn(this->pev, FALSE);
+            break;
+            
+        case PLAYMODE_READYROOM:
+            this->pev->playerclass = PLAYMODE_READYROOM;
+
+            if(theTeam)
+            {
+                theTeam->RemovePlayer(this->entindex());
+            }
+
+            this->pev->frags = 0;
+            this->mScore = 0;
+            this->mSavedCombatFrags = 0;
+            this->m_iDeaths = 0;
+            this->pev->team = TEAM_IND;
+
+            // So we don't have the sideways camera because we're dead
+            this->pev->health = 100;
+            this->pev->max_health = pev->health;
+            this->pev->armorvalue = 0;
+            
+            respawn(this->pev, FALSE);
+
+            if(this->pev->iuser3 == AVH_USER3_ALIEN_EMBRYO)
+            {
+                // Stop sound and allow movement, else we're stuck in the ready room
+                UTIL_EmitAmbientSound(ENT(this->pev), this->pev->origin, kGestationSound, 1.0f, .5, SND_STOP, 100);
+                SetUpgradeMask(&this->pev->iuser4, MASK_ALIEN_EMBRYO, false);
+            }
+            // Else "commander" draws on the scoreboard and it doesn't make sense to have a commander on the ground
+            else if(this->pev->iuser3 == AVH_USER3_COMMANDER_PLAYER)
+            {
+                this->pev->iuser3 = AVH_USER3_MARINE_PLAYER;
+            }
+            //else if(this->pev->iuser3 == AVH_USER3_ALIEN_PLAYER5)
+            //{
+            //  // Set player ducking to improve chances of them not getting stuck
+            //  SetBits( m_afPhysicsFlags, PFLAG_DUCKING );
+            //  SetBits( this->pev->flags, FL_DUCKING );
+            //  this->pev->origin.z += 25;
+            //}
+
+            theMessage = kReadyRoomMessage;
+            theTeamName = kUndefinedTeam;
+            break;
+
+        case PLAYMODE_PLAYING:
+            // Don't set playmode if we couldn't respawn
+            this->pev->playerclass = PLAYMODE_PLAYING;
+
+            //respawn(this->pev, FALSE);
+            
+            // Account for both sides, or to let player choose it somehow
+            if(this->GetClassType() == AVH_CLASS_TYPE_MARINE)
+            {
+                theUser3 = AVH_USER3_MARINE_PLAYER;
+            }
+            else
+            {
+                theUser3 = AVH_USER3_ALIEN_PLAYER1; // TEMPORARY
+
+                // In combat mode, spawn player in as most advanced lifeform so player doesn't get stuck.
+                if(GetGameRules()->GetIsCombatMode() && !GetGameRules()->GetIsHamboneMode())
+                {
+                    // Find the most advanced lifeform
+                    for(MessageIDListType::const_iterator theIter = this->mGiveCombatUpgrades.begin(); theIter != this->mGiveCombatUpgrades.end(); theIter++)
+                    {
+                        AvHMessageID theCurrentCombatUpgrade = *theIter;
+                        switch(theCurrentCombatUpgrade)
+                        {
+                        case ALIEN_LIFEFORM_TWO:
+                            theUser3 = AVH_USER3_ALIEN_PLAYER2;
+                            break;
+                        case ALIEN_LIFEFORM_THREE:
+                            theUser3 = AVH_USER3_ALIEN_PLAYER3;
+                            break;
+                        case ALIEN_LIFEFORM_FOUR:
+                            theUser3 = AVH_USER3_ALIEN_PLAYER4;
+                            break;
+                        case ALIEN_LIFEFORM_FIVE:
+                            theUser3 = AVH_USER3_ALIEN_PLAYER5;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            this->SetUser3(theUser3, true, false);
+
+            respawn(this->pev, FALSE);
+
+            this->SetWeaponsForUser3();
+
+            // In combat mode, add all player upgrades
+            if(GetGameRules()->GetIsCombatMode())
+            {
+                if(GetGameRules()->GetIsHamboneMode())
+                {
+                    // Reset tech nodes
+                    this->mGiveCombatUpgrades.clear();
+                    this->mCombatNodes = this->GetTeamPointer()->GetTechNodes();
+                    this->mExperienceLevelsSpent = 0;
+                }
+                else if(!GetGameRules()->GetIsIronMan())
+                {
+                    // Respend upgrades
+                    this->GiveCombatUpgradesOnSpawn();
+                }
+            }
+
+            theTeam = this->GetTeamPointer();
+            theTeamName = (theTeam ? theTeam->GetTeamName() : kUndefinedTeam);
+
+            this->mLastTimeStartedPlaying = gpGlobals->time;
+            this->mHasLeftReadyRoom = true;
+            break;
+
+        case PLAYMODE_AWAITINGREINFORCEMENT:
+            //this->mRole = AVH_USER3_NONE;
+            // Preserve team, we could be brought back in
+            this->pev->team = theTeamNumber;
+            this->pev->playerclass = PLAYMODE_AWAITINGREINFORCEMENT;
+
+            theTeam = this->GetTeamPointer();
+            theTeamName = (theTeam ? theTeam->GetTeamName() : kUndefinedTeam);
+
+            this->StartObservingIfNotAlready();
+            
+            theTeam = this->GetTeamPointer();
+            theTeamName = (theTeam ? theTeam->GetTeamName() : kUndefinedTeam);
+            theMessage = kReinforcementMessage;
+            this->mHasLeftReadyRoom = true;
+            break;
+
+        case PLAYMODE_REINFORCING:
+            this->pev->team = theTeamNumber;
+            this->pev->playerclass = PLAYMODE_REINFORCING;
+
+            theTeam = this->GetTeamPointer();
+            theTeamName = (theTeam ? theTeam->GetTeamName() : kUndefinedTeam);
+            
+            this->StartObservingIfNotAlready();
+
+            this->SendMessage(kReinforcingMessage, true);
+            this->mHasLeftReadyRoom = true;
+            break;
+
+        case PLAYMODE_OBSERVER:
+
+			if(theTeam)
+            {
+                theTeam->RemovePlayer(this->entindex());
+            }
+
+            // Set observer mode
+            this->StartObservingIfNotAlready();
+
+            // Set current team to indeterminate; we aren't allowed to join from spectating
+            this->pev->team = TEAM_IND;
+            this->pev->playerclass = PLAYMODE_OBSERVER;
+
+            // Remember that we have spectated
+            this->mHasBeenSpectator = true;
+            theMessage = kObserverMessage;
+            theTeamName = kSpectatorTeam;
+            this->mHasLeftReadyRoom = true;
+
+            this->SetHasSeenTeam(TEAM_ONE);
+            this->SetHasSeenTeam(TEAM_TWO);
+            break;
+
+		case PLAYMODE_REINFORCINGCOMPLETE:
+			this->pev->playerclass = PLAYMODE_REINFORCINGCOMPLETE;
+			this->SendMessage(kReinforcementComplete, false);
+			break;
+        }
+
+        // Force reset of entities because we just respawned
+        //this->ResetPlayerPVS();
+
+        // Inform gamerules of the change
+        GetGameRules()->ChangePlayerTeam(this, theTeamName.c_str(), false, false); 
+        if(theTeam)
+        {
+            this->SetHasSeenTeam(theTeam->GetTeamNumber());
+        }
+
+        // Inform scoreboard
+        this->EffectivePlayerClassChanged();
+        
+        if(theMessage != "")
+        {
+            // Send instructions to player
+            this->SendMessageNextThink(theMessage.c_str());
+        }
+    }
+}
+
+void AvHPlayer::GetNewOrigin(AvHUser3 inNewUser3, bool inCheckDucking, vec3_t& outOrigin) const
+{
+
+    vec3_t theOldMinSize;
+    vec3_t theOldMaxSize;
+
+    GetSize(theOldMinSize, theOldMaxSize);
+      
+    vec3_t theNewMinSize;
+    vec3_t theNewMaxSize;
+    
+    AvHSHUGetSizeForPlayerUser3(inNewUser3, theNewMinSize, theNewMaxSize, inCheckDucking);
+    
+    VectorCopy(pev->origin, outOrigin);
+    outOrigin[2] += theOldMinSize.z - theNewMinSize.z;
+
+}
+
+void AvHPlayer::SetUser3(AvHUser3 inUser3, bool inForceChange, bool inGiveWeapons) 
+{
+    if((inUser3 != this->pev->iuser3) || inForceChange)
+    {
+
+        // Make us duck so that it's easier to gestate in small areas.
+
+        if(AvHMUGetCanDuck(this->pev->iuser3))
+        {
+            
+            SetBits(this->pev->flags, FL_DUCKING);
+            SetBits( m_afPhysicsFlags, PFLAG_DUCKING );
+
+            // Important or the animations will get screwed up!
+
+            m_Activity = ACT_RESET;
+            SetAnimation( PLAYER_IDLE );
+
+        }
+
+        bool theIsDucking = FBitSet(this->pev->flags, FL_DUCKING);
+
+        // Save off the current size of the player so that we can adjust the
+        // origin later.
+
+        Vector theOldMinSize;
+        Vector theOldMaxSize;
+        
+        this->GetSize(theOldMinSize, theOldMaxSize);
+
+        vec3_t theNewOrigin;
+        GetNewOrigin(inUser3, true, theNewOrigin);
+
+        this->mPreviousUser3 = (AvHUser3)this->pev->iuser3;
+
+        // Leave old User3
+        switch(this->mPreviousUser3)
+        {
+        case AVH_USER3_MARINE_PLAYER:
+            break;
+        case AVH_USER3_ALIEN_PLAYER5:
+            this->StopDigestion(false);
+            break;
+        case AVH_USER3_COMMANDER_PLAYER:
+            this->StopTopDownMode();
+            break;
+        }
+
+        string theMessage;
+        
+        this->pev->iuser3 = inUser3;
+
+        // Drop inventory, clear abilities
+        //this->DestroyAllItems(FALSE);
+
+        bool theSavedAlienSightActive = this->mAlienSightActive;
+
+        this->ClearRoleAbilities();
+            
+        int theSavedUser4 = this->pev->iuser4;
+        bool theSavedIsSpectator = this->GetIsSpectator();
+
+        float theJetpackEnergy = mSavedJetpackEnergy;
+        mSavedJetpackEnergy = this->pev->fuser3;
+
+        this->ClearUserVariables();
+
+        switch(inUser3)
+        {
+        case AVH_USER3_NONE:
+            this->pev->team = TEAM_IND;
+            break;
+            
+        case AVH_USER3_MARINE_PLAYER:
+            this->pev->iuser3 = inUser3;
+            theMessage = kSoldierMessage;
+            this->pev->movetype = MOVETYPE_WALK;
+            break;
+        case AVH_USER3_COMMANDER_PLAYER:
+            this->pev->iuser3 = inUser3;
+            this->StartTopDownMode();
+            theMessage = kCommanderMessage;
+            break;
+
+        // NOTE: When moving weapons/abilities around, be sure to change AvHBasePlayerWeapon::GetAnimationExtension() also
+        case AVH_USER3_ALIEN_PLAYER1:
+            this->pev->iuser3 = inUser3;
+            this->pev->fuser3 = 1.0f*kNormalizationNetworkFactor;
+            break;
+            
+        case AVH_USER3_ALIEN_PLAYER2:
+            this->pev->iuser3 = inUser3;
+            this->pev->fuser3 = 1.0f*kNormalizationNetworkFactor;
+            break;
+        
+        case AVH_USER3_ALIEN_PLAYER3:
+            this->pev->iuser3 = inUser3;
+            this->pev->fuser3 = 1.0f*kNormalizationNetworkFactor;
+            break;
+        
+        case AVH_USER3_ALIEN_PLAYER4:
+            this->pev->iuser3 = inUser3;
+            this->pev->fuser3 = 1.0f*kNormalizationNetworkFactor;
+            break;
+            
+        case AVH_USER3_ALIEN_PLAYER5:
+            this->pev->iuser3 = inUser3;
+            this->pev->fuser3 = 1.0f*kNormalizationNetworkFactor;
+            this->mLastGallopViewDirection = gpGlobals->v_forward;
+            break;
+        
+        case AVH_USER3_ALIEN_EMBRYO:
+            this->pev->iuser3 = inUser3;
+            this->pev->iuser4 |= MASK_ALIEN_EMBRYO;
+            theMessage = kGestationMessage;
+            break;
+        }
+        
+        // Preserve upgrades on a role change
+        this->pev->iuser4 |= theSavedUser4;
+
+        // All players are selectable
+        this->pev->iuser4 |= MASK_SELECTABLE;
+
+        // Get team-wide upgrades
+        AvHTeam* theTeamPointer = this->GetTeamPointer();
+        if(theTeamPointer)
+        {
+            this->pev->iuser4 |= theTeamPointer->GetTeamWideUpgrades();
+        }
+
+        if(inGiveWeapons)
+        {
+            this->SetWeaponsForUser3();
+        }
+        
+        // Adjust the size for the new user3.
+
+        this->SetSizeForUser3();
+
+        // Adjust the origin of the player so that they are still on the ground.
+
+        //Vector theNewMinSize;
+        //Vector theNewMaxSize;
+        //this->GetSize(theNewMinSize, theNewMaxSize);
+        //this->pev->origin[2] += theOldMinSize.z - theNewMinSize.z;
+
+        if(this->mPreviousUser3 != AVH_USER3_COMMANDER_PLAYER)
+        {
+            UTIL_SetOrigin(this->pev, theNewOrigin);
+        }
+
+        this->SetViewForUser3();
+        this->SetMoveTypeForUser3();
+
+        if(theSavedIsSpectator)
+        {
+            this->SetIsSpectator();
+        }
+
+        if(this->pev->playerclass == PLAYMODE_AWAITINGREINFORCEMENT)
+        {
+            this->pev->playerclass = PLAYMODE_PLAYING;
+        }
+        
+        //this->SetModelFromState();
+        float theHealthPercentage = 1.0f;
+        float theArmorPercentage = 1.0f;
+        if((this->mPreviousUser3 != AVH_USER3_NONE) /*&& (inUser3 != AVH_USER3_ALIEN_EMBRYO)*/)
+        {
+            theHealthPercentage = (float)this->pev->health/AvHPlayerUpgrade::GetMaxHealth(theSavedUser4, this->mPreviousUser3, this->GetExperienceLevel());
+            theArmorPercentage = (float)this->pev->armorvalue/AvHPlayerUpgrade::GetMaxArmorLevel(theSavedUser4, this->mPreviousUser3);
+        }
+
+        if (mPreviousUser3 == AVH_USER3_COMMANDER_PLAYER)
+        {
+            // Restore the jetpack energy from when the player went into the CC.
+            this->pev->fuser3 = theJetpackEnergy;
+        }
+
+        //char theInitializeMessage[128];
+        //sprintf(theInitializeMessage, "Initializing to user3: %d with health/armor percentages: %f/%f\n", inUser3, theHealthPercentage, theArmorPercentage);
+        //ClientPrint(this->pev, HUD_PRINTTALK, theInitializeMessage);
+
+        this->InitializeFromTeam(theHealthPercentage, theArmorPercentage);
+
+        this->SetModelFromState();
+
+        if(this->GetIsAlien())
+        {
+            this->mAlienSightActive = theSavedAlienSightActive;
+        }
+        else
+        {
+            this->mAlienSightActive = false;
+        }
+
+        // Update team
+        AvHTeam* theTeam = this->GetTeamPointer();
+        if(theTeam)
+        {
+            theTeam->ProcessRankChange(this, this->mPreviousUser3, this->GetUser3());
+        }
+
+        // Update scoreboard
+        this->EffectivePlayerClassChanged();
+        
+        if(theMessage != "")
+        {
+            // Send instructions to player
+            this->SendMessageOnce(theMessage.c_str(), true);
+        }
+		this->LogEmitRoleChange(); 
+    }
+}
+
+void AvHPlayer::SetResources(float inResources, bool inPlaySound)
+{
+    if(!GetGameRules()->GetIsCombatMode())
+    {
+        if(inResources < 0)
+        {
+            inResources = 0;
+        }
+
+        AvHTeam* theTeam = this->GetTeamPointer();
+        ASSERT(theTeam != NULL);
+
+        if(this->GetIsMarine())
+        {
+            if(inPlaySound)
+            {
+                this->PlayHUDSound(HUD_SOUND_MARINE_POINTS_RECEIVED);
+
+                AvHPlayer* theCommander = this->GetCommander();
+                if(theCommander)
+                {
+                    theCommander->PlayHUDSound(HUD_SOUND_MARINE_POINTS_RECEIVED);
+                }
+            }
+
+            theTeam->SetTeamResources(inResources);
+        }
+        else if(this->GetIsAlien())
+        {
+            if(inPlaySound)
+            {
+                this->PlayHUDSound(HUD_SOUND_ALIEN_POINTS_RECEIVED);
+            }
+
+            this->mResources = inResources;
+        }
+
+        this->InternalBoundResources();
+
+        if(this->GetIsAlien())
+        {
+            AvHServerPlayerData* theServerPlayerData = this->GetServerPlayerData();
+            if(theServerPlayerData)
+            {
+                theServerPlayerData->SetResources(this->mResources);
+            }
+        }
+    }
+}
+
+void AvHPlayer::Spawn( void )
+{
+    CBasePlayer::Spawn();
+    //this->PrecacheAndSetPlayerModel();
+    
+    pev->classname = MAKE_STRING(kAvHPlayerClassName);
+
+    this->mSendSpawnScreenFade = true;
+
+    if(this->pev->playerclass != PLAYMODE_READYROOM)
+    {
+        this->PlayRandomRoleSound(kPlayerLevelSpawnSoundList, CHAN_ITEM, this->GetAlienAdjustedEventVolume());
+    }
+
+    //SET_MODEL(ENT(pev), "models/headcrab.mdl");
+    //UTIL_SetSize(pev, Vector(-12, -12, 0), Vector(12, 12, 24));
+
+    SetTouch(&AvHPlayer::PlayerTouch);
+
+    // Stop spectating
+    this->pev->iuser1 = 0;
+}
+
+//bool AvHPlayer::SpawnReinforcements(void)
+//{
+//  bool            theSuccess = false;
+//  
+//  // Does player have the points to do this?
+//  // Check first if someone bought you early, if so, is that person trying to come back in?  Get him if possible.
+//  // For every player in the world
+//  edict_t* pent = FIND_ENTITY_BY_CLASSNAME(NULL, kAvHPlayerClassName);
+//  while (!FNullEnt(pent) && !theSuccess)
+//  {
+//      AvHPlayer* theFoundPlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(pent));
+//      if(theFoundPlayer)
+//      {
+//          // Get team for calling player
+//          AvHTeamNumber theTeamNumber = this->GetTeam();
+//          
+//          // Make sure the player is a valid choice for reinforcements (the right playmode, hasn't observed this game, etc)
+//          if(theFoundPlayer->GetIsValidReinforcementFor(theTeamNumber))
+//          {
+//              // Join the team if you can
+//              if(GetGameRules()->AttemptToJoinTeam(theFoundPlayer, theTeamNumber))
+//              {
+//                  theFoundPlayer->SetPlayMode(PLAYMODE_PLAYING);
+//                  //theFoundPlayer->StopObserver();
+//                  
+//                  //ClientPrint(theFoundPlayer->pev, HUD_PRINTTALK, "You were called in as reinforcements!");
+//                  theFoundPlayer->SendMessage(kYouReinforcement);
+//                  
+//                  // Decrement points of player issuing command
+//                  // Send new player a message indicating who sent for them
+//                  this->SendMessage(kYouCalledReinforcement);
+//                  
+//                  // Remember who bought you, next time you'll buy them if he exists
+//                  theSuccess = true;
+//              }
+//          }
+//      }
+//      pent = FIND_ENTITY_BY_CLASSNAME(pent, kAvHPlayerClassName);
+//  }
+//  return theSuccess;
+//}
+
+void AvHPlayer::StartObservingIfNotAlready(void)
+{
+    // Prevent this is the cvar is set
+    if ( allow_spectators.value )
+    {
+        //CBasePlayer *pPlayer = GetClassPtr((CBasePlayer *)pev);
+        if(!this->IsObserver())
+            //if(!pPlayer->IsObserver())
+        {
+            //if(this->mPlayMode == PLAYMODE_AWAITINGREINFORCEMENT)
+            //{
+            // TODO: Start observer mode in chase cam on friendlies
+            //}
+            //else
+            //{
+            edict_t *pentSpawnSpot = GetGameRules()->SelectSpawnPoint( this /*pPlayer*/ );
+            if(!FNullEnt(pentSpawnSpot))
+            {
+                this->StartObserver( VARS(pentSpawnSpot)->origin, VARS(pentSpawnSpot)->angles);
+            }
+            else
+            {
+                this->StartObserver( this->pev->origin, this->pev->angles);
+            }
+        }
+    }
+    else
+    {
+        this->ObserverModeIllegal();
+    }
+}
+
+bool AvHPlayer::SetBeingDigestedMode(bool inBeingDigested)
+{
+    bool theSuccess = false;
+    bool theIsDigesting = this->GetIsBeingDigested();
+
+    SetUpgradeMask(&this->pev->iuser4, MASK_DIGESTING, false);
+
+    if(inBeingDigested && !theIsDigesting)
+    {
+        // Fade player to black
+//      Vector theFadeColor;
+//      theFadeColor.x = 0;
+//      theFadeColor.y = 0;
+//      theFadeColor.z = 0;
+//      UTIL_ScreenFade(this, theFadeColor, .7f, 0.0f, 255, FFADE_OUT | FFADE_STAYOUT);
+        
+        this->HolsterCurrent();
+
+        this->pev->solid = SOLID_NOT;
+        this->pev->effects |= EF_NODRAW;
+        this->pev->takedamage = DAMAGE_NO;
+        
+        this->pev->movetype = MOVETYPE_FLY;
+        this->m_afPhysicsFlags |= PFLAG_OBSERVER;
+        
+        ClearBits( m_afPhysicsFlags, PFLAG_DUCKING );
+        ClearBits( this->pev->flags, FL_DUCKING );
+        VectorCopy(g_vecZero, this->pev->velocity);
+
+        theSuccess = true;
+    }
+    else if(!inBeingDigested && theIsDigesting)
+    {
+        // Fade player up from black
+        Vector theFadeColor;
+        theFadeColor.x = 0;
+        theFadeColor.y = 0;
+        theFadeColor.z = 0;
+        UTIL_ScreenFade(this, theFadeColor, 1.0f, 0.0f, 255, FFADE_IN);
+        this->SetDesiredRoomType(0);
+        
+        this->DeployCurrent();
+
+        // Set physics
+        this->pev->solid = SOLID_SLIDEBOX;
+        this->pev->effects &= ~EF_NODRAW;
+        this->pev->takedamage = DAMAGE_YES;
+        
+        this->pev->movetype = MOVETYPE_WALK;
+        ClearBits(this->m_afPhysicsFlags, PFLAG_OBSERVER);
+
+        // Set player ducking to improve chances of them not getting stuck
+        SetBits( m_afPhysicsFlags, PFLAG_DUCKING );
+        SetBits( this->pev->flags, FL_DUCKING );
+        
+        VectorCopy(g_vecZero, this->pev->velocity);
+        this->pev->fixangle = TRUE;
+
+        theSuccess = true;
+    }
+
+    if(theSuccess)
+    {
+        // Set digesting flag
+        SetUpgradeMask(&this->pev->iuser4, MASK_DIGESTING, inBeingDigested);
+        this->EffectivePlayerClassChanged();
+    }
+
+    return theSuccess;
+}
+
+void AvHPlayer::StartTopDownMode()
+{
+    if(!this->mInTopDownMode && !this->GetCurrentWeaponCannotHolster())
+    {
+        Vector theFadeColor;
+        theFadeColor.x = 0;
+        theFadeColor.y = 0;
+        theFadeColor.z = 0;
+        UTIL_ScreenFade(this, theFadeColor, kTransitionFadeTime, 0.0f, 255, FFADE_IN);
+        
+        VectorCopy(this->pev->origin, this->mPositionBeforeTopDown);
+        VectorCopy(this->pev->angles, this->mAnglesBeforeTopDown);
+        VectorCopy(this->pev->v_angle, this->mViewAnglesBeforeTopDown);
+        VectorCopy(this->pev->view_ofs, this->mViewOfsBeforeTopDown);
+        this->mAnimExtensionBeforeTopDown = this->m_szAnimExtention;
+
+        this->HolsterCurrent();
+
+        this->mTimeStartedTopDown = gpGlobals->time;
+
+        this->mOverwatchEnabled = false;
+        SetUpgradeMask(&this->pev->iuser4, MASK_TOPDOWN);
+        this->m_afPhysicsFlags |= PFLAG_OBSERVER;
+        this->pev->effects |= EF_NODRAW;
+        this->pev->view_ofs = g_vecZero;
+        this->pev->gravity = 0;
+        
+        this->pev->solid = SOLID_NOT;
+        this->pev->takedamage = DAMAGE_NO;
+        
+        //this->pev->movetype = MOVETYPE_NOCLIP;
+        //this->pev->movetype = MOVETYPE_WALK;
+        this->pev->movetype = MOVETYPE_FLY;
+        this->m_afPhysicsFlags |= PFLAG_OBSERVER;
+
+        ClearBits( m_afPhysicsFlags, PFLAG_DUCKING );
+        ClearBits( this->pev->flags, FL_DUCKING );
+        //this->pev->deadflag = DEAD_RESPAWNABLE;
+        //this->pev->deadflag = DEAD_RESPAWNABLE;
+        //this->pev->velocity[0] = 0.0f;
+        //this->pev->velocity[1] = 0.0f;
+        //this->pev->velocity[2] = -1.0f;
+
+
+//      float theMinViewHeight, theMaxViewHeight;
+//      float theMinX, theMaxX;
+//      float theMinY, theMaxY;
+//      bool theDrawMapBG;
+//      GetGameRules()->GetMapExtents(theMinViewHeight, theMaxViewHeight, theMinX, theMinY, theMaxX, theMaxY, theDrawMapBG);
+
+        this->pev->origin.z = GetGameRules()->GetMapExtents().GetMaxViewHeight();
+
+        this->mInTopDownMode = true;
+
+        // Cheesy way to make sure player class change is sent to everyone
+        this->EffectivePlayerClassChanged();
+    }
+}
+
+bool AvHPlayer::GetHasLeftReadyRoom() const
+{
+    return this->mHasLeftReadyRoom;
+}
+
+bool AvHPlayer::GetHasJetpack() const
+{
+    return this->GetIsMarine() && GetHasUpgrade(this->pev->iuser4, MASK_UPGRADE_7);
+}
+
+bool AvHPlayer::GetHasHeavyArmor() const
+{
+    return this->GetIsMarine() && GetHasUpgrade(this->pev->iuser4, MASK_UPGRADE_13);
+}
+
+bool AvHPlayer::GetHasGivenOrder() const
+{
+    return this->mHasGivenOrder;
+}
+
+void AvHPlayer::SetHasGivenOrder(bool inState)
+{
+    this->mHasGivenOrder = inState;
+}
+
+float AvHPlayer::GetTimeStartedTopDown() const
+{
+    return this->mTimeStartedTopDown;
+}
+
+float AvHPlayer::GetTimeOfLastSignificantCommanderAction() const
+{
+    return this->mTimeOfLastSignificantCommanderAction;
+}
+
+bool AvHPlayer::GetHasAvailableUpgrades() const
+{
+    bool theHasPendingUpgrades = false;
+
+    AvHTeam* theTeamPointer = this->GetTeamPointer();
+    if(theTeamPointer)
+    {
+        AvHAlienUpgradeListType theUpgrades = theTeamPointer->GetAlienUpgrades();
+            
+        for(int i = ALIEN_UPGRADE_CATEGORY_INVALID + 1; i < ALIEN_UPGRADE_CATEGORY_MAX_PLUS_ONE; i++)
+        {
+            AvHAlienUpgradeCategory theCurrentCategory = AvHAlienUpgradeCategory(i);
+        
+            // Now make sure we have an unspent upgrade available
+            if(AvHGetHasFreeUpgradeCategory(theCurrentCategory, theUpgrades, this->pev->iuser4))
+            {
+                theHasPendingUpgrades = true;
+                break;
+            }
+        }
+    }
+    
+    return theHasPendingUpgrades;
+}
+
+
+bool AvHPlayer::GetHasPowerArmor() const
+{
+    return this->GetIsMarine() && GetHasUpgrade(this->pev->iuser4, MASK_UPGRADE_10);
+}
+
+int AvHPlayer::GetHull() const
+{
+    int theHull = AvHMUGetHull(true, this->pev->iuser3);
+
+    return theHull;
+}
+
+bool AvHPlayer::GetIsTemporarilyInvulnerable() const
+{
+    bool theIsInvulnerable = false;
+
+    if(GetGameRules()->GetIsCombatMode() && (this->GetPlayMode() == PLAYMODE_PLAYING))
+    {
+        if(this->mLastTimeStartedPlaying != -1)
+        {
+            float theInvulnerableTimeSeconds = 0.0f;
+
+            #ifdef DEBUG
+            theInvulnerableTimeSeconds = avh_spawninvulnerabletime.value;
+            #endif
+
+            if(gpGlobals->time < (this->mLastTimeStartedPlaying + theInvulnerableTimeSeconds))
+            {
+                theIsInvulnerable = true;
+            }
+        }
+    }
+    
+    if (mTimeOfLastRedeem != -1 && gpGlobals->time < mTimeOfLastRedeem + kRedeemInvulnerableTime)
+    {
+        theIsInvulnerable = true;
+    }
+
+    return theIsInvulnerable;
+}
+
+bool AvHPlayer::GetIsEnsnared() const
+{
+    return GetHasUpgrade(this->pev->iuser4, MASK_ENSNARED);
+}
+
+bool AvHPlayer::GetIsAbleToAct() const
+{
+    return !GetIsInTopDownMode() && !GetIsBeingDigested() && !GetIsEnsnared() && !GetIsStunned();
+}
+
+bool AvHPlayer::SetEnsnareState(bool inState)
+{
+    bool theSuccess = true;
+
+    if(inState)
+    {
+        // If too ensnared already, don't ensnare further
+        if(!this->GetIsEnsnared())
+        {
+            this->mTimeToBeUnensnared = gpGlobals->time;
+        }
+
+        if(!this->GetIsEnsnared() || ((this->mTimeToBeUnensnared + BALANCE_IVAR(kEnsnareTime) - gpGlobals->time) < BALANCE_IVAR(kMaxEnsnareTime)))
+        {
+            this->mLastTimeEnsnared = gpGlobals->time;
+            this->mTimeToBeUnensnared += BALANCE_IVAR(kEnsnareTime);
+        
+            // Player is defenseless
+            this->HolsterCurrent();
+
+            SetUpgradeMask(&this->pev->iuser4, MASK_ENSNARED);
+        }
+        else
+        {
+            theSuccess = false;
+        }
+    }
+    else
+    {
+        SetUpgradeMask(&this->pev->iuser4, MASK_ENSNARED, false);
+        this->mTimeToBeUnensnared = -1;
+        this->mLastTimeEnsnared = -1;
+
+        this->DeployCurrent();
+    }
+
+    return theSuccess;
+}
+
+bool AvHPlayer::GetIsStunned() const
+{
+    return GetHasUpgrade(this->pev->iuser4, MASK_PLAYER_STUNNED);
+}
+
+bool AvHPlayer::SetIsStunned(bool inState, float inTime)
+{
+    bool theSuccess = false;
+
+    // Only able to stun walking players (prevents weird problems with players on ladders, who are treated as flying 
+    if(inState && !this->GetIsStunned() && (this->pev->movetype == MOVETYPE_WALK))
+    {
+        SetUpgradeMask(&this->pev->iuser4, MASK_PLAYER_STUNNED);
+        this->mTimeToBeFreeToMove = gpGlobals->time + inTime;
+
+        Vector theFadeColor;
+        theFadeColor.x = 255;
+        theFadeColor.y = 255;
+        theFadeColor.z = 255;
+        float theFadeTime = .25f;
+        UTIL_ScreenFade(this, theFadeColor, theFadeTime, 0.0f, 128, FFADE_IN/* | FFADE_MODULATE*/);
+
+        theSuccess = true;
+
+        // Clear keys so they aren't held down
+        //this->ClearKeys();
+    }
+    else if(!inState && this->GetIsStunned())
+    {
+        SetUpgradeMask(&this->pev->iuser4, MASK_PLAYER_STUNNED, false);
+        this->mTimeToBeFreeToMove = -1;
+    }
+
+    return theSuccess;
+}
+
+bool AvHPlayer::GetIsCatalysted() const
+{
+    return this->GetIsMarine() && GetHasUpgrade(this->pev->iuser4, MASK_BUFFED);
+}
+
+void AvHPlayer::SetIsCatalysted(bool inState, float inTime)
+{
+    if(this->GetIsMarine())
+    {
+        if(inState && !this->GetIsCatalysted())
+        {
+            SetUpgradeMask(&this->pev->iuser4, MASK_BUFFED);
+            this->mTimeToEndCatalyst = gpGlobals->time + inTime;
+
+            // Trigger screen effect?
+        }
+        else
+        {
+            SetUpgradeMask(&this->pev->iuser4, MASK_BUFFED, false);
+            this->mTimeToEndCatalyst = -1;
+        }
+    }
+}
+
+bool AvHPlayer::Energize(float inEnergyAmount)
+{
+    bool theSuccess = false;
+
+    if(AvHMUGiveAlienEnergy(this->pev->fuser3, inEnergyAmount))
+    {
+        theSuccess = true;
+    }
+
+    return theSuccess;
+}
+
+bool AvHPlayer::Heal(float inAmount, bool inPlaySound)
+{
+    int theMaxHealth = AvHPlayerUpgrade::GetMaxHealth(this->pev->iuser4, (AvHUser3)this->pev->iuser3, this->GetExperienceLevel());
+    int theMaxArmor = AvHPlayerUpgrade::GetMaxArmorLevel(this->pev->iuser4, (AvHUser3)this->pev->iuser3);
+    bool theDidHeal = false;
+	float theAmount = inAmount;
+    
+    // If we aren't at full health, heal health
+	if(this->pev->health < theMaxHealth)
+	{
+		int theAmountToGive = theAmount;
+		theAmount -= (theMaxHealth - this->pev->health); //store relative amount compared to that necessary for complete heal
+		this->pev->health = min(theMaxHealth, this->pev->health + theAmountToGive);
+		theDidHeal = true;
+	}
+	else if(this->pev->armorvalue < theMaxArmor)
+    {
+        this->pev->armorvalue = min(theMaxArmor, this->pev->armorvalue + theAmount);
+        theDidHeal = true;
+    }
+    
+    // Play regen event
+    if(theDidHeal)
+    {
+        if(inPlaySound)
+        {
+            // Play regeneration event
+            PLAYBACK_EVENT_FULL(0, this->edict(), gRegenerationEventID, 0, this->pev->origin, (float *)&g_vecZero, this->GetAlienAdjustedEventVolume(), 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+        }
+    }
+    
+    return theDidHeal;
+}
+
+bool AvHPlayer::Regenerate(float inRegenerationAmount, bool inPlaySound)
+{
+    bool theDidRegenerate = this->Heal(inRegenerationAmount, inPlaySound);
+
+    if(theDidRegenerate)
+    {
+        this->mTimeOfLastRegeneration = gpGlobals->time;
+    }
+
+    return theDidRegenerate;
+}
+
+bool AvHPlayer::GetCanBeResupplied() const
+{
+    bool theCanBeResupplied = false;
+
+    const float theResupplyTime = BALANCE_FVAR(kResupplyTime);
+
+    if((this->mTimeOfLastResupply == 0) || (gpGlobals->time > (this->mTimeOfLastResupply + theResupplyTime)))
+    {
+        if(this->m_pActiveItem)
+        {
+            AvHBasePlayerWeapon* theBaseWeapon = dynamic_cast<AvHBasePlayerWeapon*>(this->m_pActiveItem->GetWeaponPtr());
+            if(theBaseWeapon && theBaseWeapon->CanHolster() && theBaseWeapon->GetCanBeResupplied())
+            {
+                theCanBeResupplied = true;
+            }
+        }
+
+        // If we don't have max health, or we need ammo
+        if(this->pev->health < this->pev->max_health)
+        {
+            theCanBeResupplied = true;
+        }
+    }
+
+    return theCanBeResupplied;
+}
+
+bool AvHPlayer::Resupply(bool inGiveHealth)
+{
+    bool theSuccess = false;
+
+    if(this->m_pActiveItem)
+    {
+        AvHBasePlayerWeapon* theBaseWeapon = dynamic_cast<AvHBasePlayerWeapon*>(this->m_pActiveItem->GetWeaponPtr());
+        if(theBaseWeapon && theBaseWeapon->Resupply())
+        {
+            theSuccess = true;
+        }
+
+        if(inGiveHealth)
+        {
+            if(AvHHealth::GiveHealth(this))
+            {
+                // Play event for each person helped
+                //PLAYBACK_EVENT_FULL(0, this->edict(), gPhaseInEventID, 0, this->pev->origin, (float *)&g_vecZero, 0.0, 0.0, 0, 0, 0, 0 );
+                theSuccess = true;
+            }
+        }
+        
+        this->mTimeOfLastResupply = gpGlobals->time;
+    }
+    
+    return theSuccess;
+}
+
+bool AvHPlayer::GetIsScreaming()
+{
+    return this->mIsScreaming;
+}
+
+void AvHPlayer::StartScreaming()
+{
+    this->mIsScreaming = true;
+    this->mTimeStartedScream = gpGlobals->time;
+}
+
+bool AvHPlayer::StopTopDownMode()
+{
+    bool theSuccess = false;
+
+    if(this->mInTopDownMode)
+    {
+        Vector theFadeColor;
+        theFadeColor.x = 0;
+        theFadeColor.y = 0;
+        theFadeColor.z = 0;
+        UTIL_ScreenFade(this, theFadeColor, kTransitionFadeTime, 0.0f, 255, FFADE_IN);
+        
+        this->DeployCurrent();
+        
+        this->mOverwatchEnabled = true;
+        this->pev->effects &= ~EF_NODRAW;
+        this->pev->view_ofs = g_vecZero;
+        SetUpgradeMask(&this->pev->iuser4, MASK_TOPDOWN, false);
+        
+        // TODO: Make sure original gravity is 1?
+        this->pev->gravity = 1;
+        
+        this->pev->solid = SOLID_SLIDEBOX;
+        this->pev->takedamage = DAMAGE_YES;
+        
+        //this->pev->movetype = MOVETYPE_NONE;
+        this->pev->movetype = MOVETYPE_WALK;
+        ClearBits(this->m_afPhysicsFlags, PFLAG_OBSERVER);
+        this->pev->deadflag = DEAD_NO;
+        
+        VectorCopy(this->mPositionBeforeTopDown, this->pev->origin);
+        VectorCopy(this->mAnglesBeforeTopDown, this->pev->angles);
+        VectorCopy(this->mViewAnglesBeforeTopDown, this->pev->v_angle);
+        VectorCopy(this->mViewOfsBeforeTopDown, this->pev->view_ofs);
+        strcpy(this->m_szAnimExtention, this->mAnimExtensionBeforeTopDown.c_str());
+
+        VectorCopy(g_vecZero, this->pev->velocity);
+        this->pev->fixangle = TRUE;
+        this->mInTopDownMode = false;
+        
+        AvHTeamNumber theStationTeamNumber = (AvHTeamNumber)this->pev->team;
+        const char* theTarget = (theStationTeamNumber == TEAM_ONE) ? kTargetCommandStationLogoutTeamOne : kTargetCommandStationLogoutTeamTwo;
+        FireTargets(theTarget, NULL, NULL, USE_TOGGLE, 0.0f);
+
+        this->mSelected.clear();
+
+        // Need to reset groups when logging out, so they are re-propagated when logging in after another potential commander (see AvHHud::ResetTopDownUI)
+        for(int i = 0; i < kNumHotkeyGroups; i++)
+        {
+            this->mClientGroupAlerts[i] = ALERT_NONE;
+
+            this->mClientGroups[i].clear();
+        }
+        
+        this->mClientSelectAllGroup.clear();
+
+        theSuccess = true;
+    }
+
+    return theSuccess;
+}
+
+void AvHPlayer::SetPendingCommand(char* inCommand)
+{
+    this->mPendingCommand = inCommand;
+}
+
+void AvHPlayer::TriggerFog(int inFogEntity, float inFogExpireTime)
+{
+    this->mCurrentFogEntity = inFogEntity;
+    this->mFogExpireTime = inFogExpireTime;
+
+    // Allows resetting of fog entity
+    if(inFogEntity > -1)
+    {
+        this->mTimeOfLastFogTrigger = gpGlobals->time;
+    }
+}
+
+void AvHPlayer::TriggerProgressBar(int inEntityID, int inParam)
+{
+    ASSERT(inEntityID >= 0);
+
+    this->mProgressBarEntityIndex = inEntityID;
+    this->mProgressBarParam = inParam;
+    this->mTimeProgressBarTriggered = gpGlobals->time;
+}
+
+float AvHPlayer::GetTimeOfLastTeleport() const
+{
+    return this->mTimeOfLastTeleport;
+}
+
+float AvHPlayer::GetTimeLastPlaying() const
+{
+    return this->mTimeLastPlaying;
+}
+
+
+bool AvHPlayer::HolsterWeaponToUse()
+{
+    bool theSuccess = false;
+
+    if(!this->GetCurrentWeaponCannotHolster())
+    {
+        this->HolsterCurrent();
+        
+        this->mTimeOfLastUse = gpGlobals->time;
+
+        theSuccess = true;
+    }
+    return theSuccess;
+}
+
+void AvHPlayer::SetTimeOfLastTeleport(float inTime)
+{
+    this->mTimeOfLastTeleport = inTime;
+}
+
+void AvHPlayer::BecomePod()
+{
+    //ASSERT(this->mRole != AVH_USER3_ALIEN_EMBRYO);
+    
+    this->HolsterCurrent();
+    
+    ClearBits(this->m_afPhysicsFlags, PFLAG_DUCKING);
+    ClearBits(this->pev->flags, FL_DUCKING);
+    
+    //EMIT_SOUND_DYN(ENT(this->pev), CHAN_VOICE, kGestationSound, 1, ATTN_NORM, 0, 100);
+
+	float flSilenceLevel = this->GetAlienAdjustedEventVolume();
+
+	if(flSilenceLevel > 0.0)
+		UTIL_EmitAmbientSound(ENT(this->pev), this->pev->origin, kGestationSound, flSilenceLevel, 2.0, 0, 100);
+}
+
+bool AvHPlayer::SwitchWeapon(const char* inString)
+{
+    bool theSuccess = false;
+
+    if(!this->GetIsEnsnared())
+    {
+        CBasePlayerWeapon* theCurrentWeapon;
+        
+        for (int i = 0 ; i < MAX_ITEM_TYPES ; i++ )
+        {
+            theCurrentWeapon = dynamic_cast<CBasePlayerWeapon*>(this->m_rgpPlayerItems[i]);
+            while( theCurrentWeapon )
+            {
+                if(FClassnameIs(theCurrentWeapon->pev, inString))
+                {
+                    // this weapon is from the same category. 
+                    if ( theCurrentWeapon->CanDeploy() )
+                    {
+                        theSuccess = CBasePlayer::SwitchWeapon( theCurrentWeapon );
+                    }
+                    break;
+                }
+                theCurrentWeapon = dynamic_cast<CBasePlayerWeapon*>(theCurrentWeapon->m_pNext);
+            }
+        }
+    }
+
+    return theSuccess;
+}
+
+//BOOL AvHPlayer::SwitchWeapon( CBasePlayerItem* inWeapon )
+//{
+//  CBasePlayerWeapon* theCurrentWeapon = dynamic_cast<CBasePlayerWeapon*>(this->m_pActiveItem);
+//  CBasePlayerItem* theWeapon = inWeapon;
+//  BOOL theSuccess = TRUE;
+//
+//  if(!inWeapon)
+//  {
+//      if(theCurrentWeapon)
+//      {
+//          theCurrentWeapon->RetireWeapon();
+//      }
+//      else
+//      {
+//          theSuccess = FALSE;
+//      }
+//  }
+//  else
+//  {
+//      CBasePlayer::SwitchWeapon(theWeapon);
+//  }
+//
+//  return theSuccess;
+//}
+
+
+void AvHPlayer:: TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType)
+{
+    if ( pev->takedamage && GetCanBeAffectedByEnemies())
+    {
+        m_LastHitGroup = ptr->iHitgroup;
+
+        // No locational damage in NS.
+
+        /*  
+        switch ( ptr->iHitgroup )
+        {
+        case HITGROUP_GENERIC:
+            break;
+        case HITGROUP_HEAD:
+            flDamage *= gSkillData.plrHead;
+            break;
+        case HITGROUP_CHEST:
+            flDamage *= gSkillData.plrChest;
+            break;
+        case HITGROUP_STOMACH:
+            flDamage *= gSkillData.plrStomach;
+            break;
+        case HITGROUP_LEFTARM:
+        case HITGROUP_RIGHTARM:
+            flDamage *= gSkillData.plrArm;
+            break;
+        case HITGROUP_LEFTLEG:
+        case HITGROUP_RIGHTLEG:
+            flDamage *= gSkillData.plrLeg;
+            break;
+        default:
+            break;
+        }
+        */
+
+        // Player's aren't affected by structural damage, so don't create blood
+        // if that's the damage type.
+
+        if (!(bitsDamageType & NS_DMG_STRUCTURAL))
+        {
+            SpawnBlood(ptr->vecEndPos, BloodColor(), flDamage);
+            TraceBleed( flDamage, vecDir, ptr, bitsDamageType );
+        }
+
+        AddMultiDamage( pevAttacker, this, flDamage, bitsDamageType );
+    
+    }
+}
+
+
+int AvHPlayer::TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType)
+{
+	//Even out the damage
+	//flDamage = ceil(flDamage);
+
+    int theReturnValue = 0;
+    
+    if(GetGameRules()->GetGameStarted() && !this->GetIsTemporarilyInvulnerable())
+    {
+        // Take into account handicap
+        if(!pevAttacker)
+        {
+            pevAttacker = pevInflictor;
+        }
+
+        if(!pevInflictor)
+        {
+            pevInflictor = pevAttacker;
+        }
+
+        AvHTeam* theTeam = GetGameRules()->GetTeam(AvHTeamNumber(pevAttacker->team));
+        if(theTeam)
+        {
+            float theHandicap = theTeam->GetHandicap();
+            flDamage *= theHandicap;
+        }
+        
+        if(GetGameRules()->GetIsCheatEnabled(kcHighDamage))
+        {
+            flDamage *= 10;
+        }
+        
+        if(bitsDamageType & NS_DMG_STRUCTURAL)
+        {
+            flDamage = 0.0f;
+        }
+
+        // Do half damage to the heavy armor of HA and Onos
+        if(bitsDamageType & NS_DMG_LIGHT)
+        {
+            if(this->GetHasHeavyArmor() || (this->pev->iuser3 == AVH_USER3_ALIEN_PLAYER5))
+            {
+                flDamage *= .5f;
+            }
+        }
+
+        // If we're metabolizing, convert the damage to energy
+//      if(this->GetIsMetabolizing())
+//      {
+//          const float theFactor = BALANCE_FVAR(kMetabolizeDamageEnergyFactor);
+//          float theEnergy = (flDamage/100.f)*theFactor;
+//          AvHMUGiveAlienEnergy(this->pev->fuser3, theEnergy);
+//
+//          if((this->mTimeOfLastMetabolizeEvent == -1) || (gpGlobals->time > (this->mTimeOfLastMetabolizeEvent + 1.0f)))
+//          {
+//              // Playback metabolize success event
+//              PLAYBACK_EVENT_FULL(0, this->edict(), gMetabolizeSuccessEventID, 0, this->pev->origin, (float *)&g_vecZero, this->GetAlienAdjustedEventVolume(), 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+//
+//              this->mTimeOfLastMetabolizeEvent = gpGlobals->time;;
+//          }
+//
+//          theReturnValue = 0;
+//      }
+//      else
+//      {
+            
+            theReturnValue = CBasePlayer::TakeDamage(pevInflictor, pevAttacker, flDamage, bitsDamageType);
+            if(theReturnValue > 0)
+            {
+                float theSlowDownFactor = .8f;
+                float theMaxHealth = AvHPlayerUpgrade::GetMaxHealth(this->pev->iuser4, (AvHUser3)this->pev->iuser3, this->GetExperienceLevel());
+                
+                if(flDamage > theMaxHealth/2.0f)
+                {
+                    this->PlayRandomRoleSound(kPlayerLevelWoundSoundList, CHAN_BODY, 1.0);
+                    theSlowDownFactor = .3f;
+                }
+                else if(flDamage >= theMaxHealth/5.0f)
+                {
+                    this->PlayRandomRoleSound(kPlayerLevelPainSoundList, CHAN_BODY, .8f);
+                    theSlowDownFactor = .5f;
+                }
+                
+                // Slow down when hit
+                //VectorScale(this->pev->velocity, theSlowDownFactor, this->pev->velocity);
+            
+                if(!pevAttacker || (this->pev->team != pevAttacker->team) && (pevAttacker->team != 0))
+                {
+                    GetGameRules()->TriggerAlert((AvHTeamNumber)this->pev->team, ALERT_PLAYER_ENGAGE, this->entindex());
+                }
+            
+                if(pevAttacker)
+                {
+                    CBasePlayer* inAttackingPlayer = dynamic_cast<CBasePlayer*>(CBaseEntity::Instance(ENT(pevAttacker)));
+                    const char* inWeaponName = STRING(pevInflictor->classname);
+                    if(inAttackingPlayer && inWeaponName)
+                    {
+                        this->LogPlayerAttackedPlayer(inAttackingPlayer, inWeaponName, flDamage);
+                    }
+                }
+            
+                bool theDrawDamage = (CVAR_GET_FLOAT(kvDrawDamage) > 0);
+                
+                #ifdef DEBUG
+                #ifndef AVH_EXTERNAL_BUILD
+                theDrawDamage = true;
+                #endif
+                #endif
+                
+                if(theDrawDamage)
+                {
+                    this->PlaybackNumericalEvent(kNumericalInfoHealthEvent, (int)(-flDamage));
+                }
+            
+                this->Uncloak();
+            }
+//      }
+    }
+
+    return theReturnValue;
+}
+
+void AvHPlayer::PlaybackNumericalEvent(int inEventID, int inNumber)
+{
+    Vector theMinSize;
+    Vector theMaxSize;
+    this->GetSize(theMinSize, theMaxSize);
+    
+    Vector theStartPos = this->pev->origin;
+    theStartPos.z += theMaxSize.z;
+    
+    // Draw for everyone (team = 0 after flDamage parameter)
+    AvHSUPlayNumericEvent(inNumber, this->edict(), theStartPos, 0, inEventID, this->pev->team);
+}
+
+
+//const char*   AvHPlayer::TeamID( void )
+//{
+//  AvHTeam* theTeam = this->GetTeamPointer();
+//  const char* theTeamName = (theTeam ? theTeam->GetTeamName() : kUndefinedTeam);
+//  //const char* theTeamName = this->GetPlayerModelKeyName();
+//  return theTeamName;
+//}
+
+void AvHPlayer::TurnOffOverwatch()
+{
+    this->mInOverwatch = false;
+    AvHBasePlayerWeapon* theWeapon = dynamic_cast<AvHBasePlayerWeapon*>(this->m_pActiveItem);
+    if(theWeapon)
+    {
+        theWeapon->SetOverwatchState(false);
+    }
+
+    //VectorCopy(this->mOverwatchFacing, this->pev->angles);
+    //this->pev->fixangle = TRUE;
+
+    //ASSERT(this->pev->iuser4 == AVH_USER4_OVERWATCH);
+    //this->pev->iuser4 &= ~MASK_MARINE_OVERWATCH;
+    this->pev->fuser1 = -1;
+    this->pev->fuser2 = -1;
+}
+
+void AvHPlayer::TurnOnOverwatch()
+{
+    this->mInOverwatch = true;
+    
+    // Remember facing when we entered overwatch
+    VectorCopy(this->pev->angles, this->mOverwatchFacing);
+    
+    // if so, set overwatch on, make sure to set the current weapon into overwatch
+    AvHBasePlayerWeapon* theWeapon = dynamic_cast<AvHBasePlayerWeapon*>(this->m_pActiveItem);
+    ASSERT(theWeapon);
+    theWeapon->SetOverwatchState(true);
+    
+    // Flip on overwatch, clear target, it will be acquired in think
+    this->mOverwatchTarget = -1;
+    this->pev->fuser1 = -1;
+    this->pev->fuser2 = -1;
+    //this->pev->iuser4 |= MASK_MARINE_OVERWATCH;
+}
+
+void AvHPlayer::TurnOverwatchTowardsTarget(CBaseEntity* theTarget)
+{
+    // TODO: Take gun offset into account with vecMid?
+    Vector vecMid = pev->origin + pev->view_ofs;
+    Vector vecMidEnemy = theTarget->BodyTarget( vecMid );
+    
+    // Right now just point at enemy
+    Vector vecDirToEnemy = vecMidEnemy - vecMid;
+    Vector vec = UTIL_VecToAngles(vecDirToEnemy);
+    
+    vec.x = -vec.x;
+    
+//  if (vec.y > 360)
+//      vec.y -= 360;
+//  
+//  if (vec.y < 0)
+//      vec.y += 360;
+    
+    VectorCopy(vec, this->pev->angles);
+    VectorCopy(vec, this->pev->v_angle);
+    this->pev->fixangle = TRUE;
+}
+
+bool AvHPlayer::RunClientScript(const string& inScriptName)
+{
+    // Returns false if client scripts aren't enabled
+    bool theSuccess = false;
+
+    this->mPendingClientScripts.push_back(inScriptName);
+    theSuccess = true;
+
+    return theSuccess;
+}
+
+void AvHPlayer::PrintWeaponListToClient(CBaseEntity *theAvHPlayer) {
+		char msg[1024];
+		sprintf(msg, "Weapons for %s:\n", this->GetPlayerName());	
+		ClientPrint(theAvHPlayer->pev, HUD_PRINTNOTIFY, msg);
+
+        for(int i = 0; i < MAX_ITEM_TYPES; i++)
+        {
+            AvHBasePlayerWeapon* theActiveWeapon = dynamic_cast<AvHBasePlayerWeapon*>(this->m_rgpPlayerItems[i]);
+            while(theActiveWeapon)
+            {
+                theActiveWeapon->PrintWeaponToClient(theAvHPlayer);
+
+                // Next weapon
+                theActiveWeapon = dynamic_cast<AvHBasePlayerWeapon*>(theActiveWeapon->m_pNext);
+            }
+        }
+}
+void AvHPlayer::UpdateInventoryEnabledState(int inNumActiveHives, bool inForceUpdate)
+{
+    // Have we not yet updated our weapons with this # of hives?
+    if((inNumActiveHives != this->mNumHives) || (inForceUpdate))
+    {
+        for(int i = 0; i < MAX_ITEM_TYPES; i++)
+        {
+            AvHBasePlayerWeapon* theActiveWeapon = dynamic_cast<AvHBasePlayerWeapon*>(this->m_rgpPlayerItems[i]);
+            while(theActiveWeapon)
+            {
+                theActiveWeapon->UpdateInventoryEnabledState(inNumActiveHives);
+
+                // Next weapon
+                theActiveWeapon = dynamic_cast<AvHBasePlayerWeapon*>(theActiveWeapon->m_pNext);
+            }
+        }
+    }
+
+    // Save # of hives we've last updated with
+    this->mNumHives = inNumActiveHives;
+}
+
+bool AvHPlayer::GetIsBeingDigested() const
+{
+    bool theIsBeingDigested = false;
+
+    if(GetHasUpgrade(this->pev->iuser4, MASK_DIGESTING))
+    {
+        if(this->pev->effects & EF_NODRAW)
+        {
+            theIsBeingDigested = true;
+        }
+    }
+
+    return theIsBeingDigested;
+}
+
+bool AvHPlayer::GetIsDigesting() const
+{
+    bool theIsDigesting = false;
+    
+    if(GetHasUpgrade(this->pev->iuser4, MASK_DIGESTING))
+    {
+        if(! (this->pev->effects & EF_NODRAW))
+        {
+            theIsDigesting = true;
+        }
+    }
+    
+    return theIsDigesting;
+}
+
+void AvHPlayer::UpdateAmbientSounds()
+{
+    AvHClassType theClassType = this->GetClassType();
+    if(theClassType == AVH_CLASS_TYPE_MARINE)
+    {
+    }
+    else if(theClassType == AVH_CLASS_TYPE_ALIEN)
+    {
+        // Get role
+        AvHUser3 theUser3 = this->GetUser3();
+        int theAlienLevel = theUser3 - AVH_USER3_COMMANDER_PLAYER;
+        int theVelocity = this->pev->velocity.Length();
+        bool theIsMoving = theVelocity > 100;
+        int theSilenceLevel = AvHGetAlienUpgradeLevel(this->pev->iuser4, MASK_UPGRADE_6);
+
+//      if(RANDOM_LONG(0, 40) == 0)
+//      {
+//          char theVelocityMsg[128];
+//          sprintf(theVelocityMsg, "alien moving at velocity: %d", theVelocity);
+//          ClientPrint(this->pev, HUD_PRINTTALK, theVelocityMsg);
+//      }
+
+        // if moving, check chance for playing moving sound
+        if(!this->GetIsCloaked() && !this->mIsScreaming /*&& !this->GetIsBlinking()*/)
+        {
+            float theSilenceVolumeFactor = this->GetAlienAdjustedEventVolume();
+
+            if(theIsMoving)
+            {
+                int theBaseSpeed, theMaxSpeed;
+                this->GetSpeeds(theBaseSpeed, theMaxSpeed);
+                
+                float theAlienSoundFreq = 0.003f;
+                float theChanceOfPlayingSound = theAlienSoundFreq*(theVelocity/((float)theMaxSpeed));
+                if(RANDOM_FLOAT(0, 1) < theChanceOfPlayingSound)
+                {
+                    float theVolume = RANDOM_FLOAT(.5, 1.0)*theSilenceVolumeFactor;
+                    if(theVolume > 0.01f)
+                    {
+                        this->PlayRandomRoleSound(kPlayerLevelMoveSoundList, CHAN_VOICE, theVolume);
+                    }
+                }
+            }
+            else
+            {
+                if(GetHasUpgrade(this->pev->iuser4, MASK_BUFFED))
+                {
+					float theSilenceVolumeFactor = this->GetAlienAdjustedEventVolume();
+
+                    // If player is part of primal scream, scream defiance!
+                    if(RANDOM_FLOAT(0, 1) < .02f && theSilenceVolumeFactor > 0.0)
+                    {
+                        EMIT_SOUND(this->edict(), CHAN_VOICE, kPrimalScreamResponseSound, theSilenceVolumeFactor, ATTN_NORM);
+                    }   
+                }
+                else
+                {
+                    bool theIsGestating = (this->GetUser3() == AVH_USER3_ALIEN_EMBRYO);
+                        
+                    // if idle, check chance for playing idle sound
+                    float theBaseChance = 0.0005f;
+                    if(theIsGestating)
+                    {
+                        theBaseChance *= 10;
+                    }
+                    
+                    if(RANDOM_FLOAT(0, 1) < theBaseChance)
+                    {
+                        float theVolume = RANDOM_FLOAT(.2, .4)*theSilenceVolumeFactor;
+                        if(theVolume > 0.01f)
+                        {
+                            if(theIsGestating)
+                            {
+                                EMIT_SOUND(this->edict(), CHAN_AUTO, kEggIdleSound, theVolume, ATTN_NORM);
+                            }
+                            else
+                            {
+                                this->PlayRandomRoleSound(kPlayerLevelIdleSoundList, CHAN_VOICE, theVolume);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    if(this->mDesiredRoomType != this->mClientDesiredRoomType)
+    {
+        MESSAGE_BEGIN( MSG_ONE, SVC_ROOMTYPE, NULL, this->pev);
+            WRITE_SHORT( (short)this->mDesiredRoomType);
+        MESSAGE_END();
+
+        this->mClientDesiredRoomType = this->mDesiredRoomType;
+    }
+}                                                                                            
+
+void AvHPlayer::UpdateAlienUI()
+{
+    AvHTeam* theTeamPointer = this->GetTeamPointer();
+    bool theIsMarine = false;
+    bool theIsAlien = false;
+
+    if(this->GetIsAlien())
+    {
+        theIsAlien = true;
+    }
+    else if(this->GetIsMarine())
+    {
+        theIsMarine = true;
+    }
+
+    // Update when going back to ready room, so check if not-marine instead of is-alien
+    if(!theIsMarine)
+    {
+        bool theCanRespawn = GetGameRules()->FPlayerCanRespawn(this);
+
+        AvHTeam* theTeamPointer = this->GetTeamPointer();
+        if(theTeamPointer)
+        {
+            AvHAlienUpgradeListType theUpgrades = theTeamPointer->GetAlienUpgrades();
+
+            int thePreSize = theUpgrades.size();
+            
+            // Trim max upgrades in each category
+            AvHRemoveIrrelevantUpgrades(theUpgrades);
+            
+            if(theUpgrades != this->mClientUpgrades)
+            {
+                MESSAGE_BEGIN(MSG_ONE, gmsgAlienInfo, NULL, this->pev);
+            
+                // 0 means upgrades, 1 means hive info
+                WRITE_BYTE(0);
+
+                int theNumUpgrades = theUpgrades.size();
+
+                //char theMessage[512];
+                //sprintf(theMessage, "AvHPlayer::UpdateAlienUI: Pre upgrades: %d, Post upgrades: %d\n", thePreSize, theNumUpgrades);
+                //UTIL_LogPrintf(theMessage);
+
+                // Write the upgrades
+                ASSERT(theNumUpgrades <= kNumAlienUpgrades);
+            
+                WRITE_BYTE(theNumUpgrades);
+            
+                int i;
+                for(i = 0; i < theNumUpgrades; i++)
+                {
+                    int theCurrentUpgrade = theUpgrades[i];
+                    WRITE_BYTE(theCurrentUpgrade);
+                }
+            
+                MESSAGE_END();
+                
+                this->mClientUpgrades = theUpgrades;
+            }
+
+            HiveInfoListType theTeamHiveInfo = theTeamPointer->GetHiveInfoList();
+            if(this->mClientHiveInfo != theTeamHiveInfo)
+            {
+                MESSAGE_BEGIN(MSG_ONE, gmsgAlienInfo, NULL, this->pev);
+                
+                // 0 means upgrades, 1 means hive info
+                WRITE_BYTE(1);
+            
+                // Write hive info
+                int theNumHives = theTeamHiveInfo.size();
+                WRITE_BYTE(theNumHives);
+            
+                HiveInfoListType::iterator theIterator;
+                int theIndex = 0;
+                for(theIterator = theTeamHiveInfo.begin(); theIterator != theTeamHiveInfo.end(); theIterator++, theIndex++)
+                {
+                    bool theHasChanged = true;
+                    if((signed)this->mClientHiveInfo.size() > theIndex)
+                    {
+                        if(this->mClientHiveInfo[theIndex] == theTeamHiveInfo[theIndex])
+                        {
+                            theHasChanged = false;
+                        }
+                    }
+            
+                    if(!theHasChanged)
+                    {
+                        WRITE_BYTE(0);
+                    }
+                    else
+                    {
+                        WRITE_BYTE(1);
+
+                        // Only write hive coords if client hasn't received them yet
+                        bool theSendHiveCoords = true;
+                        if((signed)this->mClientHiveInfo.size() > theIndex)
+                        {
+                            AvHHiveInfo& theClientHiveInfo = this->mClientHiveInfo[theIndex];
+                            if((theIterator->mPosX == theClientHiveInfo.mPosX) && (theIterator->mPosY == theClientHiveInfo.mPosY) || (theIterator->mPosZ == theClientHiveInfo.mPosZ))
+                            {
+                                theSendHiveCoords = false;
+                            }
+                        }
+                        WRITE_BYTE(theSendHiveCoords);
+
+                        if(theSendHiveCoords)
+                        {
+                            WRITE_COORD(theIterator->mPosX);
+                            WRITE_COORD(theIterator->mPosY);
+                            WRITE_COORD(theIterator->mPosZ);
+                        }
+            
+                        // Write hive info
+                        WRITE_BYTE(theIterator->mStatus);
+                        WRITE_BYTE(theIterator->mUnderAttack);
+                        WRITE_SHORT(theIterator->mTechnology);
+						
+						WRITE_BYTE(theIterator->mHealthPercentage);
+                    }
+                }
+            
+                this->mClientHiveInfo = theTeamHiveInfo;
+            
+                MESSAGE_END();
+            }
+        }
+    }
+}
+
+// TODO: Update this less frequently than every tick or optimize so most blips are in PVS so their positions don't have to be sent down
+void AvHPlayer::UpdateBlips()
+{
+    if(this->mEnemyBlips != this->mClientEnemyBlips)
+    {
+        // Send new blip update
+        MESSAGE_BEGIN(MSG_ONE_UNRELIABLE, gmsgBlipList, NULL, this->pev);
+
+        // Send byte indicating if enemy or friendly blips
+        WRITE_BYTE(0);
+
+        // Never send more then the size of a packet.  This could cause missing blips very large numbers of enemy blips, but I don't think this ever happens.
+        const int kMaxBlips = 25;
+
+        // Send number of enemy blips
+        int theNumBlips = min(this->mEnemyBlips.mNumBlips, kMaxBlips);
+        WRITE_BYTE(theNumBlips);
+        
+        // Send position and angle of each enemy blip
+        for(int i = 0; i < theNumBlips; i++)
+        {
+            WRITE_COORD(this->mEnemyBlips.mBlipPositions[i][0]);
+            WRITE_COORD(this->mEnemyBlips.mBlipPositions[i][1]);
+            WRITE_COORD(this->mEnemyBlips.mBlipPositions[i][2]);
+            int8 theStatus = this->mEnemyBlips.mBlipStatus[i];
+            WRITE_BYTE(theStatus);
+        }
+
+        MESSAGE_END();
+        
+        this->mClientEnemyBlips = this->mEnemyBlips;
+    }
+    
+    if(this->mFriendlyBlips != this->mClientFriendlyBlips)
+    {
+        MESSAGE_BEGIN(MSG_ONE_UNRELIABLE, gmsgBlipList, NULL, this->pev);
+
+        // Send byte indicating if enemy or friendly blips. 
+        WRITE_BYTE(1);
+        
+        // Send number of friendly blips (shouldn't ever be more then 16, but be safe)
+        const int kMaxBlips = 20;
+
+        int theNumBlips = min(this->mFriendlyBlips.mNumBlips, kMaxBlips);
+        WRITE_BYTE(theNumBlips);
+        
+        // Send position and angle of each friendly blip
+        for(int i = 0; i < theNumBlips; i++)
+        {
+            WRITE_COORD(this->mFriendlyBlips.mBlipPositions[i][0]);
+            WRITE_COORD(this->mFriendlyBlips.mBlipPositions[i][1]);
+            WRITE_COORD(this->mFriendlyBlips.mBlipPositions[i][2]);
+            
+            int8 theStatus = this->mFriendlyBlips.mBlipStatus[i];
+            WRITE_BYTE(theStatus);
+            
+            int8 theInfo = this->mFriendlyBlips.mBlipInfo[i];
+            WRITE_BYTE(theInfo);
+        }
+        
+        MESSAGE_END();
+
+        this->mClientFriendlyBlips = this->mFriendlyBlips;
+    }
+}
+
+bool AvHPlayer::GetSendBalanceData()
+{
+    bool theSendData = false;
+
+    #ifdef AVH_PLAYTEST_BUILD
+    theSendData = (this->GetAuthenticationMask() & PLAYERAUTH_DEVELOPER);
+    
+    #ifdef DEBUG
+    #ifndef AVH_EXTERNAL_BUILD
+    // Don't send data to bots for sanity while testing
+    if(!(this->pev->flags & FL_FAKECLIENT))
+    {
+        theSendData = true;
+    }
+    #endif
+    #endif
+    
+    #endif
+  
+    return theSendData;
+}
+
+void AvHPlayer::UpdateBalanceVariables()
+{
+    #ifdef AVH_PLAYTEST_BUILD
+    bool theSendData = this->GetSendBalanceData();
+    if(theSendData && mNextBalanceVarUpdate < gpGlobals->time)
+    {
+        bool theSentUpdate = false;
+
+        const BalanceIntListType& theBalanceInts = GetGameRules()->GetBalanceInts();
+        if(this->mClientBalanceInts != theBalanceInts)
+        {
+            // Send the first diff
+            for(BalanceIntListType::const_iterator theSourceIter = theBalanceInts.begin(); theSourceIter != theBalanceInts.end(); theSourceIter++)
+            {
+                const string& theString = theSourceIter->first;
+                int theValue = theSourceIter->second;
+        
+                // Look up value client has
+                bool theClientIsSame = false;
+        
+                for(BalanceIntListType::const_iterator theDestIter = this->mClientBalanceInts.begin(); theDestIter != this->mClientBalanceInts.end(); theDestIter++)
+                {
+                    if(theDestIter->first == theString)
+                    {
+                        if(theValue == theDestIter->second)
+                        {
+                            theClientIsSame = true;
+                        }
+                    }
+                }
+        
+                if(!theClientIsSame)
+                {
+                    MESSAGE_BEGIN(MSG_ONE, gmsgBalanceVar, NULL, this->edict());
+                        WRITE_STRING(theString.c_str());
+                        WRITE_BYTE(0);
+                        WRITE_LONG(theValue);
+                    MESSAGE_END();
+
+                    theSentUpdate = true;
+        
+                    this->mClientBalanceInts[theString] = theValue;
+                    
+                    // Only send one per iteration to avoid overflowing
+                    break;
+                }
+            }
+        }
+
+        if(!theSentUpdate)
+        {
+            const BalanceFloatListType& theBalanceFloats = GetGameRules()->GetBalanceFloats();
+            if(this->mClientBalanceFloats != theBalanceFloats)
+            {
+                // Send the first diff
+                for(BalanceFloatListType::const_iterator theSourceIter = theBalanceFloats.begin(); theSourceIter != theBalanceFloats.end(); theSourceIter++)
+                {
+                    const string& theString = theSourceIter->first;
+                    float theValue = theSourceIter->second;
+                    
+                    // Look up value client has
+                    bool theClientIsSame = false;
+                    
+                    for(BalanceFloatListType::const_iterator theDestIter = this->mClientBalanceFloats.begin(); theDestIter != this->mClientBalanceFloats.end(); theDestIter++)
+                    {
+                        if(theDestIter->first == theString)
+                        {
+                            if(theValue == theDestIter->second)
+                            {
+                                theClientIsSame = true;
+                            }
+                        }
+                    }
+                    
+                    if(!theClientIsSame)
+                    {
+                        MESSAGE_BEGIN(MSG_ONE, gmsgBalanceVar, NULL, this->edict());
+                            WRITE_STRING(theString.c_str());
+                            WRITE_BYTE(1);
+                            WRITE_LONG((int)(theValue*kNormalizationNetworkFactor));
+                        MESSAGE_END();
+                        
+                        theSentUpdate = true;
+                        
+                        this->mClientBalanceFloats[theString] = theValue;
+                        
+                        // Only send one per iteration to avoid overflowing
+                        break;
+                    }
+                }
+            }
+		}
+
+		//Prevent the damn overflows, only send 10 updates per second.
+		if(theSentUpdate)
+			mNextBalanceVarUpdate = gpGlobals->time + 0.1;
+	}
+    #endif
+}
+
+void AvHPlayer::UpdateClientData( void )
+{
+    if(GET_RUN_CODE(128))
+    {
+        //UTIL_LogPrintf("UpdateClientData starting.\n");
+        CBasePlayer::UpdateClientData();
+
+        // Update one-shot stuff
+        this->UpdateFirst();
+        this->UpdateParticleTemplates();
+        this->UpdateInfoLocations();
+        this->UpdateOrders();
+        this->UpdateVUser4();
+        this->UpdateProgressBar();
+        this->UpdateSetSelect();
+        this->UpdateTechNodes();
+        this->UpdateBalanceVariables();
+        this->UpdateSoundNames();
+        this->UpdateTopDownMode();
+        this->UpdateEntityHierarchy();
+        this->UpdateExperienceLevelsSpent();
+        this->UpdateSpawnScreenFade();
+        this->UpdateEffectiveClassAndTeam();
+        //this->UpdateArmor();
+        //this->UpdateOverwatch();
+        this->UpdatePendingClientScripts();
+        this->UpdateGamma();
+        this->UpdateBlips();
+        this->UpdateAlienUI();
+        this->UpdateFog();
+        //this->UpdateDebugCSP();
+    }
+    //UTIL_LogPrintf("UpdateClientData done.\n");
+}
+
+void AvHPlayer::UpdateEffectiveClassAndTeam()
+{
+    // Don't send too many messages when these get updated really quickly.  Too many messages are being sent on a game reset, and it's not needed.  We only need the most recent message.
+    const float kClassAndTeamUpdateRate = .4f;
+    if((this->mTimeOfLastClassAndTeamUpdate == -1) || (gpGlobals->time > (this->mTimeOfLastClassAndTeamUpdate + kClassAndTeamUpdateRate)))
+    {
+        if(this->mEffectivePlayerClassChanged)
+        {
+            int theAuthMask = this->GetAuthenticationMask();
+            int theTotalScore = this->mScore + this->pev->frags /*- this->m_iDeaths*/;
+            if(GetGameRules()->GetIsCombatMode())
+            {
+                int theCurrentLevel = AvHPlayerUpgrade::GetPlayerLevel(this->GetExperience());
+                theTotalScore += max((theCurrentLevel - 1), 0);
+            }
+
+            MESSAGE_BEGIN(MSG_ALL, gmsgScoreInfo);
+            WRITE_BYTE(ENTINDEX(edict()) );
+            WRITE_SHORT(theTotalScore);
+            WRITE_SHORT(this->pev->frags);
+            WRITE_SHORT(this->m_iDeaths);
+            WRITE_BYTE(this->GetEffectivePlayerClass());
+#ifdef USE_UPP
+			WRITE_SHORT(this->GetScoreboardIconNumber() | PLAYERAUTH_UPP_MODE);
+#else
+            WRITE_SHORT(theAuthMask);
+#endif
+            WRITE_SHORT(GetGameRules()->GetTeamIndex(this->TeamID()));
+#ifdef USE_UPP
+			WRITE_BYTE(this->GetScoreboardIconColor());
+#else
+			WRITE_STRING("0"); //Send a string so its easier for serverside mods to hook. (Otherwise they need to send it after the team ID is sent.)
+#endif
+            MESSAGE_END();
+            
+            this->mEffectivePlayerClassChanged = false;
+        }
+        
+        if(this->mNeedsTeamUpdate)
+        {
+            for (int i = 1; i <= gpGlobals->maxClients; i++ )
+            {
+                CBasePlayer *plr = (CBasePlayer*)UTIL_PlayerByIndex( i );
+                if ( plr && GetGameRules()->IsValidTeam( plr->TeamID() ) )
+                {
+                    MESSAGE_BEGIN( MSG_ONE, gmsgTeamInfo, NULL, this->edict() );
+                        WRITE_BYTE( plr->entindex() );
+                        WRITE_STRING( plr->TeamID() );
+                    MESSAGE_END();
+                }
+            }
+        
+            this->mNeedsTeamUpdate = false;
+        }
+        
+        if(this->mSendTeamUpdate)
+        {
+            // notify everyone's HUD of the team change
+            MESSAGE_BEGIN(MSG_ALL, gmsgTeamInfo);
+                WRITE_BYTE(this->entindex());
+                //WRITE_STRING( pPlayer->m_szTeamName );
+                WRITE_STRING(this->TeamID());
+            MESSAGE_END();
+        
+            this->mSendTeamUpdate = false;
+        }
+
+        this->mTimeOfLastClassAndTeamUpdate = gpGlobals->time;
+    }
+}
+
+
+//void AvHPlayer::UpgradeArmorLevel(void)
+//{
+//  if(this->mRole != AVH_USER3_COMMANDER_PLAYER)
+//  {
+//      if(this->mArmorLevel & ARMOR_MOTIONTRACK)
+//      {
+//          // We're fully upgraded, disable the node
+//          this->mNextArmorUpgradeLevel = MESSAGE_NULL;
+//      }
+//      else if(this->mArmorLevel & ARMOR_JETPACK)
+//      {
+//          this->mArmorLevel |= ARMOR_MOTIONTRACK;
+//          // We're fully upgraded, disable the node
+//          this->mOldArmorUpgradeLevel = BUY_ARMORMOTIONTRACKING;
+//          this->mNextArmorUpgradeLevel = MESSAGE_NULL;
+//          this->mNextArmorUpgradeName = kMenuArmorUpgradeFull;
+//          this->SendMessage(kReceiveMotionArmor);
+//      } 
+//      else if(this->mArmorLevel & ARMOR_LIFESUPPORT)
+//      {
+//          this->mArmorLevel |= ARMOR_JETPACK;
+//          this->mOldArmorUpgradeLevel = BUY_ARMORJETPACKS;
+//          this->mNextArmorUpgradeLevel = BUY_ARMORMOTIONTRACKING;
+//          this->mNextArmorUpgradeName = kMenuArmorUpgradeMotionTrack;
+//          this->pev->iuser3 = AVH_USER3_JETPACK;
+//          this->SendMessage(kReceiveJetpackArmor);
+//      }
+//      else if(this->mArmorLevel & ARMOR_HEAVY)
+//      {
+//          this->mArmorLevel |= ARMOR_LIFESUPPORT;
+//          this->mOldArmorUpgradeLevel = BUY_ARMORLIFESUPPORT;
+//          this->mNextArmorUpgradeLevel = BUY_ARMORJETPACKS;
+//          this->mNextArmorUpgradeName = kMenuArmorUpgradeJetpack;
+//          this->SendMessage(kReceiveLifeSupportArmor);
+//      }
+//      else if(this->mArmorLevel & ARMOR_BASE)
+//      {
+//          this->mArmorLevel |= ARMOR_HEAVY;
+//          this->mOldArmorUpgradeLevel = BUY_ARMORHEAVY;
+//          this->mNextArmorUpgradeLevel = BUY_ARMORLIFESUPPORT;
+//          this->mNextArmorUpgradeName = kMenuArmorUpgradeLifeSupport;
+//          this->SendMessage(kReceiveHeavyArmor);
+//      }
+//  }
+//}
+
+void AvHPlayer::UpdateFirst()
+{
+    if(this->mFirstUpdate)
+    {
+        //UTIL_LogPrintf("UpdateFirst\n");
+            
+        // Tell this player to reset
+        MESSAGE_BEGIN(MSG_ONE, gmsgGameStatus, NULL, this->pev);
+            int theStatus = (this->mNewMap ? kGameStatusResetNewMap : kGameStatusReset);
+            WRITE_BYTE(theStatus);
+            WRITE_BYTE(GetGameRules()->GetMapMode());
+        MESSAGE_END();
+        
+        //UTIL_LogPrintf("UpdateFirst-SoundNames\n");
+        if(this->mNewMap)
+        {
+            MESSAGE_BEGIN(MSG_ONE, gmsgSetSoundNames, NULL, this->pev);
+                // Write byte indicating to clear sound list or not
+                WRITE_BYTE(1);
+            MESSAGE_END();
+            
+            this->mClientSoundNames.clear();
+            
+            //UTIL_LogPrintf("UpdateFirst-MapExtents\n");
+            
+            // Send down map extents so players can start computing it
+            // Cache this so it isn't computed every round, only the when a player connects or a new map starts?
+            MESSAGE_BEGIN(MSG_ONE, gmsgSetupMap, NULL, this->pev);
+                const char* theCStrLevelName = STRING(gpGlobals->mapname);
+                ASSERT(theCStrLevelName);
+                ASSERT(!FStrEq(theCStrLevelName, ""));
+            
+                // Indicates we're sending map extents (1 for sending location)
+                WRITE_BYTE(0);
+            
+                // Write map name
+                WRITE_STRING(theCStrLevelName);
+            
+                const AvHMapExtents& theMapExtents = GetGameRules()->GetMapExtents();
+            
+                theMapExtents.SendToNetworkStream();
+            
+            MESSAGE_END();
+        }
+        
+        this->mFirstUpdate = false;
+        this->mNewMap = false;
+    }
+}
+
+void AvHPlayer::UpdateFog()
+{
+    if(this->mClientCurrentFogEntity != this->mCurrentFogEntity)
+    {
+        bool theFogEnabled = this->mCurrentFogEntity > -1;
+
+        MESSAGE_BEGIN(MSG_ONE, gmsgFog, NULL, this->pev);
+
+            // Enable or disable fog
+            WRITE_BYTE(theFogEnabled);
+            
+            // Look up fog entity, send values
+            if(theFogEnabled)
+            {
+                AvHFog* theFogEntity = dynamic_cast<AvHFog*>(CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(this->mCurrentFogEntity)));
+                ASSERT(theFogEntity);
+
+                int theR, theG, theB;
+                theFogEntity->GetFogColor(theR, theG, theB);
+                WRITE_BYTE(theR);
+                WRITE_BYTE(theG);
+                WRITE_BYTE(theB);
+
+                WRITE_COORD(theFogEntity->GetFogStart());
+                WRITE_COORD(theFogEntity->GetFogEnd());
+            }
+
+            MESSAGE_END();
+            
+            this->mClientCurrentFogEntity = this->mCurrentFogEntity;
+    }
+}
+
+void AvHPlayer::UpdateGamma()
+{
+    float theMapGamma = GetGameRules()->GetMapGamma();
+    if(this->mClientGamma != theMapGamma)
+    {
+        if(!GetGameRules()->GetIsTesting())
+        {
+            MESSAGE_BEGIN(MSG_ONE, gmsgSetGammaRamp, NULL, this->pev);
+            WRITE_COORD(theMapGamma*kNormalizationNetworkFactor);
+            MESSAGE_END();
+            
+            this->mClientGamma = theMapGamma;
+        }
+    }
+}
+
+void AvHPlayer::UpdateOrders()
+{
+    AvHTeam* theTeam = this->GetTeamPointer();
+    if(theTeam)
+    {
+        //UTIL_LogPrintf("UpdateOrders\n");
+        
+        OrderListType theTeamOrders;
+        theTeam->GetOrders(theTeamOrders);
+        
+        for(OrderListType::iterator theIter = theTeamOrders.begin(); theIter != theTeamOrders.end(); theIter++)
+        {
+            bool theClientHasOrder = false;
+            AvHOrder theClientOrder;
+            
+            // Does client already have this order?
+            for(OrderListType::iterator theClientIter = this->mClientOrders.begin(); theClientIter != this->mClientOrders.end(); theClientIter++)
+            {
+                if(theIter->GetOrderID() == theClientIter->GetOrderID())
+                {
+					//ALERT(at_console, "The client has order\n");
+                    theClientHasOrder = true;
+                    theClientOrder = *theClientIter;
+                    break;
+                }
+            }
+            
+            if(theClientHasOrder)
+            {
+                // Is it the same?
+                if(theClientOrder != *theIter)
+                {
+                    // Issue an "order changed"
+                    MESSAGE_BEGIN(MSG_ONE, gmsgSetOrder, NULL, this->pev);
+                        //int theStatus = 0;
+                        //WRITE_BYTE(theStatus);
+                        theIter->SendToNetworkStream();
+                    MESSAGE_END();
+                }
+                else
+                {
+                    int a = 0;
+                }
+            }
+            else
+            {
+                // Issue a "new order"
+                MESSAGE_BEGIN(MSG_ONE, gmsgSetOrder, NULL, this->pev);
+                    //int theStatus = 1;
+                    //WRITE_BYTE(theStatus);
+                    theIter->SendToNetworkStream();
+                MESSAGE_END();
+            }
+                
+            // Assumes that completed orders expire on client
+        }
+        
+        //      EntityListType thePlayersCompletingOrders;
+        //      theTeam->GetPlayersCompletingOrders(thePlayersCompletingOrders);
+        //
+        //      int theNumPlayersCompletingOrders = thePlayersCompletingOrders.size();
+        //      if(theNumPlayersCompletingOrders > 0)
+        //      {
+        //          MESSAGE_BEGIN(MSG_ONE, gmsgCplteOrder, NULL, this->pev);
+        //
+        //              WRITE_BYTE(theNumPlayersCompletingOrders);
+        //
+        //              for(int i = 0; i < theNumPlayersCompletingOrders; i++)
+        //              {
+        //                  WRITE_BYTE(thePlayersCompletingOrders[i]);
+        //              }
+        //
+        //          MESSAGE_END();
+        //      }
+
+        // Client is now updated
+        this->mClientOrders = theTeamOrders;
+    }
+}
+
+void AvHPlayer::UpdateParticleTemplates()
+{
+    const float kParticleTemplateRate = 1.0f;
+    if(gParticleTemplateList.GetCreatedTemplates())
+    {
+        // Make sure client clears out all particle systems first
+        int theNumberTemplates = gParticleTemplateList.GetNumberTemplates();
+        if(theNumberTemplates > this->mNumParticleTemplatesSent)
+        {
+            int theMarkerOne = (int)(theNumberTemplates*.25f);
+            int theMarkerTwo = (int)(theNumberTemplates*.5f);
+            int theMarkerThree = (int)(theNumberTemplates*.75f);
+            int theMarkerFour = (theNumberTemplates-1);
+
+//          if(this->mNumParticleTemplatesSent == 0)
+//          {
+//              this->SendMessage(kReceivingLevelData, true);
+//          }
+//          else if(this->mNumParticleTemplatesSent == theMarkerOne)
+//          {
+//              this->SendMessage(kReceivingLevelData1, true);
+//          }
+//          else if(this->mNumParticleTemplatesSent == theMarkerTwo)
+//          {
+//              this->SendMessage(kReceivingLevelData2, true);
+//          }
+//          else if(this->mNumParticleTemplatesSent == theMarkerThree)
+//          {
+//              this->SendMessage(kReceivingLevelData3, true);
+//          }
+//          else if(this->mNumParticleTemplatesSent == theMarkerFour)
+//          {
+//              this->SendMessage(kReceivingLevelData4, true);
+//          }
+            
+            if((this->mTimeOfLastParticleTemplateSending == -1) || (gpGlobals->time > this->mTimeOfLastParticleTemplateSending + kParticleTemplateRate))
+            {
+                MESSAGE_BEGIN(MSG_ONE, gmsgSetParticleTemplates, NULL, pev);
+                    AvHParticleTemplate* theTemplate = gParticleTemplateList.GetTemplateAtIndex(this->mNumParticleTemplatesSent);
+                    ASSERT(theTemplate);
+                    gParticleTemplateList.SendTemplateToNetworkStream(theTemplate);
+                MESSAGE_END();
+                
+                this->mNumParticleTemplatesSent++;
+                this->mTimeOfLastParticleTemplateSending = gpGlobals->time;
+            }
+        }
+        else
+        {
+            int a = 0;
+        }
+    }
+}
+
+void AvHPlayer::UpdateInfoLocations()
+{
+    // Get map location list
+    AvHBaseInfoLocationListType theInfoLocations = GetGameRules()->GetInfoLocations();
+
+    // Compare with ours, send one down each tick (assumes that previous ones sent don't change)
+    int theNumClientInfoLocations = this->mClientInfoLocations.size();
+    if((signed)theInfoLocations.size() > theNumClientInfoLocations)
+    {
+        // Only send one at a time
+        AvHBaseInfoLocation theInfoLocation = theInfoLocations[theNumClientInfoLocations];
+
+        MESSAGE_BEGIN(MSG_ONE, gmsgSetupMap, NULL, this->pev);
+
+            // Indicates we're sending map extents (1 for sending location)
+            WRITE_BYTE(1);
+        
+            // Send map location name
+            WRITE_STRING(theInfoLocation.GetLocationName().c_str());
+
+            // Send max extents
+            vec3_t theMaxExtents = theInfoLocation.GetMaxExtent();
+            WRITE_COORD(theMaxExtents.x);
+            WRITE_COORD(theMaxExtents.y);
+            //WRITE_COORD(theMaxExtents.z);
+
+            // Send min extents
+            vec3_t theMinExtents = theInfoLocation.GetMinExtent();
+            WRITE_COORD(theMinExtents.x);
+            WRITE_COORD(theMinExtents.y);
+            //WRITE_COORD(theMinExtents.z);
+        
+        MESSAGE_END();
+
+        // Save it
+        this->mClientInfoLocations.push_back(theInfoLocation);
+    }
+
+}
+
+void AvHPlayer::UpdatePendingClientScripts()
+{
+    if(this->mPendingClientScripts.size() > 0)
+    {
+        // Start message
+        MESSAGE_BEGIN(MSG_ONE, gmsgClientScripts, NULL, this->pev);
+        
+        // Send number of scripts
+        int theNumScripts = this->mPendingClientScripts.size();
+        ASSERT(theNumScripts < 128);
+        WRITE_BYTE(theNumScripts);
+
+        // Send each script name
+        for(StringList::iterator theIter = this->mPendingClientScripts.begin(); theIter != this->mPendingClientScripts.end(); theIter++)
+        {
+            WRITE_STRING(theIter->c_str());
+        }
+        
+        // End message
+        MESSAGE_END();
+
+        // Clear pending list because they've been sent
+        this->mPendingClientScripts.clear();
+    }
+}
+
+void AvHPlayer::UpdateProgressBar()
+{
+    // TODO: If this is the commander, send him all the progress bars of all his teammates so he can see them!
+    
+    // Assumes that progress is normalized and stored in one of the fuser variables of the entity index sent down
+    if(this->mClientProgressBarEntityIndex != this->mProgressBarEntityIndex)
+    {
+        //MESSAGE_BEGIN(MSG_ONE, gmsgProgressBar, NULL, this->pev);
+        MESSAGE_BEGIN(MSG_ONE_UNRELIABLE, gmsgProgressBar, NULL, this->pev);
+        WRITE_SHORT(this->mProgressBarEntityIndex);
+        WRITE_BYTE(this->mProgressBarParam);
+        MESSAGE_END();
+        
+        this->mClientProgressBarEntityIndex = this->mProgressBarEntityIndex;
+    }
+}
+
+void AvHPlayer::UpdateVUser4()
+{
+    // Update client with resources (as int)
+    int theResources = (short)(this->GetResources(true));
+    
+    if(CVAR_GET_FLOAT(kvTesting))
+    {
+        theResources = g_engfuncs.pfnNumberOfEntities();
+    }
+
+    if(this->pev)
+    {
+        if(GetGameRules()->GetIsCombatMode())
+        {
+            this->pev->vuser4.z = this->GetExperience()*kNumericNetworkConstant;
+        }
+        else
+        {
+            this->pev->vuser4.z = theResources*kNumericNetworkConstant;
+        }
+    }
+}
+
+void AvHPlayer::UpdateSetSelect()
+{
+    if(this->GetIsInTopDownMode())
+    {
+        if((this->mSelected != this->mClientSelected) || (this->mTrackingEntity != this->mClientTrackingEntity))
+        {
+            //UTIL_LogPrintf("UpdateSelection\n");
+            
+            // Fire selection message, sending this list to the player that fired it
+            MESSAGE_BEGIN(MSG_ONE, gmsgSetSelect, NULL, this->pev);
+        
+            // We're not sending a group
+            WRITE_BYTE(0);
+        
+            // Send number of units in selection
+            int theNumSelection = this->mSelected.size();
+            WRITE_BYTE(theNumSelection);
+            
+            // Send each each entindex
+            for(int i = 0; i < theNumSelection; i++)
+            {
+                int theEntIndex = this->mSelected[i];
+                WRITE_SHORT(theEntIndex);
+            }
+
+            // Write byte indicating if we're tracking or not
+            bool theIsTracking = (this->mTrackingEntity > 0);
+            WRITE_BYTE(theIsTracking);
+
+            if(theIsTracking)
+            {
+                // If so, write short indicating entity we're tracking
+                WRITE_SHORT(this->mTrackingEntity);
+            }
+
+            MESSAGE_END();
+            
+            // Synch up
+            this->mClientSelected = this->mSelected;
+            this->mClientTrackingEntity = this->mTrackingEntity;
+        }
+
+        AvHTeam* theTeam = this->GetTeamPointer();
+        ASSERT(theTeam);
+
+        for(int j=0; j < kNumHotkeyGroups; j++)
+        {
+            EntityListType theGroup = theTeam->GetGroup(j);
+            EntityListType& theClientGroup = this->mClientGroups[j];
+            AvHUser3 theGroupType = theTeam->GetGroupType(j);
+            AvHAlertType theGroupAlert = ALERT_NONE;
+            AvHAlertType& theClientGroupAlert = this->mClientGroupAlerts[j];
+
+            // Is group under attack or no longer under attack?
+            for(EntityListType::iterator theIter = theGroup.begin(); theIter != theGroup.end(); theIter++)
+            {
+                if(GetGameRules()->GetIsEntityUnderAttack(*theIter))
+                {
+                    theGroupAlert = ALERT_UNDER_ATTACK;
+                }
+            }
+        
+            if((theClientGroup != theGroup) || (theClientGroupAlert != theGroupAlert))
+            {
+                // Fire selection message, sending this list to the player that fired it
+                MESSAGE_BEGIN(MSG_ONE, gmsgSetSelect, NULL, this->pev);
+        
+                int theHotGroupNumber = j+1;
+                WRITE_BYTE(theHotGroupNumber);
+        
+                // Send number of units in selection
+                int theNumInGroup = theGroup.size();
+                WRITE_BYTE(theNumInGroup);
+                
+                // Send each each entindex
+                for(int i = 0; i < theNumInGroup; i++)
+                {
+                    int theEntIndex = theGroup[i];
+                    WRITE_SHORT(theEntIndex);
+                }
+
+                WRITE_BYTE((int)theGroupType);
+
+                WRITE_BYTE((int)theGroupAlert);
+
+                MESSAGE_END();
+        
+                theClientGroup = theGroup;
+                theClientGroupAlert = theGroupAlert;
+            }
+        }
+
+        // See if "selectall" hotgroup has changed and send it if needed
+        EntityListType theSelectAllGroup = theTeam->GetSelectAllGroup();
+        if(theSelectAllGroup != this->mClientSelectAllGroup)
+        {
+            // Fire selection message, sending this list to the player that fired it
+            MESSAGE_BEGIN(MSG_ONE, gmsgSetSelect, NULL, this->pev);
+            
+            WRITE_BYTE(kSelectAllHotGroup);
+            
+            // Send number of units in selection
+            int theNumInGroup = theSelectAllGroup.size();
+            WRITE_BYTE(theNumInGroup);
+            
+            // Send each each entindex
+            for(int i = 0; i < theNumInGroup; i++)
+            {
+                int theEntIndex = theSelectAllGroup[i];
+                WRITE_SHORT(theEntIndex);
+            }
+
+            // Don't write group type or alerts
+
+            MESSAGE_END();
+
+            this->mClientSelectAllGroup = theSelectAllGroup;
+        }
+        
+        // Check idle soldiers, ammo requests and health requests
+        AvHMessageID theRequestList[kNumRequestTypes] = {COMMANDER_NEXTIDLE, COMMANDER_NEXTAMMO, COMMANDER_NEXTHEALTH};
+        for(int i = 0; i < kNumRequestTypes; i++)
+        {
+            AvHMessageID theCurrentRequestType = theRequestList[i];
+            int theNumClientRequests = this->mClientRequests[i];
+            int theNumTeamRequests = theTeam->GetAlerts(theCurrentRequestType).size();
+            if(theNumClientRequests != theNumTeamRequests)
+            {
+                MESSAGE_BEGIN(MSG_ONE, gmsgSetSelect, NULL, this->pev);
+                    WRITE_BYTE(kSelectAllHotGroup + (i + 1));
+                    WRITE_BYTE(theCurrentRequestType);
+                    WRITE_BYTE(theNumTeamRequests);
+                MESSAGE_END();
+                
+                this->mClientRequests[i] = theNumTeamRequests;
+            }
+        }
+    }
+}
+
+void AvHPlayer::UpdateSoundNames()
+{
+    if(this->pev != NULL )      // Not fully connected yet
+    {
+        // Send list of special sounds
+        StringList theSoundNameList = AvHMP3Audio::GetSoundNameList();
+        int theNumberOfSounds = theSoundNameList.size();
+        int theNumberOfSoundsOnClient = this->mClientSoundNames.size();
+        
+        ASSERT(theNumberOfSoundsOnClient <= theNumberOfSounds);
+        
+        // Only send one new sound name every tick, to avoid sending too much data and overflowing too quickly
+        if(theNumberOfSounds > theNumberOfSoundsOnClient)
+        {
+            const char* theSoundNameToSend = theSoundNameList[theNumberOfSoundsOnClient].c_str();
+            if(GetGameRules()->GetIsTesting())
+            {
+                this->SendMessage(theSoundNameToSend);
+            }
+
+            //UTIL_LogPrintf("UpdateSoundNames\n");
+            
+            MESSAGE_BEGIN(MSG_ONE, gmsgSetSoundNames, NULL, this->pev);
+            WRITE_BYTE(0);
+            int theStrLen = strlen(theSoundNameToSend);
+            ASSERT(theStrLen < 50);
+            WRITE_STRING(theSoundNameToSend);
+            MESSAGE_END();
+            
+            this->mClientSoundNames.push_back(theSoundNameToSend);
+        }
+    }
+}
+
+void AvHPlayer::UpdateTechNodes()
+{
+    //UTIL_LogPrintf("UpdateTechNodes\n");
+    bool theIsCombatMode = GetGameRules()->GetIsCombatMode();
+    if((this->GetUser3() == AVH_USER3_COMMANDER_PLAYER) || theIsCombatMode || this->GetIsAlien() || this->GetSendBalanceData())
+    {
+        AvHTeam* theTeam = this->GetTeamPointer();
+        if(theTeam)
+        {
+            // Propagate and use local tech nodes in combat mode, else use team nodes in NS mode
+            AvHTechNodes theTechNodes = theIsCombatMode ? this->mCombatNodes : theTeam->GetTechNodes();
+ 
+            // Now customize nodes for aliens in NS
+            if(GetGameRules()->GetIsNSMode() && this->GetIsAlien())
+            {
+                // Set current lifeform to be unavailable
+                AvHMessageID theLifeform = MESSAGE_NULL;
+                switch(this->GetUser3())
+                {
+                case AVH_USER3_ALIEN_PLAYER1:
+                    theLifeform = ALIEN_LIFEFORM_ONE;
+                    break;
+                case AVH_USER3_ALIEN_PLAYER2:
+                    theLifeform = ALIEN_LIFEFORM_TWO;
+                    break;
+                case AVH_USER3_ALIEN_PLAYER3:
+                    theLifeform = ALIEN_LIFEFORM_THREE;
+                    break;
+                case AVH_USER3_ALIEN_PLAYER4:
+                    theLifeform = ALIEN_LIFEFORM_FOUR;
+                    break;
+                case AVH_USER3_ALIEN_PLAYER5:
+                    theLifeform = ALIEN_LIFEFORM_FIVE;
+                    break;
+                }
+                theTechNodes.SetIsResearchable(theLifeform, false);
+
+                // If not Gorge, set buildables to be unavailable
+                if(theLifeform != ALIEN_LIFEFORM_TWO)
+                {
+                    theTechNodes.SetIsResearchable(ALIEN_BUILD_HIVE, false);
+                    theTechNodes.SetIsResearchable(ALIEN_BUILD_RESOURCES, false);
+                    theTechNodes.SetIsResearchable(ALIEN_BUILD_OFFENSE_CHAMBER, false);
+                    theTechNodes.SetIsResearchable(ALIEN_BUILD_DEFENSE_CHAMBER, false);
+                    theTechNodes.SetIsResearchable(ALIEN_BUILD_MOVEMENT_CHAMBER, false);
+                    theTechNodes.SetIsResearchable(ALIEN_BUILD_SENSORY_CHAMBER, false);
+                }
+                else
+                {
+                    // If we have the max hives, disable hives
+
+                    bool theHasFreeUpgradeCategory = false;
+                    MessageIDListType theUnsupportedUpgrades;
+                    theUnsupportedUpgrades.push_back(ALIEN_BUILD_DEFENSE_CHAMBER);
+                    theUnsupportedUpgrades.push_back(ALIEN_BUILD_MOVEMENT_CHAMBER);
+                    theUnsupportedUpgrades.push_back(ALIEN_BUILD_SENSORY_CHAMBER);
+
+                    FOR_ALL_ENTITIES(kesTeamHive, AvHHive*)
+                        if(theEntity && theEntity->GetIsActive() && (theEntity->pev->team == this->pev->team))
+                        {
+                            AvHMessageID theTechnology = theEntity->GetTechnology();
+                            if(theTechnology == MESSAGE_NULL)
+                            {
+                                theHasFreeUpgradeCategory = true;
+                                break;
+                            }
+                            else
+                            {
+                                // It's supported, so remove from unsupported list
+                                theUnsupportedUpgrades.erase(std::find(theUnsupportedUpgrades.begin(), theUnsupportedUpgrades.end(), theTechnology));
+                            }
+                        }
+                    END_FOR_ALL_ENTITIES(kesTeamHive);
+
+                    // If we don't have a free upgrade category
+                    if(!theHasFreeUpgradeCategory)
+                    {
+                        // Remove every unsupported structure
+                        for(MessageIDListType::iterator theIter = theUnsupportedUpgrades.begin(); theIter != theUnsupportedUpgrades.end(); theIter++)
+                        {
+                            theTechNodes.SetIsResearchable(*theIter, false);
+                        }
+                    }
+                }
+
+                // If there are no free upgrades available, disable upgrades
+                AvHTeam* theTeamPointer = this->GetTeamPointer();
+                if(theTeamPointer)
+                {
+                    AvHAlienUpgradeListType theUpgrades = theTeamPointer->GetAlienUpgrades();
+                    
+                    for(int i = ALIEN_UPGRADE_CATEGORY_INVALID + 1; i < ALIEN_UPGRADE_CATEGORY_MAX_PLUS_ONE; i++)
+                    {
+                        AvHAlienUpgradeCategory theCurrentCategory = AvHAlienUpgradeCategory(i);
+                        
+                        // Now make sure we have an unspent upgrade available
+                        if(!AvHGetHasFreeUpgradeCategory(theCurrentCategory, theUpgrades, this->pev->iuser4))
+                        {
+                            bool theEnabledState = false;
+
+                            switch(theCurrentCategory)
+                            {
+                            case ALIEN_UPGRADE_CATEGORY_DEFENSE:
+                                theTechNodes.SetIsResearchable(ALIEN_EVOLUTION_ONE, theEnabledState);
+                                theTechNodes.SetIsResearchable(ALIEN_EVOLUTION_TWO, theEnabledState);
+                                theTechNodes.SetIsResearchable(ALIEN_EVOLUTION_THREE, theEnabledState);
+                                break;
+                            case ALIEN_UPGRADE_CATEGORY_MOVEMENT:
+                                theTechNodes.SetIsResearchable(ALIEN_EVOLUTION_SEVEN, theEnabledState);
+                                theTechNodes.SetIsResearchable(ALIEN_EVOLUTION_EIGHT, theEnabledState);
+                                theTechNodes.SetIsResearchable(ALIEN_EVOLUTION_NINE, theEnabledState);
+                                break;
+                            case ALIEN_UPGRADE_CATEGORY_SENSORY:
+                                theTechNodes.SetIsResearchable(ALIEN_EVOLUTION_TEN, theEnabledState);
+                                theTechNodes.SetIsResearchable(ALIEN_EVOLUTION_ELEVEN, theEnabledState);
+                                theTechNodes.SetIsResearchable(ALIEN_EVOLUTION_TWELVE, theEnabledState);
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+            
+            if(this->mClientTechNodes != theTechNodes)
+            {
+                int theNumTechNodes = theTechNodes.GetNumTechNodes();
+                for(int i = 0; i < theNumTechNodes; i++)
+                {
+                    AvHTechNode theCurrentClientTechNode;
+                    bool theHasClientTechNode = this->mClientTechNodes.GetTechNode(i, theCurrentClientTechNode);
+
+                    AvHTechNode theCurrentServerTechNode;
+                    bool theHasServerTechNode = theTechNodes.GetTechNode(i, theCurrentServerTechNode);
+
+                    ASSERT(theHasServerTechNode);
+
+                    if(!theHasClientTechNode || (theCurrentClientTechNode != theCurrentServerTechNode))
+                    {
+                        MESSAGE_BEGIN(MSG_ONE, gmsgSetTechNodes, NULL, this->pev);
+                            WRITE_SHORT(i);
+                            theCurrentServerTechNode.SendToNetworkStream();
+                        MESSAGE_END();
+
+                        this->mClientTechNodes.SetTechNode(i, theCurrentServerTechNode);
+                    }
+                }
+            }
+
+            // Propagate any tech slots that have changed
+            const AvHTechSlotListType& theTeamTechSlotList = theTeam->GetTechSlotManager().GetTechSlotList();
+            if(this->mClientTechSlotList != theTeamTechSlotList)
+            {
+                // Send any nodes that have changed
+                int theCurrentSlot = 0;
+                for(AvHTechSlotListType::const_iterator theIter = theTeamTechSlotList.begin(); theIter != theTeamTechSlotList.end(); theIter++, theCurrentSlot++)
+                {
+                    bool theHasClientTechSlot = false;
+                    AvHTechSlots theClientTechSlot;
+                    if((signed)this->mClientTechSlotList.size() > theCurrentSlot)
+                    {
+                        theClientTechSlot = this->mClientTechSlotList[theCurrentSlot];
+                        theHasClientTechSlot = true;
+                    }
+
+                    AvHTechSlots theServerTechSlot = theTeamTechSlotList[theCurrentSlot];
+
+                    if(!theHasClientTechSlot || (theClientTechSlot != theServerTechSlot))
+                    {
+                        MESSAGE_BEGIN(MSG_ONE, gmsgSetTechSlots, NULL, this->pev);
+                            //WRITE_SHORT(theCurrentSlot);
+                            theServerTechSlot.SendToNetworkStream();
+                        MESSAGE_END();
+                    }
+                }
+
+                this->mClientTechSlotList = theTeamTechSlotList;
+            }
+//          AvHMessageID theResearchingTech = theTeam->GetResearching();
+//          if(this->mClientResearchingTech != theResearchingTech)
+//          {
+//              // Send to everyone so they know what upgrade is coming
+//              MESSAGE_BEGIN(MSG_ONE, gmsgResearch, NULL, this->pev);
+//
+//                  WRITE_SHORT(theResearchingTech);
+//              
+//                  if(theResearchingTech != MESSAGE_NULL)
+//                  {
+//                      float theTimeResearchDone = theTeam->GetTimeResearchDone();
+//                      WRITE_COORD(theTimeResearchDone);
+//                  }
+//
+//              MESSAGE_END();
+//              this->mClientResearchingTech = theResearchingTech;
+//          }
+        }
+    }
+}
+
+void AvHPlayer::UpdateTopDownMode()
+{
+    if((this->mClientInTopDownMode != this->mInTopDownMode) || (this->mSpecialPASOrigin != this->mClientSpecialPASOrigin))
+    {
+        MESSAGE_BEGIN(MSG_ONE, gmsgSetTopDown, NULL, pev);
+            // Write 0 indicating we're sending top down data
+            WRITE_BYTE(0);
+            WRITE_BYTE(this->mInTopDownMode);
+
+            if(!this->mInTopDownMode)
+            {
+                WRITE_COORD(this->mAnglesBeforeTopDown.x);
+                WRITE_COORD(this->mAnglesBeforeTopDown.y);
+                WRITE_COORD(this->mAnglesBeforeTopDown.z);
+            }
+            else
+            {
+                WRITE_COORD(this->mSpecialPASOrigin.x);
+                WRITE_COORD(this->mSpecialPASOrigin.y);
+                WRITE_COORD(this->mSpecialPASOrigin.z);
+            }
+        MESSAGE_END();
+
+        this->mClientInTopDownMode = this->mInTopDownMode;
+        this->mClientSpecialPASOrigin = this->mSpecialPASOrigin;
+    }
+
+    // Send menu tech slots to commander
+    AvHTeam* theTeam = this->GetTeamPointer();
+    if(theTeam && this->mInTopDownMode)
+    {
+        int theMenuTechSlots = theTeam->GetMenuTechSlots();
+        if(theMenuTechSlots != this->mClientMenuTechSlots)
+        {
+            MESSAGE_BEGIN(MSG_ONE, gmsgSetTopDown, NULL, this->pev);
+                // Write 1 indicating we're sending tech slot data
+                WRITE_BYTE(1);
+                WRITE_LONG(theMenuTechSlots);
+            MESSAGE_END();
+
+            this->mClientMenuTechSlots = theMenuTechSlots;
+        }
+    }
+}
+
+void AvHPlayer::UpdateExperienceLevelsSpent()
+{
+    // If our spent level is different then our client's
+    if(this->mClientExperienceLevelsSpent != this->mExperienceLevelsSpent)
+    {
+        MESSAGE_BEGIN(MSG_ONE, gmsgGameStatus, NULL, this->edict());
+            WRITE_BYTE(kGameStatusUnspentLevels);
+            WRITE_BYTE(GetGameRules()->GetMapMode());
+            WRITE_BYTE(this->mExperienceLevelsSpent);
+        MESSAGE_END();
+
+        // Set equal
+        this->mClientExperienceLevelsSpent = this->mExperienceLevelsSpent;
+    }
+}
+
+void AvHPlayer::UpdateEntityHierarchy()
+{
+  
+    AvHPlayer* player = this;
+
+    // If we're spectating, then use the minimap data for the player we're spectating.
+
+    AvHPlayer* spectatingPlayer = dynamic_cast<AvHPlayer*>(GetSpectatingEntity());
+
+    if (spectatingPlayer)
+    {
+        player = spectatingPlayer;
+    }
+    
+    AvHTeam* theTeam = player->GetTeamPointer();
+
+    if(theTeam && GetGameRules()->GetGameStarted())
+    {
+        if (theTeam->GetTeamType() == AVH_CLASS_TYPE_MARINE ||
+            theTeam->GetTeamType() == AVH_CLASS_TYPE_ALIEN)
+        {
+            // Pass in previous version so it can optimize and only send diff
+            AvHEntityHierarchy& theEntityList = GetGameRules()->GetEntityHierarchy(player->GetTeam());
+
+            if(theEntityList.SendToNetworkStream(this->mClientEntityHierarchy, this->pev))
+            {
+                this->mClientEntityHierarchy = theEntityList;
+            }
+        }
+    }
+
+}
+
+void AvHPlayer::UpdateSpawnScreenFade()
+{
+    if(this->mSendSpawnScreenFade)
+    {
+        // Don't fade in when going back to ready room, to prevent overflows in big games on game reset
+        //if(this->mPlayMode != PLAYMODE_READYROOM)
+        //{
+        Vector theFadeColor;
+        theFadeColor.x = 0;
+        theFadeColor.y = 0;
+        theFadeColor.z = 0;
+        UTIL_ScreenFade(this, theFadeColor, kSpawnInFadeTime, 0.0f, 255, FFADE_IN);
+        //}
+
+        this->mSendSpawnScreenFade = false;
+    }
+}
+
+
+void AvHPlayer::UpdateDebugCSP()
+{
+    bool theCSPChanged = memcmp(&this->mClientDebugCSPInfo, &this->mDebugCSPInfo, sizeof(weapon_data_t));
+    if(theCSPChanged || (this->mClientNextAttack != this->m_flNextAttack))
+    {
+        MESSAGE_BEGIN(MSG_ONE, gmsgDebugCSP, NULL, this->pev);
+
+        // Write each field
+        WRITE_LONG(this->mDebugCSPInfo.m_iId);
+        WRITE_LONG(this->mDebugCSPInfo.m_iClip);
+
+        WRITE_COORD(this->mDebugCSPInfo.m_flNextPrimaryAttack);
+        WRITE_COORD(this->mDebugCSPInfo.m_flTimeWeaponIdle);
+        WRITE_COORD(this->m_flNextAttack);
+
+        MESSAGE_END();
+
+        memcpy(&this->mClientDebugCSPInfo, &this->mDebugCSPInfo, sizeof(weapon_data_t));
+        this->mClientNextAttack = this->m_flNextAttack;
+    }
+}
+
+//void AvHPlayer::UpdateArmor()
+//{
+//  // Update armor upgrade menu
+//  if(this->GetClassType() == AVH_CLASS_TYPE_MARINE)
+//  {
+//      if(this->mClientNextArmorUpgradeLevel != this->mNextArmorUpgradeLevel)
+//      {
+//          // TODO: if next armor upgrade level is MESSAGE_NULL, it's disabled
+//
+//          MESSAGE_BEGIN(MSG_ONE, gmsgChangeNodeCost, NULL, pev);
+//              // send new armor level
+//              WRITE_BYTE(this->mArmorLevel);
+//
+//              // Send old id
+//              WRITE_BYTE(this->mOldArmorUpgradeLevel);
+//
+//              // Send new id
+//              WRITE_BYTE(this->mNextArmorUpgradeLevel);
+//
+//              // Send string
+//              WRITE_STRING(this->mNextArmorUpgradeName.c_str());
+//
+//          MESSAGE_END();
+//
+//          this->mClientNextArmorUpgradeLevel = this->mNextArmorUpgradeLevel;
+//      }
+//  }
+//}
+
+void AvHPlayer::UpdateOverwatch()
+{
+    #ifndef AVH_MAPPER_BUILD
+    // Update overwatch indicator
+    if(this->mClientInOverwatch != this->mInOverwatch)
+    {
+        // We are entering overwatch
+        if(this->mInOverwatch)
+        {
+            PLAYBACK_EVENT_FULL(0, this->edict(), gStartOverwatchEventID, 0, this->pev->origin, (float *)&g_vecZero, 0.0, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+        }
+        // We are leaving overwatch
+        else
+        {
+            PLAYBACK_EVENT_FULL(0, this->edict(), gEndOverwatchEventID, 0, this->pev->origin, (float *)&g_vecZero, 0.0, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+        }
+        this->mClientInOverwatch = this->mInOverwatch;
+    }
+    #endif
+}
+
+bool AvHPlayer::GetCanUseWeapon() const
+{
+    return GetIsAbleToAct() && pev->viewmodel;
+}
+
+// tankefugl: 0000953
+// allows a player to join team only once each inCoolDownTime seconds
+bool AvHPlayer::JoinTeamCooledDown(float inCoolDownTime) {
+//	UTIL_ClientPrintAll(HUD_PRINTTALK, UTIL_VarArgs("Enter: JoinTeamCooledDown(%f), gpGlobals->time = %f, this->mTimeLastJoinTeam = %f", inCoolDownTime, gpGlobals->time, this->mTimeLastJoinTeam));
+	if ((this->mTimeLastJoinTeam == -1) || (gpGlobals->time > this->mTimeLastJoinTeam + inCoolDownTime)) 
+	{
+		this->mTimeLastJoinTeam = gpGlobals->time;
+		return true;
+	}
+	else
+		return false;
+}
+// :tankefugl
\ No newline at end of file
diff --git a/main/source/mod/AvHPlayer.h b/main/source/mod/AvHPlayer.h
new file mode 100644
index 00000000..508f3b79
--- /dev/null
+++ b/main/source/mod/AvHPlayer.h
@@ -0,0 +1,849 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHPlayer.h $
+// $Date: 2002/11/22 21:18:33 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHPlayer.h,v $
+// Revision 1.65  2002/11/22 21:18:33  Flayra
+// - Potentially fixed strange Onos collision crash
+// - Don't allow player to join team after he's seen another team
+// - "lastinv" support
+// - Fixed perma-cloak bug after losing last sensory chamber whilst cloaked
+// - Started fixing commander PAS problem
+// - Fixed readyroom "ghost player" exploit when F4 during REIN
+// - Draw damage in debug, never otherwise
+//
+// Revision 1.64  2002/11/15 04:42:50  Flayra
+// - Regenerate now returns true if healing was successful
+// - Logging changes and fixes
+//
+// Revision 1.63  2002/11/13 01:49:08  Flayra
+// - Proper death message logging for Psychostats
+//
+// Revision 1.62  2002/11/12 18:44:54  Flayra
+// - Added mp_logdetail support for damage messages
+// - Changed the alien ability anti-exploit code to try to co-exist with scripters
+//
+// Revision 1.61  2002/11/12 02:28:39  Flayra
+// - Fixed problems with armor not being updated when armor upgrades completed
+// - Aliens now keep same percentage of health and armor when morphing
+// - Much better logging, up to standard
+// - Don't add enemy buildings to hive sight unless parasited (solves blip spam)
+// - Removed draw damage from public build
+// - Changes to minimap to less overflows at end of big games
+//
+// Revision 1.60  2002/10/25 21:48:01  Flayra
+// - Added more auth masks
+// - Moved mSkin to pev->skin so playerclass could hold what used to be mPlayMode could be used to quickly perform culling, to try to prevent overflowage at the end of large games
+//
+// Revision 1.59  2002/10/24 21:40:02  Flayra
+// - Reworked jetpack effect
+// - Authicons update
+// - Set builder for alien buildings, so turret kills can credit builder
+// - Alien easter eggs
+// - Network optimizations after game reset on huge (20-32) player games
+// - Allow server ops to disable auth icons
+// - Alien energy tweaks
+// - Show unbuilt hives in hive sight
+// - Move alien energy updating fully into shared code
+// - Tried to fix full health ring showing for dead selected players
+// - Moved help text client-side
+// - Cache info_locations and gamma until map change
+// - Skin fixes
+//
+// Revision 1.58  2002/10/20 21:10:57  Flayra
+// - Optimizations
+//
+// Revision 1.57  2002/10/16 01:05:38  Flayra
+// - Sent health as short for big aliens
+// - Fixed sayings not triggering commander alerts
+// - Now name changes are queued until the next match
+// - Added authmask support
+// - Egg idle sounds play more frequently, refactored too
+// - Fixed preserving model in ready room after game end
+// - Profiling of AddToFullPack
+// - Fix for falling through lifts when morphing on them (untested)
+//
+// Revision 1.56  2002/10/03 19:32:06  Flayra
+// - Reworked orders completely
+// - Send max resources to players
+// - Heavy armor sped up slightly
+// - Kill players who illegally try to use alien abilities
+// - Moved energy to a new variable, send health for aliens
+// - Only freeze players during countdown
+// - Removed slowdown when taking damage
+// - Send blips in two messages, one friendly and one enemy (old bad hack)
+//
+// Revision 1.55  2002/09/25 20:50:06  Flayra
+// - Added 3 new sayings
+// - Frame-rate independent updating
+// - Don't allow player to kill self while commanding
+//
+// Revision 1.54  2002/09/23 22:27:52  Flayra
+// - Added skin support
+// - Added client connected/disconnected hooks for particle system propagation optimizations
+// - Removed power armor, added heavy armor
+// - Fixed death animations
+// - Added hook to see if commander has given an order and to see if he's idle
+// - Bound resources for aliens
+// - Soldiers asking for ammo and health trigger commander alert
+// - Added gestation anims
+// - Slowed down Onos movement
+// - When cheats are enabled, purchases are free
+//
+// Revision 1.53  2002/09/09 20:04:53  Flayra
+// - Added commander voting
+// - Commander score is now the average of the rest of his players (reverted back when he leaves CC)
+// - Fixed bug where upgrades were getting removed and then add repeatedly
+// - Added multiple skins for marines
+// - Play sound when aliens lose an upgrade
+// - Changed fov to 90 for all aliens for software compatibility
+// - Added hiveinfo drawing
+// - Tweaked marine and alien speeds (to compensate for loss of drastic alien fov)
+//
+// Revision 1.52  2002/08/31 18:01:02  Flayra
+// - Work at VALVe
+//
+// Revision 1.51  2002/08/16 02:42:57  Flayra
+// - New damage types
+// - Much more efficient blip calculation (at least it should be, I haven't measured it so who really knows)
+// - New way of representing ensnare state for shared code (disabling jumping, jetpacking)
+// - Removed old overwatch code
+// - Store health in fuser2 for drawing health for commander
+// - Swap bile bomb and umbra
+//
+// Revision 1.50  2002/08/09 01:10:30  Flayra
+// - Keep previous model when a game is over and going back to ready room
+// - Refactoring for scoreboard
+// - Support for "jump" animation
+// - Freeze player before game starts
+// - Reset score when leaving a team
+//
+// Revision 1.49  2002/08/02 21:52:17  Flayra
+// - Cleaned up jetpacks, made webbing useful again, help messages, added "orderself" cheat, changed gestation messages for new tooltip system, added GetHasAvailableUpgrades() for help system, removed particle template messages, slowed down particle template update rate to reduce overflows (woo!)
+//
+// Revision 1.48  2002/07/26 23:07:54  Flayra
+// - Numerical feedback
+// - New artwork for marine, with jetpack as body group (this code doesn't work)
+// - Misc. fixes (alien vision mode not being preserved when it should, and staying when it shouldn't)
+//
+// Revision 1.47  2002/07/23 17:17:57  Flayra
+// - Added power armor, added "talking" state for hive sight, changes for new resource model, removed max buildings, create buildings with random orientation, added stimpack, tweaked redemption, added new hive sight info
+//
+// Revision 1.46  2002/07/08 17:15:39  Flayra
+// - Added validation of all impulses (assumes invalid by default, instead of valid), reset players like all other entities, ensnaring fixes, players are temporarily invulnerable when they spawn, preserve health and armor when using command station, fixed up redemption, add hooks for commander voting and going back to the ready room, models can't be changed via the console anymore
+//
+// Revision 1.45  2002/07/01 21:43:16  Flayra
+// - Removed outdated adrenaline concept, added new alien sight mode, primal scream, removed flashlight battery message, fixed morphing problems for level 5 (and others), tweaked marine and alien speeds, fixed triple speed upgrade problem, disabled overwatch, moved player assets out of precache() (wasn't being called reliably), get full energy after a lifeform change, hive sight only draws out of sight now, added scent of fear
+//
+// Revision 1.44  2002/06/25 18:13:57  Flayra
+// - Added death animations, added more general animation support, leaps do damage, general construct effects, new alien inventory system, added charging, info_locations, galloping, new alien building code, better morphing system (prevents getting stuck), more builder error messages, clear deaths on game end, hide health while gestating
+//
+// Revision 1.43  2002/06/10 20:03:13  Flayra
+// - Updated for new minimap (remember killed position).  Updated blood so marines aren't bloody, and aliens emit yellow blood.  Removed slowing when hit (now players fly back when hit though), UpdateBlips() hack (fix when time)
+//
+// Revision 1.42  2002/05/28 18:03:41  Flayra
+// - Refactored size for role code for movement chambers, deal with inventory properly (entity leak), increased web ensnaring effects (put weapon away!), reinforcement refactoring, tweaked speeds so marines are a little slower, and speed upgrade works properly again (now level 1 can generally outrun marines), added recycling support, play destroy egg sound when killed when morphing, new hive sight, EffectivePlayerClassChanged() refactoring
+//
+// Revision 1.41  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVHPLAYER_H
+#define AVHPLAYER_H
+
+#include "dlls/extdll.h"
+#include "util.h"
+
+#include "cbase.h"
+#include "player.h"
+#include "trains.h"
+#include "nodes.h"
+#include "weapons.h"
+#include "soundent.h"
+#include "monsters.h"
+#include "../engine/shake.h"
+#include "decals.h"
+#include "gamerules.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHTeam.h"
+#include "mod/AvHMessage.h"
+#include "mod/AvHSharedTypes.h"
+#include "mod/AvHBasePlayerWeapon.h"
+#include "mod/AvHEntityHierarchy.h"
+#include "mod/AvHOrder.h"
+#include "mod/AvHSpecials.h"
+#include "common/usercmd.h"
+#include "types.h"
+#include "mod/AvHTechNodes.h"
+#include "common/weaponinfo.h"
+#include "mod/AvHVisibleBlipList.h"
+#include "mod/AvHBaseInfoLocation.h"
+#include "mod/AvHCloakable.h"
+#include "mod/AvHMessageList.h"
+
+void LinkUserMessages( void );
+typedef vector<AvHMessageID> MessageIDListType;
+
+class AvHPlayer : public CBasePlayer, public AvHCloakable
+{
+public:
+	// AvHPlayer stuff
+    AvHPlayer();
+
+	void			AddDebugEnemyBlip(float inX, float inY, float inZ);
+	void			PrintWeaponListToClient(CBaseEntity *theAvHPlayer);
+    virtual void    AddPoints( int score, BOOL bAllowNegativeScore );
+	
+	virtual void	AwardKill( entvars_t* pevTarget);
+	virtual int		BloodColor(void);
+	bool			BuildTech(AvHMessageID inBuildID, const Vector& inWorldPos);
+	void			ClearBlips();
+	void			ClientDisconnected();
+	bool			DropItem(const char* inItemName = NULL);
+	bool			GroupMessage(AvHMessageID inGroupMessage);
+	bool			GetCenterPositionForGroup(int inGroupNumber, float& outX, float& outY);
+	
+	virtual void	GetAnimationForActivity(int inActivity, char outAnimation[64], bool inGaitSequence = false);
+
+	bool			GetInReadyRoom(void) const;
+	AvHPlayer*		GetCommander(void);
+	AvHPlayMode		GetPlayMode(bool inIncludeSpectating = false) const;
+	bool			GetHasLeftReadyRoom() const;
+	bool			GetHasJetpack() const;
+	bool			GetHasHeavyArmor() const;
+	bool			GetHasAvailableUpgrades() const;
+	bool			GetHasPowerArmor() const;
+	int				GetHull() const;
+	virtual int		GiveAmmo( int iAmount, char *szName, int iMax );
+	bool			GetShouldResupplyAmmo();
+	float			GetCurrentWeaponAmmoPercentage();
+	virtual int		GetMaxWalkSpeed() const;
+    int             GetScore() const;
+    void            SetScore(int inScore);
+	void			PickSkin();
+	void			SetSkin(int inSkin);
+	bool			GetCanCommand(string& outErrorMessage);
+	bool			GetCanReceiveResources() const;
+
+	void			SetPlayMode(AvHPlayMode inPlayMode, bool inForceSpawn = false);
+	bool			GetHasBeenSpectator(void) const;
+	void			InitializeFromTeam(float inHealthPercentage = 1.0f, float inArmorPercentage = 1.0f);
+	bool			GetIsAlien(bool inIncludeSpectating = false) const;
+	bool			GetIsMarine(bool inIncludeSpectating = false) const;
+	bool			GetIsInTopDownMode(bool inIncludeSpectating = false) const;
+	bool			GetIsBeingDigested() const;
+	bool			GetIsDigesting() const;
+	bool			GetIsEntityInSight(CBaseEntity* inEntity);
+	bool			GetIsValidReinforcementFor(AvHTeamNumber inTeam) const;
+	AvHTeamNumber	GetTeam(bool inIncludeSpectating = false) const;
+	float			GetKilledX() const;
+	float			GetKilledY() const;
+	AvHTeam*		GetTeamPointer(bool inIncludeSpectating = false) const;
+	bool			GetIsAlienSightActive() const;
+	
+	AvHClassType	GetClassType(void) const;
+	
+	bool			GetCurrentWeaponCannotHolster() const;
+	//Activity		GetDeathActivity(void);
+	bool			GetEnemySighted(void) const;
+	bool			GetIsFiring(void) const;
+	bool			GetIsInOverwatch(void) const;
+	bool			GetIsSpectatingTeam(AvHTeamNumber inTeamNumber) const;
+	bool			GetIsSpectatingPlayer(int inPlayerNumber) const;
+	bool			GiveCombatModeUpgrade(AvHMessageID inMessageID, bool inInstantaneous = false);
+	bool			GetHasCombatModeUpgrade(AvHMessageID inMessageID) const;
+
+	bool			GetIsRelevant(bool inIncludeSpectating = false) const;
+	bool			GetCanBeAffectedByEnemies() const;
+	bool			GetIsSelected(int inEntityIndex) const;
+	bool			RemoveSelection(int inEntityIndex);
+	void			SetSelection(int inEntityIndex, bool inClearPreviousSelection = true);
+	bool			GetIsMetabolizing() const;
+	void			SetTimeOfMetabolizeEnd(float inTime);
+	virtual float	GetOpacity() const;
+	bool			GetIsSpectator() const;
+	void			SetIsSpectator();
+	float			GetLastTimeInCommandStation() const;
+	
+	bool			GetIsSpeaking(void) const;
+	AvHMessageID	GetLastSaying() const;
+	bool			GetOrdersRequested(void) const;
+	bool			GetOrderAcknowledged(void) const;
+	string			GetPlayerName() const;
+
+	bool			GetHasGivenOrder() const;
+	void			SetHasGivenOrder(bool inState);
+
+	int				GetPointValue(void) const;
+	vec3_t			GetVisualOrigin() const;
+	int				GetRespawnCost() const;
+	
+    void            AwardExperienceForObjective(float inHealthChange, AvHMessageID inMessageID);
+	float			GetExperience() const;
+	void			SetExperience(float inExperience);
+	int				GetExperienceLevel() const;
+
+	AvHServerPlayerData* GetServerPlayerData();
+
+	virtual bool	GetHasItem(const char *szName);
+	virtual void	GiveNamedItem(const char *szName, bool inSendMessage = false);
+	int				GetNumberOfItems();
+	void			GiveResources(float inResources);
+	float			GetTimeStartedTopDown() const;
+	float			GetTimeOfLastConstructUse() const;
+	void			SetTimeOfLastConstructUse(float inTime);
+	float			GetTimeOfLastSignificantCommanderAction() const;
+	void			LogEmitRoleChange();
+	void			LogPlayerAction(const char* inActionDescription, const char* inActionData);
+	void			LogPlayerActionPlayer(CBasePlayer* inAttackingPlayer, const char* inAction);
+	void			LogPlayerAttackedPlayer(CBasePlayer* inAttackingPlayer, const char* inWeaponName, float inDamage);
+	void			LogPlayerKilledPlayer(CBasePlayer* inAttackingPlayer, const char* inWeaponName);
+		
+	void			StartLeap();
+
+	AvHUser3		GetPreviousUser3(bool inIncludeSpectating = false) const;
+	AvHUser3		GetUser3(bool inIncludeSpectating = false) const;
+	AvHMessageID	GetEvolution(bool inIncludeSpectating = false) const;
+	bool			GetSpecialPASOrigin(Vector& outOrigin);
+	void			GiveTeamUpgrade(AvHMessageID inUpgrade, bool inGive = true);
+	bool			HolsterWeaponToUse();
+	void			Kick();
+	virtual void	Killed( entvars_t *pevAttacker, int iGib );
+	void			NextWeapon();
+	void			ResetEntity(void);
+    bool            PayPurchaseCost(int inCost);
+	void			PlaybackNumericalEvent(int inEventID, int inNumber);
+	bool			PlayHUDSound(AvHHUDSound inSound) const;
+    bool			PlayHUDSound(AvHHUDSound inSound, float x, float y) const;
+	void			PlayHUDStructureNotification(AvHMessageID inMessageID, const Vector& inLocation);
+	void			PlayRandomRoleSound(string inSoundListName, int inChannel = CHAN_AUTO, float inVolume = 1.0f);
+	void			PlayerConstructUse();
+	void			SetCurrentCommand(const struct usercmd_s* inCommand);
+	void			SetDebugCSP(weapon_data_t* inWeaponData);
+	void			SetPendingCommand(char* inCommand);
+	void			TriggerProgressBar(int inEntityID, int inParam);
+	float			GetTimeOfLastTeleport() const;
+	void			SetTimeOfLastTeleport(float inTime);
+	bool			SwitchWeapon(const char* inString);
+	virtual void	StartObserver( Vector vecPosition, Vector vecViewAngle );
+	virtual void	StartObservingIfNotAlready(void);
+	void			StartTopDownMode(void);
+	bool			StopTopDownMode(void);
+	bool			SetBeingDigestedMode(bool inBeingDigested);
+
+	bool			GetIsCloaked() const;
+	bool			GetIsPartiallyCloaked() const;
+	void			TriggerUncloak();
+
+#ifdef USE_UPP
+	void			SetAuthorized(bool inAuthorized);
+	bool			GetAuthorized(void) const;
+	void			SetAuthenticationMask(int inAuthMask);
+	int				GetAuthenticationMask() const;
+	void			SetScoreboardIconName(const string& inIconName);
+	string			GetScoreboardIconName(void);
+	short			GetScoreboardIconNumber(void);
+	int				GetScoreboardIconColor(void);
+#else
+	int				GetAuthenticationMask();
+#endif
+	float			GetTimeLastPlaying() const;
+
+	bool			GetHasSeenTeam(AvHTeamNumber inNumber);
+	void			SetHasSeenTeam(AvHTeamNumber inNumber);
+
+	float			GetTimeOfLastSporeDamage() const;
+	void			SetTimeOfLastSporeDamage(float inTime);
+
+	// Quick ensnare system...add something better?
+	bool			GetIsEnsnared() const;
+    bool            GetIsAbleToAct() const;
+
+	void			DropAmmo(char *pszAmmoType, int iAmmoAmt, int iMax, int iWeaponID,  Vector vecAngles);
+	void			EffectivePlayerClassChanged();
+	void			NeedsTeamUpdate();
+	void			SendTeamUpdate();
+
+	// Returns true if successful.  Fails if the player is too ensnared already
+	bool			SetEnsnareState(bool inState);
+
+	bool			GetIsStunned() const;
+	bool            SetIsStunned(bool inState, float inTime = 0.0f);
+
+    bool            GetIsCatalysted() const;
+    void            SetIsCatalysted(bool inState, float inTime = 0.0f);
+
+	bool			Energize(float inEnergyAmount);
+	bool			Heal(float inAmount, bool inPlaySound = true);
+	bool			Regenerate(float inRegenerationAmount, bool inPlaySound = true);
+	bool			GetIsScreaming();
+	void			StartScreaming();
+
+	//void			UpgradeArmorLevel(void);
+
+	// CBasePlayer stuff
+	virtual void	ImpulseCommands( void );
+	virtual void	ItemPostFrame(void);
+	virtual void	Jump( void );
+	virtual void	ObserverModeIllegal();
+	virtual void	PackDeadPlayerItems(void);
+	virtual void	PreThink( void );
+	virtual void	Spawn( void );
+	//virtual BOOL	SwitchWeapon( CBasePlayerItem* pWeapon );
+	virtual void    TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType);
+    virtual int		TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType);
+	//virtual const char*	TeamID( void );
+	virtual void	UpdateClientData( void );
+
+	virtual float	GetCloakTime() const;
+    virtual int     GetExperienceLevelsSpent() const;
+    virtual void    SetExperienceLevelsSpent(int inSpentLevels);
+
+    virtual string  GetNetworkID() const;
+    virtual void    SetNetworkID(string& inNetworkID);
+#ifdef USE_UPP
+	virtual string	GetNetworkAddress() const;
+	virtual void	SetNetworkAddress(string& inNetworkID);
+#endif
+
+	virtual bool	GetIsTemporarilyInvulnerable() const;
+	AvHTechNodes&	GetCombatNodes();
+	MessageIDListType& GetPurchasedCombatUpgrades();
+	bool			Redeem();
+    
+	bool            GetCanBeResupplied() const;
+    bool			Resupply(bool inGiveHealth = false);
+
+	void			SetDesiredNetName(string inDesiredNetName);
+	void			SetDesiredRoomType(int inRoomType, bool inForceUpdate = false);
+
+    // Gets origin of the player after changing the iuser3.
+    void            GetNewOrigin(AvHUser3 inNewUser3, bool inDucking, vec3_t& outOrigin) const;
+
+	float			GetResources(bool inIncludeSpectating = false) const;
+    void			SetUser3(AvHUser3 inUser3, bool inForceChange = false, bool inGiveWeapons = true);
+    void			SetResources(float inResources, bool inPlaySound = false);
+
+	// Send messages to player's screen
+	bool			SendMessage(const char* pMessage, bool inIsToolTip = false);
+	bool			SendMessageOnce(const char* pMessage, bool inIsToolTip = false);
+	bool			SendMessageNextThink(const char* pMessage);
+
+	virtual int		GetEffectivePlayerClass();
+
+	void			BecomePod();
+	void			SetModelFromState();
+	bool			GetAllowAuth() const;
+	void			SetAllowAuth(bool inAllowAuth);
+	void			SetAuthCheatMask(int inAuthCheatMask);
+
+	int				GetDigestee() const;
+	void			SetDigestee(int inPlayerID);
+	void			StartDigestion(int inDigestee);
+	void			StopDigestion(bool inDigested);
+	
+	void			ProcessEntityBlip(CBaseEntity* inEntity);
+
+	void			SetPosition(const Vector& inNewPosition);
+	virtual char*	GetPlayerModelKeyName();
+	void			GetSize(Vector& outMinSize, Vector& outMaxSize) const;
+	void			SetSizeForUser3();
+	
+    void            GetViewForUser3(AvHUser3 inUser3, bool inIsDucking, float& outFOV, float& outOffset) const;
+    void			SetViewForUser3();
+	void			SetWeaponsForUser3();
+
+	bool			RunClientScript(const string& inScriptName);
+	
+	void			TriggerFog(int inFogEntity, float inFogExpireTime);
+
+	void			UpdateInventoryEnabledState(int inNumActiveHives, bool inForceUpdate = false);
+
+    virtual bool    GetCanUseWeapon() const;
+
+    void            PropagateServerVariables();
+
+	bool			GetUsedKilled()					{ return mUsedKilled; }
+	void			SetUsedKilled(bool bKilled )	{ mUsedKilled = bKilled; }
+	void			ClearOrders() { mClientOrders.clear(); }
+
+	// tankefugl: 0000953 
+	bool			JoinTeamCooledDown(float inCoolDownTime);
+	// tankefugl
+private:
+	void				AcquireOverwatchTarget();
+	bool				AttemptToBuildAlienStructure(AvHMessageID inMessageID);
+	void				ClearRoleAbilities();
+	void				ClearUserVariables();
+	CBaseEntity*		CreateAndDrop(const char* inItemName);
+	void				DeployCurrent();
+	bool				ExecuteAlienMorphMessage(AvHMessageID inMessageID, bool inInstantaneous);
+    bool				ExecuteCombatMessage(AvHMessageID inMessageID, bool& outIsAvailable, bool inForce = false);
+	bool				ExecuteMessage(AvHMessageID inMessageID, bool inInstantaneous = false, bool inForce = false);
+	float				GetAlienAdjustedEventVolume() const;
+	bool				GetCanGestate(AvHMessageID inMessageID, string& outErrorMessage);
+	bool				GetDoesCurrentStateStopOverwatch() const;
+	bool				QueryEnemySighted(CBaseEntity* inEntity);
+	bool				GetHasActiveAlienWeaponWithImpulse(AvHMessageID inMessageID) const;
+	bool				GetRandomGameStartedTick(float inApproximateFrameRate);
+	bool				GetSendBalanceData();
+	bool				GetPurchaseAllowed(AvHMessageID inUpgrade, int& outCost, string* outErrorMessage = NULL) const;
+	int					GetRelevantWeight(void) const;
+	int					GetRelevantWeightForWeapon(AvHBasePlayerWeapon* inWeapon) const;
+	void				GetSpeeds(int& outBaseSpeed, int& outUnemcumberedSpeed) const;
+	void				GiveCombatUpgradesOnSpawn();
+	bool				GiveOrderToSelection(AvHOrderType inOrder, Vector inNormRay);
+	void				GiveOrderToSelection(AvHOrder& inOrder);
+	void				GiveUpgrade(AvHMessageID inUpgrade);
+	void				HandleOverwatch(void);
+	void				HandleResearch();
+	void				HolsterCurrent();
+	void				InitializeTechNodes();
+	void				HandleTopDownInput();
+	void				ProcessEvolution();
+	void				ProcessCombatDeath();
+	void				ProcessResourceAdjustment(AvHMessageID inMessageID);
+	void				ResetBehavior(bool inRemoveFromTeam);
+	void				ResetGameNewMap();
+	void				ResetPlayerPVS();
+	void				SetCombatNodes(const AvHTechNodes& inTechNodes);
+	void				SetLifeformCombatNodesAvailable(bool inAvailable);
+	void				ValidateClientMoveEvents();
+	
+	void				InternalAlienThink();
+	void				InternalAlienUpgradesThink();
+	void				InternalAlienUpgradesCloakingThink();
+	void				InternalAlienUpgradesPheromonesThink();
+	void				InternalAlienUpgradesRegenerationThink();
+	void				InternalCommanderThink();
+	void				InternalBoundResources();
+	void				InternalCommonThink();
+	void				InternalCombatThink();
+	void				InternalDigestionThink();
+	void				InternalEnemySightedPreThink();
+	void				InternalFogThink();
+	void				InternalHUDThink();
+	void				InternalMarineThink();
+	void				InternalPreThink();
+	void				InternalProgressBarThink();
+	void				InternalSpeakingThink();
+
+	void EXPORT			PlayerTouch(CBaseEntity* inOther);
+	
+	bool				PlaySaying(AvHMessageID inMessageID);				
+	bool				ProcessClickEvent(bool inLMB, float inWorldX, float inWorldY);
+	void				ProcessTechUpgrade(AvHMessageID inMessageID);
+	void				Research(AvHMessageID inMessageID, int inEntityIndex);
+	void				Evolve(AvHMessageID inMessageID, bool inInstantaneous = false);
+    void				PurchaseCombatUpgrade(AvHMessageID inMessageID);
+	void				RecalculateSpeed(void);
+	void				ReloadWeapon(void);
+    void                RemoveCombatUpgrade(AvHMessageID inMessageID);
+    void                RemoveCombatUpgradesPremptedBy(AvHMessageID inMessageID);
+	void				ResetOverwatch();
+	void				RevertHealthArmorPercentages();
+	void				SaveHealthArmorPercentages();
+	void				SetMoveTypeForUser3();
+	//bool				SpawnReinforcements(void);
+	void				TurnOverwatchTowardsTarget(CBaseEntity* theTarget);
+	void				TurnOffOverwatch();
+	void				TurnOnOverwatch();
+	void				UpdateAmbientSounds();
+
+	//void				UpdateArmor();
+	void				UpdateAlienUI();
+	void				UpdateBalanceVariables();
+	void				UpdateBlips();
+	void				UpdateDebugCSP();
+	void				UpdateEffectiveClassAndTeam();
+	void				UpdateEntityHierarchy();
+	void				UpdateExperienceLevelsSpent();
+	void				UpdateFirst();
+	void				UpdateFog();
+	void				UpdateGamma();
+	void				UpdateInfoLocations();
+	void				UpdateParticleTemplates();
+	void				UpdateOrders();
+	void				UpdateOverwatch();
+	void				UpdatePendingClientScripts();
+	void				UpdateProgressBar();
+	void				UpdateVUser4();
+	void				UpdateSetSelect();
+	void				UpdateSpawnScreenFade();
+	void				UpdateSoundNames();
+	void				UpdateTechNodes();
+	void				UpdateTopDownMode();
+
+	void				Init();
+
+    float				mResources;
+
+	bool				mFirstUpdate;
+	bool				mNewMap;
+
+	bool				mHasSeenTeamOne;
+	bool				mHasSeenTeamTwo;
+
+	string				mQueuedThinkMessage;
+
+	bool				mClientInOverwatch;
+	bool				mInOverwatch;
+	bool				mOverwatchEnabled;
+	int					mOverwatchTarget;
+	float				mTimeOfLastOverwatchPreventingAction;
+	float				mTimeLastSeenOverwatchTarget;
+	Vector				mOverwatchFacing;
+	bool				mOverwatchFiredThisThink;
+
+	// tankefugl: 0000953
+	float				mTimeLastJoinTeam;
+	// tankefugl
+
+	// alien upgrades
+	float				mTimeOfLastRegeneration;
+	float				mTimeOfLastPheromone;
+
+	float				mTimeOfLastUse;
+
+	float				mTimeLeapEnd;
+
+	Vector				mPositionBeforeTopDown;
+	Vector				mAnglesBeforeTopDown;
+	Vector				mViewAnglesBeforeTopDown;
+	Vector				mViewOfsBeforeTopDown;
+	string				mAnimExtensionBeforeTopDown;
+	bool				mClientInTopDownMode;
+	bool				mInTopDownMode;
+	int					mTimeStartedTopDown;
+	
+	float				mTimeOfLastSaying;
+	AvHMessageID		mLastSaying;
+	bool				mIsSpeaking;
+	bool				mOrdersRequested;
+	bool				mOrderAcknowledged;
+	float				mTimeOfLastEnemySighting;
+	bool				mEnemySighted;
+
+	bool				mTriggerUncloak;
+
+	bool				mHasLeftReadyRoom;
+	bool				mHasBeenSpectator;
+	char*				mPendingCommand;
+
+	struct usercmd_s	mCurrentCommand;
+	bool				mAttackOneDown;
+	bool				mAttackTwoDown;
+	Vector				mAttackOnePressedWorldPos;
+	Vector				mAttackTwoPressedWorldPos;
+	Vector				mMouseWorldPos;
+	bool				mPlacingBuilding;
+
+	EntityListType		mSelected;
+	EntityListType		mClientSelected;
+
+	EntityInfo			mTrackingEntity;
+	EntityInfo			mClientTrackingEntity;
+
+	EntityListType		mClientGroups[kNumHotkeyGroups];
+	AvHAlertType		mClientGroupAlerts[kNumHotkeyGroups];
+	int					mClientRequests[kNumRequestTypes];
+	EntityListType		mClientSelectAllGroup;
+
+	OrderListType		mClientOrders;
+
+    AvHEntityHierarchy	mClientEntityHierarchy;
+
+	// Research nodes for commander
+	AvHTechNodes		mClientTechNodes;
+	AvHTechSlotListType	mClientTechSlotList;
+
+	AvHMessageID		mClientResearchingTech;
+
+	float				mClientGamma;
+
+	StringList			mSentMessageList;
+
+	AvHVisibleBlipList	mFriendlyBlips;
+	AvHVisibleBlipList	mEnemyBlips;
+
+	AvHVisibleBlipList	mClientFriendlyBlips;
+	AvHVisibleBlipList	mClientEnemyBlips;
+	
+	int					mClientCommander;
+
+	Vector				mSpecialPASOrigin;
+	Vector				mClientSpecialPASOrigin;
+	float				mTimeOfLastPASUpdate;
+
+	bool				mClientIsAlien;
+
+	bool				mAlienSightActive;
+	
+	float				mTimeOfLastTeleport;
+    float               mTimeOfLastRedeem;
+
+	float				mJetpackEnergy;
+	bool				mJetpacking;
+
+	weapon_data_t		mClientDebugCSPInfo;
+	weapon_data_t		mDebugCSPInfo;
+	float				mClientNextAttack;
+
+	float				mTimeToBeUnensnared;
+	float				mLastTimeEnsnared;
+	int					mMaxWalkSpeed;
+	int					mMaxGallopSpeed;
+	vec3_t				mLastGallopViewDirection;
+
+	float				mTimeToBeFreeToMove;
+    float               mTimeToEndCatalyst;
+
+	float				mLastTimeInCommandStation;
+	float				mLastTimeCheckedRedemption;
+	float				mLastTimeRedemptionTriggered;
+
+	float				mLastTimeStartedPlaying;
+
+	float				mTimeOfLastHelpText;
+	bool				mLastHelpWasGeneral;
+
+	float				mLastPowerArmorThink;
+	float				mLastInventoryThink;
+
+	int					mNumHives;
+
+	float				mTimeLastPlaying;
+
+	float				mTimeGestationStarted;
+
+	AvHUser3			mPreviousUser3;
+    float               mSavedJetpackEnergy;
+
+	AvHMessageID		mEvolution;
+	float				mHealthPercentBefore;
+	float				mArmorPercentBefore;
+
+	StringList			mClientSoundNames;
+
+	bool				mIsScreaming;
+	float				mTimeStartedScream;
+
+	float				mKilledX, mKilledY;
+
+	int					mNumParticleTemplatesSent;
+	float				mTimeOfLastParticleTemplateSending;
+
+	int					mClientProgressBarEntityIndex;
+	int					mProgressBarEntityIndex;
+	int					mProgressBarParam;
+	float				mTimeProgressBarTriggered;
+
+	float				mTimeOfLastFogTrigger;
+	float				mFogExpireTime;
+	int					mCurrentFogEntity;
+	int					mClientCurrentFogEntity;
+
+	AvHBaseInfoLocationListType	mClientInfoLocations;
+
+	HiveInfoListType	mClientHiveInfo;
+
+	AvHAlienUpgradeListType		mClientUpgrades;
+
+	StringList			mPendingClientScripts;
+
+	bool				mHasGivenOrder;
+	float				mTimeOfLastSignificantCommanderAction;
+
+	int					mPreThinkTicks;
+	float				mPreThinkFrameRate;
+
+	string				mDesiredNetName;
+
+	bool				mAllowAuth;
+	int					mAuthCheatMask;
+	int					mClientMenuTechSlots;
+
+	float				mTimeOfLastClassAndTeamUpdate;
+	bool				mEffectivePlayerClassChanged;
+	bool				mNeedsTeamUpdate;
+	bool				mSendTeamUpdate;
+	bool				mSendSpawnScreenFade;
+
+	int					mDigestee;
+	float				mTimeOfLastDigestDamage;
+	float				mTimeOfLastCombatThink;
+
+	int					mDesiredRoomType;
+	int					mClientDesiredRoomType;
+
+	float				mTimeOfLastConstructUseAnimation;
+	float				mTimeOfLastConstructUse;
+
+	float				mTimeOfLastResupply;
+
+	float				mTimeOfMetabolizeEnd;
+
+	AvHMessageID		mLastSelectEvent;
+	Vector				mPositionBeforeLastGotoGroup;
+
+	float				mTimeOfLastSporeDamage;
+	float				mTimeOfLastTouchDamage;
+
+	string				mLastMessageSent;
+
+	float				mExperience;
+	float				mClientPercentToNextLevel;
+	int					mExperienceLevelsSpent;
+	int					mClientExperienceLevelsSpent;
+
+	MessageIDListType	mPurchasedCombatUpgrades;
+    MessageIDListType	mGiveCombatUpgrades;
+
+	AvHTechNodes		mCombatNodes;
+
+    int                 mScore;
+    int                 mSavedCombatFrags;
+
+#ifdef USE_UPP
+	bool				mAuthorized;
+	int					mAuthMask;
+	string				mScoreboardIconName;
+	string				mNetworkAddress;
+#else
+	int                 mCachedAuthenticationMask;
+#endif
+    int                 mLastModelIndex;
+    
+    string              mNetworkID;
+	
+
+#ifdef AVH_PLAYTEST_BUILD
+	BalanceIntListType		mClientBalanceInts;
+	BalanceFloatListType	mClientBalanceFloats;
+#endif
+
+    struct ServerVariable
+    {
+        std::string mName;
+        std::string mLastValueSent;
+    };
+
+    std::vector<ServerVariable> mServerVariableList;
+
+	bool				mUsedKilled;
+	float				mNextBalanceVarUpdate;
+};
+
+typedef vector<AvHPlayer*>	PlayerListType;
+
+#endif
+
diff --git a/main/source/mod/AvHPlayerUpgrade.cpp b/main/source/mod/AvHPlayerUpgrade.cpp
new file mode 100644
index 00000000..f008ffb2
--- /dev/null
+++ b/main/source/mod/AvHPlayerUpgrade.cpp
@@ -0,0 +1,550 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHPlayerUpgrade.cpp $
+// $Date: 2002/11/05 06:17:26 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHPlayerUpgrade.cpp,v $
+// Revision 1.25  2002/11/05 06:17:26  Flayra
+// - Balance changes
+//
+// Revision 1.24  2002/10/20 02:36:14  Flayra
+// - Regular update
+//
+// Revision 1.23  2002/10/18 22:22:04  Flayra
+// - Toned down fade armor
+//
+// Revision 1.22  2002/10/04 18:03:43  Flayra
+// - Soldier armor reduced back to 50 + 20 per upgrade (instead of 100 + 20).  Means two skulk bites to kill.
+//
+// Revision 1.21  2002/10/03 19:02:19  Flayra
+// - Toned down primal scream
+//
+// Revision 1.20  2002/09/25 20:50:23  Flayra
+// - Increased armor for soldiers to 100
+// - Heavy armor now takes 100% of damage
+//
+// Revision 1.19  2002/09/23 22:02:56  Flayra
+// - Fixed bug where damage upgrades were applying when they shouldn't (for aliens)
+// - Added heavy armor
+//
+// Revision 1.18  2002/09/09 20:05:20  Flayra
+// - More heavily armored cocooned aliens to allow them to morph in combat a bit more and for tension when encountered
+//
+// Revision 1.17  2002/08/31 18:01:02  Flayra
+// - Work at VALVe
+//
+// Revision 1.16  2002/08/16 02:43:16  Flayra
+// - Adjusted power armor slightly so it's not worse then regular armor at any point
+//
+// Revision 1.15  2002/07/28 19:21:28  Flayra
+// - Balance changes after/during RC4a
+//
+// Revision 1.14  2002/07/23 17:18:47  Flayra
+// - Level 1 armor toned down, power armor changes
+//
+// Revision 1.13  2002/07/01 21:43:56  Flayra
+// - Added offensive upgrade back, when under the influence...of primal scream!
+//
+// Revision 1.12  2002/06/25 18:14:40  Flayra
+// - Removed old offensive upgrades
+//
+// Revision 1.11  2002/06/03 16:55:49  Flayra
+// - Toned down carapace and marine upgrades
+//
+// Revision 1.10  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHSpecials.h"
+#include "mod/AvHBalance.h"
+#include "common/damagetypes.h"
+
+const int	kWeaponTracerDefault		= 0;
+const int	kWeaponTracerLevelOne		= 6;
+const int	kWeaponTracerLevelTwo		= 4;
+const int	kWeaponTracerLevelThree		= 2;
+
+float AvHPlayerUpgrade::GetAlienMeleeDamageUpgrade(int inUpgrade, bool inIncludeFocus)
+{
+	float theMultiplier = 1.0f;
+	
+	if(GetHasUpgrade(inUpgrade, MASK_BUFFED))
+	{
+		theMultiplier = 1.0f + (float)BALANCE_FVAR(kPrimalScreamDamageModifier);
+	}
+
+    if(inIncludeFocus)
+    {
+        theMultiplier *= AvHPlayerUpgrade::GetFocusDamageUpgrade(inUpgrade);
+    }
+	
+	return theMultiplier;
+}
+
+float AvHPlayerUpgrade::GetAlienRangedDamageUpgrade(int inUpgrade)
+{
+	float theMultiplier = 1.0f;
+	
+	if(GetHasUpgrade(inUpgrade, MASK_BUFFED))
+	{
+		theMultiplier = 1.0f + (float)BALANCE_FVAR(kPrimalScreamDamageModifier);
+	}
+
+	return theMultiplier;
+}
+
+float AvHPlayerUpgrade::GetFocusDamageUpgrade(int inUpgrade)
+{
+	float theFocusDamageUpgrade = 1.0f;
+
+	int theFocusLevel = AvHGetAlienUpgradeLevel(inUpgrade, MASK_UPGRADE_8);
+	if(theFocusLevel > 0)
+	{
+		// Increase damage for each level of focus
+		const float theFocusDamageUpgradePercentPerLevel = (float)BALANCE_FVAR(kFocusDamageUpgradePercentPerLevel);
+		theFocusDamageUpgrade += theFocusLevel*theFocusDamageUpgradePercentPerLevel;
+	}
+
+	return theFocusDamageUpgrade;
+}
+
+float AvHPlayerUpgrade::GetArmorValue(int inNumHives)
+{
+	// Each point of armor is work 1/x points of health
+	float theArmorValueNonAlien = BALANCE_FVAR(kArmorValueNonAlien);
+	float theArmorBonus = theArmorValueNonAlien;
+
+	if(inNumHives > 0)
+	{
+		float theArmorValueBase = 1.0f + (float)BALANCE_FVAR(kArmorValueBase);
+		float theArmorValuePerHive = (float)BALANCE_FVAR(kArmorValuePerHive);
+		inNumHives = min(inNumHives, kMaxHives);
+
+		theArmorBonus = (theArmorValueBase + inNumHives*theArmorValuePerHive);
+	}
+
+	// Smaller is better
+	theArmorBonus = 1.0f/theArmorBonus;
+
+	return theArmorBonus;
+}
+
+float AvHPlayerUpgrade::GetArmorAbsorption(AvHUser3 inUser3, int inUpgrade, int inNumHives)
+{
+	// A value of .2 means the armor Takes 80% of the damage, so the value gets smaller as it improves
+	float theAbsorption = (float)BALANCE_FVAR(kArmorAbsorptionBase);
+	inNumHives = min(inNumHives, kMaxHives);//voogru: prevent aliens taking negative damage if some mapper goon (or me :o) ) decides to put more than 3 hives on the map.
+
+	// Heavy armor is the shiznit
+	if(inUser3 == AVH_USER3_MARINE_PLAYER && GetHasUpgrade(inUpgrade, MASK_UPGRADE_13))
+	{
+		float theHeavyArmorAbsorbPercent = BALANCE_IVAR(kHeavyArmorAbsorbPercent)/100.0f;
+		ASSERT(theHeavyArmorAbsorbPercent >= 0.0f);
+		ASSERT(theHeavyArmorAbsorbPercent <= 1.0f);
+
+		theAbsorption = 1.0f - theHeavyArmorAbsorbPercent;
+	}
+
+    // Increase absorption at higher hive-levels to make sure armor is always used before player dies
+    if(inNumHives)
+    {
+        switch(inUser3)
+        {
+        case AVH_USER3_ALIEN_PLAYER1:
+        case AVH_USER3_ALIEN_PLAYER2:
+        case AVH_USER3_ALIEN_PLAYER3:
+        case AVH_USER3_ALIEN_PLAYER4:
+        case AVH_USER3_ALIEN_PLAYER5:
+        case AVH_USER3_ALIEN_EMBRYO:
+            theAbsorption -= (inNumHives - 1)*(float)BALANCE_FVAR(kArmorAbsorptionPerExtraHive);
+            break;
+        }
+    }
+
+	ASSERT(theAbsorption >= 0.0f);
+	ASSERT(theAbsorption <= 1.0f);
+
+	return theAbsorption;
+}
+
+int AvHPlayerUpgrade::GetMaxHealth(int inUpgrade, AvHUser3 inUser3, int inLevel)
+{
+	int theMaxHealth = 0;
+	int theHealthLevelIncrementPercent = BALANCE_IVAR(kCombatLevelHealthIncrease);
+
+	// TODO: Take into account upgrade if added
+	
+	switch(inUser3)
+	{
+	default:
+	case AVH_USER3_MARINE_PLAYER:
+	case AVH_USER3_COMMANDER_PLAYER:
+		theMaxHealth = BALANCE_IVAR(kMarineHealth);
+		break;
+		
+	case AVH_USER3_ALIEN_PLAYER1:
+		theMaxHealth = BALANCE_IVAR(kSkulkHealth);
+		break;
+		
+	case AVH_USER3_ALIEN_PLAYER2:
+		theMaxHealth = BALANCE_IVAR(kGorgeHealth);
+		break;
+		
+	case AVH_USER3_ALIEN_PLAYER3:
+		theMaxHealth = BALANCE_IVAR(kLerkHealth);
+		break;
+		
+	case AVH_USER3_ALIEN_PLAYER4:
+		theMaxHealth = BALANCE_IVAR(kFadeHealth);
+		break;
+		
+	case AVH_USER3_ALIEN_PLAYER5:
+		theMaxHealth = BALANCE_IVAR(kOnosHealth);
+		break;
+
+	case AVH_USER3_ALIEN_EMBRYO:
+		theMaxHealth = BALANCE_IVAR(kGestateHealth);
+		break;
+	}
+	
+	//return (1.0f + (inLevel - 1)*theHealthLevelIncrementPercent)*theMaxHealth;
+	return theMaxHealth + (inLevel - 1)*theHealthLevelIncrementPercent;
+}
+
+
+int AvHPlayerUpgrade::GetMaxArmorLevel(int inUpgrade, AvHUser3 inUser3)
+{
+	int theMaxArmorLevel = 0;
+
+	int theArmorLevel = AvHPlayerUpgrade::GetArmorUpgrade(inUser3, inUpgrade);
+	//bool theHasAlienCarapace = GetHasUpgrade(inUpgrade, MASK_UPGRADE_1);
+	bool theHasPowerArmor = GetHasUpgrade(inUpgrade, MASK_UPGRADE_10);
+	bool theHasHeavyArmor = GetHasUpgrade(inUpgrade, MASK_UPGRADE_13);
+
+	// Upgrade TODO: Take different levels into account?
+
+	switch(inUser3)
+	{
+	default:
+	case AVH_USER3_MARINE_PLAYER:
+	case AVH_USER3_COMMANDER_PLAYER:
+		//theMaxArmorLevel = 100 + theArmorLevel*20;
+		theMaxArmorLevel = BALANCE_IVAR(kMarineBaseArmor) + (int)((theArmorLevel/3.0f)*BALANCE_IVAR(kMarineArmorUpgrade));
+		if(theHasHeavyArmor)
+		{
+			theMaxArmorLevel = BALANCE_IVAR(kMarineBaseHeavyArmor) + (int)((theArmorLevel/3.0f)*BALANCE_IVAR(kMarineHeavyArmorUpgrade));
+		}
+		//if(theHasPowerArmor)
+		//{
+		//	theMaxArmorLevel *= 2;
+		//}
+		break;
+
+	case AVH_USER3_ALIEN_PLAYER1:
+		theMaxArmorLevel = BALANCE_IVAR(kSkulkBaseArmor) + (int)((theArmorLevel/3.0f)*BALANCE_IVAR(kSkulkArmorUpgrade));//(theHasAlienCarapace ? 30 : 10);
+		break;
+
+	case AVH_USER3_ALIEN_PLAYER2:
+		theMaxArmorLevel = BALANCE_IVAR(kGorgeBaseArmor) + (int)((theArmorLevel/3.0f)*BALANCE_IVAR(kGorgeArmorUpgrade));//(theHasAlienCarapace ? 75 : 50);
+		break;
+
+	case AVH_USER3_ALIEN_PLAYER3:
+		theMaxArmorLevel = BALANCE_IVAR(kLerkBaseArmor) + (int)((theArmorLevel/3.0f)*BALANCE_IVAR(kLerkArmorUpgrade));//(theHasAlienCarapace ? 75 : 50);
+		break;																								
+
+	case AVH_USER3_ALIEN_PLAYER4:
+		theMaxArmorLevel = BALANCE_IVAR(kFadeBaseArmor) + (int)((theArmorLevel/3.0f)*BALANCE_IVAR(kFadeArmorUpgrade));//(theHasAlienCarapace ? 150 : 125);
+		break;
+
+	case AVH_USER3_ALIEN_PLAYER5:
+		theMaxArmorLevel = BALANCE_IVAR(kOnosBaseArmor) + (int)((theArmorLevel/3.0f)*BALANCE_IVAR(kOnosArmorUpgrade));//(theHasAlienCarapace ? 200 : 150);
+		break;
+
+	case AVH_USER3_ALIEN_EMBRYO:
+		theMaxArmorLevel = BALANCE_IVAR(kGestateBaseArmor);
+		break;
+
+	}
+
+	return theMaxArmorLevel;
+}
+
+// Returns the level: 0, 1, 2 or 3
+int AvHPlayerUpgrade::GetArmorUpgrade(AvHUser3 inUser3, int inUpgrade, float* theArmorMultiplier)
+{
+	int theUpgradeLevel = 0;
+
+	if(theArmorMultiplier)
+		*theArmorMultiplier = 1.0f;
+
+	bool theIsMarine = false;
+	switch(inUser3)
+	{
+	case AVH_USER3_MARINE_PLAYER:
+	case AVH_USER3_COMMANDER_PLAYER:
+		theIsMarine = true;
+		break;
+	}
+
+	if(theIsMarine)
+	{
+		if(GetHasUpgrade(inUpgrade, MASK_UPGRADE_6))
+		{
+			if(theArmorMultiplier)
+				*theArmorMultiplier = 1.0f + (float)BALANCE_FVAR(kMarineArmorLevelThree);
+			theUpgradeLevel = 3;
+		}
+		else if(GetHasUpgrade(inUpgrade, MASK_UPGRADE_5))
+		{
+			if(theArmorMultiplier)
+				*theArmorMultiplier = 1.0f + (float)BALANCE_FVAR(kMarineArmorLevelTwo);
+			
+			theUpgradeLevel = 2;
+		}
+		else if(GetHasUpgrade(inUpgrade, MASK_UPGRADE_4))
+		{
+			if(theArmorMultiplier)
+				*theArmorMultiplier = 1.0f + (float)BALANCE_FVAR(kMarineArmorLevelOne);
+			
+			theUpgradeLevel = 1;
+		}
+    }
+	else
+	{
+		if(GetHasUpgrade(inUpgrade, MASK_UPGRADE_1))
+		{
+			if(theArmorMultiplier)
+			{
+				*theArmorMultiplier = 1.0f + (float)BALANCE_FVAR(kAlienArmorLevelOne);
+			}
+			theUpgradeLevel = 1;
+
+			if(GetHasUpgrade(inUpgrade, MASK_UPGRADE_10))
+			{
+				if(theArmorMultiplier)
+				{
+					*theArmorMultiplier = 1.0f + (float)BALANCE_FVAR(kAlienArmorLevelTwo);
+				}
+				
+				theUpgradeLevel = 2;
+			}
+			if(GetHasUpgrade(inUpgrade, MASK_UPGRADE_11))
+			{
+				if(theArmorMultiplier)
+				{
+					*theArmorMultiplier = 1.0f + (float)BALANCE_FVAR(kAlienArmorLevelThree);
+				}
+				
+				theUpgradeLevel = 3;
+			}
+		}
+	}
+	
+	return theUpgradeLevel;
+}
+
+// Returns the level: 0, 1, 2 or 3
+int AvHPlayerUpgrade::GetWeaponUpgrade(int inUser3, int inUpgrade, float* outDamageMultiplier, int* outTracerFreq, float* outSpread)
+{
+	int theUpgradeLevel = 0;
+	
+	if(outDamageMultiplier)
+		*outDamageMultiplier = 1.0f;
+
+	if(outTracerFreq)
+		*outTracerFreq = kWeaponTracerDefault;
+
+	// Only marines and marine items can get damage upgrades
+	switch(inUser3)
+	{
+	case AVH_USER3_MARINE_PLAYER:
+	case AVH_USER3_TURRET:
+	case AVH_USER3_SIEGETURRET:
+	case AVH_USER3_MARINEITEM:
+    case AVH_USER3_MINE:
+	case AVH_USER3_NUKE:
+		// Apply extra damage for upgrade
+		if(GetHasUpgrade(inUpgrade, MASK_UPGRADE_3))
+		{
+			if(outDamageMultiplier)
+				*outDamageMultiplier *= (1.0f + (float)BALANCE_FVAR(kWeaponDamageLevelThree));
+			if(outTracerFreq)
+				*outTracerFreq = kWeaponTracerLevelThree;
+		
+			theUpgradeLevel = 3;
+		} 
+		else if(GetHasUpgrade(inUpgrade, MASK_UPGRADE_2))
+		{
+			if(outDamageMultiplier)
+				*outDamageMultiplier *= (1.0f + (float)BALANCE_FVAR(kWeaponDamageLevelTwo));
+			if(outTracerFreq)
+				*outTracerFreq = kWeaponTracerLevelTwo;
+			theUpgradeLevel = 2;
+		}
+		else if(GetHasUpgrade(inUpgrade, MASK_UPGRADE_1))
+		{
+			if(outDamageMultiplier)
+				*outDamageMultiplier *= (1.0f + (float)BALANCE_FVAR(kWeaponDamageLevelOne));
+		
+			if(outTracerFreq)
+				*outTracerFreq = kWeaponTracerLevelOne;
+		
+			theUpgradeLevel = 1;
+		}
+		break;
+	}
+	
+	return theUpgradeLevel;
+}
+
+float AvHPlayerUpgrade::GetSilenceVolumeLevel(AvHUser3 inUser3, int inUpgrade)
+{
+	int theSilenceLevel = 0;
+
+	switch(inUser3)
+	{
+	case AVH_USER3_ALIEN_PLAYER1:
+	case AVH_USER3_ALIEN_PLAYER2:
+	case AVH_USER3_ALIEN_PLAYER3:
+	case AVH_USER3_ALIEN_PLAYER4:
+	case AVH_USER3_ALIEN_PLAYER5:
+	case AVH_USER3_ALIEN_EMBRYO:
+		theSilenceLevel = AvHGetAlienUpgradeLevel(inUpgrade, MASK_UPGRADE_6);
+		break;
+	}
+	
+	//float theSilenceVolumeFactor = (1 - (theSilenceLevel/3.0f));
+
+	float theSilenceVolumeFactor = 1.0f;
+	switch(theSilenceLevel)
+	{
+	case 1:
+		theSilenceVolumeFactor = (float)BALANCE_FVAR(kSilenceLevel1Volume);
+		break;
+	case 2:
+		theSilenceVolumeFactor = (float)BALANCE_FVAR(kSilenceLevel2Volume);
+		break;
+	case 3:
+		theSilenceVolumeFactor = (float)BALANCE_FVAR(kSilenceLevel3Volume);
+		break;
+	}
+
+	return theSilenceVolumeFactor;
+}
+
+float AvHPlayerUpgrade::CalculateDamageLessArmor(AvHUser3 inUser3, int inUser4, float flDamage, float& ioArmorValue, int bitsDamageType, int inNumHives)
+{
+	// if we're alien, if we have the armor upgrade, we take less damage off the top
+//	if(AvHGetIsAlien(inUser3))
+//	{
+//		int theArmorUpgradeLevel = AvHGetAlienUpgradeLevel(inUser4, MASK_UPGRADE_1);
+//		if((theArmorUpgradeLevel > 0) && ((int)(ioArmorValue) > 0))
+//		{
+//			float thePercentageOffTop = .1f*theArmorUpgradeLevel;
+//			flDamage -= flDamage*thePercentageOffTop; 
+//		}
+//	}
+	
+	float flRatio = AvHPlayerUpgrade::GetArmorAbsorption(inUser3, inUser4, inNumHives);
+	float flBonus = AvHPlayerUpgrade::GetArmorValue(inNumHives);
+	
+	// Level 1 aliens don't take falling damage, ever
+	if((inUser3 == AVH_USER3_ALIEN_PLAYER1) && (bitsDamageType & DMG_FALL))
+	{
+		flDamage = 0.0f;
+	}
+	
+	// Armor. 
+	if (ioArmorValue && !(bitsDamageType & (DMG_FALL | DMG_DROWN)) )// armor doesn't protect against fall or drown damage!
+	{
+		float flNew = flDamage*flRatio;
+		float flArmor = (flDamage - flNew)*flBonus;
+		
+		// Does this use more armor than we have?
+		if (flArmor > ioArmorValue)
+		{
+			flArmor = ioArmorValue;
+			flArmor *= (1/flBonus);
+			flNew = flDamage - flArmor;
+			ioArmorValue = 0;
+		}
+		else
+		{
+			ioArmorValue -= flArmor;
+			if ( bitsDamageType & (NS_DMG_ACID) )
+			{
+				ioArmorValue -= flArmor;
+			}
+		}
+	
+		flDamage = flNew;
+	}
+	
+	return flDamage;
+}
+
+const int kCombatMinLevel = 1;
+const int kCombatMaxLevel = 10;
+
+float AvHPlayerUpgrade::GetExperienceForLevel(int inLevel)
+{
+	float theExperienceForLevel = 0.0f;
+	int theLevel = 1;
+
+    int theCombatBaseExperience = BALANCE_IVAR(kCombatBaseExperience);
+	float theCombatLevelExperienceModifier = (float)BALANCE_FVAR(kCombatLevelExperienceModifier);
+
+	while((theLevel < inLevel) && (theCombatLevelExperienceModifier > 0))
+	{
+		theExperienceForLevel += (1.0f + (theLevel-1)*theCombatLevelExperienceModifier)*theCombatBaseExperience;
+		theLevel++;
+	}
+	
+	return theExperienceForLevel;
+}
+
+int AvHPlayerUpgrade::GetPlayerLevel(float inExperience)
+{
+	int thePlayerLevel = 1;
+
+    int theCombatBaseExperience = BALANCE_IVAR(kCombatBaseExperience);
+	float theCombatLevelExperienceModifier = (float)BALANCE_FVAR(kCombatLevelExperienceModifier);
+
+	while((inExperience > 0) && (theCombatLevelExperienceModifier > 0))
+	{
+		inExperience -= (1.0f + (thePlayerLevel - 1)*theCombatLevelExperienceModifier)*theCombatBaseExperience;
+
+		if(inExperience > 0)
+		{
+			thePlayerLevel++;
+		}
+	}
+
+	thePlayerLevel = max(min(thePlayerLevel, kCombatMaxLevel), kCombatMinLevel);
+
+	return thePlayerLevel;
+}
+
+float AvHPlayerUpgrade::GetPercentToNextLevel(float inExperience)
+{
+	int theCurrentLevel = AvHPlayerUpgrade::GetPlayerLevel(inExperience);
+	int theNextLevel = min(max(theCurrentLevel + 1, kCombatMinLevel), kCombatMaxLevel);
+
+	float theExperienceForCurrentLevel = AvHPlayerUpgrade::GetExperienceForLevel(theCurrentLevel);
+	float theExperienceForNextLevel = AvHPlayerUpgrade::GetExperienceForLevel(theNextLevel);
+
+	float thePercent = (inExperience - theExperienceForCurrentLevel)/(theExperienceForNextLevel - theExperienceForCurrentLevel);
+
+	thePercent = min(max(0.0f, thePercent), 1.0f);
+
+	return thePercent;
+}
\ No newline at end of file
diff --git a/main/source/mod/AvHPlayerUpgrade.h b/main/source/mod/AvHPlayerUpgrade.h
new file mode 100644
index 00000000..cdef7f5e
--- /dev/null
+++ b/main/source/mod/AvHPlayerUpgrade.h
@@ -0,0 +1,50 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHPlayerUpgrade.h $
+// $Date: 2002/09/23 22:02:57 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHPlayerUpgrade.h,v $
+// Revision 1.7  2002/09/23 22:02:57  Flayra
+// - Fixed bug where damage upgrades were applying when they shouldn't (for aliens)
+// - Added heavy armor
+//
+// Revision 1.6  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_PLAYER_UPGRADE_H
+#define AVH_PLAYER_UPGRADE_H
+
+#include "util/nowarnings.h"
+#include "types.h"
+#include "mod/AvHSpecials.h"
+
+class AvHPlayerUpgrade
+{
+public:
+	static float GetAlienMeleeDamageUpgrade(int inUpgrade, bool inIncludeFocus = false);
+	static float GetAlienRangedDamageUpgrade(int inUpgrade);
+	static float GetFocusDamageUpgrade(int inUpgrade);
+
+	static float GetArmorValue(int inNumHives = -1);
+	static float GetArmorAbsorption(AvHUser3 inUser3, int inUpgrade, int inNumHives = -1);
+	static int GetMaxArmorLevel(int inUpgrade, AvHUser3 inUser3);
+	static int GetMaxHealth(int inUpgrade, AvHUser3 inUser3, int inLevel = 1);
+	static int GetArmorUpgrade(AvHUser3 inUser3, int inUpgrade, float* outArmorMultiplier = NULL);
+	static float GetSilenceVolumeLevel(AvHUser3 inUser3, int inUpgrade);
+	static int GetWeaponUpgrade(int inUser3, int inUpgrade, float* theDamageMultiplier = NULL, int* theTracerFreq = NULL, float* theSpread = NULL);
+	static float CalculateDamageLessArmor(AvHUser3 inUser3, int inUser4, float flDamage, float& ioArmorValue, int bitsDamageType, int inNumHives = -1);
+	static float GetExperienceForLevel(int inLevel);
+	static int GetPlayerLevel(float inExperience);
+	static float GetPercentToNextLevel(float inExperience);
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHPrimalScream.cpp b/main/source/mod/AvHPrimalScream.cpp
new file mode 100644
index 00000000..850dd257
--- /dev/null
+++ b/main/source/mod/AvHPrimalScream.cpp
@@ -0,0 +1,176 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHPrimalScream.cpp $
+// $Date: 2002/11/22 21:28:17 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHPrimalScream.cpp,v $
+// Revision 1.9  2002/11/22 21:28:17  Flayra
+// - mp_consistency changes
+//
+// Revision 1.8  2002/07/24 19:09:17  Flayra
+// - Linux issues
+//
+// Revision 1.7  2002/07/24 18:55:52  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.6  2002/07/24 18:45:42  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.5  2002/07/01 21:44:16  Flayra
+// - Refactoring
+//
+// Revision 1.4  2002/06/25 18:14:54  Flayra
+// - Reworking for correct player animations and new enable/disable state, new view model artwork, alien weapon refactoring
+//
+// Revision 1.3  2002/06/03 16:39:10  Flayra
+// - Added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.2  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienEquipmentConstants.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHGamerules.h"
+#include "mod/AvHServerUtil.h"
+#endif
+
+#include "mod/AvHConstants.h"
+
+LINK_ENTITY_TO_CLASS(kwPrimalScream, AvHPrimalScream);
+
+int	AvHPrimalScream::GetBarrelLength() const
+{
+	return kPrimalScreamBarrelLength;
+}
+
+float AvHPrimalScream::GetRateOfFire() const
+{
+	return BALANCE_FVAR(kPrimalScreamROF);
+}
+
+bool AvHPrimalScream::GetFiresUnderwater() const
+{
+	return true;
+}
+
+int	AvHPrimalScream::GetDeployAnimation() const
+{
+	// Look at most recently used weapon and see if we can transition from it
+	int theDeployAnimation = -1;
+	
+	AvHWeaponID thePreviousID = this->GetPreviousWeaponID();
+	
+	switch(thePreviousID)
+	{
+	case AVH_WEAPON_BITE2:
+		theDeployAnimation = 9;
+		break;
+	case AVH_WEAPON_SPIKE:
+		theDeployAnimation = 8;
+		break;
+	}
+	
+	return theDeployAnimation;
+}
+
+float AvHPrimalScream::GetDeployTime() const
+{
+	return .6f;
+}
+
+int	AvHPrimalScream::GetIdleAnimation() const
+{
+	return 2;
+}
+
+int	AvHPrimalScream::GetShootAnimation() const
+{
+	return 6;
+}
+
+bool AvHPrimalScream::GetIsDroppable() const
+{
+	return false;
+}
+	
+void AvHPrimalScream::Init()
+{
+	this->mRange = BALANCE_IVAR(kPrimalScreamRange);
+}
+
+char* AvHPrimalScream::GetViewModel() const
+{
+	return kLevel3ViewModel;
+}
+
+
+void AvHPrimalScream::Precache(void)
+{
+	AvHAlienWeapon::Precache();
+	
+	PRECACHE_UNMODIFIED_SOUND(kPrimalScreamSound);
+	
+	this->mEvent = PRECACHE_EVENT(1, kPrimalScreamShootEventName);
+}
+
+void AvHPrimalScream::Spawn()
+{
+    AvHAlienWeapon::Spawn(); 
+	
+	Precache();
+	
+	this->m_iId = AVH_WEAPON_PRIMALSCREAM;
+	
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsPrimalScream);
+	
+	SET_MODEL(ENT(this->pev), kNullModel);
+	
+	FallInit();// get ready to fall down.
+	
+}
+
+bool AvHPrimalScream::UsesAmmo(void) const
+{
+	return false;
+}
+
+void AvHPrimalScream::FireProjectiles(void)
+{
+	#ifdef AVH_SERVER
+	
+	// Make sure we have enough points to shoot this thing
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this->m_pPlayer);
+	ASSERT(thePlayer);
+
+	thePlayer->StartScreaming();
+				
+	#endif	
+}
+
diff --git a/main/source/mod/AvHPushableBuildable.cpp b/main/source/mod/AvHPushableBuildable.cpp
new file mode 100644
index 00000000..adccc006
--- /dev/null
+++ b/main/source/mod/AvHPushableBuildable.cpp
@@ -0,0 +1,232 @@
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "saverestore.h"
+#include "func_break.h"
+#include "decals.h"
+#include "explode.h"
+#include "mod/AvHSpecials.h"
+#include "mod/AvHPushableBuildable.h"
+#include "mod/AvHSharedUtil.h"
+
+char *AvHPushableBuildable :: m_soundNames[3] = { "debris/pushbox1.wav", "debris/pushbox2.wav", "debris/pushbox3.wav" };
+
+AvHPushableBuildable::AvHPushableBuildable(AvHTechID inTechID, AvHMessageID inMessageID, char* inClassName, int inUser3) : AvHBaseBuildable(inTechID, inMessageID, inClassName, inUser3)
+{
+	this->m_lastSound = 0;
+	this->m_maxSpeed = 0;
+	this->m_soundTime = 0;
+}
+
+void AvHPushableBuildable::SetConstructionComplete()
+{
+	AvHBaseBuildable::SetConstructionComplete();
+
+//	if ( pev->spawnflags & SF_PUSH_BREAKABLE )
+//		AvHBaseBuildable::Spawn();
+//	else
+//		Precache( );
+
+	//pev->movetype	= MOVETYPE_PUSHSTEP;
+	this->pev->movetype = MOVETYPE_TOSS;
+	pev->solid		= SOLID_BBOX;
+	//SET_MODEL( ENT(pev), STRING(pev->model) );
+	SET_MODEL( ENT(pev), this->GetModelName());
+
+	Vector theMinSize, theMaxSize;
+	AvHSHUGetSizeForTech(this->GetMessageID(), theMinSize, theMaxSize);
+	UTIL_SetSize(this->pev, theMinSize, theMaxSize); 
+
+	if ( pev->friction > 399 )
+		pev->friction = 399;
+
+	m_maxSpeed = 100;//400 - pev->friction;
+	SetBits( pev->flags, FL_FLOAT );
+	pev->friction = 0;
+	
+	pev->origin.z += 1;	// Pick up off of the floor
+	UTIL_SetOrigin( pev, pev->origin );
+
+	// Multiply by area of the box's cross-section (assume 1000 units^3 standard volume)
+	pev->skin = ( pev->skin * (pev->maxs.x - pev->mins.x) * (pev->maxs.y - pev->mins.y) ) * 0.0005;
+	m_soundTime = 0;
+}
+
+float AvHPushableBuildable::GetMaxSpeed(void)
+{ 
+	return m_maxSpeed; 
+}
+
+void AvHPushableBuildable :: Precache( void )
+{
+	AvHBaseBuildable::Precache();
+
+	for ( int i = 0; i < 3; i++ )
+	{
+		PRECACHE_UNMODIFIED_SOUND( m_soundNames[i] );
+	}
+
+	//if ( pev->spawnflags & SF_PUSH_BREAKABLE )
+	//	AvHBaseBuildable::Precache( );
+}
+
+
+void AvHPushableBuildable :: KeyValue( KeyValueData *pkvd )
+{
+	if ( FStrEq(pkvd->szKeyName, "size") )
+	{
+		int bbox = atoi(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+
+		switch( bbox )
+		{
+		case 0:	// Point
+			UTIL_SetSize(pev, Vector(-8, -8, -8), Vector(8, 8, 8));
+			break;
+
+		case 2: // Big Hull!?!?	!!!BUGBUG Figure out what this hull really is
+			UTIL_SetSize(pev, VEC_DUCK_HULL_MIN*2, VEC_DUCK_HULL_MAX*2);
+			break;
+
+		case 3: // Player duck
+			UTIL_SetSize(pev, VEC_DUCK_HULL_MIN, VEC_DUCK_HULL_MAX);
+			break;
+
+		default:
+		case 1: // Player
+			UTIL_SetSize(pev, VEC_HULL_MIN, VEC_HULL_MAX);
+			break;
+		}
+
+	}
+	else if ( FStrEq(pkvd->szKeyName, "buoyancy") )
+	{
+		pev->skin = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	else
+	{
+		AvHBaseBuildable::KeyValue( pkvd );
+	}
+}
+
+
+// Pull the func_pushable
+void AvHPushableBuildable :: Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	if(!this->GetIsBuilt())
+	{
+		AvHBaseBuildable::Use(pActivator, pCaller, useType, value);
+	}
+	else
+	{
+		if ( !pActivator || !pActivator->IsPlayer() )
+		{
+			if ( pev->spawnflags & SF_PUSH_BREAKABLE )
+				this->AvHBaseBuildable::Use( pActivator, pCaller, useType, value );
+			return;
+		}
+		
+		if ( pActivator->pev->velocity != g_vecZero )
+			Move( pActivator, 0 );
+	}
+}
+
+
+void AvHPushableBuildable :: Touch( CBaseEntity *pOther )
+{
+	if ( FClassnameIs( pOther->pev, "worldspawn" ) )
+		return;
+
+	Move( pOther, 1 );
+}
+
+
+void AvHPushableBuildable :: Move( CBaseEntity *pOther, int push )
+{
+	entvars_t*	pevToucher = pOther->pev;
+	int playerTouch = 0;
+
+	// Is entity standing on this pushable ?
+	if ( FBitSet(pevToucher->flags,FL_ONGROUND) && pevToucher->groundentity && VARS(pevToucher->groundentity) == pev )
+	{
+		// Only push if floating
+		if ( pev->waterlevel > 0 )
+			pev->velocity.z += pevToucher->velocity.z * 0.1;
+
+		return;
+	}
+
+
+	if ( pOther->IsPlayer() )
+	{
+		if ( push && !(pevToucher->button & (IN_FORWARD|IN_USE)) )	// Don't push unless the player is pushing forward and NOT use (pull)
+			return;
+		playerTouch = 1;
+	}
+
+	float factor;
+
+	if ( playerTouch )
+	{
+		if ( !(pevToucher->flags & FL_ONGROUND) )	// Don't push away from jumping/falling players unless in water
+		{
+			if ( pev->waterlevel < 1 )
+				return;
+			else 
+				factor = 0.1;
+		}
+		else
+			factor = 1;
+	}
+	else 
+		factor = 0.25;
+
+	// temporarily increase height to allow it over bumps, but only if it's not on the ground already
+	if(FBitSet(this->pev->flags, FL_ONGROUND))
+	{
+		this->pev->origin.z += 10;
+	}
+	else
+	{
+		int a = 0;
+	}
+
+	pev->velocity.x += pevToucher->velocity.x * factor;
+	pev->velocity.y += pevToucher->velocity.y * factor;
+
+	float length = sqrt( pev->velocity.x * pev->velocity.x + pev->velocity.y * pev->velocity.y );
+	if ( push && (length > GetMaxSpeed()) )
+	{
+		pev->velocity.x = (pev->velocity.x * GetMaxSpeed() / length );
+		pev->velocity.y = (pev->velocity.y * GetMaxSpeed() / length );
+	}
+	if ( playerTouch )
+	{
+		pevToucher->velocity.x = pev->velocity.x;
+		pevToucher->velocity.y = pev->velocity.y;
+		if ( (gpGlobals->time - m_soundTime) > 0.7 )
+		{
+			m_soundTime = gpGlobals->time;
+			if ( length > 0 && FBitSet(pev->flags,FL_ONGROUND) )
+			{
+				m_lastSound = RANDOM_LONG(0,2);
+				EMIT_SOUND(ENT(pev), CHAN_WEAPON, m_soundNames[m_lastSound], 0.5, ATTN_NORM);
+	//			SetThink( StopSound );
+	//			pev->nextthink = pev->ltime + 0.1;
+			}
+			else
+				STOP_SOUND( ENT(pev), CHAN_WEAPON, m_soundNames[m_lastSound] );
+		}
+	}
+}
+
+#if 0
+void AvHPushableBuildable::StopSound( void )
+{
+	Vector dist = pev->oldorigin - pev->origin;
+	if ( dist.Length() <= 0 )
+		STOP_SOUND( ENT(pev), CHAN_WEAPON, m_soundNames[m_lastSound] );
+}
+#endif
+
diff --git a/main/source/mod/AvHPushableBuildable.h b/main/source/mod/AvHPushableBuildable.h
new file mode 100644
index 00000000..9f20eaca
--- /dev/null
+++ b/main/source/mod/AvHPushableBuildable.h
@@ -0,0 +1,36 @@
+#ifndef AVH_PUSHABLEBUILDABLE_H
+#define AVH_PUSHABLEBUILDABLE_H
+
+#include "mod/AvHBaseBuildable.h"
+
+class AvHPushableBuildable : public AvHBaseBuildable
+{
+public:
+	AvHPushableBuildable(AvHTechID inTechID, AvHMessageID inMessageID, char* inClassName, int inUser3);
+
+	void	Precache( void );
+	void	Touch ( CBaseEntity *pOther );
+	void	Move( CBaseEntity *pMover, int push );
+	void	KeyValue( KeyValueData *pkvd );
+	void	Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+	void	EXPORT StopSound( void );
+//	virtual void	SetActivator( CBaseEntity *pActivator ) { m_pPusher = pActivator; }
+
+	//virtual int	ObjectCaps( void ) { return (CBaseEntity :: ObjectCaps() & ~FCAP_ACROSS_TRANSITION) | FCAP_CONTINUOUS_USE; }
+
+	inline float GetMaxSpeed(void);
+
+	virtual void SetConstructionComplete();
+	
+	static	TYPEDESCRIPTION m_SaveData[];
+
+	static char *m_soundNames[3];
+	int		m_lastSound;	// no need to save/restore, just keeps the same sound from playing twice in a row
+	float	m_maxSpeed;
+	float	m_soundTime;
+
+
+};
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHReinforceable.cpp b/main/source/mod/AvHReinforceable.cpp
new file mode 100644
index 00000000..c7c4b816
--- /dev/null
+++ b/main/source/mod/AvHReinforceable.cpp
@@ -0,0 +1,151 @@
+#include "mod/AvHReinforceable.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHSharedUtil.h"
+
+AvHReinforceable::AvHReinforceable()
+{
+	this->mReinforcingPlayer = -1;
+	this->mLastTimeReinforced = -1;
+}
+
+void AvHReinforceable::CueRespawnEffect(AvHPlayer* inPlayer)
+{
+	// Nothing by default, but children can override
+}
+
+void AvHReinforceable::ResetEntity(void)
+{
+	this->mReinforcingPlayer = -1;
+	this->mLastTimeReinforced = 0;
+}
+
+void AvHReinforceable::UpdateReinforcements()
+{
+	if(this->GetCanReinforce())
+	{
+		// If this portal isn't reinforcing a player
+		if(this->mReinforcingPlayer == -1)
+		{
+			// if there are any reinforcements
+			//if(this->mNumReinforcements > 0)
+			//{
+				// Find player on this team that's been waiting the longest
+				AvHPlayer* thePlayerToSpawn = NULL;
+		
+				FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*);
+				if(theEntity->GetTeam() == this->GetReinforceTeamNumber())
+				{
+					if(theEntity->GetPlayMode() == PLAYMODE_AWAITINGREINFORCEMENT)
+					{
+						if(!thePlayerToSpawn || (theEntity->GetTimeLastPlaying() < thePlayerToSpawn->GetTimeLastPlaying()))
+						{
+							thePlayerToSpawn = theEntity;
+						}
+					}
+				}
+				END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+				
+				if(thePlayerToSpawn)
+				{
+					// Decrement reinforcements
+					//					this->mNumReinforcements--;
+					
+					// Pay for points if possible
+					//					int theSpawnCost = GetGameRules()->GetGameplay().GetMarineRespawnCost();
+					//					int theNewResources = max(0, (thePlayerToSpawn->GetResources() - theSpawnCost));
+					//					thePlayerToSpawn->SetResources(theNewResources);
+					
+					// Set the player's mode to PLAYMODE_REINFORCING
+					this->mReinforcingPlayer = thePlayerToSpawn->entindex();
+					
+					thePlayerToSpawn->SetPlayMode(PLAYMODE_REINFORCING);
+				}
+				//}
+				// else, if we're not in tourny mode
+				//else if(!GetGameRules()->GetIsTournamentMode())
+				//{
+				// TODO: research reinforcements on their own when there are people waiting
+				//}
+		}
+		else
+		{
+			// Is player still valid, or has he left the server/team?
+			bool thePlayerHasLeft = true;
+			AvHPlayer* theReinforcingPlayer = this->GetReinforcingPlayer();
+			if(theReinforcingPlayer && (theReinforcingPlayer->GetTeam() == this->GetReinforceTeamNumber()))
+			{
+				if(theReinforcingPlayer->GetPlayMode() == PLAYMODE_REINFORCING)
+				{
+					float theRespawnTime = this->GetReinforceTime();
+
+					// Has enough time passed to bring the player in?
+					if((gpGlobals->time > (theReinforcingPlayer->GetTimeLastPlaying() + theRespawnTime)) && (gpGlobals->time > (this->mLastTimeReinforced + theRespawnTime)))
+					{
+						this->ResetReinforcingPlayer(true);
+					}
+
+					thePlayerHasLeft = false;
+				}
+			}
+
+			if(thePlayerHasLeft)
+			{
+				this->ResetReinforcingPlayer(false);
+			}
+		}
+	}
+}
+
+AvHPlayer* AvHReinforceable::GetReinforcingPlayer()
+{
+	AvHPlayer* thePlayer = NULL;
+	if(this->mReinforcingPlayer != -1)
+	{
+		thePlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(this->mReinforcingPlayer)));
+	}
+	
+	return thePlayer;
+}
+
+float AvHReinforceable::GetReinforceTime() const
+{
+	return 15.0f;
+}
+
+void AvHReinforceable::ResetReinforcingPlayer(bool inSuccess)
+{
+	if(this->mReinforcingPlayer != -1)
+	{
+		AvHPlayer* thePlayer = this->GetReinforcingPlayer();
+		if(thePlayer)
+		{
+			// If inSuccess is true, spawn player into the world
+			if(inSuccess)
+			{
+				Vector theLocation;
+				if(this->GetSpawnLocationForPlayer(thePlayer, theLocation))
+				{
+					// set the playmode and reset internal state to reinforce again
+					thePlayer->SetPlayMode(PLAYMODE_PLAYING);
+					
+					VectorCopy(theLocation, thePlayer->pev->origin);
+			
+					this->CueRespawnEffect(thePlayer);
+
+					this->mLastTimeReinforced = gpGlobals->time;
+				}
+			}
+			// else, set player as reinforcement (hive was set inactive before reinforcement finished)
+			else
+			{
+				AvHPlayMode thePlayMode = thePlayer->GetPlayMode();
+				if(thePlayMode == PLAYMODE_REINFORCING)
+				{
+					thePlayer->SetPlayMode(PLAYMODE_AWAITINGREINFORCEMENT);
+				}
+			}
+		}
+		
+		this->mReinforcingPlayer = -1;
+	}
+}
diff --git a/main/source/mod/AvHReinforceable.h b/main/source/mod/AvHReinforceable.h
new file mode 100644
index 00000000..11dd603c
--- /dev/null
+++ b/main/source/mod/AvHReinforceable.h
@@ -0,0 +1,45 @@
+#ifndef AVHREINFORCEABLE_H
+#define AVHREINFORCEABLE_H
+
+#include "util/nowarnings.h"
+#include "extdll.h"
+#include "util.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHBuildable.h"
+#include "dlls/cbase.h"
+#include "mod/AvHMessage.h"
+#include "mod/AvHSpecials.h"
+#include "mod/AvHPlayer.h"
+
+class AvHReinforceable
+{
+public:
+					AvHReinforceable();
+
+	virtual void	CueRespawnEffect(AvHPlayer* inPlayer);
+					
+	virtual bool	GetCanReinforce() const = 0;
+
+	virtual bool	GetSpawnLocationForPlayer(CBaseEntity* inPlayer, Vector& outLocation) const = 0;
+
+	virtual AvHTeamNumber	GetReinforceTeamNumber() const = 0;
+
+	AvHPlayer*		GetReinforcingPlayer();
+
+	virtual float	GetReinforceTime() const;
+	
+	virtual void	ResetEntity(void);
+	
+	virtual void	UpdateReinforcements();
+
+protected:
+	virtual void	ResetReinforcingPlayer(bool inSuccess);
+	
+private:
+	
+	int				mReinforcingPlayer;
+	float			mLastTimeReinforced;
+
+};
+
+#endif
diff --git a/main/source/mod/AvHResearchManager.cpp b/main/source/mod/AvHResearchManager.cpp
new file mode 100644
index 00000000..3e5773c0
--- /dev/null
+++ b/main/source/mod/AvHResearchManager.cpp
@@ -0,0 +1,429 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHResearchManager.cpp $
+// $Date: 2002/10/24 21:41:15 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHResearchManager.cpp,v $
+// Revision 1.11  2002/10/24 21:41:15  Flayra
+// - Attempt to fix progress bars not showing up in release, or when playing online (can't quite figure out when).  Never safe to compare floats anyways.
+//
+// Revision 1.10  2002/09/23 22:28:33  Flayra
+// - Added GetIsResearching method, so automatic armory resupply could be added
+//
+// Revision 1.9  2002/08/02 21:50:37  Flayra
+// - New research system
+//
+// Revision 1.8  2002/07/24 19:09:17  Flayra
+// - Linux issues
+//
+// Revision 1.7  2002/07/24 18:45:42  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.6  2002/07/23 17:20:13  Flayra
+// - Added hooks for research starting, for distress beacon sound effects
+//
+// Revision 1.5  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHResearchManager.h"
+
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHGamerules.h"
+
+AvHResearchNode::AvHResearchNode(AvHMessageID inMessageID, int inEntityIndex)
+{
+	this->mResearch = inMessageID;
+	this->mEntityIndex = inEntityIndex;
+	this->mTimeResearchDone = -1;
+	this->mTimeResearchStarted = -1;
+}
+
+bool AvHResearchNode::GetCanEntityContinueResearch() const
+{
+	bool theCanContinueResearch = true;
+
+	CBaseEntity* theResearchEntity = AvHSUGetEntityFromIndex(this->mEntityIndex);
+	if(!theResearchEntity || !theResearchEntity->IsAlive())
+	{
+		theCanContinueResearch = false;
+	}
+
+	return theCanContinueResearch;
+}
+
+int	AvHResearchNode::GetEntityIndex() const
+{
+	return this->mEntityIndex;
+}
+
+AvHMessageID AvHResearchNode::GetResearching() const
+{
+	return this->mResearch;
+}
+
+float AvHResearchNode::GetTimeResearchDone() const
+{
+	return this->mTimeResearchDone;
+}
+
+float AvHResearchNode::GetTimeResearchStarted() const
+{
+	return this->mTimeResearchStarted;
+}
+
+bool AvHResearchNode::UpdateResearch()
+{
+	bool theResearchDone = false;
+	
+	AvHMessageID theResearchingTech = this->GetResearching();
+	if(theResearchingTech != MESSAGE_NULL)
+	{
+		CBaseEntity* theResearchEntity = AvHSUGetEntityFromIndex(this->mEntityIndex);
+		ASSERT(theResearchEntity);
+		
+		float theTimeResearchDone = this->GetTimeResearchDone();
+		
+		// Set time during the first update
+		if(theTimeResearchDone < 0)
+		{
+			this->mTimeResearchStarted = gpGlobals->time;
+			theTimeResearchDone = this->mTimeResearchStarted + GetGameRules()->GetBuildTimeForMessageID(theResearchingTech);
+			this->mTimeResearchDone = theTimeResearchDone;
+			theResearchEntity->pev->iuser2 = (int)this->mResearch;
+		}
+		
+		if((gpGlobals->time >= theTimeResearchDone) || GetGameRules()->GetIsTesting())
+		{
+			theResearchDone = true;
+			//AvHSHUSetBuildResearchState(theResearchEntity->pev->iuser3, theResearchEntity->pev->iuser4, theResearchEntity->pev->fuser1, false, 0.0f);
+			//			theResearchEntity->pev->fuser1 = 0.0f;
+			//			theResearchEntity->pev->iuser2 = 0;
+		}
+		else
+		{
+			float theNormalizedResearchFactor = (gpGlobals->time - this->mTimeResearchStarted)/(this->mTimeResearchDone - this->mTimeResearchStarted);
+			theNormalizedResearchFactor = min(max(theNormalizedResearchFactor, 0.0f), 1.0f);
+
+			//theResearchEntity->pev->fuser1 = (kResearchFuser1Base + theNormalizedResearchFactor)*kNormalizationNetworkFactor;
+			AvHSHUSetBuildResearchState(theResearchEntity->pev->iuser3, theResearchEntity->pev->iuser4, theResearchEntity->pev->fuser1, false, theNormalizedResearchFactor);
+		}
+	}
+	
+	return theResearchDone;
+}
+
+
+
+
+// Research manager
+void AvHResearchManager::AddTechNode(AvHMessageID inMessageID, AvHTechID inTechID, AvHTechID inPrereq1, AvHTechID inPrereq2, int inPointCost, int inBuildTime, bool inResearched, bool inAllowMultiples)
+{
+	AvHTechNode theTechNode(inMessageID, inTechID, inPrereq1, inPrereq2, inPointCost, inBuildTime, inResearched);
+	if(inAllowMultiples)
+	{
+		theTechNode.SetAllowMultiples();
+	}
+
+	this->mTechNodes.AddTechNode(theTechNode);
+}
+
+#ifdef AVH_PLAYTEST_BUILD
+void AvHResearchManager::BalanceChanged()
+{
+	// Run through our tech nodes and update cost and build time
+	this->mTechNodes.BalanceChanged();
+}
+#endif
+
+bool AvHResearchManager::GetResearchInfo(AvHMessageID inTech, bool& outIsResearchable, int& outCost, float& outTime) const
+{
+	bool theFoundIt = false;
+	
+	// Check each tech nodes
+	if(this->mTechNodes.GetResearchInfo(inTech, outIsResearchable, outCost, outTime))
+	{
+		theFoundIt = true;
+	}
+	
+	return theFoundIt;
+}
+
+const AvHTechNodes&	AvHResearchManager::GetTechNodes() const
+{
+	return this->mTechNodes;
+}
+
+AvHTechNodes& AvHResearchManager::GetTechNodes()
+{
+	return this->mTechNodes;
+}
+
+void AvHResearchManager::TriggerAddTech(AvHTechID inTechID)
+{
+	this->mTechNodes.TriggerAddTech(inTechID);
+}
+
+void AvHResearchManager::TriggerRemoveTech(AvHTechID inTechID)
+{
+	this->mTechNodes.TriggerRemoveTech(inTechID);
+}
+
+void AvHResearchManager::SetTeamNumber(AvHTeamNumber inTeamNumber)
+{
+	this->mTeamNumber = inTeamNumber;
+}
+
+bool AvHResearchManager::SetResearchDone(AvHMessageID inTech, int inEntityIndex)
+{
+	bool theFoundIt = false;
+	
+	if(this->mTechNodes.SetResearchDone(inTech))
+	{
+		edict_t* theEdict = g_engfuncs.pfnPEntityOfEntIndex(inEntityIndex);
+		ASSERT(!theEdict->free);
+		CBaseEntity* theEntity = CBaseEntity::Instance(theEdict);
+		ASSERT(theEntity);
+
+		// Potentially inform all entities and team of upgrade
+		GetGameRules()->ProcessTeamUpgrade(inTech, this->mTeamNumber, inEntityIndex, true);
+		
+		// Hook research complete
+		AvHSUResearchComplete(theEntity, inTech);
+
+		// No longer researching
+		//theEntity->pev->fuser1 = kResearchFuser1Base*kNormalizationNetworkFactor;
+		AvHSHUSetBuildResearchState(theEntity->pev->iuser3, theEntity->pev->iuser4, theEntity->pev->fuser1, true, 0.0f);
+		
+		// Tell entity that it's no longer researching
+		AvHBuildable* theBuildable = dynamic_cast<AvHBuildable*>(theEntity);
+		if(theBuildable)
+		{
+			theBuildable->SetResearching(false);
+		}
+		
+		// Send message indicating research is done
+		GetGameRules()->TriggerAlert(this->mTeamNumber, ALERT_RESEARCH_COMPLETE, inEntityIndex);
+		
+		theFoundIt = true;
+	}
+	
+	return theFoundIt;
+}
+
+void AvHResearchManager::Reset()
+{
+	// Clear out everything
+	this->mResearchingTech.clear();
+	this->mTechNodes.Clear();
+}
+
+bool AvHResearchManager::CancelResearch(int inEntityIndex, float& outResearchPercentage, AvHMessageID& outMessageID)
+{
+	bool theSuccess = false;
+	
+	// Search through researching tech and make sure we're researching this
+	for(ResearchListType::iterator theIter = this->mResearchingTech.begin(); theIter != this->mResearchingTech.end(); theIter++)
+	{
+		if(theIter->GetEntityIndex() == inEntityIndex)
+		{
+			float theEndTime = theIter->GetTimeResearchDone();
+			float theStartTime = theIter->GetTimeResearchStarted();
+			outResearchPercentage = (gpGlobals->time - theStartTime)/(theEndTime - theStartTime);
+			
+			outMessageID = theIter->GetResearching();
+			
+			this->mResearchingTech.erase(theIter);
+			
+			// Look up entity and reset research progress
+			CBaseEntity* theResearchEntity = AvHSUGetEntityFromIndex(inEntityIndex);
+			ASSERT(theResearchEntity);
+			//theResearchEntity->pev->fuser1 = kResearchFuser1Base*kNormalizationNetworkFactor;
+			AvHSHUSetBuildResearchState(theResearchEntity->pev->iuser3, theResearchEntity->pev->iuser4, theResearchEntity->pev->fuser1, false, 0.0f);
+			
+			AvHBuildable* theBuildable = dynamic_cast<AvHBuildable*>(theResearchEntity);
+			if(theBuildable)
+			{
+				theBuildable->SetResearching(false);
+			}			
+			
+			theSuccess = true;
+			break;
+		}
+	}
+
+	return theSuccess;
+}
+
+bool AvHResearchManager::SetResearching(AvHMessageID inMessageID, int inEntityIndex)
+{
+	bool theCouldStart = true;
+	
+	// Search through researching tech and make sure this entity isn't already researching something
+	for(ResearchListType::iterator theIter = this->mResearchingTech.begin(); theIter != this->mResearchingTech.end(); theIter++)
+	{
+		if(theIter->GetEntityIndex() == inEntityIndex)
+		{
+			theCouldStart = false;
+			break;
+		}
+	}
+	
+	if(theCouldStart)
+	{
+		bool theIsResearchable = false;
+		int theCost;
+		float theTime;
+		// joev: 0000199
+		// Look up entity and check that research is valid for this entity.
+		CBaseEntity* theResearchEntity = AvHSUGetEntityFromIndex(inEntityIndex);
+		ASSERT(theResearchEntity);
+			
+		if (!AvHSUGetIsResearchApplicable(theResearchEntity,inMessageID)) {
+			theCouldStart = false;
+		}
+		// :joev
+
+		if(!this->GetResearchInfo(inMessageID, theIsResearchable, theCost, theTime) || !theIsResearchable)
+		{
+			theCouldStart = false;
+		}
+	}
+	
+	if(theCouldStart)
+	{
+		this->mResearchingTech.push_back(AvHResearchNode(inMessageID, inEntityIndex));
+		
+		// Tell entity that it's researching
+		edict_t* theEdict = g_engfuncs.pfnPEntityOfEntIndex(inEntityIndex);
+		ASSERT(!theEdict->free);
+		CBaseEntity* theEntity = CBaseEntity::Instance(theEdict);
+		ASSERT(theEntity);
+		
+		AvHBuildable* theBuildable = dynamic_cast<AvHBuildable*>(theEntity);
+		if(theBuildable)
+		{
+			theBuildable->SetResearching(true);
+			AvHSUResearchStarted(theEntity, inMessageID);
+		}
+	}
+	
+	return theCouldStart;
+}
+
+bool AvHResearchManager::GetIsMessageAvailable(AvHMessageID& inMessageID) const
+{
+	bool theIsAvailable = false;
+
+	if(this->mTechNodes.GetIsMessageAvailable(inMessageID))
+	{
+		// Make sure it's not a one time research that we're currently researching
+		if(this->GetIsResearchingTech(inMessageID) && !this->mTechNodes.GetAllowMultiples(inMessageID))
+		{
+			theIsAvailable = false;
+		}
+		else
+		{
+			theIsAvailable = true;
+		}
+	}
+
+	return theIsAvailable;
+}
+
+TechNodeListType AvHResearchManager::GetResearchNodesDependentOn(AvHTechID inTechID) const
+{
+	TechNodeListType theTechNodes;
+
+	this->mTechNodes.GetResearchNodesDependentOn(inTechID, theTechNodes);
+	
+	return theTechNodes;
+}
+
+bool AvHResearchManager::GetIsResearchingTech(AvHMessageID inMessageID) const
+{
+	bool theIsResearchingTech = false;
+
+	for(ResearchListType::const_iterator theIter = this->mResearchingTech.begin(); theIter != this->mResearchingTech.end(); theIter++)
+	{
+		if(theIter->GetResearching() == inMessageID)
+		{
+			theIsResearchingTech = true;
+			break;
+		}
+	}
+
+	return theIsResearchingTech;
+}
+
+
+bool AvHResearchManager::GetIsResearching(int inEntityIndex) const
+{
+	bool theIsResearching = false;
+
+	// Run through every item in the list and update research, marking any done 
+	for(ResearchListType::const_iterator theIter = this->mResearchingTech.begin(); theIter != this->mResearchingTech.end(); theIter++)
+	{
+		if(theIter->GetEntityIndex() == inEntityIndex)
+		{
+			theIsResearching = true;
+			break;
+		}
+	}
+
+	return theIsResearching;
+}
+
+void AvHResearchManager::UpdateResearch()
+{
+	// Run through every item in the list and update research, marking any done 
+	for(ResearchListType::iterator theIter = this->mResearchingTech.begin(); theIter != this->mResearchingTech.end(); )
+	{
+		if(theIter->GetCanEntityContinueResearch())
+		{
+			bool theHighTechCheat = GetGameRules()->GetIsCheatEnabled(kcHighTech);
+			if(theIter->UpdateResearch() || theHighTechCheat)
+			{
+				AvHMessageID theResearchingTech = theIter->GetResearching();
+				int theEntityIndex = theIter->GetEntityIndex();
+
+				this->SetResearchDone(theResearchingTech, theEntityIndex);
+
+				theIter = this->mResearchingTech.erase(theIter);
+			}
+			else
+			{
+				theIter++;
+			}
+		}
+		else
+		{
+			theIter = this->mResearchingTech.erase(theIter);
+		}
+	}
+}
diff --git a/main/source/mod/AvHResearchManager.h b/main/source/mod/AvHResearchManager.h
new file mode 100644
index 00000000..7ca61433
--- /dev/null
+++ b/main/source/mod/AvHResearchManager.h
@@ -0,0 +1,94 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHResearchManager.h $
+// $Date: 2002/09/23 22:28:33 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHResearchManager.h,v $
+// Revision 1.4  2002/09/23 22:28:33  Flayra
+// - Added GetIsResearching method, so automatic armory resupply could be added
+//
+// Revision 1.3  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_RESEARCHMANAGER_H
+#define AVH_RESEARCHMANAGER_H
+
+#include "types.h"
+#include "mod/AvHMessage.h"
+#include "mod/AvHTechNodes.h"
+
+class AvHResearchNode
+{
+public:
+						AvHResearchNode(AvHMessageID inMessageID, int inEntityIndex);
+
+	bool				GetCanEntityContinueResearch() const;
+	int					GetEntityIndex() const;
+	AvHMessageID		GetResearching() const;
+	float				GetTimeResearchDone() const;
+	float				GetTimeResearchStarted() const;
+	bool				UpdateResearch();
+
+private:
+	int					mEntityIndex;
+	AvHMessageID		mResearch;
+	float				mTimeResearchDone;
+	float				mTimeResearchStarted;
+};
+
+typedef vector<AvHResearchNode>		ResearchListType;
+
+class AvHResearchManager
+{
+public:
+	void				AddTechNode(AvHMessageID inMessageID, AvHTechID inTechID, AvHTechID inPrereq1, AvHTechID inPrereq2, int inPointCost, int inBuildTime, bool inResearched, bool inAllowMultiples);
+
+	#ifdef AVH_PLAYTEST_BUILD
+	void				BalanceChanged();
+	#endif
+
+	const AvHTechNodes&	GetTechNodes() const;
+	AvHTechNodes&		GetTechNodes();
+
+	bool				GetResearchInfo(AvHMessageID inTech, bool& outIsResearchable, int& outCost, float& outTime) const;
+
+	void				TriggerAddTech(AvHTechID inTechID);
+	void				TriggerRemoveTech(AvHTechID inTechID);
+	
+	void				Reset();
+
+	bool				CancelResearch(int inEntityIndex, float& outResearchPercentage, AvHMessageID& outMessageID);
+
+	bool				GetIsMessageAvailable(AvHMessageID& inMessageID) const;
+
+	TechNodeListType	GetResearchNodesDependentOn(AvHTechID inTechID) const;
+
+	bool				GetIsResearchingTech(AvHMessageID inMessageID) const;
+
+	bool				GetIsResearching(int inEntityIndex) const;
+	
+	bool				SetResearching(AvHMessageID inMessageID, int inEntityIndex);
+
+	void				SetTeamNumber(AvHTeamNumber inTeamNumber);
+		
+	void				UpdateResearch();
+	
+private:
+	bool				SetResearchDone(AvHMessageID inTech, int inEntityIndex);
+
+	ResearchListType	mResearchingTech;
+	AvHTechNodes		mTechNodes;
+	AvHTeamNumber		mTeamNumber;
+	
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHScriptClient.cpp b/main/source/mod/AvHScriptClient.cpp
new file mode 100644
index 00000000..1f5b5d3a
--- /dev/null
+++ b/main/source/mod/AvHScriptClient.cpp
@@ -0,0 +1,468 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHScriptClient.cpp $
+// $Date: 2002/06/10 20:01:24 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHScriptClient.cpp,v $
+// Revision 1.2  2002/06/10 20:01:24  Flayra
+// - Updated extern references to drawing code (ugh)
+//
+// Revision 1.1  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+// Revision 1.1  2002/05/14 18:54:48  Charlie
+//===============================================================================
+#include "mod/AvHHud.h"
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHClientVariables.h"
+#include "mod/AvHSpecials.h"
+#include "common/cl_entity.h"
+#include "mod/AvHTitles.h"
+#include "pm_shared/pm_debug.h"
+#include "util/MathUtil.h"
+#include "common/r_efx.h"
+#include "cl_dll/eventscripts.h"
+#include "mod/AvHSprites.h"
+#include "ui/UIUtil.h"
+#include "types.h"
+#include <signal.h>
+#include "common/com_model.h"
+#include "cl_dll/studio_util.h"
+#include "cl_dll/r_studioint.h"
+#include "mod/AvHMiniMap.h"
+#include "mod/AvHActionButtons.h"
+#include "util/STLUtil.h"
+#include "mod/AvHSharedUtil.h"
+#include "common/event_api.h"
+#include "mod/AvHScriptManager.h"
+
+extern void DrawScaledHUDSprite(int inSpriteHandle, int inMode, int inRowsInSprite = 1, int inX = 0, int inY = 0, int inWidth = ScreenWidth(), int inHeight = ScreenHeight(), int inForceSpriteFrame = -1, float inStartU = 0.0f, float inStartV = 0.0f, float inEndU = 1.0f, float inEndV = 1.0f, float inRotateUVRadians = 0.0f, bool inUVWrapsOverFrames = false);
+extern vec3_t v_origin;
+
+static int errormessage(lua_State* inState)
+{
+	const char *s = lua_tostring(inState, 1);
+	if (s == NULL) s = "(no message)";
+	char theErrorMessage[2048];
+	sprintf(theErrorMessage, "Script error: %s\n", s);
+	
+	// Print the message					
+	//gEngfuncs.Con_Printf("%s", theErrorMessage);
+	
+	return 0;
+}
+
+static int print(lua_State* inState)
+{
+	int n = lua_gettop(inState);
+	int i;
+	string theString;
+	
+	for (i=1; i<=n; i++)
+	{
+		if (i>1) theString = "\t";
+		if (lua_isstring(inState, i))
+			theString += string(lua_tostring(inState, i));
+		else
+		{
+			char theBuffer[512];
+			sprintf(theBuffer, "%s:%p",lua_typename(inState, lua_type(inState, i)),lua_topointer(inState,i));
+			theString += string(theBuffer);
+		}
+	}
+	//theString += string("\n");
+
+	// TODO: Print message
+	//UTIL_ClientPrintAll(HUD_PRINTNOTIFY, theString.c_str());
+	gEngfuncs.Con_Printf("%s", theString.c_str());
+	
+	return 0;
+}
+
+// Runs a client command, returns success
+static int clientCommand(lua_State* inState)
+{
+	bool theSuccess = false;
+
+	int theNumArgs = lua_gettop(inState);
+	if(theNumArgs >= 1)
+	{
+		string theConsoleCommandString = lua_tostring(inState, 1);
+
+		char theConsoleCommand[1024];
+		strcpy(theConsoleCommand, theConsoleCommandString.c_str());
+		ClientCmd(theConsoleCommand);
+
+		theSuccess = true;
+	}
+
+	lua_pushnumber(inState, theSuccess);
+
+	return 1;
+}
+
+// Returns xyz
+static int getViewOrigin(lua_State* inState)
+{
+	lua_pushnumber(inState, v_origin.x);
+	lua_pushnumber(inState, v_origin.y);
+	lua_pushnumber(inState, v_origin.z);
+
+	return 3;
+}
+
+static int getScreenWidth(lua_State* inState)
+{
+	int theScreenWidth = ScreenWidth();
+	lua_pushnumber(inState, theScreenWidth);
+	return 1;
+}
+
+static int getScreenHeight(lua_State* inState)
+{
+	int theScreenHeight = ScreenHeight();
+	lua_pushnumber(inState, theScreenHeight);
+	return 1;
+}
+
+// string spriteName, int inMode, int x0, int y0, int theWidth, int theHeight, optional frame
+static int drawScaledHUDSprite(lua_State* inState)
+{
+	bool theSuccess = false;
+
+	int theNumArgs = lua_gettop(inState);
+	if(theNumArgs >= 6)
+	{
+		string theSpriteName = lua_tostring(inState, 1);
+		int theRenderMode = lua_tonumber(inState, 2);
+		int theStartX = lua_tonumber(inState, 3);
+		int theStartY = lua_tonumber(inState, 4);
+		int theWidth = lua_tonumber(inState, 5);
+		int theHeight = lua_tonumber(inState, 6);
+		int theFrame = 0;
+		
+		// Read optional frame
+		if(theNumArgs >= 7)
+		{
+			theFrame = lua_tonumber(inState, 7);
+		}
+		
+		int theSpriteHandle = Safe_SPR_Load(theSpriteName.c_str());
+		if(theSpriteHandle)
+		{
+			DrawScaledHUDSprite(theSpriteHandle, theRenderMode, 1, theStartX, theStartY, theWidth, theHeight, theFrame);
+			theSuccess = true;
+		}
+	}
+	
+	lua_pushnumber(inState, theSuccess);
+	
+	return 1;
+}
+
+// Returns success if a valid mode is passed in
+static int triRenderMode(lua_State* inState)
+{
+	bool theSuccess = false;
+	
+	int theNumArgs = lua_gettop(inState);
+	if(theNumArgs >= 1)
+	{
+		int theRenderMode = lua_tonumber(inState, 1);
+		if((theRenderMode >= kRenderNormal) && (theRenderMode <= kRenderTransAdd))
+		{
+			gEngfuncs.pTriAPI->RenderMode(theRenderMode);
+			theSuccess = true;
+		}
+	}
+	
+	lua_pushnumber(inState, theSuccess);
+	
+	return 1;
+}
+
+// Pass in primitive code, returns success
+static int triBegin(lua_State* inState)
+{
+	bool theSuccess = false;
+	
+	int theNumArgs = lua_gettop(inState);
+	if(theNumArgs >= 1)
+	{
+		int thePrimitiveCode = lua_tonumber(inState, 1);
+		if((thePrimitiveCode >= TRI_TRIANGLES) && (thePrimitiveCode <= TRI_QUAD_STRIP))
+		{
+			gEngfuncs.pTriAPI->Begin(thePrimitiveCode);
+			theSuccess = true;
+		}
+	}
+	
+	lua_pushnumber(inState, theSuccess);
+	
+	return 1;
+}
+
+// Takes and returns nothing
+static int triEnd(lua_State* inState)
+{
+	gEngfuncs.pTriAPI->End();
+	
+	return 0;
+}
+
+// Takes four floats (rgba), returns success
+static int triColor4f(lua_State* inState)
+{
+	bool theSuccess = false;
+	
+	int theNumArgs = lua_gettop(inState);
+	if(theNumArgs >= 4)
+	{
+		float theR = lua_tonumber(inState, 1);
+		float theG = lua_tonumber(inState, 2);
+		float theB = lua_tonumber(inState, 3);
+		float theA = lua_tonumber(inState, 4);
+		
+		gEngfuncs.pTriAPI->Color4f(theR, theG, theB, theA);
+		theSuccess = true;
+	}
+	
+	lua_pushnumber(inState, theSuccess);
+	
+	return 1;
+}
+
+// Takes four ints (rgba), returns success
+static int triColor4ub(lua_State* inState)
+{
+	bool theSuccess = false;
+	
+	int theNumArgs = lua_gettop(inState);
+	if(theNumArgs >= 4)
+	{
+		int theR = lua_tonumber(inState, 1);
+		int theG = lua_tonumber(inState, 2);
+		int theB = lua_tonumber(inState, 3);
+		int theA = lua_tonumber(inState, 4);
+		
+		gEngfuncs.pTriAPI->Color4ub(theR, theG, theB, theA);
+		
+		theSuccess = true;
+	}
+	
+	lua_pushnumber(inState, theSuccess);
+	
+	return 1;
+}
+
+// Takes two floats (0 to 1), returns success
+static int triTexCoord2f(lua_State* inState)
+{
+	bool theSuccess = false;
+	
+	int theNumArgs = lua_gettop(inState);
+	if(theNumArgs >= 2)
+	{
+		float theU = lua_tonumber(inState, 1);
+		float theV = lua_tonumber(inState, 2);
+		
+		gEngfuncs.pTriAPI->TexCoord2f(theU, theV);
+		
+		theSuccess = true;
+	}
+	
+	lua_pushnumber(inState, theSuccess);
+	
+	return 1;
+}
+
+// Takes three floats, returns success
+static int triVertex3f(lua_State* inState)
+{
+	bool theSuccess = false;
+	
+	int theNumArgs = lua_gettop(inState);
+	if(theNumArgs >= 3)
+	{
+		float theX = lua_tonumber(inState, 1);
+		float theY = lua_tonumber(inState, 2);
+		float theZ = lua_tonumber(inState, 3);
+		
+		gEngfuncs.pTriAPI->Vertex3f(theX, theY, theZ);
+		
+		theSuccess = true;
+	}
+	
+	lua_pushnumber(inState, theSuccess);
+	
+	return 1;
+}
+
+// Takes float (0-1), returns success
+static int triBrightness(lua_State* inState)
+{
+	bool theSuccess = false;
+	
+	int theNumArgs = lua_gettop(inState);
+	if(theNumArgs >= 1)
+	{
+		float theBrightness = lua_tonumber(inState, 1);
+		
+		gEngfuncs.pTriAPI->Brightness(theBrightness);
+		theSuccess = true;
+	}
+	
+	lua_pushnumber(inState, theSuccess);
+	
+	return 1;
+}
+
+// Takes cullstyle int (0 or 1), returns success
+static int triCullFace(lua_State* inState)
+{
+	bool theSuccess = false;
+	
+	int theNumArgs = lua_gettop(inState);
+	if(theNumArgs >= 1)
+	{
+		int theCullStyleInt = lua_tonumber(inState, 1);
+		TRICULLSTYLE theCullStyle = TRICULLSTYLE(theCullStyleInt);
+		if((theCullStyle == TRI_FRONT) || (theCullStyle == TRI_NONE))
+		{
+			gEngfuncs.pTriAPI->CullFace(theCullStyle);
+			theSuccess = true;
+		}
+	}
+	
+	lua_pushnumber(inState, theSuccess);
+	
+	return 1;
+}
+
+// Takes texture name, and optional frame, sets the current texture.  Returns true or false.
+static int triSpriteTexture(lua_State* inState)
+{
+	bool theSuccess = false;
+	
+	int theNumArgs = lua_gettop(inState);
+	if(theNumArgs >= 1)
+	{
+		string theSpriteName = lua_tostring(inState, 1);
+		int theSpriteHandle = Safe_SPR_Load(theSpriteName.c_str());
+		if(theSpriteHandle)
+		{
+			int theSpriteFrame = 0;
+			if(theNumArgs >= 2)
+			{
+				theSpriteFrame = lua_tonumber(inState, 2);
+			}
+			
+			if(gEngfuncs.pTriAPI->SpriteTexture((struct model_s *)gEngfuncs.GetSpritePointer(theSpriteHandle), theSpriteFrame))
+			{
+				theSuccess = true;
+			}
+		}
+	}
+	
+	lua_pushnumber(inState, theSuccess);
+	
+	return 1;
+}
+
+// Takes xyz, returns success, xy
+static int triWorldToScreen(lua_State* inState)
+{
+	bool theSuccess = false;
+	
+	float theScreenPos[3];
+	memset(theScreenPos, 0, sizeof(float)*3);
+	
+	int theNumArgs = lua_gettop(inState);
+	if(theNumArgs >= 3)
+	{
+		float theWorldPos[3];
+		theWorldPos[0] = lua_tonumber(inState, 1);
+		theWorldPos[1] = lua_tonumber(inState, 2);
+		theWorldPos[2] = lua_tonumber(inState, 3);
+		
+		gEngfuncs.pTriAPI->WorldToScreen(theWorldPos, theScreenPos);
+		
+		theSuccess = true;
+	}
+	
+	lua_pushnumber(inState, theSuccess);
+	lua_pushnumber(inState, theScreenPos[0]);
+	lua_pushnumber(inState, theScreenPos[1]);
+	
+	return 3;
+}
+
+// 3 floats for fog color, float fogStart, float fogEnd, int 0/1 for fog on or off.  Returns true if correct parameters were passed in
+static int triFog(lua_State* inState)
+{
+	bool theSuccess = false;
+	
+	int theNumArgs = lua_gettop(inState);
+	if(theNumArgs >= 6)
+	{
+		float theFogColor[3];
+		theFogColor[0] = lua_tonumber(inState, 1);
+		theFogColor[1] = lua_tonumber(inState, 2);
+		theFogColor[2] = lua_tonumber(inState, 3);
+
+		float theFogStart = lua_tonumber(inState, 4);
+		float theFogEnd = lua_tonumber(inState, 5);
+		int theFogOn = lua_tonumber(inState, 6);
+		
+		gEngfuncs.pTriAPI->Fog(theFogColor, theFogStart, theFogEnd, theFogOn);
+
+		theSuccess = true;
+	}
+	
+	lua_pushnumber(inState, theSuccess);
+	
+	return 1;
+}
+
+
+void AvHScriptInstance::InitClient()
+{
+	//lua_register(this->mState, LUA_ERRORMESSAGE, errormessage);
+	lua_register(this->mState, "print", print);
+	lua_register(this->mState, "clientCommand", clientCommand);
+	lua_register(this->mState, "getViewOrigin", getViewOrigin);
+
+	// Drawing utility functions
+	lua_register(this->mState, "getScreenWidth", getScreenWidth);
+	lua_register(this->mState, "getScreenHeight", getScreenHeight);
+	lua_register(this->mState, "drawScaledHUDSprite", drawScaledHUDSprite);
+
+	// Tri API hooks
+	lua_register(this->mState, "triRenderMode", triRenderMode);
+	lua_register(this->mState, "triBegin", triBegin);
+	lua_register(this->mState, "triEnd", triEnd);
+	lua_register(this->mState, "triColor4f", triColor4f);
+	lua_register(this->mState, "triColor4ub", triColor4ub);
+	lua_register(this->mState, "triTexCoord2f", triTexCoord2f);
+	lua_register(this->mState, "triVertex3f", triVertex3f);
+	lua_register(this->mState, "triBrightness", triBrightness);
+	lua_register(this->mState, "triCullFace", triCullFace);
+	lua_register(this->mState, "triSpriteTexture", triSpriteTexture);
+	lua_register(this->mState, "triWorldToScreen", triWorldToScreen);
+	lua_register(this->mState, "triFog", triFog);
+
+	// Input hooks
+
+	//lua_register(this->mState, "drawScaledHUDSprite", drawScaledHUDSpriteUV);
+	//lua_register(this->mState, "drawScaledTiledHUDSprite", drawScaledTiledHUDSprite);
+}
\ No newline at end of file
diff --git a/main/source/mod/AvHScriptManager.cpp b/main/source/mod/AvHScriptManager.cpp
new file mode 100644
index 00000000..ca515615
--- /dev/null
+++ b/main/source/mod/AvHScriptManager.cpp
@@ -0,0 +1,342 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: Contains all script bindings for testing functionality
+//
+// $Workfile: AvHAvHScriptManager.cpp $
+// $Date: 2002/11/22 21:24:27 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHScriptManager.cpp,v $
+// Revision 1.3  2002/11/22 21:24:27  Flayra
+// - Changed AVH_DEVELOPER_BUILD to DEBUG
+//
+// Revision 1.2  2002/06/25 18:15:52  Flayra
+// - Some enhancements and bugfixes for tutorial
+//
+// Revision 1.1  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "util/nowarnings.h"
+#include "mod/AvHScriptManager.h"
+#include "util/Checksum.h"
+#include "util/STLUtil.h"
+#include "mod/AvHConstants.h"
+
+extern "C"
+{
+	#include "lua/include/lauxlib.h"
+}
+
+
+AvHScriptInstance* gRunningScript = NULL;
+
+AvHScriptInstance::AvHScriptInstance(string inScriptName)
+{
+	this->mState = NULL;
+	
+	this->Init();
+
+	// Assumes that filenames are relative to the ns/scripts directory
+	//this->mScriptName = kModDirectory + string("/") + kScriptsDirectory + string("/") + inScriptName;
+	this->mScriptName = inScriptName;
+}
+
+void AvHScriptInstance::AddCallback(string& inCallbackName, float inTime)
+{
+	CallbackType theCallback(inCallbackName, inTime);
+
+	this->mCallbacksQueuedForAdd.push_back(theCallback);
+}
+
+bool AvHScriptInstance::CallbacksPending() const
+{
+	bool theCallbacksPending = false;
+
+	if((this->mCallbackList.size() > 0) || (this->mCallbacksQueuedForAdd.size() > 0))
+	{
+		theCallbacksPending = true;
+	}
+
+	return theCallbacksPending;
+}
+
+void AvHScriptInstance::CallSimpleFunction(const string& inFunctionName)
+{
+	gRunningScript = this;
+	
+	// Execute callback
+	lua_getglobal(this->mState, inFunctionName.c_str());
+	//lua_pushstring(this->mState, inFunctionName.c_str());
+	lua_call(this->mState, 0, 0);
+	
+	gRunningScript = NULL;
+}
+
+void AvHScriptInstance::Cleanup()
+{
+	ASSERT(!this->CallbacksPending());
+	ASSERT(this->mState);
+
+	lua_close(this->mState);
+}
+
+lua_State* AvHScriptInstance::GetState()
+{
+	return this->mState;
+}
+
+void AvHScriptInstance::Init()
+{
+	this->mState = lua_open();
+	
+	lua_baselibopen(this->mState);
+	lua_strlibopen(this->mState);
+	lua_mathlibopen(this->mState);
+	//lua_iolibopen(this->mState);
+
+	this->InitShared();
+
+	#ifdef AVH_SERVER
+	this->InitServer();
+	#else
+	this->InitClient();
+	#endif
+}
+
+void AvHScriptInstance::Reset()
+{
+	// Delete callbacks
+	this->mCallbackList.clear();
+	this->mCallbacksQueuedForAdd.clear();
+		
+	// Cleanup
+	this->Cleanup();
+}
+
+void AvHScriptInstance::Run()
+{
+	ASSERT(this->mState);
+	ASSERT(this->mScriptName != "");
+
+	// Set global current script so it's accessible statically (needed for setting callbacks)
+	gRunningScript = this;
+
+	lua_dofile(this->mState, this->mScriptName.c_str());
+
+	gRunningScript = NULL;
+}
+
+
+void AvHScriptInstance::Update(float inTime)
+{
+	// First add any queued callback onto our list
+	for(CallbackListType::iterator theQueuedIter = this->mCallbacksQueuedForAdd.begin(); theQueuedIter != this->mCallbacksQueuedForAdd.end(); theQueuedIter++)
+	{
+		this->mCallbackList.push_back(*theQueuedIter);
+	}
+
+	// Clear queued list
+	this->mCallbacksQueuedForAdd.clear();
+
+	// Update callbacks
+	for(CallbackListType::iterator theIter = this->mCallbackList.begin(); theIter != this->mCallbackList.end(); /* no increment*/)
+	{
+		CallbackType& theCallback = *theIter;
+		if(inTime >= theCallback.second)
+		{
+			this->CallSimpleFunction(theCallback.first.c_str());
+
+			// Remove callback from list 
+			theIter = this->mCallbackList.erase(theIter);
+		}
+		else
+		{
+			theIter++;
+		}
+	}
+}
+
+
+
+AvHScriptManager* AvHScriptManager::sSingleton = NULL;
+
+AvHScriptManager* AvHScriptManager::Instance()
+{
+	if(!sSingleton)
+	{
+		sSingleton = new AvHScriptManager();
+	}
+	
+	ASSERT(sSingleton);
+	
+	return sSingleton;
+}
+
+void AvHScriptManager::Reset()
+{
+	for(AvHScriptInstanceListType::iterator theIter = this->mScriptList.begin(); theIter != this->mScriptList.end(); theIter++)
+	{
+		theIter->Reset();
+	}
+	this->mScriptList.clear();
+}
+
+void AvHScriptManager::RunScript(const string& inScriptName)
+{
+	// Create new AvHScriptInstance, and add it
+	AvHScriptInstance theAvHScriptInstance(inScriptName);
+	
+	// Run it
+	theAvHScriptInstance.Run();
+
+	bool theIsRunningOnClient = false;
+
+	#ifdef AVH_CLIENT
+	theIsRunningOnClient = true;
+	#endif
+
+	// If it's still running, add it to the list
+	if(theAvHScriptInstance.CallbacksPending() || theIsRunningOnClient)
+	{
+		this->mScriptList.push_back(theAvHScriptInstance);
+	}
+}
+
+void AvHScriptManager::Update(float inTime)
+{
+	// Run through list of scripts
+	for(AvHScriptInstanceListType::iterator theIter = this->mScriptList.begin(); theIter != this->mScriptList.end(); /* no increment */)
+	{
+		// If callback is pending
+		if(theIter->CallbacksPending())
+		{
+			// Is it time to run any of our callbacks?
+			theIter->Update(inTime);
+			
+			// Always increment
+			theIter++;
+		}
+		// else
+		else
+		{
+			// Remove it from the list
+			theIter = this->mScriptList.erase(theIter);
+		}
+	}
+}
+
+
+#ifdef AVH_CLIENT
+void AvHScriptManager::ClientUpdate(float inTimePassed)
+{
+	// For all scripts
+	for(AvHScriptInstanceListType::iterator theIter = this->mScriptList.begin(); theIter != this->mScriptList.end(); /* no increment */)
+	{
+		// Call "clientUpdate(inTimePassed)" function (push function then args)
+		lua_getglobal(theIter->GetState(), "clientUpdate");
+
+		// Push time passed
+		lua_pushnumber(theIter->GetState(), inTimePassed);
+
+		// Push num args and num return
+		lua_call(theIter->GetState(), 1, 1);
+		
+		// If function returns false, delete it
+		bool theKeepRunning = true;
+		int theNumReturned = lua_gettop(theIter->GetState());
+		if(theNumReturned > 0)
+		{
+			string theString = lua_tostring(theIter->GetState(), 1);
+			theKeepRunning = lua_tonumber(theIter->GetState(), 1);
+			lua_pop(theIter->GetState(), 1);
+		}
+		
+		if(!theKeepRunning)
+		{
+			theIter->Reset();
+			
+			theIter = this->mScriptList.erase(theIter);
+		}
+		else
+		{
+			// else increment
+			theIter++;
+		}
+	}
+}
+
+void AvHScriptManager::DrawNormal()
+{
+	// For all scripts
+	for(AvHScriptInstanceListType::iterator theIter = this->mScriptList.begin(); theIter != this->mScriptList.end(); theIter++)
+	{
+		theIter->CallSimpleFunction("drawNormal");
+	}
+}
+
+void AvHScriptManager::DrawTransparent()
+{
+	// For all scripts
+	for(AvHScriptInstanceListType::iterator theIter = this->mScriptList.begin(); theIter != this->mScriptList.end(); theIter++)
+	{
+		theIter->CallSimpleFunction("drawTransparent");
+	}
+}
+
+void AvHScriptManager::DrawNoZBuffering()
+{
+	// For all scripts
+	for(AvHScriptInstanceListType::iterator theIter = this->mScriptList.begin(); theIter != this->mScriptList.end(); theIter++)
+	{
+		theIter->CallSimpleFunction("drawNoZBuffering");
+	}
+}
+
+bool AvHScriptManager::GetClientMove(int& outButtonBits, int& outImpulse)
+{
+	bool theSuccess = false;
+
+	#ifdef DEBUG
+
+	// For all scripts
+	for(AvHScriptInstanceListType::iterator theIter = this->mScriptList.begin(); theIter != this->mScriptList.end(); theIter++)
+	{
+		// Call getClientMove() on script.  If it is successful, stop processing.  Only one script can control movement at a time
+		const int kNumExpectedReturnValues = 2;
+
+		// Execute callback
+		lua_getglobal(theIter->GetState(), "getClientMove");
+		lua_call(theIter->GetState(), 0, kNumExpectedReturnValues);
+
+		// Check for success
+		int theNumReturned = lua_gettop(theIter->GetState());
+		if(theNumReturned >= kNumExpectedReturnValues)
+		{
+			// Populating move structure if possible
+			outButtonBits = (int)lua_tonumber(theIter->GetState(), 1);
+			outImpulse = (int)lua_tonumber(theIter->GetState(), 2);
+
+			lua_pop(theIter->GetState(), kNumExpectedReturnValues);
+
+			theSuccess = true;
+		}
+
+		if(theSuccess)
+		{
+			break;
+		}
+	}
+
+	#endif
+
+	return theSuccess;
+}
+
+#endif	
+
diff --git a/main/source/mod/AvHScriptManager.h b/main/source/mod/AvHScriptManager.h
new file mode 100644
index 00000000..a8c45998
--- /dev/null
+++ b/main/source/mod/AvHScriptManager.h
@@ -0,0 +1,112 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHScriptManager.h $
+// $Date: 2002/05/23 02:33:20 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHScriptManager.h,v $
+// Revision 1.1  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_SCRIPTMANAGER_H
+#define AVH_SCRIPTMANAGER_H
+
+extern "C"
+{
+#include "lua/include/lua.h"
+#include "lua/include/lualib.h"
+}
+
+#include "util/nowarnings.h"
+#include "util/Checksum.h"
+#include "util/STLUtil.h"
+
+//#ifdef AVH_CLIENT
+//#include "cl_dll/hud.h"
+//#include "cl_dll/cl_util.h"
+//#include "cl_dll/camera.h"
+//#include "cl_dll/kbutton.h"
+//#include "cvardef.h"
+//#include "common/usercmd.h"
+//#endif
+
+class AvHScriptInstance
+{
+public:
+				AvHScriptInstance(string inScriptName);
+
+	void		AddCallback(string& inCallbackName, float inTime);
+
+	bool		CallbacksPending() const;
+
+	void		CallSimpleFunction(const string& inFunctionName);
+
+	void		Cleanup();
+
+	lua_State*	GetState();
+
+	void		Reset();
+	
+	void		Run();
+
+	void		Update(float inTime);
+
+private:
+	void		Init();
+
+	void		InitShared();
+
+	#ifdef AVH_SERVER
+	void		InitServer();
+	#else
+	void		InitClient();
+	#endif
+
+	// This gets copied around, so make sure elements can be shallow-copied or write a copy constructor
+	lua_State*	mState;
+	string		mScriptName;
+
+	typedef pair<string, float>			CallbackType;
+	typedef vector< CallbackType >		CallbackListType;
+
+	CallbackListType					mCallbackList;
+	CallbackListType					mCallbacksQueuedForAdd;
+	
+};
+
+class AvHScriptManager
+{
+public:
+	static AvHScriptManager*	Instance();
+
+	void					Reset();
+
+	void					RunScript(const string& inScriptName);
+
+	void					Update(float inTime);
+
+	#ifdef AVH_CLIENT
+	void					ClientUpdate(float inTimePassed);
+	void					DrawNormal();
+	void					DrawTransparent();
+	void					DrawNoZBuffering();
+	bool					GetClientMove(int& outButtonBits, int& outImpulse);
+	#endif	
+
+private:
+	static AvHScriptManager*			sSingleton;
+
+	typedef vector<AvHScriptInstance>	AvHScriptInstanceListType;
+	AvHScriptInstanceListType			mScriptList;
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHScriptServer.cpp b/main/source/mod/AvHScriptServer.cpp
new file mode 100644
index 00000000..f0a4ab46
--- /dev/null
+++ b/main/source/mod/AvHScriptServer.cpp
@@ -0,0 +1,578 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHScriptServer.cpp $
+// $Date: 2002/07/24 18:45:42 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHScriptServer.cpp,v $
+// Revision 1.3  2002/07/24 18:45:42  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.2  2002/06/25 18:15:52  Flayra
+// - Some enhancements and bugfixes for tutorial
+//
+// Revision 1.1  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "util/nowarnings.h"
+#include "extdll.h"
+#include "dlls/util.h"
+#include "cbase.h"
+#include "player.h"
+#include "weapons.h"
+#include "mod/AvHScriptManager.h"
+#include "mod/AvHGamerules.h"
+#include "util/Checksum.h"
+#include "util/STLUtil.h"
+
+static int errormessage(lua_State* inState)
+{
+	const char *s = lua_tostring(inState, 1);
+	if (s == NULL) s = "(no message)";
+	char theErrorMessage[2048];
+	sprintf(theErrorMessage, "Script error: %s\n", s);
+
+	//fprintf(stderr, "error: %s\n", s);
+	UTIL_ClientPrintAll(HUD_PRINTNOTIFY, theErrorMessage);
+	
+	return 0;
+}
+
+//static int execute(lua_State* inState)
+//{
+//	// Lame hook to call into server tick
+//	int theNumServerTicks = GetGameRules()->GetServerTick();
+//	
+//	lua_getglobal(inState, "serverTick");
+//	lua_pushnumber(inState, theNumServerTicks);
+//	lua_call(inState, 1, 0);
+//	
+//	return 0;
+//}
+
+
+/* a simple "print". based on the code in lbaselib.c */
+static int print(lua_State* inState)
+{
+	int n = lua_gettop(inState);
+	int i;
+	string theString;
+	
+	for (i=1; i<=n; i++)
+	{
+		if (i>1) theString = "\t";
+		if (lua_isstring(inState, i))
+			theString += string(lua_tostring(inState, i));
+		else
+		{
+			char theBuffer[512];
+			sprintf(theBuffer, "%s:%p",lua_typename(inState, lua_type(inState, i)),lua_topointer(inState,i));
+			theString += string(theBuffer);
+		}
+	}
+	//theString += string("\n");
+	
+	UTIL_ClientPrintAll(HUD_PRINTNOTIFY, theString.c_str());
+	
+	return 0;
+}
+
+// inEntityIndex, returns x, y, z
+static int getPos(lua_State* inState)
+{
+	int theNumReturned = 0;
+	
+	// Get entity index
+	int theIndex = lua_tonumber(inState, 1);
+	if(theIndex > 0)
+	{
+		// Look it up
+		CBaseEntity* theEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theIndex));
+		if(theEntity)
+		{
+			// Return it's angle
+			lua_pushnumber(inState, theEntity->pev->origin.x);
+			lua_pushnumber(inState, theEntity->pev->origin.y);
+			lua_pushnumber(inState, theEntity->pev->origin.z);
+			theNumReturned = 3;
+		}
+	}
+	
+	return theNumReturned;
+}
+
+// inEntityIndex, x, y, z
+static int setPos(lua_State* inState)
+{
+	// Get entity index
+	int theIndex = lua_tonumber(inState, 1);
+	if(theIndex > 0)
+	{
+		// Look it up
+		CBaseEntity* theEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theIndex));
+		if(theEntity)
+		{
+			// Set it's position
+			float theX = lua_tonumber(inState, 2);
+			float theY = lua_tonumber(inState, 3);
+			float theZ = lua_tonumber(inState, 4);
+			theEntity->pev->origin = vec3_t(theX, theY, theZ);
+		}
+	}
+	
+	// Return true or false
+	return 0;
+}
+
+// inEntityIndex, returns yaw, pitch, roll
+static int getAngles(lua_State* inState)
+{
+	int theNumReturned = 0;
+
+	// Get entity index
+	int theIndex = lua_tonumber(inState, 1);
+	if(theIndex > 0)
+	{
+		// Look it up
+		CBaseEntity* theEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theIndex));
+		if(theEntity)
+		{
+			// Return it's angle
+			lua_pushnumber(inState, theEntity->pev->angles.x);
+			lua_pushnumber(inState, theEntity->pev->angles.y);
+			lua_pushnumber(inState, theEntity->pev->angles.z);
+			theNumReturned = 3;
+		}
+	}
+	
+	return theNumReturned;
+}
+
+// string inEntityName
+static int getEntityIndexWithName(lua_State* inState)
+{
+	// Get entity name
+	int theEntityIndex = -1;
+
+	const char* theEntityName = lua_tostring(inState, 1);
+	if(theEntityName)
+	{
+		CBaseEntity* theEntity = UTIL_FindEntityByTargetname(NULL, theEntityName);
+		if(theEntity)
+		{
+			theEntityIndex = theEntity->entindex();
+		}
+	}
+
+	lua_pushnumber(inState, theEntityIndex);
+
+	return 1;
+}
+
+// string targetName, int entityIndexActivator, int entityIndexCaller, useType, value
+static int fireTargets(lua_State* inState)
+{
+	int theNumArgs = lua_gettop(inState);
+	if(theNumArgs == 5)
+	{
+		const char* theTargetName = lua_tostring(inState, 1);
+		if(theTargetName)
+		{
+			int theActivatorIndex = lua_tonumber(inState, 2);
+			int theCallerIndex = lua_tonumber(inState, 3);
+			int theIntUseType = lua_tonumber(inState, 4);
+			float theValue = lua_tonumber(inState, 5);
+			
+			// Trim to valid use types
+			theIntUseType = min(max(theIntUseType, 0), 3);
+			
+			// Lookup entity indices (it's OK if either of these return NULL)
+			CBaseEntity* theActivatorEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theActivatorIndex));
+			CBaseEntity* theCallerEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theCallerIndex));
+			USE_TYPE theUseType = USE_TYPE(theIntUseType);
+			
+			FireTargets(theTargetName, theActivatorEntity, theCallerEntity, theUseType, theValue);
+		}
+	}
+	
+	return 0;
+}
+
+// inEntityIndex, yaw, pitch, roll
+static int setAngles(lua_State* inState)
+{
+	bool theSuccess = false;
+	
+	int theIndex = lua_tonumber(inState, 1);
+	if(theIndex > 0)
+	{
+		// Look it up
+		CBaseEntity* theEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theIndex));
+		if(theEntity)
+		{
+			// Return it's angle
+			theEntity->pev->angles.x = lua_tonumber(inState, 2);
+			theEntity->pev->angles.y = lua_tonumber(inState, 3);
+			theEntity->pev->angles.z = lua_tonumber(inState, 4);
+			theEntity->pev->fixangle = TRUE;
+			theSuccess = true;
+		}
+	}
+	
+	lua_pushnumber(inState, theSuccess);
+	
+	return 1;
+}
+
+// int inEntityIndex, returns success, health
+static int getHealth(lua_State* inState)
+{
+	bool theSuccess = false;
+	float theHealth = -1;	
+
+	int theIndex = lua_tonumber(inState, 1);
+	if(theIndex > 0)
+	{
+		// Look it up
+		CBaseEntity* theEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theIndex));
+		if(theEntity)
+		{
+			theHealth = theEntity->pev->health;
+			theSuccess = true;
+		}
+	}
+	
+	lua_pushnumber(inState, theSuccess);
+	lua_pushnumber(inState, theHealth);
+	
+	return 2;
+}
+
+// int inEntityIndex, int inHealth
+static int setHealth(lua_State* inState)
+{
+	bool theSuccess = false;
+
+	int theIndex = lua_tonumber(inState, 1);
+	if(theIndex > 0)
+	{
+		// Look it up
+		CBaseEntity* theEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theIndex));
+		if(theEntity)
+		{
+			int theHealth = lua_tonumber(inState, 2);
+			theEntity->pev->health = theHealth;
+			theSuccess = true;
+		}
+	}
+
+	lua_pushnumber(inState, theSuccess);
+
+	return 1;
+}
+
+
+// int inEntityIndex, returns success, team
+static int getTeam(lua_State* inState)
+{
+	bool theSuccess = false;
+	int theTeam = 0;
+
+	int theIndex = lua_tonumber(inState, 1);
+	if(theIndex > 0)
+	{
+		// Look it up
+		CBaseEntity* theEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theIndex));
+		if(theEntity)
+		{
+			theTeam = theEntity->pev->team;
+			theSuccess = true;
+		}
+	}
+	
+	lua_pushnumber(inState, theSuccess);
+	lua_pushnumber(inState, theTeam);
+	
+	return 2;
+}
+
+
+
+// takes filename, returns whether errors were encountered, returns whether checksums are identical or not
+static int compareWorldChecksum(lua_State* inState)
+{
+	bool theSuccess = false;
+	bool theChecksumsAreEqual = false;
+	
+	const char* theFileName = lua_tostring(inState, 1);
+	Checksum theOldChecksum;
+	theSuccess = theOldChecksum.ReadFromFile(theFileName);
+
+	Checksum theNewChecksum;
+	GetGameRules()->ComputeWorldChecksum(theNewChecksum);
+	if(theSuccess)
+	{
+		StringList theErrors;
+		theChecksumsAreEqual = theNewChecksum.Compare(theOldChecksum, theErrors);
+	}
+	
+	// Return function success
+	lua_pushnumber(inState, theSuccess);
+
+	// Return checksums are equal
+	lua_pushnumber(inState, theChecksumsAreEqual);
+	
+	return 2;
+}
+
+// takes filename, returns success
+static int saveWorldChecksum(lua_State* inState)
+{
+	bool theSuccess = false;
+
+	Checksum theChecksum;
+	GetGameRules()->ComputeWorldChecksum(theChecksum);
+
+	const char* theFileName = lua_tostring(inState, 1);
+	theSuccess = theChecksum.SaveToFile(theFileName);
+
+	// Return success
+	lua_pushnumber(inState, theSuccess);
+
+	return 1;
+}
+
+// int inEntityID, string itemName
+static int giveNamedItem(lua_State* inState)
+{
+	// Get entity index
+	int theIndex = lua_tonumber(inState, 1);
+	if(theIndex > 0)
+	{
+		// Look it up
+		CBaseEntity* theEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theIndex));
+		if(theEntity)
+		{
+			AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntity);
+			if(thePlayer)
+			{
+				const char* theItemName = lua_tostring(inState, 2);
+				if(theItemName != NULL)
+				{
+					thePlayer->GiveNamedItem(theItemName);
+				}
+			}
+		}
+	}
+	
+	return 0;
+}
+
+// int destination, string formattedString, returns success
+static int printMessage(lua_State* inState)
+{
+	bool theSuccess = false;
+
+	int theNumArgs = lua_gettop(inState);
+	if(theNumArgs == 2)
+	{
+		int theMessageDest = lua_tonumber(inState, 1);
+		ALERT_TYPE theAlertType = ALERT_TYPE(min(max(theMessageDest, 0), 5));
+		
+		const char* theFormattedCString = lua_tostring(inState, 2);
+		if(theFormattedCString)
+		{
+			char theCharArray[kMaxStrLen];
+			strcpy(theCharArray, theFormattedCString);
+
+			ALERT(theAlertType, theCharArray);
+
+			theSuccess = true;
+		}
+	}
+	
+	lua_pushnumber(inState, theSuccess);
+
+	return 1;
+}
+
+// int thePlayerIndex, string string (in titles.txt), returns success
+static int sendMessage(lua_State* inState)
+{
+	bool theSuccess = false;
+
+	int theNumArgs = lua_gettop(inState);
+	if(theNumArgs == 2)
+	{
+		int thePlayerIndex = lua_tonumber(inState, 1);
+		
+		const char* theCString = lua_tostring(inState, 2);
+		if(theCString)
+		{
+			char theCharArray[kMaxStrLen];
+			strcpy(theCharArray, theCString);
+
+			CBaseEntity* theEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(thePlayerIndex));
+			if(theEntity)
+			{
+				AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntity);
+				if(thePlayer)
+				{
+					thePlayer->SendMessage(theCString, true);
+					theSuccess = true;
+				}
+			}
+		}
+	}
+
+	lua_pushnumber(inState, theSuccess);
+	
+	return 1;
+}
+
+// nothing passed in, nothing returned
+static int resetWorld(lua_State* inState)
+{
+	GetGameRules()->DeleteAndResetEntities();
+	return 0;
+}
+
+// plays a precached sound
+static int playSound(lua_State* inState)
+{
+	int theNumArgs = lua_gettop(inState);
+	if(theNumArgs >= 2)
+	{
+		int theEntIndex = lua_tonumber(inState, 1);
+		
+		const char* theSoundName = lua_tostring(inState, 2);
+		
+		CBaseEntity* theEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theEntIndex));
+		if(theEntity)
+		{
+			float theVolume = 1.0f;
+			if(theNumArgs >= 3)
+			{
+				theVolume = lua_tonumber(inState, 3);
+			}
+			
+			float theAttenuation = ATTN_NORM;
+			if(theNumArgs >= 4)
+			{
+				theAttenuation = lua_tonumber(inState, 4);
+			}
+			
+			EMIT_SOUND(theEntity->edict(), CHAN_AUTO, theSoundName, theVolume, theAttenuation);
+		}
+	}
+	
+	return 0;
+}
+
+// int playerIndex, string command
+static int serverCommand(lua_State* inState)
+{
+	// Get entity index
+	int theIndex = lua_tonumber(inState, 1);
+	if(theIndex > 0)
+	{
+		// Look it up
+		CBaseEntity* theEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theIndex));
+		if(theEntity)
+		{
+			AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntity);
+			if(thePlayer)
+			{
+				const char* theServerCommand = lua_tostring(inState, 2);
+				if(theServerCommand != NULL)
+				{
+					GetGameRules()->ClientCommand(thePlayer, theServerCommand);
+				}
+			}
+		}
+	}
+	
+	return 0;
+}
+
+static int runClientScript(lua_State* inState)
+{
+	// Get entity index
+	int theIndex = lua_tonumber(inState, 1);
+	if(theIndex > 0)
+	{
+		// Look it up
+		CBaseEntity* theEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theIndex));
+		if(theEntity)
+		{
+			AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntity);
+			if(thePlayer)
+			{
+				const char* theScript = lua_tostring(inState, 2);
+				if(theScript != NULL)
+				{
+					thePlayer->RunClientScript(theScript);
+				}
+			}
+		}
+	}
+	
+	return 0;
+}
+
+static int setServerVariable(lua_State* inState)
+{
+	// Get variable name
+	const char* theVariableName = lua_tostring(inState, 1);
+	if(theVariableName)
+	{
+		float theValue = lua_tonumber(inState, 2);
+		CVAR_SET_FLOAT(theVariableName, theValue);
+	}
+
+	return 0;
+}
+
+void AvHScriptInstance::InitServer()
+{
+	//lua_register(this->mState, LUA_ERRORMESSAGE, errormessage);
+	
+	//lua_register(this->mState, "execute", execute);
+	lua_register(this->mState, "print", print);
+	
+	lua_register(this->mState, "getAngles", getAngles);
+	lua_register(this->mState, "setAngles", setAngles);
+	
+	lua_register(this->mState, "getEntityIndexWithName", getEntityIndexWithName);
+	lua_register(this->mState, "fireTargets", fireTargets);
+	
+	lua_register(this->mState, "getPos", getPos);
+	lua_register(this->mState, "setPos", setPos);
+	
+	lua_register(this->mState, "getHealth", getHealth);
+	lua_register(this->mState, "setHealth", setHealth);
+
+	lua_register(this->mState, "getTeam", getTeam);
+	
+	lua_register(this->mState, "compareWorldChecksum", compareWorldChecksum);
+	lua_register(this->mState, "saveWorldChecksum", saveWorldChecksum);
+	
+	lua_register(this->mState, "printMessage", printMessage);
+	lua_register(this->mState, "sendMessage", sendMessage);
+	
+	lua_register(this->mState, "giveNamedItem", giveNamedItem);
+	lua_register(this->mState, "playSound", playSound);
+	lua_register(this->mState, "resetWorld", resetWorld);
+	lua_register(this->mState, "serverCommand", serverCommand);
+	lua_register(this->mState, "runClientScript", runClientScript);
+
+	lua_register(this->mState, "setServerVariable", setServerVariable);
+}
\ No newline at end of file
diff --git a/main/source/mod/AvHScriptShared.cpp b/main/source/mod/AvHScriptShared.cpp
new file mode 100644
index 00000000..8c6342f5
--- /dev/null
+++ b/main/source/mod/AvHScriptShared.cpp
@@ -0,0 +1,90 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHScriptShared.cpp $
+// $Date: 2002/07/24 18:45:43 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHScriptShared.cpp,v $
+// Revision 1.2  2002/07/24 18:45:43  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.1  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "util/nowarnings.h"
+#include "mod/AvHScriptManager.h"
+#include "util/Checksum.h"
+#include "util/STLUtil.h"
+
+#ifdef AVH_SERVER
+#include "extdll.h"
+#include "dlls/util.h"
+#include "cbase.h"
+#endif
+
+#ifdef AVH_CLIENT
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "mod/AvHSharedUtil.h"
+
+extern AvHScriptInstance* gRunningScript;
+
+static int isnil(lua_State* inState)
+{
+	int theIsNil = lua_isnil(inState, 1);
+	lua_pushnumber(inState, theIsNil);
+	return 1;
+}
+
+// string functionName, float time from now
+static int setCallback(lua_State* inState)
+{
+	// Must be set by ScriptInstance::Run()
+	ASSERT(gRunningScript);
+	
+	const char* inFunctionName = lua_tostring(inState, 1);
+	ASSERT(inFunctionName);
+	
+	float theCurrentTime = 0;
+	
+#ifdef AVH_SERVER
+	theCurrentTime = gpGlobals->time;
+#else
+	theCurrentTime = gEngfuncs.GetClientTime();
+#endif
+	
+	
+	float inTime = theCurrentTime + lua_tonumber(inState, 2);
+
+	string theFunctionNameString(inFunctionName);
+	gRunningScript->AddCallback(theFunctionNameString, inTime);
+	
+	return 0;
+}
+
+// returns world time
+static int getTime(lua_State* inState)
+{
+	float theTime = AvHSHUGetTime();
+	lua_pushnumber(inState, theTime);
+	
+	return 1;
+}
+
+void AvHScriptInstance::InitShared()
+{
+	lua_register(this->mState, "isnil", isnil);
+	lua_register(this->mState, "setCallback", setCallback);
+	lua_register(this->mState, "getTime", getTime);
+}
+
diff --git a/main/source/mod/AvHScrollHandler.cpp b/main/source/mod/AvHScrollHandler.cpp
new file mode 100644
index 00000000..b107e9a0
--- /dev/null
+++ b/main/source/mod/AvHScrollHandler.cpp
@@ -0,0 +1,191 @@
+#include "mod/AvHScrollHandler.h"
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+#include "VGUI_MouseCode.h"
+#include "ui/ColoredPanel.h"
+#include "mod/AvHScrollPanel.h"
+#include "mod/AvHActionButtons.h"
+#include "ui/UIUtil.h"
+
+int AvHScrollHandler::sScrollX = 0;
+int AvHScrollHandler::sScrollY = 0;
+int AvHScrollHandler::sScrollZ = 0;
+int AvHScrollHandler::sLastMouseX = 0;
+int AvHScrollHandler::sLastMouseY = 0;
+int AvHScrollHandler::sLastMouseDownX = 0;
+int AvHScrollHandler::sLastMouseDownY = 0;
+int AvHScrollHandler::sLastMouseUpX = 0;
+int AvHScrollHandler::sLastMouseUpY = 0;
+bool AvHScrollHandler::sMouseOneDown = false;
+bool AvHScrollHandler::sMouseTwoDown = false;
+
+AvHScrollHandler::AvHScrollHandler()
+{
+}
+
+bool AvHScrollHandler::GetMouseOneDown() const
+{
+	return sMouseOneDown;
+}
+
+bool AvHScrollHandler::GetMouseTwoDown() const
+{
+	return sMouseTwoDown;
+}
+
+int	AvHScrollHandler::GetMouseX() const
+{
+	return sLastMouseX;
+}
+
+int	AvHScrollHandler::GetMouseY() const
+{
+	return sLastMouseY;
+}
+
+int AvHScrollHandler::GetXScroll() const
+{
+	return (sMouseOneDown | sMouseTwoDown) ? 0 : sScrollX;
+}
+
+int AvHScrollHandler::GetYScroll() const
+{
+	return (sMouseOneDown | sMouseTwoDown) ? 0 : sScrollY;
+}
+
+int AvHScrollHandler::GetZScroll() const
+{
+	return sScrollZ;
+}
+
+void AvHScrollHandler::ClearScrollHeight()
+{
+	sScrollZ = 0;
+}
+
+void AvHScrollHandler::ScrollLeft()
+{
+	sScrollX = -1;
+}
+
+void AvHScrollHandler::ScrollRight()
+{
+	sScrollX = 1;
+}
+
+void AvHScrollHandler::ScrollUp()
+{
+	sScrollY = 1;
+}
+
+void AvHScrollHandler::ScrollDown()
+{
+	sScrollY = -1;
+}
+
+void AvHScrollHandler::ScrollHeightUp()
+{
+	sScrollZ = -1;
+}
+
+void AvHScrollHandler::ScrollHeightDown()
+{
+	sScrollZ = 1;
+}
+
+void AvHScrollHandler::StopScroll()
+{
+	sScrollX = 0;
+	sScrollY = 0;
+	sScrollZ = 0;
+}
+
+void AvHScrollHandler::cursorMoved(int x, int y, Panel* inPanel)
+{
+	char theMessage[256];
+	int theRandNumber = rand() % 10;
+	sprintf(theMessage, "Cursor moved, %d, %d, rand = %d", x, y, theRandNumber);
+
+	// Uncomment this to make it scroll when you're near the edges of the screen, nice feel but hard to use with UI elements on edge
+	//int kPixelScrollTolerance = ScreenWidth/25;
+	int kPixelScrollTolerance = 0;
+
+	// Get screen coordinates of mouse
+	ASSERT(inPanel);
+	int theX, theY;
+	inPanel->getPos(theX, theY);
+
+	sLastMouseX = theX + x;
+	sLastMouseY = theY + y;
+
+	AvHScrollPanel* theScrollPanel = dynamic_cast<AvHScrollPanel*>(inPanel);
+	if(theScrollPanel)
+	{
+		// Only scroll when moving over colored panel (ie, not when near the edge of another component)
+		AvHScrollHandler::StopScroll();
+		
+		if(x <= kPixelScrollTolerance)
+		{
+			AvHScrollHandler::ScrollLeft();
+			sprintf(theMessage, "Scrolling left");
+		}
+		if(x >= (ScreenWidth() - 1 - kPixelScrollTolerance))
+		{
+			AvHScrollHandler::ScrollRight();
+			sprintf(theMessage, "Scrolling right");
+		}
+		if(y <= kPixelScrollTolerance)
+		{
+			AvHScrollHandler::ScrollUp();
+			sprintf(theMessage, "Scrolling up");
+		}
+		if(y >= (ScreenHeight() - 1 - kPixelScrollTolerance))
+		{
+			AvHScrollHandler::ScrollDown();
+			sprintf(theMessage, "Scrolling down");
+		}
+		//CenterPrint(theMessage);
+	}
+}
+
+void AvHScrollHandler::keyPressed(KeyCode inKeyCode, Panel* panel)
+{
+}
+
+void AvHScrollHandler::mousePressed(MouseCode code, Panel* panel)
+{
+	// store this
+	if(code == vgui::MOUSE_LEFT)
+	{
+		sMouseOneDown = true;
+	}
+	else if(code == vgui::MOUSE_RIGHT)
+	{
+		sMouseTwoDown = true;
+	}
+}
+
+void AvHScrollHandler::mouseReleased(MouseCode code, Panel* panel)
+{
+	// store this
+	if(code == vgui::MOUSE_LEFT)
+	{
+		sMouseOneDown = false;
+	}
+	else if(code == vgui::MOUSE_RIGHT)
+	{
+		sMouseTwoDown = false;
+	}
+}
+
+void AvHScrollHandler::mouseWheeled(int delta, Panel* panel)
+{
+	if(delta > 0)
+	{
+		this->ScrollHeightUp();
+	}
+	else if(delta < 0)
+	{
+		this->ScrollHeightDown();
+	}
+}
diff --git a/main/source/mod/AvHScrollHandler.h b/main/source/mod/AvHScrollHandler.h
new file mode 100644
index 00000000..08555a06
--- /dev/null
+++ b/main/source/mod/AvHScrollHandler.h
@@ -0,0 +1,56 @@
+#ifndef AVHSCROLLHANDLER_H
+#define AVHSCROLLHANDLER_H
+
+#include <VGUI_InputSignal.h>
+
+using namespace vgui;
+
+class AvHScrollHandler : public InputSignal
+{
+public:
+					AvHScrollHandler();
+
+	int				GetXScroll() const;
+	int				GetYScroll() const;
+	int				GetZScroll() const;
+	int				GetMouseX() const;
+	int				GetMouseY() const;
+	bool			GetMouseOneDown() const;
+	bool			GetMouseTwoDown() const;
+	
+	static void		ClearScrollHeight();
+	static void		ScrollLeft();
+	static void		ScrollRight();
+	static void		ScrollUp();
+	static void		ScrollDown();
+	static void		ScrollHeightUp();
+	static void		ScrollHeightDown();
+	static void		StopScroll();
+	
+	virtual void	cursorMoved(int x,int y,Panel* panel);
+	virtual void	cursorEntered(Panel* panel) {}
+	virtual void	cursorExited(Panel* panel) {}
+	virtual void	mousePressed(MouseCode code,Panel* panel);
+	virtual void	mouseDoublePressed(MouseCode code,Panel* panel) {}
+	virtual void	mouseReleased(MouseCode code,Panel* panel);
+	virtual void	mouseWheeled(int delta,Panel* panel);
+	virtual void	keyPressed(KeyCode code,Panel* panel);
+	virtual void	keyTyped(KeyCode code,Panel* panel)  {}
+	virtual void	keyReleased(KeyCode code,Panel* panel)  {}
+	virtual void	keyFocusTicked(Panel* panel)  {}
+
+private:
+	static int sScrollX;
+	static int sScrollY;
+	static int sScrollZ;
+	static int sLastMouseX;
+	static int sLastMouseY;
+	static int sLastMouseDownX;
+	static int sLastMouseDownY;
+	static int sLastMouseUpX;
+	static int sLastMouseUpY;
+	static bool sMouseOneDown;
+	static bool sMouseTwoDown;
+};
+
+#endif
diff --git a/main/source/mod/AvHScrollPanel.cpp b/main/source/mod/AvHScrollPanel.cpp
new file mode 100644
index 00000000..c4a25a7b
--- /dev/null
+++ b/main/source/mod/AvHScrollPanel.cpp
@@ -0,0 +1,27 @@
+#include "vgui_Panel.h"
+#include "ui/UIComponents.h"
+#include "mod/AvHScrollPanel.h"
+
+AvHScrollPanel::AvHScrollPanel()
+{
+}
+	
+void AvHScrollPanel::paint() 
+{
+	InvisiblePanel::paint();
+}
+	
+void AvHScrollPanel::paintBackground()
+{
+	InvisiblePanel::paintBackground();
+}
+
+void AvHUIScrollPanel::AllocateComponent(const TRDescription& inDesc)
+{
+	this->mScrollComponent = new AvHScrollPanel();
+}
+
+Panel* AvHUIScrollPanel::GetComponentPointer(void)
+{
+	return this->mScrollComponent;
+}
diff --git a/main/source/mod/AvHScrollPanel.h b/main/source/mod/AvHScrollPanel.h
new file mode 100644
index 00000000..b93f3715
--- /dev/null
+++ b/main/source/mod/AvHScrollPanel.h
@@ -0,0 +1,29 @@
+#ifndef AVHSCROLLPANEL_H
+#define AVHSCROLLPANEL_H
+
+#include "vgui_Panel.h"
+#include "ui/UIComponents.h"
+
+class AvHScrollPanel : public InvisiblePanel
+{
+public:
+					AvHScrollPanel();
+	
+protected:
+	virtual void	paint();
+	virtual void	paintBackground();
+};
+
+class AvHUIScrollPanel : public UIColoredPanel
+{
+public:
+	void				AllocateComponent(const TRDescription& inDesc);
+
+	virtual Panel*		GetComponentPointer(void);
+	
+private:
+	AvHScrollPanel*		mScrollComponent;
+	
+};
+
+#endif
diff --git a/main/source/mod/AvHSelectionHelper.cpp b/main/source/mod/AvHSelectionHelper.cpp
new file mode 100644
index 00000000..81861241
--- /dev/null
+++ b/main/source/mod/AvHSelectionHelper.cpp
@@ -0,0 +1,400 @@
+#include "util/nowarnings.h"
+
+#ifdef AVH_SERVER
+#include "extdll.h"
+#include "util.h"
+#include "types.h"
+#endif
+
+#ifdef AVH_CLIENT
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+#endif
+
+#include "mod/AvHSelectionHelper.h"
+#include "mod/AvHConstants.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHPlayer.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHEntities.h"
+#include "mod/AvHGamerules.h"
+#endif
+
+#include "pm_shared/pm_defs.h"
+#include "pm_shared/pm_shared.h"
+
+#ifdef AVH_CLIENT
+#include "pm_shared/pm_debug.h"
+extern DebugPointListType				gTriDebugLocations;
+#endif
+
+#include "util/MathUtil.h"
+
+extern playermove_t *pmove;
+#include "mod/AvHSharedUtil.h"
+
+#include "common/vector_util.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+
+#include "common/r_efx.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "cl_dll/in_defs.h"
+#endif
+
+#include "mod/AvHSpecials.h"
+
+AvHSelectionHelper::AvHSelectionHelper()
+{
+	this->mQueuedTeamNumber = TEAM_IND;
+	this->mQueuedSelectionWaiting = false;
+	this->mSelectionResultsWaiting = false;
+}
+
+void AvHSelectionHelper::ClearSelection()
+{
+	ASSERT(this->mSelectionResults.size() == 0);
+	this->mSelectionResults.clear();
+	this->mSelectionResultsWaiting = true;
+}
+
+void AvHSelectionHelper::GetAndClearSelection(EntityListType& outSelectedList)
+{
+	ASSERT(this->mSelectionResultsWaiting);
+	outSelectedList = this->mSelectionResults;
+	this->mSelectionResults.clear();
+	this->mSelectionResultsWaiting = false;
+}
+
+void AvHSelectionHelper::ProcessPendingSelections()
+{
+	if(this->mQueuedSelectionWaiting)
+	{
+		this->mSelectionResultsWaiting = this->SelectUnits(this->mQueuedPointOfView, this->mQueuedRayOne, this->mQueuedRayTwo, this->mQueuedTeamNumber, this->mSelectionResults);
+		this->mQueuedSelectionWaiting = false;
+	}
+}
+
+void AvHSelectionHelper::QueueSelection(const Vector& inPointOfView, const Vector& inStartRay, const Vector& inEndRay, AvHTeamNumber inTeamNumber)
+{
+	this->mQueuedPointOfView = inPointOfView;
+	this->mQueuedRayOne = inStartRay;
+	this->mQueuedRayTwo = inEndRay;
+	this->mQueuedTeamNumber = inTeamNumber;
+
+	this->mQueuedSelectionWaiting = true;
+}
+
+bool AvHSelectionHelper::SelectionResultsWaiting()
+{
+	return this->mSelectionResultsWaiting;
+}
+
+//#ifdef AVH_SERVER
+//void AvHSelectionHelper::SelectLocation(const Vector& inPointOfView, const Vector& inNormRay, Vector& outVector)
+//{
+//	TraceResult		tr;
+//	Vector			theStartPos;
+//	Vector			theEndPos;
+//	bool			theSuccess = false;
+//	bool			theDone = false;
+//	
+//	VectorMA(inPointOfView, kSelectionStartRange, inNormRay, theStartPos);
+//	VectorMA(inPointOfView, kSelectionEndRange, inNormRay, theEndPos);
+//	
+//	CBaseEntity* theEntityHit = NULL;
+//	edict_t* theEdictToIgnore = NULL;
+//	
+//	do
+//	{
+//		UTIL_TraceLine(theStartPos, theEndPos, ignore_monsters, theEdictToIgnore, &tr);
+//		//UTIL_TraceLine(theStartPos, theEndPos, dont_ignore_monsters, dont_ignore_glass, theEdictToIgnore, &tr);
+//		
+////		theEntityHit = CBaseEntity::Instance(tr.pHit);
+////		AvHWaypoint* theGround = dynamic_cast<AvHWaypoint*>(theEntityHit);
+////		if(theGround)
+////		{
+////			VectorCopy(tr.vecEndPos, outVector);
+////			theSuccess = true;
+////			theDone = true;
+////		}
+//
+//		if((tr.flFraction >= 1.0f) || (tr.flFraction < kFloatTolerance))
+//		{
+//			theDone = true;
+//		}
+//		else
+//		{
+//			if(theEntityHit)
+//			{
+//				theEdictToIgnore = ENT(theEntityHit->pev);
+//			}
+//			VectorCopy(tr.vecEndPos, theStartPos);
+//		}
+//	} while(!theDone);
+//}
+//#endif	
+
+//#ifdef AVH_CLIENT
+//void AvHSelectionHelper::SelectLocation(const Vector& inPointOfView, const Vector& inNormRay, Vector& outVector)
+//{
+//	// TODO: Change this to only return location when proper entity hit
+//	pmtrace_t tr;
+//	Vector theStartPos = inPointOfView;
+//	Vector theEndPos = theStartPos + kSelectionEndRange*inNormRay;
+//	Vector theResult;
+//
+//	tr = *pmove->PM_TraceLine( (float *)&theStartPos, (float *)&theEndPos, PM_TRACELINE_ANYVISIBLE, 2 /*point sized hull*/, -1 );
+//	outVector = tr.endpos;
+//}	
+//#endif
+
+
+bool AvHSelectionHelper::IsPositionInRegion(const Vector& inPosition, const Vector& inPointOfView, const Vector& inNormRayOne, const Vector& inNormRayTwo)
+{
+	bool theSuccess = false;
+
+	// Build normalized vector from eye to entity
+	Vector theEyeToEntity;
+	VectorSubtract(inPosition, inPointOfView, theEyeToEntity);
+	VectorNormalize(theEyeToEntity);
+
+	// Is vector between two other vectors?
+	//if(IsVectorBetweenBoundingVectors(theEyeToEntity, inNormRayOne, inNormRayTwo))
+	//if(IsVectorBetweenBoundingVectors(inPosition, theEyeToEntity, inNormRayOne, inNormRayTwo, thePlaneABCD))
+	if(IsVectorBetweenBoundingVectors(inPosition, theEyeToEntity, inNormRayOne, inNormRayTwo))
+	{
+		theSuccess = true;
+	}
+	
+	return theSuccess;
+}
+
+void AvHSelectionHelper::ProcessEntityForSelection(const Vector& inOrigin, const Vector& inPointOfView, const Vector& inNormRayOne, const Vector& inNormRayTwo, int inIndex, bool inIsPlayer, bool inIsMarkedSelectable, bool inSameTeam, bool inIsVisible)
+{
+	if(this->IsPositionInRegion(inOrigin, inPointOfView, inNormRayOne, inNormRayTwo))
+	{
+		if(inIsPlayer || inIsMarkedSelectable)
+		{
+			bool theIsFriendly = inSameTeam;
+			
+			if(inIsPlayer)
+			{
+				if(theIsFriendly)
+				{
+					this->mFriendlyPlayers.push_back(inIndex);
+				}
+				else if(inIsVisible)
+				{
+					//this->mNonFriendlyPlayers.push_back(inIndex);
+				}
+			}
+			else
+			{
+				if(theIsFriendly)
+				{
+					this->mFriendlyBuildings.push_back(inIndex);
+				}
+				else if(inIsVisible)
+				{
+					//this->mNonFriendlyBuildings.push_back(inIndex);
+				}
+			}
+		}
+		//		else if(inIsSelectableWorldObject)
+		//		{
+		//			this->mWorldObjects.push_back(inIndex);
+		//		}
+	}
+}
+
+bool AvHSelectionHelper::SelectUnitsInRegion(const Vector& inPointOfView, const Vector& inNormRayOne, const Vector& inNormRayTwo, AvHTeamNumber inTeamNumber, EntityListType& outEntIndexList)
+{
+#ifdef AVH_SERVER
+	// Assumes that entities won't be too far away
+	float theRadius = GetGameRules()->GetMapExtents().GetTopDownCullDistance()*2;
+
+	CBaseEntity* theBaseEntity = NULL;
+	while((theBaseEntity = UTIL_FindEntityInSphere(theBaseEntity, inPointOfView, theRadius)) != NULL)
+	{
+		const char* theClassName = STRING(theBaseEntity->pev->classname);
+		if(!AvHSUGetIsExternalClassName(theClassName))
+		{
+			
+            // Check for EF_NODRAW so that recycled command stations cannot be selected.
+            
+            if(!GetHasUpgrade(theBaseEntity->pev->iuser4, MASK_TOPDOWN) && !(theBaseEntity->pev->effects & EF_NODRAW) )
+			{
+				AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theBaseEntity);
+				bool theIsPlayer = (thePlayer && thePlayer->GetIsRelevant() && (thePlayer->GetUser3() != AVH_USER3_COMMANDER_PLAYER));
+				bool theIsMarkedSelectable = GetHasUpgrade(theBaseEntity->pev->iuser4, MASK_SELECTABLE);
+				bool theSameTeam = (theBaseEntity->pev->team == inTeamNumber);
+				bool theIsVisible = (theSameTeam || GetHasUpgrade(theBaseEntity->pev->iuser4, MASK_VIS_SIGHTED));
+				
+				Vector thePosition = theBaseEntity->pev->origin;
+				if((thePosition.x == thePosition.y) && (thePosition.y == thePosition.z) && (thePosition.z == 0.0f))
+				{
+					thePosition.x = (theBaseEntity->pev->mins.x + theBaseEntity->pev->maxs.x)/2.0f;
+					thePosition.y = (theBaseEntity->pev->mins.y + theBaseEntity->pev->maxs.y)/2.0f;
+					thePosition.z = (theBaseEntity->pev->mins.z + theBaseEntity->pev->maxs.z)/2.0f;
+				}
+				
+				int theEntityIndex = theBaseEntity->entindex();
+				AvHSHUGetEntityLocation(theEntityIndex, thePosition);
+				
+				this->ProcessEntityForSelection(thePosition, inPointOfView, inNormRayOne, inNormRayTwo, theEntityIndex, theIsPlayer, theIsMarkedSelectable, theSameTeam, theIsVisible);
+			}
+		}
+	}
+#endif
+	
+#ifdef AVH_CLIENT
+	gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction( false, true );
+	
+	// Store off the old count
+	gEngfuncs.pEventAPI->EV_PushPMStates();
+	
+	// Now add in all of the players.
+	gEngfuncs.pEventAPI->EV_SetSolidPlayers (-1);
+	
+	physent_t* theEntity = NULL;
+	int theNumEnts = pmove->numphysent;
+	for (int i = 0; i < theNumEnts; i++)
+	{
+		theEntity = gEngfuncs.pEventAPI->EV_GetPhysent(i);
+		if(theEntity && !GetHasUpgrade(theEntity->iuser4, MASK_TOPDOWN))
+		{
+			int theEntityIndex = theEntity->info;
+			bool theIsPlayer = ((theEntityIndex >= 1) && (theEntityIndex <= gEngfuncs.GetMaxClients()));
+			bool theIsMarkedSelectable = GetHasUpgrade(theEntity->iuser4, MASK_SELECTABLE);
+			bool theSameTeam = (theEntity->team == inTeamNumber);
+			bool theIsVisible = (theSameTeam || GetHasUpgrade(theEntity->iuser4, MASK_VIS_SIGHTED));
+			
+			if(theIsVisible || theIsPlayer || theIsMarkedSelectable)
+			{
+				int a = 0;
+			}
+			
+			Vector thePosition = theEntity->origin;
+			if((thePosition.x == thePosition.y) && (thePosition.y == thePosition.z) && (thePosition.z == 0.0f))
+			{
+				thePosition.x = (theEntity->mins.x + theEntity->maxs.x)/2.0f;
+				thePosition.y = (theEntity->mins.y + theEntity->maxs.y)/2.0f;
+				thePosition.z = (theEntity->mins.z + theEntity->maxs.z)/2.0f;
+			}
+			
+			this->ProcessEntityForSelection(thePosition, inPointOfView, inNormRayOne, inNormRayTwo, theEntityIndex, theIsPlayer, theIsMarkedSelectable, theSameTeam, theIsVisible);
+		}
+	}
+
+	gEngfuncs.pEventAPI->EV_PopPMStates();
+	
+	//	gTriDebugLocations.clear();
+	//	
+	//	DebugPoint thePoint;
+	//	thePoint.x = theResultOne.x;
+	//	thePoint.y = theResultOne.y;
+	//	thePoint.z = theResultOne.z;
+	//	gTriDebugLocations.push_back(thePoint);
+	//
+	//	thePoint.x = theResultTwo.x;
+	//	thePoint.y = theResultTwo.y;
+	//	thePoint.z = theResultTwo.z;
+	//	gTriDebugLocations.push_back(thePoint);
+#endif
+
+	bool theSuccess = false;
+
+	// Our own players
+	if(this->mFriendlyPlayers.size() > 0)
+	{
+		outEntIndexList = this->mFriendlyPlayers;
+	}
+	// Our own buildings only one
+	else if(this->mFriendlyBuildings.size() > 0)
+	{
+		outEntIndexList.push_back(*mFriendlyBuildings.begin());
+	}
+	// Enemy players (only one)
+	else if(this->mNonFriendlyPlayers.size() > 0)
+	{
+		outEntIndexList.push_back(*this->mNonFriendlyPlayers.begin());
+	}
+	// Enemy buildings (only one)
+	else if(this->mNonFriendlyBuildings.size() > 0)
+	{
+		outEntIndexList.push_back(*this->mNonFriendlyBuildings.begin());
+	}
+	// World objects (only one)
+//	else if(this->mWorldObjects.size() > 0)
+//	{
+//		outEntIndexList.push_back(*this->mWorldObjects.begin());
+//	}
+	if(outEntIndexList.size() > 0)
+	{
+		theSuccess = true;
+	}
+
+	this->mFriendlyBuildings.clear();
+	this->mFriendlyPlayers.clear();
+	this->mNonFriendlyBuildings.clear();
+	this->mNonFriendlyPlayers.clear();
+//	this->mWorldObjects.clear();
+		
+	return theSuccess;
+}
+
+bool AvHSelectionHelper::SelectUnits(const Vector& inPointOfView, const Vector& inStartRay, const Vector& inEndRay, AvHTeamNumber inTeamNumber, EntityListType& outEntIndexList)
+{
+	bool theSuccess = false;
+
+	// Select into new list
+	EntityListType theNewSelection;
+
+	Vector theStartRay = inStartRay;
+	Vector theEndRay = inEndRay;
+	
+	// If inNormRayOne and inNormRayTwo are sufficiently close, just do a ray test
+	const float theXTolerance = .1f;
+	const float theYTolerance = .1f;
+	if((fabs(theStartRay.x - theEndRay.x) < theXTolerance) && (fabs(theStartRay.y - theEndRay.y) < theYTolerance))
+	{
+//		// Ignore team here, we're allowed to click select units on either team
+//		int theEntIndex;
+//		if(AvHSHUGetEntityAtRay(inPointOfView, inStartRay, theEntIndex))
+//		{
+//			theNewSelection.push_back(theEntIndex);
+//			theSuccess = true;
+//		}
+
+		// Select minimum around center
+		Vector theCenter;
+		theCenter.x = (inStartRay.x + inEndRay.x)/2.0f;
+		theCenter.y = (inStartRay.y + inEndRay.y)/2.0f;
+//		theCenter.z = (inStartRay.z + inEndRay.z)/2.0f;
+
+		// Not perfect, but good enough
+		theStartRay.x = theCenter.x - theXTolerance/2.0f;
+		theStartRay.y = theCenter.y - theYTolerance/2.0f;
+		VectorNormalize(theStartRay);
+
+		theEndRay.x = theCenter.x + theXTolerance/2.0f;
+		theEndRay.y = theCenter.y + theYTolerance/2.0f;
+		VectorNormalize(theEndRay);
+	}
+//	else
+//	{
+		theSuccess = SelectUnitsInRegion(inPointOfView, theStartRay, theEndRay, inTeamNumber, theNewSelection);
+//	}
+
+	if(theSuccess)
+	{
+		// Set new selection
+		outEntIndexList = theNewSelection;
+	}
+
+	return theSuccess;
+}
diff --git a/main/source/mod/AvHSelectionHelper.h b/main/source/mod/AvHSelectionHelper.h
new file mode 100644
index 00000000..273403b7
--- /dev/null
+++ b/main/source/mod/AvHSelectionHelper.h
@@ -0,0 +1,44 @@
+#ifndef AVH_SELECTION_HELPER_H
+#define AVH_SELECTION_HELPER_H
+
+#include "mod/AvHConstants.h"
+
+// Selection stuff shared between client and server
+// Queues up selection requests, executes them after prediction, once all values are set up
+// Used by AvHHud and AvHPlayer to make sure selection is predicted as accurately as possible
+class AvHSelectionHelper
+{
+public:
+				AvHSelectionHelper();
+	//void		CategorizeSelection(const Vector& inPointOfView, const Vector& inStartRay, SelectionInfo& outInfo);
+	void		ClearSelection();
+	void		GetAndClearSelection(EntityListType& outSelectedList);
+	void		ProcessPendingSelections();
+	void		QueueSelection(const Vector& inPointOfView, const Vector& inStartRay, const Vector& inEndRay, AvHTeamNumber inTeamNumber);
+	bool		SelectionResultsWaiting();
+				
+private:		
+	bool		IsPositionInRegion(const Vector& inPosition, const Vector& inPointOfView, const Vector& inNormRayOne, const Vector& inNormRayTwo);
+	void		ProcessEntityForSelection(const Vector& inOrigin, const Vector& inPointOfView, const Vector& inNormRayOne, const Vector& inNormRayTwo, int inIndex, bool inIsPlayer, bool inIsMarkedSelectable, bool inSameTeam, bool inIsVisible);
+	//void		SelectLocation(const Vector& inPointOfView, const Vector& inNormRay, Vector& outVector);
+	bool		SelectUnitsInRegion(const Vector& inPointOfView, const Vector& inNormRayOne, const Vector& inNormRayTwo, AvHTeamNumber inTeamNumber, EntityListType& outEntIndexList);
+	bool		SelectUnits(const Vector& inPointOfView, const Vector& inStartRay, const Vector& inEndRay, AvHTeamNumber inTeamNumber, EntityListType& outEntIndexList);
+
+	Vector		mQueuedPointOfView;
+	Vector		mQueuedRayOne;
+	Vector		mQueuedRayTwo;
+	bool		mQueuedSelectionWaiting;
+	AvHTeamNumber	mQueuedTeamNumber;
+	
+	EntityListType	mSelectionResults;
+	bool		mSelectionResultsWaiting;
+
+	EntityListType	mFriendlyPlayers;
+	EntityListType	mFriendlyBuildings;
+	EntityListType	mNonFriendlyPlayers;
+	EntityListType	mNonFriendlyBuildings;
+	//EntityList	mWorldObjects;
+	
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHServerPlayerData.cpp b/main/source/mod/AvHServerPlayerData.cpp
new file mode 100644
index 00000000..cb00e289
--- /dev/null
+++ b/main/source/mod/AvHServerPlayerData.cpp
@@ -0,0 +1,70 @@
+#include "mod/AvHServerPlayerData.h"
+
+AvHServerPlayerData::AvHServerPlayerData()
+{
+	this->mResources = -1;
+	this->mTimeLastVotedDown = -1;
+	this->mExperience = 0.0f;
+	this->mExperienceLevelsSpent = 0;
+	this->mHasJoinedTeam = false;
+}
+				
+float AvHServerPlayerData::GetResources() const
+{
+	return this->mResources;
+}
+
+void AvHServerPlayerData::SetResources(float inResources)
+{
+	this->mResources = inResources;
+}
+
+float AvHServerPlayerData::GetTimeVotedDown() const
+{
+	return this->mTimeLastVotedDown;
+}
+
+void AvHServerPlayerData::SetTimeVotedDown(float inTime)
+{
+	this->mTimeLastVotedDown = inTime;
+}
+
+float AvHServerPlayerData::GetExperience() const
+{
+	return this->mExperience;
+}
+
+void AvHServerPlayerData::SetExperience(float inExperience)
+{
+	this->mExperience = inExperience;
+}
+
+const AvHTechNodes& AvHServerPlayerData::GetCombatNodes()
+{
+	return this->mCombatNodes;
+}
+
+void AvHServerPlayerData::SetCombatNodes(const AvHTechNodes& inTechNodes)
+{
+	this->mCombatNodes = inTechNodes;
+}
+
+const MessageIDListType& AvHServerPlayerData::GetPurchasedCombatUpgrades() const
+{
+	return this->mPurchasedCombatUpgrades;
+}
+
+void AvHServerPlayerData::SetPurchasedCombatUpgrades(const MessageIDListType& inPurchasedCombatUpgrades)
+{
+	this->mPurchasedCombatUpgrades = inPurchasedCombatUpgrades;
+}
+
+int	AvHServerPlayerData::GetExperienceLevelsSpent() const
+{
+	return this->mExperienceLevelsSpent;
+}
+
+void AvHServerPlayerData::SetExperienceLevelsSpent(int inExperienceLevelsSpent)
+{
+	this->mExperienceLevelsSpent = inExperienceLevelsSpent;
+}
\ No newline at end of file
diff --git a/main/source/mod/AvHServerPlayerData.h b/main/source/mod/AvHServerPlayerData.h
new file mode 100644
index 00000000..5fdaf8e2
--- /dev/null
+++ b/main/source/mod/AvHServerPlayerData.h
@@ -0,0 +1,48 @@
+#ifndef AVH_SERVERPLAYERDATA_H
+#define AVH_SERVERPLAYERDATA_H
+
+#include "types.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHTechNodes.h"
+#include "mod/AvHMessageList.h"
+
+class AvHServerPlayerData
+{
+public:
+				AvHServerPlayerData();
+				
+	float		GetResources() const;
+	void		SetResources(float inResources);
+
+	float		GetTimeVotedDown() const;
+	void		SetTimeVotedDown(float inTime);
+
+	float		GetExperience() const;
+	void		SetExperience(float inExperience);
+
+	const AvHTechNodes& GetCombatNodes();
+	void		SetCombatNodes(const AvHTechNodes& inTechNodes);
+
+	const MessageIDListType& GetPurchasedCombatUpgrades() const;
+	void		SetPurchasedCombatUpgrades(const MessageIDListType& inPurchasedCombatUpgrades);
+
+	int			GetExperienceLevelsSpent() const;
+	void		SetExperienceLevelsSpent(int inExperienceLevelsSpent);
+
+	bool		GetHasJoinedTeam()		 { return mHasJoinedTeam; }
+	void		SetHasJoinedTeam(int HasJoinedTeam) { mHasJoinedTeam =  HasJoinedTeam; }
+
+private:
+	float			mResources;
+	float			mTimeLastVotedDown;
+	float			mExperience;
+
+	AvHTechNodes    mCombatNodes;
+
+	MessageIDListType	mPurchasedCombatUpgrades;
+	int					mExperienceLevelsSpent;
+	bool				mHasJoinedTeam;
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHServerUtil.cpp b/main/source/mod/AvHServerUtil.cpp
new file mode 100644
index 00000000..d4d4041d
--- /dev/null
+++ b/main/source/mod/AvHServerUtil.cpp
@@ -0,0 +1,1895 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHServerUtil.cpp $
+// $Date: 2002/11/22 21:25:46 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHServerUtil.cpp,v $
+// Revision 1.42  2002/11/22 21:25:46  Flayra
+// - Adminmod fixes
+//
+// Revision 1.41  2002/11/15 04:42:13  Flayra
+// - Moved utility function into here from client.cpp
+//
+// Revision 1.40  2002/11/12 22:39:25  Flayra
+// - Logging changes for Psychostats compatibility
+//
+// Revision 1.39  2002/11/12 02:28:53  Flayra
+// - Don't reset adminmod_ entities
+//
+// Revision 1.38  2002/11/03 04:51:55  Flayra
+// - Refactoring for AddToFullPack changes
+//
+// Revision 1.37  2002/10/24 21:42:12  Flayra
+// - Utility function for telefragging
+// - Hive technology fixes
+//
+// Revision 1.36  2002/10/20 21:11:34  Flayra
+// - Optimizations
+//
+// Revision 1.35  2002/10/19 21:09:56  Flayra
+// - Debugging info for linux
+//
+// Revision 1.34  2002/10/19 20:58:31  Flayra
+// - Debugging info for linux
+//
+// Revision 1.33  2002/10/18 22:22:19  Flayra
+// - Sensory chamber triggers vocal alert
+//
+// Revision 1.32  2002/10/16 01:06:33  Flayra
+// - Added generic particle event
+// - Visibility tweak: enemies aren't "detected" unless they're moving.  This means the commander can only see nearby moving blips, and marines with motion-tracking won't see still aliens that are detected because they're nearby.  This also means webs won't show up when nearby.
+// - Distress beacon event
+//
+// Revision 1.31  2002/10/07 17:49:23  Flayra
+// - Umbra balance change
+//
+// Revision 1.30  2002/10/03 19:06:50  Flayra
+// - Profiling info for Linux build
+//
+// Revision 1.29  2002/09/23 22:30:05  Flayra
+// - Commander dropped weapons live forever
+// - Observatory and sensory chambers check range in 2D for commander regions
+// - Added turret factory upgrading (for siege)
+//
+// Revision 1.28  2002/09/09 20:05:59  Flayra
+// - Sensory chambers now detect enemies in range
+//
+// Revision 1.27  2002/08/31 18:01:03  Flayra
+// - Work at VALVe
+//
+// Revision 1.26  2002/08/16 02:44:11  Flayra
+// - New damage types
+//
+// Revision 1.25  2002/08/09 00:52:14  Flayra
+// - Removed old #ifdef
+//
+// Revision 1.24  2002/08/02 21:50:24  Flayra
+// - Removed hives-are-visible code, I think it's safe again
+//
+// Revision 1.23  2002/07/25 16:58:00  flayra
+// - Linux changes
+//
+// Revision 1.22  2002/07/23 17:24:27  Flayra
+// - Added random building angles for diversity, added research started hooks for distress beacon effects, added versatile alien tech tree, hives are always visible, observatories detect nearby aliens, umbra blocks most but not all bullets
+//
+// Revision 1.21  2002/07/08 17:16:43  Flayra
+// - Tried to cut down on sound list spam by defaulting to CHAN_BODY, added debugging code for tracking down solidity issues
+//
+// Revision 1.20  2002/07/01 21:44:58  Flayra
+// - Added primal scream and umbra support
+//
+// Revision 1.19  2002/06/25 18:16:56  Flayra
+// - Quieted construction effects (normalized now), temporarily removed sensory chamber sight, added upgrading of armory, wrapped bullet tracing for umbra
+//
+// Revision 1.18  2002/06/03 16:57:44  Flayra
+// - Toned down carapace and marine upgrades, removed redundant hive class name, all buildables are subject to visibility rules
+//
+// Revision 1.17  2002/05/28 18:13:50  Flayra
+// - Sensory chambers contribute to hive sight
+//
+// Revision 1.16  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "util/nowarnings.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHPlayer.h"
+#include "dlls/extdll.h"
+#include "dlls/util.h"
+#include "dlls/cbase.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "common/damagetypes.h"
+#include "mod/AvHMarineEquipment.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHSharedUtil.h"
+#include "util/MathUtil.h"
+#include "engine/studio.h"
+#include "mod/AvHSoundListManager.h"
+#include "mod/AvHAlienEquipmentConstants.h"
+#include "mod/AvHAlienEquipment.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHParticleTemplateServer.h"
+#include "mod/AvHAlienWeapons.h"
+#include "common/com_model.h"
+#include "mod/AvHHulls.h"
+#include "mod/AnimationUtil.h"
+
+int   NS_PointContents(const hull_t *hull, int num, float p[3]);
+float NS_TraceLineAgainstEntity(int inEntityIndex, float inTime, const float inRayOrigin[3], const float inRayDirection[3]);
+
+extern const float AVH_INFINITY;
+
+extern playermove_t* pmove;
+
+#ifdef WIN32
+#include "mmsystem.h"
+#endif
+
+extern int	gTeleportEventID;
+extern int	gParticleEventID;
+extern int  gNumericalInfoEventID;
+extern int	gDistressBeaconEventID;
+extern int	gUmbraCloudEventID;
+extern AvHParticleTemplateListServer	gParticleTemplateList;
+
+extern const char* kSteamIDLocal;
+extern const char* kSteamIDBot;
+extern const char* kSteamIDInvalidID;
+
+//void VectorMA (const float *veca, float scale, const float *vecb, float *vecc)
+//{
+//	vecc[0] = veca[0] + scale*vecb[0];
+//	vecc[1] = veca[1] + scale*vecb[1];
+//	vecc[2] = veca[2] + scale*vecb[2];
+//}
+
+extern int gPhaseInEventID;
+extern AvHSoundListManager				gSoundListManager;
+
+unsigned int AvHSUTimeGetTime()
+{
+	unsigned int theTime = 0;
+	
+#ifdef WIN32
+	theTime = timeGetTime();
+#else
+	FILE* theFilePointer;
+	double theIdleTime;
+	double theUpTime;
+	
+	/* Read the system uptime and accumulated idle time from /proc/uptime. We're disregarding theIdleTime  */
+	theFilePointer = fopen ("/proc/uptime", "r");
+	
+	//char theString[512];
+	//sprintf(theString, "/proc/uptime opened\n");
+	//ALERT(at_logged, theString);
+
+	if(fscanf(theFilePointer, "%lf %lf\n", &theUpTime, &theIdleTime) == 2)
+	{
+		//sprintf(theString, "/proc/uptime read %f, %f\n", theUpTime, theIdleTime);
+		//ALERT(at_logged, theString);
+		
+		/* uptime is in seconds... we want milliseconds */
+		theTime = (unsigned int)(theUpTime*1000);
+
+		//sprintf(theString, "AvHSUTimeGetTimeReturning %d\n", theTime);
+		//ALERT(at_logged, theString);
+	}
+	
+	fclose (theFilePointer);
+	#endif
+
+	return theTime;
+}
+
+int AvHSUCalcCombatSpawnWaveSize(int inNumPlayersOnTeam, int inNumDeadPlayers)
+{
+	int theSpawnWaveSize = min(inNumDeadPlayers, BALANCE_IVAR(kCombatMaxPlayersPerWave));
+
+	//// Always spawn players back in a wave when possible
+	//if(theNumPlayersOnTeam > 1)
+	//{
+	//	theSpawnWaveSize = 2 + BALANCE_FVAR(kCombatMaxPercentPlayersPerWave)*theNumPlayersOnTeam;
+	//	theSpawnWaveSize = max(BALANCE_FVAR(kCombatMaxPercentPlayersPerWave)*theNumPlayersOnTeam, 2);
+	//}
+
+	return theSpawnWaveSize;
+}
+
+float AvHSUCalcCombatSpawnTime(AvHClassType inClassType, int inNumPlayersOnTeam, int inNumDeadPlayers, int inPlayersSpentLevel)
+{
+    //const int kMaxSpentLevels = 9;
+
+    //thePlayersSpentLevel = min(thePlayersSpentLevel, kMaxSpentLevels);
+    
+    //float theMinimumWait = theNumPlayersOnTeam*(BALANCE_FVAR(kReinforcementMinimumWaitScalar) + (float)thePlayersSpentLevel*BALANCE_FVAR(kReinforcementMinimumWaitLevelScalar));
+    
+    //const int kMaxTeamSize = 16;
+    //int theCombatRespawnScalar = BALANCE_IVAR(kCombatRespawnScalar);
+    // Don't respawn players that just died, make them wait a bit longer so not everyone comes back together.  Respawn higher level players longer, but scale it to number of players in game.
+    // Target numbers: 
+    //  1v1 should go from 1 to 10 (+kCombatWaveRespawnTime/2) (2.5 - 11.5)
+    //  16v16 should go from 1 to 30 (+kCombatWaveRespawnTime/2) (2.5 - 31.5)
+    // 1v1 : 0 -> 1.125 -> 
+    //float theSpawnTime = (1.0f + (1.0f + (theNumPlayersOnTeam/(float)kMaxTeamSize)*2.0f)*(thePlayersSpentLevel/(float)kMaxSpentLevels))*theCombatRespawnScalar;
+
+    //int theMaxTeamSize = kMaxPlayers/2;
+    //const int kThresholdPlayers = BALANCE_IVAR(kCombatThresholdTeamSize);
+    //int thePlayersToTakeInAccount = max(theNumPlayersOnTeam - kThresholdPlayers, 0);
+    //
+    //// Reduce spawn times for bigger games, but only at team sizes above kThresholdPlayers
+    //float theSpawnTime = BALANCE_IVAR(kCombatBaseRespawnTime) - (thePlayersToTakeInAccount/(float)(theMaxTeamSize - kThresholdPlayers))*BALANCE_IVAR(kCombatThresholdRespawnTime);
+
+	int theWaveSize = AvHSUCalcCombatSpawnWaveSize(inNumPlayersOnTeam, inNumDeadPlayers);
+	float theSpawnTime = BALANCE_IVAR(kCombatBaseRespawnTime) + max((theWaveSize-1), 0)*BALANCE_FVAR(kCombatAdditiveRespawnTime);
+    
+    return theSpawnTime;
+}
+
+//float AvHSUCalculateDamageLessArmor(entvars_t *inVictim, float flDamage, int bitsDamageType, BOOL inIsMultiplayer)
+//{
+//	// if we're alien, if we have the armor upgrade, we take less damage off the top
+//	if(AvHGetIsAlien(inVictim->iuser3))
+//	{
+//		int theArmorUpgradeLevel = AvHGetAlienUpgradeLevel(inVictim->iuser4, MASK_UPGRADE_1);
+//		if((theArmorUpgradeLevel > 0) && ((int)(inVictim->armorvalue) > 0))
+//		{
+//			float thePercentageOffTop = .1f*theArmorUpgradeLevel;
+//			flDamage -= flDamage*thePercentageOffTop; 
+//		}
+//	}
+//
+//	AvHUser3 theUser3 = AvHUser3(inVictim->iuser3);
+//
+//	float flRatio = AvHPlayerUpgrade::GetArmorRatio(theUser3, inVictim->iuser4);
+//	float flBonus = AvHPlayerUpgrade::GetArmorBonus(inVictim->iuser4);
+//
+//	// Level 1 aliens don't take falling damage, ever
+//	if((inVictim->iuser3 == AVH_USER3_ALIEN_PLAYER1) && (bitsDamageType & DMG_FALL))
+//	{
+//		flDamage = 0.0f;
+//	}
+//	
+//	// Armor. 
+//	if (inVictim->armorvalue && !(bitsDamageType & (DMG_FALL | DMG_DROWN)) )// armor doesn't protect against fall or drown damage!
+//	{
+//		float flNew = flDamage*flRatio;
+//		float flArmor = (flDamage - flNew)*flBonus;
+//		
+//		// Does this use more armor than we have?
+//		if (flArmor > inVictim->armorvalue)
+//		{
+//			flArmor = inVictim->armorvalue;
+//			flArmor *= (1/flBonus);
+//			flNew = flDamage - flArmor;
+//			inVictim->armorvalue = 0;
+//		}
+//		else
+//			inVictim->armorvalue -= flArmor;
+//		
+//		flDamage = flNew;
+//	}
+//	
+//	return flDamage;
+//}
+
+char* AvHSUGetGameVersionString()
+{
+    static char theGameVersion[1024];
+
+    string theGameVersionString;
+    
+    theGameVersionString = "v" + MakeStringFromInt(BALANCE_IVAR(kGameVersionMajor)) + "." + MakeStringFromInt(BALANCE_IVAR(kGameVersionMinor));
+    
+    // Add letter on for beta builds
+    //#ifdef AVH_SECURE_PRERELEASE_BUILD
+    //theGameVersionString += " beta 6";
+    //#endif
+
+    //memset(theGameVersion, 0, 1024);
+    strcpy(theGameVersion, theGameVersionString.c_str());
+    
+    return theGameVersion;
+}
+
+bool AvHSUGetIsRelevantForTopDownPlayer(const vec3_t& inTopDownPosition, const vec3_t& inEntityPosition, float inScalar)
+{
+	bool theIsRelevant = false;
+	
+	//if(inEntityPosition.z <= inTopDownPosition.z)
+	//{
+	float theXDist = fabs(inTopDownPosition.x - inEntityPosition.x);
+	float theYDist = fabs(inTopDownPosition.y - inEntityPosition.y);
+	float theXYDistance = sqrt(theXDist*theXDist + theYDist*theYDist);
+	
+	float theCullDistance = GetGameRules()->GetMapExtents().GetTopDownCullDistance()*inScalar;
+	if(theXYDistance <= theCullDistance)
+	{
+		theIsRelevant = true;
+	}
+	//}
+	
+	return theIsRelevant;
+}
+
+Vector AvHSUGetRandomBuildingAngles()
+{
+	int theX = 0;//g_engfuncs.pfnRandomLong(0, 360);
+	int theY = g_engfuncs.pfnRandomLong(0, 360);
+	int theZ = 0;
+	
+	Vector theRandomAngles(theX, theY, theZ);
+
+	return theRandomAngles;
+}
+
+const char* AvHSUGetTeamName(int inTeamNumber)
+{
+	const char* theTeamName = "none";
+
+	const AvHTeam* theTeamPointer = GetGameRules()->GetTeam(AvHTeamNumber(inTeamNumber));
+	if(theTeamPointer)
+	{
+		theTeamName = theTeamPointer->GetTeamName();
+	}
+
+	return theTeamName;
+}
+
+// Steam IDs
+const char* kSteamIDPending = "STEAM_ID_PENDING";
+const char* kSteamIDLocal = "STEAM_ID_LOOPBACK";
+const char* kSteamIDBot = "BOT";
+const char* kSteamIDInvalidID = "-1";
+const char* kSteamIDDefault = "STEAM_0:0:0";
+const char* kSteamIDPrefix = "STEAM_";
+
+#ifndef USE_UPP
+bool AvHSUGetIsValidAuthID(const string& inAuthID)
+{
+	bool theIsValid = true;
+
+	// "0" is WONid that hasn't been entered
+	if((inAuthID == "") || (inAuthID == " ") || (inAuthID == "0") || (inAuthID == kSteamIDDefault) || (inAuthID == kSteamIDInvalidID) || (inAuthID == kSteamIDBot) || (inAuthID == kSteamIDLocal))
+	{
+		theIsValid = false;
+	}
+
+	return theIsValid;
+}
+// Function that is backwards-compatible with WON ids 
+string AvHSUGetPlayerAuthIDString(edict_t* inPlayer)
+{
+	string thePlayerAuthID;
+	
+	// Try to get SteamID
+	const char* theSteamID = g_engfuncs.pfnGetPlayerAuthId(inPlayer);
+	if(strcmp(theSteamID, kSteamIDInvalidID))
+	{
+		thePlayerAuthID = theSteamID;
+	}
+	// If that fails, get WonID and put it into a string
+	else
+	{
+		int theWonID = g_engfuncs.pfnGetPlayerWONId(inPlayer);
+		thePlayerAuthID = MakeStringFromInt(theWonID);
+	}
+	
+	return thePlayerAuthID;
+}
+#endif
+
+void AvHSUKillPlayersTouchingPlayer(AvHPlayer* inPlayer, entvars_t* inInflictor)
+{
+	// If new player is stuck inside another player, kill old player
+	FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+	if((theEntity != inPlayer) && (theEntity->GetIsRelevant()))
+	{
+		float theDistanceToPlayer = VectorDistance(inPlayer->pev->origin, theEntity->pev->origin);
+		if(theDistanceToPlayer < 30)
+		{
+			theEntity->TakeDamage(inInflictor, theEntity->pev, 10000, DMG_GENERIC);
+		}
+	}
+	END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+}
+
+void AvHSUBuildingJustCreated(AvHMessageID inBuildID, CBaseEntity* theBuilding, AvHPlayer* inPlayer)
+{
+	if((inBuildID == BUILD_RESOURCES) || (inBuildID == ALIEN_BUILD_RESOURCES))
+	{
+		// Add it to team for performance reasons (so world doesn't have to be polled during AvHTeam::UpdateResources)
+		AvHTeam* theTeam = GetGameRules()->GetTeam((AvHTeamNumber)theBuilding->pev->team);
+		ASSERT(theTeam);
+		theTeam->AddResourceTower(theBuilding->entindex());
+	}
+
+	// Don't expire weapons the commander drops
+	AvHBasePlayerWeapon* theBaseWeapon = dynamic_cast<AvHBasePlayerWeapon*>(theBuilding);
+	if(theBaseWeapon && (inPlayer->GetUser3() == AVH_USER3_COMMANDER_PLAYER))
+	{
+		theBaseWeapon->SetGroundLifetime(-1);
+	}
+	
+	AvHBuildable* theBuildable = dynamic_cast<AvHBuildable*>(theBuilding);
+	if(theBuildable && inPlayer)
+	{
+		theBuildable->SetBuilder(inPlayer->entindex());
+	}
+	
+	// If it was an alien tech building, look for a hive that doesn't support this tech and make it support it
+	if((inBuildID == ALIEN_BUILD_DEFENSE_CHAMBER) || (inBuildID == ALIEN_BUILD_MOVEMENT_CHAMBER) || (inBuildID == ALIEN_BUILD_SENSORY_CHAMBER))
+	{
+		if(inPlayer)
+		{
+			AvHSUUpdateHiveTechology(inPlayer->GetTeam(), inBuildID);
+		}
+	}
+
+	const char* theClassName = STRING(theBuilding->pev->classname);
+	if(inPlayer && theClassName)
+	{
+		inPlayer->LogPlayerAction("structure_built", theClassName);
+	}
+
+	// Notify player and his teammates
+	if(!GetGameRules()->GetIsCombatMode())
+	{
+		inPlayer->PlayHUDStructureNotification(inBuildID, theBuilding->pev->origin);
+	}
+}
+
+CBaseEntity* AvHSUBuildTechForPlayer(AvHMessageID inBuildID, const Vector& inLocation, AvHPlayer* inPlayer)
+{
+	CBaseEntity* theEntity = NULL;
+
+	if(!GetGameRules()->GetIsCombatMode() || AvHSHUGetIsCombatModeTech(inBuildID))
+	{
+		char* theClassName;
+
+		if(AvHSHUGetBuildTechClassName(inBuildID, theClassName))
+		{
+			// Create without owner to fix solidity problems?
+			//theEntity = CBaseEntity::Create(theClassName, inLocation, theAngles, inPlayer->edict());
+			theEntity = CBaseEntity::Create(theClassName, inLocation, AvHSUGetRandomBuildingAngles());
+			if(theEntity)
+			{
+				// Set team
+				theEntity->pev->team = inPlayer->pev->team;
+
+				// Set any team-wide upgrades
+				AvHTeam* theTeam = inPlayer->GetTeamPointer();
+				ASSERT(theTeam);
+				theEntity->pev->iuser4 |= theTeam->GetTeamWideUpgrades();
+
+				AvHSUBuildingJustCreated(inBuildID, theEntity, inPlayer);
+
+				if(!theEntity->IsInWorld() && GetGameRules()->GetIsCombatMode())
+				{
+					//voogru: okay, if for WHATEVER reason this isnt touched by a player, set it to remove in 2.5 seconds.
+					theEntity->SetThink(&CBaseEntity::SUB_Remove);
+					theEntity->pev->nextthink = gpGlobals->time + 2.5f;
+
+					//voogru: force them to touch it.
+					DispatchTouch(ENT(theEntity->pev), ENT(inPlayer->pev));
+				}
+
+				// Do special stuff for some buildings (special case scan so it doesn't "teleport in")
+				if(inBuildID != BUILD_SCAN)
+				{
+					//voogru: play effect at player origin in combat, cause the item is in the middle of nowhere.
+					Vector vecOrigin = (theEntity->IsInWorld() && !GetGameRules()->GetIsCombatMode()) ? inLocation : inPlayer->pev->origin;
+					PLAYBACK_EVENT_FULL(0, inPlayer->edict(), gPhaseInEventID, 0, vecOrigin, (float *)&g_vecZero, 0.0, 0.0, 0, 0, 0, 0 );
+				}
+			}
+		}
+	}
+	
+	return theEntity;
+}
+
+void AvHSUExplodeEntity(CBaseEntity* inEntity, Materials inMaterial)
+{
+	CBreakable* theDebris = NULL;
+	theDebris = GetClassPtr((CBreakable*)NULL);
+	
+	UTIL_SetOrigin(VARS(theDebris->pev), inEntity->pev->origin);
+	
+	theDebris->pev->model = inEntity->pev->model;
+	
+	theDebris->SetMaterial(inMaterial);
+	
+	theDebris->Spawn();
+	
+	theDebris->Die();
+
+	UTIL_Remove(theDebris);
+}
+
+Vector AvHSUEyeToBodyVector(entvars_t* inEye, CBaseEntity* inTarget)
+{
+	Vector vecMid = inEye->origin + inEye->view_ofs;
+	Vector vecMidEnemy = inTarget->BodyTarget(vecMid);
+	Vector vecDirToEnemy = vecMidEnemy - vecMid;
+	return vecDirToEnemy;
+}
+
+float AvHSUEyeToBodyDistance(entvars_t* inEye, CBaseEntity* inTarget)
+{
+	return AvHSUEyeToBodyVector(inEye, inTarget).Length();
+}
+
+float AvHSUEyeToBodyXYDistance(entvars_t* inEye, CBaseEntity* inTarget)
+{
+	return AvHSUEyeToBodyVector(inEye, inTarget).Length2D();
+}
+
+bool AvHSSUGetIsClassNameFadeable(const char* inClassName)
+{
+	bool theSuccess = false;
+	
+	if(/*FStrEq(inClassName, kesFuncDoor) || FStrEq(inClassName, "func_door_rotating") || FStrEq(inClassName, "momentary_door") ||*/ FStrEq(inClassName, kesSeethrough) || FStrEq(inClassName, kesSeethroughDoor))
+	{
+		theSuccess = true;
+	}
+	
+	return theSuccess;
+}
+
+void AvHSUPlayPhaseInEffect(int inFlags, CBaseEntity* inStartEntity, CBaseEntity* inEndEntity)
+{
+	// Play sound and implosion effect
+	EMIT_SOUND(ENT(inStartEntity->pev), CHAN_AUTO, kPhaseGateTransportSound, .8, ATTN_NORM);
+
+	MESSAGE_BEGIN(MSG_PAS, SVC_TEMPENTITY, inStartEntity->pev->origin);
+		WRITE_BYTE(TE_IMPLOSION);
+		WRITE_COORD(inStartEntity->pev->origin.x);
+		WRITE_COORD(inStartEntity->pev->origin.y);
+		WRITE_COORD(inStartEntity->pev->origin.z + 16);
+		WRITE_BYTE(255);
+		WRITE_BYTE(15);
+		WRITE_BYTE(4);
+	MESSAGE_END();
+
+
+	// Play sound and particles
+	EMIT_SOUND(ENT(inEndEntity->pev), CHAN_AUTO, kPhaseGateTransportSound, .8, ATTN_NORM);
+
+	PLAYBACK_EVENT_FULL(inFlags, inEndEntity->edict(), gTeleportEventID, 0, inEndEntity->pev->origin, inEndEntity->pev->angles, 0.0, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+}
+
+void AvHSUPlayRandomConstructionEffect(AvHPlayer* inPlayer, CBaseEntity* inConstructee)
+{
+	bool theIsMarine = inPlayer->GetIsMarine();
+	float theVolume = .3f*AvHPlayerUpgrade::GetSilenceVolumeLevel(inPlayer->GetUser3(), inPlayer->pev->iuser4);
+	if(!theIsMarine)
+	{
+		gSoundListManager.PlaySoundInList(kAlienConstructionSoundList, inConstructee, CHAN_BODY, theVolume);
+
+		// TODO: Play cool particle puff or something
+	}
+	else
+	{
+		gSoundListManager.PlaySoundInList(kMarineConstructionSoundList, inConstructee, CHAN_BODY, theVolume);
+
+		// Play sparks every other time
+		if(RANDOM_LONG(0, 1) == 1)
+		{
+			// Emit sparks from most of the way up the turret
+			Vector theVector(inConstructee->pev->origin);
+			float theRandomFloat = RANDOM_FLOAT(0.5F, 1.0f);
+			float theHeight = theRandomFloat*(inConstructee->pev->absmax.z - inConstructee->pev->absmin.z);
+			theVector.z += theHeight;
+			UTIL_Sparks(theVector);
+		}
+		
+	}
+}
+
+bool AvHSUPlayerCanBuild(entvars_t* inPev)
+{
+	bool thePlayerCanBuild = false;
+	
+	// If player is a marine or a builder-alien, he can build
+	if((inPev->iuser3 == AVH_USER3_MARINE_PLAYER) || (inPev->iuser3 == AVH_USER3_ALIEN_PLAYER2))
+	{
+		thePlayerCanBuild = true;
+	}
+	
+	return thePlayerCanBuild;
+}
+
+bool AvHSUPlayParticleEvent(const char* inParticleSystemName, const edict_t* inEdict, const Vector& inOrigin, int inEventFlags)
+{
+	bool theSuccess = false;
+
+	// Look up particle system template by name
+	uint32 theTemplateIndex = 0;
+	if(gParticleTemplateList.GetTemplateIndexWithName(inParticleSystemName, theTemplateIndex))
+	{
+		PLAYBACK_EVENT_FULL(inEventFlags, inEdict, gParticleEventID, 0, (float*)&inOrigin, (float*)&g_vecZero, 0.0f, 0.0, theTemplateIndex, 0, 0, 0);
+
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+void AvHSUPlayNumericEvent(float inNumber, const edict_t* inEdict, Vector& inOrigin, int inEventFlags, int inNumericEventType, int inTeamNumber)
+{
+	PLAYBACK_EVENT_FULL(0, inEdict, gNumericalInfoEventID, 0, inOrigin, (float *)&g_vecZero, inNumber, 0.0, inNumericEventType, inTeamNumber, 0, 0);
+}
+
+void AvHSUPlayNumericEventAboveStructure(float inNumber, AvHBaseBuildable* inBuildable, int inNumericEventType)
+{
+    // Generate visual resource event
+    Vector theMinSize;
+    Vector theMaxSize;
+    AvHSHUGetSizeForTech(inBuildable->GetMessageID(), theMinSize, theMaxSize);
+
+    Vector theStartPos = inBuildable->pev->origin;
+    theStartPos.z += theMaxSize.z;
+
+    AvHSUPlayNumericEvent(inNumber, inBuildable->edict(), theStartPos, 0, inNumericEventType, inBuildable->pev->team);
+}
+
+void AvHSURemoveAllEntities(const char* inClassName)
+{
+	FOR_ALL_ENTITIES(inClassName, CBaseEntity*);
+	UTIL_Remove(theEntity);
+	END_FOR_ALL_ENTITIES(inClassName);
+}
+
+// Works for ammo and health only, for use in Combat mode.
+void AvHSUResupplyFriendliesInRange(int inNumEntitiesToCreate, AvHPlayer* inPlayer, int inRange)
+{
+	// Create list of nearby eligible players
+	PlayerListType thePlayerList;
+
+	thePlayerList.push_back(inPlayer);
+
+	if(inRange > 0)
+	{
+		CBaseEntity* theEntity = NULL;
+		while ((theEntity = UTIL_FindEntityInSphere(theEntity, inPlayer->pev->origin, inRange)) != NULL)
+		{
+			const char* theClassName = STRING(theEntity->pev->classname);
+			if(!AvHSUGetIsExternalClassName(theClassName))
+			{
+				AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntity);
+				if(thePlayer && thePlayer->GetIsRelevant() && (thePlayer->GetTeam() == inPlayer->GetTeam()) && (thePlayer != inPlayer))
+				{
+					thePlayerList.push_back(thePlayer);
+				}
+			}
+		}
+	}
+
+	// While there are more to supply
+	while(inNumEntitiesToCreate > 0)
+	{
+		// Pick the most eligible player, giving preference to creating player
+		int theRandomOffset = RANDOM_LONG(0, thePlayerList.size() - 1);
+		AvHPlayer* thePlayer = thePlayerList[theRandomOffset];
+
+		// Give player entity
+		//AvHSUBuildTechForPlayer(inMessageID, thePlayer->pev->origin, inPlayer);
+		BOOL theHelpedPlayer = AvHHealth::GiveHealth(thePlayer);
+
+		if(!theHelpedPlayer)
+		{
+			theHelpedPlayer = AvHGenericAmmo::GiveAmmo(thePlayer);
+		}
+
+		if(theHelpedPlayer)
+		{
+			// Play event for each person helped
+			PLAYBACK_EVENT_FULL(0, thePlayer->edict(), gPhaseInEventID, 0, thePlayer->pev->origin, (float *)&g_vecZero, 0.0, 0.0, 0, 0, 0, 0 );
+		}
+		
+		// Decrement
+		inNumEntitiesToCreate--;
+	}
+}
+
+bool AvHSUGetIsOftRepeatedAlert(AvHAlertType inAlertType)
+{
+    bool theIsOftRepeated = false;
+
+    switch(inAlertType)
+    {
+    case ALERT_UNDER_ATTACK:
+    case ALERT_HIVE_DYING:
+    case ALERT_PLAYER_ENGAGE:
+    case ALERT_SENTRY_FIRING:
+    case ALERT_SENTRY_DAMAGED:
+    case ALERT_ORDER_NEEDED:
+    case ALERT_SOLDIER_NEEDS_AMMO:
+    case ALERT_SOLDIER_NEEDS_HEALTH:
+        theIsOftRepeated = true;
+        break;
+    }
+
+    return theIsOftRepeated;
+}
+
+bool AvHSUGetIsUrgentAlert(AvHAlertType inAlertType)
+{
+	bool theIsUrgent = false;
+	
+	switch(inAlertType)
+	{
+	// Very important and relatively rare
+	case ALERT_HIVE_COMPLETE:
+	case ALERT_NEW_TRAIT:
+	case ALERT_LOW_RESOURCES:
+    case ALERT_UNDER_ATTACK:
+    case ALERT_HIVE_DYING:
+
+	// These must always be played because they don't have any notification on the commander UI
+	case ALERT_RESEARCH_COMPLETE:
+	case ALERT_UPGRADE_COMPLETE:
+		theIsUrgent = true;
+		break;
+	}
+	
+	return theIsUrgent;
+}
+
+// Used to screen for non-NS entities (they can't use RTTI among others)
+bool AvHSUGetIsExternalClassName(const char* inClassName)
+{
+	bool theIsExternal = false;
+	
+	if(inClassName)
+	{
+		char theString[512];
+		sprintf(theString, "Checking entity: %s\n", inClassName);
+		//ALERT(at_logged, theString);
+	}
+	
+	if(inClassName && (!strncmp(inClassName, "adminmod_", 9)))
+	{
+		theIsExternal = true;
+	}
+	
+	return theIsExternal;
+}
+
+bool AvHSUGetIsSubjectToVisibilityRules(CBaseEntity* inEntity)
+{
+	bool theIsSubjectToVis = false;
+
+	//char theErrorString[256];
+	const char* theEntityName = "unknown";
+	if(inEntity && inEntity->pev)
+	{
+		const char* theTentativeEntityName = NULL;
+		theTentativeEntityName = STRING(inEntity->pev->classname);
+		if(theTentativeEntityName)
+		{
+			theEntityName = theTentativeEntityName;
+		}
+	}
+	
+	// Players
+	if(!strcmp(theEntityName, kAvHPlayerClassName))
+	{
+		theIsSubjectToVis = true;
+	}
+	// All buildables
+	else if(GetHasUpgrade(inEntity->pev->iuser4, MASK_BUILDABLE))
+	{
+		theIsSubjectToVis = true;
+	}
+	// Hives
+	else if(!strcmp(theEntityName, kesTeamHive))
+	{
+		theIsSubjectToVis = true;
+	}
+	// Webs
+	else if(!strcmp(theEntityName, kesTeamWebStrand))
+	{
+		theIsSubjectToVis = true;
+	}
+	// Visibility for particle systems
+	else if(!strcmp(theEntityName, kesParticles))
+	{
+		theIsSubjectToVis = true;
+	}
+	else if(!strcmp(theEntityName, kesParticlesCustom))
+	{
+		theIsSubjectToVis = true;
+	}
+	// Func resources
+	else if(!strcmp(theEntityName, kesFuncResource))
+	{
+		theIsSubjectToVis = true;
+	}
+	else if(dynamic_cast<AvHBaseBuildable*>(inEntity))
+	{
+		theIsSubjectToVis = true;
+	}
+	
+	//sprintf(theErrorString, "Entity %s subject to vis: %d.\n", theEntityName, theIsSubjectToVis);
+	//ALERT(at_logged, theErrorString);
+	
+	return theIsSubjectToVis;
+}
+
+int AvHSUGetNumHumansInGame(void)
+{
+	int theCount = 0;
+	
+	for(int theIndex = 1; theIndex <= gpGlobals->maxClients; theIndex++ )
+	{
+		CBaseEntity* thePlayer = UTIL_PlayerByIndex(theIndex);
+		
+		if(thePlayer == NULL)
+			continue;
+		
+		
+		if(FNullEnt( thePlayer->pev ) )
+			continue;
+		
+		
+		if(FStrEq(STRING(thePlayer->pev->netname), "" ))
+			continue;
+		
+		
+        if(FBitSet(thePlayer->pev->flags, FL_FAKECLIENT))
+            continue;
+		
+        theCount++;
+    }
+	
+    return theCount;
+}
+
+AvHHive* AvHSUGetRandomActiveHive(AvHTeamNumber inTeam)
+{
+	AvHHive* theHive = NULL;
+
+	int theNumActiveHives = 0;
+	vector<AvHHive*> theHiveList;
+	
+	FOR_ALL_ENTITIES(kesTeamHive, AvHHive*)
+		if(theEntity->GetIsActive() && (theEntity->GetTeamNumber() == inTeam))
+		{
+			theHiveList.push_back(theEntity);
+		}
+	END_FOR_ALL_ENTITIES(kesTeamHive)
+
+	if(theHiveList.size() > 0)
+	{
+		int theRandomHive = RANDOM_LONG(0, theHiveList.size()-1);
+		theHive = theHiveList[theRandomHive];
+	}
+
+	return theHive;
+}
+
+AvHHive* AvHSUGetRandomActivateableHive(AvHTeamNumber inTeam)
+{
+	AvHHive* theHive = NULL;
+	
+	int theNumActiveHives = 0;
+	vector<AvHHive*> theHiveList;
+	
+	FOR_ALL_ENTITIES(kesTeamHive, AvHHive*)
+		bool theCanBecomeActive = theEntity->CanBecomeActive();
+		if(theCanBecomeActive /*&& (theEntity->GetTeamNumber() == inTeam)*/)
+		{
+			theHiveList.push_back(theEntity);
+		}
+	END_FOR_ALL_ENTITIES(kesTeamHive)
+		
+	if(theHiveList.size() > 0)
+	{
+		int theRandomHive = RANDOM_LONG(0, theHiveList.size()-1);
+		theHive = theHiveList[theRandomHive];
+	}
+		
+	return theHive;
+}
+
+int AvHSUGetWeaponStayTime()
+{
+	int theWeaponStayTime = BALANCE_IVAR(kWeaponStayTime);
+	
+	if(GetGameRules()->GetIsCombatMode())
+	{
+		theWeaponStayTime = BALANCE_IVAR(kCombatWeaponStayTime);
+	}
+	
+	return theWeaponStayTime;
+}
+
+void AvHSUResearchStarted(CBaseEntity* inResearchEntity, AvHMessageID inResearchingTech)
+{
+	if(inResearchingTech == RESEARCH_DISTRESSBEACON)
+	{
+		// Playback event for all, sending time it takes to finish
+		int theDistressBeaconTime = GetGameRules()->GetBuildTimeForMessageID(inResearchingTech);
+
+		// Play sound at center of marine spawn
+		//Vector theSoundOrigin = GetGameRules()->GetSpawnAreaCenter((AvHTeamNumber)inResearchEntity->pev->team);
+
+		PLAYBACK_EVENT_FULL(0, inResearchEntity->edict(), gDistressBeaconEventID, 0, inResearchEntity->pev->origin, (float *)&g_vecZero, 0.0, 0.0, theDistressBeaconTime, 0, 0, 0 );
+
+		// Play special siren
+		//EMIT_SOUND(inResearchEntity->edict(), CHAN_AUTO, kDistressBeaconSound, 1.0f, ATTN_IDLE);
+	}
+}
+
+void AvHSUResearchComplete(CBaseEntity* inResearchEntity, AvHMessageID inResearchingTech)
+{
+	// Watch for various research messages
+	//if(inResearchingTech == RESEARCH_REINFORCEMENTS)
+	//{
+	//	AvHInfantryPortal* thePortal = dynamic_cast<AvHInfantryPortal*>(inResearchEntity);
+	// This should never happen but don't crash right now while I fix the bug for the playtest
+	//ASSERT(thePortal);
+	//if(thePortal)
+	//{
+	//	thePortal->SetReinforcements(thePortal->GetReinforcements() + 1);
+	//}
+	//}
+	
+	if(inResearchingTech == RESOURCE_UPGRADE)
+	{
+		AvHResourceTower* theTower = dynamic_cast<AvHResourceTower*>(inResearchEntity);
+		if(theTower)
+		{
+			theTower->Upgrade();
+		}
+		// This should never happen but don't crash right now while I fix the bug for the playtest
+		//else
+		//{
+		//	ASSERT(false);
+		//}
+	}			
+	else if(inResearchingTech == ARMORY_UPGRADE)
+	{
+		AvHArmory* theArmory = dynamic_cast<AvHArmory*>(inResearchEntity);
+		if(theArmory)
+		{
+			theArmory->Upgrade();
+		}
+	}
+	else if(inResearchingTech == TURRET_FACTORY_UPGRADE)
+	{
+		AvHTurretFactory* theTurretFactory = dynamic_cast<AvHTurretFactory*>(inResearchEntity);
+		if(theTurretFactory)
+		{
+			theTurretFactory->Upgrade();
+		}
+	}
+	else if(inResearchingTech == RESEARCH_DISTRESSBEACON)
+	{
+		// Player distress sound effect?
+		
+		// Immediately respawn all marines at base!
+		FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+			if(theEntity->pev->team == inResearchEntity->pev->team)
+			{
+				bool theSuccess = false;
+
+				AvHPlayMode thePlayMode = theEntity->GetPlayMode();
+
+				// Respawn dead/waiting players
+				if((thePlayMode == PLAYMODE_REINFORCING) || (thePlayMode == PLAYMODE_AWAITINGREINFORCEMENT) || (!theEntity->IsAlive() && (thePlayMode == PLAYMODE_PLAYING)))
+				{
+					theEntity->SetPlayMode(PLAYMODE_PLAYING);
+					theSuccess = true;
+				}
+				// teleport existing players back 
+				else if((thePlayMode == PLAYMODE_PLAYING) && theEntity->GetCanBeAffectedByEnemies())
+				{
+					if ( GetGameRules()->CanPlayerBeacon(theEntity) ) 
+					{
+						edict_t* theSpawnPoint = GetGameRules()->SelectSpawnPoint(theEntity);
+
+						if(theSpawnPoint)
+						{
+							if ( VectorDistance(theSpawnPoint->v.origin, theEntity->pev->origin) > BALANCE_IVAR(kDistressBeaconRange)) 
+							{
+								theEntity->InitPlayerFromSpawn(theSpawnPoint);
+
+								// Reset anything some things
+								theEntity->SetEnsnareState(false);
+								theEntity->SetIsStunned(false);
+								theSuccess = true;
+							}
+						}
+					}
+				}
+
+				if(theSuccess)
+				{
+					// Play special phase effect/sound for player
+					int theFlags = 0;
+					AvHSUPlayPhaseInEffect(theFlags, theEntity, theEntity);
+				}
+			}
+		END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+	}
+	else if(inResearchingTech == RESEARCH_ELECTRICAL)
+	{
+		AvHBaseBuildable* theBuildable = dynamic_cast<AvHBaseBuildable*>(inResearchEntity);
+		if(theBuildable)
+		{
+			// Only allow certain structures to be electrified (fix for exploit timing/selection exploit)
+			AvHMessageID theBuildableMessage = theBuildable->GetMessageID();
+			switch(theBuildableMessage)
+			{
+			case BUILD_RESOURCES:
+			case BUILD_TURRET_FACTORY:
+			case TURRET_FACTORY_UPGRADE:
+				SetUpgradeMask(&theBuildable->pev->iuser4, MASK_UPGRADE_11);
+				break;
+			}
+		}
+	}
+}
+
+bool AvHSUGetIsResearchApplicable(CBaseEntity* inResearchEntity, AvHMessageID inResearchingTech)
+{
+	bool theIsApplicable = false;
+
+	if(inResearchingTech == RESOURCE_UPGRADE)
+	{
+		AvHResourceTower* theTower = dynamic_cast<AvHResourceTower*>(inResearchEntity);
+		if(theTower)
+		{
+			theIsApplicable = true;
+		}
+	}			
+	else if(inResearchingTech == ARMORY_UPGRADE || 
+			inResearchingTech == RESEARCH_GRENADES)
+	{
+		AvHArmory* theArmory = dynamic_cast<AvHArmory*>(inResearchEntity);
+		if(theArmory)
+		{
+			theIsApplicable = true;
+		}
+	}
+	else if(inResearchingTech == TURRET_FACTORY_UPGRADE)
+	{
+		AvHTurretFactory* theTurretFactory = dynamic_cast<AvHTurretFactory*>(inResearchEntity);
+		if(theTurretFactory)
+		{
+			theIsApplicable = true;
+		}
+	}
+	else if(inResearchingTech == RESEARCH_DISTRESSBEACON ||
+			inResearchingTech == RESEARCH_MOTIONTRACK ||
+			inResearchingTech == RESEARCH_PHASETECH 
+		)
+	{
+		AvHObservatory* theObservatory = dynamic_cast<AvHObservatory*>(inResearchEntity);
+		if(theObservatory)
+		{
+			theIsApplicable = true;
+		}
+	}
+	else if(inResearchingTech == RESEARCH_ARMOR_ONE ||
+			inResearchingTech == RESEARCH_ARMOR_TWO ||
+			inResearchingTech == RESEARCH_ARMOR_THREE ||
+			inResearchingTech == RESEARCH_WEAPONS_ONE ||
+			inResearchingTech == RESEARCH_WEAPONS_TWO ||
+			inResearchingTech == RESEARCH_WEAPONS_THREE ||
+			inResearchingTech == RESEARCH_CATALYSTS)
+	{
+		AvHArmsLab* theArmsLab = dynamic_cast<AvHArmsLab*>(inResearchEntity);
+		if(theArmsLab)
+		{
+			theIsApplicable = true;
+		}
+	}
+	else if (inResearchingTech == RESEARCH_HEAVYARMOR ||
+			 inResearchingTech == RESEARCH_JETPACKS)
+	{
+		AvHPrototypeLab* thePrototypeLab = dynamic_cast<AvHPrototypeLab*>(inResearchEntity);
+		if(thePrototypeLab)
+		{
+			theIsApplicable = true;
+		}
+	}
+	else if(inResearchingTech == RESEARCH_ELECTRICAL)
+	{
+		AvHBaseBuildable* theBuildable = dynamic_cast<AvHBaseBuildable*>(inResearchEntity);
+		if(theBuildable)
+		{
+			// Only allow certain structures to be electrified (fix for exploit timing/selection exploit)
+			AvHMessageID theBuildableMessage = theBuildable->GetMessageID();
+			switch(theBuildableMessage)
+			{
+			case BUILD_RESOURCES:
+			case BUILD_TURRET_FACTORY:
+			case TURRET_FACTORY_UPGRADE:
+				theIsApplicable = true;
+				break;
+			}
+		}
+	}
+	return theIsApplicable ;
+}
+
+void AvHSUSetCollisionBoxFromSequence(entvars_t* inPev)
+{
+	ASSERT(inPev);
+	
+	studiohdr_t* theStudioHeader = (studiohdr_t*)GET_MODEL_PTR( ENT(inPev) );
+	if(theStudioHeader == NULL)
+	{
+		ALERT(at_console, "AvHSUSetCollisionBoxFromSequence(): Invalid model\n");
+	}
+	
+	mstudioseqdesc_t* theSeqDesc = (mstudioseqdesc_t *)((byte *)theStudioHeader + theStudioHeader->seqindex);
+	
+	Vector theMin = theSeqDesc[inPev->sequence].bbmin;
+	Vector theMax = theSeqDesc[inPev->sequence].bbmax;
+	
+	UTIL_SetSize(inPev, theMin, theMax);
+}
+
+
+
+////=========================================================================
+//// Returns 0 if the area around obj is safe to build in
+//int CBaseEntity::CheckArea( CBaseEntity *pIgnore )
+//{
+//	TraceResult tr;
+//	Vector vecOrg = pev->origin;
+//	
+//	// Check the origin
+//	int iContents = UTIL_PointContents(vecOrg);
+//	if ( iContents != CONTENT_EMPTY && iContents != CONTENT_WATER ) 
+//		return CAREA_BLOCKED;
+//	
+//	Vector vecIgnoreOrg = pIgnore->pev->origin;
+//	// Get the player's origin irrelevant of crouching
+//	if ( pIgnore->pev->flags & FL_DUCKING )
+//	{
+//		vecIgnoreOrg = vecIgnoreOrg + (VEC_DUCK_HULL_MIN -
+//			VEC_HULL_MIN);
+//	}
+//	// Trace a hull
+//	UTIL_TraceHull( vecIgnoreOrg, pev->origin, ignore_monsters,
+//		large_hull, edict(), &tr );
+//	CBaseEntity *pEntity = CBaseEntity::Instance(tr.pHit);
+//	if (tr.flFraction != 1 || tr.fAllSolid == 1)
+//		return CAREA_BLOCKED;
+//	
+//	// Check for solid entities in the area
+//	CBaseEntity *pEnt = NULL;
+//	while ( (pEnt = UTIL_FindEntityInSphere( pEnt, pev->origin, 48 )) !=
+//		NULL )
+//	{
+//		// If it's not the engineer, and its a solid entity, fail
+//		if (pEnt != pIgnore && pEnt != this && pEnt->pev->solid >
+//			SOLID_TRIGGER)
+//			return CAREA_BLOCKED;
+//	}
+//	
+//	// Cycle through all the Nobuild zones in the map and make sure this
+//	isn't in one of them
+//		CBaseEntity *pNoBuild = UTIL_FindEntityByClassname( NULL,
+//		"func_nobuild" );
+//	while ( pNoBuild )
+//	{
+//		// Check to see if we're building in this zone
+//		if ( vecOrg.x >= pNoBuild->pev->mins.x && vecOrg.y >=
+//			pNoBuild->pev->mins.y && vecOrg.z >= pNoBuild->pev->mins.z && 
+//			vecOrg.x <= pNoBuild->pev->maxs.x &&
+//			vecOrg.y <= pNoBuild->pev->maxs.y && vecOrg.z <= pNoBuild->pev->maxs.z )
+//			return CAREA_NOBUILD;
+//		
+//		pNoBuild = UTIL_FindEntityByClassname( pNoBuild,
+//			"func_nobuild" );
+//	}
+//	
+//	// Check below
+//	UTIL_TraceLine( vecOrg, vecOrg + Vector(0,0,-64),
+//		dont_ignore_monsters, edict(), &tr );
+//	if ( tr.flFraction == 1.0 )
+//		return CAREA_BLOCKED;
+//	
+//	return CAREA_CLEAR;
+//}
+
+CBaseEntity* AvHSUGetEntityFromIndex(int inEntityIndex)
+{
+	CBaseEntity* theEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(inEntityIndex));
+	return theEntity;
+}
+
+
+CGrenade* AvHSUShootServerGrenade(entvars_t* inOwner, Vector inOrigin, Vector inVelocity, float inTime, bool inHandGrenade)
+{
+	CGrenade* theGrenade = CGrenade::ShootExplosiveTimed(inOwner, inOrigin, inVelocity, inTime);
+    ASSERT(theGrenade);
+    
+	theGrenade->pev->team = inOwner->team;
+
+	// Set it as a marine item so it gets damage upgrades
+	theGrenade->pev->iuser3 = AVH_USER3_MARINEITEM;
+	theGrenade->pev->iuser4 = inOwner->iuser4;
+
+    if(inHandGrenade)
+    {
+        theGrenade->pev->classname = MAKE_STRING("handgrenade");
+    }
+
+//	if(!GetGameRules()->GetDrawInvisibleEntities())
+//	{
+//		theGrenade->pev->effects |= EF_NODRAW;
+//	}
+
+	return theGrenade;
+}
+
+void AvHSUKnockPlayerAbout(CBaseEntity* inAttcker, CBaseEntity* inVictim, int inForce)
+{
+	if(inAttcker && inVictim->IsPlayer())
+	{
+		AvHPlayer* theVictim = dynamic_cast<AvHPlayer*>(inVictim);
+
+		//Dont _ever_ knock around teammates
+		if(inAttcker->pev->team != inVictim->pev->team && theVictim && theVictim->GetCanBeAffectedByEnemies())
+		{
+			Vector VecDir;
+			VecDir = inVictim->pev->origin - inAttcker->pev->origin;
+			VecDir = VecDir.Normalize();
+
+			if(theVictim->GetIsMarine() && theVictim->GetHasHeavyArmor())
+				inForce = inForce * 0.50; 
+
+			//If they are in the air they have another 50% less knockback (to prevent them from becoming superplayer
+			if(!(theVictim->pev->flags & FL_ONGROUND) || !theVictim->pev->groundentity)
+			{
+				inForce = inForce * 0.50;
+			}
+			// Reduce knockback to 1/3 if user is ducked and on the ground
+			else if ((theVictim->pev->bInDuck) || (theVictim->pev->flags & FL_DUCKING))
+			{
+				inForce = inForce * 0.33;
+			}
+
+			inVictim->pev->punchangle.z = -18;
+			inVictim->pev->punchangle.x = 5;
+			inVictim->pev->velocity = VecDir * max(0, 120 - VecDir.Length() ) * inForce/75;
+		}
+	}
+
+	/*AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inEntity);
+	if(thePlayer && thePlayer->GetCanBeAffectedByEnemies())
+	{
+	inEntity->pev->punchangle.z = -18;
+	inEntity->pev->punchangle.x = 5;
+	if(!(inEntity->pev->flags & FL_ONGROUND) || !inEntity->pev->groundentity) // if the player is in midair, don't use full force
+	{
+	inEntity->pev->velocity = inEntity->pev->velocity - gpGlobals->v_right*(inForce/10);
+	}
+	else
+	{
+	inEntity->pev->velocity = inEntity->pev->velocity - gpGlobals->v_right*inForce;
+	}
+	}
+	}*/
+}
+
+void AvHGetLineBounds(const Vector& vecStart, const Vector& vecEnd, Vector& outMins, Vector& outMaxs)
+{
+    
+    outMins = vecStart;
+    outMaxs = vecStart;
+    
+    for (int i = 0; i < 3; ++i)
+    {
+        
+        if (vecStart[i] < outMins[i])
+        {
+            outMins[i] = vecStart[i];
+        }
+        
+        if (vecStart[i] > outMaxs[i])
+        {
+            outMaxs[i] = vecStart[i];
+        }
+
+        if (vecEnd[i] < outMins[i])
+        {
+            outMins[i] = vecEnd[i];
+        }
+
+        if (vecEnd[i] > outMaxs[i])
+        {
+            outMaxs[i] = vecEnd[i];
+        }
+
+    }
+
+    // Increase the box by a bit since most structure hulls are not very
+    // accurately sized.
+
+    const float kBoundingBoxPadding = 100; 
+
+    outMins[0] -= kBoundingBoxPadding;
+    outMins[1] -= kBoundingBoxPadding;
+    outMins[2] -= kBoundingBoxPadding;
+
+    outMaxs[0] += kBoundingBoxPadding;
+    outMaxs[1] += kBoundingBoxPadding;
+    outMins[2] += kBoundingBoxPadding;
+
+}
+
+/**
+ * Drop in replacement for UTIL_TraceLine which works properly for
+ */
+void AvHTraceLine(const Vector& vecStart, const Vector& vecEnd, IGNORE_MONSTERS igmon, edict_t *pentIgnore, TraceResult *ptr)
+{
+
+    // Trace against the world.
+
+    UTIL_TraceLine(vecStart, vecEnd, dont_ignore_monsters, pentIgnore, ptr);
+
+    // Trace against the players/structures.
+
+    if (igmon != ignore_monsters)
+    {
+
+        vec3_t theRayOrigin;
+        vec3_t theRayDirection;
+
+        VectorCopy(vecStart, theRayOrigin);
+        VectorSubtract(vecEnd, vecStart, theRayDirection);
+
+        vec3_t theLineMins;
+        vec3_t theLineMaxs;
+
+        AvHGetLineBounds(vecStart, vecEnd, theLineMins, theLineMaxs);
+    
+        // Get the bounding box for the line.
+
+        const int kMaxNumEntities = 128;
+        CBaseEntity* pList[kMaxNumEntities];
+
+        int theNumEntities = UTIL_EntitiesInBox(pList, kMaxNumEntities, theLineMins, theLineMaxs, (FL_CLIENT | FL_MONSTER));
+    
+        for (int i = 0; i < theNumEntities; ++i)
+        {
+
+            edict_t* theEdict = pList[i]->edict();
+
+            if (theEdict != pentIgnore)
+            {
+
+                float t = NS_TraceLineAgainstEntity(pList[i]->entindex(), gpGlobals->time, theRayOrigin, theRayDirection);        
+
+                if (t != AVH_INFINITY && t < ptr->flFraction)
+                {
+                    ptr->flFraction = t;
+                    ptr->pHit       = theEdict;
+                    ptr->iHitgroup  = 0; // NS doesn't use hit groups.
+                }
+
+            }
+
+        }
+    
+        // Compute the end position.
+
+        if (ptr->flFraction != 1.0)
+        {
+            VectorMA(theRayOrigin, ptr->flFraction, theRayDirection, ptr->vecEndPos);
+        }
+    
+    }
+
+}
+
+
+void AvHSUServerTraceBullets(const Vector& inStart, const Vector& inEnd, IGNORE_MONSTERS inIgnoreMonsters, edict_t* inIgnoreEdict, TraceResult& outTraceResult, bool& outProtected)
+{
+	outProtected = false;
+
+    // This is the old way that doesn't take into account skulk rotation.
+    UTIL_TraceLine(inStart, inEnd, inIgnoreMonsters, /*dont_ignore_glass,*/ inIgnoreEdict, &outTraceResult);
+    
+    // TEMP removed the skulk hitboxes since it's too risky for the LAN.
+	// joev:  0000573
+	// this was commented out meaning that it was just stock tracelines, not using Max M's superb hitbox collision code.
+	// Now *all* hitboxes perform as expected and the crouched fade can be shot pretty much anywhere on the model
+	// (allowing for about a 5% visual disparity) 
+    //AvHTraceLine(inStart, inEnd, inIgnoreMonsters, /*dont_ignore_glass,*/ inIgnoreEdict, &outTraceResult);
+	// :joev
+	CBaseEntity* theEntityHit = CBaseEntity::Instance(outTraceResult.pHit);
+	
+	// If we hit an entity that's hidden in the umbra, return that we didn't hit anything
+	if(theEntityHit)
+	{
+		if(GetHasUpgrade(theEntityHit->pev->iuser4, MASK_UMBRA))
+		{
+			const int theUmbraEffectiveness = BALANCE_IVAR(kUmbraEffectiveness);
+			
+			// Block most shots but not all
+			if(RANDOM_LONG(0, theUmbraEffectiveness) != 0)
+			{
+				outProtected = true;
+			}
+		}
+		else
+		{
+			// Check if bullets pass through an umbra cloud before hitting target
+			// If so, don't hit the target
+		}
+	}
+}
+
+void AvHSUUpdateHiveTechology(AvHTeamNumber inTeamNumber, AvHMessageID inBuildID)
+{
+	AvHHive* theHive = NULL;
+	bool theTechnologyAlreadySupported = false;
+	
+	FOR_ALL_ENTITIES(kesTeamHive, AvHHive*)
+		if(theEntity && theEntity->GetIsActive() && (theEntity->pev->team == (int)inTeamNumber))
+		{
+			AvHMessageID theTechnology = theEntity->GetTechnology();
+			if(theTechnology == inBuildID)
+			{
+				theTechnologyAlreadySupported = true;
+				break;
+			}
+			else if(theTechnology == MESSAGE_NULL)
+			{
+				if(!theHive)
+				{
+					theHive = theEntity;
+				}
+			}
+		}
+		END_FOR_ALL_ENTITIES(kesTeamHive);
+		
+		if(!theTechnologyAlreadySupported && theHive)
+		{
+			theHive->SetTechnology(inBuildID);
+		}
+}
+
+bool gIsDebugging = false;
+
+bool AvHSUGetIsDebugging()
+{
+	return gIsDebugging;
+}
+
+void AvHSUSetIsDebugging(bool inState)
+{
+	gIsDebugging = inState;
+}
+
+void AvHSUAddDebugPoint(float inX, float inY, float inZ)
+{
+	CBaseEntity* theBaseEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(1));
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theBaseEntity);
+	if(thePlayer)
+	{
+		thePlayer->AddDebugEnemyBlip(inX, inY, inZ);
+	}
+}
+
+AvHUser3 AvHSUGetGroupTypeFromSelection(const EntityListType& inEntityListType)
+{
+	// By default, it's a generic marine
+	AvHUser3 theUnifiedUser3 = AVH_USER3_NONE;
+
+	// Loop through all the entities
+	bool theFirstTime = true;
+	bool theSuccess = false;
+
+	for(EntityListType::const_iterator theIter = inEntityListType.begin(); theIter != inEntityListType.end(); theIter++, theSuccess)
+	{
+		theSuccess = true;
+
+		CBaseEntity* theBaseEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(*theIter));
+		if(theBaseEntity)
+		{
+			// If all the user3s are the same, then use that
+			AvHUser3 theCurrentUser3 = (AvHUser3)(theBaseEntity->pev->iuser3);
+			if(theFirstTime || (theCurrentUser3 == theUnifiedUser3))
+			{
+				theUnifiedUser3 = theCurrentUser3;
+				theFirstTime = false;
+			}
+			else
+			{
+				theSuccess = false;
+			}
+		}
+		else
+		{
+			theSuccess = false;
+		}
+	}
+
+	if(!theSuccess)
+	{
+		theUnifiedUser3 = AVH_USER3_MARINE_PLAYER;
+	}
+
+	return theUnifiedUser3;
+}
+
+void AvHSURemoveEntityFromHotgroupsAndSelection(int inEntityIndex)
+{
+	CBaseEntity* theBaseEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(inEntityIndex));
+	if(theBaseEntity)
+	{
+		// Get team
+		AvHTeam* theTeam = GetGameRules()->GetTeam((AvHTeamNumber)theBaseEntity->pev->team);
+		if(theTeam)
+		{
+			// Remove entity from any hotgroups on team
+			for(int i=0; i < kNumHotkeyGroups; i++)
+			{
+				EntityListType theHotGroup = theTeam->GetGroup(i);
+			
+				EntityListType::iterator theIter = std::find(theHotGroup.begin(), theHotGroup.end(), inEntityIndex);
+				if(theIter != theHotGroup.end())
+				{
+					// Remove it and update it
+					theHotGroup.erase(theIter);
+			
+					theTeam->SetGroup(i, theHotGroup);
+				}
+			}
+
+			// Now get commander and remove entity from their selection
+			AvHPlayer* theCommander = theTeam->GetCommanderPlayer();
+			if(theCommander)
+			{
+				theCommander->RemoveSelection(inEntityIndex);
+			}
+		}
+	}
+}
+
+string AvHSUGetLocationText(CBaseEntity* inEntity)
+{
+	// Add in location name to chat message
+	string theLocationString(" ");
+	
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inEntity);
+	if(thePlayer && thePlayer->GetIsRelevant())
+	{
+		string theLocationName;
+		if(AvHSHUGetNameOfLocation(GetGameRules()->GetInfoLocations(), inEntity->pev->origin, theLocationName))
+		{
+			theLocationString = theLocationName;
+		}
+	}
+	
+	return theLocationString;
+}
+
+void AvHSUCreateUmbraCloud(vec3_t inOrigin, AvHTeamNumber inTeamNumber, CBaseEntity* inCreatingEntity)
+{
+	// Fire umbra cloud event
+	PLAYBACK_EVENT_FULL(0, inCreatingEntity->edict(), gUmbraCloudEventID, 0, inOrigin, (float *)&g_vecZero, 1.0f, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+	
+	// Create the umbra cloud that will provide gameplay effects
+	AvHUmbraCloud* theUmbra = GetClassPtr((AvHUmbraCloud*)NULL );
+	theUmbra->Spawn();
+	
+	VectorCopy(inOrigin, theUmbra->pev->origin);
+	
+	// Set team and owner
+	theUmbra->pev->owner = inCreatingEntity->pev->owner;
+	theUmbra->pev->team = inTeamNumber;
+}
+
+// Explode with force (players only)
+void AvHSUExplosiveForce(const Vector& inOrigin, int inRadius, float inForceScalar, const CBaseEntity* inAttacker, const CBaseEntity* inIgnorePlayer)
+{
+	// ALERT(at_console, UTIL_VarArgs("Enter AvHSUExplosiveForce - inOrigin x %f y %f z %f, inRadius %i, inForceScalar %f\n", inOrigin[0], inOrigin[1], inOrigin[2], inRadius, inForceScalar));
+
+	CBaseEntity* theEntity = NULL;
+	while ((theEntity = UTIL_FindEntityInSphere(theEntity, inOrigin, inRadius)) != NULL)
+	{
+		const char* theClassName = STRING(theEntity->pev->classname);
+		if(!AvHSUGetIsExternalClassName(theClassName))
+		{
+			AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntity);
+			float theScalar = 1.0f;
+			if(thePlayer 
+				&& thePlayer->GetCanBeAffectedByEnemies() 
+				&& GetGameRules()->CanEntityDoDamageTo(inAttacker, thePlayer, &theScalar) 
+				&& (thePlayer != inIgnorePlayer)
+				&& thePlayer->pev->team != inAttacker->pev->team)
+			{
+				// Apply outward force to player
+				Vector theForceVector;
+				VectorSubtract(thePlayer->pev->origin, inOrigin, theForceVector);
+				
+				float theForceScalar = inForceScalar;
+				float theDistanceToExplosion = theForceVector.Length();
+				theDistanceToExplosion = min(max(theDistanceToExplosion, 0), inRadius);
+				
+				float thePercentForce = (1.0f - (theDistanceToExplosion/(float)inRadius));
+				theForceScalar *= thePercentForce;
+				
+				// ALERT(at_console, UTIL_VarArgs("Xeno - distance: theDistanceToExplosion %f, inRadius %d\n", theDistanceToExplosion, inRadius));
+
+				theForceVector.Normalize();
+				// ALERT(at_console, UTIL_VarArgs("Xeno - FORCEVECTOR x: %f, y: %f, z: %f\n", theForceVector[0], theForceVector[1], theForceVector[2]));
+			
+				// tankefugl: 0000771
+				if((!(thePlayer->pev->flags & FL_ONGROUND) || !thePlayer->pev->groundentity) || 
+					((thePlayer->pev->bInDuck) || (thePlayer->pev->flags & FL_DUCKING)))
+				{
+					// ALERT(at_console, "Xeno - target ducked or flying\n");
+					theForceScalar *= 0.33f; 
+				}
+
+				Vector thePreVelocity = thePlayer->pev->velocity;
+				// ALERT(at_console, UTIL_VarArgs("Xeno - ORIGINAL x: %f, y: %f, z: %f\n", thePlayer->pev->velocity[0], thePlayer->pev->velocity[1], thePlayer->pev->velocity[2]));
+				float theDamageForce = thePlayer->DamageForce(theForceScalar);
+				//Vector thePostVelocity = (thePlayer->pev->velocity + theForceVector *( thePlayer->DamageForce(theForceScalar) ));
+				Vector thePostVelocity = (thePlayer->pev->velocity + theForceVector *( theDamageForce ));
+
+				// ALERT(at_console, UTIL_VarArgs("Xeno - theDamageForce: %f, thePostVelocity x: %f, y: %f, z: %f\n", theDamageForce, thePostVelocity[0], thePostVelocity[1], thePostVelocity[2]));
+
+				// check and cap horisontal speed
+				float theMaxHorisontalSpeed = BALANCE_FVAR(kExplodeMaxHorisontalSpeed);
+				Vector theHorisontalSpeed;
+				theHorisontalSpeed[0] = thePostVelocity[0];
+				theHorisontalSpeed[1] = thePostVelocity[1];
+				theHorisontalSpeed[2] = 0;
+				float theHorisontalSpeedLength = theHorisontalSpeed.Length();
+				float theHorisontalFactor = theMaxHorisontalSpeed / theHorisontalSpeedLength;
+				if (theHorisontalSpeedLength > theMaxHorisontalSpeed) {
+					thePostVelocity[0] *= theHorisontalFactor;
+					thePostVelocity[1] *= theHorisontalFactor;
+				//	ALERT(at_console, UTIL_VarArgs("Xeno - theHorisontalFactor: %f, thePostVelocity x: %f, y: %f, z: %f\n", theHorisontalFactor, thePostVelocity[0], thePostVelocity[1], thePostVelocity[2]));
+				//	ALERT(at_console, UTIL_VarArgs("Xeno - theHorisontalSpeedLength: %f, theMaxHorisontalSpeed: %f\n", theHorisontalSpeedLength, theMaxHorisontalSpeed));
+				}
+
+				// then vertical speed
+				float theMaxVerticalSpeed = BALANCE_FVAR(kExplodeMaxVerticalSpeed);
+				//if (fabs(thePostVelocity[2]) > fabs(thePreVelocity[2]) + theMaxVerticalSpeed)
+				if (fabs(thePostVelocity[2]) > theMaxVerticalSpeed)
+				{
+					thePostVelocity[2] = thePostVelocity[2]/fabs(thePostVelocity[2]) * theMaxVerticalSpeed;
+					//thePostVelocity[2] += thePostVelocity[2]/fabs(thePostVelocity[2]) * theMaxVerticalSpeed;
+				}
+
+				// assign new speed
+				thePlayer->pev->velocity = thePostVelocity;
+				// ALERT(at_console, UTIL_VarArgs("Xeno - velocity x: %f, y: %f, z: %f\n", thePlayer->pev->velocity[0], thePlayer->pev->velocity[1], thePlayer->pev->velocity[2]));
+				//thePlayer->pev->velocity = (thePlayer->pev->velocity + theForceVector *( thePlayer->DamageForce(theForceScalar) ));
+
+				// tankefugl
+			}
+		}
+	}
+}
+
+int AvHSUGetValveHull(int inHull)
+{
+	// Convert "our" hull into VALVe hull
+	int theHull = inHull;
+	switch(inHull)
+	{
+	case 0:
+		theHull = 1;
+		break;
+	case 1:
+		theHull = 3;
+		break;
+	case 2:
+		theHull = 0;
+		break;
+	case 3:
+		theHull = 2;
+		break;
+	default:
+		ASSERT(false);
+		break;
+	}
+
+	return theHull;
+}
+
+bool AvHSUGetIsEnoughRoomForHull(const vec3_t& inCenter, int inHull, edict_t* inIgnoreEntity, bool inIgnorePlayers, bool inIgnoreEntities)
+{
+	ASSERT(inHull >= 0);
+	ASSERT(inHull <= 3);
+
+	// Check hull against the world
+	if(pmove && (pmove->numphysent > 0))
+	{
+        
+        model_s* theWorldModel = pmove->physents[0].model;
+		
+        // Convert "our" hull into VALVe hull.
+
+		int theHull = AvHSUGetValveHull(inHull);
+        const hull_t* theHullPtr = theWorldModel->hulls + theHull;
+
+		int thePointContents = NS_PointContents(theHullPtr, theHullPtr->firstclipnode, (float*)&inCenter);
+		if(thePointContents == CONTENTS_SOLID)
+		{
+    		return false;
+		}
+
+        // This seems like a good idea, but it causes problems outside engine hive on ns_bast.
+        /*
+        for (int i = 0; i < theWorldModel->numsubmodels; ++i)
+        {
+            
+            dmodel_t* model = &theWorldModel->submodels[i];
+
+            if (model->numfaces > 0)
+            {
+
+                int firstClipNode = model->headnode[theHull];
+
+                if (firstClipNode <= theHullPtr->lastclipnode)
+                {
+                    if (NS_PointContents(theHullPtr, firstClipNode, (float*)&inCenter) == CONTENTS_SOLID)
+		            {
+			            return false;
+                    }
+		        }
+
+            }
+            
+        }
+        */
+	
+    }
+
+    if (!inIgnoreEntities)
+    {
+
+	    // If that succeeds, check hull size against entities (above check doesn't take ents into account)
+	    
+	    // Use input hull to get min and max vectors
+	    vec3_t theMin;
+	    vec3_t theMax;
+	    
+	    // Scale it down just a tad so we can morph on ramps.  The shared movement code should get us unstuck in these minor cases
+	    float kScalar = 1;//.85f;
+	    
+	    switch(inHull)
+	    {
+	    case 0:
+		    theMin = HULL0_MIN*kScalar;
+		    theMax = HULL0_MAX*kScalar;
+		    break;
+	    case 1:
+		    theMin = HULL1_MIN*kScalar;
+		    theMax = HULL1_MAX*kScalar;
+		    break;
+	    case 2:
+		    theMin = HULL2_MIN*kScalar;
+		    theMax = HULL2_MAX*kScalar;
+		    break;
+	    case 3:
+		    theMin = HULL3_MIN*kScalar;
+		    theMax = HULL3_MAX*kScalar;
+		    break;
+	    }
+	    
+	    return AvHSHUGetIsAreaFree(inCenter, theMin, theMax, inIgnoreEntity, inIgnorePlayers);
+    
+    }
+
+    return true;
+
+}
+
+void AvHSUPrintDevMessage(const string& inMessage, bool inForce)
+{
+	FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+
+	bool theSendMessage = false;
+
+	#ifdef DEBUG
+	theSendMessage = true;
+	#endif
+
+	if(inForce)
+	{
+		theSendMessage = true;
+	}
+
+    AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(theEntity->edict()));
+    if(thePlayer)
+    {
+        int theAuthMask = thePlayer->GetAuthenticationMask();
+        if(theAuthMask & PLAYERAUTH_DEVELOPER)
+        {
+            theSendMessage = true;
+        }
+
+	}
+
+	if(theSendMessage)
+	{
+		ClientPrint(theEntity->pev, HUD_PRINTNOTIFY, inMessage.c_str());
+	}
+
+	END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+
+	//UTIL_LogPrintf(inMessage.c_str());
+}
+
+bool AvHCheckLineOfSight(const Vector& vecStart, const Vector& vecEnd, edict_t* pentIgnore, IGNORE_MONSTERS igmon, edict_t* pEntTarget)
+{
+
+    TraceResult tr;
+    UTIL_TraceLine(vecStart, vecEnd, igmon, ignore_glass, pentIgnore, &tr);
+
+    edict_t* theLastHit = NULL;
+    
+    while ( 1 )
+    {
+
+        bool theSeeThrough = false;
+        
+        if (tr.flFraction < 1 && tr.pHit != NULL)
+        {
+            if (tr.pHit->v.rendermode != kRenderNormal)
+            {
+                theSeeThrough = true;
+            }
+            else if ( AvHSSUGetIsClassNameFadeable(STRING(tr.pHit->v.classname)) && (int)tr.pHit->v.fuser2 != 255 )
+            {
+                theSeeThrough = true;
+            }
+        }
+            
+        if (!theSeeThrough)
+        {
+            break;
+        }
+
+        edict_t* temp = tr.pHit;
+        UTIL_TraceLine(tr.vecEndPos, vecEnd, igmon, ignore_glass, tr.pHit, &tr);
+            
+        // To avoid an infinite loop if multiple entities are overlapping.
+
+        if (theLastHit == tr.pHit)
+        {
+            break;
+        }
+
+        theLastHit = temp;
+
+    }
+
+    if (pEntTarget != NULL)
+    {
+    
+        const char* s = STRING(tr.pHit->v.classname);
+        return tr.flFraction < 1 && tr.pHit == pEntTarget;
+    }
+    else
+    {
+        return tr.flFraction == 1;
+    }
+
+}
diff --git a/main/source/mod/AvHServerUtil.h b/main/source/mod/AvHServerUtil.h
new file mode 100644
index 00000000..5c7cbc14
--- /dev/null
+++ b/main/source/mod/AvHServerUtil.h
@@ -0,0 +1,310 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHServerUtil.h $
+// $Date: 2002/11/22 21:25:46 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHServerUtil.h,v $
+// Revision 1.31  2002/11/22 21:25:46  Flayra
+// - Adminmod fixes
+//
+// Revision 1.30  2002/11/15 04:42:13  Flayra
+// - Moved utility function into here from client.cpp
+//
+// Revision 1.29  2002/11/12 22:39:25  Flayra
+// - Logging changes for Psychostats compatibility
+//
+// Revision 1.28  2002/11/12 02:28:53  Flayra
+// - Don't reset adminmod_ entities
+//
+// Revision 1.27  2002/10/24 21:42:12  Flayra
+// - Utility function for telefragging
+// - Hive technology fixes
+//
+// Revision 1.26  2002/10/20 21:11:34  Flayra
+// - Optimizations
+//
+// Revision 1.25  2002/10/19 20:19:26  Flayra
+// - Debugging info for linux
+//
+// Revision 1.24  2002/10/16 01:06:33  Flayra
+// - Added generic particle event
+// - Visibility tweak: enemies aren't "detected" unless they're moving.  This means the commander can only see nearby moving blips, and marines with motion-tracking won't see still aliens that are detected because they're nearby.  This also means webs won't show up when nearby.
+// - Distress beacon event
+//
+// Revision 1.23  2002/10/03 19:06:50  Flayra
+// - Profiling info for Linux build
+//
+// Revision 1.22  2002/07/25 16:58:00  flayra
+// - Linux changes
+//
+// Revision 1.21  2002/07/24 19:44:05  Flayra
+// - Linux issues
+//
+// Revision 1.20  2002/07/23 17:24:27  Flayra
+// - Added random building angles for diversity, added research started hooks for distress beacon effects, added versatile alien tech tree, hives are always visible, observatories detect nearby aliens, umbra blocks most but not all bullets
+//
+// Revision 1.19  2002/07/08 17:16:43  Flayra
+// - Tried to cut down on sound list spam by defaulting to CHAN_BODY, added debugging code for tracking down solidity issues
+//
+// Revision 1.18  2002/07/01 21:44:58  Flayra
+// - Added primal scream and umbra support
+//
+// Revision 1.17  2002/06/25 18:16:57  Flayra
+// - Quieted construction effects (normalized now), temporarily removed sensory chamber sight, added upgrading of armory, wrapped bullet tracing for umbra
+//
+// Revision 1.16  2002/06/03 16:57:44  Flayra
+// - Toned down carapace and marine upgrades, removed redundant hive class name, all buildables are subject to visibility rules
+//
+// Revision 1.15  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_SERVERUTIL_H
+#define AVH_SERVERUTIL_H
+
+#include "util/nowarnings.h"
+#include "dlls/extdll.h"
+#include "dlls/weapons.h"
+#include "mod/AvHMessage.h"
+#include "util.h"
+#include "mod/AvHEntities.h"
+#include "mod/AvHHive.h"
+#include "util/STLUtil.h"
+
+class AvHPlayer;
+
+unsigned int AvHSUTimeGetTime();
+void AvHSUPrintDevMessage(const string& inMessage, bool inForce = false);
+
+// Pass a string
+#ifdef PROFILE_BUILD
+const int kMaxNestLevel = 256;
+static int kIndentLevel = 0;
+static unsigned long kProfileStartTime[kMaxNestLevel];
+#endif
+
+#ifdef PROFILE_BUILD
+#define PROFILE_START() \
+//	kProfileStartTime[kIndentLevel++] = AvHSUTimeGetTime(); \
+//    ASSERT(kIndentLevel > 0); \
+//    ASSERT(kIndentLevel < kMaxNestLevel);
+#else
+#define PROFILE_START()
+#endif
+
+#ifdef PROFILE_BUILD
+//#define PROFILE_END(theNonStringProfileName) \
+//{ \
+//    ASSERT(kIndentLevel > 0); \
+//    ASSERT(kIndentLevel <= kMaxNestLevel); \
+//    int theTime = AvHSUTimeGetTime() - kProfileStartTime[--kIndentLevel]; \
+//    if(theTime > 0) \
+//    { \
+//        char theIndentLevel[kMaxNestLevel+1]; \
+//        memset(theIndentLevel, '\t', kMaxNestLevel); \
+//        theIndentLevel[kIndentLevel + 1] = '\0'; \
+//        char theMessage[kMaxNestLevel + 256]; \
+//	    sprintf(theMessage, "%s Profile result (%s): %d (ms)\n", theIndentLevel, #theNonStringProfileName, theTime); \
+//	    ALERT(at_logged, "%s", theMessage); \
+//    } \
+//}
+#else
+#define PROFILE_END(s)
+#endif
+
+#ifdef PROFILE_BUILD
+extern int kProfileRunConfig;
+#define GET_RUN_CODE(s) (s & kProfileRunConfig)
+#else
+#define GET_RUN_CODE(s) true
+#endif
+
+Vector AvHSUGetRandomBuildingAngles();
+char* AvHSUGetGameVersionString();
+bool AvHSUGetIsRelevantForTopDownPlayer(const vec3_t& inTopDownPosition, const vec3_t& inEntityPosition, float inScalar = 1.0f);
+const char* AvHSUGetTeamName(int inTeamNumber);
+#ifndef USE_UPP
+bool AvHSUGetIsValidAuthID(const string& inAuthID);
+string AvHSUGetPlayerAuthIDString(edict_t* inPlayer);
+#endif
+void AvHSUKillPlayersTouchingPlayer(AvHPlayer* inPlayer, entvars_t* inInflictor);
+void AvHSUKillBuildablesTouchingPlayer(AvHPlayer* inPlayer, entvars_t* inInflictor);
+void AvHSUBuildingJustCreated(AvHMessageID inBuildID, CBaseEntity* theBuilding, AvHPlayer* inPlayer);
+
+CBaseEntity* AvHSUBuildTechForPlayer(AvHMessageID inBuildID, const Vector& inLocation, AvHPlayer* inPlayer);
+
+// Takes armor into account
+//float AvHSUCalculateDamageLessArmor(entvars_t *inVictim, float flDamage, int bitsDamageType, BOOL inIsMultiplayer);
+int AvHSUCalcCombatSpawnWaveSize(int inNumPlayersOnTeam, int inNumDeadPlayers);
+float AvHSUCalcCombatSpawnTime(AvHClassType inClassType, int inNumPlayersOnTeam, int inNumDeadPlayersOnTeam, int thePlayersSpentLevel);
+void AvHSUExplodeEntity(CBaseEntity* inEntity, Materials inMaterial);
+
+Vector AvHSUEyeToBodyVector(entvars_t* inEye, CBaseEntity* inTarget);
+float AvHSUEyeToBodyDistance(entvars_t* inEye, CBaseEntity* inTarget);
+float AvHSUEyeToBodyXYDistance(entvars_t* inEye, CBaseEntity* inTarget);
+
+bool AvHSSUGetIsClassNameFadeable(const char* inClassName);
+
+void AvHSUPlayPhaseInEffect(int inFlags, CBaseEntity* inStartEntity, CBaseEntity* inEndEntity);
+void AvHSUPlayRandomConstructionEffect(AvHPlayer* inPlayer, CBaseEntity* inConstructee);
+bool AvHSUPlayerCanBuild(entvars_t* inPev);
+bool AvHSUPlayParticleEvent(const char* inParticleSystemName, const edict_t* inEdict, const Vector& inOrigin, int inEventFlags = 0);
+void AvHSUPlayNumericEvent(float inNumber, const edict_t* inEdict, Vector& inOrigin, int inEventFlags, int inNumericEventType, int inTeamNumber);
+void AvHSUPlayNumericEventAboveStructure(float inNumber, AvHBaseBuildable* inBuildable, int inNumericEventType = kNumericalInfoResourcesEvent);
+
+void AvHSURemoveAllEntities(const char* inClassName);
+void AvHSUResupplyFriendliesInRange(int inNumEntitiesToCreate, AvHPlayer* inPlayer, int inRange = -1);
+bool AvHSUGetIsOftRepeatedAlert(AvHAlertType inAlertType);
+bool AvHSUGetIsUrgentAlert(AvHAlertType inAlertType);
+bool AvHSUGetIsExternalClassName(const char* inClassName);
+bool AvHSUGetIsSubjectToVisibilityRules(CBaseEntity* inEntity);
+
+int AvHSUGetNumHumansInGame(void);
+
+AvHHive* AvHSUGetRandomActiveHive(AvHTeamNumber inTeam);
+AvHHive* AvHSUGetRandomActivateableHive(AvHTeamNumber inTeam);
+int AvHSUGetWeaponStayTime();
+
+void AvHSUResearchStarted(CBaseEntity* inResearchEntity, AvHMessageID inResearchingTech);
+void AvHSUResearchComplete(CBaseEntity* inResearchEntity, AvHMessageID inResearchingTech);
+
+CBaseEntity* AvHSUGetEntityFromIndex(int inEntityIndex);
+void AvHSUSetCollisionBoxFromSequence(entvars_t* inPev);
+
+CGrenade* AvHSUShootServerGrenade(entvars_t* inOwner, Vector inOrigin, Vector inVelocity, float inTime, bool inHandGrenade = true);
+void AvHSUKnockPlayerAbout(CBaseEntity* inAttcker, CBaseEntity* inVictim, int inForce);
+
+void AvHSUServerTraceBullets(const Vector& inStart, const Vector& inEnd, IGNORE_MONSTERS inIgnoreMonsters, edict_t* inIgnoreEdict, TraceResult& outTraceResult, bool& outProtected);
+
+void AvHSUUpdateHiveTechology(AvHTeamNumber inTeamNumber, AvHMessageID inBuildID);
+
+bool AvHSUGetIsDebugging();
+void AvHSUSetIsDebugging(bool inState);
+void AvHSUAddDebugPoint(float inX, float inY, float inZ);
+
+int AvHSUGetValveHull(int inHull);
+AvHUser3 AvHSUGetGroupTypeFromSelection(const EntityListType& inEntityListType);
+void AvHSURemoveEntityFromHotgroupsAndSelection(int inEntityIndex);
+
+string AvHSUGetLocationText(CBaseEntity* inEntity);
+void AvHSUCreateUmbraCloud(vec3_t inOrigin, AvHTeamNumber inTeamNumber, CBaseEntity* inCreatingEntity);
+void AvHSUExplosiveForce(const Vector& inOrigin, int inRadius, float inForceScalar, const CBaseEntity* inAttacker, const CBaseEntity* inIgnorePlayer = NULL);
+bool AvHSUGetIsEnoughRoomForHull(const vec3_t& inCenter, int inHull, edict_t* inIgnoreEntity, bool inIgnorePlayers = false, bool inIgnoreEntities = false);
+
+bool AvHCheckLineOfSight(const Vector& vecStart, const Vector& vecEnd, edict_t* pentIgnore, IGNORE_MONSTERS igmon = ignore_monsters, edict_t* pEntTarget = NULL);
+
+bool AvHSUGetIsResearchApplicable(CBaseEntity* inResearchEntity, AvHMessageID inResearchingTech);
+
+// Use theEntity to call stuff
+#define FOR_ALL_ENTITIES(inEntityClassName, inBaseClassPointer) \
+{\
+	edict_t* pent = FIND_ENTITY_BY_CLASSNAME(NULL, inEntityClassName); \
+	while (!FNullEnt(pent)) \
+	{ \
+		CBaseEntity* theBaseEntity = CBaseEntity::Instance(pent); \
+		if(theBaseEntity) \
+		{ \
+			const char* theClassName = STRING(theBaseEntity->pev->classname); \
+			if(!AvHSUGetIsExternalClassName(theClassName)) \
+			{ \
+				inBaseClassPointer theEntity = dynamic_cast<inBaseClassPointer>(theBaseEntity); \
+				if(theEntity && theEntity->pev) \
+				{ \
+	
+#define END_FOR_ALL_ENTITIES(inEntityClassName) \
+				} \
+			}\
+		}\
+		pent = FIND_ENTITY_BY_CLASSNAME(pent, inEntityClassName); \
+	} \
+}
+
+#define FOR_ALL_BASEENTITIES() \
+{ \
+	for(int theBaseEntityLoopIndex = 0; theBaseEntityLoopIndex < gpGlobals->maxEntities; theBaseEntityLoopIndex++) \
+	{ \
+		edict_t* theBaseEntityEdict = g_engfuncs.pfnPEntityOfEntIndex(theBaseEntityLoopIndex); \
+		if(theBaseEntityEdict != NULL) \
+		{ \
+			CBaseEntity* theBaseEntity = CBaseEntity::Instance(theBaseEntityEdict); \
+			if(theBaseEntity && theBaseEntity->pev) \
+			{ \
+				const char* theClassName = STRING(theBaseEntity->pev->classname); \
+				if(!AvHSUGetIsExternalClassName(theClassName)) \
+				{ \
+
+#define END_FOR_ALL_BASEENTITIES() \
+				} \
+			} \
+		} \
+	} \
+}
+
+template <class T>
+bool AvHSUGetEntityFromIndex(int inEntityIndex, T& outValue)
+{
+	bool theSuccess = false;
+	
+	CBaseEntity* theEntity = AvHSUGetEntityFromIndex(inEntityIndex);
+	if(theEntity)
+	{
+		outValue = dynamic_cast<T>(theEntity);
+		if(outValue)
+		{
+			theSuccess = true;
+		}
+	}
+	
+	return theSuccess;
+}
+
+class CachedEntity
+{
+public:
+	CachedEntity()
+	{
+		this->ResetCachedEntity();
+	}
+	
+	void ResetCachedEntity()
+	{
+		mVisible = 0;
+		mLastTimeVisible = -1;
+		mServerTick = 0;
+		mNeedsVisibilityCheck = false;
+	}
+	
+	int			mVisible;
+	float		mLastTimeVisible;
+	int			mServerTick;
+	bool		mNeedsVisibilityCheck;
+};
+
+class CachedVisibility
+{
+public:
+	CachedVisibility()
+	{
+		this->ResetCachedEntity();
+	}
+	
+	void ResetCachedEntity()
+	{
+		mPVS = mPAS = NULL;
+		mComputed = false;
+	}
+	
+	unsigned char*	mPVS;
+	unsigned char*	mPAS;
+	bool			mComputed;
+};
+
+#endif
diff --git a/main/source/mod/AvHServerVariables.h b/main/source/mod/AvHServerVariables.h
new file mode 100644
index 00000000..4716a543
--- /dev/null
+++ b/main/source/mod/AvHServerVariables.h
@@ -0,0 +1,109 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHServerVariables.h $
+// $Date: 2002/11/22 21:26:57 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHServerVariables.h,v $
+// Revision 1.24  2002/11/22 21:26:57  Flayra
+// - Added mp_version for All-Seeing Eye
+//
+// Revision 1.23  2002/11/12 18:52:16  Flayra
+// - Renamed ns_ variables to mp_
+//
+// Revision 1.22  2002/11/12 18:45:02  Flayra
+// - Added mp_logdetail
+//
+// Revision 1.21  2002/11/03 04:52:10  Flayra
+// - Removed server variables, hard-coded them
+//
+// Revision 1.20  2002/10/24 21:42:19  Flayra
+// - Regular update
+//
+// Revision 1.19  2002/10/18 22:22:29  Flayra
+// - Added easter egg server variable
+//
+// Revision 1.18  2002/10/16 01:06:52  Flayra
+// - Removed demoing variable, added serverops variable
+//
+// Revision 1.17  2002/10/03 19:07:27  Flayra
+// - Regular update
+//
+// Revision 1.16  2002/09/23 22:30:16  Flayra
+// - Added mp_weaponstaytime
+//
+// Revision 1.15  2002/09/09 20:06:07  Flayra
+// - Voting variables
+//
+// Revision 1.14  2002/07/26 23:08:05  Flayra
+// - Added mp_drawdamage variable
+//
+// Revision 1.13  2002/07/24 18:45:43  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.12  2002/07/23 17:24:54  Flayra
+// - Regular update
+//
+// Revision 1.11  2002/07/08 17:16:58  Flayra
+// - Regular update
+//
+// Revision 1.10  2002/07/01 21:45:28  Flayra
+// - Removed turret range from skill.cfg (for visible building placement ranges)
+//
+// Revision 1.9  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_SERVERVARIABLES_H
+#define AVH_SERVERVARIABLES_H
+
+#include "common/cvardef.h"
+
+extern cvar_t	avh_tournamentmode;
+
+// Variables
+#define kvTournamentMode			"mp_tournamentmode"
+#define kvTrainingMode				"mp_trainingmode"
+#define kvDrawDamage				"mp_drawdamage"
+#define kvDeathMatchMode			"mp_deathmatchmode"
+#define kvCountDownTime				"mp_countdowntime"
+#define kvDrawInvisible				"mp_drawinvisibleentities"
+#define kvAssert					"mp_assert"
+#define kvNetworkMeterRate			"mp_networkmeterrate"
+#define kvNetworkDebug				"mp_networkdebug"
+#define kvLateJoinTime				"mp_latejointime"
+#define kvLogDetail					"mp_logdetail"
+#define kvServerScripts				"mp_serverscripts"
+#define kvTeamSizeHandicapping		"mp_teamsizehandicapping"
+#define kvTeam1DamagePercent        "mp_team1damagepercent"
+#define kvTeam2DamagePercent        "mp_team2damagepercent"
+#define kvSpawnInvulnerableTime		"mp_spawninvulnerabletime"
+#define kvVoteCastTime				"mp_votecasttime"
+#define kvVoteDownTime				"mp_votedowntime"
+#define kvMinVotesNeeded			"mp_minvotesneeded"
+#define kvServerOps					"mp_serverops"
+#define kvLimitTeams				"mp_limitteams"
+#define kvVotePercentNeeded			"mp_votepercentneeded"
+#define kvAutoConcede				"mp_autoconcede"
+#define kvCombatTime				"mp_combattime"
+#define kvBulletCam					"mp_bulletcam"
+#define kvTesting					"mp_testing"
+#define kvKillDelay					"mp_killdelay"
+#define kvPerformance				"mp_performance"
+#define kvIronMan					"mp_ironman"
+#define kvIronManTime				"mp_ironmantime"
+
+#define kvEasterEggChance			"mp_eastereggchance"
+#define kvUplink					"mp_uplink"
+#define kvMapVoteRatio              "mp_mapvoteratio"
+
+#define kvBlockScripts              "mp_blockscripts"
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHSharedMovementInfo.cpp b/main/source/mod/AvHSharedMovementInfo.cpp
new file mode 100644
index 00000000..d5184599
--- /dev/null
+++ b/main/source/mod/AvHSharedMovementInfo.cpp
@@ -0,0 +1,71 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: Data structure for keeping track of movement that occurs over multiple ticks.
+//
+// $Workfile:     $
+// $Date: 2002/07/24 18:45:43 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHSharedMovementInfo.cpp,v $
+// Revision 1.2  2002/07/24 18:45:43  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.1  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifdef AVH_CLIENT
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+#endif
+
+#ifdef AVH_SERVER
+#include "extdll.h"
+#include "util.h"
+#include "common/vector_util.h"
+#endif
+
+#include "mod/AvHSharedMovementInfo.h"
+
+
+AvHPlayerMovementInfo::AvHPlayerMovementInfo()
+{
+	this->mBlinkStartTime = 0.0f;
+}
+
+
+AvHSharedMovementInfo* AvHSharedMovementInfo::sMovementInfo = NULL;
+
+AvHSharedMovementInfo* AvHSharedMovementInfo::Instance()
+{
+	if(!sMovementInfo)
+	{
+		sMovementInfo = new AvHSharedMovementInfo();
+	}
+	return sMovementInfo;
+}
+
+
+void AvHSharedMovementInfo::GetBlinkStartInfo(int inPlayerIndex, float* inOrigin, float* inDirection, float& inStartTime)
+{
+	AvHPlayerMovementInfo& theMovementInfo = this->mPlayerInfoList[inPlayerIndex];
+
+	VectorCopy(theMovementInfo.mBlinkOrigin, inOrigin);
+	VectorCopy(theMovementInfo.mBlinkDirection, inDirection);
+	inStartTime = theMovementInfo.mBlinkStartTime;
+}
+
+void AvHSharedMovementInfo::SetBlinkStartInfo(int inPlayerIndex, const float* inOrigin, const float* inDirection, float inStartTime)
+{
+	AvHPlayerMovementInfo& theMovementInfo = this->mPlayerInfoList[inPlayerIndex];
+
+	VectorCopy(inOrigin, theMovementInfo.mBlinkOrigin);
+	VectorCopy(inDirection, theMovementInfo.mBlinkDirection);
+	theMovementInfo.mBlinkStartTime = inStartTime;
+}
+
diff --git a/main/source/mod/AvHSharedMovementInfo.h b/main/source/mod/AvHSharedMovementInfo.h
new file mode 100644
index 00000000..862faf15
--- /dev/null
+++ b/main/source/mod/AvHSharedMovementInfo.h
@@ -0,0 +1,50 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: Data structure for keeping track of movement that occurs over multiple ticks.
+//
+// $Workfile:     $
+// $Date: 2002/05/23 02:33:20 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHSharedMovementInfo.h,v $
+// Revision 1.1  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_SHAREDMOVEMENTINFO_H
+#define AVH_SHAREDMOVEMENTINFO_H
+
+#include "types.h"
+
+class AvHPlayerMovementInfo
+{
+public:
+				AvHPlayerMovementInfo();
+				
+	vec3_t		mBlinkOrigin;
+	vec3_t		mBlinkDirection;
+	float		mBlinkStartTime;
+}	;
+
+class AvHSharedMovementInfo
+{
+public:
+	static	AvHSharedMovementInfo*	Instance();
+
+	void	GetBlinkStartInfo(int inPlayerIndex, float* inOrigin, float* inDirection, float& inStartTime);
+	void	SetBlinkStartInfo(int inPlayerIndex, const float* inOrigin, const float* inDirection, float inStartTime);
+	
+private:
+	static AvHSharedMovementInfo*				sMovementInfo;
+
+	typedef map<int, AvHPlayerMovementInfo>		PlayerMovementInfoList;
+	PlayerMovementInfoList						mPlayerInfoList;
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHSharedTypes.h b/main/source/mod/AvHSharedTypes.h
new file mode 100644
index 00000000..7ac3d0ee
--- /dev/null
+++ b/main/source/mod/AvHSharedTypes.h
@@ -0,0 +1,64 @@
+#ifndef AVH_SHARED_TYPES_H
+#define	AVH_SHARED_TYPES_H
+#include "types.h"
+
+const int kHiveInfoStatusUnbuilt = 0;
+const int kHiveInfoStatusBuildingStage1 = 1;
+const int kHiveInfoStatusBuildingStage2 = 2;
+const int kHiveInfoStatusBuildingStage3 = 3;
+const int kHiveInfoStatusBuildingStage4 = 4;
+const int kHiveInfoStatusBuildingStage5 = 5;
+const int kHiveInfoStatusBuilt = 6;
+const int kHiveInfoStatusUnderAttack = 7;
+
+class AvHHiveInfo
+{
+public:
+	bool	operator==(const AvHHiveInfo& inHiveInfo) const
+	{
+		bool theAreEqual = false;
+
+		if(this->mHealthPercentage == inHiveInfo.mHealthPercentage)
+		{
+			if(this->mPosX == inHiveInfo.mPosX)
+			{
+				if(this->mPosY == inHiveInfo.mPosY)
+				{
+					if(this->mPosZ == inHiveInfo.mPosZ)
+					{
+						if(this->mStatus == inHiveInfo.mStatus)
+						{
+							if(this->mUnderAttack == inHiveInfo.mUnderAttack)
+							{
+								if(this->mTechnology == inHiveInfo.mTechnology)
+								{
+									theAreEqual = true;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		return theAreEqual;
+	}
+
+	bool	operator!=(const AvHHiveInfo& inHiveInfo) const
+	{
+		return !operator==(inHiveInfo);
+	}
+
+	float	mPosX;
+	float	mPosY;
+	float	mPosZ;
+
+	int		mStatus;
+	bool	mUnderAttack;
+	int		mTechnology;
+
+	int		mHealthPercentage;
+};
+
+typedef vector<AvHHiveInfo>		HiveInfoListType;
+
+#endif
diff --git a/main/source/mod/AvHSharedUtil.cpp b/main/source/mod/AvHSharedUtil.cpp
new file mode 100644
index 00000000..cc0ba458
--- /dev/null
+++ b/main/source/mod/AvHSharedUtil.cpp
@@ -0,0 +1,3945 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose:
+//
+// $Workfile: AvHSharedUtil.cpp $
+// $Date: 2002/11/12 22:39:25 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHSharedUtil.cpp,v $
+// Revision 1.33  2002/11/12 22:39:25  Flayra
+// - Logging changes for Psychostats compatibility
+//
+// Revision 1.32  2002/10/24 21:42:32  Flayra
+// - Don't give waypoint to selected troops when scanning
+//
+// Revision 1.31  2002/10/19 21:19:49  Flayra
+// - Debugging info for linux
+//
+// Revision 1.30  2002/10/16 01:07:26  Flayra
+// - Added official sizes that HL supports (ugh)
+// - Added utility function for drawing range of ghost building, but it's unused
+//
+// Revision 1.29  2002/10/03 19:07:40  Flayra
+// - Hives can never be blocked by func_resources
+//
+// Revision 1.28  2002/09/25 20:50:58  Flayra
+// - Allow small items to be built on entities (health can be dropped right on players)
+//
+// Revision 1.27  2002/09/23 22:31:40  Flayra
+// - Updated team 0 colors so dictation can be read in readyroom
+// - Draw range for prototype lab, observatory and sensory chamber
+// - Alien building rings
+// - Don't allow non-resource buildings built too close to func_resources
+// - Added heavy armor and jetpacks
+//
+// Revision 1.26  2002/09/09 20:06:43  Flayra
+// - New observatory artwork
+//
+// Revision 1.25  2002/08/31 18:01:03  Flayra
+// - Work at VALVe
+//
+// Revision 1.24  2002/08/16 02:47:06  Flayra
+// - Fixed bug where not all the entities were iterated through
+// - Support for ring-drawing (but not for all entities)
+//
+// Revision 1.23  2002/08/09 00:51:11  Flayra
+// - Cleaned up useless special casing of tracetangible, fixed some problems where buildings could be built on players
+//
+// Revision 1.22  2002/08/02 21:50:05  Flayra
+// - Made more general, by detecting all entities, not just players
+//
+// Revision 1.21  2002/07/24 18:45:43  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.20  2002/07/23 17:26:49  Flayra
+// - Siege don't require a nearby turret factory, only add built buildings for range detection, build problems on client (point contents failing on rough surfaces)
+//
+// Revision 1.19  2002/07/08 17:17:44  Flayra
+// - Reworked colors, moved functions into server util
+//
+// Revision 1.18  2002/07/01 21:46:39  Flayra
+// - Added support for generic building ranges, fixed morphing problems
+//
+// Revision 1.17  2002/06/25 18:18:00  Flayra
+// - Renamed buildings, better is-area-free detection
+//
+// Revision 1.16  2002/06/03 16:58:13  Flayra
+// - Renamed weapons factory and armory, hive is now a buildable
+//
+// Revision 1.15  2002/05/28 18:13:43  Flayra
+// - Changed "entity blocked by whatever" message to be logged for PR/screenshot purposes
+//
+// Revision 1.14  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+
+#ifdef AVH_SERVER
+#include "extdll.h"
+#include "util.h"
+#include "types.h"
+#endif
+
+#ifdef AVH_CLIENT
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+#endif
+
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHSelectionHelper.h"
+#include "mod/AvHConstants.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHPlayer.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHEntities.h"
+#include "mod/AvHWeldable.h"
+#include "mod/AvHGamerules.h"
+#include "dlls/cfuncwall.h"
+//#include "common/com_model.h"
+//int NS_PointContents(const hull_t *hull, int num, float p[3]);
+#endif
+
+#include "pm_shared/pm_defs.h"
+#include "pm_shared/pm_shared.h"
+
+#ifdef AVH_CLIENT
+#include "pm_shared/pm_debug.h"
+//extern DebugPointListType				gTriDebugLocations;
+//extern DebugPointListType				gSquareDebugLocations;
+#endif
+
+#include "util/MathUtil.h"
+#include "util/STLUtil.h"
+
+#include "common/vector_util.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+
+#include "common/r_efx.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "cl_dll/in_defs.h"
+#endif
+
+#include "common/com_model.h"
+
+#include "mod/AvHSpecials.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "dlls/turretconst.h"
+#include "mod/AvHMarineWeaponConstants.h"
+#include "mod/AvHHulls.h"
+#include "mod/AvHAlienEquipmentConstants.h"
+
+#include "mod/CollisionUtil.h"
+/*
+bool NS_BoxesOverlap(float origin1[3], float size1[3], float origin2[3], float size2[3]);
+int  NS_PointContents(const hull_t *hull, int num, float p[3]);
+int NS_BoxContents(const hull_t *hull, int num, float mins[3], float maxs[3]);
+int  NS_GetValveHull(int inHull);
+void NS_TraceLine(const hull_t* hull, float srcPoint[3], float dstPoint[3], trace_t* trace);
+*/
+#include <time.h>
+extern playermove_t* pmove;
+vec3_t AvHSHUGetRealLocation(const vec3_t& inLocation, const vec3_t& inMinBox, const vec3_t& inMaxBox);
+
+
+vec3_t gPMDebugPoint;
+
+int kTeamColors[iNumberOfTeamColors][3] =
+{
+    { 255, 255, 255 },      // White (default)
+
+//  { 125, 165, 210 },      // Blue (marine 1)
+    { 0, 153, 255 },        // Blue (marine 1)
+
+//  { 255, 170, 0 },        // HL orange (alien 1)
+    { 255, 160, 0 },        // HL orange (alien 1)
+
+    { 145, 215, 140 },      // Green (marine 2)
+    { 200, 90, 70 },        // Red (alien 2)
+    { 255, 255, 255 }       // White (spectator)
+};
+
+float kFTeamColors[iNumberOfTeamColors][3] =
+{
+    { kTeamColors[0][0] / 255.0f, kTeamColors[0][1] / 255.0f, kTeamColors[0][2] / 255.0f },
+    { kTeamColors[1][0] / 255.0f, kTeamColors[1][1] / 255.0f, kTeamColors[1][2] / 255.0f },
+    { kTeamColors[2][0] / 255.0f, kTeamColors[2][1] / 255.0f, kTeamColors[2][2] / 255.0f },
+    { kTeamColors[3][0] / 255.0f, kTeamColors[3][1] / 255.0f, kTeamColors[3][2] / 255.0f },
+    { kTeamColors[4][0] / 255.0f, kTeamColors[4][1] / 255.0f, kTeamColors[4][2] / 255.0f },
+    { kTeamColors[5][0] / 255.0f, kTeamColors[5][1] / 255.0f, kTeamColors[5][2] / 255.0f }
+};
+
+
+// Official allowed sizes
+// {0, 0, 0 } { 0, 0, 0 } 0x0x0
+// { -16, -16, -18 } { 16, 16, 18 } 32x32x36
+// { -16, -16, -36 } { 16, 16, 36 } 32x32x72
+// { -32, -32, -32 } { 32, 32, 32 } 64x64x64
+
+//#define		kBuilding1MinSize		Vector(-14.33, -14.84, 0.02)
+////#define		kBuilding1MaxSize		Vector(21.61, 14.86, 66.9686)
+//#define		kBuilding1MaxSize		Vector(14.33, 14.86, 66.9686)
+//
+//#define		kBuilding2MinSize		Vector(-25.0, -25.0, 0.02)
+//#define		kBuilding2MaxSize		Vector(25.0, 25.0, 66.9686)
+
+#define		kResourceMinSize		Vector(-16.0, -16.0, 0.0)
+#define		kResourceMaxSize		Vector(16.0, 16.0, 66.9486)
+
+// Tried 100, 110, still jitters.  Shrink tower down a bit?
+#define		kAlienResourceMinSize	Vector(-16.0, -16.0, 0.0)
+#define		kAlienResourceMaxSize	Vector(16.0, 16.0, 80.7443)
+
+//physent_t* AvHSUGetEntity(int inPhysIndex)
+//{
+//	physent_t* theTarget = NULL;
+//	int i = 0;
+//
+//	if(inPhysIndex > 0)
+//	{
+//		#ifdef AVH_CLIENT
+//		gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction( false, true );
+//
+//		// Store off the old count
+//		//gEngfuncs.pEventAPI->EV_PushPMStates();
+//
+//		// Now add in all of the players.
+//		gEngfuncs.pEventAPI->EV_SetSolidPlayers (-1);
+//
+//		for (i = 0; i < MAX_PHYSENTS; i++)
+//		//for (i = 0; i < pmove->numphysent; i++)
+//		{
+//			physent_t* thePotentialCandidate = gEngfuncs.pEventAPI->EV_GetPhysent(i);
+//			if ( thePotentialCandidate && (thePotentialCandidate->info == inPhysIndex))
+//			{
+//				theTarget = &pmove->physents[i];
+//				break;
+//			}
+//		}
+//
+//		//gEngfuncs.pEventAPI->EV_PopPMStates();
+//		#endif
+//
+//		// Check phys entities on server
+//		#ifdef AVH_SERVER
+//		for (i = 0; i < MAX_PHYSENTS; i++)
+//		//for (i = 0; i < pmove->numphysent; i++)
+//		{
+//			if ( pmove->physents[i].info == inPhysIndex )
+//			{
+//				theTarget = &pmove->physents[i];
+//				break;
+//			}
+//		}
+//
+//		//CBaseEntity* theEntityHit = CBaseEntity::Instance(tr.pHit);
+//		#endif
+//	}
+//
+//	return theTarget;
+//}
+
+const char* AvHSHUGetClassNameFromUser3(AvHUser3 inUser3)
+{
+    const char* theClassName = "";
+
+    switch(inUser3)
+    {
+    case AVH_USER3_MARINE_PLAYER:
+        theClassName = "soldier";
+        break;
+
+    case AVH_USER3_COMMANDER_PLAYER:
+        theClassName = "commander";
+        break;
+
+    case AVH_USER3_ALIEN_PLAYER1:
+        theClassName = "skulk";
+        break;
+
+    case AVH_USER3_ALIEN_PLAYER2:
+        theClassName = "gorge";
+        break;
+
+    case AVH_USER3_ALIEN_PLAYER3:
+        theClassName = "lerk";
+        break;
+
+    case AVH_USER3_ALIEN_PLAYER4:
+        theClassName = "fade";
+        break;
+
+    case AVH_USER3_ALIEN_PLAYER5:
+        theClassName = "onos";
+        break;
+
+    case AVH_USER3_ALIEN_EMBRYO:
+        theClassName = "gestate";
+        break;
+    }
+
+    return theClassName;
+}
+
+
+// Pass in -1 to get all entities with a non-zero iuser3
+void AvHSHUGetEntities(int inUser3, EntityListType& outEntities)
+{
+	#ifdef AVH_SERVER
+	FOR_ALL_BASEENTITIES();
+	if((theBaseEntity->pev->iuser3 == inUser3) || ((inUser3 == -1) && (theBaseEntity->pev->iuser3 > 0)))
+	{
+		outEntities.push_back(theBaseEntity->entindex());
+	}
+	END_FOR_ALL_BASEENTITIES();
+
+	#endif
+
+	#ifdef AVH_CLIENT
+
+	gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction( false, true );
+
+	// Store off the old count
+	gEngfuncs.pEventAPI->EV_PushPMStates();
+
+	// Now add in all of the players.
+	gEngfuncs.pEventAPI->EV_SetSolidPlayers (-1);
+
+	physent_t* theEntity = NULL;
+	int theNumEnts = pmove->numphysent;
+	for (int i = 0; i < theNumEnts; i++)
+	{
+		theEntity = gEngfuncs.pEventAPI->EV_GetPhysent(i);
+		if((theEntity->iuser3 == inUser3) || ((inUser3 == -1) && (theEntity->iuser3 > 0)))
+		{
+			outEntities.push_back(i);
+		}
+	}
+
+	gEngfuncs.pEventAPI->EV_PopPMStates();
+	#endif
+}
+
+bool AvHSHUGetEntityLocation(int inEntity, vec3_t& outLocation)
+{
+	bool theSuccess = false;
+
+	#ifdef AVH_SERVER
+	edict_t* pEdict = g_engfuncs.pfnPEntityOfEntIndex(inEntity);
+	if(pEdict && !pEdict->free)
+	{
+		CBaseEntity* theEntity = CBaseEntity::Instance(pEdict);
+		if(theEntity)
+		{
+			outLocation = AvHSHUGetRealLocation(theEntity->pev->origin, theEntity->pev->mins, theEntity->pev->maxs);
+			theSuccess = true;
+		}
+	}
+	#endif
+
+	#ifdef AVH_CLIENT
+	gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction( false, true );
+	
+	// Store off the old count
+	gEngfuncs.pEventAPI->EV_PushPMStates();
+	
+	// Now add in all of the players.
+	gEngfuncs.pEventAPI->EV_SetSolidPlayers (-1);
+
+	physent_t* theEntity = gEngfuncs.pEventAPI->EV_GetPhysent(inEntity);
+	
+	gEngfuncs.pEventAPI->EV_PopPMStates();
+
+	if(theEntity)
+	{
+		outLocation = AvHSHUGetRealLocation(theEntity->origin, theEntity->mins, theEntity->maxs);
+		theSuccess = true;
+	}
+	#endif
+
+	return theSuccess;
+}
+
+
+bool AvHSHUGetEntityIUser3(int inEntity, AvHUser3& outIUser3)
+{
+	bool theSuccess = false;
+
+	#ifdef AVH_SERVER
+	edict_t* pEdict = g_engfuncs.pfnPEntityOfEntIndex(inEntity);
+	if(pEdict && !pEdict->free)
+	{
+		CBaseEntity* theEntity = CBaseEntity::Instance(pEdict);
+		if(theEntity)
+		{
+			outIUser3 = (AvHUser3)theEntity->pev->iuser3;
+			theSuccess = true;
+		}
+	}
+#endif
+
+#ifdef AVH_CLIENT
+	// Store off the old count
+	gEngfuncs.pEventAPI->EV_PushPMStates();
+	
+	// Now add in all of the players.
+	gEngfuncs.pEventAPI->EV_SetSolidPlayers (-1);
+
+	physent_t* theEntity = gEngfuncs.pEventAPI->EV_GetPhysent(inEntity);
+	if(theEntity)
+	{
+		outIUser3 = (AvHUser3)theEntity->iuser3;
+		theSuccess = true;
+	}
+	gEngfuncs.pEventAPI->EV_PopPMStates();
+
+#endif
+	return theSuccess;
+}
+
+
+bool AvHSHUGetEntityIUser4(int inEntity, int& outIUser4)
+{
+	bool theSuccess = false;
+
+	#ifdef AVH_SERVER
+	edict_t* pEdict = g_engfuncs.pfnPEntityOfEntIndex(inEntity);
+	if(pEdict && !pEdict->free)
+	{
+		CBaseEntity* theEntity = CBaseEntity::Instance(pEdict);
+		if(theEntity)
+		{
+			outIUser4 = theEntity->pev->iuser4;
+			theSuccess = true;
+		}
+	}
+#endif
+
+#ifdef AVH_CLIENT
+	physent_t* theEntity = gEngfuncs.pEventAPI->EV_GetPhysent(inEntity);
+	if(theEntity)
+	{
+		outIUser4 = theEntity->iuser4;
+		theSuccess = true;
+	}
+#endif
+
+	return theSuccess;
+}
+
+
+vec3_t AvHSHUGetRealLocation(const vec3_t& inLocation, const vec3_t& inMinBox, const vec3_t& inMaxBox)
+{
+	vec3_t outLocation;
+	VectorCopy(inLocation, outLocation);
+
+	if((outLocation.x == outLocation.y) && (outLocation.y == outLocation.z) && (outLocation.z == 0.0f))
+	{
+		outLocation.x = (inMinBox.x + inMaxBox.x)/2.0f;
+		outLocation.y = (inMinBox.y + inMaxBox.y)/2.0f;
+		outLocation.z = (inMinBox.z + inMaxBox.z)/2.0f;
+	}
+	return outLocation;
+}
+
+// Returns range of user3, whatever that means.  Returns -1 for no meaningful range.
+int AvHSHUGetDrawRangeForUser3(AvHUser3 inUser3)
+{
+	int theRange = -1;
+
+	switch(inUser3)
+	{
+	case AVH_USER3_COMMANDER_STATION:
+		theRange = BALANCE_IVAR(kCommandStationBuildDistance);
+		break;
+
+	case AVH_USER3_FUNC_RESOURCE:
+		theRange = BALANCE_IVAR(kResourceTowerBuildDistanceTolerance);
+		break;
+
+	case AVH_USER3_TURRET_FACTORY:
+	case AVH_USER3_ADVANCED_TURRET_FACTORY:
+		theRange = BALANCE_IVAR(kTurretFactoryBuildDistance);
+		break;
+
+	case AVH_USER3_ARMORY:
+	case AVH_USER3_ADVANCED_ARMORY:
+		theRange = BALANCE_IVAR(kArmoryBuildDistance);
+		break;
+
+	case AVH_USER3_TURRET:
+		theRange = BALANCE_IVAR(kTurretRange);
+		break;
+
+	case AVH_USER3_SIEGETURRET:
+		// TODO: Figure out a way to return minimum range also?
+		theRange = BALANCE_IVAR(kSiegeTurretRange);
+		break;
+
+	case AVH_USER3_PROTOTYPE_LAB:
+		theRange = BALANCE_IVAR(kArmorDropRange);
+		break;
+
+	case AVH_USER3_OBSERVATORY:
+		theRange = BALANCE_IVAR(kObservatoryXYDetectionRadius);
+		break;
+
+	case AVH_USER3_SENSORY_CHAMBER:
+		theRange = BALANCE_IVAR(kSensoryChamberRange);
+		break;
+	}
+
+	return theRange;
+}
+
+int AvHSHUGetDrawRangeForMessageID(AvHMessageID inMessageID)
+{
+	AvHUser3 theUser3 = AVH_USER3_NONE;
+
+	switch(inMessageID)
+	{
+	case BUILD_COMMANDSTATION:
+		theUser3 = AVH_USER3_COMMANDER_STATION;
+		break;
+
+	case BUILD_TURRET:
+		theUser3 = AVH_USER3_TURRET;
+		break;
+
+	case BUILD_SIEGE:
+		theUser3 = AVH_USER3_SIEGETURRET;
+		break;
+
+	case BUILD_OBSERVATORY:
+		theUser3 = AVH_USER3_OBSERVATORY;
+		break;
+
+	case BUILD_TURRET_FACTORY:
+		theUser3 = AVH_USER3_TURRET_FACTORY;
+		break;
+
+	case BUILD_PROTOTYPE_LAB:
+		theUser3 = AVH_USER3_PROTOTYPE_LAB;
+		break;
+
+	case BUILD_ARMORY:
+		theUser3 = AVH_USER3_ARMORY;
+		break;
+	}
+
+	return AvHSHUGetDrawRangeForUser3(theUser3);
+}
+
+
+// Specify whether we draw rings for this entity or not, and draw them at different sizes for aesthetics.  The scalar might go away when the
+// artwork all has the correct bounding boxes.
+bool AvHSHUGetDrawRingsForUser3(AvHUser3 inUser3, float& outScalar)
+{
+	bool theDrawRings = false;
+	float theScalar = 1.0f;
+
+	switch(inUser3)
+	{
+	case AVH_USER3_MARINE_PLAYER:
+		theScalar = .9f;
+		theDrawRings = true;
+		break;
+
+	case AVH_USER3_RESTOWER:
+		theScalar = 1.6f;
+		theDrawRings = true;
+		break;
+
+	case AVH_USER3_INFANTRYPORTAL:
+		theScalar = 1.3f;
+		theDrawRings = true;
+		break;
+
+	case AVH_USER3_ARMORY:
+	case AVH_USER3_ADVANCED_ARMORY:
+		theScalar = 1.35f;
+		theDrawRings = true;
+		break;
+
+	case AVH_USER3_COMMANDER_STATION:
+		theScalar = 1.4f;
+		theDrawRings = true;
+		break;
+
+	case AVH_USER3_PHASEGATE:
+		theScalar = 2.0f;
+		theDrawRings = true;
+		break;
+
+	case AVH_USER3_OBSERVATORY:
+		theScalar = .9f;
+		theDrawRings = true;
+		break;
+
+	case AVH_USER3_TURRET_FACTORY:
+	case AVH_USER3_ADVANCED_TURRET_FACTORY:
+		theScalar = 1.6f;
+		theDrawRings = true;
+		break;
+
+	case AVH_USER3_TURRET:
+		theScalar = .7f;
+		theDrawRings = true;
+		break;
+
+	case AVH_USER3_NUKEPLANT:
+		theScalar = 1.5f;
+		theDrawRings = true;
+		break;
+
+	case AVH_USER3_ARMSLAB:
+	case AVH_USER3_PROTOTYPE_LAB:
+	case AVH_USER3_CHEMLAB:
+	case AVH_USER3_MEDLAB:
+	case AVH_USER3_SIEGETURRET:
+		theScalar = 1.3f;
+		theDrawRings = true;
+		break;
+
+	// Alien buildings
+	case AVH_USER3_DEFENSE_CHAMBER:
+	case AVH_USER3_OFFENSE_CHAMBER:
+	case AVH_USER3_MOVEMENT_CHAMBER:
+	case AVH_USER3_SENSORY_CHAMBER:
+	case AVH_USER3_ALIENRESTOWER:
+		theScalar = 1.3f;
+		theDrawRings = true;
+		break;
+
+	case AVH_USER3_ALIEN_PLAYER1:
+		theScalar = .6f;
+		theDrawRings = true;
+		break;
+	case AVH_USER3_ALIEN_PLAYER2:
+		theScalar = 1.0f;
+		theDrawRings = true;
+		break;
+	case AVH_USER3_ALIEN_PLAYER3:
+		theScalar = 1.0;
+		theDrawRings = true;
+		break;
+	case AVH_USER3_ALIEN_PLAYER4:
+		theScalar = 1.3f;
+		theDrawRings = true;
+		break;
+	case AVH_USER3_ALIEN_PLAYER5:
+		theScalar = 1.2f;
+		theDrawRings = true;
+		break;
+	}
+
+	if(theDrawRings)
+	{
+		outScalar = theScalar;
+	}
+
+	return theDrawRings;
+}
+
+bool AvHSHUGetBuildRegions(AvHMessageID inMessageID, EntityListType& outEntities, IntList& outRanges, float& outZAdjustment, bool& outSnapToLocation)
+{
+	bool theFoundTech = false;
+
+	typedef vector<AvHUser3> User3ListType;
+	User3ListType theUser3s;
+
+	outZAdjustment = 0.0f;
+	outSnapToLocation = false;
+
+	switch(inMessageID)
+	{
+	case BUILD_RESOURCES:
+	case ALIEN_BUILD_RESOURCES:
+		theUser3s.push_back(AVH_USER3_FUNC_RESOURCE);
+		outZAdjustment = (kFuncResourceMaxSize.z - kFuncResourceMinSize.z);
+		outSnapToLocation = true;
+		break;
+
+	case BUILD_INFANTRYPORTAL:
+		theUser3s.push_back(AVH_USER3_COMMANDER_STATION);
+		break;
+
+	case BUILD_TURRET:
+		theUser3s.push_back(AVH_USER3_TURRET_FACTORY);
+		theUser3s.push_back(AVH_USER3_ADVANCED_TURRET_FACTORY);
+		break;
+
+	case BUILD_SIEGE:
+		theUser3s.push_back(AVH_USER3_ADVANCED_TURRET_FACTORY);
+		break;
+
+	case BUILD_MINES:
+	case BUILD_WELDER:
+	case BUILD_SHOTGUN:
+		theUser3s.push_back(AVH_USER3_ARMORY);
+		theUser3s.push_back(AVH_USER3_ADVANCED_ARMORY);
+		break;
+
+	case BUILD_HMG:
+	case BUILD_GRENADE_GUN:
+		theUser3s.push_back(AVH_USER3_ADVANCED_ARMORY);
+		break;
+
+	case BUILD_HEAVY:
+	case BUILD_JETPACK:
+		theUser3s.push_back(AVH_USER3_PROTOTYPE_LAB);
+		break;
+	}
+
+	if(theUser3s.size() > 0)
+	{
+		for(User3ListType::iterator theUser3Iter = theUser3s.begin(); theUser3Iter != theUser3s.end(); theUser3Iter++)
+		{
+			EntityListType theEntities;
+			AvHSHUGetEntities(*theUser3Iter, theEntities);
+
+			for(EntityListType::iterator theEntityIter = theEntities.begin(); theEntityIter != theEntities.end(); theEntityIter++)
+			{
+				// Only add buildings that are fully built
+				int theIuser4 = 0;
+				if(AvHSHUGetEntityIUser4(*theEntityIter, theIuser4))
+				{
+					if(!GetHasUpgrade(theIuser4, MASK_BUILDABLE))
+					{
+						outEntities.push_back(*theEntityIter);
+						outRanges.push_back(AvHSHUGetDrawRangeForUser3(*theUser3Iter));
+					}
+				}
+			}
+		}
+		theFoundTech = true;
+	}
+
+	return theFoundTech;
+}
+
+
+// tankefugl: 0000291 -- allows listed structures to be dropped on resource towers
+bool AvHSHUGetIsDroppableOnRTs(AvHMessageID inMessageID)
+{
+	switch (inMessageID)
+	{
+		case BUILD_HEALTH:
+		case BUILD_AMMO:
+		case BUILD_MINES:
+		case BUILD_WELDER:
+		case BUILD_SHOTGUN:
+		case BUILD_HMG:
+		case BUILD_GRENADE_GUN:
+		case BUILD_CAT:
+		case BUILD_HEAVY:
+		case BUILD_JETPACK:
+		case BUILD_RESOURCES:
+		case ALIEN_BUILD_RESOURCES:
+		case ALIEN_BUILD_HIVE:
+			return true;
+		default:
+			return false;
+	}
+}
+// :tankefugl
+
+bool AvHSHUGetIsMarineStructure(AvHMessageID inMessageID)
+{
+
+    switch (inMessageID)
+    {
+
+    case BUILD_INFANTRYPORTAL:
+    case BUILD_RESOURCES:
+    case BUILD_TURRET_FACTORY:
+    case BUILD_ARMSLAB:
+    case BUILD_PROTOTYPE_LAB:
+    case BUILD_ARMORY:
+    case BUILD_NUKE_PLANT:
+    case BUILD_OBSERVATORY:
+    case BUILD_PHASEGATE:
+    case BUILD_TURRET:
+    case BUILD_SIEGE:
+    case BUILD_COMMANDSTATION:
+        return true;
+    default:
+        return false;
+
+    }
+
+}
+
+bool AvHSHUGetIsMarineStructure(AvHUser3 inUser3)
+{
+
+    switch (inUser3)
+    {
+    case AVH_USER3_COMMANDER_STATION:
+    case AVH_USER3_TURRET_FACTORY:
+    case AVH_USER3_ARMORY:
+    case AVH_USER3_ADVANCED_ARMORY:
+    case AVH_USER3_ARMSLAB:
+    case AVH_USER3_PROTOTYPE_LAB:
+    case AVH_USER3_OBSERVATORY:
+    case AVH_USER3_CHEMLAB:
+    case AVH_USER3_MEDLAB:
+    case AVH_USER3_NUKEPLANT:
+    case AVH_USER3_TURRET:
+    case AVH_USER3_SIEGETURRET:
+    case AVH_USER3_RESTOWER:
+    case AVH_USER3_INFANTRYPORTAL:
+    case AVH_USER3_PHASEGATE:
+    case AVH_USER3_ADVANCED_TURRET_FACTORY:
+        return true;
+    default:
+        return false;
+    }
+
+}
+
+void AvHSHUGetMinBuildRadiusViolations(AvHMessageID inMessageID, vec3_t& inLocation, EntityListType& outViolations)
+{
+
+    // Enforce a minimum build radius for marine structures.
+
+    if (AvHSHUGetIsMarineStructure(inMessageID))
+    {
+        EntityListType theEntities;
+        AvHSHUGetEntities(-1, theEntities);
+
+        vec3_t theMinSize, theMaxSize;
+
+        AvHSHUGetSizeForTech(inMessageID, theMinSize, theMaxSize);
+        float theMaxRadius1 = max(-min(theMinSize.x, theMinSize.y), max(theMaxSize.x, theMaxSize.y));
+
+        for (EntityListType::iterator theIter = theEntities.begin(); theIter != theEntities.end(); theIter++)
+		{
+
+            AvHUser3 theUser3;
+            AvHSHUGetEntityIUser3(*theIter, theUser3);
+
+			bool theEntityCouldBlock = AvHSHUGetIsMarineStructure(theUser3);
+			if(inMessageID != BUILD_RESOURCES)
+			{
+				theEntityCouldBlock |= (theUser3 == AVH_USER3_FUNC_RESOURCE);
+			}
+
+			bool theEntityIsSolid = false;
+
+#ifdef AVH_SERVER
+			edict_t* theEntity = INDEXENT(*theIter);
+
+			if(theEntity)
+				theEntityIsSolid = (theEntity->v.solid == SOLID_BBOX);
+#endif
+
+#ifdef AVH_CLIENT
+
+			physent_t* theEntity = gEngfuncs.pEventAPI->EV_GetPhysent(*theIter);
+
+			if(theEntity) 
+				theEntityIsSolid = (theEntity->solid == SOLID_BBOX);
+				
+#endif	
+			// joev: 0000291
+			// It's possible to place "on" marines if you're offset a little from center. This code and
+			// associated changes below and in AvHHudRender.cpp is to enforce a build distance around players
+			// in the same way as buildings to prevent this exploit.
+			if (theUser3 == AVH_USER3_MARINE_PLAYER)
+			{
+				theEntityIsSolid = true;
+				theEntityCouldBlock = true;
+			}
+
+			if (theEntityCouldBlock && theEntityIsSolid)
+            {
+                AvHSHUGetSizeForUser3(theUser3, theMinSize, theMaxSize);
+                float theMaxRadius2 = max(max(theMinSize.x, theMaxSize.x), max(theMinSize.y, theMaxSize.y));
+
+	            vec3_t theLocation;
+			    if(AvHSHUGetEntityLocation(*theIter, theLocation))
+			    {
+			        vec3_t theXYInLocation = inLocation;
+                    vec3_t theXYTheLocation = theLocation;
+
+                    theXYInLocation.z = 0;
+                    theXYTheLocation.z = 0;
+
+                    float theDistance = VectorDistance((float*)&theXYInLocation, (float*)&theXYTheLocation);
+					// joev: 0000291
+					// It's possible to place "on" marines if you're offset a little from center. This code and
+					// associated changes above and in AvHHudRender.cpp is to enforce a build distance around players
+					// in the same way as buildings to prevent this exploit.
+ 					float theMinMarineBuildDistance;
+               		if (theUser3 == AVH_USER3_MARINE_PLAYER) {
+						theMinMarineBuildDistance = BALANCE_FVAR(kMinMarinePlayerBuildDistance);
+					}
+					else
+					{
+						theMinMarineBuildDistance = BALANCE_FVAR(kMinMarineBuildDistance);
+					}
+					// :joev
+                    if (theDistance < theMinMarineBuildDistance + theMaxRadius1 + theMaxRadius2)
+                    {
+                        outViolations.push_back(*theIter);
+                    }
+                }
+            }
+        }
+    }
+}
+
+bool AvHSHUGetAreSpecialBuildingRequirementsMet(AvHMessageID inMessageID, vec3_t& inLocation)
+{
+	bool theRequirementsMet = false;
+	EntityListType theEntities;
+	IntList theDistanceRequirements;
+	float theZAdjustment = 0.0f;
+	bool theSnapToLocation = false;
+
+	if(inMessageID == ALIEN_BUILD_HIVE)
+	{
+		// Look for inactive hives within radius
+		EntityListType theEntities;
+
+		// Look for a unoccupied hive spot within range
+		AvHSHUGetEntities(AVH_USER3_HIVE, theEntities);
+
+		for(EntityListType::iterator theIter = theEntities.begin(); theIter != theEntities.end(); theIter++)
+		{
+			vec3_t theLocation;
+			if(AvHSHUGetEntityLocation(*theIter, theLocation))
+			{
+				// Set z's equal to check 2D distance only
+				inLocation.z = theLocation.z;
+				float theDistance = VectorDistance((float*)&inLocation, (float*)&theLocation);
+
+				if(theDistance <= kHiveXYDistanceTolerance)
+				{
+					// Make sure this hive isn't already active
+					#ifdef AVH_SERVER
+					CBaseEntity* theEntity = AvHSUGetEntityFromIndex(*theIter);
+					ASSERT(theEntity);
+					if(theEntity->pev->team == 0)
+					{
+					#endif
+
+						theRequirementsMet = true;
+						inLocation = theLocation;
+
+					#ifdef AVH_SERVER
+					}
+					#endif
+
+					break;
+				}
+			}
+		}
+	}
+	else if(AvHSHUGetBuildRegions(inMessageID, theEntities, theDistanceRequirements, theZAdjustment, theSnapToLocation))
+	{
+		ASSERT(theEntities.size() == theDistanceRequirements.size());
+		vec3_t theBestLocation;
+
+		int i = 0;
+		float theClosestDistance = kMaxMapDimension;
+		for(EntityListType::iterator theIter = theEntities.begin(); theIter != theEntities.end(); theIter++, i++)
+		{
+			vec3_t theLocation;
+			if(AvHSHUGetEntityLocation(*theIter, theLocation))
+			{
+				// Only check xy distance
+				vec3_t theXYInLocation = inLocation;
+				vec3_t theXYTheLocation = theLocation;
+				theXYInLocation.z = 0;
+				theXYTheLocation.z = 0;
+
+				float theDistance = VectorDistance((float*)&theXYInLocation, (float*)&theXYTheLocation);
+
+				int theDistanceRequirement = theDistanceRequirements[i];
+				if((theDistance <= theDistanceRequirement) || (theDistanceRequirement == -1))
+				{
+					// Pick the closest one, in case there are multiples in range
+					if(theDistance < theClosestDistance)
+					{
+						theClosestDistance = theDistance;
+						VectorCopy(theLocation,theBestLocation);
+						theRequirementsMet = true;
+					}
+				}
+			}
+		}
+		if(theRequirementsMet && theSnapToLocation)
+		{
+			inLocation = theBestLocation;
+			inLocation.z += theZAdjustment;
+		}
+	}
+	else
+	{
+		theRequirementsMet = true;
+	}
+
+    EntityListType theBuildRadiusViolations;
+    AvHSHUGetMinBuildRadiusViolations(inMessageID, inLocation, theBuildRadiusViolations);
+
+    if (theBuildRadiusViolations.size() > 0)
+    {
+        theRequirementsMet = false;
+    }
+
+	// Anti-llama/newbie tactic: don't allow non-resource buildings to be placed such that they block access to nozzles
+	// Make sure generic building isn't being placed on top of resource nozzles
+	// tankefugl: 0000291
+	// allow equipment, rts and hives to be dropped around nodes
+	if(AvHSHUGetIsDroppableOnRTs(inMessageID) == false)
+	{
+	// :tankefugl
+		// If building is too close to an empty nozzle, don't allow it
+		float theResourceBuildingRadius, theTotalMinRadius;
+		vec3_t theMinSize, theMaxSize, theMinRadius, theFlattenedInLocation, theLocation;
+
+		theFlattenedInLocation[0] = inLocation[0];
+		theFlattenedInLocation[1] = inLocation[1];
+		theFlattenedInLocation[2] = 0;
+
+		theResourceBuildingRadius = 60;
+
+		EntityListType theEntities;
+		AvHSHUGetEntities(AVH_USER3_FUNC_RESOURCE,theEntities);
+		if(AvHSHUGetSizeForTech(inMessageID,theMinSize,theMaxSize))
+		{
+			EntityListType::iterator end = theEntities.end();
+			for(EntityListType::iterator current = theEntities.begin(); current < end; ++current)
+			{
+				if(AvHSHUGetEntityLocation(*current,theLocation))
+				{
+					//flatten to 2 dimensions
+					theLocation[2] = 0;
+
+					//space = radius of both buildings combined
+					theTotalMinRadius = theResourceBuildingRadius;
+					theTotalMinRadius += max(-min(theMinSize.x,theMinSize.y),max(theMaxSize.x,theMaxSize.y));
+
+					if(VectorDistance((float*)&theFlattenedInLocation,(float*)&theLocation) < theTotalMinRadius)
+					{
+						theRequirementsMet = false;
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	return theRequirementsMet;
+}
+
+bool AvHSHUGetBuildTechClassName(AvHMessageID inMessageID, char*& outClassName)
+{
+	bool theSuccess = true;
+
+	switch(inMessageID)
+	{
+	// Buildings
+	case BUILD_RESOURCES:
+		outClassName = kwsResourceTower;
+		break;
+
+	//case BUILD_REINFORCEMENTS:
+	//	outClassName = kwsInfantryPortal;
+	//	break;
+
+	case BUILD_INFANTRYPORTAL:
+		outClassName = kwsInfantryPortal;
+		break;
+
+	case BUILD_COMMANDSTATION:
+		outClassName = kwsTeamCommand;
+		break;
+
+	case BUILD_TURRET_FACTORY:
+		outClassName = kwsTurretFactory;
+		break;
+
+	case BUILD_ARMSLAB:
+		outClassName = kwsArmsLab;
+		break;
+
+	case BUILD_PROTOTYPE_LAB:
+		outClassName = kwsPrototypeLab;
+		break;
+
+	case BUILD_ARMORY:
+		outClassName = kwsArmory;
+		break;
+
+	case ARMORY_UPGRADE:
+		outClassName = kwsAdvancedArmory;
+		break;
+
+	case BUILD_NUKE_PLANT:
+		outClassName = kwsNukePlant;
+		break;
+
+	case BUILD_OBSERVATORY:
+		outClassName = kwsObservatory;
+		break;
+
+	case BUILD_SCAN:
+		outClassName = kwsScan;
+		break;
+
+	case BUILD_PHASEGATE:
+		outClassName = kwsPhaseGate;
+		break;
+
+	case BUILD_TURRET:
+		outClassName = kwsDeployedTurret;
+		break;
+
+	case BUILD_SIEGE:
+		outClassName = kwsSiegeTurret;
+		break;
+
+	// Equipment
+	case BUILD_HEALTH:
+		outClassName = kwsHealth;
+		break;
+
+    case BUILD_CAT:
+        outClassName = kwsCatalyst;
+        break;
+
+	case BUILD_JETPACK:
+		outClassName = kwsJetpack;
+		break;
+
+	case BUILD_HEAVY:
+		outClassName = kwsHeavyArmor;
+		break;
+
+	case BUILD_AMMO:
+		outClassName = kwsGenericAmmo;
+		break;
+
+	case BUILD_WELDER:
+		outClassName = kwsWelder;
+		break;
+
+    case BUILD_MINES:
+		outClassName = kwsMine;
+		break;
+
+	case BUILD_SHOTGUN:
+		outClassName = kwsShotGun;
+		break;
+
+	case BUILD_HMG:
+		outClassName = kwsHeavyMachineGun;
+		break;
+
+	case BUILD_NUKE:
+		outClassName = kwsNuke;
+		break;
+
+	case BUILD_GRENADE_GUN:
+		outClassName = kwsGrenadeGun;
+		break;
+
+	//case BUILD_MEDKIT:
+	//	break;
+
+	case ALIEN_BUILD_RESOURCES:
+		outClassName = kwsAlienResourceTower;
+		break;
+
+	case ALIEN_BUILD_OFFENSE_CHAMBER:
+		outClassName = kwsOffenseChamber;
+		break;
+
+	case ALIEN_BUILD_DEFENSE_CHAMBER:
+		outClassName = kwsDefenseChamber;
+		break;
+
+	case ALIEN_BUILD_SENSORY_CHAMBER:
+		outClassName = kwsSensoryChamber;
+		break;
+
+	case ALIEN_BUILD_MOVEMENT_CHAMBER:
+		outClassName = kwsMovementChamber;
+		break;
+
+	case ALIEN_BUILD_HIVE:
+		outClassName = kesTeamHive;
+		break;
+
+	default:
+		theSuccess = false;
+		break;
+	}
+
+	return theSuccess;
+}
+
+bool AvHSHUGetResearchTechName(AvHMessageID inResearchID, char*& outResearchTechName)
+{
+	bool theSuccess = true;
+
+	switch(inResearchID)
+	{
+	case RESEARCH_ELECTRICAL:
+		outResearchTechName = "research_electrical";
+		break;
+
+	case RESEARCH_ARMOR_ONE:
+		outResearchTechName = "research_armorl1";
+		break;
+
+	case RESEARCH_ARMOR_TWO:
+		outResearchTechName = "research_armorl2";
+		break;
+
+	case RESEARCH_ARMOR_THREE:
+		outResearchTechName = "research_armorl3";
+		break;
+
+	case RESEARCH_WEAPONS_ONE:
+		outResearchTechName = "research_weaponsl1";
+		break;
+
+	case RESEARCH_WEAPONS_TWO:
+		outResearchTechName = "research_weaponsl2";
+		break;
+
+	case RESEARCH_WEAPONS_THREE:
+		outResearchTechName = "research_weaponsl3";
+		break;
+
+	case ARMORY_UPGRADE:
+		outResearchTechName = "research_advarmory";
+		break;
+
+	case TURRET_FACTORY_UPGRADE:
+		outResearchTechName = "research_advturretfactory";
+		break;
+
+	case RESEARCH_JETPACKS:
+		outResearchTechName = "research_jetpacks";
+		break;
+
+	case RESEARCH_HEAVYARMOR:
+		outResearchTechName = "research_heavyarmor";
+		break;
+
+	case RESEARCH_DISTRESSBEACON:
+		outResearchTechName = "research_distressbeacon";
+		break;
+
+	case RESEARCH_HEALTH:
+		outResearchTechName = "research_health";
+		break;
+
+    case RESEARCH_CATALYSTS:
+        outResearchTechName = "research_catalysts";
+        break;
+
+	case MESSAGE_CANCEL:
+		outResearchTechName = "research_cancel";
+		break;
+
+	case RESEARCH_MOTIONTRACK:
+		outResearchTechName = "research_motiontracking";
+		break;
+
+	case RESEARCH_PHASETECH:
+		outResearchTechName = "research_phasetech";
+		break;
+
+    case RESEARCH_GRENADES:
+        outResearchTechName = "research_grenades";
+        break;
+
+	default:
+		theSuccess = false;
+		break;
+	}
+
+	return theSuccess;
+}
+
+
+bool AvHSHUGetCenterPositionForGroup(int inGroupNumber, float* inPlayerOrigin, float* outCenterPosition)
+{
+	bool theSuccess = false;
+	vec3_t thePosition;
+	float theX, theY;
+
+	#ifdef AVH_CLIENT
+	theSuccess = gHUD.GetCenterPositionForGroup(inGroupNumber, thePosition);
+	theX = thePosition[0];
+	theY = thePosition[1];
+	#endif
+
+	#ifdef AVH_SERVER
+
+	// Loop through players, find the closest player to inPlayerOrigin, to see which player is being predicted.  Is there a better way?
+	AvHPlayer* theClosestPlayer = NULL;
+	float theClosestDistance = 10000;
+
+	FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+		float theDistance = VectorDistance(theEntity->pev->origin, inPlayerOrigin);
+		if(theDistance < theClosestDistance)
+		{
+			theClosestPlayer = theEntity;
+			theClosestDistance = theDistance;
+		}
+	END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+
+	if(theClosestPlayer)
+	{
+		theSuccess = theClosestPlayer->GetCenterPositionForGroup(inGroupNumber, theX, theY);
+	}
+	#endif
+
+	if(theSuccess)
+	{
+		outCenterPosition[0] = theX;
+		outCenterPosition[1] = theY;
+	}
+
+	return theSuccess;
+}
+
+
+bool AvHSHUGetIsBuilding(AvHMessageID inMessageID)
+{
+	bool theIsBuilding = false;
+
+	switch(inMessageID)
+	{
+		// Buildings
+	case BUILD_RESOURCES:
+	case BUILD_INFANTRYPORTAL:
+	case BUILD_COMMANDSTATION:
+	case BUILD_TURRET_FACTORY:
+	case BUILD_ARMSLAB:
+	case BUILD_PROTOTYPE_LAB:
+	case BUILD_ARMORY:
+	case BUILD_NUKE_PLANT:
+	case BUILD_OBSERVATORY:
+	case BUILD_PHASEGATE:
+	case BUILD_TURRET:
+	case BUILD_SIEGE:
+
+	// Alien buildings
+	case ALIEN_BUILD_OFFENSE_CHAMBER:
+	case ALIEN_BUILD_DEFENSE_CHAMBER:
+	case ALIEN_BUILD_SENSORY_CHAMBER:
+	case ALIEN_BUILD_MOVEMENT_CHAMBER:
+	case ALIEN_BUILD_HIVE:
+		theIsBuilding = true;
+		break;
+	}
+
+	return theIsBuilding;
+}
+
+bool AvHSHUGetIsBuildTech(AvHMessageID inMessageID)
+{
+	bool theIsBuildTech = false;
+
+	switch(inMessageID)
+	{
+	// Buildings
+	case BUILD_RESOURCES:
+	case BUILD_INFANTRYPORTAL:
+	case BUILD_COMMANDSTATION:
+	case BUILD_TURRET_FACTORY:
+	case BUILD_ARMSLAB:
+	case BUILD_PROTOTYPE_LAB:
+	case BUILD_ARMORY:
+	//case UPGRADE_ADVANCED_WEAPON_FACTORY:
+	case BUILD_NUKE_PLANT:
+	case BUILD_OBSERVATORY:
+	case BUILD_SCAN:
+	case BUILD_PHASEGATE:
+	case BUILD_TURRET:
+	case BUILD_SIEGE:
+	case BUILD_HEAVY:
+	case BUILD_JETPACK:
+
+	// Equipment
+	case BUILD_AMMO:
+	case BUILD_HEALTH:
+    case BUILD_CAT:
+	case BUILD_WELDER:
+    case BUILD_MINES:
+	case BUILD_SHOTGUN:
+	case BUILD_HMG:
+	case BUILD_NUKE:
+	case BUILD_GRENADE_GUN:
+	//case BUILD_MEDKIT:
+	//case BUILD_STIMPACK:
+
+	// Alien buildings
+	case ALIEN_BUILD_OFFENSE_CHAMBER:
+	case ALIEN_BUILD_DEFENSE_CHAMBER:
+	case ALIEN_BUILD_SENSORY_CHAMBER:
+	case ALIEN_BUILD_MOVEMENT_CHAMBER:
+		theIsBuildTech = true;
+		break;
+	}
+
+	return theIsBuildTech;
+}
+
+bool AvHSHUGetIsWeaponFocusable(AvHWeaponID inWeaponID)
+{
+    bool theIsFocusable = false;
+
+    switch(inWeaponID)
+    {
+    case AVH_WEAPON_BITE:
+    case AVH_WEAPON_SPIT:
+    case AVH_WEAPON_BITE2:
+    case AVH_WEAPON_SWIPE:
+    case AVH_WEAPON_CLAWS:
+        theIsFocusable = true;
+        break;
+    }
+
+    return theIsFocusable;
+}
+
+bool AvHSHUGetDoesTechCostEnergy(AvHMessageID inMessageID)
+{
+	bool theTechCostsEnergy = false;
+
+	switch(inMessageID)
+	{
+	case BUILD_SCAN:
+		theTechCostsEnergy = true;
+		break;
+	}
+
+	return theTechCostsEnergy;
+}
+
+bool AvHSHUGetIsCombatModeTech(AvHMessageID inMessageID)
+{
+	bool theIsCombatModeTech = false;
+
+	switch(inMessageID)
+	{
+	case BUILD_SHOTGUN:
+	case BUILD_GRENADE_GUN:
+	case BUILD_HMG:
+	case BUILD_WELDER:
+	case BUILD_MINES:
+	case BUILD_JETPACK:
+	case BUILD_HEAVY:
+	case BUILD_SCAN:
+		theIsCombatModeTech = true;
+		break;
+	}
+
+	return theIsCombatModeTech;
+}
+
+bool AvHSHUGetIsResearchTech(AvHMessageID inMessageID)
+{
+	bool theIsResearchTech = false;
+
+	switch(inMessageID)
+	{
+	case RESEARCH_ELECTRICAL:
+	case RESEARCH_ARMOR_ONE:
+	case RESEARCH_ARMOR_TWO:
+	case RESEARCH_ARMOR_THREE:
+	case RESEARCH_WEAPONS_ONE:
+	case RESEARCH_WEAPONS_TWO:
+	case RESEARCH_WEAPONS_THREE:
+	case TURRET_FACTORY_UPGRADE:
+	case RESEARCH_JETPACKS:
+	case RESEARCH_HEAVYARMOR:
+	case RESEARCH_DISTRESSBEACON:
+	case RESEARCH_HEALTH:
+    case RESEARCH_CATALYSTS:
+	case MESSAGE_CANCEL:
+	case RESEARCH_MOTIONTRACK:
+	case RESEARCH_PHASETECH:
+    case RESEARCH_GRENADES:
+
+	case RESOURCE_UPGRADE:
+	case ARMORY_UPGRADE:
+		theIsResearchTech = true;
+		break;
+	}
+
+	return theIsResearchTech;
+}
+
+
+
+
+//Here's TFC's code that checks whether a player's allowed to build a sentry
+//or not.
+//I can't remember if there was any good reason why we used
+//UTIL_FindEntitiesInSphere()
+//instead of UTIL_EntitiesInBox().
+//
+////=========================================================================
+//// Returns 0 if the area around obj is safe to build in
+//int CBaseEntity::CheckArea( CBaseEntity *pIgnore )
+//{
+//	TraceResult tr;
+//	Vector vecOrg = pev->origin;
+//
+//	// Check the origin
+//	int iContents = UTIL_PointContents(vecOrg);
+//	if ( iContents != CONTENT_EMPTY && iContents != CONTENT_WATER )
+//		return CAREA_BLOCKED;
+//
+//	Vector vecIgnoreOrg = pIgnore->pev->origin;
+//	// Get the player's origin irrelevant of crouching
+//	if ( pIgnore->pev->flags & FL_DUCKING )
+//	{
+//		vecIgnoreOrg = vecIgnoreOrg + (VEC_DUCK_HULL_MIN -
+//			VEC_HULL_MIN);
+//	}
+//	// Trace a hull
+//	UTIL_TraceHull( vecIgnoreOrg, pev->origin, ignore_monsters,
+//		large_hull, edict(), &tr );
+//	CBaseEntity *pEntity = CBaseEntity::Instance(tr.pHit);
+//	if (tr.flFraction != 1 || tr.fAllSolid == 1)
+//		return CAREA_BLOCKED;
+//
+//	// Check for solid entities in the area
+//	CBaseEntity *pEnt = NULL;
+//	while ( (pEnt = UTIL_FindEntityInSphere( pEnt, pev->origin, 48 )) !=
+//		NULL )
+//	{
+//		// If it's not the engineer, and its a solid entity, fail
+//		if (pEnt != pIgnore && pEnt != this && pEnt->pev->solid >
+//			SOLID_TRIGGER)
+//			return CAREA_BLOCKED;
+//	}
+//
+//	// Cycle through all the Nobuild zones in the map and make sure this
+//	isn't in one of them
+//		CBaseEntity *pNoBuild = UTIL_FindEntityByClassname( NULL,
+//		"func_nobuild" );
+//	while ( pNoBuild )
+//	{
+//		// Check to see if we're building in this zone
+//		if ( vecOrg.x >= pNoBuild->pev->mins.x && vecOrg.y >=
+//			pNoBuild->pev->mins.y && vecOrg.z >= pNoBuild->pev->mins.z &&
+//			vecOrg.x <= pNoBuild->pev->maxs.x &&
+//			vecOrg.y <= pNoBuild->pev->maxs.y && vecOrg.z <= pNoBuild->pev->maxs.z )
+//			return CAREA_NOBUILD;
+//
+//		pNoBuild = UTIL_FindEntityByClassname( pNoBuild,
+//			"func_nobuild" );
+//	}
+//
+//	// Check below
+//	UTIL_TraceLine( vecOrg, vecOrg + Vector(0,0,-64),
+//		dont_ignore_monsters, edict(), &tr );
+//	if ( tr.flFraction == 1.0 )
+//		return CAREA_BLOCKED;
+//
+//	return CAREA_CLEAR;
+//}
+
+//bool AvHSHUGetIsEnoughRoom(const vec3_t& inCenter, const vec3_t& inMin, const vec3_t& inMax)
+//{
+//	bool theEnoughRoom = false;
+//
+//	// Do a traceline from center to center + min
+//	// Hit nothing?
+//		// Do a traceline from center to center + max
+//		// Hit nothing?
+//			// Success
+//			theEnoughRoom = true;
+//
+//	return theEnoughRoom;
+//}
+
+bool AvHSHUGetIsGroupMessage(AvHMessageID inMessageID)
+{
+	bool theIsGroupMessage = false;
+
+	switch(inMessageID)
+	{
+	case GROUP_CREATE_1:
+	case GROUP_CREATE_2:
+	case GROUP_CREATE_3:
+	case GROUP_CREATE_4:
+	case GROUP_CREATE_5:
+	case GROUP_SELECT_1:
+	case GROUP_SELECT_2:
+	case GROUP_SELECT_3:
+	case GROUP_SELECT_4:
+	case GROUP_SELECT_5:
+		theIsGroupMessage = true;
+	}
+
+	return theIsGroupMessage;
+}
+
+bool AvHSHUGetSizeForTech(AvHMessageID inMessageID, Vector& outMinSize, Vector& outMaxSize, bool inGetSizeToPlace)
+{
+	bool theSuccess = false;
+
+	// Onos-sized
+	//const int theOnosHeightNeededToSpawn = HULL3_MAXZ - HULL3_MINZ + kRespawnFudgeFactorHeight;
+	//const int theOnosWidthNeededToSpawn = HULL3_MAXY - HULL3_MINY + kRespawnFudgeFactorHeight;
+
+	// Marine-sized
+	const int theMarineHeightNeededToSpawn = HULL0_MAXZ - HULL0_MINZ + kRespawnFudgeFactorHeight;
+
+	switch(inMessageID)
+	{
+	case BUILD_INFANTRYPORTAL:
+		outMinSize = Vector(-16, -16, 0);
+		outMaxSize = Vector(16.0, 16.0, 14.49);
+
+		// Make sure there is room above it for players to spawn
+		if(inGetSizeToPlace)
+		{
+			outMaxSize.z += theMarineHeightNeededToSpawn;
+		}
+
+		theSuccess = true;
+		break;
+
+	case BUILD_PHASEGATE:
+		outMinSize = Vector(-16, -16, 0);
+		outMaxSize = Vector(16.0, 16.0, 14.49);
+
+		// Make sure there is remove above it for players to spawn
+		if(inGetSizeToPlace)
+		{
+			//outMinSize.x = outMinSize.y = -theOnosWidthNeededToSpawn;
+			//outMaxSize.x = outMaxSize.y = theOnosWidthNeededToSpawn;
+			//outMaxSize.z += theOnosHeightNeededToSpawn;
+			outMaxSize.z += theMarineHeightNeededToSpawn;
+		}
+
+		theSuccess = true;
+		break;
+
+	case BUILD_RESOURCES:
+		outMinSize = kResourceMinSize;
+		outMaxSize = kResourceMaxSize;
+		theSuccess = true;
+		break;
+
+	case ALIEN_BUILD_RESOURCES:
+		outMinSize = kAlienResourceMinSize;
+		outMaxSize = kAlienResourceMaxSize;
+		theSuccess = true;
+		break;
+
+	default:
+		outMinSize = Vector(-16, -16, 0);
+		outMaxSize = Vector(16.0, 16.0, 66.9486);
+		theSuccess = true;
+		break;
+
+	case BUILD_TURRET:
+		outMinSize = Vector(-16, -16, 0);
+		outMaxSize = Vector(16.0, 16.0, 42.0);
+		theSuccess = true;
+		break;
+
+	case ALIEN_BUILD_OFFENSE_CHAMBER:
+	case ALIEN_BUILD_DEFENSE_CHAMBER:
+	case ALIEN_BUILD_SENSORY_CHAMBER:
+	case ALIEN_BUILD_MOVEMENT_CHAMBER:
+		outMinSize = Vector(-16, -16, 0);
+		outMaxSize = Vector(16.0, 16.0, 44.0);
+		theSuccess = true;
+		break;
+
+	case BUILD_COMMANDSTATION:
+		outMinSize = Vector(-16, -16, 0);
+		outMaxSize = Vector(16.0, 16.0, 70.34);
+		theSuccess = true;
+		break;
+
+	case BUILD_TURRET_FACTORY:
+		outMinSize = Vector(-16, -16, 0);
+		//outMaxSize = Vector(16.0, 16.0, 55.68);
+		outMaxSize = Vector(16.0, 16.0, 62.1931);
+		theSuccess = true;
+		break;
+
+	case BUILD_ARMORY:
+		outMinSize = Vector(-16, -16, 0);
+		outMaxSize = Vector(16.0, 16.0, 62.1931);
+		theSuccess = true;
+		break;
+
+	case BUILD_PROTOTYPE_LAB:
+		outMinSize = Vector(-16, -16, 0);
+		outMaxSize = Vector(16.0, 16.0, 67.7443);
+		theSuccess = true;
+		break;
+
+	case BUILD_OBSERVATORY:
+		outMinSize = Vector(-16, -16, 0);
+		outMaxSize = Vector(16.0, 16.0, 80.7443);
+		theSuccess = true;
+		break;
+
+	case BUILD_SIEGE:
+		outMinSize = Vector(-16, -16, 0);
+		outMaxSize = Vector(16.0, 16.0, 62.1931/*50.6678*/);
+		theSuccess = true;
+		break;
+
+	case BUILD_HEALTH:
+		outMinSize = kHealthMinSize;
+		outMaxSize = kHealthMaxSize;
+		theSuccess = true;
+		break;
+
+    case BUILD_CAT:
+		outMinSize = kCatalystMinSize;
+		outMaxSize = kCatalystMaxSize;
+		theSuccess = true;
+		break;
+
+	case BUILD_HEAVY:
+		outMinSize = kHeavyMinSize;
+		outMaxSize = kHeavyMaxSize;
+		theSuccess = true;
+		break;
+
+	case BUILD_JETPACK:
+		outMinSize = kJetpackMinSize;
+		outMaxSize = kJetpackMaxSize;
+		theSuccess = true;
+		break;
+
+	case BUILD_AMMO:
+		outMinSize = kAmmoMinSize;
+		outMaxSize = kAmmoMaxSize;
+		theSuccess = true;
+		break;
+
+	case BUILD_MINES:
+		outMinSize = kWeaponMinSize;
+		outMaxSize = Vector(16, 16, 40);
+		theSuccess = true;
+		break;
+
+	case BUILD_SHOTGUN:
+	case BUILD_HMG:
+	case BUILD_WELDER:
+	case BUILD_NUKE:
+	case BUILD_GRENADE_GUN:
+		outMinSize = kWeaponMinSize;
+		outMaxSize = kWeaponMaxSize;
+		theSuccess = true;
+		break;
+
+	case ALIEN_BUILD_HIVE:
+		outMinSize = kHiveMinSize;
+		outMaxSize = kHiveMaxSize;
+		theSuccess = true;
+		break;
+	}
+
+	return theSuccess;
+}
+
+bool AvHSHUGetSizeForPlayerUser3(AvHUser3 inUser3, Vector& outMinSize, Vector& outMaxSize, bool inDucking)
+{
+	bool theSuccess = false;
+
+	// Now set size
+	switch(inUser3)
+	{
+	case AVH_USER3_NONE:
+	case AVH_USER3_MARINE_PLAYER:
+	case AVH_USER3_COMMANDER_PLAYER:
+	case AVH_USER3_ALIEN_PLAYER4:
+		// Get simple case working first
+		if(inDucking)
+		{
+			outMinSize = HULL1_MIN;
+			outMaxSize = HULL1_MAX;
+		}
+		else
+		{
+			outMinSize = HULL0_MIN;
+			outMaxSize = HULL0_MAX;
+		}
+		theSuccess = true;
+		break;
+
+	case AVH_USER3_ALIEN_PLAYER1:
+	case AVH_USER3_ALIEN_PLAYER2:
+	case AVH_USER3_ALIEN_PLAYER3:
+	case AVH_USER3_ALIEN_EMBRYO:
+		outMinSize = HULL1_MIN;
+		outMaxSize = HULL1_MAX;
+		theSuccess = true;
+		break;
+
+	case AVH_USER3_ALIEN_PLAYER5:
+		if(inDucking)
+		{
+			outMinSize = HULL0_MIN;
+			outMaxSize = HULL0_MAX;
+		}
+		else
+		{
+			outMinSize = HULL3_MIN;
+			outMaxSize = HULL3_MAX;
+		}
+		theSuccess = true;
+		break;
+	}
+
+	return theSuccess;
+}
+
+bool AvHSHUGetSizeForUser3(AvHUser3 inUser3, Vector& outMinSize, Vector& outMaxSize)
+{
+	bool theSuccess = false;
+
+	// If it's a player, get max size he can be (assuming he's not ducking)
+	theSuccess = AvHSHUGetSizeForPlayerUser3(inUser3, outMinSize, outMaxSize, false);
+	if(!theSuccess)
+	{
+		AvHMessageID theMessageID = MESSAGE_NULL;
+
+		// Convert it to a AvHMessageID if possible
+		if(AvHSHUUser3ToMessageID(inUser3, theMessageID))
+		{
+			theSuccess = AvHSHUGetSizeForTech(theMessageID, outMinSize, outMaxSize);
+		}
+	}
+
+	return theSuccess;
+}
+
+bool AvHSHUUser3ToMessageID(AvHUser3 inUser3, AvHMessageID& outMessageID)
+{
+	AvHMessageID theMessageID = MESSAGE_NULL;
+	bool theSuccess = false;
+
+	switch(inUser3)
+	{
+	case AVH_USER3_FUNC_RESOURCE:
+	case AVH_USER3_RESTOWER:
+		theMessageID = BUILD_RESOURCES;
+		break;
+
+	case AVH_USER3_COMMANDER_STATION:
+		theMessageID = BUILD_COMMANDSTATION;
+		break;
+
+	case AVH_USER3_TURRET_FACTORY:
+	case AVH_USER3_ADVANCED_TURRET_FACTORY:
+		theMessageID = BUILD_TURRET_FACTORY;
+		break;
+
+	case AVH_USER3_ARMORY:
+	case AVH_USER3_ADVANCED_ARMORY:
+		theMessageID = BUILD_ARMORY;
+		break;
+
+	case AVH_USER3_ARMSLAB:
+		theMessageID = BUILD_ARMSLAB;
+		break;
+
+	case AVH_USER3_PROTOTYPE_LAB:
+		theMessageID = BUILD_PROTOTYPE_LAB;
+		break;
+
+	case AVH_USER3_OBSERVATORY:
+		theMessageID = BUILD_OBSERVATORY;
+		break;
+
+	case AVH_USER3_TURRET:
+		theMessageID = BUILD_TURRET;
+		break;
+
+	case AVH_USER3_SIEGETURRET:
+		theMessageID = BUILD_SIEGE;
+		break;
+
+	case AVH_USER3_INFANTRYPORTAL:
+		theMessageID = BUILD_INFANTRYPORTAL;
+		break;
+
+	case AVH_USER3_PHASEGATE:
+		theMessageID = BUILD_PHASEGATE;
+		break;
+
+	case AVH_USER3_HEAVY:
+		theMessageID = BUILD_HEAVY;
+		break;
+
+	case AVH_USER3_JETPACK:
+		theMessageID = BUILD_JETPACK;
+		break;
+
+	case AVH_USER3_DEFENSE_CHAMBER:
+		theMessageID = ALIEN_BUILD_DEFENSE_CHAMBER;
+		break;
+
+	case AVH_USER3_MOVEMENT_CHAMBER:
+		theMessageID = ALIEN_BUILD_MOVEMENT_CHAMBER;
+		break;
+
+	case AVH_USER3_OFFENSE_CHAMBER:
+		theMessageID = ALIEN_BUILD_OFFENSE_CHAMBER;
+		break;
+
+	case AVH_USER3_SENSORY_CHAMBER:
+		theMessageID = ALIEN_BUILD_SENSORY_CHAMBER;
+		break;
+
+	case AVH_USER3_ALIENRESTOWER:
+		theMessageID = ALIEN_BUILD_RESOURCES;
+		break;
+
+	case AVH_USER3_HIVE:
+		theMessageID = ALIEN_BUILD_HIVE;
+		break;
+
+	case AVH_USER3_ALIEN_PLAYER1:
+		theMessageID = ALIEN_LIFEFORM_ONE;
+		break;
+
+	case AVH_USER3_ALIEN_PLAYER2:
+		theMessageID = ALIEN_LIFEFORM_TWO;
+		break;
+
+	case AVH_USER3_ALIEN_PLAYER3:
+		theMessageID = ALIEN_LIFEFORM_THREE;
+		break;
+
+	case AVH_USER3_ALIEN_PLAYER4:
+		theMessageID = ALIEN_LIFEFORM_FOUR;
+		break;
+
+	case AVH_USER3_ALIEN_PLAYER5:
+		theMessageID = ALIEN_LIFEFORM_FIVE;
+		break;
+	}
+
+	if(theMessageID != MESSAGE_NULL)
+	{
+		outMessageID = theMessageID;
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+bool AvHSHUMessageIDToUser3(AvHMessageID inMessageID, AvHUser3& outUser3)
+{
+	bool theSuccess = false;
+
+	AvHUser3 theUser3 = AVH_USER3_NONE;
+
+	switch(inMessageID)
+	{
+	case BUILD_RESOURCES:
+		theUser3 = AVH_USER3_RESTOWER;
+		break;
+
+	case BUILD_COMMANDSTATION:
+		theUser3 = AVH_USER3_COMMANDER_STATION;
+		break;
+
+	case BUILD_TURRET_FACTORY:
+		theUser3 = AVH_USER3_TURRET_FACTORY;
+		break;
+
+	case TURRET_FACTORY_UPGRADE:
+		theUser3 = AVH_USER3_ADVANCED_TURRET_FACTORY;
+		break;
+
+	case BUILD_ARMORY:
+		theUser3 = AVH_USER3_ARMORY;
+		break;
+
+	case ARMORY_UPGRADE:
+		theUser3 = AVH_USER3_ADVANCED_ARMORY;
+		break;
+
+	case BUILD_ARMSLAB:
+		theUser3 = AVH_USER3_ARMSLAB;
+		break;
+
+	case BUILD_PROTOTYPE_LAB:
+		theUser3 = AVH_USER3_PROTOTYPE_LAB;
+		break;
+
+	case BUILD_OBSERVATORY:
+		theUser3 = AVH_USER3_OBSERVATORY;
+		break;
+
+	case BUILD_TURRET:
+		theUser3 = AVH_USER3_TURRET;
+		break;
+
+	case BUILD_SIEGE:
+		theUser3 = AVH_USER3_SIEGETURRET;
+		break;
+
+	case BUILD_INFANTRYPORTAL:
+		theUser3 = AVH_USER3_INFANTRYPORTAL;
+		break;
+
+	case BUILD_PHASEGATE:
+		theUser3 = AVH_USER3_PHASEGATE;
+		break;
+
+	case BUILD_HEAVY:
+		theUser3 = AVH_USER3_HEAVY;
+		break;
+
+	case BUILD_JETPACK:
+		theUser3 = AVH_USER3_JETPACK;
+		break;
+
+	// Menus
+	case MENU_BUILD:
+		theUser3 = AVH_USER3_MENU_BUILD;
+		break;
+	case MENU_BUILD_ADVANCED:
+		theUser3 = AVH_USER3_MENU_BUILD_ADVANCED;
+		break;
+	case MENU_ASSIST:
+		theUser3 = AVH_USER3_MENU_ASSIST;
+		break;
+	case MENU_EQUIP:
+		theUser3 = AVH_USER3_MENU_EQUIP;
+		break;
+
+	// Weapons
+	case BUILD_MINES:
+		theUser3 = AVH_USER3_MINE;
+		break;
+
+	// Lifeforms
+	case ALIEN_LIFEFORM_ONE:
+		theUser3 = AVH_USER3_ALIEN_PLAYER1;
+		break;
+
+	case ALIEN_LIFEFORM_TWO:
+		theUser3 = AVH_USER3_ALIEN_PLAYER2;
+		break;
+
+	case ALIEN_LIFEFORM_THREE:
+		theUser3 = AVH_USER3_ALIEN_PLAYER3;
+		break;
+
+	case ALIEN_LIFEFORM_FOUR:
+		theUser3 = AVH_USER3_ALIEN_PLAYER4;
+		break;
+
+	case ALIEN_LIFEFORM_FIVE:
+		theUser3 = AVH_USER3_ALIEN_PLAYER5;
+		break;
+	}
+
+	if(theUser3 != AVH_USER3_NONE)
+	{
+		outUser3 = theUser3;
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+
+float AvHSHUGetTime()
+{
+	float theTime = 0;
+
+	#ifdef AVH_SERVER
+	theTime = gpGlobals->time;
+	#else
+	theTime = gEngfuncs.GetClientTime();
+	#endif
+
+	return theTime;
+}
+
+
+
+// Note, all these models must be precached already
+char* AvHSHUGetBuildTechModelName(AvHMessageID inMessageID)
+{
+	char* theModelName = NULL;
+
+	switch(inMessageID)
+	{
+	case BUILD_RESOURCES:
+		theModelName = kResourceTowerModel;
+		break;
+
+	//case BUILD_REINFORCEMENTS:
+	//	theModelName = kInfantryPortalModel;
+	//	break;
+
+	case BUILD_INFANTRYPORTAL:
+		theModelName = kInfantryPortalModel;
+		break;
+
+	case BUILD_COMMANDSTATION:
+		theModelName = kCommandStationModel;
+		break;
+
+	case BUILD_TURRET_FACTORY:
+		theModelName = kTurretFactoryModel;
+		break;
+
+	case BUILD_ARMSLAB:
+		theModelName = kArmsLabModel;
+		break;
+
+	case BUILD_PROTOTYPE_LAB:
+		theModelName = kPrototypeLabModel;
+		break;
+
+	case BUILD_ARMORY:
+		theModelName = kArmoryModel;
+		break;
+
+	case ARMORY_UPGRADE:
+		theModelName = kAdvancedWeaponFactoryModel;
+		break;
+
+	case BUILD_OBSERVATORY:
+		theModelName = kObservatoryModel;
+		break;
+
+	case BUILD_SCAN:
+		theModelName = kScanModel;
+		break;
+
+	case BUILD_PHASEGATE:
+		theModelName = kPhaseGateModel;
+		break;
+
+	case BUILD_TURRET:
+		theModelName = kDeployedTurretModel;
+		break;
+
+	case BUILD_NUKE:
+		theModelName = kNukeModel;
+		break;
+
+	case BUILD_SIEGE:
+		theModelName = kSiegeTurretModel;
+		//theModelName = kDeployedTurretModel;
+		break;
+
+    case BUILD_CAT:
+        theModelName = kCatalystModel;
+        break;
+
+	case BUILD_HEALTH:
+		theModelName = kHealthModel;
+		break;
+
+	case BUILD_HEAVY:
+		theModelName = kHeavyModel;
+		break;
+
+	case BUILD_JETPACK:
+		theModelName = kJetpackModel;
+		break;
+
+	case BUILD_AMMO:
+		theModelName = kAmmoModel;
+		break;
+
+	case BUILD_WELDER:
+		theModelName = kWelderWModel;
+		break;
+
+	case BUILD_MINES:
+		theModelName = kTripmineW2Model;
+		break;
+
+	case BUILD_SHOTGUN:
+		theModelName = kSGWModel;
+		break;
+
+	case BUILD_HMG:
+		theModelName = kHMGWModel;
+		break;
+
+	case BUILD_GRENADE_GUN:
+		theModelName = kGGWModel;
+		break;
+
+	// Alien buildings
+	case ALIEN_BUILD_HIVE:
+		theModelName = kHiveModel;
+		break;
+
+	case ALIEN_BUILD_RESOURCES:
+		theModelName = kAlienResourceTowerModel;
+		break;
+
+	case ALIEN_BUILD_OFFENSE_CHAMBER:
+		theModelName = kOffenseChamberModel;
+		break;
+
+	case ALIEN_BUILD_DEFENSE_CHAMBER:
+		theModelName = kDefenseChamberModel;
+		break;
+
+	case ALIEN_BUILD_SENSORY_CHAMBER:
+		theModelName = kSensoryChamberModel;
+		break;
+
+	case ALIEN_BUILD_MOVEMENT_CHAMBER:
+		theModelName = kMovementChamberModel;
+		break;
+	}
+
+	return theModelName;
+}
+
+bool AvHSHUGetBuildTechRange(AvHMessageID inMessageID, float& outRange)
+{
+	bool theSuccess = false;
+
+	//	switch(inMessageID)
+	//	{
+	//	case BUILD_CAMERA:
+	//		outRange = kResourceTowerSightRange;
+	//		theSuccess = true;
+	//		break;
+	//	case BUILD_PHASEGATE:
+	//		break;
+	//	case BUILD_TURRET:
+	//		outRange = TURRET_RANGE;
+	//		theSuccess = true;
+	//		break;
+	//	case BUILD_SIEGE:
+	//		outRange = kSiegeTurretMaxRange;
+	//		theSuccess = true;
+	//		break;
+	//	}
+
+	return theSuccess;
+}
+
+bool AvHSHUTraceLineIsAreaFree(Vector& inStart, Vector& inEnd, edict_t* inIgnoreEntity, bool inIgnorePlayers)
+{
+	bool theAreaIsFree = true;
+
+#ifdef AVH_SERVER
+	TraceResult theTR;
+	bool theIsDone = false;
+
+	// Do tracelines between the corners, to make sure there's no geometry inside the box
+	int theNumIters = 0;
+
+    IGNORE_MONSTERS theIgnoreMonsters = dont_ignore_monsters;
+
+    if (inIgnorePlayers)
+    {
+        theIgnoreMonsters = ignore_monsters;
+    }
+
+	while(!theIsDone)
+	{
+		UTIL_TraceLine(inStart, inEnd, theIgnoreMonsters, inIgnoreEntity, &theTR);
+		if(theTR.flFraction != 1.0f)
+		{
+			CBaseEntity* theEntity = CBaseEntity::Instance(ENT(theTR.pHit));
+			if(theEntity && (theEntity->pev->solid != SOLID_BBOX) && (theEntity->pev->solid != SOLID_SLIDEBOX) && (theEntity->pev->solid != SOLID_BSP) && (inIgnorePlayers != !!theEntity->IsPlayer()) )
+			{
+				VectorCopy(theTR.vecEndPos, inStart);
+			}
+			else
+			{
+				theIsDone = true;
+				theAreaIsFree = false;
+			}
+		}
+		else
+		{
+			theIsDone = true;
+		}
+
+		if(theNumIters++ > 50)
+		{
+			theIsDone = true;
+			theAreaIsFree = false;
+		}
+	}
+#endif
+
+//	int theIndex;
+//	vec3_t theEndLocation;
+//	AvHTeamNumber theTeam;
+//	bool thePlayerHit;
+//	int theUserThree;
+//	int theUserFour;
+//
+//	if(AvHSHUTraceTangible(inStart, inEnd, theIndex, theEndLocation, theTeam, thePlayerHit, theUserThree, theUserFour))
+//	{
+//		if(theIndex >= 0)
+//		{
+//			theAreaIsFree = false;
+//		}
+//	}
+
+	return theAreaIsFree;
+}
+
+float AvHTraceLineAgainstWorld(Vector& vecStart, Vector& vecEnd)
+{
+
+#ifdef AVH_SERVER
+
+    TraceResult tr;
+    UTIL_TraceLine(vecStart, vecEnd, ignore_monsters, dont_ignore_glass, NULL, &tr);
+
+    return tr.flFraction;
+
+#endif
+
+#ifdef AVH_CLIENT
+
+    // This may not be the most efficient way, but it seems to get the job done.
+
+    float theFraction = 1;
+
+    for (int i = 0; i < kMaxEntities && theFraction > 0; ++i)
+    {
+
+        cl_entity_t* theEntity = gEngfuncs.GetEntityByIndex(i);
+
+        if (theEntity != NULL && theEntity->model != NULL && theEntity->model->type == mod_brush)
+        {
+
+            vec3_t localStart;
+            vec3_t localEnd;
+
+            // Translate the start and end into the model's frame of reference.
+
+            VectorSubtract(vecStart, theEntity->origin, localStart);
+            VectorSubtract(vecEnd, theEntity->origin, localEnd);
+
+            // Rotate the start and end into the model's frame of reference.
+
+            if (theEntity->angles[0] ||
+                theEntity->angles[1] ||
+                theEntity->angles[2])
+            {
+
+                vec3_t forward;
+                vec3_t right;
+                vec3_t up;
+
+                AngleVectors(theEntity->angles, forward, right, up);
+
+                vec3_t temp;
+
+                VectorCopy(localStart, temp);
+                localStart[0] =  DotProduct(temp, forward);
+                localStart[1] = -DotProduct(temp, right);
+                localStart[2] =  DotProduct(temp, up);
+
+                VectorCopy(localEnd, temp);
+                localEnd[0] =  DotProduct(temp, forward);
+                localEnd[1] = -DotProduct(temp, right);
+                localEnd[2] =  DotProduct(temp, up);
+
+            }
+
+            trace_t tr;
+            NS_TraceLine(&theEntity->model->hulls[0], localStart, localEnd, &tr);
+
+            if (tr.fraction < theFraction)
+            {
+                theFraction = tr.fraction;
+            }
+
+        }
+
+    }
+
+    return theFraction;
+
+#endif
+
+}
+
+
+bool AvHSHUGetCanBeBuiltOnPlayers(AvHMessageID inMessageID)
+{
+	bool theCanBeBuiltOnPlayers = false;
+
+	switch(inMessageID)
+	{
+		case ALIEN_BUILD_HIVE:
+		case BUILD_SCAN:
+		case BUILD_AMMO:
+		case BUILD_HEALTH:
+		case BUILD_CAT:
+		case BUILD_MINES:
+		case BUILD_WELDER:
+		case BUILD_SHOTGUN:
+		case BUILD_HMG:
+		case BUILD_GRENADE_GUN:
+		case BUILD_HEAVY:
+		case BUILD_JETPACK:
+			theCanBeBuiltOnPlayers = true;
+			break;
+	}
+
+	return theCanBeBuiltOnPlayers;
+}
+
+bool AvHSHUGetIsSiteValidForBuild(AvHMessageID inMessageID, Vector* inLocation, int inIgnoredEntityIndex)
+{
+	//TODO: - check entity returned by client side commander trace for drop validity before we ever get this far
+
+	bool theSuccess = false;
+
+	// Check that there's enough room for building
+	vec3_t theMinSize, theMaxSize;
+	if(AvHSHUGetSizeForTech(inMessageID, theMinSize, theMaxSize, true))
+	{
+
+		// If it's a build with special placement requirements, check that here (this could modify the location also)
+		if(AvHSHUGetAreSpecialBuildingRequirementsMet(inMessageID, *inLocation))
+		{
+
+			// Assume mappers place hives correctly (it's such a showstopper if aliens can't create a hive because it's too close to a wall)
+			// KGP 4/28/04 - add res towers to hives for the same reason -- if a mapper didn't give room, it's a showstopper.
+			bool theIgnorePlayers = AvHSHUGetCanBeBuiltOnPlayers(inMessageID);
+			float theSlopeTangent = theIgnorePlayers ? kMaxEquipmentDropSlope : kMaxBuildingDropSlope;
+			bool theSkipDropCheck = false;
+			switch(inMessageID)
+			{
+				case BUILD_RESOURCES:
+					theSkipDropCheck = true;
+					break;
+				case ALIEN_BUILD_RESOURCES:
+					theSkipDropCheck = true;
+					break;
+				case ALIEN_BUILD_HIVE:
+					theSkipDropCheck = true;
+					break;
+			}
+			if(theSkipDropCheck || AvHSHUGetCanDropItem(*inLocation, theMinSize, theMaxSize, theSlopeTangent, inIgnoredEntityIndex, theIgnorePlayers))
+			{
+				//TODO: - better check for entity below drop, since it's often off center.
+				// Check to make sure building isn't being created on top of another building
+				vec3_t thePositionBelowBuild = *inLocation;
+				thePositionBelowBuild.z = -kMaxMapDimension;
+
+				int theIndex;
+				vec3_t theEndLocation;
+				AvHTeamNumber theTeam;
+				bool thePlayerHit;
+				int theUserThree;
+				int theUserFour;
+
+				// Don't allow building on any entities, except allow resource towers on top of func_resources
+
+				//TODO : use full list instead of physents, which isn't accounting for items the commander can't see
+				bool theHitSomething = AvHSHUTraceTangible(*inLocation, thePositionBelowBuild, theIndex, theEndLocation, theTeam, thePlayerHit, theUserThree, theUserFour);
+
+				//res building case
+				if(inMessageID == BUILD_RESOURCES || inMessageID == ALIEN_BUILD_RESOURCES)
+				{
+#ifdef AVH_SERVER	//on server, return false if occupied
+					FOR_ALL_ENTITIES(kesFuncResource,AvHFuncResource*)
+                        if(!theEntity->GetIsOccupied()) // open for use
+						{
+							if(VectorDistance(theEntity->pev->origin,*inLocation) < 20) //small enough that we don't check the wrong nozzle
+							{
+								theSuccess = (!theHitSomething || theIndex <= 0 || theUserThree == AVH_USER3_FUNC_RESOURCE);
+								break;
+							}
+						}
+					END_FOR_ALL_ENTITIES(kesFuncResource)
+#else //on client the occupied function isn't available
+					theSuccess = (!theHitSomething || theIndex <= 0 || theUserThree == AVH_USER3_FUNC_RESOURCE);
+#endif
+				}
+				else if ( inMessageID == ALIEN_BUILD_HIVE ) 
+				{
+					theSuccess = true;
+					//theSuccess = ( !theHitSomething || ( *inLocation[2] - theEndLocation[2] > 40.0f ) );
+//#ifdef AVH_SERVER
+//					ALERT(at_console, "theHitSomething=%d theSuccess=%d\n", theHitSomething, theSuccess);
+//					ALERT(at_console, "%f\n", *inLocation[2] - theEndLocation[2]);
+//					ALERT(at_console, "{%f, %f, %f} : { %f, %f, %f }\n", 
+//						inLocation[0], inLocation[1], inLocation[2], 
+//						theEndLocation[0], theEndLocation[1], theEndLocation[2]);
+//#endif
+				}
+				else if(!theHitSomething || (theIgnorePlayers && thePlayerHit) || theIndex <= 0)
+				{
+					// THEN it's a legal build spot and the building shows up green.
+					theSuccess = true;
+				}
+			}
+		}
+	}
+	return theSuccess;
+}
+
+int AvHSHUGetPointContents(vec3_t inPoint)
+{
+	int thePointContents = 0;
+
+	#ifdef AVH_SERVER
+	thePointContents = UTIL_PointContents(inPoint);
+	#endif
+
+	#ifdef AVH_CLIENT
+	gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction( false, true );
+	gEngfuncs.pEventAPI->EV_PushPMStates();
+	gEngfuncs.pEventAPI->EV_SetSolidPlayers(-1);
+	gEngfuncs.pEventAPI->EV_SetTraceHull(2);
+
+	thePointContents = gEngfuncs.PM_PointContents(inPoint, NULL);
+
+	gEngfuncs.pEventAPI->EV_PopPMStates();
+	#endif
+
+	return thePointContents;
+}
+
+ /*
+ * Check to see if the build or item is overlapping the world.
+ */
+bool AvHSHUGetIsVolumeContentNonsolid(vec3_t inCenter, Vector& inMinSize, Vector& inMaxSize, edict_t* inIgnoreEntity, bool inIgnorePlayers)
+{
+
+	float theMins[3], theMaxs[3];
+	VectorAdd(inCenter,inMinSize,theMins);
+	VectorAdd(inCenter,inMaxSize,theMaxs);
+
+	bool theIsNonsolid = true; //innocent until proven guilty
+
+	extern playermove_t *pmove;
+    if (pmove != NULL && pmove->physents[0].model != NULL)
+    {
+		const hull_t* theHull = &pmove->physents[0].model->hulls[NS_GetValveHull(2)];
+		int theContents = NS_BoxContents(theHull,theHull->firstclipnode,theMins,theMaxs);
+		theIsNonsolid = (theContents != CONTENT_SOLID);
+	}
+    else //fallback if we're just starting a round
+    {
+        int theContents = AvHSHUGetPointContents(inCenter);
+		if(theContents != CONTENT_SOLID)
+		{
+			//trace between each corner pair once looking for obstructions - 28 total comparisons
+			const static int MIN = 0;
+			const static int MAX = 1;
+			const static int NUM_CORNERS = 8;
+			int theIndex;
+			Vector theCorners[NUM_CORNERS];
+
+			for(int XPos = MIN; XPos <= MAX; ++XPos)
+			{
+				for(int YPos = MIN; YPos <= MAX; ++YPos)
+				{
+					for(int ZPos = MIN; ZPos <= MAX; ++ZPos)
+					{
+						theIndex = XPos+YPos*2+ZPos*4;
+						theCorners[theIndex].x = inCenter.x + ((XPos == MIN) ? inMinSize.x : inMaxSize.x);
+						theCorners[theIndex].y = inCenter.y + ((YPos == MIN) ? inMinSize.y : inMaxSize.y);
+						theCorners[theIndex].z = inCenter.z + ((ZPos == MIN) ? inMinSize.z : inMaxSize.z);
+					}
+				}
+			}
+
+			for(int startCorner = 0; startCorner < NUM_CORNERS; ++startCorner)
+			{
+				for(int endCorner = startCorner+1; endCorner < NUM_CORNERS; ++endCorner)
+				{
+					if(!AvHSHUTraceLineIsAreaFree(theCorners[startCorner],theCorners[endCorner],inIgnoreEntity,inIgnorePlayers))
+					{
+						theIsNonsolid = false;
+						break;
+					}
+				}
+				if(!theIsNonsolid)
+				{
+					break;
+				}
+			}
+		}
+		else
+		{
+			theIsNonsolid = false;
+		}
+	}
+	return theIsNonsolid;
+}
+
+bool AvHSHUGetIsAreaFree(vec3_t inCenter, Vector& inMinSize, Vector& inMaxSize, edict_t* inIgnoreEntity, bool inIgnorePlayers)
+{
+	bool theAreaIsFree = AvHSHUGetIsVolumeContentNonsolid(inCenter,inMinSize,inMaxSize,inIgnoreEntity,inIgnorePlayers);
+
+	if(theAreaIsFree)
+	{
+		theAreaIsFree = !AvHSHUGetEntitiesBlocking(inCenter, inMinSize, inMaxSize, inIgnoreEntity, inIgnorePlayers);
+	}
+
+	return theAreaIsFree;
+}
+
+bool AvHSHUGetEntitiesBlocking(Vector& inOrigin, Vector& inMinSize, Vector& inMaxSize, edict_t* inIgnoreEntity, bool inIgnorePlayers)
+{
+	bool theEntBlocking = false;
+
+	typedef vector< pair<int, Vector> > PhysEntListType;
+	PhysEntListType theEntList;
+
+	const int kSearchRadius = 800;
+
+	// Populate phys ent list
+	#ifdef AVH_SERVER
+	CBaseEntity* theEntity = NULL;
+	while ((theEntity = UTIL_FindEntityInSphere(theEntity, inOrigin, kSearchRadius)) != NULL)
+	{
+
+        // If entity is visible non-world object, add it
+		if((theEntity->pev->team != TEAM_IND) && (theEntity->pev->solid != SOLID_NOT && theEntity->pev->solid != SOLID_TRIGGER))
+		{
+
+            AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntity);
+
+            if(theEntity->edict() != inIgnoreEntity && !(thePlayer != NULL && inIgnorePlayers))
+			{
+				theEntList.push_back(make_pair(theEntity->pev->iuser3, theEntity->pev->origin));
+			}
+			else
+			{
+				int a = 0;
+			}
+		}
+	}
+	#endif
+
+	#ifdef AVH_CLIENT
+	// Haven't implemented this, so depend on it not being passed in
+	ASSERT(inIgnoreEntity == NULL);
+
+	for(int i = 0; i < pmove->numphysent; i++)
+	{
+		physent_t* thePhysEnt = pmove->physents + i;
+		if((thePhysEnt->team != TEAM_IND) && (thePhysEnt->solid != SOLID_NOT && thePhysEnt->solid != SOLID_TRIGGER))
+		{
+			theEntList.push_back(make_pair(thePhysEnt->iuser3, thePhysEnt->origin));
+		}
+	}
+	#endif
+
+	Vector theAbsMax;
+	VectorAdd(inOrigin, inMaxSize, theAbsMax);
+
+	Vector theAbsMin;
+	VectorAdd(inOrigin, inMinSize, theAbsMin);
+
+	Vector theOrigin1;
+	VectorAdd(theAbsMax, theAbsMin, theOrigin1);
+	theOrigin1 = theOrigin1*.5f;
+
+	Vector theSize1;
+	VectorSubtract(theAbsMax, theAbsMin, theSize1);
+	theSize1 = theSize1*.5f;
+
+	// Do collision on list, making sure none are too close to inOrigin
+	for(PhysEntListType::iterator theIter = theEntList.begin(); theIter != theEntList.end(); theIter++)
+	{
+		// Get size for tech
+		Vector theMinSize, theMaxSize;
+		if(AvHSHUGetSizeForUser3(AvHUser3(theIter->first), theMinSize, theMaxSize))
+		{
+			Vector theEntOrigin = theIter->second;
+
+			Vector theAbsMax;
+			VectorAdd(theEntOrigin, theMaxSize, theAbsMax);
+
+			Vector theAbsMin;
+			VectorAdd(theEntOrigin, inMinSize, theAbsMin);
+
+			Vector theOrigin2;
+			VectorAdd(theAbsMax, theAbsMin, theOrigin2);
+			theOrigin2 = theOrigin2*.5f;
+
+			Vector theSize2;
+			VectorSubtract(theAbsMax, theAbsMin, theSize2);
+			theSize2 = theSize2*.5f;
+
+			// Do simple box collision here
+			if(NS_BoxesOverlap((float*)theOrigin1, (float*)theSize1, (float*)theOrigin2, (float*)theSize2))
+			{
+				theEntBlocking = true;
+				break;
+			}
+		}
+	}
+
+	return theEntBlocking;
+}
+
+
+
+void AvHSHUMakeViewFriendlyKillerName(string& ioKillerName)
+{
+	string theOutputName = ioKillerName;
+	int theStrLen = ioKillerName.length();
+
+	if(!strncmp(ioKillerName.c_str(), "weapon_", 7))
+	{
+		theOutputName = ioKillerName.substr(7);
+	}
+	else if(!strncmp(ioKillerName.c_str(), "monster_", 8))
+	{
+		theOutputName = ioKillerName.substr(8);
+	}
+	else if(!strncmp(ioKillerName.c_str(), "func_", 5))
+	{
+		theOutputName = ioKillerName.substr(5);
+	}
+
+	ioKillerName = theOutputName;
+}
+
+bool AvHSHUGetCanDropItem(vec3_t& ioCenter, Vector& inMinSize, Vector& inMaxSize, float inMaxSlopeTangent, int inIgnoreIndex, bool inIgnorePlayers)
+{
+
+	float theMaxXWidth = max(-inMinSize[0],inMaxSize[0]);
+	float theMaxYWidth = max(-inMinSize[1],inMaxSize[1]);
+	float theRadius = sqrt(theMaxXWidth*theMaxXWidth + theMaxYWidth * theMaxYWidth);
+	float theHeight = inMaxSize[2] - inMinSize[2];
+	//adjust origin to be base
+	float theOrigin[3] = { ioCenter[0], ioCenter[1], ioCenter[2] + inMinSize[2] };
+
+	CollisionChecker Checker(pmove,kHLPointHullIndex,CollisionChecker::HULL_TYPE_ALL,inIgnorePlayers,CollisionChecker::IGNORE_NONE,inIgnoreIndex);
+	bool theCanDropItem = (Checker.GetContentsInCylinder(theOrigin,theRadius,theHeight) != CONTENTS_SOLID);
+
+
+	if(!theCanDropItem) //can't place it -- can we drop it?
+	{
+
+		float theMaxDropHeight = theRadius * inMaxSlopeTangent;
+
+		float theDropOrigin[3] = { theOrigin[0], theOrigin[1], theOrigin[2] + theMaxDropHeight };
+		theCanDropItem = (Checker.GetContentsInCylinder(theDropOrigin,theRadius,theHeight) != CONTENTS_SOLID);
+
+		if(theCanDropItem) //can drop it -- get as low to ground as possible for drop
+		{
+
+			float theBestDropHeight = theMaxDropHeight;
+			float theShiftFraction = 1.0f;
+			for(float theShiftAdjust = 0.5f; theShiftAdjust > 0.05f; theShiftAdjust /= 2)
+			{
+				theShiftFraction += theShiftAdjust * (theCanDropItem ? -1 : 1); //try lower if last was a success
+				theDropOrigin[2] = theMaxDropHeight;
+				theDropOrigin[2] *= theShiftFraction;
+				theDropOrigin[2] += theOrigin[2];
+
+				theCanDropItem = (Checker.GetContentsInCylinder(theDropOrigin,theRadius,theHeight) != CONTENTS_SOLID);
+				if(theCanDropItem)
+				{
+					theBestDropHeight = theShiftFraction;
+					theBestDropHeight *= theMaxDropHeight;
+				}
+			}
+
+			//adjust center to best position
+			ioCenter[2] += theBestDropHeight;
+			theCanDropItem = true;
+		}
+	}
+
+	return theCanDropItem;
+}
+
+bool AvHSHUTraceAndGetIsSiteValidForBuild(AvHMessageID inMessageID, const Vector& inPointOfView, const Vector& inNormRay, Vector* outLocation)
+{
+	bool theSuccess = false;
+
+	// TODO: Check if area is within the mapextents
+
+	int theUser3;
+	bool theTraceSuccess = AvHSHUTraceTangible(inPointOfView, inNormRay, &theUser3, outLocation);
+
+	// tankefugl: 0000291
+	// ignore trace for scans (removed due to cost being paid when drop failed)
+	//if (inMessageID == BUILD_SCAN)
+	//{
+	//	theSuccess = true;
+	//}
+    //else
+	// :tankefugl
+	if(theTraceSuccess)
+	{
+		// tankefugl: 0000291
+		if((inMessageID == BUILD_SCAN) || (AvHSHUGetIsSiteValidForBuild(inMessageID, outLocation)))
+		// :tankefugl
+		{
+			theSuccess = true;
+		}
+
+	}
+	return theSuccess;
+}
+
+#ifdef AVH_CLIENT
+bool AvHSHUGetEntityAtRay(const Vector& inPointOfView, const Vector& inNormRay, int& outEntIndex)
+{
+	bool theSuccess = false;
+
+	// Offset starting position a little so we don't select ourselves
+	Vector theStartPosition;
+	VectorMA(inPointOfView, kSelectionStartRange, inNormRay, theStartPosition);
+
+	Vector theEndPos;
+	VectorMA(inPointOfView, kSelectionEndRange, inNormRay, theEndPos);
+
+	gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction( false, true );
+
+	// Store off the old count
+	gEngfuncs.pEventAPI->EV_PushPMStates();
+
+	// Now add in all of the players.
+	int theNumPlayers = gEngfuncs.GetMaxClients();
+	gEngfuncs.pEventAPI->EV_SetSolidPlayers ( -1 );
+
+	bool theDone = false;
+	int theEntityIndex = -1;
+
+	vec3_t theNewStartPos;
+	AvHSHUGetFirstNonSolidPoint(theStartPosition, theEndPos, theNewStartPos);
+	VectorCopy(theNewStartPos, theStartPosition);
+
+	do
+	{
+		pmtrace_t tr;
+		gEngfuncs.pEventAPI->EV_SetTraceHull( 2 );
+		gEngfuncs.pEventAPI->EV_PlayerTrace( theStartPosition, theEndPos, PM_NORMAL, theEntityIndex, &tr );
+
+		physent_t *pEntity = gEngfuncs.pEventAPI->EV_GetPhysent( tr.ent );
+		theEntityIndex = gEngfuncs.pEventAPI->EV_IndexFromTrace( &tr );
+
+		if(pEntity)
+		{
+			int theUser3 = pEntity->iuser3;
+			if(theEntityIndex > 0)
+			{
+				outEntIndex = theEntityIndex;
+				theSuccess = true;
+				theDone = true;
+			}
+		}
+
+		if((tr.fraction >= (1.0f - kFloatTolerance)) || (tr.fraction < kFloatTolerance))
+		{
+			theDone = true;
+		}
+		else
+		{
+			VectorCopy(tr.endpos, theStartPosition);
+		}
+
+	} while(!theDone);
+
+	gEngfuncs.pEventAPI->EV_PopPMStates();
+
+	return theSuccess;
+}
+#endif
+
+#ifdef AVH_SERVER
+bool AvHSHUGetEntityAtRay(const Vector& inPointOfView, const Vector& inNormRay, int& outEntIndex)
+{
+	TraceResult		tr;
+	Vector			theStartPos;
+	Vector			theEndPos;
+	bool			theSuccess = false;
+	bool			theDone = false;
+
+	VectorMA(inPointOfView, kSelectionStartRange, inNormRay, theStartPos);
+	VectorMA(inPointOfView, kSelectionEndRange, inNormRay, theEndPos);
+
+	CBaseEntity* theEntityHit = NULL;
+	edict_t* theEdictToIgnore = NULL;
+
+	vec3_t theNewStartPos;
+	AvHSHUGetFirstNonSolidPoint(theStartPos, theEndPos, theNewStartPos);
+	VectorCopy(theNewStartPos, theStartPos);
+
+	do
+	{
+		UTIL_TraceLine(theStartPos, theEndPos, dont_ignore_monsters, ignore_glass, theEdictToIgnore, &tr);
+
+		theEntityHit = CBaseEntity::Instance(tr.pHit);
+		if(theEntityHit)
+		{
+			if(theEntityHit->entindex() > 0)
+			{
+				outEntIndex = theEntityHit->entindex();
+				theSuccess = true;
+				theDone = true;
+			}
+		}
+
+
+		if((tr.flFraction > (1.0f - kFloatTolerance)) || (tr.flFraction < kFloatTolerance))
+		{
+			theDone = true;
+		}
+		else
+		{
+			if(theEntityHit)
+			{
+				theEdictToIgnore = ENT(theEntityHit->pev);
+			}
+			VectorCopy(tr.vecEndPos, theStartPos);
+		}
+	} while(!theDone);
+
+	return theSuccess;
+}
+#endif
+
+const AvHMapExtents& AvHSHUGetMapExtents()
+{
+	#ifdef AVH_CLIENT
+	const AvHMapExtents& theMapExtents = gHUD.GetMapExtents();
+	#endif
+
+	#ifdef AVH_SERVER
+	const AvHMapExtents& theMapExtents = GetGameRules()->GetMapExtents();
+	#endif
+
+	return theMapExtents;
+}
+
+
+#ifdef AVH_CLIENT
+bool AvHSUClientTraceTangible(const vec3_t& inStartPos, const vec3_t& inEndPos, int& outIndex, vec3_t& outLocation, AvHTeamNumber& outTeamNumber, bool& outPlayerWasHit, int& outUserThree, int& outUserFour)
+{
+	physent_t*	theEntity = NULL;
+	vec3_t		theStartPos;
+	vec3_t		theEndPos;
+	int			theFoundEntity = -1;
+	bool		theSuccess = false;
+	bool		theDone = false;
+
+	VectorCopy(inStartPos, theStartPos);
+	VectorCopy(inEndPos, theEndPos);
+
+	vec3_t theNormal;
+	VectorSubtract(inEndPos, inStartPos, theNormal);
+	VectorNormalize(theNormal);
+
+	outIndex = -1;
+
+	gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction( false, true );
+
+	// Store off the old count
+	gEngfuncs.pEventAPI->EV_PushPMStates();
+
+	// Now add in all of the players.
+	int theNumPlayers = gEngfuncs.GetMaxClients();
+	gEngfuncs.pEventAPI->EV_SetSolidPlayers ( -1 );
+
+	vec3_t theNewStartPos;
+	AvHSHUGetFirstNonSolidPoint(theStartPos, theEndPos, theNewStartPos);
+	VectorCopy(theNewStartPos, theStartPos);
+
+	do
+	{
+		pmtrace_t tr;
+		gEngfuncs.pEventAPI->EV_SetTraceHull( 2 );
+		gEngfuncs.pEventAPI->EV_PlayerTrace( theStartPos, theEndPos, PM_NORMAL/*PM_GLASS_IGNORE*/, theFoundEntity, &tr );
+
+		physent_t *pEntity = gEngfuncs.pEventAPI->EV_GetPhysent( tr.ent );
+		theFoundEntity = gEngfuncs.pEventAPI->EV_IndexFromTrace( &tr );
+
+		if(pEntity)
+		{
+			if(pEntity->iuser3 != AVH_USER3_NONE)
+			{
+				VectorCopy(tr.endpos, outLocation);
+				outIndex = theFoundEntity;
+				theEntity = pEntity;
+				outUserThree = pEntity->iuser3;
+				outUserFour = pEntity->iuser4;
+				outTeamNumber = (AvHTeamNumber)(pEntity->team);
+
+				if(pEntity->player)
+				{
+					outPlayerWasHit = true;
+				}
+
+				theSuccess = true;
+				theDone = true;
+			}
+		}
+
+		if(tr.fraction >= (1.0f - kFloatTolerance))
+		{
+			theDone = true;
+		}
+		else
+		{
+			vec3_t theDiff = theNormal*kHitOffsetAmount;
+			float theLength = sqrt(theDiff.x*theDiff.x + theDiff.y*theDiff.y + theDiff.z*theDiff.z);
+			if(theLength > kFloatTolerance)
+			{
+				VectorAdd(tr.endpos, theDiff, theStartPos);
+			}
+			else
+			{
+				theDone = true;
+			}
+			// Offset a bit so we don't hit again
+			//VectorMA(tr.endpos, kHitOffsetAmount, theNormal, theStartPos);
+		}
+	} while(!theDone);
+
+	gEngfuncs.pEventAPI->EV_PopPMStates();
+
+	// If we didn't hit any special targets, see if it's a valid area to build or be ordered to
+	if(!theSuccess)
+	{
+		WaypointReturnCode theReturnCode = WAYPOINT_SUCCESS;
+		theSuccess = AvHSHUClientTraceWaypoint(inStartPos, inEndPos, &outLocation, &theReturnCode);
+		bool theWaypointTooSteep = (theReturnCode == WAYPOINT_TOOSTEEP);
+
+		if(theSuccess || theWaypointTooSteep)
+		{
+			outUserThree = AVH_USER3_WAYPOINT;
+			outPlayerWasHit = false;
+			outIndex = -1;
+			outTeamNumber = TEAM_IND;
+			theSuccess = true;
+		}
+
+		// Treat too steep as success, but mark it as nobuild
+		if(theWaypointTooSteep)
+		{
+			outUserThree = AVH_USER3_NOBUILD;
+		}
+	}
+
+	return theSuccess;
+}
+#endif
+
+#ifdef AVH_SERVER
+bool AvHSUServerTraceTangible(const vec3_t& inStartPos, const vec3_t& inEndPos, int& outIndex, vec3_t& outLocation, AvHTeamNumber& outTeamNumber, bool& outPlayerWasHit, int& outUserThree, int& outUserFour)
+{
+	bool theSuccess = false;
+	bool theDone = false;
+	edict_t* theEdictToIgnore = NULL;
+	vec3_t theStartPos;
+	vec3_t theEndPos;
+
+	VectorCopy(inStartPos, theStartPos);
+	VectorCopy(inEndPos, theEndPos);
+
+	vec3_t theNormal;
+	VectorSubtract(inEndPos, inStartPos, theNormal);
+	VectorNormalize(theNormal);
+
+//	vec3_t theNewStartPos;
+//	AvHSHUGetFirstNonSolidPoint(theStartPos, theEndPos, theNewStartPos);
+//	VectorCopy(theNewStartPos, theStartPos);
+
+	do
+	{
+		TraceResult tr;
+		UTIL_TraceLine(theStartPos, theEndPos, dont_ignore_monsters, theEdictToIgnore, &tr);
+		CBaseEntity* theEntityHit = NULL;
+
+		// Return the entity in special way
+		if(tr.flFraction < 1 && tr.pHit)
+		{
+			theEntityHit = CBaseEntity::Instance(tr.pHit);
+			AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntityHit);
+			AvHWeldable* theWeldable = dynamic_cast<AvHWeldable*>(theEntityHit);
+
+			AvHBasePlayerWeapon* theWeapon = dynamic_cast<AvHBasePlayerWeapon*>(theEntityHit);
+			if(theWeapon)
+			{
+				int a = 0;
+			}
+
+			if(AvHSUGetIsDebugging())
+			{
+				// Create an entity where the trace hit
+				Vector theAngles(0, 0, 0);
+
+				CBaseEntity* pEnt = CBaseEntity::Create(kwsDebugEntity, tr.vecEndPos, theAngles);
+				ASSERT(pEnt);
+				pEnt->pev->movetype = MOVETYPE_FLY;
+				pEnt->pev->solid = SOLID_NOT;
+			}
+
+			if(theEntityHit && (theEntityHit->pev->iuser3 != AVH_USER3_NONE))
+			{
+				// Don't hit seethroughs
+				if(theEntityHit->pev->iuser3 != AVH_USER3_ALPHA)
+				{
+					outIndex = ENTINDEX(tr.pHit);
+					VectorCopy(tr.vecEndPos, outLocation);
+					outTeamNumber = (AvHTeamNumber)theEntityHit->pev->team;
+					outUserThree = theEntityHit->pev->iuser3;
+					outUserFour = theEntityHit->pev->iuser4;
+
+					if(thePlayer)
+					{
+						outPlayerWasHit = true;
+					}
+
+					theSuccess = true;
+					theDone = true;
+				}
+			}
+
+			theEdictToIgnore = theEntityHit->edict();
+		}
+
+		if((tr.flFraction >= (1.0f - kFloatTolerance)) || (tr.flFraction < kFloatTolerance))
+		{
+			theDone = true;
+		}
+		else
+		{
+			vec3_t theDiff = theNormal*kHitOffsetAmount;
+			float theLength = sqrt(theDiff.x*theDiff.x + theDiff.y*theDiff.y + theDiff.z*theDiff.z);
+			if(theLength > kFloatTolerance)
+			{
+				VectorAdd(theStartPos, theDiff, theStartPos);
+			}
+			else
+			{
+				theDone = true;
+			}
+			// Offset a bit so we don't hit again
+			//VectorMA(tr.vecEndPos, kHitOffsetAmount, theNormal, theStartPos);
+		}
+	} while(!theDone);
+
+	if(!theSuccess)
+	{
+		WaypointReturnCode theReturnCode = WAYPOINT_SUCCESS;
+		theSuccess = AvHSHUServerTraceWaypoint(inStartPos, inEndPos, &outLocation, &theReturnCode);
+		bool theWaypointTooSteep = (theReturnCode == WAYPOINT_TOOSTEEP);
+		if(theSuccess || theWaypointTooSteep)
+		{
+			outUserThree = AVH_USER3_WAYPOINT;
+			outPlayerWasHit = false;
+			outIndex = -1;
+			outTeamNumber = TEAM_IND;
+			theSuccess = true;
+		}
+		// Treat too steep as success, but mark it as nobuild
+		if(theWaypointTooSteep)
+		{
+			outUserThree = AVH_USER3_NOBUILD;
+		}
+	}
+
+	return theSuccess;
+}
+#endif
+
+
+
+#ifdef AVH_CLIENT
+bool AvHSHUClientTraceWaypoint(const vec3_t& inStartPos, const vec3_t& inEndPos, vec3_t* outLocation, WaypointReturnCode* outReturnCode)
+{
+	vec3_t		theStartPos;
+	vec3_t		theEndPos;
+	int			theFoundEntity = -1;
+	int			theEntityToIgnore = -1;
+	bool		theDone = false;
+	bool		theLegalToBuild = false;
+
+	VectorCopy(inStartPos, theStartPos);
+	VectorCopy(inEndPos, theEndPos);
+
+	vec3_t theNormal;
+	VectorSubtract(inEndPos, inStartPos, theNormal);
+	VectorNormalize(theNormal);
+
+	int theNumPlayers = gEngfuncs.GetMaxClients();
+	pmtrace_t tr;
+
+	//DebugPoint theDebugPoint(theStartPos[0], theStartPos[1], theStartPos[2]);
+	//gSquareDebugLocations.push_back(theDebugPoint);
+
+	gEngfuncs.pEventAPI->EV_SetUpPlayerPrediction( false, true );
+	gEngfuncs.pEventAPI->EV_PushPMStates();
+	gEngfuncs.pEventAPI->EV_SetSolidPlayers(-1);
+	gEngfuncs.pEventAPI->EV_SetTraceHull(2);
+
+	vec3_t theNewStartPos;
+	AvHSHUGetFirstNonSolidPoint(theStartPos, theEndPos, theNewStartPos);
+	VectorCopy(theNewStartPos, theStartPos);
+
+	do
+	{
+		gEngfuncs.pEventAPI->EV_PlayerTrace( theStartPos, theEndPos, PM_NORMAL/*PM_GLASS_IGNORE*/, theEntityToIgnore, &tr );
+
+		physent_t* pEntity = gEngfuncs.pEventAPI->EV_GetPhysent( tr.ent );
+		theFoundEntity = gEngfuncs.pEventAPI->EV_IndexFromTrace( &tr );
+
+		// Trace until we hit a worldbrush or non-seethrough
+		if(!pEntity || (pEntity->iuser3 != AVH_USER3_ALPHA))
+		{
+			// If entity is a "no waypoint" entity we can't build here and we're done
+			if(pEntity && (pEntity->iuser3 == AVH_USER3_NOBUILD))
+			{
+				if(outReturnCode)
+				{
+					*outReturnCode = WAYPOINT_NOBUILD;
+				}
+				theDone = true;
+			}
+			else
+			{
+				// else if texture is NOBUILD, we're done
+				const char* theTextureHitCStr = gEngfuncs.pEventAPI->EV_TraceTexture(theFoundEntity, tr.endpos, theEndPos);
+				if(theTextureHitCStr && (LowercaseString(theTextureHitCStr) == LowercaseString(kNoBuildTexture)))
+				{
+					if(outReturnCode)
+					{
+						*outReturnCode = WAYPOINT_NOBUILD;
+					}
+					theDone = true;
+				}
+				else if(theTextureHitCStr && (LowercaseString(theTextureHitCStr) == LowercaseString(kSeeThroughTexture)))
+				{
+					// Not valid, but allow it to pass through
+					if(outReturnCode)
+					{
+						*outReturnCode = WAYPOINT_SEETHROUGH;
+					}
+				}
+				else
+				{
+					// Trace texture sometimes seems to miss entities that the start point lies within.  Don't count
+					// the trace texture if it found the texture of the next entity below it
+						// else if surface is more flat than vertical
+					if(tr.plane.normal[2] >= 0.7f)
+					{
+						// and if surface isn't under water, lava, in the sky, etc.
+						int thePointContents = gEngfuncs.PM_PointContents(tr.endpos, NULL);
+						if(thePointContents == CONTENTS_EMPTY)
+						{
+							// and if there's enough room to build
+
+							// we can build here, and we're done
+							theLegalToBuild = true;
+							theDone = true;
+
+							if(outReturnCode)
+							{
+								*outReturnCode = WAYPOINT_SUCCESS;
+							}
+						}
+						else
+						{
+							if(outReturnCode)
+							{
+								*outReturnCode = WAYPOINT_CONTENTSFULL;
+								theDone = true;
+							}
+						}
+					}
+					else
+					{
+						if(outReturnCode)
+						{
+							if(theTextureHitCStr)
+							{
+								*outReturnCode = WAYPOINT_TOOSTEEP;
+							}
+							else
+							{
+								*outReturnCode = WAYPOINT_ENTITYHIT;
+							}
+							theDone = true;
+						}
+					}
+				}
+			}
+		}
+
+		if(theFoundEntity != 0)
+		{
+			theEntityToIgnore = theFoundEntity;
+		}
+
+		if(((tr.fraction >= (1.0f - kFloatTolerance)) || (tr.fraction == 0.0f)) /*&& !tr.startsolid && !tr.allsolid*/)
+		{
+			theDone = true;
+		}
+		else
+		{
+			vec3_t theDiff = theNormal*kHitOffsetAmount;
+			float theLength = sqrt(theDiff.x*theDiff.x + theDiff.y*theDiff.y + theDiff.z*theDiff.z);
+			if(theLength > kFloatTolerance)
+			{
+				VectorAdd(tr.endpos, theDiff, theStartPos);
+			}
+			else
+			{
+				theDone = true;
+			}
+			// Offset a bit so we don't hit again
+			//VectorMA(tr.endpos, kHitOffsetAmount, theNormal, theStartPos);
+		}
+	} while(!theDone);
+
+	gEngfuncs.pEventAPI->EV_PopPMStates();
+
+	// Always set end location to show where invalid position is
+	*outLocation = tr.endpos;
+
+	return theLegalToBuild;
+}
+#endif
+
+#ifdef AVH_CLIENT
+void AvHSHUClientGetFirstNonSolidPoint(const vec3_t& inStartPos, const vec3_t& inEndPos, vec3_t& outNonSolidPoint)
+{
+	vec3_t theStartPos;
+	vec3_t theEndPos;
+	VectorCopy(inStartPos, theStartPos);
+	VectorCopy(inStartPos, outNonSolidPoint);
+	VectorCopy(inEndPos, theEndPos);
+
+	pmtrace_t tr;
+	gEngfuncs.pEventAPI->EV_PlayerTrace( theStartPos, theEndPos, PM_NORMAL, -1, &tr );
+
+	// Put this workaround in because a bug in EV_PlayerTrace means that when it starts solid, tr.fraction isn't returned (but it is in UTIL_TraceLine)
+	if((tr.startsolid) && (tr.fraction == 0.0f))
+	{
+		int			theFoundEntity = -1;
+		bool		theDone = false;
+
+		vec3_t theStartToEnd;
+		VectorSubtract(inEndPos, inStartPos, theStartToEnd);
+
+		gEngfuncs.pEventAPI->EV_SetTraceHull(2);
+
+		float theIncrement = 10.0f/theStartToEnd.Length();
+		float theT = 0.0f;
+		int theNumIterations = 0;
+
+		do
+		{
+			theStartPos = inStartPos + theT*theStartToEnd;
+			gEngfuncs.pEventAPI->EV_PlayerTrace( theStartPos, theEndPos, PM_WORLD_ONLY, -1, &tr );
+
+			theNumIterations++;
+
+			// If start point is solid, bisect area and move start point 1/2 between current start and current end
+			if(tr.startsolid)
+			{
+				theT += theIncrement;
+			}
+			// else if start point isn't solid, bisect area and move start point back towards original start point
+			else
+			{
+				theDone = true;
+			}
+		} while(!theDone && (theNumIterations < 200));
+
+		// Always set end location to show where invalid position is
+		if(!theDone)
+		{
+			outNonSolidPoint = inStartPos;
+		}
+		else
+		{
+			outNonSolidPoint = theStartPos;
+		}
+	}
+}
+#endif
+
+#ifdef AVH_SERVER
+void AvHSHUServerGetFirstNonSolidPoint(const vec3_t& inStartPos, const vec3_t& inEndPos, vec3_t& outNonSolidPoint)
+{
+	vec3_t theStartPos;
+	vec3_t theEndPos;
+	VectorCopy(inStartPos, theStartPos);
+	VectorCopy(inStartPos, outNonSolidPoint);
+	VectorCopy(inEndPos, theEndPos);
+
+	TraceResult tr;
+	UTIL_TraceLine(theStartPos, theEndPos, ignore_monsters, NULL, &tr);
+
+	bool theDone = false;
+
+	// Put this workaround in because a bug in EV_PlayerTrace means that when it starts solid, tr.fraction isn't returned (but it is in UTIL_TraceLine)
+	if((tr.fStartSolid) || (tr.flFraction == 0.0f))
+	{
+		int			theFoundEntity = -1;
+
+		vec3_t theStartToEnd;
+		VectorSubtract(inEndPos, inStartPos, theStartToEnd);
+
+		float theIncrement = 10.0f/theStartToEnd.Length();
+		float theT = 0.0f;
+		int theNumIterations = 0;
+		int thePointContents = 0;
+
+		do
+		{
+			theStartPos = inStartPos + theT*theStartToEnd;
+			thePointContents = UTIL_PointContents(theStartPos);
+
+			theNumIterations++;
+
+			// If start point is solid, bisect area and move start point 1/2 between current start and current end
+			if((thePointContents == CONTENTS_SOLID) || (thePointContents == CONTENTS_SKY))
+			{
+				theT += theIncrement;
+			}
+			// else if start point isn't solid, bisect area and move start point back towards original start point
+			else
+			{
+				theDone = true;
+			}
+		} while(!theDone && (theNumIterations < 200));
+
+		// Always set end location to show where invalid position is
+		outNonSolidPoint = theStartPos;
+	}
+	else
+	{
+		VectorCopy(tr.vecEndPos, outNonSolidPoint);
+		theDone = true;
+	}
+
+	if(!theDone)
+	{
+		// When we don't hit anything, return start point
+		VectorCopy(inStartPos, outNonSolidPoint);
+	}
+
+	VectorCopy(outNonSolidPoint, gPMDebugPoint);
+}
+#endif
+
+void AvHSHUGetFirstNonSolidPoint(float* inStartPos, float* inEndPos, float* outNonSolidPoint)
+{
+	vec3_t theStartPos;
+	vec3_t theEndPos;
+
+	VectorCopy(inStartPos, theStartPos);
+	VectorCopy(inEndPos, theEndPos);
+
+	vec3_t theNonSolidPoint;
+	AvHSHUGetFirstNonSolidPoint(theStartPos, theEndPos, theNonSolidPoint);
+
+	VectorCopy(theNonSolidPoint, outNonSolidPoint);
+}
+
+void AvHSHUGetFirstNonSolidPoint(const vec3_t& inStartPos, const vec3_t& inEndPos, vec3_t& outNonSolidPoint)
+{
+	#ifdef AVH_CLIENT
+	AvHSHUClientGetFirstNonSolidPoint(inStartPos, inEndPos, outNonSolidPoint);
+
+	//extern DebugPointListType gSquareDebugLocations;
+	//DebugPoint theDebugPoint(outNonSolidPoint[0], outNonSolidPoint[1], outNonSolidPoint[2]);
+	//gSquareDebugLocations.push_back(theDebugPoint);
+	#endif
+
+	#ifdef AVH_SERVER
+	AvHSHUServerGetFirstNonSolidPoint(inStartPos, inEndPos, outNonSolidPoint);
+	#endif
+}
+
+#ifdef AVH_SERVER
+bool AvHSHUServerTraceWaypoint(const vec3_t& inStartPos, const vec3_t& inEndPos, vec3_t* outLocation, WaypointReturnCode* outReturnCode)
+{
+	bool theLegalToBuild = false;
+	bool theDone = false;
+	edict_t* theEdictToIgnore = NULL;
+	TraceResult tr;
+	vec3_t theStartPos;
+	vec3_t theEndPos;
+
+	VectorCopy(inStartPos, theStartPos);
+	VectorCopy(inEndPos, theEndPos);
+
+	vec3_t theNormal;
+	VectorSubtract(inEndPos, inStartPos, theNormal);
+	VectorNormalize(theNormal);
+
+	vec3_t theNewStartPos;
+	AvHSHUGetFirstNonSolidPoint(theStartPos, theEndPos, theNewStartPos);
+	VectorCopy(theNewStartPos, theStartPos);
+
+	do
+	{
+		UTIL_TraceLine(theStartPos, theEndPos, dont_ignore_monsters, theEdictToIgnore, &tr);
+
+		// Trace until we hit a worldbrush or non-seethrough
+		CBaseEntity* theEntityHit = CBaseEntity::Instance(tr.pHit);
+		CWorld* theWorld = dynamic_cast<CWorld*>(theEntityHit);
+		bool theHitSeethrough = (theEntityHit->pev->iuser3 == AVH_USER3_ALPHA);
+		if(!theHitSeethrough)
+		{
+			// If entity is a "no waypoint" entity we can't build here and we're done
+			if(theEntityHit && (theEntityHit->pev->iuser3 == AVH_USER3_NOBUILD))
+			{
+				if(outReturnCode)
+				{
+					*outReturnCode = WAYPOINT_NOBUILD;
+				}
+				theDone = true;
+			}
+			else
+			{
+				edict_t* theEdict = ENT(theEntityHit->pev);
+				const char* theTextureHitCStr = TRACE_TEXTURE(theEdict, tr.vecEndPos, theEndPos);
+				if(theTextureHitCStr && (LowercaseString(theTextureHitCStr) == LowercaseString(kNoBuildTexture)))
+				{
+					if(outReturnCode)
+					{
+						*outReturnCode = WAYPOINT_NOBUILD;
+					}
+					theDone = true;
+				}
+				else if(theTextureHitCStr && (LowercaseString(theTextureHitCStr) == LowercaseString(kSeeThroughTexture)))
+				{
+					// Do nothing, but allow it to pass through
+					if(outReturnCode)
+					{
+						*outReturnCode = WAYPOINT_SEETHROUGH;
+					}
+				}
+				else
+				{
+					// else if surface is more flat than vertical
+					if(tr.vecPlaneNormal.z >= .7f)
+					{
+						// and if surface isn't under water, lava, sky
+						int thePointContents = UTIL_PointContents(tr.vecEndPos);
+						if(thePointContents == CONTENTS_EMPTY)
+						{
+							// and if there's enough room to build
+							if(outReturnCode)
+							{
+								*outReturnCode = WAYPOINT_SUCCESS;
+							}
+
+							// we can build here, and we're done
+							theLegalToBuild = true;
+							theDone = true;
+						}
+						else
+						{
+							if(outReturnCode)
+							{
+								*outReturnCode = WAYPOINT_CONTENTSFULL;
+							}
+						}
+					}
+					else
+					{
+						if(theTextureHitCStr)
+						{
+							*outReturnCode = WAYPOINT_TOOSTEEP;
+						}
+						else
+						{
+							*outReturnCode = WAYPOINT_ENTITYHIT;
+						}
+						theDone = true;
+					}
+				}
+			}
+
+			if(!theWorld)
+			{
+				theEdictToIgnore = theEntityHit->edict();
+			}
+
+			if(((tr.flFraction >= (1.0f - kFloatTolerance)) || (tr.flFraction < kFloatTolerance)) /*&& !tr.fStartSolid && !tr.fAllSolid*/)
+			{
+				theDone = true;
+			}
+			else
+			{
+				vec3_t theDiff = theNormal*kHitOffsetAmount;
+				float theLength = sqrt(theDiff.x*theDiff.x + theDiff.y*theDiff.y + theDiff.z*theDiff.z);
+				if(theLength > kFloatTolerance)
+				{
+					//VectorAdd(tr.vecEndPos, theDiff, theStartPos);
+					VectorAdd(theStartPos, theDiff, theStartPos);
+				}
+				else
+				{
+					theDone = true;
+				}
+				// Offset a bit so we don't hit again
+				//VectorMA(tr.vecEndPos, kHitOffsetAmount, theNormal, theStartPos);
+			}
+		}
+		else
+		{
+			theEdictToIgnore = theEntityHit->edict();
+			if(tr.vecEndPos == theStartPos)
+			{
+				vec3_t theDiff = theNormal*kHitOffsetAmount;
+				float theLength = sqrt(theDiff.x*theDiff.x + theDiff.y*theDiff.y + theDiff.z*theDiff.z);
+				if(theLength > kFloatTolerance)
+				{
+					//VectorAdd(tr.vecEndPos, theDiff, theStartPos);
+					VectorAdd(theStartPos, theDiff, theStartPos);
+				}
+			}
+			else
+			{
+				VectorCopy(tr.vecEndPos, theStartPos);
+			}
+//			vec3_t theEntityPosition = AvHSHUGetRealLocation(theEntityHit->pev->origin, theEntityHit->pev->mins, theEntityHit->pev->maxs);
+//			//VectorCopy(theEntityPosition, theStartPos);
+//			theStartPos[2] = theEntityPosition[2];
+		}
+	} while(!theDone);
+
+	// Always set end location to show where invalid position is
+	*outLocation = tr.vecEndPos;
+
+	return theLegalToBuild;
+}
+#endif
+
+bool AvHSHUTraceTangible(const vec3_t& inStartPos, const vec3_t& inEndPos, int& outIndex, vec3_t& outLocation, AvHTeamNumber& outTeamNumber, bool& outPlayerWasHit, int& outUserThree, int& outUserFour)
+{
+	bool theSuccess = false;
+
+	outPlayerWasHit = false;
+	outUserThree = 0;
+	outUserFour = 0;
+
+	// On client, set up players for prediction and do a PM_TraceLine
+	#ifdef AVH_CLIENT
+	theSuccess = AvHSUClientTraceTangible(inStartPos, inEndPos, outIndex, outLocation, outTeamNumber, outPlayerWasHit, outUserThree, outUserFour);
+	#endif
+
+	// On the server, do a UTIL_TraceLine
+	#ifdef AVH_SERVER
+	theSuccess = AvHSUServerTraceTangible(inStartPos, inEndPos, outIndex, outLocation, outTeamNumber, outPlayerWasHit, outUserThree, outUserFour);
+	#endif
+
+	return theSuccess;
+}
+
+bool AvHSHUTraceTangible(const Vector& inPointOfView, const Vector& inNormRay, int* outUserThree, vec3_t* outLocation, AvHTeamNumber* outTeamNumber, bool* outPlayerWasHit)
+{
+	bool theSuccess = false;
+	vec3_t theTraceStart;
+	vec3_t theTraceEnd;
+	vec3_t theFoundLocation;
+	int theFoundIndex = -1;
+	int theUserThree = 0;
+	int theUserFour = 0;
+	AvHTeamNumber theTeamOfThingHit;
+	bool thePlayerHit = false;
+
+	// Offset a little so we don't hit the commander
+	VectorMA(inPointOfView, kSelectionStartRange, inNormRay, theTraceStart);
+	VectorMA(inPointOfView, kSelectionEndRange, inNormRay, theTraceEnd);
+
+	if(!outUserThree)
+		outUserThree = &theUserThree;
+
+	if(!outLocation)
+		outLocation = &theFoundLocation;
+
+	if(!outTeamNumber)
+		outTeamNumber = &theTeamOfThingHit;
+
+	if(!outPlayerWasHit)
+		outPlayerWasHit = &thePlayerHit;
+
+	theSuccess = AvHSHUTraceTangible(theTraceStart, theTraceEnd, theFoundIndex, *outLocation, *outTeamNumber, *outPlayerWasHit, *outUserThree, theUserFour);
+
+	return theSuccess;
+}
+
+bool AvHSHUTraceVerticalTangible(float inX, float inY, float inZ, int& outUserThree, float& outHeight)
+{
+	bool theSuccess = false;
+
+	// Create a start pos above
+	vec3_t theStartPos(inX, inY, inZ - 100.0f);
+	//vec3_t theEndPos(inX, inY, inZ - 800.0f/*-4096.0f*/);
+	vec3_t theEndPos(inX, inY, (float)kWorldMinimumZ);
+
+//	#ifdef AVH_CLIENT
+//	extern DebugPointListType				gTriDebugLocations;
+//	bool theDrawDebug = true;//(rand() % 100 == 0);
+//
+//	if(theDrawDebug)
+//	{
+//		DebugPoint thePoint;
+//		thePoint.x = theStartPos.x;
+//		thePoint.y = theStartPos.y;
+//		thePoint.z = theStartPos.z;
+//		gTriDebugLocations.push_back(thePoint);
+//
+//		thePoint.z = theEndPos.z;
+//		gTriDebugLocations.push_back(thePoint);
+//	}
+//
+//	#endif
+
+	int theIndex;
+	vec3_t theEndLocation;
+	AvHTeamNumber theTeam;
+	bool thePlayerHit;
+	int theUserFour;
+
+	theSuccess = AvHSHUTraceTangible(theStartPos, theEndPos, theIndex, theEndLocation, theTeam, thePlayerHit, outUserThree, theUserFour);
+	if(theSuccess)
+	{
+		outHeight = theEndLocation.z;
+		ASSERT(outHeight <= inZ);
+	}
+
+	//	#ifdef AVH_CLIENT
+	//	extern DebugPointListType				gSquareDebugLocations;
+	//
+	//	if(theSuccess && theDrawDebug/*&& ((rand() % 500) == 0)*/)
+	//	{
+	//		if(!thePlayerHit && (outUserThree == AVH_USER3_WAYPOINT))
+	//		{
+	//			DebugPoint theEndPoint;
+	//			theEndPoint.x = theEndLocation.x;
+	//			theEndPoint.y = theEndLocation.y;
+	//			theEndPoint.z = theEndLocation.z;
+	//			//theEndPoint.z = theStartPos.z - 20.0f;
+	//
+	//			if((theEndPoint.x == theStartPos.x) && (theEndPoint.y == theStartPos.y))
+	//			{
+	//				if((theEndPoint.x == theEndPos.x) && (theEndPoint.y == theEndPos.y))
+	//				{
+	//					//gTriDebugLocations.push_back(theEndPoint);
+	//					gSquareDebugLocations.push_back(theEndPoint);
+	//				}
+	//				else
+	//				{
+	//					int a = 0;
+	//				}
+	//			}
+	//			else
+	//			{
+	//				int a = 0;
+	//			}
+	//		}
+	//	}
+	//	#endif
+
+	return theSuccess;
+}
+
+const char* AvHSHUGetCommonSoundName(bool inIsAlien, WeaponHUDSound inHUDSound)
+{
+	const char* theSoundName = NULL;
+
+	switch(inHUDSound)
+	{
+	case WEAPON_SOUND_HUD_ON:
+		theSoundName = inIsAlien ? "common/wpn_hudon-a.wav" : "common/wpn_hudon.wav";
+		break;
+	case WEAPON_SOUND_HUD_OFF:
+		theSoundName = inIsAlien ? "common/wpn_hudoff-a.wav" : "common/wpn_hudoff.wav";
+		break;
+	case WEAPON_SOUND_MOVE_SELECT:
+		theSoundName = inIsAlien ? "common/wpn_moveselect-a.wav" : "common/wpn_moveselect.wav";
+		break;
+	case WEAPON_SOUND_SELECT:
+		theSoundName = inIsAlien ? "common/wpn_select-a.wav" : "common/wpn_select.wav";
+		break;
+	case WEAPON_SOUND_DENYSELECT:
+		theSoundName = inIsAlien ? "common/wpn_denyselect-a.wav" : "common/wpn_denyselect.wav";
+		break;
+	}
+
+	return theSoundName;
+}
+
+
+// Values for fuser1: 0-1 means it's building.  2-3 means it's researching (see kResearchFuser1Base), 3-4 is "energy" (returns both building and researching)
+const float	kResearchFuser1Base = 2.0f;
+const float	kEnergyFuser1Base = 3.0f;
+
+void AvHSHUGetBuildResearchState(int inUser3, int inUser4, float inFuser1, bool& outIsBuilding, bool& outIsResearching, float& outNormalizedPercentage)
+{
+	outIsBuilding = outIsResearching = false;
+
+	float theStatus = (inFuser1/kNormalizationNetworkFactor);
+
+	if((GetHasUpgrade(inUser4, MASK_BUILDABLE) || (inUser3 == AVH_USER3_WELD)) && !GetHasUpgrade(inUser4, MASK_RECYCLING))
+	{
+		if((theStatus >= 0.0f) && (theStatus <= 1.0f))
+		{
+			outNormalizedPercentage = theStatus;
+			outIsBuilding = true;
+		}
+		if(inUser3 == AVH_USER3_WELD)
+		{
+			if(outNormalizedPercentage == -1)
+			{
+				outIsBuilding = outIsResearching = false;
+			}
+		}
+	}
+	else
+	{
+		if((theStatus > kResearchFuser1Base) && (theStatus <= (1.0f + kResearchFuser1Base)))
+		{
+			outNormalizedPercentage = theStatus - kResearchFuser1Base;
+			outIsResearching = true;
+		}
+		else if((theStatus > kEnergyFuser1Base) && (theStatus <= (1.0f + kEnergyFuser1Base)))
+		{
+			// Set "energy"
+			outNormalizedPercentage = theStatus - kEnergyFuser1Base;
+			outIsBuilding = outIsResearching = true;
+		}
+		else
+		{
+			outNormalizedPercentage = 1.0f;
+		}
+	}
+}
+
+void AvHSHUSetEnergyState(int inUser3, float &outFuser1, float inNormalizedPercentage)
+{
+	outFuser1 = (kEnergyFuser1Base + inNormalizedPercentage)*kNormalizationNetworkFactor;
+}
+
+void AvHSHUSetBuildResearchState(int inUser3, int inUser4, float &outFuser1, bool inTrueBuildOrFalseResearch, float inNormalizedPercentage)
+{
+	//ASSERT(GetHasUpgrade(inUser4, MASK_BUILDABLE) /*|| GetHasUpgrade(inUser4, MASK_SELECTABLE)*/ || (inUser3 == AVH_USER3_WELD));
+
+	if(inNormalizedPercentage != -1)
+	{
+		inNormalizedPercentage = min(inNormalizedPercentage, 1.0f);
+		inNormalizedPercentage = max(inNormalizedPercentage, 0.0f);
+	}
+
+	// Build
+	if(inTrueBuildOrFalseResearch)
+	{
+		//ASSERT(GetHasUpgrade(inUser4, MASK_BUILDABLE) || (inUser3 == AVH_USER3_WELD));
+
+		outFuser1 = inNormalizedPercentage*kNormalizationNetworkFactor;
+	}
+	// Research
+	else
+	{
+		outFuser1 = (kResearchFuser1Base + inNormalizedPercentage)*kNormalizationNetworkFactor;
+	}
+}
+
+
+string AvHSHUBuildExecutableScriptName(const string& inScriptName, const string& inCurrentMapName)
+{
+	string theExecutableScriptName = string(getModDirectory()) + string("/") + kScriptsDirectory + string("/") + inCurrentMapName + string("/") + inScriptName;
+
+	return theExecutableScriptName;
+}
+
+string AvHSHUGetTimeDateString()
+{
+	string theTimeDateString("<date unknown>");
+
+	time_t theTimeThingie = time ((time_t *) NULL);
+	struct tm* theTime = localtime(&theTimeThingie);
+
+	if(theTime)
+	{
+		// 04/22/03, 16:59:12
+		char theBuffer[512];
+		sprintf(theBuffer, "%.2d/%.2d/%.2d, %.2d:%.2d:%.2d", (theTime->tm_mon + 1), theTime->tm_mday, (theTime->tm_year - 100), theTime->tm_hour, theTime->tm_min, theTime->tm_sec);
+		theTimeDateString = theBuffer;
+	}
+
+	return theTimeDateString;
+}
+
+bool AvHSHUGetNameOfLocation(const AvHBaseInfoLocationListType& inLocations, vec3_t inLocation, string& outLocation)
+{
+	bool theSuccess = false;
+
+	// Look at our current position, and see if we lie within of the map locations
+	for(AvHBaseInfoLocationListType::const_iterator theIter = inLocations.begin(); theIter != inLocations.end(); theIter++)
+	{
+		if(theIter->GetIsPointInRegion(inLocation))
+		{
+			outLocation = theIter->GetLocationName();
+			theSuccess = true;
+			break;
+		}
+	}
+
+	return theSuccess;
+}
+
+// Also check AvHSUGetAlwaysPlayAlert to make sure some alerts are always triggered
+bool AvHSHUGetForceHUDSound(AvHHUDSound inHUDSound)
+{
+    bool theForceSound = false;
+
+    switch(inHUDSound)
+    {
+    case HUD_SOUND_ALIEN_HIVE_COMPLETE:
+    case HUD_SOUND_ALIEN_HIVE_DYING:
+    case HUD_SOUND_ALIEN_HIVE_ATTACK:
+    case HUD_SOUND_MARINE_CCUNDERATTACK:
+    case HUD_SOUND_SQUAD1:
+    case HUD_SOUND_SQUAD2:
+    case HUD_SOUND_SQUAD3:
+    case HUD_SOUND_SQUAD4:
+    case HUD_SOUND_SQUAD5:
+        theForceSound = true;
+        break;
+    }
+
+    return theForceSound;
+}
diff --git a/main/source/mod/AvHSharedUtil.h b/main/source/mod/AvHSharedUtil.h
new file mode 100644
index 00000000..5740f10f
--- /dev/null
+++ b/main/source/mod/AvHSharedUtil.h
@@ -0,0 +1,174 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHSharedUtil.h $
+// $Date: 2002/11/12 22:39:26 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHSharedUtil.h,v $
+// Revision 1.24  2002/11/12 22:39:26  Flayra
+// - Logging changes for Psychostats compatibility
+//
+// Revision 1.23  2002/10/16 01:07:26  Flayra
+// - Added official sizes that HL supports (ugh)
+// - Added utility function for drawing range of ghost building, but it's unused
+//
+// Revision 1.22  2002/09/25 20:51:05  Flayra
+// - Allow small items to be built on entities (health can be dropped right on players)
+//
+// Revision 1.21  2002/08/16 02:47:06  Flayra
+// - Fixed bug where not all the entities were iterated through
+// - Support for ring-drawing (but not for all entities)
+//
+// Revision 1.20  2002/08/09 00:51:11  Flayra
+// - Cleaned up useless special casing of tracetangible, fixed some problems where buildings could be built on players
+//
+// Revision 1.19  2002/07/24 18:45:43  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.18  2002/07/23 17:26:49  Flayra
+// - Siege don't require a nearby turret factory, only add built buildings for range detection, build problems on client (point contents failing on rough surfaces)
+//
+// Revision 1.17  2002/07/08 17:17:44  Flayra
+// - Reworked colors, moved functions into server util
+//
+// Revision 1.16  2002/07/01 21:46:39  Flayra
+// - Added support for generic building ranges, fixed morphing problems
+//
+// Revision 1.15  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_SHAREDUTIL_H
+#define AVH_SHAREDUTIL_H
+
+#ifdef AVH_CLIENT
+#include "cl_dll/cl_util.h"
+#include "cl_dll/util_vector.h"
+#include "common/const.h"
+#include "engine/progdefs.h"
+#include "cl_dll/ev_hldm.h"
+#include "cl_dll/parsemsg.h"
+#include "common/vector_util.h"
+#endif
+
+#ifdef AVH_SERVER
+#include "extdll.h"
+#include "util.h"
+#include "common/vector_util.h"
+#endif
+
+#include "pm_shared/pm_defs.h"
+#include "pm_shared/pm_shared.h"
+#include "pm_shared/pm_movevars.h"
+#include "pm_shared/pm_debug.h"
+#include "mod/AvHMessage.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHMapExtents.h"
+#include "mod/AvHSpecials.h"
+#include "mod/AvHBaseInfoLocation.h"
+#include "mod/AvHBasePlayerWeaponConstants.h"
+
+const int kHitOffsetAmount = 10;
+#define kNoBuildTexture		"nobuild"
+#define kSeeThroughTexture	"seethrough"
+
+//physent_t* AvHSUGetEntity(int inPhysIndex);
+const char* AvHSHUGetClassNameFromUser3(AvHUser3 inUser3);
+int AvHSHUGetDrawRangeForMessageID(AvHMessageID inMessageID);
+int AvHSHUGetDrawRangeForUser3(AvHUser3 inUser3);
+bool AvHSHUGetDrawRingsForUser3(AvHUser3 inUser3, float& outScalar);
+bool AvHSHUGetBuildRegions(AvHMessageID inMessageID, EntityListType& outEntities, IntList& outRanges, float& outZAdjustment, bool& outSnapToLocation);
+bool AvHSHUGetAreSpecialBuildingRequirementsMet(AvHMessageID inMessageID, vec3_t& inLocation);
+bool AvHSHUGetBuildTechClassName(AvHMessageID inMessageID, char*& outClassName);
+bool AvHSHUGetResearchTechName(AvHMessageID inMessageID, char*& outResearchTechName);
+bool AvHSHUGetCenterPositionForGroup(int inGroupNumber, float* inPlayerOrigin, float* outCenterPosition);
+void AvHSHUGetEntities(int inUser3, EntityListType& outEntities);
+bool AvHSHUGetEntityLocation(int inEntity, vec3_t& outLocation);
+bool AvHSHUGetEntityIUser4(int inEntity, int& outIUser4);
+vec3_t AvHSHUGetRealLocation(const vec3_t& inLocation, const vec3_t& inMinBox, const vec3_t& inMaxBox);
+void AvHSHUGetFirstNonSolidPoint(float* inStartPos, float* inEndPos, float* outNonSolidPoint);
+void AvHSHUGetFirstNonSolidPoint(const vec3_t& inStartPos, const vec3_t& inEndPos, vec3_t& outNonSolidPoint);
+bool AvHSHUGetIsBuilding(AvHMessageID inMessageID);
+bool AvHSHUGetIsBuildTech(AvHMessageID inMessageID);
+bool AvHSHUGetIsWeaponFocusable(AvHWeaponID inWeaponID);
+bool AvHSHUGetDoesTechCostEnergy(AvHMessageID inMessageID);
+bool AvHSHUGetIsCombatModeTech(AvHMessageID inMessageID);
+bool AvHSHUUser3ToMessageID(AvHUser3 inUser3, AvHMessageID& outMessageID);
+bool AvHSHUMessageIDToUser3(AvHMessageID inMessageID, AvHUser3& outUser3);
+bool AvHSHUGetIsResearchTech(AvHMessageID inMessageID);
+bool AvHSHUGetIsGroupMessage(AvHMessageID inMessageID);
+bool AvHSHUGetBuildTechRange(AvHMessageID inMessageID, float& outRange);
+char* AvHSHUGetBuildTechModelName(AvHMessageID inMessageID);
+bool AvHSHUGetSizeForPlayerUser3(AvHUser3 inUser3, Vector& outMinSize, Vector& outMaxSize, bool inDucking);
+bool AvHSHUGetSizeForTech(AvHMessageID inMessageID, Vector& outMinSize, Vector& outMaxSize, bool inGetSizeToPlace = false);
+bool AvHSHUGetSizeForUser3(AvHUser3 inUser3, Vector& outMinSize, Vector& outMaxSize);
+float AvHSHUGetTime();
+bool AvHSHUGetCanDropItem(vec3_t& inCenter, Vector& inMinSize, Vector& inMaxSize, float inMaxSlopeTangent, int inIgnoredEntityIndex, bool inIgnorePlayers);
+bool AvHSHUGetIsVolumeContentNonsolid(vec3_t inCenter, Vector& inMinSize, Vector& inMaxSize, edict_t* inIgnoreEntity, bool inIgnorePlayers);
+bool AvHSHUGetIsAreaFree(vec3_t inCenter, Vector& inMinSize, Vector& inMaxSize, edict_t* inIgnoreEntity = NULL, bool inIgnorePlayers = false);
+bool AvHSHUGetEntitiesBlocking(Vector& inOrigin, Vector& inMinSize, Vector& inMaxSize, edict_t* inIgnoreEntity = NULL, bool inIgnorePlayers = false);
+void AvHSHUGetMinBuildRadiusViolations(AvHMessageID inMessageID, vec3_t& inLocation, EntityListType& outViolations);
+bool AvHSHUGetIsSiteValidForBuild(AvHMessageID inMessageID, Vector* inLocation, int inIgnoredEntityIndex = -1);
+void AvHSHUMakeViewFriendlyKillerName(string& ioKillerName);
+bool AvHSHUTraceAndGetIsSiteValidForBuild(AvHMessageID inMessageID, const Vector& inPointOfView, const Vector& inNormRay, Vector* outLocation = NULL);
+
+bool AvHSHUGetEntityAtRay(const Vector& inPointOfView, const Vector& inNormRay, int& outEntIndex);
+
+const AvHMapExtents& AvHSHUGetMapExtents();
+
+bool AvHSHUTraceTangible(const vec3_t& inStartPos, const vec3_t& inEndPos, int& outIndex, vec3_t& outLocation, AvHTeamNumber& outTeamNumber, bool& outPlayerWasHit, int& outUserThree, int& outUserFour);
+bool AvHSHUTraceTangible(const Vector& inPointOfView, const Vector& inNormRay, int* outUserThree = NULL, vec3_t* outLocation = NULL, AvHTeamNumber* outTeamNumber = NULL, bool* outPlayerWasHit = NULL);
+bool AvHSHUTraceVerticalTangible(float inX, float inY, float inZ, int& outUserThree, float& outHeight);
+bool AvHSHUTraceLineIsAreaFree(Vector& inStart, Vector& inEnd, edict_t* inIgnoreEntity = NULL, bool inIgnorePlayers = false);
+
+float AvHTraceLineAgainstWorld(Vector& vecStart, Vector& vecEnd);
+
+typedef enum
+{
+	WAYPOINT_SUCCESS,
+	WAYPOINT_NOBUILD,
+	WAYPOINT_TOOSTEEP,
+	WAYPOINT_SEETHROUGH,
+	WAYPOINT_CONTENTSFULL,
+	WAYPOINT_ENTITYHIT,
+} WaypointReturnCode;
+
+#ifdef AVH_CLIENT
+void AvHSHUClientGetFirstNonSolidPoint(const vec3_t& inStartPos, const vec3_t& inEndPos, vec3_t& outNonSolidPoint);
+bool AvHSHUClientTraceWaypoint(const vec3_t& inStartPos, const vec3_t& inEndPos, vec3_t* outLocation, WaypointReturnCode* outReturnCode = NULL);
+#endif
+
+#ifdef AVH_SERVER
+void AvHSHUServerGetFirstNonSolidPoint(const vec3_t& inStartPos, const vec3_t& inEndPos, vec3_t& outNonSolidPoint);
+bool AvHSHUServerTraceWaypoint(const vec3_t& inStartPos, const vec3_t& inEndPos, vec3_t* outLocation, WaypointReturnCode* outReturnCode);
+#endif
+
+typedef enum
+{
+	WEAPON_SOUND_INVALID,
+	WEAPON_SOUND_HUD_ON,
+	WEAPON_SOUND_HUD_OFF,
+	WEAPON_SOUND_MOVE_SELECT,
+	WEAPON_SOUND_SELECT,
+	WEAPON_SOUND_DENYSELECT
+} WeaponHUDSound;
+
+const char* AvHSHUGetCommonSoundName(bool inIsAlien, WeaponHUDSound inHUDSound);
+
+void AvHSHUGetBuildResearchState(int inUser3, int inUser4, float inFuser1, bool& outIsBuilding, bool& outIsResearching, float& outNormalizedPercentage);
+void AvHSHUSetBuildResearchState(int inUser3, int inUser4, float &outFuser1, bool inTrueBuildOrFalseResearch, float inNormalizedPercentage);
+void AvHSHUSetEnergyState(int inUser3, float &outFuser1, float inNormalizedPercentage);
+string AvHSHUBuildExecutableScriptName(const string& inScriptName, const string& inCurrentMapName);
+string AvHSHUGetTimeDateString();
+
+bool AvHSHUGetNameOfLocation(const AvHBaseInfoLocationListType& inLocations, vec3_t inLocation, string& outLocation);
+bool AvHSHUGetForceHUDSound(AvHHUDSound inHUDSound);
+
+#endif
diff --git a/main/source/mod/AvHSiegeTurret.cpp b/main/source/mod/AvHSiegeTurret.cpp
new file mode 100644
index 00000000..cbde6ce3
--- /dev/null
+++ b/main/source/mod/AvHSiegeTurret.cpp
@@ -0,0 +1,289 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: The marine siege cannon
+//
+// $Workfile: AvHSiegeTurret.cpp$
+// $Date: 2002/11/22 21:26:06 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHSiegeTurret.cpp,v $
+// Revision 1.12  2002/11/22 21:26:06  Flayra
+// - Fixed turret factory abuse, where turrets became active after recycling the nearby turret factory before turret was fully contructed.
+// - Fixed bug where siege turrets became re-activated after building a regular turret factory nearby.
+// - mp_consistency changes
+//
+// Revision 1.11  2002/11/12 02:29:11  Flayra
+// - Removed check for mp_testing with siege
+//
+// Revision 1.10  2002/11/03 04:52:18  Flayra
+// - Removed server variables, hard-coded them
+//
+// Revision 1.9  2002/10/16 01:07:36  Flayra
+// - Removed unused sounds
+//
+// Revision 1.8  2002/09/23 22:32:14  Flayra
+// - Removed minimum range for siege
+//
+// Revision 1.7  2002/08/16 02:48:09  Flayra
+// - New damage model
+//
+// Revision 1.6  2002/07/26 23:08:14  Flayra
+// - Siege don't fire at babblers
+//
+// Revision 1.5  2002/07/24 18:55:52  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.4  2002/07/23 17:27:47  Flayra
+// - Siege no longer requires LOS (so it's actual siege)
+//
+// Revision 1.3  2002/07/01 21:47:27  Flayra
+// - Added siege shockwave effect, added view shaking effects
+//
+// Revision 1.2  2002/05/28 18:07:19  Flayra
+// - Reduced tracking rate for siege
+//
+// Revision 1.1  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHSiegeTurret.h"
+#include "mod/AvHMarineEquipment.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "util/MathUtil.h"
+
+LINK_ENTITY_TO_CLASS(kwSiegeTurret, AvHSiegeTurret);
+
+extern int		gSiegeHitEventID;
+extern int		gSiegeViewHitEventID;
+
+AvHSiegeTurret::AvHSiegeTurret() : AvHMarineTurret(TECH_NULL, BUILD_SIEGE, kwsSiegeTurret, AVH_USER3_SIEGETURRET)
+{
+	float theStartTime = RANDOM_FLOAT(0, BALANCE_IVAR(kSiegeROF));
+	this->mTimeLastFired = gpGlobals->time - theStartTime;
+}
+
+void AvHSiegeTurret::CheckEnabledState()
+{
+	bool theEnabledState = false;
+
+	if(this->GetHasBeenBuilt() && !this->GetIsRecycling())
+	{
+		FOR_ALL_ENTITIES(kwsAdvancedTurretFactory, AvHTurretFactory*)
+		if((theEntity->pev->team == this->pev->team) && theEntity->GetIsBuilt() && !GetHasUpgrade(theEntity->pev->iuser4, MASK_RECYCLING))
+		{
+			// If they are a friendly, alive, turret factory
+			float the2DDistance = VectorDistance2D(this->pev->origin, theEntity->pev->origin);
+			
+			// Enabled state is true
+			if(the2DDistance <= BALANCE_IVAR(kTurretFactoryBuildDistance))
+			{
+				theEnabledState = true;
+				break;
+			}
+		}
+		END_FOR_ALL_ENTITIES(kwsAdvancedTurretFactory)
+	}
+
+	// Set enabled state
+	this->SetEnabledState(theEnabledState);
+}
+
+bool AvHSiegeTurret::GetIsValidTarget(CBaseEntity* inEntity) const
+{
+	bool theTargetIsValid = false;
+	
+	if(AvHMarineTurret::GetIsValidTarget(inEntity))
+	{
+		if(!inEntity->IsPlayer() && !FStrEq(STRING(inEntity->pev->classname), kwsBabblerProjectile))
+		{
+			float theDistanceToCurrentEnemy = AvHSUEyeToBodyDistance(this->pev, inEntity);
+			//if(theDistanceToCurrentEnemy >= this->GetMinimumRange())
+			//{
+				// We have to see it as well
+				//Vector vecMid = this->pev->origin + this->pev->view_ofs;
+				//Vector vecMidEnemy = inEntity->BodyTarget(vecMid);
+				//if(FBoxVisible(this->pev, inEntity->pev, vecMidEnemy))
+				//{
+
+				// Entities must be sighted to be hit (in view of player or scanned)
+				AvHSiegeTurret* thisTurret = const_cast<AvHSiegeTurret*>(this);
+				if(GetHasUpgrade(inEntity->pev->iuser4, MASK_VIS_SIGHTED) || inEntity->FVisible(thisTurret))
+				{
+					theTargetIsValid = true;
+				}
+				//}
+			//}
+		}
+	}
+	return theTargetIsValid;
+}
+
+int AvHSiegeTurret::GetDamageType() const
+{
+	return NS_DMG_STRUCTURAL;
+}
+
+char* AvHSiegeTurret::GetDeploySound() const
+{
+	return kSiegeDeploy;
+}
+
+char* AvHSiegeTurret::GetPingSound() const
+{
+	return kSiegePing;
+}
+
+int AvHSiegeTurret::GetPointValue(void) const
+{
+	return BALANCE_IVAR(kScoringSiegeValue);
+}
+
+//int	AvHSiegeTurret::GetMinimumRange() const
+//{
+//	return this->GetXYRange()*kSiegeTurretMinRangeScalar;
+//}
+
+char* AvHSiegeTurret::GetModelName() const
+{
+	return kSiegeTurretModel;
+}
+
+int	AvHSiegeTurret::GetXYRange() const
+{
+	return BALANCE_IVAR(kSiegeTurretRange);
+}
+
+bool AvHSiegeTurret::GetRequiresLOS() const
+{
+	return false;
+}
+
+void AvHSiegeTurret::Precache(void)
+{
+	AvHMarineTurret::Precache();
+	
+	PRECACHE_UNMODIFIED_MODEL(kSiegeTurretModel);
+	PRECACHE_UNMODIFIED_SOUND(kSiegeTurretFire1);
+	PRECACHE_UNMODIFIED_SOUND(kSiegeDeploy);
+	PRECACHE_UNMODIFIED_SOUND(kSiegePing);
+	PRECACHE_UNMODIFIED_SOUND(kSiegeHitSound1);
+	PRECACHE_UNMODIFIED_SOUND(kSiegeHitSound2);
+	this->mShockwaveTexture = PRECACHE_UNMODIFIED_MODEL(kSiegeTurretShockWave);
+}
+
+
+void AvHSiegeTurret::Shoot(const Vector &inOrigin, const Vector &inToEnemy, const Vector& inVecEnemyVelocity)
+{
+	// Only fire once every few seconds...this is hacky but there's no way to override think functions so it must be done
+	// I wish it was easier to change the update rate but it's not so...
+	if((gpGlobals->time - this->mTimeLastFired) > BALANCE_IVAR(kSiegeROF))
+	{
+		// Find enemy player in range, ignore walls and everything else
+		if(this->m_hEnemy != NULL)
+		{
+			edict_t* theEnemyEdict = this->m_hEnemy->edict();
+			entvars_t* theEnemyEntVars = this->m_hEnemy->pev;
+			CBaseEntity* theEnemyEntity = (CBaseEntity*)(this->m_hEnemy);
+
+			if(this->GetIsValidTarget(this->m_hEnemy) && theEnemyEdict && theEnemyEntVars && theEnemyEntity)
+			{
+				// Apply damage, taking upgrade into account
+				float theDamageMultiplier;
+				AvHPlayerUpgrade::GetWeaponUpgrade(this->pev->iuser3, this->pev->iuser4, &theDamageMultiplier);
+				float theDamage = theDamageMultiplier*BALANCE_IVAR(kSiegeDamage);
+
+				// Play view shake, because a big gun is going off
+				float theShakeAmplitude = 20;
+				float theShakeFrequency = 80;
+				float theShakeDuration = .3f;
+				float theShakeRadius = 240;
+				UTIL_ScreenShake(this->pev->origin, theShakeAmplitude, theShakeFrequency, theShakeDuration, theShakeRadius);
+
+				float theSiegeSplashRadius = kSiegeSplashRadius;
+				
+				// Play fire sound
+				EMIT_SOUND_DYN(ENT(this->pev), CHAN_AUTO, kSiegeTurretFire1, 1.0, ATTN_NORM, 0, PITCH_NORM);
+				
+				this->pev->effects |= EF_MUZZLEFLASH;
+				
+				// Send normal effect to all
+				PLAYBACK_EVENT_FULL(0, theEnemyEdict, gSiegeHitEventID, 0, theEnemyEntVars->origin, theEnemyEntVars->angles, 0.0, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+
+				// Play view shake where it hits as well
+				theShakeAmplitude = 60;
+				theShakeFrequency = 120;
+				theShakeDuration = 1.0f;
+				theShakeRadius = 650;
+				UTIL_ScreenShake(theEnemyEntVars->origin, theShakeAmplitude, theShakeFrequency, theShakeDuration, theShakeRadius);
+				
+				if(theEnemyEntity->IsPlayer())
+				{
+					// Send personal view shake to recipient only (check for splash here, pass param to lessen effect for others?)
+					// TODO: Use upgrade level to parameterize screen shake and fade?
+					PLAYBACK_EVENT_FULL(FEV_HOSTONLY, theEnemyEdict, gSiegeViewHitEventID, 0, theEnemyEntVars->origin, theEnemyEntVars->angles, 0.0, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+					
+					Vector theFadeColor;
+					theFadeColor.x = 255;
+					theFadeColor.y = 100;
+					theFadeColor.z = 100;
+					UTIL_ScreenFade(this->m_hEnemy, theFadeColor, .3f, 0.0f, 255, FFADE_OUT);
+				}
+
+				// blast circles
+				MESSAGE_BEGIN( MSG_PAS, SVC_TEMPENTITY, theEnemyEntVars->origin );
+					WRITE_BYTE( TE_BEAMCYLINDER );
+					WRITE_COORD( theEnemyEntVars->origin.x);
+					WRITE_COORD( theEnemyEntVars->origin.y);
+					WRITE_COORD( theEnemyEntVars->origin.z + 16);
+					WRITE_COORD( theEnemyEntVars->origin.x);
+					WRITE_COORD( theEnemyEntVars->origin.y);
+					WRITE_COORD( theEnemyEntVars->origin.z + 16 + theSiegeSplashRadius / .2); // reach damage radius over .3 seconds
+					WRITE_SHORT( this->mShockwaveTexture );
+					WRITE_BYTE( 0 ); // startframe
+					WRITE_BYTE( 0 ); // framerate
+					WRITE_BYTE( 2 ); // life
+					WRITE_BYTE( 16 );  // width
+					WRITE_BYTE( 0 );   // noise
+				
+					// Write color
+					WRITE_BYTE(188);
+					WRITE_BYTE(220);
+					WRITE_BYTE(255);
+				
+					WRITE_BYTE( 255 );		//brightness
+					WRITE_BYTE( 0 );		// speed
+				MESSAGE_END();
+
+				// Finally, do damage (do damage after sending effects because m_hEnemy seems to be going to NULL)
+				::RadiusDamage(theEnemyEntVars->origin, this->pev, this->GetAttacker()->pev, theDamage, theSiegeSplashRadius, CLASS_NONE, this->GetDamageType());
+			}
+			else
+			{
+				this->m_hEnemy = NULL;
+			}
+		}
+
+		this->mTimeLastFired = gpGlobals->time;
+	}
+}
+
+void AvHSiegeTurret::ResetEntity()
+{
+	AvHMarineTurret::ResetEntity();
+
+	this->mTimeLastFired = -1;
+}
+
+void AvHSiegeTurret::Spawn()
+{
+	AvHMarineTurret::Spawn();
+
+	this->m_fTurnRate = M_PI/3.0f;
+}
diff --git a/main/source/mod/AvHSiegeTurret.h b/main/source/mod/AvHSiegeTurret.h
new file mode 100644
index 00000000..22805cc4
--- /dev/null
+++ b/main/source/mod/AvHSiegeTurret.h
@@ -0,0 +1,74 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: The marine siege cannon
+//
+// $Workfile: AvHSiegeTurret.h$
+// $Date: 2002/11/22 21:26:06 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHSiegeTurret.h,v $
+// Revision 1.7  2002/11/22 21:26:06  Flayra
+// - Fixed turret factory abuse, where turrets became active after recycling the nearby turret factory before turret was fully contructed.
+// - Fixed bug where siege turrets became re-activated after building a regular turret factory nearby.
+// - mp_consistency changes
+//
+// Revision 1.6  2002/10/16 01:07:36  Flayra
+// - Removed unused sounds
+//
+// Revision 1.5  2002/09/23 22:32:14  Flayra
+// - Removed minimum range for siege
+//
+// Revision 1.4  2002/08/16 02:48:10  Flayra
+// - New damage model
+//
+// Revision 1.3  2002/07/23 17:27:47  Flayra
+// - Siege no longer requires LOS (so it's actual siege)
+//
+// Revision 1.2  2002/07/01 21:47:27  Flayra
+// - Added siege shockwave effect, added view shaking effects
+//
+// Revision 1.1  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_SIEGE_TURRET_H
+#define AVH_SIEGE_TURRET_H
+
+#include "mod/AvHMarineTurret.h"
+
+class AvHSiegeTurret : public AvHMarineTurret
+{
+public:
+							AvHSiegeTurret();
+
+	virtual void			CheckEnabledState();
+	virtual char*			GetDeploySound() const;
+	virtual char*			GetModelName() const;
+	virtual char*			GetPingSound() const;
+	virtual bool			GetRequiresLOS() const;
+
+	virtual int				GetDamageType() const;
+		
+	virtual bool			GetIsValidTarget(CBaseEntity* inEntity) const;
+	virtual int				GetPointValue(void) const;
+	
+	//virtual int				GetMinimumRange() const;
+	virtual int				GetXYRange() const;
+		
+	virtual void			Precache(void);
+
+	virtual void			ResetEntity();
+	virtual void			Shoot(const Vector &inOrigin, const Vector &inDirToEnemy, const Vector& inVecEnemyVelocity);
+	virtual void			Spawn();
+		
+private:
+	float					mTimeLastFired;
+	int						mShockwaveTexture;
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHSniperGun.cpp b/main/source/mod/AvHSniperGun.cpp
new file mode 100644
index 00000000..f20d37e8
--- /dev/null
+++ b/main/source/mod/AvHSniperGun.cpp
@@ -0,0 +1,115 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHSniperGun.cpp $
+// $Date: 2002/07/24 18:55:52 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHSniperGun.cpp,v $
+// Revision 1.4  2002/07/24 18:55:52  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.3  2002/06/03 16:39:10  Flayra
+// - Added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.2  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "cl_dll/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHGamerules.h"
+
+LINK_ENTITY_TO_CLASS(kwSniperGun, AvHSniperGun);
+
+BOOL AvHSniperGun::Deploy()
+{
+	return DefaultDeploy(kSniperVModel, kSniperPModel, this->GetDeployAnimation(), kSniperAnimExt);
+}
+
+void AvHSniperGun::Init()
+{
+	this->mRange = kSniperRange;
+	this->mDamage = kSniperDamage;
+	this->mROF = kSniperROF;
+}
+
+int	AvHSniperGun::GetBarrelLength() const
+{
+	return kSniperBarrelLength;
+}
+
+bool AvHSniperGun::GetFiresUnderwater() const
+{
+	return true;
+}
+
+bool AvHSniperGun::GetIsDroppable() const
+{
+	return false;
+}
+
+void AvHSniperGun::FireProjectiles(void)
+{
+	#ifdef AVH_SERVER
+	
+	UTIL_MakeVectors(this->m_pPlayer->pev->v_angle);
+
+	Vector vecAiming = gpGlobals->v_forward;
+	Vector vecSrc = this->m_pPlayer->GetGunPosition( ) + vecAiming;
+
+	// TODO: 
+
+	#endif	
+}
+
+void AvHSniperGun::Precache()
+{
+	AvHAlienWeapon::Precache();
+
+	PRECACHE_MODEL(kSniperVModel);
+	PRECACHE_MODEL(kAlienGunWModel);
+
+	PRECACHE_SOUND(kSniperFireSound);
+
+	this->mEvent = PRECACHE_EVENT(1, kSniperShootEventName);
+}
+
+void AvHSniperGun::Spawn() 
+{ 
+    AvHAlienWeapon::Spawn(); 
+
+	Precache();
+
+	this->m_iId = AVH_WEAPON_SNIPER;
+
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsSniperGun);
+
+	SET_MODEL(ENT(this->pev), kAlienGunWModel);
+
+	FallInit();// get ready to fall down.
+} 
+
+bool AvHSniperGun::UsesAmmo(void) const
+{
+	return false;
+}
+
+
diff --git a/main/source/mod/AvHSonicGun.cpp b/main/source/mod/AvHSonicGun.cpp
new file mode 100644
index 00000000..3384f8e0
--- /dev/null
+++ b/main/source/mod/AvHSonicGun.cpp
@@ -0,0 +1,294 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHSonicGun.cpp $
+// $Date: 2002/11/22 21:28:17 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHSonicGun.cpp,v $
+// Revision 1.26  2002/11/22 21:28:17  Flayra
+// - mp_consistency changes
+//
+// Revision 1.25  2002/10/24 21:33:52  Flayra
+// - Shotgun reloading fixes
+//
+// Revision 1.24  2002/10/16 20:53:10  Flayra
+// - Removed weapon upgrade sounds
+//
+// Revision 1.23  2002/10/16 01:08:11  Flayra
+// - Removed sounds that are being played by anim
+//
+// Revision 1.22  2002/10/03 18:47:18  Flayra
+// - Added heavy view model
+//
+// Revision 1.21  2002/09/25 20:51:19  Flayra
+// - Shotgun updating (oops, this fixes sound problems)
+//
+// Revision 1.20  2002/09/23 22:32:35  Flayra
+// - Fixed problem where damage upgrades sometimes were given to aliens
+//
+// Revision 1.19  2002/08/31 18:01:03  Flayra
+// - Work at VALVe
+//
+// Revision 1.18  2002/08/16 02:48:10  Flayra
+// - New damage model
+//
+// Revision 1.17  2002/08/09 00:49:34  Flayra
+// - Fixed shotgun, so it reloads each shell individually
+//
+// Revision 1.16  2002/07/24 19:09:17  Flayra
+// - Linux issues
+//
+// Revision 1.15  2002/07/24 18:45:43  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.14  2002/07/08 17:08:52  Flayra
+// - Tweaked for bullet spread
+//
+// Revision 1.13  2002/06/25 17:50:59  Flayra
+// - Reworking for correct player animations and new enable/disable state, new view model artwork, alien weapon refactoring
+//
+// Revision 1.12  2002/06/03 16:37:31  Flayra
+// - Constants and tweaks to make weapon anims and times correct with new artwork, added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.11  2002/05/28 17:44:35  Flayra
+// - Tweak weapon deploy volume, as Valve's sounds weren't normalized, started to use new reload method (reload each shell)
+//
+// Revision 1.10  2002/05/23 02:33:20  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHMarineWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHMarineWeapons.h"
+#include "mod/AvHPlayerUpgrade.h"
+
+// Anim key:
+const int kShotgunAnimIdle = 0;
+const int kShotgunAnimIdle2 = 1;
+const int kShotgunAnimGotoReload = 2;
+const int kShotgunAnimReloadShell = 3;
+const int kShotgunAnimEndReload = 4;
+const int kShotgunAnimShoot = 5;
+const int kShotgunAnimShootEmpty = 6;
+const int kShotgunAnimDraw = 7;
+const float kShotgunAnimDrawLength = .9f;
+const float kShotgunGotoReloadLength = 1.1f;
+const float kShotgunReloadShellLength = .9f;
+const float kShotgunEndReloadLength = 1.8f;
+
+LINK_ENTITY_TO_CLASS(kwShotGun, AvHSonicGun);
+void V_PunchAxis( int axis, float punch );
+
+void AvHSonicGun::Init()
+{
+	this->mRange = kSGRange;
+	this->mDamage = BALANCE_IVAR(kSGDamage);
+}
+
+int	AvHSonicGun::GetBarrelLength() const
+{
+	return kSGBarrelLength;
+}
+
+float AvHSonicGun::GetRateOfFire() const
+{
+	return BALANCE_FVAR(kSGROF);
+}
+
+int	AvHSonicGun::GetDamageType() const
+{
+	//return NS_DMG_PIERCING;
+	return NS_DMG_NORMAL;
+}
+
+int	AvHSonicGun::GetDeployAnimation() const
+{
+	return kShotgunAnimDraw;
+}
+
+char* AvHSonicGun::GetDeploySound() const
+{ 
+	//return kSGDeploySound;
+	return NULL;
+}
+
+float AvHSonicGun::GetDeployTime() const
+{
+	return kShotgunAnimDrawLength;
+}
+
+int	AvHSonicGun::GetEmptyShootAnimation() const
+{
+	return kShotgunAnimShootEmpty;
+}
+
+int AvHSonicGun::GetGotoReloadAnimation() const
+{
+    return kShotgunAnimGotoReload;
+}
+
+float AvHSonicGun::GetGotoReloadAnimationTime() const
+{
+    return kShotgunGotoReloadLength;
+}
+
+int AvHSonicGun::GetShellReloadAnimation() const
+{
+    return kShotgunAnimReloadShell;
+}
+
+float AvHSonicGun::GetShellReloadAnimationTime() const
+{
+    return kShotgunReloadShellLength;
+}
+
+int AvHSonicGun::GetEndReloadAnimation() const
+{
+    return kShotgunAnimEndReload;
+}
+
+float AvHSonicGun::GetEndReloadAnimationTime() const
+{
+    return kShotgunEndReloadLength;
+}
+
+char* AvHSonicGun::GetHeavyViewModel() const
+{
+	return kSGHVVModel;
+}
+
+char* AvHSonicGun::GetPlayerModel() const
+{
+	return kSGPModel;
+}
+
+char* AvHSonicGun::GetViewModel() const
+{
+	return kSGVModel;
+}
+
+char* AvHSonicGun::GetWorldModel() const
+{
+	return kSGWModel;
+}
+
+Vector AvHSonicGun::GetProjectileSpread() const
+{
+	return kSGSpread;
+}
+
+void AvHSonicGun::FireProjectiles(void)
+{
+	Vector vecSrc	 = m_pPlayer->GetGunPosition( );
+	Vector vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES );
+	
+	ASSERT(this->m_iPrimaryAmmoType >= 0);
+	//int theNumBullets = min(kSGBulletsPerShot, this->m_iClientClip);
+
+	float theDamageMultiplier;
+	AvHPlayerUpgrade::GetWeaponUpgrade(this->m_pPlayer->pev->iuser3, this->m_pPlayer->pev->iuser4, &theDamageMultiplier);
+	float theDamage = this->mDamage*theDamageMultiplier;
+	
+    // Fire the bullets and apply damage
+	//this->m_pPlayer->FireBullets(kSGBulletsPerShot, vecSrc, vecAiming, this->GetProjectileSpread(), this->mRange, 0, 0, theDamage);
+	this->m_pPlayer->FireBulletsPlayer(BALANCE_IVAR(kSGBulletsPerShot), vecSrc, vecAiming, this->GetProjectileSpread(), this->mRange, BULLET_PLAYER_BUCKSHOT, 0, theDamage);
+}
+
+bool AvHSonicGun::GetHasMuzzleFlash() const
+{
+	return true;
+}
+
+int	AvHSonicGun::GetIdleAnimation() const
+{
+	int theAnimation = 0;
+
+	int theRandomNum = UTIL_SharedRandomLong(this->m_pPlayer->random_seed, 0, 1);
+
+	switch(theRandomNum)
+	{
+	case 0:
+		theAnimation = kShotgunAnimIdle;
+		break;
+	case 1:
+		theAnimation = kShotgunAnimIdle2;
+		break;
+	}
+	
+	return theAnimation;
+}
+
+int AvHSonicGun::GetReloadAnimation() const
+{
+    return kShotgunAnimReloadShell;
+}
+
+float AvHSonicGun::GetReloadTime(void) const
+{
+	//return .3f;
+	return .22f;
+}
+
+int	AvHSonicGun::GetShootAnimation() const
+{
+	return kShotgunAnimShoot;
+}
+
+void AvHSonicGun::Precache()
+{
+	AvHMarineWeapon::Precache();
+	
+	PRECACHE_UNMODIFIED_MODEL(kSGEjectModel);
+	
+	PRECACHE_UNMODIFIED_SOUND(kSGFireSound1);
+	
+	#ifdef AVH_UPGRADE_SOUNDS
+	PRECACHE_UNMODIFIED_SOUND(kSGFireSound2);
+	PRECACHE_UNMODIFIED_SOUND(kSGFireSound3);
+	PRECACHE_UNMODIFIED_SOUND(kSGFireSound4);
+	#endif
+
+	PRECACHE_UNMODIFIED_SOUND(kSGReloadSound);
+	PRECACHE_UNMODIFIED_SOUND(kSGCockSound);
+	
+	PRECACHE_UNMODIFIED_MODEL(kGenericWallpuff);
+	
+	this->mEvent = PRECACHE_EVENT(1, kSGEventName);
+}
+
+void AvHSonicGun::Spawn() 
+{ 
+    AvHMarineWeapon::Spawn(); 
+	
+	Precache();
+	
+	this->m_iId = AVH_WEAPON_SONIC;
+	this->m_iDefaultAmmo = BALANCE_IVAR(kSGMaxClip);
+	
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsShotGun);
+	
+	SET_MODEL(ENT(this->pev), kSGWModel);
+
+	FallInit();// get ready to fall down.
+} 
+
diff --git a/main/source/mod/AvHSoundConstants.h b/main/source/mod/AvHSoundConstants.h
new file mode 100644
index 00000000..bf501918
--- /dev/null
+++ b/main/source/mod/AvHSoundConstants.h
@@ -0,0 +1,20 @@
+#ifndef AVH_SOUND_CONST_H
+#define AVH_SOUND_CONST_H
+
+#define kHeavyFootstepExtension "-h"
+#define kAlienFootstepExtension "-a"
+#define kAlien1FootstepExtension "-a1"
+#define kAlien5FootstepExtension "-a5"
+#define kFootstepDirectory "player/"
+
+#define kConcreteBaseName "pl_step"
+#define kMetalBaseName "pl_metal"
+#define kDirtBaseName "pl_dirt"
+#define kDuctBaseName "pl_duct"
+#define kGrateBaseName "pl_grate"
+#define kTileBaseName "pl_tile"
+#define kSloshBaseName "pl_slosh"
+#define kWadeBaseName "pl_wade"
+#define kLadderBaseName "pl_ladder"
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHSoundListManager.cpp b/main/source/mod/AvHSoundListManager.cpp
new file mode 100644
index 00000000..ded98ec5
--- /dev/null
+++ b/main/source/mod/AvHSoundListManager.cpp
@@ -0,0 +1,166 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHSoundListManager.cpp $
+// $Date: 2002/11/22 21:28:17 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHSoundListManager.cpp,v $
+// Revision 1.10  2002/11/22 21:28:17  Flayra
+// - mp_consistency changes
+//
+// Revision 1.9  2002/09/09 20:06:56  Flayra
+// - Added custom attention parameter
+//
+// Revision 1.8  2002/07/26 01:51:57  Flayra
+// - Linux support for FindFirst/FindNext
+//
+// Revision 1.7  2002/07/25 16:58:00  flayra
+// - Linux changes
+//
+// Revision 1.6  2002/07/01 21:48:10  Flayra
+// - Added debug code, added document headers
+//
+//===============================================================================
+#include "mod/AvHSoundListManager.h"
+#include "extdll.h"
+#include "dlls/util.h"
+#include "cbase.h"
+#include "mod/AvHConstants.h"
+#include "util/STLUtil.h"
+
+#define kMaxNumberLists 200
+
+AvHSoundListManager::AvHSoundListManager()
+{
+	// Needed so strings are allocated and moved around after being precached
+	this->mSoundList.resize(kMaxNumberLists);
+}
+
+bool AvHSoundListManager::BuildSoundList(const string& inDirName, CStringList& outList)
+{
+	bool theSuccess = false;
+
+	string theBaseDirectoryName = string(getModDirectory()) + string("/") + string(kSoundDirectory) + string("/");
+	string theFullDirName = inDirName;
+	if(BuildFileList(theBaseDirectoryName, theFullDirName, "*.wav", outList))
+	{
+	    theSuccess = true;
+	}
+	
+	return theSuccess;
+}
+
+void AvHSoundListManager::Clear()
+{
+	this->mSoundList.clear();
+}
+
+SoundListType::iterator	AvHSoundListManager::GetSoundList(const string& inKey)
+{
+	// TODO: lower case inDirName and save as theKey
+	string theKey = inKey;
+	
+	// Check if we have a sound list with this name
+	SoundListType::iterator	theIterator;
+	for(theIterator = this->mSoundList.begin(); theIterator != this->mSoundList.end(); theIterator++)
+	{
+		if(theIterator->first == theKey)
+		{
+			break;
+		}
+	}
+
+	return theIterator;
+}
+
+bool AvHSoundListManager::PrecacheSoundList(const string& inDirName)
+{
+	bool theReturnValue = false;
+
+	// Check if we have a sound list with this name
+	SoundListType::iterator theIter = this->GetSoundList(inDirName);
+
+	// If so, return false
+	if(theIter == this->mSoundList.end())
+	{
+		// If not, read list of all sound files in this directory, add this to the list with theKey as a key
+		CStringList theNewSoundList;
+		if(this->BuildSoundList(inDirName, theNewSoundList))
+		{
+			// Save entry
+			this->mSoundList.push_back(make_pair(inDirName, theNewSoundList));
+
+			// NOW, precache each sound because it remembers the pointer, so it has to be the final version <sigh>
+			SoundListType::iterator theIter = this->GetSoundList(inDirName);
+			ASSERT(theIter != this->mSoundList.end());
+			
+			// Get number of entries
+			CStringList& theList = theIter->second;
+			int theNumEntries = theList.size();
+			for(int i = 0; i < theNumEntries; i++)
+			{
+				CString& theSoundToPrecache = theIter->second[i];
+
+				int iString = ALLOC_STRING((char*)theSoundToPrecache);//voogru: We cant do "(char*)theSoundToPrecache" directly cause it causes some wierd problems.
+				PRECACHE_UNMODIFIED_SOUND((char*)STRING(iString));
+
+				// Success
+				theReturnValue = true;
+			}
+		}
+		else
+		{
+			int a = 0;
+		}
+	}
+	return theReturnValue;
+}
+
+bool AvHSoundListManager::PlaySoundInList(const string& inDirName, CBaseEntity* inEntity, int inChannel, float inVolume, float inAttenuation)
+{
+	bool theReturnValue = false;
+
+	// Check if we have a sound list with this name
+	SoundListType::iterator theIter = this->GetSoundList(inDirName);
+
+	// If not, return false
+	if(theIter != this->mSoundList.end())
+	{
+		// Get number of entries
+		CStringList& theList = theIter->second;
+		int theNumEntries = theList.size();
+		if(theNumEntries > 0)
+		{
+			// Pick one at random
+			int theOneToPlay = RANDOM_LONG(0, theNumEntries - 1);
+			
+			// Play it!
+			CString& theSoundToPlay = theIter->second[theOneToPlay];
+			char* theCStrToPlay = (char*)theSoundToPlay;
+			if(theCStrToPlay)
+			{
+				//UTIL_LogPrintf("AvHSoundListManager::Playing sound: %s\n", theCStrToPlay);
+
+				EMIT_SOUND(ENT(inEntity->pev), inChannel, theCStrToPlay, inVolume, inAttenuation);
+				//int theRandomChannel = RANDOM_LONG(0, 6);
+				//EMIT_SOUND_DYN(ENT(inEntity->pev), , (char*)theSoundToPlay, 1.0, ATTN_NORM, 0, 95);
+				
+				theReturnValue = true;
+			}
+			else
+			{
+				int a = 0;
+			}
+		}
+	}
+
+	return theReturnValue;
+}
+
diff --git a/main/source/mod/AvHSoundListManager.h b/main/source/mod/AvHSoundListManager.h
new file mode 100644
index 00000000..48110fc2
--- /dev/null
+++ b/main/source/mod/AvHSoundListManager.h
@@ -0,0 +1,54 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHSoundListManager.h $
+// $Date: 2002/09/09 20:06:56 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHSoundListManager.h,v $
+// Revision 1.5  2002/09/09 20:06:56  Flayra
+// - Added custom attention parameter
+//
+// Revision 1.4  2002/07/26 01:51:57  Flayra
+// - Linux support for FindFirst/FindNext
+//
+// Revision 1.3  2002/07/01 21:48:11  Flayra
+// - Added debug code, added document headers
+//
+//===============================================================================
+#ifndef AVHSOUNDLISTMANAGER_H
+#define AVHSOUNDLISTMANAGER_H
+
+#include "types.h"
+#include "util/CString.h"
+class CBaseEntity;
+
+typedef vector< pair<string, CStringList> >	SoundListType;
+
+class AvHSoundListManager
+{
+public:
+	AvHSoundListManager();
+
+	void Clear();
+
+	bool PrecacheSoundList(const string& inDirName);
+
+	// Channel is CHAN_AUTO just didn't want to include the world
+	bool PlaySoundInList(const string& inDirName, CBaseEntity* inEntity, int inChannel = 0, float inVolume = 1.0f, float inAttenuation = .8f);
+
+private:
+	bool BuildSoundList(const string& inDirName, CStringList& outList);
+
+	SoundListType::iterator		GetSoundList(const string& inKey);
+
+	SoundListType				mSoundList;
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHSpawn.cpp b/main/source/mod/AvHSpawn.cpp
new file mode 100644
index 00000000..1478d0bb
--- /dev/null
+++ b/main/source/mod/AvHSpawn.cpp
@@ -0,0 +1,41 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHSpawn.cpp $
+// $Date: $
+//
+//-------------------------------------------------------------------------------
+// $Log: $
+//===============================================================================
+#include "mod/AvHSpawn.h"
+
+AvHSpawn::AvHSpawn(const string& inClassName, const Vector& inOrigin, const Vector& inAngles, const AvHTeamNumber inTeamNumber) : mClassName(inClassName), mOrigin(inOrigin), mAngles(inAngles), mTeamNumber(inTeamNumber)
+{
+}
+
+string AvHSpawn::GetClassName() const
+{
+	return this->mClassName;
+}
+
+Vector AvHSpawn::GetOrigin() const
+{
+	return this->mOrigin;
+}
+
+Vector AvHSpawn::GetAngles() const
+{
+	return this->mAngles;
+}
+
+AvHTeamNumber AvHSpawn::GetTeamNumber() const
+{
+	return this->mTeamNumber;
+}
+
diff --git a/main/source/mod/AvHSpawn.h b/main/source/mod/AvHSpawn.h
new file mode 100644
index 00000000..0c6037ca
--- /dev/null
+++ b/main/source/mod/AvHSpawn.h
@@ -0,0 +1,44 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile:  $
+// $Date: $
+//
+//-------------------------------------------------------------------------------
+// $Log: $
+//===============================================================================
+#ifndef AVH_SPAWN_H
+#define AVH_SPAWN_H
+
+#include "util/nowarnings.h"
+#include "extdll.h"
+#include "util.h"
+#include "mod/AvHConstants.h"
+#include <vector>
+
+class AvHSpawn
+{
+public:
+	AvHSpawn(const string& inClassName, const Vector& inOrigin, const Vector& inAngles, const AvHTeamNumber inTeamNumber);
+
+	string				GetClassName() const;
+	Vector				GetOrigin() const;
+	Vector				GetAngles() const;
+	AvHTeamNumber		GetTeamNumber() const;
+
+private:
+	string				mClassName;
+	Vector				mOrigin;
+	Vector				mAngles;
+	AvHTeamNumber		mTeamNumber;
+};
+
+typedef vector<AvHSpawn>	SpawnListType;
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHSpecials.cpp b/main/source/mod/AvHSpecials.cpp
new file mode 100644
index 00000000..c69345c6
--- /dev/null
+++ b/main/source/mod/AvHSpecials.cpp
@@ -0,0 +1,778 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHSpecials.cpp $
+// $Date: 2002/10/24 21:42:50 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHSpecials.cpp,v $
+// Revision 1.15  2002/10/24 21:42:50  Flayra
+// - Fix for allowing multiple upgrades of the same familiy
+//
+// Revision 1.14  2002/09/23 22:32:51  Flayra
+// - Removed power armor
+// - Added heavy armor and jetpacks
+//
+// Revision 1.13  2002/07/23 17:28:39  Flayra
+// - New constants for phase gates and alien buildings, new marine upgrades
+//
+// Revision 1.12  2002/07/08 17:18:29  Flayra
+// - Mark spawn points (can't remember why this is needed), updated comments, removed offensive upgrade code
+//
+// Revision 1.11  2002/06/25 18:19:17  Flayra
+// - Removed old offensive upgrades
+//
+// Revision 1.10  2002/05/23 02:32:57  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "util/nowarnings.h"
+#include "mod/AvHSpecials.h"
+#include "localassert.h"
+#include "mod/AvHConstants.h"
+
+void InitializeBuildable(int& inUser3, int& inUser4, float& inFuser1, int inUser3ID)
+{
+	inUser3 = inUser3ID;
+
+	inUser4 = 0;
+	SetUpgradeMask(&inUser4, MASK_BUILDABLE);
+	SetUpgradeMask(&inUser4, MASK_SELECTABLE);
+
+	inFuser1 = 0.0f;
+}
+
+
+void ClearUpgradeMask(int* inPointer, AvHUpgradeMask inUpgradeMask)
+{
+	int* thePointer = (int*)inPointer;
+	*thePointer &= ~inUpgradeMask;
+}
+
+bool GetHasUpgrade(int inUpgrade, AvHUpgradeMask inUpgradeMask)
+{
+	return inUpgrade & inUpgradeMask;
+}
+
+void SetUpgradeMask(int* inPointer, AvHUpgradeMask inUpgradeMask, bool inSet)
+{
+	if(inSet)
+	{
+		int* thePointer = (int*)inPointer;
+		*thePointer |= inUpgradeMask;
+	}
+	else
+	{
+		ClearUpgradeMask(inPointer, inUpgradeMask);
+	}
+}
+
+AvHUpgradeMask ProcessGenericUpgrade(int& inUpgradeVariable, AvHMessageID inUpgrade, bool inGive)
+{
+	AvHUpgradeMask theUpgradeMask = MASK_NONE;
+
+	switch(inUpgrade)
+	{
+	case RESEARCH_WEAPONS_ONE:
+		SetUpgradeMask(&inUpgradeVariable, MASK_UPGRADE_1, inGive);
+		theUpgradeMask = MASK_UPGRADE_1;
+		break;
+		
+	case RESEARCH_WEAPONS_TWO:
+		SetUpgradeMask(&inUpgradeVariable, MASK_UPGRADE_2, inGive);
+		theUpgradeMask = MASK_UPGRADE_2;
+		break;
+		
+	case RESEARCH_WEAPONS_THREE:
+		SetUpgradeMask(&inUpgradeVariable, MASK_UPGRADE_3, inGive);
+		theUpgradeMask = MASK_UPGRADE_3;
+		break;
+		
+	case RESEARCH_ARMOR_ONE:
+		SetUpgradeMask(&inUpgradeVariable, MASK_UPGRADE_4, inGive);
+		theUpgradeMask = MASK_UPGRADE_4;
+		break;
+		
+	case RESEARCH_ARMOR_TWO:
+		SetUpgradeMask(&inUpgradeVariable, MASK_UPGRADE_5, inGive);
+		theUpgradeMask = MASK_UPGRADE_5;
+		break;
+		
+	case RESEARCH_ARMOR_THREE:
+		SetUpgradeMask(&inUpgradeVariable, MASK_UPGRADE_6, inGive);
+		theUpgradeMask = MASK_UPGRADE_6;
+		break;
+
+	case RESEARCH_MOTIONTRACK:
+		SetUpgradeMask(&inUpgradeVariable, MASK_UPGRADE_8, inGive);
+		theUpgradeMask = MASK_UPGRADE_8;
+		break;
+
+    case BUILD_HEAVY:
+        SetUpgradeMask(&inUpgradeVariable, MASK_UPGRADE_13, inGive);
+        theUpgradeMask = MASK_UPGRADE_13;
+        break;
+
+    case BUILD_JETPACK:
+        SetUpgradeMask(&inUpgradeVariable, MASK_UPGRADE_7, inGive);
+        theUpgradeMask = MASK_UPGRADE_7;
+        break;
+
+	// Alien upgrades
+	case ALIEN_EVOLUTION_ONE:
+	case ALIEN_EVOLUTION_TWO:
+	case ALIEN_EVOLUTION_THREE:
+	case ALIEN_EVOLUTION_SEVEN:
+	case ALIEN_EVOLUTION_EIGHT:
+	case ALIEN_EVOLUTION_NINE:
+	case ALIEN_EVOLUTION_TEN:
+	case ALIEN_EVOLUTION_ELEVEN:
+	case ALIEN_EVOLUTION_TWELVE:
+		{
+			if(!AvHGetAlienUpgradeMask(inUpgrade, theUpgradeMask))
+			{
+				ASSERT(false);
+			}
+			SetUpgradeMask(&inUpgradeVariable, theUpgradeMask, inGive);
+		}
+		break;
+		
+		//default:
+		//	ASSERT(false);
+		//	break;
+	}
+	return theUpgradeMask;
+}
+
+
+//// Remove the mask part and return the base.  This function should be changed when the user3 variable mask is changed 
+//int AvHGetUser3Base(int inUser3)
+//{
+//	int theUser3 = inUser3;
+//	theUser3 &= ~AVH_USER3_VIS_SIGHTED;
+//	theUser3 &= ~AVH_USER3_VIS_DETECTED;
+//	return theUser3;
+//}
+
+//int AvHGetUser4Base(int inUser4)
+//{
+//	int theUser4 = inUser4;
+//	
+//	// Return only the bottom byte
+//	theUser4 &= 0x000000FF;
+//	
+//	return theUser4;
+//}
+//
+//int AvHGetUser4Extra(int inUser4)
+//{
+//	int theUser4 = inUser4;
+//	
+//	// Return only the top bit
+//	theUser4 &= 0xFFFFFF00;
+//	theUser4 >> 8;
+//	
+//	return theUser4;
+//}
+//
+//void AvHSetUser4(int& inUser4, int inBase, int inExtra)
+//{
+//	ASSERT(inBase < 0xFF);
+//	ASSERT(inExtra < 0xFFFFFF);
+//
+//	inUser4 = (inBase & 0x000000FF);
+//	inUser4 |= (inExtra << 8);
+//}
+
+bool AvHGetAlienUpgradeCategory(AvHMessageID inUpgrade, AvHAlienUpgradeCategory& outCategory)
+{
+	bool theSuccess = false;
+
+	switch(inUpgrade)
+	{
+	case ALIEN_EVOLUTION_ONE:
+	case ALIEN_EVOLUTION_TWO:
+	case ALIEN_EVOLUTION_THREE:
+		outCategory = ALIEN_UPGRADE_CATEGORY_DEFENSE;
+		theSuccess = true;
+		break;
+	//case ALIEN_EVOLUTION_FOUR:
+	//case ALIEN_EVOLUTION_FIVE:
+	//case ALIEN_EVOLUTION_SIX:
+	//	outCategory = ALIEN_UPGRADE_CATEGORY_OFFENSE;
+	//	theSuccess = true;
+	//	break;
+	case ALIEN_EVOLUTION_SEVEN:
+	case ALIEN_EVOLUTION_EIGHT:
+	case ALIEN_EVOLUTION_NINE:
+		outCategory = ALIEN_UPGRADE_CATEGORY_MOVEMENT;
+		theSuccess = true;
+		break;
+	case ALIEN_EVOLUTION_TEN:
+	case ALIEN_EVOLUTION_ELEVEN:
+	case ALIEN_EVOLUTION_TWELVE:
+		outCategory = ALIEN_UPGRADE_CATEGORY_SENSORY;
+		theSuccess = true;
+		break;
+	}
+	
+	return theSuccess;
+}
+
+bool AvHGetAlienUpgradeCategoryFromMask(AvHUpgradeMask inUpgradeMask, AvHAlienUpgradeCategory& outCategory)
+{
+	bool theSuccess = false;
+
+	switch(inUpgradeMask)
+	{
+	case MASK_UPGRADE_1:
+	case MASK_UPGRADE_2:
+	case MASK_UPGRADE_3:
+		outCategory = ALIEN_UPGRADE_CATEGORY_DEFENSE;
+		theSuccess = true;
+		break;
+
+//	case MASK_PLACEHOLDER1:
+//	case MASK_PLACEHOLDER2:
+//	case MASK_PLACEHOLDER3:
+//		outCategory = ALIEN_UPGRADE_CATEGORY_OFFENSE;
+//		theSuccess = true;
+//		break;
+		
+	case MASK_UPGRADE_4:
+	case MASK_UPGRADE_5:
+	case MASK_UPGRADE_6:
+		outCategory = ALIEN_UPGRADE_CATEGORY_MOVEMENT;
+		theSuccess = true;
+		break;
+		
+	case MASK_UPGRADE_7:
+	case MASK_UPGRADE_8:
+	case MASK_UPGRADE_9:
+		outCategory = ALIEN_UPGRADE_CATEGORY_SENSORY;
+		theSuccess = true;
+		break;
+	}
+	
+	return theSuccess;
+}
+
+int AvHGetAlienUpgradeLevel(int inUser4, AvHUpgradeMask inMask)
+{
+	int theLevel = 0;
+
+	if(GetHasUpgrade(inUser4, inMask))
+	{
+		theLevel = 1;
+
+		switch(inMask)
+		{
+		// Defensive upgrades
+		case MASK_UPGRADE_1:
+		case MASK_UPGRADE_2:
+		case MASK_UPGRADE_3:
+			if(GetHasUpgrade(inUser4, MASK_UPGRADE_10))
+			{
+				theLevel = 2;
+			}
+			if(GetHasUpgrade(inUser4, MASK_UPGRADE_11))
+			{
+				theLevel = 3;
+			}
+			break;
+		
+		// Movement upgrades
+		case MASK_UPGRADE_4:
+		case MASK_UPGRADE_5:
+		case MASK_UPGRADE_6:
+			if(GetHasUpgrade(inUser4, MASK_UPGRADE_12))
+			{
+				theLevel = 2;
+			}
+			if(GetHasUpgrade(inUser4, MASK_UPGRADE_13))
+			{
+				theLevel = 3;
+			}
+			break;
+			
+		// Sensory upgrades
+		case MASK_UPGRADE_7:
+		case MASK_UPGRADE_8:
+		case MASK_UPGRADE_9:
+			if(GetHasUpgrade(inUser4, MASK_UPGRADE_14))
+			{
+				theLevel = 2;
+			}
+			if(GetHasUpgrade(inUser4, MASK_UPGRADE_15))
+			{
+				theLevel = 3;
+			}
+			break;
+		}
+	}
+	return theLevel;
+}
+
+bool AvHGetAlienUpgradeMask(AvHMessageID inUpgrade, AvHUpgradeMask& outUpgradeMask)
+{
+	bool theSuccess = false;
+	
+	switch(inUpgrade)
+	{
+	case ALIEN_EVOLUTION_ONE:
+		outUpgradeMask = MASK_UPGRADE_1;
+		theSuccess = true;
+		break;
+	case ALIEN_EVOLUTION_TWO:
+		outUpgradeMask = MASK_UPGRADE_2;
+		theSuccess = true;
+		break;
+	case ALIEN_EVOLUTION_THREE:
+		outUpgradeMask = MASK_UPGRADE_3;
+		theSuccess = true;
+		break;
+//	case ALIEN_EVOLUTION_FOUR:
+//		outUpgradeMask = MASK_PLACEHOLDER1;
+//		theSuccess = true;
+//		break;
+//	case ALIEN_EVOLUTION_FIVE:
+//		outUpgradeMask = MASK_PLACEHOLDER2;
+//		theSuccess = true;
+//		break;
+//	case ALIEN_EVOLUTION_SIX:
+//		outUpgradeMask = MASK_PLACEHOLDER3;
+//		theSuccess = true;
+//		break;
+	case ALIEN_EVOLUTION_SEVEN:
+		outUpgradeMask = MASK_UPGRADE_4;
+		theSuccess = true;
+		break;
+	case ALIEN_EVOLUTION_EIGHT:
+		outUpgradeMask = MASK_UPGRADE_5;
+		theSuccess = true;
+		break;
+	case ALIEN_EVOLUTION_NINE:
+		outUpgradeMask = MASK_UPGRADE_6;
+		theSuccess = true;
+		break;
+	case ALIEN_EVOLUTION_TEN:
+		outUpgradeMask = MASK_UPGRADE_7;
+		theSuccess = true;
+		break;
+	case ALIEN_EVOLUTION_ELEVEN:
+		outUpgradeMask = MASK_UPGRADE_8;
+		theSuccess = true;
+		break;
+	case ALIEN_EVOLUTION_TWELVE:
+		outUpgradeMask = MASK_UPGRADE_9;
+		theSuccess = true;
+		break;
+	}
+	return theSuccess;
+}
+
+
+bool AvHGetHasFreeUpgradeCategory(AvHAlienUpgradeCategory inUpgradeCategory, const AvHAlienUpgradeListType& inList, int inUser4, int* outNumFree)
+{
+	bool theSuccess = false;
+
+	// Count how many upgrades of this category the player already has
+	int theNumUpgradesAlreadyHave = AvHGetNumUpgradesInCategory(inUpgradeCategory, inUser4);
+
+	// Count how many upgrades of this category in the list
+	int theNumUpgradesInCategoryInList = min(kMaxUpgradeLevel, AvHGetNumUpgradesInCategoryInList(inList, inUpgradeCategory));
+
+	if(theNumUpgradesAlreadyHave < theNumUpgradesInCategoryInList)
+	{
+		if(outNumFree)
+		{
+			*outNumFree = theNumUpgradesInCategoryInList - theNumUpgradesAlreadyHave;
+		}
+		theSuccess = true;
+	}
+	
+	return theSuccess;
+}
+
+bool AvHGetHasUpgradeChoiceInCategory(AvHAlienUpgradeCategory inUpgradeCategory, const AvHAlienUpgradeListType& inList, int inUser4)
+{
+	bool theSuccess = false;
+	
+	// Count how many upgrades of this category the player already has
+	int theNumUpgradesAlreadyHave = AvHGetNumUpgradesInCategory(inUpgradeCategory, inUser4);
+	
+	// Count how many upgrades of this category in the list
+	int theNumUpgradesInCategoryInList = AvHGetNumUpgradesInCategoryInList(inList, inUpgradeCategory);
+
+	// Can only choose upgrade when we have chosen none
+	if((theNumUpgradesAlreadyHave == 0) && (theNumUpgradesInCategoryInList > 0))
+	{
+		theSuccess = true;
+	}
+	
+	return theSuccess;
+}
+
+
+
+bool AvHGetIsAlien(int inUser3)
+{
+	bool theIsAlien = false;
+
+	if(inUser3 == AVH_USER3_ALIEN_PLAYER1)
+	{
+		theIsAlien = true;
+	}
+	else if(inUser3 == AVH_USER3_ALIEN_PLAYER2)
+	{
+		theIsAlien = true;
+	}
+	else if(inUser3 == AVH_USER3_ALIEN_PLAYER3)
+	{
+		theIsAlien = true;
+	}
+	else if(inUser3 == AVH_USER3_ALIEN_PLAYER4)
+	{
+		theIsAlien = true;
+	}
+	else if(inUser3 == AVH_USER3_ALIEN_PLAYER5)
+	{
+		theIsAlien = true;
+	}
+	return theIsAlien;
+}
+
+int AvHGetNumUpgradesInCategory(AvHAlienUpgradeCategory inUpgradeCategory, int inUser4)
+{
+	int theNumUpgrades = 0;
+	
+	ASSERT(inUpgradeCategory != ALIEN_UPGRADE_CATEGORY_INVALID);
+	
+	switch(inUpgradeCategory)
+	{
+	case ALIEN_UPGRADE_CATEGORY_DEFENSE:
+		theNumUpgrades = 0;
+		theNumUpgrades += (GetHasUpgrade(inUser4, MASK_UPGRADE_1) || GetHasUpgrade(inUser4, MASK_UPGRADE_2) || GetHasUpgrade(inUser4, MASK_UPGRADE_3)) ? 1 : 0;
+		if(GetHasUpgrade(inUser4, MASK_UPGRADE_10))
+		{
+			theNumUpgrades = 2;
+		}
+		else if(GetHasUpgrade(inUser4, MASK_UPGRADE_11))
+		{
+			theNumUpgrades = 3;
+		}
+		break;
+//	case ALIEN_UPGRADE_CATEGORY_OFFENSE:
+//		theNumUpgrades = 0;
+//		theNumUpgrades += (GetHasUpgrade(inUser4, MASK_PLACEHOLDER1) || GetHasUpgrade(inUser4, MASK_PLACEHOLDER2) || GetHasUpgrade(inUser4, MASK_PLACEHOLDER3)) ? 1 : 0;
+		// TODO: Add these when neeeded
+		//theNumUpgrades += GetHasUpgrade(inUser4, MASK_UPGRADE_10) ? 1 : 0;
+		//theNumUpgrades += GetHasUpgrade(inUser4, MASK_UPGRADE_11) ? 1 : 0;
+//		break;
+	case ALIEN_UPGRADE_CATEGORY_MOVEMENT:
+		theNumUpgrades = 0;
+		theNumUpgrades += (GetHasUpgrade(inUser4, MASK_UPGRADE_4) || GetHasUpgrade(inUser4, MASK_UPGRADE_5) || GetHasUpgrade(inUser4, MASK_UPGRADE_6)) ? 1 : 0;
+		if(GetHasUpgrade(inUser4, MASK_UPGRADE_12))
+		{
+			theNumUpgrades = 2;
+		}
+		else if(GetHasUpgrade(inUser4, MASK_UPGRADE_13))
+		{
+			theNumUpgrades = 3;
+		}
+		break;
+	case ALIEN_UPGRADE_CATEGORY_SENSORY:
+		theNumUpgrades = 0;
+		theNumUpgrades += (GetHasUpgrade(inUser4, MASK_UPGRADE_7) || GetHasUpgrade(inUser4, MASK_UPGRADE_8) || GetHasUpgrade(inUser4, MASK_UPGRADE_9)) ? 1 : 0;
+		if(GetHasUpgrade(inUser4, MASK_UPGRADE_14))
+		{
+			theNumUpgrades = 2;
+		}
+		else if(GetHasUpgrade(inUser4, MASK_UPGRADE_15))
+		{
+			theNumUpgrades = 3;
+		}
+		break;
+	}
+	
+	return theNumUpgrades;
+}
+
+int AvHGetNumUpgradesInCategoryInList(const AvHAlienUpgradeListType& inList, AvHAlienUpgradeCategory inUpgradeCategory)
+{
+	int theNumUpgradesInCategoryInList = 0;
+	
+	for(AvHAlienUpgradeListType::const_iterator theIter = inList.begin(); theIter != inList.end(); theIter++)
+	{
+		if(*theIter == inUpgradeCategory)
+		{
+			theNumUpgradesInCategoryInList++;
+		}
+	}
+	return theNumUpgradesInCategoryInList;
+	
+}
+
+void AvHAddHigherLevelUpgrades(const AvHAlienUpgradeListType& inList, int& inUser4)
+{
+	ASSERT(ALIEN_UPGRADE_CATEGORY_DEFENSE == 1);
+	ASSERT(ALIEN_UPGRADE_CATEGORY_SENSORY == (ALIEN_UPGRADE_CATEGORY_MAX_PLUS_ONE - 1));
+	
+	for(int i = (int)(ALIEN_UPGRADE_CATEGORY_DEFENSE); i < (int)(ALIEN_UPGRADE_CATEGORY_MAX_PLUS_ONE); i++)
+	{
+		AvHAlienUpgradeCategory theCurrentCategory = (AvHAlienUpgradeCategory)(i);
+		int theNumUpgradesInCategory = AvHGetNumUpgradesInCategory(theCurrentCategory, inUser4);
+		int theNumUpgradesInCategoryInList = AvHGetNumUpgradesInCategoryInList(inList, theCurrentCategory);
+		while(theNumUpgradesInCategoryInList > theNumUpgradesInCategory)
+		{
+			AvHAddUpgradeInCategory(theCurrentCategory, inUser4);
+			theNumUpgradesInCategory += 1;
+		}
+	}
+}
+
+void AvHRemoveIrrelevantUpgrades(AvHAlienUpgradeListType& inList)
+{
+	// Remove any upgrades that aren't helping
+	for(int i = (int)(ALIEN_UPGRADE_CATEGORY_DEFENSE); i < (int)(ALIEN_UPGRADE_CATEGORY_MAX_PLUS_ONE); i++)
+	{
+		AvHAlienUpgradeCategory theCurrentCategory = (AvHAlienUpgradeCategory)(i);
+
+		int theNumUpgradeCategories = AvHGetNumUpgradesInCategoryInList(inList, theCurrentCategory);
+		while(theNumUpgradeCategories > kNumUpgradeLevelsInCategory)
+		{
+			AvHRemoveUpgradeCategory(theCurrentCategory, inList);
+			theNumUpgradeCategories = AvHGetNumUpgradesInCategoryInList(inList, theCurrentCategory);
+		}
+	}
+}
+
+int AvHRemoveExcessUpgrades(const AvHAlienUpgradeListType& inList, int& inUser4)
+{
+	// Count number of upgrades in each category, removing any in excess
+	ASSERT(ALIEN_UPGRADE_CATEGORY_DEFENSE == 1);
+	ASSERT(ALIEN_UPGRADE_CATEGORY_SENSORY == (ALIEN_UPGRADE_CATEGORY_MAX_PLUS_ONE - 1));
+	
+	int theNumberRemoved = 0;
+	
+	for(int i = (int)(ALIEN_UPGRADE_CATEGORY_DEFENSE); i < (int)(ALIEN_UPGRADE_CATEGORY_MAX_PLUS_ONE); i++)
+	{
+		AvHAlienUpgradeCategory theCurrentCategory = (AvHAlienUpgradeCategory)(i);
+		int theNumUpgradesInCategory = AvHGetNumUpgradesInCategory(theCurrentCategory, inUser4);
+		int theNumUpgradesInCategoryInList = AvHGetNumUpgradesInCategoryInList(inList, theCurrentCategory);
+		while(theNumUpgradesInCategory > theNumUpgradesInCategoryInList)
+		{
+			AvHRemoveUpgradeInCategory(theCurrentCategory, inUser4);
+			theNumUpgradesInCategory -= 1;
+			
+			theNumberRemoved++;
+		}
+	}
+	
+	return theNumberRemoved;
+}
+
+void AvHAddUpgradeInCategory(AvHAlienUpgradeCategory inUpgradeCategory, int& inUser4)
+{
+	int theNumUpgradesInCategory = AvHGetNumUpgradesInCategory(inUpgradeCategory, inUser4);
+	switch(inUpgradeCategory)
+	{
+	case ALIEN_UPGRADE_CATEGORY_DEFENSE:
+		if(theNumUpgradesInCategory == 1)
+		{
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_10);
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_11, false);
+		}
+		else if(theNumUpgradesInCategory == 2)
+		{
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_10, false);
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_11);
+		}
+		break;
+	case ALIEN_UPGRADE_CATEGORY_MOVEMENT:
+		if(theNumUpgradesInCategory == 1)
+		{
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_12);
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_13, false);
+		}
+		else if(theNumUpgradesInCategory == 2)
+		{
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_12, false);
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_13);
+		}
+		break;
+	case ALIEN_UPGRADE_CATEGORY_SENSORY:
+		if(theNumUpgradesInCategory == 1)
+		{
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_14);
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_15, false);
+		}
+		else if(theNumUpgradesInCategory == 2)
+		{
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_14, false);
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_15);
+		}
+		break;
+	}
+}
+
+void AvHRemoveUpgradeInCategory(AvHAlienUpgradeCategory inUpgradeCategory, int& inUser4)
+{
+	int theNumUpgradesInCategory = AvHGetNumUpgradesInCategory(inUpgradeCategory, inUser4);
+	switch(inUpgradeCategory)
+	{
+	case ALIEN_UPGRADE_CATEGORY_DEFENSE:
+		if(theNumUpgradesInCategory == 1)
+		{
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_1, false);
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_2, false);
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_3, false);
+		}
+		else if(theNumUpgradesInCategory == 2)
+		{
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_10, false);
+		}
+		else if(theNumUpgradesInCategory == 3)
+		{
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_11, false);
+		}
+		break;
+//	case ALIEN_UPGRADE_CATEGORY_OFFENSE:
+//		if(theNumUpgradesInCategory == 1)
+//		{
+//			SetUpgradeMask(&inUser4, MASK_PLACEHOLDER1, false);
+//			SetUpgradeMask(&inUser4, MASK_PLACEHOLDER2, false);
+//			SetUpgradeMask(&inUser4, MASK_PLACEHOLDER3, false);
+//		}
+		// TODO: Add this when needed
+//		else if(theNumUpgradesInCategory == 2)
+//		{
+//			SetUpgradeMask(&inUser4, MASK_UPGRADE_10, false);
+//		}
+//		else if(theNumUpgradesInCategory == 3)
+//		{
+//			SetUpgradeMask(&inUser4, MASK_UPGRADE_11, false);
+//		}
+		break;
+	case ALIEN_UPGRADE_CATEGORY_MOVEMENT:
+		if(theNumUpgradesInCategory == 1)
+		{
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_4, false);
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_5, false);
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_6, false);
+		}
+		else if(theNumUpgradesInCategory == 2)
+		{
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_12, false);
+		}
+		else if(theNumUpgradesInCategory == 3)
+		{
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_13, false);
+		}
+		break;
+	case ALIEN_UPGRADE_CATEGORY_SENSORY:
+		if(theNumUpgradesInCategory == 1)
+		{
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_7, false);
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_8, false);
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_9, false);
+		}
+		else if(theNumUpgradesInCategory == 2)
+		{
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_14, false);
+		}
+		else if(theNumUpgradesInCategory == 3)
+		{
+			SetUpgradeMask(&inUser4, MASK_UPGRADE_15, false);
+		}
+		break;
+	}
+}
+
+bool AvHRemoveUpgradeCategory(AvHAlienUpgradeCategory inUpgradeCategory, AvHAlienUpgradeListType& inList)
+{
+	bool theSuccess = false;
+	
+	AvHAlienUpgradeListType::iterator theIter = std::find(inList.begin(), inList.end(), inUpgradeCategory);
+	if(theIter != inList.end())
+	{
+		inList.erase(theIter);
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+// Changing this?  Make sure to change AvHCommanderModeHandler::ActionButtonActivated also.
+bool AvHGetTechSlotEnabled(int inSlot, int inUser4)
+{
+	bool theSlotIsEnabled = false;
+
+	switch(inSlot)
+	{
+	case 0:
+		theSlotIsEnabled = GetHasUpgrade(inUser4, MASK_UPGRADE_1);
+		break;
+	case 1:
+		theSlotIsEnabled = GetHasUpgrade(inUser4, MASK_UPGRADE_2);
+		break;
+	case 2:
+		theSlotIsEnabled = GetHasUpgrade(inUser4, MASK_UPGRADE_3);
+		break;
+	case 3:
+		theSlotIsEnabled = GetHasUpgrade(inUser4, MASK_UPGRADE_4);
+		break;
+	case 4:
+		theSlotIsEnabled = GetHasUpgrade(inUser4, MASK_UPGRADE_5);
+		break;
+	case 5:
+		theSlotIsEnabled = GetHasUpgrade(inUser4, MASK_UPGRADE_6);
+		break;
+	case 6:
+		theSlotIsEnabled = GetHasUpgrade(inUser4, MASK_UPGRADE_7);
+		break;
+	case 7:
+		theSlotIsEnabled = GetHasUpgrade(inUser4, MASK_UPGRADE_8);
+		break;
+	}
+
+	return theSlotIsEnabled;
+}
+
+// Changing this?  Make sure to change AvHCommanderModeHandler::ActionButtonActivated also.
+void AvHSetTechSlotEnabledState(int inSlot, int* inUser4, bool inEnabled)
+{
+	switch(inSlot)
+	{
+	case 0:
+		SetUpgradeMask(inUser4, MASK_UPGRADE_1, inEnabled);
+		break;
+	case 1:
+		SetUpgradeMask(inUser4, MASK_UPGRADE_2, inEnabled);
+		break;
+	case 2:
+		SetUpgradeMask(inUser4, MASK_UPGRADE_3, inEnabled);
+		break;
+	case 3:
+		SetUpgradeMask(inUser4, MASK_UPGRADE_4, inEnabled);
+		break;
+	case 4:
+		SetUpgradeMask(inUser4, MASK_UPGRADE_5, inEnabled);
+		break;
+	case 5:
+		SetUpgradeMask(inUser4, MASK_UPGRADE_6, inEnabled);
+		break;
+	case 6:
+		SetUpgradeMask(inUser4, MASK_UPGRADE_7, inEnabled);
+		break;
+	case 7:
+		SetUpgradeMask(inUser4, MASK_UPGRADE_8, inEnabled);
+		break;
+	}
+}
diff --git a/main/source/mod/AvHSpecials.h b/main/source/mod/AvHSpecials.h
new file mode 100644
index 00000000..73e4aa9d
--- /dev/null
+++ b/main/source/mod/AvHSpecials.h
@@ -0,0 +1,263 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: Used to describe NS entity state on the client, server and in shared-code
+//
+// $Workfile: AvHSpecials.h $
+// $Date: 2002/11/15 04:41:53 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHSpecials.h,v $
+// Revision 1.33  2002/11/15 04:41:53  Flayra
+// - Added user3 to cull spawns
+//
+// Revision 1.32  2002/11/03 04:52:42  Flayra
+// - Added new user3s, to track entities for AddToFullPack (probably not needed)
+//
+// Revision 1.31  2002/09/23 22:32:51  Flayra
+// - Removed power armor
+// - Added heavy armor and jetpacks
+//
+// Revision 1.30  2002/08/16 02:48:33  Flayra
+// - Removed overwatch, added ensnared flag
+//
+// Revision 1.29  2002/08/02 21:47:00  Flayra
+// - Added max iuser3
+//
+// Revision 1.28  2002/07/23 17:28:39  Flayra
+// - New constants for phase gates and alien buildings, new marine upgrades
+//
+// Revision 1.27  2002/07/08 17:18:29  Flayra
+// - Mark spawn points (can't remember why this is needed), updated comments, removed offensive upgrade code
+//
+// Revision 1.26  2002/07/01 21:24:56  Flayra
+// - Regular update
+//
+// Revision 1.25  2002/06/25 18:18:56  Flayra
+// - Removed offensive upgrades, added charging, new alien upgrade system
+//
+// Revision 1.24  2002/06/03 17:00:48  Flayra
+// - Renamed weapons factory and armory
+//
+// Revision 1.23  2002/05/28 18:08:25  Flayra
+// - Added recycling and persistent masks
+//
+// Revision 1.22  2002/05/23 02:32:57  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_SPECIALS_H
+#define AVH_SPECIALS_H
+
+#include "types.h"
+#include "mod/AvHMessage.h"
+#include "mod/AvHConstants.h"
+
+// Only one of these allowed per entity, stored in pev->iuser3.
+typedef enum
+{
+	AVH_USER3_NONE = 0,
+	AVH_USER3_MARINE_PLAYER,
+	AVH_USER3_COMMANDER_PLAYER,
+	AVH_USER3_ALIEN_PLAYER1,
+	AVH_USER3_ALIEN_PLAYER2,
+	AVH_USER3_ALIEN_PLAYER3,
+	AVH_USER3_ALIEN_PLAYER4,
+	AVH_USER3_ALIEN_PLAYER5,
+	AVH_USER3_ALIEN_EMBRYO,
+	AVH_USER3_SPAWN_TEAMONE,
+	AVH_USER3_SPAWN_TEAMTWO,
+	AVH_USER3_PARTICLE_ON,				// only valid for AvHParticleEntity: entindex as int in fuser1, template index stored in fuser2
+	AVH_USER3_PARTICLE_OFF,				// only valid for AvHParticleEntity: particle system handle in fuser1
+	AVH_USER3_WELD,						// float progress (0 - 100) stored in fuser1
+	AVH_USER3_ALPHA,					// fuser1 indicates how much alpha this entity toggles to in commander mode, fuser2 for players
+	AVH_USER3_MARINEITEM,				// Something a friendly marine can pick up
+	AVH_USER3_WAYPOINT,
+	AVH_USER3_HIVE,
+	AVH_USER3_NOBUILD,
+	AVH_USER3_USEABLE,
+	AVH_USER3_AUDIO_ON,
+	AVH_USER3_AUDIO_OFF,
+	AVH_USER3_FUNC_RESOURCE,
+	AVH_USER3_COMMANDER_STATION,
+	AVH_USER3_TURRET_FACTORY, 
+	AVH_USER3_ARMORY, 
+	AVH_USER3_ADVANCED_ARMORY,
+	AVH_USER3_ARMSLAB,
+	AVH_USER3_PROTOTYPE_LAB, 
+	AVH_USER3_OBSERVATORY,
+	AVH_USER3_CHEMLAB,
+	AVH_USER3_MEDLAB,
+	AVH_USER3_NUKEPLANT,
+	AVH_USER3_TURRET,
+	AVH_USER3_SIEGETURRET,
+	AVH_USER3_RESTOWER,
+	AVH_USER3_PLACEHOLDER,
+	AVH_USER3_INFANTRYPORTAL,
+	AVH_USER3_NUKE,
+	AVH_USER3_BREAKABLE,
+	AVH_USER3_UMBRA,
+	AVH_USER3_PHASEGATE,
+	AVH_USER3_DEFENSE_CHAMBER,
+	AVH_USER3_MOVEMENT_CHAMBER,
+	AVH_USER3_OFFENSE_CHAMBER,
+	AVH_USER3_SENSORY_CHAMBER,
+	AVH_USER3_ALIENRESTOWER,
+	AVH_USER3_HEAVY,
+	AVH_USER3_JETPACK,
+	AVH_USER3_ADVANCED_TURRET_FACTORY,
+	AVH_USER3_SPAWN_READYROOM,
+	AVH_USER3_CLIENT_COMMAND,
+	AVH_USER3_FUNC_ILLUSIONARY,
+	AVH_USER3_MENU_BUILD,
+	AVH_USER3_MENU_BUILD_ADVANCED,
+	AVH_USER3_MENU_ASSIST,
+	AVH_USER3_MENU_EQUIP,
+	AVH_USER3_MINE,
+	AVH_USER3_UNKNOWN,
+	AVH_USER3_MAX
+} AvHUser3;
+
+//typedef enum
+//{
+//	AVH_USER4_PARTICLE_VISIBLE,			// only valid for AvHParticleEntity: particle system handle in fuser1
+//	AVH_USER4_PARTICLE_NOTVISIBLE,		// only valid for AvHParticleEntity: particle system handle in fuser1
+//}
+//AvHParticleUser4;
+
+//typedef enum
+//{
+//	AVH_USER4_NONE = 0,
+//	AVH_USER4_COMMANDER_STATION = 1,
+//	AVH_USER4_TURRET_FACTORY = 2, 
+//	AVH_USER4_WEAPON_FACTORY = 3, 
+//	AVH_USER4_ADVANCED_WEAPON_FACTORY = 4, 
+//	AVH_USER4_ARMORY = 5, 
+//	AVH_USER4_PROTOTYPE_LAB = 6, 
+//	AVH_USER4_OBSERVATORY = 7,
+//	AVH_USER4_CHEMLAB = 8,
+//	AVH_USER4_MEDLAB = 9,
+//	AVH_USER4_NUKEPLANT = 10,
+//	AVH_USER4_TURRET = 11,
+//	AVH_USER4_RESTOWER = 12,
+//	AVH_USER4_CAMTOWER = 13,
+//	AVH_USER4_INFANTRYPORTAL = 14
+//}
+//AvHSelectableUser4;
+
+// AvHSpecials, only one per entity, stored in pev->iuser4.  
+
+// Stored in iuser4.  Some entities don't use these values, but most do.  The ones that don't include:
+// AVH_USER3_AUDIO_OFF
+// AVH_USER3_AUDIO_ON
+typedef enum
+{
+	MASK_NONE = 0,
+	MASK_VIS_SIGHTED = 1,					// This means this is an entity that can be seen by at least one member of the opposing team.  Assumes commanders can never be seen.
+	MASK_VIS_DETECTED = 2,					// This entity has been detected by the other team but isn't currently seen
+	MASK_BUILDABLE = 4,						// This entity is buildable
+	MASK_UPGRADE_1 = 8,						// Marine weapons 1, armor, marine basebuildable slot #0
+	MASK_UPGRADE_2 = 16,					// Marine weapons 2, regen, marine basebuildable slot #1
+	MASK_UPGRADE_3 = 32,					// Marine weapons 3, redemption, marine basebuildable slot #2
+	MASK_UPGRADE_4 = 64,					// Marine armor 1, speed, marine basebuildable slot #3
+	MASK_UPGRADE_5 = 128,					// Marine armor 2, adrenaline, marine basebuildable slot #4
+	MASK_UPGRADE_6 = 256,					// Marine armor 3, silence, marine basebuildable slot #5
+	MASK_UPGRADE_7 = 512,					// Marine jetpacks, Cloaking, marine basebuildable slot #6
+	MASK_UPGRADE_8 = 1024,					// Pheromone, motion-tracking, marine basebuildable slot #7
+	MASK_UPGRADE_9 = 2048,					// Scent of fear, exoskeleton
+	MASK_UPGRADE_10 = 4096,					// Defensive level 2, power armor
+	MASK_UPGRADE_11 = 8192,					// Defensive level 3, electrical defense
+	MASK_UPGRADE_12 = 16384,				// Movement level 2, 
+	MASK_UPGRADE_13 = 32768,				// Movement level 3, marine heavy armor
+	MASK_UPGRADE_14 = 65536,				// Sensory level 2
+	MASK_UPGRADE_15 = 131072,				// Sensory level 3
+	MASK_ALIEN_MOVEMENT = 262144,			// Onos is charging
+	MASK_WALLSTICKING = 524288,				// Flag for wall-sticking
+	MASK_BUFFED = 1048576,                  // Alien is in range of active primal scream, or marine is under effects of catalyst
+	MASK_UMBRA = 2097152,
+	MASK_DIGESTING = 4194304,				// When set on a visible player, player is digesting.  When set on invisible player, player is being digested
+	MASK_RECYCLING = 8388608,
+	MASK_TOPDOWN = 16777216,
+	MASK_PLAYER_STUNNED = 33554432,			// Player has been stunned by stomp
+	MASK_ENSNARED = 67108864,
+	MASK_ALIEN_EMBRYO = 268435456,
+	MASK_SELECTABLE = 536870912,
+	MASK_PARASITED = 1073741824,
+	MASK_SENSORY_NEARBY = 2147483648
+} AvHUpgradeMask;
+
+// IMPORTANT: Keep this mask up to date as upgrades change and move around
+const int kUpgradeBitMask = MASK_UPGRADE_1 | MASK_UPGRADE_2 | MASK_UPGRADE_3 | MASK_UPGRADE_4 | MASK_UPGRADE_5 | MASK_UPGRADE_6 /*| MASK_UPGRADE_7*/ | MASK_UPGRADE_8 | MASK_UPGRADE_9 | MASK_UPGRADE_10 | MASK_UPGRADE_11 | MASK_UPGRADE_12 /*| MASK_UPGRADE_13 */ | MASK_UPGRADE_14 | MASK_UPGRADE_15;
+
+const int kMaxUpgradesTypes = 3;
+
+typedef enum
+{
+	ALIEN_UPGRADE_CATEGORY_INVALID = 0, 
+	ALIEN_UPGRADE_CATEGORY_DEFENSE,
+	ALIEN_UPGRADE_CATEGORY_OFFENSE,
+	ALIEN_UPGRADE_CATEGORY_MOVEMENT,
+	ALIEN_UPGRADE_CATEGORY_SENSORY,
+	ALIEN_UPGRADE_CATEGORY_MAX_PLUS_ONE,
+} AvHAlienUpgradeCategory;
+
+typedef vector<AvHAlienUpgradeCategory>		AvHAlienUpgradeListType;
+
+//// Server ways to get/set upgrade masks
+//#ifdef AVH_SERVER
+//class AvHPlayer;
+//bool GetHasUpgrade(AvHPlayer* inPlayer, AvHUpgradeMask inUpgrade);
+//void SetUpgradeMask(AvHPlayer* inPlayer, AvHUpgradeMask inUpgrade);
+//#endif
+//
+//// Client ways to get/set upgrade masks
+//#ifdef AVH_CLIENT
+//#include <assert.h>
+//#include "mathlib.h"
+//#include "const.h"
+//#include "usercmd.h"
+//#include "pm_defs.h"
+//#include "pm_shared.h"
+//#include "pm_movevars.h"
+//#include "pm_debug.h"
+//bool GetHasUpgrade(playermove_t* inPlayerMove, AvHUpgradeMask inUpgrade);
+//void SetUpgradeMask(playermove_t* inPlayerMove, AvHUpgradeMask inUpgrade);
+//#endif
+
+void InitializeBuildable(int& inUser3, int& inUser4, float& inFuser1, int inUser3ID);
+bool GetHasUpgrade(int inUpgrade, AvHUpgradeMask inUpgradeMask);
+void SetUpgradeMask(int* inPointer, AvHUpgradeMask inUpgradeMask, bool inSet = true);
+AvHUpgradeMask ProcessGenericUpgrade(int& inUpgradeVariable, AvHMessageID inUpgrade, bool inGive = true);
+
+//int AvHGetUser3Base(int inUser3);
+//
+//int AvHGetUser4Base(int inUser4);
+//int AvHGetUser4Extra(int inUser4);
+//void AvHSetUser4(int& inUser4, int inBase, int inExtra);
+
+bool AvHGetAlienUpgradeCategory(AvHMessageID inUpgrade, AvHAlienUpgradeCategory& outCategory);
+bool AvHGetAlienUpgradeCategoryFromMask(AvHUpgradeMask inUpgradeMask, AvHAlienUpgradeCategory& outCategory);
+
+bool AvHGetAlienUpgradeMask(AvHMessageID inUpgrade, AvHUpgradeMask& outUpgradeMask);
+int AvHGetAlienUpgradeLevel(int inUser4, AvHUpgradeMask inMask);
+
+bool AvHGetHasFreeUpgradeCategory(AvHAlienUpgradeCategory inUpgradeCategory, const AvHAlienUpgradeListType& inList, int inUser4, int* outNumFree = NULL);
+bool AvHGetHasUpgradeChoiceInCategory(AvHAlienUpgradeCategory inUpgradeCategory, const AvHAlienUpgradeListType& inList, int inUser4);
+bool AvHGetIsAlien(int inUser3);
+int AvHGetNumUpgradesInCategory(AvHAlienUpgradeCategory inUpgradeCategory, int inUser4);
+int AvHGetNumUpgradesInCategoryInList(const AvHAlienUpgradeListType& inList, AvHAlienUpgradeCategory inUpgradeCategory);
+void AvHAddHigherLevelUpgrades(const AvHAlienUpgradeListType& inList, int& inUser4);
+void AvHRemoveIrrelevantUpgrades(AvHAlienUpgradeListType& inList);
+int AvHRemoveExcessUpgrades(const AvHAlienUpgradeListType& inList, int& inUser4);
+void AvHAddUpgradeInCategory(AvHAlienUpgradeCategory inUpgradeCategory, int& inUser4);
+void AvHRemoveUpgradeInCategory(AvHAlienUpgradeCategory inUpgradeCategory, int& inUser4);
+bool AvHRemoveUpgradeCategory(AvHAlienUpgradeCategory inUpgradeCategory, AvHAlienUpgradeListType& inList);
+
+//bool AvHGetTechSlotList(const string& inClassName, TechSlotList& outTechSlotList);
+bool AvHGetTechSlotEnabled(int inSlot, int inUser4);
+void AvHSetTechSlotEnabledState(int inSlot, int* inUser4, bool inEnabled);
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHSpikeGun.cpp b/main/source/mod/AvHSpikeGun.cpp
new file mode 100644
index 00000000..101c18aa
--- /dev/null
+++ b/main/source/mod/AvHSpikeGun.cpp
@@ -0,0 +1,190 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHSpikeGun.cpp $
+// $Date: 2002/11/22 21:28:17 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHSpikeGun.cpp,v $
+// Revision 1.11  2002/11/22 21:28:17  Flayra
+// - mp_consistency changes
+//
+// Revision 1.10  2002/09/23 22:33:11  Flayra
+// - Fixed problem where spikes were playing inappropriate ricochet sounds (and too many of them)
+//
+// Revision 1.9  2002/08/16 02:48:10  Flayra
+// - New damage model
+//
+// Revision 1.8  2002/07/24 19:09:17  Flayra
+// - Linux issues
+//
+// Revision 1.7  2002/07/24 18:45:43  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.6  2002/06/25 17:50:59  Flayra
+// - Reworking for correct player animations and new enable/disable state, new view model artwork, alien weapon refactoring
+//
+// Revision 1.5  2002/06/03 16:39:10  Flayra
+// - Added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.4  2002/05/23 02:32:57  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+
+LINK_ENTITY_TO_CLASS(kwSpikeGun, AvHSpikeGun);
+void V_PunchAxis( int axis, float punch );
+
+void AvHSpikeGun::Init()
+{
+	this->mRange = kSpikeRange;
+	this->mDamage = BALANCE_IVAR(kSpikeDamage);
+
+	//this->mFramesSinceMoreAmmo = 0;
+}
+
+void AvHSpikeGun::FireProjectiles(void)
+{
+	Vector vecSrc = this->m_pPlayer->GetGunPosition();
+	Vector vecAiming = this->m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES );
+	
+    // Fire the bullets and apply damage
+    int theRange = this->mRange;
+    float theDamage = this->mDamage*AvHPlayerUpgrade::GetAlienRangedDamageUpgrade(this->m_pPlayer->pev->iuser4);
+
+	// NOTE: If these values change, update them in the EV_SpikeGun as well
+	//this->m_pPlayer->FireBullets(1, vecSrc, vecAiming, VECTOR_CONE_3DEGREES, theRange, BULLET_MONSTER_9MM, 0, theDamage);
+	this->m_pPlayer->FireBulletsPlayer(1, vecSrc, vecAiming, kSpikeSpread, theRange, BULLET_MONSTER_9MM, 0, theDamage, this->m_pPlayer->pev, this->m_pPlayer->random_seed);
+}
+
+int	AvHSpikeGun::GetBarrelLength() const
+{
+	return kSpikeBarrelLength;
+}
+
+float AvHSpikeGun::GetRateOfFire() const
+{
+	return BALANCE_FVAR(kSpikeROF);
+}
+
+int	AvHSpikeGun::GetDamageType() const
+{
+	return NS_DMG_NORMAL;
+}
+
+int	AvHSpikeGun::GetDeployAnimation() const
+{
+	// Look at most recently used weapon and see if we can transition from it
+	int theDeployAnimation = 13;
+
+	AvHWeaponID thePreviousID = this->GetPreviousWeaponID();
+
+	switch(thePreviousID)
+	{
+	case AVH_WEAPON_BITE2:
+		theDeployAnimation = 9;
+		break;
+
+	case AVH_WEAPON_UMBRA:
+	case AVH_WEAPON_SPORES:
+	case AVH_WEAPON_PRIMALSCREAM:
+		theDeployAnimation = 11;
+		break;
+	}
+
+	return theDeployAnimation;
+}
+
+float AvHSpikeGun::GetDeployTime() const
+{
+	return .6f;
+}
+
+bool AvHSpikeGun::GetFiresUnderwater() const
+{
+	return true;
+}
+
+int	AvHSpikeGun::GetIdleAnimation() const
+{
+	return 0;
+}
+
+bool AvHSpikeGun::GetIsDroppable() const
+{
+	return false;
+}
+
+int	AvHSpikeGun::GetShootAnimation() const
+{
+	return 3;
+}
+
+char* AvHSpikeGun::GetViewModel() const
+{
+	return kLevel3ViewModel;
+}
+
+void AvHSpikeGun::Precache()
+{
+	AvHAlienWeapon::Precache();
+
+	PRECACHE_UNMODIFIED_SOUND(kSpikeFireSound);
+	PRECACHE_UNMODIFIED_MODEL(kSpikeProjectileModel);
+	PRECACHE_UNMODIFIED_MODEL(kSpikeGunHitSprite);
+
+	this->mEvent = PRECACHE_EVENT(1, kSpikeShootEventName);
+}
+
+
+void AvHSpikeGun::Spawn() 
+{ 
+    AvHAlienWeapon::Spawn(); 
+
+	Precache();
+
+	this->m_iId = AVH_WEAPON_SPIKE;
+	//this->m_iDefaultAmmo = kSpikeMaxClip;
+
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsSpikeGun);
+
+	SET_MODEL(ENT(this->pev), kNullModel);
+
+	FallInit();// get ready to fall down.
+} 
+
+// Ammo comes back on it's own
+//void AvHSpikeGun::WeaponIdle()
+//{
+//	if(this->m_iClip < kSpikeMaxClip)
+//	{
+//		if(++this->mFramesSinceMoreAmmo >= 6)
+//		{
+//			this->m_iClip++;
+//			this->mFramesSinceMoreAmmo = 0;
+//		}
+//	}
+//}
diff --git a/main/source/mod/AvHSpitGun.cpp b/main/source/mod/AvHSpitGun.cpp
new file mode 100644
index 00000000..ea8abe37
--- /dev/null
+++ b/main/source/mod/AvHSpitGun.cpp
@@ -0,0 +1,296 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHSpitGun.cpp $
+// $Date: 2002/11/22 21:28:17 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHSpitGun.cpp,v $
+// Revision 1.14  2002/11/22 21:28:17  Flayra
+// - mp_consistency changes
+//
+// Revision 1.13  2002/08/16 02:48:10  Flayra
+// - New damage model
+//
+// Revision 1.12  2002/07/24 19:09:17  Flayra
+// - Linux issues
+//
+// Revision 1.11  2002/07/24 18:55:52  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.10  2002/07/24 18:45:43  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.9  2002/06/25 17:51:00  Flayra
+// - Reworking for correct player animations and new enable/disable state, new view model artwork, alien weapon refactoring
+//
+// Revision 1.8  2002/06/10 19:47:16  Flayra
+// - New level 2 view model
+//
+// Revision 1.7  2002/06/03 16:39:10  Flayra
+// - Added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.6  2002/05/23 02:32:57  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHGamerules.h"
+#endif
+
+#include "mod/AvHSharedUtil.h"
+
+LINK_ENTITY_TO_CLASS(kwSpitGun, AvHSpitGun);
+
+
+#ifdef AVH_SERVER
+
+LINK_ENTITY_TO_CLASS(kwSpitProjectile, AvHSpit);
+
+void AvHSpit::Precache(void)
+{
+	CBaseEntity::Precache();
+
+	PRECACHE_UNMODIFIED_MODEL(kSpitGunSprite);
+}
+
+void AvHSpit::SetDamage(float inDamage)
+{
+	this->mDamage = inDamage;
+}
+
+void AvHSpit::Spawn()
+{
+	this->Precache();
+	CBaseEntity::Spawn();
+	
+	this->pev->movetype = MOVETYPE_FLY;
+	this->pev->classname = MAKE_STRING(kSpitClassName);
+	
+	SET_MODEL(ENT(this->pev), kSpitGunSprite);
+	this->pev->solid = SOLID_BBOX;
+	this->mDamage = 0.0f;
+	
+	// Comment out effects line, uncomment next four, then comment out creation of temp entity in EV_SpitGun to see server side spit for testing
+	if(!GetGameRules()->GetDrawInvisibleEntities())
+	{
+		this->pev->effects = EF_NODRAW;
+	}
+	else
+	{
+		this->pev->frame = 0;
+		this->pev->scale = 0.5;
+		this->pev->rendermode = kRenderTransAlpha;
+		this->pev->renderamt = 255;
+	}
+	
+	//UTIL_SetSize(this->pev, Vector( 0, 0, 0), Vector(0, 0, 0));
+	UTIL_SetSize(this->pev, Vector( -kSpitSize, -kSpitSize, -kSpitSize), Vector(kSpitSize, kSpitSize, kSpitSize));
+	//UTIL_SetSize(this->pev, Vector( -50, -50, -50), Vector(50, 50, 50));
+	
+	SetTouch(&AvHSpit::SpitTouch);
+
+	// Enforce short range
+	SetThink(&AvHSpit::SpitDeath);
+	this->pev->nextthink = gpGlobals->time + kSpitLifetime;
+}
+
+void AvHSpit::SpitDeath()
+{
+	// Kill the spit entity
+	UTIL_Remove(this);
+
+//	SetThink(SUB_Remove);
+//	this->pev->nextthink = gpGlobals->time + 0.01f;
+}
+
+void AvHSpit::SpitTouch(CBaseEntity* pOther)
+{
+	// Never hit the player who fired it
+	if(pOther != CBaseEntity::Instance(this->pev->owner))
+	{
+		float theScalar = 1.0f;
+		if(GetGameRules()->CanEntityDoDamageTo(this, pOther, &theScalar) || (pOther->pev->team == TEAM_IND))
+		{
+			float theDamage = this->mDamage*theScalar;
+
+			// Apply damage to receiver
+			pOther->TakeDamage(this->pev, VARS(this->pev->owner), theDamage, DMG_ACID);
+		}
+
+		// Kill it off
+		this->SpitDeath();
+	}
+}
+#endif
+
+void AvHSpitGun::Init()
+{
+	this->mRange = kSpitGRange;
+	this->mDamage = BALANCE_IVAR(kSpitGDamage);
+}
+
+int	AvHSpitGun::GetBarrelLength() const
+{
+	return kSpitGBarrelLength;
+}
+
+float AvHSpitGun::GetRateOfFire() const
+{
+	return BALANCE_FVAR(kSpitROF);
+}
+
+int	AvHSpitGun::GetDamageType() const
+{
+	return NS_DMG_NORMAL;
+}
+
+int	AvHSpitGun::GetDeployAnimation() const
+{
+	// Look at most recently used weapon and see if we can transition from it
+	int theDeployAnimation = 7;
+
+	AvHWeaponID thePreviousID = this->GetPreviousWeaponID();
+
+	switch(thePreviousID)
+	{
+	case AVH_WEAPON_SPIT:
+		theDeployAnimation = -1;
+		break;
+
+	// Healing spray and web look the same
+	case AVH_WEAPON_HEALINGSPRAY:
+	case AVH_WEAPON_WEBSPINNER:
+		theDeployAnimation = 7;
+		break;
+	}
+
+	return theDeployAnimation;
+}
+
+bool AvHSpitGun::GetFiresUnderwater() const
+{
+	return true;
+}
+
+bool AvHSpitGun::GetIsDroppable() const
+{
+	return false;
+}
+
+int	AvHSpitGun::GetShootAnimation() const
+{
+	return 3;
+}
+
+void AvHSpitGun::FireProjectiles(void)
+{
+#ifdef AVH_SERVER
+	
+	// Spawn spit
+	AvHSpit* theSpit = GetClassPtr((AvHSpit*)NULL );
+	theSpit->Spawn();
+	
+	UTIL_MakeVectors(this->m_pPlayer->pev->v_angle);
+
+	Vector vecAiming = gpGlobals->v_forward;
+	Vector vecSrc = this->m_pPlayer->GetGunPosition( ) + vecAiming;
+	
+	UTIL_SetOrigin(theSpit->pev, vecSrc);
+
+	// This needs to be the same as in EV_SpitGun
+	Vector theBaseVelocity;
+	VectorScale(this->pev->velocity, kSpitParentVelocityScalar, theBaseVelocity);
+	
+	Vector theStartVelocity;
+	VectorMA(theBaseVelocity, kSpitVelocity, vecAiming, theStartVelocity);
+
+	VectorCopy(theStartVelocity, theSpit->pev->velocity);
+
+	// Set owner
+	theSpit->pev->owner = ENT(this->m_pPlayer->pev);
+
+	// Set spit's team :)
+	theSpit->pev->team = this->m_pPlayer->pev->team;
+
+	// Set amount of damage it will do
+    float theFocusScalar = 1.0f;
+
+    if(AvHSHUGetIsWeaponFocusable(AvHWeaponID(this->m_iId)))
+    {
+        theFocusScalar = AvHPlayerUpgrade::GetFocusDamageUpgrade(this->m_pPlayer->pev->iuser4);
+    }
+
+	float theDamage = this->mDamage*AvHPlayerUpgrade::GetAlienRangedDamageUpgrade(this->m_pPlayer->pev->iuser4)*theFocusScalar;
+	theSpit->SetDamage(theDamage);
+
+	#endif	
+}
+
+char* AvHSpitGun::GetViewModel() const
+{
+	return kLevel2ViewModel;
+}
+
+
+void AvHSpitGun::Precache()
+{
+	AvHAlienWeapon::Precache();
+
+	PRECACHE_UNMODIFIED_MODEL(kNullModel);
+
+	PRECACHE_UNMODIFIED_SOUND(kSpitGFireSound1);
+	PRECACHE_UNMODIFIED_SOUND(kSpitGFireSound2);
+
+	PRECACHE_UNMODIFIED_MODEL(kSpitGunSprite);
+	PRECACHE_UNMODIFIED_SOUND(kSpitHitSound1);
+	PRECACHE_UNMODIFIED_SOUND(kSpitHitSound2);
+
+	this->mEvent = PRECACHE_EVENT(1, kSpitGEventName);
+}
+
+void AvHSpitGun::Spawn() 
+{ 
+    AvHAlienWeapon::Spawn(); 
+
+	Precache();
+
+	this->m_iId = AVH_WEAPON_SPIT;
+
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsSpitGun);
+
+	SET_MODEL(ENT(this->pev), kNullModel);
+
+	FallInit();// get ready to fall down.
+} 
+
+bool AvHSpitGun::UsesAmmo(void) const
+{
+	return false;
+}
+
+
diff --git a/main/source/mod/AvHSpores.cpp b/main/source/mod/AvHSpores.cpp
new file mode 100644
index 00000000..22f08165
--- /dev/null
+++ b/main/source/mod/AvHSpores.cpp
@@ -0,0 +1,354 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHSpores.cpp $
+// $Date: 2002/11/22 21:28:17 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHSpores.cpp,v $
+// Revision 1.13  2002/11/22 21:28:17  Flayra
+// - mp_consistency changes
+//
+// Revision 1.12  2002/09/23 22:33:21  Flayra
+// - Spores no longer hurt buildings
+//
+// Revision 1.11  2002/08/16 02:48:10  Flayra
+// - New damage model
+//
+// Revision 1.10  2002/07/24 19:09:18  Flayra
+// - Linux issues
+//
+// Revision 1.9  2002/07/24 18:55:52  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.8  2002/07/24 18:45:43  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.7  2002/06/25 17:49:01  Flayra
+// - Some refactoring, new view model artwork, removed old code
+//
+// Revision 1.6  2002/06/03 16:39:10  Flayra
+// - Added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.5  2002/05/23 02:32:57  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHGamerules.h"
+#endif
+
+#include "mod/AvHAlienWeaponConstants.h"
+
+LINK_ENTITY_TO_CLASS(kwSporeGun, AvHSpore);
+
+#ifdef AVH_SERVER
+LINK_ENTITY_TO_CLASS(kwSporeProjectile, AvHSporeProjectile);
+extern int gSporeCloudEventID;
+
+AvHSporeProjectile::AvHSporeProjectile()
+{
+	this->mTimeHit = -1;
+	this->mDamage = 0.0f;
+}
+
+void AvHSporeProjectile::Precache(void)
+{
+	CBaseEntity::Precache();
+	
+	PRECACHE_UNMODIFIED_MODEL(kSporeSprite);
+	PRECACHE_UNMODIFIED_MODEL(kClientSporeSprite);
+}
+
+void AvHSporeProjectile::SetDamage(float inDamage)
+{
+	this->mDamage = inDamage;
+}
+
+void AvHSporeProjectile::Spawn(void)
+{
+	this->Precache();
+	CBaseEntity::Spawn();
+	
+	this->pev->movetype = MOVETYPE_FLY;
+	this->pev->classname = MAKE_STRING(kwsSporeProjectile);
+	
+	SET_MODEL(ENT(this->pev), kClientSporeSprite);
+	this->pev->solid = SOLID_BBOX;
+	
+	if(!GetGameRules()->GetDrawInvisibleEntities())
+	{
+		this->pev->effects = EF_NODRAW;
+	}
+	else
+	{
+		this->pev->frame = 0;
+		this->pev->scale = 0.5;
+		this->pev->rendermode = kRenderTransAlpha;
+		this->pev->renderamt = 255;
+	}
+
+	UTIL_SetSize(this->pev, Vector( 0, 0, 0), Vector(0, 0, 0));
+	//UTIL_SetSize(this->pev, Vector( -50, -50, -50), Vector(50, 50, 50));
+	
+	SetTouch(&AvHSporeProjectile::SporeTouch);
+}
+
+void AvHSporeProjectile::SporeCloudThink()
+{
+	// Apply damage to all enemy players in radius
+	CBaseEntity* theEntity = NULL;
+	while ( (theEntity = UTIL_FindEntityInSphere( theEntity, this->pev->origin, BALANCE_IVAR(kSporeCloudRadius))) != NULL )
+	{
+		// Only hurt players
+		AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntity);
+		if(thePlayer)
+		{
+			ASSERT(this->pev->team != 0);
+			if(theEntity->pev->team != this->pev->team)
+			{
+				// Don't do damage to heavy armor
+				if(!thePlayer->GetHasHeavyArmor())
+				{
+					// Spores don't stack, so don't do damage too often
+					float theTimeOfLastSporeDamage = thePlayer->GetTimeOfLastSporeDamage();
+					float kTolerance = .05f;
+					if((theTimeOfLastSporeDamage == -1) || (gpGlobals->time > (theTimeOfLastSporeDamage + BALANCE_FVAR(kSporeCloudThinkInterval) - kTolerance)))
+					{
+						// Make sure a direct line can be traced from spores to target
+						TraceResult theTraceResult;
+						UTIL_TraceLine(this->pev->origin, theEntity->pev->origin, ignore_monsters, dont_ignore_glass, theEntity->edict(), &theTraceResult);
+						
+						if(theTraceResult.flFraction == 1.0f)
+						{
+							theEntity->TakeDamage(this->pev, VARS(this->pev->owner), this->mDamage, NS_DMG_NORMAL);
+
+							thePlayer->SetTimeOfLastSporeDamage(gpGlobals->time);
+						}
+						else
+						{
+							// What did we hit?
+							CBaseEntity* theEntity = CBaseEntity::Instance(theTraceResult.pHit);
+							int a = 0;
+						}
+					}
+				}
+			
+				// TODO: Fire event?
+			}
+		}
+	}
+
+	// Is it time to expire?
+	if(gpGlobals->time > (this->mTimeHit + BALANCE_IVAR(kSporeCloudTime)))
+	{
+		// if so, remove entity
+		SetThink(&AvHSporeProjectile::SUB_Remove);
+		this->pev->nextthink = gpGlobals->time + 0.01f;
+	}
+	else
+	{
+		// if not, set next think
+		this->pev->nextthink = gpGlobals->time + BALANCE_FVAR(kSporeCloudThinkInterval);
+	}
+}
+
+void AvHSporeProjectile::SporeTouch(CBaseEntity *pOther)
+{
+	// Never hit the player who fired it
+	if(pOther != CBaseEntity::Instance(this->pev->owner))
+	{
+		// If not in tourny mode, pass through friends
+		//if(GetGameRules()->GetIsTournamentMode() || (pOther->pev->team != this->pev->team))
+		//{
+			// Tell the projectile to stop moving 
+			VectorCopy(g_vecZero, this->pev->velocity);
+
+			this->mTimeHit = gpGlobals->time;
+			SetThink(&AvHSporeProjectile::SporeCloudThink);
+			this->pev->nextthink = gpGlobals->time + BALANCE_FVAR(kSporeCloudThinkInterval);
+
+			SetTouch(NULL);
+			
+			// Fire spore cloud event
+			PLAYBACK_EVENT_FULL(0, this->edict(), gSporeCloudEventID, 0, pOther->pev->origin, (float *)&g_vecZero, 1.0f, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+		//}
+	}
+}
+#endif
+
+
+
+int	AvHSpore::GetBarrelLength() const
+{
+	return kSporeBarrelLength;
+}
+
+float AvHSpore::GetRateOfFire() const
+{
+    return BALANCE_FVAR(kSporeROF);
+}
+
+bool AvHSpore::GetFiresUnderwater() const
+{
+	return true;
+}
+
+bool AvHSpore::GetIsDroppable() const
+{
+	return false;
+}
+	
+void AvHSpore::Init()
+{
+	this->mRange = kSporeRange;
+	this->mDamage = BALANCE_IVAR(kSporeDamage);
+}
+
+int	AvHSpore::GetDamageType() const
+{
+	return NS_DMG_NORMAL;
+}
+
+int	AvHSpore::GetIdleAnimation() const
+{
+	return 2;
+}
+
+int	AvHSpore::GetShootAnimation() const
+{
+	return 5;
+}
+
+int	AvHSpore::GetDeployAnimation() const
+{
+	// Look at most recently used weapon and see if we can transition from it
+	int theDeployAnimation = -1;
+
+	AvHWeaponID thePreviousID = this->GetPreviousWeaponID();
+
+	switch(thePreviousID)
+	{
+	case AVH_WEAPON_BITE2:
+		theDeployAnimation = 9;
+		break;
+	case AVH_WEAPON_SPIKE:
+		theDeployAnimation = 8;
+		break;
+	}
+
+	return theDeployAnimation;
+}
+
+float AvHSpore::GetDeployTime() const
+{
+	return .6f;
+}
+
+char* AvHSpore::GetViewModel() const
+{
+	return kLevel3ViewModel;
+}
+
+void AvHSpore::Precache(void)
+{
+	AvHAlienWeapon::Precache();
+	
+	PRECACHE_UNMODIFIED_SOUND(kSporeFireSound);
+	PRECACHE_UNMODIFIED_SOUND(kSporeCloudSound);
+	
+	this->mEvent = PRECACHE_EVENT(1, kSporeShootEventName);
+}
+
+void AvHSpore::Spawn()
+{
+    AvHAlienWeapon::Spawn(); 
+	
+	Precache();
+	
+	this->m_iId = AVH_WEAPON_SPORES;
+	
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsSporeGun);
+	
+	SET_MODEL(ENT(this->pev), kNullModel);
+	
+	FallInit();// get ready to fall down.
+	
+}
+
+bool AvHSpore::UsesAmmo(void) const
+{
+	return false;
+}
+
+void AvHSpore::FireProjectiles(void)
+{
+	#ifdef AVH_SERVER
+	// Make sure we have enough points to shoot this thing
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this->m_pPlayer);
+	ASSERT(thePlayer);
+	
+	//if(thePlayer->GetResources() > kSporePointCost)
+	//{
+	//	// Decrement kSporePointCost points
+	//	thePlayer->SetResources(thePlayer->GetResources() - kSporePointCost);
+		
+		// Create hidden projectile that creates a huge spore cloud where it hits
+		AvHSporeProjectile* theSpore = GetClassPtr((AvHSporeProjectile*)NULL );
+		theSpore->Spawn();
+		
+		UTIL_MakeVectors(this->m_pPlayer->pev->v_angle);
+		
+		Vector vecAiming = gpGlobals->v_forward;
+		Vector vecSrc = this->m_pPlayer->GetGunPosition( ) + vecAiming;
+		
+		UTIL_SetOrigin(theSpore->pev, vecSrc);
+		
+//		// This needs to be the same as in EV_SporeGun
+//		Vector theBaseVelocity;
+//		VectorScale(this->pev->velocity, kSporeParentVelocityScalar, theBaseVelocity);
+//		
+//		Vector theStartVelocity;
+//		VectorMA(theBaseVelocity, kSporeVelocity, vecAiming, theStartVelocity);
+//		
+//		VectorCopy(theStartVelocity, theSpore->pev->velocity);
+
+		VectorScale(vecAiming, kShootCloudVelocity, theSpore->pev->velocity);
+		
+		// Set owner
+		theSpore->pev->owner = ENT(this->m_pPlayer->pev);
+		
+		// Set spore's team :)
+		theSpore->pev->team = this->m_pPlayer->pev->team;
+
+		// Set the spore damage
+		float theDamage = this->mDamage*AvHPlayerUpgrade::GetAlienRangedDamageUpgrade(this->m_pPlayer->pev->iuser4);
+		theSpore->SetDamage(theDamage);
+	//}
+	#endif	
+}
+
diff --git a/main/source/mod/AvHSpriteAPI.cpp b/main/source/mod/AvHSpriteAPI.cpp
new file mode 100644
index 00000000..12ea7447
--- /dev/null
+++ b/main/source/mod/AvHSpriteAPI.cpp
@@ -0,0 +1,543 @@
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+#include "common/com_model.h"
+#include "cl_dll/demo.h"
+#include "cl_dll/r_studioint.h"
+#include "common/demo_api.h"
+#include "mod/AvHSpriteAPI.h"
+
+extern vec3_t gPlaybackViewOrigin;
+extern engine_studio_api_t IEngineStudio;
+
+struct Vertex
+{
+    float x;
+    float y;
+    float u;
+    float v;
+};
+
+// This is the amount that the depth is increased each time a sprite
+// is rendered. This eliminates z-fighting.
+const float kDepthIncrement = 0.001f;
+
+Vector gViewOrigin;
+Vector gViewXAxis;
+Vector gViewYAxis;
+Vector gViewZAxis;
+
+int                 gRenderMode;
+AvHSpriteDrawMode   gDrawMode;
+
+float gTransform[2][3];
+
+float gClipRectX1;
+float gClipRectY1;
+float gClipRectX2;
+float gClipRectY2;
+
+bool gClippingEnabled;
+
+float gDepth;
+float gDepthOffset;
+
+float gColor[4];
+
+bool gVGUIEnabled = true;
+int  gVGUIOffsetX = 0;
+int  gVGUIOffsetY = 0;
+
+float gViewportXScale = 1;
+float gViewportYScale = 1;
+float gViewportXOffset = 0;
+float gViewportYOffset = 0;
+
+void AvHSpriteBeginFrame()
+{
+
+    // Compute the camera parameters.
+
+    Vector origin;
+
+	if (gEngfuncs.pDemoAPI->IsPlayingback())
+	{
+		VectorCopy(gPlaybackViewOrigin, origin);
+	}
+    else
+    {
+        VectorCopy(v_origin, origin);
+    }
+
+    float nearDistance = 12;
+    float aspectRatio  = (float)(ScreenHeight()) / ScreenWidth();
+
+    float w = nearDistance * tan(M_PI * gHUD.m_iFOV / 360);
+    float h = nearDistance * tan(M_PI * gHUD.m_iFOV / 360) * aspectRatio;
+
+    Vector forward;
+    Vector right;
+    Vector up;
+    
+    AngleVectors(v_angles, forward, right, up);
+
+    gViewOrigin = origin + forward * nearDistance - right * w + up * h;
+    gViewXAxis =  2 * w * right / ScreenWidth();
+    gViewYAxis = -2 * h * up / ScreenHeight();
+    gViewZAxis = -forward;
+
+    gRenderMode = kRenderNormal;
+
+    // Initialize the transform to an identity transform.
+
+    gTransform[0][0] = 1;
+    gTransform[0][1] = 0;
+    gTransform[0][2] = 0;
+
+    gTransform[1][0] = 0;
+    gTransform[1][1] = 1;
+    gTransform[1][2] = 0;
+
+    // Initialize the clipping rectangle to the whole screen.
+    
+    gClipRectX1 = 0;
+    gClipRectY1 = 0;
+    gClipRectX2 = ScreenWidth();
+    gClipRectY2 = ScreenHeight();
+    
+    gClippingEnabled = false;
+
+    gDepth = 0;
+    gDepthOffset = 0;
+
+    gColor[0] = 1;
+    gColor[1] = 1;
+    gColor[2] = 1;
+    gColor[3] = 1;
+
+    gDrawMode = kSpriteDrawModeFilled;
+
+}
+
+void AvHSpriteEndFrame()
+{
+    // Restore the state to something normal, otherwise weird things happen.
+    gEngfuncs.pTriAPI->Color4f(1, 1, 1, 1);
+
+    gEngfuncs.pTriAPI->RenderMode(kRenderNormal);
+    gEngfuncs.pTriAPI->CullFace(TRI_NONE);
+
+}
+
+void AvHSpriteSetViewport(float x1, float y1, float x2, float y2)
+{
+
+    gViewportXScale = (x2 - x1) / ScreenWidth();
+    gViewportYScale = (y2 - y1) / ScreenHeight();
+
+    gViewportXOffset = x1;
+    gViewportYOffset = y1;
+    
+}
+
+void AvHSpriteClearViewport()
+{
+    gViewportXScale = 1;
+    gViewportYScale = 1;
+    gViewportXOffset = 0;
+    gViewportYOffset = 0;
+}
+
+void AvHSpriteEnableClippingRect(bool enable)
+{
+    gClippingEnabled = enable;
+}
+
+void AvHSpriteSetClippingRect(float x1, float y1, float x2, float y2)
+{
+    gClipRectX1 = x1;
+    gClipRectY1 = y1;
+    gClipRectX2 = x2;
+    gClipRectY2 = y2;
+}
+
+void AvHSpriteSetRenderMode(int renderMode)
+{
+    gRenderMode = renderMode;
+}
+
+void AvHSpriteSetDrawMode(AvHSpriteDrawMode drawMode)
+{
+    gDrawMode = drawMode;
+}
+
+void AvHSpriteSetRotation(float degrees, float cx, float cy)
+{
+
+    float radians = degrees * M_PI / 180;
+
+    float sa = sinf(radians);
+    float ca = cosf(radians);
+
+    gTransform[0][0] = ca;
+    gTransform[1][0] = sa;
+
+    gTransform[0][1] = -sa;
+    gTransform[1][1] =  ca;
+
+    gTransform[0][2] = -ca * cx + sa * cy + cx;
+    gTransform[1][2] = -sa * cx - ca * cy + cy;
+
+}
+
+void AvHSpriteSetColor(float r, float g, float b, float a)
+{
+    gColor[0] = r;
+    gColor[1] = g;
+    gColor[2] = b;
+    gColor[3] = a;
+}
+
+void AvHSpriteSetDepthOffset(float depthOffset)
+{
+    gDepthOffset = depthOffset;
+}
+
+/**
+ * Clips the polygon against a hyper-plane of the form a * x + b * y + d = 0.
+ * The resulting polyon is stored back in the input array.
+ */
+void ClipPolygon(Vertex vertex[8], int& numVertices, float a, float b, float d)
+{
+
+    Vertex newVertex[8];
+    int newNumVertices = 0;
+
+    int s = numVertices - 1;
+    int e = 0;
+    
+    // Classify the start point.
+
+    bool sInside = a * vertex[s].x + b * vertex[s].y + d >= 0;
+    
+    while (e != numVertices)
+    {
+
+        bool eInside = a * vertex[e].x + b * vertex[e].y + d >= 0;
+
+        if (sInside && eInside)
+        {
+            // The edge is totally inside the rectangle.
+            ASSERT(newNumVertices < 8);
+            newVertex[newNumVertices] = vertex[e];
+            ++newNumVertices;
+        }
+        else if (sInside || eInside)
+        {
+            
+            // Compute the intersection vertex.
+
+            float dx = vertex[e].x - vertex[s].x;
+            float dy = vertex[e].y - vertex[s].y;
+            
+            float du = vertex[e].u - vertex[s].u;
+            float dv = vertex[e].v - vertex[s].v;
+            
+            float n = -(a * vertex[s].x + b * vertex[s].y + d);
+            float d = a * dx + b * dy;
+            float t = n / d;
+            
+            Vertex i;
+
+            i.x = vertex[s].x + t * dx;
+            i.y = vertex[s].y + t * dy;
+
+            i.u = vertex[s].u + t * du;
+            i.v = vertex[s].v + t * dv;
+            
+            if (sInside)
+            {
+                
+                // The edge starts inside and goes outside.
+                
+                ASSERT(newNumVertices < 8);
+                newVertex[newNumVertices] = i;
+                ++newNumVertices;
+
+            }
+            else
+            {
+                
+                // The edge starts outside and goes inside.
+                
+                ASSERT(newNumVertices < 8);
+                newVertex[newNumVertices] = i;
+                ++newNumVertices;
+                
+                ASSERT(newNumVertices < 8);
+                newVertex[newNumVertices] = vertex[e];
+                ++newNumVertices;
+            
+            }
+        }
+
+        // Advance to the next edge.
+
+        s = e;
+        e = e + 1;
+
+        sInside = eInside;
+
+    }
+
+    // Store the vertices back in the input array.
+
+    memcpy(vertex, newVertex, newNumVertices * sizeof(Vertex));
+    numVertices = newNumVertices;
+
+}
+
+
+void AvHSpriteDraw(int spriteHandle, int frame, float x1, float y1, float x2, float y2, float u1, float v1, float u2, float v2)
+{
+
+    gEngfuncs.pTriAPI->RenderMode(gRenderMode);
+    gEngfuncs.pTriAPI->CullFace(TRI_NONE);
+    
+    struct model_s* spritePtr = (struct model_s*)(gEngfuncs.GetSpritePointer(spriteHandle));
+    ASSERT(spritePtr);
+
+    if (!gEngfuncs.pTriAPI->SpriteTexture(spritePtr, frame))
+    {
+        return;
+    }
+
+    Vertex vertex[8];
+
+    vertex[0].x = x1;
+    vertex[0].y = y1;
+    vertex[0].u = u1;
+    vertex[0].v = v1;
+
+    vertex[1].x = x2;
+    vertex[1].y = y1;
+    vertex[1].u = u2;
+    vertex[1].v = v1;
+
+    vertex[2].x = x2;
+    vertex[2].y = y2;
+    vertex[2].u = u2;
+    vertex[2].v = v2;
+
+    vertex[3].x = x1;
+    vertex[3].y = y2;
+    vertex[3].u = u1;
+    vertex[3].v = v2;
+
+    int numVertices = 4;
+
+    float pw = SPR_Width(spriteHandle, frame);
+    float ph = SPR_Height(spriteHandle, frame);
+
+    float uOffset = 0;
+    float vOffset = 0;
+
+    if (IEngineStudio.IsHardware() == 2)
+    {
+
+        // Direct3D addresses textures differently than OpenGL so compensate
+        // for that here.
+
+        uOffset = 0.5 / pw;
+        vOffset = 0.5 / ph;
+  
+    }
+
+    // Apply the transformation to the vertices.
+    
+    for (int i = 0; i < numVertices; ++i)
+    {
+
+        if (vertex[i].u < 0.25 / pw)
+        {
+            vertex[i].u = 0.25 / pw;
+        }
+
+        if (vertex[i].v < 0.25 / ph)
+        {
+            vertex[i].v = 0.25 / ph;
+        }
+
+        if (vertex[i].u > 1 - 0.25 / pw)
+        {
+            vertex[i].u = 1 - 0.25 / pw;
+        }
+
+        if (vertex[i].v > 1 - 0.25 / ph)
+        {
+            vertex[i].v = 1 - 0.25 / ph;
+        }
+
+        vertex[i].u += uOffset;
+        vertex[i].v += vOffset;
+        
+        float x = vertex[i].x;
+        float y = vertex[i].y;
+        
+        vertex[i].x = x * gTransform[0][0] + y * gTransform[0][1] + gTransform[0][2];
+        vertex[i].y = x * gTransform[1][0] + y * gTransform[1][1] + gTransform[1][2];
+
+    }
+
+    if (gClippingEnabled)
+    {
+    
+        // Clip the polygon to each side of the clipping rectangle. This isn't the
+        // fastest way to clip a polygon against a rectangle, but it's probably the
+        // simplest.
+
+        ClipPolygon(vertex, numVertices,  1,  0, -gClipRectX1);
+        ClipPolygon(vertex, numVertices, -1,  0,  gClipRectX2);
+        ClipPolygon(vertex, numVertices,  0,  1, -gClipRectY1);
+        ClipPolygon(vertex, numVertices,  0, -1,  gClipRectY2);
+
+    }
+
+    // Compensate for the overbrightening effect.
+
+	float gammaScale = 1.0f / gHUD.GetGammaSlope();
+	gEngfuncs.pTriAPI->Color4f(gammaScale * gColor[0], gammaScale * gColor[1], gammaScale * gColor[2], gColor[3]);
+
+    // Output the vertices.
+
+    if (gDrawMode == kSpriteDrawModeFilled)
+    {
+        gEngfuncs.pTriAPI->Begin(TRI_TRIANGLE_FAN);
+
+        for (int j = 0; j < numVertices; ++j)
+        {
+
+            Vector worldPoint;
+            
+            if (gVGUIEnabled)
+            {
+                worldPoint.x = (vertex[j].x - gVGUIOffsetX) * gViewportXScale + gViewportXOffset;
+                worldPoint.y = (vertex[j].y - gVGUIOffsetY) * gViewportYScale + gViewportYOffset;
+                worldPoint.z = 1;
+            }
+            else
+            {
+                worldPoint = gViewOrigin +
+                    gViewXAxis * vertex[j].x +
+                    gViewYAxis * vertex[j].y +
+                    gViewZAxis * (gDepth + gDepthOffset);
+            }
+
+            gEngfuncs.pTriAPI->TexCoord2f(vertex[j].u, vertex[j].v);
+            gEngfuncs.pTriAPI->Vertex3fv((float*)&worldPoint);
+
+        }
+    
+        gEngfuncs.pTriAPI->End();
+
+    }
+    else if (gDrawMode == kSpriteDrawModeBorder)
+    {
+
+        gEngfuncs.pTriAPI->Begin(TRI_LINES);
+
+        for (int j = 0; j < numVertices; ++j)
+        {
+
+            int k = (j + 1) % numVertices;
+
+            Vector worldPoint1;
+            Vector worldPoint2;
+            
+            if (gVGUIEnabled)
+            {
+
+                worldPoint1.x = vertex[j].x - gVGUIOffsetX;
+                worldPoint1.y = vertex[j].y - gVGUIOffsetY;
+                worldPoint1.z = 1;
+
+                worldPoint2.x = vertex[k].x - gVGUIOffsetX;
+                worldPoint2.y = vertex[k].y - gVGUIOffsetY;
+                worldPoint2.z = 1;
+            
+            }
+            else
+            {
+                
+                worldPoint1 = gViewOrigin +
+                    gViewXAxis * vertex[j].x +
+                    gViewYAxis * vertex[j].y +
+                    gViewZAxis * (gDepth + gDepthOffset);
+
+                worldPoint2 = gViewOrigin +
+                    gViewXAxis * vertex[k].x +
+                    gViewYAxis * vertex[k].y +
+                    gViewZAxis * (gDepth + gDepthOffset);
+            
+            }
+
+            gEngfuncs.pTriAPI->TexCoord2f(vertex[j].u, vertex[j].v);
+            gEngfuncs.pTriAPI->Vertex3fv((float*)&worldPoint1);
+
+            gEngfuncs.pTriAPI->TexCoord2f(vertex[k].u, vertex[k].v);
+            gEngfuncs.pTriAPI->Vertex3fv((float*)&worldPoint2);
+        
+        }
+
+        gEngfuncs.pTriAPI->End();
+
+    }
+
+    gDepth += kDepthIncrement; 
+
+}
+
+void AvHSpriteDrawTiles(int spriteHandle, int numXFrames, int numYFrames, float x1, float y1, float x2, float y2, float u1, float v1, float u2, float v2)
+{
+    
+    float dx = x2 - x1;
+    float dy = y2 - y1;
+
+    float oldDepth = gDepth;
+
+    for (int frameY = 0; frameY < numYFrames; ++frameY)
+    {
+        for (int frameX = 0; frameX < numXFrames; ++frameX)
+        {
+
+            int frame = frameX + frameY * numXFrames;
+
+            float pw = SPR_Width(spriteHandle, frame);
+            float ph = SPR_Height(spriteHandle, frame);
+            
+            float fx1 = ((float)(frameX)) / numXFrames;
+            float fy1 = ((float)(frameY)) / numYFrames;
+            
+            float fx2 = ((float)(frameX + 1)) / numXFrames;
+            float fy2 = ((float)(frameY + 1)) / numYFrames;
+
+            gDepth = oldDepth;
+
+            AvHSpriteDraw(spriteHandle, frame,
+                 x1 + dx * fx1, y1 + dy * fy1, x1 + dx * fx2, y1 + dy * fy2,
+                 0, 0, 1, 1);
+
+        }
+    }
+
+}
+
+void AvHSpriteEnableVGUI(bool enableVGUI)
+{
+    gVGUIEnabled = enableVGUI;
+}
+
+void AvHSpriteSetVGUIOffset(int x, int y)
+{
+    gVGUIOffsetX = x;
+    gVGUIOffsetY = y;
+}
diff --git a/main/source/mod/AvHSpriteAPI.h b/main/source/mod/AvHSpriteAPI.h
new file mode 100644
index 00000000..2ecc7101
--- /dev/null
+++ b/main/source/mod/AvHSpriteAPI.h
@@ -0,0 +1,67 @@
+#ifndef AVHSPRITEAPI_H
+#define AVHSPRITEAPI_H
+
+enum AvHSpriteDrawMode
+{
+    kSpriteDrawModeFilled,
+    kSpriteDrawModeBorder,
+};
+
+/**
+ * Once the final coordinates are computed, they are transformed to this viewport.
+ */
+void AvHSpriteSetViewport(float x1, float y1, float x2, float y2);
+
+/**
+ * Clears any previously set viewport.
+ */
+void AvHSpriteClearViewport();
+
+
+void AvHSpriteBeginFrame();
+void AvHSpriteEndFrame();
+
+/**
+ * Sets the render mode used for subsequent sprite operations.
+ */
+void AvHSpriteSetRenderMode(int renderMode);
+
+/**
+ * Sets the rotation used for subsequence sprite operations. The rotation is
+ * specified about a point in the screen (cx, cy).
+ */
+void AvHSpriteSetRotation(float degrees, float cx, float cy);
+
+/**
+ * Enables or disables the clipping rectangle. If the clipping rectangle is
+ * disabled the sprites won't be clipping, however it will be faster.
+ */
+void AvHSpriteEnableClippingRect(bool enable);
+
+/**
+ * Sets the screen space rectangle which drawing operations are clipped against.
+ */
+void AvHSpriteSetClippingRect(float x1, float y1, float x2, float y2);
+
+/**
+ *
+ */
+void AvHSpriteSetDrawMode(AvHSpriteDrawMode drawMode);
+
+/**
+ * Sets the color which is multiplied by the sprite pixel values.
+ */
+void AvHSpriteSetColor(float r, float g, float b, float a = 1);
+
+/**
+ *
+ */
+void AvHSpriteSetDepthOffset(float depthOffset);
+
+void AvHSpriteDraw(int spriteHandle, int frame, float x1, float y1, float x2, float y2, float u1, float v1, float u2, float v2);
+void AvHSpriteDrawTiles(int spriteHandle, int numXFrames, int numYFrames, float x1, float y1, float x2, float y2, float u1, float v1, float u2, float v2);
+
+void AvHSpriteEnableVGUI(bool enableVGUI);
+void AvHSpriteSetVGUIOffset(int x, int y);
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHSprites.h b/main/source/mod/AvHSprites.h
new file mode 100644
index 00000000..2da91b93
--- /dev/null
+++ b/main/source/mod/AvHSprites.h
@@ -0,0 +1,112 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHSprites.h $
+// $Date: 2002/09/23 22:33:34 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHSprites.h,v $
+// Revision 1.17  2002/09/23 22:33:34  Flayra
+// - Removed siege turret min range sprite
+// - Added alien building sprites
+//
+// Revision 1.16  2002/09/09 20:07:18  Flayra
+// - Added hiveinfo sprite
+//
+// Revision 1.15  2002/08/16 02:48:42  Flayra
+// - Regular update
+//
+// Revision 1.14  2002/08/02 21:46:45  Flayra
+// - Added constants for sprites
+//
+// Revision 1.13  2002/07/23 17:29:03  Flayra
+// - Big update to hive sight and sprites
+//
+// Revision 1.12  2002/07/08 17:18:50  Flayra
+// - Added marine upgrades sprite to be drawn in the future
+//
+// Revision 1.11  2002/07/01 21:24:37  Flayra
+// - Removed outdated sprites, updated visible blips
+//
+// Revision 1.10  2002/06/25 18:19:39  Flayra
+// - New alien upgrade system
+//
+// Revision 1.9  2002/06/03 17:00:43  Flayra
+// - Help sprites moved into one animated sprite
+//
+// Revision 1.8  2002/05/23 02:32:57  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_SPRITES_H
+#define AVH_SPRITES_H
+
+#define		kJetpackSprite			"jetpack"
+
+#define		kAlienEnergySprite		"a-energy"
+#define		kAlienResourceSprite	"a-resources"
+
+#define		kCombatExperienceSprite	"experience"
+
+//#define		kAdrenSprite		"adren"
+//#define		kEggSprite			"egg"
+//#define		kHiveSprite			"hive"
+//#define		kLifeformSprite		"alien"
+#define		kAlienUpgradeSprite			"alienupgrades"
+#define		kAlienUpgradeCategory		"alienupgradecategories"
+
+#define		kOrdersSprite				"order"
+
+#define		kAlienCursorSprite			"sprites/aliencursor.spr"
+
+#define		kTopDownBGSprite			"sprites/topdownbg.spr"
+#define		kTopDownTopHUDSprite		"sprites/topdowntop.spr"
+#define		kTopDownBottomHUDSprite		"sprites/topdownbottom.spr"
+#define		kMarineTopHUDSprite			"sprites/mainhud.spr"
+#define		kLogoutSprite				"sprites/logout.spr"
+#define		kHiveInfoSprite				"sprites/hiveinfo.spr"
+#define		kHiveHealthSprite			"sprites/hivehealth.spr"
+#define		kCursorsSprite				"sprites/cursors.spr"
+#define		kCommandButtonSprite		"sprites/commandbutton.spr"
+#define		kCommandStatusSprite		"sprites/commandstatus.spr"
+#define		kCommandStatusSprite		"sprites/commandstatus.spr"
+#define		kSelectAllSprite			"sprites/selectall.spr"
+
+#define		kMarineOrderSprite			"sprites/hudorder.spr"
+#define		kMarineUpgradesSprite		"sprites/upgrades.spr"
+
+#define		kAlienBuildSprite			"sprites/ba-build.spr"
+#define		kMarineBuildSprite			"sprites/b-build.spr"
+
+#define		kAlienHealthSprite			"sprites/ba-health.spr"
+#define		kMarineHealthSprite			"sprites/b-health.spr"
+
+#define		kBuildCircleSprite			"sprites/buildcircle.spr"
+//#define		kSiegeTurretSprite			"sprites/siegeturret.spr"
+
+//#define		kOverwatchAimSprite			"sprites/overwatch-aim.spr"
+
+#define		kMembraneSprite				"sprites/membrane.spr"
+#define		kDigestingSprite			"sprites/digesting.spr"
+
+#define		kHelpIconPrefix				"sprites/helpicons"
+
+#define		kOverwatchCenterSprite		"sprites/overwatch-center.spr"
+#define		kReticleSprite				"sprites/reticle.spr"
+#define		kMarinePlayersSprite		"sprites/iplayerm.spr"
+#define		kAlienPlayersSprite			"sprites/iplayera.spr"
+#define		kStructuresSprite			"sprites/itech.spr"
+#define		kSmallOrderSprite			"sprites/320orders.spr"
+
+#define     kAlertSprite				"sprites/alert.spr"
+#define		kCommBlipSprite				"sprites/comm-blip.spr"
+
+#define		kWhiteSprite			    "sprites/white.spr"
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHStomp.cpp b/main/source/mod/AvHStomp.cpp
new file mode 100644
index 00000000..ca08915d
--- /dev/null
+++ b/main/source/mod/AvHStomp.cpp
@@ -0,0 +1,364 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHStomp.cpp $
+// $Date: $
+//
+//-------------------------------------------------------------------------------
+// $Log: $
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+#include "mod/AvHConstants.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHGamerules.h"
+#include "mod/AvHServerUtil.h"
+#endif
+
+#include "mod/AvHParticleConstants.h"
+#include "mod/AvHHulls.h"
+#include "mod/AvHSharedUtil.h"
+
+LINK_ENTITY_TO_CLASS(kwStomp, AvHStomp);
+
+#ifdef AVH_SERVER
+LINK_ENTITY_TO_CLASS(kwStompProjectile, AvHStompProjectile);
+
+AvHStompProjectile::AvHStompProjectile()
+{
+}
+	
+void AvHStompProjectile::Precache(void)
+{
+	CBaseEntity::Precache();
+}
+
+void AvHStompProjectile::Spawn(void)
+{
+	this->Precache();
+
+	CBaseEntity::Spawn();
+	
+	this->pev->movetype = MOVETYPE_NOCLIP;
+	this->pev->classname = MAKE_STRING(kwsStompProjectile);
+	
+	SET_MODEL(ENT(this->pev), kStompProjectileModel);
+	this->pev->solid = SOLID_TRIGGER;
+	
+	if(!GetGameRules()->GetDrawInvisibleEntities())
+	{
+		this->pev->effects = EF_NODRAW;
+	}
+	else
+	{
+		this->pev->frame = 0;
+		this->pev->scale = 1.0;
+		this->pev->rendermode = kRenderTransAdd;
+		this->pev->renderamt = kStompModelRenderAmount;
+	}
+
+	const int kBoxWidth = 50;
+	UTIL_SetSize(this->pev, Vector(-kBoxWidth, -kBoxWidth, -kBoxWidth), Vector(kBoxWidth, kBoxWidth, kBoxWidth));
+//	UTIL_SetSize(this->pev, Vector( 0, 0, 0), Vector(0, 0, 0));
+
+	SetTouch(&AvHStompProjectile::StompTouch);
+
+	SetThink(&CBaseEntity::SUB_Remove);
+	this->pev->nextthink = gpGlobals->time + kStompProjectileLifetime;
+
+	this->mStunTime = 0.0f;
+}
+
+void AvHStompProjectile::SetStunTime(float inStunTime)
+{
+	this->mStunTime = inStunTime;
+}
+	
+void AvHStompProjectile::StompTouch(CBaseEntity* inOther)
+{
+	if(!AvHSUGetIsExternalClassName(STRING(inOther->pev->classname)))
+	{
+		// Stop when it hits the world
+		AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inOther);
+		if(thePlayer)
+		{
+			if(thePlayer->GetCanBeAffectedByEnemies() && (thePlayer->GetTeam() != this->pev->team))
+			{
+				// Stun them if they're not stunned already, to prevent perpetual stunning
+				if(!thePlayer->GetIsStunned() && !GetHasUpgrade(thePlayer->pev->iuser4, MASK_TOPDOWN))
+				{
+					// Don't stun jetpackers
+					if(!GetHasUpgrade(thePlayer->pev->iuser4, MASK_UPGRADE_7)) //&& !(thePlayer->pev->flags & FL_ONGROUND)))
+					{
+						// Do a traceline to make sure the world isn't blocking it (StompTouch doesn't seem to be called for CWorld collisions)
+						TraceResult theTraceResult;
+						UTIL_TraceLine(this->mSpawnLocation, inOther->pev->origin, ignore_monsters, ignore_glass, NULL, &theTraceResult);
+
+						if(theTraceResult.flFraction == 1.0f)
+						{
+							if(thePlayer->SetIsStunned(true, this->mStunTime))
+                            {
+                                // Play effect at player's feet
+							    Vector theMinSize, theMaxSize;
+							    thePlayer->GetSize(theMinSize, theMaxSize);
+							    
+							    vec3_t theOrigin = thePlayer->pev->origin;
+							    theOrigin.z += theMinSize.z;
+							    
+							    AvHSUPlayParticleEvent(kpsStompEffect, inOther->edict(), theOrigin);
+                            }
+						}
+						else
+						{
+							CBaseEntity* theEntityHit = CBaseEntity::Instance(ENT(theTraceResult.pHit));
+							int a = 0;
+						}
+					}
+				}
+			}
+		}
+	}
+}
+	
+#endif
+
+
+
+BOOL AvHStomp::CanHolster(void)
+{
+	return true;
+}
+
+void AvHStomp::Init()
+{
+	this->mRange = BALANCE_IVAR(kStompRadius);
+}
+
+// Only allow it to be triggered when on the ground
+BOOL AvHStomp::IsUseable(void)
+{
+	BOOL theSuccess = AvHAlienWeapon::IsUseable();
+
+	if(theSuccess)
+	{
+		if(!this->m_pPlayer || !FBitSet(this->m_pPlayer->pev->flags, FL_ONGROUND))
+		{
+			theSuccess = false;
+		}
+	}
+
+	return theSuccess;
+}
+
+int	AvHStomp::GetBarrelLength() const
+{
+	return kStompBarrelLength;
+}
+
+float AvHStomp::GetRateOfFire() const
+{
+    return BALANCE_FVAR(kStompROF);
+}
+
+int	AvHStomp::GetDeployAnimation() const
+{
+	// Look at most recently used weapon and see if we can transition from it
+	int theDeployAnimation = 7;
+	
+	AvHWeaponID thePreviousID = this->GetPreviousWeaponID();
+	
+	switch(thePreviousID)
+	{
+	case AVH_WEAPON_CLAWS:
+		theDeployAnimation = 7;
+		break;
+	case AVH_ABILITY_CHARGE:
+		theDeployAnimation = 11;
+		break;
+	case AVH_WEAPON_DEVOUR:
+		theDeployAnimation = 20;
+		break;
+	}
+	
+	return theDeployAnimation;
+}
+
+float AvHStomp::GetDeployTime() const
+{
+	return .6f;
+}
+
+void AvHStomp::GetEventAngles(Vector& outAngles) const
+{
+	//this->GetStompVelocity(outAngles);
+	AvHAlienWeapon::GetEventAngles(outAngles);
+}
+
+void AvHStomp::GetEventOrigin(Vector& outOrigin) const
+{
+	this->GetStompOrigin(outOrigin);
+}
+
+bool AvHStomp::GetFiresUnderwater() const
+{
+	return false;
+}
+
+bool AvHStomp::GetIsDroppable() const
+{
+	return false;
+}
+
+int AvHStomp::GetShootAnimation() const
+{
+	return 24;
+}
+
+void AvHStomp::FireProjectiles(void)
+{
+#ifdef AVH_SERVER
+	// Search for relevant enemy players in range (only on ground?)
+//	CBaseEntity* theEntity = NULL;
+//	while((theEntity = UTIL_FindEntityInSphere(theEntity, this->pev->origin, this->mRange)) != NULL)
+//	{
+//		AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntity);
+//		if(thePlayer && (thePlayer != this->m_pPlayer))
+//		{
+//			if(thePlayer->GetIsRelevant() && (thePlayer->GetTeam() != this->m_pPlayer->pev->team))
+//			{
+//				// Stun them if they're not stunned already, to prevent perpetual stunning
+//				if(!thePlayer->GetIsStunned() && !GetHasUpgrade(thePlayer->pev->iuser4, MASK_TOPDOWN))
+//				{
+//					// Don't stun flying jetpackers
+//					if(!(GetHasUpgrade(thePlayer->pev->iuser4, MASK_UPGRADE_7) && !(thePlayer->pev->flags & FL_ONGROUND)))
+//					{
+//						thePlayer->SetIsStunned(true, BALANCE_FVAR(kStompTime));
+//					}
+//				}
+//			}
+//		}
+//	}
+
+	// Create stomp projectile that flies forward, stunning enemies it touches
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this->m_pPlayer);
+	ASSERT(thePlayer);
+	
+	AvHStompProjectile* theStomp = GetClassPtr((AvHStompProjectile*)NULL );
+	theStomp->Spawn();
+
+	this->GetStompOrigin(theStomp->pev->origin);
+	UTIL_SetOrigin(theStomp->pev, theStomp->pev->origin);
+
+	// Save starting point
+	VectorCopy(theStomp->pev->origin, theStomp->mSpawnLocation);
+
+	this->GetStompVelocity(theStomp->pev->velocity);
+	
+	// Set owner
+	theStomp->pev->owner = ENT(this->m_pPlayer->pev);
+	
+	// Set Stomp's team :)
+	theStomp->pev->team = this->m_pPlayer->pev->team;
+
+	// Set stun time
+	float theStunTime = BALANCE_FVAR(kStompTime);
+
+    if(AvHSHUGetIsWeaponFocusable(AvHWeaponID(this->m_iId)))
+    {
+        theStunTime *= AvHPlayerUpgrade::GetFocusDamageUpgrade(this->m_pPlayer->pev->iuser4);
+    }
+    
+	theStomp->SetStunTime(theStunTime);
+
+	// Play view shake here
+	float theShakeAmplitude = 100;
+	float theShakeFrequency = 100;
+	float theShakeDuration = 1.0f;
+	float theShakeRadius = 700;
+	UTIL_ScreenShake(this->pev->origin, theShakeAmplitude, theShakeFrequency, theShakeDuration, this->mRange);
+#endif	
+}
+
+void AvHStomp::GetStompOrigin(Vector& outOrigin) const
+{
+	VectorCopy(this->m_pPlayer->pev->origin, outOrigin);
+	
+	#ifdef AVH_SERVER
+	float theZOffset = this->m_pPlayer->pev->mins.z;
+	outOrigin.z += theZOffset;
+	#endif
+}
+
+void AvHStomp::GetStompVelocity(Vector& outVelocity) const
+{
+	// Send shockwave in direction player is looking, but always make it go kStompProjectilVelocity
+	UTIL_MakeVectors(this->m_pPlayer->pev->v_angle);
+	
+	// Zero out z velocity so it stays on the ground
+	Vector theAim = gpGlobals->v_forward;
+	theAim.z = 0;
+	
+	VectorNormalize(theAim);
+
+	VectorScale(theAim, kStompProjectileVelocity, outVelocity);
+}
+
+
+
+char* AvHStomp::GetViewModel() const
+{
+	return kLevel5ViewModel;
+}
+
+void AvHStomp::Precache()
+{
+	AvHAlienWeapon::Precache();
+
+	PRECACHE_UNMODIFIED_SOUND(kStompFireSound);
+	PRECACHE_UNMODIFIED_MODEL(kStompProjectileModel);
+
+	this->mEvent = PRECACHE_EVENT(1, kStompShootEventName);
+}
+
+void AvHStomp::Spawn() 
+{ 
+    AvHAlienWeapon::Spawn(); 
+
+	Precache();
+
+	this->m_iId = AVH_WEAPON_STOMP;
+
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsStomp);
+
+	SET_MODEL(ENT(this->pev), kNullModel);
+
+	FallInit();// get ready to fall down.
+} 
+
+bool AvHStomp::UsesAmmo(void) const
+{
+	return false;
+}
+
diff --git a/main/source/mod/AvHSwipe.cpp b/main/source/mod/AvHSwipe.cpp
new file mode 100644
index 00000000..207f1e62
--- /dev/null
+++ b/main/source/mod/AvHSwipe.cpp
@@ -0,0 +1,262 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHSwipe.cpp $
+// $Date: 2002/11/22 21:28:17 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHSwipe.cpp,v $
+// Revision 1.15  2002/11/22 21:28:17  Flayra
+// - mp_consistency changes
+//
+// Revision 1.14  2002/11/06 01:38:37  Flayra
+// - Added ability for buildings to be enabled and disabled, for turrets to be shut down
+// - Damage refactoring (TakeDamage assumes caller has already adjusted for friendly fire, etc.)
+//
+// Revision 1.13  2002/08/16 02:48:10  Flayra
+// - New damage model
+//
+// Revision 1.12  2002/07/24 19:09:18  Flayra
+// - Linux issues
+//
+// Revision 1.11  2002/07/24 18:55:53  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.10  2002/07/24 18:45:43  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.9  2002/07/23 17:29:52  Flayra
+// - Updated for new artwork
+//
+// Revision 1.8  2002/07/08 16:48:50  Flayra
+// - Melee weapons don't play hit sounds or punchangle target if they didn't damage them
+//
+// Revision 1.7  2002/06/25 17:51:00  Flayra
+// - Reworking for correct player animations and new enable/disable state, new view model artwork, alien weapon refactoring
+//
+// Revision 1.6  2002/06/03 16:39:10  Flayra
+// - Added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.5  2002/05/23 02:32:57  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHGamerules.h"
+#include "mod/AvHServerUtil.h"
+#endif
+
+#include "mod/AvHSharedUtil.h"
+
+LINK_ENTITY_TO_CLASS(kwSwipe, AvHSwipe);
+
+int	AvHSwipe::GetBarrelLength() const
+{
+	return kSwipeBarrelLength;
+}
+
+bool AvHSwipe::GetIsGunPositionValid() const
+{
+    return true;
+}
+
+float AvHSwipe::GetRateOfFire() const
+{
+	return BALANCE_FVAR(kSwipeROF);
+}
+
+bool AvHSwipe::GetFiresUnderwater() const
+{
+	return true;
+}
+
+int	AvHSwipe::GetIdleAnimation() const
+{
+	// Only play the arm-scratching animation once in awhile, it's a special treat
+	// Must be odd
+	int theAnimation = 0;
+	const int kMax = 41;
+	int theRandomNumber = UTIL_SharedRandomLong(this->m_pPlayer->random_seed, 0, kMax);
+	
+	if(theRandomNumber == kMax)
+	{
+		// Return flavor anim
+		theAnimation = 2;
+	} 
+	else if(theRandomNumber < (kMax-1)/2)
+	{
+		theAnimation = 0;
+	}
+	else
+	{
+		theAnimation = 1;
+	}
+	
+	return theAnimation;
+}
+
+
+bool AvHSwipe::GetIsDroppable() const
+{
+	return false;
+}
+
+int	AvHSwipe::GetDeployAnimation() const
+{
+	// Look at most recently used weapon and see if we can transition from it
+	int theDeployAnimation = 5;
+	
+	AvHWeaponID thePreviousID = this->GetPreviousWeaponID();
+	
+	switch(thePreviousID)
+	{
+	case AVH_WEAPON_SWIPE:
+		theDeployAnimation = -1;
+		break;
+
+	case AVH_WEAPON_ACIDROCKET:
+	case AVH_WEAPON_BILEBOMB:
+		theDeployAnimation = 10;
+		break;
+
+	case AVH_WEAPON_BLINK:
+	case AVH_WEAPON_METABOLIZE:
+		theDeployAnimation = 12;
+		break;
+	}
+	
+	return theDeployAnimation;
+}
+
+int	AvHSwipe::GetShootAnimation() const
+{
+	int theAnimation = UTIL_SharedRandomLong(this->m_pPlayer->random_seed, 3, 4);
+
+	return theAnimation;
+}
+
+void AvHSwipe::Init()
+{
+	this->mRange = kSwipeRange;
+	this->mDamage = BALANCE_IVAR(kSwipeDamage);
+}
+
+int AvHSwipe::GetDamageType() const
+{
+	return NS_DMG_NORMAL;
+}
+
+char* AvHSwipe::GetViewModel() const
+{
+	return kLevel4ViewModel;
+}
+
+
+void AvHSwipe::Precache(void)
+{
+	AvHAlienWeapon::Precache();
+	
+	PRECACHE_UNMODIFIED_SOUND(kSwipeSound1);
+	PRECACHE_UNMODIFIED_SOUND(kSwipeSound2);
+	PRECACHE_UNMODIFIED_SOUND(kSwipeSound3);
+	PRECACHE_UNMODIFIED_SOUND(kSwipeSound4);
+
+	PRECACHE_UNMODIFIED_SOUND(kSwipeHitSound1);
+	PRECACHE_UNMODIFIED_SOUND(kSwipeHitSound2);
+	PRECACHE_UNMODIFIED_SOUND(kSwipeKillSound);
+
+	this->mEvent = PRECACHE_EVENT(1, kSwipeEventName);
+}
+
+void AvHSwipe::Spawn()
+{
+    AvHAlienWeapon::Spawn(); 
+	
+	Precache();
+	
+	this->m_iId = AVH_WEAPON_SWIPE;
+	
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsSwipe);
+	
+	SET_MODEL(ENT(this->pev), kNullModel);
+	
+	FallInit();// get ready to fall down.
+	
+}
+
+bool AvHSwipe::UsesAmmo(void) const
+{
+	return false;
+}
+
+BOOL AvHSwipe::UseDecrement(void)
+{
+	return true;
+}
+
+void AvHSwipe::FireProjectiles(void)
+{
+	#ifdef AVH_SERVER
+
+	// TODO: Check team
+
+	float theDamage = this->mDamage*AvHPlayerUpgrade::GetAlienMeleeDamageUpgrade(this->m_pPlayer->pev->iuser4, AvHSHUGetIsWeaponFocusable(AvHWeaponID(this->m_iId)));
+	
+	// Do trace hull here
+	CBaseEntity* pHurt = this->m_pPlayer->CheckTraceHullAttack(kSwipeRange, theDamage, this->GetDamageType());
+	if(pHurt)
+	{
+		if(pHurt->pev->flags & (FL_MONSTER | FL_CLIENT))
+		{
+            AvHSUKnockPlayerAbout(CBaseEntity::Instance(this->m_pPlayer->edict()), pHurt, 300);
+			
+			int theSoundIndex = RANDOM_LONG(0, 1);
+			char* theSoundToPlay = NULL;
+			switch(theSoundIndex)
+			{
+			case 0:
+				theSoundToPlay = kSwipeHitSound1;
+				break;
+			case 1:
+				theSoundToPlay = kSwipeHitSound2;
+				break;
+			}
+			
+			if(pHurt->pev->health <= 0)
+			{
+				theSoundToPlay = kSwipeKillSound;
+			}
+			
+			ASSERT(theSoundToPlay);
+
+			EMIT_SOUND(ENT(pev), CHAN_WEAPON, theSoundToPlay, 1.0, ATTN_NORM);
+		}
+	}
+
+	#endif	
+}
+
diff --git a/main/source/mod/AvHTeam.cpp b/main/source/mod/AvHTeam.cpp
new file mode 100644
index 00000000..df2d380f
--- /dev/null
+++ b/main/source/mod/AvHTeam.cpp
@@ -0,0 +1,2863 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHTeam.cpp $
+// $Date: 2002/11/26 20:35:00 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHTeam.cpp,v $
+// Revision 1.55  2002/11/26 20:35:00  Flayra
+// - Hurt fix
+//
+// Revision 1.54  2002/11/26 15:58:31  Flayra
+// - When the alien team no longer has any growing or active hives, all aliens slowly take damage. This is done to speed up the end game and prevent hiding llamas.
+//
+// Revision 1.53  2002/11/22 23:26:59  Flayra
+// - Don't play kill lingering aliens with cheats on (when testing)
+//
+// Revision 1.52  2002/11/22 21:15:37  Flayra
+// - Remove owner of entities when player leaves the team
+// - Do damage to aliens without hives
+// - Fixed bug where a vote could affect a commander that logged in after a vote had been started.
+//
+// Revision 1.51  2002/11/15 23:31:26  Flayra
+// - Added "ready" verification for tourny mode
+//
+// Revision 1.50  2002/11/12 02:29:33  Flayra
+// - Added better standardized logging
+//
+// Revision 1.49  2002/11/06 03:08:56  Flayra
+// - Undid +1 for resources, it's too drastic
+//
+// Revision 1.48  2002/11/06 02:23:49  Flayra
+// - Removed faulty minimum trickle that was giving 1 extra resource point to both teams
+//
+// Revision 1.47  2002/11/06 01:39:04  Flayra
+// - Show true resources going to team
+//
+// Revision 1.46  2002/11/03 04:52:55  Flayra
+// - Hard-coded resources
+//
+// Revision 1.45  2002/10/24 21:43:29  Flayra
+// - Alien easter eggs
+// - Voting fix
+//
+// Revision 1.44  2002/10/19 21:28:38  Flayra
+// - Debugging info for linux
+//
+// Revision 1.43  2002/10/19 21:09:56  Flayra
+// - Debugging info for linux
+//
+// Revision 1.42  2002/10/19 20:56:06  Flayra
+// - Debugging info for linux
+//
+// Revision 1.41  2002/10/19 20:19:26  Flayra
+// - Debugging info for linux
+//
+// Revision 1.40  2002/10/19 20:04:14  Flayra
+// - Debugging info for linux
+//
+// Revision 1.39  2002/10/18 22:23:04  Flayra
+// - Added beginnings of alien easter eggs
+// - Added "we need builders" alert
+//
+// Revision 1.38  2002/10/04 18:03:23  Flayra
+// - Fixed bug where extra resources were sometimes being wasted on the alien team
+//
+// Revision 1.37  2002/10/03 19:09:55  Flayra
+// - New resource model
+// - Orders refactoring
+// - Tech tree changes
+// - Aliens always get initial points when joining
+// - Play gamestart sound
+// - New trait available trigger
+// - Moved voting stuff to server variables
+// - Slowed down hints
+//
+// Revision 1.36  2002/09/25 20:51:31  Flayra
+// - Play commander-idle sounds less often
+//
+// Revision 1.35  2002/09/23 22:35:43  Flayra
+// - Removed hive donation and put in new system for builders
+// - Updated tech tree (jetpacks, heavy armor, moved phase)
+// - Resource towers set as built on game start
+// - Added tons of commander hints (low resource alerts, tell commander about pressing jump key, commander ejected, select troops and give orders, don't just sit there, etc.)
+//
+// Revision 1.34  2002/09/09 20:08:26  Flayra
+// - Added commander voting
+// - Added hive info
+// - Changed how commander scoring works
+//
+// Revision 1.33  2002/08/31 18:01:03  Flayra
+// - Work at VALVe
+//
+// Revision 1.32  2002/08/02 21:45:20  Flayra
+// - Reworked alerts.
+//
+// Revision 1.31  2002/07/28 19:21:27  Flayra
+// - Balance changes after/during RC4a
+//
+// Revision 1.30  2002/07/26 23:08:25  Flayra
+// - Added numerical feedback
+//
+// Revision 1.29  2002/07/25 16:58:00  flayra
+// - Linux changes
+//
+// Revision 1.28  2002/07/24 18:55:53  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.27  2002/07/23 17:32:23  Flayra
+// - Resource model overhaul (closed system, random initial points), tech tree changes (new marine upgrades), free resource tower at nearest func_resource
+//
+// Revision 1.26  2002/07/10 14:45:26  Flayra
+// - Fixed victory condition bug (bug #171)
+//
+// Revision 1.25  2002/07/08 17:19:42  Flayra
+// - Added handicapping, map validity checking, reinforcements happen independently of teams now
+//
+// Revision 1.24  2002/07/01 21:24:07  Flayra
+// - Brought siege back, removed alpha male resource model
+//
+// Revision 1.23  2002/06/25 18:21:33  Flayra
+// - New enabled/disabled system for alien weapons, better victory detection, updated tech tree (removed old junk, added armory upgrade), fixed bug where a commander that leaves the game hogged the station, update resources less often (optimization)
+//
+// Revision 1.22  2002/06/03 17:00:33  Flayra
+// - Removed mines and siege temporarily while being worked on, removed old code, removed redundant hive class name
+//
+// Revision 1.21  2002/05/28 18:09:51  Flayra
+// - Track number of webs for team, fix for premature victory condition (again), fixed bug where alien upgrades weren't being cleared between levels, causing eventual overflows for alien players after many games, recycling support, spawn in command center when game starts
+//
+// Revision 1.20  2002/05/23 02:32:57  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "extdll.h"
+#include "util.h"
+#include "cbase.h"
+#include "mod/AvHTeam.h"
+#include "mod/AvHPlayer.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHServerVariables.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHMarineEquipment.h"
+#include "mod/AvHAlienEquipmentConstants.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "game_shared/teamconst.h"
+#include "mod/AvHBuildable.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHTitles.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "util/MathUtil.h"
+#include "mod/UPPUtil.h"
+
+extern int gPhaseInEventID;
+extern int gmsgTeamScore;
+extern cvar_t avh_votecasttime;
+extern cvar_t avh_votedowntime;
+extern cvar_t avh_votepercentneeded;
+extern cvar_t avh_minvotesneeded;
+extern cvar_t avh_initialalienpoints;
+extern cvar_t avh_eastereggchance;
+
+AvHTeam::AvHTeam(AvHTeamNumber inTeamNumber)
+{
+	this->Init();
+	this->mTeamNumber = inTeamNumber;
+	this->mResearchManager.SetTeamNumber(inTeamNumber);
+}
+
+void AvHTeam::Init()
+{
+	this->mTeamType = AVH_CLASS_TYPE_UNDEFINED;
+	this->mTeamName = kInvalidTeamName;
+	this->mTeamNumber = TEAM_IND;
+	this->mCommander = -1;
+	this->mCommanderWhenVoteStarted = -1;
+	
+	this->mPlayerList.clear();
+	this->mResourceTowerList.clear();
+
+	this->mLastResourceUpdateTime = -1;
+	this->mLastCommandScoreUpdateTime = -1;
+	this->mLastServerPlayerDataUpdateTime = -1;
+	this->mLastPlayerUpdateTime = -1;
+	this->mLastInjectionTime = 0;
+	this->mLastHiveSpawnTime = 0;
+
+	// Alerts
+	this->mAlertList.clear();
+	this->mTimeOfLastTeamHint = -1;
+	this->mTimeLastHintUpdate = -1;
+
+	this->mTeamResources = 0;
+	this->mHandicap = 1.0f;
+
+	this->mResearchManager.Reset();
+
+	this->mAlienUpgrades.clear();
+	this->mTeamWideUpgrades = 0;
+
+	this->mNumWebStrands = 0;
+	this->mIsReady = false;
+
+	this->mTotalResourcesGathered = 0;
+	this->mClientTotalResourcesGathered = 0;
+
+	this->mMenuTechSlots = 0;
+
+	this->mTimeReinforcementWaveComplete = -1;
+}
+
+bool AvHTeam::AddPlayer(int inPlayerIndex)
+{
+	bool theSuccess = false;
+	
+	if(!this->GetIsPlayerOnTeam(inPlayerIndex))
+	{
+		// Add player
+		this->mPlayerList.push_back(inPlayerIndex);
+
+		theSuccess = true;
+	}
+	
+	return theSuccess;
+}
+
+bool AvHTeam::AddResourceTower(int inResourceTowerIndex)
+{
+	bool theSuccess = false;
+
+	EntityListType::const_iterator theIter = std::find(this->mResourceTowerList.begin(), this->mResourceTowerList	.end(), inResourceTowerIndex);
+	if(theIter == this->mResourceTowerList.end())
+	{
+		this->mResourceTowerList.push_back(inResourceTowerIndex);
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+bool AvHTeam::RemoveResourceTower(int inResourceTowerIndex)
+{
+	bool theSuccess = false;
+
+	EntityListType::iterator theIter = std::find(this->mResourceTowerList.begin(), this->mResourceTowerList	.end(), inResourceTowerIndex);
+	if(theIter != this->mResourceTowerList.end())
+	{
+		this->mResourceTowerList.erase(theIter);
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+bool AvHTeam::GetIsReady() const
+{
+	return this->mIsReady;
+}
+
+int	AvHTeam::GetMenuTechSlots() const
+{
+	return this->mMenuTechSlots;
+}
+
+void AvHTeam::SetIsReady(bool bIsReady)
+{
+	this->mIsReady = bIsReady;
+}
+
+int	AvHTeam::GetNumBuiltCommandStations() const
+{
+	return this->mNumBuiltCommandStations;
+}
+
+int	AvHTeam::GetNumActiveHives() const
+{
+	return this->mNumActiveHives;
+}
+
+float AvHTeam::GetMaxResources(AvHUser3 inUser3) const
+{
+	float theMaxResources = -1;
+
+	if(this->mTeamType == AVH_CLASS_TYPE_ALIEN)
+	{
+		//if(inUser3 == AVH_USER3_ALIEN_PLAYER2)
+		//{
+			// Needed so builders can create hives (also means that having more builders diverts resources from combat/offense)
+			theMaxResources = kMaxAlienResources;
+		//}
+		//else
+		//{
+		//	int theNumActiveHives = max(this->GetNumActiveHives(), 1);
+		//	theMaxResources = (theNumActiveHives/(float)kMaxAlienHives)*kMaxAlienResources;
+		//}
+	}
+
+	return theMaxResources;
+}
+
+
+bool AvHTeam::GetTeamHasAbilityToRespawn() const
+{
+	bool theAbilityToRespawn = false;
+	
+	// If game hasn't started
+	if(!GetGameRules()->GetGameStarted())
+	{
+		// return true
+		theAbilityToRespawn = true;
+	}
+	// else if we're a marine team
+	else if(this->GetTeamType() == AVH_CLASS_TYPE_MARINE)
+	{
+		// Do we have any built infantry portals?
+		FOR_ALL_ENTITIES(kwsInfantryPortal, AvHInfantryPortal*)
+		if(theEntity->GetIsBuilt())
+		{
+			AvHTeamNumber theTeamNumber = (AvHTeamNumber)(theEntity->pev->team);
+			if(theTeamNumber == this->mTeamNumber)
+			{
+				theAbilityToRespawn = true;
+				break;
+			}
+		}
+		END_FOR_ALL_ENTITIES(kwsInfantryPortal);
+	}
+	// else if we're an alien team
+	else if(this->GetTeamType() == AVH_CLASS_TYPE_ALIEN)
+	{
+		// Do we have any active hives?
+		FOR_ALL_ENTITIES(kesTeamHive, AvHHive*)
+			if(theEntity->GetIsActive())
+			{
+				AvHTeamNumber theTeamNumber = (AvHTeamNumber)(theEntity->pev->team);
+				if(theTeamNumber == this->mTeamNumber)
+				{
+					theAbilityToRespawn = true;
+					break;
+				}
+			}
+			END_FOR_ALL_ENTITIES(kesTeamHive);
+	}
+	
+	return theAbilityToRespawn;
+}
+
+bool AvHTeam::GetHasAtLeastOneActivePlayer(bool* outHasAtLeastOnePlayerOnTeam) const
+{
+	bool theHasAtLeastOneActivePlayer = false;
+
+	// Loop through all players on team
+	for(EntityListType::const_iterator theIter = this->mPlayerList.begin(); theIter != this->mPlayerList.end(); theIter++)
+	{
+		const AvHPlayer* thePlayer = this->GetPlayerFromIndex(*theIter);
+		ASSERT(thePlayer);
+		
+		if(outHasAtLeastOnePlayerOnTeam)
+		{
+			*outHasAtLeastOnePlayerOnTeam = true;
+		}
+		
+		if((thePlayer->IsAlive() && !thePlayer->GetIsBeingDigested()) || (thePlayer->GetUser3() == AVH_USER3_COMMANDER_PLAYER))
+		{
+			theHasAtLeastOneActivePlayer = true;
+			break;
+		}
+	}
+
+	return theHasAtLeastOneActivePlayer;
+}
+
+bool AvHTeam::GetHasTeamLost() const
+{
+	bool theTeamHasLost = false;
+	
+	bool theHasAtLeastOnePlayerOnTeam = false;
+	bool theHasAtLeastOneActivePlayer = this->GetHasAtLeastOneActivePlayer(&theHasAtLeastOnePlayerOnTeam);
+	
+	if(GetGameRules()->GetIsCombatMode())
+	{
+		if(this->GetTeamType() == AVH_CLASS_TYPE_ALIEN)
+		{
+			if((this->GetNumActiveHives() == 0) || !theHasAtLeastOnePlayerOnTeam)
+			{
+				theTeamHasLost = true;
+			}
+		}
+		else if(this->GetTeamType() == AVH_CLASS_TYPE_MARINE)
+		{
+			if((this->GetNumBuiltCommandStations() == 0) || !theHasAtLeastOnePlayerOnTeam)
+			{
+				theTeamHasLost = true;
+			}
+		}
+	}
+	else
+	{
+		// We need at least one alive player, OR, at the ability to respawn
+		bool theHasAbilityToRespawn = this->GetTeamHasAbilityToRespawn();
+		if((!theHasAtLeastOneActivePlayer && !theHasAbilityToRespawn) || !theHasAtLeastOnePlayerOnTeam)
+		{
+			theTeamHasLost = true;
+		}
+	}
+
+	if(theTeamHasLost)
+	{
+		//UTIL_LogPrintf("Team %d has lost.  theAtLeastOneAlivePlayer: %d, theAbilityToRespawn: %d, theHasAtLeastOnePlayerOnTeam: %d\n", this->mTeamNumber, theHasAtLeastOneAlivePlayer, theHasAbilityToRespawn, theHasAtLeastOnePlayerOnTeam);
+		UTIL_LogPrintf("Team %d has lost.\n", this->mTeamNumber);
+		
+		//FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+		//	UTIL_LogPrintf("	Victory player info: ent: %d, team: %d, role: %d, playmode: %d\n", theEntity->entindex(), theEntity->pev->team, (int)theEntity->GetRole(), (int)theEntity->GetPlayMode());
+		//END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+	}
+	
+	return theTeamHasLost;
+}
+
+HiveInfoListType AvHTeam::GetHiveInfoList() const
+{
+	return this->mHiveInfoList;
+}
+
+
+const AvHResearchManager& AvHTeam::GetResearchManager() const
+{
+	return this->mResearchManager;
+}
+
+AvHResearchManager&	AvHTeam::GetResearchManager()
+{
+	return this->mResearchManager;
+}
+
+float AvHTeam::GetTotalResourcesGathered() const
+{
+	return this->mTotalResourcesGathered;
+}
+
+void AvHTeam::AddResourcesGathered(float inResources)
+{
+	this->mTotalResourcesGathered += inResources;
+}
+
+bool AvHTeam::GetIsPlayerOnTeam(int inPlayerIndex) const
+{
+	bool theSuccess = false;
+	
+	EntityListType::const_iterator theIter = std::find(this->mPlayerList.begin(), this->mPlayerList	.end(), inPlayerIndex);
+	if(theIter != this->mPlayerList.end())
+	{
+		theSuccess = true;
+	}
+	
+	return theSuccess;
+}
+
+AvHPlayer* AvHTeam::GetPlayerFromIndex(int inPlayerIndex)
+{
+	AvHPlayer* thePlayer = NULL;
+	
+	CBaseEntity* theBaseEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(inPlayerIndex));
+	thePlayer = dynamic_cast<AvHPlayer*>(theBaseEntity);
+	
+	return thePlayer;
+}
+
+const AvHPlayer* AvHTeam::GetPlayerFromIndex(int inPlayerIndex) const
+{
+	const AvHPlayer* thePlayer = NULL;
+	const CBaseEntity* theBaseEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(inPlayerIndex));
+	thePlayer = dynamic_cast<const AvHPlayer*>(theBaseEntity);
+	
+	return thePlayer;
+}
+
+void AvHTeam::GetOrders(OrderListType& outOrderList) const
+{
+	outOrderList = this->mOrderList;
+}
+
+bool AvHTeam::GetDoesPlayerHaveOrder(int inPlayerIndex)
+{
+	bool thePlayerHasOrders = false;
+
+	for(OrderListType::iterator theIter = this->mOrderList.begin(); theIter != this->mOrderList.end(); theIter++)
+	{
+		EntityInfo theReceiver = theIter->GetReceiver();
+		if(theReceiver == inPlayerIndex)
+		{
+			thePlayerHasOrders = true;
+		}
+	}
+
+	return thePlayerHasOrders;
+}
+
+//void AvHTeam::GetPlayersCompletingOrders(const EntityListType& outPlayerList) const
+//{
+//	outPlayerList = this->mPlayersCompletingOrder;
+//}
+
+void AvHTeam::SetOrder(const AvHOrder& inOrder)
+{
+	AvHChangeOrder(this->mOrderList, inOrder);
+}
+
+void AvHTeam::AddTechNode(AvHMessageID inMessageID, AvHTechID inTechID, AvHTechID inPrereq1, AvHTechID inPrereq2, bool inAllowMultiples, bool inResearched)
+{
+	int theCost = GetGameRules()->GetCostForMessageID(inMessageID);
+	int theBuildTime = GetGameRules()->GetBuildTimeForMessageID(inMessageID);
+
+	bool theCheatsEnabled = false;//GetGameRules()->GetCheatsEnabled();
+	AvHTechID thePrereq1 = theCheatsEnabled ? TECH_NULL : inPrereq1;
+	AvHTechID thePrereq2 = theCheatsEnabled ? TECH_NULL : inPrereq2;
+
+	this->mResearchManager.AddTechNode(inMessageID, inTechID, thePrereq1, thePrereq2, theCost, theBuildTime, inResearched, inAllowMultiples);
+}
+
+#ifdef AVH_PLAYTEST_BUILD
+void AvHTeam::BalanceChanged()
+{
+	this->mResearchManager.BalanceChanged();
+}
+#endif
+
+void AvHTeam::InitializeTechNodes()
+{
+	// Clear them first
+	this->mResearchManager.Reset();
+	//this->mUpgradeCosts.clear();
+	this->mTechSlotManager.Clear();
+
+	// Depending on game mode, set tech tree
+	
+	if(GetGameRules()->GetIsCombatMode())
+	{
+		this->InitializeCombatTechNodes();
+	}
+	else
+	{
+		// else regular NS
+		if(this->mTeamType == AVH_CLASS_TYPE_MARINE)
+		{
+			this->AddTechNode(MESSAGE_NULL, TECH_COMMAND_CENTER, TECH_NULL, TECH_NULL, false, true);
+			this->AddTechNode(BUILD_RECYCLE, TECH_NULL, TECH_NULL);
+			this->AddTechNode(BUILD_COMMANDSTATION, TECH_NULL, TECH_NULL);
+
+			this->AddTechNode(BUILD_INFANTRYPORTAL, TECH_INFANTRYPORTAL, TECH_COMMAND_CENTER);
+			//this->AddTechNode(RESEARCH_FASTER_REINFORCEMENTS, TECH_RESEARCH_FASTER_REINFORCEMENTS, TECH_INFANTRYPORTAL, TECH_OBSERVATORY, false, false);
+			
+			this->AddTechNode(MESSAGE_CANCEL, TECH_NULL, TECH_NULL, TECH_NULL, true);
+			
+			this->AddTechNode(BUILD_AMMO, TECH_NULL, TECH_NULL);
+			this->AddTechNode(BUILD_HEALTH, TECH_NULL, TECH_NULL);
+            this->AddTechNode(BUILD_CAT, TECH_NULL, TECH_RESEARCH_CATALYSTS, TECH_NULL, true, false);
+			this->AddTechNode(BUILD_RESOURCES, TECH_COMMAND_CENTER, TECH_NULL, TECH_NULL, true, false);
+			this->AddTechNode(BUILD_HEALTH, TECH_COMMAND_CENTER, TECH_NULL);
+
+			// CC
+			//this->AddTechNode(RESEARCH_HEALTH, TECH_RESEARCH_HEALTH, TECH_COMMAND_CENTER, TECH_NULL, false);
+			
+			// Turret factory route
+			this->AddTechNode(BUILD_TURRET_FACTORY, TECH_TURRET_FACTORY);
+			this->AddTechNode(BUILD_TURRET, TECH_NULL, TECH_TURRET_FACTORY);
+			this->AddTechNode(RESEARCH_ELECTRICAL, TECH_RESEARCH_ELECTRICAL, TECH_TURRET_FACTORY, TECH_NULL, true);
+
+			this->AddTechNode(TURRET_FACTORY_UPGRADE, TECH_ADVANCED_TURRET_FACTORY, TECH_TURRET_FACTORY, TECH_NULL, true);
+			this->AddTechNode(BUILD_SIEGE, TECH_NULL, TECH_ADVANCED_TURRET_FACTORY);
+			
+			// Arms lab
+			this->AddTechNode(BUILD_ARMSLAB, TECH_ARMSLAB, TECH_ARMORY);
+
+			this->AddTechNode(RESEARCH_ARMOR_ONE, TECH_RESEARCH_ARMOR_ONE, TECH_ARMSLAB, TECH_NULL, false);
+			this->AddTechNode(RESEARCH_ARMOR_TWO, TECH_RESEARCH_ARMOR_TWO, TECH_RESEARCH_ARMOR_ONE, TECH_NULL, false);
+			this->AddTechNode(RESEARCH_ARMOR_THREE, TECH_RESEARCH_ARMOR_THREE, TECH_RESEARCH_ARMOR_TWO, TECH_NULL, false);
+
+			this->AddTechNode(RESEARCH_WEAPONS_ONE, TECH_RESEARCH_WEAPONS_ONE, TECH_ARMSLAB, TECH_NULL, false);
+			this->AddTechNode(RESEARCH_WEAPONS_TWO, TECH_RESEARCH_WEAPONS_TWO, TECH_RESEARCH_WEAPONS_ONE, TECH_NULL, false);
+			this->AddTechNode(RESEARCH_WEAPONS_THREE, TECH_RESEARCH_WEAPONS_THREE, TECH_RESEARCH_WEAPONS_TWO, TECH_NULL, false);
+            this->AddTechNode(RESEARCH_CATALYSTS, TECH_RESEARCH_CATALYSTS, TECH_ARMSLAB, TECH_NULL, false, false);
+
+			this->AddTechNode(RESEARCH_HEAVYARMOR, TECH_RESEARCH_HEAVYARMOR, TECH_PROTOTYPE_LAB, TECH_NULL, false);
+					
+			// Prototype lab
+			this->AddTechNode(BUILD_PROTOTYPE_LAB, TECH_PROTOTYPE_LAB, TECH_ARMSLAB, TECH_ADVANCED_ARMORY);
+			this->AddTechNode(RESEARCH_JETPACKS, TECH_RESEARCH_JETPACKS, TECH_PROTOTYPE_LAB, TECH_NULL, false, false);
+
+			// Armor add-ons
+			this->AddTechNode(BUILD_JETPACK, TECH_NULL, TECH_RESEARCH_JETPACKS, TECH_PROTOTYPE_LAB);
+			this->AddTechNode(BUILD_HEAVY, TECH_NULL, TECH_RESEARCH_HEAVYARMOR, TECH_PROTOTYPE_LAB);
+
+			// Weapon factory route
+			this->AddTechNode(BUILD_ARMORY, TECH_ARMORY);
+			this->AddTechNode(ARMORY_UPGRADE, TECH_ADVANCED_ARMORY, TECH_ARMORY);
+            this->AddTechNode(RESEARCH_GRENADES, TECH_RESEARCH_GRENADES, TECH_ARMORY, TECH_NULL, false, false);
+			//this->AddTechNode(BUILD_NUKE_PLANT, TECH_NUKE_PLANT, TECH_ADVANCED_ARMORY);
+
+			// Observatory/knowledge/phase gate route
+			this->AddTechNode(BUILD_OBSERVATORY, TECH_OBSERVATORY, TECH_ARMORY);
+			this->AddTechNode(BUILD_SCAN, TECH_NULL, TECH_OBSERVATORY);
+			this->AddTechNode(RESEARCH_MOTIONTRACK, TECH_RESEARCH_MOTIONTRACK, TECH_OBSERVATORY, TECH_NULL, false);
+			this->AddTechNode(RESEARCH_DISTRESSBEACON, TECH_RESEARCH_DISTRESSBEACON, TECH_OBSERVATORY, TECH_NULL);
+			this->AddTechNode(RESEARCH_PHASETECH, TECH_RESEARCH_PHASETECH, TECH_INFANTRYPORTAL, TECH_OBSERVATORY, false);
+			this->AddTechNode(BUILD_PHASEGATE, TECH_NULL, TECH_OBSERVATORY, TECH_RESEARCH_PHASETECH);
+			
+			// Weapons
+			this->AddTechNode(BUILD_SHOTGUN, TECH_NULL, TECH_ARMORY);
+			this->AddTechNode(BUILD_WELDER, TECH_NULL, TECH_ARMORY);
+			this->AddTechNode(BUILD_MINES, TECH_NULL, TECH_ARMORY);
+			
+			this->AddTechNode(BUILD_HMG, TECH_NULL, TECH_ADVANCED_ARMORY);
+			this->AddTechNode(BUILD_GRENADE_GUN, TECH_NULL, TECH_ADVANCED_ARMORY, TECH_NULL);
+			//this->AddTechNode(BUILD_NUKE, TECH_NULL, TECH_NUKE_PLANT, TECH_ADVANCED_ARMORY);
+			
+			// Specials
+			//this->AddTechNode(BUILD_MEDKIT, TECH_NULL, TECH_MEDLAB);
+
+			// Add tech to allow resource adjustment (allow it to be researched multiple times)
+			//this->AddTechNode(RESOURCE_UPGRADE, TECH_NULL, TECH_NULL, TECH_NULL);
+
+			// Initialize tech slots for marines
+			this->mTechSlotManager.AddTechSlots(AvHTechSlots(AVH_USER3_COMMANDER_STATION, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, BUILD_RECYCLE));
+			this->mTechSlotManager.AddTechSlots(AvHTechSlots(AVH_USER3_TURRET_FACTORY, RESEARCH_ELECTRICAL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, TURRET_FACTORY_UPGRADE, MESSAGE_NULL, MESSAGE_NULL, BUILD_RECYCLE));
+			this->mTechSlotManager.AddTechSlots(AvHTechSlots(AVH_USER3_ADVANCED_TURRET_FACTORY, RESEARCH_ELECTRICAL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, BUILD_RECYCLE));
+			this->mTechSlotManager.AddTechSlots(AvHTechSlots(AVH_USER3_ARMORY, ARMORY_UPGRADE, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, RESEARCH_GRENADES, MESSAGE_NULL, MESSAGE_NULL, BUILD_RECYCLE));
+			this->mTechSlotManager.AddTechSlots(AvHTechSlots(AVH_USER3_ADVANCED_ARMORY, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, RESEARCH_GRENADES, MESSAGE_NULL, MESSAGE_NULL, BUILD_RECYCLE));
+			this->mTechSlotManager.AddTechSlots(AvHTechSlots(AVH_USER3_ARMSLAB, RESEARCH_WEAPONS_ONE, RESEARCH_WEAPONS_TWO, RESEARCH_WEAPONS_THREE, RESEARCH_CATALYSTS, RESEARCH_ARMOR_ONE, RESEARCH_ARMOR_TWO, RESEARCH_ARMOR_THREE, BUILD_RECYCLE));
+			this->mTechSlotManager.AddTechSlots(AvHTechSlots(AVH_USER3_PROTOTYPE_LAB, RESEARCH_JETPACKS, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, RESEARCH_HEAVYARMOR, MESSAGE_NULL, MESSAGE_NULL, BUILD_RECYCLE));
+			this->mTechSlotManager.AddTechSlots(AvHTechSlots(AVH_USER3_OBSERVATORY, BUILD_SCAN, RESEARCH_PHASETECH, MESSAGE_NULL, MESSAGE_NULL, RESEARCH_DISTRESSBEACON, RESEARCH_MOTIONTRACK, MESSAGE_NULL, BUILD_RECYCLE));
+			this->mTechSlotManager.AddTechSlots(AvHTechSlots(AVH_USER3_TURRET, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, BUILD_RECYCLE));
+			this->mTechSlotManager.AddTechSlots(AvHTechSlots(AVH_USER3_SIEGETURRET, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, BUILD_RECYCLE));
+			this->mTechSlotManager.AddTechSlots(AvHTechSlots(AVH_USER3_RESTOWER, RESEARCH_ELECTRICAL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, BUILD_RECYCLE));
+			this->mTechSlotManager.AddTechSlots(AvHTechSlots(AVH_USER3_INFANTRYPORTAL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, BUILD_RECYCLE));
+			this->mTechSlotManager.AddTechSlots(AvHTechSlots(AVH_USER3_PHASEGATE, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, MESSAGE_NULL, BUILD_RECYCLE));
+			this->mTechSlotManager.AddTechSlots(AvHTechSlots(AVH_USER3_MARINE_PLAYER));
+
+			// Initialize tech slots for top-level menus.  Note that the data for these four menus is stored in the command station iuser1
+			this->mTechSlotManager.AddTechSlots(AvHTechSlots(AVH_USER3_MENU_BUILD, BUILD_RESOURCES, BUILD_INFANTRYPORTAL, BUILD_ARMORY, BUILD_COMMANDSTATION, BUILD_TURRET_FACTORY, BUILD_TURRET, BUILD_SIEGE));
+			this->mTechSlotManager.AddTechSlots(AvHTechSlots(AVH_USER3_MENU_BUILD_ADVANCED, BUILD_OBSERVATORY, BUILD_ARMSLAB, BUILD_PROTOTYPE_LAB, BUILD_PHASEGATE));
+			this->mTechSlotManager.AddTechSlots(AvHTechSlots(AVH_USER3_MENU_ASSIST, BUILD_AMMO, BUILD_HEALTH, BUILD_CAT));
+			this->mTechSlotManager.AddTechSlots(AvHTechSlots(AVH_USER3_MENU_EQUIP, BUILD_MINES, BUILD_SHOTGUN, BUILD_HMG, BUILD_GRENADE_GUN, BUILD_WELDER, BUILD_JETPACK, BUILD_HEAVY));
+			//this->mTechSlotManager.AddTechSlots(AvHTechSlots(AVH_USER3_MENU_ORDERS, BUILD_HEALTH));
+		}
+		else
+		{
+            // These upgrades are per alien
+            this->AddTechNode(ALIEN_LIFEFORM_ONE, TECH_SKULK, TECH_NULL, TECH_NULL, true, true);
+            this->AddTechNode(ALIEN_LIFEFORM_TWO, TECH_GORGE, TECH_NULL, TECH_NULL, true, true);
+            this->AddTechNode(ALIEN_LIFEFORM_THREE, TECH_LERK, TECH_SKULK, TECH_NULL, true, true);
+            this->AddTechNode(ALIEN_LIFEFORM_FOUR, TECH_FADE, TECH_LERK, TECH_NULL, true, true);
+            this->AddTechNode(ALIEN_LIFEFORM_FIVE, TECH_ONOS, TECH_FADE, TECH_NULL, true, true);
+
+            // Only gorge can build
+            this->AddTechNode(ALIEN_BUILD_RESOURCES, TECH_ALIEN_RESOURCE_NODE, TECH_GORGE, TECH_NULL, true, false);
+            this->AddTechNode(ALIEN_BUILD_HIVE, TECH_HIVE, TECH_GORGE, TECH_NULL, true, false);
+            this->AddTechNode(ALIEN_BUILD_MOVEMENT_CHAMBER, TECH_MOVEMENT_CHAMBER, TECH_GORGE, TECH_NULL, true, false);
+            this->AddTechNode(ALIEN_BUILD_DEFENSE_CHAMBER, TECH_DEFENSE_CHAMBER, TECH_GORGE, TECH_NULL, true, false);
+            this->AddTechNode(ALIEN_BUILD_SENSORY_CHAMBER, TECH_SENSORY_CHAMBER, TECH_GORGE, TECH_NULL, true, false);
+            this->AddTechNode(ALIEN_BUILD_OFFENSE_CHAMBER, TECH_OFFENSE_CHAMBER, TECH_GORGE, TECH_NULL, true, false);
+
+            // Upgrades
+            this->AddTechNode(ALIEN_EVOLUTION_ONE, TECH_DEFENSE_CHAMBER, TECH_NULL, TECH_NULL, true, false);
+            this->AddTechNode(ALIEN_EVOLUTION_TWO, TECH_DEFENSE_CHAMBER, TECH_NULL, TECH_NULL, true, false);
+            this->AddTechNode(ALIEN_EVOLUTION_THREE, TECH_DEFENSE_CHAMBER, TECH_NULL, TECH_NULL, true, false);
+
+            this->AddTechNode(ALIEN_EVOLUTION_SEVEN, TECH_MOVEMENT_CHAMBER, TECH_NULL, TECH_NULL, true, false);
+            this->AddTechNode(ALIEN_EVOLUTION_EIGHT, TECH_MOVEMENT_CHAMBER, TECH_NULL, TECH_NULL, true, false);
+            this->AddTechNode(ALIEN_EVOLUTION_NINE, TECH_MOVEMENT_CHAMBER, TECH_NULL, TECH_NULL, true, false);
+
+            this->AddTechNode(ALIEN_EVOLUTION_TEN, TECH_SENSORY_CHAMBER, TECH_NULL, TECH_NULL, true, false);
+            this->AddTechNode(ALIEN_EVOLUTION_ELEVEN, TECH_SENSORY_CHAMBER, TECH_NULL, TECH_NULL, true, false);
+            this->AddTechNode(ALIEN_EVOLUTION_TWELVE, TECH_SENSORY_CHAMBER, TECH_NULL, TECH_NULL, true, false);
+		}
+	}
+}
+
+const AvHTechNodes& AvHTeam::GetTechNodes() const
+{
+	return this->mResearchManager.GetTechNodes();
+}
+
+AvHTechNodes& AvHTeam::GetTechNodes()
+{
+	return this->mResearchManager.GetTechNodes();
+}
+
+const AvHTechSlotManager& AvHTeam::GetTechSlotManager() const
+{
+	return this->mTechSlotManager;
+}
+
+AvHTechSlotManager& AvHTeam::GetTechSlotManager()
+{
+	return this->mTechSlotManager;
+}
+
+// For marine teams, this means a player is trying to vote down the commander
+bool AvHTeam::PlayerVote(int inPlayerIndex, string& outPlayerMessage)
+{
+	bool theSuccess = false;
+	
+	// If we are a marine team and we have a commander
+	if((this->GetTeamType() == AVH_CLASS_TYPE_MARINE) && (this->GetCommander() != -1) && GetGameRules()->GetGameStarted())
+	{
+		// If player is allowed to vote (can only vote every x minutes)
+		EntityListType::iterator theIterator = std::find(this->mVotingPlayers.begin(), this->mVotingPlayers.end(), inPlayerIndex);
+		if(theIterator == this->mVotingPlayers.end())
+		{
+			AvHPlayer* theVotingPlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(inPlayerIndex)));
+			if(theVotingPlayer)
+			{
+				theVotingPlayer->SendMessage(kVoteCast);
+				
+				// Increment vote
+				this->mVotes++;
+				this->mVotingPlayers.push_back(inPlayerIndex);
+				theSuccess = true;
+
+				AvHPlayer* theCommander = GetCommanderPlayer();
+				if(theCommander)
+				{
+					theCommander->LogPlayerActionPlayer(theVotingPlayer, "votedown");
+				}
+			}
+		}
+		else
+		{
+			// Display message that player has already voted
+			outPlayerMessage = kAlreadyVoted;
+		}
+	}
+	else
+	{
+		outPlayerMessage = kVoteIllegal;
+	}
+	
+	return theSuccess;
+}
+
+void AvHTeam::PlayFunHUDSoundOnce(AvHHUDSound inHUDSound)
+{
+	if(std::find(this->mFunSoundsPlayed.begin(), this->mFunSoundsPlayed.end(), inHUDSound) == this->mFunSoundsPlayed.end())
+	{
+		this->PlayHUDSoundForAlivePlayers(inHUDSound);
+		this->mFunSoundsPlayed.push_back(inHUDSound);
+	}
+}
+
+void AvHTeam::PlayHUDSoundForAlivePlayers(AvHHUDSound inHUDSound) const
+{
+	FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+	if(theEntity->GetIsRelevant() && (theEntity->pev->team == this->mTeamNumber))
+	{
+		theEntity->PlayHUDSound(inHUDSound);
+	}
+	END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+}
+
+// joev: Bug 0000767
+void AvHTeam::PlayHUDSoundForAllPlayers(AvHHUDSound inHUDSound) const
+{
+	FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+		theEntity->PlayHUDSound(inHUDSound);
+	END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+}
+// :joev
+
+
+// Assumes rank change has been approved from on high.  It just does the best job it can,
+// it doesn't change any other ranks than the one indicated
+bool AvHTeam::ProcessRankChange(AvHPlayer* inPlayer, AvHUser3 inOldUser3, AvHUser3 inNewUser3)
+{
+	bool theSuccess = false;
+
+	// Someone just stepped up or down, change the player's squad
+	int thePlayerIndex = inPlayer->entindex();
+
+	// if player is now a soldier
+	if(inNewUser3 == AVH_USER3_MARINE_PLAYER)
+	{
+		if(this->GetCommander() == thePlayerIndex)
+		{
+			this->SetCommander(-1);
+		}
+	}
+	// else if player is now commander
+	else if(inNewUser3 == AVH_USER3_COMMANDER_PLAYER)
+	{
+		// Set him as commander
+		this->SetCommander(thePlayerIndex);
+		
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+void AvHTeam::ResetGame()
+{
+	AvHTeamNumber theTeamNumber = this->mTeamNumber;
+	AvHClassType theTeamType = this->mTeamType;
+	
+	this->Init();
+	
+	this->mTeamNumber = theTeamNumber;
+	this->mTeamType = theTeamType;
+	
+	this->mLastInjectionTime = gpGlobals->time;
+	this->mLastResourceUpdateTime = -1;
+	this->mLastCommandScoreUpdateTime = -1;
+	this->mStartingLocation.x = this->mStartingLocation.y = this->mStartingLocation.z = 0;
+	this->mNumBuiltCommandStations = 0;
+	this->mNumActiveHives = 0;
+	
+	if(this->mTeamType == AVH_CLASS_TYPE_ALIEN)
+	{
+		// Spawn the initial hives
+		int theNumHives = GetGameRules()->GetGameplay().GetInitialHives();
+		for(int i = 0; i < theNumHives; i++)
+		{
+			this->SpawnHive(&this->mStartingLocation, true);
+		}
+
+		if(GetGameRules()->GetIsCombatMode())
+		{
+			for(int i= 0; i < 3; i++)
+			{
+				this->AddTeamUpgrade(ALIEN_UPGRADE_CATEGORY_DEFENSE);
+				this->AddTeamUpgrade(ALIEN_UPGRADE_CATEGORY_MOVEMENT);
+				this->AddTeamUpgrade(ALIEN_UPGRADE_CATEGORY_SENSORY);
+			}
+		}
+	}
+	
+	if(!GetGameRules()->GetIsCombatMode())
+	{
+		// Put down command station
+		FOR_ALL_ENTITIES(kwsTeamCommand, AvHCommandStation*)
+			if(theEntity->pev->team == (int)(this->mTeamNumber))
+			{
+				theEntity->SetConstructionComplete(true);
+				DROP_TO_FLOOR(ENT(theEntity->pev));
+				//PLAYBACK_EVENT_FULL(0, theEntity->edict(), gPhaseInEventID, 0, theEntity->pev->origin, (float *)&g_vecZero, 0.0, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+				VectorCopy(theEntity->pev->origin, this->mStartingLocation);
+			}
+		END_FOR_ALL_ENTITIES(kwsTeamCommand)
+
+		if(this->mTeamType == AVH_CLASS_TYPE_MARINE)
+		{
+			this->SetTeamResources(GetGameRules()->GetGameplay().GetInitialMarinePoints());
+		}
+	//	else if(this->mTeamType == AVH_CLASS_TYPE_ALIEN)
+	//	{
+	//		this->SetTeamResources(GetGameRules()->GetGameplay().GetInitialAlienPoints());
+	//	}
+
+		this->SpawnResourceTower();
+	}
+		
+	this->mOrderList.clear();
+	
+	this->ResetServerPlayerData();
+	//this->InitializeRandomResourceShares();
+
+	this->mHiveInfoList.clear();
+	this->mTimeOfLastStructureUpdate = -1;
+
+	this->mVoteStarted = false;
+	this->mPreviousVotes = this->mVotes = 0;
+	this->mVotingPlayers.clear();
+	this->mTimeVoteStarted = -1;
+	this->mVotesNeeded = 0;
+
+
+	this->mLowResourceAlerts.clear();
+	this->mCommandersToldAboutJumpKey.clear();
+	this->mFunSoundsPlayed.clear();
+	this->mPlayedSeeDeadPeople = false;
+
+	int theEasterEggChance = max(0, avh_eastereggchance.value);
+	this->mPlayFunSoundsThisGame = (RANDOM_LONG(0, theEasterEggChance) == 0);
+
+	// Don't give hints right away
+	this->mTimeOfLastTeamHint = gpGlobals->time;
+	this->mTimeLastHintUpdate = -1;
+
+	// Reset group info
+	for(int i = 0; i < kNumHotkeyGroups; i++)
+	{
+		this->mGroups[i].clear();
+		this->mGroupTypes[i] = AVH_USER3_NONE;
+	}
+	this->mSelectAllGroup.clear();
+}
+
+void AvHTeam::SpawnResourceTower()
+{
+	string theResourceEntity;
+	AvHMessageID theResourceEntityMessageID = MESSAGE_NULL;
+
+	if(this->mTeamType == AVH_CLASS_TYPE_MARINE)
+	{
+		theResourceEntity = kwsResourceTower;
+		theResourceEntityMessageID = BUILD_RESOURCES;
+	}
+	else if(this->mTeamType == AVH_CLASS_TYPE_ALIEN)
+	{
+		theResourceEntity = kwsAlienResourceTower;
+		theResourceEntityMessageID = ALIEN_BUILD_RESOURCES;	
+	}
+
+	// Create a resource tower for the team, nearest their spawn
+	Vector theLocationToBuild;
+	
+	// Look for func resource nearest to team start
+	CBaseEntity* theNearestFuncResource = NULL;
+	float theNearestDistance = -1;
+	
+	FOR_ALL_ENTITIES(kesFuncResource, AvHFuncResource*)
+		if(!theEntity->GetIsOccupied())
+		{
+			float theDistance = VectorDistance(this->mStartingLocation, theEntity->pev->origin);
+			if((theNearestDistance == -1) || (theDistance < theNearestDistance))
+			{
+				theNearestFuncResource = theEntity;
+				theNearestDistance = theDistance;
+			}
+		}
+	END_FOR_ALL_ENTITIES(kesFuncResource);
+
+	if(theNearestFuncResource)
+	{
+		Vector theLocation = theNearestFuncResource->pev->origin;
+		theLocation.z += 35;
+
+		CBaseEntity* theBaseEntity = CBaseEntity::Create(theResourceEntity.c_str(), theLocation, AvHSUGetRandomBuildingAngles());
+			
+		theBaseEntity->pev->team = this->mTeamNumber;
+
+		AvHSUBuildingJustCreated(theResourceEntityMessageID, theBaseEntity, NULL);
+
+		// Set it complete immediately.  If not, aliens are slowed down noticeably because they need builders to tower building
+		AvHResourceTower* theResourceTower = dynamic_cast<AvHResourceTower*>(theBaseEntity);
+		ASSERT(theResourceTower);
+		// The first resource tower is active immediately
+		theResourceTower->SetActivateTime(0);
+
+		//DROP_TO_FLOOR(ENT(theBaseBuildable->pev));
+		theResourceTower->SetConstructionComplete(true);
+	}
+}
+
+// Delete any server player data that has expired
+void AvHTeam::ResetServerPlayerData()
+{
+	// Run through list
+	for(AvHServerPlayerDataListType::iterator theIter = this->mServerPlayerData.begin(); theIter != this->mServerPlayerData.end(); /* no inc */)
+	{
+		// Delete it unless the player has been voted down
+		if(theIter->second.GetTimeVotedDown() == -1)
+		{
+			AvHServerPlayerDataListType::iterator theTempIter = theIter;
+			theTempIter++;
+			this->mServerPlayerData.erase(theIter);
+			theIter = theTempIter;
+		}
+		else
+		{
+			theIter++;
+		}
+	}
+}
+
+int	AvHTeam::GetDesiredSpawnCount() const
+{
+	int theDesiredSpawns = 0;
+
+	if(this->mTeamType == AVH_CLASS_TYPE_MARINE)
+	{
+		// 16 for the marine start
+		theDesiredSpawns = 16;
+	}
+	else if(this->mTeamType == AVH_CLASS_TYPE_ALIEN)
+	{
+		// 16 for each hive
+		theDesiredSpawns = 16*3;
+	}
+
+	return theDesiredSpawns;
+}
+
+float AvHTeam::GetInitialPlayerPoints(edict_t* inEdict)
+{
+	float theInitialPoints = 0;
+
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(inEdict));
+	ASSERT(thePlayer);
+
+	// Marines don't get any individual points, aliens get random amount
+	// Use WONID to make sure player doesn't try to get more points by quitting and rejoining
+	if(this->mTeamType == AVH_CLASS_TYPE_ALIEN)
+	{
+		if(GetGameRules()->GetArePlayersAllowedToJoinImmediately() /*&& !thePlayer->GetHasLeftReadyRoom()*/)
+		{
+			theInitialPoints = GetGameRules()->GetGameplay().GetInitialAlienPoints();
+		}
+
+		// If WON id already exists (because we already gave points out to that player)
+		AvHServerPlayerData* theServerPlayerData = this->GetServerPlayerData(inEdict);
+		if(theServerPlayerData && (theServerPlayerData->GetResources() != -1))
+		{
+			// Give them the number of points they last had
+			theInitialPoints = theServerPlayerData->GetResources();
+		}
+	}
+
+	return theInitialPoints;
+}
+
+float AvHTeam::GetInitialExperience(edict_t* inEdict)
+{
+	float theInitialExperience = 0.0f;
+
+	//AvHServerPlayerData* theServerPlayerData = this->GetServerPlayerData(inEdict);
+	//if(theServerPlayerData && (theServerPlayerData->GetExperience() > 0.0f))
+	//{
+	//	// Give them experience they last had
+	//	theInitialExperience = theServerPlayerData->GetExperience();
+	//}
+
+	return theInitialExperience;
+}
+
+void AvHTeam::SetGameStarted(bool inGameStarted)
+{
+	if(inGameStarted)
+	{
+		if(this->mTeamType == AVH_CLASS_TYPE_ALIEN)
+		{
+			this->mLastHiveSpawnTime = gpGlobals->time;
+		}
+		this->mLastInjectionTime = gpGlobals->time;
+
+		//#ifndef DEBUG
+		// If team is alien, give them all game started hud sound
+		FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+			if(theEntity->pev->team == this->mTeamNumber)
+			{
+				theEntity->PlayHUDSound(HUD_SOUND_GAMESTART);
+
+				// Send Combat objective
+				if(GetGameRules()->GetIsCombatMode())
+				{
+					string theMessage;
+					if(GetGameRules()->GetCombatAttackingTeamNumber() == this->mTeamNumber)
+					{
+						theMessage = kYouAreAttacking;
+
+					}
+					else
+					{
+						theMessage = kYouAreDefending;
+					}
+
+					theEntity->SendMessage(theMessage.c_str(), false);
+				}
+			}
+		END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+		//#endif
+	}
+}
+
+void AvHTeam::KillCS()
+{
+	AvHCommandStation* theCS = NULL;
+	
+	FOR_ALL_ENTITIES(kwsTeamCommand, AvHCommandStation*)
+		if(theEntity->pev->health > 0)
+		{
+			theEntity->TakeDamage(theEntity->pev, theEntity->pev, 20000, DMG_GENERIC);
+		}
+	END_FOR_ALL_ENTITIES(kwsTeamCommand)
+}
+
+void AvHTeam::KillHive()
+{
+	if(this->mTeamType == AVH_CLASS_TYPE_ALIEN)
+	{
+		AvHHive* theHive = AvHSUGetRandomActiveHive(this->mTeamNumber);
+		if(theHive)
+		{
+			theHive->Killed(NULL, 0);
+		}
+	}
+}
+
+void AvHTeam::SpawnHive(Vector* outLocation, bool inForce)
+{
+	if(this->mTeamType == AVH_CLASS_TYPE_ALIEN)
+	{
+		AvHHive* theHive = AvHSUGetRandomActivateableHive(this->mTeamNumber);
+		if(theHive)
+		{
+			if(theHive->StartSpawningForTeam(this->mTeamNumber, inForce))
+			{
+				theHive->SetConstructionComplete(true);
+				this->mNumActiveHives++;
+
+				if(outLocation)
+				{
+					VectorCopy(theHive->pev->origin, *outLocation);
+				}
+			}
+			else
+			{
+				ALERT(at_console, "Error spawning hive. Is it blocked by something?\n");
+			}
+		}
+	}
+}
+
+int	AvHTeam::GetCommander() const
+{
+	return this->mCommander;
+}
+
+AvHPlayer* AvHTeam::GetCommanderPlayer()
+{
+	AvHPlayer* theCommanderPlayer = NULL;
+
+	if(this->mCommander > 0)
+	{
+		theCommanderPlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(this->mCommander)));
+	}
+
+	return theCommanderPlayer;
+}
+
+
+AvHTeamNumber AvHTeam::GetTeamNumber(void) const
+{
+	return this->mTeamNumber;
+}
+
+void AvHTeam::SetTeamNumber(AvHTeamNumber inTeamNumber)
+{
+	this->mTeamNumber = inTeamNumber;
+}
+
+AvHClassType AvHTeam::GetTeamType(void) const
+{
+	return this->mTeamType;
+}
+
+const char*	AvHTeam::GetTeamTypeString(void) const
+{
+	const char* theTeamString = "Unknown";
+
+	switch(this->mTeamType)
+	{
+	case AVH_CLASS_TYPE_MARINE:
+		theTeamString = "marine";
+		break;
+	case AVH_CLASS_TYPE_ALIEN:
+		theTeamString = "alien";
+		break;
+	}
+
+	return theTeamString;
+}
+
+void AvHTeam::AddTeamUpgrade(AvHAlienUpgradeCategory inCategory)
+{
+	int theNumUpgradeCategories = AvHGetNumUpgradesInCategoryInList(this->mAlienUpgrades, inCategory);
+
+	// If we don't have an upgrade of this type, trigger an alert
+	if(theNumUpgradeCategories == 0)
+	{
+		GetGameRules()->TriggerAlert(this->mTeamNumber, ALERT_NEW_TRAIT, -1);
+	}
+
+	this->mAlienUpgrades.push_back(inCategory);
+}
+
+AvHAlienUpgradeListType	AvHTeam::GetAlienUpgrades() const
+{
+	return this->mAlienUpgrades;
+}
+
+bool AvHTeam::RemoveAlienUpgradeCategory(AvHAlienUpgradeCategory inCategory)
+{
+	bool theRemoved = AvHRemoveUpgradeCategory(inCategory, this->mAlienUpgrades);
+	return theRemoved;
+}
+
+int	AvHTeam::GetTeamWideUpgrades() const
+{
+	return this->mTeamWideUpgrades;
+}
+
+void AvHTeam::ProcessTeamUpgrade(AvHMessageID inMessageID, bool inGive)
+{
+	ProcessGenericUpgrade(this->mTeamWideUpgrades, inMessageID, inGive);
+}
+
+void AvHTeam::InitializeRandomResourceShares()
+{
+	this->mRandomResourceShares.clear();
+	this->mTotalShareWeight = 0;
+
+	// Populate random resource shares with random value (like cards in Bridge)
+	for(int i = 0; i < kTotalShares; i++)
+	{
+		const int kSlope = 2;
+		int theBoundaryOne = kTotalShares/3;
+		int theBoundaryTwo = (2*kTotalShares)/3;
+		int theCardValue = 1;
+
+		if((i > theBoundaryOne) && (i < theBoundaryTwo))
+		{
+			theCardValue = 2*kSlope;
+		}
+		else if(i > theBoundaryTwo)
+		{
+			theCardValue = 3*kSlope;
+		}
+
+		this->mRandomResourceShares.push_back(theCardValue);
+		this->mTotalShareWeight += theCardValue;
+	}
+}
+
+float AvHTeam::WithdrawPointsViaRandomShares(int inPlayerIndex)
+{
+	int theNumSharesLeft = this->mRandomResourceShares.size();
+	ASSERT(theNumSharesLeft >= kNumSharesPerPlayer);
+
+	// Pick some random shares and add them up
+	int theRandomShares = 0;
+
+	for(int i = 0; i < kNumSharesPerPlayer; i++)
+	{
+		// Pick a random "card", add it's shares, remove card from pool
+		int theRandomNumber = g_engfuncs.pfnRandomLong(0, this->mRandomResourceShares.size() - 1);
+		RandomResourceShareListType::iterator theIter = this->mRandomResourceShares.begin() + theRandomNumber;
+
+		theRandomShares = theRandomShares + *theIter;
+
+		// Remember which "cards" we've given this player so we can add them back in later
+		this->mPlayerShares[inPlayerIndex].push_back(*theIter);
+
+		this->mRandomResourceShares.erase(theIter);
+	}
+
+	// Return this percentage of the team resources for this player
+	float thePercentage = theRandomShares/(float)this->mTotalShareWeight;
+
+	float theInitialPoints = thePercentage*this->GetTeamResources();
+	this->SetTeamResources(this->GetTeamResources() - theInitialPoints);
+
+	return theInitialPoints;
+}
+
+void AvHTeam::SetTeamType(AvHClassType inType)
+{
+	this->mTeamType = inType;
+
+	switch(inType)
+	{
+	case AVH_CLASS_TYPE_MARINE:
+		this->mTeamName = kMarine1Team;
+		this->mTeamPrettyName = kMarinePrettyName;
+		break;
+	case AVH_CLASS_TYPE_ALIEN:
+		this->mTeamName = kAlien1Team;
+		this->mTeamPrettyName = kAlienPrettyName;
+		break;
+	default:
+		this->mTeamName = kUndefinedTeam;
+		this->mTeamPrettyName = kUndefPrettyName;
+		break;
+	}
+
+	// Make sure team names aren't longer than MAX_TEAM_NAME
+	ASSERT(this->mTeamName.length() < MAX_TEAM_NAME);
+}
+
+int	AvHTeam::GetNumWebStrands() const
+{
+	return this->mNumWebStrands;
+}
+
+void AvHTeam::SetNumWebStrands(int inNumWebStrands)
+{
+	this->mNumWebStrands = inNumWebStrands;
+}
+
+float AvHTeam::GetTeamResources() const
+{
+	return this->mTeamResources;
+}
+
+void AvHTeam::SetTeamResources(float inTeamResources)
+{
+	this->mTeamResources = inTeamResources;
+}
+
+float AvHTeam::GetHandicap() const
+{
+	return this->mHandicap;
+}
+
+void AvHTeam::SetHandicap(float inHandicap)
+{
+	this->mHandicap = inHandicap;
+}
+
+const char*	AvHTeam::GetTeamName(void) const
+{
+	return this->mTeamName.c_str();
+}
+
+const char*	AvHTeam::GetTeamPrettyName(void) const
+{
+	return this->mTeamPrettyName.c_str();
+}
+
+void AvHTeam::SetCommander(int inPlayerNumber)
+{
+	if(inPlayerNumber != this->mCommander)
+	{
+		// Reset commander hints
+		this->mTimeOfLastTeamHint = -1;
+
+		this->mCommander = inPlayerNumber;
+	}
+}
+
+void AvHTeam::SetTeamName(const char* inTeamName)
+{
+	this->mTeamName = inTeamName;
+}
+
+void AvHTeam::SetTeamPrettyName(const char* inTeamName)
+{
+	this->mTeamPrettyName = inTeamName;
+}
+
+int AvHTeam::GetPlayerCount(bool inCountOnlyDead) const
+{
+	int theNumPlayers = this->mPlayerList.size();
+
+	if(inCountOnlyDead)
+	{
+		theNumPlayers = 0;
+
+		FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+		if((AvHTeamNumber)theEntity->pev->team == this->mTeamNumber)
+		{
+			AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntity);
+			ASSERT(thePlayer);
+
+			if(!thePlayer->IsAlive())
+			{
+				theNumPlayers++;
+			}
+		}
+		END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+	}
+
+	return theNumPlayers;
+}
+
+bool AvHTeam::RemovePlayer(int inPlayerIndex)
+{
+	bool theSuccess = false;
+	
+	if(this->GetIsPlayerOnTeam(inPlayerIndex))
+	{
+		// Remove player
+		EntityListType::iterator thePlayerIter = std::find(this->mPlayerList.begin(), this->mPlayerList	.end(), inPlayerIndex);
+		if(thePlayerIter != this->mPlayerList.end())
+		{
+			AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(inPlayerIndex)));
+			ASSERT(thePlayer);
+
+			// Add cards back into pool
+//			RandomResourceShareListType& theVector = this->mPlayerShares[inPlayerIndex];
+//			for(RandomResourceShareListType::iterator theCardIter = theVector.begin(); theCardIter != theVector.end(); theCardIter++)
+//			{
+//				this->mRandomResourceShares.push_back(*theCardIter);
+//			}
+
+			// Make sure no entities have this player as an owner
+			edict_t* thePlayerEdict = thePlayer->edict();
+			FOR_ALL_BASEENTITIES();
+				if(theBaseEntity->pev->owner == thePlayerEdict)
+				{
+					theBaseEntity->pev->owner = NULL;
+				}
+
+				AvHBuildable* theBuildable = dynamic_cast<AvHBuildable*>(theBaseEntity);
+				if(theBuildable && (theBuildable->GetBuilder() == thePlayer->entindex()))
+				{
+					theBuildable->SetBuilder(-1);
+				}
+			END_FOR_ALL_BASEENTITIES();
+
+			AvHSURemoveEntityFromHotgroupsAndSelection(inPlayerIndex);
+			
+//			theVector.clear();
+			
+			this->mPlayerList.erase(thePlayerIter);
+			
+			theSuccess = true;
+		}
+	}
+	
+	if(this->mCommander == inPlayerIndex)
+	{
+		this->SetCommander(-1);
+	}
+	
+	return theSuccess;
+}
+
+void AvHTeam::TriggerAddTech(AvHTechID inTechID)
+{
+	if(!GetGameRules()->GetIsCombatMode())
+	{
+		this->mResearchManager.TriggerAddTech(inTechID);
+
+		// Get list of completed research that depended on this tech
+		TechNodeListType theDependentTechNodes = this->mResearchManager.GetResearchNodesDependentOn(inTechID);
+		
+		// For all researched nodes
+		for(TechNodeListType::iterator theIter = theDependentTechNodes.begin(); theIter != theDependentTechNodes.end(); theIter++)
+		{
+			if(theIter->GetIsResearched())
+			{
+				// Enable because of gain of this tech
+				AvHMessageID theMessage = theIter->GetMessageID();
+				GetGameRules()->ProcessTeamUpgrade(theMessage, this->mTeamNumber, 0, true);
+			}
+		}
+	}
+}
+
+void AvHTeam::TriggerRemoveTech(AvHTechID inTechID)
+{
+	if(!GetGameRules()->GetIsCombatMode())
+	{
+		// Run through world, looking for anything alive that could still be giving us this tech
+		bool theFoundActiveTech = false;
+
+		FOR_ALL_BASEENTITIES();
+			AvHBuildable* theBuildable = dynamic_cast<AvHBuildable*>(theBaseEntity);
+			if(theBuildable)
+			{
+				if((theBuildable->GetSupportsTechID(inTechID)) && (theBuildable->GetTeamNumber() == this->mTeamNumber))
+				{
+					if(theBuildable->GetIsTechActive())
+					{
+						theFoundActiveTech = true;
+						break;
+					}
+				}
+			}
+		END_FOR_ALL_BASEENTITIES();
+
+		if(!theFoundActiveTech)
+		{
+			// If we can't find anything, remove it from the tech nodes
+			this->mResearchManager.TriggerRemoveTech(inTechID);
+
+			// Get list of completed research that depended on this tech
+			TechNodeListType theDependentTechNodes = this->mResearchManager.GetResearchNodesDependentOn(inTechID);
+
+			// For all researched nodes
+			for(TechNodeListType::iterator theIter = theDependentTechNodes.begin(); theIter != theDependentTechNodes.end(); theIter++)
+			{
+				if(theIter->GetIsResearched())
+				{
+					// Disable because of loss of this tech and remove them
+					AvHMessageID theMessage = theIter->GetMessageID();
+					GetGameRules()->ProcessTeamUpgrade(theMessage, this->mTeamNumber, 0, false);
+				}
+			}
+		}
+	}
+}
+
+//void AvHTeam::RespawnLongestWaitingPlayer()
+//{
+//	// Find the player that's been dead the longest
+//	AvHGamerules* theGameRules = GetGameRules();
+//	AvHPlayer* theLongestDeadPlayer = NULL;
+//	float theEarliestTime = gpGlobals->time;
+//
+//	FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+//	if((AvHTeamNumber)theEntity->pev->team == this->mTeamNumber)
+//	{
+//		if(!theEntity->GetIsRelevant())
+//		{
+//			float theTime = theEntity->GetTimeWantedToPlay();
+//			if((theTime != -1) && (theTime < theEarliestTime))
+//			{
+//				theLongestDeadPlayer = theEntity;
+//				theEarliestTime = theLongestDeadPlayer->GetTimeWantedToPlay();
+//			}
+//		}
+//	}
+//	END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+//		
+//		// Respawn that player in if possible
+//		if(theLongestDeadPlayer)
+//		{
+//			if(theGameRules->FPlayerCanRespawn(theLongestDeadPlayer))
+//			{
+//				theGameRules->RespawnPlayer(theLongestDeadPlayer);
+//			}
+//		}
+//}
+
+void AvHTeam::Update()
+{
+	//this->RespawnLongestWaitingPlayer();
+	//this->UpdateCommanderScore();
+    PROFILE_START()
+	this->UpdateHints();
+    PROFILE_END(kAvHTeamUpdateHints)
+
+    PROFILE_START()
+	this->UpdateInventoryEnabledState();
+    PROFILE_END(kAvHTeamUpdateInventoryEnabledState)
+
+    PROFILE_START()
+	this->UpdateReinforcementWave();
+    PROFILE_END(kAvHTeamUpdateReinforcementWave)
+
+    PROFILE_START()
+	this->UpdateOrders();
+    PROFILE_END(kAvHTeamUpdateOrders)
+
+    PROFILE_START()
+	this->UpdateResearch();
+    PROFILE_END(kAvHTeamUpdateResearch)
+
+    PROFILE_START()
+	this->UpdateResources();
+    PROFILE_END(kAvHTeamUpdateResources)
+
+    PROFILE_START()
+	this->UpdateAlerts();
+    PROFILE_END(kAvHTeamUpdateAlerts)
+
+    PROFILE_START()
+	this->UpdateServerPlayerData();
+    PROFILE_END(kAvHTeamUpdateServerPlayerData)
+
+    PROFILE_START()
+	this->UpdateTeamStructures();
+    PROFILE_END(kAvHTeamUpdateTeamStructures)
+
+    PROFILE_START()
+	this->UpdateVoting();
+    PROFILE_END(kAvHTeamUpdateVoting)
+
+    PROFILE_START()
+	this->UpdatePlayers();
+    PROFILE_END(kAvHTeamUpdatePlayers)
+}
+
+void AvHTeam::UpdateTeamStructures()
+{
+	const float kStructureUpdateRate = 1.0f;
+	if((this->mTimeOfLastStructureUpdate == -1) || (gpGlobals->time > (this->mTimeOfLastStructureUpdate + kStructureUpdateRate)))
+	{
+		this->mTimeOfLastStructureUpdate = gpGlobals->time;
+
+		if(this->GetTeamType() == AVH_CLASS_TYPE_ALIEN)
+		{
+			this->mHiveInfoList.clear();
+
+			// Search for free hives, or hives on our team
+			FOR_ALL_ENTITIES(kesTeamHive, AvHHive*)
+				if((theEntity->pev->team == 0) || ((AvHTeamNumber)theEntity->pev->team == this->mTeamNumber))
+				{
+					AvHHiveInfo theHiveInfo;
+
+					theHiveInfo.mPosX = theEntity->pev->origin.x;
+					theHiveInfo.mPosY = theEntity->pev->origin.y;
+					theHiveInfo.mPosZ = theEntity->pev->origin.z;
+
+					if (theEntity->pev->max_health > 0) {
+						theHiveInfo.mHealthPercentage = (int)(100 * theEntity->pev->health / theEntity->pev->max_health);
+					} else {
+						theHiveInfo.mHealthPercentage = 0;
+					}
+
+					int theEntityIndex = theEntity->entindex();
+
+					// Fill in hive status
+					int theStatus = kHiveInfoStatusBuilt;
+					
+					// Unbuilt hives
+					if(theEntity->pev->team == 0)
+					{
+						theStatus = kHiveInfoStatusUnbuilt;
+					}
+					// building hives
+					else if(!theEntity->GetIsBuilt())
+					{
+						float theNormalizedBuildPercentage = theEntity->GetNormalizedBuildPercentage();
+						if(theNormalizedBuildPercentage > 0.0f)
+						{
+							theStatus = kHiveInfoStatusBuildingStage1;
+							int theSteps = (int)(theNormalizedBuildPercentage*5.0f);
+							theStatus += theSteps;
+						}
+						else
+						{
+							theStatus = kHiveInfoStatusUnbuilt;
+						}
+					}
+					
+					theHiveInfo.mStatus = theStatus;
+					theHiveInfo.mTechnology = (int)(theEntity->GetTechnology());
+					
+					// Under attack?
+					theHiveInfo.mUnderAttack = GetGameRules()->GetIsEntityUnderAttack(theEntityIndex);
+					
+					// Add onto the end, so we don't resend unnecessarily
+					this->mHiveInfoList.insert(this->mHiveInfoList.end(), theHiveInfo);
+				}
+			END_FOR_ALL_ENTITIES(kesTeamHive);
+				
+			// Count number of active hives
+			int theNumHives = 0;
+			FOR_ALL_ENTITIES(kesTeamHive, AvHHive*)
+				if(theEntity->GetIsActive())
+				{
+					AvHTeamNumber theTeamNumber = (AvHTeamNumber)(theEntity->pev->team);
+					if(theTeamNumber == this->mTeamNumber)
+					{
+						theNumHives++;
+					}
+				}
+			END_FOR_ALL_ENTITIES(kesTeamHive);
+			this->mNumActiveHives = theNumHives;
+		}
+		else if(this->GetTeamType() == AVH_CLASS_TYPE_MARINE)
+		{
+			// Count # of command stations
+			int theNumActiveCommandStations = 0;
+			FOR_ALL_ENTITIES(kwsTeamCommand, AvHCommandStation*)
+				if(theEntity->GetIsBuilt())
+				{
+					AvHTeamNumber theTeamNumber = (AvHTeamNumber)(theEntity->pev->team);
+					if(theTeamNumber == this->mTeamNumber)
+					{
+						theNumActiveCommandStations++;
+					}
+				}
+			END_FOR_ALL_ENTITIES(kwsTeamCommand);
+			this->mNumBuiltCommandStations = theNumActiveCommandStations;
+		}
+	}
+}
+
+void AvHTeam::UpdatePlayers()
+{
+	//FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+	//	GetGameRules()->ClientCommand(theEntity, );
+	//END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+		
+	// Update every once in awhile
+	const float kPlayerUpdateRate = 2.0f;
+	if((this->mLastPlayerUpdateTime == -1) || (gpGlobals->time > (this->mLastPlayerUpdateTime + kPlayerUpdateRate)))
+	{
+		if(!GetGameRules()->GetCheatsEnabled() && !GetGameRules()->GetIsTournamentMode() && !GetGameRules()->GetIsCombatMode())
+		{
+			// If the team is alien and has no hives left
+			if(this->mTeamType == AVH_CLASS_TYPE_ALIEN)
+			{
+				// Do we have any active hives?
+				int theNumGrowingOrActiveHives = 0;
+				FOR_ALL_ENTITIES(kesTeamHive, AvHHive*)
+					AvHTeamNumber theTeamNumber = (AvHTeamNumber)(theEntity->pev->team);
+				if(theTeamNumber == this->mTeamNumber)
+				{
+					if(theEntity->GetIsActive() || theEntity->GetIsSpawning())
+					{
+						theNumGrowingOrActiveHives++;
+					}
+				}
+				END_FOR_ALL_ENTITIES(kesTeamHive);
+				
+				if(theNumGrowingOrActiveHives == 0)
+				{
+					CBaseEntity* theWorld = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(0));
+					if(theWorld)
+					{
+						entvars_t* theInflictor = theWorld->pev;
+						
+						// Do some damage to remaining players
+						FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+							if((theEntity->pev->team == this->mTeamNumber) && theEntity->IsAlive())
+							{
+								AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntity);
+								ASSERT(thePlayer);
+								float theMaxHealth = AvHPlayerUpgrade::GetMaxHealth(theEntity->pev->iuser4, theEntity->GetUser3(), thePlayer->GetExperienceLevel());
+								float theDamage = theMaxHealth/8;
+								
+								theEntity->TakeDamage(theInflictor, theInflictor, theDamage, DMG_DROWN | DMG_IGNOREARMOR);
+							}
+							theEntity->PlayHUDSound(HUD_SOUND_COUNTDOWN);
+							
+						END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+					}
+				}
+			}
+		}
+		
+		this->mLastPlayerUpdateTime = gpGlobals->time;
+	}
+	
+	// Update team score if we're in tournament mode
+	this->SendResourcesGatheredScore(true);
+}
+
+bool AvHTeam::SendResourcesGatheredScore(bool inThisTeamOnly)
+{
+	bool theSentMessage = false;
+
+	if(GetGameRules()->GetIsTournamentMode())
+	{
+		// Only send message to players on our team, or spectating players
+		int theTeamScore = (int)this->GetTotalResourcesGathered();
+		if(theTeamScore != this->mClientTotalResourcesGathered)
+		{
+			if(inThisTeamOnly)
+			{
+				for(EntityListType::iterator thePlayerIter = this->mPlayerList.begin(); thePlayerIter != this->mPlayerList.end(); thePlayerIter++)
+				{
+					AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(*thePlayerIter)));
+					if(thePlayer)
+					{
+						MESSAGE_BEGIN(MSG_ONE, gmsgTeamScore, NULL, thePlayer->edict());
+						
+						// Team name string
+						WRITE_STRING(this->GetTeamName());
+						
+						// Score ("frags")
+						WRITE_SHORT(theTeamScore);
+						
+						// Deaths
+						WRITE_SHORT(0);
+						
+						MESSAGE_END();
+					}
+				}
+			}
+			else
+			{
+				MESSAGE_BEGIN(MSG_ALL, gmsgTeamScore);
+				
+				// Team name string
+				WRITE_STRING(this->GetTeamName());
+				
+				// Score ("frags")
+				WRITE_SHORT(theTeamScore);
+				
+				// Deaths
+				WRITE_SHORT(0);
+				
+				MESSAGE_END();
+			}
+						
+			this->mClientTotalResourcesGathered = theTeamScore;
+
+			theSentMessage = true;
+		}
+	}
+	
+	return theSentMessage;
+}
+
+
+void AvHTeam::UpdateVoting()
+{
+	string theMessageForPlayers;
+	AvHHUDSound theSoundForPlayers = HUD_SOUND_INVALID;
+	bool theSendOnlyToNonvotingPlayers = false;
+	
+	// If we have more then 1 vote against commander
+	if(this->mVotes > 0)
+	{
+		// If a vote hasn't started
+		if(!this->mVoteStarted)
+		{
+			// Tell all players on team that a vote has started
+			theMessageForPlayers = kVoteStarted;
+			theSendOnlyToNonvotingPlayers = true;
+			
+			// Start vote
+			this->mVoteStarted = true;
+			this->mCommanderWhenVoteStarted = this->mCommander;
+			this->mTimeVoteStarted = gpGlobals->time;
+		}
+		else
+		{
+			bool theResetVote = false;
+
+			// If commander logs out after vote started, cancel vote
+			if(this->mCommander != this->mCommanderWhenVoteStarted)
+			{
+				theMessageForPlayers = kVoteCancelled;
+				theResetVote = true;
+			}
+			else
+			{
+				// If we have enough votes to kick commander
+				float theVotePercent = avh_votepercentneeded.value;
+				int theMinVotesRequired = (int)avh_minvotesneeded.value;
+				int theVotesNeeded = max(theMinVotesRequired, this->mPlayerList.size()*theVotePercent);
+				
+				// #545: If the voting has changed, indicate so in the HUD
+				if ((this->mVotesNeeded != theVotesNeeded) || (this->mVotes != this->mPreviousVotes)) {
+
+					// tankefugl: 0000545
+					char theVoteMessage[512];
+					sprintf(theVoteMessage, "Eject commander: %d of %d votes needed.", this->mVotes, theVotesNeeded);
+
+					FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+					if(theEntity->pev->team == this->mTeamNumber)
+					{
+						UTIL_SayText(theVoteMessage, theEntity); // , theEntity->entindex());
+					}
+					END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+
+
+					// UTIL_ClientPrintAll(HUD_PRINTTALK, theVoteMessage);
+					UTIL_LogPrintf(theVoteMessage);
+
+					this->mVotesNeeded = theVotesNeeded;
+					this->mPreviousVotes = this->mVotes;
+					// :tankefugl
+				}
+
+				if(this->mVotes >= theVotesNeeded)
+				{
+					// Kick commander
+					AvHPlayer* theCommander = this->GetCommanderPlayer();
+					if(theCommander)
+					{
+						theCommander->StopTopDownMode();
+						theCommander->SetUser3(AVH_USER3_MARINE_PLAYER);
+				
+						// Remember when we were voted down, so they can't command again
+						AvHServerPlayerData* theServerPlayerData = this->GetServerPlayerData(theCommander->edict());
+						if(theServerPlayerData)
+						{
+							theServerPlayerData->SetTimeVotedDown(gpGlobals->time);
+						}
+						
+						// Tell all players on team that commander has been ejected
+						theMessageForPlayers = kVoteSucceeded;
+						theSoundForPlayers = HUD_SOUND_MARINE_COMMANDER_EJECTED;
+						theResetVote = true;
+					}
+				}
+				else
+				{
+					// else if enough time has elapsed without a vote going through
+					int theVoteCastTimeInSeconds = avh_votecasttime.value*60;
+					if(gpGlobals->time > (this->mTimeVoteStarted + theVoteCastTimeInSeconds))
+					{
+						// Tell all players on team that the vote has failed
+						theMessageForPlayers = kVoteFailed;
+						theResetVote = true;
+					}
+				}
+			}
+			
+			if(theResetVote)
+			{
+				// Reset vote (don't reset players that voted, they can only vote once per game)
+				this->mVotes = 0;
+				this->mVoteStarted = false;
+				this->mTimeVoteStarted = -1;
+				// clear the list of voting players to allow more than one vote each game (#545)
+				this->mVotingPlayers.clear();
+				this->mVotesNeeded = 0;
+				this->mPreviousVotes = 0;
+			}
+		}
+	}
+	
+	// Send message to players
+	if(theMessageForPlayers != "")
+	{
+		// Send message to players on team
+		FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+			if(theEntity->GetTeam() == this->GetTeamNumber())
+			{
+				int thePlayerIndex = theEntity->entindex();
+				EntityListType::iterator theIterator = std::find(this->mVotingPlayers.begin(), this->mVotingPlayers.end(), thePlayerIndex);
+				bool thePlayerHasVoted = (theIterator != this->mVotingPlayers.end());
+
+				if(!theSendOnlyToNonvotingPlayers || !thePlayerHasVoted)
+				{
+					theEntity->SendMessage(theMessageForPlayers.c_str());
+
+					// Play "commander has been ejected" sound for all players
+					if(theSoundForPlayers != HUD_SOUND_INVALID)
+					{
+						theEntity->PlayHUDSound(theSoundForPlayers);
+					}
+				}
+			}
+		END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+	}
+}
+
+void AvHTeam::UpdateHints()
+{
+	if(GetGameRules()->GetGameStarted() && (this->GetPlayerCount() > 1) && !GetGameRules()->GetIsCombatMode())
+	{
+		const float kHintUpdateInterval = 2.0f;
+		if((this->mTimeLastHintUpdate == -1) || (gpGlobals->time > (this->mTimeLastHintUpdate + kHintUpdateInterval)))
+		{
+			this->mTimeLastHintUpdate = gpGlobals->time;
+
+			float kHintInterval = 20.0f;
+			if(this->GetTeamType() == AVH_CLASS_TYPE_ALIEN)
+			{
+				kHintInterval = 30.0f;
+			}
+		
+			if((this->mTimeOfLastTeamHint == -1) || (gpGlobals->time > (this->mTimeOfLastTeamHint + kHintInterval)))
+			{
+				bool thePlayedHint = false;
+			
+				// Update commander hints
+				AvHPlayer* theCommanderPlayer = this->GetCommanderPlayer();
+				if(theCommanderPlayer)
+				{
+					const float kGiveOrdersHintDelay = 20.0f;
+					float theTimeAsCommander = gpGlobals->time - theCommanderPlayer->GetTimeStartedTopDown();
+				
+					if(theTimeAsCommander > kGiveOrdersHintDelay)
+					{
+						// Remove warning because tech tree doesn't currently require it
+						//// Do we have zero infantry portals, and we haven't played "need infantry portal" sound for awhile
+						//bool theTeamHasLiveInfantryPortal = false;
+						//
+						//FOR_ALL_ENTITIES(kwsInfantryPortal, AvHInfantryPortal*)
+						//	if(theEntity->pev->team == this->mTeamNumber)
+						//	{
+						//		if(theEntity->GetIsBuilt())
+						//		{
+						//			theTeamHasLiveInfantryPortal = true;
+						//			break;
+						//		}
+						//	}
+						//END_FOR_ALL_ENTITIES(kwsInfantryPortal);
+						//
+						//if(!theTeamHasLiveInfantryPortal)
+						//{
+						//	// Play "need infantry portal" sound
+						//	theCommanderPlayer->PlayHUDSound(HUD_SOUND_MARINE_NEEDPORTAL);
+						//	thePlayedHint = true;
+						//}
+						
+						if(!thePlayedHint)
+						{
+							// Did commander just join and hasn't given any orders?  Play "select your troops and give them orders".
+							if(!theCommanderPlayer->GetHasGivenOrder())
+							{
+								theCommanderPlayer->PlayHUDSound(HUD_SOUND_MARINE_GIVEORDERS);
+								thePlayedHint = true;
+							}
+						}
+						
+						if(!thePlayedHint)
+						{
+							// If we just played an alert, tell them how to go to it (but only tell every commander once)
+							const float kMinAlertNotifyInterval = 5.0f;
+							float theTimeOfLastAudioAlert = -1;
+                            const AvHAlert* theLastAlert = this->GetLastAudioAlert();
+                            if(theLastAlert)
+                            {
+                                theTimeOfLastAudioAlert = theLastAlert->GetTime();
+                            }
+
+							if((theTimeOfLastAudioAlert == -1) || ((gpGlobals->time - theTimeOfLastAudioAlert) < kMinAlertNotifyInterval))
+							{
+								int theCurrentCommander = theCommanderPlayer->entindex();
+								if(std::find(this->mCommandersToldAboutJumpKey.begin(), this->mCommandersToldAboutJumpKey.end(), theCurrentCommander) == this->mCommandersToldAboutJumpKey.end())
+								{
+									theCommanderPlayer->PlayHUDSound(HUD_SOUND_MARINE_GOTOALERT);
+									this->mCommandersToldAboutJumpKey.push_back(theCurrentCommander);
+								}
+							}
+						}
+						
+						// Detect shell-shocked commander.  Play "do something" sound.
+						if(!thePlayedHint)
+						{
+							const float kShellShockedInterval = 130.0f;
+						
+							float theTimeOfLastSignificantCommanderAction = theCommanderPlayer->GetTimeOfLastSignificantCommanderAction();
+							float theTimeSinceLastSignificantAction = gpGlobals->time - theTimeOfLastSignificantCommanderAction;
+						
+							if((theTimeOfLastSignificantCommanderAction == -1) || (theTimeSinceLastSignificantAction > kShellShockedInterval))
+							{
+								theCommanderPlayer->PlayHUDSound(HUD_SOUND_MARINE_COMMANDERIDLE);
+								thePlayedHint = true;
+							}
+						}
+					}
+				}
+			
+				// Update alien team hints
+				if(this->mTeamType == AVH_CLASS_TYPE_ALIEN)
+				{
+					int theNumBuilders = 0;
+					int theNumAliveTeamMembers = 0;
+		
+					// If we have no builders, tell the team
+					FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+						if(theEntity->GetIsRelevant() && (theEntity->pev->team == this->mTeamNumber))
+						{
+							// If we have builders, or players that are evolving to builders...
+							if(theEntity->GetUser3() == AVH_USER3_ALIEN_PLAYER2)
+							{
+								theNumBuilders++;
+							}
+							else if(theEntity->GetEvolution() == ALIEN_LIFEFORM_TWO)
+							{
+								theNumBuilders++;
+							}
+							else if((theEntity->GetUser3() == AVH_USER3_ALIEN_EMBRYO) && (theEntity->GetPreviousUser3() == AVH_USER3_ALIEN_PLAYER2))
+							{
+								AvHMessageID theEvolution = theEntity->GetEvolution();
+								switch(theEvolution)
+								{
+								case ALIEN_EVOLUTION_ONE:
+								case ALIEN_EVOLUTION_TWO:
+								case ALIEN_EVOLUTION_THREE:
+								case ALIEN_EVOLUTION_SEVEN:
+								case ALIEN_EVOLUTION_EIGHT:
+								case ALIEN_EVOLUTION_NINE:
+								case ALIEN_EVOLUTION_TEN:
+								case ALIEN_EVOLUTION_ELEVEN:
+								case ALIEN_EVOLUTION_TWELVE:
+									theNumBuilders++;
+									break;
+								}
+							}
+		
+							if(theEntity->IsAlive())
+							{
+								theNumAliveTeamMembers++;
+							}
+						}
+					END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+		
+					// Only play if there is more then one person alive on team (player could be last one left or could be saving up)
+					if((theNumBuilders == 0) && (theNumAliveTeamMembers > 1))
+					{
+						this->PlayHUDSoundForAlivePlayers(HUD_SOUND_ALIEN_NEED_BUILDERS);
+						thePlayedHint = true;
+					}
+		
+					// Now, fun easter eggs, but not in tourny mode
+					if(!thePlayedHint && !GetGameRules()->GetIsTournamentMode() && this->mPlayFunSoundsThisGame)
+					{
+						// If a hive is under attack and the marines are way ahead, play "game over man"
+		
+						AvHHive* theRandomHive = AvHSUGetRandomActiveHive(this->mTeamNumber);
+						if(theRandomHive)
+						{
+							const float kRadius = 600;
+		
+							int theClutterEntities = 0;
+							int theDeadTeammates = 0;
+							int theDeadPlayers = 0;
+		
+							CBaseEntity* theEntity = NULL;
+							while((theEntity = UTIL_FindEntityInSphere(theEntity, theRandomHive->pev->origin, kRadius)) != NULL)
+							{
+								// If there are a ton of dead alien players, sometimes play "we need better players"
+								if(theEntity->IsPlayer() && !theEntity->IsAlive())
+								{
+									if(theEntity->pev->team == this->mTeamNumber)
+									{
+										theDeadTeammates++;
+									}
+		
+									theDeadPlayers++;
+								}
+								else
+								{
+									// If there are tons of aliens buildings nearby, play "place is a mess" sound for all aliens nearby
+									AvHBaseBuildable* theBuildable = dynamic_cast<AvHBaseBuildable*>(theEntity);
+									CBasePlayerItem* theItem = dynamic_cast<CBasePlayerItem*>(theEntity);
+									if(theBuildable || theItem)
+									{
+										theClutterEntities++;
+									}
+								}
+							}
+		
+							if((theDeadPlayers >= 14) && !this->mPlayedSeeDeadPeople)
+							{
+								EMIT_SOUND(theRandomHive->edict(), CHAN_AUTO, kAlienSeeDead, 1.0f, ATTN_NORM);
+								this->mPlayedSeeDeadPeople;
+								thePlayedHint = true;
+							}
+							else if(theDeadTeammates >= 8)
+							{
+								this->PlayFunHUDSoundOnce(HUD_SOUND_ALIEN_NEED_BETTER);
+								thePlayedHint = true;
+							}
+							else if(theClutterEntities >= 25)
+							{
+								this->PlayFunHUDSoundOnce(HUD_SOUND_ALIEN_MESS);
+								thePlayedHint = true;
+							}
+						}
+		
+						// If aliens have all three hives and all upgrades, play "donce"
+						if(this->GetNumActiveHives() == kMaxHives)
+						{
+							if(this->GetAlienUpgrades().size() >= kMaxUpgradeCategories*kMaxUpgradeLevel)
+							{
+								this->PlayFunHUDSoundOnce(HUD_SOUND_ALIEN_NOW_DONCE);
+								thePlayedHint = true;
+							}
+						}
+		
+						// If there are tons of bodies near a hive, play "I see dead people"
+		
+					}
+				}
+			
+				if(thePlayedHint)
+				{
+					this->mTimeOfLastTeamHint = gpGlobals->time;
+				}
+			}
+		}
+	}
+}
+
+void AvHTeam::UpdateCommanderScore()
+{
+	// The commander score is the average of his team score
+	const float kUpdateScoreTime = 2.0f;
+	float theCurrentTime = gpGlobals->time;
+
+	int theCommander = this->GetCommander();
+	if(theCommander > 0)
+	{
+		if((this->mLastCommandScoreUpdateTime == -1) || (theCurrentTime > this->mLastCommandScoreUpdateTime + kUpdateScoreTime))
+		{
+			int theScore = 0;
+			int theNumPlayers = 0;
+		
+			// Run through players on team and average score
+			FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+				// For each player, update alien inventory with this # of hives
+				if(theEntity->GetTeam() == this->GetTeamNumber())
+				{
+					if(theEntity->entindex() != theCommander)
+					{
+						theScore += theEntity->GetScore();
+						theNumPlayers++;
+					}
+				}
+			END_FOR_ALL_ENTITIES(kAvHPlayerClassName);
+
+			int theCommanderScore = (int)((theScore/(float)theNumPlayers) + .5f);
+
+			AvHPlayer* theCommanderPlayer = this->GetCommanderPlayer();
+			if(theCommanderPlayer)
+			{
+				theCommanderPlayer->SetScore(theCommanderScore);
+			}
+					
+			this->mLastCommandScoreUpdateTime = theCurrentTime;
+		}
+	}
+}
+
+void AvHTeam::UpdateInventoryEnabledState()
+{
+	// Count # of hives
+	int theNumHives = this->GetNumActiveHives();
+
+	// Loop through players on team
+	FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+		// For each player, update alien inventory with this # of hives
+		if(theEntity->GetTeam() == this->GetTeamNumber())
+		{
+			if(GetGameRules()->GetIsCombatMode())
+			{
+				theNumHives = 1;
+				
+				MessageIDListType& thePurchasedCombatUpgrades = theEntity->GetPurchasedCombatUpgrades();
+				MessageIDListType::iterator theIter = std::find(thePurchasedCombatUpgrades.begin(), thePurchasedCombatUpgrades.end(), ALIEN_HIVE_TWO_UNLOCK);
+
+				//AvHTechNode theTechNode;
+				//if(theEntity->GetCombatNodes().GetTechNode(ALIEN_HIVE_TWO_UNLOCK, theTechNode) && theTechNode.GetIsResearched())
+				if(theIter != thePurchasedCombatUpgrades.end())
+				{
+					theNumHives++;
+
+					//if(theEntity->GetCombatNodes().GetTechNode(ALIEN_HIVE_THREE_UNLOCK, theTechNode) && theTechNode.GetIsResearched())
+					theIter = std::find(thePurchasedCombatUpgrades.begin(), thePurchasedCombatUpgrades.end(), ALIEN_HIVE_THREE_UNLOCK);
+					if(theIter != thePurchasedCombatUpgrades.end())
+					{
+						theNumHives++;
+					}
+				}
+			}
+
+			theEntity->UpdateInventoryEnabledState(theNumHives);
+		}
+	END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+}
+
+void AvHTeam::UpdateReinforcementWave()
+{
+    int theNumPlayersOnTeam = this->GetPlayerCount();
+	int theNumDeadPlayers = this->GetPlayerCount(true);
+	int theWaveSize = AvHSUCalcCombatSpawnWaveSize(theNumPlayersOnTeam, theNumDeadPlayers);
+
+	// If we're in combat mode
+	if(GetGameRules()->GetIsCombatMode() && (GetGameRules()->GetVictoryTeam() == TEAM_IND) && !GetGameRules()->GetIsIronMan())
+	{
+		// If reinforcement wave hasn't started
+		if(this->mTimeReinforcementWaveComplete == -1)
+		{
+			// If team has at least one dead player, start wave
+			for(EntityListType::const_iterator theIter = this->mPlayerList.begin(); theIter != this->mPlayerList.end(); theIter++)
+			{
+				const AvHPlayer* thePlayer = this->GetPlayerFromIndex(*theIter);
+				ASSERT(thePlayer);
+                float theWaveTime = AvHSUCalcCombatSpawnTime(this->mTeamType, theNumPlayersOnTeam, theNumDeadPlayers, 0);
+
+                switch(thePlayer->GetPlayMode())
+                {
+                case PLAYMODE_AWAITINGREINFORCEMENT:
+                case PLAYMODE_REINFORCING:
+					// Set time reinforcement is complete
+					this->mTimeReinforcementWaveComplete = gpGlobals->time + theWaveTime;
+					break;
+                }
+			}
+		}
+		else
+		{
+            // Spawn back in a max of X players per wave (1/4 rounded up)
+            int theNumRespawning = 0;
+
+            EntityListType::const_iterator theIter;
+
+            // Count number of people currently respawning
+            for(theIter = this->mPlayerList.begin(); theIter != this->mPlayerList.end(); theIter++)
+            {
+                AvHPlayer* thePlayer = this->GetPlayerFromIndex(*theIter);
+                ASSERT(thePlayer);
+                
+                if(thePlayer->GetPlayMode() == PLAYMODE_REINFORCING)
+                {
+                    theNumRespawning++;
+                }
+            }
+
+            // Find the player that's been waiting the longest
+            if(theNumRespawning < theWaveSize)
+            {
+                EntityListType::const_iterator theLongestWaitingPlayer = this->mPlayerList.end();
+                float theLongestWaitingTime = -1;
+
+                // Loop through players
+                for(theIter = this->mPlayerList.begin(); theIter != this->mPlayerList.end(); theIter++)
+                {
+                    // While we don't allow any more to repsawn or we hit end of list 
+                    AvHPlayer* thePlayer = this->GetPlayerFromIndex(*theIter);
+                    ASSERT(thePlayer);
+                    
+                    if(thePlayer->GetPlayMode() == PLAYMODE_AWAITINGREINFORCEMENT)
+                    {
+                        float thePlayerWaitTime = (gpGlobals->time - thePlayer->GetTimeLastPlaying());
+                        if((theLongestWaitingTime == -1) || (thePlayerWaitTime > theLongestWaitingTime))
+                        {
+                            theLongestWaitingPlayer = theIter;
+                            theLongestWaitingTime = thePlayerWaitTime;
+                        }
+                    }
+                }
+
+                if(theLongestWaitingPlayer != this->mPlayerList.end())
+                {
+                    AvHPlayer* thePlayer = this->GetPlayerFromIndex(*theLongestWaitingPlayer);
+                    ASSERT(thePlayer);
+                    thePlayer->SetPlayMode(PLAYMODE_REINFORCING);
+                }
+            }
+
+            // Respawn players when wave is complete
+            if(gpGlobals->time > this->mTimeReinforcementWaveComplete)
+            {
+                for(theIter = this->mPlayerList.begin(); theIter != this->mPlayerList.end(); theIter++)
+                {
+                    // While we don't allow any more to repsawn or we hit end of list 
+                    AvHPlayer* thePlayer = this->GetPlayerFromIndex(*theIter);
+                    ASSERT(thePlayer);
+
+                    if(thePlayer->GetPlayMode() == PLAYMODE_REINFORCING)
+                    {
+                        thePlayer->SetPlayMode(PLAYMODE_PLAYING);
+                    }
+                }
+
+                // Reset wave
+                this->mTimeReinforcementWaveComplete = -1;
+            }
+		}
+	}
+}
+
+void AvHTeam::UpdateOrders()
+{
+	// For each order in our list
+	for(OrderListType::iterator theOrderIter = this->mOrderList.begin(); theOrderIter != this->mOrderList.end(); /* no increment*/)
+	{
+		ASSERT(theOrderIter->GetReceiver() != -1 );
+		if(theOrderIter->Update())
+		{
+			bool theOrderCancelled = theOrderIter->GetOrderCancelled();
+			if(!theOrderCancelled)
+			{
+				EntityInfo theReceiver = theOrderIter->GetReceiver();
+				if(theReceiver != -1 )
+				{
+					GetGameRules()->TriggerAlert(this->mTeamNumber, ALERT_ORDER_COMPLETE, theReceiver);
+				}
+			}
+		}
+		
+		// Have any orders been completed for a bit?
+		const float kExpireTime = 1.0f;
+		if(!theOrderIter->GetOrderActive() && (theOrderIter->GetTimeOrderCompleted() != -1) && (gpGlobals->time > (theOrderIter->GetTimeOrderCompleted() + kExpireTime)))
+		{
+			this->mOrderList.erase(theOrderIter);
+		}
+		else
+		{
+			theOrderIter++;
+		}
+
+		// Is the order complete?
+//	for(OrderListType::iterator theOrderIter = this->mOrderList.begin(); theOrderIter != this->mOrderList.end(); /* no increment */)
+//	{
+//		// Is the order complete?
+//		bool theOrderCancelled = false;
+//		if(theOrderIter->GetIsComplete(&theOrderCancelled))
+//		{
+//			if(!theOrderCancelled)
+//			{
+//				// For each receiver
+//				EntityListType theReceivers = theOrderIter->GetReceivers();
+//				for(EntityListType::iterator theReceiverIter = theReceivers.begin(); theReceiverIter != theReceivers.end(); theReceiverIter++)
+//				{
+//					// Get player.  This fails occasionally, due to selection issues (ie, a building or other non-player entity will be in here)
+//					AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(*theReceiverIter)));
+//					//ASSERT(thePlayer);
+//					if(thePlayer)
+//					{
+//						// Set the order complete
+//						thePlayer->PlayOrderComplete();
+//					}
+//				}
+//				
+//				// Set order complete for commander
+//				int theCommanderIndex = this->GetCommander();
+//				if(theCommanderIndex >= 0)
+//				{
+//					AvHPlayer* theCommander = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(theCommanderIndex)));
+//					if(theCommander)
+//					{
+//						theCommander->PlayOrderComplete();
+//					}
+//				}
+//			}
+//			
+//			// Set the receivers to none because it's no longer relevant
+//			AvHOrder theCompletedOrder(*theOrderIter);
+//			theCompletedOrder.SetOrderCompleted();
+//			
+//			this->SetOrder(theCompletedOrder);
+//		}
+//		else
+//		{
+//			theOrderIter++;
+//		}
+	}
+}
+
+//void AvHTeam::UpdateReinforcements()
+//{
+//	// If this team is alien
+//	if(this->mTeamType == AVH_CLASS_TYPE_ALIEN)
+//	{
+//		// For each hive on this team
+//		FOR_ALL_ENTITIES(kesTeamHive, AvHHive*)
+//			if(AvHTeamNumber(theEntity->pev->team) == this->mTeamNumber)
+//			{
+//				// Update reinforcements
+//				theEntity->UpdateReinforcements();
+//			}
+//		END_FOR_ALL_ENTITIES(kesTeamHive);
+//	}
+//	// else if it's marine
+//	else if(this->mTeamType == AVH_CLASS_TYPE_MARINE)
+//	{
+//		// For each infantry portal on this team
+//		FOR_ALL_ENTITIES(kwsInfantryPortal, AvHInfantryPortal*)
+//			if(AvHTeamNumber(theEntity->pev->team) == this->mTeamNumber)
+//			{
+//				// Update reinforcements
+//				theEntity->UpdateReinforcements();
+//			}
+//		END_FOR_ALL_ENTITIES(kwsInfantryPortal);
+//	}
+//	else
+//	{
+//		ASSERT(false);
+//	}
+//}
+
+void AvHTeam::UpdateResearch()
+{
+	this->mResearchManager.UpdateResearch();
+	this->UpdateMenuTechSlots();
+}
+
+void AvHTeam::UpdateResources()
+{
+	const AvHGameplay& theGameplay = GetGameRules()->GetGameplay();
+	float kResourceUpdateInterval = theGameplay.GetTowerInjectionTime();
+ 
+    if(GetGameRules()->GetIsHamboneMode())
+    {
+        kResourceUpdateInterval /= 2.0f;    
+    }
+
+    // Change here if teams should always get at least one resource
+    float theResourcesGathered = 0.0f;
+
+	float theCurrentTime = gpGlobals->time;
+	if((this->mLastResourceUpdateTime == -1) || (theCurrentTime > (this->mLastResourceUpdateTime + kResourceUpdateInterval)))
+	{
+		// Add resources for each built-on resource on the team
+		for(EntityListType::iterator theResourceTowerIter = this->mResourceTowerList.begin(); theResourceTowerIter != this->mResourceTowerList.end(); /* nothing */)
+		{
+			CBaseEntity* theResourceTowerEntity = CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(*theResourceTowerIter));
+			AvHResourceTower* theResourceTower = dynamic_cast<AvHResourceTower*>(theResourceTowerEntity);
+			if(theResourceTower && (theResourceTower->pev->team == this->mTeamNumber))
+			{
+				if(theResourceTower->GetIsActive())
+				{
+					// Has enough time elapsed?
+					float theLastTimeResourcesContributed = theResourceTower->GetTimeLastContributed();
+					float theCurrentTime = gpGlobals->time;
+					
+					if(theCurrentTime > (theLastTimeResourcesContributed + kResourceUpdateInterval))
+					{
+						// Take into account upgrade level stored in tower
+						float theTowerContribution = theGameplay.GetTowerInjectionAmount();
+						theResourcesGathered += theTowerContribution;
+					
+						// Decrement the amount of points the resources has
+						theResourceTower->SetTimeLastContributed(theCurrentTime);
+					
+                        AvHSUPlayNumericEventAboveStructure(theTowerContribution, theResourceTower);
+					}
+				}
+
+				theResourceTowerIter++;
+			}
+			else
+			{
+				// Remove it from team also
+				theResourceTowerIter = this->mResourceTowerList.erase(theResourceTowerIter);
+			}
+		}
+        
+	    // If we're marines, add it to the team total
+	    if(this->mTeamType == AVH_CLASS_TYPE_MARINE)
+	    {
+		    this->SetTeamResources(this->GetTeamResources() + theResourcesGathered);
+	    }
+	    else if(this->mTeamType == AVH_CLASS_TYPE_ALIEN)
+	    {
+		    // Else dump it into the pool, and split the whole pool up among all players on our team
+            float theTeamResources = this->GetTeamResources() + theResourcesGathered;
+
+		    int theNumPlayers = this->GetPlayerCount();
+		    float theAmountForPlayer = theTeamResources/(float)theNumPlayers;
+
+            // Clear resources, assuming all res will be given out.  Anything over will gob ack into team pool
+            this->SetTeamResources(0.0f);
+		    
+		    for(EntityListType::iterator thePlayerIter = this->mPlayerList.begin(); thePlayerIter != this->mPlayerList.end(); thePlayerIter++)
+		    {
+			    AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(*thePlayerIter)));
+			    ASSERT(thePlayer);
+
+                // If the amount goes over the player's max, it goes back into team resources
+                float theResourcesBefore = thePlayer->GetResources();
+			    thePlayer->SetResources(thePlayer->GetResources() + theAmountForPlayer);
+		    }
+	    }
+	    
+	    // Increment total resources gathered
+	    this->AddResourcesGathered(theResourcesGathered);
+
+        this->mLastResourceUpdateTime = theCurrentTime;
+    }
+}
+
+AvHServerPlayerData* AvHTeam::GetServerPlayerData(edict_t* inEdict)
+{
+	AvHServerPlayerData* theReturnData = NULL;
+#ifdef USE_UPP
+	string theNetworkID = UPPUtil_GetNetworkID(inEdict);
+	theReturnData = &this->mServerPlayerData[theNetworkID];
+#else
+	string theAuthID = AvHSUGetPlayerAuthIDString(inEdict);
+	if(theAuthID != "-1" && theAuthID != "STEAM_ID_LAN")
+	{
+		// Return existing record, create one if it doesn't exist
+		theReturnData = &this->mServerPlayerData[theAuthID];
+	}
+#endif
+	
+	return theReturnData;
+}
+
+void AvHTeam::UpdateServerPlayerData()
+{
+	const float kServerPlayerDataUpdateInterval = 1.0f;
+	float theCurrentTime = gpGlobals->time;
+	if((this->mLastServerPlayerDataUpdateTime == -1) || (theCurrentTime > (this->mLastServerPlayerDataUpdateTime + kServerPlayerDataUpdateInterval)))
+	{
+		// Update all settings to remember keyed to their WONid
+		FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+		AvHServerPlayerData* theServerPlayerData = this->GetServerPlayerData(theEntity->edict());
+		if(theServerPlayerData)
+		{
+			// Expire any commander bans
+			float theCommanderVoteDownTime = avh_votedowntime.value;
+			float theTimeVotedDown = theServerPlayerData->GetTimeVotedDown()*60;
+			if(theTimeVotedDown > 0)
+			{
+				if(gpGlobals->time > (theTimeVotedDown + theCommanderVoteDownTime))
+				{
+					theServerPlayerData->SetTimeVotedDown(-1);
+				}
+			}
+		}
+		END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+	}
+}
+
+void AvHTeam::UpdateMenuTechSlots()
+{
+	if(this->mTeamType == AVH_CLASS_TYPE_MARINE)
+	{
+		// Update commander menus.  Get tech slots for each menu and add them all in one 32 long list
+		this->mMenuTechSlots = 0;
+		
+		AvHGamerules* theGameRules = GetGameRules();
+		const AvHTeam* theTeam = theGameRules->GetTeam(this->mTeamNumber);
+		if(theTeam)
+		{
+			for(int j = 0; j < 4; j++)
+			{
+				AvHUser3 theUser3 = AVH_USER3_NONE;
+				int theBaseIndex = 0;
+				
+				switch(j)
+				{
+				case 0:
+					theUser3 = AVH_USER3_MENU_BUILD;
+					theBaseIndex = 0;
+					break;
+				case 1:
+					theUser3 = AVH_USER3_MENU_BUILD_ADVANCED;
+					theBaseIndex = 8;
+					break;
+				case 2:
+					theUser3 = AVH_USER3_MENU_ASSIST;
+					theBaseIndex = 16;
+					break;
+				case 3:
+					theUser3 = AVH_USER3_MENU_EQUIP;
+					theBaseIndex = 24;
+					break;
+				}
+				
+				// For each slot, see if tech is available
+				AvHTechSlots theTechSlots;
+				if(theTeam->GetTechSlotManager().GetTechSlotList(theUser3, theTechSlots))
+				{
+					// Store results in full 32-bits of iuser1
+					for(int i = 0; i < kNumTechSlots; i++)
+					{
+						int theCurrentMask = 1 << (theBaseIndex + i);
+						
+						AvHMessageID theMessage = theTechSlots.mTechSlots[i];
+						if(theMessage != MESSAGE_NULL)
+						{
+							if(this->GetIsTechnologyAvailable(theMessage))
+							{
+								this->mMenuTechSlots |= theCurrentMask;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+bool AvHTeam::GetIsTechnologyAvailable(AvHMessageID inMessageID) const
+{
+	bool theTechnologyAvailable = this->GetResearchManager().GetIsMessageAvailable(inMessageID);
+	return theTechnologyAvailable;
+}
+
+
+
+
+bool AvHTeam::GetLastAlert(AvHAlert& outAlert, bool inClearAlert, bool inAnyMessage, AvHMessageID* ioMessageID)
+{
+	float theLastAlertTime = -1;
+	bool theSuccess = false;
+	
+	// Look for last alert
+	AlertListType::iterator theLastAlertIter;
+	AvHMessageID theOutputMessageID = MESSAGE_NULL;
+
+	for(MessageAlertListType::iterator theIter = this->mAlertList.begin(); theIter != this->mAlertList.end(); theIter++)
+	{
+		if(inAnyMessage || (ioMessageID && (theIter->first == *ioMessageID)))
+		{
+			for(AlertListType::iterator theAlertIter = theIter->second.begin(); theAlertIter != theIter->second.end(); theAlertIter++)
+			{
+				float theCurrentTime = theAlertIter->GetTime();
+				if(theCurrentTime > theLastAlertTime)
+				{
+					theLastAlertIter = theAlertIter;
+					theLastAlertTime = theCurrentTime;
+					theOutputMessageID = theIter->first;
+					theSuccess = true;
+				}
+			}
+		}
+	}
+
+	// If we found it, set the alert
+	if(theSuccess)
+	{
+		outAlert = *theLastAlertIter;
+		if(ioMessageID)
+		{
+			*ioMessageID = theOutputMessageID;
+		}
+	}
+
+	// Clear the alert if specified
+	if(inClearAlert)
+	{
+		for(MessageAlertListType::iterator theIter = this->mAlertList.begin(); theIter != this->mAlertList.end(); theIter++)
+		{
+			for(AlertListType::iterator theAlertIter = theIter->second.begin(); theAlertIter != theIter->second.end(); theAlertIter++)
+			{
+				if(theAlertIter == theLastAlertIter)
+				{
+					theIter->second.erase(theLastAlertIter);
+					break;
+				}
+			}
+		}
+	}
+	
+	return theSuccess;
+}
+
+float AvHTeam::GetAudioAlertInterval() const
+{
+	float theAudioAlertInterval = BALANCE_FVAR(kAudioAlertInterval);
+	return theAudioAlertInterval;
+}
+
+void AvHTeam::AddAlert(const AvHAlert& inAlert, AvHMessageID inMessageID)
+{
+	this->mAlertList[inMessageID].push_back(inAlert);
+}
+
+const AvHAlert* AvHTeam::GetLastAudioAlert() const
+{
+	// Look for last audio alert
+	const AvHAlert* theLastAudioAlert = NULL;
+	float theLastTime = -1;
+
+	for(MessageAlertListType::const_iterator theIter = this->mAlertList.begin(); theIter != this->mAlertList.end(); theIter++)
+	{
+		for(AlertListType::const_iterator theAlertIter = theIter->second.begin(); theAlertIter != theIter->second.end(); theAlertIter++)
+		{
+			if(theAlertIter->GetPlayedAudio())
+			{
+				float theCurrentTime = theAlertIter->GetTime();
+				if(theCurrentTime > theLastTime)
+				{
+                    theLastAudioAlert = &(*theAlertIter);
+					theLastTime = theCurrentTime;
+				}
+			}
+		}
+	}
+	
+	return theLastAudioAlert;
+}
+
+AlertListType AvHTeam::GetAlerts(AvHMessageID inMessageID) 
+{
+	return this->mAlertList[inMessageID];
+}
+
+void AvHTeam::UpdateAlerts()
+{
+	const float theAlertExpireTime = BALANCE_FVAR(kAlertExpireTime);
+
+	#ifdef AVH_PLAYTEST_BUILD
+	// Run through our team, and alert everyone if there is a player that's no longer playing or on the server
+	for(EntityListType::const_iterator thePlayerIter = this->mPlayerList.begin(); thePlayerIter != this->mPlayerList.end(); thePlayerIter++)
+	{
+		int thePlayerIndex = *thePlayerIter;
+		bool theSendAlert = false;
+		char theErrorMessage[512];
+
+		AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(g_engfuncs.pfnPEntityOfEntIndex(*thePlayerIter)));
+		if(!thePlayer)
+		{
+			theSendAlert = true;
+			strcpy(theErrorMessage, "NULL player");
+		}
+		else
+		{
+			AvHPlayMode thePlayMode = thePlayer->GetPlayMode();
+			if((thePlayMode != PLAYMODE_PLAYING) && (thePlayMode != PLAYMODE_AWAITINGREINFORCEMENT) && (thePlayMode != PLAYMODE_REINFORCING))
+			{
+				theSendAlert = true;
+				sprintf(theErrorMessage, "Invalid play mode: %d\n", thePlayMode);
+			}
+			else if(AvHTeamNumber(thePlayer->pev->team) != this->mTeamNumber)
+			{
+				theSendAlert = true;
+				sprintf(theErrorMessage, "on wrong team (%d instead of %d)", thePlayer->pev->team, this->mTeamNumber);
+			}
+		}
+
+		if(theSendAlert)
+		{
+			const char* thePlayerName = "<null>";
+			thePlayerName = STRING(thePlayer->pev->netname);
+			
+			char theFullErrorMesssage[512];
+			sprintf(theFullErrorMesssage, "Invalid player bug detected <\"%s\">: %d", thePlayerName, theErrorMessage);
+			UTIL_SayTextAll(theFullErrorMesssage, thePlayer);
+		}
+	}
+	#endif
+	
+	// Run through alerts, and expire any past a certain age
+	for(MessageAlertListType::iterator theIter = this->mAlertList.begin(); theIter != this->mAlertList.end(); theIter++)
+	{
+		AlertListType& theAlertList = theIter->second;
+		for(AlertListType::iterator theAlertIter = theAlertList.begin(); theAlertIter != theAlertList.end(); /* no inc */)
+		{
+			float theCurrentTime = theAlertIter->GetTime();
+			if(gpGlobals->time > (theCurrentTime + theAlertExpireTime))
+			{
+				int theAlertListSize = theAlertList.size();
+				theAlertIter = theAlertList.erase(theAlertIter);
+				
+				//				AlertListType::iterator theTempIter = theAlertIter;
+				//				theAlertIter++;
+				//				
+				//				this->mAlertList.erase(theTempIter);
+			}
+			else
+			{
+				theAlertIter++;
+			}
+		}
+	}
+}
+
+EntityListType AvHTeam::GetGroup(int inGroupNumber)
+{
+	ASSERT(inGroupNumber >= 0);
+	ASSERT(inGroupNumber < kNumHotkeyGroups);
+
+	return this->mGroups[inGroupNumber];
+}
+
+void AvHTeam::SetGroup(int inGroupNumber, EntityListType& inEntityListType)
+{
+	// Set group
+	ASSERT(inGroupNumber >= 0);
+	ASSERT(inGroupNumber < kNumHotkeyGroups);
+	
+	this->mGroups[inGroupNumber] = inEntityListType;
+
+	// Update group type
+	AvHUser3 theUser3 = AvHSUGetGroupTypeFromSelection(this->mGroups[inGroupNumber]);
+	this->mGroupTypes[inGroupNumber] = theUser3;
+}
+
+AvHUser3 AvHTeam::GetGroupType(int inGroupNumber)
+{
+	ASSERT(inGroupNumber >= 0);
+	ASSERT(inGroupNumber < kNumHotkeyGroups);
+
+	return this->mGroupTypes[inGroupNumber];
+}
+
+EntityListType AvHTeam::GetSelectAllGroup()
+{
+	return this->mSelectAllGroup;
+}
+
+void AvHTeam::SetSelectAllGroup(EntityListType& inGroup)
+{
+	this->mSelectAllGroup = inGroup;
+}
diff --git a/main/source/mod/AvHTeam.h b/main/source/mod/AvHTeam.h
new file mode 100644
index 00000000..77547198
--- /dev/null
+++ b/main/source/mod/AvHTeam.h
@@ -0,0 +1,341 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHTeam.h $
+// $Date: 2002/11/22 21:15:37 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHTeam.h,v $
+// Revision 1.32  2002/11/22 21:15:37  Flayra
+// - Remove owner of entities when player leaves the team
+// - Do damage to aliens without hives
+// - Fixed bug where a vote could affect a commander that logged in after a vote had been started.
+//
+// Revision 1.31  2002/11/15 23:31:26  Flayra
+// - Added "ready" verification for tourny mode
+//
+// Revision 1.30  2002/11/12 02:29:33  Flayra
+// - Added better standardized logging
+//
+// Revision 1.29  2002/10/24 21:43:29  Flayra
+// - Alien easter eggs
+// - Voting fix
+//
+// Revision 1.28  2002/10/18 22:23:04  Flayra
+// - Added beginnings of alien easter eggs
+// - Added "we need builders" alert
+//
+// Revision 1.27  2002/10/03 19:09:55  Flayra
+// - New resource model
+// - Orders refactoring
+// - Tech tree changes
+// - Aliens always get initial points when joining
+// - Play gamestart sound
+// - New trait available trigger
+// - Moved voting stuff to server variables
+// - Slowed down hints
+//
+// Revision 1.26  2002/09/23 22:35:43  Flayra
+// - Removed hive donation and put in new system for builders
+// - Updated tech tree (jetpacks, heavy armor, moved phase)
+// - Resource towers set as built on game start
+// - Added tons of commander hints (low resource alerts, tell commander about pressing jump key, commander ejected, select troops and give orders, don't just sit there, etc.)
+//
+// Revision 1.25  2002/09/09 20:08:26  Flayra
+// - Added commander voting
+// - Added hive info
+// - Changed how commander scoring works
+//
+// Revision 1.24  2002/08/31 18:01:03  Flayra
+// - Work at VALVe
+//
+// Revision 1.23  2002/08/02 21:45:20  Flayra
+// - Reworked alerts.
+//
+// Revision 1.22  2002/07/23 17:32:23  Flayra
+// - Resource model overhaul (closed system, random initial points), tech tree changes (new marine upgrades), free resource tower at nearest func_resource
+//
+// Revision 1.21  2002/07/08 17:19:42  Flayra
+// - Added handicapping, map validity checking, reinforcements happen independently of teams now
+//
+// Revision 1.20  2002/06/25 18:21:33  Flayra
+// - New enabled/disabled system for alien weapons, better victory detection, updated tech tree (removed old junk, added armory upgrade), fixed bug where a commander that leaves the game hogged the station, update resources less often (optimization)
+//
+// Revision 1.19  2002/05/28 18:09:51  Flayra
+// - Track number of webs for team, fix for premature victory condition (again), fixed bug where alien upgrades weren't being cleared between levels, causing eventual overflows for alien players after many games, recycling support, spawn in command center when game starts
+//
+// Revision 1.18  2002/05/23 02:32:57  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_TEAM_H
+#define AVH_TEAM_H
+
+#include "mod/AvHConstants.h"
+#include "mod/AvHOrder.h"
+#include "mod/AvHSharedTypes.h"
+#include "mod/AvHResearchManager.h"
+#include "mod/AvHSpecials.h"
+#include "mod/AvHServerPlayerData.h"
+#include "mod/AvHTechSlotManager.h"
+#include "mod/AvHAlert.h"
+
+class AvHPlayer;
+
+class AvHTeam
+{
+public:
+					AvHTeam(AvHTeamNumber inTeamNumber);
+
+	bool			AddPlayer(int inPlayerIndex);
+	bool			RemovePlayer(int inPlayerIndex);
+
+	bool			AddResourceTower(int inResourceTowerIndex);
+	bool			RemoveResourceTower(int inResourceTowerIndex);
+
+	bool			GetHasAtLeastOneActivePlayer(bool* outHasAtLeastOnePlayerOnTeam = NULL) const;
+	bool			GetHasTeamLost() const;
+	int				GetNumBuiltCommandStations() const;
+	int				GetNumActiveHives() const;
+
+	bool			ProcessRankChange(AvHPlayer* inPlayer, AvHUser3 inOldUser3, AvHUser3 inNewUser3);
+
+	#ifdef AVH_PLAYTEST_BUILD
+	void			BalanceChanged();
+	#endif
+
+	bool			GetIsReady() const;
+	void			SetIsReady(bool bIsReady = true);
+
+	AvHPlayer*			GetPlayerFromIndex(int inPlayerIndex);
+	const AvHPlayer*	GetPlayerFromIndex(int inPlayerIndex) const;
+	
+	AvHClassType	GetTeamType(void) const;
+	void			SetTeamType(AvHClassType inType);
+	const char*		GetTeamTypeString(void) const;
+	
+	float			GetTeamResources() const;
+	void			SetTeamResources(float inTeamResources);
+	float			GetTotalResourcesGathered() const;
+	void			AddResourcesGathered(float inResources);
+
+	float			GetMaxResources(AvHUser3 inUser3) const;
+
+	const char*		GetTeamName(void) const;
+	void			SetTeamName(const char* inTeamName);
+
+	const char*		GetTeamPrettyName(void) const;
+	void			SetTeamPrettyName(const char* inTeamName);
+
+	bool			GetIsPlayerOnTeam(int inPlayerIndex) const;
+	int				GetPlayerCount(bool inCountOnlyDead = false) const;
+	AvHTeamNumber	GetTeamNumber(void) const;
+	void			SetTeamNumber(AvHTeamNumber	inTeamNumber);
+
+	float			GetHandicap() const;
+	void			SetHandicap(float inHandicap);
+	bool			GetIsTechnologyAvailable(AvHMessageID inMessageID) const;
+
+	int				GetDesiredSpawnCount() const;
+	float			GetInitialPlayerPoints(edict_t* inEdict);
+	float			GetInitialExperience(edict_t* inEdict);
+
+	bool			SendResourcesGatheredScore(bool inThisTeamOnly = true);
+
+	void						AddTeamUpgrade(AvHAlienUpgradeCategory inCategory);
+	AvHAlienUpgradeListType		GetAlienUpgrades() const;
+	bool						RemoveAlienUpgradeCategory(AvHAlienUpgradeCategory inCategory);
+
+	int				GetTeamWideUpgrades() const;
+	void			ProcessTeamUpgrade(AvHMessageID inMessageID, bool inGive);
+	
+	int				GetNumCommanders(void) const;
+
+	// returns -1 if no commander assigned yet
+	int				GetCommander() const;
+	void			SetCommander(int inPlayerNumber);
+	AvHPlayer*		GetCommanderPlayer();
+
+	void			ResetGame();
+	virtual void	SetGameStarted(bool inGameStarted);
+
+	HiveInfoListType	GetHiveInfoList() const;
+	
+	// Tech nodes for team
+	void			InitializeTechNodes();
+
+	const AvHTechNodes&	GetTechNodes() const;
+	AvHTechNodes&		GetTechNodes();
+
+	const AvHTechSlotManager& GetTechSlotManager() const;
+	AvHTechSlotManager& GetTechSlotManager();
+	
+	void			TriggerAddTech(AvHTechID inTechID);
+	void			TriggerRemoveTech(AvHTechID inTechID);
+
+	void			AddAlert(const AvHAlert& inAlert, AvHMessageID inMessageID = MESSAGE_NULL);
+	bool			GetLastAlert(AvHAlert& outAlert, bool inClearAlert = false, bool inAnyMessage = true, AvHMessageID* ioMessageID = NULL);
+	const AvHAlert* GetLastAudioAlert() const;
+	float			GetAudioAlertInterval() const;
+	int				GetMenuTechSlots() const;
+		
+	void			GetOrders(OrderListType& outOrderList) const;
+	bool			GetDoesPlayerHaveOrder(int inPlayerIndex);
+	//void			GetPlayersCompletingOrders(const EntityListType& outPlayerList) const;
+	void			SetOrder(const AvHOrder& inOrder);
+
+	void			KillCS();
+	void			KillHive();
+	void			SpawnHive(Vector* outLocation = NULL, bool inForce = false);
+
+	int				GetNumWebStrands() const;
+	void			SetNumWebStrands(int inNumWebStrands);
+
+	void			PlayFunHUDSoundOnce(AvHHUDSound inHUDSound);
+	void			PlayHUDSoundForAlivePlayers(AvHHUDSound inHUDSound) const;
+
+	// joev: Bug 0000767
+	void			PlayHUDSoundForAllPlayers(AvHHUDSound inHUDSound) const;
+	// :joev
+
+	bool			PlayerVote(int inPlayerIndex, string& outPlayerMessage);
+
+	const AvHResearchManager&	GetResearchManager() const;
+	AvHResearchManager&			GetResearchManager();
+
+	AvHServerPlayerData*		GetServerPlayerData(edict_t* inEdict);
+	
+	void			Update();
+	void			UpdateMenuTechSlots();
+
+	AlertListType	GetAlerts(AvHMessageID inMessageID);
+
+	EntityListType	GetGroup(int inGroupNumber);
+	void			SetGroup(int inGroupNumber, EntityListType& inEntityListType);
+
+	AvHUser3		GetGroupType(int inGroupNumber);
+
+	EntityListType	GetSelectAllGroup();
+	void			SetSelectAllGroup(EntityListType& inGroup);
+
+private:
+	void			AddTechNode(AvHMessageID inMessageID, AvHTechID inTechID, AvHTechID inPrereq1 = TECH_NULL, AvHTechID inPrereq2 = TECH_NULL, bool inAllowMultiples = true, bool inResearched = false);
+	void			SpawnResourceTower();
+	
+	void			Init();
+	void			InitializeCombatTechNodes();
+	void			InitializeRandomResourceShares();
+	bool			GetTeamHasAbilityToRespawn() const;
+	void			ResetServerPlayerData();
+	void			RespawnLongestWaitingPlayer();
+	void			UpdateAlerts();
+	void			UpdateHints();
+	void			UpdateCommanderScore();
+	void			UpdateInventoryEnabledState();
+	void			UpdateReinforcementWave();
+	void			UpdateOrders();
+	void			UpdateResearch();
+	void			UpdateResources();
+	void			UpdateServerPlayerData();
+	void			UpdateTeamStructures();
+	void			UpdatePlayers();
+	void			UpdateVoting();
+	
+	float			WithdrawPointsViaRandomShares(int inPlayerIndex);
+	
+	AvHClassType	mTeamType;
+	string			mTeamName;
+	string			mTeamPrettyName;
+
+	AvHTeamNumber	mTeamNumber;
+	float			mLastResourceUpdateTime;
+	float			mLastCommandScoreUpdateTime;
+	float			mLastInjectionTime;
+	float			mLastHiveSpawnTime;
+	float			mLastPlayerUpdateTime;
+	float			mLastServerPlayerDataUpdateTime;
+	Vector			mStartingLocation;
+
+	// List of player entindices
+	EntityListType	mPlayerList;
+	EntityListType	mResourceTowerList;
+
+	OrderListType	mOrderList;
+
+	//EntityListType	mPlayersCompletingOrder;
+	
+	int				mCommander;
+	int				mCommanderWhenVoteStarted;
+
+	// Voting variables
+	bool			mVoteStarted;
+	int				mVotes;
+	int				mPreviousVotes;
+	EntityListType	mVotingPlayers;
+	int				mVotesNeeded;
+	float			mTimeVoteStarted;
+
+	float			mTeamResources;
+	float			mHandicap;
+
+	//AvHMessageID	mResearchingTech;
+	AvHResearchManager			mResearchManager;
+		
+	AvHAlienUpgradeListType		mAlienUpgrades;
+	int							mTeamWideUpgrades;
+
+	int				mNumWebStrands;
+
+	typedef			vector<int>								RandomResourceShareListType;
+	RandomResourceShareListType								mRandomResourceShares;
+
+	typedef			map<int, RandomResourceShareListType>	PlayerSharesListType;
+	PlayerSharesListType									mPlayerShares;
+
+	int				mTotalShareWeight;
+
+	typedef			map<string, AvHServerPlayerData>		AvHServerPlayerDataListType;
+	AvHServerPlayerDataListType								mServerPlayerData;
+
+	HiveInfoListType	mHiveInfoList;
+	float				mTimeOfLastStructureUpdate;
+
+	EntityListType	mLowResourceAlerts;
+	float			mTimeLastHintUpdate;
+	float			mTimeOfLastTeamHint;
+
+	EntityListType	mCommandersToldAboutJumpKey;
+
+	bool				mPlayFunSoundsThisGame;
+	HUDSoundListType	mFunSoundsPlayed;
+	bool				mPlayedSeeDeadPeople;
+
+	bool				mIsReady;
+
+	AvHTechSlotManager	mTechSlotManager;
+
+	float				mTotalResourcesGathered;
+	int					mClientTotalResourcesGathered;
+
+	int					mMenuTechSlots;
+	int					mNumActiveHives;
+	int					mNumBuiltCommandStations;
+
+	// Store alerts by message ID.  This message ID is used to fetch then when the commander presses the button on the UI.  General alerts use MESSAGE_NULL.
+	typedef map<AvHMessageID, AlertListType>	MessageAlertListType;
+	MessageAlertListType						mAlertList;
+
+	EntityListType		mGroups[kNumHotkeyGroups];
+	AvHUser3			mGroupTypes[kNumHotkeyGroups];
+	EntityListType		mSelectAllGroup;
+
+	float				mTimeReinforcementWaveComplete;
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHTeamHierarchy.cpp b/main/source/mod/AvHTeamHierarchy.cpp
new file mode 100644
index 00000000..f3195dbe
--- /dev/null
+++ b/main/source/mod/AvHTeamHierarchy.cpp
@@ -0,0 +1,187 @@
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+#include "common/const.h"
+#include "common/entity_state.h"
+#include "common/cl_entity.h"
+#include "ui/UITags.h"
+#include "mod/AvHTeamHierarchy.h"
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHSpecials.h"
+#include "mod/AvHMiniMap.h"
+#include "ui/UIUtil.h"
+#include "mod/AvHPlayerUpgrade.h"
+#include "mod/AvHSpriteAPI.h"
+#include "mod/AvHSprites.h"
+
+using std::string;
+
+AvHTeamHierarchy::AvHTeamHierarchy(int wide,int tall) : StaticLabel(wide, tall)
+{
+    mFullScreen = false;
+}
+
+void AvHTeamHierarchy::SetFullScreen(bool inFullScreen)
+{
+    mFullScreen = inFullScreen;
+}
+
+void AvHTeamHierarchy::GetWorldPosFromMouse(int inMouseX, int inMouseY, float& outWorldX, float& outWorldY)
+{
+
+    AvHOverviewMap::DrawInfo theDrawInfo;
+    GetDrawInfo(theDrawInfo);    
+    
+    gHUD.GetOverviewMap().GetWorldPosFromMouse(theDrawInfo, inMouseX, inMouseY, outWorldX, outWorldY);
+
+}
+
+void AvHTeamHierarchy::paint()
+{
+
+    AvHOverviewMap::DrawInfo theDrawInfo;
+    GetDrawInfo(theDrawInfo);
+    
+    AvHSpriteEnableVGUI(true);
+    AvHSpriteSetVGUIOffset(theDrawInfo.mX, theDrawInfo.mY);
+
+    gHUD.GetOverviewMap().Draw(theDrawInfo);
+ 
+	// Evil awful hack that must be done for mouse cursors to work :(
+	gHUD.ComponentJustPainted(this);
+
+}
+
+void AvHTeamHierarchy::paintBackground()
+{
+}
+
+void AvHTeamHierarchy::GetDrawInfo(AvHOverviewMap::DrawInfo& outDrawInfo)
+{
+
+    getPos(outDrawInfo.mX, outDrawInfo.mY);
+    getSize(outDrawInfo.mWidth, outDrawInfo.mHeight);
+    
+    AvHOverviewMap& theOverviewMap = gHUD.GetOverviewMap();
+    
+    AvHMapExtents theMapExtents;
+    theOverviewMap.GetMapExtents(theMapExtents);
+
+    outDrawInfo.mFullScreen = mFullScreen;
+
+    if (this->mFullScreen)
+	{
+
+		float worldWidth  = theMapExtents.GetMaxMapX() - theMapExtents.GetMinMapX();
+		float worldHeight = theMapExtents.GetMaxMapY() - theMapExtents.GetMinMapY();
+	
+		float xScale;
+		float yScale;
+
+		float aspect1 = worldWidth / worldHeight;
+        float aspect2 = ((float)outDrawInfo.mWidth) / outDrawInfo.mHeight; 
+        
+        if (aspect1 > aspect2)
+		{
+			xScale = 1;
+			yScale = 1 / aspect2;
+		}
+		else
+		{
+			xScale = aspect2;
+			yScale = 1;
+        }
+
+		float centerX = (theMapExtents.GetMinMapX() + theMapExtents.GetMaxMapX()) / 2;
+		float centerY = (theMapExtents.GetMinMapY() + theMapExtents.GetMaxMapY()) / 2;
+        
+        outDrawInfo.mViewWorldMinX = centerX - worldWidth  * xScale * 0.5;
+        outDrawInfo.mViewWorldMinY = centerY - worldHeight * yScale * 0.5;
+        outDrawInfo.mViewWorldMaxX = centerX + worldWidth  * xScale * 0.5;
+        outDrawInfo.mViewWorldMaxY = centerY + worldHeight * yScale * 0.5;
+    
+    }
+	else
+	{
+
+        float worldViewWidth = 800.0f;
+        
+        float aspectRatio = (float)(outDrawInfo.mHeight) / outDrawInfo.mWidth;
+	
+        float thePlayerX;
+        float thePlayerY;
+
+        theOverviewMap.GetWorldPosition(thePlayerX, thePlayerY);
+
+        outDrawInfo.mViewWorldMinX = thePlayerX - worldViewWidth;
+        outDrawInfo.mViewWorldMinY = thePlayerY - worldViewWidth * aspectRatio;
+        outDrawInfo.mViewWorldMaxX = thePlayerX + worldViewWidth;
+        outDrawInfo.mViewWorldMaxY = thePlayerY + worldViewWidth * aspectRatio;
+    
+    }
+
+}
+
+
+
+AvHUITeamHierarchy::AvHUITeamHierarchy(void)
+{
+    this->mType = "TeamHierarchy";
+}
+
+void AvHUITeamHierarchy::AllocateComponent(const TRDescription& inDesc)
+{
+    // Width and height (normalized screen coords)
+    float theWidth = UIDefaultWidth;
+    float theHeight = UIDefaultHeight;
+    inDesc.GetTagValue(UITagWidth, theWidth);
+    inDesc.GetTagValue(UITagHeight, theHeight);
+	
+    this->mHierarchyComponent = new AvHTeamHierarchy(theWidth*ScreenWidth(), theHeight*ScreenHeight());
+}
+                            
+// Destructor automatically removes component from the engine
+AvHUITeamHierarchy::~AvHUITeamHierarchy(void)
+{
+    delete this->mHierarchyComponent;
+    this->mHierarchyComponent = NULL;
+}
+
+Panel* AvHUITeamHierarchy::GetComponentPointer(void)
+{
+    return this->mHierarchyComponent;
+}
+
+const string& AvHUITeamHierarchy::GetType(void) const
+{
+    return this->mType;
+}
+
+bool AvHUITeamHierarchy::SetClassProperties(const TRDescription& inDesc, Panel* inComponent, CSchemeManager* inSchemeManager)
+{
+    bool theSuccess = false;
+
+    // read custom attributes here
+    UIStaticLabel::SetClassProperties(inDesc, inComponent, inSchemeManager);
+
+    // Get font to use
+    std::string theSchemeName;
+    if(inDesc.GetTagValue(UITagScheme, theSchemeName))
+    {
+        AvHTeamHierarchy* theHierarchy = dynamic_cast<AvHTeamHierarchy*>(inComponent);
+        if(theHierarchy)
+        {
+            const char* theSchemeCString = theSchemeName.c_str();
+            SchemeHandle_t theSchemeHandle = inSchemeManager->getSchemeHandle(theSchemeCString);
+        	Font* theFont = inSchemeManager->getFont(theSchemeHandle);
+            if(theFont)
+            {
+                theHierarchy->setFont(theFont);
+            }
+
+            theSuccess = true;
+        }
+    }
+
+    return theSuccess;
+}
+
diff --git a/main/source/mod/AvHTeamHierarchy.h b/main/source/mod/AvHTeamHierarchy.h
new file mode 100644
index 00000000..61fa3b2d
--- /dev/null
+++ b/main/source/mod/AvHTeamHierarchy.h
@@ -0,0 +1,58 @@
+#ifndef AVHTEAMHIERARCHY_H
+#define AVHTEAMHIERARCHY_H
+
+#include "ui/UIComponents.h"
+#include "VGUI_TextPanel.h"
+#include "mod/AvHEntityHierarchy.h"
+#include "ui/StaticLabel.h"
+#include "mod/AvHMapExtents.h"
+
+using vgui::Panel;
+using vgui::TextPanel;
+
+
+class AvHTeamHierarchy : public StaticLabel
+{										                                                                                                            
+public:
+									AvHTeamHierarchy(int wide,int tall);
+
+	void							SetFullScreen(bool inFullScreen);
+	void							GetWorldPosFromMouse(int inMouseX, int inMouseY, float& outWorldX, float& outWorldY);
+
+protected:
+
+    void                            GetDrawInfo(AvHOverviewMap::DrawInfo& outDrawInfo);
+    virtual void					paint();
+    virtual void                    paintBackground();
+
+    bool                            mFullScreen;
+
+};
+
+
+
+class AvHUITeamHierarchy : public UIStaticLabel
+{
+public:
+	                        AvHUITeamHierarchy(void);
+                            
+	                        // Destructor automatically removes component from the engine
+	                        virtual ~AvHUITeamHierarchy(void);
+
+	virtual Panel*			GetComponentPointer(void);
+
+	virtual const string&	GetType(void) const;
+
+	virtual bool			SetClassProperties(const TRDescription& inDescription, Panel* inComponent, CSchemeManager* inSchemeManager);
+
+private:
+
+	void                    AllocateComponent(const TRDescription& inDescription);
+
+    AvHTeamHierarchy*       mHierarchyComponent;
+
+    string                  mType;
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHTechID.h b/main/source/mod/AvHTechID.h
new file mode 100644
index 00000000..c2b2f6fc
--- /dev/null
+++ b/main/source/mod/AvHTechID.h
@@ -0,0 +1,134 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHTechID.h $
+// $Date: 2002/09/23 22:35:52 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHTechID.h,v $
+// Revision 1.8  2002/09/23 22:35:52  Flayra
+// - Regular update
+//
+// Revision 1.7  2002/07/23 17:32:46  Flayra
+// - Regular update
+//
+// Revision 1.6  2002/06/25 18:22:34  Flayra
+// - Renamed buildings
+//
+// Revision 1.5  2002/06/03 17:01:06  Flayra
+// - Renamed weapons factory and armory
+//
+// Revision 1.4  2002/05/23 02:32:57  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_TECH_ID_H
+#define AVH_TECH_ID_H
+
+typedef enum
+{
+	TECH_NULL = 0,
+
+	// Build tech (unlocked when there is at least one building of this type)
+	TECH_COMMAND_CENTER = 1,
+	//TECH_REINFORCEMENTS = 2,
+	TECH_TURRET_FACTORY = 3,
+	//TECH_ADVANCED_TURRET_FACTORY = 4,
+	TECH_ARMSLAB = 5,
+	TECH_PROTOTYPE_LAB = 6,
+	TECH_CHEMLAB = 7,
+	TECH_ARMORY = 8,
+	TECH_ADVANCED_ARMORY = 9,
+	TECH_NUKE_PLANT = 10,
+	TECH_RESOURCES = 11,
+	TECH_OBSERVATORY = 12,
+	TECH_PHASE_GATE = 13,
+	TECH_MEDLAB = 14,
+	TECH_INFANTRYPORTAL = 15,
+
+	// Research tech (permanently unlocked after researching it)
+	TECH_RESEARCH_ELECTRICAL = 19,
+	TECH_RESEARCH_ARMOR_ONE = 20,
+	TECH_RESEARCH_ARMOR_TWO = 21,
+	TECH_RESEARCH_ARMOR_THREE = 22,
+	TECH_RESEARCH_WEAPONS_ONE = 23,
+	TECH_RESEARCH_WEAPONS_TWO = 24,
+	TECH_RESEARCH_WEAPONS_THREE = 25,
+
+	TECH_ADVANCED_TURRET_FACTORY = 26,
+
+	TECH_RESEARCH_JETPACKS = 28,
+	TECH_RESEARCH_HEAVYARMOR = 29,
+
+	TECH_RESEARCH_DISTRESSBEACON = 30,
+	TECH_RESEARCH_HEALTH = 31,
+	// 32 is cancel, although there's no real reason to keep these contants lined up, just makes it easier to think about
+	TECH_RESEARCH_MOTIONTRACK = 33,
+	TECH_RESEARCH_PHASETECH = 34,
+
+    TECH_RESEARCH_CATALYSTS = 35,
+    TECH_RESEARCH_GRENADES = 36,
+
+    // Alien tech
+    TECH_HIVE = 39,
+    TECH_ONE_HIVE = 40,
+    TECH_TWO_HIVES = 41,
+    TECH_THREE_HIVES = 42,
+    TECH_SKULK = 43,
+    TECH_GORGE = 44,
+    TECH_LERK = 45,
+    TECH_FADE = 46,
+    TECH_ONOS = 47,
+    TECH_MOVEMENT_CHAMBER = 48,
+    TECH_DEFENSE_CHAMBER = 49,
+    TECH_SENSORY_CHAMBER = 50,
+    TECH_OFFENSE_CHAMBER = 51,
+    TECH_ALIEN_RESOURCE_NODE = 52,
+    
+	// Generic tech levels for combat game mode
+	TECH_ONE_LEVEL_ONE = 60,
+	TECH_ONE_LEVEL_TWO = 61,
+	TECH_ONE_LEVEL_THREE = 62,
+	TECH_ONE_LEVEL_FOUR = 63,
+	TECH_ONE_LEVEL_FIVE = 64,
+
+	TECH_TWO_LEVEL_ONE = 65,
+	TECH_TWO_LEVEL_TWO = 66,
+	TECH_TWO_LEVEL_THREE = 67,
+	TECH_TWO_LEVEL_FOUR = 68,
+	TECH_TWO_LEVEL_FIVE = 69,
+
+	TECH_THREE_LEVEL_ONE = 70,
+	TECH_THREE_LEVEL_TWO = 71,
+	TECH_THREE_LEVEL_THREE = 72,
+	TECH_THREE_LEVEL_FOUR = 73,
+	TECH_THREE_LEVEL_FIVE = 74,
+	
+	TECH_FOUR_LEVEL_ONE = 75,
+	TECH_FOUR_LEVEL_TWO = 76,
+	TECH_FOUR_LEVEL_THREE = 77,
+	TECH_FOUR_LEVEL_FOUR = 78,
+	TECH_FOUR_LEVEL_FIVE = 79,
+	
+	TECH_FIVE_LEVEL_ONE = 80,
+	TECH_FIVE_LEVEL_TWO = 81,
+	TECH_FIVE_LEVEL_THREE = 82,
+	TECH_FIVE_LEVEL_FOUR = 83,
+	TECH_FIVE_LEVEL_FIVE = 84,
+
+	TECH_PLAYER_TIER_ONE = 85,
+	TECH_PLAYER_TIER_TWO = 86,
+	TECH_PLAYER_TIER_THREE = 87,
+
+    // Gives a way to add a technology to the tech tree that will never become available
+    TECH_PLAYER_UNAVAILABLE = 88
+	
+} AvHTechID;
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHTechImpulsePanel.cpp b/main/source/mod/AvHTechImpulsePanel.cpp
new file mode 100644
index 00000000..c0a55e6d
--- /dev/null
+++ b/main/source/mod/AvHTechImpulsePanel.cpp
@@ -0,0 +1,229 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHTechImpulsePanel.cpp $
+// $Date: 2002/08/16 02:28:55 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHTechImpulsePanel.cpp,v $
+// Revision 1.3  2002/08/16 02:28:55  Flayra
+// - Added document headers
+//
+//===============================================================================
+#include "mod/AvHTechImpulsePanel.h"
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+#include "ui/UITags.h"
+
+AvHTechImpulsePanel::AvHTechImpulsePanel() : Label(), mTextImage("")
+{
+	this->mMessageID = MESSAGE_NULL;
+	this->mVisualNumber = -1;
+	this->mDrawNumberRange = -1;
+}
+
+AvHTechImpulsePanel::AvHTechImpulsePanel(int inXPos, int inYPos, int inWidth, int inHeight) : Label(" ", inXPos, inYPos, inWidth, inHeight), mTextImage("")
+{
+}
+
+AvHMessageID AvHTechImpulsePanel::GetMessageID() const
+{
+	return this->mMessageID;
+}
+
+void AvHTechImpulsePanel::SetDrawNumberRange(int inRange)
+{
+	this->mDrawNumberRange = inRange;
+}
+
+void AvHTechImpulsePanel::SetMessageID(AvHMessageID inImpulse)
+{
+	this->mMessageID = inImpulse;
+}
+
+void AvHTechImpulsePanel::SetVisualNumber(int inNumber)
+{
+	this->mVisualNumber = inNumber;
+}
+
+
+void AvHTechImpulsePanel::paint()
+{
+	//Label::paint();
+
+	if((this->mDrawNumberRange >= 0) && (this->mVisualNumber >= this->mDrawNumberRange))
+	{
+		int thePosX, thePosY;
+		this->getPos(thePosX, thePosY);
+		
+		int theWidth, theHeight;
+		this->getSize(theWidth, theHeight);
+		
+		int theFlags = (this->mVisualNumber < 10) ? 0 : DHN_2DIGITS;
+
+		char theNumberString[5];
+		sprintf(theNumberString, "%d", this->mVisualNumber);
+		int theLength = strlen(theNumberString);
+		
+		int theTextWidth, theTextHeight;
+		this->GetTextExtents(theTextWidth, theTextHeight);
+
+		this->drawSetTextColor(255, 255, 255, 0);
+
+		this->drawPrintText(theWidth - theTextWidth, theHeight - theTextHeight, theNumberString, theLength);
+	}
+}
+
+bool AvHTechImpulsePanel::GetTextExtents(int& outWidth, int& outHeight)
+{
+	bool theSuccess = false;
+
+	if((this->mDrawNumberRange >= 0) && (this->mVisualNumber >= this->mDrawNumberRange))
+	{
+		int theFlags = (this->mVisualNumber < 10) ? 0 : DHN_2DIGITS;
+		
+		char theNumberString[5];
+		sprintf(theNumberString, "%d", this->mVisualNumber);
+		
+		this->mTextImage.setText(theNumberString);
+		this->mTextImage.getTextSize(outWidth, outHeight);
+		
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+void AvHTechImpulsePanel::setFont(Scheme::SchemeFont schemeFont)
+{
+	Label::setFont(schemeFont);
+	this->mTextImage.setFont(schemeFont);
+}
+
+void AvHTechImpulsePanel::setFont(Font* font)
+{
+	Label::setFont(font);
+	this->mTextImage.setFont(font);
+}
+
+void AvHTechImpulsePanel::paintBackground()
+{
+	int theTextWidth, theTextHeight;
+	if(this->GetTextExtents(theTextWidth, theTextHeight))
+	{
+		int theXPos, theYPos;
+		this->getPos(theXPos, theYPos);
+		
+		int theWidth, theHeight;
+		this->getSize(theWidth, theHeight);
+
+		ASSERT(theWidth >= theTextWidth);
+		ASSERT(theHeight >= theTextHeight);
+
+		FillRGBA(0 + (theWidth - theTextWidth), 0 - (theHeight - theTextHeight), theTextWidth, theTextHeight, 0, 0, 0, 128);
+		//FillRGBA(0, 0, theWidth, theHeight, 128, 128, 128, 128);
+	}
+
+//	Panel::paintBackground();
+//
+//	int r, g, b, a;
+//	this->getBgColor(r, g, b, a);
+//
+//	int theXPos, theYPos;
+//	this->getPos(theXPos, theYPos);
+//
+//	int theWidth, theHeight;
+//	this->getSize(theWidth, theHeight);
+//
+//	//FillRGBA(0, 0, theWidth, theHeight, r, g, b, a);
+//
+//	float theOptimalIncrement = (float)255/theHeight;
+//	int theStepSize = max(theOptimalIncrement, 1);
+//	a = 0;
+//	for(int i = 0; i < theHeight; i++)
+//	{
+//		// Fill lines across, getting darker
+//		FillRGBA(0, i, theWidth, 1, r, g, b, a);
+//		a = min(a+theStepSize, 255);
+//	}
+}
+
+
+//////////////////////////////////////
+// AvHUITechImpulsePanel -> UIPanel //
+//////////////////////////////////////
+void AvHUITechImpulsePanel::AllocateComponent(const TRDescription& inDesc)
+{
+    // Position (normalized screen coords)
+    float theXPos = UIDefaultXPos;
+    float theYPos = UIDefaultYPos;
+    inDesc.GetTagValue(UITagXPos, theXPos);
+    inDesc.GetTagValue(UITagYPos, theYPos);
+	
+    // Width and height (normalized screen coords)
+    float theWidth = UIDefaultWidth;
+    float theHeight = UIDefaultHeight;
+    inDesc.GetTagValue(UITagWidth, theWidth);
+    inDesc.GetTagValue(UITagHeight, theHeight);
+	
+	this->mComponent = new AvHTechImpulsePanel(theXPos*ScreenWidth(), theYPos*ScreenHeight(), theWidth*ScreenWidth(), theHeight*ScreenHeight());
+}
+
+Panel* AvHUITechImpulsePanel::GetComponentPointer(void)
+{
+	return this->mComponent;
+}
+
+bool AvHUITechImpulsePanel::SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager)
+{
+    AvHTechImpulsePanel* theComponent = (AvHTechImpulsePanel*)inPanel;
+	
+    bool theSuccess = UILabel::SetClassProperties(inDesc, inPanel, inSchemeManager);
+    
+    if(theSuccess)
+    {
+		int theImpulse = 0;
+		if(inDesc.GetTagValue("impulse", theImpulse))
+		{
+			theComponent->SetMessageID(AvHMessageID(theImpulse));
+		}
+
+		int theDrawNumber = 0;
+		if(inDesc.GetTagValue("drawnumber", theDrawNumber))
+		{
+			theComponent->SetDrawNumberRange(theDrawNumber);
+		}
+
+		theSuccess = true;
+	}
+	
+	return theSuccess;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/main/source/mod/AvHTechImpulsePanel.h b/main/source/mod/AvHTechImpulsePanel.h
new file mode 100644
index 00000000..85fb3306
--- /dev/null
+++ b/main/source/mod/AvHTechImpulsePanel.h
@@ -0,0 +1,70 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: TechImpulse.h $
+// $Date: 2002/08/16 02:28:55 $
+//
+//-------------------------------------------------------------------------------
+// $Log: TechImpulse.h,v $
+// Revision 1.3  2002/08/16 02:28:55  Flayra
+// - Added document headers
+//
+//===============================================================================
+#ifndef AVHTECHIMPULSEPANEL_H
+#define AVHTECHIMPULSEPANEL_H
+
+#include "vgui_Label.h"
+#include "mod/AvHMessage.h"
+#include "ui/UIComponents.h"
+#include "VGUI_TextImage.h"
+#include "ui/FakeTextImage.h"
+
+class AvHTechImpulsePanel : public vgui::Label
+{
+public:
+					AvHTechImpulsePanel();
+					AvHTechImpulsePanel(int inXPos, int inYPos, int inWidth, int inHeight);
+
+	AvHMessageID	GetMessageID() const;
+
+	void			SetDrawNumberRange(int inRange);
+	void			SetMessageID(AvHMessageID inImpulse);
+	void			SetVisualNumber(int inNumber);
+
+	virtual void	setFont(Scheme::SchemeFont schemeFont);
+	virtual void	setFont(Font* font);
+					
+protected:
+	bool			GetTextExtents(int& outWidth, int& outHeight);
+	virtual void	paint();
+	virtual void	paintBackground();
+
+private:
+	AvHMessageID	mMessageID;
+	int				mVisualNumber;
+    FakeTextImage   mTextImage;
+	int				mDrawNumberRange;
+};
+
+class AvHUITechImpulsePanel : public UILabel
+{
+public:
+	virtual Panel*			GetComponentPointer(void);
+	
+    virtual bool			SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager);
+	
+private:
+	
+	void                    AllocateComponent(const TRDescription& inDescription);
+	
+    AvHTechImpulsePanel*	mComponent;
+};
+
+
+#endif
diff --git a/main/source/mod/AvHTechNodes.cpp b/main/source/mod/AvHTechNodes.cpp
new file mode 100644
index 00000000..8f61e90a
--- /dev/null
+++ b/main/source/mod/AvHTechNodes.cpp
@@ -0,0 +1,836 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHTechNodes.cpp $
+// $Date: 2002/09/23 22:36:08 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHTechNodes.cpp,v $
+// Revision 1.9  2002/09/23 22:36:08  Flayra
+// - Slight refactoring
+//
+// Revision 1.8  2002/07/08 17:20:32  Flayra
+// - Added hooks to support disallowing actions when a building is "busy"
+//
+//===============================================================================
+#include "util/nowarnings.h"
+#include "mod/AvHTechNodes.h"
+
+#ifdef AVH_SERVER
+#include "extdll.h"
+#include "util.h"
+#endif
+
+#ifdef AVH_CLIENT
+#include "cl_dll/parsemsg.h"
+#endif
+
+// Prototype here instead of include to prevent vec3_t nightmare
+bool AvHSHUGetIsResearchTech(AvHMessageID inMessageID);
+
+AvHTechNode::AvHTechNode()
+{
+	this->mMessageID = MESSAGE_NULL;
+	this->mTechID = this->mPrereqID1 = this->mPrereqID2 = TECH_NULL;
+	this->mCost = -1;
+	this->mBuildTime = 1;
+	this->mResearchable = true;
+	this->mResearched = false;
+	this->mAllowMultiples = false;
+}
+
+AvHTechNode::AvHTechNode(AvHMessageID inMessageID, AvHTechID inID, AvHTechID inPrereq1, AvHTechID inPrereq2, int inCost, int inBuildTime, bool inResearched)
+{
+	this->mMessageID = inMessageID;
+	this->mTechID = inID;
+	this->mPrereqID1 = inPrereq1;
+	this->mPrereqID2 = inPrereq2;
+	this->mCost = inCost;
+	this->mBuildTime = inBuildTime;
+	this->mResearchable = true;
+	this->mResearched = inResearched;
+	this->mAllowMultiples = false;
+}
+
+bool AvHTechNode::GetAllowMultiples() const
+{
+	return this->mAllowMultiples;
+}
+
+AvHMessageID AvHTechNode::GetMessageID() const
+{
+	return this->mMessageID;
+}
+
+AvHTechID AvHTechNode::GetTechID() const
+{
+	return this->mTechID;
+}
+
+AvHTechID AvHTechNode::GetPrereqTechID1() const
+{
+	return this->mPrereqID1;
+}
+
+AvHTechID AvHTechNode::GetPrereqTechID2() const
+{
+	return this->mPrereqID2;
+}
+
+int	AvHTechNode::GetBuildTime() const
+{
+	return this->mBuildTime;
+}
+
+int	AvHTechNode::GetCost() const
+{
+	return this->mCost;
+}
+
+bool AvHTechNode::GetIsResearchable() const
+{
+	return this->mResearchable;
+}
+
+bool AvHTechNode::GetIsResearched() const
+{
+	return this->mResearched;
+}
+
+void AvHTechNode::SetAllowMultiples()
+{
+	this->mAllowMultiples = true;
+}
+
+void AvHTechNode::SetBuildTime(int inBuildTime)
+{
+	this->mBuildTime = inBuildTime;
+}
+
+void AvHTechNode::SetCost(int inCost)
+{
+	this->mCost = inCost;
+}
+
+void AvHTechNode::SetResearchable(bool inState)
+{
+	this->mResearchable = inState;
+}
+
+void AvHTechNode::SetResearchState(bool inState)
+{
+	this->mResearched = inState;
+
+	if(!this->GetAllowMultiples())
+	{
+		this->mResearchable = !this->mResearched;
+	}
+}
+
+#ifdef AVH_SERVER
+void AvHTechNode::SendToNetworkStream() const
+{
+	// Send tech node
+	WRITE_BYTE(this->mMessageID);
+	
+	WRITE_BYTE(this->mTechID);
+
+	// Send prereqs
+	WRITE_BYTE(this->mPrereqID1);
+	WRITE_BYTE(this->mPrereqID2);
+	
+	// Send cost
+	WRITE_SHORT(this->mCost);
+
+	// Send build time
+	WRITE_SHORT(this->mBuildTime);
+
+	// Send researchable, researched, multiples
+	WRITE_BYTE(this->mResearchable);
+	WRITE_BYTE(this->mResearched);
+	WRITE_BYTE(this->mAllowMultiples);
+}
+#endif						
+
+#ifdef AVH_CLIENT
+string AvHTechNode::GetLabel() const
+{
+	return this->mLabel;
+}
+
+void AvHTechNode::SetLabel(const string& inLabel)
+{
+	this->mLabel = inLabel;
+}
+
+string AvHTechNode::GetHelpText() const
+{
+	return this->mHelpText;
+}
+
+void AvHTechNode::SetHelpText(const string& inHelpText)
+{
+	this->mHelpText = inHelpText;
+}
+
+int	AvHTechNode::ReceiveFromNetworkStream()
+{
+	int theBytesRead = 0;
+
+	this->mMessageID = (AvHMessageID)READ_BYTE();
+	theBytesRead++;
+	
+	this->mTechID = (AvHTechID)READ_BYTE();
+	theBytesRead++;
+
+	this->mPrereqID1 = (AvHTechID)READ_BYTE();
+	theBytesRead++;
+
+	this->mPrereqID2 = (AvHTechID)READ_BYTE();
+	theBytesRead++;
+	
+	this->mCost = READ_SHORT();
+	theBytesRead += 2;
+
+	this->mBuildTime = READ_SHORT();
+	theBytesRead += 2;
+	
+	this->mResearchable = READ_BYTE();
+	theBytesRead++;
+
+	this->mResearched = READ_BYTE();
+	theBytesRead++;
+
+	this->mAllowMultiples = READ_BYTE();
+	theBytesRead++;
+	
+	return theBytesRead;
+}
+#endif
+
+bool AvHTechNode::operator==(const AvHTechNode& inTechNode) const
+{
+	bool theIsEqual = false;
+	
+	if(this->mMessageID == inTechNode.mMessageID)
+	{
+		if(this->mTechID == inTechNode.mTechID)
+		{
+			if(this->mPrereqID1 == inTechNode.mPrereqID1)
+			{
+				if(this->mPrereqID2 == inTechNode.mPrereqID2)
+				{
+					if(this->mCost == inTechNode.mCost)
+					{
+						if(this->mBuildTime == inTechNode.mBuildTime)
+						{
+							if(this->mResearchable == inTechNode.mResearchable)
+							{
+								if(this->mResearched == inTechNode.mResearched)
+								{
+									if(this->mAllowMultiples == inTechNode.mAllowMultiples)
+									{
+
+#ifdef AVH_CLIENT
+										if(this->mHelpText == inTechNode.mHelpText)
+										{
+											if(this->mLabel == inTechNode.mLabel)
+											{
+#endif
+												theIsEqual = true;
+
+#ifdef AVH_CLIENT
+											}
+										}
+#endif
+
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return theIsEqual;
+}
+
+bool AvHTechNode::operator!=(const AvHTechNode& inTechNode) const
+{
+	return !this->operator==(inTechNode);
+}
+
+void AvHTechNode::operator=(const AvHTechNode& inTechNode)
+{
+	this->mMessageID = inTechNode.mMessageID;
+	this->mTechID = inTechNode.mTechID;
+	this->mCost = inTechNode.mCost;
+	this->mPrereqID1 = inTechNode.mPrereqID1;
+	this->mPrereqID2 = inTechNode.mPrereqID2;
+	this->mBuildTime = inTechNode.mBuildTime;
+	this->mResearchable = inTechNode.mResearchable;
+	this->mResearched = inTechNode.mResearched;
+	this->mAllowMultiples = inTechNode.mAllowMultiples;
+
+	#ifdef AVH_CLIENT
+	this->mHelpText = inTechNode.mHelpText;
+	this->mLabel = inTechNode.mLabel;
+#endif
+}
+
+
+
+
+void AvHTechNodes::AddTechNode(const AvHTechNode& inTechNode)
+{
+	this->mTechNodes.push_back(inTechNode);
+}
+
+#ifdef AVH_PLAYTEST_BUILD
+	#ifdef AVH_SERVER
+
+	#include "mod/AvHGamerules.h"
+
+	void AvHTechNodes::BalanceChanged()
+	{
+		// Run through our tech nodes and update cost and build time
+		for(TechNodeListType::iterator theIter = this->mTechNodes.begin(); theIter != this->mTechNodes.end(); theIter++)
+		{
+			AvHMessageID theMessageID = theIter->GetMessageID();
+			
+			int theBuildTime = GetGameRules()->GetBuildTimeForMessageID(theMessageID);
+			if(theBuildTime != theIter->GetBuildTime())
+			{
+				theIter->SetBuildTime(theBuildTime);
+			}
+
+			int theCost = GetGameRules()->GetCostForMessageID(theMessageID);
+			if(theCost != theIter->GetCost())
+			{
+				theIter->SetCost(theCost);
+			}
+		}
+	}
+	#endif
+#endif
+
+void AvHTechNodes::Clear()
+{
+	this->mTechNodes.clear();
+}
+
+bool AvHTechNodes::GetAllowMultiples(AvHMessageID& inMessageID) const
+{
+	bool theAllowMultiples = false;
+
+	for(TechNodeListType::const_iterator theIter = this->mTechNodes.begin(); theIter != this->mTechNodes.end(); theIter++)
+	{
+		if(theIter->GetMessageID() == inMessageID)
+		{
+			theAllowMultiples = theIter->GetAllowMultiples();
+			break;
+		}
+	}
+
+	return theAllowMultiples; 
+}
+
+bool AvHTechNodes::GetIsMessageInTechTree(AvHMessageID& inMessageID) const
+{
+    bool theMessageIsInTechTree = false;
+
+    // Message must be in the tech tree
+    for(TechNodeListType::const_iterator theIter = this->mTechNodes.begin(); theIter != this->mTechNodes.end(); theIter++)
+    {
+        if(theIter->GetMessageID() == inMessageID)
+        {
+            theMessageIsInTechTree = true;
+            break;
+        }
+    }
+
+    if(!theMessageIsInTechTree)
+    {
+        int a = 0;
+    }
+
+    return theMessageIsInTechTree;
+}
+
+bool AvHTechNodes::GetIsMessageAvailable(AvHMessageID& inMessageID) const
+{
+	bool theMessageIsAvailable = false;
+
+	// Get prereqs for message
+    AvHTechID thePrereqOne = TECH_NULL;
+	AvHTechID thePrereqTwo = TECH_NULL;
+
+	// Are they both available?
+	if(this->GetPrequisiteForMessage(inMessageID, thePrereqOne, thePrereqTwo))
+	{
+	    if((thePrereqOne == TECH_NULL) || (this->GetIsTechResearched(thePrereqOne)))
+	    {
+		    if((thePrereqTwo == TECH_NULL) || (this->GetIsTechResearched(thePrereqTwo)))
+		    {
+			    theMessageIsAvailable = true;
+		    }
+	    }
+	}
+	else
+	{
+	    theMessageIsAvailable = true;
+	}
+
+	// Non-multiple research not available if researched
+	for(TechNodeListType::const_iterator theIter = this->mTechNodes.begin(); theIter != this->mTechNodes.end(); theIter++)
+	{
+	    if(theIter->GetMessageID() == inMessageID)
+	    {
+		    if(!theIter->GetAllowMultiples() && theIter->GetIsResearched())
+		    {
+			    theMessageIsAvailable = false;
+			    break;
+		    }
+	    }
+	}
+
+	return theMessageIsAvailable;
+}
+
+bool AvHTechNodes::GetIsMessageAvailableForSelection(AvHMessageID& inMessageID, EntityListType& inSelection) const
+{
+	bool theMessageIsAvailable = this->GetIsMessageAvailable(inMessageID);
+	return theMessageIsAvailable;
+}
+
+bool AvHTechNodes::GetIsTechResearched(AvHTechID inTech) const
+{
+	bool theTechIsResearched = false;
+	
+	for(TechNodeListType::const_iterator theIter = this->mTechNodes.begin(); theIter != this->mTechNodes.end(); theIter++)
+	{
+		if(theIter->GetTechID() == inTech)
+		{
+			theTechIsResearched = theIter->GetIsResearched();
+			break;
+		}
+	}
+	
+	return theTechIsResearched;
+}
+
+bool AvHTechNodes::SetFirstNodeWithTechResearchState(AvHTechID inTech, bool inState)
+{
+	bool theSuccess = false;
+	
+	for(TechNodeListType::iterator theIter = this->mTechNodes.begin(); theIter != this->mTechNodes.end(); theIter++)
+	{
+		if(theIter->GetTechID() == inTech)
+		{
+			theIter->SetResearchState(inState);
+			theSuccess = true;
+			break;
+		}
+	}
+	
+	return theSuccess;
+}
+
+bool AvHTechNodes::GetMessageForTech(const AvHTechID inTechID, AvHMessageID& outMessageID) const
+{
+	bool theSuccess = false;
+	
+	for(TechNodeListType::const_iterator theIter = this->mTechNodes.begin(); theIter != this->mTechNodes.end(); theIter++)
+	{
+		if(theIter->GetTechID() == inTechID)
+		{
+			outMessageID = theIter->GetMessageID();
+			theSuccess = true;
+			break;
+		}
+	}
+	
+	return theSuccess;
+}
+
+AvHMessageID AvHTechNodes::GetNextMessageNeededFor(AvHMessageID inMessageID) const
+{
+	AvHMessageID theNextMessage = inMessageID;
+
+	// while theNextMessage isn't available for research
+	bool theIsDone = false;
+
+	do 
+	{
+		int theBottleNeckCost = 0;
+		float theBottleNeckTime = 0;
+
+		bool theIsAvailable = false;
+		this->GetResearchInfo(theNextMessage, theIsAvailable, theBottleNeckCost, theBottleNeckTime);
+
+		AvHTechID theTechID = TECH_NULL;
+		if(this->GetTechForMessage(theNextMessage, theTechID))
+		{
+			// Looking for first tech that isn't researched, but has prereqs researched or NULL
+			if(!this->GetIsTechResearched(theTechID))
+			{
+				do 
+				{
+					AvHTechID thePrereqID1;
+					AvHTechID thePrereqID2;
+					if(this->GetPrequisiteForMessage(theNextMessage, thePrereqID1, thePrereqID2))
+					{
+						// If both prereqs are researched or NULL, then theNextMessage is right
+						for(int i = 0; i < 2; i++)
+						{
+							AvHTechID theCurrentPrereq = ((i == 0) ? thePrereqID1 : thePrereqID2);
+							if((theCurrentPrereq == TECH_NULL) || this->GetIsTechResearched(theCurrentPrereq))
+							{
+								theIsDone = true;
+							}
+							// else dig deeper
+							else
+							{
+								if(this->GetMessageForTech(theCurrentPrereq, theNextMessage))
+								{
+									i = 2;
+								}
+							}
+						}
+					}
+					else
+					{
+						theIsDone = true;
+					}
+				}
+				while (!theIsDone);
+			}
+			else
+			{
+				theIsDone = true;
+			}
+		}
+		else
+		{
+			theIsDone = true;
+		}
+	} 
+	while(!theIsDone);
+
+	return theNextMessage;
+}
+
+void AvHTechNodes::GetResearchNodesDependentOn(AvHTechID inTechID, TechNodeListType& outTechNodes) const
+{
+	if(inTechID != TECH_NULL)
+	{
+		// Add all techs that directly depend on this one
+		for(TechNodeListType::const_iterator theIter = this->mTechNodes.begin(); theIter != this->mTechNodes.end(); theIter++)
+		{
+            AvHMessageID theMessageID = theIter->GetMessageID();
+
+			if(AvHSHUGetIsResearchTech(theMessageID) && ((theIter->GetPrereqTechID1() == inTechID) || (theIter->GetPrereqTechID2() == inTechID)))
+			{
+				AvHTechID theDependentID = theIter->GetTechID();
+				if(theDependentID != TECH_NULL)
+				{
+				    if(std::find(outTechNodes.begin(), outTechNodes.end(), *theIter) == outTechNodes.end())
+				    {
+					    // Add node
+					    outTechNodes.push_back(*theIter);
+
+					    // Add research nodes that are recursively dependent on this one
+					    this->GetResearchNodesDependentOn(theDependentID, outTechNodes);
+                    }
+				}
+			}
+		}
+	}
+}
+
+int	AvHTechNodes::GetNumNodes() const
+{
+	return this->mTechNodes.size();
+}
+
+bool AvHTechNodes::GetTechForMessage(const AvHMessageID inMessageID, AvHTechID& outTechID) const
+{
+	bool theSuccess = false;
+	
+	for(TechNodeListType::const_iterator theIter = this->mTechNodes.begin(); theIter != this->mTechNodes.end(); theIter++)
+	{
+		if(theIter->GetMessageID() == inMessageID)
+		{
+			outTechID = theIter->GetTechID();
+			theSuccess = true;
+			break;
+		}
+	}
+	
+	return theSuccess;
+}
+
+const TechNodeListType& AvHTechNodes::GetTechNodes() const
+{
+	return this->mTechNodes;
+}
+
+bool AvHTechNodes::GetPrequisiteForMessage(const AvHMessageID inMessageID, AvHTechID& outTech1, AvHTechID& outTech2) const
+{
+	bool theTechHasPrereq = false;
+	
+	for(TechNodeListType::const_iterator theIter = this->mTechNodes.begin(); theIter != this->mTechNodes.end(); theIter++)
+	{
+		if(theIter->GetMessageID() == inMessageID)
+		{
+			AvHTechID thePrereqTechID1 = theIter->GetPrereqTechID1();
+			AvHTechID thePrereqTechID2 = theIter->GetPrereqTechID2();
+			if((thePrereqTechID1 != TECH_NULL) || (thePrereqTechID2 != TECH_NULL))
+			{
+				outTech1 = thePrereqTechID1;
+				outTech2 = thePrereqTechID2;
+				theTechHasPrereq = true;
+			}
+			break;
+		}
+	}
+	
+	return theTechHasPrereq;
+}
+
+int	AvHTechNodes::GetNumTechNodes() const
+{
+	return this->mTechNodes.size();
+}
+
+bool AvHTechNodes::GetResearchInfo(AvHMessageID inTech, bool& outIsResearchable, int& outCost, float& outTime) const
+{
+	bool theFoundIt = false;
+	
+	outIsResearchable = false;
+	outCost = -1;
+	outTime = -1;
+
+	// Run through list, remembering previous node
+	for(TechNodeListType::const_iterator theIter = this->mTechNodes.begin(); theIter != this->mTechNodes.end(); theIter++)
+	{
+		// If node found, make sure previous node is empty or researched
+		//if(theIter->GetTechID() == inTech)
+		if(theIter->GetMessageID() == inTech)
+		{
+			// Fill in info
+			theFoundIt = true;
+
+			outCost = theIter->GetCost();
+			outTime = (float)theIter->GetBuildTime();
+			outIsResearchable = theIter->GetIsResearchable();
+			
+			//			AvHTechID thePrereq = theIter->GetPrereqTechID();
+			//			if((thePrereq == TECH_NULL) || (this->GetIsTechResearched(thePrereq)))
+			//			{
+			//				outIsResearchable = true;
+			//			}
+			break;
+		}
+	}
+	
+	return theFoundIt;
+}
+
+bool AvHTechNodes::GetTechNode(int inOffset, AvHTechNode& outTechNode) const
+{
+	bool theFoundTechNode = false;
+	
+	if(inOffset < (signed)this->mTechNodes.size())
+	{
+		outTechNode = this->mTechNodes[inOffset];
+		theFoundTechNode = true;
+	}
+	
+	return theFoundTechNode;
+}
+
+bool AvHTechNodes::GetTechNode(AvHMessageID inMessageID, AvHTechNode& outTechNode) const
+{
+	bool theSuccess = false;
+
+	for(TechNodeListType::const_iterator theIter = this->mTechNodes.begin(); theIter != this->mTechNodes.end(); theIter++)
+	{
+		if(theIter->GetMessageID() == inMessageID)
+		{
+			outTechNode = *theIter;
+			theSuccess = true;
+			break;
+		}
+	}
+
+	return theSuccess;
+}
+
+bool AvHTechNodes::SetIsResearchable(AvHMessageID inMessageID, bool inState)
+{
+    bool theSuccess = false;
+
+    for(TechNodeListType::iterator theIter = this->mTechNodes.begin(); theIter != this->mTechNodes.end(); theIter++)
+    {
+        if(theIter->GetMessageID() == inMessageID)
+        {
+            theIter->SetResearchable(inState);
+            theSuccess = true;
+            break;
+        }
+    }
+
+    return theSuccess;
+}
+
+bool AvHTechNodes::SetResearchDone(AvHMessageID inMessageID, bool inState)
+{
+	bool theSuccess = false;
+	
+	for(TechNodeListType::iterator theIter = this->mTechNodes.begin(); theIter != this->mTechNodes.end(); theIter++)
+	{
+		if(theIter->GetMessageID() == inMessageID)
+		{
+			theIter->SetResearchState(inState);
+			theSuccess = true;
+			break;
+		}
+	}
+	
+	return theSuccess;
+}
+
+
+bool AvHTechNodes::SetTechNode(int inOffset, const AvHTechNode& inTechNode)
+{
+	bool theSuccess = false;
+	
+	if(inOffset < (signed)this->mTechNodes.size())
+	{
+		this->mTechNodes[inOffset] = inTechNode;
+		theSuccess = true;
+	}
+	else if(inOffset == (signed)this->mTechNodes.size())
+	{
+		this->mTechNodes.push_back(inTechNode);
+		theSuccess = true;
+	}
+	else
+	{
+		ASSERT(false);
+	}
+	
+	return theSuccess;
+}
+
+void AvHTechNodes::TriggerAddTech(AvHTechID inTechID)
+{
+	for(TechNodeListType::iterator theIter = this->mTechNodes.begin(); theIter != this->mTechNodes.end(); theIter++)
+	{
+		if(theIter->GetTechID() == inTechID)
+		{
+			theIter->SetResearchState(true);
+		}
+	}
+}
+
+void AvHTechNodes::TriggerRemoveTech(AvHTechID inTechID)
+{
+	for(TechNodeListType::iterator theIter = this->mTechNodes.begin(); theIter != this->mTechNodes.end(); theIter++)
+	{
+		if(theIter->GetTechID() == inTechID)
+		{
+			theIter->SetResearchState(false);
+		}
+	}
+}
+
+bool AvHTechNodes::operator!=(const AvHTechNodes& inTechNodes) const
+{
+	return !this->operator==(inTechNodes);
+}
+
+bool AvHTechNodes::operator==(const AvHTechNodes& inTechNodes) const
+{
+	bool theAreEqual = false;
+	
+	if(this->mTechNodes == inTechNodes.mTechNodes)
+	{
+		theAreEqual = true;
+	}
+	
+	return theAreEqual;
+}
+
+void AvHTechNodes::operator=(const AvHTechNodes& inTechNodes)
+{
+	this->mTechNodes = inTechNodes.mTechNodes;
+}
+
+//#ifdef AVH_SERVER
+//void AvHTechNodes::SendToNetworkStream() const
+//{
+//	// send num nodes
+//	int theNumNodes = this->mTechNodes.size();
+//	WRITE_SHORT(theNumNodes);
+//	
+//	// for each one
+//	for(TechNodeListType::const_iterator theIterator = this->mTechNodes.begin(); theIterator != this->mTechNodes.end(); theIterator++)
+//	{
+//		theIterator->SendToNetworkStream();
+//	}
+//}
+//#endif						
+//
+//#ifdef AVH_CLIENT
+//int	AvHTechNodes::ReceiveFromNetworkStream()
+//{
+//	int theBytesRead = 0;
+//
+//	this->Clear();
+//
+//	int theNumNodes = READ_SHORT();
+//	theBytesRead += 2;
+//
+//	for(int i = 0; i < theNumNodes; i++)
+//	{
+//		AvHTechNode theTechNode;
+//		theBytesRead += theTechNode.ReceiveFromNetworkStream();
+//		this->mTechNodes.push_back(theTechNode);
+//	}
+//	
+//	return theBytesRead;
+//}
+//#endif
+	
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/main/source/mod/AvHTechNodes.h b/main/source/mod/AvHTechNodes.h
new file mode 100644
index 00000000..b0de8929
--- /dev/null
+++ b/main/source/mod/AvHTechNodes.h
@@ -0,0 +1,143 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHTechNodes.h $
+// $Date: 2002/09/23 22:36:08 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHTechNodes.h,v $
+// Revision 1.7  2002/09/23 22:36:08  Flayra
+// - Slight refactoring
+//
+// Revision 1.6  2002/07/08 17:20:32  Flayra
+// - Added hooks to support disallowing actions when a building is "busy"
+//
+//===============================================================================
+#ifndef AVHTECHNODES_H
+#define AVHTECHNODES_H
+
+#include "types.h"
+#include "mod/AvHConstants.h"
+#include "mod/AvHMessage.h"
+#include "mod/AvHTechID.h"
+
+class AvHTechNode
+{
+public:
+					AvHTechNode();
+					AvHTechNode(AvHMessageID inMessageID, AvHTechID inID, AvHTechID inPrereq1, AvHTechID inPrereq2, int inCost, int inBuildTime, bool inResearched = false);
+
+	bool			GetAllowMultiples() const;
+	AvHMessageID	GetMessageID() const;
+	AvHTechID		GetTechID() const;
+	AvHTechID		GetPrereqTechID1() const;
+	AvHTechID		GetPrereqTechID2() const;
+	int				GetCost() const;
+	int				GetBuildTime() const;
+
+	bool			GetIsResearchable() const;
+	bool			GetIsResearched() const;
+	void			SetAllowMultiples();
+	void			SetBuildTime(int inBuildTime);
+	void			SetCost(int inCost);
+	void			SetResearchable(bool inState = true);
+	void			SetResearchState(bool inState);
+
+	#ifdef AVH_SERVER
+	void			SendToNetworkStream() const;
+	#endif						
+	
+	#ifdef AVH_CLIENT
+	string			GetLabel() const;
+	void			SetLabel(const string& inLabel);
+	
+	string			GetHelpText() const;
+	void			SetHelpText(const string& inHelpText);
+	
+	int				ReceiveFromNetworkStream();
+	#endif
+
+	bool			operator==(const AvHTechNode& inTechNode) const;
+	bool			operator!=(const AvHTechNode& inTechNode) const;
+	void			operator=(const AvHTechNode& inTechNode);
+	
+private:
+	// Adding a member?  Change the operator== and operator = functions too
+	AvHMessageID	mMessageID;
+	AvHTechID		mTechID;
+	AvHTechID		mPrereqID1;
+	AvHTechID		mPrereqID2;
+	int				mCost;
+	int				mBuildTime;
+
+	bool			mResearchable;
+	bool			mResearched;
+	bool			mAllowMultiples;
+
+	#ifdef AVH_CLIENT
+	string			mLabel;
+	string			mHelpText;
+	#endif
+};
+
+typedef vector<AvHTechNode>		TechNodeListType;
+
+class AvHTechNodes
+{
+public:
+	void					AddTechNode(const AvHTechNode& inTechNode);
+	
+	#ifdef AVH_PLAYTEST_BUILD
+		#ifdef AVH_SERVER
+		void				BalanceChanged();
+		#endif
+	#endif
+
+	void					Clear();
+	bool					GetAllowMultiples(AvHMessageID& inMessageID) const;
+	bool					GetIsMessageAvailable(AvHMessageID& inMessageID) const;
+	bool					GetIsMessageAvailableForSelection(AvHMessageID& inMessageID, EntityListType& inSelection) const;
+    bool                    GetIsMessageInTechTree(AvHMessageID& inMessageID) const;
+	bool					GetIsTechResearched(AvHTechID inTech) const;
+	bool					GetMessageForTech(const AvHTechID inTechID, AvHMessageID& outMessageID) const;
+	AvHMessageID			GetNextMessageNeededFor(AvHMessageID inMessageID) const;
+	void					GetResearchNodesDependentOn(AvHTechID inTechID, TechNodeListType& outTechNodes) const;
+	int						GetNumNodes() const;
+	bool					GetTechForMessage(const AvHMessageID inMessageID, AvHTechID& outTechID) const;
+	const TechNodeListType& GetTechNodes() const;
+	bool					GetPrequisiteForMessage(const AvHMessageID inMessageID, AvHTechID& outTech1, AvHTechID& outTech2) const;
+	int						GetNumTechNodes() const;
+	bool					GetResearchInfo(AvHMessageID inTech, bool& outIsResearchable, int& outCost, float& outTime) const;
+	bool					GetTechNode(int inOffset, AvHTechNode& outTechNode) const;
+	bool					GetTechNode(AvHMessageID inMessageID, AvHTechNode& outTechNode) const;
+	bool					SetResearchDone(AvHMessageID inTech, bool inState = true);
+    bool                    SetIsResearchable(AvHMessageID inMessageID, bool inState = true);
+	bool					SetTechNode(int inOffset, const AvHTechNode& inTechNode);
+	bool					SetFirstNodeWithTechResearchState(AvHTechID inTech, bool inState = true);
+
+	void					TriggerAddTech(AvHTechID inTechID);
+	void					TriggerRemoveTech(AvHTechID inTechID);
+	
+	bool					operator!=(const AvHTechNodes& inTechNodes) const;
+	bool					operator==(const AvHTechNodes& inTechNodes) const;
+	void					operator=(const AvHTechNodes& inTechNodes);
+	
+	//#ifdef AVH_SERVER
+	//void					SendToNetworkStream() const;
+	//#endif						
+	
+	//#ifdef AVH_CLIENT
+	//int						ReceiveFromNetworkStream();
+	//#endif
+
+private:
+	TechNodeListType		mTechNodes;
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHTechSlotManager.cpp b/main/source/mod/AvHTechSlotManager.cpp
new file mode 100644
index 00000000..e8bb8398
--- /dev/null
+++ b/main/source/mod/AvHTechSlotManager.cpp
@@ -0,0 +1,168 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHTechSlotManager.cpp $
+// $Date: $
+//
+//-------------------------------------------------------------------------------
+// $Log: $
+//===============================================================================
+#include <stdio.h>
+#include "mod/AvHTechSlotManager.h"
+
+AvHTechSlots::AvHTechSlots()
+{
+	this->mUser3 = AVH_USER3_NONE;
+	
+	for(int i=0; i < kNumTechSlots; i++)
+	{
+		this->mTechSlots[i] = MESSAGE_NULL;
+	}
+
+#ifdef AVH_SERVER
+	this->mReceivesUpgrades = false;
+#endif
+}
+
+AvHTechSlots::AvHTechSlots(AvHUser3 inUser3, AvHMessageID inMessageID1, AvHMessageID inMessageID2, AvHMessageID inMessageID3, AvHMessageID inMessageID4, AvHMessageID inMessageID5, AvHMessageID inMessageID6, AvHMessageID inMessageID7, AvHMessageID inMessageID8, bool inReceivesUpgrades)
+{
+	this->mUser3 = inUser3;
+	this->mTechSlots[0] = inMessageID1;
+	this->mTechSlots[1] = inMessageID2;
+	this->mTechSlots[2] = inMessageID3;
+	this->mTechSlots[3] = inMessageID4;
+	this->mTechSlots[4] = inMessageID5;
+	this->mTechSlots[5] = inMessageID6;
+	this->mTechSlots[6] = inMessageID7;
+	this->mTechSlots[7] = inMessageID8;
+
+#ifdef AVH_SERVER
+	this->mReceivesUpgrades = inReceivesUpgrades;
+#endif
+}
+
+bool AvHTechSlots::operator==(const AvHTechSlots& inTechSlot) const
+{
+	bool theAreEqual = false;
+
+	if(this->mUser3 == inTechSlot.mUser3)
+	{
+		if(!memcmp(this->mTechSlots, inTechSlot.mTechSlots, kNumTechSlots*sizeof(AvHMessageID)))
+		{
+			#ifdef AVH_SERVER
+			if(this->mReceivesUpgrades == inTechSlot.mReceivesUpgrades)
+			{
+			#endif
+				theAreEqual = true;
+			#ifdef AVH_SERVER
+			}
+			#endif
+		}
+	}
+
+	return theAreEqual;
+}
+
+bool AvHTechSlots::operator!=(const AvHTechSlots& inTechSlot) const
+{
+	return !this->operator==(inTechSlot);
+}
+
+void AvHTechSlots::operator=(const AvHTechSlots& inTechSlot)
+{
+	this->mUser3 = inTechSlot.mUser3;
+	memcpy(this->mTechSlots, inTechSlot.mTechSlots, kNumTechSlots*sizeof(AvHMessageID));
+
+#ifdef AVH_SERVER
+	this->mReceivesUpgrades = inTechSlot.mReceivesUpgrades;
+#endif
+}
+
+#ifdef AVH_CLIENT
+int32 AvHTechSlots::ReceiveFromNetworkStream()
+{
+	int32 theBytesRead = 0;
+
+	int theUser3 = READ_BYTE();
+	this->mUser3 = (AvHUser3)theUser3;
+	theBytesRead++;
+
+	for(int i = 0; i < kNumTechSlots; i++)
+	{
+		this->mTechSlots[i] = (AvHMessageID)READ_BYTE();
+		theBytesRead++;
+	}
+
+	return theBytesRead;
+}
+#endif
+
+#ifdef AVH_SERVER
+void AvHTechSlots::SendToNetworkStream()
+{
+	WRITE_BYTE(this->mUser3);
+
+	for(int i=0; i<kNumTechSlots; i++)
+	{
+		WRITE_BYTE(this->mTechSlots[i]);
+	}
+}
+#endif
+
+
+void AvHTechSlotManager::AddTechSlots(AvHTechSlots inTechSlots)
+{
+	// Check to make sure we don't have something with this user3 already
+	for(AvHTechSlotListType::iterator theIter = this->mTechSlotList.begin(); theIter != this->mTechSlotList.end(); theIter++)
+	{
+		if(theIter->mUser3 == inTechSlots.mUser3)
+		{
+			//ASSERT(false);
+			// Remove existing one with this user3
+			this->mTechSlotList.erase(theIter);
+			break;
+		}
+	}
+	
+	this->mTechSlotList.push_back(inTechSlots);
+}
+
+void AvHTechSlotManager::Clear()
+{
+	this->mTechSlotList.clear();
+}
+
+const AvHTechSlotListType& AvHTechSlotManager::GetTechSlotList() const
+{
+	return this->mTechSlotList;
+}
+
+AvHTechSlotListType& AvHTechSlotManager::GetTechSlotList()
+{
+	return this->mTechSlotList;
+}
+
+bool AvHTechSlotManager::GetTechSlotList(AvHUser3 inUser3, AvHTechSlots& outTechSlotList) const
+{
+	bool theSuccess = false;
+	
+	// Check to make sure we don't have something with this user3 already
+	for(AvHTechSlotListType::const_iterator theIter = this->mTechSlotList.begin(); theIter != this->mTechSlotList.end(); theIter++)
+	{
+		if(theIter->mUser3 == inUser3)
+		{
+			outTechSlotList = *theIter;
+			theSuccess = true;
+			break;
+		}
+	}
+
+	return theSuccess;
+}
+
diff --git a/main/source/mod/AvHTechSlotManager.h b/main/source/mod/AvHTechSlotManager.h
new file mode 100644
index 00000000..ca904637
--- /dev/null
+++ b/main/source/mod/AvHTechSlotManager.h
@@ -0,0 +1,83 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHTechSlotManager.h $
+// $Date: $
+//
+//-------------------------------------------------------------------------------
+// $Log: $
+//===============================================================================
+#ifndef TECHSLOTMANAGER_H
+#define TECHSLOTMANAGER_H
+
+#include "util/nowarnings.h"
+#include "types.h"
+#include "build.h"
+#include "mod/AvHMessage.h"
+#include "mod/AvHSpecials.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/util_vector.h"
+#include "common/const.h"
+#include "engine/progdefs.h"
+#include "cl_dll/parsemsg.h"
+#endif
+
+#ifdef AVH_SERVER
+#include "extdll.h"
+#include "util.h"
+#endif
+
+const int kNumTechSlots = 8;
+class AvHTechSlots
+{
+public:
+					AvHTechSlots();
+					AvHTechSlots(AvHUser3 inUser3, AvHMessageID inMessageID1 = MESSAGE_NULL, AvHMessageID inMessageID2 = MESSAGE_NULL, AvHMessageID inMessageID3 = MESSAGE_NULL, AvHMessageID inMessageID4 = MESSAGE_NULL, AvHMessageID inMessageID5 = MESSAGE_NULL, AvHMessageID inMessageID6 = MESSAGE_NULL, AvHMessageID inMessageID7 = MESSAGE_NULL, AvHMessageID inMessageID8 = MESSAGE_NULL, bool inReceivesUpgrades = false);
+
+	bool			operator==(const AvHTechSlots& inTechSlot) const;
+	bool			operator!=(const AvHTechSlots& inTechSlot) const;
+	void			operator=(const AvHTechSlots& inTechSlot);
+
+#ifdef AVH_CLIENT
+	int32			ReceiveFromNetworkStream();
+#endif
+	
+#ifdef AVH_SERVER
+    void			SendToNetworkStream();
+#endif
+
+	AvHUser3		mUser3;
+	AvHMessageID	mTechSlots[kNumTechSlots];
+
+#ifdef AVH_SERVER
+	bool			mReceivesUpgrades;
+#endif
+};
+
+typedef vector<AvHTechSlots>		AvHTechSlotListType;
+
+class AvHTechSlotManager
+{
+public:
+	void							AddTechSlots(AvHTechSlots inTechSlots);
+
+	void							Clear();
+
+	const AvHTechSlotListType&		GetTechSlotList() const;
+	AvHTechSlotListType&			GetTechSlotList();
+	
+	bool							GetTechSlotList(AvHUser3 inUser3, AvHTechSlots& outTechSlotList) const;
+									
+private:							
+	AvHTechSlotListType				mTechSlotList;
+	
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHTitles.h b/main/source/mod/AvHTitles.h
new file mode 100644
index 00000000..c5030dcb
--- /dev/null
+++ b/main/source/mod/AvHTitles.h
@@ -0,0 +1,311 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: Constants for all sayings in titles.txt
+//
+// $Workfile: AvHTitles.h $
+// $Date: 2002/10/24 21:43:38 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHTitles.h,v $
+// Revision 1.35  2002/10/24 21:43:38  Flayra
+// - Removed old unused titles
+//
+// Revision 1.34  2002/10/18 22:23:10  Flayra
+// - Regular update
+//
+// Revision 1.33  2002/10/16 01:08:26  Flayra
+// - New HUD titles
+//
+// Revision 1.32  2002/10/03 19:10:05  Flayra
+// - Regular update
+//
+// Revision 1.31  2002/09/23 22:36:17  Flayra
+// - Added "paralyzed" message
+//
+// Revision 1.30  2002/09/09 20:09:16  Flayra
+// - Added constants for commander voting
+//
+// Revision 1.29  2002/08/16 02:48:49  Flayra
+// - Regular update
+//
+// Revision 1.28  2002/08/02 21:44:16  Flayra
+// - Massive help update
+//
+// Revision 1.27  2002/07/26 23:08:34  Flayra
+// - Added numerical feedback
+//
+// Revision 1.26  2002/07/23 17:33:05  Flayra
+// - Regular update
+//
+// Revision 1.25  2002/07/08 17:20:54  Flayra
+// - Regular update
+//
+// Revision 1.24  2002/06/25 18:22:54  Flayra
+// - Regular update
+//
+// Revision 1.23  2002/06/03 17:01:43  Flayra
+// - Regular update (alien building help text, effective player classes for aliens)
+//
+// Revision 1.22  2002/05/28 18:10:49  Flayra
+// - Regular update
+//
+// Revision 1.21  2002/05/23 02:32:57  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_TITLES_H
+#define AVH_TITLES_H
+
+// Messages
+#define kReadyRoomMessage				"ReadyRoomMessage"
+#define kReinforcementMessage			"ReinforcementMessage"
+#define kReinforcingMessage				"ReinforcingMessage"
+#define kObserverMessage				"ObserverMessage"
+#define kReinforcementComplete			"ReinforcementComplete"
+#define kCantSwitchTeamsInTournyMode	"CantSwitchTeamsInTournyMode"
+#define kCantSwitchTeamsAfterGameStart	"CantSwitchTeamsAfterGameStart"
+#define kTooManyPlayersOnTeam			"TooManyPlayersOnTeam"
+#define kCantJoinAfterSpectating		"CantJoinAfterSpectating"
+#define kJoinTeamTooFast				"JoinTeamTooFast"
+#define kSpectatorsNotAllowed			"SpectatorsNotAllowed"
+#define kCanOnlyJoinTeamYouveReinforced "CanOnlyJoinTeamYouveReinforced"
+#define kObjectivesVsAliens				"ObjectivesVsAliens"
+#define kObjectivesVsMarines			"ObjectivesVsMarines"
+#define kTeamTitle						"Team"
+#define kMustGestateUp					"MustGestateUp"
+#define kMustGestateOnGround			"MustGestateOnGround"
+#define kNotWhileDigesting				"NotWhileDigesting"
+#define kNoReadyRoomWhileDigested		"NoReadyRoomWhileDigested"
+#define kNeedMoreRoomToGestate			"NeedMoreRoomToGestate"
+#define kNeedOneHiveToGestate			"NeedOneHiveToGestate"
+#define kNeedTwoHivesToGestate			"NeedTwoHivesToGestate"
+#define kNeedThreeHivesToGestate		"NeedThreeHivesToGestate"
+#define kNeedOneHiveForStructure		"NeedOneHiveForStructure"
+#define kNeedTwoHivesForStructure		"NeedTwoHivesForStructure"
+#define kNeedThreeHivesForStructure		"NeedThreeHivesForStructure"
+#define kNeedsAnotherHiveForStructure	"NeedsAnotherHiveForStructure"
+#define kMustBeBuilder					"MustBeBuilder"
+#define kUpgradeNotAvailable			"UpgradeNotAvailable"
+#define kTooManyStructuresInArea		"TooManyStructuresInArea"
+#define kTooManyStructuresOfThisTypeNearby	"TooManyStructuresOfThisTypeNearby"
+#define kTooManyWebs					"TooManyWebs"
+#define kTooManyWebsNearby				"TooManyWebsNearby"
+
+#define kSoldierMessage					"SoldierMessage"
+#define kCommanderMessage				"CommanderMessage"
+#define kGestationMessage				"GestationMessage"
+#define kCocoonMessage					"CocoonMessage"
+
+#define kFriendText						"Friend"
+#define kEnemyText						"Enemy"
+#define kWeaponHelpText					"Weapon%dHelp"
+#define kCostMarker						"Cost"
+#define kDamageMarker					"Damage:"
+#define kRateOfFireMarker				"Rate of fire:"
+#define kSquadIndicator					"SquadIndicator"
+#define kRankText						"Rank_%s_%d"
+#define kCombatUpgradeLineComplete		"LineComplete"
+#define kYouAreAttacking				"YouAreAttacking"
+#define kYouAreDefending				"YouAreDefending"
+#define kAttacking						"Attacking"
+#define kDefending						"Defending"
+#define kYouAreNowA						"YouAreNowA"
+#define kExclamation					"Exclamation"
+#define kChooseAnUpgrade				"ChooseAnUpgrade"
+
+#define kYouReinforcement				"YouAreReinforcements"
+#define kNoSpectating					"NoSpectating"
+#define kObsInEyePrefix					"ObsInEyePrefix"
+
+#define kReceiveHeavyArmor				"ReceiveHeavyArmor"
+#define kReceiveMotionArmor				"ReceiveMotionTrackArmor"
+#define kReceiveJetpackArmor			"ReceiveJetpackArmor"
+#define kReceiveLifeSupportArmor		"ReceiveLifeSupportArmor"
+
+#define kMarineResourcePrefix			"MarineResourcePrefix"
+#define kAlienResourcePrefix			"AlienResourcePrefix"
+#define kCarryResourcePrefix			"CarryResourcePrefix"
+#define kAlienEnergyDescription			"AlienEnergyDescription"
+#define kResourcesTitle					"Resources"
+#define kResourcesDepletedTitle			"ResourcesDepleted"
+#define kReinforcementsTitle			"Reinforcements"
+
+#define	kNumericalEventResources		"NumericalEventResources"
+#define	kNumericalEventHealth			"NumericalEventHealth"
+#define	kNumericalEventResourcesDonated	"NumericalEventResourcesDonated"
+#define kNumericalEventAmmo				"NumericalEventAmmo"
+
+#define kMenuArmorUpgradeLifeSupport	"#MenuBuyArmorLifeSupport"
+#define kMenuArmorUpgradeJetpack		"#MenuBuyArmorJetpack"
+#define kMenuArmorUpgradeMotionTrack	"#MenuBuyArmorMotionTrack"
+#define kMenuArmorUpgradeFull			"#MenuArmorFull"
+
+#define kMarinePointsAwardedToCommander	"MarineAwardToCommander"
+#define kMarinePointsAwardedToLeader	"MarineAwardToLeader"
+#define kMarinePointsAwarded			"MarineAward"
+#define kAlienPointsAwarded				"AlienAward"
+
+#define kCommander						"Commander"
+#define kNoCommander					"NoCommander"
+#define kHandicap						"Handicap"
+
+#define kStunned						"Stunned"
+#define kDigested						"Digested"
+#define kDigestingPlayer				"DigestingPlayer"
+#define kParasited						"Parasited"
+#define kPrimalScreamed					"PrimalScreamed"
+#define kCatalysted                     "Catalysted"
+#define kUmbraed						"Umbraed"
+#define kWebbed							"Webbed"
+
+#define kWeaponCantBeDropped			"WeaponCantBeDropped"
+#define kReceivingLevelData				"ReceivingLevelData"
+#define kReceivingLevelData1			"ReceivingLevelData1"
+#define kReceivingLevelData2			"ReceivingLevelData2"
+#define kReceivingLevelData3			"ReceivingLevelData3"
+#define kReceivingLevelData4			"ReceivingLevelData4"
+
+#define kVoteCast						"VoteCast"
+#define kVoteStarted					"VoteStarted"
+#define kVoteIllegal					"VoteIllegal"
+#define kAlreadyVoted					"AlreadyVoted"
+#define	kVoteFailed						"VoteFailed"
+#define kVoteSucceeded					"VoteSucceeded"
+#define kVoteCancelled					"VoteCancelled"
+#define kBannedFromCommand				"BannedFromCommand"
+
+#define kAlreadyOnTeam					"AlreadyOnTeam"
+#define kGameBegun						"GameBegun"
+#define kJoinSoon						"YouCanJoinSoon"
+#define kTeamOneWon						"TeamOneWon"
+#define kTeamTwoWon						"TeamTwoWon"
+#define kGameDraw						"GameDraw"
+
+#define kRankOnlyBeforeGameStart		"RankBeforeGameStart"
+#define kDefectOnlyAfterGameStart		"DefectAfterGameStart"
+#define	kDefectMessageToLeader			"DefectMessageToLeader"
+#define kGameWontStart					"GameWontStart"
+#define kGameWontStartUntilReady		"GameWontStartUntilReady"
+#define kGameStarting					"GameStarting"
+
+#define	kInvalidOrderGiven				"InvalidOrderGiven"
+
+#define kBuildingPrefix					"Building"
+#define kResearchingPrefix				"Researching"
+#define kEnergyPrefix					"Energy"
+
+#define kEditingParticleSystem			"EditingParticleSystem"
+#define kNoParticleSystem				"NoParticleSystem"
+
+#define kCommandStationForOtherTeam		"CommandStationOtherTeam"
+#define kCommandStationInUse			"CommandStationInUse"
+#define kWeaponPreventingCommandStation	"WeaponPreventingCommandStation"
+#define kCommandStationDestroyed		"CommandStationDestroyed"
+#define kCommandStationWaitTime			"CommandStationWaitTime"
+#define kJetpackEnergyHUDText			"JetpackEnergyHUDText"
+
+#define kHelpTextDisableHelp			"HelpTextDisableHelp"
+
+// Marine help text
+#define kHelpTextCSAttractMode			"HelpTextCSAttractMode"
+#define kHelpTextArmoryResupply			"HelpTextArmoryResupply"
+#define kHelpTextAttackNearbyStation	"HelpTextAttackNearbyStation"
+#define kHelpTextBuildTurret			"HelpTextBuildTurret"
+#define kHelpTextBuildTower				"HelpTextBuildTower"
+#define kHelpTextExplainTower			"HelpTextExplainTower"
+#define kHelpTextAttackNearbyHive		"HelpTextAttackNearbyHive"
+
+// Alien chambers
+#define kHelpTextFriendlyMovementChamber	"HelpTextFriendlyMovementChamber"
+#define kHelpTextAttackMovementChamber		"HelpTextAttackMovementChamber"
+
+#define kHelpTextFriendlyOffensiveChamber	"HelpTextFriendlyOffensiveChamber"
+#define kHelpTextAttackOffensiveChamber		"HelpTextAttackOffensiveChamber"
+
+#define kHelpTextFriendlyDefensiveChamber	"HelpTextFriendlyDefensiveChamber"
+#define kHelpTextAttackDefensiveChamber		"HelpTextAttackDefensiveChamber"
+
+#define kHelpTextFriendlySensoryChamber		"HelpTextFriendlySensoryChamber"
+#define kHelpTextAttackSensoryChamber		"HelpTextAttackSensoryChamber"
+
+#define kHelpTextOpenWeldable			"HelpTextOpenWeldable"
+#define kHelpTextCloseWeldable			"HelpTextCloseWeldable"
+#define kHelpTextAttackHive				"HelpTextAttackHive"
+#define kHelpTextHiveBlocked			"HelpTextOtherHiveBlocked"
+#define kHelpTextOtherHiveBuilding		"HelpTextOtherHiveBuilding"
+#define kHelpTextEmptyHiveNotNearby		"HelpTextEmptyHiveNotNearby"
+#define	kHelpTextPhaseGate				"HelpTextPhaseGate"
+#define kHelpTextOrder					"HelpTextOrder"
+
+#define kHelpTextAlienPopupMenu			"HelpTextAlienPopupMenu"
+#define kHelpTextMarinePopupMenu		"HelpTextMarinePopupMenu"
+
+#define kHelpTextCommanderUseable		"HelpTextCommanderUseable"
+#define kHelpTextResourceDropoff		"HelpTextResourceDropoff"
+#define kHelpTextJetpacks				"HelpTextJetpacks"
+#define kHelpTextBite					"HelpTextBite"
+#define kHelpTextWallwalking			"HelpTextWallwalking"
+#define kHelpTextBuilder				"HelpTextBuilder"
+#define kHelpTextWeb					"HelpTextWeb"
+#define	kHelpTextEggLayer				"HelpTextEggLayer"
+#define kHelpTextFlight					"HelpTextFlight"
+#define kHelpTextSpores					"HelpTextSpores"
+#define kHelpTextAlienResource			"HelpTextAlienResource"
+#define kHelpTextPopupMenu				"HelpTextPopupMenu"
+
+// General alien help
+#define kHelpTextBuyUpgrade				"HelpTextBuyUpgrade"
+#define kHelpTextBuyLifeform			"HelpTextBuyLifeform"
+#define kHelpTextAlienWeapons			"HelpTextAlienWeapons"
+#define kHelpTextAlienResources			"HelpTextAlienResources"
+#define kHelpTextAlienEnergy			"HelpTextAlienEnergy"
+#define kHelpTextAlienPendingUpgrades	"HelpTextAlienPendingUpgrades"
+#define kHelpTextAlienBuildStructure	"HelpTextAlienBuildStructure"
+#define kHelpTextAlienHiveSight			"HelpTextAlienHiveSight"
+#define kHelpTextAlienVisionMode		"HelpTextAlienVisionMode"
+
+#define kHelpTextAlienUnderAttack		"HelpTextAlienUnderAttack"
+
+#define	kHelpTextCommanderGiveOrders	"HelpTextCommanderGiveOrders"
+#define kHelpTextCommanderSelectPlayers	"HelpTextCommanderSelectPlayers"
+#define kHelpTextCommanderBuild			"HelpTextCommanderBuild"
+#define kHelpTextCommanderUse			"HelpTextCommanderUse"
+#define kHelpTextCommanderAttack		"HelpTextCommanderAttack"
+#define kHelpTextCommanderWeld			"HelpTextCommanderWeld"
+#define kHelpTextCommanderGet			"HelpTextCommanderGet"
+#define kHelpTextCommanderUnderAttack	"HelpTextCommanderUnderAttack"
+#define kHelpTextCommanderResearchComplete	"HelpTextCommanderResearchComplete"
+#define kHelpTextCommanderUpgradeComplete	"HelpTextCommanderUpgradeComplete"
+#define kHelpTextCommanderLogout		"HelpTextCommanderLogout"
+
+// Alien help text
+#define kHelpTextAlienCommandMenu		"HelpTextAlienCommandMenu"
+#define kHelpTextAttackTower			"HelpTextAttackTower"
+
+// Scoreboard
+#define kClassCommander					"#ClassCommander"
+#define kClassHeavyMarine				"#ClassHeavyMarine"
+#define kClassJetpackMarine				"#ClassJetpackMarine"
+#define kClassDead						"#ClassDead"
+#define kClassDigesting					"#ClassDigesting"
+#define kClassReinforcing				"#ClassReinforcing"
+#define kClassReinforcingComplete		"#ClassReinforcingComplete"
+#define kClassLevel1					"#ClassLevel1"
+#define kClassLevel2					"#ClassLevel2"
+#define kClassLevel3					"#ClassLevel3"
+#define kClassLevel4					"#ClassLevel4"
+#define kClassLevel5					"#ClassLevel5"
+#define kClassGestating					"#ClassGestating"
+
+// Timelimit
+#define kGameTime						"GameTime"
+#define kElapsed						"Elapsed"
+#define kRemaining						"Remaining"
+#define kTimeLimit						"TimeLimit"
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHTooltip.cpp b/main/source/mod/AvHTooltip.cpp
new file mode 100644
index 00000000..286733f8
--- /dev/null
+++ b/main/source/mod/AvHTooltip.cpp
@@ -0,0 +1,426 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHTooltip.cpp $
+// $Date: 2002/09/25 20:52:10 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHTooltip.cpp,v $
+// Revision 1.2  2002/09/25 20:52:10  Flayra
+// - Refactoring
+//
+// Revision 1.1  2002/08/02 21:43:47  Flayra
+// - New files to control tooltips on HUD
+//
+//===============================================================================
+#include "mod/AvHTooltip.h"
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+#include "ui/UIUtil.h"
+#include "util/Tokenizer.h"
+
+AvHTooltip::AvHTooltip()
+{
+	this->mNormScreenX = -1;
+	this->mNormScreenY = -1;
+	this->mCentered = false;
+	this->mIgnoreFadeForLifetime = false;
+	this->mLifetime = -1;
+
+	// White
+	this->mColorR = this->mColorG = this->mColorB = 255;
+	this->mColorA = 255;
+
+	// Yellow
+	this->mBoldColorR = 248;
+	this->mBoldColorG = 252;
+	this->mBoldColorB = 0;
+
+	// Background color defaults to black
+	this->mBackgroundColorR = 0;
+	this->mBackgroundColorG = 0;
+	this->mBackgroundColorB = 0;
+	this->mBackgroundColorA = 25;
+	
+	this->mNeedsRecomputing = true;
+	
+	this->mScreenWidth = this->mScreenHeight = 0;
+	this->mScreenLineHSpacing = 0;
+	this->mScreenLineVSpacing = 0;
+	this->mScreenLineHeight = 0;
+
+	this->mDrawBorder = false;
+
+	this->mNormMaxWidth = .3f;
+
+	this->mFadeDownSpeed = -250;
+	this->mFadeUpSpeed = 500;
+}
+
+AvHTooltip::AvHTooltip(string& inText, float inNormScreenX, float inNormScreenY, bool inCentered)
+{
+	this->mText = inText;
+	this->mNormScreenX = inNormScreenX;
+	this->mNormScreenY = inNormScreenY;
+	this->mCentered = inCentered;
+}
+
+AvHTooltip::~AvHTooltip()
+{
+	int a = 0;
+}
+
+
+bool AvHTooltip::ChopStringOfMaxScreenWidth(int inMaxScreenWidth, string& ioBaseString, string& outChoppedString)
+{
+	// Loop backwards through the string, until we get a string that fits in this screen width
+	int theCurrentLength = ioBaseString.length();
+	int theMaxLength = ioBaseString.length();
+	bool theSuccess = false;
+	
+	while(!theSuccess && (theCurrentLength > 0))
+	{
+		string theCurrentString = ioBaseString.substr(0, theCurrentLength);
+		int theCurrentStringScreenWidth = gHUD.GetHudStringWidth(theCurrentString.c_str());
+		if(theCurrentStringScreenWidth <= inMaxScreenWidth)
+		{
+			// Look for a word to break the line
+			while((theCurrentLength > 0) && !theSuccess)
+			{
+				char theCurrentChar = ioBaseString[theCurrentLength-1];
+				if((theCurrentChar == ' ') || (theCurrentLength == theMaxLength))
+				{
+					outChoppedString = ioBaseString.substr(0, theCurrentLength);
+					ioBaseString = ioBaseString.substr(theCurrentLength, ioBaseString.length() - theCurrentLength);
+					theSuccess = true;
+					break;
+				}
+				else
+				{
+					theCurrentLength--;
+				}
+			}
+		}
+		else
+		{
+			theCurrentLength--;
+		}
+	}
+	
+	return theSuccess;
+}
+
+void AvHTooltip::Draw()
+{
+	this->RecomputeIfNeccessary();
+
+	if(this->mLocalizedText != "")
+	{
+		int theFillStartX = (int)(this->mNormScreenX*ScreenWidth());
+		int theFillStartY = (int)(this->mNormScreenY*ScreenHeight());
+		
+		if(this->mCentered)
+		{
+			theFillStartX -= this->mScreenWidth/2;	
+			theFillStartY -= this->mScreenHeight/2;
+		}
+		
+		// Draw nice border and shaded background
+		float theNormalizedAlpha = (float)this->mColorA/255;
+		int theAlphaComponent = theNormalizedAlpha*this->mBackgroundColorA;
+		
+		FillRGBA(theFillStartX, theFillStartY, this->mScreenWidth, this->mScreenHeight, this->mBackgroundColorR, this->mBackgroundColorG, this->mBackgroundColorB, theAlphaComponent);
+		vguiSimpleBox(theFillStartX, theFillStartY, theFillStartX + this->mScreenWidth, theFillStartY + this->mScreenHeight, this->mColorR, this->mColorG, this->mColorB, theAlphaComponent);
+		
+		// Now draw each line, non-centered, left-aligned
+		int theLineNumber = 0;
+		StringList::iterator theStringListIter;
+		for(theStringListIter = this->mStringList.begin(); theStringListIter != this->mStringList.end(); theStringListIter++)
+		{
+			// If the line starts with a marker, draw it in a special color
+			//string theDamageMarker(kDamageMarker);
+			//if(theStringListIter->substr(0, theDamageMarker.length()) == theDamageMarker)
+			//{
+			//	// Draw string in yellow
+			//	theR = theG = 255;
+			//	theB = 25;
+			//}
+			
+			int theBaseY = theFillStartY + this->mScreenLineVSpacing + theLineNumber*this->mScreenLineHeight;
+			
+			int theR = this->mColorR;
+			int theG = this->mColorG;
+			int theB = this->mColorB;
+
+			// If this line is bold, draw in bold color
+			string theString = theStringListIter->c_str();
+			int theToolTipPreStringLength = kTooltipBoldPreString.length();
+			if((int)theString.length() >= theToolTipPreStringLength)
+			{
+				if(!strncmp(theString.c_str(), kTooltipBoldPreString.c_str(), kTooltipBoldPreString.length()))
+				{
+					theR = this->mBoldColorR;
+					theG = this->mBoldColorG;
+					theB = this->mBoldColorB;
+
+					// Now remove prefix
+					theString = theString.substr(theToolTipPreStringLength, theString.length());
+				}
+			}
+
+			// Draw message (DrawHudStringCentered only centers in x)
+			gHUD.DrawHudString(theFillStartX + this->mScreenLineHSpacing, theBaseY /*- this->mScreenLineHeight/2*/, ScreenWidth(), theString.c_str(), theR*theNormalizedAlpha, theG*theNormalizedAlpha, theB*theNormalizedAlpha);
+			
+			theLineNumber++;
+		}
+	}
+}
+
+void AvHTooltip::FadeText(float inTimePassed, bool inFadeDown)
+{
+	// Fade reticle nicely
+	int theFadeSpeed = inFadeDown ? this->mFadeDownSpeed : this->mFadeUpSpeed;
+
+	float theNewAlpha = this->mColorA + inTimePassed*theFadeSpeed;
+
+	if(inFadeDown && this->mIgnoreFadeForLifetime)
+	{
+		// Don't fade until a lifetime is set
+	}
+	else
+	{
+		// Our lifetime has been set, start counting it down
+		if((this->mLifetime > 0) && inFadeDown)
+		{
+			this->mLifetime -= inTimePassed;
+		}
+		else
+		{
+			this->SetA(max(0, min(255, theNewAlpha)));
+		}
+	}
+}
+
+int AvHTooltip::GetA() const
+{
+	return this->mColorA;
+}
+
+float AvHTooltip::GetNormalizedScreenX() const
+{
+	return this->mNormScreenX;
+}
+
+float AvHTooltip::GetNormalizedScreenY() const
+{
+	return this->mNormScreenY;
+}
+
+int	AvHTooltip::GetScreenWidth() const
+{
+	return this->mScreenWidth;
+}
+
+int	AvHTooltip::GetScreenHeight() const
+{
+	return this->mScreenHeight;
+}
+
+
+void AvHTooltip::RecomputeIfNeccessary()
+{
+	if(this->mNeedsRecomputing)
+	{
+		this->RecomputeTextAndDimensions();
+		this->mNeedsRecomputing = false;
+	}
+}
+
+
+void AvHTooltip::RecomputeTextAndDimensions()
+{
+	this->mStringList.clear();
+	this->mLocalizedText = this->mText;
+	
+	LocalizeString(this->mText.c_str(), this->mLocalizedText);
+
+	if(this->mLocalizedText != "")
+	{
+		// If localization failed (ie, it was already localized), remove the dang delimiter
+		if(this->mLocalizedText[0] == '#')
+		{
+			this->mLocalizedText = this->mLocalizedText.substr(1, this->mLocalizedText.length() - 1);
+		}
+
+		int kMaxScreenWidth = this->mNormMaxWidth*ScreenWidth();
+		
+		// Build list of strings that end in newline, using mLocalizedText
+		StringList theNewlines;
+		Tokenizer::split(this->mLocalizedText, "\n", theNewlines);
+
+		StringList::iterator theStringListIter;
+		for(theStringListIter = theNewlines.begin(); theStringListIter != theNewlines.end(); theStringListIter++)
+		{
+			string theHelpString = *theStringListIter;
+
+			// For each of these, chop them up into more lines that fit the box
+			do
+			{
+				string theNewString;
+				if(this->ChopStringOfMaxScreenWidth(kMaxScreenWidth, theHelpString, theNewString))
+				{
+					this->mStringList.push_back(theNewString);
+				}
+				else
+				{
+					theHelpString = "";
+				}
+			} 
+			while(theHelpString != "");
+		}
+		
+		// For each line, if the line contains any special markers, move them to their own lines
+		this->mScreenWidth = 0;
+		for(theStringListIter = this->mStringList.begin(); theStringListIter != this->mStringList.end(); theStringListIter++)
+		{
+			// Compute max width of all the strings, add some extra for a frame
+			int theCurrentScreenWidth = gHUD.GetHudStringWidth(theStringListIter->c_str());
+			this->mScreenWidth = max(this->mScreenWidth, theCurrentScreenWidth);
+		}
+		this->mScreenLineHSpacing = .01f*ScreenWidth();
+		this->mScreenWidth += 2*this->mScreenLineHSpacing;
+		
+		// Compute max height needed to contain all the strings, add some extra for a frame
+		this->mScreenLineVSpacing = .01f*ScreenHeight();
+		this->mScreenLineHeight = gHUD.GetHudStringHeight();
+		this->mScreenHeight = 2*this->mScreenLineVSpacing + (this->mStringList.size()*this->mScreenLineHeight);
+	}	
+}
+
+void AvHTooltip::SetCentered(bool inCentered)
+{
+	this->mCentered = inCentered;
+}
+
+void AvHTooltip::SetDrawBorder(bool inDrawBorder)
+{
+	this->mDrawBorder = inDrawBorder;
+}
+
+void AvHTooltip::SetFadeDownSpeed(int inFadeDownSpeed)
+{
+	this->mFadeDownSpeed = inFadeDownSpeed;
+}
+
+void AvHTooltip::SetFadeUpSpeed(int inFadeUpSpeed)
+{
+	this->mFadeUpSpeed = inFadeUpSpeed;
+}
+
+void AvHTooltip::SetIgnoreFadeForLifetime(bool inIgnoreFadeForLifetime)
+{
+	this->mIgnoreFadeForLifetime = inIgnoreFadeForLifetime;
+}
+
+void AvHTooltip::SetText(const string& inText)
+{
+	this->mText = inText;
+	this->mNeedsRecomputing = true;
+}
+
+float AvHTooltip::GetNormalizedMaxWidth() const
+{
+	return this->mNormMaxWidth;
+}
+
+void AvHTooltip::SetNormalizedMaxWidth(float inNormalizedMaxWidth)
+{
+	this->mNormMaxWidth = inNormalizedMaxWidth;
+}
+
+void AvHTooltip::SetNormalizedScreenX(float inNormScreenX)
+{
+	this->mNormScreenX = inNormScreenX;
+}
+
+void AvHTooltip::SetNormalizedScreenY(float inNormScreenY)
+{
+	this->mNormScreenY = inNormScreenY;
+}
+
+void AvHTooltip::SetRGB(int inR, int inG, int inB)
+{
+	this->mColorR = inR;
+	this->mColorG = inG;
+	this->mColorB = inB;
+}
+
+void AvHTooltip::SetR(int inR)
+{
+	this->mColorR = inR;
+}
+
+void AvHTooltip::SetG(int inG)
+{
+	this->mColorG = inG;
+}
+
+void AvHTooltip::SetB(int inB)
+{
+	this->mColorB = inB;
+}
+
+void AvHTooltip::SetA(int inA)
+{
+	this->mColorA = inA;
+
+	// Once fully faded in, and we're ignoring fade for lifetime, set our lifetime to expire
+	if((inA >= 255) && this->mIgnoreFadeForLifetime)
+	{
+		// Increase lifetime with message length
+		this->mLifetime = max(3.0f, this->mLocalizedText.length()/12.0f);
+		this->mIgnoreFadeForLifetime = false;
+	}
+}
+
+void AvHTooltip::SetBoldR(int inR)
+{
+	this->mBoldColorR = inR;
+}
+
+void AvHTooltip::SetBoldG(int inG)
+{
+	this->mBoldColorG = inG;
+}
+
+void AvHTooltip::SetBoldB(int inB)
+{
+	this->mBoldColorB = inB;
+}
+
+void AvHTooltip::SetBackgroundR(int inR)
+{
+	this->mBackgroundColorR = inR;
+}
+
+void AvHTooltip::SetBackgroundG(int inG)
+{
+	this->mBackgroundColorG = inG;
+}
+
+void AvHTooltip::SetBackgroundB(int inB)
+{
+	this->mBackgroundColorB = inB;
+}
+
+void AvHTooltip::SetBackgroundA(int inA)
+{
+	this->mBackgroundColorA = inA;
+}
+
diff --git a/main/source/mod/AvHTooltip.h b/main/source/mod/AvHTooltip.h
new file mode 100644
index 00000000..6049eccf
--- /dev/null
+++ b/main/source/mod/AvHTooltip.h
@@ -0,0 +1,128 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHTooltip.h $
+// $Date: 2002/09/25 20:52:10 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHTooltip.h,v $
+// Revision 1.2  2002/09/25 20:52:10  Flayra
+// - Refactoring
+//
+// Revision 1.1  2002/08/02 21:43:47  Flayra
+// - New files to control tooltips on HUD
+//
+//===============================================================================
+#ifndef AVH_TOOLTIP_H
+#define AVH_TOOLTIP_H
+
+#include "types.h"
+
+const string kTooltipBoldPreString = "<b>";
+
+class AvHTooltip
+{
+public:
+				AvHTooltip();
+				AvHTooltip(string& inText, float inNormScreenX, float inNormScreenY, bool inCentered = false);
+
+	virtual		~AvHTooltip();
+				
+	void		Draw();
+				
+	void		FadeText(float inTimePassed, bool inFadeDown);
+
+	int			GetA() const;
+	
+	float		GetNormalizedScreenX() const;
+	float		GetNormalizedScreenY() const;
+	
+	int			GetScreenWidth() const;
+	int			GetScreenHeight() const;
+
+	void		RecomputeIfNeccessary();
+
+	void		SetCentered(bool inCentered);
+	void		SetDrawBorder(bool inDrawBorder);
+	void		SetFadeDownSpeed(int inFadeDownSpeed);
+	void		SetFadeUpSpeed(int inFadeUpSpeed);
+	void		SetIgnoreFadeForLifetime(bool inIgnoreFadeForLifetime);
+	void		SetText(const string& inText);
+
+	float		GetNormalizedMaxWidth() const;
+	void		SetNormalizedMaxWidth(float inNormalizedMaxWidth);
+				
+	void		SetNormalizedScreenX(float inNormScreenX);
+	void		SetNormalizedScreenY(float inNormScreenY);
+				
+	void		SetRGB(int inR, int inG, int inB);
+	
+	void		SetR(int inR);
+	void		SetG(int inG);
+	void		SetB(int inB);
+	void		SetA(int inA);
+
+	void		SetBackgroundR(int inR);
+	void		SetBackgroundG(int inG);
+	void		SetBackgroundB(int inB);
+	void		SetBackgroundA(int inA);
+
+	void		SetBoldR(int inR);
+	void		SetBoldG(int inG);
+	void		SetBoldB(int inB);
+				
+private:		
+	bool		ChopStringOfMaxScreenWidth(int inMaxScreenWidth, string& ioBaseString, string& outChoppedString);
+	void		RecomputeTextAndDimensions();
+
+	// TODO: Add more info here to indicate what to point out in the world (either an entity, or a position)
+
+	string		mText;
+	string		mLocalizedText;
+	StringList	mStringList;
+
+	bool		mDrawBorder;
+
+	int			mColorR;
+	int			mColorG;
+	int			mColorB;
+	int			mColorA;
+
+	int			mBoldColorR;
+	int			mBoldColorG;
+	int			mBoldColorB;
+
+	int			mBackgroundColorR;
+	int			mBackgroundColorG;
+	int			mBackgroundColorB;
+	int			mBackgroundColorA;
+
+	bool		mIgnoreFadeForLifetime;
+	float		mLifetime;
+	bool		mCentered;
+
+	bool		mNeedsRecomputing;
+	
+	float		mNormScreenX;
+	float		mNormScreenY;
+
+	float		mNormMaxWidth;
+
+	int			mScreenWidth;
+	int			mScreenHeight;
+	int			mScreenLineHSpacing;
+	int			mScreenLineVSpacing;
+	int			mScreenLineHeight;
+
+	int			mFadeDownSpeed;
+	int			mFadeUpSpeed;
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHTurret.cpp b/main/source/mod/AvHTurret.cpp
new file mode 100644
index 00000000..46f91559
--- /dev/null
+++ b/main/source/mod/AvHTurret.cpp
@@ -0,0 +1,672 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: Base NS turret, used for all types of automated enemy detection
+//
+// $Workfile: AvHTurret.cpp$
+// $Date: 2002/11/22 21:24:59 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHTurret.cpp,v $
+// Revision 1.12  2002/11/22 21:24:59  Flayra
+// - Fixed turret factory abuse, where turrets became active after recycling the nearby turret factory before turret was fully contructed.
+// - Fixed bug where siege turrets became re-activated after building a regular turret factory nearby.
+//
+// Revision 1.11  2002/11/06 01:39:21  Flayra
+// - Turrets now need an active turret factory to be active
+//
+// Revision 1.10  2002/10/03 19:10:19  Flayra
+// - Turret intervals sped up again
+//
+// Revision 1.9  2002/09/25 20:52:24  Flayra
+// - Performance improvements
+//
+// Revision 1.8  2002/09/23 22:36:37  Flayra
+// - Turrets now reacquire closer targets intermittently
+//
+// Revision 1.7  2002/08/31 18:01:03  Flayra
+// - Work at VALVe
+//
+// Revision 1.6  2002/08/16 02:49:00  Flayra
+// - New damage model
+//
+// Revision 1.5  2002/07/23 17:34:07  Flayra
+// - Turrets track range in 2D, turrets can not require LOS if desired (for siege)
+//
+// Revision 1.4  2002/07/01 21:23:00  Flayra
+// - Added generic vertical FOV to allow alien turrets to shoot very high and low
+//
+// Revision 1.3  2002/06/03 17:02:30  Flayra
+// - Reduced turret volume
+//
+// Revision 1.2  2002/05/28 18:11:59  Flayra
+// - Put in slower, randomish rate of fire for turrets for sound variance and drama, don't play ping if no ping sound specified (crashing with offensive tower)
+//
+// Revision 1.1  2002/05/23 02:32:57  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHTurret.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHCloakable.h"
+#include "util/MathUtil.h"
+
+const float kPingInterval = 3.0f;
+const float kPingVolume = .4f;
+const float kTurretThinkInterval = .05f;
+const float kTurretSearchScalar = kTurretThinkInterval*(-90.0f/180)*M_PI;
+const float kTurretUpdateEnemyInterval = .25f;
+
+AvHTurret::AvHTurret(AvHTechID inTechID, AvHMessageID inMessageID, char* inClassName, int inUser3) : AvHBaseBuildable(inTechID, inMessageID, inClassName, inUser3)
+{
+	this->Init();
+}
+
+void AvHTurret::Init()
+{
+	this->m_hEnemy = 0;
+	this->m_flFieldOfView = 0;
+	this->mTimeOfLastAttack = -1;
+	this->mTimeOfNextAttack = -1;
+    this->mTimeOfLastUpdateEnemy = -1;
+	
+	this->m_fTurnRate = 0;
+	
+	this->mGoalQuat = this->mCurQuat = Quat(0, 0, 0, 1);
+	
+	this->mNextPingTime = 0;
+	
+	this->mEnabled = false;
+}
+
+void AvHTurret::ResetEntity()
+{
+	AvHBaseBuildable::ResetEntity();
+
+	this->Init();
+
+	this->Setup();
+}
+
+char* AvHTurret::GetActiveSound() const
+{
+	return NULL;
+}
+
+char* AvHTurret::GetAlertSound() const
+{
+	return NULL;
+}
+
+char* AvHTurret::GetPingSound() const
+{
+	return NULL;
+}
+
+int AvHTurret::GetPointValue(void) const
+{
+	return BALANCE_IVAR(kScoringTurretValue);
+}
+
+int AvHTurret::GetSetEnabledAnimation() const
+{
+    return -1;
+}
+
+int	AvHTurret::GetActiveAnimation() const
+{
+	return 1;
+}
+
+int	AvHTurret::GetSpawnAnimation() const
+{
+	return 0;
+}
+
+int	AvHTurret::GetDeployAnimation() const
+{
+	return -1;
+}
+
+bool AvHTurret::GetEnabledState() const
+{
+	return this->mEnabled;
+}
+
+int	AvHTurret::GetTakeDamageAnimation() const
+{
+	return -1;
+}
+
+int	AvHTurret::GetIdle1Animation() const
+{
+	return -1;
+}
+
+int	AvHTurret::GetIdle2Animation() const
+{
+	return -1;
+}
+
+int	AvHTurret::GetKilledAnimation() const
+{
+	return 5;
+}
+
+bool AvHTurret::GetRequiresLOS() const
+{
+	return true;
+}
+
+int	AvHTurret::GetDamageType() const
+{
+	// Turrets to half damage to heavy players
+	return DMG_BULLET | DMG_NEVERGIB | NS_DMG_LIGHT;
+}
+
+int AvHTurret::IRelationship (CBaseEntity* inTarget)
+{
+	int theRelationship = R_NO;
+
+	// Ignore the roaches for heaven's sake
+	if(!FClassnameIs( inTarget->pev, "monster_cockroach" ))
+	{
+		// Don't shoot at cloaked players
+		AvHCloakable* theCloakable = dynamic_cast<AvHCloakable*>(inTarget);
+		if(theCloakable && theCloakable->GetIsCloaked())
+		{
+			theRelationship = R_NO;
+		}
+		else
+		{
+			// Shoot all monsters that aren't on our team
+			CBaseMonster* theMonsterPointer = dynamic_cast<CBaseMonster*>(inTarget);
+			if(theMonsterPointer && (theMonsterPointer->pev->team != this->pev->team))
+			{
+				theRelationship = R_DL;
+			}
+			else
+			{
+				// Look at own team vs. incoming team
+				AvHTeamNumber inTeam = (AvHTeamNumber)inTarget->pev->team;
+				if(inTeam != TEAM_IND)
+				{
+					if(inTeam == this->pev->team)
+					{
+						theRelationship = R_AL;
+					}
+					else
+					{
+						// Don't keep switching targets constantly
+						theRelationship = R_DL;
+					}
+				}
+				else
+				{
+					//theRelationship = CSentry::IRelationship(inTarget);
+				}
+			}
+		}
+	}
+	
+	return theRelationship;
+}
+
+bool AvHTurret::GetIsValidTarget(CBaseEntity* inEntity) const
+{
+	bool theTargetIsValid = false;
+	
+	if((inEntity->pev->team != this->pev->team) && (inEntity->pev->team != 0) && (inEntity->pev->takedamage))
+	{
+		float theDistanceToCurrentEnemy = AvHSUEyeToBodyXYDistance(this->pev, inEntity);
+		if(theDistanceToCurrentEnemy <= this->GetXYRange())
+		{
+			// Players are targettable when 
+			AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inEntity);
+			if(!thePlayer || !thePlayer->GetIsCloaked() || !thePlayer->GetIsBeingDigested()) //added digestion - elven
+			{
+				// TODO: Check to be sure enemy is still visible
+				theTargetIsValid = true;
+			}
+			else
+			{
+				AvHCloakable* theCloakable = dynamic_cast<AvHCloakable*>(inEntity);
+				if(!theCloakable || (theCloakable->GetOpacity() > 0.0f))
+				{
+					theTargetIsValid = true;
+				}
+			}
+		}
+	}
+
+	return theTargetIsValid;
+}
+
+void AvHTurret::Ping(void)
+{
+	// Make the pinging noise every second while searching
+	if(this->mNextPingTime == 0)
+	{
+		this->mNextPingTime = gpGlobals->time + kPingInterval;
+	}
+	else if(this->mNextPingTime <= gpGlobals->time)
+	{
+		char* thePingSound = this->GetPingSound();
+		if(thePingSound)
+		{
+			this->mNextPingTime = gpGlobals->time + kPingInterval;
+			EMIT_SOUND(ENT(this->pev), CHAN_ITEM, thePingSound, kPingVolume, ATTN_STATIC);
+			//EyeOn( );
+		}
+	}
+	//	else if (m_eyeBrightness > 0)
+	//	{
+	//		EyeOff( );
+	//	}
+}
+
+//=========================================================
+// FInViewCone - returns true is the passed ent is in
+// the caller's forward view cone. The dot product is performed
+// in 2d, making the view cone infinitely tall. 
+//=========================================================
+BOOL AvHTurret::FInViewCone(CBaseEntity* inEntity)
+{
+	Vector2D	vec2LOS;
+	float	flDot;
+	
+	UTIL_MakeVectors ( pev->angles );
+	
+	vec2LOS = ( inEntity->pev->origin - pev->origin ).Make2D();
+	vec2LOS = vec2LOS.Normalize();
+	
+	flDot = DotProduct (vec2LOS , gpGlobals->v_forward.Make2D() );
+	
+	if ( flDot > this->m_flFieldOfView )
+	{
+		return TRUE;
+	}
+	else
+	{
+		return FALSE;
+	}
+}
+
+//=========================================================
+// FInViewCone - returns true is the passed vector is in
+// the caller's forward view cone. The dot product is performed
+// in 2d, making the view cone infinitely tall. 
+//=========================================================
+BOOL AvHTurret::FInViewCone(Vector* inOrigin)
+{
+	Vector2D	vec2LOS;
+	float		flDot;
+
+	UTIL_MakeVectors ( pev->angles );
+	
+	vec2LOS = ( *inOrigin - pev->origin ).Make2D();
+	vec2LOS = vec2LOS.Normalize();
+	
+	flDot = DotProduct (vec2LOS , gpGlobals->v_forward.Make2D() );
+	
+	if ( flDot > this->m_flFieldOfView )
+	{
+		return TRUE;
+	}
+	else
+	{
+		return FALSE;
+	}
+
+}
+
+// This function takes a lot of CPU, so make sure it's not called often!  Don't call this function directly, use UpdateEnemy instead whenever possible.
+CBaseEntity* AvHTurret::FindBestEnemy()
+{
+    PROFILE_START()
+	CBaseEntity* theEntityList[100];
+	
+	int theMaxRange = this->GetXYRange();
+	
+	Vector delta = Vector(theMaxRange, theMaxRange, theMaxRange);
+	CBaseEntity* theCurrentEntity = NULL;
+	CBaseEntity* theBestPlayer = NULL;
+	CBaseEntity* theBestStructure = NULL;
+
+	float theCurrentEntityRange = 100000;
+	
+	// Find only monsters/clients in box, NOT limited to PVS
+	int theCount = UTIL_EntitiesInBox(theEntityList, 100, this->pev->origin - delta, this->pev->origin + delta, FL_CLIENT | FL_MONSTER);
+	for(int i = 0; i < theCount; i++ )
+	{
+		theCurrentEntity = theEntityList[i];
+		if((theCurrentEntity != this) && theCurrentEntity->IsAlive())
+		{
+			// the looker will want to consider this entity
+			// don't check anything else about an entity that can't be seen, or an entity that you don't care about.
+			if(this->IRelationship(theCurrentEntity ) != R_NO && FInViewCone(theCurrentEntity) && !FBitSet(theCurrentEntity->pev->flags, FL_NOTARGET))
+			{
+				AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theCurrentEntity);
+				if(!thePlayer || thePlayer->GetCanBeAffectedByEnemies())
+				{
+					if(this->GetIsValidTarget(theCurrentEntity))
+					{
+						// Find nearest enemy
+						float theRangeToTarget = VectorDistance2D(this->pev->origin, theCurrentEntity->pev->origin);
+						if(theRangeToTarget < theCurrentEntityRange)
+						{
+                            // FVisible is expensive, so defer until necessary
+                            if(!this->GetRequiresLOS() || FVisible(theCurrentEntity))
+                            {
+                                theCurrentEntityRange = theRangeToTarget;
+								if ( thePlayer ) 
+								{
+									theBestPlayer = theCurrentEntity;
+								}
+								else
+								{
+									theBestStructure = theCurrentEntity;
+								}
+                            }
+						}
+					}
+				}
+			}
+		}
+	}
+    PROFILE_END(kAvHTurretFindBestEnemy);
+
+	return (theBestPlayer != NULL ) ? theBestPlayer : theBestStructure;
+}
+
+// Return degrees from center turret can aim up or down
+int	AvHTurret::GetVerticalFOV() const
+{
+	return 30;
+}
+
+void AvHTurret::UpdateEnemy()
+{
+	// If enabled
+	if(this->mEnabled)
+	{
+		// If time to find new enemy
+        float theCurrentTime = gpGlobals->time;
+
+		if((this->mTimeOfLastUpdateEnemy == -1) || (theCurrentTime > (this->mTimeOfLastUpdateEnemy + kTurretUpdateEnemyInterval)))
+		{
+			// Find new best enemy
+			this->m_hEnemy = this->FindBestEnemy();
+            this->mTimeOfLastUpdateEnemy = theCurrentTime;
+		}
+	}
+	else
+	{
+		// Clear current enemy
+		this->m_hEnemy = NULL;
+	}
+}
+
+void AvHTurret::ActiveThink(void)
+{
+    PROFILE_START()
+
+	// Advance model frame
+	StudioFrameAdvance();
+
+	// Find enemy, or reacquire dead enemy
+	this->UpdateEnemy();
+
+	// If we have a valid enemy
+	if(!FNullEnt(this->m_hEnemy))
+	{
+		// If enemy is in FOV
+		Vector theVecMid = this->pev->origin + this->pev->view_ofs;
+		//AvHSUPlayParticleEvent("JetpackEffect", this->edict(), theVecMid);
+
+		CBaseEntity* theEnemyEntity = this->m_hEnemy;
+		Vector theVecMidEnemy = theEnemyEntity->BodyTarget(theVecMid);
+
+		//AvHSUPlayParticleEvent("JetpackEffect", theEnemyEntity->edict(), theVecMidEnemy);
+
+		// calculate dir and dist to enemy
+		Vector theVecDirToEnemy = theVecMidEnemy - theVecMid;
+		Vector theAddition = theVecMid + theVecDirToEnemy;
+
+		Vector theVecLOS = theVecDirToEnemy.Normalize();
+
+		// Update our goal angles to direction to enemy
+		Vector theVecDirToEnemyAngles;
+		VectorAngles(theVecDirToEnemy, theVecDirToEnemyAngles);
+
+		// Set goal quaternion
+		this->mGoalQuat = Quat(theVecDirToEnemyAngles);
+
+		// Is the turret looking at the target yet?
+		float theRadians = (this->GetVerticalFOV()/180.0f)*3.1415f;
+		float theCosVerticalFOV = cos(theRadians);
+
+		Vector theCurrentAngles;
+		this->mCurQuat.GetAngles(theCurrentAngles);
+		UTIL_MakeAimVectors(theCurrentAngles);
+
+		if(DotProduct(theVecLOS, gpGlobals->v_forward) > theCosVerticalFOV)
+		{
+			// If enemy is visible
+			bool theEnemyVisible = FBoxVisible(this->pev, this->m_hEnemy->pev, theVecMidEnemy) || !this->GetRequiresLOS();
+			if(theEnemyVisible && this->m_hEnemy->IsAlive())
+			{
+				// If it's time to attack
+				if((this->mTimeOfNextAttack == -1) || (gpGlobals->time >= this->mTimeOfNextAttack))
+				{
+					// Shoot and play shoot animation
+					Shoot(theVecMid, theVecDirToEnemy, theEnemyEntity->pev->velocity);
+					
+					this->PlayAnimationAtIndex(this->GetActiveAnimation());
+					
+					// Set time for next attack
+					this->SetNextAttack();
+				}
+				// spin the barrel when acquired but not firing
+				else if(this->GetBaseClassAnimatesTurret())
+				{
+					this->pev->sequence = 2;
+					ResetSequenceInfo();
+				}
+			}
+		}
+
+		// Set next active think
+		this->pev->nextthink = gpGlobals->time + kTurretThinkInterval;
+	}
+	// else we have no enemy, go back to search think
+	else
+	{
+		SetThink(&AvHTurret::SearchThink);
+		this->pev->nextthink = gpGlobals->time + kTurretThinkInterval;
+	}
+
+	this->TurretUpdate();
+
+    PROFILE_END(kAvHTurretActiveThink)
+}
+
+bool AvHTurret::GetBaseClassAnimatesTurret() const
+{
+	return true;
+}
+
+void AvHTurret::SearchThink(void)
+{
+    PROFILE_START()
+        
+	if(this->GetBaseClassAnimatesTurret())
+	{
+		this->pev->sequence = 2;
+		ResetSequenceInfo();
+		StudioFrameAdvance();
+	}
+	this->pev->nextthink = gpGlobals->time + kTurretThinkInterval;
+	
+	this->Ping();
+	
+	// If we have a target and we're still healthy
+	if(this->m_hEnemy != NULL)
+	{
+		if(!this->m_hEnemy->IsAlive() )
+		{
+			this->m_hEnemy = NULL;// Dead enemy forces a search for new one
+		}
+	}
+	
+	// Acquire Target
+    this->UpdateEnemy();
+
+	// If we've found a target, spin up the barrel and start to attack
+	if(this->m_hEnemy != NULL)
+	{
+		//this->m_flSpinUpTime = 0;
+		SetThink(&AvHTurret::ActiveThink);
+	}
+//	else
+//	{
+//		// generic hunt for new victims
+//		this->m_vecGoalAngles.y = (this->m_vecGoalAngles.y + 0.1*this->m_fTurnRate);
+//		if(this->m_vecGoalAngles.y >= 360)
+//		{
+//			m_vecGoalAngles.y -= 360;
+//		}
+//	}
+
+	this->TurretUpdate();
+    
+    PROFILE_END(kTurretSearchThink)
+}
+
+void AvHTurret::TurretUpdate()
+{
+	this->MoveTurret();
+}
+
+void AvHTurret::SetNextAttack()
+{
+	this->mTimeOfNextAttack = gpGlobals->time + this->GetRateOfFire();
+}
+
+int AvHTurret::MoveTurret(void)
+{
+	ASSERT(this->m_fTurnRate > 0);
+
+	// We have an enemy, track towards goal angles
+	if(this->m_hEnemy != NULL)
+	{
+		float theRate = this->m_fTurnRate*kTurretThinkInterval;
+		this->mCurQuat = ConstantRateLerp(this->mCurQuat, this->mGoalQuat, theRate);
+	}
+	// generic hunt for new victims
+	else
+	{
+		// Create transformation quat that will rotate current quat
+		float axis[3] = { 0.0f, 0.0f, 1.0f};
+		Quat rot(kTurretSearchScalar, axis);
+
+		this->mCurQuat = rot*this->mCurQuat;
+
+		// Reset height
+	}
+
+	Vector theAngles;
+	this->mCurQuat.GetAngles(theAngles);
+
+	//SetBoneController(0, m_vecCurAngles.y - pev->angles.y );
+	SetBoneController(0, theAngles.y - pev->angles.y );
+	SetBoneController(1, -theAngles.x);
+
+	return 0;
+}
+
+void AvHTurret::CheckEnabledState()
+{
+    this->SetEnabledState(true, true);
+}
+
+void AvHTurret::SetHasBeenBuilt()
+{
+	AvHBuildable::SetHasBeenBuilt();
+	
+    this->CheckEnabledState();
+}
+
+void AvHTurret::SetEnabledState(bool inState, bool inForce)
+{
+	if(!GetHasUpgrade(this->pev->iuser4, MASK_RECYCLING))
+	{
+		if((inState != this->mEnabled) || inForce)
+		{
+			this->mEnabled = inState;
+
+            if(this->GetBaseClassAnimatesTurret())
+            {
+                int theEnabledAnimation = this->GetSetEnabledAnimation();
+                if(theEnabledAnimation >= 0)
+                {
+                    float theSpeed = this->mEnabled ? 1.0f : -1.0f;
+                    this->PlayAnimationAtIndex(theEnabledAnimation, true, theSpeed);
+                }
+            }
+			
+			if(!this->mEnabled)
+			{
+				this->m_hEnemy = NULL;
+				SetThink(NULL);
+
+			}
+			else
+			{
+                float theTimeToAnimate = max(gpGlobals->time + kTurretThinkInterval, this->GetTimeAnimationDone());
+				SetThink(&AvHTurret::SearchThink);
+				this->pev->nextthink = theTimeToAnimate;
+			}
+		}
+	}
+}
+
+float AvHTurret::GetRateOfFire() const
+{
+	float theVariance = RANDOM_FLOAT(0, 0.2);
+	float theBaseROF = BALANCE_FVAR(kTurretBaseRateOfFire);
+	return theBaseROF + theVariance;
+}
+
+void AvHTurret::Setup()
+{
+	this->pev->nextthink = gpGlobals->time + 1;
+	this->pev->frame = 0;
+	this->pev->takedamage = DAMAGE_AIM;
+	this->mNextPingTime = 0;
+	this->m_flFieldOfView = VIEW_FIELD_FULL;
+	this->m_fTurnRate = BALANCE_FVAR(kTurretTrackingRate);
+	
+	// This is the visual difference between model origin and gun barrel, it's needed to orient the barrel and hit targets properly
+	this->pev->view_ofs.z = 48;
+	
+	SetBits(this->pev->flags, FL_MONSTER);
+	
+	this->SetBoneController(0, 0);
+	this->SetBoneController(1, 0);
+
+	this->mEnabled = false;
+}
+
+void AvHTurret::Spawn()
+{
+	AvHBaseBuildable::Spawn();
+
+	this->Setup();
+}
+
diff --git a/main/source/mod/AvHTurret.h b/main/source/mod/AvHTurret.h
new file mode 100644
index 00000000..825b5201
--- /dev/null
+++ b/main/source/mod/AvHTurret.h
@@ -0,0 +1,127 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: Base NS turret, used for all types of automated enemy detection
+//
+// $Workfile: AvHTurret.h$
+// $Date: 2002/11/22 21:24:59 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHTurret.h,v $
+// Revision 1.8  2002/11/22 21:24:59  Flayra
+// - Fixed turret factory abuse, where turrets became active after recycling the nearby turret factory before turret was fully contructed.
+// - Fixed bug where siege turrets became re-activated after building a regular turret factory nearby.
+//
+// Revision 1.7  2002/11/06 01:39:21  Flayra
+// - Turrets now need an active turret factory to be active
+//
+// Revision 1.6  2002/08/16 02:49:00  Flayra
+// - New damage model
+//
+// Revision 1.5  2002/07/23 17:34:07  Flayra
+// - Turrets track range in 2D, turrets can not require LOS if desired (for siege)
+//
+// Revision 1.4  2002/07/01 21:23:01  Flayra
+// - Added generic vertical FOV to allow alien turrets to shoot very high and low
+//
+// Revision 1.3  2002/06/03 17:02:22  Flayra
+// - Experimented with pushable/buildable siege turrets
+//
+// Revision 1.2  2002/05/28 18:11:59  Flayra
+// - Put in slower, randomish rate of fire for turrets for sound variance and drama, don't play ping if no ping sound specified (crashing with offensive tower)
+//
+// Revision 1.1  2002/05/23 02:32:57  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_TURRET_H
+#define AVH_TURRET_H
+
+#include "mod/AvHBaseBuildable.h"
+#include "util/Quat.h"
+
+//#include "mod/AvHPushableBuildable.h"
+// This class behaves like CSentry does, but clean and extensible, and with a base class of AvHBaseBuildable
+//class AvHTurret : public AvHPushableBuildable//public AvHBaseBuildable
+class AvHTurret : public AvHBaseBuildable
+{
+public:
+					AvHTurret(AvHTechID inTechID, AvHMessageID inMessageID, char* inClassName, int inUser3);
+
+    virtual void	CheckEnabledState();
+    
+	virtual char*	GetActiveSound() const;
+	virtual char*	GetAlertSound() const;
+	virtual char*	GetPingSound() const;
+
+	virtual int		GetDamageType() const;
+
+	virtual int		GetActiveAnimation() const;
+	virtual int		GetDeployAnimation() const;
+	virtual bool	GetEnabledState() const;
+	virtual int		GetIdle1Animation() const;
+	virtual int		GetIdle2Animation() const;
+	virtual int		GetKilledAnimation() const;
+	virtual bool	GetRequiresLOS() const;
+	virtual int		GetPointValue(void) const;
+    virtual int     GetSetEnabledAnimation() const;
+	virtual int		GetSpawnAnimation() const;
+	virtual int		GetTakeDamageAnimation() const;
+	virtual int		GetVerticalFOV() const;
+
+	virtual bool	GetIsValidTarget(CBaseEntity* inEntity) const;
+
+	CBaseEntity*	FindBestEnemy();
+	virtual int		IRelationship(CBaseEntity* inTarget);
+	
+	virtual void	SetNextAttack();
+	
+	// Must override these
+	virtual int		GetXYRange() const = 0;
+	virtual void	Shoot(const Vector &vecSrc, const Vector &vecDirToEnemy, const Vector& inVecEnemyVelocity) = 0;
+    virtual void	Ping(void);
+	virtual int		MoveTurret(void);
+	virtual bool	GetBaseClassAnimatesTurret() const;
+
+	virtual void	ResetEntity();
+	virtual void	SetHasBeenBuilt();
+	virtual void	SetEnabledState(bool inState, bool inForce = false);
+	virtual void	Spawn();
+
+protected:
+	virtual float	GetRateOfFire() const;
+	virtual void	UpdateEnemy();
+	void			TurretUpdate();
+	void			Init();
+	void			Setup();
+
+	BOOL			FInViewCone(CBaseEntity* inEntity);
+	BOOL			FInViewCone(Vector* inOrigin);
+		
+	EXPORT void		ActiveThink(void);
+	EXPORT void		SearchThink(void);
+
+	EHANDLE			m_hEnemy;
+	float			m_flFieldOfView;
+	float			mTimeOfLastAttack;
+	float			mTimeOfNextAttack;
+    float           mTimeOfLastUpdateEnemy;
+
+	// turn rate in radians
+	float			m_fTurnRate;		
+
+	// movement
+	Quat			mCurQuat;
+	Quat			mGoalQuat;
+	
+	float			mNextPingTime;
+
+	bool			mEnabled;
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHUIFactory.cpp b/main/source/mod/AvHUIFactory.cpp
new file mode 100644
index 00000000..a6cec05d
--- /dev/null
+++ b/main/source/mod/AvHUIFactory.cpp
@@ -0,0 +1,48 @@
+#include "mod/AvHUIFactory.h"
+#include "mod/AvHTeamHierarchy.h"
+#include "mod/AvHActionButtons.h"
+#include "mod/AvHScrollPanel.h"
+#include "mod/AvHLogoutComponent.h"
+#include "mod/AvHTechImpulsePanel.h"
+
+// Knows how to build custom mod-specific components
+UIComponent* AvHUIFactory::BuildComponent(const TRDescription& inTextRep, CSchemeManager* inSchemeManager)
+{
+    UIComponent* theNewComponent = NULL;
+
+    // If base class can't create it, maybe it's a custom component
+    theNewComponent = UIFactory::BuildComponent(inTextRep, inSchemeManager);
+    if(!theNewComponent)
+    {
+    	string theCompType = inTextRep.GetType();
+
+        if(theCompType == "TeamHierarchy")
+        {
+            theNewComponent = new AvHUITeamHierarchy();
+        }
+		else if(theCompType == "ActionButtons")
+		{
+			theNewComponent = new AvHUIActionButtons();
+		}
+		else if(theCompType == "ScrollPanel")
+		{
+			theNewComponent = new AvHUIScrollPanel();
+		}
+		else if(theCompType == "LogoutComponent")
+		{
+			theNewComponent = new AvHUILogoutComponent();
+		}
+		else if(theCompType == "TechImpulsePanel")
+		{
+			theNewComponent = new AvHUITechImpulsePanel();
+		}
+		
+        // Initialize it
+	    if(theNewComponent)
+	    {
+	    	theNewComponent->AllocateAndSetProperties(inTextRep, inSchemeManager);
+	    }
+    }
+    return theNewComponent;
+}
+
diff --git a/main/source/mod/AvHUIFactory.h b/main/source/mod/AvHUIFactory.h
new file mode 100644
index 00000000..5b80314f
--- /dev/null
+++ b/main/source/mod/AvHUIFactory.h
@@ -0,0 +1,15 @@
+#ifndef AVH_UI_FACTORY_H
+#define AVH_UI_FACTORY_H
+
+#include "ui/UIFactory.h"
+class CSchemeManager;
+
+// Knows how to build custom mod-specific components
+class AvHUIFactory : public UIFactory
+{
+public:
+    virtual UIComponent*  BuildComponent(const TRDescription& inTextRep, CSchemeManager* inSchemeManager);
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHUmbraGun.cpp b/main/source/mod/AvHUmbraGun.cpp
new file mode 100644
index 00000000..411a7067
--- /dev/null
+++ b/main/source/mod/AvHUmbraGun.cpp
@@ -0,0 +1,270 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHUmbraGun.cpp $
+// $Date: 2002/11/22 21:28:17 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHUmbraGun.cpp,v $
+// Revision 1.10  2002/11/22 21:28:17  Flayra
+// - mp_consistency changes
+//
+// Revision 1.9  2002/08/16 02:49:14  Flayra
+// - Umbra is now used by the level 4
+//
+// Revision 1.8  2002/07/24 19:09:18  Flayra
+// - Linux issues
+//
+// Revision 1.7  2002/07/24 18:55:53  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.6  2002/07/24 18:45:43  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.5  2002/07/23 17:34:25  Flayra
+// - Updated for new artwork
+//
+// Revision 1.4  2002/07/01 21:20:14  Flayra
+// - Implemented umbra weapon
+//
+// Revision 1.3  2002/06/25 17:50:31  Flayra
+// - Reworking for correct player animations and new enable/disable state, new view model artwork, alien weapon refactoring
+//
+// Revision 1.2  2002/06/03 16:39:10  Flayra
+// - Added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.1  2002/05/23 02:32:57  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHGamerules.h"
+#include "mod/AvHServerUtil.h"
+#endif
+
+LINK_ENTITY_TO_CLASS(kwUmbraGun, AvHUmbraGun);
+
+#ifdef AVH_SERVER
+LINK_ENTITY_TO_CLASS(kwUmbraProjectile, AvHUmbraProjectile);
+LINK_ENTITY_TO_CLASS(kwUmbraCloud, AvHUmbraCloud);
+
+AvHUmbraCloud::AvHUmbraCloud()
+{
+	this->mTimeHit = -1;
+}
+
+void AvHUmbraCloud::Precache(void)
+{
+	CBaseEntity::Precache();
+}
+
+void AvHUmbraCloud::Spawn(void)
+{
+	this->Precache();
+
+	CBaseEntity::Spawn();
+	
+	this->pev->movetype = MOVETYPE_NONE;
+	this->pev->classname = MAKE_STRING(kwsUmbraCloud);
+	this->pev->iuser3 = AVH_USER3_UMBRA;
+	this->pev->effects |= EF_NODRAW;
+
+	SetThink(&AvHUmbraCloud::SUB_Remove);
+	this->pev->nextthink = gpGlobals->time + BALANCE_IVAR(kUmbraCloudDuration);
+}
+
+
+
+void AvHUmbraProjectile::Spawn(void)
+{
+	this->Precache();
+
+	CBaseEntity::Spawn();
+	
+	this->pev->movetype = MOVETYPE_FLY;
+	this->pev->classname = MAKE_STRING(kwsUmbraProjectile);
+	
+	SET_MODEL(ENT(this->pev), kClientUmbraSprite);
+	this->pev->solid = SOLID_BBOX;
+	
+	if(!GetGameRules()->GetDrawInvisibleEntities())
+	{
+		this->pev->effects = EF_NODRAW;
+	}
+	else
+	{
+		this->pev->frame = 0;
+		this->pev->scale = 0.5;
+		this->pev->rendermode = kRenderTransAlpha;
+		this->pev->renderamt = 255;
+	}
+	
+	UTIL_SetSize(this->pev, Vector( 0, 0, 0), Vector(0, 0, 0));
+
+	SetTouch(&AvHUmbraProjectile::UmbraTouch);
+}
+
+void AvHUmbraProjectile::UmbraTouch(CBaseEntity* inOther)
+{
+	// Never hit the player who fired it
+	if(inOther != CBaseEntity::Instance(this->pev->owner))
+	{
+		AvHSUCreateUmbraCloud(this->pev->origin, AvHTeamNumber(this->pev->team), this);
+
+		// Remove the projectile
+		SetTouch(NULL);
+
+		UTIL_Remove(this);
+	}
+}
+
+#endif
+
+
+
+void AvHUmbraGun::Init()
+{
+	this->mRange = kUmbraRange;
+	this->mDamage = 0;
+}
+
+int	AvHUmbraGun::GetBarrelLength() const
+{
+	return kUmbraBarrelLength;
+}
+
+float AvHUmbraGun::GetRateOfFire() const
+{
+	return BALANCE_FVAR(kUmbraROF);
+}
+
+int	AvHUmbraGun::GetDeployAnimation() const
+{
+	int theDeployAnimation = -1;
+	
+	AvHWeaponID thePreviousID = this->GetPreviousWeaponID();
+	
+	switch(thePreviousID)
+	{
+	case AVH_WEAPON_BITE2:
+		theDeployAnimation = 9;
+		break;
+	case AVH_WEAPON_SPIKE:
+		theDeployAnimation = 8;
+		break;
+	}
+	
+	return theDeployAnimation;
+}
+
+int	AvHUmbraGun::GetIdleAnimation() const
+{
+	return 2;
+}
+
+int	AvHUmbraGun::GetShootAnimation() const
+{
+	return 5;
+}
+
+bool AvHUmbraGun::GetFiresUnderwater() const
+{
+	return true;
+}
+
+bool AvHUmbraGun::GetIsDroppable() const
+{
+	return false;
+}
+
+void AvHUmbraGun::FireProjectiles(void)
+{
+	#ifdef AVH_SERVER
+	
+	// Make sure we have enough points to shoot this thing
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this->m_pPlayer);
+	ASSERT(thePlayer);
+
+	// Create umbra projectile
+	AvHUmbraProjectile* theUmbra = GetClassPtr((AvHUmbraProjectile*)NULL );
+	theUmbra->Spawn();
+	
+	UTIL_MakeVectors(this->m_pPlayer->pev->v_angle);
+	
+	Vector vecAiming = gpGlobals->v_forward;
+	Vector vecSrc = this->m_pPlayer->GetGunPosition( ) + vecAiming;
+	
+	UTIL_SetOrigin(theUmbra->pev, vecSrc);
+	
+	VectorScale(vecAiming, kShootCloudVelocity, theUmbra->pev->velocity);
+	
+	// Set projectile team and owner
+	theUmbra->pev->owner = ENT(this->m_pPlayer->pev);
+	
+	// Set Umbra's team :)
+	theUmbra->pev->team = this->m_pPlayer->pev->team;
+	
+	#endif	
+}
+
+char* AvHUmbraGun::GetViewModel() const
+{
+	return kLevel3ViewModel;
+}
+
+void AvHUmbraGun::Precache()
+{
+	AvHAlienWeapon::Precache();
+
+	PRECACHE_UNMODIFIED_SOUND(kUmbraFireSound);
+	PRECACHE_UNMODIFIED_SOUND(kUmbraBlockedSound);
+	PRECACHE_UNMODIFIED_MODEL(kUmbraSprite);
+	PRECACHE_UNMODIFIED_MODEL(kClientUmbraSprite);
+
+	this->mEvent = PRECACHE_EVENT(1, kUmbraShootEventName);
+}
+
+void AvHUmbraGun::Spawn() 
+{ 
+    AvHAlienWeapon::Spawn(); 
+
+	Precache();
+
+	this->m_iId = AVH_WEAPON_UMBRA;
+
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsUmbraGun);
+
+	SET_MODEL(ENT(this->pev), kNullModel);
+
+	FallInit();// get ready to fall down.
+} 
+
+bool AvHUmbraGun::UsesAmmo(void) const
+{
+	return false;
+}
+
diff --git a/main/source/mod/AvHVisibleBlipList.cpp b/main/source/mod/AvHVisibleBlipList.cpp
new file mode 100644
index 00000000..99eeafb6
--- /dev/null
+++ b/main/source/mod/AvHVisibleBlipList.cpp
@@ -0,0 +1,296 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHVisibleBlipList.cpp $
+// $Date: 2002/09/25 20:52:34 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHVisibleBlipList.cpp,v $
+// Revision 1.11  2002/09/25 20:52:34  Flayra
+// - Refactoring
+//
+// Revision 1.10  2002/08/31 18:01:03  Flayra
+// - Work at VALVe
+//
+// Revision 1.9  2002/07/23 17:34:59  Flayra
+// - Updates for new hive sight info
+//
+// Revision 1.8  2002/07/08 17:21:57  Flayra
+// - Allow up to 64 blips, don't ASSERT if we exceed them (trying to draw all physents from shared code on client and server)
+//
+// Revision 1.7  2002/07/01 21:22:09  Flayra
+// - Reworked sprites to be simpler and to allow more types
+//
+// Revision 1.6  2002/06/10 20:04:39  Flayra
+// - Blip list wasn't being cleared properly (?)
+//
+// Revision 1.5  2002/05/28 18:13:02  Flayra
+// - New hive sight (different states for different targets)
+//
+// Revision 1.4  2002/05/23 02:32:57  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHVisibleBlipList.h"
+
+#ifdef AVH_CLIENT
+#include "common/triangleapi.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+
+#include "cl_dll/cl_util.h"
+#include "cl_dll/util_vector.h"
+#include "common/renderingconst.h"
+#include "common/const.h"
+#include "engine/progdefs.h"
+#include "engine/edict.h"
+#include "pm_shared/pm_defs.h"
+#include "engine/cdll_int.h"
+#include "common/event_api.h"
+#include "common/cl_entity.h"
+#include "particles/particledefs.h"
+#include "particles/p_vector.h"
+#include "particles/papi.h"
+#include "usercmd.h"
+#include "pm_defs.h"
+#include "pm_shared.h"
+#include "pm_movevars.h"
+#include "pm_debug.h"
+
+#include "mod/AvHParticleSystemManager.h"
+#include "mod/AvHHudConstants.h"
+#include "cl_dll/ev_hldm.h"
+#include "cl_dll/parsemsg.h"
+#include "cl_dll/hud.h"
+#include "util/STLUtil.h"
+
+void AvHVisibleBlipList::Draw(const pVector& inView, int kDefaultStatus)
+{
+	//bool theIsEnemy = this->GetType() == BLIP_TYPE_ENEMY;
+	
+	// Now draw the thing!
+	for(int theCurrentBlip = 0; theCurrentBlip < this->mNumBlips; theCurrentBlip++)
+	{
+		int theStatus = this->mBlipStatus[theCurrentBlip];
+		ASSERT(theStatus >= 0);
+		ASSERT(theStatus < kNumBlipTypes);
+
+		// This has to be reloaded too
+		if(!this->mSprite[theStatus])
+		{
+			string theSpriteName = string(kSpriteDirectory) + string("/") + string(kBlipSprite) + MakeStringFromInt(theStatus) + string(".spr");
+			this->mSprite[theStatus] = Safe_SPR_Load(theSpriteName.c_str());
+		}
+
+		int theSprite = this->mSprite[theStatus];
+		if(!theSprite)
+		{
+			theSprite = this->mSprite[kDefaultStatus];
+		}
+
+		if(theSprite > 0)
+		{
+			int theNumFrames = SPR_Frames(theSprite);
+			const int kFrameRate = 12;
+			const float theCurrentTime = gEngfuncs.GetClientTime();
+			int theFrame = (int)((theCurrentTime - this->mTimeBlipsReceived)*kFrameRate) % theNumFrames;
+			
+			if(gEngfuncs.pTriAPI->SpriteTexture((struct model_s *)gEngfuncs.GetSpritePointer(theSprite), theFrame))
+			{
+				//gEngfuncs.pTriAPI->RenderMode(kRenderTransTexture);
+				gEngfuncs.pTriAPI->RenderMode(kRenderTransAdd);
+			
+				pVector up(0, 0, 1);
+				pVector right = inView ^ up;
+				right.normalize();
+				pVector nup = right ^ inView;
+				
+				int theScale = kWorldBlipScale;
+				right *= theScale/2.0f;
+				nup *= theScale/2.0f;
+				
+				// Quad draws v0, v1, v2, v3
+				pVector V0 = -(right + nup);
+				pVector V1 = -(right - nup);
+				pVector V2 = right + nup;
+				pVector V3 = right - nup;
+				
+				pVector sV0 = V0;
+				pVector sV1 = V1;
+				pVector sV2 = V2;
+				pVector sV3 = V3;
+			
+//				SPR_Set(this->mSprite, 255, 255, 255);
+//			
+//				// Only draw if not behind viewer
+//				vec3_t theWorldPos, theScreenPos;
+//				theWorldPos[0] = this->mBlipPositions[theCurrentBlip][0];
+//				theWorldPos[1] = this->mBlipPositions[theCurrentBlip][1];
+//				theWorldPos[2] = this->mBlipPositions[theCurrentBlip][2];
+//			
+//				if(!gEngfuncs.pTriAPI->WorldToScreen(theWorldPos, theScreenPos))
+//				{
+//					theScreenPos[0] = XPROJECT(theScreenPos[0]);
+//					theScreenPos[1] = YPROJECT(theScreenPos[1]);
+//			
+//					if(theScreenPos[0] >= 0 && theScreenPos[0] < ScreenWidth)
+//					{
+//						if(theScreenPos[1] >= 0 && theScreenPos[1] < ScreenHeight)
+//						{
+//							SPR_DrawAdditive(theFrame, theScreenPos[0], theScreenPos[1], NULL);
+//						}
+//					}
+//				}
+				
+				gEngfuncs.pTriAPI->CullFace( TRI_NONE );
+				
+				gEngfuncs.pTriAPI->Begin( TRI_TRIANGLE_STRIP );
+			
+				gEngfuncs.pTriAPI->Brightness(1.0f);
+				
+					pVector p;
+					p.x = this->mBlipPositions[theCurrentBlip][0];
+					p.y = this->mBlipPositions[theCurrentBlip][1];
+					p.z = this->mBlipPositions[theCurrentBlip][2];
+					
+					gEngfuncs.pTriAPI->TexCoord2f(0, 0);
+					pVector ver = p + sV0;
+					gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+			
+					gEngfuncs.pTriAPI->TexCoord2f(0, 1);
+					ver = p + sV1;
+					gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+			
+					gEngfuncs.pTriAPI->TexCoord2f(1, 0);
+					ver = p + sV3;
+					gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+
+					gEngfuncs.pTriAPI->TexCoord2f(1, 1);
+					ver = p + sV2;
+					gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+				
+				gEngfuncs.pTriAPI->End();
+			
+				gEngfuncs.pTriAPI->RenderMode( kRenderNormal );
+			}
+		}
+	}
+}
+#endif
+
+#ifdef AVH_SERVER
+#include "extdll.h"
+#include "dlls/util.h"
+#endif
+
+AvHVisibleBlipList::AvHVisibleBlipList()
+{
+	this->Clear();
+}
+
+void AvHVisibleBlipList::AddBlip(float inX, float inY, float inZ, int8 inStatus, int8 inBlipInfo)
+{
+	//ASSERT(this->mNumBlips < kMaxBlips);
+	if(this->mNumBlips < (kMaxBlips-1))
+	{
+		int theBlipOffset = this->mNumBlips;
+		
+		this->mBlipPositions[theBlipOffset][0] = inX;
+		this->mBlipPositions[theBlipOffset][1] = inY;
+		this->mBlipPositions[theBlipOffset][2] = inZ;
+		this->mBlipStatus[theBlipOffset] = inStatus;
+		this->mBlipInfo[theBlipOffset] = inBlipInfo;
+		
+		this->mNumBlips++;
+	}
+	else
+	{
+		#ifdef AVH_SERVER
+		UTIL_LogPrintf("AvHVisibleBlipList::AddBlip(%f, %f, %f, status: %d):  Can't add blip, max limit %d reached.\n", inX, inY, inZ, inStatus, kMaxBlips);
+		#endif
+	}
+}
+
+
+void AvHVisibleBlipList::Clear()
+{
+	#ifdef AVH_CLIENT
+	//memset(this->mSprite, 0, kNumBlipTypes*sizeof(int));
+	this->mTimeBlipsReceived = -1;
+	#endif
+
+	this->mNumBlips = 0;
+	
+	memset(this->mBlipPositions, 0, sizeof(float)*kMaxBlips*3);
+	memset(this->mBlipStatus, 0, sizeof(int8)*kMaxBlips);
+	memset(this->mBlipInfo, 0, sizeof(int8)*kMaxBlips);
+}
+
+#ifdef AVH_CLIENT
+void AvHVisibleBlipList::SetTimeBlipsReceived(float inTime)
+{
+	this->mTimeBlipsReceived = inTime;
+}
+
+void AvHVisibleBlipList::VidInit()
+{
+	memset(this->mSprite, 0, kNumBlipTypes*sizeof(int));
+}
+#endif
+
+
+bool AvHVisibleBlipList::operator==(const AvHVisibleBlipList& inList)
+{
+	bool theAreEqual = false;
+
+	if(this->mNumBlips == inList.mNumBlips)
+	{
+#ifdef AVH_CLIENT
+		if(!memcmp(this->mSprite, inList.mSprite, kNumBlipTypes*sizeof(int)))
+		{
+			if(this->mTimeBlipsReceived == inList.mTimeBlipsReceived)
+			{
+#endif
+				theAreEqual = true;
+					
+				for(int i = 0; i < this->mNumBlips; i++)
+				{
+					for(int j = 0; j < 3; j++)
+					{
+						if(this->mBlipPositions[i][j] != inList.mBlipPositions[i][j])
+						{
+							theAreEqual = false;
+							break;
+						}
+				
+					}
+					if(this->mBlipStatus[i] != inList.mBlipStatus[i])
+					{
+						theAreEqual = false;
+						break;
+					}
+					if(this->mBlipInfo[i] != inList.mBlipInfo[i])
+					{
+						theAreEqual = false;
+						break;
+					}
+				}
+#ifdef AVH_CLIENT
+			}
+		}
+#endif
+	}
+
+	return theAreEqual;
+}
+
+bool AvHVisibleBlipList::operator!=(const AvHVisibleBlipList& inList)
+{
+	return !this->operator==(inList);
+}
diff --git a/main/source/mod/AvHVisibleBlipList.h b/main/source/mod/AvHVisibleBlipList.h
new file mode 100644
index 00000000..87473f5f
--- /dev/null
+++ b/main/source/mod/AvHVisibleBlipList.h
@@ -0,0 +1,78 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHVisibleBlipList.h $
+// $Date: 2002/07/23 17:34:59 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHVisibleBlipList.h,v $
+// Revision 1.7  2002/07/23 17:34:59  Flayra
+// - Updates for new hive sight info
+//
+// Revision 1.6  2002/07/08 17:21:57  Flayra
+// - Allow up to 64 blips, don't ASSERT if we exceed them (trying to draw all physents from shared code on client and server)
+//
+// Revision 1.5  2002/07/01 21:22:09  Flayra
+// - Reworked sprites to be simpler and to allow more types
+//
+// Revision 1.4  2002/05/28 18:13:02  Flayra
+// - New hive sight (different states for different targets)
+//
+// Revision 1.3  2002/05/23 02:32:57  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_VISIBLE_BLIP_LIST_H
+#define AVH_VISIBLE_BLIP_LIST_H
+
+#include "types.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/util_vector.h"
+#include "particles/p_vector.h"
+#include "mod/AvHBlipConstants.h"
+//#include "cl_dll/hud.h"
+#endif
+
+const int	kMaxBlips = 64;
+
+class AvHVisibleBlipList
+{
+public:
+				AvHVisibleBlipList();
+
+	void		AddBlip(float inX, float inY, float inZ, int8 inStatus = 0, int8 inBlipInfo = 0);
+
+	void		Clear();
+
+	#ifdef AVH_CLIENT
+	void		Draw(const pVector& inView, int kDefaultStatus);
+				
+	void		SetTimeBlipsReceived(float inTime);
+
+	void		VidInit();
+	#endif
+
+	bool		operator==(const AvHVisibleBlipList& inList);
+	bool		operator!=(const AvHVisibleBlipList& inList);
+	
+	int			mNumBlips;
+	float		mBlipPositions[kMaxBlips][3];
+	int8		mBlipStatus[kMaxBlips];
+	int8		mBlipInfo[kMaxBlips];
+
+private:
+	#ifdef AVH_CLIENT
+	int			mSprite[kNumBlipTypes];
+	float		mTimeBlipsReceived;
+	#endif
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHVoiceHelper.cpp b/main/source/mod/AvHVoiceHelper.cpp
new file mode 100644
index 00000000..a321d02a
--- /dev/null
+++ b/main/source/mod/AvHVoiceHelper.cpp
@@ -0,0 +1,105 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHVoiceHelper.cpp $
+// $Date: 2002/11/15 23:32:34 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHVoiceHelper.cpp,v $
+// Revision 1.9  2002/11/15 23:32:34  Flayra
+// - Voice changes to make tourny mode and observation smoother
+//
+// Revision 1.8  2002/09/09 20:09:49  Flayra
+// - Tried to fix bug where players can sometimes hear players on the opposite team after they die
+// - Removed old NSTR preprocessor directives
+//
+// Revision 1.7  2002/07/24 18:55:53  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.6  2002/07/10 14:46:09  Flayra
+// - Removed unnecessary code, hopefully fixing bug #274
+//
+// Revision 1.5  2002/05/23 02:32:57  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHVoiceHelper.h"
+#include "mod/AvHGamerules.h"
+#include "pm_shared/pm_shared.h"
+
+AvHVoiceHelper gVoiceHelper;
+
+bool AvHVoiceHelper::CanPlayerHearPlayer(CBasePlayer *pListener, CBasePlayer *pTalker)
+{
+	AvHPlayer* theListener = dynamic_cast<AvHPlayer*>(pListener);
+	ASSERT(theListener);
+
+	AvHPlayer* theTalker = dynamic_cast<AvHPlayer*>(pTalker);
+	ASSERT(theTalker);
+
+	// Don't allow talking during countdown, to allow players to record demos, and for dramatic effect
+//	if(GetGameRules()->GetCountdownStarted() && !GetGameRules()->GetGameStarted())
+//	{
+//		return false;
+//	}
+
+	// If commander is talking and has crouch key held, only selected players can hear him
+	if(theTalker->GetIsInTopDownMode())
+	{
+		if(theTalker->GetTeam() == theListener->GetTeam())
+		{
+			bool theCrouchKeyHeld = (theTalker->pev->button & IN_DUCK);
+			if(theCrouchKeyHeld)
+			{
+				if(theTalker->GetIsSelected(theListener->entindex()))
+				{
+					return true;
+				}
+				else
+				{
+					return false;
+				}
+			}
+		}
+	}
+
+	// Players on a team can only hear other players on their team
+	if((theListener->GetTeam() == theTalker->GetTeam()) && (theListener->GetTeam() != TEAM_IND))
+	{
+		return true;
+	}
+	
+	// Players in the ready room can only hear other players in the ready room
+	if((theListener->GetPlayMode() == PLAYMODE_READYROOM) && (theTalker->GetPlayMode() == PLAYMODE_READYROOM))
+	{
+		return true;
+	}
+
+	// Spectators can always hear other spectators
+	if(theListener->GetPlayMode() == PLAYMODE_OBSERVER)
+	{
+		if(theTalker->GetPlayMode() == PLAYMODE_OBSERVER)
+		{
+			return true;
+		}
+		
+		// If spectator is spectating first-person in casual mode, he can hear other members of this team
+		if((theListener->pev->iuser1 == OBS_IN_EYE) && !GetGameRules()->GetIsTournamentMode())
+		{
+			if(theListener->GetTeam(true) == theTalker->GetTeam())
+			{
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+
diff --git a/main/source/mod/AvHVoiceHelper.h b/main/source/mod/AvHVoiceHelper.h
new file mode 100644
index 00000000..a2fa5ac2
--- /dev/null
+++ b/main/source/mod/AvHVoiceHelper.h
@@ -0,0 +1,17 @@
+#ifndef AVH_VOICEHELPER_H
+#define AVH_VOICEHELPER_H
+
+#include "util/nowarnings.h"
+#include "dlls/extdll.h"
+#include "dlls/util.h"
+#include "cbase.h"
+#include "game_shared/voice_gamemgr.h"
+
+class AvHVoiceHelper : public IVoiceGameMgrHelper
+{
+public:
+	virtual bool		CanPlayerHearPlayer(CBasePlayer *pListener, CBasePlayer *pTalker);
+};
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHWebSpinner.cpp b/main/source/mod/AvHWebSpinner.cpp
new file mode 100644
index 00000000..1311899b
--- /dev/null
+++ b/main/source/mod/AvHWebSpinner.cpp
@@ -0,0 +1,511 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHWebSpinner.cpp $
+// $Date: 2002/11/22 21:28:17 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHWebSpinner.cpp,v $
+// Revision 1.14  2002/11/22 21:28:17  Flayra
+// - mp_consistency changes
+//
+// Revision 1.13  2002/10/18 22:23:24  Flayra
+// - Refactoring for checking max buildings in radius as well
+//
+// Revision 1.12  2002/07/24 19:09:18  Flayra
+// - Linux issues
+//
+// Revision 1.11  2002/07/24 18:55:53  Flayra
+// - Linux case sensitivity stuff
+//
+// Revision 1.10  2002/07/24 18:45:43  Flayra
+// - Linux and scripting changes
+//
+// Revision 1.9  2002/07/08 17:23:03  Flayra
+// - Don't allow builder to web a player by hitting him
+//
+// Revision 1.8  2002/06/25 17:50:07  Flayra
+// - Some refactoring, new view model, removed old code, no longer costs resources to use, web projectile can ensnare marines without creating web
+//
+// Revision 1.7  2002/06/10 19:47:25  Flayra
+// - New level 2 view model
+//
+// Revision 1.6  2002/06/03 16:39:10  Flayra
+// - Added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.5  2002/05/28 18:13:37  Flayra
+// - Limit total webs, limit webs in sphere
+//
+// Revision 1.4  2002/05/23 02:32:39  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHPlayer.h"
+
+#ifdef AVH_CLIENT
+#include "cl_dll/eventscripts.h"
+#include "cl_dll/in_defs.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+#endif
+
+#include "common/hldm.h"
+#include "common/event_api.h"
+#include "common/event_args.h"
+#include "common/vector_util.h"
+#include "mod/AvHAlienEquipmentConstants.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHPlayerUpgrade.h"
+
+#include "mod/AvHConstants.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHGamerules.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHEntities.h"
+#include "dlls/cbasedoor.h"
+#include "dlls/plats.h"
+#include "mod/AvHTitles.h"
+#endif
+
+
+#ifdef AVH_SERVER
+LINK_ENTITY_TO_CLASS(kwWebProjectile, AvHWebProjectile);
+
+bool AvHWebProjectile::CreateWeb()
+{
+	bool theSuccessfulStrand = false;
+
+	AvHWebSpinner* theWebSpinner = NULL;
+	if(this->GetWebSpinner(theWebSpinner))
+	{
+		vec3_t theNewPoint = this->pev->origin;
+		
+		vec3_t theLastPoint;
+		if(theWebSpinner->GetLastPoint(theLastPoint))
+		{
+			// Check line between these two points.  If there's an obstruction then don't create strand
+			TraceResult theObstructionTR;
+			UTIL_TraceLine(theLastPoint, theNewPoint, ignore_monsters, NULL, &theObstructionTR);
+			if(theObstructionTR.flFraction == 1.0f)
+			{
+				// ...and if distance between this point and last valid point is short enough
+				float theDistance = (theNewPoint - theLastPoint).Length();
+				if(theDistance < kMaxWebDistance)
+				{
+					// Make sure our team doesn't have too many webs already
+					AvHTeam* theTeam = GetGameRules()->GetTeam((AvHTeamNumber)this->pev->team);
+					ASSERT(theTeam);
+
+					AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(CBaseEntity::Instance(this->pev->owner));
+					ASSERT(thePlayer);
+
+					int theNumStrands = theTeam->GetNumWebStrands();
+					if(theNumStrands < BALANCE_IVAR(kMaxTeamStrands))
+					{
+						// Finally, make sure there aren't too many strands in our immediate area, to prevent visibility problems.
+						// Note that it doesn't care if they are enemy or friendly web strands, so this may be a problem for alien vs. alien
+						int theNumWebsNearby = UTIL_CountEntitiesInSphere(theNewPoint, BALANCE_IVAR(kBuildingVisibilityRadius), kesTeamWebStrand);
+						if(theNumWebsNearby < BALANCE_IVAR(kNumWebsAllowedInRadius))
+						{
+							// Add new web strand
+							AvHWebStrand* theWebStrand = GetClassPtr((AvHWebStrand*)NULL);
+							theWebStrand->Setup(theLastPoint, theNewPoint);
+							theWebStrand->Spawn();
+							//theWebStrand->pev->owner = this->pev->owner;
+							theWebStrand->pev->team = this->pev->team;
+							
+							// Add decal at this point
+							UTIL_DecalTrace(&theObstructionTR, DECAL_SPIT1 + RANDOM_LONG(0,1));
+							
+							// Increment team strands
+							theTeam->SetNumWebStrands(theNumStrands + 1);
+							
+							theSuccessfulStrand = true;
+						}
+						else
+						{
+							// Send player message indicating they've reached the limit for this particular area
+							thePlayer->SendMessage(kTooManyWebsNearby, true);
+						}
+					}
+					else
+					{
+						// Send player message indicating they've reached the limit
+						thePlayer->SendMessage(kTooManyWebs, true);
+					}
+				}
+			}
+		}
+
+		theWebSpinner->SetLastPoint(theNewPoint);
+	}
+
+	return theSuccessfulStrand;
+}
+
+bool AvHWebProjectile::GetWebSpinner(AvHWebSpinner*& outSpinner)
+{
+	bool theSuccess = false;
+
+	CBaseEntity* theEntity = CBaseEntity::Instance(this->pev->owner);
+	if(theEntity)
+	{
+		AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(theEntity);
+		if(thePlayer)
+		{
+			AvHWebSpinner* theWebSpinner = dynamic_cast<AvHWebSpinner*>(thePlayer->m_pActiveItem);
+			if(theWebSpinner)
+			{
+				outSpinner = theWebSpinner;
+				theSuccess = true;
+			}
+		}
+	}
+
+	return theSuccess;
+}
+
+void AvHWebProjectile::Precache(void)
+{
+	CBaseEntity::Precache();
+	
+	PRECACHE_UNMODIFIED_MODEL(kWebProjectileSprite);
+}
+
+
+void AvHWebProjectile::Spawn()
+{
+	this->Precache();
+	CBaseEntity::Spawn();
+	
+	this->pev->movetype = MOVETYPE_FLY;
+	this->pev->classname = MAKE_STRING(kWebProjectileClassName);
+	
+	SET_MODEL(ENT(this->pev), kWebProjectileSprite);
+	this->pev->solid = SOLID_BBOX;
+	
+	// Comment out effects line, uncomment next four, then comment out creation of temp entity in EV_SpitGun to see server side spit for testing
+	if(!GetGameRules()->GetDrawInvisibleEntities())
+	{
+		this->pev->effects = EF_NODRAW;
+	}
+	else
+	{
+		this->pev->frame = 0;
+		this->pev->scale = 0.5;
+		this->pev->rendermode = kRenderTransAlpha;
+		this->pev->renderamt = 255;
+	}
+	
+	UTIL_SetSize(this->pev, Vector( 0, 0, 0), Vector(0, 0, 0));
+	//UTIL_SetSize(this->pev, Vector( -16, -16, -16), Vector(16, 16, 16));
+	//UTIL_SetSize(this->pev, Vector( -50, -50, -50), Vector(50, 50, 50));
+	
+	SetTouch(&AvHWebProjectile::WebTouch);
+}
+
+
+void AvHWebProjectile::WebTouch(CBaseEntity* inOther)
+{
+	// Never hit the player who fired it
+	if(inOther != CBaseEntity::Instance(this->pev->owner))
+	{
+		// If we an enemy player, ensnare them
+//		AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inOther);
+//		if(thePlayer && GetGameRules()->CanEntityDoDamageTo(this, inOther))
+//		{
+//			EMIT_SOUND(ENT(inOther->pev), CHAN_AUTO, kWebStrandBreakSound, 1.0, ATTN_IDLE);
+//			thePlayer->SetEnsnareState(true);
+//		}
+//		else
+//		{
+
+		// Can't hit players directly
+		if(!inOther->IsPlayer())
+		{
+			// If not in tourny mode, pass through friends
+			if((inOther->pev->team == 0) || (GetGameRules()->CanEntityDoDamageTo(this, inOther)))
+			{
+				// Create new strand
+				if(this->CreateWeb())
+				{
+					// Play sound when it hits
+					//EMIT_SOUND(ENT(this->m_pPlayer->pev), CHAN_AUTO, kWebSpinSound2, 1.0f, ATTN_NORM);
+				}
+			}
+		}
+
+		// Kill it off
+		SetThink(&AvHWebProjectile::SUB_Remove);
+		this->pev->nextthink = gpGlobals->time + .1f;
+		
+		SetTouch(NULL);
+	}
+}
+#endif
+
+
+
+LINK_ENTITY_TO_CLASS(kwWebSpinner, AvHWebSpinner);
+
+BOOL AvHWebSpinner::Deploy()
+{
+	#ifdef AVH_SERVER
+	this->mPlacedValidWebPointSinceDeploy = false;
+	#endif
+
+	return AvHAlienWeapon::Deploy();
+}
+
+int	AvHWebSpinner::GetBarrelLength() const
+{
+	return kWebSpinnerBarrelLength;
+}
+
+float AvHWebSpinner::GetRateOfFire() const
+{
+	return BALANCE_FVAR(kWebSpinnerROF);
+}
+
+int AvHWebSpinner::GetDeployAnimation() const
+{
+	int theDeployAnimation = 5;
+	
+	AvHWeaponID thePreviousID = this->GetPreviousWeaponID();
+	
+	switch(thePreviousID)
+	{
+	case AVH_WEAPON_WEBSPINNER:
+		theDeployAnimation = -1;
+		break;
+
+	// Spit and bile bomb look the same
+	case AVH_WEAPON_SPIT:
+	case AVH_WEAPON_BILEBOMB:
+		theDeployAnimation = 5;
+		break;
+	}
+	
+	return theDeployAnimation;
+}
+
+float AvHWebSpinner::GetDeployTime() const
+{
+	return 1.0f;
+}
+
+int	AvHWebSpinner::GetIdleAnimation() const
+{
+	return 2;
+}
+
+int	AvHWebSpinner::GetShootAnimation() const
+{
+	return 4;
+}
+
+bool AvHWebSpinner::GetFiresUnderwater() const
+{
+	return true;
+}
+
+bool AvHWebSpinner::GetIsDroppable() const
+{
+	return false;
+}
+	
+void AvHWebSpinner::Init()
+{
+	this->mRange = kWebSpinnerRange;
+
+	#ifdef AVH_SERVER
+	this->mPlacedValidWebPointSinceDeploy = false;
+	#endif
+}
+
+char* AvHWebSpinner::GetViewModel() const
+{
+	return kLevel2ViewModel;
+}
+
+
+void AvHWebSpinner::Precache(void)
+{
+	AvHAlienWeapon::Precache();
+	
+	PRECACHE_UNMODIFIED_SOUND(kWebSpinSound1);
+	PRECACHE_UNMODIFIED_SOUND(kWebSpinSound2);
+	
+	this->mEvent = PRECACHE_EVENT(1, kWebSpinnerShootEventName);
+}
+
+void AvHWebSpinner::Spawn()
+{
+    AvHAlienWeapon::Spawn(); 
+	
+	Precache();
+	
+	this->m_iId = AVH_WEAPON_WEBSPINNER;
+	
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsWebSpinner);
+	
+	SET_MODEL(ENT(this->pev), kNullModel);
+	
+	FallInit();// get ready to fall down.
+	
+}
+
+bool AvHWebSpinner::UsesAmmo(void) const
+{
+	return false;
+}
+
+void AvHWebSpinner::FireProjectiles(void)
+{
+#ifdef AVH_SERVER
+	
+	// Make sure we have enough points to shoot this thing
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this->m_pPlayer);
+	ASSERT(thePlayer);
+
+//	int theNumResources = thePlayer->GetResources();
+//	if(theNumResources >= kWebPointCost)
+//	{
+//		thePlayer->SetResources(theNumResources - kWebPointCost);
+
+		// Spawn WebProjectile
+		AvHWebProjectile* theWebProjectile = GetClassPtr((AvHWebProjectile*)NULL );
+		theWebProjectile->Spawn();
+		
+		UTIL_MakeVectors(thePlayer->pev->v_angle);
+		
+		Vector vecAiming = gpGlobals->v_forward;
+		Vector vecSrc = thePlayer->GetGunPosition( ) + vecAiming;
+		
+		UTIL_SetOrigin(theWebProjectile->pev, vecSrc);
+		
+		// This needs to be the same as in EV_WebProjectileGun
+		Vector theBaseVelocity;
+		VectorScale(this->pev->velocity, kWebProjectileParentVelocityScalar, theBaseVelocity);
+		
+		Vector theStartVelocity;
+		VectorMA(theBaseVelocity, kWebProjectileVelocity, vecAiming, theStartVelocity);
+		
+		VectorCopy(theStartVelocity, theWebProjectile->pev->velocity);
+		
+		// Set owner
+		theWebProjectile->pev->owner = ENT(thePlayer->pev);
+		
+		// Set WebProjectile's team :)
+		theWebProjectile->pev->team = thePlayer->pev->team;
+		
+	//	// Do a traceline to see where they want to place new web point
+	//	UTIL_MakeVectors(this->m_pPlayer->pev->v_angle);
+	//
+	//	Vector theForwardDir = gpGlobals->v_forward;
+	//	VectorNormalize(theForwardDir);
+	//
+	//	TraceResult	theNewStrandTR;
+	//	UTIL_TraceLine(this->pev->origin + this->pev->view_ofs, this->pev->origin + this->pev->view_ofs + theForwardDir*128, ignore_monsters, ENT(this->m_pPlayer->pev), &theNewStrandTR);
+	//	if (theNewStrandTR.flFraction != 1.0)
+	//	{
+	//		//CBaseEntity* theWorld = dynamic_cast<CWorld*>(CBaseEntity::Instance(tr.pHit));
+	//		//if(theWorld)
+	//		//{
+	//
+	//		bool theSuccessfulStrand = false;
+	//
+	//		// Only allow webs on the world, not doors, entities, players
+	//		CBaseDoor* theDoor = dynamic_cast<CBaseDoor*>(CBaseEntity::Instance(theNewStrandTR.pHit));
+	//		CBasePlatTrain* theTrain = dynamic_cast<CBasePlatTrain*>(CBaseEntity::Instance(theNewStrandTR.pHit));
+	//		if((!theDoor) && (!theTrain))
+	//		{
+	//			vec3_t theNewPoint = theNewStrandTR.vecEndPos;
+	//			vec3_t theNewNormal = theNewStrandTR.vecPlaneNormal;
+	//
+	//			// If we've placed another point
+	//			if(this->mPlacedValidWebPointSinceDeploy)
+	//			{
+	//				// Check line between these two points.  If there's an obstruction (that's not us?) then remember new point but don't create strand
+	//				TraceResult theObstructionTR;
+	//				UTIL_TraceLine(this->mLastValidWebPoint, theNewPoint, ignore_monsters, ENT(this->m_pPlayer->pev), &theObstructionTR);
+	//				if(theObstructionTR.flFraction == 1.0f)
+	//				{
+	//					// Check to make sure the normals are different, can't place on the same surface for fairness
+	//					if(!(theNewNormal == this->mLastValidWebNormal))
+	//					{
+	//						// ...and if distance between this point and last valid point is short enough
+	//						float theDistance = (theNewPoint - this->mLastValidWebPoint).Length();
+	//						if(theDistance < kMaxWebDistance)
+	//						{
+	//							// Add new web strand
+	//							AvHWebStrand* theWebStrand = GetClassPtr((AvHWebStrand*)NULL);
+	//							theWebStrand->Setup(this->mLastValidWebPoint, theNewPoint);
+	//							theWebStrand->Spawn();
+	//							theWebStrand->pev->owner = ENT(this->m_pPlayer->pev);
+	//							theWebStrand->pev->team = this->m_pPlayer->pev->team;
+	//
+	//							theSuccessfulStrand = true;
+	//						}
+	//					}
+	//				}
+	//			}
+	//			else
+	//			{
+	//				theSuccessfulStrand = true;
+	//			}
+	//
+	//			if(theSuccessfulStrand)
+	//			{
+	//				// Play web confirmation sound
+	//				EMIT_SOUND(ENT(this->m_pPlayer->pev), CHAN_AUTO, kWebSpinSound2, 1.0f, ATTN_NORM);
+	//				
+	//				// Add decal at this point
+	//				UTIL_DecalTrace(&theNewStrandTR, DECAL_SPIT1 + RANDOM_LONG(0,1));
+	//			}
+	//
+	//			// Set new valid last point to current point
+	//			this->mLastValidWebPoint = theNewPoint;
+	//			this->mLastValidWebNormal = theNewNormal;
+	//			this->mPlacedValidWebPointSinceDeploy = true;
+	//		}
+	//	}
+//	}
+//	else
+//	{
+//		thePlayer->PlayHUDSound(HUD_SOUND_ALIEN_MORE);
+//	}
+				
+	#endif	
+}
+
+#ifdef AVH_SERVER
+bool AvHWebSpinner::GetLastPoint(vec3_t& outLastPoint) const
+{
+	bool theSuccess = false;
+
+	if(this->mPlacedValidWebPointSinceDeploy)
+	{
+		VectorCopy(this->mLastValidWebPoint, outLastPoint);
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+void AvHWebSpinner::SetLastPoint(vec3_t& inLastPoint)
+{
+	VectorCopy(inLastPoint, this->mLastValidWebPoint);
+	this->mPlacedValidWebPointSinceDeploy = true;
+}
+#endif
+
diff --git a/main/source/mod/AvHWeldable.cpp b/main/source/mod/AvHWeldable.cpp
new file mode 100644
index 00000000..9a250f80
--- /dev/null
+++ b/main/source/mod/AvHWeldable.cpp
@@ -0,0 +1,484 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHWeldable.cpp $
+// $Date: 2002/10/03 18:49:43 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHWeldable.cpp,v $
+// Revision 1.2  2002/10/03 18:49:43  Flayra
+// - Changes for welding order completion
+//
+// Revision 1.1  2002/05/23 02:32:39  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHWeldable.h"
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHServerUtil.h"
+
+LINK_ENTITY_TO_CLASS(keWeldable, AvHWeldable);
+
+const float kPlayerTouchInterval = 1.0f;
+
+AvHWeldable::AvHWeldable()
+{
+	// Reset "template" values
+	this->mNonUpgradedMaxHealth = 100;
+	this->mMaxHealth = this->mNonUpgradedMaxHealth;
+	this->mThinkInterval = .1f;
+	this->mMaterial = matWood;
+	
+	this->Init();
+}
+
+void AvHWeldable::AddChecksum(Checksum& inChecksum)
+{
+	AvHBaseEntity::AddChecksum(inChecksum);
+
+	inChecksum.AddChecksum("AvHWeldable::mWelded", this->mWelded);
+	inChecksum.AddFloatChecksum("AvHWeldable::mBuildTime", this->mBuildTime);
+	inChecksum.AddFloatChecksum("AvHWeldable::mTimeBuilt", this->mTimeBuilt);
+	inChecksum.AddFloatChecksum("AvHWeldable::mMaxHealth", this->mMaxHealth);
+	inChecksum.AddChecksum("AvHWeldable::mUseState", this->mUseState);
+}
+
+void AvHWeldable::Init()
+{
+	// Reset "non-template" values
+	this->mWelded = false;
+	this->mWeldOpens = false;
+	this->mUseState = false;
+	this->mDestroyed = false;
+	
+	this->mTimeBuilt = 0;
+	this->mTimeLastPlayerTouch = -1;
+}
+
+
+// Called by the welder when fired at a weldable
+void AvHWeldable::AddBuildTime(float inTime)
+{
+	if(this->GetCanBeWelded())
+	{
+		this->mTimeBuilt += inTime;
+		if(this->mTimeBuilt >= this->mBuildTime)
+		{
+			this->mWelded = true;
+			this->TriggerFinished();
+		}
+		this->UpdateEntityState();
+	}
+}
+
+bool AvHWeldable::GetCanBeWelded() const
+{
+	return (!this->mWelded && /*this->mUseState &&*/ !this->mDestroyed && ( this->mWeldOpens || (this->mTimeLastPlayerTouch == -1) || (gpGlobals->time > (this->mTimeLastPlayerTouch + kPlayerTouchInterval)  ) ) );
+}
+
+float AvHWeldable::GetNormalizedBuildPercentage() const
+{
+	bool theIsBuilding, theIsResearching;
+	float thePercentageBuilt;
+	AvHSHUGetBuildResearchState(this->pev->iuser3, this->pev->iuser4, this->pev->fuser1, theIsBuilding, theIsResearching, thePercentageBuilt);
+	
+	return thePercentageBuilt;	
+}
+
+bool AvHWeldable::GetIsWelded() const
+{
+	return this->mWelded;
+}
+
+bool AvHWeldable::GetWeldOpens() const
+{
+	return this->mWeldOpens;
+}
+
+void AvHWeldable::KeyValue( KeyValueData* pkvd )
+{
+	// "Health to destroy once welded (-1 infinite)" : "-1"
+	if (FStrEq(pkvd->szKeyName, "weldableHealth"))
+	{
+		this->mNonUpgradedMaxHealth = atof(pkvd->szValue);
+		this->mMaxHealth = this->mNonUpgradedMaxHealth;
+		pkvd->fHandled = TRUE;
+	}
+	// "Seconds to weld" : "20"
+	else if (FStrEq(pkvd->szKeyName, "weldableTime"))
+	{
+		this->mBuildTime = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
+	// "Build sounds filespec" : "sc/scv_build"
+	else if (FStrEq(pkvd->szKeyName, "weldableSounds"))
+	{
+		pkvd->fHandled = TRUE;
+	}
+	// "Target to trigger on break" : ""
+	else if (FStrEq(pkvd->szKeyName, "targetOnBreak"))
+	{
+		this->mTargetOnBreak = pkvd->szValue;
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "targetOnUse"))
+	{
+		this->mTargetOnUse = pkvd->szValue;
+		pkvd->fHandled = TRUE;
+	}
+	// "Target to trigger on finish" : ""
+	else if (FStrEq(pkvd->szKeyName, "targetOnFinish"))
+	{
+		this->mTargetOnFinish = pkvd->szValue;
+		pkvd->fHandled = TRUE;
+	}
+	else if (FStrEq(pkvd->szKeyName, "material"))
+	{
+		int i = atoi( pkvd->szValue);
+		
+		// 0:glass, 1:metal, 2:flesh, 3:wood
+		
+		if ((i < 0) || (i >= matLastMaterial))
+			this->mMaterial = matWood;
+		else
+			this->mMaterial = (Materials)i;
+		
+		pkvd->fHandled = TRUE;
+	}
+	else
+	{
+		AvHBaseEntity::KeyValue(pkvd);
+	}
+}
+
+void AvHWeldable::Killed( entvars_t *pevAttacker, int iGib )
+{
+	AvHSUExplodeEntity(this, this->mMaterial);
+
+	AvHBaseEntity::Killed(pevAttacker, iGib);
+
+	this->TriggerBroken();
+}
+
+void AvHWeldable::NotifyUpgrade(AvHUpgradeMask inUpgradeMask)
+{
+	if(this->mMaxHealth != -1)
+	{
+		if((this->mWelded && !this->mWeldOpens && !this->mDestroyed))
+		{
+//			if((inUpgradeMask == MARINE_UPGRADE_6) || (inUpgradeMask == MARINE_UPGRADE_5) || (inUpgradeMask == MARINE_UPGRADE_4))
+//			{
+//				float theArmorMultiplier;
+//				AvHPlayerUpgrade::GetArmorUpgrade(this->pev->iuser4, &theArmorMultiplier);
+//				
+//				// Upgrade max health, making welds stronger (always apply to base value)
+//				this->mMaxHealth = this->mNonUpgradedMaxHealth*theArmorMultiplier;
+//			}
+		}
+	}
+}
+
+void AvHWeldable::EndTrace(void)
+{
+//	//if(!this->mWelded)
+//	//{
+//	if(!this->mWelded && !this->mWeldOpens)
+//		this->pev->solid = SOLID_NOT;
+//	//}
+}
+
+void AvHWeldable::ResetEntity()
+{
+	this->Init();
+
+	UTIL_SetOrigin(pev, pev->origin);
+	SET_MODEL(ENT(pev), STRING(pev->model));
+	
+	this->SetPEVFlagsFromState();
+
+	this->pev->iuser3 = AVH_USER3_WELD;
+	AvHSHUSetBuildResearchState(this->pev->iuser3, this->pev->iuser4, this->pev->fuser1, true, 0.0f);
+	this->pev->health = this->mMaxHealth*kBaseHealthPercentage;
+
+	this->UpdateEntityState();
+}
+
+void AvHWeldable::StartTrace(void)
+{
+	//	//if(!this->mWelded)
+	//	//{
+	//	if(!this->mWelded && !this->mWeldOpens)
+	//	{
+	//		this->pev->solid = SOLID_BSP;
+	//		this->pev->movetype = MOVETYPE_PUSHSTEP;
+	//	}
+	//	//}
+}
+
+void AvHWeldable::Precache(void)
+{
+	AvHBaseEntity::Precache();
+	
+	PRECACHE_MODEL( (char *)STRING(pev->model) );
+	
+	// Precache every type of func breakable
+	//UTIL_PrecacheOther("func_breakable");
+	CBreakable::PrecacheAll();
+}
+
+void AvHWeldable::SetHealth()
+{
+	float thePercentageBuilt = this->GetNormalizedBuildPercentage();
+	if(this->mMaxHealth == -1)
+	{
+		this->pev->takedamage = DAMAGE_NO;
+		this->pev->health = 100;
+	}
+	else
+	{
+		if(!this->mWeldOpens)
+		{	
+			this->pev->takedamage = DAMAGE_YES;
+			this->pev->health = thePercentageBuilt*this->mMaxHealth;
+		}
+	}
+}
+
+void AvHWeldable::SetPEVFlagsFromState()
+{
+	// Set spawn flags
+	if(this->pev->spawnflags & 1)
+	{
+		this->mUseState = true;
+	}
+	if(this->pev->spawnflags & 2)
+	{
+		this->mWeldOpens = true;
+	}
+	
+	if(this->mWeldOpens)
+	{
+		this->pev->solid = SOLID_BSP;
+		this->pev->movetype = MOVETYPE_PUSH;
+	}
+	else
+	{
+		this->pev->movetype = MOVETYPE_FLY;//MOVETYPE_PUSH;
+		this->pev->solid = 5;
+		//this->pev->solid = SOLID_NOT;
+	}
+
+	// Reset visuals
+	this->pev->rendermode = kRenderNormal;
+	this->pev->renderamt = 255;
+
+	// TODO: Do this in combination with above to fix weldable collision and trace problems?
+	//this->pev->flags |= FL_WORLDBRUSH;
+}
+
+void AvHWeldable::Spawn()
+{
+	Precache();
+
+	AvHBaseEntity::Spawn();
+
+	// Set model
+    pev->classname = MAKE_STRING(kwsWeldableClassName);
+
+	this->SetPEVFlagsFromState();
+
+	//this->pev->solid = (this->mWeldOpens ? SOLID_BSP : SOLID_NOT);
+	////this->pev->movetype = MOVETYPE_PUSH;
+	//this->pev->movetype = MOVETYPE_FLY;
+	
+	//this->pev->rendermode = kRenderTransTexture;
+	//	if(this->mWeldOpens)
+	//	{
+	//		this->pev->rendermode = kRenderNormal;
+	//		this->pev->renderamt = 255;
+	//	}
+	//	else
+	//	{
+	//		this->pev->rendermode = kRenderTransTexture;
+	//		this->pev->renderamt = this->mStartAlpha;
+	//	}
+	
+//	UTIL_SetOrigin(pev, pev->origin);
+//	SET_MODEL(ENT(pev), STRING(pev->model));
+	
+	// Set use so it can be toggled on and off like a switch, not used by the player 
+	SetUse(&AvHWeldable::WeldableUse);
+	SetTouch(&AvHWeldable::WeldableTouch);
+	
+	// Set think so it can be destroyed
+	//SetThink(WeldableThink);
+	//pev->nextthink = gpGlobals->time + this->mThinkInterval;
+}
+
+//int	AvHWeldable::TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType )
+//{
+//	if(flDamage >= this->pev->health)
+//	{
+//		this->mWelded = false;
+//		this->mDestroyed = false;
+//		//SetThink(NULL);
+//		
+//		// Trigger sound and destruction effects
+//		this->Explode();
+//	}
+//
+//	return AvHBaseEntity::TakeDamage(pevInflictor, pevAttacker, flDamage, bitsDamageType);
+//}
+
+void AvHWeldable::TriggerBroken()
+{
+	if(this->mTargetOnBreak != "")
+	{
+		FireTargets(this->mTargetOnBreak.c_str(), NULL, NULL, USE_TOGGLE, 0.0f);
+	}
+}
+
+void AvHWeldable::TriggerFinished()
+{
+	if(this->mTargetOnFinish != "")
+	{
+		FireTargets(this->mTargetOnFinish.c_str(), NULL, NULL, USE_TOGGLE, 0.0f);
+	}
+}
+
+void AvHWeldable::TriggerUse()
+{
+	if(this->mTargetOnUse != "")
+	{
+		FireTargets(this->mTargetOnUse.c_str(), NULL, NULL, USE_TOGGLE, 0.0f);
+	}
+}
+
+void AvHWeldable::UpdateEntityState()
+{
+//    if(this->mAlwaysDrawNoFade)
+//	{
+//		this->pev->renderamt = 255;
+//	}
+//	else
+//	{
+//		float thePercentageBuilt = this->GetNormalizedBuiltPercentage();
+//		if(this->mWeldOpens)
+//		{
+//			this->pev->renderamt = this->mStartAlpha - thePercentageBuilt*this->mStartAlpha;
+//		}
+//		else
+//		{
+//			this->pev->renderamt = this->mStartAlpha + thePercentageBuilt*(255 - this->mStartAlpha);
+//		}
+//	}
+
+	float theBuiltPercentage = this->mTimeBuilt/this->mBuildTime;
+	//this->pev->fuser1 = thePercentageBuilt*kNormalizationNetworkFactor;
+	AvHSHUSetBuildResearchState(this->pev->iuser3, this->pev->iuser4, this->pev->fuser1, true, theBuiltPercentage);
+	this->pev->health = this->mMaxHealth*kBaseHealthPercentage + theBuiltPercentage*(1.0f - kBaseHealthPercentage);
+	
+//	if(thePercentageBuilt > 0.0f)
+//	{
+//		UTIL_ClientPrintAll( HUD_PRINTNOTIFY, UTIL_VarArgs( "Setting build percentage to %f...\n", this->pev->fuser1));
+//	}
+	
+	if(this->mWelded)
+	{
+		// Once built, toggle the solid state and allow it to take damage
+		if(this->mWeldOpens)
+		{
+			this->pev->rendermode = kRenderTransTexture;
+			this->pev->renderamt = 0;
+			this->pev->solid = 5;
+
+			AvHSUExplodeEntity(this, this->mMaterial);
+		}
+		else
+		{
+			this->pev->solid = SOLID_BSP;
+			this->pev->movetype = MOVETYPE_PUSH;
+			this->pev->rendermode = kRenderNormal;
+		}
+
+		// Clear progress bar indicators
+		//this->pev->iuser3 = AVH_USER3_NONE;
+		this->pev->fuser1 = -1;
+
+		//this->pev->solid = (!this->mWeldOpens ? SOLID_BSP : SOLID_NOT);
+		//this->pev->movetype = MOVETYPE_PUSH;
+		
+		// Closeable welds can take damage
+		this->SetHealth();
+	}
+
+	// Indicate that it can no longer be the target of a weld
+	if(this->mWelded || this->mDestroyed)
+	{
+		//this->pev->fuser1 = -1;
+		AvHSHUSetBuildResearchState(this->pev->iuser3, this->pev->iuser4, this->pev->fuser1, true, -1);
+	}
+}
+
+//void AvHWeldable::WeldableThink(void)
+//{
+//	if(pev->health <= 0 && this->mWelded)
+//	{
+//		this->mWelded = false;
+//		this->mDestroyed = false;
+//		SetThink(NULL);
+//
+//		// Trigger sound and destruction effects
+//		this->Explode();
+//	}
+//	else
+//	{
+//		pev->nextthink = gpGlobals->time + this->mThinkInterval;
+//	}
+//}
+
+void AvHWeldable::WeldableTouch(CBaseEntity *pOther)
+{
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(pOther);
+	if(thePlayer && thePlayer->IsAlive())
+	{
+		this->mTimeLastPlayerTouch = gpGlobals->time;
+	}
+}
+
+void AvHWeldable::WeldableUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
+{
+	// Can't toggle it once it's been welded
+	if(!this->mWelded)
+	{
+		switch(useType)
+		{
+		case USE_OFF:
+			this->mUseState = false;
+			break;
+			
+		case USE_ON:
+			this->mUseState = true;
+			break;
+			
+		case USE_SET:
+			// Handle this?
+			break;
+			
+		case USE_TOGGLE:
+			if(!this->mWelded || this->mDestroyed)
+			{
+				this->mUseState = !this->mUseState;
+				this->TriggerUse();
+			}
+			break;
+		}
+	}
+}
+
diff --git a/main/source/mod/AvHWeldable.h b/main/source/mod/AvHWeldable.h
new file mode 100644
index 00000000..6f376686
--- /dev/null
+++ b/main/source/mod/AvHWeldable.h
@@ -0,0 +1,93 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHWeldable.h $
+// $Date: 2002/10/03 18:49:43 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHWeldable.h,v $
+// Revision 1.2  2002/10/03 18:49:43  Flayra
+// - Changes for welding order completion
+//
+// Revision 1.1  2002/05/23 02:32:40  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef AVH_WELDABLE_H
+#define AVH_WELDABLE_H
+
+#include "mod/AvHEntities.h"
+
+class AvHWeldable : public AvHBaseEntity
+{
+public:
+					AvHWeldable();
+	
+	void			AddBuildTime(float inTime);
+
+	virtual void	AddChecksum(Checksum& inChecksum);
+	
+	void			EndTrace(void);
+
+	bool			GetCanBeWelded() const;
+
+	bool			GetIsWelded() const;
+		
+	virtual float	GetNormalizedBuildPercentage() const;
+	
+	bool			GetWeldOpens() const;
+
+	virtual void	KeyValue( KeyValueData* pkvd );
+	
+	virtual void	Killed( entvars_t *pevAttacker, int iGib );
+
+	virtual void	NotifyUpgrade(AvHUpgradeMask inUpgradeMask);
+	
+	virtual void	Precache(void);
+
+	virtual void	ResetEntity(void);
+	
+	virtual void	Spawn();
+	
+	void			StartTrace(void);
+	//virtual int		TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType );
+
+	//void EXPORT		WeldableThink(void);
+
+	void EXPORT		WeldableTouch(CBaseEntity *pOther);
+
+	void EXPORT		WeldableUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
+
+private:
+	void			Init();
+	void			SetHealth();
+	void			SetPEVFlagsFromState();
+	void			TriggerBroken();
+	void			TriggerFinished();
+	void			TriggerUse();
+	void			UpdateEntityState();
+	
+	bool			mWelded;
+	bool			mWeldOpens;
+	bool			mUseState;
+	bool			mDestroyed;
+	
+	Materials		mMaterial;
+	string			mTargetOnBreak;
+	string			mTargetOnFinish;
+	string			mTargetOnUse;
+	float			mTimeBuilt;
+	float			mBuildTime;
+	float			mMaxHealth;
+	float			mNonUpgradedMaxHealth;
+	float			mThinkInterval;
+	float			mTimeLastPlayerTouch;
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/AvHWelder.cpp b/main/source/mod/AvHWelder.cpp
new file mode 100644
index 00000000..92f1f40d
--- /dev/null
+++ b/main/source/mod/AvHWelder.cpp
@@ -0,0 +1,375 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: AvHWelder.cpp $
+// $Date: 2002/11/22 21:28:17 $
+//
+//-------------------------------------------------------------------------------
+// $Log: AvHWelder.cpp,v $
+// Revision 1.23  2002/11/22 21:28:17  Flayra
+// - mp_consistency changes
+//
+// Revision 1.22  2002/11/12 02:29:48  Flayra
+// - Change inflictor for better logging
+//
+// Revision 1.21  2002/11/06 01:39:26  Flayra
+// - Damage refactoring (TakeDamage assumes caller has already adjusted for friendly fire, etc.)
+//
+// Revision 1.20  2002/10/03 18:47:40  Flayra
+// - Added heavy view model
+//
+// Revision 1.19  2002/09/23 22:37:04  Flayra
+// - Fixed bug (typo?!) where welder was removing jetpacks (and removing marine status!)
+//
+// Revision 1.18  2002/08/16 02:49:45  Flayra
+// - Updates to allow welder to repair buildables
+// - Removed ability to repair soldier armor until it's visible
+//
+// Revision 1.17  2002/07/26 23:03:08  Flayra
+// - New artwork
+//
+// Revision 1.16  2002/06/25 17:50:31  Flayra
+// - Reworking for correct player animations and new enable/disable state, new view model artwork, alien weapon refactoring
+//
+// Revision 1.15  2002/06/03 16:39:10  Flayra
+// - Added different deploy times (this should be refactored a bit more)
+//
+// Revision 1.14  2002/05/28 17:44:26  Flayra
+// - Tweak weapon deploy volume, as Valve's sounds weren't normalized, welder clears webs now, welder no longer makes ambient hum, slight refactoring of variable names away from Valve style
+//
+// Revision 1.13  2002/05/23 02:32:40  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "mod/AvHMarineWeapons.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "mod/AvHWeldable.h"
+#include "mod/AvHSpecials.h"
+
+#ifdef AVH_SERVER
+#include "mod/AvHPlayerUpgrade.h"
+#include "AvHServerUtil.h"
+#include "mod/AvHPlayer.h"
+#include "mod/AvHMarineEquipment.h"
+#include "mod/AvHGamerules.h"
+
+extern int	gWelderConstEventID;
+#endif
+
+int AvHWelder::GetDeployAnimation() const
+{
+	return 3;
+}
+
+float AvHWelder::GetDeployTime() const
+{
+	return .55f;
+}
+
+char* AvHWelder::GetHeavyViewModel() const
+{
+	return kWelderHVVModel;
+}
+
+char* AvHWelder::GetPlayerModel() const
+{
+	return kWelderPModel;
+}
+
+int	AvHWelder::GetShootAnimation() const
+{
+	return 2;
+}
+
+char* AvHWelder::GetViewModel() const
+{
+	return kWelderVModel;
+}
+
+char* AvHWelder::GetWorldModel() const
+{
+	return kWelderWModel;
+}
+
+void AvHWelder::FireProjectiles(void)
+{
+#ifdef AVH_SERVER
+	
+	//	FOR_ALL_ENTITIES(kwsWeldableClassName, AvHWeldable*)
+	//		theEntity->StartTrace();
+	//	END_FOR_ALL_ENTITIES(kwsWeldableClassName)
+	
+	Vector theWelderBarrel = this->GetWorldBarrelPoint();
+
+	UTIL_MakeVectors(this->m_pPlayer->pev->v_angle);
+	Vector vecEnd = theWelderBarrel + gpGlobals->v_forward*BALANCE_IVAR(kWelderRange);
+
+	TraceResult tr;
+	UTIL_TraceLine(theWelderBarrel, vecEnd, dont_ignore_monsters, dont_ignore_glass, ENT( m_pPlayer->pev ), &tr);
+	float theROF = this->GetRateOfFire();
+	bool theDidWeld = false;
+
+	if(tr.flFraction != 1.0f)
+	{
+		// If it's a weldable, check if it's valid for construction
+		CBaseEntity* theEntity = CBaseEntity::Instance(tr.pHit);
+		AvHWeldable* theWeldable = dynamic_cast<AvHWeldable*>(theEntity);
+		if(theWeldable)
+		{
+			if(theWeldable->GetCanBeWelded())
+			{
+				// Build it by the amount of our rate of fire
+				theWeldable->AddBuildTime(theROF);
+
+				AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(this->m_pPlayer);
+				ASSERT(thePlayer);
+				thePlayer->TriggerProgressBar(theWeldable->entindex(), 1);
+				theDidWeld = true;
+			}
+		}
+		// else it's not a weldable, apply damage to it
+		else
+		{
+			if(this->m_pPlayer->pev->team == theEntity->pev->team)
+			{
+				// Hack in quick playest ability for welder to rebuild dead command stations
+//				if((theEntity->pev->classname == MAKE_STRING(kwsTeamCommand)) && (theEntity->pev->health == 0))
+//				{
+//					theEntity->ResetEntity();
+//				}
+//				else
+//				{
+				if( this->RepairTarget(theEntity, theROF) )
+					theDidWeld = true;
+//				}
+			}
+			else
+			{
+				// Apply damage to it and playback other event
+				float theScalar = 1.0f;
+				if(GetGameRules()->CanEntityDoDamageTo(this->m_pPlayer, theEntity, &theScalar))
+				{
+					float theDamageMultiplier;
+					AvHPlayerUpgrade::GetWeaponUpgrade(this->m_pPlayer->pev->iuser3, this->m_pPlayer->pev->iuser4, &theDamageMultiplier);
+					float theDamage = this->mDamage*theDamageMultiplier*theScalar;
+					
+					theEntity->TakeDamage(this->pev, this->m_pPlayer->pev, theDamage, DMG_BURN);
+				}
+			}
+		}
+
+
+		if(!theDidWeld)
+		{
+			if(this->GetIsWelding())
+			{
+				PLAYBACK_EVENT_FULL(0, this->m_pPlayer->edict(), gWelderConstEventID, 0, this->m_pPlayer->pev->origin, (float *)&g_vecZero, 0.0, 0.0, 1, 0, 0, 0 );
+				this->SetIsWelding(false);
+			}
+		}
+		else
+		{
+			if(!this->GetIsWelding())
+			{
+				PLAYBACK_EVENT_FULL(0, this->m_pPlayer->edict(), gWelderConstEventID, 0, this->m_pPlayer->pev->origin, (float *)&g_vecZero, 0.0, 0.0, 0, 0, 0, 0 );
+				this->SetIsWelding(true);
+			}
+		}
+	}
+	else
+	{
+		if(this->GetIsWelding())
+		{
+			PLAYBACK_EVENT_FULL(0, this->m_pPlayer->edict(), gWelderConstEventID, 0, this->m_pPlayer->pev->origin, (float *)&g_vecZero, 0.0, 0.0, 1, 0, 0, 0 );
+			this->SetIsWelding(false);
+		}
+	}
+
+	// Scan area for webs, and clear them.  I can't make the webs solid, and it seems like the welder might do this, so why not?  Also
+	// adds neat element of specialization where a guy with a welder might be needed to clear an area before an attack, kinda RPS
+	const float kWebClearingRadius = 75;
+	CBaseEntity* thePotentialWebStrand = NULL;
+	while((thePotentialWebStrand = UTIL_FindEntityInSphere(thePotentialWebStrand, theWelderBarrel, kWebClearingRadius)) != NULL)
+	{
+		AvHWebStrand* theWebStrand = dynamic_cast<AvHWebStrand*>(thePotentialWebStrand);
+		if(theWebStrand)
+		{
+			theWebStrand->Break();
+		}
+	}
+
+//	FOR_ALL_ENTITIES(kwsWeldableClassName, AvHWeldable*)
+//		theEntity->EndTrace();
+//	END_FOR_ALL_ENTITIES(kwsWeldableClassName)
+
+	#endif
+}
+
+int	AvHWelder::GetBarrelLength() const
+{
+	// Note that this variable is used in EV_Welder
+	return kWelderBarrelLength; 
+}
+
+float AvHWelder::GetRateOfFire() const
+{
+	return BALANCE_FVAR(kWelderROF);
+}
+
+void AvHWelder::Holster( int skiplocal )
+{
+	AvHMarineWeapon::Holster(skiplocal);
+
+#ifdef AVH_SERVER
+	if(this->GetIsWelding()) 
+	{
+		PLAYBACK_EVENT_FULL(0, this->m_pPlayer->edict(), gWelderConstEventID, 0, this->m_pPlayer->pev->origin, (float *)&g_vecZero, 0.0, 0.0, 1, 0, 0, 0 );
+		this->SetIsWelding(false);
+	}
+#endif
+
+#ifndef AVH_MAPPER_BUILD
+	PLAYBACK_EVENT_FULL(0, this->m_pPlayer->edict(), this->mEndEvent, 0, this->m_pPlayer->pev->origin, (float *)&g_vecZero, 0.0, 0.0, 0, 0, 0, 0 );
+	this->PlaybackEvent(this->mEndEvent);
+#endif
+}
+
+void AvHWelder::WeaponIdle(void)
+{
+#ifdef AVH_SERVER
+	if(this->GetIsWelding() && this->mAttackButtonDownLastFrame) 
+	{
+		PLAYBACK_EVENT_FULL(0, this->m_pPlayer->edict(), gWelderConstEventID, 0, this->m_pPlayer->pev->origin, (float *)&g_vecZero, 0.0, 0.0, 1, 0, 0, 0 );
+		this->SetIsWelding(false);
+	}
+#endif
+
+	AvHMarineWeapon::WeaponIdle();
+}
+
+
+void AvHWelder::Init()
+{
+	this->mRange = BALANCE_IVAR(kWelderRange);
+	this->mDamage = BALANCE_IVAR(kWelderDamage);
+	this->SetIsWelding(false);
+}
+
+BOOL AvHWelder::IsUseable(void)
+{
+	// No ammo, always useable
+	return TRUE;
+}
+
+void AvHWelder::Precache()
+{
+	AvHMarineWeapon::Precache();
+	
+	PRECACHE_UNMODIFIED_SOUND(kWeldingSound);
+	PRECACHE_UNMODIFIED_SOUND(kWeldingHitSound);
+	PRECACHE_UNMODIFIED_SOUND(kWeldingStopSound);
+	
+	this->mEvent = PRECACHE_EVENT(1, kWelderEventName);
+	PRECACHE_EVENT(1, kWelderConstEventName);
+	
+	this->mStartEvent = PRECACHE_EVENT(1, kWelderStartEventName);
+	this->mEndEvent = PRECACHE_EVENT(1, kWelderEndEventName);
+}
+
+#ifdef AVH_SERVER
+
+bool AvHWelder::RepairTarget(CBaseEntity* inEntity, float inROF)
+{
+    int theAmountToRepair = inROF*BALANCE_IVAR(kWelderRepairRate);
+	
+	bool theReturn = false;
+
+	if(inEntity)
+	{
+		AvHPlayer* theHitPlayer = dynamic_cast<AvHPlayer*>(inEntity);
+
+		if(theHitPlayer)
+		{
+			// Repair armor if possible
+			int theCurrentArmor = theHitPlayer->pev->armorvalue;
+			int theMaxArmor = AvHPlayerUpgrade::GetMaxArmorLevel(theHitPlayer->pev->iuser4, theHitPlayer->GetUser3());
+			
+			if(theCurrentArmor < theMaxArmor)
+			{
+				int theNewArmor = theCurrentArmor + (theAmountToRepair * BALANCE_FVAR(kWelderPlayerModifier));
+				theHitPlayer->pev->armorvalue = min(theMaxArmor, theNewArmor);
+				theReturn = true;
+			}
+            
+            // Burn off webs
+            if(theHitPlayer->GetIsEnsnared())
+            {
+                theHitPlayer->SetEnsnareState(false);
+				theReturn = true;
+            }
+		}
+		else //if(GetHasUpgrade(inEntity->pev->iuser4, MASK_BUILDABLE))
+		{
+			// Max health in armorvalue
+			AvHBaseBuildable* theBuildable = dynamic_cast<AvHBaseBuildable*>(inEntity);
+			if(theBuildable)
+			{
+				if(theBuildable->Regenerate((theAmountToRepair * BALANCE_FVAR(kWelderBuildingModifier)), false))
+                {
+                    // Award experience for welding the CC.  Might award a little more if barely wounded, but that seems OK.
+                    if(GetGameRules()->GetIsCombatMode() && (theBuildable->pev->iuser3 == AVH_USER3_COMMANDER_STATION))
+                    {
+                        AvHPlayer* theWeldingPlayer = dynamic_cast<AvHPlayer*>(this->m_pPlayer);
+                        if(theWeldingPlayer && (theWeldingPlayer->pev->team == theBuildable->pev->team))
+                        {
+                            float theCombatHealExperienceScalar = BALANCE_FVAR(kCombatHealExperienceScalar);
+                            theWeldingPlayer->AwardExperienceForObjective(theAmountToRepair*theCombatHealExperienceScalar, theBuildable->GetMessageID());
+                        }
+                    }
+					theReturn = true;
+                }
+			}
+		}
+	}
+	return theReturn;
+}
+#endif
+
+void AvHWelder::Spawn() 
+{ 
+    AvHMarineWeapon::Spawn(); 
+
+	Precache();
+
+	this->m_iId = AVH_WEAPON_WELDER;
+	//this->m_iDefaultAmmo = kWelderMaxClip;
+
+    // Set our class name
+	this->pev->classname = MAKE_STRING(kwsWelder);
+
+	SET_MODEL(ENT(this->pev), kWelderWModel);
+
+	FallInit();// get ready to fall down.
+} 
+
+// When welder is deployed, it makes the welding sound
+void AvHWelder::WelderThink()
+{
+	//#ifndef AVH_MAPPER_BUILD
+	// Either way, always play looping welder sounds (maybe this should play always, whether using it or not)
+	//EMIT_SOUND_DYN(ENT(m_pPlayer->pev), CHAN_STATIC, kWeldingSound, RANDOM_FLOAT(.3, .5), ATTN_NORM, 0, 93 + RANDOM_LONG(0,0xF));
+	//#endif
+
+	//this->pev->nextthink = gpGlobals->time + kWelderThinkTime;
+}
+
+bool AvHWelder::UsesAmmo(void) const
+{
+	return false;
+}
diff --git a/main/source/mod/AvHWorldUpdate.cpp b/main/source/mod/AvHWorldUpdate.cpp
new file mode 100644
index 00000000..feb56024
--- /dev/null
+++ b/main/source/mod/AvHWorldUpdate.cpp
@@ -0,0 +1,591 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile:  $
+// $Date: $
+//
+//-------------------------------------------------------------------------------
+// $Log: $
+//===============================================================================
+#include "build.h"
+#include "util/nowarnings.h"
+#include "extdll.h"
+#include "dlls/util.h"
+#include "cbase.h"
+#include "player.h"
+#include "weapons.h"
+#include "mod/AvHGamerules.h"
+#include "mod/AvHMarineEquipment.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "mod/AvHAlienEquipment.h"
+#include "mod/AvHAlienEquipmentConstants.h"
+#include "mod/AvHAlienWeapons.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHServerUtil.h"
+#include "util/MathUtil.h"
+
+typedef vector<AvHPlayer*>			AvHPlayerListType;
+typedef vector<AvHObservatory*>		AvHObservatoryListType;
+typedef vector<AvHScan*>			AvHScanListType;
+typedef vector<AvHSensoryChamber*>	AvHSensoryChamberListType;
+typedef vector<AvHUmbraCloud*>		AvHUmbraCloudListType;
+
+BaseEntityListType			gBaseEntityList;
+AvHPlayerListType			gPlayerList;
+AvHPlayerListType			gRelevantPlayerList;
+AvHObservatoryListType		gObservatoryList;
+AvHScanListType				gScanList;
+AvHSensoryChamberListType	gSensoryChamberList;
+AvHUmbraCloudListType		gUmbraCloudList;
+
+const float kMovementVisibilityThreshold = 10.0f;
+
+bool AvHSUGetInViewOfEnemy(CBaseEntity* inEntity, int& outSightedStatus)
+{
+	bool theInViewOfEnemy = false;
+
+	if(inEntity->pev->iuser4 & MASK_TOPDOWN) 
+	{
+		// Top down players are never visible
+	}
+	else
+	{
+		if(GetGameRules()->GetDrawInvisibleEntities())
+		{
+			outSightedStatus |= MASK_VIS_SIGHTED;
+			theInViewOfEnemy = true;
+		}
+		else if(GetGameRules()->GetIsCheatEnabled(kcDetectAll))
+		{
+			outSightedStatus |= MASK_VIS_DETECTED;
+			theInViewOfEnemy = true;
+		}
+		else
+		{
+			// Make all hives always visible
+			//AvHHive* theHive = dynamic_cast<AvHHive*>(inEntity);
+			//if(theHive)
+			//{
+			//	int a = 0;
+			//}
+			//if(theHive && (theHive->GetIsActive() || theHive->GetIsSpawning()))
+			//{
+			//	outSightedStatus = MASK_VIS_SIGHTED;
+			//	theInViewOfEnemy = true;
+			//}
+			//else
+			//{
+				AvHPlayer* theInPlayer = dynamic_cast<AvHPlayer*>(inEntity);
+                AvHCloakable* theCloakable = dynamic_cast<AvHCloakable*>(inEntity);
+				if(!theInPlayer || !theInPlayer->GetIsCloaked())
+				{
+					if(!theCloakable || (theCloakable->GetOpacity() > 0.0f))
+					{
+						// Loop through enemy players, check if we are in view of any of them
+						//FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+						for(AvHPlayerListType::iterator thePlayerIter = gPlayerList.begin(); thePlayerIter != gPlayerList.end(); thePlayerIter++)
+						{
+							if((*thePlayerIter)->GetTeam() != inEntity->pev->team)
+							{
+								// Commanders can't "see" enemies
+								if(((*thePlayerIter)->GetUser3() != AVH_USER3_COMMANDER_PLAYER) && ((*thePlayerIter)->GetIsRelevant()))
+								{
+									if((*thePlayerIter)->GetIsEntityInSight(inEntity))
+									{
+										outSightedStatus |= MASK_VIS_SIGHTED;
+										theInViewOfEnemy = true;
+										//char theErrorString[256];
+										//sprintf(theErrorString, "Entity %s is in sight of player %d.\n", STRING(inEntity->pev->classname), (*thePlayerIter)->entindex());
+										//ALERT(at_logged, theErrorString);
+										break;
+									}
+								}
+    						}
+						}
+					}
+					//END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+
+					// Loop through observatories, uncloaking and detecting all enemy players in range
+					//FOR_ALL_ENTITIES(kwsObservatory, AvHObservatory*)
+					for(AvHObservatoryListType::iterator theObservatoryIter = gObservatoryList.begin(); theObservatoryIter != gObservatoryList.end(); theObservatoryIter++)
+					{
+						if((*theObservatoryIter)->pev->team != inEntity->pev->team && !(*theObservatoryIter)->GetIsRecycling() )
+						{
+							// Check that entity is in range of scan (only check XY distance, for commander's purposes)
+							float theDistance = VectorDistance2D((*theObservatoryIter)->pev->origin, inEntity->pev->origin);
+							if(theDistance < BALANCE_IVAR(kObservatoryXYDetectionRadius))
+							{
+								outSightedStatus |= MASK_VIS_DETECTED;
+								theInViewOfEnemy = true;
+
+                                if(theCloakable)
+                                {
+                                    theCloakable->Uncloak();
+                                }
+								break;
+							}
+						}
+					}
+					//END_FOR_ALL_ENTITIES(kwsObservatory)
+				
+					// Loop through all active scans on our team
+					//FOR_ALL_ENTITIES(kwsScan, AvHScan*)
+					for(AvHScanListType::iterator theScanIter = gScanList.begin(); theScanIter != gScanList.end(); theScanIter++)
+					{
+						if((*theScanIter)->pev->team != inEntity->pev->team)
+						{
+							// Check that entity is in range of scan
+							float theDistance = VectorDistance((*theScanIter)->pev->origin, inEntity->pev->origin);
+							if(theDistance < BALANCE_IVAR(kScanRadius))
+							{
+								outSightedStatus |= MASK_VIS_SIGHTED;
+								theInViewOfEnemy = true;
+								break;
+							}
+						}
+					}
+					//END_FOR_ALL_ENTITIES(kwsScan)
+					
+					// Loop through active sensory chambers
+					//FOR_ALL_ENTITIES(kwsSensoryChamber, AvHSensoryChamber*)
+//					for(AvHSensoryChamberListType::iterator theSensoryChamberIter = gSensoryChamberList.begin(); theSensoryChamberIter != gSensoryChamberList.end(); theSensoryChamberIter++)
+//					{
+//						if(((*theSensoryChamberIter)->pev->team != inEntity->pev->team) && (inEntity->pev->team != 0))
+//						{
+//							// Make sure it's built
+//							if((*theSensoryChamberIter)->GetIsBuilt())
+//							{
+//								//if((*theSensoryChamberIter)->GetIsEntityInSight(inEntity))
+//								float theDistance = VectorDistance2D((*theSensoryChamberIter)->pev->origin, inEntity->pev->origin);
+//								if(theDistance < kSensoryChamber2DSightRange)
+//								{
+//									// Trigger alert
+//									GetGameRules()->TriggerAlert(AvHTeamNumber((*theSensoryChamberIter)->pev->team), ALERT_ENEMY_APPROACHES, inEntity->entindex());
+//									
+//									outSightedStatus = MASK_VIS_SIGHTED;
+//									theInViewOfEnemy = true;
+//									break;
+//								}
+//							}
+//						}
+//					}
+					//END_FOR_ALL_ENTITIES(kwsSensoryChamber)
+					//				}
+			}
+		}
+		
+		// If not in sight, check for motion-tracking
+		if(!theInViewOfEnemy)
+		{
+			bool theEnemyTeamHasMotionTracking = false;
+			if((inEntity->pev->team == TEAM_ONE) || (inEntity->pev->team == TEAM_TWO))
+			{
+				AvHTeamNumber theEnemyTeamNumber = (inEntity->pev->team == TEAM_ONE) ? TEAM_TWO : TEAM_ONE;
+				AvHTeam* theEnemyTeam = GetGameRules()->GetTeam(theEnemyTeamNumber);
+				if(theEnemyTeam)
+				{
+					if(theEnemyTeam->GetResearchManager().GetTechNodes().GetIsTechResearched(TECH_RESEARCH_MOTIONTRACK) || GetGameRules()->GetIsCombatMode())
+					{
+						//char theErrorString[256];
+						//const char* theEntityName = "unknown";
+						//if(inEntity && inEntity->pev)
+						//{
+						//	const char* theTentativeEntityName = NULL;
+						//	theTentativeEntityName = STRING(inEntity->pev->classname);
+						//	if(theTentativeEntityName)
+						//	{
+						//		theEntityName = theTentativeEntityName;
+						//	}
+						//}
+
+						// Motion-tracking doesn't pick up cloaked entities (players)
+						bool theIsCloaked = false;
+						AvHCloakable* theCloakable = dynamic_cast<AvHCloakable*>(inEntity);
+						if(theCloakable && (theCloakable->GetOpacity() < 0.1f))
+						{
+							theIsCloaked = true;
+						}
+
+						float theVelocity = inEntity->pev->velocity.Length();
+						//sprintf(theErrorString, "Entity %s has velocity %f.\n", theEntityName, theVelocity);
+						//ALERT(at_logged, theErrorString);
+						
+						//ELVEN - WE HAVE TO CHECK FOR EXISTANT OBSERVATORIES BEFORE WE CAN FLAG THIS.
+						//voogru: Fixed combat mode problems & slight perfoamance issue (no need to loop thru every obs).
+						bool obsExists = false;
+
+						if(!GetGameRules()->GetIsCombatMode())
+						{
+							FOR_ALL_ENTITIES(kwsObservatory, AvHObservatory*)
+								if(theEntity->GetIsBuilt())
+								{
+									obsExists = true;
+									break;
+								}
+								END_FOR_ALL_ENTITIES(kwsObservatory)
+						}
+						else
+						{
+							obsExists = true;
+						}
+
+						if((theVelocity > kMovementVisibilityThreshold) && !theIsCloaked && obsExists)
+						{
+							outSightedStatus |= MASK_VIS_DETECTED;
+							theInViewOfEnemy = true;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return theInViewOfEnemy;
+}
+
+bool AvHSUGetInRangeOfFriendlyPrimalScream(CBaseEntity* inEntity)
+{
+	bool inRangeOfPrimalScream = false;
+
+	int theTeamNumber = inEntity->pev->team;
+	if(theTeamNumber)
+	{
+		// If team is of type alien
+		const AvHTeam* theTeam = GetGameRules()->GetTeam(AvHTeamNumber(theTeamNumber));
+		if(theTeam && (theTeam->GetTeamType() == AVH_CLASS_TYPE_ALIEN) && inEntity->IsAlive())
+		{
+			// Loop through all players on our team
+			for(AvHPlayerListType::iterator theIter = gPlayerList.begin(); theIter != gPlayerList.end(); theIter++)
+			{
+				AvHPlayer* thePlayer = *theIter;
+
+				// See if any of them are screaming
+				if(thePlayer && (thePlayer->pev->team == theTeamNumber) && (thePlayer->GetIsScreaming()))
+				{
+					// Are they in range of us?
+					float theDistance = VectorDistance(inEntity->pev->origin, thePlayer->pev->origin);
+					if(theDistance < BALANCE_IVAR(kPrimalScreamRange))
+					{
+						inRangeOfPrimalScream = true;
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	return inRangeOfPrimalScream;
+}
+
+bool AvHSUGetInRangeOfFriendlySensoryChamber(CBaseEntity* inEntity)
+{
+	bool inRangeOfSensoryChamber = false;
+	
+	int theTeamNumber = inEntity->pev->team;
+	if(theTeamNumber)
+	{
+		// If team is of type alien
+		const AvHTeam* theTeam = GetGameRules()->GetTeam(AvHTeamNumber(theTeamNumber));
+		if(theTeam && (theTeam->GetTeamType() == AVH_CLASS_TYPE_ALIEN) && inEntity->IsAlive())
+		{
+			// Loop through all SensoryChamber clouds on our team
+			for(AvHSensoryChamberListType::const_iterator theIter = gSensoryChamberList.begin(); theIter != gSensoryChamberList.end(); theIter++)
+			{
+				AvHSensoryChamber* theChamber = *theIter;
+				if(theChamber && (theChamber->pev->team == theTeamNumber))
+				{
+					// Are we in range?
+					float theDistance = VectorDistance(inEntity->pev->origin, theChamber->pev->origin);
+					if(theDistance < BALANCE_IVAR(kSensoryChamberRange))
+					{
+						AvHBaseBuildable* theBuildable = dynamic_cast<AvHBaseBuildable*>(theChamber);
+						if(theBuildable && theBuildable->GetIsBuilt())
+						{
+							inRangeOfSensoryChamber = true;
+							break;
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	return inRangeOfSensoryChamber;
+}
+
+bool AvHSUGetInRangeOfEnemySensoryChamber(CBaseEntity* inEntity)
+{
+	bool inRangeOfSensoryChamber = false;
+	int theTeamNumber = inEntity->pev->team;
+	if(theTeamNumber)
+	{
+		// If team is of type marine
+		const AvHTeam* theTeam = GetGameRules()->GetTeam(AvHTeamNumber(theTeamNumber));
+		if(theTeam && (theTeam->GetTeamType() == AVH_CLASS_TYPE_MARINE) && inEntity->IsAlive())
+		{
+			// Loop through all SensoryChamber clouds on our team
+			for(AvHSensoryChamberListType::const_iterator theIter = gSensoryChamberList.begin(); theIter != gSensoryChamberList.end(); theIter++)
+			{
+				AvHSensoryChamber* theChamber = *theIter;
+				if(theChamber && (theChamber->pev->team != theTeamNumber))
+				{
+					// Are we in range?
+					float theDistance = VectorDistance(inEntity->pev->origin, theChamber->pev->origin);
+					if(theDistance < BALANCE_IVAR(kSensoryChamberRange))
+					{
+						AvHBaseBuildable* theBuildable = dynamic_cast<AvHBaseBuildable*>(theChamber);
+						if(theBuildable && theBuildable->GetIsBuilt())
+						{
+							inRangeOfSensoryChamber = true;
+							break;
+						}
+					}
+				}
+			}
+		}
+	}
+	return inRangeOfSensoryChamber;
+}
+
+bool AvHSUGetInRangeOfFriendlyUmbra(CBaseEntity* inEntity)
+{
+	bool inRangeOfUmbra = false;
+
+	int theTeamNumber = inEntity->pev->team;
+	if(theTeamNumber)
+	{
+		// If team is of type alien
+		const AvHTeam* theTeam = GetGameRules()->GetTeam(AvHTeamNumber(theTeamNumber));
+		if(theTeam && (theTeam->GetTeamType() == AVH_CLASS_TYPE_ALIEN) && inEntity->IsAlive())
+		{
+			// Loop through all umbra clouds on our team
+			for(AvHUmbraCloudListType::iterator theIter = gUmbraCloudList.begin(); theIter != gUmbraCloudList.end(); theIter++)
+			{
+				AvHUmbraCloud* theUmbraCloud = *theIter;
+				if(theUmbraCloud && (theUmbraCloud->pev->team == theTeamNumber))
+				{
+					// Are we in range?
+					float theDistance = VectorDistance(inEntity->pev->origin, theUmbraCloud->pev->origin);
+					if(theDistance < BALANCE_IVAR(kUmbraCloudRadius))
+					{
+						inRangeOfUmbra = true;
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	return inRangeOfUmbra;
+}
+
+void UpdateWorldEntity(CBaseEntity* inBaseEntity)
+{
+	// Visibility
+	inBaseEntity->pev->iuser4 &= ~MASK_VIS_SIGHTED;
+	inBaseEntity->pev->iuser4 &= ~MASK_VIS_DETECTED;
+	
+	if(AvHSUGetIsSubjectToVisibilityRules(inBaseEntity))
+	{
+		int theSightedStatus = 0;
+		if(AvHSUGetInViewOfEnemy(inBaseEntity, theSightedStatus))
+		{
+			inBaseEntity->pev->iuser4 |= theSightedStatus;
+			if(inBaseEntity->pev->classname == MAKE_STRING(kesParticlesCustom))
+			{
+				int a = 0;
+			}
+		}
+	}
+	
+	// Don't clear buff flag on marines, as it means catalysts for them and they expire in AvHPlayer::InternalMarineThink
+    AvHUser3 theUser3 = AvHUser3(inBaseEntity->pev->iuser3);
+    if(theUser3 != AVH_USER3_MARINE_PLAYER)
+    {
+        inBaseEntity->pev->iuser4 &= ~MASK_BUFFED;
+    }
+	
+    // Primal scream bonuses
+	if(AvHSUGetInRangeOfFriendlyPrimalScream(inBaseEntity))
+	{
+		inBaseEntity->pev->iuser4 |= MASK_BUFFED;
+	}
+	
+
+	// Deteted by sensory chambers
+    if(theUser3 == AVH_USER3_MARINE_PLAYER )
+   {
+		if(AvHSUGetInRangeOfEnemySensoryChamber(inBaseEntity))
+		{
+			SetUpgradeMask(&inBaseEntity->pev->iuser4, MASK_SENSORY_NEARBY, true);
+		}
+		else
+		{
+			SetUpgradeMask(&inBaseEntity->pev->iuser4, MASK_SENSORY_NEARBY, false);
+		}
+	}
+
+	// Cloaking near sensory chambers
+	AvHCloakable* theCloakable = dynamic_cast<AvHCloakable*>(inBaseEntity);
+	if(theCloakable )
+	{
+		if ( theUser3 != AVH_USER3_MARINE_PLAYER ) 
+		{
+			if(AvHSUGetInRangeOfFriendlySensoryChamber(inBaseEntity))
+			{
+				theCloakable->SetSpeeds(0.0f, 0.0f, 0.0f);
+				theCloakable->Cloak();
+				
+				SetUpgradeMask(&inBaseEntity->pev->iuser4, MASK_SENSORY_NEARBY, true);
+			}
+			else
+			{
+				// Don't uncloak if we are cloaking via the upgrade
+				int theCloakingLevel = AvHGetAlienUpgradeLevel(inBaseEntity->pev->iuser4, MASK_UPGRADE_7);
+				if(theCloakingLevel == 0)
+				{
+					theCloakable->Uncloak();
+				}
+				
+				SetUpgradeMask(&inBaseEntity->pev->iuser4, MASK_SENSORY_NEARBY, false);
+			}
+		}
+		else 
+		{
+			theCloakable->Uncloak();
+		}
+	}
+	
+	// Umbra defense
+	inBaseEntity->pev->iuser4 &= ~MASK_UMBRA;
+	if(AvHSUGetInRangeOfFriendlyUmbra(inBaseEntity))
+	{
+		inBaseEntity->pev->iuser4 |= MASK_UMBRA;
+	}
+	
+	// Update tech slots periodically so UI shows what's available
+	AvHBaseBuildable* theBaseBuildable = dynamic_cast<AvHBaseBuildable*>(inBaseEntity);
+	if(theBaseBuildable)
+	{
+		theBaseBuildable->WorldUpdate();
+	}
+}
+
+void AvHGamerules::UpdateWorldEntities()
+{
+	// Prepare for many calls to AvHSUGetInViewOfEnemy
+	ASSERT(gPlayerList.size() == 0);
+	ASSERT(gRelevantPlayerList.size() == 0);
+	ASSERT(gObservatoryList.size() == 0);
+	ASSERT(gScanList.size() == 0);
+	ASSERT(gSensoryChamberList.size() == 0);
+	ASSERT(gUmbraCloudList.size() == 0);
+	ASSERT(gBaseEntityList.size() == 0);
+    
+    PROFILE_START()
+	
+	FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+		gPlayerList.push_back(theEntity);
+		if(theEntity->GetIsRelevant(true))
+		{
+			gRelevantPlayerList.push_back(theEntity);
+		}
+	END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+		
+	FOR_ALL_ENTITIES(kwsObservatory, AvHObservatory*)
+		if(theEntity->GetIsBuilt())
+		{
+			gObservatoryList.push_back(theEntity);
+		}
+	END_FOR_ALL_ENTITIES(kwsObservatory)
+		
+	FOR_ALL_ENTITIES(kwsScan, AvHScan*)
+		gScanList.push_back(theEntity);
+	END_FOR_ALL_ENTITIES(kwsScan)
+		
+	FOR_ALL_ENTITIES(kwsSensoryChamber, AvHSensoryChamber*)
+		gSensoryChamberList.push_back(theEntity);
+	END_FOR_ALL_ENTITIES(kwsSensoryChamber)
+
+	FOR_ALL_ENTITIES(kwsUmbraCloud, AvHUmbraCloud*)
+		gUmbraCloudList.push_back(theEntity);
+	END_FOR_ALL_ENTITIES(kwsUmbraCloud)
+
+    PROFILE_END(kUpdateWorldEntitiesBuildLists)
+    
+	//AvHSUPrintDevMessage("FOR_ALL_BASEENTITIES: AvHGamerules::UpdateWorldEntities\n");
+
+    if(GET_RUN_CODE(2048))
+    {
+		PROFILE_START()
+        FOR_ALL_BASEENTITIES()
+			UpdateWorldEntity(theBaseEntity);
+            gBaseEntityList.push_back(theBaseEntity);
+        END_FOR_ALL_BASEENTITIES()
+        PROFILE_END(kUpdateWorldEntitiesUpdateWorldEntities)
+    }
+
+	// Rebuild this->mTeamOneEntityHierarchy and this->mTeamTwoEntityHierarchy if changed
+    PROFILE_START()
+	this->mTeamOneEntityHierarchy.BuildFromTeam(this->GetTeam(TEAM_ONE), gBaseEntityList);
+	this->mTeamTwoEntityHierarchy.BuildFromTeam(this->GetTeam(TEAM_TWO), gBaseEntityList);
+    PROFILE_END(kUpdateWorldEntitiesBuildEntityHierarchies)
+
+	// Update blips
+    if(GET_RUN_CODE(1024))
+    {
+        PROFILE_START()
+	    for(AvHPlayerListType::iterator theIter = gPlayerList.begin(); theIter != gPlayerList.end(); theIter++)
+	    {	
+		    // Reset their blips
+		    (*theIter)->ClearBlips();
+	    }
+	    
+	    // For all entities in the world
+	    for(BaseEntityListType::iterator theBaseIter = gBaseEntityList.begin(); theBaseIter != gBaseEntityList.end(); theBaseIter++)
+	    {
+		    CBaseEntity* theBaseEntity = *theBaseIter;
+
+		    // If entity has a team	(allow hives so aliens can find hive locations)
+            bool theIsHive = (theBaseEntity->pev->iuser3 == AVH_USER3_HIVE);
+		    if((theBaseEntity->pev->team != 0) || theIsHive)
+		    {
+                // Only process players, parasited entities and hives, as they are the only things that ever show up as blips
+                int theEntIndex = theBaseEntity->entindex();
+
+                bool theIsParasited = GetHasUpgrade(theBaseEntity->pev->iuser4, MASK_PARASITED);
+				bool theIsNearSensory = GetHasUpgrade(theBaseEntity->pev->iuser4, MASK_SENSORY_NEARBY);
+                bool theIsBuildable = dynamic_cast<AvHBaseBuildable*>(theBaseEntity);
+
+                if(((theEntIndex > 0) && (theEntIndex <= kMaxPlayers)) || theIsNearSensory || theIsHive || theIsParasited || theIsBuildable)
+                {
+			        // For all relevant players in list
+			        for(AvHPlayerListType::iterator thePlayerIterator = gRelevantPlayerList.begin(); thePlayerIterator != gRelevantPlayerList.end(); thePlayerIterator++)
+			        {
+				        // Call ProcessEntityBlip
+				        (*thePlayerIterator)->ProcessEntityBlip(theBaseEntity);
+			        }
+                }
+		    }
+	    }
+
+        PROFILE_END(kUpdateWorldEntitiesUpdateBlips)
+    }
+
+	// End after many calls to AvHSUGetInViewOfEnemy
+	gPlayerList.clear();
+	gRelevantPlayerList.clear();
+	gObservatoryList.clear();
+	gScanList.clear();
+	gSensoryChamberList.clear();
+	gUmbraCloudList.clear();
+	gBaseEntityList.clear();
+}
+
+
diff --git a/main/source/mod/ChatPanel.cpp b/main/source/mod/ChatPanel.cpp
new file mode 100644
index 00000000..0ad28b0f
--- /dev/null
+++ b/main/source/mod/ChatPanel.cpp
@@ -0,0 +1,183 @@
+#include "mod/ChatPanel.h"
+#include "VGUI_KeyCode.h"
+#include "VGUI_App.h"
+#include "cl_dll/hud.h"
+#include <windows.h>
+
+using namespace vgui;
+
+ChatPanel::ChatPanel(int x, int y, int wide, int tall)
+    : Panel(x, y, wide, tall)
+{
+
+    for (int i = 0; i < 256; ++i)
+    {
+        mKeyPushed[i] = false;
+    }
+    
+}
+    
+void ChatPanel::SetChatMode(string sChatMode)
+{
+    mChatMode = sChatMode;
+}
+
+void ChatPanel::CancelChat()
+{
+    
+    mText = "";
+    setVisible(false);
+    
+    for (int i = 0; i < 256; ++i)
+    {
+        mKeyPushed[i] = false;
+    }
+    
+}
+
+void ChatPanel::KeyDown(int virtualKey, int scanCode)
+{
+
+    if (virtualKey >= 0 && virtualKey < 256)
+    {
+        mKeyPushed[virtualKey] = true;
+    }
+    
+    if (virtualKey == VK_ESCAPE)
+    {
+        CancelChat();
+    }
+    else if (virtualKey == VK_RETURN)
+    {
+        
+        std::string theCommand;
+
+		theCommand += mChatMode;
+
+		theCommand += " \"";
+
+            // Replace all ';' characters with ':' characters since we can't have
+        // ';' characters on a console message.
+
+        for (unsigned int i = 0; i < mText.length(); ++i)
+        {
+            if (mText[i] == ';')
+            {
+                mText[i] = ':';
+            }
+        }
+        
+        theCommand += mText;
+
+		theCommand += "\"";
+
+		//say_x "the message here" instead of 
+		//say_x the message here (ever word was treated as another argument)
+        gEngfuncs.pfnClientCmd((char*)theCommand.c_str());
+
+        CancelChat();
+
+    }
+    else if (virtualKey == VK_BACK)
+    {
+        if (mText.length() > 0)
+        {
+            mText.erase(mText.length() - 1, mText.length());
+        }
+    }
+    else
+    {
+
+        BYTE keyState[256];
+        GetKeyboardState(keyState);
+
+        // Turn off caps lock since some people use it for voice comm.
+
+        keyState[VK_CAPITAL]  = 0;
+
+        // Turn off control since some people use it for crouching.
+
+        keyState[VK_LCONTROL] = 0;
+        keyState[VK_RCONTROL] = 0;
+        keyState[VK_CONTROL]  = 0;
+
+        char buffer[3] = { 0 };
+        int count = ToAscii(virtualKey, scanCode, keyState, (LPWORD)buffer, 0);
+
+        if (count > 0)
+        {
+            mText += buffer;
+        }
+
+    }
+
+}
+
+void ChatPanel::paint()
+{
+
+    const AvHFont& theFont = gHUD.GetSmallFont();
+    int thePadSize = 5;
+
+    //requestFocus();
+
+    int width;
+    int height;
+
+    getSize(width, height);
+
+    int x = thePadSize;
+    int y = (height - theFont.GetStringHeight()) / 2;
+    
+    char prompt[128];
+	strncpy(prompt, mChatMode.c_str(), 127);
+
+	prompt[0] = toupper( prompt[0] );
+
+	// Remove any _'s (say_team becomes say team)
+	for ( char *pApersand = prompt; pApersand != NULL && *pApersand != 0; pApersand++ )
+	{
+		// Replace it with a space
+		if ( *pApersand == '_' )
+			*pApersand = ' ';
+	}
+
+	strcat(prompt, ": ");
+
+    x = theFont.DrawString(x, y, prompt, 128, 128, 128);
+    
+    const char* text = mText.c_str(); 
+
+    while (x + theFont.GetStringWidth(text) > width - thePadSize)
+    {
+        ++text;
+    }
+
+    x = theFont.DrawString(x, y, text, 255, 255, 255);
+
+}
+
+void ChatPanel::paintBackground()
+{
+
+    int width;
+    int height;
+
+    getSize(width, height);
+
+	drawSetColor(0,0,0, 80);
+	drawFilledRect(0,0, width, height);
+		
+}
+
+bool ChatPanel::WasKeyPushed(int virtualKey) const
+{
+    if (virtualKey >= 0 && virtualKey < 256)
+    {
+        return mKeyPushed[virtualKey];
+    }
+    else
+    {
+        return true;
+    }
+}
diff --git a/main/source/mod/ChatPanel.h b/main/source/mod/ChatPanel.h
new file mode 100644
index 00000000..5f081764
--- /dev/null
+++ b/main/source/mod/ChatPanel.h
@@ -0,0 +1,35 @@
+#ifndef CHAT_PANEL_H
+#define CHAT_PANEL_H
+
+#include <VGUI_Panel.h>
+#include <VGUI_DefaultInputSignal.h>
+
+#include "mod/AvHFont.h"
+
+#include <string>
+
+class ChatPanel : public vgui::Panel, public vgui::CDefaultInputSignal
+{
+public:
+    ChatPanel(int x, int y, int wide, int tall);
+
+    void CancelChat();
+    void SetChatMode(std::string sChatMode);
+    
+    void KeyDown(int virtualKey, int scanCode);
+
+    // Checks if a key was pushed since the chat window was opened.
+    bool WasKeyPushed(int virtualKey) const;
+
+    virtual void paint();
+	virtual void paintBackground();
+
+private:
+    std::string mText;
+    std::string mChatMode;
+
+    bool        mKeyPushed[256];
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/CollisionChecker.cpp b/main/source/mod/CollisionChecker.cpp
new file mode 100644
index 00000000..6f59e9ca
--- /dev/null
+++ b/main/source/mod/CollisionChecker.cpp
@@ -0,0 +1,769 @@
+
+//new collision replacemnet
+
+#include <vector>
+#include <memory>
+
+#include "common/mathlib.h"
+#include "common/const.h"
+#include "common/com_model.h"
+#include "pm_defs.h"
+#include "common/vector_util.h"
+#include "mod/AvHHulls.h"
+#include "types.h"
+#include "util/MathUtil.h"
+
+#include "CollisionChecker.h"
+
+using std::auto_ptr;
+
+//-----------------------------------------------------------------------------
+// PlaneTest classes - used by CollisionChecker for testing against hulls
+//-----------------------------------------------------------------------------
+
+class CollisionTest 
+{
+public:
+	virtual ~CollisionTest(void) {}
+	virtual int GetPlanarIntersectionType(const mplane_t* plane) const = 0;
+	virtual bool GetAABBIntersection(const nspoint_t& mins, const nspoint_t& maxs) const = 0;
+	virtual auto_ptr<CollisionTest> RotateAndShift(const nspoint_t& forward, const nspoint_t& up, const nspoint_t& right, const nspoint_t& origin) const = 0;
+	virtual auto_ptr<CollisionTest> Shift(const nspoint_t& origin) const = 0;
+};
+
+class PointCollisionTest : public CollisionTest
+{
+public:
+	PointCollisionTest(const nspoint_t& point) 
+	{ SetPoint(point); }
+
+	void SetPoint(const nspoint_t& point) 
+	{ VectorCopy(point,point_); }
+
+	int GetPlanarIntersectionType(const mplane_t* plane) const
+	{
+		float d;
+		if(plane->type < 3) // first three plane types are axial by index
+		{
+			d = point_[plane->type]*plane->normal[plane->type] - plane->dist;
+		}
+		else
+		{
+			d = DotProduct(plane->normal,point_) - plane->dist;
+		}
+		return ((d < 0) ? CollisionChecker::INTERSECTION_RELATION_BACK : CollisionChecker::INTERSECTION_RELATION_FRONT);
+	}
+
+	bool GetAABBIntersection(const nspoint_t& mins, const nspoint_t& maxs) const
+	{
+		return (
+			(point_[0] >= mins[0]) &&
+			(point_[0] <= maxs[0]) &&
+			(point_[1] >= mins[1]) &&
+			(point_[1] <= maxs[1]) &&
+			(point_[2] >= mins[2]) &&
+			(point_[2] <= maxs[1])
+			);
+	}
+
+	auto_ptr<CollisionTest> RotateAndShift(const nspoint_t& forward, const nspoint_t& right, const nspoint_t& up, const nspoint_t& origin) const
+	{
+		return Shift(origin);
+	}
+
+	auto_ptr<CollisionTest> Shift(const nspoint_t& origin) const
+	{
+		nspoint_t new_origin;
+		VectorAdd(origin,point_,new_origin);
+		return auto_ptr<CollisionTest>(new PointCollisionTest(new_origin));
+	}
+
+private:
+	nspoint_t point_;
+};
+
+//-----------------------------------------------------------------------------
+
+class CylinderCollisionTest : public CollisionTest
+{
+public:
+	CylinderCollisionTest(const nspoint_t& up, const nspoint_t& base, const float radius, const float height) : point_test_(base)
+	{ 
+		VectorCopy(up,up_);
+		VectorNormalize(up_);
+		VectorCopy(base,base_);
+		radius_ = radius;
+		height_ = height;
+	}
+
+	int GetPlanarIntersectionType(const mplane_t* plane) const
+	{
+		nspoint_t in_plane,out_of_plane,point_to_check;
+		CrossProduct(up_,plane->normal,in_plane);
+		CrossProduct(up_,in_plane,out_of_plane); //perp to up and pointing directly out of plane
+		VectorNormalize(out_of_plane);
+
+		VectorMA(base_,radius_,out_of_plane,point_to_check);
+		point_test_.SetPoint(point_to_check);
+		int intersect = point_test_.GetPlanarIntersectionType(plane);
+
+		VectorMA(point_to_check,height_,up_,point_to_check);
+		point_test_.SetPoint(point_to_check);
+		intersect |= point_test_.GetPlanarIntersectionType(plane);
+
+		if(intersect != CollisionChecker::INTERSECTION_RELATION_BOTH)
+		{
+			VectorMA(base_,-radius_,out_of_plane,point_to_check);
+			point_test_.SetPoint(point_to_check);
+			intersect |= point_test_.GetPlanarIntersectionType(plane);
+		}
+
+		if(intersect != CollisionChecker::INTERSECTION_RELATION_BOTH)
+		{
+			VectorMA(point_to_check,height_,up_,point_to_check);
+			point_test_.SetPoint(point_to_check);
+			intersect |= point_test_.GetPlanarIntersectionType(plane);
+		}
+
+		return intersect;
+	}
+
+	bool GetAABBIntersection(const nspoint_t& mins, const nspoint_t& maxs) const
+	{
+		//special case of unrotated cylinder
+		if(up_[2] == 1.0f)
+		{
+			if( maxs[2] < base_[2] || 
+				mins[2] > base_[2] + height_ ||
+				maxs[0] < base_[0] - radius_ || 
+				mins[0] > base_[0] + radius_ ||
+				maxs[1] < base_[1] - radius_ ||
+				maxs[1] > base_[1] + radius_
+				) { return false; }
+			//TODO: tighten definition to use overlap of circle instead of box with circle inscribed
+			return true;
+		}
+
+		//TODO: handle general case by turning bbox into hull and testing against that hull
+		ASSERT(0 && "Need to handle case of rotated cylinder & AABB collision");
+		return false;
+	}
+
+	auto_ptr<CollisionTest> RotateAndShift(const nspoint_t& forward, const nspoint_t& right, const nspoint_t& up, const nspoint_t& origin) const
+	{
+		nspoint_t new_up, new_base;
+		TransformVector(up_,forward,right,up,new_up);
+		VectorAdd(base_,origin,new_base);
+		return auto_ptr<CollisionTest>(new CylinderCollisionTest(new_up,new_base,radius_,height_));
+	}
+
+	auto_ptr<CollisionTest> Shift(const nspoint_t& origin) const
+	{
+		nspoint_t new_base;
+		VectorAdd(base_,origin,new_base);
+		return auto_ptr<CollisionTest>(new CylinderCollisionTest(up_,new_base,radius_,height_));
+	}
+
+private:
+	mutable PointCollisionTest point_test_;
+	nspoint_t up_;
+	nspoint_t base_;
+	float radius_;
+	float height_;
+};
+
+//-----------------------------------------------------------------------------
+
+//TODO: determine if there's a faster way than scanning all 8 corners
+class OBBCollisionTest : public CollisionTest
+{
+public:
+	OBBCollisionTest(const OBBox& box) : point_test_(box.mOrigin)
+	{
+		box_ = box;
+		nspoint_t offset;
+		//calculate eight corners of the box given input angles:
+		for(int index = 0; index < 8; ++index)
+		{
+			offset[0] = box.mExtents[0] * box.mAxis[0][0];
+			offset[0] += box.mExtents[1] * box.mAxis[1][0];
+			offset[0] += box.mExtents[2] * box.mAxis[2][0];
+			if(index % 2) //every other item
+			{ offset[0] *= -1; }
+
+			offset[1] = box.mExtents[0] * box.mAxis[0][1];
+			offset[1] += box.mExtents[1] * box.mAxis[1][1];
+			offset[1] += box.mExtents[2] * box.mAxis[2][1];
+			if((index / 2) % 2) //every other pair of items
+			{ offset[1] *= -1; }
+
+			offset[2] = box.mExtents[0] * box.mAxis[0][2];
+			offset[2] += box.mExtents[1] * box.mAxis[1][2];
+			offset[2] += box.mExtents[2] * box.mAxis[2][2];
+			if(index < 4) //4 false, then 4 true
+			{ offset[2] *= -1; }
+
+			VectorAdd(box.mOrigin,offset,corners[index]);
+		}
+	}
+
+	int GetPlanarIntersectionType(const mplane_t* plane) const
+	{
+		int intersection_type = CollisionChecker::INTERSECTION_RELATION_NONE;
+		for(int index = 0; index < 8; ++index)
+		{
+			point_test_.SetPoint(corners[index]);
+			intersection_type |= point_test_.GetPlanarIntersectionType(plane);
+			if(intersection_type == CollisionChecker::INTERSECTION_RELATION_BOTH)
+			{ break; }
+		}
+		return intersection_type;
+	}
+
+	bool GetAABBIntersection(const nspoint_t& mins, const nspoint_t& maxs) const
+	{
+		bool intersection = false;
+		for(int index = 0; index < 8; ++index)
+		{
+			point_test_.SetPoint(corners[index]);
+			intersection = point_test_.GetAABBIntersection(mins,maxs);
+			if(intersection)
+			{ break; }
+		}
+		return intersection;
+	}
+
+	auto_ptr<CollisionTest> RotateAndShift(const nspoint_t& forward, const nspoint_t& right, const nspoint_t& up, const nspoint_t& origin) const
+	{
+		//make this an OBB by rotation around the ent angles - not a cheap operation.
+		OBBox box = box_;
+
+		VectorAdd(box_.mOrigin,origin,box.mOrigin);
+		TransformVector(box_.mAxis[0],forward,right,up,box.mAxis[0]);
+		TransformVector(box_.mAxis[1],forward,right,up,box.mAxis[1]);
+		TransformVector(box_.mAxis[2],forward,right,up,box.mAxis[2]);
+
+		//rotate axes!
+		return auto_ptr<CollisionTest>(new OBBCollisionTest(box));
+	}
+
+	auto_ptr<CollisionTest> Shift(const nspoint_t& origin) const
+	{
+		//make this an OBB by rotation around the ent angles - not a cheap operation.
+		OBBox box = box_;
+		VectorAdd(box_.mOrigin,origin,box.mOrigin);
+		return auto_ptr<CollisionTest>(new OBBCollisionTest(box));
+	}
+
+private:
+	OBBox box_;
+	nspoint_t corners[8];
+	mutable PointCollisionTest point_test_;
+};
+
+//-----------------------------------------------------------------------------
+
+class AABBCollisionTest : public CollisionTest
+{
+public:
+	AABBCollisionTest(const nspoint_t& mins, const nspoint_t& maxs) : point_test_(mins)
+	{
+		VectorCopy(maxs,maxs_);
+		VectorCopy(mins,mins_);
+	}
+
+	int GetPlanarIntersectionType(const mplane_t* plane) const
+	{
+		nspoint_t orientedMins = { 
+			plane->normal[0] < 0 ? maxs_[0] : mins_[0], 
+			plane->normal[1] < 0 ? maxs_[1] : mins_[1], 
+			plane->normal[2] < 0 ? maxs_[2] : mins_[2]
+		};
+		point_test_.SetPoint(orientedMins);
+		int intersect_type = point_test_.GetPlanarIntersectionType(plane);
+
+		nspoint_t orientedMaxes = { 
+			plane->normal[0] < 0 ? mins_[0] : maxs_[0], 
+			plane->normal[1] < 0 ? mins_[1] : maxs_[1], 
+			plane->normal[2] < 0 ? mins_[2] : maxs_[2]
+		};
+		point_test_.SetPoint(orientedMaxes);
+		intersect_type |= point_test_.GetPlanarIntersectionType(plane);
+
+		return intersect_type;	
+	}
+
+	bool GetAABBIntersection(const nspoint_t& mins, const nspoint_t& maxs) const
+	{
+		return (
+			(maxs_[0] >= mins[0]) &&
+			(mins_[0] <= maxs[0]) &&
+			(maxs_[1] >= mins[1]) &&
+			(mins_[1] <= maxs[1]) &&
+			(maxs_[2] >= mins[2]) &&
+			(mins_[2] <= maxs[2])
+			);
+	}
+
+	auto_ptr<CollisionTest> RotateAndShift(const nspoint_t& forward, const nspoint_t& right, const nspoint_t& up, const nspoint_t& origin) const
+	{
+		//make this an OBB by rotation around the ent angles - not a cheap operation.
+		OBBox box;
+
+		//set up origin = ((mins + maxs) / 2) - ent origin
+		VectorCopy(mins_,box.mOrigin);
+		VectorAdd(maxs_,box.mOrigin,box.mOrigin);
+		VectorScale(box.mOrigin,0.5f,box.mOrigin);
+		VectorSubtract(box.mOrigin,origin,box.mOrigin);
+
+		//set up extents = ((maxs - mins) / 2)
+		VectorCopy(maxs_,box.mExtents);
+		VectorSubtract(box.mExtents,mins_,box.mExtents);
+		VectorScale(box.mExtents,0.5f,box.mExtents);
+
+		//set up axis = axis defined by ent angles
+		nspoint_t axis[3] = {{1,0,0},{0,1,0},{0,0,1}};
+		VectorCopy(forward,box.mAxis[0]);
+		VectorCopy(up,box.mAxis[1]);
+		VectorCopy(right,box.mAxis[2]);
+
+		return auto_ptr<CollisionTest>(new OBBCollisionTest(box));
+	}
+
+	auto_ptr<CollisionTest> Shift(const nspoint_t& origin) const
+	{
+		nspoint_t new_mins, new_maxs;
+		VectorAdd(origin,mins_,new_mins);
+		VectorAdd(origin,maxs_,new_maxs);
+		return auto_ptr<CollisionTest>(new AABBCollisionTest(new_mins,new_maxs));
+	}
+
+private:
+	nspoint_t mins_, maxs_;
+	mutable PointCollisionTest point_test_;
+};
+
+//-----------------------------------------------------------------------------
+// CollisionChecker class - making a fresh start on collision checking code
+// that runs properly on both the server and client; requires that pmove is
+// filled to function -- won't function fully for initial frames
+//
+// TODO: write quick functions for when pmove isn't available
+// KGP - 4/25/04
+//-----------------------------------------------------------------------------
+
+const int CollisionChecker::NO_ENTITY = -1;
+const int CollisionChecker::WORLD_ENTITY = 0;
+
+const bool CollisionChecker::IGNORE_PLAYERS_FALSE = false;
+const bool CollisionChecker::IGNORE_PLAYERS_TRUE = true;
+
+const int CollisionChecker::HULL_TYPE_BBOX = 1;
+const int CollisionChecker::HULL_TYPE_BSP = 2;
+const int CollisionChecker::HULL_TYPE_ALL = 3;
+
+const int CollisionChecker::INTERSECTION_RELATION_NONE = 0;
+const int CollisionChecker::INTERSECTION_RELATION_FRONT = 1;
+const int CollisionChecker::INTERSECTION_RELATION_BACK = 2;
+const int CollisionChecker::INTERSECTION_RELATION_BOTH = 3;
+
+CollisionChecker::CollisionChecker(const playermove_t* pmove) : pmove_(pmove) 
+{
+	SetHullNumber(0);
+	SetHullTypeMask(HULL_TYPE_ALL);
+	SetIgnorePlayers(false);
+	SetIgnoreEntityClass(IGNORE_NONE);
+	ClearEntityToIgnore();
+}
+
+CollisionChecker::CollisionChecker(const playermove_t* pmove, int ns_hull_number, int hull_type_mask, bool ignore_players, int ignore_entity_class, int entity_index_to_ignore) : pmove_(pmove)
+{
+	SetHullNumber(ns_hull_number);
+	SetHullTypeMask(hull_type_mask);
+	SetIgnorePlayers(ignore_players);
+	SetIgnoreEntityClass(ignore_entity_class);
+	SetEntityToIgnore(entity_index_to_ignore);
+}
+
+//-------------------------------------------------------------------
+// Configuration
+//-------------------------------------------------------------------
+
+void CollisionChecker::SetHullNumber(int ns_hull_number)
+{
+	switch(ns_hull_number)
+	{
+	case kHLPointHullIndex:
+		valve_hull_number_ = 0;
+		break;
+	case kHLCrouchHullIndex:
+		valve_hull_number_ = 1;
+		break;
+	case kHLStandHullIndex:
+		valve_hull_number_ = 2;
+		break;
+	case kNSHugeHullIndex:
+		valve_hull_number_ = 3;
+		break;
+	default:
+		ASSERT(0 && "unknown hull index passed to CollisionChecker::SetHullNumber");
+		valve_hull_number_ = 0;
+		break;
+	}
+}
+
+//-------------------------------------------------------------------
+
+void CollisionChecker::SetHullTypeMask(int hull_type_mask)
+{
+	hull_type_mask_ = hull_type_mask;
+}
+
+//-------------------------------------------------------------------
+
+void CollisionChecker::SetEntityToIgnore(int entity_index_to_ignore)
+{
+	ASSERT(entity_index_to_ignore > 0 || entity_index_to_ignore == NO_ENTITY);
+	entity_index_to_ignore_ = entity_index_to_ignore;
+}
+
+//-------------------------------------------------------------------
+
+void CollisionChecker::ClearEntityToIgnore(void)
+{
+	entity_index_to_ignore_ = NO_ENTITY;
+}
+
+//-------------------------------------------------------------------
+
+void CollisionChecker::SetIgnorePlayers(bool ignore_players)
+{
+	ignore_players_ = ignore_players;
+}
+
+//-------------------------------------------------------------------
+
+void CollisionChecker::SetIgnoreEntityClass(int ignore_entity_class)
+{
+	ignore_entity_class_ = ignore_entity_class;
+}
+
+//-------------------------------------------------------------------
+// Public point routines
+//-------------------------------------------------------------------
+
+int CollisionChecker::GetContentsAtPoint(const nspoint_t& point) const
+{
+	return GetContents(&PointCollisionTest(point));
+}
+
+//-------------------------------------------------------------------
+
+int CollisionChecker::GetWorldContentsAtPoint(const nspoint_t& point) const
+{
+	return GetSingleEntityContentsAtPoint(point, WORLD_ENTITY);
+}
+
+//-------------------------------------------------------------------
+
+int CollisionChecker::GetAllEntityContentsAtPoint(const nspoint_t& point) const
+{
+	return GetAllEntityContents(&PointCollisionTest(point));
+}
+
+//-------------------------------------------------------------------
+
+int CollisionChecker::GetSingleEntityContentsAtPoint(const nspoint_t& point, int entity_index) const
+{
+	return GetSingleEntityContents(&PointCollisionTest(point),entity_index);
+}
+
+//-------------------------------------------------------------------
+// Public Cylinder routines
+//-------------------------------------------------------------------
+
+const static nspoint_t CYLINDER_UP_DEFAULT = {0,0,1.0f};
+
+int CollisionChecker::GetContentsInCylinder(const nspoint_t& base, float radius, float height) const
+{
+	return GetContents(&CylinderCollisionTest(CYLINDER_UP_DEFAULT,base,radius,height));
+}
+
+//-------------------------------------------------------------------
+
+int CollisionChecker::GetWorldContentsInCylinder(const nspoint_t& base, float radius, float height) const
+{
+	return GetSingleEntityContents(&CylinderCollisionTest(CYLINDER_UP_DEFAULT,base,radius,height),WORLD_ENTITY);
+}
+
+//-------------------------------------------------------------------
+
+int CollisionChecker::GetAllEntityContentsInCylinder(const nspoint_t& base, float radius, float height) const
+{
+	return GetAllEntityContents(&CylinderCollisionTest(CYLINDER_UP_DEFAULT,base,radius,height));
+}
+
+//-------------------------------------------------------------------
+
+int CollisionChecker::GetSingleEntityContentsInCylinder(const nspoint_t& base, float radius, float height, int entity_index) const
+{
+	return GetSingleEntityContents(&CylinderCollisionTest(CYLINDER_UP_DEFAULT,base,radius,height),entity_index);
+}
+
+//-------------------------------------------------------------------
+// Public AABB routines
+//-------------------------------------------------------------------
+
+int CollisionChecker::GetContentsInAABB(const nspoint_t& mins, const nspoint_t& maxs) const
+{
+	return GetContents(&AABBCollisionTest(mins,maxs));
+}
+
+//-------------------------------------------------------------------
+
+int CollisionChecker::GetWorldContentsInAABB(const nspoint_t& mins, const nspoint_t& maxs) const
+{
+	return GetSingleEntityContents(&AABBCollisionTest(mins,maxs),WORLD_ENTITY);
+}
+
+//-------------------------------------------------------------------
+
+int CollisionChecker::GetAllEntityContentsInAABB(const nspoint_t& mins, const nspoint_t& maxs) const
+{
+	return GetAllEntityContents(&AABBCollisionTest(mins,maxs));
+}
+
+//-------------------------------------------------------------------
+
+int CollisionChecker::GetSingleEntityContentsInAABB(const nspoint_t& mins, const nspoint_t& maxs, int entity_index) const
+{
+	return GetSingleEntityContents(&AABBCollisionTest(mins,maxs),entity_index);
+}
+
+//-------------------------------------------------------------------
+// Private utility routines
+//-------------------------------------------------------------------
+
+int CollisionChecker::CombineContents(const int old_contents, const int new_contents) const
+{
+	if(new_contents == CONTENTS_EMPTY)
+	{ return old_contents; }
+	if(old_contents == CONTENT_EMPTY)
+	{ return new_contents; }
+	return max(old_contents,new_contents);
+}
+
+//-------------------------------------------------------------------
+// Private content check routines
+//-------------------------------------------------------------------
+
+int CollisionChecker::GetContents(const CollisionTest* test) const
+{
+	int total_contents = GetSingleEntityContents(test,WORLD_ENTITY);
+	if(total_contents != CONTENTS_SOLID)
+	{
+		total_contents = CombineContents(total_contents,GetAllEntityContents(test));
+	}
+	return total_contents;
+}
+
+//-------------------------------------------------------------------
+
+int CollisionChecker::GetAllEntityContents(const CollisionTest* test) const
+{
+	int total_contents = CONTENTS_EMPTY;
+
+	UpdateNumEntities();
+	for(int counter = WORLD_ENTITY+1; counter < entity_count_; ++counter)
+	{
+		total_contents = CombineContents(total_contents,GetSingleEntityContents(test,counter));
+		if(total_contents == CONTENTS_SOLID)
+		{ break; }
+	}
+
+	return total_contents;
+}
+
+//-------------------------------------------------------------------
+
+int CollisionChecker::GetSingleEntityContents(const CollisionTest* test, int entity_index) const
+{
+	int total_contents = CONTENTS_EMPTY;
+	const physent_t* ent = GetPhysentForIndex(entity_index);
+	if(ent && ent->info != entity_index_to_ignore_ && (!ignore_players_ || ent->info == WORLD_ENTITY || ent->info > 32))
+	{
+		if(ent->solid == SOLID_BBOX)
+		{
+			nspoint_t bbox_mins, bbox_maxs;
+			VectorSubtract(ent->mins,ent->origin,bbox_mins);
+			VectorSubtract(ent->maxs,ent->origin,bbox_maxs);
+
+			if(valve_hull_number_) //adjust for input hull
+			{
+				const hull_t* hull = &(&pmove_->physents[WORLD_ENTITY])->model->hulls[valve_hull_number_];
+				VectorAdd(bbox_mins,hull->clip_mins,bbox_mins);
+				VectorAdd(bbox_mins,hull->clip_maxs,bbox_maxs);
+			}
+
+			if(test->GetAABBIntersection(bbox_mins,bbox_maxs))
+			{
+				total_contents = CONTENTS_SOLID;
+			}
+		}
+		else if(ent->model && ent->model->type == mod_brush)
+		{
+			const hull_t* hull = &ent->model->hulls[valve_hull_number_];
+
+			if(ent->angles[0] || ent->angles[1] || ent->angles[2])
+			{
+				float axes[3][3];
+				AngleVectors(ent->angles,axes[0],axes[1],axes[2]);
+				auto_ptr<CollisionTest> rotated_test = test->RotateAndShift(axes[0],axes[1],axes[2],ent->origin);
+				total_contents = GetHullContent(hull,hull->firstclipnode,rotated_test.get());
+			}
+			else
+			{
+				auto_ptr<CollisionTest> shifted_test = test->Shift(ent->origin);
+				total_contents = GetHullContent(hull,hull->firstclipnode,shifted_test.get());
+			}
+		}
+		else
+		{
+			int a = 0;	//breakpoint to be used as catch-all
+		}
+	}
+	return total_contents;
+}
+
+//-------------------------------------------------------------------
+
+//DFS search for solid hull leaf with passed in intersection test and short circuit on solid leaf found
+int CollisionChecker::GetHullContent(const hull_t* hull, int current_node, const CollisionTest* test) const
+{
+	ASSERT(current_node >= hull->firstclipnode);
+	ASSERT(current_node <= hull->lastclipnode);
+	int total_contents = CONTENTS_EMPTY;
+
+	if(current_node < 0)
+	{ total_contents = current_node; }
+	else
+	{
+		dclipnode_t	*node = &hull->clipnodes[current_node];
+		mplane_t	*plane;
+		int intersection;
+		while(true)
+		{
+			ASSERT(total_contents < 0); // 0 + is a node number and means we've had a bad assignment
+
+			//short circuit on solid found
+			if(total_contents == CONTENTS_SOLID)
+			{ 
+				this->intersected_nodes_.clear();
+				break; 
+			}
+
+			plane = &hull->planes[node->planenum];
+
+			intersection = test->GetPlanarIntersectionType(&hull->planes[node->planenum]);
+
+			switch(intersection)
+			{
+			case INTERSECTION_RELATION_BOTH:
+				if(node->children[0] > CONTENTS_EMPTY) //non-leaf
+				{
+					if(node->children[1] > CONTENTS_EMPTY) //non-leaf
+					{
+						this->intersected_nodes_.push_back(node->children[0]); //store one path for later
+						node = &hull->clipnodes[node->children[1]]; //follow other path
+						continue;
+					}
+				
+					total_contents = CombineContents(total_contents,node->children[1]);
+					node = &hull->clipnodes[node->children[0]];
+					continue;
+				}
+				else
+				{
+					total_contents = CombineContents(total_contents,node->children[0]);
+
+					if(node->children[1] > CONTENTS_EMPTY) //non-leaf
+					{
+						node = &hull->clipnodes[node->children[1]];
+						continue;
+					}
+
+					total_contents = CombineContents(total_contents,node->children[1]);
+				}
+				break;
+
+			case INTERSECTION_RELATION_FRONT:
+				if(node->children[0] > CONTENTS_EMPTY)
+				{ 
+					node = &hull->clipnodes[node->children[0]];
+					continue;
+				}
+
+				total_contents = CombineContents(total_contents,node->children[0]);
+				break;
+
+			case INTERSECTION_RELATION_BACK:
+				if(node->children[1] > CONTENTS_EMPTY)
+				{ 
+					node = &hull->clipnodes[node->children[1]]; 
+					continue;
+				}
+
+				total_contents = CombineContents(total_contents,node->children[1]);
+				break;
+			}
+
+			//check for other subtrees to process
+			if(this->intersected_nodes_.empty())
+			{ break; }
+
+			node = &hull->clipnodes[this->intersected_nodes_.back()];
+			this->intersected_nodes_.pop_back();
+		}
+	}
+	return total_contents;
+}
+
+//------------------------------------------------------------------------------
+// Client/server specific code :( ... client version, server version in own file
+//------------------------------------------------------------------------------
+#ifdef AVH_CLIENT
+const int CollisionChecker::IGNORE_NONE = 0;
+const int CollisionChecker::IGNORE_INVISIBLE = 1;
+const int CollisionChecker::IGNORE_INTANGIBLE = 2;
+
+void CollisionChecker::UpdateNumEntities() const
+{
+	switch(ignore_entity_class_)
+	{
+	case IGNORE_NONE:
+	case IGNORE_INVISIBLE:
+		entity_count_ = pmove_ ? pmove_->numvisent : 0;
+		break;
+	case IGNORE_INTANGIBLE:
+		entity_count_ = pmove_ ? pmove_->numphysent : 0;
+		break;
+	default:
+		ASSERT(0 && "Unknown ignore entity class");
+	};
+}
+
+const physent_t* CollisionChecker::GetPhysentForIndex(int entity_index) const
+{
+	switch(ignore_entity_class_)
+	{
+	case IGNORE_NONE:
+	case IGNORE_INVISIBLE:
+		return pmove_ ? &pmove_->visents[entity_index] : (physent_t*)NULL;
+	case IGNORE_INTANGIBLE:
+		return pmove_ ? &pmove_->physents[entity_index] : (physent_t*)NULL;
+	}
+	ASSERT(0 && "Unknown ignore entity class");
+	return NULL;
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/CollisionChecker.h b/main/source/mod/CollisionChecker.h
new file mode 100644
index 00000000..c474678a
--- /dev/null
+++ b/main/source/mod/CollisionChecker.h
@@ -0,0 +1,104 @@
+#ifndef COLLISIONCHECKER_H
+#define COLLISIONCHECKER_H
+
+//-----------------------------------------------------------------------------
+// Begin NS collision detection replacement
+//
+// Class is not reentrant, declare 1 per thread if necessary
+// Implementation is split into three files -- [x]Shared, [x]Client, and [x]Server
+// Client and Server code provides identical functionality under the same function
+// names, but are written to address the peculiarities of each environment
+//-----------------------------------------------------------------------------
+
+typedef float nspoint_t[3]; //do this because vec3_t is inconsistantly defined.
+
+struct OBBox
+{
+    nspoint_t mExtents;
+    nspoint_t mOrigin;
+    nspoint_t mAxis[3];
+};
+
+class CollisionTest; //implemented internally for each collision hull type/shape
+
+class CollisionChecker
+{
+public:
+	CollisionChecker(const playermove_t* pmove);
+	CollisionChecker(const playermove_t* pmove, int ns_hull_number, int hull_type_mask, bool ignore_players, int ignore_entity_class, int entity_index_to_ignore);
+
+	void SetIgnorePlayers(bool ignore_players);
+	void SetIgnoreEntityClass(int ignore_entity_class);
+	void SetEntityToIgnore(int entity_index_to_ignore);
+	void ClearEntityToIgnore(void);
+
+	void SetHullNumber(int ns_hull_number);
+	void SetHullTypeMask(int hull_type_mask);
+
+	int GetContentsAtPoint(const nspoint_t& point) const;
+	int GetSingleEntityContentsAtPoint(const nspoint_t& point, int pmove_index) const;
+	int GetWorldContentsAtPoint(const nspoint_t& point) const;
+	int GetAllEntityContentsAtPoint(const nspoint_t& point) const;
+
+	int GetContentsInAABB(const nspoint_t& mins, const nspoint_t& maxs) const;
+	int GetSingleEntityContentsInAABB(const nspoint_t& mins, const nspoint_t& maxs, int entity_index) const;
+	int GetWorldContentsInAABB(const nspoint_t& mins, const nspoint_t& maxs) const;
+	int GetAllEntityContentsInAABB(const nspoint_t& mins, const nspoint_t& maxs) const;
+
+	int GetContentsInOBB(const OBBox& bounding_box) const;
+	int GetSingleEntityConentsInOBB(const OBBox& bounding_box, int entity_index) const;
+	int GetWorldContentsInOBB(const OBBox& bounding_box) const;
+	int GetAllEntityContentsInOBB(const OBBox& bounding_box) const;
+
+	int GetContentsInSphere(const nspoint_t& origin, const float radius) const;
+	int GetSingleEntityContentsInSphere(const nspoint_t& origin, const float radius, int entity_index) const;
+	int GetWorldContentsInSphere(const nspoint_t& origin, const float radius) const;
+	int GetAllEntityContentsInSphere(const nspoint_t& origin, const float radius) const;
+
+	int GetContentsInCylinder(const nspoint_t& base, const float radius, const float height) const;
+	int GetSingleEntityContentsInCylinder(const nspoint_t& base, const float radius, const float height, int entity_index) const;
+	int GetWorldContentsInCylinder(const nspoint_t& base, const float radius, const float height) const;
+	int GetAllEntityContentsInCylinder(const nspoint_t& base, const float radius, const float height) const;
+
+	//for use in passing values into the system
+	const static int NO_ENTITY;
+	const static int WORLD_ENTITY;
+	const static int IGNORE_NONE;
+	const static int IGNORE_INVISIBLE;
+	const static int IGNORE_INTANGIBLE;
+	const static bool IGNORE_PLAYERS_FALSE;
+	const static bool IGNORE_PLAYERS_TRUE;
+
+	//for use in internal tests
+	const static int INTERSECTION_RELATION_NONE;
+	const static int INTERSECTION_RELATION_FRONT;
+	const static int INTERSECTION_RELATION_BACK;
+	const static int INTERSECTION_RELATION_BOTH;
+	const static int HULL_TYPE_BSP;
+	const static int HULL_TYPE_BBOX;
+	const static int HULL_TYPE_ALL;
+
+private:
+	int CombineContents(const int old_contents, const int new_contents) const;
+	int GetHullContent(const hull_t* hull, int current_node, const CollisionTest* test) const;
+
+	int GetContents(const CollisionTest* test) const;
+	int GetSingleEntityContents(const CollisionTest* test, int entity_index) const;
+	int GetAllEntityContents(const CollisionTest* test) const;
+
+	//client/server specific
+	void UpdateNumEntities() const; //called once per GetAllEntityContents, sets internal entity counter
+	const physent_t* GetPhysentForIndex(int entity_index) const; //called by GetSingleEntityContents
+
+	const playermove_t* pmove_;
+	mutable physent_t local_ent;
+	bool ignore_players_;
+	int entity_index_to_ignore_;
+	int valve_hull_number_;
+	int ignore_entity_class_;
+	int hull_type_mask_;
+	mutable int entity_count_;
+	mutable std::vector<int> intersected_nodes_; //used for DFS hull intersect code
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/CollisionChecker_ServerOnly.cpp b/main/source/mod/CollisionChecker_ServerOnly.cpp
new file mode 100644
index 00000000..11bea481
--- /dev/null
+++ b/main/source/mod/CollisionChecker_ServerOnly.cpp
@@ -0,0 +1,78 @@
+#include <vector>
+
+#include "dlls/extdll.h"
+#include "dlls/util.h"
+#include "dlls/cbase.h"
+
+#include "common/const.h"
+#include "common/com_model.h"
+#include "pm_defs.h"
+#include "common/vector_util.h"
+#include "mod/AvHHulls.h"
+#include "types.h"
+#include "util/MathUtil.h"
+
+#include "CollisionChecker.h"
+
+const int CollisionChecker::IGNORE_NONE = 0;
+const int CollisionChecker::IGNORE_INVISIBLE = 1;
+const int CollisionChecker::IGNORE_INTANGIBLE = 2;
+
+void CollisionChecker::UpdateNumEntities() const
+{
+	switch(ignore_entity_class_)
+	{
+	case IGNORE_NONE:
+		memset(&local_ent,0,sizeof(local_ent));
+		entity_count_ = gpGlobals->maxEntities;
+		break;
+	case IGNORE_INVISIBLE:
+		entity_count_ = pmove_ ? pmove_->numvisent : 0;
+		break;
+	case IGNORE_INTANGIBLE:
+		entity_count_ = pmove_ ? pmove_->numphysent : 0;
+		break;
+	default:
+		ASSERT(0 && "Unknown ignore entity class");
+	};
+}
+
+const physent_t* CollisionChecker::GetPhysentForIndex(int entity_index) const
+{
+	switch(ignore_entity_class_)
+	{
+	case IGNORE_NONE:
+	{
+		edict_t* entity = INDEXENT(entity_index);
+		if(entity)
+		{
+			local_ent.info = entity_index;
+			local_ent.player = entity_index && entity_index <= gpGlobals->maxClients ? 1 : 0;
+			local_ent.origin = entity->v.origin;
+			local_ent.angles = entity->v.angles;
+			local_ent.mins = entity->v.mins;
+			local_ent.maxs = entity->v.maxs;
+			local_ent.solid = entity->v.solid;
+			if(local_ent.solid != SOLID_BBOX)
+			{
+				for(int counter = 0; counter < pmove_->numvisent; ++counter)
+				{
+					if(local_ent.info == pmove_->visents[counter].info)
+					{
+						local_ent.model = pmove_->visents[counter].model;
+						break;
+					}
+				}
+			}
+			return &local_ent;
+		}
+		return NULL;
+	}
+	case IGNORE_INVISIBLE:
+		return pmove_ ? &pmove_->visents[entity_index] : NULL;
+	case IGNORE_INTANGIBLE:
+		return pmove_ ? &pmove_->physents[entity_index] : NULL;
+	}
+	ASSERT(0 && "Unknown ignore entity class");
+	return NULL;
+}
diff --git a/main/source/mod/CollisionUtil.cpp b/main/source/mod/CollisionUtil.cpp
new file mode 100644
index 00000000..c81f6576
--- /dev/null
+++ b/main/source/mod/CollisionUtil.cpp
@@ -0,0 +1,1214 @@
+#include "common/mathlib.h"
+#include "common/const.h"
+#include "common/com_model.h"
+
+#include "common/vector_util.h"
+#include "engine/studio.h"
+
+#include "CollisionUtil.h"
+
+#include <memory.h>
+#include <float.h>
+#include <math.h>
+#include <stdlib.h>
+#include <queue>
+#include "localassert.h"
+#include "engine/progdefs.h"
+
+#ifdef AVH_SERVER
+#include "engine/edict.h"
+#include "engine/eiface.h"
+#include "dlls/enginecallback.h"
+#endif
+
+#ifdef AVH_CLIENT
+#include "common/cl_entity.h"
+#endif
+
+#include "AnimationUtil.h"
+
+#include "pm_defs.h"
+
+const float AVH_INFINITY = -logf(0);
+const float AVH_EPSILON  = 0.001f;
+
+#define PITCH   0
+#define YAW     1
+#define ROLL    2 
+
+// These definitions are taken from the QuakeWorld source code.
+
+#define	SURF_PLANEBACK		2
+#define	SURF_DRAWSKY		4
+#define SURF_DRAWSPRITE		8
+#define SURF_DRAWTURB		0x10
+#define SURF_DRAWTILED		0x20
+#define SURF_DRAWBACKGROUND	0x40
+#define SURF_UNDERWATER		0x80
+#define SURF_DONTWARP		0x100
+
+#define	VERTEXSIZE	7
+
+typedef struct glpoly_s
+{
+	struct	glpoly_s	*next;
+	struct	glpoly_s	*chain;
+	int		numverts;
+	int		flags;			// for SURF_UNDERWATER
+	float	verts[4][VERTEXSIZE];	// variable sized (xyz s1t1 s2t2)
+} glpoly_t;
+
+typedef struct glmnode_s
+{
+
+// common with leaf
+	int				contents;		// 0, to differentiate from leafs
+	int				visframe;		// node needs to be traversed if current
+
+	float   		minmaxs[6];		// for bounding box culling
+
+	struct mnode_s	*parent;
+
+// node specific
+	mplane_t		*plane;
+	struct mnode_s	*children[2];
+
+	unsigned short		firstsurface;
+	unsigned short		numsurfaces;
+
+} glmnode_t;
+
+typedef struct glmleaf_s
+{
+
+// common with node
+	int			contents;		// wil be a negative contents number
+	int			visframe;		// node needs to be traversed if current
+
+	float		minmaxs[6];		// for bounding box culling
+
+	struct mnode_s	*parent;
+
+// leaf specific
+	byte		*compressed_vis;
+	struct efrag_s	*efrags;
+
+	msurface_t	**firstmarksurface;
+	int			nummarksurfaces;
+	int			key;			// BSP sequence number for leaf's contents
+	byte		ambient_sound_level[NUM_AMBIENTS];
+
+} glmleaf_t;
+
+typedef struct glmsurface_s
+{
+	int			visframe;		// should be drawn when node is crossed
+
+	mplane_t	*plane;
+	int			flags;
+
+	int			firstedge;	// look up in model->surfedges[], negative numbers
+	int			numedges;	// are backwards edges
+
+	short		texturemins[2];
+	short		extents[2];
+
+	int			light_s, light_t;			// gl lightmap coordinates
+
+	glpoly_t	*polys;						// multiple if warped
+	struct msurface_s	*texturechain;
+
+	mtexinfo_t	*texinfo;
+
+// lighting info
+	int			dlightframe;
+	int			dlightbits;
+
+	int			lightmaptexturenum;
+	byte		styles[MAXLIGHTMAPS];
+	int			cached_light[MAXLIGHTMAPS];	// values currently used in lightmap
+	qboolean	cached_dlight;				// true if dynamic light in cache
+
+//	byte		*samples;					// [numstyles*surfsize]
+	color24		*samples;					// note: this is the actual lightmap data for this surface
+	decal_t		*pdecals;
+
+} glmsurface_t;
+
+
+#define NODE		glmnode_t
+#define SURFACE		glmsurface_t
+
+
+/**
+ * Returns the distance between a point and a plane.
+ */
+float NS_PointToPlaneDistance(const vec3_t point, const mplane_t* plane)
+{
+
+	if (plane->type < 3)
+	{
+		return point[plane->type] - plane->dist; 
+	}
+	else
+	{
+		return DotProduct(point, plane->normal) - plane->dist;
+	}
+
+}
+
+
+/**
+ * Returns the square of the distance between two points.
+ */
+float NS_PointToPointDistanceSquared(const vec3_t p1, const vec3_t p2)
+{
+	vec3_t v;
+	VectorSubtract(p2, p1, v);
+	return DotProduct(v, v);
+}
+
+
+/**
+ * Returns the minimum distance from a point to the perimeter of a surface
+ * of a model.
+ */
+float NS_PointToSurfaceEdgeDistance(const model_t* model, const SURFACE* surface, const vec3_t point)
+{
+	
+	float minDistance = FLT_MAX;
+
+	int lastEdge = surface->firstedge + surface->numedges;
+
+	for (int i = surface->firstedge; i < lastEdge; ++i)
+	{
+		
+		ASSERT(i >= 0 && i < model->numsurfedges);
+	
+		int edge = model->surfedges[i];
+
+		const mvertex_t* v1;
+		const mvertex_t* v2;
+
+		if (edge >= 0)
+		{
+			v1 = &model->vertexes[model->edges[edge].v[0]];
+			v2 = &model->vertexes[model->edges[edge].v[1]];
+		}
+		else
+		{
+			v1 = &model->vertexes[model->edges[-edge].v[1]];	
+			v2 = &model->vertexes[model->edges[-edge].v[0]];
+		}
+
+		// Compute the closest point on the line to the point.
+		
+		vec3_t a;
+		vec3_t b;
+
+		VectorSubtract(point, v1->position, a);
+		VectorSubtract(v2->position, v1->position, b);
+
+		float t = DotProduct(a, b) / DotProduct(b, b);
+
+		// Restrict the point to being on the line segment.
+
+		if (t < 0) t = 0;
+		if (t > 1) t = 1;
+
+		vec3_t closestPoint;
+
+		VectorScale(b, t, closestPoint);
+		VectorAdd(closestPoint, v1->position, closestPoint);
+
+		// Compute the distance.
+
+		float distance = NS_PointToPointDistanceSquared(point, closestPoint);
+		
+		if (distance < minDistance)
+		{
+			minDistance = distance;
+		}
+	
+	}
+
+	return sqrtf(minDistance);
+
+}
+
+
+/**
+ * Tests if a point lies on a surface of a model. The point must lie on the
+ * plane of the surface.
+ */
+bool NS_PointOnSurface(const model_t* model, const SURFACE* surface, const vec3_t point)
+{
+	
+	int lastEdge = surface->firstedge + surface->numedges;
+
+	int x = (surface->plane->type + 1) % 3;
+	int y = (surface->plane->type + 2) % 3; 
+
+	int crossings = 0;
+
+	for (int i = surface->firstedge; i < lastEdge; ++i)
+	{
+		
+		ASSERT(i >= 0 && i < model->numsurfedges);
+	
+		int edge = model->surfedges[i];
+
+		const mvertex_t* v1;
+		const mvertex_t* v2;
+
+		if (edge >= 0)
+		{
+			v1 = &model->vertexes[model->edges[edge].v[0]];
+			v2 = &model->vertexes[model->edges[edge].v[1]];
+		}
+		else
+		{
+			v1 = &model->vertexes[model->edges[-edge].v[1]];	
+			v2 = &model->vertexes[model->edges[-edge].v[0]];
+		}
+
+		// Check for a crossing.
+
+		if ((v1->position[y] - point[y] >= 0) !=
+			(v2->position[y] - point[y] >= 0))
+		{
+
+			float dx = v1->position[x] - v2->position[x];
+			float dy = v1->position[y] - v2->position[y];
+
+			if (v2->position[x] - (v1->position[y] - point[y]) * dx / dy >= point[x])
+			{
+
+				++crossings;
+
+				// For a convex polygon, a straight line can only intersect the
+				// perimeter a maximum of two times.
+			
+				if (crossings == 2)
+				{
+					return false;
+				}
+			
+			}
+		}
+	
+	}
+
+	return (crossings % 2) == 1;
+
+}
+
+
+/**
+ * Computes the area of intersection between a circle and a surface. The
+ * circle and the surface must intersect.
+ */
+float NS_CircleSurfaceIntersectionArea(const model_t* model, const SURFACE* surface, const vec3_t point, float radius)
+{
+
+	float area = 0;
+
+	int lastEdge = surface->firstedge + surface->numedges;
+
+	int x = (surface->plane->type + 1) % 3;
+	int y = (surface->plane->type + 2) % 3; 
+
+	float radiusSquared = radius * radius;
+
+	for (int i = surface->firstedge; i < lastEdge; ++i)
+	{
+
+		ASSERT(i >= 0 && i < model->numsurfedges);
+	
+		int edge = model->surfedges[i];
+
+		const mvertex_t* v1;
+		const mvertex_t* v2;
+
+		if (edge >= 0)
+		{
+			v1 = &model->vertexes[model->edges[edge].v[0]];
+			v2 = &model->vertexes[model->edges[edge].v[1]];
+		}
+		else
+		{
+			v1 = &model->vertexes[model->edges[-edge].v[1]];	
+			v2 = &model->vertexes[model->edges[-edge].v[0]];
+		}
+
+		bool v1Inside = NS_PointToPointDistanceSquared(v1->position, point) < radiusSquared;
+		bool v2Inside = NS_PointToPointDistanceSquared(v2->position, point) < radiusSquared;
+
+		if (v1Inside && v2Inside)
+		{
+			// Add the signed area of triangle v1, v2, origin.
+		}
+		else if (v1Inside && !v2Inside)
+		{
+			// Find the interection of v1, v2 with the circle.
+			// Add the signed area of triangle v1, intersection, origin
+			// chordStart = v1
+		}
+		else if (!v1Inside && v2Inside)
+		{
+			// Find the interection of v1, v2 with the circle.
+			// Add the signed area of triangle intersection, v2, origin
+			// Add the area partitioned by the chord chordStart, intersection
+		}
+		else if (!v1Inside && !v2Inside)
+		{
+			// Check if v1, v2 intersects the circle.
+		}
+		
+	}
+	
+	return area;
+
+}
+
+
+/**
+ * Tests if the model structure is a software rendering model structure.
+ */
+bool NS_IsSoftwareModel(const model_t* model)
+{
+
+	if (model->nodes[0].parent != NULL)
+	{
+		return false;
+	}
+
+	const mnode_t* child = model->nodes[0].children[0];
+
+	if (child < model->nodes || child > model->nodes + model->numnodes)
+	{
+		return false;
+	}
+
+	if (child->parent != &model->nodes[0])
+	{
+		return false;
+	}
+
+	return true;
+
+}
+
+
+int NS_GetAverageNormalInsideSphere(const model_t* model, const NODE* node, const vec3_t point, float radius, vec3_t normal)
+{
+
+	// Check for a leaf node.
+
+	if (node->contents < 0)
+	{
+		return 0;
+	}
+	
+	float distance = NS_PointToPlaneDistance(point, node->plane);
+
+	int numSurfaces = 0;
+
+	if (distance > radius)
+	{
+		
+		// The sphere is completely in front of the plane.
+
+		numSurfaces = NS_GetAverageNormalInsideSphere(model,
+			(const NODE*)node->children[0], point, radius, normal);	
+
+	}
+	else if (distance < -radius)
+	{
+		
+		// The sphere is completely behind the plane.
+	
+		numSurfaces = NS_GetAverageNormalInsideSphere(model,
+			(const NODE*)node->children[1], point, radius, normal);
+
+	}
+	else
+	{
+
+		// Compute the projection of the point onto the plane.
+
+		vec3_t projection;
+
+		VectorScale(node->plane->normal, distance, projection);
+		VectorAdd(point, projection, projection);
+
+		// Test if the sphere intersects any of the surfaces in this node.
+
+		unsigned short lastSurface = node->firstsurface + node->numsurfaces;
+		
+		for (unsigned short i = node->firstsurface; i < lastSurface; ++i)
+		{
+		
+			ASSERT(i < model->numsurfaces);
+			
+			const SURFACE* surface = &((const SURFACE*)model->surfaces)[i];
+			ASSERT(surface->plane == node->plane);
+
+			if (NS_PointOnSurface(model, surface, projection) ||
+				NS_PointToSurfaceEdgeDistance(model, surface, point) < radius)
+			{
+
+				// Compute a weighting factor for the normal based on the
+				// intersection area of the sphere and plane.
+
+				float weight = radius * radius - distance * distance;
+
+				vec3_t surfaceNormal;
+				
+				if (surface->flags & SURF_PLANEBACK)
+				{
+					VectorScale(node->plane->normal, -weight, surfaceNormal);
+				}
+				else
+				{
+					VectorScale(node->plane->normal, weight, surfaceNormal);
+				}
+
+				VectorAdd(normal, surfaceNormal, normal);
+
+				++numSurfaces;
+			}
+
+		}
+
+		// Recursively test the child nodes.
+
+		numSurfaces += NS_GetAverageNormalInsideSphere(model,
+			(const NODE*)node->children[0], point, radius, normal);
+
+		numSurfaces += NS_GetAverageNormalInsideSphere(model,
+			(const NODE*)node->children[1], point, radius, normal);
+
+	}
+
+	return numSurfaces;
+
+}
+
+
+int NS_GetAverageNormalInsideSphere(const model_t* model, const vec3_t point, float radius, vec3_t normal)
+{
+	
+	ASSERT(!NS_IsSoftwareModel(model));
+
+	normal[0] = 0;
+	normal[1] = 0;
+	normal[2] = 0;
+
+	int numSurfaces = NS_GetAverageNormalInsideSphere(model, (const NODE*)(model->nodes), point, radius, normal);
+
+	if (numSurfaces > 0)
+	{
+		VectorNormalize(normal);
+	}
+
+	return numSurfaces;
+
+}
+
+int NS_UpdateNodeContent(int old_content, int new_content)
+{
+	if(new_content == CONTENTS_EMPTY)
+	{
+		return old_content;
+	}
+	if(old_content == CONTENTS_EMPTY)
+	{
+		return new_content;
+	}
+	return max(old_content,new_content);
+}
+
+/**
+ * Returns world content value in a sphere - solid beats liquid beats empty
+ */
+int NS_SphereContents(const hull_t *hull, int num, float origin[3], float radius)
+{
+	ASSERT(radius >= 0);
+
+	int contents = CONTENTS_EMPTY;
+
+	if(hull->firstclipnode <= hull->lastclipnode)
+	{
+		float d;
+		dclipnode_t	*node;
+		mplane_t	*plane;
+		std::queue<int> nodelist; //list of clipnodes to check
+		nodelist.push(num);
+		while(!nodelist.empty())
+		{
+			ASSERT(num >= hull->firstclipnode && num <= hull->lastclipnode);
+			num = nodelist.front();
+			nodelist.pop();
+
+			node = hull->clipnodes + num;
+			plane = hull->planes + node->planenum;
+			
+			d = NS_PointToPlaneDistance(origin,plane);
+
+			if(d < radius)
+			{
+				ASSERT(node->children[1] != num);
+				if(node->children[1] < 0)
+				{
+					contents = NS_UpdateNodeContent(contents,node->children[1]);
+				}
+				else
+				{
+					nodelist.push(node->children[1]);
+				}
+			}
+			if(d > -radius)
+			{
+				ASSERT(node->children[0] != num);
+				if(node->children[0] < 0)
+				{
+					contents = NS_UpdateNodeContent(contents,node->children[0]);
+				}
+				else
+				{
+					nodelist.push(node->children[0]);
+				}
+			}
+		}
+	}
+
+	return contents;
+}
+
+/**
+ * Returns whether a box is in front, behind, or intersecting a plane
+ */
+int NS_BoxPlaneIntersectionType(float mins[3], float maxs[3], mplane_t* plane)
+{
+	int intersect_type = INTERSECT_NONE;
+	float orientedMins[3] = { 
+		plane->normal[0] < 0 ? maxs[0] : mins[0], 
+		plane->normal[1] < 0 ? maxs[1] : mins[1], 
+		plane->normal[2] < 0 ? maxs[2] : mins[2]
+	};
+	float orientedMaxes[3] = { 
+		plane->normal[0] < 0 ? mins[0] : maxs[0], 
+		plane->normal[1] < 0 ? mins[1] : maxs[1], 
+		plane->normal[2] < 0 ? mins[2] : maxs[2]
+	};
+	intersect_type |= (NS_PointToPlaneDistance(orientedMins,plane) < 0) ? INTERSECT_BACK : INTERSECT_FRONT;
+	intersect_type |= (NS_PointToPlaneDistance(orientedMaxes,plane) < 0) ? INTERSECT_BACK : INTERSECT_FRONT;
+	return intersect_type;
+}
+
+/**
+ * Returns world content value in a box - solid beats liquid beats empty
+ */
+int NS_BoxContents(const hull_t *hull, int num, float mins[3], float maxs[3])
+{
+	ASSERT(mins[0] <= maxs[0]);
+	ASSERT(mins[1] <= maxs[1]);
+	ASSERT(mins[2] <= maxs[2]);
+
+	int contents = CONTENTS_EMPTY;
+
+	if(hull->firstclipnode <= hull->lastclipnode)
+	{
+		int intersection_type;
+		dclipnode_t	*node;
+		mplane_t	*plane;
+		std::queue<int> nodelist; //list of clipnodes to check
+		nodelist.push(num);
+		while(!nodelist.empty())
+		{
+			ASSERT(num >= hull->firstclipnode && num <= hull->lastclipnode);
+			num = nodelist.front();
+			nodelist.pop();
+
+			node = hull->clipnodes + num;
+			plane = hull->planes + node->planenum;
+
+			intersection_type = NS_BoxPlaneIntersectionType(mins,maxs,plane);
+
+			if(intersection_type & INTERSECT_BACK)
+			{
+				ASSERT(node->children[1] != num);
+				if(node->children[1] < 0)
+				{
+					contents = NS_UpdateNodeContent(contents,node->children[1]);
+				}
+				else
+				{
+					nodelist.push(node->children[1]);
+				}
+			}
+			if(intersection_type & INTERSECT_FRONT)
+			{
+				ASSERT(node->children[0] != num);
+				if(node->children[0] < 0)
+				{
+					contents = NS_UpdateNodeContent(contents,node->children[0]);
+				}
+				else
+				{
+					nodelist.push(node->children[0]);
+				}
+			}
+		}
+	}
+	return contents;
+}
+
+
+int NS_PointContents(const hull_t *hull, int num, float p[3])
+{
+	float		d;
+	dclipnode_t	*node;
+	mplane_t	*plane;
+
+    if (hull->firstclipnode > hull->lastclipnode)
+    {
+        return CONTENTS_EMPTY;
+    }
+
+	while (num >= 0)
+	{
+		ASSERT(num >= hull->firstclipnode && num <= hull->lastclipnode);
+	
+		node = hull->clipnodes + num;
+		plane = hull->planes + node->planenum;
+		
+		if (plane->type < 3)
+			d = p[plane->type] - plane->dist;
+		else
+			d = DotProduct (plane->normal, p) - plane->dist;
+
+		if (d < 0)
+		{
+			ASSERT(node->children[1] != num);
+			num = node->children[1];
+		}
+		else
+		{
+			ASSERT(node->children[0] != num);
+			num = node->children[0];
+		}
+	}
+	
+	return num;
+}
+
+bool NS_TraceLine(const hull_t* hull, int num, float p1f, float p2f, vec3_t p1, vec3_t p2, trace_t* trace)
+{
+
+	//const float DIST_EPSILON = 0.03125f;
+    const float DIST_EPSILON = 0.1f;
+
+	dclipnode_t	*node;
+	mplane_t	*plane;
+	float		t1, t2;
+	float		frac;
+	int			i;
+	vec3_t		mid;
+	int			side;
+	float		midf;
+
+// check for empty
+	if (num < 0)
+	{
+		if (num != CONTENTS_SOLID)
+		{
+			trace->allsolid = false;
+			if (num == CONTENTS_EMPTY)
+				trace->inopen = true;
+			else
+				trace->inwater = true;
+		}
+		else
+			trace->startsolid = true;
+		return true;		// empty
+	}
+
+	ASSERT(num >= hull->firstclipnode && num <= hull->lastclipnode);
+
+//
+// find the point distances
+//
+	node = hull->clipnodes + num;
+	plane = hull->planes + node->planenum;
+
+	if (plane->type < 3)
+	{
+		t1 = p1[plane->type] - plane->dist;
+		t2 = p2[plane->type] - plane->dist;
+	}
+	else
+	{
+		t1 = DotProduct (plane->normal, p1) - plane->dist;
+		t2 = DotProduct (plane->normal, p2) - plane->dist;
+	}
+	
+	if (t1 >= 0 && t2 >= 0)
+		return NS_TraceLine(hull, node->children[0], p1f, p2f, p1, p2, trace);
+	if (t1 < 0 && t2 < 0)
+		return NS_TraceLine(hull, node->children[1], p1f, p2f, p1, p2, trace);
+
+// put the crosspoint DIST_EPSILON pixels on the near side
+	if (t1 < 0)
+		frac = (t1 + DIST_EPSILON)/(t1-t2);
+	else
+		frac = (t1 - DIST_EPSILON)/(t1-t2);
+	if (frac < 0)
+		frac = 0;
+	if (frac > 1)
+		frac = 1;
+		
+	midf = p1f + (p2f - p1f)*frac;
+	for (i=0 ; i<3 ; i++)
+		mid[i] = p1[i] + frac*(p2[i] - p1[i]);
+
+	side = (t1 < 0);
+
+// move up to the node
+	if (!NS_TraceLine(hull, node->children[side], p1f, midf, p1, mid, trace) )
+		return false;
+	
+	if (NS_PointContents(hull, node->children[side^1], mid) != CONTENTS_SOLID)
+// go past the node
+		return NS_TraceLine(hull, node->children[side^1], midf, p2f, mid, p2, trace);
+	
+	if (trace->allsolid)
+		return false;		// never got out of the solid area
+		
+//==================
+// the other side of the node is solid, this is the impact point
+//==================
+	if (!side)
+	{
+		VectorCopy (plane->normal, trace->plane.normal);
+		trace->plane.dist = plane->dist;
+	}
+	else
+	{
+		VectorSubtract (vec3_origin, plane->normal, trace->plane.normal);
+		trace->plane.dist = -plane->dist;
+	}
+
+	while (NS_PointContents(hull, hull->firstclipnode, mid) == CONTENTS_SOLID)
+	{ // shouldn't really happen, but does occasionally
+		frac -= 0.1f;
+		if (frac < 0)
+		{
+			trace->fraction = midf;
+			VectorCopy (mid, trace->endpos);
+			// backup past 0
+			return false;
+		}
+		midf = p1f + (p2f - p1f)*frac;
+		for (i=0 ; i<3 ; i++)
+			mid[i] = p1[i] + frac*(p2[i] - p1[i]);
+	}
+
+	trace->fraction = midf;
+	VectorCopy (mid, trace->endpos);
+
+	return false;
+
+}
+
+
+void NS_TraceLine(const hull_t* hull, vec3_t srcPoint, vec3_t dstPoint, trace_t* trace)
+{
+
+	memset(trace, 0, sizeof(trace_t));
+	
+	trace->fraction = 1;
+	trace->allsolid = true;
+	VectorCopy(dstPoint, trace->endpos);
+
+    if (hull->firstclipnode <= hull->lastclipnode)
+    {
+    	NS_TraceLine(hull, hull->firstclipnode, 0, 1, srcPoint, dstPoint, trace);
+    }
+
+	if (trace->allsolid)
+    {
+		trace->startsolid = true;
+    }
+
+	if (trace->startsolid)
+    {
+		trace->fraction = 0;
+    }
+
+}
+
+
+void NS_TraceLine(vec3_t min, vec3_t max, vec3_t srcPoint, vec3_t dstPoint, trace_t* trace)
+{
+
+	memset(trace, 0, sizeof(trace_t));
+
+    vec3_t direction;
+    VectorSubtract(dstPoint, srcPoint, direction);
+    
+    vec3_t tMax;
+
+    tMax[0] = -1;
+    tMax[1] = -1;
+    tMax[2] = -1;
+
+    vec3_t result;
+    bool inside = true;
+
+    // Find candidate planes.
+
+    for (int i = 0; i < 3; ++i)
+    {
+
+        if (srcPoint[i] <= min[i])
+        {
+            
+            result[i] = min[i];
+            inside = false;
+
+            // Calculate the distances to the candidate planes.
+            
+            if (direction[i] != 0)
+            {
+                tMax[i] = (min[i] - srcPoint[i]) / direction[i];
+            }
+        
+        
+        }
+        else if (srcPoint[i] >= max[i])
+        {
+
+            result[i] = max[i];
+            inside = false;
+
+            // Calculate the distances to the candidate planes.
+
+            if (direction[i] != 0)
+            {
+                tMax[i] = (max[i] - srcPoint[i]) / direction[i];
+            }
+
+        }
+    
+    }
+
+    // Check if the trace origin is inside the box.
+
+    if (inside)
+    {
+        
+        trace->startsolid = true;
+        trace->fraction   = 0;
+	    VectorCopy(srcPoint, trace->endpos);
+
+        return;
+
+    }
+
+    // Get the largest of the tMax's for the final choice of intersection.
+
+    int axis = 0;
+
+    if (tMax[1] > tMax[axis]) axis = 1;
+    if (tMax[2] > tMax[axis]) axis = 2;
+
+    // Check that the intersection is actually inside the line segment.
+
+    trace->fraction = 1;
+    VectorCopy(dstPoint, trace->endpos);
+
+    if (tMax[axis] <= 0 || tMax[axis] > 1)
+    {
+        return;
+    }
+
+    for (int j = 0; j < 3; ++j)
+    {
+        if (j != axis)
+        {
+
+            result[j] = srcPoint[j] + tMax[axis] * direction[j];
+
+            if (result[j] < min[j] || result[j] > max[j])
+            {
+                return;
+            }
+        
+        }
+    }
+
+    trace->fraction = tMax[axis];
+    VectorCopy(result, trace->endpos);
+
+}
+
+
+bool NS_BoxesOverlap(float origin1[3], float size1[3], float origin2[3], float size2[3])
+{
+
+	for (int i = 0; i < 3; ++i)
+	{
+
+		float distance = (float)fabs(origin2[i] - origin1[i]);
+		
+		if (distance > size1[i] + size2[i])
+		{
+			return false;
+		}
+
+	}
+
+	return true;
+
+}
+
+//-----------------------------------------------------------------------------
+
+void NS_GetHitBoxesForEntity(int inEntityIndex, int inMaxNumBoxes, OBBox outBoxes[], int& outNumBoxes, float time)
+{
+
+    outNumBoxes = 0;
+
+    NS_AnimationData theAnimationData;
+    
+    if (!NS_GetEntityAnimationData(inEntityIndex, theAnimationData))
+    {
+        return;
+    }
+
+    studiohdr_t* theModelHeader = theAnimationData.mModelHeader;
+
+    if (theAnimationData.mModelHeader == NULL)
+    {
+        return;
+    }
+
+    if (theModelHeader->numhitboxes > inMaxNumBoxes)
+    {
+        outNumBoxes = inMaxNumBoxes;
+    }
+    else
+    {
+        outNumBoxes = theModelHeader->numhitboxes;
+    }
+
+    mstudiobbox_t* theHitBoxes = (mstudiobbox_t*)((byte*)theModelHeader + theModelHeader->hitboxindex);
+
+    NS_Matrix3x4 theBoneMatrix[MAXSTUDIOBONES];
+    NS_GetBoneMatrices(theAnimationData, time, theBoneMatrix);
+
+    for (int i = 0; i < outNumBoxes; ++i)
+    {
+        
+        int theBone = theHitBoxes[i].bone;
+
+        for (int r = 0; r < 3; ++r)
+        {
+            for (int c = 0; c < 3; ++c)
+            {
+                outBoxes[i].mAxis[c][r] = theBoneMatrix[theBone][r][c];
+            }
+        }
+
+        outBoxes[i].mOrigin[0] = theBoneMatrix[theBone][0][3];
+        outBoxes[i].mOrigin[1] = theBoneMatrix[theBone][1][3];
+        outBoxes[i].mOrigin[2] = theBoneMatrix[theBone][2][3];
+
+        vec3_t temp;
+        VectorSubtract(theHitBoxes[i].bbmax, theHitBoxes[i].bbmin, temp);
+        VectorScale(temp, 0.5, outBoxes[i].mExtents);
+
+        VectorAdd(theHitBoxes[i].bbmax, theHitBoxes[i].bbmin, temp);
+        VectorScale(temp, 0.5, temp);
+        
+        VectorMA(outBoxes[i].mOrigin, temp[0], outBoxes[i].mAxis[0], outBoxes[i].mOrigin);
+        VectorMA(outBoxes[i].mOrigin, temp[1], outBoxes[i].mAxis[1], outBoxes[i].mOrigin);
+        VectorMA(outBoxes[i].mOrigin, temp[2], outBoxes[i].mAxis[2], outBoxes[i].mOrigin);
+
+    }
+
+}
+
+//-----------------------------------------------------------------------------
+
+float NS_GetIntersection(const OBBox& inBox, const vec3_t inRayOrigin, const vec3_t inRayDirection)
+{
+
+    // Ray/Box intersection test from "Real-Time Rendering" by Tomas Moller
+    // and Eric Haines.
+
+	float tMin = -AVH_INFINITY;
+	float tMax =  AVH_INFINITY;
+	
+	vec3_t p;
+    VectorSubtract(inBox.mOrigin, inRayOrigin, p);
+	
+	for (int i = 0; i < 3; i++)
+    {
+		
+		float e = DotProduct(inBox.mAxis[i], p);
+		float f = DotProduct(inBox.mAxis[i], inRayDirection);
+	
+		// Check that the ray and the slab are not parallel
+
+		if (fabs(f) > AVH_EPSILON)
+        {
+			
+			float t1 = (e + inBox.mExtents[i]) / f;
+			float t2 = (e - inBox.mExtents[i]) / f;
+			
+			if (t1 > t2)
+            {
+                std::swap(t1, t2);
+			}
+			
+			if (t1 > tMin)
+            {
+				tMin = t1;
+			}
+			
+			if (t2 < tMax)
+            {
+				tMax = t2;
+			}
+			
+			if (tMin > tMax)
+            {
+				return AVH_INFINITY;
+			}
+
+			if (tMax < 0)
+            {
+				return AVH_INFINITY;
+			}
+
+		}
+        else if (-e - inBox.mExtents[i] > 0 || -e + inBox.mExtents[i] < 0)
+        {
+			return AVH_INFINITY;		
+		}
+
+	}
+	
+	if (tMin > 0)
+    {
+		return tMin;
+	}
+    else
+    {
+		return tMax;
+	}
+
+}
+
+//-----------------------------------------------------------------------------
+
+float NS_TraceLineAgainstEntity(int inEntityIndex, float inTime, const vec3_t inRayOrigin, const vec3_t inRayDirection)
+{
+
+    /*
+    // Do an early out test to see if the ray collides with the bounding box.
+
+    NS_AnimationData theAnimationData;
+    
+    if (!NS_GetEntityAnimationData(inEntityIndex, theAnimationData))
+    {
+        return AVH_INFINITY;
+    }
+
+    OBBox theBoundingBox;
+
+    theBoundingBox.mAxis[0][0] = theAnimationData.mMatrix[0][0];
+    theBoundingBox.mAxis[0][1] = theAnimationData.mMatrix[1][0];
+    theBoundingBox.mAxis[0][2] = theAnimationData.mMatrix[2][0];
+
+    theBoundingBox.mAxis[1][0] = theAnimationData.mMatrix[0][1];
+    theBoundingBox.mAxis[1][1] = theAnimationData.mMatrix[1][1];
+    theBoundingBox.mAxis[1][2] = theAnimationData.mMatrix[2][1];
+
+    theBoundingBox.mAxis[2][0] = theAnimationData.mMatrix[0][2];
+    theBoundingBox.mAxis[2][1] = theAnimationData.mMatrix[1][2];
+    theBoundingBox.mAxis[2][2] = theAnimationData.mMatrix[2][2];
+    
+    theBoundingBox.mOrigin[0] = theAnimationData.mMatrix[0][3];
+    theBoundingBox.mOrigin[1] = theAnimationData.mMatrix[1][3];
+    theBoundingBox.mOrigin[2] = theAnimationData.mMatrix[2][3];
+    
+    vec3_t temp;
+    VectorSubtract(theAnimationData.mMins, theAnimationData.mMaxs, temp);
+    VectorScale(temp, 0.5, theBoundingBox.mExtents);
+    
+    VectorAdd(theAnimationData.mMins, theAnimationData.mMaxs, temp);
+    VectorScale(temp, 0.5, theBoundingBox.mOrigin); // Wrong space, but probably good enough.
+    
+    if (NS_GetIntersection(theBoundingBox, inRayOrigin, inRayDirection) == AVH_INFINITY)    
+    {
+        return AVH_INFINITY;
+    }
+    */
+
+    // Do the full hit box test.
+
+    const int kMaxNumBoxes = 255;
+    OBBox theBoxes[kMaxNumBoxes];
+    int   theNumBoxes;
+
+    NS_GetHitBoxesForEntity(inEntityIndex, kMaxNumBoxes, theBoxes, theNumBoxes, inTime);
+
+    float tMin = AVH_INFINITY;
+    
+    for (int i = 0; i < theNumBoxes; ++i)
+    {
+        
+        float t = NS_GetIntersection(theBoxes[i], inRayOrigin, inRayDirection);
+    
+        if (t < tMin)
+        {
+            tMin = t;
+        }
+    
+    }
+
+    return tMin;
+
+}
+
+//-----------------------------------------------------------------------------
+
+int NS_GetValveHull(int inHull)
+{
+
+    int theHull = inHull;
+    switch(inHull)
+    {
+    case 0:
+        theHull = 1;
+        break;
+    case 1:
+        theHull = 3;
+        break;
+    case 2:
+        theHull = 0;
+        break;
+    case 3:
+        theHull = 2;
+        break;
+    default:
+        ASSERT(false);
+        break;
+    }
+
+    return theHull;
+}
\ No newline at end of file
diff --git a/main/source/mod/CollisionUtil.h b/main/source/mod/CollisionUtil.h
new file mode 100644
index 00000000..5228075e
--- /dev/null
+++ b/main/source/mod/CollisionUtil.h
@@ -0,0 +1,80 @@
+#ifndef COLLISION_UTIL_H
+#define COLLISION_UTIL_H
+
+extern const float AVH_INFINITY;
+extern const float AVH_EPSILON;
+
+#include <vector>
+#include "pm_defs.h"
+#include "CollisionChecker.h"
+
+/**
+ * Computes the average of all the surface normals inside a sphere. Returns the
+ * number of surfaces that were tested in the process of computing the normal.
+ */
+int NS_GetAverageNormalInsideSphere(const model_t* model, const vec3_t point, float radius, vec3_t normal);
+
+/**
+ * Traces a line segment against the specified hull.
+ */
+void NS_TraceLine(const hull_t* hull, float srcPoint[3], float dstPoint[3], trace_t* trace);
+
+/**
+ * Traces a line segment against an AABB.
+ */
+void NS_TraceLine(vec3_t min, vec3_t max, vec3_t srcPoint, vec3_t dstPoint, trace_t* trace);
+
+/**
+ * Tests if two axis-aligned bounding boxes overlap.
+ */
+bool NS_BoxesOverlap(float origin1[3], float size1[3], float origin2[3], float size2[3]);
+
+/**
+ * Returns world content type at given point
+ */
+int NS_PointContents(const hull_t *hull, int num, float p[3]);
+
+/**
+ * Returns minimum world content type inside sphere -- precedence: solid, then liquid types, then empty
+ */
+int NS_SphereContents(const hull_t *hull, int num, float origin[3], float radius);
+
+const static int INTERSECT_NONE = 0;
+const static int INTERSECT_FRONT = 1;
+const static int INTERSECT_BACK = 2;
+const static int INTERSECT_BOTH = 3;
+
+/**
+ * Returns box / plane intersection type - see constants above
+ */
+int NS_BoxPlaneIntersectionType(float mins[3], float maxs[3], mplane_t* plane);
+
+/**
+ * Returns minimum world content type inside box -- precedence: solid, then liquid types, then empty
+ */
+int NS_BoxContents(const hull_t *hull, int num, float mins[3], float maxs[3]);
+
+/**
+ * inEntityIndex is the index of the entity in edicts in the server or
+ * cl_entities in the client.
+ */
+void NS_GetHitBoxesForEntity(int inEntityIndex, int inMaxNumBoxes, OBBox outBoxes[], int& outNumBoxes, float time);
+
+/**
+ * Retuns the distance along a ray at which it intersects an oriented bounding
+ * box. If there is no intersection the function returns AVH_INFINITY.
+ */
+float NS_GetIntersection(const OBBox& inBox, const vec3_t inRayOrigin, const vec3_t inRayDirection);
+
+/**
+ * Retuns the distance along a ray at which it intersects an entity.
+ * If there is no intersection the function returns AVH_INFINITY.
+ */
+float NS_TraceLineAgainstEntity(int inEntityIndex, float inTime, const vec3_t inRayOrigin, const vec3_t inRayDirection);
+
+/**
+ * Convert "our" hull into VALVe hull
+ */
+int NS_GetValveHull(int inHull);
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/FileUtil.cpp b/main/source/mod/FileUtil.cpp
new file mode 100644
index 00000000..e80e7459
--- /dev/null
+++ b/main/source/mod/FileUtil.cpp
@@ -0,0 +1,138 @@
+#include "mod/FileUtil.h"
+#include "localassert.h"
+#include "util/nowarnings.h"
+#include <stdio.h>
+#include "stdarg.h"
+
+// For FindFirst/FindNext functionality in BuildFileList
+#ifdef WIN32
+	#include "windows.h"
+#else
+	#include "util/LinuxSupport.h"
+#endif
+
+#include "public/interface.h"
+#include "public/FileSystem.h"
+
+IFileSystem* FUGetFileSystem()
+{
+	static IFileSystem* sFileSystem = NULL;
+
+	if(!sFileSystem)
+	{
+		CSysModule *theFilesystem = Sys_LoadModule("FileSystem_Stdio");
+		
+		CreateInterfaceFn factory = Sys_GetFactory(theFilesystem);
+
+		void* theRetVal = factory(FILESYSTEM_INTERFACE_VERSION, NULL );
+		if(!theRetVal)
+		{
+			// Error
+			int a = 0;
+		}
+		sFileSystem = (IFileSystem *)theRetVal;
+	}
+	
+	ASSERT(sFileSystem);
+
+	return sFileSystem;
+}
+
+// Pass in relative path, do search on path including mod directory, return files relative to mod directory
+bool FUBuildFileList(const string& inBaseDirectoryName, const string& inDirectoryName, const string& inFileExtension, CStringList& outList)
+{
+	#ifdef WIN32
+	const string kDelimiter("\\");
+	#else
+	const string kDelimiter("/");
+	#endif
+
+	bool theSuccess = false;
+
+	string theBaseDirectoryName = inBaseDirectoryName;
+	string theDirectoryName = inDirectoryName;
+
+	#ifdef WIN32
+	// Replace all forward slashes with \\'s if needed
+	std::replace(theBaseDirectoryName.begin(), theBaseDirectoryName.end(), '/', '\\');
+	std::replace(theDirectoryName.begin(), theDirectoryName.end(), '/', '\\');
+	#endif
+	
+	string theFullDirName = theBaseDirectoryName + theDirectoryName;
+	
+	int theEndOffset = theDirectoryName.find_last_of(kDelimiter);
+	string theBaseDirName = theDirectoryName.substr(0, theEndOffset);
+
+	theFullDirName += inFileExtension;
+
+	#ifdef WIN32
+
+	FileFindHandle_t theHandle;
+	const char* theCStrFoundFileName = FUGetFileSystem()->FindFirst(theFullDirName.c_str(), &theHandle);
+	if(theCStrFoundFileName)
+	{
+		do
+		{
+			string theFoundFilename = string(theCStrFoundFileName);
+
+	#else
+
+	string theFoundFilename;
+	FIND_DATA theFindData;
+
+	int theRC = FindFirstFile(theFullDirName.c_str(), &theFindData);
+	if(theRC != -1)
+	{
+		do
+		{
+			string theFoundFilename = string(theFindData.cFileName);
+	#endif
+
+
+			CString theCString;
+			string theFullFileName = theBaseDirName + string("/") + theFoundFilename;
+
+			// Precache requires / in the filename
+			std::replace(theFullFileName.begin(), theFullFileName.end(), '\\', '/');
+
+			theCString = theFullFileName;
+			outList.push_back(theCString);
+			theSuccess = true;
+
+
+
+	#ifdef WIN32
+		} 
+		while((theCStrFoundFileName = FUGetFileSystem()->FindNext(theHandle)) != NULL);
+	}
+	#else
+
+		}
+		while(FindNextFile(0, &theFindData));
+	}
+
+	#endif
+	
+	
+	//DIR theDirp = opendir(theDirName.c_str());
+	//	while(theDirp) 
+	//	{
+	//		int theErrno = 0;
+	//		     if ((dp = readdir(theDirp)) != NULL) {
+	//			         if (strcmp(dp->d_name, name) == 0) {
+	//				             closedir(theDirp);
+	//				             return FOUND;
+	//				         }
+	//			     } else {
+	//				         if (theErrno == 0) {
+	//					             closedir(theDirp);
+	//					             return NOT_FOUND;
+	//					         }
+	//				         closedir(theDirp);
+	//				         return READ_ERROR;
+	//				     }
+	//			 }
+	//	return OPEN_ERROR;
+
+	return theSuccess;
+}
diff --git a/main/source/mod/FileUtil.h b/main/source/mod/FileUtil.h
new file mode 100644
index 00000000..4effc87f
--- /dev/null
+++ b/main/source/mod/FileUtil.h
@@ -0,0 +1,9 @@
+#ifndef NS_FILEUTIL_H
+#define NS_FILEUTIL_H
+
+#include "types.h"
+#include "util/CString.h"
+
+bool FUBuildFileList(const string& inBaseDirectoryName, const string& inDirectoryName, const string& inFileExtension, CStringList& outList);
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/LineDrawer.cpp b/main/source/mod/LineDrawer.cpp
new file mode 100644
index 00000000..0dd8fce5
--- /dev/null
+++ b/main/source/mod/LineDrawer.cpp
@@ -0,0 +1,319 @@
+#include "mod/LineDrawer.h"
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+
+int vguiRound(float inFloat)
+{
+    return (int)(inFloat + .5f);
+}
+
+int vguiAbs(int inNum)
+{
+    return (inNum > -inNum ? inNum : -inNum);
+}
+
+void vguiSimpleLine(int x0, int y0, int x1, int y1, int r, int g, int b, int a)
+{
+    //public void lineImproved(int x0, int y0, int x1, int y1, Color color)
+    //{
+        //int pix = color.getRGB();
+        int dx = x1 - x0;
+        int dy = y1 - y0;
+
+        //raster.setPixel(pix, x0, y0);
+        FillRGBA(x0, y0, 1, 1, r, g, b, a);
+        //if (Math.abs(dx) > Math.abs(dy)) {          // slope < 1
+        if(vguiAbs(dx) > vguiAbs(dy))
+        {
+            float m = (float) dy / (float) dx;      // compute slope
+            float b = y0 - m*x0;
+            dx = (dx < 0) ? -1 : 1;
+            while (x0 != x1) 
+            {
+                x0 += dx;
+                //raster.setPixel(pix, x0, Math.round(m*x0 + b));
+                FillRGBA(x0, vguiRound(m*x0 + b), 1, 1, r, g, b, a);
+            }
+        } else
+        if (dy != 0) 
+        {                              // slope >= 1
+            float m = (float) dx / (float) dy;      // compute slope
+            float b = x0 - m*y0;
+            dy = (dy < 0) ? -1 : 1;
+            while (y0 != y1) 
+            {
+                y0 += dy;
+                //raster.setPixel(pix, Math.round(m*y0 + b), y0);
+                FillRGBA(vguiRound(m*y0 + b), y0, 1, 1, r, g, b, a);
+            }
+        }
+    //}
+}
+
+void vguiSimpleBox(int x0, int y0, int x1, int y1, int r, int g, int b, int a)
+{
+	// Draw lines around edges of box, don't duplicate corner pixels though, looks weird where additive
+
+	// Top
+	vguiSimpleLine(x0, y0, x1, y0, r, g, b, a);
+	
+	// Left
+	vguiSimpleLine(x0, y0+1, x0, y1, r, g, b, a);
+	
+	// Right
+	vguiSimpleLine(x1, y0+1, x1, y1, r, g, b, a);
+	
+	// Bottom
+	vguiSimpleLine(x0+1, y1, x1, y1, r, g, b, a);
+}
+
+//int trunc(float inX)
+//{
+//    return 0;
+//	//return integer part of x
+//}
+//
+//float frac(float inX)
+//{
+//    return 0.0f;
+//	//return fractional part of x
+//}
+// 
+//float invfrac(inX)
+//{
+//    return 0.0f;
+//	//return 1 - (fractional part of x)
+//}
+//
+//
+//void vguiWuLine(int x1, int y1, int x2, int y2)
+//{
+//
+//        variable declerations:
+//            int variables:
+//		grad, xd, yd, length,xm,ym
+//		xgap, ygap, xend, yend, xf, yf
+//		brigheness1, brigheness2
+//
+//	    integer variables:
+//		x, y, ix1, ix2, iy1, iy2
+//
+//	    byte variables:
+//		c1,c2
+//
+//	code starts here:
+//
+//	    Width and Height of the line
+//	    xd = (x2-x1)
+//	    yd = (y2-y1)
+//	
+//	   
+//	    if abs(xd) > abs(yd) then			check line gradient
+//	        horizontal(ish) lines
+//
+//
+//		if x1 > x2 then				if line is back to front
+//		    swap x1 and x2			then swap it round
+//		    swap y1 and y2
+//	            xd = (x2-x1)				and recalc xd & yd
+//	            yd = (y2-y1)
+//		end if
+//
+//	 	grad = yd/xd                             gradient of the line
+//		
+//
+//		End Point 1
+//		-----------
+//
+//		xend = trunc(x1+.5)                      find nearest integer X-coordinate
+//		yend = y1 + grad*(xend-x1)               and corresponding Y value
+//		
+//		xgap = invfrac(x1+.5)                    distance i
+//		
+//		ix1  = int(xend)                         calc screen coordinates
+//		iy1  = int(yend)
+//	
+//		brightness1 = invfrac(yend) * xgap       calc the intensity of the other 
+//		brightness2 =    frac(yend) * xgap       end point pixel pair.
+//		
+//		c1 = byte(brightness1 * MaxPixelValue)	 calc pixel values
+//		c2 = byte(brightness2 * MaxPixelValue)	
+//
+//		DrawPixel(ix1,iy1), c1			 draw the pair of pixels
+//		DrawPixel(ix1,iy1+1), c2
+//
+//		yf = yend+grad                           calc first Y-intersection for
+//                                                         main loop
+//
+//		End Point 2
+//		-----------
+//
+//		xend = trunc(x2+.5)                      find nearest integer X-coordinate
+//		yend = y2 + grad*(xend-x2)               and corresponding Y value
+//		
+//		xgap = invfrac(x2-.5)                    distance i
+//		
+//		ix2  = int(xend)                         calc screen coordinates
+//		iy2  = int(yend)
+//	
+//		brightness1 = invfrac(yend) * xgap       calc the intensity of the first 
+//		brightness2 =    frac(yend) * xgap       end point pixel pair.
+//		
+//		c1 = byte(brightness1 * MaxPixelValue)	calc pixel values
+//		c2 = byte(brightness2 * MaxPixelValue)	
+//
+//		DrawPixel(ix2,iy2), c1			draw the pair of pixels
+//		DrawPixel(ix2,iy2+1), c2
+//
+//
+//
+//		MAIN LOOP
+//		---------
+//
+//		Loop x from (ix1+1) to (ix2-1)			main loop
+//
+//		    brightness1 = invfrac(yf)		        calc pixel brightnesses
+//		    brightness2 =    frac(yf)
+//
+//  		    c1 = byte(brightness1 * MaxPixelValue)	calc pixel values
+//		    c2 = byte(brightness2 * MaxPixelValue)	
+//
+//		    DrawPixel(x,int(yf)), c1			draw the pair of pixels
+// 		    DrawPixel(x,int(yf)+1), c2
+//
+//	            yf = yf + grad				update the y-coordinate
+//
+//		end of x loop					end of loop
+//
+//	    else
+//		vertical(ish) lines
+//
+//		handle the vertical(ish) lines in the
+//		same way as the horizontal(ish) ones
+//		but swap the roles of X and Y
+//	    end if
+//// end of procedure
+//}
+
+
+//void vguiDrawLine(int x0, int y0, int x1, int y1, vgui::Color inDrawColor) {
+//    int dx, dy, temp;
+//    
+//    // First clip input points to ICanvas
+//    if(x0 < 0) {
+//        x0 = 0;
+//    }
+//    if(x1 < 0) {
+//        x1 = 0;
+//    }
+//    if(x0 >= width) {
+//        x0 = width - 1;
+//    }
+//    if(x1 >= width) {
+//        x1 = width - 1;
+//    }
+//    if(y0 < 0) {
+//        y0 = 0;
+//    }
+//    if(y1 < 0) {
+//        y1 = 0;
+//    }
+//    if(y0 >= height) {
+//        y0 = height - 1;
+//    }
+//    if(y1 >= height) {
+//        y1 = height - 1;
+//    }
+//    
+//    dx = x1-x0;
+//    dy = y1-y0;
+//    
+//    if(y0 == y1) { // Special case horizontal lines!
+//        if(dx < 0) {
+//            dx = -dx; // Change to dx = -dx;
+//            x0 = x1;
+//        }
+//        // Call asm_drawHorizontalLine
+//        drawHorizontalLine(x0, y0, dx, inDrawColor);
+//        return;
+//    }
+//    
+//    if(x0 == x1) {
+//        if(dy < 0) {
+//            dy = -dy;
+//            y0 = y1;
+//        }
+//        // Call asm_drawVerticalLine
+//        drawVerticalLine(x0, y0, dy, inDrawColor);
+//        return;
+//    }
+//    
+//    bufferDest = (unsigned long)(buffer + y0*width + x0);
+//    if(fabs(dx) > fabs(dy)) {
+//        // We're going to call octant0
+//        oldYFract = (float)((float)(y1 - y0)/(float)fabs(x1 - x0));
+//        bufferWidth = width;
+//        if(oldYFract < 0) {
+//            oldYFract = -oldYFract; // Probably not needed cause sign bit shifted out
+//            bufferWidth = -width;
+//        }
+//        oldYFract++;
+//        if(x0 < x1) {
+//            drawDirection = 1;
+//        } else {
+//            drawDirection = -1;
+//        }
+//        if(fabs(dx) != 0) {
+//            octant0(fabs(dx));
+//        }
+//    } else {
+//        // We're going to call octant1
+//        oldXFract = (float)((float)(x1 - x0)/(float)fabs((y1 - y0)));
+//        oldXFract++;
+//        drawDirection = 1;
+//        if(oldXFract < 0) {
+//            oldXFract = -oldXFract;
+//            drawDirection = -1;
+//        }
+//        if(y0 < y1) {
+//            bufferWidth = width;
+//        } else {
+//            bufferWidth = -width;
+//        }
+//        if(fabs(dy) != 0) {
+//            octant1(fabs(dy));
+//        }
+//    }
+//}
+
+//void vguiOctant0(int inBufferDest, int inDeltaX, vgui::Color inDrawColor)
+//{
+//  asm_octant0_    PROC    NEAR
+//    ; Set up destination
+//    mov edi,[_bufferDest]
+//    mov bl,[_drawColor]
+
+
+//
+//    ; Set up fractional error
+//    mov eax,[_oldYFract]
+//    shl eax,9
+//    xor ax,ax
+//    mov [_yFract],eax
+//;    xor eax,eax
+//    xor edx,edx
+//
+//NOTDONEOCTANT0:
+//    mov [edi],bl
+//    ;inc edi
+//    add edi,[_drawDirection]
+//
+//    ; Now just figure out whether we go to the next line or not
+//    add edx,[_yFract]
+//    jnc DONTADDOCTANT0
+//    add edi,[_bufferWidth]
+//DONTADDOCTANT0:
+//    sub ecx,1
+//    jnz NOTDONEOCTANT0
+//    ret
+//}
\ No newline at end of file
diff --git a/main/source/mod/LineDrawer.h b/main/source/mod/LineDrawer.h
new file mode 100644
index 00000000..2d406bbf
--- /dev/null
+++ b/main/source/mod/LineDrawer.h
@@ -0,0 +1,16 @@
+#ifndef LINEDRAWER_H
+#define LINEDRAWER_H
+
+
+//int trunc(float inX);
+//
+//float frac(float inX);
+// 
+//float invfrac(inX);
+//
+//void vguiWuLine(int x1, int y1, int x2, int y2);
+
+void vguiSimpleLine(int x0, int y0, int x1, int y1, int r, int g, int b, int a);
+void vguiSimpleBox(int x0, int y0, int x1, int y1, int r, int g, int b, int a);
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/NetworkMeter.cpp b/main/source/mod/NetworkMeter.cpp
new file mode 100644
index 00000000..28034f65
--- /dev/null
+++ b/main/source/mod/NetworkMeter.cpp
@@ -0,0 +1,674 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: NetworkMeter.cpp $
+// $Date: 2002/11/15 19:09:23 $
+//
+//-------------------------------------------------------------------------------
+// $Log: NetworkMeter.cpp,v $
+// Revision 1.9  2002/11/15 19:09:23  Flayra
+// - Reworked network metering to be easily toggleable
+//
+// Revision 1.8  2002/10/24 21:44:01  Flayra
+// - Size was being calculated wrong (harmless, but gave wrong number in network log)
+//
+// Revision 1.7  2002/10/20 16:36:54  Flayra
+// - Allow network metering to be compiled in or out easily
+//
+// Revision 1.6  2002/08/02 21:44:50  Flayra
+// - Added code to enable/disable network metering, but there are problems when it's used
+//
+// Revision 1.5  2002/07/10 14:46:46  Flayra
+// - More debug info to the log to track down overflows
+//
+// Revision 1.4  2002/07/08 17:22:56  Flayra
+// - Allow disabling of network metering by setting rate to -1
+//
+// Revision 1.3  2002/07/01 21:20:51  Flayra
+// - Added logging code to track down overflows
+//
+// Revision 1.2  2002/05/23 02:32:40  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+// Revision 1.2  2002/05/01 02:34:41  Charlie
+//===============================================================================
+#include "mod/NetworkMeter.h"
+#include "build.h"
+
+////////////////////
+// Hook functions //
+////////////////////
+
+void NetworkMeterMessageBegin(int msg_dest, int msg_type, const float* pOrigin, edict_t* ed)
+{
+	if(CVAR_GET_FLOAT("mp_networkdebug") > 0) 
+	{
+		char theDebugString[512];
+		sprintf(theDebugString, "MessageBegin(%d, %d...)\n", msg_dest, msg_type);
+		ALERT(at_logged, theDebugString); 
+	}
+	
+#ifdef USE_NETWORK_METERING
+	NetworkMeter::Instance()->MessageBegin(msg_dest, msg_type, pOrigin, ed);
+#else
+	(*g_engfuncs.pfnMessageBegin)(msg_dest, msg_type, pOrigin, ed);
+#endif
+}
+
+void MESSAGE_END()
+{
+	#ifdef USE_NETWORK_METERING
+	NetworkMeter::Instance()->MessageEnd();
+	#else
+	(*g_engfuncs.pfnMessageEnd)();
+	#endif
+}
+
+void WRITE_BYTE(int inData)
+{
+	#ifdef USE_NETWORK_METERING
+	NetworkMeter::Instance()->WriteByte(inData);
+	#else
+	(*g_engfuncs.pfnWriteByte)(inData);
+	#endif
+}
+
+void WRITE_CHAR(int inData)
+{
+	#ifdef USE_NETWORK_METERING
+	NetworkMeter::Instance()->WriteChar(inData);
+	#else
+	(*g_engfuncs.pfnWriteChar)(inData);
+	#endif
+}
+
+void WRITE_SHORT(int inData)
+{
+	#ifdef USE_NETWORK_METERING
+	NetworkMeter::Instance()->WriteShort(inData);
+	#else
+	(*g_engfuncs.pfnWriteShort)(inData);
+	#endif
+}
+
+void WRITE_LONG(int inData)
+{
+	#ifdef USE_NETWORK_METERING
+	NetworkMeter::Instance()->WriteLong(inData);
+	#else
+	(*g_engfuncs.pfnWriteLong)(inData);
+	#endif
+}
+
+void WRITE_ANGLE(float inData)
+{
+	#ifdef USE_NETWORK_METERING
+	NetworkMeter::Instance()->WriteAngle(inData);
+	#else
+	(*g_engfuncs.pfnWriteAngle)(inData);
+	#endif
+}
+
+void WRITE_COORD(float inData)
+{
+	#ifdef USE_NETWORK_METERING
+	NetworkMeter::Instance()->WriteCoord(inData);
+	#else
+	(*g_engfuncs.pfnWriteCoord)(inData);
+	#endif
+}
+
+void WRITE_STRING(const char* inData)
+{
+	#ifdef USE_NETWORK_METERING
+	NetworkMeter::Instance()->WriteString(inData);
+	#else
+	(*g_engfuncs.pfnWriteString)(inData);
+	#endif
+}
+
+int REG_USER_MSG(const char* inMessageName, int inMessageSize)
+{
+	int theMessageID = (*g_engfuncs.pfnRegUserMsg)(inMessageName, inMessageSize);
+
+	#ifdef USE_NETWORK_METERING
+	NetworkMeter::Instance()->AddMessage(inMessageName, theMessageID);
+	#endif
+
+	return theMessageID;
+}
+
+
+//////////////////
+// Network data //
+//////////////////
+NetworkData::NetworkData()
+{
+	this->mDataType = NETWORK_DATA_TYPE_INVALID;
+	this->mIntData = 0;
+	this->mFloatData = 0.0f;
+	this->mStringData = "";
+}
+
+// Return size of data, in bytes
+int NetworkData::GetDataSize()
+{
+	int theDataSize = 0;
+
+	switch(this->mDataType)
+	{
+	case NETWORK_DATA_TYPE_INVALID:
+		ASSERT(false);
+		break;
+
+	case NETWORK_DATA_TYPE_BYTE:
+	case NETWORK_DATA_TYPE_CHAR:
+		theDataSize = 1;
+		break;
+
+	case NETWORK_DATA_TYPE_SHORT:
+	case NETWORK_DATA_TYPE_COORD:
+		theDataSize = 2;
+		break;
+
+	case NETWORK_DATA_TYPE_LONG:
+		theDataSize = 4;
+		break;
+
+	case NETWORK_DATA_TYPE_ANGLE:
+		theDataSize = 4;
+		break;
+		
+	case NETWORK_DATA_TYPE_STRING:
+		//ASSERT(this->mStringData != "");
+		theDataSize = 1*this->mStringData.length();
+		break;
+	}
+
+	return theDataSize;
+}
+
+void NetworkData::Execute()
+{
+	switch(this->mDataType)
+	{
+	case NETWORK_DATA_TYPE_INVALID:
+		ASSERT(false);
+		break;
+		
+	case NETWORK_DATA_TYPE_BYTE:
+		(*g_engfuncs.pfnWriteByte)(this->mIntData);
+		break;
+
+	case NETWORK_DATA_TYPE_CHAR:
+		(*g_engfuncs.pfnWriteChar)(this->mIntData);
+		break;
+		
+	case NETWORK_DATA_TYPE_SHORT:
+		(*g_engfuncs.pfnWriteShort)(this->mIntData);
+		break;
+		
+	case NETWORK_DATA_TYPE_LONG:
+		(*g_engfuncs.pfnWriteLong)(this->mIntData);
+		break;
+		
+	case NETWORK_DATA_TYPE_ANGLE:
+		(*g_engfuncs.pfnWriteAngle)(this->mFloatData);
+		break;
+
+	case NETWORK_DATA_TYPE_COORD:
+		(*g_engfuncs.pfnWriteCoord)(this->mFloatData);
+		break;
+		
+	case NETWORK_DATA_TYPE_STRING:
+		//ASSERT(this->mStringData != "");
+		(*g_engfuncs.pfnWriteString)(this->mStringData.c_str());
+		break;
+	}
+}
+
+void NetworkData::SetTypeByte(int inData)
+{
+	this->mDataType = NETWORK_DATA_TYPE_BYTE;
+	this->mIntData = inData;
+}
+
+void NetworkData::SetTypeChar(int inData)
+{
+	this->mDataType = NETWORK_DATA_TYPE_CHAR;
+	this->mIntData = inData;
+}
+
+void NetworkData::SetTypeShort(int inData)
+{
+	this->mDataType = NETWORK_DATA_TYPE_SHORT;
+	this->mIntData = inData;
+}
+
+void NetworkData::SetTypeLong(int inData)
+{
+	this->mDataType = NETWORK_DATA_TYPE_LONG;
+	this->mIntData = inData;
+}
+
+void NetworkData::SetTypeAngle(float inData)
+{
+	this->mDataType = NETWORK_DATA_TYPE_ANGLE;
+	this->mFloatData = inData;
+}
+
+void NetworkData::SetTypeCoord(float inData)
+{
+	this->mDataType = NETWORK_DATA_TYPE_COORD;
+	this->mFloatData = inData;
+}
+
+void NetworkData::SetTypeString(const char* inData)
+{
+	this->mDataType = NETWORK_DATA_TYPE_STRING;
+	this->mStringData = inData;
+}
+
+
+
+////////////////////
+// NetworkMessage //
+////////////////////
+NetworkMessage::NetworkMessage()
+{
+	this->Clear();
+}
+
+void NetworkMessage::Clear()
+{
+	this->mMessageDest = -1;
+	this->mMessageType = -1;
+	this->mEdict = NULL;
+	this->mOrigin[0] = this->mOrigin[1] = this->mOrigin[2] = 0.0f;
+	this->mMessageData.clear();
+	this->mMessagePending = false;
+	this->mMessageSent = false;
+	this->mTimeMessageSent = -1;
+}
+
+void NetworkMessage::MessageBegin(int inMessageDest, int inMessageType, const float* inOrigin, edict_t* inEd)
+{
+	this->Clear();
+
+	// Set message header data
+	this->mMessageDest = inMessageDest;
+	this->mMessageType = inMessageType;
+	if(inOrigin)
+	{
+		this->mOrigin[0] = inOrigin[0];
+		this->mOrigin[1] = inOrigin[1];
+		this->mOrigin[2] = inOrigin[2];
+	}
+	this->mEdict = inEd;
+
+	this->mMessagePending = true;
+}
+
+void NetworkMessage::AddData(const NetworkData& inData)
+{
+	ASSERT(this->mMessagePending);
+
+	this->mMessageData.push_back(inData);
+}
+
+void NetworkMessage::Execute(int theNumMessagesQueued)
+{
+	if(CVAR_GET_FLOAT("mp_networkdebug") > 0) 
+	{
+		string theMessageName = NetworkMeter::Instance()->LookupMessageID(this->mMessageType);
+		string theMessageDest = "-";
+		if(this->mEdict)
+		{
+			theMessageDest = STRING(VARS(this->mEdict)->netname);
+		}
+		UTIL_LogPrintf("NetworkMessage::Execute(\"%s\", \"%s\", %d bytes, %d queued, time: %f)\n", theMessageDest.c_str(), theMessageName.c_str(), this->GetDataSize(), theNumMessagesQueued, gpGlobals->time);
+	}
+	
+	// Start the message
+	(*g_engfuncs.pfnMessageBegin)(this->mMessageDest, this->mMessageType, this->mOrigin, this->mEdict);
+	
+	// Loop through the data
+	for(NetworkMessageDataList::iterator theIter = this->mMessageData.begin(); theIter != this->mMessageData.end(); theIter++)
+	{
+		// Send each
+		theIter->Execute();
+	}
+
+	// End the message
+	(*g_engfuncs.pfnMessageEnd)();
+	
+	// Mark message as sent
+	this->SetMessageSent();
+}
+
+void NetworkMessage::MessageEnd()
+{
+	ASSERT(this->mMessagePending);
+
+	this->mMessagePending = false;
+}
+
+int	NetworkMessage::GetDataSize()
+{
+	// Estimated amount for header.  TODO: Ask Yahn to find out exactly?
+	const int kNumBytesForMessageHeader = 4;
+
+	int theNumBytes = kNumBytesForMessageHeader;
+
+	for(NetworkMessageDataList::iterator theIter = this->mMessageData.begin(); theIter != this->mMessageData.end(); theIter++)
+	{
+		theNumBytes += theIter->GetDataSize();
+	}
+
+	return theNumBytes;
+}
+
+bool NetworkMessage::GetMessagePending() const
+{
+	return this->mMessagePending;
+}
+
+bool NetworkMessage::GetMessageSent() const
+{
+	return this->mMessageSent;
+}
+
+void NetworkMessage::SetMessageSent()
+{
+	this->mMessageSent = true;
+	this->mTimeMessageSent = gpGlobals->time;
+}
+
+float NetworkMessage::GetTimeMessageSent() const
+{
+	return this->mTimeMessageSent;
+}
+
+
+////////////////////////
+// PlayerNetworkMeter //
+////////////////////////
+PlayerNetworkMeter::PlayerNetworkMeter()
+{
+	this->mBytesSentInPastSecond = 0;
+	this->mBytesPerSecond = 0;
+}
+
+void PlayerNetworkMeter::SetBufferAmount(int inBytesPerSecond)
+{
+	this->mBytesPerSecond = inBytesPerSecond;
+}
+
+void PlayerNetworkMeter::MessageBegin(int inMessageDest, int inMessageType, const float* inOrigin, edict_t* inEd)
+{
+	// Make sure we're not in the middle of sending a message
+	ASSERT(!this->mMessage.GetMessagePending());
+	
+	// Start new message
+	this->mMessage.MessageBegin(inMessageDest, inMessageType, inOrigin, inEd);
+}
+
+void PlayerNetworkMeter::MessageEnd()
+{
+	ASSERT(this->mMessage.GetMessagePending());
+	
+	this->mMessage.MessageEnd();
+	
+	// Add message to the (end of) list
+	this->mMessageList.push_back(this->mMessage);
+	
+	// Clear message
+	this->mMessage.Clear();
+}
+
+void PlayerNetworkMeter::WriteByte(int inByte)
+{
+	ASSERT(this->mMessage.GetMessagePending());
+	
+	NetworkData theNetworkData;
+	theNetworkData.SetTypeByte(inByte);
+	this->mMessage.AddData(theNetworkData);
+}
+
+void PlayerNetworkMeter::WriteChar(int inChar)
+{
+	ASSERT(this->mMessage.GetMessagePending());
+	
+	NetworkData theNetworkData;
+	theNetworkData.SetTypeChar(inChar);
+	this->mMessage.AddData(theNetworkData);
+}
+
+void PlayerNetworkMeter::WriteShort(int inShort)
+{
+	ASSERT(this->mMessage.GetMessagePending());
+	
+	NetworkData theNetworkData;
+	theNetworkData.SetTypeShort(inShort);
+	this->mMessage.AddData(theNetworkData);
+}
+
+void PlayerNetworkMeter::WriteLong(int inLong)
+{
+	ASSERT(this->mMessage.GetMessagePending());
+	
+	NetworkData theNetworkData;
+	theNetworkData.SetTypeLong(inLong);
+	this->mMessage.AddData(theNetworkData);
+}
+
+void PlayerNetworkMeter::WriteAngle(float inAngle)
+{
+	ASSERT(this->mMessage.GetMessagePending());
+	
+	NetworkData theNetworkData;
+	theNetworkData.SetTypeAngle(inAngle);
+	this->mMessage.AddData(theNetworkData);
+}
+
+void PlayerNetworkMeter::WriteCoord(float inCoord)
+{
+	ASSERT(this->mMessage.GetMessagePending());
+	
+	NetworkData theNetworkData;
+	theNetworkData.SetTypeCoord(inCoord);
+	this->mMessage.AddData(theNetworkData);
+}
+
+void PlayerNetworkMeter::WriteString(const char* inString)
+{
+	ASSERT(this->mMessage.GetMessagePending());
+	
+	NetworkData theNetworkData;
+	theNetworkData.SetTypeString(inString);
+	this->mMessage.AddData(theNetworkData);
+}
+
+void PlayerNetworkMeter::ProcessQueuedMessages()
+{
+	#ifdef USE_NETWORK_METERING
+	
+	//char theMessage[256];
+	//sprintf(theMessage, "PlayerNetworkMeter::ProcessQueuedMessages(): %d messages\n", this->mMessageList.size());
+	//ALERT(at_logged, "%s", theMessage);
+
+	// Run through our list of network messages
+	for(NetworkMessageList::iterator theIter = this->mMessageList.begin(); theIter != this->mMessageList.end(); )
+	{
+		// See how much data it requires
+		int theMessageSize = theIter->GetDataSize();
+
+		// For each, if message hasn't been sent
+		if(!theIter->GetMessageSent())
+		{
+			bool theForceSend = (this->mBytesPerSecond < 0);
+			int theBudget = this->mBytesPerSecond - this->mBytesSentInPastSecond;
+
+			// This can be less then 0 when the variable is changed mid-game
+			if((theBudget >= 0) || theForceSend)
+			{
+				// If we can afford to send this message
+				if((theMessageSize <= theBudget) || theForceSend)
+				{
+					// Execute the message
+					theIter->Execute(this->mMessageList.size());
+				
+					// Increment num bytes we've sent in past second
+					this->mBytesSentInPastSecond += theMessageSize;
+				
+					// Continue processing
+					theIter++;
+				}
+				else
+				{
+					// If not, stop looping
+					break;
+				}
+			}
+			else
+			{
+				// If not, stop looping
+				break;
+			}
+		}
+		else
+		{
+			// if time message sent was over a second ago
+			float theMessageSendTime = theIter->GetTimeMessageSent();
+			if(theMessageSendTime < (gpGlobals->time - 1.0f))
+			{
+				// get back the amount of bytes from it
+				this->mBytesSentInPastSecond -= theMessageSize;
+
+				// pop it off the list
+				theIter = this->mMessageList.erase(theIter);
+			}
+			else
+			{
+				// Continue processing
+				theIter++;
+			}
+		}
+	}
+	#endif
+}
+
+
+///////////////////
+// Network meter //
+///////////////////
+NetworkMeter* NetworkMeter::sSingletonNetworkMeter = NULL;
+
+// Singleton static accessor (see "Design Patterns")
+NetworkMeter* NetworkMeter::Instance()
+{
+	if(!sSingletonNetworkMeter)
+	{
+		sSingletonNetworkMeter = new NetworkMeter();
+	}
+
+	// Out of memory condition
+	ASSERT(sSingletonNetworkMeter);
+
+	return sSingletonNetworkMeter;
+}
+
+NetworkMeter::NetworkMeter()
+{
+	this->mCurrentEntity = NULL;
+	this->mBytesPerSecond = 0;
+}
+
+void NetworkMeter::SetBufferAmount(int inBytesPerSecond)
+{
+	this->mBytesPerSecond = inBytesPerSecond;
+}
+
+void NetworkMeter::AddMessage(const char* inMessageName, int inMessageID)
+{
+	this->mNetworkMessageTypes[inMessageID] = string(inMessageName);
+}
+
+string NetworkMeter::LookupMessageID(int inMessageID)
+{
+	string theMessageName = this->mNetworkMessageTypes[inMessageID];
+	if(theMessageName == "")
+	{
+		theMessageName = "Unknown";
+	}
+	return theMessageName;
+}
+
+
+void NetworkMeter::MessageBegin(int inMessageDest, int inMessageType, const float* inOrigin, edict_t* inEd)
+{
+	this->mCurrentEntity = inEd;
+	this->GetPlayerNetworkMeter(this->mCurrentEntity).MessageBegin(inMessageDest, inMessageType, inOrigin, inEd);
+}
+
+void NetworkMeter::MessageEnd()
+{
+	this->GetPlayerNetworkMeter(this->mCurrentEntity).MessageEnd();
+}
+
+void NetworkMeter::WriteByte(int inByte)
+{
+	this->GetPlayerNetworkMeter(this->mCurrentEntity).WriteByte(inByte);
+}
+
+void NetworkMeter::WriteChar(int inChar)
+{
+	this->GetPlayerNetworkMeter(this->mCurrentEntity).WriteChar(inChar);
+}
+
+void NetworkMeter::WriteShort(int inShort)
+{
+	this->GetPlayerNetworkMeter(this->mCurrentEntity).WriteShort(inShort);
+}
+
+void NetworkMeter::WriteLong(int inLong)
+{
+	this->GetPlayerNetworkMeter(this->mCurrentEntity).WriteLong(inLong);
+}
+
+void NetworkMeter::WriteAngle(float inAngle)
+{
+	this->GetPlayerNetworkMeter(this->mCurrentEntity).WriteAngle(inAngle);
+}
+
+void NetworkMeter::WriteCoord(float inCoord)
+{
+	this->GetPlayerNetworkMeter(this->mCurrentEntity).WriteCoord(inCoord);
+}
+
+void NetworkMeter::WriteString(const char* inString)
+{
+	this->GetPlayerNetworkMeter(this->mCurrentEntity).WriteString(inString);
+}
+
+void NetworkMeter::ProcessQueuedMessages()
+{
+	// Iterate through all player network meters
+	for(PlayerNetworkMeterMap::iterator theIter = this->mPlayerList.begin(); theIter != this->mPlayerList.end(); theIter++)
+	{
+		theIter->second.SetBufferAmount(this->mBytesPerSecond);
+		theIter->second.ProcessQueuedMessages();
+	}
+}
+
+PlayerNetworkMeter&	NetworkMeter::GetPlayerNetworkMeter(edict_t* inEd)
+{
+	// Look up edict in map.  If it doesn't exist, this will create a new entry
+	return this->mPlayerList[inEd];
+}
diff --git a/main/source/mod/NetworkMeter.h b/main/source/mod/NetworkMeter.h
new file mode 100644
index 00000000..8cb450fd
--- /dev/null
+++ b/main/source/mod/NetworkMeter.h
@@ -0,0 +1,193 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: NetworkMeter.h $
+// $Date: 2002/11/15 19:09:23 $
+//
+//-------------------------------------------------------------------------------
+// $Log: NetworkMeter.h,v $
+// Revision 1.5  2002/11/15 19:09:23  Flayra
+// - Reworked network metering to be easily toggleable
+//
+// Revision 1.4  2002/07/10 14:46:46  Flayra
+// - More debug info to the log to track down overflows
+//
+// Revision 1.3  2002/07/01 21:20:51  Flayra
+// - Added logging code to track down overflows
+//
+// Revision 1.2  2002/05/23 02:32:40  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+// Revision 1.2  2002/05/01 02:34:41  Charlie
+//===============================================================================
+#ifndef NETWORK_METER_H
+#define NETWORK_METER_H
+
+#include "dlls/extdll.h"
+#include "util.h"
+#include "types.h"
+#include "build.h"
+
+//	NetworkMeter: Main manager, creates and updates NetworkMeterPlayers
+//		list of NetworkMeterPlayers: manages network messages for a player
+//			list of NetworkMessages: contains message begin info, plus ordered list of network data
+//				list of NetworkData: network data type (created by WRITE_BYTE(), WRITE_STRING(), etc.)
+
+typedef enum
+{
+	NETWORK_DATA_TYPE_INVALID,
+	NETWORK_DATA_TYPE_BYTE,
+	NETWORK_DATA_TYPE_CHAR,
+	NETWORK_DATA_TYPE_SHORT,
+	NETWORK_DATA_TYPE_LONG,
+	NETWORK_DATA_TYPE_ANGLE,
+	NETWORK_DATA_TYPE_COORD,
+	NETWORK_DATA_TYPE_STRING
+} NetworkDataType;
+
+class NetworkData
+{
+public:
+					NetworkData();
+
+	// Size of data in bytes
+	int				GetDataSize();
+
+	void			Execute();
+
+	void			SetTypeByte(int inData);
+	void			SetTypeChar(int inData);
+	void			SetTypeShort(int inData);
+	void			SetTypeLong(int inData);
+	void			SetTypeAngle(float inData);
+	void			SetTypeCoord(float inData);
+	void			SetTypeString(const char* inData);
+
+private:
+	NetworkDataType	mDataType;
+	int				mIntData;
+	float			mFloatData;
+	string			mStringData;
+};
+
+
+
+class NetworkMessage
+{
+public:
+					NetworkMessage();
+
+	void			Clear();
+					
+	void			MessageBegin(int inMessageDest, int inMessageType, const float* inOrigin, edict_t* inEd);
+
+	void			AddData(const NetworkData& inData);
+
+	void			Execute(int theNumMessagesQueued);
+	
+	void			MessageEnd();
+
+	// Size of data in bytes
+	int				GetDataSize();
+
+	bool			GetMessagePending() const;
+
+	bool			GetMessageSent() const;
+	void			SetMessageSent();
+
+	float			GetTimeMessageSent() const;
+					
+private:			
+
+	int				mMessageDest;
+	int				mMessageType;
+	float			mOrigin[3];
+	edict_t*		mEdict;
+
+	typedef vector<NetworkData>	NetworkMessageDataList;
+	NetworkMessageDataList		mMessageData;
+
+	bool						mMessagePending;
+	bool						mMessageSent;
+	float						mTimeMessageSent;
+	
+};
+
+class PlayerNetworkMeter
+{
+public:
+			PlayerNetworkMeter();
+
+	void	SetBufferAmount(int inBytesPerSecond);
+			
+	void	MessageBegin(int inMessageDest, int inMessageType, const float* inOrigin, edict_t* inEd);
+	void	MessageEnd();
+			
+	void	WriteByte(int inByte);
+	void	WriteChar(int inChar);
+	void	WriteShort(int inShort);
+	void	WriteLong(int inShort);
+	void	WriteAngle(float inCoord);
+	void	WriteCoord(float inCoord);
+	void	WriteString(const char* inString);
+	
+	void	ProcessQueuedMessages();
+	
+private:
+	typedef vector<NetworkMessage>	NetworkMessageList;
+	NetworkMessageList				mMessageList;
+	
+	NetworkMessage					mMessage;
+	int								mBytesSentInPastSecond;
+	int								mBytesPerSecond;
+	
+};
+
+class NetworkMeter
+{
+public:
+	static	NetworkMeter*	Instance();
+	
+	void	SetBufferAmount(int inBytesPerSecond);
+
+	void	AddMessage(const char* inMessageName, int inMessageID);
+	string	LookupMessageID(int inMessageID);
+
+	void	MessageBegin(int inMessageDest, int inMessageType, const float* inOrigin, edict_t* inEd);
+	void	MessageEnd();
+	
+	void	WriteByte(int inByte);
+	void	WriteChar(int inChar);
+	void	WriteShort(int inShort);
+	void	WriteLong(int inLong);
+	void	WriteAngle(float inAngle);
+	void	WriteCoord(float inCoord);
+	void	WriteString(const char* inString);
+	
+	void	ProcessQueuedMessages();
+	
+private:
+	static	NetworkMeter*	sSingletonNetworkMeter;
+	NetworkMeter();
+	
+	PlayerNetworkMeter&	GetPlayerNetworkMeter(edict_t* inEd);
+	
+	// Keep list of queued network messages per edict_t
+	int			mBytesPerSecond;
+	
+	edict_t*	mCurrentEntity;
+	
+	typedef map<edict_t*, PlayerNetworkMeter>	PlayerNetworkMeterMap;
+	PlayerNetworkMeterMap						mPlayerList;
+	
+	typedef map<int, string>	NetworkMessageListType;
+	NetworkMessageListType		mNetworkMessageTypes;
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/mod/UPPUtil.cpp b/main/source/mod/UPPUtil.cpp
new file mode 100644
index 00000000..1fcca557
--- /dev/null
+++ b/main/source/mod/UPPUtil.cpp
@@ -0,0 +1,752 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: UPPUtil.h $
+// $Date: 2002/11/12 22:39:25 $
+//
+//-------------------------------------------------------------------------------
+// $Log: UPPUtil.h,v $
+//===============================================================================
+
+#ifdef USE_UPP
+
+#include "build.h"
+#include "dlls/extdll.h"
+#include "util/STLUtil.h"
+#include "mod/AvHServerUtil.h"
+#include "mod/AvHSharedUtil.h"
+#include "mod/AvHGamerules.h"
+#include "mod/UPPUtil.h"
+#include "AvHConstants.h"
+
+// TODO: 
+//   Move AuthGroup functionality into own logical section?
+//   Move NetworkIDManager class and functionality into another file?
+//   Add logic to clear temporary id cache intelligently to prevent dynamic ips from
+//     causing collisions across multiple players; this should be a very rare occurance
+//     even with the current code.
+//   Fix UPPUtil_GetDefaultAuthorization to match Auth system's default behavior.
+//   Add cheating death status to Auth mask?
+//   Resolve HL version
+//   Resolve Plugins
+//   Resolve Gamestate - gamestate key-value pairs hold the name of a variable and
+//     a concatentated listing of all of the values the variable has held at some point
+//     during the round, e.g. ("sv_cheats","0:1") if sv_cheats had been turned on partway 
+//     through, then back off... a tracking method needs to be implemented for the 
+//     variables, a list of variables to track needs to be finalized, and the code to
+//     transform a set of values into the final format needs to be written.
+//   Implement unauthorized team join handler
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+typedef map<string,int> AuthGroupMap; //CONSIDER: STLPort's hash map implementation instead
+
+bool UPPUtil_GetDefaultAuthorization(void)
+{
+	bool theDefaultAuthorization = true;
+
+	#ifdef AVH_PLAYTEST_BUILD
+	theDefaultAuthorization = false;
+	#endif
+
+	return theDefaultAuthorization;
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+int UPPUtil_GetDefaultAuthMask(void)
+{
+	return PLAYERAUTH_NONE;
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+string UPPUtil_GetDefaultScoreboardIcon(void)
+{
+	return "";
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+map<string,int> UPPUtil_CreateAuthGroupMap(void)
+{
+	AuthGroupMap theMap;
+	
+	theMap.insert(AuthGroupMap::value_type("betaop",PLAYERAUTH_BETASERVEROP));
+	theMap.insert(AuthGroupMap::value_type("const",PLAYERAUTH_CONTRIBUTOR));
+	theMap.insert(AuthGroupMap::value_type("dev",PLAYERAUTH_DEVELOPER));
+	theMap.insert(AuthGroupMap::value_type("guide",PLAYERAUTH_GUIDE));
+	theMap.insert(AuthGroupMap::value_type("op",PLAYERAUTH_SERVEROP));
+	theMap.insert(AuthGroupMap::value_type("pt",PLAYERAUTH_PLAYTESTER));
+	theMap.insert(AuthGroupMap::value_type("vet",PLAYERAUTH_VETERAN));
+
+	return theMap;
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+int UPPUtil_GetAuthMask(const StringSet inAuthGroups)
+{
+	int theAuthMask = PLAYERAUTH_NONE;
+
+	//step 1 - convert auth groups into mask
+	if(!inAuthGroups.empty())
+	{
+		static AuthGroupMap theMap = UPPUtil_CreateAuthGroupMap();
+		AuthGroupMap::iterator theMapEntry;
+
+		StringSet::const_iterator end = inAuthGroups.end();
+		for(StringSet::const_iterator i = inAuthGroups.begin(); i != end; ++i)
+		{
+			theMapEntry = theMap.find(*i);
+			if(theMapEntry != theMap.end())
+			{
+				theAuthMask |= theMapEntry->second;
+			}
+		}
+	}
+	return theAuthMask;
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+void UPPUtil_ProcessProfileInfo(auto_ptr<UPP::ProfileInfo> inProfileInfo)
+{
+	UPP::ProfileInfo* theProfileInfo = inProfileInfo.release();
+
+	UPPUtil_StoreProfileInfo(theProfileInfo);
+	if(UPP::getGeneratePerformanceData()) //report if we're profiling
+	{
+		AvHSUPrintDevMessage(string("UPP ProfileInfo Received for ") + theProfileInfo->getNetworkID() + "\n",true);
+	}
+
+
+	AvHPlayer* thePlayer = NULL;
+	FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+		if(!theEntity->GetNetworkID().compare(theProfileInfo->getNetworkID()))
+		{
+			thePlayer = theEntity;
+			break;
+		}
+	END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+	if(thePlayer)
+	{
+		UPPUtil_InitializePlayer(thePlayer);
+	}
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+void UPPUtil_ProcessPerformanceData(auto_ptr<UPP::PerformanceData> data)
+{
+	string theMessage("UPP Signal Returned: ");
+	theMessage += data->getSignalType() + " ";
+	theMessage += MakeStringFromInt(data->getTimeInQueue()) + "/";
+	theMessage += MakeStringFromInt(data->getTimeInProcessing()-data->getTimeInProcessingOnServer()) + "/";
+	theMessage += MakeStringFromInt(data->getTimeInProcessingOnServer()) + " ms; ";
+	theMessage += MakeStringFromInt(data->getRequestSize()) + "/";
+	theMessage += MakeStringFromInt(data->getResponseSize()) + " bytes; ";
+	theMessage += MakeStringFromInt(data->getErrorCode()) + " ";
+	theMessage += data->getErrorDescription() + " \n";
+	AvHSUPrintDevMessage(theMessage,true);
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+TeamSet UPPUtil_BuildTeamInfoList(void)
+{
+    TeamSet theTeamInfoList;
+
+	UPP::TeamInfo readyroom(TEAM_IND,"readyroom");
+	UPP::TeamInfo marines(TEAM_ONE,"marines");
+	UPP::TeamInfo aliens(TEAM_TWO,"aliens");
+	UPP::TeamInfo spectators(TEAM_SPECT,"spectators");
+
+	UPP::PlayerInfo player;
+
+	FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+		player = UPPUtil_GetPlayerInfo(theEntity);
+		switch(player.getTeamIndex())
+		{
+		case TEAM_ONE:
+			marines.addPlayer(player);
+			break;
+		case TEAM_TWO:
+			aliens.addPlayer(player);
+			break;
+		case TEAM_IND:
+			readyroom.addPlayer(player);
+			break;
+		case TEAM_SPECT:
+			spectators.addPlayer(player);
+			break;
+		}
+	END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+
+	theTeamInfoList.insert(readyroom);
+	theTeamInfoList.insert(marines);
+	theTeamInfoList.insert(aliens);
+	theTeamInfoList.insert(spectators);
+
+    // Return them
+    return theTeamInfoList;
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+StringMap UPPUtil_BuildServerVariableList(bool GameEndVariables)
+{
+	StringMap theVariableList;
+
+	auto_ptr<const StringSet> varsToUse = GameEndVariables ? UPP::listGameEndVariables() : UPP::listGameStartVariables();
+
+	string theKey;
+	string theValue;
+
+	const char* theRawValue;
+
+	StringSet::const_iterator end = varsToUse->end();
+	for(StringSet::const_iterator i = varsToUse->begin(); i != end; ++i)
+	{
+		theKey.assign(*i);
+		theRawValue = CVAR_GET_STRING(theKey.c_str());
+		if(theRawValue)
+		{
+			theValue = theRawValue;
+		}
+		else
+		{
+			theValue.clear();
+		}
+		theVariableList.insert(StringMap::value_type(theKey,theValue));
+	}
+
+    return theVariableList;
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+UPP::GameInfo UPPUtil_GetGameInfo(void)
+{
+    string theGameType;
+    switch(GetGameRules()->GetMapMode())
+    {
+    case MAP_MODE_CO:
+        theGameType.assign("CO");
+        break;
+    case MAP_MODE_NS:
+        theGameType.assign("NS");
+        break;
+    }
+
+	UPP::GameInfo game(theGameType);
+
+    // Map name
+    string theMapName = STRING(gpGlobals->mapname);
+    game.setMapName(theMapName);
+
+    // Add team infos
+    TeamSet theTeamInfoList = UPPUtil_BuildTeamInfoList();
+	TeamSet::iterator end = theTeamInfoList.end();
+    for(TeamSet::iterator theTeamIter = theTeamInfoList.begin(); theTeamIter != end; ++theTeamIter)
+    {
+        game.addTeam(*theTeamIter);
+    }
+
+    StringMap theVariableValueList = UPPUtil_BuildServerVariableList(false);
+	StringMap::iterator SMend = theVariableValueList.end();
+    for(StringMap::iterator theIter = theVariableValueList.begin(); theIter != SMend; ++theIter)
+    {
+       game.addVariable(theIter->first, theIter->second);
+    }
+
+	return game;
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+UPP::GameResultInfo UPPUtil_GetGameResultInfo(const int WinningTeam)
+{
+	UPP::GameResultInfo result;
+
+	result.setWinningTeam(WinningTeam);
+
+    // Add team infos
+    TeamSet theTeamInfoList = UPPUtil_BuildTeamInfoList();
+	TeamSet::iterator end = theTeamInfoList.end();
+    for(TeamSet::iterator theTeamIter = theTeamInfoList.begin(); theTeamIter != end; ++theTeamIter)
+    {
+        result.addTeam(*theTeamIter);
+    }
+
+	StringMap theVariableValueList = UPPUtil_BuildServerVariableList(true);
+	StringMap::iterator SMend = theVariableValueList.end();
+    for(StringMap::iterator theIter = theVariableValueList.begin(); theIter != SMend; ++theIter)
+    {
+       result.addVariable(theIter->first, theIter->second);
+    }
+
+	return result;
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+UPP::PlayerInfo UPPUtil_GetConnectingPlayerInfo(edict_t* edict, const char* name, const char* address)
+{
+	UPP::PlayerInfo player;
+
+    player.setNetworkID(UPPUtil_GenerateNetworkID(edict,address));
+    player.setName(string(name));
+    player.setScore(0);
+    player.setKills(0);
+    player.setExperience(0.0f);
+    player.setDeaths(0);
+	player.setClass("none");
+	player.setTeamIndex(TEAM_IND);
+
+	return player;
+}
+
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+UPP::PlayerInfo UPPUtil_GetPlayerInfo(const AvHPlayer* inPlayer)
+{
+	UPP::PlayerInfo player;
+
+    string theName = STRING(inPlayer->pev->netname);
+    player.setName(theName);
+    player.setNetworkID(inPlayer->GetNetworkID());
+
+    player.setScore(inPlayer->GetScore());
+    player.setKills(inPlayer->pev->frags);
+    player.setExperience(inPlayer->GetExperience());
+    player.setDeaths(inPlayer->m_iDeaths);
+
+	switch(inPlayer->GetPlayMode())
+	{
+	case PLAYMODE_READYROOM:
+		player.setClass("none");
+		player.setTeamIndex(TEAM_IND);
+		break;
+	case PLAYMODE_OBSERVER:
+		player.setClass("spectator");
+		player.setTeamIndex(TEAM_SPECT);
+		break;
+	default:
+	    const char* theUser3Name = AvHSHUGetClassNameFromUser3(inPlayer->GetUser3());
+	    player.setClass(string(theUser3Name));
+		player.setTeamIndex(inPlayer->GetTeam());
+		break;
+	}
+
+	return player;
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+UPP::ClientInfo UPPUtil_GetClientInfo(void)
+{
+	UPP::ClientInfo client;
+
+	//Name
+	const char* theCStrServerName = CVAR_GET_STRING("hostname");
+	client.setName(theCStrServerName ? string(theCStrServerName) : "Unspecified Server Name");
+
+	//IP Address & Port
+	string theAddress("?.?.?.?");
+	int thePort = 0;
+
+	const char* theCStrServerAddress = CVAR_GET_STRING("net_address");
+	if(theCStrServerAddress)
+	{
+		theAddress.assign(theCStrServerAddress);
+		int theColonIndex = theAddress.find(':');
+		if(theColonIndex != string::npos)
+		{
+			thePort = MakeIntFromString(theAddress.substr(theColonIndex+1));
+			theAddress.resize(theColonIndex);
+		}
+		else
+		{
+			const char* theCStrPort = CVAR_GET_STRING("port");
+			if(theCStrPort)
+			{
+				thePort = MakeIntFromString(string(theCStrPort));
+			}
+		}
+	}
+
+	client.setAddress(theAddress);
+	client.setPort(thePort);
+
+    // TODO: Plug-ins
+
+    // Region
+    const char* theCStrRegion = CVAR_GET_STRING("sv_region");
+	client.setRegion(theCStrRegion ? MakeIntFromString(string(theCStrRegion)) : 255);
+
+    // TODO: Engine version
+    string theEngineVersion = "1.1.1.0"; // WON: 1.1.1.0, STEAM: 1.1.2.0
+    client.setEngineVersion(theEngineVersion);
+
+    // Game version
+    string theGameVersion = AvHSUGetGameVersionString();
+    client.setGameVersion(theGameVersion);
+
+    // Contact
+    const char* theCStrContact = CVAR_GET_STRING("sv_contact");
+    client.setContact(theCStrContact ? string(theCStrContact) : "");
+
+	return client;
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+void UPPUtil_ConnectPlayer(edict_t* inEntity, const char* inName, const char* inAddress)
+{
+	UPP::PlayerInfo thePlayerInfo = UPPUtil_GetConnectingPlayerInfo(inEntity,inName,inAddress);
+	bool theResolved = UPPUtil_GetPlayerIsResolved(inEntity);
+	UPP::reportPlayerEntered(thePlayerInfo,theResolved);
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+void UPPUtil_ResetPlayer(AvHPlayer* inPlayer)
+{
+	inPlayer->SetAuthenticationMask(UPPUtil_GetDefaultAuthMask());
+	inPlayer->SetAuthorized(UPPUtil_GetDefaultAuthorization());
+	inPlayer->SetScoreboardIconName(UPPUtil_GetDefaultScoreboardIcon());
+	inPlayer->EffectivePlayerClassChanged();
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+void UPPUtil_HandleUnauthorizedJoinTeamAttempt(AvHPlayer* inPlayer, AvHTeam inTeamNumber)
+{
+
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+void UPPUtil_InitializePlayer(CBasePlayer* inPlayer)
+{
+	AvHPlayer* thePlayer = dynamic_cast<AvHPlayer*>(inPlayer);
+	if(thePlayer)
+	{
+		thePlayer->SetNetworkAddress(UPPUtil_GetNetworkAddress(inPlayer->edict()));
+		thePlayer->SetNetworkID(UPPUtil_GetNetworkID(inPlayer->edict()));
+		UPPUtil_ResetPlayer(thePlayer);
+		if(UPP::isConnected())
+		{
+			UPP::ProfileInfo* theProfileInfo = UPPUtil_GetProfileInfo(thePlayer->GetNetworkID());
+			if(theProfileInfo)
+			{
+				thePlayer->SetAuthorized(theProfileInfo->getAuthorized());
+				thePlayer->SetAuthenticationMask(UPPUtil_GetAuthMask(theProfileInfo->getAuthGroups()));
+				thePlayer->SetScoreboardIconName(theProfileInfo->getIconName());
+				thePlayer->EffectivePlayerClassChanged();
+			}
+		}
+	}
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+void UPPUtil_ProcessResponses(void)
+{
+	//process ProfileInfos
+	while(UPP::hasProfileInfo())
+	{
+		UPPUtil_ProcessProfileInfo(UPP::getProfileInfo());
+	}
+
+	//process PerformanceData
+	while(UPP::hasPerformanceData())
+	{
+		UPPUtil_ProcessPerformanceData(UPP::getPerformanceData());
+	}
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+void UPPUtil_Disconnect(void) //actual function registered with atexit
+{
+	UPP::disconnect();
+	FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+		UPPUtil_ResetPlayer(theEntity);
+	END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+void UPPUtil_RegisterShutdown(void)
+{
+	static bool registered = false;
+	if(!registered)
+	{
+		atexit(UPPUtil_Disconnect);
+		registered = true;
+	}
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+void UPPUtil_Connect(void)
+{
+	UPP::setServerConnection("https://24.5.210.1/upp_server-dev/index.php","soap");
+	UPP::connect(UPPUtil_GetClientInfo());
+	UPP::requestAuthGroups();
+	UPP::requestVariables();
+	FOR_ALL_ENTITIES(kAvHPlayerClassName, AvHPlayer*)
+		UPP::reportPlayerEntered(UPPUtil_GetPlayerInfo(theEntity),UPPUtil_GetPlayerIsResolved(theEntity->edict()));
+	END_FOR_ALL_ENTITIES(kAvHPlayerClassName)
+	UPPUtil_RegisterShutdown();
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Network ID management functions for use with UPP
+// CONSIDER: this class isn't multithreading safe - do we need it to be?
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//CONSIDER: using hash_map instead
+typedef map<const edict_t*,string> NetworkIDMap; 
+typedef map<const edict_t*,string> AddressMap;   //key = edict, value = address
+typedef map<string,UPP::ProfileInfo*> ProfileInfoMap;
+typedef map<string,string> TemporaryIDMap; //key = address, value = id
+
+class NetworkIDManager
+{
+public:
+	const static string STEAM_ID_PENDING;
+	const static string STEAM_ID_LAN;
+	const static string WON_ID_LAN;
+	const static string UNRESOLVED_PREFIX;
+
+	static NetworkIDManager* GetInstance(void);
+	~NetworkIDManager(void);
+	const string GenerateID(edict_t* inEntity, const char* inAddress);
+	const string RetrieveID(const edict_t* inEntity) const;
+	const string RetrieveAddress(const edict_t* inEntity) const;
+	UPP::ProfileInfo* GetProfileInfo(const string& inNetworkID) const;
+	void SetProfileInfo(const string& inNetworkID, UPP::ProfileInfo* info);
+	bool GetIsResolved(const edict_t* inEntity);
+	bool UpdateID(edict_t* inEntity);
+	bool ClearForLevelReset(void);
+
+private:
+	auto_ptr<string> GenerateResolvedID(edict_t* inEntity);
+	NetworkIDManager(void);
+	NetworkIDMap mNetworkIDs;
+	AddressMap mAddresses;
+	ProfileInfoMap mProfiles;
+	TemporaryIDMap mUnresolvedIDs;
+	int mNextTempIDNumber;
+};
+
+const string NetworkIDManager::STEAM_ID_PENDING("STEAM_ID_PENDING");
+const string NetworkIDManager::STEAM_ID_LAN("STEAM_ID_LAN");
+const string NetworkIDManager::WON_ID_LAN("-1");
+const string NetworkIDManager::UNRESOLVED_PREFIX("UNKNOWN_");
+
+NetworkIDManager::NetworkIDManager(void) : mNextTempIDNumber(1000) {}
+NetworkIDManager::~NetworkIDManager(void) {}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+NetworkIDManager* NetworkIDManager::GetInstance(void)
+{
+	static auto_ptr<NetworkIDManager> ptr(new NetworkIDManager());
+	return ptr.get();
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+bool NetworkIDManager::ClearForLevelReset(void)
+{
+	this->mNetworkIDs.clear();
+	this->mAddresses.clear();
+	this->mProfiles.clear();
+	return true;
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+auto_ptr<string> NetworkIDManager::GenerateResolvedID(edict_t* inEntity)
+{
+	//(1) attempt to resolve it using STEAM
+	auto_ptr<string> theNetworkID(new string(g_engfuncs.pfnGetPlayerAuthId(inEntity)));	
+	if(!theNetworkID->compare(STEAM_ID_PENDING) || !theNetworkID->compare(STEAM_ID_LAN))
+	{
+		//(2) attempt to resolve it using WON
+		theNetworkID->assign(MakeStringFromInt(g_engfuncs.pfnGetPlayerWONId(inEntity)));
+		if(!theNetworkID->compare(WON_ID_LAN))
+		{
+			//(3) couldn't resolve it, return NULL
+			theNetworkID.reset();
+		}
+	}
+	return theNetworkID;
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+const string NetworkIDManager::GenerateID(edict_t* inEntity, const char* inAddress)
+{
+	string theAddress(inAddress);
+
+	//(1) attempt to resolve it
+	auto_ptr<string> theNetworkID = this->GenerateResolvedID(inEntity);
+	if(theNetworkID.get() == NULL)
+	{
+		//(2) attempt to retrieve temporary id matching the address - it's probably
+		//    a reconnection from the last map change and the same person...
+		TemporaryIDMap::iterator theEntry = this->mUnresolvedIDs.find(inAddress);
+		if(theEntry != this->mUnresolvedIDs.end())
+		{
+			theNetworkID.reset(new string(theEntry->second));
+		}
+		else
+		{
+			//(3) generate new temporary id and store in temporary id storage
+			string theTempID(UNRESOLVED_PREFIX + MakeStringFromInt(this->mNextTempIDNumber));
+			++this->mNextTempIDNumber;
+			this->mUnresolvedIDs.insert(TemporaryIDMap::value_type(inAddress,theTempID));
+			theNetworkID.reset(new string(theTempID));
+		}
+	}
+	this->mNetworkIDs.insert(NetworkIDMap::value_type(inEntity,*theNetworkID.get()));
+	this->mAddresses.insert(AddressMap::value_type(inEntity,theAddress));
+	return string(*theNetworkID.get());
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+const string NetworkIDManager::RetrieveID(const edict_t* inEntity) const
+{
+	NetworkIDMap::const_iterator theEntry = this->mNetworkIDs.find(inEntity);
+	return theEntry->second;
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+const string NetworkIDManager::RetrieveAddress(const edict_t* inEntity) const
+{
+	AddressMap::const_iterator theEntry = this->mAddresses.find(inEntity);
+	return theEntry->second;
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+bool NetworkIDManager::GetIsResolved(const edict_t* inEntity)
+{
+	return this->RetrieveID(inEntity).compare(0,UNRESOLVED_PREFIX.size(),UNRESOLVED_PREFIX);
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+bool NetworkIDManager::UpdateID(edict_t* inEntity)
+{
+	auto_ptr<string> theNewID(NULL);
+	if(!this->GetIsResolved(inEntity))
+	{
+		theNewID = this->GenerateResolvedID(inEntity);
+		if(theNewID.get())
+		{
+			//remove this edict from the temporary list
+			AddressMap::iterator theEntry = this->mAddresses.find(inEntity);
+			this->mUnresolvedIDs.erase(theEntry->second);
+		}
+	}
+	return theNewID.get();
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+UPP::ProfileInfo* NetworkIDManager::GetProfileInfo(const string& inNetworkID) const
+{
+	UPP::ProfileInfo* theProfile = NULL;
+	ProfileInfoMap::const_iterator i = this->mProfiles.find(inNetworkID);
+	if(i != this->mProfiles.end())
+	{ 
+		theProfile = i->second; 
+	}
+	return theProfile;
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+void NetworkIDManager::SetProfileInfo(const string& inNetworkID, UPP::ProfileInfo* info)
+{
+	this->mProfiles.insert(ProfileInfoMap::value_type(inNetworkID,info));
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+string UPPUtil_GenerateNetworkID(edict_t* inEntity, const char* inAddress)
+{ 
+	return NetworkIDManager::GetInstance()->GenerateID(inEntity,inAddress); 
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+string UPPUtil_GetNetworkID(const edict_t* inEntity)
+{
+	return NetworkIDManager::GetInstance()->RetrieveID(inEntity);
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+string UPPUtil_GetNetworkAddress(const edict_t* inEntity)
+{
+	return NetworkIDManager::GetInstance()->RetrieveAddress(inEntity);
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+bool UPPUtil_GetPlayerIsResolved(edict_t* inEntity)
+{ 
+	return NetworkIDManager::GetInstance()->GetIsResolved(inEntity);
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+bool UPPUtil_GetPlayerIsResolved(const AvHPlayer* inPlayer)
+{ 
+	return NetworkIDManager::GetInstance()->GetIsResolved(const_cast<AvHPlayer*>(inPlayer)->edict());
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+UPP::ProfileInfo* UPPUtil_GetProfileInfo(const string& inNetworkID)
+{
+	return NetworkIDManager::GetInstance()->GetProfileInfo(inNetworkID);
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+bool UPPUtil_ResolvePlayer(AvHPlayer* inPlayer)
+{
+	bool theUpdated = NetworkIDManager::GetInstance()->UpdateID(inPlayer->edict());
+	if(theUpdated)
+	{
+		string theNewID = NetworkIDManager::GetInstance()->RetrieveID(inPlayer->edict());
+		UPP::reportPlayerChangingIDs(UPPUtil_GetPlayerInfo(inPlayer),theNewID,true);
+		inPlayer->SetNetworkID(theNewID);
+	}
+	return theUpdated;
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+void UPPUtil_StoreProfileInfo(UPP::ProfileInfo* info)
+{
+	NetworkIDManager::GetInstance()->SetProfileInfo(info->getNetworkID(),info);
+}
+
+#endif
diff --git a/main/source/mod/UPPUtil.h b/main/source/mod/UPPUtil.h
new file mode 100644
index 00000000..80646e94
--- /dev/null
+++ b/main/source/mod/UPPUtil.h
@@ -0,0 +1,53 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: Centralized functions that build and return UPP data objects
+//
+// $Workfile: UPPUtil.h $
+// $Date: 2002/11/12 22:39:25 $
+//
+//-------------------------------------------------------------------------------
+// $Log: UPPUtil.h,v $
+//===============================================================================
+
+#ifdef USE_UPP
+#ifndef UPP_UTIL
+#define UPP_UTIL
+
+#include "mod/AvHEntities.h"
+#include "upp/common/UPPClientInterface.h"
+
+//UPP Object construction routines
+UPP::GameInfo UPPUtil_GetGameInfo(void);
+UPP::GameResultInfo UPPUtil_GetGameResultInfo(const int WinningTeam);
+UPP::PlayerInfo UPPUtil_GetPlayerInfo(const AvHPlayer* inPlayer);
+UPP::ClientInfo UPPUtil_GetClientInfo(void);
+
+//AvHGamerules functionality 
+void UPPUtil_ProcessResponses(void);
+void UPPUtil_ConnectPlayer(edict_t* inEntity, const char* inName, const char* inAddress);
+void UPPUtil_InitializePlayer(CBasePlayer* inPlayer);
+void UPPUtil_HandleUnauthorizedJoinTeamAttempt(AvHPlayer* inPlayer, AvHTeam inTeamNumber);
+void UPPUtil_Connect(void);
+void UPPUtil_Disconnect(void);
+
+//AvHPlayer defaults for initialization
+bool UPPUtil_GetDefaultAuthorization(void);
+int UPPUtil_GetDefaultAuthMask(void);
+string UPPUtil_GetDefaultScoreboardIcon(void);
+
+//NetworkID functionality
+string UPPUtil_GenerateNetworkID(edict_t* inEntity, const char* inAddress);
+string UPPUtil_GetNetworkID(const edict_t* inEntity);
+string UPPUtil_GetNetworkAddress(const edict_t* inEntity);
+bool UPPUtil_GetPlayerIsResolved(edict_t* inEntity);
+bool UPPUtil_ResolvePlayer(AvHPlayer* inPlayer);
+void UPPUtil_StoreProfileInfo(UPP::ProfileInfo* info);
+UPP::ProfileInfo* UPPUtil_GetProfileInfo(const string& inNetworkID);
+
+#endif
+#endif
\ No newline at end of file
diff --git a/main/source/particles/HLRender.cpp b/main/source/particles/HLRender.cpp
new file mode 100644
index 00000000..e71b27da
--- /dev/null
+++ b/main/source/particles/HLRender.cpp
@@ -0,0 +1,269 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: HLRender.cpp $
+// $Date: 2002/08/31 18:04:08 $
+//
+//-------------------------------------------------------------------------------
+// $Log: HLRender.cpp,v $
+// Revision 1.4  2002/08/31 18:04:08  Flayra
+// - Work at VALVe
+//
+// Revision 1.3  2002/08/16 02:26:55  Flayra
+// - Added document header
+//
+//===============================================================================
+// This file implements the API calls that draw particle groups in Half-life
+
+#include "general.h"
+
+#ifdef WIN32
+// This is for something in gl.h.
+#include <windows.h>
+#endif
+
+//#include <GL/gl.h>
+#include "common/triangleapi.h"
+#include "cl_dll/wrect.h"
+#include "cl_dll/cl_dll.h"
+//#include "common/renderingconst.h"
+#include "particles/papi.h"
+
+// XXX #include <iostream.h>
+
+// Draw as a splat texture on a quad.
+void DrawGroupTriSplat(const pVector &view, const pVector &up,
+					float size_scale, bool draw_tex,
+					bool const_size, bool const_color)
+{
+	int cnt = pGetGroupCount();
+	
+	if(cnt < 1)
+		return;
+	
+	pVector *ppos = new pVector[cnt];
+	float *color = const_color ? NULL : new float[cnt * 4];
+	pVector *size = const_size ? NULL : new pVector[cnt];
+	
+	pGetParticles(0, cnt, (float *)ppos, color, NULL, (float *)size);
+	
+	// Compute the vectors from the particle to the corners of its tri.
+	// 2
+	// |\      The particle is at the center of the x.
+	// |-\     V0, V1, and V2 go from there to the vertices.
+	// |x|\    The texcoords are (0,0), (2,0), and (0,2) respectively.
+	// 0-+-1   We clamp the texture so the rest is transparent.
+	
+	pVector right = view ^ up;
+	right.normalize();
+	pVector nup = right ^ view;
+	right *= size_scale;
+	nup *= size_scale;
+
+	pVector V0 = -(right + nup);
+	pVector V1 = V0 + right * 4;
+	pVector V2 = V0 + nup*4 + right*2;
+
+	//cerr << "x " << view.x << " " << view.y << " " << view.z << endl;
+	//cerr << "x " << nup.x << " " << nup.y << " " << nup.z << endl;
+	//cerr << "x " << right.x << " " << right.y << " " << right.z << endl;
+	//cerr << "x " << V0.x << " " << V0.y << " " << V0.z << endl;
+
+	//glBegin(GL_TRIANGLES);
+	gEngfuncs.pTriAPI->Begin( TRI_TRIANGLES );
+	//gEngfuncs.pTriAPI->RenderMode( kRenderTransAlpha );
+	
+	for(int i = 0; i < cnt; i++)
+	{
+		pVector &p = ppos[i];
+
+		float* theCurrentColor = &color[i*4];
+		if(!const_color)
+		{
+			//glColor4fv((GLfloat *)&color[i*4]);
+			gEngfuncs.pTriAPI->Color4f(theCurrentColor[0], theCurrentColor[1], theCurrentColor[2], theCurrentColor[3]);
+		}
+		//else
+		//{
+		//	gEngfuncs.pTriAPI->Color4f(1.0f, 1.0f, 1.0f, .5f);
+		//}
+
+		pVector sV0 = V0;
+		pVector sV1 = V1;
+		pVector sV2 = V2;
+
+		if(!const_size)
+		  {
+		    sV0 *= size[i].x;
+		    sV1 *= size[i].x;
+		    sV2 *= size[i].x;
+		  }
+
+		//if(draw_tex) glTexCoord2f(0,0);
+		if(draw_tex) gEngfuncs.pTriAPI->TexCoord2f(0,0);
+		pVector ver = p + sV0;
+		//glVertex3fv((GLfloat *)&ver);
+		gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+
+		//if(draw_tex) glTexCoord2f(2,0);
+		if(draw_tex) gEngfuncs.pTriAPI->TexCoord2f(1,0);
+		ver = p + sV1;
+		//glVertex3fv((GLfloat *)&ver);
+		gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+
+		//if(draw_tex) glTexCoord2f(0,2);
+		if(draw_tex) gEngfuncs.pTriAPI->TexCoord2f(.5,1);
+		ver = p + sV2;
+		//glVertex3fv((GLfloat *)&ver);
+		gEngfuncs.pTriAPI->Vertex3fv((float*)&ver);
+	}
+	
+	//glEnd();
+	gEngfuncs.pTriAPI->End();
+
+	delete [] ppos;
+	if(color) delete [] color;
+	if(size) delete [] size;
+}
+
+
+
+// Emit OpenGL calls to draw the particles. These are drawn with
+// whatever primitive type the user specified(GL_POINTS, for
+// example). The color and radius are set per primitive, by default.
+// For GL_LINES, the other vertex of the line is the velocity vector.
+// XXX const_size is ignored.
+//PARTICLEDLL_API void pDrawGroupp(int primitive, bool const_size, bool const_color)
+//{
+//	_ParticleState &_ps = _GetPState();
+//
+//	// Get a pointer to the particles in gp memory
+//	ParticleGroup *pg = _ps.pgrp;
+//
+//	if(pg == NULL)
+//		return; // ERROR
+//	
+//	if(pg->p_count < 1)
+//		return;
+//	
+//	if(primitive == GL_POINTS)
+//	{
+//		glPushClientAttrib(GL_CLIENT_VERTEX_ARRAY_BIT);
+//		glEnableClientState(GL_VERTEX_ARRAY);
+//		if(!const_color)
+//		{
+//			glEnableClientState(GL_COLOR_ARRAY);
+//			glColorPointer(4, GL_FLOAT, sizeof(Particle), &pg->list[0].color);
+//		}
+//		
+//		glVertexPointer(3, GL_FLOAT, sizeof(Particle), &pg->list[0].pos);
+//		glDrawArrays((GLenum)primitive, 0, pg->p_count);
+//		glPopClientAttrib();
+//		// XXX For E&S
+//		glDisableClientState(GL_COLOR_ARRAY);
+//	}
+//	else
+//	{
+//		// Assume GL_LINES
+//		glBegin((GLenum)primitive);
+//		
+//		if(!const_color)
+//		{
+//			for(int i = 0; i < pg->p_count; i++)
+//			{
+//				Particle &m = pg->list[i];
+//				
+//				// Warning: this depends on alpha following color in the Particle struct.
+//				glColor4fv((GLfloat *)&m.color);
+//				glVertex3fv((GLfloat *)&m.pos);
+//				
+//				// For lines, make a tail with the velocity vector's direction and
+//				// a length of radius.
+//				pVector tail = m.pos - m.vel;			
+//				glVertex3fv((GLfloat *)&tail);
+//			}
+//		}
+//		else
+//		{
+//			for(int i = 0; i < pg->p_count; i++)
+//			{
+//				Particle &m = pg->list[i];
+//				glVertex3fv((GLfloat *)&m.pos);
+//				
+//				// For lines, make a tail with the velocity vector's direction and
+//				// a length of radius.
+//				pVector tail = m.pos - m.vel;			
+//				glVertex3fv((GLfloat *)&tail);
+//			}
+//		}
+//		glEnd();
+//	}
+//}
+//
+//PARTICLEDLL_API void pDrawGroupl(int dlist, bool const_size, bool const_color, bool const_rotation)
+//{
+//	_ParticleState &_ps = _GetPState();
+//
+//	// Get a pointer to the particles in gp memory
+//	ParticleGroup *pg = _ps.pgrp;
+//	if(pg == NULL)
+//		return; // ERROR
+//	
+//	if(pg->p_count < 1)
+//		return;
+//
+//	//if(const_color)
+//	//	glColor4fv((GLfloat *)&pg->list[0].color);
+//
+//	for(int i = 0; i < pg->p_count; i++)
+//	{
+//		Particle &m = pg->list[i];
+//
+//		glPushMatrix();
+//		glTranslatef(m.pos.x, m.pos.y, m.pos.z);
+//
+//		if(!const_size)
+//			glScalef(m.size.x, m.size.y, m.size.z);
+//		else
+//			glScalef(pg->list[i].size.x, pg->list[i].size.y, pg->list[i].size.z);
+//
+//		// Expensive! A sqrt, cross prod and acos. Yow.
+//		if(!const_rotation)
+//		{
+//			pVector vN(m.vel);
+//			vN.normalize();
+//			pVector voN(m.velB);
+//			voN.normalize();
+//
+//			pVector biN;
+//			if(voN.x == vN.x && voN.y == vN.y && voN.z == vN.z)
+//				biN = pVector(0, 1, 0);
+//			else
+//				biN = vN ^ voN;
+//			biN.normalize();
+//
+//			pVector N(vN ^ biN);
+//
+//			double M[16];
+//			M[0] = vN.x;  M[4] = biN.x;  M[8] = N.x;  M[12] = 0;
+//			M[1] = vN.y;  M[5] = biN.y;  M[9] = N.y;  M[13] = 0;
+//			M[2] = vN.z;  M[6] = biN.z;  M[10] = N.z; M[14] = 0;
+//			M[3] = 0;     M[7] = 0;      M[11] = 0;   M[15] = 1;
+//			glMultMatrixd(M);
+//		}
+//
+//		// Warning: this depends on alpha following color in the Particle struct.
+//		if(!const_color)
+//			glColor4fv((GLfloat *)&m.color);
+//
+//		glCallList(dlist);
+//
+//		glPopMatrix();
+//	}
+//}
diff --git a/main/source/particles/action_api.cpp b/main/source/particles/action_api.cpp
new file mode 100644
index 00000000..f4642d1f
--- /dev/null
+++ b/main/source/particles/action_api.cpp
@@ -0,0 +1,391 @@
+// action_api.cpp
+//
+// Copyright 1997-1998 by David K. McAllister
+//
+// This file implements the action API calls by creating
+// action class instances, which are either executed or
+// added to an action list.
+
+#include "general.h"
+#include "papi.h"
+
+extern void _pAddActionToList(ParticleAction *S, int size);
+extern void _pCallActionList(ParticleAction *pa, int num_actions,
+							 ParticleGroup *pg);
+
+// Do not call this function.
+void _pSendAction(ParticleAction *S, PActionEnum type, int size)
+{
+	_ParticleState &_ps = _GetPState();
+
+	S->type = type;
+	
+	if(_ps.in_new_list)
+	{
+		_pAddActionToList(S, size);
+	}
+	else
+	{
+		// Immediate mode. Execute it.
+		// This is a hack to give them local access to dt.
+		S->dt = _ps.dt;
+		_pCallActionList(S, 1, _ps.pgrp);
+	}
+}
+
+PARTICLEDLL_API void pAvoid(float magnitude, float epsilon, float look_ahead, 
+			 PDomainEnum dtype,
+			 float a0, float a1, float a2,
+			 float a3, float a4, float a5,
+			 float a6, float a7, float a8)
+{
+	PAAvoid S;
+	
+	S.position = pDomain(dtype, a0, a1, a2, a3, a4, a5, a6, a7, a8);
+	S.magnitude = magnitude;
+	S.epsilon = epsilon;
+	S.look_ahead = look_ahead;
+
+	_pSendAction(&S, PAAvoidID, sizeof(PAAvoid));
+}
+
+PARTICLEDLL_API void pBounce(float friction, float resilience, float cutoff,
+			 PDomainEnum dtype,
+			 float a0, float a1, float a2,
+			 float a3, float a4, float a5,
+			 float a6, float a7, float a8)
+{
+	PABounce S;
+	
+	S.position = pDomain(dtype, a0, a1, a2, a3, a4, a5, a6, a7, a8);
+	S.oneMinusFriction = 1.0f - friction;
+	S.resilience = resilience;
+	S.cutoffSqr = fsqr(cutoff);
+	
+	_pSendAction(&S, PABounceID, sizeof(PABounce));
+}
+
+PARTICLEDLL_API void pCopyVertexB(bool copy_pos, bool copy_vel)
+{
+	PACopyVertexB S;
+
+	S.copy_pos = copy_pos;
+	S.copy_vel = copy_vel;
+	
+	_pSendAction(&S, PACopyVertexBID, sizeof(PACopyVertexB));
+}
+
+PARTICLEDLL_API void pDamping(float damping_x, float damping_y, float damping_z,
+			 float vlow, float vhigh)
+{
+	PADamping S;
+	
+	S.damping = pVector(damping_x, damping_y, damping_z);
+	S.vlowSqr = fsqr(vlow);
+	S.vhighSqr = fsqr(vhigh);
+	
+	_pSendAction(&S, PADampingID, sizeof(PADamping));
+}
+
+PARTICLEDLL_API void pExplosion(float center_x, float center_y, float center_z, float velocity,
+				float magnitude, float stdev, float epsilon, float age)
+{
+	PAExplosion S;
+	
+	S.center = pVector(center_x, center_y, center_z);
+	S.velocity = velocity;
+	S.magnitude = magnitude;
+	S.stdev = stdev;
+	S.epsilon = epsilon;
+	S.age = age;
+	
+	if(S.epsilon < 0.0f)
+		S.epsilon = P_EPS;
+	
+	_pSendAction(&S, PAExplosionID, sizeof(PAExplosion));
+}
+
+PARTICLEDLL_API void pFollow(float magnitude, float epsilon, float max_radius)
+{
+	PAFollow S;
+	
+	S.magnitude = magnitude;
+	S.epsilon = epsilon;
+	S.max_radius = max_radius;
+	
+	_pSendAction(&S, PAFollowID, sizeof(PAFollow));
+}
+
+PARTICLEDLL_API void pGravitate(float magnitude, float epsilon, float max_radius)
+{
+	PAGravitate S;
+	
+	S.magnitude = magnitude;
+	S.epsilon = epsilon;
+	S.max_radius = max_radius;
+	
+	_pSendAction(&S, PAGravitateID, sizeof(PAGravitate));
+}
+
+PARTICLEDLL_API void pGravity(float dir_x, float dir_y, float dir_z)
+{
+	PAGravity S;
+	
+	S.direction = pVector(dir_x, dir_y, dir_z);
+	
+	_pSendAction(&S, PAGravityID, sizeof(PAGravity));
+}
+
+PARTICLEDLL_API void pJet(float center_x, float center_y, float center_z,
+		 float magnitude, float epsilon, float max_radius)
+{
+	_ParticleState &_ps = _GetPState();
+
+	PAJet S;
+	
+	S.center = pVector(center_x, center_y, center_z);
+	S.acc = _ps.Vel;
+	S.magnitude = magnitude;
+	S.epsilon = epsilon;
+	S.max_radius = max_radius;
+	
+	_pSendAction(&S, PAJetID, sizeof(PAJet));
+}
+
+PARTICLEDLL_API void pKillOld(float age_limit, bool kill_less_than)
+{
+	PAKillOld S;
+	
+	S.age_limit = age_limit;
+	S.kill_less_than = kill_less_than;
+	
+	_pSendAction(&S, PAKillOldID, sizeof(PAKillOld));
+}
+
+PARTICLEDLL_API void pMatchVelocity(float magnitude, float epsilon, float max_radius)
+{
+	PAMatchVelocity S;
+	
+	S.magnitude = magnitude;
+	S.epsilon = epsilon;
+	S.max_radius = max_radius;
+	
+	_pSendAction(&S, PAMatchVelocityID, sizeof(PAMatchVelocity));
+}
+
+PARTICLEDLL_API void pMove()
+{
+	PAMove S;
+	
+	_pSendAction(&S, PAMoveID, sizeof(PAMove));
+}
+
+PARTICLEDLL_API void pOrbitLine(float p_x, float p_y, float p_z,
+				float axis_x, float axis_y, float axis_z,
+				float magnitude, float epsilon, float max_radius)
+{
+	PAOrbitLine S;
+	
+	S.p = pVector(p_x, p_y, p_z);
+	S.axis = pVector(axis_x, axis_y, axis_z);
+	S.axis.normalize();
+	S.magnitude = magnitude;
+	S.epsilon = epsilon;
+	S.max_radius = max_radius;
+	
+	_pSendAction(&S, PAOrbitLineID, sizeof(PAOrbitLine));
+}
+
+PARTICLEDLL_API void pOrbitPoint(float center_x, float center_y, float center_z,
+				 float magnitude, float epsilon, float max_radius)
+{
+	PAOrbitPoint S;
+	
+	S.center = pVector(center_x, center_y, center_z);
+	S.magnitude = magnitude;
+	S.epsilon = epsilon;
+	S.max_radius = max_radius;
+	
+	_pSendAction(&S, PAOrbitPointID, sizeof(PAOrbitPoint));
+}
+
+PARTICLEDLL_API void pRandomAccel(PDomainEnum dtype,
+				 float a0, float a1, float a2,
+				 float a3, float a4, float a5,
+				 float a6, float a7, float a8)
+{
+	PARandomAccel S;
+	
+	S.gen_acc = pDomain(dtype, a0, a1, a2, a3, a4, a5, a6, a7, a8);
+	
+	_pSendAction(&S, PARandomAccelID, sizeof(PARandomAccel));
+}
+
+PARTICLEDLL_API void pRandomDisplace(PDomainEnum dtype,
+					 float a0, float a1, float a2,
+					 float a3, float a4, float a5,
+					 float a6, float a7, float a8)
+{
+	PARandomDisplace S;
+	
+	S.gen_disp = pDomain(dtype, a0, a1, a2, a3, a4, a5, a6, a7, a8);
+	
+	_pSendAction(&S, PARandomDisplaceID, sizeof(PARandomDisplace));
+}
+
+PARTICLEDLL_API void pRandomVelocity(PDomainEnum dtype,
+					 float a0, float a1, float a2,
+					 float a3, float a4, float a5,
+					 float a6, float a7, float a8)
+{
+	PARandomVelocity S;
+	
+	S.gen_vel = pDomain(dtype, a0, a1, a2, a3, a4, a5, a6, a7, a8);
+	
+	_pSendAction(&S, PARandomVelocityID, sizeof(PARandomVelocity));
+}
+
+PARTICLEDLL_API void pRestore(float time_left)
+{
+	PARestore S;
+	
+	S.time_left = time_left;
+	
+	_pSendAction(&S, PARestoreID, sizeof(PARestore));
+}
+
+PARTICLEDLL_API void pSink(bool kill_inside, PDomainEnum dtype,
+		  float a0, float a1, float a2,
+		  float a3, float a4, float a5,
+		  float a6, float a7, float a8)
+{
+	PASink S;
+	
+	S.kill_inside = kill_inside;
+	S.position = pDomain(dtype, a0, a1, a2, a3, a4, a5, a6, a7, a8);
+	
+	_pSendAction(&S, PASinkID, sizeof(PASink));
+}
+
+PARTICLEDLL_API void pSinkVelocity(bool kill_inside, PDomainEnum dtype,
+				  float a0, float a1, float a2,
+				  float a3, float a4, float a5,
+				  float a6, float a7, float a8)
+{
+	PASinkVelocity S;
+	
+	S.kill_inside = kill_inside;
+	S.velocity = pDomain(dtype, a0, a1, a2, a3, a4, a5, a6, a7, a8);
+	
+	_pSendAction(&S, PASinkVelocityID, sizeof(PASinkVelocity));
+}
+
+PARTICLEDLL_API void pSource(float particle_rate, PDomainEnum dtype,
+			 float a0, float a1, float a2,
+			 float a3, float a4, float a5,
+			 float a6, float a7, float a8)
+{
+	_ParticleState &_ps = _GetPState();
+
+	PASource S;
+	
+	S.particle_rate = particle_rate;
+	S.position = pDomain(dtype, a0, a1, a2, a3, a4, a5, a6, a7, a8);
+	S.positionB = _ps.VertexB;
+	S.size = _ps.Size;
+	S.velocity = _ps.Vel;
+	S.color = _ps.Color;
+	S.alpha = _ps.Alpha;
+	S.age = _ps.Age;
+	S.age_sigma = _ps.AgeSigma;
+	S.vertexB_tracks = _ps.vertexB_tracks;
+	
+	_pSendAction(&S, PASourceID, sizeof(PASource));
+}
+
+PARTICLEDLL_API void pSpeedLimit(float min_speed, float max_speed)
+{
+	PASpeedLimit S;
+
+	S.min_speed = min_speed;
+	S.max_speed = max_speed;
+
+	_pSendAction(&S, PASpeedLimitID, sizeof(PASpeedLimit));
+}
+
+PARTICLEDLL_API void pTargetColor(float color_x, float color_y, float color_z,
+				 float alpha, float scale)
+{
+	PATargetColor S;
+	
+	S.color = pVector(color_x, color_y, color_z);
+	S.alpha = alpha;
+	S.scale = scale;
+	
+	_pSendAction(&S, PATargetColorID, sizeof(PATargetColor));
+}
+
+PARTICLEDLL_API void pTargetSize(float size_x, float size_y, float size_z,
+						 float scale_x, float scale_y, float scale_z)
+{
+	PATargetSize S;
+	
+	S.size = pVector(size_x, size_y, size_z);
+	S.scale = pVector(scale_x, scale_y, scale_z);
+	
+	_pSendAction(&S, PATargetSizeID, sizeof(PATargetSize));
+}
+
+PARTICLEDLL_API void pTargetVelocity(float vel_x, float vel_y, float vel_z, float scale)
+{
+	PATargetVelocity S;
+	
+	S.velocity = pVector(vel_x, vel_y, vel_z);
+	S.scale = scale;
+	
+	_pSendAction(&S, PATargetVelocityID, sizeof(PATargetVelocity));
+}
+
+// If in immediate mode, quickly add a vertex.
+// If building an action list, call pSource.
+PARTICLEDLL_API void pVertex(float x, float y, float z)
+{
+	_ParticleState &_ps = _GetPState();
+
+	if(_ps.in_new_list)
+	{
+		pSource(1, PDPoint, x, y, z);
+		return;
+	}
+	
+	// Immediate mode. Quickly add the vertex.
+	if(_ps.pgrp == NULL)
+		return;
+	
+	pVector pos(x, y, z);
+	pVector siz, vel, col, posB;
+	if(_ps.vertexB_tracks)
+		posB = pos;
+	else
+		_ps.VertexB.Generate(posB);
+	_ps.Size.Generate(siz);
+	_ps.Vel.Generate(vel);
+	_ps.Color.Generate(col);
+	_ps.pgrp->Add(pos, posB, siz, vel, col, _ps.Alpha, _ps.Age);
+}
+
+PARTICLEDLL_API void pVortex(float center_x, float center_y, float center_z,
+			 float axis_x, float axis_y, float axis_z,
+			 float magnitude, float epsilon, float max_radius)
+{
+	PAVortex S;
+	
+	S.center = pVector(center_x, center_y, center_z);
+	S.axis = pVector(axis_x, axis_y, axis_z);
+	S.axis.normalize();
+	S.magnitude = magnitude;
+	S.epsilon = epsilon;
+	S.max_radius = max_radius;
+	
+	_pSendAction(&S, PAVortexID, sizeof(PAVortex));
+}
diff --git a/main/source/particles/actions.cpp b/main/source/particles/actions.cpp
new file mode 100644
index 00000000..e5b2452b
--- /dev/null
+++ b/main/source/particles/actions.cpp
@@ -0,0 +1,1841 @@
+// actions.cpp
+//
+// Copyright 1997-1998 by David K. McAllister
+//
+// I used code Copyright 1997 by Jonathan P. Leech
+// as an example in implenting this.
+//
+// This file implements the dynamics of particle actions.
+
+#include "general.h"
+#include <float.h>
+//#include <iostream.h>
+#include "papi.h"
+
+#define SQRT2PI 2.506628274631000502415765284811045253006
+#define ONEOVERSQRT2PI (1. / SQRT2PI)
+
+// To offset [0 .. 1] vectors to [-.5 .. .5]
+static pVector vHalf(0.5, 0.5, 0.5);
+
+static inline pVector RandVec()
+{
+	return pVector(drand48(), drand48(), drand48());
+}
+
+// Return a random number with a normal distribution.
+static inline float NRand(float sigma = 1.0f)
+{
+#define ONE_OVER_SIGMA_EXP (1.0f / 0.7975f)
+	
+	if(sigma == 0) return 0;
+	
+	float y;
+	do
+	{
+		y = -logf(drand48());
+	}
+	while(drand48() > expf(-fsqr(y - 1.0f)*0.5f));
+	
+	if(rand() & 0x1)
+		return y * sigma * ONE_OVER_SIGMA_EXP;
+	else
+		return -y * sigma * ONE_OVER_SIGMA_EXP;
+}
+
+void PAAvoid::Execute(ParticleGroup *group)
+{
+	float magdt = magnitude * dt;
+	
+	switch(position.type)
+	{
+	case PDPlane:
+		{
+			if(look_ahead < P_MAXFLOAT)
+			{
+				for(int i = 0; i < group->p_count; i++)
+				{
+					Particle &m = group->list[i];
+					
+					// p2 stores the plane normal (the a,b,c of the plane eqn).
+					// Old and new distances: dist(p,plane) = n * p + d
+					// radius1 stores -n*p, which is d.
+					float dist = m.pos * position.p2 + position.radius1;
+					
+					if(dist < look_ahead)
+					{
+						float vm = m.vel.length();
+						pVector Vn = m.vel / vm;
+						// float dot = Vn * position.p2;
+						
+						pVector tmp = (position.p2 * (magdt / (dist*dist+epsilon))) + Vn;
+						m.vel = tmp * (vm / tmp.length());
+					}
+				}
+			}
+			else
+			{
+				for(int i = 0; i < group->p_count; i++)
+				{
+					Particle &m = group->list[i];
+					
+					// p2 stores the plane normal (the a,b,c of the plane eqn).
+					// Old and new distances: dist(p,plane) = n * p + d
+					// radius1 stores -n*p, which is d.
+					float dist = m.pos * position.p2 + position.radius1;
+					
+					float vm = m.vel.length();
+					pVector Vn = m.vel / vm;
+					// float dot = Vn * position.p2;
+					
+					pVector tmp = (position.p2 * (magdt / (dist*dist+epsilon))) + Vn;
+					m.vel = tmp * (vm / tmp.length());
+				}
+			}
+		}
+		break;
+	case PDRectangle:
+		{
+			// Compute the inverse matrix of the plane basis.
+			pVector &u = position.u;
+			pVector &v = position.v;
+			
+			// The normalized bases are needed inside the loop.
+			pVector un = u / position.radius1Sqr;
+			pVector vn = v / position.radius2Sqr;
+			
+			// w = u cross v
+			float wx = u.y*v.z-u.z*v.y;
+			float wy = u.z*v.x-u.x*v.z;
+			float wz = u.x*v.y-u.y*v.x;
+			
+			float det = 1/(wz*u.x*v.y-wz*u.y*v.x-u.z*wx*v.y-u.x*v.z*wy+v.z*wx*u.y+u.z*v.x*wy);
+			
+			pVector s1((v.y*wz-v.z*wy), (v.z*wx-v.x*wz), (v.x*wy-v.y*wx));
+			s1 *= det;
+			pVector s2((u.y*wz-u.z*wy), (u.z*wx-u.x*wz), (u.x*wy-u.y*wx));
+			s2 *= -det;
+			
+			// See which particles bounce.
+			for(int i = 0; i < group->p_count; i++)
+			{
+				Particle &m = group->list[i];
+				
+				// See if particle's current and next positions cross plane.
+				// If not, couldn't bounce, so keep going.
+				pVector pnext(m.pos + m.vel * dt * look_ahead);
+				
+				// p2 stores the plane normal (the a,b,c of the plane eqn).
+				// Old and new distances: dist(p,plane) = n * p + d
+				// radius1 stores -n*p, which is d.
+				float distold = m.pos * position.p2 + position.radius1;
+				float distnew = pnext * position.p2 + position.radius1;
+				
+				// Opposite signs if product < 0
+				// There is no faster way to do this.
+				if(distold * distnew >= 0)
+					continue;
+				
+				float nv = position.p2 * m.vel;
+				float t = -distold / nv;
+				
+				// Actual intersection point p(t) = pos + vel t
+				pVector phit(m.pos + m.vel * t);
+				
+				// Offset from origin in plane, p - origin
+				pVector offset(phit - position.p1);
+				
+				// Dot product with basis vectors of old frame
+				// in terms of new frame gives position in uv frame.
+				float upos = offset * s1;
+				float vpos = offset * s2;
+				
+				// Did it cross plane outside triangle?
+				if(upos < 0 || vpos < 0 || upos > 1 || vpos > 1)
+					continue;
+				
+				// A hit! A most palpable hit!
+				// Compute distance to the three edges.
+				pVector uofs = (un * (un * offset)) - offset;
+				float udistSqr = uofs.length2();
+				pVector vofs = (vn * (vn * offset)) - offset;
+				float vdistSqr = vofs.length2();
+				
+				pVector foffset((u + v) - offset);
+				pVector fofs = (un * (un * foffset)) - foffset;
+				float fdistSqr = fofs.length2();
+				pVector gofs = (un * (un * foffset)) - foffset;
+				float gdistSqr = gofs.length2();
+				
+				pVector S;
+				if(udistSqr <= vdistSqr && udistSqr <= fdistSqr
+					&& udistSqr <= gdistSqr) S = uofs;
+				else if(vdistSqr <= fdistSqr && vdistSqr <= gdistSqr) S = vofs;
+				else if(fdistSqr <= gdistSqr) S = fofs;
+				else S = gofs;
+				
+				S.normalize();
+				
+				// We now have a vector to safety.
+				float vm = m.vel.length();
+				pVector Vn = m.vel / vm;
+				
+				// Blend S into V.
+				pVector tmp = (S * (magdt / (t*t+epsilon))) + Vn;
+				m.vel = tmp * (vm / tmp.length());
+			}
+		}
+		break;
+	case PDTriangle:
+		{
+			// Compute the inverse matrix of the plane basis.
+			pVector &u = position.u;
+			pVector &v = position.v;
+			
+			// The normalized bases are needed inside the loop.
+			pVector un = u / position.radius1Sqr;
+			pVector vn = v / position.radius2Sqr;
+			
+			// f is the third (non-basis) triangle edge.
+			pVector f = v - u;
+			pVector fn(f);
+			fn.normalize();
+			
+			// w = u cross v
+			float wx = u.y*v.z-u.z*v.y;
+			float wy = u.z*v.x-u.x*v.z;
+			float wz = u.x*v.y-u.y*v.x;
+			
+			float det = 1/(wz*u.x*v.y-wz*u.y*v.x-u.z*wx*v.y-u.x*v.z*wy+v.z*wx*u.y+u.z*v.x*wy);
+			
+			pVector s1((v.y*wz-v.z*wy), (v.z*wx-v.x*wz), (v.x*wy-v.y*wx));
+			s1 *= det;
+			pVector s2((u.y*wz-u.z*wy), (u.z*wx-u.x*wz), (u.x*wy-u.y*wx));
+			s2 *= -det;
+			
+			// See which particles bounce.
+			for(int i = 0; i < group->p_count; i++)
+			{
+				Particle &m = group->list[i];
+				
+				// See if particle's current and next positions cross plane.
+				// If not, couldn't bounce, so keep going.
+				pVector pnext(m.pos + m.vel * dt * look_ahead);
+				
+				// p2 stores the plane normal (the a,b,c of the plane eqn).
+				// Old and new distances: dist(p,plane) = n * p + d
+				// radius1 stores -n*p, which is d.
+				float distold = m.pos * position.p2 + position.radius1;
+				float distnew = pnext * position.p2 + position.radius1;
+				
+				// Opposite signs if product < 0
+				// Is there a faster way to do this?
+				if(distold * distnew >= 0)
+					continue;
+				
+				float nv = position.p2 * m.vel;
+				float t = -distold / nv;
+				
+				// Actual intersection point p(t) = pos + vel t
+				pVector phit(m.pos + m.vel * t);
+				
+				// Offset from origin in plane, p - origin
+				pVector offset(phit - position.p1);
+				
+				// Dot product with basis vectors of old frame
+				// in terms of new frame gives position in uv frame.
+				float upos = offset * s1;
+				float vpos = offset * s2;
+				
+				// Did it cross plane outside triangle?
+				if(upos < 0 || vpos < 0 || (upos + vpos) > 1)
+					continue;
+				
+				// A hit! A most palpable hit!
+				// Compute distance to the three edges.
+				pVector uofs = (un * (un * offset)) - offset;
+				float udistSqr = uofs.length2();
+				pVector vofs = (vn * (vn * offset)) - offset;
+				float vdistSqr = vofs.length2();
+				pVector foffset(offset - u);
+				pVector fofs = (fn * (fn * foffset)) - foffset;
+				float fdistSqr = fofs.length2();
+				pVector S;
+				if(udistSqr <= vdistSqr && udistSqr <= fdistSqr) S = uofs;
+				else if(vdistSqr <= fdistSqr) S = vofs;
+				else S = fofs;
+				
+				S.normalize();
+				
+				// We now have a vector to safety.
+				float vm = m.vel.length();
+				pVector Vn = m.vel / vm;
+				
+				// Blend S into V.
+				pVector tmp = (S * (magdt / (t*t+epsilon))) + Vn;
+				m.vel = tmp * (vm / tmp.length());
+			}
+		}
+		break;
+	case PDDisc:
+		{
+			float r1Sqr = fsqr(position.radius1);
+			float r2Sqr = fsqr(position.radius2);
+			
+			// See which particles bounce.
+			for(int i = 0; i < group->p_count; i++)
+			{
+				Particle &m = group->list[i];
+				
+				// See if particle's current and next positions cross plane.
+				// If not, couldn't bounce, so keep going.
+				pVector pnext(m.pos + m.vel * dt * look_ahead);
+				
+				// p2 stores the plane normal (the a,b,c of the plane eqn).
+				// Old and new distances: dist(p,plane) = n * p + d
+				// radius1 stores -n*p, which is d. radius1Sqr stores d.
+				float distold = m.pos * position.p2 + position.radius1Sqr;
+				float distnew = pnext * position.p2 + position.radius1Sqr;
+				
+				// Opposite signs if product < 0
+				// Is there a faster way to do this?
+				if(distold * distnew >= 0)
+					continue;
+				
+				// Find position at the crossing point by parameterizing
+				// p(t) = pos + vel * t
+				// Solve dist(p(t),plane) = 0 e.g.
+				// n * p(t) + D = 0 ->
+				// n * p + t (n * v) + D = 0 ->
+				// t = -(n * p + D) / (n * v)
+				// Could factor n*v into distnew = distold + n*v and save a bit.
+				// Safe since n*v != 0 assured by quick rejection test.
+				// This calc is indep. of dt because we have established that it
+				// will hit before dt. We just want to know when.
+				float nv = position.p2 * m.vel;
+				float t = -distold / nv;
+				
+				// Actual intersection point p(t) = pos + vel t
+				pVector phit(m.pos + m.vel * t);
+				
+				// Offset from origin in plane, phit - origin
+				pVector offset(phit - position.p1);
+				
+				float rad = offset.length2();
+				
+				if(rad > r1Sqr || rad < r2Sqr)
+					continue;
+				
+				// A hit! A most palpable hit!
+				pVector S = offset;
+				S.normalize();
+				
+				// We now have a vector to safety.
+				float vm = m.vel.length();
+				pVector Vn = m.vel / vm;
+				
+				// Blend S into V.
+				pVector tmp = (S * (magdt / (t*t+epsilon))) + Vn;
+				m.vel = tmp * (vm / tmp.length());
+			}
+		}
+		break;
+	case PDSphere:
+		{
+			float rSqr = position.radius1 * position.radius1;
+			
+			// See which particles are aimed toward the sphere.
+			for(int i = 0; i < group->p_count; i++)
+			{
+				Particle &m = group->list[i];
+				
+				// First do a ray-sphere intersection test and
+				// see if it's soon enough.
+				// Can I do this faster without t?
+				float vm = m.vel.length();
+				pVector Vn = m.vel / vm;
+				
+				pVector L = position.p1 - m.pos;
+				float v = L * Vn;
+				
+				float disc = rSqr - (L * L) + v * v;
+				if(disc < 0)
+					continue; // I'm not heading toward it.
+				
+				// Compute length for second rejection test.
+				float t = v - sqrtf(disc);
+				if(t < 0 || t > (vm * look_ahead))
+					continue;
+				
+				// Get a vector to safety.
+				pVector C = Vn ^ L;
+				C.normalize();
+				pVector S = Vn ^ C;
+				
+				// Blend S into V.
+				pVector tmp = (S * (magdt / (t*t+epsilon))) + Vn;
+				m.vel = tmp * (vm / tmp.length());
+			}
+		}
+		break;
+	}
+}
+
+void PABounce::Execute(ParticleGroup *group)
+{
+	switch(position.type)
+	{
+	case PDTriangle:
+		{
+			// Compute the inverse matrix of the plane basis.
+			pVector &u = position.u;
+			pVector &v = position.v;
+			
+			// w = u cross v
+			float wx = u.y*v.z-u.z*v.y;
+			float wy = u.z*v.x-u.x*v.z;
+			float wz = u.x*v.y-u.y*v.x;
+			
+			float det = 1/(wz*u.x*v.y-wz*u.y*v.x-u.z*wx*v.y-u.x*v.z*wy+v.z*wx*u.y+u.z*v.x*wy);
+			
+			pVector s1((v.y*wz-v.z*wy), (v.z*wx-v.x*wz), (v.x*wy-v.y*wx));
+			s1 *= det;
+			pVector s2((u.y*wz-u.z*wy), (u.z*wx-u.x*wz), (u.x*wy-u.y*wx));
+			s2 *= -det;
+			
+			// See which particles bounce.
+			for(int i = 0; i < group->p_count; i++)
+			{
+				Particle &m = group->list[i];
+				
+				// See if particle's current and next positions cross plane.
+				// If not, couldn't bounce, so keep going.
+				pVector pnext(m.pos + m.vel * dt);
+				
+				// p2 stores the plane normal (the a,b,c of the plane eqn).
+				// Old and new distances: dist(p,plane) = n * p + d
+				// radius1 stores -n*p, which is d.
+				float distold = m.pos * position.p2 + position.radius1;
+				float distnew = pnext * position.p2 + position.radius1;
+				
+				// Opposite signs if product < 0
+				// Is there a faster way to do this?
+				if(distold * distnew >= 0)
+					continue;
+				
+				// Find position at the crossing point by parameterizing
+				// p(t) = pos + vel * t
+				// Solve dist(p(t),plane) = 0 e.g.
+				// n * p(t) + D = 0 ->
+				// n * p + t (n * v) + D = 0 ->
+				// t = -(n * p + D) / (n * v)
+				// Could factor n*v into distnew = distold + n*v and save a bit.
+				// Safe since n*v != 0 assured by quick rejection test.
+				// This calc is indep. of dt because we have established that it
+				// will hit before dt. We just want to know when.
+				float nv = position.p2 * m.vel;
+				float t = -distold / nv;
+				
+				// Actual intersection point p(t) = pos + vel t
+				pVector phit(m.pos + m.vel * t);
+				
+				// Offset from origin in plane, p - origin
+				pVector offset(phit - position.p1);
+				
+				// Dot product with basis vectors of old frame
+				// in terms of new frame gives position in uv frame.
+				float upos = offset * s1;
+				float vpos = offset * s2;
+				
+				// Did it cross plane outside triangle?
+				if(upos < 0 || vpos < 0 || (upos + vpos) > 1)
+					continue;
+				
+				// A hit! A most palpable hit!
+				
+				// Compute tangential and normal components of velocity
+				pVector vn(position.p2 * nv); // Normal Vn = (V.N)N
+				pVector vt(m.vel - vn); // Tangent Vt = V - Vn
+				
+				// Compute new velocity heading out:
+				// Don't apply friction if tangential velocity < cutoff
+				if(vt.length2() <= cutoffSqr)
+					m.vel = vt - vn * resilience;
+				else
+					m.vel = vt * oneMinusFriction - vn * resilience;
+			}
+		}
+		break;
+	case PDDisc:
+		{
+			float r1Sqr = fsqr(position.radius1);
+			float r2Sqr = fsqr(position.radius2);
+			
+			// See which particles bounce.
+			for(int i = 0; i < group->p_count; i++)
+			{
+				Particle &m = group->list[i];
+				
+				// See if particle's current and next positions cross plane.
+				// If not, couldn't bounce, so keep going.
+				pVector pnext(m.pos + m.vel * dt);
+				
+				// p2 stores the plane normal (the a,b,c of the plane eqn).
+				// Old and new distances: dist(p,plane) = n * p + d
+				// radius1 stores -n*p, which is d. radius1Sqr stores d.
+				float distold = m.pos * position.p2 + position.radius1Sqr;
+				float distnew = pnext * position.p2 + position.radius1Sqr;
+				
+				// Opposite signs if product < 0
+				// Is there a faster way to do this?
+				if(distold * distnew >= 0)
+					continue;
+				
+				// Find position at the crossing point by parameterizing
+				// p(t) = pos + vel * t
+				// Solve dist(p(t),plane) = 0 e.g.
+				// n * p(t) + D = 0 ->
+				// n * p + t (n * v) + D = 0 ->
+				// t = -(n * p + D) / (n * v)
+				// Could factor n*v into distnew = distold + n*v and save a bit.
+				// Safe since n*v != 0 assured by quick rejection test.
+				// This calc is indep. of dt because we have established that it
+				// will hit before dt. We just want to know when.
+				float nv = position.p2 * m.vel;
+				float t = -distold / nv;
+				
+				// Actual intersection point p(t) = pos + vel t
+				pVector phit(m.pos + m.vel * t);
+				
+				// Offset from origin in plane, phit - origin
+				pVector offset(phit - position.p1);
+				
+				float rad = offset.length2();
+				
+				if(rad > r1Sqr || rad < r2Sqr)
+					continue;
+				
+				// A hit! A most palpable hit!
+				
+				// Compute tangential and normal components of velocity
+				pVector vn(position.p2 * nv); // Normal Vn = (V.N)N
+				pVector vt(m.vel - vn); // Tangent Vt = V - Vn
+				
+				// Compute new velocity heading out:
+				// Don't apply friction if tangential velocity < cutoff
+				if(vt.length2() <= cutoffSqr)
+					m.vel = vt - vn * resilience;
+				else
+					m.vel = vt * oneMinusFriction - vn * resilience;
+			}
+		}
+		break;
+	case PDPlane:
+		{
+			// See which particles bounce.
+			for(int i = 0; i < group->p_count; i++)
+			{
+				Particle &m = group->list[i];
+				
+				// See if particle's current and next positions cross plane.
+				// If not, couldn't bounce, so keep going.
+				pVector pnext(m.pos + m.vel * dt);
+				
+				// p2 stores the plane normal (the a,b,c of the plane eqn).
+				// Old and new distances: dist(p,plane) = n * p + d
+				// radius1 stores -n*p, which is d.
+				float distold = m.pos * position.p2 + position.radius1;
+				float distnew = pnext * position.p2 + position.radius1;
+				
+				// Opposite signs if product < 0
+				if(distold * distnew >= 0)
+					continue;
+				
+				// Compute tangential and normal components of velocity
+				float nmag = m.vel * position.p2;
+				pVector vn(position.p2 * nmag); // Normal Vn = (V.N)N
+				pVector vt(m.vel - vn); // Tangent Vt = V - Vn
+				
+				// Compute new velocity heading out:
+				// Don't apply friction if tangential velocity < cutoff
+				if(vt.length2() <= cutoffSqr)
+					m.vel = vt - vn * resilience;
+				else
+					m.vel = vt * oneMinusFriction - vn * resilience;
+			}
+		}
+		break;
+	case PDRectangle:
+		{
+			// Compute the inverse matrix of the plane basis.
+			pVector &u = position.u;
+			pVector &v = position.v;
+			
+			// w = u cross v
+			float wx = u.y*v.z-u.z*v.y;
+			float wy = u.z*v.x-u.x*v.z;
+			float wz = u.x*v.y-u.y*v.x;
+			
+			float det = 1/(wz*u.x*v.y-wz*u.y*v.x-u.z*wx*v.y-u.x*v.z*wy+v.z*wx*u.y+u.z*v.x*wy);
+			
+			pVector s1((v.y*wz-v.z*wy), (v.z*wx-v.x*wz), (v.x*wy-v.y*wx));
+			s1 *= det;
+			pVector s2((u.y*wz-u.z*wy), (u.z*wx-u.x*wz), (u.x*wy-u.y*wx));
+			s2 *= -det;
+			
+			// See which particles bounce.
+			for(int i = 0; i < group->p_count; i++)
+			{
+				Particle &m = group->list[i];
+				
+				// See if particle's current and next positions cross plane.
+				// If not, couldn't bounce, so keep going.
+				pVector pnext(m.pos + m.vel * dt);
+				
+				// p2 stores the plane normal (the a,b,c of the plane eqn).
+				// Old and new distances: dist(p,plane) = n * p + d
+				// radius1 stores -n*p, which is d.
+				float distold = m.pos * position.p2 + position.radius1;
+				float distnew = pnext * position.p2 + position.radius1;
+				
+				// Opposite signs if product < 0
+				if(distold * distnew >= 0)
+					continue;
+				
+				// Find position at the crossing point by parameterizing
+				// p(t) = pos + vel * t
+				// Solve dist(p(t),plane) = 0 e.g.
+				// n * p(t) + D = 0 ->
+				// n * p + t (n * v) + D = 0 ->
+				// t = -(n * p + D) / (n * v)
+				float t = -distold / (position.p2 * m.vel);
+				
+				// Actual intersection point p(t) = pos + vel t
+				pVector phit(m.pos + m.vel * t);
+				
+				// Offset from origin in plane, p - origin
+				pVector offset(phit - position.p1);
+				
+				// Dot product with basis vectors of old frame
+				// in terms of new frame gives position in uv frame.
+				float upos = offset * s1;
+				float vpos = offset * s2;
+				
+				// Crossed plane outside bounce region if !(0<=[uv]pos<=1)
+				if(upos < 0 || upos > 1 || vpos < 0 || vpos > 1)
+					continue;
+				
+				// A hit! A most palpable hit!
+				
+				// Compute tangential and normal components of velocity
+				float nmag = m.vel * position.p2;
+				pVector vn(position.p2 * nmag); // Normal Vn = (V.N)N
+				pVector vt(m.vel - vn); // Tangent Vt = V - Vn
+				
+				// Compute new velocity heading out:
+				// Don't apply friction if tangential velocity < cutoff
+				if(vt.length2() <= cutoffSqr)
+					m.vel = vt - vn * resilience;
+				else
+					m.vel = vt * oneMinusFriction - vn * resilience;
+			}
+		}
+		break;
+	case PDSphere:
+		{
+			// Sphere that particles bounce off
+			// The particles are always forced out of the sphere.
+			for(int i = 0; i < group->p_count; i++)
+			{
+				Particle &m = group->list[i];
+				
+				// See if particle's next position is inside domain.
+				// If so, bounce it.
+				pVector pnext(m.pos + m.vel * dt);
+				
+				if(position.Within(pnext))
+				{
+					// See if we were inside on previous timestep.
+					bool pinside = position.Within(m.pos);
+					
+					// Normal to surface. This works for a sphere. Isn't
+					// computed quite right, should extrapolate particle
+					// position to surface.
+					pVector n(m.pos - position.p1);
+					n.normalize();
+					
+					// Compute tangential and normal components of velocity
+					float nmag = m.vel * n;
+					
+					pVector vn(n * nmag); // Normal Vn = (V.N)N
+					pVector vt = m.vel - vn; // Tangent Vt = V - Vn
+					
+					if(pinside)
+					{
+						// Previous position was inside. If normal component of
+						// velocity points in, reverse it. This effectively
+						// repels particles which would otherwise be trapped
+						// in the sphere.
+						if(nmag < 0)
+							m.vel = vt - vn;
+					}
+					else
+					{
+						// Previous position was outside -> particle will cross
+						// surface boundary. Reverse normal component of velocity,
+						// and apply friction (if Vt >= cutoff) and resilience.
+						
+						// Compute new velocity heading out:
+						// Don't apply friction if tangential velocity < cutoff
+						if(vt.length2() <= cutoffSqr)
+							m.vel = vt - vn * resilience;
+						else
+							m.vel = vt * oneMinusFriction - vn * resilience;
+					}
+				}
+			}
+		}
+	}
+}
+
+// Set the secondary position of each particle to be its position.
+void PACallActionList::Execute(ParticleGroup *group)
+{
+	pCallActionList(action_list_num);
+}
+
+// Set the secondary position of each particle to be its position.
+void PACopyVertexB::Execute(ParticleGroup *group)
+{
+	int i;
+	
+	if(copy_pos)
+	{
+		for(i = 0; i < group->p_count; i++)
+		{
+			Particle &m = group->list[i];
+			m.posB = m.pos;
+		}
+	}
+	
+	if(copy_vel)
+	{
+		for(i = 0; i < group->p_count; i++)
+		{
+			Particle &m = group->list[i];
+			m.velB = m.vel;
+		}
+	}
+}
+
+// Dampen velocities
+void PADamping::Execute(ParticleGroup *group)
+{
+	// This is important if dt is != 1.
+	pVector one(1,1,1);
+	pVector scale(one - ((one - damping) * dt));
+	
+	for(int i = 0; i < group->p_count; i++)
+	{
+		Particle &m = group->list[i];
+		float vSqr = m.vel.length2();
+		
+		if(vSqr >= vlowSqr && vSqr <= vhighSqr)
+		{
+			m.vel.x *= scale.x;
+			m.vel.y *= scale.y;
+			m.vel.z *= scale.z;
+		}
+	}
+}
+
+// Exert force on each particle away from explosion center
+void PAExplosion::Execute(ParticleGroup *group)
+{
+	float radius = velocity * age;
+	float magdt = magnitude * dt;
+	float oneOverSigma = 1.0f / stdev;
+	float inexp = -0.5f*fsqr(oneOverSigma);
+	float outexp = ONEOVERSQRT2PI * oneOverSigma;
+	
+	for(int i = 0; i < group->p_count; i++)
+	{
+		Particle &m = group->list[i];
+		
+		// Figure direction to particle.
+		pVector dir(m.pos - center);
+		float distSqr = dir.length2();
+		float dist = sqrtf(distSqr);
+		float DistFromWaveSqr = fsqr(radius - dist);
+		
+		float Gd = exp(DistFromWaveSqr * inexp) * outexp;
+		
+		m.vel += dir * (Gd * magdt / (dist * (distSqr + epsilon)));
+	}
+	
+	age += dt;
+}
+
+// Follow the next particle in the list
+void PAFollow::Execute(ParticleGroup *group)
+{
+	float magdt = magnitude * dt;
+	float max_radiusSqr = max_radius * max_radius;
+	
+	if(max_radiusSqr < P_MAXFLOAT)
+	{
+		for(int i = 0; i < group->p_count - 1; i++)
+		{
+			Particle &m = group->list[i];
+			
+			// Accelerate toward the particle after me in the list.
+			pVector tohim(group->list[i+1].pos - m.pos); // tohim = p1 - p0
+			float tohimlenSqr = tohim.length2();
+			
+			if(tohimlenSqr < max_radiusSqr)
+			{
+				// Compute force exerted between the two bodies
+				m.vel += tohim * (magdt / (sqrtf(tohimlenSqr) * (tohimlenSqr + epsilon)));
+			}
+		}
+	}
+	else
+	{
+		for(int i = 0; i < group->p_count - 1; i++)
+		{
+			Particle &m = group->list[i];
+			
+			// Accelerate toward the particle after me in the list.
+			pVector tohim(group->list[i+1].pos - m.pos); // tohim = p1 - p0
+			float tohimlenSqr = tohim.length2();
+			
+			// Compute force exerted between the two bodies
+			m.vel += tohim * (magdt / (sqrtf(tohimlenSqr) * (tohimlenSqr + epsilon)));
+		}
+	}
+}
+
+// Inter-particle gravitation
+void PAGravitate::Execute(ParticleGroup *group)
+{
+	float magdt = magnitude * dt;
+	float max_radiusSqr = max_radius * max_radius;
+	
+	if(max_radiusSqr < P_MAXFLOAT)
+	{
+		for(int i = 0; i < group->p_count; i++)
+		{
+			Particle &m = group->list[i];
+			
+			// Add interactions with other particles
+			for(int j = i + 1; j < group->p_count; j++)
+			{
+				Particle &mj = group->list[j];
+				
+				pVector tohim(mj.pos - m.pos); // tohim = p1 - p0
+				float tohimlenSqr = tohim.length2();
+				
+				if(tohimlenSqr < max_radiusSqr)
+				{
+					// Compute force exerted between the two bodies
+					pVector acc(tohim * (magdt / (sqrtf(tohimlenSqr) * (tohimlenSqr + epsilon))));
+					
+					m.vel += acc;
+					mj.vel -= acc;
+				}
+			}
+		}
+	}
+	else
+	{
+		for(int i = 0; i < group->p_count; i++)
+		{
+			Particle &m = group->list[i];
+			
+			// Add interactions with other particles
+			for(int j = i + 1; j < group->p_count; j++)
+			{
+				Particle &mj = group->list[j];
+				
+				pVector tohim(mj.pos - m.pos); // tohim = p1 - p0
+				float tohimlenSqr = tohim.length2();
+				
+				// Compute force exerted between the two bodies
+				pVector acc(tohim * (magdt / (sqrtf(tohimlenSqr) * (tohimlenSqr + epsilon))));
+				
+				m.vel += acc;
+				mj.vel -= acc;
+			}
+		}
+	}
+}
+
+// Acceleration in a constant direction
+void PAGravity::Execute(ParticleGroup *group)
+{
+	pVector ddir(direction * dt);
+	
+	for(int i = 0; i < group->p_count; i++)
+	{
+		// Step velocity with acceleration
+		group->list[i].vel += ddir;
+	}
+}
+
+// Accelerate particles along a line
+void PAJet::Execute(ParticleGroup *group)
+{
+	float magdt = magnitude * dt;
+	float max_radiusSqr = max_radius * max_radius;
+	
+	if(max_radiusSqr < P_MAXFLOAT)
+	{
+		for(int i = 0; i < group->p_count; i++)
+		{
+			Particle &m = group->list[i];
+			
+			// Figure direction to particle.
+			pVector dir(m.pos - center);
+			
+			// Distance to jet (force drops as 1/r^2)
+			// Soften by epsilon to avoid tight encounters to infinity
+			float rSqr = dir.length2();
+			
+			if(rSqr < max_radiusSqr)
+			{
+				pVector accel;
+				acc.Generate(accel);
+				
+				// Step velocity with acceleration
+				m.vel += accel * (magdt / (rSqr + epsilon));
+			}
+		}
+	}
+	else
+	{
+		for(int i = 0; i < group->p_count; i++)
+		{
+			Particle &m = group->list[i];
+			
+			// Figure direction to particle.
+			pVector dir(m.pos - center);
+			
+			// Distance to jet (force drops as 1/r^2)
+			// Soften by epsilon to avoid tight encounters to infinity
+			float rSqr = dir.length2();
+			
+			pVector accel;
+			acc.Generate(accel);
+			
+			// Step velocity with acceleration
+			m.vel += accel * (magdt / (rSqr + epsilon));
+		}
+	}
+}
+
+// Get rid of older particles
+void PAKillOld::Execute(ParticleGroup *group)
+{
+	// Must traverse list in reverse order so Remove will work
+	for(int i = group->p_count-1; i >= 0; i--)
+	{
+		Particle &m = group->list[i];
+		
+		if(!((m.age < age_limit) ^ kill_less_than))
+			group->Remove(i);
+	}
+}
+
+// Match velocity to near neighbors
+void PAMatchVelocity::Execute(ParticleGroup *group)
+{
+	float magdt = magnitude * dt;
+	float max_radiusSqr = max_radius * max_radius;
+	
+	if(max_radiusSqr < P_MAXFLOAT)
+	{
+		for(int i = 0; i < group->p_count; i++)
+		{
+			Particle &m = group->list[i];
+			
+			// Add interactions with other particles
+			for(int j = i + 1; j < group->p_count; j++)
+			{
+				Particle &mj = group->list[j];
+				
+				pVector tohim(mj.pos - m.pos); // tohim = p1 - p0
+				float tohimlenSqr = tohim.length2();
+				
+				if(tohimlenSqr < max_radiusSqr)
+				{
+					// Compute force exerted between the two bodies
+					pVector acc(mj.vel * (magdt / (tohimlenSqr + epsilon)));
+					
+					m.vel += acc;
+					mj.vel -= acc;
+				}
+			}
+		}
+	}
+	else
+	{
+		for(int i = 0; i < group->p_count; i++)
+		{
+			Particle &m = group->list[i];
+			
+			// Add interactions with other particles
+			for(int j = i + 1; j < group->p_count; j++)
+			{
+				Particle &mj = group->list[j];
+				
+				pVector tohim(mj.pos - m.pos); // tohim = p1 - p0
+				float tohimlenSqr = tohim.length2();
+				
+				// Compute force exerted between the two bodies
+				pVector acc(mj.vel * (magdt / (tohimlenSqr + epsilon)));
+				
+				m.vel += acc;
+				mj.vel -= acc;
+			}
+		}
+	}
+}
+
+void PAMove::Execute(ParticleGroup *group)
+{
+	// Step particle positions forward by dt, and age the particles.
+	for(int i = 0; i < group->p_count; i++)
+	{
+		Particle &m = group->list[i];
+		
+		m.age += dt;
+		m.pos += m.vel * dt;
+	}
+}
+
+// Accelerate particles towards a line
+void PAOrbitLine::Execute(ParticleGroup *group)
+{
+	float magdt = magnitude * dt;
+	float max_radiusSqr = max_radius * max_radius;
+	
+	if(max_radiusSqr < P_MAXFLOAT)
+	{
+		for(int i = 0; i < group->p_count; i++)
+		{
+			Particle &m = group->list[i];
+			
+			// Figure direction to particle from base of line.
+			pVector f(m.pos - p);
+			
+			pVector w(axis * (f * axis));
+			
+			// Direction from particle to nearest point on line.
+			pVector into = w - f;
+			
+			// Distance to line (force drops as 1/r^2, normalize by 1/r)
+			// Soften by epsilon to avoid tight encounters to infinity
+			float rSqr = into.length2();
+			
+			if(rSqr < max_radiusSqr)
+				// Step velocity with acceleration
+				m.vel += into * (magdt / (sqrtf(rSqr) + (rSqr + epsilon)));
+		}
+	}
+	else
+	{
+		// Removed because it causes pipeline stalls.
+		for(int i = 0; i < group->p_count; i++)
+		{
+			Particle &m = group->list[i];
+			
+			// Figure direction to particle from base of line.
+			pVector f(m.pos - p);
+			
+			pVector w(axis * (f * axis));
+			
+			// Direction from particle to nearest point on line.
+			pVector into = w - f;
+			
+			// Distance to line (force drops as 1/r^2, normalize by 1/r)
+			// Soften by epsilon to avoid tight encounters to infinity
+			float rSqr = into.length2();
+			
+			// Step velocity with acceleration
+			m.vel += into * (magdt / (sqrtf(rSqr) + (rSqr + epsilon)));
+		}
+	}
+}
+
+// Accelerate particles towards a point
+void PAOrbitPoint::Execute(ParticleGroup *group)
+{
+	float magdt = magnitude * dt;
+	float max_radiusSqr = max_radius * max_radius;
+
+	if(max_radiusSqr < P_MAXFLOAT)
+	{
+		for(int i = 0; i < group->p_count; i++)
+		{
+			Particle &m = group->list[i];
+			
+			// Figure direction to particle.
+			pVector dir(center - m.pos);
+			
+			// Distance to gravity well (force drops as 1/r^2, normalize by 1/r)
+			// Soften by epsilon to avoid tight encounters to infinity
+			float rSqr = dir.length2();
+			
+			// Step velocity with acceleration
+			if(rSqr < max_radiusSqr)
+				m.vel += dir * (magdt / (sqrtf(rSqr) + (rSqr + epsilon)));
+		}
+	}
+	else
+	{
+		// Avoids pipeline stalls.
+		for(int i = 0; i < group->p_count; i++)
+		{
+			Particle &m = group->list[i];
+			
+			// Figure direction to particle.
+			pVector dir(center - m.pos);
+			
+			// Distance to gravity well (force drops as 1/r^2, normalize by 1/r)
+			// Soften by epsilon to avoid tight encounters to infinity
+			float rSqr = dir.length2();
+			
+			// Step velocity with acceleration
+			m.vel += dir * (magdt / (sqrtf(rSqr) + (rSqr + epsilon)));
+		}
+	}
+}
+
+// Accelerate in random direction each time step
+void PARandomAccel::Execute(ParticleGroup *group)
+{
+	for(int i = 0; i < group->p_count; i++)
+	{
+		Particle &m = group->list[i];
+		
+		pVector acceleration;
+		gen_acc.Generate(acceleration);
+		
+		// dt will affect this by making a higher probability of
+		// being near the original velocity after unit time. Smaller
+		// dt approach a normal distribution instead of a square wave.
+		m.vel += acceleration * dt;
+	}
+}
+
+// Immediately displace position randomly
+void PARandomDisplace::Execute(ParticleGroup *group)
+{
+	for(int i = 0; i < group->p_count; i++)
+	{
+		Particle &m = group->list[i];
+		
+		pVector displacement;
+		gen_disp.Generate(displacement);
+		
+		// dt will affect this by making a higher probability of
+		// being near the original position after unit time. Smaller
+		// dt approach a normal distribution instead of a square wave.
+		m.pos += displacement * dt;
+	}
+}
+
+// Immediately assign a random velocity
+void PARandomVelocity::Execute(ParticleGroup *group)
+{
+	for(int i = 0; i < group->p_count; i++)
+	{
+		Particle &m = group->list[i];
+		
+		pVector velocity;
+		gen_vel.Generate(velocity);
+		
+		// Shouldn't multiply by dt because velocities are
+		// invariant of dt. How should dt affect this?
+		m.vel = velocity;
+	}
+}
+
+#if 0
+// Produce coefficients of a velocity function v(t)=at^2 + bt + c
+// satisfying initial x(0)=x0,v(0)=v0 and desired x(t)=xf,v(t)=vf,
+// where x = x(0) + integrate(v(T),0,t)
+static inline void _pconstrain(float x0, float v0, float xf, float vf,
+							   float t, float *a, float *b, float *c)
+{
+	*c = v0;
+	*b = 2 * (-t*vf - 2*t*v0 + 3*xf - 3*x0) / (t * t);
+	*a = 3 * (t*vf + t*v0 - 2*xf + 2*x0) / (t * t * t);
+}
+#endif
+
+// Over time, restore particles to initial positions
+// Put all particles on the surface of a statue, explode the statue,
+// and then suck the particles back to the original position. Cool!
+void PARestore::Execute(ParticleGroup *group)
+{
+	if(time_left <= 0)
+	{
+		for(int i = 0; i < group->p_count; i++)
+		{
+			Particle &m = group->list[i];
+			
+			// Already constrained, keep it there.
+			m.pos = m.posB;
+			m.vel = pVector(0,0,0);
+		}
+	}
+	else
+	{
+		float t = time_left;
+		float dtSqr = dt * dt;
+		float tSqrInv2dt = dt * 2.0f / (t * t);
+		float tCubInv3dtSqr = dtSqr * 3.0f / (t * t * t);
+		
+		for(int i = 0; i < group->p_count; i++)
+		{
+#if 1
+			Particle &m = group->list[i];
+			
+			// Solve for a desired-behavior velocity function in each axis
+			// _pconstrain(m.pos.x, m.vel.x, m.posB.x, 0., timeLeft, &a, &b, &c);
+			
+			// Figure new velocity at next timestep
+			// m.vel.x = a * dtSqr + b * dt + c;
+			
+			float b = (-2*t*m.vel.x + 3*m.posB.x - 3*m.pos.x) * tSqrInv2dt;
+			float a = (t*m.vel.x - m.posB.x - m.posB.x + m.pos.x + m.pos.x) * tCubInv3dtSqr;
+			
+			// Figure new velocity at next timestep
+			m.vel.x += a + b;
+			
+			b = (-2*t*m.vel.y + 3*m.posB.y - 3*m.pos.y) * tSqrInv2dt;
+			a = (t*m.vel.y - m.posB.y - m.posB.y + m.pos.y + m.pos.y) * tCubInv3dtSqr;
+			
+			// Figure new velocity at next timestep
+			m.vel.y += a + b;
+			
+			b = (-2*t*m.vel.z + 3*m.posB.z - 3*m.pos.z) * tSqrInv2dt;
+			a = (t*m.vel.z - m.posB.z - m.posB.z + m.pos.z + m.pos.z) * tCubInv3dtSqr;
+			
+			// Figure new velocity at next timestep
+			m.vel.z += a + b;
+#else
+			Particle &m = group->list[i];
+			
+			// XXX Optimize this.
+			// Solve for a desired-behavior velocity function in each axis
+			float a, b, c; // Coefficients of velocity function needed
+			
+			_pconstrain(m.pos.x, m.vel.x, m.posB.x, 0.,
+				timeLeft, &a, &b, &c);
+			
+			// Figure new velocity at next timestep
+			m.vel.x = a * dtSqr + b * dt + c;
+			
+			_pconstrain(m.pos.y, m.vel.y, m.posB.y, 0.,
+				timeLeft, &a, &b, &c);
+			
+			// Figure new velocity at next timestep
+			m.vel.y = a * dtSqr + b * dt + c;
+			
+			_pconstrain(m.pos.z, m.vel.z, m.posB.z, 0.,
+				timeLeft, &a, &b, &c);
+			
+			// Figure new velocity at next timestep
+			m.vel.z = a * dtSqr + b * dt + c;
+			
+#endif
+		}
+	}
+	
+	time_left -= dt;
+}
+
+// Kill particles with positions on wrong side of the specified domain
+void PASink::Execute(ParticleGroup *group)
+{
+	// Must traverse list in reverse order so Remove will work
+	for(int i = group->p_count-1; i >= 0; i--)
+	{
+		Particle &m = group->list[i];
+		
+		// Remove if inside/outside flag matches object's flag
+		if(!(position.Within(m.pos) ^ kill_inside))
+			group->Remove(i);
+	}
+}
+
+// Kill particles with velocities on wrong side of the specified domain
+void PASinkVelocity::Execute(ParticleGroup *group)
+{
+	// Must traverse list in reverse order so Remove will work
+	for(int i = group->p_count-1; i >= 0; i--)
+	{
+		Particle &m = group->list[i];
+		
+		// Remove if inside/outside flag matches object's flag
+		if(!(velocity.Within(m.vel) ^ kill_inside))
+			group->Remove(i);
+	}
+}
+
+// Randomly add particles to the system
+void PASource::Execute(ParticleGroup *group)
+{
+	int rate = int(floor(particle_rate * dt));
+	
+	// Dither the fraction particle in time.
+	if(drand48() < particle_rate * dt - float(rate))
+		rate++;
+	
+	// Don't emit more than it can hold.
+	if(group->p_count + rate > group->max_particles)
+		rate = group->max_particles - group->p_count;
+	
+	pVector pos, posB, vel, col, siz;
+	
+	if(vertexB_tracks)
+	{
+		for(int i = 0; i < rate; i++)
+		{
+			position.Generate(pos);
+			size.Generate(siz);
+			velocity.Generate(vel);
+			color.Generate(col);
+			float ag = age + NRand(age_sigma);
+			
+			group->Add(pos, pos, siz, vel, col, alpha, ag);
+		}
+	}
+	else
+	{
+		for(int i = 0; i < rate; i++)
+		{
+			position.Generate(pos);
+			positionB.Generate(posB);
+			size.Generate(siz);
+			velocity.Generate(vel);
+			color.Generate(col);
+			float ag = age + NRand(age_sigma);
+			
+			group->Add(pos, posB, siz, vel, col, alpha, ag);
+		}
+	}
+}
+
+void PASpeedLimit::Execute(ParticleGroup *group)
+{
+	float min_sqr = min_speed*min_speed;
+	float max_sqr = max_speed*max_speed;
+	
+	for(int i = 0; i < group->p_count; i++)
+	{
+		Particle &m = group->list[i];
+		float sSqr = m.vel.length2();
+		if(sSqr<min_sqr && sSqr)
+		{
+			float s = sqrtf(sSqr);
+			m.vel *= (min_speed/s);
+		}
+		else if(sSqr>max_sqr)
+		{
+			float s = sqrtf(sSqr);
+			m.vel *= (max_speed/s);
+		}
+	}
+}
+
+// Change color of all particles toward the specified color
+void PATargetColor::Execute(ParticleGroup *group)
+{
+	float scaleFac = scale * dt;
+	
+	for(int i = 0; i < group->p_count; i++)
+	{
+		Particle &m = group->list[i];
+		m.color += (color - m.color) * scaleFac;
+		m.alpha += (alpha - m.alpha) * scaleFac;
+	}
+}
+
+// Change sizes of all particles toward the specified size
+void PATargetSize::Execute(ParticleGroup *group)
+{
+	float scaleFac_x = scale.x * dt;
+	float scaleFac_y = scale.y * dt;
+	float scaleFac_z = scale.z * dt;
+	
+	for(int i = 0; i < group->p_count; i++)
+	{
+		Particle &m = group->list[i];
+		pVector dif(size - m.size);
+		dif.x *= scaleFac_x;
+		dif.y *= scaleFac_y;
+		dif.z *= scaleFac_z;
+		m.size += dif;
+	}
+}
+
+// Change velocity of all particles toward the specified velocity
+void PATargetVelocity::Execute(ParticleGroup *group)
+{
+	float scaleFac = scale * dt;
+	
+	for(int i = 0; i < group->p_count; i++)
+	{
+		Particle &m = group->list[i];
+		m.vel += (velocity - m.vel) * scaleFac;
+	}
+}
+
+// Immediately displace position using vortex
+// Vortex tip at center, around axis, with magnitude
+// and tightness exponent
+void PAVortex::Execute(ParticleGroup *group)
+{
+	float magdt = magnitude * dt;
+	float max_radiusSqr = max_radius * max_radius;
+	
+	if(max_radiusSqr < P_MAXFLOAT)
+	{
+		for(int i = 0; i < group->p_count; i++)
+		{
+			Particle &m = group->list[i];
+			
+			// Vector from tip of vortex
+			pVector offset(m.pos - center);
+			
+			// Compute distance from particle to tip of vortex.
+			float rSqr = offset.length2();
+			
+			// Don't do anything to particle if too close or too far.
+			if(rSqr > max_radiusSqr)
+				continue;
+			
+			float r = sqrtf(rSqr);
+			
+			// Compute normalized offset vector.
+			pVector offnorm(offset / r);
+			
+			// Construct orthogonal vector frame in which to rotate
+			// transformed point around origin
+			float axisProj = offnorm * axis; // offnorm . axis
+			
+			// Components of offset perpendicular and parallel to axis
+			pVector w(axis * axisProj); // parallel component
+			pVector u(offnorm - w); // perpendicular component
+			
+			// Perpendicular component completing frame:
+			pVector v(axis ^ u);
+			
+			// Figure amount of rotation
+			// Resultant is (cos theta) u + (sin theta) v
+			float theta = magdt / (rSqr + epsilon);
+			float s = sinf(theta);
+			float c = cosf(theta);
+			
+			offset = (u * c + v * s + w) * r;
+			
+			// Translate back to object space
+			m.pos = offset + center;
+		}
+	}
+	else
+	{
+		for(int i = 0; i < group->p_count; i++)
+		{
+			Particle &m = group->list[i];
+			
+			// Vector from tip of vortex
+			pVector offset(m.pos - center);
+			
+			// Compute distance from particle to tip of vortex.
+			float rSqr = offset.length2();
+			
+			float r = sqrtf(rSqr);
+			
+			// Compute normalized offset vector.
+			pVector offnorm(offset / r);
+			
+			// Construct orthogonal vector frame in which to rotate
+			// transformed point around origin
+			float axisProj = offnorm * axis; // offnorm . axis
+			
+			// Components of offset perpendicular and parallel to axis
+			pVector w(axis * axisProj); // parallel component
+			pVector u(offnorm - w); // perpendicular component
+			
+			// Perpendicular component completing frame:
+			pVector v(axis ^ u);
+			
+			// Figure amount of rotation
+			// Resultant is (cos theta) u + (sin theta) v
+			float theta = magdt / (rSqr + epsilon);
+			float s = sinf(theta);
+			float c = cosf(theta);
+			
+			offset = (u * c + v * s + w) * r;
+			
+			// Translate back to object space
+			m.pos = offset + center;
+		}
+	}
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Stuff for the pDomain.
+
+pDomain::pDomain(PDomainEnum dtype, float a0, float a1,
+				 float a2, float a3, float a4, float a5,
+				 float a6, float a7, float a8)
+{
+	type = dtype;
+	switch(type)
+	{
+	case PDPoint:
+		p1 = pVector(a0, a1, a2);
+		break;
+	case PDLine:
+		{
+			p1 = pVector(a0, a1, a2);
+			pVector tmp(a3, a4, a5);
+			// p2 is vector from p1 to other endpoint.
+			p2 = tmp - p1;
+		}
+		break;
+	case PDBox:
+		// p1 is the min corner. p2 is the max corner.
+		if(a0 < a3)
+		{
+			p1.x = a0; p2.x = a3;
+		}
+		else
+		{
+			p1.x = a3; p2.x = a0;
+		}
+		if(a1 < a4)
+		{
+			p1.y = a1; p2.y = a4;
+		}
+		else
+		{
+			p1.y = a4; p2.y = a1;
+		}
+		if(a2 < a5)
+		{
+			p1.z = a2; p2.z = a5;
+		}
+		else
+		{
+			p1.z = a5; p2.z = a2;
+		}
+		break;
+	case PDTriangle:
+		{
+			p1 = pVector(a0, a1, a2);
+			pVector tp2 = pVector(a3, a4, a5);
+			pVector tp3 = pVector(a6, a7, a8);
+			
+			u = tp2 - p1;
+			v = tp3 - p1;
+			
+			// The rest of this is needed for bouncing.
+			radius1Sqr = u.length();
+			pVector tu = u / radius1Sqr;
+			radius2Sqr = v.length();
+			pVector tv = v / radius2Sqr;
+			
+			p2 = tu ^ tv; // This is the non-unit normal.
+			p2.normalize(); // Must normalize it.
+			
+			// radius1 stores the d of the plane eqn.
+			radius1 = -(p1 * p2);
+		}
+		break;
+	case PDRectangle:
+		{
+			p1 = pVector(a0, a1, a2);
+			u = pVector(a3, a4, a5);
+			v = pVector(a6, a7, a8);
+			
+			// The rest of this is needed for bouncing.
+			radius1Sqr = u.length();
+			pVector tu = u / radius1Sqr;
+			radius2Sqr = v.length();
+			pVector tv = v / radius2Sqr;
+			
+			p2 = tu ^ tv; // This is the non-unit normal.
+			p2.normalize(); // Must normalize it.
+			
+			// radius1 stores the d of the plane eqn.
+			radius1 = -(p1 * p2);
+		}
+		break;
+	case PDPlane:
+		{
+			p1 = pVector(a0, a1, a2);
+			p2 = pVector(a3, a4, a5);
+			p2.normalize(); // Must normalize it.
+			
+			// radius1 stores the d of the plane eqn.
+			radius1 = -(p1 * p2);
+		}
+		break;
+	case PDSphere:
+		p1 = pVector(a0, a1, a2);
+		if(a3 > a4)
+		{
+			radius1 = a3; radius2 = a4;
+		}
+		else
+		{
+			radius1 = a4; radius2 = a3;
+		}
+		radius1Sqr = radius1 * radius1;
+		radius2Sqr = radius2 * radius2;
+		break;
+	case PDCone:
+	case PDCylinder:
+		{
+			// p2 is a vector from p1 to the other end of cylinder.
+			// p1 is apex of cone.
+			
+			p1 = pVector(a0, a1, a2);
+			pVector tmp(a3, a4, a5);
+			p2 = tmp - p1;
+			
+			if(a6 > a7)
+			{
+				radius1 = a6; radius2 = a7;
+			}
+			else
+			{
+				radius1 = a7; radius2 = a6;
+			}
+			radius1Sqr = fsqr(radius1);
+			
+			// Given an arbitrary nonzero vector n, make two orthonormal
+			// vectors u and v forming a frame [u,v,n.normalize()].
+			pVector n = p2;
+			float p2l2 = n.length2(); // Optimize this.
+			n.normalize();
+			
+			// radius2Sqr stores 1 / (p2.p2)
+			// XXX Used to have an actual if.
+			radius2Sqr = p2l2 ? 1.0f / p2l2 : 0.0f;
+			
+			// Find a vector orthogonal to n.
+			pVector basis(1.0f, 0.0f, 0.0f);
+			if(fabs(basis * n) > 0.999)
+				basis = pVector(0.0f, 1.0f, 0.0f);
+			
+			// Project away N component, normalize and cross to get
+			// second orthonormal vector.
+			u = basis - n * (basis * n);
+			u.normalize();
+			v = n ^ u;
+		}
+		break;
+	case PDBlob:
+		{
+			p1 = pVector(a0, a1, a2);
+			radius1 = a3;
+			float tmp = 1./radius1;
+			radius2Sqr = -0.5f*fsqr(tmp);
+			radius2 = ONEOVERSQRT2PI * tmp;
+		}
+		break;
+	case PDDisc:
+		{
+			p1 = pVector(a0, a1, a2); // Center point
+			p2 = pVector(a3, a4, a5); // Normal (not used in Within and Generate)
+			p2.normalize();
+			
+			if(a6 > a7)
+			{
+				radius1 = a6; radius2 = a7;
+			}
+			else
+			{
+				radius1 = a7; radius2 = a6;
+			}
+			
+			// Find a vector orthogonal to n.
+			pVector basis(1.0f, 0.0f, 0.0f);
+			if(fabs(basis * p2) > 0.999)
+				basis = pVector(0.0f, 1.0f, 0.0f);
+			
+			// Project away N component, normalize and cross to get
+			// second orthonormal vector.
+			u = basis - p2 * (basis * p2);
+			u.normalize();
+			v = p2 ^ u;
+			radius1Sqr = -(p1 * p2); // D of the plane eqn.
+		}
+		break;
+	}
+}
+
+// Determines if pos is inside the domain
+bool pDomain::Within(const pVector &pos) const
+{
+	switch (type)
+	{
+	case PDBox:
+		return !((pos.x < p1.x) || (pos.x > p2.x) ||
+			(pos.y < p1.y) || (pos.y > p2.y) ||
+			(pos.z < p1.z) || (pos.z > p2.z));
+	case PDPlane:
+		// Distance from plane = n * p + d
+		// Inside is the positive half-space.
+		return pos * p2 >= -radius1;
+	case PDSphere:
+		{
+			pVector rvec(pos - p1);
+			float rSqr = rvec.length2();
+			return rSqr <= radius1Sqr && rSqr >= radius2Sqr;
+		}
+	case PDCylinder:
+	case PDCone:
+		{
+			// This is painful and slow. Might be better to do quick
+			// accept/reject tests.
+			// Let p2 = vector from base to tip of the cylinder
+			// x = vector from base to test point
+			// x . p2
+			// dist = ------ = projected distance of x along the axis
+			// p2. p2 ranging from 0 (base) to 1 (tip)
+			//
+			// rad = x - dist * p2 = projected vector of x along the base
+			// p1 is the apex of the cone.
+			
+			pVector x(pos - p1);
+			
+			// Check axial distance
+			// radius2Sqr stores 1 / (p2.p2)
+			float dist = (p2 * x) * radius2Sqr;
+			if(dist < 0.0f || dist > 1.0f)
+				return false;
+			
+			// Check radial distance; scale radius along axis for cones
+			pVector xrad = x - p2 * dist; // Radial component of x
+			float rSqr = xrad.length2();
+			
+			if(type == PDCone)
+				return (rSqr <= fsqr(dist * radius1) &&
+				rSqr >= fsqr(dist * radius2));
+			else
+				return (rSqr <= radius1Sqr && rSqr >= fsqr(radius2));
+		}
+	case PDBlob:
+		{
+			pVector x(pos - p1);
+			// return exp(-0.5 * xSq * Sqr(oneOverSigma)) * ONEOVERSQRT2PI * oneOverSigma;
+			float Gx = expf(x.length2() * radius2Sqr) * radius2;
+			return (drand48() < Gx);
+		}
+	case PDPoint:
+	case PDLine:
+	case PDRectangle:
+	case PDTriangle:
+	case PDDisc:
+	default:
+		return false; // XXX Is there something better?
+	}
+}
+
+// Generate a random point uniformly distrbuted within the domain
+void pDomain::Generate(pVector &pos) const
+{
+	switch (type)
+	{
+	case PDPoint:
+		pos = p1;
+		break;
+	case PDLine:
+		pos = p1 + p2 * drand48();
+		break;
+	case PDBox:
+		// Scale and translate [0,1] random to fit box
+		pos.x = p1.x + (p2.x - p1.x) * drand48();
+		pos.y = p1.y + (p2.y - p1.y) * drand48();
+		pos.z = p1.z + (p2.z - p1.z) * drand48();
+		break;
+	case PDTriangle:
+		{
+			float r1 = drand48();
+			float r2 = drand48();
+			if(r1 + r2 < 1.0f)
+				pos = p1 + u * r1 + v * r2;
+			else
+				pos = p1 + u * (1.0f-r1) + v * (1.0f-r2);
+		}
+		break;
+	case PDRectangle:
+		pos = p1 + u * drand48() + v * drand48();
+		break;
+	case PDPlane: // How do I sensibly make a point on an infinite plane?
+		pos = p1;
+		break;
+	case PDSphere:
+		// Place on [-1..1] sphere
+		pos = RandVec() - vHalf;
+		pos.normalize();
+		
+		// Scale unit sphere pos by [0..r] and translate
+		// (should distribute as r^2 law)
+		if(radius1 == radius2)
+			pos = p1 + pos * radius1;
+		else
+			pos = p1 + pos * (radius2 + drand48() * (radius1 - radius2));
+		break;
+	case PDCylinder:
+	case PDCone:
+		{
+			// For a cone, p2 is the apex of the cone.
+			float dist = drand48(); // Distance between base and tip
+			float theta = drand48() * 2.0f * float(M_PI); // Angle around axis
+			// Distance from axis
+			float r = radius2 + drand48() * (radius1 - radius2);
+			
+			float x = r * cosf(theta); // Weighting of each frame vector
+			float y = r * sinf(theta);
+			
+			// Scale radius along axis for cones
+			if(type == PDCone)
+			{
+				x *= dist;
+				y *= dist;
+			}
+			
+			pos = p1 + p2 * dist + u * x + v * y;
+		}
+		break;
+	case PDBlob:
+		pos.x = p1.x + NRand(radius1);
+		pos.y = p1.y + NRand(radius1);
+		pos.z = p1.z + NRand(radius1);
+		
+		break;
+	case PDDisc:
+		{
+			float theta = drand48() * 2.0f * float(M_PI); // Angle around normal
+			// Distance from center
+			float r = radius2 + drand48() * (radius1 - radius2);
+			
+			float x = r * cosf(theta); // Weighting of each frame vector
+			float y = r * sinf(theta);
+			
+			pos = p1 + u * x + v * y;
+		}
+		break;
+	default:
+		pos = pVector(0,0,0);
+	}
+}
diff --git a/main/source/particles/general.h b/main/source/particles/general.h
new file mode 100644
index 00000000..b123393b
--- /dev/null
+++ b/main/source/particles/general.h
@@ -0,0 +1,404 @@
+// general.h
+//
+// Copyright 1998 by David K. McAllister.
+//
+// This file implements the API calls that are not particle actions.
+
+#ifndef general_h
+#define general_h
+
+//#include "papi.h"
+#include "p_vector.h"
+#include "particledefs.h"
+
+#ifdef _WIN32
+#pragma warning (disable:4244)
+#endif
+
+struct pDomain
+{
+	PDomainEnum type;	// PABoxDomain, PASphereDomain, PAConeDomain...
+	pVector p1, p2;		// Box vertices, Sphere center, Cylinder/Cone ends
+	pVector u, v;		// Orthonormal basis vectors for Cylinder/Cone
+	float radius1;		// Outer radius
+	float radius2;		// Inner radius
+	float radius1Sqr;	// Used for fast Within test of spheres,
+	float radius2Sqr;	// and for mag. of u and v vectors for plane.
+	
+	bool Within(const pVector &) const;
+	void Generate(pVector &) const;
+	
+	// This constructor is used when default constructing a
+	// ParticleAction that has a pDomain.
+	inline pDomain()
+	{
+	}
+	
+	// Construct a domain in the standard way.
+	pDomain(PDomainEnum dtype,
+		float a0=0.0f, float a1=0.0f, float a2=0.0f,
+		float a3=0.0f, float a4=0.0f, float a5=0.0f,
+		float a6=0.0f, float a7=0.0f, float a8=0.0f);
+};
+
+//////////////////////////////////////////////////////////////////////
+// Type codes for all actions
+enum PActionEnum
+{
+	PAHeaderID,			// The first action in each list.
+	PAAvoidID,			// Avoid entering the domain of space.
+	PABounceID,			// Bounce particles off a domain of space.
+	PACallActionListID,	// 
+	PACopyVertexBID,	// Set the secondary position from current position.
+	PADampingID,		// Dampen particle velocities.
+	PAExplosionID,		// An Explosion.
+	PAFollowID,			// Accelerate toward the previous particle in the group.
+	PAGravitateID,		// Accelerate each particle toward each other particle.
+	PAGravityID,		// Acceleration in the given direction.
+	PAJetID,			// 
+	PAKillOldID,		// 
+	PAMatchVelocityID,	// 
+	PAMoveID,			// 
+	PAOrbitLineID,		// 
+	PAOrbitPointID,		// 
+	PARandomAccelID,	// 
+	PARandomDisplaceID,	// 
+	PARandomVelocityID,	// 
+	PARestoreID,		// 
+	PASinkID,			// 
+	PASinkVelocityID,	// 
+	PASourceID,			// 
+	PASpeedLimitID,		// 
+	PATargetColorID,	// 
+	PATargetSizeID,		// 
+	PATargetVelocityID,	// 
+	PAVortexID			// 
+};
+
+// This method actually does the particle's action.
+#define ExecMethod	void Execute(ParticleGroup *pg);
+
+struct ParticleAction
+{
+	static float dt;	// This is copied to here from global state.
+	PActionEnum type;	// Type field
+};
+
+///////////////////////////////////////////////////////////////////////////
+// Data types derived from Action.
+
+
+struct PAHeader : public ParticleAction
+{
+	int actions_allocated;
+	int count;			// Total actions in the list.
+	float padding[96];	// This must be the largest action.
+	
+	ExecMethod
+};
+
+struct PAAvoid : public ParticleAction
+{
+	pDomain position;	// Avoid region
+	float look_ahead;	// how many time units ahead to look
+	float magnitude;	// what percent of the way to go each time
+	float epsilon;		// add to r^2 for softening
+	
+	ExecMethod
+};
+
+struct PABounce : public ParticleAction
+{
+	pDomain position;	// Bounce region
+	float oneMinusFriction;	// Friction tangent to surface
+	float resilience;	// Resilence perpendicular to surface
+	float cutoffSqr;	// cutoff velocity; friction applies iff v > cutoff
+	
+	ExecMethod
+};
+
+struct PACallActionList : public ParticleAction
+{
+	int action_list_num;	// The action list number to call
+	
+	ExecMethod
+};
+
+struct PACopyVertexB : public ParticleAction
+{
+	bool copy_pos;		// True to copy pos to posB.
+	bool copy_vel;		// True to copy vel to velB.
+	
+	ExecMethod
+};
+
+struct PADamping : public ParticleAction
+{
+	pVector damping;	// Damping constant applied to velocity
+	float vlowSqr;		// Low and high cutoff velocities
+	float vhighSqr;
+	
+	ExecMethod
+};
+
+struct PAExplosion : public ParticleAction
+{
+	pVector center;		// The center of the explosion
+	float velocity;		// Of shock wave
+	float magnitude;	// At unit radius
+	float stdev;		// Sharpness or width of shock wave
+	float age;			// How long it's been going on
+	float epsilon;		// Softening parameter
+	
+	ExecMethod
+};
+
+struct PAFollow : public ParticleAction
+{
+	float magnitude;	// The grav of each particle
+	float epsilon;		// Softening parameter
+	float max_radius;	// Only influence particles within max_radius
+	
+	ExecMethod
+};
+
+struct PAGravitate : public ParticleAction
+{
+	float magnitude;	// The grav of each particle
+	float epsilon;		// Softening parameter
+	float max_radius;	// Only influence particles within max_radius
+	
+	ExecMethod
+};
+
+struct PAGravity : public ParticleAction
+{
+	pVector direction;	// Amount to increment velocity
+	
+	ExecMethod
+};
+
+struct PAJet : public ParticleAction
+{
+	pVector	center;		// Center of the fan
+	pDomain acc;		// Acceleration vector domain
+	float magnitude;	// Scales acceleration
+	float epsilon;		// Softening parameter
+	float max_radius;	// Only influence particles within max_radius
+	
+	ExecMethod
+};
+
+struct PAKillOld : public ParticleAction
+{
+	float age_limit;		// Exact age at which to kill particles.
+	bool kill_less_than;	// True to kill particles less than limit.
+	
+	ExecMethod
+};
+
+struct PAMatchVelocity : public ParticleAction
+{
+	float magnitude;	// The grav of each particle
+	float epsilon;		// Softening parameter
+	float max_radius;	// Only influence particles within max_radius
+	
+	ExecMethod
+};
+
+struct PAMove : public ParticleAction
+{
+	
+	ExecMethod
+};
+
+struct PAOrbitLine : public ParticleAction
+{
+	pVector p, axis;	// Endpoints of line to which particles are attracted
+	float magnitude;	// Scales acceleration
+	float epsilon;		// Softening parameter
+	float max_radius;	// Only influence particles within max_radius
+	
+	ExecMethod
+};
+
+struct PAOrbitPoint : public ParticleAction
+{
+	pVector center;		// Point to which particles are attracted
+	float magnitude;	// Scales acceleration
+	float epsilon;		// Softening parameter
+	float max_radius;	// Only influence particles within max_radius
+	
+	ExecMethod
+};
+
+struct PARandomAccel : public ParticleAction
+{
+	pDomain gen_acc;	// The domain of random accelerations.
+	
+	ExecMethod
+};
+
+struct PARandomDisplace : public ParticleAction
+{
+	pDomain gen_disp;	// The domain of random displacements.
+	
+	ExecMethod
+};
+
+struct PARandomVelocity : public ParticleAction
+{
+	pDomain gen_vel;	// The domain of random velocities.
+	
+	ExecMethod
+};
+
+struct PARestore : public ParticleAction
+{
+	float time_left;		// Time remaining until they should be in position.
+	
+	ExecMethod
+};
+
+struct PASink : public ParticleAction
+{
+	bool kill_inside;	// True to dispose of particles *inside* domain
+	pDomain position;	// Disposal region
+	
+	ExecMethod
+};
+
+struct PASinkVelocity : public ParticleAction
+{
+	bool kill_inside;	// True to dispose of particles with vel *inside* domain
+	pDomain velocity;	// Disposal region
+	
+	ExecMethod
+};
+
+struct PASpeedLimit : public ParticleAction
+{
+	float min_speed;		// Clamp speed to this minimum.
+	float max_speed;		// Clamp speed to this maximum.
+	
+	ExecMethod
+};
+
+struct PASource : public ParticleAction
+{
+	pDomain position;	// Choose a position in this domain.
+	pDomain positionB;	// Choose a positionB in this domain.
+	pDomain size;		// Choose a size in this domain.
+	pDomain velocity;	// Choose a velocity in this domain.
+	pDomain color;		// Choose a color in this domain.
+	float alpha;		// Alpha of all generated particles
+	float particle_rate;	// Particles to generate per unit time
+	float age;			// Initial age of the particles
+	float age_sigma;	// St. dev. of initial age of the particles
+	bool vertexB_tracks;	// True to get positionB from position.
+	
+	ExecMethod
+};
+
+struct PATargetColor : public ParticleAction
+{
+	pVector color;		// Color to shift towards
+	float alpha;		// Alpha value to shift towards
+	float scale;		// Amount to shift by (1 == all the way)
+	
+	ExecMethod
+};
+
+struct PATargetSize : public ParticleAction
+{
+	pVector size;		// Size to shift towards
+	pVector scale;		// Amount to shift by per frame (1 == all the way)
+	
+	ExecMethod
+};
+
+struct PATargetVelocity : public ParticleAction
+{
+	pVector velocity;	// Velocity to shift towards
+	float scale;		// Amount to shift by (1 == all the way)
+	
+	ExecMethod
+};
+
+struct PAVortex : public ParticleAction
+{
+	pVector center;		// Center of vortex
+	pVector axis;		// Axis around which vortex is applied
+	float magnitude;	// Scale for rotation around axis
+	float epsilon;		// Softening parameter
+	float max_radius;	// Only influence particles within max_radius
+	
+	ExecMethod
+};
+
+// Global state vector
+struct _ParticleState
+{
+	float dt;
+	bool in_call_list;
+	bool in_new_list;
+	bool vertexB_tracks;
+	
+	int group_id;
+	int list_id;
+	ParticleGroup *pgrp;
+	PAHeader *pact;
+	int tid; // Only used in the MP case, but always define it.
+	
+	// These are static because all threads access the same groups.
+	// All accesses to these should be locked.
+	static ParticleGroup **group_list;
+	static PAHeader **alist_list;
+	static int group_count;
+	static int alist_count;
+	
+	pDomain Size;
+	pDomain Vel;
+	pDomain VertexB;
+	pDomain Color;
+	float Alpha;
+	float Age;
+	float AgeSigma;
+	
+	_ParticleState();
+	
+	// Return an index into the list of particle groups where
+	// p_group_count groups can be added.
+	int GenerateGroups(int p_group_count);
+	int GenerateLists(int alist_count);
+	ParticleGroup *GetGroupPtr(int p_group_num);
+	PAHeader *GetListPtr(int action_list_num);
+};
+
+#ifdef PARTICLE_MP
+// All entry points call this to get their particle state.
+inline _ParticleState &_GetPState()
+{
+	// Returns a reference to the appropriate particle state.
+	extern _ParticleState &_GetPStateWithTID();
+	
+	return _GetPStateWithTID();
+}
+
+#else
+
+// All entry points call this to get their particle state.
+// For the non-MP case this is practically a no-op.
+inline _ParticleState &_GetPState()
+{
+	// This is the global state.
+	extern _ParticleState __ps;
+	
+	return __ps;
+}
+#endif
+
+// Just a silly little function.
+static inline float fsqr(float f) { return f * f; }
+
+#endif
diff --git a/main/source/particles/opengl.cpp b/main/source/particles/opengl.cpp
new file mode 100644
index 00000000..dd5438db
--- /dev/null
+++ b/main/source/particles/opengl.cpp
@@ -0,0 +1,149 @@
+// opengl.cpp
+//
+// Copyright 1998 by David K. McAllister
+//
+// This file implements the API calls that draw particle groups in OpenGL.
+
+#include "general.h"
+
+#ifdef WIN32
+// This is for something in gl.h.
+#include <windows.h>
+#endif
+
+#include <GL/gl.h>
+// XXX #include <iostream.h>
+
+// Emit OpenGL calls to draw the particles. These are drawn with
+// whatever primitive type the user specified(GL_POINTS, for
+// example). The color and radius are set per primitive, by default.
+// For GL_LINES, the other vertex of the line is the velocity vector.
+// XXX const_size is ignored.
+PARTICLEDLL_API void pDrawGroupp(int primitive, bool const_size, bool const_color)
+{
+	_ParticleState &_ps = _GetPState();
+
+	// Get a pointer to the particles in gp memory
+	ParticleGroup *pg = _ps.pgrp;
+
+	if(pg == NULL)
+		return; // ERROR
+	
+	if(pg->p_count < 1)
+		return;
+	
+	if(primitive == GL_POINTS)
+	{
+		glPushClientAttrib(GL_CLIENT_VERTEX_ARRAY_BIT);
+		glEnableClientState(GL_VERTEX_ARRAY);
+		if(!const_color)
+		{
+			glEnableClientState(GL_COLOR_ARRAY);
+			glColorPointer(4, GL_FLOAT, sizeof(Particle), &pg->list[0].color);
+		}
+		
+		glVertexPointer(3, GL_FLOAT, sizeof(Particle), &pg->list[0].pos);
+		glDrawArrays((GLenum)primitive, 0, pg->p_count);
+		glPopClientAttrib();
+		// XXX For E&S
+		glDisableClientState(GL_COLOR_ARRAY);
+	}
+	else
+	{
+		// Assume GL_LINES
+		glBegin((GLenum)primitive);
+		
+		if(!const_color)
+		{
+			for(int i = 0; i < pg->p_count; i++)
+			{
+				Particle &m = pg->list[i];
+				
+				// Warning: this depends on alpha following color in the Particle struct.
+				glColor4fv((GLfloat *)&m.color);
+				glVertex3fv((GLfloat *)&m.pos);
+				
+				// For lines, make a tail with the velocity vector's direction and
+				// a length of radius.
+				pVector tail = m.pos - m.vel;			
+				glVertex3fv((GLfloat *)&tail);
+			}
+		}
+		else
+		{
+			for(int i = 0; i < pg->p_count; i++)
+			{
+				Particle &m = pg->list[i];
+				glVertex3fv((GLfloat *)&m.pos);
+				
+				// For lines, make a tail with the velocity vector's direction and
+				// a length of radius.
+				pVector tail = m.pos - m.vel;			
+				glVertex3fv((GLfloat *)&tail);
+			}
+		}
+		glEnd();
+	}
+}
+
+PARTICLEDLL_API void pDrawGroupl(int dlist, bool const_size, bool const_color, bool const_rotation)
+{
+	_ParticleState &_ps = _GetPState();
+
+	// Get a pointer to the particles in gp memory
+	ParticleGroup *pg = _ps.pgrp;
+	if(pg == NULL)
+		return; // ERROR
+	
+	if(pg->p_count < 1)
+		return;
+
+	//if(const_color)
+	//	glColor4fv((GLfloat *)&pg->list[0].color);
+
+	for(int i = 0; i < pg->p_count; i++)
+	{
+		Particle &m = pg->list[i];
+
+		glPushMatrix();
+		glTranslatef(m.pos.x, m.pos.y, m.pos.z);
+
+		if(!const_size)
+			glScalef(m.size.x, m.size.y, m.size.z);
+		else
+			glScalef(pg->list[i].size.x, pg->list[i].size.y, pg->list[i].size.z);
+
+		// Expensive! A sqrt, cross prod and acos. Yow.
+		if(!const_rotation)
+		{
+			pVector vN(m.vel);
+			vN.normalize();
+			pVector voN(m.velB);
+			voN.normalize();
+
+			pVector biN;
+			if(voN.x == vN.x && voN.y == vN.y && voN.z == vN.z)
+				biN = pVector(0, 1, 0);
+			else
+				biN = vN ^ voN;
+			biN.normalize();
+
+			pVector N(vN ^ biN);
+
+			double M[16];
+			M[0] = vN.x;  M[4] = biN.x;  M[8] = N.x;  M[12] = 0;
+			M[1] = vN.y;  M[5] = biN.y;  M[9] = N.y;  M[13] = 0;
+			M[2] = vN.z;  M[6] = biN.z;  M[10] = N.z; M[14] = 0;
+			M[3] = 0;     M[7] = 0;      M[11] = 0;   M[15] = 1;
+			glMultMatrixd(M);
+		}
+
+		// Warning: this depends on alpha following color in the Particle struct.
+		if(!const_color)
+			glColor4fv((GLfloat *)&m.color);
+
+		glCallList(dlist);
+
+		glPopMatrix();
+	}
+}
diff --git a/main/source/particles/p_vector.h b/main/source/particles/p_vector.h
new file mode 100644
index 00000000..ef8c43bb
--- /dev/null
+++ b/main/source/particles/p_vector.h
@@ -0,0 +1,141 @@
+// p_vector.h - yet another vector class.
+//
+// Copyright 1997 by Jonathan P. Leech
+// Modifications Copyright 1997-1999 by David K. McAllister
+//
+// A simple 3D float vector class for internal use by the particle systems.
+
+#ifndef particle_vector_h
+#define particle_vector_h
+
+#include <math.h>
+
+#ifndef M_PI
+#define M_PI 3.1415926535897932384626433f
+#endif
+
+#ifdef WIN32
+#define drand48() (((float) rand())/((float) RAND_MAX))
+#define srand48(x) srand(x)
+
+// This is because their stupid compiler thinks it's smart.
+#define inline __forceinline
+#endif
+
+class pVector
+{
+public:
+	float x, y, z;
+	
+	inline pVector(float ax, float ay, float az) : x(ax), y(ay), z(az)
+	{
+		//x = ax; y = ay; z = az;
+	}
+	
+	inline pVector() {}
+	
+	inline float length() const
+	{
+		return sqrtf(x*x+y*y+z*z);
+	}
+	
+	inline float length2() const
+	{
+		return (x*x+y*y+z*z);
+	}
+	
+	inline float normalize()
+	{
+		float onel = 1.0f / sqrtf(x*x+y*y+z*z);
+		x *= onel;
+		y *= onel;
+		z *= onel;
+		
+		return onel;
+	}
+	
+	inline float operator*(const pVector &a) const
+	{
+		return x*a.x + y*a.y + z*a.z;
+	}
+	
+	inline pVector operator*(const float s) const
+	{
+		return pVector(x*s, y*s, z*s);
+	}
+	
+	inline pVector operator/(const float s) const
+	{
+		float invs = 1.0f / s;
+		return pVector(x*invs, y*invs, z*invs);
+	}
+	
+	inline pVector operator+(const pVector& a) const
+	{
+		return pVector(x+a.x, y+a.y, z+a.z);
+	}
+	
+	inline pVector operator-(const pVector& a) const
+	{
+		return pVector(x-a.x, y-a.y, z-a.z);
+	}
+	
+	inline pVector operator-()
+	{
+		x = -x;
+		y = -y;
+		z = -z;
+		return *this;
+	}
+	
+	inline pVector& operator+=(const pVector& a)
+	{
+		x += a.x;
+		y += a.y;
+		z += a.z;
+		return *this;
+	}
+	
+	inline pVector& operator-=(const pVector& a)
+	{
+		x -= a.x;
+		y -= a.y;
+		z -= a.z;
+		return *this;
+	}
+	
+	inline pVector& operator*=(const float a)
+	{
+		x *= a;
+		y *= a;
+		z *= a;
+		return *this;
+	}
+	
+	inline pVector& operator/=(const float a)
+	{
+		float b = 1.0f / a;
+		x *= b;
+		y *= b;
+		z *= b;
+		return *this;
+	}
+	
+	inline pVector& operator=(const pVector& a)
+	{
+		x = a.x;
+		y = a.y;
+		z = a.z;
+		return *this;
+	}
+	
+	inline pVector operator^(const pVector& b) const
+	{
+		return pVector(
+			y*b.z-z*b.y,
+			z*b.x-x*b.z,
+			x*b.y-y*b.x);
+	}
+};
+
+#endif
diff --git a/main/source/particles/papi.h b/main/source/particles/papi.h
new file mode 100644
index 00000000..8963bb10
--- /dev/null
+++ b/main/source/particles/papi.h
@@ -0,0 +1,201 @@
+// papi.h
+//
+// Copyright 1997-1998 by David K. McAllister
+// http://www.cs.unc.edu/~davemc/Particle
+//
+// Include this file in all applications that use the Particle System API.
+
+#ifndef _particle_api_h
+#define _particle_api_h
+
+#include <stdlib.h>
+
+// This is the major and minor version number of this release of the API.
+#define P_VERSION 120
+
+// added <<< cgc >>>
+#include "p_vector.h"
+#include "general.h"
+#include "particledefs.h"
+
+// State setting calls
+
+PARTICLEDLL_API void pColor(float red, float green, float blue, float alpha = 1.0f);
+
+PARTICLEDLL_API void pColorD(float alpha, PDomainEnum dtype,
+							 float a0 = 0.0f, float a1 = 0.0f, float a2 = 0.0f,
+							 float a3 = 0.0f, float a4 = 0.0f, float a5 = 0.0f,
+							 float a6 = 0.0f, float a7 = 0.0f, float a8 = 0.0f);
+
+PARTICLEDLL_API void pSize(float size_x, float size_y = 1.0f, float size_z = 1.0f);
+
+PARTICLEDLL_API void pSizeD(PDomainEnum dtype,
+						  float a0 = 0.0f, float a1 = 0.0f, float a2 = 0.0f,
+						  float a3 = 0.0f, float a4 = 0.0f, float a5 = 0.0f,
+						  float a6 = 0.0f, float a7 = 0.0f, float a8 = 0.0f);
+
+PARTICLEDLL_API void pStartingAge(float age, float sigma = 1.0f);
+
+PARTICLEDLL_API void pTimeStep(float new_dt);
+
+PARTICLEDLL_API void pVelocity(float x, float y, float z);
+
+PARTICLEDLL_API void pVelocityD(PDomainEnum dtype,
+								float a0 = 0.0f, float a1 = 0.0f, float a2 = 0.0f,
+								float a3 = 0.0f, float a4 = 0.0f, float a5 = 0.0f,
+								float a6 = 0.0f, float a7 = 0.0f, float a8 = 0.0f);
+
+PARTICLEDLL_API void pVertexB(float x, float y, float z);
+
+PARTICLEDLL_API void pVertexBD(PDomainEnum dtype,
+							  float a0 = 0.0f, float a1 = 0.0f, float a2 = 0.0f,
+							  float a3 = 0.0f, float a4 = 0.0f, float a5 = 0.0f,
+							  float a6 = 0.0f, float a7 = 0.0f, float a8 = 0.0f);
+
+PARTICLEDLL_API void pVertexBTracks(bool track_vertex = true);
+
+
+// Action List Calls
+
+PARTICLEDLL_API void pCallActionList(int action_list_num);
+
+PARTICLEDLL_API void pDeleteActionLists(int action_list_num, int action_list_count = 1);
+
+PARTICLEDLL_API void pEndActionList();
+
+PARTICLEDLL_API int pGenActionLists(int action_list_count = 1);
+
+PARTICLEDLL_API void pNewActionList(int action_list_num);
+
+
+// Particle Group Calls
+
+PARTICLEDLL_API ParticleGroup* pGetParticleGroupRef(int p_group_num);
+
+PARTICLEDLL_API void pCopyGroup(int p_src_group_num, int index = 0, int copy_count = P_MAXINT);
+
+PARTICLEDLL_API void pCurrentGroup(int p_group_num);
+
+PARTICLEDLL_API ParticleGroup* pGetCurrentGroup(void);
+
+PARTICLEDLL_API void pDeleteParticleGroups(int p_group_num, int p_group_count = 1);
+
+PARTICLEDLL_API void pDrawGroupl(int dlist, bool const_size = false,
+								 bool const_color = false, bool const_rotation = false);
+
+PARTICLEDLL_API void pDrawGroupp(int primitive, bool const_size = false,
+								 bool const_color = false);
+
+// Added <<< cgc >>>
+PARTICLEDLL_API void DrawGroupTriSplat(const pVector &view, const pVector &up, float size_scale = 1.0f, bool draw_tex=false, bool const_size=false, bool const_color=false);
+// end
+
+PARTICLEDLL_API int pGenParticleGroups(int p_group_count = 1, int max_particles = 0);
+
+PARTICLEDLL_API int pGetGroupCount();
+
+PARTICLEDLL_API int pGetParticles(int index, int count, float *position = NULL, float *color = NULL,
+								  float *vel = NULL, float *size = NULL, float *age = NULL);
+
+PARTICLEDLL_API int pSetMaxParticles(int max_count);
+
+
+// Actions
+
+PARTICLEDLL_API void pAvoid(float magnitude, float epsilon, float look_ahead, 
+							 PDomainEnum dtype,
+							 float a0 = 0.0f, float a1 = 0.0f, float a2 = 0.0f,
+							 float a3 = 0.0f, float a4 = 0.0f, float a5 = 0.0f,
+							 float a6 = 0.0f, float a7 = 0.0f, float a8 = 0.0f);
+
+PARTICLEDLL_API void pBounce(float friction, float resilience, float cutoff,
+							 PDomainEnum dtype,
+							 float a0 = 0.0f, float a1 = 0.0f, float a2 = 0.0f,
+							 float a3 = 0.0f, float a4 = 0.0f, float a5 = 0.0f,
+							 float a6 = 0.0f, float a7 = 0.0f, float a8 = 0.0f);
+
+PARTICLEDLL_API void pCopyVertexB(bool copy_pos = true, bool copy_vel = false);
+
+PARTICLEDLL_API void pDamping(float damping_x, float damping_y, float damping_z,
+							 float vlow = 0.0f, float vhigh = P_MAXFLOAT);
+
+PARTICLEDLL_API void pExplosion(float center_x, float center_y, float center_z, float velocity,
+				float magnitude, float stdev, float epsilon = P_EPS, float age = 0.0f);
+
+PARTICLEDLL_API void pFollow(float magnitude = 1.0f, float epsilon = P_EPS, float max_radius = P_MAXFLOAT);
+
+PARTICLEDLL_API void pGravitate(float magnitude = 1.0f, float epsilon = P_EPS, float max_radius = P_MAXFLOAT);
+
+PARTICLEDLL_API void pGravity(float dir_x, float dir_y, float dir_z);
+
+PARTICLEDLL_API void pJet(float center_x, float center_y, float center_z, float magnitude = 1.0f,
+						 float epsilon = P_EPS, float max_radius = P_MAXFLOAT);
+
+PARTICLEDLL_API void pKillOld(float age_limit, bool kill_less_than = false);
+
+PARTICLEDLL_API void pMatchVelocity(float magnitude = 1.0f, float epsilon = P_EPS,
+									float max_radius = P_MAXFLOAT);
+
+PARTICLEDLL_API void pMove();
+
+PARTICLEDLL_API void pOrbitLine(float p_x, float p_y, float p_z,
+							float axis_x, float axis_y, float axis_z, float magnitude = 1.0f,
+							float epsilon = P_EPS, float max_radius = P_MAXFLOAT);
+
+PARTICLEDLL_API void pOrbitPoint(float center_x, float center_y, float center_z,
+							 float magnitude = 1.0f, float epsilon = P_EPS,
+							 float max_radius = P_MAXFLOAT);
+
+PARTICLEDLL_API void pRandomAccel(PDomainEnum dtype,
+								 float a0 = 0.0f, float a1 = 0.0f, float a2 = 0.0f,
+								 float a3 = 0.0f, float a4 = 0.0f, float a5 = 0.0f,
+								 float a6 = 0.0f, float a7 = 0.0f, float a8 = 0.0f);
+
+PARTICLEDLL_API void pRandomDisplace(PDomainEnum dtype,
+									 float a0 = 0.0f, float a1 = 0.0f, float a2 = 0.0f,
+									 float a3 = 0.0f, float a4 = 0.0f, float a5 = 0.0f,
+									 float a6 = 0.0f, float a7 = 0.0f, float a8 = 0.0f);
+
+PARTICLEDLL_API void pRandomVelocity(PDomainEnum dtype,
+									 float a0 = 0.0f, float a1 = 0.0f, float a2 = 0.0f,
+									 float a3 = 0.0f, float a4 = 0.0f, float a5 = 0.0f,
+									 float a6 = 0.0f, float a7 = 0.0f, float a8 = 0.0f);
+
+PARTICLEDLL_API void pRestore(float time);
+
+PARTICLEDLL_API void pShade(float color_x, float color_y, float color_z,
+							float alpha, float scale);
+
+PARTICLEDLL_API void pSink(bool kill_inside, PDomainEnum dtype,
+						  float a0 = 0.0f, float a1 = 0.0f, float a2 = 0.0f,
+						  float a3 = 0.0f, float a4 = 0.0f, float a5 = 0.0f,
+						  float a6 = 0.0f, float a7 = 0.0f, float a8 = 0.0f);
+
+PARTICLEDLL_API void pSinkVelocity(bool kill_inside, PDomainEnum dtype,
+								  float a0 = 0.0f, float a1 = 0.0f, float a2 = 0.0f,
+								  float a3 = 0.0f, float a4 = 0.0f, float a5 = 0.0f,
+								  float a6 = 0.0f, float a7 = 0.0f, float a8 = 0.0f);
+
+PARTICLEDLL_API void pSource(float particle_rate, PDomainEnum dtype,
+							 float a0 = 0.0f, float a1 = 0.0f, float a2 = 0.0f,
+							 float a3 = 0.0f, float a4 = 0.0f, float a5 = 0.0f,
+							 float a6 = 0.0f, float a7 = 0.0f, float a8 = 0.0f);
+
+PARTICLEDLL_API void pSpeedLimit(float min_speed, float max_speed = P_MAXFLOAT);
+
+PARTICLEDLL_API void pTargetColor(float color_x, float color_y, float color_z,
+								 float alpha, float scale);
+
+PARTICLEDLL_API void pTargetSize(float size_x, float size_y, float size_z,
+								 float scale_x = 0.0f, float scale_y = 0.0f, float scale_z = 0.0f);
+
+PARTICLEDLL_API void pTargetVelocity(float vel_x, float vel_y, float vel_z, float scale);
+
+PARTICLEDLL_API void pVertex(float x, float y, float z);
+
+PARTICLEDLL_API void pVortex(float center_x, float center_y, float center_z,
+							 float axis_x, float axis_y, float axis_z,
+							 float magnitude = 1.0f, float epsilon = P_EPS,
+							 float max_radius = P_MAXFLOAT);
+
+#endif
diff --git a/main/source/particles/particledefs.h b/main/source/particles/particledefs.h
new file mode 100644
index 00000000..572b02ec
--- /dev/null
+++ b/main/source/particles/particledefs.h
@@ -0,0 +1,111 @@
+// general.h
+//
+// Copyright 1998 by David K. McAllister.
+//
+// This file implements the API calls that are not particle actions.
+
+#ifndef particledefs_h
+#define particledefs_h
+
+#include "p_vector.h"
+
+#ifdef WIN32
+#include <windows.h>
+
+// removed <<< cgc >>>
+//#ifdef PARTICLEDLL_EXPORTS
+//#define PARTICLEDLL_API __declspec(dllexport)
+//#else
+//#define PARTICLEDLL_API __declspec(dllimport)
+//#endif
+#define PARTICLEDLL_API extern "C"
+
+// removed <<< cgc >>>
+#else
+#define PARTICLEDLL_API
+#endif
+
+
+#ifdef _WIN32
+#pragma warning (disable:4244)
+#endif
+
+// Actually this must be < sqrt(MAXFLOAT) since we store this value squared.
+#define P_MAXFLOAT 1.0e16f
+
+#ifdef MAXINT
+#define P_MAXINT MAXINT
+#else
+#define P_MAXINT 0x7fffffff
+#endif
+
+#define P_EPS 1e-3f
+
+//////////////////////////////////////////////////////////////////////
+// Type codes for domains
+PARTICLEDLL_API enum PDomainEnum
+{
+	PDPoint = 0, // Single point
+	PDLine = 1, // Line segment
+	PDTriangle = 2, // Triangle
+	PDPlane = 3, // Arbitrarily-oriented plane
+	PDBox = 4, // Axis-aligned box
+	PDSphere = 5, // Sphere
+	PDCylinder = 6, // Cylinder
+	PDCone = 7, // Cone
+	PDBlob = 8, // Gaussian blob
+	PDDisc = 9, // Arbitrarily-oriented disc
+	PDRectangle = 10 // Rhombus-shaped planar region
+};
+
+// A single particle
+struct Particle
+{
+	pVector pos;
+	pVector posB;
+	pVector size;
+	pVector vel;
+	pVector velB;	// Used to compute binormal, normal, etc.
+	pVector color;	// Color must be next to alpha so glColor4fv works.
+	float alpha;	// This is both cunning and scary.
+	float age;
+};
+
+// A group of particles - Info and an array of Particles
+struct ParticleGroup
+{
+	int p_count;		// Number of particles currently existing.
+	int max_particles;	// Max particles allowed in group.
+	int particles_allocated; // Actual allocated size.
+	Particle list[1];	// Actually, num_particles in size
+	
+	inline void Remove(int i)
+	{
+		list[i] = list[--p_count];
+	}
+	
+	inline bool Add(const pVector &pos, const pVector &posB,
+		const pVector &size, const pVector &vel, const pVector &color,
+		const float alpha = 1.0f,
+		const float age = 0.0f)
+	{
+		if(p_count >= max_particles)
+			return false;
+		else
+		{
+			list[p_count].pos = pos;
+			list[p_count].posB = posB;
+			list[p_count].size = size;
+			list[p_count].vel = vel;
+			list[p_count].velB = vel;	// XXX This should be fixed.
+			list[p_count].color = color;
+			list[p_count].alpha = alpha;
+			list[p_count].age = age;
+			p_count++;
+			return true;
+		}
+	}
+};
+
+
+#endif
diff --git a/main/source/particles/particles.vcproj b/main/source/particles/particles.vcproj
new file mode 100644
index 00000000..4681c09d
--- /dev/null
+++ b/main/source/particles/particles.vcproj
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="particles"
+	SccProjectName=""
+	SccAuxPath=""
+	SccLocalPath=""
+	SccProvider="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)/"
+			IntermediateDirectory="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Release/particles.pch"
+				AssemblerListingLocation="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ObjectFile="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ProgramDataBaseFileName="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(SolutionDir)\lib\$(ConfigurationName)\particles.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)/"
+			IntermediateDirectory="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="$(SolutionDir)"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Debug/particles.pch"
+				AssemblerListingLocation="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ObjectFile="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ProgramDataBaseFileName="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(SolutionDir)\lib\$(ConfigurationName)\particles.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="action_api.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="actions.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="opengl.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="system.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="general.h">
+			</File>
+			<File
+				RelativePath="p_vector.h">
+			</File>
+			<File
+				RelativePath="papi.h">
+			</File>
+			<File
+				RelativePath="particledefs.h">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/main/source/particles/system.cpp b/main/source/particles/system.cpp
new file mode 100644
index 00000000..4dc10ae8
--- /dev/null
+++ b/main/source/particles/system.cpp
@@ -0,0 +1,908 @@
+// system.cpp
+//
+// Copyright 1998 by David K. McAllister.
+//
+// This file implements the API calls that are not particle actions.
+
+#include "general.h"
+
+#include <memory.h>
+
+// XXX
+//#include <iostream.h>
+// using namespace std;
+
+// <<< cgc >>> removed DllMain() because I'm linking statically
+// For Windows DLL.
+//#ifdef WIN32
+//BOOL APIENTRY DllMain( HANDLE hModule, 
+//                       DWORD  ul_reason_for_call, 
+//                       LPVOID lpReserved
+//					 )
+//{
+//    switch (ul_reason_for_call)
+//	{
+//		case DLL_PROCESS_ATTACH:
+//		case DLL_THREAD_ATTACH:
+//		case DLL_THREAD_DETACH:
+//		case DLL_PROCESS_DETACH:
+//			break;
+//    }
+//    return TRUE;
+//}
+//#endif
+
+// <<< cgc >>> added this pre-declaration
+extern void _pSendAction(ParticleAction *S, PActionEnum type, int size);
+
+float ParticleAction::dt;
+
+ParticleGroup **_ParticleState::group_list;
+PAHeader **_ParticleState::alist_list;
+int _ParticleState::group_count;
+int _ParticleState::alist_count;
+
+// This AutoCall struct allows for static initialization of the above shared variables.
+struct AutoCall
+{
+	AutoCall();
+};
+
+AutoCall::AutoCall()
+{
+	// The list of groups, etc.		
+	_ParticleState::group_list = new ParticleGroup *[16];
+	_ParticleState::group_count = 16;
+	_ParticleState::alist_list = new PAHeader *[16];
+	_ParticleState::alist_count = 16;
+	for(int i=0; i<16; i++)
+	{
+		_ParticleState::group_list[i] = NULL;
+		_ParticleState::alist_list[i] = NULL;
+	}
+}
+
+#ifdef PARTICLE_MP
+// This code is defined if we are compiling the library to be used on
+// multiple threads. We need to have each API call figure out which
+// _ParticleState belongs to it. We hash pointers to contexts in
+// _CtxHash. Whenever a TID is asked for but doesn't exist we create
+// it.
+
+#include <mpc.h>
+
+// XXX This hard limit should get fixed.
+int _CtxCount = 151;
+_ParticleState **_CtxHash = NULL;
+
+inline int _HashTID(int tid)
+{
+  return ((tid << 13) ^ ((tid >> 11) ^ tid)) % _CtxCount;
+}
+
+// Returns a reference to the appropriate particle state.
+_ParticleState &_GetPStateWithTID()
+{
+  int tid = mp_my_threadnum();
+
+  int ind = _HashTID(tid);
+
+  // cerr << tid << "->" << ind << endl;
+
+  // Check through the hash table and find it.
+  for(int i=ind; i<_CtxCount; i++)
+    if(_CtxHash[i] && _CtxHash[i]->tid == tid)
+      {
+	//#pragma critical
+	//cerr << tid << " => " << i << endl;
+	
+      return *_CtxHash[i];
+      }
+
+  for(i=0; i<ind; i++)
+    if(_CtxHash[i] && _CtxHash[i]->tid == tid)
+      return *_CtxHash[i];
+
+  // It didn't exist. It's a new context, so create it.
+  _ParticleState *psp = new _ParticleState();
+  psp->tid = tid;
+
+  // Find a place to put it.
+  for(i=ind; i<_CtxCount; i++)
+    if(_CtxHash[i] == NULL)
+      {
+	// #pragma critical
+	// cerr << "Stored " << tid << " at " << i << endl;
+	_CtxHash[i] = psp;
+	return *psp;
+      }
+
+  for(i=0; i<ind; i++)
+    if(_CtxHash[i] == NULL)
+      {
+	_CtxHash[i] = psp;
+	return *psp;
+      }
+
+  // We should never get here. The hash table got full.
+  exit(1);
+
+  // To appease warnings.
+  return *_CtxHash[0];
+}
+
+inline void _PLock()
+{
+  // XXX This implementation is specific to the #pragma parallel directives.
+  // cerr << "Getting lock.\n";
+  // mp_setlock();
+  // cerr << "Got lock.\n";
+}
+
+inline void _PUnLock()
+{
+  // XXX This implementation is specific to the #pragma parallel directives.
+  // cerr << "Giving lock.\n";
+  // mp_unsetlock();
+  // cerr << "Gave lock.\n";
+}
+
+#else
+// This is the global state.
+_ParticleState __ps;
+
+inline void _PLock()
+{
+}
+
+inline void _PUnLock()
+{
+}
+#endif
+
+_ParticleState::_ParticleState()
+{
+	in_call_list = false;
+	in_new_list = false;
+	vertexB_tracks = true;
+	
+	dt = 1.0f;
+	
+	group_id = -1;
+	list_id = -1;
+	pgrp = NULL;
+	pact = NULL;
+	tid = 0; // This will be filled in above if we're MP.
+	
+	Size = pDomain(PDPoint, 1.0f, 1.0f, 1.0f);
+	Vel = pDomain(PDPoint, 0.0f, 0.0f, 0.0f);
+	VertexB = pDomain(PDPoint, 0.0f, 0.0f, 0.0f);
+	Color = pDomain(PDPoint, 1.0f, 1.0f, 1.0f);
+	Alpha = 1.0f;
+	Age = 0.0f;
+	AgeSigma = 0.0f;
+}
+
+ParticleGroup *_ParticleState::GetGroupPtr(int p_group_num)
+{
+	if(p_group_num < 0)
+		return NULL; // IERROR
+
+	if(p_group_num >= group_count)
+		return NULL; // IERROR
+
+	return group_list[p_group_num];
+}
+
+PAHeader *_ParticleState::GetListPtr(int a_list_num)
+{
+	if(a_list_num < 0)
+		return NULL; // IERROR
+
+	if(a_list_num >= alist_count)
+		return NULL; // IERROR
+
+	return alist_list[a_list_num];
+}
+
+// Return an index into the list of particle groups where
+// p_group_count groups can be added.
+int _ParticleState::GenerateGroups(int p_group_count)
+{
+	int num_empty = 0;
+	int first_empty = -1;
+	
+	for(int i=0; i<group_count; i++)
+	{
+		if(group_list[i])
+		{
+			num_empty = 0;
+			first_empty = -1;
+		}
+		else
+		{
+			if(first_empty < 0)
+				first_empty = i;
+			num_empty++;
+			if(num_empty >= p_group_count)
+				return first_empty;
+		}
+	}
+	
+	// Couldn't find a big enough gap. Reallocate.
+	int new_count = 16 + group_count + p_group_count;
+	ParticleGroup **glist = new ParticleGroup *[new_count];
+	memcpy(glist, group_list, group_count * sizeof(void*));
+	for(i=group_count; i<new_count; i++)
+		glist[i] = NULL;
+	delete [] group_list;
+	group_list = glist;
+	group_count = new_count;
+	
+	return GenerateGroups(p_group_count);
+}
+
+// Return an index into the list of action lists where
+// list_count lists can be added.
+int _ParticleState::GenerateLists(int list_count)
+{
+	int num_empty = 0;
+	int first_empty = -1;
+	
+	for(int i=0; i<alist_count; i++)
+	{
+		if(alist_list[i])
+		{
+			num_empty = 0;
+			first_empty = -1;
+		}
+		else
+		{
+			if(first_empty < 0)
+				first_empty = i;
+			num_empty++;
+			if(num_empty >= list_count)
+				return first_empty;
+		}
+	}
+	
+	// Couldn't find a big enough gap. Reallocate.
+	int new_count = 16 + alist_count + list_count;
+	PAHeader **new_list = new PAHeader *[new_count];
+	memcpy(new_list, alist_list, alist_count * sizeof(void*));
+	for(i=list_count; i<new_count; i++)
+		new_list[i] = NULL;
+	delete [] alist_list;
+	alist_list = new_list;
+	alist_count = new_count;
+	
+	return GenerateLists(list_count);
+}
+
+////////////////////////////////////////////////////////
+// Auxiliary calls
+void _pCallActionList(ParticleAction *apa, int num_actions,
+					  ParticleGroup *pg)
+{
+	// All these require a particle group, so check for it.
+	if(pg == NULL)
+		return;
+	
+	PAHeader *pa = (PAHeader *)apa;
+	
+	// Step through all the actions in the action list.
+	for(int action = 0; action < num_actions; action++, pa++)
+	{
+		switch(pa->type)
+		{
+		case PAAvoidID:
+			((PAAvoid *)pa)->Execute(pg);
+			break;
+		case PABounceID:
+			((PABounce *)pa)->Execute(pg);
+			break;
+		case PACallActionListID:
+			((PACallActionList *)pa)->Execute(pg);
+			break;
+		case PACopyVertexBID:
+			((PACopyVertexB *)pa)->Execute(pg);
+			break;
+		case PADampingID:
+			((PADamping *)pa)->Execute(pg);
+			break;
+		case PAExplosionID:
+			((PAExplosion *)pa)->Execute(pg);
+			break;
+		case PAFollowID:
+			((PAFollow *)pa)->Execute(pg);
+			break;
+		case PAGravitateID:
+			((PAGravitate *)pa)->Execute(pg);
+			break;
+		case PAGravityID:
+			((PAGravity *)pa)->Execute(pg);
+			break;
+		case PAJetID:
+			((PAJet *)pa)->Execute(pg);
+			break;
+		case PAKillOldID:
+			((PAKillOld *)pa)->Execute(pg);
+			break;
+		case PAMatchVelocityID:
+			((PAMatchVelocity *)pa)->Execute(pg);
+			break;
+		case PAMoveID:
+			((PAMove *)pa)->Execute(pg);
+			break;
+		case PAOrbitLineID:
+			((PAOrbitLine *)pa)->Execute(pg);
+			break;
+		case PAOrbitPointID:
+			((PAOrbitPoint *)pa)->Execute(pg);
+			break;
+		case PARandomAccelID:
+			((PARandomAccel *)pa)->Execute(pg);
+			break;
+		case PARandomDisplaceID:
+			((PARandomDisplace *)pa)->Execute(pg);
+			break;
+		case PARandomVelocityID:
+			((PARandomVelocity *)pa)->Execute(pg);
+			break;
+		case PARestoreID:
+			((PARestore *)pa)->Execute(pg);
+			break;
+		case PASinkID:
+			((PASink *)pa)->Execute(pg);
+			break;
+		case PASinkVelocityID:
+			((PASinkVelocity *)pa)->Execute(pg);
+			break;
+		case PASourceID:
+			((PASource *)pa)->Execute(pg);
+			break;
+		case PASpeedLimitID:
+			((PASpeedLimit *)pa)->Execute(pg);
+			break;
+		case PATargetColorID:
+			((PATargetColor *)pa)->Execute(pg);
+			break;
+		case PATargetSizeID:
+			((PATargetSize *)pa)->Execute(pg);
+			break;
+		case PATargetVelocityID:
+			((PATargetVelocity *)pa)->Execute(pg);
+			break;
+		case PAVortexID:
+			((PAVortex *)pa)->Execute(pg);
+			break;
+		}
+	}
+}
+
+// Add the incoming action to the end of the current action list.
+void _pAddActionToList(ParticleAction *S, int size)
+{
+	_ParticleState &_ps = _GetPState();
+
+	if(!_ps.in_new_list)
+		return; // ERROR
+	
+	if(_ps.pact == NULL)
+		return; // ERROR
+	
+	if(_ps.list_id < 0)
+		return; // ERROR
+	
+	PAHeader *alist = _ps.pact;
+	
+	if(alist->actions_allocated <= alist->count)
+	{
+		// Must reallocate.
+		int new_alloc = 16 + alist->actions_allocated;
+		PAHeader *new_alist = new PAHeader[new_alloc];
+		memcpy(new_alist, alist, alist->count * sizeof(PAHeader));
+		
+		delete [] alist;
+		_ps.alist_list[_ps.list_id] = _ps.pact = alist = new_alist;
+		
+		alist->actions_allocated = new_alloc;
+	}
+	
+	// Now add it in.
+	memcpy(&alist[alist->count], S, size);
+	alist->count++;
+}
+
+////////////////////////////////////////////////////////
+// State setting calls
+
+PARTICLEDLL_API void pColor(float red, float green, float blue, float alpha)
+{
+	_ParticleState &_ps = _GetPState();
+
+	_ps.Alpha = alpha;
+	_ps.Color = pDomain(PDPoint, red, green, blue);
+}
+
+PARTICLEDLL_API void pColorD(float alpha, PDomainEnum dtype,
+			 float a0, float a1, float a2,
+			 float a3, float a4, float a5,
+			 float a6, float a7, float a8)
+{
+	_ParticleState &_ps = _GetPState();
+
+	_ps.Alpha = alpha;
+	_ps.Color = pDomain(dtype, a0, a1, a2, a3, a4, a5, a6, a7, a8);
+}
+
+PARTICLEDLL_API void pVelocity(float x, float y, float z)
+{
+	_ParticleState &_ps = _GetPState();
+
+	_ps.Vel = pDomain(PDPoint, x, y, z);
+}
+
+PARTICLEDLL_API void pVelocityD(PDomainEnum dtype,
+				float a0, float a1, float a2,
+				float a3, float a4, float a5,
+				float a6, float a7, float a8)
+{
+	_ParticleState &_ps = _GetPState();
+
+	_ps.Vel = pDomain(dtype, a0, a1, a2, a3, a4, a5, a6, a7, a8);
+}
+
+PARTICLEDLL_API void pVertexB(float x, float y, float z)
+{
+	_ParticleState &_ps = _GetPState();
+
+	_ps.VertexB = pDomain(PDPoint, x, y, z);
+}
+
+PARTICLEDLL_API void pVertexBD(PDomainEnum dtype,
+			   float a0, float a1, float a2,
+			   float a3, float a4, float a5,
+			   float a6, float a7, float a8)
+{
+	_ParticleState &_ps = _GetPState();
+
+	_ps.VertexB = pDomain(dtype, a0, a1, a2, a3, a4, a5, a6, a7, a8);
+}
+
+
+PARTICLEDLL_API void pVertexBTracks(bool trackVertex)
+{
+	_ParticleState &_ps = _GetPState();
+
+	_ps.vertexB_tracks = trackVertex;
+}
+
+PARTICLEDLL_API void pSize(float size_x, float size_y, float size_z)
+{
+	_ParticleState &_ps = _GetPState();
+
+	_ps.Size = pDomain(PDPoint, size_x, size_y, size_z);
+}
+
+PARTICLEDLL_API void pSizeD(PDomainEnum dtype,
+			   float a0, float a1, float a2,
+			   float a3, float a4, float a5,
+			   float a6, float a7, float a8)
+{
+	_ParticleState &_ps = _GetPState();
+
+	_ps.Size = pDomain(dtype, a0, a1, a2, a3, a4, a5, a6, a7, a8);
+}
+
+PARTICLEDLL_API void pStartingAge(float age, float sigma)
+{
+	_ParticleState &_ps = _GetPState();
+
+	_ps.Age = age;
+	_ps.AgeSigma = sigma;
+}
+
+PARTICLEDLL_API void pTimeStep(float newDT)
+{
+	_ParticleState &_ps = _GetPState();
+
+	_ps.dt = newDT;
+}
+
+////////////////////////////////////////////////////////
+// Action List Calls
+
+PARTICLEDLL_API int pGenActionLists(int action_list_count)
+{
+	_ParticleState &_ps = _GetPState();
+
+	if(_ps.in_new_list)
+		return -1; // ERROR
+	
+	_PLock();
+
+	int ind = _ps.GenerateLists(action_list_count);
+	
+	for(int i=ind; i<ind+action_list_count; i++)
+	{
+		_ps.alist_list[i] = new PAHeader[8];
+		_ps.alist_list[i]->actions_allocated = 8;
+		_ps.alist_list[i]->type = PAHeaderID;
+		_ps.alist_list[i]->count = 1;
+	}
+
+	_PUnLock();
+
+	return ind;
+}
+
+PARTICLEDLL_API void pNewActionList(int action_list_num)
+{
+	_ParticleState &_ps = _GetPState();
+
+	if(_ps.in_new_list)
+		return; // ERROR
+	
+	_ps.pact = _ps.GetListPtr(action_list_num);
+	
+	if(_ps.pact == NULL)
+		return; // ERROR
+	
+	_ps.list_id = action_list_num;
+	_ps.in_new_list = true;
+
+	// Remove whatever used to be in the list.
+	_ps.pact->count = 1;
+}
+
+PARTICLEDLL_API void pEndActionList()
+{
+	_ParticleState &_ps = _GetPState();
+
+	if(!_ps.in_new_list)
+		return; // ERROR
+	
+	_ps.in_new_list = false;
+	
+	_ps.pact = NULL;
+	_ps.list_id = -1;
+}
+
+PARTICLEDLL_API void pDeleteActionLists(int action_list_num, int action_list_count)
+{
+	_ParticleState &_ps = _GetPState();
+
+	if(_ps.in_new_list)
+		return; // ERROR
+
+	if(action_list_num < 0)
+		return; // ERROR
+
+	if(action_list_num + action_list_count > _ps.alist_count)
+		return; // ERROR
+
+	_PLock();
+
+	for(int i = action_list_num; i < action_list_num + action_list_count; i++)
+	{
+		if(_ps.alist_list[i])
+		{
+			delete [] _ps.alist_list[i];
+			_ps.alist_list[i] = NULL;
+		}
+		else
+		{
+			_PUnLock();
+			return; // ERROR
+		}
+	}
+
+	_PUnLock();
+}
+
+PARTICLEDLL_API void pCallActionList(int action_list_num)
+{
+	_ParticleState &_ps = _GetPState();
+
+	if(_ps.in_new_list)
+	{
+		// Add this call as an action to the current list.
+		// <<< cgc >>> commented out predeclaration
+		//void _pSendAction(ParticleAction *S, PActionEnum type, int size);
+
+		PACallActionList S;
+		S.action_list_num = action_list_num;
+		
+		_pSendAction(&S, PACallActionListID, sizeof(PACallActionList));
+	}
+	else
+	{
+		// Execute the specified action list.
+		PAHeader *pa = _ps.GetListPtr(action_list_num);
+		
+		if(pa == NULL)
+			return; // ERRROR
+		
+		// XXX A temporary hack.
+		pa->dt = _ps.dt;
+		
+		_ps.in_call_list = true;
+		
+		_pCallActionList(pa+1, pa->count-1, _ps.pgrp);
+		
+		_ps.in_call_list = false;
+	}
+}
+
+////////////////////////////////////////////////////////
+// Particle Group Calls
+
+// Create particle groups, each with max_particles allocated.
+PARTICLEDLL_API int pGenParticleGroups(int p_group_count, int max_particles)
+{
+	_ParticleState &_ps = _GetPState();
+
+	if(_ps.in_new_list)
+		return -1; // ERROR
+
+	_PLock();
+	// cerr << "Generating pg " << _ps.tid << " cnt= " << max_particles << endl;
+
+	int ind = _ps.GenerateGroups(p_group_count);
+	
+	for(int i=ind; i<ind+p_group_count; i++)
+	{
+		_ps.group_list[i] = (ParticleGroup *)new
+			Particle[max_particles + 2];
+		_ps.group_list[i]->max_particles = max_particles;
+		_ps.group_list[i]->particles_allocated = max_particles;
+		_ps.group_list[i]->p_count = 0;
+	}
+
+	_PUnLock();
+	
+	return ind;
+}
+
+PARTICLEDLL_API void pDeleteParticleGroups(int p_group_num, int p_group_count)
+{
+	_ParticleState &_ps = _GetPState();
+
+	if(p_group_num < 0)
+		return; // ERROR
+
+	if(p_group_num + p_group_count > _ps.group_count)
+		return; // ERROR
+	
+	_PLock();
+
+	for(int i = p_group_num; i < p_group_num + p_group_count; i++)
+	{
+		if(_ps.group_list[i])
+		{
+			delete [] _ps.group_list[i];
+			_ps.group_list[i] = NULL;
+		}
+		else
+		  {
+		  	_PUnLock();
+			return; // ERROR
+		  }
+	}
+
+	_PUnLock();
+}
+
+// Change which group is current.
+PARTICLEDLL_API void pCurrentGroup(int p_group_num)
+{
+	_ParticleState &_ps = _GetPState();
+
+	if(_ps.in_new_list)
+		return; // ERROR
+	
+	_ps.pgrp = _ps.GetGroupPtr(p_group_num);
+	if(_ps.pgrp)
+		_ps.group_id = p_group_num;
+	else
+		_ps.group_id = -1;
+}
+
+PARTICLEDLL_API ParticleGroup* pGetCurrentGroup(void)
+{
+	_ParticleState &_ps = _GetPState();
+	ParticleGroup *pg = _ps.pgrp;
+	return pg;
+}
+
+// Change the maximum number of particles in the current group.
+PARTICLEDLL_API int pSetMaxParticles(int max_count)
+{
+	_ParticleState &_ps = _GetPState();
+
+	if(_ps.in_new_list)
+		return 0; // ERROR
+	
+	ParticleGroup *pg = _ps.pgrp;
+	if(pg == NULL)
+		return 0; // ERROR
+	
+	if(max_count < 0)
+		return 0; // ERROR
+
+	// Reducing max.
+	if(pg->particles_allocated >= max_count)
+	{
+		pg->max_particles = max_count;
+
+		// May have to kill particles.
+		if(pg->p_count > pg->max_particles)
+			pg->p_count = pg->max_particles;
+
+		return max_count;
+	}
+
+	_PLock();
+	
+	// Allocate particles.
+	ParticleGroup *pg2 =(ParticleGroup *)new Particle[max_count + 2];
+	if(pg2 == NULL)
+	{
+		// Not enough memory. Just give all we've got.
+		// ERROR
+		pg->max_particles = pg->particles_allocated;
+
+		_PUnLock();
+		
+		return pg->max_particles;
+	}
+	
+	memcpy(pg2, pg, (pg->p_count + 2) * sizeof(Particle));
+	
+	delete [] pg;
+	
+	_ps.group_list[_ps.group_id] = _ps.pgrp = pg2;
+	pg2->max_particles = max_count;
+	pg2->particles_allocated = max_count;
+
+	_PUnLock();
+
+	return max_count;
+}
+
+// Copy from the specified group to the current group.
+PARTICLEDLL_API void pCopyGroup(int p_src_group_num, int index, int copy_count)
+{
+	_ParticleState &_ps = _GetPState();
+
+	if(_ps.in_new_list)
+		return; // ERROR
+	
+	ParticleGroup *srcgrp = _ps.GetGroupPtr(p_src_group_num);
+	if(srcgrp == NULL)
+		return; // ERROR
+
+	ParticleGroup *destgrp = _ps.pgrp;
+	if(destgrp == NULL)
+		return; // ERROR
+
+	// Find out exactly how many to copy.
+	int ccount = copy_count;
+	if(ccount > srcgrp->p_count - index)
+		ccount = srcgrp->p_count - index;
+	if(ccount > destgrp->max_particles - destgrp->p_count)
+		ccount = destgrp->max_particles - destgrp->p_count;
+
+	// #pragma critical
+	// cerr << p_src_group_num << ": " << ccount << " " << srcgrp->p_count << " " << index << endl;
+
+	if(ccount<0)
+	  ccount = 0;
+
+	// Directly copy the particles to the current list.
+	for(int i=0; i<ccount; i++)
+	{
+		destgrp->list[destgrp->p_count+i] =
+			srcgrp->list[index+i];
+	}
+	destgrp->p_count += ccount;
+}
+
+PARTICLEDLL_API ParticleGroup* pGetParticleGroupRef(int p_group_num)
+{
+	ParticleGroup* theGroup = NULL;
+
+	_ParticleState &_ps = _GetPState();
+
+	if(!_ps.in_new_list)
+	{	
+		theGroup = _ps.GetGroupPtr(p_group_num);
+	}
+	return theGroup;
+}
+
+// Copy from the current group to application memory.
+PARTICLEDLL_API int pGetParticles(int index, int count, float *verts,
+				  float *color, float *vel, float *size, float *age)
+{
+	_ParticleState &_ps = _GetPState();
+
+	// XXX I should think about whether color means color3, color4, or what.
+	// For now, it means color4.
+
+	if(_ps.in_new_list)
+		return -1; // ERROR
+		
+	ParticleGroup *pg = _ps.pgrp;
+	if(pg == NULL)
+		return -2; // ERROR
+
+	if(index < 0 || count < 0)
+		return -3; // ERROR
+
+	if(index + count > pg->p_count)
+	  {
+	    count = pg->p_count - index;
+	    if(count <= 0)
+	      return -4; // ERROR index out of bounds.
+	  }
+
+	int vi = 0, ci = 0, li = 0, si = 0, ai = 0;
+
+	// This could be optimized.
+	for(int i=0; i<count; i++)
+	{
+		Particle &m = pg->list[index + i];
+
+		if(verts)
+		{
+			verts[vi++] = m.pos.x;
+			verts[vi++] = m.pos.y;
+			verts[vi++] = m.pos.z;
+		}
+
+		if(color)
+		{
+			color[ci++] = m.color.x;
+			color[ci++] = m.color.y;
+			color[ci++] = m.color.z;
+			color[ci++] = m.alpha;
+		}
+
+		if(vel)
+		{
+			vel[li++] = m.vel.x;
+			vel[li++] = m.vel.y;
+			vel[li++] = m.vel.z;
+		}
+
+		if(size)
+		{
+			size[si++] = m.size.x;
+			size[si++] = m.size.y;
+			size[si++] = m.size.z;
+		}
+
+		if(age)
+		{
+			age[ai++] = m.age;
+		}
+	}
+
+	return count;
+}
+
+// Returns the number of particles currently in the group.
+PARTICLEDLL_API int pGetGroupCount()
+{
+	_ParticleState &_ps = _GetPState();
+
+	if(_ps.in_new_list)
+		return 0; // ERROR
+	
+	if(_ps.pgrp == NULL)
+		return 0; // ERROR
+
+	return _ps.pgrp->p_count;
+}
diff --git a/main/source/pm_shared/pm_debug.cpp b/main/source/pm_shared/pm_debug.cpp
new file mode 100644
index 00000000..c5c88ccc
--- /dev/null
+++ b/main/source/pm_shared/pm_debug.cpp
@@ -0,0 +1,322 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+#include "mathlib.h"
+#include "const.h"
+#include "usercmd.h"
+#include "pm_defs.h"
+#include "pm_shared.h"
+#include "pm_movevars.h"
+#include "pm_debug.h"
+#include "util/MathUtil.h"
+
+#include <string.h>
+
+#pragma warning(disable : 4244)
+#pragma warning(disable : 4305)
+
+extern playermove_t *pmove;
+
+// Expand debugging BBOX particle hulls by this many units.
+#define BOX_GAP 0.0f               
+
+int PM_boxpnt[6][4] =
+{
+	{ 0, 4, 6, 2 }, // +X
+	{ 0, 1, 5, 4 }, // +Y
+	{ 0, 2, 3, 1 }, // +Z
+	{ 7, 5, 1, 3 }, // -X
+	{ 7, 3, 2, 6 }, // -Y
+	{ 7, 6, 4, 5 }, // -Z
+};	
+
+void PM_ShowClipBox( void )
+{
+#if defined( _DEBUG )
+	vec3_t org;
+	vec3_t offset = { 0, 0, 0 };
+	
+	if ( !pmove->runfuncs )
+		return;
+	
+	// More debugging, draw the particle bbox for player and for the entity we are looking directly at.
+	//  aslo prints entity info to the console overlay.
+	//if ( !pmove->server )
+	//	return;
+	
+	// Draw entity in center of view
+	// Also draws the normal to the clip plane that intersects our movement ray.  Leaves a particle
+	//  trail at the intersection point.
+	PM_ViewEntity();
+	
+	VectorCopy( pmove->origin, org );
+	
+	if ( pmove->server )
+	{
+		VectorAdd( org, offset, org );
+	}
+	else
+	{
+		VectorSubtract( org, offset, org );
+	}
+	
+	// Show our BBOX in particles.
+	PM_DrawBBox( pmove->player_mins[pmove->usehull], pmove->player_maxs[pmove->usehull], org, pmove->server ? 132 : 0, 0.1 );
+	
+	PM_ParticleLine( org, org, pmove->server ? 132 : 0, 0.1, 5.0 );
+	/*
+	{
+	int i;
+	for ( i = 0; i < pmove->numphysent; i++ )
+	{
+	if ( pmove->physents[ i ].info >= 1 && pmove->physents[ i ].info <= 4 )
+	{
+	PM_DrawBBox( pmove->player_mins[pmove->usehull], pmove->player_maxs[pmove->usehull], pmove->physents[i].origin, 132, 0.1 );
+	}
+	}
+	}
+	*/
+#endif
+}
+
+/*
+===============
+PM_ParticleLine(vec3_t start, vec3_t end, int color, float life)
+
+================
+*/
+void PM_ParticleLine(vec3_t start, vec3_t end, int pcolor, float life, float vert)
+{
+	float linestep = 2.0f;
+	float curdist;
+	float len;
+	vec3_t curpos;
+	vec3_t diff;
+	int i;
+	// Determine distance;
+
+	VectorSubtract(end, start, diff);
+	
+	len = VectorNormalize(diff);
+
+	curdist = 0;
+	while (curdist <= len)
+	{
+		for (i = 0; i < 3; i++)
+			curpos[i] = start[i] + curdist * diff[i];
+		
+		pmove->PM_Particle( curpos, pcolor, life, 0, vert);
+		curdist += linestep;
+	}
+
+}
+
+/*
+================
+PM_DrawRectangle(vec3_t tl, vec3_t br)
+
+================
+*/
+void PM_DrawRectangle(vec3_t tl, vec3_t bl, vec3_t tr, vec3_t br, int pcolor, float life)
+{
+	PM_ParticleLine(tl, bl, pcolor, life, 0);
+	PM_ParticleLine(bl, br, pcolor, life, 0);
+	PM_ParticleLine(br, tr, pcolor, life, 0);
+	PM_ParticleLine(tr, tl, pcolor, life, 0);
+}
+
+/*
+================
+PM_DrawPhysEntBBox(int num)
+
+================
+*/
+void PM_DrawPhysEntBBox(int num, int pcolor, float life)
+{
+	physent_t *pe;
+	vec3_t org;
+	int j;
+	vec3_t tmp;
+	vec3_t		p[8];
+	float gap = BOX_GAP;
+	vec3_t modelmins, modelmaxs;
+
+	if (num >= pmove->numphysent ||
+		num <= 0)
+		return;
+
+	pe = &pmove->physents[num];
+
+	if (pe->model)
+	{
+		VectorCopy(pe->origin, org);
+
+		pmove->PM_GetModelBounds( pe->model, modelmins, modelmaxs );
+		for (j = 0; j < 8; j++)
+		{
+			tmp[0] = (j & 1) ? modelmins[0] - gap : modelmaxs[0] + gap;
+			tmp[1] = (j & 2) ? modelmins[1] - gap : modelmaxs[1] + gap;
+			tmp[2] = (j & 4) ? modelmins[2] - gap : modelmaxs[2] + gap;
+
+			VectorCopy(tmp, p[j]);
+		}
+
+		// If the bbox should be rotated, do that
+		if (pe->angles[0] || pe->angles[1] || pe->angles[2])
+		{
+			vec3_t	forward, right, up;
+
+			AngleVectorsTranspose(pe->angles, forward, right, up);
+			for (j = 0; j < 8; j++)
+			{
+				VectorCopy(p[j], tmp);
+				p[j][0] = DotProduct  ( tmp, forward );
+				p[j][1] = DotProduct ( tmp, right );
+				p[j][2] = DotProduct  ( tmp, up );
+			}
+		}
+
+		// Offset by entity origin, if any.
+		for (j = 0; j < 8; j++)
+			VectorAdd(p[j], org, p[j]);
+
+		for (j = 0; j < 6; j++)
+		{
+			PM_DrawRectangle(
+				p[PM_boxpnt[j][1]],
+				p[PM_boxpnt[j][0]],
+				p[PM_boxpnt[j][2]],
+				p[PM_boxpnt[j][3]],
+				pcolor, life);
+		}
+	}
+	else
+	{
+		for (j = 0; j < 8; j++)
+		{
+			tmp[0] = (j & 1) ? pe->mins[0] : pe->maxs[0];
+			tmp[1] = (j & 2) ? pe->mins[1] : pe->maxs[1];
+			tmp[2] = (j & 4) ? pe->mins[2] : pe->maxs[2];
+
+			VectorAdd(tmp, pe->origin, tmp);
+			VectorCopy(tmp, p[j]);
+		}
+
+		for (j = 0; j < 6; j++)
+		{
+			PM_DrawRectangle(
+				p[PM_boxpnt[j][1]],
+				p[PM_boxpnt[j][0]],
+				p[PM_boxpnt[j][2]],
+				p[PM_boxpnt[j][3]],
+				pcolor, life);
+		}
+
+	}
+}
+
+/*
+================
+PM_DrawBBox(vec3_t mins, vec3_t maxs, vec3_t origin, int pcolor, float life)
+
+================
+*/
+void PM_DrawBBox(vec3_t mins, vec3_t maxs, vec3_t origin, int pcolor, float life)
+{
+	int j;
+	
+	vec3_t tmp;
+	vec3_t		p[8];
+	float gap = BOX_GAP;
+
+	for (j = 0; j < 8; j++)
+	{
+		tmp[0] = (j & 1) ? mins[0] - gap : maxs[0] + gap;
+		tmp[1] = (j & 2) ? mins[1] - gap : maxs[1] + gap ;
+		tmp[2] = (j & 4) ? mins[2] - gap : maxs[2] + gap ;
+
+		VectorAdd(tmp, origin, tmp);
+		VectorCopy(tmp, p[j]);
+	}
+
+	for (j = 0; j < 6; j++)
+	{
+		PM_DrawRectangle(
+			p[PM_boxpnt[j][1]],
+			p[PM_boxpnt[j][0]],
+			p[PM_boxpnt[j][2]],
+			p[PM_boxpnt[j][3]],
+			pcolor, life);
+	}
+}
+
+
+#ifndef DEDICATED
+
+/*
+================
+PM_ViewEntity
+
+Shows a particle trail from player to entity in crosshair.
+Shows particles at that entities bbox
+
+Tries to shoot a ray out by about 128 units.
+================
+*/
+void PM_ViewEntity( void )
+{
+	vec3_t forward, right, up;
+	float raydist = 256.0f;
+	vec3_t origin;
+	vec3_t end;
+	int i;
+	pmtrace_t trace;
+	int pcolor = 77;
+	float fup;
+
+#if 0
+	if ( !pm_showclip.value )
+		return;
+#endif
+
+	AngleVectors (pmove->angles, forward, right, up);  // Determine movement angles
+
+	VectorCopy( pmove->origin, origin);
+
+	fup = 0.5*( pmove->player_mins[pmove->usehull][2] + pmove->player_maxs[pmove->usehull][2] );
+	fup += pmove->view_ofs[2];
+	fup -= 4;
+
+	for (i = 0; i < 3; i++)
+	{
+		end[i] = origin[i] + raydist * forward[i];
+	}
+
+	//trace = pmove->PM_PlayerTrace( origin, end, PM_STUDIO_BOX, -1 );
+	trace = pmove->PM_PlayerTrace( origin, end, PM_NORMAL, -1 );
+
+	if (trace.ent > 0)  // Not the world
+	{
+		pcolor = 111;
+	}
+	
+	// Draw the hull or bbox.
+	if (trace.ent > 0)
+	{
+		PM_DrawPhysEntBBox(trace.ent, pcolor, 0.3f);
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/pm_shared/pm_debug.h b/main/source/pm_shared/pm_debug.h
new file mode 100644
index 00000000..8ff8b4b5
--- /dev/null
+++ b/main/source/pm_shared/pm_debug.h
@@ -0,0 +1,38 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#ifndef PM_DEBUG_H
+#define PM_DEBUG_H
+#pragma once
+
+#include "types.h"
+
+void PM_ViewEntity( void );
+void PM_DrawBBox(vec3_t mins, vec3_t maxs, vec3_t origin, int pcolor, float life);
+void PM_ParticleLine(vec3_t start, vec3_t end, int pcolor, float life, float vert);
+void PM_ShowClipBox( void );
+
+class DebugPoint
+{
+public:
+	DebugPoint() :x(0), y(0), z(0), mSize(5) { };
+	DebugPoint(float inX, float inY, float inZ, int inSize = 5) : x(inX), y(inY), z(inZ), mSize(inSize) {}
+	float x, y, z;
+	int mSize;
+};
+
+typedef vector< DebugPoint >		DebugPointListType;
+typedef vector<int>					DebugEntityListType;
+
+#endif // PMOVEDBG_H
diff --git a/main/source/pm_shared/pm_defs.h b/main/source/pm_shared/pm_defs.h
new file mode 100644
index 00000000..7bf01121
--- /dev/null
+++ b/main/source/pm_shared/pm_defs.h
@@ -0,0 +1,222 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+// pm_defs.h
+#if !defined( PM_DEFSH )
+#define PM_DEFSH
+#pragma once
+
+#define	MAX_PHYSENTS 600 		  // Must have room for all entities in the world.
+#define MAX_MOVEENTS 64
+#define	MAX_CLIP_PLANES	5
+
+#define PM_NORMAL			0x00000000
+#define PM_STUDIO_IGNORE	0x00000001		// Skip studio models
+#define PM_STUDIO_BOX		0x00000002		// Use boxes for non-complex studio models (even in traceline)
+#define PM_GLASS_IGNORE		0x00000004		// Ignore entities with non-normal rendermode
+#define PM_WORLD_ONLY		0x00000008		// Only trace against the world
+
+// Values for flags parameter of PM_TraceLine
+#define PM_TRACELINE_ANYVISIBLE		0
+#define PM_TRACELINE_PHYSENTSONLY	1
+
+#include "pm_info.h"
+
+// PM_PlayerTrace results.
+#include "pmtrace.h"
+
+#if !defined ( USERCMD_H )
+#include "usercmd.h"
+#endif
+
+// physent_t
+typedef struct physent_s
+{
+	char			name[32];             // Name of model, or "player" or "world".
+	int				player;
+	vec3_t			origin;               // Model's origin in world coordinates.
+	struct model_s	*model;		          // only for bsp models
+	struct model_s	*studiomodel;         // SOLID_BBOX, but studio clip intersections.
+	vec3_t			mins, maxs;	          // only for non-bsp models
+	int				info;		          // For client or server to use to identify (index into edicts or cl_entities)
+	vec3_t			angles;               // rotated entities need this info for hull testing to work.
+
+	int				solid;				  // Triggers and func_door type WATER brushes are SOLID_NOT
+	int				skin;                 // BSP Contents for such things like fun_door water brushes.
+	int				rendermode;			  // So we can ignore glass
+	
+	// Complex collision detection.
+	float			frame;
+	int				sequence;
+	byte			controller[4];
+	byte			blending[2];
+
+	int				movetype;
+	int				takedamage;
+	int				blooddecal;
+	int				team;
+	int				classnumber;
+
+	// For mods
+	int				iuser1;
+	int				iuser2;
+	int				iuser3;
+	int				iuser4;
+	float			fuser1;
+	float			fuser2;
+	float			fuser3;
+	float			fuser4;
+	vec3_t			vuser1;
+	vec3_t			vuser2;
+	vec3_t			vuser3;
+	vec3_t			vuser4;
+} physent_t;
+
+typedef struct playermove_s playermove_t;
+
+struct playermove_s
+{
+	int				player_index;  // So we don't try to run the PM_CheckStuck nudging too quickly.
+	qboolean		server;        // For debugging, are we running physics code on server side?
+
+	qboolean		multiplayer;   // 1 == multiplayer server
+	float			time;          // realtime on host, for reckoning duck timing
+	float			frametime;	   // Duration of this frame
+
+	vec3_t			forward, right, up; // Vectors for angles
+	// player state
+	vec3_t			origin;        // Movement origin.
+	vec3_t			angles;        // Movement view angles.
+	vec3_t			oldangles;     // Angles before movement view angles were looked at.
+	vec3_t			velocity;      // Current movement direction.
+	vec3_t			movedir;       // For waterjumping, a forced forward velocity so we can fly over lip of ledge.
+	vec3_t			basevelocity;  // Velocity of the conveyor we are standing, e.g.
+	
+	// For ducking/dead
+	vec3_t			view_ofs;      // Our eye position.
+	float			flDuckTime;    // Time we started duck
+	qboolean		bInDuck;       // In process of ducking or ducked already?
+	
+	// For walking/falling
+	int				flTimeStepSound;  // Next time we can play a step sound
+	int				iStepLeft;
+
+	float			flFallVelocity;
+	vec3_t			punchangle;
+
+	float			flSwimTime;
+
+	float			flNextPrimaryAttack;
+
+	int				effects;		// MUZZLE FLASH, e.g.
+
+	int				flags;         // FL_ONGROUND, FL_DUCKING, etc.
+	int				usehull;       // 0 = regular player hull, 1 = ducked player hull, 2 = point hull
+	float			gravity;       // Our current gravity and friction.
+	float			friction;
+	int				oldbuttons;    // Buttons last usercmd
+	float			waterjumptime; // Amount of time left in jumping out of water cycle.
+	qboolean		dead;          // Are we a dead player?
+	int				deadflag;
+	int				spectator;     // Should we use spectator physics model?
+	int				movetype;      // Our movement type, NOCLIP, WALK, FLY
+
+	int				onground;
+	int				waterlevel;
+	int				watertype;
+	int				oldwaterlevel;
+
+	char			sztexturename[256];
+	char			chtexturetype;
+
+	float			maxspeed;
+	float			clientmaxspeed; // Player specific maxspeed
+
+	// For mods
+	int				iuser1;
+	int				iuser2;
+	int				iuser3;
+	int				iuser4;
+	float			fuser1;
+	float			fuser2;
+	float			fuser3;
+	float			fuser4;
+	vec3_t			vuser1;
+	vec3_t			vuser2;
+	vec3_t			vuser3;
+	vec3_t			vuser4;
+	// world state
+	// Number of entities to clip against.
+	int				numphysent;    
+	physent_t		physents[MAX_PHYSENTS];
+	// Number of momvement entities (ladders)
+	int				nummoveent;
+	// just a list of ladders
+	physent_t		moveents[MAX_MOVEENTS];	
+
+	// All things being rendered, for tracing against things you don't actually collide with
+	int				numvisent;
+	physent_t		visents[ MAX_PHYSENTS ];
+
+	// input to run through physics.
+	usercmd_t		cmd;
+
+	// Trace results for objects we collided with.
+	int				numtouch;
+	pmtrace_t		touchindex[MAX_PHYSENTS];
+
+	char			physinfo[ MAX_PHYSINFO_STRING ]; // Physics info string
+
+	struct movevars_s *movevars;
+	vec3_t player_mins[ 4 ];
+	vec3_t player_maxs[ 4 ];
+	
+	// Common functions
+	const char		*(*PM_Info_ValueForKey) ( const char *s, const char *key );
+	void			(*PM_Particle)( float *origin, int color, float life, int zpos, int zvel);
+	int				(*PM_TestPlayerPosition) (float *pos, pmtrace_t *ptrace );
+	void			(*Con_NPrintf)( int idx, char *fmt, ... );
+	void			(*Con_DPrintf)( char *fmt, ... );
+	void			(*Con_Printf)( char *fmt, ... );
+	double			(*Sys_FloatTime)( void );
+	void			(*PM_StuckTouch)( int hitent, pmtrace_t *ptraceresult );
+	int				(*PM_PointContents) (float *p, int *truecontents /*filled in if this is non-null*/ );
+	int				(*PM_TruePointContents) (float *p);
+	int				(*PM_HullPointContents) ( struct hull_s *hull, int num, float *p);   
+	pmtrace_t		(*PM_PlayerTrace) (float *start, float *end, int traceFlags, int ignore_pe );
+	struct pmtrace_s *(*PM_TraceLine)( float *start, float *end, int flags, int usehulll, int ignore_pe );
+	long			(*RandomLong)( long lLow, long lHigh );
+	float			(*RandomFloat)( float flLow, float flHigh );
+	int				(*PM_GetModelType)( struct model_s *mod );
+	void			(*PM_GetModelBounds)( struct model_s *mod, float *mins, float *maxs );
+	void			*(*PM_HullForBsp)( physent_t *pe, float *offset );
+	float			(*PM_TraceModel)( physent_t *pEnt, float *start, float *end, trace_t *trace );
+	int				(*COM_FileSize)(char *filename);
+	byte			*(*COM_LoadFile) (char *path, int usehunk, int *pLength);
+	void			(*COM_FreeFile) ( void *buffer );
+	char			*(*memfgets)( byte *pMemFile, int fileSize, int *pFilePos, char *pBuffer, int bufferSize );
+
+	// Functions
+	// Run functions for this frame?
+	qboolean		runfuncs;      
+	void			(*PM_PlaySound) ( int channel, const char *sample, float volume, float attenuation, int fFlags, int pitch );
+	const char		*(*PM_TraceTexture) ( int ground, float *vstart, float *vend );
+	void			(*PM_PlaybackEventFull) ( int flags, int clientindex, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 );
+	
+	pmtrace_t		(*PM_PlayerTraceEx) (float *start, float *end, int traceFlags, int (*pfnIgnore)( physent_t *pe ) );
+	int				(*PM_TestPlayerPositionEx) (float *pos, pmtrace_t *ptrace, int (*pfnIgnore)( physent_t *pe ) );
+	struct pmtrace_s *(*PM_TraceLineEx)( float *start, float *end, int flags, int usehulll, int (*pfnIgnore)( physent_t *pe ) );
+};
+
+#endif
diff --git a/main/source/pm_shared/pm_info.h b/main/source/pm_shared/pm_info.h
new file mode 100644
index 00000000..dcfce839
--- /dev/null
+++ b/main/source/pm_shared/pm_info.h
@@ -0,0 +1,22 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+// Physics info string definition
+#if !defined( PM_INFOH )
+#define PM_INFOH
+#pragma once
+
+#define MAX_PHYSINFO_STRING 256
+
+#endif // PM_INFOH
diff --git a/main/source/pm_shared/pm_materials.h b/main/source/pm_shared/pm_materials.h
new file mode 100644
index 00000000..e402f0a7
--- /dev/null
+++ b/main/source/pm_shared/pm_materials.h
@@ -0,0 +1,33 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+#if !defined( PM_MATERIALSH )
+#define PM_MATERIALSH
+#pragma once
+
+#define CBTEXTURENAMEMAX	13			// only load first n chars of name
+
+#define CHAR_TEX_CONCRETE	'C'			// texture types
+#define CHAR_TEX_METAL		'M'
+#define CHAR_TEX_DIRT		'D'
+#define CHAR_TEX_VENT		'V'
+#define CHAR_TEX_GRATE		'G'
+#define CHAR_TEX_TILE		'T'
+#define CHAR_TEX_SLOSH		'S'
+#define CHAR_TEX_WOOD		'W'
+#define CHAR_TEX_COMPUTER	'P'
+#define CHAR_TEX_GLASS		'Y'
+#define CHAR_TEX_FLESH		'F'
+
+#endif // !PM_MATERIALSH
diff --git a/main/source/pm_shared/pm_math.cpp b/main/source/pm_shared/pm_math.cpp
new file mode 100644
index 00000000..b7efc90a
--- /dev/null
+++ b/main/source/pm_shared/pm_math.cpp
@@ -0,0 +1,304 @@
+/***
+*
+*	Copyright (c) 1999, 2000, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+// pm_math.c -- math primitives
+
+#include "mathlib.h"
+#include "const.h"
+#include <math.h>
+#include "util/MathUtil.h"
+
+float AngleBetweenVectors( float * v1, float * v2 );
+void InterpolateAngles( float *start, float *end, float *output, float frac );
+
+// up / down
+#define	PITCH	0
+// left / right
+#define	YAW		1
+// fall over
+#define	ROLL	2 
+
+#pragma warning(disable : 4244)
+
+vec3_t vec3_origin = {0,0,0};
+int nanmask = 255<<23;
+
+float	anglemod(float a)
+{
+	a = (360.0/65536) * ((int)(a*(65536/360.0)) & 65535);
+	return a;
+}
+
+void AngleVectors (const vec3_t angles, vec3_t forward, vec3_t right, vec3_t up)
+{
+	float		angle;
+	float		sr, sp, sy, cr, cp, cy;
+	
+	angle = angles[YAW] * (M_PI*2 / 360);
+	sy = sin(angle);
+	cy = cos(angle);
+	angle = angles[PITCH] * (M_PI*2 / 360);
+	sp = sin(angle);
+	cp = cos(angle);
+	angle = angles[ROLL] * (M_PI*2 / 360);
+	sr = sin(angle);
+	cr = cos(angle);
+
+	if (forward)
+	{
+		forward[0] = cp*cy;
+		forward[1] = cp*sy;
+		forward[2] = -sp;
+	}
+	if (right)
+	{
+		right[0] = (-1*sr*sp*cy+-1*cr*-sy);
+		right[1] = (-1*sr*sp*sy+-1*cr*cy);
+		right[2] = -1*sr*cp;
+	}
+	if (up)
+	{
+		up[0] = (cr*sp*cy+-sr*-sy);
+		up[1] = (cr*sp*sy+-sr*cy);
+		up[2] = cr*cp;
+	}
+}
+
+void AngleVectorsTranspose (const vec3_t angles, vec3_t forward, vec3_t right, vec3_t up)
+{
+	float		angle;
+	float		sr, sp, sy, cr, cp, cy;
+	
+	angle = angles[YAW] * (M_PI*2 / 360);
+	sy = sin(angle);
+	cy = cos(angle);
+	angle = angles[PITCH] * (M_PI*2 / 360);
+	sp = sin(angle);
+	cp = cos(angle);
+	angle = angles[ROLL] * (M_PI*2 / 360);
+	sr = sin(angle);
+	cr = cos(angle);
+
+	if (forward)
+	{
+		forward[0]	= cp*cy;
+		forward[1]	= (sr*sp*cy+cr*-sy);
+		forward[2]	= (cr*sp*cy+-sr*-sy);
+	}
+	if (right)
+	{
+		right[0]	= cp*sy;
+		right[1]	= (sr*sp*sy+cr*cy);
+		right[2]	= (cr*sp*sy+-sr*cy);
+	}
+	if (up)
+	{
+		up[0]		= -sp;
+		up[1]		= sr*cp;
+		up[2]		= cr*cp;
+	}
+}
+
+
+void AngleIMatrix (const vec3_t angles, float matrix[3][4] )
+{
+	float		angle;
+	float		sr, sp, sy, cr, cp, cy;
+	
+	angle = angles[YAW] * (M_PI*2 / 360);
+	sy = sin(angle);
+	cy = cos(angle);
+	angle = angles[PITCH] * (M_PI*2 / 360);
+	sp = sin(angle);
+	cp = cos(angle);
+	angle = angles[ROLL] * (M_PI*2 / 360);
+	sr = sin(angle);
+	cr = cos(angle);
+
+	// matrix = (YAW * PITCH) * ROLL
+	matrix[0][0] = cp*cy;
+	matrix[0][1] = cp*sy;
+	matrix[0][2] = -sp;
+	matrix[1][0] = sr*sp*cy+cr*-sy;
+	matrix[1][1] = sr*sp*sy+cr*cy;
+	matrix[1][2] = sr*cp;
+	matrix[2][0] = (cr*sp*cy+-sr*-sy);
+	matrix[2][1] = (cr*sp*sy+-sr*cy);
+	matrix[2][2] = cr*cp;
+	matrix[0][3] = 0.0;
+	matrix[1][3] = 0.0;
+	matrix[2][3] = 0.0;
+}
+
+void NormalizeAngles( float *angles )
+{
+	int i;
+	// Normalize angles
+	for ( i = 0; i < 3; i++ )
+	{
+		if ( angles[i] > 180.0 )
+		{
+			angles[i] -= 360.0;
+		}
+		else if ( angles[i] < -180.0 )
+		{
+			angles[i] += 360.0;
+		}
+	}
+}
+
+/*
+===================
+InterpolateAngles
+
+Interpolate Euler angles.
+FIXME:  Use Quaternions to avoid discontinuities
+Frac is 0.0 to 1.0 ( i.e., should probably be clamped, but doesn't have to be )
+===================
+*/
+void InterpolateAngles( float *start, float *end, float *output, float frac )
+{
+	int i;
+	float ang1, ang2;
+	float d;
+	
+	NormalizeAngles( start );
+	NormalizeAngles( end );
+
+	for ( i = 0 ; i < 3 ; i++ )
+	{
+		ang1 = start[i];
+		ang2 = end[i];
+
+		d = ang2 - ang1;
+		if ( d > 180 )
+		{
+			d -= 360;
+		}
+		else if ( d < -180 )
+		{	
+			d += 360;
+		}
+
+		output[i] = ang1 + d * frac;
+	}
+
+	NormalizeAngles( output );
+} 
+
+/*
+===================
+AngleBetweenVectors
+
+===================
+*/
+float AngleBetweenVectors( float* v1, float* v2 )
+{
+	float angle;
+	float l1 = Length( v1 );
+	float l2 = Length( v2 );
+
+	if ( !l1 || !l2 )
+		return 0.0f;
+
+	angle = acos( DotProduct( v1, v2 ) ) / (l1*l2);
+	angle = ( angle  * 180.0f ) / M_PI;
+
+	return angle;
+}
+
+void VectorTransform (const vec3_t in1, float in2[3][4], vec3_t out)
+{
+	out[0] = DotProduct(in1, in2[0]) + in2[0][3];
+	out[1] = DotProduct(in1, in2[1]) + in2[1][3];
+	out[2] = DotProduct(in1, in2[2]) + in2[2][3];
+}
+
+
+int VectorCompare (const vec3_t v1, const vec3_t v2)
+{
+	int		i;
+	
+	for (i=0 ; i<3 ; i++)
+		if (v1[i] != v2[i])
+			return 0;
+			
+	return 1;
+}
+
+vec_t _DotProduct (vec3_t v1, vec3_t v2)
+{
+	return v1[0]*v2[0] + v1[1]*v2[1] + v1[2]*v2[2];
+}
+
+void _VectorSubtract (vec3_t veca, vec3_t vecb, vec3_t out)
+{
+	out[0] = veca[0]-vecb[0];
+	out[1] = veca[1]-vecb[1];
+	out[2] = veca[2]-vecb[2];
+}
+
+void _VectorAdd (vec3_t veca, vec3_t vecb, vec3_t out)
+{
+	out[0] = veca[0]+vecb[0];
+	out[1] = veca[1]+vecb[1];
+	out[2] = veca[2]+vecb[2];
+}
+
+void _VectorCopy (vec3_t in, vec3_t out)
+{
+	out[0] = in[0];
+	out[1] = in[1];
+	out[2] = in[2];
+}
+
+void CrossProduct (const vec3_t v1, const vec3_t v2, vec3_t cross)
+{
+	cross[0] = v1[1]*v2[2] - v1[2]*v2[1];
+	cross[1] = v1[2]*v2[0] - v1[0]*v2[2];
+	cross[2] = v1[0]*v2[1] - v1[1]*v2[0];
+}
+
+double sqrt(double x);
+
+int Q_log2(int val)
+{
+	int answer=0;
+	while (val>>=1)
+		answer++;
+	return answer;
+}
+
+void VectorMatrix( vec3_t forward, vec3_t right, vec3_t up)
+{
+	vec3_t tmp;
+
+	if (forward[0] == 0 && forward[1] == 0)
+	{
+		right[0] = 1;	
+		right[1] = 0; 
+		right[2] = 0;
+		up[0] = -forward[2]; 
+		up[1] = 0; 
+		up[2] = 0;
+		return;
+	}
+
+	tmp[0] = 0; tmp[1] = 0; tmp[2] = 1.0;
+	CrossProduct( forward, tmp, right );
+	VectorNormalize( right );
+	CrossProduct( right, forward, up );
+	VectorNormalize( up );
+}
+
diff --git a/main/source/pm_shared/pm_movevars.h b/main/source/pm_shared/pm_movevars.h
new file mode 100644
index 00000000..61bfd05d
--- /dev/null
+++ b/main/source/pm_shared/pm_movevars.h
@@ -0,0 +1,40 @@
+// pm_movevars.h
+#if !defined( PM_MOVEVARSH )
+#define PM_MOVEVARSH
+
+// movevars_t                  // Physics variables.
+typedef struct movevars_s movevars_t;
+
+struct movevars_s
+{
+	float	gravity;           // Gravity for map
+	float	stopspeed;         // Deceleration when not moving
+	float	maxspeed;          // Max allowed speed
+	float	spectatormaxspeed;
+	float	accelerate;        // Acceleration factor
+	float	airaccelerate;     // Same for when in open air
+	float	wateraccelerate;   // Same for when in water
+	float	friction;          
+	float   edgefriction;	   // Extra friction near dropofs 
+	float	waterfriction;     // Less in water
+	float	entgravity;        // 1.0
+	float   bounce;            // Wall bounce value. 1.0
+	float   stepsize;          // sv_stepsize;
+	float   maxvelocity;       // maximum server velocity.
+	float	zmax;			   // Max z-buffer range (for GL)
+	float	waveHeight;		   // Water wave height (for GL)
+	qboolean footsteps;        // Play footstep sounds
+	char	skyName[32];	   // Name of the sky map
+	float	rollangle;
+	float	rollspeed;
+	float	skycolor_r;			// Sky color
+	float	skycolor_g;			// 
+	float	skycolor_b;			//
+	float	skyvec_x;			// Sky vector
+	float	skyvec_y;			// 
+	float	skyvec_z;			// 
+};
+
+extern movevars_t movevars;
+
+#endif
\ No newline at end of file
diff --git a/main/source/pm_shared/pm_shared.cpp b/main/source/pm_shared/pm_shared.cpp
new file mode 100644
index 00000000..f99643e4
--- /dev/null
+++ b/main/source/pm_shared/pm_shared.cpp
@@ -0,0 +1,6893 @@
+//  Copyright (c) 1999, Valve LLC. All rights reserved.
+//  
+//  This product contains software technology licensed from Id 
+//  Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+//  All Rights Reserved.
+//
+//  Use, distribution, and modification of this source code and/or resulting
+//  object code is restricted to non-commercial enhancements to products from
+//  Valve LLC.  All other use, distribution, or modification is prohibited
+//  without written permission from Valve LLC.
+//
+//
+// $Workfile: pm_shared.cpp $
+// $Date: 2002/10/24 21:20:28 $
+//
+//-------------------------------------------------------------------------------
+// $Log: pm_shared.cpp,v $
+// Revision 1.39  2002/10/24 21:20:28  Flayra
+// - Reworked jetpack effect
+// - Extended spectating distance
+// - Only play blink effect once
+// - Update alien energy in shared code
+//
+// Revision 1.38  2002/10/18 22:16:51  Flayra
+// - Level5 crouching fix
+// - Skulks can't use ladders
+//
+// Revision 1.37  2002/10/16 20:50:28  Flayra
+// - Updated onos footsteps with new sound
+//
+// Revision 1.36  2002/10/16 00:42:55  Flayra
+// - Removed blink fail event
+//
+// Revision 1.35  2002/10/03 18:30:31  Flayra
+// - Moved alien energy to fuser3
+// - Flying/ladder fix (lerks can't use them)
+// - When players are frozen, don't allow them to press buttons either
+//
+// Revision 1.34  2002/09/25 20:41:45  Flayra
+// - Removed marine strafing slowdown
+//
+// Revision 1.33  2002/09/23 22:05:58  Flayra
+// - Added code for rotation skulk model (removed it though)
+// - Removed inverse lighting for skulks
+// - Started to add speed abuse code, but realized the physics are inprecise and going over maxspeed is normal
+//
+// Revision 1.32  2002/09/09 19:45:30  Flayra
+// - Blink fixes, removed level 5 custom step size
+//
+// Revision 1.31  2002/08/16 02:28:03  Flayra
+// - Removed overwatch code
+// - Webs now prevent jumping and jetpacking
+//
+// Revision 1.30  2002/08/09 01:12:16  Flayra
+// - Turned on wall-climbing by default
+// - Tweaked jetpack physics
+// - Only update predicted player origin when runfuncs is true (fixes bug with flickering ghost unit in CM)
+//
+// Revision 1.29  2002/08/02 21:45:46  Flayra
+// - Fixed jetpack energy problem, moved wall-running back to duck
+//
+// Revision 1.28  2002/07/25 17:28:37  Flayra
+// - More linux changes
+//
+// Revision 1.27  2002/07/23 16:51:49  Flayra
+// - MrBlonde's fix for player shaking (not sure how well it works)
+//
+// Revision 1.26  2002/07/10 14:37:18  Flayra
+// - Removed large differing step-sizes (bug #255)
+//
+// Revision 1.25  2002/07/08 16:23:28  Flayra
+// - Added debug code to fix solidity problems, fixed commander/hera-landing-pad bug, added document header
+//
+//===============================================================================
+#include <assert.h>
+#include "mathlib.h"
+#include "const.h"
+#include "usercmd.h"
+#include "pm_defs.h"
+#include "pm_shared.h"
+#include "pm_movevars.h"
+#include "pm_debug.h"
+#include <stdio.h>  // NULL
+#include <math.h>   // sqrt
+#include <string.h> // strcpy
+#include <stdlib.h> // atoi
+#include <ctype.h>  // isspace
+#include "mod/AvHSpecials.h"
+#include "mod/AvHMarineEquipmentConstants.h"
+#include "mod/AvHMessage.h"
+#include "util/MathUtil.h"
+#include "util/Quat.h"
+#include "util/Mat3.h"
+#include "common/event_flags.h"
+#include "mod/AvHSoundConstants.h"
+#include "mod/AvHMovementUtil.h"
+#include "mod/AvHHulls.h"
+#include "mod/AvHAlienAbilityConstants.h"
+#include "mod/AvHAlienWeaponConstants.h"
+#include "mod/AvHMovementUtil.h"
+#include "mod/AvHMapExtents.h"
+#include "mod/AvHSharedMovementInfo.h"
+
+
+
+#include "common/const.h"
+#include "common/com_model.h"
+#include "common/mathlib.h"
+
+#include "mod/CollisionUtil.h"
+#include "mod/AvHBalance.h"
+
+#include "engine/studio.h"
+
+
+//#ifdef AVH_SERVER
+#include "engine/edict.h"
+#include "engine/eiface.h"
+#include "dlls/enginecallback.h"
+//#endif
+
+#ifdef AVH_SERVER
+void AvHSUAddDebugPoint(float inX, float inY, float inZ);
+#endif
+
+void AvHSHUGetFirstNonSolidPoint(float* inStartPos, float* inEndPos, float* outNonSolidPoint);
+bool AvHSHUGetCenterPositionForGroup(int inGroupNumber, float* inPlayerOrigin, float* outCenterPosition);
+
+#ifdef AVH_CLIENT
+////#include "cl_dll/cl_dll.h"
+////#include "cl_dll/hud.h"
+//#include "cl_dll/cl_util.h"
+//#include "cl_dll/cl_dll.h"
+#include "cl_dll/eventscripts.h"
+#endif
+
+float PM_GetDesiredTopDownCameraHeight(qboolean& outFoundEntity);
+qboolean PM_CanWalljump();
+qboolean PM_CanFlap();
+void PM_Overwatch();
+bool PM_TopDown();
+void PM_Jump(void);
+void PM_PreventMegaBunnyJumping(bool inIgnoreZ);
+bool GetIsEntityAPlayer(int inPhysIndex);
+
+#ifdef AVH_CLIENT
+#include "pm_shared/pm_debug.h"
+#include "..\common\hltv.h"
+void PM_DebugLocations();
+typedef vector< DebugPoint >        PositionListType;
+DebugPointListType                  gTriDebugLocations;
+DebugPointListType                  gSquareDebugLocations;
+DebugEntityListType                 gCubeDebugEntities;
+#endif
+
+//extern int gWallJumpEventID;
+//extern int gFlightEventID;
+
+extern int gJetpackEventID;
+extern int gBlinkEffectSuccessEventID;
+
+#define Vector vec3_t
+#include "mod/AvHSelectionHelper.h"
+
+int gHeightLevel = 0;
+
+const float kMarineBackpedalSpeedScalar = .4f;
+const float kMarineSidestepSpeedScalar = 1.0f;
+
+//physent_t* AvHSUGetEntity(int inPhysIndex);
+
+const AvHMapExtents& GetMapExtents();
+
+#ifdef AVH_CLIENT
+// Spectator Mode
+int     iJumpSpectator;
+float   vJumpOrigin[3];
+float   vJumpAngles[3];
+//float gTopDownHeight = 0;
+
+float   gTopDownViewOrigin[3];
+float   gTopDownViewAngles[3];
+//int       iHasNewViewOrigin = 0;
+//int       iHasNewViewAngles = 0;
+#endif
+
+static int pm_shared_initialized = 0;
+
+//void InterpolateAngles( float *start, float *end, float *output, float frac );
+    
+#pragma warning( disable : 4305 )
+
+
+playermove_t *pmove = NULL;
+
+extern "C"
+{
+    Vector  gPredictedPlayerOrigin;
+    Vector  gPredictedPlayerVOfs;
+}
+
+#ifdef AVH_CLIENT
+float gOverwatchTargetRange;
+#endif
+
+
+///////////////////////////////
+// Begin Max's Code
+///////////////////////////////     
+
+const float kSkulkRotationRate      = (float)(2.5 * M_PI);  // Radians per second.
+const float kSkulkRotationLookAhead = 75;
+
+// Distance around the skulk to look each in direction for wallsticking.
+const vec3_t kWallstickingDistanceCheck = { 5, 5, 5 };
+
+#ifdef AVH_CLIENT
+extern vec3_t gPlayerAngles;
+extern vec3_t gTargetPlayerAngles;
+extern vec3_t gWorldViewAngles;
+#endif
+
+///////////////////////////////
+// End Max's Code
+///////////////////////////////     
+
+// Ducking time
+#define TIME_TO_DUCK    (0.4 * 1000)
+//#define VEC_DUCK_HULL_MIN -18
+//#define VEC_DUCK_HULL_MAX 18
+//#define VEC_DUCK_VIEW     12
+#define PM_DEAD_VIEWHEIGHT  -8
+#define MAX_CLIMB_SPEED 120
+#define STUCK_MOVEUP 1
+#define STUCK_MOVEDOWN -1
+//#define VEC_HULL_MIN      -36
+//#define VEC_HULL_MAX      36
+//#define VEC_VIEW          28
+#define STOP_EPSILON    0.1
+
+#define CTEXTURESMAX        512         // max number of textures loaded
+#define CBTEXTURENAMEMAX    13          // only load first n chars of name
+
+#define CHAR_TEX_CONCRETE   'C'         // texture types
+#define CHAR_TEX_METAL      'M'
+#define CHAR_TEX_DIRT       'D'
+#define CHAR_TEX_VENT       'V'
+#define CHAR_TEX_GRATE      'G'
+#define CHAR_TEX_TILE       'T'
+#define CHAR_TEX_SLOSH      'S'
+#define CHAR_TEX_WOOD       'W'
+#define CHAR_TEX_COMPUTER   'P'
+#define CHAR_TEX_GLASS      'Y'
+#define CHAR_TEX_FLESH      'F'
+
+#define STEP_CONCRETE   0       // default step sound
+#define STEP_METAL      1       // metal floor
+#define STEP_DIRT       2       // dirt, sand, rock
+#define STEP_VENT       3       // ventillation duct
+#define STEP_GRATE      4       // metal grating
+#define STEP_TILE       5       // floor tiles
+#define STEP_SLOSH      6       // shallow liquid puddle
+#define STEP_WADE       7       // wading in liquid
+#define STEP_LADDER     8       // climbing ladder
+
+#define PLAYER_FATAL_FALL_SPEED     1024// approx 60 feet
+#define PLAYER_MAX_SAFE_FALL_SPEED  580// approx 20 feet
+#define DAMAGE_FOR_FALL_SPEED       (float) 100 / ( PLAYER_FATAL_FALL_SPEED - PLAYER_MAX_SAFE_FALL_SPEED )// damage per unit per second.
+#define PLAYER_MIN_BOUNCE_SPEED     200
+#define PLAYER_FALL_PENALTY_THRESHHOLD (float)200 // If player lands with this much speed or more, slow them down as penalty for jumping
+#define PLAYER_FALL_PUNCH_THRESHHOLD (float)350 // won't punch player's screen/make scrape noise unless player falling at least this fast.
+
+#define PLAYER_LONGJUMP_SPEED 350 // how fast we longjump
+
+const float kAlienEnergyFlap = .025f;
+
+// double to float warning
+#pragma warning(disable : 4244)
+#define max(a, b)  (((a) > (b)) ? (a) : (b))
+#define min(a, b)  (((a) < (b)) ? (a) : (b))
+// up / down
+#define PITCH   0
+// left / right
+#define YAW     1
+// fall over
+#define ROLL    2 
+
+#define MAX_CLIENTS 32
+
+#define CONTENTS_CURRENT_0      -9
+#define CONTENTS_CURRENT_90     -10
+#define CONTENTS_CURRENT_180    -11
+#define CONTENTS_CURRENT_270    -12
+#define CONTENTS_CURRENT_UP     -13
+#define CONTENTS_CURRENT_DOWN   -14
+
+#define CONTENTS_TRANSLUCENT    -15
+
+static vec3_t rgv3tStuckTable[54];
+static int rgStuckLast[MAX_CLIENTS][2];
+
+// Texture names
+static int gcTextures = 0;
+static char grgszTextureName[CTEXTURESMAX][CBTEXTURENAMEMAX];   
+static char grgchTextureType[CTEXTURESMAX];
+
+int     g_onladder[MAX_CLIENTS];
+bool    gIsJetpacking[MAX_CLIENTS];
+
+
+// Borrowed from Quake1.
+
+static  hull_t      box_hull;
+static  dclipnode_t box_clipnodes[6];
+static  mplane_t    box_planes[6];
+
+
+bool PM_GetIsBlinking()
+{
+    if (pmove->cmd.weaponselect == 255 || pmove->flags & FL_FAKECLIENT)
+    {
+        return (pmove->iuser3 == AVH_USER3_ALIEN_PLAYER4) && (pmove->cmd.impulse == ALIEN_ABILITY_BLINK);
+    }
+    return false;
+}
+
+bool PM_GetIsLeaping()
+{
+    if (pmove->cmd.weaponselect == 255 || pmove->flags & FL_FAKECLIENT)
+    {
+        return (pmove->iuser3 == AVH_USER3_ALIEN_PLAYER1) && (pmove->cmd.impulse == ALIEN_ABILITY_LEAP);
+    }
+    return false;
+}
+
+bool PM_GetIsCharging()
+{
+    if (pmove->cmd.weaponselect == 255 || pmove->flags & FL_FAKECLIENT)
+    {
+        return (pmove->cmd.impulse == ALIEN_ABILITY_CHARGE);
+    }
+    return false;
+}
+
+
+/*
+===================
+PM_InitBoxHull
+
+Set up the planes and clipnodes so that the six floats of a bounding box
+can just be stored out and get a proper hull_t structure.
+===================
+*/
+void PM_InitBoxHull (void)
+{
+    int     i;
+    int     side;
+
+    box_hull.clipnodes = box_clipnodes;
+    box_hull.planes = box_planes;
+    box_hull.firstclipnode = 0;
+    box_hull.lastclipnode = 5;
+
+    for (i=0 ; i<6 ; i++)
+    {
+        box_clipnodes[i].planenum = i;
+        
+        side = i&1;
+        
+        box_clipnodes[i].children[side] = CONTENTS_EMPTY;
+        if (i != 5)
+            box_clipnodes[i].children[side^1] = i + 1;
+        else
+            box_clipnodes[i].children[side^1] = CONTENTS_SOLID;
+
+    }
+    
+}
+
+
+/*
+===================
+PM_HullForBox
+
+To keep everything totally uniform, bounding boxes are turned into small
+BSP trees instead of being compared directly.
+===================
+*/
+hull_t* PM_HullForBox (vec3_t mins, vec3_t maxs)
+{
+
+    for (int i=0 ; i<6 ; i++)
+    {
+        
+        box_planes[i].type = i>>1;
+        
+        box_planes[i].normal[0] = 0;
+        box_planes[i].normal[1] = 0;
+        box_planes[i].normal[2] = 0;
+        box_planes[i].normal[i>>1] = 1;
+    
+    }
+
+    box_planes[0].dist = maxs[0];
+    box_planes[1].dist = mins[0];
+    box_planes[2].dist = maxs[1];
+    box_planes[3].dist = mins[1];
+    box_planes[4].dist = maxs[2];
+    box_planes[5].dist = mins[2];
+
+    return &box_hull;
+}
+
+
+void NS_DrawBoundingBox(const vec3_t mins,
+                        const vec3_t maxs,
+                        const vec3_t inEntityOrigin,
+                        const vec3_t inEntityAngles)
+{
+
+#ifdef AVH_SERVER
+
+    void PM_DrawRectangle(vec3_t tl, vec3_t bl, vec3_t tr, vec3_t br, int pcolor, float life);
+    extern int PM_boxpnt[6][4];
+
+    int pcolor = 132;
+    float plife = 0.1;
+
+	vec3_t tmp;
+	vec3_t		p[8];
+	float gap = 0;
+    int j;
+
+	for (j = 0; j < 8; j++)
+	{
+		tmp[0] = (j & 1) ? mins[0] - gap : maxs[0] + gap;
+		tmp[1] = (j & 2) ? mins[1] - gap : maxs[1] + gap;
+		tmp[2] = (j & 4) ? mins[2] - gap : maxs[2] + gap;
+
+		VectorCopy(tmp, p[j]);
+	}
+
+	// If the bbox should be rotated, do that
+	vec3_t	forward, right, up;
+
+	AngleVectorsTranspose(inEntityAngles, forward, right, up);
+	for (j = 0; j < 8; j++)
+	{
+		VectorCopy(p[j], tmp);
+		p[j][0] = DotProduct  ( tmp, forward );
+		p[j][1] = DotProduct ( tmp, right );
+		p[j][2] = DotProduct  ( tmp, up );
+	}
+
+	// Offset by entity origin, if any.
+	for (j = 0; j < 8; j++)
+		VectorAdd(p[j], inEntityOrigin, p[j]);
+
+	for (j = 0; j < 6; j++)
+	{
+		PM_DrawRectangle(
+			p[PM_boxpnt[j][1]],
+			p[PM_boxpnt[j][0]],
+			p[PM_boxpnt[j][2]],
+			p[PM_boxpnt[j][3]],
+			pcolor, plife);
+	}
+
+#endif
+
+}
+
+
+void NS_DrawBoundingBox(const OBBox& inBox)
+{
+
+    vec3_t theAngles;
+    VectorsToAngles(inBox.mAxis[1], inBox.mAxis[0], inBox.mAxis[2], theAngles);
+
+    vec3_t theMin;
+    VectorScale(inBox.mExtents, -1, theMin);
+
+    vec3_t theMax;
+    VectorCopy(inBox.mExtents, theMax);
+
+    NS_DrawBoundingBox(theMin, theMax, inBox.mOrigin, theAngles);
+
+}
+
+
+
+/**
+ * Computes the hull for an oriented bounding box.
+ */
+hull_t* NS_HullForBox(vec3_t inEntityMins, vec3_t inEntityMaxs,
+    vec3_t inEntityAngles, vec3_t inPlayerExtents)
+{
+
+    float thePlayerRadius = max(inPlayerExtents[0], inPlayerExtents[1]);
+
+    // Players "feel" too large so artificially shrink them relative to the
+    // structures.
+    thePlayerRadius *= 0.8; 
+    
+    vec3_t axis[3];
+    AngleVectors(inEntityAngles, axis[0], axis[1], axis[2]);
+
+    // For some reason the y-axis is negated so flip it.
+    
+    axis[1][0] = -axis[1][0];
+    axis[1][1] = -axis[1][1];
+    axis[1][2] = -axis[1][2];
+
+    for (int i = 0; i < 3; ++i)
+    {
+        
+        int p1 = i * 2;
+        int p2 = p1 + 1;
+        
+        vec3_t p;
+
+        // Compute the offset the planes to account for the size of the player.
+ 
+        /*
+        float offset = fabs(inPlayerExtents[0] * axis[i][0]) +
+                       fabs(inPlayerExtents[1] * axis[i][1]) +
+                       fabs(inPlayerExtents[2] * axis[i][2]);
+        */
+
+        // Use a cylindrical player instead of a square one.
+        float offset = thePlayerRadius;
+
+        // Positive plane.
+
+        VectorCopy(axis[i], box_planes[p1].normal);
+        VectorScale(box_planes[p1].normal, inEntityMaxs[i], p);
+
+        box_planes[p1].dist = DotProduct(p, box_planes[p1].normal) + offset;
+        box_planes[p1].type = 3; // Not axis aligned.
+
+        // Negative plane.
+
+        VectorCopy(axis[i], box_planes[p2].normal);
+        VectorScale(box_planes[p2].normal, inEntityMins[i], p);
+
+        box_planes[p2].dist = DotProduct(p, box_planes[p2].normal) - offset;
+        box_planes[p2].type = 3; // Not axis aligned.
+
+    }
+
+    return &box_hull;
+
+}
+
+
+bool NS_GetCollisionSizeForUser3(AvHUser3 inUser3, vec3_t outMinSize, vec3_t outMaxSize)
+{
+
+    switch (inUser3)
+    {
+    
+    case AVH_USER3_COMMANDER_STATION:
+        outMinSize[0] = -45;
+        outMinSize[1] = -16;
+        outMinSize[2] =  0;
+        outMaxSize[0] =  45;
+        outMaxSize[1] =  16;
+        outMaxSize[2] =  70.34;
+        return true;
+
+    case AVH_USER3_INFANTRYPORTAL:
+        outMinSize[0] = -25;
+        outMinSize[1] = -25;
+        outMinSize[2] =  0;
+        outMaxSize[0] =  25;
+        outMaxSize[1] =  25;
+        outMaxSize[2] =  5;
+        return true;
+	
+    case AVH_USER3_PHASEGATE:
+        outMinSize[0] = -55;
+        outMinSize[1] = -40;
+        outMinSize[2] =  0;
+        outMaxSize[0] =  40;
+        outMaxSize[1] =  50;
+        outMaxSize[2] =  14.49;
+        return true;
+
+    case AVH_USER3_ARMORY:
+    case AVH_USER3_ADVANCED_ARMORY:
+        outMinSize[0] = -20;
+        outMinSize[1] = -20;
+        outMinSize[2] =  0;
+        outMaxSize[0] =  20;
+        outMaxSize[1] =  20;
+        outMaxSize[2] =  62.1931;
+        return true;
+
+    case AVH_USER3_ARMSLAB:
+        outMinSize[0] = -30;
+        outMinSize[1] = -20;
+        outMinSize[2] =  0;
+        outMaxSize[0] =  30;
+        outMaxSize[1] =  20;
+        outMaxSize[2] =  60;
+        return true;
+
+    case AVH_USER3_PROTOTYPE_LAB:
+        outMinSize[0] = -16;
+        outMinSize[1] = -16;
+        outMinSize[2] =  0;
+        outMaxSize[0] =  16;
+        outMaxSize[1] =  16;
+        outMaxSize[2] =  67.7443;
+        return true;
+
+    case AVH_USER3_OBSERVATORY:
+        outMinSize[0] = -16;
+        outMinSize[1] = -16;
+        outMinSize[2] =  0;
+        outMaxSize[0] =  16;
+        outMaxSize[1] =  16;
+        outMaxSize[2] =  80.7443;
+        return true;
+
+        /*
+    case AVH_USER3_RESTOWER:
+        outMinSize[0] = -35;
+        outMinSize[1] = -35;
+        outMinSize[2] =  0;
+        outMaxSize[0] =  35;
+        outMaxSize[1] =  35;
+        outMaxSize[2] =  60;
+        return true;
+        */
+
+    case AVH_USER3_TURRET_FACTORY:
+    case AVH_USER3_ADVANCED_TURRET_FACTORY:
+	    outMinSize[0] = -40;
+        outMinSize[1] = -25;
+        outMinSize[2] =  0;
+        outMaxSize[0] =  40;
+        outMaxSize[1] =  25;
+        outMaxSize[2] =  50;
+        return true;
+
+    case AVH_USER3_TURRET:
+	    outMinSize[0] = -16;
+        outMinSize[1] = -16;
+        outMinSize[2] =  0;
+        outMaxSize[0] =  16;
+        outMaxSize[1] =  16;
+        outMaxSize[2] =  42;
+		return true;
+	
+    case AVH_USER3_SIEGETURRET:
+	    outMinSize[0] = -16;
+        outMinSize[1] = -16;
+        outMinSize[2] =  0;
+        outMaxSize[0] =  16;
+        outMaxSize[1] =  16;
+        outMaxSize[2] =  62.1931;
+		return true;
+
+    /*
+    case AVH_USER3_ALIENRESTOWER:
+        outMinSize[0] = -30;
+        outMinSize[1] = -35;
+        outMinSize[2] =  0;
+        outMaxSize[0] =  30;
+        outMaxSize[1] =  75;
+        outMaxSize[2] = 100;
+        return true;
+
+	case AVH_USER3_OFFENSE_CHAMBER:
+	case AVH_USER3_DEFENSE_CHAMBER:
+	case AVH_USER3_SENSORY_CHAMBER:
+	case AVH_USER3_MOVEMENT_CHAMBER:
+	    outMinSize[0] = -16;
+        outMinSize[1] = -16;
+        outMinSize[2] =  0;
+        outMaxSize[0] =  16;
+        outMaxSize[1] =  16;
+        outMaxSize[2] =  44;
+		return true;
+
+    case AVH_USER3_HIVE:
+	    outMinSize[0] = -50;
+        outMinSize[1] = -80;
+        outMinSize[2] = -145;
+        outMaxSize[0] =  50;
+        outMaxSize[1] =  80;
+        outMaxSize[2] =  50;
+        return true;
+    */
+
+    }
+    
+    return false;
+
+}
+
+void NS_GetClosestPlaneNormal(vec3_t inDirection, mplane_t inPlanes[], int inNumPlanes, vec3_t outNormal)
+{
+
+    VectorCopy(inDirection, outNormal);
+    float best = 0;
+
+    for (int i = 0; i < inNumPlanes; ++i)
+    {
+    
+        float d = fabs(DotProduct(inDirection, inPlanes[i].normal));
+
+        if (d >= best)
+        {
+            VectorCopy(inPlanes[i].normal, outNormal);
+            best = d;
+        }
+    
+    }
+
+}
+
+void NS_TraceLine(float* start, float* end, int hull, int traceFlags, int ignore_pe, bool ignorePlayers, trace_t& result)
+{
+
+    memset(&result, 0, sizeof(trace_t));
+    
+    result.fraction = 1;
+    result.ent      = NULL;
+    
+    VectorCopy(end, result.endpos);
+
+    int hullNumber = NS_GetValveHull(hull);
+
+    for (int i = 0; i < pmove->numphysent; ++i) //Elven - why is this ++i? could this be an off by 1 error?
+    {
+        if (i != ignore_pe && pmove->physents[i].solid != SOLID_NOT && (!ignorePlayers || !pmove->physents[i].player))
+        {
+
+            hull_t* hull = NULL;
+            bool    ignoreRotation = false;
+            
+            if (pmove->physents[i].model != NULL)
+            {
+                hull = &pmove->physents[i].model->hulls[hullNumber];
+            }
+            else if (!(traceFlags & PM_WORLD_ONLY))
+            {
+
+                vec3_t min;
+                vec3_t max;
+
+                VectorAdd(pmove->physents[i].mins, pmove->player_mins[pmove->usehull], min);
+                VectorAdd(pmove->physents[i].maxs, pmove->player_maxs[pmove->usehull], max);
+
+                vec3_t offset;
+                VectorAdd(pmove->physents[i].maxs, pmove->physents[i].mins, offset);
+
+                vec3_t center;
+                VectorMA(pmove->physents[i].origin, 0.5, offset, center);
+
+                vec3_t theEntityMins;
+                vec3_t theEntityMaxs;
+
+                if (NS_GetCollisionSizeForUser3((AvHUser3)pmove->physents[i].iuser3,
+                        theEntityMins, theEntityMaxs))
+                {
+
+                    vec3_t thePlayerExtents;
+                    VectorSubtract(pmove->player_maxs[hullNumber], pmove->player_mins[hullNumber], thePlayerExtents);
+                    VectorScale(thePlayerExtents, 0.5, thePlayerExtents);
+
+                    hull = NS_HullForBox(theEntityMins,
+                                         theEntityMaxs,
+                                         pmove->physents[i].angles,
+                                         thePlayerExtents);
+
+                    // We've already taken the rotation of the entity into account.
+                    ignoreRotation = true;                    
+                
+                }
+                else
+                {
+
+                    vec3_t min;
+                    vec3_t max;
+
+                    VectorAdd(pmove->physents[i].mins, pmove->player_mins[hullNumber], min);
+                    VectorAdd(pmove->physents[i].maxs, pmove->player_maxs[hullNumber], max);
+
+                    hull = PM_HullForBox(min, max);
+                
+                }
+
+            }
+
+            if (hull != NULL)
+            {
+                
+                vec3_t localStart;
+                vec3_t localEnd;
+
+                // Translate the start and end into the model's frame of reference.
+
+                VectorSubtract(start, pmove->physents[i].origin, localStart);
+                VectorSubtract(end, pmove->physents[i].origin, localEnd);
+
+                // Rotate the start and end into the model's frame of reference.
+
+                bool rotated;
+
+                if (pmove->physents[i].angles[0] ||
+                    pmove->physents[i].angles[1] ||
+                    pmove->physents[i].angles[2])
+                {
+                    rotated = !ignoreRotation;
+                }
+                else
+                {
+                    rotated = false;
+                }
+
+                vec3_t forward;
+                vec3_t right;
+                vec3_t up;
+
+                if (rotated)
+                {
+
+                    AngleVectors(pmove->physents[i].angles, forward, right, up);
+
+                    vec3_t temp;
+
+                    VectorCopy(localStart, temp);
+                    localStart[0] =  DotProduct(temp, forward);
+                    localStart[1] = -DotProduct(temp, right);
+                    localStart[2] =  DotProduct(temp, up);
+
+                    VectorCopy(localEnd, temp);
+                    localEnd[0] =  DotProduct(temp, forward);
+                    localEnd[1] = -DotProduct(temp, right);
+                    localEnd[2] =  DotProduct(temp, up);
+                
+                }
+
+                trace_t trace;
+                NS_TraceLine(hull, localStart, localEnd, &trace);
+
+                if (trace.fraction < result.fraction)
+                {
+                    memcpy(&result, &trace, sizeof(trace_t));
+
+                    if (rotated)
+                    {
+                        
+                        vec3_t invAngles;
+
+                        VectorScale(pmove->physents[i].angles, -1, invAngles);
+                        AngleVectors(invAngles, forward, right, up);
+
+                        vec3_t temp;
+                        VectorCopy(result.plane.normal, temp);
+
+                        result.plane.normal[0] =  DotProduct(temp, forward);
+                        result.plane.normal[1] = -DotProduct(temp, right);
+                        result.plane.normal[2] =  DotProduct(temp, up);
+
+                        // TODO result.plane.dst needs to be updated.
+
+                    }
+                    
+                }
+
+            }
+
+        }
+    }
+
+    // Compute the end position of the trace.
+
+    result.endpos[0] = start[0] + result.fraction * (end[0] - start[0]);
+    result.endpos[1] = start[1] + result.fraction * (end[1] - start[1]);
+    result.endpos[2] = start[2] + result.fraction * (end[2] - start[2]);
+
+}
+
+pmtrace_t NS_PlayerTrace(playermove_t* pmove, float* start, float* end, int traceFlags, int ignore_pe)
+{
+
+    //return pmove->PM_PlayerTrace(start, end, traceFlags, ignore_pe);
+
+    pmtrace_t result = { 0 };
+    
+    result.fraction = 1;
+    result.ent      = -1;
+    
+    VectorCopy(end, result.endpos);
+
+    int hullNumber = NS_GetValveHull(pmove->usehull);
+
+	
+    for (int i = 0; i < pmove->numphysent; ++i)  //wtf is this again? elven.
+    {
+        if (i != ignore_pe && pmove->physents[i].solid != SOLID_NOT)
+        {
+
+            hull_t* hull = NULL;
+            bool    ignoreRotation = false;
+
+            vec3_t awayDirection;
+        
+            if (pmove->physents[i].model != NULL)
+            {
+                hull = &pmove->physents[i].model->hulls[hullNumber];
+            }
+            else if (!(traceFlags & PM_WORLD_ONLY))
+            {
+
+                
+                /*
+                OBBox theBox[50];
+                int theNumBoxes;
+                NS_GetHitBoxesForEntity(pmove->physents[i].info, 50, theBox, theNumBoxes, pmove->time);
+
+                for (int z = 0; z < theNumBoxes; ++z)
+                {
+                    NS_DrawBoundingBox(theBox[z]);
+                }
+                */    
+
+                vec3_t min;
+                vec3_t max;
+
+                VectorAdd(pmove->physents[i].mins, pmove->player_mins[pmove->usehull], min);
+                VectorAdd(pmove->physents[i].maxs, pmove->player_maxs[pmove->usehull], max);
+
+                vec3_t offset;
+                VectorAdd(pmove->physents[i].maxs, pmove->physents[i].mins, offset);
+
+                vec3_t center;
+                VectorMA(pmove->physents[i].origin, 0.5, offset, center);
+
+                // Check if the player is moving away from the object. If they
+                // are, don't check for collision. This makes it so that objects
+                // can still move apart even if they are intersecting.
+
+                vec3_t direction;
+                VectorSubtract(end, start, direction);
+                
+                VectorSubtract(start, center, awayDirection);
+                VectorNormalize(awayDirection);
+                
+                vec3_t theEntityMins;
+                vec3_t theEntityMaxs;
+
+                if (NS_GetCollisionSizeForUser3((AvHUser3)pmove->physents[i].iuser3,
+                        theEntityMins, theEntityMaxs))
+                {
+
+                    vec3_t thePlayerExtents;
+                    VectorSubtract(pmove->player_maxs[pmove->usehull], pmove->player_mins[pmove->usehull], thePlayerExtents);
+                    VectorScale(thePlayerExtents, 0.5, thePlayerExtents);
+
+                    hull = NS_HullForBox(theEntityMins,
+                                         theEntityMaxs,
+                                         pmove->physents[i].angles,
+                                         thePlayerExtents);
+
+                    /*
+                    NS_DrawBoundingBox(theEntityMins,
+                                       theEntityMaxs,
+                                       pmove->physents[i].origin,
+                                       pmove->physents[i].angles);
+                    */
+                    
+
+                    // We've already taken the rotation of the entity into account.
+                    ignoreRotation = true;                    
+                
+                }
+                else
+                {
+
+                    vec3_t min;
+                    vec3_t max;
+
+                    VectorAdd(pmove->physents[i].mins, pmove->player_mins[pmove->usehull], min);
+                    VectorAdd(pmove->physents[i].maxs, pmove->player_maxs[pmove->usehull], max);
+
+                    hull = PM_HullForBox(min, max);
+                
+                }
+
+                vec3_t localStart;
+                VectorSubtract(start, pmove->physents[i].origin, localStart);
+
+                if (NS_PointContents(hull, 0, localStart) == CONTENTS_SOLID)
+                {
+                    // If the player is stuck but trying to move away, let them.
+                    if (DotProduct(direction, awayDirection) >= 0)
+                    {
+                        hull = NULL;
+                    }
+                }
+
+            }
+
+            if (hull != NULL)
+            {
+                
+                vec3_t localStart;
+                vec3_t localEnd;
+
+                // Translate the start and end into the model's frame of reference.
+
+                VectorSubtract(start, pmove->physents[i].origin, localStart);
+                VectorSubtract(end, pmove->physents[i].origin, localEnd);
+
+                // Rotate the start and end into the model's frame of reference.
+
+                bool rotated;
+
+                if (pmove->physents[i].model == NULL)
+                {
+                    rotated = false;
+                }
+                else
+                {
+                    if (pmove->physents[i].angles[0] ||
+                        pmove->physents[i].angles[1] ||
+                        pmove->physents[i].angles[2])
+                    {
+                        rotated = !ignoreRotation;
+                    }
+                    else
+                    {
+                        rotated = false;
+                    }
+                }
+
+                vec3_t forward;
+                vec3_t right;
+                vec3_t up;
+
+                if (rotated)
+                {
+
+                    AngleVectors(pmove->physents[i].angles, forward, right, up);
+
+                    vec3_t temp;
+
+                    VectorCopy(localStart, temp);
+                    localStart[0] =  DotProduct(temp, forward);
+                    localStart[1] = -DotProduct(temp, right);
+                    localStart[2] =  DotProduct(temp, up);
+
+                    VectorCopy(localEnd, temp);
+                    localEnd[0] =  DotProduct(temp, forward);
+                    localEnd[1] = -DotProduct(temp, right);
+                    localEnd[2] =  DotProduct(temp, up);
+                
+                }
+
+                trace_t trace;
+                NS_TraceLine(hull, localStart, localEnd, &trace);
+
+                if (trace.fraction < result.fraction)
+                {
+
+                    result.allsolid   = trace.allsolid;
+                    result.startsolid = trace.startsolid;
+                    result.inopen     = trace.inopen;
+                    result.inwater    = trace.inwater;
+                    result.fraction   = trace.fraction;
+                    result.ent        = i;
+                    result.hitgroup   = trace.hitgroup;
+
+                    if (pmove->physents[i].model == NULL && result.allsolid)
+                    {
+
+                        // We don't have a normal, so use the plane normal
+                        // closest to the away direction.
+
+                        NS_GetClosestPlaneNormal(awayDirection, box_planes, 6, result.plane.normal);
+                        result.plane.dist = 0;
+                        
+                        //VectorCopy(awayDirection, result.plane.normal);
+
+                        result.allsolid = false;
+                    
+                    }
+                    else
+                    {
+                        VectorCopy(trace.plane.normal, result.plane.normal);
+                        result.plane.dist = trace.plane.dist;
+                    }
+
+                    if (rotated)
+                    {
+                        
+                        vec3_t invAngles;
+
+                        VectorScale(pmove->physents[i].angles, -1, invAngles);
+                        AngleVectors(invAngles, forward, right, up);
+
+                        vec3_t temp;
+                        VectorCopy(result.plane.normal, temp);
+
+                        result.plane.normal[0] =  DotProduct(temp, forward);
+                        result.plane.normal[1] = -DotProduct(temp, right);
+                        result.plane.normal[2] =  DotProduct(temp, up);
+
+                        // TODO result.plane.dst needs to be updated.
+
+                    }
+                    
+                }
+
+            }
+
+        }
+    }
+
+    // Compute the end position of the trace.
+
+    result.endpos[0] = start[0] + result.fraction * (end[0] - start[0]);
+    result.endpos[1] = start[1] + result.fraction * (end[1] - start[1]);
+    result.endpos[2] = start[2] + result.fraction * (end[2] - start[2]);
+
+    // Compute the delta velocity
+
+    if (result.fraction < 1)
+    {
+
+        float s = DotProduct(result.plane.normal, pmove->velocity);
+
+        vec3_t antiVelocity;
+        VectorScale(result.plane.normal, s, antiVelocity);
+
+        VectorSubtract(pmove->velocity, antiVelocity, result.deltavelocity);
+    
+    }
+
+    return result;
+
+}
+
+int NS_TestPlayerPosition(playermove_t* pmove, float* origin, pmtrace_t* trace)
+{
+
+    //return pmove->PM_TestPlayerPosition(origin, trace);
+
+    pmtrace_t tempTrace = NS_PlayerTrace(pmove, origin, origin, PM_WORLD_ONLY, -1); 
+    
+    if (trace != NULL)
+    {
+        memcpy(trace, &tempTrace, sizeof(pmtrace_t));
+    }
+
+    return tempTrace.ent;
+    
+}
+
+
+
+//#ifdef AVH_CLIENT
+void PM_DebugLocations(int theRandomNumber)
+{
+#ifdef AVH_CLIENT
+    gTriDebugLocations.clear();
+#endif
+    
+    //int theNumEnts = pmove->numphysent;
+    int theNumEnts = pmove->numvisent;
+    
+    //if(pmove->server)
+    //{
+    //  pmove->Con_Printf("DEBUGLOCATIONS (server, %d ents):\n", theNumEnts);
+    //}
+    //else
+    //{
+    //  pmove->Con_Printf("DEBUGLOCATIONS (client, %d ents):\n", theNumEnts);
+    //}
+    
+    physent_t* theEntity = NULL;
+    for (int i = 0; i < theNumEnts; i++)
+    {
+        //theEntity = pmove->physents + i;;
+        theEntity = pmove->visents + i;;
+        if(theEntity)// && (theEntity->info >= 1) && (theEntity->info <= 16))
+        {
+            vec3_t theEntityOrigin;
+            VectorCopy(theEntity->origin, theEntityOrigin);
+            
+            //if(pmove->iuser3 == AVH_USER3_FUNC_RESOURCE)
+            //{
+            //  pmove->Con_Printf("  - entnumber(%d)  iuser3 (%d)  %d origin(%f, %f, %f)  mins(%f, %f, %f)  maxs(%f %f %f)\n", theEntity->info, pmove->iuser3, theEntityOrigin[0], theEntityOrigin[1], theEntityOrigin[2], theEntity->mins[0], theEntity->mins[1], theEntity->mins[2], theEntity->maxs[0], theEntity->maxs[1], theEntity->maxs[2]);
+            //}
+            //pmove->Con_Printf("mins(%f, %f, %f)  maxs(%f %f %f)\n", i, theEntityOrigin[0], theEntityOrigin[1], theEntityOrigin[2]);
+            
+#ifdef AVH_CLIENT
+            DebugPoint thePoint;
+            thePoint.x = theEntityOrigin[0];
+            thePoint.y = theEntityOrigin[1];
+            thePoint.z = theEntityOrigin[2];
+
+            gTriDebugLocations.push_back(thePoint);
+#endif
+
+#ifdef AVH_SERVER
+            AvHSUAddDebugPoint(theEntityOrigin[0], theEntityOrigin[1], theEntityOrigin[2]);
+#endif
+            //          float theOriginX = (theEntity->maxs.x + theEntity->mins.x)/2.0f;
+            //          float theOriginY = (theEntity->maxs.y + theEntity->mins.y)/2.0f;
+            //          float theOriginZ = (theEntity->maxs.z + theEntity->mins.z)/2.0f;
+            //DrawCircleOnGroundAtPoint(theEntityOrigin, 4, 0, 12, 1, 1, 0, .5f);
+        }
+    }
+    pmove->Con_Printf("\n");
+    
+    //  if(theRandomNumber < 10)
+    //  {
+    //      pmove->Con_Printf("Using hull: %d\n", pmove->usehull);
+    //  }
+}
+//#endif
+
+void PM_GetWishVelocity(vec3_t& outWishVelocity)
+{
+    VectorNormalize(pmove->forward);
+    VectorNormalize(pmove->right);
+    VectorNormalize(pmove->up);
+
+    float fmove = pmove->cmd.forwardmove;
+    float smove = pmove->cmd.sidemove;
+    float umove = pmove->cmd.upmove;
+    
+    for(int i=0 ; i<3 ; i++)
+    {
+        outWishVelocity[i] = pmove->forward[i]*fmove + pmove->right[i]*smove + pmove->up[i]*umove;
+    }
+}
+
+bool NS_CheckOffsetFromOrigin(float inX, float inY, float inZ, vec3_t& outNormal)
+{
+
+    ///////////////////////////////
+    // Begin Max's Code
+    ///////////////////////////////     
+
+    bool thePointIsSolid = false;
+
+    const float kScalar = 1.3f;
+
+    vec3_t thePoint;
+
+    thePoint[0] = pmove->origin[0] + inX*kScalar;
+    thePoint[1] = pmove->origin[1] + inY*kScalar;
+    thePoint[2] = pmove->origin[2] + inZ*kScalar;
+
+    // Trace against the world geometry.
+
+    trace_t trace;
+    NS_TraceLine(pmove->origin, thePoint, 1, PM_WORLD_ONLY, -1, true, trace);
+
+    if (trace.fraction < 1)
+    {
+        
+        // Weight the normal based on how close the intersection is.
+
+        vec3_t normal;
+        
+        VectorScale(trace.plane.normal, 1.0f / (trace.fraction + 0.1f), normal);
+        VectorAdd(normal, outNormal, outNormal);
+
+        thePointIsSolid = true;
+
+        #ifdef AVH_SERVER
+        //PM_ParticleLine(pmove->origin, thePoint, 63, 0.1, 5.0);
+        #endif      
+
+    }
+    else
+    {
+        #ifdef AVH_SERVER
+        //PM_ParticleLine(pmove->origin, thePoint, 0, 0.1, 5.0);
+        #endif      
+    }
+
+    // If there was no intersection with the world, trace the entities.
+    
+    // We prioritize world tracing over entity tracing so that small entities (like
+    // IPs, resource nozzles and switches) don't cause changes in the skulk's orientation.
+    
+    if (!thePointIsSolid)
+    {
+
+        const int pointSizeHull = 2;
+
+        trace_t trace;
+        NS_TraceLine(pmove->origin, thePoint, pointSizeHull, 0, -1, true, trace);
+        
+        /*
+        struct pmtrace_s* theTrace = pmove->PM_TraceLine(pmove->origin, thePoint,
+            PM_TRACELINE_ANYVISIBLE, pointSizeHull, pmove->player_index);
+            */
+    
+        //if (theTrace && (theTrace->fraction < 1) && !GetIsEntityAPlayer(theTrace->ent))
+        if (trace.fraction < 1)
+        {
+        
+            // Add the normal so that we compute an average normal over all tests.
+            // Weight the normal based on how close the intersection is.
+
+            vec3_t normal;
+        
+            //VectorScale(theTrace->plane.normal, 1.0f / (theTrace->fraction + 0.1f), normal);
+            VectorScale(trace.plane.normal, 1.0f / (trace.fraction + 0.1f), normal);
+            VectorAdd(normal, outNormal, outNormal);
+
+            thePointIsSolid = true;
+
+            #ifdef AVH_SERVER
+            //PM_ParticleLine(pmove->origin, thePoint, 79, 0.1, 5.0);
+            #endif
+        
+        }
+    
+    }
+
+    return thePointIsSolid;
+
+    ///////////////////////////////
+    // End Max's Code
+    ///////////////////////////////     
+
+}
+
+void NS_GetWallstickingAngles(const vec3_t surfaceNormal, const vec3_t currentAngles, vec3_t angles)
+{
+
+    vec3_t forward;
+    vec3_t right;
+    vec3_t up;
+
+    VectorCopy(surfaceNormal, up);
+    AngleVectors(currentAngles, forward, NULL, NULL);
+
+    CrossProduct(forward, up, right);
+    CrossProduct(up, right, forward);
+
+    VectorNormalize(forward);
+    VectorNormalize(right);
+    VectorNormalize(up);
+
+    VectorsToAngles(forward, right, up, angles);
+
+}
+
+void NS_FixWallstickingAngles(vec3_t angles)
+{
+
+    const float minValue = -1000;
+    const float maxValue =  1000;
+
+    if (!(angles[0] > minValue && angles[0] < maxValue) ||
+        !(angles[1] > minValue && angles[1] < maxValue) ||
+        !(angles[2] > minValue && angles[2] < maxValue))
+    {
+        
+        // The angles have become invalid, so reset them.
+
+        angles[0] = 0;
+        angles[1] = 0;
+        angles[2] = 0;
+
+    }
+
+}
+
+void PM_ParticleAxes(vec3_t origin, vec3_t angles)
+{
+
+
+    vec3_t forward;
+    vec3_t right;
+    vec3_t up;
+
+    AngleVectors(angles, forward, right, up);
+
+    VectorScale(forward, 100, forward);
+    VectorScale(right, 100, right);
+    VectorScale(up, 100, up);
+
+    VectorAdd(origin, forward, forward);
+    VectorAdd(origin, right, right);
+    VectorAdd(origin, up, up);
+
+    PM_ParticleLine(origin, forward, 63, 0.1, 2.0);
+    PM_ParticleLine(origin, right, 79, 0.1, 2.0);
+    PM_ParticleLine(origin, up, 15, 0.1, 2.0);
+
+}
+
+
+void NS_UpdateWallsticking()
+{
+
+    SetUpgradeMask(&pmove->iuser4, MASK_WALLSTICKING, false);
+
+    //pmove->effects &= ~EF_INVLIGHT;
+
+    if (pmove->iuser3 == AVH_USER3_ALIEN_PLAYER1)
+    {
+        if(!(pmove->cmd.buttons & IN_DUCK)) //&& ((pmove->onground != -1) || (pmove->numtouch > 0)))
+        {
+            
+            vec3_t theMinPoint;
+            vec3_t theMaxPoint;
+            
+            VectorScale(kWallstickingDistanceCheck, -1, theMinPoint);
+            VectorCopy(kWallstickingDistanceCheck, theMaxPoint);
+            
+            // Trace corners of hull to see if any are touching a solid and
+            // compute an average surface normal.
+            
+            vec3_t theSurfaceNormal = { 0, 0, 0 };
+            
+            bool wallsticking = false;
+
+            wallsticking |= NS_CheckOffsetFromOrigin(theMinPoint[0], theMinPoint[1], theMinPoint[2], theSurfaceNormal);
+            wallsticking |= NS_CheckOffsetFromOrigin(theMinPoint[0], theMaxPoint[1], theMinPoint[2], theSurfaceNormal);
+            wallsticking |= NS_CheckOffsetFromOrigin(theMaxPoint[0], theMinPoint[1], theMinPoint[2], theSurfaceNormal);
+            wallsticking |= NS_CheckOffsetFromOrigin(theMaxPoint[0], theMaxPoint[1], theMinPoint[2], theSurfaceNormal);
+
+            wallsticking |= NS_CheckOffsetFromOrigin(theMinPoint[0], theMinPoint[1], theMaxPoint[2], theSurfaceNormal);
+            wallsticking |= NS_CheckOffsetFromOrigin(theMinPoint[0], theMaxPoint[1], theMaxPoint[2], theSurfaceNormal);
+            wallsticking |= NS_CheckOffsetFromOrigin(theMaxPoint[0], theMinPoint[1], theMaxPoint[2], theSurfaceNormal);
+            wallsticking |= NS_CheckOffsetFromOrigin(theMaxPoint[0], theMaxPoint[1], theMaxPoint[2], theSurfaceNormal);
+
+            VectorNormalize(theSurfaceNormal);
+
+            if (wallsticking)
+            {
+
+                // Set wall sticking to true.
+                SetUpgradeMask(&pmove->iuser4, MASK_WALLSTICKING);
+
+                vec3_t angles;
+                         
+                #ifdef AVH_SERVER
+
+                vec3_t worldViewAngles;
+                
+                Mat3 objectMatrix(pmove->vuser1);
+                Mat3 viewMatrix(pmove->angles);
+
+                (objectMatrix * viewMatrix).GetEulerAngles(worldViewAngles);                
+
+                NS_GetWallstickingAngles(theSurfaceNormal, pmove->angles, angles);   
+                VectorCopy(angles, pmove->vuser2);
+
+                #endif
+
+                #ifdef AVH_CLIENT
+                NS_GetWallstickingAngles(theSurfaceNormal, gWorldViewAngles, angles);
+                VectorCopy(angles, gTargetPlayerAngles);
+                #endif
+
+            }
+            else
+            {
+                
+                // This seems like a good idea, but it doesn't work too well in
+                // practice (maybe the constant just need to be tweaked).
+            
+                /*
+                // If the Skulk is not wallsticking, then rotate to align with the
+                // surface he's moving towards (if there's one nearby).
+
+                vec3_t traceEnd;
+                vec3_t traceDir;
+
+                VectorCopy(pmove->velocity, traceDir);
+                VectorNormalize(traceDir);
+
+                VectorScale(traceDir, kSkulkRotationLookAhead, traceDir);
+                VectorAdd(traceDir, pmove->origin, traceEnd);
+
+                pmtrace_t trace = NS_PlayerTrace(pmove, pmove->origin, traceEnd, PM_NORMAL, -1 );
+
+                if (trace.fraction < 1)
+                {
+
+                    vec3_t angles;
+                    
+                    #ifdef AVH_SERVER
+                    NS_GetWallstickingAngles(trace.plane.normal, pmove->vuser1, angles);
+                    VectorCopy(angles, pmove->vuser2);
+                    #endif
+
+                    #ifdef AVH_CLIENT
+                    NS_GetWallstickingAngles(trace.plane.normal, gWorldViewAngles, angles);
+                    VectorCopy(angles, gTargetPlayerAngles);
+                    #endif                    
+                }
+                */
+
+                // When the player isn't wall sticking, just revert to the normal
+                // angles.
+
+                #ifdef AVH_SERVER
+                VectorCopy(pmove->angles, pmove->vuser2);
+                #endif
+
+                #ifdef AVH_CLIENT
+                VectorCopy(pmove->angles, gTargetPlayerAngles);
+                #endif                      
+
+            }
+
+            // These buttons have changed this frame
+            int theButtonsChanged = (pmove->oldbuttons ^ pmove->cmd.buttons);
+
+            // The changed ones still down are "pressed"
+            //int theButtonPressed =  theButtonsChanged & pmove->cmd.buttons;
+            
+            // If we're now wallsticking and we JUST pressed our duck button, slow our velocity
+            if(GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING) && (theButtonsChanged & IN_DUCK))
+            {
+                //pmove->Con_Printf("Setting vel to 0\n");
+                VectorScale(pmove->velocity, .999f, pmove->velocity);               
+                //pmove->velocity[0] = pmove->velocity[1] = pmove->velocity[2] = 0.0f;
+
+                // Trigger footstep immediately
+                pmove->flTimeStepSound = 0.0f;
+            }
+        }
+        else
+        {
+            #ifdef AVH_SERVER
+            //VectorCopy(pmove->angles, pmove->vuser2);
+            
+            vec3_t up = { 0, 0, 1 };
+            NS_GetWallstickingAngles(up, pmove->angles, pmove->vuser2);
+            #endif
+        }
+
+    }
+
+}
+
+
+int NS_GetStepsize(int iuser3)
+{
+    // TODO: Move this into a server variable?
+    const int kDefaultStepsize = 18;
+    int theStepSize = kDefaultStepsize;
+
+    //if((pmove->iuser3 == AVH_USER3_ALIEN_PLAYER1) || (pmove->iuser3 == AVH_USER3_ALIEN_PLAYER2))
+    //{
+    //  theStepSize = kDefaultStepsize;//.66f*kDefaultStepsize;
+    //}
+    //else if(pmove->iuser3 == AVH_USER3_ALIEN_PLAYER4)
+    //{
+    //  theStepSize = 1.3f*kDefaultStepsize;
+    //}
+    //else if(pmove->iuser3 == AVH_USER3_ALIEN_PLAYER5)
+    //{
+    //  theStepSize = 1.6*kDefaultStepsize;
+    //}
+    //if(pmove->iuser3 == AVH_USER3_ALIEN_PLAYER5)
+    //{
+    //  theStepSize = 1.3f*kDefaultStepsize;
+    //}
+    
+    return theStepSize;
+}
+
+
+void PM_SwapTextures( int i, int j )
+{
+    char chTemp;
+    char szTemp[ CBTEXTURENAMEMAX ];
+
+    strcpy( szTemp, grgszTextureName[ i ] );
+    chTemp = grgchTextureType[ i ];
+    
+    strcpy( grgszTextureName[ i ], grgszTextureName[ j ] );
+    grgchTextureType[ i ] = grgchTextureType[ j ];
+
+    strcpy( grgszTextureName[ j ], szTemp );
+    grgchTextureType[ j ] = chTemp;
+}
+
+void PM_SortTextures( void )
+{
+    // Bubble sort, yuck, but this only occurs at startup and it's only 512 elements...
+    //
+    int i, j;
+
+    for ( i = 0 ; i < gcTextures; i++ )
+    {
+        for ( j = i + 1; j < gcTextures; j++ )
+        {
+            if ( stricmp( grgszTextureName[ i ], grgszTextureName[ j ] ) > 0 )
+            {
+                // Swap
+                //
+                PM_SwapTextures( i, j );
+            }
+        }
+    }
+}
+
+void PM_InitTextureTypes()
+{
+    char buffer[512];
+    int i, j;
+    byte *pMemFile;
+    int fileSize, filePos;
+    static qboolean bTextureTypeInit = false;
+
+    if ( bTextureTypeInit )
+        return;
+
+    memset(&(grgszTextureName[0][0]), 0, CTEXTURESMAX * CBTEXTURENAMEMAX);
+    memset(grgchTextureType, 0, CTEXTURESMAX);
+
+    gcTextures = 0;
+    memset(buffer, 0, 512);
+
+    fileSize = pmove->COM_FileSize( "sound/materials.txt" );
+    pMemFile = pmove->COM_LoadFile( "sound/materials.txt", 5, NULL );
+    if ( !pMemFile )
+        return;
+
+    filePos = 0;
+    // for each line in the file...
+    while ( pmove->memfgets( pMemFile, fileSize, &filePos, buffer, 511 ) != NULL && (gcTextures < CTEXTURESMAX) )
+    {
+        // skip whitespace
+        i = 0;
+        while(buffer[i] && isspace(buffer[i]))
+            i++;
+        
+        if (!buffer[i])
+            continue;
+
+        // skip comment lines
+        if (buffer[i] == '/' || !isalpha(buffer[i]))
+            continue;
+
+        // get texture type
+        grgchTextureType[gcTextures] = toupper(buffer[i++]);
+
+        // skip whitespace
+        while(buffer[i] && isspace(buffer[i]))
+            i++;
+        
+        if (!buffer[i])
+            continue;
+
+        // get sentence name
+        j = i;
+        while (buffer[j] && !isspace(buffer[j]))
+            j++;
+
+        if (!buffer[j])
+            continue;
+
+        // null-terminate name and save in sentences array
+        j = min (j, CBTEXTURENAMEMAX-1+i);
+        buffer[j] = 0;
+        strcpy(&(grgszTextureName[gcTextures++][0]), &(buffer[i]));
+    }
+
+    // Must use engine to free since we are in a .dll
+    pmove->COM_FreeFile ( pMemFile );
+
+    PM_SortTextures();
+
+    bTextureTypeInit = true;
+}
+
+char PM_FindTextureType( char *name )
+{
+    int left, right, pivot;
+    int val;
+
+    assert( pm_shared_initialized );
+
+    left = 0;
+    right = gcTextures - 1;
+
+    while ( left <= right )
+    {
+        pivot = ( left + right ) / 2;
+
+        val = strnicmp( name, grgszTextureName[ pivot ], CBTEXTURENAMEMAX-1 );
+        if ( val == 0 )
+        {
+            return grgchTextureType[ pivot ];
+        }
+        else if ( val > 0 )
+        {
+            left = pivot + 1;
+        }
+        else if ( val < 0 )
+        {
+            right = pivot - 1;
+        }
+    }
+    
+    return CHAR_TEX_CONCRETE;
+}
+
+float PM_GetDesiredTopDownCameraHeight(qboolean& outFoundEntity)
+{
+//  vec3_t      theTraceStart;
+//  vec3_t      theTraceEnd;
+//  vec3_t      theForward;
+//  pmtrace_t*  theTrace = NULL;
+//  physent_t*  theTarget = NULL;
+//  float       theHeight = 320;//180;
+//  qboolean    theDone = false;
+//  int         theEntityHit = -1;
+//
+//  // Start tracing at player, but at the highest point in the map
+//  VectorCopy(pmove->origin, theTraceStart);
+//  theTraceStart[2] = 750;
+//
+//  VectorCopy(pmove->origin, theTraceEnd);
+//  theTraceEnd[2] = -500;
+//  
+//  //AngleVectors(pmove->angles, theForward, NULL, NULL);
+//  //VectorNormalize(theForward);
+//  theForward[0] = theForward[1] = 0;
+//  theForward[2] = -1;
+//  
+//  //VectorMA(pmove->origin, theHeight, theForward, theTraceEnd);
+//
+//  do
+//  {
+//      //struct pmtrace_s *(*PM_TraceLine)( float *start, float *end, int flags, int usehull, int ignore_pe );
+//      theTrace = pmove->PM_TraceLine(theTraceStart, theTraceEnd, PM_TRACELINE_ANYVISIBLE, 2,  theEntityHit);
+//      
+//      // Find out if there are any view height entities at our x,y
+//      theEntityHit = theTrace->ent;
+//      if(theEntityHit > 0)
+//      {
+//          //theTarget = AvHSUGetEntity(theEntityHit);
+//          for (int i = 0; i < pmove->numphysent; i++)
+//          {
+//              if ( pmove->physents[i].info == theEntityHit)
+//              {
+//                  theTarget = pmove->physents + i;
+//              }
+//          }
+//      }
+//
+//      // If so, pick the nearest one and set our height to it
+//      if(theTarget && (theTarget->iuser3 == AVH_USER3_VIEWHEIGHT))
+//      {
+//          // Use it's center for the height
+//          theHeight = (theTarget->maxs[2] + theTarget->mins[2])/2.0f;
+//
+//          outFoundEntity = true;
+//
+//          // We're done
+//          theDone = true;
+//      }
+//      //if(!theTarget)
+//      //{
+//      //  theDone = true;
+//      //}
+//
+//      // Do the trace again but starting at this point
+//      VectorCopy(theTrace->endpos, theTraceStart);
+////        if(theTrace->startsolid)
+////        {
+////            VectorMA(theTrace->endpos, 10, theForward, theTraceStart);
+////        }
+//  }
+//  // While the end point is not a view entity and not below
+//  //while(theTrace->fraction > kFloatTolerance && !theDone);
+//  while((theTrace->fraction != 1.0f) && !theDone /*&& (!theTrace->startsolid || theTrace->fraction != 0)*/);
+//  
+//  // Return the result
+//  return theHeight;
+    return 640;
+}
+
+bool NS_GetIsPlayerAlien(string& outExtension, float* outVolume = NULL)
+{
+    int theUser3 = pmove->iuser3;
+
+    // Default alien extension
+    bool theIsAlien1 = (theUser3 == AVH_USER3_ALIEN_PLAYER1);
+    bool theIsAlien2 = (theUser3 == AVH_USER3_ALIEN_PLAYER2);
+    bool theIsAlien3 = (theUser3 == AVH_USER3_ALIEN_PLAYER3);
+    bool theIsAlien4 = (theUser3 == AVH_USER3_ALIEN_PLAYER4);
+    bool theIsAlien5 = (theUser3 == AVH_USER3_ALIEN_PLAYER5);
+    
+    if(theIsAlien1)
+    {
+        outExtension = kAlien1FootstepExtension;
+    }
+    else if(theIsAlien5)
+    {
+        outExtension = kAlien5FootstepExtension;
+        if(outVolume)
+        {
+            *outVolume = .3f;
+        }
+    }
+    else if(theIsAlien2 || theIsAlien3 || theIsAlien4)
+    {
+        outExtension = kAlienFootstepExtension;
+    }
+
+    return theIsAlien1 || theIsAlien2 || theIsAlien3 || theIsAlien4 || theIsAlien5;
+}
+
+void NS_PlayStepSound(int inMaterialType, int inSoundNumber, float inVolume)
+{
+    // Is this an alien step sound?
+    string theExtension;
+    bool theIsAlien = NS_GetIsPlayerAlien(theExtension, &inVolume);
+
+    // If we have heavy armor
+    if((pmove->iuser3 == AVH_USER3_MARINE_PLAYER) && GetHasUpgrade(pmove->iuser4, MASK_UPGRADE_13))
+    {
+        theExtension = kHeavyFootstepExtension;
+
+        // Can't be too quiet with heavy armor
+        inVolume = max(inVolume, .5f);
+    }
+
+    // Build base name
+    string theBaseName;
+
+    // Switch material type
+    switch(inMaterialType)
+    {
+    case STEP_CONCRETE:
+        theBaseName = kConcreteBaseName;
+        break;
+
+    case STEP_METAL:
+        theBaseName = kMetalBaseName;
+        break;
+        
+    case STEP_DIRT:
+        theBaseName = kDirtBaseName;
+        break;
+        
+    case STEP_VENT:
+        theBaseName = kDuctBaseName;
+        break;
+        
+    case STEP_GRATE:
+        theBaseName = kGrateBaseName;
+        break;
+        
+    case STEP_TILE:
+        theBaseName = kTileBaseName;
+        break;
+        
+    case STEP_SLOSH:
+        theBaseName = kSloshBaseName;
+        break;
+        
+    case STEP_WADE:
+        theBaseName = kWadeBaseName;
+        break;
+        
+    case STEP_LADDER:
+        theBaseName = kLadderBaseName;
+        break;
+    }
+
+    // Map random number to indices Valve uses
+    int theFinalNumber;
+    switch(inSoundNumber)
+    {
+    case 0:
+        theFinalNumber = 1;
+        break;
+    case 1:
+        theFinalNumber = 3;
+        break;
+    case 2:
+        theFinalNumber = 2;
+        break;
+    case 3:
+        theFinalNumber = 4;
+        break;
+    case 4:
+        theFinalNumber = 5;
+        break;
+    }
+
+    // If player is walking, don't play sound
+    float theWalkFactor = .5f;//AvHMUGetWalkSpeedFactor((AvHUser3)pmove->iuser3);
+
+    int theCurrentSpeed = Length(pmove->velocity);//sqrt( pmove->cmd.forwardmove * pmove->cmd.forwardmove ) +   ( pmove->cmd.sidemove * pmove->cmd.sidemove ) + ( pmove->cmd.upmove * pmove->cmd.upmove );
+    int theMaxSpeed = pmove->clientmaxspeed;
+    theMaxSpeed = pmove->maxspeed;
+    float theSpeedFraction = theCurrentSpeed/(float)theMaxSpeed;
+
+    bool thePlayingFootstep = true;
+    if(theSpeedFraction > theWalkFactor)
+    {
+        // Construct full name using base name and sound number
+        char theFinalName[128];
+        sprintf(theFinalName, "%s%s%d", kFootstepDirectory, theBaseName.c_str(), theFinalNumber);
+        
+        //if(theIsAlien && (inMaterialType != STEP_WADE))
+        float theNorm = ATTN_NORM;
+        if((theExtension != "") && (inMaterialType == STEP_CONCRETE))
+        {
+            //theNorm = ATTN_IDLE;
+            strcat(theFinalName, theExtension.c_str());
+        }
+        strcat(theFinalName, ".wav");
+        
+        // If alien has silencio upgrade, mute footstep volume
+        float theSilenceUpgradeFactor = 0.0f;
+
+        if(theIsAlien)
+        {
+            int theSilenceUpgradeLevel = AvHGetAlienUpgradeLevel(pmove->iuser4, MASK_UPGRADE_6);
+            theSilenceUpgradeFactor = theSilenceUpgradeLevel/3.0f;
+        }
+        
+        inVolume = inVolume - inVolume*theSilenceUpgradeFactor;
+        
+        // Play it at the specified volume
+        pmove->PM_PlaySound(CHAN_BODY, theFinalName, inVolume, theNorm, 0, PITCH_NORM);
+    }
+    else
+    {
+//      pmove->Con_DPrintf("Skipping footstep sound\n");
+        thePlayingFootstep = false;
+    }
+
+//  pmove->Con_DPrintf("current speed: %d, max speed: %d, fraction %f, played footstep: %d\n", theCurrentSpeed, theMaxSpeed, theSpeedFraction, thePlayingFootstep);
+}
+
+void PM_PlayStepSound( int step, float fvol )
+{
+    static int iSkipStep = 0;
+    int irand;
+    vec3_t hvel;
+
+    pmove->iStepLeft = !pmove->iStepLeft;
+
+    if ( !pmove->runfuncs )
+    {
+        return;
+    }
+    
+    irand = pmove->RandomLong(0,1) + ( pmove->iStepLeft * 2 );
+
+    // Don't play footsteps when ducked
+    // FIXME mp_footsteps needs to be a movevar
+    if((pmove->multiplayer && !pmove->movevars->footsteps) || (pmove->flags & FL_DUCKING))
+    {
+        return;
+    }
+
+    VectorCopy( pmove->velocity, hvel );
+    hvel[2] = 0.0;
+
+    //if ( pmove->multiplayer && ( !g_onladder && Length( hvel ) <= 220 ) ) (use CBasePlayer::GetMaxWalkSpeed somehow if ever uncommenting this)
+    //  return;
+
+    // irand - 0,1 for right foot, 2,3 for left foot
+    // used to alternate left and right foot
+    // FIXME, move to player state
+
+    switch (step)
+    {
+    default:
+    case STEP_CONCRETE:
+    case STEP_METAL:
+    case STEP_DIRT:
+    case STEP_VENT:
+    case STEP_SLOSH:
+    case STEP_GRATE:
+    case STEP_WADE:
+    case STEP_LADDER:
+        NS_PlayStepSound(step, irand, fvol);
+        break;
+
+    case STEP_TILE:
+        if ( !pmove->RandomLong(0,4) )
+            irand = 4;
+        NS_PlayStepSound(step, irand, fvol);
+        break;
+    }
+
+//  switch (step)
+//  {
+//  default:
+//  case STEP_CONCRETE:
+//      switch (irand)
+//      {
+//      // right foot
+//      case 0: pmove->PM_PlaySound( CHAN_BODY, "player/pl_step1.wav", fvol, ATTN_NORM, 0, PITCH_NORM );    break;
+//      case 1: pmove->PM_PlaySound( CHAN_BODY, "player/pl_step3.wav", fvol, ATTN_NORM, 0, PITCH_NORM );    break;
+//      // left foot
+//      case 2: pmove->PM_PlaySound( CHAN_BODY, "player/pl_step2.wav", fvol, ATTN_NORM, 0, PITCH_NORM );    break;
+//      case 3: pmove->PM_PlaySound( CHAN_BODY, "player/pl_step4.wav", fvol, ATTN_NORM, 0, PITCH_NORM );    break;
+//      }
+//      break;
+//  case STEP_METAL:
+//      switch(irand)
+//      {
+//      // right foot
+//      case 0: pmove->PM_PlaySound( CHAN_BODY, "player/pl_metal1.wav", fvol, ATTN_NORM, 0, PITCH_NORM );   break;
+//      case 1: pmove->PM_PlaySound( CHAN_BODY, "player/pl_metal3.wav", fvol, ATTN_NORM, 0, PITCH_NORM );   break;
+//      // left foot
+//      case 2: pmove->PM_PlaySound( CHAN_BODY, "player/pl_metal2.wav", fvol, ATTN_NORM, 0, PITCH_NORM );   break;
+//      case 3: pmove->PM_PlaySound( CHAN_BODY, "player/pl_metal4.wav", fvol, ATTN_NORM, 0, PITCH_NORM );   break;
+//      }
+//      break;
+//  case STEP_DIRT:
+//      switch(irand)
+//      {
+//      // right foot
+//      case 0: pmove->PM_PlaySound( CHAN_BODY, "player/pl_dirt1.wav", fvol, ATTN_NORM, 0, PITCH_NORM );    break;
+//      case 1: pmove->PM_PlaySound( CHAN_BODY, "player/pl_dirt3.wav", fvol, ATTN_NORM, 0, PITCH_NORM );    break;
+//      // left foot
+//      case 2: pmove->PM_PlaySound( CHAN_BODY, "player/pl_dirt2.wav", fvol, ATTN_NORM, 0, PITCH_NORM );    break;
+//      case 3: pmove->PM_PlaySound( CHAN_BODY, "player/pl_dirt4.wav", fvol, ATTN_NORM, 0, PITCH_NORM );    break;
+//      }
+//      break;
+//  case STEP_VENT:
+//      switch(irand)
+//      {
+//      // right foot
+//      case 0: pmove->PM_PlaySound( CHAN_BODY, "player/pl_duct1.wav", fvol, ATTN_NORM, 0, PITCH_NORM );    break;
+//      case 1: pmove->PM_PlaySound( CHAN_BODY, "player/pl_duct3.wav", fvol, ATTN_NORM, 0, PITCH_NORM );    break;
+//      // left foot
+//      case 2: pmove->PM_PlaySound( CHAN_BODY, "player/pl_duct2.wav", fvol, ATTN_NORM, 0, PITCH_NORM );    break;
+//      case 3: pmove->PM_PlaySound( CHAN_BODY, "player/pl_duct4.wav", fvol, ATTN_NORM, 0, PITCH_NORM );    break;
+//      }
+//      break;
+//  case STEP_GRATE:
+//      switch(irand)
+//      {
+//      // right foot
+//      case 0: pmove->PM_PlaySound( CHAN_BODY, "player/pl_grate1.wav", fvol, ATTN_NORM, 0, PITCH_NORM );   break;
+//      case 1: pmove->PM_PlaySound( CHAN_BODY, "player/pl_grate3.wav", fvol, ATTN_NORM, 0, PITCH_NORM );   break;
+//      // left foot
+//      case 2: pmove->PM_PlaySound( CHAN_BODY, "player/pl_grate2.wav", fvol, ATTN_NORM, 0, PITCH_NORM );   break;
+//      case 3: pmove->PM_PlaySound( CHAN_BODY, "player/pl_grate4.wav", fvol, ATTN_NORM, 0, PITCH_NORM );   break;
+//      }
+//      break;
+//  case STEP_TILE:
+//      if ( !pmove->RandomLong(0,4) )
+//          irand = 4;
+//      switch(irand)
+//      {
+//      // right foot
+//      case 0: pmove->PM_PlaySound( CHAN_BODY, "player/pl_tile1.wav", fvol, ATTN_NORM, 0, PITCH_NORM );    break;
+//      case 1: pmove->PM_PlaySound( CHAN_BODY, "player/pl_tile3.wav", fvol, ATTN_NORM, 0, PITCH_NORM );    break;
+//      // left foot
+//      case 2: pmove->PM_PlaySound( CHAN_BODY, "player/pl_tile2.wav", fvol, ATTN_NORM, 0, PITCH_NORM );    break;
+//      case 3: pmove->PM_PlaySound( CHAN_BODY, "player/pl_tile4.wav", fvol, ATTN_NORM, 0, PITCH_NORM );    break;
+//      case 4: pmove->PM_PlaySound( CHAN_BODY, "player/pl_tile5.wav", fvol, ATTN_NORM, 0, PITCH_NORM );    break;
+//      }
+//      break;
+//  case STEP_SLOSH:
+//      switch(irand)
+//      {
+//      // right foot
+//      case 0: pmove->PM_PlaySound( CHAN_BODY, "player/pl_slosh1.wav", fvol, ATTN_NORM, 0, PITCH_NORM );   break;
+//      case 1: pmove->PM_PlaySound( CHAN_BODY, "player/pl_slosh3.wav", fvol, ATTN_NORM, 0, PITCH_NORM );   break;
+//      // left foot
+//      case 2: pmove->PM_PlaySound( CHAN_BODY, "player/pl_slosh2.wav", fvol, ATTN_NORM, 0, PITCH_NORM );   break;
+//      case 3: pmove->PM_PlaySound( CHAN_BODY, "player/pl_slosh4.wav", fvol, ATTN_NORM, 0, PITCH_NORM );   break;
+//      }
+//      break;
+//  case STEP_WADE:
+//      if ( iSkipStep == 0 )
+//      {
+//          iSkipStep++;
+//          break;
+//      }
+//
+//      if ( iSkipStep++ == 3 )
+//      {
+//          iSkipStep = 0;
+//      }
+//
+//      switch (irand)
+//      {
+//      // right foot
+//      case 0: pmove->PM_PlaySound( CHAN_BODY, "player/pl_wade1.wav", fvol, ATTN_NORM, 0, PITCH_NORM );    break;
+//      case 1: pmove->PM_PlaySound( CHAN_BODY, "player/pl_wade2.wav", fvol, ATTN_NORM, 0, PITCH_NORM );    break;
+//      // left foot
+//      case 2: pmove->PM_PlaySound( CHAN_BODY, "player/pl_wade3.wav", fvol, ATTN_NORM, 0, PITCH_NORM );    break;
+//      case 3: pmove->PM_PlaySound( CHAN_BODY, "player/pl_wade4.wav", fvol, ATTN_NORM, 0, PITCH_NORM );    break;
+//      }
+//      break;
+//  case STEP_LADDER:
+//      switch(irand)
+//      {
+//      // right foot
+//      case 0: pmove->PM_PlaySound( CHAN_BODY, "player/pl_ladder1.wav", fvol, ATTN_NORM, 0, PITCH_NORM );  break;
+//      case 1: pmove->PM_PlaySound( CHAN_BODY, "player/pl_ladder3.wav", fvol, ATTN_NORM, 0, PITCH_NORM );  break;
+//      // left foot
+//      case 2: pmove->PM_PlaySound( CHAN_BODY, "player/pl_ladder2.wav", fvol, ATTN_NORM, 0, PITCH_NORM );  break;
+//      case 3: pmove->PM_PlaySound( CHAN_BODY, "player/pl_ladder4.wav", fvol, ATTN_NORM, 0, PITCH_NORM );  break;
+//      }
+//      break;
+//  }
+}   
+
+int PM_MapTextureTypeStepType(char chTextureType)
+{
+    int theTextureType = 0;
+
+    switch (chTextureType)
+    {
+        default:
+        case CHAR_TEX_CONCRETE:
+            theTextureType = STEP_CONCRETE;
+            break;
+
+        case CHAR_TEX_METAL:
+            theTextureType = STEP_METAL;
+            break;
+
+        case CHAR_TEX_DIRT:
+            theTextureType = STEP_DIRT; 
+            break;
+
+        case CHAR_TEX_VENT:
+            theTextureType = STEP_VENT;
+            break;
+
+        case CHAR_TEX_GRATE:
+            theTextureType = STEP_GRATE;
+            break;
+
+        case CHAR_TEX_TILE:
+            theTextureType = STEP_TILE;
+            break;
+
+        case CHAR_TEX_SLOSH:
+            theTextureType = STEP_SLOSH;
+            break;
+    }
+    
+    return theTextureType;
+}
+
+/*
+====================
+PM_CatagorizeTextureType
+
+Determine texture info for the texture we are standing on.
+====================
+*/
+void PM_CatagorizeTextureType( void )
+{
+    vec3_t start, end;
+    const char *pTextureName;
+
+    VectorCopy( pmove->origin, start );
+    VectorCopy( pmove->origin, end );
+
+    // Straight down
+    end[2] -= 64;
+
+    // Fill in default values, just in case.
+    pmove->sztexturename[0] = '\0';
+    pmove->chtexturetype = CHAR_TEX_CONCRETE;
+
+    pTextureName = pmove->PM_TraceTexture( pmove->onground, start, end );
+    if ( !pTextureName )
+        return;
+
+    // strip leading '-0' or '+0~' or '{' or '!'
+    if (*pTextureName == '-' || *pTextureName == '+')
+        pTextureName += 2;
+
+    if (*pTextureName == '{' || *pTextureName == '!' || *pTextureName == '~' || *pTextureName == ' ')
+        pTextureName++;
+    // '}}'
+    
+    strcpy( pmove->sztexturename, pTextureName);
+    pmove->sztexturename[ CBTEXTURENAMEMAX - 1 ] = 0;
+        
+    // get texture type
+    pmove->chtexturetype = PM_FindTextureType( pmove->sztexturename );  
+}
+
+void PM_GetSpeeds(float& outVelWalk, float& outVelRun)
+{
+}
+
+float PM_SetStepInterval()
+{
+    //int theCurrentSpeed = Length(pmove->velocity);
+    int theCurrentSpeed =   ( pmove->cmd.forwardmove * pmove->cmd.forwardmove ) +
+                            ( pmove->cmd.sidemove * pmove->cmd.sidemove ) +
+                            ( pmove->cmd.upmove * pmove->cmd.upmove );
+    theCurrentSpeed = sqrt( (double)theCurrentSpeed );
+
+    int theMaxSpeed = kMaxGroundPlayerSpeed;//pmove->clientmaxspeed;
+
+//  int kFastestFootstepInterval = BALANCE_IVAR(kFootstepFastInterval);
+//  int kSlowestFootstepInterval = BALANCE_IVAR(kFootstepSlowInterval);
+//
+//  if(pmove->iuser3 == AVH_USER3_ALIEN_PLAYER5)
+//  {
+//      kFastestFootstepInterval = 200;
+//      kSlowestFootstepInterval = 800;
+//  }
+
+    // Play louder as we get closer to max speed
+    float theFraction = (float)theCurrentSpeed/theMaxSpeed;
+
+//  int theCurrentInterval = kSlowestFootstepInterval - (kSlowestFootstepInterval - kFastestFootstepInterval)*theFraction;
+
+    int theScalar = 800;
+
+    switch(pmove->iuser3)
+    {
+    case AVH_USER3_MARINE_PLAYER:
+        if(GetHasUpgrade(pmove->iuser4, MASK_UPGRADE_13))
+        {
+            theScalar = BALANCE_IVAR(kFootstepHeavyScalar);
+        }
+        else
+        {
+            theScalar = BALANCE_IVAR(kFootstepMarineScalar);
+        }
+        break;
+    case AVH_USER3_ALIEN_PLAYER1:
+        theScalar = BALANCE_IVAR(kFootstepSkulkScalar);
+        break;
+    case AVH_USER3_ALIEN_PLAYER2:
+        theScalar = BALANCE_IVAR(kFootstepGorgeScalar);
+        break;
+    case AVH_USER3_ALIEN_PLAYER3:
+        theScalar = BALANCE_IVAR(kFootstepLerkScalar);
+        break;
+    case AVH_USER3_ALIEN_PLAYER4:
+        theScalar = BALANCE_IVAR(kFootstepFadeScalar);
+        break;
+    case AVH_USER3_ALIEN_PLAYER5:
+        theScalar = BALANCE_IVAR(kFootstepOnosScalar);
+        break;
+    }
+
+    int theCurrentInterval = max(((float)theScalar/theCurrentSpeed)*100, 200);
+
+    pmove->flTimeStepSound = theCurrentInterval;
+
+    return theFraction;
+}
+
+void PM_SetHulls( void )
+{
+    pmove->player_mins[0][0] = HULL0_MINX;
+    pmove->player_mins[0][1] = HULL0_MINY;
+    pmove->player_mins[0][2] = HULL0_MINZ;
+
+    pmove->player_maxs[0][0] = HULL0_MAXX;
+    pmove->player_maxs[0][1] = HULL0_MAXY;
+    pmove->player_maxs[0][2] = HULL0_MAXZ;
+
+    pmove->player_mins[1][0] = HULL1_MINX;
+    pmove->player_mins[1][1] = HULL1_MINY;
+    pmove->player_mins[1][2] = HULL1_MINZ;
+    
+    pmove->player_maxs[1][0] = HULL1_MAXX;
+    pmove->player_maxs[1][1] = HULL1_MAXY;
+    pmove->player_maxs[1][2] = HULL1_MAXZ;
+
+    pmove->player_mins[2][0] = HULL2_MINX;
+    pmove->player_mins[2][1] = HULL2_MINY;
+    pmove->player_mins[2][2] = HULL2_MINZ;
+    
+    pmove->player_maxs[2][0] = HULL2_MAXX;
+    pmove->player_maxs[2][1] = HULL2_MAXY;
+    pmove->player_maxs[2][2] = HULL2_MAXZ;
+
+    pmove->player_mins[3][0] = HULL3_MINX;
+    pmove->player_mins[3][1] = HULL3_MINY;
+    pmove->player_mins[3][2] = HULL3_MINZ;
+    
+    pmove->player_maxs[3][0] = HULL3_MAXX;
+    pmove->player_maxs[3][1] = HULL3_MAXY;
+    pmove->player_maxs[3][2] = HULL3_MAXZ;
+
+
+    // Work around for a problem in the engine where it always uses the default HL
+    // hull sizes for the clip_mins and clip_maxs. 
+
+    for (int i = 0; i < pmove->numphysent; ++i)
+    {
+
+        // HACK: for some reason the player field isn't correct on the clients.
+        // This is either a problem with HL or with NS's propagation of entities.
+
+        if (pmove->physents[i].info >= 1 && pmove->physents[i].info <= 32)
+        {
+            pmove->physents[i].player = 1;
+        }
+        else
+        {
+            pmove->physents[i].player = 0;
+        }
+        
+        model_s* model = pmove->physents[i].model;
+        
+        if (model)
+        {
+            
+            model->hulls[0].clip_mins[0] = HULL2_MINX;
+            model->hulls[0].clip_mins[1] = HULL2_MINY;
+            model->hulls[0].clip_mins[2] = HULL2_MINZ;
+            
+            model->hulls[0].clip_maxs[0] = HULL2_MAXX;
+            model->hulls[0].clip_maxs[1] = HULL2_MAXY;
+            model->hulls[0].clip_maxs[2] = HULL2_MAXZ;
+
+            model->hulls[1].clip_mins[0] = HULL0_MINX;
+            model->hulls[1].clip_mins[1] = HULL0_MINY;
+            model->hulls[1].clip_mins[2] = HULL0_MINZ;
+            
+            model->hulls[1].clip_maxs[0] = HULL0_MAXX;
+            model->hulls[1].clip_maxs[1] = HULL0_MAXY;
+            model->hulls[1].clip_maxs[2] = HULL0_MAXZ;
+        
+            model->hulls[2].clip_mins[0] = HULL3_MINX;
+            model->hulls[2].clip_mins[1] = HULL3_MINY;
+            model->hulls[2].clip_mins[2] = HULL3_MINZ;
+            
+            model->hulls[2].clip_maxs[0] = HULL3_MAXX;
+            model->hulls[2].clip_maxs[1] = HULL3_MAXY;
+            model->hulls[2].clip_maxs[2] = HULL3_MAXZ;
+            
+            model->hulls[3].clip_mins[0] = HULL1_MINX;
+            model->hulls[3].clip_mins[1] = HULL1_MINY;
+            model->hulls[3].clip_mins[2] = HULL1_MINZ;
+            
+            model->hulls[3].clip_maxs[0] = HULL1_MAXX;
+            model->hulls[3].clip_maxs[1] = HULL1_MAXY;
+            model->hulls[3].clip_maxs[2] = HULL1_MAXZ;
+        
+        }
+    
+    }
+
+}
+
+void PM_UpdateStepSound( void )
+{
+    if(!GetHasUpgrade(pmove->iuser4, MASK_TOPDOWN))
+    {
+        int fWalking;
+        float fvol;
+        vec3_t knee;
+        vec3_t feet;
+        vec3_t center;
+        float height;
+        float speed;
+        float velrun;
+        float velwalk;
+//      float flduck;
+        int fLadder;
+        int step;
+        
+        if ( pmove->flTimeStepSound > 0 )
+            return;
+        
+        if ( pmove->flags & FL_FROZEN )
+            return;
+        
+        PM_CatagorizeTextureType();
+        
+        speed = Length( pmove->velocity );
+        
+        // determine if we are on a ladder
+        fLadder = ( pmove->movetype == MOVETYPE_FLY );// IsOnLadder();
+        
+        // UNDONE: need defined numbers for run, walk, crouch, crouch run velocities!!!!    
+        if ( !GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING) && (( pmove->flags & FL_DUCKING) || fLadder) )
+        {
+            velwalk = 60;       // These constants should be based on cl_movespeedkey * cl_forwardspeed somehow
+            velrun = 80;        // UNDONE: Move walking to server
+//          flduck = 100;
+        }
+        else
+        {
+            velwalk = 120;
+            velrun = 210;
+//          flduck = 0;
+        }
+        
+        // If we're on a ladder or on the ground, and we're moving fast enough,
+        //  play step sound.  Also, if pmove->flTimeStepSound is zero, get the new
+        //  sound right away - we just started moving in new level.
+        if ( (fLadder || GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING) || ( pmove->onground != -1 ) ) && ( Length( pmove->velocity ) > 0.0 ))
+        {
+            fWalking = speed < velrun;      
+            
+            VectorCopy( pmove->origin, center );
+            VectorCopy( pmove->origin, knee );
+            VectorCopy( pmove->origin, feet );
+            
+            height = pmove->player_maxs[ pmove->usehull ][ 2 ] - pmove->player_mins[ pmove->usehull ][ 2 ];
+            
+            knee[2] = pmove->origin[2] - 0.3 * height;
+            feet[2] = pmove->origin[2] - 0.5 * height;
+            
+            // find out what we're stepping in or on...
+            if (fLadder)
+            {
+                step = STEP_LADDER;
+                fvol = 0.35;
+                pmove->flTimeStepSound = 350;
+            }
+            else if ( pmove->PM_PointContents ( knee, NULL ) == CONTENTS_WATER )
+            {
+                step = STEP_WADE;
+                fvol = 0.65;
+                pmove->flTimeStepSound = 600;
+            }
+            else if ( pmove->PM_PointContents ( feet, NULL ) == CONTENTS_WATER )
+            {
+                step = STEP_SLOSH;
+                fvol = fWalking ? 0.2 : 0.5;
+                pmove->flTimeStepSound = fWalking ? 400 : 300;      
+            }
+            else
+            {
+                // find texture under player, if different from current texture, 
+                // get material type
+                step = PM_MapTextureTypeStepType( pmove->chtexturetype );
+                float theFraction = PM_SetStepInterval();
+                
+                switch ( pmove->chtexturetype )
+                {
+                default:
+                case CHAR_TEX_CONCRETE:                     
+                case CHAR_TEX_METAL:    
+                case CHAR_TEX_GRATE:
+                case CHAR_TEX_TILE: 
+                case CHAR_TEX_SLOSH:
+                    //fvol = .2f + .3f*theFraction;
+                    fvol = .7f*theFraction;
+                    break;
+                    
+                case CHAR_TEX_DIRT: 
+                    fvol = .75f*theFraction;
+                    //fvol = .25f + .3f*theFraction;
+                    //fvol = fWalking ? 0.25 : 0.55;
+                    //pmove->flTimeStepSound = fWalking ? 400 : 300;
+                    break;
+                    
+                case CHAR_TEX_VENT: 
+                    fvol = .3f + .5f*theFraction;
+                    //fvol = .5f + .3f*theFraction;
+                    //fvol = fWalking ? 0.4 : 0.7;
+                    //pmove->flTimeStepSound = fWalking ? 400 : 300;
+                    break;
+                }
+            }
+            
+//          pmove->flTimeStepSound += flduck; // slower step time if ducking
+            
+            // play the sound
+            // 35% volume if ducking
+            if (!GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING) && (pmove->flags & FL_DUCKING))
+            {
+                fvol *= 0.35;
+            }
+            
+            PM_PlayStepSound( step, fvol );
+        }
+    }
+}
+
+/*
+================
+PM_AddToTouched
+
+Add's the trace result to touch list, if contact is not already in list.
+================
+*/
+qboolean PM_AddToTouched(pmtrace_t tr, vec3_t impactvelocity)
+{
+    int i;
+
+    for (i = 0; i < pmove->numtouch; i++)
+    {
+        if (pmove->touchindex[i].ent == tr.ent)
+            break;
+    }
+    if (i != pmove->numtouch)  // Already in list.
+        return false;
+
+    VectorCopy( impactvelocity, tr.deltavelocity );
+
+    if (pmove->numtouch >= MAX_PHYSENTS)
+        pmove->Con_DPrintf("Too many entities were touched!\n");
+
+    pmove->touchindex[pmove->numtouch++] = tr;
+    return true;
+}
+
+/*
+================
+PM_CheckVelocity
+
+See if the player has a bogus velocity value.
+================
+*/
+void PM_CheckVelocity ()
+{
+    int     i;
+
+//
+// bound velocity
+//
+    for (i=0 ; i<3 ; i++)
+    {
+        // See if it's bogus.
+        if (IS_NAN(pmove->velocity[i]))
+        {
+            pmove->Con_Printf ("PM  Got a NaN velocity %i\n", i);
+            pmove->velocity[i] = 0;
+        }
+        if (IS_NAN(pmove->origin[i]))
+        {
+            pmove->Con_Printf ("PM  Got a NaN origin on %i\n", i);
+            pmove->origin[i] = 0;
+        }
+
+        // Bound it.
+        if (pmove->velocity[i] > pmove->movevars->maxvelocity) 
+        {
+            pmove->Con_DPrintf ("PM  Got a velocity too high on %i\n", i);
+            pmove->velocity[i] = pmove->movevars->maxvelocity;
+        }
+        else if (pmove->velocity[i] < -pmove->movevars->maxvelocity)
+        {
+            pmove->Con_DPrintf ("PM  Got a velocity too low on %i\n", i);
+            pmove->velocity[i] = -pmove->movevars->maxvelocity;
+        }
+
+    }
+}
+
+/*
+==================
+PM_ClipVelocity
+
+Slide off of the impacting object
+returns the blocked flags:
+0x01 == floor
+0x02 == step / wall
+==================
+*/
+int PM_ClipVelocity (vec3_t in, vec3_t normal, vec3_t out, float overbounce)
+{
+    float   backoff;
+    float   change;
+    float angle;
+    int     i, blocked;
+    
+    angle = normal[ 2 ];
+
+    blocked = 0x00;            // Assume unblocked.
+    if (angle > 0)      // If the plane that is blocking us has a positive z component, then assume it's a floor.
+        blocked |= 0x01;        // 
+    if (!angle)         // If the plane has no Z, it is vertical (wall/step)
+        blocked |= 0x02;        // 
+    
+    // Determine how far along plane to slide based on incoming direction.
+    // Scale by overbounce factor.
+    backoff = DotProduct (in, normal) * overbounce;
+
+    for (i=0 ; i<3 ; i++)
+    {
+        change = normal[i]*backoff;
+        out[i] = in[i] - change;
+        // If out velocity is too small, zero it out.
+        if (out[i] > -STOP_EPSILON && out[i] < STOP_EPSILON)
+            out[i] = 0;
+    }
+    
+    // Return blocking flags.
+    return blocked;
+}
+
+float PM_GetHorizontalSpeed()
+{
+    return sqrtf(pmove->velocity[0] * pmove->velocity[0] +
+                 pmove->velocity[1] * pmove->velocity[1]);
+}
+
+void PM_AddCorrectGravity()
+{
+    float   ent_gravity;
+
+    // TODO: Put back in alien glide when alien upgrades worked out
+//  if(GetHasUpgrade(pmove->iuser4, ALIEN_ABILITY_1))
+//  {
+//      pmove->gravity = .2f;
+//  }
+/*  else */
+    if(pmove->iuser3 == AVH_USER3_ALIEN_PLAYER3)
+    {
+        /*
+        // Glide down
+        if((pmove->cmd.buttons & IN_JUMP) && (pmove->velocity[2] <= 0.0f))
+        {
+            pmove->gravity = .10f;
+        }
+        else
+        {
+            pmove->gravity = .55f;
+        }
+        */
+
+        float theMinGravity = 0.10f;
+        float theMaxGravity = 0.75f;
+        float theGravity = theMaxGravity;
+
+        if (pmove->cmd.buttons & IN_JUMP)
+        {
+        
+            float theSpeed = PM_GetHorizontalSpeed();
+            float theLift  = (theSpeed / 300) * (pmove->forward[2] + 0.5) / 1.5;
+
+            if (theLift < 0)
+            {
+                theLift = 0;
+            }
+            
+            theGravity = theMinGravity + (1 - theLift) * (theMaxGravity - theMinGravity);
+            
+        }
+
+        pmove->gravity = max(min(theGravity, theMaxGravity), theMinGravity);
+    }
+    else
+    {
+        pmove->gravity = 1.0f;
+    }
+
+    // If they're in the air and they have jump held down, and they have the gliding type,
+    // apply less gravity to them
+//  if ( pmove->cmd.buttons & IN_JUMP )
+//  {
+//      if(pmove->iuser3 == AVH_USER3_GLIDE)
+//      {
+//          // Only glide on the way down
+//          if(pmove->velocity[2] < 0)
+//          {
+//              if(pmove->onground == -1)
+//              {
+//                  // Glide and drag baybee
+//                  pmove->gravity = .15f;
+//                  pmove->velocity[0] /= 1.01f;
+//                  pmove->velocity[1] /= 1.01f;
+//              }
+//          }
+//      }
+//  }
+
+    if ( pmove->waterjumptime )
+        return;
+
+    if (pmove->gravity)
+        ent_gravity = pmove->gravity;
+    else
+        ent_gravity = 1.0;
+
+    if(GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING) || GetHasUpgrade(pmove->iuser4, MASK_TOPDOWN))
+    {
+        pmove->gravity = ent_gravity = 0.0f;
+    }
+
+    // Add gravity so they'll be in the correct position during movement
+    // yes, this 0.5 looks wrong, but it's not.  
+    pmove->velocity[2] -= (ent_gravity * pmove->movevars->gravity * 0.5 * pmove->frametime );
+    pmove->velocity[2] += pmove->basevelocity[2] * pmove->frametime;
+    pmove->basevelocity[2] = 0;
+
+    PM_CheckVelocity();
+}
+
+
+void PM_FixupGravityVelocity ()
+{
+    float   ent_gravity;
+
+    if ( pmove->waterjumptime )
+        return;
+
+    if (pmove->gravity)
+        ent_gravity = pmove->gravity;
+    else
+        ent_gravity = 1.0;
+
+    if(GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING) || GetHasUpgrade(pmove->iuser4, MASK_TOPDOWN))
+    {
+        pmove->gravity = ent_gravity = 0.0f;
+    }
+
+    // Get the correct velocity for the end of the dt 
+    pmove->velocity[2] -= (ent_gravity * pmove->movevars->gravity * pmove->frametime * 0.5 );
+
+    PM_CheckVelocity();
+}
+
+/*
+============
+PM_FlyMove
+
+The basic solid body movement clip that slides along multiple planes
+============
+*/
+int PM_FlyMove (void)
+{
+    int         bumpcount, numbumps;
+    vec3_t      dir;
+    float       d;
+    int         numplanes;
+    vec3_t      planes[MAX_CLIP_PLANES];
+    vec3_t      primal_velocity, original_velocity;
+    vec3_t      new_velocity;
+    int         i, j;
+    pmtrace_t   trace;
+    vec3_t      end;
+    float       time_left, allFraction;
+    int         blocked;
+        
+    numbumps  = 4;           // Bump up to four times
+    
+    blocked   = 0;           // Assume not blocked
+    numplanes = 0;           //  and not sliding along any planes
+    VectorCopy (pmove->velocity, original_velocity);  // Store original velocity
+    VectorCopy (pmove->velocity, primal_velocity);
+    
+    allFraction = 0;
+    time_left = pmove->frametime;   // Total time for this movement operation.
+
+    // CGC - Removed zeroing of velocity so commander can float around easily outside of world 1/11/02
+    bool theIsInTopDown = (pmove->iuser4 & MASK_TOPDOWN);
+
+    for (bumpcount=0 ; bumpcount<numbumps ; bumpcount++)
+    {
+        if (!pmove->velocity[0] && !pmove->velocity[1] && !pmove->velocity[2])
+            break;
+
+        // Assume we can move all the way from the current origin to the
+        //  end point.
+        for (i=0 ; i<3 ; i++)
+            end[i] = pmove->origin[i] + time_left * pmove->velocity[i];
+
+        // See if we can make it from origin to end point.
+
+        trace = NS_PlayerTrace (pmove, pmove->origin, end, PM_NORMAL, -1 );
+
+        if(theIsInTopDown)
+        {
+            // Don't collide with anything when we're commander
+            VectorCopy(end, trace.endpos);
+        }
+
+        allFraction += trace.fraction;
+        // If we started in a solid object, or we were in solid space
+        //  the whole way, zero out our velocity and return that we
+        //  are blocked by floor and wall.
+        if (trace.allsolid && !theIsInTopDown)
+        {
+            // entity is trapped in another solid
+            VectorCopy (vec3_origin, pmove->velocity);
+            //Con_DPrintf("Trapped 4\n");
+            return 4;
+        }
+
+        // If we moved some portion of the total distance, then
+        //  copy the end position into the pmove->origin and 
+        //  zero the plane counter.
+        if (trace.fraction > 0 || theIsInTopDown)
+        {   // actually covered some distance
+            VectorCopy (trace.endpos, pmove->origin);
+            VectorCopy (pmove->velocity, original_velocity);
+            numplanes = 0;
+        }
+
+        // If we covered the entire distance, we are done
+        //  and can return.
+        if (trace.fraction == 1 || theIsInTopDown)
+             break;     // moved the entire distance
+
+        //if (!trace.ent)
+        //  Sys_Error ("PM_PlayerTrace: !trace.ent");
+
+        // Save entity that blocked us (since fraction was < 1.0)
+        //  for contact
+        // Add it if it's not already in the list!!!
+        PM_AddToTouched(trace, pmove->velocity);
+
+        // If the plane we hit has a high z component in the normal, then
+        //  it's probably a floor
+        if (trace.plane.normal[2] > 0.7)
+        {
+            blocked |= 1;       // floor
+        }
+        // If the plane has a zero z component in the normal, then it's a 
+        //  step or wall
+        if (!trace.plane.normal[2])
+        {
+            blocked |= 2;       // step / wall
+            //Con_DPrintf("Blocked by %i\n", trace.ent);
+        }
+
+        // Reduce amount of pmove->frametime left by total time left * fraction
+        //  that we covered.
+        time_left -= time_left * trace.fraction;
+        
+        // Did we run out of planes to clip against?
+        if (numplanes >= MAX_CLIP_PLANES)
+        {   // this shouldn't really happen
+            //  Stop our movement if so.
+            VectorCopy (vec3_origin, pmove->velocity);
+            //Con_DPrintf("Too many planes 4\n");
+
+            break;
+        }
+
+        // Set up next clipping plane
+        VectorCopy (trace.plane.normal, planes[numplanes]);
+        numplanes++;
+//
+
+// modify original_velocity so it parallels all of the clip planes
+//
+        if ( pmove->movetype == MOVETYPE_WALK &&
+            ((pmove->onground == -1) || (pmove->friction != 1)) )   // relfect player velocity
+        {
+            for ( i = 0; i < numplanes; i++ )
+            {
+                if ( planes[i][2] > 0.7  )
+                {// floor or slope
+                    PM_ClipVelocity( original_velocity, planes[i], new_velocity, 1 );
+                    VectorCopy( new_velocity, original_velocity );
+                }
+                else                                                            
+                    PM_ClipVelocity( original_velocity, planes[i], new_velocity, 1.0 + pmove->movevars->bounce * (1-pmove->friction) );
+            }
+
+            VectorCopy( new_velocity, pmove->velocity );
+            VectorCopy( new_velocity, original_velocity );
+        }
+        else
+        {
+            for (i=0 ; i<numplanes ; i++)
+            {
+                PM_ClipVelocity (
+                    original_velocity,
+                    planes[i],
+                    pmove->velocity,
+                    1);
+                for (j=0 ; j<numplanes ; j++)
+                    if (j != i)
+                    {
+                        // Are we now moving against this plane?
+                        if (DotProduct (pmove->velocity, planes[j]) < 0)
+                            break;  // not ok
+                    }
+                if (j == numplanes)  // Didn't have to clip, so we're ok
+                    break;
+            }
+            
+            // Did we go all the way through plane set
+            if (i != numplanes)
+            {   // go along this plane
+                // pmove->velocity is set in clipping call, no need to set again.
+                ;  
+            }
+            else
+            {   // go along the crease
+                if (numplanes != 2)
+                {
+                    //Con_Printf ("clip velocity, numplanes == %i\n",numplanes);
+                    VectorCopy (vec3_origin, pmove->velocity);
+                    //Con_DPrintf("Trapped 4\n");
+
+                    break;
+                }
+                CrossProduct (planes[0], planes[1], dir);
+                d = DotProduct (dir, pmove->velocity);
+                VectorScale (dir, d, pmove->velocity );
+            }
+
+    //
+    // if original velocity is against the original velocity, stop dead
+    // to avoid tiny occilations in sloping corners
+    //
+            if (DotProduct (pmove->velocity, primal_velocity) <= 0)
+            {
+                //Con_DPrintf("Back\n");
+                VectorCopy (vec3_origin, pmove->velocity);
+                break;
+            }
+        }
+    }
+
+    if ( allFraction == 0 )
+    {
+        if(!GetHasUpgrade(pmove->iuser4, MASK_TOPDOWN))
+        {
+            VectorCopy (vec3_origin, pmove->velocity);
+        }
+        //Con_DPrintf( "Don't stick\n" );
+    }
+
+    return blocked;
+}
+
+/*
+==============
+PM_Accelerate
+==============
+*/
+void PM_Accelerate (vec3_t wishdir, float wishspeed, float accel)
+{
+    int         i;
+    float       addspeed, accelspeed, currentspeed;
+
+    // Dead player's don't accelerate
+    if (pmove->dead)
+        return;
+
+    // If waterjumping, don't accelerate
+    if (pmove->waterjumptime)
+        return;
+
+    // See if we are changing direction a bit
+    currentspeed = DotProduct (pmove->velocity, wishdir);
+
+    // Reduce wishspeed by the amount of veer.
+    addspeed = wishspeed - currentspeed;
+
+    // If not going to add any speed, done.
+    if (addspeed <= 0)
+        return;
+
+    // Determine amount of accleration.
+    accelspeed = accel * pmove->frametime * wishspeed * pmove->friction;
+    
+    // Cap at addspeed
+    if (accelspeed > addspeed)
+        accelspeed = addspeed;
+    
+    // Adjust velocity.
+    for (i=0 ; i<3 ; i++)
+    {
+        pmove->velocity[i] += accelspeed * wishdir[i];  
+    }
+}
+
+/*
+=====================
+PM_WalkMove
+
+Only used by players.  Moves along the ground when player is a MOVETYPE_WALK.
+======================
+*/
+void PM_WalkMove ()
+{
+    int         clip;
+    int         oldonground;
+    int i;
+
+    vec3_t      wishvel;
+    float       spd;
+    float       fmove, smove, umove;
+    vec3_t      wishdir;
+    float       wishspeed;
+
+    vec3_t dest, start;
+    vec3_t original, originalvel;
+    vec3_t down, downvel;
+    float downdist, updist;
+
+    pmtrace_t trace;
+    
+    // Copy movement amounts
+    fmove = pmove->cmd.forwardmove;
+    smove = pmove->cmd.sidemove;
+    // Added by mmcguire.
+    umove = pmove->cmd.upmove;
+
+    float theVelocityLength = Length(pmove->velocity);
+    //pmove->Con_Printf("Max speed: %f, velocity: %f\n", pmove->maxspeed, theVelocityLength);
+
+    // Marines move slower when moving backwards or sideways
+    if(pmove->iuser3 == AVH_USER3_MARINE_PLAYER)
+    {
+        if(fmove < 0)
+        {
+            fmove *= kMarineBackpedalSpeedScalar;
+        }
+
+        smove *= kMarineSidestepSpeedScalar;
+    }
+
+    if(GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING))
+    {
+
+        vec3_t theForwardView, theRightView, theUpView;
+
+        VectorCopy(pmove->forward, theForwardView);
+        VectorCopy(pmove->up, theUpView);
+
+        VectorNormalize(theForwardView);
+        VectorNormalize(theUpView);
+        
+        CrossProduct(theForwardView, theUpView, theRightView);
+        
+        // Changed by mmcguire. Added up movement.
+        for (i=0 ; i<3 ; i++)
+        {
+            wishvel[i] = theForwardView[i]*fmove + theRightView[i]*smove + theUpView[i]*umove;
+        }
+    
+    }
+    else
+    {
+        // Zero out z components of movement vectors
+        pmove->forward[2] = 0;
+        pmove->right[2]   = 0;
+        
+        VectorNormalize (pmove->forward);  // Normalize remainder of vectors.
+        VectorNormalize (pmove->right);    // 
+
+        //pmove->Con_Printf("PM_WalkMove()->fmove: %f\n", fmove);
+
+        if (PM_GetIsCharging())
+        {
+            SetUpgradeMask(&pmove->iuser4, MASK_ALIEN_MOVEMENT, true);
+
+            if(fmove)
+            {
+                int a = 0;
+            }
+            // Modify fmove?
+            fmove = 500;
+        }
+        
+        for (i=0 ; i<2 ; i++)       // Determine x and y parts of velocity
+            wishvel[i] = pmove->forward[i]*fmove + pmove->right[i]*smove;
+
+        wishvel[2] = 0;             // Zero out z part of velocity
+    }
+    
+    VectorCopy (wishvel, wishdir);   // Determine maginitude of speed of move
+    wishspeed = VectorNormalize(wishdir);
+
+//
+// Clamp to server defined max speed
+//
+    if (wishspeed > pmove->maxspeed)
+    {
+        VectorScale (wishvel, pmove->maxspeed/wishspeed, wishvel);
+        wishspeed = pmove->maxspeed;
+    }
+
+    // Set pmove velocity
+    if(!GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING))
+        pmove->velocity[2] = 0;
+
+    PM_Accelerate (wishdir, wishspeed, pmove->movevars->accelerate);
+
+    if(!GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING))
+        pmove->velocity[2] = 0;
+
+    // Add in any base velocity to the current velocity.
+    VectorAdd (pmove->velocity, pmove->basevelocity, pmove->velocity );
+
+    spd = Length( pmove->velocity );
+
+    if (spd < 1.0f)
+    {
+        VectorClear( pmove->velocity );
+        return;
+    }
+
+    // If we are not moving, do nothing
+    //if (!pmove->velocity[0] && !pmove->velocity[1] && !pmove->velocity[2])
+    //  return;
+
+    oldonground = pmove->onground;
+
+// first try just moving to the destination 
+    dest[0] = pmove->origin[0] + pmove->velocity[0]*pmove->frametime;
+    dest[1] = pmove->origin[1] + pmove->velocity[1]*pmove->frametime;   
+
+    // Wall-sticking change
+    //dest[2] = pmove->origin[2];
+    dest[2] = pmove->origin[2] + pmove->velocity[2]*pmove->frametime;
+
+    // first try moving directly to the next spot
+    VectorCopy (dest, start);
+
+        trace = NS_PlayerTrace (pmove, pmove->origin, dest, PM_NORMAL, -1 );    
+
+    
+    // If we made it all the way, then copy trace end
+    //  as new player position.
+    if (trace.fraction == 1)
+    {
+        VectorCopy (trace.endpos, pmove->origin);
+        return;
+    }
+
+    if(!GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING))
+    {
+        if (oldonground == -1 &&   // Don't walk up stairs if not on ground.
+            pmove->waterlevel  == 0)
+            return;
+    }
+    
+    if (pmove->waterjumptime)         // If we are jumping out of water, don't do anything more.
+        return;
+
+    // Try sliding forward both on ground and up 16 pixels
+    //  take the move that goes farthest
+    VectorCopy (pmove->origin, original);       // Save out original pos &
+    VectorCopy (pmove->velocity, originalvel);  //  velocity.
+
+    // Slide move
+    clip = PM_FlyMove ();
+
+    // Copy the results out
+    VectorCopy (pmove->origin  , down);
+    VectorCopy (pmove->velocity, downvel);
+
+    // Reset original values.
+    VectorCopy (original, pmove->origin);
+
+    VectorCopy (originalvel, pmove->velocity);
+
+    // Start out up one stair height
+    VectorCopy (pmove->origin, dest);
+    //dest[2] += pmove->movevars->stepsize;
+    dest[2] += NS_GetStepsize(pmove->iuser3);
+    
+    trace = NS_PlayerTrace (pmove, pmove->origin, dest, PM_NORMAL, -1 );    
+
+    // If we started okay and made it part of the way at least,
+    //  copy the results to the movement start position and then
+    //  run another move try.
+    if (!trace.startsolid && !trace.allsolid)
+    {
+        VectorCopy (trace.endpos, pmove->origin);
+    }
+
+// slide move the rest of the way.
+    clip = PM_FlyMove ();
+
+// Now try going back down from the end point
+//  press down the stepheight
+    VectorCopy (pmove->origin, dest);
+    //dest[2] -= pmove->movevars->stepsize;
+    dest[2] -= NS_GetStepsize(pmove->iuser3);
+    
+    trace = NS_PlayerTrace (pmove, pmove->origin, dest, PM_NORMAL, -1 );
+
+    // If we are not on the ground any more then
+    //  use the original movement attempt
+    if ( trace.plane.normal[2] < 0.7)
+        goto usedown;
+    // If the trace ended up in empty space, copy the end
+    //  over to the origin.
+    if (!trace.startsolid && !trace.allsolid)
+    {
+        VectorCopy (trace.endpos, pmove->origin);
+    }
+    // Copy this origion to up.
+    VectorCopy (pmove->origin, pmove->up);
+
+    // decide which one went farther
+    downdist = (down[0] - original[0])*(down[0] - original[0])
+             + (down[1] - original[1])*(down[1] - original[1]);
+    updist   = (pmove->up[0]   - original[0])*(pmove->up[0]   - original[0])
+             + (pmove->up[1]   - original[1])*(pmove->up[1]   - original[1]);
+
+    if (downdist > updist)
+    {
+usedown:
+        VectorCopy (down   , pmove->origin);
+        VectorCopy (downvel, pmove->velocity);
+    } else // copy z value from slide move
+        pmove->velocity[2] = downvel[2];
+}
+
+/*
+==================
+PM_Friction
+
+Handles both ground friction and water friction
+==================
+*/
+void PM_Friction (void)
+{
+    float   *vel;
+    float   speed, newspeed, control;
+    float   friction;
+    float   drop;
+    vec3_t newvel;
+    
+    // If we are in water jump cycle, don't apply friction
+    if (pmove->waterjumptime)
+        return;
+
+    if (PM_GetIsBlinking())
+        return;
+
+    // Get velocity
+    vel = pmove->velocity;
+    
+    // Calculate speed
+    speed = sqrt(vel[0]*vel[0] +vel[1]*vel[1] + vel[2]*vel[2]);
+    
+    // If too slow, return
+    if (speed < 0.1f)
+    {
+        return;
+    }
+
+    drop = 0;
+
+// apply ground friction
+    if ((pmove->onground != -1) || (GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING)))  // On an entity that is the ground
+    {
+        vec3_t start, stop;
+        pmtrace_t trace;
+
+        start[0] = stop[0] = pmove->origin[0] + vel[0]/speed*16;
+        start[1] = stop[1] = pmove->origin[1] + vel[1]/speed*16;
+        start[2] = pmove->origin[2] + pmove->player_mins[pmove->usehull][2];
+        stop[2] = start[2] - 34;
+
+        trace = NS_PlayerTrace (pmove, start, stop, PM_NORMAL, -1 );
+
+        if (trace.fraction == 1.0)
+            friction = pmove->movevars->friction*pmove->movevars->edgefriction;
+        else
+            friction = pmove->movevars->friction;
+        
+        // Grab friction value.
+        //friction = pmove->movevars->friction;      
+
+        friction *= pmove->friction;  // player friction?
+
+        // Bleed off some speed, but if we have less than the bleed
+        //  threshhold, bleed the theshold amount.
+        control = (speed < pmove->movevars->stopspeed) ?
+            pmove->movevars->stopspeed : speed;
+        // Add the amount to t'he drop amount.
+        drop += control*friction*pmove->frametime;
+    }
+
+// apply water friction
+//  if (pmove->waterlevel)
+//      drop += speed * pmove->movevars->waterfriction * waterlevel * pmove->frametime;
+
+// scale the velocity
+    newspeed = speed - drop;
+    if (newspeed < 0)
+        newspeed = 0;
+
+    // Determine proportion of old speed we are using.
+    newspeed /= speed;
+
+    // Adjust velocity according to proportion.
+    newvel[0] = vel[0] * newspeed;
+    newvel[1] = vel[1] * newspeed;
+    newvel[2] = vel[2] * newspeed;
+
+    VectorCopy( newvel, pmove->velocity );
+}
+
+void PM_AirAccelerate (vec3_t wishdir, float wishspeed, float accel)
+{
+    int         i;
+    float       addspeed, accelspeed, currentspeed, wishspd = wishspeed;
+        
+    if (pmove->dead)
+        return;
+    if (pmove->waterjumptime)
+        return;
+    if(GetHasUpgrade(pmove->iuser4, MASK_TOPDOWN))
+        return;
+
+    // Cap speed
+    //wishspd = VectorNormalize (pmove->wishveloc);
+    
+    if (wishspd > 30)
+        wishspd = 30;
+    // Determine veer amount
+    currentspeed = DotProduct (pmove->velocity, wishdir);
+    // See how much to add
+    addspeed = wishspd - currentspeed;
+    // If not adding any, done.
+    if (addspeed <= 0)
+        return;
+    // Determine acceleration speed after acceleration
+
+    accelspeed = accel * wishspeed * pmove->frametime * pmove->friction;
+    // Cap it
+    if (accelspeed > addspeed)
+        accelspeed = addspeed;
+    
+    // Adjust pmove vel.
+    for (i=0 ; i<3 ; i++)
+    {
+        pmove->velocity[i] += accelspeed*wishdir[i];    
+    }
+}
+
+/*
+===================
+PM_WaterMove
+
+===================
+*/
+void PM_WaterMove (void)
+{
+    int     i;
+    vec3_t  wishvel;
+    float   wishspeed;
+    vec3_t  wishdir;
+    vec3_t  start, dest;
+    vec3_t  temp;
+    pmtrace_t   trace;
+
+    float speed, newspeed, addspeed, accelspeed;
+
+//
+// user intentions
+//
+    for (i=0 ; i<3 ; i++)
+        wishvel[i] = pmove->forward[i]*pmove->cmd.forwardmove + pmove->right[i]*pmove->cmd.sidemove;
+
+    // Sinking after no other movement occurs
+    if (!pmove->cmd.forwardmove && !pmove->cmd.sidemove && !pmove->cmd.upmove)
+        wishvel[2] -= 60;       // drift towards bottom
+    else  // Go straight up by upmove amount.
+        wishvel[2] += pmove->cmd.upmove;
+
+    // Copy it over and determine speed
+    VectorCopy (wishvel, wishdir);
+    wishspeed = VectorNormalize(wishdir);
+
+    // Cap speed.
+    if (wishspeed > pmove->maxspeed)
+    {
+        VectorScale (wishvel, pmove->maxspeed/wishspeed, wishvel);
+        wishspeed = pmove->maxspeed;
+    }
+    // Slow us down a bit.
+    wishspeed *= 0.8;
+
+    VectorAdd (pmove->velocity, pmove->basevelocity, pmove->velocity);
+// Water friction
+    VectorCopy(pmove->velocity, temp);
+    speed = VectorNormalize(temp);
+    if (speed)
+    {
+        newspeed = speed - pmove->frametime * speed * pmove->movevars->friction * pmove->friction;
+
+        if (newspeed < 0)
+            newspeed = 0;
+        VectorScale (pmove->velocity, newspeed/speed, pmove->velocity);
+    }
+    else
+        newspeed = 0;
+
+//
+// water acceleration
+//
+    if ( wishspeed < 0.1f )
+    {
+        return;
+    }
+
+    addspeed = wishspeed - newspeed;
+    if (addspeed > 0)
+    {
+
+        VectorNormalize(wishvel);
+        accelspeed = pmove->movevars->accelerate * wishspeed * pmove->frametime * pmove->friction;
+        if (accelspeed > addspeed)
+            accelspeed = addspeed;
+
+        for (i = 0; i < 3; i++)
+            pmove->velocity[i] += accelspeed * wishvel[i];
+    }
+
+// Now move
+// assume it is a stair or a slope, so press down from stepheight above
+    VectorMA (pmove->origin, pmove->frametime, pmove->velocity, dest);
+    VectorCopy (dest, start);
+
+    //start[2] += pmove->movevars->stepsize + 1;
+    start[2] += NS_GetStepsize(pmove->iuser3) + 1;
+
+    trace = NS_PlayerTrace (pmove, start, dest, PM_NORMAL, -1 );
+    
+    if (!trace.startsolid && !trace.allsolid)   // FIXME: check steep slope?
+    {   // walked up the step, so just keep result and exit
+        VectorCopy (trace.endpos, pmove->origin);
+        return;
+    }
+    
+    // Try moving straight along out normal path.
+    PM_FlyMove ();
+}
+
+
+/*
+===================
+PM_AirMove
+
+===================
+*/
+void PM_AirMove (void)
+{
+    int         i;
+    vec3_t      wishvel;
+    float       fmove, smove;
+    vec3_t      wishdir;
+    float       wishspeed;
+
+    // Copy movement amounts
+    fmove = pmove->cmd.forwardmove;
+    smove = pmove->cmd.sidemove;
+    
+    // Zero out z components of movement vectors
+    pmove->forward[2] = 0;
+    pmove->right[2]   = 0;
+    // Renormalize
+    VectorNormalize (pmove->forward);
+    VectorNormalize (pmove->right);
+
+    // Determine x and y parts of velocity
+    for (i=0 ; i<2 ; i++)       
+    {
+        wishvel[i] = pmove->forward[i]*fmove + pmove->right[i]*smove;
+    }
+    // Zero out z part of velocity
+    wishvel[2] = 0;             
+
+     // Determine maginitude of speed of move
+    VectorCopy (wishvel, wishdir);  
+    wishspeed = VectorNormalize(wishdir);
+
+    // Clamp to server defined max speed
+    if (wishspeed > pmove->maxspeed)
+    {
+        VectorScale (wishvel, pmove->maxspeed/wishspeed, wishvel);
+        wishspeed = pmove->maxspeed;
+    }
+
+    PM_PreventMegaBunnyJumping(true);
+    
+	float theAirAccelerate = gIsJetpacking[pmove->player_index] ? pmove->movevars->airaccelerate*4 : pmove->movevars->airaccelerate;
+    if(pmove->iuser3 == AVH_USER3_ALIEN_PLAYER3)
+    {
+        theAirAccelerate = pmove->movevars->airaccelerate/22.0f;
+    }
+        
+    PM_AirAccelerate (wishdir, wishspeed, theAirAccelerate);
+
+    // Add in any base velocity to the current velocity.
+    VectorAdd (pmove->velocity, pmove->basevelocity, pmove->velocity );
+
+    //pmove->Con_Printf("airmove wish vel: %f %f %f\n", wishvel[0], wishvel[1], wishvel[2]);
+    //pmove->Con_Printf("airmove vel: %f %f %f\n", pmove->velocity[0], pmove->velocity[1], pmove->velocity[2]);
+
+    PM_FlyMove ();
+}
+
+qboolean PM_InWater( void )
+{
+    return ( pmove->waterlevel > 1 );
+}
+
+/*
+=============
+PM_CheckWater
+
+Sets pmove->waterlevel and pmove->watertype values.
+=============
+*/
+qboolean PM_CheckWater ()
+{
+    vec3_t  point;
+    int     cont;
+    int     truecont;
+    float     height;
+    float       heightover2;
+
+    // Pick a spot just above the players feet.
+    point[0] = pmove->origin[0] + (pmove->player_mins[pmove->usehull][0] + pmove->player_maxs[pmove->usehull][0]) * 0.5;
+    point[1] = pmove->origin[1] + (pmove->player_mins[pmove->usehull][1] + pmove->player_maxs[pmove->usehull][1]) * 0.5;
+    point[2] = pmove->origin[2] + pmove->player_mins[pmove->usehull][2] + 1;
+    
+    // Assume that we are not in water at all.
+    pmove->waterlevel = 0;
+    pmove->watertype = CONTENTS_EMPTY;
+
+    // Not sure why this is happening, but the commander on hera, above the droppad is returning CONTENTS_WATER
+    // The commander can never be under water
+    if(!GetHasUpgrade(pmove->iuser4, MASK_TOPDOWN))
+    {
+        // Grab point contents.
+        cont = pmove->PM_PointContents (point, &truecont );
+        // Are we under water? (not solid and not empty?)
+        if (cont <= CONTENTS_WATER && cont > CONTENTS_TRANSLUCENT )
+        {
+            // Set water type
+            pmove->watertype = cont;
+        
+            // We are at least at level one
+            pmove->waterlevel = 1;
+        
+            height = (pmove->player_mins[pmove->usehull][2] + pmove->player_maxs[pmove->usehull][2]);
+            heightover2 = height * 0.5;
+        
+            // Now check a point that is at the player hull midpoint.
+            point[2] = pmove->origin[2] + heightover2;
+            cont = pmove->PM_PointContents (point, NULL );
+            // If that point is also under water...
+            if (cont <= CONTENTS_WATER && cont > CONTENTS_TRANSLUCENT )
+            {
+                // Set a higher water level.
+                pmove->waterlevel = 2;
+        
+                // Now check the eye position.  (view_ofs is relative to the origin)
+                point[2] = pmove->origin[2] + pmove->view_ofs[2];
+        
+                cont = pmove->PM_PointContents (point, NULL );
+                if (cont <= CONTENTS_WATER && cont > CONTENTS_TRANSLUCENT ) 
+                    pmove->waterlevel = 3;  // In over our eyes
+            }
+        
+            // Adjust velocity based on water current, if any.
+            if ( ( truecont <= CONTENTS_CURRENT_0 ) &&
+                 ( truecont >= CONTENTS_CURRENT_DOWN ) )
+            {
+                // The deeper we are, the stronger the current.
+                static vec3_t current_table[] =
+                {
+                    {1, 0, 0}, {0, 1, 0}, {-1, 0, 0},
+                    {0, -1, 0}, {0, 0, 1}, {0, 0, -1}
+                };
+        
+                VectorMA (pmove->basevelocity, 50.0*pmove->waterlevel, current_table[CONTENTS_CURRENT_0 - truecont], pmove->basevelocity);
+            }
+        }
+    }
+
+    return pmove->waterlevel > 1;
+}
+
+/*
+=============
+PM_CategorizePosition
+=============
+*/
+void PM_CategorizePosition (void)
+{
+    vec3_t      point;
+    pmtrace_t       tr;
+
+// if the player hull point one unit down is solid, the player
+// is on ground
+
+// see if standing on something solid   
+
+    // Doing this before we move may introduce a potential latency in water detection, but
+    // doing it after can get us stuck on the bottom in water if the amount we move up
+    // is less than the 1 pixel 'threshold' we're about to snap to. Also, we'll call
+    // this several times per frame, so we really need to avoid sticking to the bottom of
+    // water on each call, and the converse case will correct itself if called twice.
+    PM_CheckWater();
+
+    point[0] = pmove->origin[0];
+    point[1] = pmove->origin[1];
+    point[2] = pmove->origin[2] - 2;
+
+    if (pmove->velocity[2] > 180)   // Shooting up really fast.  Definitely not on ground.
+    {
+        pmove->onground = -1;
+    }
+    else
+    {
+        // Try and move down.
+        tr = NS_PlayerTrace (pmove, pmove->origin, point, PM_NORMAL, -1 );
+
+//      // If we hit a steep plane, we are not on ground
+//      if ( tr.plane.normal[2] < 0.7)
+//          pmove->onground = -1;   // too steep
+//      else
+//          pmove->onground = tr.ent;  // Otherwise, point to index of ent under us.
+
+        // Change from Mr. Blonde, to fix weird problems when standing on buildings or resource nodes
+        if(tr.ent > 0 && !pmove->physents[tr.ent].model)
+        {
+            pmove->onground = tr.ent; // Standing on a point entity
+        }
+        else if ( tr.plane.normal[2] < 0.7 )
+        {
+            pmove->onground = -1;   // too steep
+        }
+        else
+        {
+            pmove->onground = tr.ent;  // Otherwise, point to index of ent under us.
+        }
+
+        // If we are on something...
+        if (pmove->onground != -1)
+        {
+            // Then we are not in water jump sequence
+            pmove->waterjumptime = 0;
+            // If we could make the move, drop us down that 1 pixel
+            if (pmove->waterlevel < 2 && !tr.startsolid && !tr.allsolid)
+                VectorCopy (tr.endpos, pmove->origin);
+        }
+
+        // Standing on an entity other than the world
+        if (tr.ent > 0)   // So signal that we are touching something.
+        {
+            PM_AddToTouched(tr, pmove->velocity);
+        }
+    }
+}
+
+/*
+=================
+PM_GetRandomStuckOffsets
+
+When a player is stuck, it's costly to try and unstick them
+Grab a test offset for the player based on a passed in index
+=================
+*/
+int PM_GetRandomStuckOffsets(int nIndex, int server, vec3_t offset)
+{
+ // Last time we did a full
+    int idx;
+    idx = rgStuckLast[nIndex][server]++;
+
+    VectorCopy(rgv3tStuckTable[idx % 54], offset);
+
+    return (idx % 54);
+}
+
+void PM_ResetStuckOffsets(int nIndex, int server)
+{
+    rgStuckLast[nIndex][server] = 0;
+}
+
+/*
+=================
+NudgePosition
+
+If pmove->origin is in a solid position,
+try nudging slightly on all axis to
+allow for the cut precision of the net coordinates
+=================
+*/
+#define PM_CHECKSTUCK_MINTIME 0.05  // Don't check again too quickly.
+
+int PM_CheckStuck (void)
+{
+    // Can't be stuck when you're a commander, allows commander to fly around outside the world.  Do the same for observers/spectators?
+    if(GetHasUpgrade(pmove->iuser4, MASK_TOPDOWN))
+    {
+        return 0;
+    }
+
+    vec3_t  base;
+    vec3_t  offset;
+    vec3_t  test;
+    int     hitent;
+    int     idx;
+    float   fTime;
+    int i;
+    pmtrace_t traceresult;
+
+
+
+//  int theEntNumber = 1;
+//  
+//  vec3_t theMins;
+//  VectorCopy(pmove->physents[theEntNumber].mins, theMins);
+//  
+//  vec3_t theMaxs;
+//  VectorCopy(pmove->physents[theEntNumber].maxs, theMaxs);
+//  
+//  //char* theName = pmove->physents[hitent].model
+//  //int theModType = pmove->PM_GetModelType( pmove->physents[hitent].model );
+//  
+//  int theSolidity = pmove->physents[theEntNumber].solid;
+//
+//  vec3_t theAngles;
+//  VectorCopy(pmove->physents[theEntNumber].angles, theAngles);
+//
+//  vec3_t theOrigin;
+//  VectorCopy(pmove->physents[theEntNumber].origin, theOrigin);
+//  
+//  if(pmove->server)
+//  {
+//      pmove->Con_DPrintf("Server: ent: %d, solidity: %d  mins(%f, %f, %f), maxs(%f, %f, %f), origin(%f, %f, %f), angles(%f, %f, %f)\n", theEntNumber, theSolidity, theMins[0], theMins[1], theMins[2], theMaxs[0], theMaxs[1], theMaxs[2], theOrigin[0], theOrigin[1], theOrigin[2], theAngles[0], theAngles[1], theAngles[2]);
+//  }
+//  else
+//  {
+//      pmove->Con_DPrintf("Client: ent: %d, solidity: %d  mins(%f, %f, %f), maxs(%f, %f, %f), origin(%f, %f, %f), angles(%f, %f, %f)\n", theEntNumber, theSolidity, theMins[0], theMins[1], theMins[2], theMaxs[0], theMaxs[1], theMaxs[2], theOrigin[0], theOrigin[1], theOrigin[2], theAngles[0], theAngles[1], theAngles[2]);
+//  }
+    
+
+
+
+
+    static float rgStuckCheckTime[MAX_CLIENTS][2]; // Last time we did a full
+
+    // If position is okay, exit
+    //hitent = pmove->PM_TestPlayerPosition (pmove->origin, &traceresult );
+    hitent = NS_TestPlayerPosition(pmove, pmove->origin, &traceresult);
+
+    if (hitent == -1 )
+    {
+        PM_ResetStuckOffsets( pmove->player_index, pmove->server );
+        return 0;
+    }
+
+    VectorCopy (pmove->origin, base);
+
+    // 
+    // Deal with precision error in network.
+    // 
+    if (!pmove->server)
+    {
+        // World or BSP model
+        if ( ( hitent == 0 ) ||
+             ( pmove->physents[hitent].model != NULL ) )
+        {
+            int nReps = 0;
+            PM_ResetStuckOffsets( pmove->player_index, pmove->server );
+            do 
+            {
+                i = PM_GetRandomStuckOffsets(pmove->player_index, pmove->server, offset);
+
+                VectorAdd(base, offset, test);
+                //if (pmove->PM_TestPlayerPosition (test, &traceresult ) == -1)
+                if (NS_TestPlayerPosition(pmove, test, &traceresult ) == -1)
+                {
+                    PM_ResetStuckOffsets( pmove->player_index, pmove->server );
+        
+                    VectorCopy ( test, pmove->origin );
+                    return 0;
+                }
+                nReps++;
+            } while (nReps < 54);
+        }
+    }
+
+    // Only an issue on the client.
+
+    if (pmove->server)
+        idx = 0;
+    else
+        idx = 1;
+
+    fTime = pmove->Sys_FloatTime();
+    // Too soon?
+    if (rgStuckCheckTime[pmove->player_index][idx] >= 
+        ( fTime - PM_CHECKSTUCK_MINTIME ) )
+    {
+        return 1;
+    }
+    rgStuckCheckTime[pmove->player_index][idx] = fTime;
+
+    pmove->PM_StuckTouch( hitent, &traceresult );
+
+    i = PM_GetRandomStuckOffsets(pmove->player_index, pmove->server, offset);
+
+    VectorAdd(base, offset, test);
+    
+    if ( ( hitent = NS_TestPlayerPosition (pmove, test, NULL ) ) == -1 )
+    //if ( ( hitent = pmove->PM_TestPlayerPosition ( test, NULL ) ) == -1 )
+    {
+        //pmove->Con_DPrintf("Nudged\n");
+
+        PM_ResetStuckOffsets( pmove->player_index, pmove->server );
+
+        if (i >= 27)
+            VectorCopy ( test, pmove->origin );
+
+        return 0;
+    }
+
+    // If player is flailing while stuck in another player ( should never happen ), then see
+    //  if we can't "unstick" them forceably.
+    if ( pmove->cmd.buttons & ( IN_JUMP | IN_DUCK | IN_ATTACK ) && ( pmove->physents[ hitent ].player != 0 ) )
+    {
+        float x, y, z;
+        float xystep = 8.0;
+        float zstep = 18.0;
+        float xyminmax = xystep;
+        float zminmax = 4 * zstep;
+        
+        for ( z = 0; z <= zminmax; z += zstep )
+        {
+            for ( x = -xyminmax; x <= xyminmax; x += xystep )
+            {
+                for ( y = -xyminmax; y <= xyminmax; y += xystep )
+                {
+                    VectorCopy( base, test );
+                    test[0] += x;
+                    test[1] += y;
+                    test[2] += z;
+
+                    //if ( pmove->PM_TestPlayerPosition ( test, NULL ) == -1 )
+                    if (NS_TestPlayerPosition (pmove, test, NULL ) == -1 )
+                    {
+                        VectorCopy( test, pmove->origin );
+                        return 0;
+                    }
+                }
+            }
+        }
+    }
+
+    //VectorCopy (base, pmove->origin);
+
+    return 1;
+}
+
+/*
+===============
+PM_SpectatorMove
+===============
+*/
+void PM_SpectatorMove (void)
+{
+    float   speed, drop, friction, control, newspeed;
+    //float   accel;
+    float   currentspeed, addspeed, accelspeed;
+    int         i;
+    vec3_t      wishvel;
+    float       fmove, smove;
+    vec3_t      wishdir;
+    float       wishspeed;
+    // this routine keeps track of the spectators psoition
+    // there a two different main move types : track player or moce freely (OBS_ROAMING)
+    // doesn't need excate track position, only to generate PVS, so just copy
+    // targets position and real view position is calculated on client (saves server CPU)
+    
+    if ( pmove->iuser1 == OBS_ROAMING)
+    {
+
+#ifdef AVH_CLIENT
+        // jump only in roaming mode
+        if ( iJumpSpectator )
+        {
+            VectorCopy( vJumpOrigin, pmove->origin );
+            VectorCopy( vJumpAngles, pmove->angles );
+            VectorCopy( vec3_origin, pmove->velocity );
+            iJumpSpectator  = 0;
+            return;
+        }
+        #endif
+        // Move around in normal spectator method
+
+        speed = Length (pmove->velocity);
+        if (speed < 1)
+        {
+            VectorCopy (vec3_origin, pmove->velocity)
+        }
+        else
+        {
+            drop = 0;
+
+            friction = pmove->movevars->friction*1.5;   // extra friction
+            control = speed < pmove->movevars->stopspeed ? pmove->movevars->stopspeed : speed;
+            drop += control*friction*pmove->frametime;
+
+            // scale the velocity
+            newspeed = speed - drop;
+            if (newspeed < 0)
+                newspeed = 0;
+            newspeed /= speed;
+
+            VectorScale (pmove->velocity, newspeed, pmove->velocity);
+        }
+
+        // accelerate
+        fmove = pmove->cmd.forwardmove;
+        smove = pmove->cmd.sidemove;
+        
+        VectorNormalize (pmove->forward);
+        VectorNormalize (pmove->right);
+
+        for (i=0 ; i<3 ; i++)
+        {
+            wishvel[i] = pmove->forward[i]*fmove + pmove->right[i]*smove;
+        }
+        wishvel[2] += pmove->cmd.upmove;
+
+        VectorCopy (wishvel, wishdir);
+        wishspeed = VectorNormalize(wishdir);
+        
+        //
+        // clamp to server defined max speed
+        //
+        if (wishspeed > pmove->movevars->spectatormaxspeed)
+        {
+            VectorScale (wishvel, pmove->movevars->spectatormaxspeed/wishspeed, wishvel);
+            wishspeed = pmove->movevars->spectatormaxspeed;
+        }
+        
+        currentspeed = DotProduct(pmove->velocity, wishdir);
+        addspeed = wishspeed - currentspeed;
+        if (addspeed <= 0)
+            return;
+        
+        accelspeed = pmove->movevars->accelerate*pmove->frametime*wishspeed;
+        if (accelspeed > addspeed)
+            accelspeed = addspeed;
+        
+        for (i=0 ; i<3 ; i++)
+            pmove->velocity[i] += accelspeed*wishdir[i];    
+        
+        // move
+        VectorMA (pmove->origin, pmove->frametime, pmove->velocity, pmove->origin);
+    }
+    else
+    {
+        // all other modes just track some kind of target, so spectator PVS = target PVS
+        
+        int target;
+        
+        // no valid target ?
+        if ( pmove->iuser2 <= 0)
+            return;
+        
+        // Find the client this player's targeting
+        for (target = 0; target < pmove->numphysent; target++)
+        {
+            if ( pmove->physents[target].info == pmove->iuser2 )
+                break;
+        }
+        
+        if (target == pmove->numphysent)
+            return;
+        
+        // use targets position as own origin for PVS
+        VectorCopy( pmove->physents[target].angles, pmove->angles );
+        VectorCopy( pmove->physents[target].origin, pmove->origin );
+        
+        // no velocity
+        VectorCopy( vec3_origin, pmove->velocity );
+    }
+}
+
+/*
+==================
+PM_SplineFraction
+
+Use for ease-in, ease-out style interpolation (accel/decel)
+Used by ducking code.
+==================
+*/
+float PM_SplineFraction( float value, float scale )
+{
+    float valueSquared;
+
+    value = scale * value;
+    valueSquared = value * value;
+
+    // Nice little ease-in, ease-out spline-like curve
+    return 3 * valueSquared - 2 * valueSquared * value;
+}
+
+void PM_FixPlayerCrouchStuck( int direction )
+{
+    int     hitent;
+    int i;
+    vec3_t test;
+
+    hitent = pmove->PM_TestPlayerPosition ( pmove->origin, NULL );
+    if (hitent == -1 )
+        return;
+    
+    VectorCopy( pmove->origin, test );  
+    for ( i = 0; i < 36; i++ )
+    {
+        pmove->origin[2] += direction;
+        
+        hitent = NS_TestPlayerPosition (pmove, pmove->origin, NULL );
+        //hitent = pmove->PM_TestPlayerPosition ( pmove->origin, NULL );
+        if (hitent == -1 )
+            return;
+    }
+
+    VectorCopy( test, pmove->origin ); // Failed
+}
+
+void PM_UnDuck( void )
+{
+    if(AvHMUGetCanDuck(pmove->iuser3))
+    {
+
+        pmtrace_t trace;
+        vec3_t newOrigin;
+        
+        VectorCopy( pmove->origin, newOrigin );
+        
+        if ( pmove->onground != -1 )
+        {
+            int theStandingHull = AvHMUGetHull(false, pmove->iuser3);
+            int theCrouchingHull = AvHMUGetHull(true, pmove->iuser3);
+
+            newOrigin[2] += ( pmove->player_mins[theCrouchingHull][2] - pmove->player_mins[theStandingHull][2] );
+        }
+
+        trace = NS_PlayerTrace(pmove, newOrigin, newOrigin, PM_NORMAL, -1 );        
+        
+        if ( !trace.startsolid )
+        {
+            //pmove->usehull = 0;
+            pmove->usehull = AvHMUGetHull(false, pmove->iuser3);
+            
+            // Oh, no, changing hulls stuck us into something, try unsticking downward first.
+            
+            trace = NS_PlayerTrace(pmove, newOrigin, newOrigin, PM_NORMAL, -1  );
+
+            if ( trace.startsolid )
+            {
+                // Trace again for onos, but move us up first.  Trying to get him unstick by moving down will never work for him.
+                if(pmove->iuser3 == AVH_USER3_ALIEN_PLAYER5)
+                {
+                    newOrigin[2] += 30;
+                }
+
+                trace = NS_PlayerTrace(pmove, newOrigin, newOrigin, PM_NORMAL, -1  );
+
+                if ( trace.startsolid )
+                {
+                    
+                    // See if we are stuck?  If so, stay ducked with the duck hull until we have a clear spot
+                    //pmove->Con_Printf( "unstick got stuck\n" );
+                    
+                    //pmove->usehull = 1;
+                    pmove->usehull = AvHMUGetHull(true, pmove->iuser3);
+                    //pmove->Con_Printf("Using hull: %d\n", pmove->usehull);
+                    return;
+                }
+            }
+            //pmove->Con_Printf("Using hull: %d\n", pmove->usehull);
+            
+            pmove->flags &= ~FL_DUCKING;
+            pmove->bInDuck  = false;
+            //pmove->view_ofs[2] = VEC_VIEW;
+            float theViewHeight = kStandingViewHeightPercentage*pmove->player_maxs[pmove->usehull][2];
+            pmove->view_ofs[2] = theViewHeight;
+            pmove->flDuckTime = 0;
+            
+            VectorCopy( newOrigin, pmove->origin );
+            
+            // Recatagorize position since ducking can change origin
+            PM_CategorizePosition();
+        }
+    }
+}
+
+void PM_Duck( void )
+{
+    if(AvHMUGetCanDuck(pmove->iuser3))
+    {
+        
+        int buttonsChanged  = ( pmove->oldbuttons ^ pmove->cmd.buttons );   // These buttons have changed this frame
+        int nButtonPressed  =  buttonsChanged & pmove->cmd.buttons;     // The changed ones still down are "pressed"
+        
+        int duckchange      = buttonsChanged & IN_DUCK ? 1 : 0;
+        int duckpressed     = nButtonPressed & IN_DUCK ? 1 : 0;
+        
+        if ( pmove->cmd.buttons & IN_DUCK )
+        {
+            pmove->oldbuttons |= IN_DUCK;
+        }
+        else
+        {
+            pmove->oldbuttons &= ~IN_DUCK;
+        }
+        
+        // Prevent ducking if the iuser3 variable is set
+        //if ( pmove->iuser3 || pmove->dead )
+        //{
+        //  // Try to unduck
+        //  if ( pmove->flags & FL_DUCKING )
+        //  {
+        //      PM_UnDuck();
+        //  }
+        //  return;
+        //}
+        
+        if((pmove->flags & FL_DUCKING) && (!GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING)))
+        {
+            pmove->cmd.forwardmove *= 0.333;
+            pmove->cmd.sidemove    *= 0.333;
+            pmove->cmd.upmove      *= 0.333;
+        }
+        
+        if ( ( pmove->cmd.buttons & IN_DUCK ) || ( pmove->bInDuck ) || ( pmove->flags & FL_DUCKING ) )
+        {
+            if ( pmove->cmd.buttons & IN_DUCK )
+            {
+                if ( (nButtonPressed & IN_DUCK ) && !( pmove->flags & FL_DUCKING ) )
+                {
+                    // Use 1 second so super long jump will work
+                    pmove->flDuckTime = TIME_TO_DUCK;
+                    pmove->bInDuck    = true;
+                }
+                
+                float duckFraction = 1 - ((float)pmove->flDuckTime / TIME_TO_DUCK);
+                
+                if ( pmove->bInDuck )
+                {
+
+                    int theStandingHull = AvHMUGetHull(false, pmove->iuser3);
+                    int theCrouchingHull = AvHMUGetHull(true, pmove->iuser3);
+                    
+                    // Finish ducking immediately if duck time is over or not on ground
+                    if ( (pmove->flDuckTime == 0) || (pmove->onground == -1 ) )
+                    {
+
+                        pmove->usehull = theCrouchingHull;
+                        pmove->view_ofs[2] = kDuckingViewHeightPercentage*pmove->player_maxs[pmove->usehull][2];
+
+                        pmove->flags |= FL_DUCKING;
+                        pmove->bInDuck = false;
+                        
+                        // HACKHACK - Fudge for collision bug - no time to fix this properly
+                        if ( pmove->onground != -1 )
+                        {
+                            pmove->origin[2] -= ( pmove->player_mins[theCrouchingHull][2] - pmove->player_mins[theStandingHull][2] );
+                            // See if we are stuck?
+                            PM_FixPlayerCrouchStuck( STUCK_MOVEUP );
+                            
+                            // Recatagorize position since ducking can change origin
+                            PM_CategorizePosition();
+                        }
+
+                    }
+                    else
+                    {
+                        float theDuckingZ = kDuckingViewHeightPercentage*(pmove->player_maxs[theCrouchingHull][2]) +( pmove->player_mins[theStandingHull][2] - pmove->player_mins[theCrouchingHull][2] );
+                        float theStandingZ = kStandingViewHeightPercentage*(pmove->player_maxs[theStandingHull][2]);
+
+                        // Calc parametric time
+                        float duckSplineFraction = PM_SplineFraction( duckFraction, 1);
+                        pmove->view_ofs[2] = theStandingZ + duckSplineFraction * (theDuckingZ - theStandingZ);
+                        
+                    }
+                }
+            }
+            else
+            {
+                // Try to unduck
+                PM_UnDuck();
+            }
+        }
+    }
+}
+
+/*
+bool NS_PositionFree(float inX, float inY, float inZ)
+{
+    bool thePositionFree = false;
+    pmtrace_t traceresult;
+    vec3_t thePosition;
+    thePosition[0] = inX;
+    thePosition[1] = inY;
+    thePosition[2] = inZ;
+    int hitent = pmove->PM_TestPlayerPosition(thePosition, &traceresult);
+    if(hitent == -1)
+    {
+        thePositionFree = true;
+    }
+    return thePositionFree;
+}
+
+bool NS_PositionFreeForPlayer(vec3_t& inPosition)
+{
+    bool thePositionFree = false;
+
+    // Test center point
+    if(NS_PositionFree(inPosition[0], inPosition[1], inPosition[2]))
+    {
+        // Test 8 corners of hull
+        vec3_t theMinHull;
+        VectorCopy(pmove->player_mins[pmove->usehull], theMinHull);
+
+        vec3_t theMaxHull;
+        VectorCopy(pmove->player_maxs[pmove->usehull], theMaxHull);
+
+        // Don't test hull points exactly (not exactly sure if PM_TestPlayerPosition() takes into account hull or not)
+        float theFudgeFactor = .5f;
+        float theMinX = inPosition[0] + theMinHull[0]*theFudgeFactor;
+        float theMinY = inPosition[1] + theMinHull[1]*theFudgeFactor;
+        float theMinZ = inPosition[2] + theMinHull[2]*theFudgeFactor;
+
+        float theMaxX = inPosition[0] + theMaxHull[0]*theFudgeFactor;
+        float theMaxY = inPosition[1] + theMaxHull[1]*theFudgeFactor;
+        float theMaxZ = inPosition[2] + theMaxHull[2]*theFudgeFactor;
+
+        if(NS_PositionFree(theMinX, theMinY, theMinZ))
+        {
+            if(NS_PositionFree(theMinX, theMinY, theMaxZ))
+            {
+                if(NS_PositionFree(theMinX, theMaxY, theMinZ))
+                {
+                    if(NS_PositionFree(theMinX, theMaxY, theMaxZ))
+                    {
+                        if(NS_PositionFree(theMaxX, theMinY, theMinZ))
+                        {
+                            if(NS_PositionFree(theMaxX, theMinY, theMaxZ))
+                            {
+                                if(NS_PositionFree(theMaxX, theMaxY, theMinZ))
+                                {
+                                    if(NS_PositionFree(theMaxX, theMaxY, theMaxZ))
+                                    {
+                                        thePositionFree = true;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    return thePositionFree;
+}
+*/
+
+
+void PM_AlienAbilities()
+{
+    // Give some energy back if we're an alien and not evolving
+    string theExt;
+    if(NS_GetIsPlayerAlien(theExt))
+    {
+        float theTimePassed = pmove->cmd.msec*0.001f;
+        AvHMUUpdateAlienEnergy(theTimePassed, pmove->iuser3, pmove->iuser4, pmove->fuser3);
+
+        // Stop charging when we're out of energy
+        if(GetHasUpgrade(pmove->iuser4, MASK_ALIEN_MOVEMENT))
+        {
+            if(pmove->fuser3 <= 0.0f)
+            {
+                SetUpgradeMask(&pmove->iuser4, MASK_ALIEN_MOVEMENT, false);
+            }
+        }
+    }
+
+    //#endif
+
+    if (PM_GetIsLeaping() || PM_GetIsBlinking())
+    {
+        float theScalar = 500;
+		float theEnergyCost = 0;
+
+        if (PM_GetIsBlinking())
+        {
+            theScalar = 225;
+			AvHMUGetEnergyCost(AVH_WEAPON_BLINK, theEnergyCost);
+        }
+		else
+		{
+			AvHMUGetEnergyCost(AVH_ABILITY_LEAP, theEnergyCost);
+		}
+
+		if(AvHMUHasEnoughAlienEnergy(pmove->fuser3, theEnergyCost))
+		{
+			AvHMUDeductAlienEnergy(pmove->fuser3, theEnergyCost);
+		}
+		else
+		{
+			//voogru: I'd like to kill them or do something evil here (since this can only happen if they try the exploit), but nah.
+			return;
+		}
+
+		vec3_t forward, right, up;
+		AngleVectors(pmove->angles, forward, right, up);
+
+		PM_Jump();
+
+        vec3_t theAbilityVelocity;
+        //VectorScale(pmove->forward, theScalar, theAbilityVelocity);
+        VectorScale(forward, theScalar, theAbilityVelocity);
+        
+        vec3_t theFinalVelocity;
+        VectorAdd(pmove->velocity, theAbilityVelocity, theFinalVelocity);
+        
+        VectorCopy(theFinalVelocity, pmove->velocity);
+
+            //pmove->oldbuttons |= IN_JUMP; // don't jump again until released
+            
+            
+            //      if(pmove->runfuncs)
+            //      {
+            //          pmove->PM_PlaySound(CHAN_WEAPON, kLeapSound, 1.0f, ATTN_NORM, 0, 94 + pmove->RandomLong(0, 0xf));
+            //      }
+            //pmove->velocity[2] += 300;
+        //}
+    }
+
+//      else if((pmove->cmd.impulse == ALIEN_ABILITY_BLINK) && (pmove->iuser3 == AVH_USER3_ALIEN_PLAYER4))
+//      {
+//
+//            vec3_t theBlinkStart;
+//          VectorCopy(pmove->origin, theBlinkStart);
+//          theBlinkStart[2] += pmove->view_ofs[2];
+//
+//          vec3_t theBlinkDirection;
+//          VectorCopy(pmove->forward, theBlinkDirection);
+//
+//          vec3_t theBlinkEnd;
+//          VectorMA(pmove->origin, kMaxMapDimension, theBlinkDirection, theBlinkEnd);
+//
+//          // Do traceline through glass, until we hit something (this uses the current player hull, so it's like it's actually flying forward)
+//          int theTraceFlags = PM_TRACELINE_ANYVISIBLE;
+//          int theHull = -1;//pmove->usehull;
+//          int theIgnoreEntity = -1;
+//          pmtrace_t* theTrace = pmove->PM_TraceLine(theBlinkStart, theBlinkEnd, theTraceFlags, theHull, theIgnoreEntity);
+//          ASSERT(theTrace);
+//
+//          // While position isn't free, bring distance back a little
+//          vec3_t theFreeEndPoint;
+//          VectorCopy(theTrace->endpos, theFreeEndPoint);
+//
+//          // Subtract view height again
+//          theFreeEndPoint[2] -= pmove->view_ofs[2];
+//
+//          int theNumIterations = 0;
+//          bool theSuccess = false;
+//          while(!theSuccess && (theNumIterations < 5))
+//          {
+//              if(NS_PositionFreeForPlayer(theFreeEndPoint))
+//              {
+//                  // If position is still in front of us
+//                  vec3_t theFreeEndPointDirection;
+//                  VectorSubtract(theFreeEndPoint, theBlinkStart, theFreeEndPointDirection);
+//                  if(DotProduct(theBlinkDirection, theFreeEndPointDirection) > 0)
+//                  {
+//                      // Save position so client can use it to draw
+//                      theSuccess = true;
+//                  }
+//              }
+//              else
+//              {
+//                  vec3_t theBackwardsIncrement;
+//                  VectorMA(vec3_origin, -50, theBlinkDirection, theBackwardsIncrement);
+//                      
+//                  VectorAdd(theFreeEndPoint, theBackwardsIncrement, theFreeEndPoint);
+//              }
+//
+//              theNumIterations++;
+//          }
+//
+//          // If position is okay, exit
+//          if(theSuccess)
+//          {
+//              // If so, set our new location to it
+//              VectorCopy(theFreeEndPoint, pmove->origin);
+//
+//              if(pmove->runfuncs)
+//              {
+//                  pmove->PM_PlaybackEventFull(0, pmove->player_index, gBlinkEffectSuccessEventID, 0, (float *)theBlinkStart, (float *)theFreeEndPoint, 0.0, 0.0, 0, 0, 0, 0 );
+//              }
+//          }
+//          //else
+//          //{
+//          //  // Play a "blink failed" event
+//          //  pmove->PM_PlaybackEventFull(0, pmove->player_index, gBlinkEffectFailEventID, 0, (float *)pmove->origin, (float *)pmove->origin, 0.0, 0.0, 0, 0, 0, 0 );
+//          //}
+//
+//      }
+    
+}
+
+void PM_LadderMove( physent_t *pLadder )
+{
+    vec3_t      ladderCenter;
+    trace_t     trace;
+    qboolean    onFloor;
+    vec3_t      floor;
+    vec3_t      modelmins, modelmaxs;
+
+    if ( pmove->movetype == MOVETYPE_NOCLIP )
+        return;
+
+    pmove->PM_GetModelBounds( pLadder->model, modelmins, modelmaxs );
+
+    VectorAdd( modelmins, modelmaxs, ladderCenter );
+    VectorScale( ladderCenter, 0.5, ladderCenter );
+
+    pmove->movetype = MOVETYPE_FLY;
+
+    // On ladder, convert movement to be relative to the ladder
+
+    VectorCopy( pmove->origin, floor );
+    floor[2] += pmove->player_mins[pmove->usehull][2] - 1;
+
+    if ( pmove->PM_PointContents( floor, NULL ) == CONTENTS_SOLID )
+        onFloor = true;
+    else
+        onFloor = false;
+
+    pmove->gravity = 0;
+    pmove->PM_TraceModel( pLadder, pmove->origin, ladderCenter, &trace );
+    if ( trace.fraction != 1.0 )
+    {
+        float forward = 0, right = 0;
+        vec3_t vpn, v_right;
+
+        AngleVectors( pmove->angles, vpn, v_right, NULL );
+        if ( pmove->cmd.buttons & IN_BACK )
+            forward -= MAX_CLIMB_SPEED;
+        if ( pmove->cmd.buttons & IN_FORWARD )
+            forward += MAX_CLIMB_SPEED;
+        if ( pmove->cmd.buttons & IN_MOVELEFT )
+            right -= MAX_CLIMB_SPEED;
+        if ( pmove->cmd.buttons & IN_MOVERIGHT )
+            right += MAX_CLIMB_SPEED;
+
+        if ( PM_GetIsBlinking() )
+        {
+            pmove->movetype = MOVETYPE_WALK;
+            VectorScale( trace.plane.normal, 270, pmove->velocity );
+        }
+        else if ( pmove->cmd.buttons & IN_JUMP )
+        {
+            pmove->movetype = MOVETYPE_WALK;
+            VectorScale( trace.plane.normal, 270, pmove->velocity );
+        }
+        else
+        {
+            if ( forward != 0 || right != 0 )
+            {
+                vec3_t velocity, perp, cross, lateral, tmp;
+                float normal;
+
+                //ALERT(at_console, "pev %.2f %.2f %.2f - ",
+                //  pev->velocity.x, pev->velocity.y, pev->velocity.z);
+                // Calculate player's intended velocity
+                //Vector velocity = (forward * gpGlobals->v_forward) + (right * gpGlobals->v_right);
+                VectorScale( vpn, forward, velocity );
+                VectorMA( velocity, right, v_right, velocity );
+
+                
+                // Perpendicular in the ladder plane
+    //                  Vector perp = CrossProduct( Vector(0,0,1), trace.vecPlaneNormal );
+    //                  perp = perp.Normalize();
+                VectorClear( tmp );
+                tmp[2] = 1;
+                CrossProduct( tmp, trace.plane.normal, perp );
+                VectorNormalize( perp );
+
+
+                // decompose velocity into ladder plane
+                normal = DotProduct( velocity, trace.plane.normal );
+                // This is the velocity into the face of the ladder
+                VectorScale( trace.plane.normal, normal, cross );
+
+
+                // This is the player's additional velocity
+                VectorSubtract( velocity, cross, lateral );
+
+                // This turns the velocity into the face of the ladder into velocity that
+                // is roughly vertically perpendicular to the face of the ladder.
+                // NOTE: It IS possible to face up and move down or face down and move up
+                // because the velocity is a sum of the directional velocity and the converted
+                // velocity through the face of the ladder -- by design.
+                CrossProduct( trace.plane.normal, perp, tmp );
+                VectorMA( lateral, -normal, tmp, pmove->velocity );
+                if ( onFloor && normal > 0 )    // On ground moving away from the ladder
+                {
+                    VectorMA( pmove->velocity, MAX_CLIMB_SPEED, trace.plane.normal, pmove->velocity );
+                }
+                //pev->velocity = lateral - (CrossProduct( trace.vecPlaneNormal, perp ) * normal);
+            }
+            else
+            {
+                VectorClear( pmove->velocity );
+            }
+        }
+    }
+}
+
+physent_t *PM_Ladder( void )
+{
+    int         i;
+    physent_t   *pe;
+    hull_t      *hull;
+    int         num;
+    vec3_t      test;
+
+    for ( i = 0; i < pmove->nummoveent; i++ )
+    {
+        pe = &pmove->moveents[i];
+        
+        if ( pe->model && (modtype_t)pmove->PM_GetModelType( pe->model ) == mod_brush && pe->skin == CONTENTS_LADDER )
+        {
+    
+            hull = (hull_t *)pmove->PM_HullForBsp( pe, test );
+            num = hull->firstclipnode;
+    
+            // Offset the test point appropriately for this hull.
+            VectorSubtract ( pmove->origin, test, test);
+    
+            // Test the player's hull for intersection with this model
+            if ( pmove->PM_HullPointContents (hull, num, test) == CONTENTS_EMPTY)
+                continue;
+            
+            return pe;
+        }
+    }
+
+    return NULL;
+}
+
+
+
+void PM_WaterJump (void)
+{
+    if ( pmove->waterjumptime > 10000 )
+    {
+        pmove->waterjumptime = 10000;
+    }
+
+    if ( !pmove->waterjumptime )
+        return;
+
+    pmove->waterjumptime -= pmove->cmd.msec;
+    if ( pmove->waterjumptime < 0 ||
+         !pmove->waterlevel )
+    {
+        pmove->waterjumptime = 0;
+        pmove->flags &= ~FL_WATERJUMP;
+    }
+
+    pmove->velocity[0] = pmove->movedir[0];
+    pmove->velocity[1] = pmove->movedir[1];
+}
+
+/*
+============
+PM_AddGravity
+
+============
+*/
+void PM_AddGravity ()
+{
+    float   ent_gravity;
+
+    if (pmove->gravity)
+        ent_gravity = pmove->gravity;
+    else
+        ent_gravity = 1.0;
+
+    // Add gravity incorrectly
+    pmove->velocity[2] -= (ent_gravity * pmove->movevars->gravity * pmove->frametime );
+    pmove->velocity[2] += pmove->basevelocity[2] * pmove->frametime;
+    pmove->basevelocity[2] = 0;
+    PM_CheckVelocity();
+}
+/*
+============
+PM_PushEntity
+
+Does not change the entities velocity at all
+============
+*/
+pmtrace_t PM_PushEntity (vec3_t push)
+{
+    pmtrace_t   trace;
+    vec3_t  end;
+        
+    VectorAdd (pmove->origin, push, end);
+
+    trace = NS_PlayerTrace (pmove, pmove->origin, end, PM_NORMAL, -1 );
+    
+    VectorCopy (trace.endpos, pmove->origin);
+
+    // So we can run impact function afterwards.
+    if (trace.fraction < 1.0 &&
+        !trace.allsolid)
+    {
+        PM_AddToTouched(trace, pmove->velocity);
+    }
+
+    return trace;
+}   
+
+/*
+============
+PM_Physics_Toss()
+
+Dead player flying through air., e.g.
+============
+*/
+void PM_Physics_Toss()
+{
+    pmtrace_t trace;
+    vec3_t  move;
+    float   backoff;
+
+    PM_CheckWater();
+
+    if (pmove->velocity[2] > 0)
+        pmove->onground = -1;
+
+    // If on ground and not moving, return.
+    if ( pmove->onground != -1 )
+    {
+        if (VectorCompare(pmove->basevelocity, vec3_origin) &&
+            VectorCompare(pmove->velocity, vec3_origin))
+            return;
+    }
+
+    PM_CheckVelocity ();
+
+// add gravity
+    if ( pmove->movetype != MOVETYPE_FLY &&
+         pmove->movetype != MOVETYPE_BOUNCEMISSILE &&
+         pmove->movetype != MOVETYPE_FLYMISSILE )
+        PM_AddGravity ();
+
+// move origin
+    // Base velocity is not properly accounted for since this entity will move again after the bounce without
+    // taking it into account
+    VectorAdd (pmove->velocity, pmove->basevelocity, pmove->velocity);
+    
+    PM_CheckVelocity();
+    VectorScale (pmove->velocity, pmove->frametime, move);
+    VectorSubtract (pmove->velocity, pmove->basevelocity, pmove->velocity);
+
+    trace = PM_PushEntity (move);   // Should this clear basevelocity
+
+    PM_CheckVelocity();
+
+    if (trace.allsolid)
+    {   
+        // entity is trapped in another solid
+        pmove->onground = trace.ent;
+        VectorCopy (vec3_origin, pmove->velocity);
+        return;
+    }
+    
+    if (trace.fraction == 1)
+    {
+        PM_CheckWater();
+        return;
+    }
+
+
+    if (pmove->movetype == MOVETYPE_BOUNCE)
+        backoff = 2.0 - pmove->friction;
+    else if (pmove->movetype == MOVETYPE_BOUNCEMISSILE)
+        backoff = 2.0;
+    else
+        backoff = 1;
+
+    PM_ClipVelocity (pmove->velocity, trace.plane.normal, pmove->velocity, backoff);
+
+    // stop if on ground
+    if (trace.plane.normal[2] > 0.7)
+    {       
+        float vel;
+        vec3_t base;
+
+        VectorClear( base );
+        if (pmove->velocity[2] < pmove->movevars->gravity * pmove->frametime)
+        {
+            // we're rolling on the ground, add static friction.
+            pmove->onground = trace.ent;
+            pmove->velocity[2] = 0;
+        }
+
+        vel = DotProduct( pmove->velocity, pmove->velocity );
+
+        // Con_DPrintf("%f %f: %.0f %.0f %.0f\n", vel, trace.fraction, ent->velocity[0], ent->velocity[1], ent->velocity[2] );
+
+        if (vel < (30 * 30) || (pmove->movetype != MOVETYPE_BOUNCE && pmove->movetype != MOVETYPE_BOUNCEMISSILE))
+        {
+            pmove->onground = trace.ent;
+            VectorCopy (vec3_origin, pmove->velocity);
+        }
+        else
+        {
+            VectorScale (pmove->velocity, (1.0 - trace.fraction) * pmove->frametime * 0.9, move);
+            trace = PM_PushEntity (move);
+        }
+        VectorSubtract( pmove->velocity, base, pmove->velocity )
+    }
+    
+// check for in water
+    PM_CheckWater();
+}
+
+/*
+====================
+PM_NoClip
+
+====================
+*/
+void PM_NoClip()
+{
+    int         i;
+    vec3_t      wishvel;
+    float       fmove, smove;
+//  float       currentspeed, addspeed, accelspeed;
+
+    // Copy movement amounts
+    fmove = pmove->cmd.forwardmove;
+    smove = pmove->cmd.sidemove;
+    
+    VectorNormalize ( pmove->forward ); 
+    VectorNormalize ( pmove->right );
+
+    for (i=0 ; i<3 ; i++)       // Determine x and y parts of velocity
+    {
+        wishvel[i] = pmove->forward[i]*fmove + pmove->right[i]*smove;
+    }
+    wishvel[2] += pmove->cmd.upmove;
+    
+    VectorMA (pmove->origin, pmove->frametime, wishvel, pmove->origin);
+    
+    // Zero out the velocity so that we don't accumulate a huge downward velocity from
+    //  gravity, etc.
+    VectorClear( pmove->velocity );
+    
+}
+
+void PM_PlaybackEvent(int inEventID)
+{
+    int theFlags = 0;
+
+    //#if defined( AVH_SERVER )
+    theFlags = FEV_NOTHOST;
+    //#endif
+    
+    vec3_t theZeroVector;
+    theZeroVector[0] = theZeroVector[1] = theZeroVector[2] = 0.0f;
+    
+    // Lame way to get the local player index that playback event full needs...there must be another way?
+    //vec3_t theTraceEnd;
+    //VectorMA(pmove->origin, 100, pmove->forward, theTraceEnd);
+    //pmtrace_t theTrace = pmove->PM_PlayerTrace(pmove->origin, theTraceEnd, PM_TRACELINE_PHYSENTSONLY, -1);
+    //theTrace = pmove->PM_TraceLine(pmove->origin, theTraceEnd, PM_TRACELINE_PHYSENTSONLY, 2,  -1);
+    
+    int thisPredictedPlayer = pmove->player_index;/*theTrace.ent;*/
+    pmove->PM_PlaybackEventFull(theFlags, thisPredictedPlayer, inEventID, 0, (float *)theZeroVector, (float *)theZeroVector, 0.0, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+}
+
+// Only allow bunny jumping up to 1.1x server / player maxspeed setting
+#define BUNNYJUMP_MAX_SPEED_FACTOR 1.7f
+
+//-----------------------------------------------------------------------------
+// Purpose: Corrects bunny jumping ( where player initiates a bunny jump before other
+//  movement logic runs, thus making onground == -1 thus making PM_Friction get skipped and
+//  running PM_AirMove, which doesn't crop velocity to maxspeed like the ground / other
+//  movement logic does.
+//-----------------------------------------------------------------------------
+void PM_PreventMegaBunnyJumping(bool inAir)
+{
+    // Current player speed
+    float spd;
+    // If we have to crop, apply this cropping fraction to velocity
+    float fraction;
+    // Speed at which bunny jumping is limited
+    float maxscaledspeed;
+    
+    maxscaledspeed = BUNNYJUMP_MAX_SPEED_FACTOR * pmove->maxspeed;
+    if(inAir)
+    {
+        // Allow flyers, leapers, and JPers to go faster in the air, but still capped
+        maxscaledspeed = BALANCE_FVAR(kAirspeedMultiplier)*pmove->maxspeed;
+    }
+    
+    // Don't divide by zero
+    if ( maxscaledspeed <= 0.0f )
+        return;
+
+    vec3_t theVelVector;
+    VectorCopy(pmove->velocity, theVelVector);
+
+    if(inAir)
+    {
+        theVelVector[2] = 0.0f;
+    }
+
+    spd = Length( theVelVector );
+    
+    if ( spd <= maxscaledspeed )
+        return;
+    
+    // Returns the modifier for the velocity
+    fraction = maxscaledspeed/spd;
+    
+    float theCurrentSpeed = Length(pmove->velocity);
+
+    VectorScale( pmove->velocity, fraction, pmove->velocity ); //Crop it down!.
+
+//#ifdef AVH_CLIENT
+//  if(pmove->runfuncs)
+//  {
+//      pmove->Con_Printf("Preventing speed exploits (max speed: %f, current speed: %f, adjusted speed: %f\n", pmove->maxspeed, theCurrentSpeed, Length(pmove->velocity));
+//  }
+//#endif
+
+    // Trigger footstep immediately to prevent silent bunny-hopping
+    //pmove->flTimeStepSound = 0.0f;
+}
+
+/*
+=============
+PM_Jump
+=============
+*/
+void PM_Jump (void)
+{
+    int i;
+    qboolean tfc = false;
+    
+    qboolean cansuperjump = false;
+    
+    if (pmove->dead || GetHasUpgrade(pmove->iuser4, MASK_ENSNARED))
+    {
+        pmove->oldbuttons |= IN_JUMP ;  // don't jump again until released
+        return;
+    }
+    
+    tfc = atoi( pmove->PM_Info_ValueForKey( pmove->physinfo, "tfc" ) ) == 1 ? true : false;
+    
+    // Spy that's feigning death cannot jump
+    if ( tfc && 
+        ( pmove->deadflag == ( DEAD_DISCARDBODY + 1 ) ) )
+    {
+        return;
+    }
+    
+    // See if we are waterjumping.  If so, decrement count and return.
+    if ( pmove->waterjumptime )
+    {
+        pmove->waterjumptime -= pmove->cmd.msec;
+        if (pmove->waterjumptime < 0)
+        {
+            pmove->waterjumptime = 0;
+        }
+        return;
+    }
+    
+    // If we are in the water most of the way...
+    if (pmove->waterlevel >= 2)
+    {   // swimming, not jumping
+        pmove->onground = -1;
+        
+        if (pmove->watertype == CONTENTS_WATER)    // We move up a certain amount
+            pmove->velocity[2] = 100;
+        else if (pmove->watertype == CONTENTS_SLIME)
+            pmove->velocity[2] = 80;
+        else  // LAVA
+            pmove->velocity[2] = 50;
+        
+        // play swiming sound
+        if ( pmove->flSwimTime <= 0 )
+        {
+            // If alien has silencio upgrade, mute footstep volume
+            int theSilenceUpgradeLevel = AvHGetAlienUpgradeLevel(pmove->iuser4, MASK_UPGRADE_6);
+            float theVolumeScalar = 1.0f - theSilenceUpgradeLevel/3.0f;
+            
+            // Don't play sound again for 1 second
+            pmove->flSwimTime = 1000;
+            switch ( pmove->RandomLong( 0, 3 ) )
+            { 
+            case 0:
+                pmove->PM_PlaySound( CHAN_BODY, "player/pl_wade1.wav", theVolumeScalar, ATTN_NORM, 0, PITCH_NORM );
+                break;
+            case 1:
+                pmove->PM_PlaySound( CHAN_BODY, "player/pl_wade2.wav", theVolumeScalar, ATTN_NORM, 0, PITCH_NORM );
+                break;
+            case 2:
+                pmove->PM_PlaySound( CHAN_BODY, "player/pl_wade3.wav", theVolumeScalar, ATTN_NORM, 0, PITCH_NORM );
+                break;
+            case 3:
+                pmove->PM_PlaySound( CHAN_BODY, "player/pl_wade4.wav", theVolumeScalar, ATTN_NORM, 0, PITCH_NORM );
+                break;
+            }
+        }
+        
+        return;
+    }
+    
+    // For wall jumping, remove bit above and replace with this (from coding forums)
+    
+    
+    if(PM_CanFlap())
+    {
+        //          //pmove->punchangle[0] = -2;
+        //          //float theXComp = (fabs(pmove->velocity[0]) > fabs(pmove->forward[0]) ? pmove->velocity[0] : pmove->forward[0]);
+        //          //float theYComp = (fabs(pmove->velocity[1]) > fabs(pmove->forward[1]) ? pmove->velocity[1] : pmove->forward[1]);
+        //          float theXComp = pmove->forward[0]*(pmove->cmd.forwardmove/pmove->clientmaxspeed) + pmove->right[0]*(pmove->cmd.sidemove/pmove->clientmaxspeed);
+        //          float theYComp = pmove->forward[1]*(pmove->cmd.forwardmove/pmove->clientmaxspeed) + pmove->right[1]*(pmove->cmd.sidemove/pmove->clientmaxspeed);
+        //
+        //          pmove->velocity[0] += theXComp * 8;
+        //          pmove->velocity[1] += theYComp * 8;
+        //          pmove->velocity[2] += 35;
+
+        AvHMUDeductAlienEnergy(pmove->fuser3, kAlienEnergyFlap);
+        
+        // Added by mmcguire.
+        // Move the lerk in the direction has is facing.
+
+        vec3_t theFlapVelocity;
+        
+        float theThrust;
+        float theLift;
+        
+        if (pmove->cmd.forwardmove != 0)
+        {
+
+            if (pmove->cmd.forwardmove > 0)
+            {
+
+                theThrust = pmove->cmd.forwardmove * kWingThrustForwardScalar;
+                theLift = 200 * (pmove->forward[2] + 0.5) / 1.5;
+            
+                if (theLift < 0)
+                {
+                    theLift = 0;
+                }
+
+            }
+            else
+            {
+                theThrust = -pmove->cmd.forwardmove * kWingThrustBackwardScalar;
+                theLift = 200;
+            }
+
+        }
+        else
+        {
+            theLift = 300;
+            theThrust = 0;
+        }
+
+        VectorScale(pmove->forward, theThrust, theFlapVelocity);
+        theFlapVelocity[2] += theLift;
+
+		int theSpeedUpgradeLevel = 0;
+        if(GetHasUpgrade(pmove->iuser4, MASK_UPGRADE_4))
+        {
+            theSpeedUpgradeLevel = 1;
+
+            if(GetHasUpgrade(pmove->iuser4, MASK_UPGRADE_12))
+            {
+                theSpeedUpgradeLevel = 2;
+            }
+            else if(GetHasUpgrade(pmove->iuser4, MASK_UPGRADE_13))
+            {
+                theSpeedUpgradeLevel = 3;
+            }
+        }
+		int theAdjustment=theSpeedUpgradeLevel * BALANCE_FVAR(kAlienCelerityBonus);
+		float theAscendMax=BALANCE_FVAR(kLerkBaseAscendSpeedMax) + theAdjustment;
+		static float maxVelocity=0;
+		maxVelocity=max(maxVelocity, pmove->velocity[2]); 
+		if ( pmove->velocity[2] > theAscendMax ) {
+			theFlapVelocity[2]=0;
+		}
+		// cap diving too
+		if ( -pmove->velocity[2] > theAscendMax*1.3 ) {
+			theFlapVelocity[2]=0;
+		}
+
+        vec3_t theNewVelocity;
+        VectorAdd(pmove->velocity, theFlapVelocity, theNewVelocity);
+
+        VectorCopy(theNewVelocity, pmove->velocity);
+        /*
+
+        // Old Lerk flight model.
+
+        vec3_t theWishVelocity;
+        PM_GetWishVelocity(theWishVelocity);
+        
+        float theWishXPercent = theWishVelocity[0]/pmove->clientmaxspeed; 
+        float theWishYPercent = theWishVelocity[1]/pmove->clientmaxspeed;
+        float theWishZPercent = max(0.0f, 1.0f - fabs(theWishXPercent) - fabs(theWishYPercent));
+        pmove->velocity[0] += theWishXPercent*kWingFlapLateralScalar;
+        pmove->velocity[1] += theWishYPercent*kWingFlapLateralScalar;
+        pmove->velocity[2] += theWishZPercent*pmove->clientmaxspeed;
+
+        */
+
+        if(pmove->runfuncs)
+        {
+//          #ifdef AVH_CLIENT
+//          int theLong = pmove->RandomLong(0, 20);
+//          pmove->Con_Printf("Flap %d\n", theLong);
+//          #endif
+            
+            // Pick a random sound to play
+            int theSoundIndex = pmove->RandomLong(0, 2);
+            char* theSoundToPlay = NULL;
+            switch(theSoundIndex)
+            {
+            case 0:
+                theSoundToPlay = kWingFlapSound1;
+                break;
+            case 1:
+                theSoundToPlay = kWingFlapSound2;
+                break;
+            case 2:
+                theSoundToPlay = kWingFlapSound3;
+                break;
+            }
+            
+            // If alien has silencio upgrade, mute footstep volume
+            int theSilenceUpgradeLevel = AvHGetAlienUpgradeLevel(pmove->iuser4, MASK_UPGRADE_6);
+            const float theBaseVolume = .5f;
+            float theVolumeScalar = theBaseVolume - (theSilenceUpgradeLevel/(float)3)*theBaseVolume;
+            theVolumeScalar = min(max(theVolumeScalar, 0.0f), 1.0f);
+            
+            pmove->PM_PlaySound(CHAN_BODY, theSoundToPlay, theVolumeScalar, ATTN_NORM, 0, PITCH_NORM);
+            
+            //pmove->PM_PlaySound(channel, , 1.0f, ATTN_NORM, flags, pitch);
+            //gEngfuncs.pEventAPI->EV_PlaySound(inArgs->entindex, thePlayer->origin, CHAN_AUTO, kEndCloakSound, 1, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 0xf ));
+            
+            //PM_PlaybackEvent(gFlightEventID);
+        }
+        //      else if(PM_CanWalljump())
+//      {
+//          pmove->punchangle[0] = -2;
+//          pmove->velocity[2] += (pmove->forward[2] * 300);
+//          
+//          //pmove->velocity[2] = sqrt(2 * 800 * 45.0);
+//
+//          PM_PlaybackEvent(gWallJumpEventID);
+//      }
+
+        pmove->oldbuttons |= IN_JUMP; // don't jump again until released
+        return; // in air, so no; effect
+    }
+    else
+    {
+    
+        // Added by mmcguire.
+        // Lerk gliding.
+
+        if (pmove->iuser3 == AVH_USER3_ALIEN_PLAYER3 && pmove->onground == -1)
+        {
+                
+            // Compute the velocity not in the direction we're facing.
+
+            float theGlideAmount = PM_GetHorizontalSpeed() / 1000;
+            
+            if (theGlideAmount > 0.2)
+            {
+                theGlideAmount = 0.2;
+            }
+
+
+            float speed = Length(pmove->velocity);
+            float projectedSpeed = DotProduct(pmove->velocity, pmove->forward);
+
+            vec3_t forwardVelocity;
+            VectorScale(pmove->forward, speed, forwardVelocity);
+
+            vec3_t glideVelocity;
+            VectorSubtract(pmove->velocity, forwardVelocity, glideVelocity);
+            VectorScale(glideVelocity, theGlideAmount, glideVelocity);
+
+            VectorSubtract(pmove->velocity, glideVelocity, pmove->velocity);
+            
+            return;
+
+        }
+
+    
+    }
+
+    // No more effect
+    if ( pmove->onground == -1 )
+    {
+        // Flag that we jumped.
+        // HACK HACK HACK
+        // Remove this when the game .dll no longer does physics code!!!!
+        pmove->oldbuttons |= IN_JUMP;   // don't jump again until released
+        return;     // in air, so no effect
+    }
+
+
+//	string theAlienExtension;
+//	bool theIsAlien = NS_GetIsPlayerAlien(theAlienExtension);
+//	if ( pmove->oldbuttons & IN_JUMP && (pmove->velocity[0] == 0 || !theIsAlien  || pmove->iuser3 == AVH_USER3_ALIEN_PLAYER3) )
+		//return;     // don't pogo stick
+
+	if ( pmove->oldbuttons & IN_JUMP )
+		return;     // don't pogo stick
+
+	// In the air now.
+    pmove->onground = -1;
+
+    PM_PreventMegaBunnyJumping(false);
+
+    if ( tfc )
+    {
+        pmove->PM_PlaySound( CHAN_BODY, "player/plyrjmp8.wav", 0.5, ATTN_NORM, 0, PITCH_NORM );
+    }
+    else
+    {
+        PM_PlayStepSound( PM_MapTextureTypeStepType( pmove->chtexturetype ), 1.0 );
+    }
+    
+    // See if user can super long jump?
+    cansuperjump = atoi( pmove->PM_Info_ValueForKey( pmove->physinfo, "slj" ) ) == 1 ? true : false;
+    
+    // Acclerate upward
+    // If we are ducking...
+    if ( ( pmove->bInDuck ) || ( pmove->flags & FL_DUCKING ) )
+    {
+        // Adjust for super long jump module
+        // UNDONE -- note this should be based on forward angles, not current velocity.
+        if ( cansuperjump &&
+            ( pmove->cmd.buttons & IN_DUCK ) &&
+            ( pmove->flDuckTime > 0 ) &&
+            Length( pmove->velocity ) > 50 )
+        {
+            pmove->punchangle[0] = -5;
+            
+            for (i =0; i < 2; i++)
+            {
+                pmove->velocity[i] = pmove->forward[i] * PLAYER_LONGJUMP_SPEED * 1.6;
+            }
+            
+            pmove->velocity[2] = sqrt(2 * 800 * 56.0);
+        }
+        else
+        {
+            pmove->velocity[2] = sqrt(2 * 800 * 45.0);
+        }
+    }
+    else
+    {
+        pmove->velocity[2] = sqrt(2 * 800 * 45.0);
+    }
+    
+    // Decay it for simulation
+    PM_FixupGravityVelocity();
+    
+    // Flag that we jumped.
+    pmove->oldbuttons |= IN_JUMP;   // don't jump again until released
+}
+
+/*
+=============
+PM_CheckWaterJump
+=============
+*/
+#define WJ_HEIGHT 8
+void PM_CheckWaterJump (void)
+{
+    vec3_t  vecStart, vecEnd;
+    vec3_t  flatforward;
+    vec3_t  flatvelocity;
+    float curspeed;
+    pmtrace_t tr;
+    int     savehull;
+
+    // Already water jumping.
+    if ( pmove->waterjumptime )
+        return;
+
+    // Don't hop out if we just jumped in
+    if ( pmove->velocity[2] < -180 )
+        return; // only hop out if we are moving up
+
+    // See if we are backing up
+    flatvelocity[0] = pmove->velocity[0];
+    flatvelocity[1] = pmove->velocity[1];
+    flatvelocity[2] = 0;
+
+    // Must be moving
+    curspeed = VectorNormalize( flatvelocity );
+    
+    // see if near an edge
+    flatforward[0] = pmove->forward[0];
+    flatforward[1] = pmove->forward[1];
+    flatforward[2] = 0;
+    VectorNormalize (flatforward);
+
+    // Are we backing into water from steps or something?  If so, don't pop forward
+    if ( curspeed != 0.0 && ( DotProduct( flatvelocity, flatforward ) < 0.0 ) )
+        return;
+
+    VectorCopy( pmove->origin, vecStart );
+    vecStart[2] += WJ_HEIGHT;
+
+    VectorMA ( vecStart, 24, flatforward, vecEnd );
+    
+    // Trace, this trace should use the point sized collision hull
+    savehull = pmove->usehull;
+    pmove->usehull = 2;
+
+    tr = NS_PlayerTrace(pmove, vecStart, vecEnd, PM_NORMAL, -1 );
+
+    if ( tr.fraction < 1.0 && fabs( tr.plane.normal[2] ) < 0.1f )  // Facing a near vertical wall?
+    {
+        vecStart[2] += pmove->player_maxs[ savehull ][2] - WJ_HEIGHT;
+        VectorMA( vecStart, 24, flatforward, vecEnd );
+        VectorMA( vec3_origin, -50, tr.plane.normal, pmove->movedir );
+
+        tr = NS_PlayerTrace(pmove, vecStart, vecEnd, PM_NORMAL, -1 );       
+
+        if ( tr.fraction == 1.0 )
+        {
+            pmove->waterjumptime = 2000;
+            pmove->velocity[2] = 225;
+            pmove->oldbuttons |= IN_JUMP;
+            pmove->flags |= FL_WATERJUMP;
+        }
+    }
+    
+    // Reset the collision hull
+    pmove->usehull = savehull;
+}
+
+void PM_CheckFalling( void )
+{
+    if(!GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING))
+    {
+        if ((pmove->onground != -1) && !pmove->dead)
+        {
+            // Slow marines down on landing after a jump
+            const int theFallPenaltyThreshold = pmove->maxspeed;//BALANCE_IVAR(kUnencumberedPlayerSpeed);
+            if(pmove->flFallVelocity > theFallPenaltyThreshold)
+            {
+                if(pmove->iuser3 == AVH_USER3_MARINE_PLAYER)
+                {
+                    VectorScale(pmove->velocity, .3f, pmove->velocity);
+                    
+                    if(pmove->runfuncs)
+                    {
+                        //#ifdef AVH_CLIENT
+                        //pmove->Con_Printf("Player landed.\n");
+                        //#endif
+                    }
+                }
+            }
+
+            // Play landing sound if we landed hard enough
+            if(pmove->flFallVelocity >= PLAYER_FALL_PUNCH_THRESHHOLD)
+            {
+                float fvol = 0.5;
+				char theFallPainSound[64];                
+                
+                int theSilenceUpgradeLevel = AvHGetAlienUpgradeLevel(pmove->iuser4, MASK_UPGRADE_6);
+                float theVolumeScalar = 1.0f - theSilenceUpgradeLevel/3.0f;
+                
+                float theFallPainVolume = 1.0f*theVolumeScalar;
+                
+                string theAlienExtension;
+                bool theIsAlien = NS_GetIsPlayerAlien(theAlienExtension);
+
+				if(theIsAlien  || pmove->iuser3 == AVH_USER3_ALIEN_EMBRYO )
+                {
+					sprintf(theFallPainSound, kFallPainSoundFormat, pmove->iuser3);
+                }
+				else 
+				{
+					if ( GetHasUpgrade(pmove->iuser4, MASK_UPGRADE_13) )
+					{
+						sprintf(theFallPainSound, kFallPainSoundFormat, 2);
+					}
+					else
+					{
+						sprintf(theFallPainSound, kFallPainSoundFormat, 1);
+					}
+				}
+                
+                if ( pmove->waterlevel > 0 )
+                {
+                }
+                else if ( pmove->flFallVelocity > PLAYER_MAX_SAFE_FALL_SPEED )
+                {
+                    // NOTE:  In the original game dll , there were no breaks after these cases, causing the first one to 
+                    // cascade into the second
+                    //switch ( RandomLong(0,1) )
+                    //{
+                    //case 0:
+                    //pmove->PM_PlaySound( CHAN_VOICE, "player/pl_fallpain2.wav", 1, ATTN_NORM, 0, PITCH_NORM );
+                    //break;
+                    //case 1:
+                    pmove->PM_PlaySound( CHAN_VOICE, theFallPainSound, theFallPainVolume, ATTN_NORM, 0, PITCH_NORM );
+                    //  break;
+                    //}
+                    fvol = 1.0;
+                }
+                else if ( pmove->flFallVelocity > PLAYER_MAX_SAFE_FALL_SPEED / 2 )
+                {
+                    qboolean tfc = false;
+                    tfc = atoi( pmove->PM_Info_ValueForKey( pmove->physinfo, "tfc" ) ) == 1 ? true : false;
+                    
+                    if ( tfc )
+                    {
+                        pmove->PM_PlaySound( CHAN_VOICE, theFallPainSound, theFallPainVolume, ATTN_NORM, 0, PITCH_NORM );
+                    }
+                    
+                    fvol = 0.85;
+                }
+                else if ( pmove->flFallVelocity < PLAYER_MIN_BOUNCE_SPEED )
+                {
+                    fvol = 0;
+                }
+                
+                if ( fvol > 0.0 )
+                {
+                    // Play landing step right away
+                    pmove->flTimeStepSound = 0;
+                    
+                    PM_UpdateStepSound();
+                    
+                    // play step sound for current texture
+                    PM_PlayStepSound( PM_MapTextureTypeStepType( pmove->chtexturetype ), fvol );
+                    
+                    // Knock the screen around a little bit, temporary effect
+                    pmove->punchangle[ 2 ] = pmove->flFallVelocity * 0.013; // punch z axis
+                    
+                    if ( pmove->punchangle[ 0 ] > 8 )
+                    {
+                        pmove->punchangle[ 0 ] = 8;
+                    }
+                }
+            }
+        }
+        
+        if ( pmove->onground != -1 ) 
+        {       
+            pmove->flFallVelocity = 0;
+        }
+    }
+}
+
+/*
+=================
+PM_PlayWaterSounds
+
+  =================
+*/
+void PM_PlayWaterSounds( void )
+{
+    // Did we enter or leave water?
+    if  ( ( pmove->oldwaterlevel == 0 && pmove->waterlevel != 0 ) ||
+        ( pmove->oldwaterlevel != 0 && pmove->waterlevel == 0 ) )
+    {
+        int theSilenceUpgradeLevel = AvHGetAlienUpgradeLevel(pmove->iuser4, MASK_UPGRADE_6);
+        float theVolume = 1.0f - theSilenceUpgradeLevel/3.0f;
+
+        switch ( pmove->RandomLong(0,3) )
+        {
+        case 0:
+            pmove->PM_PlaySound( CHAN_BODY, "player/pl_wade1.wav", theVolume, ATTN_NORM, 0, PITCH_NORM );
+            break;
+        case 1:
+            pmove->PM_PlaySound( CHAN_BODY, "player/pl_wade2.wav", theVolume, ATTN_NORM, 0, PITCH_NORM );
+            break;
+        case 2:
+            pmove->PM_PlaySound( CHAN_BODY, "player/pl_wade3.wav", theVolume, ATTN_NORM, 0, PITCH_NORM );
+            break;
+        case 3:
+            pmove->PM_PlaySound( CHAN_BODY, "player/pl_wade4.wav", theVolume, ATTN_NORM, 0, PITCH_NORM );
+            break;
+        }
+    }
+}
+
+/*
+===============
+PM_CalcRoll
+
+===============
+*/
+float PM_CalcRoll (vec3_t angles, vec3_t velocity, float rollangle, float rollspeed )
+{
+    float   sign;
+    float   side;
+    float   value;
+    vec3_t  forward, right, up;
+    
+    AngleVectors (angles, forward, right, up);
+    
+    side = DotProduct (velocity, right);
+    
+    sign = side < 0 ? -1 : 1;
+    
+    side = fabs(side);
+    
+    value = rollangle;
+    
+    if (side < rollspeed)
+    {
+        side = side * value / rollspeed;
+    }
+    else
+    {
+        side = value;
+    }
+  
+    return side * sign;
+}
+
+/*
+=============
+PM_DropPunchAngle
+
+=============
+*/
+void PM_DropPunchAngle ( vec3_t punchangle )
+{
+    float   len;
+    
+    len = VectorNormalize ( punchangle );
+    len -= (10.0 + len * 0.5) * pmove->frametime;
+    len = max( len, 0.0 );
+    VectorScale ( punchangle, len, punchangle);
+}
+
+/*
+==============
+PM_CheckParamters
+
+==============
+*/
+void PM_CheckParamters( void )
+{
+    float spd;
+    float maxspeed;
+    vec3_t  v_angle;
+
+    spd = ( pmove->cmd.forwardmove * pmove->cmd.forwardmove ) +
+          ( pmove->cmd.sidemove * pmove->cmd.sidemove ) +
+          ( pmove->cmd.upmove * pmove->cmd.upmove );
+    spd = sqrt( spd );
+
+    maxspeed = pmove->clientmaxspeed; //atof( pmove->PM_Info_ValueForKey( pmove->physinfo, "maxspd" ) );
+    if ( maxspeed != 0.0 )
+    {
+        pmove->maxspeed = min( maxspeed, pmove->maxspeed );
+    }
+
+    if ( ( spd != 0.0 ) &&
+         ( spd > pmove->maxspeed ) )
+    {
+        float fRatio = pmove->maxspeed / spd;
+        pmove->cmd.forwardmove *= fRatio;
+        pmove->cmd.sidemove    *= fRatio;
+        pmove->cmd.upmove      *= fRatio;
+    }
+
+    bool theIsImmobilized = GetHasUpgrade(pmove->iuser4, MASK_PLAYER_STUNNED) || GetHasUpgrade(pmove->iuser4, MASK_ALIEN_EMBRYO);
+
+    if ( pmove->flags & FL_FROZEN ||
+         pmove->flags & FL_ONTRAIN || 
+         theIsImmobilized ||
+         pmove->dead )
+    {
+        pmove->cmd.forwardmove = 0;
+        pmove->cmd.sidemove    = 0;
+        pmove->cmd.upmove      = 0;
+        pmove->cmd.viewangles[0] = 0;
+        pmove->cmd.viewangles[1] = 0;
+        pmove->cmd.viewangles[2] = 0;
+        pmove->cmd.buttons = 0;
+    }
+
+
+    PM_DropPunchAngle( pmove->punchangle );
+
+    // Take angles from command.
+    if(!theIsImmobilized)
+    {
+        if ( !pmove->dead)
+        {
+            VectorCopy ( pmove->cmd.viewangles, v_angle );         
+            VectorAdd( v_angle, pmove->punchangle, v_angle );
+        
+            // Set up view angles.
+            pmove->angles[ROLL] =   PM_CalcRoll ( v_angle, pmove->velocity, pmove->movevars->rollangle, pmove->movevars->rollspeed )*4;
+            pmove->angles[PITCH] =  v_angle[PITCH];
+            pmove->angles[YAW]   =  v_angle[YAW];
+        }
+        else
+        {
+            VectorCopy( pmove->oldangles, pmove->angles );
+        }
+    }
+    else
+    {
+        VectorCopy( pmove->oldangles, pmove->angles );
+    }
+    
+    // Set dead player view_offset
+    if ( pmove->dead )
+    {
+        pmove->view_ofs[2] = PM_DEAD_VIEWHEIGHT;
+    }
+
+    // Adjust client view angles to match values used on server.
+    if (pmove->angles[YAW] > 180.0f)
+    {
+        pmove->angles[YAW] -= 360.0f;
+    }
+
+    // Set default stepsize
+    pmove->movevars->stepsize = NS_GetStepsize(pmove->iuser3);
+}
+
+void PM_ReduceTimers( void )
+{
+    if ( pmove->flTimeStepSound > 0 )
+    {
+        pmove->flTimeStepSound -= pmove->cmd.msec;
+        if ( pmove->flTimeStepSound < 0 )
+        {
+            pmove->flTimeStepSound = 0;
+        }
+    }
+    if ( pmove->flDuckTime > 0 )
+    {
+        pmove->flDuckTime -= pmove->cmd.msec;
+        if ( pmove->flDuckTime < 0 )
+        {
+            pmove->flDuckTime = 0;
+        }
+    }
+    if ( pmove->flSwimTime > 0 )
+    {
+        pmove->flSwimTime -= pmove->cmd.msec;
+        if ( pmove->flSwimTime < 0 )
+        {
+            pmove->flSwimTime = 0;
+        }
+    }
+}
+
+qboolean PM_CanFlap()
+{
+    qboolean theCanFlap = false;
+    
+    if(pmove->iuser3 == AVH_USER3_ALIEN_PLAYER3)
+    {
+        if((pmove->onground == -1) && !(pmove->oldbuttons & IN_JUMP))
+        {
+            if(AvHMUHasEnoughAlienEnergy(pmove->fuser3, kAlienEnergyFlap))
+            {
+                // Can't hold the button down
+                theCanFlap = true;
+            }
+        }
+    }
+    return theCanFlap;
+}
+
+qboolean PM_CanGlide()
+{
+    
+    if(pmove->iuser3 == AVH_USER3_ALIEN_PLAYER3)
+    {
+        if((pmove->onground == -1))
+        {
+            return true;
+        }
+    }
+            
+    return false;
+
+}
+
+
+qboolean PM_CanWalljump()
+{
+    vec3_t front;
+    pmtrace_t trace;
+    qboolean theCanWalljump = false;
+
+    if(pmove->iuser3 == AVH_USER3_ALIEN_PLAYER4)
+    {
+        front[0] = pmove->origin[0] + pmove->player_maxs[pmove->usehull][0] + 2;
+        front[1] = pmove->origin[1] + pmove->player_maxs[pmove->usehull][1] + 2;
+        front[2] = pmove->origin[2] + pmove->player_mins[pmove->usehull][2] + 1;
+
+        trace = NS_PlayerTrace (pmove, pmove->origin, front, PM_WORLD_ONLY, -1 );
+        
+        if ( (trace.fraction < 1 ))
+        {
+            theCanWalljump = true;
+        }
+    }
+    return theCanWalljump;
+}
+
+
+void PM_Overwatch()
+{
+    #ifdef AVH_CLIENT
+    gOverwatchTargetRange = -1;
+    #endif
+
+    // If overwatch is on and we have a target
+//  if(GetHasUpgrade(pmove->iuser4, MASK_MARINE_OVERWATCH))
+//  {
+//      // Get target
+//      int thePhysIndex = (int)pmove->fuser1;
+//      if(thePhysIndex != -1)
+//      {
+//          physent_t* theTarget = NULL;//AvHSUGetEntity(thePhysIndex);
+//
+//          //= &(pmove->physents[ thePhysIndex ]);
+//          //physent_t* theTarget = gEngfuncs.pEventAPI->EV_GetPhysent(thePhysIndex);
+//          
+//          if(theTarget)
+//          {
+//              // TODO: Take gun offset into account with vecMid?
+//              vec3_t vecMid;
+//              vec3_t vecMidEnemy;
+//              vec3_t vecDirToEnemy;
+//              vec3_t vec;
+//              
+//              VectorAdd(pmove->origin, pmove->view_ofs, vecMid);
+//              
+//              VectorCopy(theTarget->origin, vecMidEnemy);//theTarget->BodyTarget( vecMid );
+//              
+//              // Right now just point at enemy
+//              //UTIL_MakeVectors()
+//              VectorSubtract(vecMidEnemy, vecMid, vecDirToEnemy);
+//              // = UTIL_VecToAngles(vecDirToEnemy);
+//              VectorAngles(vecDirToEnemy, vec);
+//              
+//              //vec.x = -vec.x;
+//              vec[0] = -vec[0];
+//              
+//              //  if (vec.y > 360)
+//              //      vec.y -= 360;
+//              //  
+//              //  if (vec.y < 0)
+//              //      vec.y += 360;
+//              
+//
+//              // Set new view angles, set iHasNewViewAngles so it isn't reset on us
+//              VectorCopy(vec, pmove->angles);
+//              
+//              #ifdef AVH_CLIENT
+//              VectorCopy(pmove->angles, gTopDownViewAngles);
+//              iHasNewViewAngles = true;
+//              #endif
+//              
+//              AngleVectors (pmove->angles, pmove->forward, pmove->right, pmove->up);
+//              //VectorCopy(vec, this->pev->v_angle);
+//              
+//              // Save target range
+//              #ifdef AVH_CLIENT
+//              gOverwatchTargetRange = Length(vecDirToEnemy);
+//              #endif
+//              pmove->fuser2 = Length(vecDirToEnemy)/100.0f;
+//          }
+//      }
+//  }
+}
+
+bool PM_TopDown()
+{
+    bool theInTopDownMode = false;
+
+    if(GetHasUpgrade(pmove->iuser4, MASK_TOPDOWN))
+    {
+        // Reset this, it seems to be getting set by the engine
+        //pmove->movetype = MOVETYPE_FLY;
+
+        pmove->forward[0] = pmove->forward[1] = 0;
+        pmove->forward[2] = -1;
+        
+        pmove->right[0] = 1;
+        pmove->right[1] = pmove->right[2] = 0;
+
+        pmove->up[0] = pmove->up[2] = 0;
+        pmove->up[1] = 1;
+
+        theInTopDownMode = true;
+
+        if(pmove->cmd.buttons & ( IN_ATTACK ))
+        {
+            int a = 0;
+        }
+        
+        const AvHMapExtents& theMapExtents = GetMapExtents();
+            
+        float theMinX = theMapExtents.GetMinMapX();
+        float theMinY = theMapExtents.GetMinMapY();
+        float theMaxX = theMapExtents.GetMaxMapX();
+        float theMaxY = theMapExtents.GetMaxMapY();
+        float theMaxZ = theMapExtents.GetMaxViewHeight();
+        float theMinZ = theMapExtents.GetMinViewHeight();
+
+        // Modify the max to make sure commander stays inside the world
+        vec3_t theStartPos;
+        VectorCopy(pmove->origin, theStartPos);
+        theStartPos[2] = theMaxZ;
+
+        vec3_t theNewStartPos;
+        vec3_t theEndPos;
+        VectorCopy(pmove->origin, theEndPos);
+        theEndPos[2] = theMinZ;
+
+        float theMaxCommanderHeight = theMaxZ;
+
+        AvHSHUGetFirstNonSolidPoint((float*)theStartPos, (float*)theEndPos, (float*)theNewStartPos);
+
+        //theMaxZ = min(theMaxZ, theNewStartPos[2]);
+        
+//      #ifdef AVH_CLIENT
+//      extern DebugPointListType gSquareDebugLocations;
+//      DebugPoint theDebugPoint(theNewStartPos[0], theNewStartPos[1], theMaxZ - theNewStartPos[2]);
+//      gSquareDebugLocations.push_back(theDebugPoint);
+//      #endif
+        
+        float       speed, drop, friction, control, newspeed;
+        float       currentspeed, addspeed, accelspeed;
+        int         i;
+        vec3_t      wishvel;
+        vec3_t      theAngles;
+        float       fmove = 0.0f;
+        float       smove = 0.0f;
+        float       umove = 0.0f;
+        vec3_t      wishdir;
+        float       wishspeed;
+        
+        // Don't scroll when COMMANDER_MOUSECOORD set, it's indicating a world position, not a move
+        //if(pmove->cmd.impulse != COMMANDER_MOUSECOORD)
+        //{
+//          #ifdef AVH_CLIENT
+//          if ( pmove->runfuncs )
+//          {
+//              // Set spectator flag
+//              iIsSpectator = SPEC_IS_SPECTATOR;
+//          }
+//          #endif
+
+            // Move around in normal spectator method
+            // friction
+            speed = Length (pmove->velocity);
+            if (speed < 1)
+            {
+                VectorCopy (vec3_origin, pmove->velocity)
+            }
+            else
+            {
+                drop = 0;
+                
+                friction = pmove->movevars->friction*5.0;   // extra friction
+                //friction = pmove->movevars->friction*.9f;
+                control = speed < pmove->movevars->stopspeed ? pmove->movevars->stopspeed : speed;
+                drop += control*friction*pmove->frametime;
+                
+                // scale the velocity
+                newspeed = speed - drop;
+                if (newspeed < 0)
+                    newspeed = 0;
+                newspeed /= speed;
+
+                VectorScale (pmove->velocity, newspeed, pmove->velocity);
+            }
+            
+            // If player moved mouse wheel, move camera up and down if we didn't just move over a view entity
+            qboolean theFoundEntity = false;
+            //float theDesiredHeight = PM_GetDesiredTopDownCameraHeight(theFoundEntity);
+            if(pmove->cmd.forwardmove != 0)
+            {
+                int a = 0;
+            }
+            if(pmove->cmd.sidemove != 0)
+            {
+                int a = 0;
+            }
+            if(pmove->cmd.upmove != 0)
+            {
+                int a = 0;
+            }
+            
+//          gHeightLevel += (pmove->cmd.forwardmove/300.0f);
+//          float theDesiredHeight = theMaxViewHeight + gHeightLevel;
+//
+//          // Note: To have a nice smooth zoom-up effect, comment out this next line, but you'll have to
+//          // fix the bouncing from the drop/control/friction code above.  That's where the problem is.
+//          // You'll also have to add an initial upwards velocity in AvHPlayer::StartTopDown()
+//          pmove->origin[2] = theDesiredHeight;
+//          
+//          const float kSwoopingTolerance = 1.0f;
+//          float theDiff = theDesiredHeight - pmove->origin[2];
+//          float theFabsDiff = fabs(theDiff);
+//          
+//          if(theFabsDiff > kSwoopingTolerance)
+//          {
+//              // When we get near, don't use sudden moves, move slowly
+//              float theAmount = min(theFabsDiff*10, 1000);
+//              
+//              //fmove = theDiff;//pmove->cmd.forwardmove;
+//              if(theDiff > 0)
+//                  fmove = -theAmount;
+//              else
+//                  fmove = theAmount;
+//          }
+//          else
+//          {
+//              fmove = 0.0f;
+//          }
+            
+            // accelerate
+            fmove = pmove->cmd.forwardmove;
+            smove = pmove->cmd.sidemove;
+            umove = pmove->cmd.upmove;
+            
+            float theMoveTotal = fabs(fmove) + fabs(smove) + fabs(umove);
+            if(theMoveTotal > 5.0f)
+            {
+//              VectorNormalize (pmove->forward);
+//              VectorNormalize (pmove->right);
+//              VectorNormalize (pmove->up);
+//              
+//              for (i=0 ; i<3 ; i++)
+//              {
+//                  wishvel[i] = pmove->forward[i]*fmove + pmove->right[i]*smove + pmove->up[i]*umove;
+//              }
+//              //wishvel[2] += pmove->cmd.upmove;
+//              
+                PM_GetWishVelocity(wishvel);
+                VectorCopy (wishvel, wishdir);
+
+                wishspeed = VectorNormalize(wishdir);
+                
+                //
+                // clamp to server defined max speed
+                //
+                if (wishspeed > pmove->movevars->maxspeed)
+                {
+                    VectorScale (wishvel, pmove->movevars->maxspeed/wishspeed, wishvel);
+                    wishspeed = pmove->movevars->maxspeed;
+                }
+                
+                currentspeed = DotProduct(pmove->velocity, wishdir);
+                addspeed = wishspeed - currentspeed;
+                if (addspeed > 0)
+                {
+                    accelspeed = pmove->movevars->accelerate*pmove->frametime*wishspeed;
+                    if (accelspeed > addspeed)
+                        accelspeed = addspeed;
+                    
+                    for (i=0 ; i<3 ; i++)
+                        pmove->velocity[i] += accelspeed*wishdir[i];    
+                    
+                    // move
+                    VectorMA (pmove->origin, pmove->frametime, pmove->velocity, pmove->origin);
+                }
+            }
+            else
+            {
+                wishvel[0] = wishvel[1] = wishvel[2] = 0.0f;
+                wishdir[0] = wishdir[1] = wishdir[2] = 0.0f;
+                pmove->velocity[2] = 0.0f;
+            }
+        //}
+    
+        // Set view down
+        theAngles[0] = kTopDownYaw;
+        theAngles[1] = kTopDownPitch;
+        theAngles[2] = kTopDownRoll;
+        
+        // Set angles facing down so observer knows which way to point
+        VectorCopy(theAngles, pmove->angles);
+        
+        // Set origin
+        //pmove->origin[2] = 1080;
+        //pmove->origin[2] = PM_GetDesiredTopDownCameraHeight();
+        
+        #ifdef AVH_CLIENT
+        if ( pmove->runfuncs )
+        {
+            VectorCopy(theAngles, gTopDownViewAngles);
+            //iHasNewViewAngles = true;
+
+            // Set view origin to our real origin but at our highest map extents.  This is needed to the commander's origin is actually inside the world so 
+            // he receives nearby events, but so he looks like he's outside the world. Changing this?  Make sure AvHPlayer::GetVisualOrigin() is updated also.
+            VectorCopy(pmove->origin, gTopDownViewOrigin);
+            gTopDownViewOrigin[2] = theMaxCommanderHeight;
+
+            //iHasNewViewOrigin = true;
+        }
+        #endif
+    
+        AngleVectors (pmove->angles, pmove->forward, pmove->right, pmove->up);
+        
+        // Are we zooming to an area?
+        if(pmove->cmd.impulse == COMMANDER_MOVETO)
+        {
+            pmove->origin[0] = pmove->cmd.upmove*kWorldPosNetworkConstant;
+            pmove->origin[1] = pmove->cmd.sidemove*kWorldPosNetworkConstant;
+            VectorCopy(vec3_origin, pmove->velocity)
+        }
+        
+        // Clip position to map extents
+        float theCurrentX = pmove->origin[0];
+        float theCurrentY = pmove->origin[1];
+        //float theCurrentZ = pmove->origin[2];
+
+        pmove->origin[0] = min(max(theMinX, theCurrentX), theMaxX);
+        pmove->origin[1] = min(max(theMinY, theCurrentY), theMaxY);
+        pmove->origin[2] = min(max(theMinZ, theNewStartPos[2]), theMaxZ);
+
+        if(pmove->runfuncs)
+        {
+            // Update view offset
+            #ifdef AVH_CLIENT
+            // Save our top down height so we can offset camera in view.cpp
+            // Changing this?  Make sure AvHPlayer::GetVisualOrigin() is updated also.
+            //gTopDownHeight = theMaxCommanderHeight;
+            #endif
+            
+            if(theMaxCommanderHeight < pmove->origin[2])
+            {
+                int a = 0;
+            }
+            pmove->view_ofs[2] = theMaxCommanderHeight - pmove->origin[2];
+
+            //pmove->Con_Printf("PMTopDown(): up: %f, side: %f, forward: %f, impulse: %d, velocity: %f\n", pmove->cmd.upmove, pmove->cmd.sidemove, pmove->cmd.forwardmove, pmove->cmd.impulse, Length(pmove->velocity));
+        }
+    }
+    
+    // Reset view
+    //  else if(pmove->iuser3 == AVH_USER3_VIEW_SPECIAL_LEAVE_COMMANDER)
+    //  {
+    //      vec3_t      theAngles;
+    //      
+    //      // Set view down
+    //      theAngles[0] = 0;
+    //      theAngles[1] = 0;
+    //      theAngles[2] = 0;
+    //      
+    //      // Set angles facing down so observer knows which way to point
+    //      VectorCopy(theAngles, pmove->angles);
+    //      
+    //      #ifdef AVH_CLIENT
+    //      if ( pmove->runfuncs )
+    //      {
+    //          VectorCopy(theAngles, gTopDownViewAngles);
+    //          iHasNewViewAngles = true;
+    //      }
+    //      #endif
+    //      
+    //      AngleVectors (pmove->angles, pmove->forward, pmove->right, pmove->up);
+    //
+    //      #ifdef AVH_CLIENT
+    //      if ( pmove->runfuncs )
+    //      {
+    //          iHasNewViewAngles = true;
+    //          pmove->iuser3 = 0;
+    //      }
+    //      #endif
+    //
+    //      #ifdef AVH_SERVER
+    //      pmove->iuser3 = 0;
+    //      #endif
+    //  }
+    return theInTopDownMode;
+}
+
+void PM_Jetpack()
+{
+    bool theHasJetpackUpgrade = GetHasUpgrade(pmove->iuser4, MASK_UPGRADE_7) && (pmove->iuser3 == AVH_USER3_MARINE_PLAYER);
+    
+    // Turn off jetpack by default
+    gIsJetpacking[pmove->player_index] = false;
+    
+    if(!pmove->dead && theHasJetpackUpgrade)
+    {
+        bool theJumpHeldDown = (pmove->cmd.buttons & IN_JUMP);
+        bool theHasEnoughEnergy = (pmove->fuser3 > (kJetpackMinimumEnergyToJetpack*kNormalizationNetworkFactor));
+        float theTimePassed = pmove->frametime;
+
+        // If jump is held down and we have a jetpack, apply upwards force! - added check for digestion - elven
+        if(theJumpHeldDown && theHasEnoughEnergy && !GetHasUpgrade(pmove->iuser4, MASK_ENSNARED) && !GetHasUpgrade(pmove->iuser4, MASK_PLAYER_STUNNED) && !GetHasUpgrade(pmove->iuser4, MASK_DIGESTING))
+        {
+            gIsJetpacking[pmove->player_index] = true;
+            
+            // Apply upwards force to player
+            //pmove->velocity[2] += kJetpackForce;
+            
+            vec3_t theWishVelocity;
+            PM_GetWishVelocity(theWishVelocity);
+
+            const float kBaseScalar = .6f;
+
+            int theMinMarineSpeed = BALANCE_IVAR(kBasePlayerSpeed);
+            if(theMinMarineSpeed == 0)
+            {
+                theMinMarineSpeed = 150;
+            }
+
+            int theMaxMarineSpeed = BALANCE_IVAR(kUnencumberedPlayerSpeed);
+            if(theMaxMarineSpeed == 0)
+            {
+                theMaxMarineSpeed = 220;
+            }
+
+            float theWeightScalar = kBaseScalar + (1.0f - kBaseScalar)*((pmove->clientmaxspeed - theMinMarineSpeed)/(theMaxMarineSpeed - theMinMarineSpeed));
+            
+            pmove->velocity[0] += (theWishVelocity[0]/pmove->clientmaxspeed)*kJetpackLateralScalar;
+            pmove->velocity[1] += (theWishVelocity[1]/pmove->clientmaxspeed)*kJetpackLateralScalar;
+            pmove->velocity[2] += theTimePassed*theWeightScalar*kJetpackForce;
+
+            // Play an event every so often
+            if(pmove->runfuncs /*&& (pmove->RandomLong(0, 2) == 0)*/)
+            {
+                pmove->PM_PlaybackEventFull(0, pmove->player_index, gJetpackEventID, 0, (float *)pmove->origin, (float *)pmove->origin, 0.0, 0.0, /*theWeaponIndex*/ 0, 0, 0, 0 );
+            }
+        }
+
+        float theJetpackEnergy = pmove->fuser3/kNormalizationNetworkFactor;
+
+        AvHMUUpdateJetpackEnergy(gIsJetpacking[pmove->player_index], theTimePassed, theJetpackEnergy);
+
+        pmove->fuser3 = theJetpackEnergy*kNormalizationNetworkFactor;
+    }
+
+    //pmove->Con_Printf("Jetpacking: %d\n", gIsJetpacking);
+}
+
+/*
+=============
+PlayerMove
+
+Returns with origin, angles, and velocity modified in place.
+
+Numtouch and touchindex[] will be set if any of the physents
+were contacted during the move.
+=============
+*/
+void PM_PlayerMove ( qboolean server )
+{
+    physent_t *pLadder = NULL;
+
+    // Are we running server code?
+    pmove->server = server;                
+
+    if (pmove->cmd.buttons & IN_JUMP)
+    {
+        int a =0;
+    }
+    
+    int theMaxSpeed = 0;
+
+    // Adjust speeds etc.
+    PM_CheckParamters();
+
+    // Assume we don't touch anything
+    pmove->numtouch = 0;                    
+
+    // # of msec to apply movement
+    pmove->frametime = pmove->cmd.msec * 0.001;    
+
+//  if(pmove->runfuncs)
+//  {
+//      pmove->Con_Printf("pmove->frametime: %f\n", pmove->frametime);
+//  }
+
+    PM_ReduceTimers();
+
+    bool theIsGestating = GetHasUpgrade(pmove->iuser4, MASK_ALIEN_EMBRYO);
+    bool theIsParalyzed = GetHasUpgrade(pmove->iuser4, MASK_PLAYER_STUNNED);
+
+    if(!theIsParalyzed && !theIsGestating)
+    {
+        // Convert view angles to vectors
+        AngleVectors (pmove->angles, pmove->forward, pmove->right, pmove->up);
+    }
+    else
+    {
+        int a = 0;
+    }
+
+    //if(pmove->cmd.impulse == COMMANDER_MOUSECOORD)
+//  if(pmove->iuser3 == AVH_USER3_VIS_SPECIAL_TOPDOWN)
+//  {
+//      if((pmove->cmd.impulse != COMMANDER_MOVETO) && (pmove->cmd.impulse != MESSAGE_NULL))
+//      {
+//          return;
+//      }
+//  }
+    
+    bool theIsDucking = AvHMUGetCanDuck(pmove->iuser3) && (pmove->flags & FL_DUCKING);
+    pmove->usehull = AvHMUGetHull(theIsDucking, pmove->iuser3);
+
+    //pmove->Con_Printf("Using hull: %d\n", pmove->usehull);
+
+    //PM_ShowClipBox();
+
+    if(pmove->cmd.impulse == COMMANDER_SCROLL)
+    {
+        int a = 0;
+    }
+
+    // Clear movement when building, giving orders, or anything other than scrolling
+    if(GetHasUpgrade(pmove->iuser4, MASK_TOPDOWN))
+    {
+        if((pmove->cmd.impulse != COMMANDER_SCROLL) && (pmove->cmd.impulse != COMMANDER_MOVETO))
+        {
+            pmove->cmd.sidemove = pmove->cmd.upmove = pmove->cmd.forwardmove = 0;
+            pmove->cmd.buttons = 0;
+        }
+    }
+
+    if ( pmove->flags & FL_FROZEN )
+        return;
+
+    // Special handling for spectator and observers. (iuser1 is set if the player's in observer mode)
+    if ( pmove->spectator || pmove->iuser1 > 0 )
+    {
+        PM_SpectatorMove();
+        PM_CategorizePosition();
+        return;
+    }
+
+//  if(GetHasUpgrade(pmove->iuser4, MASK_MARINE_OVERWATCH))
+//  {
+//      PM_Overwatch();
+//  }
+
+    PM_TopDown();
+
+    // Paralyzed players and embryos can't move
+    if(theIsParalyzed || theIsGestating)
+    {
+        PM_Physics_Toss();
+        return;
+    }
+    
+    // Always try and unstick us unless we are in NOCLIP mode
+    if ( pmove->movetype != MOVETYPE_NOCLIP && pmove->movetype != MOVETYPE_NONE )
+    {
+        if ( PM_CheckStuck() )
+        {
+            return;  // Can't move, we're stuck
+        }
+    }
+
+    // Now that we are "unstuck", see where we are ( waterlevel and type, pmove->onground ).
+    PM_CategorizePosition();
+
+    // Store off the starting water level
+    pmove->oldwaterlevel = pmove->waterlevel;
+
+    // If we are not on ground, store off how fast we are moving down
+    if ( pmove->onground == -1 )
+    {
+        pmove->flFallVelocity = -pmove->velocity[2];
+    }
+
+	g_onladder[pmove->player_index] = 0;
+
+    PM_Jetpack();
+
+    PM_AlienAbilities();
+
+    NS_UpdateWallsticking();
+
+    // Don't run ladder code if dead or on a train, or a lerk or a skulk
+    bool theIsFlyingAlien = (pmove->iuser3 == AVH_USER3_ALIEN_PLAYER3) && (pmove->onground == -1);
+    bool theIsSkulk = (pmove->iuser3 == AVH_USER3_ALIEN_PLAYER1);
+
+    if ( !pmove->dead && !(pmove->flags & FL_ONTRAIN) && !gIsJetpacking[pmove->player_index] && !GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING) && !theIsFlyingAlien && !theIsSkulk)
+    {
+        pLadder = PM_Ladder();
+        if ( pLadder )
+        {
+            g_onladder[pmove->player_index] = 1;
+        }
+    }
+
+    //pmove->Con_DPrintf("g_onladder: %d\n", g_onladder);
+    
+    PM_UpdateStepSound();
+
+    PM_Duck();
+
+    // Don't run ladder code if dead or on a train
+    if ( !pmove->dead && !(pmove->flags & FL_ONTRAIN) && !gIsJetpacking[pmove->player_index] && !GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING))
+    {
+        if ( pLadder )
+        {
+            PM_LadderMove( pLadder );
+        }
+        else if ( pmove->movetype != MOVETYPE_WALK &&
+                  pmove->movetype != MOVETYPE_NOCLIP )
+        {
+            // Clear ladder stuff unless player is noclipping
+            //  it will be set immediately again next frame if necessary
+            pmove->movetype = MOVETYPE_WALK;
+        }
+    }
+
+    // Slow down, I'm pulling it! (a box maybe) but only when I'm standing on ground
+    if ( ( pmove->onground != -1 ) && ( pmove->cmd.buttons & IN_USE) )
+    {
+        VectorScale( pmove->velocity, 0.3, pmove->velocity );
+    }
+
+    // Reset gravity to 1.0, in case we're not gliding anymore.  This will get changed
+    // in PM_Jump if player is still holding down the key.
+    // This assumes only players in here!  Sounds problematic to me.
+//  if(pmove->iuser3 == AVH_USER3_GLIDE)
+//  {
+//      pmove->gravity = 1.0f;
+//  }
+
+    // Handle movement
+    switch ( pmove->movetype )
+    {
+    default:
+        pmove->Con_Printf("Bogus pmove player movetype %i on (%i) 0=cl 1=sv\n", pmove->movetype, pmove->server);
+        break;
+
+    case MOVETYPE_NONE:
+        break;
+
+    case MOVETYPE_NOCLIP:
+        PM_NoClip();
+        break;
+
+    case MOVETYPE_TOSS:
+    case MOVETYPE_BOUNCE:
+        PM_Physics_Toss();
+        break;
+
+    case MOVETYPE_FLY:
+    
+        PM_CheckWater();
+
+        // Was jump button pressed?
+        // If so, set velocity to 270 away from ladder.  This is currently wrong.
+        // Also, set MOVE_TYPE to walk, too.
+        if ( pmove->cmd.buttons & IN_JUMP)
+        {
+            if ( !pLadder )
+            {
+                PM_Jump ();
+            }
+        }
+        else
+        {
+            pmove->oldbuttons &= ~IN_JUMP;
+        }
+        
+        // Perform the move accounting for any base velocity.
+        VectorAdd (pmove->velocity, pmove->basevelocity, pmove->velocity);
+        PM_FlyMove ();
+        VectorSubtract (pmove->velocity, pmove->basevelocity, pmove->velocity);
+        break;
+
+    case MOVETYPE_WALK:
+        if ( !PM_InWater() )
+        {
+            PM_AddCorrectGravity();
+        }
+
+        // If we are leaping out of the water, just update the counters.
+        if ( pmove->waterjumptime )
+        {
+            PM_WaterJump();
+            PM_FlyMove();
+
+            // Make sure waterlevel is set correctly
+            PM_CheckWater();
+            return;
+        }
+
+        // If we are swimming in the water, see if we are nudging against a place we can jump up out
+        //  of, and, if so, start out jump.  Otherwise, if we are not moving up, then reset jump timer to 0
+        if ( pmove->waterlevel >= 2 ) 
+        {
+            if ( pmove->waterlevel == 2 )
+            {
+                PM_CheckWaterJump();
+            }
+
+            // If we are falling again, then we must not trying to jump out of water any more.
+            if ( pmove->velocity[2] < 0 && pmove->waterjumptime )
+            {
+                pmove->waterjumptime = 0;
+            }
+
+            // Was jump button pressed?
+            if (pmove->cmd.buttons & IN_JUMP)
+            {
+                PM_Jump ();
+            }
+            else
+            {
+                pmove->oldbuttons &= ~IN_JUMP;
+            }
+
+            // Perform regular water movement
+            PM_WaterMove();
+            
+            VectorSubtract (pmove->velocity, pmove->basevelocity, pmove->velocity);
+
+            // Get a final position
+            PM_CategorizePosition();
+        }
+        else
+
+        // Not underwater
+        {
+
+            // Was jump button pressed?
+            if ( pmove->cmd.buttons & IN_JUMP )
+            {
+                if ( !pLadder )
+                {
+                    PM_Jump ();
+                }
+            }
+            else
+            {
+                pmove->oldbuttons &= ~IN_JUMP;
+            }
+
+            // Fricion is handled before we add in any base velocity. That way, if we are on a conveyor, 
+            //  we don't slow when standing still, relative to the conveyor.
+            if ((pmove->onground != -1) || GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING))
+            {
+                if(!GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING))
+                    pmove->velocity[2] = 0.0;
+                PM_Friction();
+            }
+
+            // Make sure velocity is valid.
+            PM_CheckVelocity();
+
+            // Are we on ground now
+            if ( (pmove->onground != -1) || GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING))
+            {
+                PM_WalkMove();
+            }
+            else
+            {
+                PM_AirMove();  // Take into account movement when in air.
+            }
+            
+            // Set final flags.
+            PM_CategorizePosition();
+
+            //float theVelocityLength = Length(pmove->velocity);
+            //pmove->Con_Printf("Max speed: %f, velocity: %f\n", pmove->maxspeed, theVelocityLength);
+
+            // Now pull the base velocity back out.
+            // Base velocity is set if you are on a moving object, like
+            //  a conveyor (or maybe another monster?)
+            VectorSubtract (pmove->velocity, pmove->basevelocity, pmove->velocity );
+                
+            // Make sure velocity is valid.
+            PM_CheckVelocity();
+
+            // Add any remaining gravitational component.
+            if ( !PM_InWater() )
+            {
+                PM_FixupGravityVelocity();
+            }
+
+            // If we are on ground, no downward velocity.
+            if((pmove->onground != -1) && !GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING))
+            {
+                pmove->velocity[2] = 0;
+            }
+
+            // See if we landed on the ground with enough force to play
+            //  a landing sound.
+            PM_CheckFalling();
+        }
+            
+
+        // Did we enter or leave the water?
+        PM_PlayWaterSounds();
+        break;
+    }
+}
+
+void PM_CreateStuckTable( void )
+{
+    float x, y, z;
+    int idx;
+    int i;
+    float zi[3];
+
+    memset(rgv3tStuckTable, 0, 54 * sizeof(vec3_t));
+
+    idx = 0;
+    // Little Moves.
+    x = y = 0;
+    // Z moves
+    for (z = -0.125 ; z <= 0.125 ; z += 0.125)
+    {
+        rgv3tStuckTable[idx][0] = x;
+        rgv3tStuckTable[idx][1] = y;
+        rgv3tStuckTable[idx][2] = z;
+        idx++;
+    }
+    x = z = 0;
+    // Y moves
+    for (y = -0.125 ; y <= 0.125 ; y += 0.125)
+    {
+        rgv3tStuckTable[idx][0] = x;
+        rgv3tStuckTable[idx][1] = y;
+        rgv3tStuckTable[idx][2] = z;
+        idx++;
+    }
+    y = z = 0;
+    // X moves
+    for (x = -0.125 ; x <= 0.125 ; x += 0.125)
+    {
+        rgv3tStuckTable[idx][0] = x;
+        rgv3tStuckTable[idx][1] = y;
+        rgv3tStuckTable[idx][2] = z;
+        idx++;
+    }
+
+    // Remaining multi axis nudges.
+    for ( x = - 0.125; x <= 0.125; x += 0.250 )
+    {
+        for ( y = - 0.125; y <= 0.125; y += 0.250 )
+        {
+            for ( z = - 0.125; z <= 0.125; z += 0.250 )
+            {
+                rgv3tStuckTable[idx][0] = x;
+                rgv3tStuckTable[idx][1] = y;
+                rgv3tStuckTable[idx][2] = z;
+                idx++;
+            }
+        }
+    }
+
+    // Big Moves.
+    x = y = 0;
+    zi[0] = 0.0f;
+    zi[1] = 1.0f;
+    zi[2] = 6.0f;
+
+    for (i = 0; i < 3; i++)
+    {
+        // Z moves
+        z = zi[i];
+        rgv3tStuckTable[idx][0] = x;
+        rgv3tStuckTable[idx][1] = y;
+        rgv3tStuckTable[idx][2] = z;
+        idx++;
+    }
+
+    x = z = 0;
+
+    // Y moves
+    for (y = -2.0f ; y <= 2.0f ; y += 2.0)
+    {
+        rgv3tStuckTable[idx][0] = x;
+        rgv3tStuckTable[idx][1] = y;
+        rgv3tStuckTable[idx][2] = z;
+        idx++;
+    }
+    y = z = 0;
+    // X moves
+    for (x = -2.0f ; x <= 2.0f ; x += 2.0f)
+    {
+        rgv3tStuckTable[idx][0] = x;
+        rgv3tStuckTable[idx][1] = y;
+        rgv3tStuckTable[idx][2] = z;
+        idx++;
+    }
+
+    // Remaining multi axis nudges.
+    for (i = 0 ; i < 3; i++)
+    {
+        z = zi[i];
+        
+        for (x = -2.0f ; x <= 2.0f ; x += 2.0f)
+        {
+            for (y = -2.0f ; y <= 2.0f ; y += 2.0)
+            {
+                rgv3tStuckTable[idx][0] = x;
+                rgv3tStuckTable[idx][1] = y;
+                rgv3tStuckTable[idx][2] = z;
+                idx++;
+            }
+        }
+    }
+}
+
+
+
+
+/*
+This modume implements the shared player physics code between any particular game and 
+the engine.  The same PM_Move routine is built into the game .dll and the client .dll and is
+invoked by each side as appropriate.  There should be no distinction, internally, between server
+and client.  This will ensure that prediction behaves appropriately.
+*/
+
+void PM_Move ( struct playermove_s *ppmove, int server )
+{
+    assert( pm_shared_initialized );
+
+    pmove = ppmove;
+
+    PM_SetHulls();
+
+    PM_PlayerMove( ( server != 0 ) ? true : false );
+
+    if ( pmove->onground != -1 )
+    {
+        pmove->flags |= FL_ONGROUND;
+    }
+    else
+    {
+        pmove->flags &= ~FL_ONGROUND;
+    }
+
+    // In single player, reset friction after each movement to FrictionModifier Triggers work still.
+    if ( !pmove->multiplayer && ( pmove->movetype == MOVETYPE_WALK  ) )
+    {
+        pmove->friction = 1.0f;
+    }
+
+    //int theRandomNumber = pmove->RandomLong(0, 100);
+    //  
+    //#ifdef AVH_CLIENT
+    //if(pmove->runfuncs)
+    //{
+    //  PM_DebugLocations(theRandomNumber);
+    //}
+    //#endif
+
+    // Remember most predicted player origin (only if runfuncs?)
+    if(pmove->runfuncs)
+    {
+        VectorCopy(pmove->origin, gPredictedPlayerOrigin);
+        VectorCopy(pmove->view_ofs, gPredictedPlayerVOfs);
+    }
+
+    ///////////////////////////////
+    // Begin Max's Code
+    ///////////////////////////////     
+
+    // If the current orientation is different than the desired orientation,
+    // interpolate between them.
+
+    vec3_t currentAngles;
+    vec3_t targetAngles;
+
+    #ifdef AVH_SERVER
+
+    NS_FixWallstickingAngles(pmove->vuser1);
+    NS_FixWallstickingAngles(pmove->vuser2);
+    
+    VectorCopy(pmove->vuser1, currentAngles);
+    VectorCopy(pmove->vuser2, targetAngles);
+
+    #endif
+
+    #ifdef AVH_CLIENT
+
+    NS_FixWallstickingAngles(gPlayerAngles);
+    NS_FixWallstickingAngles(gTargetPlayerAngles);
+    
+    VectorCopy(gPlayerAngles, currentAngles);
+    VectorCopy(gTargetPlayerAngles, targetAngles);
+    
+    #endif
+
+    if (VectorCompare(currentAngles, targetAngles) == 0)
+    {
+
+        Quat src = Quat(currentAngles).Unit();
+        Quat dst = Quat(targetAngles).Unit();
+    
+        Quat rot = (dst * src.Conjugate()).Unit();
+
+        // Compute the axis and angle we need to rotate about to go from src
+        // to dst.
+
+        float angle = acosf(rot.w) * 2;
+        float sinAngle = sqrtf(1.0f - rot.w * rot.w);
+        
+        if (fabs(sinAngle) < 0.0005f)
+        {
+            sinAngle = 1;
+        }
+
+        vec3_t axis;
+
+        axis[0] = rot.x / sinAngle;
+        axis[1] = rot.y / sinAngle;
+        axis[2] = rot.z / sinAngle;
+
+        // Wrap the angle to the range -PI to PI
+        angle = WrapFloat(angle, -M_PI, M_PI);
+
+        // Amount to rotate this frame.
+        float frameAngle = kSkulkRotationRate * pmove->frametime;
+
+        if (fabs(angle) <= frameAngle)
+        {
+            // If we are very close, just jump to the goal orientation.
+            VectorCopy(targetAngles, currentAngles);
+        }
+        else
+        {
+
+            Quat final;
+
+            if (angle < 0)
+            {
+                final = Quat(-frameAngle, axis) * src;
+            }
+            else
+            {
+                final = Quat(frameAngle, axis) * src;
+            }
+
+            vec3_t xAxis;
+            vec3_t yAxis;
+            vec3_t zAxis;
+            
+            final.GetVectors(xAxis, yAxis, zAxis);
+
+            VectorsToAngles(yAxis, xAxis, zAxis, currentAngles);
+
+        }
+
+    }
+
+    #ifdef AVH_SERVER
+    VectorCopy(currentAngles, pmove->vuser1);
+    #endif
+    
+    #ifdef AVH_CLIENT
+    VectorCopy(currentAngles, gPlayerAngles);
+    #endif
+
+    ///////////////////////////////
+    // End Max's Code
+    /////////////////////////////// 
+
+}
+
+//void PM_GetEntityList(PhysEntListType& outList)
+//{
+//  physent_t* theTarget = NULL;
+//  
+//  for (i = 0; i < MAX_PHYSENTS; i++)
+//  {
+//      theTarget = pmove->physents[i];
+//      outList.push_back(theTarget);
+//  }
+//
+//}
+
+
+int PM_GetVisEntInfo( int ent )
+{
+    if ( ent >= 0 && ent <= pmove->numvisent )
+    {
+        return pmove->visents[ ent ].info;
+    }
+    return -1;
+}
+
+int PM_GetPhysEntInfo( int ent )
+{
+    if ( ent >= 0 && ent <= pmove->numphysent)
+    {
+        return pmove->physents[ ent ].info;
+    }
+    return -1;
+}
+
+void PM_Init( struct playermove_s *ppmove )
+{
+    assert( !pm_shared_initialized );
+    
+    pmove = ppmove;
+    
+    PM_CreateStuckTable();
+    PM_InitTextureTypes();
+    PM_InitBoxHull();
+    
+    pm_shared_initialized = 1;
+}
+
+
+bool PM_ViewTraceEntity(float inOriginX, float inOriginY, float inOriginZ, float inDirX, float inDirY, float inDirZ, int& outIndex)
+{
+    bool theSuccess = false;
+
+    vec3_t theTraceEnd;
+    vec3_t theNormal;
+    theNormal[0] = inDirX;
+    theNormal[1] = inDirY;
+    theNormal[2] = inDirZ;
+    VectorScale(theNormal, 8012, theTraceEnd);
+
+    vec3_t theTraceStart;
+    theTraceStart[0] = inOriginX;
+    theTraceStart[1]= inOriginY;
+    theTraceStart[2] = inOriginZ;
+    
+    pmtrace_t* theTrace = NULL;
+    bool theDone = false;
+    
+    do
+    {
+        theTrace = pmove->PM_TraceLine(theTraceStart, theTraceEnd, PM_TRACELINE_ANYVISIBLE, 2,  -1);
+
+        if(!theTrace || theTrace->fraction < 0.0001f || theTrace->ent > 0)
+        {
+            theDone = true;
+        }
+        else
+        {
+            // Trace again from here
+            VectorCopy(theTrace->endpos, theTraceStart);
+        }
+
+    } while(!theDone);
+
+    if(theTrace && (theTrace->ent > 0))
+    {
+        outIndex = theTrace->ent;
+        theSuccess = true;
+    }
+    return theSuccess;
+}
+
+bool GetIsEntityAPlayer(int inPhysIndex)
+{
+    bool theEntIsPlayer = false;
+
+    physent_t* theEntity = NULL;
+    if((inPhysIndex > 0) && (inPhysIndex <= pmove->numphysent))
+    {
+        theEntity = pmove->physents + inPhysIndex;
+    }
+
+    if(theEntity)
+    {
+        const char* theName = theEntity->name;
+        if(!strcmp(theName, kAvHPlayerClassName))
+        {
+            theEntIsPlayer = true;
+        }
+    }
+
+    return theEntIsPlayer;
+}
+
+
+bool PM_ViewTracePlayer(float inOriginX, float inOriginY, float inOriginZ, float inEndX, float inEndY, float inEndZ, int& outIndex)
+{
+    bool theSuccess = false;
+
+    #ifdef AVH_CLIENT
+    //gSquareDebugLocations.clear();
+    #endif
+
+    vec3_t theTraceEnd;
+    //vec3_t theNormal;
+    //theNormal[0] = inDirX;
+    //theNormal[1] = inDirY;
+    //theNormal[2] = inDirZ;
+    //VectorScale(theNormal, 8012, theTraceEnd);
+    theTraceEnd[0] = inEndX;
+    theTraceEnd[1] = inEndY;
+    theTraceEnd[2] = inEndZ;
+    
+    vec3_t theTraceStart;
+    theTraceStart[0] = inOriginX;
+    theTraceStart[1]= inOriginY;
+    theTraceStart[2] = inOriginZ;
+    
+    #ifdef AVH_CLIENT
+    DebugPoint thePoint;
+    thePoint.x = theTraceStart[0];
+    thePoint.y = theTraceStart[1];
+    thePoint.z = theTraceStart[2];
+    //gSquareDebugLocations.push_back(thePoint);
+
+    thePoint.x = theTraceEnd[0];
+    thePoint.y = theTraceEnd[1];
+    thePoint.z = theTraceEnd[2];
+    //gSquareDebugLocations.push_back(thePoint);
+    #endif  
+    
+//  pmtrace_t* theTrace = NULL;
+//  bool theDone = false;
+    
+//  do
+//  {
+        pmtrace_t theTraceStruct;
+
+        theTraceStruct = NS_PlayerTrace(pmove, theTraceStart, theTraceEnd, PM_NORMAL, -1);
+        int theEntIndex = theTraceStruct.ent;
+
+//      //pmtrace_t     (*PM_PlayerTrace) (vec3_t start, vec3_t end, int traceFlags, int ignore_pe );
+//      //theTrace = pmove->PM_TraceLine(theTraceStart, theTraceEnd, PM_TRACELINE_ANYVISIBLE, 2,  -1);
+//      bool theEntityIsAPlayer = false;
+//      
+//      if(!theTrace || theTrace->fraction < 0.0001f || (theEntityIsAPlayer = GetIsEntityAPlayer(theTrace->ent)))
+//      {
+//          theDone = true;
+//      }
+//      else
+//      {
+//          // Trace again from here
+//          VectorCopy(theTrace->endpos, theTraceStart);
+//      }
+
+        //if(!theDone || theEntityIsAPlayer)
+        if(theEntIndex > 0)
+        {
+            #ifdef AVH_CLIENT
+            DebugPoint thePoint;
+            thePoint.x = theTraceStruct.endpos[0];
+            thePoint.y = theTraceStruct.endpos[1];
+            thePoint.z = theTraceStruct.endpos[2];
+            //gSquareDebugLocations.push_back(thePoint);
+            #endif
+        }
+        
+//  } while(!theDone);
+    
+    if(theEntIndex > 0)
+    //if(theTrace && (theTrace->ent > 0))
+    {
+        outIndex = theEntIndex;
+        //outIndex = theTrace->ent;
+        theSuccess = true;
+    }
+    return theSuccess;
+}
+
+
+
diff --git a/main/source/pm_shared/pm_shared.h b/main/source/pm_shared/pm_shared.h
new file mode 100644
index 00000000..faa77737
--- /dev/null
+++ b/main/source/pm_shared/pm_shared.h
@@ -0,0 +1,39 @@
+/***
+*
+*	Copyright (c) 1999, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+*   Use, distribution, and modification of this source code and/or resulting
+*   object code is restricted to non-commercial enhancements to products from
+*   Valve LLC.  All other use, distribution, or modification is prohibited
+*   without written permission from Valve LLC.
+*
+****/
+
+//
+// pm_shared.h
+//
+#if !defined( PM_SHAREDH )
+#define PM_SHAREDH
+#pragma once
+
+void PM_Init( struct playermove_s *ppmove );
+void PM_Move ( struct playermove_s *ppmove, int server );
+char PM_FindTextureType( char *name );
+
+// Spectator Movement modes (stored in pev->iuser1, so the physics code can get at them)
+
+#define OBS_NONE				0
+#define OBS_CHASE_LOCKED		1
+#define OBS_CHASE_FREE			2
+#define OBS_ROAMING				3		
+#define OBS_IN_EYE				4
+/*
+#define OBS_MAP_FREE			5
+#define OBS_MAP_CHASE			6
+*/
+
+#endif
\ No newline at end of file
diff --git a/main/source/putsrc.bat b/main/source/putsrc.bat
new file mode 100644
index 00000000..c2956bce
--- /dev/null
+++ b/main/source/putsrc.bat
@@ -0,0 +1,3 @@
+@echo off
+pscp NS-server-src.zip flayra@www.jarhedz.com:/home/flayra/build/
+
diff --git a/main/source/stlport/INSTALL b/main/source/stlport/INSTALL
new file mode 100644
index 00000000..f7169fb7
--- /dev/null
+++ b/main/source/stlport/INSTALL
@@ -0,0 +1,142 @@
+**********************************************************************
+* 	INSTALL file for STLport 4.6.0                               *
+*                                                                    *
+**********************************************************************
+
+STLport-4.6 is a full ANSI C++ Standard library.
+
+This distribution contains STLport sources only, no binaries.
+To use STLport iostreams, you have to build STLport library from sources in "src" 
+directory and link your programs with it.
+
+This is major change since pre-4.0 releases, please read the instructions carefully.
+
+==== Unpacking and installing STLport ==========
+
+1) Unpack STLport archive to a directory accessible during compilation.
+   NOTE : DO NOT overwrite header files coming with the compiler, even if you made
+   a backup - this won't work ! Most probably, you've already unpacked the archive before
+   reading this file though ;)
+
+2) Make sure "stlport" directory of this distribution comes before compiler's one 
+   in your search path when you compile the project;
+
+   Note: for SunPro CC 5.0 and higher, there used to be special directory "stlport/SC5"
+	 this is now obsolete, please make sure you do not use it anymore.
+
+3) Make sure you do not rename this "stlport" subdirectory -
+   that may result in compilation errors.
+
+   NOTE : Do NOT attempt to run "configure" ! It is deprecated, moved to safe standalone folder
+          and should be used as a helper to create initial config for a new compiler only. 
+          Your compiler should be recognized by STLport source code with no configuring.
+	  Please edit appropriate configuration header for your compiler
+          directly if you have to make compiler-specific configuration changes.
+
+
+4)  Go to "src" subdirectory. It contains various makefiles for different 
+    compilers.  If you are not able to find makefile for your particular 
+    compiler, please use one that looks most similar to your make engine to 
+    create your own.
+
+    Verify you can do command line compiles. IDE users may have to do something 
+    special, like add environment variables (for Microsoft) or install 
+    additional compiler components (for Metrowerks), before they can use their 
+    command line compilers.
+
+   IMPORTANT :
+
+   If you DO NOT plan to use STLport iostreams implementation, you do not have to build the library.
+   Please do this instead  : 
+
+   4-1) Using appropriate makefile, do "make -f <your compiler name>.mak prepare".
+   	Please do not skip this! On some platforms, it creates necessary symbolic links.
+        If you do build STLport iostream, this step is performed automatically when you do "make all".
+
+   4-2) uncomment _STLP_NO_OWN_IOSTREAMS setting in "stlport/stl_user_config.h" to disable use
+       of STLport iostreams and to use wrappers around your existing iostreams. 
+       After disabling STLport iostreams, you will use wrappers around  your compiler's iostreams 
+       libabry, as in previous STLport releases.
+       No binary library for STLport needs to be built in this case.
+       Note though :
+        - new-style ANSI iostreams may not be available on your system;
+        - compiler's iostreams are most likely slower than STLport version.
+
+ 
+  If you have decided to disable STLport iostreams, you may stop reading here.
+
+
+==== Building STLport iostreams library ==========
+
+Below are step-by-step instructions to build STLport streams library:
+
+5)  Using appropriate makefile, do "make clean all" to build the STLport libraries
+    (makefiles are set up to build several different flavors - debug/nondebug,
+    static/dynamic versions).
+    Optionally, do "make install" to copy STLport headers and libraries to shared location.
+
+    Note : your "make" program may have different name, like "nmake" for Visual C++.
+
+    Examples : 
+     1. If you are building STLport for just one compiler, you may do something like that
+        (DOS syntax for Visual C++ below):
+        copy vc6.mak makefile
+        nmake clean all
+        nmake install
+
+     2. If you plan to build STLport with multiple compilers, use "make -f" :
+	make -f gcc.mak clean install
+	make -f sunpro.mak clean install
+
+        This will build and install STLport for gcc & SUN CC.
+
+        "install" target works on most platforms.
+
+         On Win32, it does the following :
+          - copies STLport headers in "stlport" subdirectory of your compiler's INCLUDE directory;
+          - copies STLport .lib files in your compiler's LIB directory;
+          - copies STLport DLLs to Windows system directory so they can be found at runtime.
+
+	 On UNIX, it does the following :
+          - copies STLport headers in "stlport" subdirectory of system's local include directory (default is /usr/local/include);
+          - copies STLport .a and .so files to system local library directory (default is /usr/local/lib);
+
+6)  If build fails, you may choose to :
+     - try fixing the build ;
+     - wait until somebody else will submit corresponding changes to be incorporated in next STLport 
+       release/snapshot. To use STLport w/o its own iostreams, please do step 3a).
+
+    In case you do patch STLport, please submit your patches to support@stlport.com or (better)
+    to STLport Forum (http://www.stlport.com/cgi-bin/forum/dcboard.cgi)
+
+7) Do "make install" to install resulting libraries into "./lib" subdirectory.
+ 
+==== Linking your application with STLport library ==========
+
+8) Supply the "lib" subdirectory to the library search path and add desired 
+   library to the list of libraries to link with.
+   Examples (imagine you have mytest.cpp in the same directory as this file is):
+	With gcc     : gcc -I./stlport mytest.cpp -L./lib/ -lstlport_gcc
+	With DEC CC  : cxx -I./stlport mytest.cpp -L./lib/ -lstlport_deccxx
+	With SUN CC  : CC -I./stlport mytest.cpp -L./lib/ -lstlport_sunpro
+	.....
+   [ Visual C++ specific ] For VC++, you do not have to specify "stlport-msvc-XXX.lib" explicitly,
+   as it is being choosen and forced to link automatically by "#pragma"'s in stlport/config/stl_select_lib.h.
+   Appropriate version is being selected based on /MD[d] vs /MT[d] options and __STL_DEBUG setting.
+   All you have to do is to set library search path for the linker.
+	Example :
+           cl.exe /I.\stlport mytest.cpp /link /libpath:.\lib /MD
+
+9) If you linked your application with shared STLport library (.so or .dll), please make your .so or
+   .dll's to be found in PATH at runtime. On Windows, the simplest way to do it
+   is to copy all .dll's to Windows system directory. Or, you might choose to add directory
+   containing STLport to the PATH environment string. 
+
+10) Have fun !
+
+10/31/03, Boris Fomitchev.
+
+
+
+
+
diff --git a/main/source/stlport/README b/main/source/stlport/README
new file mode 100644
index 00000000..20ce56ea
--- /dev/null
+++ b/main/source/stlport/README
@@ -0,0 +1,53 @@
+**********************************************************************
+* 	README file for STLport 4.6                                  *
+*                                                                    *
+**********************************************************************
+
+This directory contains STLport-4.6 release.
+
+What's inside :
+
+README      - this file
+INSTALL     - installation instructions
+
+stlport     - main STLport include directory
+src         - source and makefiles for iostreams implementation
+lib         - installation directory for STLport library (if you use STLport iostreams only)
+test/regression   - regression test, using wrapper iostreams
+test/eh     - exception handling test using STLport iostreams
+etc         - miscellanous files (ChangeLog, TODO, scripts, etc.) 
+
+GETTING STLPORT
+
+To download the latest version of STLport, please be sure to visit
+http://www.stlport.com/download.html
+
+LEGALESE
+
+This software is being distributed under the following terms :
+
+ *
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996-1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999, 2000, 2001, 2002
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+
+**********************************************************************
diff --git a/main/source/stlport/doc/README.BC.html b/main/source/stlport/doc/README.BC.html
new file mode 100644
index 00000000..4df05f26
--- /dev/null
+++ b/main/source/stlport/doc/README.BC.html
@@ -0,0 +1,40 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: STLport - Note For Borland C++ Users</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">Note For Borland C++ / C++ Builder Users</span>
+        <p>&nbsp;</p>
+        <h2>Known problems</h2>
+        <h4>Compiling</h4>
+        <ul>
+          <li>This release is known to have problems with BC 5.0x.
+            Directory <b>STLport/BC50/</b> contains some extra files Borland C++ 5.x
+            expects to see on the path. Make sure you put <b>STLport/BC50 </b>in<br>
+            your search path before  <b>STLport </b>main directory. The problems still persist
+            with &lt;string&gt;, so BC50 is configured to use native one. You may face other problems with
+            5.0. Please direct your bug reports and workarounds to the Forum.</li>
+	  <li>This release should work out-of-the box for Borland C++ Builder 4. Builder 3 may require
+              some configuration adjustments to enable features added in BCB 3. You may also utilize &lt;iostream.h&gt;
+            wrapper in stlport/BCB directory to compile programs using old-style header.</li>
+          <li>With 5.0, you may also encounter problems with too long symbols when compiling
+            with debug information. To handle this, try defining <b><tt>_STLP_USE_ABBREVS</tt></b>
+            in <tt>stlcomp.h</tt>.</li>
+          <li>If your program is multi-threaded, be sure to define macro <b><tt>_REENTRANT
+            </tt></b>for proper synchronization (if you are <i>using SGI node
+            allocator. If you are using new_alloc or malloc_alloc, you won't
+            need that)</i>.</li>
+          <li>You may encounter problems using new-style BC++ 5.0 <b><tt>&lt;iostream&gt;
+            </tt></b>in mix with SGI STL <b><tt>&lt;string&gt;, &lt;stdexcept&gt;
+            </tt></b>without defining <b>_STLP_USE_OWN_NAMESPACE.</b></li>
+        </ul>
+        <hr>
+        <h2>Migration notes</h2>
+        You should experience no other problems migrating from BC++ STL to SGI
+        STL. <br>
+        Default <b><tt>allocator&lt;T&gt;</tt></b> in this adaptation should be
+        fully functional.
+        <p>&nbsp;</p>
+        <hr>
+        <h4>Versions prior to 4.52</h4>
+        Borland C++ versions older than 4.52 have not been tested. Probably it
+        would work with 4.50-4.51.
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/README.CW.html b/main/source/stlport/doc/README.CW.html
new file mode 100644
index 00000000..89ed0cb7
--- /dev/null
+++ b/main/source/stlport/doc/README.CW.html
@@ -0,0 +1,28 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Note For Metrowerks CodeWarrior Users</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">Note For Metrowerks CodeWarrior Users</span>
+        <hr>
+        <h2>Known problems</h2>
+        <h4>Compiling</h4>
+        <ul>
+          <li>You may have to edit relative/full path to CodeWarrior native
+            headers .</li>
+          <li>To avoid editing the headers mentioned above, Metrowerks users
+            should put the "STLport" directory in the "Metrowerks
+            Standard Library" directory, and add the "STLport"
+            directory as the first item in the system search paths of the
+            projects that wish to use it.</li>
+          <li>If you want your code to be portable, you should avoid explicit
+            usage of <tt>reverse_iterator&lt;Iterator,T,T&amp;,T*,Distance&gt;</tt>.</li>
+          <li>It's better to use coherent set of headers in the project: <b>all
+            new-style</b>, including STL ones;</li>
+          <li><b>IMPORTANT</b> : You should either have _STLP_USE_OWN_NAMESPACE
+            defined, or you should recompile CodeWarrior runtime libraries after
+            you installed STLport.</li>
+          <li>For earlier versions, you have to copy <tt>&lt;functional&gt;</tt>
+            to <tt>&lt;functional.h&gt;</tt>. <tt>&lt;functional.h&gt;</tt> is
+            not provided in distribution since it clobbers <tt>&lt;function.h&gt;</tt>
+            on 8.3 systems</li>
+        </ul>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/README.DEC.html b/main/source/stlport/doc/README.DEC.html
new file mode 100644
index 00000000..bbe8a874
--- /dev/null
+++ b/main/source/stlport/doc/README.DEC.html
@@ -0,0 +1,37 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Notes for DEC CXX Users</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">Note for DEC CXX users</span>
+        <hr>
+        <h2>Known problems</h2>
+        <h4>Compiling</h4>
+        DEC CXX require explicit template notation such as <tt>template_class&lt;Param&gt;</tt>
+        where most others (conformant) accept just <tt>template_class</tt>
+        (inside template method bodies, etc):
+        <p><tt>template &lt;class Param&gt; class template_class {</tt> <br>
+        <tt>template_class foo() ; // error for DEC</tt> <br>
+        <tt>template_class&lt;Param&gt; foo() // OK</tt> <br>
+        <tt>.....</tt> <br>
+        <tt>}</tt></p>
+        <p>That is being worked around in this adaptation, but may cause
+        problems when porting template code from other platforms. Use the same
+        name of formal parameter : <tt>Param </tt>in all method's outside
+        definitions.</p>
+        <h4>Linking</h4>
+        Repository handling of this compiler is imperfect, so you may experience
+        various problems on link stage. Linker problems problems are generally
+        of two kinds : unresolved symbols and duplicate symbols. The latter
+        problem was never reported to occur with DEC CXX. The problem with
+        undefined symbols is also may require manual intervention. General rule
+        is : if you get "unresolved symbol" errors, explicit
+        instantiation will most likely help, for example:
+        <p><tt>Unresolved:</tt> <br>
+        <tt>__default_alloc_template&lt;0, 0&gt;::allocate(unsigned long)</tt> <br>
+        <tt>__default_alloc_template&lt;0, 0&gt;::deallocate(void*, unsigned
+        long) &gt;</tt></p>
+        <p>To work around this problem, just instantiate <tt>__alloc&lt;0,0&gt;</tt>
+        explicitly in some module:</p>
+        <p><tt>template class __default_alloc_template&lt;0,0&gt;;</tt></p>
+        <p>Another way to solve this problem may be use of <tt>-pts </tt>compiler
+        option, but I'm not sure it works in all cases.</p>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/README.MPW.html b/main/source/stlport/doc/README.MPW.html
new file mode 100644
index 00000000..bc8295c4
--- /dev/null
+++ b/main/source/stlport/doc/README.MPW.html
@@ -0,0 +1,35 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Note for Apple MPW users</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+<span class="heading">Note for Apple MPW users</span>
+
+<p align="right">
+03/22/2001<br>
+Tsutomu Yoshida<br>
+Minokamo, Japan
+</p>
+
+<h2>Installation</h2>
+For the installation of STLport package, please follow the instruction contained in <b>"ReadMe.MPW"</b> located in <b>"test:regression:"</b> folder. 
+The MPW shell scripts embedded in this document will set up the shell variable <b>"{STL}"</b> which points to the main STLport package folder "stlport:". 
+A small MPW shell script named <b>"!STL_Folder_SetUp"</b> will be placed in "{MPW}StartUp Items:" so that this "{STL}" will be automatically reestablished 
+at the subsequent MPW startups.
+The script also set up <b>an alias to MPW's "{CIncludes}"</b> at the same level as "stlport:" which is used to look up the native C headers refered from STLport.
+
+<p>The installation script will build and install stlport library binary which contains iostreams code and other commonly used class binaries.
+The library binaries are stored in <b>"{STL}:lib:"</b> folder with the names:<br>
+<ul>
+<li><b>"STLportLib.68K.DBG.o"</b> :  68K (SCpp) with debugging code</li>
+<li><b>"STLportLib.68K.o"</b> :  68K (SCpp) without debugging code</li>
+<li><b>"STLportLib.PPC.DBG.o"</b> :  PPC (MrCpp) with debugging code</li>
+<li><b>"STLportLib.PPC.o"</b> :  PPC (MrCpp) without debugging code</li>
+</ul>
+<br>
+For the sample setup of makefile utilizing STLport and accompanying library binary, please refer to:<br>
+<ul>
+<li>"{STL}:src:MrCpp.mak" </li>
+<li>"{STL}:test:regression:MrCpp.mak"</li>
+<li>"{STL}:src:SCpp.mak"</li>
+<li>"{STL}:test:regression:SCpp.mak"</li>
+</ul>
+</p>
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/README.VC++.html b/main/source/stlport/doc/README.VC++.html
new file mode 100644
index 00000000..ebcb993e
--- /dev/null
+++ b/main/source/stlport/doc/README.VC++.html
@@ -0,0 +1,75 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Note For Visual C++ Users</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">Note For Visual C++ Users</span>
+        <hr>
+        <h2>Known problems</h2>
+        <h4>Compiling</h4>
+        <ul>
+          <li>If your program is multi-threaded, make sure you defined macro <b><tt>_REENTRANT
+            </tt></b>to enable proper synchronization (if you are <i>using SGI
+            node allocator. If you are using new_alloc or malloc_alloc, you
+            won't need that)</i>.</li>
+          <li>You may encounter problems using&nbsp; <b><tt>&lt;iostream&gt; </tt></b>in
+            mix with SGI STL <b><tt>&lt;string&gt;, &lt;stdexcept&gt; </tt></b>without
+            defining <b>_STLP_USE_OWN_NAMESPACE.</b>&nbsp; Using&nbsp; <b>_STLP_USE_OWN_NAMESPACE&nbsp;
+            </b>is the most safe way to cooperate with new I/O<br>
+            library and is definitely recommended unless you recompile the whole
+            C++ std library with STLport installed.</li>
+          <li><b><tt>_STLP_USE_EXCEPTIONS</tt></b> is being defined
+            automatically if the compiler defined <b><tt>_CPPUNWIND</tt></b>
+            macro ("<b><tt>/GX</tt></b>" option). So you should not
+            worry about it.</li>
+          <li>There were reports that Visual C++ 4.0 have problems with
+            namespaces in certain cases. Due to that, <b><tt>_STLP_NO_NAMESPACES</tt></b>&nbsp;
+            defined for it in <b>&lt;stlcomp.h&gt;</b>.</li>
+          <li>You may encounter problems with too long symbols when compiling
+            with debug information. To handle this, try defining <b><tt>_STLP_USE_ABBREVS</tt></b>
+            in <tt>stlcomp.h</tt>.</li>
+          <li>You may experience problems with default SGI node allocator. I had
+            no such problems, though. Default node allocator is quite fast, so I
+            wouldn't recommend disabling it without serious reason. However, if
+            it causes problems, define <b><tt>_STLP_USE_MALLOC</tt></b> or <b><tt>_STLP_USE_NEWALLOC</tt></b>
+            to get bare malloc()-based or new()-based default allocator.</li>
+          <li>If your program is multi-threaded, make sure you defined macro <b><tt>_REENTRANT
+            </tt></b>to enable proper synchronization.</li>
+          <li><b>[ VC++ 4.2 and higher] </b>This version allows use of new-style
+            <b>&lt;iostream&gt;, &lt;string&gt;</b> with STLport , as well as
+            the old-style &lt;iostream.h&gt; . The default is new &lt;iostream&gt;
+            usage.</li>
+          <br>
+          If you want to use old-style <b>&lt;iostream.h&gt;</b> in your
+          project:
+          <ul>
+            <li>define macro <b>_STLP_NO_NEW_IOSTREAMS</b> in <b>&lt;stl_user_config.h&gt;</b>
+              or at the command line.</li>
+          </ul>
+          If you are going to use new-style <b>&lt;iostream&gt;</b> without
+          defining _STLP_USE_OWN_NAMESPACE:
+          <ul>
+            <li>You may have to edit relative (or set full) path to VC++&nbsp;
+              native headers<b><tt> </tt></b>in &lt;stl_user_config.h&gt;. Using
+              native versions is necessary to avoid clashes with compiled code
+              in C++ runtime library.</li>
+            <li>In the whole project, use coherent set of headers : <b>all
+              new-style.</b></li>
+            <br>
+            <b>&nbsp;</b>
+          </ul>
+          <li>You may also try <a href="http://www.sirius.com/~ouchida">SGI STL
+            adapted for MSVC++ 5.0 only,</a> by Wayne Ouchida. (Note : looks
+            like it's out of date and&nbsp; discontinued. It doesn't provide
+            debug support and other extensions of this adaptation).</li>
+        </ul>
+        <hr>
+        <h2>Migration notes</h2>
+        You should experience no other problems migrating from VC++ STL to SGI
+        STL. Default <b><tt>allocator&lt;T&gt;</tt></b> in this adaptation is
+        fully functional.
+        <p>&nbsp;</p>
+        <hr>
+        <h4>Versions prior to 4.0</h4>
+        Visual C++ older than 4.0 won't compile STL. You have to upgrade.
+        <p>&nbsp;</p>
+        <hr>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/README.aCC.html b/main/source/stlport/doc/README.aCC.html
new file mode 100644
index 00000000..dab1201b
--- /dev/null
+++ b/main/source/stlport/doc/README.aCC.html
@@ -0,0 +1,22 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Note for HP ANSI C++ Compiler users</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">Note for HP ANSI C++ Compiler users</span>
+        <p>&nbsp;</p>
+        <hr>
+        <h2>Known problems</h2>
+        <h4>Configuring</h4>
+        <tt>stlcomp.h</tt> provides recognition section usable with <tt>aCC 1.06</tt>.
+        You should be able to use unconfigured STL distribution with it. If you
+        are using more recent version, you might want to enable more features
+        (see comments in <tt>stlcomp.h</tt>). Basically, <tt>"configure"</tt>
+        script was reported to work with aCC. However, your aCC version might
+        contain bugs (not showing in simple example) that could prevent your
+        code from compiling. In this case, refer to <tt>stlcomp.h</tt> to figure
+        out more reliable set of configuration switches.
+        <h4>Compiling</h4>
+        aCC enforces stricter name lookup checking than many other compilers.&nbsp;
+        Also it uses initial template name lookup scheme different from many
+        compilers. This scheme prevents any use of inherited typenames without
+        explicit "using" directive, etc.
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/README.gcc.html b/main/source/stlport/doc/README.gcc.html
new file mode 100644
index 00000000..f0b7cee9
--- /dev/null
+++ b/main/source/stlport/doc/README.gcc.html
@@ -0,0 +1,91 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Note for GCC users</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">Note for GCC users</span>
+        <hr>
+        <h3>GCC versions</h3>
+        STLport works with the following GCC flavours:
+	<p>gcc-3.0 Note : "wrapper mode" w/o STLport iostreams doesn't work with 3.0, as gcc 3.0 implements Koenig lookup properly, which leads to ambiguity errors when trying to wrap new-style gcc iostreams into STLport namespace.</p>
+	<p>gcc-2.95.x  Note: on some platforms (HP, AIX) gcc-2.95 does not implement automatic instantiation of static template data members. Please refer to gcc-2.7 section below for workaround. </p>
+        <p><a href="http://www.cygnus.com/egcs">Cygnus "egcs":</a>
+        Based on gcc-2.8 development tree, it provides <b>better </b>template
+        support than in FSF gcc-2.8.1, and many modern commercial compilers. It
+        features full-blown default template parameters, namespaces, partial
+        template specialization and member template methods. EGCS also offers
+        greatly improved EH support.&nbsp; STLport works with egcs just fine.
+        Though it comes with SGI STL, <br>
+        you may still want to use STLport because of debug mode.</p>
+        <p>gcc-2.8.1: About the same as egcs. <br>
+        <i>( Note : you may encounter problems compiling with 2.8.1 due to bugs
+        in partial template specialization. Just #define _STLP_PARTIAL_SPECIALIZATION_BUG
+        then ) </i>.</p>
+        <p>If you use egcs or 2.8.1 or higher, you may stop reading here.</p>
+        <p>&nbsp;</p>
+        <hr width="100%">
+        <h3>GCC 2.7.x :</h3>
+        Althought it does work with STLport, it has poor template support
+        compared to other modern compilers. <br>
+        If you do generic programming, it's definitely time to upgrade.
+        <h3>Workaround strategy</h3>
+        To address GCC inability to auto-instantiate static template data
+        members, the following workaround introduced:
+        <p>Instantiations of required static data members provided in
+        corresponing headers under <i>#ifdef </i><tt>__PUT_STATIC_DATA_MEMBERS_HERE</tt>
+        ( luckily, in this version of STL their amount doesn't depend on how
+        many different instantiations you have ). You should <tt>#define __PUT_STATIC_DATA_MEMBERS_HERE</tt><i>
+        </i>in <b>one</b> of your compilation unit ( or specify it in <i>CFLAGS </i>for
+        it ) <b>before </b>including any STL header. That should not affect
+        'good' compilers in any way.</p>
+        <p><b>Moreover,</b> <b>gcc on platforms that use ELF object file format
+        or GNU linker, will work without this hack</b>. gcc's <b><i>__attribute__((weak))__</i></b>
+        used instead as workaround. That makes gcc usable in portable way with
+        STL on many platforms ( Linux/Solaris/etc. ).</p>
+        <p>&nbsp;</p>
+        <hr>
+        <h2>Known problems</h2>
+        <h4>Compiling</h4>
+        See <a href="#Migration%20notes">Migration notes</a>.
+        <h4>Linking</h4>
+        When using <i>__attribute__((weak))__<b> </b></i>, you may run into
+        linker errors like : <b>'multiple definition of `global constructors
+        keyed to __malloc_alloc_template&lt;0&gt;::oom_handler'</b>. <br>
+        That indicates that you have defined some global objects in your source.
+        gcc then produce a bug treating weak symbol declared in header as real
+        global. <br>
+        The workaround is simple : just put some dummy global variable <b>before
+        </b>including STL headers. That worked for me. <br>
+        Another way is to <tt>#define _STLP_WEAK_ATTRIBUTE 0 </tt>in <b><i>stlconf.h</i></b>
+        and use <tt>__PUT_STATIC_DATA_MEMBERS_HERE</tt> scheme described above.
+        <p>On some non-ELF systems (<b>SunOS 4.x</b>) "configure" sets
+        <tt>_STLP_WEAK_ATTRIBUTE. </tt>Unfortunately, this won't work unless you
+        are using GNU linker. To justify this, <tt>#define _STLP_WEAK_ATTRIBUTE
+        0 </tt>in <b><i>stlconf.h</i></b> and use <tt>__PUT_STATIC_DATA_MEMBERS_HERE</tt>
+        scheme described above.</p>
+        <p>You may have troubles getting _linker_ errors compiling complex cases
+        without <i>-frepo</i>. If that problem occurs, try <i>-frepo</i> flag.
+        This flag is generally preferred unless you are compiling really short
+        examples. Be sure to supply -frepo switch on the link stage, too.</p>
+        <p>&nbsp;</p>
+        <hr>
+        <h2><a name="Migration%20notes"></a>Migration notes</h2>
+        You may have to define operators ==() and &lt;() on all classes you are
+        using with most containers, even if they are not really used. That is
+        the gcc bug. Another bug is that gcc won't find this operators defined
+        in base class, you have to redefine them. Don't define any of
+        !=(),&gt;(),&lt;=(),&gt;=;() operators for your classes - gcc have bugs
+        in resolution and report that as ambiguity with templates in <i>function.h.</i>
+        <p>If you use <tt>&lt;string&gt;</tt> from <tt>libg++</tt> the described
+        problem of the definition of <tt>!=, &gt;, &lt;=</tt> and <tt>&gt;=</tt>
+        occurs: something like: "<tt>ambiguous template instantiation in
+        sinst.h</tt>" The concrete solution is to disable the definitions
+        of those operators in <tt>g++-include/std/sinst.h (line 59):</tt></p>
+        <p><tt>__DOB (==)</tt> <br>
+        <tt>//__DOB (!=)</tt> <br>
+        <tt>__DOB (&gt;)</tt> <br>
+        <tt>//__DOB (&gt;)</tt> <br>
+        <tt>//__DOB (&lt;=)</tt> <br>
+        <tt>//__DOB (&lt;=)</tt> <br>
+        <tt>//__DOB (&gt;=)</tt></p>
+        <p>This would be a general fix due to gcc problems. The other possible
+        solution is to <tt>#include &lt;string&gt;</tt> after STL headers.</p>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/README.os390.html b/main/source/stlport/doc/README.os390.html
new file mode 100644
index 00000000..e47ecfd7
--- /dev/null
+++ b/main/source/stlport/doc/README.os390.html
@@ -0,0 +1,132 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Note for IBM OS/390 C/C++ Users</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">Note for IBM OS/390 C/C++ Users</span>
+        <p>&nbsp;</p>
+        <hr>
+        <br>
+        <b><i><font face="Arial,Helvetica,Geneva"><font size="+1">Known Problems</font></font></i></b>
+        <p><b>Compiling:</b></p>
+        <ol>
+          <li>OS/390 C/C++ requires explicit template notation such as
+            template_class&lt;Param&gt; where most other conformant compilers
+            only accept template_class (inside template method bodies, etc.):</li>
+          <p><br>
+          <br>
+          <font size="+0">&nbsp; template &lt;class Param&gt; class
+          template_class {<br>
+          <br>
+          &nbsp;&nbsp;&nbsp; template_class foo();&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          // error for OS390 C/C++<br>
+          <br>
+          &nbsp;&nbsp;&nbsp; template_class&lt;Param&gt; foo();&nbsp;&nbsp;&nbsp;&nbsp;
+          // OK<br>
+          <br>
+          &nbsp;&nbsp;&nbsp; ...<br>
+          <br>
+          &nbsp; };</font></p>
+          This adaptation works around the above OS/390 C/C++ requirement, but
+          may cause compatibility problems when porting template code from other
+          platforms.
+          <li>OS/390 C++, does not allow passing an extern "C"
+            function pointer as an argument to a C++ function. For example:</li>
+          <p><br>
+          <br>
+          <font size="+0">&nbsp; template &lt;class Result&gt;&nbsp;<br>
+          <br>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; pointer_to_void_function&lt;Result&gt;
+          ptr_gen(Result (*x)());<br>
+          <br>
+          &nbsp;&nbsp;<br>
+          <br>
+          &nbsp; p = ptr_gen(rand);&nbsp;&nbsp; // error for OS/390 C/C++</font></p>
+          In the above template, <i>ptr_gen</i> takes a function pointer as its
+          argument and returns a function pointer adaptor (a type of function
+          object), and <i>rand</i> is an extern "C" library pointer.
+          This is not allowed because C and C++ linkage is different on OS/390
+          C/C++.
+          <p>To work around this problem, provide a C++ wrapper around the
+          extern "C" function and pass the C++ wrapper instead:</p>
+          <p><br>
+          <br>
+          <font size="+0">&nbsp; int cxxrand(void) { return rand();}<br>
+          <br>
+          &nbsp; p = ptr_gen(cxxrand);&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          // OK</font></p>
+          <li>OS/390 C++ does not allow functions to be declared with a function
+            or an array as its return type:</li>
+          <p><br>
+          <br>
+          <font size="+0">&nbsp; template &lt;class InputIterator, class
+          OutputIterator,class result)<br>
+          <br>
+          &nbsp;&nbsp;&nbsp;&nbsp; OutputIterator
+          adjacent_difference(InputIterator first,&nbsp;<br>
+          <br>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; InputIterator
+          last,&nbsp;<br>
+          <br>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; OutputIterator
+          result);<br>
+          <br>
+          &nbsp;&nbsp;<br>
+          <br>
+          &nbsp; main() {<br>
+          <br>
+          &nbsp;&nbsp;&nbsp;&nbsp; int number[10];<br>
+          <br>
+          &nbsp;&nbsp;&nbsp;&nbsp; int different[5];<br>
+          <br>
+          &nbsp;&nbsp;&nbsp;&nbsp; adjacent_difference(number,<br>
+          <br>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; number
+          + 5,<br>
+          <br>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; different);&nbsp;&nbsp;
+          // error for OS/390 C/C++<br>
+          <br>
+          &nbsp; }</font></p>
+          In the above example, the compiler attempts to create an instantiation
+          that returns an array <i>int[]</i>, which is not allowed in OS/390
+          C/C++:
+          <p><br>
+          <br>
+          <font size="+0">&nbsp; int[] adjacent_difference(int*, int*,&nbsp; int*)</font></p>
+          To work around this problem, cast the <i>int</i> array to pointer to <i>int</i>:
+          <p><br>
+          <br>
+          <font size="+0">&nbsp; adjacent_difference(number,number + 5, (int *)
+          different);&nbsp;&nbsp; // OK</font></p>
+        </ol>
+        <b>Linking:</b>
+        <p>Repository handling in the compiler is imperfect, so you may
+        experience various problems during the link step. The problems are
+        generally of two kinds: duplicate symbols or unresolved symbols. The
+        duplicate symbol problem is not fatal, since the symbols are weak
+        (compiler generated) in that case. When it comes to large projects,
+        however, it may cause unacceptable code bloat (extra code generated by
+        the compiler when it separates the template instantiation files into the
+        TEMPINC directory). To overcome this problem, this adaptation simulates <i>separate
+        template implementation</i>. Compiling templates using the tempinc
+        compile option, minimizes code bloat as there are less duplicate
+        symbols. The problem with undefined symbols is also caused by imperfect
+        repository handling, but may require manual intervention. The general
+        rule is: <b>if you get <i>unresolved symbol</i> errors, explicit
+        instantiation will most likely help</b>. For example:</p>
+        <p><i>Unresolved:</i></p>
+        <p><br>
+        <br>
+        <font size="+0">&nbsp; __default_alloc_template&lt;0,0&gt;::allocate(unsigned
+        long)<br>
+        <br>
+        &nbsp; __default_alloc_template&lt;0,0&gt;::deallocate(void *, unsigned
+        long)</font></p>
+        To work around this problem, just instantiate __default_alloc_template&lt;0,0&gt;
+        explicitly in a module:
+        <p><br>
+        <br>
+        <font size="+0">&nbsp; template class __default_alloc_template&lt;0,0&gt;;</font></p>
+        <h2><font size="+0">Useful Links</font></h2>
+        <p><font size="+0">Check out :</font></p>
+        <p><a href="http://www.software.ibm.com/ad/c390/cmvsstlp.htm">http://www.software.ibm.com/ad/c390/cmvsstlp.htm</a></p>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/README.pow.html b/main/source/stlport/doc/README.pow.html
new file mode 100644
index 00000000..fab4c558
--- /dev/null
+++ b/main/source/stlport/doc/README.pow.html
@@ -0,0 +1,76 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Note for PowerSoft's Power++ Users</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">Note for PowerSoft's Power++ Users</span>
+
+        <hr>
+        <h2>Known problems</h2>
+        <p><tt>Subject: Re: SGI STL Adaptation Page updated (STLport 2.031
+        release) <br>
+        Date: Wed, 1 Oct 1997 16:30:48 -0400 <br>
+        From: Doni_Grande@ethyl.com (Doni Grande) </tt><br>
+        </p>
+        <p><tt>This version (2.031) seems to work with Powersoft's Power++ 2.0
+        compiler, which is based on the Watcom C/C++ 11.0 compiler. The STL
+        debug mode still won't compile, but everything else seems to work.
+        Power++ does some memory management in debug mode that needs to be
+        worked around, and there is a nuisance warning message that needs to be
+        suppressed. I generally load all the STL headers I use in a single
+        header file, and do the workarounds needed there. The STL.HPP file I use
+        is below. </tt></p>
+        <p><tt>// Power++ 2.0 include file <br>
+        // <br>
+        // stl.hpp -- Include all the files in the standard SGI STL distribution
+        <br>
+        // </tt></p>
+        <p><tt>#ifndef _STL_HPP_INCLUDED <br>
+        #define _STL_HPP_INCLUDED</tt></p>
+        <p><tt>// Define symbol to indicate SGI STL <br>
+        #ifndef __SGISTL <br>
+        #define __SGISTL <br>
+        #endif</tt></p>
+        <p><tt>// The following turns off warning 549: <br>
+        // 'sizeof' operand contains compiler generated information // This
+        warning remains disabled after loading this file.</tt></p>
+        <p><tt>#pragma warning 549 9;</tt></p>
+        <p><tt>/* Redefine the C++ "new" and "delete"
+        operators to not go through the component library's memory checker. */ <br>
+        #if defined( _DEBUG ) &amp;&amp; defined( new ) <br>
+        # undef new <br>
+        # undef delete <br>
+        # define _REDEFINE_WNEW <br>
+        #endif</tt></p>
+        <p><tt>// If can get STL debug working, use the following <br>
+        // #if defined( _DEBUG ) <br>
+        // # define _STLP_DEBUG 1 // #endif</tt></p>
+        <p><tt>// Get rid of Watcom's min and max macros <br>
+        #undef min <br>
+        #undef max</tt></p>
+        <p><tt>// Get configuration defines #include "stlcomp.h"</tt></p>
+        <p><tt>#include "algo.h" <br>
+        #include "bvector.h" <br>
+        #include "deque.h" <br>
+        #include "heap.h" <br>
+        #include "list.h" <br>
+        #include "map.h" <br>
+        #include "multimap.h" <br>
+        #include "multiset.h" <br>
+        #include "pair.h" <br>
+        #include "set.h" <br>
+        #include "stack.h" <br>
+        #include "tempbuf.h" <br>
+        #include "vector.h"</tt></p>
+        <p><tt>// SGI-specific additions <br>
+        #include "rope.h" <br>
+        #include "slist.h" <br>
+        #include "function.h" <br>
+        #include "hash_map.h" <br>
+        #include "hash_set.h"</tt></p>
+        <p><tt>#ifdef _REDEFINE_WNEW <br>
+        # include "wnew.hpp" <br>
+        # undef _REDEFINE_WNEW <br>
+        #endif</tt></p>
+        <p><tt>#endif</tt></p>
+        <p>&nbsp;</p>
+        <hr>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/README.sgi40.html b/main/source/stlport/doc/README.sgi40.html
new file mode 100644
index 00000000..a2a67854
--- /dev/null
+++ b/main/source/stlport/doc/README.sgi40.html
@@ -0,0 +1,15 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Note for SGI's CC v4 Compiler users</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">Note for SGI's CC v4 Compiler users</span>
+
+        <hr>
+        <h2>Known problems</h2>
+        <h4>Patches required</h4>
+        - You have to make sure that you have installed the C++_non_shared_libs
+        package (from the "C++ translator" CD).
+        <p>- You must then install CC patch 1599 (you may also installed patches
+        1260,1600, and 1628 though they should not be necessary).</p>
+        <p>&nbsp;</p>
+        <hr>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/README.sunpro.html b/main/source/stlport/doc/README.sunpro.html
new file mode 100644
index 00000000..d9eaeba3
--- /dev/null
+++ b/main/source/stlport/doc/README.sunpro.html
@@ -0,0 +1,191 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Notes for SUNPro C++ Users</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">Notes for SUNPro C++ Users</span>
+        <p>&nbsp;</p>
+	<h2>Common Notes</h2>
+	For all SUN compilers, STLport nables separate compilation with 
+        non-inline template members defined in .c file. That is supposed to
+        help with code bloat, but does not make a big difference for SUN compilers.
+        So, if having any problems with this mode, just turn off _STLP_LINK_TIME_INSTANTIATION switch.
+	Installation: please note that even if you do not use STLport iostreams, you still have to go to "src" subdirectory and do "make" or at least "make prepare" to produce additional .SUNWCCh files necessary for compilation)
+
+        <h2>Notes for SUNPro C++ users</h2>
+        <h2>Known problems</h2>
+        <h4>Compiling</h4>
+        <h2>Known problems</h2>
+        <h4>Bugs (Note for SUNPro C++ 4.2 or before)</h4>
+	<br><b>Note: proposed workaround is implemented for this bug for all relevant STLport code. 
+        However, please be aware of this bug because it might affect your own code.</b>
+        <br>Perry R. Ross 3/12/99<br>
+        pross@platinum.com<br>
+        <p>
+        The SunPro 4.2 compiler has a serious problem handling string literals<br>
+        passed as arguments to inline functions. Each time the dummy argument
+        representing the string literal appears in the function, it receives a
+        new address, just as if you'd typed the literal at that spot in the
+        function. Normally this is harmless except for wasting a bit of<br>
+        memory, but if the function attempts to do any pointer arithmetic, it
+        fails horribly. Here is a small program that duplicates the problem:<br>
+        <br>
+        #include &lt;iostream.h&gt;<br>
+        <br>
+        inline void func(char *s) {<br>
+        // Each of these will print a different address for s<br>
+        // if the arg was a string literal.<br>
+        cout &lt;&lt; "address of " &lt;&lt; s &lt;&lt; " is
+        " &lt;&lt; (int) s &lt;&lt; endl;<br>
+        cout &lt;&lt; "address of " &lt;&lt; s &lt;&lt; " is
+        " &lt;&lt; (int) s &lt;&lt; endl;<br>
+        cout &lt;&lt; "address of " &lt;&lt; s &lt;&lt; " is
+        " &lt;&lt; (int) s &lt;&lt; endl;<br>
+        <br>
+        // This will print a negative number if the arg is a literal.<br>
+        cout &lt;&lt; "the difference between (s+1) and s is "
+        &lt;&lt; ( (s+1) - s) &lt;&lt; endl;<br>
+        }</p>
+        <p>int<br>
+        main(int argc, char *argv[]) {<br>
+        func("hello");<br>
+        char *bye = "goodbye";<br>
+        func(bye);<br>
+        return 0;<br>
+        }<br>
+        <br>
+        Here is a demo program that shows how this impacts STL:<br>
+        <br>
+        #include &lt;iostream.h&gt;<br>
+        #include &lt;string&gt;<br>
+        <br>
+        string str("hello");<br>
+        <br>
+        int main(int argc, char *argv[]) {<br>
+        cout &lt;&lt; str &lt;&lt; endl;<br>
+        return 0;<br>
+        }<br>
+        <br>
+        This will print "hellohello" on a broken compiler version.<br>
+        <br>
+        The fix for this is to add this line to the beginning of func():<br>
+        <br>
+        s = s;<br>
+        <br>
+        This somehow makes the compiler stop creating new copies of the string,<br>
+        and if you compile with -O, it seems to completely optimize away,<br>
+        so there is no runtime penalty. There is a substantial ugliness<br>
+        penalty, though, as this line has to be in every inline function that <br>
+        can be called with a string constant.<br>
+        The fix could be done with the preprocessor macro
+        __SUN_INLINE_STRING_LITERAL_BUG, which should be empty on all platforms
+        but SUNPRO version 4.2 or before (/<b>fbp</b>/this change is not in 3.12
+        yet, as I still hope to find less ugly solution, maybe with compiler
+        flags /<b>fbp</b>/):</p>
+        <ul>
+          <li><b>#define __SUN_INLINE_STRING_LITERAL_BUG(x) x=x;</b>&nbsp; (for
+            Sun CC)</li>
+          <li><b>#define __SUN_INLINE_STRING_LITERAL_BUG(x) ( </b>for other
+            compilers)</li>
+        </ul>
+        <p>.<br>
+        You should be careful passing string literals with SunPro CC (frankly -
+        NEVER do that), as the above bug appear in any inline function (not only
+        template ones).</p>
+        <h4>Compiling</h4>
+        <ul>
+          <li>If your program is multi-threaded, make sure you defined macro <b><tt>_REENTRANT
+            </tt></b>to enable proper synchronization .&nbsp; That will enable
+            use of Solaris threads synchronization support. If you are usizg
+            Pthreads in your program, define <b>_PTHREADS</b> for STLport.</li>
+          <li>If your project has multiple directories structure, it is better
+            to use <b>-ptr</b> option to keep all template databese in one
+            place.</li>
+        </ul>
+        <hr>
+        <h2>Note for SUNPro C++ 4.1 users</h2>
+        <h2>Known problems</h2>
+        <h4>Compiling</h4>
+        C++ 4.1 have problems recognizing types nested in template classes when
+        parsing declarations. For example , the following construct fails
+        (suppose STL vector is a base type for derived_vector ):
+        <p><tt>derived_vector&lt;int&gt; years;</tt> <br>
+        <tt>derived_vector&lt;int&gt;::iterator i;</tt></p>
+        <p>To work around this problem completely, you should repeat those
+        typedefs from base class that you are going to use in any way:</p>
+        <p><tt>template &lt;class T&gt; class derived_vector : public
+        vector&lt;T&gt; {</tt> <br>
+        <tt>typedef vector&lt;T&gt;::iterator iterator;</tt> <br>
+        <tt>...</tt></p>
+        <p>STL code itself is now free of this problem.</p>
+        <p>C++ 4.1 may also suffer from optimization bugs when using exception
+        handling. If your application doesn't use exceptions, you'd better use <tt>-noex</tt>
+        option along with <tt>_STLP_NO_EXCEPTIONS</tt> flag.</p>
+        <h4>Linking</h4>
+        You may have troubles getting linker errors compiling multiple targets
+        in one directory ( for example, running cygnus testsuite). That is a bug
+        in handling Templates.DB dependencies. Known solutions are :
+        <p>a) for one-file tests, specify option <b>-pto</b> <i>(one-file-mode)</i>
+        option to turn off database completely. Option <b>-pts</b><i>(single-file-mode)</i>
+        doesn't fix all problems.</p>
+        <p>b) for complex projects, use separate Templates.DB directories for
+        different targets.</p>
+        <p>&nbsp;</p>
+        <hr width="100%">
+        <h2>Notes for SUNPro C++ 4.0.1 users</h2>
+        <h2>Known problems</h2>
+        <h4>Version problems</h4>
+        If your CC 4.0.1 cannot compile <a href="testsuite.html">testsuite</a>,
+        most likely you are using out-of date version. You should download
+        patches for 4.0.1 (SparcCompilers WorkShop 3.0.1) from SunPro site :
+        <p><b>Solaris 2.x :</b></p>
+        <p><a href="http://www.sun.com/workshop/tnb/sparc2x/patch.html">http://www.sun.com/workshop/tnb/sparc2x/patch.html</a>
+        (SPARC/Solaris 2.x) . You should look for patches 101242-12 &amp;
+        101242-14 ( 101242-12 is required to work with 101242-12).</p>
+        <p><b>Sunos 4.1.x:</b></p>
+        <p><a href="http://www.sun.com/smcc/solaris-migration/cmc.products.970709/XCM/101914-14.tar.Z">http://www.sun.com/smcc/solaris-migration/cmc.products.970709/XCM/101914-14.tar.Z</a><a href="http://www.sun.com/workshop/tnb/sparc1x/patch.html">
+        (SPARC/SunOS 4.1.x)</a></p>
+        <p><a href="http://www.sun.com/workshop/tnb/sparc1x/patch.html">http://www.sun.com/workshop/tnb/sparc1x/patch.html</a>
+        (SPARC/SunOS 4.1.x). Look for 101914-20.</p>
+        <h4>Compiling</h4>
+        C++ 4.0.1 have problems recognizing types nested in template classes
+        when parsing declarations. For example , the following construct fails
+        (suppose STL vector is a base type for derived_vector ):
+        <p><tt><font size="-1">derived_vector&lt;int&gt; years;</font></tt> <br>
+        <tt><font size="-1">derived_vector&lt;int&gt;::iterator i;</font></tt></p>
+        <p>To work around this problem completely, you should repeat those
+        typedefs from base class that you are going to use in any way:</p>
+        <p><tt><font size="-1">template &lt;class T&gt; class derived_vector :
+        public vector&lt;T&gt; {</font></tt> <br>
+        <tt><font size="-1">typedef vector&lt;T&gt;::iterator iterator;</font></tt>
+        <br>
+        <tt><font size="-1">...</font></tt></p>
+        <p>More severe problems arise when given template argument's typedefs
+        are used as template arguments for base class. The example is function
+        adaptors from <b>function.h</b> . Refer to workarounds for binders &amp;
+        composers to see how it can be hanled ( proposed by "Martin
+        Abernethy" &lt;gma@paston.co.uk&gt; ).</p>
+        <p>C++ 4.01 may also suffer from optimization bugs when using exception
+        handling. If your application doesn't use exceptions, you'd better use <tt>-noex</tt>
+        option along with <tt>_STLP_NO_EXCEPTIONS</tt> flag.</p>
+        <h4>Linking</h4>
+        You may still have to use explicit instantiations and/or specific
+        template database controls for complex cases to avoid "<i>unresolved
+        symbol</i>" linker errors.
+        <p>You may have troubles getting linker errors compiling multiple
+        targets in one directory ( for example, running cygnus testsuite). That
+        is a bug in handling Templates.DB dependencies. Known solutions are :</p>
+        <p>a) for one-file tests, specify option <b>-pto</b> <i>(one-file-mode)</i>
+        option to turn off database completely. Option <b>-pts</b><i>(single-file-mode)</i>
+        doesn't fix all problems.</p>
+        <p>b) for complex projects, use separate Templates.DB directories for
+        different targets.</p>
+        <p>&nbsp;</p>
+        <hr>
+        <h2>Migration notes</h2>
+        You should experience no other problems migrating from HP STL to SGI
+        STL.
+        <p>&nbsp;</p>
+        <hr>
+        <h4>Versions prior to 4.1</h4>
+        For info on SUNPro C++ 4.0.1, see README.sunpro401. SUNPro C++ older
+        than 4.0.1 won't compile STL. You have to upgrade.
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/README.xlC.html b/main/source/stlport/doc/README.xlC.html
new file mode 100644
index 00000000..f1624658
--- /dev/null
+++ b/main/source/stlport/doc/README.xlC.html
@@ -0,0 +1,41 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Note for xlC &amp; Visual Age C++ users</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">Note for xlC &amp; Visual Age C++ users</span>
+        <hr>
+        <h2>Known problems</h2>
+        <h4>Compiling</h4>
+        xlC &amp; VAC++ require explicit template notation such as <tt>template_class&lt;Param&gt;</tt>
+        where most others (conformant) accept just <tt>template_class</tt>
+        (inside template method bodies, etc):
+        <p><tt>template &lt;class Param&gt; class template_class {</tt> <br>
+        <tt>template_class foo() ; // error for xlC</tt> <br>
+        <tt>template_class&lt;Param&gt; foo() // OK</tt> <br>
+        <tt>.....</tt> <br>
+        <tt>}</tt></p>
+        <p>That is being worked around in this adaptation, but may cause
+        problems when porting template code from other platforms.</p>
+        <h4>Linking</h4>
+        Repository handling in this compilers is imperfect, so you may
+        experience various problems on link stage. The problems are generally of
+        two kinds : unresolved symbols and duplicate symbols. The latter problem
+        is not fatal, since the symbols are weak in that case. It may cause
+        unacceptable code bloat when it comes to large projects, however. To
+        overcome this problem, for all IBM compilers, STLport 3.2 enables separate 
+        compilation with non-inline template members defined in .c file. <b>Note : you should enable corresponding
+        option in the compiler (/Ft+ or equivalent) to get use of this mode, as it is being enabled conditionally 
+        based on the presence of builin macro ___TEMPINC__.</b><br>When compiling templates splitted to *.h/*.c
+        scheme, these compilers produce better results (around 50% code size reduction, less duplicate symbols).
+        The problem with undefined symbols is also caused by imperfect
+        repository handling, but it may require manual intervention. General
+        rule is : if you get "unresolved symbol" errors, explicit
+        instantiation will most likely help, for example:
+        <p><tt>Unresolved:</tt> <br>
+        <tt>__default_alloc_template&lt;0, 0&gt;::allocate(unsigned long)</tt> <br>
+        <tt>__default_alloc_template&lt;0, 0&gt;::deallocate(void*, unsigned
+        long) &gt;</tt></p>
+        <p>To work around this problem, just instantiate <tt>__default_alloc_template&lt;0,0&gt;</tt>
+        explicitly in some module:</p>
+        <p><tt>template class __default_alloc_template&lt;0,0&gt;;</tt></p>
+        <p>&nbsp;</p>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/auto_configure.html b/main/source/stlport/doc/auto_configure.html
new file mode 100644
index 00000000..f4626094
--- /dev/null
+++ b/main/source/stlport/doc/auto_configure.html
@@ -0,0 +1,88 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Running configure</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">Running "configure"</span>
+
+        <font size="1"><em><strong>by Boris Fomitchev</strong></em></font>
+
+        <h3>Configuring STLport for new compiler with UNIX shell</h3>
+
+        <p><i>Note: this document describes the procedure ot tuning STLport for
+        new compiler, not the one that is already supported. If your compiler is listed
+        as supported, this is absolutely unnecessary.</i></p>
+        
+	<p>STLport comes with "configure" shell script to help in the
+	initial step to tune the library for a new compiler. 
+	It sets up stlconf.h configuration header
+        with proper flags depending on features of the compiler and user-defined
+        options. 
+	Recommended way to create new configuration is to run "configure"
+	in "config/new_compiler" directory and create <b>stl_yourcompiler.h</b> in "config"
+	directory based on switches defined by "configure" in stlconf.h.
+	<b>Do not</b> expect STLport to be configured just by running "configure".
+</p>
+
+        <p>Here is an example how to specify the parameters to "configure" (for Bourne-like
+        shells): <b><br>
+        host&gt; cd STLport/config<br>
+        host&gt; CXX=CC CXXFLAGS="-xwe -noex" ./configure --enable-malloc</b></p>
+        <p>This will set up workarounds necessary for "<b>CC</b>"
+        compiler as well as specify malloc-based allocator as the default one. <br>
+
+        
+	Run "<b>configure --help</b>" to see list of options
+        available. For most reliable results, you should specify <b>CXXFLAGS</b>
+        to contain the option turning warnings into errors.
+        "configure" tries to scan warnings, but that not always works.
+        After testing your compiler features and setting options specified,
+        "configure" creates <b>stlconf.h</b> file using <b>config/stlconf.h</b>
+        as input. Macro <b>__AUTO_CONFIGURED</b> indicates that the package has
+        been configured. If it is not set (before you run configure), <b>stlconf.h</b>
+        includes <b>stlcomp.h</b> header to set up conservative configuration
+        and recognize the compiler version. <b>config/stlconf.h</b> can be
+        safely copied to stlconf.h to restore unconfigured status-quo.</p>
+        
+	<h3>Configuring STLport on other platforms</h3>
+        
+	The above may also work on other systems with UNIX-like toolsets on&nbsp;
+        them.&nbsp; <br>
+        
+	For example, the <a href="http://www.cygnus.com">cygwin32</a>&nbsp;
+        suite for Windows 95/NT runs "configure" just fine.&nbsp;&nbsp;&nbsp;
+        <br>
+        
+	You can also change &lt;stlcomp.h&gt; for your system manually.<br>
+        Please consider contributing your changes back to the&nbsp; STLport
+        project!
+        
+	<h3>"configure" synopsys (Bourne shells):</h3>
+        
+	<p>&gt; [environment] <b>./configure</b> [user-defined options]</p>
+        
+	<h3>"configure" synopsys (C-shells):</h3>
+        <p>&gt; <b>env </b>[environment] <b>./configure</b> [user-defined
+        options]</p>
+        
+	<p><b>"configure" script runs series of tests to determine
+        detailed characteristics of your compiler.</b></p>
+        <p>In [environment] , you may specify the following parameters</p>
+        <p><b>CXX=&lt;compiler_name&gt;, </b>default is <b>c++</b></p>
+        <p><b>CXXFLAGS=&lt;<i>cxx compiler flags you will most likely use</i>&gt;
+        . <br>
+        </b>That may be needed to set up some features correctly. That is, if
+        you plan to use exception handling, and your compiler doesn't enable
+        them by default, specify the option enabling EH there. <br>
+        It is also helpful to specify an option turning warnings into errors
+        here to get most reliable configuration ( For example, warnings could be
+        like that : <i>"Warning: namespaces are mostly broken in this
+        release"</i>, and they're indeed broken. ).</p>
+
+        <p>In case you are not able to run configure, you might have to know
+        internal STLport macros describing compiler features/bugs
+	Please refer to the <a href="configure.html">Configuration Manual</a> for the values.
+</p>
+
+        <h3>Modifying the configuration engine</h3>
+        <p>Don't edit the "configure" script directly, use <b>config/configure.in</b>
+        source + <b>GNU autoconf</b> instead.</p>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/bug_report.html b/main/source/stlport/doc/bug_report.html
new file mode 100644
index 00000000..8bad6b2a
--- /dev/null
+++ b/main/source/stlport/doc/bug_report.html
@@ -0,0 +1,25 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Bug Reports</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">Bug Reports and Questions</span>
+        <p><font size="3"><br>
+        </font>Bug reports and questions are welcome. Please supply a source
+        code fragment and compiler/OS information along with bug reports.</p>
+        <p>Before sending a bug report, please check <a href="FAQ.html">FAQ</a>
+        and <a href="buglist.html">Known Bugs</a> to see if your bug has been
+        reported already. Refer also to <a href="compiler_readmes.html">READMEs</a>
+        to see if it's common problem with your compiler.</p>
+        <p>Please direct your bug reports and questions to <a href="http://www.stlport.com/cgi-bin/forum/dcboard.cgi">STLport
+       Forum</a> to get better feedback. Answers are being normally posted
+        there, too. Please keep in mind the support is done on a pure volunteer
+        basis.</p>
+        <p>If you make a port for your compiler and would like to make it
+        available to the public, <a href="mailto:consulting@stlport.com">contact us</a>
+        and we'll be happy to include it with this package, provided that your
+        modifications are freely distributable.</p>
+        <p>If you wish to be notified about STLport updates automatically : please
+        indicate it in download form. You may alter your mail list option
+        anytime via the same form.</p>
+        <p><a href="http://www.stlport.com/cgi-bin/forum/dcboard.cgi">Report your
+        bug</a></p>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/buglist.html b/main/source/stlport/doc/buglist.html
new file mode 100644
index 00000000..2870fc58
--- /dev/null
+++ b/main/source/stlport/doc/buglist.html
@@ -0,0 +1,18 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Current buglist</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">Known bugs</span>
+        <hr noshade="" color="#000080">
+	<p><b>Borland C++ 5.0</b><br>
+	This release is known to still have problems with BC 5.0x.
+        Directory <b>STLport/BC50/</b> contains some extra files Borland C++ 5.x
+        expects to see on the path. Make sure you put <b>STLport/BC50 </b>in<br>
+        your search path before  <b>STLport </b>main directory. The problems still persist
+        with &lt;string&gt;, so BC50 is configured to use native one. You may face other problems with
+        5.0. Please direct your bug reports and workarounds to the Forum.</p>
+
+        <p><b>Visual C++ 6.0 : <br>
+        </b>To fix internal compiler errors on large compilations, please refer to VC knowledge base to see what extra options may be supplied.</p>
+        <hr noshade="" color="#000080">
+        <p><a href="bug_report.html">Report a bug</a></p>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/compiler_readmes.html b/main/source/stlport/doc/compiler_readmes.html
new file mode 100644
index 00000000..fdc49983
--- /dev/null
+++ b/main/source/stlport/doc/compiler_readmes.html
@@ -0,0 +1,27 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: README Files for Particular Compilers</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+
+        <span class="heading">README Files for Particular Compilers</span>
+        <p>&nbsp;</p>
+        <p>Some compilers have bugs that require specific workarounds in your
+        source code. They compile STLport headers OK but crash on using certain
+        STL constructs in your code, or require specific tuning in some cases.
+        Refer to appropriate README file if running into problems:</p>
+        <dir>
+          <li><a href="README.gcc.html">GCC README&nbsp;</a></li>
+          <li><a href="README.sunpro.html">SunPro C++&nbsp; README</a></li>
+          <li><a href="README.VC++.html">Visual C++ README</a></li>
+          <li><a href="README.BC.html">Borland C++ 5.x README</a></li>
+          <li><a href="README.xlC.html">AIX xlC README</a></li>
+          <li><a href="README.xlC.html">IBM Visual Age C++ README</a></li>
+          <li><a href="README.DEC.html">DEC CXX README</a></li>
+          <li><a href="README.CW.html">Metrowerks CodeWarrior README</a></li>
+          <li><a href="README.aCC.html">HP ANSI C++ Compiler (aCC) README</a></li>
+          <li><a href="README.pow.html">PowerSoft's Power++ 2.0 README</a></li>
+          <li><a href="README.os390.html">IBM OS/390 C/C++ 1.x - 2.x&nbsp;
+            README&nbsp;</a></li>
+          <li><a href="README.sgi40.html">SGI MIPSpro C++ 4.0 README</a></li>
+          <li><a href="README.MPW.html">Apple MPW MrCpp and SCpp README</a></li>
+        </dir>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/configure.html b/main/source/stlport/doc/configure.html
new file mode 100644
index 00000000..4101ad01
--- /dev/null
+++ b/main/source/stlport/doc/configure.html
@@ -0,0 +1,793 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Configuration Manual</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">STLport Configuration Manual</span>
+<p>
+        <font size="1"><em><strong>by Boris Fomitchev</strong></em></font>
+</p>
+        <h3>Parameters</h3>
+        <p>There are two major categories of STLport configuration parameters:</p>
+        <ul>
+          <li>User-definable preferences</li>
+          <li>Parameters describing compiler bugs and misfeatures</li>
+        </ul>
+        <p>The former class lets you set some specific preferences. Switches
+        controlling these preferences are located in &lt;stl_use_config.h&gt;
+        header, which is self-documented. This manual provide some additional
+        info on them.</p>
+        <p>For the latter, STLport&nbsp; comes&nbsp; preconfigured for a wide
+        variety of compilers. <br>
+        See list for a complete list of compilers that STLport automatically
+        recognizes.<br>
+        If your compiler is not being recognized properly, this document will
+        help you to fix the problem.</p>
+        <p>&nbsp;</p>
+        <h3>User-defined preferences</h3>
+        <p>You may specify some user-defined preferences for STLport. There are
+        two ways to set the options up :</p>
+        <ol>
+          <li>Setting corresponding #define in &lt;stl_user_config.h&gt; . This
+            is the preferred method. You can also use different &lt;stl_user_config.h&gt;
+            headers for different projects.</li>
+          <li>Specifying corresponding flag on compiler command-line. Some
+            options also may be suppressed. For example, you may configure the
+            distribution to exploit exception handling with setting <b>_STLP_USE_EXCEPTIONS</b>
+            macro to 1, then turning exception handling off with <b>-D_STLP_NO_EXCEPTIONS</b>
+            command-line option for particular project</li>
+        </ol>
+        <p>Below is a stable set of of user-defined options with description. If
+        not indicated otherwise, default for these options is that they are
+        undefined.<br>
+        </p>
+        <table border="1" cellspacing="0" cellpadding="4">
+          <caption>
+            <h4>User-defined options for STLport</h4>
+          </caption>
+          <tr>
+            <td><b>Controlling Macro</b></td>
+            <td><b>Description</b></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_OWN_IOSTREAMS
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">This switch is used to select
+              one from two major STLport iostream modes. Please visit <a href="select_io.html">"Getting Started"</a> section for details.
+	       </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_NEW_IOSTREAMS
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Suppress using new-style
+              iostreams even if they are available. </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_IOSTREAMS
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">This switch is experimental and
+            is intended to be used in embedded environments. It makes STLport assume that
+            no iostreams are available at all. </font></td>
+          </tr>
+
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_CUSTOM_IO
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">This switch is experimental. Define this if you do not instantiate basic_xxx iostream classes  with custom types (which is most likely the case). "Custom" means types other than char, wchar and char_traits&lt;&gt;, like basic_ostream&lt;my_char_type, my_traits&lt;my_char_type&gt; &gt;. When this option is on, most non-inline template functions definitions for iostreams are not seen by the client. Default is off, just not to break compilation for those who do use those types. When on, it saves a lot of compile time for most compilers, also object and executable size for some. That also guarantees that you still use optimized standard i/o when you compile your program without optimization and link with optimized library. Option does not affect STLport library build; you may use the same binary library with and without this option, on per-project basis.</font></td>
+          </tr>
+
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_USE_DEBUG_LIB </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">(Windows compilers only)
+	    Normally, optimized STLport library is being automatically linked in even when you compile your project with _DEBUG set (Debug build). If you wish to use debug build of STLport library for your debug builds, define this option (you will also have to build STLport library with debug flags, via additional "make debug_static debug_dynamic"  command, as "make all" only builds "release" and "stldebug" versions of the libraries). 
+            </font></td>
+          </tr>
+
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_USE_STATIC_LIB, _STLP_USE_STATICX_LIB, _STLP_USE_DYNAMIC_LIB </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">(Windows compilers only)
+	    Normally, a version of STLport library iwhich corresponds to your RTL library setting is being automatically linked in (if you use dynamic RTL DLL, dynamic STLport DLL is being used, and vice versa).
+ If you wish to force use of particular (static, dynamic, or "staticx" which is static STLport lib built with dynamic RTL) STLport lib, please make use one of those options. 
+            </font></td>
+          </tr>
+
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_OWN_NAMESPACE
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Suppresses STLport use of
+              namespace <b>_STL</b>:: even if it is recommended, forces
+              STLport to use <b>std</b>::. Normally, STLport uses <b>_STL</b>::
+              namespace instead of <b>std</b>::, to prevent clashes with iostreams/string stuff that comes
+              with the compiler. </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_USE_OWN_NAMESPACE
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Forces STLport to use <b>_STL</b>::
+              namespace instead of <b>std</b>:: STLport sets this flag
+              automatically if _STLP_USE_NAMESPACES is set.</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_DONT_RENAME_STD
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Precludes STLport from redefining <b>std</b>::
+             to <b>_STL</b>::. Define it only if renaming scheme does not work for you for some reason.
+            </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_DEBUG </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Turns the <a href="debug_mode.html">Debug
+              Mode</a> on. That gets you checked iterators and ranges.
+              Thread-safe. </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_USE_SYSTEM_ASSERT
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">use the system-defined
+              assert instead of fprintf to stderr </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_DEBUG_MESSAGE </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Uncomment this to force
+              all failed assertions to be directed through a user-defined global
+              function: void __stl_debug_message(const char * format_str, ...).
+              This allows you to take control of assertions for debugging
+              purposes. Note : If you set this macro, you must supply <b>__stl_debug_message</b> function definition somewhere. </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_DEBUG_TERMINATE </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Uncomment this to force
+             all failed assertions to be executed through user-defined global function: void __stl_debug_terminate(void). This allows you to take control of assertion behaviour for debugging purposes. Default routine throws unique exception if _STLP_NO_DEBUG_EXCEPTIONS is not set, calls abort() otherwise. <br>Note : If you set this macro, you must supply __stl_debug_terminate  function definition somewhere.
+            </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_DEBUG_EXCEPTIONS </b></font></td>
+            <td><font face="Arial, Helvetica" size="2"> Comment this out to enable throwing unique exceptions from default __stl_debug_terminate() instead of calling abort(). </font></td>
+          </tr>
+
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_EXCEPTIONS </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Disables exception
+              handling code. </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_NAMESPACES </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Puts STLport into global
+              namespace, even if the compiler supports namespaces. </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_RELOPS_NAMESPACE
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">if defined, don't put the
+              relational operators in namespace <b>std::rel_ops</b>. </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_REENTRANT </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Define this if your
+              project is multithreaded. STLport uses MT-safe allocator support
+              then. </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_NOTHREADS </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">If defined, STLport don't
+              use any multithreading support. </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_NEW_C_HEADERS</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">If defined, STLport don't
+              use native new-style C headers even if they are available. </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_USE_RAW_SGI_ALLOCATORS
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Force STLport to use
+              older SGI-style allocators as default ones for containers, instead
+              of standard-conforming <b>allocator</b>&lt;&gt;. </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_USE_MALLOC </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">This makes <b>allocator</b>&lt;&gt;
+              to do plain <b>malloc()</b> calls instead of using SGI optimized
+              node allocator engine. </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_USE_NEWALLOC </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">This makes <b>allocator</b>&lt;&gt;
+              to do plain <b>new()</b> calls instead of using SGI optimized node
+              allocator engine. </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_DEBUG_ALLOC </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">This makes <b>allocator</b>&lt;&gt;
+              to perform memory debugging, such as padding/checking for memory
+              consistency. </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_DEBUG_UNINITIALIZED </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">
+	    Use this option to catch uninitialized members in your classes.
+	    When it is set, construct() and destroy() fill the class storage
+	    with _STLP_SHRED_BYTE (see below). 
+	    Note : _STLP_DEBUG and _STLP_DEBUG_ALLOC don't set this option automatically
+	    </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_SHRED_BYTE </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Provides a definition for
+              the byte with which raw memory will be filled if _STLP_DEBUG_ALLOC or _STLP_DEBUG_UNINITIALIZED
+              is defined. Choose a value which is likely to cause a noticeable
+              problem if dereferenced or otherwise abused. A good value may
+              already be defined for your platform; see <b>stldebug.h</b> </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_DONT_THROW_RANGE_ERRORS </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">
+	    This macro prevents instantiation of at() member function
+	    for containers (vector and deque).
+	    We do not instantiate at() that does not throw range errors -
+	    if this macro is defined, at() method is not defined.
+	    </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_MSVC50_COMPATIBILITY
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">This definition makes SGI
+              <b>reverse_iterator</b> to be compatible with other parts of MSVC
+              library. (With partial specialization, it just has no effect). Its
+              use is strongly discouraged - for MSVC5.0 configuration, it is
+              being set automatically. </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_USE_MFC </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">
+	    You should define this macro if compiling with MFC - STLport &lt;stl/_config.h&gt;
+	    then include &lt;afx.h&gt; instead of &lt;windows.h&gt; to get synchronisation primitives
+	    </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_MINIMUM_DEFAULT_TEMPLATE_PARAMS</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">
+	    Use minimum set of default arguments on template classes that have more
+	    than one - for example map&lt;&gt;, set&lt;&gt;.
+	    This has effect only if _STLP_LIMITED_DEFAULT_TEMPLATES is on.
+	    </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_PROXY_ARROW_OPERATOR</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">
+	    By default, STLport uses proxy technique to enable operator -&gt; for
+	    iterators even for those compilers that check the return type of
+	    unused instantiations. If this causes problems for your project, turn this
+	    switch on to disable proxy -&gt;() operators.
+	    </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_USE_ABBREVS</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Use abbreviated class
+              names internally for linker benefit (don't affect interface). This
+              option is obsolete, but should work in this release.</font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_USE_DECLSPEC
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">
+	   (Obsolete, Windows only) This switch makes STLport symbols exported from DLL.
+           To use export feature, you should define this macro for all compilation units and
+           also define _STLP_DESIGNATED_DLL macro for one of your DLL's which is supposed to export
+           all STLport symbols. You must use this feature if you use default node allocator and pass
+           objects across DLL boundaries, and do not use STLport iostreams. 
+           Defined automatically if you use STLport iostreams and
+	   compile with /MD flag. 
+	    </font></td>
+          </tr>
+
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_DESIGNATED_DLL
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">
+	   (Obsolete, Windows only) Designed to be used together with _STLP_USE_DECLSPEC switch to
+           make one of your DLL's to export STLport symbols for other modules. 
+           The library which is designated to export DLL symbols, must have both of
+           those switches defined for compilation and it should include at least &lt;string&gt;
+           header from at least one source file. Normally you should not be using this, it is used by STLport internally to build STLport DLL.
+	    </font></td>
+          </tr>
+
+        </table>
+        <p><b>Notes:</b></p>
+        <ul>
+          <li>When using tools like Purify (c), Codeguard (c) or BoundsChecker
+            (c), it is advised to <tt>#define _STLP_USE_MALLOC</tt> or <tt>_STLP_USE_NEWALLOC</tt>,
+            otherwise pointer checking will generally not be available on most
+            STL internal structures, thus defeating the purpose of those tools.</li>
+        </ul>
+        <p>&nbsp;</p>
+
+	<a name="compiler_switches"></a>
+        <h3>Compiler-specific switches</h3>
+
+        <p>Compiler-specific switches are STLport macros describing compiler (mis)features/bugs.Below is the
+        table describing them. They are designed in such a way that the compiler 
+        that implements complete set of ANSI C++ features and has no bugs ;) would 
+	have empty configuration file.</p>
+
+	STLport also provides a script that is designed to help you setting those numerous switches.
+	Please read <a href="auto_configure.html">Running configure</a> chapter to learn more about this tool. 
+	<br><i>Note : <b>do not</b> expect STLport to be configured just by running "configure".
+	It is provided only as a tool to help in the initial configuration phase.</i>
+
+        <table border="1" cellspacing="0" cellpadding="4">
+          <caption>
+            <h4>STLport macros describing compiler features</h4>
+          </caption>
+          <tr>
+            <td><b>Controlling macro name</b></td>
+            <td><b>Description</b></td>
+            <td><b>Default</b></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NATIVE_INCLUDE_PATH
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">The path where native
+              compiler headers are located. STLport uses this information to
+              import <b>std</b>:: names into <b>_STL</b>:: namespace. Default
+              is <b>../include</b>. Hint : never install STLport headers in the
+              directory that ends with <b>include</b>. </font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_UINT32_T</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Unsigned 32-bit integral
+              type</font></td>
+            <td><font face="Arial, Helvetica" size="2">unsigned long</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_LONG_LONG</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if compiler
+              supports non-standard <b>long long</b> type</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_WCHAR_T</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if compiler
+              does not support <b>wchar_t</b> type</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_WCHAR_T_IS_USHORT
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">wchar_t is not a unique
+              type, and is actually a typedef to unsigned short </font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_LONG_DOUBLE</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if compiler
+              does not support <b>long double</b> type</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_TYPENAME</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if your compiler
+              does not support <b>typename </b>keyword</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_EXPLICIT</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if your compiler
+              does not support <b>explicit </b>keyword</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_MUTABLE</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if your compiler
+              does not support <b>mutable </b>keyword</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_NEW_STYLE_CASTS</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if compiler
+              does not support new-style <b>const_cast&lt;&gt;</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_BOOL</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if the compiler
+              does not support <b>bool</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_DONT_USE_BOOL_TYPEDEF</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Bool not supported, but
+              keyword is reserved for future use</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_YVALS_H</b></font></td>
+            <td><font face="Arial, Helvetica" size="2"><b>true/false</b> defined
+              in <b>&lt;yvals.h&gt;</b> header ( Visual C++ 4.2)</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_DEFAULT_TEMPLATE_PARAM</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if compiler
+              does not support default template parameters</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_DEFAULT_TYPE_PARAM</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if compiler
+              support only complete types as default parameters</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_LIMITED_DEFAULT_TEMPLATES</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if the compiler
+              cannot handle default non-type template parameters</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NON_TYPE_TMPL_PARAM_BUG</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if compiler has
+              trouble with functions getting non-type-parameterized classes as
+              parameters</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_STATIC_TEMPLATE_DATA</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if compiler does
+              not support static class data template definition</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_STATIC_CONST_INIT_BUG</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if compiler does
+              not support initialization of const static class data template members within class.</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_WEAK_ATTRIBUTE</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if your compiler
+              provides <b>__attribute((weak))__</b> construct as extension. Only needed if
+              the compiler can't handle static template data members (gcc 2.7.2)</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_HAS_NO_NAMESPACES</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if your compiler
+              does not support namespaces</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_BROKEN_USING_DIRECTIVE
+              </b></font></td>
+            <td><font size="2" face="Arial, Helvetica">"<b>using</b>"
+              keyword does not work with template types </font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_HAS_NO_EXCEPTIONS</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if your compiler
+              does not support exception-handling</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_EXCEPTION_SPEC</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if your compiler
+              does not support exception specifications</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_THROW_RETURN_BUG
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Compiler requires <b>return</b>
+              statement after <b>throw</b>() </font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_NO_BAD_ALLOC </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Header &lt;<b>new</b>&gt;
+              that comes with the compiler does not define <b>bad_alloc</b>
+              exception </font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_MEMBER_TEMPLATES</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if compiler
+              does not support member templates</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_MEMBER_TEMPLATE_CLASSES</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if compiler
+              does not support member template classes</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_FRIEND_TEMPLATES</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if compiler
+              does not support friend templates</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_NO_QUALIFIED_FRIENDS
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Compiler does not accept
+              friend declaration qualified with namespace name. </font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_CLASS_PARTIAL_SPECIALIZATION</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if compiler
+              does not support partial template class specialization</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_PARTIAL_SPEC_NEEDS_TEMPLATE_ARGS
+              </b></font></td>
+            <td><font size="2" face="Arial, Helvetica">Class being partially
+              specialized require full name (template parameters) of itself for
+              method declarations </font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_PARTIAL_SPECIALIZATION_BUG
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Partial specialization
+              has bugs that prevent you from using new-style <b>reverse_iterator</b>
+              </font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_MEMBER_SPECIALIZATION_BUG
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Compiler has problems
+              specializing members of partially specialized class </font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_METHOD_SPECIALIZATION</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if the compiler
+              does not support specializations of single template method.</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_FUNC_PARTIAL_ORDERING</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if compiler
+              does not support partial template functions ordering</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if compiler
+              does not support full template specialization syntax</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Compiler does not support
+              explicit template arguments for functions </font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><b><font size="1" face="Arial, Helvetica">_STLP_AUTOMATIC_TYPE_TRAITS</font></b></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if the compiler
+              specializes predefined class <b>type_traits&lt;T&gt;</b> for every
+              type. This is an extension</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><b><font size="1" face="Arial, Helvetica">_STLP_LOOP_INLINE_PROBLEMS</font></b></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if your compiler
+              can't inline <b>while(), for()</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><b><font size="1" face="Arial, Helvetica">_STLP_BASE_MATCH_BUG</font></b></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if the compiler
+              fails to match a template function argument of base type</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><b><font size="1" face="Arial, Helvetica">_STLP_NONTEMPL_BASE_MATCH_BUG</font></b></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if the compiler
+              fails to match a template function argument of base
+              (non-template)&nbsp;type</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><b><font size="1" face="Arial, Helvetica">_STLP_NESTED_TYPE_PARAM_BUG</font></b></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if the compiler
+              rejects outline method definition explicitly taking nested types/typedefs</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_TYPENAME_ON_RETURN_TYPE
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Compiler requires
+              typename keyword on outline method definition explicitly taking
+              nested types/typedefs </font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_BASE_TYPEDEF_BUG</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if your compiler
+              have serious problems with typedefs</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_BASE_TYPEDEF_OUTSIDE_BUG</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if the baseclass
+              typedefs not visible from outside</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_MEMBER_POINTER_PARAM_BUG</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if the compiler
+              can't handle pointer-to-member type as function parameter</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_UNINITIALIZABLE_PRIVATE</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if the compiler
+              has problems with static private data members initialization</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_STATIC_ARRAY_BUG</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if the compiler
+              has trouble instantiating static array members with dimension
+              defined as enum.</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_DEFAULT_CONSTRUCTOR_BUG</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if default
+              constructor for builtin integer type fails to initialize it to 0 </font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_CONST_CONSTRUCTOR_BUG</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if constructor
+              required to explicitly call member's default constructors for
+              const objects</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_TRIVIAL_CONSTRUCTOR_BUG</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if the compiler
+              has trouble calling <b>POD</b>-types constructors</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_TRIVIAL_DESTRUCTOR_BUG</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if the compiler
+              has trouble calling <b>POD</b>-types destructors</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_MULTI_CONST_TEMPLATE_ARG_BUG
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">problems specializing
+              maps/sets with key type being const </font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>__SGI_STL_NO_ARROW_OPERATOR
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Compiler has deficiencie compiling
+              -&gt; operators for iterators. STLport provides proxy workaround for those. </font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_NO_AT_MEMBER_FUNCTION
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Disables <b>at</b>()
+              member functions for containers </font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_HAS_NO_NEW_IOSTREAMS
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Native C++ library does not provide
+              new-style templatized <b>iostreams</b> </font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_NO_EXCEPTION_HEADER
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">compiler lacks &lt;<b>exception</b>&gt;
+              header </font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_HAS_NO_NEW_C_HEADERS
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Native library does not provide new-style headers
+              like &lt;<b>cstddef</b>&gt;, only old-style like: &lt;stddef.h&gt; </font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_NO_NEW_NEW_HEADER
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Native library does not provide new-style
+              like &lt;<b>new</b>&gt; header. </font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_VENDOR_GLOBAL_STD </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">compiler-supplied standard library
+              resides in global namespace, not <b>std</b>:: </font></td>
+            <td><font face="Arial, Helvetica" size="2">std::</font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_VENDOR_GLOBAL_CSTD </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">compiler-supplied &lt;<b>cstdio</b>&gt;
+              and the like put stuff in global namespace, not <b>std</b>:: </font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font size="1" face="Arial, Helvetica"><b>_STLP_RAND48</b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Defined if C library has <b>lrand48()</b>
+              function</font></td>
+            <td><font face="Arial, Helvetica" size="2">Off</font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_NATIVE_INCLUDE_PATH
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Path to get native
+              compiler headers included. May be relative or absolute. </font></td>
+            <td><font face="Arial, Helvetica" size="2"><b>../include</b></font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_NATIVE_C_INCLUDE_PATH
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Path to get native
+              compiler's  old-style C headers (like <b>stdio.h</b>) included. May be relative or absolute. </font></td>
+            <td><font face="Arial, Helvetica" size="2"><b>../include</b></font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_NATIVE_CPP_C_INCLUDE_PATH
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Path to get native
+              compiler new-style C headers (like <b>cstdio</b>) included. May be relative or absolute. </font></td>
+            <td><font face="Arial, Helvetica" size="2"><b>../include</b></font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_MAKE_HEADER </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">This macro constructs
+              header path from directory and name. You may change it if your
+              compiler does not understand "/". </font></td>
+            <td><font face="Arial, Helvetica" size="2">&lt;<b>path/header</b>&gt;</font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_NATIVE_HEADER(header)
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">This macro constructs
+              native include header path from include path and name. You may
+              have do define it if experiencing problems with preprocessor </font></td>
+            <td><font face="Arial, Helvetica" size="2">See <b>stl_config.h</b></font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_NATIVE_C_HEADER(header)
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Same for old-style C headers </font></td>
+            <td><font face="Arial, Helvetica" size="2">See <b>stl_config.h</b></font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_NATIVE_CPP_C_HEADER(header)
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">Same for new-style C headers </font></td>
+            <td><font face="Arial, Helvetica" size="2">See <b>stl_config.h</b></font></td>
+          </tr>
+          <tr>
+            <td><font face="Arial, Helvetica" size="1"><b>_STLP_LINK_TIME_INSTANTIATION
+              </b></font></td>
+            <td><font face="Arial, Helvetica" size="2">
+	    This switch should be set on if the compiler supports separate template compilation model,
+	    with non-inlined functions and methods being defined in implementation .c file.
+	    </font></td>
+            <td><font face="Arial, Helvetica" size="2"><b>Off</b></font></td>
+          </tr>
+
+        </table>
+        <h4>&nbsp;</h4>
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/copyrights.html b/main/source/stlport/doc/copyrights.html
new file mode 100644
index 00000000..043b8faf
--- /dev/null
+++ b/main/source/stlport/doc/copyrights.html
@@ -0,0 +1,56 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Copyrights and Permissions</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+        
+				<span class="heading">Copyrights and Permissions</span>
+        <p>&nbsp;</p>
+        <p>STLport library is</p>
+        <p><b><i>Copyright (c) 1999, 2000 Boris Fomitchev </i></b></p>
+        <p>See<a href="license.html"> license agreement</a> for details.</p>
+        <p>STLport is build upon the <a href="http://www.sgi.com/tech/stl/">SGI
+        STL distribution</a>, which is:</p>
+        <p><b><i>Copyright (c) 1994 Hewlett-Packard Company</i></b></p>
+        <p><b><i>Copyright (c) 1996,97,98,99 Silicon Graphics Computer Systems, Inc.</i></b></p>
+        <p>The STLport adaptation is historically</p>
+        <p><b><i>Copyright (c) 1997 Moscow Center for SPARC Technology.</i></b></p>
+        <p>STLport is provided pursuant to the following permission notices:</p>
+        <blockquote>
+          <p><i><font size="2">Permission to use, copy, modify, distribute and
+          sell this software and its documentation for any purpose is hereby
+          granted without fee, provided that the above copyright notice appear
+          in all copies and that both that copyright notice and this permission
+          notice appear in supporting documentation. Hewlett-Packard Company
+          makes no representations about the suitability of this software for
+          any purpose. It is provided "as is" without express or
+          implied warranty.</font></i></p>
+          <p><i><font size="2">Permission to use, copy, modify, distribute and
+          sell this software and its documentation for any purpose is hereby
+          granted without fee, provided that the above copyright notice appear
+          in all copies and that both that copyright notice and this permission
+          notice appear in supporting documentation. Silicon Graphics makes no
+          representations about the suitability of this software for any
+          purpose. It is provided "as is" without express or implied
+          warranty.</font></i></p>
+        </blockquote>
+        <blockquote>
+          <i><font size="2">Permission to use, copy, modify, distribute and sell
+          this software and its documentation for any purpose is hereby granted
+          without fee, provided that the above copyright notice appear in all
+          copies and that both that copyright notice and this permission notice
+          appear in supporting documentation. Moscow Center for SPARC Technology&nbsp;
+          makes no representations about the suitability of this software for
+          any purpose. It is provided "as is" without express or
+          implied warranty.</font></i>
+        </blockquote>
+        <p>The Exception Handling Test Suite is</p>
+        <blockquote>
+          <i>Copyright (c) 1997 Mark of the Unicorn, Inc. </i>
+          <p><i><font size="2">Permission to use, copy, modify, distribute and
+          sell this software and its documentation for any purpose is hereby
+          granted without fee, provided that the above copyright notice appear
+          in all copies and that both that copyright notice and this permission
+          notice appear in supporting documentation. Mark of the Unicorn makes
+          no representations about the suitability of this software for any
+          purpose. It is provided "as is" without express or implied
+          warranty. </font></i></p>
+        </blockquote>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/cvs.html b/main/source/stlport/doc/cvs.html
new file mode 100644
index 00000000..89b6255b
--- /dev/null
+++ b/main/source/stlport/doc/cvs.html
@@ -0,0 +1,38 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Early Access</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+<span class="heading">Early access</span>
+
+  <table valign="top" border="0" cellpadding="8" cellspacing="0" width="776">
+  <tr>
+  <td colspan="2">
+
+<h3>Setting up CVS</h3>
+Please download 'scvs' script from "http://www.stlport.com/beta/cvsaccess" directory.
+To use it, you need three programs : perl, cvs and ssh installed on your system.
+The script is already modified to work with stlpor.com under cygwin.
+You might have to edit location for your perl installation and cvs program.
+
+Use this script like that :
+<p><b>
+scvs -d pserver:cvs@www.stlport.com/stlport &lt;cvs command&gt;
+</b>
+</p>
+
+<h3>CVS Accounts</h3>
+Note : example above use "cvs" account -- this allows anonymous readonly access.
+If you have been given individual account with write permissions, use your account name instead.
+If you do not have individual account but wish to have one, please submit the patches that you made
+ (using read-only access and cvs diff) along with your request to <a href="mailto:boris@stlport.com">boris@stlport.com</a>.
+
+More detailed instructions on using scvs script can be found at :
+
+<a href="http://www.prima.eu.org/tobez/cvs-howto.html">http://www.prima.eu.org/tobez/cvs-howto.html</a>
+
+<h3>Tags and Branches</h3>
+STLport CVS repository provides static tags and branches. Branches are provided for bugfixes maintenance.
+Please use static tags to retrieve particular snapshots.
+Tags have the form : STLPORT&lt;VERSION_MAJOR&gt;&lt;VERSION_MINOR&gt;&lt;YYMMDD&gt;, where YYMMDD is the time stamp when the tag was created.
+	    </td>
+          </tr>
+        </table>
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/debug_mode.html b/main/source/stlport/doc/debug_mode.html
new file mode 100644
index 00000000..2b66d66f
--- /dev/null
+++ b/main/source/stlport/doc/debug_mode.html
@@ -0,0 +1,125 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Debug Mode</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">STLport : Debug Mode</span>
+
+        <p><i><font size="2">by Boris Fomitchev</font></i></p>
+        <h3>Abstract</h3>
+        <p>Debug mode lets you find very obscure bugs in application code which uses STL iterators and algorithms. <br>
+        It performs runtime checking of iterator <i>validity and ownership</i> and <i>algorithm
+        preconditions</i>. <br>
+        When debug check reveals the bug,&nbsp; it terminates the program
+        with detailed diagnostics.</p>
+        <p>STLport in debug mode is as much <i>exception-safe</i> and<i>
+        thread-safe</i> as in release mode.</p>
+        <h3>Debugging facilities provided</h3>
+        <ul>
+          <li><b>"Safe iterators" for all STL containers</b>. <br>
+            They report detailed diagnostics when being used in invalid ways.</li>
+        </ul>
+        <ul>
+          <li><b>Checking of preconditions for algorithms and container methods</b>.
+            STLport checks the following reasonable set of preconditions:</li>
+          <ul>
+            <li>Range preconditions for random-access iterators</li>
+            <li>Iterator's ownership, validity and deferenceability</li>
+            <li>Container-specific preconditions for methods</li>
+          </ul>
+        </ul>
+        <h3>Implementation</h3>
+        <p>Checked iterators keep track of their container while the container
+        keeps track of them. The idea was introduced in <b><a href="http://www.horstmann.com/safestl.html">Cay
+        Horstmann's "Safe STL"</a></b>.</p>
+        <ul>
+          <li>If the container goes out of scope, its iterators are being
+            invalidated;</li>
+          <li>If certain iterators are being invalidated because of mutating
+            operation, all instances of this iterator are invalidated.</li>
+        </ul>
+        <h3>Usage</h3>
+        <p>To turn on the debug mode, you should somehow <b><tt>#define _STLP_DEBUG</tt></b>
+        macro before including any STL header. You can either supply the
+        definition via compiler command-line or within CXXFLAGS in your makefile:</p>
+        <p><b><tt>$&gt; CC -g -D_STLP_DEBUG foo.cpp</tt></b></p>
+        <p>Naturally, you may also wrap it into your project configuration
+        header :</p>
+        <p><b><tt># ifdef _NDEBUG<br>
+        # undef _STLP_DEBUG<br>
+        # else<br>
+        # define _STLP_DEBUG 1<br>
+        # endif</tt></b></p>
+        <p><b>Important</b> : you must recompile your project after changing <b><tt>_STLP_DEBUG</tt></b>
+        definition.</p>
+        <h3>Examples</h3>
+        <p>Here are some error examples with corresponding runtime output:</p>
+        <p><tt>char string[23] = "A string to be copied.";<br>
+        char result[23]; <br>
+        copy(string+<u>20</u>, string+<u>10</u>, result);</tt> <br>
+        <b>_debug.h:168 STL error : Range [first,last) is invalid <br>
+        algobase.h:369 STL assertion failure: __check_range(first, last)</b></p>
+        <p><tt>vector&lt;char&gt;::iterator i; <br>
+        char ii = *i; <br>
+        </tt>s<b>tldebug.h:152 STL error : Uninitialized or invalidated (by
+        mutating operation) iterator used<br>
+        vector.h:158 STL assertion failure: __check_dereferenceable(*this)</b></p>
+        <p><tt>vector&lt;char&gt;::iterator i=v2.begin(); <br>
+        v2.insert(v2.begin(),'!'); <br>
+        char ii = *i; <br>
+        </tt><b>_debug.h:152 STL error : Uninitialized or invalidated (by
+        mutating operation) iterator used<br>
+        vector.h:158 STL assertion failure: __check_dereferenceable(*this)</b></p>
+        <p><tt>vector&lt;int&gt; v; v.pop_back();<br>
+        </tt><b>vector.h:482 STL error : Trying to extract an object out from
+        empty container <br>
+        vector.h:482 STL assertion failure: !empty()</b></p>
+        <p><tt>vector &lt;int&gt; v1(10);<br>
+        for(int i = 0; i &lt; v1.size(); i++) <br>
+        v1[i] = i; vector &lt;int&gt; v2(10); <br>
+        copy(v1.begin(), <u><blink>v2</blink></u>.end(), v2.begin());<br>
+        </tt><b>_debug.h:61 STL error : Iterators used in expression are from
+        different owners<br>
+        vector.h:182 STL assertion failure: __check_same_owner(*this,y)</b></p>
+        <p><tt>list&lt;int&gt; l1(array1, array1 + 3); <br>
+        l1.erase(l1.<u>end()</u>);</tt><b> <br>
+        list.h:398 STL error : Past-the-end iterator could not be erased <br>
+        list.h:398 STL assertion failure: position.node!=node </b></p>
+        <p><tt>list&lt;int&gt; l1(array1, array1 + 3); <br>
+        list&lt;int&gt; l2(array2, array2 + 2); <br>
+        l1.erase(<u>l2</u>.begin());</tt><b> <br>
+        _debug.h:70 STL error : Container doesn't own the iterator <br>
+        list.h:397 STL assertion failure: __check_if_owner(node,position) </b></p>
+        <h3>Notes</h3>
+        <ul>
+          <li>Application code using <tt>T*</tt> to store <tt>vector::iterator</tt>
+            would not compile in debug mode. Such code should be fixed - the
+            standard does not specify <tt>vector::iterator</tt>, so different implementations
+            can use different types for it.</li>
+          <li>Miscellanous stuff used by debug engine (<tt>_debug.h</tt>) is
+            not documented on purpose. Never explicitly include or otherwise use
+            it in your code - it's non-standard and is subject to change.</li>
+
+          <li>The ability to throw exceptions instead of calling <tt>abort()</tt>
+            is provided since 3.2. Please comment out _STLP_NO_DEBUG_EXCEPTIONS switch which 
+            disables it as default.</li>
+
+          <li> If those two defaults do not match your debugging needs,
+you may force all failed assertions to be executed through user-defined global function:<br> void __stl_debug_terminate(void). This allows you to take control of assertion behavior for debugging purposes.</li>
+
+          <li>You can control the way the debug checking messages are being printed out by defining 
+your own debug output function. To do so, you should define _STLP_DEBUG_MESSAGE switch in stl_user_config.h and
+provide your function with the following signature :<br>
+void __stl_debug_message(const char * format_str, ...). The parameters are printf()-like. 
+STLport will then use it to format debug message output.</li>
+
+          <li>Some preconditions that cannot be checked without partial class
+            template specialization still left alone. (<i>example : for
+            copy(InputIterator first, InputIterator last, OutputIterator result)
+            algorithm, result should not be in range [first,last).</i> )</li>
+
+          <li>Unfortunately, the file/line pairs reported by debug engine always
+            point to STL code, not to application code. I see no way to fix that
+            (&nbsp;although the diagnostic certainly may be refined ). There's
+            no substitute for good debugger to walk up the stack and locate the
+            error.</li>
+        </ul>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/doc.css b/main/source/stlport/doc/doc.css
new file mode 100644
index 00000000..53257574
--- /dev/null
+++ b/main/source/stlport/doc/doc.css
@@ -0,0 +1,12 @@
+BODY { margin: 0 0; background: #FFFFFF; font-family: "Tahoma", "Helvetica", "Arial", "sans-serif"; }
+
+A:link {font-size: 14px; text-decoration:none; color: #0c70b6;}
+
+A:visited {font-size: 14px; text-decoration:none; color: #0c70b6;}
+
+.copyright { font-size: 10px; font-family: "Tahoma", "Helvetica", "Arial", "sans-serif"; line-height: 12px; color: #999999; }
+
+.bottomNav { font-size: 11px; font-family: "Tahoma", "Helvetica", "Arial", "sans-serif"; text-decoration: none; font-weight: bold; color: #325A30; }
+
+.heading { font-size: 18px; font-family: "Tahoma", "Helvetica", "Arial", "sans-serif";  line-height: 14px; color: #e35a23; }
+
diff --git a/main/source/stlport/doc/eh_testsuite.html b/main/source/stlport/doc/eh_testsuite.html
new file mode 100644
index 00000000..0411eaee
--- /dev/null
+++ b/main/source/stlport/doc/eh_testsuite.html
@@ -0,0 +1,85 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Exception Handling Testsuite</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+        <span class="heading">Exception Handling Test Suite for STLport</span>
+<p>
+        <font size="1"><em><strong>by Dave Abrahams, Boris Fomitchev</strong></em></font>
+</p>
+        <h2>Synopsis</h2>
+        <p><b><tt>eh_test [-n &lt;iterations&gt;] [-s &lt;size&gt;] [-l] [-e]
+        [-q]/[-v] [-t]</tt></b></p>
+        <h4>Options:</h4>
+        <ul>
+          <li><tt>[<b>-n &lt;iterations&gt;</b>] </tt>: number of test
+            iterations, default==100;</li>
+          <li><tt>[<b>-s &lt;size&gt;</b>]</tt> : base value for random
+            container sizes, default==1000;</li>
+          <li><tt>[<b>-e</b>]</tt> : don't throw exceptions, test for leak in
+            normal conditions;</li>
+          <li><tt>[<b>-q</b>]</tt> : quiet mode;</li>
+          <li><tt>[<b>-v</b>]</tt> : verbose mode (default);</li>
+          <li><tt>[<b>-t</b>]</tt> : track each allocation;</li>
+          <li><tt>[<b>test_name</b> [<b>test_name</b>...]]</tt> : run <b>test_name</b>
+            tests (<b>default</b>==all). <br>
+            Names are : <b>algo, vector, bit_vector, list, slist, deque, set,
+            map, hash_set, hash_map, rope, string, bitset</b>.</li>
+        </ul>
+        <h2>The Story</h2>
+        <p>The testsuite was written by Dave Abrahams for testing of proposed EH
+        for SGI STL . Shortly, EH&nbsp;was merged into STLport v1.0. That wasn't
+        long until EH was introduced in&nbsp; SGI&nbsp;STL&nbsp;distribution,
+        too (a bit different approach was used). This test helped to locate and
+        fix some EH&nbsp;bugs in 2.0-2.02 releases of SGI STL. As a side effect,
+        it reveals problems in some compiler's EH&nbsp;implementation (typically
+        they show up when you are trying turning on some optimizations).</p>
+        <h2>Portability</h2>
+        <p>EH&nbsp;testsuite can be compiled and run with the following
+        compilers :</p>
+        <ul>
+          <li>SunPro CC 4.1-4.2 (passed OK)</li>
+          <li>Metrowerks CodeWarrior Pro 1 (passed OK)</li>
+          <li>Visual C++ 4.1 (hashed container tests won't compile, compiler bug
+            produce false alarms for list test, other passed.)</li>
+          <li>Visual C++ 5.0 (passed OK).</li>
+          <li>Borland C++ 5.0 (passed OK).</li>
+          <li>gcc-2.7.2 (without EH, actually ;))</li>
+          <li>egcs-970922 (fails to run, dumps core in __throw implemetation).</li>
+        </ul>
+        <p>Makefiles for <b>gcc</b>, <b>SUNPro</b>, <b>Visual C++</b> compilers
+        are provided with the suite. Look for <i>.mak</i> files in the
+        distribution. It should be not difficult to adjust one of them to your
+        compiler.</p>
+        <h2>How To</h2>
+        <p>EH testsuite comes in directory <b>test/eh</b> with your STLport
+        distribution. Edit appropriate makefile to fit your compiler and include
+        directories . After you've done, try "<i>make check</i>". That
+        should build test executable and run it with default options (see
+        Synopsis). If writing your own makefile or working from within some IDE,
+        you should specify the following switches to get proper testing :</p>
+        <p><tt>_STLP_USE_NEWALLOC</tt> - use new-based allocator (that will
+        promptly throw on common test scheme). Otherwise, only
+        assignment/comparison will throw,</p>
+        <p><tt>_STLP_USE_DEBUG_ALLOC</tt> - to catch other potential memory
+        problems.</p>
+        <p><tt>EH_NEW_HEADERS - </tt>if you wish to use new-style C++ headers.
+        This option may be useful to test some other STL&nbsp;implementation.</p>
+        <p>For Borland C++ 5.x , you have to <tt>#define _STLP_NO_NAMESPACES</tt>
+        to compile.</p>
+        <p>For 16-bit platforms, you have to #define NO_FAST_ALLOCATOR to
+        compile.</p>
+        <p>The testsuite may be used to test not only STLport adaptation against
+        particular compiler. It does not contain any adaptation-specific code,
+        so it may be used with regular SGI release (note <tt>_STLP_USE_NEWALLOC </tt>has
+        no effect<tt> </tt>then) or with other STL&nbsp;implementation (hash
+        containers and rope may not work).</p>
+        <h3>Copyright</h3>
+        <p>This software is<br>
+        <i>Copyright (c) 1997 Mark of the Unicorn, Inc. </i></p>
+        <p><i><font size="1">Permission to use, copy, modify, distribute and
+        sell this software and its documentation for any purpose is hereby
+        granted without fee, provided that the above copyright notice appear in
+        all copies and that both that copyright notice and this permission
+        notice appear in supporting documentation. Mark of the Unicorn makes no
+        representations about the suitability of this software for any purpose.
+        It is provided "as is" without express or implied warranty. </font></i>
+				</p>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/exception_safety.html b/main/source/stlport/doc/exception_safety.html
new file mode 100644
index 00000000..6efd3170
--- /dev/null
+++ b/main/source/stlport/doc/exception_safety.html
@@ -0,0 +1,471 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Exception Handling</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">Exception Safety in STLport</span>
+	<p>
+        <font size="2"><em><strong>by Dave Abrahams</strong></em></font>
+</p>
+        <h2><a name="guarantees"></a>Basic Library Guarantees</h2>
+        <p><b>STLport makes the guarantee that</b> <b>no resources are leaked in
+        the face of exceptions</b>.</p>
+        <p><b>This means:</b></p>
+        <ul>
+          <li>By the time a container's destructor completes:</li>
+          <ul>
+            <li>It has returned all memory it has allocated to the appropriate
+              deallocation function.</li>
+            <li>The destructor has been called for all objects constructed by
+              the container.</li>
+          </ul>
+          <li>Algorithms destroy all temporary objects and deallocate all
+            temporary memory even if the algorithm does not complete due to an
+            exception.</li>
+          <li>Algorithms which construct objects (e.g. <tt>uninitialized_fill</tt>)
+            either complete successfully or destroy any objects they have
+            constructed at the time of the exception.</li>
+          <li>Algorithms which destroy objects always succeed.</li>
+        </ul>
+        <h4>Additionally:</h4>
+        <ul>
+          <li>Algorithms which operate on ranges of objects leave only
+            fully-constructed objects in those ranges if they terminate due to
+            an exception.</li>
+          <li>Containers continue to fulfill all of their requirements, even
+            after an exception occurs during a mutating function. For example, a
+            map will never give an inaccurate report of its size, or fail to
+            meet its performance requirements because the tree that implements
+            it has become unbalanced.</li>
+          <li>A stronger guarantee is available for some operations: that <i>if
+            the operation terminates due to an exception, program state will
+            remain unchanged</i>. For example, <tt>vector&lt;T,A&gt;::push_back()</tt>
+            leaves the vector unchanged if an exception is thrown, provided the
+            library client fulfills the <a href="#basic_requirements">basic
+            requirements</a> below. For some operations, the "<a href="#Strong%20Guarantee">strong
+            guarantee</a>" is available if additional requirements are
+            filled.</li>
+        </ul>
+        <p>&nbsp;</p>
+        <p><a name="basic_requirements"></a><b><font size="+2">Basic Client
+        Requirements</font></b></p>
+        <p><b>The <a href="#guarantees">library guarantees</a> above are
+        conditional on some requirements that library clients must fulfill.</b></p>
+        <p><b>The following operations must return normally - they are forbidden
+        to terminate due to an exception:</b></p>
+        <ul>
+          <li>Destructors of any classes used by the library. This includes all
+            classes used as library template parameters. It also includes all
+            classes which fulfill "type requirements" of classes used
+            as library templates- an allocator's <tt>size_type</tt>, for
+            example.</li>
+          <li>Valid uses of any of the required functionality of the following
+            types. Note that invalid uses (e.g. comparison of two iterators from
+            different containers) are not prohibited from throwing an exception.
+            Presumably, invalid uses would cause worse problems than resource
+            leaks:</li>
+          <ul>
+            <li>The ForwardIterator arguments to the following:</li>
+            <ul>
+              <li><tt>uninitialized_copy(InputIterator first, InputIterator
+                last, ForwardIterator result)</tt></li>
+              <li><tt>uninitialized_fill(ForwardIterator first, ForwardIterator
+                last, const T&amp; x)</tt></li>
+              <li><tt>uninitialized_fill_n(ForwardIterator first, Size n, const
+                T&amp; x)</tt></li>
+              <li><tt>destroy(ForwardIterator first, ForwardIterator last)</tt></li>
+            </ul>
+            <li>An allocator's <tt>deallocate()</tt> function</li>
+            <li>Any of the required allocator types:</li>
+            <ul>
+              <li><tt>pointer</tt></li>
+              <li><tt>const_pointer</tt></li>
+              <li><tt>reference</tt></li>
+              <li><tt>const_reference</tt></li>
+              <li><tt>size_type</tt></li>
+              <li><tt>difference_type</tt></li>
+            </ul>
+          </ul>
+        </ul>
+        <p>&nbsp;</p>
+        <p>Note: Algorithms like <tt>copy()</tt> expect that they are copying
+        into real objects. The use of <tt>raw_storage_iterator</tt> with most
+        algorithms is inherently exception-unsafe:</p>
+        <ul>
+          <p><tt>// objects of the same type as *iterator1 may be leaked if a
+          failure occurs.<br>
+          copy( iterator1, iterator2, raw_storage_iterator( ptr ) ); </tt></p>
+        </ul>
+        <p>Furthermore, there is no way to properly recover from this using an
+        enclosing <tt>try</tt>/<tt>catch </tt>block, because <tt>raw_storage_iterator</tt>
+        has no function in its public interface to tell you how far it has been
+        advanced.</p>
+        <p>&nbsp;</p>
+        <h2><a name="Strong%20Guarantee"></a>The "Strong Guarantee"</h2>
+        <p>In many programs, some objects will be destroyed automatically during
+        exception-unwinding. For these, the basic guarantee that resources won't
+        be leaked is good enough. If a program hopes to survive an exception and
+        continue running, though, it probably also uses long-lived containers
+        which are expected to survive past exception-recovery in a known state.
+        For example, a program could maintain a list of objects representing
+        tasks it is working on. If adding a task to that list fails, the program
+        may still need to rely on the list. If the list must survive an
+        exception intact, we need the strong guarantee:</p>
+        <ul>
+          <p><i>If an exception is thrown, the operation has no effects.</i></p>
+        </ul>
+        <p>You can get the strong guarantee by "brute force" for any
+        container operation as follows, provided the container's <tt>swap()</tt>
+        member function can't fail (this is true for most real-world
+        containers):</p>
+        <p><tt>container_type container_copy( original_container ); <br>
+        container_copy.mutating_operation(...); <br>
+        original_container.swap( container_copy );</tt></p>
+        <p>Fortunately, many mutating operations give the strong guarantee with
+        no additional requirements on the client. To get the strong guarantee
+        for others, you can either use the above technique or conform to some <a href="#additional_requirements">additional
+        requirements</a>.</p>
+        <p>&nbsp;</p>
+        <h3>Operations that give the "strong guarantee" with no
+        additional requirements</h3>
+        <p><a name="1"></a><i>( Operations labelled with * are guaranteed to
+        return normally if all <a href="#basic_requirements">basic requirements</a>
+        have been met) </i></p>
+        <ul>
+          <li><tt>uninitialized_fill()</tt></li>
+          <li><tt>uninitialized_copy()</tt></li>
+          <li><tt>uninitialized_fill_n()</tt></li>
+          <li><tt>deque&lt;T,A&gt;</tt> member functions:</li>
+          <ul>
+            <li><tt>swap(deque&lt;T,A&gt;&amp;)</tt> <a href="#1">*</a></li>
+            <li><tt>push_back(const T&amp;)</tt></li>
+            <li><tt>pop_back()</tt> <a href="#1">*</a></li>
+            <li><tt>push_front(const T&amp;)</tt></li>
+            <li><tt>pop_front()</tt> <a href="#1">*</a></li>
+          </ul>
+          <li><tt>list&lt;T,A&gt;</tt> member functions:</li>
+          <ul>
+            <li><tt>insert(iterator position, const T&amp; x = T())</tt></li>
+            <li><tt>insert(iterator position)</tt></li>
+            <li><tt>push_back(const T&amp;)</tt></li>
+            <li><tt>pop_back()</tt> <a href="#1">*</a></li>
+            <li><tt>push_front(const T&amp;)</tt></li>
+            <li><tt>pop_front()</tt> <a href="#1">*</a></li>
+            <li><tt>splice(iterator position, list&lt;T,Allocator&gt;&amp; x)</tt>
+              <a href="#1">*</a></li>
+            <li><tt>splice(iterator position, list&lt;T,Allocator&gt;&amp; x,
+              iterator i)</tt> <a href="#1">*</a></li>
+            <li><tt>splice(iterator position, list&lt;T,Allocator&gt;&amp; x,
+              iterator first, iterator last)</tt> <a href="#1">*</a></li>
+            <li><tt>swap(list&lt;T,A&gt;&amp;)</tt> <a href="#1">*</a></li>
+            <li><tt>reverse()</tt> <a href="#1">*</a></li>
+            <li><tt>erase(iterator position)</tt> <a href="#1">* </a></li>
+            <li><tt>erase(iterator first, iterator last)</tt> <a href="#1">* </a></li>
+          </ul>
+          <li><tt>vector&lt;T, A&gt;</tt> member functions:</li>
+          <ul>
+            <li><tt>reserve(size_type n)</tt></li>
+            <li><tt>swap(vector&lt;T,A&gt;&amp;)</tt> <a href="#1">*</a></li>
+            <li><tt>push_back(const T&amp;) </tt></li>
+            <li><tt>pop_back()</tt> <a href="#1">*</a></li>
+          </ul>
+          <li><tt>bit_vector&lt;A&gt;</tt> member functions:</li>
+          <ul>
+            <li><tt>reserve(size_type n)</tt></li>
+            <li><tt>swap(bit_vector&amp;)</tt> <a href="#1">*</a></li>
+            <li><tt>push_back(const T&amp;) </tt></li>
+            <li><tt>pop_back()</tt> <a href="#1">*</a></li>
+            <li><tt>insert(iterator position, bool x = bool())</tt></li>
+            <li><tt>insert(iterator position)</tt></li>
+            <li>insert(iterator position, const_iterator first, const_iterator
+              last)</li>
+            <li>insert(iterator position, const bool* first, const bool* last)</li>
+            <li>insert(iterator position, size_type n, bool x)</li>
+            <li><tt>erase(iterator position)</tt> <a href="#1">* </a></li>
+            <li><tt>erase(iterator first, iterator last)</tt> <a href="#1">* </a></li>
+          </ul>
+          <li><tt>map&lt;K, T, C, A&gt;</tt> member functions:</li>
+          <ul>
+            <li><tt>operator[](const key_type&amp; k)</tt></li>
+            <li><tt>insert(iterator position, const value_type&amp; x)</tt></li>
+            <li><tt>insert(const value_type&amp; x) </tt></li>
+            <li><tt>erase(const key_type&amp; x) <a href="#1">*</a> </tt></li>
+            <li><tt>erase(iterator position)</tt> <a href="#1">* </a></li>
+            <li><tt>erase(iterator first, iterator last)</tt> <a href="#1">* </a></li>
+          </ul>
+          <li><tt>set&lt;K, C, A&gt;</tt> member functions:</li>
+          <ul>
+            <li><tt>insert(iterator position, const value_type&amp; x)</tt></li>
+            <li><tt>insert(const value_type&amp; x)</tt></li>
+            <li><tt>erase(const key_type&amp; x)</tt> <a href="#1">*</a></li>
+            <li><tt>erase(iterator position)</tt> <a href="#1">* </a></li>
+            <li><tt>erase(iterator first, iterator last)</tt> <a href="#1">* </a></li>
+          </ul>
+          <li><tt>multimap&lt;K, T, C, A&gt;</tt> member functions:</li>
+          <ul>
+            <li><tt>insert(iterator position, const value_type&amp; x)</tt></li>
+            <li><tt>insert(const value_type&amp; x)</tt></li>
+            <li><tt>erase(const key_type&amp; x) </tt><a href="#1">*</a></li>
+            <li><tt>erase(iterator position)</tt> <a href="#1">* </a></li>
+            <li><tt>erase(iterator first, iterator last)</tt> <a href="#1">* </a></li>
+          </ul>
+          <li><tt>multiset&lt;K, C, A&gt;</tt> member functions:</li>
+          <ul>
+            <li><tt>insert(iterator position, const value_type&amp; x)</tt></li>
+            <li><tt>insert(const value_type&amp; x)</tt></li>
+            <li><tt>erase(const key_type&amp; x) </tt><a href="#1">*</a></li>
+            <li><tt>erase(iterator position)</tt> <a href="#1">* </a></li>
+            <li><tt>erase(iterator first, iterator last)</tt> <a href="#1">* </a></li>
+          </ul>
+          <li><tt>hash_map&lt;K, T, H, E, A&gt;</tt> member functions:</li>
+          <ul>
+            <li><tt>insert_noresize(const value_type&amp; obj)</tt></li>
+            <li><tt>erase(const key_type&amp; key)</tt> <a href="#1">*</a></li>
+            <li><tt>erase(iterator position)</tt> <a href="#1">* </a></li>
+            <li><tt>erase(iterator first, iterator last)</tt> <a href="#1">* </a></li>
+          </ul>
+          <li><tt>hash_multimap&lt;K, T, H, E, A&gt;</tt> member functions:</li>
+          <ul>
+            <li><tt>insert_noresize(const value_type&amp; obj)</tt></li>
+            <li><tt>erase(const key_type&amp; key)</tt> <a href="#1">*</a></li>
+            <li><tt>erase(iterator position)</tt> <a href="#1">* </a></li>
+            <li><tt>erase(iterator first, iterator last)</tt> <a href="#1">* </a></li>
+          </ul>
+          <li><tt>hash_set&lt;T, H, E, A&gt;</tt> member functions:</li>
+          <ul>
+            <li><tt>insert_noresize(const value_type&amp; obj)</tt></li>
+            <li><tt>erase(const key_type&amp; key)</tt> <a href="#1">*</a></li>
+            <li><tt>erase(iterator position)</tt> <a href="#1">* </a></li>
+            <li><tt>erase(iterator first, iterator last)</tt> <a href="#1">* </a></li>
+          </ul>
+          <li><tt>hash_multiset&lt;T, H, E, A&gt;</tt> member functions:</li>
+          <ul>
+            <li><tt>insert_noresize(const value_type&amp; obj)</tt></li>
+            <li><tt>erase(const key_type&amp; key) </tt><a href="#1">*</a></li>
+            <li><tt>erase(iterator position)</tt> <a href="#1">* </a></li>
+            <li><tt>erase(iterator first, iterator last)</tt> <a href="#1">* </a></li>
+          </ul>
+          <li><tt>clear()</tt> for all containers <a href="#1">* </a></li>
+          <li>all container const member functions <a href="#1">*</a></li>
+          <li>all constructors, by language definition (included for
+            completeness)</li>
+        </ul>
+        <p>&nbsp;</p>
+        <h3><a name="additional_requirements"></a><b><font size="+2">Strong
+        guarantee requirements for other mutating container operations</font></b></h3>
+        <p><a name="2"></a><i>Operations labelled with * are guaranteed to
+        return normally if all additional requirements have been met) </i></p>
+        <table border="2" cellspacing="2" cellpadding="2" width="80%">
+          <caption><b>Definition of terms</b></caption>
+          <tr>
+            <td valign="TOP"><b><i>Term</i></b></td>
+            <td><b><i>Meaning, when applied to a type <tt>T<br>
+              </tt></i></b><i>(<tt>x</tt> and <tt>y</tt>of type <tt>T</tt>)</i></td>
+          </tr>
+          <tr>
+            <td valign="TOP">"guaranteed copyable"</td>
+            <td valign="TOP"><tt>T z(x)</tt> and <tt>x = y</tt> may not exit via
+              exception.</td>
+          </tr>
+          <tr>
+            <td>"guaranteed equality-comparable"</td>
+            <td valign="TOP"><tt>x == y</tt> may not exit via exception.</td>
+          </tr>
+          <tr>
+            <td>"guaranteed comparable"</td>
+            <td><tt>x &lt; y</tt> may not exit via exception.</td>
+          </tr>
+        </table>
+        <p>&nbsp;</p>
+        <table border="2" cellspacing="2" cellpadding="2" width="95%">
+          <caption><b><tt>deque&lt;T,A&gt;</tt> member functions</b></caption>
+          <tr>
+            <td valign="TOP"><b><i>Function</i></b></td>
+            <td><b><i>Requirements</i></b></td>
+          </tr>
+          <tr>
+            <td valign="TOP"><tt>insert(iterator position, const T&amp; x)<br>
+              insert(iterator position)</tt></td>
+            <td valign="TOP"><tt>position == begin() || position == end()<br>
+              </tt><b>OR </b><tt>T</tt> guaranteed copyable</td>
+          </tr>
+          <tr>
+            <td><tt>erase(iterator position)</tt></td>
+            <td><tt>position == begin() || position == end() - 1<br>
+              </tt><b>OR </b><tt>T</tt> guaranteed copyable</td>
+          </tr>
+          <tr>
+            <td><tt>erase(iterator first, iterator last)</tt></td>
+            <td><tt>first == begin() || last == end()<br>
+              </tt><b>OR </b><tt>T</tt> guaranteed copyable</td>
+          </tr>
+          <tr>
+            <td><tt>resize(size_type new_size, const T&amp; x)<br>
+              resize(size_type new_size)</tt></td>
+            <td valign="TOP"><tt>new_size == size() + 1<br>
+              </tt><b>OR </b><tt>new_size &lt;= size()</tt> <a href="#2">*</a></td>
+          </tr>
+        </table>
+        <p>&nbsp;</p>
+        <table border="2" cellspacing="2" cellpadding="2" width="95%">
+          <caption><b><tt>list&lt;T,A&gt;</tt> member functions</b></caption>
+          <tr>
+            <td valign="TOP"><b><i>Function</i></b></td>
+            <td><b><i>Requirements</i></b></td>
+          </tr>
+          <tr>
+            <td valign="TOP"><tt>remove(const T&amp; value)</tt></td>
+            <td valign="TOP"><tt>T</tt> guaranteed equality-comparable</td>
+          </tr>
+          <tr>
+            <td><tt>unique()</tt></td>
+            <td valign="TOP"><tt>T</tt> guaranteed equality-comparable</td>
+          </tr>
+          <tr>
+            <td><tt>merge(list&lt;T, Alloc&gt;&amp; x)</tt></td>
+            <td><tt>T</tt> guaranteed comparable</td>
+          </tr>
+          <tr>
+            <td><tt>sort()</tt></td>
+            <td><tt>T</tt> guaranteed comparable</td>
+          </tr>
+        </table>
+        <p>&nbsp;</p>
+        <table border="2" cellspacing="2" cellpadding="2" width="95%">
+          <caption><b><tt>vector&lt;T,A&gt;</tt> member functions</b></caption>
+          <tr>
+            <td valign="TOP"><b><i>Function</i></b></td>
+            <td><b><i>Requirements</i></b></td>
+          </tr>
+          <tr>
+            <td valign="TOP"><tt>insert(iterator position, const T&amp; x)<br>
+              insert(iterator position)</tt></td>
+            <td valign="TOP"><tt>position == end()<br>
+              </tt><b>OR </b><tt>T</tt> guaranteed copyable</td>
+          </tr>
+          <tr>
+            <td><tt>insert (iterator position, const_iterator first,
+              const_iterator last);</tt>
+              <br><tt>void insert (iterator position, size_type n, const T&amp;
+              x);</tt></td>
+            <td valign="TOP"><tt>T</tt> guaranteed copyable</td>
+          </tr>
+          <tr>
+            <td><tt>erase(iterator position)</tt></td>
+            <td><tt>position == end() - 1<br>
+              </tt><b>OR </b><tt>T</tt> guaranteed copyable</td>
+          </tr>
+          <tr>
+            <td><tt>erase(iterator first, iterator last)</tt></td>
+            <td><tt>last == end()<br>
+              </tt><b>OR </b><tt>T</tt> guaranteed copyable</td>
+          </tr>
+          <tr valign="TOP">
+            <td><tt>resize(size_type new_size, const T&amp; x)<br>
+              resize(size_type new_size)</tt></td>
+            <td><tt>new_size == size() + 1<br>
+              </tt><b>OR </b><tt>T</tt> guaranteed copyable<br>
+              <b>OR </b><tt>new_size &lt;= size()</tt> <a href="#2">*</a></td>
+          </tr>
+        </table>
+        <p>&nbsp;</p>
+        <table border="2" cellspacing="2" cellpadding="2" width="95%">
+          <caption><b>Basic Associative Container member functions</b></caption>
+          <tr>
+            <td valign="TOP"><b><i>Function</i></b></td>
+            <td><b><i>Requirements</i></b></td>
+          </tr>
+          <tr>
+            <td valign="TOP"><tt>map&lt;Key,T,Compare,A&gt;::swap(map&lt;Key,T,Compare,A&gt;&amp;
+              amp; amp;)</tt></td>
+            <td valign="TOP"><tt>Compare </tt>guaranteed copyable <a href="#2">*</a></td>
+          </tr>
+          <tr>
+            <td><tt>multimap&lt;Key,T,Compare,A&gt;::swap(multimap&lt;Key,T,Compare,A&amp;a
+              mp;g t;&amp;)</tt></td>
+            <td valign="TOP"><tt>Compare </tt>guaranteed copyable <a href="#2">*</a></td>
+          </tr>
+          <tr valign="TOP">
+            <td><tt>set&lt;T,Compare,A&gt;::swap(set&lt;T,Compare,A&gt;&amp;)</tt></td>
+            <td><tt>Compare </tt>guaranteed copyable <a href="#2">*</a></td>
+          </tr>
+          <tr>
+            <td><tt>multiset&lt;T,Compare,A&gt;::swap(multiset&lt;T,Compare,A&gt;&amp;)
+              </tt></td>
+            <td><tt>Compare </tt>guaranteed copyable <a href="#2">*</a></td>
+          </tr>
+        </table>
+        <p>&nbsp;</p>
+        <table border="2" cellspacing="2" cellpadding="2" width="95%">
+          <caption><b>hash_map&lt;K, T, HashFcn, EqualKey, A&gt; member
+            functions</b></caption>
+          <tr>
+            <td valign="TOP"><b><i>Function</i></b></td>
+            <td><b><i>Requirements</i></b></td>
+          </tr>
+          <tr>
+            <td valign="TOP"><tt>swap(hash_map&lt;K, T, HashFcn, EqualKey,
+              A&gt;&amp;)</tt></td>
+            <td valign="TOP"><tt>HashFcn and EqualKey </tt>guaranteed copyable <a href="#2">*</a></td>
+          </tr>
+          <tr>
+            <td><tt>insert(const value_type&amp; obj)</tt></td>
+            <td valign="TOP"><tt>bucket_count() &gt;= size() + 1</tt></td>
+          </tr>
+          <tr valign="TOP">
+            <td><tt>operator[](const key_type&amp; k)</tt></td>
+            <td><tt>bucket_count() &gt;= size() + 1</tt></td>
+          </tr>
+        </table>
+        <p>&nbsp;</p>
+        <table border="2" cellspacing="2" cellpadding="2" width="95%">
+          <caption><b>hash_multimap&lt;K, T, HashFcn, EqualKey, A&gt; member
+            functions</b></caption>
+          <tr>
+            <td valign="TOP"><b><i>Function</i></b></td>
+            <td><b><i>Requirements</i></b></td>
+          </tr>
+          <tr>
+            <td valign="TOP"><tt>swap(hash_multimap&lt;K, T, HashFcn, EqualKey,
+              A&gt;&amp;)</tt></td>
+            <td valign="TOP"><tt>HashFcn and EqualKey </tt>guaranteed copyable <a href="#2">*</a></td>
+          </tr>
+          <tr>
+            <td><tt>insert(const value_type&amp; obj)</tt></td>
+            <td valign="TOP"><tt>bucket_count() &gt;= size() + 1</tt></td>
+          </tr>
+        </table>
+        <p>&nbsp;</p>
+        <table border="2" cellspacing="2" cellpadding="2" width="95%">
+          <caption><b>hash_set&lt;T, HashFcn, EqualKey, A&gt; member functions</b></caption>
+          <tr>
+            <td valign="TOP"><b><i>Function</i></b></td>
+            <td><b><i>Requirements</i></b></td>
+          </tr>
+          <tr>
+            <td valign="TOP"><tt>swap(hash_set&lt;K, T, HashFcn, EqualKey,
+              A&gt;&amp;)</tt></td>
+            <td valign="TOP"><tt>HashFcn and EqualKey </tt>guaranteed copyable <a href="#2">*</a></td>
+          </tr>
+          <tr>
+            <td><tt>insert(const value_type&amp; obj)</tt></td>
+            <td valign="TOP"><tt>bucket_count() &gt;= size() + 1</tt></td>
+          </tr>
+        </table>
+        <p>&nbsp;</p>
+        <table border="2" cellspacing="2" cellpadding="2" width="95%">
+          <caption><b>hash_multiset&lt;T, HashFcn, EqualKey, A&gt; member
+            functions</b></caption>
+          <tr>
+            <td valign="TOP"><b><i>Function</i></b></td>
+            <td><b><i>Requirements</i></b></td>
+          </tr>
+          <tr>
+            <td valign="TOP"><tt>swap(hash_multiset&lt;K, T, HashFcn, EqualKey,
+              A&gt;&amp;)</tt></td>
+            <td valign="TOP"><tt>HashFcn and EqualKey </tt>guaranteed copyable <a href="#2">*</a></td>
+          </tr>
+          <tr>
+            <td><tt>insert(const value_type&amp; obj)</tt></td>
+            <td valign="TOP"><tt>bucket_count() &gt;= size() + 1</tt></td>
+          </tr>
+        </table>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/images/black.gif b/main/source/stlport/doc/images/black.gif
new file mode 100644
index 00000000..b98c7116
Binary files /dev/null and b/main/source/stlport/doc/images/black.gif differ
diff --git a/main/source/stlport/doc/images/stl_logo_doc.gif b/main/source/stlport/doc/images/stl_logo_doc.gif
new file mode 100644
index 00000000..936b7fcf
Binary files /dev/null and b/main/source/stlport/doc/images/stl_logo_doc.gif differ
diff --git a/main/source/stlport/doc/images/t_doc2.gif b/main/source/stlport/doc/images/t_doc2.gif
new file mode 100644
index 00000000..c40a3321
Binary files /dev/null and b/main/source/stlport/doc/images/t_doc2.gif differ
diff --git a/main/source/stlport/doc/images/trans.gif b/main/source/stlport/doc/images/trans.gif
new file mode 100644
index 00000000..1d11fa9a
Binary files /dev/null and b/main/source/stlport/doc/images/trans.gif differ
diff --git a/main/source/stlport/doc/index.html b/main/source/stlport/doc/index.html
new file mode 100644
index 00000000..2ae4518c
--- /dev/null
+++ b/main/source/stlport/doc/index.html
@@ -0,0 +1,56 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: STLport Documentation Index</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+<span class="heading">STLport Documentation Index</span>
+<br><br>
+
+<table border="0" cellpadding="8" cellspacing="0">
+  <tr>
+    <td valign="top" align="left" nowrap="">
+      <b>Introduction</b><br>
+      
+      &nbsp; <a href="index.html">Documentation Index</a><br>
+      &nbsp; <a href="sgi_stl.html">SGI STL Base</a><br>
+      &nbsp; <a href="story.html">STLport Story</a><br>
+<!--      &#160; <a href="projects.html">Portofolio</a> -->
+      
+      <p><b>STLport Features</b><br>
+      &nbsp; <a href="platforms.html">Portability</a><br>
+      &nbsp; <a href="debug_mode.html">Debug Mode</a><br>
+      &nbsp; <a href="sgi_stl.html#thread_safety">Thread Safety</a><br>
+      &nbsp; <a href="exception_safety.html">Exception Safety</a>
+      </p>
+
+      <p><b>Getting Started</b><br>
+
+      &nbsp; <a href="install.html">Download and Install</a><br>
+      &nbsp; <a href="select_io.html">Select Streams Mode</a><br>
+      &nbsp; <a href="use_stlport.html">Compiling with STLport</a>
+      </p>
+     </td>
+
+      <td valign="top" align="left" nowrap="">
+      <p><b>White Papers</b><br>
+      &nbsp; <a href="release_notes.html">Release Notes</a><br>
+<!--      &#160; <a href="FAQ.html">FAQ</a><br/> -->
+      &nbsp; <a href="compiler_readmes.html">READMEs</a><br>
+      &nbsp; <a href="vendor_interface.html">Interface with std::</a><br>
+      &nbsp; <a href="wrappers.html">Wrappers</a><br>
+      &nbsp; <a href="configure.html">Config manual</a><br>
+      &nbsp; <a href="testsuite.html">Regression Test</a><br>
+      &nbsp; <a href="eh_testsuite.html">Exception Test</a>
+      </p>
+
+      <p><b>Feedback</b><br>
+      &nbsp; <a href="bug_report.html">Bug Reports</a><br>
+      &nbsp; <a href="http://www.stlport.com/cgi-bin/forum/forum.cgi">Forum</a><br>
+      </p>
+      
+      <p><b>Appendix</b><br>
+      &nbsp; <a href="thanks.html">Acknowledgements</a><br>
+<!--      &#160; <a href="copyrights.html">Copyrights</a><br/> -->
+      &nbsp; <a href="license.html">Your Free Licence</a></p>
+    </td>
+  </tr>
+</table>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/install.html b/main/source/stlport/doc/install.html
new file mode 100644
index 00000000..32f4be69
--- /dev/null
+++ b/main/source/stlport/doc/install.html
@@ -0,0 +1,45 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Getting Started: Installing STLport</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+
+        <span class="heading">Getting Started: Installing STLport</span>
+
+        <h3><b><a name="download"></a>Download</b></h3>
+        To get STLport, please visit <a href="http://www.stlport.com/download.html">download page at stlport.com</a>.
+	It provides STLport releases from 2.x to the latest one as well as beta snapshots.
+        If you are interested in contributing to STLport development, please take a look at <a href="http://www.stlport.com/early_access.html">Early Access page</a>.
+
+        <h3><b><a name="unpack"></a>Unpack</b></h3>
+        <p>After downloading <b>STLport-XXX.tar.gz </b>[<b>zip</b>],&nbsp;
+        unpack it to some place where it is going to be accesible for all 
+        compilers you plan to use with this installation.
+	<br><b>Note</b> : <b>Never</b> overwrite header files that come with the compiler, 
+        even if you made a backup - this won't work! 
+        Also, please make sure you do not rename this <b>"stlport"</b> subdirectory 
+        into anything else - that may render installation unusable.
+</p>
+
+        <h3><b><a name="adjust"></a>Setup Preferences</b></h3>
+
+        <p>Look through <tt>&lt;<b>stl/_site_config.h</b>&gt;</tt> and <tt>&lt;<b>stl_user_config.h</b>&gt;</tt> 
+        to adjust <a href="configure.html">preferences</a>.</p>
+
+	<p>
+        <b>Do NOT</b> attempt to run "configure" script! 
+          It is deprecated, moved to safe standalone 
+          folder and should be used as a helper to create initial config for a new compiler only. 
+          Your compiler should be auto-recognized.
+	  Please edit appropriate configuration header for your compiler
+          directly if you have to make small compiler-specific configuration changes.
+	</p>
+
+        <p>Only if you recieve error message during compilation which explicitly says
+        <i><b>"Your compiler version is not recognized by STLport"</b></i>, you
+        will have to do major configuration of STLport before use. 
+        To learn how to configure STLport, please read 
+        <a href="configure.html">configuration manual</a>.
+        </p>
+
+	<p>Please be sure to read about <a href="select_io.html">STLport iostreams modes</a> 
+        and select the one appropriate for your project before using the library.</p>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/license.html b/main/source/stlport/doc/license.html
new file mode 100644
index 00000000..1711b106
--- /dev/null
+++ b/main/source/stlport/doc/license.html
@@ -0,0 +1,68 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: License Agreement</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">        
+
+<span class="heading">License Agreement</span>
+
+<p><b>Boris Fomitchev</b> grants <b>Licensee</b> a non-exclusive,
+non-transferable, royalty-free license to use <b>STLport</b> and its
+documentation without fee.<br>
+<br>
+By downloading, using, or copying <b>STLport</b> or any portion thereof,&nbsp;
+<b>Licensee</b> agrees to abide by the intellectual property laws and all other
+applicable laws of the United States of America, and to all of the terms and
+conditions of this Agreement.<br>
+<br>
+<b>Licensee</b> shall maintain the following copyright and permission&nbsp;
+notices on <b>STLport </b>sources and its documentation unchanged :</p>
+
+
+<b>Copyright 1999,2000 Boris Fomitchev</b><br>
+<br>
+This material is provided "as is", with absolutely no warranty
+expressed or implied. Any use is at your own risk.<br>
+Permission to use or copy this software for any purpose is hereby granted
+without fee, provided the above notices are retained on all copies. Permission
+to modify the code and to distribute modified code is granted, provided the
+above notices are retained, and a notice that the code was modified is included
+with the above copyright notice.
+
+
+<p>The <b>Licensee</b> may distribute binaries compiled with <b>STLport</b>
+(whether original or modified) without any royalties or restrictions.</p>
+<p>The <b>Licensee</b> may distribute original or modified <b>STLport</b> sources,
+provided that:</p>
+<ul>
+  <li>The conditions indicated in the above permission notice are met;</li>
+  <li>The following copyright notices are retained when present, and conditions
+    provided in accompanying permission notices are met :</li>
+</ul>
+<p><b><i>Copyright  1994 Hewlett-Packard Company</i></b></p>
+<p><b><i>Copyright  1996,97 Silicon Graphics Computer Systems, Inc.</i></b></p>
+<p><b><i>Copyright  1997 Moscow Center for SPARC Technology.</i></b></p>
+<blockquote>
+  <p><i><font size="2">Permission to use, copy, modify, distribute and sell this
+  software and its documentation for any purpose is hereby granted without fee,
+  provided that the above copyright notice appear in all copies and that both
+  that copyright notice and this permission notice appear in supporting
+  documentation. Hewlett-Packard Company makes no representations about the
+  suitability of this software for any purpose. It is provided "as is"
+  without express or implied warranty.</font></i></p>
+  <p><i><font size="2">Permission to use, copy, modify, distribute and sell this
+  software and its documentation for any purpose is hereby granted without fee,
+  provided that the above copyright notice appear in all copies and that both
+  that copyright notice and this permission notice appear in supporting
+  documentation. Silicon Graphics makes no representations about the suitability
+  of this software for any purpose. It is provided "as is" without
+  express or implied warranty.</font></i></p>
+</blockquote>
+<blockquote>
+  <i><font size="2">Permission to use, copy, modify, distribute and sell this
+  software and its documentation for any purpose is hereby granted without fee,
+  provided that the above copyright notice appear in all copies and that both
+  that copyright notice and this permission notice appear in supporting
+  documentation. Moscow Center for SPARC Technology&nbsp; makes no
+  representations about the suitability of this software for any purpose. It is
+  provided "as is" without express or implied warranty.</font></i>
+</blockquote>
+
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/platforms.html b/main/source/stlport/doc/platforms.html
new file mode 100644
index 00000000..d671d2f3
--- /dev/null
+++ b/main/source/stlport/doc/platforms.html
@@ -0,0 +1,50 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Platforms</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">Compilers supported by STLport</span>
+        <p>Portability is a key feature of STLport. It allows for having single,
+        thoroughly tested code base on all platforms used in the project.</p>
+        <p>STLport was reported to work with the compilers listed below.</p>
+        <p>Please follow links to see README files for particular compilers.</p> 
+
+        <ul>
+
+          <li><b><a href="README.sunpro.html">
+              SUN Workshop C++ Compilers 4.0.x-5.0, 5.1, 5.2 (Forte 6, 6u1, 6u2)</a>, for Solaris</b></li>
+          <li><b><a href="README.gcc.html">
+              GNU GCC 2.7.2-2.95, 3.0 Compilers</a>, for all GCC platforms</b></li>
+          <li><a href="README.xlC.html">
+              IBM xlC 3.1.4.0</a>, for AIX</li>
+          <li><b><a href="README.os390.html">
+              IBM OS/390 C/C++ 1.x - 2.x Compiler</a>, for OS/390 
+              <i>(STLport is the only available and 
+              <a href="http://www.software.ibm.com/ad/c390/cmvsstlp.htm">official</a> 
+              ANSI library for this platform)</i></b></li>
+          <li><b>IBM VisualAge/ILE C++ for AS/400 Version 4 Release 4, for AS/400</b></li>
+          <li><b><a href="README.xlC.html">
+              IBM Visual Age C++ 3.x-5.x</a>, for OS/2 and Win32</b></li>
+          <li><b><a href="README.aCC.html">
+              HP ANSI C++ Compiler, for HP-UX</a></b></li>
+          <li><b>SGI MIPSpro C++ 7.x, for IRIX</b></li>
+          <li><b><a href="README.sgi40.html">
+              SGI MIPSpro C++ 4.0</a>, for IRIX</b></li>
+          <li><a href="README.DEC.html"><b>
+              DEC C++ V5.5-004, V6.x for OSF 3.2/4.0, for Digital Unix</b></a>.</li>
+          <li><b>Tandem NCC, for Tandem OS</b></li>
+          <li><b>SCO UDK C++, for UnixWare</b></li>
+          <li><b>Apogee C++ 4.0, for SUN Solaris</b></li>
+
+          <li><b>KAI C++ 3.1-4.x, for all KAI platforms</b></li>
+          <li><b>Portland Group C++ compiler ( pgCC), for all pgCC platforms</b></li>
+
+          <li><b><a href="README.VC++.html">Microsoft Visual C++ 4.x - 6.x, for Win32</a></b></li>
+          <li><b><a href="README.VC++.html">Microsoft Embedded Visual C++ 3.0</a></b></li>
+          <li><b><a href="README.BC.html">Borland C++ 5.02-5.5</a>, for Win16/32</b></li>
+          <li><b><a href="README.CW.html">Metrowerks CodeWarrior Pro 1.8-5.3</a>, for MacOS, Win32</b></li>
+          <li><b>Intel (R) C++ 4.0/4.5/5.0 Reference Compiler, for Win32</b></li>
+          <li><b>Watcom C++ 10.x-11.0, for DOS, Win16, Win32</b></li>
+          <li><b><a href="README.pow.html">Powersoft's Power++ 2.0</a>, for Win32</b></li>
+          <li><b>Symantec C++ 7x/8.x, for MacOS and Win32</b></li>
+          <li><b><a href="README.MPW.html">Apple MPW MrCpp and SCpp compilers</a>, for MacOS</b></li>
+        </ul>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/projects.html b/main/source/stlport/doc/projects.html
new file mode 100644
index 00000000..72e2f73e
--- /dev/null
+++ b/main/source/stlport/doc/projects.html
@@ -0,0 +1,244 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Real World Projects</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">STLport Portfolio - Real World Projects</span>
+
+        <p>Many people still won't consider using STL in industrial projects.
+        The reason is often that the code could may turn out to be nonportable,
+        while it must also be compiled with some legacy compiler X on platform Y
+        . With STLport, you can use single tested&nbsp; STL&nbsp; codebase in a
+        multiplatform project.&nbsp; Below is very incomplete list of <b>software
+        projects using STLport&nbsp; </b><i>(thanks to all contributors who have
+        submitted the information)</i>.</p>
+	<p><i>Coming soon : <b>Add Your Project</b></i><br></p>
+        <hr width="100%">
+        <p><i>Organization: <a href="http://www.ipmce.su">Moscow Center for
+        SPARC Technology</a></i></p>
+        <h3>Project : CPU Architecture Simulation</h3>
+        <dl>
+          <dt><b>Description </b>:</dt>
+          <dd>Scalable set of compatible VLIW ISA CPU simulators varying in
+            speed/accuracy. Team of 6, extensive use of STL utilities and
+            concepts.</dd>
+          <dt><b>Platforms/compilers used:</b></dt>
+          <dd>Solaris 2.x/SunPro CC 4.2, to be ported to Windows NT/VC++.</dd>
+</dl>
+          <h3>&nbsp;</h3>
+          <hr width="100%">
+          <i>Organization: <a href="http://www.motu.com">Mark of the Unicorn,
+          Inc.</a></i>
+          <h3>Product : "Composer's Mosaic"</h3>
+          <dt><b>Description </b>:</dt>
+          <dd>State-of-the-art music desktop publishing software for the
+            Macintosh. Provides a WYSIWYG environment in which you can produce
+            publication-quality music notation, from lead sheets to full
+            orchestra scores. Includes real-time MIDI playback and recording,
+            using the transcription engine that Keyboard magazine called
+            "The best we've ever seen". Also supports convenient
+            step-record and mouse and keyboard note entry. Supports standard
+            MIDI file format. Unlimited voices, staves, and voices per staff.
+            Unlimited Undo/Redo.</dd>
+          <dt><b>Platforms/compilers used:</b></dt>
+          <dd>Mac/CodeWarrior Pro 1</dd>
+          <p><b>Availability :</b> demo version coming in a few weeks.</p>
+          <p>&nbsp;</p>
+          <hr width="100%">
+          <p><i>Organization: <a href="http://www.motu.com">Mark of the Unicorn,
+          Inc.</a></i></p>
+          <h3>Product : "FreeStyle"</h3>
+          <dt><b>Description </b>:</dt>
+          <dd>Trackless MIDI sequencing and notation program for songwriters and
+            arrangers, combining simplicity and ease-of-use with sophisticated
+            features that allow users to work in musically intuitive ways.</dd>
+          <dt><b>Platforms/compilers used:</b></dt>
+          <dd>Mac/CodeWarrior Pro 1 , Windows/Borland C++</dd>
+          <p><b>Availability :</b> demo version coming in a few weeks.</p>
+          <p>&nbsp;</p>
+          <hr width="100%">
+          <p><i>Organization: <a href="http://www.usc.edu">University of
+          Southern California</a></i></p>
+          <h3><a href="http://selforg.usc.edu:8376/~dyweb/frp.html">Project :
+          Face Recognition</a></h3>
+          <dt><b>Description </b>:</dt>
+          <dd>Face recognition system called FLAVOR(formerly called Eidos),
+            which uses an elastic graph matching algorithm.</dd>
+          <dt><b>Platforms/compilers used:</b></dt>
+          <dd>IRIX 6.2 on<b> </b>SGI Power Challenge XL/SGI MipsPro C++ v. 7.1,<b>
+            </b>Wintel port coming.</dd>
+          <p>&nbsp;</p>
+          <hr width="100%">
+          <p><i>Organization: <a href="http://www.ucla.edu">University of
+          California at Los Angeles </a>, <a href="http://www.cs.ucla.edu">Computer
+          Science Department</a></i> <br>
+          <i><a href="http://vlsicad.cs.ucla.edu">VLSI CAD Laboratory - ABKGroup</a></i></p>
+          <h3>Project : VLSI placement/routing</h3>
+          <dt><b>Description </b>:</dt>
+          <dd>Extensively use most aspects of STL in algorithm research for
+            placement and routing of VLSI circuits. Developers at site: 5.
+            Working code using STL: exceeds 20,000 lines.</dd>
+          <dt><b>Platforms/compilers used:</b></dt>
+          <dd>SunPro CC4.2 (Solaris) and MSVC++ 5.0 (Windows NT/'95)</dd>
+          <p><i>Contact email: &lt;abk@cs.ucla.edu&gt; &lt;imarkov@cs.ucla.edu&gt;</i></p>
+          <p>&nbsp;</p>
+          <hr width="100%">
+          <p><i>Organization:<a href="mailto:100023.3267@compuserve.com">Askesis
+          B.V</a></i></p>
+          <h3>Product : "ICAS"</h3>
+          <dt><b>Description </b>:</dt>
+          <dd>A client/server patient database management system for the
+            intensive care departement in the hospital of the University of
+            Nijmegen in the Netherlands. Includes a TCP/IP Winsocket, an ODBC
+            class library and a code generator for creating the database code
+            based on the ODBC class library. Uses the container classes heavily.</dd>
+          <dt><b>Platforms/compilers used:</b></dt>
+          <dd>IBM Visual Age C++ for Windows, DB/2 for Windows NT, Windows
+            NT/Windows 95 and Windows 3.11.</dd>
+          <dt><b>Availability :</b></dt>
+          <dd>The TCP/IP and ODBC database libary with the code generator will
+            be released in under GNU Library Genereral Public Licence within a
+            few weeks.</dd>
+          <p>&nbsp;</p>
+          <hr width="100%">
+          <p><i>Organization: <a href="http://www.entegrity.com">Entegrity
+          Solutions Inc</a></i></p>
+          <h3>Product : "Security Development Platform"</h3>
+          <dt><b>Description </b>:</dt>
+          <dd>A comprehensive framework/library for developping secure
+            applications. Includes symmetric and assymetric cryptography and
+            complete public key infrastructure (CA) functionality. Extensive use
+            of STL throughout the project.</dd>
+          <dt><b>Platforms/compilers used:</b></dt>
+          <dd>Solaris 2.5 with SunCC 4.2 using STL adaption + extra basic_string.
+            Windows NT4 with MS Visual C++ 5.0 using MS STL implementation.
+            Compatibility between MS STL and STL adaption is good when limiting
+            usage to common classes.</dd>
+          <dt><b>Availability :</b></dt>
+          <br>
+          Beta release (NT only) due end of September.&nbsp;
+          <hr width="100%">
+          <p><i>Organization: <a href="http://darwin.cwru.edu">Case Western
+          Reserve University School of Medicine,</a></i> <br>
+          <i><a href="http://darwin.cwru.edu">Department of Molecular and
+          Genetic Epidemiology, S.A.G.E. Group</a></i></p>
+          <h3>Product : "S.A.G.E. (Statistical Analysis for Genetic
+          Epidemiology)"</h3>
+          <dt><b>Description </b>:</dt>
+          <dd>For detailed package information, see <a href="http://darwin.cwru.edu.">http://darwin.cwru.edu.</a>
+            Use of the STL : in upcoming 4.0 release, ~50k+ lines of code relies
+            heavily on the standard library containers and to a lesser degree on
+            the standard algorithms. Code also compiles with Kuck &amp;
+            Associate's modified Moderna STL and DeltaLogic's XTL.</dd>
+          <dt><b>Platforms/compilers used:</b></dt>
+          <dd>Alpha Digital Unix 4.0/g++ 2.7.2.1, Digital C++ 5.5 ; Sparc
+            Solaris 2.5/g++ 2.7.2.1, SunPro C++; i386 Linux 2.x/g++ 2.7.2.1</dd>
+          <dt><b>Availability :</b> check <a href="http://darwin.mhmc.cwru.edu/pub/sage.html">S.A.G.E
+            homepage</a>.</dt>
+          <dt><i>Contact e-mail: </i><a href="mailto:jacobs@darwin.cwru.edu">jacobs@darwin.cwru.edu</a></dt>
+          <dt>&nbsp;</dt>
+          <hr width="100%">
+          <p><i>Organization: </i><a href="mailto:info@formatek.com">Formatek
+          Inc.</a></p>
+          <h3>Product : "Softmap"</h3>
+          <dt><b>Description </b>:</dt>
+          <dd><b>SoftMap</b> is a GIS software bundled to a set of standard maps
+            (topographic maps, city maps, thematic maps) on CD-ROM to which
+            complementary georeferenced data can be added: topologically
+            structured nodes, vectors, polygons, icons and texts. As SoftMap is
+            a multimedia software, it is possible to link to the above graphic
+            elements attributes, images, external files, data base records etc.</dd>
+          <dt><b>Platforms/compilers used:</b></dt>
+          <dd>Windows/Borland C++</dd>
+          <dt><b>Availability :</b> check <a href="http://www.naturinfo.com">http://www.naturinfo.com</a>.</dt>
+          <dt><b>Contact e-mail:</b> <a href="mailto:info@formatek.com">info@formatek.com</a></dt>
+          <dt>&nbsp;</dt>
+          <hr width="100%">
+          <p><i>Organization: <a href="http://www.int.com">Interactive Network
+          Technologies, Inc (INT)</a></i></p>
+          <h3>Product : "Carnac", Graphics Toolkit</h3>
+          <dt><b>Description </b>:</dt>
+          <dd><b>Carnac</b> is a multi-platform high-performance graphics
+            toolkit written in C++ targeted at handling of huge volumes of
+            graphics information: maps, geoscience, satellite images and so on.
+            Carnac includes database components (spatial-organized geometry,
+            visual attributes), view management, data management, distributed
+            components and platform-specific drivers..</dd>
+          <dt><b>Platforms/compilers used:</b></dt>
+          <dd>Microsoft Windows NT, Sun Solaris, SGI IRIX and IBM AIX. Other
+            platforms may be added.</dd>
+          <dt><b>Availability:</b></dt>
+          <dd>check the <a href="http://www.int.com/product/carnac/index.html">Carnac
+            Web Page</a>.</dd>
+          <dt><b>Comments from Carnac developers:</b></dt>
+          <dd>To handle this diversity and to keep our code-base reasonably
+            small and manageable we use internally a lot of new features of
+            upcoming ANSI C++ standard: templates, exception handling, standard
+            library based on STL. The biggest problem of our multi-platform
+            project was a diversity of C++ compilers. They have a variety of
+            different bugs and "features", and somewhat incompatible
+            interpretations of templates. Some of them didn't support HP STL we
+            started with. HP STL had a limited set of containers (notably it
+            lacks hash-based containers). ObjectSpace STL was modeled after HP
+            STL and had the same problems. We decided to go with SGI STL as most
+            comprehensive STL implementation available. While it worked fine on
+            Windows NT and SGI, we had troubles with other platforms. Adaptation
+            of SGI STL (STLport) really improved this situation. We use original
+            SGI STL 2.03 on Windows NT and SGI IRIX and SGI STL port 2.03 on Sun
+            Solaris and IBM AIX. Both libraries work out-of-box on these
+            platforms. I should add that STLport has very important features ---
+            it incorporates a debug mode, which is crucial for big projects,
+            thread-safety and exception safety. SGI STL and STLport are free,
+            easy-to-use, up-to-date and evolving, close to ANSI C++ draft
+            standard and THEY WORK ON EXISTING COMPILERS!!! That's why we chose
+            SGI STL for our project.</dd>
+          <br>
+          Eugene Lazutkin, Senior Software Analyst <br>
+          Interactive Network Technologies, Inc.
+          <dt>&nbsp;</dt>
+          <hr width="100%">
+          <br>
+          <i>Organization: <a href="http://www.claris.com">Claris Corporation</a></i>
+          <h3>Project : ClarisWorks New Code Base</h3>
+          <dt><b>Description </b>:</dt>
+          <dd>ClarisWorks is a productivity package that includes
+            word-processing, drawing, spreadsheet, and paint capabilities all
+            integrated in one package.&nbsp; It is currently available on MacOS
+            as well as Windows 95/NT.</dd>
+          <br>
+          MacWeek rates us 4.5 diamonds (out of five). PCWeek says we are all
+          the Office you need. <br>
+          &nbsp;
+          <dt><b>Platforms/compilers used:</b></dt>
+          <dd>&nbsp;&nbsp;&nbsp; MacOS/CodeWarrior Pro 2</dd>
+          <br>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Win32/Visual
+          C++ 5.0 sp2 <br>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; WinCE/Visual
+          C++ 5.0 sp2 <br>
+          &nbsp;
+          <dt><b>Availability :</b></dt>
+          <br>
+          You can buy ClarisWorks 5.0 currently, although it is not written
+          using STLport, you can get a look at what we are working on.&nbsp;
+          <hr width="100%">
+          <br>
+          &nbsp; <br>
+          <i>Organization: <a href="http://www.uni-paderborn.de/cs/">University
+          of Paderborn, Germany</a></i>
+          <h3>Project : <a href="http://www.uni-paderborn.de/cs/padfem/">PadFEM</a></h3>
+          <dt><b>Description </b>:</dt>
+          <br>
+          &nbsp;&nbsp;&nbsp; PadFEM is a project of the University of Paderborn,
+          Germany, dealing <br>
+          with parallel adaptive finite element simulations. <br>
+          &nbsp;
+          <dt><b>Platforms/compilers used:</b></dt>
+          <br>
+          g++ compiler (2.7.2 and 2.8.0) on Sun workstations (Solaris) and <br>
+          massive parallel computers. <br>
+          &nbsp;
+          <dt><b>Availability :</b></dt>
+          <br>
+          &nbsp; More informations are available on the PadFEM homepage at <br>
+          <a href="http://www.uni-paderborn.de/cs/padfem/">http://www.uni-paderborn.de/cs/padfem/</a>.
+          <br>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/release_notes.html b/main/source/stlport/doc/release_notes.html
new file mode 100644
index 00000000..a494f274
--- /dev/null
+++ b/main/source/stlport/doc/release_notes.html
@@ -0,0 +1,176 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Release Notes</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">STLport 4.5 Release Notes</span>
+<p>
+	Please see etc/ChangeLog for the list of changes since 4.0. 
+	A number of new platforms are supported; STLport iostreams ported to many new platforms.
+	4.5 should provide for much greater reliability and efficiency, especially in iostreams part. 
+	Code bloat should be significantly reduced. Versioning is introduced for dynamic libraries. 
+</p>
+        <span class="heading">STLport 4.0 Release Notes</span>
+<p>
+	STLport 4.0 is a major release. Finally, it offers complete C++ standard library!
+	Here is a list of major changes in 4.0 :
+        <ul>
+
+	<li>Complete ANSI C++ standard library, including &lt;complex&gt; and SGI iostreams.</li>
+
+	<li>Can be configured to use either SGI or native iostreams.</li>
+
+	<li>Debug mode completely redesigned. Debug mode containers are 
+	  implemented in terms of wrappers around non-debug ones.
+	  That provides for more clean and efficient implementation.
+	  In Debug Mode, different namespace <b>_STLD::</b> is being used,
+	  so no link-time clashes between debug and non-debug versions are possible.</li>
+
+	<li>New platforms - gcc-2.95, Mingw32, Borland C++ Builder 5.5, SUN CC 6.0 Early Access, SUN CC in compatibility mode.</li>
+
+        </ul>
+
+
+	Minor changes:
+	<ul>
+
+	<li> std:: is not used for STLport namespace even with SGI iostreams,
+	  to avoid possible clashes and facilitate 3rd-party library use.
+          Same macro redefinition technique for _STL:: used to keep clients
+	  code which uses literal std::.</li>
+
+	<li>C library headers wrapping changed to account for multiple inclusion tricks
+	  (needed by gcc-2.95 mostly)</li>
+
+	<li>auto_ptr updated, now it passes polymorphic tests with VC++</li>
+
+	<li>config changes - "configure" made obsolete and moved into "stlport/config/new_compiler"</li>
+	<li>Lot of minor bugfixes.</li>
+	</ul>
+</p>
+
+        <h2><font color="#000080">STLport 3.2.1 Release Notes</font></h2>
+
+	<p>STLport 3.2.1 is a minor release in terms of functionality, but it is a huge
+        leap forward in terms of usability. </p>
+
+	<h2>std::renaming</h2>
+	3.2.1 finally solved the conflict between STLport string and std::string, which
+        used to be worked around by using namespace stlport::, to avoid link- and run-time
+        clashes. Refer to <a href="vendor_interface.html">"Cooperation with native standard library"</a> 
+        section for details.
+	In 3.2.1, new, completely transparent scheme introduced to redefine <b>"std::"</b> in user
+sources to <b>"stlport::"</b> via macros. Before 3.2.1, it was not possible, because not all headers were provided
+ with necessary wrappers. 
+Now, when user writes <b>"std::"</b> in application code, it yields the same results as if he wrote <b>"stlport::"</b>.<br>
+The biggest advantage is that now absolutely no modifications in client code are needed to use.
+STLport instead of native STL lib, which turns STLport into seamless drop-in component!
+ 
+	<h2>Windows improvements</h2>
+	STLport 3.2.1 provides the mechanism to export static members of default node allocator
+	from a designated user's DLL, which solves the problem observed with default allocator
+	and passing objects across DLL boundaries. Currently, one of user's DLL is supposed to
+	be designated to export STLport symbols. That will change as soon as STLport will provide
+	iostreams library.<p></p>
+	For MT compilation, <b>&lt;windows.h&gt;</b> is not included anymore to get synchronization
+	function prototypes. That significally reduces compilation time.
+	<p></p>	
+	<h2>Quality improvements</h2>
+	<p>3.2.1 provides further code bloat reduction - hashtable uses vector <b>&lt;void*&gt;</b> internally.</p>
+	<h2>New platforms</h2>
+	Configuration files provided for DEC C++ 6.x/5.x , Borland C++ 5.02, KAI C++.
+	Windows CE configuration provided.
+	<hr>	
+
+        <h2><font color="#000080">STLport 3.2 Release Notes</font></h2>
+
+	<p>STLport 3.2 is a major change from 3.12. It provides new components, new wrappers
+        and fixes many portability issues.</p>
+	<h2>New Components</h2>
+	New standard header files are provided : &lt;limits;&gt; and &lt;valarray&gt;.
+	Also, STLport now provide complete set of C library headers which are currently
+        wrappers for either old-style or new-style native C library headers.
+	<h2>Headers reorganization</h2>
+	Main STLport include directory renamed to <b>stlport</b>. 
+	Old HP-style STL headers moved to <b>stlport/hp</b> directory.
+	<h2>Quality improvements</h2>
+	<p>3.2 provides new workarounds for standard allocators : EBO (empty-base optimization),
+        for automatic space optimization for instanceless allocators. Allocators with instances
+        now can be used with any compiler. Chunking problem is fixed - no memory overuse.
+</p>
+	<p>Major restructuring - non-inline code moved to .c implementation files.
+        That makes huge code bloat reduction for compilers that support separate compilation model,
+	like IBM xlC. If this model is not supported, .c file is being included in corresponding .h file.
+</p>
+	<p><a href="debug_mode.html">Debug</a> mode redesigned for less code bloat and memory footprint.
+	Now it use single-linked lists for iterators lists and tables for error reporting. Also it provides more flexible control on error reporting for user - now you can control whether debug aasertion throws an exception or not, or to supply your own termination routine in addition to reporting one.
+</p>
+	<h2>New platforms</h2>
+	Configuration files provided for Apogee C++, Borland C++ Builder 4.
+	<h2>Smoother portability</h2>
+	<p>New workarounds are used for compilers with limited capabilities. Standard forms of distance() 
+	and operator -&gt; for iterators is supported for them in 3.2. Additional user-level switch 
+        _STLP_MINIMUM_DEFAULT_TEMPLATE_PARAMS is added to use minimum set of default arguments on 
+        template classes that have more than one - for example map&lt;&gt;, set&lt;&gt;. This is supposed to help compiling existing standard code which use shortest notation.
+	Many other portability issues reported for 3.12 are fixed, including workaround for famous Sun CC 4.2 bug. _STLP_USE_MFC switch added for MFC cooperation. 
+</p>
+        <h2>Configuration engine changes</h2>
+	<p><a href="configure.html">Configuration</a> switches changed - those describing compiler misfeatures changed so that
+	the compiler that implements complete ANSI C++ Standard and has no bugs would have empty
+        configuration file.  
+</p>
+	<br>
+	<hr>	
+        <h2><font color="#000080">STLport 3.12 Release Notes</font></h2>
+
+        <h2>Configuration changes</h2>
+        <p>In 3.12, the confuguration headers stlcomp.h and configure script reside in
+config/ directory. stlcomp.h has been splitted to compiler-specific-headers. As now stl_config.h
+        includes &lt;config/stlcomp.h&gt;, your compiler must be able to understand UNIX-style paths.
+        Most compilers do that automatically, but some (MetroWerks CodeWarrior) require setting the option to do that..</p>
+        <h2>Cooperation with compiler's C++ library</h2>
+        <p>STLport 3.12 is capable of&nbsp; using separate namespace <b>stlport::</b>
+        to avoid conflicts with standard C++ library that comes with the
+        compiler. If your compiler provides new-style <b>&lt;iostream&gt;</b>,
+        please be sure to read the <a href="vendor_interface.html">document
+        describing this technique</a>.</p>
+        <h2>New-style iostreams:</h2>
+        <p>In STLport 3.12, <b>_STLP_USE_NEW_IOSTREAMS&nbsp; </b>macro controls
+        whether you are using templatized iostreams or not. This setting is
+        important - STLport's <b>&lt;iostream&gt;</b> imports appropriate
+        version of native iostreams (&lt;<b>iostream</b>&gt; vs. &lt;<b>iostream.h</b>&gt;
+        depending on it. This also affects the choice of <a href="vendor_interface.html#option_2">own
+        namespace mode</a>.</p>
+        <p>Use of other new-style header names like <tt>&lt;<b>vector</b>&gt;</tt>
+        with STLport is highly recommended. </p>
+        <h2>allocator&lt;&gt;</h2>
+        <p>In STLport 3.12, the default <b>_Alloc</b> parameter to standard
+        container is always <b>allocator&lt;&gt;</b> (unlike in SGI STL, where
+        it is only so when the compiler supports partial specialization and
+        other new features).</p>
+        <h2>Underscored&nbsp; names</h2>
+        <p>All inernal names in STLport 3.12 starts with undercsore
+        ("_"), as specified by C++ standard.</p>
+        <h2><a name="new%20headers"></a>New-style C library headers</h2>
+        In this release, <b>_STLP_USE_NEW_STYLE_HEADERS</b> only controls
+        STLport choice of using new-style C library headers : &lt;cstdio&gt; vs.
+        &lt;stdio.h&gt;, etc.
+        <h2>Bitset - additional parameter</h2>
+        <p>SGI STL introduced extra template parameter BufSize for bitset : <b>_WordT,
+        </b>which defaults to unsigned long. For 64-bits architectures, you may
+        wish to change it to be long long. Note that explicit use of extra
+        parameter will lead to non-portability with other STL implementations.</p>
+        <h2>Deque - additional parameter</h2>
+        <p>SGI STL introduced extra template parameter BufSize for deque : <tt>deque&lt;class
+        T, class Alloc, size_t BufSize=0&gt;</tt>. <br>
+        That allows you to specify deque buffer size on per-instance basis. </p>
+        <p>Some compilers (<b>Borland, Visual, SunPro, ..</b>.) are unhappy
+        about non-type template parameters (particularly when deque is being
+        passed as parameter to functions). For these compilers, only default
+        buffer size option is available. You may still specify buffer size using
+        <tt>__deque__&lt;T,Alloc,BufSize&gt;</tt>. </p>
+        <p> Note that explicit use of extra parameter will lead to
+        non-portability with other STL implementations. You may force full
+        version to be the default ( <tt>deque&lt;class T, class Alloc=allocator&lt;T&gt;,
+        size_t BufSize=0&gt;</tt> ) by disabling <tt>_STLP_NON_TYPE_TMPL_PARAM_BUG</tt>
+        switch. Note that you may have problems instantiating template functions
+        taking deque as its argument then.</p>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/select_io.html b/main/source/stlport/doc/select_io.html
new file mode 100644
index 00000000..ed44bc44
--- /dev/null
+++ b/main/source/stlport/doc/select_io.html
@@ -0,0 +1,79 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Getting Started: Selecting IOStreams mode</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">Selecting IOStreams Mode</span>
+        
+        <h3><b>Major IOStream Modes</b></h3>
+
+	STLport 4.0 may be used in two different major modes :
+	<ul>
+	<li><b>With STLport iostreams (default)</b>. In this mode, you are going to use iostreams
+        and complex libraries provided by STLport. 
+        To do so, first you have to build STLport library from sources 
+        provided in "src" subdirectory and link your programs with it.
+        This is major change since pre-4.0 releases, please read the instructions carefully.</li>
+
+	<li><b>Without STLport iostreams</b>. In this mode, STLport will use wrappers around  
+	 your compiler's iostreams and complex libraries, just like in STLport 
+         releases prior to 4.0.</li>
+        </ul>
+
+	For any of these modes, please make sure 
+        <b>"stlport"</b> directory containing header files
+        is the <b>first</b> one in your include search path when you compile the project<br>
+
+        <h3><a name="no_sgi_iostreams"></a>Installing STLport for use without STLport iostream library ("wrapper mode")</h3>
+
+	In this mode, you will use wrappers around  your compiler's iostreams 
+	libabry, as in previous STLport releases.
+
+	All you	have to do to use STLport in this mode is to uncomment 
+        <b>_STLP_NO_OWN_IOSTREAMS</b> setting in <b>"stlport/stl/_site_config.h"</b>
+       to disable use of STLport iostreams and to use wrappers around your existing iostreams. 
+       (For SUN CC, you still have to go to "src" subdirectory and do "make" or at least "make prepare" to produce additional .SUNWCCh files necessary for compilation)
+
+       Note though :
+       <ul>
+       <li>For the most modern compilers which implements Koenig lookup properly, this option may not be available due to ambiguities during namespace lookup. Example: gcc-3.0</li>
+       <li>New-style ANSI iostreams and/or complex library 
+           may not be provided by your compiler vendor;</li>
+       <li>If provided, vendor iostreams may appear to be slower than STLport version.</li>
+       </ul>
+      If you have decided to disable STLport iostreams, you may stop reading here.
+      To use wrapper mode, you do not have to build any binary libraries, as everything you need
+      is contained in the header files already.
+      
+      <h3><a name="beta"></a>Building STLport iostreams library (Default Mode)</h3>
+
+  In this mode, you will use STLport implementation of iostreams instead of the one that comes
+  with your compiler. It does contain some non-template code so you have to build STLport 
+  iostreams library in <b>"src"</b> directory to link your project with. 
+
+  Below are step-by-step instructions to build STLport library:
+  <ol>
+  <li>Do make sure you have followed instructions for default installation above.</li>
+
+  <li>Go to <b>"src"</b> subdirectory. It contains various makefiles for different compilers.
+    If iostreams library is not yet ported to your compiler (please see <a href="release_notes.html">Release Notes</a> for details), you may revert to use "wrapper" mode or port it. Please refer
+    to <a href="porting_iostreams.html">porting document</a> to learn how to port iostreams library
+    to your compiler. The porting procedure is usually straightforward on UNIXes.
+</li>
+
+    <li>Using appropriate makefile, do <b>"make clean all"</b> to build STLport libraries
+    (makefiles are set up to build several different flavors - debug/nondebug,
+    static/dynamic versions).    
+    <i>Note : your make program may have different name, like "nmake" for Visual C++, so, with "nmake", do "nmake clean all"</i>
+</li>
+    
+<li>If make fails, you may try fixing the build yourself and/or report it to <a href="http://www.stlport.com/cgi-bin/forum/dcboard.cgi">STLport Forum</a>.
+</li>
+
+<li>Do <b>"make install"</b> to install resulting libraries into <b>"lib"</b> subdirectory. On Windows, this step also copies .dll libraries to system directory to be accessible at runtime.</li>
+
+</ol>
+
+<h3>Testing STLport</h3>
+   STLport provides two <b>test suites</b> - <a href="testsuite.html">regression
+   test</a> and <a href="eh_testsuite.html">exception handling test</a>.<br>
+   It is recommended that you build and run them in place to verify your new STLport installation is OK.
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/sgi_stl.html b/main/source/stlport/doc/sgi_stl.html
new file mode 100644
index 00000000..4c8b9a9c
--- /dev/null
+++ b/main/source/stlport/doc/sgi_stl.html
@@ -0,0 +1,86 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: SGI STL Overview</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">SGI Standard Template Library</span>
+
+        <h3>Overview</h3>
+        <p class="FOOTNOTE"><i>Silicon Graphics has made its implementation of the C++
+        Standard Template Library freely available to the public. The SGI
+        Standard Template Library features thread safety, improved memory
+        utilization, improved run-time efficiency, and new data structures,
+        including hash tables; it also includes a comprehensive conceptual
+        taxonomy of generic software components.</i></p>
+        <p><font size="1">cite from SF BA <a href="http://www.centeradv.com">Center
+        for Advanced Technology</a>&nbsp; C++&nbsp; ISG presentation</font></p>
+        Visit SGI <a href="http://www.sgi.com/Technology/STL">Standard
+        Template Library User's Guide</a> page to learn more about SGI STL. That
+        excellent site contain full STL documentation, distribution to download
+        and useful links.
+        <h3><a name="efficiency"></a>Efficiency</h3>
+        <p>These are major improvements that make SGI STL the most efficient:</p>
+        <ul>
+          <li><b>Rich set of algorithm specializations.</b> What everybody is
+            looking for in generic library,&nbsp; it's the <b>generic interface</b>,
+            not the <b>same code</b> for every type instantiated. Utilizing&nbsp;
+            <b>__type_traits</b> technique, SGI STL optimizes <b>copy(T*, T*, T*
+            )</b> call for <b>T</b> being builtin type into a single <b>memmove()</b>
+            call, and so on.</li>
+          <li><b>Node allocators.</b> SGI STL implements allocator&lt;T&gt; as a
+            wrapper over&nbsp; thread-safe node allocator engine which is
+            fine-tuned to handle allocation of relatively small chunks of memory
+            very efficiently.</li>
+        </ul>
+        <h3><b><a name="thread_safety"></a>Thread safety </b></h3>
+        <p>Please refer to SGI site for <a href="http://www.sgi.com/Technology/STL/thread_safety.html">detailed
+        document on thread safety</a>. Basic points are:</p>
+        <ul>
+          <li><b>simultaneous read access to the same container from within
+            separate threads is safe;</b></li>
+          <li><b>simultaneous access to distinct containers (not shared between
+            threads) is safe;</b></li>
+          <li><b>user must provide synchronization for all accesses if any
+            thread may modify shared container.</b></li>
+        </ul>
+        <h3><b>Exception safety</b></h3>
+        <p>SGI STL is exception-safe. STLport <a href="exception_safety.html">document
+        on exception safety</a> describes STL guarantees and client requirements.</p>
+
+        <h3><b>Standard compliance</b></h3>
+        <p>SGI STL is committed to close compliance to C++ Standard. With the
+        latest release in Feb 99 and experimental effort continued through 2000, 
+        it incorporates the latest "word of the standard".</p>
+        <h3><b>Reliability</b></h3>
+        <p>SGI STL is being shipped with GNU C++ since 2.8.x.<br>
+        That is enormous amount of installations which provide solid feedback to
+        get bugs fixed.</p>
+        <h3><b>Important extensions</b></h3>
+        <p>SGI STL provides the following extensions compared to the C++
+        standard:</p>
+        <ul>
+          <li><b>hashed containers:</b> hash_set, hash_multiset, hash_map,
+            hash_multimap.</li>
+	  <li><b>single-linked lists</b> - often very reasonable tradeoff.</li>
+          <li><b>ropes:</b> alternative representation of strings which scale
+            well to very large strings</li>
+        </ul>
+        <h3>Public distribution</h3>
+        <p>SGI STL is being distributed free of charge and restrictions:</p>
+        <p><b><i>Copyright (c) 1994 Hewlett-Packard Company</i></b></p>
+        <p><b><i>Copyright (c) 1996,97 Silicon Graphics Computer Systems, Inc.</i></b></p>
+        <p><i><font size="2">Permission to use, copy, modify, distribute and
+        sell this software and its documentation for any purpose is hereby
+        granted without fee, provided that the above copyright notice appear in
+        all copies and that both that copyright notice and this permission
+        notice appear in supporting documentation. Hewlett-Packard Company makes
+        no representations about the suitability of this software for any
+        purpose. It is provided "as is" without express or implied
+        warranty.</font></i></p>
+        <p><i><font size="2">Permission to use, copy, modify, distribute and
+        sell this software and its documentation for any purpose is hereby
+        granted without fee, provided that the above copyright notice appear in
+        all copies and that both that copyright notice and this permission
+        notice appear in supporting documentation. Silicon Graphics makes no
+        representations about the suitability of this software for any purpose.
+        It is provided "as is" without express or implied warranty.</font></i>
+		</p>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/story.html b/main/source/stlport/doc/story.html
new file mode 100644
index 00000000..20edb240
--- /dev/null
+++ b/main/source/stlport/doc/story.html
@@ -0,0 +1,43 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: History</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+<span class="heading">STLport Story</span>
+
+<address class="FOOTNOTE">by Boris Fomitchev</address>
+
+<h3>First Step</h3>
+
+I started STLport project in Jan'97, shortly after first release of SGI STL.
+Back then, I was working for <a href="http://www.elbrus.ru">Moscow Center for SPARC Technology</a>.
+I made a quick-and-dirty port of SGI STL for gcc-2.7.2 and SUN CC 4.2 for internal use. 
+Very proud of myself, I submitted my changes back to SGI team. 
+Matt Austern (still leading library developer) was kind enough to respond to me. 
+However, I realized SGI team were not interested at all in extra portability. So I built my own Web page and started distributing my humble port from there.
+I named it "Adapted SGI STL" (weird, huh ?). Reasonable name appeared only a few months later.
+
+
+<h3>"With a little help..."</h3>
+
+Once the initial port availability was announced, I started to receive strong feedback from
+users. Many people happened to be interested and willing to contribute to this development.
+With their help, it only took me a few months to port it to most popular compilers.
+At the same time, I started to realize infinite potential for improvements in this library.   
+
+<h3>Going Ahead</h3>
+
+The first time STLport went ahead of SGI STL was introduction of exception handling support. Dave Abrahams implemented exception-safe standard containers and algorithms on the base of SGI STL to present to ANSI C++ Commitee. At the time, no EH guarantees/requirements were present in the draft standard. Dave proposed to merge his changes into STLport, for maintenance reasons, which I happily did. In the meantime, SGI somewhat independently implemented the exception-safety guarantees in the proposal Dave brought before the committee with Greg Colvin. The STLport exception-handling testsuite was instrumental in getting these implementations right. Dave and Greg managed to get the proposal approved by the standards commitee, due in part to the existence of two working implementations. 
+
+<h3>Making the Difference</h3>
+
+Debug Mode was implemented after "Safe STL" (debug version of HP STL, by Cay Horstmann) in 1997. It is still the feature which makes STLport different from all other standard libraries. No matter how simple the idea of this mode might look, it took several complete redesigns to get it to its current level. I am very pleased to be able to present this unique feature.
+ 
+<h3>Letting Go</h3>
+
+I have to confess that there was a time when I was serious about selling STLport as a commercial library.
+It took me two years to get a slight idea of how the industry works. So I decided to stick with open source.
+
+<h3>Growing Up</h3>
+Using open source component does not necessarily mean relying on self-maintenance and volunteers good will. 
+In 1999, STLport Consulting, Inc. was founded. We offer STLport support contracts as well as custom development and
+other consulting services. You may reach us at <a href="mailto:consulting@stlport.com">consulting@stlport.com</a>.
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/testsuite.html b/main/source/stlport/doc/testsuite.html
new file mode 100644
index 00000000..f0321c35
--- /dev/null
+++ b/main/source/stlport/doc/testsuite.html
@@ -0,0 +1,52 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Testsuite</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">STLport Test Suite</span>
+<p>
+        <font size="1"><em><strong>by Boris Fomitchev</strong></em></font>
+</p>
+        <h2>Abstract</h2>
+        <p><b>STLport test suite performs extensive test of</b> <b>basic STLport
+        functionality</b>.<br>
+        One of the problems one is faced when deciding whether using STL is the
+        question of reliability. It's a common place when compiler crashes on
+        templates.<br>
+        Obvious question is - how can I be sure the compiler produces valid code
+        when it does <b>not</b> crash ?&nbsp; <br>
+        This test suite answers to this question. It doesn't use too complex
+        construct with STL items. But it does instantiate about every item and
+        checks if it works properly.</p>
+        <h2>The Story</h2>
+        <p>This test suite is derived from <a href="http://www.cygnus.com">Cygnus
+        Solutions</a> STL test suite, which is based on <a href="http://www.objectspace.com">ObjectSpace
+        </a>STL examples. The changes that have been made mostly involve
+        restructuring. You can run a single short test for particular STL
+        construct , or try to compile them all and link to single executable.
+        You may also test if your compiler can handle extremely long source
+        files by compiling a single source including all others.</p>
+        <h2>Portability</h2>
+        <p>Makefiles for most supported compilers are provided with the suite. Look for <i>.mak</i>
+        files in the distribution. It should be not difficult to adjust one of
+        them to your compiler.</p>
+        <h2>How To</h2>
+        <p>The test suite comes in directory <b>test/eh</b> with your STLport
+        distribution.<br>
+        You may have to edit appropriate makefile to fit your compiler and
+        include directories . <br>
+        After you've done, try "<i>make check</i>". This target is
+        output (<i>stl_test.out</i>) of single executable containing all the
+        tests. <br>
+        Compare it with <i>stl_test.exp</i> output. There should be no
+        differences. Note that some tests use random number generators. <i>stl_test.exp</i>
+        is for those having <b>lrand48()</b> function. If your configuration
+        uses <b>rand() </b>function, you should compare the result with <i>stl_test.rand.exp</i>.
+        Obviously, <b>there is no guarantee for matching of different rand()
+        implementations</b>.<br>
+        If some test fails to compile, you may try "make <i>test_name</i>.out"
+        to produce single test executable and run it.</p>
+        <h3>Linux (glibc)&nbsp;note</h3>
+        <p>GNU&nbsp;libc, being used widely on Linux platforms, has different
+        random generator implementation than one used on most UNIX platforms.
+        You should ignore the output difference of tests using random generator.
+				</p>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/thanks.html b/main/source/stlport/doc/thanks.html
new file mode 100644
index 00000000..d849dfe1
--- /dev/null
+++ b/main/source/stlport/doc/thanks.html
@@ -0,0 +1,198 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Acknowledgements</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+        <span class="heading">Acknowledgements</span>
+        
+        <p>Special thanks to:</p>
+        <ul>
+<li><b>Alexander Stepanov</b> for his fundamental work;</li>
+        <li><b>Matt Austern</b>, for his valuable collaboration</li>
+          <li><b>Dave Abrahams</b>, for his continuous help, exception-handling code contribution,
+            EH testsuite and Metrowerks support</li>
+          <li><b>Cay Horstmann</b>, for debug approach example</li>
+        </ul>
+        Thanks to all <b>contributors</b> who
+        have submitted bug reports, patches and suggestions:
+  <table border="0" cellpadding="4" cellspacing="0" align="center">
+  <tr>
+  <td align="left">
+        <dir>
+          <li>Matt Austern</li>
+          <li>Lo Russo Graziano</li>
+          <li>Kevin G. Walker</li>
+          <li>Enno Rehling</li>
+          <li>Jan Didrik Andersen</li>
+          <li>Cheng-Yen (Vinnie) Liang</li>
+          <li>Jeff Hanson</li>
+          <li>Matt Brincho</li>
+          <li>Oleg Alexsandrovich</li>
+          <li>Martin Abernethy</li>
+          <li>Eelco de Lange</li>
+          <li>Warren Young</li>
+          <li>Dave Abrahams</li>
+          <li>Damian Gilmurray</li>
+          <li>Mark Wells</li>
+          <li>Jeremy Grodberg</li>
+          <li>Ralph Zeller</li>
+          <li>Julian C. Cummings</li>
+          <li>Josh Levenberg</li>
+          <li>Egor Elagin</li>
+          <li>Sean Donnelly</li>
+          <li>Eric Bloodworth</li>
+          <li>Harri Heimo P Hakula</li>
+          <li>John Maddock</li>
+          <li>Per Sabelstrom</li>
+          <li>Franck Lebastard</li>
+          <li>Jeff Greif</li>
+          <li>Marcelo Cantos</li>
+          <li>John Stevenson-Hoare</li>
+          <li>Ryszard Kabatek</li>
+          <li>Eugene Lazutkin</li>
+          <li>David Polock</li>
+          <li>Steve Barnes</li>
+          <li>Chris McKillop</li>
+          <li>Dan Candela</li>
+          <li>Joost Kraaijeveld</li>
+          <li>Raymond Nijssen</li>
+          <li>Paul Maragakis</li>
+          <li>Max Moroz</li>
+          <li>Mark Elbrecht</li>
+          <li>Steven Youngs</li>
+          <li>Joe Buck</li>
+          <li>Doni Grande</li>
+          <li>Catherine Lung</li>
+          <li>Joachim Achtzehnter</li>
+          <li>Steven Woolgar</li>
+          <li>Michael Carr</li>
+          <li>Simon-Pierre Cadieux</li>
+          <li>Tinny Ng</li>
+          <li>Bjorn Fahller</li>
+          <li>Alexander Vanic</li>
+          <li>Roland Hoogendijk</li>
+          <li>Chichiang Wan</li>
+          <li>Chris Atwood</li>
+          <li>Esser Arno</li>
+          <li>Gary Powell</li>
+          <li>Guy Gascoigne</li>
+          <li>Ilya Sharapov</li>
+          <li>Aldona Majorek</li>
+          <li>Tsutomu Yoshida</li>
+          <li>Vasile Gaburici</li>
+          <li>Clive Bluston</li>
+          <li>Harold Putman</li>
+          <li>Hongyao Zhu</li>
+          <li>Stephane Rouleau</li>
+          <li>Robert Kopac</li>
+<li>Steven Serocki</li>
+<li>Matti Rintala</li>
+<li>Ilya Chvetsov</li>
+<li>Edward Ball</li>
+<li>Mike Pyle</li>
+<li>Todd Richmond</li>
+<li>Gavin Wood</li>
+<li>Alain Miniussi</li>
+<li>Michael Entin</li>
+<li>Kevin Wooten</li>
+<li>Kees de Bruin</li>
+<li>Parcival Willems</li>
+<li>Anton Sergeev</li>
+<li>Todd Rider</li>
+<li>Niran Bala</li>
+<li>Will Fike</li>
+<li>Petr Ovchenkov</li>
+<li>Marc W. Mengel</li>
+<li>Willie Arbuckle</li>
+<li>Matthew Kelly</li>
+</dir>
+</td>
+<td align="left">
+<dir>
+<li>Mikhail Leonov</li>
+<li>E.Musser</li>
+<li>Andrew Waters</li>
+<li>Bruce Alderson</li>
+<li>Ben Nason</li>
+<li>Danny Smith</li>
+<li>Andrey Khovanskiy</li>
+<li>Ben Liblit</li>
+<li>Mike Steed</li>
+<li>Sean Cavanaugh</li>
+<li>John Hynes</li>
+<li>Glen Summers</li>
+<li>Dirk Schreib</li>
+<li>Jeff Sparkes</li>
+<li>Ricardo Gayoso</li>
+<li>John Wiegley</li>
+<li>Craig Powers</li>
+<li>Bryan Byrnes</li>
+<li>Vijay Ramachandran</li>
+<li>Ed Brey</li>
+<li>Matthew Collins</li>
+<li>Jack Andrews</li>
+<li>Bernd Mohr</li>
+<li>Charles Burfoot</li>
+<li>Brett Denner</li>
+<li>Serge Pashkov</li>
+<li>George Trojan</li>
+<li>Bruce Dawson</li>
+<li>Adam Gates</li>
+<li>Levente Farkas</li>
+<li>Mark Laffoon</li>
+<li>Holger Stasch</li>
+<li>Anton Lapach</li>
+<li>Ingo Donasch</li>
+<li>Jack Andrews</li>
+<li>Jason Taylor</li>
+<li>Thomas Witt</li>
+<li>Mat Marcus</li>
+<li>Jesse Jones</li>
+<li>Jim Cole</li>
+<li>Rene van Oostrum</li>
+<li>Kenny Simpson</li>
+<li>Gerd Hoeren</li>
+<li>Tom Widmer</li>
+<li>Vadim Egorov</li>
+<li>Dean Sturtevant</li>
+<li>Gavin Collins</li>
+<li>Alberto Barbati</li>
+<li>Todd Wilson</li>
+<li>Per Liboriussen</li>
+<li>Michael Rauch</li>
+<li>Tanes Sriviroolchai</li>
+<li>Patrick Luby</li>
+<li>Joachim Achtzehnter</li>
+<li>Phillip Toland</li>
+<li>Val Melamed</li>
+<li>Johannes Brunen</li>
+<li>Sergei Nikolaev</li>
+<li>Levente Farkas</li>
+<li>Rainer Schnitker</li>
+<li>Carlos Paniago</li>
+<li>Yotam Medini</li>
+<li>Anton Ephanov</li>
+<li>Doug Gilbert</li>
+<li>Steven Green</li>
+<li>Andreas Malzahn</li>
+<li>Whitney Kew</li>
+<li>Dan Ingold</li>
+<li>Ed James-Beckerman</li>
+<li>John Daniel</li>
+<li>Marcello Pietrobon</li>
+<li>Mukesh Kapoor</li>
+<li>Jens Maurer</li>
+<li>Stephen Baker</li>
+<li>Thomas Meischner</li>
+<li>Bruce Florman</li>
+<li>Paul Ghezzi</li>
+<li>Tobias Ernst</li>
+<li>Steve Loves</li>
+<li>Piers Haken</li>
+<li>Michael Kopp</li>
+<li>Synge Todo</li>
+        </dir>
+      </td>
+    </tr>
+ </table>
+
+
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/use_stlport.html b/main/source/stlport/doc/use_stlport.html
new file mode 100644
index 00000000..81578989
--- /dev/null
+++ b/main/source/stlport/doc/use_stlport.html
@@ -0,0 +1,27 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Getting Started: Compiling with STLport</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+   <span class="heading">Compiling Your Project with STLport</span>
+
+    <p>
+    Please make sure 
+    <b>"stlport"</b> directory containing header files
+    is the <b>first</b> one in your include search path when you compile the project</p>
+<p>
+    <i>Note: for SunPro CC 5.0 and higher, there is special directory <b>"stlport/SC5"</b>
+       to be set in search path due to specific SUNpro search rules)</i>
+		</p>
+
+   <h3>Special Notes for STLport as a dynamic library</h3>
+		<p>
+   When using STLport as a dynamic library, please make sure you put in the <b>PATH</b>
+   and distribute it together with your executable. This extra dependency is certainly
+   in favor of using static linking. However, if your project deploys any
+   Win DLL's using STLport, you <b>have</b> to use STLport as Win DLL, too. This is because
+   it contains some static variables (like <b>cerr</b> stream) which would otherwise be duplicated
+   in every DLL. This problem does not arise in Unix world.</p>
+   <p>
+   <i>[ Visual C++ specific ]</i> If using STLport as DLL, please be sure to use <b>/MD[d]</b> 
+   compiler option to pick up all dynamic libraries.
+		</p>
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/vendor_interface.html b/main/source/stlport/doc/vendor_interface.html
new file mode 100644
index 00000000..df96c398
--- /dev/null
+++ b/main/source/stlport/doc/vendor_interface.html
@@ -0,0 +1,48 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Native C++ Library Interface</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+
+        <span class="heading">STLport and Vendor's C++ Library</span>
+        <p>Modern compilers come with more or less complete ANSI standard C++
+        library.&nbsp; <a name="native"></a>Below, term "<b>native</b>"
+        is being used to refer to standard C++ headers and object code libraries
+        supplied with the compiler.</p>
+
+        <p>The problem that arises when you want to use STLport with them, is
+        that putting STLport into namespace <b>std::</b> may violate <b>ODR</b>(One
+        Definition Rule). This can happen if some parts of <a href="#native">native</a>
+        library (such as <b>string</b>, <b>locale, iostream</b>) are
+        instantiated already and <b>compiled into</b> native runtime C++ support
+        libraries.</p> <br>
+
+        Example : Visual C++ 6.x
+
+        <p> In practice, if the compiler supplies&nbsp; new-style <b>&lt;iostream&gt;,</b>
+        you have this problem almost for sure - typically that means you have
+        some <b>&lt;string&gt;</b> stuff compiled into native C++ object
+        library. The clash can happen even if you do not utilize new-style
+        iostreams.</p>
+
+	<p>Even if you use STLport with its own iostreams, which means your code do not 
+	use any part of native C++ standard library, you may still encounter clashes at
+	link stage. Just magine using 3rd-party lib which was compiled with
+	native library.<br> </p>
+	<p><b>To resolve this namespace conflict, after long experiments,
+	it was decided to put STLport into its own namespace "_STL::"</b>.
+	<br>
+        This provides seamless drop-in compatibility and ensures no conflicts 
+       are ever possible.</p>
+
+        <p>To provide more portability for your code and to make sure 
+        you use <b>_STL::</b> components,
+	not the native <b>std::</b> one, <i>STLport provides macro redefinition 
+        of <b>std::</b> into <b>_STL::</b></i>. 
+        This is completely transparent to the user. </p>
+	<p>
+        As STLport code uses namespace different from <b>std::</b>, 
+        it never clashes with native library - neither at compile nor at link time.
+	</p>
+       <p>For the most modern compilers which implements Koenig lookup properly, "wrapper mode" w/o STLport iostreams may not be available due to ambiguities during namespace lookup. Example: gcc-3.0.
+		</p>
+
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/doc/wrappers.html b/main/source/stlport/doc/wrappers.html
new file mode 100644
index 00000000..189208ce
--- /dev/null
+++ b/main/source/stlport/doc/wrappers.html
@@ -0,0 +1,52 @@
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>STLport: Wrappers Technique</title><link href="doc.css" type="text/css" rel="stylesheet"></head><body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" vlink="#314A30" link="#314A30" text="black" bgcolor="white"><table border="0" cellspacing="0" cellpadding="0"><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img border="0" height="14" width="1" src="images/trans.gif"><br><a href="../index.html"><img src="images/stl_logo_doc.gif" border="0" height="80" width="80"></a><a href="http://www.stlport.com"><img border="0" height="80" width="461" src="images/t_doc2.gif"></a><br><img src="images/trans.gif" border="0" height="24" width="1"><br><img src="images/black.gif" border="0" height="1" width="776"><br><img src="images/trans.gif" border="0" height="24" width="1"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="10" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776">
+
+
+        <span class="heading">Wrapper Technique in STLport</span>
+<p>
+        Considerable point of non-portability was the lack of default
+        template class parameters in many compilers. C++ template syntax doesn't
+        allow an easy way to hide that behind any macro magic.
+        <br>STLport uses wrapper technique to work around that:<br>
+        Full functionality for <i>'container'</i> is implemented via class <i>'__container__'</i>.
+</p>
+        <p>For example:</p>
+        <pre><tt>#ifdef _STLP_DEFAULT_TYPE_PARAM
+template &lt;class T, class Alloc = alloc&gt;
+#else
+#&nbsp; define vector __vector
+template &lt;class T, class Alloc&gt;
+#endif
+class vector {
+public:
+......
+#ifdef _STLP_DEFAULT_TYPE_PARAM
+define __vector__ vector
+# else
+template &lt;class T&gt;
+class vector : public __vector__&lt;T,alloc&gt;&nbsp;
+{
+.....
+#define __vector__ __vector
+# endif /* _STLP_DEFAULT_TYPE_PARAM */</tt></pre>
+        So, you are provided with two versions of container: with and without
+        default parameters. It buys you a way to access full functionality while
+        not breaking code using the short notation. <br>
+        If you wish to specify the allocator parameter, use <tt>__vector__</tt>.
+        For default alloc parameter, use <tt>vector</tt>. <br>
+        I would recommend that you <tt>#define</tt> some alias for <tt>__vector__</tt>,
+        to be able to switch easily. <br>
+        If you don't use different allocators, don't bother.
+	<p><b>New in STLport 3.2:</b><br>
+	<tt>_STLP_MINIMUM_DEFAULT_TEMPLATE_PARAMS</tt> switch is introduced for user to take control
+        of wrappers behavior with classes that have more than one default template argument. With this switch defined,
+	STLport will use minimum set of default arguments on  template classes that have more than one - 
+        for example map&lt;&gt;, set&lt;&gt;. 
+        This is supposed to help compiling existing standard code which use shortest notation.</p>
+
+        <p>Here is the list of compilers that cannot handle <b>dependant</b>
+        default template parameters:<br>
+        SunPro CC, BC++ 4.52, VC++ 4.2, xlC 3.1.4, DEC C++ 5.5, Visual Age C++
+        3.0.</p>
+
+
+</td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="20" width="50"><br><a href="index.html">Table of Contents</a><br></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="40" width="80"><br><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/black.gif" border="0" height="1" width="776"></td></tr><tr valign="top" align="left"><td width="24"><img src="images/trans.gif" border="0" height="1" width="24"></td><td width="776"><img src="images/trans.gif" border="0" height="5" width="50"><br><span class="copyright">Copyright 2001 by STLport</span><br><img src="images/trans.gif" border="0" height="50" width="80"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/main/source/stlport/etc/ChangeLog b/main/source/stlport/etc/ChangeLog
new file mode 100644
index 00000000..56bc2d23
--- /dev/null
+++ b/main/source/stlport/etc/ChangeLog
@@ -0,0 +1,996 @@
+The following changes were made in 4.6 since 4.5.3 release:
+  ---
+  * A few ANSI conformance fixes (thanks Richard Peng)
+  
+  * Performance optimization for string::reserve (thanks Marc)
+	
+  ---
+	
+  * icc patches applied (Thanks Blaine Kubesh)
+	
+  * _thread.c, _thread.h: merged thread redesign from CVS (thanks Petr Ovchenkov)
+	
+  ----
+	
+  * iostream.cpp, locale_impl.cpp : static initialization made robust for case of 
+    dynamic loader circular depandancies (Thanks Alexey Sarytchev for the report)
+	
+  ----
+	
+  * _function.h : integration of a new workaround for mem_fun_* family 
+                  for compiler having return void bug (Thanks Pavel Kuznetsov).
+
+  * stl_solaris.h : v8plus compilation fix (Thanks Mukesh Kapoor)
+
+  * num_put_float.cpp : FreeBSD fix 
+
+  * _construct.h : fixed case for compilers with default integer
+  constructor bug
+	
+  ---
+	
+  * fstream.cpp : text file stream position bug correction (thanks Christopher Kohlert)
+  ---
+  * _num_put.c : Correction of the display of the min 64 bits signed integer values
+                 like numeric_limits<__int64>::min() on WIN32 for instance (thanks Anders Dalvander)
+  ---
+  * _num_put.c : Add of the '+' sign when requested for the unsigned integer display 
+                 (thanks Francois Dumont)
+  ---
+  * debug : many missing iterator invalidation corrected (thanks Detlev V.Davidson and Francois Dumont)
+  ---
+  * _new.h : introduction of a new config compiler switch for those which do define
+             bad_alloc but that do not throw it! (thanks ?)
+  ---
+  * _new.h : class nothrow_t changed to struct nothrow_t (Thanks Francois Dumont)
+	---
+	* _bvector.h : Addition of the |= and &= operator on the _Bit_reference struct (thanks Ed Rice)
+	---
+	* Performance bug in type_traits.h fixed (Thanks Francois Dumont)
+	---
+	* Added Linux spin lock code ()
+	---
+    * Added GCC-3.x configurations
+
+	* Fixed HP aCC support
+
+	* Added OpenWatcom support
+	
+	* version numbers bumped
+
+	* iostreams ported to EMX (gcc on OS/2) (Thanks Martin Schaffoener)
+
+	* iostreams ported to CRAY Unicos C90, T90, and J90 (Thanks Geir Johansen)
+	
+	* stl_sunpro.h : fixed mbstate definition for SUN 4.2 (thanks  lengzq)
+
+	* complex.cpp, _complex.h : template<> used for specializations
+
+	* _num_put.c : unised locale variable removed (thanks Petr Ovchenkov)
+
+	* _algo.h : __reverse beautified (thanks Kabanov)
+
+	* dll_main.cpp : force_link() forced to be linked in
+
+	* stl_msvc.h : config changes for .NET
+
+	* _auto_ptr.h : "struct" changed to "class"
+
+	* _istream.c : M_read_unbuffered fixed (thanks  Stefan Schwarzer )
+ 	
+	* stl_gcc.h : added missing inclusion for SCO platform (thanks Emmanuel Soden)
+
+	* _tree.c : optimized insert_unique (thanks Timothy)
+
+	* _algo.c : relaxed type requirements for lower_bound, upper_bound, binary_search
+
+	* _algo.h : adjacent_find() expressed with compare-function flavour
+
+	* cpp_runtime/typeinfo : made adjustments for .NET (Thanks Daniel)
+
+	* cstd/cassert : guard removed (thanks Evan Cheng)
+	
+The following changes were made in 4.5.3 since 4.5.1 release:
+
+	* iostreams ported to Windows CE (thanks Andrew Waters)
+
+	* iostreams ported to AmigaOS (thanks Steven Solie)
+
+	* iostreams ported to NCR 3.x (thanks Emmanuel Soden)
+	
+	* _hash_map::operator[] : enhanced to avoid calling default object constructor
+	 (Thanks Yuri Taranenko for the report)
+
+	* Identifier "__value" changed everywhere to "__val" to avoid clashes with Microsoft's "managed C++" keyword (thanks Crow for the report)
+
+	* Most containers : swap() fixed to swap non-stateless allocators correctly (thanks Scott Meyers)
+
+	* _sstream : fix to account for ios_base::app flag properly
+
+	* type_traits.h : _IsOKToMemCpy() fixed to only allow memcpy() for same type arguments (thanks  Ed Brey for the report)
+	
+	* stl/_num_put.c, stl/_list.c : workarounds for Debian gcc (thanks Levente Farkas)
+	
+	* <typeinfo> : fixed MS workaround (thanks  Wil Evers,  Andrew Ushakov)
+
+	* _pthread_alloc.h : added per_thread_allocator class; returns memory to the same thread it's been allocated in.
+
+	* _iterator_old.h : restored ->() operator for MSVC (thanks Daniel Anderson)
+
+	* a bunch of MPW fixes (thanks Tsutomu Yoshida)
+
+	* _config_compat.h : fixed compatibility definition for _STLP_NO_EXCEPTIONS (thanks Nicolas)
+
+	* _fstream.c : fixed bug in _M_seek_init (thanks Pavel Kuznetsov)
+	
+	* _rope.h : rope<>::swap() methods fixed for non-partial ordering case (thanks Eric Musser)
+ 	
+	* comlex_trig.cpp : fixed bug on SGI (thanks Mortis)
+
+	* A bunch of fixes for HP aCC compilation with -AA option (thanks  John Bossom)
+
+	* *.c files : added conditional inclusion of corresponding *.h file to fix xlC issues with -tempinc option (thanks Alla Bogolyubov for the report)
+
+	* _auto_ptr.h : "struct" changed to "class" (thanks Alex Pinsker for the report)
+
+	* _config.h/stl_user_config.h : handling of macro _STLP_WHOLE_VENDOR_STD rectified
+
+	* _num_put.c : do_put(const void*) changed to output pointers in hex format (thanks  Alex Rosenberg)
+
+	* test/eh/test_algobase.cpp : fixed alignment to work on 64-bit architectures
+
+The following changes were made in 4.5.1 beta 1 since 4.5 release:
+
+	* _config.h, _epilog.h : new namespace inclusion schema implemented for own iostreams mode
+	 (no std:: redefinition; _STL:: namespace imported into std::, instead of std:: imported to _STL.
+	  C library header files wrappers become obsolete if this mode is used and no own namespace is selected.
+	  They will be moved out to distinct directory in the next release, and default is going to be no own namespace 
+	  with own iostreams.)
+ 	  For some compilers (VC6), this only works with _STLP_NO_OWN_NAMESPACE and _STLP_OWN_IOSTREAMS settings. 
+	
+	* iostreams ported to SCO OpenServer (thanks Emmanuel Soden)
+
+	* sparc_atomic.s : added "stbar" to fix multiprocessor crashes on SPARC
+
+	* dll_main.cpp : forced link of Bs_G static data members (thanks  Sandy Martel). Function wrapped in STLport namespace.
+
+	* _alloc.c : fixed _STLP_CHUNK_MALLOC for debug malloc configuration (thanks  Markus Schöpflin)
+
+	* _config_compat.h : fixed compatibility section for _STLP_NO_OWN_IOSTREAMS
+
+	* fstram.cpp , vc6.unicode.mak : fixed bug in wide streams handling for VC6 (thanks Jim Dolter)
+
+	* etc/*.txt : files list broken up into several categories for future reorganization
+
+	* stl_msvc.h : fixed library selection for .NET (Thanks Franz Zetting)
+
+	* _ftsream.h, iostream.cpp : fixed compilation for _STLP_NO_EXTENSIONS case (thanks  Ben Dorman for the report)
+
+	* char_traits.h : fpos<> operators == made members (thanks  Thomas Witt)
+
+	* _threads.h : added using directive for Solaris x86 compile (thanks Mukesh Kapoor)
+
+	* _threads.h : fixed InterlockedXXX definitions for VC++ 6.0 SP5 (thanks AndreasM)
+
+	* gcc-install-apple-macosx.mak : INSTALL_STEP set to install_unix (Thanks Tron Thomas)
+
+	* common.mak : default install directory for Unix set to /usr/local
+
+	* _string.h : _M_null expressed via _STLP_DEFAULT_CONSTRUCTED (Thanks Anthony)
+
+	* _site_config.h : made sure _STLP_NO_THREADS are set if _NOTHREADS is on (Thanks Jeppe Madsen)
+
+	* _config.h : _STLP_WIN32THREADS is set (bugfix) ( thanks to Andreas Malzahn )
+
+	* _num_put.c, common_rules.mak : patches by Levente Farkas 
+
+	* etc/STLport-4.5.1.spec : spec file to build STLport-4.5.1 RPM added (thanks Levente Farkas)
+
+	* _auto_ptr.h , _debug.c, _debug.h : debug check for auto_ptr pointer added (thanks Gerd Hoeren for the idea)
+
+	* debug/_vector.h : invalidation for erase() corrected not to invalidate current iterator (Thanks ALberto Barbati)
+
+	* stl_bc.h : restored automatic library link directive for cases when STLport is not a native library
+
+
+	* _auto_ptr.h : template constructor conversion bug fixed (thanks mbergal)
+
+	* MIngw32 patches integrated (thanks Wu Yongwei)
+
+	* src/complex_impl.h : case for DEC CXX changed to general, instead of extension functions for float and long double, to get it compliled with CC 6.1 (thanks Tony McConnell) 
+
+	* dll_main.cpp : added __malloc_alloc instantiation (thanks Michael Ehrig)
+
+	* _debug.c : fixed race condition in _M_detach (thanks Achim Stremplat)
+
+	* test/*/hpacc.mak : fixed flags and libs (thanks  Michael Ehrig)
+
+	* typeinfo : added fix for MS VC ::bad_cast confusion (thanks Alberto Barbati)
+	
+	* debug/_vector.h : removed extra guard for MSCV around member template constructor (thanks Alberto Barbati)
+	
+	* _fstream.h : added extension basic_fstream<> constructors taking protection parameter (thanks Mukesh Kapoor for the idea)
+
+	* stl_sunpro.h : added additional C include directory choice for Solaris 6&7 (thanks John E. Bossom)
+	
+        * _vector.c : added _vector.h inclusion for _STLP_LINK_TIME_INSTANTIATION case (thanks Alex Vanic)
+
+
+	* _num_put.c : fixed overflow case with grouping (thanks Will Evers)
+	
+	* _istreambuf_iterator.h : fixed distance_type return type (thanks Anthony Williams)
+
+	* debug/_vector.h : debug version of push_back() added (thanks)
+
+	* Iostreams ported to LynxOS 3.0 (thanks Dmitry Azovtsev)
+ 	
+	* wrappers/*.h : added inclusions of the master header to fix xlC 3.x compile (Thanks Dmitry Azovtsev)
+
+	* Changes for BCB6 integration (thanks Nathan York)
+
+	* Removed all dead code blocks marked by #if OBSOLETE and #if 0
+
+	* Updates build spec file for Linux rpm (thanks Levene Farkas, Harold van Oostrom)
+
+	* complex_trig.cpp : limits changed to be static, for performance optimization (thanks Sergei Nikolaev)
+
+	* _algo.c : eliminated default-constructed iterators, to lift unnecessary restriction (thanks Tonci Tomic )
+ 	
+	* _vector.h : fixed bug in assign() : copy used instead of __copy_aux (Thanks Tim Finer)
+
+	* stl_sunpro.h : restored _STLP_HAS_NO_NEW_C_HEADERS switch for SUN CC 4.2
+
+	* <new> : __stl_new definition put into the namespace (thanks Satoshi Nakamura)
+
+	* bcb*.mak : fixed md command and DYN_LINK (thanks Kirby Zhou)
+
+	* stl_user_config.h : added _STLP_USE_CUSTOM_CHAR_TYPES_IO switch to optimize iostreams for default case
+	
+	* debug/_vector.h : fixed debug check bug (thanks Gerd Hoeren)
+
+	* _alloc.h : allocator::construct uses std::_Construct (thanks Gert Grossmann)
+
+	* stl/_alloc_old.h : restored (thanks Gert Grossmann)
+
+	* stl/_threads.h : fixed _STLP_ATOMIC_xxx macros for DEC (thanks Gert Grossman)
+
+	* src/_locale_impl.cpp : added missing guards for codecvt<> in _STLP_NO_MBSTATE_T case
+ 	
+	
+The following changes were made in 4.5 release since 4.5 beta 8 :
+	
+	* _threads.h, debug/_debug.h etc : STLport iostreams library made binary compatible with user code compiler w/o multithreaded switch, for some platforms
+	
+	* config/stl_msvc.h, <cmath> : corrected _STLP_NO_USING_FOR_GLOBAL_FUNCTIONS for VC++ 6.0 SP5 
+	  (Thanks Alberto Barbati)
+
+	* src/vc6.mak : RC macro definition restored (Thanks Graham)
+
+	* stl/_cmath.h, <cmath> : parts of code moved to <cmath> as <valarray> uses it (Thanks Synge Todo)
+
+	* stl/_tree.c : fixed insert_unique() with a hint bug (Thanks Serge Pashkov)
+ 	
+	* src/gcc-*.mak : removed -nostdinc++ option
+
+	* stl_solaris.h : definition of _STLP_SUNPRO_EXCLUDE made dependant on _XOPEN macro instead of SUN CC macros (Thanks ecohen for the report)
+
+	* fstream.cpp : mmap_chunk made to be 1M instead of 16M as was originally intended (thanks Alexey Starikovskiy)
+	* stl_sunpro.h : _STLP_LIMITED_DEFAULT_TEMPLATES not defined for compat mode anymore ( thanks Michael Kopp)
+	* dll_main.cpp : added instantiation for _Swap_lock_struct<> (thanks simonb)
+
+	* _ostream.c : fixed formatting bug for width()==1
+
+	* config/_epilog.h : added option pop section for Borland. 
+
+	* stl/_threads.h : fixed InterlockedXXX declarations for MS .NET (thanks Piers Haken)
+
+	* vc7.mak makefile added for MS VC++ 7.0 (.NET)
+
+	* fixed _STLP_ITERATOR_CATEGORY, etc. for Mwerks CodeWarrior 5.0
+
+	* stl/_num_put.c : fixed operator<<(void*) to use _STLP_LONG_LONG where available.
+
+	* _STLP_WHOLE_VENDOR_STD option is back supported (Thanks anton ephanov for the input)
+
+	* _cmath.h : added guard to mask additional overloads (thanks Tim Smith)
+
+	* stl_solaris.h : mbstate_t stuff defined here, old-style C headers used (Thanks Mukesh Kapoor)
+
+	* type_traits.h : __default_constructed() inlined (Thanks Matt Davies)
+
+	* new.h : fix for gcc-3.0 to look in backward directory (Thanks Ken) 
+
+	* stlport/using/h/streambuf.h added (Thanks Gennadiy)
+
+	* A bunch of changes for Borland static and DLL compile (Thanks Nathan York)
+
+	* stl/_algo.c : fixed find_end() bug (Thanks Alberto Barbati)
+
+	* stl/_queue.h : priority_queue<>::_comp renamed to "comp" as standard states (thanks Todd Greer)
+
+        * _limits.c : added correct data member representations for AS400 and Alpha machines (thanks Holger Stash)
+ 	
+	* _vector.h : added check to avoid calling allocator<>::deallocate(0) (thanks Stephen Cleary)
+
+	* config/_prolog.h, config/_epilog.h : added push/pop pack(8) pragmas for MSVC (thanks Todd Greer, Alberto Barbati)
+ 	
+	* gcc.mak's : default spelling for "-pthreads" option changed to "-pthread" as more platforms use that.
+	
+	
+The following changes were made in 4.5 beta 8 since 4.5 beta 7 :
+	
+	* stl/_fstream.c : _M_underflow bug fix for custom codecvt facets (thanks Alberto Barbati)
+	
+	* bcc55.mak : c_locale.c added to the link command (thanks Steve Loves)
+	
+	* _iterator_base.h & many other places : iterator tags are being accepted by const reference 
+	   instead of value, to fix segmentation faults experienced on certain platforms with beta7.
+	  That also should improve efficiency on same platforms (apparently, empty unreferenced 
+	  objects with no constructors/destructors were copied on the stack when passed by value).
+	  Accompanied change eliminates hardcoded deference hack used in previous beta.
+	  Thanks everybody who reported this.
+
+	* stl_user_config.h : added _STLP_GCC_USES_GNU_LD switch. This is for those platforms 
+	  where native linker does not let gcc to implement automatic instantiation of static 
+	  template data members (Tru64, AIX, HP-UX). 
+	  It is being put in this file as there is no automatic way to check if we are using GNU ld or not.
+	
+	* _range_erors.h : depandancy on <stdexcept> and <string> removed for own iostreams mode
+	(thanks Doug Gilbert)
+
+	* debug/_list.h : "typename" added in new methods (thanks Doug Gilbert)
+
+	* _config.h, src/common_macros.mak : beta version number bumped 
+		
+	* src/ftream.cpp, c_locale_win32.c : fixes for UNICODE compilation (thanks Valo)
+
+	* stl_gcc.h, etc : changes for GCC support on Tru64 (thanks Tobias Ernst)
+
+	* _alloc.c : for MS VC, malloc_dbg only used when _STLP_DEBUG_ALLOC is set, not for all debug configs
+ 	  (Thanks Anton Ephanov)
+
+	* test/eh/gcc.mak : directories stuff fixed (Thanks Brodie)
+
+	* stl/_complex.h : fixed declarations for long double specializations (Thanks Tsutomu Yoshida)
+
+	* locale_byname.cpp, etc. : fixes for Apple compilers by Tsutomu Yoshida.
+
+	* _ios_base.h : __evenk id changed not to clash with MS VC++ 7 (thanks Paul Ghezzi)
+
+	* _fstream.c : added basic_filebuf constructor workaround for compiler which do not initialize builtins
+	  to zero when default constructed (thanks Alberto Barbati)
+
+	* _locale.h : relaxed guerd around templated locale constructor (thanks Alberto Barbati)
+
+	* stl_mwerks.h : changes to accomodate CodeWarrior 6.2 (thanks cprosser)
+
+	* stl/_cmath.h : extracted from <cmath> for better decoupling
+
+	* stl/_std_prolog.h, stl/_std_epilog.h : hooks for future alternative namespace inclusion style.
+
+	* config/stl_gcc.h : gcc-3.0 now supported
+
+	* src/gcc-beos.h : only static library is being built (dynamic stil don't work) (thanks John Maddock)
+
+	* using/iostream : included using/istream and using/ostream
+
+	* dll_main.cpp : force_link() fix to prevent numeric_limits static members and 
+	  _M_increment/decrement from _tree.c from being optimized out by VC++
+	  (thanks Sofus Mortensen, Alberto Barbati )
+
+	* _alloc.c : added CHECK_NULL_ALLOC for _STLP_CHUNK_ALLOC with malloc, to throw exception if malloc returns 0 (thanks ghunt)
+
+	* stl_bc.h, <exception> : fixed Borland C++ import of unexpected handler stuff
+
+	* stl_ibm.h, etc. : fixes for IBM VisualAge 5.02 to compile
+
+	* type_traits.h : bool2type<> changed to be parameterized on int, to work around SUN CC bugs (probably others, too)
+	
+The following changes were made in 4.5 beta 7 since 4.1 beta 6 :
+
+	* sparc_atomic.s : file missing from the distribution restored
+
+	* etc/ subdirectory created; miscellanous files moved there
+
+	* STLport ported to BeOs, complete with iostreams (thanks John Maddock) 
+	
+	* Macro _STLP_NO_SGI_IOSTREAMS renamed to _STLP_NO_OWN_IOSTREAMS, old references to SGI removed; 
+	
+	* "prepare" target added to all makefiles in src/; should be run before using STLport;
+	  on most platforms it's empty, on some of them it creates necessary symbolic links, etc.
+	
+	* stl/_deque.h : deque<>::erase bug (introduced in 4.1b4) fixed (thanks to BruceFlorman) 
+	               : default parameter in constructor bug fixed (Thanks to Alex Vanic) 
+
+	* stl_msvc.h : explicit template function agruments enabled for VC++; 
+
+	* stl_wince.h : added <windows.h> inclusion
+
+	* stl/_limits.h : numeric_limits<bool>::digits changed from 0 to 1 (Thanks Mukesh Kapoor)
+
+	* stl/_function_base.h : added __identity_element() (extension name), _numeric.h : this one used instead of identity_element() (Thanks Hafeez)
+ 
+	* stl_msvc.h : explicit template function agruments enabled for VC++; 
+
+	  use_facet<> now fully conforms to the standard with VC++. (Thanks Jeff Kohn for the input)
+
+	* fstream.cpp : LARGE_INTEGER used to work around Intel shift instruction bug (thanks Thomas Meischner)
+	* fstream.cpp : ULL macro fixed for Win32
+	* fstream.cpp : Added test for for INVALID_HANDLE_VALUE and NULL base and _M_view_id,
+ 	  for _M_close on Win32 (Thanks Stephen Baker)
+	* fstream.cpp : Fixed corner case with mmap() on EOF (Thanks Jens Maurer)
+
+        * _istream.c : fixed _M_read_buffered sssso that it does not skip delimiters (Thanks Gerd Hoeren)
+	
+	* stl/_string.h : operator __std_string() uses constructor with a size to correctly initialize string containing null chars (Thanks Armin)
+	
+	* iomanip : added operator for setfill object and istream (was ostream only) (Thanks Mukesh Kapoor)
+	
+	* stl/_locale.h , stl_intel.h : fixes for Intel 5.0 compiler (Thanks Anton and Marcello Pietrobon)
+
+	* stl_solaris.h : added _STLP_NO_NATIVE_WIDE_FUNCTIONS
+	
+	* New makefiles added for Intel C++ 5.0 and VC++ 6.0 in src/, test/eh, test/regression (Thanks to Marcello Pietrobon)
+
+	* _STLP_NO_LONG_DOUBLE case handled for STLport iostreams as well (thanks John Daniel)
+	
+	* SUN CC compiler template cache is being properly cleaned up (Thanks Whitney Kew)
+
+	* dll_main.cpp : added extern "C" around DllMain() (Thanks Danny Smith)
+	
+	* type_traits.h : added bool parameter to shut up warnings on some compilers (Thanks glassman)
+	
+	* stl/_rope.h/.c, src/mrcpp.mak, src/mrc.mak, stl/_tree.h : MPW & MRC fixes by Tsutomu Yoshida
+
+	* stl_gcc.h : added path for <exceptions> et al for gcc-2.95.3 on FreeBSD (Thanks to 
+	
+	* _tree.h /_tree.c : pointers used as return values instead of iterators for implementation 
+	  functions, for efficiency.
+
+	* _algo.h/.c : added leading underscrore to some symbols (Thanks to Ed James-Beckerman for the report)
+	
+	* dll_main.cpp : fixed nothrow object initialization (Thanks to Dan Ingold)
+
+	* beta suffix in common_macros.mak updated (thanks to Whitney Kew)
+
+	* c_locale_win32.c : incomple fix for locale completed (thanks to Alberto Barbati)
+
+	* c_locale.h : _Locale_ALPHA definition for VC++ and mingw32 fixed (thanks Danny Smith)
+	
+	* _threads.h : fixed _DECTHREADS block to work on both DEC and HP
+
+	* _hash_set.h : fixed typo in MSVC++ bug workaround ( Thanks to Jon_Hanson for the report)
+
+	* stlport/strstream.h : fixed inclusion for MSVC 6 (Thanks  Joachim Achtzehnter)
+	
+	* _config.h : _STLP_RETHROW changed to avoid warnings with NO_EXCEPTIONS (thanks Richmond)	
+
+	* _hashtable.c : prime list definition made consistent (thanks Rainer Schnitker)
+
+	* stl_hpacc.h :  _STLP_FORCE_ALLOCATORS workaround used for Version 3.15 also (thanks Rainer Schnitker)
+
+	* stl/_string_io.c : fixed using directive in operator >>() (thanks Rainer Schnitker)
+
+	* debug/_deque.h : a check in erase() fixed (thanks Andreas Malzahn)
+
+	* debug/_list.h : added remove() to do iterator invalidation; range erase() fixed to do invalidation
+
+	* stl_watcom.h : added switches; disabled own iosterams by default; 
+	                 enabled ->() operator for iterators (thanks Steven Green)
+
+	* <exception> : added throw spec for what(); stl_sgi.h : made _STLP_NO_EXCEPTIONS depend on __EXCEPTIONS macro (Thanks Anton Ephanov)
+
+	* _string_io.c : operator << : fixed width() interpretation bug
+
+	* stl_hpacc.h/cmath : fixed HP aCC settings for -AA option (thanks Doug Gilbert) 
+
+
+	
+The following changes were made in 4.1 beta 6 since 4.1 beta 5 :
+
+	* _istream.h, _ostream.h, _ios.h, _fstream.h : guard macros fixed to not clash with .h files in "stlport" directory
+	  Also all uses of those macros fixed. (thanks to Gerd Hoeren for the report)
+
+	* _debug.c/_debug.h : fixed swap() for rb_tree and list (thanks to Gerd Hoeren for the report)
+	  swap() changed not to invalidate any iterators, as prescribed by the standard 
+
+	* forced _REENTRANT to be defined when compiling with STLport iostreams and _STLP_DEBUG
+	  (without _STLP_DEBUG it seems to be binary compatible even without that)
+	
+	* facets_byname.cpp source introduced to replace all xx_byname.cpp files;
+ 	  restored separate facets .cpp complilation (they used to be included in locale_impl.cpp)
+
+	* introduced _STLP_USE_PERTHREAD_ALLOC to optionally use per-thread allocator 
+	  (_Pthread_alloc from _pthread_alloc.h) as the deafult node allocator. Only works with pthreads for now.
+	  
+	* Switches _STLP_DONT_REDEFINE_STD and _STLP_WHOLE_VENOR_STD are back (thanks to  Anton Ephanov for the report)
+	
+	* _vector.h : fixed bug in template version of insert (Thanks to Yotam Medini for the report)
+	
+	* monetary.cpp : unneded hack for cygwin removed (thanks to Dean Sturtevant) 
+
+	* <iostream> : fixed _STLP_OUTERMOST_HEADER_ID macro
+
+	* cin/cout/cerr redefined if no namespaces and SGI iostreams are used, for all compilers, just in case. 
+	* _sparc_atomic.h : fixed and improved atomic ops for gcc
+
+	* test/regression : non-backward-compatible old-style __STL_xx macros use changed to _STLP_xx
+
+	* config/st_gcc.h : disabled non-standard "extern" use for non-DLL templates 
+
+	* mingw32 - used 'windows.h replacement' section in _threads.h (thanks to Danny Smith)
+
+	* locale Win32 bug fixed (thanks to Alberto Balbarti)
+
+	* mingw32 : _STLP_CONST_INIT_BUG defined for dll (thanks to Danny Smith)
+
+	* "make clean" glitches fixed (thanks to Whitney Kew for the report)
+
+	* _fstream.c : fixed codecvt bug for variable width encoding
+
+	* _STLP_ABORT macro introduced to avoid clashes with third-party sw redefining abort() (thanks to Jerry)
+
+	* c_locale_win32 : fixed parse bug in __ParseLocaleString (thanks to Danny Smith)
+
+	* extra declspecs removed from templates to fix VC++ 7.0 ; only concrete classes have specifiers (thanks to Holger Stasch for the report)
+
+	* stl_msvc.h, _hashtable.h/.c : fixes for IA64 compilation (thanks to Rainer Schnitker )
+
+	* fixed bugs in "make install" on Unix (thanks to Carlos Paniago)
+
+	* dll_main.cpp : DisableThreadLibraryCalls used for optimization (thanks to Alberto Barbati)
+	
+	* dll_main.cpp : a dummy function added to force <limits> guts for static VC++ link (thanks to Alberto Barbati)
+
+	* gcc-linux.mak : flags fixed (thanks to Levente Farkas )
+
+	* stl_msvc.h, stl_intel.h : fixed __ICL version test (thanks to Serge Pashkov)
+
+	* versioning schema changed on Windows to have .dll extension (thanks everybody for the feedback)
+
+	* NetBSD makefiles fixed
+
+	* A bunch of fixes by Tsutomu Yoshida : MPW fixes plus :
+	* stl/_config.h : I believe the definition for _STLP_STD under debug/non-debug configurations swapped.
+
+	* typeinfo.h : added check for _STLP_NO_NEW_HEADER for using declaration.
+          Otherwise three classes will not be included in the namespace std when #include <typeinfo>.
+
+	* _istream.c : use of bind2nd (which required _function.h inclusion) changed to use alternate functor (thanks to Sergei Nikolaev)
+ 	
+	* stl_msvc.h : removed erroneous _STLP_USE_TEMPLATE_EXPORT setting which caused major code bloat for native streams builds on VC++ (Thanks to Johannes Brunen for the report)
+
+	* _string_io.c : fixed Intel C++ compilation bug in native streams mode
+
+	* fstream.cpp : added write-sharing for fstream file handle (Thanks to Leland Best)
+
+	* stl_gcc.h : disabled wide function imports for linux (some xx_POSIX macro should be really used; disabled for all linuxes for now). Thanks everybody for the reports.
+
+	* KAI C++ 4.0 is now supported on SUN
+
+	* MAC OS X compilation fixed (thanks Patrick Luby for the patch)
+
+	* HP aCC fixes by Michael Tsirkin
+	
+	* "INF/NAN" string representation for uppercase changed to "Inf/NaN" to behave like printf() on most systems.
+	
+	* debug/_iterator.c : fixed SUN 6.0 compiler internal error 
+
+	* typeinfo.h : global scope used to import bad_cast, etc. (thanks to Val Melamed)
+	
+	* debug/_list.h : missing template versions of remove_if(), merge() added. Missing regular sort() added.
+	 (Thanks to dgehri)
+
+	* debug/_slist.h : missing sort() (template and regular) interface added
+
+	* _istream.h : eliminated warning about comparison with unsigned (Thanks to Gerd Hoeren for the report)
+
+	* template constructors for containers changed to be one version with default allocator agrument, where possible.
+	
+        * remaining _STL_ prefixes changed to _STLP_
+	
+	* Solaris 7 compilation fixed
+
+        * fstream.cpp : seek() allowed to seek past the end of the stream (Thanks to Phillip Toland for the input)
+The following changes were made in 4.1 beta 5 since 4.1 beta 4 :
+
+	* All internal macros changed to have prefix _STLP_ instead of __STL or __STLPORT or __SGI_STL.
+          That is to allow seamless wrapping on platforms that use SGI STL as native STL/iostreams.
+	  For backward compatibility, most of user-settable __STL_xxx macros are accepted.
+
+	* Versioning of shared libraries made UNIX-compliant
+	
+	* Some temporary lifetime problems in SGI iostreams which may introduce memory corruption, fixed.
+
+        * <new> : fixed memory leak bug due to unclever macro expansion in __stl_new (thanks to Joachim Achtzehnter)
+
+	* stl/_tree.h : fixed several bugs in new code for corner cases in insert_equal()/insert_unique() with a hint 
+	  (thanks to Micheal Tsirkin for the report and patch)
+
+	* _vector.h:284 : __copy call fixed to be __copy_aux (thanks to Alex Vanic)
+
+	* _config.h : fixed static build bug due to  __STL_EXPOSE_GLOBALS_IMPLEMENTATION typo (thanks to Serge Pashkov)
+	
+	* fstream.cpp: __pioinfo definition for mingw32 fixed (Thanks to Danny Smith)
+
+	* *.SUNWCCh files changed to regular files; moved to "stlport" directory
+
+	* pthread_alloc : split into <pthread_alloc>/<stl/_pthread_alloc.h>
+
+	* lightweight atomic ops used on SPARC v8plus and v9 (gcc and SUN CC)
+	
+	* Mac OS X support introduced (thanks to Patrick Luby) 
+
+	* SGI iostreams ported to DJGPP (thanks to Tanes Sriviroolchai)
+
+	* SGI iostreams ported to NetBSD (thanks to Michael Rauch)
+
+	* FreeBSD build fixed, now builds for wchar_t too
+
+	* DEC CXX build fixed; restricted to dynamic lib only
+
+	* SGI MIPSpro build fixed; GNU make has to be used
+
+	* Set of HP fixes by Michael Tsirkin
+
+	* Set of Watcom fixes by Ricardo Gayozo
+
+	* Bunch of Apple MRC/MPW fixes by Tsutomu Yoshida integrated
+	
+	* Bunch of iostream fixes for Cygwin, Borland and Intel 4.5, by Serge Pashkov	
+	
+	* debug/_list.h : added checking versions of pop_back/pop_front (thanks to Per Liboriussen)
+
+	* src/c_locale_win32.c : fix for VC5sp3 (thanks to Petr Ovchenkov), fix for day of week order (thanks to Danny Smith),
+	  fix for null-termination in my_ltoa (thanks to Serge Pashkov)
+	
+	* Some warnings in debug mode fixed (thanks to Marco)
+
+	* type_traits.h : IsP functions return types changed to be more portable (thanks to Serge Pashkov for the suggestion),
+	  __cdecl added for Win (thanks to Todd Wilson)
+
+	* debug/_tree.h : added owner check for erase() (thanks to Alberto Barbati)
+
+	* stl/_ostream.h : << operator specializations added for compilers w/o partial ordering 
+	  (thanks to Alberto Barbati for pointing this out).
+
+	* "make install" on UNIX : fixed the target not to remove lib directory; 
+	   default installdir restored to be /usr/local (thanks to Jeff de Vries for the input)
+	
+	* _construct.h : extra cast for __STL_SHRED_BYTE removed (thanks to khesin)
+	
+ 	* _relops.h header obsoleted; some extra includes removed
+
+	* __STL_STATIC_CONST_INIT_BUG use normalized; now it's used for all compilers not able
+	  to treat const members as coplile-time constants; enum used for them (e.g VC++).
+	  Thanks to  Dean Sturtevant and Gavin Collins for the ideas.
+	
+	* stlport/cmath : fixed SUN CC 5.0 compatibility mode bug (thanks to ade for the report)
+
+	* debug/_hashtable.h : fixed equal_range() bug (thanks to decraft for the report)
+
+	* streambuf.cpp/_streambuf.h : fixes xsgetn() bug (thanks to Vadim Egorov)
+	
+	* istreambuf_iterator<> : nonconforming behaviour fixed (thanks to Tom Widmer)
+
+	* _num_put.c : fixed corner case for 0x8000000 output.
+	
+        * num_get<> : extra get() and do_get() members for "int" and "short" removed; istream operators changed accordingly
+	
+        * _itreambuf_iterator.h/_ostreambuf_iterator.h introduced to decouple those from num_get/num_put
+
+	* gcc makefiles in src : "-fno-implement-inlines" removed
+
+	* Added workaround for gcc's limits.h and SUN Ultra with -mcpu=ultrasparc in 32-bit mode. 
+	
+	* ios_base:: type for constants  made "int" for all compilers, as it more efficient and perfectly compliant.
+	 	
+	* debug/_hashtable.h : fixed typo in swap() ( thanks to Gerd Hoeren for the report)
+
+	* debug/_string.h : +() operators defined unconditionally ( thanks to Gerd Hoeren for the report)
+
+	* _istream.c : removed dependancy on _function.h (thanks to Kenny Simpson for the report)
+
+	* _limits.c : fixed little-endian representation of infinity & NaN (thanks to Rene van Oostrum)
+
+	* _stdio_file.h : fixed postdecr macro for 64-bit Solaris (thanks to Jim Cole)
+
+	
+The following changes were made in 4.1 beta 4 since 4.1 beta 3 :
+	
+	* Simulation of class partial specialization (thanks to  Mat Marcus and Jesse Jones of Adobe)
+	  used to provide following enhancements :
+	
+	 - type_traits are automatically specialized for all pointer types for all compilers, 
+	   which makes them able to utilize type_traits-based optimizations when dealing with pointer types, 
+	   automatically.
+	
+	 - all functions specialized for pointers and optimized via __type_traits
+	   ( like copy()/copy_backward(), _uninitialized_xx) now enjoy this optimization for all compilers!
+        
+	- generic __value_type()/__difference_type()/__iterator_category() are written so user does not have
+	   to supply any of its own even when partial specialization is not available.
+	   (Note : gcc-2.7 and VC++ 5.x, 6.x have bugs which prevents them from using this enhancement, still)
+	
+	* <iterator> : by default, non-standard iterator query names like 
+	  value_type()/difference_type()/iterator_category() are not used
+	
+	* <algo> : major revision:
+	   - algorithms without explicit Compare() function expressed via the one that has it where possible.
+	     This considerably reduces header size and reduces code bloat for programs which use both flavours of
+	     those algorithms.
+	   - some function bodies moved between  .c and .h 
+	   - all functions used internally moved out to _algobase.h, so no other header includes <_algo.h> anymore
+	   - find() specialized for random access iterators regardless of partial spec.
+
+	* Dynamic libraries (.DLL and .so) : name versioning used to prevent clashes between STLport versions
+
+	* src/ : code regrouped between .cpp files to provide for less executable size with dumb linkers;
+
+	* locale subsystem initialization : startup changed to use statically allocated structures as much as possible;
+	
+	* <stl/_function.h> : basic stuff moved to _function_base.h ; 
+	  other STL headers now include _function_base.h instead
+
+	* _threads.h : MT support for OS/2 added (only tested with VAC++)
+
+	* _stdio_file.h : added support for Solaris in ELF64 mode (thanks to Holger Stasch)
+	
+	* stl/_hashtable.h : [] operator for hash_map optimized to take no more than find() when element is present
+	  (Thanks to Thomas Witt et al.)
+
+	* _ostream.h : fix for default unsigned char (thanks to  Holger Stasch)
+	
+	* all __STL_ABBREVS abbreviations moved aside in _abbrevs.h header.
+
+	* Fujitsu C++ Compiler support added (thanks to  Holger Stasch)
+	
+	* Initial SGI iostreams port to OS/390 introduced (thanks to  Holger Stasch).
+
+	* More on SGI iostreams port to xlC 5.0 (thanks to  Holger Stasch).
+
+	* Fixes for SGI MIPSpro compilers (Thanks to Ralph)
+
+	* Fixes for HP aCC compiler (Thanks to Michael Tsirkin)
+
+	* stlport/SC5 directory : removed C library .h files to fix circular inclusion problem with WS6.0 + C programs.
+	
+        *  hash_map::swap() in debug mode fixed (thanks to Anton) 
+	
+	* __STL_COMPILE_INSTANTIATE hack for DEC removed (thanks to Ralph)
+
+	* __STL_INLINE_STRING_LITERAL_BUG defined for HP aCC ( thanks to Jason Taylor)
+
+	* _bitset.h - member workaround operators made const (thanks to dzwick) 
+
+	* _bitset.h/.c, hashtable.h -- small bugfixes (thanks to Levente Farkas)
+	
+	* <exception> - now includes exception.h if only that is available.
+
+	* vector::assign() inplemented for vector::iterator when member templates are not available (Thanks to dzwick)
+
+	* fstream.cpp : __pioinfo used for MinGW32 (thanks to Danny Smith)
+	
+The following changes were made in 4.1 beta 3 since 4.1 beta 2 :
+
+	* list<>::clear() : protected access bug fixed
+
+	* __STL_MUTEX_INITIALIZER set back to PTHREAD_MUTEX_INITIALIZER for pthreads case, 
+	  as some platforms (eg AIX) do not treat zero-initialized mutex as valid one (thanks to Alex Vanic, Jack Andrews for help)
+	
+	* stl/_limits.c : fixed typo preventing numeric limits constants to be defined for __STL_LITTLE_ENDIAN,
+	  constants initialization fixed (thanks to Ingo Donasch)  
+
+	* real implementation of locales for Win32 contributed by Anton Lapach (thanks !) merged in.
+	
+	* stl_user_config.h, _config.h : changed default to not define relops:: operators
+	  in __STL_NO_NAMESPACES mode.
+
+	* _numeric_facets.c/num_put.cpp : printing of integer do not use sprintf() anymore
+
+	* "install" target implemented for UNIX & VC++ Makefiles. It now installs headers and libraries.
+
+	* "src" : files merged to get less compilation time and less space overhead for imperfect compilers
+
+	* "debug" flavour of STLport excluded from default build and auto-select ; 
+	  please use __STL_USE_DEBUG_LIB and build debug STLport lib explicitly with "make debug_dynamic" 
+	  if you really need it). "all" now builds 2 kinds : "release" and "STLdebug", for static and dynamic builds.  
+
+	* stlport_prefix.h : WIN32_LEAN_AND_MEAN set for Win32 build of STLport library, for speed.
+
+	* FreeBSD compile fixed; makefiles added.
+
+	* All "__init" changed to "_Init" to fix clashes with DEC conventions (thanks to Holger Stasch)
+
+	* _range_errors.h -- fixed to always set __STL_EXTERN_RANGE_ERRORS for SGI iostreams (thanks to Serge Pashkov)
+	
+	* *gcc* mak : some files renamed to gcc-platform mak 
+
+	* "extern template" extension used for gcc & standard i/o classes, to reduce code bloat in application's .o
+
+	* "extern template" extension used for VC++ & standard i/o classes (was for DLL only)
+
+	* _iterator.h : added template(and non-template) assignment operator for reverse_iterator<> (thanks to psw).  Obsolete HP-style code moved to _iterator_old.h 
+
+	* _alloc.h : obsolete code for raw SGI allocators support moved to separate header, for compile-time improvement
+
+	* More iostreams code conditionally moved out for clients who only use standard i/o and can set __STL_NO_CUSTOM_IO flag
+	
+	* <iostream>, <locale> : initialization of locale subsystem made independent of standard streams.
+	  sync_with_stdio call before iostream initialization now works.
+	
+	* <fstream>, <fstream.h> : added initialization code for locale , same as in <locale> 
+	  (thanks to George Trojan for the report)
+
+	* fstream.cpp : fixed resource leak in case memory map fails on Win32 (thanks to Mark Laffoon)
+	
+	* <cmath>, <cstdlib> : added additonal overload signatures required by chapter 26.5 of ANSI (thanks to Levente Farkas for
+	 the suggestion), plus "long long" flavour where applicable. 
+	
+	* __STL_LONG_LONG generalized to support __int64 on Win32 (thanks to Adam Gates for the suggestion)
+
+	* _fstream.h : added constructor from file descriptor, as extension (thanks to eric_a_benson)
+
+	* _fstream.h : added basic_filebuf<>::fd() file descriptor accessor, as extension (thanks to George Trojan)
+
+	* stl_sunpro.h : strstream masked for CC 4.2 to avoid virtual table clash (thanks to Ken)
+
+	* stl_msvc.h : member templates allowed for VC5, it's capable of hadling most of them (same restrictions as VC6 -- inline).
+	
+	* debug/_debug.c : slightly changed format of debug message to please VC++ IDE (thanks for Bruce Dawson for the suggestion)
+
+	* src/sgi_mipspro.mak added, for SGI MIPSPro compilation
+
+	* merged series of HP/SUN minor fixes by Petr Ovchenkov 
+	
+	* merged series of Intel 4.5 fixes by Serge 
+
+	* vc_common.mak : -Yd dropped, as obsolete (thanks to psw)
+
+	* _range_errors.h:95 : unused argument removed (thanks to George Trojan)
+
+	* _string_io.h : refined _WRTLING workaround for Watcom (thanks to Serge Pashkov)
+
+	* _threads.h : fixed SGI threads dafines for gcc on IRIX (thanks to Brett Denner for the report)
+
+	* <typeinfo.h>, <typeinfo> : mutually-exclusive machanism added to allow including both in same unit.
+
+	* Inclusion of SGI iostreams headers put to some order; _streambuf_iterator.h file introduced to resolve circular dependancies
+	
+The following changes were made in 4.1 beta 2 since 4.1 beta 1 :
+	
+	* _algobase.h : fixed __STL_DECLARE_COPY_TRIVIAL definition
+	(thanks to Charles Burfoot for the report)
+
+	* _algobase.h : added copy_backward specializations for builtin types for compilers w/o partial spec.
+
+	* _char_traits.h : fixed zero-length check for copy (thanks to Michael Tsirkin)
+
+	* msvc_warnings_off.h : fixed "and" typo
+	(thanks to Charles Burfoot for the report)
+
+        * num_put_float.cpp : fixed rounding for "g" format (thanks to Bernd Mohr for the report) 
+	
+	* Initial port of iostreams to xlC 5.0 added (thanks to Jack Andrews)
+	
+	* stl_sunpro.h : a fix for Forte config (Thanks to Alex Vanic for the report)
+
+	* old_hp/iterator.h : fixed iterator_category()/etc. import
+
+	* _threads.h : __stl_atomic_t used instead of "unsigned long" (thanks to Alex Vanic for the report)
+	* using/iomanip : old-streams path used for native iomanip.h (thanks to Michael Tsirkin for the report).
+
+	* _bitset.h , _bitset.c : direct STL_THROW replaced with __stl_throw_xxx calls (thanks to Michael Tsirkin for the report)
+
+	* range_errors.h/cpp : added functions to support throwing of  overflow_error and invalid_argument
+
+	* _threads.h : enganced HP-specific guards for HP-UX 11 (thanks to Matthew Collins for the report)
+
+	* _string.h : compare() bugfix (thanks to Anton Sergeev)
+
+	* moneypunct_byname_w.cpp : rolled back wrong bugfix (thanks to Ken)
+
+	* _vector.h, _deque.h, _list.h : nonstandard versions of push_back()/push_front() 
+	  moved under __STL_NO_ANACHRONISMS guard (thanks to Ed Brey)
+	
+	* _tree.c, _list.c, _slist.c, _debug.c : compile-time improvements
+	
+	* _tree.h/c, _list.h/c, _slist.h/c, _vector.h/c, _string.h/c : using directive for data members 
+	  changed to explicit "this->".
+	
+	* _complex.h : signatures of some methods changed to take value_type instead of const value_type&, 
+	   for better conformance (thanks to Petr Ovchenkov)
+
+	* Bunch of fixes to compile with gcc on HP-UX 10, 11 (thanks to Petr Ovchenkov)
+
+	* Code duplication for __STL_INLINE_MEMBER_TEMPLATES removed -- corresponding methods are always inlined
+
+	* stl_sunpro.h : fix for "-compat" mode (thanks to Vijay Ramachandran)
+
+	* pthread.h : new wrapper added
+
+	* Added custom prolog/epilog for HP aCC to select kthreads on HP-UX 11 (Thanks to Michael Tsirkin)
+
+	* <new> : fixed throw specification for bad_alloc (has to be inherited)
+
+	* Macro __STL_NATIVE_CPP_RUNTIME_INCLUDE_PATH introduced to specify separate path for <exception>, <typeinfo>, <new>.
+	  (thanks to Bryan Byrnes)
+	
+	* <stdio_streambuf> : moved from stlport/stl to stlport directory, for SGI compatibility
+	
+The following changes were made in 4.1 beta 1 since 4.0 :
+
+	*  Sun Forte 6.0 C++ configuration provided (thanks to Alexander Vanic for the input)
+	
+	* _threads.h/_config.h : added efficient support for atomic operations for
+	  DEC CXX and Watcom (thanks to Ricardo Gayoso for the input). 
+	  Macros __STL_ATOMIC_xxx introduced to facilitate this.
+
+	* _tree.h : optimizations to lower number of comparisons (thanks to Craig Powers for the patch)
+
+	* _tree.h, _hashtable.h and clients : added templated find() as an extension (thanks to Michael Tsirkin for the suggestion)
+
+	* _tree.h : changed some inlining for performance optimization
+	
+	* __node_alloc:: allocate broken into two functions for better inlining 
+
+	* _threads.h : added PTHREAD_MUTEX_INITIALIZER guard for HP workaround
+
+	* stl_bc.h : option set to control alignment and virtual table  behaviour to be consistent; 
+	 library name adjusted to stlport_bcc55_xxx
+
+	* _algobase.h, _uninitialized.h, char_traits.h -- optimized out empty memcpy() calls 
+	  (thanks to Michael Tsirkin for the report).
+	
+	* _iterator.h : fixed reverse_iterator::operator+(int, reverse_iterator) resolution
+	  (thanks to Anton Sergeev for the input)
+
+	* _bitset.h : bitset<>::test bugfix (thanks to Anton Sergeev for the patch)
+
+	* complex_trig.cpp : use of __STL_NO_LONG_DOUBLE made consistent, fixes for Borland on Linux
+	 (thanks to John Wiegley for the input)
+	
+	* moneypunct_byname_w.cpp : bugfixes for string copying (thanks to Anton Sergeev for the input)
+	
+	* Watcom-specific fixes (thanks to Ricardo Gayoso for the input)
+
+	* src/common_macros.mak : some intermediate targets added (thanks to Jeremy for the suggestion) 
+	
+	* _debug.c : fixes for Win CE (thanks to John Hynes for the patch)
+
+	* Intel CC 4.0-specific fixes (thanks to Sean Cavanaugh for the input)
+
+	* _list.c : workaround for Watcom C++ (thanks to Mike Steed for the report)
+
+	* __STL_NO_NATIVE_WIDE_STREAMS definition fixed (thanks to Glen Summers for the patch)
+
+	* cast macros fixed to be more robust (thanks to Geoff Oakham for the report)
+
+	* "strstream.h" native inclusion for VC 6.0 fixed (thanks to  Sathish T C for the report)
+	
+	* debug/_string.h : improvement to string with __STL_DEBUG w/o member templates 
+	  (thanks to Paul Furnanz for the report)
+
+	* debug/_string.h : fixed internal compiler error for VC++ 5.x (thanks to chvetsov for the report)
+	
+	* cstdio, stl/_streambuf.h : fixes to allow gcc compilation with -ansi flag
+
+	* workaround for cin/cout renaming on HPUX11 for -D_REENTRANT (thankf to Jeff Sparkes for the report)
+
+	* cin/cout/cerr/clog renaming in STLport for CC 4.0 and SGI iostreams, 
+	 to avoid symbol clashes with native ones (thanks to Dirk Schreib for the report)
+
+	* type_info scope fixes for VC++ 6.0 (thanks to Sathish T C for the report)
+
+	* typeinfo.h using fixes (thanks to Glen Summers for the input)
+	
+	* stlcomp.h : fixes to allow compilation of .c modules with VAC++, Sun CC, DEC CC, Watcom CC
+	 (thanks to Dmitry A.Steklenev, Jonathan Richardson for the report)
+	
+	* debug/_tree.h : fixed insert_unique() bug (thanks to Ben Liblit for the report)
+
+	* regression/gcc.mak made non-dependant on "." in the path 
+	  (thanks to Thomas Matelich for the report)
+	
+	* hmset1.cpp fixed to compile under OS390 ( thanks to Andrey Khovanskiy for the report)
+	
diff --git a/main/source/stlport/etc/ChangeLog-4.0 b/main/source/stlport/etc/ChangeLog-4.0
new file mode 100644
index 00000000..ef02dbfa
--- /dev/null
+++ b/main/source/stlport/etc/ChangeLog-4.0
@@ -0,0 +1,668 @@
+The following fix was made in 4.0 since 4.0 Release Candidate :
+
+	* _threads.h/_config.h : for all platforms, static mutexes made non-indirect
+
+	* _iterator_base.h : made possible to choose between iterator_traits approach
+	  and old-style iterator queries like iterator_category(), value_type(), etc. 
+	  (Thanks to John R. Bandela for pointing this out)
+	* _config.h, stl_user_config.h : introduced __STL_OLD_HP_ITERATOR_QUERIES switch to
+	  allow old-style and new-style iterator queries (for all compilers). 
+	  iterator_traits<> made always defined. 
+
+	* _ptr_specialize.h - specializations of type_traits<> for compilers w/o partial spec
+	  moved into separate file. Added iterator_traits<> specializations for pointer types
+	  for __STL_NO_OLD_HP_ITERATOR_QUERIES case. Macro __STL_POINTERS_SPECIALIZE is now available
+	  to specialize both type_traits and iterator_traits for a pointer to user-defined 
+	  type (latter for standard-style iterator queries mode only)
+
+	* vc5.mak : __STL_NO_FORCE_INSTANTIATE flag restored
+
+	* _site_config.h : if __STL_NO_NEW_IOSTREAMS or __STL_NO_IOSTREAMS specified, 
+	 SGI iostreams are being turned off. __STL_NO_SGI_IOSTREAMS moved into stl_user_config.h
+	(Thanks to Sathish T C for the report)
+
+	* stl_watcom.h : _REENTRANT is being set if _MT is set (thanks to Ricardo E. Gayoso for the input)
+	
+The following fix was made in 4.0 Release Candidate :
+	* _threads.h, _alloc.c : fixed use of _STL_mutex_base instead of _STL_STATIC_MUTEX macro 
+
+The following changes were made in 4.0 Release Candidate since 4.0 beta 8:
+
+	* fstream.cpp : WIN32 fstreambuf::open flag mapping fixed
+	  (thanks to Alberto Barbati for the reports)
+
+	* ctype.cpp : fixed classic table regarding ios_base::print/ios_base::space
+	  conflict (thanks to Alberto Barbati for the report)
+
+	* cmath : added same workaround for SUN's math exception/std::exception name clash
+	  as was there in math.h before
+	
+	* _streambuf.c : added "typename" to out-of-line functions (thanks to Michael Tsirkin for the report)
+
+	* README fixed to be consistent about SGI iostreams setting (thanks to Ed Brey for the report)
+
+	* _bitset.h : fixed SUN CC 4.2 crash with -g option (thanks to Alex Vanic for the report),
+	  fixed bug in bitset<>::reference base bitset typedef
+
+	* _threads.h/.c  - fixed issue with inconsistent system's macro for initialization
+	  and warning about partially bracketed initializer
+
+	* debug/_vector.h : fixed _Vector_nonconst_traits specialization for bit_vector
+	  (thanks for Dave Abrahams for the fix & reminder)
+
+	* config/msvc.h - addidional level 4 warnings suppressed (thanks to Ed Brey for the report) 
+	* _ios.h : fixed DLL export decl for MSVC (thanks to Alberto Barbati for the report)
+
+	* stdio_streambuf.cpp : compatibility fix for glibc 2.2 (thanks to Bill Shanahan for the patch)
+	* _iterator_base.h : added iterator<output_iterator_tag, void,..> specialization;
+	  _stream_iterator.h : ostream_iterator changed to inherit from iterator<>
+	 (thanks to Raphael Bossek for the report)
+
+	* INSTALL : added some exaples and fixed typos (thanks to Beman Dawes for the report)
+
+	* _site_config.h : more consistency checks for MT (thanks to John Maddock for the input)
+
+	* _messages_facets.h : added DLL export decls (thanks to John Maddock for the report)
+
+	* complex_io_w.cpp : fixed specialization syntax for aCC (thanks to Paul E. Blanchard for the report)
+
+	* complex_exp.cpp : fixed pow() bug for negative arguments (thanks to Anton Sergeev for the report)
+	* _fstream.h/_streambuf.h : MRC/MPW workarounds (thanks for Tsutomu Yoshida for the report)
+
+	* using/fstream.h : added missing end-of-line (thanks to Jean-Francois Panisset for the report)
+
+	* <typeinfo> : workaround for VC++ 6.0 defining type_info in gobal namespace (thanks to Bosko Ivanisevic for pointing that out)
+
+	* _threads.h/_threads.c/pthread_alloc : improved pthreads portability (thatnks to Michael Tsirkin for the patch) 
+
+	* _debug.h/_debug.c : __STL_ASSERT/__STL_VERBOSE_ASSERT/__STL_VERBOSE_RETUN macros guarded to be overridable by user (thanks to Tony Gould for the input)
+
+	* _valarray.h : added assert to operator= 
+
+	* config/vc_select_lib.h : added _AFXDLL recognition (thanks to Andrew Phipps for input)
+
+	* _rope.h : added default constructors to please gcc-2.7.2
+
+	* _set.h/_hash_set.h : pointer and reference typedefs fixed (thanks to Anton Sergeev for the report)
+
+	* stl/_config.h : stl_user config.h included prior to other parts of configuration
+	(thanks to Frank Samuel for the report)
+	
+The following changes were made in 4.0 beta 8 since 4.0 beta 7:
+
+	* Merged changes for 06/08 SGI library snapshot; mostly in locale
+	
+	* Merged series of fixes/workarounds by Tsutomu Yoshida (thanks!):
+	*   _rope.c - fixed memory leak bug;	
+	*   _debug.c/_debug.h - added extra zero-initialization for more robustness;
+	*   _list.h - MPW - specific fixes;
+	*   _hashtable.h - fixed debug renaming clash for __STL_USE_ABBREVS 
+	*   EH workarounds to make Apple compilers behave
+
+	* _fstream.c : fixed tellg() bug in text mode
+
+	* <csignal> : added sig_atomic_t import
+
+	* series of fixes for HP aCC 1.23 ( thanks to Michael Tsirkin for the patch ):
+	  _bvector.h : all relops are specialized;
+	  stl_hpacc.h - fixed config;
+	  hpacc.mak : added makefiles for HP aCC in src and test
+	  debug/_iterator.h, debug/_vector.h - removed future errors due to baseclass member use 
+	
+	* <cstdlib> : added import of system() call (thanks to Petr Ovchenkov for the report) 
+
+	* _REENTRANT is now set by default to be on for all SGI iostreams compilations.
+	  Same is being enforced if SGI iostreams are used.
+	
+	* _pair.h : added workaround for make_pair in case of char literals 
+	  (extension, only works with partial function order)
+
+	* config/stl_gcc.h - fixed configuration problem for "g++-3" directory used in Cygnus and Mingw 
+	  distributions for gcc-2.95.2, while all other platforms use "g++". Added recognition section.
+	  Thanks to Dave Abrahams for the report.
+
+	* config/stl_mlc.h : added support for MLC compiler (thanks to Anton Sergeev for the patch)
+
+	* <memory> : auto_ptr simplified (thanks to Kon Tantos for problem report)
+	
+	* num_get.cpp : included <ostream> to get external symbols right. 
+
+	* stl_ibm.h : __STL_NO_TYPEINFO added for OS/2 (thanks to Willie Arbuckle for the report)
+
+	* stl_bc.h  : fixed enforcement of static library until dynamic made to work (thanks to J. Lambert for the report) 
+	* src/stlport.rc : improved version definition to work with mingw32, <winres.h> changed to <windows.h>
+	
+	* src/mingw32.mak : Made use of stlport.rc for DLL build (thanks to Danny Smith for the suggestion)
+	* debug/_vector.h : name clash removed for _Base (thanks to Will Fike for the report)
+
+	* _monetary.h - added "static const bool intl" member to meneypunct<> templates 
+	  (thanks to Anton Sergeev for the report)
+
+	* _bitset.h : added forward friend decraration for reference (thanks to Anton Sergeev for the report)
+
+	* _tree.h : made _Rb_tree_base_iterator::_M_node initialized in default constructor (thanks to Dean Sturtevant for the report)
+
+	* _set.h : reinterpret_cast<> changed to C-style cast (thanks to Dave Abrahams for the suggestion)
+
+	* Use of raw SGI allocators (like __node_alloc) as an allocator parameter deprecated, 
+	  available only with __STL_USE_RAW_SGI_ALLOCATORS macro. May be removed later.
+	  __allocator<T> still available unless __STL_NO_EXTENSIONS is specified
+
+	* _limits.h/_limits.c - alignment fix for Solaris;
+	* Modified __format_float* routines to take long double as parameter;
+          (thatnks to Anthony Williams for the patch)
+
+	* debug/_iterator.h - wrappers for noncompliant compilers moved under 
+	  #ifdef __SGI_STL_NO_ARROW_OPERATOR  (thanks to Dave Abrahams for the input)
+
+	* _numeric_facets.h - num_put<> , num_get<> virtual members made outline to work
+	  aroung gcc-2.95 bug.
+	
+	* <cstdio> : undefined obsolete C macros : getchar/putchar & the like.
+
+	* ctype.cpp : fixed bug with ctype<char>::is (const char*, const char*, mask)
+	
+	* ctype.cpp : fixed is(print) for certain platforms where print is a separate flag
+
+	* ftstream.cpp : fixed corner case bug for Win32 text output (thanks for Dirk Schreib for the report) 
+
+	* _streambuf.h, _fstream.h, stdio_strembuf.h : fixed overflow/pbackfail() virtuals definition;
+	* _bitset.h : _M_copy_from_string fixed for non-member-template case (thanks to Alex Vanic for the report)
+
+	* gcc-glibc.mak, common_macros.mak : GLIBC compilation fixes (thanks to Thomas Witt for the report)
+	* WCHAR_MIN, WCHAR_MAX definitions moved from <limits> to <cwchar>
+
+	* char_traits<char>::to_char_type : parameter changed to int
+
+	* <cstddef> included in <new> (for size_t)
+
+	* _codecvt<>::do_length: fixed first parameter to be const mbstate_t &;
+	  virtual fns moved into .cpp, to work aroung gcc bugs
+
+	* _complex.h : fixed complex<>::operator= and constructors signature to take const T& 
+
+	* _istream.c : fixed formatted input involving binary '0'
+
+	* locale_impl.cpp : insertion of time_put<wchar_t> fixed
+	
+The following changes were made in 4.0 beta 7 since 4.0 beta 6:
+
+       	* Merged series of fixes/workarounds by Tsutomu Yoshida (thanks!):	
+       	* cmath,  _complex.h, stl_apple.h, _deque.h - MPW/MRC specific workarounds
+       	* _bitset.h - removed the obsolete _WordT template parameters.
+       	* _ctype.h, _codecvt.h, _collate.h, _istream.h,     _messages_facets.h, _monetary.c
+       	  _monetary.h, _numeric_facets.h,  _time_facets.h - added workaround for locale's nested class.
+       	* _ostream.c_ostream.h - added proposed modification against the <ostream> circular inclusion problem.
+       	* test/eh/test_deque.cpp - removed the obsolete template argument
+
+	* _bitset.h - removed obsolete adaptor (thanks to Alex Vanic for the report)
+
+	* _[io]stream.h - removed extra DLL specs (thanks to Danny Smith for the report)
+
+	* stl_msvc.h - fixed bug caused static lib to always be selected
+	
+	* gcc.mak - fixed AR definition for static link 
+
+	* Added workaround for static locale::id member in DLL for mingw32 (thanks for Danny Smith for the report)
+	
+	* _string_io.h : added _widen() to get getline() compile with wchar (somewhat missing in b6 , thanks to Mikhail Leonov for reminder)
+	
+	* threads.h - fixed guards for DreamSega WinCE (thanks to Ben Nason for the report)
+
+	* fstream.cpp : fixed truncation for WIN32 (thanks to Bruce Alderson for the report)
+
+	* _istream.c/_M_ignore_unbuffered() - fixed count bug 
+
+	* _istream.c/ readsome() : fixed extra failbit setting on eof
+
+	* __get_integer - enhanced using a table; input value made unchanged in case of error.
+
+	* __get_base_or_zero - more code factored out
+
+	* stl_wince.h : fixed assert() definition for Win CE (thanks to Andrew Waters for the report)
+
+	* vc_select_lib.h " fixed __declspec selection for Win CE (thanks to Andrew Waters for the report)
+
+	* _rope.c - fixed bug in _S_destr_concat_char_iter (thanks to E.Musser for the fix)
+
+	* debug/_vector.h - fixed DLL export for vector<void*>
+
+	* _vector.h, _deque.h, _bvector.h - obsolete guards around at() methods removed ;
+	* type_traits.h - WinCE compatibility fixes for -> operator definition ;
+	* _vector.h, _deque,h - removed extra casts (thanks to Andrew Waters for the report)
+
+	* _algobase.h - optimized lexicografical_compare() overload for char*
+	
+The following changes were made in 4.0 beta 6 since 4.0 beta 5:
+
+	* Merged changes from SGI STL snapshots 04/03, 04/14, 04/18.
+
+	* Iostreams ported to Apple MPW/MRC (thanks to Tsutomu Yoshida for the contribution)
+
+	* Iostreams ported to OSF1/Tru64 (thanks to Marc W. Mengel for the contribution)
+
+	* Iostreams ported to FreeBSD ( Thanks to Sms for the contribution)
+	
+	* <deque> : extra template parameter removed
+	
+	* locale::id, locale::facet : reverted to nested classes as standard prescribes
+	
+	* _string_io.h : added _widen() to get getline() compile with wchar (thanks to Mikhail Leonov for the patch)
+
+	* collate_byname[_w].cpp : fixes for VC++ 5.0 build w/__STL_DEBUG (thanks to Petr Ovchenkov for the patch)
+
+	* <complex> : __STL_COMPLEX_NAMESPACE defined before inclusion of impl. header 
+	              (thanks to Matthew Kelly for the patch)
+
+	* makefiles in "src" : improved to get each compiler to put object files in separate directory :
+	  ./obj/$(COMP)/Debug, etc. COMP is given some default value for each compiler, but may be also overridden.
+
+	* "src" subdirectory : added stlport_prefix.h file for precompiled header support; 
+	   VC++ makefiles make use of them  
+	
+	* stl/_iterator_base.h : provided __STL_NONTEMPL_BASE_MATCH_BUG 
+	  workaround for new form of distance().
+
+	* <limits> : added cast to WCHAR_MAX definition (thanks for Dave Abrahams for the report).  
+
+	* stl_user_config.h, stl/_config.h - setting splitted and organized more properly. 
+
+	* time_facets.cpp - extra instantiations removed (thanks to Matti Rintala for the report).
+
+	* stdio_streambuf.h : added explicit qualifications of C lib functions for gcc-2.91
+
+	* SGI code used for compatibility w/older versions are guarded with #ifndef __STL_NO_ANACHRONISMS
+
+	* SGI extensions are guarded with #ifndef __STL_NO_EXTENSIONS
+
+	* SGI/HP anachronisms are guarded with #ifndef __STL_NO_ANACHRONISMS
+
+	* <typeinfo> : .h file included if __STL_NO_NEW_NEW header is set 
+	 (thanks to Willie Arbuckle for the report)
+
+	* Suppresed spurious BC55 warnings about iterators
+
+	* complex_io.h - fixed operators declarations for MetroWerks 	
+
+	* debug/_slist.h - cleaned up use of stl_debug_do obsolete macro (thanks to Matti Rintala)
+
+	* debug/_iterator.h, debug/_vector.h - fixed relaxed iterator constructors (thanks to Dave Abrahams for the patch) 
+
+	* stl/_complex.h - fixes for gcc-2.95 on IRIX (thanks to Marc W. Mengel) 
+	
+        * debug/_iterator.h : fixed relaxed const/non-const iterator construction for debug mode
+	  (thanks to Dave Abrahams for the patch)
+	
+	* collate : added workaround for SUNpro linker (thanks to Petr Ovchenkov for the fix)
+
+	* _ios.h, _streambuf.h - added obsolete stuff required by the standard
+
+	* _config.h/stdexcept - introduced __STL_NOTHROW_INHERITED to be used when we actually need
+	  exception specification due to inheritance (thanks to Joe for the report)
+
+	* _locale.h:104 : fixed ummaned parameters
+
+	* _tempbuf.h - fixed absent inclusion of _tempbuf.c
+
+	* <exception> : relaxed rules for importing vendor symbols
+
+	* _deque.h - added != operator
+
+	* _streambuf.h - fixed snextc() bug for wchar_t
+
+	* <ostream>, _numeric_facets.h - circular dependency resolved
+
+	* stl/_iosfwd.h - added include guard
+
+	* basic_[io]stream::sentry made inner class again (as per standard) 
+	  for non-DLL compilations.
+
+	* vector<void*> is used in locale implementation to reduce code bloat,
+	  vector<void*> exported from DLL
+
+	* <stdexcept> : exported more stuff
+
+	* stl_intel.h : ICL config merged into stl_msvc.h
+
+	* gcc.mak - fixed for shared target
+	
+The following changes were made in 4.0 beta 5 since 4.0 beta 4:
+
+	* _hastable.c:263 : removed inneeded cast (thanks to Will Fike for the report)
+
+	* debug/_string.h :  added conversion to non-SGI string (thanks to Todd Richmond for the report)
+
+	* _complex.h : fixed DLL declarations for i/o operators
+
+	* _ostream.h : fixed sentry behavoiur and DLL specs.
+
+	* _istream.h : fixed DLL specs, optimized some try/catch blocks
+
+	* _vector.h : fixed vector::insert body definition for __STL_INLINE_MEMBER_TEMPLATES
+
+	* <exception> : more compilers listed as having full exception header
+
+	* debug/_debug.h : added namespace to __STL_ASSERT for EH test which uses this internal macro.
+
+	* resource info fixed (thanks to Michael Entin for the report)
+
+	* debug/_string.h : fixed _M_start resolution bug (thanks to Rob for the report )
+
+	* <new> : added import of new_handler stuff from vendor namespace (thanks to Niran Bala for the report).
+
+	* src/c_locale_glibc - missed directory contents restored (thanks to Todd Rider for the report)
+
+	* mwerks_prj - project updated for new file set, target names for x86 changed to conform to common schema
+
+	* _ostream.c/_istream.c : fixed lookup for _S_eof symbol (thanks to Anton Sergeev for the report)
+
+	* _ios.h - fixed VC++ DLL warning for specializations
+
+	* stl_ibm.h - disabled "long long" due to incomplete support on MVS by request (thanks to Tinny Ng)
+	
+	* char_traits.h - worked around weird gcc internal bug (__sz identifier changed to _Sz)
+	
+The following changes were made in 4.0 beta 4 since 4.0 beta 3:
+
+	* "src" directory : source divided into smaller parts to be more manageable and to
+	  get more cache locality
+
+	* throw specifications removed (macros made void) - thanks to Dave Abrahams for the suggestion
+	
+	* stl/_list.c - fixed reverse() "inline", 
+	  _deque.h - fixed cast bug for xlC (thanks to Alex Vanic for the reports)
+		
+	* stl/_strstream.h - fixed DLL specs (thanks to Parcival Willems for the report)
+
+	* stl/_string.h, debug/_string.h - fixed conversion from native string with __STL_DEBUG
+	  (thanks to Todd Richmond for the report).
+
+	* stl/_istream.h - fixed clash of "__N" symbol with ctype.h macro for some compilers
+	  (thanks to Kees de Bruin for the report)
+
+	* Configuration fixed for Borland C++ 5.02 compiler [ deque still does not work with it ]
+
+	* gcc-2.7.2 configuration fixed	
+
+	* SGI iostreams now work for Borland 5.5 with static lib , some problems with
+	  locale initialization when DLL is used.
+	
+	* __get_c_string exported in DLL (thanks to Ed Ball for the report).
+
+	* ENDIAN fixes for CodeWarrior/DEC (thanks to Kevin Wooten for bringing this up)
+
+	* wrap_std/h/strstream.h - added missing wrapper (Thanks to Laurent for the report)
+
+	* stl_hpacc.h - fixed #endif bug, 
+	  _limits.h/.c - fixed array initialization, 
+	  _string_io.h, _locale.h - fixed circular dependancy,
+	  _set.[hc], _hashtable.c, _set.h - added __REINTERPRET_CAST need by some compilers;
+	  _i[o]stream.c, _rope.[hc] - lookup fixed for dependant symbols 
+	  (thanks to Alain Miniussi for the reports)
+	
+After-release minor bugfixes for beta3:
+	
+	* stl/_list.c - fixed reverse() [ new SGI code, merged unported first ]
+	  Thanks for everybody who reported it.
+	
+	* stl/_bvector.h : fixed ambiguity problem with relational iterators
+	  for __STL_NO_BOOL case (thanks to Alex Vanic for the report).
+
+	* stl/_alloc.c, stl/_threads.c - fixed static member definitions for compilers
+	  that lack automatic static data members (gcc-2.7). Thanks to Huang-Ming Huang 
+	  for the report. 
+
+	* standard wide streams initialization bug on Win32 fixed (thanks to Harold Putman for the
+	  report)
+	
+The following changes were made in 4.0 beta 3 since 4.0 beta 2:
+
+	* Merged SGI changes from 02/18 snapshot.
+	
+        * Ming32W (gcc Win32 port using MS runtime lib) is now fully supported. 
+
+	* .dll build schema improved, now builds with mingw32 and Borland C++
+	  (Borland has some problem with numeric i/o)
+	
+	* VC++ version bugfixes in <xstring>/<xutility>/<xstring> 
+	  (thanks to Todd Richmond for the report)
+
+	* _bvector.h - relational operators defined only for "bit_vector", 
+	   not for "vector" specializations (thanks to Edward Ball for the report)
+
+	* src/locale_impl.h - fixed multiple defined symbol problem with gcc
+	  (Thanks to Matti Rintala for the report)
+
+	* config/stl_ibm.h - __STL_NO_TYPEINFO added (thanks for Tinny Ng).
+	
+	* <string> : _stl_string_io.h/c introduced to fight inter-dependencies
+
+	* _bvector.h - added fix for -tempinc compilation on AIX (thanks to Alex Vanic for the patch)
+
+	* fstream.cpp - _M_write bug for Win32 text mode fixed (thanks to Mike Pyle)
+
+	* _string.h : debug version included prior to _string.c;
+
+	* debug/_debug.h/.c, debug/_deque.h, debug/_string.h - fixed debug mode bugs;
+	  Apple compilers config fixes / iostream wrapping fixes / EH test fixes,
+	  (thanks to Tsutomu Youshida for the patch)
+
+	* csetjmp/setjmp.h - guards added against VC++ #defines (thanks to Gavin Wood)
+
+	* stl/_iosfwd.h : __STL_DEFAULT_CONSTRUCTED used instead of __STL_NULL_CHAR_INIT
+	(thanks to Alex Vanic for the report)
+
+	* __stl_get_c_string() - made extern non-template for SGI iostreams mode.
+
+	* __cdecl calling convention fixes - now works for debug & non-debug code.
+
+	* _limits.h/.c : static data moved from inline functions into a class.
+
+	* stlport_msvc.rc resource file added for DLL's (thanks to Michael Entin)
+
+	* stlport/config/stl_wince.h : added abort()/assert() definitions
+	  (thanks to Gavin Wood for the report)
+
+	* Initial iostreams port for xlC (thanks to Alexander Vanic for the patch).
+
+	* config files - made safe for C compilers
+
+	* src/c_locale_stub.c - made structure for full platform-dependent 
+	  locales other than "C". Glibc implementation merged.
+	
+The following changes were made in 4.0 release candidate 2 since 4.0 release candidate 1:
+
+	* Solid approach to __STL_DEFAULT_CONSTRUCTOR_BUG problem implemented,
+	  rope.h typo fixed (thanks to Alex Vanic for the report) 
+
+	* getline and stream operators moved from _istream.c to _string.c 
+	  where they belong (thanks for Petr Ovchenkov)
+
+	* <new> fixed to import nothrow and nothrow_t
+
+	* Borland C++ 5.5 (free compiler) supported (iostreams won't compile yet).
+	
+	* SUN CC 6.0 EA - new features unabled (most announced features still don't work though)
+	
+	* HP ACC configuration updated, some fixes for new aCC beta(thanks to Alain Miniussi).
+
+	* Windows CE compatibility fixed (thanks to Gavin Wood for the report)
+	
+	* <sstream> fixed for non-SGI case, ios.cpp bug in __STL_NO_EXCEPTIONS 
+	  mode fixed, debug iterators fix (thanks to Todd Richmond).
+	
+	* VC++ 5.0 and 4.2 compatibility fixed (thanks to Ilya for the report)
+
+	* __cdecl calling convention explicitly specified for VC++ & static/global functions.
+
+	* vc_common.mk : debug type changed to CV (thanks to Mike Pyle for the solution)
+	
+	* fstream.cpp : Win32 text mode : bugs fixed, SGI code used.
+	  fixed _M_open() creation flags for Win32 (thanks to Mike Pyle for the report)
+
+        * "install" target added for VC++ to install .dll's into Win system directory.
+
+	* __STL_USE_STATIC_LIB switch added to add flexibility to VC++ linking.
+	
+	* __stl_debug_message for WIN32/Unicode/MFC improved 
+	  (thanks to Edward Ball, Chvetsov for the reports)
+
+	* MVS fix for auto_ptr<> (thanks to Tinny Ng)
+
+	* debug/_tree.h, debug/_vector.h "typename" fixes, thanks to Matti Rintala.
+
+	* c_locale.h : fix for Solaris 2.5.x (thanks to B. K. Oxley)
+
+	* _bvector.h : Watcom compatibility fixed (thanks to Ricardo E. Gayoso for the report)
+
+	* __STL_DONT_REDEFINE_STD flag behaviour fixed
+	
+The following changes were made in 4.0 release candidate 1 since 3.2.2 Beta 4 :
+	
+	* Merged changes made to SGI standard library snapshot on 01/28.
+
+	* Fixed bug with istream reading numbers in hex mode (thanks to Dave Abrahams
+	  for the patch).
+
+	* Debug mode redesigned (again) - no extra namespaces is being used
+	  Finally, it works for MSVC and all other platforms.
+
+	* __SGI_STL_OWN_IOSTREAMS made to be the default mode except few platforms
+	  not provided with makefiles to build STLport yet.
+	
+	* Changed strategy on redefinig std:: namespace. 
+	  prolog/epilog technology used to get clean namespace wrapping.
+	  It also allows for managing stack of pragmas 
+	  (see stlport/stl/config/_prolog.h,_epilog.h) to get rid of warnings.
+	  Note : default namespace changed to _STL:: to satisfy implementation
+	  constraints and to allow for more compact symbols. 
+	  "stlport::" namespace is still defined for backwards compatibility.
+
+	* iostreams library now compiles on HP with aCC (thanks to Steven Serocki for the patch).
+
+	* Configuration for SUN Workshop 6.0 EA provided.
+	
+	* For VC++, corresponding [selected by /MT(d) or /MD(d) switch]
+	  STLport iostreams library is being linked automatically - all you
+	  need is to put library in lib search path or specify additional library path.
+
+	* Ability to turn on all warnings in your own code if you're using 
+	  a compiler with appropriate support (e.g. MSVC6).
+	  
+	* Small fixes posted to the forum integrated:
+	
+	 * config/stl_wince.h : added __STL_HAS_NO_NEW_C_HEADERS switch
+	 * wrap_std/strsream  : fixed preprocessor bug, strstream.h included
+	  when not using new-style headers
+	 * other fixes
+	
+The following changes were made in 3.2.2 beta 4 since 3.2.2 Beta 3:
+
+	* Merged changes made to SGI standard library snapshot on 01/10.
+
+	* Major restructuring of header files - for maintainability and
+	  8.3 filesystems benefit.
+
+	* Major debug mode improvements - new debug mode now works with
+	 VC++, gcc, intel, SUNpro, MetroWerks.
+
+	* Regression test suite changed to new-style headers - thanks to
+	  Dima Pasechnik for the initial port.
+	
+	* <rope> fixes for Watcom
+
+	* many miscellanous fixes.
+	
+The following changes were made in 3.2.2 beta 3 since 3.2.2 Beta 2:
+
+	* Merged changes made to SGI standard library snapshot in December.
+	
+	* std:: is not used for STLport namespace even with SGI iostreams,
+	  to avoid possible clashes and facilitate 3rd-party library use.
+          Same macro redefinition technique for stlport:: used to keep clients
+	  code with literal std:: happy as in native iostreams mode.
+	
+	* C library headers wrapping changed to allow multiple inclusion tricks
+	  (needed by gcc-2.95 mostly)
+	
+	* gcc-2.95 and CodeWarrior configurations updated.
+
+	* HP aCC fixes applied.
+
+	* Visual C++ - added static library targets, build refined.
+	  Fixed memory-mapping bugs.
+	
+	* auto_ptr updated, now it passes polymorphic tests with VC++.
+
+	* Many small bugfixes.
+	
+The following changes were made in 3.2.2 beta 2 since 3.2.2 Beta 1:
+
+	* Fixed SUN CC deque<> problem with -g
+	
+	* Added configuration and makefiles for DEC VMS, Borland and Win32 gcc.
+
+	* Merged changes made to November SGI standard library snapshot.
+
+	* config changes - "configure" made obsolete and moved into "stlport/config/new_compiler".
+
+	* __STL_TYPENAME_ON_RETURN_TYPE handling changed.
+	
+	* Miscellanous fixes.
+
+The following changes were made in 3.2.2 Beta 1 since 3.2.1 release:
+
+	* SGI iostreams adopted. To use SGI iostreams, user have to set
+	  __SGI_STL_OWN_IOSTREAMS flag and to build the library in "src"
+	  directory to link with. Please read INSTALL file for detailed
+	  instructions.
+	  Default setting is NOT to use SGI iostreams (wrappers used as before).
+
+	* Debug mode completely redesigned - debug mode containers are 
+	  implemented in terms of wrappers around non-debug ones.
+	  That provides for more clean and efficient implementation and
+	  binary compatibility between debug and non-debug versions.
+
+	* Additional configurations added for platforms :
+	     - gcc-2.95
+	     - SUNpro CC 5.0 in "compatibility" mode
+	  "configure" made obsolete.
+	
+	* Bugfixes reported by users since 3.2.1 release merged 
+
+The following changes were made in 3.2.1 since 3.2 release:
+
+	* Now, by default, STLPort renames std:: namespace for user
+	  if __STL_USE_OWN_NAMESPACE is used. To make it possible, many new
+	  wrapper headers introduced. Internally, STLport uses stlport:: namespace,
+	  so no link- or run- time clashes are possible, and you don't have to rebuild
+	  the runtime lib (which you don't want to).
+	  This feature makes STLport usable out-of-the box, without any modifications
+	  for client code, with any compiler.
+
+	* Code bloat reduction : hashtable<T> uses vector<void*> internally.
+
+	* Vector : efficiency/code bloat reduction fixes.
+
+	* Visual C++ : DLL export is supported for allocators and strings. To use it, 
+	  please define __STL_USE_DECLSPEC in all modules and __STL_DESIGNATED_DLL
+	  for the DLL which is supposed to instantiate STLport exports (at least one
+	  source of this DLL must include <string>.
+
+        * Visual C++ : for MT synchronization, <windows.h> is not included anymore.
+	
+	* For Sunpro C++ 5.0 : all headers are linked into stlport/SC5, so only
+	  one include path is needed. Note that SC5.0 has problems with relative 
+	  search path. It is easy to work around : in your makefiles, instead of
+	  "STL_INCL=../.." , write "STL_INCL=${PWD}/../..".
+
+	* Configuration files provided for compilers : 
+	   KAI C++
+	   DEC C++ (6.x, 5.x)
+	   Borland 5.02 is back on the road (finally !)
+	  
+	* Windows CE config provided for Visual C++.
+
+	* __STL_NO_IOSTREAMS switch introduced for embedded platforms.
+	
+	* Lots of minor config fixes and improvements for various platforms.
diff --git a/main/source/stlport/etc/README b/main/source/stlport/etc/README
new file mode 100644
index 00000000..78379cc4
--- /dev/null
+++ b/main/source/stlport/etc/README
@@ -0,0 +1,36 @@
+***********************************************
+
+This directory contains miscellanous files for STLport-4.6 release.
+
+***********************************************
+
+                 PROJECT COORDINATION FILES
+
+ * ChangeLog            - Log of changes since  STLport 4.0 release
+ * ChangeLog-4.0        - Log of changes before STLport 4.0 release
+
+ * TODO                 - Some future plans and directions 
+
+                 CVS HOUSEKEEPING, SCRIPTS
+
+ * cvsignore            - ignore patterns to use with GNU 'tar' command
+ * scvs                 - script to use CVS through SSH tunneling (the default 
+                          method at cvs.stlport.com)
+
+                 INDEPENDENT PACKAGING SUPPORT
+ * STLport-4.5.1.spec : spec file to build RPM for STLport-4.5.1
+
+                INTERNAL INSTALLATION SUPPORT
+
+ * std_headers_xxx.txt      - a list of headers to be placed in various dirs
+
+                         LOGOS
+
+ * stlport_powered_red.gif     Those are "Powered by STLport" logos. You are more than welcome
+   stlport_powered_white.gif   to put those logos on webpages for your product if it uses STLport.
+
+                         GOODIES
+
+ * msvcincl.dat         - the file to be placed in Windows directory 
+                          to exclude STLport files from VC++ dependancy checks
+
diff --git a/main/source/stlport/etc/STLport-4.5.1.spec b/main/source/stlport/etc/STLport-4.5.1.spec
new file mode 100644
index 00000000..2be23798
--- /dev/null
+++ b/main/source/stlport/etc/STLport-4.5.1.spec
@@ -0,0 +1,96 @@
+%define MAKEFILE gcc-linux.mak
+
+Summary: Complete C++ standard library
+Name: STLport
+Version: 4.5.1
+Release: 1
+Copyright: free (see license), see /usr/share/doc/%{name}-%{version}/license.html
+URL: http://www.stlport.org/
+Packager: Levente Farkas <lfarkas@mindmaker.hu>
+Group: System Environment/Languages
+Icon: stlport_powered_white.gif
+Source0: http://www.stlport.org/archive/%{name}-%{version}.tar.gz
+Patch0: STLport-rename.patch
+#Patch1: STLport-rules.patch
+#Patch2: STLport-install-dir.patch
+Buildroot: %{_tmppath}/%{name}-%{version}-%(id -u -n)
+
+%description
+STLport is a multiplatform STL implementation based on SGI STL.
+This package contains the runtime library for STLport.
+
+%package -n STLport-devel
+Summary: Complete C++ standard library header files and libraries
+Group: Development/Libraries
+Requires: STLport = %{version}
+
+%description -n STLport-devel
+STLport is a multiplatform STL implementation based on SGI STL. Complete   
+C++ standard library, including <complex> and SGI STL iostreams. If you
+would like to use your code with STLport add
+"-nostdinc++ -I/usr/include/stlport" when compile and -lstlport_gcc when
+link (eg: gcc -nostdinc++ -I/usr/include/stlport x.cc -lstlport_gcc).
+
+%prep
+%setup
+%patch0 -p1
+#%patch1 -p1
+#%patch2 -p1
+
+%build
+cd src
+make -f %{MAKEFILE} INSTALLDIR=$RPM_BUILD_ROOT/usr clean all
+
+%install
+rm -rf $RPM_BUILD_ROOT
+cd src
+make -f %{MAKEFILE} INSTALLDIR=$RPM_BUILD_ROOT/usr install
+cd $RPM_BUILD_ROOT/usr/include/stlport
+ln -s . ext
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%post -n STLport-devel
+/sbin/ldconfig
+
+%postun -n STLport-devel
+/sbin/ldconfig
+
+%files
+%defattr(-,root,root)
+%doc doc/license.html
+/usr/lib/libstlport_gcc.so
+#/usr/lib/libstlport_gcc.so.%{version}
+/usr/lib/libstlport_gcc.so.4.5
+
+%files -n STLport-devel
+%defattr(-,root,root)
+%doc INSTALL README doc etc test
+/usr/lib/libstlport_gcc*.a
+/usr/lib/libstlport_gcc_*debug.so*
+/usr/include/*
+
+%changelog
+* Mon Dec 10 2001 Levente Farkas <lfarkas@mindmaker.hu>
+- upgrade to 4.5.1
+
+* Fri Nov 16 2001 Levente Farkas <lfarkas@mindmaker.hu>
+- merge with Harold's changes
+
+* Thu Nov 15 2001 <stlport@lanceerplaats.nl>
+- rebuild for RedHat 7.2, spec file fixes.
+
+* Tue Oct  2 2001 Levente Farkas <lfarkas@mindmaker.hu>
+- upgrade to 4.5
+
+* Thu Oct 26 2000 Levente Farkas <lfarkas@mindmaker.hu>
+- upgrade to 4.1-b3
+
+* Thu Jul 17 2000 Levente Farkas <lfarkas@mindmaker.hu>
+- initial release use STLport-4.0
+
diff --git a/main/source/stlport/etc/STLport-4.5.3.spec b/main/source/stlport/etc/STLport-4.5.3.spec
new file mode 100644
index 00000000..2d7c151e
--- /dev/null
+++ b/main/source/stlport/etc/STLport-4.5.3.spec
@@ -0,0 +1,96 @@
+%define MAKEFILE gcc-linux.mak
+
+Summary: Complete C++ standard library
+Name: STLport
+Version: 4.5.3
+Release: 1
+Copyright: free (see license), see /usr/share/doc/%{name}-%{version}/license.html
+URL: http://www.stlport.org/
+Packager: Levente Farkas <lfarkas@mindmaker.hu>
+Group: System Environment/Languages
+Icon: stlport_powered_white.gif
+Source0: http://www.stlport.org/archive/%{name}-%{version}.tar.gz
+#Patch0: STLport-rename.patch
+#Patch1: STLport-rules.patch
+#Patch2: STLport-install-dir.patch
+Buildroot: %{_tmppath}/%{name}-%{version}-%(id -u -n)
+
+%description
+STLport is a multiplatform STL implementation based on SGI STL.
+This package contains the runtime library for STLport.
+
+%package -n STLport-devel
+Summary: Complete C++ standard library header files and libraries
+Group: Development/Libraries
+Requires: STLport = %{version}
+
+%description -n STLport-devel
+STLport is a multiplatform STL implementation based on SGI STL. Complete   
+C++ standard library, including <complex> and SGI STL iostreams. If you
+would like to use your code with STLport add
+"-nostdinc++ -I/usr/include/stlport" when compile and -lstlport_gcc when
+link (eg: gcc -nostdinc++ -I/usr/include/stlport x.cc -lstlport_gcc).
+
+%prep
+%setup
+%patch0 -p1
+#%patch1 -p1
+#%patch2 -p1
+
+%build
+cd src
+make -f %{MAKEFILE} INSTALLDIR=$RPM_BUILD_ROOT/usr clean all
+
+%install
+rm -rf $RPM_BUILD_ROOT
+cd src
+make -f %{MAKEFILE} INSTALLDIR=$RPM_BUILD_ROOT/usr install
+cd $RPM_BUILD_ROOT/usr/include/stlport
+ln -s . ext
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%post -n STLport-devel
+/sbin/ldconfig
+
+%postun -n STLport-devel
+/sbin/ldconfig
+
+%files
+%defattr(-,root,root)
+%doc doc/license.html
+/usr/lib/libstlport_gcc.so
+#/usr/lib/libstlport_gcc.so.%{version}
+/usr/lib/libstlport_gcc.so.4.5
+
+%files -n STLport-devel
+%defattr(-,root,root)
+%doc INSTALL README doc etc test
+/usr/lib/libstlport_gcc*.a
+/usr/lib/libstlport_gcc_*debug.so*
+/usr/include/*
+
+%changelog
+* Mon Dec 10 2001 Levente Farkas <lfarkas@mindmaker.hu>
+- upgrade to 4.5.1
+
+* Fri Nov 16 2001 Levente Farkas <lfarkas@mindmaker.hu>
+- merge with Harold's changes
+
+* Thu Nov 15 2001 <stlport@lanceerplaats.nl>
+- rebuild for RedHat 7.2, spec file fixes.
+
+* Tue Oct  2 2001 Levente Farkas <lfarkas@mindmaker.hu>
+- upgrade to 4.5
+
+* Thu Oct 26 2000 Levente Farkas <lfarkas@mindmaker.hu>
+- upgrade to 4.1-b3
+
+* Thu Jul 17 2000 Levente Farkas <lfarkas@mindmaker.hu>
+- initial release use STLport-4.0
+
diff --git a/main/source/stlport/etc/STLport-4.6.spec b/main/source/stlport/etc/STLport-4.6.spec
new file mode 100644
index 00000000..6ae6cc1d
--- /dev/null
+++ b/main/source/stlport/etc/STLport-4.6.spec
@@ -0,0 +1,99 @@
+%define MAKEFILE gcc-linux.mak
+
+Summary: Complete C++ standard library
+Name: STLport
+Version: 4.6
+Release: 1
+Copyright: free (see license), see /usr/share/doc/%{name}-%{version}/license.html
+URL: http://www.stlport.org/
+Packager: Levente Farkas <lfarkas@mindmaker.hu>
+Group: System Environment/Languages
+Icon: stlport_powered_white.gif
+Source0: http://www.stlport.org/archive/%{name}-%{version}.tar.gz
+#Patch0: STLport-rename.patch
+#Patch1: STLport-rules.patch
+#Patch2: STLport-install-dir.patch
+Buildroot: %{_tmppath}/%{name}-%{version}-%(id -u -n)
+
+%description
+STLport is a multiplatform STL implementation based on SGI STL.
+This package contains the runtime library for STLport.
+
+%package -n STLport-devel
+Summary: Complete C++ standard library header files and libraries
+Group: Development/Libraries
+Requires: STLport = %{version}
+
+%description -n STLport-devel
+STLport is a multiplatform STL implementation based on SGI STL. Complete   
+C++ standard library, including <complex> and SGI STL iostreams. If you
+would like to use your code with STLport add
+"-nostdinc++ -I/usr/include/stlport" when compile and -lstlport_gcc when
+link (eg: gcc -nostdinc++ -I/usr/include/stlport x.cc -lstlport_gcc).
+
+%prep
+%setup
+%patch0 -p1
+#%patch1 -p1
+#%patch2 -p1
+
+%build
+cd src
+make -f %{MAKEFILE} INSTALLDIR=$RPM_BUILD_ROOT/usr clean all
+
+%install
+rm -rf $RPM_BUILD_ROOT
+cd src
+make -f %{MAKEFILE} INSTALLDIR=$RPM_BUILD_ROOT/usr install
+cd $RPM_BUILD_ROOT/usr/include/stlport
+ln -s . ext
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%post -n STLport-devel
+/sbin/ldconfig
+
+%postun -n STLport-devel
+/sbin/ldconfig
+
+%files
+%defattr(-,root,root)
+%doc doc/license.html
+/usr/lib/libstlport_gcc.so
+#/usr/lib/libstlport_gcc.so.%{version}
+/usr/lib/libstlport_gcc.so.4.6
+
+%files -n STLport-devel
+%defattr(-,root,root)
+%doc INSTALL README doc etc test
+/usr/lib/libstlport_gcc*.a
+/usr/lib/libstlport_gcc_*debug.so*
+/usr/include/*
+
+%changelog
+* Fri Oct 31 2003 <boris@stlport.com>
+- upgrade to 4.6
+
+* Mon Dec 10 2001 Levente Farkas <lfarkas@mindmaker.hu>
+- upgrade to 4.5.1
+
+* Fri Nov 16 2001 Levente Farkas <lfarkas@mindmaker.hu>
+- merge with Harold's changes
+
+* Thu Nov 15 2001 <stlport@lanceerplaats.nl>
+- rebuild for RedHat 7.2, spec file fixes.
+
+* Tue Oct  2 2001 Levente Farkas <lfarkas@mindmaker.hu>
+- upgrade to 4.5
+
+* Thu Oct 26 2000 Levente Farkas <lfarkas@mindmaker.hu>
+- upgrade to 4.1-b3
+
+* Thu Jul 17 2000 Levente Farkas <lfarkas@mindmaker.hu>
+- initial release use STLport-4.0
+
diff --git a/main/source/stlport/etc/TODO b/main/source/stlport/etc/TODO
new file mode 100644
index 00000000..4767ddfc
--- /dev/null
+++ b/main/source/stlport/etc/TODO
@@ -0,0 +1,36 @@
+**********************************************************************
+* 	   TODO file for STLport                                     *
+*                                                                    *
+**********************************************************************
+
+This file lists various prospective things to do with STLport.
+
+Please feel free to contribute to implementing any of these.
+Please submit results back to STLport coordinator 
+( boris@stlport.com, http://www.stlport.com/forum ).
+
+Below, numbers in "[]" brackets indicate priority.
+
+[1] Make sure that the libary compiled with thread support, 
+is binary compatible with _NOTHREADS compiled projects. Hint - now it's NOT. 
+
+[1] More makefiles in src directory.
+
+[1] More detailed installation/build instructions.
+
+[2] More detailed documentation.
+
+[1] User-friendly installation scripts.
+
+[3] iostreams efficiency analysis.
+
+[3] iostream/STL benchmarking against other implementations.
+
+[3] An "undef" script to expand macros and produce more readable
+STLport headers customized for given configuration automatically.
+
+[1] More points to add to this file ;).
+
+
+
+
diff --git a/main/source/stlport/etc/cvsignore b/main/source/stlport/etc/cvsignore
new file mode 100644
index 00000000..56185a4b
--- /dev/null
+++ b/main/source/stlport/etc/cvsignore
@@ -0,0 +1,22 @@
+ignore
+dev
+fix
+lib
+*.o
+*.obj
+*~
+*.exe
+*.dll
+*.core
+*.bak
+*.out
+*.pdb
+*.pch
+.*
+core
+CVS
+SunWS_cache
+Templates.DB
+*.gz
+doc
+make_snap.sh
diff --git a/main/source/stlport/etc/msvcincl.dat b/main/source/stlport/etc/msvcincl.dat
new file mode 100644
index 00000000..afd7ba24
--- /dev/null
+++ b/main/source/stlport/etc/msvcincl.dat
@@ -0,0 +1,309 @@
+algo.h
+algobase.h
+algorith.h
+algorithm
+alloc.h
+bitset
+bitset.h
+bvector.h
+cassert
+cassert.h
+cctype
+cctype.h
+cerrno
+cerrno.h
+cfloat
+cfloat.h
+char_traits.h
+climits
+climits.h
+clocale
+clocale.h
+cmath
+cmath.h
+complex
+complex.h
+concept_checks.h
+configure
+configure.in
+csetjmp
+csetjmp.h
+csignal
+csignal.h
+cstdarg
+cstdarg.h
+cstddef
+cstddef.h
+cstdio
+cstdio.h
+cstdlib
+cstdlib.h
+cstring
+cstring.h
+ctime
+ctime.h
+ctype.h
+cwchar
+cwchar.h
+cwctype
+cwctype.h
+c_locale.h
+defalloc.h
+deque
+deque.h
+exceptio.h
+exception
+exception.h
+export
+fstream
+fstream.h
+function.h
+functional
+hashtable.h
+hash_map
+hash_map.h
+hash_set
+hash_set.h
+heap.h
+iomanip
+iomanip.h
+ios
+ios.h
+iosfwd
+iosfwd.h
+iostream
+iostream.h
+istream
+istream.h
+iterator
+iterator.h
+limits
+limits.h
+list
+list.h
+locale
+locale.h
+map
+map.h
+math.h
+mem.h
+memory
+memory.h
+mmemory.h
+msl_string.h
+multimap.h
+multiset.h
+new
+new.h
+numeric
+numeric.h
+numeric.h
+ostream
+ostream.h
+pair.h
+pthread.h
+pthread_alloc
+pthread_alloc.h
+queue
+queue.h
+rope
+rope.h
+set
+set.h
+setjmp.h
+signal.h
+slist
+slist.h
+sstream
+sstream.h
+stack
+stack.h
+stdarg.h
+stddef.h
+stddef.h
+stdexcep.h
+stdexcept
+stdio.h
+stdio_streambuf
+stdlib.h
+stdlib.h
+stlcomp.h
+stlconf.h.in
+stl_apcc.h
+stl_apple.bak.h
+stl_apple.h
+stl_as400.h
+stl_bc.h
+stl_como.h
+stl_confix.h
+stl_dec.h
+stl_dec_vms.h
+stl_fujitsu.h
+stl_gcc.h
+stl_hpacc.h
+stl_ibm.h
+stl_intel.h
+stl_kai.h
+stl_mlc.h
+stl_msvc.h
+stl_mwerks.h
+stl_mycomp.h
+stl_sco.h
+stl_select_lib.h
+stl_sgi.h
+stl_solaris.h
+stl_sunpro.h
+stl_symantec.h
+stl_tmpl.h
+stl_user_config.h
+stl_watcom.h
+stl_wince.h
+streambu.h
+streambuf
+streambuf.h
+string
+string.h
+strstrea.h
+strstream
+strstream.h
+tempbuf.h
+time.h
+tree.h
+typeinfo
+typeinfo.h
+type_traits.h
+utility
+utility.h
+valarray
+valarray.h
+vc_select_lib.h
+vector
+vector.h
+wchar.h
+wctype.h
+_abbrevs.h
+_algo.c
+_algo.h
+_algobase.c
+_algobase.h
+_alloc.c
+_alloc.h
+_alloc_old.h
+_auto_ptr.h
+_bitset.c
+_bitset.h
+_bvector.h
+_check_config.h
+_codecvt.h
+_collate.h
+_complex.c
+_complex.h
+_config.h
+_config_compat.h
+_config_compat_post.h
+_construct.h
+_ctraits_fns.h
+_ctype.h
+_cwchar.h
+_debug.c
+_debug.h
+_deque.c
+_deque.h
+_epilog.h
+_epilog.h
+_exception.h
+_fstream.c
+_fstream.h
+_function.h
+_function_base.h
+_hashtable.c
+_hashtable.h
+_hash_fun.h
+_hash_map.h
+_hash_set.h
+_heap.c
+_heap.h
+_ios.c
+_ios.h
+_iosfwd.h
+_ios_base.h
+_istream.c
+_istream.h
+_istreambuf_iterator.h
+_iterator.h
+_iterator.h
+_iterator_base.h
+_iterator_old.h
+_limits.c
+_limits.h
+_list.c
+_list.h
+_list.h
+_locale.h
+_map.h
+_messages_facets.h
+_mmap.h
+_monetary.c
+_monetary.h
+_msvc_warnings_off.h
+_null_stream.h
+_numeric.c
+_numeric.h
+_numpunct.h
+_num_get.c
+_num_get.h
+_num_put.c
+_num_put.h
+_ostream.c
+_ostream.h
+_ostreambuf_iterator.h
+_pair.h
+_prolog.h
+_pthread_alloc.h
+_ptrs_specialize.h
+_queue.h
+_range_errors.h
+_raw_storage_iter.h
+_relops.h
+_relops_cont.h
+_relops_template.h
+_rope.c
+_rope.h
+_set.h
+_set_operators.h
+_site_config.h
+_slist.c
+_slist.h
+_slist_base.c
+_slist_base.h
+_sparc_atomic.h
+_sstream.c
+_sstream.h
+_stack.h
+_stdio_file.h
+_stdio_file.h.new
+_streambuf.c
+_streambuf.h
+_streambuf_iterator.h
+_stream_iterator.h
+_string.c
+_string.h
+_string_fwd.c
+_string_fwd.h
+_string_hash.h
+_string_io.c
+_string_io.h
+_strstream.h
+_tempbuf.c
+_tempbuf.h
+_threads.c
+_threads.h
+_time_facets.c
+_time_facets.h
+_tree.c
+_tree.h
+_uninitialized.h
+_valarray.c
+_valarray.h
+_vector.c
+_vector.h
diff --git a/main/source/stlport/etc/scvs b/main/source/stlport/etc/scvs
new file mode 100644
index 00000000..a13e753e
--- /dev/null
+++ b/main/source/stlport/etc/scvs
@@ -0,0 +1,192 @@
+#!/usr/bin/perl
+# Note : you may have to edit path to Perl above, according to your system setup
+
+#
+# modified for ssh+chroot setup by Anton Berezin <tobez@plab.ku.dk> #
+# Synopsys : scvs -d :pserver:cvs@www.stlport.com/stlport <cvs command> # (this is for read-only anonymous access via "cvs" user)
+# Please use your cvs login name if you have one instead of "cvs" above, to be able to commit your changes 
+#
+
+
+#--
+#   tunable variables
+#--
+
+# Set this if it does not work otherwise
+# $tune_cvs_server_name = "cvs.stlport.com";
+
+# where cvs program is located on the client system
+$tune_local_cvs_cmd = "cvs";
+
+# remote pserver port to use
+# for explanation, see
+#    http://www.prima.eu.org/tobez/cvs-howto.html#inetd
+$tune_remote_cvs_port = 2410;
+
+# local pserver port;  you probably don't want to change this
+$tune_local_cvs_port = 2401;
+
+# ssh command to use; the default is good for UNIX clients
+$tune_ssh_cmd = "ssh";
+
+# the user on the server side cvs runs as
+$tune_ssh_user = "cvs";
+
+#--
+#   end of tunable variables
+#   there is no need to modify anything below
+#--
+
+#############################################################################
+# CVS settings
+
+$CVS_CMD=$tune_local_cvs_cmd;
+
+$CVS_PORT=$tune_remote_cvs_port;
+$CVS_LOCAL_PORT=$tune_local_cvs_port;
+
+# the values below will be needed only if the repository is specified via the
+# command line or the CVSROOT environment variable, and in those cases they
+# will be extracted from there. However, for funny results you can uncomment
+# these two lines.
+# $CVS_HOST="www.stlport.com";
+# $CVS_USER="cvs";
+
+#############################################################################
+# SSH settings
+
+# ssh2 does not seem to work with our -L port:host:hostport argument, so make
+# sure we will use ssh1.
+$SSH_CMD=$tune_ssh_cmd;
+
+# This should be the user on whose behalf the tunneling is made. It is
+# typically a user that cannot do any harm, has no password and uses a program
+# like nologin (but one that will wait) as a shell.
+$SSH_USER=$tune_ssh_user;
+
+# This value should also automagically be set from the repository name.
+# However, if that host is not running sshd, you may want to tunnel through
+# another host and modify and uncomment the line below.
+# $SSH_HOST=$CVS_HOST
+
+# This value is used if the repository cannot be determined from the
+# commandline or the CVSROOT variable. Modify this for your local situation.
+$SSH_DEFAULT_HOST=$tune_cvs_server_name;
+
+# Port at which the sshd on the remote server runs. Default is 22.
+# $SSH_PORT=22;
+
+# This should be left unmodified, as it makes no sense changing this. Unless
+# some future version (or perhaps even the current version) of cvs allow you
+# to specify the remote repository's port.
+$SSH_LOCAL_PORT=$CVS_LOCAL_PORT;
+
+
+#############################################################################
+# & parse_repository ({{rep}})
+# . extracts the method, user, host, port and directory from {{rep}}.
+# . There are four possibilities:
+#   - /path/to/repository
+#   - :method:/path/to/repository
+#   - :user@hostname:/path/to/repository
+#   - :method:user@hostname:/path/to/repository
+#   non-standard repositories. Has only been tested for :pserver: method.
+#
+sub parse_repository
+{
+  my $rep = $_[0];
+  my ($dir,$user,$host,$method);
+
+  # determine the directory
+  $rep =~ s/:(\/.*)$// && do { $dir=$1; };
+  if (not $dir)
+    { $rep =~ s/(\/.*)$// && do {$dir = $1; }; }
+
+  # determine the hostname and the username
+  $rep =~ s/:([^:]*)@(.*)$// && do { $user = $1; $host = $2; };
+  if (not $host)
+    { $rep =~ s/:([^:]+)$// && do { $host = $1; }; }
+
+  # all that is left now is the method
+  $rep =~ s/^:([^:]*)// && do { $method = $1; };
+
+  # if there is still anything left, we have an error, warn the user
+  if ($rep)
+    { print STDERR "Warning: repository parsed wrong ('$rep' ignored).\n"; }
+
+#  print STDERR "DEBUG: dir=$dir, user=$user, host=$host, method=$method\n";
+  return ($method, $user, $host, $dir);
+}
+
+
+#############################################################################
+# main
+
+# should be changed to a general cmdline parsing routine.
+# get the repository's name from the commandline or the CVSROOT environment
+# variable.
+if ($ARGV[0] eq "-d")
+{
+  $rep="$ARGV[1]";
+  shift; shift;
+}
+else
+{
+  $rep = $ENV{'CVSROOT'};
+}
+
+# print STDERR "DEBUG: rep = $rep\n";
+
+# parse the repository
+($method, $user, $host, $dir) = parse_repository $rep;
+# print "met: $method, user: $user, host: $host, dir: $dir\n";
+
+# construct the local fake cvs server name.
+if ($method) { $cvs_serv = ":$method:"; }
+if ($user)   { $cvs_serv .= "$user\@"; }
+if ($rep)    { $cvs_serv .= "localhost:"; }
+if ($dir)    { $cvs_serv .= $dir; }
+
+# print STDERR "DEBUG: cvs_serv = $cvs_serv\n";
+
+# construct the tunneling command
+$SSH_HOST |= $host;
+# print STDERR "DEBUG: SSH_HOST=$SSH_HOST\n";
+$SSH_HOST |= $SSH_DEFAULT_HOST;
+# print STDERR "DEBUG: SSH_HOST=$SSH_HOST\n";
+
+if ($SSH_USER)
+  { $ssh_serv="$SSH_USER\@$SSH_HOST"; }
+else
+  { $ssh_serv="$SSH_HOST"; }
+
+# print "ssh_serv: $ssh_serv\n";
+
+$tunnel_cmd = "$SSH_CMD $ssh_serv -x -f"
+            . ( ($SSH_PORT) ? " -p $(SSH_PORT)" : "" )
+            . " -L $SSH_LOCAL_PORT:$SSH_HOST:$CVS_PORT open";
+
+# print STDERR "DEBUG: tunnel_cmd: $tunnel_cmd\n";
+
+# execute the tunneling, and read the response from the server
+open (TUNNELSH,"$tunnel_cmd |") or die "Could not execute $tunnel_cmd!";
+chomp ($magicword = <TUNNELSH>);
+# print STDERR "DEBUG: magicword = $magicword!\n";
+
+# Now we can call system to execute the cvs command.
+  # print STDERR "Doing: $CVS_CMD|", ( ($cvs_serv) ? ('-d |', "$cvs_serv|") : ( ) ) , "@ARGV", "|\n";
+$exitcode =
+  system "$CVS_CMD", ( ($cvs_serv) ? ('-d', $cvs_serv) : () ) , @ARGV;
+
+if ($exitcode) { print STDERR "Could not execute CVS command!\n"; }
+
+# close the tunnel
+#print STDERR "DEBUG: ", ( "$SSH_CMD $ssh_serv -q -x -f"
+#            . ( ($SSH_PORT) ? " -p $SSH_PORT" : "" )
+#            . " $magicword" );
+# print STDERR "before close\n";
+system ( "$SSH_CMD $ssh_serv -q -x -f"
+            . ( ($SSH_PORT) ? " -p $SSH_PORT" : "" )
+            . " $magicword" );
+
+# print STDERR "right after close\n";
diff --git a/main/source/stlport/etc/std_headers.txt b/main/source/stlport/etc/std_headers.txt
new file mode 100644
index 00000000..f5ffe131
--- /dev/null
+++ b/main/source/stlport/etc/std_headers.txt
@@ -0,0 +1,34 @@
+algorithm
+bitset
+complex
+deque
+fstream
+functional
+hash_map
+hash_set
+iomanip
+ios
+iosfwd
+iostream
+istream
+iterator
+limits
+list
+locale
+map
+memory
+numeric
+ostream
+pthread_alloc
+queue
+set
+slist
+sstream
+stack
+stdexcept
+streambuf
+string
+strstream
+utility
+valarray
+vector
diff --git a/main/source/stlport/etc/std_headers_c.txt b/main/source/stlport/etc/std_headers_c.txt
new file mode 100644
index 00000000..83c93f16
--- /dev/null
+++ b/main/source/stlport/etc/std_headers_c.txt
@@ -0,0 +1,17 @@
+cassert
+cctype
+cerrno
+cfloat
+climits
+clocale
+cmath
+csetjmp
+csignal
+cstdarg
+cstddef
+cstdio
+cstdlib
+cstring
+ctime
+cwchar
+cwctype
diff --git a/main/source/stlport/etc/std_headers_c_h.txt b/main/source/stlport/etc/std_headers_c_h.txt
new file mode 100644
index 00000000..a22c73bd
--- /dev/null
+++ b/main/source/stlport/etc/std_headers_c_h.txt
@@ -0,0 +1,13 @@
+ctype.h
+locale.h
+math.h
+setjmp.h
+signal.h
+stdarg.h
+stddef.h
+stdio.h
+stdlib.h
+string.h
+time.h
+wchar.h
+wctype.h
diff --git a/main/source/stlport/etc/std_headers_classic_iostreams.txt b/main/source/stlport/etc/std_headers_classic_iostreams.txt
new file mode 100644
index 00000000..0bf10849
--- /dev/null
+++ b/main/source/stlport/etc/std_headers_classic_iostreams.txt
@@ -0,0 +1,8 @@
+fstream.h
+iomanip.h
+ios.h
+iostream.h
+istream.h
+ostream.h
+streambuf.h
+strstream.h
diff --git a/main/source/stlport/etc/std_headers_cpp_runtime.txt b/main/source/stlport/etc/std_headers_cpp_runtime.txt
new file mode 100644
index 00000000..556a2e7a
--- /dev/null
+++ b/main/source/stlport/etc/std_headers_cpp_runtime.txt
@@ -0,0 +1,3 @@
+exception
+new
+typeinfo
diff --git a/main/source/stlport/etc/std_headers_cpp_runtime_h.txt b/main/source/stlport/etc/std_headers_cpp_runtime_h.txt
new file mode 100644
index 00000000..5c053a5e
--- /dev/null
+++ b/main/source/stlport/etc/std_headers_cpp_runtime_h.txt
@@ -0,0 +1,3 @@
+exception.h
+new.h
+typeinfo.h
diff --git a/main/source/stlport/etc/stlport_powered_red.gif b/main/source/stlport/etc/stlport_powered_red.gif
new file mode 100644
index 00000000..8f725d15
Binary files /dev/null and b/main/source/stlport/etc/stlport_powered_red.gif differ
diff --git a/main/source/stlport/etc/stlport_powered_white.gif b/main/source/stlport/etc/stlport_powered_white.gif
new file mode 100644
index 00000000..2bea0fc5
Binary files /dev/null and b/main/source/stlport/etc/stlport_powered_white.gif differ
diff --git a/main/source/stlport/lib/obj/VC71/DebugSTL/vc70.pdb b/main/source/stlport/lib/obj/VC71/DebugSTL/vc70.pdb
new file mode 100644
index 00000000..890906af
Binary files /dev/null and b/main/source/stlport/lib/obj/VC71/DebugSTL/vc70.pdb differ
diff --git a/main/source/stlport/lib/obj/VC71/DebugSTLD/vc70.pdb b/main/source/stlport/lib/obj/VC71/DebugSTLD/vc70.pdb
new file mode 100644
index 00000000..5d9c06d1
Binary files /dev/null and b/main/source/stlport/lib/obj/VC71/DebugSTLD/vc70.pdb differ
diff --git a/main/source/stlport/lib/obj/VC71/Release/vc70.pdb b/main/source/stlport/lib/obj/VC71/Release/vc70.pdb
new file mode 100644
index 00000000..c879885a
Binary files /dev/null and b/main/source/stlport/lib/obj/VC71/Release/vc70.pdb differ
diff --git a/main/source/stlport/lib/obj/VC71/ReleaseD/vc70.pdb b/main/source/stlport/lib/obj/VC71/ReleaseD/vc70.pdb
new file mode 100644
index 00000000..142e5d0c
Binary files /dev/null and b/main/source/stlport/lib/obj/VC71/ReleaseD/vc70.pdb differ
diff --git a/main/source/stlport/lib/stlport_vc71.exp b/main/source/stlport/lib/stlport_vc71.exp
new file mode 100644
index 00000000..f41bef1c
Binary files /dev/null and b/main/source/stlport/lib/stlport_vc71.exp differ
diff --git a/main/source/stlport/lib/stlport_vc71.lib b/main/source/stlport/lib/stlport_vc71.lib
new file mode 100644
index 00000000..8e09de6f
Binary files /dev/null and b/main/source/stlport/lib/stlport_vc71.lib differ
diff --git a/main/source/stlport/lib/stlport_vc7146.dll b/main/source/stlport/lib/stlport_vc7146.dll
new file mode 100644
index 00000000..305abbcd
Binary files /dev/null and b/main/source/stlport/lib/stlport_vc7146.dll differ
diff --git a/main/source/stlport/lib/stlport_vc71_static.lib b/main/source/stlport/lib/stlport_vc71_static.lib
new file mode 100644
index 00000000..b1e707f4
Binary files /dev/null and b/main/source/stlport/lib/stlport_vc71_static.lib differ
diff --git a/main/source/stlport/lib/stlport_vc71_stldebug.exp b/main/source/stlport/lib/stlport_vc71_stldebug.exp
new file mode 100644
index 00000000..7d97dee4
Binary files /dev/null and b/main/source/stlport/lib/stlport_vc71_stldebug.exp differ
diff --git a/main/source/stlport/lib/stlport_vc71_stldebug.lib b/main/source/stlport/lib/stlport_vc71_stldebug.lib
new file mode 100644
index 00000000..6a890a58
Binary files /dev/null and b/main/source/stlport/lib/stlport_vc71_stldebug.lib differ
diff --git a/main/source/stlport/lib/stlport_vc71_stldebug46.dll b/main/source/stlport/lib/stlport_vc71_stldebug46.dll
new file mode 100644
index 00000000..4b670d2e
Binary files /dev/null and b/main/source/stlport/lib/stlport_vc71_stldebug46.dll differ
diff --git a/main/source/stlport/lib/stlport_vc71_stldebug46.pdb b/main/source/stlport/lib/stlport_vc71_stldebug46.pdb
new file mode 100644
index 00000000..53b2e4a1
Binary files /dev/null and b/main/source/stlport/lib/stlport_vc71_stldebug46.pdb differ
diff --git a/main/source/stlport/lib/stlport_vc71_stldebug_static.lib b/main/source/stlport/lib/stlport_vc71_stldebug_static.lib
new file mode 100644
index 00000000..05443908
Binary files /dev/null and b/main/source/stlport/lib/stlport_vc71_stldebug_static.lib differ
diff --git a/main/source/stlport/src/MrCpp.mak b/main/source/stlport/src/MrCpp.mak
new file mode 100644
index 00000000..5b136770
--- /dev/null
+++ b/main/source/stlport/src/MrCpp.mak
@@ -0,0 +1,179 @@
+MAKEFILE        = MrCpp.mak
+¥MondoBuild¥    = {MAKEFILE}  # Make blank to avoid rebuilds when makefile is modified
+
+Sym-PPC         	= -sym on
+!ifdef DEBUG
+config_				= .PPC.DBG
+MrCpp_DebugOptions 	= -inline none,global -opt none {Sym-PPC}
+STL_DebugOptions 	= -d _STLP_DEBUG -d _STLP_DEBUG_ALLOC -d _STLP_DEBUG_UNINITIALIZED
+!else
+config_				= .PPC
+MrCpp_DebugOptions 	= 
+STL_DebugOptions 	= 
+!endif
+ObjDir          	= :{config_}:
+SrcDir				= :
+
+Includes     	= -i : -i "{STL}" -i "{CIncludes}"
+
+MrCpp_Options 	= -ansi on -ansifor -bool on -exceptions on -rtti on -align power -j0 -traceback -opt size -inline 3,global -includes unix_mac
+				
+STL_Options  	= 	#-d _STLP_USE_NEWALLOC ¶
+					#-d _STLP_NO_SGI_IOSTREAMS ¶
+					# end
+
+Link_options = ¶
+		-c 'MPS ' ¶
+		-mf ¶
+		-d ¶
+		-Linkfaster off ¶
+		#{Sym-PPC} ¶
+		# end
+
+### Default Rules ###
+
+"{ObjDir}" Ä "{SrcDir}"
+
+.cpp.x  Ä  .cpp  # {¥MondoBuild¥}
+	###
+	echo "¶nCompiling:      '"{depDir}{default}.cpp"'"
+	"{MrCpp}" {depDir}{default}.cpp ¶
+		-o {targDir}{default}.cpp.x ¶
+		{Includes} ¶
+		{MrCpp_Options} {MrCpp_DebugOptions} {other_MrCpp_Options} ¶
+		{STL_Options} {STL_DebugOptions} {other_STL_Options}
+		if "{status}"
+			set compile_status 1
+		end
+
+
+### Optional Dependencies ###
+
+setup Ä $OutOfDate
+	###
+	echo "¶n# Target:       '"{ObjDir}"'"
+	unset compile_status
+	if !`exists "{ObjDir}"`
+		newfolder "{ObjDir}"
+	end
+
+
+### Build this target to generate "include file" dependencies. ###
+
+Dependencies  Ä  $OutOfDate #*TY 02/26/2000 - MakeDepend does not work unless all mentioned include directory exists
+	###
+	echo "¶nUpdating:       {MAKEFILE} Dependencies"
+	MakeDepend ¶
+		-append {MAKEFILE} ¶
+		-ignore "{CIncludes}" ¶
+		-objdir "{ObjDir}" ¶
+		-objext .x ¶
+		{Includes} ¶
+		{SrcFiles}
+
+
+##################################################################################
+#	{stl}:src: build rule
+##################################################################################
+
+### Source Files ###
+
+STLportLibSrcFiles        =  ¶
+				c_locale_stub.cpp	¶
+				codecvt.cpp	¶
+				collate.cpp	¶
+				complex.cpp	¶
+				complex_exp.cpp	¶
+				complex_io.cpp	¶
+				complex_io_w.cpp	¶
+				complex_trig.cpp	¶
+				ctype.cpp	¶
+				dll_main.cpp	¶
+				fstream.cpp	¶
+				ios.cpp	¶
+				iostream.cpp	¶
+				istream.cpp	¶
+				locale.cpp	¶
+				locale_catalog.cpp	¶
+				facets_byname.cpp	¶
+				locale_impl.cpp	¶
+				messages.cpp	¶
+				monetary.cpp	¶
+				num_get.cpp	¶
+				num_get_float.cpp	¶
+				num_put.cpp	¶
+				num_put_float.cpp	¶
+				numpunct.cpp	¶
+				ostream.cpp	¶
+				sstream.cpp	¶
+				stdio_streambuf.cpp	¶
+				streambuf.cpp	¶
+				string_w.cpp	¶
+				strstream.cpp	¶
+				time_facets.cpp	¶
+				# end		#*TY 11/25/2000 - updated for STLport.4.1
+
+
+### Object Files ###
+
+STLportLibObjFiles-PPC    =  ¶
+				{ObjDir}c_locale_stub.cpp.x	¶
+				{ObjDir}codecvt.cpp.x	¶
+				{ObjDir}collate.cpp.x	¶
+				{ObjDir}complex.cpp.x	¶
+				{ObjDir}complex_exp.cpp.x	¶
+				{ObjDir}complex_io.cpp.x	¶
+				{ObjDir}complex_io_w.cpp.x	¶
+				{ObjDir}complex_trig.cpp.x	¶
+				{ObjDir}ctype.cpp.x	¶
+				{ObjDir}dll_main.cpp.x	¶
+				{ObjDir}fstream.cpp.x	¶
+				{ObjDir}ios.cpp.x	¶
+				{ObjDir}iostream.cpp.x	¶
+				{ObjDir}istream.cpp.x	¶
+				{ObjDir}locale.cpp.x	¶
+				{ObjDir}locale_catalog.cpp.x	¶
+				{ObjDir}facets_byname.cpp.x	¶
+				{ObjDir}locale_impl.cpp.x	¶
+				{ObjDir}messages.cpp.x	¶
+				{ObjDir}monetary.cpp.x	¶
+				{ObjDir}num_get.cpp.x	¶
+				{ObjDir}num_get_float.cpp.x	¶
+				{ObjDir}num_put.cpp.x	¶
+				{ObjDir}num_put_float.cpp.x	¶
+				{ObjDir}numpunct.cpp.x	¶
+				{ObjDir}ostream.cpp.x	¶
+				{ObjDir}sstream.cpp.x	¶
+				{ObjDir}stdio_streambuf.cpp.x	¶
+				{ObjDir}streambuf.cpp.x	¶
+				{ObjDir}string_w.cpp.x	¶
+				{ObjDir}strstream.cpp.x	¶
+				{ObjDir}time_facets.cpp.x	¶
+				# end		#*TY 11/25/2000 - updated for STLport.4.1
+
+
+### Build Rules ###
+
+build	ÄÄ	setup
+build	ÄÄ	"{ObjDir}"STLportLib{config_}.o
+
+install  ÄÄ  build
+	###
+	echo "¶nInstalling:     ¶{stl¶}:lib:STLportLib{config_}.o"
+	if !`exists "{stl}":lib:`
+		newfolder "{stl}":lib:
+	end
+	duplicate -y "{ObjDir}"STLportLib{config_}.o "{stl}":lib:STLportLib{config_}.o
+
+"{ObjDir}"STLportLib{config_}.o  ÄÄ  {STLportLibObjFiles-PPC} {¥MondoBuild¥}
+	###
+	echo "¶nLibbing:        {Targ}"
+	PPCLink ¶
+		-xm l ¶
+		-t 'XCOF' ¶
+		-o {Targ} ¶
+		{STLportLibObjFiles-PPC} ¶
+		{Link_options} ¶
+		{Sym-PPC} ¶
+		# end
+
diff --git a/main/source/stlport/src/SCpp.mak b/main/source/stlport/src/SCpp.mak
new file mode 100644
index 00000000..6539149a
--- /dev/null
+++ b/main/source/stlport/src/SCpp.mak
@@ -0,0 +1,196 @@
+MAKEFILE        = SCpp.mak
+¥MondoBuild¥    = {MAKEFILE}  # Make blank to avoid rebuilds when makefile is modified
+
+Sym-68K         	= -sym on
+!ifdef DEBUG
+config_				= .68K.DBG
+SCpp_DebugOptions 	= -inline none,global -opt none -frames {Sym-68K}
+STL_DebugOptions 	= -d _STLP_DEBUG -d _STLP_DEBUG_ALLOC -d _STLP_DEBUG_UNINITIALIZED
+!else
+config_				= .68K
+SCpp_DebugOptions 	= 
+STL_DebugOptions 	= 
+!endif
+ObjDir          	= :{config_}:
+SrcDir				= :
+
+Includes     	= -i : -i "{STL}" -i "{CIncludes}"
+
+SCpp_Options 	= -model far -ansi on -ansifor -bool on -exceptions on -rtti on -b2  -mbg full -opt all -inline all,global -includes unix_mac -w 12
+				
+STL_Options  	= 	#-d _STLP_USE_NEWALLOC ¶
+					#-d _STLP_NO_SGI_IOSTREAMS ¶
+					# end
+
+Link_options = ¶
+		-c 'MPS ' ¶
+		-mf ¶
+		-d ¶
+		-w ¶
+		-model far ¶
+		-srtsg all ¶
+		#{Sym-68K} ¶
+		# end
+
+### Default Rules ###
+
+"{ObjDir}" Ä "{SrcDir}"
+
+.cpp.o  Ä  .cpp  # {¥MondoBuild¥}
+	###
+	echo "¶nCompiling:      '"{depDir}{default}.cpp"'"
+	"{SCpp}" {depDir}{default}.cpp ¶
+		-o {targDir}{default}.cpp.o ¶
+		-seg "{default}" ¶
+		{Includes} ¶
+		{SCpp_Options} {SCpp_DebugOptions} {other_SCpp_Options} ¶
+		{STL_Options} {STL_DebugOptions} {other_STL_Options}
+		if "{status}"
+			set compile_status 1
+		end
+
+
+### Optional Dependencies ###
+
+setup Ä $OutOfDate
+	###
+	echo "¶n# Target:       '"{ObjDir}"'"
+	unset compile_status
+	if !`exists "{ObjDir}"`
+		newfolder "{ObjDir}"
+	end
+
+
+### Build this target to generate "include file" dependencies. ###
+
+Dependencies  Ä  $OutOfDate #*TY 02/26/2000 - MakeDepend does not work unless all mentioned include directory exists
+	###
+	echo "¶nUpdating:       {MAKEFILE} Dependencies"
+	MakeDepend ¶
+		-append {MAKEFILE} ¶
+		-ignore "{CIncludes}" ¶
+		-objdir "{ObjDir}" ¶
+		-objext .x ¶
+		{Includes} ¶
+		{SrcFiles}
+
+
+##################################################################################
+#	{stl}:src: build rule
+##################################################################################
+
+### Source Files ###
+
+STLportLibSrcFiles        =  ¶
+				c_locale_stub.cpp	¶
+				codecvt.cpp	¶
+				collate.cpp	¶
+				complex.cpp	¶
+				complex_exp.cpp	¶
+				complex_io.cpp	¶
+				complex_io_w.cpp	¶
+				complex_trig.cpp	¶
+				ctype.cpp	¶
+				dll_main.cpp	¶
+				fstream.cpp	¶
+				ios.cpp	¶
+				iostream.cpp	¶
+				istream.cpp	¶
+				locale.cpp	¶
+				locale_catalog.cpp	¶
+				facets_byname.cpp	¶
+				locale_impl.cpp	¶
+				messages.cpp	¶
+				monetary.cpp	¶
+				num_get.cpp	¶
+				num_get_float.cpp	¶
+				num_put.cpp	¶
+				num_put_float.cpp	¶
+				numpunct.cpp	¶
+				ostream.cpp	¶
+				sstream.cpp	¶
+				stdio_streambuf.cpp	¶
+				streambuf.cpp	¶
+				string_w.cpp	¶
+				strstream.cpp	¶
+				time_facets.cpp	¶
+				# end		#*TY 11/25/2000 - updated for STLport.4.1
+
+
+### Object Files ###
+
+STLportLibObjFiles1-68K    =  ¶
+				{ObjDir}c_locale_stub.cpp.o	¶
+				{ObjDir}codecvt.cpp.o	¶
+				{ObjDir}collate.cpp.o	¶
+				{ObjDir}complex.cpp.o	¶
+				{ObjDir}complex_exp.cpp.o	¶
+				{ObjDir}complex_io.cpp.o	¶
+				{ObjDir}complex_io_w.cpp.o	¶
+				{ObjDir}complex_trig.cpp.o	¶
+				{ObjDir}ctype.cpp.o	¶
+				{ObjDir}dll_main.cpp.o	¶
+				{ObjDir}fstream.cpp.o	¶
+				{ObjDir}ios.cpp.o	¶
+				{ObjDir}iostream.cpp.o	¶
+				{ObjDir}istream.cpp.o	¶
+				{ObjDir}locale.cpp.o	¶
+				{ObjDir}locale_catalog.cpp.o	¶
+				#
+STLportLibObjFiles2-68K    =  ¶
+				{ObjDir}facets_byname.cpp.o	¶
+				{ObjDir}locale_impl.cpp.o	¶
+				{ObjDir}messages.cpp.o	¶
+				{ObjDir}monetary.cpp.o	¶
+				{ObjDir}num_get.cpp.o	¶
+				{ObjDir}num_get_float.cpp.o	¶
+				{ObjDir}num_put.cpp.o	¶
+				{ObjDir}num_put_float.cpp.o	¶
+				{ObjDir}numpunct.cpp.o	¶
+				{ObjDir}ostream.cpp.o	¶
+				{ObjDir}sstream.cpp.o	¶
+				{ObjDir}stdio_streambuf.cpp.o	¶
+				{ObjDir}streambuf.cpp.o	¶
+				{ObjDir}string_w.cpp.o	¶
+				{ObjDir}strstream.cpp.o	¶
+				{ObjDir}time_facets.cpp.o	¶
+				# end		#*TY 11/25/2000 - updated for STLport.4.1
+
+
+### Build Rules ###
+
+build	ÄÄ	setup
+build	ÄÄ	"{ObjDir}"STLportLib{config_}.o
+
+"{ObjDir}"STLportLib{config_}.o	ÄÄ  {STLportLibObjFiles1-68K} {STLportLibObjFiles2-68K} {¥MondoBuild¥}
+	###
+	echo "¶nLibbing:        {Targ}"
+	Lib ¶
+		-o "{ObjDir}"STLportLib1{config_}.o ¶
+		{STLportLibObjFiles1-68K} ¶
+		-mf ¶
+		-d ¶
+		-sym on ¶
+		# end
+	Lib ¶
+		-o "{ObjDir}"STLportLib2{config_}.o ¶
+		{STLportLibObjFiles2-68K} ¶
+		-mf ¶
+		-d ¶
+		-sym on ¶
+		# end
+	Lib ¶
+		-o {Targ} ¶
+		"{ObjDir}"STLportLib1{config_}.o "{ObjDir}"STLportLib2{config_}.o ¶
+		-mf ¶
+		-d ¶
+		-sym on ¶
+		# end
+
+install  ÄÄ  build
+	###
+	echo "¶nInstalling:     ¶{stl¶}:lib:STLportLib{config_}.o"
+	if !`exists "{stl}":lib:`
+		newfolder "{stl}":lib:
+	end
+	duplicate -y "{ObjDir}"STLportLib{config_}.o "{stl}":lib:STLportLib{config_}.o
diff --git a/main/source/stlport/src/aligned_buffer.h b/main/source/stlport/src/aligned_buffer.h
new file mode 100644
index 00000000..eeda9ae3
--- /dev/null
+++ b/main/source/stlport/src/aligned_buffer.h
@@ -0,0 +1,13 @@
+# ifndef ALIGNED_BUFFER_H
+#  define ALIGNED_BUFFER_H
+
+_STLP_BEGIN_NAMESPACE
+// this is for fake initialization
+template<class T>
+union _Stl_aligned_buffer {
+  char buf[sizeof(T)];
+  struct { double a; double b; } padding;
+};
+_STLP_END_NAMESPACE
+
+# endif
diff --git a/main/source/stlport/src/bc502.mak b/main/source/stlport/src/bc502.mak
new file mode 100644
index 00000000..c73886ff
--- /dev/null
+++ b/main/source/stlport/src/bc502.mak
@@ -0,0 +1,234 @@
+# ---------------------------------------------------------------------------
+
+CPP=cpp32
+CC=bcc32 -P
+CXX=bcc32
+
+RC=brc32
+COMP=BCC502
+
+LIB_BASENAME=stlport_bcb
+
+# ---------------------------------------------------------------------------
+
+LINK_OUT=
+DYNLINK_OUT=
+LINK = tlib /P128
+DYN_LINK = ilink32
+OBJEXT=obj
+DYNEXT=dll
+STEXT=lib
+RM=@erase /F /Q
+PATH_SEP=\\
+MKDIR=mkdir
+STATIC_SUFFIX=_static
+INSTALL_STEP=install_bc
+
+# static builds, but cannot be used - some weird compile errors..
+all : all_dynamic
+
+!include common_macros_windows.mak
+
+DYNAMIC_DEFS=_RTLDLL
+STATIC_DEFS=_LIB;_STLP_NO_FORCE_INSTANTIATE
+
+LINKSTARTUP= c0d32.obj
+
+FLAGS_COMMON= -I.;..\stlport\BC50;..\stlport;$(BCB)\include -j1 -w -c -w-par -w-inl -tWM
+FLAGS_COMMON_static = $(FLAGS_COMMON) -D$(SYSDEFINES);$(USERDEFINES);$(STATIC_DEFS)
+FLAGS_COMMON_dynamic = $(FLAGS_COMMON) -D$(SYSDEFINES);$(USERDEFINES);$(DYNAMIC_DEFS) -tWD
+
+LDFLAGS_COMMON=-Gn -Gi -Tpd -aa -L$(MAKEDIR)\..\lib -x 
+LDFLAGS_COMMON_static=  $(LDFLAGS_COMMON)
+LDFLAGS_COMMON_dynamic= $(LDFLAGS_COMMON)
+
+
+LDFLAGS_RELEASE_static=   $(LDFLAGS_COMMON_static)  $(LINKSTARTUP)
+LDFLAGS_DEBUG_static=     $(LDFLAGS_COMMON_static)  $(LINKSTARTUP)
+LDFLAGS_STLDEBUG_static=  $(LDFLAGS_COMMON_static)  $(LINKSTARTUP)
+
+LDFLAGS_RELEASE_dynamic=   $(LDFLAGS_COMMON_dynamic) $(LINKSTARTUP)
+LDFLAGS_DEBUG_dynamic=     $(LDFLAGS_COMMON_dynamic) $(LINKSTARTUP)
+LDFLAGS_STLDEBUG_dynamic=  $(LDFLAGS_COMMON_dynamic) $(LINKSTARTUP)
+
+LDLIBS_RELEASE_dynamic=   import32.lib cw32mti.lib
+LDLIBS_DEBUG_dynamic=     import32.lib cw32mti.lib
+LDLIBS_STLDEBUG_dynamic=  import32.lib cw32mti.lib
+
+
+CXXFLAGS_RELEASE_static= $(FLAGS_COMMON_static) -O2 -n$(RELEASE_OBJDIR_static)
+CXXFLAGS_DEBUG_static= $(FLAGS_COMMON_static) -v -N -x -xp -n$(DEBUG_OBJDIR_static)
+CXXFLAGS_STLDEBUG_static= $(FLAGS_COMMON_static) -v -N -x -xp -n$(STLDEBUG_OBJDIR_static) -D_STLP_DEBUG
+
+CXXFLAGS_RELEASE_dynamic= $(FLAGS_COMMON_dynamic) -O2 -n$(RELEASE_OBJDIR_dynamic)
+CXXFLAGS_DEBUG_dynamic= $(FLAGS_COMMON_dynamic)  -v -N -x -xp -n$(DEBUG_OBJDIR_dynamic)
+CXXFLAGS_STLDEBUG_dynamic= $(FLAGS_COMMON_dynamic)  -v -N -x -xp -n$(STLDEBUG_OBJDIR_dynamic) -D_STLP_DEBUG
+
+RELEASE_LINK_COMMANDS_static=\
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_exp.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_io.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_trig.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)dll_main.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)ios.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)streambuf.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)iostream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)istream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)ostream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)fstream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)strstream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)sstream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)codecvt.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)collate.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)ctype.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)messages.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)monetary.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)num_get.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)num_get_float.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)num_put.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)num_put_float.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)numpunct.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)time_facets.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)locale.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)locale_catalog.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)facets_byname.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)locale_impl.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_io_w.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)string_w.$(OBJEXT)
+
+
+DEBUG_LINK_COMMANDS_static= \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_exp.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_io.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_trig.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)dll_main.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)ios.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)streambuf.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)iostream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)istream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)ostream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)fstream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)strstream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)sstream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)codecvt.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)collate.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)ctype.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)messages.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)monetary.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)num_get.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)num_get_float.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)num_put.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)num_put_float.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)numpunct.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)time_facets.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)locale.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)locale_catalog.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)facets_byname.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)locale_impl.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_io_w.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)string_w.$(OBJEXT)
+
+STLDEBUG_LINK_COMMANDS_static= \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_exp.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_io.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_trig.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)dll_main.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)ios.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)streambuf.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)iostream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)istream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)ostream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)fstream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)strstream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)sstream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)codecvt.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)collate.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)ctype.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)messages.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)monetary.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_get.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_get_float.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_put.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_put_float.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)numpunct.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)time_facets.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)locale.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)locale_catalog.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)facets_byname.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)locale_impl.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_io_w.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)string_w.$(OBJEXT)
+
+#
+#  Target directories
+#
+#
+
+$(OUTDIR) :
+	$(MKDIR) $(OUTDIR)
+$(RELEASE_OBJDIR_dynamic) :
+	$(MKDIR) $(RELEASE_OBJDIR_dynamic)
+$(DEBUG_OBJDIR_dynamic) :
+	$(MKDIR) $(DEBUG_OBJDIR_dynamic)
+$(STLDEBUG_OBJDIR_dynamic) :
+	$(MKDIR) $(STLDEBUG_OBJDIR_dynamic)
+$(RELEASE_OBJDIR_static) :
+	$(MKDIR) $(RELEASE_OBJDIR_static)
+$(DEBUG_OBJDIR_static) :
+	$(MKDIR) $(DEBUG_OBJDIR_static)
+$(STLDEBUG_OBJDIR_static) :
+	$(MKDIR) $(STLDEBUG_OBJDIR_static)
+
+######   Targets ##################
+
+all_static :   $(ALL_STATIC_LIBS)
+
+all_dynamic :  $(ALL_DYNAMIC_LIBS)
+
+install :  $(INSTALL_STEP)
+
+clean : $(CLEAN_SPECIFIC)
+	-$(RM) $(RELEASE_OBJDIR_static) $(DEBUG_OBJDIR_static) \
+        $(STLDEBUG_OBJDIR_static) $(RELEASE_OBJDIR_dynamic) \
+        $(DEBUG_OBJDIR_dynamic) $(STLDEBUG_OBJDIR_dynamic)
+
+clobber : clean
+	-$(RM) $(OUTDIR)$(PATH_SEP)$(DEBUG_NAME).* \
+               $(OUTDIR)$(PATH_SEP)$(RELEASE_NAME).* $(OUTDIR)$(PATH_SEP)$(STLDEBUG_NAME).*
+
+
+$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) : $(OUTDIR) $(RELEASE_OBJDIR_dynamic) $(DEF_FILE) $(RELEASE_OBJECTS_dynamic)
+	$(DYN_LINK) $(LDFLAGS_RELEASE_dynamic) $(RELEASE_OBJECTS_dynamic) , $(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB),,$(LDLIBS_RELEASE_dynamic)
+
+$(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB) : $(OUTDIR) $(DEBUG_OBJDIR_dynamic) $(DEF_FILE) $(DEBUG_OBJECTS_dynamic)
+	$(DYN_LINK) $(LDFLAGS_DEBUG_dynamic) $(DEBUG_OBJECTS_dynamic), $(DYNLINK_OUT)$(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB) ,, $(LDLIBS_DEBUG_dynamic) 
+
+$(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB) : $(OUTDIR) $(STLDEBUG_OBJDIR_dynamic) $(DEF_FILE) $(STLDEBUG_OBJECTS_dynamic)
+	$(DYN_LINK)  $(LDFLAGS_STLDEBUG_dynamic) $(STLDEBUG_OBJECTS_dynamic) , $(DYNLINK_OUT)$(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB) ,, $(LDLIBS_STLDEBUG_dynamic)
+
+$(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) : $(OUTDIR) $(RELEASE_OBJDIR_static) $(DEF_FILE) $(RELEASE_OBJECTS_static)
+	$(LINK) $(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) $(RELEASE_LINK_COMMANDS_static)
+
+$(OUTDIR)$(PATH_SEP)$(DEBUG_LIB) : $(OUTDIR) $(DEBUG_OBJDIR_static) $(DEF_FILE) $(DEBUG_OBJECTS_static)
+	$(LINK) $(OUTDIR)$(PATH_SEP)$(DEBUG_LIB) $(DEBUG_LINK_COMMANDS_static)  
+
+$(OUTDIR)$(PATH_SEP)$(STLDEBUG_LIB) : $(OUTDIR) $(STLDEBUG_OBJDIR_static) $(DEF_FILE) $(STLDEBUG_OBJECTS_static)
+	$(LINK) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_LIB) $(STLDEBUG_LINK_COMMANDS_static)
+
+#########################################
+
+# ---------------------------------------------------------------------------
+
+!include nmake_common.mak
+
+.cpp.i:
+    $(CPP) $(CXXFLAGS_RELEASE_dynamic) -n. -Sr -Ss -Sd {$< }
+
+# ---------------------------------------------------------------------------
+
+# ---------------------------------------------------------------------------
diff --git a/main/source/stlport/src/bcb.mak b/main/source/stlport/src/bcb.mak
new file mode 100644
index 00000000..df2b8920
--- /dev/null
+++ b/main/source/stlport/src/bcb.mak
@@ -0,0 +1,253 @@
+# ---------------------------------------------------------------------------
+
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+CPP=cpp32
+CC=bcc32 -P
+CXX=bcc32
+
+RC=brc32
+COMP=BCB
+
+LIB_BASENAME=stlp
+
+# ---------------------------------------------------------------------------
+
+LINK_OUT=
+DYNLINK_OUT=
+LINK = tlib /P256
+# Use objs in RTL build tree
+DYN_LINK = ilink32 -L$(BCB)\lib
+OBJEXT=obj
+DYNEXT=dll
+STEXT=lib
+# We use 4NT, which does not know about /Q
+#RM=-rd /S /Q
+RM=-rd /S
+PATH_SEP=\\
+MKDIR=-mkdir
+STATIC_SUFFIX=st
+INSTALL_STEP=install_bc
+
+all : platform all_dynamic all_static
+
+!include common_macros_windows.mak
+
+#RM=-rd /S /Q
+RM=-rd /S
+MKDIR=-mkdir
+
+DYNAMIC_DEFS=_RTLDLL;_WIN32;_DLL;_STLP_DESIGNATED_DLL
+STATIC_DEFS=_LIB;_WIN32;_STLP_NO_FORCE_INSTANTIATE
+
+LINKSTARTUP= c0d32.obj
+
+FLAGS_COMMON= -I.;..\stlport;$(BCB)\include;$(BCB)\include\windows -jb -j1 -w -c -w-par -w-inl -w-stl
+FLAGS_COMMON_static = $(FLAGS_COMMON) -D$(SYSDEFINES);$(USERDEFINES);$(STATIC_DEFS)
+FLAGS_COMMON_dynamic = $(FLAGS_COMMON) -D$(SYSDEFINES);$(USERDEFINES);$(DYNAMIC_DEFS) -tWDR
+
+# -L$(MAKEDIR)\..\lib  removed  ...it should get ilink32.cfg values instead
+LDFLAGS_COMMON=-Gn -Gi -Tpd -aa -x 
+LDFLAGS_COMMON_static=  $(LDFLAGS_COMMON)
+LDFLAGS_COMMON_dynamic= $(LDFLAGS_COMMON)
+
+
+LDFLAGS_RELEASE_static=   $(LDFLAGS_COMMON_static)  $(LINKSTARTUP)
+LDFLAGS_DEBUG_static=     $(LDFLAGS_COMMON_static)  $(LINKSTARTUP)
+LDFLAGS_STLDEBUG_static=  $(LDFLAGS_COMMON_static)  $(LINKSTARTUP)
+
+LDFLAGS_RELEASE_dynamic=   $(LDFLAGS_COMMON_dynamic) $(LINKSTARTUP)
+LDFLAGS_DEBUG_dynamic=     $(LDFLAGS_COMMON_dynamic) $(LINKSTARTUP)
+LDFLAGS_STLDEBUG_dynamic=  $(LDFLAGS_COMMON_dynamic) $(LINKSTARTUP)
+
+LDLIBS_RELEASE_dynamic=   import32.lib cw32i.lib
+LDLIBS_DEBUG_dynamic=     import32.lib cw32i.lib
+LDLIBS_STLDEBUG_dynamic=  import32.lib cw32i.lib
+
+
+CXXFLAGS_RELEASE_static= $(FLAGS_COMMON_static) -O2 -n$(RELEASE_OBJDIR_static)
+CXXFLAGS_DEBUG_static= $(FLAGS_COMMON_static) -v -N -x -xp -n$(DEBUG_OBJDIR_static)
+CXXFLAGS_STLDEBUG_static= $(FLAGS_COMMON_static) -v -N -x -xp -n$(STLDEBUG_OBJDIR_static) -D_STLP_DEBUG
+
+CXXFLAGS_RELEASE_dynamic= $(FLAGS_COMMON_dynamic) -O2 -n$(RELEASE_OBJDIR_dynamic)
+CXXFLAGS_DEBUG_dynamic= $(FLAGS_COMMON_dynamic)  -v -N -x -xp -n$(DEBUG_OBJDIR_dynamic)
+CXXFLAGS_STLDEBUG_dynamic= $(FLAGS_COMMON_dynamic)  -v -N -x -xp -n$(STLDEBUG_OBJDIR_dynamic) -D_STLP_DEBUG
+
+RELEASE_LINK_COMMANDS_static=\
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_exp.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_io.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_trig.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)dll_main.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)ios.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)streambuf.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)iostream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)istream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)ostream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)fstream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)strstream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)sstream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)codecvt.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)collate.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)ctype.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)messages.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)monetary.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)num_get.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)num_get_float.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)num_put.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)num_put_float.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)numpunct.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)time_facets.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)locale.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)locale_catalog.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)facets_byname.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)locale_impl.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)c_locale.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)c_locale_stub.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_io_w.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)string_w.$(OBJEXT)
+
+
+DEBUG_LINK_COMMANDS_static= \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_exp.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_io.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_trig.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)dll_main.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)ios.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)streambuf.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)iostream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)istream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)ostream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)fstream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)strstream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)sstream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)codecvt.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)collate.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)ctype.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)messages.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)monetary.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)num_get.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)num_get_float.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)num_put.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)num_put_float.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)numpunct.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)time_facets.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)locale.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)locale_catalog.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)facets_byname.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)locale_impl.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)c_locale.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)c_locale_stub.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_io_w.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)string_w.$(OBJEXT)
+
+STLDEBUG_LINK_COMMANDS_static= \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_exp.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_io.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_trig.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)dll_main.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)ios.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)streambuf.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)iostream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)istream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)ostream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)fstream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)strstream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)sstream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)codecvt.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)collate.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)ctype.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)messages.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)monetary.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_get.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_get_float.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_put.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_put_float.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)numpunct.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)time_facets.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)locale.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)locale_catalog.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)facets_byname.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)locale_impl.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)c_locale.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)c_locale_stub.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_io_w.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)string_w.$(OBJEXT)
+
+#
+#  Target directories
+#
+#
+
+$(RELEASE_OBJDIR_dynamic) :
+	$(MKDIR) $(RELEASE_OBJDIR_dynamic)
+$(DEBUG_OBJDIR_dynamic) :
+	$(MKDIR) $(DEBUG_OBJDIR_dynamic)
+$(STLDEBUG_OBJDIR_dynamic) :
+	$(MKDIR) $(STLDEBUG_OBJDIR_dynamic)
+$(RELEASE_OBJDIR_static) :
+	$(MKDIR) $(RELEASE_OBJDIR_static)
+$(DEBUG_OBJDIR_static) :
+	$(MKDIR) $(DEBUG_OBJDIR_static)
+$(STLDEBUG_OBJDIR_static) :
+	$(MKDIR) $(STLDEBUG_OBJDIR_static)
+
+######   Targets ##################
+
+all_static :   $(ALL_STATIC_LIBS)
+
+all_dynamic :  $(ALL_DYNAMIC_LIBS)
+
+install :  $(INSTALL_STEP)
+
+clean : $(CLEAN_SPECIFIC)
+	-$(RM) $(RELEASE_OBJDIR_static) $(DEBUG_OBJDIR_static) \
+        $(STLDEBUG_OBJDIR_static) $(RELEASE_OBJDIR_dynamic) \
+        $(DEBUG_OBJDIR_dynamic) $(STLDEBUG_OBJDIR_dynamic)
+
+clobber : clean
+	-$(RM) $(OUTDIR)$(PATH_SEP)$(DEBUG_NAME).* \
+               $(OUTDIR)$(PATH_SEP)$(RELEASE_NAME).* $(OUTDIR)$(PATH_SEP)$(STLDEBUG_NAME).*
+
+#create a compiler platform directory
+platform:
+	-$(MKDIR) $(OBJDIR_COMMON)
+	-$(MKDIR) $(OBJDIR)
+
+$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) : $(RELEASE_OBJDIR_dynamic) $(DEF_FILE) $(RELEASE_OBJECTS_dynamic)
+	$(DYN_LINK) $(LDFLAGS_RELEASE_dynamic) $(RELEASE_OBJECTS_dynamic) , $(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB),,$(LDLIBS_RELEASE_dynamic)
+
+$(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB) : $(DEBUG_OBJDIR_dynamic) $(DEF_FILE) $(DEBUG_OBJECTS_dynamic)
+	$(DYN_LINK) $(LDFLAGS_DEBUG_dynamic) $(DEBUG_OBJECTS_dynamic), $(DYNLINK_OUT)$(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB) ,, $(LDLIBS_DEBUG_dynamic) 
+
+$(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB) : $(STLDEBUG_OBJDIR_dynamic) $(DEF_FILE) $(STLDEBUG_OBJECTS_dynamic)
+	$(DYN_LINK)  $(LDFLAGS_STLDEBUG_dynamic) $(STLDEBUG_OBJECTS_dynamic) , $(DYNLINK_OUT)$(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB) ,, $(LDLIBS_STLDEBUG_dynamic)
+
+$(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) : $(RELEASE_OBJDIR_static) $(DEF_FILE) $(RELEASE_OBJECTS_static)
+	$(LINK) $(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) $(RELEASE_LINK_COMMANDS_static)
+
+$(OUTDIR)$(PATH_SEP)$(DEBUG_LIB) : $(DEBUG_OBJDIR_static) $(DEF_FILE) $(DEBUG_OBJECTS_static)
+	$(LINK) $(OUTDIR)$(PATH_SEP)$(DEBUG_LIB) $(DEBUG_LINK_COMMANDS_static)  
+
+$(OUTDIR)$(PATH_SEP)$(STLDEBUG_LIB) : $(STLDEBUG_OBJDIR_static) $(DEF_FILE) $(STLDEBUG_OBJECTS_static)
+	$(LINK) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_LIB) $(STLDEBUG_LINK_COMMANDS_static)
+
+#########################################
+
+# ---------------------------------------------------------------------------
+
+!include nmake_common.mak
+
+.cpp.i:
+    $(CPP) $(CXXFLAGS_DEBUG_dynamic) -n. -Sr -Ss -Sd {$< }
+
+# ---------------------------------------------------------------------------
+
+# ---------------------------------------------------------------------------
diff --git a/main/source/stlport/src/bcb55.mak b/main/source/stlport/src/bcb55.mak
new file mode 100644
index 00000000..5d858ee4
--- /dev/null
+++ b/main/source/stlport/src/bcb55.mak
@@ -0,0 +1,253 @@
+# ---------------------------------------------------------------------------
+
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+CPP=cpp32
+CC=bcc32 -P
+CXX=bcc32
+
+RC=brc32
+COMP=BCB
+
+LIB_BASENAME=stlp
+
+# ---------------------------------------------------------------------------
+
+LINK_OUT=
+DYNLINK_OUT=
+LINK = tlib /P256
+# Use objs in RTL build tree
+DYN_LINK = ilink32 -L$(BCB)\lib
+OBJEXT=obj
+DYNEXT=dll
+STEXT=lib
+# We use 4NT, which does not know about /Q
+#RM=-rd /S /Q
+RM=-rd /S
+PATH_SEP=\\
+MKDIR=-md
+STATIC_SUFFIX=st
+INSTALL_STEP=install_bc
+
+all : platform all_dynamic all_static
+
+!include common_macros_windows.mak
+
+#RM=-rd /S /Q
+RM=-rd /S
+MKDIR=-md
+
+DYNAMIC_DEFS=_RTLDLL;_WIN32;_DLL;_STLP_DESIGNATED_DLL
+STATIC_DEFS=_LIB;_WIN32;_STLP_NO_FORCE_INSTANTIATE
+
+LINKSTARTUP= c0d32.obj
+
+FLAGS_COMMON= -I.;..\stlport;$(BCB)\include;$(BCB)\include\windows -jb -j1 -w -c -w-par -w-inl -w-stl
+FLAGS_COMMON_static = $(FLAGS_COMMON) -D$(SYSDEFINES);$(USERDEFINES);$(STATIC_DEFS)
+FLAGS_COMMON_dynamic = $(FLAGS_COMMON) -D$(SYSDEFINES);$(USERDEFINES);$(DYNAMIC_DEFS) -tWDR
+
+# -L$(MAKEDIR)\..\lib  removed  ...it should get ilink32.cfg values instead
+LDFLAGS_COMMON=-Gn -Gi -Tpd -aa -x 
+LDFLAGS_COMMON_static=  $(LDFLAGS_COMMON)
+LDFLAGS_COMMON_dynamic= $(LDFLAGS_COMMON)
+
+
+LDFLAGS_RELEASE_static=   $(LDFLAGS_COMMON_static)  $(LINKSTARTUP)
+LDFLAGS_DEBUG_static=     $(LDFLAGS_COMMON_static)  $(LINKSTARTUP)
+LDFLAGS_STLDEBUG_static=  $(LDFLAGS_COMMON_static)  $(LINKSTARTUP)
+
+LDFLAGS_RELEASE_dynamic=   $(LDFLAGS_COMMON_dynamic) $(LINKSTARTUP)
+LDFLAGS_DEBUG_dynamic=     $(LDFLAGS_COMMON_dynamic) $(LINKSTARTUP)
+LDFLAGS_STLDEBUG_dynamic=  $(LDFLAGS_COMMON_dynamic) $(LINKSTARTUP)
+
+LDLIBS_RELEASE_dynamic=   import32.lib cw32i.lib
+LDLIBS_DEBUG_dynamic=     import32.lib cw32i.lib
+LDLIBS_STLDEBUG_dynamic=  import32.lib cw32i.lib
+
+
+CXXFLAGS_RELEASE_static= $(FLAGS_COMMON_static) -O2 -n$(RELEASE_OBJDIR_static)
+CXXFLAGS_DEBUG_static= $(FLAGS_COMMON_static) -v -N -x -xp -n$(DEBUG_OBJDIR_static)
+CXXFLAGS_STLDEBUG_static= $(FLAGS_COMMON_static) -v -N -x -xp -n$(STLDEBUG_OBJDIR_static) -D_STLP_DEBUG
+
+CXXFLAGS_RELEASE_dynamic= $(FLAGS_COMMON_dynamic) -O2 -n$(RELEASE_OBJDIR_dynamic)
+CXXFLAGS_DEBUG_dynamic= $(FLAGS_COMMON_dynamic)  -v -N -x -xp -n$(DEBUG_OBJDIR_dynamic)
+CXXFLAGS_STLDEBUG_dynamic= $(FLAGS_COMMON_dynamic)  -v -N -x -xp -n$(STLDEBUG_OBJDIR_dynamic) -D_STLP_DEBUG
+
+RELEASE_LINK_COMMANDS_static=\
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_exp.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_io.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_trig.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)dll_main.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)ios.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)streambuf.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)iostream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)istream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)ostream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)fstream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)strstream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)sstream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)codecvt.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)collate.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)ctype.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)messages.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)monetary.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)num_get.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)num_get_float.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)num_put.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)num_put_float.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)numpunct.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)time_facets.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)locale.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)locale_catalog.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)facets_byname.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)locale_impl.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)c_locale.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)c_locale_stub.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_io_w.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)string_w.$(OBJEXT)
+
+
+DEBUG_LINK_COMMANDS_static= \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_exp.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_io.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_trig.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)dll_main.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)ios.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)streambuf.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)iostream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)istream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)ostream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)fstream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)strstream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)sstream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)codecvt.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)collate.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)ctype.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)messages.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)monetary.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)num_get.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)num_get_float.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)num_put.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)num_put_float.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)numpunct.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)time_facets.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)locale.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)locale_catalog.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)facets_byname.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)locale_impl.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)c_locale.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)c_locale_stub.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_io_w.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)string_w.$(OBJEXT)
+
+STLDEBUG_LINK_COMMANDS_static= \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_exp.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_io.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_trig.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)dll_main.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)ios.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)streambuf.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)iostream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)istream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)ostream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)fstream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)strstream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)sstream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)codecvt.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)collate.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)ctype.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)messages.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)monetary.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_get.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_get_float.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_put.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_put_float.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)numpunct.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)time_facets.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)locale.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)locale_catalog.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)facets_byname.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)locale_impl.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)c_locale.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)c_locale_stub.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_io_w.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)string_w.$(OBJEXT)
+
+#
+#  Target directories
+#
+#
+
+$(RELEASE_OBJDIR_dynamic) :
+	$(MKDIR) $(RELEASE_OBJDIR_dynamic)
+$(DEBUG_OBJDIR_dynamic) :
+	$(MKDIR) $(DEBUG_OBJDIR_dynamic)
+$(STLDEBUG_OBJDIR_dynamic) :
+	$(MKDIR) $(STLDEBUG_OBJDIR_dynamic)
+$(RELEASE_OBJDIR_static) :
+	$(MKDIR) $(RELEASE_OBJDIR_static)
+$(DEBUG_OBJDIR_static) :
+	$(MKDIR) $(DEBUG_OBJDIR_static)
+$(STLDEBUG_OBJDIR_static) :
+	$(MKDIR) $(STLDEBUG_OBJDIR_static)
+
+######   Targets ##################
+
+all_static :   $(ALL_STATIC_LIBS)
+
+all_dynamic :  $(ALL_DYNAMIC_LIBS)
+
+install :  $(INSTALL_STEP)
+
+clean : $(CLEAN_SPECIFIC)
+	-$(RM) $(RELEASE_OBJDIR_static) $(DEBUG_OBJDIR_static) \
+        $(STLDEBUG_OBJDIR_static) $(RELEASE_OBJDIR_dynamic) \
+        $(DEBUG_OBJDIR_dynamic) $(STLDEBUG_OBJDIR_dynamic)
+
+clobber : clean
+	-$(RM) $(OUTDIR)$(PATH_SEP)$(DEBUG_NAME).* \
+               $(OUTDIR)$(PATH_SEP)$(RELEASE_NAME).* $(OUTDIR)$(PATH_SEP)$(STLDEBUG_NAME).*
+
+#create a compiler platform directory
+platform:
+	-$(MKDIR) $(OBJDIR_COMMON)
+	-$(MKDIR) $(OBJDIR)
+
+$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) : $(RELEASE_OBJDIR_dynamic) $(DEF_FILE) $(RELEASE_OBJECTS_dynamic)
+	$(DYN_LINK) $(LDFLAGS_RELEASE_dynamic) $(RELEASE_OBJECTS_dynamic) , $(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB),,$(LDLIBS_RELEASE_dynamic)
+
+$(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB) : $(DEBUG_OBJDIR_dynamic) $(DEF_FILE) $(DEBUG_OBJECTS_dynamic)
+	$(DYN_LINK) $(LDFLAGS_DEBUG_dynamic) $(DEBUG_OBJECTS_dynamic), $(DYNLINK_OUT)$(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB) ,, $(LDLIBS_DEBUG_dynamic) 
+
+$(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB) : $(STLDEBUG_OBJDIR_dynamic) $(DEF_FILE) $(STLDEBUG_OBJECTS_dynamic)
+	$(DYN_LINK)  $(LDFLAGS_STLDEBUG_dynamic) $(STLDEBUG_OBJECTS_dynamic) , $(DYNLINK_OUT)$(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB) ,, $(LDLIBS_STLDEBUG_dynamic)
+
+$(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) : $(RELEASE_OBJDIR_static) $(DEF_FILE) $(RELEASE_OBJECTS_static)
+	$(LINK) $(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) $(RELEASE_LINK_COMMANDS_static)
+
+$(OUTDIR)$(PATH_SEP)$(DEBUG_LIB) : $(DEBUG_OBJDIR_static) $(DEF_FILE) $(DEBUG_OBJECTS_static)
+	$(LINK) $(OUTDIR)$(PATH_SEP)$(DEBUG_LIB) $(DEBUG_LINK_COMMANDS_static)  
+
+$(OUTDIR)$(PATH_SEP)$(STLDEBUG_LIB) : $(STLDEBUG_OBJDIR_static) $(DEF_FILE) $(STLDEBUG_OBJECTS_static)
+	$(LINK) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_LIB) $(STLDEBUG_LINK_COMMANDS_static)
+
+#########################################
+
+# ---------------------------------------------------------------------------
+
+!include nmake_common.mak
+
+.cpp.i:
+    $(CPP) $(CXXFLAGS_DEBUG_dynamic) -n. -Sr -Ss -Sd {$< }
+
+# ---------------------------------------------------------------------------
+
+# ---------------------------------------------------------------------------
diff --git a/main/source/stlport/src/bcb60.mak b/main/source/stlport/src/bcb60.mak
new file mode 100644
index 00000000..1c0bb70b
--- /dev/null
+++ b/main/source/stlport/src/bcb60.mak
@@ -0,0 +1,254 @@
+# ---------------------------------------------------------------------------
+
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+CPP=cpp32
+CC=bcc32 -P
+CXX=bcc32
+
+RC=brc32
+COMP=BCB
+
+LIB_BASENAME=stlp
+
+# ---------------------------------------------------------------------------
+
+LINK_OUT=
+DYNLINK_OUT=
+LINK = tlib /P256
+# Use objs in RTL build tree
+DYN_LINK = ilink32 -L$(BCB)\lib
+OBJEXT=obj
+DYNEXT=dll
+STEXT=lib
+# We use 4NT, which does not know about /Q
+#RM=-rd /S /Q
+RM=-rd /S
+PATH_SEP=\\
+MKDIR=-md
+STATIC_SUFFIX=st
+INSTALL_STEP=install_bc
+
+all : platform all_dynamic all_static
+
+!include common_macros_windows.mak
+
+#RM=-rd /S /Q
+RM=-rd /S
+MKDIR=-md
+
+DYNAMIC_DEFS=_RTLDLL;_WIN32;_DLL;_STLP_DESIGNATED_DLL
+STATIC_DEFS=_LIB;_WIN32;_STLP_NO_FORCE_INSTANTIATE;_STLP_DESIGNATED_DLL
+
+LINKSTARTUP= c0d32.obj
+
+FLAGS_COMMON= -I.;..\stlport;$(BCB)\include;$(BCB)\include\windows -jb -j1 -w -c -w-par -w-inl -w-stl
+
+FLAGS_COMMON_static = $(FLAGS_COMMON) -D$(SYSDEFINES);$(USERDEFINES);$(STATIC_DEFS)
+FLAGS_COMMON_dynamic = $(FLAGS_COMMON) -D$(SYSDEFINES);$(USERDEFINES);$(DYNAMIC_DEFS) -tWDR
+
+# -L$(MAKEDIR)\..\lib  removed  ...it should get ilink32.cfg values instead
+LDFLAGS_COMMON=-Gn -Gi -Tpd -aa -x 
+LDFLAGS_COMMON_static=  $(LDFLAGS_COMMON)
+LDFLAGS_COMMON_dynamic= $(LDFLAGS_COMMON)
+
+
+LDFLAGS_RELEASE_static=   $(LDFLAGS_COMMON_static)  $(LINKSTARTUP)
+LDFLAGS_DEBUG_static=     $(LDFLAGS_COMMON_static)  $(LINKSTARTUP)
+LDFLAGS_STLDEBUG_static=  $(LDFLAGS_COMMON_static)  $(LINKSTARTUP)
+
+LDFLAGS_RELEASE_dynamic=   $(LDFLAGS_COMMON_dynamic) $(LINKSTARTUP)
+LDFLAGS_DEBUG_dynamic=     $(LDFLAGS_COMMON_dynamic) $(LINKSTARTUP)
+LDFLAGS_STLDEBUG_dynamic=  $(LDFLAGS_COMMON_dynamic) $(LINKSTARTUP)
+
+LDLIBS_RELEASE_dynamic=   import32.lib cw32i.lib
+LDLIBS_DEBUG_dynamic=     import32.lib cw32i.lib
+LDLIBS_STLDEBUG_dynamic=  import32.lib cw32i.lib
+
+
+CXXFLAGS_RELEASE_static= $(FLAGS_COMMON_static) -O2 -n$(RELEASE_OBJDIR_static)
+CXXFLAGS_DEBUG_static= $(FLAGS_COMMON_static) -v -N -x -xp -n$(DEBUG_OBJDIR_static)
+CXXFLAGS_STLDEBUG_static= $(FLAGS_COMMON_static) -v -N -x -xp -n$(STLDEBUG_OBJDIR_static) -D_STLP_DEBUG
+
+CXXFLAGS_RELEASE_dynamic= $(FLAGS_COMMON_dynamic) -O2 -n$(RELEASE_OBJDIR_dynamic)
+CXXFLAGS_DEBUG_dynamic= $(FLAGS_COMMON_dynamic)  -v -N -x -xp -n$(DEBUG_OBJDIR_dynamic)
+CXXFLAGS_STLDEBUG_dynamic= $(FLAGS_COMMON_dynamic)  -v -N -x -xp -n$(STLDEBUG_OBJDIR_dynamic) -D_STLP_DEBUG
+
+RELEASE_LINK_COMMANDS_static=\
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_exp.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_io.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_trig.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)dll_main.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)ios.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)streambuf.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)iostream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)istream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)ostream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)fstream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)strstream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)sstream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)codecvt.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)collate.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)ctype.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)messages.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)monetary.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)num_get.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)num_get_float.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)num_put.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)num_put_float.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)numpunct.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)time_facets.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)locale.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)locale_catalog.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)facets_byname.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)locale_impl.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)c_locale.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)c_locale_stub.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_io_w.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)string_w.$(OBJEXT)
+
+
+DEBUG_LINK_COMMANDS_static= \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_exp.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_io.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_trig.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)dll_main.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)ios.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)streambuf.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)iostream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)istream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)ostream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)fstream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)strstream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)sstream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)codecvt.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)collate.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)ctype.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)messages.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)monetary.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)num_get.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)num_get_float.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)num_put.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)num_put_float.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)numpunct.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)time_facets.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)locale.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)locale_catalog.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)facets_byname.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)locale_impl.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)c_locale.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)c_locale_stub.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_io_w.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)string_w.$(OBJEXT)
+
+STLDEBUG_LINK_COMMANDS_static= \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_exp.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_io.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_trig.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)dll_main.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)ios.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)streambuf.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)iostream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)istream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)ostream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)fstream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)strstream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)sstream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)codecvt.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)collate.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)ctype.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)messages.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)monetary.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_get.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_get_float.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_put.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_put_float.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)numpunct.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)time_facets.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)locale.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)locale_catalog.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)facets_byname.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)locale_impl.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)c_locale.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)c_locale_stub.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_io_w.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)string_w.$(OBJEXT)
+
+#
+#  Target directories
+#
+#
+
+$(RELEASE_OBJDIR_dynamic) :
+	$(MKDIR) $(RELEASE_OBJDIR_dynamic)
+$(DEBUG_OBJDIR_dynamic) :
+	$(MKDIR) $(DEBUG_OBJDIR_dynamic)
+$(STLDEBUG_OBJDIR_dynamic) :
+	$(MKDIR) $(STLDEBUG_OBJDIR_dynamic)
+$(RELEASE_OBJDIR_static) :
+	$(MKDIR) $(RELEASE_OBJDIR_static)
+$(DEBUG_OBJDIR_static) :
+	$(MKDIR) $(DEBUG_OBJDIR_static)
+$(STLDEBUG_OBJDIR_static) :
+	$(MKDIR) $(STLDEBUG_OBJDIR_static)
+
+######   Targets ##################
+
+all_static :   $(ALL_STATIC_LIBS)
+
+all_dynamic :  $(ALL_DYNAMIC_LIBS)
+
+install :  $(INSTALL_STEP)
+
+clean : $(CLEAN_SPECIFIC)
+	-$(RM) $(RELEASE_OBJDIR_static) $(DEBUG_OBJDIR_static) \
+        $(STLDEBUG_OBJDIR_static) $(RELEASE_OBJDIR_dynamic) \
+        $(DEBUG_OBJDIR_dynamic) $(STLDEBUG_OBJDIR_dynamic)
+
+clobber : clean
+	-$(RM) $(OUTDIR)$(PATH_SEP)$(DEBUG_NAME).* \
+               $(OUTDIR)$(PATH_SEP)$(RELEASE_NAME).* $(OUTDIR)$(PATH_SEP)$(STLDEBUG_NAME).*
+
+#create a compiler platform directory
+platform:
+	-$(MKDIR) $(OBJDIR_COMMON)
+	-$(MKDIR) $(OBJDIR)
+
+$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) : $(RELEASE_OBJDIR_dynamic) $(DEF_FILE) $(RELEASE_OBJECTS_dynamic)
+	$(DYN_LINK) $(LDFLAGS_RELEASE_dynamic) $(RELEASE_OBJECTS_dynamic) , $(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB),,$(LDLIBS_RELEASE_dynamic)
+
+$(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB) : $(DEBUG_OBJDIR_dynamic) $(DEF_FILE) $(DEBUG_OBJECTS_dynamic)
+	$(DYN_LINK) $(LDFLAGS_DEBUG_dynamic) $(DEBUG_OBJECTS_dynamic), $(DYNLINK_OUT)$(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB) ,, $(LDLIBS_DEBUG_dynamic) 
+
+$(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB) : $(STLDEBUG_OBJDIR_dynamic) $(DEF_FILE) $(STLDEBUG_OBJECTS_dynamic)
+	$(DYN_LINK)  $(LDFLAGS_STLDEBUG_dynamic) $(STLDEBUG_OBJECTS_dynamic) , $(DYNLINK_OUT)$(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB) ,, $(LDLIBS_STLDEBUG_dynamic)
+
+$(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) : $(RELEASE_OBJDIR_static) $(DEF_FILE) $(RELEASE_OBJECTS_static)
+	$(LINK) $(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) $(RELEASE_LINK_COMMANDS_static)
+
+$(OUTDIR)$(PATH_SEP)$(DEBUG_LIB) : $(DEBUG_OBJDIR_static) $(DEF_FILE) $(DEBUG_OBJECTS_static)
+	$(LINK) $(OUTDIR)$(PATH_SEP)$(DEBUG_LIB) $(DEBUG_LINK_COMMANDS_static)  
+
+$(OUTDIR)$(PATH_SEP)$(STLDEBUG_LIB) : $(STLDEBUG_OBJDIR_static) $(DEF_FILE) $(STLDEBUG_OBJECTS_static)
+	$(LINK) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_LIB) $(STLDEBUG_LINK_COMMANDS_static)
+
+#########################################
+
+# ---------------------------------------------------------------------------
+
+!include nmake_common.mak
+
+.cpp.i:
+    $(CPP) $(FLAGS_COMMON_static) -n. -Sr -Ss -Sd {$< }
+
+# ---------------------------------------------------------------------------
+
+# ---------------------------------------------------------------------------
diff --git a/main/source/stlport/src/bcb60mt.mak b/main/source/stlport/src/bcb60mt.mak
new file mode 100644
index 00000000..cdb62688
--- /dev/null
+++ b/main/source/stlport/src/bcb60mt.mak
@@ -0,0 +1,253 @@
+# ---------------------------------------------------------------------------
+
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+CPP=cpp32
+CC=bcc32 -P
+CXX=bcc32
+
+RC=brc32
+COMP=BCB60MT
+
+LIB_BASENAME=stlpmt
+
+# ---------------------------------------------------------------------------
+
+LINK_OUT=
+DYNLINK_OUT=
+LINK = tlib /P256
+# Use objs in RTL build tree
+DYN_LINK = ilink32 -L$(BCB)\..\lib
+OBJEXT=obj
+DYNEXT=dll
+STEXT=lib
+# We use 4NT, which does not know about /Q
+#RM=-rd /S /Q
+RM=-rd /S
+PATH_SEP=\\
+MKDIR=-md /S
+STATIC_SUFFIX=st
+INSTALL_STEP=install_bc
+
+all : platform all_dynamic all_static
+
+!include common_macros_windows.mak
+
+#RM=-rd /S /Q
+RM=-rd /S
+MKDIR=-md /S
+
+DYNAMIC_DEFS=_RTLDLL;_WIN32;_DLL;_STLP_DESIGNATED_DLL
+STATIC_DEFS=_LIB;_WIN32;_STLP_NO_FORCE_INSTANTIATE
+
+LINKSTARTUP= c0d32.obj
+
+FLAGS_COMMON= -I.;..\stlport;$(BCB)\include;$(BCB)\include\windows -jb -j1 -w -c -w-par -w-inl -tWM -w-stl
+FLAGS_COMMON_static = $(FLAGS_COMMON) -D$(SYSDEFINES);$(USERDEFINES);$(STATIC_DEFS)
+FLAGS_COMMON_dynamic = $(FLAGS_COMMON) -D$(SYSDEFINES);$(USERDEFINES);$(DYNAMIC_DEFS) -tWDR
+
+# -L$(MAKEDIR)\..\lib  removed  ...it should get ilink32.cfg values instead
+LDFLAGS_COMMON=-Gn -Gi -Tpd -aa -x 
+LDFLAGS_COMMON_static=  $(LDFLAGS_COMMON)
+LDFLAGS_COMMON_dynamic= $(LDFLAGS_COMMON)
+
+
+LDFLAGS_RELEASE_static=   $(LDFLAGS_COMMON_static)  $(LINKSTARTUP)
+LDFLAGS_DEBUG_static=     $(LDFLAGS_COMMON_static)  $(LINKSTARTUP)
+LDFLAGS_STLDEBUG_static=  $(LDFLAGS_COMMON_static)  $(LINKSTARTUP)
+
+LDFLAGS_RELEASE_dynamic=   $(LDFLAGS_COMMON_dynamic) $(LINKSTARTUP)
+LDFLAGS_DEBUG_dynamic=     $(LDFLAGS_COMMON_dynamic) $(LINKSTARTUP)
+LDFLAGS_STLDEBUG_dynamic=  $(LDFLAGS_COMMON_dynamic) $(LINKSTARTUP)
+
+LDLIBS_RELEASE_dynamic=   import32.lib cw32mti.lib
+LDLIBS_DEBUG_dynamic=     import32.lib cw32mti.lib
+LDLIBS_STLDEBUG_dynamic=  import32.lib cw32mti.lib
+
+
+CXXFLAGS_RELEASE_static= $(FLAGS_COMMON_static) -O2 -n$(RELEASE_OBJDIR_static)
+CXXFLAGS_DEBUG_static= $(FLAGS_COMMON_static) -v -N -x -xp -n$(DEBUG_OBJDIR_static)
+CXXFLAGS_STLDEBUG_static= $(FLAGS_COMMON_static) -v -N -x -xp -n$(STLDEBUG_OBJDIR_static) -D_STLP_DEBUG
+
+CXXFLAGS_RELEASE_dynamic= $(FLAGS_COMMON_dynamic) -O2 -n$(RELEASE_OBJDIR_dynamic)
+CXXFLAGS_DEBUG_dynamic= $(FLAGS_COMMON_dynamic)  -v -N -x -xp -n$(DEBUG_OBJDIR_dynamic)
+CXXFLAGS_STLDEBUG_dynamic= $(FLAGS_COMMON_dynamic)  -v -N -x -xp -n$(STLDEBUG_OBJDIR_dynamic) -D_STLP_DEBUG
+
+RELEASE_LINK_COMMANDS_static=\
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_exp.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_io.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_trig.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)dll_main.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)ios.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)streambuf.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)iostream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)istream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)ostream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)fstream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)strstream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)sstream.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)codecvt.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)collate.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)ctype.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)messages.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)monetary.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)num_get.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)num_get_float.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)num_put.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)num_put_float.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)numpunct.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)time_facets.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)locale.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)locale_catalog.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)facets_byname.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)locale_impl.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)c_locale.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)c_locale_stub.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_io_w.$(OBJEXT) \
++$(RELEASE_OBJDIR_static)$(PATH_SEP)string_w.$(OBJEXT)
+
+
+DEBUG_LINK_COMMANDS_static= \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_exp.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_io.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_trig.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)dll_main.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)ios.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)streambuf.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)iostream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)istream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)ostream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)fstream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)strstream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)sstream.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)codecvt.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)collate.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)ctype.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)messages.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)monetary.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)num_get.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)num_get_float.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)num_put.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)num_put_float.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)numpunct.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)time_facets.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)locale.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)locale_catalog.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)facets_byname.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)locale_impl.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)c_locale.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)c_locale_stub.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_io_w.$(OBJEXT) \
++$(DEBUG_OBJDIR_static)$(PATH_SEP)string_w.$(OBJEXT)
+
+STLDEBUG_LINK_COMMANDS_static= \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_exp.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_io.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_trig.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)dll_main.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)ios.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)streambuf.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)iostream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)istream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)ostream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)fstream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)strstream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)sstream.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)codecvt.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)collate.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)ctype.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)messages.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)monetary.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_get.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_get_float.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_put.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_put_float.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)numpunct.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)time_facets.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)locale.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)locale_catalog.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)facets_byname.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)locale_impl.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)c_locale.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)c_locale_stub.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_io_w.$(OBJEXT) \
++$(STLDEBUG_OBJDIR_static)$(PATH_SEP)string_w.$(OBJEXT)
+
+#
+#  Target directories
+#
+#
+
+$(RELEASE_OBJDIR_dynamic) :
+	$(MKDIR) $(RELEASE_OBJDIR_dynamic)
+$(DEBUG_OBJDIR_dynamic) :
+	$(MKDIR) $(DEBUG_OBJDIR_dynamic)
+$(STLDEBUG_OBJDIR_dynamic) :
+	$(MKDIR) $(STLDEBUG_OBJDIR_dynamic)
+$(RELEASE_OBJDIR_static) :
+	$(MKDIR) $(RELEASE_OBJDIR_static)
+$(DEBUG_OBJDIR_static) :
+	$(MKDIR) $(DEBUG_OBJDIR_static)
+$(STLDEBUG_OBJDIR_static) :
+	$(MKDIR) $(STLDEBUG_OBJDIR_static)
+
+######   Targets ##################
+
+all_static :   $(ALL_STATIC_LIBS)
+
+all_dynamic :  $(ALL_DYNAMIC_LIBS)
+
+install :  $(INSTALL_STEP)
+
+clean : $(CLEAN_SPECIFIC)
+	-$(RM) $(RELEASE_OBJDIR_static) $(DEBUG_OBJDIR_static) \
+        $(STLDEBUG_OBJDIR_static) $(RELEASE_OBJDIR_dynamic) \
+        $(DEBUG_OBJDIR_dynamic) $(STLDEBUG_OBJDIR_dynamic)
+
+clobber : clean
+	-$(RM) $(OUTDIR)$(PATH_SEP)$(DEBUG_NAME).* \
+               $(OUTDIR)$(PATH_SEP)$(RELEASE_NAME).* $(OUTDIR)$(PATH_SEP)$(STLDEBUG_NAME).*
+
+#create a compiler platform directory
+platform:
+	-$(MKDIR) $(OBJDIR_COMMON)
+	-$(MKDIR) $(OBJDIR)
+
+$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) : $(RELEASE_OBJDIR_dynamic) $(DEF_FILE) $(RELEASE_OBJECTS_dynamic)
+	$(DYN_LINK) $(LDFLAGS_RELEASE_dynamic) $(RELEASE_OBJECTS_dynamic) , $(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB),,$(LDLIBS_RELEASE_dynamic)
+
+$(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB) : $(DEBUG_OBJDIR_dynamic) $(DEF_FILE) $(DEBUG_OBJECTS_dynamic)
+	$(DYN_LINK) $(LDFLAGS_DEBUG_dynamic) $(DEBUG_OBJECTS_dynamic), $(DYNLINK_OUT)$(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB) ,, $(LDLIBS_DEBUG_dynamic) 
+
+$(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB) : $(STLDEBUG_OBJDIR_dynamic) $(DEF_FILE) $(STLDEBUG_OBJECTS_dynamic)
+	$(DYN_LINK)  $(LDFLAGS_STLDEBUG_dynamic) $(STLDEBUG_OBJECTS_dynamic) , $(DYNLINK_OUT)$(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB) ,, $(LDLIBS_STLDEBUG_dynamic)
+
+$(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) : $(RELEASE_OBJDIR_static) $(DEF_FILE) $(RELEASE_OBJECTS_static)
+	$(LINK) $(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) $(RELEASE_LINK_COMMANDS_static)
+
+$(OUTDIR)$(PATH_SEP)$(DEBUG_LIB) : $(DEBUG_OBJDIR_static) $(DEF_FILE) $(DEBUG_OBJECTS_static)
+	$(LINK) $(OUTDIR)$(PATH_SEP)$(DEBUG_LIB) $(DEBUG_LINK_COMMANDS_static)  
+
+$(OUTDIR)$(PATH_SEP)$(STLDEBUG_LIB) : $(STLDEBUG_OBJDIR_static) $(DEF_FILE) $(STLDEBUG_OBJECTS_static)
+	$(LINK) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_LIB) $(STLDEBUG_LINK_COMMANDS_static)
+
+#########################################
+
+# ---------------------------------------------------------------------------
+
+!include nmake_common.mak
+
+.cpp.i:
+    $(CPP) $(CXXFLAGS_DEBUG_dynamic) -n. -Sr -Ss -Sd {$< }
+
+# ---------------------------------------------------------------------------
+
+# ---------------------------------------------------------------------------
diff --git a/main/source/stlport/src/beos-setup b/main/source/stlport/src/beos-setup
new file mode 100644
index 00000000..708982d6
--- /dev/null
+++ b/main/source/stlport/src/beos-setup
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+function intel_setup
+{
+files='alloca assert ctype dirent err fcntl float new inttypes libio limits locale malloc math memory signal stdarg stddef stdio stdlib string time va_list wchar wctype'
+
+for file in $files; do
+   echo '#include_next "'"$file"'.h"' > "../stlport/beos/$file"'.h'
+   echo '#include_next "'"c$file"'"' > "../stlport/beos/c$file"''
+done
+
+files='fstream new exception typeinfo iomanip iosfwd iostream istream ostream stdexcept stdiostream stream streambuf strstream'
+
+for file in $files; do
+   echo '#include_next "'"$file"'.h"' > "../stlport/beos/$file"'.h'
+   echo '#include_next "'"$file"'"' > "../stlport/beos/$file"''
+done
+}
+
+function intel_uninstall
+{
+	rm -fr ~/config/include/stlport
+	cd ../lib
+	for file in libstlport_gcc*; do
+		rm -f ~/config/lib/$file
+	done
+	rm -f ~/config/lib/libstlport_gcc*.so
+}
+
+function intel_install
+{
+	cp -R ../stlport ~/config/include
+
+	cd ../lib
+	for file in libstlport_gcc*.so.*; do
+		basename=`echo $file | sed 's/\(.*\.so\).*/\1/'`
+		cp $file ~/config/lib
+		if test "$file" != "$basename"; then
+			ln -s ~/config/lib/$file ~/config/lib/$basename
+		fi
+	done
+
+	for file in libstlport_gcc*.a; do
+		cp $file ~/config/lib
+	done
+
+	echo include files are in ~/config/include
+	echo libraries are in ~/config/lib
+}
+
+
+if test $# -ne 1; then
+echo usage:
+echo "	beos-setup -setup       # sets up headers"
+echo "	beos-setup -install     # installs STLPort"
+echo "	beos-setup -uninstall   #uninstalls STLPort"
+
+else
+
+if test $1 = "-setup"; then
+	intel_setup
+	exit 0
+fi
+
+if test $1 = "-uninstall"; then
+	intel_uninstall
+	exit 0
+fi
+
+if test $1 = "-install"; then
+	intel_install
+	exit 0
+fi
+
+echo unknown option $*
+exit 1
+
+
+
+fi
+
+
+
+
+
+
+
diff --git a/main/source/stlport/src/build-tempinc-xlc.mk b/main/source/stlport/src/build-tempinc-xlc.mk
new file mode 100644
index 00000000..2b74ad8a
--- /dev/null
+++ b/main/source/stlport/src/build-tempinc-xlc.mk
@@ -0,0 +1,16 @@
+tempIncConst = tempinc
+buildDir = .
+tempIncDir = $(buildDir)/$(tempIncConst)
+
+TempInc_CFiles := $(wildcard $(tempIncDir)/*.C)
+TempInc_OFiles := $(patsubst %.C,%.o, $(TempInc_CFiles))
+
+all.PHONY : $(TempInc_OFiles)
+
+%.o : %.C
+    @echo "Compiling File $@"
+    @xlC_r  \
+    -I/tools/STLport-4.0/stlport -qmaxerr=10 -qtempinc=$(tempIncDir)
+-qrtti=all -qsrcmsg \
+    -o $(@) \
+    -c $<
diff --git a/main/source/stlport/src/build-tempinc-xlc.sh b/main/source/stlport/src/build-tempinc-xlc.sh
new file mode 100644
index 00000000..dae22ee4
--- /dev/null
+++ b/main/source/stlport/src/build-tempinc-xlc.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+GNUMake=gmake
+MakeFile=build-tempinc-xlc.mk
+
+PassNumber=0
+echo "Building the AIX tempinc directory."
+echo "Calling $MakeFile."
+until  { $GNUMake -f $MakeFile -q ; }
+do
+    let PassNumber=$PassNumber+1
+    echo "Pass Number: $PassNumber"
+    if { ! $GNUMake -f $MakeFile ; } then
+        echo "An error occurred.. aborting"
+        exit 1;
+    fi
+done
+echo "Finished the AIX tempinc directory."
diff --git a/main/source/stlport/src/c_locale.c b/main/source/stlport/src/c_locale.c
new file mode 100644
index 00000000..b9a749de
--- /dev/null
+++ b/main/source/stlport/src/c_locale.c
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+# include "stlport_prefix.h" 
+
+# include <stdlib.h>
+
+# ifdef _STLP_REAL_LOCALE_IMPLEMENTED
+#  include <limits.h>
+#  include "c_locale.h"
+#  if defined (WIN32) || defined (_WIN32)
+#   include "c_locale_win32/c_locale_win32.c"
+#  elif defined (_STLP_USE_GLIBC) && ! defined (__CYGWIN__)
+#   if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)  
+#    include "c_locale_glibc/c_locale_glibc2.c"
+#   else
+#    include "c_locale_glibc/c_locale_glibc.c"
+#   endif
+#  elif defined __ISCPP__
+#   include "c_locale_is/c_locale_is.cpp"
+#  endif
+# endif
diff --git a/main/source/stlport/src/c_locale.h b/main/source/stlport/src/c_locale.h
new file mode 100644
index 00000000..2ef16245
--- /dev/null
+++ b/main/source/stlport/src/c_locale.h
@@ -0,0 +1,407 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+/*
+ * It is impossible to write the C++ locale library in terms of locales
+ * as defined in the C standard.  Instead, we write the C++ locale and I/O
+ * library in terms of a low level C-like interface.  This file defines
+ * that interface.
+ *
+ * The low-level locale interface can't be written portably; there
+ * must be a version of it for each platform that the C++ library
+ * is ported to.  On many systems this interface may be a thin wrapper
+ * for existing functionality.
+ */
+
+#ifndef _STLP_C_LOCALE_IMPL_H
+# define _STLP_C_LOCALE_IMPL_H
+
+# include <stl/c_locale.h>
+// # include <wchar.h>
+# include <stl/_cwchar.h>
+
+#define _Locale_MAX_SIMPLE_NAME 256
+
+/*
+ * A number: the maximum length of a simple locale name.
+ * (i.e. a name like like en_US, as opposed to a name like
+ * en_US/de_AT/de_AT/es_MX/en_US/en_US) */
+#define _Locale_MAX_COMPOSITE_NAME 6*(_Locale_MAX_SIMPLE_NAME+3)
+
+/*
+ * Maximum length of a composite locale.
+ */
+
+#ifdef __cplusplus
+_STLP_BEGIN_NAMESPACE
+extern "C" {
+#endif
+
+/*
+ * Typedefs:
+ */
+
+#if defined (__GNUC__) || defined (_KCC) || defined(__ICC)
+typedef unsigned short int _Locale_mask_t;
+#else
+typedef unsigned int _Locale_mask_t;
+#endif
+
+void * _Locale_ctype_create(const char *);
+void * _Locale_numeric_create(const char *);
+void * _Locale_time_create(const char *);
+void * _Locale_collate_create(const char *);
+void * _Locale_monetary_create(const char *);
+void * _Locale_messages_create(const char *);
+
+/*
+ * The char* argument is a simple locale name.
+ * These functions return NULL to indicate failure.
+ * The char* argument is a simple locale name, which may not
+ * be "".  These functions return NULL to indicate failure.
+ */
+
+const char * _Locale_ctype_default(char * __buf);
+const char * _Locale_numeric_default(char * __buf);
+const char * _Locale_time_default(char * __buf);
+const char * _Locale_collate_default(char * __buf);
+const char * _Locale_monetary_default(char * __buf);
+const char * _Locale_messages_default(char * __buf);
+
+/*
+ * Returns the name of the user's default locale in each
+ * category, as a null-terminated string.  A NULL value
+ * means the default "C" locale.
+ */
+
+char * _Locale_ctype_name(const void *, char *);
+char * _Locale_numeric_name(const void *, char *);
+char * _Locale_time_name(const void *, char *);
+char * _Locale_collate_name(const void *, char *);
+char * _Locale_monetary_name(const void *, char *);
+char * _Locale_messages_name(const void *, char *);
+
+/*
+ * __buf points to a buffer that can hold at least _Locale_MAX_SIMPLE_NAME
+ * characters.  These functions store the name, as a null-terminated
+ * string, in __buf.
+ */
+
+void _Locale_ctype_destroy(void *);
+void _Locale_numeric_destroy(void *);
+void _Locale_time_destroy(void *);
+void _Locale_collate_destroy(void *);
+void _Locale_monetary_destroy(void *);
+void _Locale_messages_destroy(void *);
+
+char * _Locale_extract_ctype_name(const char *cname, char *__buf);
+char * _Locale_extract_numeric_name(const char *cname, char *__buf);
+char * _Locale_extract_time_name(const char *cname, char *__buf);
+char * _Locale_extract_collate_name(const char *cname, char *__buf);
+char * _Locale_extract_monetary_name(const char *cname, char *__buf);
+char * _Locale_extract_messages_name(const char *cname, char *__buf);
+
+/*
+ * cname is a (possibly composite) locale name---i.e. a name that can
+ * be passed to setlocale.  _buf points to an array large enough to
+ * store at least _Locale_MAX_SIMPLE_NAME characters, and each of these
+ * functions extracts the name of a single category, stores it in buf
+ * as a null-terminated string, and returns buf.
+ */
+
+char * _Locale_compose_name(char *__buf,
+                            const char *__Ctype, const char *__Numeric,
+                            const char *__Time, const char *__Collate,
+                            const char *__Monetary, const char *__Messages,
+                            const char *__DefaultName);
+
+/*
+ * The inputs to this function are six null-terminated strings: the
+ * names of a locale's six categories.  Locale names for non-standard
+ * categories are taken from __DefaultName.
+ * __buf is a pointer to an array large enough to store at least 
+ * _Locale_MAX_COMPOSITE_NAME characters.
+ * This function constructs a (possibly composite) name describing the
+ * locale as a whole, stores that name in buf as a null-terminated
+ * string, and returns buf.
+ */
+
+/*
+ * FUNCTIONS THAT USE CTYPE
+ */
+
+/*
+ * Narrow character functions:
+ */
+
+const _Locale_mask_t * _Locale_ctype_table(struct _Locale_ctype *);
+
+/*
+ * Returns a pointer to the beginning of the ctype table.  The table is
+ * at least 257 bytes long; if p is the pointer returned by this
+ * function, then p[c] is valid if c is EOF or if p is any value of
+ * type unsigned char.
+ */
+
+int _Locale_toupper(struct _Locale_ctype *, int);
+int _Locale_tolower(struct _Locale_ctype *, int);
+
+/*
+ * c is either EOF, or an unsigned char value.
+ */
+
+# ifndef _STLP_NO_WCHAR_T
+/*
+ * Wide character functions:
+ */
+_Locale_mask_t _Locale_wchar_ctype(struct _Locale_ctype *, wint_t, 
+	_Locale_mask_t);
+wint_t _Locale_wchar_tolower(struct _Locale_ctype *, wint_t);
+wint_t _Locale_wchar_toupper(struct _Locale_ctype *, wint_t);
+# endif
+
+# if !defined ( _STLP_NO_MBSTATE_T )
+
+/*
+ * Multibyte functions:
+ */
+
+int _Locale_mb_cur_max (struct _Locale_ctype *);
+/*
+ * Returns the number of bytes of the longest allowed multibyte
+ * character in the current encoding.
+ */
+
+int _Locale_mb_cur_min (struct _Locale_ctype *);
+/*
+ * Returns the number of bytes of the shortest allowed multibyte
+ * character in the current encoding.
+ */
+
+int _Locale_is_stateless (struct _Locale_ctype *);
+/*
+ * Returns 1 if the current multibyte encoding is stateless
+ * and does not require the use of an mbstate_t value.
+ */
+
+# ifndef _STLP_NO_WCHAR_T
+wint_t _Locale_btowc(struct _Locale_ctype *, int);
+int _Locale_wctob(struct _Locale_ctype *, wint_t);
+
+/*
+ * Just like btowc and wctob, from 4.6.5.1 of the C standard, Normative
+ * Addendum 1.  (And just like widen/narrow, from clause 22 of the C++
+ * standard.)
+ */
+
+size_t _Locale_mbtowc(struct _Locale_ctype *,
+                      wchar_t *,
+                      const char *, size_t,
+                      mbstate_t *);
+
+/*
+ * Almost identical to mbrtowc, from 4.6.5.3.2 of NA1.  The only
+ * important difference is that mbrtowc treats null wide characters
+ * as special, and we don't.  Specifically: examines the characters
+ * in [from, from + n), extracts a single wide character, and stores
+ * it in *to.  Modifies shift_state if appropriate.  The return value,
+ * which is always positive, is the number of characters extracted from
+ * the input sequence.  Return value is (size_t) -1 if there was an
+ * encoding error in the input sequence, and (size_t) -2 if
+ * [from, from + n) is correct but not complete.  None of the pointer
+ * arguments may be null pointers.
+ */
+
+size_t _Locale_wctomb(struct _Locale_ctype *,
+                      char *, size_t,
+                      const wchar_t,
+                      mbstate_t *);
+
+/*
+ * Again, very similar to wcrtomb.  The differences are that (1) it
+ * doesn't treat null characters as special; and (2) it stores at most
+ * n characters.  Converts c to a multibyte sequence, stores that
+ * sequence in the array 'to', and returns the length of the sequence.
+ * Modifies shift_state if appropriate.  The return value is (size_t) -1
+ * if c is not a valid wide character, and (size_t) -2 if the length of
+ * the multibyte character sequence is greater than n.
+ */
+# endif
+
+size_t _Locale_unshift(struct _Locale_ctype *,
+                       mbstate_t *,
+                       char *, size_t, char **);
+
+/*
+ * Inserts whatever characters are necessary to restore st to an
+ * initial shift state.  Sets *next to buf + m, where m is the number
+ * of characters inserted.  (0 <= m <= n.)  Returns m to indicate
+ * success, (size_t) -1 to indicate error, (size_t) -2 to indicate
+ * partial success (more than n characters needed).  For success or partial
+ * success, sets *next to buf + m.
+ */
+
+# endif /*  _STLP_NO_MBSTATE_T */
+
+/*
+ * FUNCTIONS THAT USE COLLATE
+ */
+
+int _Locale_strcmp(struct _Locale_collate *,
+                   const char *, size_t,
+                   const char *, size_t);
+# ifndef _STLP_NO_WCHAR_T
+int _Locale_strwcmp(struct _Locale_collate *,
+                    const wchar_t *, size_t,
+                    const wchar_t *, size_t);
+# endif
+/*
+ * Compares the two sequences [s1, s1 + n1) and [s2, s2 + n2).  Neither
+ * sequence is assumed to be null-terminated, and null characters
+ * aren't special.  If the two sequences are the same up through
+ * min(n1, n2), then the sequence that compares less is whichever one
+ * is shorter.
+ */
+
+size_t _Locale_strxfrm(struct _Locale_collate *,
+                       char *, size_t,
+                       const char *, size_t);
+
+# ifndef _STLP_NO_WCHAR_T
+size_t _Locale_strwxfrm(struct _Locale_collate *,
+                        wchar_t *, size_t,
+                        const wchar_t *, size_t);
+# endif
+
+/*
+ * Creates a transformed version of the string [s2, s2 + n2).  The
+ * string may contain embedded null characters; nulls aren't special.
+ * The transformed string begins at s1, and contains at most n1
+ * characters.  The return value is the length of the transformed
+ * string.  If the return value is greater than n1 then this is an
+ * error condition: it indicates that there wasn't enough space.  In
+ * that case, the contents of [s1, s1 + n1) is unspecified.
+*/
+
+/*
+ * FUNCTIONS THAT USE NUMERIC
+ */
+
+char _Locale_decimal_point(struct _Locale_numeric *);
+char _Locale_thousands_sep(struct _Locale_numeric *);
+const char * _Locale_grouping(struct _Locale_numeric *);
+
+/*
+ * Equivalent to the first three fields in struct lconv.  (C standard,
+ * section 7.4.)
+ */
+
+const char * _Locale_true(struct _Locale_numeric *);
+const char * _Locale_false(struct _Locale_numeric *);
+
+/*
+ * Return "true" and "false" in English locales, and something
+ * appropriate in non-English locales.
+ */
+
+/*
+ * FUNCTIONS THAT USE MONETARY
+ */
+
+const char * _Locale_int_curr_symbol(struct _Locale_monetary *);
+const char * _Locale_currency_symbol(struct _Locale_monetary *);
+char         _Locale_mon_decimal_point(struct _Locale_monetary *);
+char         _Locale_mon_thousands_sep(struct _Locale_monetary *);
+const char * _Locale_mon_grouping(struct _Locale_monetary *);
+const char * _Locale_positive_sign(struct _Locale_monetary *);
+const char * _Locale_negative_sign(struct _Locale_monetary *);
+char         _Locale_int_frac_digits(struct _Locale_monetary *);
+char         _Locale_frac_digits(struct _Locale_monetary *);
+int          _Locale_p_cs_precedes(struct _Locale_monetary *);
+int          _Locale_p_sep_by_space(struct _Locale_monetary *);
+int          _Locale_p_sign_posn(struct _Locale_monetary *);
+int          _Locale_n_cs_precedes(struct _Locale_monetary *);
+int          _Locale_n_sep_by_space(struct _Locale_monetary *);
+int          _Locale_n_sign_posn(struct _Locale_monetary *);
+
+/*
+ * Return the obvious fields of struct lconv.
+ */
+
+/*
+ * FUNCTIONS THAT USE TIME
+ */
+
+const char * _Locale_full_monthname(struct _Locale_time *, int);
+const char * _Locale_abbrev_monthname(struct _Locale_time *, int);
+
+/*
+ * month is in the range [0, 12).
+ */
+
+const char * _Locale_full_dayofweek(struct _Locale_time *, int);
+const char * _Locale_abbrev_dayofweek(struct _Locale_time *, int);
+
+/*
+ * day is in the range [0, 7).  Sunday is 0.
+ */
+
+const char * _Locale_d_t_fmt(struct _Locale_time *);
+const char * _Locale_d_fmt(struct _Locale_time *);
+const char * _Locale_t_fmt(struct _Locale_time *);
+const char * _Locale_long_d_t_fmt(struct _Locale_time*);
+const char * _Locale_long_d_fmt(struct _Locale_time*);
+
+const char * _Locale_am_str(struct _Locale_time *);
+const char * _Locale_pm_str(struct _Locale_time *);
+const char * _Locale_t_fmt_ampm(struct _Locale_time *);
+
+
+/*
+ * FUNCTIONS THAT USE MESSAGES
+ */
+
+int _Locale_catopen(struct _Locale_messages*, const char*);
+
+/*
+ * Very similar to catopen, except that it uses L to determine
+ * which catalog to open.
+ */
+
+void _Locale_catclose(struct _Locale_messages*, int);
+
+/*
+ * catalog is a value that was returned by a previous call to
+ * _Locale_catopen
+ */
+
+const char * _Locale_catgets(struct _Locale_messages *, int,
+                             int, int,const char *);
+
+/*
+ * Returns a string, identified by a set index and a message index,
+ * from an opened message catalog.  Returns default if no such
+ * string exists.
+ */
+
+# ifdef __cplusplus
+}
+_STLP_END_NAMESPACE
+# endif
+
+# endif /* _STLP_C_LOCALE_IMPL_H */
diff --git a/main/source/stlport/src/c_locale_glibc/c_locale_glibc.c b/main/source/stlport/src/c_locale_glibc/c_locale_glibc.c
new file mode 100644
index 00000000..b1859c1f
--- /dev/null
+++ b/main/source/stlport/src/c_locale_glibc/c_locale_glibc.c
@@ -0,0 +1,774 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Silicon Graphics makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ */ 
+
+
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#ifdef _POSIX_MAPPED_FILES
+# include <sys/mman.h>
+#endif
+
+#include <stl/c_locale.h>
+#include <limits.h>
+#include <wctype.h>
+/* #include <libc-lock.h> */
+
+#include <locale.h>
+#include <argz.h>
+#include "gcc_localeinfo.h"
+
+wint_t btowc(int c);
+int wctob (wint_t c);
+
+size_t mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps);
+size_t wcrtomb (char *s, wchar_t wc, mbstate_t *ps);
+size_t mbrlen (const char* s, size_t n, mbstate_t *ps);
+
+#include <nl_types.h>
+
+
+typedef struct _Locale_ctype    { 
+  const struct locale_data* gcc_data;
+  const int* __tolower;
+  const int* __toupper;
+  _Locale_mask_t* __class;
+} L_ctype_t;
+
+typedef struct _Locale_numeric  { 
+  const struct locale_data* gcc_data;
+} L_numeric_t;
+
+typedef struct _Locale_time     { 
+  const struct locale_data* gcc_data;
+} L_time_t;
+
+typedef struct _Locale_collate  { 
+  const struct locale_data* gcc_data;
+} L_collate_t;
+
+typedef struct _Locale_monetary { 
+  const struct locale_data* gcc_data;
+} L_monetary_t;
+
+typedef struct _Locale_messages { 
+  const struct locale_data* gcc_data;
+} L_messages_t;
+
+static char *
+_Locale_extract_name ( const char *cname, char *into, int category )
+{
+  int i = 0;
+  const char * end;
+  
+  if ( cname[0] != '/' )
+    return strcpy(into, cname); /* simple locale name */
+  
+  for ( i = 0; i <= category; i ++ ) {
+    while ( *cname != '\0' && *cname != '/' )
+      cname++;
+    if ( *cname == '\0' )
+      return into;
+    cname++;
+  }
+  
+  if ( *cname == '\0' )
+    return into;
+  
+  end = cname;
+  while ( *end != '\0' && *end != '/' )
+    end++;
+  
+  strncpy ( into, cname, end - cname );
+  into [ end - cname ] = '\0';
+  
+  return into;
+}
+
+char* _Locale_name(const struct locale_data* gcc_data, 
+			      char* buf)
+{
+  if (!(gcc_data && gcc_data->name)) return 0;
+  strncpy(buf, gcc_data->name, _Locale_MAX_SIMPLE_NAME);
+  buf [ _Locale_MAX_SIMPLE_NAME - 1 ] = '\0';
+  return buf;
+}
+
+
+/* calls _nl_find_locale which is a function internal to the glibc
+    locale implementation that loads locale data in from the data
+    files.  The locale_data struct has information for all categories.
+    In the following implementation we use a locale_data struct for
+    each category for simplicity, though there is an obvious waste in
+    doing that.  */
+const struct locale_data *
+_Find_locale (char *locale_path, size_t locale_path_len,
+	      int category, char **name)
+{
+  return __nl_find_locale(locale_path, locale_path_len, category, name);
+}
+
+
+static void
+_Remove_locale (int locale, struct locale_data *data)
+{
+  /* this should eventually call _nl_remove_locale() in glibc 2.1 */
+}
+
+/* couldn't find where LOCALE_PATH was defined in glibc,
+   but this is the directory it is defined to -JGS */
+#define __LOCALE_PATH "/usr/share/locale"
+
+const struct locale_data*
+_Category_create(const char * name, int category)
+{
+  /* JGS, where should this path come from? */
+  char* locpath_var;
+  char* locale_path = NULL;
+  size_t locale_path_len = 0;
+
+  locpath_var = __secure_getenv("LOCPATH");
+  
+  if (locpath_var != NULL && locpath_var[0] != '\0')
+    if (argz_create_sep (locpath_var, ':',
+			 &locale_path, &locale_path_len) != 0)
+      return NULL;
+  
+  if (argz_add_sep (&locale_path, &locale_path_len, __LOCALE_PATH, ':') != 0)
+    return NULL;
+
+  return _Find_locale(locale_path, locale_path_len, 
+		      category, (char**)&name);
+}
+
+
+
+static const char* get_default_locale(char* buf) {
+  char* lang = getenv("LANG");
+  if (lang == NULL || lang[0] == '\0') {
+    buf[0] = '\0';
+    return NULL;
+  }
+  else {
+    strcpy(buf, lang);
+    return buf;
+  }
+}
+    
+const char* _Locale_ctype_default(char* buf) {
+  char fullname[_Locale_MAX_COMPOSITE_NAME];
+  if (get_default_locale(fullname) == NULL)
+    return NULL;
+  else
+    return _Locale_extract_ctype_name(fullname, buf);
+}
+
+const char* _Locale_numeric_default(char* buf) {
+  char fullname[_Locale_MAX_COMPOSITE_NAME];
+  if (get_default_locale(fullname) == NULL)
+    return NULL;
+  else
+    return _Locale_extract_numeric_name(fullname, buf);
+}
+
+const char* _Locale_time_default(char* buf) {
+  char fullname[_Locale_MAX_COMPOSITE_NAME];
+  if (get_default_locale(fullname) == NULL)
+    return NULL;
+  else
+    return _Locale_extract_time_name(fullname, buf);
+}
+
+const char* _Locale_collate_default(char* buf)  {
+  char fullname[_Locale_MAX_COMPOSITE_NAME];
+  if (get_default_locale(fullname) == NULL)
+    return NULL;
+  else
+    return _Locale_extract_collate_name(fullname, buf);
+}
+
+const char* _Locale_monetary_default(char* buf) {
+  char fullname[_Locale_MAX_COMPOSITE_NAME];
+  if (get_default_locale(fullname) == NULL)
+    return NULL;
+  else
+    return _Locale_extract_monetary_name(fullname, buf);
+}
+
+const char* _Locale_messages_default(char* buf) {
+  char fullname[_Locale_MAX_COMPOSITE_NAME];
+  if (get_default_locale(fullname) == NULL)
+    return NULL;
+  else
+    return _Locale_extract_messages_name(fullname, buf);
+}
+
+
+/****** Numeric Category ******/
+
+void*
+_Locale_numeric_create(const char * name) {
+  L_numeric_t*  lnum = (L_numeric_t*)malloc(sizeof(L_numeric_t));
+  lnum->gcc_data = _Category_create(name, LC_NUMERIC);
+  return (void*)lnum; 
+}
+
+
+char* _Locale_numeric_name(const void* lnum, 
+				      char* buf) {
+  return _Locale_name(((struct _Locale_ctype*)lnum)->gcc_data, buf);
+}
+void _Locale_numeric_destroy(void* lnum)   
+{
+  _Remove_locale(LC_NUMERIC, (struct locale_data *)((struct _Locale_ctype*)lnum)->gcc_data);
+  free(lnum);
+}
+char* _Locale_extract_numeric_name(const char* cname, char* buf) 
+{
+  return _Locale_extract_name(cname, buf, LC_NUMERIC);
+}
+char _Locale_decimal_point(struct _Locale_numeric* lnum)
+{ 
+  return lnum->gcc_data->values[_NL_ITEM_INDEX(DECIMAL_POINT)].string[0]; 
+}
+char _Locale_thousands_sep(struct _Locale_numeric* lnum)
+{ 
+  return lnum->gcc_data->values[_NL_ITEM_INDEX(THOUSANDS_SEP)].string[0]; 
+}
+const char* _Locale_grouping(struct _Locale_numeric * lnum) 
+{
+  return lnum->gcc_data->values[_NL_ITEM_INDEX(GROUPING)].string; 
+}
+
+/* JGS: gcc/linux does not provide true/false names in their
+ * locale data files 
+*/
+
+static const char* __true_name = "true";
+static const char* __false_name = "false";
+
+const char * _Locale_true(struct _Locale_numeric *l)  
+{ return __true_name; }
+const char * _Locale_false(struct _Locale_numeric *l)
+{ return __false_name; }
+
+
+/****** Monetary Category ******/
+
+void* _Locale_monetary_create(const char* name) {
+  L_monetary_t* lmon = (L_monetary_t*)malloc(sizeof(L_monetary_t));
+  lmon->gcc_data = _Category_create(name, LC_MONETARY);
+  return lmon;
+}
+
+char* _Locale_monetary_name(const void* lmon,
+			    char* buf) {
+  return _Locale_name(((struct _Locale_monetary*)lmon)->gcc_data, buf);
+}
+
+void _Locale_monetary_destroy(void*lmon) {
+  _Remove_locale(LC_MONETARY, (struct locale_data *)((struct _Locale_monetary*)lmon)->gcc_data);
+  free(lmon);
+}
+
+char* _Locale_extract_monetary_name(const char* cname, char* buf) {
+  return _Locale_extract_name(cname, buf, LC_MONETARY);
+}
+
+const char* _Locale_int_curr_symbol(struct _Locale_monetary* lmon) {
+  return lmon->gcc_data->values[_NL_ITEM_INDEX(INT_CURR_SYMBOL)].string; 
+}
+const char* _Locale_currency_symbol(struct _Locale_monetary* lmon) {
+  return lmon->gcc_data->values[_NL_ITEM_INDEX(CURRENCY_SYMBOL)].string; 
+}
+char        _Locale_mon_decimal_point(struct _Locale_monetary* lmon) {
+  return lmon->gcc_data->values[_NL_ITEM_INDEX(MON_DECIMAL_POINT)].string[0]; 
+}
+char        _Locale_mon_thousands_sep(struct _Locale_monetary* lmon) {
+  return lmon->gcc_data->values[_NL_ITEM_INDEX(MON_THOUSANDS_SEP)].string[0]; 
+}
+const char* _Locale_mon_grouping(struct _Locale_monetary* lmon) {
+  return lmon->gcc_data->values[_NL_ITEM_INDEX(MON_GROUPING)].string; 
+}
+const char* _Locale_positive_sign(struct _Locale_monetary* lmon) {
+  return lmon->gcc_data->values[_NL_ITEM_INDEX(POSITIVE_SIGN)].string; 
+}
+const char* _Locale_negative_sign(struct _Locale_monetary* lmon) {
+  return lmon->gcc_data->values[_NL_ITEM_INDEX(NEGATIVE_SIGN)].string; 
+}
+char        _Locale_int_frac_digits(struct _Locale_monetary* lmon) {
+  return lmon->gcc_data->values[_NL_ITEM_INDEX(INT_FRAC_DIGITS)].string[0]; 
+}
+char        _Locale_frac_digits(struct _Locale_monetary* lmon) {
+  return lmon->gcc_data->values[_NL_ITEM_INDEX(FRAC_DIGITS)].string[0]; 
+}
+int         _Locale_p_cs_precedes(struct _Locale_monetary* lmon) {
+  return lmon->gcc_data->values[_NL_ITEM_INDEX(P_CS_PRECEDES)].word; 
+}
+int         _Locale_p_sep_by_space(struct _Locale_monetary* lmon) {
+  return lmon->gcc_data->values[_NL_ITEM_INDEX(P_SEP_BY_SPACE)].word; 
+}
+int         _Locale_p_sign_posn(struct _Locale_monetary* lmon) {
+  return lmon->gcc_data->values[_NL_ITEM_INDEX(P_SIGN_POSN)].word; 
+}
+int         _Locale_n_cs_precedes(struct _Locale_monetary* lmon) {
+  return lmon->gcc_data->values[_NL_ITEM_INDEX(N_CS_PRECEDES)].word; 
+}
+int          _Locale_n_sep_by_space(struct _Locale_monetary* lmon) {
+  return lmon->gcc_data->values[_NL_ITEM_INDEX(N_SEP_BY_SPACE)].word; 
+}
+int          _Locale_n_sign_posn(struct _Locale_monetary* lmon) {
+  return lmon->gcc_data->values[_NL_ITEM_INDEX(N_SIGN_POSN)].word; 
+}
+
+/****** Time Category ******/
+
+void* _Locale_time_create(const char * name) {
+  L_time_t*  ltime = (L_time_t*)malloc(sizeof(L_time_t));
+  ltime->gcc_data = _Category_create(name, LC_TIME);
+  return ltime; 
+}
+
+char* _Locale_time_name(const void* ltime, 
+			char* buf) {
+  return _Locale_name(((struct _Locale_time*)ltime)->gcc_data, buf);
+}
+char* _Locale_extract_time_name(const char* cname, char* buf) {
+  return _Locale_extract_name(cname, buf, LC_TIME);
+}
+void _Locale_time_destroy(void* ltime) {
+  _Remove_locale(LC_TIME, (struct locale_data *)((struct _Locale_time*)ltime)->gcc_data);
+  free(ltime);
+}
+const char * _Locale_full_monthname(struct _Locale_time *ltime, int month) {
+	const char **names = (const char **)&(ltime->gcc_data->values[_NL_ITEM_INDEX(MON_1)]);
+	return names[month]; 
+}
+const char * _Locale_abbrev_monthname(struct _Locale_time *ltime, int month) {
+	const char **names = (const char **)&(ltime->gcc_data->values[_NL_ITEM_INDEX(ABMON_1)]);
+	return names[month]; 
+}
+const char * _Locale_full_dayofweek(struct _Locale_time *ltime, int day) {
+	const char **names = (const char **)&(ltime->gcc_data->values[_NL_ITEM_INDEX(DAY_1)]);
+	return names[day]; 
+}
+const char * _Locale_abbrev_dayofweek(struct _Locale_time *ltime, int day) {
+	const char **names = (const char **)&(ltime->gcc_data->values[_NL_ITEM_INDEX(ABDAY_1)]);
+	return names[day]; 
+}
+const char* _Locale_d_t_fmt(struct _Locale_time* ltime) {
+  return ltime->gcc_data->values[_NL_ITEM_INDEX(D_T_FMT)].string; 
+}
+const char* _Locale_long_d_t_fmt(struct _Locale_time* ltime) {
+  return ltime->gcc_data->values[_NL_ITEM_INDEX(D_T_FMT)].string; 
+}
+const char* _Locale_d_fmt(struct _Locale_time* ltime) 
+{
+  return ltime->gcc_data->values[_NL_ITEM_INDEX(D_FMT)].string; 
+}
+const char* _Locale_long_d_fmt(struct _Locale_time* ltime)
+{
+  return ltime->gcc_data->values[_NL_ITEM_INDEX(D_FMT)].string;
+}
+const char* _Locale_t_fmt(struct _Locale_time* ltime) {
+  return ltime->gcc_data->values[_NL_ITEM_INDEX(T_FMT)].string; 
+}
+const char* _Locale_am_str(struct _Locale_time* ltime) {
+  return ltime->gcc_data->values[_NL_ITEM_INDEX(AM_STR)].string; 
+}
+const char* _Locale_pm_str(struct _Locale_time* ltime) {
+  return ltime->gcc_data->values[_NL_ITEM_INDEX(PM_STR)].string; 
+}
+const char* _Locale_t_fmt_ampm(struct _Locale_time* ltime)
+{
+  return ltime->gcc_data->values[_NL_ITEM_INDEX(T_FMT_AMPM)].string; 
+}
+
+
+/****** Messages Category ******/
+
+void* _Locale_messages_create(const char * name) {
+  L_messages_t*  lmsg = (L_messages_t*)malloc(sizeof(L_messages_t));
+  lmsg->gcc_data = _Category_create(name, LC_MESSAGES);
+  return lmsg; 
+}
+
+char* _Locale_messages_name(const void* lmsg, char* buf) {
+  return _Locale_name(((struct _Locale_messages*)lmsg)->gcc_data, buf);
+}
+
+void _Locale_messages_destroy(void* lmsg) {
+  _Remove_locale(LC_MESSAGES, (struct locale_data *)((struct _Locale_messages*)lmsg)->gcc_data);
+  free(lmsg);
+}
+
+char* _Locale_extract_messages_name(const char* cname, char* buf) { 
+  return _Locale_extract_name(cname, buf, LC_MESSAGES);
+}
+
+
+/*
+  Could not find support for locale specific messages in glibc
+
+  Also, this C locale interface should use a typedef for the catalog
+  instead of just an int. Currently I'm casting a void* (nl_catd)
+  back and forth to and int.
+
+  -JGS
+ */
+
+int _Locale_catopen(struct _Locale_messages*l, const char* cat_name) {
+  return (int)catopen(cat_name, 0); /*  JGS, don't know about the flag */
+}
+void _Locale_catclose(struct _Locale_messages*l, int catalog) {
+  catclose((nl_catd)catalog);
+}
+const char* _Locale_catgets(struct _Locale_messages*l, int catalog,
+                                       int set_num, int msg_num,
+                                       const char *dfault){
+  return catgets((nl_catd)catalog, set_num, msg_num, dfault);
+}
+
+
+/****** ctype Category ******/
+
+
+/*
+  gcc uses a different set of masks for wide characters than for
+  normal characters. However, the C++ standard requires there
+  to be only one set of masks for both. Therefore we must
+  translate the mask values from the wide characters to the 
+  mask values for the normal characters.  -JGS
+ */
+static _Locale_mask_t _Map_wchar_mask_to_char_mask(wctype_t m) {
+  _Locale_mask_t ret = 0;
+  if (m & _ISwcntrl)  ret |= _Locale_CNTRL;
+  if (m & _ISwupper)  ret |= _Locale_UPPER;
+  if (m & _ISwlower)  ret |= _Locale_LOWER;
+  if (m & _ISwdigit)  ret |= _Locale_DIGIT;
+  if (m & _ISwxdigit) ret |= _Locale_XDIGIT;
+  if (m & _ISwpunct)  ret |= _Locale_PUNCT;
+  if (m & _ISwspace)  ret |= _Locale_SPACE;
+  if (m & _ISwprint)  ret |= _Locale_PRINT;
+  if (m & _ISwalpha)  ret |= _Locale_ALPHA;
+  return ret;
+}
+
+
+void* _Locale_ctype_create(const char * name) {
+  const union locale_data_value *ctypes;
+  L_ctype_t* lctype;
+
+  lctype = (L_ctype_t*)malloc(sizeof(L_ctype_t));
+  lctype->gcc_data = _Category_create(name, LC_CTYPE);
+  ctypes = lctype->gcc_data->values;
+
+  lctype->__class = (_Locale_mask_t *)
+    (ctypes[_NL_ITEM_INDEX (_NL_CTYPE_CLASS)] .string) + 128;
+#if BYTE_ORDER == BIG_ENDIAN
+  lctype->__tolower = (const int *)
+    (ctypes[_NL_ITEM_INDEX (_NL_CTYPE_TOLOWER_EB)].string) + 128;
+  lctype->__toupper = (const int *)
+    (ctypes[_NL_ITEM_INDEX (_NL_CTYPE_TOUPPER_EB)].string) + 128;
+#elif BYTE_ORDER == LITTLE_ENDIAN
+  lctype->__tolower = (const int *)
+    (ctypes[_NL_ITEM_INDEX (_NL_CTYPE_TOLOWER_EL)].string) + 128;
+  lctype->__toupper = (const int *)
+    (ctypes[_NL_ITEM_INDEX (_NL_CTYPE_TOUPPER_EL)].string) + 128;
+#else
+#error bizarre byte order
+#endif
+  return lctype;
+}
+char* _Locale_ctype_name(const void* lctype,
+			 char* buf) {
+  return _Locale_name(((struct _Locale_ctype*)lctype)->gcc_data, buf);
+}
+void _Locale_ctype_destroy(void* lctype) {
+  _Remove_locale(LC_CTYPE, (struct locale_data *)((struct _Locale_ctype*)lctype)->gcc_data);
+  free(lctype);
+}
+char* _Locale_extract_ctype_name(const char* cname, char* buf) {
+  return _Locale_extract_name(cname, buf, LC_CTYPE);
+}
+const _Locale_mask_t* _Locale_ctype_table(struct _Locale_ctype* lctype) {
+  return lctype->__class; 
+}
+int _Locale_toupper(struct _Locale_ctype* lctype, int c) { 
+  return lctype->__toupper[c];
+}
+int _Locale_tolower(struct _Locale_ctype* lctype, int c) { 
+  return lctype->__tolower[c];
+}
+
+/* Wide Character Functions */
+
+static inline size_t
+cname_lookup (wint_t wc, const struct locale_data* loc)
+{
+  unsigned int *__nl_ctype_names;
+  unsigned int hash_size, hash_layers;
+  size_t result, cnt;
+
+#if BYTE_ORDER == BIG_ENDIAN
+  __nl_ctype_names = (unsigned int*)loc->values[_NL_ITEM_INDEX(_NL_CTYPE_NAMES_EB)].string;
+#elif BYTE_ORDER == LITTLE_ENDIAN
+  __nl_ctype_names = (unsigned int*)loc->values[_NL_ITEM_INDEX(_NL_CTYPE_NAMES_EL)].string;
+#else
+#error bizarre byte order
+#endif
+
+  hash_size = loc->values[_NL_ITEM_INDEX(_NL_CTYPE_HASH_SIZE)].word;
+  hash_layers = loc->values[_NL_ITEM_INDEX(_NL_CTYPE_HASH_LAYERS)].word;
+
+  result = wc % hash_size;
+  for (cnt = 0; cnt < hash_layers; ++cnt) {
+    if (__nl_ctype_names[result] == wc)
+      break;
+    result += hash_size;
+  }
+  return cnt < hash_layers ? result : ~((size_t) 0);
+}
+
+
+
+
+_Locale_mask_t _Locale_wchar_ctype(struct _Locale_ctype* loc, wint_t wc,
+  _Locale_mask_t which_bits) {
+  const struct locale_data* locale = loc->gcc_data;
+  const unsigned int *class32_b;
+  size_t idx;
+
+  idx = cname_lookup (wc, locale);
+  if (idx == ~((size_t) 0))
+    return 0;
+
+  class32_b = (u_int32_t *)
+    locale->values[_NL_ITEM_INDEX (_NL_CTYPE_CLASS32)].string;
+
+  return _Map_wchar_mask_to_char_mask( class32_b[idx] ) & which_bits;
+}
+
+
+
+wint_t
+__towctrans_ld (wint_t wc, wctrans_t desc, const struct locale_data* locale)
+{
+  size_t idx;
+
+  idx = cname_lookup (wc, locale);
+  if (idx == ~((size_t) 0))
+    /* Character is not known.  Default action is to simply return it.  */
+    return wc;
+
+  return (wint_t) desc[idx];
+}
+
+wint_t _Locale_wchar_tolower(struct _Locale_ctype* locale, wint_t wc) {
+  return __towctrans_ld (wc, (const unsigned int *)locale->__tolower, locale->gcc_data);
+}
+wint_t _Locale_wchar_toupper(struct _Locale_ctype* locale, wint_t wc) {
+  return __towctrans_ld (wc, (const unsigned int *)locale->__toupper, locale->gcc_data);
+}
+
+
+int _Locale_mb_cur_max (struct _Locale_ctype *lctype) { 
+  return lctype->gcc_data->values[_NL_ITEM_INDEX(_NL_CTYPE_MB_CUR_MAX)].word; 
+}
+
+int _Locale_mb_cur_min (struct _Locale_ctype *l) { 
+  return 1;  /* JGS just a guess */
+}
+
+int _Locale_is_stateless (struct _Locale_ctype *l) { return 1; }
+
+wint_t _Locale_btowc(struct _Locale_ctype *l, int c) { 
+  return btowc(c);
+}
+
+/*
+  glibc currently doesn't support locale dependent conversion,
+  which affects the following functions. When it does, then
+  these functions will need to change. Hopeully, the
+  just the calls to the glibc functions will need to be
+  replaced.
+  -JGS
+ */
+
+int _Locale_wctob(struct _Locale_ctype *l, wint_t c) { 
+  return wctob(c);
+}
+
+size_t _Locale_mbtowc(struct _Locale_ctype *l,
+                                 wchar_t *to,
+                                 const char *from, size_t n,
+                                 mbstate_t *shift_state)
+{
+  int ret;
+  if (to)
+    ret = mbrtowc(to, from, n, shift_state);
+  else
+    ret = mbrlen(from, n, shift_state);
+  return ret;
+}
+
+size_t _Locale_wctomb(struct _Locale_ctype *l,
+		      char *to, size_t n,
+		      const wchar_t c,
+		      mbstate_t *shift_state)
+{
+  char buf [MB_LEN_MAX];
+  int ret;
+  char* mb = buf;
+  ret = wcrtomb(mb, c, shift_state);
+
+  if (ret > n)
+    return (size_t)-2;
+  else if (ret <= 0)
+    return ret;
+
+  n = ret;
+  while (n--)
+    *to++ = *mb++;
+
+  return ret;
+}
+
+size_t _Locale_unshift(struct _Locale_ctype *l,
+		       mbstate_t * st,
+		       char *buf, size_t n, char **next) {
+  *next = buf; /* JGS stateless, so don't need to do anything? */
+  return 0;
+}
+
+
+/****** Collate Category ******/
+
+void* _Locale_collate_create(const char * name) {
+  L_collate_t*  lcollate = (L_collate_t*)malloc(sizeof(L_collate_t));
+  lcollate->gcc_data = _Category_create(name, LC_COLLATE);
+  return lcollate; 
+}
+
+char* _Locale_collate_name(const void* lcollate, char* buf) {
+  return _Locale_name(((struct _Locale_collate*)lcollate)->gcc_data, buf);
+}
+
+void _Locale_collate_destroy(void* lcollate) {
+  _Remove_locale(LC_COLLATE, (struct locale_data *)((struct _Locale_collate*)lcollate)->gcc_data);
+  free(lcollate);
+}
+
+char* _Locale_extract_collate_name(const char* cname, char* buf) {
+  return _Locale_extract_name(cname, buf, LC_COLLATE);
+}
+
+/* copied from the IRIX version -JGS */
+char* _Locale_compose_name(char* buf,
+			   const char* ctype, const char* numeric,
+			   const char* time, const char* collate,
+			   const char* monetary, const char* messages,
+			   const char *default_name)
+{
+   (void) default_name;
+
+    if ( !strcmp ( ctype, numeric ) &&
+	 !strcmp ( ctype, time ) &&
+	 !strcmp ( ctype, collate ) &&
+	 !strcmp ( ctype, monetary ) &&
+	 !strcmp ( ctype, messages ) )
+	return strcpy ( buf, ctype );
+
+    strcpy ( buf, "/" );
+    strcat ( buf, ctype );
+
+    strcat ( buf, "/" );
+    strcat ( buf, numeric );
+
+    strcat ( buf, "/" );
+    strcat ( buf, time );
+
+    strcat ( buf, "/" );
+    strcat ( buf, collate );
+
+    strcat ( buf, "/" );
+    strcat ( buf, monetary );
+
+    strcat ( buf, "/" );
+    strcat ( buf, messages );
+
+    return buf;
+}
+
+
+
+/*
+  glibc doesn't have a locale specific strcmp
+  This doesn't ignore null chars the way it should
+ */
+int
+_Locale_strcmp(struct _Locale_collate * l,
+	       const char *s1, size_t n1,
+	       const char *s2, size_t n2)
+{
+  int ret;
+  int minN = n1 < n2 ? n1 : n2;
+  ret = strncmp(s1, s2, minN);
+  if (ret == 0) {
+    if (n1 < n2) return -1;
+    else if (n1 > n2) return 1;
+    else return 0;
+  } else
+    return ret;
+}
+
+
+int _Locale_strwcmp(struct _Locale_collate*l,
+		    const wchar_t*s1, size_t n1,
+		    const wchar_t*s2, size_t n2)
+{
+  int ret;
+  int minN = n1 < n2 ? n1 : n2;
+  ret = wcsncmp(s1, s2, minN);
+  if (ret == 0) {
+    if (n1 < n2) return -1;
+    else if (n1 > n2) return 1;
+    else return 0;
+  } else
+    return ret;
+}
+
+
+
+size_t _Locale_strxfrm(struct _Locale_collate* lcollate,
+		       char* dest, size_t destN, const char* src, size_t srcN)
+{
+  size_t n;
+  n = strxfrm(dest, src, destN);
+  if (n > destN)
+    return (size_t)-1;
+  dest[n] = 0;
+  return n;
+}
+
+size_t _Locale_strwxfrm(struct _Locale_collate* lcollate,
+			wchar_t* dest, size_t destN, 
+			const wchar_t* src, size_t srcN)
+{
+  size_t n;
+  n = wcsxfrm(dest, src, destN);
+  if (n > destN)
+    return (size_t)-1;
+  dest[n] = 0;
+  return n;
+}
diff --git a/main/source/stlport/src/c_locale_glibc/gcc_localeinfo.h b/main/source/stlport/src/c_locale_glibc/gcc_localeinfo.h
new file mode 100644
index 00000000..9bfd5d26
--- /dev/null
+++ b/main/source/stlport/src/c_locale_glibc/gcc_localeinfo.h
@@ -0,0 +1,207 @@
+/* localeinfo.h -- declarations for internal libc locale interfaces
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef _LOCALEINFO_H
+#define _LOCALEINFO_H 1
+
+#include <stddef.h>
+#include <langinfo.h>
+#include <time.h>
+#include <sys/types.h>
+
+
+/* stuff from loadinfo.h */
+
+#ifndef PARAMS
+# if __STDC__
+#  define PARAMS(args) args
+# else
+#  define PARAMS(args) ()
+# endif
+#endif
+
+/* Encoding of locale name parts.  */
+#define CEN_REVISION		1
+#define CEN_SPONSOR		2
+#define CEN_SPECIAL		4
+#define XPG_NORM_CODESET	8
+#define XPG_CODESET		16
+#define TERRITORY		32
+#define CEN_AUDIENCE		64
+#define XPG_MODIFIER		128
+
+#define CEN_SPECIFIC	(CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE)
+#define XPG_SPECIFIC	(XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER)
+
+
+struct loaded_l10nfile
+{
+  const char *filename;
+  int decided;
+
+  const void *data;
+
+  struct loaded_l10nfile *next;
+  struct loaded_l10nfile *successor[1];
+};
+
+
+extern const char *_nl_normalize_codeset PARAMS ((const char *codeset,
+						  size_t name_len));
+
+extern struct loaded_l10nfile *
+_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list,
+			    const char *dirlist, size_t dirlist_len, int mask,
+			    const char *language, const char *territory,
+			    const char *codeset,
+			    const char *normalized_codeset,
+			    const char *modifier, const char *special,
+			    const char *sponsor, const char *revision,
+			    const char *filename, int do_allocate));
+
+
+extern const char *_nl_expand_alias PARAMS ((const char *name));
+
+extern int _nl_explode_name PARAMS ((char *name, const char **language,
+				     const char **modifier,
+				     const char **territory,
+				     const char **codeset,
+				     const char **normalized_codeset,
+				     const char **special,
+				     const char **sponsor,
+				     const char **revision));
+
+
+
+/* Magic number at the beginning of a locale data file for CATEGORY.  */
+#define	LIMAGIC(category)	(0x960617de ^ (category))
+
+/* Two special weight constants for the collation data.  */
+#define FORWARD_CHAR ((wchar_t) 0xfffffffd)
+#define ELLIPSIS_CHAR ((wchar_t) 0xfffffffe)
+#define IGNORE_CHAR ((wchar_t) 0xffffffff)
+
+#define MAX_USAGE_COUNT (UINT_MAX - 1)
+#define UNDELETABLE	UINT_MAX
+
+/* Structure describing locale data in core for a category.  */
+struct locale_data
+{
+  const char *name;
+  const char *filedata;		/* Region mapping the file data.  */
+  off_t filesize;		/* Size of the file (and the region).  */
+
+  //  unsigned int usage_count;
+  //  int mmaped;
+
+  unsigned int nstrings;	/* Number of strings below.  */
+  union locale_data_value
+  {
+    const wchar_t *wstr;
+    const char *string;
+    unsigned int word;
+  }
+  values[0];	/* Items, usually pointers into `filedata'.  */
+};
+
+/* We know three kinds of collation sorting rules.  */
+enum coll_sort_rule
+{
+  illegal_0__,
+  sort_forward,
+  sort_backward,
+  illegal_3__,
+  sort_position,
+  sort_forward_position,
+  sort_backward_position,
+  sort_mask
+};
+
+/* We can map the types of the entries into a few categories.  */
+enum value_type
+{
+  none,
+  string,
+  stringarray,
+  byte,
+  bytearray,
+  word
+};
+
+
+/* Structure to access `era' information from LC_TIME.  */
+struct era_entry
+{
+  u_int32_t direction;		/* Contains '+' or '-'.  */
+  int32_t offset;
+  int32_t start_date[3];
+  int32_t stop_date[3];
+  const char name_fmt[0];
+};
+
+extern const char *const _nl_category_names[LC_ALL + 1];
+extern const size_t _nl_category_name_sizes[LC_ALL + 1];
+extern const struct locale_data * *const _nl_current[LC_ALL];
+
+/* Name of the standard locale.  */
+extern const char _nl_C_name[];
+
+/* Extract the current CATEGORY locale's string for ITEM.  */
+#define _NL_CURRENT(category, item) \
+  (_nl_current_##category->values[_NL_ITEM_INDEX (item)].string)
+
+/* Extract the current CATEGORY locale's word for ITEM.  */
+#define _NL_CURRENT_WORD(category, item) \
+  (_nl_current_##category->values[_NL_ITEM_INDEX (item)].word)
+
+/* This is used in lc-CATEGORY.c to define _nl_current_CATEGORY.  */
+#define _NL_CURRENT_DEFINE(category) \
+  extern const struct locale_data _nl_C_##category; \
+  const struct locale_data *_nl_current_##category = &_nl_C_##category
+
+/* Load the locale data for CATEGORY from the file specified by *NAME.
+   If *NAME is "", use environment variables as specified by POSIX,
+   and fill in *NAME with the actual name used.  The directories
+   listed in LOCALE_PATH are searched for the locale files.  */
+extern const struct locale_data *_nl_find_locale (const char *locale_path,
+						  size_t locale_path_len,
+						  int category, char **name);
+
+/* Try to load the file described by FILE.  */
+extern void _nl_load_locale (struct loaded_l10nfile *file, int category);
+
+
+/* Return `era' entry which corresponds to TP.  Used in strftime.  */
+struct era_entry *_nl_get_era_entry (const struct tm *tp);
+
+/* Return `alt_digit' which corresponds to NUMBER.  Used in strftime.  */
+const char *_nl_get_alt_digit (unsigned int number);
+
+
+/* Global variables for LC_COLLATE category data.  */
+extern const u_int32_t *__collate_table;
+extern const u_int32_t *__collate_extra;
+extern const u_int32_t *__collate_element_hash;
+extern const char *__collate_element_strings;
+extern const wchar_t *__collate_element_values;
+extern const u_int32_t *__collate_symbol_hash;
+extern const char *__collate_symbol_strings;
+extern const u_int32_t *__collate_symbol_classes;
+
+#endif	/* localeinfo.h */
diff --git a/main/source/stlport/src/c_locale_stub.cpp b/main/source/stlport/src/c_locale_stub.cpp
new file mode 100644
index 00000000..4b04d159
--- /dev/null
+++ b/main/source/stlport/src/c_locale_stub.cpp
@@ -0,0 +1,279 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+# include "stlport_prefix.h"
+#include "c_locale.h"
+#include <limits.h>
+
+# ifdef _STLP_REAL_LOCALE_IMPLEMENTED
+
+// here, we'll put C locale implementation for those compilers where
+// it has to be done in C++
+
+# else
+
+/* This is a "stub" implementation of the "c_locale.h" interface,
+   intended for operating systems where we have not yet written
+   a real implementation.  A C++ library using this stub implementation
+   is still standard-conforming, since the C++ standard does not require
+   that any locales other than "C" be supported.
+*/
+
+/* Framework functions */
+
+struct _Locale_ctype    /* { } */ ;
+struct _Locale_numeric  /* { } */;
+struct _Locale_time      /* { } */;
+struct _Locale_collate   /*{ } */;
+struct _Locale_monetary  /* { } */;
+struct _Locale_messages  /* { } */;
+
+# ifdef __cplusplus
+_STLP_BEGIN_NAMESPACE
+extern "C" {
+# define __DUMMY_PAR
+# define __DUMMY_PAR1
+# define __DUMMY_PAR2
+# define __DUMMY_PAR3
+# define __DUMMY_PAR4
+# define __DUMMY_PAR5
+# define __DUMMY_PAR6
+# define __DUMMY_PAR7
+# define __DUMMY_PAR8
+# endif
+    
+ void* _Locale_ctype_create(const char * __DUMMY_PAR)
+  { return 0; }
+ void* _Locale_numeric_create(const char * __DUMMY_PAR)
+  { return 0; }
+ void*_Locale_time_create(const char * __DUMMY_PAR)
+  { return 0; }
+ void* _Locale_collate_create(const char *__DUMMY_PAR)
+  { return 0; }
+ void* _Locale_monetary_create(const char * __DUMMY_PAR)
+  { return 0; }
+ void* _Locale_messages_create(const char *__DUMMY_PAR)
+  { return 0; }
+
+ const char* _Locale_ctype_default(char*)    { return 0; }
+ const char* _Locale_numeric_default(char *) { return 0; }
+ const char* _Locale_time_default(char*)     { return 0; }
+ const char* _Locale_collate_default(char*)  { return 0; }
+ const char* _Locale_monetary_default(char*) { return 0; }
+ const char* _Locale_messages_default(char*) { return 0; }
+
+ char* _Locale_ctype_name(const void* __DUMMY_PAR1, char* __DUMMY_PAR)
+  { return 0; }
+ char* _Locale_numeric_name(const void* __DUMMY_PAR1, char* __DUMMY_PAR)
+  { return 0; }
+ char* _Locale_time_name(const void* __DUMMY_PAR1, char* __DUMMY_PAR)
+  { return 0; }
+ char* _Locale_collate_name(const void* __DUMMY_PAR1, char* __DUMMY_PAR)
+  { return 0; }
+ char* _Locale_monetary_name(const void* __DUMMY_PAR1, char* __DUMMY_PAR)
+  { return 0; }
+ char* _Locale_messages_name(const void* __DUMMY_PAR1, char* __DUMMY_PAR)
+  { return 0; }
+
+ void _Locale_ctype_destroy(void* __DUMMY_PAR)    {}
+ void _Locale_numeric_destroy(void* __DUMMY_PAR)  {}
+ void _Locale_time_destroy(void* __DUMMY_PAR)     {}
+ void _Locale_collate_destroy(void* __DUMMY_PAR)  {}
+ void _Locale_monetary_destroy(void* __DUMMY_PAR) {}
+ void _Locale_messages_destroy(void* __DUMMY_PAR) {}
+
+ char* _Locale_extract_ctype_name(const char* __DUMMY_PAR1, char* __DUMMY_PAR) 
+  { return 0; }
+ char* _Locale_extract_numeric_name(const char*__DUMMY_PAR1, char* __DUMMY_PAR) 
+  { return 0; }
+ char* _Locale_extract_time_name(const char*__DUMMY_PAR1, char* __DUMMY_PAR) 
+  { return 0; }
+ char* _Locale_extract_collate_name(const char*__DUMMY_PAR1, char* __DUMMY_PAR) 
+  { return 0; }
+ char* _Locale_extract_monetary_name(const char*__DUMMY_PAR1, char* __DUMMY_PAR) 
+  { return 0; }
+ char* _Locale_extract_messages_name(const char*__DUMMY_PAR1, char* __DUMMY_PAR) 
+  { return 0; }
+
+ char* _Locale_compose_name(char*__DUMMY_PAR1, const char*__DUMMY_PAR2, const char*__DUMMY_PAR3,
+                            const char*__DUMMY_PAR4,
+                            const char*__DUMMY_PAR5, const char*__DUMMY_PAR6, const char*__DUMMY_PAR7, const char*__DUMMY_PAR8)
+  { return 0; }
+
+
+/* ctype */
+
+const  _Locale_mask_t* _Locale_ctype_table(struct _Locale_ctype* __DUMMY_PAR)
+  { return 0; }
+ int _Locale_toupper(struct _Locale_ctype*__DUMMY_PAR1, int __DUMMY_PAR) { return 0; }
+ int _Locale_tolower(struct _Locale_ctype*__DUMMY_PAR1, int __DUMMY_PAR) { return 0; }
+
+# ifndef _STLP_NO_WCHAR_T
+ _Locale_mask_t _Locale_wchar_ctype(struct _Locale_ctype*__DUMMY_PAR1, wint_t __DUMMY_PAR2, _Locale_mask_t __DUMMY_PAR3)
+  { return 0; }
+ wint_t _Locale_wchar_tolower(struct _Locale_ctype*__DUMMY_PAR1, wint_t __DUMMY_PAR)
+  { return 0; }
+ wint_t _Locale_wchar_toupper(struct _Locale_ctype*__DUMMY_PAR1, wint_t __DUMMY_PAR)
+  { return 0; }
+# endif
+
+# ifndef _STLP_NO_MBSTATE_T
+
+ int _Locale_mb_cur_max (struct _Locale_ctype * __DUMMY_PAR) { return 0; }
+ int _Locale_mb_cur_min (struct _Locale_ctype * __DUMMY_PAR) { return 0; }
+ int _Locale_is_stateless (struct _Locale_ctype * __DUMMY_PAR) { return 1; }
+#ifndef _STLP_NO_WCHAR_T
+ wint_t _Locale_btowc(struct _Locale_ctype * __DUMMY_PAR1, int __DUMMY_PAR) { return 0; }
+ int _Locale_wctob(struct _Locale_ctype * __DUMMY_PAR2, wint_t __DUMMY_PAR) { return 0; }
+
+ size_t _Locale_mbtowc(struct _Locale_ctype *__DUMMY_PAR1,
+                                 wchar_t *__DUMMY_PAR2,
+                                 const char *__DUMMY_PAR3, size_t __DUMMY_PAR4,
+                                 mbstate_t *__DUMMY_PAR5) {
+  return (size_t) -1; 
+}
+ size_t _Locale_wctomb(struct _Locale_ctype *__DUMMY_PAR1,
+                                 char *__DUMMY_PAR2, size_t __DUMMY_PAR3,
+                                 const wchar_t __DUMMY_PAR4,
+                                 mbstate_t *__DUMMY_PAR5) {
+  return (size_t) -1;
+}
+# endif
+
+ size_t _Locale_unshift(struct _Locale_ctype *__DUMMY_PAR1,
+                                  mbstate_t *__DUMMY_PAR2,
+                                  char *__DUMMY_PAR3, size_t __DUMMY_PAR4, char ** __DUMMY_PAR5) {
+  return (size_t) -1;
+}
+
+# endif /*  _STLP_NO_MBSTATE_T */
+
+
+/* Collate */
+ int _Locale_strcmp(struct _Locale_collate* __DUMMY_PAR1,
+                    const char* __DUMMY_PAR2, size_t __DUMMY_PAR3, const char* __DUMMY_PAR4,
+                    size_t __DUMMY_PAR5) {
+  return 0;
+}
+
+# ifndef _STLP_NO_WCHAR_T
+
+ int _Locale_strwcmp(struct _Locale_collate* __DUMMY_PAR1,
+                     const wchar_t* __DUMMY_PAR2, size_t __DUMMY_PAR3,
+                     const wchar_t* __DUMMY_PAR4, size_t __DUMMY_PAR5) {
+  return 0;
+}
+
+# endif
+
+ size_t _Locale_strxfrm(struct _Locale_collate* __DUMMY_PAR1,
+                        char* __DUMMY_PAR2, size_t __DUMMY_PAR3,
+                        const char* __DUMMY_PAR4, size_t __DUMMY_PAR5) {
+  return 0;
+}
+
+# ifndef _STLP_NO_WCHAR_T
+
+  size_t _Locale_strwxfrm(struct _Locale_collate* __DUMMY_PAR1,
+                          wchar_t* __DUMMY_PAR2, size_t __DUMMY_PAR3,
+                          const wchar_t* __DUMMY_PAR4, size_t __DUMMY_PAR5)
+{
+  return 0;
+}
+
+# endif
+
+/* Numeric */
+
+ char _Locale_decimal_point(struct _Locale_numeric* __DUMMY_PAR) { return '.'; }
+ char _Locale_thousands_sep(struct _Locale_numeric* __DUMMY_PAR) { return ','; }
+ const char* _Locale_grouping(struct _Locale_numeric * __DUMMY_PAR) 
+  { return ""; }
+
+ const char * _Locale_true(struct _Locale_numeric * __DUMMY_PAR)  { return 0; }
+ const char * _Locale_false(struct _Locale_numeric * __DUMMY_PAR) { return 0; }
+
+
+/* Monetary */
+
+ const char* _Locale_int_curr_symbol(struct _Locale_monetary * __DUMMY_PAR)
+  { return 0; }
+ const char* _Locale_currency_symbol(struct _Locale_monetary * __DUMMY_PAR)
+  { return 0; }
+ char        _Locale_mon_decimal_point(struct _Locale_monetary * __DUMMY_PAR)
+  { return '.'; }
+ char        _Locale_mon_thousands_sep(struct _Locale_monetary * __DUMMY_PAR)
+  { return ','; }
+ const char* _Locale_mon_grouping(struct _Locale_monetary * __DUMMY_PAR)
+  { return ""; }
+ const char* _Locale_positive_sign(struct _Locale_monetary * __DUMMY_PAR)
+  { return ""; }
+ const char* _Locale_negative_sign(struct _Locale_monetary * __DUMMY_PAR)
+  { return ""; }
+ char        _Locale_int_frac_digits(struct _Locale_monetary * __DUMMY_PAR)
+  { return CHAR_MAX; }
+ char        _Locale_frac_digits(struct _Locale_monetary * __DUMMY_PAR)
+  { return CHAR_MAX; }
+ int         _Locale_p_cs_precedes(struct _Locale_monetary * __DUMMY_PAR)
+  { return CHAR_MAX; }
+ int         _Locale_p_sep_by_space(struct _Locale_monetary * __DUMMY_PAR)
+  { return CHAR_MAX; }
+ int         _Locale_p_sign_posn(struct _Locale_monetary * __DUMMY_PAR)
+  { return CHAR_MAX; }
+ int         _Locale_n_cs_precedes(struct _Locale_monetary * __DUMMY_PAR)
+  { return CHAR_MAX; }
+ int          _Locale_n_sep_by_space(struct _Locale_monetary * __DUMMY_PAR)
+  { return CHAR_MAX; }
+ int          _Locale_n_sign_posn(struct _Locale_monetary * __DUMMY_PAR)
+  { return CHAR_MAX; }
+
+
+/* Time */
+ const char * _Locale_full_monthname(struct _Locale_time * __DUMMY_PAR1, int __DUMMY_PAR2)
+  { return 0; }
+ const char * _Locale_abbrev_monthname(struct _Locale_time * __DUMMY_PAR1, int __DUMMY_PAR2)
+  { return 0; }
+ const char * _Locale_full_dayofweek(struct _Locale_time * __DUMMY_PAR1, int __DUMMY_PAR2)
+  { return 0; }
+ const char * _Locale_abbrev_dayofweek(struct _Locale_time * __DUMMY_PAR1, int __DUMMY_PAR2)
+  { return 0; }
+
+ const char* _Locale_d_t_fmt(struct _Locale_time* __DUMMY_PAR)    { return 0; }
+ const char* _Locale_d_fmt(struct _Locale_time* __DUMMY_PAR)      { return 0; }
+ const char* _Locale_t_fmt(struct _Locale_time* __DUMMY_PAR)      { return 0; }
+ const char* _Locale_long_d_t_fmt(struct _Locale_time* __DUMMY_PAR){ return 0; }
+ const char* _Locale_long_d_fmt(struct _Locale_time* __DUMMY_PAR)   { return 0; }
+ const char* _Locale_am_str(struct _Locale_time* __DUMMY_PAR)     { return 0; }
+ const char* _Locale_pm_str(struct _Locale_time* __DUMMY_PAR)     { return 0; }
+ const char* _Locale_t_fmt_ampm(struct _Locale_time* __DUMMY_PAR) { return 0; }
+
+/* Messages */
+
+ int _Locale_catopen(struct _Locale_messages* __DUMMY_PAR1, const char* __DUMMY_PAR)
+  { return -1; }
+ void _Locale_catclose(struct _Locale_messages* __DUMMY_PAR1, int __DUMMY_PAR) {}
+ const char* _Locale_catgets(struct _Locale_messages* __DUMMY_PAR1, int __DUMMY_PAR2,
+                                       int __DUMMY_PAR3, int __DUMMY_PAR4,
+                                       const char *dfault)
+  { return dfault; }
+
+#ifdef __cplusplus    
+} /* extern C */
+_STLP_END_NAMESPACE
+#endif
+
+#endif /* real locale */
diff --git a/main/source/stlport/src/c_locale_win32/c_locale_win32.c b/main/source/stlport/src/c_locale_win32/c_locale_win32.c
new file mode 100644
index 00000000..1ffa47d0
--- /dev/null
+++ b/main/source/stlport/src/c_locale_win32/c_locale_win32.c
@@ -0,0 +1,1743 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999
+ * Boris Fomitchev
+ *
+ * Written 2000
+ * Anton Lapach
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#include <windows.h>
+#include <limits.h>
+#if defined (_STLP_MSVC) || defined (__ICL) || defined (__BORLANDC__)
+# include <memory.h>
+#endif
+#include <string.h>
+#include <locale.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#ifdef __cplusplus
+// _STLP_BEGIN_NAMESPACE
+extern "C" {
+#endif
+
+/* Framework functions */
+/*
+  locale :: "lang[_country[.code_page]]"
+  | ".code_page"
+  | ""
+  | NULL
+
+*/
+
+#ifndef _LEADBYTE
+/* multibyte leadbyte */
+#define _LEADBYTE       0x8000
+#endif
+
+typedef struct _LOCALECONV
+{
+  const char* name;
+  const char* abbrev;
+} LOCALECONV;
+
+#define MAX_LANG_LEN        64  /* max language name length */
+#define MAX_CTRY_LEN        64  /* max country name length */
+#define MAX_MODIFIER_LEN    0   /* max modifier name length - n/a */
+#define MAX_LC_LEN          (MAX_LANG_LEN+MAX_CTRY_LEN+MAX_MODIFIER_LEN+3)
+                                /* max entire locale string length */
+#define MAX_CP_LEN          5   /* max code page name length */
+
+
+// Metrowerks has different define here
+#if !defined (LC_MAX)
+# if defined (LC_LAST)
+#  define LC_MAX LC_LAST
+# endif
+#endif
+
+//  non-NLS language string table
+static LOCALECONV __rg_language[] =
+{
+  {"american",                    "ENU"},
+  {"american english",            "ENU"},
+  {"american-english",            "ENU"},
+  {"australian",                  "ENA"},
+  {"belgian",                     "NLB"},
+  {"canadian",                    "ENC"},
+  {"chh",                         "ZHH"},
+  {"chi",                         "ZHI"},
+  {"chinese",                     "CHS"},
+  {"chinese-hongkong",            "ZHH"},
+  {"chinese-simplified",          "CHS"},
+  {"chinese-singapore",           "ZHI"},
+  {"chinese-traditional",         "CHT"},
+  {"dutch-belgian",               "NLB"},
+  {"english-american",            "ENU"},
+  {"english-aus",                 "ENA"},
+  {"english-belize",              "ENL"},
+  {"english-can",                 "ENC"},
+  {"english-caribbean",           "ENB"},
+  {"english-ire",                 "ENI"},
+  {"english-jamaica",             "ENJ"},
+  {"english-nz",                  "ENZ"},
+  {"english-south africa",        "ENS"},
+  {"english-trinidad y tobago",   "ENT"},
+  {"english-uk",                  "ENG"},
+  {"english-us",                  "ENU"},
+  {"english-usa",                 "ENU"},
+  {"french-belgian",              "FRB"},
+  {"french-canadian",             "FRC"},
+  {"french-luxembourg",           "FRL"},
+  {"french-swiss",                "FRS"},
+  {"german-austrian",             "DEA"},
+  {"german-lichtenstein",         "DEC"},
+  {"german-luxembourg",           "DEL"},
+  {"german-swiss",                "DES"},
+  {"irish-english",               "ENI"},
+  {"italian-swiss",               "ITS"},
+  {"norwegian",                   "NOR"},
+  {"norwegian-bokmal",            "NOR"},
+  {"norwegian-nynorsk",           "NON"},
+  {"portuguese-brazilian",        "PTB"},
+  {"spanish-argentina",           "ESS"},
+  {"spanish-bolivia",             "ESB"},
+  {"spanish-chile",               "ESL"},
+  {"spanish-colombia",            "ESO"},
+  {"spanish-costa rica",          "ESC"},
+  {"spanish-dominican republic",  "ESD"},
+  {"spanish-ecuador",             "ESF"},
+  {"spanish-el salvador",         "ESE"},
+  {"spanish-guatemala",           "ESG"},
+  {"spanish-honduras",            "ESH"},
+  {"spanish-mexican",             "ESM"},
+  {"spanish-modern",              "ESN"},
+  {"spanish-nicaragua",           "ESI"},
+  {"spanish-panama",              "ESA"},
+  {"spanish-paraguay",            "ESZ"},
+  {"spanish-peru",                "ESR"},
+  {"spanish-puerto rico",         "ESU"},
+  {"spanish-uruguay",             "ESY"},
+  {"spanish-venezuela",           "ESV"},
+  {"swedish-finland",             "SVF"},
+  {"swiss",                       "DES"},
+  {"uk",                          "ENG"},
+  {"us",                          "ENU"},
+  {"usa",                         "ENU"}
+};
+
+//  non-NLS country string table
+static LOCALECONV __rg_country[] =
+{
+  {"america",                     "USA"},
+  {"britain",                     "GBR"},
+  {"china",                       "CHN"},
+  {"czech",                       "CZE"},
+  {"england",                     "GBR"},
+  {"great britain",               "GBR"},
+  {"holland",                     "NLD"},
+  {"hong-kong",                   "HKG"},
+  {"new-zealand",                 "NZL"},
+  {"nz",                          "NZL"},
+  {"pr china",                    "CHN"},
+  {"pr-china",                    "CHN"},
+  {"puerto-rico",                 "PRI"},
+  {"slovak",                      "SVK"},
+  {"south africa",                "ZAF"},
+  {"south korea",                 "KOR"},
+  {"south-africa",                "ZAF"},
+  {"south-korea",                 "KOR"},
+  {"trinidad & tobago",           "TTO"},
+  {"uk",                          "GBR"},
+  {"united-kingdom",              "GBR"},
+  {"united-states",               "USA"},
+  {"us",                          "USA"},
+};
+
+typedef struct _Locale_ctype {
+  LCID lcid;
+  UINT cp;
+  unsigned int ctable[257];
+} _Locale_ctype_t;
+
+typedef struct _Locale_numeric	{
+  LCID lcid;
+  char cp[MAX_CP_LEN+1];
+  char decimal_point[4];
+  char thousands_sep[4];
+  char *grouping;
+} _Locale_numeric_t;
+
+typedef struct _Locale_time	{
+  LCID lcid;
+  char cp[MAX_CP_LEN+1];
+  char *month[12];
+  char *abbrev_month[12];
+  char *dayofweek[7];
+  char *abbrev_dayofweek[7];
+} _Locale_time_t;
+
+typedef struct _Locale_collate	{
+  LCID lcid;
+  char cp[MAX_CP_LEN+1];
+} _Locale_collate_t;
+
+typedef struct _Locale_monetary	{
+  LCID lcid;
+  char cp[MAX_CP_LEN+1];
+  char decimal_point[4];
+  char thousands_sep[4];
+  char *grouping;
+  char int_curr_symbol[5]; // 3+1+1
+  char curr_symbol[6];
+  char negative_sign[5];
+  char positive_sign[5];
+  int frac_digits;
+  int int_frac_digits;
+} _Locale_monetary_t;
+
+typedef struct _Locale_messages	{
+  LCID lcid;
+  char cp[MAX_CP_LEN+1];
+} _Locale_messages_t;
+
+/* Internal function */
+static void __FixGrouping(char *grouping);
+static const char* __ConvertName(const char* lname, LOCALECONV* ConvTable, int TableSize);
+static int __ParseLocaleString(const char* lname, char* lang, char* ctry, char* page);
+static int __GetLCID(const char* lang, const char* ctry, LCID* lcid);
+static int __GetLCIDFromName(const char* lname, LCID* lcid, char *cp);
+static char* __GetLocaleName(LCID lcid, const char* cp, char* buf);
+static char* __Extract_locale_name(const char* loc, int category, char* buf);
+static char* __TranslateToSystem(const char* lname, char* buf);
+static void __ConvertFromACP(char* buf, int buf_size, const char* cp);
+static int __intGetACP(LCID lcid);
+static int __intGetOCP(LCID lcid);
+static int __GetDefaultCP(LCID lcid);
+static char* __ConvertToCP(int from_cp, int to_cp, const char *from, size_t size, size_t *ret_buf_size);
+static void my_ltoa(long __x, char* buf) ;
+
+void my_ltoa(long __x, char* buf) 
+{ 
+  char rbuf[64];
+  char* ptr = rbuf; 
+
+  if (__x == 0)
+    *ptr++ = '0';
+  else {
+    for (; __x != 0; __x /= 10)
+      *ptr++ = (int)(__x % 10) + '0';
+  }
+  while(ptr > rbuf) *buf++ = *--ptr;
+  //psw
+  *buf = '\0';
+} 
+
+# ifdef __cplusplus
+_STLP_BEGIN_NAMESPACE
+extern "C" {
+# endif
+
+  void* _Locale_ctype_create(const char * name)
+  {
+    char cname[_Locale_MAX_SIMPLE_NAME];
+    char cp_name[MAX_CP_LEN+1];
+    int NativeCP;
+    unsigned char Buffer[256];
+    unsigned char *ptr;
+    unsigned short ctable[256];
+    CPINFO CPInfo;
+    int i;
+    wchar_t *wbuffer;
+    int BufferSize;
+
+    _Locale_ctype_t *ltype=(_Locale_ctype_t*)malloc(sizeof(_Locale_ctype_t));
+    if(!ltype) return ltype;
+    memset(ltype, 0, sizeof(_Locale_ctype_t));
+
+    __Extract_locale_name(name, LC_CTYPE, cname);
+
+    if(__GetLCIDFromName(cname, &ltype->lcid, cp_name)==-1)
+      { free(ltype); return NULL; }
+    ltype->cp = atoi(cp_name);
+
+    NativeCP=__intGetACP(ltype->lcid);
+    if(NativeCP == 0)
+      NativeCP=__intGetOCP(ltype->lcid);
+
+    /* Make table with all characters. */
+    for(i = 0; i < 256; i++) Buffer[i] = i;
+
+    if(!GetCPInfo(NativeCP, &CPInfo)) { free(ltype); return NULL; }
+
+    if(CPInfo.MaxCharSize > 1)
+      for(ptr=(unsigned char*)CPInfo.LeadByte; *ptr && *(ptr+1); ptr+=2)
+	for(i=*ptr; i <= *(ptr+1); i++) Buffer[i] = 0;
+
+    if(NativeCP != ltype->cp)
+      {
+    	OSVERSIONINFO ver_info;
+        ver_info.dwOSVersionInfoSize = sizeof(ver_info);
+    	GetVersionEx(&ver_info);
+    	if(ver_info.dwPlatformId == VER_PLATFORM_WIN32_NT)
+	  {
+	    // Convert character sequence to Unicode.
+	    BufferSize = MultiByteToWideChar(ltype->cp, MB_PRECOMPOSED, (const char*)Buffer, 256, NULL, 0);
+	    wbuffer = (wchar_t*)malloc(BufferSize*sizeof(wchar_t));
+	    if(!MultiByteToWideChar(ltype->cp, MB_PRECOMPOSED, (const char*)Buffer, 256, wbuffer, BufferSize))
+	      { free(wbuffer); free(ltype); return NULL; }
+
+	    GetStringTypeW(CT_CTYPE1, wbuffer, 256, ctable);
+
+	    for(i = 0; i < 256; ++i)
+	      ltype->ctable[i+1]=(unsigned int)ctable[i];
+
+	    if(CPInfo.MaxCharSize > 1)
+	      for(ptr=(unsigned char*)CPInfo.LeadByte; *ptr && *(ptr+1); ptr+=2)
+		for(i=*ptr; i <= *(ptr+1); i++) ltype->ctable[i+1] = _LEADBYTE;
+
+	    free(wbuffer);
+	  }
+    	else
+	  {
+	    unsigned char TargetBuffer[256];
+	    GetStringTypeA(ltype->lcid, CT_CTYPE1, (const char*)Buffer, 256, ctable);
+
+	    // Convert character sequence to target code page.
+	    BufferSize = MultiByteToWideChar(NativeCP, MB_PRECOMPOSED, (const char*)Buffer, 256, NULL, 0);
+	    wbuffer = (wchar_t*)malloc(BufferSize*sizeof(wchar_t));
+	    if(!MultiByteToWideChar(NativeCP, MB_PRECOMPOSED, (const char*)Buffer, 256, wbuffer, BufferSize))
+	      { free(wbuffer); free(ltype); return NULL; }
+	    if(!WideCharToMultiByte(ltype->cp, WC_COMPOSITECHECK | WC_SEPCHARS, wbuffer, BufferSize, (char*)TargetBuffer, 256, NULL, FALSE))
+	      { free(wbuffer); free(ltype); return NULL; }
+
+	    free(wbuffer);
+
+	    // Translate ctype table.
+	    for(i = 0; i < 256; ++i)
+	      {
+		if(!TargetBuffer[i]) continue;
+		ltype->ctable[TargetBuffer[i]+1] = ctable[i];
+	      }
+	    ltype->ctable[0] = 0; // EOF
+
+	    // Mark lead byte.
+	    if(!GetCPInfo(ltype->cp, &CPInfo)) { free(ltype); return NULL; }
+	    if(CPInfo.MaxCharSize > 1)
+	      for(ptr=(unsigned char*)CPInfo.LeadByte; *ptr && *(ptr+1); ptr+=2)
+		for(i=*ptr; i <= *(ptr+1); i++) ltype->ctable[i+1] = _LEADBYTE;
+	  }
+      }
+    else
+      {
+	GetStringTypeA(ltype->lcid, CT_CTYPE1, (const char*)Buffer, 256, ctable);
+	for(i = 0; i < 256; ++i)
+	  ltype->ctable[i+1]=(unsigned int)ctable[i];
+
+    	if(CPInfo.MaxCharSize > 1)
+	  for(ptr=(unsigned char*)CPInfo.LeadByte; *ptr && *(ptr+1); ptr+=2)
+	    for(i=*ptr; i <= *(ptr+1); i++) ltype->ctable[i+1] = _LEADBYTE;
+      }
+    ltype->ctable[0] = 0; // EOF
+
+    return ltype;
+  }
+
+  void* _Locale_numeric_create(const char * name)
+  {
+    char *GroupingBuffer;
+    char cname[_Locale_MAX_SIMPLE_NAME];
+    int BufferSize;
+    _Locale_numeric_t *lnum=(_Locale_numeric_t*)malloc(sizeof(_Locale_numeric_t));
+    if(!lnum) return lnum; // MS normal behavior for 'new'
+
+    __Extract_locale_name(name, LC_NUMERIC, cname);
+
+    if(__GetLCIDFromName(cname, &lnum->lcid, lnum->cp)==-1)
+      { free(lnum); return NULL; }
+
+    GetLocaleInfoA(lnum->lcid, LOCALE_SDECIMAL, lnum->decimal_point, 4);
+    __ConvertFromACP(lnum->decimal_point, 4, lnum->cp);
+    GetLocaleInfoA(lnum->lcid, LOCALE_STHOUSAND, lnum->thousands_sep, 4);
+    __ConvertFromACP(lnum->thousands_sep, 4, lnum->cp);
+
+    BufferSize=GetLocaleInfoA(lnum->lcid, LOCALE_SGROUPING, NULL, 0);
+    GroupingBuffer=(char*)malloc(BufferSize);
+    if(!GroupingBuffer) { lnum->grouping=NULL; return lnum; }
+    GetLocaleInfoA(lnum->lcid, LOCALE_SGROUPING, GroupingBuffer, BufferSize);
+    __FixGrouping(GroupingBuffer);
+    lnum->grouping=GroupingBuffer;
+
+    return lnum;
+  }
+
+  void* _Locale_time_create(const char * name)
+  {
+    int size, month, dayofweek;
+    char cname[_Locale_MAX_SIMPLE_NAME];
+
+    _Locale_time_t *ltime=(_Locale_time_t*)malloc(sizeof(_Locale_time_t));;
+    if(!ltime) return ltime;
+    memset(ltime, 0, sizeof(_Locale_time_t));
+
+    __Extract_locale_name(name, LC_TIME, cname);
+
+    if(__GetLCIDFromName(cname, &ltime->lcid, ltime->cp)==-1)
+      { free(ltime); return NULL; }
+
+    for(month=LOCALE_SMONTHNAME1; month<=LOCALE_SMONTHNAME12; month++) // Small hack :-)
+      {
+	size=GetLocaleInfoA(ltime->lcid, month, NULL, 0);
+    	ltime->month[month-LOCALE_SMONTHNAME1]=(char*)malloc(size);
+        if(!ltime->month[month-LOCALE_SMONTHNAME1]) { _Locale_time_destroy(ltime); return NULL; }
+	GetLocaleInfoA(ltime->lcid, month, ltime->month[month-LOCALE_SMONTHNAME1], size);
+    	__ConvertFromACP(ltime->month[month-LOCALE_SMONTHNAME1], size, ltime->cp);
+      }
+
+    for(month=LOCALE_SABBREVMONTHNAME1; month<=LOCALE_SABBREVMONTHNAME12; month++)
+      {
+	size=GetLocaleInfoA(ltime->lcid, month, NULL, 0);
+	ltime->abbrev_month[month-LOCALE_SABBREVMONTHNAME1]=(char*)malloc(size);
+	if(!ltime->abbrev_month[month-LOCALE_SABBREVMONTHNAME1]) { _Locale_time_destroy(ltime); return NULL; }
+	GetLocaleInfoA(ltime->lcid, month, ltime->abbrev_month[month-LOCALE_SABBREVMONTHNAME1], size);
+	__ConvertFromACP(ltime->abbrev_month[month-LOCALE_SABBREVMONTHNAME1], size, ltime->cp);
+      }
+
+    for(dayofweek=LOCALE_SDAYNAME1; dayofweek<=LOCALE_SDAYNAME7; dayofweek++)
+      {
+	int dayindex= ( dayofweek != LOCALE_SDAYNAME7 ) ?
+	  dayofweek-LOCALE_SDAYNAME1+1 : 0;
+	size=GetLocaleInfoA(ltime->lcid, dayofweek, NULL, 0);
+	ltime->dayofweek[dayindex]=(char*)malloc(size);
+	if(!ltime->dayofweek[dayindex] ) { _Locale_time_destroy(ltime); return NULL; }
+	GetLocaleInfoA(ltime->lcid, dayofweek, ltime->dayofweek[dayindex], size);
+	__ConvertFromACP(ltime->dayofweek[dayindex], size, ltime->cp);
+      }
+
+    for(dayofweek=LOCALE_SABBREVDAYNAME1; dayofweek<=LOCALE_SABBREVDAYNAME7; dayofweek++)
+      {
+	int dayindex= ( dayofweek != LOCALE_SABBREVDAYNAME7 ) ?
+	  dayofweek-LOCALE_SABBREVDAYNAME1+1 : 0;
+	size=GetLocaleInfoA(ltime->lcid, dayofweek, NULL, 0);
+	ltime->abbrev_dayofweek[dayindex]=(char*)malloc(size);
+	if(!ltime->abbrev_dayofweek[dayindex]) { _Locale_time_destroy(ltime); return NULL; }
+	GetLocaleInfoA(ltime->lcid, dayofweek, ltime->abbrev_dayofweek[dayindex], size);
+	__ConvertFromACP(ltime->abbrev_dayofweek[dayindex], size, ltime->cp);
+      }
+
+    return ltime;
+  }
+
+  void* _Locale_collate_create(const char * name)
+  {
+    char cname[_Locale_MAX_SIMPLE_NAME];
+
+    _Locale_collate_t *lcol=(_Locale_collate_t*)malloc(sizeof(_Locale_collate_t));
+    if(!lcol) return lcol;
+    memset(lcol, 0, sizeof(_Locale_collate_t));
+
+    __Extract_locale_name(name, LC_COLLATE, cname);
+
+    if(__GetLCIDFromName(cname, &lcol->lcid, lcol->cp)==-1)
+      { free(lcol); return NULL; }
+
+    return lcol;
+  }
+
+  void* _Locale_monetary_create(const char * name)
+  {
+    char cname[_Locale_MAX_SIMPLE_NAME];
+    char *GroupingBuffer;
+    int BufferSize;
+    char FracDigits[3];
+
+    _Locale_monetary_t *lmon=(_Locale_monetary_t*)malloc(sizeof(_Locale_monetary_t));
+    if(!lmon) return lmon;
+    memset(lmon, 0, sizeof(_Locale_monetary_t));
+
+    __Extract_locale_name(name, LC_MONETARY, cname);
+
+    if(__GetLCIDFromName(cname, &lmon->lcid, lmon->cp)==-1)
+      { free(lmon); return NULL; }
+
+    // Extract information about monetary system
+    GetLocaleInfoA(lmon->lcid, LOCALE_SDECIMAL, lmon->decimal_point, 4);
+    __ConvertFromACP(lmon->decimal_point, 4, lmon->cp);
+    GetLocaleInfoA(lmon->lcid, LOCALE_STHOUSAND, lmon->thousands_sep, 4);
+    __ConvertFromACP(lmon->thousands_sep, 4, lmon->cp);
+
+    BufferSize=GetLocaleInfoA(lmon->lcid, LOCALE_SGROUPING, NULL, 0);
+    GroupingBuffer=(char*)malloc(BufferSize);
+    if(!GroupingBuffer) { lmon->grouping=NULL; return lmon; }
+    GetLocaleInfoA(lmon->lcid, LOCALE_SGROUPING, GroupingBuffer, BufferSize);
+    __FixGrouping(GroupingBuffer);
+    lmon->grouping=GroupingBuffer;
+
+    GetLocaleInfoA(lmon->lcid, LOCALE_SCURRENCY, lmon->curr_symbol, 6);
+    __ConvertFromACP(lmon->curr_symbol, 6, lmon->cp);
+
+    GetLocaleInfoA(lmon->lcid, LOCALE_SNEGATIVESIGN, lmon->negative_sign, 5);
+    __ConvertFromACP(lmon->negative_sign, 5, lmon->cp);
+
+    GetLocaleInfoA(lmon->lcid, LOCALE_SPOSITIVESIGN, lmon->positive_sign, 5);
+    __ConvertFromACP(lmon->positive_sign, 5, lmon->cp);
+
+    GetLocaleInfoA(lmon->lcid, LOCALE_ICURRDIGITS, FracDigits, 3);
+    lmon->frac_digits=atoi(FracDigits);
+
+    GetLocaleInfoA(lmon->lcid, LOCALE_IINTLCURRDIGITS, FracDigits, 3);
+    lmon->int_frac_digits=atoi(FracDigits);
+
+    GetLocaleInfoA(lmon->lcid, LOCALE_SINTLSYMBOL, lmon->int_curr_symbol, 5);
+
+    return lmon;
+  }
+
+  void* _Locale_messages_create(const char *name)
+  {
+    _Locale_messages_t *lmes=(_Locale_messages_t*)malloc(sizeof(_Locale_messages_t));
+    if(!lmes) return lmes;
+    memset(lmes, 0, sizeof(_Locale_messages_t));
+
+    return lmes;
+  }
+
+  const char* _Locale_common_default(char* buf)
+  {
+    char cp[MAX_CP_LEN+1];
+    int CodePage=__intGetACP(LOCALE_USER_DEFAULT);
+    if(!CodePage) CodePage=__intGetOCP(LOCALE_USER_DEFAULT);
+    my_ltoa(CodePage, cp);
+    return __GetLocaleName(LOCALE_USER_DEFAULT, cp, buf);
+  }
+
+  const char* _Locale_ctype_default(char* buf)
+  {
+    return  _Locale_common_default(buf);
+  }
+
+  const char* _Locale_numeric_default(char * buf)
+  {
+    return  _Locale_common_default(buf);
+  }
+
+  const char* _Locale_time_default(char* buf)
+  {
+    return  _Locale_common_default(buf);
+  }
+
+  const char* _Locale_collate_default(char* buf)
+  {
+    return  _Locale_common_default(buf);
+  }
+
+  const char* _Locale_monetary_default(char* buf)
+  {
+    return  _Locale_common_default(buf);
+  }
+
+  const char* _Locale_messages_default(char* buf)
+  {
+    return  _Locale_common_default(buf);
+  }
+
+  char* _Locale_ctype_name(const void* loc, char* buf)
+  {
+    char cp_buf[MAX_CP_LEN+1];
+    _Locale_ctype_t* ltype=(_Locale_ctype_t*)loc;
+    my_ltoa(ltype->cp, cp_buf);
+    return __GetLocaleName(ltype->lcid, cp_buf, buf);
+  }
+
+  char* _Locale_numeric_name(const void* loc, char* buf)
+  {
+    _Locale_numeric_t* lnum=(_Locale_numeric_t*)loc;
+    return __GetLocaleName(lnum->lcid, lnum->cp, buf);
+  }
+
+  char* _Locale_time_name(const void* loc, char* buf)
+  {
+    _Locale_time_t* ltime=(_Locale_time_t*)loc;
+    return __GetLocaleName(ltime->lcid, ltime->cp, buf);
+  }
+
+  char* _Locale_collate_name(const void* loc, char* buf)
+  {
+    _Locale_collate_t* lcol=(_Locale_collate_t*)loc;
+    return __GetLocaleName(lcol->lcid, lcol->cp, buf);
+  }
+
+  char* _Locale_monetary_name(const void* loc, char* buf)
+  {
+    _Locale_monetary_t* lmon=(_Locale_monetary_t*)loc;
+    return __GetLocaleName(lmon->lcid, lmon->cp, buf);
+  }
+
+  char* _Locale_messages_name(const void* loc, char* buf)
+  {
+    _Locale_messages_t* lmes=(_Locale_messages_t*)loc;
+    return __GetLocaleName(lmes->lcid, lmes->cp, buf);
+  }
+
+  void _Locale_ctype_destroy(void* loc)
+  {
+    _Locale_ctype_t *ltype=(_Locale_ctype_t*)loc;
+    if(!ltype) return;
+
+    free(ltype);
+  }
+
+  void _Locale_numeric_destroy(void* loc)
+  {
+    _Locale_numeric_t *lnum=(_Locale_numeric_t *)loc;
+    if(!lnum) return;
+
+    if(lnum->grouping) free(lnum->grouping);
+    free(lnum);
+  }
+
+  void _Locale_time_destroy(void* loc)
+  {
+    int i;
+    _Locale_time_t* ltime=(_Locale_time_t*)loc;
+    if(!ltime) return;
+
+    for(i=0; i<12; i++)
+      {
+    	if(ltime->month[i]) free(ltime->month[i]);
+    	if(ltime->abbrev_month[i]) free(ltime->abbrev_month[i]);
+      }
+
+    for(i=0; i<7; i++)
+      {
+    	if(ltime->dayofweek[i]) free(ltime->dayofweek[i]);
+    	if(ltime->abbrev_dayofweek[i]) free(ltime->abbrev_dayofweek[i]);
+      }
+
+    free(ltime);
+  }
+
+  void _Locale_collate_destroy(void* loc)
+  {
+    _Locale_collate_t* lcol=(_Locale_collate_t*)loc;
+    if(!lcol) return;
+
+    free(lcol);
+  }
+
+  void _Locale_monetary_destroy(void* loc)
+  {
+    struct _Locale_monetary *lmon=(struct _Locale_monetary *)loc;
+    if(!lmon) return;
+
+    if(lmon->grouping) free(lmon->grouping);
+    free(lmon);
+  }
+
+  void _Locale_messages_destroy(void* loc)
+  {
+    _Locale_messages_t* lmes=(_Locale_messages_t*)loc;
+    if(!lmes) return;
+
+    free(lmes);
+  }
+
+  char* _Locale_extract_ctype_name(const char* cname, char* buf) 
+  {
+    char lname[_Locale_MAX_SIMPLE_NAME];
+    __Extract_locale_name(cname, LC_CTYPE, lname);
+    if(lname[0] == 'C' && lname[1] == 0) return strcpy(buf, lname);
+    return __TranslateToSystem(lname, buf);
+  }
+
+  char* _Locale_extract_numeric_name(const char* cname, char* buf) 
+  {
+    char lname[_Locale_MAX_SIMPLE_NAME];
+    __Extract_locale_name(cname, LC_NUMERIC, lname);
+    if(lname[0] == 'C' && lname[1] == 0) return strcpy(buf, lname);
+    return __TranslateToSystem(lname, buf);
+  }
+
+  char* _Locale_extract_time_name(const char* cname, char* buf) 
+  {
+    char lname[_Locale_MAX_SIMPLE_NAME];
+    __Extract_locale_name(cname, LC_TIME, lname);
+    if(lname[0] == 'C' && lname[1] == 0) return strcpy(buf, lname);
+    return __TranslateToSystem(lname, buf);
+  }
+
+  char* _Locale_extract_collate_name(const char* cname, char* buf) 
+  {
+    char lname[_Locale_MAX_SIMPLE_NAME];
+    __Extract_locale_name(cname, LC_COLLATE, lname);
+    if(lname[0] == 'C' && lname[1] == 0) return strcpy(buf, lname);
+    return __TranslateToSystem(lname, buf);
+  }
+
+  char* _Locale_extract_monetary_name(const char* cname, char* buf) 
+  {
+    char lname[_Locale_MAX_SIMPLE_NAME];
+    __Extract_locale_name(cname, LC_MONETARY, lname);
+    if(lname[0] == 'C' && lname[1] == 0) return strcpy(buf, lname);
+    return __TranslateToSystem(lname, buf);
+  }
+
+  char* _Locale_extract_messages_name(const char* cname, char* buf) 
+  {
+    if(cname[0] == 'L' && cname[1] == 'C' && cname[2] == '_')
+      return strcpy(buf, "C");
+    return strcpy(buf, cname);
+  }
+
+  char* _Locale_compose_name(char* buf,
+			     const char* _ctype, const char* numeric,
+			     const char* time, const char* _collate,
+			     const char* monetary, const char* messages,
+			     const char* default_name)
+  {
+    (void) default_name;
+
+    if(!strcmp(_ctype, numeric) &&\
+       !strcmp(_ctype, time) &&\
+       !strcmp(_ctype, _collate) &&\
+       !strcmp(_ctype, monetary) &&\
+       !strcmp(_ctype, messages))
+      return strcpy(buf, _ctype);
+
+    strcpy(buf, "LC_CTYPE="); strcat(buf, _ctype); strcat(buf, ";");
+    strcat(buf, "LC_TIME="); strcat(buf, time); strcat(buf, ";");
+    strcat(buf, "LC_NUMERIC="); strcat(buf, numeric); strcat(buf, ";");
+    strcat(buf, "LC_COLLATE="); strcat(buf, _collate); strcat(buf, ";");
+    strcat(buf, "LC_MONETARY="); strcat(buf, monetary); strcat(buf, ";");
+    strcat(buf, "LC_MESSAGES="); strcat(buf, messages); strcat(buf, ";");
+
+    return buf;
+  }
+
+  /* ctype */
+
+ const  _Locale_mask_t* _Locale_ctype_table(struct _Locale_ctype* ltype)
+  {
+    return (const _Locale_mask_t*)ltype->ctable;
+  }
+
+  int _Locale_toupper(struct _Locale_ctype* ltype, int c)
+  {
+    char buf[2], out_buf[2];;
+    buf[0] = (char)c; buf[1] = 0;
+    if(__GetDefaultCP(ltype->lcid) == ltype->cp)
+      {
+	LCMapStringA(ltype->lcid, LCMAP_LINGUISTIC_CASING | LCMAP_UPPERCASE, buf, 2, out_buf, 2);
+	return out_buf[0];
+      }
+    else
+      {
+	wchar_t wbuf[2];
+    	MultiByteToWideChar(ltype->cp, MB_PRECOMPOSED, buf, 2, wbuf, 2);
+	WideCharToMultiByte(__GetDefaultCP(ltype->lcid), WC_COMPOSITECHECK | WC_SEPCHARS, wbuf, 2, buf, 2, NULL, FALSE);
+
+	LCMapStringA(ltype->lcid, LCMAP_LINGUISTIC_CASING | LCMAP_UPPERCASE, buf, 2, out_buf, 2);
+
+    	MultiByteToWideChar(__GetDefaultCP(ltype->lcid), MB_PRECOMPOSED, out_buf, 2, wbuf, 2);
+	WideCharToMultiByte(ltype->cp, WC_COMPOSITECHECK | WC_SEPCHARS, wbuf, 2, out_buf, 2, NULL, FALSE);
+	return out_buf[0];
+      }
+  }
+
+  int _Locale_tolower(struct _Locale_ctype* ltype, int c)
+  {
+    char buf[2], out_buf[2];;
+    buf[0] = (char)c; buf[1] = 0;
+    if(__GetDefaultCP(ltype->lcid) == ltype->cp)
+      {
+	LCMapStringA(ltype->lcid, LCMAP_LINGUISTIC_CASING | LCMAP_LOWERCASE, buf, 2, out_buf, 2);
+	return out_buf[0];
+      }
+    else
+      {
+	wchar_t wbuf[2];
+    	MultiByteToWideChar(ltype->cp, MB_PRECOMPOSED, buf, 2, wbuf, 2);
+	WideCharToMultiByte(__GetDefaultCP(ltype->lcid), WC_COMPOSITECHECK | WC_SEPCHARS, wbuf, 2, buf, 2, NULL, FALSE);
+
+	LCMapStringA(ltype->lcid, LCMAP_LINGUISTIC_CASING | LCMAP_LOWERCASE, buf, 2, out_buf, 2);
+
+    	MultiByteToWideChar(__GetDefaultCP(ltype->lcid), MB_PRECOMPOSED, out_buf, 2, wbuf, 2);
+	WideCharToMultiByte(ltype->cp, WC_COMPOSITECHECK | WC_SEPCHARS, wbuf, 2, out_buf, 2, NULL, FALSE);
+	return out_buf[0];
+      }
+  }
+
+# ifndef _STLP_NO_WCHAR_T
+  _Locale_mask_t _Locale_wchar_ctype(struct _Locale_ctype* ltype, wint_t c,
+    _Locale_mask_t which_bits)
+  {
+    wchar_t buf[2];
+    WORD out[2];
+    buf[0] = c; buf[1] = 0;
+    GetStringTypeW(CT_CTYPE1, buf, -1, out);
+
+    return (_Locale_mask_t)out[0] & which_bits;
+    //	ltype;
+  }
+
+  wint_t _Locale_wchar_tolower(struct _Locale_ctype* ltype, wint_t c)
+  {
+    wint_t res;
+
+    LCMapStringW(ltype->lcid, LCMAP_LOWERCASE, &c, 1, &res, 1);
+    return res;
+  }
+
+  wint_t _Locale_wchar_toupper(struct _Locale_ctype* ltype, wint_t c)
+  {
+    wint_t res;
+
+    LCMapStringW(ltype->lcid, LCMAP_UPPERCASE, &c, 1, &res, 1);
+    return res;
+  }
+# endif
+
+# ifndef _STLP_NO_MBSTATE_T
+
+  int _Locale_mb_cur_max (struct _Locale_ctype * ltype)
+  {
+    CPINFO CPInfo;
+    if(!GetCPInfo(ltype->cp, &CPInfo)) return 0;
+    return CPInfo.MaxCharSize;
+  }
+
+  int _Locale_mb_cur_min (struct _Locale_ctype *dummy)
+  { return 1; }
+
+  int _Locale_is_stateless (struct _Locale_ctype * ltype)
+  {
+    CPINFO CPInfo;
+    GetCPInfo(ltype->cp, &CPInfo);
+    return (CPInfo.MaxCharSize == 1) ? 1 : 0;
+  }
+
+  wint_t _Locale_btowc(struct _Locale_ctype * ltype, int c)
+  {
+    wchar_t wc;
+    if(c == EOF) return WEOF;
+
+    MultiByteToWideChar(ltype->cp, MB_PRECOMPOSED, (char*)&c, 1, &wc, 1);
+
+    return (wint_t)wc;
+  }
+
+  int _Locale_wctob(struct _Locale_ctype * ltype, wint_t wc)
+  {
+    char c;
+
+    if(WideCharToMultiByte(ltype->cp, WC_COMPOSITECHECK | WC_DEFAULTCHAR, (wchar_t*)&wc, 1, &c, 1, NULL, NULL) == 0)
+      return WEOF; // Not single byte or error conversion.
+
+    return (int)c;
+  }
+
+  static int __isleadbyte(int c, unsigned int *ctable)
+  {
+    return (ctable[(unsigned char)(c)] & _LEADBYTE);
+  }
+
+  static size_t __mbtowc(struct _Locale_ctype *l, wchar_t *dst, char src, mbstate_t *shift_state)
+  {
+    int result;
+
+    if(*shift_state == 0)
+      {
+	if(__isleadbyte(src, l->ctable))
+	  {
+	    ((unsigned char*)shift_state)[0] = src;
+	    return (size_t)-2;
+	  }
+	else
+	  {
+	    result = MultiByteToWideChar(l->cp, MB_PRECOMPOSED, &src, 1, dst, 1);
+	    if(result == 0) return (size_t)-1;
+
+	    return 1;
+	  }
+      }
+    else
+      {
+	((unsigned char*)shift_state)[1] = src;
+	result = MultiByteToWideChar(l->cp, MB_PRECOMPOSED, (const char*)shift_state, 2, dst, 1);
+	*shift_state = 0;
+	if(result == 0) return (size_t)-1;
+
+	return 1;
+      }
+  }
+
+  size_t _Locale_mbtowc(struct _Locale_ctype *ltype,
+			wchar_t *to,
+			const char *from, size_t n,
+			mbstate_t *shift_state)
+  {
+    CPINFO ci;
+    int result;
+
+    GetCPInfo(ltype->cp, &ci);
+    if(ci.MaxCharSize == 1) // Single byte encoding.
+      {
+	*shift_state = (mbstate_t)0;
+	result = MultiByteToWideChar(ltype->cp, MB_PRECOMPOSED, from, 1, to, 1);
+	if(result == 0) return (size_t)-1;
+	return result;
+      }
+    else // Multi byte encoding.
+      {
+    	size_t retval, count = 0;
+    	while(n--)
+	  {
+	    retval = __mbtowc(ltype, to, *from, shift_state);
+	    if(retval == -2) { from++; count++; }
+	    else if(retval == -1) return -1;
+	    else return count+retval;
+	  }
+    	if(retval == -2) return (size_t)-2;
+
+    	return n;
+      }
+  }
+
+  size_t _Locale_wctomb(struct _Locale_ctype *ltype,
+			char *to, size_t n,
+			const wchar_t c,
+			mbstate_t *shift_state)
+  {
+    int size = \
+      WideCharToMultiByte(ltype->cp,  WC_COMPOSITECHECK | WC_SEPCHARS, &c, 1, NULL, 0, NULL, NULL);
+
+    if(size > n) return (size_t)-2;
+
+    size = \
+      WideCharToMultiByte(ltype->cp,  WC_COMPOSITECHECK | WC_SEPCHARS, &c, 1, to, n, NULL, NULL);
+
+    if(size == 0) return (size_t)-1;
+
+    return (size_t)size;
+  }
+
+  size_t _Locale_unshift(struct _Locale_ctype *ltype,
+			 mbstate_t *st,
+			 char *buf, size_t n, char **next)
+  {
+    if(*st == 0)
+      {
+	*next = buf;
+	return 0;
+      }
+    else
+      {
+	if(n < 1) { *next = buf; return (size_t)-2; }
+
+	*next = buf + 1;
+	return 1;
+      }
+  }
+
+# endif /*  _STLP_NO_MBSTATE_T */
+
+
+# ifndef CSTR_EQUAL /* VC5SP3*/
+# define CSTR_EQUAL 2
+# endif
+# ifndef CSTR_LESS_THAN /* VC5SP3 */
+# define CSTR_LESS_THAN 1
+# endif
+
+  /* Collate */
+  int _Locale_strcmp(struct _Locale_collate* lcol,
+		     const char* s1, size_t n1,
+		     const char* s2, size_t n2)
+  {
+    int result;
+    if(__GetDefaultCP(lcol->lcid) == atoi(lcol->cp))
+      {
+	result=CompareStringA(lcol->lcid, 0, s1, n1, s2, n2);
+      }
+    else
+      {
+	char *buf1, *buf2;
+	size_t size1, size2;
+	buf1 = __ConvertToCP(atoi(lcol->cp), __GetDefaultCP(lcol->lcid), s1, n1, &size1);
+	buf2 = __ConvertToCP(atoi(lcol->cp), __GetDefaultCP(lcol->lcid), s2, n2, &size2);
+
+	result=CompareStringA(lcol->lcid, 0, buf1, size1, buf2, size2);
+	free(buf1); free(buf2);
+      }
+    return (result == CSTR_EQUAL) ? 0 : (result == CSTR_LESS_THAN) ? -1 : 1;
+  }
+
+# ifndef _STLP_NO_WCHAR_T
+
+  int _Locale_strwcmp(struct _Locale_collate* lcol,
+		      const wchar_t* s1, size_t n1,
+		      const wchar_t* s2, size_t n2)
+  {
+    int result;
+    result=CompareStringW(lcol->lcid, 0, s1, n1, s2, n2);
+    return (result == CSTR_EQUAL) ? 0 : (result == CSTR_LESS_THAN) ? -1 : 1;
+  }
+
+# endif
+
+  size_t _Locale_strxfrm(struct _Locale_collate* lcol,
+			 char* dst, size_t dst_size,
+			 const char* src, size_t src_size)
+  {
+    if(__GetDefaultCP(lcol->lcid) == atoi(lcol->cp))
+      return LCMapStringA(lcol->lcid, LCMAP_SORTKEY, src, src_size, dst, dst_size);
+    else
+      {
+	int result;
+	char *buf;
+	size_t size;
+	buf = __ConvertToCP(atoi(lcol->cp), __GetDefaultCP(lcol->lcid), src, src_size, &size);
+
+	result=LCMapStringA(lcol->lcid, LCMAP_SORTKEY, buf, size, dst, dst_size);
+	free(buf);
+	return result;
+      }
+  }
+
+# ifndef _STLP_NO_WCHAR_T
+
+  size_t _Locale_strwxfrm(struct _Locale_collate* lcol,
+                          wchar_t* dst, size_t dst_size,
+                          const wchar_t* src, size_t src_size)
+  {
+    return LCMapStringW(lcol->lcid, LCMAP_SORTKEY, src, src_size, dst, dst_size);
+  }
+
+# endif
+
+  /* Numeric */
+
+  static const char* __true_name="true";
+  static const char* __false_name="false";
+
+  char _Locale_decimal_point(struct _Locale_numeric* lnum)
+  {
+    return lnum->decimal_point[0];
+  }
+
+  char _Locale_thousands_sep(struct _Locale_numeric* lnum)
+  {
+    return lnum->thousands_sep[0];
+  }
+
+  const char* _Locale_grouping(struct _Locale_numeric * lnum)
+  {
+    if(!lnum->grouping) return "";
+    else return lnum->grouping;
+  }
+
+  const char * _Locale_true(struct _Locale_numeric * lnum)
+  {
+    return __true_name; // NT does't provide information about this
+  }
+
+  const char * _Locale_false(struct _Locale_numeric * lnum)
+  {
+    return __false_name; // NT does't provide information about this
+  }
+
+
+  /* Monetary */
+
+  const char* _Locale_int_curr_symbol(struct _Locale_monetary * lmon)
+  {
+    return lmon->int_curr_symbol;
+  }
+
+  const char* _Locale_currency_symbol(struct _Locale_monetary * lmon)
+  {
+    return lmon->curr_symbol;
+  }
+
+  char        _Locale_mon_decimal_point(struct _Locale_monetary * lmon)
+  {
+    return lmon->decimal_point[0];
+  }
+
+  char        _Locale_mon_thousands_sep(struct _Locale_monetary * lmon)
+  {
+    return lmon->thousands_sep[0];
+  }
+
+  const char* _Locale_mon_grouping(struct _Locale_monetary * lmon)
+  {
+    if(!lmon->grouping) return "";
+    else return lmon->grouping;
+  }
+
+  const char* _Locale_positive_sign(struct _Locale_monetary * lmon)
+  {
+    return lmon->positive_sign;
+  }
+
+  const char* _Locale_negative_sign(struct _Locale_monetary * lmon)
+  {
+    return lmon->negative_sign;
+  }
+
+  char        _Locale_int_frac_digits(struct _Locale_monetary * lmon)
+  {
+    return (char)lmon->int_frac_digits;
+  }
+
+  char        _Locale_frac_digits(struct _Locale_monetary * lmon)
+  {
+    return (char)lmon->frac_digits;
+  }
+
+  int         _Locale_p_cs_precedes(struct _Locale_monetary * lmon)
+  {
+    char loc_data[2];
+    GetLocaleInfoA(lmon->lcid, LOCALE_IPOSSYMPRECEDES, loc_data, 2);
+    if(loc_data[0]=='0') return 0;
+    else if(loc_data[0]=='1') return 1;
+    else return -1;
+  }
+
+  int         _Locale_p_sep_by_space(struct _Locale_monetary * lmon)
+  {
+    char loc_data[2];
+    GetLocaleInfoA(lmon->lcid, LOCALE_IPOSSEPBYSPACE, loc_data, 2);
+    if(loc_data[0]=='0') return 0;
+    else if(loc_data[0]=='1') return 1;
+    else return -1;
+  }
+
+  int         _Locale_p_sign_posn(struct _Locale_monetary * lmon)
+  {
+    char loc_data[2];
+    GetLocaleInfoA(lmon->lcid, LOCALE_IPOSSIGNPOSN, loc_data, 2);
+    return atoi(loc_data);
+  }
+
+  int         _Locale_n_cs_precedes(struct _Locale_monetary * lmon)
+  {
+    char loc_data[2];
+    GetLocaleInfoA(lmon->lcid, LOCALE_INEGSYMPRECEDES, loc_data, 2);
+    if(loc_data[0]=='0') return 0;
+    else if(loc_data[0]=='1') return 1;
+    else return -1;
+  }
+
+  int          _Locale_n_sep_by_space(struct _Locale_monetary * lmon)
+  {
+    char loc_data[2];
+    GetLocaleInfoA(lmon->lcid, LOCALE_INEGSEPBYSPACE, loc_data, 2);
+    if(loc_data[0]=='0') return 0;
+    else if(loc_data[0]=='1') return 1;
+    else return -1;
+  }
+
+  int          _Locale_n_sign_posn(struct _Locale_monetary * lmon)
+  {
+    char loc_data[2];
+    GetLocaleInfoA(lmon->lcid, LOCALE_INEGSIGNPOSN, loc_data, 2);
+    return atoi(loc_data);
+  }
+
+
+  /* Time */
+  const char * _Locale_full_monthname(struct _Locale_time * ltime, int month)
+  {
+    const char **names = (const char**)ltime->month;
+    return names[month];
+  }
+
+  const char * _Locale_abbrev_monthname(struct _Locale_time * ltime, int month)
+  {
+    const char **names = (const char**)ltime->abbrev_month;
+    return names[month];
+  }
+
+  const char * _Locale_full_dayofweek(struct _Locale_time * ltime, int day)
+  {
+    const char **names = (const char**)ltime->dayofweek;
+    return names[day];
+  }
+
+  const char * _Locale_abbrev_dayofweek(struct _Locale_time * ltime, int day)
+  {
+    const char **names = (const char**)ltime->abbrev_dayofweek;
+    return names[day];
+  }
+
+  const char* _Locale_d_t_fmt(struct _Locale_time* ltime)
+  {
+    // NT doesn't provide this information, and must simulate.
+    static char buffer[MAX_PATH];
+    strcpy(buffer, _Locale_d_fmt(ltime));
+    strcat(buffer, " ");
+    strcat(buffer, _Locale_t_fmt(ltime));
+    return buffer;
+  }
+
+  const char* _Locale_long_d_t_fmt(struct _Locale_time* ltime)
+  {
+    // NT doesn't provide this information, and must simulate.
+    static char buffer[MAX_PATH];
+    strcpy(buffer, _Locale_long_d_fmt(ltime));
+    strcat(buffer, " ");
+    strcat(buffer, _Locale_t_fmt(ltime));
+    return buffer;
+  }
+
+  const char* __ConvertDate(const char* NTTime)
+  {
+    static char ansi_date_fmt[MAX_PATH]; // Hack
+    const char *cur_char;
+    char *cur_output;
+
+    // Correct time format.
+    cur_char=NTTime;
+    cur_output=ansi_date_fmt;
+    while(*cur_char)
+      {
+    	switch(*cur_char)
+	  {
+	  case 'd':
+            {
+	      if(*(cur_char+1)=='d')
+                {
+		  if(*(cur_char+2)=='d')
+		    {
+		      if(*(cur_char+3)=='d')
+			{ *(cur_output++)='%'; *(cur_output++)='A';  cur_char+=3; }
+		      else
+			{ *(cur_output++)='%'; *(cur_output++)='a';  cur_char+=2; }
+		    }
+		  else
+		    { *(cur_output++)='%'; *(cur_output++)='d';  cur_char++; }
+                }
+	      else
+		{ *(cur_output++)='%'; *(cur_output++)='#'; *(cur_output++)='d'; }
+            }
+            break;
+
+	  case 'M':
+            {
+	      if(*(cur_char+1)=='M')
+                {
+		  if(*(cur_char+2)=='M')
+		    {
+		      if(*(cur_char+3)=='M')
+			{ *(cur_output++)='%'; *(cur_output++)='B';  cur_char+=3; }
+		      else
+			{ *(cur_output++)='%'; *(cur_output++)='b';  cur_char+=2; }
+		    }
+		  else
+		    { *(cur_output++)='%'; *(cur_output++)='m';  cur_char++; }
+                }
+	      else
+		{ *(cur_output++)='%'; *(cur_output++)='#'; *(cur_output++)='m'; }
+            }
+            break;
+
+	  case 'y':
+            {
+	      if(*(cur_char+1)=='y')
+                {
+		  if(*(cur_char+2)=='y' && *(cur_char+3)=='y')
+		    { *(cur_output++)='%'; *(cur_output++)='Y';  cur_char+=3; }
+		  else
+		    { *(cur_output++)='%'; *(cur_output++)='y';  cur_char++; }
+                }
+	      else
+		{ *(cur_output++)='%'; *(cur_output++)='#'; *(cur_output++)='y'; }
+            }
+            break;
+
+	  case '%':
+	    {
+	      *(cur_output++)='%'; *(cur_output++)='%';
+    	    }
+            break;
+
+	  case '\'':
+	    {
+	      cur_char++;
+	      while(*cur_char!='\'' && *cur_char!=0) *cur_output++=*cur_char++;
+	    }
+	    break;
+
+	  default:
+	    {
+	      *(cur_output++)=*cur_char;
+            }
+            break;
+	  }
+        if(*cur_char==0) break;
+        cur_char++;
+      }
+
+    *cur_output=0;
+    return ansi_date_fmt;
+  }
+
+  const char* _Locale_d_fmt(struct _Locale_time* ltime)
+  {
+    static char date_fmt[80];
+    GetLocaleInfoA(ltime->lcid, LOCALE_SSHORTDATE, date_fmt, MAX_PATH);
+    __ConvertFromACP(date_fmt, 80, ltime->cp);
+
+    return __ConvertDate(date_fmt);
+  }
+
+  const char* _Locale_long_d_fmt(struct _Locale_time* ltime)
+  {
+    static char date_fmt[80];
+    GetLocaleInfoA(ltime->lcid, LOCALE_SLONGDATE, date_fmt, MAX_PATH);
+    __ConvertFromACP(date_fmt, 80, ltime->cp);
+
+    return __ConvertDate(date_fmt);
+  }
+
+  const char* _Locale_t_fmt(struct _Locale_time* ltime)
+  {
+    char time_fmt[80];
+    static char ansi_time_fmt[MAX_PATH]; // Hack
+    char *cur_char, *cur_output;
+    GetLocaleInfoA(ltime->lcid, LOCALE_STIMEFORMAT, time_fmt, MAX_PATH);
+    __ConvertFromACP(time_fmt, 80, ltime->cp);
+
+    // Correct time format.
+    cur_char=time_fmt;
+    cur_output=ansi_time_fmt;
+    while(*cur_char)
+      {
+    	switch(*cur_char)
+	  {
+	  case 'h':
+            {
+	      if(*(cur_char+1)=='h')
+		{ *(cur_output++)='%'; *(cur_output++)='I';  cur_char++; }
+	      else
+		{ *(cur_output++)='%'; *(cur_output++)='#'; *(cur_output++)='I'; }
+            }
+            break;
+
+	  case 'H':
+	    if(*(cur_char+1)=='H')
+	      { *(cur_output++)='%'; *(cur_output++)='H'; cur_char++; }
+	    else
+	      { *(cur_output++)='%'; *(cur_output++)='#'; *(cur_output++)='H'; }
+	    break;
+
+	  case 'm':
+            {
+	      if(*(cur_char+1)=='m')
+		{ *(cur_output++)='%'; *(cur_output++)='M';  cur_char++; }
+	      else
+		{ *(cur_output++)='%'; *(cur_output++)='#'; *(cur_output++)='M'; }
+            }
+            break;
+
+	  case 's':
+            {
+	      if(*(cur_char+1)=='s')
+		{ *(cur_output++)='%'; *(cur_output++)='S';  cur_char++; }
+	      else
+		{ *(cur_output++)='%'; *(cur_output++)='#'; *(cur_output++)='S'; }
+            }
+            break;
+
+	  case 't':
+            {
+	      if(*(cur_char+1)=='t')
+		cur_char++;
+
+	      *(cur_output++)='%'; *(cur_output++)='p';
+            }
+            break;
+
+	  case '%':
+	    {
+	      *(cur_output++)='%'; *(cur_output++)='%';
+    	    }
+            break;
+
+	  case '\'':
+	    {
+	      cur_char++;
+	      while(*cur_char!='\'' && *cur_char!=0) *cur_output++=*cur_char++;
+	    }
+	    break;
+
+	  default:
+	    {
+	      *(cur_output++)=*cur_char;
+            }
+            break;
+	  }
+        if(*cur_char==0) break;
+        cur_char++;
+      }
+
+    *cur_output=0;
+    return ansi_time_fmt;
+  }
+
+  const char* _Locale_am_str(struct _Locale_time* ltime)
+  {
+    static char buffer[9];
+    GetLocaleInfoA(ltime->lcid, LOCALE_S1159, buffer, 9);
+    __ConvertFromACP(buffer, 9, ltime->cp);
+    return buffer;
+  }
+
+  const char* _Locale_pm_str(struct _Locale_time* ltime)
+  {
+    static char buffer[9];
+    GetLocaleInfoA(ltime->lcid, LOCALE_S2359, buffer, 9);
+    __ConvertFromACP(buffer, 9, ltime->cp);
+    return buffer;
+  }
+
+  const char* _Locale_t_fmt_ampm(struct _Locale_time* ltime)
+  {
+    char time_sep[4];
+    static char buffer[17];
+    GetLocaleInfoA(ltime->lcid, LOCALE_STIME, time_sep, 4);
+    __ConvertFromACP(time_sep, 4, ltime->cp);
+    strcpy(buffer, "%H"); strcat(buffer, time_sep);
+    strcat(buffer, "%M"); strcat(buffer, time_sep);
+    strcat(buffer, "%S %p");
+    return buffer;
+  }
+
+  /* Messages */
+
+  int _Locale_catopen(struct _Locale_messages* __DUMMY_PAR1, const char* __DUMMY_PAR)
+  { return -1; }
+  void _Locale_catclose(struct _Locale_messages* __DUMMY_PAR1, int __DUMMY_PAR) {}
+  const char* _Locale_catgets(struct _Locale_messages* __DUMMY_PAR1, int __DUMMY_PAR2,
+			      int __DUMMY_PAR3, int __DUMMY_PAR4,
+			      const char *dfault)
+  { return dfault; }
+
+#ifdef __cplusplus    
+} /* extern C */
+_STLP_END_NAMESPACE
+#endif
+
+void __FixGrouping(char *grouping)
+{
+  /* This converts NT version which uses '0' instead of 0, etc ; to ANSI */
+  while (*grouping) {
+    if (*grouping >= '0' && *grouping <= '9') {
+      *grouping = *grouping - '0'; 
+      grouping++;
+    } else if (*grouping == ';') {
+      char *tmp = grouping;
+      /* remove ':' */
+      for (tmp = grouping; *tmp; tmp++)
+        *tmp = *(tmp+1);
+    } else
+      grouping++;
+  } 
+}
+
+const char* __ConvertName(const char* lname, LOCALECONV* ConvTable, int TableSize)
+{
+  int     i;
+  int     cmp = 1;
+  int     low = 0;
+  int		high=TableSize-1;
+
+  //  typical binary search - do until no more to search or match
+  while (low <= high)
+    {
+      i = (low + high) / 2;
+
+      if ((cmp=lstrcmpiA(lname, (*(ConvTable + i)).name))==0)
+	return (*(ConvTable + i)).abbrev;
+      else if (cmp < 0)
+	high = i - 1;
+      else
+	low = i + 1;
+    }
+  return lname;
+}
+
+int __ParseLocaleString(const char* lname, char* lang, char* ctry,
+char* page)
+{
+  int param=0;
+  size_t len=0;
+  char ch=lname[0];
+
+  if(ch==0)
+     return 0;
+    
+  else if(ch=='.') // Only code page provided
+    {
+      if(strlen(lname+1)>MAX_CP_LEN) return -1; // CP number too long
+      strcpy(page, lname+1);
+      lang[0] = 0; ctry[0] = 0;  //necessary? calling function does this too
+      return 0;
+    }
+
+  while (ch!=0) // Parse string
+    {
+      len=strcspn(lname, "_.,"); // ',' for compability with POSIX
+
+      ch=lname[len];
+      if((param==0) && (len<MAX_LANG_LEN))
+        {
+          if (ch!='.') // hence '_', ',' or '/0'
+                strncpy(lang, lname, len);
+          else  // no ctry, read lang and skip ctry on next pass
+            {
+              ctry[0]=0;  
+              strncpy(lang, lname, len);
+              param++;    
+             }
+         }
+      else if(param==1 && len<MAX_CTRY_LEN && ch!='_')
+            strncpy(ctry, lname, len);
+      else if(param==2 && len<MAX_CP_LEN && (ch==0 || ch==','))
+            strncpy(page, lname, len);
+      else
+        return -1;
+      if(ch==',') break; // Modifier found. In NT not used.
+      param++;
+      lname+=(len+1);
+    }
+  return 0;
+}
+
+/* Data necesary for find LCID*/
+static int __FindFlag;
+static LCID __FndLCID;
+static const char* __FndLang;
+static const char* __FndCtry;
+
+static LCID LocaleFromHex(const char* locale)
+{
+  unsigned long result=0;
+  int digit;
+  while(*locale)
+    {
+      result<<=4;
+      digit=(*locale>='0' && *locale<='9')? *locale-'0':
+	(*locale>='A' && *locale<='F')?(*locale-'A')+10:(*locale-'a')+10;
+      result+=digit;
+      locale++;
+    }
+  return (LCID)result;
+}
+
+static BOOL CALLBACK EnumLocalesProcA(LPSTR locale)
+{
+  LCID lcid=LocaleFromHex(locale);
+  int LangFlag=0, CtryFlag=!__FndCtry;
+  static char Lang[MAX_LANG_LEN], Ctry[MAX_CTRY_LEN];
+
+  GetLocaleInfoA(lcid, LOCALE_SENGLANGUAGE, Lang, MAX_LANG_LEN);
+  if(lstrcmpiA(Lang, __FndLang)!=0)
+    {
+      GetLocaleInfoA(lcid, LOCALE_SABBREVLANGNAME, Lang, MAX_LANG_LEN);
+      if(lstrcmpiA(Lang, __FndLang)==0) LangFlag=1;
+    }
+  else LangFlag=1;
+
+  if(__FndCtry)
+    {
+      GetLocaleInfoA(lcid, LOCALE_SENGCOUNTRY, Ctry, MAX_CTRY_LEN);
+      if(lstrcmpiA(Ctry, __FndCtry)!=0)
+	{
+	  GetLocaleInfoA(lcid, LOCALE_SABBREVCTRYNAME, Ctry, MAX_CTRY_LEN);
+	  if(lstrcmpiA(Ctry, __FndCtry)==0) CtryFlag=1;
+	}
+      else CtryFlag=1;
+    }
+
+  if(LangFlag && CtryFlag)
+    {
+      __FindFlag=1;
+      __FndLCID=lcid;
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+int __GetLCID(const char* lang, const char* ctry, LCID* lcid)
+{
+  __FindFlag=0;
+  __FndLang=lang;
+  __FndCtry=ctry;
+  EnumSystemLocalesA(EnumLocalesProcA, LCID_INSTALLED);
+
+  if(__FindFlag==0) return -1;
+
+  *lcid=__FndLCID;
+  return 0;
+}
+
+int __GetLCIDFromName(const char* lname, LCID* lcid, char* cp)
+{
+  char lang[MAX_LANG_LEN+1], ctry[MAX_CTRY_LEN+1], page[MAX_CP_LEN+1];
+  int result = 0;
+  if(lname==NULL || lname[0]==0)
+    {
+      *lcid=LOCALE_USER_DEFAULT;
+      return 0;
+    }
+
+  memset(lang, 0, MAX_LANG_LEN+1);
+  memset(ctry, 0, MAX_CTRY_LEN+1);
+  memset(page, 0, MAX_CP_LEN+1);
+  if(__ParseLocaleString(lname, lang, ctry, page)==-1) return -1;
+
+  if(lang[0] == 0 && ctry[0] == 0)
+    *lcid = LOCALE_USER_DEFAULT; // Only code page given.
+  else
+    {
+      if(ctry[0] == 0)
+	result = __GetLCID(__ConvertName(lang, __rg_language, sizeof(__rg_language)/sizeof(LOCALECONV)), NULL, lcid);
+      else
+	result = __GetLCID(
+			   __ConvertName(lang, __rg_language, sizeof(__rg_language)/sizeof(LOCALECONV)),
+			   __ConvertName(ctry, __rg_country, sizeof(__rg_country)/sizeof(LOCALECONV)),
+			   lcid);
+    }
+
+  if(result==0)
+    {
+      // Handling code page
+      if(lstrcmpiA(page, "ACP")==0 || page[0]==0)
+	my_ltoa(__intGetACP(*lcid), cp);
+      else if(lstrcmpiA(page, "OCP")==0)
+	my_ltoa(__intGetOCP(*lcid), cp);
+      else strncpy(cp, page, 5);
+    }
+  return result;
+}
+
+char* __GetLocaleName(LCID lcid, const char* cp, char* buf)
+{
+  char lang[MAX_LANG_LEN+1], ctry[MAX_CTRY_LEN+1];
+  GetLocaleInfoA(lcid, LOCALE_SENGLANGUAGE, lang, MAX_LANG_LEN);
+  GetLocaleInfoA(lcid, LOCALE_SENGCOUNTRY, ctry, MAX_CTRY_LEN);
+  strcpy(buf, lang); strcat(buf, "_");
+  strcat(buf, ctry); strcat(buf, ".");
+  return strcat(buf, cp);
+}
+
+static const char* __loc_categories[]=
+{
+  "LC_ALL", "LC_COLLATE", "LC_CTYPE", "LC_MONETARY", "LC_NUMERIC", "LC_TIME"
+    };
+
+char* __Extract_locale_name(const char* loc, int category, char* buf)
+{
+  char *expr;
+  size_t len_name;
+  buf[0] = 0;
+  if(category < LC_ALL || category > LC_MAX) return NULL;
+
+  if(loc[0]=='L' && loc[1]=='C' && loc[2]=='_')
+    {
+      expr=strstr((char*)loc, __loc_categories[category]);
+      if(expr==NULL) return NULL; // Category not found.
+      expr=strchr(expr, '=');
+      if(expr==NULL) return NULL;
+      expr++;
+      len_name=strcspn(expr, ";");
+      len_name=len_name>_Locale_MAX_SIMPLE_NAME?\
+	_Locale_MAX_SIMPLE_NAME:len_name;
+      strncpy(buf, expr, len_name);		buf[len_name]=0;
+      return buf;
+    }
+  else
+    return strncpy(buf, loc, _Locale_MAX_SIMPLE_NAME);
+}
+
+char* __TranslateToSystem(const char* lname, char* buf)
+{
+  LCID lcid;
+  char cp[MAX_CP_LEN+1];
+  if(__GetLCIDFromName(lname, &lcid, cp)!=0) return NULL;
+
+  return __GetLocaleName(lcid, cp, buf);
+}
+
+void __ConvertFromACP(char* buf, int buf_size, const char* cp)
+{
+  wchar_t *Buffer;
+  int BufferSize=MultiByteToWideChar(CP_ACP, 0, buf, -1, NULL, 0);
+  Buffer=(wchar_t*)malloc(sizeof(wchar_t)*(BufferSize+1));
+  MultiByteToWideChar(CP_ACP, 0, buf, -1, Buffer, BufferSize);
+  WideCharToMultiByte(atoi(cp), 0, Buffer, -1, buf, buf_size, NULL, NULL);
+  free(Buffer);
+}
+
+/* Return 0 if ANSI code page not used */
+int __intGetACP(LCID lcid)
+{
+  char cp[6];
+  GetLocaleInfoA(lcid, LOCALE_IDEFAULTANSICODEPAGE, cp, 6);
+  return atoi(cp);
+}
+
+/* Return 1 if OEM code page not used */
+int __intGetOCP(LCID lcid)
+{
+  char cp[6];
+  GetLocaleInfoA(lcid, LOCALE_IDEFAULTCODEPAGE, cp, 6);
+  return atoi(cp);
+}
+
+int __GetDefaultCP(LCID lcid)
+{
+  int cp = __intGetACP(lcid);
+  if(cp == 0) return __intGetOCP(lcid);
+  else return cp;
+}
+
+char* __ConvertToCP(int from_cp, int to_cp, const char *from, size_t size, size_t *ret_buf_size)
+{
+  int wbuffer_size, buffer_size;
+  wchar_t *wbuffer;
+  char* buffer;
+
+  wbuffer_size = MultiByteToWideChar(from_cp, MB_PRECOMPOSED, from, size, NULL, 0);
+  wbuffer = (wchar_t*)malloc(sizeof(wchar_t)*wbuffer_size);
+  MultiByteToWideChar(from_cp, MB_PRECOMPOSED, from, size, wbuffer, wbuffer_size);
+
+  buffer_size = WideCharToMultiByte(to_cp, WC_COMPOSITECHECK | WC_SEPCHARS, wbuffer, wbuffer_size, NULL, 0, NULL, FALSE);
+  buffer = (char*)malloc(buffer_size);
+  WideCharToMultiByte(to_cp, WC_COMPOSITECHECK | WC_SEPCHARS, wbuffer, wbuffer_size, buffer, buffer_size, NULL, FALSE);
+
+  free(wbuffer);
+  *ret_buf_size = buffer_size;
+  return buffer;
+}
+
+#ifdef __cplusplus
+}
+// _STLP_END_NAMESPACE
+#endif
diff --git a/main/source/stlport/src/codecvt.cpp b/main/source/stlport/src/codecvt.cpp
new file mode 100644
index 00000000..bd81ac33
--- /dev/null
+++ b/main/source/stlport/src/codecvt.cpp
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+# include "stlport_prefix.h"
+
+# ifndef _STLP_NO_MBSTATE_T
+
+#include <stl/_codecvt.h>
+#include <stl/_algobase.h>
+
+_STLP_BEGIN_NAMESPACE
+
+//----------------------------------------------------------------------
+// codecvt<char, char, mbstate_t>
+
+codecvt<char, char, mbstate_t>::~codecvt() {}
+
+int codecvt<char, char, mbstate_t>::do_length(const mbstate_t&,
+                                              const  char* from, 
+                                              const  char* end,
+                                              size_t mx) const
+{
+  return (int)(min) ( __STATIC_CAST(size_t, (end - from)), mx);
+}
+
+int codecvt<char, char, mbstate_t>::do_max_length() const _STLP_NOTHROW
+{
+ return 1; 
+}
+
+bool
+codecvt<char, char, mbstate_t>::do_always_noconv() const _STLP_NOTHROW
+{
+  return true;
+}
+
+int 
+codecvt<char, char, mbstate_t>::do_encoding() const _STLP_NOTHROW
+{
+  return 1; 
+}
+
+
+codecvt_base::result 
+codecvt<char, char, mbstate_t>::do_unshift(mbstate_t& /* __state */,
+                                           char*      __to,
+                                           char*      /* __to_limit */,
+                                           char*&     __to_next) const
+{ __to_next = __to; return noconv; }
+
+codecvt_base::result 
+codecvt<char, char, mbstate_t>::do_in (mbstate_t&   /* __state */ , 
+                                       const char*  __from,
+                                       const char*  /* __from_end */,
+                                       const char*& __from_next,
+                                       char*        __to,
+                                       char*        /* __to_end */,
+                                       char*&       __to_next) const
+{ __from_next = __from; __to_next   = __to; return noconv; }
+
+codecvt_base::result 
+codecvt<char, char, mbstate_t>::do_out(mbstate_t&   /* __state */,
+                                       const char*  __from,
+                                       const char*  /* __from_end */,
+                                       const char*& __from_next,
+                                       char*        __to,
+                                       char*        /* __to_limit */,
+                                       char*&       __to_next) const
+{ __from_next = __from; __to_next   = __to; return noconv; }
+
+
+# ifndef _STLP_NO_WCHAR_T
+//----------------------------------------------------------------------
+// codecvt<wchar_t, char, mbstate_t>
+
+codecvt<wchar_t, char, mbstate_t>::~codecvt() {}
+
+
+codecvt<wchar_t, char, mbstate_t>::result
+codecvt<wchar_t, char, mbstate_t>::do_out(state_type&         /* state */, 
+                                          const intern_type*  from,
+                                          const intern_type*  from_end,
+                                          const intern_type*& from_next,
+                                          extern_type*        to,
+                                          extern_type*        to_limit,
+                                          extern_type*&       to_next) const
+{
+  ptrdiff_t len = (min) (from_end - from, to_limit - to);
+  copy(from, from + len, to);
+  from_next = from + len;
+  to_next   = to   + len;
+  return ok;
+}
+
+codecvt<wchar_t, char, mbstate_t>::result
+codecvt<wchar_t, char, mbstate_t>::do_in (state_type&       /* state */,
+                                          const extern_type*  from,
+                                          const extern_type*  from_end,
+                                          const extern_type*& from_next,
+                                          intern_type*        to,
+                                          intern_type*        to_limit,
+                                          intern_type*&       to_next) const
+{
+  ptrdiff_t len = (min) (from_end - from, to_limit - to);
+  copy(from, from + len, to);
+  from_next = from + len;
+  to_next   = to   + len;
+  return ok;
+}
+
+codecvt<wchar_t, char, mbstate_t>::result
+codecvt<wchar_t, char, mbstate_t>::do_unshift(state_type&   /* state */,
+                                              extern_type*  to, 
+                                              extern_type*  ,
+                                              extern_type*& to_next) const
+{
+  to_next = to;
+  return noconv;
+}
+
+int codecvt<wchar_t, char, mbstate_t>::do_encoding() const _STLP_NOTHROW {
+  return 1;
+}
+
+
+bool codecvt<wchar_t, char, mbstate_t>::do_always_noconv() const _STLP_NOTHROW
+{
+  return true;
+}
+
+int codecvt<wchar_t, char, mbstate_t>::do_length(const  state_type&,
+                                                 const  extern_type* from, 
+                                                 const  extern_type* end,
+                                                 size_t mx) const 
+{
+  return (int)(min) ((size_t) (end - from), mx);
+}
+
+int codecvt<wchar_t, char, mbstate_t>::do_max_length() const _STLP_NOTHROW {
+  return 1;
+}
+# endif /* wchar_t */
+
+_STLP_END_NAMESPACE
+
+# endif /* _STLP_NO_MBSTATE_T */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/src/collate.cpp b/main/source/stlport/src/collate.cpp
new file mode 100644
index 00000000..f1e3c5a4
--- /dev/null
+++ b/main/source/stlport/src/collate.cpp
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+# include "stlport_prefix.h"
+
+#include "stl/_collate.h"
+
+_STLP_BEGIN_NAMESPACE
+
+// collate<char>
+
+collate<char>::~collate() {}
+
+int collate<char>::do_compare(const char* low1, const char* high1,
+                              const char* low2, const char* high2) const
+{
+  return __lexicographical_compare_3way(low1, high1, low2, high2);
+}
+
+string collate<char>::do_transform(const char* low, const char* high) const
+{
+  return string(low, high);
+}
+
+long collate<char>::do_hash(const char* low, const char* high) const {
+  unsigned long result = 0;
+  for ( ; low < high; ++low)
+    result = 5 * result + *low;
+  return result;
+}
+
+
+
+
+# ifndef _STLP_NO_WCHAR_T
+// collate<wchar_t>
+
+collate<wchar_t>::~collate() {}
+
+int
+collate<wchar_t>::do_compare(const wchar_t* low1, const wchar_t* high1,
+                             const wchar_t* low2, const wchar_t* high2) const
+{
+  return __lexicographical_compare_3way(low1, high1, low2, high2);
+}
+
+
+wstring
+collate<wchar_t>::do_transform(const wchar_t* low, const wchar_t* high) const
+{
+  return wstring(low, high);
+}
+
+long collate<wchar_t>::do_hash(const wchar_t* low, const wchar_t* high) const
+{
+  unsigned long result = 0;
+  for ( ; low < high; ++low)
+    result = 5 * result + *low;
+  return result;
+}
+# endif
+
+_STLP_END_NAMESPACE
+
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/src/common_macros.mak b/main/source/stlport/src/common_macros.mak
new file mode 100644
index 00000000..d316ae31
--- /dev/null
+++ b/main/source/stlport/src/common_macros.mak
@@ -0,0 +1,416 @@
+SHELL=/bin/sh
+
+#
+# Versioning
+#
+VERSION_MAJOR=4
+VERSION_MINOR=6
+
+# This one is not always present; it should be empty for release versions.
+# We do not assume any binary compatibility for betas.
+BETA_SUFFIX=
+
+VERSION_SUFFIX= .$(VERSION_MAJOR).$(VERSION_MINOR)$(BETA_SUFFIX)
+WIN_VERSION_SUFFIX= $(VERSION_MAJOR)$(VERSION_MINOR)$(BETA_SUFFIX)
+
+# DYNAMIC_SUFFIX= $(VERSION_SUFFIX)$(PATCH_SUFFIX)
+DYNAMIC_SUFFIX= $(VERSION_SUFFIX)
+WIN_DYNAMIC_SUFFIX= $(WIN_VERSION_SUFFIX)
+
+#
+#  Directories
+#
+#
+
+SRCDIR=.
+STLPORT_DIR=$(CUR_DIR)..$(PATH_SEP)stlport
+OUTDIR=$(CUR_DIR)..$(PATH_SEP)lib
+OBJDIR_COMMON=$(OUTDIR)$(PATH_SEP)obj
+OBJDIR=$(OUTDIR)$(PATH_SEP)obj$(PATH_SEP)$(COMP)
+
+RELEASE_OBJDIR_static=$(OBJDIR)$(PATH_SEP)Release
+DEBUG_OBJDIR_static=$(OBJDIR)$(PATH_SEP)Debug
+STLDEBUG_OBJDIR_static=$(OBJDIR)$(PATH_SEP)DebugSTL
+RELEASE_OBJDIR_staticx=$(OBJDIR)$(PATH_SEP)Releasex
+DEBUG_OBJDIR_staticx=$(OBJDIR)$(PATH_SEP)Debugx
+STLDEBUG_OBJDIR_staticx=$(OBJDIR)$(PATH_SEP)DebugSTLx
+RELEASE_OBJDIR_dynamic=$(OBJDIR)$(PATH_SEP)ReleaseD
+DEBUG_OBJDIR_dynamic=$(OBJDIR)$(PATH_SEP)DebugD
+STLDEBUG_OBJDIR_dynamic=$(OBJDIR)$(PATH_SEP)DebugSTLD
+
+#
+# By default on UNIX, STLport headers go into /usr/local/include/stlport,
+# and libraries go into /usr/local/lib. Please override any of them if desired. 
+#
+
+INSTALLDIR=/usr/local
+# INSTALLDIR=/tmp
+INSTALLDIR_INC=$(INSTALLDIR)/include/stlport
+INSTALLDIR_LIB=$(INSTALLDIR)/lib
+
+RM = rm -fr
+INSTALL = ./install.sh -c
+INSTALL_LIB = $(INSTALL)
+INSTALL_H = $(INSTALL) -m 444
+
+#
+#
+# Targets
+#
+
+RELEASE_NAME=$(LIB_BASENAME)
+DEBUG_NAME=$(LIB_BASENAME)_debug
+STLDEBUG_NAME=$(LIB_BASENAME)_stldebug
+
+RELEASE_DYNLIB=$(RELEASE_NAME).$(DYNEXT)$(DYNAMIC_SUFFIX)
+DEBUG_DYNLIB=$(DEBUG_NAME).$(DYNEXT)$(DYNAMIC_SUFFIX)
+STLDEBUG_DYNLIB=$(STLDEBUG_NAME).$(DYNEXT)$(DYNAMIC_SUFFIX)
+
+RELEASE_DYNLIB_SONAME=$(RELEASE_NAME).$(DYNEXT)$(VERSION_SUFFIX)
+DEBUG_DYNLIB_SONAME=$(DEBUG_NAME).$(DYNEXT)$(VERSION_SUFFIX)
+STLDEBUG_DYNLIB_SONAME=$(STLDEBUG_NAME).$(DYNEXT)$(VERSION_SUFFIX)
+
+RELEASE_LIB=$(RELEASE_NAME)$(STATIC_SUFFIX).$(STEXT)
+DEBUG_LIB=$(DEBUG_NAME)$(STATIC_SUFFIX).$(STEXT)
+STLDEBUG_LIB=$(STLDEBUG_NAME)$(STATIC_SUFFIX).$(STEXT)
+
+RELEASEX_LIB=$(RELEASE_NAME)$(STATIC_SUFFIX)x.$(STEXT)
+DEBUGX_LIB=$(DEBUG_NAME)$(STATIC_SUFFIX)x.$(STEXT)
+STLDEBUGX_LIB=$(STLDEBUG_NAME)$(STATIC_SUFFIX)x.$(STEXT)
+
+ALL_STATIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_LIB)
+DEBUG_STATIC_LIBS=$(ALL_STATIC_LIBS) $(OUTDIR)$(PATH_SEP)$(DEBUG_LIB)
+
+ALL_STATICX_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASEX_LIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUGX_LIB)
+DEBUG_STATICX_LIBS=$(ALL_STATICX_LIBS) $(OUTDIR)$(PATH_SEP)$(DEBUGX_LIB)
+
+ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB)
+DEBUG_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB)
+
+
+RELEASE_OBJECTS_static= \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)dll_main.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)fstream.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)strstream.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)sstream.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)ios.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)streambuf.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)istream.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)ostream.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)iostream.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)codecvt.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)collate.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)ctype.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)monetary.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)num_get.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)num_put.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)num_get_float.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)num_put_float.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)numpunct.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)time_facets.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)messages.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)locale_impl.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)locale.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)locale_catalog.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)facets_byname.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)c_locale.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)c_locale_stub.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)complex.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_exp.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_io.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_trig.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)complex_io_w.$(OBJEXT) \
+$(RELEASE_OBJDIR_static)$(PATH_SEP)string_w.$(OBJEXT)
+
+
+DEBUG_OBJECTS_static= \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)dll_main.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)fstream.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)strstream.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)sstream.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)ios.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)streambuf.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)istream.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)ostream.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)iostream.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)codecvt.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)collate.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)ctype.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)monetary.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)num_get.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)num_put.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)num_get_float.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)num_put_float.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)numpunct.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)time_facets.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)messages.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)locale_impl.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)locale.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)locale_catalog.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)facets_byname.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)c_locale.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)c_locale_stub.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)complex.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_exp.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_io.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_trig.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_io_w.$(OBJEXT) \
+$(DEBUG_OBJDIR_static)$(PATH_SEP)string_w.$(OBJEXT)
+
+STLDEBUG_OBJECTS_static= \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)dll_main.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)fstream.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)strstream.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)sstream.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)ios.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)streambuf.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)istream.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)ostream.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)iostream.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)codecvt.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)collate.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)ctype.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)monetary.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_get.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_put.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_get_float.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_put_float.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)numpunct.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)time_facets.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)messages.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)locale_impl.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)locale.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)locale_catalog.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)facets_byname.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)c_locale.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)c_locale_stub.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_exp.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_io.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_trig.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_io_w.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_static)$(PATH_SEP)string_w.$(OBJEXT)
+
+###########################################################
+
+RELEASE_OBJECTS_staticx= \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)dll_main.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)fstream.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)strstream.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)sstream.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)ios.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)streambuf.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)istream.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)ostream.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)iostream.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)codecvt.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)collate.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)ctype.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)monetary.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)num_get.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)num_put.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)num_get_float.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)num_put_float.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)numpunct.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)time_facets.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)messages.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)locale_impl.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)locale.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)locale_catalog.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)facets_byname.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)c_locale.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)c_locale_stub.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)complex.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)complex_exp.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)complex_io.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)complex_trig.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)complex_io_w.$(OBJEXT) \
+$(RELEASE_OBJDIR_staticx)$(PATH_SEP)string_w.$(OBJEXT)
+
+
+DEBUG_OBJECTS_staticx= \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)dll_main.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)fstream.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)strstream.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)sstream.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)ios.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)streambuf.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)istream.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)ostream.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)iostream.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)codecvt.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)collate.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)ctype.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)monetary.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)num_get.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)num_put.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)num_get_float.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)num_put_float.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)numpunct.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)time_facets.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)messages.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)locale_impl.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)locale.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)locale_catalog.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)facets_byname.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)c_locale.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)c_locale_stub.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)complex.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)complex_exp.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)complex_io.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)complex_trig.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)complex_io_w.$(OBJEXT) \
+$(DEBUG_OBJDIR_staticx)$(PATH_SEP)string_w.$(OBJEXT)
+
+STLDEBUG_OBJECTS_staticx= \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)dll_main.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)fstream.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)strstream.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)sstream.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)ios.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)streambuf.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)istream.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)ostream.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)iostream.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)codecvt.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)collate.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)ctype.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)monetary.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)num_get.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)num_put.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)num_get_float.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)num_put_float.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)numpunct.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)time_facets.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)messages.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)locale_impl.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)locale.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)locale_catalog.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)facets_byname.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)c_locale.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)c_locale_stub.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)complex.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)complex_exp.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)complex_io.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)complex_trig.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)complex_io_w.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)string_w.$(OBJEXT)
+
+
+###########################################################
+
+RELEASE_OBJECTS_dynamic= \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)dll_main.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)fstream.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)strstream.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)sstream.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)ios.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)streambuf.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)istream.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)ostream.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)iostream.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)codecvt.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)collate.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)ctype.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)monetary.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)num_get.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)num_put.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)num_get_float.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)num_put_float.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)numpunct.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)time_facets.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)messages.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)locale_impl.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)locale.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)locale_catalog.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)facets_byname.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)c_locale.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)c_locale_stub.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)complex.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)complex_exp.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)complex_io.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)complex_trig.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)complex_io_w.$(OBJEXT) \
+$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)string_w.$(OBJEXT) \
+$(RESFILE)
+
+DEBUG_OBJECTS_dynamic= \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)dll_main.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)fstream.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)strstream.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)sstream.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)ios.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)streambuf.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)istream.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)ostream.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)iostream.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)codecvt.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)collate.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)ctype.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)monetary.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)num_get.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)num_put.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)num_get_float.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)num_put_float.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)numpunct.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)time_facets.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)messages.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)locale_impl.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)locale.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)locale_catalog.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)facets_byname.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)c_locale.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)c_locale_stub.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)complex.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)complex_exp.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)complex_io.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)complex_trig.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)complex_io_w.$(OBJEXT) \
+$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)string_w.$(OBJEXT) \
+$(RESFILE_debug)
+
+STLDEBUG_OBJECTS_dynamic= \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)dll_main.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)fstream.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)strstream.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)sstream.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)ios.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)streambuf.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)istream.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)ostream.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)iostream.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)codecvt.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)collate.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)ctype.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)monetary.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)num_get.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)num_put.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)num_get_float.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)num_put_float.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)numpunct.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)time_facets.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)messages.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)locale_impl.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)locale.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)locale_catalog.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)facets_byname.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)c_locale.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)c_locale_stub.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)complex.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)complex_exp.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)complex_io.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)complex_trig.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)complex_io_w.$(OBJEXT) \
+$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)string_w.$(OBJEXT) \
+$(RESFILE_stldebug)
+
+
diff --git a/main/source/stlport/src/common_macros_windows.mak b/main/source/stlport/src/common_macros_windows.mak
new file mode 100644
index 00000000..e1cc3fc0
--- /dev/null
+++ b/main/source/stlport/src/common_macros_windows.mak
@@ -0,0 +1,30 @@
+SHELL=/bin/sh
+
+!include common_macros.mak
+
+# INSTALLDIR=/usr/local
+# INSTALLDIR_INC=$(INSTALLDIR)/include/stlport
+# INSTALLDIR_LIB=$(INSTALLDIR)/lib
+
+# RM = rm -fr
+
+# INSTALL = ./install.sh -c
+# INSTALL_LIB = $(INSTALL)
+# INSTALL_H = $(INSTALL) -m 444
+
+#
+#
+# Targets
+#
+
+# those are defined "Unix way" in common_macros.mak; redefine them here
+RELEASE_DYNLIB=$(RELEASE_NAME)$(WIN_DYNAMIC_SUFFIX).$(DYNEXT)
+DEBUG_DYNLIB=$(DEBUG_NAME)$(WIN_DYNAMIC_SUFFIX).$(DYNEXT)
+STLDEBUG_DYNLIB=$(STLDEBUG_NAME)$(WIN_DYNAMIC_SUFFIX).$(DYNEXT)
+
+RELEASE_DYNLIB_SONAME=$(RELEASE_NAME)$(WIN_VERSION_SUFFIX).$(DYNEXT)
+DEBUG_DYNLIB_SONAME=$(DEBUG_NAME)$(WIN_VERSION_SUFFIX).$(DYNEXT)
+STLDEBUG_DYNLIB_SONAME=$(STLDEBUG_NAME)$(WIN_VERSION_SUFFIX).$(DYNEXT)
+
+ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB)
+DEBUG_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB)
diff --git a/main/source/stlport/src/common_percent_rules.mak b/main/source/stlport/src/common_percent_rules.mak
new file mode 100644
index 00000000..14f41e4a
--- /dev/null
+++ b/main/source/stlport/src/common_percent_rules.mak
@@ -0,0 +1,46 @@
+
+.SUFFIXES: .cpp .c .o .so .a
+
+$(RELEASE_OBJDIR_static)/%.o: %.cpp
+	$(CXX) $(CXXFLAGS_RELEASE_static) $< -c -o $@
+$(RELEASE_OBJDIR_static)/%.o: %.c
+	$(CC) $(CXXFLAGS_RELEASE_static) $< -c -o $@
+$(RELEASE_OBJDIR_static)/%.i : %.cpp
+	$(CXX) $(CXXFLAGS_RELEASE_static) $< -E  $@
+
+$(RELEASE_OBJDIR_dynamic)/%.o : %.cpp
+	$(CXX) $(CXXFLAGS_RELEASE_dynamic) $< -c -o $@
+$(RELEASE_OBJDIR_dynamic)/%.o : %.c
+	$(CC) $(CXXFLAGS_RELEASE_dynamic) $< -c -o $@
+$(RELEASE_OBJDIR_dynamic)/%.i : %.cpp
+	$(CXX) $(CXXFLAGS_RELEASE_dynamic) $< -E  $@
+
+$(DEBUG_OBJDIR_static)/%.o : %.cpp
+	$(CXX) $(CXXFLAGS_DEBUG_static) $< -c -o $@
+$(DEBUG_OBJDIR_static)/%.o : %.c
+	$(CC) $(CXXFLAGS_DEBUG_static) $< -c -o $@
+$(DEBUG_OBJDIR_static)/%.i : %.cpp
+	$(CXX) $(CXXFLAGS_DEBUG_static) $< -E  $@
+
+$(DEBUG_OBJDIR_dynamic)/%.o : %.cpp
+	$(CXX) $(CXXFLAGS_DEBUG_dynamic) $< -c -o $@
+$(DEBUG_OBJDIR_dynamic)/%.o : %.c
+	$(CC) $(CXXFLAGS_DEBUG_dynamic) $< -c -o $@
+$(DEBUG_OBJDIR_dynamic)/%.i : %.cpp
+	$(CXX) $(CXXFLAGS_DEBUG_dynamic) $< -E  $@
+
+$(STLDEBUG_OBJDIR_static)/%.o : %.cpp
+	$(CXX) $(CXXFLAGS_STLDEBUG_static) $< -c -o $@
+$(STLDEBUG_OBJDIR_static)/%.o : %.c
+	$(CC) $(CXXFLAGS_STLDEBUG_static) $< -c -o $@
+$(STLDEBUG_OBJDIR_static)/%.i : %.cpp
+	$(CXX) $(CXXFLAGS_STLDEBUG_static) $< -E  $@
+
+$(STLDEBUG_OBJDIR_dynamic)/%.o : %.cpp
+	$(CXX) $(CXXFLAGS_STLDEBUG_dynamic) $< -c -o $@
+$(STLDEBUG_OBJDIR_dynamic)/%.o : %.c
+	$(CC) $(CXXFLAGS_STLDEBUG_dynamic) $< -c -o $@
+$(STLDEBUG_OBJDIR_dynamic)/%.i : %.cpp
+	$(CXX) $(CXXFLAGS_STLDEBUG_dynamic) $< -E  $@
+
+
diff --git a/main/source/stlport/src/common_rules.mak b/main/source/stlport/src/common_rules.mak
new file mode 100644
index 00000000..533ea99b
--- /dev/null
+++ b/main/source/stlport/src/common_rules.mak
@@ -0,0 +1,160 @@
+#
+#  Target directories
+#
+#
+
+$(OUTDIR) :
+	$(MKDIR) $(OUTDIR)
+$(RELEASE_OBJDIR_dynamic) :
+	$(MKDIR) $(RELEASE_OBJDIR_dynamic)
+$(DEBUG_OBJDIR_dynamic) :
+	$(MKDIR) $(DEBUG_OBJDIR_dynamic)
+$(STLDEBUG_OBJDIR_dynamic) :
+	$(MKDIR) $(STLDEBUG_OBJDIR_dynamic)
+$(RELEASE_OBJDIR_static) :
+	$(MKDIR) $(RELEASE_OBJDIR_static)
+$(DEBUG_OBJDIR_static) :
+	$(MKDIR) $(DEBUG_OBJDIR_static)
+$(STLDEBUG_OBJDIR_static) :
+	$(MKDIR) $(STLDEBUG_OBJDIR_static)
+$(RELEASE_OBJDIR_staticx) :
+	$(MKDIR) $(RELEASE_OBJDIR_staticx)
+$(DEBUG_OBJDIR_staticx) :
+	$(MKDIR) $(DEBUG_OBJDIR_staticx)
+$(STLDEBUG_OBJDIR_staticx) :
+	$(MKDIR) $(STLDEBUG_OBJDIR_staticx)
+
+#create a compiler platform directory
+platform: $(PREPARE_STEP)
+	-@$(MKDIR) $(OUTDIR)
+	-@$(MKDIR) $(OBJDIR_COMMON)
+	-@$(MKDIR) $(OBJDIR)
+
+prepare: $(PREPARE_STEP)
+	@echo "STLport installation is prepared for use in-place. No iostreams are built yet !"
+	@echo "To build and use STLport iostreams, please do : make -f <this makefile> all."
+	@echo "To install STLport in a designated directory, please do : make -f <this makefile> install."
+
+clean_all_obj:
+	-$(RM) $(OUTDIR)$(PATH_SEP)obj
+
+######   Targets ##################
+
+all_static :   platform $(ALL_STATIC_LIBS)
+
+all_dynamic :  platform $(ALL_DYNAMIC_LIBS)
+
+all_staticx :	platform $(ALL_STATICX_LIBS) 
+
+release_static :  platform $(OUTDIR)$(PATH_SEP)$(RELEASE_LIB)
+
+debug_static :  platform $(OUTDIR)$(PATH_SEP)$(DEBUG_LIB)
+
+stldebug_static :  platform $(OUTDIR)$(PATH_SEP)$(STLDEBUG_LIB)
+
+release_staticx :  platform $(OUTDIR)$(PATH_SEP)$(RELEASEX_LIB)
+ 
+debug_staticx :  platform $(OUTDIR)$(PATH_SEP)$(DEBUGX_LIB)
+
+stldebug_staticx :  platform $(OUTDIR)$(PATH_SEP)$(STLDEBUGX_LIB)
+
+release_dynamic :  platform $(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB)
+
+debug_dynamic :  platform $(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB)
+
+stldebug_dynamic :  platform $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB)
+
+install :  all $(INSTALL_STEP)
+
+clean : $(CLEAN_SPECIFIC)
+	-$(RM) $(RELEASE_OBJDIR_static) $(DEBUG_OBJDIR_static) $(STLDEBUG_OBJDIR_static) \
+        $(RELEASE_OBJDIR_staticx) $(DEBUG_OBJDIR_staticx) $(STLDEBUG_OBJDIR_staticx) \
+        $(RELEASE_OBJDIR_dynamic) $(DEBUG_OBJDIR_dynamic) $(STLDEBUG_OBJDIR_dynamic) \
+        $(OUTDIR)$(PATH_SEP)SunWS_cache SunWS_cache $(OUTDIR)$(PATH_SEP)Templates.DB Templates.DB tempinc
+
+clobber : clean clean_all_obj
+	-$(RM) $(OUTDIR)$(PATH_SEP)$(DEBUG_NAME).* \
+               $(OUTDIR)$(PATH_SEP)$(RELEASE_NAME).* $(OUTDIR)$(PATH_SEP)$(STLDEBUG_NAME).*
+
+HEADER_DIRS1 = . using wrap_std old_hp
+HEADER_DIRS2 = config stl stl/debug stl/wrappers using/h  wrap_std/h
+
+symbolic_links :
+	$(RM) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT)
+	$(RM) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
+	$(RM) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
+	ln -s $(RELEASE_DYNLIB) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT)
+	-ln -s $(DEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
+	ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
+
+install_unix :
+	-$(RM) $(INSTALLDIR_INC)
+	for dir in $(HEADER_DIRS1); \
+	do \
+	  ./mkinstalldirs $(INSTALLDIR_INC)/$$dir; \
+	  for file in `cat ../stlport/$$dir/export`; \
+	  do \
+		$(INSTALL_H) ../stlport/$$dir/$$file $(INSTALLDIR_INC)/$$dir ; \
+          done \
+	done
+	for dir in $(HEADER_DIRS2); \
+	do \
+	  ./mkinstalldirs $(INSTALLDIR_INC)/$$dir; \
+	  for file in `ls ../stlport/$$dir/*.*`; \
+	  do \
+		$(INSTALL_H) $$file $(INSTALLDIR_INC)/$$dir ; \
+          done \
+	done
+	./mkinstalldirs $(INSTALLDIR_LIB)
+	for file in `ls $(OUTDIR)/$(LIB_BASENAME)*`; \
+	do \
+         $(RM)  $(INSTALLDIR_LIB)/$$file; \
+	 $(INSTALL_LIB)  $$file $(INSTALLDIR_LIB); \
+	done
+	$(RM) $(INSTALLDIR_LIB)/$(RELEASE_NAME).$(DYNEXT)
+	$(RM) $(INSTALLDIR_LIB)/$(STLDEBUG_NAME).$(DYNEXT)
+	ln -s $(RELEASE_DYNLIB) $(INSTALLDIR_LIB)/$(RELEASE_NAME).$(DYNEXT)
+	ln -s $(STLDEBUG_DYNLIB) $(INSTALLDIR_LIB)/$(STLDEBUG_NAME).$(DYNEXT)
+
+#	ln -s $(INSTALLDIR_LIB)/$(RELEASE_DYNLIB) $(INSTALLDIR_LIB)/$(RELEASE_NAME).$(DYNEXT)
+#	ln -s $(INSTALLDIR_LIB)/$(STLDEBUG_DYNLIB) $(INSTALLDIR_LIB)/$(STLDEBUG_NAME).$(DYNEXT)
+
+install_sun : install_unix
+	  for file in `cat ../stlport/$$dir/export.sun`; \
+	  do \
+		$(INSTALL_H) ../stlport/$$dir/$$file $(INSTALLDIR_INC)/$$dir ; \
+          done
+
+$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) : $(OUTDIR) $(RELEASE_OBJDIR_dynamic) $(DEF_FILE) $(RELEASE_OBJECTS_dynamic)
+	$(DYN_LINK) $(DYNLINK_OUT)$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(LDFLAGS_RELEASE_dynamic) $(RELEASE_OBJECTS_dynamic) $(LDLIBS_RELEASE_dynamic) 
+
+$(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) : $(OUTDIR) $(RELEASE_OBJDIR_static) $(DEF_FILE) $(RELEASE_OBJECTS_static)
+	$(LINK) $(LINK_OUT)$(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) $(LDFLAGS_RELEASE_static) $(RELEASE_OBJECTS_static) $(LDLIBS_RELEASE_static)
+
+$(OUTDIR)$(PATH_SEP)$(RELEASEX_LIB) : $(OUTDIR) $(RELEASE_OBJDIR_staticx) $(DEF_FILE) $(RELEASE_OBJECTS_staticx)
+	$(LINK) $(LINK_OUT)$(OUTDIR)$(PATH_SEP)$(RELEASEX_LIB) $(LDFLAGS_RELEASE_static) $(RELEASE_OBJECTS_staticx) $(LDLIBS_RELEASE_static)
+
+$(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB) : $(OUTDIR) $(DEBUG_OBJDIR_dynamic) $(DEF_FILE) $(DEBUG_OBJECTS_dynamic)
+	$(DYN_LINK) $(DYNLINK_OUT)$(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB) $(LDFLAGS_DEBUG_dynamic) $(DEBUG_OBJECTS_dynamic) $(LDLIBS_DEBUG_dynamic) 
+
+$(OUTDIR)$(PATH_SEP)$(DEBUG_LIB) : $(OUTDIR) $(DEBUG_OBJDIR_static) $(DEF_FILE) $(DEBUG_OBJECTS_static)
+	$(LINK) $(LINK_OUT)$(OUTDIR)$(PATH_SEP)$(DEBUG_LIB) $(LDLIBS_DEBUG_static) $(LDFLAGS_DEBUG_static) $(DEBUG_OBJECTS_static)  
+
+$(OUTDIR)$(PATH_SEP)$(DEBUGX_LIB) : $(OUTDIR) $(DEBUG_OBJDIR_staticx) $(DEF_FILE) $(DEBUG_OBJECTS_staticx)
+	$(LINK) $(LINK_OUT)$(OUTDIR)$(PATH_SEP)$(DEBUGX_LIB) $(LDLIBS_DEBUG_static) $(LDFLAGS_DEBUG_static) $(DEBUG_OBJECTS_staticx)
+
+$(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB) : $(OUTDIR) $(STLDEBUG_OBJDIR_dynamic) $(DEF_FILE) $(STLDEBUG_OBJECTS_dynamic)
+	$(DYN_LINK) $(DYNLINK_OUT)$(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB) $(LDFLAGS_STLDEBUG_dynamic) $(STLDEBUG_OBJECTS_dynamic) $(LDLIBS_STLDEBUG_dynamic)
+
+$(OUTDIR)$(PATH_SEP)$(STLDEBUG_LIB) : $(OUTDIR) $(STLDEBUG_OBJDIR_static) $(DEF_FILE) $(STLDEBUG_OBJECTS_static)
+	$(LINK) $(LINK_OUT)$(OUTDIR)$(PATH_SEP)$(STLDEBUG_LIB) $(LDFLAGS_STLDEBUG_static) $(STLDEBUG_OBJECTS_static)  $(LDLIBS_STLDEBUG_static)
+
+$(OUTDIR)$(PATH_SEP)$(STLDEBUGX_LIB) : $(OUTDIR) $(STLDEBUG_OBJDIR_staticx) $(DEF_FILE) $(STLDEBUG_OBJECTS_staticx)
+	$(LINK) $(LINK_OUT)$(OUTDIR)$(PATH_SEP)$(STLDEBUGX_LIB) $(LDFLAGS_STLDEBUG_static) $(STLDEBUG_OBJECTS_staticx)  $(LDLIBS_STLDEBUG_static)
+
+# locale_impl.cpp : codecvt.cpp collate.cpp ctype.cpp monetary.cpp num_get.cpp num_get_float.cpp num_put.cpp num_put_float.cpp numpunct.cpp time_facets.cpp messages.cpp
+
+# locale_catalog.cpp : ctype_byname.cpp collate_byname.cpp codecvt_byname.cpp numpunct_byname.cpp monetary_byname.cpp messages_byname.cpp
+
+
+#########################################
diff --git a/main/source/stlport/src/como.mak b/main/source/stlport/src/como.mak
new file mode 100644
index 00000000..76f10ca1
--- /dev/null
+++ b/main/source/stlport/src/como.mak
@@ -0,0 +1,53 @@
+#
+# Note : this makefile has been only tested in como + gcc setup
+#
+
+#
+# compiler
+#
+CC = gcc
+CXX = como
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_como
+
+#
+# guts for common stuff
+#
+#
+LINK=ar cr
+# 2.95 flag
+DYN_LINK=-copt="-shared -all" -G -o 
+
+OBJEXT=o
+DYNEXT=so
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=COMO_$(ARCH)
+INSTALL_STEP = install_unix 
+
+all: all_static symbolic_links 
+
+include common_macros.mak
+
+WARNING_FLAGS=  -DLIBCIO= --diag_suppress=68
+
+CXXFLAGS_COMMON = -I. -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -O
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -O -fPIC
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+
+include common_percent_rules.mak
+include common_rules.mak
+
+
diff --git a/main/source/stlport/src/complex.cpp b/main/source/stlport/src/complex.cpp
new file mode 100644
index 00000000..9c844224
--- /dev/null
+++ b/main/source/stlport/src/complex.cpp
@@ -0,0 +1,290 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+# include "stlport_prefix.h"
+// Complex division and square roots.
+
+#include "complex_impl.h"
+
+_STLP_BEGIN_NAMESPACE
+
+// Absolute value
+_STLP_TEMPLATE_NULL
+_STLP_DECLSPEC float _STLP_CALL abs(const complex<float>& __z)
+{
+  return _STLP_HYPOTF(__z._M_re, __z._M_im);
+}
+_STLP_TEMPLATE_NULL
+_STLP_DECLSPEC double _STLP_CALL abs(const complex<double>& __z)
+{
+  return _STLP_HYPOT(__z._M_re, __z._M_im);
+}
+
+#ifndef _STLP_NO_LONG_DOUBLE
+_STLP_TEMPLATE_NULL
+_STLP_DECLSPEC long double _STLP_CALL abs(const complex<long double>& __z)
+{
+  return _STLP_HYPOTL(__z._M_re, __z._M_im);
+}
+#endif
+
+// Phase
+
+_STLP_TEMPLATE_NULL 
+_STLP_DECLSPEC float _STLP_CALL arg(const complex<float>& __z) 
+{
+  return _STLP_ATAN2F(__z._M_im, __z._M_re);
+}
+
+_STLP_TEMPLATE_NULL 
+_STLP_DECLSPEC double _STLP_CALL arg(const complex<double>& __z) 
+{
+  return _STLP_ATAN2(__z._M_im, __z._M_re);
+}
+
+#ifndef _STLP_NO_LONG_DOUBLE
+_STLP_TEMPLATE_NULL
+_STLP_DECLSPEC long double _STLP_CALL arg(const complex<long double>& __z) 
+{
+  return _STLP_ATAN2L(__z._M_im, __z._M_re);
+}
+#endif
+
+// Construct a complex number from polar representation
+_STLP_TEMPLATE_NULL
+_STLP_DECLSPEC complex<float> _STLP_CALL polar(const float& __rho, const float& __phi) 
+{
+  return complex<float>(__rho * _STLP_COSF(__phi), __rho * _STLP_SINF(__phi));
+}
+_STLP_TEMPLATE_NULL
+_STLP_DECLSPEC complex<double> _STLP_CALL polar(const double& __rho, const double& __phi) 
+{
+  return complex<double>(__rho * _STLP_COS(__phi), __rho * _STLP_SIN(__phi));
+}
+
+#ifndef _STLP_NO_LONG_DOUBLE
+_STLP_TEMPLATE_NULL 
+_STLP_DECLSPEC complex<long double> _STLP_CALL polar(const long double& __rho, const long double& __phi)
+{
+  return complex<long double>(__rho * _STLP_COSL(__phi), __rho * _STLP_SINL(__phi));
+}
+#endif
+
+// Division
+
+void  _STLP_CALL
+complex<float>::_div(const float& __z1_r, const float& __z1_i,
+		     const float& __z2_r, const float& __z2_i,
+		     float& __res_r, float& __res_i) {
+  float __ar = __z2_r >= 0 ? __z2_r : -__z2_r;
+  float __ai = __z2_i >= 0 ? __z2_i : -__z2_i;
+
+  if (__ar <= __ai) {
+    float __ratio = __z2_r / __z2_i;
+    float __denom = __z2_i * (1 + __ratio * __ratio);
+    __res_r = (__z1_r * __ratio + __z1_i) / __denom;
+    __res_i = (__z1_i * __ratio - __z1_r) / __denom;
+  }
+  else {
+    float __ratio = __z2_i / __z2_r;
+    float __denom = __z2_r * (1 + __ratio * __ratio);
+    __res_r = (__z1_r + __z1_i * __ratio) / __denom;
+    __res_i = (__z1_i - __z1_r * __ratio) / __denom;
+  }
+}
+
+void  _STLP_CALL
+complex<float>::_div(const float& __z1_r,
+                     const float& __z2_r, const float& __z2_i,
+                     float& __res_r, float& __res_i) {
+  float __ar = __z2_r >= 0 ? __z2_r : -__z2_r;
+  float __ai = __z2_i >= 0 ? __z2_i : -__z2_i;
+
+  if (__ar <= __ai) {
+    float __ratio = __z2_r / __z2_i;
+    float __denom = __z2_i * (1 + __ratio * __ratio);
+    __res_r = (__z1_r * __ratio) / __denom;
+    __res_i = - __z1_r / __denom;
+  }
+  else {
+    float __ratio = __z2_i / __z2_r;
+    float __denom = __z2_r * (1 + __ratio * __ratio);
+    __res_r = __z1_r / __denom;
+    __res_i = - (__z1_r * __ratio) / __denom;
+  }
+}
+
+
+void  _STLP_CALL
+complex<double>::_div(const double& __z1_r, const double& __z1_i,
+                      const double& __z2_r, const double& __z2_i,
+                      double& __res_r, double& __res_i) {
+  double __ar = __z2_r >= 0 ? __z2_r : -__z2_r;
+  double __ai = __z2_i >= 0 ? __z2_i : -__z2_i;
+
+  if (__ar <= __ai) {
+    double __ratio = __z2_r / __z2_i;
+    double __denom = __z2_i * (1 + __ratio * __ratio);
+    __res_r = (__z1_r * __ratio + __z1_i) / __denom;
+    __res_i = (__z1_i * __ratio - __z1_r) / __denom;
+  }
+  else {
+    double __ratio = __z2_i / __z2_r;
+    double __denom = __z2_r * (1 + __ratio * __ratio);
+    __res_r = (__z1_r + __z1_i * __ratio) / __denom;
+    __res_i = (__z1_i - __z1_r * __ratio) / __denom;
+  }
+}
+
+void _STLP_CALL
+complex<double>::_div(const double& __z1_r,
+                      const double& __z2_r, const double& __z2_i,
+                      double& __res_r, double& __res_i) {
+  double __ar = __z2_r >= 0 ? __z2_r : -__z2_r;
+  double __ai = __z2_i >= 0 ? __z2_i : -__z2_i;
+
+  if (__ar <= __ai) {
+    double __ratio = __z2_r / __z2_i;
+    double __denom = __z2_i * (1 + __ratio * __ratio);
+    __res_r = (__z1_r * __ratio) / __denom;
+    __res_i = - __z1_r / __denom;
+  }
+  else {
+    double __ratio = __z2_i / __z2_r;
+    double __denom = __z2_r * (1 + __ratio * __ratio);
+    __res_r = __z1_r / __denom;
+    __res_i = - (__z1_r * __ratio) / __denom;
+  }
+}
+
+#ifndef _STLP_NO_LONG_DOUBLE
+void  _STLP_CALL
+complex<long double>::_div(const long double& __z1_r, const long double& __z1_i,
+                           const long double& __z2_r, const long double& __z2_i,
+                           long double& __res_r, long double& __res_i) {
+  long double __ar = __z2_r >= 0 ? __z2_r : -__z2_r;
+  long double __ai = __z2_i >= 0 ? __z2_i : -__z2_i;
+
+  if (__ar <= __ai) {
+    long double __ratio = __z2_r / __z2_i;
+    long double __denom = __z2_i * (1 + __ratio * __ratio);
+    __res_r = (__z1_r * __ratio + __z1_i) / __denom;
+    __res_i = (__z1_i * __ratio - __z1_r) / __denom;
+  }
+  else {
+    long double __ratio = __z2_i / __z2_r;
+    long double __denom = __z2_r * (1 + __ratio * __ratio);
+    __res_r = (__z1_r + __z1_i * __ratio) / __denom;
+    __res_i = (__z1_i - __z1_r * __ratio) / __denom;
+  }
+}
+
+
+void _STLP_CALL
+complex<long double>::_div(const long double& __z1_r,
+                           const long double& __z2_r, const long double& __z2_i,
+                           long double& __res_r, long double& __res_i) {
+  long double __ar = __z2_r >= 0 ? __z2_r : -__z2_r;
+  long double __ai = __z2_i >= 0 ? __z2_i : -__z2_i;
+
+  if (__ar <= __ai) {
+    long double __ratio = __z2_r / __z2_i;
+    long double __denom = __z2_i * (1 + __ratio * __ratio);
+    __res_r = (__z1_r * __ratio) / __denom;
+    __res_i = - __z1_r / __denom;
+  }
+  else {
+    long double __ratio = __z2_i / __z2_r;
+    long double __denom = __z2_r * (1 + __ratio * __ratio);
+    __res_r = __z1_r / __denom;
+    __res_i = - (__z1_r * __ratio) / __denom;
+  }
+}
+#endif
+
+//----------------------------------------------------------------------
+// Square root
+
+
+complex<float> _STLP_CALL
+sqrt(const complex<float>& z) {
+  float re = z._M_re;
+  float im = z._M_im;
+  float mag = _STLP_HYPOTF(re, im);
+  complex<float> result;
+
+  if (mag == 0.) {
+    result._M_re = result._M_im = 0.f;
+  } else if (re > 0.f) {
+    result._M_re = _STLP_SQRTF(0.5f * (mag + re));
+    result._M_im = im/result._M_re/2.f;
+  } else {
+    result._M_im = _STLP_SQRTF(0.5f * (mag - re));
+    if (im < 0.f)
+      result._M_im = - result._M_im;
+    result._M_re = im/result._M_im/2.f;
+  }
+  return result;
+}
+
+
+complex<double>  _STLP_CALL
+sqrt(const complex<double>& z) {
+  double re = z._M_re;
+  double im = z._M_im;
+  double mag = _STLP_HYPOT(re, im);
+  complex<double> result;
+
+  if (mag == 0.) {
+    result._M_re = result._M_im = 0.;
+  } else if (re > 0.) {
+    result._M_re = _STLP_SQRT(0.5 * (mag + re));
+    result._M_im = im/result._M_re/2;
+  } else {
+    result._M_im = _STLP_SQRT(0.5 * (mag - re));
+    if (im < 0.)
+      result._M_im = - result._M_im;
+    result._M_re = im/result._M_im/2;
+  }
+  return result;
+}
+
+#ifndef _STLP_NO_LONG_DOUBLE
+complex<long double> _STLP_CALL
+sqrt(const complex<long double>& z) {
+  long double re = z._M_re;
+  long double im = z._M_im;
+  long double mag = _STLP_HYPOTL(re, im);
+  complex<long double> result;
+
+  if (mag == 0.L) {
+    result._M_re = result._M_im = 0.L;
+  } else if (re > 0.L) {
+    result._M_re = _STLP_SQRTL(0.5L * (mag + re));
+    result._M_im = (im/result._M_re) * .5L;
+  } else {
+    result._M_im = _STLP_SQRTL(0.5L * (mag - re));
+    if (im < 0.L)
+      result._M_im = - result._M_im;
+    result._M_re = (im/result._M_im) * .5L;
+  }
+  return result;
+}
+#endif
+
+_STLP_END_NAMESPACE
+
diff --git a/main/source/stlport/src/complex_exp.cpp b/main/source/stlport/src/complex_exp.cpp
new file mode 100644
index 00000000..fd8805a6
--- /dev/null
+++ b/main/source/stlport/src/complex_exp.cpp
@@ -0,0 +1,239 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+# include "stlport_prefix.h"
+// exp, log, pow for complex<float>, complex<double>, and complex<long double>
+
+#include <numeric>
+#include "complex_impl.h"
+
+_STLP_BEGIN_NAMESPACE
+
+//----------------------------------------------------------------------
+// exp
+
+_STLP_DECLSPEC complex<float>  _STLP_CALL
+exp(const complex<float>& z)
+{
+  float expx = _STLP_EXPF(z._M_re);
+  return complex<float>(expx * _STLP_COSF(z._M_im),
+                        expx * _STLP_SINF(z._M_im));
+}
+
+_STLP_DECLSPEC complex<double> _STLP_CALL exp(const complex<double>& z)
+{
+  double expx = _STLP_EXP(z._M_re);
+  return complex<double>(expx * _STLP_COS(z._M_im),
+                         expx * _STLP_SIN(z._M_im));
+}
+
+# ifndef _STLP_NO_LONG_DOUBLE
+_STLP_DECLSPEC complex<long double> _STLP_CALL exp(const complex<long double>& z)
+{
+  long double expx = _STLP_EXPL(z._M_re);
+  return complex<long double>(expx * _STLP_COSL(z._M_im),
+                              expx * _STLP_SINL(z._M_im));
+}
+# endif
+
+//----------------------------------------------------------------------
+// log10
+
+_STLP_DECLSPEC complex<float> _STLP_CALL log10(const complex<float>& z)
+{
+  complex<float> r;
+  static float ln10_inv = 1.f / _STLP_LOGF(10.f);
+
+  r._M_im = _STLP_ATAN2F(z._M_im, z._M_re) * ln10_inv;
+  r._M_re = _STLP_LOG10F(_STLP_HYPOTF(z._M_re, z._M_im));
+  return r;
+}
+
+_STLP_DECLSPEC complex<double> _STLP_CALL log10(const complex<double>& z)
+{
+  complex<double> r;
+  static double ln10_inv = 1. / _STLP_LOG(10.);
+
+  r._M_im = _STLP_ATAN2(z._M_im, z._M_re) * ln10_inv;
+  r._M_re = _STLP_LOG10(_STLP_HYPOT(z._M_re, z._M_im));
+  return r;
+}
+
+#ifndef _STLP_NO_LONG_DOUBLE
+_STLP_DECLSPEC complex<long double> _STLP_CALL log10(const complex<long double>& z)
+{
+  complex<long double> result;
+  static long double ln10_inv = 1.l / _STLP_LOGL(10.l);
+
+  result._M_im = _STLP_ATAN2L(z._M_im, z._M_re) * ln10_inv;
+  result._M_re = _STLP_LOG10L(_STLP_HYPOTL(z._M_re, z._M_im));
+  return result;
+}
+# endif
+
+//----------------------------------------------------------------------
+// log
+
+_STLP_DECLSPEC complex<float> _STLP_CALL log(const complex<float>& z)
+{
+  complex<float> r;
+
+  r._M_im = _STLP_ATAN2F(z._M_im, z._M_re);
+  r._M_re = _STLP_LOGF(_STLP_HYPOTF(z._M_re, z._M_im));
+  return r;
+}
+
+_STLP_DECLSPEC complex<double> _STLP_CALL log(const complex<double>& z)
+{
+  complex<double> r;
+
+  r._M_im = _STLP_ATAN2(z._M_im, z._M_re);
+  r._M_re = _STLP_LOG(_STLP_HYPOT(z._M_re, z._M_im));
+  return r;
+}
+
+#ifndef _STLP_NO_LONG_DOUBLE
+_STLP_DECLSPEC complex<long double> _STLP_CALL log(const complex<long double>& z)
+{
+  complex<long double> result;
+
+  result._M_im = _STLP_ATAN2L(z._M_im, z._M_re);
+  result._M_re = _STLP_LOGL(_STLP_HYPOTL(z._M_re, z._M_im));
+  return result;
+}
+# endif
+
+//----------------------------------------------------------------------
+// pow
+
+_STLP_DECLSPEC complex<float> _STLP_CALL pow(const float& a, const complex<float>& b) {
+  float logr = _STLP_LOGF(a);
+  float x = _STLP_EXPF(logr*b._M_re);
+  float y = logr*b._M_im;
+
+  return complex<float>(x * _STLP_COSF(y), x * _STLP_SINF(y));
+}
+
+_STLP_DECLSPEC complex<float> _STLP_CALL pow(const complex<float>& z_in, int n) {
+  complex<float> z = z_in;
+  z = __power(z, (n < 0 ? -n : n), multiplies< complex<float> >());
+  if (n < 0)
+    return 1.f / z;
+  else
+    return z;
+}
+
+_STLP_DECLSPEC complex<float> _STLP_CALL pow(const complex<float>& a, const float& b) {
+  float logr = _STLP_LOGF(_STLP_HYPOTF(a._M_re,a._M_im));
+  float logi = _STLP_ATAN2F(a._M_im, a._M_re);
+  float x = _STLP_EXPF(logr * b);
+  float y = logi * b;
+
+  return complex<float>(x * _STLP_COSF(y), x * _STLP_SINF(y));
+}  
+
+_STLP_DECLSPEC complex<float> _STLP_CALL pow(const complex<float>& a, const complex<float>& b) {
+  float logr = _STLP_LOGF(_STLP_HYPOTF(a._M_re,a._M_im));
+  float logi = _STLP_ATAN2F(a._M_im, a._M_re);
+  float x = _STLP_EXPF(logr*b._M_re - logi*b._M_im);
+  float y = logr*b._M_im + logi*b._M_re;
+
+  return complex<float>(x * _STLP_COSF(y), x * _STLP_SINF(y));
+}
+
+
+_STLP_DECLSPEC complex<double> _STLP_CALL pow(const double& a, const complex<double>& b) {
+  double logr = _STLP_LOG(a);
+  double x = _STLP_EXP(logr*b._M_re);
+  double y = logr*b._M_im;
+
+  return complex<double>(x * _STLP_COS(y), x * _STLP_SIN(y));
+}
+
+_STLP_DECLSPEC complex<double> _STLP_CALL pow(const complex<double>& z_in, int n) {
+  complex<double> z = z_in;
+  z = __power(z, (n < 0 ? -n : n), multiplies< complex<double> >());
+  if (n < 0)
+#if !defined(__SC__)			//*TY 04/15/2000 - 
+    return 1. / z;
+#else							//*TY 04/15/2000 - added workaround for SCpp compiler
+	return double(1.0) / z;		//*TY 04/15/2000 - it incorrectly assign long double attribute to floating point literals
+#endif							//*TY 04/15/2000 - 
+  else
+    return z;
+}
+
+_STLP_DECLSPEC complex<double> _STLP_CALL pow(const complex<double>& a, const double& b) {
+  double logr = _STLP_LOG(_STLP_HYPOT(a._M_re,a._M_im));
+  double logi = _STLP_ATAN2(a._M_im, a._M_re);
+  double x = _STLP_EXP(logr * b);
+  double y = logi * b;
+
+  return complex<double>(x * _STLP_COS(y), x * _STLP_SIN(y));
+}  
+
+_STLP_DECLSPEC complex<double> _STLP_CALL pow(const complex<double>& a, const complex<double>& b) {
+  double logr = _STLP_LOG(_STLP_HYPOT(a._M_re,a._M_im));
+  double logi = _STLP_ATAN2(a._M_im, a._M_re);
+  double x = _STLP_EXP(logr*b._M_re - logi*b._M_im);
+  double y = logr*b._M_im + logi*b._M_re;
+
+  return complex<double>(x * _STLP_COS(y), x * _STLP_SIN(y));
+}
+
+
+_STLP_DECLSPEC complex<long double> _STLP_CALL pow(const long double& a,
+                                                   const complex<long double>& b) {
+  long double logr = _STLP_LOGL(a);
+  long double x = _STLP_EXPL(logr*b._M_re);
+  long double y = logr*b._M_im;
+
+  return complex<long double>(x * _STLP_COSL(y), x * _STLP_SINL(y));
+}
+
+_STLP_DECLSPEC complex<long double> _STLP_CALL pow(const complex<long double>& z_in, int n) {
+  complex<long double> z = z_in;
+  z = __power(z, (n < 0 ? -n : n), multiplies< complex<long double> >());
+  if (n < 0)
+    return 1.l / z;
+  else
+    return z;
+}
+
+_STLP_DECLSPEC complex<long double> _STLP_CALL pow(const complex<long double>& a,
+                         const long double& b) {
+  long double logr = _STLP_LOGL(_STLP_HYPOTL(a._M_re,a._M_im));
+  long double logi = _STLP_ATAN2L(a._M_im, a._M_re);
+  long double x = _STLP_EXPL(logr * b);
+  long double y = logi * b;
+
+  return complex<long double>(x * _STLP_COSL(y), x * _STLP_SINL(y));
+}  
+
+_STLP_DECLSPEC complex<long double> _STLP_CALL pow(const complex<long double>& a,
+                         const complex<long double>& b) {
+  long double logr = _STLP_LOGL(_STLP_HYPOTL(a._M_re,a._M_im));
+  long double logi = _STLP_ATAN2L(a._M_im, a._M_re);
+  long double x = _STLP_EXPL(logr*b._M_re - logi*b._M_im);
+  long double y = logr*b._M_im + logi*b._M_re;
+
+  return complex<long double>(x * _STLP_COSL(y), x * _STLP_SINL(y));
+}
+
+_STLP_END_NAMESPACE
+
diff --git a/main/source/stlport/src/complex_impl.h b/main/source/stlport/src/complex_impl.h
new file mode 100644
index 00000000..ddbf7ef1
--- /dev/null
+++ b/main/source/stlport/src/complex_impl.h
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+# ifndef COMPLEX_IMPL_H
+#  define  COMPLEX_IMPL_H
+
+#include <complex>
+#include <cmath>
+#include <math.h>
+#include <stl/_cmath.h>
+
+# if (defined (__sgi) && !defined(__GNUC__)) /* || defined (__DECCXX) */
+
+# define _STLP_ABSF   _STLP_VENDOR_CSTD::fabsf
+# define _STLP_ATAN2F _STLP_VENDOR_CSTD::atan2f
+# define _STLP_SINF   _STLP_VENDOR_CSTD::sinf
+# define _STLP_COSF   _STLP_VENDOR_CSTD::cosf
+# define _STLP_SQRTF  _STLP_VENDOR_CSTD::sqrtf
+# define _STLP_EXPF   _STLP_VENDOR_CSTD::expf
+# define _STLP_LOG10F _STLP_VENDOR_CSTD::log10f
+# define _STLP_LOGF   _STLP_VENDOR_CSTD::logf
+# define _STLP_SINHF  _STLP_VENDOR_CSTD::sinhf
+# define _STLP_COSHF  _STLP_VENDOR_CSTD::coshf
+# define _STLP_HYPOTF _STLP_VENDOR_CSTD::hypotf
+
+
+# define _STLP_ABSL   _STLP_VENDOR_CSTD::fabsl
+# define _STLP_ATAN2L _STLP_VENDOR_CSTD::atan2l
+# define _STLP_SINL   _STLP_VENDOR_CSTD::sinl
+# define _STLP_COSL   _STLP_VENDOR_CSTD::cosl
+# define _STLP_SQRTL  _STLP_VENDOR_CSTD::sqrtl
+# define _STLP_EXPL   _STLP_VENDOR_CSTD::expl
+# define _STLP_LOG10L _STLP_VENDOR_CSTD::log10l
+# define _STLP_LOGL   _STLP_VENDOR_CSTD::logl
+# define _STLP_SINHL  _STLP_VENDOR_CSTD::sinhl
+# define _STLP_COSHL  _STLP_VENDOR_CSTD::coshl
+// # define _STLP_HYPOT  ::hypot
+# define _STLP_HYPOTL _STLP_VENDOR_CSTD::hypotl
+
+#else
+
+# define _STLP_ABSF (float)_STLP_DO_ABS(double)
+# define _STLP_ABSL (long double)_STLP_DO_ABS(double)
+# define _STLP_ATAN2F (float)_STLP_DO_ATAN2(double)
+# define _STLP_ATAN2L (long double)_STLP_DO_ATAN2(double)
+# define _STLP_SINF   (float)_STLP_DO_SIN(double)
+# define _STLP_SINL   (long double)_STLP_DO_SIN(double)
+# define _STLP_COSF   (float)_STLP_DO_COS(double)
+# define _STLP_COSL   (long double)_STLP_DO_COS(double)
+# define _STLP_SQRTF  (float)_STLP_DO_SQRT(double)
+# define _STLP_SQRTL  (long double)_STLP_DO_SQRT(double)
+# define _STLP_EXPF   (float)_STLP_DO_EXP(double)
+# define _STLP_EXPL   (long double)_STLP_DO_EXP(double)
+# define _STLP_LOG10F   (float)_STLP_DO_LOG10(double)
+# define _STLP_LOG10L   (long double)_STLP_DO_LOG10(double)
+# define _STLP_LOGF   (float)_STLP_DO_LOG(double)
+# define _STLP_LOGL   (long double)_STLP_DO_LOG(double)
+# define _STLP_SINHF   (float)_STLP_DO_SINH(double)
+# define _STLP_SINHL   (long double)_STLP_DO_SINH(double)
+# define _STLP_COSHF   (float)_STLP_DO_COSH(double)
+# define _STLP_COSHL   (long double)_STLP_DO_COSH(double)
+# define _STLP_HYPOTF   (float)_STLP_DO_HYPOT(double)
+# define _STLP_HYPOTL   (long double)_STLP_DO_HYPOT(double)
+
+#endif
+
+# define _STLP_ABS      (double)_STLP_DO_ABS(double)
+# define _STLP_ATAN2    (double)_STLP_DO_ATAN2(double)
+# define _STLP_SIN      (double)_STLP_DO_SIN(double)
+# define _STLP_COS      (double)_STLP_DO_COS(double)
+# define _STLP_SQRT     (double)_STLP_DO_SQRT(double)
+# define _STLP_EXP      (double)_STLP_DO_EXP(double)
+# define _STLP_LOG10    (double)_STLP_DO_LOG10(double)
+# define _STLP_LOG      (double)_STLP_DO_LOG(double)
+# define _STLP_SINH     (double)_STLP_DO_SINH(double)
+# define _STLP_COSH     (double)_STLP_DO_COSH(double)
+# define _STLP_HYPOT    _STLP_DO_HYPOT(double)
+
+#endif
diff --git a/main/source/stlport/src/complex_io.cpp b/main/source/stlport/src/complex_io.cpp
new file mode 100644
index 00000000..44df8fff
--- /dev/null
+++ b/main/source/stlport/src/complex_io.cpp
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+# include "stlport_prefix.h"
+// #include <iterator>
+#include "complex_impl.h"
+#include <istream>
+
+_STLP_BEGIN_NAMESPACE
+
+# if ! (defined (_STLP_MSVC) && _STLP_MSVC < 1200)
+
+// Specializations for narrow characters; lets us avoid the nuisance of
+// widening.
+_STLP_OPERATOR_SPEC
+basic_ostream<char, char_traits<char> >& _STLP_CALL
+operator<< (basic_ostream<char, char_traits<char> >& __os, const complex<float>& __z)
+{
+  return __os << '(' << (double)__z.real() << ',' << (double)__z.imag() << ')';
+}
+
+_STLP_OPERATOR_SPEC
+basic_ostream<char, char_traits<char> >& _STLP_CALL
+operator<< (basic_ostream<char, char_traits<char> >& __os, const complex<double>& __z)
+{
+  return __os << '(' << __z.real() << ',' << __z.imag() << ')';
+}
+
+#ifndef _STLP_NO_LONG_DOUBLE
+_STLP_OPERATOR_SPEC
+basic_ostream<char, char_traits<char> >& _STLP_CALL
+operator<< (basic_ostream<char, char_traits<char> >& __os, const complex<long double>& __z)
+{
+  return __os << '(' << __z.real() << ',' << __z.imag() << ')';
+}
+#endif
+
+// Specialization for narrow characters; lets us avoid widen.
+_STLP_OPERATOR_SPEC
+basic_istream<char, char_traits<char> >& _STLP_CALL
+operator>>(basic_istream<char, char_traits<char> >& __is, complex<float>& __z)
+{
+  float  __re = 0;
+  float  __im = 0;
+
+  char __c;
+
+  __is >> __c;
+  if (__c == '(') {
+    __is >> __re >> __c;
+    if (__c == ',')
+      __is >> __im >> __c;
+    if (__c != ')')
+      __is.setstate(ios_base::failbit);
+  }
+  else {
+    __is.putback(__c);
+    __is >> __re;
+  }
+
+  if (__is)
+    __z = complex<float>(__re, __im);
+  return __is;
+}
+
+_STLP_OPERATOR_SPEC
+basic_istream<char, char_traits<char> >& _STLP_CALL
+operator>>(basic_istream<char, char_traits<char> >& __is, complex<double>& __z)
+{
+  double  __re = 0;
+  double  __im = 0;
+
+  char __c;
+
+  __is >> __c;
+  if (__c == '(') {
+    __is >> __re >> __c;
+    if (__c == ',')
+      __is >> __im >> __c;
+    if (__c != ')')
+      __is.setstate(ios_base::failbit);
+  }
+  else {
+    __is.putback(__c);
+    __is >> __re;
+  }
+
+  if (__is)
+    __z = complex<double>(__re, __im);
+  return __is;
+}
+
+#  ifndef _STLP_NO_LONG_DOUBLE
+_STLP_OPERATOR_SPEC
+basic_istream<char, char_traits<char> >& _STLP_CALL
+operator>>(basic_istream<char, char_traits<char> >& __is, complex<long double>& __z) {
+  long double  __re = 0;
+  long double  __im = 0;
+
+  char __c;
+
+  __is >> __c;
+  if (__c == '(') {
+    __is >> __re >> __c;
+    if (__c == ',')
+      __is >> __im >> __c;
+    if (__c != ')')
+      __is.setstate(ios_base::failbit);
+  }
+  else {
+    __is.putback(__c);
+    __is >> __re;
+  }
+
+  if (__is)
+    __z = complex<long double>(__re, __im);
+  return __is;
+}
+#  endif
+
+# endif /* MSVC */
+
+_STLP_END_NAMESPACE
+
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/src/complex_io_w.cpp b/main/source/stlport/src/complex_io_w.cpp
new file mode 100644
index 00000000..b812cd2f
--- /dev/null
+++ b/main/source/stlport/src/complex_io_w.cpp
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+# include "stlport_prefix.h"
+// #include <iterator>
+#include <complex>
+#include <istream>
+
+_STLP_BEGIN_NAMESPACE
+
+// Force instantiation of complex I/O functions
+
+#if !(defined (_STLP_NO_FORCE_INSTANTIATE) || defined (_STLP_NO_WCHAR_T))
+
+_STLP_OPERATOR_SPEC basic_istream<wchar_t, char_traits<wchar_t> >&  _STLP_CALL
+operator>>(basic_istream<wchar_t, char_traits<wchar_t> >&, complex<float>&);
+
+_STLP_OPERATOR_SPEC basic_istream<wchar_t, char_traits<wchar_t> >&  _STLP_CALL
+operator>>(basic_istream<wchar_t, char_traits<wchar_t> >&, complex<double>&);
+
+#ifndef _STLP_NO_LONG_DOUBLE
+_STLP_OPERATOR_SPEC basic_istream<wchar_t, char_traits<wchar_t> >&  _STLP_CALL
+operator>>(basic_istream<wchar_t, char_traits<wchar_t> >&, complex<long double>&);
+
+_STLP_OPERATOR_SPEC basic_ostream<wchar_t, char_traits<wchar_t> >&  _STLP_CALL
+operator<<(basic_ostream<wchar_t, char_traits<wchar_t> >&, const complex<long double>&);
+#endif
+
+_STLP_OPERATOR_SPEC basic_ostream<wchar_t, char_traits<wchar_t> >&  _STLP_CALL
+operator<<(basic_ostream<wchar_t, char_traits<wchar_t> >&, const complex<float>&);
+
+_STLP_OPERATOR_SPEC basic_ostream<wchar_t, char_traits<wchar_t> >&  _STLP_CALL
+operator<<(basic_ostream<wchar_t, char_traits<wchar_t> >&, const complex<double>&);
+
+# endif /* _STLP_NO_WCHAR_T */
+
+_STLP_END_NAMESPACE
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/src/complex_trig.cpp b/main/source/stlport/src/complex_trig.cpp
new file mode 100644
index 00000000..d5edeb4d
--- /dev/null
+++ b/main/source/stlport/src/complex_trig.cpp
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+# include "stlport_prefix.h"
+
+
+// Trigonometric and hyperbolic functions for complex<float>, 
+// complex<double>, and complex<long double>
+
+
+#include "complex_impl.h"
+
+#include <cfloat>
+#include <cmath>
+
+_STLP_BEGIN_NAMESPACE
+
+
+//----------------------------------------------------------------------
+// helpers
+
+#ifdef __sgi
+  static const union { unsigned int i; float f; } float_ulimit = { 0x42b2d4fc };
+  static const float float_limit = float_ulimit.f;
+  static union {
+    struct { unsigned int h; unsigned int l; } w;
+    double d;
+  } double_ulimit = { 0x408633ce, 0x8fb9f87d };
+  static const double double_limit = double_ulimit.d;
+  static union {
+    struct { unsigned int h[2]; unsigned int l[2]; } w;
+    long double ld;
+  } ldouble_ulimit = {0x408633ce, 0x8fb9f87e, 0xbd23b659, 0x4e9bd8b1};
+# ifndef _STLP_NO_LONG_DOUBLE
+  static const long double ldouble_limit = ldouble_ulimit.ld;
+# endif
+#else
+  static const float float_limit = _STLP_LOGF(FLT_MAX);
+  static const double double_limit = _STLP_DO_LOG(double)(DBL_MAX);
+# ifndef _STLP_NO_LONG_DOUBLE
+  static const long double ldouble_limit = _STLP_LOGL(LDBL_MAX);
+# endif
+#endif
+
+
+//----------------------------------------------------------------------
+// sin
+
+_STLP_DECLSPEC complex<float>  _STLP_CALL sin(const complex<float>& z) {
+  return complex<float>(_STLP_SINF(z._M_re) * _STLP_COSHF(z._M_im),
+                        _STLP_COSF(z._M_re) * _STLP_SINHF(z._M_im));
+}
+
+_STLP_DECLSPEC complex<double> _STLP_CALL sin(const complex<double>& z) {
+  return complex<double>(_STLP_SIN(z._M_re) * _STLP_COSH(z._M_im),
+                         _STLP_COS(z._M_re) * _STLP_SINH(z._M_im));
+}
+
+#ifndef _STLP_NO_LONG_DOUBLE
+_STLP_DECLSPEC complex<long double> _STLP_CALL sin(const complex<long double>& z) {
+  return complex<long double>(_STLP_SINL(z._M_re) * _STLP_COSHL(z._M_im),
+                              _STLP_COSL(z._M_re) * _STLP_SINHL(z._M_im));
+}
+#endif
+
+//----------------------------------------------------------------------
+// cos
+
+_STLP_DECLSPEC complex<float> _STLP_CALL cos(const complex<float>& z) {
+  return complex<float>(_STLP_COSF(z._M_re) * _STLP_COSHF(z._M_im),
+                        -_STLP_SINF(z._M_re) * _STLP_SINHF(z._M_im));
+}
+
+_STLP_DECLSPEC complex<double> _STLP_CALL cos(const complex<double>& z) {
+  return complex<double>(_STLP_COS(z._M_re) * _STLP_COSH(z._M_im),
+                        -_STLP_SIN(z._M_re) * _STLP_SINH(z._M_im));
+}
+
+#ifndef _STLP_NO_LONG_DOUBLE
+_STLP_DECLSPEC complex<long double> _STLP_CALL cos(const complex<long double>& z) {
+  return complex<long double>(_STLP_COSL(z._M_re) * _STLP_COSHL(z._M_im),
+                              -_STLP_SINL(z._M_re) * _STLP_SINHL(z._M_im));
+}
+# endif
+
+//----------------------------------------------------------------------
+// tan
+
+_STLP_DECLSPEC complex<float> _STLP_CALL tan(const complex<float>& z) {
+  float re2 = 2.f * z._M_re;
+  float im2 = 2.f * z._M_im;
+
+  if (_STLP_ABSF(im2) > float_limit)
+    return complex<float>(0.f, (im2 > 0 ? 1.f : -1.f));
+  else {
+    float den = _STLP_COSF(re2) + _STLP_COSHF(im2);
+    return complex<float>(_STLP_SINF(re2) / den, _STLP_SINHF(im2) / den);
+  }
+}
+
+_STLP_DECLSPEC complex<double> _STLP_CALL tan(const complex<double>& z) {
+  double re2 = 2. * z._M_re;
+  double im2 = 2. * z._M_im;
+
+  if (fabs(float(im2)) > double_limit)
+    return complex<double>(0., (im2 > 0 ? 1. : -1.));
+  else {
+    double den = _STLP_COS(re2) + _STLP_COSH(im2);
+    return complex<double>(_STLP_SIN(re2) / den, _STLP_SINH(im2) / den);
+  }
+}
+
+#ifndef _STLP_NO_LONG_DOUBLE
+_STLP_DECLSPEC complex<long double> _STLP_CALL tan(const complex<long double>& z) {
+  long double re2 = 2.l * z._M_re;
+  long double im2 = 2.l * z._M_im;
+  if (_STLP_ABSL(im2) > ldouble_limit)
+    return complex<long double>(0.l, (im2 > 0 ? 1.l : -1.l));
+  else {
+    long double den = _STLP_COSL(re2) + _STLP_COSHL(im2);
+    return complex<long double>(_STLP_SINL(re2) / den, _STLP_SINHL(im2) / den);
+  }
+}
+
+# endif
+
+//----------------------------------------------------------------------
+// sinh
+
+_STLP_DECLSPEC complex<float> _STLP_CALL sinh(const complex<float>& z) {
+  return complex<float>(_STLP_SINHF(z._M_re) * _STLP_COSF(z._M_im),
+                        _STLP_COSHF(z._M_re) * _STLP_SINF(z._M_im));
+}
+
+_STLP_DECLSPEC complex<double> _STLP_CALL sinh(const complex<double>& z) {
+  return complex<double>(_STLP_SINH(z._M_re) * _STLP_COS(z._M_im),
+                         _STLP_COSH(z._M_re) * _STLP_SIN(z._M_im));
+}
+
+#ifndef _STLP_NO_LONG_DOUBLE
+_STLP_DECLSPEC complex<long double> _STLP_CALL sinh(const complex<long double>& z) {
+  return complex<long double>(_STLP_SINHL(z._M_re) * _STLP_COSL(z._M_im),
+                              _STLP_COSHL(z._M_re) * _STLP_SINL(z._M_im));
+}
+#endif
+
+//----------------------------------------------------------------------
+// cosh
+
+_STLP_DECLSPEC complex<float> _STLP_CALL cosh(const complex<float>& z) {
+  return complex<float>(_STLP_COSHF(z._M_re) * _STLP_COSF(z._M_im),
+                        _STLP_SINHF(z._M_re) * _STLP_SINF(z._M_im));
+}
+
+_STLP_DECLSPEC complex<double> _STLP_CALL cosh(const complex<double>& z) {
+  return complex<double>(_STLP_COSH(z._M_re) * _STLP_COS(z._M_im),
+                         _STLP_SINH(z._M_re) * _STLP_SIN(z._M_im));
+}
+
+#ifndef _STLP_NO_LONG_DOUBLE
+_STLP_DECLSPEC complex<long double> _STLP_CALL cosh(const complex<long double>& z) {
+  return complex<long double>(_STLP_COSHL(z._M_re) * _STLP_COSL(z._M_im),
+                              _STLP_SINHL(z._M_re) * _STLP_SINL(z._M_im));
+}
+#endif
+
+//----------------------------------------------------------------------
+// tanh
+
+_STLP_DECLSPEC complex<float> _STLP_CALL tanh(const complex<float>& z) {
+  float re2 = 2.f * z._M_re;
+  float im2 = 2.f * z._M_im;
+  if (_STLP_ABSF(re2) > float_limit)
+    return complex<float>((re2 > 0 ? 1.f : -1.f), 0.f);
+  else {
+    float den = _STLP_COSHF(re2) + _STLP_COSF(im2);
+    return complex<float>(_STLP_SINHF(re2) / den, _STLP_SINF(im2) / den);
+  }
+}
+
+_STLP_DECLSPEC complex<double> _STLP_CALL tanh(const complex<double>& z) {
+  double re2 = 2. * z._M_re;
+  double im2 = 2. * z._M_im;  
+  if (fabs(float(re2)) > double_limit)
+    return complex<double>((re2 > 0 ? 1. : -1.), 0.);
+  else {
+    double den = _STLP_COSH(re2) + _STLP_COS(im2);
+    return complex<double>(_STLP_SINH(re2) / den, _STLP_SIN(im2) / den);
+  }
+}
+
+#ifndef _STLP_NO_LONG_DOUBLE
+_STLP_DECLSPEC complex<long double> _STLP_CALL tanh(const complex<long double>& z) {
+  long double re2 = 2.l * z._M_re;
+  long double im2 = 2.l * z._M_im;
+  if (_STLP_ABSL(re2) > ldouble_limit)
+    return complex<long double>((re2 > 0 ? 1.l : -1.l), 0.l);
+  else {
+    long double den = _STLP_COSHL(re2) + _STLP_COSL(im2);
+    return complex<long double>(_STLP_SINHL(re2) / den, _STLP_SINL(im2) / den);
+  }
+}
+#endif
+_STLP_END_NAMESPACE
diff --git a/main/source/stlport/src/cray.mak b/main/source/stlport/src/cray.mak
new file mode 100644
index 00000000..8585ca17
--- /dev/null
+++ b/main/source/stlport/src/cray.mak
@@ -0,0 +1,155 @@
+#
+# Note : This makefile is for Cray C++ 3.4 and 3.5
+#
+#        The GNU version of make must be used to execute the
+#	 makefile.  The UNICOS version of make does not support
+#	 the "%.suffix1: %.suffix2" feature.  
+#
+#	 GNU version of make is available from the Cray Open
+#	 Source release, or can be downloaded from various of
+#	 open source sites.
+
+#
+# compiler
+#
+CC = cc 
+CXX = CC
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport
+
+#
+# guts for common stuff
+#
+#
+LINK=ar cr
+
+OBJEXT=o
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=CRAY$(ARCH)
+
+all:  all_static all_staticx
+
+include common_macros.mak
+
+CXXFLAGS_COMMON = -I${STLPORT_DIR}
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -D_STLP_HAS_NO_EXCEPTIONS
+CXXFLAGS_RELEASE_staticx = $(CXXFLAGS_COMMON) -hexceptions
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG -D_STLP_HAS_NO_EXCEPTIONS
+CXXFLAGS_STLDEBUG_staticx = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG -hexceptions
+
+include common_percent_rules.mak
+
+# common_percent_rules.mak does not contain makerules for staticx source
+$(RELEASE_OBJDIR_staticx)/%.o: %.cpp
+	$(CXX) $(CXXFLAGS_RELEASE_staticx) $< -c -o $@
+$(RELEASE_OBJDIR_staticx)/%.o: %.c
+	$(CC) $(CXXFLAGS_RELEASE_staticx) $< -c -o $@
+$(RELEASE_OBJDIR_staticx)/%.i : %.cpp
+	$(CXX) $(CXXFLAGS_RELEASE_staticx) $< -E  $@
+
+$(STLDEBUG_OBJDIR_staticx)/%.o : %.cpp
+	$(CXX) $(CXXFLAGS_STLDEBUG_staticx) $< -c -o $@
+$(STLDEBUG_OBJDIR_staticx)/%.o : %.c
+	$(CC) $(CXXFLAGS_STLDEBUG_staticx) $< -c -o $@
+$(STLDEBUG_OBJDIR_staticx)/%.i : %.cpp
+	$(CXX) $(CXXFLAGS_STLDEBUG_staticx) $< -E  $@
+
+#include common_rules.mak
+#
+#  Target directories
+#
+#
+
+$(OUTDIR) :
+	$(MKDIR) $(OUTDIR)
+$(RELEASE_OBJDIR_static) :
+	$(MKDIR) $(RELEASE_OBJDIR_static)
+$(DEBUG_OBJDIR_static) :
+	$(MKDIR) $(DEBUG_OBJDIR_static)
+$(STLDEBUG_OBJDIR_static) :
+	$(MKDIR) $(STLDEBUG_OBJDIR_static)
+$(RELEASE_OBJDIR_staticx) :
+	$(MKDIR) $(RELEASE_OBJDIR_staticx)
+$(DEBUG_OBJDIR_staticx) :
+	$(MKDIR) $(DEBUG_OBJDIR_staticx)
+$(STLDEBUG_OBJDIR_staticx) :
+	$(MKDIR) $(STLDEBUG_OBJDIR_staticx)
+
+#create a compiler platform directory
+platform: $(PREPARE_STEP)
+	-@$(MKDIR) $(OUTDIR)
+	-@$(MKDIR) $(OBJDIR_COMMON)
+	-@$(MKDIR) $(OBJDIR)
+
+clean_all_obj:
+	-$(RM) $(OUTDIR)$(PATH_SEP)obj
+
+######   Targets ##################
+
+all_static :   platform $(ALL_STATIC_LIBS)
+
+all_staticx :	platform $(ALL_STATICX_LIBS) 
+
+release_static :  platform $(OUTDIR)$(PATH_SEP)$(RELEASE_LIB)
+
+debug_static :  platform $(OUTDIR)$(PATH_SEP)$(DEBUG_LIB)
+
+stldebug_static :  platform $(OUTDIR)$(PATH_SEP)$(STLDEBUG_LIB)
+
+release_staticx :  platform $(OUTDIR)$(PATH_SEP)$(RELEASEX_LIB)
+ 
+debug_staticx :  platform $(OUTDIR)$(PATH_SEP)$(DEBUGX_LIB)
+
+stldebug_staticx :  platform $(OUTDIR)$(PATH_SEP)$(STLDEBUGX_LIB)
+
+install :  all $(INSTALL_STEP)
+
+clean : $(CLEAN_SPECIFIC)
+	-$(RM) $(RELEASE_OBJDIR_static) $(DEBUG_OBJDIR_static) $(STLDEBUG_OBJDIR_static) \
+        $(RELEASE_OBJDIR_staticx) $(DEBUG_OBJDIR_staticx) $(STLDEBUG_OBJDIR_staticx) 
+
+clobber : clean clean_all_obj
+	-$(RM) $(OUTDIR)$(PATH_SEP)$(DEBUG_NAME).* \
+               $(OUTDIR)$(PATH_SEP)$(RELEASE_NAME).* $(OUTDIR)$(PATH_SEP)$(STLDEBUG_NAME).*
+
+# Need to link with a dummy main process to fully instantiate object files.
+
+$(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) : $(OUTDIR) $(RELEASE_OBJDIR_static) $(DEF_FILE) $(RELEASE_OBJECTS_static)
+	echo 'main() { }' >dummy_main.C
+	$(CXX) -o junk dummy_main.C $(RELEASE_OBJECTS_static) -lpthread
+	rm dummy_main.C
+	$(LINK) $(LINK_OUT)$(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) $(LDFLAGS_RELEASE_static) $(RELEASE_OBJECTS_static) $(LDLIBS_RELEASE_static)
+	
+$(OUTDIR)$(PATH_SEP)$(RELEASEX_LIB) : $(OUTDIR) $(RELEASE_OBJDIR_staticx) $(DEF_FILE) $(RELEASE_OBJECTS_staticx)
+	echo 'main() { }' >dummy_main.C
+	$(CXX) -o junk dummy_main.C $(RELEASE_OBJECTS_staticx) -lpthread
+	rm dummy_main.C
+	$(LINK) $(LINK_OUT)$(OUTDIR)$(PATH_SEP)$(RELEASEX_LIB) $(LDFLAGS_RELEASE_static) $(RELEASE_OBJECTS_staticx) $(LDLIBS_RELEASE_static)
+
+$(OUTDIR)$(PATH_SEP)$(STLDEBUG_LIB) : $(OUTDIR) $(STLDEBUG_OBJDIR_static) $(DEF_FILE) $(STLDEBUG_OBJECTS_static)
+	echo 'main() { }' >dummy_main.C
+	$(CXX) -o junk dummy_main.C $(STLDEBUG_OBJECTS_static) -lpthread
+	rm dummy_main.C
+	$(LINK) $(LINK_OUT)$(OUTDIR)$(PATH_SEP)$(STLDEBUG_LIB) $(LDFLAGS_STLDEBUG_static) $(STLDEBUG_OBJECTS_static)  $(LDLIBS_STLDEBUG_static)
+
+$(OUTDIR)$(PATH_SEP)$(STLDEBUGX_LIB) : $(OUTDIR) $(STLDEBUG_OBJDIR_staticx) $(DEF_FILE) $(STLDEBUG_OBJECTS_staticx)
+	echo 'main() { }' >dummy_main.C
+	$(CXX) -o junk dummy_main.C $(STLDEBUG_OBJECTS_staticx) -lpthread
+	rm dummy_main.C
+	$(LINK) $(LINK_OUT)$(OUTDIR)$(PATH_SEP)$(STLDEBUGX_LIB) $(LDFLAGS_STLDEBUG_static) $(STLDEBUG_OBJECTS_staticx)  $(LDLIBS_STLDEBUG_static)
+
+
+#install: all
+#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -S  $<  -o $@
+
+
diff --git a/main/source/stlport/src/ctype.cpp b/main/source/stlport/src/ctype.cpp
new file mode 100644
index 00000000..f273f365
--- /dev/null
+++ b/main/source/stlport/src/ctype.cpp
@@ -0,0 +1,490 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+# include "stlport_prefix.h"
+
+#include <algorithm>
+#include <stl/_ctype.h>
+#include <stl/_function.h>
+#include "c_locale.h"
+
+_STLP_BEGIN_NAMESPACE
+
+//----------------------------------------------------------------------
+// ctype<char>
+
+// The classic table: static data members.
+
+# if !defined(_STLP_STATIC_CONST_INIT_BUG) && !(defined(__MRC__) || defined(__SC__))
+//*TY 02/25/2000 - added workaround for MPW compilers; they confuse on in-class static const
+const size_t ctype<char>::table_size;
+# endif
+
+// This macro is specifically for platforms where isprint() relies
+// on separate flag
+
+# define PRINTFLAG ctype_base::mask( _Locale_PRINT & ~(_Locale_UPPER | _Locale_LOWER | _Locale_ALPHA | _Locale_DIGIT | _Locale_PUNCT | _Locale_SPACE | _Locale_XDIGIT )) 
+
+// Ctype table for the ASCII character set.
+// There are 257 entries in this table.  The first is EOF (-1).  
+// That is, the "table" seen by ctype<char> member functions is
+// _S_classic_table + 1.
+const ctype_base::mask 
+ctype<char>::_S_classic_table[257] = 
+{
+  ctype_base::mask(0) /* EOF */,
+  cntrl /* null */,
+  cntrl /* ^A */,
+  cntrl /* ^B */,
+  cntrl /* ^C */,
+  cntrl /* ^D */,
+  cntrl /* ^E */,
+  cntrl /* ^F */,
+  cntrl /* ^G */,
+  cntrl /* ^H */,
+  ctype_base::mask(space | cntrl) /* tab */,
+  ctype_base::mask(space | cntrl) /* LF */,
+  ctype_base::mask(space | cntrl) /* ^K */,
+  ctype_base::mask(space | cntrl) /* FF */,
+  ctype_base::mask(space | cntrl) /* ^M */,
+  cntrl /* ^N */,
+  cntrl /* ^O */,
+  cntrl /* ^P */,
+  cntrl /* ^Q */,
+  cntrl /* ^R */,
+  cntrl /* ^S */,
+  cntrl /* ^T */,
+  cntrl /* ^U */,
+  cntrl /* ^V */,
+  cntrl /* ^W */,
+  cntrl /* ^X */,
+  cntrl /* ^Y */,
+  cntrl /* ^Z */,
+  cntrl /* esc */,
+  cntrl /* ^\ */,
+  cntrl /* ^] */,
+  cntrl /* ^^ */,
+  cntrl /* ^_ */,
+  ctype_base::mask (space | PRINTFLAG) /*  */,
+  ctype_base::mask (punct | PRINTFLAG ) /* ! */,
+  ctype_base::mask (punct | PRINTFLAG ) /* " */,
+  ctype_base::mask (punct | PRINTFLAG ) /* # */,
+  ctype_base::mask (punct | PRINTFLAG ) /* $ */,
+  ctype_base::mask (punct | PRINTFLAG ) /* % */,
+  ctype_base::mask (punct | PRINTFLAG ) /* & */,
+  ctype_base::mask (punct | PRINTFLAG ) /* ' */,
+  ctype_base::mask (punct | PRINTFLAG ) /* ( */,
+  ctype_base::mask (punct | PRINTFLAG ) /* ) */,
+  ctype_base::mask (punct | PRINTFLAG ) /* * */,
+  ctype_base::mask (punct | PRINTFLAG ) /* + */,
+  ctype_base::mask (punct | PRINTFLAG ) /* , */,
+  ctype_base::mask (punct | PRINTFLAG ) /* - */,
+  ctype_base::mask (punct | PRINTFLAG ) /* . */,
+  ctype_base::mask (punct | PRINTFLAG ) /* / */,
+  ctype_base::mask(digit | PRINTFLAG | xdigit) /* 0 */,
+  ctype_base::mask(digit | PRINTFLAG | xdigit) /* 1 */,
+  ctype_base::mask(digit | PRINTFLAG | xdigit) /* 2 */,
+  ctype_base::mask(digit | PRINTFLAG | xdigit) /* 3 */,
+  ctype_base::mask(digit | PRINTFLAG | xdigit) /* 4 */,
+  ctype_base::mask(digit | PRINTFLAG | xdigit) /* 5 */,
+  ctype_base::mask(digit | PRINTFLAG | xdigit) /* 6 */,
+  ctype_base::mask(digit | PRINTFLAG | xdigit) /* 7 */,
+  ctype_base::mask(digit | PRINTFLAG | xdigit) /* 8 */,
+  ctype_base::mask(digit | PRINTFLAG | xdigit) /* 9 */,
+  ctype_base::mask (punct | PRINTFLAG ) /* : */,
+  ctype_base::mask (punct | PRINTFLAG ) /* ; */,
+  ctype_base::mask (punct | PRINTFLAG ) /* < */,
+  ctype_base::mask (punct | PRINTFLAG ) /* = */,
+  ctype_base::mask (punct | PRINTFLAG ) /* > */,
+  ctype_base::mask (punct | PRINTFLAG ) /* ? */,
+  ctype_base::mask (punct | PRINTFLAG ) /* ! */,
+  ctype_base::mask(alpha | PRINTFLAG | upper | xdigit) /* A */,
+  ctype_base::mask(alpha | PRINTFLAG | upper | xdigit) /* B */,
+  ctype_base::mask(alpha | PRINTFLAG | upper | xdigit) /* C */,
+  ctype_base::mask(alpha | PRINTFLAG | upper | xdigit) /* D */,
+  ctype_base::mask(alpha | PRINTFLAG | upper | xdigit) /* E */,
+  ctype_base::mask(alpha | PRINTFLAG | upper | xdigit) /* F */,
+  ctype_base::mask(alpha | PRINTFLAG | upper) /* G */,
+  ctype_base::mask(alpha | PRINTFLAG | upper) /* H */,
+  ctype_base::mask(alpha | PRINTFLAG | upper) /* I */,
+  ctype_base::mask(alpha | PRINTFLAG | upper) /* J */,
+  ctype_base::mask(alpha | PRINTFLAG | upper) /* K */,
+  ctype_base::mask(alpha | PRINTFLAG | upper) /* L */,
+  ctype_base::mask(alpha | PRINTFLAG | upper) /* M */,
+  ctype_base::mask(alpha | PRINTFLAG | upper) /* N */,
+  ctype_base::mask(alpha | PRINTFLAG | upper) /* O */,
+  ctype_base::mask(alpha | PRINTFLAG | upper) /* P */,
+  ctype_base::mask(alpha | PRINTFLAG | upper) /* Q */,
+  ctype_base::mask(alpha | PRINTFLAG | upper) /* R */,
+  ctype_base::mask(alpha | PRINTFLAG | upper) /* S */,
+  ctype_base::mask(alpha | PRINTFLAG | upper) /* T */,
+  ctype_base::mask(alpha | PRINTFLAG | upper) /* U */,
+  ctype_base::mask(alpha | PRINTFLAG | upper) /* V */,
+  ctype_base::mask(alpha | PRINTFLAG | upper) /* W */,
+  ctype_base::mask(alpha | PRINTFLAG | upper) /* X */,
+  ctype_base::mask(alpha | PRINTFLAG | upper) /* Y */,
+  ctype_base::mask(alpha | PRINTFLAG | upper) /* Z */,
+  ctype_base::mask (punct | PRINTFLAG ) /* [ */,
+  ctype_base::mask (punct | PRINTFLAG ) /* \ */,
+  ctype_base::mask (punct | PRINTFLAG ) /* ] */,
+  ctype_base::mask (punct | PRINTFLAG ) /* ^ */,
+  ctype_base::mask (punct | PRINTFLAG ) /* _ */,
+  ctype_base::mask (punct | PRINTFLAG ) /* ` */,
+  ctype_base::mask(alpha | PRINTFLAG | lower | xdigit) /* a */,
+  ctype_base::mask(alpha | PRINTFLAG | lower | xdigit) /* b */,
+  ctype_base::mask(alpha | PRINTFLAG | lower | xdigit) /* c */,
+  ctype_base::mask(alpha | PRINTFLAG | lower | xdigit) /* d */,
+  ctype_base::mask(alpha | PRINTFLAG | lower | xdigit) /* e */,
+  ctype_base::mask(alpha | PRINTFLAG | lower | xdigit) /* f */,
+  ctype_base::mask(alpha | PRINTFLAG | lower) /* g */,
+  ctype_base::mask(alpha | PRINTFLAG | lower) /* h */,
+  ctype_base::mask(alpha | PRINTFLAG | lower) /* i */,
+  ctype_base::mask(alpha | PRINTFLAG | lower) /* j */,
+  ctype_base::mask(alpha | PRINTFLAG | lower) /* k */,
+  ctype_base::mask(alpha | PRINTFLAG | lower) /* l */,
+  ctype_base::mask(alpha | PRINTFLAG | lower) /* m */,
+  ctype_base::mask(alpha | PRINTFLAG | lower) /* n */,
+  ctype_base::mask(alpha | PRINTFLAG | lower) /* o */,
+  ctype_base::mask(alpha | PRINTFLAG | lower) /* p */,
+  ctype_base::mask(alpha | PRINTFLAG | lower) /* q */,
+  ctype_base::mask(alpha | PRINTFLAG | lower) /* r */,
+  ctype_base::mask(alpha | PRINTFLAG | lower) /* s */,
+  ctype_base::mask(alpha | PRINTFLAG | lower) /* t */,
+  ctype_base::mask(alpha | PRINTFLAG | lower) /* u */,
+  ctype_base::mask(alpha | PRINTFLAG | lower) /* v */,
+  ctype_base::mask(alpha | PRINTFLAG | lower) /* w */,
+  ctype_base::mask(alpha | PRINTFLAG | lower) /* x */,
+  ctype_base::mask(alpha | PRINTFLAG | lower) /* y */,
+  ctype_base::mask(alpha | PRINTFLAG | lower) /* x */,
+  ctype_base::mask (punct | PRINTFLAG ) /* { */,
+  ctype_base::mask (punct | PRINTFLAG ) /* | */,
+  ctype_base::mask (punct | PRINTFLAG ) /* } */,
+  ctype_base::mask (punct | PRINTFLAG ) /* ~ */,
+  cntrl /* del (0x7f)*/,
+    /* ASCII is a 7-bit code, so everything else is non-ASCII */
+ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),
+ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),
+ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),
+ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),
+ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),
+ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),
+ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),
+ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),
+ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),
+ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),
+ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),
+ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),
+ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),
+ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),
+ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),
+ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0),  ctype_base::mask(0)
+};
+
+// For every c in the range 0 <= c < 256, _S_upper[c] is the
+// uppercased version of c and _S_lower[c] is the lowercased
+// version.  As before, these two tables assume the ASCII character
+// set.
+
+const unsigned char ctype<char>::_S_upper[256] =
+{
+  0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+  0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+  0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+  0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+  0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+  0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+  0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+  0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+  0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+  0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+  0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
+  0x60, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+  0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+  0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+  0x58, 0x59, 0x5a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
+  0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+  0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+  0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+  0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
+  0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
+  0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
+  0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
+  0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
+  0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+  0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+  0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
+  0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
+  0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
+  0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
+  0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+  0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
+};
+
+const unsigned char ctype<char>::_S_lower[256] =
+{
+  0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+  0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+  0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+  0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+  0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+  0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+  0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+  0x40, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+  0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
+  0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+  0x78, 0x79, 0x7a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
+  0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+  0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
+  0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+  0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
+  0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+  0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+  0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+  0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
+  0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
+  0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
+  0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
+  0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
+  0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+  0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+  0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
+  0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
+  0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
+  0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
+  0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+  0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
+};
+
+
+// Some helper functions used in ctype<>::scan_is and scan_is_not.
+
+struct _Ctype_is_mask {
+  typedef char argument_type;
+  typedef bool result_type;
+  
+  ctype_base::mask _Mask;
+  const ctype_base::mask* _M_table;
+  
+  _Ctype_is_mask(ctype_base::mask __m, const ctype_base::mask* __t) : _Mask(__m), _M_table(__t) {}
+  bool operator()(char __c) const { return (_M_table[(unsigned char) __c] & _Mask) != 0; }
+};
+
+struct _Ctype_not_mask {
+  typedef char argument_type;
+  typedef bool result_type;
+  
+  ctype_base::mask _Mask;
+  const ctype_base::mask* _M_table;
+  
+  _Ctype_not_mask(ctype_base::mask __m, const ctype_base::mask* __t) : _Mask(__m), _M_table(__t) {}
+  bool operator()(char __c) const { return (_M_table[(unsigned char) __c] & _Mask) == 0; }
+};
+ 
+ctype<char>::ctype(const ctype_base::mask * __tab, bool __del, size_t __refs) : 
+  _BaseFacet(__refs) /* , _M_ctype_table(0) */ {
+  _M_ctype_table = __tab ? __tab : classic_table();
+  _M_delete = __tab && __del;
+}
+
+ctype<char>::~ctype() {
+  if (_M_delete)
+    delete[] __CONST_CAST(ctype_base::mask *, _M_ctype_table);
+}
+
+const char*
+ctype<char>::scan_is(ctype_base::mask  __m, const char* __low, const char* __high) const  {
+  return _STLP_STD::find_if(__low, __high, _Ctype_is_mask(__m, _M_ctype_table));
+}
+
+const char* 
+ctype<char>::scan_not(ctype_base::mask  __m, const char* __low, const char* __high) const {
+  return _STLP_STD::find_if(__low, __high, _Ctype_not_mask(__m, _M_ctype_table));
+}
+
+char        
+ctype<char>::do_toupper(char __c) const
+{ return (char) _S_upper[(unsigned char) __c]; }
+char        
+ctype<char>::do_tolower(char __c) const
+{ return (char) _S_lower[(unsigned char) __c]; }
+const char* 
+ctype<char>::do_toupper(char* __low, const char* __high) const {
+  for ( ; __low < __high; ++__low)
+    *__low = (char) _S_upper[(unsigned char) *__low];
+  return __high;
+}
+  
+const char* 
+ctype<char>::do_tolower(char* __low, const char* __high) const {
+  for ( ; __low < __high; ++__low)
+    *__low = (char) _S_lower[(unsigned char) *__low];
+  return __high;
+}
+
+char        
+ctype<char>::do_widen(char __c) const { return __c; }
+
+const char* 
+ctype<char>::do_widen(const char* __low, const char* __high,
+                      char* __to) const {
+  __copy_trivial(__low, __high, __to);
+  return __high;    
+}
+char
+ctype<char>::do_narrow(char __c, char /* dfault */ ) const { return __c; }
+const char* 
+ctype<char>::do_narrow(const char* __low, const char* __high,
+                       char /* dfault */, char* __to) const {
+  __copy_trivial(__low, __high, __to);
+  return __high; 
+}
+
+
+# ifndef _STLP_NO_WCHAR_T
+
+  struct _Ctype_w_is_mask {
+    typedef wchar_t argument_type;
+    typedef bool    result_type;
+
+    ctype_base::mask M;
+    const ctype_base::mask* table;
+    
+    _Ctype_w_is_mask(ctype_base::mask m, const ctype_base::mask* t)
+      : M(m), table(t) {}
+    bool operator()(wchar_t c) const
+      { return c >= 0 && size_t(c) < ctype<char>::table_size && (table[c] & M); }
+  };
+
+
+//----------------------------------------------------------------------
+// ctype<wchar_t>
+
+ctype<wchar_t>::~ctype() {}
+
+
+bool ctype<wchar_t>::do_is(ctype_base::mask  m, wchar_t c) const
+{
+  const ctype_base::mask * table = ctype<char>::classic_table();
+  return c >= 0 && size_t(c) < ctype<char>::table_size && (m & table[c]);
+}
+
+const wchar_t* ctype<wchar_t>::do_is(const wchar_t* low, const wchar_t* high,
+                                     ctype_base::mask * vec) const
+{
+  // boris : not clear if this is the right thing to do...
+  const ctype_base::mask * table = ctype<char>::classic_table();
+  for ( ; low < high; ++low, ++vec) {
+    wchar_t c = *low;
+    *vec = c >= 0 && size_t(c) < ctype<char>::table_size ? table[c] : ctype_base::mask (0);
+  }
+  return high;
+}
+
+const wchar_t*
+ctype<wchar_t>::do_scan_is(ctype_base::mask  m,
+                           const wchar_t* low, const wchar_t* high) const
+{
+  return find_if(low, high, _Ctype_w_is_mask(m, ctype<char>::classic_table()));
+}
+
+
+const wchar_t*
+ctype<wchar_t>::do_scan_not(ctype_base::mask  m,
+                            const wchar_t* low, const wchar_t* high) const
+{
+    return find_if(low, high, not1(_Ctype_w_is_mask(m, ctype<char>::classic_table())));
+}
+
+wchar_t ctype<wchar_t>::do_toupper(wchar_t c) const
+{
+  return c >= 0 && size_t(c) < ctype<char>::table_size
+    ? (wchar_t) ctype<char>::_S_upper[c]
+    : c;
+}
+
+const wchar_t* 
+ctype<wchar_t>::do_toupper(wchar_t* low, const wchar_t* high) const
+{
+  for ( ; low < high; ++low) {
+    wchar_t c = *low;
+    *low = c >= 0 && size_t(c) < ctype<char>::table_size
+      ? (wchar_t) ctype<char>::_S_upper[c]
+      : c;
+  }
+  return high;
+}
+
+wchar_t ctype<wchar_t>::do_tolower(wchar_t c) const
+{
+  return c >= 0 && size_t(c) < ctype<char>::table_size
+    ? (wchar_t) ctype<char>::_S_lower[c]
+    : c;
+}
+
+const wchar_t* 
+ctype<wchar_t>::do_tolower(wchar_t* low, const wchar_t* high) const
+{
+  for ( ; low < high; ++low) {
+    wchar_t c = *low;
+    *low = c >= 0 && size_t(c) < ctype<char>::table_size
+      ? (wchar_t) ctype<char>::_S_lower[c]
+      : c;
+  }
+  return high;
+}
+
+wchar_t ctype<wchar_t>::do_widen(char c) const 
+{
+  return (wchar_t) c;
+}
+
+const char* 
+ctype<wchar_t>::do_widen(const char* low, const char* high,
+                         wchar_t* dest) const
+{
+  while (low != high)
+    *dest++ = (wchar_t) *low++;
+  return high;
+}
+
+char ctype<wchar_t>::do_narrow(wchar_t c, char dfault) const 
+{
+  return (char) c == c ? c : dfault;
+}
+
+const wchar_t* ctype<wchar_t>::do_narrow(const wchar_t* low,
+                                         const wchar_t* high,
+                                         char dfault, char* dest) const
+{
+  while (low != high) {
+    wchar_t c = *low++;
+    *dest++ = (char) c == c ? c : dfault;
+  }
+
+  return high;
+}
+
+# endif
+_STLP_END_NAMESPACE
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/src/dec.mak b/main/source/stlport/src/dec.mak
new file mode 100644
index 00000000..0a37009b
--- /dev/null
+++ b/main/source/stlport/src/dec.mak
@@ -0,0 +1,100 @@
+#
+# Note : this requires GNU make
+#
+
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_dec
+
+CUR_DIR= $(PWD)/
+
+# point this to proper location
+STL_INCL= -I. -I../stlport -I/usr/include
+
+#
+# guts for common stuff
+#
+#
+CC = cxx
+CXX = cxx
+
+LINK=$(CXX) -o
+DYN_LINK=$(CXX) -o
+
+OBJEXT=o
+DYNEXT=so
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=DEC
+
+# LINK_OUT=-xar -o  
+# DYNLINK_OUT=-o 
+
+# all: all_dynamic all_static
+# Boris : do not see a reasonable way to link static library witout instantiating in .o 
+# Anyone ?
+all: msg all_dynamic symbolic_links
+
+msg:
+	@echo "*** ATTENTION! ***"
+	@echo "This makefile requires GNU make!"
+	@echo "******************"
+
+include common_macros.mak
+
+# Rules
+
+MTFLAGS = -pthread
+
+CXXFLAGS_COMMON = -std ansi -nousing_std -pt -rtti $(MTFLAGS) ${STL_INCL} -D_PTHREADS
+
+SHCXXFLAGS = -shared
+RELEASE_FLAGS = -O
+
+LIBS =  
+
+RELEASE_static_rep = -ptr ${RELEASE_OBJDIR_static}
+RELEASE_dynamic_rep = -ptr ${RELEASE_OBJDIR_dynamic}
+DEBUG_static_rep = -ptr ${DEBUG_OBJDIR_static}
+DEBUG_dynamic_rep = -ptr ${DEBUG_OBJDIR_dynamic}
+STLDEBUG_static_rep = -ptr ${STLDEBUG_OBJDIR_static}
+STLDEBUG_dynamic_rep = -ptr ${STLDEBUG_OBJDIR_dynamic}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${RELEASE_FLAGS} ${RELEASE_static_rep}
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${RELEASE_FLAGS} $(SHCXXFLAGS) ${RELEASE_dynamic_rep}
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g ${DEBUG_static_rep}
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g $(SHCXXFLAGS) ${DEBUG_dynamic_rep}
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_COMMON) -O -g ${STLDEBUG_static_rep} -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g $(SHCXXFLAGS) ${STLDEBUG_dynamic_rep} -D_STLP_DEBUG
+
+LDFLAGS_RELEASE_static = ${CXXFLAGS_RELEASE_static}
+LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic}
+LDLIBS_RELEASE_dynamic = -lm
+LDLIBS_RELEASE_static = -lm
+
+LDFLAGS_DEBUG_static = ${CXXFLAGS_DEBUG_static}
+LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic}
+LDLIBS_DEBUG_dynamic = -lm
+LDLIBS_DEBUG_static = -lm
+
+LDFLAGS_STLDEBUG_static = ${CXXFLAGS_STLDEBUG_static}
+LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic}
+LDLIBS_STLDEBUG_dynamic = -lm
+LDLIBS_STLDEBUG_static = -lm
+
+INSTALL_STEP = install_unix 
+
+include common_percent_rules.mak
+include common_rules.mak
+
+
+%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $*.cpp -v -E > $@
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
diff --git a/main/source/stlport/src/djgpp.mak b/main/source/stlport/src/djgpp.mak
new file mode 100644
index 00000000..6aa390e4
--- /dev/null
+++ b/main/source/stlport/src/djgpp.mak
@@ -0,0 +1,72 @@
+
+#
+# This is makefile for compiling with DJGPP.
+# Since DJGPP is used to create DOS protected mode, it has no
+# dynamic link library. Only static libraries are created.
+# With DJGPP, gcc is used to compile c++. It will know the 
+# language being compiled automatically from file extension of
+# the source code being compiled.
+#
+# Tanes Sriviroolchai (tanes73@yahoo.com)
+# Jan 4, 2001
+#
+
+#
+# compiler
+#
+CC = gcc
+CXX = gcc
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_djgpp
+
+#
+# guts for common stuff
+#
+#
+LINK=ar crv
+
+OBJEXT=o
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=DJGPP
+
+STATIC_SUFFIX=_static
+
+all: all_static
+
+include common_macros.mak
+
+RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.o
+RESFILE_debug=$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o
+RESFILE_stldebug=$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o
+
+WARNING_FLAGS= -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
+
+CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS} -ftemplate-depth-32 -mbnu210
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+
+LDFLAGS_RELEASE_static = 
+
+LDFLAGS_DEBUG_static = 
+
+LDFLAGS_STLDEBUG_static = 
+
+
+include common_percent_rules.mak
+include common_rules.mak
+
+
+#%.s: %.cpp
+#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+
diff --git a/main/source/stlport/src/dll_main.cpp b/main/source/stlport/src/dll_main.cpp
new file mode 100644
index 00000000..191d90e3
--- /dev/null
+++ b/main/source/stlport/src/dll_main.cpp
@@ -0,0 +1,257 @@
+ /*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# define __PUT_STATIC_DATA_MEMBERS_HERE
+# define _STLP_EXPOSE_GLOBALS_IMPLEMENTATION
+
+# include "stlport_prefix.h"
+
+# if !defined(_STLP_DEBUG) && ! defined (_STLP_ASSERTIONS)
+# define _STLP_ASSERTIONS 1
+# endif
+
+#include <utility>
+
+#include <stl/debug/_debug.h>
+#include <memory>
+#include <vector>
+#include <set>
+#include <list>
+#include <slist>
+#include <stl/_hashtable.h>
+#include <limits>
+#include <string>
+#include <stdexcept>
+#include <bitset>
+
+# if ( _STLP_STATIC_TEMPLATE_DATA < 1 )
+// for rope, locale static members
+#  include <rope>
+#  include <locale>
+# endif
+
+# if defined (_STLP_UNIX)
+#  define _STLP_HAS_PERTHREAD_ALLOCATOR
+# include <stl/_pthread_alloc.h>
+# endif
+
+// boris : this piece of code duplicated from _range_errors.h
+#undef _STLP_THROW_MSG
+#if defined(_STLP_THROW_RANGE_ERRORS)
+# ifndef _STLP_STDEXCEPT
+#  include <stdexcept>
+# endif
+# ifndef _STLP_STRING
+#  include <string>
+# endif
+# define _STLP_THROW_MSG(ex,msg)  throw ex(string(msg))
+#else
+# if defined (_STLP_WINCE)
+#  define _STLP_THROW_MSG(ex,msg)  TerminateProcess(GetCurrentProcess(), 0)
+# else
+#  include <cstdlib>
+#  include <cstdio>
+#  define _STLP_THROW_MSG(ex,msg)  puts(msg),_STLP_ABORT()
+# endif
+#endif
+
+#ifdef _STLP_MSVC
+#pragma optimize("g",off)
+#endif 
+
+_STLP_BEGIN_NAMESPACE
+
+void _STLP_DECLSPEC _STLP_CALL __stl_throw_range_error(const char* __msg) { 
+  _STLP_THROW_MSG(range_error, __msg); 
+}
+
+void _STLP_DECLSPEC _STLP_CALL __stl_throw_out_of_range(const char* __msg) { 
+  _STLP_THROW_MSG(out_of_range, __msg); 
+}
+
+void _STLP_DECLSPEC _STLP_CALL __stl_throw_length_error(const char* __msg) { 
+  _STLP_THROW_MSG(length_error, __msg); 
+}
+
+void _STLP_DECLSPEC _STLP_CALL __stl_throw_invalid_argument(const char* __msg) { 
+  _STLP_THROW_MSG(invalid_argument, __msg); 
+}
+
+void _STLP_DECLSPEC _STLP_CALL __stl_throw_overflow_error(const char* __msg) { 
+  _STLP_THROW_MSG(overflow_error, __msg); 
+}
+
+_STLP_DECLSPEC const char*  _STLP_CALL
+__get_c_string(const string& __str) { 
+  return __str.c_str(); 
+}
+
+
+# if defined (_STLP_NO_EXCEPTION_HEADER) || defined(_STLP_BROKEN_EXCEPTION_CLASS)
+exception::exception() _STLP_NOTHROW {}
+exception::~exception() _STLP_NOTHROW {}
+bad_exception::bad_exception() _STLP_NOTHROW {}
+bad_exception::~bad_exception() _STLP_NOTHROW {}
+const char* exception::what() const _STLP_NOTHROW {return "class exception";}
+const char* bad_exception::what() const _STLP_NOTHROW {return "class bad_exception";}
+# endif
+
+# ifdef _STLP_OWN_STDEXCEPT
+__Named_exception::__Named_exception(const string& __str) {
+  strncpy(_M_name, __get_c_string(__str), _S_bufsize);
+  _M_name[_S_bufsize - 1] = '\0';
+}
+
+const char* __Named_exception::what() const _STLP_NOTHROW_INHERENTLY { return _M_name; }
+
+// boris : those are needed to force typeinfo nodes to be created in here only
+__Named_exception::~__Named_exception() _STLP_NOTHROW_INHERENTLY {}
+
+logic_error::~logic_error() _STLP_NOTHROW_INHERENTLY {}
+runtime_error::~runtime_error() _STLP_NOTHROW_INHERENTLY {}
+domain_error::~domain_error() _STLP_NOTHROW_INHERENTLY {}
+invalid_argument::~invalid_argument() _STLP_NOTHROW_INHERENTLY {}
+length_error::~length_error() _STLP_NOTHROW_INHERENTLY {}
+out_of_range::~out_of_range() _STLP_NOTHROW_INHERENTLY {}
+range_error::~range_error() _STLP_NOTHROW_INHERENTLY {}
+overflow_error::~overflow_error() _STLP_NOTHROW_INHERENTLY {}
+underflow_error::~underflow_error() _STLP_NOTHROW_INHERENTLY {}
+
+# endif
+
+# ifdef  _STLP_NO_BAD_ALLOC
+const nothrow_t nothrow /* = {} */;
+# endif
+
+# ifndef _STLP_NO_FORCE_INSTANTIATE
+
+# if defined (_STLP_DEBUG) || defined (_STLP_ASSERTIONS)
+template struct _STLP_CLASS_DECLSPEC __stl_debug_engine<bool>;
+# endif
+
+template class _STLP_CLASS_DECLSPEC __node_alloc<false,0>;
+template class _STLP_CLASS_DECLSPEC __node_alloc<true,0>;
+template class _STLP_CLASS_DECLSPEC __debug_alloc< __node_alloc<true,0> >;
+template class _STLP_CLASS_DECLSPEC __debug_alloc< __node_alloc<false,0> >;
+template class _STLP_CLASS_DECLSPEC __debug_alloc<__new_alloc>;
+template class _STLP_CLASS_DECLSPEC __malloc_alloc<0>;
+
+# if defined (_STLP_THREADS) && ! defined ( _STLP_ATOMIC_EXCHANGE ) && (defined(_STLP_PTHREADS) || defined (_STLP_UITHREADS)  || defined (_STLP_OS2THREADS))
+template class _STLP_CLASS_DECLSPEC _Swap_lock_struct<0>;
+# endif
+
+template class allocator<void*>;
+template class _STLP_alloc_proxy<void**, void*, allocator<void*> >;
+template class _Vector_base<void*,allocator<void*> >;
+# if defined (_STLP_DEBUG) && ! defined (__SUNPRO_CC)
+template class __WORKAROUND_DBG_RENAME(vector) <void*,allocator<void*> >;
+# endif
+template class __vector__<void*,allocator<void*> >;
+
+template class _Rb_global<bool>;
+template class _List_global<bool>;
+template class _Sl_global<bool>;
+template class _Stl_prime<bool>;
+template class _LimG<bool>;
+template class _Bs_G<bool>;
+
+template class _STLP_CLASS_DECLSPEC allocator<char>;
+template class _STLP_CLASS_DECLSPEC _STLP_alloc_proxy<char *,char, allocator<char> >;
+template class _STLP_CLASS_DECLSPEC _String_base<char, allocator<char> >;
+
+# if defined (_STLP_DEBUG) && ! defined (__SUNPRO_CC)
+template class _STLP_CLASS_DECLSPEC _Nondebug_string<char, char_traits<char>, allocator<char> >;
+# endif
+
+template class basic_string<char, char_traits<char>, allocator<char> >;
+# endif
+
+_STLP_END_NAMESPACE
+
+#define FORCE_SYMBOL extern
+
+# if defined (_WIN32) && defined (_STLP_USE_DECLSPEC) && ! defined (_STLP_USE_STATIC_LIB) && ! defined (_STLP_USE_STATICX_LIB)
+// stlportmt.cpp : Defines the entry point for the DLL application.
+//
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#undef FORCE_SYMBOL 
+#define FORCE_SYMBOL APIENTRY
+
+extern "C" {
+
+BOOL APIENTRY DllMain( HANDLE hModule, 
+                       DWORD  ul_reason_for_call, 
+                       LPVOID lpReserved
+					 )
+{
+    switch (ul_reason_for_call)
+	{
+		case DLL_PROCESS_ATTACH:
+		  DisableThreadLibraryCalls((HINSTANCE)hModule);
+		case DLL_THREAD_ATTACH:
+		case DLL_THREAD_DETACH:
+		case DLL_PROCESS_DETACH:
+			break;
+    }
+    return TRUE;
+}
+
+} /* extern "C" */
+
+_STLP_BEGIN_NAMESPACE
+
+void FORCE_SYMBOL
+force_link()
+{
+  float f;
+  f = numeric_limits<float>::infinity();
+  f = numeric_limits<float>::quiet_NaN();
+  f = numeric_limits<float>::signaling_NaN();
+  double d;
+  d = numeric_limits<double>::infinity();
+  d = numeric_limits<double>::quiet_NaN();
+  d = numeric_limits<double>::signaling_NaN();
+#ifndef _STLP_NO_LONG_DOUBLE
+  long double ld;
+  ld = numeric_limits<long double>::infinity();
+  ld = numeric_limits<long double>::quiet_NaN();
+  ld = numeric_limits<long double>::signaling_NaN();
+#endif
+  
+  set<int>::iterator iter;
+  // _M_increment; _M_decrement instantiation
+  ++iter;
+  --iter;
+  
+  // force bitset globals to be instantiated
+  unsigned char uc = _Bs_G<bool>::_S_bit_count[0];
+  uc += _Bs_G<bool>::_S_first_one[0];
+}
+
+_STLP_END_NAMESPACE
+
+# endif
diff --git a/main/source/stlport/src/facets_byname.cpp b/main/source/stlport/src/facets_byname.cpp
new file mode 100644
index 00000000..c498938f
--- /dev/null
+++ b/main/source/stlport/src/facets_byname.cpp
@@ -0,0 +1,1178 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+# include "stlport_prefix.h"
+
+#include <hash_map>
+#include "locale_impl.h"
+#include "c_locale.h"
+
+#include "locale_nonclassic.h"
+
+
+#include <stl/_codecvt.h>
+#include <stl/_collate.h>
+#include <stl/_ctype.h>
+#include <stl/_monetary.h>
+#include <stl/_time_facets.h>
+#include <stl/_messages_facets.h>
+#include <stl/_istream.h>
+#include <stl/_num_get.h>
+#include <stl/_num_put.h>
+
+#include <algorithm>
+// #include <stl/_ctype.h>
+#include <stl/_function.h>
+#include "c_locale.h"
+
+_STLP_BEGIN_NAMESPACE
+
+_Locale_ctype* __acquire_ctype(const char* name); 
+void __release_ctype(_Locale_ctype* cat);
+
+
+//----------------------------------------------------------------------
+// ctype_byname<char>
+
+ctype_byname<char>::ctype_byname(const char* name, size_t refs)
+  : ctype<char>(_M_byname_table+1, false, refs),
+  _M_ctype(__acquire_ctype(name))
+{
+  
+  if (!_M_ctype)
+    locale::_M_throw_runtime_error();
+  
+  // We have to do this, instead of just pointer twiddling, because
+  // ctype_base::mask isn't the same type as _Locale_mask_t.  
+
+  const _Locale_mask_t* p = _Locale_ctype_table(_M_ctype);
+
+   if (!p)
+     locale::_M_throw_runtime_error(); 
+
+  for (size_t i = 0; i < table_size + 1; ++i) {
+    _Locale_mask_t __m = p[i];
+    if (__m & (upper | lower))
+      __m |= alpha;
+    _M_byname_table[i] = ctype_base::mask(__m);
+  }
+}
+
+ctype_byname<char>::~ctype_byname()
+{
+  __release_ctype(_M_ctype);
+}
+
+char ctype_byname<char>::do_toupper(char c) const 
+{
+  return _Locale_toupper(_M_ctype, c);
+}
+
+char ctype_byname<char>::do_tolower(char c) const 
+{
+  return _Locale_tolower(_M_ctype, c);
+}
+
+const char*
+ctype_byname<char>::do_toupper(char* first, const char* last) const
+{
+  for ( ; first != last ; ++first) 
+    *first = _Locale_toupper(_M_ctype, *first);
+  return last;
+}
+
+const char*
+ctype_byname<char>::do_tolower(char* first, const char* last) const
+{
+  for ( ; first != last ; ++first) 
+    *first = _Locale_tolower(_M_ctype, *first);
+  return last;
+}
+
+
+// Some helper functions used in ctype<>::scan_is and scan_is_not.
+
+# ifndef _STLP_NO_WCHAR_T
+
+// ctype_byname<wchar_t>
+
+  struct _Ctype_byname_w_is_mask {
+    typedef wchar_t argument_type;
+    typedef bool    result_type;
+
+    /* ctype_base::mask*/ int  M;
+    _Locale_ctype* M_ctp;
+
+    _Ctype_byname_w_is_mask(/* ctype_base::mask */ int m, _Locale_ctype* c) : M((int)m), M_ctp(c) {}
+    bool operator()(wchar_t c) const
+      { return (M & _Locale_wchar_ctype(M_ctp, c, M)) != 0; }
+  };
+
+ctype_byname<wchar_t>::ctype_byname(const char* name, size_t refs)
+  : ctype<wchar_t>(refs),
+    _M_ctype(__acquire_ctype(name))
+{
+  if (!_M_ctype)
+    locale::_M_throw_runtime_error();    
+}
+
+ctype_byname<wchar_t>::~ctype_byname()
+{
+  __release_ctype(_M_ctype);
+}
+
+bool ctype_byname<wchar_t>::do_is(ctype_base::mask  m, wchar_t c) const
+{
+  return (m & _Locale_wchar_ctype(_M_ctype, c, m)) != 0;
+}
+
+const wchar_t*
+ctype_byname<wchar_t>::do_is(const wchar_t* low, const wchar_t* high,
+                             ctype_base::mask * m) const
+{
+  ctype_base::mask all_bits = ctype_base::mask(
+    ctype_base::space |
+    ctype_base::print |
+    ctype_base::cntrl |
+    ctype_base::upper |
+    ctype_base::lower |
+    ctype_base::alpha |
+    ctype_base::digit |
+    ctype_base::punct |
+    ctype_base::xdigit);
+
+  for ( ; low < high; ++low, ++m)
+    *m = ctype_base::mask (_Locale_wchar_ctype(_M_ctype, *low, all_bits));
+  return high;
+}
+
+    
+const wchar_t*
+ctype_byname<wchar_t>
+  ::do_scan_is(ctype_base::mask  m, const wchar_t* low, const wchar_t* high) const
+{
+  return find_if(low, high, _Ctype_byname_w_is_mask(m, _M_ctype));
+}
+
+const wchar_t*
+ctype_byname<wchar_t>
+  ::do_scan_not(ctype_base::mask  m, const wchar_t* low, const wchar_t* high) const
+{
+  return find_if(low, high, not1(_Ctype_byname_w_is_mask(m, _M_ctype)));
+}
+
+wchar_t ctype_byname<wchar_t>::do_toupper(wchar_t c) const 
+{
+  return _Locale_wchar_toupper(_M_ctype, c);
+}
+
+const wchar_t* 
+ctype_byname<wchar_t>::do_toupper(wchar_t* low, const wchar_t* high) const
+{
+  for ( ; low < high; ++low)
+    *low = _Locale_wchar_toupper(_M_ctype, *low);
+  return high;
+}
+
+wchar_t ctype_byname<wchar_t>::do_tolower(wchar_t c) const 
+{
+  return _Locale_wchar_tolower(_M_ctype, c);
+}
+
+const wchar_t* 
+ctype_byname<wchar_t>::do_tolower(wchar_t* low, const wchar_t* high) const
+{
+  for ( ; low < high; ++low)
+    *low = _Locale_wchar_tolower(_M_ctype, *low);
+  return high;
+}
+
+# endif /* WCHAR_T */
+
+_STLP_END_NAMESPACE
+
+
+// # include "collate_byname.cpp"
+
+#include "stl/_collate.h"
+#include "c_locale.h"
+#include <vector>
+
+_STLP_BEGIN_NAMESPACE
+
+// collate_byname<char>
+_Locale_collate* __acquire_collate(const char* name);
+void __release_collate(_Locale_collate* cat);
+
+collate_byname<char>::collate_byname(const char* name, size_t refs)
+  : collate<char>(refs),
+    _M_collate(__acquire_collate(name))
+{
+  if (!_M_collate)
+    locale::_M_throw_runtime_error();
+}
+
+collate_byname<char>::~collate_byname()
+{
+  __release_collate(_M_collate);
+}
+
+int collate_byname<char>::do_compare(const char* __low1,
+                                     const char* __high1,
+                                     const char* __low2,
+                                     const char* __high2) const {
+  return _Locale_strcmp(_M_collate,
+                        __low1, __high1 - __low1, 
+                        __low2, __high2 - __low2);
+}
+
+collate_byname<char>::string_type
+collate_byname<char>::do_transform(const char* low, const char* high) const {
+  size_t n = _Locale_strxfrm(_M_collate,
+                             NULL, 0,
+                             low, high - low);
+
+  __vector__<char, allocator<char> > buf(n);
+  _Locale_strxfrm(_M_collate, &buf.front(), n,
+                              low, high - low);
+
+   char& __c1 = *(buf.begin());
+   char& __c2 = (n == (size_t)-1) ? *(buf.begin() + (high-low-1)) : *(buf.begin() + n);
+   //   char& __c2 = *(buf.begin() + n);
+   return string_type( &__c1, &__c2 );
+}
+
+
+# ifndef _STLP_NO_WCHAR_T
+
+// collate_byname<wchar_t>
+
+collate_byname<wchar_t>::collate_byname(const char* name, size_t refs)
+  : collate<wchar_t>(refs),
+    _M_collate(__acquire_collate(name))
+{
+  if (!_M_collate)
+    locale::_M_throw_runtime_error();
+}
+
+collate_byname<wchar_t>::~collate_byname() 
+{
+  __release_collate(_M_collate);
+}
+
+int collate_byname<wchar_t>::do_compare(const wchar_t* low1,
+                                        const wchar_t* high1,
+                                        const wchar_t* low2,
+                                        const wchar_t* high2) const
+{
+  return _Locale_strwcmp(_M_collate,
+                         low1, high1 - low1, 
+                         low2, high2 - low2);
+}
+
+collate_byname<wchar_t>::string_type
+collate_byname<wchar_t>
+  ::do_transform(const wchar_t* low, const wchar_t* high) const
+{
+  size_t n = _Locale_strwxfrm(_M_collate,
+                              NULL, 0,
+                              low, high - low);
+
+  __vector__<wchar_t, allocator<wchar_t> > buf(high - low);
+  _Locale_strwxfrm(_M_collate, &buf.front(), n,
+                               low, high - low);
+  wchar_t& __c1 = *(buf.begin());
+  wchar_t& __c2 = (n == (size_t)-1) ? *(buf.begin() + (high-low-1)) : *(buf.begin() + n);
+  // wchar_t& __c2 = *(buf.begin() + n);
+  return string_type( &__c1, &__c2 );
+}
+
+# endif /*  _STLP_NO_WCHAR_T */
+
+_STLP_END_NAMESPACE
+
+# ifndef _STLP_NO_MBSTATE_T
+
+#include <stl/_codecvt.h>
+#include <stl/_algobase.h>
+#include "c_locale.h"
+
+_STLP_BEGIN_NAMESPACE
+
+
+//----------------------------------------------------------------------
+// codecvt_byname<char>
+
+codecvt_byname<char, char, mbstate_t>
+  ::codecvt_byname(const char* /* name */, size_t refs)
+    : codecvt<char, char, mbstate_t>(refs)
+{}
+
+codecvt_byname<char, char, mbstate_t>::~codecvt_byname() {}
+
+
+# ifndef _STLP_NO_WCHAR_T
+
+//----------------------------------------------------------------------
+// codecvt_byname<wchar_t>
+
+_Locale_ctype* __acquire_ctype(const char* name);
+void __release_ctype(_Locale_ctype* cat);
+
+codecvt_byname<wchar_t, char, mbstate_t>
+  ::codecvt_byname(const char* name, size_t refs)
+    : codecvt<wchar_t, char, mbstate_t>(refs),
+      _M_ctype(__acquire_ctype(name))
+{
+  if (!_M_ctype)
+    locale::_M_throw_runtime_error();
+}
+
+codecvt_byname<wchar_t, char, mbstate_t>::~codecvt_byname()
+{
+  __release_ctype(_M_ctype);
+}
+
+codecvt<wchar_t, char, mbstate_t>::result
+codecvt_byname<wchar_t, char, mbstate_t>
+  ::do_out(state_type&     state,
+           const wchar_t*  from,
+           const wchar_t*  from_end,
+           const wchar_t*& from_next,
+           char*           to,
+           char*           to_limit,
+           char*&          to_next) const
+{
+  while (from != from_end) {
+    size_t chars_stored = _Locale_wctomb(_M_ctype,
+                                         to, to_limit - to, *from,
+                                         &state);
+    if (chars_stored == (size_t) -1) {
+      from_next = from;
+      to_next   = to;
+      return error;
+    }
+
+    else if (chars_stored == (size_t) -2) {
+      from_next = from;
+      to_next   = to;
+      return partial;
+    }
+
+    ++from;
+    to += chars_stored;
+  }
+
+  from_next = from;
+  to_next   = to;
+  return ok;
+}
+
+codecvt<wchar_t, char, mbstate_t>::result
+codecvt_byname<wchar_t, char, mbstate_t>
+  ::do_in(state_type&         state,
+          const extern_type*  from,
+          const extern_type*  from_end,
+          const extern_type*& from_next,
+          intern_type*        to,
+          intern_type*        ,
+          intern_type*&       to_next) const
+{
+  while (from != from_end) {
+    size_t chars_read = _Locale_mbtowc(_M_ctype,
+                                       to, from, from_end - from,
+                                       &state);
+    if (chars_read == (size_t) -1) {
+      from_next = from;
+      to_next   = to;
+      return error;
+    }
+
+    if (chars_read == (size_t) -2) {
+      from_next = from;
+      to_next   = to;
+      return partial;
+    }
+
+    from += chars_read;
+    to++;
+  }
+
+  from_next = from;
+  to_next   = to;
+  return ok;
+}
+
+codecvt<wchar_t, char, mbstate_t>::result
+codecvt_byname<wchar_t, char, mbstate_t>
+  ::do_unshift(state_type&   state,
+               extern_type*  to,
+               extern_type*  to_limit,
+               extern_type*& to_next) const
+{
+  to_next = to;
+  size_t result = _Locale_unshift(_M_ctype, &state,
+                                  to, to_limit - to, &to_next);
+  if (result == (size_t) -1)
+    return error;
+  else if (result == (size_t) -2)
+    return partial;
+  else
+#ifdef __ISCPP__
+    return /*to_next == to ? noconv :*/ ok;
+#else
+    return to_next == to ? noconv : ok;
+#endif
+}
+
+int
+codecvt_byname<wchar_t, char, mbstate_t>::do_encoding() const _STLP_NOTHROW
+{
+  if (_Locale_is_stateless(_M_ctype)) {
+    int max_width = _Locale_mb_cur_max(_M_ctype);
+    int min_width = _Locale_mb_cur_min(_M_ctype);
+    return min_width == max_width ? min_width : 0;
+  }
+  else
+    return -1;
+}
+
+
+bool codecvt_byname<wchar_t, char, mbstate_t>
+  ::do_always_noconv() const _STLP_NOTHROW
+{
+  return false;
+}
+
+int 
+codecvt_byname<wchar_t, char, mbstate_t>::do_length(
+                                                    const state_type&,
+                                                    const  extern_type* from, const  extern_type* end,
+                                                    size_t mx) const 
+{
+  return (int)(min) ((size_t) (end - from), mx);
+}
+
+int
+codecvt_byname<wchar_t, char, mbstate_t>::do_max_length() const _STLP_NOTHROW
+{
+  return _Locale_mb_cur_max(_M_ctype);
+}
+# endif /* WCHAR_T */
+
+_STLP_END_NAMESPACE
+
+# endif /* MBSTATE_T */
+
+#include "locale_impl.h"
+# include <stl/_numpunct.h>
+
+_STLP_BEGIN_NAMESPACE
+
+_Locale_numeric*  _STLP_CALL __acquire_numeric(const char* name);
+void  _STLP_CALL __release_numeric(_Locale_numeric* cat);
+
+// numpunct_byname<char>
+
+numpunct_byname<char>::numpunct_byname(const char* name, size_t refs)
+  : numpunct<char>(refs),
+    _M_numeric(__acquire_numeric(name))
+{
+  if (!_M_numeric)
+    locale::_M_throw_runtime_error();
+
+  _M_truename  = _Locale_true(_M_numeric);
+  _M_falsename = _Locale_false(_M_numeric);
+}
+
+numpunct_byname<char>::~numpunct_byname()
+{
+  __release_numeric(_M_numeric);
+}
+
+char numpunct_byname<char>::do_decimal_point() const {
+  return _Locale_decimal_point(_M_numeric);
+}
+
+char numpunct_byname<char>::do_thousands_sep() const {
+  return _Locale_thousands_sep(_M_numeric);
+}
+
+string numpunct_byname<char>::do_grouping() const {
+  const char * __grouping = _Locale_grouping(_M_numeric);
+  if (__grouping != NULL && __grouping[0] == CHAR_MAX)
+    __grouping = "";
+  return __grouping;
+}
+
+//----------------------------------------------------------------------
+// numpunct<wchar_t>
+
+# ifndef _STLP_NO_WCHAR_T
+
+// numpunct_byname<wchar_t> 
+
+numpunct_byname<wchar_t>::numpunct_byname(const char* name, size_t refs)
+  : numpunct<wchar_t>(refs),
+    _M_numeric(__acquire_numeric(name))
+{
+  if (!_M_numeric)
+    locale::_M_throw_runtime_error();
+
+  const char* truename  = _Locale_true(_M_numeric);
+  const char* falsename = _Locale_false(_M_numeric);
+  _M_truename.resize(strlen(truename));
+  _M_falsename.resize(strlen(falsename));
+  copy(truename,  truename  + strlen(truename), _M_truename.begin());
+  copy(falsename, falsename + strlen(falsename), _M_falsename.begin());
+}
+
+numpunct_byname<wchar_t>::~numpunct_byname()
+{
+  __release_numeric(_M_numeric);
+}
+
+wchar_t numpunct_byname<wchar_t>::do_decimal_point() const {
+  return (wchar_t) _Locale_decimal_point(_M_numeric);
+}
+
+wchar_t numpunct_byname<wchar_t>::do_thousands_sep() const {
+  return (wchar_t) _Locale_thousands_sep(_M_numeric);
+}
+
+string numpunct_byname<wchar_t>::do_grouping() const {
+  const char * __grouping = _Locale_grouping(_M_numeric);
+  if (__grouping != NULL && __grouping[0] == CHAR_MAX)
+    __grouping = "";
+  return __grouping;
+}
+
+# endif
+
+_STLP_END_NAMESPACE
+
+#include <stl/_monetary.h>
+// #include <stl/_ostream.h>
+// #include <stl/_istream.h>
+#include "c_locale.h"
+
+
+_STLP_BEGIN_NAMESPACE
+
+static void _Init_monetary_formats(money_base::pattern& pos_format,
+                                    money_base::pattern& neg_format,
+                                    _Locale_monetary * monetary) {
+  switch (_Locale_p_sign_posn(monetary)) {
+    case 0: case 1:
+      pos_format.field[0] = (char) money_base::sign;
+      if (_Locale_p_cs_precedes(monetary)) {
+	pos_format.field[1] = (char) money_base::symbol;
+	if (_Locale_p_sep_by_space(monetary)) {
+	  pos_format.field[2] = (char) money_base::space;
+	  pos_format.field[3] = (char) money_base::value;
+	}
+	else {
+	  pos_format.field[2] = (char) money_base::value;
+	  pos_format.field[3] = (char) money_base::none;
+	}
+      }
+      else {
+	pos_format.field[2] = (char) money_base::value;
+	if (_Locale_p_sep_by_space(monetary)) {
+	  pos_format.field[2] = (char) money_base::space;
+	  pos_format.field[3] = (char) money_base::symbol;
+	}
+	else {
+	  pos_format.field[2] = (char) money_base::symbol;
+	  pos_format.field[3] = (char) money_base::none;
+	}
+      }       
+      break;
+    case 2:
+      if (_Locale_p_cs_precedes(monetary)) {
+	pos_format.field[0] = (char) money_base::symbol;
+	if (_Locale_p_sep_by_space(monetary)) {
+	  pos_format.field[1] = (char) money_base::space;
+	  pos_format.field[2] = (char) money_base::value;
+	  pos_format.field[3] = (char) money_base::sign;
+	}
+	else {
+	  pos_format.field[1] = (char) money_base::value;
+	  pos_format.field[2] = (char) money_base::sign;
+	  pos_format.field[3] = (char) money_base::none;
+	}
+      }
+      else {
+	pos_format.field[1] = (char) money_base::value;
+	if (_Locale_p_sep_by_space(monetary)) {
+	  pos_format.field[1] = (char) money_base::space;
+	  pos_format.field[2] = (char) money_base::symbol;
+	  pos_format.field[3] = (char) money_base::sign;
+	}
+	else {
+	  pos_format.field[1] = (char) money_base::symbol;
+	  pos_format.field[2] = (char) money_base::sign;
+	  pos_format.field[3] = (char) money_base::none;
+	}
+      }
+      break;
+    case 3:
+      if (_Locale_p_cs_precedes(monetary)) {
+	pos_format.field[0] = (char) money_base::sign;
+	pos_format.field[1] = (char) money_base::symbol;
+	if (_Locale_p_sep_by_space(monetary)) {
+	  pos_format.field[2] = (char) money_base::space;
+	  pos_format.field[3] = (char) money_base::value;
+	}
+	else {
+	  pos_format.field[2] = (char) money_base::value;
+	  pos_format.field[3] = (char) money_base::none;
+	}
+      }
+      else {
+	pos_format.field[0] = (char) money_base::value;
+	pos_format.field[1] = (char) money_base::sign;
+	pos_format.field[2] = (char) money_base::symbol;
+	pos_format.field[3] = (char) money_base::none;
+      }
+      break;
+    case 4: default:
+      if (_Locale_p_cs_precedes(monetary)) {
+	pos_format.field[0] = (char) money_base::symbol;
+	pos_format.field[1] = (char) money_base::sign;
+	pos_format.field[2] = (char) money_base::value;
+	pos_format.field[3] = (char) money_base::none;
+      }
+      else {
+	pos_format.field[0] = (char) money_base::value;
+	if (_Locale_p_sep_by_space(monetary)) {
+	  pos_format.field[1] = (char) money_base::space;
+	  pos_format.field[2] = (char) money_base::symbol;
+	  pos_format.field[3] = (char) money_base::sign;
+	}
+        else {
+	  pos_format.field[1] = (char) money_base::symbol;
+	  pos_format.field[2] = (char) money_base::sign;
+	  pos_format.field[3] = (char) money_base::none;
+	}
+      }
+    break;
+  }
+
+  switch (_Locale_n_sign_posn(monetary)) {
+    case 0: case 1:
+      neg_format.field[0] = (char) money_base::sign;
+      if (_Locale_n_cs_precedes(monetary)) {
+        neg_format.field[1] = (char) money_base::symbol;
+	if (_Locale_n_sep_by_space(monetary)) {
+	  neg_format.field[2] = (char) money_base::space;
+	  neg_format.field[3] = (char) money_base::value;
+	}
+	else {
+	  neg_format.field[2] = (char) money_base::value;
+	  neg_format.field[3] = (char) money_base::none;
+	}
+      }
+      else {
+	neg_format.field[2] = (char) money_base::value;
+	if (_Locale_n_sep_by_space(monetary)) {
+	  neg_format.field[2] = (char) money_base::space;
+	  neg_format.field[3] = (char) money_base::symbol;
+	}
+	else {
+	  neg_format.field[2] = (char) money_base::symbol;
+	  neg_format.field[3] = (char) money_base::none;
+	}
+      }       
+      break;
+    case 2:
+      if (_Locale_n_cs_precedes(monetary)) {
+	neg_format.field[0] = (char) money_base::symbol;
+	if (_Locale_n_sep_by_space(monetary)) {
+	  neg_format.field[1] = (char) money_base::space;
+	  neg_format.field[2] = (char) money_base::value;
+	  neg_format.field[3] = (char) money_base::sign;
+	}
+	else {
+	  neg_format.field[1] = (char) money_base::value;
+	  neg_format.field[2] = (char) money_base::sign;
+	  neg_format.field[3] = (char) money_base::none;
+	}
+      }
+      else {
+	neg_format.field[1] = (char) money_base::value;
+	if (_Locale_n_sep_by_space(monetary)) {
+	  neg_format.field[1] = (char) money_base::space;
+	  neg_format.field[2] = (char) money_base::symbol;
+	  neg_format.field[3] = (char) money_base::sign;
+	}
+	else {
+	  neg_format.field[1] = (char) money_base::symbol;
+	  neg_format.field[2] = (char) money_base::sign;
+	  neg_format.field[3] = (char) money_base::none;
+	}
+      }
+      break;
+    case 3:
+      if (_Locale_n_cs_precedes(monetary)) {
+	neg_format.field[0] = (char) money_base::sign;
+	neg_format.field[1] = (char) money_base::symbol;
+	if (_Locale_n_sep_by_space(monetary)) {
+	  neg_format.field[2] = (char) money_base::space;
+	  neg_format.field[3] = (char) money_base::value;
+	}
+	else {
+	  neg_format.field[2] = (char) money_base::value;
+	  neg_format.field[3] = (char) money_base::none;
+	}
+      }
+      else {
+	neg_format.field[0] = (char) money_base::value;
+	neg_format.field[1] = (char) money_base::sign;
+	neg_format.field[2] = (char) money_base::symbol;
+	neg_format.field[3] = (char) money_base::none;
+      }
+      break;
+    case 4: default:
+      if (_Locale_n_cs_precedes(monetary)) {
+	neg_format.field[0] = (char) money_base::symbol;
+	neg_format.field[1] = (char) money_base::sign;
+	neg_format.field[2] = (char) money_base::value;
+	neg_format.field[3] = (char) money_base::none;
+      }
+      else {
+	neg_format.field[0] = (char) money_base::value;
+	if (_Locale_n_sep_by_space(monetary)) {
+	  neg_format.field[1] = (char) money_base::space;
+	  neg_format.field[2] = (char) money_base::symbol;
+	  neg_format.field[3] = (char) money_base::sign;
+	}
+        else {
+	  neg_format.field[1] = (char) money_base::symbol;
+	  neg_format.field[2] = (char) money_base::sign;
+	  neg_format.field[3] = (char) money_base::none;
+	}
+      }
+      break;
+  }
+}
+
+
+//
+// moneypunct_byname<>
+//
+
+_Locale_monetary* __acquire_monetary(const char* name);
+void __release_monetary(_Locale_monetary* mon);
+
+moneypunct_byname<char, true>::moneypunct_byname(const char * name,
+						 size_t refs):
+  moneypunct<char, true>(refs),
+  _M_monetary(__acquire_monetary(name))
+{
+  if (!_M_monetary)
+    locale::_M_throw_runtime_error();
+  _Init_monetary_formats(_M_pos_format, _M_neg_format, _M_monetary);
+}
+
+moneypunct_byname<char, true>::~moneypunct_byname()
+{
+  __release_monetary(_M_monetary);
+}
+
+char moneypunct_byname<char, true>::do_decimal_point() const 
+  {return _Locale_mon_decimal_point(_M_monetary);}
+
+char moneypunct_byname<char, true>::do_thousands_sep() const
+  {return _Locale_mon_thousands_sep(_M_monetary);}
+
+string moneypunct_byname<char, true>::do_grouping() const
+  {return _Locale_mon_grouping(_M_monetary);}
+
+string moneypunct_byname<char, true>::do_curr_symbol() const
+  {return _Locale_int_curr_symbol(_M_monetary);}
+
+string moneypunct_byname<char, true>::do_positive_sign() const
+  {return _Locale_positive_sign(_M_monetary);}
+
+string moneypunct_byname<char, true>::do_negative_sign() const
+  {return _Locale_negative_sign(_M_monetary);}
+
+int moneypunct_byname<char, true>::do_frac_digits() const 
+  {return _Locale_int_frac_digits(_M_monetary);}
+
+moneypunct_byname<char, false>::moneypunct_byname(const char * name,
+						  size_t refs):
+  moneypunct<char, false>(refs),
+  _M_monetary(__acquire_monetary(name))
+{
+  if (!_M_monetary)
+    locale::_M_throw_runtime_error();
+  _Init_monetary_formats(_M_pos_format, _M_neg_format, _M_monetary);
+}
+
+moneypunct_byname<char, false>::~moneypunct_byname()
+{
+  __release_monetary(_M_monetary);
+}
+
+char moneypunct_byname<char, false>::do_decimal_point() const
+  {return _Locale_mon_decimal_point(_M_monetary);}
+
+char moneypunct_byname<char, false>::do_thousands_sep() const
+  {return _Locale_mon_thousands_sep(_M_monetary);}
+
+string moneypunct_byname<char, false>::do_grouping() const
+  {return _Locale_mon_grouping(_M_monetary);}
+
+string moneypunct_byname<char, false>::do_curr_symbol() const
+  {return _Locale_currency_symbol(_M_monetary);}
+
+string moneypunct_byname<char, false>::do_positive_sign() const
+  {return _Locale_positive_sign(_M_monetary);}
+
+string moneypunct_byname<char, false>::do_negative_sign() const
+  {return _Locale_negative_sign(_M_monetary);}
+
+int moneypunct_byname<char, false>::do_frac_digits() const 
+  {return _Locale_frac_digits(_M_monetary);}
+
+//
+// moneypunct_byname<wchar_t>
+//
+# ifndef _STLP_NO_WCHAR_T
+
+moneypunct_byname<wchar_t, true>::moneypunct_byname(const char * name,
+						 size_t refs):
+  moneypunct<wchar_t, true>(refs),
+  _M_monetary(__acquire_monetary(name))
+{
+  if (!_M_monetary)
+    locale::_M_throw_runtime_error();
+  _Init_monetary_formats(_M_pos_format, _M_neg_format, _M_monetary);
+}
+
+moneypunct_byname<wchar_t, true>::~moneypunct_byname() 
+{
+  __release_monetary(_M_monetary);
+}
+
+wchar_t moneypunct_byname<wchar_t, true>::do_decimal_point() const
+  {return _Locale_mon_decimal_point(_M_monetary);}
+
+wchar_t moneypunct_byname<wchar_t, true>::do_thousands_sep() const
+  {return _Locale_mon_thousands_sep(_M_monetary);}
+
+string moneypunct_byname<wchar_t, true>::do_grouping() const
+  {return _Locale_mon_grouping(_M_monetary);}
+
+wstring moneypunct_byname<wchar_t, true>::do_curr_symbol() const
+{
+  string str = _Locale_int_curr_symbol(_M_monetary);
+# if defined (_STLP_NO_MEMBER_TEMPLATES) || defined (_STLP_MSVC) || defined(__MRC__) || defined(__SC__)		//*ty 05/26/2001 - added workaround for mpw
+  wstring result(wstring::_Reserve_t(), str.size());
+  copy(str.begin(), str.end(), result.begin());
+# else
+  wstring result(str.begin(), str.end());
+# endif
+  return result;
+}
+
+wstring moneypunct_byname<wchar_t, true>::do_positive_sign() const
+{
+  string str = _Locale_positive_sign(_M_monetary);
+# if defined (_STLP_NO_MEMBER_TEMPLATES) || defined (_STLP_MSVC) || defined(__MRC__) || defined(__SC__)		//*ty 05/26/2001 - added workaround for mpw
+  wstring result(wstring::_Reserve_t(), str.size());
+  copy(str.begin(), str.end(), result.begin());
+# else
+  wstring result(str.begin(), str.end());
+# endif
+  return result;
+}
+
+
+wstring moneypunct_byname<wchar_t, true>::do_negative_sign() const
+{
+  string str = _Locale_negative_sign(_M_monetary);
+# if defined (_STLP_NO_MEMBER_TEMPLATES) || defined (_STLP_MSVC)  || defined(__MRC__) || defined(__SC__)		//*ty 05/26/2001 - added workaround for mpw
+  wstring result(wstring::_Reserve_t(), str.size());
+  copy(str.begin(), str.end(), result.begin());
+# else
+  wstring result(str.begin(), str.end());
+# endif
+  return result;
+}
+
+int moneypunct_byname<wchar_t, true>::do_frac_digits() const 
+  {return _Locale_int_frac_digits(_M_monetary);}
+
+moneypunct_byname<wchar_t, false>::moneypunct_byname(const char * name,
+						 size_t refs):
+  moneypunct<wchar_t, false>(refs),
+  _M_monetary(__acquire_monetary(name))
+{
+  if (!_M_monetary)
+    locale::_M_throw_runtime_error() ;
+  _Init_monetary_formats(_M_pos_format, _M_neg_format, _M_monetary);
+}
+
+moneypunct_byname<wchar_t, false>::~moneypunct_byname()
+{
+  __release_monetary(_M_monetary);
+}
+
+wchar_t moneypunct_byname<wchar_t, false>::do_decimal_point() const
+  {return _Locale_mon_decimal_point(_M_monetary);}
+
+wchar_t moneypunct_byname<wchar_t, false>::do_thousands_sep() const
+  {return _Locale_mon_thousands_sep(_M_monetary);}
+
+string moneypunct_byname<wchar_t, false>::do_grouping() const
+  {return _Locale_mon_grouping(_M_monetary);}
+
+wstring moneypunct_byname<wchar_t, false>::do_curr_symbol() const
+{
+  string str =  _Locale_currency_symbol(_M_monetary);
+# if defined (_STLP_NO_MEMBER_TEMPLATES) || defined (_STLP_MSVC) || defined(__MRC__) || defined(__SC__)		//*ty 05/26/2001 - added workaround for mpw
+  wstring result(wstring::_Reserve_t(), str.size());
+  copy(str.begin(), str.end(), result.begin());
+# else
+  wstring result(str.begin(), str.end());
+# endif
+  return result;
+}
+
+wstring moneypunct_byname<wchar_t, false>::do_positive_sign() const
+{
+  string str = _Locale_positive_sign(_M_monetary);
+# if defined (_STLP_NO_MEMBER_TEMPLATES) || defined (_STLP_MSVC) || defined(__MRC__) || defined(__SC__)		//*ty 05/26/2001 - added workaround for mpw
+  wstring result(wstring::_Reserve_t(), str.size());
+  copy(str.begin(), str.end(), result.begin());
+# else
+  wstring result(str.begin(), str.end());
+# endif
+  return result;
+}
+
+wstring moneypunct_byname<wchar_t, false>::do_negative_sign() const
+{
+  string str = _Locale_negative_sign(_M_monetary);
+# if defined (_STLP_NO_MEMBER_TEMPLATES) || defined (_STLP_MSVC) || defined(__MRC__) || defined(__SC__)		//*ty 05/26/2001 - added workaround for mpw
+  wstring result(wstring::_Reserve_t(), str.size());
+  copy(str.begin(), str.end(), result.begin());
+# else
+  wstring result(str.begin(), str.end());
+# endif
+  return result;
+}
+
+int moneypunct_byname<wchar_t, false>::do_frac_digits() const 
+  {return _Locale_frac_digits(_M_monetary);}
+
+# endif
+
+_STLP_END_NAMESPACE  
+
+#include <stl/_messages_facets.h>
+#include "message_facets.h"
+#include <typeinfo>
+
+_STLP_BEGIN_NAMESPACE
+
+void _Catalog_locale_map::insert(int key, const locale& L)
+{
+# ifdef _STLP_NO_WCHAR_T
+  typedef char _Char;
+# else
+  typedef wchar_t _Char;
+# endif
+#if !defined(_STLP_NO_TYPEINFO)
+  // Don't bother to do anything unless we're using a non-default ctype facet
+  _STLP_TRY {
+    typedef ctype<_Char> wctype;
+    wctype& wct = (wctype &)use_facet<wctype>(L);
+    wctype* zz;
+    if (typeid(&wct) != typeid(zz)) {
+      if (!M)
+        M = new hash_map<int, locale, hash<int>, equal_to<int> >;
+
+#if defined(__SC__)
+      if (!M) delete M;
+#endif
+      if (M->find(key) == M->end())
+        M->insert(pair<const int, locale>(key, L));
+    }
+  }
+  _STLP_CATCH_ALL {}
+# endif /* _STLP_NO_TYPEINFO */
+}
+
+void _Catalog_locale_map::erase(int key)
+{
+  if (M)
+    M->erase(key);
+}
+
+locale _Catalog_locale_map::lookup(int key) const
+{
+  if (M) {
+    hash_map<int, locale, hash<int>, equal_to<int> >::iterator i = M->find(key);
+    return i != M->end() ? (*i).second : locale::classic();
+  }
+  else
+    return locale::classic();
+}
+
+
+//----------------------------------------------------------------------
+//
+//
+
+_Messages_impl::_Messages_impl(bool is_wide) : 
+  _M_message_obj(0), _M_map(0)
+{ 
+  _M_delete = true;
+  if (is_wide) 
+    _M_map = new _Catalog_locale_map;
+  _M_message_obj = __acquire_messages("C");
+}
+
+_Messages_impl::_Messages_impl(bool is_wide, _Locale_messages* msg_obj ) : 
+  _M_message_obj(msg_obj), _M_map(0)
+{ 
+  _M_delete = true;
+  if (is_wide) 
+    _M_map = new _Catalog_locale_map;
+}
+
+_Messages_impl::~_Messages_impl()
+{
+  __release_messages(_M_message_obj);
+  if (_M_map) delete _M_map;
+}
+
+int _Messages_impl::do_open(const string& filename, const locale& L) const
+{  
+  int result = _M_message_obj
+    ? _Locale_catopen(_M_message_obj, filename.c_str())
+    : -1;
+
+  if (result >= 0 && _M_map != 0)
+    _M_map->insert(result, L);
+
+  return result;
+}
+
+string _Messages_impl::do_get(catalog cat,
+                              int set, int p_id, const string& dfault) const
+{
+  return _M_message_obj != 0 && cat >= 0
+    ? string(_Locale_catgets(_M_message_obj, cat, set, p_id, dfault.c_str()))
+    : dfault;
+}
+
+# ifndef _STLP_NO_WCHAR_T
+
+wstring
+_Messages_impl::do_get(catalog thecat,
+		       int set, int p_id, const wstring& dfault) const
+{
+  typedef ctype<wchar_t> wctype;
+  const wctype& ct = use_facet<wctype>(_M_map->lookup(thecat));
+
+  const char* str = _Locale_catgets(_M_message_obj, thecat, set, p_id, "");
+
+  // Verify that the lookup failed; an empty string might represent success.
+  if (!str)
+    return dfault;
+  else if (str[0] == '\0') {
+    const char* str2 = _Locale_catgets(_M_message_obj, thecat, set, p_id, "*");
+    if (!str2 || strcmp(str2, "*") == 0)
+      return dfault;
+  }
+
+  // str is correct.  Now we must widen it to get a wstring.
+  size_t n = strlen(str);
+
+  // NOT PORTABLE.  What we're doing relies on internal details of the 
+  // string implementation.  (Contiguity of string elements.)
+  wstring result(n, wchar_t(0));
+  ct.widen(str, str + n, &*result.begin());
+  return result;
+}
+
+# endif
+
+void _Messages_impl::do_close(catalog thecat) const
+{
+  if (_M_message_obj)
+    _Locale_catclose(_M_message_obj, thecat);
+  if (_M_map) _M_map->erase(thecat);
+}
+
+
+//----------------------------------------------------------------------
+// messages<char>
+
+messages<char>::messages(size_t refs)  : 
+  _BaseFacet(refs), _M_impl(new _Messages_impl(false))
+{}
+
+messages<char>::messages(size_t refs, _Locale_messages* msg_obj) : _BaseFacet(refs), 
+  _M_impl(new _Messages_impl(false, msg_obj))
+{}
+
+
+//----------------------------------------------------------------------
+// messages_byname<char>
+
+messages_byname<char>::messages_byname(const char* name, size_t refs)
+  : messages<char>(refs, name ? __acquire_messages(name) : 0)
+{}
+
+messages_byname<char>::~messages_byname()
+{}
+
+# ifndef _STLP_NO_WCHAR_T
+
+//----------------------------------------------------------------------
+// messages<wchar_t>
+
+messages<wchar_t>::messages(size_t refs)  : 
+  _BaseFacet(refs), _M_impl(new _Messages_impl(true))
+{}
+
+messages<wchar_t>::messages(size_t refs, _Locale_messages* msg_obj)
+  : _BaseFacet(refs),
+    _M_impl(new _Messages_impl(true, msg_obj))
+{}
+
+//----------------------------------------------------------------------
+// messages_byname<wchar_t>
+
+
+messages_byname<wchar_t>::messages_byname(const char* name, size_t refs)
+  : messages<wchar_t>(refs, name ? __acquire_messages(name) : 0)
+{}
+
+messages_byname<wchar_t>::~messages_byname()
+{}
+
+# endif
+
+_STLP_END_NAMESPACE
+
diff --git a/main/source/stlport/src/fstream.cpp b/main/source/stlport/src/fstream.cpp
new file mode 100644
index 00000000..6f9ffbb6
--- /dev/null
+++ b/main/source/stlport/src/fstream.cpp
@@ -0,0 +1,1179 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+
+# include "stlport_prefix.h"
+
+# if defined  (__SUNPPRO_CC)  && !defined (_STLP_NO_NEW_C_HEADERS)
+#  include <time.h>
+// For sunpro, it chokes if time.h is included through stat.h
+# endif
+
+#include <fstream>
+
+
+#ifdef __CYGWIN__
+#  define __int64 long long
+#endif
+
+#if defined (_STLP_USE_UNIX_IO)
+extern "C" {
+// open/close/read/write
+#  include <sys/stat.h>           // For stat
+#if !defined (_CRAY) && ! defined (__EMX__)
+#  include <sys/mman.h>           // For mmap
+#endif
+
+//  on HP-UX 11, this one contradicts with pthread.h on pthread_atfork, unless we unset this
+#  if defined (__hpux) && defined (__GNUC__)
+#   undef _INCLUDE_POSIX1C_SOURCE
+#  endif
+
+#  include <unistd.h>
+#  include <fcntl.h>
+}
+# ifdef __APPLE__
+#  include <sys/sysctl.h>
+# endif
+#elif defined (_STLP_USE_WIN32_IO)
+# define WIN32_LEAN_AND_MEAN
+#  include <windows.h>
+
+# ifdef __BORLANDC__
+#  if (__BORLANDC__ > 0x530)
+#  include <cfcntl.h>            // For _O_RDONLY, etc
+#  else
+#  include <fcntl.h>            // For _O_RDONLY, etc
+#  endif
+#  include <sys/stat.h>         // For _fstat
+# elif !defined(_STLP_WINCE)
+#  include <io.h>               // For _get_osfhandle
+#  include <fcntl.h>            // For _O_RDONLY, etc
+#  include <sys/stat.h>         // For _fstat
+# endif
+
+# define _TEXTBUF_SIZE 0x1000
+#elif defined (_STLP_USE_UNIX_EMULATION_IO)
+#  if defined( __MSL__ )
+#   include <unistd.h>
+#  else
+#   include <io.h>
+#  endif
+#  include <fcntl.h>
+#  include <sys/stat.h>
+
+#elif defined (_STLP_USE_STDIO_IO)
+#  include <cstdio>
+
+#  if !(defined(__MRC__) || defined(__SC__) || defined(__ISCPP__) )
+extern "C" {
+#   include <sys/stat.h>
+}
+#  endif
+#  if defined( __MSL__ )
+#   include <unix.h>
+#  endif
+#  if defined(__ISCPP__)
+#   include <c_locale_is/filestat.h>
+#  endif
+#  if defined(__BEOS__) && defined(__INTEL__)
+#   include <fcntl.h>
+#   include <sys/stat.h>         // For _fstat
+#   define _S_IREAD S_IREAD
+#   define _S_IWRITE S_IWRITE
+#   define _S_IFREG S_IFREG
+#  endif
+#else
+#error "Configure i/o !"
+#endif
+
+// map permission masks
+#if defined (_STLP_USE_UNIX_EMULATION_IO) || defined (_STLP_USE_STDIO_IO)
+# ifndef S_IRUSR
+#  define S_IRUSR _S_IREAD
+#  define S_IWUSR _S_IWRITE
+#  define S_IRGRP _S_IREAD
+#  define S_IWGRP _S_IWRITE
+#  define S_IROTH _S_IREAD
+#  define S_IWOTH _S_IWRITE
+# endif
+# ifndef O_RDONLY
+#   define O_RDONLY _O_RDONLY
+#   define O_WRONLY _O_WRONLY
+#   define O_RDWR   _O_RDWR
+#   define O_APPEND _O_APPEND
+#   define O_CREAT  _O_CREAT
+#   define O_TRUNC  _O_TRUNC
+#   define O_TEXT   _O_TEXT
+#   define O_BINARY _O_BINARY
+# endif
+
+# ifdef __MSL__
+#  define _O_TEXT 0x0
+#  if !defined( O_TEXT )
+#   define O_TEXT _O_TEXT
+#  endif
+#  define _S_IFREG S_IFREG
+#  define S_IREAD        S_IRUSR
+#  define S_IWRITE       S_IWUSR
+#  define S_IEXEC        S_IXUSR
+#  define _S_IWRITE S_IWRITE
+#  define _S_IREAD S_IREAD
+#  define _open open
+#  define _lseek lseek
+#  define _close close
+#  define _read read
+#  define _write write
+# endif
+
+#endif
+
+#ifndef O_ACCMODE
+#   define O_ACCMODE (O_RDONLY|O_WRONLY|O_RDWR)
+#endif
+
+#include "fstream_impl.h"
+
+# ifdef _STLP_LONG_LONG
+# define ULL(x) ((unsigned _STLP_LONG_LONG)x)
+// # elif defined (_MSC_VER) || defined (__BORLANDC__)
+// # define ULL(x) ((__int64)x)
+# elif defined(__MRC__) || defined(__SC__)		//*TY 02/25/2000 - added support for MPW compilers
+# include <Math64.h>
+# define ULL(x) (U64SetU(x))
+# elif defined(__ISCPP__)
+#  include "uint64.h"
+# else
+#  error "there should be some long long type on the system!"
+# endif
+
+__SGI_BEGIN_NAMESPACE
+
+#if !defined(__MSL__) && !defined(__MRC__) && !defined(__SC__) && !defined(_STLP_WINCE)		//*TY 04/15/2000 - exclude mpw compilers also
+ios_base::openmode flag_to_openmode(int mode)
+{
+  ios_base::openmode ret;
+  
+  switch(mode & O_ACCMODE) {
+
+  case O_RDONLY:
+    ret = ios_base::in; break;
+
+  case O_WRONLY:
+    ret = ios_base::out; break;
+
+  case O_RDWR:
+    ret = ios_base::in | ios_base::out; break;
+
+  }
+
+  if (mode & O_APPEND)
+    ret |= ios_base::app;
+  
+#  ifdef _STLP_USE_WIN32_IO
+  if (mode & O_BINARY)
+    ret |= ios_base::binary;
+#  endif // _MSC_VER
+
+  return ret;
+  
+}
+# endif /* MSL */
+
+// Helper functions for _Filebuf_base.
+
+bool __is_regular_file(_STLP_fd fd) {
+
+#if defined (_STLP_UNIX)
+
+  struct stat buf;
+  return fstat(fd, &buf) == 0 && S_ISREG(buf.st_mode);
+
+#elif defined(__MRC__) || defined(__SC__)		//*TY 02/25/2000 - added support for MPW compilers
+
+  #pragma unused(fd)
+  return true;  // each file is a regular file under mac os, isn't it? (we don't have fstat())
+
+#elif defined(_STLP_USE_UNIX_EMULATION_IO) || defined (_STLP_USE_STDIO_IO)
+
+  struct stat buf;
+  return fstat(fd, &buf) == 0 && (buf.st_mode & _S_IFREG) != 0 ;
+
+#   elif defined (_STLP_USE_WIN32_IO) && !defined(_STLP_WINCE)
+
+  return (GetFileType(fd) & ~FILE_TYPE_REMOTE) == FILE_TYPE_DISK;
+
+#else
+  (void)fd;    // dwa 4/27/00 - suppress unused parameter warning
+  return false;
+
+#endif
+}
+
+// Number of characters in the file.  
+streamoff __file_size(_STLP_fd fd) {
+ streamoff ret = 0;
+
+#if defined (_STLP_UNIX)
+
+  struct stat buf;
+  if(fstat(fd, &buf) == 0 && S_ISREG(buf.st_mode))
+    ret = buf.st_size > 0 ? buf.st_size : 0;
+
+#elif defined(__MRC__) || defined(__SC__)		//*TY 02/25/2000 - added support for MPW compilers
+
+  #pragma unused(fd)
+
+#elif defined(_STLP_USE_UNIX_EMULATION_IO) || defined (_STLP_USE_STDIO_IO)
+
+  struct stat buf;
+  if(fstat(fd, &buf) == 0 && (buf.st_mode & _S_IFREG) != 0)
+    ret = buf.st_size > 0 ? buf.st_size : 0;
+
+#   elif defined (_STLP_USE_WIN32_IO)
+
+ LARGE_INTEGER li;
+ li.LowPart = GetFileSize(fd, (unsigned long*) &li.HighPart);
+ if (li.LowPart == 0xFFFFFFFF && GetLastError() != NO_ERROR )
+ {
+   ret = 0;
+ } else
+   ret = li.QuadPart;
+ 
+# else
+  (void)fd;    // dwa 4/27/00 - suppress unused parameter warning  
+# endif
+  
+  return ret;
+}
+
+
+// Visual C++ and Intel use this, but not Metrowerks
+// Also MinGW, msvcrt.dll (but not crtdll.dll) dependent version
+#if (!defined(__MSL__) && !defined(_STLP_WINCE) && defined( _MSC_VER ) && defined(_WIN32)) || \
+ (defined(__MINGW32__) && defined(__MSVCRT__))
+
+// fcntl(fileno, F_GETFL) for Microsoft library
+// 'semi-documented' defines:
+#define IOINFO_L2E          5
+#define IOINFO_ARRAY_ELTS   (1 << IOINFO_L2E)
+#define _pioinfo(i) ( __pioinfo[(i) >> IOINFO_L2E] + \
+              ((i) & (IOINFO_ARRAY_ELTS - 1)) )
+#define FAPPEND         0x20    // O_APPEND flag
+#define FTEXT           0x80    // O_TEXT flag
+// end of 'semi-documented' defines
+
+// fbp : empirical
+#define F_WRITABLE           0x04
+
+// 'semi-documented' internal structure
+extern "C" {
+  struct ioinfo {
+    long osfhnd;    // the real os HANDLE
+    char osfile;    // file handle flags
+    char pipech;    // pipe buffer
+#   ifdef _MT
+    // multi-threaded locking
+    int lockinitflag;
+    CRITICAL_SECTION lock;
+#   endif  /* _MT */
+  };
+#ifdef __MINGW32__
+ __MINGW_IMPORT ioinfo * __pioinfo[];
+#else
+  extern _CRTIMP ioinfo * __pioinfo[];
+#endif
+
+} // extern "C"
+// end of 'semi-documented' declarations 
+
+ios_base::openmode _get_osfflags(int fd, HANDLE oshandle) {
+  char dosflags = 0;
+
+  dosflags = _pioinfo(fd)->osfile;
+    // end of 'semi-documented' stuff 
+  int mode = 0;
+  
+  if (dosflags & FAPPEND)
+    mode |= O_APPEND;
+  if (dosflags & FTEXT)
+    mode |= O_TEXT;
+  else
+    mode |= O_BINARY;
+
+  // we have to guess
+# ifdef __macintosh
+   DWORD dummy, dummy2;
+   if (WriteFile(oshandle, &dummy2, 0, &dummy, 0))
+     mode |= O_RDWR;
+   else
+     mode |= O_RDONLY;
+# else
+   // on Windows, this seems to work...
+   if (dosflags & F_WRITABLE)
+      mode |= O_RDWR;
+   else
+      mode |= O_RDONLY;
+# endif
+  
+  return flag_to_openmode(mode);
+}
+
+#elif defined(__DMC__)
+
+#define FHND_APPEND 0x04
+#define FHND_DEVICE 0x08
+#define FHND_TEXT   0x10
+
+extern "C" unsigned char __fhnd_info[_NFILE];
+
+ios_base::openmode _get_osfflags(int fd, HANDLE oshandle) {
+  int mode = 0;
+
+  if (__fhnd_info[fd] & FHND_APPEND)
+    mode |= O_APPEND;
+
+  if (__fhnd_info[fd] & FHND_TEXT == 0)
+    mode |= O_BINARY;
+
+  for (FILE *fp = &_iob[0]; fp < &_iob[_NFILE]; fp++)
+  {
+    if ((fileno(fp) == fd) && (fp->_flag & (_IOREAD | _IOWRT | _IORW)))
+    {
+      const int osflags = fp->_flag;
+
+      if ((osflags & _IOREAD) && !(osflags & _IOWRT) && !(osflags & _IORW))
+	mode |= O_RDONLY;
+      else if ((osflags & _IOWRT) && !(osflags & _IOREAD) && !(osflags & _IORW))
+	mode |= O_WRONLY;
+      else
+	mode |= O_RDWR;
+
+      break;
+    }
+  }
+
+  return flag_to_openmode(mode);
+}
+#endif // _MSC_VER
+
+__SGI_END_NAMESPACE
+
+// All version of Unix have mmap and lseek system calls.  Some also have
+// longer versions of thos system calls to accommodate 64-bit offsets.
+// If we're on a Unix system, define some macros to encapsulate those
+// differences.
+#ifdef _STLP_USE_UNIX_IO
+# ifdef __sgi /* IRIX */
+#  define LSEEK lseek64
+#  define MMAP  mmap64
+# else
+#  define LSEEK lseek
+#  define MMAP  mmap
+# endif
+
+#ifndef MAP_FAILED /* MMAP failure return code */
+# define MAP_FAILED -1
+#endif
+
+#elif defined (_STLP_USE_UNIX_EMULATION_IO)
+#  define LSEEK _lseek
+#endif
+
+
+_STLP_BEGIN_NAMESPACE
+
+size_t
+_Filebuf_base::_M_page_size = 4096;
+
+_Filebuf_base::_Filebuf_base()
+  : _M_file_id((_STLP_fd)-1),
+    _M_openmode(0),
+    _M_is_open(false),
+    _M_should_close(false)
+{
+  if (!_M_page_size)
+#if defined (_STLP_UNIX)  && !defined(__DJGPP) && !defined(_CRAY)
+#  if defined (__APPLE__)
+   {
+   int mib[2];
+   size_t pagesize, len;
+   mib[0] = CTL_HW;
+   mib[1] = HW_PAGESIZE;
+   len = sizeof(pagesize);
+   sysctl(mib, 2, &pagesize, &len, NULL, 0);
+   _M_page_size = pagesize;
+   }
+# elif defined(__DJGPP) && defined(_CRAY)
+   _M_page_size = BUFSIZ;
+#  else
+  _M_page_size = sysconf(_SC_PAGESIZE);
+#  endif
+# elif defined (_STLP_USE_WIN32_IO)
+  {
+  SYSTEM_INFO SystemInfo;
+  GetSystemInfo(&SystemInfo);
+  _M_page_size = SystemInfo.dwPageSize;
+  // might be .dwAllocationGranularity
+  }
+  //  _M_CRLF_trans_buf = 0,
+  //  _M_trans_buf_end=0,   
+  _M_view_id = 0;
+#endif
+
+  if (_M_page_size <=0 )
+    _M_page_size = 4096;
+
+}
+
+
+// Return the size of the file.  This is a wrapper for stat.
+// Returns zero if the size cannot be determined or is ill-defined.
+streamoff 
+_Filebuf_base::_M_file_size()
+{
+  return _SgI::__file_size(_M_file_id);
+}
+
+bool _Filebuf_base::_M_open(const char* name, ios_base::openmode openmode,
+                            long permission)
+{
+  _STLP_fd file_no;
+
+  if (_M_is_open)
+    return false;
+
+#if defined (_STLP_USE_UNIX_IO) || defined (_STLP_USE_UNIX_EMULATION_IO)
+
+  int flags = 0;
+
+  // Unix makes no distinction between text and binary files.
+  switch(openmode & (~ios_base::ate & ~ios_base::binary)) {
+  case ios_base::out:
+  case ios_base::out | ios_base::trunc:
+    flags = O_WRONLY | O_CREAT | O_TRUNC;
+    break;
+  case ios_base::out | ios_base::app:
+    flags = O_WRONLY | O_CREAT | O_APPEND;
+    break;
+  case ios_base::in:
+    flags = O_RDONLY;
+    permission = 0;             // Irrelevant unless we're writing.
+    break;
+  case ios_base::in | ios_base::out:
+    flags = O_RDWR;
+    break;
+  case ios_base::in | ios_base::out | ios_base::trunc:
+    flags = O_RDWR | O_CREAT | O_TRUNC;
+    break;
+  default:                      // The above are the only combinations of 
+    return false;               // flags allowed by the C++ standard.
+  }
+
+# if defined (_STLP_USE_UNIX_EMULATION_IO)
+
+  if (openmode & ios_base::binary)
+    flags |= O_BINARY;
+  else
+    flags |= O_TEXT;
+
+  file_no = _open(name, flags, permission);
+
+# else
+
+  file_no = open(name, flags, permission);
+
+# endif /* _STLP_USE_UNIX_EMULATION_IO */
+
+  if (file_no < 0)
+    return false;
+
+  _M_is_open = true;
+
+  if (openmode & ios_base::ate)
+    if (LSEEK(file_no, 0, SEEK_END) == -1)
+      _M_is_open = false;
+  
+#elif defined (_STLP_USE_STDIO_IO)
+  // use FILE-based i/o
+  const char* flags;
+
+  switch(openmode & (~ios_base::ate)) {
+  case ios_base::out:
+  case ios_base::out | ios_base::trunc:
+    flags = "w";
+    break;
+
+  case ios_base::out | ios_base::binary:
+  case ios_base::out | ios_base::trunc | ios_base::binary:
+    flags = "wb";
+    break;
+
+  case ios_base::out | ios_base::app:
+    flags = "a";
+    break;
+
+  case ios_base::out | ios_base::app | ios_base::binary:
+    flags = "ab";
+    break;
+
+  case ios_base::in:
+    flags = "r";
+    break;
+
+  case ios_base::in | ios_base::binary:
+    flags = "rb";
+    break;
+
+  case ios_base::in | ios_base::out:
+    flags = "r+";
+    break;
+
+  case ios_base::in | ios_base::out | ios_base::binary:
+    flags = "r+b";
+    break;
+
+
+  case ios_base::in | ios_base::out | ios_base::trunc:
+    flags = "w+";
+    break;
+
+  case ios_base::in | ios_base::out | ios_base::trunc | ios_base::binary:
+    flags = "w+b";
+    break;
+
+  default:                      // The above are the only combinations of 
+    return false;               // flags allowed by the C++ standard.
+  }
+
+  // fbp : TODO : set permissions !
+  (void)permission; // currently unused		//*TY 02/26/2000 - added to suppress warning message
+  _M_file = fopen(name, flags);
+ 
+  if (_M_file) {
+    file_no = fileno(_M_file);
+  }
+  else
+    return false;
+
+  // unset buffering immediately
+  setbuf(_M_file, 0);
+
+  _M_is_open = true;
+
+  if (openmode & ios_base::ate)
+    if (fseek(_M_file, 0, SEEK_END) == -1)
+      _M_is_open = false;
+  
+#   elif defined (_STLP_USE_WIN32_IO)
+
+  DWORD dwDesiredAccess, dwShareMode, dwCreationDisposition;
+  bool  doTruncate = false;
+
+  switch(openmode & (~ios_base::ate & ~ios_base::binary)) {
+  case ios_base::out:
+  case ios_base::out | ios_base::trunc:
+    dwDesiredAccess = GENERIC_WRITE;
+    dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE;
+    dwCreationDisposition = OPEN_ALWAYS;
+    // boris : even though it is very non-intuitive, standard
+    // requires them both to behave same.
+    doTruncate = true;
+    break;
+
+  case ios_base::out | ios_base::app:
+    dwDesiredAccess = GENERIC_WRITE;
+    dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE;
+    dwCreationDisposition = OPEN_ALWAYS;
+    break;
+  case ios_base::in:
+    dwDesiredAccess = GENERIC_READ;
+    dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE;
+    dwCreationDisposition = OPEN_EXISTING;
+    permission = 0;             // Irrelevant unless we're writing.
+    break;
+  case ios_base::in | ios_base::out:
+    dwDesiredAccess = GENERIC_READ | GENERIC_WRITE;
+    dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE;
+    dwCreationDisposition = OPEN_EXISTING;
+    break;
+  case ios_base::in | ios_base::out | ios_base::trunc:
+    dwDesiredAccess = GENERIC_READ | GENERIC_WRITE;
+    dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE;
+    dwCreationDisposition = OPEN_ALWAYS;
+    doTruncate = true;
+    break;
+  default:                      // The above are the only combinations of
+    return false;               // flags allowed by the C++ standard.
+  }
+
+  #if defined(_STLP_WINCE)
+    file_no = CreateFile(__ASCIIToWide(name).c_str(),
+  #else
+    file_no = CreateFileA(name,
+  #endif
+                  dwDesiredAccess, dwShareMode, 0,
+			dwCreationDisposition, permission, 0);
+  
+  if ( file_no == INVALID_HANDLE_VALUE )
+  return false;
+
+  if ((doTruncate && SetEndOfFile(file_no) == 0) ||
+      ((openmode & ios_base::ate) && SetFilePointer(file_no, 0, NULL, FILE_END) == -1)) {
+    CloseHandle(file_no);
+    return false;
+  }
+
+  _M_is_open = true;
+ 
+#else
+# error "Port!"  
+#endif /* __unix */
+
+
+  _M_file_id = file_no;
+  _M_should_close = _M_is_open;
+  _M_openmode = openmode;
+
+  if (_M_is_open)
+    _M_regular_file = _SgI::__is_regular_file(_M_file_id);
+  
+  return _M_is_open;
+}
+
+  
+bool _Filebuf_base::_M_open(const char* name, ios_base::openmode openmode)
+{
+  // This doesn't really grant everyone in the world read/write
+  // access.  On Unix, file-creation system calls always clear 
+  // bits that are set in the umask from the permissions flag.
+# ifdef _STLP_USE_WIN32_IO
+  return this->_M_open(name, openmode, FILE_ATTRIBUTE_NORMAL);
+# elif defined(__MRC__) || defined(__SC__)		//*TY 02/26/2000 - added support for MPW compilers
+  return this->_M_open(name, openmode, 0);
+# else
+  return this->_M_open(name, openmode, S_IRUSR | S_IWUSR | S_IRGRP | 
+                                       S_IWGRP | S_IROTH | S_IWOTH);
+# endif
+}
+
+      
+// Associated the filebuf with a file descriptor pointing to an already-
+// open file.  Mode is set to be consistent with the way that the file
+// was opened.
+bool _Filebuf_base::_M_open(int file_no, ios_base::openmode init_mode) {
+
+  if (_M_is_open || file_no < 0)
+    return false;
+
+# if defined (_STLP_UNIX)
+  (void)init_mode;    // dwa 4/27/00 - suppress unused parameter warning
+  int mode ;
+  mode = fcntl(file_no, F_GETFL);
+
+  if (mode == -1)
+    return false;
+
+  _M_openmode = _SgI::flag_to_openmode(mode);
+  
+# elif defined(__MRC__) || defined(__SC__)		//*TY 02/26/2000 - added support for MPW compilers
+  (void)init_mode;    // dwa 4/27/00 - suppress unused parameter warning
+  switch( _iob[file_no]._flag & (_IOREAD|_IOWRT|_IORW) )
+  {
+  case _IOREAD:
+    _M_openmode = ios_base::in; break;
+  case _IOWRT:
+    _M_openmode = ios_base::out; break;
+  case _IORW:
+    _M_openmode = ios_base::in | ios_base::out; break;
+  default:
+  	return false;
+  }
+  
+# elif defined (_STLP_USE_UNIX_EMULATION_IO) || defined (_STLP_USE_STDIO_IO) 
+  (void)init_mode;    // dwa 4/27/00 - suppress unused parameter warning
+  int mode ;
+  struct stat buf;
+  if (fstat(file_no, &buf) != 0)
+    return false;
+  mode = buf.st_mode;
+  
+  switch(mode & (_S_IWRITE | _S_IREAD) ) {
+  case _S_IREAD:
+    _M_openmode = ios_base::in; break;
+  case _S_IWRITE:
+    _M_openmode = ios_base::out; break;
+  case (_S_IWRITE | _S_IREAD):
+    _M_openmode = ios_base::in | ios_base::out; break;
+  default:
+    return false;
+  }
+# elif (defined(_STLP_USE_WIN32_IO) && defined (_MSC_VER) && !defined(_STLP_WINCE)) || \
+        (defined(__MINGW32__) && defined(__MSVCRT__)) || defined(__DMC__)
+
+  if (_M_is_open || file_no == -1)
+    return false;
+
+  HANDLE oshandle = (HANDLE)_get_osfhandle(file_no);
+  
+  if ((long)oshandle != -1)
+	file_no = (int)oshandle;
+  else
+    return false;
+  
+  if (init_mode != ios_base::__default_mode)
+    _M_openmode = init_mode;
+  else
+    _M_openmode = _SgI::_get_osfflags(file_no, oshandle);
+  
+# else
+  (void)init_mode;    // dwa 4/27/00 - suppress unused parameter warning
+
+  // not available for the API
+  return false;
+
+# endif
+  
+
+  _M_is_open = true;
+  _M_file_id = (_STLP_fd)file_no;
+  _M_should_close = false;
+  _M_regular_file = _SgI::__is_regular_file(_M_file_id);
+
+  return true;
+}
+
+bool _Filebuf_base::_M_close() {
+  if (!_M_is_open)
+    return false;
+
+  bool ok;
+
+  if (!_M_should_close)
+    ok = true;
+  else {
+    
+#   if defined (_STLP_USE_UNIX_IO)
+
+    ok = (close(_M_file_id) == 0);
+
+#   elif defined (_STLP_USE_UNIX_EMULATION_IO)
+
+    ok = (_close(_M_file_id) == 0);
+
+#   elif defined (_STLP_USE_STDIO_IO)
+
+    ok = (fclose(_M_file) == 0);
+
+#   elif defined (_STLP_USE_WIN32_IO)
+
+    if ( _M_file_id != INVALID_HANDLE_VALUE ) {
+      ok = (CloseHandle(_M_file_id) != 0);
+    }
+    else {
+      ok = false;
+    }
+    
+#   else
+
+    ok = false;
+
+#   endif /* _STLP_USE_UNIX_IO */
+  }
+
+  _M_is_open = _M_should_close = false;
+  _M_openmode = 0;
+  return ok;
+}
+
+
+# define _STLP_LF 10
+# define _STLP_CR 13
+# define _STLP_CTRLZ 26
+
+// Read up to n characters into a buffer.  Return value is number of
+// characters read.
+ptrdiff_t _Filebuf_base::_M_read(char* buf, ptrdiff_t n) {
+#   if defined (_STLP_USE_UNIX_IO)
+
+  return read(_M_file_id, buf, n);
+
+#   elif defined (_STLP_USE_UNIX_EMULATION_IO)
+
+  return _read(_M_file_id, buf, n);
+
+#   elif defined (_STLP_USE_WIN32_IO)
+  
+  DWORD NumberOfBytesRead;
+  ReadFile(_M_file_id, (LPVOID)buf, (DWORD)n, 
+           &NumberOfBytesRead, 0);
+
+  if ((! (_M_openmode & ios_base::binary)) && NumberOfBytesRead) { 
+    // translate CR-LFs to LFs in the buffer
+    char * to = buf, * last = buf + NumberOfBytesRead - 1;
+    char * from;
+    for (from = buf; from <= last && * from != _STLP_CTRLZ; ++ from ) {
+      if (* from != _STLP_CR)
+        * to ++ = * from;
+      else { // found CR
+        if (from < last) { // not at buffer end
+          if (* (from + 1) != _STLP_LF)
+            * to ++ = _STLP_CR;
+        }
+        else { // last char is CR, peek for LF
+          char peek = ' ';
+          DWORD NumberOfBytesPeeked;
+          ReadFile(_M_file_id, (LPVOID)&peek, 
+                        1, &NumberOfBytesPeeked, 0);
+          if (NumberOfBytesPeeked) {
+            if (peek != _STLP_LF) { //not a <CR><LF> combination
+            * to ++ = _STLP_CR;
+              SetFilePointer(_M_file_id,(LONG)-1,0,SEEK_CUR);
+			}
+            else {
+              //We ignore the complete combinaison:
+              SetFilePointer(_M_file_id,(LONG)-2,0,SEEK_CUR);
+			}
+		  }
+        }
+      } // found CR
+    } // for
+    // seek back to TEXT end of file if hit CTRL-Z
+    if (from <= last) // terminated due to CTRLZ
+      SetFilePointer(_M_file_id,(LONG)((last+1) - from),0,SEEK_CUR);
+    NumberOfBytesRead = to - buf;
+  }
+  return (ptrdiff_t)NumberOfBytesRead;
+  
+#   elif defined (_STLP_USE_STDIO_IO)
+  
+  return fread(buf, 1, n, _M_file);
+  
+#   else 
+#    error "Port!"
+# endif /* __unix */
+}
+
+// Write n characters from a buffer.  Return value: true if we managed
+// to write the entire buffer, false if we didn't.  
+bool _Filebuf_base::_M_write(char* buf, ptrdiff_t n) {
+  
+  while (true) {
+    ptrdiff_t written;
+    
+#   if defined (_STLP_USE_UNIX_IO)
+
+    written = write(_M_file_id, buf, n);
+
+#   elif defined (_STLP_USE_UNIX_EMULATION_IO)
+
+    written = _write(_M_file_id, buf, n);
+
+#   elif defined (_STLP_USE_WIN32_IO)
+
+    // In append mode, every write does an implicit seek to the end
+    // of the file.
+    if (_M_openmode & ios_base::app)
+      _M_seek( 0, ios_base::end);
+    
+    if (_M_openmode & ios_base::binary) { 
+      // binary mode
+      DWORD NumberOfBytesWritten;
+      WriteFile(_M_file_id, (LPVOID)buf, (DWORD)n, 
+                &NumberOfBytesWritten, 0);
+      written = (ptrdiff_t)NumberOfBytesWritten;
+    }
+    else {
+      char textbuf[_TEXTBUF_SIZE + 1]; // extra 1 in case LF at end
+      char * nextblock = buf, * ptrtextbuf = textbuf;
+      char * endtextbuf = textbuf + _TEXTBUF_SIZE;
+      char * endblock = buf + n;
+      ptrdiff_t nextblocksize = (min) (n, (ptrdiff_t)_TEXTBUF_SIZE);
+      char * nextlf;
+      
+      while ( (nextblocksize > 0) && 
+              (nextlf = (char *)memchr(nextblock, _STLP_LF, nextblocksize)) != 0) {
+        ptrdiff_t linelength = nextlf - nextblock;
+        memcpy(ptrtextbuf, nextblock, linelength);
+        ptrtextbuf += linelength;
+        nextblock += (linelength + 1);
+        * ptrtextbuf ++ = _STLP_CR;
+        * ptrtextbuf ++ = _STLP_LF;
+        nextblocksize = (min) (ptrdiff_t(endblock - nextblock), 
+                                             (max) (ptrdiff_t(0), ptrdiff_t(endtextbuf - ptrtextbuf)));
+      }
+      // write out what's left, > condition is here since for LF at the end , 
+      // endtextbuf may get < ptrtextbuf ...
+      if (nextblocksize > 0) {
+        memcpy(ptrtextbuf, nextblock, nextblocksize);
+        ptrtextbuf += nextblocksize;
+        nextblock += nextblocksize;
+      }
+      // now write out the translated buffer
+      char * writetextbuf = textbuf;
+      for (ptrdiff_t NumberOfBytesToWrite = ptrtextbuf - textbuf; 
+           NumberOfBytesToWrite;) {
+        DWORD NumberOfBytesWritten;
+        WriteFile((HANDLE)_M_file_id, (LPVOID)writetextbuf, 
+                  NumberOfBytesToWrite, &NumberOfBytesWritten, 0);
+        if (NumberOfBytesWritten == NumberOfBytesToWrite)
+          break;
+        if (!NumberOfBytesWritten) // write shortfall
+          return false;
+        writetextbuf += NumberOfBytesWritten;
+        NumberOfBytesToWrite -=	NumberOfBytesWritten;
+      }
+      // count non-translated characters
+      written = (nextblock - buf);
+    }
+
+#   elif defined (_STLP_USE_STDIO_IO)
+
+    written = fwrite(buf, 1, n, _M_file);
+
+#   else 
+#    error "Port!"
+#   endif /* __unix */ 
+    
+    if (n == written)
+      return true;
+    else if (written > 0 && written < n) {
+      n -= written;
+      buf += written;
+    }
+    else
+      return false;
+  }
+}
+
+
+#ifdef _STLP_USE_WIN32_IO
+# define STL_SEEK_SET FILE_BEGIN
+# define STL_SEEK_CUR FILE_CURRENT
+# define STL_SEEK_END FILE_END
+#else
+# define STL_SEEK_SET SEEK_SET
+# define STL_SEEK_CUR SEEK_CUR
+# define STL_SEEK_END SEEK_END
+#endif
+
+// Wrapper for lseek or the like.
+streamoff _Filebuf_base::_M_seek(streamoff offset, ios_base::seekdir dir)
+{
+  streamoff result = -1;
+
+  int whence;
+
+  switch(dir) {
+  case ios_base::beg:
+    if (offset < 0 /* || offset > _M_file_size() */ )
+      return streamoff(-1);
+    whence = STL_SEEK_SET;
+    break;
+  case ios_base::cur:
+    whence = STL_SEEK_CUR;
+    break;
+  case ios_base::end:
+    if (/* offset > 0 || */  -offset > _M_file_size() )
+      return streamoff(-1);
+    whence = STL_SEEK_END;
+    break;
+  default:
+    return streamoff(-1);
+  }
+
+#if defined (_STLP_USE_UNIX_IO) || defined (_STLP_USE_UNIX_EMULATION_IO)
+
+  result = LSEEK(_M_file_id, offset, whence);
+
+#elif defined (_STLP_USE_STDIO_IO)
+
+  result = fseek(_M_file, offset, whence);
+
+#elif defined (_STLP_USE_WIN32_IO)
+
+  LARGE_INTEGER li;
+  li.QuadPart = offset;
+  li.LowPart = SetFilePointer(_M_file_id, li.LowPart, &li.HighPart, whence);
+  if (li.LowPart == 0xFFFFFFFF && GetLastError() != NO_ERROR)
+    result = -1; // Error
+  else
+    result = li.QuadPart;
+
+#else
+#   error "Port!"
+#endif
+
+  return result;
+}
+
+
+// Attempts to memory-map len bytes of the current file, starting
+// at position offset.  Precondition: offset is a multiple of the
+// page size.  Postcondition: return value is a null pointer if the
+// memory mapping failed.  Otherwise the return value is a pointer to 
+// the memory-mapped file and the file position is set to offset.
+void* _Filebuf_base::_M_mmap(streamoff offset, streamoff len) {
+  void* base;
+#if defined (_STLP_UNIX) && !defined(__DJGPP) && !defined(_CRAY)
+  base = MMAP(0, len, PROT_READ, MAP_PRIVATE, _M_file_id, offset);
+  if (base != (void*)MAP_FAILED) {
+    if (LSEEK(_M_file_id, offset + len, SEEK_SET) < 0) {
+      this->_M_unmap(base, len);
+      base = 0;
+    }
+  } else
+    base =0;
+
+#elif defined (_STLP_USE_WIN32_IO)
+
+  _M_view_id = CreateFileMapping(_M_file_id, (PSECURITY_ATTRIBUTES)0 ,
+				 PAGE_READONLY, 0 /* len >> 32 */ , 
+				 0 /* len & 0xFFFFFFFF */ ,             // low-order DWORD of size
+				 0);
+
+  if (_M_view_id) {
+# if 0
+    printf("view %x created from file %x, error = %d, size = %d, map_offset = %d map_len = %d\n", 
+	   _M_view_id, _M_file_id, GetLastError(), 
+	   (int)cur_filesize, ULL(offset) & 0xffffffff, len);
+# endif
+    
+    base = MapViewOfFile(_M_view_id, FILE_MAP_READ, ULL(offset)>>32, 
+			 ULL(offset) & 0xffffffff, len);
+    // check if mapping succeded and is usable
+    if (base ==0  || _M_seek(offset+len, ios_base::beg) < 0) {
+      this->_M_unmap(base, len);
+      base = 0;
+    }
+  } else
+    base = 0;
+#else
+  (void)len;		//*TY 02/26/2000 - unused variables
+  (void)offset;		//*TY 02/26/2000 - 
+  base = 0;
+#endif
+  return base;  
+}
+
+void _Filebuf_base::_M_unmap(void* base, streamoff len) {
+  // precondition : there is a valid mapping at the moment
+#if defined (_STLP_UNIX)  && !defined(__DJGPP) && !defined(_CRAY)
+  munmap((char*)base, len);
+#elif defined (_STLP_USE_WIN32_IO)
+  if ( base != NULL )
+    UnmapViewOfFile(base);
+  // destroy view handle as well
+  if ( _M_view_id != NULL )
+    CloseHandle(_M_view_id);
+  _M_view_id = 0;
+  base = 0;
+#else
+  (void)len;		//*TY 02/26/2000 - unused variables
+  (void)base;		//*TY 02/26/2000 - 
+#endif
+}
+
+// fbp : let us map 1 MB maximum, just be sure not to trash VM
+# define MMAP_CHUNK 0x100000UL
+
+int _STLP_CALL
+_Underflow<char, char_traits<char> >::_M_doit (basic_filebuf<char, char_traits<char> >* __this)  
+{
+  if (!__this->_M_in_input_mode) {
+    if (!__this->_M_switch_to_input_mode())
+      return traits_type::eof();
+  }
+  
+  else if (__this->_M_in_putback_mode) {
+    __this->_M_exit_putback_mode();
+    if (__this->gptr() != __this->egptr()) {
+      int_type __c = traits_type::to_int_type(*__this->gptr());
+      return __c;
+    }
+  }
+    
+  // If it's a disk file, and if the internal and external character
+  // sequences are guaranteed to be identical, then try to use memory
+  // mapped I/O.  Otherwise, revert to ordinary read.
+  if (__this->_M_base.__regular_file() 
+      && __this->_M_always_noconv
+      && __this->_M_base._M_in_binary_mode()) {
+    // If we've mmapped part of the file already, then unmap it.
+    if (__this->_M_mmap_base)
+      __this->_M_base._M_unmap(__this->_M_mmap_base, __this->_M_mmap_len);
+    __this->_M_mmap_base = 0;
+    __this->_M_mmap_len = 0;
+      
+    // Determine the position where we start mapping.  It has to be
+    // a multiple of the page size.
+    streamoff __cur = __this->_M_base._M_seek(0, ios_base::cur);
+    streamoff __size = __this->_M_base._M_file_size();
+    if (__size > 0 && __cur >= 0 && __cur < __size) {
+      streamoff __offset    = (__cur / __this->_M_base.__page_size())
+	* __this->_M_base.__page_size();
+      streamoff __remainder = __cur - __offset;
+
+      __this->_M_mmap_len = __size - __offset;
+
+      if (__this->_M_mmap_len > MMAP_CHUNK)
+	__this->_M_mmap_len = MMAP_CHUNK;
+
+      if ((__this->_M_mmap_base =
+	   __this->_M_base._M_mmap(__offset, __this->_M_mmap_len)) != 0) {
+	__this->setg((char*) __this->_M_mmap_base,
+		     (char*) __this->_M_mmap_base + __remainder,
+		     (char*) __this->_M_mmap_base + __this->_M_mmap_len);
+	return traits_type::to_int_type(*__this->gptr());
+      } 
+    } else /* size > 0 ... */ {
+      // There is nothing to map. We unmapped the file above, now zap pointers.
+      __this->_M_mmap_base = 0;
+      __this->_M_mmap_len = 0;
+    }
+  }
+    
+  return __this->_M_underflow_aux();
+}
+
+
+//----------------------------------------------------------------------
+// Force instantiation of filebuf and fstream classes.
+#if !defined(_STLP_NO_FORCE_INSTANTIATE)
+
+template class basic_filebuf<char, char_traits<char> >;
+template class basic_ifstream<char, char_traits<char> >;
+template class basic_ofstream<char, char_traits<char> >;
+template class basic_fstream<char, char_traits<char> >;
+
+#  ifndef _STLP_NO_WCHAR_T
+template class _Underflow<wchar_t, char_traits<wchar_t> >;
+template class basic_filebuf<wchar_t, char_traits<wchar_t> >;
+template class basic_ifstream<wchar_t, char_traits<wchar_t> >;
+template class basic_ofstream<wchar_t, char_traits<wchar_t> >;
+template class basic_fstream<wchar_t, char_traits<wchar_t> >;
+#  endif /* _STLP_NO_WCHAR_T */
+
+#endif
+
+_STLP_END_NAMESPACE
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/src/fstream_impl.h b/main/source/stlport/src/fstream_impl.h
new file mode 100644
index 00000000..cb3aab64
--- /dev/null
+++ b/main/source/stlport/src/fstream_impl.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+#ifndef FSTREAM_IMPL_H
+# define FSTREAM_IMPL_H
+
+#include <stl/_stdio_file.h>
+
+# ifdef _STLP_HAS_NO_NAMESPACES
+#  define __SGI_BEGIN_NAMESPACE
+#  define __SGI_END_NAMESPACE
+#  define _SgI
+# else
+#  define __SGI_BEGIN_NAMESPACE namespace _SgI {
+#  define __SGI_END_NAMESPACE }
+# endif
+
+__SGI_BEGIN_NAMESPACE
+
+# ifndef _STLP_HAS_NO_NAMESPACES
+using _STLP_STD::streamoff;
+using _STLP_STD::ios_base;
+using _STLP_STD::streamsize;
+using _STLP_STD::streamoff;
+using _STLP_STD::char_traits;
+# ifndef _STLP_USE_UNIX_IO
+using _STLP_VENDOR_CSTD::FILE;
+using _STLP_VENDOR_CSTD::ftell;
+# endif
+
+using _STLP_STD::_FILE_fd;
+# endif
+
+extern bool __is_regular_file(_STLP_fd fd);
+extern streamoff __file_size(_STLP_fd fd);
+
+__SGI_END_NAMESPACE
+
+#endif /* FSTREAM_IMPL_H */
diff --git a/main/source/stlport/src/gcc-99r1-sun.mak b/main/source/stlport/src/gcc-99r1-sun.mak
new file mode 100644
index 00000000..6c35bf3b
--- /dev/null
+++ b/main/source/stlport/src/gcc-99r1-sun.mak
@@ -0,0 +1,66 @@
+#
+# Note : this makefile is for gcc-2.95 and later !
+#
+
+#
+# compiler
+#
+CC = gcc
+CXX = c++ -pthreads
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_gcc99r1
+
+#
+# guts for common stuff
+#
+#
+LINK=ar cr
+# 2.95 flag
+DYN_LINK=c++ -pthreads -shared -o
+
+OBJEXT=o
+DYNEXT=so
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=GCC-99r1
+INSTALL_STEP = install_unix 
+
+all:  all_dynamic all_static symbolic_links
+
+include common_macros.mak
+
+WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
+
+CXXFLAGS_COMMON =  -nostdinc++ -fexceptions -ftemplate-depth-32 -D_STLP_HAS_NO_NAMESPACES -shared -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -gstabs
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -gstabs -fPIC
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+
+LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic}
+
+LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic}
+
+LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic}
+
+LDLIBS_RELEASE_dynamic =  -lposix4
+
+LDLIBS_STLDEBUG_dynamic = -lposix4
+
+include common_percent_rules.mak
+include common_rules.mak
+
+#%.s: %.cpp
+#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+
diff --git a/main/source/stlport/src/gcc-amigaos-m68k.mak b/main/source/stlport/src/gcc-amigaos-m68k.mak
new file mode 100644
index 00000000..28d7ba20
--- /dev/null
+++ b/main/source/stlport/src/gcc-amigaos-m68k.mak
@@ -0,0 +1,46 @@
+#
+# Note : this makefile is for gcc-2.95.3 and later !
+#
+
+#
+# compiler
+#
+CC = gcc -noixemul -m68020
+CXX = g++ -noixemul -m68020 -ftemplate-depth-32
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_gcc
+
+#
+# guts for common stuff
+#
+#
+LINK=ar cr
+OBJEXT=o
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=GCC$(ARCH)
+
+all: release_static
+
+include common_macros.mak
+
+WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
+
+CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+
+include common_percent_rules.mak
+include common_rules.mak
+
+$(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) : $(OUTDIR) $(RELEASE_OBJDIR_static) $(DEF_FILE) $(RELEASE_OBJECTS_static)
+	$(LINK) $(LINK_OUT)$(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) $(LDFLAGS_RELEASE_static) $(RELEASE_OBJDIR_static)$(PATH_SEP)*.$(OBJEXT) $(LDLIBS_RELEASE_static)
diff --git a/main/source/stlport/src/gcc-apple-macosx.mak b/main/source/stlport/src/gcc-apple-macosx.mak
new file mode 100644
index 00000000..c3d0b3f6
--- /dev/null
+++ b/main/source/stlport/src/gcc-apple-macosx.mak
@@ -0,0 +1,52 @@
+#
+# Note : this makefile is for gcc-2.95 and later !
+#
+
+#
+# compiler
+#
+CC = gcc
+CXX = c++ -fexceptions
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_gcc
+
+#
+# guts for common stuff
+#
+#
+LINK=libtool -static -o
+# 2.95 flag
+DYN_LINK=libtool -dynamic -framework System -lcc_dynamic -lstdc++ -install_name @executable_path/$(@F) -o
+
+OBJEXT=o
+DYNEXT=dylib
+STEXT=a
+RM=rm -Rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=GCC$(ARCH)
+INSTALL_STEP = install_unix 
+
+all: all_dynamic all_static
+
+include common_macros.mak
+
+WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
+
+CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fPIC
+
+include common_percent_rules.mak
+include common_rules.mak
+
diff --git a/main/source/stlport/src/gcc-beos.mak b/main/source/stlport/src/gcc-beos.mak
new file mode 100644
index 00000000..02da50ff
--- /dev/null
+++ b/main/source/stlport/src/gcc-beos.mak
@@ -0,0 +1,63 @@
+#
+# compiler
+#
+CC = gcc
+CXX = c++
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_gcc
+
+#
+# guts for common stuff
+#
+#
+LINK=ar crv
+DYN_LINK=g++ -nostart -o
+
+OBJEXT=o
+DYNEXT=so
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=GCC-BEOS
+
+all: msg all_static
+
+msg:
+	mkdir -p ../stlport/beos
+	./beos-setup -setup
+
+include common_macros.mak
+
+WARNING_FLAGS= -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
+
+# boris : real locale implementation does not really work
+# CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS} -D_STLP_REAL_LOCALE_IMPLEMENTED
+CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fPIC
+
+include common_percent_rules.mak
+include common_rules.mak
+
+
+install: all
+	./beos-setup -install
+
+uninstall:
+	./beos-setup -uninstall
+
+#%.s: %.cpp
+#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+
diff --git a/main/source/stlport/src/gcc-cygwin.mak b/main/source/stlport/src/gcc-cygwin.mak
new file mode 100644
index 00000000..5e840c11
--- /dev/null
+++ b/main/source/stlport/src/gcc-cygwin.mak
@@ -0,0 +1,62 @@
+#
+# compiler
+#
+CC = gcc
+CXX = c++
+
+COMP = cygwin
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_cygwin
+
+#
+# guts for common stuff
+#
+#
+LINK=ar crv
+DYN_LINK=c++ -o
+
+OBJEXT=o
+DYNEXT=dll
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=cygwin
+
+# STATIC_SUFFIX=_static
+
+all: all_static
+INSTALL_STEP = install_unix
+
+include common_macros.mak
+
+WARNING_FLAGS= -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
+
+CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -D_STLP_USE_DYNAMIC_LIB
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -D_STLP_USE_DYNAMIC_LIB
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -D_STLP_USE_DYNAMIC_LIB
+
+LDFLAGS_RELEASE_static =
+LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic}  -Wl,-d
+
+LDFLAGS_DEBUG_static = 
+LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic}  -Wl,--export-all-symbols -Wl,-d -Wl,--out-implib,${OUTDIR}/${DEBUG_NAME}.a
+
+LDFLAGS_STLDEBUG_static = 
+LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic} -Wl,--export-all-symbols -Wl,--out-implib,${OUTDIR}/${STLDEBUG_NAME}.a
+
+include common_percent_rules.mak
+
+include common_rules.mak
+
+
diff --git a/main/source/stlport/src/gcc-freebsd.mak b/main/source/stlport/src/gcc-freebsd.mak
new file mode 100644
index 00000000..bec9e6ef
--- /dev/null
+++ b/main/source/stlport/src/gcc-freebsd.mak
@@ -0,0 +1,63 @@
+#
+# Note : this makefile is for gcc-2.95 and later !
+#
+
+#
+# compiler
+#
+CC = gcc -pthread
+CXX = c++ -pthread -fexceptions
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_gcc
+
+#
+# guts for common stuff
+#
+#
+LINK=ar cr
+# 2.95 flag
+DYN_LINK=c++ -pthread -fexceptions -shared -o
+
+OBJEXT=o
+DYNEXT=so
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=GCC-FREEBSD
+INSTALL_STEP = install_unix 
+
+all: gmake_message  all_dynamic all_static symbolic_links 
+
+gmake_message:
+	echo "Note : this makefile requires gmake on FreeBSD"
+
+include common_macros.mak
+
+WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
+
+CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fPIC
+
+include common_percent_rules.mak
+include common_rules.mak
+
+
+#install: all
+#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
+
+#%.s: %.cpp
+#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+
diff --git a/main/source/stlport/src/gcc-glibc.mak b/main/source/stlport/src/gcc-glibc.mak
new file mode 100644
index 00000000..88876eb3
--- /dev/null
+++ b/main/source/stlport/src/gcc-glibc.mak
@@ -0,0 +1,60 @@
+#
+# compiler
+#
+CC = gcc
+CXX = c++
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_gcc
+
+#
+# guts for common stuff
+#
+#
+LINK=ar crv
+DYN_LINK=gcc -shared -o
+
+OBJEXT=o
+DYNEXT=so
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=GCC$(ARCH)
+INSTALL_STEP = install_unix 
+
+all: msg all_dynamic all_static symbolic_links 
+
+msg:
+	@echo "*** ATTENTION! ***"
+	@echo "This makefile tries to use system locale which might not work well with all glibc flavours."
+	@echo "If build fails, please resort to gcc.mak which will build C-locale only version for STLport"
+	@echo "******************"
+include common_macros.mak
+
+WARNING_FLAGS= -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -D_STLP_USE_GLIBC
+
+CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS} -D_STLP_REAL_LOCALE_IMPLEMENTED
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fpic
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fpic
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fpic
+
+include common_percent_rules.mak
+include common_rules.mak
+
+
+#install: all
+#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
+
+#%.s: %.cpp
+#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+
diff --git a/main/source/stlport/src/gcc-hp.mak b/main/source/stlport/src/gcc-hp.mak
new file mode 100644
index 00000000..843db01f
--- /dev/null
+++ b/main/source/stlport/src/gcc-hp.mak
@@ -0,0 +1,69 @@
+#
+# Note : this makefile is for gcc-2.95 and later (HP-UX)!
+#
+
+#
+# compiler
+#
+CC = gcc
+CXX = c++ -pthreads
+
+# -fkeep-inline-functions
+# -finline-functions
+# -fno-default-inline
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_gcc
+
+#
+# guts for common stuff
+#
+#
+LINK=ar cr
+# 2.95 flag
+# DYN_LINK=c++ -pthreads -fPIC -shared -o
+# DYN_LINK=c++ -pthreads -nostdinc++ -fexceptions -frtti -fPIC -O -fno-implement-inlines -Winline -Wextern-inline -shared -D_STLP_DEBUG -o
+# DYN_LINK=ld -shared -export-dynamic -Bdynamic -Bsymbolic -Ur -o
+DYN_LINK=ld -z -b -o
+
+OBJEXT=o
+DYNEXT=sl
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=GCC-HP
+INSTALL_STEP = install_unix 
+
+all: all_dynamic all_static symbolic_links  
+
+include common_macros.mak
+
+WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
+
+# CXXFLAGS_COMMON = -ftemplate-depth-32 -I${STLPORT_DIR} ${WARNING_FLAGS}
+CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O -fPIC
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+
+LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic} -Wl,+h${RELEASE_DYNLIB_SONAME}
+LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic} -Wl,+h${DEBUG_DYNLIB_SONAME}
+LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic} -Wl,+h${STLDEBUG_DYNLIB_SONAME}
+
+include common_percent_rules.mak
+include common_rules.mak
+
+#install: all
+#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
+
+#%.s: %.cpp
+#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
diff --git a/main/source/stlport/src/gcc-hp11.mak b/main/source/stlport/src/gcc-hp11.mak
new file mode 100644
index 00000000..187e1be2
--- /dev/null
+++ b/main/source/stlport/src/gcc-hp11.mak
@@ -0,0 +1,75 @@
+#
+# Note : this makefile is for gcc-2.95 and later (HP-UX)!
+#
+
+#
+# compiler
+#
+CC = gcc
+CXX = c++
+
+# -fkeep-inline-functions
+# -finline-functions
+# -fno-default-inline
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_gcc
+
+#
+# guts for common stuff
+#
+#
+LINK=ar cr
+# 2.95 flag
+# DYN_LINK=c++ -pthreads -fPIC -shared -o
+# DYN_LINK=c++ -pthreads -nostdinc++ -fexceptions -frtti -fPIC -O -fno-implement-inlines -Winline -Wextern-inline -shared -D_STLP_DEBUG -o
+# DYN_LINK=ld -shared -export-dynamic -Bdynamic -Bsymbolic -Ur -o
+# DYN_LINK=/usr/bin/ld -z -b -o
+
+DYN_LINK= c++ -shared -o 
+
+OBJEXT=o
+DYNEXT=sl
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=GCC-HP
+INSTALL_STEP = install_unix 
+
+all: all_dynamic all_static symbolic_links  
+
+include common_macros.mak
+
+WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -D_REENTRANT -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
+
+# CXXFLAGS_COMMON = -ftemplate-depth-32 -I${STLPORT_DIR} ${WARNING_FLAGS}
+CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O -fPIC
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+
+# LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic} -Wl,+h${RELEASE_DYNLIB_SONAME}
+# LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic} -Wl,+h${DEBUG_DYNLIB_SONAME}
+# LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic} -Wl,+h${STLDEBUG_DYNLIB_SONAME}
+
+LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic}
+LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic}
+LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic}
+
+include common_percent_rules.mak
+include common_rules.mak
+
+#install: all
+#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
+
+#%.s: %.cpp
+#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
diff --git a/main/source/stlport/src/gcc-irix.mak b/main/source/stlport/src/gcc-irix.mak
new file mode 100644
index 00000000..66647cc7
--- /dev/null
+++ b/main/source/stlport/src/gcc-irix.mak
@@ -0,0 +1,51 @@
+#
+# Note : this makefile is for gcc-2.95 and later !
+#
+
+#
+# compiler
+#
+CC = gcc 
+CXX = c++ -fexceptions
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_gcc
+
+#
+# guts for common stuff
+#
+#
+LINK=ar cr
+# 2.95 flag
+DYN_LINK=c++ -lpthread -fexceptions -shared -o
+
+OBJEXT=o
+DYNEXT=so
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=GCC$(ARCH)
+INSTALL_STEP = install_unix 
+
+all:  all_dynamic all_static symbolic_links 
+
+include common_macros.mak
+
+WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
+
+CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+
+include common_percent_rules.mak
+include common_rules.mak
diff --git a/main/source/stlport/src/gcc-linux.mak b/main/source/stlport/src/gcc-linux.mak
new file mode 100644
index 00000000..6fd47dc0
--- /dev/null
+++ b/main/source/stlport/src/gcc-linux.mak
@@ -0,0 +1,62 @@
+#
+# compiler
+#
+CC = gcc
+CXX = c++  -pthread -fexceptions
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_gcc
+
+#
+# guts for common stuff
+#
+#
+LINK=ar crv
+DYN_LINK=gcc -shared -o
+
+OBJEXT=o
+DYNEXT=so
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=GCC-LINUX
+INSTALL_STEP = install_unix 
+
+all: msg all_dynamic all_static symbolic_links
+
+msg:
+	@echo "*** ATTENTION! ***"
+	@echo "This makefile tries to use system locale which might not work well with all glibc flavours."
+	@echo "If build fails, please resort to gcc.mak which will build C-locale only version for STLport"
+	@echo "******************"
+include common_macros.mak
+
+WARNING_FLAGS= -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -D_STLP_USE_GLIBC
+
+# boris : real locale implementation may not really work
+CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS} -D_STLP_REAL_LOCALE_IMPLEMENTED -D_GNU_SOURCE
+# CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fPIC
+
+include common_percent_rules.mak
+include common_rules.mak
+
+
+#install: all
+#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
+
+#%.s: %.cpp
+#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+
diff --git a/main/source/stlport/src/gcc-mingw32.mak b/main/source/stlport/src/gcc-mingw32.mak
new file mode 100644
index 00000000..d9968915
--- /dev/null
+++ b/main/source/stlport/src/gcc-mingw32.mak
@@ -0,0 +1,78 @@
+#
+# compiler
+#
+CC = gcc
+CXX = c++
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_mingw32
+
+#
+# guts for common stuff
+#
+#
+LINK=ar crv
+DYN_LINK=c++ -shared -o
+
+OBJEXT=o
+DYNEXT=dll
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=MINGW32
+
+STATIC_SUFFIX=_static
+
+all: all_dynamic all_static
+
+include common_macros.mak
+
+RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.o
+RESFILE_debug=$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o
+RESFILE_stldebug=$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o
+
+WARNING_FLAGS= -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
+
+CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+# CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -shared -D_STLP_USE_DYNAMIC_LIB
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -D_STLP_USE_DYNAMIC_LIB
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -shared -D_STLP_USE_DYNAMIC_LIB
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -shared -D_STLP_USE_DYNAMIC_LIB
+
+LDFLAGS_RELEASE_static =
+# LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic}  -Wl,--no-undefined, -Wl,--export-all-symbols -Wl,-d -Wl,--out-implib,${OUTDIR}/${RELEASE_NAME}.a
+LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic}  -Wl,--export-all-symbols -Wl,-d -Wl,--out-implib,${OUTDIR}/${RELEASE_NAME}.a
+
+LDFLAGS_DEBUG_static =
+LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic}  -Wl,--export-all-symbols -Wl,-d -Wl,--out-implib,${OUTDIR}/${DEBUG_NAME}.a
+
+LDFLAGS_STLDEBUG_static =
+LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic} -Wl,--export-all-symbols -Wl,--out-implib,${OUTDIR}/${STLDEBUG_NAME}.a
+
+
+include common_percent_rules.mak
+include common_rules.mak
+
+
+${RESFILE}: stlport.rc
+	windres -O coff --define COMP=${COMP} --define BUILD= -o $(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.o stlport.rc
+
+${RESFILE_debug}: stlport.rc
+	windres -O coff --define COMP=${COMP} --define BUILD=_DEBUG -o $(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o stlport.rc
+
+${RESFILE_stldebug}: stlport.rc
+	windres -O coff --define COMP=${COMP} --define BUILD=_STLDEBUG -o $(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o stlport.rc
+
+#%.s: %.cpp
+#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+
diff --git a/main/source/stlport/src/gcc-ncr.mak b/main/source/stlport/src/gcc-ncr.mak
new file mode 100644
index 00000000..e30fc399
--- /dev/null
+++ b/main/source/stlport/src/gcc-ncr.mak
@@ -0,0 +1,60 @@
+#
+# Note : this makefile is for gcc-2.95 and later !
+#
+
+#
+# compiler
+#
+CC = gcc 
+CXX = c++ -fexceptions
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_gcc
+
+#
+# guts for common stuff
+#
+#
+LINK=ar cr
+# 2.95 flag
+DYN_LINK=c++ -pthreads -fexceptions -shared -o
+
+OBJEXT=o
+DYNEXT=so
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=GCC-NCR
+INSTALL_STEP = install_unix 
+
+all:  all_dynamic all_static symbolic_links 
+
+include common_macros.mak
+
+WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
+
+CXXFLAGS_COMMON = -D__NCR_SVR -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+
+include common_percent_rules.mak
+include common_rules.mak
+
+
+#install: all
+#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
+
+#%.s: %.cpp
+#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+
diff --git a/main/source/stlport/src/gcc-netbsd.mak b/main/source/stlport/src/gcc-netbsd.mak
new file mode 100644
index 00000000..ca7dcbe4
--- /dev/null
+++ b/main/source/stlport/src/gcc-netbsd.mak
@@ -0,0 +1,60 @@
+#
+# Note : this makefile is for gcc-2.95 and later !
+#
+
+#
+# compiler
+#
+CC = gcc 
+CXX = c++ -fexceptions
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_gcc
+
+#
+# guts for common stuff
+#
+#
+LINK=ar crv
+# 2.95 flag
+DYN_LINK=c++ -lpthread -fexceptions -shared -fPIC -o
+
+OBJEXT=o
+DYNEXT=so
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=GCC-NETBSD
+INSTALL_STEP = install_unix 
+
+all: all_dynamic all_static symbolic_links
+
+include common_macros.mak
+
+WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
+
+CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fPIC
+
+include common_percent_rules.mak
+include common_rules.mak
+
+
+#install: all
+#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
+
+#%.s: %.cpp
+#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+
diff --git a/main/source/stlport/src/gcc-sun.mak b/main/source/stlport/src/gcc-sun.mak
new file mode 100644
index 00000000..17b1bbcb
--- /dev/null
+++ b/main/source/stlport/src/gcc-sun.mak
@@ -0,0 +1,71 @@
+#
+# Note : this makefile is for gcc-2.95 and later !
+#
+
+#
+# compiler
+#
+CC = gcc
+CXX = c++ -pthreads
+
+CUR_DIR= ${PWD}/
+
+STLPORT_DIR=${PWD}/../stlport
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_gcc
+
+#
+# guts for common stuff
+#
+#
+LINK=ar cr
+# 2.95 flag
+DYN_LINK=c++ -pthreads -shared -o
+
+OBJEXT=o
+DYNEXT=so
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=GCC-SUN
+INSTALL_STEP = install_unix 
+
+all: all_dynamic all_static symbolic_links
+
+include common_macros.mak
+
+WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
+
+CXXFLAGS_COMMON =  -fexceptions -ftemplate-depth-32 -shared -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -gstabs
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -gstabs -fPIC
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+
+# LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic} -Wl,-soname,${RELEASE_DYNLIB_SONAME}
+# LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic} -Wl,-soname,${DEBUG_DYNLIB_SONAME}
+# LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic} -Wl,-soname,${STLDEBUG_DYNLIB_SONAME}
+
+LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic}
+LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic}
+LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic}
+
+# LDLIBS_RELEASE_dynamic =  -lposix4
+# LDLIBS_STLDEBUG_dynamic = -lposix4
+
+include common_percent_rules.mak
+include common_rules.mak
+
+#%.s: %.cpp
+#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+
diff --git a/main/source/stlport/src/gcc.mak b/main/source/stlport/src/gcc.mak
new file mode 100644
index 00000000..e65024b2
--- /dev/null
+++ b/main/source/stlport/src/gcc.mak
@@ -0,0 +1,60 @@
+#
+# Note : this makefile is for gcc-2.95 and later !
+#
+
+#
+# compiler
+#
+CC = gcc 
+CXX = c++ -pthread -fexceptions
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_gcc
+
+#
+# guts for common stuff
+#
+#
+LINK=ar cr
+# 2.95 flag
+DYN_LINK=c++ -pthread -fexceptions -shared -o
+
+OBJEXT=o
+DYNEXT=so
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=GCC$(ARCH)
+INSTALL_STEP = install_unix 
+
+all:  all_dynamic all_static symbolic_links 
+
+include common_macros.mak
+
+WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32 -frtti
+
+CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS} -D_STLP_USE_GLIBC
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+
+include common_percent_rules.mak
+include common_rules.mak
+
+
+#install: all
+#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
+
+#%.s: %.cpp
+#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+
diff --git a/main/source/stlport/src/gcc7.mak b/main/source/stlport/src/gcc7.mak
new file mode 100644
index 00000000..4e5eef2c
--- /dev/null
+++ b/main/source/stlport/src/gcc7.mak
@@ -0,0 +1,55 @@
+#
+# compiler
+#
+CC = c++
+CXX = $(CC)
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_gcc
+
+#
+# guts for common stuff
+#
+#
+LINK=ar crv
+DYN_LINK=ar crv
+
+OBJEXT=o
+DYNEXT=so
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=GCC7${ARCH}
+INSTALL_STEP = install_unix 
+
+all: all_dynamic all_static symbolic_links 
+
+include common_macros.mak
+
+WARNING_FLAGS= -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -D_STLP_NO_TYPEINFO -D_STLP_NO_EXCEPTIONS -frtti
+
+CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fpic
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fpic
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fpic
+
+include common_percent_rules.mak
+include common_rules.mak
+
+
+#install: all
+#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
+
+#%.s: %.cpp
+#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+
diff --git a/main/source/stlport/src/gcc8.mak b/main/source/stlport/src/gcc8.mak
new file mode 100644
index 00000000..e08149d3
--- /dev/null
+++ b/main/source/stlport/src/gcc8.mak
@@ -0,0 +1,56 @@
+#
+# compiler
+#
+CC = gcc
+CXX = c++  -fexceptions -D__EXCEPTIONS -ftemplate-depth-20
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_gcc
+
+#
+# guts for common stuff
+#
+#
+LINK=ar crv
+DYN_LINK=ar crv
+
+OBJEXT=o
+DYNEXT=so
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=GCC8${ARCH}
+INSTALL_STEP = install_unix 
+
+all: all_static
+
+include common_macros.mak
+
+WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
+
+CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+# -O does not always work for gcc-2.8
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON)
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -fpic
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fpic
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fpic
+
+include common_percent_rules.mak
+include common_rules.mak
+
+
+#install: all
+#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
+
+#%.s: %.cpp
+#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+
diff --git a/main/source/stlport/src/hpacc.mak b/main/source/stlport/src/hpacc.mak
new file mode 100644
index 00000000..4fb6c5fc
--- /dev/null
+++ b/main/source/stlport/src/hpacc.mak
@@ -0,0 +1,58 @@
+#
+# Makefile for HP aCC 1.23 compiler or later
+#
+CC = aCC
+CXX = aCC
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_aCC
+
+OPTIM=+O2 +Onolimit
+
+#
+# guts for common stuff
+#
+#
+LINK=ar cr
+# 2.95 flag
+DYN_LINK=aCC -b ${OPTIM} +nostl -o
+
+OBJEXT=o
+DYNEXT=sl
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=ACC$(ARCH)
+INSTALL_STEP = install_unix 
+
+all: all_dynamic all_static symbolic_links
+
+include common_macros.mak
+
+WARNING_FLAGS= 
+
+# CXXFLAGS_COMMON = +ESlit -Aa -I${STLPORT_DIR} ${WARNING_FLAGS}
+# CXXFLAGS_COMMON = -Aa -I${STLPORT_DIR} -D_REENTRANT +inst_close ${WARNING_FLAGS}
+CXXFLAGS_COMMON = -AA -I${STLPORT_DIR} +inst_close ${WARNING_FLAGS} ${CXX_EXTRA_FLAGS}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${OPTIM} -z
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${OPTIM} -z +Z
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g ${OPTIM} -z
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g ${OPTIM} -z +Z
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG 
+
+include common_percent_rules.mak
+include common_rules.mak
+
+
+#install: all
+#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
+
+#%.s: %.cpp
+#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
diff --git a/main/source/stlport/src/icc.mak b/main/source/stlport/src/icc.mak
new file mode 100644
index 00000000..18b4a6b8
--- /dev/null
+++ b/main/source/stlport/src/icc.mak
@@ -0,0 +1,60 @@
+#
+# Note: This makefile is for the Linux Intel C++ compiler 'icc'
+#
+
+#
+# compiler
+#
+CC = icc 
+CXX = icpc -pthread
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_icc
+
+#
+# guts for common stuff
+#
+#
+LINK=ar cr
+DYN_LINK=icc -pthread -shared -o
+
+OBJEXT=o
+DYNEXT=so
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=ICC
+INSTALL_STEP = install_unix 
+
+all:  all_dynamic all_static symbolic_links 
+
+include common_macros.mak
+
+WARNING_FLAGS= -w1
+
+CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O3 -ipo -ipo_obj
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O3 -fPIC -ipo -ipo_obj
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O0 -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O0 -g -fPIC
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+
+include common_percent_rules.mak
+include common_rules.mak
+
+
+#install: all
+#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
+
+#%.s: %.cpp
+#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+
+
diff --git a/main/source/stlport/src/install.sh b/main/source/stlport/src/install.sh
new file mode 100644
index 00000000..e5efbab1
--- /dev/null
+++ b/main/source/stlport/src/install.sh
@@ -0,0 +1,238 @@
+#! /bin/sh
+#
+# install - install a program, script, or datafile
+# This comes from X11R5.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+#
+
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+tranformbasename=""
+transform_arg=""
+instcmd="$mvprog"
+chmodcmd="$chmodprog 0755"
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=""
+dst=""
+dir_arg=""
+
+while [ x"$1" != x ]; do
+    case $1 in
+	-c) instcmd="$cpprog"
+	    shift
+	    continue;;
+
+	-d) dir_arg=true
+	    shift
+	    continue;;
+
+	-m) chmodcmd="$chmodprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-o) chowncmd="$chownprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-g) chgrpcmd="$chgrpprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-s) stripcmd="$stripprog"
+	    shift
+	    continue;;
+
+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+	    shift
+	    continue;;
+
+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+	    shift
+	    continue;;
+
+	*)  if [ x"$src" = x ]
+	    then
+		src=$1
+	    else
+		# this colon is to work around a 386BSD /bin/sh bug
+		:
+		dst=$1
+	    fi
+	    shift
+	    continue;;
+    esac
+done
+
+if [ x"$src" = x ]
+then
+	echo "install:	no input file specified"
+	exit 1
+else
+	true
+fi
+
+if [ x"$dir_arg" != x ]; then
+	dst=$src
+	src=""
+	
+	if [ -d $dst ]; then
+		instcmd=:
+	else
+		instcmd=mkdir
+	fi
+else
+
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad 
+# if $src (and thus $dsttmp) contains '*'.
+
+	if [ -f $src -o -d $src ]
+	then
+		true
+	else
+		echo "install:  $src does not exist"
+		exit 1
+	fi
+	
+	if [ x"$dst" = x ]
+	then
+		echo "install:	no destination specified"
+		exit 1
+	else
+		true
+	fi
+
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+	if [ -d $dst ]
+	then
+		dst="$dst"/`basename $src`
+	else
+		true
+	fi
+fi
+
+## this sed command emulates the dirname command
+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+# Make sure that the destination directory exists.
+#  this part is taken from Noah Friedman's mkinstalldirs script
+
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
+defaultIFS='	
+'
+IFS="${IFS-${defaultIFS}}"
+
+oIFS="${IFS}"
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS="${oIFS}"
+
+pathcomp=''
+
+while [ $# -ne 0 ] ; do
+	pathcomp="${pathcomp}${1}"
+	shift
+
+	if [ ! -d "${pathcomp}" ] ;
+        then
+		$mkdirprog "${pathcomp}"
+	else
+		true
+	fi
+
+	pathcomp="${pathcomp}/"
+done
+fi
+
+if [ x"$dir_arg" != x ]
+then
+	$doit $instcmd $dst &&
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+else
+
+# If we're going to rename the final executable, determine the name now.
+
+	if [ x"$transformarg" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		dstfile=`basename $dst $transformbasename | 
+			sed $transformarg`$transformbasename
+	fi
+
+# don't allow the sed command to completely eliminate the filename
+
+	if [ x"$dstfile" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		true
+	fi
+
+# Make a temp file name in the proper directory.
+
+	dsttmp=$dstdir/#inst.$$#
+
+# Move or copy the file name to the temp name
+
+	$doit $instcmd $src $dsttmp &&
+
+	trap "rm -f ${dsttmp}" 0 &&
+
+# and set any options; do chmod last to preserve setuid bits
+
+# If any of these fail, we abort the whole thing.  If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+
+# Now rename the file to the real destination.
+
+	$doit $rmcmd -f $dstdir/$dstfile &&
+	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+
+fi &&
+
+
+exit 0
diff --git a/main/source/stlport/src/intel.mak b/main/source/stlport/src/intel.mak
new file mode 100644
index 00000000..e0ae5cda
--- /dev/null
+++ b/main/source/stlport/src/intel.mak
@@ -0,0 +1,22 @@
+#
+# Tools
+#
+
+CXX=icl.exe
+CC=icl.exe
+RC=rc
+
+LIB_BASENAME=stlport_icl
+
+EXTRA_COMMON_FLAGS=/D "_MBCS"
+COMP=ICL
+
+all: all_static
+
+!INCLUDE vc_common.mak
+
+#
+#
+
+
+
diff --git a/main/source/stlport/src/intel40.mak b/main/source/stlport/src/intel40.mak
new file mode 100644
index 00000000..fd024141
--- /dev/null
+++ b/main/source/stlport/src/intel40.mak
@@ -0,0 +1,26 @@
+#
+# Tools
+#
+
+CXX=icl.exe
+CC=icl.exe
+RC=rc
+
+LIB_BASENAME=stlport_icl
+
+# EXTRA_COMMON_FLAGS=/D "_MBCS"
+EXTRA_COMMON_FLAGS= -D_MBCS
+EXTRA_DEBUG_FLAGS=
+EXTRA_NDEBUG_FLAGS= -Qipo -Qsox-
+
+COMP=ICL
+
+all: all_static
+
+!INCLUDE vc_common.mak
+
+#
+#
+
+
+
diff --git a/main/source/stlport/src/intel45.mak b/main/source/stlport/src/intel45.mak
new file mode 100644
index 00000000..8cc85da9
--- /dev/null
+++ b/main/source/stlport/src/intel45.mak
@@ -0,0 +1,30 @@
+#
+# Makefile for Intel C++ compiler v.4.5 
+
+#
+# Tools
+#
+CXX=icl.exe
+CC=icl.exe
+# Intel frontend tools
+# LINK=xilib.exe
+
+DYN_LINK=xilink.exe
+
+
+LIB_BASENAME=stlport_icl
+COMP=ICL
+
+EXTRA_COMMON_FLAGS= -D_MBCS -Qwd186
+EXTRA_DEBUG_FLAGS=
+EXTRA_NDEBUG_FLAGS= -Qsox-
+
+all: platform all_dynamic all_static 
+
+!INCLUDE vc_common.mak
+
+#
+#
+
+
+
diff --git a/main/source/stlport/src/intel50.mak b/main/source/stlport/src/intel50.mak
new file mode 100644
index 00000000..976d38fc
--- /dev/null
+++ b/main/source/stlport/src/intel50.mak
@@ -0,0 +1,33 @@
+#
+# Makefile for Intel C++ compiler v.5.0
+
+#
+# Tools
+#
+
+CXX=icl.exe
+CC=icl.exe
+RC=rc
+
+# Intel frontend tools
+# LINK=xilib.exe
+
+DYN_LINK=xilink.exe
+
+
+LIB_BASENAME=stlport_icl
+COMP=ICL
+
+EXTRA_COMMON_FLAGS= -D_MBCS -Qwd186,985
+EXTRA_DEBUG_FLAGS=
+EXTRA_NDEBUG_FLAGS= -Qsox-
+
+all: platform all_static all_dynamic
+
+!INCLUDE vc_common.mak
+
+#
+#
+
+
+
diff --git a/main/source/stlport/src/ios.cpp b/main/source/stlport/src/ios.cpp
new file mode 100644
index 00000000..728050df
--- /dev/null
+++ b/main/source/stlport/src/ios.cpp
@@ -0,0 +1,313 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+# include "stlport_prefix.h"
+# include <algorithm>
+# include <stl/_ios.h>
+
+_STLP_BEGIN_NAMESPACE
+
+char* _STLP_CALL
+__write_integer(char* buf, ios_base::fmtflags flags, long x);
+
+//----------------------------------------------------------------------
+// ios_base members
+
+// class ios_base::failure, a subclass of exception.  It's used solely
+// for reporting errors.
+
+ios_base::failure::failure(const string& s) 
+  : __Named_exception(s)
+{}
+
+ios_base::failure::~failure() _STLP_NOTHROW_INHERENTLY {}
+
+#if !defined (_STLP_STATIC_CONST_INIT_BUG)
+
+// Definitions of ios_base's formatting flags.
+const ios_base::fmtflags ios_base::left;
+const ios_base::fmtflags ios_base::right;
+const ios_base::fmtflags ios_base::internal;
+const ios_base::fmtflags ios_base::dec;
+const ios_base::fmtflags ios_base::hex;
+const ios_base::fmtflags ios_base::oct;
+const ios_base::fmtflags ios_base::fixed;
+const ios_base::fmtflags ios_base::scientific;
+const ios_base::fmtflags ios_base::boolalpha;
+const ios_base::fmtflags ios_base::showbase;
+const ios_base::fmtflags ios_base::showpoint;
+const ios_base::fmtflags ios_base::showpos;
+const ios_base::fmtflags ios_base::skipws;
+const ios_base::fmtflags ios_base::unitbuf;
+const ios_base::fmtflags ios_base::uppercase;
+const ios_base::fmtflags ios_base::adjustfield;
+const ios_base::fmtflags ios_base::basefield;
+const ios_base::fmtflags ios_base::floatfield;
+
+// Definitions of ios_base's state flags.
+const ios_base::iostate ios_base::goodbit;
+const ios_base::iostate ios_base::badbit;
+const ios_base::iostate ios_base::eofbit;
+const ios_base::iostate ios_base::failbit;
+
+// Definitions of ios_base's openmode flags.
+const ios_base::openmode ios_base::app;
+const ios_base::openmode ios_base::ate;
+const ios_base::openmode ios_base::binary;
+const ios_base::openmode ios_base::in;
+const ios_base::openmode ios_base::out;
+const ios_base::openmode ios_base::trunc;
+
+// Definitions of ios_base's seekdir flags.
+const ios_base::seekdir ios_base::beg;
+const ios_base::seekdir ios_base::cur;
+const ios_base::seekdir ios_base::end;
+
+# endif /*  _STLP_STATIC_CONST_INIT_BUG */
+
+// Internal functions used for managing exponentially-growing arrays of
+// POD types.
+
+// array is a pointer to N elements of type PODType.  Expands the array,
+// if necessary, so that array[index] is meaningful.  All new elements are
+// initialized to zero.  Returns a pointer to the new array, and the new
+// size.
+template <class PODType>
+pair<PODType*, size_t> 
+_Stl_expand_array(PODType* array, size_t N, int index)
+{
+  if ((int)N < index + 1) {
+    size_t new_N = (max)(2 * N, size_t(index + 1));
+    PODType* new_array
+      = __STATIC_CAST(PODType*,realloc(array, new_N * sizeof(PODType)));
+    if (new_array) {
+      fill(new_array + N, new_array + new_N, PODType());
+      return pair<PODType*, size_t>(new_array, new_N);
+    }
+    else 
+      return pair<PODType*, size_t>(__STATIC_CAST(PODType*,0), 0);
+  }
+  else
+    return pair<PODType*, size_t>(array, N);
+}
+
+// array is a pointer to N elements of type PODType.  Allocate a new
+// array of N elements, copying the values from the old array to the new.
+// Return a pointer to the new array.  It is assumed that array is non-null
+// and N is nonzero.
+template <class PODType>
+PODType* _Stl_copy_array(const PODType* array, size_t N) {
+  PODType* result = __STATIC_CAST(PODType*,malloc(N * sizeof(PODType)));
+  if (result)
+    copy(array, array + N, result);
+  return result;
+}
+
+locale ios_base::imbue(const locale& loc) {
+    locale previous = _M_locale;
+    _M_locale = loc;
+    _M_invoke_callbacks(imbue_event);
+    return previous;
+}
+
+int ios_base::_S_index = 0;
+
+int _STLP_CALL ios_base::xalloc()
+{
+  static _STLP_STATIC_MUTEX L _STLP_MUTEX_INITIALIZER;
+  _STLP_auto_lock sentry(L);
+  return _S_index++;
+}
+
+long& ios_base::iword(int index) {
+  static long dummy = 0;
+
+  pair<long*, size_t> tmp = _Stl_expand_array(_M_iwords, _M_num_iwords, index);
+  if (tmp.first) {              // The allocation, if any, succeeded.
+    _M_iwords = tmp.first;
+    _M_num_iwords = tmp.second;
+    return _M_iwords[index];
+  }
+  else {
+    _M_setstate_nothrow(badbit);
+    _M_check_exception_mask();
+    return dummy;
+  }
+}
+
+ 
+void*& ios_base::pword(int index) {
+  static void* dummy = 0;
+
+  pair<void**, size_t> tmp = _Stl_expand_array(_M_pwords, _M_num_pwords, index);
+  if (tmp.first) {              // The allocation, if any, succeeded.
+    _M_pwords = tmp.first;
+    _M_num_pwords = tmp.second;
+    return _M_pwords[index];
+  }
+  else {
+    _M_setstate_nothrow(badbit);
+    _M_check_exception_mask();
+    return dummy;
+  }
+}
+
+void ios_base::register_callback(event_callback __fn, int index) {
+  pair<pair<event_callback, int>*, size_t> tmp
+    = _Stl_expand_array(_M_callbacks, _M_num_callbacks, (int)_M_callback_index /* fbp: index ??? */ );
+  if (tmp.first) {
+    _M_callbacks = tmp.first;
+    _M_num_callbacks = tmp.second;
+    _M_callbacks[_M_callback_index++] = make_pair(__fn, index);
+  }
+  else {
+    _M_setstate_nothrow(badbit);
+    _M_check_exception_mask();
+  }
+}
+
+// Invokes all currently registered callbacks for a particular event.
+// Behaves correctly even if one of the callbacks adds a new callback.
+void ios_base::_M_invoke_callbacks(event E) {
+  for (size_t i = _M_callback_index; i > 0; --i) {
+    event_callback f = _M_callbacks[i-1].first;
+    int n = _M_callbacks[i-1].second;
+    f(E, *this, n);
+  }
+}
+
+// This function is called if the state, rdstate(), has a bit set
+// that is also set in the exception mask exceptions().
+void ios_base::_M_throw_failure() {
+  const char* arg ;
+# if 0
+  char buffer[256];
+  char* ptr;
+  strcpy(buffer, "ios failure: rdstate = 0x");
+  ptr = __write_integer(buffer+strlen(buffer), ios_base::hex, __STATIC_CAST(unsigned long,_M_iostate)); 
+  strcpy(ptr, " mask = 0x");
+  ptr = __write_integer(buffer+strlen(buffer), ios_base::hex, __STATIC_CAST(unsigned long,_M_exception_mask)); 
+  *ptr = 0;
+  arg = buffer;
+# else
+  arg = "ios failure";
+# endif
+
+# ifndef _STLP_USE_EXCEPTIONS
+  fputs(arg, stderr);
+# else
+  throw failure(arg);
+# endif
+}
+
+// Copy x's state to *this.  This member function is used in the 
+// implementation of basic_ios::copyfmt.  Does not copy _M_exception_mask
+// or _M_iostate.  
+void ios_base::_M_copy_state(const ios_base& x) {
+  _M_fmtflags  = x._M_fmtflags; // Copy the flags, except for _M_iostate
+  _M_openmode  = x._M_openmode; // and _M_exception_mask.
+  _M_seekdir   = x._M_seekdir;
+  _M_precision = x._M_precision;
+  _M_width     = x._M_width;
+  
+  if (_M_locale != x._M_locale) {
+    _M_locale = x._M_locale;
+    _M_cached_ctype = x._M_cached_ctype;
+    _M_cached_numpunct = x._M_cached_numpunct;
+  }
+
+  if (x._M_callbacks) {
+    pair<event_callback, int>* tmp = _Stl_copy_array(x._M_callbacks, x._M_callback_index);
+    if (tmp) {
+      free(_M_callbacks);
+      _M_callbacks = tmp;
+      _M_num_callbacks = _M_callback_index = x._M_callback_index;
+    }
+    else {
+      _M_setstate_nothrow(badbit);
+      _M_check_exception_mask();
+    }
+  }
+
+  if (x._M_iwords) {
+    long* tmp = _Stl_copy_array(x._M_iwords, x._M_num_iwords);
+    if (tmp) {
+      free(_M_iwords);
+      _M_iwords = tmp;
+      _M_num_iwords = x._M_num_iwords;
+    }
+    else {
+      _M_setstate_nothrow(badbit);
+      _M_check_exception_mask();
+    }
+  }
+
+  if (x._M_pwords) {
+    void** tmp = _Stl_copy_array(x._M_pwords, x._M_num_pwords);
+    if (tmp) {
+      free(_M_pwords);
+      _M_pwords = tmp;
+      _M_num_pwords = x._M_num_pwords;
+    }
+    else {
+      _M_setstate_nothrow(badbit);
+      _M_check_exception_mask();
+    }
+  }
+}
+
+
+// ios's (protected) default constructor.  The standard says that all 
+// fields have indeterminate values; we initialize them to zero for
+// simplicity.  The only thing that really matters is that the arrays
+// are all initially null pointers, and the array element counts are all
+// initially zero.
+ios_base::ios_base()
+  : _M_fmtflags(0), _M_iostate(0), _M_openmode(0), _M_seekdir(0),
+    _M_exception_mask(0),
+    _M_precision(0), _M_width(0),
+    _M_locale(),
+    _M_callbacks(0), _M_num_callbacks(0), _M_callback_index(0),
+    _M_iwords(0), _M_num_iwords(0),
+    _M_pwords(0),
+    _M_num_pwords(0) , _M_cached_ctype(0), _M_cached_numpunct(0)
+{ }
+
+// ios's destructor.
+ios_base::~ios_base() {
+  _M_invoke_callbacks(erase_event);
+  free(_M_callbacks);
+  free(_M_iwords);
+  free(_M_pwords);
+}
+
+//----------------------------------------------------------------------
+// Force instantiation of basic_ios
+// For DLL exports, they are already instantiated.
+#  if !defined(_STLP_NO_FORCE_INSTANTIATE)
+template class _STLP_CLASS_DECLSPEC basic_ios<char, char_traits<char> >;
+#   ifndef _STLP_NO_WCHAR_T
+template class _STLP_CLASS_DECLSPEC basic_ios<wchar_t, char_traits<wchar_t> >;
+#   endif /* _STLP_NO_WCHAR_T */
+#  endif
+
+_STLP_END_NAMESPACE
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/src/iostream.cpp b/main/source/stlport/src/iostream.cpp
new file mode 100644
index 00000000..2075a14d
--- /dev/null
+++ b/main/source/stlport/src/iostream.cpp
@@ -0,0 +1,396 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+# include "stlport_prefix.h"
+
+#include <istream>
+// #include <stl/_istream.h>
+
+#include <stl/_fstream.h>
+#include <stdio_streambuf>
+#include "aligned_buffer.h"
+
+// boris : note this is repeated in <iostream>
+#ifndef _STLP_USE_NAMESPACES
+// in case of SGI iostreams, we have to rename our streams not to clash with those
+// provided in native lib
+# define cin _STLP_cin
+# define cout _STLP_cout
+# define cerr _STLP_cerr
+# define clog _STLP_clog
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+#if defined (__BORLANDC__) && ! defined (_STLP_USE_GLIBC)
+using _STLP_VENDOR_CSTD::_streams;
+#endif
+
+// This file handles iostream initialization.  It is inherently
+// nonportable, since the C++ language definition provides no mechanism
+// for controlling order of initialization of nonlocal objects.  
+// Initialization has three parts, which must be performed in the following
+// order:
+//  (1) Initialize the locale system
+//  (2) Call the constructors for the eight global stream objects.
+//  (3) Create streambufs for the global stream objects, and initialize
+//      the stream objects by calling the init() member function.
+
+
+#if defined (_STLP_MSVC) || defined(__MWERKS__) || defined (__ICL) || defined (__ISCPP__)
+
+// Definitions of the eight global I/O objects that are declared in 
+// <iostream>. For VC++ we use the init_seg pragma to put the global I/O
+// objects into an intitialization segement that will not
+// be executed. We then explicitly invoke the constructors
+// with placement new in ios_base::_S_initialize() 
+
+#if defined(__MWERKS__)
+# pragma suppress_init_code on
+#else
+# pragma init_seg("STLPORT_NO_INIT")
+#endif
+
+_STLP_DECLSPEC istream cin(0);
+_STLP_DECLSPEC ostream cout(0);
+_STLP_DECLSPEC ostream cerr(0);
+_STLP_DECLSPEC ostream clog(0);
+
+_STLP_DECLSPEC wistream wcin(0);
+_STLP_DECLSPEC wostream wcout(0);
+_STLP_DECLSPEC wostream wcerr(0);
+_STLP_DECLSPEC wostream wclog(0);
+
+#if defined(__MWERKS__)
+# pragma suppress_init_code off
+#endif
+
+#else
+
+
+// Definitions of the eight global I/O objects that are declared in 
+// <iostream>.  Disgusting hack: we deliberately define them with the
+// wrong types so that the constructors don't get run automatically.
+// We need special tricks to make sure that these objects are struct-
+// aligned rather than byte-aligned.
+
+// This is not portable.  Declaring a variable with different types in
+// two translations units is "undefined", according to the C++ standard.
+// Most compilers, however, silently accept this instead of diagnosing
+// it as an error.
+
+#ifndef __DMC__
+_STLP_DECLSPEC _Stl_aligned_buffer<istream> cin;
+_STLP_DECLSPEC _Stl_aligned_buffer<ostream> cout;
+_STLP_DECLSPEC _Stl_aligned_buffer<ostream> cerr;
+_STLP_DECLSPEC _Stl_aligned_buffer<ostream> clog;
+#else
+_Stl_aligned_buffer<istream> cin;
+_Stl_aligned_buffer<ostream> cout;
+_Stl_aligned_buffer<ostream> cerr;
+_Stl_aligned_buffer<ostream> clog;
+
+#pragma alias("?cin@std@@3V?$basic_istream@std@DV?$char_traits@std@D@1@@1@A", "?cin@std@@3T?$_Stl_aligned_buffer@std@V?$basic_istream@std@DV?$char_traits@std@D@1@@1@@1@A")
+#pragma alias("?cout@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A", "?cout@std@@3T?$_Stl_aligned_buffer@std@V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@@1@A")
+#pragma alias("?cerr@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A", "?cerr@std@@3T?$_Stl_aligned_buffer@std@V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@@1@A")
+#pragma alias("?clog@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A", "?clog@std@@3T?$_Stl_aligned_buffer@std@V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@@1@A")
+#endif
+
+# ifndef _STLP_NO_WCHAR_T
+
+#ifndef __DMC__
+_STLP_DECLSPEC _Stl_aligned_buffer<wistream> wcin;
+_STLP_DECLSPEC _Stl_aligned_buffer<wostream> wcout;
+_STLP_DECLSPEC _Stl_aligned_buffer<wostream> wcerr;
+_STLP_DECLSPEC _Stl_aligned_buffer<wostream> wclog;
+#else
+_Stl_aligned_buffer<wistream> wcin;
+_Stl_aligned_buffer<wostream> wcout;
+_Stl_aligned_buffer<wostream> wcerr;
+_Stl_aligned_buffer<wostream> wclog;
+
+#pragma alias("?wcin@std@@3V?$basic_istream@std@_YV?$char_traits@std@_Y@1@@1@A", "?wcin@std@@3T?$_Stl_aligned_buffer@std@V?$basic_istream@std@_YV?$char_traits@std@_Y@1@@1@@1@A")
+#pragma alias("?wcout@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A", "?wcout@std@@3T?$_Stl_aligned_buffer@std@V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@@1@A")
+#pragma alias("?wcerr@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A", "?wcerr@std@@3T?$_Stl_aligned_buffer@std@V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@@1@A")
+#pragma alias("?wclog@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A", "?wclog@std@@3T?$_Stl_aligned_buffer@std@V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@@1@A")
+#endif
+# endif
+
+#endif /* STL_MSVC || __MWERKS__ */
+
+// Member functions from class ios_base and ios_base::Init
+
+long ios_base::Init::_S_count = 0;
+// by default, those are synced
+bool ios_base::_S_was_synced = true;
+
+ios_base::Init::Init() {
+  //    if (_S_count == 0)
+      ios_base::_S_initialize();
+}
+
+ios_base::Init::~Init() {
+  //    if (_S_count > 0)
+      ios_base::_S_uninitialize();
+}
+
+
+filebuf*
+_Stl_create_filebuf(FILE* f, ios_base::openmode mode )
+{
+  basic_filebuf<char, char_traits<char> >* result;
+  
+  result = new basic_filebuf<char, char_traits<char> >();
+
+  _STLP_TRY {
+    result->_M_open(_FILE_fd(f), mode);
+  }
+  _STLP_CATCH_ALL {}
+
+  if (!result->is_open()) {
+    delete result;
+    result = 0;
+  }
+  return result;
+}
+
+# ifndef _STLP_NO_WCHAR_T
+
+wfilebuf*
+_Stl_create_wfilebuf(FILE* f, ios_base::openmode mode )
+{
+  basic_filebuf<wchar_t, char_traits<wchar_t> >* result;
+  
+  result = new basic_filebuf<wchar_t, char_traits<wchar_t> >();
+
+  _STLP_TRY {
+    result->_M_open(_FILE_fd(f), mode);
+  }
+  _STLP_CATCH_ALL {}
+
+  if (!result->is_open()) {
+    delete result;
+    result = 0;
+  }
+  return result;
+}
+
+# endif
+
+void  _STLP_CALL ios_base::_S_initialize()
+{
+
+  if (ios_base::Init::_S_count++ > 0) 
+    return ;
+# if !defined(_STLP_HAS_NO_NAMESPACES) && !defined(_STLP_WINCE)
+  using _SgI::stdio_istreambuf;
+  using _SgI::stdio_ostreambuf;
+# endif
+  _STLP_TRY {
+    // Run constructors for the four narrow stream objects.
+    // check with locale system
+    //    if (_Loc_init::_S_count == 0) {
+      locale::_S_initialize();
+      //    }
+#if !defined(_STLP_WINCE)
+    istream* ptr_cin  = new((void*)&cin)  istream(0);
+    ostream* ptr_cout = new((void*)&cout) ostream(0);
+    ostream* ptr_cerr = new((void*)&cerr) ostream(0);
+    ostream* ptr_clog = new((void*)&clog) ostream(0);
+
+    // Initialize the four narrow stream objects.
+    if (_S_was_synced) {
+      ptr_cin->init(new stdio_istreambuf(stdin));
+      ptr_cout->init(new stdio_ostreambuf(stdout));
+      ptr_cerr->init(new stdio_ostreambuf(stderr));
+      ptr_clog->init(new stdio_ostreambuf(stderr));
+    } else {
+      ptr_cin->init(_Stl_create_filebuf(stdin, ios_base::in));
+      ptr_cin->init(_Stl_create_filebuf(stdout, ios_base::out));
+      ptr_cin->init(_Stl_create_filebuf(stderr, ios_base::out));
+      ptr_cin->init(_Stl_create_filebuf(stderr, ios_base::out)); 
+    }
+    ptr_cin->tie(ptr_cout);
+    ptr_cerr->setf(ios_base::unitbuf);
+
+# ifndef _STLP_NO_WCHAR_T
+
+    // Run constructors for the four wide stream objects.
+    wistream* ptr_wcin  = new(&wcin)  wistream(0);
+    wostream* ptr_wcout = new(&wcout) wostream(0);
+    wostream* ptr_wcerr = new(&wcerr) wostream(0);
+    wostream* ptr_wclog = new(&wclog) wostream(0);
+    
+    wfilebuf* win  = _Stl_create_wfilebuf(stdin, ios_base::in);
+    wfilebuf* wout = _Stl_create_wfilebuf(stdout, ios_base::out);;
+    wfilebuf* werr = _Stl_create_wfilebuf(stderr, ios_base::out);
+    wfilebuf* wlog = _Stl_create_wfilebuf(stderr, ios_base::out);
+    
+    ptr_wcin->init(win);
+    ptr_wcout->init(wout);
+    ptr_wcerr->init(werr);
+    ptr_wclog->init(wlog);
+
+    ptr_wcin->tie(ptr_wcout);
+    ptr_wcerr->setf(ios_base::unitbuf);
+    
+# endif /*  _STLP_NO_WCHAR_T */
+#endif /* _STLP_WINCE */
+
+    //    ++ios_base::Init::_S_count;
+  }
+
+  _STLP_CATCH_ALL {}
+}
+
+void _STLP_CALL ios_base::_S_uninitialize()
+{
+  if (--ios_base::Init::_S_count != 0) 
+    return ;
+
+  // Note that destroying output streambufs flushes the buffers.
+
+  istream* ptr_cin  = __REINTERPRET_CAST(istream*,&cin);
+  ostream* ptr_cout = __REINTERPRET_CAST(ostream*,&cout);
+  ostream* ptr_cerr = __REINTERPRET_CAST(ostream*,&cerr);
+  ostream* ptr_clog = __REINTERPRET_CAST(ostream*,&clog);
+
+# ifndef _STLP_NO_WCHAR_T
+  wistream* ptr_wcin  = __REINTERPRET_CAST(wistream*,&wcin);
+  wostream* ptr_wcout = __REINTERPRET_CAST(wostream*,&wcout);
+  wostream* ptr_wcerr = __REINTERPRET_CAST(wostream*,&wcerr);
+  wostream* ptr_wclog = __REINTERPRET_CAST(wostream*,&wclog);
+# endif
+
+  // we don't want any exceptions being thrown here
+  ptr_cin->exceptions(0);
+  ptr_cout->exceptions(0);
+  ptr_cerr->exceptions(0);
+  ptr_clog->exceptions(0);
+
+  delete ptr_cin->rdbuf(0);
+  delete ptr_cout->rdbuf(0);
+  delete ptr_cerr->rdbuf(0);
+  delete ptr_clog->rdbuf(0);
+
+  _Destroy(ptr_cin);
+  _Destroy(ptr_cout);
+  _Destroy(ptr_cerr);
+  _Destroy(ptr_clog);
+
+# ifndef _STLP_NO_WCHAR_T
+  // we don't want any exceptions being thrown here
+  ptr_wcin->exceptions(0);
+  ptr_wcout->exceptions(0);
+  ptr_wcerr->exceptions(0);
+  ptr_wclog->exceptions(0);
+
+  delete ptr_wcin->rdbuf(0);
+  delete ptr_wcout->rdbuf(0);
+  delete ptr_wcerr->rdbuf(0);
+  delete ptr_wclog->rdbuf(0);
+
+  _Destroy(ptr_wcin);
+  _Destroy(ptr_wcout);
+  _Destroy(ptr_wcerr);
+  _Destroy(ptr_wclog);
+
+# endif
+    if (_Loc_init::_S_count > 0) {
+      locale::_S_uninitialize();
+    }
+
+    --ios_base::Init::_S_count;
+}
+
+
+bool _STLP_CALL ios_base::sync_with_stdio(bool sync) {
+#if !defined(STLP_WINCE)
+# ifndef _STLP_HAS_NO_NAMESPACES
+  using _SgI::stdio_istreambuf;
+  using _SgI::stdio_ostreambuf;
+# endif
+  
+  bool was_synced =  _S_was_synced;
+
+  // if by any chance we got there before std streams initialization,
+  // just set the sync flag and exit
+  if (Init::_S_count == 0) {
+    _S_was_synced = sync;
+    return was_synced;
+  }
+
+  istream* ptr_cin  = __REINTERPRET_CAST(istream*,&cin);
+  ostream* ptr_cout = __REINTERPRET_CAST(ostream*,&cout);
+  ostream* ptr_cerr = __REINTERPRET_CAST(ostream*,&cerr);
+  ostream* ptr_clog = __REINTERPRET_CAST(ostream*,&clog);
+
+  streambuf* old_cin  = ptr_cin->rdbuf();
+  streambuf* old_cout = ptr_cout->rdbuf();
+  streambuf* old_cerr = ptr_cerr->rdbuf();
+  streambuf* old_clog = ptr_clog->rdbuf();
+
+  streambuf* new_cin  = 0;
+  streambuf* new_cout = 0;
+  streambuf* new_cerr = 0;
+  streambuf* new_clog = 0;
+
+  _STLP_TRY {
+    if (sync && !was_synced) {
+      new_cin  = new stdio_istreambuf(stdin);
+      new_cout = new stdio_ostreambuf(stdout);
+      new_cerr = new stdio_ostreambuf(stderr);
+      new_clog = new stdio_ostreambuf(stderr);
+    }
+    else if (!sync && was_synced) {
+      new_cin  = _Stl_create_filebuf(stdin, ios_base::in);
+      new_cout = _Stl_create_filebuf(stdout, ios_base::out);
+      new_cerr = _Stl_create_filebuf(stderr, ios_base::out);
+      new_clog = _Stl_create_filebuf(stderr, ios_base::out);
+    }
+  }
+  _STLP_CATCH_ALL {}
+
+  if (new_cin && new_cout && new_cerr && new_clog) {
+    ptr_cin->rdbuf(new_cin);
+    ptr_cout->rdbuf(new_cout);
+    ptr_cerr->rdbuf(new_cerr);
+    ptr_clog->rdbuf(new_clog);
+
+    delete old_cin;
+    delete old_cout;
+    delete old_cerr;
+    delete old_clog;
+  }
+  else {
+    delete new_cin;
+    delete new_cout;
+    delete new_cerr;
+    delete new_clog;
+  }
+
+  return was_synced;
+#else
+  return false;
+#endif /* _STLP_WINCE */
+}
+
+_STLP_END_NAMESPACE
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/src/istream.cpp b/main/source/stlport/src/istream.cpp
new file mode 100644
index 00000000..6eb7f56d
--- /dev/null
+++ b/main/source/stlport/src/istream.cpp
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+# include "stlport_prefix.h"
+
+#include <istream>
+
+_STLP_BEGIN_NAMESPACE
+
+#if !defined(_STLP_NO_FORCE_INSTANTIATE)
+// instantiations
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+template  class _STLP_CLASS_DECLSPEC _Isentry<char, char_traits<char> >;
+# endif
+template  class _STLP_CLASS_DECLSPEC basic_iostream<char, char_traits<char> >;
+#if !defined(_STLP_MSVC) || (_STLP_MSVC > 1100)
+template  class _STLP_CLASS_DECLSPEC basic_istream<char, char_traits<char> >;
+#endif
+
+#ifndef _STLP_NO_WCHAR_T
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+template class _STLP_CLASS_DECLSPEC _Isentry<wchar_t, char_traits<wchar_t> >;
+# endif
+#if !defined(_STLP_MSVC) || (_STLP_MSVC > 1100)
+template class _STLP_CLASS_DECLSPEC basic_istream<wchar_t, char_traits<wchar_t> >;
+#endif
+template class _STLP_CLASS_DECLSPEC basic_iostream<wchar_t, char_traits<wchar_t> >;
+#endif /* INSTANTIATE_WIDE_STREAMS */
+#endif
+
+_STLP_END_NAMESPACE
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/src/kai-sun.mak b/main/source/stlport/src/kai-sun.mak
new file mode 100644
index 00000000..f7341517
--- /dev/null
+++ b/main/source/stlport/src/kai-sun.mak
@@ -0,0 +1,67 @@
+#
+# compiler
+#
+CC = KCC
+CXX = $(CC)
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_kcc
+
+#
+# guts for common stuff
+#
+#
+
+WARNING_FLAGS= --one_per --thread_safe --exceptions --abstract_pointer
+
+CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+LINK=KCC ${CXXFLAGS_COMMON} -o
+DYN_LINK=KCC ${CXXFLAGS_COMMON} -o
+
+OBJEXT=o
+DYNEXT=so
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=KAI${ARCH}
+INSTALL_STEP = install_unix 
+
+all: sparc_atomic.o all_static all_dynamic symbolic_links
+
+include common_macros.mak
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) +K3 -O2
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) +K3 -O2  -KPIC
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) +K0
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) +K0 -KPIC
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+
+include common_percent_rules.mak
+include common_rules.mak
+
+sparc_atomic.o : sparc_atomic.s
+	${AS} sparc_atomic.s -o sparc_atomic.o
+sparc_atomic64.o : sparc_atomic64.s
+	${AS} sparc_atomic64.s -o sparc_atomic64.o
+
+LDFLAGS_RELEASE_static = ${CXXFLAGS_RELEASE_static} 
+LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic} --soname ${RELEASE_DYNLIB_SONAME} sparc_atomic.o
+
+LDFLAGS_DEBUG_static = ${CXXFLAGS_DEBUG_static} sparc_atomic.o
+LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic} --soname ${DEBUG_DYNLIB_SONAME} sparc_atomic.o
+
+LDFLAGS_STLDEBUG_static = ${CXXFLAGS_STLDEBUG_static} sparc_atomic.o
+LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic} --soname ${STLDEBUG_DYNLIB_SONAME} sparc_atomic.o
+
+# LDLIBS_RELEASE_dynamic =  -lposix4
+# LDLIBS_STLDEBUG_dynamic = -lposix4
+
+
+
diff --git a/main/source/stlport/src/kai.mak b/main/source/stlport/src/kai.mak
new file mode 100644
index 00000000..2f365d2e
--- /dev/null
+++ b/main/source/stlport/src/kai.mak
@@ -0,0 +1,63 @@
+#
+# compiler
+#
+CC = KCC
+CXX = $(CC)
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_kcc
+
+#
+# guts for common stuff
+#
+#
+
+WARNING_FLAGS= --one_per --thread_safe --exceptions --abstract_pointer
+
+CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+LINK=ar crv
+DYN_LINK=KCC ${CXXFLAGS_COMMON} -o
+
+OBJEXT=o
+DYNEXT=so
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=KAI${ARCH}
+INSTALL_STEP = install_unix 
+
+all: all_static all_dynamic symbolic_links
+
+include common_macros.mak
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) +K3 -O2
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) +K3 -O2  -KPIC
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -K0
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -K0 -KPIC
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+
+include common_percent_rules.mak
+include common_rules.mak
+
+
+LDFLAGS_RELEASE_static = ${CXXFLAGS_RELEASE_static}
+LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic} --soname ${RELEASE_DYNLIB_SONAME}
+
+LDFLAGS_DEBUG_static = ${CXXFLAGS_DEBUG_static}
+LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic} --soname ${DEBUG_DYNLIB_SONAME}
+
+LDFLAGS_STLDEBUG_static = ${CXXFLAGS_STLDEBUG_static} sparc_atomic.S
+LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic} --soname ${STLDEBUG_DYNLIB_SONAME}
+
+LDLIBS_RELEASE_dynamic =  -lposix4
+LDLIBS_STLDEBUG_dynamic = -lposix4
+
+
+
diff --git a/main/source/stlport/src/locale.cpp b/main/source/stlport/src/locale.cpp
new file mode 100644
index 00000000..1b657f8a
--- /dev/null
+++ b/main/source/stlport/src/locale.cpp
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+# include "stlport_prefix.h"
+
+#include <locale>
+#include <stdexcept>
+#include <stl/_algobase.h>
+
+#include "locale_nonclassic.h"
+
+_STLP_BEGIN_NAMESPACE
+
+_Locale::_Locale(const _Locale_impl& L)
+  : _Locale_impl(L), _Refcount_Base(1), facets_vec((void**)L.facets, (void**)L.facets+L.size())
+{
+  for (size_t i = 1; i < L.size(); ++i) {
+    locale::facet* f = L.facets[i];
+    if (f && f->_M_delete)
+      f->_M_incr();
+  }
+  facets = (locale::facet**)&facets_vec[0];
+  _M_size = facets_vec.size();
+}
+
+_Locale::~_Locale() {
+  size_t sz = facets_vec.size();
+  for (size_t i = 1; i < sz ; ++i)
+    this->remove(i);
+}
+
+void _Locale::remove(size_t index) {
+  if (index > 0 && index < facets_vec.size()) {
+    locale::facet* old = (locale::facet*)facets_vec[index];
+    if (old && old->_M_delete) {
+      old->_M_decr(); 
+      if (old->_M_ref_count == 0)
+        delete old;
+    }
+    facets_vec[index] = 0;
+  }
+}
+
+locale::facet*
+_Locale::insert(locale::facet* f, size_t index, bool do_incr) {
+  if (f != 0 && index != 0) {
+    if (index >= facets_vec.size()) {
+      facets_vec.insert(facets_vec.end(),
+                        index - facets_vec.size() + 1, (void*) 0);
+      facets = (locale::facet**)&facets_vec[0];
+      _M_size = facets_vec.size();
+    }
+    if (do_incr)
+      f->_M_incr();
+    
+    remove(index);
+    facets_vec[index] = (void*)f;
+    return f;
+  }
+  else
+    return 0;
+}
+
+void _Locale::insert(_Locale_impl* from, const locale::id& n) {
+  size_t index = n._M_index;
+  this->remove(index);
+  if (index > 0 && index < from->size())
+    this->insert(from->facets[index], index, true);
+}
+
+
+static _STLP_STATIC_MUTEX _Index_lock _STLP_MUTEX_INITIALIZER;
+
+// Takes a reference to a locale::id, and returns its numeric index.
+// If no numeric index has yet been assigned, assigns one.  The return
+// value is always positive.
+static size_t _Stl_loc_get_index(locale::id& id)
+{
+  if (id._M_index == 0) {
+    _STLP_auto_lock sentry(_Index_lock);
+    size_t new_index = locale::id::_S_max++;
+    id._M_index = new_index;
+  }
+  return id._M_index;
+}
+
+void locale::_M_insert(facet* f, locale::id& n)
+{
+  if (f)
+    ((_Locale*)_M_impl)->insert(f, _Stl_loc_get_index(n), false);
+}
+
+
+// Make a locale directly from a _Locale_impl object.  If the second argument
+// is true, we clone the _Locale_impl.  If false, we just twiddle pointers.
+locale::locale(_Locale_impl* impl, bool do_copy)
+  : _M_impl(0)
+{
+  if (do_copy) {
+    _M_impl = new _Locale(*impl);
+    _M_impl->name = "*";
+  } else
+    _M_impl = _S_copy_impl(impl);
+}
+
+_STLP_END_NAMESPACE
diff --git a/main/source/stlport/src/locale_catalog.cpp b/main/source/stlport/src/locale_catalog.cpp
new file mode 100644
index 00000000..9f8b1a23
--- /dev/null
+++ b/main/source/stlport/src/locale_catalog.cpp
@@ -0,0 +1,737 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+# include "stlport_prefix.h"
+
+// #include <locale>
+#include <hash_map>
+#include "locale_impl.h"
+#include "c_locale.h"
+
+#include "locale_nonclassic.h"
+
+
+#include <stl/_codecvt.h>
+#include <stl/_collate.h>
+#include <stl/_ctype.h>
+#include <stl/_monetary.h>
+#include <stl/_time_facets.h>
+#include <stl/_messages_facets.h>
+#include <stl/_istream.h>
+#include <stl/_num_get.h>
+#include <stl/_num_put.h>
+
+
+_STLP_BEGIN_NAMESPACE
+
+// those wrappers are needed to avoid extern "C"
+
+ void* _Loc_ctype_create(const char * s)
+  { return (void*)_Locale_ctype_create(s); }
+ void* _Loc_numeric_create(const char * s)
+  { return (void*)_Locale_numeric_create(s); }
+ void* _Loc_time_create(const char * s)
+  { return (void*)_Locale_time_create(s); }
+ void* _Loc_collate_create(const char * s)
+  { return (void*)_Locale_collate_create(s); }
+ void* _Loc_monetary_create(const char * s)
+  { return (void*)_Locale_monetary_create(s); }
+ void* _Loc_messages_create(const char * s)
+  { return (void*)_Locale_messages_create(s); }
+
+ char* _Loc_ctype_name(const void* l, char* s)
+  { return _Locale_ctype_name(l, s); }
+ char* _Loc_numeric_name(const void* l, char* s)
+  { return _Locale_numeric_name(l, s); }
+ char* _Loc_time_name(const void* l, char* s)
+  { return _Locale_time_name(l,s); }
+ char* _Loc_collate_name( const void* l, char* s)
+  { return _Locale_collate_name(l,s); }
+ char* _Loc_monetary_name(const void* l, char* s)
+  { return _Locale_monetary_name(l,s); }
+ char* _Loc_messages_name(const void* l, char* s)
+  { return _Locale_messages_name(l,s); }
+
+ const char* _Loc_ctype_default(char* p)    { return _Locale_ctype_default(p); }
+ const char* _Loc_numeric_default(char * p) { return _Locale_numeric_default(p); }
+ const char* _Loc_time_default(char* p)     { return _Locale_time_default(p); }
+ const char* _Loc_collate_default(char* p)  { return _Locale_collate_default(p); }
+ const char* _Loc_monetary_default(char* p) { return _Locale_monetary_default(p); }
+ const char* _Loc_messages_default(char* p) { return _Locale_messages_default(p); }
+
+ void _Loc_ctype_destroy(void* p)    {_Locale_ctype_destroy(p); }
+ void _Loc_numeric_destroy(void* p)  {_Locale_numeric_destroy(p); }
+ void _Loc_time_destroy(void* p)     {_Locale_time_destroy(p);}
+ void _Loc_collate_destroy(void* p)  {_Locale_collate_destroy(p);}
+ void _Loc_monetary_destroy(void* p) {_Locale_monetary_destroy(p);}
+ void _Loc_messages_destroy(void* p) {_Locale_messages_destroy(p);}
+
+typedef void* (*loc_create_func_t)(const char *);
+typedef char* (*loc_name_func_t)(const void* l, char* s);
+typedef void (*loc_destroy_func_t)(void* l);
+typedef const char* (*loc_default_name_func_t)(char* s);
+
+//----------------------------------------------------------------------
+// Acquire and release low-level category objects.  The whole point of
+// this is so that we don't allocate (say) four different _Locale_ctype
+// objects for a single locale.
+
+struct __eqstr {
+  bool operator()(const char* s1, const char* s2) const
+    { return strcmp(s1, s2) == 0; }
+};
+
+struct __ptr_hash {
+  size_t operator()(const void* p) const
+    { return __REINTERPRET_CAST(size_t,p); }
+};
+
+template <class _Category_ptr>
+struct __destroy_fun {
+  typedef void (*_fun_type)(_Category_ptr);
+  _fun_type _M_fun;
+  __destroy_fun(_fun_type __f) : _M_fun(__f) {}
+  void operator()(_Category_ptr __c) { _M_fun(__c); }  
+};
+
+// Global hash tables for category objects.
+typedef hash_map<const char*, pair<void*, size_t>, hash<const char*>, __eqstr> Category_Map;
+
+// Look up a category by name
+static hash_map<const char*, pair<void*, size_t>, hash<const char*>, __eqstr>* ctype_hash;
+static hash_map<const char*, pair<void*, size_t>, hash<const char*>, __eqstr>* numeric_hash;
+static hash_map<const char*, pair<void*, size_t>, hash<const char*>, __eqstr>* time_hash;
+static hash_map<const char*, pair<void*, size_t>, hash<const char*>, __eqstr>* collate_hash;
+static hash_map<const char*, pair<void*, size_t>, hash<const char*>, __eqstr>* monetary_hash;
+static hash_map<const char*, pair<void*, size_t>, hash<const char*>, __eqstr>* messages_hash;
+
+// We have a single lock for all of the hash tables.  We may wish to 
+// replace it with six different locks.
+/* REFERENCED */
+_STLP_STATIC_MUTEX __category_hash_lock _STLP_MUTEX_INITIALIZER;
+
+static void*
+__acquire_category(const char* name, loc_create_func_t create_obj,
+                   loc_default_name_func_t default_obj, Category_Map ** M)
+{
+  typedef Category_Map::iterator Category_iterator;
+  pair<Category_iterator, bool> result;
+  _STLP_auto_lock sentry(__category_hash_lock);
+
+  typedef const char* key_type; 
+  pair<const key_type, pair<void*,size_t> > __e(name, pair<void*,size_t>((void*)0,size_t(0)));
+
+  if (!*M)
+    *M = new Category_Map();
+
+#if defined(__SC__)		//*TY 06/01/2000 - added workaround for SCpp
+  if(!*M) delete *M;	//*TY 06/01/2000 - it forgets to generate dtor for Category_Map class. This fake code forces to generate one.
+#endif					//*TY 06/01/2000 - 
+
+  // Find what name to look for.  Be careful if user requests the default.
+  char buf[_Locale_MAX_SIMPLE_NAME];
+  if (name == 0 || name[0] == 0)
+    name = default_obj(buf);
+  if (name == 0 || name[0] == 0)
+    name = "C";
+
+  // Look for an existing entry with that name.
+
+  result = (*M)->insert_noresize(__e);
+
+  // There was no entry in the map already.  Create the category.
+  if (result.second) 
+    (*result.first).second.first = create_obj(name);
+
+  // Increment the reference count.
+  ++((*result.first).second.second);
+
+  return (*result.first).second.first;
+}
+
+
+static void 
+__release_category(void* cat,
+                 loc_destroy_func_t destroy_fun,
+                 loc_name_func_t get_name,
+                 Category_Map* M)
+{
+  _STLP_auto_lock sentry(__category_hash_lock);
+
+  if (cat && M) {
+    // Find the name of the category object.
+    char buf[_Locale_MAX_SIMPLE_NAME + 1];
+    char* name = get_name(cat, buf);
+
+    if (name != 0) {
+      Category_Map::iterator it = M->find(name);
+      if (it != M->end()) {
+        // Decrement the ref count.  If it goes to zero, delete this category
+        // from the map.
+        if (--((*it).second.second) == 0) {
+          void* cat1 = (*it).second.first;
+          destroy_fun(cat1);
+          M->erase(it);
+        }
+      }
+    }
+  }
+}
+
+_Locale_ctype* _STLP_CALL __acquire_ctype(const char* name)
+{ return __REINTERPRET_CAST(_Locale_ctype*,
+                            __acquire_category(name, _Loc_ctype_create, _Loc_ctype_default, &ctype_hash)); }
+_Locale_numeric* _STLP_CALL __acquire_numeric(const char* name)
+{ return __REINTERPRET_CAST(_Locale_numeric*,
+                            __acquire_category(name, _Loc_numeric_create, _Loc_numeric_default, &numeric_hash)); }
+_Locale_time* _STLP_CALL __acquire_time(const char* name)
+{ return __REINTERPRET_CAST(_Locale_time*,
+                            __acquire_category(name, _Loc_time_create, _Loc_time_default, &time_hash)); }
+_Locale_collate* _STLP_CALL __acquire_collate(const char* name)
+{ return __REINTERPRET_CAST(_Locale_collate*,
+                            __acquire_category(name, _Loc_collate_create, _Loc_collate_default, &collate_hash)); }
+_Locale_monetary* _STLP_CALL __acquire_monetary(const char* name)
+{ return __REINTERPRET_CAST(_Locale_monetary*,
+                            __acquire_category(name, _Loc_monetary_create, _Loc_monetary_default, &monetary_hash)); }
+_Locale_messages* _STLP_CALL __acquire_messages(const char* name)
+{ return __REINTERPRET_CAST(_Locale_messages*,
+                            __acquire_category(name, _Loc_messages_create, _Loc_messages_default, &messages_hash)); }
+
+void  _STLP_CALL __release_ctype(_Locale_ctype* cat) {
+  __release_category(cat, _Loc_ctype_destroy, _Loc_ctype_name, ctype_hash);
+}
+void _STLP_CALL __release_numeric(_Locale_numeric* cat) {
+  __release_category(cat, _Loc_numeric_destroy, _Loc_numeric_name, numeric_hash);
+}
+void _STLP_CALL __release_time(_Locale_time* cat) {
+  __release_category(cat, _Loc_time_destroy, _Loc_time_name, time_hash);
+}
+void _STLP_CALL __release_collate(_Locale_collate* cat) {
+  __release_category(cat, _Loc_collate_destroy, _Loc_collate_name, collate_hash);
+}
+void _STLP_CALL __release_monetary(_Locale_monetary* cat) {
+  __release_category(cat, _Loc_monetary_destroy, _Loc_monetary_name, monetary_hash);
+}
+void _STLP_CALL __release_messages(_Locale_messages* cat) {
+  __release_category(cat, _Loc_messages_destroy, _Loc_messages_name, messages_hash);
+}
+
+
+//
+// <locale> content which is dependent on the name 
+//
+
+template <class Facet>
+inline locale::facet* 
+_Locale_insert(_Locale* __that, Facet* f) {
+  return __that->insert(f, Facet::id._M_index, false);
+}
+
+// Give L a name where all facets except those in category c
+// are taken from name1, and those in category c are taken from name2.
+void _Stl_loc_combine_names(_Locale* L,
+                   const char* name1, const char* name2,
+                   locale::category c)
+{
+  if ((c & locale::all) == 0 || strcmp(name1, name2) == 0)
+    L->name = name1;
+  else if ((c & locale::all) == locale::all)
+    L->name = name2;
+  else {
+    // Decompose the names.
+    char ctype_buf[_Locale_MAX_SIMPLE_NAME];
+    char numeric_buf[_Locale_MAX_SIMPLE_NAME];
+    char time_buf[_Locale_MAX_SIMPLE_NAME];
+    char collate_buf[_Locale_MAX_SIMPLE_NAME];
+    char monetary_buf[_Locale_MAX_SIMPLE_NAME];
+    char messages_buf[_Locale_MAX_SIMPLE_NAME];
+
+    _Locale_extract_ctype_name((c & locale::ctype) ? name2 : name1,
+                               ctype_buf); 
+    _Locale_extract_numeric_name((c & locale::numeric) ? name2 : name1,
+                                 numeric_buf); 
+    _Locale_extract_time_name((c & locale::time) ? name2 : name1,
+                              time_buf); 
+    _Locale_extract_collate_name((c & locale::collate) ? name2 : name1,
+                                 collate_buf); 
+    _Locale_extract_monetary_name((c & locale::monetary) ? name2 : name1,
+                                  monetary_buf); 
+    _Locale_extract_messages_name((c & locale::messages) ? name2 : name1,
+                                  messages_buf); 
+    
+    // Construct a new composite name.
+    char composite_buf[_Locale_MAX_COMPOSITE_NAME];
+    _Locale_compose_name(composite_buf,
+                         ctype_buf, numeric_buf, time_buf,
+                         collate_buf, monetary_buf, messages_buf,
+                         name1);
+    L->name = composite_buf;
+  }
+}
+
+
+// Create a locale from a name.
+locale::locale(const char* name)
+  : _M_impl(0)
+{
+  if (!name)
+    _M_throw_runtime_error(0);
+
+  _Locale* impl = 0;
+
+  _STLP_TRY {
+    impl = new _Locale(locale::id::_S_max, name);
+
+    // Insert categories one at a time.
+    impl->insert_ctype_facets(name);
+    impl->insert_numeric_facets(name);
+    impl->insert_time_facets(name);
+    impl->insert_collate_facets(name);
+    impl->insert_monetary_facets(name);
+    impl->insert_messages_facets(name);
+    // reassign impl
+    _M_impl = impl;
+  }
+  _STLP_UNWIND(delete impl);
+}
+
+// Create a locale that's a copy of L, except that all of the facets
+// in category c are instead constructed by name.
+locale::locale(const locale& L, const char* name, locale::category c)
+  : _M_impl(0)
+{
+  if (name == 0 || strcmp(name, "*") == 0)
+    _M_throw_runtime_error(name);
+
+  _Locale* impl = 0;
+
+  _STLP_TRY {
+    impl = new _Locale(*L._M_impl);
+    _Stl_loc_combine_names(impl, L._M_impl->name.c_str(), name, c);
+
+    if (c & locale::ctype)
+      impl->insert_ctype_facets(name);
+    if (c & locale::numeric)
+      impl->insert_numeric_facets(name);
+    if (c & locale::time)
+      impl->insert_time_facets(name);
+    if (c & locale::collate)
+      impl->insert_collate_facets(name);
+    if (c & locale::monetary)
+      impl->insert_monetary_facets(name);
+    if (c & locale::messages)
+      impl->insert_messages_facets(name);
+    _M_impl = impl;
+  }
+  _STLP_UNWIND(delete impl)
+
+}
+
+// Contruct a new locale where all facets that aren't in category c
+// come from L1, and all those that are in category c come from L2.
+locale::locale(const locale& L1, const locale& L2, category c)
+  : _M_impl(0)
+{
+  _Locale* impl = new _Locale(*L1._M_impl);
+  
+  _Locale_impl* i2 = L2._M_impl;
+
+  static string nameless("*");
+  if (L1.name() != nameless && L2.name() != nameless)
+    _Stl_loc_combine_names(impl,
+                  L1._M_impl->name.c_str(), L2._M_impl->name.c_str(),
+                  c);
+  else {
+    impl->name = "*";
+  }
+
+  if (c & collate) {
+    impl->insert( i2, _STLP_STD::collate<char>::id);
+# ifndef _STLP_NO_WCHAR_T
+    impl->insert( i2, _STLP_STD::collate<wchar_t>::id);
+# endif
+  }
+  if (c & ctype) {
+    impl->insert( i2, _STLP_STD::ctype<char>::id);
+    impl->insert( i2, _STLP_STD::codecvt<char, char, mbstate_t>::id);
+# ifndef _STLP_NO_WCHAR_T
+    impl->insert( i2, _STLP_STD::ctype<wchar_t>::id);
+    impl->insert( i2, _STLP_STD::codecvt<wchar_t, char, mbstate_t>::id);
+# endif
+  }
+  if (c & monetary) {
+    impl->insert( i2, _STLP_STD::moneypunct<char, true>::id);
+    impl->insert( i2, _STLP_STD::moneypunct<char, false>::id);
+    impl->insert( i2, _STLP_STD::money_get<char, istreambuf_iterator<char, char_traits<char> > >::id);
+    impl->insert( i2, _STLP_STD::money_put<char, ostreambuf_iterator<char, char_traits<char> > >::id);
+# ifndef _STLP_NO_WCHAR_T
+    impl->insert( i2, _STLP_STD::moneypunct<wchar_t, true>::id);
+    impl->insert( i2, _STLP_STD::moneypunct<wchar_t, false>::id);
+    impl->insert( i2, _STLP_STD::money_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >::id);
+    impl->insert( i2, _STLP_STD::money_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >::id);
+# endif
+  }
+  if (c & numeric) {
+    impl->insert( i2, _STLP_STD::numpunct<char>::id);
+    impl->insert( i2, _STLP_STD::num_get<char, istreambuf_iterator<char, char_traits<char> > >::id);
+    impl->insert( i2, _STLP_STD::num_put<char, ostreambuf_iterator<char, char_traits<char> > >::id);
+# ifndef _STLP_NO_WCHAR_T
+    impl->insert( i2, _STLP_STD::numpunct<wchar_t>::id);
+    impl->insert( i2, num_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >::id);
+    impl->insert( i2, num_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >::id);
+# endif
+  }
+  if (c & time) {
+    impl->insert( i2, _STLP_STD::time_get<char, istreambuf_iterator<char, char_traits<char> > >::id);
+    impl->insert( i2, _STLP_STD::time_put<char, ostreambuf_iterator<char, char_traits<char> > >::id);
+# ifndef _STLP_NO_WCHAR_T
+    impl->insert( i2, _STLP_STD::time_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >::id);
+    impl->insert( i2, _STLP_STD::time_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >::id);
+# endif
+  }
+  if (c & messages) {
+    impl->insert( i2, _STLP_STD::messages<char>::id);
+# ifndef _STLP_NO_WCHAR_T
+    impl->insert( i2, _STLP_STD::messages<wchar_t>::id);
+# endif
+  }
+  _M_impl = impl;
+}
+
+// Six functions, one for each category.  Each of them takes a 
+// _Locale* and a name, constructs that appropriate category
+// facets by name, and inserts them into the locale.  
+
+void _Locale::insert_ctype_facets(const char* pname)
+{
+  char buf[_Locale_MAX_SIMPLE_NAME];
+  _Locale_impl* i2 = locale::classic()._M_impl;
+
+  if (pname == 0 || pname[0] == 0)
+    pname = _Locale_ctype_default(buf);
+
+  if (pname == 0 || pname[0] == 0 || strcmp(pname, "C") == 0) {
+    this->insert(i2, ctype<char>::id);
+# ifndef _STLP_NO_MBSTATE_T
+    this->insert(i2, codecvt<char, char, mbstate_t>::id);
+# endif
+# ifndef _STLP_NO_WCHAR_T
+    this->insert(i2, ctype<wchar_t>::id);
+# ifndef _STLP_NO_MBSTATE_T
+    this->insert(i2, codecvt<wchar_t, char, mbstate_t>::id);
+# endif
+# endif
+  }
+  else {
+    ctype<char>*    ct                      = 0;
+# ifndef _STLP_NO_MBSTATE_T
+    codecvt<char, char, mbstate_t>*    cvt  = 0;
+# endif
+# ifndef _STLP_NO_WCHAR_T
+    ctype<wchar_t>* wct                     = 0;
+    codecvt<wchar_t, char, mbstate_t>* wcvt = 0;
+# endif
+    _STLP_TRY {
+      ct   = new ctype_byname<char>(pname);
+# ifndef _STLP_NO_MBSTATE_T
+      cvt  = new codecvt_byname<char, char, mbstate_t>(pname);
+# endif
+# ifndef _STLP_NO_WCHAR_T
+      wct  = new ctype_byname<wchar_t>(pname); 
+      wcvt = new codecvt_byname<wchar_t, char, mbstate_t>(pname);
+# endif
+    }
+    
+# ifndef _STLP_NO_WCHAR_T
+#  ifdef _STLP_NO_MBSTATE_T
+    _STLP_UNWIND(delete ct; delete wct; delete wcvt);
+#  else
+    _STLP_UNWIND(delete ct; delete wct; delete cvt; delete wcvt);
+#  endif
+# else
+#  ifdef _STLP_NO_MBSTATE_T
+    _STLP_UNWIND(delete ct);
+#  else
+    _STLP_UNWIND(delete ct; delete cvt);
+#  endif
+# endif    
+    _Locale_insert(this, ct);
+#  ifndef _STLP_NO_MBSTATE_T
+    _Locale_insert(this, cvt);
+#  endif
+#  ifndef _STLP_NO_WCHAR_T
+    _Locale_insert(this, wct);
+    _Locale_insert(this, wcvt);
+#  endif
+  }
+}
+
+void _Locale::insert_numeric_facets(const char* pname)
+{
+  _Locale_impl* i2 = locale::classic()._M_impl;
+
+  numpunct<char>*    punct  = 0;
+  num_get<char, istreambuf_iterator<char, char_traits<char> > >*     get    = 0;
+  num_put<char, ostreambuf_iterator<char, char_traits<char> > >*     put    = 0;
+# ifndef _STLP_NO_WCHAR_T
+  numpunct<wchar_t>* wpunct = 0;
+  num_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >*  wget   = 0;
+  num_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >*  wput   = 0;
+# endif
+
+  char buf[_Locale_MAX_SIMPLE_NAME];
+  if (pname == 0 || pname[0] == 0)
+    pname = _Locale_numeric_default(buf);
+
+  if (pname == 0 || pname[0] == 0 || strcmp(pname, "C") == 0) {
+    this->insert(i2, numpunct<char>::id);
+    this->insert(i2, 
+		 num_put<char, ostreambuf_iterator<char, char_traits<char> >  >::id);
+    this->insert(i2, 
+		 num_get<char, istreambuf_iterator<char, char_traits<char> > >::id);
+# ifndef _STLP_NO_WCHAR_T
+    this->insert(i2, numpunct<wchar_t>::id);
+    this->insert(i2, 
+		 num_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> >  >::id);
+    this->insert(i2, 
+		 num_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >::id);
+# endif
+  }
+  else {
+    _STLP_TRY {
+      punct  = new numpunct_byname<char>(pname);
+      get    = new num_get<char, istreambuf_iterator<char, char_traits<char> > >;
+      put    = new num_put<char, ostreambuf_iterator<char, char_traits<char> > >;
+# ifndef _STLP_NO_WCHAR_T
+      wpunct = new numpunct_byname<wchar_t>(pname);
+      wget   = new num_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >;
+      wput   = new num_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >;
+# endif
+    }
+# ifndef _STLP_NO_WCHAR_T
+    _STLP_UNWIND(delete punct; delete wpunct; delete get; delete wget;
+    delete put; delete wput);
+# else
+    _STLP_UNWIND(delete punct; delete get;delete put);
+# endif
+    
+  _Locale_insert(this,punct);
+  _Locale_insert(this,get);
+  _Locale_insert(this,put);
+
+# ifndef _STLP_NO_WCHAR_T
+  _Locale_insert(this,wpunct);
+  _Locale_insert(this,wget);
+  _Locale_insert(this,wput);
+# endif
+  }
+}
+
+void _Locale::insert_time_facets(const char* pname)
+{
+  _Locale_impl* i2 = locale::classic()._M_impl;
+  time_get<char, istreambuf_iterator<char, char_traits<char> > >*    get  = 0;
+  time_put<char, ostreambuf_iterator<char, char_traits<char> > >*    put  = 0;
+# ifndef _STLP_NO_WCHAR_T
+  time_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >* wget = 0;
+  time_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >* wput = 0;
+# endif
+
+  char buf[_Locale_MAX_SIMPLE_NAME];
+  if (pname == 0 || pname[0] == 0)
+    pname = _Locale_time_default(buf);
+  
+  if (pname == 0 || pname[0] == 0 || strcmp(pname, "C") == 0) {
+
+    this->insert(i2, 
+		 time_get<char, istreambuf_iterator<char, char_traits<char> > >::id);
+    this->insert(i2, 
+		 time_put<char, ostreambuf_iterator<char, char_traits<char> > >::id);
+# ifndef _STLP_NO_WCHAR_T
+    this->insert(i2,
+		 time_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >::id);
+    this->insert(i2,
+		 time_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >::id);
+# endif
+  }
+  else {
+    _STLP_TRY {
+      get  = new time_get_byname<char, istreambuf_iterator<char, char_traits<char> > >(pname);
+      put  = new time_put_byname<char, ostreambuf_iterator<char, char_traits<char> > >(pname);
+# ifndef _STLP_NO_WCHAR_T
+      wget = new time_get_byname<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >(pname);
+      wput = new time_put_byname<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >(pname);
+# endif
+    }
+# ifndef _STLP_NO_WCHAR_T
+    _STLP_UNWIND(delete get; delete wget; delete put; delete wput);
+# else
+    _STLP_UNWIND(delete get; delete put);
+# endif
+    _Locale_insert(this,get);
+    _Locale_insert(this,put);
+# ifndef _STLP_NO_WCHAR_T
+    _Locale_insert(this,wget);
+    _Locale_insert(this,wput);
+# endif
+  }
+}
+
+void _Locale::insert_collate_facets(const char* nam)
+{
+  _Locale_impl* i2 = locale::classic()._M_impl;
+
+  collate<char>*    col  = 0;
+# ifndef _STLP_NO_WCHAR_T
+  collate<wchar_t>* wcol = 0;
+# endif
+
+  char buf[_Locale_MAX_SIMPLE_NAME];
+  if (nam == 0 || nam[0] == 0)
+    nam = _Locale_collate_default(buf);
+
+  if (nam == 0 || nam[0] == 0 || strcmp(nam, "C") == 0) {
+    this->insert(i2, collate<char>::id);
+# ifndef _STLP_NO_WCHAR_T
+    this->insert(i2, collate<wchar_t>::id);
+# endif
+  }
+  else {
+    _STLP_TRY {
+      col   = new collate_byname<char>(nam);
+# ifndef _STLP_NO_WCHAR_T
+      wcol  = new collate_byname<wchar_t>(nam); 
+# endif
+    }
+# ifndef _STLP_NO_WCHAR_T
+    _STLP_UNWIND(delete col; delete wcol);
+# else
+    _STLP_UNWIND(delete col);
+# endif
+    _Locale_insert(this,col);
+# ifndef _STLP_NO_WCHAR_T
+    _Locale_insert(this,wcol);
+# endif
+  }
+}
+
+void _Locale::insert_monetary_facets(const char* pname)
+{
+  _Locale_impl* i2 = locale::classic()._M_impl;
+
+  moneypunct<char,    false>* punct   = 0;
+  moneypunct<char,    true>*  ipunct  = 0;
+  money_get<char, istreambuf_iterator<char, char_traits<char> > >*            get     = 0;
+  money_put<char, ostreambuf_iterator<char, char_traits<char> > >*            put     = 0;
+
+# ifndef _STLP_NO_WCHAR_T
+  moneypunct<wchar_t, false>* wpunct  = 0;
+  moneypunct<wchar_t, true>*  wipunct = 0;
+  money_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >*         wget    = 0;
+  money_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >*         wput    = 0;
+# endif
+
+  char buf[_Locale_MAX_SIMPLE_NAME];
+  if (pname == 0 || pname[0] == 0)
+    pname = _Locale_monetary_default(buf);
+
+  if (pname == 0 || pname[0] == 0 || strcmp(pname, "C") == 0) {
+    this->insert(i2, moneypunct<char, false>::id);
+    this->insert(i2, moneypunct<char, true>::id);
+    this->insert(i2, money_get<char, istreambuf_iterator<char, char_traits<char> > >::id);
+    this->insert(i2, money_put<char, ostreambuf_iterator<char, char_traits<char> > >::id);
+# ifndef _STLP_NO_WCHAR_T
+    this->insert(i2, moneypunct<wchar_t, false>::id);
+    this->insert(i2, moneypunct<wchar_t, true>::id);
+    this->insert(i2, money_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >::id);
+    this->insert(i2, money_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >::id);
+# endif
+  }
+  else {    
+    _STLP_TRY {
+      punct   = new moneypunct_byname<char, false>(pname);
+      ipunct  = new moneypunct_byname<char, true>(pname);
+      get     = new money_get<char, istreambuf_iterator<char, char_traits<char> > >;
+      put     = new money_put<char, ostreambuf_iterator<char, char_traits<char> > >;
+# ifndef _STLP_NO_WCHAR_T
+      wpunct  = new moneypunct_byname<wchar_t, false>(pname);
+      wipunct = new moneypunct_byname<wchar_t, true>(pname);
+      wget    = new money_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >;
+      wput    = new money_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >;
+# endif
+    }
+# ifndef _STLP_NO_WCHAR_T
+    _STLP_UNWIND(delete punct; delete ipunct; delete wpunct; delete wipunct;
+    delete get; delete wget; delete put; delete wput);
+# else
+    _STLP_UNWIND(delete punct; delete ipunct; delete get; delete put);
+# endif
+    _Locale_insert(this,punct);
+    _Locale_insert(this,ipunct);
+    _Locale_insert(this,get);
+    _Locale_insert(this,put);
+# ifndef _STLP_NO_WCHAR_T
+    _Locale_insert(this,wget);
+    _Locale_insert(this,wpunct);
+    _Locale_insert(this,wipunct);
+    _Locale_insert(this,wput);
+# endif
+  }
+}
+
+
+void _Locale::insert_messages_facets(const char* pname)
+{
+  _Locale_impl* i2 = locale::classic()._M_impl;
+  messages<char>*    msg  = 0;
+# ifndef _STLP_NO_WCHAR_T
+  messages<wchar_t>* wmsg = 0;
+# endif
+
+  char buf[_Locale_MAX_SIMPLE_NAME];
+  if (pname == 0 || pname[0] == 0)
+    pname = _Locale_messages_default(buf);
+
+  if (pname == 0 || pname[0] == 0 || strcmp(pname, "C") == 0) {
+    this->insert(i2, messages<char>::id);
+# ifndef _STLP_NO_WCHAR_T
+    this->insert(i2, messages<wchar_t>::id);
+# endif
+  }
+  else {
+    _STLP_TRY {
+      msg  = new messages_byname<char>(pname);
+# ifndef _STLP_NO_WCHAR_T
+      wmsg = new messages_byname<wchar_t>(pname);
+# endif
+    }
+# ifndef _STLP_NO_WCHAR_T
+    _STLP_UNWIND(delete msg; delete wmsg);
+# else
+    _STLP_UNWIND(delete msg);
+# endif
+    _Locale_insert(this,msg);
+# ifndef _STLP_NO_WCHAR_T
+    _Locale_insert(this,wmsg);
+# endif
+  }
+}
+
+_STLP_END_NAMESPACE
+
+
+
diff --git a/main/source/stlport/src/locale_impl.cpp b/main/source/stlport/src/locale_impl.cpp
new file mode 100644
index 00000000..695b2ffa
--- /dev/null
+++ b/main/source/stlport/src/locale_impl.cpp
@@ -0,0 +1,487 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+# include "stlport_prefix.h"
+
+#include "locale_impl.h"
+#include <locale>
+#include <typeinfo>
+#include <stdexcept>
+#include "c_locale.h"
+#include "aligned_buffer.h"
+
+
+#include "locale_impl.h"
+#include <stl/_codecvt.h>
+#include <stl/_collate.h>
+#include <stl/_ctype.h>
+#include <stl/_monetary.h>
+#include "message_facets.h"
+
+_STLP_BEGIN_NAMESPACE
+
+// #ifdef _STLP_USE_OWN_NAMESPACE
+// using _STLP_VENDOR_EXCEPT_STD::bad_cast;
+// #endif
+
+_Locale_impl::_Locale_impl(const char* s) : name(s) {}
+_Locale_impl::~_Locale_impl() {}
+void _Locale_impl::incr() {}
+void _Locale_impl::decr() {}
+
+// _Locale_impl non-inline member functions.
+void _STLP_CALL
+_Locale_impl::_M_throw_bad_cast()
+{
+  _STLP_THROW(bad_cast());  
+}
+
+static void 
+_Stl_loc_assign_ids() {
+  // This assigns ids to every facet that is a member of a category,
+  // and also to money_get/put, num_get/put, and time_get/put
+  // instantiated using ordinary pointers as the input/output
+  // iterators.  (The default is [io]streambuf_iterator.)
+
+  money_get<char, istreambuf_iterator<char, char_traits<char> > >::id._M_index                     = 8;
+  money_get<char, const char*>::id._M_index        = 9;
+  money_put<char, ostreambuf_iterator<char, char_traits<char> > >::id._M_index                     = 10;
+  money_put<char, char*>::id._M_index              = 11;
+
+  num_get<char, istreambuf_iterator<char, char_traits<char> > >::id._M_index                       = 12;
+  num_get<char, const char*>::id._M_index          = 13;
+  num_put<char, ostreambuf_iterator<char, char_traits<char> > >::id._M_index                       = 14;
+  num_put<char, char*>::id._M_index                = 15;
+  time_get<char, istreambuf_iterator<char, char_traits<char> > >::id._M_index                      = 16;
+  time_get<char, const char*>::id._M_index         = 17;
+  time_put<char, ostreambuf_iterator<char, char_traits<char> > >::id._M_index                      = 18;
+  time_put<char, char*>::id._M_index               = 19;
+
+# ifndef _STLP_NO_WCHAR_T
+
+  money_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >::id._M_index                  = 27;
+  money_get<wchar_t, const wchar_t*>::id._M_index  = 28;
+  money_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >::id._M_index                  = 29;
+  money_put<wchar_t, wchar_t*>::id._M_index        = 30;
+
+  num_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >::id._M_index                       = 31;
+  num_get<wchar_t, const wchar_t*>::id._M_index    = 32;
+  num_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > > ::id._M_index                      = 33;
+  num_put<wchar_t, wchar_t*>::id._M_index          = 34;
+  time_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >::id._M_index                   = 35;
+  time_get<wchar_t, const wchar_t*>::id._M_index   = 36;
+  time_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >::id._M_index                   = 37;
+  time_put<wchar_t, wchar_t*>::id._M_index         = 38;
+  //  messages<wchar_t>::id._M_index                   = 38;
+# endif
+
+  //  locale::id::_S_max                               = 39;
+}
+
+static _Stl_aligned_buffer<_Locale_impl> _S_classic_locale;
+
+static _Stl_aligned_buffer<collate<char> > _S_collate_char;
+static _Stl_aligned_buffer<ctype<char> > _S_ctype_char;
+
+# ifndef _STLP_NO_MBSTATE_T
+static _Stl_aligned_buffer<codecvt<char, char, mbstate_t> > _S_codecvt_char;
+# endif
+
+static _Stl_aligned_buffer<moneypunct<char, true> > _S_moneypunct_true_char;
+static _Stl_aligned_buffer<moneypunct<char, false> > _S_moneypunct_false_char;
+static _Stl_aligned_buffer<numpunct<char> > _S_numpunct_char;
+static _Stl_aligned_buffer<messages<char> > _S_messages_char;
+
+static _Stl_aligned_buffer<money_get<char, istreambuf_iterator<char, char_traits<char> > > > _S_money_get_char;
+static _Stl_aligned_buffer<money_put<char, ostreambuf_iterator<char, char_traits<char> > > > _S_money_put_char;
+static _Stl_aligned_buffer<num_get<char, istreambuf_iterator<char, char_traits<char> > > > _S_num_get_char;
+static _Stl_aligned_buffer<num_put<char, ostreambuf_iterator<char, char_traits<char> > > > _S_num_put_char;
+static _Stl_aligned_buffer<time_get<char, istreambuf_iterator<char, char_traits<char> > > > _S_time_get_char;
+static _Stl_aligned_buffer<time_put<char, ostreambuf_iterator<char, char_traits<char> > > > _S_time_put_char;
+
+# ifndef _STLP_NO_WCHAR_T
+static _Stl_aligned_buffer<collate<wchar_t> > _S_collate_wchar;
+static _Stl_aligned_buffer<ctype<wchar_t> > _S_ctype_wchar;
+# ifndef _STLP_NO_MBSTATE_T
+static _Stl_aligned_buffer<codecvt<wchar_t, char, mbstate_t> > _S_codecvt_wchar;
+# endif
+static _Stl_aligned_buffer<moneypunct<wchar_t, true> > _S_moneypunct_true_wchar;
+static _Stl_aligned_buffer<moneypunct<wchar_t, false> > _S_moneypunct_false_wchar;
+static _Stl_aligned_buffer<numpunct<wchar_t> > _S_numpunct_wchar;
+static _Stl_aligned_buffer<messages<wchar_t> > _S_messages_wchar;
+
+static _Stl_aligned_buffer<money_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > > > _S_money_get_wchar;
+static _Stl_aligned_buffer<money_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > > > _S_money_put_wchar;
+static _Stl_aligned_buffer<num_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > > > _S_num_get_wchar;
+static _Stl_aligned_buffer<num_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > > > _S_num_put_wchar;
+static _Stl_aligned_buffer<time_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > > > _S_time_get_wchar;
+static _Stl_aligned_buffer<time_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > > > _S_time_put_wchar;
+
+# endif
+
+static _Messages _Null_messages;
+
+static locale::facet* _S_classic_facets[] = {
+  __REINTERPRET_CAST(locale::facet*,0),
+  __REINTERPRET_CAST(locale::facet*,&_S_collate_char),
+  __REINTERPRET_CAST(locale::facet*,&_S_ctype_char), 
+# ifndef _STLP_NO_MBSTATE_T
+    __REINTERPRET_CAST(locale::facet*,&_S_codecvt_char),
+# else
+    __REINTERPRET_CAST(locale::facet*,0), 
+# endif
+  __REINTERPRET_CAST(locale::facet*,&_S_moneypunct_true_char),
+  __REINTERPRET_CAST(locale::facet*,&_S_moneypunct_false_char),
+  __REINTERPRET_CAST(locale::facet*,&_S_numpunct_char),
+  __REINTERPRET_CAST(locale::facet*,&_S_messages_char),
+
+  __REINTERPRET_CAST(locale::facet*,&_S_money_get_char),
+  __REINTERPRET_CAST(locale::facet*,0),
+  __REINTERPRET_CAST(locale::facet*,&_S_money_put_char),
+  __REINTERPRET_CAST(locale::facet*,0),
+
+  __REINTERPRET_CAST(locale::facet*,&_S_num_get_char),
+  __REINTERPRET_CAST(locale::facet*,0),
+  __REINTERPRET_CAST(locale::facet*,&_S_num_put_char),
+  __REINTERPRET_CAST(locale::facet*,0),
+  __REINTERPRET_CAST(locale::facet*,&_S_time_get_char),
+  __REINTERPRET_CAST(locale::facet*,0),
+  __REINTERPRET_CAST(locale::facet*,&_S_time_put_char),
+  __REINTERPRET_CAST(locale::facet*,0),
+# ifndef _STLP_NO_WCHAR_T
+  __REINTERPRET_CAST(locale::facet*,&_S_collate_wchar),
+  __REINTERPRET_CAST(locale::facet*,&_S_ctype_wchar), 
+
+# ifndef _STLP_NO_MBSTATE_T
+  __REINTERPRET_CAST(locale::facet*,&_S_codecvt_wchar),
+# else
+  __REINTERPRET_CAST(locale::facet*,0)
+# endif
+  __REINTERPRET_CAST(locale::facet*,&_S_moneypunct_true_wchar),
+  __REINTERPRET_CAST(locale::facet*,&_S_moneypunct_false_wchar),
+  __REINTERPRET_CAST(locale::facet*,&_S_numpunct_wchar),
+  __REINTERPRET_CAST(locale::facet*,&_S_messages_wchar),
+
+  __REINTERPRET_CAST(locale::facet*,&_S_money_get_wchar),
+  __REINTERPRET_CAST(locale::facet*,0),
+  __REINTERPRET_CAST(locale::facet*,&_S_money_put_wchar),
+  __REINTERPRET_CAST(locale::facet*,0),
+
+  __REINTERPRET_CAST(locale::facet*,&_S_num_get_wchar),
+  __REINTERPRET_CAST(locale::facet*,0),
+  __REINTERPRET_CAST(locale::facet*,&_S_num_put_wchar),
+  __REINTERPRET_CAST(locale::facet*,0),
+  __REINTERPRET_CAST(locale::facet*,&_S_time_get_wchar),
+  __REINTERPRET_CAST(locale::facet*,0),
+  __REINTERPRET_CAST(locale::facet*,&_S_time_put_wchar),
+  __REINTERPRET_CAST(locale::facet*,0),
+# endif
+  0
+};
+
+_Locale_impl* 
+_Locale_impl::make_classic_locale() {
+  // The classic locale contains every facet that belongs to a category.
+  _Locale_impl* classic = __REINTERPRET_CAST(_Locale_impl*, &_S_classic_locale);
+  
+  new (classic) _Locale_impl("C");
+
+  classic->facets = _S_classic_facets;
+  classic->_M_size = locale::id::_S_max;
+
+  // ctype category
+  new(&_S_ctype_char) ctype<char>(0, false, 1);
+  // collate category
+  new(&_S_collate_char) collate<char>(1);
+  new(&_S_codecvt_char) codecvt<char, char, mbstate_t>(1);
+  // numeric category
+  new(&_S_numpunct_char) numpunct<char>(1);
+  new (&_S_num_get_char) num_get<char, istreambuf_iterator<char, char_traits<char> > >(1);
+  new (&_S_num_put_char) num_put<char, ostreambuf_iterator<char, char_traits<char> > >(1);
+  new (&_S_time_get_char) time_get<char, istreambuf_iterator<char, char_traits<char> > >(1);
+  new (&_S_time_put_char) time_put<char, ostreambuf_iterator<char, char_traits<char> > >(1);
+  // monetary category
+  new (&_S_moneypunct_true_char) moneypunct<char, true>(1);
+  new (&_S_moneypunct_false_char) moneypunct<char, false>(1);
+  new (&_S_money_get_char) money_get<char, istreambuf_iterator<char, char_traits<char> > >(1);
+  new (&_S_money_put_char) money_put<char, ostreambuf_iterator<char, char_traits<char> > >(1);
+  // messages category
+  new (&_S_messages_char)messages<char>(&_Null_messages);
+
+# ifndef _STLP_NO_WCHAR_T
+  // ctype category
+  new(&_S_ctype_wchar) ctype<wchar_t>(1);
+  // collate category
+  new(&_S_collate_wchar) collate<wchar_t>(1);
+  new(&_S_codecvt_wchar) codecvt<wchar_t, char, mbstate_t>(1);
+  // numeric category
+  new(&_S_numpunct_wchar) numpunct<wchar_t>(1);
+  new (&_S_num_get_wchar) num_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >(1);
+  new (&_S_num_put_wchar) num_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >(1);
+  new (&_S_time_get_wchar) time_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >(1);
+  new (&_S_time_put_wchar) time_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >(1);
+  new (&_S_messages_wchar)messages<wchar_t>(&_Null_messages);
+  // monetary category
+  new (&_S_moneypunct_true_wchar) moneypunct<wchar_t, true>(1);
+  new (&_S_moneypunct_false_wchar) moneypunct<wchar_t, false>(1);
+  new (&_S_money_get_wchar) money_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >(1);
+  new (&_S_money_put_wchar) money_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >(1);
+# endif
+
+  return classic;
+}
+
+
+//----------------------------------------------------------------------
+
+// Declarations of (non-template) facets' static data members
+size_t locale::id::_S_max = 39;
+
+_STLP_STATIC_MEMBER_DECLSPEC locale::id collate<char>::id = { 1 };
+_STLP_STATIC_MEMBER_DECLSPEC locale::id ctype<char>::id = { 2 };
+
+# ifndef _STLP_NO_MBSTATE_T
+_STLP_STATIC_MEMBER_DECLSPEC locale::id codecvt<char, char, mbstate_t>::id = { 3 };
+#  ifndef _STLP_NO_WCHAR_T
+_STLP_STATIC_MEMBER_DECLSPEC locale::id codecvt<wchar_t, char, mbstate_t>::id = { 22 };
+#  endif
+# endif
+
+_STLP_STATIC_MEMBER_DECLSPEC locale::id moneypunct<char, true>::id = { 4 };
+_STLP_STATIC_MEMBER_DECLSPEC locale::id moneypunct<char, false>::id = { 5 };
+_STLP_STATIC_MEMBER_DECLSPEC locale::id numpunct<char>::id = { 6 } ;
+_STLP_STATIC_MEMBER_DECLSPEC locale::id messages<char>::id = { 7 };
+
+# ifndef _STLP_NO_WCHAR_T
+_STLP_STATIC_MEMBER_DECLSPEC locale::id collate<wchar_t>::id = { 20 };
+_STLP_STATIC_MEMBER_DECLSPEC locale::id ctype<wchar_t>::id = { 21 };
+
+_STLP_STATIC_MEMBER_DECLSPEC locale::id moneypunct<wchar_t, true>::id = { 23 } ;
+_STLP_STATIC_MEMBER_DECLSPEC locale::id moneypunct<wchar_t, false>::id = { 24 } ;
+
+_STLP_STATIC_MEMBER_DECLSPEC locale::id numpunct<wchar_t>::id = { 25 };
+_STLP_STATIC_MEMBER_DECLSPEC locale::id messages<wchar_t>::id = { 26 };
+# endif
+
+//
+// locale class
+//
+
+locale::facet::~facet() {}
+
+# if ! defined ( _STLP_MEMBER_TEMPLATES ) || defined (_STLP_INLINE_MEMBER_TEMPLATES)
+// members that fail to be templates 
+bool locale::operator()(const string& __x,
+                        const string& __y) const {
+  return __locale_do_operator_call(this, __x, __y);
+}
+
+#  ifndef _STLP_NO_WCHAR_T
+bool locale::operator()(const wstring& __x,
+                  const wstring& __y) const {
+  return __locale_do_operator_call(this, __x, __y);
+}
+#  endif
+# endif
+
+_Locale_impl*   _Locale_impl::_S_global_impl    = 0;
+static _Stl_aligned_buffer<locale> _S_b_classic;
+// locale          _Locale_impl::_S_classic(__REINTERPRET_CAST(_Locale_impl*, &_S_classic_locale));
+_STLP_STATIC_MUTEX _Locale_impl::_S_global_locale_lock _STLP_MUTEX_INITIALIZER;
+  
+//----------------------------------------------------------------------
+// class locale
+
+void _STLP_CALL
+locale::_M_throw_runtime_error(const char* name)
+{
+  char buf[256];
+
+  if (name) {
+    const char* prefix = "bad locale name: ";
+    strcpy(buf, prefix);
+    strncat(buf, name, 256 - strlen(prefix));
+    buf[255] = '\0';
+  }
+  else {
+    strcpy(buf, "locale error");
+  }
+  _STLP_THROW(runtime_error(buf));
+}
+
+#if !( defined (__BORLANDC__) && defined(_RTLDLL))
+
+long ios_base::_Loc_init::_S_count = 0;
+
+ios_base::_Loc_init::_Loc_init() {
+  //  if (_S_count++ == 0)
+      locale::_S_initialize();
+}
+
+ios_base::_Loc_init::~_Loc_init() {
+  //    if (--_S_count == 0)
+      locale::_S_uninitialize();
+}
+
+#endif /* _RTLDLL */
+
+// Initialization of the locale system.  This must be called before
+// any locales are constructed.  (Meaning that it must be called when
+// the I/O library itself is initialized.)
+void _STLP_CALL
+locale::_S_initialize()
+{
+  // additional check for singleton count : linker may choose to alter the order of function calls on initialization
+  if (ios_base::_Loc_init::_S_count++ > 0 )
+    return;
+  _Stl_loc_assign_ids();
+  _Locale_impl::_S_global_impl = _Locale_impl::make_classic_locale();
+}
+
+
+
+void _STLP_CALL
+locale::_S_uninitialize()
+{
+  // additional check for singleton count : linker may choose to alter the order of function calls on initialization
+  if (--ios_base::_Loc_init::_S_count != 0 )
+    return;
+  _Locale_impl::_S_global_impl->decr();
+}
+
+
+// Default constructor: create a copy of the global locale.
+locale::locale() : _M_impl(0) {
+  _M_impl = _S_copy_impl(_Locale_impl::_S_global_impl);
+}
+
+locale::locale(_Locale_impl* impl) : _M_impl(impl)
+{}
+
+// Copy constructor
+locale::locale(const locale& L) _STLP_NOTHROW
+  : _M_impl(0)
+{
+  _M_impl = _S_copy_impl(L._M_impl);
+}
+
+// Destructor.
+locale::~locale() _STLP_NOTHROW
+{
+  if (_M_impl) {
+  _M_impl->decr();
+  _M_impl = 0;
+  }
+}
+
+// Assignment operator.  Much like the copy constructor: just a bit of
+// pointer twiddling.
+const locale& locale::operator=(const locale& L) _STLP_NOTHROW
+{
+  if (this->_M_impl != L._M_impl) {
+    this->_M_impl->decr();
+    this->_M_impl = _S_copy_impl(L._M_impl);
+  }
+  return *this;
+}
+
+locale::facet* locale::_M_get_facet(const locale::id& n) const
+{
+  return n._M_index < _M_impl->size()
+    ? __REINTERPRET_CAST(locale::facet*,_M_impl->facets[n._M_index])
+    : __REINTERPRET_CAST(locale::facet*, 0);
+}
+
+locale::facet* locale::_M_use_facet(const locale::id& n) const
+{
+  locale::facet* f = (n._M_index < _M_impl->size()
+		      ? __REINTERPRET_CAST(locale::facet*,_M_impl->facets[n._M_index])
+		      : __REINTERPRET_CAST(locale::facet*, 0));
+  if (!f)
+    _M_impl->_M_throw_bad_cast();
+  return f;
+}
+
+string locale::name() const {
+  return _M_impl->name;
+}
+
+static string _Nameless("*");
+
+// Compare two locales for equality.
+bool locale::operator==(const locale& L) const {
+
+  return this->_M_impl == L._M_impl ||
+         (this->name() == L.name() && this->name() != _Nameless);
+}
+
+bool locale::operator!=(const locale& L) const {
+  return !(*this == L);
+}
+
+// Static member functions.
+const locale&  _STLP_CALL
+locale::classic() {
+  //  return _Locale_impl::_S_classic;
+  return *__REINTERPRET_CAST(const locale*, &_S_b_classic);
+}
+
+locale  _STLP_CALL
+locale::global(const locale& L) 
+{
+  locale old;                   // A copy of the old global locale.
+
+  L._M_impl->incr();
+  {
+    _STLP_auto_lock lock(_Locale_impl::_S_global_locale_lock);
+    _Locale_impl::_S_global_impl->decr();     // We made a copy, so it can't be zero.
+    _Locale_impl::_S_global_impl = L._M_impl;
+  }
+
+                                // Set the global C locale, if appropriate.
+#if !defined(_STLP_WINCE)
+  if (L.name() != _Nameless)
+    setlocale(LC_ALL, L.name().c_str());
+#endif
+
+  return old;
+}
+
+
+// static data members.
+
+# if !defined (_STLP_STATIC_CONST_INIT_BUG) && ! defined (_STLP_USE_DECLSPEC)
+
+const locale::category locale::none;
+const locale::category locale::collate;
+const locale::category locale::ctype;
+const locale::category locale::monetary;
+const locale::category locale::numeric;
+const locale::category locale::time; 
+const locale::category locale::messages;
+const locale::category locale::all;
+
+# endif
+
+_STLP_END_NAMESPACE
+
+//
+// Facets included in classic locale :
+//
+
+
+
diff --git a/main/source/stlport/src/locale_impl.h b/main/source/stlport/src/locale_impl.h
new file mode 100644
index 00000000..ee1bac8b
--- /dev/null
+++ b/main/source/stlport/src/locale_impl.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+# ifndef LOCALE_IMPL_H
+#  define  LOCALE_IMPL_H
+
+#include <clocale>             // C locale header file.
+#include <vector>
+#include <string>
+#include <stl/_locale.h>
+#include "c_locale.h"
+
+_STLP_BEGIN_NAMESPACE
+
+//----------------------------------------------------------------------
+// Class _Locale_impl
+// This is the base class which implements access only and is supposed to 
+// be used for classic locale only
+class _STLP_CLASS_DECLSPEC _Locale_impl
+{
+public:
+  _Locale_impl(const char* s);
+  //  _Locale_impl(const _Locale_impl&);
+  virtual ~_Locale_impl();
+
+  virtual void incr();
+  virtual void decr();
+
+  size_t size() const { return _M_size; }
+
+  static _Locale_impl* make_classic_locale();
+  
+  locale::facet** facets;
+  size_t _M_size;
+
+  basic_string<char, char_traits<char>, allocator<char> > name;
+
+  static void _STLP_CALL _M_throw_bad_cast();
+
+ public:
+  static _Locale_impl*   _S_global_impl;
+  //  static locale          _S_classic;
+  static _STLP_STATIC_MUTEX _S_global_locale_lock;
+
+private:
+  void operator=(const _Locale_impl&);
+};
+
+inline _Locale_impl*  _STLP_CALL _S_copy_impl(_Locale_impl* I) {
+    _STLP_ASSERT( I != 0 );
+    I->incr();
+    return I;
+}
+
+_STLP_END_NAMESPACE
+
+#endif
+
+
diff --git a/main/source/stlport/src/locale_nonclassic.h b/main/source/stlport/src/locale_nonclassic.h
new file mode 100644
index 00000000..20fa20be
--- /dev/null
+++ b/main/source/stlport/src/locale_nonclassic.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+# ifndef LOCALE_nonclassic_H
+#  define  LOCALE_nonclassic_H
+
+# include "locale_impl.h"
+
+_STLP_BEGIN_NAMESPACE
+
+class _STLP_CLASS_DECLSPEC _Locale : public _Locale_impl, public _Refcount_Base
+{
+public:
+  _Locale(size_t n, const char* s) : _Locale_impl(s), _Refcount_Base(1), 
+    facets_vec(n, (void*)0 ) { facets = (locale::facet**)&facets_vec[0]; _M_size = n; }
+  _Locale(const _Locale_impl&);
+  ~_Locale();
+
+  virtual void incr() { this->_M_incr(); }
+  virtual void decr() { this->_M_decr(); if (!this->_M_ref_count) delete this;}
+
+  void remove(size_t index);
+  locale::facet* insert(locale::facet*, size_t index, bool do_incr);
+  void insert(_Locale_impl* from, const locale::id& n);
+
+// Helper functions for byname construction of locales.
+  void insert_ctype_facets(const char* name);
+  void insert_numeric_facets(const char* name);
+  void insert_time_facets(const char* name);
+  void insert_collate_facets(const char* name);
+  void insert_monetary_facets(const char* name);
+  void insert_messages_facets(const char* name);
+  
+  vector<void*> facets_vec;
+
+  static void _STLP_CALL _M_throw_bad_cast();
+
+private:
+  void operator=(const _Locale_impl&);
+};
+
+_STLP_END_NAMESPACE
+
+#endif
diff --git a/main/source/stlport/src/message_facets.h b/main/source/stlport/src/message_facets.h
new file mode 100644
index 00000000..8fba8337
--- /dev/null
+++ b/main/source/stlport/src/message_facets.h
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+#ifndef MESSAGE_FACETS_H
+# define MESSAGE_FACETS_H
+
+#include <string>
+#include <stl/_messages_facets.h>
+#include <stl/_ctype.h>
+// #include <istream>
+#include <typeinfo>
+#include <hash_map>
+#include "c_locale.h"
+
+_STLP_BEGIN_NAMESPACE
+
+// Forward declaration of an opaque type.
+struct _Catalog_locale_map;
+
+_Locale_messages* __acquire_messages(const char* name); 
+void __release_messages(_Locale_messages* cat);
+
+// Class _Catalog_locale_map.  The reason for this is that, internally,
+// a message string is always a char*.  We need a ctype facet to convert
+// a string to and from wchar_t, and the user is permitted to provide such
+// a facet when calling open().
+
+struct _Catalog_locale_map
+{
+  _Catalog_locale_map() : M(0) {}
+  ~_Catalog_locale_map() { if (M) delete M; }
+
+  void insert(int key, const locale& L);
+  locale lookup(int key) const;
+  void erase(int key);
+
+  hash_map<int, locale, hash<int>, equal_to<int> >* M;
+
+private:                        // Invalidate copy constructor and assignment
+  _Catalog_locale_map(const _Catalog_locale_map&);
+  void operator=(const _Catalog_locale_map&);
+};
+
+
+class _Messages {
+public:
+  typedef messages_base::catalog catalog;
+
+  _Messages();
+
+  virtual catalog     do_open(const string& __fn, const locale& __loc) const;
+  virtual string do_get(catalog __c, int __set, int __msgid,
+			const string& __dfault) const;
+# ifndef _STLP_NO_WCHAR_T
+  virtual wstring do_get(catalog __c, int __set, int __msgid,
+                             const wstring& __dfault) const;
+# endif
+  virtual void        do_close(catalog __c) const;
+  virtual ~_Messages();
+  bool _M_delete;
+};
+
+class _Messages_impl : public _Messages {
+public:
+
+  _Messages_impl(bool);
+
+  _Messages_impl(bool, _Locale_messages*);
+
+  catalog     do_open(const string& __fn, const locale& __loc) const;
+  string do_get(catalog __c, int __set, int __msgid,
+			const string& __dfault) const;
+# ifndef _STLP_NO_WCHAR_T
+  wstring do_get(catalog __c, int __set, int __msgid,
+		 const wstring& __dfault) const;
+# endif
+  void        do_close(catalog __c) const;
+  
+  ~_Messages_impl();
+
+private:
+  _Locale_messages* _M_message_obj;
+  _Catalog_locale_map* _M_map;
+};
+
+_STLP_END_NAMESPACE
+
+#endif
diff --git a/main/source/stlport/src/messages.cpp b/main/source/stlport/src/messages.cpp
new file mode 100644
index 00000000..1ef3236e
--- /dev/null
+++ b/main/source/stlport/src/messages.cpp
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+# include "stlport_prefix.h"
+
+# include "message_facets.h"
+
+_STLP_BEGIN_NAMESPACE
+
+//----------------------------------------------------------------------
+// messages<char>
+
+messages<char>::messages(_Messages* imp)  : 
+  _BaseFacet(1), _M_impl(imp) { imp->_M_delete = false;  }
+
+messages<char>::~messages()
+{ 
+  if (_M_impl && _M_impl->_M_delete)  delete _M_impl; 
+}
+
+int messages<char>::do_open(const string& filename, const locale& l) const
+{
+  return _M_impl->do_open(filename, l);
+}
+
+string messages<char>::do_get(catalog cat,
+                              int set, int p_id, const string& dfault) const
+{
+  return _M_impl->do_get(cat, set, p_id, dfault);
+}
+
+void messages<char>::do_close(catalog cat) const
+{
+  _M_impl->do_close(cat);
+}
+
+_Messages::_Messages()
+{ }
+
+_Messages::~_Messages()
+{}
+
+int _Messages::do_open(const string&, const locale&) const
+{  
+  return -1;
+}
+
+string _Messages::do_get(catalog,
+			 int, int, const string& dfault) const
+{
+  return dfault;
+}
+
+void _Messages::do_close(catalog) const
+{}
+
+
+# ifndef _STLP_NO_WCHAR_T
+
+messages<wchar_t>::messages(_Messages* imp)  : 
+  _BaseFacet(1), _M_impl(imp) { imp->_M_delete = false;  }
+
+messages<wchar_t>::~messages()
+{ if (_M_impl && _M_impl->_M_delete) delete _M_impl; }
+
+int messages<wchar_t>::do_open(const string& filename, const locale& L) const
+{
+  return _M_impl->do_open(filename, L);
+}
+
+wstring
+messages<wchar_t>::do_get(catalog thecat,
+                          int set, int p_id, const wstring& dfault) const
+{
+  return _M_impl->do_get(thecat, set, p_id, dfault);
+}
+
+void messages<wchar_t>::do_close(catalog cat) const
+{
+  _M_impl->do_close(cat);
+}
+
+wstring
+_Messages::do_get(catalog,
+		  int, int, const wstring& dfault) const
+{
+  return dfault;
+}
+
+# endif
+
+_STLP_END_NAMESPACE
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/src/mkinstalldirs b/main/source/stlport/src/mkinstalldirs
new file mode 100644
index 00000000..77c53e17
--- /dev/null
+++ b/main/source/stlport/src/mkinstalldirs
@@ -0,0 +1,32 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Created: 1993-05-16
+# Last modified: 1994-03-25
+# Public domain
+
+errstatus=0
+
+for file in ${1+"$@"} ; do 
+   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+   shift
+
+   pathcomp=
+   for d in ${1+"$@"} ; do
+     pathcomp="$pathcomp$d"
+     case "$pathcomp" in
+       -* ) pathcomp=./$pathcomp ;;
+     esac
+
+     if test ! -d "$pathcomp"; then
+        echo "mkdir $pathcomp" 1>&2
+        mkdir "$pathcomp" || errstatus=$?
+     fi
+
+     pathcomp="$pathcomp/"
+   done
+done
+
+exit $errstatus
+
+# mkinstalldirs ends here
diff --git a/main/source/stlport/src/monetary.cpp b/main/source/stlport/src/monetary.cpp
new file mode 100644
index 00000000..5a643f04
--- /dev/null
+++ b/main/source/stlport/src/monetary.cpp
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+# include "stlport_prefix.h"
+
+#include <stl/_monetary.h>
+#include <stl/_istream.h>
+
+_STLP_BEGIN_NAMESPACE
+
+static void _Init_monetary_formats(money_base::pattern& pos_format,
+				   money_base::pattern& neg_format) {
+  pos_format.field[0] = (char) money_base::symbol;
+  pos_format.field[1] = (char) money_base::sign;
+  pos_format.field[2] = (char) money_base::none;
+  pos_format.field[3] = (char) money_base::value;
+
+  neg_format.field[0] = (char) money_base::symbol;
+  neg_format.field[1] = (char) money_base::sign;
+  neg_format.field[2] = (char) money_base::none;
+  neg_format.field[3] = (char) money_base::value;
+}
+
+// This is being used throughout the library
+string _S_empty_string("");
+# ifndef _STLP_NO_WCHAR_T
+wstring _S_empty_wstring(L"");
+# endif
+
+//
+// moneypunct<>
+//
+
+moneypunct<char, true>::moneypunct(size_t __refs) : _BaseFacet(__refs) { 
+    _Init_monetary_formats(_M_pos_format, _M_neg_format); 
+}
+moneypunct<char, true>::~moneypunct() {}
+
+char moneypunct<char, true>::do_decimal_point() const {return ' ';}
+char moneypunct<char, true>::do_thousands_sep() const {return ' ';}
+string moneypunct<char, true>::do_grouping() const { return _S_empty_string; }
+string moneypunct<char, true>::do_curr_symbol() const { return _S_empty_string; }
+string moneypunct<char, true>::do_positive_sign() const { return _S_empty_string; }
+string moneypunct<char, true>::do_negative_sign() const { return _S_empty_string; }
+money_base::pattern moneypunct<char, true>::do_pos_format() const  {return _M_pos_format;}
+money_base::pattern moneypunct<char, true>::do_neg_format() const {return _M_neg_format;}
+int moneypunct<char, true>::do_frac_digits() const {return 0;}
+
+moneypunct<char, false>::moneypunct(size_t __refs) : _BaseFacet(__refs) { 
+    _Init_monetary_formats(_M_pos_format, _M_neg_format); 
+}
+moneypunct<char, false>::~moneypunct() {}
+
+char moneypunct<char, false>::do_decimal_point() const {return ' ';}
+char moneypunct<char, false>::do_thousands_sep() const {return ' ';}
+
+string moneypunct<char, false>::do_grouping() const { return _S_empty_string; }
+string moneypunct<char, false>::do_curr_symbol() const { return _S_empty_string; }
+string moneypunct<char, false>::do_positive_sign() const { return _S_empty_string; }
+string moneypunct<char, false>::do_negative_sign() const { return _S_empty_string; }
+money_base::pattern moneypunct<char, false>::do_pos_format() const {return _M_pos_format;}
+money_base::pattern moneypunct<char, false>::do_neg_format() const {return _M_neg_format;}
+int moneypunct<char, false>::do_frac_digits() const {return 0;}
+
+
+# ifndef _STLP_NO_WCHAR_T
+
+moneypunct<wchar_t, true>::moneypunct(size_t __refs) : _BaseFacet(__refs) { 
+    _Init_monetary_formats(_M_pos_format, _M_neg_format); 
+}
+moneypunct<wchar_t, true>::~moneypunct() {}
+
+wchar_t moneypunct<wchar_t, true>::do_decimal_point() const {return L' ';}
+wchar_t moneypunct<wchar_t, true>::do_thousands_sep() const {return L' ';}
+string moneypunct<wchar_t, true>::do_grouping() const {return _S_empty_string;}
+
+wstring moneypunct<wchar_t, true>::do_curr_symbol() const
+  {return _S_empty_wstring;}
+wstring moneypunct<wchar_t, true>::do_positive_sign() const
+  {return _S_empty_wstring;}
+wstring moneypunct<wchar_t, true>::do_negative_sign() const
+  {return _S_empty_wstring;}
+int moneypunct<wchar_t, true>::do_frac_digits() const {return 0;}
+money_base::pattern moneypunct<wchar_t, true>::do_pos_format() const
+  {return _M_pos_format;}
+money_base::pattern moneypunct<wchar_t, true>::do_neg_format() const
+  {return _M_neg_format;}
+
+moneypunct<wchar_t, false>::moneypunct(size_t __refs) : _BaseFacet(__refs) { 
+    _Init_monetary_formats(_M_pos_format, _M_neg_format); 
+}
+moneypunct<wchar_t, false>::~moneypunct() {}
+
+wchar_t moneypunct<wchar_t, false>::do_decimal_point() const {return L' ';}
+wchar_t moneypunct<wchar_t, false>::do_thousands_sep() const {return L' ';}
+string moneypunct<wchar_t, false>::do_grouping() const { return _S_empty_string;}
+wstring moneypunct<wchar_t, false>::do_curr_symbol() const
+  {return _S_empty_wstring;}
+wstring moneypunct<wchar_t, false>::do_positive_sign() const
+  {return _S_empty_wstring;}
+wstring moneypunct<wchar_t, false>::do_negative_sign() const
+  {return _S_empty_wstring;}
+int moneypunct<wchar_t, false>::do_frac_digits() const {return 0;}
+
+money_base::pattern moneypunct<wchar_t, false>::do_pos_format() const
+  {return _M_pos_format;}
+money_base::pattern moneypunct<wchar_t, false>::do_neg_format() const
+  {return _M_neg_format;}
+
+# endif /* WCHAR_T */
+
+//
+// Instantiations
+//
+
+# if !defined(_STLP_NO_FORCE_INSTANTIATE)
+
+template class money_get<char, istreambuf_iterator<char, char_traits<char> > >;
+template class money_put<char, ostreambuf_iterator<char, char_traits<char> > >;
+// template class money_put<char, char*>;
+
+#ifndef _STLP_NO_WCHAR_T
+template class money_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >;
+template class money_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >;
+// template class money_put<wchar_t, wchar_t*>;
+// template class money_get<wchar_t, const wchar_t*>;
+#endif
+
+# endif
+
+_STLP_END_NAMESPACE  
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/src/msvc_warning_disablers.h b/main/source/stlport/src/msvc_warning_disablers.h
new file mode 100644
index 00000000..ec04b261
--- /dev/null
+++ b/main/source/stlport/src/msvc_warning_disablers.h
@@ -0,0 +1,11 @@
+#pragma warning( disable : 4146 ) // unary minus applied to unsigned type
+#pragma warning( disable : 4244 ) // arithmetic conversion - possible loss of data
+#pragma warning( disable : 4290 ) // c++ exception specification ignored
+
+// dwa 1/28/00 - actually I think this may indicate real bugs. We should look
+// into these
+#pragma warning( disable : 4018 ) // signed/unsigned mismatch
+#pragma warning( disable : 4251 ) // DLL interface needed
+
+
+
diff --git a/main/source/stlport/src/mwerks_debug_prefix.h b/main/source/stlport/src/mwerks_debug_prefix.h
new file mode 100644
index 00000000..6bb78790
--- /dev/null
+++ b/main/source/stlport/src/mwerks_debug_prefix.h
@@ -0,0 +1,3 @@
+#define __BUILDING_STLPORT 1
+#define _STLP_OWN_IOSTREAMS 1
+#define _STLP_DEBUG 1
diff --git a/main/source/stlport/src/mwerks_prefix.h b/main/source/stlport/src/mwerks_prefix.h
new file mode 100644
index 00000000..d4243dd6
--- /dev/null
+++ b/main/source/stlport/src/mwerks_prefix.h
@@ -0,0 +1,2 @@
+#define __BUILDING_STLPORT 1
+#define _STLP_OWN_IOSTREAMS 1
diff --git a/main/source/stlport/src/mwerks_prj/libstlport_Data/CWSettingsWindows.stg b/main/source/stlport/src/mwerks_prj/libstlport_Data/CWSettingsWindows.stg
new file mode 100644
index 00000000..bff541d1
Binary files /dev/null and b/main/source/stlport/src/mwerks_prj/libstlport_Data/CWSettingsWindows.stg differ
diff --git a/main/source/stlport/src/mwerks_x86_prefix.h b/main/source/stlport/src/mwerks_x86_prefix.h
new file mode 100644
index 00000000..ab77d4b9
--- /dev/null
+++ b/main/source/stlport/src/mwerks_x86_prefix.h
@@ -0,0 +1,4 @@
+// #define __BUILDING_STLPORT 1
+#define _STLP_OWN_IOSTREAMS 1
+// #define _DLL
+#define _WIN32
diff --git a/main/source/stlport/src/nmake_common.mak b/main/source/stlport/src/nmake_common.mak
new file mode 100644
index 00000000..bf318e96
--- /dev/null
+++ b/main/source/stlport/src/nmake_common.mak
@@ -0,0 +1,157 @@
+
+install_dlls:
+	@echo Copying STLport DLLs to Windows system directory...
+	@if "%OS%" == "Windows_NT" copy $(OUTDIR)\$(LIB_BASENAME)*.dll $(WINDIR)\System32
+	@if "%OS%" == "" copy $(OUTDIR)\$(LIB_BASENAME)*.dll $(WINDIR)\System
+	@echo STLport DLL libraries are installed on your system.
+
+install_libs_vc:
+	@echo Copying STLport .lib files to VC lib directory : %MSVCDir%\lib...
+	@copy $(OUTDIR)\$(LIB_BASENAME)*.lib "%MSVCDir%\lib"
+	@echo Done copying .lib files.
+
+install_headers_vc:
+	@echo Copying STLport headers files to VC include directory : %MSVCDir%\include\stlport...
+	@xcopy /Q /R /K /I /S ..\stlport "%MSVCDir%\include\stlport\"
+	@echo Done copying STLport headers.
+
+check_env_vc:
+	@if not exist "%MSVCDir%\lib\*.*" echo "Please set up MSVCDir environment variable. Did you run vcvars32.bat ?"
+	@if not exist "%MSVCDir%\lib\*.*" dir "%MSVCDir%\lib"
+
+install_vc : all check_env_vc install_libs_vc install_dlls install_headers_vc report_dirs_vc
+
+install_bc : all install_dlls
+
+report_dirs_vc :
+	@echo STLport installation complete.
+	@echo Please find STLport headers in %MSVCDir%\include\stlport.
+	@echo Please find STLport .lib files in %MSVCDir%\lib.
+	@echo Please find STLport DLLs in Windows system directory.
+
+{$(SRCDIR)}.cpp{$(RELEASE_OBJDIR_static)}.obj:
+   $(CXX) $(CXXFLAGS_RELEASE_static) $< 
+
+{$(SRCDIR)}.c{$(RELEASE_OBJDIR_static)}.obj:
+   $(CC) $(CXXFLAGS_RELEASE_static) $< 
+
+{$(SRCDIR)}.c{$(RELEASE_OBJDIR_static)}.sbr:
+   $(CC) $(CXXFLAGS_RELEASE_static) $< 
+
+{$(SRCDIR)}.cpp{$(RELEASE_OBJDIR_static)}.sbr:
+   $(CXX) $(CXXFLAGS_RELEASE_static) $<
+
+
+{$(SRCDIR)}.cpp{$(RELEASE_OBJDIR_staticx)}.obj:
+   $(CXX) $(CXXFLAGS_RELEASE_staticx) $< 
+
+{$(SRCDIR)}.c{$(RELEASE_OBJDIR_staticx)}.obj:
+   $(CC) $(CXXFLAGS_RELEASE_staticx) $< 
+
+{$(SRCDIR)}.c{$(RELEASE_OBJDIR_staticx)}.sbr:
+   $(CC) $(CXXFLAGS_RELEASE_staticx) $< 
+
+{$(SRCDIR)}.cpp{$(RELEASE_OBJDIR_staticx)}.sbr:
+   $(CXX) $(CXXFLAGS_RELEASE_staticx) $<
+
+
+{$(SRCDIR)}.cpp{$(RELEASE_OBJDIR_dynamic)}.obj:
+   $(CXX) $(CXXFLAGS_RELEASE_dynamic) $< 
+
+{$(SRCDIR)}.c{$(RELEASE_OBJDIR_dynamic)}.obj:
+   $(CC) $(CXXFLAGS_RELEASE_dynamic) $< 
+
+{$(SRCDIR)}.c{$(RELEASE_OBJDIR_dynamic)}.sbr:
+   $(CC) $(CXXFLAGS_RELEASE_dynamic) $< 
+
+{$(SRCDIR)}.cpp{$(RELEASE_OBJDIR_dynamic)}.sbr:
+   $(CXX) $(CXXFLAGS_RELEASE_dynamic) $<
+
+#########################################
+
+{$(SRCDIR)}.cpp{$(DEBUG_OBJDIR_static)}.obj:
+   $(CXX) $(CXXFLAGS_DEBUG_static) $<
+
+{$(SRCDIR)}.c{$(DEBUG_OBJDIR_static)}.obj:
+   $(CC) $(CXXFLAGS_DEBUG_static) $<
+
+{$(SRCDIR)}.c{$(DEBUG_OBJDIR_static)}.sbr:
+   $(CC) $(CXXFLAGS_DEBUG_static) $<
+
+{$(SRCDIR)}.cpp{$(DEBUG_OBJDIR_static)}.sbr:
+   $(CXX) $(CXXFLAGS_DEBUG_static) $<
+
+{$(SRCDIR)}.cpp{$(DEBUG_OBJDIR_staticx)}.obj:
+   $(CXX) $(CXXFLAGS_DEBUG_staticx) $<
+
+{$(SRCDIR)}.c{$(DEBUG_OBJDIR_staticx)}.obj:
+   $(CC) $(CXXFLAGS_DEBUG_staticx) $<
+
+{$(SRCDIR)}.c{$(DEBUG_OBJDIR_staticx)}.sbr:
+   $(CC) $(CXXFLAGS_DEBUG_staticx) $<
+
+{$(SRCDIR)}.cpp{$(DEBUG_OBJDIR_staticx)}.sbr:
+   $(CXX) $(CXXFLAGS_DEBUG_staticx) $<
+
+{$(SRCDIR)}.cpp{$(DEBUG_OBJDIR_dynamic)}.obj:
+   $(CXX) $(CXXFLAGS_DEBUG_dynamic) $<
+
+{$(SRCDIR)}.c{$(DEBUG_OBJDIR_dynamic)}.obj:
+   $(CC) $(CXXFLAGS_DEBUG_dynamic) $<
+
+{$(SRCDIR)}.c{$(DEBUG_OBJDIR_dynamic)}.sbr:
+   $(CC) $(CXXFLAGS_DEBUG_dynamic) $<
+
+{$(SRCDIR)}.cpp{$(DEBUG_OBJDIR_dynamic)}.sbr:
+   $(CXX) $(CXXFLAGS_DEBUG_dynamic) $<
+
+######################################### 
+
+{$(SRCDIR)}.cpp{$(STLDEBUG_OBJDIR_static)}.obj:
+   $(CXX) $(CXXFLAGS_STLDEBUG_static) $<
+
+{$(SRCDIR)}.c{$(STLDEBUG_OBJDIR_static)}.obj:
+   $(CC) $(CXXFLAGS_STLDEBUG_static) $<
+
+{$(SRCDIR)}.c{$(STLDEBUG_OBJDIR_static)}.sbr:
+   $(CC) $(CXXFLAGS_STLDEBUG_static) $<
+
+{$(SRCDIR)}.cpp{$(STLDEBUG_OBJDIR_static)}.sbr:
+   $(CXX) $(CXXFLAGS_STLDEBUG_static) $<
+
+{$(SRCDIR)}.cpp{$(STLDEBUG_OBJDIR_staticx)}.obj:
+   $(CXX) $(CXXFLAGS_STLDEBUG_staticx) $<
+
+{$(SRCDIR)}.c{$(STLDEBUG_OBJDIR_staticx)}.obj:
+   $(CC) $(CXXFLAGS_STLDEBUG_staticx) $<
+
+{$(SRCDIR)}.c{$(STLDEBUG_OBJDIR_staticx)}.sbr:
+   $(CC) $(CXXFLAGS_STLDEBUG_staticx) $<
+
+{$(SRCDIR)}.cpp{$(STLDEBUG_OBJDIR_staticx)}.sbr:
+   $(CXX) $(CXXFLAGS_STLDEBUG_staticx) $<
+
+{$(SRCDIR)}.cpp{$(STLDEBUG_OBJDIR_dynamic)}.obj:
+   $(CXX) $(CXXFLAGS_STLDEBUG_dynamic) $<
+
+{$(SRCDIR)}.c{$(STLDEBUG_OBJDIR_dynamic)}.obj:
+   $(CC) $(CXXFLAGS_STLDEBUG_dynamic) $<
+
+{$(SRCDIR)}.c{$(STLDEBUG_OBJDIR_dynamic)}.sbr:
+   $(CC) $(CXXFLAGS_STLDEBUG_dynamic) $<
+
+{$(SRCDIR)}.cpp{$(STLDEBUG_OBJDIR_dynamic)}.sbr:
+   $(CXX) $(CXXFLAGS_STLDEBUG_dynamic) $<
+
+############################################
+
+{$(SRCDIR)}.rc{$(RELEASE_OBJDIR_dynamic)}.res:
+	$(RC) /d COMP=$(COMP) /fo $(RELEASE_OBJDIR_dynamic)\stlport.res $<
+
+{$(SRCDIR)}.rc{$(DEBUG_OBJDIR_dynamic)}.res:
+	$(RC) /d COMP=$(COMP) /d BUILD=_DEBUG /fo $(DEBUG_OBJDIR_dynamic)\stlport.res $<
+
+{$(SRCDIR)}.rc{$(STLDEBUG_OBJDIR_dynamic)}.res:
+	$(RC) /d COMP=$(COMP) /d BUILD=_STLDEBUG /fo $(STLDEBUG_OBJDIR_dynamic)\stlport.res $<
+
+
diff --git a/main/source/stlport/src/num_get.cpp b/main/source/stlport/src/num_get.cpp
new file mode 100644
index 00000000..eb4dd0b4
--- /dev/null
+++ b/main/source/stlport/src/num_get.cpp
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+# include "stlport_prefix.h"
+#include <stl/_num_get.h>
+#include <stl/_istream.h>
+#include <stl/_algo.h>
+
+_STLP_BEGIN_NAMESPACE
+
+//----------------------------------------------------------------------
+// num_get
+
+
+static char narrow_digits[11]  = "0123456789";
+static char narrow_xdigits[13] = "aAbBcCdDeEfF";
+
+# ifndef _STLP_NO_WCHAR_T 
+
+void  _STLP_CALL
+_Initialize_get_digit(wchar_t* digits, wchar_t* xdigits,
+                       const ctype<wchar_t>& ct)
+{
+  ct.widen(narrow_digits + 0,  narrow_digits + 10,  digits);
+  ct.widen(narrow_xdigits + 0, narrow_xdigits + 10, xdigits);
+}
+
+// Return either the digit corresponding to c, or a negative number if
+// if c isn't a digit.  We return -1 if c is the separator character, and
+// -2 if it's some other non-digit.
+int _STLP_CALL __get_digit(wchar_t c,
+                           const wchar_t* digits, const wchar_t* xdigits,
+                           wchar_t separator)
+{
+  // Test if it's the separator.
+  if (c == separator)
+    return -1;
+
+  const wchar_t* p;
+
+  // Test if it's a decimal digit.
+  p = find(digits, digits + 10, c);
+  if (p != digits + 10)
+    return (int)(p - digits);
+
+  // Test if it's a hex digit.
+  p = find(xdigits, xdigits + 12, c);
+  if (p != xdigits + 12)
+    return (int)(10 + (xdigits - p) / 2);
+  else
+    return -2;                  // It's not a digit and not the separator.
+}
+
+# endif /* _STLP_NO_WCHAR_T */
+
+// __valid_grouping compares two strings, one representing the
+// group sizes encountered when reading an integer, and the other
+// representing the valid group sizes as returned by the numpunct
+// grouping() member function.  Both are interpreted right-to-left.
+// The grouping string is treated as if it were extended indefinitely
+// with its last value.  For a grouping to be valid, each term in
+// the first string must be equal to the corresponding term in the
+// second, except for the last, which must be less than or equal.
+
+// boris : this takes reversed first string !
+bool  _STLP_CALL
+__valid_grouping(const char * first1, const char * last1, 
+                 const char * first2, const char * last2)
+{
+  if (first1 == last1 || first2 == last2) return true;
+
+  --last1; --last2;
+
+  while (first1 != last1) {
+    if (*last1 != *first2)
+      return false;
+    --last1;
+    if (first2 != last2) ++first2;
+  }
+
+  return *last1 <= *first2;
+}
+
+// this needed for some compilers to make sure sumbols are extern
+extern const unsigned char __digit_val_table[];
+extern const char __narrow_atoms[];
+
+
+const unsigned char __digit_val_table[128] = 
+{
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+   0, 1, 2, 3, 4, 5, 6, 7, 8, 9,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+  0xFF,10,11,12,13,14,15,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+  0xFF,10,11,12,13,14,15,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF
+};     
+
+const char __narrow_atoms[5] = {'+', '-', '0', 'x', 'X'};
+
+// index is actually a char
+
+# ifndef _STLP_NO_WCHAR_T
+
+// Similar, except return the character itself instead of the numeric
+// value.  Used for floating-point input.
+bool  _STLP_CALL __get_fdigit(wchar_t& c, const wchar_t* digits)
+{
+  const wchar_t* p = find(digits, digits + 10, c);
+  if (p != digits + 10) {
+    c = (char)('0' + (p - digits));
+    return true;
+  }
+  else
+    return false;
+}
+
+bool  _STLP_CALL __get_fdigit_or_sep(wchar_t& c, wchar_t sep,
+                                     const wchar_t * digits)
+{
+  if (c == sep) {
+    c = (char)',';
+    return true;
+  }
+  else
+    return __get_fdigit(c, digits);
+}
+
+//----------------------------------------------------------------------
+// Force instantiation of of num_get<>
+
+#if !defined(_STLP_NO_FORCE_INSTANTIATE)
+template class _STLP_CLASS_DECLSPEC  istreambuf_iterator<wchar_t, char_traits<wchar_t> >;
+template class num_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >;
+// template class num_get<wchar_t, const wchar_t*>;
+#endif
+
+# endif /* _STLP_NO_WCHAR_T */
+
+//----------------------------------------------------------------------
+// Force instantiation of of num_get<>
+
+#if !defined(_STLP_NO_FORCE_INSTANTIATE)
+template class _STLP_CLASS_DECLSPEC istreambuf_iterator<char, char_traits<char> >;
+// template class num_get<char, const char*>;
+template class num_get<char, istreambuf_iterator<char, char_traits<char> > >;
+#endif
+ 
+// basic_streambuf<char, char_traits<char> >* _STLP_CALL _M_get_istreambuf(basic_istream<char, char_traits<char> >& ) ;
+
+_STLP_END_NAMESPACE
+
+// Local Variables:
+// mode:C++
+// End:
+
+
diff --git a/main/source/stlport/src/num_get_float.cpp b/main/source/stlport/src/num_get_float.cpp
new file mode 100644
index 00000000..81e0911b
--- /dev/null
+++ b/main/source/stlport/src/num_get_float.cpp
@@ -0,0 +1,792 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+# include "stlport_prefix.h"
+#include <stl/_limits.h>
+#include <stl/_num_get.h>
+#include <stl/_istream.h>
+
+_STLP_BEGIN_NAMESPACE
+
+//----------------------------------------------------------------------
+// num_get
+
+// Helper functions for _M_do_get_float.
+
+# ifndef _STLP_NO_WCHAR_T
+
+void  _STLP_CALL
+_Initialize_get_float( const ctype<wchar_t>& ct,
+                       wchar_t& Plus, wchar_t& Minus,
+                       wchar_t& pow_e, wchar_t& pow_E,
+                       wchar_t* digits)
+{
+  char ndigits[11] = "0123456789";
+  Plus  = ct.widen('+');
+  Minus = ct.widen('-');
+  pow_e = ct.widen('e');
+  pow_E = ct.widen('E');
+  ct.widen(ndigits + 0, ndigits + 10, digits);
+}
+
+# endif /* WCHAR_T */
+
+/*
+ * __string_to_double is just lifted from atof, the difference being
+ * that we just use '.' for the decimal point, rather than let it
+ * be taken from the current C locale, which of course is not accessible
+ * to us.
+ */
+
+typedef unsigned int uint32;
+# if defined (_STLP_MSVC) || defined (__BORLANDC__) || defined (__ICL)
+# define ULL(x) x##Ui64
+typedef unsigned _STLP_LONG_LONG uint64;
+# elif defined (_STLP_LONG_LONG)
+typedef unsigned _STLP_LONG_LONG uint64;
+# define ULL(x) x##ULL
+# elif defined(__MRC__) || defined(__SC__)		//*TY 02/25/2000 - added support for MPW compilers
+# include "uint64.h"		//*TY 03/25/2000 - added 64bit math type definition
+# else
+#  error "there should be some long long type on the system!"
+#  define NUMERIC_NO_64 1
+# endif
+
+// Multiplication of two 64-bit integers, giving a 128-bit result.
+// Taken from Algorithm M in Knuth section 4.3.1, with the loop 
+// hand-unrolled.
+void _Stl_mult64(const uint64 u, const uint64 v,
+		 uint64& high, uint64& low)
+{
+  const uint64 low_mask = ULL(0xffffffff);
+  const uint64 u0 = u & low_mask;
+  const uint64 u1 = u >> 32;
+  const uint64 v0 = v & low_mask;
+  const uint64 v1 = v >> 32;
+
+  uint64 t = u0 * v0;
+  low = t & low_mask;
+
+  t = u1 * v0 + (t >> 32);
+  uint64 w1 = t & low_mask;
+  uint64 w2 = t >> 32;
+
+  uint64 x = u0 * v1 + w1;
+  low += (x & low_mask) << 32;
+  high = u1 * v1 + w2 + (x >> 32);
+}
+
+# define bit11 ULL(0x7ff)
+# define exponent_mask (bit11 << 52)
+
+inline void _Stl_set_exponent(uint64& val, uint64 exp)
+{
+  val = (val & ~exponent_mask) | ((exp & bit11) << 52);
+}
+
+/* Power of ten fractions for tenscale*/
+/* The constants are factored so that at most two constants
+ * and two multiplies are needed. Furthermore, one of the constants
+ * is represented exactly - 10**n where 1<= n <= 27.
+ */
+
+#if !defined(__SC__)		//*TY 03/25/2000 - no native 64bit integer under SCpp
+static const uint64 _Stl_tenpow[80] = {
+ULL(0xa000000000000000), /* _Stl_tenpow[0]=(10**1)/(2**4) */
+ULL(0xc800000000000000), /* _Stl_tenpow[1]=(10**2)/(2**7) */
+ULL(0xfa00000000000000), /* _Stl_tenpow[2]=(10**3)/(2**10) */
+ULL(0x9c40000000000000), /* _Stl_tenpow[3]=(10**4)/(2**14) */
+ULL(0xc350000000000000), /* _Stl_tenpow[4]=(10**5)/(2**17) */
+ULL(0xf424000000000000), /* _Stl_tenpow[5]=(10**6)/(2**20) */
+ULL(0x9896800000000000), /* _Stl_tenpow[6]=(10**7)/(2**24) */
+ULL(0xbebc200000000000), /* _Stl_tenpow[7]=(10**8)/(2**27) */
+ULL(0xee6b280000000000), /* _Stl_tenpow[8]=(10**9)/(2**30) */
+ULL(0x9502f90000000000), /* _Stl_tenpow[9]=(10**10)/(2**34) */
+ULL(0xba43b74000000000), /* _Stl_tenpow[10]=(10**11)/(2**37) */
+ULL(0xe8d4a51000000000), /* _Stl_tenpow[11]=(10**12)/(2**40) */
+ULL(0x9184e72a00000000), /* _Stl_tenpow[12]=(10**13)/(2**44) */
+ULL(0xb5e620f480000000), /* _Stl_tenpow[13]=(10**14)/(2**47) */
+ULL(0xe35fa931a0000000), /* _Stl_tenpow[14]=(10**15)/(2**50) */
+ULL(0x8e1bc9bf04000000), /* _Stl_tenpow[15]=(10**16)/(2**54) */
+ULL(0xb1a2bc2ec5000000), /* _Stl_tenpow[16]=(10**17)/(2**57) */
+ULL(0xde0b6b3a76400000), /* _Stl_tenpow[17]=(10**18)/(2**60) */
+ULL(0x8ac7230489e80000), /* _Stl_tenpow[18]=(10**19)/(2**64) */
+ULL(0xad78ebc5ac620000), /* _Stl_tenpow[19]=(10**20)/(2**67) */
+ULL(0xd8d726b7177a8000), /* _Stl_tenpow[20]=(10**21)/(2**70) */
+ULL(0x878678326eac9000), /* _Stl_tenpow[21]=(10**22)/(2**74) */
+ULL(0xa968163f0a57b400), /* _Stl_tenpow[22]=(10**23)/(2**77) */
+ULL(0xd3c21bcecceda100), /* _Stl_tenpow[23]=(10**24)/(2**80) */
+ULL(0x84595161401484a0), /* _Stl_tenpow[24]=(10**25)/(2**84) */
+ULL(0xa56fa5b99019a5c8), /* _Stl_tenpow[25]=(10**26)/(2**87) */
+ULL(0xcecb8f27f4200f3a), /* _Stl_tenpow[26]=(10**27)/(2**90) */
+
+ULL(0xd0cf4b50cfe20766), /* _Stl_tenpow[27]=(10**55)/(2**183) */
+ULL(0xd2d80db02aabd62c), /* _Stl_tenpow[28]=(10**83)/(2**276) */
+ULL(0xd4e5e2cdc1d1ea96), /* _Stl_tenpow[29]=(10**111)/(2**369) */
+ULL(0xd6f8d7509292d603), /* _Stl_tenpow[30]=(10**139)/(2**462) */
+ULL(0xd910f7ff28069da4), /* _Stl_tenpow[31]=(10**167)/(2**555) */
+ULL(0xdb2e51bfe9d0696a), /* _Stl_tenpow[32]=(10**195)/(2**648) */
+ULL(0xdd50f1996b947519), /* _Stl_tenpow[33]=(10**223)/(2**741) */
+ULL(0xdf78e4b2bd342cf7), /* _Stl_tenpow[34]=(10**251)/(2**834) */
+ULL(0xe1a63853bbd26451), /* _Stl_tenpow[35]=(10**279)/(2**927) */
+ULL(0xe3d8f9e563a198e5), /* _Stl_tenpow[36]=(10**307)/(2**1020) */
+
+ULL(0xfd87b5f28300ca0e), /* _Stl_tenpow[37]=(10**-28)/(2**-93) */
+ULL(0xfb158592be068d2f), /* _Stl_tenpow[38]=(10**-56)/(2**-186) */
+ULL(0xf8a95fcf88747d94), /* _Stl_tenpow[39]=(10**-84)/(2**-279) */
+ULL(0xf64335bcf065d37d), /* _Stl_tenpow[40]=(10**-112)/(2**-372) */
+ULL(0xf3e2f893dec3f126), /* _Stl_tenpow[41]=(10**-140)/(2**-465) */
+ULL(0xf18899b1bc3f8ca2), /* _Stl_tenpow[42]=(10**-168)/(2**-558) */
+ULL(0xef340a98172aace5), /* _Stl_tenpow[43]=(10**-196)/(2**-651) */
+ULL(0xece53cec4a314ebe), /* _Stl_tenpow[44]=(10**-224)/(2**-744) */
+ULL(0xea9c227723ee8bcb), /* _Stl_tenpow[45]=(10**-252)/(2**-837)     */
+ULL(0xe858ad248f5c22ca), /* _Stl_tenpow[46]=(10**-280)/(2**-930) */
+ULL(0xe61acf033d1a45df), /* _Stl_tenpow[47]=(10**-308)/(2**-1023)    */
+ULL(0xe3e27a444d8d98b8), /* _Stl_tenpow[48]=(10**-336)/(2**-1116) */
+ULL(0xe1afa13afbd14d6e)  /* _Stl_tenpow[49]=(10**-364)/(2**-1209) */
+
+#else		//*TY 03/20/2000 - added support for SCpp which lacks native 64bit integer type
+static const UnsignedWide _Stl_tenpow[80] = {
+ULL2(0xa0000000,0x00000000), /* _Stl_tenpow[0]=(10**1)/(2**4) */
+ULL2(0xc8000000,0x00000000), /* _Stl_tenpow[1]=(10**2)/(2**7) */
+ULL2(0xfa000000,0x00000000), /* _Stl_tenpow[2]=(10**3)/(2**10) */
+ULL2(0x9c400000,0x00000000), /* _Stl_tenpow[3]=(10**4)/(2**14) */
+ULL2(0xc3500000,0x00000000), /* _Stl_tenpow[4]=(10**5)/(2**17) */
+ULL2(0xf4240000,0x00000000), /* _Stl_tenpow[5]=(10**6)/(2**20) */
+ULL2(0x98968000,0x00000000), /* _Stl_tenpow[6]=(10**7)/(2**24) */
+ULL2(0xbebc2000,0x00000000), /* _Stl_tenpow[7]=(10**8)/(2**27) */
+ULL2(0xee6b2800,0x00000000), /* _Stl_tenpow[8]=(10**9)/(2**30) */
+ULL2(0x9502f900,0x00000000), /* _Stl_tenpow[9]=(10**10)/(2**34) */
+ULL2(0xba43b740,0x00000000), /* _Stl_tenpow[10]=(10**11)/(2**37) */
+ULL2(0xe8d4a510,0x00000000), /* _Stl_tenpow[11]=(10**12)/(2**40) */
+ULL2(0x9184e72a,0x00000000), /* _Stl_tenpow[12]=(10**13)/(2**44) */
+ULL2(0xb5e620f4,0x80000000), /* _Stl_tenpow[13]=(10**14)/(2**47) */
+ULL2(0xe35fa931,0xa0000000), /* _Stl_tenpow[14]=(10**15)/(2**50) */
+ULL2(0x8e1bc9bf,0x04000000), /* _Stl_tenpow[15]=(10**16)/(2**54) */
+ULL2(0xb1a2bc2e,0xc5000000), /* _Stl_tenpow[16]=(10**17)/(2**57) */
+ULL2(0xde0b6b3a,0x76400000), /* _Stl_tenpow[17]=(10**18)/(2**60) */
+ULL2(0x8ac72304,0x89e80000), /* _Stl_tenpow[18]=(10**19)/(2**64) */
+ULL2(0xad78ebc5,0xac620000), /* _Stl_tenpow[19]=(10**20)/(2**67) */
+ULL2(0xd8d726b7,0x177a8000), /* _Stl_tenpow[20]=(10**21)/(2**70) */
+ULL2(0x87867832,0x6eac9000), /* _Stl_tenpow[21]=(10**22)/(2**74) */
+ULL2(0xa968163f,0x0a57b400), /* _Stl_tenpow[22]=(10**23)/(2**77) */
+ULL2(0xd3c21bce,0xcceda100), /* _Stl_tenpow[23]=(10**24)/(2**80) */
+ULL2(0x84595161,0x401484a0), /* _Stl_tenpow[24]=(10**25)/(2**84) */
+ULL2(0xa56fa5b9,0x9019a5c8), /* _Stl_tenpow[25]=(10**26)/(2**87) */
+ULL2(0xcecb8f27,0xf4200f3a), /* _Stl_tenpow[26]=(10**27)/(2**90) */
+
+ULL2(0xd0cf4b50,0xcfe20766), /* _Stl_tenpow[27]=(10**55)/(2**183) */
+ULL2(0xd2d80db0,0x2aabd62c), /* _Stl_tenpow[28]=(10**83)/(2**276) */
+ULL2(0xd4e5e2cd,0xc1d1ea96), /* _Stl_tenpow[29]=(10**111)/(2**369) */
+ULL2(0xd6f8d750,0x9292d603), /* _Stl_tenpow[30]=(10**139)/(2**462) */
+ULL2(0xd910f7ff,0x28069da4), /* _Stl_tenpow[31]=(10**167)/(2**555) */
+ULL2(0xdb2e51bf,0xe9d0696a), /* _Stl_tenpow[32]=(10**195)/(2**648) */
+ULL2(0xdd50f199,0x6b947519), /* _Stl_tenpow[33]=(10**223)/(2**741) */
+ULL2(0xdf78e4b2,0xbd342cf7), /* _Stl_tenpow[34]=(10**251)/(2**834) */
+ULL2(0xe1a63853,0xbbd26451), /* _Stl_tenpow[35]=(10**279)/(2**927) */
+ULL2(0xe3d8f9e5,0x63a198e5), /* _Stl_tenpow[36]=(10**307)/(2**1020) */
+
+ULL2(0xfd87b5f2,0x8300ca0e), /* _Stl_tenpow[37]=(10**-28)/(2**-93) */
+ULL2(0xfb158592,0xbe068d2f), /* _Stl_tenpow[38]=(10**-56)/(2**-186) */
+ULL2(0xf8a95fcf,0x88747d94), /* _Stl_tenpow[39]=(10**-84)/(2**-279) */
+ULL2(0xf64335bc,0xf065d37d), /* _Stl_tenpow[40]=(10**-112)/(2**-372) */
+ULL2(0xf3e2f893,0xdec3f126), /* _Stl_tenpow[41]=(10**-140)/(2**-465) */
+ULL2(0xf18899b1,0xbc3f8ca2), /* _Stl_tenpow[42]=(10**-168)/(2**-558) */
+ULL2(0xef340a98,0x172aace5), /* _Stl_tenpow[43]=(10**-196)/(2**-651) */
+ULL2(0xece53cec,0x4a314ebe), /* _Stl_tenpow[44]=(10**-224)/(2**-744) */
+ULL2(0xea9c2277,0x23ee8bcb), /* _Stl_tenpow[45]=(10**-252)/(2**-837)     */
+ULL2(0xe858ad24,0x8f5c22ca), /* _Stl_tenpow[46]=(10**-280)/(2**-930) */
+ULL2(0xe61acf03,0x3d1a45df), /* _Stl_tenpow[47]=(10**-308)/(2**-1023)    */
+ULL2(0xe3e27a44,0x4d8d98b8), /* _Stl_tenpow[48]=(10**-336)/(2**-1116) */
+ULL2(0xe1afa13a,0xfbd14d6e)  /* _Stl_tenpow[49]=(10**-364)/(2**-1209) */
+#endif
+};
+
+static const short _Stl_twoexp[80] = {
+4,7,10,14,17,20,24,27,30,34,37,40,44,47,50,54,57,60,64,67,70,74,77,80,84,87,90,
+183,276,369,462,555,648,741,834,927,1020,
+-93,-186,-279,-372,-465,-558,-651,-744,-837,-930,-1023,-1116,-1209
+};
+
+# define  TEN_1  0           /* offset to 10 **   1 */
+# define  TEN_27   26        /* offset to 10 **  27 */
+# define  TEN_M28  37        /* offset to 10 ** -28 */
+# define  NUM_HI_P 11
+# define  NUM_HI_N 13
+
+# define _Stl_HIBITULL (ULL(1) << 63)
+
+void _Stl_norm_and_round(uint64& p, int& norm, uint64 prodhi, uint64 prodlo)
+{
+  norm = 0;
+  if( ! (prodhi & _Stl_HIBITULL) ) { 
+                                /* leading bit is a zero 
+                                 * may have to normalize 
+                                 */
+    if(( prodhi == ~_Stl_HIBITULL) &&
+       ((prodlo >> 62) == 0x3) ) {  /* normalization followed by round
+                                     * would cause carry to create
+                                     * extra bit, so don't normalize 
+                                     */
+      p = _Stl_HIBITULL;
+      return;
+    }
+    p = (prodhi<<1) | (prodlo>>63); /* normalize */
+    norm=1;
+    prodlo <<= 1;
+  }
+  else {
+    p = prodhi;
+  }
+
+  if( (prodlo & _Stl_HIBITULL) != 0 ) {     /* first guard bit a one */		//*TY 03/25/2000 - added explicit comparison to zero to avoid reliance to the implicit conversion from uint64 to bool
+#if !defined(__SC__)			//*TY 03/25/2000 - 
+    if( ((p & 0x1) != 0) ||
+       prodlo != _Stl_HIBITULL ) {    /* not borderline for round to even */
+#else							//*TY 03/25/2000 - added workaround for SCpp compiler
+	bool b1 = ((p & 0x1) != 0);
+    if( b1 || prodlo != _Stl_HIBITULL ) {		//*TY 03/25/2000 - SCpp confuses on this particular original boolean expression
+#endif							//*TY 03/25/2000 - 
+      /* round */
+      p++;
+      if(p==0)
+        p++;
+    }
+  }
+
+  return;
+}
+
+// Convert a 64-bitb fraction * 10^exp to a 64-bit fraction * 2^bexp.
+// p:    64-bit fraction
+// exp:  base-10 exponent
+// bexp: base-2 exponent (output parameter)
+
+void _Stl_tenscale(uint64& p, int exp, int& bexp)
+{
+  uint64 prodhi, prodlo;        /* 128b product */
+  int exp_hi, exp_lo;           /* exp = exp_hi*32 + exp_lo */
+  int hi, lo, tlo, thi;         /* offsets in power of ten table */
+  int norm;                     /* number of bits of normalization */
+  int num_hi;                   /* number of high exponent powers */
+
+  bexp = 0;
+  if(exp > 0) {                 /* split exponent */
+    exp_lo = exp;
+    exp_hi = 0;
+    if(exp_lo>27) {
+      exp_lo++;
+      while(exp_lo>27) {
+        exp_hi++;
+        exp_lo-=28;
+      }
+    }
+    tlo = TEN_1;
+    thi = TEN_27;
+    num_hi = NUM_HI_P;
+  }
+  else if(exp < 0) {
+    exp_lo = exp;
+    exp_hi = 0;
+    while(exp_lo<0) {
+      exp_hi++;
+      exp_lo+=28;
+    }
+    tlo = TEN_1;
+    thi = TEN_M28;
+    num_hi = NUM_HI_N;
+  }
+  else {                        /* no scaling needed */
+    return;
+  }
+  while(exp_hi) {               /* scale */
+    hi = (min) (exp_hi,num_hi);    /* only a few large powers of 10 */
+    exp_hi -= hi;               /* could iterate in extreme case */
+    hi += thi-1;
+    _Stl_mult64(p, _Stl_tenpow[hi], prodhi, prodlo);
+    _Stl_norm_and_round(p, norm, prodhi, prodlo);
+    bexp += _Stl_twoexp[hi] - norm;
+  }
+  if(exp_lo) {
+    lo = tlo + exp_lo -1;
+    _Stl_mult64(p, _Stl_tenpow[lo], prodhi, prodlo);
+    _Stl_norm_and_round(p, norm, prodhi, prodlo);
+    bexp += _Stl_twoexp[lo] - norm;
+  }
+
+  return;
+}
+
+// First argument is a buffer of values from 0 to 9, NOT ascii.
+// Second argument is number of digits in buffer, 1 <= digits <= 17.
+// Third argument is base-10 exponent.
+
+#if defined(__SC__) || defined(__MRC__)
+
+//*TY 04/06/2000 - powermac's 68K emulator utilizes apple's SANE floating point, which is not compatible with IEEE format.
+_STLP_END_NAMESPACE
+# include <fp.h>
+_STLP_BEGIN_NAMESPACE
+inline double _Stl_atod(char *buffer, int ndigit, int dexp)
+{
+	decimal d;	// ref. inside macintosh powerpc numerics p.9-13
+	
+	d.sgn = 0;
+	d.exp = dexp;
+	d.sig.length = ndigit;
+	for( int i = 0; i < ndigit; ++i )
+	{
+		d.sig.text[i] = buffer[i] + '0';
+	}
+	return dec2num( &d );
+}
+
+#else  /* IEEE representation */
+
+#if 0 // def __ICL
+// turn off optimization here
+#  pragma optimize "off"
+#endif
+
+double _Stl_atod(char *buffer, int ndigit, int dexp)
+{
+
+  uint64 value;         /* Value develops as follows:
+                                 * 1) decimal digits as an integer
+                                 * 2) left adjusted fraction
+                                 * 3) right adjusted fraction
+                                 * 4) exponent and fraction
+                                 */
+
+  uint32 guard;         /* First guard bit */
+  uint64 rest;          /* Remaining guard bits */
+
+  int bexp;             /* binary exponent */
+  int nzero;            /* number of non-zero bits */
+  int sexp;             /* scaling exponent */
+
+  char *bufferend;              /* pointer to char after last digit */
+  
+  /* Check for zero and treat it as a special case */
+
+  if (buffer == 0){
+    return 0.0; 
+  }
+
+  /* Convert the decimal digits to a binary integer. */
+
+  bufferend = buffer + ndigit;
+  value = 0;                    
+
+  while( buffer < bufferend ) {
+    value *= 10;
+    value += *buffer++;
+  }
+
+  /* Check for zero and treat it as a special case */
+
+  if (value == 0){
+    return 0.0; 
+  }
+
+  /* Normalize value */
+
+  bexp = 64;                    /* convert from 64b int to fraction */
+
+  /* Count number of non-zeroes in value */
+  nzero = 0;
+  if ( (value >> 32) !=0 ){ nzero  = 32; }		//*TY 03/25/2000 - added explicit comparison to zero to avoid uint64 to bool conversion operator
+  if ( (value >> (16 + nzero)) !=0 ){ nzero += 16; }
+  if ( (value >> ( 8 + nzero)) !=0 ){ nzero +=  8; }
+  if ( (value >> ( 4 + nzero)) !=0 ){ nzero +=  4; }
+  if ( (value >> ( 2 + nzero)) !=0 ){ nzero +=  2; }
+  if ( (value >> ( 1 + nzero)) !=0 ){ nzero +=  1; }
+  if ( (value >> (     nzero)) !=0 ){ nzero +=  1; }
+
+  /* Normalize */
+  value <<= /*(uint64)*/ (64-nzero);		//*TY 03/25/2000 - removed extraneous cast to uint64
+  bexp -= 64-nzero;
+
+  /* At this point we have a 64b fraction and a binary exponent 
+   * but have yet to incorporate the decimal exponent.
+   */
+
+  /* multiply by 10^dexp */
+
+  _Stl_tenscale(value, dexp, sexp);
+  bexp += sexp;
+
+  if (bexp <= -1022) {          /* HI denorm or underflow */
+    bexp += 1022;
+    if( bexp < -53 ) {          /* guaranteed underflow */
+      value = 0;
+    }
+    else {                      /* denorm or possible underflow */
+    int lead0;
+
+      lead0 = 12-bexp;          /* 12 sign and exponent bits */
+
+      /* we must special case right shifts of more than 63 */
+
+      if ( lead0 > 64 )
+      {
+           rest = value;
+           guard = 0;
+           value = 0;
+      }
+      else if ( lead0 == 64 )
+      {
+           rest = value & ((ULL(1)<< 63)-1);
+#if !defined(__SC__)
+           guard = (uint32) ((value>> 63) & 1 );
+#else
+           guard = to_ulong((value>> 63) & 1 );		//*TY 03/25/2000 - use member function instead of problematic conversion operator utilization
+#endif
+           value = 0;
+      }
+      else
+      {
+          rest = value & (((ULL(1) << lead0)-1)-1);
+#if !defined(__SC__)
+          guard = (uint32) (((value>> lead0)-1) & 1);
+#else		//*TY 03/25/2000 - 
+          guard = to_ulong(((value>> lead0)-1) & 1); 
+#endif		//*TY 03/25/2000 - 
+          value >>= /*(uint64)*/ lead0; /* exponent is zero */
+      }
+
+      /* Round */
+      if (  guard && ( (value&1) || rest) ) {		
+        value++;
+        if( value == (ULL(1) << 52) ) { /* carry created normal number */
+          value = 0;
+          _Stl_set_exponent(value, 1);
+        }
+      }
+    }
+
+  }
+  else {                        /* not zero or denorm */
+    /* Round to 53 bits */
+
+    rest = value & (1<<10)-1;
+    value >>= 10;
+#if !defined(__SC__)
+    guard = (uint32) value & 1;
+#else		//*TY 03/25/2000 - 
+    guard = to_ulong(value & 1);
+#endif
+    value >>= 1;
+
+    /*  value&1 guard   rest    Action
+     *  
+     *  dc      0       dc      none
+     *  1       1       dc      round
+     *  0       1       0       none
+     *  0       1       !=0     round
+     */
+    if(guard) {
+      if(((value&1)!=0) || (rest!=0)) {
+        value++;                        /* round */
+        if((value>>53)!=0) {         /* carry all the way across */		
+          value >>= 1;          /* renormalize */
+          bexp ++;
+        }
+      }
+    }
+    /*
+     * Check for overflow
+     * IEEE Double Precision Format
+     * (From Table 7-8 of Kane and Heinrich)
+     * 
+     * Fraction bits               52
+     * Emax                     +1023
+     * Emin                     -1022
+     * Exponent bias            +1023
+     * Exponent bits               11
+     * Integer bit             hidden
+     * Total width in bits         64
+     */
+  
+    if (bexp > 1024) {          /* overflow */
+      return numeric_limits<double>::infinity();
+    }
+    else {                      /* value is normal */
+      value &= ~(ULL(1) << 52);   /* hide hidden bit */
+      _Stl_set_exponent(value, bexp + 1022); /* add bias */
+    }
+  }
+
+  return *((double *) &value);
+}
+
+#endif
+
+double _Stl_string_to_double(const char * s) {
+  const int max_digits = 17;
+  unsigned c;
+  unsigned Negate, decimal_point;
+  char *d;
+  int exp;
+  double x;
+  int dpchar;
+  char digits[max_digits];
+
+  // Skip leading whitespace, if any.
+  const ctype<char>& ct = use_facet<ctype<char> >(locale::classic());
+  while (c = *s++, ct.is(ctype_base::space, char(c)))
+    ;
+
+  /* process sign */
+  Negate = 0;
+  if (c == '+') {
+    c = *s++;
+  }
+  else if (c == '-') {
+    Negate = 1;
+    c = *s++;
+  }
+  d = digits;
+  dpchar = '.' - '0';
+  decimal_point = 0;
+  exp = 0;
+  for (;;) {
+    c -= '0';
+    if (c < 10) {
+      if (d == digits+max_digits) {
+        /* ignore more than 17 digits, but adjust exponent */
+        exp += (decimal_point ^ 1);
+      }
+      else {
+        if (c == 0 && d == digits) {
+          /* ignore leading zeros */
+        }
+        else {
+          *d++ = (char) c;
+        }
+        exp -= decimal_point;
+      }
+    }
+    else if (c == (unsigned int) dpchar && !decimal_point) {    /* INTERNATIONAL */
+      decimal_point = 1;
+    }
+    else {
+      break;
+    }
+    c = *s++;
+  }
+  /* strtod cant return until it finds the end of the exponent */
+  if (d == digits) {
+    return 0.0;
+  }
+  if (c == 'e'-'0' || c == 'E'-'0') {
+    register unsigned negate_exp = 0;
+    register int e = 0;
+    c = *s++;
+    if (c == '+' || c == ' ') {
+      c = *s++;
+    }
+    else if (c == '-') {
+      negate_exp = 1;
+      c = *s++;
+    }
+    if (c -= '0', c < 10) {
+      do {
+        if (e <= 340) 
+          e = e * 10 + (int)c;
+        else break;
+        c = *s++;
+      }
+      while (c -= '0', c < 10);
+      if (negate_exp) {
+        e = -e;
+      }
+      if (e < -340 || e > 340) 
+        exp = e;
+      else 
+        exp += e;
+    }
+  }
+
+  if (exp < -340) {
+    x = 0;
+  }
+  else if (exp > 308) {
+    x = numeric_limits<double>::infinity();
+  }
+  else {
+    /* let _Stl_atod diagnose under- and over-flows */
+    /* if the input was == 0.0, we have already returned,
+       so retval of +-Inf signals OVERFLOW, 0.0 UNDERFLOW
+    */
+    x = _Stl_atod (digits, (int)(d - digits), exp);
+  }
+  if (Negate) {
+    x = -x;
+  }
+  return x;
+}
+
+
+#ifndef _STLP_NO_LONG_DOUBLE
+/*
+ * __string_to_long_double is just lifted from atold, the difference being
+ * that we just use '.' for the decimal point, rather than let it
+ * be taken from the current C locale, which of course is not accessible
+ * to us.
+ */
+
+long double 
+_Stl_string_to_long_double(const char * s) {
+  const int max_digits = 34;
+  register unsigned c;
+  register unsigned Negate, decimal_point;
+  register char *d;
+  register int exp;
+  long double x;
+  register int dpchar;
+  char digits[max_digits];
+
+  const ctype<char>& ct = use_facet<ctype<char> >(locale::classic());
+  while (c = *s++, ct.is(ctype_base::space, char(c)))
+    ;
+
+  /* process sign */
+  Negate = 0;
+  if (c == '+') {
+    c = *s++;
+  }
+  else if (c == '-') {
+    Negate = 1;
+    c = *s++;
+  }
+
+  d = digits;
+  dpchar = '.' -'0';
+  decimal_point = 0;
+  exp = 0;
+
+  for (;;) {
+    c -= '0';
+    if (c < 10) {
+      if (d == digits+max_digits) {
+        /* ignore more than 34 digits, but adjust exponent */
+        exp += (decimal_point ^ 1);
+      }
+      else {
+        if (c == 0 && d == digits) {
+          /* ignore leading zeros */
+          ;
+        }
+        else {
+          *d++ = c;
+        }
+        exp -= decimal_point;
+      }
+    }
+    else if (c == dpchar && !decimal_point) {    /* INTERNATIONAL */
+      decimal_point = 1;
+    }
+    else {
+      break;
+    }
+    c = *s++;
+  } /* for */
+
+  if (d == digits) {
+    return 0.0L;
+  }
+  if (c == 'e'-'0' || c == 'E'-'0') {
+    register unsigned negate_exp = 0;
+    register int e = 0;
+    c = *s++;
+    if (c == '+' || c == ' ') {
+      c = *s++;
+    }
+    else if (c == '-') {
+      negate_exp = 1;
+      c = *s++;
+    }
+    if (c -= '0', c < 10) {
+      do {
+        if (e <= 340) 
+          e = e * 10 + c;
+        else break;
+        c = *s++;
+      }
+      while (c -= '0', c < 10);
+      if (negate_exp) {
+        e = -e;
+      }
+      if (e < -(323+max_digits) || e > 308) 
+        exp = e;
+      else 
+        exp += e;
+    }
+  }
+
+
+  if (exp < -(324+max_digits)) {
+    x = 0;
+  }
+  else if (exp > 308) {
+    x =  numeric_limits<long double>::infinity();
+  }
+  else {
+    /* let _Stl_atod diagnose under- and over-flows */
+    /* if the input was == 0.0, we have already returned,
+           so retval of +-Inf signals OVERFLOW, 0.0 UNDERFLOW
+        */
+
+    //    x = _Stl_atod (digits, (int)(d - digits), exp); // TEMPORARY!!:1
+    double tmp = _Stl_atod (digits, (int)(d - digits), exp); // TEMPORARY!!:1
+    x = tmp == numeric_limits<double>::infinity()
+      ? numeric_limits<long double>::infinity()
+      : tmp;
+  }
+
+  if (Negate) {
+    x = -x;
+  }
+
+  return x;
+}
+#endif
+
+void  _STLP_CALL
+__string_to_float(const string& v, float& val) {
+    val = _Stl_string_to_double(v.data());
+}
+
+void  _STLP_CALL
+__string_to_float(const string& v, double& val) {
+    val = _Stl_string_to_double(v.data());
+}
+
+#ifndef _STLP_NO_LONG_DOUBLE
+void  _STLP_CALL
+__string_to_float(const string& v, long double& val) {
+    val = _Stl_string_to_long_double(v.data());
+}
+#endif
+
+_STLP_END_NAMESPACE
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/src/num_put.cpp b/main/source/stlport/src/num_put.cpp
new file mode 100644
index 00000000..d37375f5
--- /dev/null
+++ b/main/source/stlport/src/num_put.cpp
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+# include "stlport_prefix.h"
+# include "num_put.h"
+
+_STLP_BEGIN_NAMESPACE
+
+//----------------------------------------------------------------------
+// num_put
+
+extern const char __hex_char_table_lo[];
+extern const char __hex_char_table_hi[];
+
+const char __hex_char_table_lo[18] = "0123456789abcdefx"; 
+const char __hex_char_table_hi[18] = "0123456789ABCDEFX";
+
+char* _STLP_CALL
+__write_integer(char* buf, ios_base::fmtflags flags, long x)
+{
+  char tmp[64];
+  char* bufend = tmp+64;
+  char* beg = __write_integer_backward(bufend, flags, x);
+  return copy(beg, bufend, buf);
+}
+
+///-------------------------------------
+
+ptrdiff_t _STLP_CALL
+__insert_grouping(char * first, char * last, const string& grouping,
+		  char separator, char Plus, char Minus, int basechars)
+{
+  return __insert_grouping_aux(first, last, grouping, 
+			       separator, Plus, Minus, basechars);
+}
+
+# ifndef _STLP_NO_WCHAR_T
+
+ptrdiff_t _STLP_CALL
+__insert_grouping(wchar_t* first, wchar_t* last, const string& grouping,
+                  wchar_t separator, wchar_t Plus, wchar_t Minus,
+		  int basechars)
+{
+  return __insert_grouping_aux(first, last, grouping, separator, 
+			       Plus, Minus, basechars);
+}
+
+# endif
+
+
+//----------------------------------------------------------------------
+// Force instantiation of num_put<>
+#if !defined(_STLP_NO_FORCE_INSTANTIATE)
+template class _STLP_CLASS_DECLSPEC ostreambuf_iterator<char, char_traits<char> >;
+// template class num_put<char, char*>;
+template class num_put<char, ostreambuf_iterator<char, char_traits<char> > >;
+# ifndef _STLP_NO_WCHAR_T
+template class ostreambuf_iterator<wchar_t, char_traits<wchar_t> >;
+template class num_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >;
+// template class num_put<wchar_t, wchar_t*>;
+# endif /* INSTANTIATE_WIDE_STREAMS */
+#endif
+
+_STLP_END_NAMESPACE
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/src/num_put.h b/main/source/stlport/src/num_put.h
new file mode 100644
index 00000000..24f6a796
--- /dev/null
+++ b/main/source/stlport/src/num_put.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+# ifndef _STLP_NUM_PUT_H
+#  define _STLP_NUM_PUT_H
+
+#ifndef _STLP_INTERNAL_NUM_PUT_H
+#include <stl/_num_put.h>
+#endif
+#ifndef _STLP_INTERNAL_OSTREAM_H
+#include <stl/_ostream.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+// Note that grouping[0] is the number of digits in the *rightmost* group.
+// We assume, without checking, that *last is null and that there is enough
+// space in the buffer to extend the number past [first, last).
+template <class Char>
+ptrdiff_t 
+__insert_grouping_aux(Char* first, Char* last, const string& grouping,
+                      Char separator, Char Plus, Char Minus,
+		      int basechars)
+{
+  typedef string::size_type str_size;
+
+  if (first == last)
+    return 0;
+
+  int sign = 0;
+
+  if (*first == Plus || *first == Minus) {
+    sign = 1;
+    ++first;
+  }
+ 
+  first += basechars;
+  str_size n = 0;               // Index of the current group.
+  Char* cur_group = last;       // Points immediately beyond the rightmost
+                                // digit of the current group.
+  int groupsize = 0;            // Size of the current group.
+  
+  while (true) {
+    groupsize = n < grouping.size() ? grouping[n] : groupsize;
+    ++n;
+
+    if (groupsize <= 0 || groupsize >= cur_group - first)
+      break;
+
+    // Insert a separator character just before position cur_group - groupsize
+    cur_group -= groupsize;
+    ++last;
+    copy_backward(cur_group, last, last + 1);
+    *cur_group = separator;
+  }
+
+  return (last - first) + sign + basechars;
+}
+
+_STLP_END_NAMESPACE
+
+# endif
diff --git a/main/source/stlport/src/num_put_float.cpp b/main/source/stlport/src/num_put_float.cpp
new file mode 100644
index 00000000..6206c669
--- /dev/null
+++ b/main/source/stlport/src/num_put_float.cpp
@@ -0,0 +1,762 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# include "stlport_prefix.h"
+
+# ifdef __DECCXX
+#define NDIG 400
+# else
+#define NDIG 82
+# endif
+
+# ifdef _STLP_NO_LONG_DOUBLE
+#  define MAXECVT 17
+#  define MAXFCVT 18
+typedef double max_double_type;
+# else
+#  define MAXECVT 35
+#  define MAXFCVT 36
+typedef long double max_double_type;
+# endif
+
+#define MAXFSIG MAXECVT
+#define MAXESIZ 5
+
+#define todigit(x) ((x)+'0')
+
+# include <stl/_config.h>
+
+# ifdef _STLP_UNIX
+
+# if defined (__sun) 
+#  include <floatingpoint.h>
+# endif
+
+//# if !(defined(_STLP_USE_GLIBC) || defined(__FreeBSD__) || defined(__NetBSD__) || defined (_AIX) || defined(__MVS__) || defined (__OS400__) || defined (__QNXNTO__) || defined (__APPLE__) || defined (__DJGPP))
+# if defined (__sun) || defined (__digital__) || defined (__sgi) || defined (_STLP_SCO_OPENSERVER) || defined (__NCR_SVR)
+// DEC, SGI & Solaris need this
+#  include <values.h>
+#  include <nan.h>
+# endif
+
+# if defined (__QNXNTO__) || ( defined(__GNUC__) && defined(__APPLE__) )
+#  define USE_SPRINTF_INSTEAD
+# endif
+
+#  if defined( _AIX ) // JFA 3-Aug-2000
+#    include <math.h>
+#    include <float.h>
+#  endif
+
+# endif
+
+# include <cstdlib>
+
+//#if defined(_CRAY)
+//# include <stdlib.h>
+//#endif
+
+#if defined (_MSC_VER) || defined (__MINGW32__) || defined (__BORLANDC__) || defined (__DJGPP)  || defined (_STLP_SCO_OPENSERVER) || defined (__NCR_SVR)
+# include <float.h>
+#endif
+
+#if defined(__MRC__) || defined(__SC__)	|| defined(_CRAY)	//*TY 02/24/2000 - added support for MPW
+# include <fp.h>
+#endif
+
+#include <cmath>
+
+#if defined( __MSL__ )
+# include <cstdlib>	// for atoi
+# include <cstdio>	// for snprintf
+# include <algorithm>
+# include <cassert>
+#endif
+
+#if defined (__ISCPP__)
+# include <cfloat>
+#endif
+
+
+# include "num_put.h"
+# include <algorithm>
+
+
+#if defined(__hpux) && !defined(_INCLUDE_HPUX_SOURCE)
+     extern "C" double erf(double);
+     extern "C" double erfc(double);
+     extern "C" double gamma(double);                             /* obsolescent */
+     extern "C" double hypot(double, double);
+     extern "C" int    isnan(double);
+     extern "C" double j0(double);
+     extern "C" double j1(double);
+     extern "C" double jn(int, double);
+     extern "C" double lgamma(double);
+     extern "C" double y0(double);
+     extern "C" double y1(double);
+     extern "C" double yn(int, double);
+
+#  define HUGE_VALF     _SINFINITY
+#  define INFINITY      _SINFINITY
+#  define NAN           _SQNAN
+
+#  define isnan(x)              _ISNAN(x)
+#  define isinf(x)              _ISINF(x)
+#  define signbit(x)            _SIGNBIT(x)
+#  define isfinite(x)           _ISFINITE(x)
+#  define isnormal(x)           _ISNORMAL(x)
+#  define fpclassify(x)         _FPCLASSIFY(x)
+#  define isunordered(x,y)      _ISUNORDERED(x,y)
+#  define isgreater(x,y)        _ISGREATER(x,y)
+#  define isgreaterequal(x,y)   _ISGREATEREQUAL(x,y)
+#  define isless(x,y)           _ISLESS(x,y)
+#  define islessequal(x,y)      _ISLESSEQUAL(x,y)
+#  define islessgreater(x,y)    _ISLESSGREATER(x,y)
+
+#  define FP_NORMAL     0
+#  define FP_ZERO       1
+#  define FP_INFINITE   2
+#  define FP_SUBNORMAL  3
+#  define FP_NAN        4
+
+#  define DECIMAL_DIG   17
+
+#  define _IS64(x) (sizeof(x)==sizeof(double))
+#  define _IS32(x) (sizeof(x)==sizeof(float))
+
+extern "C" {
+     extern double copysign(double, double);
+     extern const float _SINFINITY;
+     extern const float _SQNAN;
+#    ifdef _PA_RISC
+#      define _ISNAN(x)          (_IS32(x)?_Isnanf(x):(isnan)(x))
+#      define _ISINF(x)          (_IS32(x)?_Isinff(x):_Isinf(x))
+#      define _SIGNBIT(x)        (_IS32(x)?_Signbitf(x):_Signbit(x))
+#      define _ISFINITE(x)       (_IS32(x)?_Isfinitef(x):_Isfinite(x))
+#      define _ISNORMAL(x)       (_IS32(x)?_Isnormalf(x):_Isnormal(x))
+#      define _FPCLASSIFY(x)     (_IS32(x)?_Fpclassifyf(x)>>1:_Fpclassify(x)>>1)
+#      define _ISUNORDERED(x,y)  (_IS32(x)&&_IS32(y)?_Isunorderedf(x,y):_Isunordered(x,y))
+       extern int _Signbit(double);
+       extern int _Signbitf(float);
+       extern int _Isnanf(float);
+       extern int _Isfinite(double);
+       extern int _Isfinitef(float);
+       extern int _Isinf(double);
+       extern int _Isinff(float);
+       extern int _Isnormal(double);
+       extern int _Isnormalf(float);
+       extern int _Isunordered(double, double);
+       extern int _Isunorderedf(float, float);
+       extern int _Fpclassify(double);
+       extern int _Fpclassifyf(float);
+#    else
+#      include "math_ia64_internal.h"
+#      define _FPCLASSIFY(x)     (_IS32(x)?_Fpclassf(x):_Fpclass(x))
+       extern int _Fpclass(double);
+       extern int _Fpclassf(float);
+#    endif
+}
+
+#ifndef _INCLUDE_XOPEN_SOURCE_EXTENDED
+extern "C" char *fcvt(double, int, int *, int *);
+extern "C" char *ecvt(double, int, int *, int *);
+#endif
+#ifndef _INCLUDE_HPUX_SOURCE
+#  ifndef _LONG_DOUBLE
+#    define _LONG_DOUBLE
+     typedef struct {
+       uint32_t word1, word2, word3, word4;
+     } long_double;
+#  endif /* _LONG_DOUBLE */
+extern "C" char *_ldecvt(long_double, int, int *, int *);
+extern "C" char *_ldfcvt(long_double, int, int *, int *);
+
+#endif
+
+#endif /* __hpux */
+
+_STLP_BEGIN_NAMESPACE
+
+#if defined (__MWERKS__) || defined(__BEOS__)
+#  define USE_SPRINTF_INSTEAD
+#endif
+
+# if defined (_AIX)
+// Some OS'es only provide non-reentrant primitives, so we have to use additional synchronization here
+# ifdef _REENTRANT
+static _STLP_STATIC_MUTEX __put_float_mutex _STLP_MUTEX_INITIALIZER;
+# define LOCK_CVT _STLP_auto_lock lock(__put_float_mutex);
+# define RETURN_CVT(ecvt, x, n, pt, sign, buf) strcpy(buf, ecvt(x, n, pt, sign)); return buf;
+# else
+# define LOCK_CVT
+# define RETURN_CVT(ecvt, x, n, pt, sign, buf) return ecvt(x, n, pt, sign);
+# endif
+# endif
+
+// Tests for infinity and NaN differ on different OSs.  We encapsulate
+// these differences here.
+
+#ifdef USE_SPRINTF_INSTEAD
+
+#elif defined (__hpux) || defined (__DJGPP) || ( defined(_STLP_USE_GLIBC) && ! defined (__MSL__) )
+#  if defined (isfinite) 
+inline bool _Stl_is_nan_or_inf(double x) { return !isfinite(x); }
+#  else
+inline bool _Stl_is_nan_or_inf(double x) { return !finite(x); }
+#  endif
+inline bool _Stl_is_neg_nan(double x)    { return isnan(x) && ( copysign(1., x) < 0 ); }
+inline bool _Stl_is_inf(double x)        { return isinf(x); }
+// inline bool _Stl_is_neg_inf(double x)    { return isinf(x) < 0; }  
+inline bool _Stl_is_neg_inf(double x)    { return isinf(x) && x < 0; }
+#elif defined(__unix) && !defined(__FreeBSD__)  && !defined(__NetBSD__) \
+      && !defined(__APPLE__)  && !defined(__DJGPP) && !defined(__osf__) \
+      && !defined(_CRAY)
+inline bool _Stl_is_nan_or_inf(double x) { return IsNANorINF(x); }
+inline bool _Stl_is_inf(double x)        { return IsNANorINF(x) && IsINF(x); }
+inline bool _Stl_is_neg_inf(double x)    { return (IsINF(x)) && (x < 0.0); }
+inline bool _Stl_is_neg_nan(double x)    { return IsNegNAN(x); }
+# elif defined (__BORLANDC__) && ( __BORLANDC__ < 0x540 )
+inline bool _Stl_is_nan_or_inf(double x) {  return !_finite(x); }
+inline bool _Stl_is_inf(double x)        {  return _Stl_is_nan_or_inf(x) && ! _isnan(x);}
+inline bool _Stl_is_neg_inf(double x)    {  return _Stl_is_inf(x) && x < 0 ; }
+inline bool _Stl_is_neg_nan(double x)    { return _isnan(x) && x < 0 ; } 
+#elif defined (_MSC_VER) || defined (__MINGW32__) || defined (__BORLANDC__)
+inline bool _Stl_is_nan_or_inf(double x) { return !_finite(x); }
+inline bool _Stl_is_inf(double x)        { 
+  int fclass = _fpclass(x); 
+  return fclass == _FPCLASS_NINF || fclass == _FPCLASS_PINF; 
+}
+inline bool _Stl_is_neg_inf(double x)    { return _fpclass(x) == _FPCLASS_NINF; }
+inline bool _Stl_is_neg_nan(double x)    { return _isnan(x) && _copysign(1., x) < 0 ; } 
+#elif defined(__MRC__) || defined(__SC__)		//*TY 02/24/2000 - added support for MPW
+bool _Stl_is_nan_or_inf(double x) { return isnan(x) || !isfinite(x); }
+bool _Stl_is_inf(double x)        { return !isfinite(x); }
+bool _Stl_is_neg_inf(double x)    { return !isfinite(x) && signbit(x); }
+bool _Stl_is_neg_nan(double x)    { return isnan(x) && signbit(x); }
+#elif /* defined (__FreeBSD__) */ ( defined (__GNUC__) && defined (__APPLE__) )
+inline bool _Stl_is_nan_or_inf(double x) { return !finite(x); }
+inline bool _Stl_is_inf(double x)        {   return _Stl_is_nan_or_inf(x) && ! isnan(x); }
+inline bool _Stl_is_neg_inf(double x)    {   return _Stl_is_inf(x) && x < 0 ; }
+inline bool _Stl_is_neg_nan(double x)    { return isnan(x) && copysign(1., x) < 0 ; } 
+#elif defined( _AIX ) // JFA 11-Aug-2000
+bool _Stl_is_nan_or_inf(double x) { return isnan(x) || !finite(x); }
+bool _Stl_is_inf(double x)        { return !finite(x); }
+// bool _Stl_is_neg_inf(double x)    { return _class(x) == FP_MINUS_INF; }
+bool _Stl_is_neg_inf(double x)    { return _Stl_is_inf(x) && ( copysign(1., x) < 0 );  }
+bool _Stl_is_neg_nan(double x)    { return isnan(x) && ( copysign(1., x) < 0 );  }
+#elif defined (__ISCPP__)
+inline bool _Stl_is_nan_or_inf  (double x) { return _fp_isINF(x) || _fp_isNAN(x); }
+inline bool _Stl_is_inf         (double x) { return _fp_isINF(x); }
+inline bool _Stl_is_neg_inf     (double x) { return _fp_isINF(x) && x < 0; }
+inline bool _Stl_is_neg_nan     (double x) { return _fp_isNAN(x) && x < 0; }
+#elif defined(_CRAY)
+ #if defined(_CRAYIEEE)
+inline bool _Stl_is_nan_or_inf(double x) { return isnan(x) || isinf(x); }
+inline bool _Stl_is_inf(double x)        { return isinf(x); }
+inline bool _Stl_is_neg_inf(double x)    { return isinf(x) && signbit(x); }
+inline bool _Stl_is_neg_nan(double x)    { return isnan(x) && signbit(x); }
+ #else
+inline bool _Stl_is_nan_or_inf(double x) { return false; }
+inline bool _Stl_is_inf(double x)        { return false; }
+inline bool _Stl_is_neg_inf(double x)    { return false; }
+inline bool _Stl_is_neg_nan(double x)    { return false; }
+ #endif
+#elif ! defined (USE_SPRINTF_INSTEAD)
+# define USE_SPRINTF_INSTEAD
+#endif
+
+
+# ifndef  USE_SPRINTF_INSTEAD
+// Reentrant versions of floating-point conversion functions.  The argument
+// lists look slightly different on different operating systems, so we're
+// encapsulating the differences here.
+
+#if defined (__CYGWIN__) || defined(__DJGPP)
+  inline char* _Stl_ecvtR(double x, int n, int* pt, int* sign, char* buf)
+    { return ecvtbuf(x, n, pt, sign, buf); }
+  inline char* _Stl_fcvtR(double x, int n, int* pt, int* sign, char* buf)
+    { return fcvtbuf(x, n, pt, sign, buf); }
+# ifndef _STLP_NO_LONG_DOUBLE
+  inline char* _Stl_qecvtR(long double x, int n, int* pt, int* sign, char* buf)
+    { return ecvtbuf(x, n, pt, sign, buf); }
+  inline char* _Stl_qfcvtR(long double x, int n, int* pt, int* sign, char* buf)
+    { return fcvtbuf(x, n, pt, sign, buf); }
+# endif
+#elif defined (_STLP_USE_GLIBC)
+  inline char* _Stl_ecvtR(double x, int n, int* pt, int* sign, char* buf)
+    { return buf + ecvt_r(x, n, pt, sign, buf, NDIG+2); }
+  inline char* _Stl_fcvtR(double x, int n, int* pt, int* sign, char* buf)
+    { return buf + fcvt_r(x, n, pt, sign, buf, NDIG+2); }
+#  ifndef _STLP_NO_LONG_DOUBLE
+  inline char* _Stl_qecvtR(long double x, int n, int* pt, int* sign, char* buf)
+    { return buf + qecvt_r(x, n, pt, sign, buf, NDIG+2); }
+  inline char* _Stl_qfcvtR(long double x, int n, int* pt, int* sign, char* buf)
+    { return buf + qfcvt_r(x, n, pt, sign, buf, NDIG+2); }
+#  endif
+#elif defined (_STLP_SCO_OPENSERVER) || defined (__NCR_SVR)
+  inline char* _Stl_ecvtR(double x, int n, int* pt, int* sign, char* buf)
+    { return ecvt(x, n, pt, sign); }
+  inline char* _Stl_fcvtR(double x, int n, int* pt, int* sign, char* buf)
+    { return fcvt(x, n, pt, sign); }
+#  ifndef _STLP_NO_LONG_DOUBLE
+  inline char* _Stl_qecvtR(long double x, int n, int* pt, int* sign, char* buf)
+    { return ecvtl(x, n, pt, sign); }
+  inline char* _Stl_qfcvtR(long double x, int n, int* pt, int* sign, char* buf)
+    { return fcvtl(x, n, pt, sign); }
+#  endif
+#elif defined (__sun)
+  inline char* _Stl_ecvtR(double x, int n, int* pt, int* sign, char* buf)
+    { return econvert(x, n, pt, sign, buf); }
+  inline char* _Stl_fcvtR(double x, int n, int* pt, int* sign, char* buf)
+    { return fconvert(x, n, pt, sign, buf); }
+#  ifndef _STLP_NO_LONG_DOUBLE
+  inline char* _Stl_qecvtR(long double x, int n, int* pt, int* sign, char* buf)
+    { return qeconvert(&x, n, pt, sign, buf); }
+  inline char* _Stl_qfcvtR(long double x, int n, int* pt, int* sign, char* buf)
+    { return qfconvert(&x, n, pt, sign, buf); }
+#  endif
+#elif defined (__DECCXX) 
+  inline char* _Stl_ecvtR(double x, int n, int* pt, int* sign, char* buf)
+    { return (ecvt_r(x, n, pt, sign, buf, NDIG)==0 ? buf : 0); }
+  inline char* _Stl_fcvtR(double x, int n, int* pt, int* sign, char* buf)
+    { return (fcvt_r(x, n, pt, sign, buf, NDIG)==0 ? buf : 0); }
+#  ifndef _STLP_NO_LONG_DOUBLE
+// fbp : no "long double" conversions !
+  inline char* _Stl_qecvtR(long double x, int n, int* pt, int* sign, char* buf)
+    { return (ecvt_r((double)x, n, pt, sign, buf, NDIG)==0 ? buf : 0) ; }
+  inline char* _Stl_qfcvtR(long double x, int n, int* pt, int* sign, char* buf)
+    { return (fcvt_r((double)x, n, pt, sign, buf, NDIG)==0 ? buf : 0); }
+#  endif
+#elif defined (__hpux)
+   inline char* _Stl_ecvtR(double x, int n, int* pt, int* sign, char* buf)
+     { return ecvt(x, n, pt, sign); }
+   inline char* _Stl_fcvtR(double x, int n, int* pt, int* sign, char* buf)
+     { return fcvt(x, n, pt, sign); }
+# ifndef _STLP_NO_LONG_DOUBLE
+
+#  if defined( _REENTRANT ) && (defined(_PTHREADS_DRAFT4) || defined(PTHREAD_THREADS_MAX))
+   inline char* _Stl_qecvtR(long double x, int n, int* pt, int* sign, char* buf)
+     { return (_ldecvt_r(*(long_double*)&x, n, pt, sign, buf, NDIG+2)==0 ? buf : 0); }
+   inline char* _Stl_qfcvtR(long double x, int n, int* pt, int* sign, char* buf)
+     { return (_ldfcvt_r(*(long_double*)&x, n, pt, sign, buf, NDIG+2)==0 ? buf : 0); }
+#  else
+   inline char* _Stl_qecvtR(long double x, int n, int* pt, int* sign, char* buf)
+     { return _ldecvt(*(long_double*)&x, n, pt, sign); }
+   inline char* _Stl_qfcvtR(long double x, int n, int* pt, int* sign, char* buf)
+     { return _ldfcvt(*(long_double*)&x, n, pt, sign); }
+#  endif
+# endif
+#elif defined (_AIX)
+  inline char* _Stl_ecvtR(double x, int n, int* pt, int* sign, char* buf)
+    { LOCK_CVT RETURN_CVT(ecvt, x, n, pt, sign, buf) }
+  inline char* _Stl_fcvtR(double x, int n, int* pt, int* sign, char* buf)
+    { LOCK_CVT RETURN_CVT(fcvt, x, n, pt, sign, buf) }
+# ifndef _STLP_NO_LONG_DOUBLE
+  inline char* _Stl_qecvtR(long double x, int n, int* pt, int* sign, char* buf)
+    { LOCK_CVT RETURN_CVT(ecvt, x, n, pt, sign, buf) }
+  inline char* _Stl_qfcvtR(long double x, int n, int* pt, int* sign, char* buf)
+    { LOCK_CVT RETURN_CVT(fcvt, x, n, pt, sign, buf) }
+# endif
+#elif defined (__unix)  && !defined(__FreeBSD__)  && !defined(__NetBSD__) && !defined(__APPLE__) && !defined(_CRAY)
+  inline char* _Stl_ecvtR(double x, int n, int* pt, int* sign, char* buf)
+    { return ecvt_r(x, n, pt, sign, buf); }
+  inline char* _Stl_fcvtR(double x, int n, int* pt, int* sign, char* buf)
+    { return fcvt_r(x, n, pt, sign, buf); }
+# ifndef _STLP_NO_LONG_DOUBLE
+  inline char* _Stl_qecvtR(long double x, int n, int* pt, int* sign, char* buf)
+    { return qecvt_r(x, n, pt, sign, buf); }
+  inline char* _Stl_qfcvtR(long double x, int n, int* pt, int* sign, char* buf)
+    { return qfcvt_r(x, n, pt, sign, buf); }
+#  endif
+#elif defined (_MSC_VER) || defined (__MINGW32__) || defined (__BORLANDC__)
+// those guys claim _cvt functions being reentrant.
+inline char* _Stl_ecvtR(double x, int n, int* pt, int* sign, char* buf) {  return _ecvt(x, n, pt, sign); }
+inline char* _Stl_fcvtR(double x, int n, int* pt, int* sign, char* buf) { return _fcvt(x, n, pt, sign); }
+# ifndef _STLP_NO_LONG_DOUBLE
+inline char* _Stl_qecvtR(long double x, int n, int* pt, int* sign, char* buf) { return _ecvt((double)x, n, pt, sign); }
+inline char* _Stl_qfcvtR(long double x, int n, int* pt, int* sign, char* buf) { return _fcvt((double)x, n, pt, sign); }
+# endif
+#elif defined (__ISCPP__)
+inline char* _Stl_ecvtR(double x, int n, int* pt, int* sign, char* buf)
+{ return _fp_ecvt( x, n, pt, sign, buf); }
+
+inline char* _Stl_fcvtR(double x, int n, int* pt, int* sign, char* buf)
+{ return _fp_fcvt(x, n, pt, sign, buf); }
+
+# ifndef _STLP_NO_LONG_DOUBLE
+inline char* _Stl_qecvtR(long double x, int n, int* pt, int* sign, char* buf)
+{ return _fp_ecvt( x, n, pt, sign, buf); }
+
+inline char* _Stl_qfcvtR(long double x, int n, int* pt, int* sign, char* buf)
+{ return _fp_fcvt(x, n, pt, sign, buf); }
+# endif
+#elif defined (__MRC__) || defined(__SC__) || defined(_CRAY)
+inline char* _Stl_ecvtR(double x, int n, int* pt, int* sign, char* )
+{ return ecvt( x, n, pt, sign ); }
+inline char* _Stl_fcvtR(double x, int n, int* pt, int* sign, char* )
+{ return fcvt(x, n, pt, sign); }
+#ifndef _STLP_NO_LONG_DOUBLE
+inline char* _Stl_qecvtR(long double x, int n, int* pt, int* sign, char* )
+{ return ecvt( x, n, pt, sign ); }
+inline char* _Stl_qfcvtR(long double x, int n, int* pt, int* sign, char* )
+{ return fcvt(x, n, pt, sign); }
+#endif
+#endif
+
+
+//----------------------------------------------------------------------
+// num_put
+
+// Helper functions for _M_do_put_float
+
+// __format_float formats a mantissa and exponent as returned by
+// one of the conversion functions (ecvt_r, fcvt_r, qecvt_r, qfcvt_r)
+// according to the specified precision and format flags.  This is
+// based on doprnt but is much simpler since it is concerned only
+// with floating point input and does not consider all formats.  It
+// also does not deal with blank padding, which is handled by
+// __copy_float_and_fill. 
+
+void __format_float_scientific(char * buf, const char * bp, 
+			       int decpt, int sign, bool is_zero,
+			       ios_base::fmtflags flags,
+			       int precision, bool /* islong */)
+{
+  char * suffix;
+  char expbuf[MAXESIZ + 2];
+  // sign if required
+  if (sign)
+    *buf++ = '-';
+  else if (flags & ios_base::showpos)
+    *buf++ = '+';
+  
+  // first digit of mantissa
+  *buf++ = *bp++;
+
+  // decimal point if required
+  if (precision != 0 || flags & ios_base::showpoint)
+    *buf++ = '.';
+  // rest of mantissa
+  int rz = precision;
+  while (rz-- > 0 && *bp != 0)
+    *buf++ = *bp++;
+
+  // exponent
+  *(suffix = &expbuf[MAXESIZ]) = 0;
+  if (!is_zero) {
+    int nn = decpt - 1;
+    if (nn < 0)
+      nn = -nn;
+    for (; nn > 9; nn /= 10)
+      *--suffix = (char) todigit(nn % 10);
+    *--suffix = (char) todigit(nn);
+  }
+  	
+  // prepend leading zeros to exponent
+  while (suffix > &expbuf[MAXESIZ - 2])
+    *--suffix = '0';
+  
+  // put in the exponent sign
+  *--suffix = (char) ((decpt > 0 || is_zero ) ? '+' : '-');
+  
+  // put in the e
+  *--suffix = flags & ios_base::uppercase ? 'E' : 'e';
+
+  // copy the suffix
+  strcpy(buf, suffix);
+}
+
+static inline 
+void __flush_static_buf(string &buf, 
+                        char *sbeginbuf, char *sendbuf, char *&scurpos) {
+  if (scurpos == sendbuf) {
+    buf.append(sbeginbuf, sendbuf);
+    scurpos = sbeginbuf;
+  }
+}
+  
+void __format_float_fixed(string &buf, const char * bp,
+			  int decpt, int sign, bool /* x */,
+			  ios_base::fmtflags flags,
+			  int precision, bool islong )
+{
+  char static_buf[128];
+  char *sbuf = static_buf;
+  char *sendbuf = static_buf + sizeof(static_buf);
+
+  if (sign && decpt > -precision && *bp != 0)
+    *sbuf++ = '-';
+  else if (flags & ios_base::showpos)
+    *sbuf++ = '+';
+  
+  int rzero   = 0;
+  int nn      = decpt;
+  int k       = 0;
+  int maxfsig = islong ? 2*MAXFSIG : MAXFSIG;
+
+  do {
+    *sbuf++ = (char) ((nn <= 0 || *bp == 0 || k >= maxfsig) ?
+      '0' : (k++, *bp++));
+    __flush_static_buf(buf, static_buf, sendbuf, sbuf);
+  } while (--nn > 0);
+
+  // decimal point if needed
+  if (flags & ios_base::showpoint || precision > 0) {
+    *sbuf++ = '.';
+    __flush_static_buf(buf, static_buf, sendbuf, sbuf);
+  }
+
+  // digits after decimal point if any
+  nn = (min) (precision, MAXFCVT);
+  if (precision > nn)
+    rzero = precision - nn;
+  while (--nn >= 0) {
+    *sbuf++ = (++decpt <= 0 || *bp == '\0' || k >= maxfsig)
+      		? '0' : (k++, *bp++);
+    __flush_static_buf(buf, static_buf, sendbuf, sbuf);
+  }
+
+  // trailing zeros if needed
+  while (rzero-- > 0) {
+    *sbuf++ = '0';
+    __flush_static_buf(buf, static_buf, sendbuf, sbuf);
+  }
+  buf.append(static_buf, sbuf);
+}
+
+
+void __format_nan_or_inf(char * buf, double x,
+			 ios_base::fmtflags flags)
+{
+  static const char* inf[2] = { "inf", "Inf" };
+  static const char* nan[2] = { "nan", "NaN" };
+  const char** inf_or_nan = 0;
+  if (_Stl_is_inf((double)x)) {            // Infinity
+    inf_or_nan = inf;
+    if (_Stl_is_neg_inf((double)x))
+      *buf++ = '-';
+    else if (flags & ios_base::showpos)
+      *buf++ = '+';
+  }
+  else {                      // NaN
+    inf_or_nan = nan;
+    if (_Stl_is_neg_nan((double)x))
+      *buf++ = '-';
+    else if (flags & ios_base::showpos)
+      *buf++ = '+';
+  }
+  strcpy(buf, flags & ios_base::uppercase ? inf_or_nan[1] : inf_or_nan[0]);  
+}
+
+template <class max_double_type>
+static inline 
+void __format_float(string &buf, const char * bp,
+                    int decpt, int sign, max_double_type x,
+                    ios_base::fmtflags flags,
+                    int precision, bool islong)
+{
+  char static_buf[128];
+  // Output of infinities and NANs does not depend on the format flags
+  if (_Stl_is_nan_or_inf((double)x)) {       // Infinity or NaN
+    __format_nan_or_inf(static_buf, x, flags);
+    buf = static_buf;
+  } 
+  else {                        // representable number
+    switch (flags & ios_base::floatfield) {
+    case ios_base::scientific:
+      __format_float_scientific(static_buf, bp, decpt, sign, x == 0.0, flags,
+                                precision, islong);
+      buf = static_buf;
+      break;
+      
+    case ios_base::fixed:
+      __format_float_fixed(buf, bp, decpt, sign, true, flags,
+                           precision, islong);
+      break;
+      
+    default: // g format
+      // establish default precision
+      if (flags & ios_base::showpoint || precision > 0) {
+        if (precision == 0) precision = 1;
+      }
+      else
+        precision = 6;
+      
+      // reset exponent if value is zero
+      if (x == 0)
+        decpt = 1;
+      
+      int kk = precision;
+      if (!(flags & ios_base::showpoint)) {
+        size_t n = strlen(bp);
+        if (n < kk)
+          kk = (int)n;
+        while (kk >= 1 && bp[kk-1] == '0')
+          --kk;
+      }
+      
+      if (decpt < -3 || decpt > precision) {
+        precision = kk - 1;
+        __format_float_scientific(static_buf, bp, decpt, sign, x == 0,
+                                  flags, precision, islong);
+        buf = static_buf;
+      }
+      else {
+        precision = kk - decpt;
+        __format_float_fixed(buf, bp, decpt, sign, true,
+                             flags, precision, islong);
+      }
+      break;
+    } /* switch */
+  } /* else */
+}
+
+# else
+// Creates a format string for sprintf()
+static int fill_fmtbuf(char* fmtbuf, ios_base::fmtflags flags, char long_modifier)
+{
+  fmtbuf[0] = '%';
+  int i = 1;
+
+  if (flags & ios_base::showpos)
+    fmtbuf[i++] = '+';
+
+  if (flags & ios_base::showpoint)
+    fmtbuf[i++] = '#';
+
+  fmtbuf[i++] = '.';
+  fmtbuf[i++] = '*';
+  
+  if (long_modifier)
+    fmtbuf[i++] = long_modifier;
+
+  switch (flags & ios_base::floatfield)
+    {
+    case ios_base::scientific:
+      fmtbuf[i++] = (flags & ios_base::uppercase) ?  'E' : 'e';      
+      break;
+    case ios_base::fixed:
+#if defined (__FreeBSD__)
+      fmtbuf[i++] = 'f';
+#else
+      fmtbuf[i++] = (flags & ios_base::uppercase) ? 'F' : 'f'; 
+#endif
+      break;
+    default:
+      fmtbuf[i++] = (flags & ios_base::uppercase) ?  'G' : 'g';      
+      break;
+    }
+
+  fmtbuf[i] = 0;
+  return i;
+}
+# endif  /* USE_SPRINTF_INSTEAD */
+
+
+void  _STLP_CALL
+__write_float(string &buf, ios_base::fmtflags flags, int precision,
+              double x)
+{
+# ifdef USE_SPRINTF_INSTEAD
+  char static_buf[128];
+  char fmtbuf[32];
+  fill_fmtbuf(fmtbuf, flags, 0);
+  sprintf(static_buf, fmtbuf, precision, x);    
+  // we should be able to return static_buf + sprintf(), but we do not trust'em...
+  buf = static_buf;
+# else
+  char cvtbuf[NDIG+2];
+  char * bp;
+  int decpt, sign;
+
+  switch (flags & ios_base::floatfield) {
+  case ios_base::fixed:
+    bp = _Stl_fcvtR(x, (min) (precision, MAXFCVT), &decpt, &sign, cvtbuf);
+    break;
+  case ios_base::scientific :
+    bp = _Stl_ecvtR(x, (min) (precision + 1, MAXECVT), &decpt, &sign, cvtbuf);
+    break;
+  default :
+    bp = _Stl_ecvtR(x, (min) (precision, MAXECVT), &decpt, &sign, cvtbuf);
+    break;
+  }
+  __format_float(buf, bp, decpt, sign, x, flags, precision, false);
+# endif
+
+}
+
+# ifndef _STLP_NO_LONG_DOUBLE
+void _STLP_CALL
+__write_float(string &buf, ios_base::fmtflags flags, int precision,
+              long double x)
+{
+# ifdef USE_SPRINTF_INSTEAD
+  char static_buf[128];
+  char fmtbuf[64];
+  int i = fill_fmtbuf(fmtbuf, flags, 'L');
+  sprintf(static_buf, fmtbuf, precision, x);    
+  // we should be able to return buf + sprintf(), but we do not trust'em...
+  buf = static_buf;
+# else
+  char cvtbuf[NDIG+2];
+  char * bp;
+  int decpt, sign;
+
+  switch (flags & ios_base::floatfield) {
+  case ios_base::fixed:
+    bp = _Stl_qfcvtR(x, (min) (precision, MAXFCVT), &decpt, &sign, cvtbuf);
+    break;
+  case ios_base::scientific :
+    bp = _Stl_qecvtR(x, (min) (precision + 1, MAXECVT),     &decpt, &sign, cvtbuf);
+    break;
+  default :
+    bp = _Stl_qecvtR(x, (min) (precision, MAXECVT), &decpt, &sign, cvtbuf);
+    break;
+  }
+  __format_float(buf, bp, decpt, sign, x, flags, precision, true);
+# endif
+}
+# endif
+
+
+# ifndef _STLP_NO_WCHAR_T
+
+wchar_t* _STLP_CALL
+__convert_float_buffer(const char* first, const char* last, wchar_t* out,
+                       const ctype<wchar_t>& ct, wchar_t dot)
+{
+  ct.widen(first, last, out);
+  if (ct.widen('.') != dot)
+    replace(out, out + (last - first), ct.widen('.'), dot);
+  return out + (last - first);
+}
+
+# endif
+
+void _STLP_CALL
+__adjust_float_buffer(char* first, char* last, char dot)
+{
+  if ('.' != dot)
+    replace(first, last, '.', dot);
+}
+
+_STLP_END_NAMESPACE
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/src/numpunct.cpp b/main/source/stlport/src/numpunct.cpp
new file mode 100644
index 00000000..e38c78cf
--- /dev/null
+++ b/main/source/stlport/src/numpunct.cpp
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+# include "stlport_prefix.h"
+# include <stl/_numpunct.h>
+
+_STLP_BEGIN_NAMESPACE
+
+//----------------------------------------------------------------------
+// numpunct<char>
+char   numpunct<char>::do_decimal_point() const {return '.';}
+char   numpunct<char>::do_thousands_sep() const { return ','; }
+string numpunct<char>::do_grouping()  const { return string();}
+string numpunct<char>::do_truename()  const { return _M_truename;}
+string numpunct<char>::do_falsename() const { return _M_falsename; }
+numpunct<char>::~numpunct() {}
+
+_STLP_STATIC_MEMBER_DECLSPEC  string numpunct<char>::_M_truename("true");
+_STLP_STATIC_MEMBER_DECLSPEC  string  numpunct<char>::_M_falsename("false");
+_STLP_STATIC_MEMBER_DECLSPEC  string numpunct<char>::_M_grouping("");
+
+# ifndef _STLP_NO_WCHAR_T
+
+numpunct<wchar_t>::~numpunct() {}
+
+wchar_t numpunct<wchar_t>::do_decimal_point() const { return L'.'; }
+
+wchar_t numpunct<wchar_t>::do_thousands_sep() const
+{
+  return L',';
+}
+
+string numpunct<wchar_t>::do_grouping() const
+{
+  return string();
+}
+
+
+wstring numpunct<wchar_t>::do_truename() const
+{
+  return _M_truename;
+}
+ 
+wstring numpunct<wchar_t>::do_falsename() const
+{
+  return _M_falsename;
+} 
+
+_STLP_STATIC_MEMBER_DECLSPEC  wstring numpunct<wchar_t>::_M_truename(L"true");
+_STLP_STATIC_MEMBER_DECLSPEC  wstring numpunct<wchar_t>::_M_falsename(L"false");
+_STLP_STATIC_MEMBER_DECLSPEC  string numpunct<wchar_t>::_M_grouping("");
+# endif
+
+_STLP_END_NAMESPACE
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/src/ostream.cpp b/main/source/stlport/src/ostream.cpp
new file mode 100644
index 00000000..0ef31fb5
--- /dev/null
+++ b/main/source/stlport/src/ostream.cpp
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+# include "stlport_prefix.h"
+#include <stl/_ostream.h>
+
+_STLP_BEGIN_NAMESPACE
+
+#if !defined(_STLP_NO_FORCE_INSTANTIATE)
+
+// instantiations
+template  class _STLP_CLASS_DECLSPEC basic_ostream<char, char_traits<char> >;
+
+template _STLP_DECLSPEC basic_ostream<char, char_traits<char> >&  _STLP_CALL 
+_M_put_num(basic_ostream<char, char_traits<char> >&, long);
+template _STLP_DECLSPEC basic_ostream<char, char_traits<char> >&   _STLP_CALL 
+_M_put_num(basic_ostream<char, char_traits<char> >&, unsigned long);
+#  if defined (_STLP_LONG_LONG)
+template _STLP_DECLSPEC basic_ostream<char, char_traits<char> >&  _STLP_CALL
+_M_put_num(basic_ostream<char, char_traits<char> >&, unsigned _STLP_LONG_LONG);
+template _STLP_DECLSPEC basic_ostream<char, char_traits<char> >& _STLP_CALL
+_M_put_num(basic_ostream<char, char_traits<char> >&, _STLP_LONG_LONG);
+#  endif
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+template  class _STLP_CLASS_DECLSPEC _Osentry<char, char_traits<char> >;
+# endif
+
+#ifndef _STLP_NO_WCHAR_T
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+template class _STLP_CLASS_DECLSPEC _Osentry<wchar_t, char_traits<wchar_t> >;
+# endif
+template class _STLP_CLASS_DECLSPEC basic_ostream<wchar_t, char_traits<wchar_t> >;
+#endif
+
+#endif
+
+_STLP_END_NAMESPACE
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/src/sgi_mipspro.mak b/main/source/stlport/src/sgi_mipspro.mak
new file mode 100644
index 00000000..14e0273d
--- /dev/null
+++ b/main/source/stlport/src/sgi_mipspro.mak
@@ -0,0 +1,70 @@
+#
+# Basename for libraries
+#
+.POSIX:
+
+SHELL=/bin/sh
+
+LIB_BASENAME = libstlport_mipspro
+
+STL_INCL= -I. -I${PWD}/../stlport/
+CUR_DIR=./
+
+CC = CC
+CXX = CC
+
+#
+# guts for common stuff
+#
+#
+LINK=$(CC) -ar -all -o
+DYN_LINK=$(CC) -shared -all -o
+
+OBJEXT=o
+DYNEXT=so
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=MIPS
+INSTALL_STEP = install_unix 
+
+all: msg all_dynamic all_static symbolic_links 
+
+msg:
+	@echo "*** ATTENTION! ***"
+	@echo "This makefile requires GNU make!"
+	@echo "******************"
+
+include common_macros.mak
+
+CXXFLAGS_COMMON = -J 4 -ansi -LANG:std -I. -D_PTHREADS ${STL_INCL} 
+
+DEBUG_FLAGS = -g +w2 -D_STLP_DEBUG
+RELEASE_FLAGS = -O2
+
+
+# install: $(TARGETS)
+#	cp -p $(TARGETS) ${INSTALLDIR}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${RELEASE_FLAGS}
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${RELEASE_FLAGS} $(SHCXXFLAGS)
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_COMMON) -O -g -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -D_STLP_DEBUG
+
+LDFLAGS_RELEASE_static = ${CXXFLAGS_RELEASE_static}
+LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic}
+
+LDFLAGS_DEBUG_static = ${CXXFLAGS_DEBUG_static}
+LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic}
+
+LDFLAGS_STLDEBUG_static = ${CXXFLAGS_STLDEBUG_static}
+LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic}
+
+include common_percent_rules.mak
+include common_rules.mak
+
diff --git a/main/source/stlport/src/sparc_atomic.s b/main/source/stlport/src/sparc_atomic.s
new file mode 100644
index 00000000..92168ae3
--- /dev/null
+++ b/main/source/stlport/src/sparc_atomic.s
@@ -0,0 +1,68 @@
+        .section        ".text",#alloc,#execinstr
+	        .align 8
+	        .skip 16
+
+
+	/*
+	**  int _STLP_atomic_exchange (void *pvalue, int value)
+	*/
+
+	        .type   _STLP_atomic_exchange,#function
+	        .global _STLP_atomic_exchange
+	        .align  8
+
+_STLP_atomic_exchange:
+0:
+	        ld      [%o0], %o2              ! Set the current value
+	        mov     %o1, %o3                ! Set the new value
+!	        swap     [%o0], %o3             ! Do the compare and swap
+	        cas     [%o0], %o2, %o3 
+	        cmp     %o2, %o3                ! Check whether successful
+	        bne     0b                      ! Retry upon failure
+	        stbar
+	        mov     %o2, %o0                ! Set the new value
+	        retl                            ! return
+	        nop
+	        .size   _STLP_atomic_exchange,(.-_STLP_atomic_exchange)
+
+	/* int _STLP_atomic_increment (void *pvalue) */
+
+	        .type   _STLP_atomic_increment,#function
+	        .global _STLP_atomic_increment
+	        .align  8
+_STLP_atomic_increment:
+1:
+	        ld      [%o0], %o2              ! set the current
+	        add             %o2, 0x1, %o3                   ! Increment and store current
+!	        swap     [%o0], %o3         ! Do the compare and swap
+	        cas     [%o0], %o2, %o3 
+	        cmp     %o3, %o2                ! Check whether successful
+	        bne     1b                                         ! Retry if we failed.
+	        membar  #LoadLoad | #LoadStore  ! Ensure the cas finishes before
+	                                        ! returning
+	        nop
+	        retl                            ! return
+	        nop
+
+	        .size   _STLP_atomic_increment,(.-_STLP_atomic_increment)
+
+
+	/* int _STLP_atomic_decrement (void *pvalue) */
+	        .type   _STLP_atomic_decrement,#function
+	        .global _STLP_atomic_decrement
+	        .align  8
+
+_STLP_atomic_decrement:
+2:
+	        ld      [%o0], %o2              ! set the current
+	        sub     %o2, 0x1, %o3                   ! decrement and store current
+!	        swap    [%o0], %o3         ! Do the compare and swap
+	        cas     [%o0], %o2, %o3 
+	        cmp     %o3, %o2                ! Check whether successful
+	        bne     2b                                         ! Retry if we failed.
+	        membar  #LoadLoad | #LoadStore  ! Ensure the cas finishes before
+	        nop
+	                                        ! returning
+	        retl                            ! return
+	        nop
+	        .size   _STLP_atomic_decrement,(.-_STLP_atomic_decrement)
diff --git a/main/source/stlport/src/sparc_atomic64.s b/main/source/stlport/src/sparc_atomic64.s
new file mode 100644
index 00000000..51829b9f
--- /dev/null
+++ b/main/source/stlport/src/sparc_atomic64.s
@@ -0,0 +1,65 @@
+        .section        ".text",#alloc,#execinstr
+        .align 8
+        .skip 16
+
+!  int _STLP_atomic_exchange (void *pvalue, int value)
+!
+
+        .type   _STLP_atomic_exchange,#function
+        .global _STLP_atomic_exchange
+        .align  8
+
+_STLP_atomic_exchange:
+1:	
+	ldx      [%o0], %o2              ! Set the current value
+        mov      %o1, %o3                ! Set the new value
+        casx     [%o0], %o2, %o3         ! Do the compare and swap
+        cmp      %o2, %o3                ! Check whether successful
+        bne      1b                  ! Retry upon failure
+        membar  #LoadLoad | #LoadStore  ! Ensure the cas finishes before
+                                        ! returning
+        retl                            ! return
+        mov     %o2, %o0                                ! Set the new value
+        .size   _STLP_atomic_exchange,(.-_STLP_atomic_exchange)
+
+	
+! int _STLP_atomic_increment (void *pvalue)
+
+        .type   _STLP_atomic_increment,#function
+        .global _STLP_atomic_increment
+        .align  8
+_STLP_atomic_increment:
+0:	
+        ldx      [%o0], %o2              ! set the current
+        addx     %o2, 0x1, %o3                   ! Increment and store current
+        casx     [%o0], %o2, %o3         ! Do the compare and swap
+        cmp     %o3, %o2                ! Check whether successful
+        bne     0b
+        membar  #LoadLoad | #LoadStore  ! Ensure the cas finishes before
+                                        ! returning
+        retl                            ! return
+        mov    %o1, %o0                                 ! Set the return value
+
+        .size   _STLP_atomic_increment,(.-_STLP_atomic_increment)
+
+	
+!        /* int _STLP_atomic_decrement (void *pvalue) */
+        .type   _STLP_atomic_decrement,#function
+        .global _STLP_atomic_decrement
+        .align  8
+
+_STLP_atomic_decrement:
+0:	
+        ldx      [%o0], %o2              ! set the current
+        subx             %o2, 0x1, %o3                   ! decrement and store current
+        casx     [%o0], %o2, %o3         ! Do the compare and swap
+        cmp     %o3, %o2                ! Check whether successful
+        bne     0b
+        membar  #LoadLoad | #LoadStore  ! Ensure the cas finishes before
+                                        ! returning
+        retl                            ! return
+	nop
+        .size   _STLP_atomic_decrement,(.-_STLP_atomic_decrement)
+
+	
+
diff --git a/main/source/stlport/src/sstream.cpp b/main/source/stlport/src/sstream.cpp
new file mode 100644
index 00000000..ee461495
--- /dev/null
+++ b/main/source/stlport/src/sstream.cpp
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+# include "stlport_prefix.h"
+#include <stl/_sstream.h>
+
+_STLP_BEGIN_NAMESPACE
+
+# ifndef _STLP_NO_FORCE_INSTANTIATE
+
+// Force instantiation of stringstream classes.
+template class _STLP_CLASS_DECLSPEC basic_stringbuf<char, char_traits<char>, allocator<char> >;
+template class _STLP_CLASS_DECLSPEC basic_ostringstream<char, char_traits<char>, allocator<char> >;
+template class _STLP_CLASS_DECLSPEC basic_istringstream<char, char_traits<char>, allocator<char> >;
+template class _STLP_CLASS_DECLSPEC basic_stringstream<char, char_traits<char>, allocator<char> >;
+
+#ifndef _STLP_NO_WCHAR_T
+template class _STLP_CLASS_DECLSPEC basic_stringbuf<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >;
+template class _STLP_CLASS_DECLSPEC basic_ostringstream<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >;
+template class _STLP_CLASS_DECLSPEC basic_istringstream<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >;
+template class _STLP_CLASS_DECLSPEC basic_stringstream<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >;
+#endif /* INSTANTIATE_WIDE_STREAMS */
+
+# endif
+
+_STLP_END_NAMESPACE
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/src/stdio_streambuf.cpp b/main/source/stlport/src/stdio_streambuf.cpp
new file mode 100644
index 00000000..f8e3a471
--- /dev/null
+++ b/main/source/stlport/src/stdio_streambuf.cpp
@@ -0,0 +1,239 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+# include "stlport_prefix.h"
+#include <stdio_streambuf>
+
+#ifdef _STLP_UNIX
+#include <sys/types.h>
+#include <sys/stat.h>
+#endif /* __unix */
+
+#include <stl/_fstream.h>
+#include "fstream_impl.h"
+
+# if defined (_STLP_USE_WIN32_IO) && !defined(_STLP_WINCE)
+# if defined (__BORLANDC__)
+// #  include <cio.h>
+#  include <cfcntl.h>
+# else
+#  include <io.h>
+#  include <fcntl.h>
+# endif
+
+#  include <sys/stat.h>
+# endif
+
+__SGI_BEGIN_NAMESPACE
+//----------------------------------------------------------------------
+// Class stdio_streambuf_base
+
+stdio_streambuf_base::stdio_streambuf_base(FILE* file)
+  : _STLP_STD::basic_streambuf<char, _STLP_STD::char_traits<char> >(file, 0),
+    _M_file(file)
+{}
+
+stdio_streambuf_base::~stdio_streambuf_base()
+{
+  _STLP_VENDOR_CSTD::fflush(_M_file);
+}
+
+_STLP_STD::streambuf* stdio_streambuf_base::setbuf(char* s, streamsize n)
+{
+  _STLP_VENDOR_CSTD::setvbuf(_M_file, s, (s == 0 && n == 0) ? _IONBF : _IOFBF, n);
+  return this;
+}
+
+stdio_streambuf_base::pos_type
+stdio_streambuf_base::seekoff(off_type off, ios_base::seekdir dir,
+                              ios_base::openmode /* mode */)
+{
+  int whence;
+  switch(dir) {
+  case ios_base::beg:
+    whence = SEEK_SET;
+    break;
+  case ios_base::cur:
+    whence = SEEK_CUR;
+    break;
+  case ios_base::end:
+    whence = SEEK_END;
+    break;
+  default:
+    return pos_type(-1);
+  }
+      
+  if (_STLP_VENDOR_CSTD::fseek(_M_file, off, whence) == 0) {
+    fpos_t pos;
+    _STLP_VENDOR_CSTD::fgetpos(_M_file, &pos);
+    // added 21 june 00 mdb,rjf,wjs: glibc 2.2 changed fpos_t to be a struct instead
+    // of a primitive type
+#if (defined(__GLIBC__) && ( (__GLIBC__ > 2) || ( (__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 2) ) ) )
+    return pos_type((streamoff)pos.__pos);
+#elif defined(__ISCPP__) || defined(__MVS__) || (__OS400__)
+     return pos_type(pos.__fpos_elem[ 0 ]);
+#elif defined (__EMX__)
+     return pos_type((streamoff)pos._pos);
+#else
+    return pos_type(pos);
+#endif
+  }
+  else
+    return pos_type(-1);
+}
+
+
+stdio_streambuf_base::pos_type
+stdio_streambuf_base::seekpos(pos_type pos, ios_base::openmode /* mode */)   // dwa 4/27/00 - suppress unused parameter warning
+{
+
+  // added 21 june 00 mdb,rjf,wjs: glibc 2.2 changed fpos_t to be a struct instead
+  // of a primitive type
+#if (defined(__GLIBC__) && ( (__GLIBC__ > 2) || ( (__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 2) ) ) )
+  fpos_t p;
+  p.__pos = pos;
+  memset( &(p.__state), 0, sizeof(p.__state) );
+#elif defined(__MVS__) || (__OS400__)
+  fpos_t p;
+  p.__fpos_elem[0] = pos;
+#elif defined(__EMX__)
+  fpos_t p;
+  p._pos = pos;
+  memset( &(p._mbstate), 0, sizeof(p._mbstate) );
+#else
+  fpos_t p(pos);
+#endif
+
+  if (_STLP_VENDOR_CSTD::fsetpos(_M_file, &p) == 0)
+    return pos;
+  else
+    return pos_type(-1);
+}
+
+int stdio_streambuf_base::sync()
+{
+  return _STLP_VENDOR_CSTD::fflush(_M_file) == 0 ? 0 : -1;
+}
+
+//----------------------------------------------------------------------
+// Class stdio_istreambuf
+
+stdio_istreambuf::~stdio_istreambuf() {}
+
+streamsize stdio_istreambuf::showmanyc()
+{
+  if (feof(_M_file)) 
+    return -1;
+  else {
+    int fd = _FILE_fd(_M_file);
+# ifdef _STLP_USE_WIN32_IO
+    // in this case, __file_size works with Win32 fh , not libc one
+    streamoff size;
+    struct stat buf;
+# ifdef __BORLANDC__
+    if(fstat(fd, &buf) == 0 && S_ISREG( buf.st_mode ) )
+# else
+    if(fstat(fd, &buf) == 0 && ( _S_IFREG & buf.st_mode ) )
+# endif
+      size = ( buf.st_size > 0  ? buf.st_size : 0);
+    else
+      size = 0;
+# else
+    streamoff size = _SgI::__file_size(fd);
+# endif
+    // fbp : we can use ftell as this flavour always use stdio.
+    long pos = _STLP_VENDOR_CSTD::ftell(_M_file);
+    return pos >= 0 && size > pos ? size - pos : 0;
+  }
+}
+
+stdio_istreambuf::int_type stdio_istreambuf::underflow()
+{
+  int c = getc(_M_file);
+  if (c != EOF) {
+    _STLP_VENDOR_CSTD::ungetc(c, _M_file);
+    return c;
+  }
+  else
+    return traits_type::eof();
+}
+
+stdio_istreambuf::int_type stdio_istreambuf::uflow()
+{
+  int c = getc(_M_file);
+  return c != EOF ? c : traits_type::eof();
+}
+
+stdio_istreambuf::int_type stdio_istreambuf::pbackfail(int_type c)
+{
+  if (c != traits_type::eof()) {
+    int result = _STLP_VENDOR_CSTD::ungetc(c, _M_file);
+    return result != EOF ? result : traits_type::eof();
+  }
+  else{
+    if (this->eback() < this->gptr()) {
+      this->gbump(-1);
+      return traits_type::not_eof(c);
+    }
+    else
+      return traits_type::eof();
+  }
+}
+
+//----------------------------------------------------------------------
+// Class stdio_ostreambuf
+
+stdio_ostreambuf::~stdio_ostreambuf() {}
+
+streamsize stdio_ostreambuf::showmanyc()
+{
+  return -1;
+}
+
+stdio_ostreambuf::int_type stdio_ostreambuf::overflow(int_type c)
+{
+  // Write the existing buffer, without writing any additional character.
+  if (c == traits_type::eof()) {
+    // Do we have a buffer to write?
+    ptrdiff_t unwritten = this->pptr() - this->pbase();
+    if (unwritten != 0) {
+      _STLP_VENDOR_CSTD::fflush(_M_file);
+      // Test if the write succeeded.
+      if (this->pptr() - this->pbase() < unwritten)
+        return traits_type::not_eof(c);
+      else
+        return traits_type::eof();
+    }
+
+    // We always succeed if we don't have to do anything.
+    else
+      return traits_type::not_eof(c);
+  }
+
+  // Write the character c, and whatever else might be in the buffer.
+  else {
+    int result = putc(c, _M_file);
+    return result != EOF ? result : traits_type::eof();
+  }
+}
+
+__SGI_END_NAMESPACE
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/src/stlport.rc b/main/source/stlport/src/stlport.rc
new file mode 100644
index 00000000..f90d03c9
--- /dev/null
+++ b/main/source/stlport/src/stlport.rc
@@ -0,0 +1,56 @@
+///////////////////////////
+//
+// Version
+//
+
+#include <windows.h>
+
+#define VER_MAJOR 4
+#define VER_MINOR 6
+#define VER_YEAR  2003
+#define VER_MMDD  1031
+
+#define VERSION_STRING2(x) #x "\0"
+#define VERSION_STRING(x) VERSION_STRING2(x)
+#define VERSION_ID VER_MAJOR, VER_MINOR, VER_YEAR, VER_MMDD
+#define VERSION_STR VERSION_STRING(VER_MAJOR.VER_MINOR.VER_YEAR.VER_MMDD)
+
+#define VERSION_STRING1(x) #x
+#define DLLNAME_STRING2(compstr,buildstr) \
+"STLPORT_" VERSION_STRING1(compstr) VERSION_STRING1(buildstr) "_\0" VERSION_STRING1(VER_MAJOR) VERSION_STRING1(VER_MINOR) ".DLL\0"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION VERSION_ID
+PRODUCTVERSION VERSION_ID
+FILEFLAGSMASK 0x3fL
+
+// FILEFLAGS VS_FF_DEBUG
+
+FILEOS VOS__WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+BLOCK "StringFileInfo"
+BEGIN
+BLOCK "040904B0"
+BEGIN
+VALUE "CompanyName", "STLport Consulting, Inc.\0"
+VALUE "FileDescription", "STLport\0"
+VALUE "FileVersion", VERSION_STR
+VALUE "InternalName", "STLPORT.DLL\0"
+VALUE "LegalCopyright", "Copyright (C) Boris Fomitchev\0"
+
+VALUE "OriginalFilename", DLLNAME_STRING2(COMP,BUILD)
+
+VALUE "ProductName", "STLport Standard ANSI C++ Library\0"
+VALUE "ProductVersion", VERSION_STR
+#ifdef BUILD
+VALUE "SpecialBuild", VERSION_STRING2(BUILD)
+#endif
+END
+END
+BLOCK "VarFileInfo"
+BEGIN
+VALUE "Translation", 0x409, 1200
+END
+END
diff --git a/main/source/stlport/src/stlport_prefix.h b/main/source/stlport/src/stlport_prefix.h
new file mode 100644
index 00000000..5ac3956e
--- /dev/null
+++ b/main/source/stlport/src/stlport_prefix.h
@@ -0,0 +1,42 @@
+#ifndef STLPORT_PREFIX_H
+# define STLPORT_PREFIX_H
+
+# define __BUILDING_STLPORT 1
+
+# if defined (_WIN32) || defined (WIN32)
+#  ifdef __cplusplus
+#   define WIN32_LEAN_AND_MEAN
+#   define NOSERVICE
+#  endif
+#  if !(defined (__CYGWIN__) || defined(_WIN32_WCE))
+#   define _STLP_REAL_LOCALE_IMPLEMENTED
+#  endif
+# endif
+
+#   undef _STLP_NO_FORCE_INSTANTIATE
+
+/* Please add extra compilation switches for particular compilers here */
+
+# include <stl/_config.h>
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT) && defined (_STLP_USE_DECLSPEC) && ! defined (_STLP_EXPOSE_GLOBALS_IMPLEMENTATION)
+#  define _STLP_EXPOSE_GLOBALS_IMPLEMENTATION
+# endif
+
+# ifdef __cplusplus
+
+# include <ctime>
+# if defined (_STLP_USE_NAMESPACES) && ! defined (_STLP_VENDOR_GLOBAL_CSTD)
+using _STLP_VENDOR_CSTD::time_t;
+# endif
+
+# if defined (_STLP_FUNCTION_TMPL_PARTIAL_ORDER) || defined (__BORLANDC__)
+#  define _STLP_OPERATOR_SPEC _STLP_DECLSPEC 
+# else
+#  define _STLP_OPERATOR_SPEC _STLP_TEMPLATE_NULL _STLP_DECLSPEC
+# endif
+
+# endif /* __cplusplus */
+
+#endif /* PREFIX */
+
diff --git a/main/source/stlport/src/streambuf.cpp b/main/source/stlport/src/streambuf.cpp
new file mode 100644
index 00000000..ff1f3ba5
--- /dev/null
+++ b/main/source/stlport/src/streambuf.cpp
@@ -0,0 +1,242 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+# include "stlport_prefix.h"
+
+
+#include <stl/_streambuf.h>
+#include <stl/_algobase.h>
+
+// Implementation of non-inline member functions of class
+// basic_streambuf<char, char_traits<char> >
+
+# if defined (__hpux)
+#  define FILE_CAST(x) (__REINTERPRET_CAST(FILE*, x))
+# else
+#  define FILE_CAST(x) x
+# endif
+
+_STLP_BEGIN_NAMESPACE
+
+#if !defined(_STLP_WINCE)
+
+basic_streambuf<char, char_traits<char> >::~basic_streambuf() {}
+
+// This constructor is an extension.  It is for streambuf subclasses that
+// are synchronized with C stdio files.
+basic_streambuf<char, char_traits<char> >
+  ::basic_streambuf(FILE* __get, FILE* __put)
+    : _M_get(__get ? __get : FILE_CAST(&_M_default_get)),
+      _M_put(__put ? __put : FILE_CAST(&_M_default_put)),
+      _M_locale()
+{
+  _M_lock._M_initialize();
+
+  if (_M_get == FILE_CAST(&_M_default_get))
+    _FILE_I_set(_M_get, 0, 0, 0);
+  if (_M_put == FILE_CAST(&_M_default_put))
+    _FILE_O_set(_M_put, 0, 0, 0);      
+}
+
+// virtual functions
+
+void basic_streambuf<char, char_traits<char> >::imbue(const locale&)
+{}
+
+basic_streambuf<char, char_traits<char> >*
+basic_streambuf<char, char_traits<char> >::setbuf(char*, streamsize)
+{
+  return this;
+}
+
+basic_streambuf<char, char_traits<char> >::pos_type
+basic_streambuf<char, char_traits<char> >
+  ::seekoff(off_type, ios_base::seekdir, ios_base::openmode)
+{
+  return pos_type(-1);
+}
+
+basic_streambuf<char, char_traits<char> >::pos_type
+basic_streambuf<char, char_traits<char> >
+  ::seekpos(pos_type, ios_base::openmode)
+{
+  return pos_type(-1);
+}
+
+int basic_streambuf<char, char_traits<char> >::sync()
+{
+  return 0;
+}
+
+streamsize basic_streambuf<char, char_traits<char> >::showmanyc()
+{
+  return 0;
+}
+
+streamsize basic_streambuf<char, char_traits<char> >
+  ::xsgetn(char* s, streamsize n)
+{
+  streamsize result = 0;
+  const int_type eof = traits_type::eof();
+
+  while (result < n) {
+    if (_FILE_I_avail(_M_get) > 0) {
+      size_t chunk = (min) (__STATIC_CAST(size_t,_FILE_I_avail(_M_get)),
+                         __STATIC_CAST(size_t,n - result));
+      traits_type::copy(s, _FILE_I_next(_M_get), chunk);
+      result += chunk;
+      s += chunk;
+      _FILE_I_bump(_M_get, chunk);
+    }
+    else {
+      int_type c = sbumpc();
+      if (c != eof) {
+        *s = c;
+        ++result;
+	++s;
+      }
+      else
+        break; 
+    }
+  }
+  
+  return result;
+}
+
+basic_streambuf<char, char_traits<char> >::int_type
+basic_streambuf<char, char_traits<char> >::underflow()
+{
+  return traits_type::eof();
+}
+
+basic_streambuf<char, char_traits<char> >::int_type
+basic_streambuf<char, char_traits<char> >::uflow()
+{
+  const int_type eof = traits_type::eof();
+  return this->underflow() == eof 
+    ? eof
+    : traits_type::to_int_type(_FILE_I_postincr(_M_get));
+}
+
+basic_streambuf<char, char_traits<char> >::int_type
+basic_streambuf<char, char_traits<char> >::pbackfail(int_type /* __c */)
+{
+  return traits_type::eof();
+}
+
+
+streamsize basic_streambuf<char, char_traits<char> >
+  ::xsputn(const char* s, streamsize n)
+{
+  streamsize result = 0;
+  const int_type eof = traits_type::eof();
+
+  while (result < n) {
+    if (_FILE_O_avail(_M_put) > 0) {
+      size_t chunk = (min) (__STATIC_CAST(size_t,_FILE_O_avail(_M_put)),
+                         __STATIC_CAST(size_t,n - result));
+      traits_type::copy(_FILE_O_next(_M_put), s, chunk);
+      result += chunk;
+      s += chunk;
+      _FILE_O_bump(_M_put, (int)chunk);
+    }
+
+    else if (this->overflow(traits_type::to_int_type(*s)) != eof) {
+      ++result;
+      ++s;
+    }
+    else
+      break;
+  }
+  return result;
+}
+
+streamsize basic_streambuf<char, char_traits<char> >
+  ::_M_xsputnc(char c, streamsize n)
+{
+  streamsize result = 0;
+  const int_type eof = traits_type::eof();
+
+  while (result < n) {
+    if (_FILE_O_avail(_M_put) > 0) {
+      size_t chunk = (min) (__STATIC_CAST(size_t,_FILE_O_avail(_M_put)),
+                         __STATIC_CAST(size_t,n - result));
+      traits_type::assign(_FILE_O_next(_M_put), chunk, c);
+      result += chunk;
+      _FILE_O_bump(_M_put, (int)chunk);
+    }
+
+    else if (this->overflow(traits_type::to_int_type(c)) != eof)
+      ++result;
+    else
+      break;
+  }
+  return result;
+}
+
+basic_streambuf<char, char_traits<char> >::int_type
+basic_streambuf<char, char_traits<char> >::overflow(int_type/*  c */)
+{
+  return traits_type::eof();
+}
+
+basic_streambuf<char, char_traits<char> >::int_type
+basic_streambuf<char, char_traits<char> >::_M_snextc_aux()
+{
+  int_type eof = traits_type::eof();
+  if (_FILE_I_avail(_M_get) == 0)
+    return this->uflow() == eof ? eof : this->sgetc();
+  else {
+    _FILE_I_set(_M_get,
+              _FILE_I_begin(_M_get), _FILE_I_end(_M_get), _FILE_I_end(_M_get));
+    return this->underflow();
+  }
+}
+
+
+locale basic_streambuf<char, char_traits<char> >::pubimbue(const locale& loc)
+{
+  this->imbue(loc);
+  locale tmp = _M_locale;
+  _M_locale = loc;
+  return tmp;
+}
+
+#else
+
+#if !defined(_STLP_NO_FORCE_INSTANTIATE)
+template class basic_streambuf<char, char_traits<char> >;
+#endif
+
+#endif /* _STLP_WINCE */
+
+//----------------------------------------------------------------------
+// Force instantiation of basic_streambuf
+
+// not basic_streambuf<char>, because it's specialized.
+
+#if !defined(_STLP_NO_FORCE_INSTANTIATE)
+#if !defined (_STLP_NO_WCHAR_T)
+template class basic_streambuf<wchar_t, char_traits<wchar_t> >;
+#endif /* INSTANTIATE_WIDE_STREAMS */
+#endif
+
+_STLP_END_NAMESPACE
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/src/string_w.cpp b/main/source/stlport/src/string_w.cpp
new file mode 100644
index 00000000..b549bc0f
--- /dev/null
+++ b/main/source/stlport/src/string_w.cpp
@@ -0,0 +1,16 @@
+#include "stlport_prefix.h"
+#include <stl/_string.h>
+
+_STLP_BEGIN_NAMESPACE
+# ifndef _STLP_NO_FORCE_INSTANTIATE
+#  ifndef _STLP_NO_WCHAR_T
+template class _STLP_CLASS_DECLSPEC allocator<wchar_t>;
+template class _STLP_CLASS_DECLSPEC _String_base<wchar_t, allocator<wchar_t> >;
+# ifdef _STLP_DEBUG
+template class _STLP_CLASS_DECLSPEC _Nondebug_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >;
+# endif
+template class _STLP_CLASS_DECLSPEC basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >;
+#  endif
+# endif
+_STLP_END_NAMESPACE
+
diff --git a/main/source/stlport/src/strstream.cpp b/main/source/stlport/src/strstream.cpp
new file mode 100644
index 00000000..7f6b3897
--- /dev/null
+++ b/main/source/stlport/src/strstream.cpp
@@ -0,0 +1,425 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+// Implementation of the classes in header <strstream>.
+// WARNING: The classes defined in <strstream> are DEPRECATED.  This
+// header is defined in section D.7.1 of the C++ standard, and it
+// MAY BE REMOVED in a future standard revision.  You should use the
+// header <sstream> instead.
+
+# include "stlport_prefix.h"
+#include <stl/_strstream.h>
+#include <stl/_algobase.h>
+
+_STLP_BEGIN_NAMESPACE
+
+// strstreambuf constructor, destructor.
+
+strstreambuf::strstreambuf(streamsize initial_capacity)
+   :  _M_alloc_fun(0), _M_free_fun(0),
+     _M_dynamic(true), _M_frozen(false), _M_constant(false)  
+{
+  streamsize n = (max)(initial_capacity, streamsize(16));
+
+  char* buf = _M_alloc(n);
+  if (buf) {
+    setp(buf, buf + n);
+    setg(buf, buf, buf);
+  }
+}
+
+
+
+strstreambuf::strstreambuf(__alloc_fn alloc_f, __free_fn free_f)
+  : _M_alloc_fun(alloc_f), _M_free_fun(free_f),
+    _M_dynamic(true), _M_frozen(false), _M_constant(false)
+{
+  streamsize n = 16;
+
+  char* buf = _M_alloc(n);
+  if (buf) {
+    setp(buf, buf + n);
+    setg(buf, buf, buf);
+  }
+}
+
+strstreambuf::strstreambuf(char* get, streamsize n, char* put)
+  : _M_alloc_fun(0), _M_free_fun(0),
+    _M_dynamic(false), _M_frozen(false), _M_constant(false)
+{
+  _M_setup(get, put, n);
+}
+
+strstreambuf::strstreambuf(signed char* get, streamsize n, signed char* put)
+  : _M_alloc_fun(0), _M_free_fun(0),
+    _M_dynamic(false), _M_frozen(false), _M_constant(false)
+{
+  _M_setup(__REINTERPRET_CAST(char*,get), __REINTERPRET_CAST(char*,put), n);
+}
+
+strstreambuf::strstreambuf(unsigned char* get, streamsize n,
+                           unsigned char* put)
+  : _M_alloc_fun(0), _M_free_fun(0),
+    _M_dynamic(false), _M_frozen(false), _M_constant(false)
+{
+  _M_setup(__REINTERPRET_CAST(char*,get), __REINTERPRET_CAST(char*,put), n);
+}
+
+strstreambuf::strstreambuf(const char* get, streamsize n)
+  : _M_alloc_fun(0), _M_free_fun(0),
+    _M_dynamic(false), _M_frozen(false), _M_constant(true)
+{
+  _M_setup(__CONST_CAST(char*,get), 0, n);
+}
+
+strstreambuf::strstreambuf(const signed char* get, streamsize n)
+  : _M_alloc_fun(0), _M_free_fun(0),
+    _M_dynamic(false), _M_frozen(false), _M_constant(true)
+{
+  _M_setup(__REINTERPRET_CAST(char*, __CONST_CAST(signed char*,get)), 0, n);
+}
+
+strstreambuf::strstreambuf(const unsigned char* get, streamsize n)
+  : _M_alloc_fun(0), _M_free_fun(0),
+    _M_dynamic(false), _M_frozen(false), _M_constant(true)
+{
+  _M_setup(__REINTERPRET_CAST(char*, __CONST_CAST(unsigned char*,get)), 0, n);
+}
+
+strstreambuf::~strstreambuf()
+{
+  if (_M_dynamic && !_M_frozen)
+    _M_free(eback());    
+}
+
+void strstreambuf::freeze(bool frozenflag)
+{
+  if (_M_dynamic)
+    _M_frozen = frozenflag;
+}
+
+char* strstreambuf::str()
+{
+  freeze(true);
+  return eback();
+}
+
+int strstreambuf::pcount() const
+{
+  return int(pptr() ? pptr() - pbase() : 0);
+}
+
+strstreambuf::int_type strstreambuf::overflow(int_type c) {
+  if (c == traits_type::eof())
+    return traits_type::not_eof(c);
+
+  // Try to expand the buffer.
+  if (pptr() == epptr() && _M_dynamic && !_M_frozen && !_M_constant) {
+    ptrdiff_t old_size = epptr() - pbase();
+    ptrdiff_t new_size = (max)(2 * old_size, ptrdiff_t(1));
+
+    char* buf = _M_alloc(new_size);
+    if (buf) {
+      memcpy(buf, pbase(), old_size);
+
+      char* old_buffer = pbase();
+      bool reposition_get = false;
+      ptrdiff_t old_get_offset;
+      if (gptr() != 0) {
+        reposition_get = true;
+        old_get_offset = gptr() - eback();
+      }
+
+      setp(buf, buf + new_size);
+      pbump((int)old_size);
+
+      if (reposition_get) 
+        setg(buf, buf + old_get_offset, buf + (max)(old_get_offset, old_size));
+
+      _M_free(old_buffer);
+    }
+  }
+
+  if (pptr() != epptr()) {
+    *pptr() = c;
+    pbump(1);
+    return c;
+  }
+  else
+    return traits_type::eof();
+}
+
+strstreambuf::int_type strstreambuf::pbackfail(int_type c)
+{
+  if (gptr() != eback()) {
+    if (c == _Traits::eof()) {
+      gbump(-1);
+      return _Traits::not_eof(c);
+    }
+    else if (c == gptr()[-1]) {
+      gbump(-1);
+      return c;
+    }
+    else if (!_M_constant) {
+      gbump(-1);
+      *gptr() = c;
+      return c;
+    }
+  }
+
+  return _Traits::eof();
+}
+
+strstreambuf::int_type strstreambuf::underflow()
+{
+  if (gptr() == egptr() && pptr() && pptr() > egptr())
+    setg(eback(), gptr(), pptr());
+
+  if (gptr() != egptr())
+    return (unsigned char) *gptr();
+  else
+    return _Traits::eof();
+}
+
+basic_streambuf<char, char_traits<char> >* 
+strstreambuf::setbuf(char*, streamsize)
+{
+  return this;
+}
+
+strstreambuf::pos_type
+strstreambuf::seekoff(off_type off,
+                      ios_base::seekdir dir, ios_base::openmode mode)
+{
+  bool do_get = false;
+  bool do_put = false;
+
+  if ((mode & (ios_base::in | ios_base::out)) ==
+          (ios_base::in | ios_base::out) &&
+      (dir == ios_base::beg || dir == ios_base::end))
+    do_get = do_put = true;
+  else if (mode & ios_base::in)
+    do_get = true;
+  else if (mode & ios_base::out)
+    do_put = true;
+
+  // !gptr() is here because, according to D.7.1 paragraph 4, the seekable
+  // area is undefined if there is no get area.
+  if ((!do_get && !do_put) || (do_put && !pptr()) || !gptr())
+    return pos_type(off_type(-1));
+
+  char* seeklow  = eback();
+  char* seekhigh = epptr() ? epptr() : egptr();
+
+  off_type newoff;
+  switch(dir) {
+  case ios_base::beg:
+    newoff = 0;
+    break;
+  case ios_base::end:
+    newoff = seekhigh - seeklow;
+    break;
+  case ios_base::cur:
+    newoff = do_put ? pptr() - seeklow : gptr() - seeklow;
+    break;
+  default:
+    return pos_type(off_type(-1));
+  }
+
+  off += newoff;
+  if (off < 0 || off > seekhigh - seeklow)
+    return pos_type(off_type(-1));
+
+  if (do_put) {
+    if (seeklow + off < pbase()) {
+      setp(seeklow, epptr());
+      pbump((int)off);
+    }
+    else {
+      setp(pbase(), epptr());
+      pbump((int)(off - (pbase() - seeklow)));
+    }
+  }
+  if (do_get) {
+    if (off <= egptr() - seeklow)
+      setg(seeklow, seeklow + off, egptr());
+    else if (off <= pptr() - seeklow)
+      setg(seeklow, seeklow + off, pptr());
+    else
+      setg(seeklow, seeklow + off, epptr());
+  }
+
+  return pos_type(newoff);
+}
+
+strstreambuf::pos_type
+strstreambuf::seekpos(pos_type pos, ios_base::openmode mode)
+{
+  return seekoff(pos - pos_type(off_type(0)), ios_base::beg, mode);
+}
+
+
+char* strstreambuf::_M_alloc(size_t n)
+{
+  if (_M_alloc_fun)
+    return __STATIC_CAST(char*,_M_alloc_fun(n));
+  else
+    return new char[n];
+}
+
+void strstreambuf::_M_free(char* p)
+{
+  if (p)
+    if (_M_free_fun)
+      _M_free_fun(p);
+    else
+      delete[] p;
+}
+
+void strstreambuf::_M_setup(char* get, char* put, streamsize n)
+{
+  if (get) {
+    size_t N = n > 0 ? size_t(n) : n == 0 ? strlen(get) : size_t(INT_MAX);
+    
+    if (put) {
+      setg(get, get, put);
+      setp(put, put + N);
+    }
+    else {
+      setg(get, get, get + N);
+    }
+  }
+}
+
+//----------------------------------------------------------------------
+// Class istrstream
+
+istrstream::istrstream(char* s)
+  : basic_istream<char, char_traits<char> >(0), _M_buf(s, 0)
+{
+  this->init(&_M_buf);
+}
+
+istrstream::istrstream(const char* s)
+  : basic_istream<char, char_traits<char> >(0), _M_buf(s, 0)
+{
+  this->init(&_M_buf);
+}
+
+istrstream::istrstream(char* s, streamsize n)
+  : basic_istream<char, char_traits<char> >(0), _M_buf(s, n)
+{
+  this->init(&_M_buf);
+}
+
+istrstream::istrstream(const char* s, streamsize n)
+  : basic_istream<char, char_traits<char> >(0), _M_buf(s, n)
+{
+  this->init(&_M_buf);
+}
+
+istrstream::~istrstream() {}
+
+strstreambuf* istrstream::rdbuf() const {
+  return __CONST_CAST(strstreambuf*,&_M_buf);
+}
+
+char* istrstream::str() { return _M_buf.str(); }
+
+//----------------------------------------------------------------------
+// Class ostrstream
+
+ostrstream::ostrstream()
+  : basic_ostream<char, char_traits<char> >(0), _M_buf()
+{
+  basic_ios<char, char_traits<char> >::init(&_M_buf);
+}
+
+ostrstream::ostrstream(char* s, int n, ios_base::openmode mode)
+  : basic_ostream<char, char_traits<char> >(0), 
+    _M_buf(s, n, mode & ios_base::app ? s + strlen(s) : s)
+{
+  basic_ios<char, char_traits<char> >::init(&_M_buf);
+}
+
+ostrstream::~ostrstream() {}
+
+strstreambuf* ostrstream::rdbuf() const 
+{
+  return __CONST_CAST(strstreambuf*,&_M_buf);
+}
+
+void ostrstream::freeze(bool freezeflag)
+{
+  _M_buf.freeze(freezeflag);
+}
+
+char* ostrstream::str()
+{
+  return _M_buf.str();
+}
+
+int ostrstream::pcount() const
+{
+  return _M_buf.pcount();
+}
+
+
+//----------------------------------------------------------------------
+// Class strstream
+
+strstream::strstream()
+  : basic_iostream<char, char_traits<char> >(0), _M_buf()
+{
+  basic_ios<char, char_traits<char> >::init(&_M_buf);
+}
+
+strstream::strstream(char* s, int n, ios_base::openmode mode)
+  : basic_iostream<char, char_traits<char> >(0), 
+    _M_buf(s, n, mode & ios_base::app ? s + strlen(s) : s)
+{
+  basic_ios<char, char_traits<char> >::init(&_M_buf);
+}
+  
+strstream::~strstream() {}
+
+strstreambuf* strstream::rdbuf() const
+{
+  return __CONST_CAST(strstreambuf*,&_M_buf);
+}
+
+void strstream::freeze(bool freezeflag)
+{
+  _M_buf.freeze(freezeflag);
+}
+
+int strstream::pcount() const
+{
+  return _M_buf.pcount();
+}
+
+char* strstream::str()
+{
+  return _M_buf.str();
+}
+
+_STLP_END_NAMESPACE
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/src/sunpro-64.mak b/main/source/stlport/src/sunpro-64.mak
new file mode 100644
index 00000000..57bcb3e2
--- /dev/null
+++ b/main/source/stlport/src/sunpro-64.mak
@@ -0,0 +1,16 @@
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_sunpro64
+
+#
+# This makefile will work for SUN CC 5.0-5.3 (Forte 6 Update 2)
+#
+
+CC = CC -xarch=v9
+CXX = CC -xarch=v9
+
+COMP = SUN64
+ATOMIC_ASM = sparc_atomic64.s
+
+include sunpro-common.mak
diff --git a/main/source/stlport/src/sunpro-common.mak b/main/source/stlport/src/sunpro-common.mak
new file mode 100644
index 00000000..1d1dc44b
--- /dev/null
+++ b/main/source/stlport/src/sunpro-common.mak
@@ -0,0 +1,105 @@
+
+CUR_DIR= ${PWD}/
+
+STL_INCL= -I. -I${PWD}/../stlport
+
+#
+# guts for common stuff
+#
+#
+LINK=$(CC) -xar -o
+DYN_LINK=$(CC) -G -o
+
+OBJEXT=o
+DYNEXT=so
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+INSTALL_STEP = install_sun
+PREPARE_STEP = prepare_sunpro
+
+all: all_dynamic symbolic_links  all_static
+
+include common_macros.mak
+
+CXXFLAGS_COMMON = -mt +w2 -library=no%Cstd -features=rtti -xildoff ${STL_INCL} $(EXTRA_COMMON_FLAGS)
+
+SHCXXFLAGS = -PIC
+
+DEBUG_FLAGS = -O -g +w2 -D_STLP_DEBUG
+
+#
+# Try those flags to see if they help to get maximum efficiency :
+# -Qoption iropt -R,-Ml30,-Ms30,-Mi1000000,-Mm1000000,-Mr1000000,-Ma1000000,-Mc1000000,-Mt1000000
+RELEASE_FLAGS = -O2 +w2 -qoption ccfe -expand=1000
+
+
+# install: $(TARGETS)
+#	cp -p $(TARGETS) ${INSTALLDIR}
+
+RELEASE_static_rep = -ptr${RELEASE_OBJDIR_static}
+RELEASE_dynamic_rep = -ptr${RELEASE_OBJDIR_dynamic}
+DEBUG_static_rep = -ptr${DEBUG_OBJDIR_static}
+DEBUG_dynamic_rep = -ptr${DEBUG_OBJDIR_dynamic}
+STLDEBUG_static_rep = -ptr${STLDEBUG_OBJDIR_static}
+STLDEBUG_dynamic_rep = -ptr${STLDEBUG_OBJDIR_dynamic}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${RELEASE_FLAGS} ${RELEASE_static_rep}
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${RELEASE_FLAGS} $(SHCXXFLAGS) ${RELEASE_dynamic_rep}
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g ${DEBUG_static_rep}
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g $(SHCXXFLAGS) ${DEBUG_dynamic_rep}
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_COMMON) -O -g ${STLDEBUG_static_rep} -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g $(SHCXXFLAGS) ${STLDEBUG_dynamic_rep} -D_STLP_DEBUG
+
+
+LDFLAGS_RELEASE_static = ${CXXFLAGS_RELEASE_static} ${ATOMIC_ASM}
+LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic} -h${RELEASE_DYNLIB_SONAME} ${ATOMIC_ASM}
+
+LDFLAGS_DEBUG_static = ${CXXFLAGS_DEBUG_static} ${ATOMIC_ASM}
+LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic} -h${DEBUG_DYNLIB_SONAME} ${ATOMIC_ASM}
+
+LDFLAGS_STLDEBUG_static = ${CXXFLAGS_STLDEBUG_static} ${ATOMIC_ASM}
+LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic} -h${STLDEBUG_DYNLIB_SONAME} ${ATOMIC_ASM}
+
+#LDLIBS_RELEASE_dynamic =  -lposix4
+#LDLIBS_STLDEBUG_dynamic = -lposix4
+
+include common_percent_rules.mak
+
+#	for file in `cat ../etc/std_headers.txt ../etc/std_headers_classic_iostreams.txt ../etc/std_headers_cpp_runtime.txt ../etc/std_headers_cpp_runtime_h.txt`;
+#	for file in `cat ../etc/std_headers.txt ../etc/std_headers_classic_iostreams.txt ../etc/std_headers_c.txt   ../etc/std_headers_cpp_runtime.txt ../etc/std_headers_c_h.txt  ../etc/std_headers_cpp_runtime_h.txt`;
+
+../stlport/algorithm.SUNWCCh :
+	for file in `cat ../etc/std_headers.txt`; \
+	do \
+	  rm -f ../stlport/$$file.SUNWCCh ; \
+	  (cd ../stlport ; ln -s $$file $$file.SUNWCCh) ; \
+        done
+	for file in `cat ../etc/std_headers_classic_iostreams.txt`; \
+	do \
+	  rm -f ../stlport/clsssic_iostreams/$$file.SUNWCCh ; \
+	  (cd ../stlport/classic_iostreams ; ln -s $$file $$file.SUNWCCh) ; \
+        done
+	for file in `cat ../etc/std_headers_c.txt`; \
+	do \
+	  rm -f ../stlport/cstd/$$file.SUNWCCh ; \
+	  (cd ../stlport/cstd ; ln -s $$file $$file.SUNWCCh) ; \
+        done
+	for file in `cat ../etc/std_headers_cpp_runtime.txt`; \
+	do \
+	  rm -f ../stlport/cpp_runtime/$$file.SUNWCCh ; \
+	  (cd ../stlport/cpp_runtime ; ln -s $$file $$file.SUNWCCh) ; \
+        done
+
+prepare_sunpro : ../stlport/algorithm.SUNWCCh
+
+remove_c_headers : 
+	for file in `cat ../etc/std_headers_c_h.txt ../etc/std_headers_c.txt`; \
+	do \
+	rm -f ../stlport/$$file ../stlport/$$file.SUNWCCh; \
+	done
+
+include common_rules.mak
diff --git a/main/source/stlport/src/sunpro-compat.mak b/main/source/stlport/src/sunpro-compat.mak
new file mode 100644
index 00000000..8dc09c2c
--- /dev/null
+++ b/main/source/stlport/src/sunpro-compat.mak
@@ -0,0 +1,10 @@
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_sunpro_compat
+
+CC = CC
+CXX = CC -compat=4
+
+COMP=SUN-COMPAT
+
diff --git a/main/source/stlport/src/sunpro-v8plus.mak b/main/source/stlport/src/sunpro-v8plus.mak
new file mode 100644
index 00000000..8851c61f
--- /dev/null
+++ b/main/source/stlport/src/sunpro-v8plus.mak
@@ -0,0 +1,16 @@
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_sunpro64
+
+#
+# This makefile will work for SUN CC 5.0-5.3 (Forte 6 Update 2)
+#
+
+CC = CC -xarch=v8plus
+CXX = CC -xarch=v8plus
+
+COMP = SUN64
+ATOMIC_ASM = sparc_atomic.s
+
+include sunpro-common.mak
diff --git a/main/source/stlport/src/sunpro.mak b/main/source/stlport/src/sunpro.mak
new file mode 100644
index 00000000..d22803fa
--- /dev/null
+++ b/main/source/stlport/src/sunpro.mak
@@ -0,0 +1,16 @@
+#
+# Basename for libraries
+#
+
+#
+# This makefile will work for SUN 5.0 and higher
+#
+
+LIB_BASENAME = libstlport_sunpro
+COMP=SUN
+CC = CC
+CXX = CC
+
+include sunpro-common.mak
+
+
diff --git a/main/source/stlport/src/sunpro42.mak b/main/source/stlport/src/sunpro42.mak
new file mode 100644
index 00000000..e19a7ef6
--- /dev/null
+++ b/main/source/stlport/src/sunpro42.mak
@@ -0,0 +1,11 @@
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_sunpro42
+COMP=SUN42
+CC = CC
+CXX = CC
+
+include sunpro-common.mak
+
+
diff --git a/main/source/stlport/src/time_facets.cpp b/main/source/stlport/src/time_facets.cpp
new file mode 100644
index 00000000..fb88fdd4
--- /dev/null
+++ b/main/source/stlport/src/time_facets.cpp
@@ -0,0 +1,441 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+
+#include "stlport_prefix.h"
+#include <stl/_time_facets.h>
+#include <stl/_istream.h>
+#include "c_locale.h"
+
+_STLP_BEGIN_NAMESPACE
+
+char* _STLP_CALL
+__write_integer(char* buf, ios_base::fmtflags flags, long x);
+
+// The function copy_cstring is used to initialize a string
+// with a C-style string.  Used to initialize the month and weekday
+// tables in time_get and time_put.  Called only by _Init_timeinfo
+// so its name does not require leading underscores.
+
+static inline void copy_cstring(const char * s, string& v) {
+  copy(s, s + strlen(s), back_insert_iterator<string >(v));
+}
+
+// default "C" values for month and day names
+
+  const char default_dayname[][14] = {
+    "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
+    "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday",
+    "Friday", "Saturday"};
+
+  const char default_monthname[][24] = {
+    "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+    "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
+    "January", "February", "March", "April", "May", "June",
+    "July", "August", "September", "October", "November", "December"};
+
+// _Init_time_info: initialize table with
+// "C" values (note these are not defined in the C standard, so this
+// is somewhat arbitrary).
+
+void _STLP_CALL _Init_timeinfo(_Time_Info& table) {
+  int i;
+  for (i = 0; i < 14; ++i)
+    copy_cstring(default_dayname[i], table._M_dayname[i]);
+  for (i = 0; i < 24; ++i)
+    copy_cstring(default_monthname[i], table._M_monthname[i]);
+  copy_cstring("AM", table._M_am_pm[0]);
+  copy_cstring("PM", table._M_am_pm[1]);
+  copy_cstring("%H:%M:%S", table._M_time_format);
+  copy_cstring("%m/%d/%y",  table._M_date_format);
+  copy_cstring("%a %b %e %H:%M:%S %Y", table._M_date_time_format);
+}
+
+void _STLP_CALL _Init_timeinfo(_Time_Info& table, _Locale_time * time) {
+  int i;
+  for (i = 0; i < 7; ++i)
+    copy_cstring(_Locale_abbrev_dayofweek(time, i),
+		 table._M_dayname[i]);
+  for (i = 0; i < 7; ++i)
+    copy_cstring(_Locale_full_dayofweek(time, i),
+		 table._M_dayname[i+7]); 
+  for (i = 0; i < 12; ++i)
+    copy_cstring(_Locale_abbrev_monthname(time, i),
+		 table._M_monthname[i]);
+  for (i = 0; i < 12; ++i)
+    copy_cstring(_Locale_full_monthname(time, i),
+		 table._M_monthname[i+12]);
+  copy_cstring(_Locale_am_str(time),
+		 table._M_am_pm[0]);
+  copy_cstring(_Locale_pm_str(time),
+	       table._M_am_pm[1]);
+  copy_cstring(_Locale_t_fmt(time), table._M_time_format);
+  copy_cstring(_Locale_d_fmt(time), table._M_date_format);
+  copy_cstring(_Locale_d_t_fmt(time), table._M_date_time_format);
+  copy_cstring(_Locale_long_d_fmt(time), table._M_long_date_format);
+  copy_cstring(_Locale_long_d_t_fmt(time), table._M_long_date_time_format);
+}
+
+inline char* __subformat(string format, char*& buf, 
+			 const _Time_Info&  table, const tm* t) {
+  const char * cp = format.data();
+  const char * cp_end = cp + format.size();
+  while (cp != cp_end) {
+    if (*cp == '%') {
+  	  char mod = 0;
+      ++cp;
+      if(*cp == '#') {
+        mod = *cp; ++cp;
+      }
+      buf = __write_formatted_time(buf, *cp++, mod, table, t);
+    } else
+      *buf++ = *cp++;
+  }
+  return buf;
+}
+
+/* The number of days from the first day of the first ISO week of this
+   year to the year day YDAY with week day WDAY.  ISO weeks start on
+   Monday; the first ISO week has the year's first Thursday.  YDAY may
+   be as small as YDAY_MINIMUM.  */
+#define __ISO_WEEK_START_WDAY 1 /* Monday */
+#define __ISO_WEEK1_WDAY 4 /* Thursday */
+#define __YDAY_MINIMUM (-366)
+#define __TM_YEAR_BASE 1900
+static int
+__iso_week_days (int yday, int wday)
+{
+  /* Add enough to the first operand of % to make it nonnegative.  */
+  int big_enough_multiple_of_7 = (-__YDAY_MINIMUM / 7 + 2) * 7;
+  return (yday
+	  - (yday - wday + __ISO_WEEK1_WDAY + big_enough_multiple_of_7) % 7
+	  + __ISO_WEEK1_WDAY - __ISO_WEEK_START_WDAY);
+}
+
+#define	__is_leap(year)	\
+  ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))
+
+#define __hour12(hour) \
+  (((hour) % 12 == 0) ? (12) : (hour) % 12)
+
+char * __write_formatted_time(char* buf, char format, char modifier,
+			      const _Time_Info& table, const tm* t) {
+  switch(format) {
+    case 'a':
+      return copy(table._M_dayname[t->tm_wday].begin(),
+	          table._M_dayname[t->tm_wday].end(),
+	          buf);
+
+    case 'A':
+      return copy(table._M_dayname[t->tm_wday+7].begin(),
+	          table._M_dayname[t->tm_wday+7].end(),
+	          buf);
+
+    case 'b':
+      return copy(table._M_monthname[t->tm_mon].begin(),
+	          table._M_monthname[t->tm_mon].end(),
+	          buf);
+
+    case 'B':
+      return copy(table._M_monthname[t->tm_mon+12].begin(),
+	     table._M_monthname[t->tm_mon+12].end(),
+	     buf);
+
+    case 'c': {
+      const char * cp = (modifier != '#') ? table._M_date_time_format.data():\
+      									   table._M_long_date_time_format.data();
+      const char* cp_end = (modifier != '#') ? cp + table._M_date_time_format.size():\
+      										  cp + table._M_long_date_time_format.size();
+      char mod = 0;
+      while (cp != cp_end) {
+	if (*cp == '%') {
+	  ++cp; if(*cp == '#') mod = *cp++; else mod = 0;
+	  buf = __write_formatted_time(buf, *cp++, mod, table, t);
+	}
+	else
+	  *buf++ = *cp++;
+      }
+      return buf;
+    }
+
+    case 'd': 
+      sprintf(buf, (modifier != '#')?"%.2ld":"%ld", (long)t->tm_mday);
+      return ((long)t->tm_mday < 10L && modifier == '#')?buf+1:buf + 2;
+
+    case 'e':
+      sprintf(buf, "%2ld", (long)t->tm_mday);
+      return buf + 2;
+
+    case 'H':
+      sprintf(buf, (modifier != '#')?"%.2ld":"%ld", (long)t->tm_hour);
+      return ((long)t->tm_hour < 10L && modifier == '#')?buf+1:buf + 2;
+
+    case 'I':
+      sprintf(buf, (modifier != '#')?"%.2ld":"%ld", (long)__hour12(t->tm_hour));
+      return ((long)__hour12(t->tm_hour) < 10L && modifier == '#')?buf+1:buf + 2;
+
+    case 'j':
+      return __write_integer(buf, 0, (long)((long)t->tm_yday + 1));
+
+    case 'm':
+      sprintf(buf, (modifier != '#')?"%.2ld":"%ld", (long)t->tm_mon + 1);
+      return ((long)(t->tm_mon + 1) < 10L && modifier == '#')?buf+1:buf + 2;
+
+    case 'M':
+      sprintf(buf, (modifier != '#')?"%.2ld":"%ld", (long)t->tm_min);
+      return ((long)t->tm_min < 10L && modifier == '#')?buf+1:buf + 2;
+
+    case 'p':
+      return copy(table._M_am_pm[t->tm_hour/12].begin(),
+	          table._M_am_pm[t->tm_hour/12].end(),
+	   	  buf);
+
+    case 'S': // pad with zeros
+       sprintf(buf, (modifier != '#')?"%.2ld":"%ld", (long)t->tm_sec);
+       return ((long)t->tm_sec < 10L && modifier == '#')?buf+1:buf + 2;
+
+    case 'U':
+      return __write_integer(buf, 0, 
+			    long((t->tm_yday - t->tm_wday + 7) / 7));
+      //      break;
+
+    case 'w':
+      return __write_integer(buf, 0, (long)t->tm_wday);
+      //      break;
+
+    case 'W':
+      return __write_integer(buf, 0,
+		             (long)(t->tm_wday == 0       ?
+			      (t->tm_yday + 1) / 7 :
+			      (t->tm_yday + 8 - t->tm_wday) / 7));
+
+    case'x': {
+      const char * cp = (modifier != '#') ? table._M_date_format.data():\
+      									   table._M_long_date_format.data();
+      const char* cp_end = (modifier != '#') ? cp + table._M_date_format.size():\
+      										  cp + table._M_long_date_format.size();
+      char mod = 0;
+      while (cp != cp_end) {
+	if (*cp == '%') {
+	  ++cp; if(*cp == '#') mod = *cp++; else mod = 0;
+	  buf = __write_formatted_time(buf, *cp++, mod, table, t);
+	}
+	else
+	  *buf++ = *cp++;
+      }
+      return buf;
+    }
+
+    case 'X': {
+      const char * cp = table._M_time_format.data();
+      const char* cp_end = cp + table._M_time_format.size();
+      char mod = 0;
+      while (cp != cp_end) {
+	if (*cp == '%') {
+	  ++cp; if(*cp == '#') mod = *cp++; else mod = 0;
+	  buf = __write_formatted_time(buf, *cp++, mod, table, t);
+	}
+	else
+	  *buf++ = *cp++;
+      }
+      return buf;
+    }
+    case 'y':
+      return __write_integer(buf, 0, (long)((long)(t->tm_year + 1900) % 100));
+
+    case 'Y':
+      return __write_integer(buf, 0, (long)((long)t->tm_year + 1900));
+
+    case '%':
+      *buf++ = '%';
+      return buf;
+
+#ifdef __GNUC__
+
+      // fbp : at least on SUN 
+# if defined ( _STLP_UNIX ) && ! defined (__linux__)
+#  define __USE_BSD 1
+# endif
+ 
+   /*********************************************
+    *     JGS, handle various extensions        *
+    *********************************************/
+
+    case 'h': /* POSIX.2 extension */
+      // same as 'b', abbrev month name
+      return copy(table._M_monthname[t->tm_mon].begin(),
+	          table._M_monthname[t->tm_mon].end(),
+	          buf);
+
+    case 'C': /* POSIX.2 extension */
+      // same as 'd', the day 
+      sprintf(buf, "%2ld", (long)t->tm_mday);
+      return buf + 2;
+
+    case 'D': /* POSIX.2 extension */
+      // same as 'x'
+      return __subformat(table._M_date_format, buf, table, t);
+
+    case 'k': /* GNU extension */
+      sprintf(buf, "%2ld", (long)t->tm_hour);
+      return buf + 2;
+
+    case 'l': /* GNU extension */
+      sprintf(buf, "%2ld", (long)t->tm_hour % 12);
+      return buf + 2;
+
+    case 'n': /* POSIX.2 extension */
+      *buf++ = '\n';
+      return buf;
+
+    case 'R': /* GNU extension */
+      return __subformat("%H:%M", buf, table, t);
+
+    case 'r': /* POSIX.2 extension */
+      return __subformat("%I:%M:%S %p", buf, table, t);
+
+    case 'T': /* POSIX.2 extension.  */
+      return __subformat("%H:%M:%S", buf, table, t);
+
+    case 't': /* POSIX.2 extension.  */
+      *buf++ = '\t';
+      return buf;
+
+    case 'u': /* POSIX.2 extension.  */
+      return __write_integer(buf, 0, long((t->tm_wday - 1 + 7)) % 7 + 1);
+
+    case 's': {
+      time_t __t;
+      __t = mktime ((tm*)t);
+      return __write_integer(buf, 0, (long)__t );
+    }
+    case 'g': /* GNU extension */
+    case 'G': {
+      int year = t->tm_year + __TM_YEAR_BASE;
+      int days = __iso_week_days (t->tm_yday, t->tm_wday);
+      if (days < 0) {
+	  /* This ISO week belongs to the previous year.  */
+	  year--;
+	  days = __iso_week_days (t->tm_yday + (365 + __is_leap (year)),
+				t->tm_wday);
+      } else {
+	int d = __iso_week_days (t->tm_yday - (365 + __is_leap (year)),
+			       t->tm_wday);
+	if (0 <= d) {
+	  /* This ISO week belongs to the next year.  */
+	  year++;
+	  days = d;
+	}
+      }
+      switch (format) {
+      case 'g':
+	return __write_integer(buf, 0, (long)(year % 100 + 100) % 100);
+      case 'G':
+	return __write_integer(buf, 0, (long)year);
+      default:
+	return __write_integer(buf, 0, (long)days / 7 + 1);
+      }
+    }
+
+# if defined ( _STLP_USE_GLIBC  ) && ! defined (__CYGWIN__)
+    case 'z':		/* GNU extension.  */
+      if (t->tm_isdst < 0)
+	break;
+      {
+	int diff;
+#if defined(__USE_BSD) || defined(__BEOS__)
+	diff = t->tm_gmtoff;
+#else
+	diff = t->__tm_gmtoff;
+#endif	
+	if (diff < 0) {
+	  *buf++ = '-';
+	  diff = -diff;
+	} else
+	  *buf++ = '+';
+	
+	diff /= 60;
+	sprintf(buf, "%.4d", (diff / 60) * 100 + diff % 60);
+	return buf + 4;
+      }
+# endif /* __GLIBC__ */
+#endif /* __GNUC__ */
+
+    default:
+      //      return buf;
+      break;
+  }
+  return buf;
+}
+
+time_base::dateorder _STLP_CALL
+__get_date_order(_Locale_time* time)
+{
+  const char * fmt = _Locale_d_fmt(time);
+  char first, second, third;
+
+  while (*fmt != 0 && *fmt != '%') ++fmt;
+  if (*fmt == 0)
+    return time_base::no_order;
+  first = *++fmt;
+  while (*fmt != 0 && *fmt != '%') ++fmt;
+  if (*fmt == 0)
+    return time_base::no_order;
+  second = *++fmt;
+  while (*fmt != 0 && *fmt != '%') ++fmt;
+  if (*fmt == 0)
+    return time_base::no_order;
+  third = *++fmt;
+
+  switch (first) {
+    case 'd':
+      return (second == 'm' && third == 'y') ? time_base::dmy
+					     : time_base::no_order;
+    case 'm':
+      return (second == 'd' && third == 'y') ? time_base::mdy
+					     : time_base::no_order;
+    case 'y':
+      switch (second) {
+	case 'd':
+	  return third == 'm' ? time_base::ydm : time_base::no_order;
+        case 'm':
+	  return third == 'd' ? time_base::ymd : time_base::no_order;
+	default:
+	  return time_base::no_order;
+      }
+    default:
+      return time_base::no_order;
+  }
+}
+
+#if !defined(_STLP_NO_FORCE_INSTANTIATE)
+template class time_get<char, istreambuf_iterator<char, char_traits<char> > >;
+// template class time_get<char, const char*>;
+template class time_put<char, ostreambuf_iterator<char, char_traits<char> > >;
+// template class time_put<char, char*>;
+
+#ifndef _STLP_NO_WCHAR_T
+template class time_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >;
+// template class time_get<wchar_t, const wchar_t*>;
+template class time_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >;
+// template class time_put<wchar_t, wchar_t*>;
+#endif /* INSTANTIATE_WIDE_STREAMS */
+
+#endif
+
+_STLP_END_NAMESPACE
diff --git a/main/source/stlport/src/uint64.h b/main/source/stlport/src/uint64.h
new file mode 100644
index 00000000..37c73bb1
--- /dev/null
+++ b/main/source/stlport/src/uint64.h
@@ -0,0 +1,184 @@
+//	uint64.h
+//	minimal double precision unsigned int arithmetics for numeric_facets support.
+//	Written by Tsutomu Yoshida, Minokamo, Japan. 03/25/2000
+
+#ifndef _UINT64_H
+#define _UINT64_H
+
+
+
+template <class _Tp>
+class _compound_int : public _Tp
+{
+public:
+  typedef _compound_int<_Tp> _Self;
+
+  // Constructors, destructor, assignment operator.
+  _compound_int();										// platform specific
+  _compound_int(unsigned long);							// platform specific
+  _compound_int(unsigned long hi, unsigned long lo);	// platform specific
+  _compound_int(const _Tp& rhs) : _Tp(rhs) {}
+
+  // Arithmetic op= operations involving two _compound_int.
+  _Self& operator+= (const _Self&);						// platform specific
+  _Self& operator-= (const _Self&);						// platform specific
+  _Self& operator*= (const _Self&);						// platform specific
+  _Self& operator/= (const _Self&);						// platform specific
+  _Self& operator%= (const _Self&);						// platform specific
+  _Self& operator&= (const _Self&);						// platform specific
+  _Self& operator|= (const _Self&);						// platform specific
+  _Self& operator^= (const _Self&);						// platform specific
+
+  // Arithmetic op= operations involving built-in integer.
+  _Self& operator<<= (unsigned int);					// platform specific
+  _Self& operator>>= (unsigned int);					// platform specific
+  
+  _Self& operator=  (unsigned long rhs) { return *this =  _Self(rhs); }
+  _Self& operator+= (unsigned long rhs) { return *this += _Self(rhs); }
+  _Self& operator-= (unsigned long rhs) { return *this -= _Self(rhs); }
+  _Self& operator*= (unsigned long rhs) { return *this *= _Self(rhs); }
+  _Self& operator/= (unsigned long rhs) { return *this /= _Self(rhs); }
+  _Self& operator%= (unsigned long rhs) { return *this %= _Self(rhs); }
+  _Self& operator&= (unsigned long rhs) { return *this &= _Self(rhs); }
+  _Self& operator|= (unsigned long rhs) { return *this |= _Self(rhs); }
+  _Self& operator^= (unsigned long rhs) { return *this ^= _Self(rhs); }
+
+  // Increment and decrement
+  _Self& operator++() { return (*this) += 1; }
+  _Self& operator--() { return (*this) -= 1; }
+  _Self operator++(int) { _Self temp(*this); ++(*this); return temp; }
+  _Self operator--(int) { _Self temp(*this); --(*this); return temp; }
+};
+
+// Comparison operators.
+template <class _Tp> bool operator==(const _compound_int<_Tp>&, const _compound_int<_Tp>&);	// platform specific
+template <class _Tp> bool operator<(const _compound_int<_Tp>&, const _compound_int<_Tp>&);	// platform specific
+
+template <class _Tp> inline bool operator==(const _compound_int<_Tp>& lhs, unsigned long rhs) { return lhs == _compound_int<_Tp>(rhs); }
+template <class _Tp> inline bool operator==(unsigned long lhs, const _compound_int<_Tp>& rhs) { return rhs == lhs; }
+
+template <class _Tp> inline bool operator< (const _compound_int<_Tp>& lhs, unsigned long rhs) { return lhs < _compound_int<_Tp>(rhs); }
+template <class _Tp> inline bool operator< (unsigned long lhs, const _compound_int<_Tp>& rhs) { return _compound_int<_Tp>(lhs) < rhs; }
+
+template <class _Tp> inline bool operator!=(const _compound_int<_Tp>& lhs, unsigned long rhs) { return !(lhs == rhs); }
+template <class _Tp> inline bool operator!=(unsigned long lhs, const _compound_int<_Tp>& rhs) { return !(lhs == rhs); }
+
+template <class _Tp> inline bool operator> (const _compound_int<_Tp>& lhs, unsigned long rhs) { return rhs < lhs; }
+template <class _Tp> inline bool operator> (unsigned long lhs, const _compound_int<_Tp>& rhs) { return rhs < lhs; }
+
+template <class _Tp> inline bool operator<=(const _compound_int<_Tp>& lhs, unsigned long rhs) { return !(lhs > rhs); }
+template <class _Tp> inline bool operator<=(unsigned long lhs, const _compound_int<_Tp>& rhs) { return !(lhs > rhs); }
+
+template <class _Tp> inline bool operator>=(const _compound_int<_Tp>& lhs, unsigned long rhs) { return !(lhs < rhs); }
+template <class _Tp> inline bool operator>=(unsigned long lhs, const _compound_int<_Tp>& rhs) { return !(lhs < rhs); }
+
+// Unary non-member arithmetic operators.
+template <class _Tp> unsigned long to_ulong(const _compound_int<_Tp>&);			// platform specific
+template <class _Tp> _compound_int<_Tp> operator~(const _compound_int<_Tp>&);	// platform specific
+
+template <class _Tp> inline _compound_int<_Tp> operator+(const _compound_int<_Tp>& val) {return val;}
+template <class _Tp> inline _compound_int<_Tp> operator-(const _compound_int<_Tp>& val) {return 0 - val;}
+template <class _Tp> inline bool operator!(const _compound_int<_Tp>& val) {return val==0;}
+
+// Non-member arithmetic operations involving two _compound_int arguments
+template <class _Tp> inline _compound_int<_Tp> operator+(const _compound_int<_Tp>& lhs, const _compound_int<_Tp>& rhs) { _compound_int<_Tp> temp(lhs); return temp += rhs; }
+template <class _Tp> inline _compound_int<_Tp> operator-(const _compound_int<_Tp>& lhs, const _compound_int<_Tp>& rhs) { _compound_int<_Tp> temp(lhs); return temp -= rhs; }
+template <class _Tp> inline _compound_int<_Tp> operator*(const _compound_int<_Tp>& lhs, const _compound_int<_Tp>& rhs) { _compound_int<_Tp> temp(lhs); return temp *= rhs; }
+template <class _Tp> inline _compound_int<_Tp> operator/(const _compound_int<_Tp>& lhs, const _compound_int<_Tp>& rhs) { _compound_int<_Tp> temp(lhs); return temp /= rhs; }
+template <class _Tp> inline _compound_int<_Tp> operator%(const _compound_int<_Tp>& lhs, const _compound_int<_Tp>& rhs) { _compound_int<_Tp> temp(lhs); return temp %= rhs; }
+template <class _Tp> inline _compound_int<_Tp> operator&(const _compound_int<_Tp>& lhs, const _compound_int<_Tp>& rhs) { _compound_int<_Tp> temp(lhs); return temp &= rhs; }
+template <class _Tp> inline _compound_int<_Tp> operator|(const _compound_int<_Tp>& lhs, const _compound_int<_Tp>& rhs) { _compound_int<_Tp> temp(lhs); return temp |= rhs; }
+template <class _Tp> inline _compound_int<_Tp> operator^(const _compound_int<_Tp>& lhs, const _compound_int<_Tp>& rhs) { _compound_int<_Tp> temp(lhs); return temp ^= rhs; }
+
+// Non-member arithmetic operations involving one built-in integer argument.
+template <class _Tp> inline _compound_int<_Tp> operator+(const _compound_int<_Tp>& lhs, unsigned long rhs) { return lhs + _compound_int<_Tp>(rhs); }
+template <class _Tp> inline _compound_int<_Tp> operator+(unsigned long lhs, const _compound_int<_Tp>& rhs) { return _compound_int<_Tp>(lhs) + rhs; }
+
+template <class _Tp> inline _compound_int<_Tp> operator-(const _compound_int<_Tp>& lhs, unsigned long rhs) { return lhs - _compound_int<_Tp>(rhs); }
+template <class _Tp> inline _compound_int<_Tp> operator-(unsigned long lhs, const _compound_int<_Tp>& rhs) { return _compound_int<_Tp>(lhs) - rhs; }
+
+template <class _Tp> inline _compound_int<_Tp> operator*(const _compound_int<_Tp>& lhs, unsigned long rhs) { return lhs * _compound_int<_Tp>(rhs); }
+template <class _Tp> inline _compound_int<_Tp> operator*(unsigned long lhs, const _compound_int<_Tp>& rhs) { return _compound_int<_Tp>(lhs) * rhs; }
+
+template <class _Tp> inline _compound_int<_Tp> operator/(const _compound_int<_Tp>& lhs, unsigned long rhs) { return lhs / _compound_int<_Tp>(rhs); }
+template <class _Tp> inline _compound_int<_Tp> operator/(unsigned long lhs, const _compound_int<_Tp>& rhs) { return _compound_int<_Tp>(lhs) / rhs; }
+
+template <class _Tp> inline _compound_int<_Tp> operator%(const _compound_int<_Tp>& lhs, unsigned long rhs) { return lhs % _compound_int<_Tp>(rhs); }
+template <class _Tp> inline _compound_int<_Tp> operator%(unsigned long lhs, const _compound_int<_Tp>& rhs) { return _compound_int<_Tp>(lhs) % rhs; }
+
+template <class _Tp> inline _compound_int<_Tp> operator&(const _compound_int<_Tp>& lhs, unsigned long rhs) { return lhs & _compound_int<_Tp>(rhs); }
+template <class _Tp> inline _compound_int<_Tp> operator&(unsigned long lhs, const _compound_int<_Tp>& rhs) { return _compound_int<_Tp>(lhs) & rhs; }
+
+template <class _Tp> inline _compound_int<_Tp> operator|(const _compound_int<_Tp>& lhs, unsigned long rhs) { return lhs | _compound_int<_Tp>(rhs); }
+template <class _Tp> inline _compound_int<_Tp> operator|(unsigned long lhs, const _compound_int<_Tp>& rhs) { return _compound_int<_Tp>(lhs) | rhs; }
+
+template <class _Tp> inline _compound_int<_Tp> operator^(const _compound_int<_Tp>& lhs, unsigned long rhs) { return lhs ^ _compound_int<_Tp>(rhs); }
+template <class _Tp> inline _compound_int<_Tp> operator^(unsigned long lhs, const _compound_int<_Tp>& rhs) { return _compound_int<_Tp>(lhs) ^ rhs; }
+
+template <class _Tp> inline _compound_int<_Tp> operator<<(const _compound_int<_Tp>& lhs, unsigned int rhs) { _compound_int<_Tp> temp(lhs); return temp <<= rhs; }
+template <class _Tp> inline _compound_int<_Tp> operator>>(const _compound_int<_Tp>& lhs, unsigned int rhs) { _compound_int<_Tp> temp(lhs); return temp >>= rhs; }
+
+
+
+
+// platform specific specializations
+
+#if defined(__MRC__)||defined(__SC__)
+
+_STLP_END_NAMESPACE // ugly!
+# include <Math64.h>
+# include <utility>
+# undef modff		//*TY 04/06/2000 - defined in <math.h> which conflicts with <fp.h> definition
+# include <fp.h>
+
+_STLP_BEGIN_NAMESPACE
+
+# if TYPE_LONGLONG 
+typedef UInt64 uint64;
+# define ULL(x) (U64SetU(x))
+
+# else
+//	Apple's mpw sc compiler for 68k macintosh does not support native 64bit integer type. 
+//	Instead, it comes with external support library and struct data type representing 64bit int:
+//	
+//		struct UnsignedWide {
+//			UInt32 	hi;
+//			UInt32 	lo;
+//		};
+
+typedef _compound_int<UnsignedWide> uint64;
+# define ULL(x) uint64(x)
+# define ULL2(hi,lo) {hi,lo}
+
+// Constructors, destructor, assignment operator.
+_STLP_TEMPLATE_NULL inline _compound_int<UnsignedWide>::_compound_int() { hi = 0; lo = 0; }
+_STLP_TEMPLATE_NULL inline _compound_int<UnsignedWide>::_compound_int(unsigned long val) { hi = 0; lo = val; }
+_STLP_TEMPLATE_NULL inline _compound_int<UnsignedWide>::_compound_int(unsigned long h, unsigned long l) { hi = h; lo = l; }
+
+// Arithmetic op= operations involving two _compound_int.
+_STLP_TEMPLATE_NULL inline _compound_int<UnsignedWide>& _compound_int<UnsignedWide>::operator+= (const _compound_int<UnsignedWide>& rhs) { *this = U64Add( *this, rhs ); return *this; }
+_STLP_TEMPLATE_NULL inline _compound_int<UnsignedWide>& _compound_int<UnsignedWide>::operator-= (const _compound_int<UnsignedWide>& rhs) { *this = U64Subtract( *this, rhs ); return *this; }
+_STLP_TEMPLATE_NULL inline _compound_int<UnsignedWide>& _compound_int<UnsignedWide>::operator*= (const _compound_int<UnsignedWide>& rhs) { *this = U64Multiply( *this, rhs ); return *this; }
+_STLP_TEMPLATE_NULL inline _compound_int<UnsignedWide>& _compound_int<UnsignedWide>::operator/= (const _compound_int<UnsignedWide>& rhs) { *this = U64Divide( *this, rhs, NULL ); return *this; }
+_STLP_TEMPLATE_NULL inline _compound_int<UnsignedWide>& _compound_int<UnsignedWide>::operator%= (const _compound_int<UnsignedWide>& rhs) { U64Divide( *this, rhs, this ); return *this; }
+_STLP_TEMPLATE_NULL inline _compound_int<UnsignedWide>& _compound_int<UnsignedWide>::operator&= (const _compound_int<UnsignedWide>& rhs) { *this = U64BitwiseAnd( *this, rhs ); return *this; }
+_STLP_TEMPLATE_NULL inline _compound_int<UnsignedWide>& _compound_int<UnsignedWide>::operator|= (const _compound_int<UnsignedWide>& rhs) { *this = U64BitwiseOr( *this, rhs ); return *this; }
+_STLP_TEMPLATE_NULL inline _compound_int<UnsignedWide>& _compound_int<UnsignedWide>::operator^= (const _compound_int<UnsignedWide>& rhs) { *this = U64BitwiseEor( *this, rhs ); return *this; }
+
+// Arithmetic op= operations involving built-in integer.
+_STLP_TEMPLATE_NULL inline _compound_int<UnsignedWide>& _compound_int<UnsignedWide>::operator<<= (unsigned int rhs) { *this = U64ShiftLeft( *this, rhs ); return *this; }
+_STLP_TEMPLATE_NULL inline _compound_int<UnsignedWide>& _compound_int<UnsignedWide>::operator>>= (unsigned int rhs) { *this = U64ShiftRight( *this, rhs ); return *this; }
+
+// Comparison operators.
+_STLP_TEMPLATE_NULL inline bool operator==(const _compound_int<UnsignedWide>& lhs, const _compound_int<UnsignedWide>& rhs) { return (lhs.hi == rhs.hi) && (lhs.lo == rhs.lo); }
+_STLP_TEMPLATE_NULL inline bool operator< (const _compound_int<UnsignedWide>& lhs, const _compound_int<UnsignedWide>& rhs) { return U64Compare( lhs, rhs ) < 0; }
+_STLP_TEMPLATE_NULL inline bool operator==(const _compound_int<UnsignedWide>& lhs, unsigned long rhs) { return (lhs.hi == 0) && (lhs.lo == rhs); }
+
+// Unary non-member arithmetic operators.
+_STLP_TEMPLATE_NULL inline unsigned long to_ulong(const _compound_int<UnsignedWide>& val) { return val.lo; }
+_STLP_TEMPLATE_NULL inline _compound_int<UnsignedWide> operator~(const _compound_int<UnsignedWide>& val) { return U64BitwiseNot( val ); }
+_STLP_TEMPLATE_NULL inline bool operator!(const _compound_int<UnsignedWide>& val) { return !((val.hi == 0) && (val.lo == 0)); }
+
+# endif // TYPE_LONGLONG
+#endif // __MRC__
+#endif // _UINT64_H
diff --git a/main/source/stlport/src/vc5.mak b/main/source/stlport/src/vc5.mak
new file mode 100644
index 00000000..b9118ae6
--- /dev/null
+++ b/main/source/stlport/src/vc5.mak
@@ -0,0 +1,25 @@
+#
+# Tools
+#
+
+CXX=cl.exe
+CC=cl.exe
+RC=rc
+
+LIB_BASENAME=stlport_vc5
+COMP=VC5
+
+# EXTRA_COMMON_FLAGS=/D "_MBCS" /D "_STLP_NO_FORCE_INSTANTIATE"
+EXTRA_COMMON_FLAGS=/Zm800 /FI "vc_warning_disable.h" /D "_MBCS"
+EXTRA_DEBUG_FLAGS=
+EXTRA_NDEBUG_FLAGS=
+
+all: all_static all_staticx
+
+!INCLUDE vc_common.mak
+
+#
+#
+
+
+
diff --git a/main/source/stlport/src/vc6-unicode.mak b/main/source/stlport/src/vc6-unicode.mak
new file mode 100644
index 00000000..a8e46088
--- /dev/null
+++ b/main/source/stlport/src/vc6-unicode.mak
@@ -0,0 +1,25 @@
+#
+# Tools
+#
+
+CXX=cl.exe
+CC=cl.exe
+RC=rc
+
+LIB_BASENAME=stlport_vc6
+COMP=VC6
+
+# EXTRA_COMMON_FLAGS=/D "_MBCS"
+EXTRA_COMMON_FLAGS=/Zm800 /FI "vc_warning_disable.h" /D "_MBCS"
+EXTRA_DEBUG_FLAGS=
+EXTRA_NDEBUG_FLAGS=
+
+all: platform all_static all_dynamic 
+
+!INCLUDE vc_common.mak
+
+#
+#
+
+
+
diff --git a/main/source/stlport/src/vc6.mak b/main/source/stlport/src/vc6.mak
new file mode 100644
index 00000000..a8e46088
--- /dev/null
+++ b/main/source/stlport/src/vc6.mak
@@ -0,0 +1,25 @@
+#
+# Tools
+#
+
+CXX=cl.exe
+CC=cl.exe
+RC=rc
+
+LIB_BASENAME=stlport_vc6
+COMP=VC6
+
+# EXTRA_COMMON_FLAGS=/D "_MBCS"
+EXTRA_COMMON_FLAGS=/Zm800 /FI "vc_warning_disable.h" /D "_MBCS"
+EXTRA_DEBUG_FLAGS=
+EXTRA_NDEBUG_FLAGS=
+
+all: platform all_static all_dynamic 
+
+!INCLUDE vc_common.mak
+
+#
+#
+
+
+
diff --git a/main/source/stlport/src/vc6_singlethreaded.mak b/main/source/stlport/src/vc6_singlethreaded.mak
new file mode 100644
index 00000000..a8e46088
--- /dev/null
+++ b/main/source/stlport/src/vc6_singlethreaded.mak
@@ -0,0 +1,25 @@
+#
+# Tools
+#
+
+CXX=cl.exe
+CC=cl.exe
+RC=rc
+
+LIB_BASENAME=stlport_vc6
+COMP=VC6
+
+# EXTRA_COMMON_FLAGS=/D "_MBCS"
+EXTRA_COMMON_FLAGS=/Zm800 /FI "vc_warning_disable.h" /D "_MBCS"
+EXTRA_DEBUG_FLAGS=
+EXTRA_NDEBUG_FLAGS=
+
+all: platform all_static all_dynamic 
+
+!INCLUDE vc_common.mak
+
+#
+#
+
+
+
diff --git a/main/source/stlport/src/vc7.mak b/main/source/stlport/src/vc7.mak
new file mode 100644
index 00000000..769b2a24
--- /dev/null
+++ b/main/source/stlport/src/vc7.mak
@@ -0,0 +1,25 @@
+#
+# STLport makefile for VC++ 7 (.NET)
+#
+
+CXX=cl.exe
+CC=cl.exe
+RC=rc
+
+LIB_BASENAME=stlport_vc7
+COMP=VC7
+
+# EXTRA_COMMON_FLAGS=/D "_MBCS"
+EXTRA_COMMON_FLAGS=/FI "vc_warning_disable.h" /D "_MBCS"
+EXTRA_DEBUG_FLAGS=
+EXTRA_NDEBUG_FLAGS=
+
+all: platform all_static all_dynamic 
+
+!INCLUDE vc_common.mak
+
+#
+#
+
+
+
diff --git a/main/source/stlport/src/vc71.mak b/main/source/stlport/src/vc71.mak
new file mode 100644
index 00000000..f9bba526
--- /dev/null
+++ b/main/source/stlport/src/vc71.mak
@@ -0,0 +1,25 @@
+#
+# STLport makefile for VC++ 7.1 (.NET 2003)
+#
+
+CXX=cl.exe
+CC=cl.exe
+RC=rc
+
+LIB_BASENAME=stlport_vc71
+COMP=VC71
+
+# EXTRA_COMMON_FLAGS=/D "_MBCS"
+EXTRA_COMMON_FLAGS=/FI "vc_warning_disable.h" /D "_MBCS"
+EXTRA_DEBUG_FLAGS=
+EXTRA_NDEBUG_FLAGS=
+
+all: platform all_static all_dynamic 
+
+!INCLUDE vc_common.mak
+
+#
+#
+
+
+
diff --git a/main/source/stlport/src/vc_common.mak b/main/source/stlport/src/vc_common.mak
new file mode 100644
index 00000000..5c00798a
--- /dev/null
+++ b/main/source/stlport/src/vc_common.mak
@@ -0,0 +1,115 @@
+#
+#
+
+
+#
+# Tools
+#
+
+#Default tools
+
+!IF "$(CC)" == ""
+CC=cl.exe
+!ENDIF
+!IF "$(CXX)" == ""
+CXX=cl.exe
+!ENDIF
+!IF "$(DYN_LINK)" == ""
+DYN_LINK=link.exe
+!ENDIF
+!IF "$(LINK)" == ""
+LINK=lib.exe
+!ENDIF
+
+#Files extension
+
+OBJEXT=obj
+DYNEXT=dll
+STEXT=lib
+
+PATH_SEP=\\
+
+MKDIR=-mkdir
+LINK_OUT=/out:
+DYNLINK_OUT=/out:
+STATIC_SUFFIX=_static
+INSTALL_STEP=install_vc
+
+!include common_macros_windows.mak
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+RM=-rd /S /Q
+!ELSE 
+RM=-deltree /Y
+NULL=nul
+!ENDIF 
+
+
+#
+# Flags
+#
+
+# FLAGS_COMMON =/nologo /c /W3 /GR /GX /D "WIN32" /D "_WINDOWS" /I "$(STLPORT_DIR)" $(EXTRA_COMMON_FLAGS)
+FLAGS_COMMON =/nologo /c /Zi /W3 /GR /GX /D "WIN32" /D "_WINDOWS" /I "$(STLPORT_DIR)" $(EXTRA_COMMON_FLAGS)
+FLAGS_COMMON_static = $(FLAGS_COMMON) /FD  /D "_STLP_NO_FORCE_INSTANTIATE"
+FLAGS_COMMON_dynamic = $(FLAGS_COMMON)
+
+FLAGS_DEBUG=/Gm /Od /D_DEBUG $(EXTRA_DEBUG_FLAGS)
+# FLAGS_DEBUG=/Zi /Gm /Od /D_DEBUG $(EXTRA_DEBUG_FLAGS)
+FLAGS_NDEBUG=/O2 /DNDEBUG  $(EXTRA_NDEBUG_FLAGS)
+
+LDFLAGS_COMMON=/nologo /machine:I386 /debugtype:cv
+LDFLAGS_DEBUG=/debug
+LDFLAGS_RELEASE=/opt:ref
+
+LDFLAGS_COMMON_static=$(LDFLAGS_COMMON)
+LDFLAGS_COMMON_dynamic=$(LDFLAGS_COMMON) /dll /incremental:no
+
+
+CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd $(FLAGS_DEBUG) /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\"
+
+CXXFLAGS_DEBUG_staticx=$(FLAGS_COMMON_static) /MDd $(FLAGS_DEBUG) /Fo"$(DEBUG_OBJDIR_staticx)\\" /Fd"$(DEBUG_OBJDIR_staticx)\\"
+
+CXXFLAGS_DEBUG_dynamic=$(FLAGS_COMMON_dynamic) /MDd $(FLAGS_DEBUG) /Fo"$(DEBUG_OBJDIR_dynamic)\\" /Fd"$(DEBUG_OBJDIR_dynamic)\\"
+
+CXXFLAGS_STLDEBUG_static=$(FLAGS_COMMON_static) /MTd $(FLAGS_DEBUG) /D "_STLP_DEBUG" /Fo"$(STLDEBUG_OBJDIR_static)\\" /Fd"$(STLDEBUG_OBJDIR_static)\\"
+
+CXXFLAGS_STLDEBUG_staticx=$(FLAGS_COMMON_static) /MDd $(FLAGS_DEBUG) /D "_STLP_DEBUG" /Fo"$(STLDEBUG_OBJDIR_staticx)\\" /Fd"$(STLDEBUG_OBJDIR_staticx)\\"
+
+CXXFLAGS_STLDEBUG_dynamic=$(FLAGS_COMMON_dynamic) /MDd $(FLAGS_DEBUG) /D "_STLP_DEBUG" /Fo"$(STLDEBUG_OBJDIR_dynamic)\\" /Fd"$(STLDEBUG_OBJDIR_dynamic)\\"
+
+
+LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)
+LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)"
+LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static)
+LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 
+
+# LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)  /DEBUGTYPE:CV
+# LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" 
+# LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static)  /DEBUGTYPE:CV
+# LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 
+
+CXXFLAGS_RELEASE_static=$(FLAGS_COMMON_static) /MT $(FLAGS_NDEBUG) /Fo"$(RELEASE_OBJDIR_static)\\" /Fd"$(RELEASE_OBJDIR_static)\\"
+
+CXXFLAGS_RELEASE_staticx=$(FLAGS_COMMON_static) /MD $(FLAGS_NDEBUG) /Fo"$(RELEASE_OBJDIR_staticx)\\" /Fd"$(RELEASE_OBJDIR_staticx)\\"
+
+CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /MD $(FLAGS_NDEBUG) /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\"
+
+LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)
+LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_RELEASE) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
+# LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
+
+RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res
+RESFILE_debug=$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.res
+RESFILE_stldebug=$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.res
+
+
+#
+# Rules
+#
+
+!include common_rules.mak
+
+!include nmake_common.mak
+
diff --git a/main/source/stlport/src/vc_common_singlethreaded.mak b/main/source/stlport/src/vc_common_singlethreaded.mak
new file mode 100644
index 00000000..5ec72a43
--- /dev/null
+++ b/main/source/stlport/src/vc_common_singlethreaded.mak
@@ -0,0 +1,115 @@
+#
+#
+
+
+#
+# Tools
+#
+
+#Default tools
+
+!IF "$(CC)" == ""
+CC=cl.exe
+!ENDIF
+!IF "$(CXX)" == ""
+CXX=cl.exe
+!ENDIF
+!IF "$(DYN_LINK)" == ""
+DYN_LINK=link.exe
+!ENDIF
+!IF "$(LINK)" == ""
+LINK=lib.exe
+!ENDIF
+
+#Files extension
+
+OBJEXT=obj
+DYNEXT=dll
+STEXT=lib
+
+PATH_SEP=\\
+
+MKDIR=-mkdir
+LINK_OUT=/out:
+DYNLINK_OUT=/out:
+STATIC_SUFFIX=_static
+INSTALL_STEP=install_vc
+
+!include common_macros_windows.mak
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+RM=-rd /S /Q
+!ELSE 
+RM=-deltree /Y
+NULL=nul
+!ENDIF 
+
+
+#
+# Flags
+#
+
+# FLAGS_COMMON =/nologo /c /W3 /GR /GX /D "WIN32" /D "_WINDOWS" /I "$(STLPORT_DIR)" $(EXTRA_COMMON_FLAGS)
+FLAGS_COMMON =/nologo /c /Zi /W3 /GR /GX /D "WIN32" /D "_WINDOWS" /I "$(STLPORT_DIR)" $(EXTRA_COMMON_FLAGS)
+FLAGS_COMMON_static = $(FLAGS_COMMON) /FD  /D "_STLP_NO_FORCE_INSTANTIATE" /D "_NOTHREADS"
+FLAGS_COMMON_dynamic = $(FLAGS_COMMON)
+
+FLAGS_DEBUG=/Gm /Od /D_DEBUG $(EXTRA_DEBUG_FLAGS)
+# FLAGS_DEBUG=/Zi /Gm /Od /D_DEBUG $(EXTRA_DEBUG_FLAGS)
+FLAGS_NDEBUG=/O2 /DNDEBUG  $(EXTRA_NDEBUG_FLAGS)
+
+LDFLAGS_COMMON=/nologo /machine:I386 /debugtype:cv
+LDFLAGS_DEBUG=/debug
+LDFLAGS_RELEASE=/opt:ref
+
+LDFLAGS_COMMON_static=$(LDFLAGS_COMMON)
+LDFLAGS_COMMON_dynamic=$(LDFLAGS_COMMON) /dll /incremental:no
+
+
+CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MLd $(FLAGS_DEBUG) /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\"
+
+CXXFLAGS_DEBUG_staticx=$(FLAGS_COMMON_static) /MDd $(FLAGS_DEBUG) /Fo"$(DEBUG_OBJDIR_staticx)\\" /Fd"$(DEBUG_OBJDIR_staticx)\\"
+
+CXXFLAGS_DEBUG_dynamic=$(FLAGS_COMMON_dynamic) /MDd $(FLAGS_DEBUG) /Fo"$(DEBUG_OBJDIR_dynamic)\\" /Fd"$(DEBUG_OBJDIR_dynamic)\\"
+
+CXXFLAGS_STLDEBUG_static=$(FLAGS_COMMON_static) /MLd $(FLAGS_DEBUG) /D "_STLP_DEBUG" /Fo"$(STLDEBUG_OBJDIR_static)\\" /Fd"$(STLDEBUG_OBJDIR_static)\\"
+
+CXXFLAGS_STLDEBUG_staticx=$(FLAGS_COMMON_static) /MDd $(FLAGS_DEBUG) /D "_STLP_DEBUG" /Fo"$(STLDEBUG_OBJDIR_staticx)\\" /Fd"$(STLDEBUG_OBJDIR_staticx)\\"
+
+CXXFLAGS_STLDEBUG_dynamic=$(FLAGS_COMMON_dynamic) /MDd $(FLAGS_DEBUG) /D "_STLP_DEBUG" /Fo"$(STLDEBUG_OBJDIR_dynamic)\\" /Fd"$(STLDEBUG_OBJDIR_dynamic)\\"
+
+
+LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)
+LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)"
+LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static)
+LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 
+
+# LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)  /DEBUGTYPE:CV
+# LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" 
+# LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static)  /DEBUGTYPE:CV
+# LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 
+
+CXXFLAGS_RELEASE_static=$(FLAGS_COMMON_static) /ML $(FLAGS_NDEBUG) /Fo"$(RELEASE_OBJDIR_static)\\" /Fd"$(RELEASE_OBJDIR_static)\\"
+
+CXXFLAGS_RELEASE_staticx=$(FLAGS_COMMON_static) /MD $(FLAGS_NDEBUG) /Fo"$(RELEASE_OBJDIR_staticx)\\" /Fd"$(RELEASE_OBJDIR_staticx)\\"
+
+CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /MD $(FLAGS_NDEBUG) /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\"
+
+LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)
+LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_RELEASE) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
+# LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
+
+RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res
+RESFILE_debug=$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.res
+RESFILE_stldebug=$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.res
+
+
+#
+# Rules
+#
+
+!include common_rules.mak
+
+!include nmake_common.mak
+
diff --git a/main/source/stlport/src/vc_warning_disable.h b/main/source/stlport/src/vc_warning_disable.h
new file mode 100644
index 00000000..34ecfea6
--- /dev/null
+++ b/main/source/stlport/src/vc_warning_disable.h
@@ -0,0 +1,23 @@
+// vc_warning_disable.h
+#pragma warning( disable : 4786 ) // identifier truncated to 255 characters
+#pragma warning( disable : 4244 ) // implicit conversion: possible loss of data
+#pragma warning( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
+#pragma warning( disable : 4189) // local variable is initialized but not referenced
+#pragma warning( disable : 4100) // unreferenced formal parameter
+#pragma warning( disable : 4245) // conversion from 'const int' to 'unsigned long', signed/unsigned mismatch
+#pragma warning( disable : 4660) // template-class specialization 'basic_filebuf<char,class _STLD::char_traits<char> >' is already instantiated
+#pragma warning( disable :  4701) // local variable 'base' may be used without having been initialized
+#pragma warning( disable : 4075) // initializers put in unrecognized initialization area
+#pragma warning( disable : 4673) // throwing class with private base class
+#pragma warning( disable : 4670) // throwing class with private base class
+#pragma warning( disable : 4018) // signed/unsigned mismatch
+#pragma warning( disable : 4505 ) // unreferenced local function has been removed
+#pragma warning( disable : 4146 ) // unary minus applied to unsigned type
+#pragma warning( disable : 4244 ) // arithmetic conversion - possible loss of data
+#pragma warning( disable : 4290 ) // c++ exception specification ignored
+
+// dwa 1/28/00 - actually I think this may indicate real bugs. We should look
+// into these
+#pragma warning( disable : 4018 ) // signed/unsigned mismatch
+#pragma warning( disable : 4251 ) // DLL interface needed
+#pragma warning( disable : 4284 ) // for -> operator
diff --git a/main/source/stlport/src/watcom-qnx.mak b/main/source/stlport/src/watcom-qnx.mak
new file mode 100644
index 00000000..37ed8504
--- /dev/null
+++ b/main/source/stlport/src/watcom-qnx.mak
@@ -0,0 +1,45 @@
+#
+# compiler
+#
+CC = cc
+CXX = $(CC)
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_watcom
+
+#
+# guts for common stuff
+#
+#
+LINK=ar crv
+DYN_LINK=ar crv
+
+OBJEXT=o
+DYNEXT=so
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=WATCOM
+INSTALL_STEP = install_unix 
+
+all: all_dynamic symbolic_links  all_static 
+
+CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+
+include common_percent_rules.mak
+
+include common_rules.mak
+
+
diff --git a/main/source/stlport/src/xlC50.mak b/main/source/stlport/src/xlC50.mak
new file mode 100644
index 00000000..57901c20
--- /dev/null
+++ b/main/source/stlport/src/xlC50.mak
@@ -0,0 +1,43 @@
+#
+# compiler
+#
+CC = xlc_r -qcpluscmt
+CXX = xlC_r -qnotempinc
+
+#
+# Basename for libraries
+#
+LIB_BASENAME = libstlport_xlC50
+
+#
+# guts for common stuff
+#
+#
+
+LINK=ar crv
+
+OBJEXT=o
+DYNEXT=so
+STEXT=a
+RM=rm -rf
+PATH_SEP=/
+MKDIR=mkdir -p
+COMP=XLC50-AIX
+INSTALL_STEP = install_unix 
+
+# Alex Vanic, 07Aug2001, only want static libraries.
+all: all_static
+
+include common_macros.mak
+
+CXXFLAGS_COMMON = -I${STLPORT_DIR}
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+
+include common_percent_rules.mak
+include common_rules.mak
+
diff --git a/main/source/stlport/stlport/BC50/README b/main/source/stlport/stlport/BC50/README
new file mode 100644
index 00000000..3d46c5bb
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/README
@@ -0,0 +1,8 @@
+
+This directory should be included in search path when compiling
+with Borland C++ 5.0x compiler (maybe later ones, too).
+
+It provides wrappers that force inclusion of STLport files without extensions.
+If you want to preserve old-style HP semantics, include ../old_hp BEFORE this directory
+to include HP-style STL headers (with "using" directives). If namespaces are disabled,
+this one should be enough.
diff --git a/main/source/stlport/stlport/BC50/algorith.h b/main/source/stlport/stlport/BC50/algorith.h
new file mode 100644
index 00000000..ecd3c937
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/algorith.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_algorithm_H
+#  define  __STLPORT_BC_algorithm_H
+
+#  include  <..\algorithm.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/alloc.h b/main/source/stlport/stlport/BC50/alloc.h
new file mode 100644
index 00000000..5214d9ee
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/alloc.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_memory_H
+#  define  __STLPORT_BC_memory_H
+
+#  include  <..\memory.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/bak/stddef.h b/main/source/stlport/stlport/BC50/bak/stddef.h
new file mode 100644
index 00000000..5f5d54f2
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/bak/stddef.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_cstddef_H
+#  define  __STLPORT_BC_cstddef_H
+
+#  include  <..\cstddef.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/bak/stdlib.h b/main/source/stlport/stlport/BC50/bak/stdlib.h
new file mode 100644
index 00000000..44eaff68
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/bak/stdlib.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#  include  <..\stdlib.h>
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/bitset.h b/main/source/stlport/stlport/BC50/bitset.h
new file mode 100644
index 00000000..f53a3974
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/bitset.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_bitset_H
+#  define  __STLPORT_BC_bitset_H
+
+#  include  <..\bitset.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/cassert.h b/main/source/stlport/stlport/BC50/cassert.h
new file mode 100644
index 00000000..612a6d5f
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/cassert.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_cassert_H
+#  define  __STLPORT_BC_cassert_H
+
+#  include  <..\cassert.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/cctype.h b/main/source/stlport/stlport/BC50/cctype.h
new file mode 100644
index 00000000..b6dd39fd
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/cctype.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_cctype_H
+#  define  __STLPORT_BC_cctype_H
+
+#  include  <..\cctype.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/cerrno.h b/main/source/stlport/stlport/BC50/cerrno.h
new file mode 100644
index 00000000..cd10ba50
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/cerrno.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_cerrno_H
+#  define  __STLPORT_BC_cerrno_H
+
+#  include  <..\cerrno.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/cfloat.h b/main/source/stlport/stlport/BC50/cfloat.h
new file mode 100644
index 00000000..b52e5cc7
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/cfloat.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_cfloat_H
+#  define  __STLPORT_BC_cfloat_H
+
+#  include  <..\cfloat.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/climits.h b/main/source/stlport/stlport/BC50/climits.h
new file mode 100644
index 00000000..85758bda
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/climits.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_climits_H
+#  define  __STLPORT_BC_climits_H
+
+#  include  <..\climits.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/clocale.h b/main/source/stlport/stlport/BC50/clocale.h
new file mode 100644
index 00000000..30b5becd
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/clocale.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_clocale_H
+#  define  __STLPORT_BC_clocale_H
+
+#  include  <..\clocale.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/cmath.h b/main/source/stlport/stlport/BC50/cmath.h
new file mode 100644
index 00000000..8cb1ec0f
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/cmath.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_cmath_H
+#  define  __STLPORT_BC_cmath_H
+
+#  include  <..\cmath.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/complex.h b/main/source/stlport/stlport/BC50/complex.h
new file mode 100644
index 00000000..2241f1cd
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/complex.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_complex_H
+#  define  __STLPORT_BC_complex_H
+
+#  include  <..\complex.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/csetjmp.h b/main/source/stlport/stlport/BC50/csetjmp.h
new file mode 100644
index 00000000..34d6fda9
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/csetjmp.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_csetjmp_H
+#  define  __STLPORT_BC_csetjmp_H
+
+#  include  <..\csetjmp.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/csignal.h b/main/source/stlport/stlport/BC50/csignal.h
new file mode 100644
index 00000000..6d41adb2
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/csignal.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_csignal_H
+#  define  __STLPORT_BC_csignal_H
+
+#  include  <..\csignal.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/cstdarg.h b/main/source/stlport/stlport/BC50/cstdarg.h
new file mode 100644
index 00000000..0e67dfc9
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/cstdarg.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_cstdarg_H
+#  define  __STLPORT_BC_cstdarg_H
+
+#  include  <..\cstdarg.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/cstddef.h b/main/source/stlport/stlport/BC50/cstddef.h
new file mode 100644
index 00000000..5f5d54f2
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/cstddef.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_cstddef_H
+#  define  __STLPORT_BC_cstddef_H
+
+#  include  <..\cstddef.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/cstdio.h b/main/source/stlport/stlport/BC50/cstdio.h
new file mode 100644
index 00000000..e5c5f4d5
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/cstdio.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_cstdio_H
+#  define  __STLPORT_BC_cstdio_H
+
+#  include  <..\cstdio.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/cstdlib.h b/main/source/stlport/stlport/BC50/cstdlib.h
new file mode 100644
index 00000000..19d198e9
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/cstdlib.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#  include  <..\cstdlib.>
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/cstring.h b/main/source/stlport/stlport/BC50/cstring.h
new file mode 100644
index 00000000..0f5f6e5e
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/cstring.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+#ifndef __STLPORT_BC_cstring_H
+#  define  __STLPORT_BC_cstring_H
+
+#  include  <..\cstring.>
+
+#endif
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/ctime.h b/main/source/stlport/stlport/BC50/ctime.h
new file mode 100644
index 00000000..99608212
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/ctime.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_ctime_H
+#  define  __STLPORT_BC_ctime_H
+
+#  include  <..\ctime.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/cwchar.h b/main/source/stlport/stlport/BC50/cwchar.h
new file mode 100644
index 00000000..ed9abe8a
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/cwchar.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_cwchar_H
+#  define  __STLPORT_BC_cwchar_H
+
+#  include  <..\cwchar.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/cwctype.h b/main/source/stlport/stlport/BC50/cwctype.h
new file mode 100644
index 00000000..cbd97544
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/cwctype.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_cwctype_H
+#  define  __STLPORT_BC_cwctype_H
+
+#  include  <..\cwctype.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/deque.h b/main/source/stlport/stlport/BC50/deque.h
new file mode 100644
index 00000000..4eddd871
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/deque.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_deque_H
+#  define  __STLPORT_BC_deque_H
+
+#  include  <..\deque.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/exceptio.h b/main/source/stlport/stlport/BC50/exceptio.h
new file mode 100644
index 00000000..190a425a
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/exceptio.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_exceptio_H
+#  define  __STLPORT_BC_exceptio_H
+
+#  include  <..\exception.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/fstream.h b/main/source/stlport/stlport/BC50/fstream.h
new file mode 100644
index 00000000..e58b95cf
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/fstream.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_fstream_H
+#  define  __STLPORT_BC_fstream_H
+
+#  include  <..\fstream.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/function.h b/main/source/stlport/stlport/BC50/function.h
new file mode 100644
index 00000000..4c08f21d
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/function.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_functional_H
+#  define  __STLPORT_BC_functional_H
+
+#  include  <..\functional.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/hash_map.h b/main/source/stlport/stlport/BC50/hash_map.h
new file mode 100644
index 00000000..22bba538
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/hash_map.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_hash_map_H
+#  define  __STLPORT_BC_hash_map_H
+
+#  include  <..\hash_map.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/hash_set.h b/main/source/stlport/stlport/BC50/hash_set.h
new file mode 100644
index 00000000..9971cbe2
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/hash_set.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_hash_set_H
+#  define  __STLPORT_BC_hash_set_H
+
+#  include  <..\hash_set.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/iomanip.h b/main/source/stlport/stlport/BC50/iomanip.h
new file mode 100644
index 00000000..d74ededd
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/iomanip.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_iomanip_H
+#  define  __STLPORT_BC_iomanip_H
+
+#  include  <..\iomanip.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/ios.h b/main/source/stlport/stlport/BC50/ios.h
new file mode 100644
index 00000000..e8d783f8
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/ios.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_ios_H
+#  define  __STLPORT_BC_ios_H
+
+#  include  <..\ios.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/iosfwd.h b/main/source/stlport/stlport/BC50/iosfwd.h
new file mode 100644
index 00000000..1c4449bd
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/iosfwd.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_iosfwd_H
+#  define  __STLPORT_BC_iosfwd_H
+
+#  include  <..\iosfwd.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/iostream.h b/main/source/stlport/stlport/BC50/iostream.h
new file mode 100644
index 00000000..1107ec08
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/iostream.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_iostream_H
+#  define  __STLPORT_BC_iostream_H
+
+#  include  <..\iostream.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/istream.h b/main/source/stlport/stlport/BC50/istream.h
new file mode 100644
index 00000000..d3c0b4e7
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/istream.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_istream_H
+#  define  __STLPORT_BC_istream_H
+
+#  include  <..\istream.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/iterator.h b/main/source/stlport/stlport/BC50/iterator.h
new file mode 100644
index 00000000..4f4a0cfd
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/iterator.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_iterator_H
+#  define  __STLPORT_BC_iterator_H
+
+#  include  <..\iterator.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/limits.h b/main/source/stlport/stlport/BC50/limits.h
new file mode 100644
index 00000000..3cad5189
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/limits.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+// include BC native <limits.h>
+
+#include  <..\climits.>
+
+#ifndef __IN_STLPORT_CLIMITS
+# include  <..\limits.>
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/list.h b/main/source/stlport/stlport/BC50/list.h
new file mode 100644
index 00000000..cb0c6a0e
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/list.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_list_H
+#  define  __STLPORT_BC_list_H
+
+#  include  <..\list.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/locale.h b/main/source/stlport/stlport/BC50/locale.h
new file mode 100644
index 00000000..264ed814
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/locale.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#  include  <..\clocale.>
+
+# ifndef __IN_STLPORT_CLOCALE
+#  include  <..\locale.>
+# endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/make_bc50.sh b/main/source/stlport/stlport/BC50/make_bc50.sh
new file mode 100644
index 00000000..f32b249b
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/make_bc50.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+for file in `cat ../export_names`
+do
+rm -fr $file.h
+cat stl_tmpl.h | sed -e "s/REPLACEME/$file/g" > $file.h
+done
+
+mv algorithm.h algorith.h
+mv functional.h function.h
+mv stdexcept.h stdexcep.h
+mv streambuf.h streambu.h
+mv strstream.h strstrea.h
diff --git a/main/source/stlport/stlport/BC50/map.h b/main/source/stlport/stlport/BC50/map.h
new file mode 100644
index 00000000..68ce5959
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/map.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_map_H
+#  define  __STLPORT_BC_map_H
+
+#  include  <..\map.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/memory.h b/main/source/stlport/stlport/BC50/memory.h
new file mode 100644
index 00000000..b933e3d3
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/memory.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_memory_H
+#  define  __STLPORT_BC_memory_H
+
+#  include  <..\include\memory.h>
+
+#  include  <..\memory.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/numeric.h b/main/source/stlport/stlport/BC50/numeric.h
new file mode 100644
index 00000000..80f3ff18
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/numeric.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_numeric_H
+#  define  __STLPORT_BC_numeric_H
+
+#  include  <..\numeric.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/ostream.h b/main/source/stlport/stlport/BC50/ostream.h
new file mode 100644
index 00000000..ea2edc26
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/ostream.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_ostream_H
+#  define  __STLPORT_BC_ostream_H
+
+#  include  <..\ostream.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/pthread_alloc.h b/main/source/stlport/stlport/BC50/pthread_alloc.h
new file mode 100644
index 00000000..0ae939f1
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/pthread_alloc.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_pthread_alloc_H
+#  define  __STLPORT_BC_pthread_alloc_H
+
+#  include  <..\pthread_alloc.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/queue.h b/main/source/stlport/stlport/BC50/queue.h
new file mode 100644
index 00000000..d3f9cca5
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/queue.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_queue_H
+#  define  __STLPORT_BC_queue_H
+
+#  include  <..\queue.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/rope.h b/main/source/stlport/stlport/BC50/rope.h
new file mode 100644
index 00000000..dbf3687c
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/rope.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_rope_H
+#  define  __STLPORT_BC_rope_H
+
+#  include  <..\rope.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/set.h b/main/source/stlport/stlport/BC50/set.h
new file mode 100644
index 00000000..0d18c8db
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/set.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_set_H
+#  define  __STLPORT_BC_set_H
+
+#  include  <..\set.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/slist.h b/main/source/stlport/stlport/BC50/slist.h
new file mode 100644
index 00000000..bc7bae69
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/slist.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_slist_H
+#  define  __STLPORT_BC_slist_H
+
+#  include  <..\slist.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/sstream.h b/main/source/stlport/stlport/BC50/sstream.h
new file mode 100644
index 00000000..60e45010
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/sstream.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_sstream_H
+#  define  __STLPORT_BC_sstream_H
+
+#  include  <..\sstream.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/stack.h b/main/source/stlport/stlport/BC50/stack.h
new file mode 100644
index 00000000..6d67f66f
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/stack.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_stack_H
+#  define  __STLPORT_BC_stack_H
+
+#  include  <..\stack.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/stdexcep.h b/main/source/stlport/stlport/BC50/stdexcep.h
new file mode 100644
index 00000000..b04b98cf
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/stdexcep.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_stdexcept_H
+#  define  __STLPORT_BC_stdexcept_H
+
+#  include  <..\stdexcept.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/stl_tmpl.h b/main/source/stlport/stlport/BC50/stl_tmpl.h
new file mode 100644
index 00000000..ed6e036e
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/stl_tmpl.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_REPLACEME_H
+#  define  __STLPORT_BC_REPLACEME_H
+
+#  include  <..\REPLACEME.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/streambu.h b/main/source/stlport/stlport/BC50/streambu.h
new file mode 100644
index 00000000..a75dbf77
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/streambu.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_streambuf_H
+#  define  __STLPORT_BC_streambuf_H
+
+#  include  <..\streambuf.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/streambuf.h b/main/source/stlport/stlport/BC50/streambuf.h
new file mode 100644
index 00000000..d6bc8589
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/streambuf.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_streambuf_H
+#  define  __STLPORT_BC_streambuf_H
+
+#  include  <..\streambuf.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/string.h b/main/source/stlport/stlport/BC50/string.h
new file mode 100644
index 00000000..1879c9f4
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/string.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+
+#  include <..\string.h>
+
+# ifndef __IN_STLPORT_CSTRING
+// okay, include STLPort header
+#  include  <..\string.>
+# endif /* __IN_STLPORT_CSTRING */
+
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/strstrea.h b/main/source/stlport/stlport/BC50/strstrea.h
new file mode 100644
index 00000000..75ff26f1
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/strstrea.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_strstream_H
+#  define  __STLPORT_BC_strstream_H
+
+#  include  <..\strstream.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/typeinfo.h b/main/source/stlport/stlport/BC50/typeinfo.h
new file mode 100644
index 00000000..602a1193
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/typeinfo.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_typeinfo_H
+#  define  __STLPORT_BC_typeinfo_H
+
+#  include  <..\typeinfo.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/using/cstring.h b/main/source/stlport/stlport/BC50/using/cstring.h
new file mode 100644
index 00000000..479b49a6
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/using/cstring.h
@@ -0,0 +1,54 @@
+using _STLP_VENDOR_CSTD::size_t;
+
+#  ifndef _STLP_NO_CSTD_FUNCTION_IMPORTS
+#   if defined(__MSL__) && __MC68K__ && !_No_BlockMove && __dest_os == __mac_os
+#    undef memcpy
+#    undef memmove
+inline void* memcpy(void* dst, const void* src, size_t len)
+{
+	return _STLP_VENDOR_CSTD::__memcpy(dst, src, len);
+}
+inline void* memmove(void* dst, const void* src, size_t len)
+{
+	return _STLP_VENDOR_CSTD::__memmove(dst, src, len);
+}
+#   else
+
+ using _STLP_VENDOR_CSTD::memmove;
+ using _STLP_VENDOR_CSTD::memcpy;
+
+#   endif
+
+# if ! defined (__BORLANDC__)
+using _STLP_VENDOR_CSTD::memchr;
+using _STLP_VENDOR_CSTD::strchr;
+using _STLP_VENDOR_CSTD::strpbrk;
+using _STLP_VENDOR_CSTD::strrchr;
+using _STLP_VENDOR_CSTD::strstr;
+# endif
+
+using _STLP_VENDOR_CSTD::memcmp;
+using _STLP_VENDOR_CSTD::memset;
+
+using _STLP_VENDOR_CSTD::strcat;
+
+# if !defined (strcmp)
+using _STLP_VENDOR_CSTD::strcmp;
+# endif
+
+using _STLP_VENDOR_CSTD::strcoll;
+# if !defined (strcpy)
+using _STLP_VENDOR_CSTD::strcpy;
+# endif
+using _STLP_VENDOR_CSTD::strcspn;
+using _STLP_VENDOR_CSTD::strerror;
+using _STLP_VENDOR_CSTD::strlen;
+using _STLP_VENDOR_CSTD::strncat;
+using _STLP_VENDOR_CSTD::strncmp;
+
+using _STLP_VENDOR_CSTD::strncpy;
+using _STLP_VENDOR_CSTD::strspn;
+
+using _STLP_VENDOR_CSTD::strtok;
+using _STLP_VENDOR_CSTD::strxfrm;
+#  endif /* _STLP_NO_CSTD_FUNCTION_IMPORTS */
diff --git a/main/source/stlport/stlport/BC50/using/fstream.h b/main/source/stlport/stlport/BC50/using/fstream.h
new file mode 100644
index 00000000..ec4f19b0
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/using/fstream.h
@@ -0,0 +1,19 @@
+#ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace _STLP_STD;
+#else
+using _STLP_NEW_IO_NAMESPACE::basic_filebuf;
+using _STLP_NEW_IO_NAMESPACE::filebuf;
+using _STLP_NEW_IO_NAMESPACE::basic_ifstream;
+using _STLP_NEW_IO_NAMESPACE::basic_ofstream;
+using _STLP_NEW_IO_NAMESPACE::ifstream;
+using _STLP_NEW_IO_NAMESPACE::ofstream;
+using _STLP_NEW_IO_NAMESPACE::basic_fstream;
+using _STLP_NEW_IO_NAMESPACE::fstream;
+
+# ifndef _STLP_NO_WIDE_STREAMS
+using _STLP_NEW_IO_NAMESPACE::wofstream;
+using _STLP_NEW_IO_NAMESPACE::wfilebuf;
+using _STLP_NEW_IO_NAMESPACE::wifstream;
+using _STLP_NEW_IO_NAMESPACE::wfstream;
+# endif
+#endif
diff --git a/main/source/stlport/stlport/BC50/using/iomanip.h b/main/source/stlport/stlport/BC50/using/iomanip.h
new file mode 100644
index 00000000..e918d406
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/using/iomanip.h
@@ -0,0 +1,6 @@
+using _STLP_NEW_IO_NAMESPACE::setiosflags;
+using _STLP_NEW_IO_NAMESPACE::resetiosflags;
+using _STLP_NEW_IO_NAMESPACE::setbase;
+using _STLP_NEW_IO_NAMESPACE::setfill;
+using _STLP_NEW_IO_NAMESPACE::setprecision;
+using _STLP_NEW_IO_NAMESPACE::setw;
diff --git a/main/source/stlport/stlport/BC50/using/ios.h b/main/source/stlport/stlport/BC50/using/ios.h
new file mode 100644
index 00000000..5534aaf0
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/using/ios.h
@@ -0,0 +1,41 @@
+#  ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace _STLP_NEW_IO_NAMESPACE;
+#  else
+
+using _STLP_NEW_IO_NAMESPACE::ios;
+using _STLP_NEW_IO_NAMESPACE::streamoff;
+using _STLP_NEW_IO_NAMESPACE::streamsize;
+
+using _STLP_NEW_IO_NAMESPACE::ios_base;
+using _STLP_NEW_IO_NAMESPACE::basic_ios;
+
+// _lib.std.ios.manip_, manipulators:	
+using _STLP_NEW_IO_NAMESPACE::boolalpha;
+using _STLP_NEW_IO_NAMESPACE::noboolalpha;
+using _STLP_NEW_IO_NAMESPACE::showbase;
+using _STLP_NEW_IO_NAMESPACE::noshowbase;
+using _STLP_NEW_IO_NAMESPACE::showpoint;
+using _STLP_NEW_IO_NAMESPACE::noshowpoint;
+using _STLP_NEW_IO_NAMESPACE::showpos;
+using _STLP_NEW_IO_NAMESPACE::noshowpos;
+using _STLP_NEW_IO_NAMESPACE::skipws;
+using _STLP_NEW_IO_NAMESPACE::noskipws;
+using _STLP_NEW_IO_NAMESPACE::uppercase;
+using _STLP_NEW_IO_NAMESPACE::nouppercase;
+
+// _lib.adjustfield.manip_ adjustfield:
+using _STLP_NEW_IO_NAMESPACE::internal;
+using _STLP_NEW_IO_NAMESPACE::left;
+using _STLP_NEW_IO_NAMESPACE::right;
+
+// _lib.basefield.manip_ basefield:
+using _STLP_NEW_IO_NAMESPACE::dec;
+using _STLP_NEW_IO_NAMESPACE::hex;
+using _STLP_NEW_IO_NAMESPACE::oct;
+
+// _lib.floatfield.manip_ floatfield:
+using _STLP_NEW_IO_NAMESPACE::fixed;
+using _STLP_NEW_IO_NAMESPACE::scientific;
+
+#  endif  /* _STLP_BROKEN_USING_DIRECTIVE */
+
diff --git a/main/source/stlport/stlport/BC50/using/iosfwd.h b/main/source/stlport/stlport/BC50/using/iosfwd.h
new file mode 100644
index 00000000..d02b9120
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/using/iosfwd.h
@@ -0,0 +1,54 @@
+# if defined (_STLP_USE_NEW_IOSTREAMS)
+using _STLP_NEW_IO_NAMESPACE::char_traits;
+using _STLP_NEW_IO_NAMESPACE::basic_ios;
+using _STLP_NEW_IO_NAMESPACE::basic_streambuf;
+using _STLP_NEW_IO_NAMESPACE::basic_istream;
+using _STLP_NEW_IO_NAMESPACE::basic_ostream;
+using _STLP_NEW_IO_NAMESPACE::basic_iostream;
+using _STLP_NEW_IO_NAMESPACE::basic_stringbuf;
+using _STLP_NEW_IO_NAMESPACE::basic_istringstream;
+using _STLP_NEW_IO_NAMESPACE::basic_ostringstream;
+using _STLP_NEW_IO_NAMESPACE::basic_stringstream;
+using _STLP_NEW_IO_NAMESPACE::basic_filebuf;
+using _STLP_NEW_IO_NAMESPACE::basic_ifstream;
+using _STLP_NEW_IO_NAMESPACE::basic_ofstream;
+using _STLP_NEW_IO_NAMESPACE::basic_fstream;
+using _STLP_NEW_IO_NAMESPACE::fpos;
+using _STLP_NEW_IO_NAMESPACE::istreambuf_iterator;
+using _STLP_NEW_IO_NAMESPACE::ostreambuf_iterator;
+using _STLP_NEW_IO_NAMESPACE::stringbuf;
+using _STLP_NEW_IO_NAMESPACE::istringstream;
+using _STLP_NEW_IO_NAMESPACE::ostringstream;
+using _STLP_NEW_IO_NAMESPACE::stringstream;
+# endif
+
+using _STLP_NEW_IO_NAMESPACE::ios;
+using _STLP_NEW_IO_NAMESPACE::streambuf;
+using _STLP_NEW_IO_NAMESPACE::istream;
+using _STLP_NEW_IO_NAMESPACE::ostream;
+using _STLP_NEW_IO_NAMESPACE::iostream;
+
+using _STLP_NEW_IO_NAMESPACE::filebuf;
+using _STLP_NEW_IO_NAMESPACE::ifstream;
+using _STLP_NEW_IO_NAMESPACE::ofstream;
+using _STLP_NEW_IO_NAMESPACE::fstream;
+
+using _STLP_NEW_IO_NAMESPACE::streampos;
+using _STLP_NEW_IO_NAMESPACE::streamoff;
+
+# if !defined (_STLP_NO_WIDE_STREAMS)
+using _STLP_NEW_IO_NAMESPACE::wios;
+using _STLP_NEW_IO_NAMESPACE::wstreambuf;
+using _STLP_NEW_IO_NAMESPACE::wistream;
+using _STLP_NEW_IO_NAMESPACE::wostream;
+using _STLP_NEW_IO_NAMESPACE::wiostream;
+using _STLP_NEW_IO_NAMESPACE::wstringbuf;
+using _STLP_NEW_IO_NAMESPACE::wistringstream;
+using _STLP_NEW_IO_NAMESPACE::wostringstream;
+using _STLP_NEW_IO_NAMESPACE::wstringstream;
+using _STLP_NEW_IO_NAMESPACE::wfilebuf;
+using _STLP_NEW_IO_NAMESPACE::wifstream;
+using _STLP_NEW_IO_NAMESPACE::wofstream;
+using _STLP_NEW_IO_NAMESPACE::wfstream;
+using _STLP_NEW_IO_NAMESPACE::wstreampos;
+# endif
diff --git a/main/source/stlport/stlport/BC50/using/iostream.h b/main/source/stlport/stlport/BC50/using/iostream.h
new file mode 100644
index 00000000..a062610e
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/using/iostream.h
@@ -0,0 +1,11 @@
+using _STLP_VENDOR_STD::cin;
+using _STLP_VENDOR_STD::cout;
+using _STLP_VENDOR_STD::cerr;
+using _STLP_VENDOR_STD::clog;
+
+# if ! defined (_STLP_NO_WIDE_STREAMS)
+using _STLP_VENDOR_STD::wcin;
+using _STLP_VENDOR_STD::wcout;
+using _STLP_VENDOR_STD::wcerr;
+using _STLP_VENDOR_STD::wclog;
+# endif
diff --git a/main/source/stlport/stlport/BC50/using/istream.h b/main/source/stlport/stlport/BC50/using/istream.h
new file mode 100644
index 00000000..e120d399
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/using/istream.h
@@ -0,0 +1,15 @@
+
+using _STLP_NEW_IO_NAMESPACE::basic_istream;
+using _STLP_NEW_IO_NAMESPACE::basic_iostream;
+
+using _STLP_NEW_IO_NAMESPACE::istream;
+using _STLP_NEW_IO_NAMESPACE::iostream;
+
+# if !defined (_STLP_NO_NATIVE_WIDE_STREAMS)
+using _STLP_NEW_IO_NAMESPACE::wistream;
+using _STLP_NEW_IO_NAMESPACE::wiostream;
+# endif
+
+#if !(defined (_STLP_MSVC) && (_STLP_MSVC < 1200))
+using _STLP_NEW_IO_NAMESPACE::ws;
+#endif
diff --git a/main/source/stlport/stlport/BC50/using/locale.h b/main/source/stlport/stlport/BC50/using/locale.h
new file mode 100644
index 00000000..d92b801e
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/using/locale.h
@@ -0,0 +1,62 @@
+// from <cwchar>
+#if !defined (_STLP_NO_MBSTATE_T)
+using _STLP_VENDOR_MB_NAMESPACE::mbstate_t;
+#endif
+
+// _lib.locale_, locale:
+using _STLP_NEW_IO_NAMESPACE::locale;
+using _STLP_NEW_IO_NAMESPACE::use_facet;
+using _STLP_NEW_IO_NAMESPACE::has_facet;
+
+// _lib.locale.convenience_, convenience interfaces:
+using _STLP_NEW_IO_NAMESPACE::isspace;
+using _STLP_NEW_IO_NAMESPACE::isprint;
+using _STLP_NEW_IO_NAMESPACE::iscntrl;
+using _STLP_NEW_IO_NAMESPACE::isupper;
+using _STLP_NEW_IO_NAMESPACE::islower;
+using _STLP_NEW_IO_NAMESPACE::isalpha;
+using _STLP_NEW_IO_NAMESPACE::isdigit;
+using _STLP_NEW_IO_NAMESPACE::ispunct;
+using _STLP_NEW_IO_NAMESPACE::isxdigit;
+using _STLP_NEW_IO_NAMESPACE::isalnum;
+using _STLP_NEW_IO_NAMESPACE::isgraph;
+using _STLP_NEW_IO_NAMESPACE::toupper;
+using _STLP_NEW_IO_NAMESPACE::tolower;
+
+// _lib.category.ctype_ and _lib.facet.ctype.special_, ctype:
+using _STLP_NEW_IO_NAMESPACE::ctype_base;
+using _STLP_NEW_IO_NAMESPACE::ctype;
+using _STLP_NEW_IO_NAMESPACE::ctype_byname;
+using _STLP_NEW_IO_NAMESPACE::codecvt_base;
+using _STLP_NEW_IO_NAMESPACE::codecvt;
+using _STLP_NEW_IO_NAMESPACE::codecvt_byname;
+
+// _lib.category.numeric_ and _lib.facet.numpunct_, numeric:
+using _STLP_NEW_IO_NAMESPACE::num_get;
+using _STLP_NEW_IO_NAMESPACE::num_put;
+using _STLP_NEW_IO_NAMESPACE::numpunct;
+using _STLP_NEW_IO_NAMESPACE::numpunct_byname;
+
+// _lib.category.collate_, collation:
+using _STLP_NEW_IO_NAMESPACE::collate;
+using _STLP_NEW_IO_NAMESPACE::collate_byname;
+
+// _lib.category.time_, date and time:
+using _STLP_NEW_IO_NAMESPACE::time_base;
+using _STLP_NEW_IO_NAMESPACE::time_get;
+using _STLP_NEW_IO_NAMESPACE::time_get_byname;
+using _STLP_NEW_IO_NAMESPACE::time_put;
+using _STLP_NEW_IO_NAMESPACE::time_put_byname;
+
+// _lib.category.monetary_, money:
+using _STLP_NEW_IO_NAMESPACE::money_base;
+using _STLP_NEW_IO_NAMESPACE::money_get;
+using _STLP_NEW_IO_NAMESPACE::money_put;
+using _STLP_NEW_IO_NAMESPACE::moneypunct;
+using _STLP_NEW_IO_NAMESPACE::moneypunct_byname;
+
+#if !defined (_STLP_OWN_IOSTREAMS) && !defined (_STLP_NO_NATIVE_MESSAGE_FACET)
+using _STLP_NEW_IO_NAMESPACE::messages_base;
+using _STLP_NEW_IO_NAMESPACE::messages;
+using _STLP_NEW_IO_NAMESPACE::messages_byname;
+#endif // _MSL_NO_MESSAGE_FACET
diff --git a/main/source/stlport/stlport/BC50/using/ostream.h b/main/source/stlport/stlport/BC50/using/ostream.h
new file mode 100644
index 00000000..f505f1cb
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/using/ostream.h
@@ -0,0 +1,10 @@
+using _STLP_NEW_IO_NAMESPACE::basic_ostream;
+using _STLP_NEW_IO_NAMESPACE::ostream;
+
+# ifndef _STLP_NO_WIDE_STREAMS
+using _STLP_NEW_IO_NAMESPACE::wostream;
+# endif
+
+using _STLP_NEW_IO_NAMESPACE::endl;
+using _STLP_NEW_IO_NAMESPACE::ends;
+using _STLP_NEW_IO_NAMESPACE::flush;
diff --git a/main/source/stlport/stlport/BC50/using/sstream.h b/main/source/stlport/stlport/BC50/using/sstream.h
new file mode 100644
index 00000000..f9ab695c
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/using/sstream.h
@@ -0,0 +1,16 @@
+using _STLP_NEW_IO_NAMESPACE::basic_stringbuf;
+using _STLP_NEW_IO_NAMESPACE::stringbuf;
+
+using _STLP_NEW_IO_NAMESPACE::basic_istringstream;
+using _STLP_NEW_IO_NAMESPACE::basic_ostringstream;
+using _STLP_NEW_IO_NAMESPACE::basic_stringstream;
+using _STLP_NEW_IO_NAMESPACE::istringstream;
+using _STLP_NEW_IO_NAMESPACE::ostringstream;
+using _STLP_NEW_IO_NAMESPACE::stringstream;
+
+#ifndef _STLP_NO_WIDE_STREAMS
+using _STLP_NEW_IO_NAMESPACE::wstringbuf;
+using _STLP_NEW_IO_NAMESPACE::wistringstream;
+using _STLP_NEW_IO_NAMESPACE::wostringstream;
+using _STLP_NEW_IO_NAMESPACE::wstringstream;
+#endif
diff --git a/main/source/stlport/stlport/BC50/using/streambuf.h b/main/source/stlport/stlport/BC50/using/streambuf.h
new file mode 100644
index 00000000..9507277c
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/using/streambuf.h
@@ -0,0 +1,5 @@
+using _STLP_NEW_IO_NAMESPACE::basic_streambuf;
+using _STLP_NEW_IO_NAMESPACE::streambuf;
+#ifndef _STLP_NO_WIDE_STREAMS
+using _STLP_NEW_IO_NAMESPACE::wstreambuf;
+# endif
diff --git a/main/source/stlport/stlport/BC50/using/strstream.h b/main/source/stlport/stlport/BC50/using/strstream.h
new file mode 100644
index 00000000..d1049058
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/using/strstream.h
@@ -0,0 +1,4 @@
+using _STLP_NEW_IO_NAMESPACE::strstreambuf;
+using _STLP_NEW_IO_NAMESPACE::istrstream;
+using _STLP_NEW_IO_NAMESPACE::ostrstream;
+using _STLP_NEW_IO_NAMESPACE::strstream;
diff --git a/main/source/stlport/stlport/BC50/utility.h b/main/source/stlport/stlport/BC50/utility.h
new file mode 100644
index 00000000..9d72c6c8
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/utility.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_utility_H
+#  define  __STLPORT_BC_utility_H
+
+#  include  <..\utility.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/valarray.h b/main/source/stlport/stlport/BC50/valarray.h
new file mode 100644
index 00000000..36daa35f
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/valarray.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_valarray_H
+#  define  __STLPORT_BC_valarray_H
+
+#  include  <..\valarray.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/BC50/vector.h b/main/source/stlport/stlport/BC50/vector.h
new file mode 100644
index 00000000..69b7b66e
--- /dev/null
+++ b/main/source/stlport/stlport/BC50/vector.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 1999 Boris Fomitchev
+ * AUTOMATICALLY GENERATED - DO NOT EDIT !
+ */
+
+/*
+ *
+ *  This wrapper is needed for Borland C++ 5.0 to get STLport 
+ *  header properly included
+ */
+
+#ifndef __STLPORT_BC_vector_H
+#  define  __STLPORT_BC_vector_H
+
+#  include  <..\vector.>
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/algorithm b/main/source/stlport/stlport/algorithm
new file mode 100644
index 00000000..a18a9eed
--- /dev/null
+++ b/main/source/stlport/stlport/algorithm
@@ -0,0 +1,60 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_ALGORITHM
+#define _STLP_ALGORITHM
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x1
+#  include <stl/_prolog.h>
+# endif
+
+#ifdef _STLP_PRAGMA_ONCE
+# pragma once
+#endif
+
+# if ! defined (_STLP_USE_NAMESPACES)
+// remove() conflicts, <cstdio> should always go first
+#  include <cstdio>
+# endif
+
+# ifndef _STLP_INTERNAL_ALGO_H
+#  include <stl/_algo.h>
+# endif
+
+#if defined (_STLP_IMPORT_VENDOR_STD)
+# include _STLP_NATIVE_HEADER(algorithm)
+#endif /* _STLP_IMPORT_VENDOR_STD */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x1 )
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_ALGORITHM */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/bitset b/main/source/stlport/stlport/bitset
new file mode 100644
index 00000000..f7361971
--- /dev/null
+++ b/main/source/stlport/stlport/bitset
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 1998
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_BITSET
+#define _STLP_BITSET
+
+// This implementation of bitset<> has a second template parameter,
+// _WordT, which defaults to unsigned long.  *YOU SHOULD NOT USE
+// THIS FEATURE*.  It is experimental, and it may be removed in
+// future releases.
+
+// A bitset of size N, using words of type _WordT, will have 
+// N % (sizeof(_WordT) * CHAR_BIT) unused bits.  (They are the high-
+// order bits in the highest word.)  It is a class invariant
+// of class bitset<> that those unused bits are always zero.
+
+// Most of the actual code isn't contained in bitset<> itself, but in the 
+// base class _Base_bitset.  The base class works with whole words, not with
+// individual bits.  This allows us to specialize _Base_bitset for the
+// important special case where the bitset is only a single word.
+
+// The C++ standard does not define the precise semantics of operator[].
+// In this implementation the const version of operator[] is equivalent
+// to test(), except that it does no range checking.  The non-const version
+// returns a reference to a bit, again without doing any range checking.
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x2
+#  include <stl/_prolog.h>
+# endif
+
+#ifdef _STLP_PRAGMA_ONCE
+# pragma once
+#endif
+
+# include <stl/_bitset.h>
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x2 )
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_BITSET */
+
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/cassert b/main/source/stlport/stlport/cassert
new file mode 100644
index 00000000..15d81137
--- /dev/null
+++ b/main/source/stlport/stlport/cassert
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x103
+#  include <stl/_prolog.h>
+# endif
+
+# if defined (_STLP_USE_NEW_C_HEADERS) || defined (__IN_STLPORT_CASSERT)
+#  include _STLP_NATIVE_CPP_C_HEADER(cassert)
+# else
+#  include <assert.h>
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x103 )
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/cctype b/main/source/stlport/stlport/cctype
new file mode 100644
index 00000000..cf9809a1
--- /dev/null
+++ b/main/source/stlport/stlport/cctype
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_CCTYPE
+# define _STLP_CCTYPE
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x104
+#  include <stl/_prolog.h>
+# endif
+
+# if defined (_STLP_USE_NEW_C_HEADERS)
+
+#  include _STLP_NATIVE_CPP_C_HEADER(cctype)
+
+# else
+
+#  include <ctype.h>
+
+// Undef convenience interfaces
+#undef isspace
+#undef isprint
+#undef iscntrl
+#undef isupper
+#undef islower
+#undef isalpha
+#undef isdigit
+#undef ispunct
+#undef isxdigit
+#undef isalnum
+#undef isgraph
+#undef toupper
+#undef tolower
+
+# endif /* _STLP_USE_NEW_C_HEADERS */
+
+# if ! defined (_STLP_NO_CSTD_FUNCTION_IMPORTS)
+#  if defined ( _STLP_IMPORT_VENDOR_CSTD )
+_STLP_BEGIN_NAMESPACE
+using _STLP_VENDOR_CSTD::isalnum;
+using _STLP_VENDOR_CSTD::isalpha;
+using _STLP_VENDOR_CSTD::iscntrl;
+using _STLP_VENDOR_CSTD::isdigit;
+using _STLP_VENDOR_CSTD::isgraph;
+using _STLP_VENDOR_CSTD::islower;
+using _STLP_VENDOR_CSTD::isprint;
+using _STLP_VENDOR_CSTD::ispunct;
+using _STLP_VENDOR_CSTD::isspace;
+using _STLP_VENDOR_CSTD::isupper;
+using _STLP_VENDOR_CSTD::isxdigit;
+using _STLP_VENDOR_CSTD::tolower;
+using _STLP_VENDOR_CSTD::toupper;
+_STLP_END_NAMESPACE
+#   endif /* _STLP_IMPORT_VENDOR_CSTD*/
+#  endif /* _STLP_NO_CSTD_FUNCTION_IMPORTS */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x104 )
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_CCTYPE */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/cerrno b/main/source/stlport/stlport/cerrno
new file mode 100644
index 00000000..73a63cfd
--- /dev/null
+++ b/main/source/stlport/stlport/cerrno
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_CERRNO
+# define _STLP_CERRNO
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x105
+#  include <stl/_prolog.h>
+# endif
+
+# if defined (_STLP_USE_NEW_C_HEADERS)
+#  include _STLP_NATIVE_CPP_C_HEADER(cerrno)
+# else
+#  include <errno.h>
+# endif
+
+#ifndef errno
+
+# if defined (_STLP_IMPORT_VENDOR_CSTD) && ! defined (__IBMCPP__) && ! defined(__hpux)
+_STLP_BEGIN_NAMESPACE
+using _STLP_VENDOR_CSTD::errno;
+_STLP_END_NAMESPACE
+# endif /* _STLP_IMPORT_VENDOR_CSTD */
+
+#endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x105 )
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_CERRNO */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/cfloat b/main/source/stlport/stlport/cfloat
new file mode 100644
index 00000000..5df1b0fc
--- /dev/null
+++ b/main/source/stlport/stlport/cfloat
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_CFLOAT
+# define _STLP_CFLOAT
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x106
+#  include <stl/_prolog.h>
+# endif
+
+// Borland defines some implementation constants in std:: namespace,
+// we do not want to import them.
+# if defined  (_STLP_USE_NEW_C_HEADERS) && ! defined (__BORLANDC__)
+#  include _STLP_NATIVE_CPP_C_HEADER(cfloat)
+# else
+#  include _STLP_NATIVE_C_HEADER(float.h)
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x106 )
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_CFLOAT */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/climits b/main/source/stlport/stlport/climits
new file mode 100644
index 00000000..76ef5523
--- /dev/null
+++ b/main/source/stlport/stlport/climits
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_CLIMITS
+# define _STLP_CLIMITS
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x107
+#  include <stl/_prolog.h>
+# endif
+
+# if defined (__SUNPRO_CC) && ((__SUNPRO_CC == 0x500) && (__SUNPRO_CC_COMPAT > 4))
+#  include </usr/include/limits.h>
+# elif defined (_STLP_USE_NEW_C_HEADERS)
+#  include _STLP_NATIVE_CPP_C_HEADER(climits)
+# else
+#  ifdef __BORLANDC__
+#   include _STLP_NATIVE_C_HEADER(limits.h)
+#  else
+#   include <limits.h>
+#  endif
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID ==  0x107 )
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_CLIMITS */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/clocale b/main/source/stlport/stlport/clocale
new file mode 100644
index 00000000..509c0db0
--- /dev/null
+++ b/main/source/stlport/stlport/clocale
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_CLOCALE
+#  define _STLP_CLOCALE
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID  0x108
+#  include <stl/_prolog.h>
+# endif
+
+# if defined (_STLP_USE_NEW_C_HEADERS)
+#  include _STLP_NATIVE_CPP_C_HEADER(clocale)
+# else
+#  include _STLP_NATIVE_C_HEADER(locale.h)
+# endif
+
+# ifdef _STLP_IMPORT_VENDOR_CSTD
+_STLP_BEGIN_NAMESPACE
+using _STLP_VENDOR_CSTD::lconv;
+#  if ! defined (_STLP_NO_CSTD_FUNCTION_IMPORTS)
+using _STLP_VENDOR_CSTD::localeconv;
+using _STLP_VENDOR_CSTD::setlocale;
+#  endif
+_STLP_END_NAMESPACE
+# endif /* _STLP_IMPORT_VENDOR_CSTD */
+
+# if (_STLP_OUTERMOST_HEADER_ID ==  0x108 )
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_CLOCALE */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/cmath b/main/source/stlport/stlport/cmath
new file mode 100644
index 00000000..219f13a2
--- /dev/null
+++ b/main/source/stlport/stlport/cmath
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_CMATH
+# define _STLP_CMATH
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID  0x109
+#  include <stl/_prolog.h>
+# endif
+
+# if defined (_STLP_USE_NEW_C_HEADERS)
+#  if defined (_STLP_HAS_NO_NAMESPACES) && ! defined (exception)
+#   define exception __math_exception
+#  endif
+#  include _STLP_NATIVE_CPP_C_HEADER(cmath)
+#  if defined (_STLP_HAS_NO_NAMESPACES)
+#   undef exception
+#  endif
+# else
+#  include <math.h>
+# endif
+
+#  if (defined (__SUNPRO_CC) && (__SUNPRO_CC > 0x500)) || \
+     !( defined (__IBMCPP__) && (__IBMCPP__ >= 500) || ! ( defined (__HP_aCC) && (__HP_aCC >= 30000) ))
+# ifndef _STLP_HAS_NO_NAMESPACES
+namespace std {
+# endif
+  extern "C" double hypot(double x, double y);
+# ifndef _STLP_HAS_NO_NAMESPACES
+}
+# endif
+
+#  endif
+
+#  ifdef _STLP_IMPORT_VENDOR_CSTD
+_STLP_BEGIN_NAMESPACE
+# if ! defined (_STLP_NO_CSTD_FUNCTION_IMPORTS)
+# ifdef _STLP_HAS_NATIVE_FLOAT_ABS
+using _STLP_VENDOR_CSTD::abs;
+# endif
+using _STLP_VENDOR_CSTD::acos;
+using _STLP_VENDOR_CSTD::asin;
+using _STLP_VENDOR_CSTD::atan2;
+using _STLP_VENDOR_CSTD::atan;
+using _STLP_VENDOR_CSTD::ceil;
+using _STLP_VENDOR_CSTD::cos;
+using _STLP_VENDOR_CSTD::cosh;
+using _STLP_VENDOR_CSTD::exp;
+using _STLP_VENDOR_CSTD::fabs;
+using _STLP_VENDOR_CSTD::floor;
+using _STLP_VENDOR_CSTD::fmod;
+using _STLP_VENDOR_CSTD::frexp;
+using _STLP_VENDOR_CSTD::ldexp;
+using _STLP_VENDOR_CSTD::log10;
+using _STLP_VENDOR_CSTD::log;
+using _STLP_VENDOR_CSTD::modf;
+using _STLP_VENDOR_CSTD::pow;
+using _STLP_VENDOR_CSTD::sin;
+using _STLP_VENDOR_CSTD::sinh;
+using _STLP_VENDOR_CSTD::sqrt;
+using _STLP_VENDOR_CSTD::tan;
+using _STLP_VENDOR_CSTD::tanh;
+# endif /* BUG */
+_STLP_END_NAMESPACE
+#  endif /* _STLP_IMPORT_VENDOR_CSTD */
+
+#ifndef _STLP_CMATH_H_HEADER
+#  include <stl/_cmath.h>
+#endif
+
+# if (_STLP_OUTERMOST_HEADER_ID ==  0x109 )
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_CMATH */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/complex b/main/source/stlport/stlport/complex
new file mode 100644
index 00000000..c6ea419f
--- /dev/null
+++ b/main/source/stlport/stlport/complex
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+#ifndef _STLP_template_complex
+# define _STLP_template_complex
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID  0x10
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_OWN_IOSTREAMS
+// This header declares the template class complex, as described in 
+// in the draft C++ standard.  Single-precision complex numbers
+// are complex<float>, double-precision are complex<double>, and
+// quad precision are complex<long double>.
+
+// Note that the template class complex is declared within namespace
+// std, as called for by the draft C++ standard
+  
+#  define _STLP_COMPLEX_NAMESPACE _STLP_STD
+#  include <stl/_complex.h>
+# else
+#  define _STLP_COMPLEX_NAMESPACE _STLP_VENDOR_STD
+#  include <wrap_std/complex>
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID ==  0x10 )
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_template_complex */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/config/_epilog.h b/main/source/stlport/stlport/config/_epilog.h
new file mode 100644
index 00000000..dc9b5138
--- /dev/null
+++ b/main/source/stlport/stlport/config/_epilog.h
@@ -0,0 +1,33 @@
+#if defined (_STLP_MSVC) || defined (__ICL) || defined (__BORLANDC__)
+
+# if defined (__BORLANDC__)
+#  pragma option pop
+#  pragma option -w-8062
+# else
+#  if !(defined (_STLP_MSVC) && (_STLP_MSVC < 1200))
+#   pragma warning (pop)
+#  endif
+#  pragma pack (pop)
+# endif
+
+
+#elif defined(__sgi) && !defined(__GNUC__) && (_MIPS_SIM != _MIPS_SIM_ABI32)
+
+# pragma reset woff 1174
+# pragma reset woff 1375
+# pragma reset woff 1209
+// from iterator_base.h
+# pragma reset woff 1183
+
+#elif defined(__DECCXX)
+
+# ifdef __PRAGMA_ENVIRONMENT
+#  pragma __environment __restore
+# endif
+
+#elif defined(__IBMCPP__)
+
+#pragma info(restore)
+
+#endif
+
diff --git a/main/source/stlport/stlport/config/_msvc_warnings_off.h b/main/source/stlport/stlport/config/_msvc_warnings_off.h
new file mode 100644
index 00000000..6d18e30d
--- /dev/null
+++ b/main/source/stlport/stlport/config/_msvc_warnings_off.h
@@ -0,0 +1,20 @@
+# if (_MSC_VER > 1000)
+// #pragma warning ( disable : 4251 )	// ignore template classes being exported in .dll's
+/* 
+ * "this used in base member initializer list"
+ * arrow operator warning
+ * copy constr & assignment cannot be generated
+ * "forcing value to bool 'true' or 'false'
+ * typedef used instaead of full type
+ * 4018 : signed/unsigned mismatch, 4146 - result still unsigned 
+ * 4100: unreferenced formal parameter
+ * 4663: C++ language change: to explicitly specialize class template 'identifier' use the following syntax
+ */
+#  pragma warning ( disable : 4355 4284  4231 4511 4512 4097 4786 4800 4018 4146 4244 4514 4127 4100 4663)
+#  pragma warning ( disable : 4245 4514 4660) // conversion from enum to unsigned int signed/unsigned mismatch
+#  if (_MSC_VER > 1200)
+// multiple copy constructors/assignment operators specified,
+// with member templates are bogus...
+#   pragma warning ( disable : 4521 4522)
+#  endif  
+# endif
diff --git a/main/source/stlport/stlport/config/_prolog.h b/main/source/stlport/stlport/config/_prolog.h
new file mode 100644
index 00000000..6dcf052c
--- /dev/null
+++ b/main/source/stlport/stlport/config/_prolog.h
@@ -0,0 +1,46 @@
+
+#if defined (_STLP_MSVC) || defined (__ICL) || defined (__BORLANDC__)
+
+# if defined (__BORLANDC__)
+#  if (__BORLANDC__ >= 0x510)
+#  pragma option push -Vx- -Ve- -a8 -b -pc -w-inl -w-aus -w-sig -w-8062 -w-8041 -w-8008 -w-8012 -w-8027 -w-8057 -w-8091 -w-8092 -w-8066  /* P_O_1 */
+#  endif
+# else
+# if !(defined (_STLP_MSVC) && (_STLP_MSVC < 1200))
+#  pragma warning(push)
+# endif
+# pragma pack(push,8)
+# include <config/_msvc_warnings_off.h>
+# endif
+
+
+#elif defined(__sgi) && !defined(__GNUC__) && (_MIPS_SIM != _MIPS_SIM_ABI32)
+
+#pragma set woff 1209
+#pragma set woff 1174
+#pragma set woff 1375
+// from iterator_base.h
+#pragma set woff 1183
+
+#elif defined(__DECCXX)
+
+# ifdef __PRAGMA_ENVIRONMENT
+#  pragma __environment __save
+#  pragma __environment __header_defaults
+# endif
+
+#elif defined(__IBMCPP__)
+// supress EDC3130: A constant is being used as a conditional expression
+#pragma info(nocnd)
+
+#elif defined (__HP_aCC)
+/* _REENTRANT selects Posix 1c threads unless draft4 selected.
+ *  * This usage is obsolescent, "-D_POSIX_C_SOURCE=199506" is preferred */
+# if 0 /* defined (_REENTRANT) && ! defined (_POSIX_C_SOURCE) */
+#  define _POSIX_C_SOURCE 199506
+# endif
+#elif defined (__WATCOMCPLUSPLUS__)
+# pragma warning 604 10 // must lookahead to determine...
+# pragma warning 594 10 // resolved as declaration/type
+# pragma warning 595 10 // resolved as an expression
+#endif
diff --git a/main/source/stlport/stlport/config/new_compiler/README b/main/source/stlport/stlport/config/new_compiler/README
new file mode 100644
index 00000000..26eed48a
--- /dev/null
+++ b/main/source/stlport/stlport/config/new_compiler/README
@@ -0,0 +1,12 @@
+
+README file for "stlport/config/new_compiler"
+
+
+This directory contains "configure" script which will help you to 
+create config file for a new compiler. Please refer to HTML documentation
+at www.stlport.org/doc for details. 
+NOTE : stlconf.h produced by "configure" is NOT suitable for immediate use
+as platform-specific configuration file as it does not set several important
+macros. However, it is a good starting point.
+
+Boris Fomitchev.
\ No newline at end of file
diff --git a/main/source/stlport/stlport/config/new_compiler/configure b/main/source/stlport/stlport/config/new_compiler/configure
new file mode 100644
index 00000000..5a757b0c
--- /dev/null
+++ b/main/source/stlport/stlport/config/new_compiler/configure
@@ -0,0 +1,3644 @@
+#! /bin/sh
+
+# Guess values for system-dependent variables and create Makefiles.
+# Generated automatically using autoconf version 2.12 
+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+
+# Defaults:
+ac_help=
+ac_default_prefix=/usr/local
+# Any additions from configure.in:
+ac_help="$ac_help
+--enable-extension=<ext>"
+ac_help="$ac_help
+--enable-namespaces Use namespaces (default if posssible)
+--disable-namespaces Don't use namespaces support"
+ac_help="$ac_help
+--enable-exceptions Use exceptions support (default if posssible)
+ --disable-exceptions Don't use exceptions support"
+ac_help="$ac_help
+--enable-relops Separate rel_ops namespace for relational operators (default if posssible)
+--disable-relops No separate rel_ops namespace for relational operators"
+ac_help="$ac_help
+--enable-new-style-headers Use new-style headers (default)
+--disable-new-style-headers Don't use new-style headers"
+ac_help="$ac_help
+--enable-new-iostreams Use new iostreams (default)
+--disable-new-iostreams Don't use new iostreams"
+ac_help="$ac_help
+--enable-sgi-allocators : set default parameter to SGI-style default alloc, not allocator<T>
+ --disable-sgi-allocators : use allocator<T> if possible"
+ac_help="$ac_help
+--enable-malloc : set default alloc to malloc-based allocator ( malloc_alloc_template<instance_no>, alloc.h )
+--disable-malloc : choose (default) sgi node allocator (__alloc<threads,no>  alloc.h )"
+ac_help="$ac_help
+--enable-newalloc : set default alloc to new-based allocator ( new_alloc, alloc.h )
+--disable-newalloc : choose (default) sgi allocator (__alloc<threads,no>  alloc.h )"
+ac_help="$ac_help
+--enable-defalloc : make HP-style defalloc.h included in alloc.h )
+--disable-defalloc : leave defalloc.h alone"
+ac_help="$ac_help
+--enable-debugalloc : use debug versions of allocators
+--disable-debugalloc : not using debug allocators"
+ac_help="$ac_help
+--enable-abbrevs : use abbreviated class names internally for linker benefit (don't affect interface)
+--disable-abbrevs : don't use abbreviated names"
+
+# Initialize some variables set by options.
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+build=NONE
+cache_file=./config.cache
+exec_prefix=NONE
+host=NONE
+no_create=
+nonopt=NONE
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+target=NONE
+verbose=
+x_includes=NONE
+x_libraries=NONE
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datadir='${prefix}/share'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
+
+# Initialize some other variables.
+subdirs=
+MFLAGS= MAKEFLAGS=
+# Maximum number of lines to put in a shell here document.
+ac_max_here_lines=12
+
+ac_prev=
+for ac_option
+do
+
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval "$ac_prev=\$ac_option"
+    ac_prev=
+    continue
+  fi
+
+  case "$ac_option" in
+  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) ac_optarg= ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case "$ac_option" in
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir="$ac_optarg" ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build="$ac_optarg" ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file="$ac_optarg" ;;
+
+  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+  | --da=*)
+    datadir="$ac_optarg" ;;
+
+  -disable-* | --disable-*)
+    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+    fi
+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+    eval "enable_${ac_feature}=no" ;;
+
+  -enable-* | --enable-*)
+    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+    fi
+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+    case "$ac_option" in
+      *=*) ;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "enable_${ac_feature}='$ac_optarg'" ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix="$ac_optarg" ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he)
+    # Omit some internal or obsolete options to make the list less imposing.
+    # This message is too long to be a string in the A/UX 3.1 sh.
+    cat << EOF
+Usage: configure [options] [host]
+Options: [defaults in brackets after descriptions]
+Configuration:
+  --cache-file=FILE       cache test results in FILE
+  --help                  print this message
+  --no-create             do not create output files
+  --quiet, --silent       do not print \`checking...' messages
+  --version               print the version of autoconf that created configure
+Directory and file names:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [same as prefix]
+  --bindir=DIR            user executables in DIR [EPREFIX/bin]
+  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
+  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
+  --datadir=DIR           read-only architecture-independent data in DIR
+                          [PREFIX/share]
+  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
+                          [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
+  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
+  --includedir=DIR        C header files in DIR [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
+  --infodir=DIR           info documentation in DIR [PREFIX/info]
+  --mandir=DIR            man documentation in DIR [PREFIX/man]
+  --srcdir=DIR            find the sources in DIR [configure dir or ..]
+  --program-prefix=PREFIX prepend PREFIX to installed program names
+  --program-suffix=SUFFIX append SUFFIX to installed program names
+  --program-transform-name=PROGRAM
+                          run sed PROGRAM on installed program names
+EOF
+    cat << EOF
+Host type:
+  --build=BUILD           configure for building on BUILD [BUILD=HOST]
+  --host=HOST             configure for HOST [guessed]
+  --target=TARGET         configure for TARGET [TARGET=HOST]
+Features and packages:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --x-includes=DIR        X include files are in DIR
+  --x-libraries=DIR       X library files are in DIR
+EOF
+    if test -n "$ac_help"; then
+      echo "--enable and --with options recognized:$ac_help"
+    fi
+    exit 0 ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host="$ac_optarg" ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir="$ac_optarg" ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir="$ac_optarg" ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir="$ac_optarg" ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir="$ac_optarg" ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst \
+  | --locals | --local | --loca | --loc | --lo)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+    localstatedir="$ac_optarg" ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir="$ac_optarg" ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir="$ac_optarg" ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix="$ac_optarg" ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix="$ac_optarg" ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix="$ac_optarg" ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name="$ac_optarg" ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir="$ac_optarg" ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir="$ac_optarg" ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site="$ac_optarg" ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir="$ac_optarg" ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir="$ac_optarg" ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target="$ac_optarg" ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers)
+    echo "configure generated by autoconf version 2.12"
+    exit 0 ;;
+
+  -with-* | --with-*)
+    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+    fi
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    case "$ac_option" in
+      *=*) ;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "with_${ac_package}='$ac_optarg'" ;;
+
+  -without-* | --without-*)
+    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+    fi
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    eval "with_${ac_package}=no" ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes="$ac_optarg" ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries="$ac_optarg" ;;
+
+  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+    ;;
+
+  *)
+    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+      echo "configure: warning: $ac_option: invalid host type" 1>&2
+    fi
+    if test "x$nonopt" != xNONE; then
+      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+    fi
+    nonopt="$ac_option"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
+fi
+
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
+# File descriptor usage:
+# 0 standard input
+# 1 file creation
+# 2 errors and warnings
+# 3 some systems may open it to /dev/tty
+# 4 used on the Kubota Titan
+# 6 checking for... messages and results
+# 5 compiler messages saved in config.log
+if test "$silent" = yes; then
+  exec 6>/dev/null
+else
+  exec 6>&1
+fi
+exec 5>./config.log
+
+echo "\
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+" 1>&5
+
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell metacharacters.
+ac_configure_args=
+for ac_arg
+do
+  case "$ac_arg" in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c) ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
+  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  esac
+done
+
+# NLS nuisances.
+# Only set these to C if already set.  These must not be set unconditionally
+# because not all systems understand e.g. LANG=C (notably SCO).
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+# Non-C LC_CTYPE values break the ctype check.
+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo > confdefs.h
+
+# A filename unique to this package, relative to the directory that
+# configure is in, which we can look for to find out if srcdir is correct.
+ac_unique_file=stlconf.h.in
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then its parent.
+  ac_prog=$0
+  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
+  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
+  srcdir=$ac_confdir
+  if test ! -r $srcdir/$ac_unique_file; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r $srcdir/$ac_unique_file; then
+  if test "$ac_srcdir_defaulted" = yes; then
+    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+  else
+    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+  fi
+fi
+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+
+# Prefer explicitly selected file to automatically selected ones.
+if test -z "$CONFIG_SITE"; then
+  if test "x$prefix" != xNONE; then
+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+  else
+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  fi
+fi
+for ac_site_file in $CONFIG_SITE; do
+  if test -r "$ac_site_file"; then
+    echo "loading site script $ac_site_file"
+    . "$ac_site_file"
+  fi
+done
+
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+    ac_n= ac_c='
+' ac_t='	'
+  else
+    ac_n=-n ac_c= ac_t=
+  fi
+else
+  ac_n= ac_c='\c' ac_t=
+fi
+
+
+
+
+echo "$ac_t""*** $0: STLport configuration utility ***" 1>&6
+if test "${CXXFLAGS}" = ""; then 
+echo "$ac_t""* Note: for best reliability - try \"CXXFLAGS=-treat_warnings_as_errors\" $0 " 1>&6
+echo "$ac_t""* Please don't forget specifying typical CXXFLAGS you'll be using - " 1>&6 
+echo "$ac_t""* such as that enabling exceptions handling" 1>&6
+fi
+echo "$ac_t""Please stand by while exploring compiler capabilities..." 1>&6
+echo "$ac_t""Be patient - that may take a while..." 1>&6
+echo "$ac_t""***" 1>&6
+
+# utility function
+check_warning () {
+    warn_str=`tail -1 config.log | egrep -i "arning|\(W\)"`
+    if test "$warn_str" = ""; then
+      return 0
+    else
+     return 1
+    fi
+}
+
+
+# Check whether --enable-extension or --disable-extension was given.
+if test "${enable_extension+set}" = set; then
+  enableval="$enable_extension"
+  
+case "$enableval" in
+	no) echo "$ac_t""Info :.cpp used as extension for tests" 1>&6 
+	    ac_ext=cpp 
+      	;;
+	 *) echo "$ac_t""Argument : .$enableval used as extension" 1>&6 
+	ac_ext=$enableval
+esac
+
+else
+  echo "$ac_t""Info : .cpp used as extension for tests" 1>&6 
+	ac_ext=cpp
+
+
+fi
+
+
+# Save that, as it is being redefined several times 
+use_ac_ext=$ac_ext
+
+for ac_prog in $CCC c++ g++ gcc CC cxx cc++
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:601: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CXX="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CXX="$ac_cv_prog_CXX"
+if test -n "$CXX"; then
+  echo "$ac_t""$CXX" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$CXX" && break
+done
+test -n "$CXX" || CXX="gcc"
+
+
+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:632: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+cat > conftest.$ac_ext <<EOF
+#line 642 "configure"
+#include "confdefs.h"
+main(){return(0);}
+EOF
+if { (eval echo configure:646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  ac_cv_prog_cxx_works=yes
+  # If we can't run a trivial program, we are probably using a cross compiler.
+  if (./conftest; exit) 2>/dev/null; then
+    ac_cv_prog_cxx_cross=no
+  else
+    ac_cv_prog_cxx_cross=yes
+  fi
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_prog_cxx_works=no
+fi
+rm -fr conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
+if test $ac_cv_prog_cxx_works = no; then
+  { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
+fi
+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+echo "configure:672: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
+cross_compiling=$ac_cv_prog_cxx_cross
+
+echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
+echo "configure:677: checking whether we are using GNU C++" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.C <<EOF
+#ifdef __GNUC__
+  yes;
+#endif
+EOF
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:686: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+  ac_cv_prog_gxx=yes
+else
+  ac_cv_prog_gxx=no
+fi
+fi
+
+echo "$ac_t""$ac_cv_prog_gxx" 1>&6
+
+if test $ac_cv_prog_gxx = yes; then
+  GXX=yes
+  ac_test_CXXFLAGS="${CXXFLAGS+set}"
+  ac_save_CXXFLAGS="$CXXFLAGS"
+  CXXFLAGS=
+  echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+echo "configure:701: checking whether ${CXX-g++} accepts -g" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  echo 'void f(){}' > conftest.cc
+if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
+  ac_cv_prog_cxx_g=yes
+else
+  ac_cv_prog_cxx_g=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
+  if test "$ac_test_CXXFLAGS" = set; then
+    CXXFLAGS="$ac_save_CXXFLAGS"
+  elif test $ac_cv_prog_cxx_g = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-O2"
+  fi
+else
+  GXX=
+  test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
+fi
+
+ac_ext=$use_ac_ext
+
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+ac_ext=$use_ac_ext
+
+echo $ac_n "checking size of int""... $ac_c" 1>&6
+echo "configure:740: checking size of int" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_int=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 748 "configure"
+#include "confdefs.h"
+#ifdef __cplusplus
+extern "C" void exit(int);
+#endif
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(int));
+  exit(0);
+}
+EOF
+if { (eval echo configure:762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_int=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_int=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_int" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+EOF
+
+
+ac_ext=$use_ac_ext
+
+if test "$ac_cv_sizeof_int" = "4"; then
+  cat >> confdefs.h <<EOF
+#define _STLP_UINT32_T unsigned int
+EOF
+
+else
+  echo $ac_n "checking size of long""... $ac_c" 1>&6
+echo "configure:790: checking size of long" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_long=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 798 "configure"
+#include "confdefs.h"
+#ifdef __cplusplus
+extern "C" void exit(int);
+#endif
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long));
+  exit(0);
+}
+EOF
+if { (eval echo configure:812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_long=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_long=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+EOF
+
+
+  ac_ext=$use_ac_ext
+  if test "$ac_cv_sizeof_long" = "4"; then
+    cat >> confdefs.h <<EOF
+#define _STLP_UINT32_T unsigned long
+EOF
+
+  else
+      echo $ac_n "checking size of short""... $ac_c" 1>&6
+echo "configure:839: checking size of short" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_short=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 847 "configure"
+#include "confdefs.h"
+#ifdef __cplusplus
+extern "C" void exit(int);
+#endif
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(short));
+  exit(0);
+}
+EOF
+if { (eval echo configure:861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_short=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_short=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_short" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
+EOF
+
+
+    if test "$ac_cv_sizeof_short" = "4"; then
+      cat >> confdefs.h <<EOF
+#define _STLP_UINT32_T unsigned short
+EOF
+
+    else
+      { echo "configure: error: Cannot find any 32-bit integer type for your compiler" 1>&2; exit 1; }
+    fi
+  ac_ext=$use_ac_ext
+  fi
+fi
+ac_ext=$use_ac_ext
+
+
+if test "$ac_cv_c_cross" = "yes"; then
+  CXXFLAGS="${CXXFLAGS} -c"
+fi
+
+ac_ext=$use_ac_ext
+
+echo $ac_n "checking for basic STL compatibility""... $ac_c" 1>&6
+echo "configure:901: checking for basic STL compatibility" >&5
+cat > conftest.$ac_ext <<EOF
+#line 903 "configure"
+#include "confdefs.h"
+
+template <class Arg1, class Arg2, class Result>
+struct binary_function {
+    typedef Arg1 first_argument_type;
+    typedef Arg2 second_argument_type;
+    typedef Result result_type;
+};      
+template <class T>
+struct plus : public binary_function<T, T, T> {
+    T operator()(const T& x, const T& y) const;
+};
+
+template <class T>
+T plus<T>::operator()(const T& x, const T& y) const { return x + y; }
+plus<int> p;
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_compat="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  { echo "configure: error: Your compiler won't be able to compile this implementation. Sorry." 1>&2; exit 1; } 
+ ac_cv_compat="no"
+
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_compat" 1>&6
+
+echo $ac_n "checking for partial specialization syntax""... $ac_c" 1>&6
+echo "configure:940: checking for partial specialization syntax" >&5
+cat > conftest.$ac_ext <<EOF
+#line 942 "configure"
+#include "confdefs.h"
+
+     template <class T> class fs_foo {};
+     template <> class fs_foo<int> {};
+int main() {
+ fs_foo<int> i;
+; return 0; }
+EOF
+if { (eval echo configure:951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+    _FULL_SPEC="template <>" ac_cv_spec_syntax="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+    cat >> confdefs.h <<\EOF
+#define _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX 1
+EOF
+ ac_cv_spec_syntax="no" _FULL_SPEC=""
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_spec_syntax" 1>&6
+
+echo $ac_n "checking for bool keyword""... $ac_c" 1>&6
+echo "configure:967: checking for bool keyword" >&5
+cat > conftest.$ac_ext <<EOF
+#line 969 "configure"
+#include "confdefs.h"
+bool b_foo() { return true; }
+int main() {
+(void)b_foo();
+; return 0; }
+EOF
+if { (eval echo configure:976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_bool="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NO_BOOL 1
+EOF
+ ac_cv_bool="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_bool" 1>&6
+if test "$ac_cv_bool" = "no"; then
+  echo $ac_n "checking for yvals.h header""... $ac_c" 1>&6
+echo "configure:992: checking for yvals.h header" >&5
+  cat > conftest.$ac_ext <<EOF
+#line 994 "configure"
+#include "confdefs.h"
+#include <yvals.h> 
+    extern bool aaa=true;
+   
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_YVALS_H 1
+EOF
+ echo "$ac_t""yes" 1>&6 
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+  echo "$ac_t""no" 1>&6
+  echo $ac_n "checking whether bool is reserved word""... $ac_c" 1>&6
+echo "configure:1016: checking whether bool is reserved word" >&5
+  cat > conftest.$ac_ext <<EOF
+#line 1018 "configure"
+#include "confdefs.h"
+typedef int bool;
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_bool_reserved="no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_DONT_USE_BOOL_TYPEDEF 1
+EOF
+ ac_cv_bool_reserved="yes"
+fi
+rm -f conftest*
+  echo "$ac_t""$ac_cv_bool_reserved" 1>&6
+  
+fi
+rm -f conftest*
+fi
+
+echo $ac_n "checking for wchar_t type""... $ac_c" 1>&6
+echo "configure:1045: checking for wchar_t type" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1047 "configure"
+#include "confdefs.h"
+ #include <wchar.h>
+      wchar_t wc_foo() { return 'a'; }
+int main() {
+(void)wc_foo();
+; return 0; }
+EOF
+if { (eval echo configure:1055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_wchar="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NO_WCHAR_T 1
+EOF
+ ac_cv_wchar="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_wchar" 1>&6
+
+echo $ac_n "checking if wchar_t is unsigned short""... $ac_c" 1>&6
+echo "configure:1071: checking if wchar_t is unsigned short" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1073 "configure"
+#include "confdefs.h"
+
+     # include <wchar.h>
+     template <class T> struct foo {};
+     $_FULL_SPEC struct foo <wchar_t> {};
+     typedef unsigned short u__short;
+     $_FULL_SPEC struct foo <u__short> {};
+     foo<wchar_t> f1;
+     foo<u__short> f2;
+	
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1088: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_wchar_short="no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_WCHAR_T_IS_USHORT 1
+EOF
+ ac_cv_wchar_short="yes"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_wchar_short" 1>&6
+
+echo $ac_n "checking for long long type""... $ac_c" 1>&6
+echo "configure:1104: checking for long long type" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1106 "configure"
+#include "confdefs.h"
+long long ll_foo() { return 0; }
+int main() {
+(void)ll_foo();
+; return 0; }
+EOF
+if { (eval echo configure:1113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_LONG_LONG 1
+EOF
+ ac_cv_long_long="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_long_long="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_long_long" 1>&6
+
+echo $ac_n "checking for long double type""... $ac_c" 1>&6
+echo "configure:1129: checking for long double type" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1131 "configure"
+#include "confdefs.h"
+long double ld_foo() { return 0; }
+int main() {
+(void)ld_foo();
+; return 0; }
+EOF
+if { (eval echo configure:1138: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_long_double="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NO_LONG_DOUBLE 1
+EOF
+ ac_cv_long_double="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_long_double" 1>&6
+
+echo $ac_n "checking for typename keyword""... $ac_c" 1>&6
+echo "configure:1154: checking for typename keyword" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1156 "configure"
+#include "confdefs.h"
+
+template <class T1, class T2>
+struct pair {
+    typedef T1 first_type;
+    typedef T2 second_type;
+};
+
+template <class Arg, class Result>
+struct unary_function {
+    typedef Arg argument_type;
+    typedef Result result_type;
+};
+
+template <class Pair>
+struct select2nd : public unary_function<Pair, typename Pair::second_type> {
+  typedef typename Pair::first_type ignored_type;
+  const typename Pair::second_type& operator()(const typename Pair::second_type& x,
+						const ignored_type& ) const
+  {
+    return x;
+  }
+  
+};
+    
+int main() {
+ 
+	typedef pair<int,int> tn_p;
+	select2nd< tn_p > tn_s;
+	(void)tn_s(1,5);
+    
+; return 0; }
+EOF
+if { (eval echo configure:1190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  __TYPENAME="typename" 
+     ac_cv_typename="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  __TYPENAME="" 
+     cat >> confdefs.h <<\EOF
+#define _STLP_NEED_TYPENAME 1
+EOF
+
+     ac_cv_typename="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_typename" 1>&6
+
+echo $ac_n "checking for explicit keyword""... $ac_c" 1>&6
+echo "configure:1209: checking for explicit keyword" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1211 "configure"
+#include "confdefs.h"
+struct expl_Class { int a; explicit expl_Class(int t): a(t) {} };
+    expl_Class c(1);
+    
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_explicit="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NO_EXPLICIT 1
+EOF
+ ac_cv_explicit="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_explicit" 1>&6
+
+echo $ac_n "checking for mutable keyword""... $ac_c" 1>&6
+echo "configure:1236: checking for mutable keyword" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1238 "configure"
+#include "confdefs.h"
+struct mut_Class { mutable int a; void update() const { a=0; }  };
+    mut_Class c;
+    
+int main() {
+c.update()
+; return 0; }
+EOF
+if { (eval echo configure:1247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_mutable="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NEED_MUTABLE 1
+EOF
+ ac_cv_mutable="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_mutable" 1>&6
+
+echo $ac_n "checking for new style casts""... $ac_c" 1>&6
+echo "configure:1263: checking for new style casts" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1265 "configure"
+#include "confdefs.h"
+struct ncast_Class { 
+	int a; void update(int* i) { *i=a; }  };
+    ncast_Class c;
+    
+int main() {
+
+  const int a(5);
+  c.update(const_cast<int*>(&a))
+    
+; return 0; }
+EOF
+if { (eval echo configure:1278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_new_cast="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NO_NEW_STYLE_CASTS 1
+EOF
+ ac_cv_new_cast="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_new_cast" 1>&6
+
+echo $ac_n "checking for new-style C library headers""... $ac_c" 1>&6
+echo "configure:1294: checking for new-style C library headers" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1296 "configure"
+#include "confdefs.h"
+
+     #include <cctype>
+     #include <cstddef>
+     #include <cstdio>
+     #include <cstdlib>
+     #include <cstring>
+     #include <cassert>
+     #include <climits>
+     #ifndef _STLP_NO_WCHAR_T
+     #include <cwchar>
+     #endif
+       
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_newheaders="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_HAS_NO_NEW_C_HEADERS 1
+EOF
+ ac_cv_newheaders="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_newheaders" 1>&6
+
+echo $ac_n "checking for new-style <new> header""... $ac_c" 1>&6
+echo "configure:1330: checking for new-style <new> header" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1332 "configure"
+#include "confdefs.h"
+
+     #include <new>
+       
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_new_new="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NO_NEW_NEW_HEADER 1
+EOF
+ ac_cv_new_new="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_new_new" 1>&6
+
+
+echo $ac_n "checking for member template methods""... $ac_c" 1>&6
+echo "configure:1358: checking for member template methods" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1360 "configure"
+#include "confdefs.h"
+
+template <class Result>
+struct mt_foo {
+    typedef Result result_type;
+    template <class Arg> result_type operate(const Arg&) { return Result(); }
+};      
+mt_foo<int> p;
+
+int main() {
+
+(void)p.operate((char*)"aaa");
+
+; return 0; }
+EOF
+if { (eval echo configure:1376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_member_templates="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NO_MEMBER_TEMPLATES 1
+EOF
+ ac_cv_member_templates="no"
+
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_member_templates" 1>&6
+
+echo $ac_n "checking for friend templates""... $ac_c" 1>&6
+echo "configure:1393: checking for friend templates" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1395 "configure"
+#include "confdefs.h"
+
+
+template <class Result2> class foo;
+
+template <class Result>
+struct ft_foo {
+    typedef Result result_type;
+    template <class Result2> friend class foo;
+};      
+ft_foo<int> p;
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_friend_templates="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NO_FRIEND_TEMPLATES 1
+EOF
+ ac_cv_friend_templates="no"
+
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_friend_templates" 1>&6
+
+echo $ac_n "checking for qualified friend templates""... $ac_c" 1>&6
+echo "configure:1429: checking for qualified friend templates" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1431 "configure"
+#include "confdefs.h"
+
+
+${_TEST_STD_BEGIN}
+
+template <class Result2> class foo;
+
+template <class Result>
+struct ft_foo {
+    typedef Result result_type;
+    template <class Result2> friend class $_TEST_STD::foo;
+};      
+ft_foo<int> p;
+${_TEST_STD_END}
+
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_qual_friend_templates="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NO_QUALIFIED_FRIENDS 1
+EOF
+ ac_cv_qual_friend_templates="no"
+
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_qual_friend_templates" 1>&6
+
+echo $ac_n "checking for member template keyword""... $ac_c" 1>&6
+echo "configure:1469: checking for member template keyword" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1471 "configure"
+#include "confdefs.h"
+
+template <class Result>
+struct nt_foo {
+    typedef Result result_type;
+    template <class Arg> struct rebind {  typedef nt_foo<Arg> other; };
+};
+
+template <class _Tp, class _Allocator>
+struct _Traits
+{
+  typedef typename _Allocator:: template rebind<_Tp> my_rebind; 
+  typedef typename my_rebind::other allocator_type;
+};
+
+nt_foo<char> p;
+_Traits< int, nt_foo<short> > pp;
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_member_template_keyword="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NO_MEMBER_TEMPLATE_KEYWORD 1
+EOF
+ ac_cv_member_template_keyword="no"
+
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_member_template_keyword" 1>&6
+
+if test "$ac_cv_member_template_keyword" = "no"; then
+echo $ac_n "checking for member template classes""... $ac_c" 1>&6
+echo "configure:1512: checking for member template classes" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1514 "configure"
+#include "confdefs.h"
+
+template <class Result>
+struct nt_foo {
+    typedef Result result_type;
+    template <class Arg> struct rebind {  typedef nt_foo<Arg> other; };
+};
+
+template <class _Tp, class _Allocator>
+struct _Traits
+{
+  typedef typename _Allocator::rebind<_Tp> my_rebind; 
+  typedef typename my_rebind::other allocator_type;
+};
+
+nt_foo<char> p;
+_Traits< int, nt_foo<short> > pp;
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_member_template_classes="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1
+EOF
+ ac_cv_member_template_classes="no"
+
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_member_template_classes" 1>&6
+fi
+
+echo $ac_n "checking for partial class specialization""... $ac_c" 1>&6
+echo "configure:1555: checking for partial class specialization" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1557 "configure"
+#include "confdefs.h"
+
+template <class Arg,class Result>
+struct ps_foo {
+    typedef Arg argument_type;
+    typedef Result result_type;
+};   
+
+template<class Result>
+struct ps_foo<Result*,Result*> {
+	void bar() {}
+};
+
+template<class Result>
+struct ps_foo<int*,Result> {
+	void foo() {}
+};
+
+ps_foo<char*, char*> p;
+ps_foo<int*, int> p1;
+
+int main() {
+p.bar();
+ p1.foo();
+; return 0; }
+EOF
+if { (eval echo configure:1584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_partial_spec="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION 1
+EOF
+ ac_cv_partial_spec="no"
+
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_partial_spec" 1>&6
+
+if test "$ac_cv_partial_spec" = yes; then
+
+echo $ac_n "checking if explicit args accepted on constructors of partial specialized classes""... $ac_c" 1>&6
+echo "configure:1603: checking if explicit args accepted on constructors of partial specialized classes" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1605 "configure"
+#include "confdefs.h"
+
+template <class Arg,class Result>
+struct ps_foo {
+    typedef Arg argument_type;
+    typedef Result result_type;
+};   
+
+template<class Result>
+struct ps_foo<Result*,Result*> {
+	ps_foo<Result*,Result*>() {}
+	void bar() {}
+};
+
+template<class Result>
+struct ps_foo<int*,Result> {
+	ps_foo<int*,Result*>() {}
+	void bar() {}
+
+};
+
+ps_foo<char*, char*> p;
+ps_foo<int*, int> p1;
+
+int main() {
+p.bar();
+ p1.foo();
+; return 0; }
+EOF
+if { (eval echo configure:1635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_PARTIAL_SPEC_NEEDS_TEMPLATE_ARGS 1
+EOF
+ ac_cv_partial_spec_needs_args="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_partial_spec_needs_args="no"
+
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_partial_spec_needs_args" 1>&6
+
+fi
+
+if test ac_cv_partial_spec_needs_args=="no"; then
+
+echo $ac_n "checking if explicit args accepted on constructors of explicitly specialized classes""... $ac_c" 1>&6
+echo "configure:1656: checking if explicit args accepted on constructors of explicitly specialized classes" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1658 "configure"
+#include "confdefs.h"
+
+template <class Arg,class Result>
+struct ps_foo {
+    typedef Arg argument_type;
+    typedef Result result_type;
+    void bar() {}	
+};   
+
+template<class Result>
+struct ps_foo<int*,int> {
+	ps_foo<Result*,Result*>() {}
+	void foo() {}
+};
+
+ps_foo<char*, char*> p;
+ps_foo<int*, int> p1;
+
+int main() {
+p.bar();
+ p1.foo();
+; return 0; }
+EOF
+if { (eval echo configure:1682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_PARTIAL_SPEC_NEEDS_TEMPLATE_ARGS 1
+EOF
+ ac_cv_partial_spec_needs_args="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_partial_spec_needs_args="no"
+
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_partial_spec_needs_args" 1>&6
+
+fi
+
+echo $ac_n "checking for partial template function ordering""... $ac_c" 1>&6
+echo "configure:1701: checking for partial template function ordering" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1703 "configure"
+#include "confdefs.h"
+
+
+template <class Arg,class Result>
+Result po_foo (const Arg& a,const Result&){ return (Result)a.nothing; }  
+
+template <class T>
+struct A {
+	T a;
+	A(int _a) : a(_a) {}
+};
+
+template<class T>
+T po_foo (const A<T>& a, const A<T>& b){ return a.a; }   
+
+int main() {
+
+  A<int> po_a(0); A<int> po_b(1); (void)po_foo(po_b, po_a)
+
+; return 0; }
+EOF
+if { (eval echo configure:1725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_partial_ord="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER 1
+EOF
+ ac_cv_partial_ord="no"
+
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_partial_ord" 1>&6
+
+echo $ac_n "checking for method specialization""... $ac_c" 1>&6
+echo "configure:1742: checking for method specialization" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1744 "configure"
+#include "confdefs.h"
+
+template <class Arg,class Result>
+struct ms_foo {
+    typedef Arg argument_type;
+    typedef Result result_type;
+    inline void bar();
+};   
+
+template <class Arg,class Result>
+inline void ms_foo<Arg,Result>::bar() {}
+
+inline void ms_foo<int*,int>::bar() {}
+
+ms_foo<char*, char*> p;
+ms_foo<int*, int> p1;
+
+int main() {
+p.bar();
+ p1.bar();
+; return 0; }
+EOF
+if { (eval echo configure:1767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_method_spec="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NO_METHOD_SPECIALIZATION 1
+EOF
+ ac_cv_method_spec="no"
+
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_method_spec" 1>&6
+
+echo $ac_n "checking for lrand48 function""... $ac_c" 1>&6
+echo "configure:1784: checking for lrand48 function" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1786 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+int main() {
+long i = lrand48();
+; return 0; }
+EOF
+if { (eval echo configure:1793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_RAND48 1
+EOF
+ ac_cv_func_lrand48="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_func_lrand48="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_func_lrand48" 1>&6
+
+
+echo $ac_n "checking for default template parameters""... $ac_c" 1>&6
+echo "configure:1810: checking for default template parameters" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1812 "configure"
+#include "confdefs.h"
+template <class T> struct less {}; 
+     template <class T, class T1=less<T> > struct Class { T1 t1; };
+     Class<int> cl;
+     Class<int,less<short> > cl2;
+    
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_default_template_param="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_LIMITED_DEFAULT_TEMPLATES 1
+EOF
+ ac_cv_default_template_param="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_default_template_param" 1>&6
+if test "$ac_cv_default_template_param" = "no"; then
+  echo $ac_n "checking for default type parameters""... $ac_c" 1>&6
+echo "configure:1839: checking for default type parameters" >&5
+  cat > conftest.$ac_ext <<EOF
+#line 1841 "configure"
+#include "confdefs.h"
+
+template <class T> struct less {
+	typedef int int_t;
+  }; 
+
+template <class T, class T1=less<int> > 
+struct Class { 
+private:
+       int a;
+public:
+       typedef Class<T,T1> self; 
+       typedef $__TYPENAME T1::int_t int_t;
+       self foo (const Class<T,T1>& t) { 
+         if ( t.a==a ) return *this;
+         else return t;
+         } 
+};
+
+Class<int> cl;
+Class<int,less<short> > cl2;
+    
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_DEFAULT_TYPE_PARAM 1
+EOF
+ ac_cv_default_type_param="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_default_type_param="no"
+fi
+rm -f conftest*
+  echo "$ac_t""$ac_cv_default_type_param" 1>&6
+
+fi
+
+
+echo $ac_n "checking for default non-type parameters""... $ac_c" 1>&6
+echo "configure:1887: checking for default non-type parameters" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1889 "configure"
+#include "confdefs.h"
+
+template <class T, int N=0 > 
+struct Class { 
+private:
+       T* t;
+       enum { t1=N };
+public:
+       int get_n() { return N; }
+};
+
+Class<int> cl;
+Class<int, 2> cl2;
+    
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_default_nontype_param="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NO_DEFAULT_NON_TYPE_PARAM 1
+EOF
+ ac_cv_default_nontype_param="no"
+	
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_default_nontype_param" 1>&6
+
+echo $ac_n "checking for non-type parameter bug""... $ac_c" 1>&6
+echo "configure:1925: checking for non-type parameter bug" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1927 "configure"
+#include "confdefs.h"
+
+template <class T, int N> 
+struct Class { 
+private:
+       T* t;
+       enum { t1=N };
+public:
+       int get_n() { return N; }
+};
+
+template <class T, int N>
+int operator==(const Class<T,N>& , const Class<T,N>& ) { return 0; }
+
+Class<int, 1> cl;
+Class<int, 1> cl2;
+int i(cl==cl2);
+    
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_nontype_param_bug="no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NON_TYPE_TMPL_PARAM_BUG 1
+EOF
+ ac_cv_nontype_param_bug="yes"
+	
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_nontype_param_bug" 1>&6
+
+echo $ac_n "checking for static data member templates""... $ac_c" 1>&6
+echo "configure:1967: checking for static data member templates" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1969 "configure"
+#include "confdefs.h"
+template <class T> struct Class { static int a; };
+     template <class T> int Class<T>::a;
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_static_templates="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NO_STATIC_TEMPLATE_DATA 1
+EOF
+ ac_cv_static_templates="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_static_templates" 1>&6
+
+if test "$ac_cv_static_templates" = no; then
+ echo $ac_n "checking for weak attribute""... $ac_c" 1>&6
+echo "configure:1994: checking for weak attribute" >&5
+ cat > conftest.$ac_ext <<EOF
+#line 1996 "configure"
+#include "confdefs.h"
+int a_w __attribute__((weak));
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:2003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_WEAK_ATTRIBUTE 1
+EOF
+ ac_cv_weak_attribute="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_weak_attribute="no"
+fi
+rm -f conftest*
+ echo "$ac_t""$ac_cv_weak_attribute" 1>&6
+fi
+
+if test "$ac_cv_static_templates" = yes; then
+echo $ac_n "checking for static array member size bug""... $ac_c" 1>&6
+echo "configure:2021: checking for static array member size bug" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2023 "configure"
+#include "confdefs.h"
+template <class T> struct Class { enum { sz=5 }; static int a[sz]; };
+     template <class T> int Class<T>::a[Class<T>::sz];
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:2031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_static_array_bug="no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_STATIC_ARRAY_BUG 1
+EOF
+ ac_cv_static_array_bug="yes"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_static_array_bug" 1>&6
+fi
+
+echo $ac_n "checking for static data member const initializer bug""... $ac_c" 1>&6
+echo "configure:2048: checking for static data member const initializer bug" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2050 "configure"
+#include "confdefs.h"
+template <class T> struct Class { static const int a = 1; };
+     template <class T> const int Class<T>::a;
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:2058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_static_init_bug="no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_STATIC_CONST_INIT_BUG 1
+EOF
+ ac_cv_static_init_bug="yes"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_static_init_bug" 1>&6
+
+echo $ac_n "checking for namespaces support""... $ac_c" 1>&6
+echo "configure:2074: checking for namespaces support" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2076 "configure"
+#include "confdefs.h"
+class test_class {};
+     namespace std { 
+      using ::test_class;
+      template <class T> struct Class { typedef T my_type; };
+      typedef Class<int>::my_type int_type;
+	}; 
+    inline int ns_foo (std::int_type t) { 
+      using namespace std; 
+      int_type i =2;
+      return i+t; 
+    } 
+     
+int main() {
+(void)ns_foo(1);
+; return 0; }
+EOF
+if { (eval echo configure:2094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  _TEST_STD="std"  _TEST_STD_BEGIN="namespace $_TEST_STD" _TEST_STD_END="namespace $_TEST_STD" ac_cv_namespaces="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_HAS_NO_NAMESPACES 1
+EOF
+ _TEST_STD="" _TEST_STD_BEGIN="" _TEST_STD_END="" ac_cv_namespaces="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_namespaces" 1>&6
+
+echo $ac_n "checking for broken "using" directive""... $ac_c" 1>&6
+echo "configure:2110: checking for broken "using" directive" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2112 "configure"
+#include "confdefs.h"
+namespace std { 
+      template <class T> struct Class { typedef T my_type; };
+      typedef Class<int>::my_type int_type;
+      template <class T> void foo(T,int) {}
+      template <class T> void foo(T,int,int) {}
+	}; 
+     using std::Class;
+     using std::foo;
+     
+int main() {
+(void)foo(1,1);
+; return 0; }
+EOF
+if { (eval echo configure:2127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_broken_using="no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_broken_using="yes"
+fi
+rm -f conftest*
+if test "$ac_cv_broken_using" = no; then
+# check if no warnings have been issued
+  if `check_warning` ; then
+    ac_cv_broken_using=no
+  else
+   cat >> confdefs.h <<\EOF
+#define _STLP_BROKEN_USING_DIRECTIVE 1
+EOF
+
+  fi
+else
+   cat >> confdefs.h <<\EOF
+#define _STLP_BROKEN_USING_DIRECTIVE 1
+EOF
+
+fi
+echo "$ac_t""$ac_cv_broken_using" 1>&6
+
+
+if test "$ac_cv_namespaces" = yes; then
+# Check whether --enable-namespaces or --disable-namespaces was given.
+if test "${enable_namespaces+set}" = set; then
+  enableval="$enable_namespaces"
+  
+case "$enableval" in
+	no) cat >> confdefs.h <<\EOF
+#define _STLP_NO_NAMESPACES 1
+EOF
+ 
+            _TEST_STD="" 
+            _TEST_STD_BEGIN=""
+            _TEST_STD_END=""
+            echo "$ac_t""Config arg --disable-namespaces : code not put into namespace by user request" 1>&6;;
+	 *) echo "$ac_t""Config default: code put into namespace" 1>&6
+esac
+
+else
+  echo "$ac_t""Config default: code put into namespace" 1>&6
+
+fi
+
+else
+ echo "$ac_t""Compiler restriction : no namespaces support used" 1>&6
+fi
+
+
+echo $ac_n "checking for exceptions support""... $ac_c" 1>&6
+echo "configure:2184: checking for exceptions support" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2186 "configure"
+#include "confdefs.h"
+int ex_foo() { 
+       try { 
+         try { throw(1); } 
+         catch (int a) { throw; } 
+       } catch (...) {;} 
+      return 0;
+    }
+int main() {
+(void)ex_foo();
+; return 0; }
+EOF
+if { (eval echo configure:2199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_exceptions="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_HAS_NO_EXCEPTIONS 1
+EOF
+ ac_cv_exceptions="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_exceptions" 1>&6
+
+if test "$ac_cv_exceptions" = yes; then
+
+echo $ac_n "checking if exceptions specification works""... $ac_c" 1>&6
+echo "configure:2217: checking if exceptions specification works" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2219 "configure"
+#include "confdefs.h"
+template <class T> inline int ex_spec_foo(const T&) throw () { return 0;} 
+int main() {
+(void)ex_spec_foo(5);
+; return 0; }
+EOF
+if { (eval echo configure:2226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_exception_spec="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NO_EXCEPTION_SPEC 1
+EOF
+ ac_cv_exception_spec="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_exception_spec" 1>&6
+
+echo $ac_n "checking if return is required after throw""... $ac_c" 1>&6
+echo "configure:2242: checking if return is required after throw" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2244 "configure"
+#include "confdefs.h"
+int ex_foo() { 
+       try { 
+         try { throw(1); } 
+         catch (int a) { throw; } 
+       } catch (...) {;} 
+      return 0;
+    }
+int main() {
+(void)ex_foo();
+; return 0; }
+EOF
+if { (eval echo configure:2257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_throw_return_bug="no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_THROW_RETURN_BUG 1
+EOF
+ ac_cv_throw_return_bug="yes"
+fi
+rm -f conftest*
+
+    if test "$ac_cv_throw_return_bug" = no; then
+    # check if no warnings have been issued
+     if `check_warning` ; then
+       ac_cv_throw_return_bug="no"
+     else
+       cat >> confdefs.h <<\EOF
+#define _STLP_THROW_RETURN_BUG 1
+EOF
+
+       ac_cv_throw_return_bug="yes"
+     fi
+    fi
+echo "$ac_t""$ac_cv_throw_return_bug" 1>&6
+
+fi
+
+echo $ac_n "checking for native <string> header with basic_string defined ""... $ac_c" 1>&6
+echo "configure:2288: checking for native <string> header with basic_string defined " >&5
+cat > conftest.$ac_ext <<EOF
+#line 2290 "configure"
+#include "confdefs.h"
+
+     #include <string>
+     # if !defined (_STLP_HAS_NO_NAMESPACES)
+       using namespace $_TEST_STD;
+     # endif
+     basic_string<char, char_traits<char>, allocator<char> > bs;
+     string bd = bs;
+    
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:2304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+   ac_cv_string_header="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+   cat >> confdefs.h <<\EOF
+#define _STLP_NO_STRING_HEADER 1
+EOF
+ ac_cv_string_header="no"
+
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_string_header" 1>&6
+
+if test "$ac_cv_string_header" = yes; then
+echo $ac_n "checking for native <stdexcept> header""... $ac_c" 1>&6
+echo "configure:2322: checking for native <stdexcept> header" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2324 "configure"
+#include "confdefs.h"
+
+     #include <stdexcept>
+     # if !defined (_STLP_HAS_NO_NAMESPACES)
+       using namespace $_TEST_STD;
+     # endif
+     string s;
+     logic_error le(s);
+     runtime_error re(s);
+     domain_error de(s);
+     invalid_argument ia(s);
+     length_error lne(s);
+     out_of_range or(s);
+     range_error rne(s);
+     overflow_error ove(s);
+     underflow_error ue(s);
+    
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:2346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_stdexcept_header="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NO_STDEXCEPT_HEADER 1
+EOF
+ ac_cv_stdexcept_header="no"
+
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_stdexcept_header" 1>&6
+
+echo $ac_n "checking for new iostreams""... $ac_c" 1>&6
+echo "configure:2363: checking for new iostreams" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2365 "configure"
+#include "confdefs.h"
+
+     #include <iosfwd>
+     #include <iostream>
+     # if !defined (_STLP_HAS_NO_NAMESPACES)
+       using namespace $_TEST_STD;
+     # endif
+
+     template <class _Tp, class _Traits>
+     void outp(basic_ostream<_Tp,_Traits>& o, char* str) {
+         o<<str; 
+        }
+       
+int main() {
+
+	outp(cout, "Hello World\n")
+    
+; return 0; }
+EOF
+if { (eval echo configure:2385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_newstreams="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_HAS_NO_NEW_IOSTREAMS 1
+EOF
+ ac_cv_newstreams="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_newstreams" 1>&6
+
+
+fi
+
+echo $ac_n "checking for <exception> header with class "exception" defined""... $ac_c" 1>&6
+echo "configure:2404: checking for <exception> header with class "exception" defined" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2406 "configure"
+#include "confdefs.h"
+
+     #include <exception>
+     # if !defined (_STLP_HAS_NO_NAMESPACES)
+       using namespace $_TEST_STD;
+     # endif
+     class my_exception: public $_TEST_STD::exception {};
+     my_exception mm;
+    
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:2420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_exception_header="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NO_EXCEPTION_HEADER 1
+EOF
+ ac_cv_exception_header="no"
+
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_exception_header" 1>&6
+
+echo $ac_n "checking builtin constructor bug""... $ac_c" 1>&6
+echo "configure:2437: checking builtin constructor bug" >&5
+if test "$cross_compiling" = yes; then
+   cat >> confdefs.h <<\EOF
+#define _STLP_DEFAULT_CONSTRUCTOR_BUG 1
+EOF
+ ac_cv_builtin_c_bug="yes"
+
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2446 "configure"
+#include "confdefs.h"
+#ifdef __cplusplus
+extern "C" void exit(int);
+#endif
+
+# ifdef _STLP_USE_NEW_STYLE_HEADERS
+#  include <cassert>
+#  include <cstdio>
+#  include <cstring>
+#  include <new>
+# else
+#  include <assert.h>
+#  include <stdio.h>
+#  include <string.h>
+#  include <new.h>
+# endif
+int main(int, char**) {
+	int i;
+	double buf[1000];
+	char* pc = (char*)buf;
+	short* ps = (short*)buf;
+	int* pi = (int*)buf;
+	long* pl = (long*)buf;
+	double* pd = (double*)buf;
+	float* pf = (float*)buf;
+	for (i=0; i<100; i++) {
+	   	new(pc) char();
+        	assert(char()==0 && *pc==0);
+		sprintf(pc,"lalala\n");
+	        new (ps) short();	
+		assert(short()==0 && *ps ==0);
+		sprintf(pc,"lalala\n");
+	        new (pi) int();
+		assert(int()==0 && *pi == 0);
+		sprintf(pc,"lalala\n");
+	        new (pl) long();	
+		assert(long()==0 && *pl == 0);
+		sprintf(pc,"lalala\n");
+	        new (pf) float();	
+		assert(float()==0.0 && *pf == 0.0);
+		sprintf(pc,"lalala\n");
+	        new (pd) double();	
+		assert(double()==0.0 && *pd == 0.0);
+		sprintf(pc,"lalala\n");
+	}
+  return 0;
+}
+
+EOF
+if { (eval echo configure:2496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+then
+   ac_cv_builtin_c_bug="no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+   cat >> confdefs.h <<\EOF
+#define _STLP_DEFAULT_CONSTRUCTOR_BUG 1
+EOF
+ ac_cv_builtin_c_bug="yes"
+fi
+rm -fr conftest*
+fi
+
+echo "$ac_t""$ac_cv_builtin_c_bug" 1>&6
+
+echo $ac_n "checking for trivial constructor bug""... $ac_c" 1>&6
+echo "configure:2514: checking for trivial constructor bug" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2516 "configure"
+#include "confdefs.h"
+struct output_iterator_tag {};
+     void tc_bug_foo(output_iterator_tag) {}
+     inline void tc_test_foo()  { tc_bug_foo(output_iterator_tag()); }
+int main() {
+tc_test_foo();
+; return 0; }
+EOF
+if { (eval echo configure:2525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_tc_bug="no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_TRIVIAL_CONSTRUCTOR_BUG 1
+EOF
+ ac_cv_tc_bug="yes"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_tc_bug" 1>&6
+
+echo $ac_n "checking for trivial destructor bug""... $ac_c" 1>&6
+echo "configure:2541: checking for trivial destructor bug" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2543 "configure"
+#include "confdefs.h"
+struct output_iterator_tag {output_iterator_tag() {} };
+	output_iterator_tag* td_bug_bar ;
+	
+int main() {
+ td_bug_bar->~output_iterator_tag();
+     
+; return 0; }
+EOF
+if { (eval echo configure:2553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_td_bug="no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_TRIVIAL_DESTRUCTOR_BUG 1
+EOF
+ ac_cv_td_bug="yes"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_td_bug" 1>&6
+
+echo $ac_n "checking for explicit function template arguments""... $ac_c" 1>&6
+echo "configure:2569: checking for explicit function template arguments" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2571 "configure"
+#include "confdefs.h"
+  template <class T> class foo;
+       template<class T> bool operator==(const foo<T>& lhs,const foo<T>& rhs);
+      template <class T> class foo {
+	private:
+	  T bar;
+	friend bool operator== <> (const foo<T>&,const foo<T>&);
+     };
+     template<class T> bool operator==(const foo<T>& lhs,const foo<T>& rhs) {
+	return  lhs.bar==rhs.bar;
+     }
+int main() {
+ foo<int> f1, f2;
+      int ret= (f1==f2) 
+; return 0; }
+EOF
+if { (eval echo configure:2588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+   _NULLARGS="<>" ac_cv_expl_fun_args="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+   cat >> confdefs.h <<\EOF
+#define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS 1
+EOF
+ ac_cv_expl_fun_args="no" _NULLARGS=""
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_expl_fun_args" 1>&6
+
+echo $ac_n "checking for template parameter baseclass matching""... $ac_c" 1>&6
+echo "configure:2604: checking for template parameter baseclass matching" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2606 "configure"
+#include "confdefs.h"
+struct output_iterator_tag {};
+     struct derived1_tag : public output_iterator_tag {};
+     struct derived2_tag : public derived1_tag {};
+     template<class T> struct output_iterator { 
+	public:
+	output_iterator() {} 
+	~output_iterator() {} 
+	friend inline int operator== $_NULLARGS (const output_iterator<T>&, 
+                                      const output_iterator<T>&);
+	};
+     template<class T> inline int operator==(const output_iterator<T>&, 
+                              	        const output_iterator<T>&) {
+       return 0;
+     }
+     template<class T> inline output_iterator_tag
+     iterator_category(const output_iterator<T>&) {return output_iterator_tag();}
+     template <class T>
+     struct derived_iterator : public output_iterator<T> {
+	public:
+	derived_iterator() {} 
+	~derived_iterator() {}
+	};
+     template<class T> inline T select_foo(T t, output_iterator_tag) { return t;}     
+     template<class T> inline int select_foo_2(T, T,
+                                             output_iterator_tag) { return 0;}     
+     template<class T> inline T tbase_foo(T pm )  { 
+	derived_iterator<T> di1, di2; int i( di1==di2 && pm);
+	return select_foo((int)1,iterator_category(derived_iterator<T>())); 
+    }
+    
+int main() {
+ (void)tbase_foo((int)1); 
+; return 0; }
+EOF
+if { (eval echo configure:2642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_base_match="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_BASE_MATCH_BUG 1
+EOF
+ ac_cv_base_match="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_base_match" 1>&6
+
+echo $ac_n "checking for non-template parameter baseclass matching ""... $ac_c" 1>&6
+echo "configure:2658: checking for non-template parameter baseclass matching " >&5
+cat > conftest.$ac_ext <<EOF
+#line 2660 "configure"
+#include "confdefs.h"
+struct output_iterator_tag {};
+     struct derived1_tag : public output_iterator_tag {};
+     struct derived2_tag : public derived1_tag {};
+     struct derived3_tag : public derived2_tag {};
+     template<class T> struct output_iterator { 
+	public:
+	output_iterator() {} 
+	~output_iterator() {} 
+	};
+     template<class T> inline output_iterator_tag
+     iterator_category(const output_iterator<T>&) {return output_iterator_tag();}
+     template <class T>
+     struct derived_iterator : public output_iterator<T> {
+	public:
+	derived_iterator() {} 
+	~derived_iterator() {}
+	};
+     template<class T> inline int select_foo_2(T, T,
+                                             output_iterator_tag) { return 0;}     
+     template<class T> inline int select_foo_2(T, T,
+                                             derived1_tag) { return 0;}     
+     template<class T> inline void nont_base_foo(T pm )  { 
+	derived_iterator<T> di1, di2; 
+	(void)select_foo_2(di1, (const derived_iterator<T>&)di2, derived3_tag());
+    }
+    
+int main() {
+ nont_base_foo((int)1); 
+; return 0; }
+EOF
+if { (eval echo configure:2692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_nont_base_match="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NONTEMPL_BASE_MATCH_BUG 1
+EOF
+ ac_cv_nont_base_match="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_nont_base_match" 1>&6
+
+echo $ac_n "checking for nested type parameters bug""... $ac_c" 1>&6
+echo "configure:2708: checking for nested type parameters bug" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2710 "configure"
+#include "confdefs.h"
+template<class T> struct nt_o { typedef int ii; inline ii foo(ii);};
+     template <class T> inline nt_o<T>::ii nt_o<T>::foo(ii) { return 0; }
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:2718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_nested_type_param_bug="no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NESTED_TYPE_PARAM_BUG 1
+EOF
+ ac_cv_nested_type_param_bug="yes"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_nested_type_param_bug" 1>&6
+
+
+echo $ac_n "checking if inherited template typedefs broken completely""... $ac_c" 1>&6
+echo "configure:2735: checking if inherited template typedefs broken completely" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2737 "configure"
+#include "confdefs.h"
+
+template <class Arg1, class Arg2, class Result>
+struct binary_function {
+    typedef Arg1 first_argument_type;
+    typedef Arg2 second_argument_type;
+    typedef Result result_type;
+};     
+
+template <class T>
+struct equal_to : public binary_function<T, T, int> {
+    int operator()(const T& x, const T& y) const { return x == y; }
+};
+
+template <class Predicate> 
+class binary_negate 
+    : public binary_function<$__TYPENAME Predicate::first_argument_type,
+			     $__TYPENAME Predicate::second_argument_type, 
+                             int> {
+protected:
+    Predicate pred;
+public:
+    binary_negate(const Predicate& x = Predicate()) : pred(x) {}
+    int operator() (const $__TYPENAME Predicate::first_argument_type& x, 
+		    const $__TYPENAME Predicate::second_argument_type& y) const {
+	return !pred(x, y); 
+    }
+};
+      typedef equal_to<int> eq_int;
+      typedef binary_negate<equal_to<int> > int_negate;
+      int_negate n;
+ 
+int main() {
+
+      (void)n(1,2);
+    
+; return 0; }
+EOF
+if { (eval echo configure:2776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_typebug="no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_BASE_TYPEDEF_BUG 1
+EOF
+ 
+     cat >> confdefs.h <<\EOF
+#define _STLP_BASE_TYPEDEF_OUTSIDE_BUG 1
+EOF
+ ac_cv_typebug="yes"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_typebug" 1>&6
+
+echo $ac_n "checking if inherited typedefs visible from outside""... $ac_c" 1>&6
+echo "configure:2796: checking if inherited typedefs visible from outside" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2798 "configure"
+#include "confdefs.h"
+
+template <class Arg1, class Arg2, class Result>
+struct binary_function {
+    typedef Arg1 first_argument_type;
+    typedef Arg1 second_argument_type;
+    typedef Result result_type;
+};     
+
+
+template <class T>
+class plus : public binary_function<T, T, T> {
+public:
+    plus() {}
+    plus(const T&) {}
+    T operator()(const T& x, const T& y) const { return x + y; };
+};
+
+plus<int> p;
+plus<int>::first_argument_type a;
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:2824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_outside_typedef="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_BASE_TYPEDEF_OUTSIDE_BUG 1
+EOF
+ ac_cv_outside_typedef="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_outside_typedef" 1>&6
+
+# fi
+
+echo $ac_n "checking if private type static members initializable""... $ac_c" 1>&6
+echo "configure:2842: checking if private type static members initializable" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2844 "configure"
+#include "confdefs.h"
+struct p_Class { private: struct str_ { 
+	int a; str_(int i) : a(i) {}}; static str_ my_int; 
+     };
+     p_Class::str_ p_Class::my_int(0); 
+     
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:2855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_private="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_UNINITIALIZABLE_PRIVATE 1
+EOF
+ ac_cv_private="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_private" 1>&6
+
+
+echo $ac_n "checking for const member constructor bug""... $ac_c" 1>&6
+echo "configure:2872: checking for const member constructor bug" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2874 "configure"
+#include "confdefs.h"
+
+template <class T1, class T2>
+struct pair {
+    T1 first;
+    T2 second;
+    pair(): first(T1()), second(T2()) {}
+    pair(const pair<T1,T2>& o) : first(o.first), second(o.second) {}
+};
+pair< const int, const int > p;  
+     
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:2890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_const_constructor_bug="no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_CONST_CONSTRUCTOR_BUG 1
+EOF
+ ac_cv_const_constructor_bug="yes"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_const_constructor_bug" 1>&6
+
+echo $ac_n "checking for loop inline problems""... $ac_c" 1>&6
+echo "configure:2906: checking for loop inline problems" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2908 "configure"
+#include "confdefs.h"
+inline int il_foo (int a) { 
+      int i; for (i=0; i<a; i++) a+=a;  while (i>0) a-=3; return a; }
+int main() {
+(void)il_foo(2);
+; return 0; }
+EOF
+if { (eval echo configure:2916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_inline_problems="no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_LOOP_INLINE_PROBLEMS 1
+EOF
+ ac_cv_inline_problems="yes"
+fi
+rm -f conftest*
+if test "$ac_cv_inline_problems" = no; then
+# check if no warnings have been issued
+  if `check_warning` ; then
+     ac_cv_inline_problems="no"
+  else
+   cat >> confdefs.h <<\EOF
+#define _STLP_LOOP_INLINE_PROBLEMS 1
+EOF
+
+   ac_cv_inline_problems="yes"
+  fi
+fi
+echo "$ac_t""$ac_cv_inline_problems" 1>&6
+
+
+echo $ac_n "checking if arrow operator always get instantiated""... $ac_c" 1>&6
+echo "configure:2945: checking if arrow operator always get instantiated" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2947 "configure"
+#include "confdefs.h"
+
+     template <class T> struct um_foo { T* ptr; 
+	T* operator ->() { return &(operator*());}
+	T  operator *()  { return *ptr; }
+     };
+     template <class T>
+	int operator == ( const um_foo<T>& x, const um_foo<T>& y)
+	{
+    		return *x == *y;
+	}
+     struct um_tag { int a ; };
+     um_foo<um_tag> f;
+     um_foo<int> a;
+     
+int main() {
+ 
+     int b(5); a.ptr=&b;
+; return 0; }
+EOF
+if { (eval echo configure:2968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_unused_required="no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NO_ARROW_OPERATOR 1
+EOF
+ ac_cv_unused_required="yes"
+    
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_unused_required" 1>&6
+
+echo $ac_n "checking for pointer-to-member parameter bug""... $ac_c" 1>&6
+echo "configure:2985: checking for pointer-to-member parameter bug" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2987 "configure"
+#include "confdefs.h"
+
+struct pmf_foo {
+	int bar() { return 0; };
+};
+
+template <class Class, class Result> 
+class mem_fun_t {
+protected:
+    typedef Result (Class::*fun_type)(void);
+    fun_type ptr;
+public:
+    mem_fun_t() {}
+    mem_fun_t(fun_type p) : ptr(p) {}
+    Result operator()(Class* x) const { return (x->*ptr)();}
+};
+
+template <class Class, class Result>
+inline mem_fun_t <Class, Result> 
+mem_fun(Result (Class::*ptr)(void)) {
+    return mem_fun_t<Class, Result>(ptr);
+}
+
+int main() {
+pmf_foo pmf; (void)mem_fun(&pmf_foo::bar)(&pmf)
+; return 0; }
+EOF
+if { (eval echo configure:3015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_pmf_bug="no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_MEMBER_POINTER_PARAM_BUG 1
+EOF
+ ac_cv_pmf_bug="yes"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_pmf_bug" 1>&6
+
+echo $ac_n "checking if bad_alloc defined in <new>""... $ac_c" 1>&6
+echo "configure:3031: checking if bad_alloc defined in <new>" >&5
+cat > conftest.$ac_ext <<EOF
+#line 3033 "configure"
+#include "confdefs.h"
+
+     #if !defined (_STLP_NO_NEW_STYLE_HEADERS)
+     #include <new>
+     #else
+     #include <new.h>
+     #endif
+
+     # if !defined (_STLP_HAS_NO_NAMESPACES)
+       using namespace $_TEST_STD;
+     # endif
+
+     bad_alloc badalloc_foo() { bad_alloc err; return err;}
+int main() {
+(void)badalloc_foo()
+; return 0; }
+EOF
+if { (eval echo configure:3051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_bad_alloc="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_NO_BAD_ALLOC 1
+EOF
+ ac_cv_bad_alloc="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_bad_alloc" 1>&6
+
+echo $ac_n "checking for __type_traits automatic specialization""... $ac_c" 1>&6
+echo "configure:3067: checking for __type_traits automatic specialization" >&5
+cat > conftest.$ac_ext <<EOF
+#line 3069 "configure"
+#include "confdefs.h"
+template <class T> int tt_foo(const T&) {
+	typedef __type_traits<T> traits;
+	return 0;
+     }
+int main() {
+(void)tt_foo(5)
+; return 0; }
+EOF
+if { (eval echo configure:3079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define _STLP_AUTOMATIC_TYPE_TRAITS 1
+EOF
+ ac_cv_type_traits="yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_type_traits="no"
+fi
+rm -f conftest*
+echo "$ac_t""$ac_cv_type_traits" 1>&6
+
+
+# package options - exceptions
+echo "$ac_t""***" 1>&6
+echo "$ac_t""$0: Setting implementation options..." 1>&6
+echo "$ac_t""***" 1>&6
+
+if test "$ac_cv_exceptions" = yes; then
+# Check whether --enable-exceptions or --disable-exceptions was given.
+if test "${enable_exceptions+set}" = set; then
+  enableval="$enable_exceptions"
+  
+case "$enableval" in
+           no) cat >> confdefs.h <<\EOF
+#define _STLP_NO_EXCEPTIONS 1
+EOF
+
+               echo "$ac_t""Config arg --disable-exceptions : disabling exceptions by user request" 1>&6;;
+           *)  echo "$ac_t""Config default: exceptions enabled" 1>&6
+esac
+
+else
+  echo "$ac_t""Config default: exceptions enabled" 1>&6 
+
+fi
+
+else
+ echo "$ac_t""Compiler restriction : no exceptions support used" 1>&6
+fi
+
+if test "$ac_cv_namespaces" = yes; then
+# Check whether --enable-relops or --disable-relops was given.
+if test "${enable_relops+set}" = set; then
+  enableval="$enable_relops"
+  
+case "$enableval" in
+	no) cat >> confdefs.h <<\EOF
+#define _STLP_NO_RELOPS_NAMESPACE 1
+EOF
+ 
+            echo "$ac_t""Config arg --disable-relops : no std::rel_ops namespace by user request" 1>&6;;
+	 *) echo "$ac_t""Config default: Separate std::rel_ops namespace for relational operators" 1>&6
+esac
+
+else
+  echo "$ac_t""Config default: Separate std::rel_ops namespace for relational operators" 1>&6
+
+fi
+
+else
+ cat >> confdefs.h <<\EOF
+#define _STLP_NO_RELOPS_NAMESPACE 1
+EOF
+ 
+fi
+
+if test "$ac_cv_newheaders" = yes; then
+# Check whether --enable-new-style-headers or --disable-new-style-headers was given.
+if test "${enable_new_style_headers+set}" = set; then
+  enableval="$enable_new_style_headers"
+  
+case "$enableval" in
+	no) cat >> confdefs.h <<\EOF
+#define _STLP_NO_NEW_STYLE_HEADERS 1
+EOF
+ 
+            echo "$ac_t""Config arg --disable-new-style-headers : not using new-style headers" 1>&6;;
+	 *) echo "$ac_t""Config default: using new-style headers" 1>&6
+esac
+
+else
+  echo "$ac_t""Config default: using new-style headers" 1>&6
+
+fi
+
+else
+ cat >> confdefs.h <<\EOF
+#define _STLP_NO_NEW_STYLE_HEADERS 1
+EOF
+
+fi
+
+if test "$ac_cv_newstreams" = yes; then
+# Check whether --enable-new-iostreams or --disable-new-iostreams was given.
+if test "${enable_new_iostreams+set}" = set; then
+  enableval="$enable_new_iostreams"
+  
+case "$enableval" in
+	no) cat >> confdefs.h <<\EOF
+#define _STLP_NO_NEW_IOSTREAMS 1
+EOF
+ 
+            echo "$ac_t""Config arg --disable-new-iostreams : not using new iostreams" 1>&6;;
+	 *) echo "$ac_t""Config default: using new iostreams" 1>&6
+esac
+
+else
+  echo "$ac_t""Config default: using new iostreams" 1>&6
+
+fi
+
+else
+  cat >> confdefs.h <<\EOF
+#define _STLP_NO_NEW_IOSTREAMS 1
+EOF
+
+fi
+
+# Check whether --enable-sgi-allocators or --disable-sgi-allocators was given.
+if test "${enable_sgi_allocators+set}" = set; then
+  enableval="$enable_sgi_allocators"
+  
+case "$enableval" in
+	  yes ) echo "$ac_t""Config arg  --enable-sgi-allocators : SGI-style alloc as default allocator" 1>&6 
+                cat >> confdefs.h <<\EOF
+#define _STLP_USE_RAW_SGI_ALLOCATORS 1
+EOF
+;;
+	    * ) echo "$ac_t""Config default: using allocator<T> as default allocator if possible " 1>&6
+esac
+
+else
+  
+ echo "$ac_t""Config default: using allocator<T> as default allocator if possible" 1>&6
+
+
+fi
+
+
+# Check whether --enable-malloc or --disable-malloc was given.
+if test "${enable_malloc+set}" = set; then
+  enableval="$enable_malloc"
+  
+case "$enableval" in
+	  yes ) echo "$ac_t""Config arg  --enable-malloc : setting malloc_alloc as default alloc" 1>&6 
+                cat >> confdefs.h <<\EOF
+#define _STLP_USE_MALLOC 1
+EOF
+;;
+	    * ) echo "$ac_t""Config default: not using malloc_alloc as default alloc" 1>&6
+esac
+
+else
+  
+ echo "$ac_t""Config default: not using malloc_alloc as default alloc" 1>&6
+
+
+fi
+
+
+# Check whether --enable-newalloc or --disable-newalloc was given.
+if test "${enable_newalloc+set}" = set; then
+  enableval="$enable_newalloc"
+  
+case "$enableval" in
+	  yes ) echo "$ac_t""Config arg  --enable-newalloc : setting new_alloc as default alloc" 1>&6 
+                cat >> confdefs.h <<\EOF
+#define _STLP_USE_NEWALLOC 1
+EOF
+;;
+	    * )
+                echo "$ac_t""Config default: not using new_alloc as default alloc" 1>&6
+esac
+
+else
+  
+ echo "$ac_t""Config default: not using new_alloc as default alloc" 1>&6
+
+
+fi
+
+
+# Check whether --enable-defalloc or --disable-defalloc was given.
+if test "${enable_defalloc+set}" = set; then
+  enableval="$enable_defalloc"
+  
+case "$enableval" in
+	  no ) echo "$ac_t""Config arg --disable-defalloc : not including HP-style defalloc.h into alloc.h" 1>&6;;
+
+	  * ) echo "$ac_t""Config default : including HP-style defalloc.h into alloc.h" 1>&6 
+                cat >> confdefs.h <<\EOF
+#define _STLP_USE_DEFALLOC 1
+EOF
+
+esac
+
+else
+  
+          echo "$ac_t""Config default : not including HP-style defalloc.h into alloc.h" 1>&6
+
+
+fi
+
+
+
+# Check whether --enable-debugalloc or --disable-debugalloc was given.
+if test "${enable_debugalloc+set}" = set; then
+  enableval="$enable_debugalloc"
+  
+case "$enableval" in
+	  yes ) echo "$ac_t""Config arg --enable-debugalloc : use debug versions of allocators " 1>&6 
+                cat >> confdefs.h <<\EOF
+#define _STLP_DEBUG_ALLOC 1
+EOF
+;;
+	  * )
+          echo "$ac_t""Config default : not using debug allocators" 1>&6
+esac
+
+else
+  
+          echo "$ac_t""Config default : not using debug allocators" 1>&6
+
+
+fi
+
+
+
+# Check whether --enable-abbrevs or --disable-abbrevs was given.
+if test "${enable_abbrevs+set}" = set; then
+  enableval="$enable_abbrevs"
+  
+case "$enableval" in
+	  yes ) echo "$ac_t""Config arg --enable-abbrevs : using abbreviated class names internally" 1>&6 
+                cat >> confdefs.h <<\EOF
+#define _STLP_USE_ABBREVS 1
+EOF
+;;
+	  * )
+          echo "$ac_t""Config default : not using abbreviated class names internally" 1>&6
+esac
+
+else
+  
+          echo "$ac_t""Config default : not using abbreviated class names internally" 1>&6
+
+
+fi
+
+
+
+cat >> confdefs.h <<\EOF
+#define __AUTO_CONFIGURED 1
+EOF
+
+
+echo "$ac_t""***" 1>&6
+echo "$ac_t""$0: setting up headers..." 1>&6
+echo "$ac_t""***" 1>&6
+trap '' 1 2 15
+
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# Any assignment to VPATH causes Sun make to only execute
+# the first set of double-colon rules, so remove it if not needed.
+# If there is a colon in the path, we need to keep it.
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
+fi
+
+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
+
+DEFS=-DHAVE_CONFIG_H
+
+# Without the "./", some shells look in PATH for config.status.
+: ${CONFIG_STATUS=./config.status}
+
+echo creating $CONFIG_STATUS
+rm -f $CONFIG_STATUS
+cat > $CONFIG_STATUS <<EOF
+#! /bin/sh
+# Generated automatically by configure.
+# Run this file to recreate the current configuration.
+# This directory was configured as follows,
+# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+#
+# $0 $ac_configure_args
+#
+# Compiler output produced by configure, useful for debugging
+# configure, is in ./config.log if it exists.
+
+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
+for ac_option
+do
+  case "\$ac_option" in
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
+    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
+  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
+    echo "$CONFIG_STATUS generated by autoconf version 2.12"
+    exit 0 ;;
+  -help | --help | --hel | --he | --h)
+    echo "\$ac_cs_usage"; exit 0 ;;
+  *) echo "\$ac_cs_usage"; exit 1 ;;
+  esac
+done
+
+ac_given_srcdir=$srcdir
+
+trap 'rm -fr `echo "stlconf.h stlconf.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+EOF
+cat >> $CONFIG_STATUS <<EOF
+
+# Protect against being on the right side of a sed subst in config.status.
+sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
+ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
+$ac_vpsub
+$extrasub
+s%@CFLAGS@%$CFLAGS%g
+s%@CPPFLAGS@%$CPPFLAGS%g
+s%@CXXFLAGS@%$CXXFLAGS%g
+s%@DEFS@%$DEFS%g
+s%@LDFLAGS@%$LDFLAGS%g
+s%@LIBS@%$LIBS%g
+s%@exec_prefix@%$exec_prefix%g
+s%@prefix@%$prefix%g
+s%@program_transform_name@%$program_transform_name%g
+s%@bindir@%$bindir%g
+s%@sbindir@%$sbindir%g
+s%@libexecdir@%$libexecdir%g
+s%@datadir@%$datadir%g
+s%@sysconfdir@%$sysconfdir%g
+s%@sharedstatedir@%$sharedstatedir%g
+s%@localstatedir@%$localstatedir%g
+s%@libdir@%$libdir%g
+s%@includedir@%$includedir%g
+s%@oldincludedir@%$oldincludedir%g
+s%@infodir@%$infodir%g
+s%@mandir@%$mandir%g
+s%@CXX@%$CXX%g
+
+CEOF
+EOF
+
+cat >> $CONFIG_STATUS <<\EOF
+
+# Split the substitutions into bite-sized pieces for seds with
+# small command number limits, like on Digital OSF/1 and HP-UX.
+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_file=1 # Number of current file.
+ac_beg=1 # First line for current file.
+ac_end=$ac_max_sed_cmds # Line after last line for current file.
+ac_more_lines=:
+ac_sed_cmds=""
+while $ac_more_lines; do
+  if test $ac_beg -gt 1; then
+    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
+  else
+    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+  fi
+  if test ! -s conftest.s$ac_file; then
+    ac_more_lines=false
+    rm -f conftest.s$ac_file
+  else
+    if test -z "$ac_sed_cmds"; then
+      ac_sed_cmds="sed -f conftest.s$ac_file"
+    else
+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+    fi
+    ac_file=`expr $ac_file + 1`
+    ac_beg=$ac_end
+    ac_end=`expr $ac_end + $ac_max_sed_cmds`
+  fi
+done
+if test -z "$ac_sed_cmds"; then
+  ac_sed_cmds=cat
+fi
+EOF
+
+cat >> $CONFIG_STATUS <<EOF
+
+CONFIG_FILES=\${CONFIG_FILES-"stlconf.h"}
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case "$ac_file" in
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+  *) ac_file_in="${ac_file}.in" ;;
+  esac
+
+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
+
+  # Remove last slash and all that follows it.  Not all systems have dirname.
+  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+    # The file is in a subdirectory.
+    test ! -d "$ac_dir" && mkdir "$ac_dir"
+    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+    # A "../" for each directory in $ac_dir_suffix.
+    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+  else
+    ac_dir_suffix= ac_dots=
+  fi
+
+  case "$ac_given_srcdir" in
+  .)  srcdir=.
+      if test -z "$ac_dots"; then top_srcdir=.
+      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
+  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+  *) # Relative path.
+    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
+    top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  esac
+
+
+  echo creating "$ac_file"
+  rm -f "$ac_file"
+  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
+  case "$ac_file" in
+  *Makefile*) ac_comsub="1i\\
+# $configure_input" ;;
+  *) ac_comsub= ;;
+  esac
+
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  sed -e "$ac_comsub
+s%@configure_input@%$configure_input%g
+s%@srcdir@%$srcdir%g
+s%@top_srcdir@%$top_srcdir%g
+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
+fi; done
+rm -f conftest.s*
+
+# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+# NAME is the cpp macro being defined and VALUE is the value it is being given.
+#
+# ac_d sets the value in "#define NAME VALUE" lines.
+ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
+ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
+ac_dC='\3'
+ac_dD='%g'
+# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
+ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
+ac_uB='\([ 	]\)%\1#\2define\3'
+ac_uC=' '
+ac_uD='\4%g'
+# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
+ac_eB='$%\1#\2define\3'
+ac_eC=' '
+ac_eD='%g'
+
+if test "${CONFIG_HEADERS+set}" != set; then
+EOF
+cat >> $CONFIG_STATUS <<EOF
+  CONFIG_HEADERS="stlconf.h"
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+fi
+for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case "$ac_file" in
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+  *) ac_file_in="${ac_file}.in" ;;
+  esac
+
+  echo creating $ac_file
+
+  rm -f conftest.frag conftest.in conftest.out
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  cat $ac_file_inputs > conftest.in
+
+EOF
+
+# Transform confdefs.h into a sed script conftest.vals that substitutes
+# the proper values into config.h.in to produce config.h.  And first:
+# Protect against being on the right side of a sed subst in config.status.
+# Protect against being in an unquoted here document in config.status.
+rm -f conftest.vals
+cat > conftest.hdr <<\EOF
+s/[\\&%]/\\&/g
+s%[\\$`]%\\&%g
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
+s%ac_d%ac_u%gp
+s%ac_u%ac_e%gp
+EOF
+sed -n -f conftest.hdr confdefs.h > conftest.vals
+rm -f conftest.hdr
+
+# This sed command replaces #undef with comments.  This is necessary, for
+# example, in the case of _POSIX_SOURCE, which is predefined and required
+# on some systems where configure will not decide to define it.
+cat >> conftest.vals <<\EOF
+s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
+EOF
+
+# Break up conftest.vals because some shells have a limit on
+# the size of here documents, and old seds have small limits too.
+
+rm -f conftest.tail
+while :
+do
+  ac_lines=`grep -c . conftest.vals`
+  # grep -c gives empty output for an empty file on some AIX systems.
+  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
+  # Write a limited-size here document to conftest.frag.
+  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
+  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
+  echo 'CEOF
+  sed -f conftest.frag conftest.in > conftest.out
+  rm -f conftest.in
+  mv conftest.out conftest.in
+' >> $CONFIG_STATUS
+  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
+  rm -f conftest.vals
+  mv conftest.tail conftest.vals
+done
+rm -f conftest.vals
+
+cat >> $CONFIG_STATUS <<\EOF
+  rm -f conftest.frag conftest.h
+  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
+  cat conftest.in >> conftest.h
+  rm -f conftest.in
+  if cmp -s $ac_file conftest.h 2>/dev/null; then
+    echo "$ac_file is unchanged"
+    rm -f conftest.h
+  else
+    # Remove last slash and all that follows it.  Not all systems have dirname.
+      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+      # The file is in a subdirectory.
+      test ! -d "$ac_dir" && mkdir "$ac_dir"
+    fi
+    rm -f $ac_file
+    mv conftest.h $ac_file
+  fi
+fi; done
+
+EOF
+cat >> $CONFIG_STATUS <<EOF
+
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+
+exit 0
+EOF
+chmod +x $CONFIG_STATUS
+rm -fr confdefs* $ac_clean_files
+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+
+echo "$ac_t""***" 1>&6
+echo "$ac_t""$0: STLport configured for use with \"${CXX}\" compiler" 1>&6
+echo "$ac_t""$0: To restore original settings - run \"./unconfigure\" or copy stlconf.h.in to stlconf.h." 1>&6
+echo "$ac_t""***" 1>&6
+
diff --git a/main/source/stlport/stlport/config/new_compiler/configure.in b/main/source/stlport/stlport/config/new_compiler/configure.in
new file mode 100644
index 00000000..c670d38b
--- /dev/null
+++ b/main/source/stlport/stlport/config/new_compiler/configure.in
@@ -0,0 +1,1424 @@
+dnl Disable any caching here 
+define([AC_CACHE_LOAD], )dnl
+define([AC_CACHE_SAVE], )dnl
+dnl Process this file with autoconf to produce a configure script.
+AC_INIT(stlconf.h.in)
+AC_CONFIG_HEADER(stlconf.h)
+
+AC_MSG_RESULT(*** $0: STLport configuration utility ***)
+if test "${CXXFLAGS}" = ""; then 
+AC_MSG_RESULT(* Note: for best reliability - try \"CXXFLAGS=-treat_warnings_as_errors\" $0 )
+AC_MSG_RESULT(* Please don't forget specifying typical CXXFLAGS you'll be using - ) 
+AC_MSG_RESULT(* such as that enabling exceptions handling, etc. )
+dnl AC_MSG_RESULT(* Add option forcing instantiation of all templates to CXXFLAGS if possible. )
+fi
+AC_MSG_RESULT(Please stand by while exploring compiler capabilities...)
+AC_MSG_RESULT(Be patient - that may take a while...)
+AC_MSG_RESULT(***)
+
+# utility function
+check_warning () {
+    warn_str=`tail -1 config.log | egrep -i "arning|\(W\)"`
+    if test "$warn_str" = ""; then
+      return 0
+    else
+     return 1
+    fi
+}
+
+dnl Checks for systems
+dnl AC_AIX
+dnl Checks for programs.
+dnl sets CXX
+
+AC_ARG_ENABLE(extension,[--enable-extension=<ext>],
+[
+case "$enableval" in
+	no) AC_MSG_RESULT(Info :.cpp used as extension for tests) 
+	    ac_ext=cpp 
+      	;;
+	 *) AC_MSG_RESULT(Argument : .$enableval used as extension) 
+	ac_ext=$enableval
+esac
+],
+[AC_MSG_RESULT(Info : .cpp used as extension for tests) 
+	ac_ext=cpp
+]
+)
+
+# Save that, as it is being redefined several times 
+use_ac_ext=$ac_ext
+
+AC_PROG_CXX
+ac_ext=$use_ac_ext
+
+AC_LANG_CPLUSPLUS
+ac_ext=$use_ac_ext
+
+AC_CHECK_SIZEOF(int,4)
+ac_ext=$use_ac_ext
+
+if test "$ac_cv_sizeof_int" = "4"; then
+  AC_DEFINE_UNQUOTED(_STLP_UINT32_T,unsigned int)
+else
+  AC_CHECK_SIZEOF(long,4)
+  ac_ext=$use_ac_ext
+  if test "$ac_cv_sizeof_long" = "4"; then
+    AC_DEFINE_UNQUOTED(_STLP_UINT32_T,unsigned long)
+  else
+  dnl ELBRUS ??? ;)
+    AC_CHECK_SIZEOF(short,4)
+    if test "$ac_cv_sizeof_short" = "4"; then
+      AC_DEFINE_UNQUOTED(_STLP_UINT32_T,unsigned short)
+    else
+      AC_MSG_ERROR(Cannot find any 32-bit integer type for your compiler)
+    fi
+  ac_ext=$use_ac_ext
+  fi
+fi
+ac_ext=$use_ac_ext
+
+
+dnl Exclude link stage for cross-compilation
+if test "$ac_cv_c_cross" = "yes"; then
+  CXXFLAGS="${CXXFLAGS} -c"
+fi
+
+ac_ext=$use_ac_ext
+
+dnl checking for compiler capabilities
+AC_MSG_CHECKING(for basic STL compatibility)
+AC_TRY_LINK( [
+template <class Arg1, class Arg2, class Result>
+struct binary_function {
+    typedef Arg1 first_argument_type;
+    typedef Arg2 second_argument_type;
+    typedef Result result_type;
+};      
+template <class T>
+struct plus : public binary_function<T, T, T> {
+    T operator()(const T& x, const T& y) const;
+};
+
+template <class T>
+T plus<T>::operator()(const T& x, const T& y) const { return x + y; }
+plus<int> p;
+],
+[], 
+[ac_cv_compat="yes"],
+[AC_MSG_ERROR(Your compiler won't be able to compile this implementation. Sorry.) 
+ ac_cv_compat="no"]
+)
+AC_MSG_RESULT($ac_cv_compat)
+
+AC_MSG_CHECKING(for partial specialization syntax)
+AC_TRY_LINK(
+    [
+     template <class T> class fs_foo {};
+     template <> class fs_foo<int> {};],
+    [ fs_foo<int> i;],
+    [  _FULL_SPEC="template <>" ac_cv_spec_syntax="yes"],
+    [  AC_DEFINE(_STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX) ac_cv_spec_syntax="no" _FULL_SPEC=""])
+AC_MSG_RESULT($ac_cv_spec_syntax)
+
+AC_MSG_CHECKING(for bool keyword)
+AC_TRY_COMPILE(
+    [bool b_foo() { return true; }],
+    [(void)b_foo();],
+    [ac_cv_bool="yes"],
+    [AC_DEFINE(_STLP_NO_BOOL) ac_cv_bool="no"])
+AC_MSG_RESULT($ac_cv_bool)
+if test "$ac_cv_bool" = "no"; then
+  AC_MSG_CHECKING(for yvals.h header)
+  AC_TRY_COMPILE([#include <yvals.h> 
+    extern bool aaa=true;
+   ], [], 
+  [AC_DEFINE(_STLP_YVALS_H) AC_MSG_RESULT(yes) ], 
+  [
+  AC_MSG_RESULT(no)
+  AC_MSG_CHECKING(whether bool is reserved word)
+  AC_TRY_COMPILE(
+    [typedef int bool;],
+    [],
+    [ac_cv_bool_reserved="no"],
+    [AC_DEFINE(_STLP_DONT_USE_BOOL_TYPEDEF) ac_cv_bool_reserved="yes"])
+  AC_MSG_RESULT($ac_cv_bool_reserved)
+  ])
+fi
+
+AC_MSG_CHECKING(for wchar_t type)
+AC_TRY_COMPILE(
+    [ #include <wchar.h>
+      wchar_t wc_foo() { return 'a'; }],
+    [(void)wc_foo();],
+    [ac_cv_wchar="yes"],
+    [AC_DEFINE(_STLP_NO_WCHAR_T) ac_cv_wchar="no"])
+AC_MSG_RESULT($ac_cv_wchar)
+
+AC_MSG_CHECKING(if wchar_t is unsigned short)
+AC_TRY_COMPILE(
+    [
+     # include <wchar.h>
+     template <class T> struct foo {};
+     $_FULL_SPEC struct foo <wchar_t> {};
+     typedef unsigned short u__short;
+     $_FULL_SPEC struct foo <u__short> {};
+     foo<wchar_t> f1;
+     foo<u__short> f2;
+	],
+    [],
+    [ac_cv_wchar_short="no"],
+    [AC_DEFINE(_STLP_WCHAR_T_IS_USHORT) ac_cv_wchar_short="yes"])
+AC_MSG_RESULT($ac_cv_wchar_short)
+
+AC_MSG_CHECKING(for long long type)
+AC_TRY_COMPILE(
+    [long long ll_foo() { return 0; }],
+    [(void)ll_foo();],
+    [AC_DEFINE(_STLP_LONG_LONG) ac_cv_long_long="yes"],
+    [ac_cv_long_long="no"])
+AC_MSG_RESULT($ac_cv_long_long)
+
+AC_MSG_CHECKING(for long double type)
+AC_TRY_COMPILE(
+    [long double ld_foo() { return 0; }],
+    [(void)ld_foo();],
+    [ac_cv_long_double="yes"],
+    [AC_DEFINE(_STLP_NO_LONG_DOUBLE) ac_cv_long_double="no"])
+AC_MSG_RESULT($ac_cv_long_double)
+
+AC_MSG_CHECKING(for typename keyword)
+AC_TRY_LINK(
+    [
+template <class T1, class T2>
+struct pair {
+    typedef T1 first_type;
+    typedef T2 second_type;
+};
+
+template <class Arg, class Result>
+struct unary_function {
+    typedef Arg argument_type;
+    typedef Result result_type;
+};
+
+template <class Pair>
+struct select2nd : public unary_function<Pair, typename Pair::second_type> {
+  typedef typename Pair::first_type ignored_type;
+  const typename Pair::second_type& operator()(const typename Pair::second_type& x,
+						const ignored_type& ) const
+  {
+    return x;
+  }
+  
+};
+    ],
+    [ 
+	typedef pair<int,int> tn_p;
+	select2nd< tn_p > tn_s;
+	(void)tn_s(1,5);
+    ],
+    [__TYPENAME="typename" 
+     ac_cv_typename="yes"],
+    [__TYPENAME="" 
+     AC_DEFINE(_STLP_NEED_TYPENAME)
+     ac_cv_typename="no"])
+AC_MSG_RESULT($ac_cv_typename)
+
+AC_MSG_CHECKING(for explicit keyword)
+AC_TRY_COMPILE(    
+    [struct expl_Class { int a; explicit expl_Class(int t): a(t) {} };
+    expl_Class c(1);
+    ],
+    [],
+    [ac_cv_explicit="yes"],
+    [AC_DEFINE(_STLP_NO_EXPLICIT) ac_cv_explicit="no"])
+AC_MSG_RESULT($ac_cv_explicit)
+
+AC_MSG_CHECKING(for mutable keyword)
+AC_TRY_COMPILE(    
+    [struct mut_Class { mutable int a; void update() const { a=0; }  };
+    mut_Class c;
+    ],
+    [c.update()],
+    [ac_cv_mutable="yes"],
+    [AC_DEFINE(_STLP_NEED_MUTABLE) ac_cv_mutable="no"])
+AC_MSG_RESULT($ac_cv_mutable)
+
+AC_MSG_CHECKING(for new style casts)
+AC_TRY_COMPILE(    
+    [struct ncast_Class { 
+	int a; void update(int* i) { *i=a; }  };
+    ncast_Class c;
+    ],
+    [
+  const int a(5);
+  c.update(const_cast<int*>(&a))
+    ],
+    [ac_cv_new_cast="yes"],
+    [AC_DEFINE(_STLP_NO_NEW_STYLE_CASTS) ac_cv_new_cast="no"])
+AC_MSG_RESULT($ac_cv_new_cast)
+
+AC_MSG_CHECKING(for new-style C library headers)
+AC_TRY_COMPILE(
+    [
+     #include <cctype>
+     #include <cstddef>
+     #include <cstdio>
+     #include <cstdlib>
+     #include <cstring>
+     #include <cassert>
+     #include <climits>
+     #ifndef _STLP_NO_WCHAR_T
+     #include <cwchar>
+     #endif
+       ],
+    [],
+    [ac_cv_newheaders="yes"],
+    [AC_DEFINE(_STLP_HAS_NO_NEW_C_HEADERS) ac_cv_newheaders="no"])
+AC_MSG_RESULT($ac_cv_newheaders)
+
+AC_MSG_CHECKING(for new-style <new> header)
+AC_TRY_COMPILE(
+    [
+     #include <new>
+       ],
+    [],
+    [ac_cv_new_new="yes"],
+    [AC_DEFINE(_STLP_NO_NEW_NEW_HEADER) ac_cv_new_new="no"])
+AC_MSG_RESULT($ac_cv_new_new)
+
+
+AC_MSG_CHECKING(for member template methods)
+AC_TRY_LINK( [
+template <class Result>
+struct mt_foo {
+    typedef Result result_type;
+    template <class Arg> result_type operate(const Arg&) { return Result(); }
+};      
+mt_foo<int> p;
+],
+[
+(void)p.operate((char*)"aaa");
+], 
+[ac_cv_member_templates="yes"],
+[AC_DEFINE(_STLP_NO_MEMBER_TEMPLATES) ac_cv_member_templates="no"]
+)
+AC_MSG_RESULT($ac_cv_member_templates)
+
+AC_MSG_CHECKING(for friend templates)
+AC_TRY_LINK( [
+
+template <class Result2> class foo;
+
+template <class Result>
+struct ft_foo {
+    typedef Result result_type;
+    template <class Result2> friend class foo;
+};      
+ft_foo<int> p;
+],
+[], 
+[ac_cv_friend_templates="yes"],
+[AC_DEFINE(_STLP_NO_FRIEND_TEMPLATES) ac_cv_friend_templates="no"]
+)
+AC_MSG_RESULT($ac_cv_friend_templates)
+
+AC_MSG_CHECKING(for qualified friend templates)
+AC_TRY_LINK( [
+
+${_TEST_STD_BEGIN}
+
+template <class Result2> class foo;
+
+template <class Result>
+struct ft_foo {
+    typedef Result result_type;
+    template <class Result2> friend class $_TEST_STD::foo;
+};      
+ft_foo<int> p;
+${_TEST_STD_END}
+
+],
+[], 
+[ac_cv_qual_friend_templates="yes"],
+[AC_DEFINE(_STLP_NO_QUALIFIED_FRIENDS) ac_cv_qual_friend_templates="no"]
+)
+AC_MSG_RESULT($ac_cv_qual_friend_templates)
+
+AC_MSG_CHECKING(for member template keyword)
+AC_TRY_LINK( [
+template <class Result>
+struct nt_foo {
+    typedef Result result_type;
+    template <class Arg> struct rebind {  typedef nt_foo<Arg> other; };
+};
+
+template <class _Tp, class _Allocator>
+struct _Traits
+{
+  typedef typename _Allocator:: template rebind<_Tp> my_rebind; 
+  typedef typename my_rebind::other allocator_type;
+};
+
+nt_foo<char> p;
+_Traits< int, nt_foo<short> > pp;
+],
+[], 
+[ac_cv_member_template_keyword="yes"],
+[AC_DEFINE(_STLP_NO_MEMBER_TEMPLATE_KEYWORD) ac_cv_member_template_keyword="no"]
+)
+AC_MSG_RESULT($ac_cv_member_template_keyword)
+
+if test "$ac_cv_member_template_keyword" = "no"; then
+AC_MSG_CHECKING(for member template classes)
+AC_TRY_LINK( [
+template <class Result>
+struct nt_foo {
+    typedef Result result_type;
+    template <class Arg> struct rebind {  typedef nt_foo<Arg> other; };
+};
+
+template <class _Tp, class _Allocator>
+struct _Traits
+{
+  typedef typename _Allocator::rebind<_Tp> my_rebind; 
+  typedef typename my_rebind::other allocator_type;
+};
+
+nt_foo<char> p;
+_Traits< int, nt_foo<short> > pp;
+],
+[], 
+[ac_cv_member_template_classes="yes"],
+[AC_DEFINE(_STLP_NO_MEMBER_TEMPLATE_CLASSES) ac_cv_member_template_classes="no"]
+)
+AC_MSG_RESULT($ac_cv_member_template_classes)
+fi
+
+AC_MSG_CHECKING(for partial class specialization)
+AC_TRY_LINK( [
+template <class Arg,class Result>
+struct ps_foo {
+    typedef Arg argument_type;
+    typedef Result result_type;
+};   
+
+template<class Result>
+struct ps_foo<Result*,Result*> {
+	void bar() {}
+};
+
+template<class Result>
+struct ps_foo<int*,Result> {
+	void foo() {}
+};
+
+ps_foo<char*, char*> p;
+ps_foo<int*, int> p1;
+],
+[p.bar();
+ p1.foo();], 
+[ac_cv_partial_spec="yes"],
+[AC_DEFINE(_STLP_NO_CLASS_PARTIAL_SPECIALIZATION) ac_cv_partial_spec="no"]
+)
+AC_MSG_RESULT($ac_cv_partial_spec)
+
+if test "$ac_cv_partial_spec" = yes; then
+
+AC_MSG_CHECKING(if explicit args accepted on constructors of partial specialized classes)
+AC_TRY_LINK( [
+template <class Arg,class Result>
+struct ps_foo {
+    typedef Arg argument_type;
+    typedef Result result_type;
+};   
+
+template<class Result>
+struct ps_foo<Result*,Result*> {
+	ps_foo<Result*,Result*>() {}
+	void bar() {}
+};
+
+template<class Result>
+struct ps_foo<int*,Result> {
+	ps_foo<int*,Result*>() {}
+	void bar() {}
+
+};
+
+ps_foo<char*, char*> p;
+ps_foo<int*, int> p1;
+],
+[p.bar();
+ p1.foo();], 
+[AC_DEFINE(_STLP_PARTIAL_SPEC_NEEDS_TEMPLATE_ARGS) ac_cv_partial_spec_needs_args="yes"],
+[ac_cv_partial_spec_needs_args="no"]
+)
+AC_MSG_RESULT($ac_cv_partial_spec_needs_args)
+
+fi
+
+if test ac_cv_partial_spec_needs_args=="no"; then
+
+AC_MSG_CHECKING(if explicit args accepted on constructors of explicitly specialized classes)
+AC_TRY_LINK( [
+template <class Arg,class Result>
+struct ps_foo {
+    typedef Arg argument_type;
+    typedef Result result_type;
+    void bar() {}	
+};   
+
+template<class Result>
+struct ps_foo<int*,int> {
+	ps_foo<Result*,Result*>() {}
+	void foo() {}
+};
+
+ps_foo<char*, char*> p;
+ps_foo<int*, int> p1;
+],
+[p.bar();
+ p1.foo();], 
+[AC_DEFINE(_STLP_PARTIAL_SPEC_NEEDS_TEMPLATE_ARGS) ac_cv_partial_spec_needs_args="yes"],
+[ac_cv_partial_spec_needs_args="no"]
+)
+AC_MSG_RESULT($ac_cv_partial_spec_needs_args)
+
+fi
+
+AC_MSG_CHECKING(for partial template function ordering)
+AC_TRY_LINK( [
+
+template <class Arg,class Result>
+Result po_foo (const Arg& a,const Result&){ return (Result)a.nothing; }  
+
+template <class T>
+struct A {
+	T a;
+	A(int _a) : a(_a) {}
+};
+
+template<class T>
+T po_foo (const A<T>& a, const A<T>& b){ return a.a; }   
+],
+[
+  A<int> po_a(0); A<int> po_b(1); (void)po_foo(po_b, po_a)
+],
+[ac_cv_partial_ord="yes"],
+[AC_DEFINE(_STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER) ac_cv_partial_ord="no"]
+)
+AC_MSG_RESULT($ac_cv_partial_ord)
+
+AC_MSG_CHECKING(for method specialization)
+AC_TRY_LINK( [
+template <class Arg,class Result>
+struct ms_foo {
+    typedef Arg argument_type;
+    typedef Result result_type;
+    inline void bar();
+};   
+
+template <class Arg,class Result>
+inline void ms_foo<Arg,Result>::bar() {}
+
+inline void ms_foo<int*,int>::bar() {}
+
+ms_foo<char*, char*> p;
+ms_foo<int*, int> p1;
+],
+[p.bar();
+ p1.bar();], 
+[ac_cv_method_spec="yes"],
+[AC_DEFINE(_STLP_NO_METHOD_SPECIALIZATION) ac_cv_method_spec="no"]
+)
+AC_MSG_RESULT($ac_cv_method_spec)
+
+AC_MSG_CHECKING(for lrand48 function)
+AC_TRY_LINK(
+    [#include <stdlib.h>],
+    [long i = lrand48();],
+    [AC_DEFINE(_STLP_RAND48) ac_cv_func_lrand48="yes"],
+    [ac_cv_func_lrand48="no"])
+AC_MSG_RESULT($ac_cv_func_lrand48)
+
+
+AC_MSG_CHECKING(for default template parameters)
+AC_TRY_LINK(
+    [template <class T> struct less {}; 
+     template <class T, class T1=less<T> > struct Class { T1 t1; };
+     Class<int> cl;
+     Class<int,less<short> > cl2;
+    ],
+    [],
+    [ac_cv_default_template_param="yes"],
+    [AC_DEFINE(_STLP_LIMITED_DEFAULT_TEMPLATES) ac_cv_default_template_param="no"])
+AC_MSG_RESULT($ac_cv_default_template_param)
+if test "$ac_cv_default_template_param" = "no"; then
+  AC_MSG_CHECKING(for default type parameters)
+  AC_TRY_LINK(
+    [
+template <class T> struct less {
+	typedef int int_t;
+  }; 
+
+template <class T, class T1=less<int> > 
+struct Class { 
+private:
+       int a;
+public:
+       typedef Class<T,T1> self; 
+       typedef $__TYPENAME T1::int_t int_t;
+       self foo (const Class<T,T1>& t) { 
+         if ( t.a==a ) return *this;
+         else return t;
+         } 
+};
+
+Class<int> cl;
+Class<int,less<short> > cl2;
+    ],
+    [],
+    [AC_DEFINE(_STLP_DEFAULT_TYPE_PARAM) ac_cv_default_type_param="yes"],
+    [ac_cv_default_type_param="no"])
+  AC_MSG_RESULT($ac_cv_default_type_param)
+
+fi
+
+dnl let's check if non-type cannot be default
+
+AC_MSG_CHECKING(for default non-type parameters)
+AC_TRY_LINK(
+    [
+template <class T, int N=0 > 
+struct Class { 
+private:
+       T* t;
+       enum { t1=N };
+public:
+       int get_n() { return N; }
+};
+
+Class<int> cl;
+Class<int, 2> cl2;
+    ],
+    [],
+    [ac_cv_default_nontype_param="yes"],
+    [AC_DEFINE(_STLP_NO_DEFAULT_NON_TYPE_PARAM) ac_cv_default_nontype_param="no"]
+	)
+AC_MSG_RESULT($ac_cv_default_nontype_param)
+
+AC_MSG_CHECKING(for non-type parameter bug)
+AC_TRY_LINK(
+    [
+template <class T, int N> 
+struct Class { 
+private:
+       T* t;
+       enum { t1=N };
+public:
+       int get_n() { return N; }
+};
+
+template <class T, int N>
+int operator==(const Class<T,N>& , const Class<T,N>& ) { return 0; }
+
+Class<int, 1> cl;
+Class<int, 1> cl2;
+int i(cl==cl2);
+    ],
+    [],
+    [ac_cv_nontype_param_bug="no"],
+    [AC_DEFINE(_STLP_NON_TYPE_TMPL_PARAM_BUG) ac_cv_nontype_param_bug="yes"]
+	)
+AC_MSG_RESULT($ac_cv_nontype_param_bug)
+
+AC_MSG_CHECKING(for static data member templates)
+AC_TRY_LINK(
+    [template <class T> struct Class { static int a; };
+     template <class T> int Class<T>::a;],
+    [],
+    [ac_cv_static_templates="yes"],
+    [AC_DEFINE(_STLP_NO_STATIC_TEMPLATE_DATA) ac_cv_static_templates="no"])
+AC_MSG_RESULT($ac_cv_static_templates)
+
+if test "$ac_cv_static_templates" = no; then
+ AC_MSG_CHECKING(for weak attribute)
+ AC_TRY_COMPILE(
+    [int a_w __attribute__((weak));],
+    [],
+    [AC_DEFINE(_STLP_WEAK_ATTRIBUTE) ac_cv_weak_attribute="yes"],
+    [ac_cv_weak_attribute="no"])
+ AC_MSG_RESULT($ac_cv_weak_attribute)
+fi
+
+if test "$ac_cv_static_templates" = yes; then
+AC_MSG_CHECKING(for static array member size bug)
+AC_TRY_LINK(
+    [template <class T> struct Class { enum { sz=5 }; static int a[sz]; };
+     template <class T> int Class<T>::a[Class<T>::sz];],
+    [],
+    [ac_cv_static_array_bug="no"],
+    [AC_DEFINE(_STLP_STATIC_ARRAY_BUG) ac_cv_static_array_bug="yes"])
+AC_MSG_RESULT($ac_cv_static_array_bug)
+fi
+
+AC_MSG_CHECKING(for static data member const initializer bug)
+AC_TRY_LINK(
+    [template <class T> struct Class { static const int a = 1; };
+     template <class T> const int Class<T>::a;],
+    [],
+    [ac_cv_static_init_bug="no"],
+    [AC_DEFINE(_STLP_STATIC_CONST_INIT_BUG) ac_cv_static_init_bug="yes"])
+AC_MSG_RESULT($ac_cv_static_init_bug)
+
+AC_MSG_CHECKING(for namespaces support)
+AC_TRY_COMPILE(
+    [class test_class {};
+     namespace std { 
+      using ::test_class;
+      template <class T> struct Class { typedef T my_type; };
+      typedef Class<int>::my_type int_type;
+	}; 
+    inline int ns_foo (std::int_type t) { 
+      using namespace std; 
+      int_type i =2;
+      return i+t; 
+    } 
+     ],
+    [(void)ns_foo(1);],
+    [_TEST_STD="std"  _TEST_STD_BEGIN="namespace $_TEST_STD" _TEST_STD_END="namespace $_TEST_STD" ac_cv_namespaces="yes"],
+    [AC_DEFINE(_STLP_HAS_NO_NAMESPACES) _TEST_STD="" _TEST_STD_BEGIN="" _TEST_STD_END="" ac_cv_namespaces="no"])
+AC_MSG_RESULT($ac_cv_namespaces)
+
+AC_MSG_CHECKING(for broken "using" directive)
+AC_TRY_COMPILE(
+    [namespace std { 
+      template <class T> struct Class { typedef T my_type; };
+      typedef Class<int>::my_type int_type;
+      template <class T> void foo(T,int) {}
+      template <class T> void foo(T,int,int) {}
+	}; 
+     using std::Class;
+     using std::foo;
+     ],
+    [(void)foo(1,1);],
+    [ac_cv_broken_using="no"],
+    [ac_cv_broken_using="yes"])
+if test "$ac_cv_broken_using" = no; then
+# check if no warnings have been issued
+  if `check_warning` ; then
+    ac_cv_broken_using=no
+  else
+   AC_DEFINE(_STLP_BROKEN_USING_DIRECTIVE)
+  fi
+else
+   AC_DEFINE(_STLP_BROKEN_USING_DIRECTIVE)
+fi
+AC_MSG_RESULT($ac_cv_broken_using)
+
+
+if test "$ac_cv_namespaces" = yes; then
+AC_ARG_ENABLE(namespaces,[--enable-namespaces Use namespaces (default if posssible)
+--disable-namespaces Don't use namespaces support],
+[
+case "$enableval" in
+	no) AC_DEFINE(_STLP_NO_NAMESPACES) 
+            _TEST_STD="" 
+            _TEST_STD_BEGIN=""
+            _TEST_STD_END=""
+            AC_MSG_RESULT(Config arg --disable-namespaces : code not put into namespace by user request);;
+	 *) AC_MSG_RESULT(Config default: code put into namespace)
+esac
+],
+[AC_MSG_RESULT(Config default: code put into namespace)]
+)
+else
+ AC_MSG_RESULT(Compiler restriction : no namespaces support used)
+fi
+
+
+AC_MSG_CHECKING(for exceptions support)
+AC_TRY_COMPILE(
+    [int ex_foo() { 
+       try { 
+         try { throw(1); } 
+         catch (int a) { throw; } 
+       } catch (...) {;} 
+      return 0;
+    }],
+    [(void)ex_foo();],
+    [ac_cv_exceptions="yes"],
+    [AC_DEFINE(_STLP_HAS_NO_EXCEPTIONS) ac_cv_exceptions="no"])
+AC_MSG_RESULT($ac_cv_exceptions)
+
+if test "$ac_cv_exceptions" = yes; then
+
+AC_MSG_CHECKING(if exceptions specification works)
+AC_TRY_COMPILE(
+    [template <class T> inline int ex_spec_foo(const T&) throw () { return 0;} ], 
+    [(void)ex_spec_foo(5);],
+    [ac_cv_exception_spec="yes"],
+    [AC_DEFINE(_STLP_NO_EXCEPTION_SPEC) ac_cv_exception_spec="no"])
+dnl    if test "$ac_cv_exception_spec" = yes; then
+dnl    # check if no warnings have been issued
+dnl     if `check_warning` ; then
+dnl       AC_DEFINE(_STLP_EXCEPTION_SPEC)
+dnl     else
+dnl      ac_cv_exception_spec=no
+dnl      fi
+dnl    fi
+AC_MSG_RESULT($ac_cv_exception_spec)
+
+AC_MSG_CHECKING(if return is required after throw)
+AC_TRY_COMPILE(
+    [int ex_foo() { 
+       try { 
+         try { throw(1); } 
+         catch (int a) { throw; } 
+       } catch (...) {;} 
+      return 0;
+    }],
+    [(void)ex_foo();],
+    [ac_cv_throw_return_bug="no"],
+    [AC_DEFINE(_STLP_THROW_RETURN_BUG) ac_cv_throw_return_bug="yes"])
+
+    if test "$ac_cv_throw_return_bug" = no; then
+    # check if no warnings have been issued
+     if `check_warning` ; then
+       ac_cv_throw_return_bug="no"
+     else
+       AC_DEFINE(_STLP_THROW_RETURN_BUG)
+       ac_cv_throw_return_bug="yes"
+     fi
+    fi
+AC_MSG_RESULT($ac_cv_throw_return_bug)
+
+fi
+
+AC_MSG_CHECKING(for native <string> header with basic_string defined )
+AC_TRY_COMPILE(
+    [
+     #include <string>
+     # if !defined (_STLP_HAS_NO_NAMESPACES)
+       using namespace $_TEST_STD;
+     # endif
+     basic_string<char, char_traits<char>, allocator<char> > bs;
+     string bd = bs;
+    ],
+    [],
+    [ ac_cv_string_header="yes"],
+    [ AC_DEFINE(_STLP_NO_STRING_HEADER) ac_cv_string_header="no"]
+)
+AC_MSG_RESULT($ac_cv_string_header)
+
+dnl there could be no correct stdexcept/iostream  without string
+if test "$ac_cv_string_header" = yes; then
+AC_MSG_CHECKING(for native <stdexcept> header)
+AC_TRY_COMPILE(
+    [
+     #include <stdexcept>
+     # if !defined (_STLP_HAS_NO_NAMESPACES)
+       using namespace $_TEST_STD;
+     # endif
+     string s;
+     logic_error le(s);
+     runtime_error re(s);
+     domain_error de(s);
+     invalid_argument ia(s);
+     length_error lne(s);
+     out_of_range or(s);
+     range_error rne(s);
+     overflow_error ove(s);
+     underflow_error ue(s);
+    ],
+    [],
+    [ac_cv_stdexcept_header="yes"],
+    [AC_DEFINE(_STLP_NO_STDEXCEPT_HEADER) ac_cv_stdexcept_header="no"]
+)
+AC_MSG_RESULT($ac_cv_stdexcept_header)
+
+AC_MSG_CHECKING(for new iostreams)
+AC_TRY_COMPILE(
+    [
+     #include <iosfwd>
+     #include <iostream>
+     # if !defined (_STLP_HAS_NO_NAMESPACES)
+       using namespace $_TEST_STD;
+     # endif
+
+     template <class _Tp, class _Traits>
+     void outp(basic_ostream<_Tp,_Traits>& o, char* str) {
+         o<<str; 
+        }
+       ],
+    [
+	outp(cout, "Hello World\n")
+    ],
+    [ac_cv_newstreams="yes"],
+    [AC_DEFINE(_STLP_HAS_NO_NEW_IOSTREAMS) ac_cv_newstreams="no"])
+AC_MSG_RESULT($ac_cv_newstreams)
+
+dnl end namespace-related tests
+
+fi
+
+AC_MSG_CHECKING(for <exception> header with class "exception" defined)
+AC_TRY_COMPILE(
+    [
+     #include <exception>
+     # if !defined (_STLP_HAS_NO_NAMESPACES)
+       using namespace $_TEST_STD;
+     # endif
+     class my_exception: public $_TEST_STD::exception {};
+     my_exception mm;
+    ],
+    [],
+    [ac_cv_exception_header="yes"],
+    [AC_DEFINE(_STLP_NO_EXCEPTION_HEADER) ac_cv_exception_header="no"]
+)
+AC_MSG_RESULT($ac_cv_exception_header)
+
+AC_MSG_CHECKING(builtin constructor bug)
+AC_TRY_RUN( [
+# ifdef _STLP_USE_NEW_STYLE_HEADERS
+#  include <cassert>
+#  include <cstdio>
+#  include <cstring>
+#  include <new>
+# else
+#  include <assert.h>
+#  include <stdio.h>
+#  include <string.h>
+#  include <new.h>
+# endif
+int main(int, char**) {
+	int i;
+	double buf[1000];
+	char* pc = (char*)buf;
+	short* ps = (short*)buf;
+	int* pi = (int*)buf;
+	long* pl = (long*)buf;
+	double* pd = (double*)buf;
+	float* pf = (float*)buf;
+	for (i=0; i<100; i++) {
+	   	new(pc) char();
+        	assert(char()==0 && *pc==0);
+		sprintf(pc,"lalala\n");
+	        new (ps) short();	
+		assert(short()==0 && *ps ==0);
+		sprintf(pc,"lalala\n");
+	        new (pi) int();
+		assert(int()==0 && *pi == 0);
+		sprintf(pc,"lalala\n");
+	        new (pl) long();	
+		assert(long()==0 && *pl == 0);
+		sprintf(pc,"lalala\n");
+	        new (pf) float();	
+		assert(float()==0.0 && *pf == 0.0);
+		sprintf(pc,"lalala\n");
+	        new (pd) double();	
+		assert(double()==0.0 && *pd == 0.0);
+		sprintf(pc,"lalala\n");
+	}
+  return 0;
+}
+], 
+[ ac_cv_builtin_c_bug="no"],
+[ AC_DEFINE(_STLP_DEFAULT_CONSTRUCTOR_BUG) ac_cv_builtin_c_bug="yes"],
+[ AC_DEFINE(_STLP_DEFAULT_CONSTRUCTOR_BUG) ac_cv_builtin_c_bug="yes"]
+)
+AC_MSG_RESULT($ac_cv_builtin_c_bug)
+
+AC_MSG_CHECKING(for trivial constructor bug)
+AC_TRY_LINK(
+    [struct output_iterator_tag {};
+     void tc_bug_foo(output_iterator_tag) {}
+     inline void tc_test_foo()  { tc_bug_foo(output_iterator_tag()); }],
+    [tc_test_foo();],
+    [ac_cv_tc_bug="no"],
+    [AC_DEFINE(_STLP_TRIVIAL_CONSTRUCTOR_BUG) ac_cv_tc_bug="yes"])
+AC_MSG_RESULT($ac_cv_tc_bug)
+
+AC_MSG_CHECKING(for trivial destructor bug)
+AC_TRY_LINK(
+    [struct output_iterator_tag {output_iterator_tag() {} };
+	output_iterator_tag* td_bug_bar ;
+	],
+    [ td_bug_bar->~output_iterator_tag();
+     ],
+    [ac_cv_td_bug="no"],
+    [AC_DEFINE(_STLP_TRIVIAL_DESTRUCTOR_BUG) ac_cv_td_bug="yes"])
+AC_MSG_RESULT($ac_cv_td_bug)
+
+AC_MSG_CHECKING(for explicit function template arguments)
+AC_TRY_LINK(
+    [  template <class T> class foo;
+       template<class T> bool operator==(const foo<T>& lhs,const foo<T>& rhs);
+      template <class T> class foo {
+	private:
+	  T bar;
+	friend bool operator== <> (const foo<T>&,const foo<T>&);
+     };
+     template<class T> bool operator==(const foo<T>& lhs,const foo<T>& rhs) {
+	return  lhs.bar==rhs.bar;
+     }],
+    [ foo<int> f1, f2;
+      int ret= (f1==f2) ],
+    [ _NULLARGS="<>" ac_cv_expl_fun_args="yes"],
+    [ AC_DEFINE(_STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS) ac_cv_expl_fun_args="no" _NULLARGS=""])
+AC_MSG_RESULT($ac_cv_expl_fun_args)
+
+AC_MSG_CHECKING(for template parameter baseclass matching)
+AC_TRY_LINK(
+    [struct output_iterator_tag {};
+     struct derived1_tag : public output_iterator_tag {};
+     struct derived2_tag : public derived1_tag {};
+     template<class T> struct output_iterator { 
+	public:
+	output_iterator() {} 
+	~output_iterator() {} 
+	friend inline int operator== $_NULLARGS (const output_iterator<T>&, 
+                                      const output_iterator<T>&);
+	};
+     template<class T> inline int operator==(const output_iterator<T>&, 
+                              	        const output_iterator<T>&) {
+       return 0;
+     }
+     template<class T> inline output_iterator_tag
+     iterator_category(const output_iterator<T>&) {return output_iterator_tag();}
+     template <class T>
+     struct derived_iterator : public output_iterator<T> {
+	public:
+	derived_iterator() {} 
+	~derived_iterator() {}
+	};
+     template<class T> inline T select_foo(T t, output_iterator_tag) { return t;}     
+     template<class T> inline int select_foo_2(T, T,
+                                             output_iterator_tag) { return 0;}     
+     template<class T> inline T tbase_foo(T pm )  { 
+	derived_iterator<T> di1, di2; int i( di1==di2 && pm);
+	return select_foo((int)1,iterator_category(derived_iterator<T>())); 
+    }
+    ],
+    [ (void)tbase_foo((int)1); ],
+    [ac_cv_base_match="yes"],
+    [AC_DEFINE(_STLP_BASE_MATCH_BUG) ac_cv_base_match="no"])
+AC_MSG_RESULT($ac_cv_base_match)
+
+AC_MSG_CHECKING(for non-template parameter baseclass matching )
+AC_TRY_LINK(
+    [struct output_iterator_tag {};
+     struct derived1_tag : public output_iterator_tag {};
+     struct derived2_tag : public derived1_tag {};
+     struct derived3_tag : public derived2_tag {};
+     template<class T> struct output_iterator { 
+	public:
+	output_iterator() {} 
+	~output_iterator() {} 
+	};
+     template<class T> inline output_iterator_tag
+     iterator_category(const output_iterator<T>&) {return output_iterator_tag();}
+     template <class T>
+     struct derived_iterator : public output_iterator<T> {
+	public:
+	derived_iterator() {} 
+	~derived_iterator() {}
+	};
+     template<class T> inline int select_foo_2(T, T,
+                                             output_iterator_tag) { return 0;}     
+     template<class T> inline int select_foo_2(T, T,
+                                             derived1_tag) { return 0;}     
+     template<class T> inline void nont_base_foo(T pm )  { 
+	derived_iterator<T> di1, di2; 
+	(void)select_foo_2(di1, (const derived_iterator<T>&)di2, derived3_tag());
+    }
+    ],
+    [ nont_base_foo((int)1); ],
+    [ac_cv_nont_base_match="yes"],
+    [AC_DEFINE(_STLP_NONTEMPL_BASE_MATCH_BUG) ac_cv_nont_base_match="no"])
+AC_MSG_RESULT($ac_cv_nont_base_match)
+
+AC_MSG_CHECKING(for nested type parameters bug)
+AC_TRY_LINK(
+    [template<class T> struct nt_o { typedef int ii; inline ii foo(ii);};
+     template <class T> inline nt_o<T>::ii nt_o<T>::foo(ii) { return 0; }],
+    [],
+    [ac_cv_nested_type_param_bug="no"],
+    [AC_DEFINE(_STLP_NESTED_TYPE_PARAM_BUG) ac_cv_nested_type_param_bug="yes"])
+AC_MSG_RESULT($ac_cv_nested_type_param_bug)
+
+
+AC_MSG_CHECKING(if inherited template typedefs broken completely)
+AC_TRY_LINK(
+    [
+template <class Arg1, class Arg2, class Result>
+struct binary_function {
+    typedef Arg1 first_argument_type;
+    typedef Arg2 second_argument_type;
+    typedef Result result_type;
+};     
+
+template <class T>
+struct equal_to : public binary_function<T, T, int> {
+    int operator()(const T& x, const T& y) const { return x == y; }
+};
+
+template <class Predicate> 
+class binary_negate 
+    : public binary_function<$__TYPENAME Predicate::first_argument_type,
+			     $__TYPENAME Predicate::second_argument_type, 
+                             int> {
+protected:
+    Predicate pred;
+public:
+    binary_negate(const Predicate& x = Predicate()) : pred(x) {}
+    int operator() (const $__TYPENAME Predicate::first_argument_type& x, 
+		    const $__TYPENAME Predicate::second_argument_type& y) const {
+	return !pred(x, y); 
+    }
+};
+      typedef equal_to<int> eq_int;
+      typedef binary_negate<equal_to<int> > int_negate;
+      int_negate n;
+ ],
+    [
+      (void)n(1,2);
+    ],
+    [ac_cv_typebug="no"],
+    [AC_DEFINE(_STLP_BASE_TYPEDEF_BUG) 
+     AC_DEFINE(_STLP_BASE_TYPEDEF_OUTSIDE_BUG) ac_cv_typebug="yes"])
+AC_MSG_RESULT($ac_cv_typebug)
+
+AC_MSG_CHECKING(if inherited typedefs visible from outside)
+AC_TRY_COMPILE(
+    [
+template <class Arg1, class Arg2, class Result>
+struct binary_function {
+    typedef Arg1 first_argument_type;
+    typedef Arg1 second_argument_type;
+    typedef Result result_type;
+};     
+
+
+template <class T>
+class plus : public binary_function<T, T, T> {
+public:
+    plus() {}
+    plus(const T&) {}
+    T operator()(const T& x, const T& y) const { return x + y; };
+};
+
+plus<int> p;
+plus<int>::first_argument_type a;
+],
+    [],
+    [ac_cv_outside_typedef="yes"],
+    [AC_DEFINE(_STLP_BASE_TYPEDEF_OUTSIDE_BUG) ac_cv_outside_typedef="no"])
+AC_MSG_RESULT($ac_cv_outside_typedef)
+
+# fi
+
+AC_MSG_CHECKING(if private type static members initializable)
+AC_TRY_COMPILE(
+    [struct p_Class { private: struct str_ { 
+	int a; str_(int i) : a(i) {}}; static str_ my_int; 
+     };
+     p_Class::str_ p_Class::my_int(0); 
+     ],
+    [],
+    [ac_cv_private="yes"],
+    [AC_DEFINE(_STLP_UNINITIALIZABLE_PRIVATE) ac_cv_private="no"])
+AC_MSG_RESULT($ac_cv_private)
+
+
+AC_MSG_CHECKING(for const member constructor bug)
+AC_TRY_LINK([
+template <class T1, class T2>
+struct pair {
+    T1 first;
+    T2 second;
+    pair(): first(T1()), second(T2()) {}
+    pair(const pair<T1,T2>& o) : first(o.first), second(o.second) {}
+};
+pair< const int, const int > p;  
+     ],
+    [],
+    [ac_cv_const_constructor_bug="no"],
+    [AC_DEFINE(_STLP_CONST_CONSTRUCTOR_BUG) ac_cv_const_constructor_bug="yes"])
+AC_MSG_RESULT($ac_cv_const_constructor_bug)
+
+AC_MSG_CHECKING(for loop inline problems)
+AC_TRY_COMPILE(
+    [inline int il_foo (int a) { 
+      int i; for (i=0; i<a; i++) a+=a;  while (i>0) a-=3; return a; }],
+    [(void)il_foo(2);],
+    [ac_cv_inline_problems="no"],
+    [AC_DEFINE(_STLP_LOOP_INLINE_PROBLEMS) ac_cv_inline_problems="yes"])
+if test "$ac_cv_inline_problems" = no; then
+# check if no warnings have been issued
+  if `check_warning` ; then
+     ac_cv_inline_problems="no"
+  else
+   AC_DEFINE(_STLP_LOOP_INLINE_PROBLEMS)
+   ac_cv_inline_problems="yes"
+  fi
+fi
+AC_MSG_RESULT($ac_cv_inline_problems)
+
+
+AC_MSG_CHECKING(if arrow operator always get instantiated)
+AC_TRY_LINK(
+    [
+     template <class T> struct um_foo { T* ptr; 
+	T* operator ->() { return &(operator*());}
+	T  operator *()  { return *ptr; }
+     };
+     template <class T>
+	int operator == ( const um_foo<T>& x, const um_foo<T>& y)
+	{
+    		return *x == *y;
+	}
+     struct um_tag { int a ; };
+     um_foo<um_tag> f;
+     um_foo<int> a;
+     ],
+    [ 
+     int b(5); a.ptr=&b;],
+    [ac_cv_unused_required="no"],
+    [AC_DEFINE(_STPL_NO_ARROW_OPERATOR) ac_cv_unused_required="yes"]
+    )
+AC_MSG_RESULT($ac_cv_unused_required)
+
+AC_MSG_CHECKING(for pointer-to-member parameter bug)
+AC_TRY_COMPILE(
+    [
+struct pmf_foo {
+	int bar() { return 0; };
+};
+
+template <class Class, class Result> 
+class mem_fun_t {
+protected:
+    typedef Result (Class::*fun_type)(void);
+    fun_type ptr;
+public:
+    mem_fun_t() {}
+    mem_fun_t(fun_type p) : ptr(p) {}
+    Result operator()(Class* x) const { return (x->*ptr)();}
+};
+
+template <class Class, class Result>
+inline mem_fun_t <Class, Result> 
+mem_fun(Result (Class::*ptr)(void)) {
+    return mem_fun_t<Class, Result>(ptr);
+}
+],
+    [pmf_foo pmf; (void)mem_fun(&pmf_foo::bar)(&pmf)],
+    [ac_cv_pmf_bug="no"],
+    [AC_DEFINE( _STLP_MEMBER_POINTER_PARAM_BUG) ac_cv_pmf_bug="yes"])
+AC_MSG_RESULT($ac_cv_pmf_bug)
+
+AC_MSG_CHECKING(if bad_alloc defined in <new>)
+AC_TRY_COMPILE(
+    [
+     #if !defined (_STLP_NO_NEW_STYLE_HEADERS)
+     #include <new>
+     #else
+     #include <new.h>
+     #endif
+
+     # if !defined (_STLP_HAS_NO_NAMESPACES)
+       using namespace $_TEST_STD;
+     # endif
+
+     bad_alloc badalloc_foo() { bad_alloc err; return err;}],
+    [(void)badalloc_foo()],
+    [ac_cv_bad_alloc="yes"],
+    [AC_DEFINE(_STLP_NO_BAD_ALLOC) ac_cv_bad_alloc="no"])
+AC_MSG_RESULT($ac_cv_bad_alloc)
+
+AC_MSG_CHECKING(for __type_traits automatic specialization)
+AC_TRY_LINK(
+    [template <class T> int tt_foo(const T&) {
+	typedef __type_traits<T> traits;
+	return 0;
+     }],
+    [(void)tt_foo(5)],
+    [AC_DEFINE(_STLP_AUTOMATIC_TYPE_TRAITS) ac_cv_type_traits="yes"],
+    [ac_cv_type_traits="no"])
+AC_MSG_RESULT($ac_cv_type_traits)
+
+
+# package options - exceptions
+AC_MSG_RESULT(***)
+AC_MSG_RESULT($0: Setting implementation options...)
+AC_MSG_RESULT(***)
+
+if test "$ac_cv_exceptions" = yes; then
+AC_ARG_ENABLE(exceptions,[--enable-exceptions Use exceptions support (default if posssible)
+ --disable-exceptions Don't use exceptions support],
+[
+case "$enableval" in
+           no) AC_DEFINE(_STLP_NO_EXCEPTIONS)
+               AC_MSG_RESULT(Config arg --disable-exceptions : disabling exceptions by user request);;
+           *)  AC_MSG_RESULT(Config default: exceptions enabled)
+esac
+],
+[AC_MSG_RESULT(Config default: exceptions enabled) ]
+)
+else
+ AC_MSG_RESULT(Compiler restriction : no exceptions support used)
+fi
+
+if test "$ac_cv_namespaces" = yes; then
+AC_ARG_ENABLE(relops,[--enable-relops Separate rel_ops namespace for relational operators (default if posssible)
+--disable-relops No separate rel_ops namespace for relational operators],
+[
+case "$enableval" in
+	no) AC_DEFINE(_STLP_NO_RELOPS_NAMESPACE) 
+            AC_MSG_RESULT(Config arg --disable-relops : no std::rel_ops namespace by user request);;
+	 *) AC_MSG_RESULT(Config default: Separate std::rel_ops namespace for relational operators)
+esac
+],
+[AC_MSG_RESULT(Config default: Separate std::rel_ops namespace for relational operators)]
+)
+else
+ AC_DEFINE(_STLP_NO_RELOPS_NAMESPACE) 
+fi
+
+if test "$ac_cv_newheaders" = yes; then
+AC_ARG_ENABLE(new-style-headers,[--enable-new-style-headers Use new-style headers (default)
+--disable-new-style-headers Don't use new-style headers],
+[
+case "$enableval" in
+	no) AC_DEFINE(_STLP_NO_NEW_STYLE_HEADERS) 
+            AC_MSG_RESULT(Config arg --disable-new-style-headers : not using new-style headers);;
+	 *) AC_MSG_RESULT(Config default: using new-style headers)
+esac
+],
+[AC_MSG_RESULT(Config default: using new-style headers)]
+)
+else
+ AC_DEFINE(_STLP_NO_NEW_STYLE_HEADERS)
+fi
+
+if test "$ac_cv_newstreams" = yes; then
+AC_ARG_ENABLE(new-iostreams,[--enable-new-iostreams Use new iostreams (default)
+--disable-new-iostreams Don't use new iostreams],
+[
+case "$enableval" in
+	no) AC_DEFINE(_STLP_NO_NEW_IOSTREAMS) 
+            AC_MSG_RESULT(Config arg --disable-new-iostreams : not using new iostreams);;
+	 *) AC_MSG_RESULT(Config default: using new iostreams)
+esac
+],
+[AC_MSG_RESULT(Config default: using new iostreams)]
+)
+else
+  AC_DEFINE(_STLP_NO_NEW_IOSTREAMS)
+fi
+
+AC_ARG_ENABLE(sgi-allocators,[--enable-sgi-allocators : set default parameter to SGI-style default alloc, not allocator<T>
+ --disable-sgi-allocators : use allocator<T> if possible],
+[
+case "$enableval" in
+	  yes ) AC_MSG_RESULT(Config arg  --enable-sgi-allocators : SGI-style alloc as default allocator) 
+                AC_DEFINE(_STLP_USE_RAW_SGI_ALLOCATORS);;
+	    * ) AC_MSG_RESULT(Config default: using allocator<T> as default allocator if possible )
+esac
+],
+[
+ AC_MSG_RESULT(Config default: using allocator<T> as default allocator if possible)
+]
+)
+
+AC_ARG_ENABLE(malloc,[--enable-malloc : set default alloc to malloc-based allocator ( malloc_alloc_template<instance_no>, alloc.h )
+--disable-malloc : choose (default) sgi node allocator (__alloc<threads,no>  alloc.h )],
+[
+case "$enableval" in
+	  yes ) AC_MSG_RESULT(Config arg  --enable-malloc : setting malloc_alloc as default alloc) 
+                AC_DEFINE(_STLP_USE_MALLOC);;
+	    * ) AC_MSG_RESULT(Config default: not using malloc_alloc as default alloc)
+esac
+],
+[
+ AC_MSG_RESULT(Config default: not using malloc_alloc as default alloc)
+]
+)
+
+AC_ARG_ENABLE(newalloc,[--enable-newalloc : set default alloc to new-based allocator ( new_alloc, alloc.h )
+--disable-newalloc : choose (default) sgi allocator (__alloc<threads,no>  alloc.h )],
+[
+case "$enableval" in
+	  yes ) AC_MSG_RESULT(Config arg  --enable-newalloc : setting new_alloc as default alloc) 
+                AC_DEFINE(_STLP_USE_NEWALLOC);;
+	    * )
+                AC_MSG_RESULT(Config default: not using new_alloc as default alloc)
+esac
+],
+[
+ AC_MSG_RESULT(Config default: not using new_alloc as default alloc)
+]
+)
+
+AC_ARG_ENABLE(defalloc,[--enable-defalloc : make HP-style defalloc.h included in alloc.h )
+--disable-defalloc : leave defalloc.h alone],
+[
+case "$enableval" in
+	  no ) AC_MSG_RESULT(Config arg --disable-defalloc : not including HP-style defalloc.h into alloc.h);;
+
+	  * ) AC_MSG_RESULT(Config default : including HP-style defalloc.h into alloc.h) 
+                AC_DEFINE(_STLP_USE_DEFALLOC)
+esac
+],
+[
+          AC_MSG_RESULT(Config default : not including HP-style defalloc.h into alloc.h)
+]
+)
+
+
+AC_ARG_ENABLE(debugalloc,[--enable-debugalloc : use debug versions of allocators
+--disable-debugalloc : not using debug allocators],
+[
+case "$enableval" in
+	  yes ) AC_MSG_RESULT(Config arg --enable-debugalloc : use debug versions of allocators ) 
+                AC_DEFINE(_STLP_DEBUG_ALLOC);;
+	  * )
+          AC_MSG_RESULT(Config default : not using debug allocators)
+esac
+],
+[
+          AC_MSG_RESULT(Config default : not using debug allocators)
+]
+)
+
+
+AC_ARG_ENABLE(abbrevs,[--enable-abbrevs : use abbreviated class names internally for linker benefit (don't affect interface)
+--disable-abbrevs : don't use abbreviated names],
+[
+case "$enableval" in
+	  yes ) AC_MSG_RESULT(Config arg --enable-abbrevs : using abbreviated class names internally) 
+                AC_DEFINE(_STLP_USE_ABBREVS);;
+	  * )
+          AC_MSG_RESULT(Config default : not using abbreviated class names internally)
+esac
+],
+[
+          AC_MSG_RESULT(Config default : not using abbreviated class names internally)
+]
+)
+
+
+AC_DEFINE(__AUTO_CONFIGURED)
+
+AC_MSG_RESULT(***)
+AC_MSG_RESULT($0: setting up headers...)
+AC_MSG_RESULT(***)
+AC_OUTPUT(stlconf.h)
+AC_MSG_RESULT(***)
+AC_MSG_RESULT($0: STLport configured for use with \"${CXX}\" compiler, CXXFLAGS used: \"${CXXFLAGS}\".)
+AC_MSG_RESULT($0: To restore original settings - run \"./unconfigure\" or copy stlconf.h.in to stlconf.h.)
+AC_MSG_RESULT(***)
+
diff --git a/main/source/stlport/stlport/config/new_compiler/stlconf.h.in b/main/source/stlport/stlport/config/new_compiler/stlconf.h.in
new file mode 100644
index 00000000..dbbe155a
--- /dev/null
+++ b/main/source/stlport/stlport/config/new_compiler/stlconf.h.in
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_STLCONF_H
+# define _STLP_STLCONF_H
+
+# undef __AUTO_CONFIGURED
+
+//==========================================================
+// Getting proper values of autoconf flags
+// if you ran 'configure', __AUTO_CONFIGURED is set to 1 and
+// specific compiler features will be used.
+// Otherwise, the <stlcomp.h> header will be included for per-version
+// features recognition.
+//==========================================================
+# if defined (__AUTO_CONFIGURED)
+// auto-configured section
+
+# undef _STLP_NO_EXCEPTIONS
+# undef _STLP_NO_NAMESPACES
+# undef _STLP_NO_RELOPS_NAMESPACE
+# undef _STLP_NO_NEW_NEW_HEADER 
+
+# undef _STLP_NO_NEW_IOSTREAMS
+
+// select threads strategy
+# undef _PTHREADS
+# undef _NOTHREADS
+
+// select SGI-style alloc instead of allocator<T>
+# undef _STLP_USE_SGI_ALLOCATORS
+
+// select allocation method you like
+# undef _STLP_USE_MALLOC
+# undef _STLP_USE_NEWALLOC
+
+// this one is not mandatory, just enabled
+# undef _STLP_USE_DEFALLOC
+
+// define _STLP_USE_ABBREVS if your linker has trouble with long 
+// external symbols
+# undef _STLP_USE_ABBREVS
+
+
+// unsigned 32-bit integer type
+#  define _STLP_UINT32_T unsigned
+#  undef _STLP_NO_BOOL
+#  undef _STLP_DONT_USE_BOOL_TYPEDEF
+#  undef _STLP_YVALS_H
+#  undef _STLP_LIMITED_DEFAULT_TEMPLATES
+#  undef _STLP_DEFAULT_TYPE_PARAM
+#  undef _STLP_NO_STATIC_TEMPLATE_DATA
+#  undef _STLP_RAND48
+#  undef _STLP_LOOP_INLINE_PROBLEMS
+
+#  undef _STLP_HAS_NO_NAMESPACES
+
+#  undef _STLP_NEED_TYPENAME
+#  undef _STLP_NEED_EXPLICIT
+#  undef _STLP_HAS_NO_EXCEPTIONS
+#  undef _STLP_NO_EXCEPTION_SPEC
+#  undef _STLP_WEAK_ATTRIBUTE
+#  undef _STLP_BASE_MATCH_BUG
+#  undef _STLP_NONTEMPL_BASE_MATCH_BUG
+#  undef _STLP_NESTED_TYPE_PARAM_BUG
+#  undef _STLP_NO_ARROW_OPERATOR
+#  undef _STLP_UNINITIALIZABLE_PRIVATE
+#  undef _STLP_BASE_TYPEDEF_BUG
+#  undef _STLP_BASE_TYPEDEF_OUTSIDE_BUG
+#  undef _STLP_CONST_CONSTRUCTOR_BUG
+
+#  undef _STLP_NO_NEW_STYLE_CASTS
+#  undef _STLP_NO_WCHAR_T
+#  undef _STLP_WCHAR_T_IS_USHORT
+#  undef _STLP_LONG_LONG
+#  undef _STLP_NO_LONG_DOUBLE
+#  undef _STLP_NEED_MUTABLE
+#  undef _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX
+#  undef _STLP_NO_BAD_ALLOC
+#  undef _STLP_DEBUG_ALLOC
+#  undef _STLP_NO_MEMBER_TEMPLATES
+#  undef _STLP_NO_MEMBER_TEMPLATE_CLASSES
+#  undef _STLP_NO_MEMBER_TEMPLATE_KEYWORD
+#  undef _STLP_NO_FRIEND_TEMPLATES
+#  undef _STLP_NO_QUALIFIED_FRIENDS
+#  undef _STLP_NO_CLASS_PARTIAL_SPECIALIZATION
+#  undef _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER
+#  undef _STLP_AUTOMATIC_TYPE_TRAITS
+#  undef _STLP_MEMBER_POINTER_PARAM_BUG
+#  undef _STLP_NON_TYPE_TMPL_PARAM_BUG
+#  undef _STLP_NO_DEFAULT_NON_TYPE_PARAM
+#  undef _STLP_NO_METHOD_SPECIALIZATION
+#  undef _STLP_STATIC_ARRAY_BUG
+#  undef _STLP_STATIC_CONST_INIT_BUG
+#  undef _STLP_TRIVIAL_CONSTRUCTOR_BUG
+#  undef _STLP_TRIVIAL_DESTRUCTOR_BUG
+#  undef _STLP_BROKEN_USING_DIRECTIVE
+#  undef _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
+#  undef _STLP_NO_EXCEPTION_HEADER
+#  undef _STLP_DEFAULT_CONSTRUCTOR_BUG
+
+#  undef _STLP_HAS_NO_NEW_IOSTREAMS
+#  undef _STLP_HAS_NO_NEW_C_HEADERS 
+#  undef _STLP_STATIC_CONST_INIT_BUG
+// new ones
+#  undef _STLP_THROW_RETURN_BUG
+// unimp
+#  undef _STLP_LINK_TIME_INSTANTIATION
+#  undef _STLP_PARTIAL_SPEC_NEEDS_TEMPLATE_ARGS
+// unimp
+#  undef _STLP_NO_TEMPLATE_CONVERSIONS
+# endif /* AUTO_CONFIGURED */
+
+//==========================================================
+
+
+#endif /* __STLCONF_H */
+
diff --git a/main/source/stlport/stlport/config/new_compiler/unconfigure b/main/source/stlport/stlport/config/new_compiler/unconfigure
new file mode 100644
index 00000000..2a16542e
--- /dev/null
+++ b/main/source/stlport/stlport/config/new_compiler/unconfigure
@@ -0,0 +1,3 @@
+#!/bin/sh
+cp stlconf.h.in stlconf.h
+echo "STLport unconfigured."
diff --git a/main/source/stlport/stlport/config/stl_apcc.h b/main/source/stlport/stlport/config/stl_apcc.h
new file mode 100644
index 00000000..b514f7c8
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_apcc.h
@@ -0,0 +1,32 @@
+// STLport config file for Apogee 4.x
+
+#  define _STLP_NO_NEW_NEW_HEADER 1
+#  define _STLP_HAS_NO_NEW_IOSTREAMS 1
+#  define _STLP_HAS_NO_NEW_C_HEADERS 1
+
+#if defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 >= 4)
+# define _STLP_RAND48 1
+#endif
+// #  define _STLP_RAND48 1
+#  define _STLP_LONG_LONG long long
+#  define _STLP_NO_BAD_ALLOC 1
+#  define _STLP_NO_MEMBER_TEMPLATE_KEYWORD 1
+#  define _STLP_NON_TYPE_TMPL_PARAM_BUG 1
+// #  define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS 1
+#  define _STLP_NO_EXCEPTION_HEADER 1
+
+# undef  _STLP_LINK_TIME_INSTANTIATION
+# define _STLP_LINK_TIME_INSTANTIATION 1
+
+# ifdef __STDLIB
+#  undef _STLP_HAS_NO_NEW_IOSTREAMS
+#  undef _STLP_NO_NEW_C_HEADERS
+#  undef _STLP_NO_NEW_NEW_HEADER
+#  undef _STLP_NO_BAD_ALLOC
+#  undef _STLP_LONG_LONG
+# else
+#  undef  _STLP_NO_EXCEPTION_SPEC
+#  define _STLP_NO_EXCEPTION_SPEC 1
+# endif
+
+
diff --git a/main/source/stlport/stlport/config/stl_apple.h b/main/source/stlport/stlport/config/stl_apple.h
new file mode 100644
index 00000000..8ed0d12e
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_apple.h
@@ -0,0 +1,112 @@
+// STLport configuration file
+// It is internal STLport header - DO NOT include it directly
+
+// common configuration settings for Apple MPW MrCpp / SCpp
+
+#if defined(__MRC__) && __MRC__ < 0x500
+# error Apple's MPW MrCpp v.5.0.0 or better compiler required
+#endif
+#if defined(__SC__) && __SC__ < 0x890
+# error Apple's MPW SCpp v.8.9.0 or better compiler required
+#endif
+
+#ifdef qMacApp
+# ifndef __CONDITIONALMACROS__ // skip including ConditionalMacros_AC.h if ConditionalMacros.h is already included
+# include <CoreSwitches_AC.h>
+# include <ConditionalMacros_AC.h>
+# include <Types_AC.h>
+# define _STLP_FILE__ _FILE_AC
+# define _STLP_DEBUG_MESSAGE      
+# define __stl_debug_message ProgramBreak_AC
+# include <ConditionalMacros.h>
+# endif
+# include <Types.h>
+#else
+# include <ConditionalMacros.h>
+# include <Types.h>
+#endif
+
+#define _STLP_UINT32_T UInt32
+typedef int wint_t;
+
+#ifndef TYPE_BOOL
+# error <ConditionalMacros.h> must be included. (TYPE_BOOL)
+#endif
+#if !TYPE_BOOL
+# define _STLP_NO_BOOL
+# define _STLP_DONT_USE_BOOL_TYPEDEF
+#endif
+
+#ifndef TYPE_LONGLONG
+# error <ConditionalMacros.h> must be included. (TYPE_LONGLONG)
+#endif
+#if TYPE_LONGLONG
+# define _STLP_LONG_LONG long long
+#endif
+
+#if !__option(exceptions)
+# define _STLP_HAS_NO_EXCEPTIONS
+#endif
+
+#define _STLP_DEBUG_MESSAGE_POST DebugStr("\pSTL diagnosis issued. See 'stderr' for detail.");
+#define _STLP_ASSERT_MSG_TRAILER " "
+
+#ifdef _STLP_DEBUG
+#   define _STLP_THROW(x) (DebugStr("\pSTL is about to throw exception: "#x),throw x)
+#endif
+
+#if defined(__MRC__)
+# ifndef __spillargs
+#  define __spillargs 1 // MrCpp requires this symbol to be defined as 1 to properly handle va_start; ref.[ file stdarg.h; line 26 ]
+# endif
+#endif
+
+#if defined(__SC__)
+#define _STLP_VENDOR_LONG_DOUBLE_MATH				//*TY 12/03/2000 - SCpp's native math type is long double
+#endif
+
+#ifndef _STLP_NATIVE_INCLUDE_PATH
+# if __option(unix_includes)
+#  define _STLP_NATIVE_INCLUDE_PATH ../CIncludes 	// expects the alias to {CIncludes} under the same folder as {STL}
+# else
+#  define _STLP_NATIVE_INCLUDE_PATH ::CIncludes 	// expects the alias to {CIncludes} under the same folder as {STL}
+# endif
+#endif
+#if !defined(_STLP_MAKE_HEADER)
+# if !__option(unix_includes)
+#  define _STLP_MAKE_HEADER(path, header) <path:header> // Mac uses ":" for directory delimiter
+# endif
+#endif
+
+# define _STLD _DBG	// to keep the length of generated symbols within the compiler limitation
+
+#define _STLP_OWN_IOSTREAMS
+#define _STLP_USE_STDIO_IO 1						//*TY 02/24/2000 - see also ; ref.[ file _fstream.h; line 36 ]
+#define _STLP_NO_THREADS							//*TY 12/17/2000 - multi-thread capability not explored, yet.
+#undef _REENTRANT									//*ty 11/24/2001 - to make sure no thread facility is activated
+#define _NOTHREADS									//*ty 12/07/2001 - 
+
+// native library limitations
+#define _STLP_VENDOR_GLOBAL_STD						// mpw's c++ libs do not utilize namespace std yet
+#define _STLP_NO_BAD_ALLOC							// known limitation
+#define _STLP_HAS_NO_NEW_C_HEADERS					// known limitation
+#define _STLP_NO_NEW_NEW_HEADER						// known limitation
+#define _STLP_HAS_NO_NEW_IOSTREAMS					// known limitation
+#define _STLP_NO_NATIVE_MBSTATE_T					// known limitation
+#define _STLP_NO_NATIVE_WIDE_FUNCTIONS				// known limitation
+#define _STLP_NO_NATIVE_WIDE_STREAMS				// known limitation
+#define _STLP_INCOMPLETE_EXCEPTION_HEADER			// known limitation
+#define _STLP_BROKEN_EXCEPTION_CLASS				// known limitation
+
+// compiler limitations
+# define _STLP_DONT_SIMULATE_PARTIAL_SPEC_FOR_TYPE_TRAITS
+
+# define _STLP_MPWFIX_TRY try{											//*TY 06/01/2000 - exception handling bug workaround
+# define _STLP_MPWFIX_CATCH }catch(...){throw;}							//*TY 06/01/2000 - exception handling bug workaround
+# define _STLP_MPWFIX_CATCH_ACTION(action) }catch(...){action;throw;}	//*TY 06/01/2000 - exception handling bug workaround
+# define _STLP_THROW_RETURN_BUG						// known limitation 
+# define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION		// known limitation
+# define _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX		// known limitation
+# define _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER		// known limitation
+# define _STLP_NO_RELOPS_NAMESPACE					// known limitation
+// end of stl_apple.h
diff --git a/main/source/stlport/stlport/config/stl_as400.h b/main/source/stlport/stlport/config/stl_as400.h
new file mode 100644
index 00000000..7062e891
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_as400.h
@@ -0,0 +1,60 @@
+// STLport configuration file
+// It is internal STLport header - DO NOT include it directly
+
+// AS/400 C++ config
+
+# ifdef _REENTRANT
+#  define _PTHREADS
+# endif
+
+#  define _STLP_NO_NEW_NEW_HEADER 1
+
+#  define _STLP_NO_BOOL
+#  define _STLP_LIMITED_DEFAULT_TEMPLATES
+
+#  define _STLP_HAS_NO_NAMESPACES
+#  define _STLP_NEED_TYPENAME
+#  define _STLP_NEED_EXPLICIT
+#  define _STLP_HAS_NO_EXCEPTIONS
+#  define _STLP_NO_EXCEPTION_SPEC
+#  define _STLP_NO_ARROW_OPERATOR
+#  define _STLP_NO_NEW_STYLE_CASTS
+
+#  define _STLP_NEED_MUTABLE
+#  define _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX
+#  define _STLP_NO_BAD_ALLOC
+#  define _STLP_NO_MEMBER_TEMPLATES
+#  define _STLP_NO_MEMBER_TEMPLATE_CLASSES
+#  define _STLP_NO_MEMBER_TEMPLATE_KEYWORD
+#  define _STLP_NO_FRIEND_TEMPLATES
+#  define _STLP_NO_QUALIFIED_FRIENDS
+#  define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION
+#  define _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER
+
+#  define _STLP_NO_METHOD_SPECIALIZATION
+#  define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
+
+// #  define _STLP_NO_EXCEPTION_HEADER
+
+#  define _STLP_HAS_NO_NEW_IOSTREAMS
+#  define _STLP_HAS_NO_NEW_C_HEADERS 
+
+#  define _STLP_STATIC_CONST_INIT_BUG
+#  define _STLP_THROW_RETURN_BUG
+#  define _STLP_LINK_TIME_INSTANTIATION
+#  define _STLP_NO_TEMPLATE_CONVERSIONS
+
+#  define _STLP_UNINITIALIZABLE_PRIVATE 1
+#  define _STLP_STATIC_ARRAY_BUG 1
+#  define _STLP_NON_TYPE_TMPL_PARAM_BUG 1
+#  define _STLP_TRIVIAL_DESTRUCTOR_BUG  1
+
+#  if defined(_LONG_LONG)
+#    define _STLP_LONG_LONG long long
+#  endif
+// #  define _STLP_LONG_DOUBLE 1
+#  if defined(_PTHREADS)
+#    define _MULTI_THREADED
+#  endif
+// fbp : to fix __partition() problem
+# define _STLP_NONTEMPL_BASE_MATCH_BUG 1
diff --git a/main/source/stlport/stlport/config/stl_bc.h b/main/source/stlport/stlport/config/stl_bc.h
new file mode 100644
index 00000000..d35444ea
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_bc.h
@@ -0,0 +1,204 @@
+// STLport configuration file
+// It is internal STLport header - DO NOT include it directly
+
+
+// versions ?
+# if defined(_STLP_DESIGNATED_DLL)
+#   define _STLP_CALL __cdecl __export
+# elif defined(_RTLDLL)
+#   define  _STLP_CALL __cdecl __import
+# else
+#   define  _STLP_CALL __cdecl
+# endif
+
+# define _USE_STLP
+# define _STLP_USE_OWN_MBSTATE_T
+// # define _STLP_USE_OWN_NAMESPACE
+# define _STLP_DLLEXPORT_NEEDS_PREDECLARATION
+# define _STLP_OPERATOR_SPEC_NEEDS_TEMPLATE_ARGS
+
+// most of <exception> contents is still in global namespace
+// # define _STLP_VENDOR_UNEXPECTED_STD
+
+// <limits> problem
+# define _STLP_STATIC_CONST_INIT_BUG
+
+// <bitset> problems
+# define _STLP_MEMBER_SPECIALIZATION_BUG
+# define  _STLP_HAS_SPECIFIC_PROLOG_EPILOG 1
+
+#if ( __BORLANDC__ < 0x540 )
+// Borland C++ Builder 3 (?)
+// those are assumptions, if some of them actually work, please let me know
+// #  define _STLP_STATIC_CONST_INIT_BUG 1
+// #  define _STLP_THROW_RETURN_BUG 1
+#  define _STLP_NO_TEMPLATE_CONVERSIONS 1
+#  define _STLP_DEFAULT_CONSTRUCTOR_BUG 1
+#  define _STLP_NO_TYPENAME_ON_RETURN_TYPE
+#else
+#  define _STLP_LONG_LONG  __int64
+#endif
+
+// BCB 2 or less (Borland 5.02)
+#if ( __BORLANDC__ < 0x530 )
+
+#  define _STLP_NO_OWN_IOSTREAMS
+#  undef  _STLP_OWN_IOSTREAMS
+
+#  define _STLP_GLOBAL_VENDOR_CSTD 1
+#  define _STLP_HAS_NO_NEW_IOSTREAMS 1
+#  define _STLP_HAS_NO_NEW_C_HEADERS 1
+
+#  define _STLP_NO_MEMBER_TEMPLATES 1
+#  define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1
+#  define _STLP_NO_MEMBER_TEMPLATE_KEYWORD 1
+#  define _STLP_NO_FRIEND_TEMPLATES 1
+#  define _STLP_NO_QUALIFIED_FRIENDS 1
+#  define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION 1
+#  define _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER 1
+#  define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS 1
+
+#  define _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX 1
+
+#  define _STLP_NO_DEFAULT_NON_TYPE_PARAM 1
+#  define _STLP_NON_TYPE_TMPL_PARAM_BUG 1
+#  define _STLP_MEMBER_SPECIALIZATION_BUG
+#  define _STLP_NO_EXCEPTION_HEADER 1
+#  define _STLP_NO_EXCEPTION_SPEC 1
+
+#  define _STLP_NO_BAD_ALLOC 1
+#  define _STLP_NO_ARROW_OPERATOR 1
+
+typedef char    mbstate_t;
+
+#  define _STLP_LIMITED_DEFAULT_TEMPLATES 1
+#  define _STLP_NO_TYPEINFO
+#  define _STLP_NO_METHOD_SPECIALIZATION
+
+#endif
+
+// Borland 5.0x
+#if ( __BORLANDC__ < 0x520 )
+
+#  define _STLP_BROKEN_USING_DIRECTIVE 1
+#  define _STLP_EXPORT_KEYWORD _export
+#  define _STLP_IMPORT_KEYWORD _import
+#  define _STLP_EXPORT_TEMPLATE_KEYWORD _export
+#  define _STLP_IMPORT_TEMPLATE_KEYWORD _import
+#endif
+
+#if ( __BORLANDC__ < 0x501 )
+#   define  _STLP_NONTEMPL_BASE_MATCH_BUG 1
+#   define  _STLP_NO_WCHAR_T 1
+#endif
+
+// 4.x
+#if ( __BORLANDC__ < 0x500 )
+#   define _STLP_NESTED_TYPE_PARAM_BUG 1
+#   define _STLP_STATIC_ARRAY_BUG 1
+#   define _STLP_NO_BOOL 1
+#   define _STLP_HAS_NO_NAMESPACES 1
+#   define _STLP_NEED_TYPENAME 1
+#   define _STLP_NEED_EXPLICIT 1
+#   define _STLP_NEED_MUTABLE 1
+#   define _STLP_NO_WCHAR_T 1
+#endif
+
+// auto enable thread safety and exceptions:
+#   ifndef _CPPUNWIND
+#     define _STLP_HAS_NO_EXCEPTIONS
+#   endif
+
+#   if defined ( __MT__ ) && !defined (_NOTHREADS) && !defined (_REENTRANT)
+#     define _REENTRANT 1
+#   endif
+
+#  if defined ( __DEBUG ) && ( __DEBUG > 1 )
+#   define _STLP_DEBUG
+#  endif
+
+#  define _STLP_LIB_BASENAME "stlp"
+
+# if (__BORLANDC__ < 0x540)
+
+#  define _STLP_EXPORT_DECLSPEC __declspec(dllexport)
+#  define _STLP_IMPORT_DECLSPEC __declspec(dllimport)
+#  define _STLP_IMPORT_TEMPLATE_KEYWORD  extern
+#  define _STLP_EXPORT_TEMPLATE_KEYWORD
+
+#  define _STLP_CLASS_EXPORT_DECLSPEC __declspec(dllexport)
+#  define _STLP_CLASS_IMPORT_DECLSPEC __declspec(dllimport)
+
+#   if !defined (_STLP_NO_OWN_IOSTREAMS)
+
+#    if ( defined (__DLL) || defined (_DLL) || defined (_WINDLL) || defined (_RTLDLL) \
+     || defined (_STLP_USE_DYNAMIC_LIB) ) \
+       && ! defined (_STLP_USE_STATIC_LIB)
+#      undef  _STLP_USE_DECLSPEC
+#      define _STLP_USE_DECLSPEC
+#     endif
+#   endif
+
+# else
+
+# define _STLP_EXPORT_DECLSPEC __declspec(dllexport)
+# define _STLP_IMPORT_DECLSPEC __declspec(dllimport)
+
+# define _STLP_CLASS_EXPORT_DECLSPEC __declspec(dllexport)
+# define _STLP_CLASS_IMPORT_DECLSPEC __declspec(dllimport)
+
+#  if !defined (_STLP_NO_OWN_IOSTREAMS)
+
+#    if ( defined (__DLL) || defined (_DLL) || defined (_WINDLL) || defined (_RTLDLL) \
+     || defined(_AFXDLL) || defined (_STLP_USE_DYNAMIC_LIB) )
+#      undef  _STLP_USE_DECLSPEC
+#      define _STLP_USE_DECLSPEC 1
+#    endif
+
+#  ifndef _STLP_IMPORT_TEMPLATE_KEYWORD
+#   define _STLP_IMPORT_TEMPLATE_KEYWORD __declspec(dllimport)
+#  endif
+#  define _STLP_EXPORT_TEMPLATE_KEYWORD __declspec(dllexport)
+
+# if (__BORLANDC__ >= 0x560) && ! defined (_STLP_OWN_IOSTREAMS)
+// #  define _STLP_IS_NATIVE_LIB
+#  define _STLP_NATIVE_INCLUDE_PATH ../include/oldstl
+#  define _STLP_NATIVE_CPP_C_INCLUDE_PATH ../include/oldstl
+#  define _STLP_NATIVE_C_INCLUDE_PATH ../include/oldstl
+#  define _STLP_NATIVE_CPP_RUNTIME_PATH ../include/oldstl
+# endif
+
+# ifndef __BUILDING_STLPORT
+#  ifdef _STLP_DEBUG
+#   ifdef _MT
+#    ifdef _RTLDLL
+#      pragma comment(lib,"stlpmt_stldebug45.lib")
+#    else
+#     pragma comment(lib,"stlpmt_stldebugst.lib")
+#    endif
+#   else
+#    ifdef _RTLDLL
+#      pragma comment(lib,"stlp_stldebug45.lib")
+#    else
+#     pragma comment(lib,"stlp_stldebugst.lib")
+#    endif
+#   endif
+#  else
+#   ifdef _MT
+#    ifdef _RTLDLL
+#      pragma comment(lib,"stlpmt45.lib")
+#    else
+#     pragma comment(lib,"stlpmtst.lib")
+#    endif
+#  else
+#    ifdef _RTLDLL
+#      pragma comment(lib,"stlp45.lib")
+#    else
+#     pragma comment(lib,"stlpst.lib")
+#    endif
+#   endif
+#  endif
+# endif
+
+#  endif /* _STLP_OWN_IOSTREAMS */
+# endif
diff --git a/main/source/stlport/stlport/config/stl_como.h b/main/source/stlport/stlport/config/stl_como.h
new file mode 100644
index 00000000..42833d20
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_como.h
@@ -0,0 +1,209 @@
+
+// STLport configuration file
+// It is internal STLport header - DO NOT include it directly
+
+
+# define _STLP_UINT32_T unsigned int
+
+# define _STLP_HAS_NO_NEW_C_HEADERS
+// # define _STLP_VENDOR_GLOBAL_EXCEPT_STD
+// # define _STLP_LONG_LONG
+
+
+//
+// ADDITIONS FOR COMEAU C++, made by Comeau Computing.
+// We can be reached through comeau@comeaucomputing.com
+// You shouldn't need to change anything below here for Comeau C++.
+// If you do, please tell us at comeau@comeaucomputing.com
+//
+// Changes made here, AND THROUGH ALL FILES, based upon the __COMO__ macro
+// (and SIMILAR NAMES INVOLVING COMO).... no doubt some of this will
+// change as SGI integrates the changes into their code base since
+// some changes are not really Comeau C++ specific, but required to
+// make the SGI code compliant with Standard C++).
+//
+// Testing was done with Comeau C++ 4.2.44 and 4.2.45.2.  Changes were made for
+// both Comeau relaxed mode and Comeau strict mode, especially for end user code
+// (that is, some of the .cxx files cannot compile in strict mode, because they
+// contain extensions to Standard C++, however their object code forms can
+// be used once compiled in relaxed mode, even if the end user code uses
+// strict mode).
+//
+// These changes may also work for some earlier versions of Comeau C++,
+// though we have not tested them.
+//
+// Actual mods made under RedHat 6.1 LINUX, should be ok with SuSE too and
+// other LINUX's, and older Caldera LINUX, Solaris/SPARC, SunOS, SCO UNIX,
+// and NetBSD. Other platforms may be added.  Comeau will also perform
+// custom ports for you.
+//
+// Check libcomo details at http://www.comeaucomputing.com/libcomo and
+// http://www.comeaucomputing.com
+//
+// History of Comeau changes (this is rough, as work was often going on in parallel):
+// BETA1 July 14, 2000, Initial port for RedHat 6.1 INTEL/ELF
+// BETA2 Aug   4, 2000, Stronger RedHat support
+//                      Support for Comeau strict mode for end user code
+// BETA3 Aug  22, 2000, Support for other LINUX/INTEL/ELF's, including older ones
+// BETA4 Sept  2, 2000, Initial support for SCO UNIX + other UNIX x86 SVR3's
+//                      Stronger support for end user Comeau strict mode
+// BETA5 Oct   5, 2000, Initial support for Solaris/SPARC
+//                      More SCO support (though still incomplete)
+// BETA6 Feb   5, 2001, Minor mods to accomodate Comeau C++ 4.2.45.1
+// BETA7 Mar  13, 2001, Verified with Comeau C++ 4.2.45.2
+//                      Minor NetBSD support
+// BETA8 Apr   1. 2001, Initial support for SunOS/SPARC
+// BETA9 Apr   7, 2001, Stronger SCO support + other UNIX x86 SVR3's
+//                      Mods for an fpos_t problem for some LINUXes
+//                      Mods since Destroy did not work in strict mode
+// BETA10 Apr  12. 2001, Stronger NetBSD support
+//
+// PLANNED:
+// BETAx TBA  TBA, 2001, NetBSD, UNIXWARE, and Windows support expected
+//
+
+
+#ifdef __linux__
+
+#   define _STLP_NO_NATIVE_MBSTATE_T      1
+#   define _STLP_NO_NATIVE_WIDE_FUNCTIONS 1
+#   define _STLP_NO_NATIVE_WIDE_STREAMS   1
+#   define _STLP_NO_LONG_DOUBLE   1
+
+// Comeau C++ under LINUX/INTEL/ELF
+// Preprocess away "long long" routines for now, even in relaxed mode
+# define __wcstoull_internal_defined	1
+# define __wcstoll_internal_defined	1
+
+#endif /* __COMO__ under __linux__ */
+
+#ifdef __USING_x86SVR3x_WITH_COMO /* SCO et al */
+/* UNIX 386+ SVR3 mods made with __USING_x86SVR3x_WITH_COMO
+   in other sources, not here */
+#    define atan2l atan2
+#    define cosl cos
+#    define sinl sin
+#    define sqrtl sqrt
+#    include <math.h>
+     inline long double expl(long double arg) { return exp(arg); }
+     inline long double logl(long double arg) { return log(arg); }
+#    define log10l log10
+
+#    define sinhl sinh
+#    define coshl cosh
+#    define fabsl fabs
+namespace std {
+ inline int min(int a, int b) { return a>b ? b : a; }
+}
+#endif
+
+#ifdef sun
+// Comeau C++ under Solaris/SPARC or SunOS
+
+#ifdef solarissparc
+#define __USING_SOLARIS_SPARC_WITH_COMO /* show this in the source when grep'ing for COMO */
+// Note comowchar.h for Solaris/SPARC wchar stuff
+
+#include <math.h>
+#    define sinf sin
+#    define sinl sin
+#    define sinhf sinh
+#    define sinhl sinh
+#    define cosf cos
+#    define cosl cos
+#    define coshf cosh
+#    define coshl cosh
+#    define atan2l atan2
+#    define atan2f atan2
+     inline float logf(float arg) { return log(arg); }
+     inline long double logl(long double arg) { return log(arg); }
+#    define log10f log10
+#    define log10l log10
+#    define expf exp
+     inline long double expl(long double arg) { return exp(arg); }
+#    define sqrtf sqrt
+#    define sqrtl sqrt
+#    define fabsf fabs
+#    define fabsl fabs
+#else
+#define __USING_SUNOS_WITH_COMO
+
+#define __unix 1
+#define __EXTENSIONS__ /* This might create undue noise somewhere */
+#endif
+#endif /* sun */
+
+#if defined(__NetBSD__)
+// From non-como #ifdef __GNUC__ above
+#undef _STLP_NO_FUNCTION_PTR_IN_CLASS_TEMPLATE
+#define __unix 1
+
+#include <sys/cdefs.h>
+// Some joker #define'd __END_DECLS as };
+#undef __END_DECLS
+#define __END_DECLS }
+
+// <sys/stat.h> prob
+#include <sys/cdefs.h>
+#undef __RENAME
+#define __RENAME(x)
+
+#define wchar_t __COMO_WCHAR_T
+#include <stddef.h>
+#undef wchar_t
+
+#include <math.h>
+# ifdef BORIS_DISABLED
+#    define atan2l atan2
+#    define cosl cos
+#    define sinl sin
+#    define sqrtl sqrt
+     inline long double expl(long double arg) { return exp(arg); }
+     inline long double logl(long double arg) { return log(arg); }
+#    define log10l log10
+#    define sinhl sinh
+#    define coshl cosh
+#    define fabsl fabs
+# endif
+#endif /* __NetBSD__ under __COMO__ */
+
+// Shouldn't need to change anything below here for Comeau C++
+// If so, tell us at comeau@comeaucomputing.com
+
+#define _STLP_NO_DRAND48
+
+#define _STLP_PARTIAL_SPECIALIZATION_SYNTAX
+#define _STLP_NO_USING_CLAUSE_IN_CLASS
+
+
+#if __COMO_VERSION__ >= 4245
+#define _STLP_NO_EXCEPTION_HEADER /**/
+#endif
+#define _STLP_NO_BAD_ALLOC /**/
+#define _STLP_USE_AUTO_PTR_CONVERSIONS /**/
+
+#if __COMO_VERSION__ >= 4245
+// Is this needed?
+#include <stdexcept.stdh>
+//
+// ALSO: SEE THE END OF THIS FILE FOR #INCLUDE <IOSTREAM>
+//
+#endif
+
+// this one is true only with MS
+# if defined (_MSC_VER)
+#  define _STLP_WCHAR_T_IS_USHORT 1
+#  if _MSC_VER <= 1200
+#   define _STLP_VENDOR_GLOBAL_CSTD
+#  endif
+#  if _MSC_VER < 1100
+#   define _STLP_NO_BAD_ALLOC 1
+#   define _STLP_NO_EXCEPTION_HEADER 1
+#   define _STLP_NO_NEW_NEW_HEADER 1
+#   define _STLP_NO_NEW_IOSTREAMS 1
+#  endif
+# endif
+
+// # define __EDG_SWITCHES
+
+
diff --git a/main/source/stlport/stlport/config/stl_confix.h b/main/source/stlport/stlport/config/stl_confix.h
new file mode 100644
index 00000000..9a38627e
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_confix.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/*
+ * STLport configuration file
+ * It is internal STLport header - DO NOT include it directly
+ * Purpose of this file : to define STLport settings that depend on
+ * compiler flags or can be otherwise missed
+ *
+ */
+
+#ifndef _STLP_CONFIX_H
+# define _STLP_CONFIX_H
+
+/* If, by any chance, C compiler gets there, try to help it to pass smoothly */
+# if ! defined (__cplusplus) && ! defined (_STLP_HAS_NO_NAMESPACES)
+#  define _STLP_HAS_NO_NAMESPACES
+# endif
+
+# if defined(__MINGW32__)
+#   define _STLP_NO_DRAND48
+# endif
+
+/* Modena C++ library  */
+#if defined (__MWERKS__) && __MWERKS__ <= 0x2303 || (defined (__KCC) && __KCC_VERSION < 3400)
+# include <mcompile.h>
+# define _STLP_USE_MSIPL 1
+# if defined (__KCC) || (defined(__MSL_CPP__) && \
+       ( (__MSL_CPP__ >= 0x5000 && defined( _MSL_NO_MESSAGE_FACET )) || \
+	 (__MSL_CPP__ < 0x5000 && defined( MSIPL_NL_TYPES )))  \
+	 )
+#  define _STLP_NO_NATIVE_MESSAGE_FACET 1
+# endif
+#endif
+
+/* common switches for EDG front-end */
+# if defined (__EDG_SWITCHES)
+#   if !(defined(_TYPENAME) || defined (_TYPENAME_IS_KEYWORD))
+#     undef  _STLP_NEED_TYPENAME
+#     define _STLP_NEED_TYPENAME 1
+#   endif
+#   if !defined(_WCHAR_T_IS_KEYWORD)
+#     undef _STLP_NO_WCHAR_T 
+#     define _STLP_NO_WCHAR_T 1
+#   endif
+#   ifndef _PARTIAL_SPECIALIZATION_OF_CLASS_TEMPLATES
+#     undef _STLP_NO_CLASS_PARTIAL_SPECIALIZATION
+#     define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION 1
+#   endif
+#   ifndef _MEMBER_TEMPLATES
+#     undef _STLP_NO_MEMBER_TEMPLATES
+#     define _STLP_NO_MEMBER_TEMPLATES 1
+#     undef _STLP_NO_MEMBER_TEMPLATE_CLASSES
+#     define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1
+#   endif
+#   if !defined(_MEMBER_TEMPLATE_KEYWORD)
+#     undef  _STLP_NO_MEMBER_TEMPLATE_KEYWORD
+#     define _STLP_NO_MEMBER_TEMPLATE_KEYWORD 1
+#   endif
+#   if !defined (__EXCEPTIONS) && ! defined (_EXCEPTIONS)
+#     undef  _STLP_HAS_NO_EXCEPTIONS
+#     define _STLP_HAS_NO_EXCEPTIONS
+#   endif
+#   undef __EDG_SWITCHES
+# endif /* EDG */
+#endif
diff --git a/main/source/stlport/stlport/config/stl_cray.h b/main/source/stlport/stlport/config/stl_cray.h
new file mode 100644
index 00000000..64f0b30e
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_cray.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+// Mostly correct guess, change it for Alpha (and other environments
+// that has 64-bit "long")
+#  define _STLP_UINT32_T unsigned long
+
+// Uncomment if long long is available
+#  define _STLP_LONG_LONG long long
+
+// Uncomment this if your compiler can't inline while(), for()
+#  define _STLP_LOOP_INLINE_PROBLEMS 1
+
+// Uncomment if native new-style iostreams are not available
+#define    _STLP_HAS_NO_NEW_IOSTREAMS	1
+
+// Uncomment this if your compiler does not support exceptions
+// Cray C++ supports exceptions when '-h exceptions' option is user;
+// therefore '-D_STLP_HAS_NO_EXCEPTIONS' must be used when '-h exceptions'
+// is NOT used.
+//#  define _STLP_HAS_NO_EXCEPTIONS 1
+
+// Delete?
+// Define this if compiler lacks <exception> header
+//#  define _STLP_NO_EXCEPTION_HEADER 1
+
+// Uncomment this if your C library has lrand48() function
+#  define _STLP_RAND48 1
+
+// Uncomment if native new-style C library headers lile <cstddef>, etc are not available.
+#   define _STLP_HAS_NO_NEW_C_HEADERS 1
+
+// uncomment if new-style headers <new> is available
+#   define _STLP_NO_NEW_NEW_HEADER 1
+
+// uncomment this if <iostream> and other STD headers put their stuff in ::namespace,
+// not std::
+#  define _STLP_VENDOR_GLOBAL_STD
+
+// uncomment this if <cstdio> and the like put stuff in ::namespace,
+// not std::
+#  define _STLP_VENDOR_GLOBAL_CSTD
+
+# define _STLP_NATIVE_C_HEADER(__x) </usr/include/##__x>
+// WARNING: Following is hardcoded to the system default C++ include files
+# define _STLP_NATIVE_CPP_RUNTIME_HEADER(__x) </opt/ctl/CC/CC/include/##__x>
+
+
+# define _STLP_NO_NATIVE_MBSTATE_T
+# define _STLP_NO_CSTD_FUNCTION_IMPORTS
+//# define _STLP_VENDOR_GLOBAL_EXCEPT_STD
+
+
diff --git a/main/source/stlport/stlport/config/stl_dec.h b/main/source/stlport/stlport/config/stl_dec.h
new file mode 100644
index 00000000..531f4ec1
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_dec.h
@@ -0,0 +1,110 @@
+# define _STLP_HAS_SPECIFIC_PROLOG_EPILOG
+
+# define _STLP_NATIVE_HEADER(header) <../cxx/##header>
+# define _STLP_NATIVE_C_HEADER(x) <../include/##x>
+
+#if (__DECCXX_VER < 60300000)
+# define _STLP_NATIVE_CPP_C_HEADER(header) <../cxx/##header>
+#else
+# define _STLP_NATIVE_CPP_C_HEADER(header) </usr/include/cxx_cname/##header>
+#endif
+
+# define _STLP_NATIVE_OLD_STREAMS_HEADER(header) <../cxx/##header>
+# define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <../cxx/##header>
+
+// Alpha is little-endian
+# define _STLP_LITTLE_ENDIAN
+
+// collisions 
+# define _STLP_DONT_PUT_STLPORT_IN_STD
+
+#if (__DECCXX_VER < 60000000)
+
+// automatic template instantiation does not
+// work with namespaces ;(
+# define _STLP_HAS_NO_NAMESPACES 1
+
+# define _STLP_NO_NEW_NEW_HEADER 1 
+
+# define _STLP_NO_WCHAR_T  1
+# define _STLP_NEED_EXPLICIT  1
+
+# define _STLP_NO_BOOL  1
+# define _STLP_NEED_TYPENAME 1
+# define _STLP_NO_NEW_STYLE_CASTS 1
+# define _STLP_NEED_MUTABLE 1
+# define _STLP_NO_BAD_ALLOC 1
+
+
+# define _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX 1
+
+# define _STLP_NO_MEMBER_TEMPLATES 1
+# define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1
+# define _STLP_NO_MEMBER_TEMPLATE_KEYWORD 1
+# define _STLP_NO_FRIEND_TEMPLATES 1
+# define _STLP_NO_QUALIFIED_FRIENDS 1
+# define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION 1
+# define _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER 1
+# define _STLP_NON_TYPE_TMPL_PARAM_BUG 1
+# define _STLP_BROKEN_USING_DIRECTIVE 1
+# define _STLP_NO_EXCEPTION_HEADER 1
+# define _STLP_DEFAULT_CONSTRUCTOR_BUG 1
+
+#endif
+
+
+#ifdef __NO_USE_STD_IOSTREAM
+#  define _STLP_HAS_NO_NEW_IOSTREAMS 1
+# else
+// default is to use new iostreams, anyway
+# ifndef __USE_STD_IOSTREAM
+#  define __USE_STD_IOSTREAM
+# endif
+#endif
+
+// # if !defined (_STLP_NEW_IOSTREAMS) && ! defined (_STLP_DONT_REDEFINE_STD) \
+//  && ! defined (_STLP_REDEFINE_STD)
+// # undef __PRAGMA_ENVIRONMENT
+//   #  define _STLP_DONT_REDEFINE_STD
+// # endif
+
+//# ifndef __STD_STRICT_ANSI_ERRORS
+//# endif
+
+#ifndef __EXCEPTIONS
+# define _STLP_HAS_NO_EXCEPTIONS 1
+#endif
+
+# ifdef __IMPLICIT_INCLUDE_ENABLED
+
+// but, works with ours ;).
+#  define _STLP_LINK_TIME_INSTANTIATION 1
+# else
+#  undef _STLP_LINK_TIME_INSTANTIATION
+# endif
+
+# if defined (__IMPLICIT_USING_STD) && !defined (__NO_USE_STD_IOSTREAM)
+// we should ban that !
+// #  error "STLport won't work with new iostreams and std:: being implicitly included. Please use -std strict_ansi[_errors] or specify __NO_USE_STD_IOSTREAM"
+# endif
+
+# if (defined (__STD_STRICT_ANSI) || defined (__STD_STRICT_ANSI_ERRORS))
+#  define _STLP_STRICT_ANSI 1
+# else
+// we want to enforce it
+#  define _STLP_LONG_LONG long long
+# endif
+
+// unsigned 32-bit integer type
+#  define _STLP_UINT32_T unsigned int
+#if defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 >= 4)
+# define _STLP_RAND48 1
+#endif
+// #  define _STLP_RAND48 1
+
+#  define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS 1
+
+# if (__DECCXX_VER <= 60400000)
+#  define _STLP_HAS_NO_NEW_C_HEADERS 1 
+# endif
+
diff --git a/main/source/stlport/stlport/config/stl_dec_vms.h b/main/source/stlport/stlport/config/stl_dec_vms.h
new file mode 100644
index 00000000..85d9f492
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_dec_vms.h
@@ -0,0 +1,96 @@
+// OpenVMS version
+
+# define _STLP_NATIVE_HEADER(header) <sys$library:##header>
+# define _STLP_NATIVE_C_HEADER(x) <sys$library:##x>
+# define _STLP_NATIVE_CPP_C_HEADER(header) <sys$library:##header>
+# define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <sys$library:##header>
+
+#if (__DECCXX_VER < 60000000)
+
+// automatic template instantiation does not
+// work with namespaces ;(
+# define _STLP_HAS_NO_NAMESPACES 1
+
+# define _STLP_NO_WCHAR_T  1
+# define _STLP_NEED_EXPLICIT  1
+
+# define _STLP_NO_BOOL  1
+# define _STLP_NEED_TYPENAME 1
+# define _STLP_NO_NEW_STYLE_CASTS 1
+# define _STLP_NEED_MUTABLE 1
+# define _STLP_NO_BAD_ALLOC 1
+
+# define _STLP_NO_NEW_NEW_HEADER 1 
+# define _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX 1
+
+# define _STLP_NO_MEMBER_TEMPLATES 1
+# define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1
+# define _STLP_NO_MEMBER_TEMPLATE_KEYWORD 1
+# define _STLP_NO_FRIEND_TEMPLATES 1
+# define _STLP_NO_QUALIFIED_FRIENDS 1
+# define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION 1
+# define _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER 1
+# define _STLP_NON_TYPE_TMPL_PARAM_BUG 1
+# define _STLP_BROKEN_USING_DIRECTIVE 1
+# define _STLP_NO_EXCEPTION_HEADER 1
+# define _STLP_DEFAULT_CONSTRUCTOR_BUG 1
+
+#endif
+
+
+#ifdef __NO_USE_STD_IOSTREAM
+#  define _STLP_HAS_NO_NEW_IOSTREAMS 1
+# else
+// default is to use new iostreams, anyway
+# ifndef __USE_STD_IOSTREAM
+#  define __USE_STD_IOSTREAM
+# endif
+#endif
+
+// # if !defined (_STLP_NEW_IOSTREAMS) && ! defined (_STLP_DONT_REDEFINE_STD) \
+//  && ! defined (_STLP_REDEFINE_STD)
+// # undef __PRAGMA_ENVIRONMENT
+//   #  define _STLP_DONT_REDEFINE_STD
+// # endif
+
+//# ifndef __STD_STRICT_ANSI_ERRORS
+//# endif
+
+#ifndef __EXCEPTIONS
+# define _STLP_HAS_NO_EXCEPTIONS 1
+#endif
+
+# ifdef __IMPLICIT_INCLUDE_ENABLED
+
+#ifndef _STLP_IOSTREAMS
+// implicit include introduces conflicts
+// between stlport and native lib.
+# undef __IMPLICIT_INCLUDE_ENABLED
+#endif
+
+// but, works with ours ;).
+#  define _STLP_LINK_TIME_INSTANTIATION 1
+
+# endif
+
+# if defined (__IMPLICIT_USING_STD) && !defined (__NO_USE_STD_IOSTREAM)
+// we should ban that !
+#  error "STLport won't work with new iostreams and std:: being implicitly included. Please use -std strict_ansi[_errors] or specify __NO_USE_STD_IOSTREAM"
+# endif
+
+# if !(defined (__STD_STRICT_ANSI) || defined (__STD_STRICT_ANSI_ERRORS))
+// we want to enforce it
+#  define _STLP_LONG_LONG long long
+# endif
+
+// unsigned 32-bit integer type
+#  define _STLP_UINT32_T unsigned int
+#if defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 >= 4)
+# define _STLP_RAND48 1
+#endif
+// #  define _STLP_RAND48 1
+
+#  define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS 1
+
+#define _STLP_HAS_NO_NEW_C_HEADERS 1
+
diff --git a/main/source/stlport/stlport/config/stl_dm.h b/main/source/stlport/stlport/config/stl_dm.h
new file mode 100644
index 00000000..121f4ba4
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_dm.h
@@ -0,0 +1,225 @@
+// STLport configuration file for Digital Mars C++
+
+#ifndef _STLP_DMC_H
+# define _STLP_DMC_H
+
+#if __DMC__ < 0x832
+#error "Digital Mars C++ versions prior to 8.32 are not supported!"
+#endif
+
+
+#ifndef _CPPUNWIND
+# define _STLP_NO_EXCEPTIONS
+#endif
+# undef _STLP_NO_NAMESPACES
+# define _STLP_NO_RELOPS_NAMESPACE
+# define _STLP_VENDOR_GLOBAL_CSTD
+# define _STLP_VENDOR_GLOBAL_STD
+# define _STLP_VENDOR_EXCEPT_STD std
+
+# if !defined(_WIN32)
+// it's not fully supported on non-Win32 platforms
+#  define _STLP_NO_NEW_IOSTREAMS
+#  define _STLP_NO_NATIVE_WIDE_FUNCTIONS
+# endif
+
+# if defined(_STLP_NO_NEW_IOSTREAMS) || defined(_STLP_NO_OWN_IOSTREAMS)
+#  define _STLP_OWN_NAMESPACE
+# else
+#  define _STLP_NO_OWN_NAMESPACE
+# endif
+
+
+// select threads strategy
+# if defined (_MT) && !defined (_NOTHREADS)
+#  define _REENTRANT
+# else
+#  define _NOTHREADS
+# endif
+
+// select SGI-style alloc instead of allocator<T>
+# define _STLP_USE_SGI_ALLOCATORS
+
+// select allocation method you like
+# undef _STLP_USE_MALLOC
+# define _STLP_USE_NEWALLOC
+
+// this one is not mandatory, just enabled
+# undef _STLP_USE_DEFALLOC
+
+// define _STLP_USE_ABBREVS if your linker has trouble with long 
+// external symbols
+# undef _STLP_USE_ABBREVS
+
+
+// unsigned 32-bit integer type
+#  define _STLP_UINT32_T unsigned
+
+#  ifndef _BOOL_DEFINED
+#   define _STLP_NO_BOOL
+#  else
+#   define _STLP_DONT_USE_BOOL_TYPEDEF
+#  endif
+
+#  undef _STLP_YVALS_H
+#  undef _STLP_LIMITED_DEFAULT_TEMPLATES
+#  define _STLP_DEFAULT_TYPE_PARAM
+#  undef _STLP_NO_STATIC_TEMPLATE_DATA
+#  undef _STLP_RAND48
+#  undef _STLP_LOOP_INLINE_PROBLEMS
+
+#  undef _STLP_HAS_NO_NAMESPACES
+
+#  undef _STLP_NEED_TYPENAME
+#  undef _STLP_NEED_EXPLICIT
+#  undef _STLP_HAS_NO_EXCEPTIONS
+#  undef _STLP_NO_EXCEPTION_SPEC
+#  undef _STLP_WEAK_ATTRIBUTE
+#  undef _STLP_BASE_MATCH_BUG
+#  undef _STLP_NONTEMPL_BASE_MATCH_BUG
+#  undef _STLP_NESTED_TYPE_PARAM_BUG
+#  undef _STLP_NO_ARROW_OPERATOR
+#  undef _STLP_UNINITIALIZABLE_PRIVATE
+#  undef _STLP_BASE_TYPEDEF_BUG
+#  undef _STLP_BASE_TYPEDEF_OUTSIDE_BUG
+#  undef _STLP_CONST_CONSTRUCTOR_BUG
+
+#  undef _STLP_NO_NEW_STYLE_CASTS
+
+#  ifndef _WCHAR_T_DEFINED
+#   define _STLP_NO_WCHAR_T
+#  endif
+#  define _STLP_HAS_NO_UNIX98_WCHAR_EXTENSIONS
+
+#  undef _STLP_WCHAR_T_IS_USHORT
+
+#  if _INTEGRAL_MAX_BITS >= 64
+#   define _STLP_LONG_LONG long long
+#  endif
+
+#  undef _STLP_NO_LONG_DOUBLE
+#  undef _STLP_NEED_MUTABLE
+#  undef _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX
+#  undef _STLP_NO_BAD_ALLOC
+#  undef _STLP_DEBUG_ALLOC
+#  undef _STLP_NO_MEMBER_TEMPLATES
+#  undef _STLP_NO_MEMBER_TEMPLATE_CLASSES
+#  define _STLP_NO_MEMBER_TEMPLATE_KEYWORD
+#  undef _STLP_NO_FRIEND_TEMPLATES
+#  undef _STLP_NO_QUALIFIED_FRIENDS
+#  undef _STLP_NO_CLASS_PARTIAL_SPECIALIZATION
+#  undef _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER
+#  undef _STLP_AUTOMATIC_TYPE_TRAITS
+#  undef _STLP_MEMBER_POINTER_PARAM_BUG
+#  undef _STLP_NON_TYPE_TMPL_PARAM_BUG
+#  undef _STLP_NO_DEFAULT_NON_TYPE_PARAM
+#  undef _STLP_NO_METHOD_SPECIALIZATION
+#  undef _STLP_STATIC_ARRAY_BUG
+#  undef _STLP_STATIC_CONST_INIT_BUG
+#  undef _STLP_TRIVIAL_CONSTRUCTOR_BUG
+#  undef _STLP_TRIVIAL_DESTRUCTOR_BUG
+#  undef _STLP_BROKEN_USING_DIRECTIVE
+#  undef _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
+#  undef _STLP_NO_EXCEPTION_HEADER
+#  undef _STLP_DEFAULT_CONSTRUCTOR_BUG
+
+#  define _STLP_HAS_NO_NEW_IOSTREAMS
+#  define _STLP_HAS_NO_NEW_C_HEADERS
+#  define _STLP_THROW_RETURN_BUG
+#  undef _STLP_LINK_TIME_INSTANTIATION
+#  undef _STLP_PARTIAL_SPEC_NEEDS_TEMPLATE_ARGS
+#  undef _STLP_NO_TEMPLATE_CONVERSIONS
+#  undef _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS
+
+
+#  define _STLP_NO_NATIVE_MBSTATE_T
+
+
+#  define _STLP_EXPORT_DECLSPEC __declspec(dllexport)
+#  define _STLP_IMPORT_DECLSPEC __declspec(dllimport)
+
+#  define _STLP_CLASS_EXPORT_DECLSPEC __declspec(dllexport)
+#  define _STLP_CLASS_IMPORT_DECLSPEC __declspec(dllimport)
+
+#  define _STLP_IMPORT_TEMPLATE_KEYWORD __declspec(dllimport)
+#  define _STLP_EXPORT_TEMPLATE_KEYWORD __declspec(dllexport)
+
+#define _STLP_NATIVE_HEADER(header)    <../include/##header>
+#define _STLP_NATIVE_C_HEADER(header)    <../include/##header>
+#define _STLP_NATIVE_CPP_C_HEADER(header)    <../include/##header>
+#define _STLP_NATIVE_OLD_STREAMS_HEADER(header) <../include/##header>
+#define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <../include/##header>
+
+
+# if defined(__BUILDING_STLPORT) && defined(_WINDLL)
+#  define _STLP_CALL __export
+
+#  undef _STLP_USE_DECLSPEC
+#  define _STLP_USE_DECLSPEC 1
+# endif
+
+# if !defined (__BUILDING_STLPORT) && !defined (_STLP_NO_OWN_IOSTREAMS)
+#  if (defined (_DLL) && !defined (_STLP_DONT_USE_DLL)) || defined (_STLP_USE_DLL)
+#   undef  _STLP_USE_DECLSPEC
+#   define _STLP_USE_DECLSPEC 1
+#  endif
+
+#  if defined (_STLP_DEBUG)
+#   if defined (_DLL)
+#    if !defined (_STLP_DONT_USE_DLL)
+#     pragma comment(lib,"stlp45dm_stldebug.lib")
+#    else
+#     pragma comment(lib,"stlp45dm_stldebug_staticx.lib")
+#    endif
+#   else
+#    if defined (_STLP_USE_DLL)
+#     pragma comment(lib,"stlp45dms_stldebug.lib")
+#    else
+#     pragma comment(lib,"stlp45dm_stldebug_static.lib")
+#    endif
+#   endif
+#  elif defined (DEBUG)
+#   if defined (_DLL)
+#    if !defined (_STLP_DONT_USE_DLL)
+#     pragma comment(lib,"stlp45dm_debug.lib")
+#    else
+#     pragma comment(lib,"stlp45dm_debug_staticx.lib")
+#    endif
+#   else
+#    if defined (_STLP_USE_DLL)
+#     pragma comment(lib,"stlp45dms_debug.lib")
+#    else
+#     pragma comment(lib,"stlp45dm_debug_static.lib")
+#    endif
+#   endif
+#  else
+#   if defined (_DLL)
+#    if !defined (_STLP_DONT_USE_DLL)
+#     pragma comment(lib,"stlp45dm.lib")
+#    else
+#     pragma comment(lib,"stlp45dm_staticx.lib")
+#    endif
+#   else
+#    if defined (_STLP_USE_DLL)
+#     pragma comment(lib,"stlp45dms.lib")
+#    else
+#     pragma comment(lib,"stlp45dm_static.lib")
+#    endif
+#   endif
+#  endif
+# endif
+
+
+#ifdef __BUILDING_STLPORT
+// still needed for building STLport itself, but isn't needed for
+// compiling applications anymore
+# undef __SC__
+#endif
+
+#undef __STLP_NO_KEYWORDS_WORKAROUND
+#if !defined (__STLP_NO_KEYWORDS_WORKAROUND)
+# define __in __stl_in
+# define __out __stl_out
+#endif
+
+#endif
diff --git a/main/source/stlport/stlport/config/stl_fujitsu.h b/main/source/stlport/stlport/config/stl_fujitsu.h
new file mode 100644
index 00000000..ae4210b7
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_fujitsu.h
@@ -0,0 +1,5 @@
+/* STLport configuration for Fujitsu compiler : looks like a perfect one ! */
+# define _STLP_NATIVE_INCLUDE_PATH ../std
+# define _STLP_UINT32_T unsigned int
+# define _STLP_LONG_LONG long long
+# define _STLP_WCHAR_SUNPRO_EXCLUDE 1
diff --git a/main/source/stlport/stlport/config/stl_gcc.h b/main/source/stlport/stlport/config/stl_gcc.h
new file mode 100644
index 00000000..cdc8f3a6
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_gcc.h
@@ -0,0 +1,376 @@
+/* STLport configuration file
+ * It is internal STLport header - DO NOT include it directly
+ */
+
+/* Systems having GLIBC installed have different traits */
+#if ! defined (_STLP_USE_GLIBC) && ( defined (__linux__) || defined (__CYGWIN__) )
+# define _STLP_USE_GLIBC
+#endif
+
+#   define _STLP_NO_MEMBER_TEMPLATE_KEYWORD
+
+# if defined(__FreeBSD__) || defined (__hpux) || defined(__amigaos__) || ( defined(__OS2__) && defined(__EMX__) )
+#  define _STLP_NO_WCHAR_T
+# endif
+
+#ifdef __USLC__
+# include <config/stl_sco.h>
+#endif
+
+# if defined (__sun)
+
+// gcc does not support ELF64 yet ; however; it supports ultrasparc + v8plus.
+// limits.h contains invalid values for this combination
+# if (defined  (__sparc_v9__) || defined (__sparcv9)) && ! defined ( __WORD64 )
+#  define __LONG_MAX__ 2147483647L
+# endif
+
+#  include <config/stl_solaris.h>
+# endif
+
+// no thread support on AmigaOS
+#if defined (__amigaos__)
+# define _NOTHREADS
+# define _STLP_NO_THREADS
+#endif
+
+// azov: gcc on lynx have a bug that causes internal
+// compiler errors when compiling STLport with namespaces turned on. 
+// When the compiler gets better - comment out _STLP_HAS_NO_NAMESPACES
+# if defined (__Lynx__) && (__GNUC__ < 3)
+#   define _STLP_HAS_NO_NAMESPACES 1
+#   define _STLP_NO_STATIC_TEMPLATE_DATA 1
+//  turn off useless warning about including system headers
+#   define __NO_INCLUDE_WARN__ 1
+# endif
+
+
+/* Tru64 Unix, AIX, HP : gcc there by default uses uses native ld and hence cannot auto-instantiate 
+   static template data. If you are using GNU ld, please say so in stl_user_config.h header */    
+# if (__GNUC__ < 3) && ! (_STLP_GCC_USES_GNU_LD) && \
+   ((defined (__osf__) && defined (__alpha__)) || defined (_AIX) || defined (__hpux) || defined(__amigaos__) )
+#   define _STLP_NO_STATIC_TEMPLATE_DATA
+# endif
+
+# if defined(__DJGPP)
+#   define _STLP_RAND48		1
+#   define _NOTHREADS		1
+#   undef  _PTHREADS
+#   define _STLP_LITTLE_ENDIAN
+# endif 
+
+# if defined(__MINGW32__)
+/* Mingw32, egcs compiler using the Microsoft C runtime */
+#   undef  _STLP_NO_DRAND48
+#   define _STLP_NO_DRAND48
+#   ifdef _MT
+#     define _REENTRANT
+#   endif
+#  define _STLP_IMPORT_DECLSPEC __attribute__((dllimport))
+#  define _STLP_EXPORT_DECLSPEC __attribute__((dllexport))
+#  define _STLP_CLASS_IMPORT_DECLSPEC __attribute__((dllimport))
+#  define _STLP_CLASS_EXPORT_DECLSPEC __attribute__((dllexport))
+#  define _STLP_CALL
+
+#  if defined (_STLP_USE_DYNAMIC_LIB)
+#   define _STLP_USE_DECLSPEC 1
+// #   define _STLP_USE_TEMPLATE_EXPORT 1
+/* Using dynamic library in MinGW requires _STLP_NO_CUSTOM_IO */
+# define _STLP_NO_CUSTOM_IO
+#  endif
+
+# endif
+
+#if defined (__CYGWIN__) || defined (__MINGW32__) || !(defined (_STLP_USE_GLIBC) || defined (__sun)) 
+#ifndef __MINGW32__
+#   define _STLP_NO_NATIVE_MBSTATE_T      1
+#endif
+#   define _STLP_NO_NATIVE_WIDE_FUNCTIONS 1
+#   define _STLP_NO_NATIVE_WIDE_STREAMS   1
+# elif defined(__linux__)
+#   define _STLP_NO_NATIVE_WIDE_FUNCTIONS 1
+#   define _STLP_NO_NATIVE_WIDE_STREAMS   1
+# elif defined (__sun)
+#   define _STLP_WCHAR_BORLAND_EXCLUDE
+#   define _STLP_NO_NATIVE_WIDE_FUNCTIONS 1
+#endif
+
+/* Mac OS X is a little different with namespaces and cannot instantiate
+ * static data members in template classes */
+# if defined (__APPLE__)
+/* Mac OS X is missing a required typedef and standard macro */
+typedef unsigned int wint_t;
+
+#  define __unix
+
+#   if (__GNUC__ < 3)
+
+ /* Mac OS X needs one and only one source file to initialize all static data
+  * members in template classes. Only one source file in an executable or
+  * library can declare instances for such data members, otherwise duplicate
+  * symbols will be generated. */
+
+#   define _STLP_NO_STATIC_TEMPLATE_DATA
+#   define _STLP_STATIC_CONST_INIT_BUG 1
+#   define _STLP_STATIC_TEMPLATE_DATA 0
+#   define _STLP_WEAK_ATTRIBUTE 1
+ /* Workaround for the broken Mac OS X C++ preprocessor which cannot handle
+  * parameterized macros in #include statements */
+#  define _STLP_NATIVE_HEADER(header) <../g++/##header##>
+#  define _STLP_NATIVE_C_HEADER(header) <../include/##header##>
+#  define _STLP_NATIVE_CPP_C_HEADER(header) <../g++/##header##>
+#  define _STLP_NATIVE_OLD_STREAMS_HEADER(header) <../g++/##header##>
+#  define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <../g++/##header##> 
+# endif /* __GNUC__ < 3 */
+
+#   define _STLP_NO_LONG_DOUBLE
+
+/* Mac OS X needs all "::" scope references to be "std::" */
+#define _STLP_USE_NEW_C_HEADERS
+# endif
+
+
+# if defined(__BEOS__) && defined(__INTEL__)
+#  define _STLP_NATIVE_HEADER(header) <../stlport/beos/##header##>
+#  define _STLP_NATIVE_C_HEADER(header) <../stlport/beos/##header##>
+#  define _STLP_NATIVE_CPP_C_HEADER(header) <../stlport/beos/##header##>
+#  define _STLP_NATIVE_OLD_STREAMS_HEADER(header) <../stlport/beos/##header##>
+#  define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <../stlport/beos/##header##>
+#  define _STLP_NO_NATIVE_WIDE_FUNCTIONS 1
+#  define _STLP_NO_NATIVE_WIDE_STREAMS   1
+//#  define _NOTHREADS 1
+#  ifdef _PTHREADS
+#    undef  _PTHREADS
+#  endif
+#  ifdef _STLP_PTHREADS
+#    undef _STLP_PTHREADS
+#  endif
+#  define _STLP_USE_STDIO_IO 1
+#  define _STLP_USE_GLIBC 1
+# endif
+
+
+/* g++ 2.7.x and above */
+#   define _STLP_LONG_LONG long long 
+
+#   if (__GNUC__ >= 3)
+#    ifndef _STLP_HAS_NO_NEW_C_HEADERS
+#     define _STLP_HAS_NATIVE_FLOAT_ABS
+#    else
+#     ifdef _STLP_USE_GLIBC
+#      define _STLP_VENDOR_LONG_DOUBLE_MATH  1 // - ptr: with new c headers no needs
+// #      define _STLP_REAL_LOCALE_IMPLEMENTED
+#     endif
+#    endif
+#   endif
+
+#   if (__GNUC__ < 3)
+#    define _STLP_HAS_NO_NEW_C_HEADERS     1
+#    define _STLP_VENDOR_GLOBAL_CSTD       1
+#    define _STLP_HAS_NO_NEW_IOSTREAMS     1
+#    ifndef __HONOR_STD
+#     define _STLP_VENDOR_GLOBAL_EXCEPT_STD 1
+#    endif
+#   endif
+
+#   if (__GNUC_MINOR__ < 95)  && (__GNUC__ < 3)
+/* egcs fails to initialize builtin types in expr. like this : new(p) char();  */
+#     define _STLP_DEFAULT_CONSTRUCTOR_BUG 1
+#     define _STLP_INCOMPLETE_EXCEPTION_HEADER
+#   endif
+
+#   if (__GNUC_MINOR__ < 9)  && (__GNUC__ < 3) /* gcc 2.8 */
+#     define _STLP_NO_TEMPLATE_CONVERSIONS
+#     define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1
+#     define _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER 1
+#     define _STLP_NO_FRIEND_TEMPLATES 1
+#     define _STLP_HAS_NO_NAMESPACES 1
+#     define _STLP_NO_METHOD_SPECIALIZATION 1
+#     define _STLP_NO_MEMBER_TEMPLATES 1
+#     define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION 1
+#     define _STLP_DONT_SIMULATE_PARTIAL_SPEC_FOR_TYPE_TRAITS
+/*  DJGPP doesn't seem to implement it in 2.8.x */
+#     ifdef DJGPP
+#      define  _STLP_NO_STATIC_TEMPLATE_DATA 1
+#     endif
+#   endif
+
+#  if __GNUC__ <= 2 && __GNUC_MINOR__ <= 7 && ! defined (__CYGWIN32__)
+/* Will it work with 2.6 ? I doubt it. */
+#   if ( __GNUC_MINOR__ < 6 )
+    __GIVE_UP_WITH_STL(GCC_272);
+#   endif
+
+# define  _STLP_NO_RELOPS_NAMESPACE
+# define  _STLP_NON_TYPE_TMPL_PARAM_BUG
+# define  _STLP_LIMITED_DEFAULT_TEMPLATES 1
+# define  _STLP_DEFAULT_TYPE_PARAM 1
+# define  _STLP_NO_BAD_ALLOC
+# define  _STLP_NO_ARROW_OPERATOR 1
+# ifndef _STLP_NO_STATIC_TEMPLATE_DATA
+#  define  _STLP_NO_STATIC_TEMPLATE_DATA
+# endif
+# define  _STLP_STATIC_CONST_INIT_BUG 1
+# define  _STLP_NO_METHOD_SPECIALIZATION 1
+
+#  if !defined (__CYGWIN32__) 
+#   define _STLP_NESTED_TYPE_PARAM_BUG   1
+#   define _STLP_BASE_MATCH_BUG       1
+/*  unused operators are required (forward) */
+#   define  _STLP_CONST_CONSTRUCTOR_BUG 
+#   define _STLP_NO_DEFAULT_NON_TYPE_PARAM
+#  endif
+#   define _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX 1
+#   define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS 1
+#   define _STLP_NO_EXCEPTION_HEADER 1
+#  else /* ! <= 2.7.* */
+#  endif /* ! <= 2.7.* */
+
+/* static template data members workaround strategy for gcc tries
+ * to use weak symbols.
+ * if you don't want to use that, #define _STLP_WEAK_ATTRIBUTE=0 ( you'll
+ * have to put "#define __PUT_STATIC_DATA_MEMBERS_HERE" line in one of your
+ * compilation unit ( or CFLAGS for it ) _before_ including any STL header ).
+ */
+#   if defined (_STLP_NO_STATIC_TEMPLATE_DATA) && ! defined (_STLP_WEAK_ATTRIBUTE )
+/* systems using GNU ld or format that supports weak symbols
+   may use "weak" attribute
+   Linux & Solaris ( x86 & SPARC ) are being auto-recognized here */
+#    if defined(_STLP_GNU_LD) || defined(__ELF__) || defined (__CYGWIN__) || \
+     (( defined (__SVR4) || defined ( __svr4__ )) && \
+      ( defined (sun) || defined ( __sun__ )))
+#     define _STLP_WEAK_ATTRIBUTE 1
+#    endif
+#   endif /* _STLP_WEAK_ATTRIBUTE */
+
+
+/* strict ANSI prohibits "long long" ( gcc) */
+#  if defined ( __STRICT_ANSI__ )
+#    undef _STLP_LONG_LONG
+// #    define _STLP_STRICT_ANSI 1
+#  endif
+
+//# if !defined (__STRICT_ANSI__) || defined (__BUILDING_STLPORT)
+//#    define _STLP_USE_TEMPLATE_EXPORT
+//#    define _STLP_EXPORT_TEMPLATE_KEYWORD extern
+//#    define _STLP_IMPORT_TEMPLATE_KEYWORD extern
+//# endif
+
+#   ifndef __EXCEPTIONS
+#     undef  _STLP_HAS_NO_EXCEPTIONS
+#     define _STLP_HAS_NO_EXCEPTIONS  1
+#   endif
+
+# if (__GNUC__ >= 3)
+
+#  if ((__GNUC_MINOR__ == 0) || (__APPLE__))
+#   define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
+#   define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
+#  else
+#   if defined(__GNUC_PATCHLEVEL__) && (__GNUC_PATCHLEVEL__ > 0)
+#     define _STLP_NATIVE_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__
+#     define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__/backward
+#   else
+#     define _STLP_NATIVE_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__
+#     define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__/backward
+#   endif
+#  endif
+
+# elif (__GNUC_MINOR__ < 8)
+
+#  define _STLP_NO_OWN_IOSTREAMS 1
+#  undef  _STLP_OWN_IOSTREAMS
+#  define _STLP_NATIVE_INCLUDE_PATH ../g++-include
+
+/* tuning of static template data members workaround */
+#  if ( _STLP_STATIC_TEMPLATE_DATA < 1 )
+#   if ( _STLP_WEAK_ATTRIBUTE > 0 )
+#    define _STLP_WEAK __attribute__ (( weak ))
+#   else
+#    define _STLP_WEAK
+#   endif /* _STLP_WEAK_ATTRIBUTE */
+
+#   ifdef __PUT_STATIC_DATA_MEMBERS_HERE
+#    define __DECLARE_INSTANCE(type,item,init) type item _STLP_WEAK init
+#   else
+#    define __DECLARE_INSTANCE(type,item,init)
+#   endif /* __PUT_STATIC_DATA_MEMBERS_HERE */
+#  endif /* _STLP_STATIC_TEMPLATE_DATA */
+
+# else
+
+// gcc-2.95.0 used to use "g++-3" directory which has been changed to "g++" in
+// system-dependent "include" for 2.95.2 except for Cygwin and Mingw packages.
+// I expect "g++-3" not being used in later releases.
+// If your installation use "g++-3" include directory for any reason (pre-2.95.2 or Win binary kit),
+// please change the macro below to point to your directory. 
+
+# if defined(__DJGPP)
+#   define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
+# elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
+#   define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
+# elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) || defined (__OS2__) ) )
+#   define _STLP_NATIVE_INCLUDE_PATH ../g++-3
+# elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3) && !defined( __Lynx__ )
+// this really sucks, as GNUpro does not really identifies itself, so we have to guess 
+// depending on a platform
+#   ifdef __hpux
+#    define _STLP_NATIVE_INCLUDE_PATH ../g++-3
+#   else
+#    define _STLP_NATIVE_INCLUDE_PATH ../g++-2
+#   endif
+# else
+#   define _STLP_NATIVE_INCLUDE_PATH g++
+# endif
+
+// <exception> et al
+# ifdef __FreeBSD__
+#   if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ > 95)
+#     define _STLP_NATIVE_CPP_RUNTIME_INCLUDE_PATH ../include
+#   endif
+# else
+// azov
+#   ifdef __Lynx__ 
+#     define _STLP_NATIVE_CPP_RUNTIME_INCLUDE_PATH _STLP_NATIVE_INCLUDE_PATH
+#   else
+#    if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)
+// #     define _STLP_NATIVE_CPP_RUNTIME_INCLUDE_PATH ../g++-v3
+#   else
+#     define _STLP_NATIVE_CPP_RUNTIME_INCLUDE_PATH ../include
+#   endif
+#  endif
+# endif
+
+#endif /* GNUC_MINOR < 8 */
+
+# define _STLP_NATIVE_CPP_C_INCLUDE_PATH _STLP_NATIVE_INCLUDE_PATH
+# define _STLP_NATIVE_C_INCLUDE_PATH ../include
+
+
+#ifdef _SCO_ELF
+# define _STLP_SCO_OPENSERVER
+#     if defined(_REENTRANT)
+#           define _UITHREADS     /* if      UnixWare < 7.0.1 */
+#           define _STLP_UITHREADS
+#     endif /* _REENTRANT */
+#endif
+
+// Tune settings for the case where static template data members are not 
+// instaniated by default
+# if defined ( _STLP_NO_STATIC_TEMPLATE_DATA )
+#   define _STLP_STATIC_TEMPLATE_DATA 0
+#   if !defined ( _STLP_WEAK_ATTRIBUTE )
+#    define _STLP_WEAK_ATTRIBUTE 0
+#   endif
+#  ifdef __PUT_STATIC_DATA_MEMBERS_HERE
+#   define __DECLARE_INSTANCE(type,item,init) type item init
+#  else
+#   define __DECLARE_INSTANCE(type,item,init)
+#  endif
+# else
+#   define _STLP_STATIC_TEMPLATE_DATA 1
+# endif
+
+
+
+
diff --git a/main/source/stlport/stlport/config/stl_hpacc.h b/main/source/stlport/stlport/config/stl_hpacc.h
new file mode 100644
index 00000000..1e9d8e42
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_hpacc.h
@@ -0,0 +1,218 @@
+// STLport configuration file
+// It is internal STLport header - DO NOT include it directly
+
+// system C-library dependent
+#if defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 >= 4)
+# define _STLP_RAND48 1
+#endif
+// #  define _STLP_RAND48 1
+#  define _STLP_NO_NATIVE_MBSTATE_T      1
+#  define _STLP_HPACC_BROKEN_BUFEND       1
+#  define _STLP_WCHAR_HPACC_EXCLUDE      1
+
+// this was reported to help, just as with SUN CC 4.2
+# define _STLP_INLINE_STRING_LITERAL_BUG
+
+
+// specific prolog is needed to select correct threads impl
+#  define _STLP_HAS_SPECIFIC_PROLOG_EPILOG
+
+// HP aCC with +noeh
+#  ifdef __HPACC_NOEH
+#   define _STLP_HAS_NO_EXCEPTIONS 1
+#  endif
+
+// HP compilers
+// At that point, we only know we are on HP (and _not_ using gcc,
+// according to "stlcomp.h"
+
+// __HP_aCC indicate HP ANSI C++, but not always (03.xx does not
+// define it before 3.13, for example).
+//
+#  if defined(__HP_aCC)
+
+# if __HP_aCC < 33100
+#   define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../iostream
+# else
+#   define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../include/iostream
+# endif
+
+#   define _STLP_LONG_LONG long long
+
+#if (__HP_aCC <= 30000 && __HP_aCC >= 12100)
+
+//Special kludge to workaround bug in aCC A.01.23, CR JAGac40634
+#ifdef _STLP_DEBUG
+static void _STLP_dummy_literal() { const char *p = "x";}
+static void _STLP_dummy_literal_2() { const char *p = "123456789"; }
+static void _STLP_dummy_literal_3() { const char *p = "123456700000000000000089";}
+#endif
+
+#     define _STLP_HP_ACC                   0123
+#     define _STLP_NATIVE_INCLUDE_PATH       ../include
+#     define _STLP_NATIVE_C_INCLUDE_PATH     ../include
+#     define _STLP_NATIVE_CPP_C_INCLUDE_PATH ../include
+#     define _STLP_VENDOR_GLOBAL_STD         1
+#     define _STLP_VENDOR_GLOBAL_CSTD        1
+#     define _STLP_HAS_NO_NEW_IOSTREAMS      1
+#     define _STLP_DONT_THROW_RANGE_ERRORS   1
+#     define _STLP_STATIC_CONST_INIT_BUG 1
+#if (__HP_aCC  < 12700)
+//new flag: on most HP compilers cwchar is missing
+#     define _STLP_NO_CWCHAR
+#endif
+
+#     define _STLP_FORCE_ALLOCATORS(t,a) \
+  typedef typename _Alloc_traits<t,a>::_Orig _STLP_dummy_type1;\
+  typedef typename _STLP_dummy_type1:: _STLP_TEMPLATE rebind<t>::other _STLP_dummy_type2;
+
+#   endif /* 123 */
+
+// latest version and up
+#   if (__HP_aCC >= 32500 )
+#     define _STLP_HP_ACC                   0325
+
+#     define _STLP_FORCE_ALLOCATORS(t,a) \
+  typedef typename _Alloc_traits<t,a>::_Orig _STLP_dummy_type1;\
+  typedef typename _STLP_dummy_type1:: _STLP_TEMPLATE rebind<t>::other _STLP_dummy_type2;
+
+# if !defined( _INCLUDE__STDC_A1_SOURCE ) // HP-UX 11i only
+#  define _STLP_HAS_NO_UNIX98_WCHAR_EXTENSIONS
+# endif
+
+#    if defined(_HP_NAMESPACE_STD) // option -AA
+// from now, we have a full standard lib in namespace std
+//
+// -AA indicates that we are compiling against Rogue Wave 2.2.1
+// STL shipped with the HP aCC compiler. -AA tells the compiler
+// to use the STL defined in the include_std directory.
+//
+# define _STLP_NATIVE_INCLUDE_PATH ../include_std
+# define _STLP_NATIVE_C_INCLUDE_PATH ../include_std
+# define _STLP_NATIVE_CPP_C_INCLUDE_PATH ../include_std
+
+// #      define _STLP_HPACC_ONLY_NATIVE_STRING 1 // STLPort _string.c includes <locale>
+#     define _STLP_HP_ACC_COMPAT            -1
+#    else // option -Aa
+#     define _STLP_NATIVE_INCLUDE_PATH       ../include
+#     define _STLP_NATIVE_C_INCLUDE_PATH     ../include
+#     define _STLP_NATIVE_CPP_C_INCLUDE_PATH ../include
+#     define _STLP_VENDOR_GLOBAL_STD         1
+#     define _STLP_VENDOR_GLOBAL_CSTD        1
+#     define _STLP_HAS_NO_NEW_IOSTREAMS      1
+// Add the following in _site_config.h if "-Wc,-koenig_lookup,on" not used
+//#     define _STLP_NO_KOENIG_LOOKUP          1
+#     define _STLP_DONT_THROW_RANGE_ERRORS   1
+#    endif /* _NAMESPACE_STD */
+#   endif
+
+#   if (__HP_aCC >= 31400 && __HP_aCC < 32500)
+#     define _STLP_HP_ACC                   0314
+
+# define _STLP_FORCE_ALLOCATORS(t,a) \
+typedef typename _Alloc_traits<t,a>::_Orig _STLP_dummy_type1;\
+typedef typename _STLP_dummy_type1:: _STLP_TEMPLATE rebind<t>::other _STLP_dummy_type2;
+#     define _STLP_NO_CWCHAR
+#    if defined(_NAMESPACE_STD) // option -AA
+// from now, we have a full standard lib in namespace std
+#      define _STLP_NATIVE_INCLUDE_PATH       ../include_std
+#      define _STLP_NATIVE_C_INCLUDE_PATH     ../include_std
+#      define _STLP_NATIVE_CPP_C_INCLUDE_PATH ../include_std
+// #      define _STLP_HPACC_ONLY_NATIVE_STRING 1 // STLPort _string.c includes <locale>
+#     define _STLP_HP_ACC_COMPAT            -1
+#    else // kind of compatibility mode
+#     define _STLP_NATIVE_INCLUDE_PATH       ../include
+#     define _STLP_NATIVE_C_INCLUDE_PATH     ../include
+#     define _STLP_NATIVE_CPP_C_INCLUDE_PATH ../include
+#     define _STLP_VENDOR_GLOBAL_STD         1
+#     define _STLP_VENDOR_GLOBAL_CSTD        1
+#     define _STLP_HAS_NO_NEW_IOSTREAMS      1
+// comment if  "-Wc,-koenig_lookup,on" id used
+#     define _STLP_NO_KOENIG_LOOKUP          1
+#     define _STLP_DONT_THROW_RANGE_ERRORS   1
+#     define _STLP_NO_ROPE                   1
+#    endif /* _NAMESPACE_STD */
+#   endif /* 314 */
+
+#  if ((__HP_aCC >= 30000 && __HP_aCC < 31400) || (__HP_aCC == 1)) // A.03.13: __HP_aCC == 1
+
+#if (__HP_aCC != 1)
+#   define _STLP_HAS_NO_NEW_C_HEADERS 1
+#endif
+
+#   define _STLP_HAS_NO_NEW_IOSTREAMS
+#   define _STLP_NO_QUALIFIED_FRIENDS       1
+// aCC bug ? need explicit args on constructors of partial specialized
+// classes
+#   define _STLP_PARTIAL_SPEC_NEEDS_TEMPLATE_ARGS 1
+// ?? fbp: really needed ?
+#   define _STLP_STATIC_ARRAY_BUG 1
+// ?? fbp : maybe present in some versions ?
+#   define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1
+#   define _STLP_NO_MEMBER_TEMPLATE_KEYWORD 1
+// <exception> and stuff is in global namespace
+#   define _STLP_VENDOR_GLOBAL_EXCEPT_STD
+// fbp : moved here
+#     define _STLP_VENDOR_GLOBAL_CSTD        1
+// #     define _INCLUDE_HPUX_SOURCE
+#   define _XPG4
+#   define _INCLUDE_XOPEN_SOURCE
+#   define _INCLUDE_AES_SOURCE
+#  endif /* < 314 */
+#   if __HP_aCC == 1
+#     define _STLP_BROKEN_USING_IN_CLASS
+#     define _STLP_USING_BASE_MEMBER
+#     define _STLP_NO_CWCHAR
+// #     define _STLP_NO_WCHAR_T 1
+#   endif
+# endif /* HP_ACC */
+
+// 
+# ifndef __HP_aCC
+#  define _STLP_NATIVE_INCLUDE_PATH ../CC
+#  define _STLP_NATIVE_C_INCLUDE_PATH ../include
+// it is HP's old cfront-based compiler.
+#  define _STLP_NO_BOOL 1
+// #  define _STLP_DONT_USE_BOOL_TYPEDEF 1
+#  define _STLP_NO_NEW_NEW_HEADER 1 
+#  define _STLP_HAS_NO_NEW_IOSTREAMS 1
+#  define _STLP_LIMITED_DEFAULT_TEMPLATES 1
+#  define _STLP_NO_SIGNED_BUILTINS
+#  define _STLP_HAS_NO_NAMESPACES 1
+#  define _STLP_NEED_TYPENAME 1
+#  define _STLP_NEED_EXPLICIT 1
+#  define _STLP_NO_EXCEPTION_SPEC 1
+#  define _STLP_NONTEMPL_BASE_MATCH_BUG 1
+#  define _STLP_NO_ARROW_OPERATOR 1
+#  define _STLP_BASE_MATCH_BUG
+#  define _STLP_BASE_TYPEDEF_OUTSIDE_BUG 1
+#  define _STLP_NO_NEW_STYLE_CASTS 1
+// #  define _STLP_NO_WCHAR_T 1
+// #  define _STLP_LONG_LONG long long
+#  define _STLP_NEED_MUTABLE 1
+#  define _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX 1
+#  define _STLP_NO_BAD_ALLOC 1
+#  define _STLP_NO_MEMBER_TEMPLATES 1
+#  define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1
+#  define _STLP_NO_MEMBER_TEMPLATE_KEYWORD 1
+#  define _STLP_NO_FRIEND_TEMPLATES 1
+#  define _STLP_NO_QUALIFIED_FRIENDS 1
+#  define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION 1
+#  define _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER 1
+#  define _STLP_MEMBER_POINTER_PARAM_BUG 1
+#  define _STLP_NON_TYPE_TMPL_PARAM_BUG 1
+#  define _STLP_NO_DEFAULT_NON_TYPE_PARAM 1
+// #  define _STLP_NO_METHOD_SPECIALIZATION 1
+#  define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS 1
+#  define _STLP_NO_EXCEPTION_HEADER 1
+#  define _STLP_DEFAULT_CONSTRUCTOR_BUG 1
+#  define _STLP_HAS_NO_NEW_C_HEADERS 1
+// #  define _STLP_STATIC_CONST_INIT_BUG 1
+// #  define _STLP_THROW_RETURN_BUG 1
+// #  define _STLP_LINK_TIME_INSTANTIATION 1
+// #  define _STLP_NO_TEMPLATE_CONVERSIONS 1
+#  define _STLP_NO_TYPEINFO 1
+#  define _STLP_WCHAR_T_IS_USHORT 1
+
+# endif /* cfront */
+
diff --git a/main/source/stlport/stlport/config/stl_ibm.h b/main/source/stlport/stlport/config/stl_ibm.h
new file mode 100644
index 00000000..c38e8afb
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_ibm.h
@@ -0,0 +1,139 @@
+// STLport configuration file
+// It is internal STLport header - DO NOT include it directly
+
+#if !defined(__IBMCPP__) || (__IBMCPP__ < 500)
+# define _STLP_HAS_NO_NEW_C_HEADERS 1
+#endif
+
+// string literal problem, same as with SUN and aCC
+# define _STLP_INLINE_STRING_LITERAL_BUG 1
+# define _STLP_HAS_NATIVE_FLOAT_ABS
+
+#  define _STLP_DEFAULT_CONSTRUCTOR_BUG 1
+
+
+# ifdef __IBMCPP__
+#  define _STLP_HAS_SPECIFIC_PROLOG_EPILOG
+# endif
+
+// #  if ( defined (__MULTI__) && defined (__WINDOWS__))
+// #   define  _STLP_WIN32THREADS 1          // Only Visual Age 3.5 for Windows
+// #  endif
+
+#  if ( defined (__MULTI__) && defined (__OS2__))
+#   define _STLP_OS2THREADS 1
+#  endif
+
+// __TEMPINC__ is set when /Ft+ option is used
+#  ifdef __TEMPINC__
+#    define _STLP_LINK_TIME_INSTANTIATION 1
+#  endif
+
+# if defined (__MVS__)
+// long long support is buggy - reported by Tinny Ng
+// #  if __EXTENDED__ && __COMPILER_VER__ >= 0x22060000
+// #   define _STLP_LONG_LONG long long
+// #  endif
+// boris : hstash reported it can be treated like UNIX
+#  define _STLP_UNIX 1
+#  define _STLP_NO_TYPEINFO 1
+#  undef _STLP_NATIVE_INCLUDE_PATH
+#  define _STLP_NATIVE_INCLUDE_PATH /usr/lpp/ioclib/include
+// same for C headers like <string.h>
+#  undef _STLP_NATIVE_C_INCLUDE_PATH
+#  define _STLP_NATIVE_C_INCLUDE_PATH /usr/include
+#  define _STLP_NATIVE_CPP_RUNTIME_INCLUDE_PATH /usr/include
+
+# elif (defined (__WINDOWS__) || defined (_AIX) || defined (__OS2__) ) && (__IBMCPP__ >= 350)
+
+#  define _STLP_LONG_LONG long long
+
+#endif
+
+#if !( defined( __xlC__ ) && __xlC__ >= 0x500 )
+
+// AIX xlC 3.1 , 3.0.1 ==0x301
+// Visual Age C++ 3.x
+// OS-390 C++
+// fbp : should be more version-specific!
+
+#  define _STLP_NO_BOOL 1
+#  define _STLP_DONT_USE_BOOL_TYPEDEF 1
+#  define _STLP_LIMITED_DEFAULT_TEMPLATES 1
+#  define _STLP_HAS_NO_NAMESPACES 1
+#  define _STLP_NEED_TYPENAME 1
+#  define _STLP_NEED_EXPLICIT 1
+#  define _STLP_NO_ARROW_OPERATOR 1
+#  define _STLP_NO_NEW_STYLE_CASTS 1
+#  define _STLP_NO_WCHAR_T 1
+#  define _STLP_NEED_MUTABLE 1
+#  define _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX 1
+#  define _STLP_NO_BAD_ALLOC 1
+
+#  define _STLP_NO_MEMBER_TEMPLATES 1
+#  define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1
+#  define _STLP_NO_MEMBER_TEMPLATE_KEYWORD 1
+#  define _STLP_NO_FRIEND_TEMPLATES 1
+#  define _STLP_NO_QUALIFIED_FRIENDS 1
+#  define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION 1
+#  define _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER 1
+
+#  define _STLP_NO_DEFAULT_NON_TYPE_PARAM 1
+#  define _STLP_NO_METHOD_SPECIALIZATION 1
+#  define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS 1
+#  define _STLP_NO_EXCEPTION_HEADER 1
+
+#  define _STLP_HAS_NO_NEW_IOSTREAMS 1
+#  define _STLP_NO_NEW_NEW_HEADER 1
+
+#  if defined (__OS2__) && (__IBMCPP__ <= 350)
+#   define _STLP_NO_TYPEINFO 1
+#  endif
+#  define _STLP_NO_NEW_NEW_HEADER 1
+
+#  define _STLP_STATIC_CONST_INIT_BUG 1
+// #  define _STLP_THROW_RETURN_BUG 1
+
+
+#  define _STLP_NO_TEMPLATE_CONVERSIONS 1
+#  define _STLP_UNINITIALIZABLE_PRIVATE 1
+#  define _STLP_BASE_TYPEDEF_OUTSIDE_BUG 1
+#  define _STLP_STATIC_ARRAY_BUG 1
+
+// AIX xlC, Visual Age 3.0 for OS/2 and MS 
+#  define _STLP_TRIVIAL_DESTRUCTOR_BUG
+
+#  define _STLP_NON_TYPE_TMPL_PARAM_BUG 1
+#  define _STLP_NONTEMPL_BASE_MATCH_BUG 1
+
+#if __IBMCPP__ <= 350
+#  define _STLP_NEED_UNREACHABLE_RETURN 1
+#endif
+
+#if __IBMCPP__ < 350
+#  define _STLP_NO_LONG_DOUBLE 1
+#endif
+
+#if __IBMCPP__ >= 365
+// does not have new C headers, but has div()
+#  define _STLP_LDIV
+#endif
+
+#endif /* xlC 5 */
+
+/* detect xlC5 by: */
+#if defined(__IBMCPP__) && (500 <= __IBMCPP__) && (__IBMCPP__ < 700)
+// #define _STLP_USE_EXCEPTIONS 1
+# define _STLP_STATIC_CONST_INIT_BUG 1 
+//#pragma report(disable,CPPC1500029)
+// unsigned 32-bit integer type
+#  define _STLP_UINT32_T unsigned int
+#if defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 >= 4)
+# define _STLP_RAND48 1
+#endif
+// #  define _STLP_RAND48 1
+# endif /* __IBMCPP__ == 500 */
+
+
+
+
diff --git a/main/source/stlport/stlport/config/stl_icc.h b/main/source/stlport/stlport/config/stl_icc.h
new file mode 100644
index 00000000..7744881f
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_icc.h
@@ -0,0 +1,49 @@
+ /* stl_icc.h
+  * *
+  * * A list of Intel compiler for Linux portion of STLport settings.
+  * * This file is being included by stlcomp.h
+  * */
+# ifndef _STLP_ICC_H
+# define _STLP_ICC_H
+
+# define _STLP_UINT32_T unsigned long
+# define _STLP_LONG_LONG long long
+# define _STLP_TYPENAME_ON_RETURN_TYPE typename
+
+// Edit relative path below (or put full path) to get native
+// compiler headers included. Default is "../include".
+// C headers may reside in different directory, so separate macro is provided.
+# if (__INTEL_COMPILER < 800)
+# define _STLP_NATIVE_INCLUDE_PATH ../include
+# else
+// The header of files have moved to a new location on Linux Intel C++ compiler 
+// starting with version 8, which has GCC 3.2 compatability.
+# define _STLP_NATIVE_INCLUDE_PATH ../include/c++
+# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH _STLP_NATIVE_INCLUDE_PATH/backward
+#   ifndef __GNUC__ 
+//  If GCC compatability is diabled (-no-gcc is specified) STD needs to be redefined.
+#   define _STLP_REDEFINE_STD 1
+#   endif
+# endif
+# define _STLP_NATIVE_C_INCLUDE_PATH ../include
+# define _STLP_NATIVE_CPP_C_INCLUDE_PATH ../include
+
+// This macro constructs header path from directory and name.
+# define _STLP_MAKE_HEADER(path, header) <path/header>
+// This macro constructs native include header path from include path and name.
+# define _STLP_NATIVE_HEADER(header) _STLP_MAKE_HEADER(_STLP_NATIVE_INCLUDE_PATH,header)
+
+# define _STLP_NATIVE_CPP_C_HEADER(header) _STLP_MAKE_HEADER(_STLP_NATIVE_INCLUDE_PATH,header)
+
+// Same for C headers
+# define _STLP_NATIVE_C_HEADER(header) _STLP_MAKE_HEADER(_STLP_NATIVE_C_INCLUDE_PATH,header)
+
+# undef _STLP_WINCE
+
+# ifndef __GNUC__ 
+# define __GNUC__ 1
+# endif
+
+# define _STLP_NO_NATIVE_WIDE_FUNCTIONS 1
+# endif
+
diff --git a/main/source/stlport/stlport/config/stl_intel.h b/main/source/stlport/stlport/config/stl_intel.h
new file mode 100644
index 00000000..8b836b75
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_intel.h
@@ -0,0 +1,14 @@
+// STLport configuration file
+// It is internal STLport header - DO NOT include it directly
+
+# if (__ICL >= 450)
+#  define _STLP_DLLEXPORT_NEEDS_PREDECLARATION 1
+# endif
+
+# define _STLP_IMPORT_TEMPLATE_KEYWORD extern
+
+# include <config/stl_msvc.h>
+
+# undef  _STLP_LONG_LONG
+# define _STLP_LONG_LONG long long
+
diff --git a/main/source/stlport/stlport/config/stl_kai.h b/main/source/stlport/stlport/config/stl_kai.h
new file mode 100644
index 00000000..d2f59fe9
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_kai.h
@@ -0,0 +1,58 @@
+// STLport config file for KAI C++ compiler
+
+#if defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 >= 4)
+# define _STLP_RAND48 1
+#endif
+
+#  ifndef __KAI_STRICT /* _NO_LONGLONG */
+#   define _STLP_LONG_LONG long long
+#  endif
+
+#  if !defined (__EXCEPTIONS) && ! defined (_EXCEPTIONS)
+#    define _STLP_HAS_NO_EXCEPTIONS
+#  endif
+
+# ifndef __BUILDING_STLPORT
+#  define _STLP_LINK_TIME_INSTANTIATION 1
+# endif
+
+// two levels of macros do not work good with kcc.
+#   define _STLP_NATIVE_HEADER(header)    <../include/##header> 
+#   define _STLP_NATIVE_C_HEADER(header)    <../include/##header> 
+#   define _STLP_NATIVE_CPP_C_HEADER(header)    <../include/##header> 
+#   define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <../include/##header>
+
+# ifdef _WIN32
+#  define _STLP_MINIMUM_IMPORT_STD
+# endif
+
+// KAI C++ uses EDG front-end, but apparently different switches
+// #  define __EDG_SWITCHES 1
+
+
+#  define _STLP_VENDOR_GLOBAL_CSTD 1
+#  define _STLP_VENDOR_MB_NAMESPACE std
+
+// boris : some of those may also apply to KCC 3.4
+# if __KCC_VERSION < 4000
+#  define _STLP_VENDOR_GLOBAL_EXCEPT_STD 1
+
+# endif
+
+// this is multiplatform compiler, so here should go system-dependant section
+// This really should be in platform-specific files, like stl_solaris.h
+# ifdef __linux__
+#  define _STLP_NO_NATIVE_WIDE_STREAMS 1
+#  define _STLP_NO_NATIVE_WIDE_FUNCTIONS 1
+# elif defined (__sun) || defined (sun)
+// # define _STLP_VENDOR_MB_NAMESPACE
+#  include <config/stl_solaris.h>
+# elif defined (__hpux)
+#  define _STLP_NO_NATIVE_WIDE_FUNCTIONS
+# elif defined (__sgi)
+// this requires some discrimination on whether we are actually on 
+// a system officially supported by KAI. 
+#  define _STLP_HAS_NO_NEW_C_HEADERS 1
+#  include <standards.h>
+# endif
+
diff --git a/main/source/stlport/stlport/config/stl_mlc.h b/main/source/stlport/stlport/config/stl_mlc.h
new file mode 100644
index 00000000..601042e8
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_mlc.h
@@ -0,0 +1,8 @@
+// STLport configuration file
+// It is internal STLport header - DO NOT include it directly
+
+#define _STLP_NO_MEMBER_TEMPLATES           	// Compiler does not support member templates
+#define _STLP_NO_MEMBER_TEMPLATE_CLASSES    	// Compiler does not support member template classes
+
+#define _STLP_HAS_NEW_NEW_HEADER
+#define _STLP_HAS_NO_NEW_IOSTREAMS              // Native C++ library does not provide new-style templatized iostreams
diff --git a/main/source/stlport/stlport/config/stl_msvc.h b/main/source/stlport/stlport/config/stl_msvc.h
new file mode 100644
index 00000000..2a1b5b00
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_msvc.h
@@ -0,0 +1,207 @@
+// STLport configuration file
+// It is internal STLport header - DO NOT include it directly
+// Microsoft Visual C++ 4.0, 4.1, 4.2, 5.0, 6.0, 7.0, 7.1, ICL
+
+
+// Common features for VC++ 4.0 and higher
+# ifdef _M_IA64
+#  define _STLP_NATIVE_HEADER(x) <../crt/##x>
+#  define _STLP_NATIVE_C_HEADER(x) <../crt/##x>
+#  define _STLP_NATIVE_CPP_C_HEADER(x) <../crt/##x>
+#  define _STLP_NATIVE_OLD_STREAMS_HEADER(x) <../crt/##x>
+#  define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <../crt/##header>
+#  define _STLP_GLOBAL_NEW_HANDLER
+# else
+#  define _STLP_NATIVE_HEADER(x) <../include/##x>
+#  define _STLP_NATIVE_C_HEADER(x) <../include/##x>
+#  define _STLP_NATIVE_CPP_C_HEADER(x) <../include/##x>
+#  define _STLP_NATIVE_OLD_STREAMS_HEADER(x) <../include/##x>
+#  define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <../include/##header>
+# endif
+
+# define _STLP_CALL __cdecl
+
+# ifndef _STLP_LONG_LONG
+#  define _STLP_LONG_LONG  __int64
+# endif
+
+# define _STLP_PRAGMA_ONCE
+
+// these switches depend on compiler flags
+# ifndef _CPPUNWIND
+#  define _STLP_HAS_NO_EXCEPTIONS 1
+# endif
+
+# define _STLP_VENDOR_UNEXPECTED_STD
+
+# if defined ( _MT ) && !defined (_STLP_NO_THREADS)  && !defined (_REENTRANT)
+#   define _REENTRANT 1
+# endif
+
+# if !defined (_NATIVE_WCHAR_T_DEFINED)
+# define _STLP_WCHAR_T_IS_USHORT 1
+# endif
+
+# define _STLP_MINIMUM_IMPORT_STD
+
+# ifdef _STLP_MSVC
+
+# ifndef _STLP_MSVC50_COMPATIBILITY
+#  define _STLP_MSVC50_COMPATIBILITY   1
+# endif
+
+#  define _STLP_DLLEXPORT_NEEDS_PREDECLARATION 1
+
+// # ifndef __BUILDING_STLPORT
+// #  define _STLP_USE_TEMPLATE_EXPORT 1
+// # endif
+
+# if (_STLP_MSVC >= 1310)
+# define _STLP_NO_METHOD_SPECIALIZATION 1
+# endif	//	(_STLP_MSVC >= 1310)
+
+#  if (_STLP_MSVC > 1100)
+     typedef char __stl_char;
+#   define _STLP_DEFAULTCHAR __stl_char
+#  endif /* (_STLP_MSVC < 1100 ) */
+
+# if (_STLP_MSVC <= 1310)
+# define _STLP_STATIC_CONST_INIT_BUG   1
+# endif	//	(_STLP_MSVC <= 1310)
+
+# if (_STLP_MSVC <= 1300) 
+#  define _STLP_DEFAULT_CONSTRUCTOR_BUG 1
+#  define _STLP_HAS_SPECIFIC_PROLOG_EPILOG
+#  define _STLP_NO_TYPENAME_IN_TEMPLATE_HEADER
+// fails to properly resolve call to sin() from within sin()
+#  define _STLP_SAME_FUNCTION_NAME_RESOLUTION_BUG
+#  define _STLP_NO_TYPENAME_ON_RETURN_TYPE 1
+// boris : not defining this macro for SP5 causes other problems
+// #  if !defined (_MSC_FULL_VER) || (_MSC_FULL_VER < 12008804 )
+#  define _STLP_NO_USING_FOR_GLOBAL_FUNCTIONS 1
+//#  endif
+#  define _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER 1
+#  define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION 1
+#  define _STLP_NO_FRIEND_TEMPLATES
+// VC++ cannot handle default allocator argument in template constructors
+#  define _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS
+// there is no partial spec, and MSVC breaks on simulating it for iterator_traits queries
+#  define _STLP_USE_OLD_HP_ITERATOR_QUERIES
+// #  define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS 1
+#  define _STLP_NO_QUALIFIED_FRIENDS    1
+#  define _STLP_DONT_USE_BOOL_TYPEDEF 1
+# endif /* _STLP_MSVC <= 1300 */
+
+# endif /* _STLP_MSVC */
+
+# if (_MSC_VER <= 1310) 
+#  define _STLP_VENDOR_GLOBAL_CSTD
+// They included the necessary coding,
+// but the beta still has an issue with template classes
+// ok:    class a { static const int v = 2; };
+// error: template &lt;class _Tp> class a { static const int v = 2; };
+#  if !defined (_STLP_WHOLE_NATIVE_STD) && ! defined (_STLP_REDEFINE_STD)
+#    define _STLP_REDEFINE_STD
+#  endif
+# endif /* (_MSC_VER <= 1310) */
+
+# if (_MSC_VER <= 1200)  // including MSVC 6.0
+//  these work, as long they are inline
+#  define _STLP_INLINE_MEMBER_TEMPLATES 1
+#  define _STLP_NO_MEMBER_TEMPLATE_KEYWORD 1
+#  define _STLP_GLOBAL_NEW_HANDLER
+#  define _STLP_DONT_RETURN_VOID 1
+#  define _STLP_DONT_USE_NESTED_TCLASS_THROUGHT_TPARAM 1
+# endif /* (_MSC_VER <= 1200) */
+
+# if ( _MSC_VER<=1010 )
+// "bool" is reserved in MSVC 4.1 while <yvals.h> absent, so :
+// #    define _STLP_USE_ABBREVS           1
+#  define _STLP_NO_BAD_ALLOC
+#  define _STLP_HAS_NO_NEW_C_HEADERS 1
+#  define _STLP_NO_NEW_NEW_HEADER 1
+# elif (_MSC_VER < 1100)
+// VC++ 4.2 and higher
+#  define _STLP_YVALS_H 1
+#  define _STLP_HAS_NO_NEW_IOSTREAMS 1
+# endif /* 1010 */
+
+# if defined (_STLP_MSVC) && ( _STLP_MSVC < 1200 ) /* VC++ 6.0 */
+// #  define _STLP_NO_MEMBER_TEMPLATES 1
+// #  define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS 1
+#  define _STLP_NON_TYPE_TMPL_PARAM_BUG 1 
+#  define _STLP_THROW_RETURN_BUG 1
+#  define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1
+# endif
+
+# if defined (_STLP_MSVC) && ( _STLP_MSVC < 1100 )
+#  ifndef _STLP_NO_OWN_IOSTREAMS
+#   define _STLP_NO_OWN_IOSTREAMS
+#   undef  _STLP_OWN_IOSTREAMS
+#  endif
+// #  define _STLP_NESTED_TYPE_PARAM_BUG 1
+// Debug mode does not work for 4.2
+#  ifdef _STLP_DEBUG
+#   pragma message ("STLport debug mode does not work for VC++ 4.2, turning _STLP_DEBUG off ...")
+#    undef _STLP_DEBUG
+#  endif
+#  define _STLP_NO_BOOL            1
+#  define _STLP_NEED_TYPENAME      1
+#  define _STLP_NEED_EXPLICIT      1
+#   define _STLP_NEED_MUTABLE       1
+#   define _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX
+#   define _STLP_LIMITED_DEFAULT_TEMPLATES 1
+
+// up to 4.2, library is in global namespace
+#   define _STLP_VENDOR_GLOBAL_STD
+#   define _STLP_NONTEMPL_BASE_MATCH_BUG 1
+#   define _STLP_BROKEN_USING_DIRECTIVE  1
+#   define _STLP_NO_ARROW_OPERATOR
+#   define _STLP_NO_SIGNED_BUILTINS 1
+#   define _STLP_NO_EXCEPTION_SPEC 1
+#   undef  _STLP_DEFAULT_TYPE_PARAM
+#   undef  _STLP_HAS_NO_NAMESPACES
+#   undef  _STLP_NO_AT_MEMBER_FUNCTION
+#   undef  _STLP_NO_MEMBER_TEMPLATES
+#   undef  _STLP_NO_MEMBER_TEMPLATE_CLASSES
+#   define  _STLP_HAS_NO_NAMESPACES 1
+#   define  _STLP_NO_AT_MEMBER_FUNCTION 1
+#  define  _STLP_NO_MEMBER_TEMPLATES
+#  define  _STLP_NO_MEMBER_TEMPLATE_CLASSES
+# endif /* 1100 */
+
+// If we are under Windows CE, include appropriate config
+
+# ifdef UNDER_CE
+#   include <config/stl_wince.h>
+# endif
+
+# ifdef __ICL
+#  define _STLP_LIB_BASENAME "stlport_icl"
+# else
+# if (_MSC_VER >= 1310) 
+#   define _STLP_LIB_BASENAME "stlport_vc71"
+# elif (_MSC_VER >= 1300) 
+#   define _STLP_LIB_BASENAME "stlport_vc7"
+# elif (_MSC_VER >= 1200)
+#    define _STLP_LIB_BASENAME "stlport_vc6"
+//#   endif
+#  elif (_MSC_VER >= 1100)
+//#   ifdef _UNICODE
+//#    define _STLP_LIB_BASENAME "stlport_vc5_unicode"
+//#   else
+#    define _STLP_LIB_BASENAME "stlport_vc5"
+//#   endif
+#  endif /* (_MSC_VER >= 1200) */
+# endif /* __ICL */
+
+
+#    if (defined (__ICL) && (__ICL < 450)) || (_MSC_VER < 1200)
+//    only static STLport lib now works for ICL and VC 5.0
+#     undef  _STLP_USE_STATIC_LIB
+#     define _STLP_USE_STATIC_LIB
+//    disable hook which makes template symbols to be searched for in the library
+#     undef _STLP_NO_CUSTOM_IO
+#    endif
+
+#   include <config/vc_select_lib.h>
diff --git a/main/source/stlport/stlport/config/stl_mwerks.h b/main/source/stlport/stlport/config/stl_mwerks.h
new file mode 100644
index 00000000..ac5ddb06
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_mwerks.h
@@ -0,0 +1,140 @@
+// STLport configuration file
+// It is internal STLport header - DO NOT include it directly
+
+// Bring in definition of __MSL__ and related items
+#include <mslGlobals.h>
+#include <ansi_parms.h>
+
+//
+//  Compiler features
+//
+
+
+// *** CodeWarrior Compiler Common Features ***
+#  if __option(longlong)
+#   define _STLP_LONG_LONG	long long
+#  endif
+
+#  define _STLP_USE_UNIX_EMULATION_IO	1
+#  define _STLP_USE_AUTO_PTR_CONVERSIONS	1
+
+# ifdef __INTEL__
+#  define _STLP_LITTLE_ENDIAN
+# else
+#  define _STLP_BIG_ENDIAN
+# endif
+
+#if defined(_MSL_NO_LOCALE)
+#define _STLP_NO_IMPORT_LOCALE
+#endif
+#if !__option( wchar_type )
+# define _STLP_WCHAR_T_IS_USHORT
+#endif
+
+// *** CodeWarrior Compiler Common Bugs ***
+#  define __MSL_FIX_ITERATORS__(myType)		// Some MSL headers rely on this
+#  define _STLP_NO_FRIEND_TEMPLATES 1	// Bug mysteriously reintroduced in this version.
+#  define _STLP_THROW_RETURN_BUG	1
+
+//  *** Version-specific settings ***
+
+#  if __MWERKS__ >= 0x2405
+#   define _STLP_HAS_NATIVE_FLOAT_ABS
+#  endif
+
+#  if __MWERKS__ < 0x2405
+#   define _STLP_STATIC_CONST_INIT_BUG
+#  endif
+
+#  if __MWERKS__ <= 0x2303
+#   define _STLP_NO_TEMPLATE_CONVERSIONS	1
+#   define _STLP_NO_MEMBER_TEMPLATE_KEYWORD	1
+#  endif
+
+#  if __MWERKS__ < 0x2301
+#   define _STLP_MEMBER_SPECIALIZATION_BUG	1
+#  endif
+
+#  if __MWERKS__ < 0x2300		// CW Pro5 features
+#   define _STLP_INLINE_MEMBER_TEMPLATES 1
+#   define _STLP_RELOPS_IN_STD_BUG	 1
+#   define _STLP_DEFAULT_CONSTRUCTOR_BUG 1
+#   define _STLP_NO_TYPENAME_ON_RETURN_TYPE
+#  endif
+
+#  if __MWERKS__ < 0x2200		// CW Pro4 features
+#   define _STLP_BROKEN_USING_DIRECTIVE	1
+#   define _STLP_NO_MEMBER_TEMPLATES 1
+#   define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1
+#   define _STLP_NO_MEMBER_TEMPLATE_KEYWORD 1
+#   define _STLP_NO_FRIEND_TEMPLATES 1
+#   define _STLP_NO_QUALIFIED_FRIENDS 1
+#   define _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER 1
+#  endif
+
+#  if __MWERKS__ < 0x2100			// CW Pro3 features
+#   define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION 1
+#   define _STLP_HAS_NO_NAMESPACES 1
+#   define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS 1
+
+#   define _STLP_NEED_TYPENAME				1
+#   define _STLP_NO_ARROW_OPERATOR 1
+#   define _STLP_TEMPLATE_PARAM_SUBTYPE_BUG	1
+#   define _STLP_FORCED_INLINE_INSTANTIATION_BUG	1
+#   define _STLP_MULTI_CONST_TEMPLATE_ARG_BUG	1
+#   define _STLP_INLINE_NAME_RESOLUTION_BUG	1
+// *** Metrowerks Standard Library Bug ***
+#   define _STLP_MSVC50_COMPATIBILITY 1
+#  endif
+
+#  if __MWERKS__ < 0x2000			// v. 2.0 features
+#   define _STLP_NO_WCHAR_T 1
+#   define _STLP_NO_DEFAULT_NON_TYPE_PARAM 1
+#   define _STLP_NON_TYPE_TMPL_PARAM_BUG	1	// dwa 8/21/97 - this bug fixed for CWPro2
+#   define _STLP_UNINITIALIZABLE_PRIVATE  1		// dwa 10/23/97 - this bug fixed for CWPro2
+#  endif
+
+#  if __MWERKS__ < 0x1900         				// dwa 8/19/97 - 1.9 Compiler feature defines
+#   define _STLP_LIMITED_DEFAULT_TEMPLATES 1
+#   define _STLP_BASE_TYPEDEF_BUG        1
+#   define _STLP_BASE_MATCH_BUG   1
+#   define _STLP_NONTEMPL_BASE_MATCH_BUG 1
+#   define _STLP_DEFAULT_TYPE_PARAM  1			// More limited template parameters
+
+#   if __MWERKS__ < 0x1800
+    __GIVE_UP_WITH_STL(CW_18)
+#   endif
+
+#  endif
+
+
+// fixes to native inclusion wrappers. 
+# if __MWERKS__ >= 0x2300	// CWPro5 changes paths - dwa 2/28/99
+
+#  define _STLP_NATIVE_INCLUDE_PATH  ../include
+#  define _STLP_NATIVE_C_INCLUDE_PATH  ../include
+#  define _STLP_NATIVE_HEADER(header)     <../include/##header>  
+#  define _STLP_NATIVE_CPP_C_HEADER(header)     <../include/##header>
+#  define _STLP_NATIVE_C_HEADER(header)     <../include/##header>
+#  define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <../include/##header>
+
+# else
+
+#  define _STLP_NATIVE_INCLUDE_PATH  Macintosh HD:Codewarrior Pro 4:Metrowerks CodeWarrior:Metrowerks Standard Library:MSL C++:Include
+#  define _STLP_NATIVE_C_INCLUDE_PATH  Macintosh HD:Codewarrior Pro 4:Metrowerks CodeWarrior:Metrowerks Standard Library:MSL C:MSL Common:Public Includes
+#  define _STLP_NATIVE_HEADER(header)     <Macintosh HD:Codewarrior Pro 4:Metrowerks CodeWarrior:Metrowerks Standard Library:MSL C++:Include:##header>
+#  define _STLP_NATIVE_CPP_C_HEADER(header)     <Macintosh HD:Codewarrior Pro 4:Metrowerks CodeWarrior:Metrowerks Standard Library:MSL C++:Include:##header>
+#  define _STLP_NATIVE_C_HEADER(header)     <Macintosh HD:Codewarrior Pro 4:Metrowerks CodeWarrior:Metrowerks Standard Library:MSL C:MSL Common:Public Includes:##header>
+#   define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <Macintosh HD:Codewarrior Pro 4:Metrowerks CodeWarrior:Metrowerks Standard Library:MSL C:MSL Common:Public Includes:##header>
+
+# endif
+
+     // fbp
+# if !defined( __MSL_CPP__ ) || __MSL_CPP__ <= 0x4105
+#   define _STLP_NO_NATIVE_WIDE_STREAMS 1
+#  endif
+
+# define _STLP_LIB_BASENAME stlport_mwerks_x86
+# define _STLP_DLLEXPORT_NEEDS_PREDECLARATION 1
+
+// # include <config/vc_select_lib.h>
diff --git a/main/source/stlport/stlport/config/stl_mycomp.h b/main/source/stlport/stlport/config/stl_mycomp.h
new file mode 100644
index 00000000..2e80a37f
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_mycomp.h
@@ -0,0 +1,268 @@
+/*
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/*
+ * Purpose of this file :
+ *
+ * A list of COMPILER-SPECIFIC portion of STLport settings.
+ * This file is provided to help in manual configuration
+ * of STLport. This file is being included by stlcomp.h 
+ * when STLport is unable to identify your compiler.
+ * Please remove the error diagnostic below before adjusting 
+ * macros.
+ * 
+ */
+# ifndef _STLP_MYCOMP_H
+#  define  _STLP_MYCOMP_H
+
+# error "Your compiler version is not recognized by STLport. Please edit <config/stl_mycomp.h>"
+
+//==========================================================
+
+// the values choosen here as defaults try to give
+// maximum functionality on the most conservative settings
+
+// Mostly correct guess, change it for Alpha (and other environments
+// that has 64-bit "long")
+// #  define _STLP_UINT32_T unsigned long
+
+// Disables wchar_t functionality
+// #  define _STLP_NO_WCHAR_T  1
+
+// Define if wchar_t is not a unique type, and is actually a typedef to unsigned short. 
+// #  define _STLP_WCHAR_T_IS_USHORT 1
+
+// Uncomment if long long is available
+// #  define _STLP_LONG_LONG long long
+
+// Uncomment if long double is not available
+// #  define _STLP_NO_LONG_DOUBLE 1
+
+// Uncomment this if your compiler does not support "typename" keyword
+// #  define _STLP_NEED_TYPENAME 1
+
+// Uncomment this if your compiler does not support "mutable" keyword
+// #  define _STLP_NEED_MUTABLE 1
+
+// Uncomment this if your compiler does not support "explicit" keyword
+// #  define _STLP_NEED_EXPLICIT 1
+
+// Uncomment if new-style-casts like const_cast<> are not available
+// #  define _STLP_NO_NEW_STYLE_CASTS 1
+
+// Uncomment this if your compiler does not have "bool" type
+// #  define  _STLP_NO_BOOL 1
+
+// Uncomment this if your compiler does not have "bool" type, but has "bool" keyword reserved
+// #  define  _STLP_DONT_USE_BOOL_TYPEDEF 1
+
+// Uncomment this if your compiler does not have "bool" type, but defines "bool" in <yvals.h>
+// #  define  _STLP_YVALS_H 1
+
+// Uncomment this if your compiler has limited or no default template arguments for classes
+// #  define _STLP_LIMITED_DEFAULT_TEMPLATES 1
+
+// Uncomment this if your compiler support only complete (not dependent on other parameters)
+// types as default parameters for class templates
+// #  define _STLP_DEFAULT_TYPE_PARAM 1
+
+// Uncomment this if your compiler has problem with not-type
+// default template parameters
+// #  define _STLP_NO_DEFAULT_NON_TYPE_PARAM 1
+
+// Define if compiler has
+// trouble with functions getting non-type-parameterized classes as parameters
+// #  define _STLP_NON_TYPE_TMPL_PARAM_BUG 1
+
+// Uncomment this if your compiler lacks static data members.
+// Uncomment next line if your compiler supports __attribute__((weak))
+// #  define _STLP_NO_STATIC_TEMPLATE_DATA 1
+// #  define _STLP_WEAK_ATTRIBUTE 1
+
+// Uncomment this if your compiler does not support namespaces 
+// #  define _STLP_HAS_NO_NAMESPACES 1
+
+// Uncomment if "using" keyword does not work with template types 
+// # define _STLP_BROKEN_USING_DIRECTIVE 1
+
+// Uncomment this if your compiler does not support exceptions
+// #  define _STLP_HAS_NO_EXCEPTIONS 1
+
+// Uncomment this if your compiler does not support exception specifications
+// #  define _STLP_NO_EXCEPTION_SPEC
+
+// Define this if your compiler requires return statement after throw()
+// # define _STLP_THROW_RETURN_BUG 1
+
+// Define this if your compiler do not support return of void
+// # define _STLP_DONT_RETURN_VOID 1
+
+// Header <new> that comes with the compiler 
+// does not define bad_alloc exception
+// #  define _STLP_NO_BAD_ALLOC  1
+
+// Define this if your compiler do not throw bad_alloc from the new operator
+// #  define _STLP_NEW_DONT_THROW  1
+
+// Uncomment if member template methods are not available
+// #  define _STLP_NO_MEMBER_TEMPLATES   1
+
+// Uncomment if member template classes are not available
+// #  define _STLP_NO_MEMBER_TEMPLATE_CLASSES   1
+
+// Uncomment if you cannot access member template classe throught a class template parameter
+// # define _STLP_DONT_USE_NESTED_TCLASS_THROUGHT_TPARAM 1
+
+// Uncomment if no "template" keyword should be used with member template classes
+// #  define _STLP_NO_MEMBER_TEMPLATE_KEYWORD   1
+
+// Uncomment if friend member templates are not available
+// #  define _STLP_NO_FRIEND_TEMPLATES   1
+
+// Compiler does not accept friend declaration qualified with namespace name.
+// #  define _STLP_NO_QUALIFIED_FRIENDS 1
+
+// Uncomment if partial specialization is not available
+// #  define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION 1
+
+// Define if class being partially specialized require full name (template parameters)
+// of itself for method declarations
+// #  define _STLP_PARTIAL_SPEC_NEEDS_TEMPLATE_ARGS
+
+// Compiler has problems specializing members of partially 
+// specialized class
+// #  define _STLP_MEMBER_SPECIALIZATION_BUG
+
+// Uncomment if partial order of template functions is not available
+// #  define _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER 1
+
+// Uncomment if specialization of methods is not allowed
+// #  define _STLP_NO_METHOD_SPECIALIZATION  1
+
+// Uncomment if full  specialization does not use partial spec. syntax : template <> struct ....
+// #  define _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX  1
+
+// Uncomment if compiler does not support explicit template arguments for functions
+// # define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
+
+// Uncomment if "__typetraits is being instaniated automatically by the compiler (SGI only ?)
+// #  define _STLP_AUTOMATIC_TYPE_TRAITS 1
+
+// Uncomment this if your compiler can't inline while(), for()
+// #  define _STLP_LOOP_INLINE_PROBLEMS 1
+
+// Define if the compiler fails to match a template function argument of base
+// #  define _STLP_BASE_MATCH_BUG          1
+
+// Define if the compiler fails to match a template function argument of base
+// (non-template)
+//#  define  _STLP_NONTEMPL_BASE_MATCH_BUG 1
+
+// Define if the compiler rejects outline method definition 
+// explicitly taking nested types/typedefs
+// #  define _STLP_NESTED_TYPE_PARAM_BUG   1
+
+// Compiler requires typename keyword on outline method definition 
+// explicitly taking nested types/typedefs
+// #define  _STLP_TYPENAME_ON_RETURN_TYPE
+
+// Define if the baseclass typedefs not visible from outside
+// #  define _STLP_BASE_TYPEDEF_OUTSIDE_BUG 1
+
+// if your compiler have serious problems with typedefs, try this one
+// #  define _STLP_BASE_TYPEDEF_BUG          1
+
+// Uncomment if getting errors compiling mem_fun* adaptors
+// #  define _STLP_MEMBER_POINTER_PARAM_BUG 1
+
+// #  define _STLP_UNINITIALIZABLE_PRIVATE  1
+
+// Defined if the compiler
+// has trouble instantiating static array members with dimension defined as enum
+// # define _STLP_STATIC_ARRAY_BUG
+
+// * _STLP_STATIC_CONST_INIT_BUG: defined if the compiler can't handle a
+//   constant-initializer in the declaration of a static const data member
+//   of integer type.  (See section 9.4.2, paragraph 4, of the C++ standard.)
+// # define _STLP_STATIC_CONST_INIT_BUG
+
+// Define if default constructor for builtin integer type fails to initialize it to 0
+// #  define _STLP_DEFAULT_CONSTRUCTOR_BUG    1
+
+// Defined if constructor
+// required to explicitly call member's default constructors for const objects
+// #  define _STLP_CONST_CONSTRUCTOR_BUG    1
+
+// Defined if the compiler has trouble calling POD-types constructors/destructors
+// #  define _STLP_TRIVIAL_CONSTRUCTOR_BUG    1
+// #  define _STLP_TRIVIAL_DESTRUCTOR_BUG    1
+
+// Define if having problems specializing maps/sets with
+// key type being const 
+// #  define _STLP_MULTI_CONST_TEMPLATE_ARG_BUG
+
+// Uncomment this to disable -> operators on all iterators
+// #  define   _STLP_NO_ARROW_OPERATOR 1
+
+// Uncomment this to disble at() member functions for containers
+// #  define   _STLP_NO_AT_MEMBER_FUNCTION 1
+
+// Uncomment if native new-style iostreams are not available
+// #define    _STLP_HAS_NO_NEW_IOSTREAMS	1
+
+// Define this if compiler lacks <exception> header
+// #  define _STLP_NO_EXCEPTION_HEADER 1
+
+// Uncomment this if your C library has lrand48() function
+// #  define _STLP_RAND48 1
+
+// Uncomment if native new-style C library headers lile <cstddef>, etc are not available.
+// #   define _STLP_HAS_NO_NEW_C_HEADERS 1
+
+// uncomment if new-style headers <new> is available
+// #  define _STLP_HAS_NEW_NEW_HEADER 1
+
+// uncomment this if <iostream> and other STD headers put their stuff in ::namespace,
+// not std::
+// #  define _STLP_VENDOR_GLOBAL_STD
+
+// uncomment this if <cstdio> and the like put stuff in ::namespace,
+// not std::
+// #  define _STLP_VENDOR_GLOBAL_CSTD
+
+// Edit relative path below (or put full path) to get native 
+// compiler headers included. Default is "../include".
+// C headers may reside in different directory, so separate macro is provided.
+// Hint : never install STLport in the directory that ends with "include"
+// # define _STLP_NATIVE_INCLUDE_PATH ../include
+// # define _STLP_NATIVE_C_INCLUDE_PATH ../include
+// # define _STLP_NATIVE_CPP_C_INCLUDE_PATH ../include
+
+// This macro constructs header path from directory and name.
+// You may change it if your compiler does not understand "/". 
+// #  define _STLP_MAKE_HEADER(path, header) <path/header>
+
+// This macro constructs native include header path from include path and name.
+// You may have do define it if experirncing problems with preprocessor
+// # define _STLP_NATIVE_HEADER(header) _STLP_MAKE_HEADER(_STLP_NATIVE_INCLUDE_PATH,header)
+
+// Same for C headers
+// #define _STLP_NATIVE_C_HEADER(header)
+
+//==========================================================
+# endif
diff --git a/main/source/stlport/stlport/config/stl_sco.h b/main/source/stlport/stlport/config/stl_sco.h
new file mode 100644
index 00000000..1876387b
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_sco.h
@@ -0,0 +1,35 @@
+// SCO UDK 7 compiler (UnixWare 7x, OSR 5, UnixWare 2x)
+
+
+#  define _STLP_NO_BAD_ALLOC 1
+
+// allocator::rebind used not to work properly
+// #  define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1
+// #  define _STLP_NO_MEMBER_TEMPLATE_KEYWORD 1
+
+#  define _STLP_NO_FRIEND_TEMPLATES 1
+#  define _STLP_NO_QUALIFIED_FRIENDS 1
+
+
+// #  define _STLP_NO_DEFAULT_NON_TYPE_PARAM 1
+
+//#  define _STLP_HAS_NO_NEW_IOSTREAMS 1
+//#  define _STLP_HAS_NO_NEW_C_HEADERS 1
+
+// ???
+//#  define _STLP_STATIC_CONST_INIT_BUG 1
+
+// ???
+//#  define _STLP_LINK_TIME_INSTANTIATION 1
+
+// ???
+#  define _STLP_NO_TEMPLATE_CONVERSIONS 1
+
+#     define _STLP_LONG_LONG long long
+
+#     if defined(_REENTRANT)
+#           define _UITHREADS     /* if      UnixWare < 7.0.1 */
+#           define _STLP_UITHREADS
+#     endif /* _REENTRANT */
+
+# define _STLP_SCO_OPENSERVER
diff --git a/main/source/stlport/stlport/config/stl_select_lib.h b/main/source/stlport/stlport/config/stl_select_lib.h
new file mode 100644
index 00000000..f121eed1
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_select_lib.h
@@ -0,0 +1,36 @@
+# if !defined (_STLP_NO_OWN_IOSTREAMS)
+
+#  if ! defined (_STLP_LIB_STATIC_SUFFIX)
+#   define _STLP_LIB_STATIC_SUFFIX ""
+#  endif
+
+// Note : the code below is intended to make use of compiled
+// STLport iostreams easier. If you are with to change names used for
+// STLport libraries , please also change RELEASE_NAME and DEBUG_NAME
+// macros in makefile ../../src/vc6.mak (or whatever .mak you are using to build
+// STLport). If you are using binaries, you may just rename the binaries.
+#    if ! defined (__BUILDING_STLPORT) && ! defined (_STLP_DONT_FORCE_MSVC_LIB_NAME)
+#     if defined (_STLP_USE_DECLSPEC)
+#      ifdef _STLP_DEBUG
+#       pragma comment(lib, _STLP_LIB_BASENAME"_stldebug.lib")
+#      elif (defined (_DEBUG) || defined (__DEBUG)) && defined (_STLP_USE_DEBUG_LIB)
+#       pragma comment(lib, _STLP_LIB_BASENAME"_debug.lib")
+#      else
+#       pragma comment(lib, _STLP_LIB_BASENAME".lib")
+#      endif
+#     else /* _STLP_USE_DECLSPEC */
+// fbp : for static linking, debug setting _MUST_ correspond to what
+// has been compiled into binary lib
+#      ifdef _STLP_DEBUG
+#       if (! defined (_DEBUG))
+#        error "For static link with STLport library, _DEBUG setting MUST be on when _STLP_DEBUG is on. (/MTd forces _DEBUG)"
+#       endif
+#       pragma comment(lib, _STLP_LIB_BASENAME"_stldebug"_STLP_LIB_STATIC_SUFFIX".lib")
+#      elif (defined (_DEBUG) || defined (__DEBUG)) && defined (_STLP_USE_DEBUG_LIB)
+#       pragma comment(lib, _STLP_LIB_BASENAME"_debug"_STLP_LIB_STATIC_SUFFIX".lib")
+#      else
+#       pragma comment(lib, _STLP_LIB_BASENAME""_STLP_LIB_STATIC_SUFFIX".lib")
+#      endif
+#     endif /* _STLP_USE_DECLSPEC */
+#    endif /* __BUILDING_STLPORT */
+#   endif /* _STLP_OWN_IOSTREAMS */
diff --git a/main/source/stlport/stlport/config/stl_sgi.h b/main/source/stlport/stlport/config/stl_sgi.h
new file mode 100644
index 00000000..b164bdef
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_sgi.h
@@ -0,0 +1,94 @@
+// STLport configuration file
+// It is internal STLport header - DO NOT include it directly
+
+# define _STLP_HAS_SPECIFIC_PROLOG_EPILOG
+
+// define native include path before trying to include anything
+
+# define _STLP_NATIVE_HEADER(__x) </usr/include/CC/##__x>
+# define _STLP_NATIVE_C_HEADER(__x) </usr/include/##__x>
+# define _STLP_NATIVE_OLD_STREAMS_HEADER(__x) </usr/include/CC/##__x> 
+# define _STLP_NATIVE_CPP_C_HEADER(__x) </usr/include/CC/##__x>
+# define _STLP_NATIVE_CPP_RUNTIME_HEADER(__x) </usr/include/CC/##__x>
+
+# define _STLP_NO_NATIVE_MBSTATE_T
+
+#define _STLP_NO_CSTD_FUNCTION_IMPORTS
+#define _STLP_NO_NATIVE_WIDE_FUNCTIONS
+#define _STLP_NO_MEMBER_TEMPLATE_CLASSES
+
+// #define _STLP_NO_BAD_ALLOC
+
+#define _STL_HAS_NAMESPACES
+
+#if ! defined (__EXCEPTIONS) && ! defined (_STLP_NO_EXCEPTIONS)
+# define _STLP_NO_EXCEPTIONS
+#endif
+
+// #define _STLP_NOTHROW throw()
+     
+#  define __EDG_SWITCHES
+
+// any version ???
+#  define _STLP_AUTOMATIC_TYPE_TRAITS 1
+
+#  define _STLP_USE_SGI_STRING         1
+
+#  define _STLP_HAS_NO_NEW_C_HEADERS 1
+// #  define _STLP_VENDOR_GLOBAL_EXCEPT_STD
+
+// # if ! defined (_STLP_NO_OWN_IOSTREAMS) && ! defined (_STLP_NO_NEW_IOSTREAMS)
+#  define _STLP_NO_POST_COMPATIBLE_SECTION
+// # endif
+
+#  include <standards.h>
+
+# if !(_COMPILER_VERSION >= 730)
+#   define _STLP_NO_NEW_NEW_HEADER 1
+# endif
+
+# if (_COMPILER_VERSION >= 730 && defined(_STANDARD_C_PLUS_PLUS))
+#  define _STLP_EXTERN_RANGE_ERRORS
+# endif
+
+#   if !defined(_BOOL)
+#     define _STLP_NO_BOOL
+#   endif
+#   if defined(_MIPS_SIM) && _MIPS_SIM == _ABIO32
+#     define _STLP_STATIC_CONST_INIT_BUG
+#   endif
+
+#   if (_COMPILER_VERSION < 720) || (defined(_MIPS_SIM) && _MIPS_SIM == _ABIO32)
+#     define _STLP_DEFAULT_CONSTRUCTOR_BUG
+#   endif
+#   if !((_COMPILER_VERSION >= 730) && defined(_MIPS_SIM) && _MIPS_SIM != _ABIO32)
+#     define _STLP_NO_MEMBER_TEMPLATE_KEYWORD
+#   endif
+#   if !defined(_STANDARD_C_PLUS_PLUS)
+#     define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
+#   endif
+#   if !((_COMPILER_VERSION >= 721) && defined(_NAMESPACES))
+#     define _STLP_HAS_NO_NAMESPACES
+#   endif 
+#   if (_COMPILER_VERSION < 721) || !defined(_STL_HAS_NAMESPACES) || defined(_STLP_NO_NAMESPACES)
+#     define _STLP_NO_EXCEPTION_HEADER
+#   endif
+#   if _COMPILER_VERSION < 730 || !defined(_STANDARD_C_PLUS_PLUS) || !defined(_NAMESPACES)
+#     define _STLP_NO_BAD_ALLOC
+#   endif
+#   if defined(_LONGLONG) && defined(_SGIAPI) && _SGIAPI
+#     define _STLP_LONG_LONG long long
+#   endif
+#   if !(_COMPILER_VERSION >= 730 && defined(_STANDARD_C_PLUS_PLUS))
+#     define _STLP_HAS_NO_NEW_IOSTREAMS
+#   endif
+#   if !(_COMPILER_VERSION >= 730 && defined(_STANDARD_C_PLUS_PLUS))
+#     define _STLP_NO_AT_MEMBER_FUNCTION
+#   endif
+// #   if !(_COMPILER_VERSION >= 730 && defined(_STANDARD_C_PLUS_PLUS))
+#   if !(_COMPILER_VERSION >= 721 && defined(_STANDARD_C_PLUS_PLUS))
+#     define _STLP_NO_TEMPLATE_CONVERSIONS
+#   endif
+#   if !((_COMPILER_VERSION >= 730) && defined(_MIPS_SIM) && _MIPS_SIM != _ABIO32)
+#     define _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER
+#   endif
diff --git a/main/source/stlport/stlport/config/stl_solaris.h b/main/source/stlport/stlport/config/stl_solaris.h
new file mode 100644
index 00000000..e58e4164
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_solaris.h
@@ -0,0 +1,35 @@
+
+// include system features file
+# include <sys/feature_tests.h>
+
+// system-dependent defines 
+
+# if defined (__SunOS_5_8) && ! defined (_STLP_HAS_NO_NEW_C_HEADERS) && ( __cplusplus >= 199711L)
+#  define _STLP_HAS_NATIVE_FLOAT_ABS
+# endif
+
+#if defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 >= 4)
+# define _STLP_RAND48 1
+#endif
+
+#if (defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 == 4)) || defined (__SunOS_5_6)
+# define _STLP_WCHAR_SUNPRO_EXCLUDE 1
+# define _STLP_NO_NATIVE_WIDE_FUNCTIONS 1
+#endif
+
+// boris : this should always be defined for Solaris 5 & 6. Any ideas how to do it ?
+# if !(defined ( __KCC ) && __KCC_VERSION > 3400 ) && \
+  ((defined(__SunOS_5_5_1) || defined(__SunOS_5_6) ))
+#  ifndef _STLP_NO_NATIVE_MBSTATE_T
+#   define _STLP_NO_NATIVE_MBSTATE_T 1
+#  endif
+# endif /* KCC */
+
+// For SPARC we use lightweight synchronization
+# if defined (__sparc) /* && (defined (_REENTRANT) || defined (_PTHREADS)) */ \ && ((defined (__GNUC__) && defined (__sparc_v9__)) || \
+(defined (__sparcv9) && ! defined (_STLP_NO_OWN_IOSTREAMS)) ) \
+&& !defined(_NOTHREADS) && ! defined (_STLP_NO_SPARC_SOLARIS_THREADS)
+# define _STLP_SPARC_SOLARIS_THREADS
+# define _STLP_THREADS_DEFINED
+# endif
+
diff --git a/main/source/stlport/stlport/config/stl_sunpro.h b/main/source/stlport/stlport/config/stl_sunpro.h
new file mode 100644
index 00000000..cd04eb39
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_sunpro.h
@@ -0,0 +1,175 @@
+// STLport configuration file
+// It is internal STLport header - DO NOT include it directly
+
+#  define _STLP_LONG_LONG  long long
+#  define _STLP_LINK_TIME_INSTANTIATION 1
+
+# if ! defined(_BOOL)
+#  define _STLP_NO_BOOL 1
+# endif
+
+#  if (__SUNPRO_CC >= 0x500 ) && (!defined (__SUNPRO_CC_COMPAT) || (__SUNPRO_CC_COMPAT == 5 )) \
+    && defined (_STLP_NO_OWN_IOSTREAMS) && ! defined (_STLP_HAS_NO_NEW_IOSTREAMS)
+#    error "The wrapper (_STLP_NO_OWN_IOSTREAMS) mode does not work well without _STLP_HAS_NO_NEW_IOSTREAMS. Please set this flag. You will also have to use -liostream option on link phase."
+// #   define _STLP_HAS_NO_NEW_IOSTREAMS
+#  endif
+
+// compatibility mode stuff
+# if (__SUNPRO_CC >= 0x510) && (!defined (__SUNPRO_CC_COMPAT) || (__SUNPRO_CC_COMPAT == 5 ))
+#  define _STLP_NATIVE_INCLUDE_PATH ../CC/Cstd
+#  define _STLP_NATIVE_CPP_RUNTIME_INCLUDE_PATH ../CC
+# elif (__SUNPRO_CC >= 0x500) && (!defined (__SUNPRO_CC_COMPAT) || (__SUNPRO_CC_COMPAT == 5 ))
+#  define _STLP_NATIVE_INCLUDE_PATH ../CC
+# elif (defined (__SUNPRO_CC_COMPAT) && __SUNPRO_CC_COMPAT == 4)
+#  define _STLP_NATIVE_INCLUDE_PATH ../CC4
+# else
+#  define _STLP_NATIVE_INCLUDE_PATH ../CC
+# endif
+
+#  if (__SUNPRO_CC >= 0x500 ) && ( defined (_STLP_NO_NEW_IOSTREAMS) || defined (_STLP_HAS_NO_NEW_IOSTREAMS) )
+// if the project is set up to use libiostream (_STLP_NO_NEW_IOSTREAMS should be defined then),
+// use classic iostreams
+#   define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../CCios
+#  endif
+
+#  define _STLP_STATIC_CONST_INIT_BUG 1
+
+# if (__SUNPRO_CC < 0x530)
+// those are tested and proved not to work...
+#  define _STLP_STATIC_ARRAY_BUG 1
+#  define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION 1
+#  define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1
+#  define _STLP_USE_OLD_HP_ITERATOR_QUERIES
+# endif 
+
+
+# if defined (_STLP_OWN_IOSTREAMS)
+//#  if ! defined (_STLP_NO_OWN_NAMESPACE)
+//#   define _STLP_NO_OWN_NAMESPACE
+//#  endif
+# else
+#  define _STLP_HAS_NO_NEW_C_HEADERS 1
+# endif
+
+// those do not depend on compatibility
+# if (__SUNPRO_CC < 0x510)
+#  define _STLP_NO_TYPENAME_ON_RETURN_TYPE 1 
+#  define _STLP_NONTEMPL_BASE_MATCH_BUG 1
+# endif
+
+# if (__SUNPRO_CC < 0x510) || (defined (__SUNPRO_CC_COMPAT) && (__SUNPRO_CC_COMPAT < 5))
+
+#  define _STLP_NO_QUALIFIED_FRIENDS 1
+
+// no partial , just for explicit one
+#  define _STLP_PARTIAL_SPEC_NEEDS_TEMPLATE_ARGS
+#  define _STLP_NON_TYPE_TMPL_PARAM_BUG 1
+
+#  define _STLP_NO_MEMBER_TEMPLATES 1
+#  define _STLP_NO_FRIEND_TEMPLATES 1
+
+#  define _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER 1
+#  define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
+#  define _STLP_NO_MEMBER_TEMPLATE_KEYWORD 1
+# endif
+
+// Features that depend on compatibility switch
+# if ( __SUNPRO_CC < 0x500 ) || (defined (__SUNPRO_CC_COMPAT) && (__SUNPRO_CC_COMPAT < 5))
+
+#  ifndef _STLP_HAS_NO_NEW_IOSTREAMS
+#   define _STLP_HAS_NO_NEW_IOSTREAMS 1
+#  endif
+#  define _STLP_NO_NEW_NEW_HEADER 1
+// #  define _STLP_NO_RELOPS_NAMESPACE
+#  define _STLP_HAS_NO_NAMESPACES 1
+#  define _STLP_NEED_MUTABLE  1
+#  define _STLP_NO_BAD_ALLOC 1
+#  define _STLP_NO_EXCEPTION_HEADER 1
+#  define _STLP_NATIVE_C_INCLUDE_PATH ../include
+# elif (__SUNPRO_CC < 0x510)
+// #  define _STLP_NATIVE_C_HEADER(header) <../CC/##header##.SUNWCCh>
+#  define _STLP_NATIVE_CPP_C_HEADER(header) <../CC/##header##.SUNWCCh>
+#  define _STLP_NATIVE_C_INCLUDE_PATH /usr/include
+# elif defined( __SunOS_5_5_1 ) || defined( __SunOS_5_6 ) || defined( __SunOS_5_7 )
+#  define _STLP_NATIVE_C_INCLUDE_PATH ../CC/std
+#  define _STLP_NATIVE_CPP_C_INCLUDE_PATH ../CC/std
+# else
+#  define _STLP_NATIVE_C_INCLUDE_PATH /usr/include
+#  define _STLP_NATIVE_CPP_C_INCLUDE_PATH ../CC/std
+# endif
+
+
+
+#  if ( __SUNPRO_CC < 0x500 )
+
+# undef _STLP_NATIVE_C_HEADER
+# undef _STLP_NATIVE_CPP_C_HEADER
+
+#   define wint_t __wint_t 
+// famous CC 4.2 bug
+#   define _STLP_INLINE_STRING_LITERAL_BUG 1
+// /usr/include
+#   define _STLP_NATIVE_C_INCLUDE_PATH ../include
+
+// 4.2 cannot handle iterator_traits<_Tp>::iterator_category as a return type ;(
+#  define _STLP_USE_OLD_HP_ITERATOR_QUERIES
+
+// 4.2 does not like it
+#  undef  _STLP_PARTIAL_SPEC_NEEDS_TEMPLATE_ARGS
+
+#  define _STLP_LIMITED_DEFAULT_TEMPLATES 1
+
+#  define _STLP_NEED_TYPENAME 1
+#  define _STLP_NEED_EXPLICIT 1
+#  define _STLP_UNINITIALIZABLE_PRIVATE 1
+#  define _STLP_NO_BAD_ALLOC 1
+#  define _STLP_NO_ARROW_OPERATOR 1
+
+#  define _STLP_DEFAULT_CONSTRUCTOR_BUG 1
+#  define _STLP_GLOBAL_NESTED_RETURN_TYPE_PARAM_BUG 1
+#  undef  _STLP_HAS_NO_NEW_C_HEADERS
+#  define _STLP_HAS_NO_NEW_C_HEADERS 1
+// #  define _STLP_DONT_SIMULATE_PARTIAL_SPEC_FOR_TYPE_TRAITS
+
+#   if ( __SUNPRO_CC < 0x420 )
+#    define _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX 1
+#    define _STLP_NO_NEW_STYLE_CASTS 1
+#    define _STLP_NO_METHOD_SPECIALIZATION 1
+#    if ( __SUNPRO_CC > 0x401 )
+#     if (__SUNPRO_CC==0x410)
+#      define _STLP_BASE_TYPEDEF_OUTSIDE_BUG  1
+#     endif
+#    else
+   // SUNPro C++ 4.0.1
+#     define _STLP_BASE_MATCH_BUG          1
+#     define _STLP_BASE_TYPEDEF_BUG        1
+#      if ( __SUNPRO_CC < 0x401 )
+        __GIVE_UP_WITH_STL(SUNPRO_401)
+#      endif
+#    endif /* 4.0.1 */
+#   endif /* 4.2 */
+
+#  endif /* <  5.0 */
+
+# include <config/stl_solaris.h>
+
+#ifndef _MBSTATET_H
+#   define _MBSTATET_H
+#   undef _MBSTATE_T
+#   define _MBSTATE_T
+    typedef struct __mbstate_t {
+      #if defined(_LP64)
+        long    __filler[4];
+      #else
+        int     __filler[6];
+      #endif
+    } __mbstate_t;
+# ifndef _STLP_HAS_NO_NAMESPACES
+    namespace std {
+        typedef __mbstate_t     mbstate_t;
+    }
+    using std::mbstate_t;
+#else
+typedef __mbstate_t mbstate_t;
+# endif
+#endif  /* __MBSTATET_H */
diff --git a/main/source/stlport/stlport/config/stl_symantec.h b/main/source/stlport/stlport/config/stl_symantec.h
new file mode 100644
index 00000000..312b989f
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_symantec.h
@@ -0,0 +1,42 @@
+// STLport configuration file
+// It is internal STLport header - DO NOT include it directly
+
+// if not using maximum ANSI compatibility ( -A -Ab -Aw),
+// uncomment the following two lines:
+//#  define _STLP_NO_BOOL 1
+//#  define _STLP_NO_WCHAR_T 1
+
+
+#  define _STLP_HAS_NO_NAMESPACES 1
+
+#  define _STLP_NEED_TYPENAME 1
+#  define _STLP_NEED_EXPLICIT 1
+#  define _STLP_NO_NEW_STYLE_CASTS 1
+#  define _STLP_NEED_MUTABLE 1
+#  define _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX 1
+// #  define _STLP_NO_BAD_ALLOC 1
+
+#  define _STLP_NO_MEMBER_TEMPLATES 1
+#  define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1
+#  define _STLP_NO_MEMBER_TEMPLATE_KEYWORD 1
+#  define _STLP_NO_FRIEND_TEMPLATES 1
+#  define _STLP_NO_QUALIFIED_FRIENDS 1
+#  define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION 1
+#  define _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER 1
+
+// #  define _STLP_NO_DEFAULT_NON_TYPE_PARAM 1
+#  define _STLP_NO_METHOD_SPECIALIZATION 1
+#  define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS 1
+// #  define _STLP_NO_EXCEPTION_HEADER 1
+
+#  define _STLP_HAS_NO_NEW_IOSTREAMS 1
+#  define _STLP_HAS_NO_NEW_C_HEADERS 1
+
+#  define _STLP_STATIC_CONST_INIT_BUG 1
+#  define _STLP_THROW_RETURN_BUG 1
+// #  define _STLP_LINK_TIME_INSTANTIATION 1
+#  define _STLP_NO_TEMPLATE_CONVERSIONS 1
+
+#  define _STLP_NON_TYPE_TMPL_PARAM_BUG 1
+#  define _STLP_UNINITIALIZABLE_PRIVATE 1
+
diff --git a/main/source/stlport/stlport/config/stl_watcom.h b/main/source/stlport/stlport/config/stl_watcom.h
new file mode 100644
index 00000000..f0d1e04a
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_watcom.h
@@ -0,0 +1,152 @@
+// STLport configuration file
+// It is internal STLport header - DO NOT include it directly
+
+# ifndef _STLP_NO_OWN_IOSTREAMS 
+#  define _STLP_NO_OWN_IOSTREAMS
+# endif
+
+# define _STLP_NO_RELOPS_NAMESPACE
+# define _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX
+
+#  define _STLP_HAS_SPECIFIC_PROLOG_EPILOG
+#  define _STLP_DONT_SIMULATE_PARTIAL_SPEC_FOR_TYPE_TRAITS
+#  define _STLP_USE_OLD_HP_ITERATOR_QUERIES
+
+// On QNX, headers are supposed to be found in /usr/include,
+// so default "../include" should work.
+# ifndef __QNX__
+#  define _STLP_NATIVE_INCLUDE_PATH ../h
+# endif
+
+// Inline replacements for locking calls under Watcom
+// Define _STLP_NO_WATCOM_INLINE_INTERLOCK to keep using
+// standard WIN32 calls
+// Define _STL_MULTIPROCESSOR to enable lock
+#if !defined(_STLP_NO_WATCOM_INLINE_INTERLOCK)
+
+long    __stl_InterlockedIncrement( long *var );
+long    __stl_InterlockedDecrement( long *var );
+
+#ifdef _STL_MULTIPROCESSOR
+// Multiple Processors, add lock prefix
+#pragma aux __stl_InterlockedIncrement parm [ ecx ] = \
+        ".586"                  \
+        "mov eax, 1"            \
+        "lock xadd [ecx], eax"       \
+        "inc eax"               \
+        value [eax];
+
+        
+#pragma aux __stl_InterlockedDecrement parm [ ecx ] = \
+        ".586"                  \
+        "mov eax, 0FFFFFFFFh"   \
+        "lock xadd [ecx], eax"       \
+        "dec eax"               \
+        value [eax];
+#else 
+// Single Processor, lock prefix not needed
+#pragma aux __stl_InterlockedIncrement parm [ ecx ] = \
+        ".586"                  \
+        "mov eax, 1"            \
+        "xadd [ecx], eax"       \
+        "inc eax"               \
+        value [eax];
+        
+#pragma aux __stl_InterlockedDecrement parm [ ecx ] = \
+        ".586"                  \
+        "mov eax, 0FFFFFFFFh"   \
+        "xadd [ecx], eax"       \
+        "dec eax"               \
+        value [eax];
+#endif // _STL_MULTIPROCESSOR
+
+long    __stl_InterlockedExchange( long *Destination, long Value );
+                
+// xchg has auto-lock
+#pragma aux __stl_InterlockedExchange parm [ecx] [eax] = \
+        ".586"                  \
+        "xchg eax, [ecx]"       \
+        value [eax];
+#else
+
+#define __stl_InterlockedIncrement      InterlockedIncrement
+#define __stl_InterlockedDecrement      InterlockedDecrement
+#define __stl_InterlockedExchange       InterlockedExchange
+#endif /* INLINE INTERLOCK */
+
+#define _STLP_ATOMIC_INCREMENT(__x) __stl_InterlockedIncrement((long*)__x)
+#define _STLP_ATOMIC_DECREMENT(__x) __stl_InterlockedDecrement((long*)__x)
+#define _STLP_ATOMIC_EXCHANGE(__x, __y) __stl_InterlockedExchange((long*)__x, (long)__y)
+
+// boris : is this true or just the header is not in /usr/include ?
+# ifdef __QNX__
+#  define _STLP_NO_TYPEINFO 1
+# endif
+
+#  define _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER 1
+#  define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION 1
+#  define _STLP_NO_MEMBER_TEMPLATE_KEYWORD 1
+#  define _STLP_NO_MEMBER_TEMPLATES 1
+#  define _STLP_NO_FRIEND_TEMPLATES 1
+#  define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1
+
+
+#  define _STLP_LIMITED_DEFAULT_TEMPLATES 1
+#  define _STLP_HAS_NO_NAMESPACES 1
+#  define _STLP_NEED_TYPENAME 1
+
+#  if __WATCOMC__ < 1100
+#  define _STLP_NO_WCHAR_T 1
+#  define _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX 1
+#  endif
+
+#  define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS 1
+
+#  define _STLP_STATIC_CONST_INIT_BUG 1
+// #  define _STLP_THROW_RETURN_BUG 1
+#  define _STLP_NO_TEMPLATE_CONVERSIONS 1
+
+#  define _STLP_BASE_TYPEDEF_OUTSIDE_BUG 1
+
+#  define _STLP_HAS_NO_NEW_IOSTREAMS 1
+#  define _STLP_HAS_NO_NEW_C_HEADERS 1
+#  define _STLP_NO_NEW_NEW_HEADER 1
+#  define _STLP_VENDOR_GLOBAL_STD
+
+#  define _STLP_NO_DEFAULT_NON_TYPE_PARAM 1
+#  define _STLP_NON_TYPE_TMPL_PARAM_BUG 1
+#  define _STLP_NONTEMPL_BASE_MATCH_BUG
+#  define _STLP_NO_EXCEPTION_HEADER 1
+#  define _STLP_NO_BAD_ALLOC 1
+
+#  define _STLP_NESTED_TYPE_PARAM_BUG 1
+
+#  define _STLP_NO_CSTD_FUNCTION_IMPORTS 1
+
+#  if (__WATCOM_CPLUSPLUS__ < 1100 )
+#   define _STLP_NO_BOOL 1
+#   define _STLP_NEED_EXPLICIT 1
+#   define _STLP_NEED_MUTABLE 1
+#   define _STLP_NO_ARROW_OPERATOR 1
+#  endif
+// This one is present in 11, but apparently has bugs (with auto_ptr).
+#   define _STLP_NO_NEW_STYLE_CASTS 1
+
+// Get rid of Watcom's min and max macros 
+#undef min 
+#undef max
+
+// for switches (-xs,  -xss,  -xst)
+//
+#if !(defined (__SW_XS) || defined (__SW_XSS) || defined(__SW_XST))
+#    define _STLP_HAS_NO_EXCEPTIONS 1
+# endif
+
+# if defined ( _MT ) && !defined (_NOTHREADS) && !defined (_REENTRANT)
+# define _REENTRANT 1
+# endif
+
+
+
+
+
diff --git a/main/source/stlport/stlport/config/stl_wince.h b/main/source/stlport/stlport/config/stl_wince.h
new file mode 100644
index 00000000..627943b7
--- /dev/null
+++ b/main/source/stlport/stlport/config/stl_wince.h
@@ -0,0 +1,188 @@
+/*
+ * File to have Windows CE Toolkit for VC++ 5.0 working with STLport
+ * 09 - 03 - 1999
+ * Origin : Giuseppe Govi - g.govi@iol.it
+ */
+
+#ifndef _STLP_WINCE_H
+#define _STLP_WINCE_H
+
+// this flag is being used by STLport
+#   define _STLP_WINCE
+
+#ifndef _MT                            // Always threaded in CE
+  #define _MT
+#endif
+
+#define _STLP_NO_NATIVE_MBSTATE_T
+#define _STLP_NO_TYPEINFO
+#define _STLP_NO_BAD_ALLOC
+#define _STLP_NO_NEW_NEW_HEADER
+#define _STLP_OWN_IOSTREAMS
+
+// tell other parts no threads are there
+#   define _STLP_NO_THREADS 1
+
+// not all new-style headers are available...
+# define _STLP_HAS_NO_NEW_C_HEADERS
+
+#     undef _STLP_HAS_NO_EXCEPTIONS
+#     define _STLP_HAS_NO_EXCEPTIONS
+#     undef _STLP_NO_EXCEPTION_HEADER
+#     define _STLP_NO_EXCEPTION_HEADER
+
+// we have to use malloc instead of new
+# undef  _STLP_USE_NEWALLOC
+# define _STLP_USE_MALLOC
+
+//# ifdef _STLP_MSVC
+//#     pragma warning (disable: 4786)
+//# endif
+
+#ifdef _STLP_WINCE_USE_OUTPUTDEBUGSTRING
+#define _STLP_WINCE_TRACE(msg)   OutputDebugString(msg)
+#else
+#define _STLP_WINCE_TRACE(msg)   MessageBox(NULL,(msg),NULL,MB_OK)
+#endif
+
+#ifndef __THROW_BAD_ALLOC
+#define __THROW_BAD_ALLOC _STLP_WINCE_TRACE(L"out of memory"); ExitThread(1)
+#endif
+
+#ifndef _SIZE_T_DEFINED
+typedef unsigned int size_t;
+#define _SIZE_T_DEFINED
+#endif
+
+#ifndef _WCHAR_T_DEFINED
+typedef unsigned short wchar_t;
+#define _WCHAR_T_DEFINED
+#endif
+
+#ifndef _TIME_T_DEFINED
+typedef unsigned long time_t;
+#define _TIME_T_DEFINED
+#endif
+
+//ptrdiff_t is not defined in Windows CE SDK
+#ifndef _PTRDIFF_T_DEFINED
+typedef int ptrdiff_t;
+#define _PTRDIFF_T_DEFINED
+#endif
+
+//clock_t is not defined in Windows CE SDK
+#ifndef _CLOCK_T_DEFINED
+typedef long clock_t;
+#define _CLOCK_T_DEFINED
+#endif
+
+//struct tm is not defined in Windows CE SDK
+#ifndef _TM_DEFINED
+struct tm {
+        int tm_sec;     /* seconds after the minute - [0,59] */
+        int tm_min;     /* minutes after the hour - [0,59] */
+        int tm_hour;    /* hours since midnight - [0,23] */
+        int tm_mday;    /* day of the month - [1,31] */
+        int tm_mon;     /* months since January - [0,11] */
+        int tm_year;    /* years since 1900 */
+        int tm_wday;    /* days since Sunday - [0,6] */
+        int tm_yday;    /* days since January 1 - [0,365] */
+        int tm_isdst;   /* daylight savings time flag */
+        };
+#define _TM_DEFINED
+#endif
+
+// Some useful routines that are missing in Windows CE SDK
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+  char *      __cdecl getenv(const char *);
+  struct tm * __cdecl gmtime(const time_t *);
+  int         __cdecl remove(const char *);
+  int         __cdecl rename(const char *, const char *);
+  time_t      __cdecl time(time_t *);
+
+  #if (_WIN32_WCE < 300)
+    char * __cdecl strrchr(const char *, int);
+  #endif
+
+#ifdef __cplusplus
+}
+
+#ifndef __PLACEMENT_NEW_INLINE
+inline void *__cdecl operator new(size_t, void *_P) { return (_P); }
+#define __PLACEMENT_NEW_INLINE
+#endif
+
+// Only defined as macros in Windows CE SDK
+#include _STLP_NATIVE_C_HEADER(ctype.h)
+
+#if (_WIN32_WCE < 300)                  // Only wide chars for older versions
+#define _isctype iswctype
+#endif
+
+inline int (isalpha)(int c) { return _isctype(c, _ALPHA); }
+inline int (isupper)(int c) { return _isctype(c, _UPPER); }
+inline int (islower)(int c) { return _isctype(c, _LOWER); }
+inline int (isdigit)(int c) { return _isctype(c, _DIGIT); }
+inline int (isxdigit)(int c) { return _isctype(c, _HEX); }
+inline int (isspace)(int c) { return _isctype(c, _SPACE); }
+inline int (ispunct)(int c) { return _isctype(c, _PUNCT); }
+inline int (isalnum)(int c) { return _isctype(c, _ALPHA|_DIGIT); }
+inline int (isprint)(int c) { return _isctype(c, _BLANK|_PUNCT|_ALPHA|_DIGIT); }
+inline int (isgraph)(int c) { return _isctype(c, _PUNCT|_ALPHA|_DIGIT); }
+inline int (iscntrl)(int c) { return _isctype(c, _CONTROL); }
+inline int (isascii)(int c) { return ((unsigned)(c) < 0x80); }
+
+#undef _isctype
+
+inline int (iswalpha)(int c) { return iswctype(c, _ALPHA); }
+inline int (iswupper)(int c) { return iswctype(c, _UPPER); }
+inline int (iswlower)(int c) { return iswctype(c, _LOWER); }
+inline int (iswdigit)(int c) { return iswctype(c, _DIGIT); }
+inline int (iswxdigit)(int c) { return iswctype(c, _HEX); }
+inline int (iswspace)(int c) { return iswctype(c, _SPACE); }
+inline int (iswpunct)(int c) { return iswctype(c, _PUNCT); }
+inline int (iswalnum)(int c) { return iswctype(c, _ALPHA|_DIGIT); }
+inline int (iswprint)(int c) { return iswctype(c, _BLANK|_PUNCT|_ALPHA|_DIGIT); }
+inline int (iswgraph)(int c) { return iswctype(c, _PUNCT|_ALPHA|_DIGIT); }
+inline int (iswcntrl)(int c) { return iswctype(c, _CONTROL); }
+inline int (iswascii)(int c) { return ((unsigned)(c) < 0x80); }
+
+#endif /* __cplusplus */
+
+#if !defined(WIN32_LEAN_AND_MEAN)       // Minimise windows includes
+  #define WIN32_LEAN_AND_MEAN
+#endif
+#if !defined(VC_EXTRALEAN)
+  #define VC_EXTRALEAN
+#endif
+#if !defined(STRICT)
+  #define STRICT
+#endif
+#if !defined(NOMINMAX)
+  #define NOMINMAX
+#endif
+
+#ifndef __WINDOWS__
+#include <windows.h>
+#endif
+
+#ifndef _ABORT_DEFINED
+# define _STLP_ABORT() TerminateProcess(GetCurrentProcess(), 0)
+# define _ABORT_DEFINED
+#endif
+
+#ifndef _ASSERT_DEFINED
+# define assert(expr) _STLP_ASSERT(expr)
+# define _ASSERT_DEFINED
+#endif
+
+// they say it's needed 
+# include <windows.h>
+
+#endif /* _STLP_WCE_H */
+
+
diff --git a/main/source/stlport/stlport/config/stlcomp.h b/main/source/stlport/stlport/config/stlcomp.h
new file mode 100644
index 00000000..87c57237
--- /dev/null
+++ b/main/source/stlport/stlport/config/stlcomp.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/*
+ * Purpose of this file :
+ *
+ * To hold COMPILER-SPECIFIC portion of STLport settings.
+ * In general, user should not edit this file unless 
+ * using the compiler not recognized below.
+ *
+ * If your compiler is not being recognized yet, 
+ * please look for definitions of macros in stl_mycomp.h,
+ * copy stl_mycomp.h to stl_YOUR_COMPILER_NAME, 
+ * adjust flags for your compiler, and add  <include config/stl_YOUR_COMPILER_NAME>
+ * to the secton controlled by unique macro defined internaly by your compiler.
+ *
+ * To change user-definable settings, please edit <../stl_user_config.h> 
+ *
+ */
+
+#ifndef _STLP_COMP_H
+# define _STLP_COMP_H
+
+#  define __GIVE_UP_WITH_STL(message) void give_up() \
+   { upgrade_the_compiler_to_use_STL;}
+
+/* distinguish real MSC from Metrowerks and Intel */
+# if defined(_MSC_VER) && !defined(__MWERKS__) && !defined (__ICL) && !defined (__COMO__)
+#  define _STLP_MSVC _MSC_VER
+# endif
+
+# if defined (__xlC__)  || defined (__IBMC__) || defined ( __IBMCPP__ ) 
+/* AIX xlC, Visual Age C++ , OS-390 C++ */
+#  include <config/stl_ibm.h>
+# elif defined (__INTEL_COMPILER) && defined(__unix__)
+/* Check intel before gcc, since newer versions define GNUC */
+#  include <config/stl_icc.h>
+# elif defined (__GNUC__ )
+#  include <config/stl_gcc.h>
+# elif defined (__KCC)
+#  include <config/stl_kai.h>
+# elif defined(__sgi)
+#  include <config/stl_sgi.h>
+# elif (defined(__OS400__))
+/* AS/400 C++ */
+#  include <config/stl_as400.h>
+# elif defined(_STLP_MSVC)
+/* Microsoft Visual C++ 4.0, 4.1, 4.2, 5.0 */
+#  include <config/stl_msvc.h>
+# elif defined ( __BORLANDC__ )
+/* Borland C++ ( 4.x - 5.x ) */
+#  include <config/stl_bc.h>
+# elif defined(__SUNPRO_CC) || defined (__SUNPRO_C)
+/* SUN CC 4.0.1-5.0  */
+#  include <config/stl_sunpro.h>
+# elif defined (__WATCOM_CPLUSPLUS__) || defined (__WATCOMC__)
+/* Watcom C++ */
+#  include <config/stl_watcom.h>
+# elif defined(__COMO__) || defined (__COMO_VERSION_)
+#  include <config/stl_como.h>
+# elif defined (__DMC__)
+/* Digital Mars C++ */
+#  include <config/stl_dm.h>
+# elif defined (__SC__) && (__SC__ < 0x800)
+/* Symantec 7.5 */
+#  include <config/stl_symantec.h>
+# elif defined (__MRC__) || (defined (__SC__) && (__SC__ >= 0x882))
+/* Apple MPW SCpp 8.8.2  
+ * Apple MPW MrCpp 4.1.0 */
+#  include <config/stl_apple.h>
+# elif defined (__MWERKS__)
+/* Metrowerks CodeWarrior */
+#  include <config/stl_mwerks.h>
+# elif defined(__hpux)
+/* HP compilers */
+#  include <config/stl_hpacc.h>
+# elif defined(__ICL)
+/* Intel reference compiler for Win */
+#  include <config/stl_intel.h>
+/* SCO UDK 7 compiler (UnixWare 7x, OSR 5, UnixWare 2x) */
+# elif defined(__USLC__)
+#  include <config/stl_sco.h>
+/* Apogee 4.x */
+# elif defined (__APOGEE__)
+#  include <config/stl_apcc.h>
+# elif defined (__DECCXX) || defined (__DECC)
+#  ifdef __vms
+#    include <config/stl_dec_vms.h>
+#  else
+#    include <config/stl_dec.h>
+#  endif
+# elif defined (__ISCPP__)
+#  include <config/stl_is.h>
+# elif defined (__FCC_VERSION)
+/* Fujutsu Compiler, v4.0 assumed */
+#  include <config/stl_fujitsu.h>
+# elif defined(_CRAY)
+/* Cray C++ 3.4 or 3.5 */
+#  include <config/stl_cray.h>
+# else
+/* Unable to identify the compiler, issue error diagnostic.
+ * Edit <config/stl_mycomp.h> to set STLport up for your compiler. */
+#  include <config/stl_mycomp.h>
+# endif /* end of compiler choice */
+# undef __GIVE_UP_WITH_STL
+#endif
+
diff --git a/main/source/stlport/stlport/config/vc_select_lib.h b/main/source/stlport/stlport/config/vc_select_lib.h
new file mode 100644
index 00000000..70aba26c
--- /dev/null
+++ b/main/source/stlport/stlport/config/vc_select_lib.h
@@ -0,0 +1,35 @@
+# if !( defined(_STLP_WINCE) )
+#  define _STLP_EXPORT_DECLSPEC __declspec(dllexport)
+#  define _STLP_IMPORT_DECLSPEC __declspec(dllimport)
+# endif
+
+#  if !( defined(_STLP_MSVC) && _STLP_MSVC < 1100)
+#   define _STLP_CLASS_EXPORT_DECLSPEC __declspec(dllexport)
+#   define _STLP_CLASS_IMPORT_DECLSPEC __declspec(dllimport)
+#  endif
+
+#  if !defined (_STLP_NO_OWN_IOSTREAMS)
+
+#    if ( defined (__DLL) || defined (_DLL) || defined (_WINDLL) || defined (_RTLDLL) \
+     || defined(_AFXDLL) || defined (_STLP_USE_DYNAMIC_LIB) ) \
+       && ! defined (_STLP_USE_STATIC_LIB)
+#      undef  _STLP_USE_DECLSPEC
+#      define _STLP_USE_DECLSPEC 1
+#    endif
+
+#  ifndef _STLP_IMPORT_TEMPLATE_KEYWORD
+#   define _STLP_IMPORT_TEMPLATE_KEYWORD  extern
+#  endif
+#  define _STLP_EXPORT_TEMPLATE_KEYWORD
+
+# if defined (_RTLDLL) && defined (_STLP_USE_STATIC_LIB)
+#    define _STLP_LIB_STATIC_SUFFIX "_staticx"
+# else
+#    define _STLP_LIB_STATIC_SUFFIX "_static"
+# endif
+
+#    include <config/stl_select_lib.h>
+
+#  endif /* _STLP_OWN_IOSTREAMS */
+
+
diff --git a/main/source/stlport/stlport/csetjmp b/main/source/stlport/stlport/csetjmp
new file mode 100644
index 00000000..daa6f18e
--- /dev/null
+++ b/main/source/stlport/stlport/csetjmp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_CSETJMP
+# define _STLP_CSETJMP
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x111
+#  include <stl/_prolog.h>
+# endif
+
+// if the macro is on, the header is already there
+# ifndef setjmp
+# if defined (_STLP_USE_NEW_C_HEADERS)
+#  include _STLP_NATIVE_CPP_C_HEADER(csetjmp)
+# else
+#  include _STLP_NATIVE_C_HEADER(setjmp.h)
+# endif
+# endif
+
+# ifdef _STLP_IMPORT_VENDOR_CSTD
+_STLP_BEGIN_NAMESPACE
+using _STLP_VENDOR_CSTD::jmp_buf;
+# ifndef _STLP_NO_CSTD_FUNCTION_IMPORTS
+#  ifndef setjmp
+using _STLP_VENDOR_CSTD::setjmp;
+#  endif
+using _STLP_VENDOR_CSTD::longjmp;
+# endif
+_STLP_END_NAMESPACE
+#endif /* _STLP_IMPORT_VENDOR_CSTD */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x111 )
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_CSETJMP */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/csignal b/main/source/stlport/stlport/csignal
new file mode 100644
index 00000000..3a327e81
--- /dev/null
+++ b/main/source/stlport/stlport/csignal
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_CSIGNAL
+# define _STLP_CSIGNAL
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x112
+#  include <stl/_prolog.h>
+# endif
+
+# if defined (_STLP_USE_NEW_C_HEADERS)
+#  include _STLP_NATIVE_CPP_C_HEADER(csignal)
+# else
+#  include _STLP_NATIVE_C_HEADER(signal.h)
+# endif
+
+#  ifdef _STLP_IMPORT_VENDOR_CSTD
+_STLP_BEGIN_NAMESPACE
+# ifndef _STLP_NO_CSTD_FUNCTION_IMPORTS
+using _STLP_VENDOR_CSTD::signal;
+using _STLP_VENDOR_CSTD::raise;
+# endif /* _STLP_NO_CSTD_FUNCTION_IMPORTS */
+using _STLP_VENDOR_CSTD::sig_atomic_t;
+_STLP_END_NAMESPACE
+#  endif /* _STLP_IMPORT_VENDOR_CSTD */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x112 )
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_CSIGNAL */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/cstdarg b/main/source/stlport/stlport/cstdarg
new file mode 100644
index 00000000..afbb91c7
--- /dev/null
+++ b/main/source/stlport/stlport/cstdarg
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_CSTDARG
+# define _STLP_CSTDARG
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x113
+#  include <stl/_prolog.h>
+# endif
+
+# if defined (_STLP_USE_NEW_C_HEADERS)
+#  include _STLP_NATIVE_CPP_C_HEADER(cstdarg)
+# else
+#  include _STLP_NATIVE_C_HEADER(stdarg.h)
+# endif
+
+# ifdef _STLP_IMPORT_VENDOR_CSTD
+_STLP_BEGIN_NAMESPACE
+using _STLP_VENDOR_CSTD::va_list;
+_STLP_END_NAMESPACE
+#endif /* _STLP_IMPORT_VENDOR_CSTD */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x113 )
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_CSTDARG */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/cstddef b/main/source/stlport/stlport/cstddef
new file mode 100644
index 00000000..a54991ad
--- /dev/null
+++ b/main/source/stlport/stlport/cstddef
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_CSTDDEF
+# define _STLP_CSTDDEF
+
+# if ! defined (_STLP_WINCE)
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x114
+#  include <stl/_prolog.h>
+# endif
+
+# if (__GNUC__ >= 3) && defined(__CYGWIN__) // this total HACK is the only expedient way I could cygwin to work with GCC 3.0
+#  define __need_wint_t // mostly because wint_t didn't seem to get defined otherwise :(
+#  define __need_wchar_t
+#  define __need_size_t
+#  define __need_ptrdiff_t
+#  define __need_NULL
+# endif
+
+# if defined (_STLP_USE_NEW_C_HEADERS)
+#  include _STLP_NATIVE_CPP_C_HEADER(cstddef)
+# else
+#  include _STLP_NATIVE_C_HEADER(stddef.h)
+# endif
+
+# ifdef _STLP_IMPORT_VENDOR_CSTD
+_STLP_BEGIN_NAMESPACE  
+using _STLP_VENDOR_CSTD::ptrdiff_t;
+using _STLP_VENDOR_CSTD::size_t;
+_STLP_END_NAMESPACE
+#endif /* _STLP_IMPORT_VENDOR_CSTD */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x114 )
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_WINCE */
+
+#endif /* _STLP_CSTDDEF */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/cstdio b/main/source/stlport/stlport/cstdio
new file mode 100644
index 00000000..6bfe623b
--- /dev/null
+++ b/main/source/stlport/stlport/cstdio
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_CSTDIO
+# define _STLP_CSTDIO
+
+# if ! defined (_STLP_WINCE)
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 15
+#  include <stl/_prolog.h>
+# endif
+
+#ifdef __Lynx__
+#  include _STLP_NATIVE_C_HEADER(stdarg.h)
+#endif
+
+# if defined (_STLP_USE_NEW_C_HEADERS)
+#  include _STLP_NATIVE_CPP_C_HEADER(cstdio)
+# else
+#  include _STLP_NATIVE_C_HEADER(stdio.h)
+# endif
+
+# ifdef __MWERKS__
+#  undef stdin
+#  undef stdout
+#  undef stderr
+#  define stdin  	(&_STLP_VENDOR_CSTD::__files[0])
+#  define stdout	(&_STLP_VENDOR_CSTD::__files[1])
+#  define stderr	(&_STLP_VENDOR_CSTD::__files[2])
+# endif
+
+#  if defined (_STLP_MSVC) || defined (__ICL)
+namespace _STLP_VENDOR_CSTD {
+inline
+int vsnprintf(char *s1, size_t n, const char *s2, va_list v)
+{
+return ::_vsnprintf(s1, n, s2, v);
+}
+}
+#  endif
+
+# ifdef _STLP_IMPORT_VENDOR_CSTD 
+_STLP_BEGIN_NAMESPACE
+using _STLP_VENDOR_CSTD::FILE;
+using _STLP_VENDOR_CSTD::fpos_t;
+using _STLP_VENDOR_CSTD::size_t;
+
+// undef obsolete macros
+# undef putc
+# undef getc
+# undef getchar
+# undef putchar
+# undef feof
+# undef ferror
+
+#  ifndef _STLP_NO_CSTD_FUNCTION_IMPORTS
+using _STLP_VENDOR_CSTD::clearerr;
+using _STLP_VENDOR_CSTD::fclose;
+using _STLP_VENDOR_CSTD::feof;
+using _STLP_VENDOR_CSTD::ferror;
+using _STLP_VENDOR_CSTD::fflush;
+using _STLP_VENDOR_CSTD::fgetc;
+using _STLP_VENDOR_CSTD::fgetpos;
+using _STLP_VENDOR_CSTD::fgets;
+using _STLP_VENDOR_CSTD::fopen;
+using _STLP_VENDOR_CSTD::fprintf;
+using _STLP_VENDOR_CSTD::fputc;
+using _STLP_VENDOR_CSTD::fputs;
+using _STLP_VENDOR_CSTD::fread;
+using _STLP_VENDOR_CSTD::freopen;
+using _STLP_VENDOR_CSTD::fscanf;
+using _STLP_VENDOR_CSTD::fseek;
+using _STLP_VENDOR_CSTD::fsetpos;
+using _STLP_VENDOR_CSTD::ftell;
+using _STLP_VENDOR_CSTD::fwrite;
+
+#   if  ( !( defined (__IBMCPP__) && (__IBMCPP__ >= 500) )  )
+ using _STLP_VENDOR_CSTD::getc;
+ using _STLP_VENDOR_CSTD::getchar;
+ using _STLP_VENDOR_CSTD::putc;
+ using _STLP_VENDOR_CSTD::putchar;
+#   endif
+
+using _STLP_VENDOR_CSTD::gets;
+using _STLP_VENDOR_CSTD::perror;
+using _STLP_VENDOR_CSTD::printf;
+using _STLP_VENDOR_CSTD::puts;
+using _STLP_VENDOR_CSTD::remove;
+using _STLP_VENDOR_CSTD::rename;
+using _STLP_VENDOR_CSTD::rewind;
+using _STLP_VENDOR_CSTD::scanf;
+using _STLP_VENDOR_CSTD::setbuf;
+using _STLP_VENDOR_CSTD::setvbuf;
+using _STLP_VENDOR_CSTD::sprintf;
+using _STLP_VENDOR_CSTD::sscanf;
+using _STLP_VENDOR_CSTD::tmpfile;
+using _STLP_VENDOR_CSTD::tmpnam;
+using _STLP_VENDOR_CSTD::ungetc;
+using _STLP_VENDOR_CSTD::vfprintf;
+using _STLP_VENDOR_CSTD::vprintf;
+using _STLP_VENDOR_CSTD::vsprintf;
+#   if (defined (__MWERKS__) || defined (_STLP_MSVC) || defined (__ICL) || \
+( defined (__BORLANDC__) && __BORLANDC__ > 0x530))
+using _STLP_VENDOR_CSTD::vsnprintf;
+#   endif
+#  endif /* _STLP_NO_CSTD_FUNCTION_IMPORTS */
+_STLP_END_NAMESPACE
+# endif /* _STLP_IMPORT_VENDOR_CSTD */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 15)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+# endif /* ! defined (_STLP_WINCE) */
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/cstdlib b/main/source/stlport/stlport/cstdlib
new file mode 100644
index 00000000..276364d1
--- /dev/null
+++ b/main/source/stlport/stlport/cstdlib
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_CSTDLIB
+# define _STLP_CSTDLIB
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x116
+#  include <stl/_prolog.h>
+# endif
+
+# if defined (_STLP_USE_NEW_C_HEADERS)
+#  include _STLP_NATIVE_CPP_C_HEADER(cstdlib)
+# else
+#  include _STLP_NATIVE_C_HEADER(stdlib.h)
+# endif
+
+# if defined( __MSL__ ) && __MSL__ <= 0x5003
+namespace std {
+	typedef ::div_t div_t;
+	typedef ::ldiv_t ldiv_t;
+#  ifdef __MSL_LONGLONG_SUPPORT__
+	typedef ::lldiv_t lldiv_t;
+#  endif
+}
+# endif
+
+# ifdef _STLP_IMPORT_VENDOR_CSTD 
+_STLP_BEGIN_NAMESPACE
+using _STLP_VENDOR_CSTD::div_t;
+using _STLP_VENDOR_CSTD::ldiv_t;
+using _STLP_VENDOR_CSTD::size_t;
+
+#  ifndef _STLP_NO_CSTD_FUNCTION_IMPORTS
+using _STLP_VENDOR_CSTD::abort;
+using _STLP_VENDOR_CSTD::atexit;
+using _STLP_VENDOR_CSTD::exit;
+using _STLP_VENDOR_CSTD::getenv;
+using _STLP_VENDOR_CSTD::calloc;
+using _STLP_VENDOR_CSTD::free;
+using _STLP_VENDOR_CSTD::malloc;
+using _STLP_VENDOR_CSTD::realloc;
+using _STLP_VENDOR_CSTD::atof;
+using _STLP_VENDOR_CSTD::atoi;
+using _STLP_VENDOR_CSTD::atol;
+using _STLP_VENDOR_CSTD::mblen;
+using _STLP_VENDOR_CSTD::mbstowcs;
+using _STLP_VENDOR_CSTD::mbtowc;
+using _STLP_VENDOR_CSTD::strtod;
+using _STLP_VENDOR_CSTD::strtol;
+using _STLP_VENDOR_CSTD::strtoul;
+using _STLP_VENDOR_CSTD::system;
+
+#if ! (defined (_STLP_NO_NATIVE_WIDE_STREAMS) || defined (_STLP_NO_MBSTATE_T) )
+using _STLP_VENDOR_CSTD::wcstombs;
+using _STLP_VENDOR_CSTD::wctomb;
+#endif
+using _STLP_VENDOR_CSTD::bsearch;
+using _STLP_VENDOR_CSTD::qsort;
+// boris : if we do not have native float abs, we define ours; then we cannot do "using" for "other" abs 
+# ifdef _STLP_HAS_NATIVE_FLOAT_ABS 
+using _STLP_VENDOR_CSTD::abs;
+# endif
+using _STLP_VENDOR_CSTD::div;
+using _STLP_VENDOR_CSTD::labs;
+using _STLP_VENDOR_CSTD::ldiv;
+using _STLP_VENDOR_CSTD::rand;
+using _STLP_VENDOR_CSTD::srand;
+#  endif /* _STLP_NO_CSTD_FUNCTION_IMPORTS */
+_STLP_END_NAMESPACE
+#endif /* _STLP_IMPORT_VENDOR_CSTD */
+
+_STLP_BEGIN_NAMESPACE
+
+# if defined(_STLP_HAS_NO_NEW_C_HEADERS) && defined(__cplusplus)
+# if !defined ( _STLP_LABS )
+inline long   abs(long __x) { return _STLP_VENDOR_CSTD::labs(__x); }
+# endif
+# if !defined ( _STLP_LDIV )
+inline ldiv_t div(long __x, long __y) { return _STLP_VENDOR_CSTD::ldiv(__x, __y); } 
+# endif
+# endif
+
+#  if defined ( _STLP_LLABS )
+_STLP_LONG_LONG   abs(_STLP_LONG_LONG __x) { return _STLP_VENDOR_CSTD::_STLP_LLABS(__x); }
+#  endif
+#  if defined ( _STLP_LLDIV )
+_STLP_LLDIV_T div(_STLP_LONG_LONG __x, _STLP_LONG_LONG __y) { return _STLP_VENDOR_CSTD::_STLP_LLDIV(__x, __y); } 
+#  endif
+
+_STLP_END_NAMESPACE
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x116)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_CSTDLIB */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/cstring b/main/source/stlport/stlport/cstring
new file mode 100644
index 00000000..8fbb84a4
--- /dev/null
+++ b/main/source/stlport/stlport/cstring
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_CSTRING
+# define _STLP_CSTRING
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x117
+#  include <stl/_prolog.h>
+# endif
+
+# if defined (_STLP_USE_NEW_C_HEADERS)
+#  include _STLP_NATIVE_CPP_C_HEADER(cstring)
+# else
+#  include _STLP_NATIVE_C_HEADER(string.h)
+# endif
+
+# ifdef _STLP_IMPORT_VENDOR_CSTD
+_STLP_BEGIN_NAMESPACE
+#  include <using/cstring>
+_STLP_END_NAMESPACE
+#endif /* _STLP_IMPORT_VENDOR_CSTD */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x117)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_CSTRING */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/ctime b/main/source/stlport/stlport/ctime
new file mode 100644
index 00000000..667fb762
--- /dev/null
+++ b/main/source/stlport/stlport/ctime
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_CTIME
+# define _STLP_CTIME
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x118
+#  include <stl/_prolog.h>
+# endif
+
+# if defined (_STLP_USE_NEW_C_HEADERS)
+#  include _STLP_NATIVE_CPP_C_HEADER(ctime)
+# else
+#  include _STLP_NATIVE_C_HEADER(time.h)
+# endif
+
+# ifdef _STLP_IMPORT_VENDOR_CSTD
+_STLP_BEGIN_NAMESPACE
+using _STLP_VENDOR_CSTD::size_t;
+using _STLP_VENDOR_CSTD::clock_t;
+using _STLP_VENDOR_CSTD::time_t;
+using _STLP_VENDOR_CSTD::tm;
+#  ifndef _STLP_NO_CSTD_FUNCTION_IMPORTS
+using _STLP_VENDOR_CSTD::clock;
+using _STLP_VENDOR_CSTD::asctime;
+using _STLP_VENDOR_CSTD::ctime;
+using _STLP_VENDOR_CSTD::gmtime;
+using _STLP_VENDOR_CSTD::difftime;
+using _STLP_VENDOR_CSTD::mktime;
+using _STLP_VENDOR_CSTD::localtime;
+using _STLP_VENDOR_CSTD::strftime;
+using _STLP_VENDOR_CSTD::time;
+#  endif /* _STLP_NO_CSTD_FUNCTION_IMPORTS */
+_STLP_END_NAMESPACE
+#endif /* _STLP_IMPORT_VENDOR_CSTD */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x118)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_CTIME */
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/ctype.h b/main/source/stlport/stlport/ctype.h
new file mode 100644
index 00000000..5b889165
--- /dev/null
+++ b/main/source/stlport/stlport/ctype.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# if !defined (_STLP_OUTERMOST_HEADER_ID)
+#  define _STLP_OUTERMOST_HEADER_ID 0x219
+#  include <stl/_prolog.h>
+# elif (_STLP_OUTERMOST_HEADER_ID == 0x219) && ! defined (_STLP_DONT_POP_0x219)
+#  define _STLP_DONT_POP_0x219
+# endif
+
+# include _STLP_NATIVE_C_HEADER(ctype.h)
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x219)
+#  if ! defined (_STLP_DONT_POP_0x219)
+#   include <stl/_epilog.h>
+#   undef  _STLP_OUTERMOST_HEADER_ID
+#   endif
+#   undef  _STLP_DONT_POP_0x219
+# endif
+
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/cwchar b/main/source/stlport/stlport/cwchar
new file mode 100644
index 00000000..c63082eb
--- /dev/null
+++ b/main/source/stlport/stlport/cwchar
@@ -0,0 +1,250 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_CWCHAR
+# define _STLP_CWCHAR
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x120
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef __GNUC__
+#  include <cstddef>
+# endif
+
+# if ! defined (_STLP_WINCE)
+
+# if defined (__BORLANDC__) &&  (__BORLANDC__ >= 0x530 ) && ! defined (_STLP_OWN_IOSTREAMS)
+/*  Borland defines this stuff here */
+#   include <iosfwd>
+# endif
+
+# if !  defined (_STLP_NO_CWCHAR) && defined  (_STLP_USE_NEW_C_HEADERS)
+#  include _STLP_NATIVE_CPP_C_HEADER(cwchar)
+
+# elif defined (__MRC__) || (defined (__SC__) && !defined (__DMC__)) || defined (__BORLANDC__) || defined(__FreeBSD__) || (defined (__GNUC__) && defined (__APPLE__) || defined( __Lynx__ )) || defined (_STLP_NO_WCHAR_T)
+
+#  include _STLP_NATIVE_C_HEADER(stddef.h)
+#  if defined (__FreeBSD__) || defined (__Lynx__)
+#   ifndef _WINT_T
+typedef long int wint_t;
+#    define _WINT_T
+#   endif /* _WINT_T */
+#  endif
+
+# else 
+#  include _STLP_NATIVE_C_HEADER(wchar.h)
+
+#  if defined(__sun) && (defined(_XOPEN_SOURCE) || (_XOPEN_VERSION - 0 == 4))
+extern wint_t   btowc();
+extern int      fwprintf();
+extern int      fwscanf();
+extern int      fwide();
+extern int      mbsinit();
+extern size_t   mbrlen();
+extern size_t   mbrtowc();
+extern size_t   mbsrtowcs();
+extern int      swprintf();
+extern int      swscanf();
+extern int      vfwprintf();
+extern int      vwprintf();
+extern int      vswprintf();
+extern size_t   wcrtomb();
+extern size_t   wcsrtombs();
+extern wchar_t  *wcsstr();
+extern int      wctob();
+extern wchar_t  *wmemchr();
+extern int      wmemcmp();
+extern wchar_t  *wmemcpy();
+extern wchar_t  *wmemmove();
+extern wchar_t  *wmemset();
+extern int      wprintf();
+extern int      wscanf();
+#  endif
+# endif
+
+#if defined(__MSL__) && __MSL__ <= 0x51FF	/* dwa 2/28/99 - not yet implemented by MSL  */
+#   define _STLP_WCHAR_MSL_EXCLUDE 1
+namespace std
+{ 
+  extern "C" size_t wcsftime(wchar_t * str, size_t max_size, const wchar_t * format_str, const struct tm * timeptr);
+}
+#  define _STLP_NO_MBSTATE_T 1
+#elif defined (__BORLANDC__)
+#  ifdef _STLP_OWN_IOSTREAMS
+#   define _STLP_NO_NATIVE_MBSTATE_T
+#  endif
+#  define _STLP_WCHAR_BORLAND_EXCLUDE 1
+#  if (__BORLANDC__ < 0x540 )
+#   define _STLP_NO_MBSTATE_T 1
+#   define _STLP_WCHAR_SUNPRO_EXCLUDE
+#  endif
+#endif
+
+#ifndef _STLP_CWCHAR_H
+# include <stl/_cwchar.h>
+#endif
+
+# ifdef _STLP_IMPORT_VENDOR_CSTD
+
+#if defined (__SUNPRO_CC) && defined (_STLP_NO_OWN_IOSTREAMS) && !defined (_STLP_HAS_NO_NEW_C_HEADERS)
+using _STLP_VENDOR_CSTD::wint_t; 
+#endif
+
+_STLP_BEGIN_NAMESPACE
+# ifdef _STLP_NO_WCHAR_T
+typedef int wint_t;
+# else
+// gcc 3.0 has a glitch : wint_t only sucked into the global namespace if _GLIBCPP_USE_WCHAR_T is defined
+#  if defined (__GNUC__) && ! defined (_GLIBCPP_USE_WCHAR_T)
+using ::wint_t;
+#  else
+using _STLP_VENDOR_CSTD::wint_t;
+#  endif
+# endif
+
+
+using _STLP_VENDOR_CSTD::size_t;
+
+#  if !defined (_STLP_NO_NATIVE_MBSTATE_T) && ! defined (_STLP_USE_OWN_MBSTATE_T)
+using _STLP_VENDOR_MB_NAMESPACE::mbstate_t;
+
+# if !defined (_STLP_NO_CSTD_FUNCTION_IMPORTS) && !defined(_STLP_WCHAR_BORLAND_EXCLUDE) \
+  && (!defined(__MSL__) || __MSL__ > 0x6001)
+#  if ! (defined (__KCC) || defined (__GNUC__))
+using _STLP_VENDOR_MB_NAMESPACE::btowc;
+#   if (!defined(__MSL__) || __MSL__ > 0x7001)
+using _STLP_VENDOR_MB_NAMESPACE::mbsinit;
+#   endif
+#  endif
+# if ! defined (__GNUC__)
+using _STLP_VENDOR_MB_NAMESPACE::mbrlen;
+using _STLP_VENDOR_MB_NAMESPACE::mbrtowc;
+using _STLP_VENDOR_MB_NAMESPACE::mbsrtowcs;
+using _STLP_VENDOR_MB_NAMESPACE::wcrtomb;
+using _STLP_VENDOR_MB_NAMESPACE::wcsrtombs;
+# endif
+#    endif /* BORLAND && !__MSL__ || __MSL__ > 0x6001 */
+
+#  endif /* _STLP_NO_NATIVE_MBSTATE_T */
+
+# if !defined (_STLP_NO_NATIVE_WIDE_FUNCTIONS) && ! defined (_STLP_NO_CSTD_FUNCTION_IMPORTS)
+
+# if !defined (_STLP_WCHAR_BORLAND_EXCLUDE) && ! defined (_STLP_NO_CSTD_FUNCTION_IMPORTS)
+using _STLP_VENDOR_CSTD::fgetwc;
+using _STLP_VENDOR_CSTD::fgetws;
+using _STLP_VENDOR_CSTD::fputwc;
+using _STLP_VENDOR_CSTD::fputws;
+# endif
+
+#  if !( defined (_STLP_WCHAR_SUNPRO_EXCLUDE) || defined (_STLP_WCHAR_BORLAND_EXCLUDE) \
+      || defined(_STLP_WCHAR_HPACC_EXCLUDE) )
+# ifndef __DECCXX
+using _STLP_VENDOR_CSTD::fwide;
+# endif
+using _STLP_VENDOR_CSTD::fwprintf;
+using _STLP_VENDOR_CSTD::fwscanf;
+using _STLP_VENDOR_CSTD::getwchar;
+#  endif
+
+# ifndef _STLP_WCHAR_BORLAND_EXCLUDE
+using _STLP_VENDOR_CSTD::getwc;
+using _STLP_VENDOR_CSTD::ungetwc;
+
+using _STLP_VENDOR_CSTD::putwc;
+using _STLP_VENDOR_CSTD::putwchar;
+# endif
+
+#  if !( defined (_STLP_WCHAR_SUNPRO_EXCLUDE) || defined (_STLP_WCHAR_BORLAND_EXCLUDE)\
+      || defined(_STLP_WCHAR_HPACC_EXCLUDE) ) 
+using _STLP_VENDOR_CSTD::swprintf;
+using _STLP_VENDOR_CSTD::swscanf;
+using _STLP_VENDOR_CSTD::vfwprintf;
+using _STLP_VENDOR_CSTD::vwprintf;
+using _STLP_VENDOR_CSTD::vswprintf;
+
+#   if !defined(__MSL__) || __MSL__ > 0x7001
+using _STLP_VENDOR_CSTD::wcsftime;
+#   endif
+using _STLP_VENDOR_CSTD::wcstok;
+
+#  endif
+
+# if !(defined (__BORLANDC__) && (__BORLANDC__ < 0x540))
+using _STLP_VENDOR_CSTD::wcscat;
+using _STLP_VENDOR_CSTD::wcsrchr;
+using _STLP_VENDOR_CSTD::wcscmp;
+using _STLP_VENDOR_CSTD::wcscoll;
+
+using _STLP_VENDOR_CSTD::wcscpy;
+using _STLP_VENDOR_CSTD::wcscspn;
+
+using _STLP_VENDOR_CSTD::wcslen;
+using _STLP_VENDOR_CSTD::wcsncat;
+using _STLP_VENDOR_CSTD::wcsncmp;
+using _STLP_VENDOR_CSTD::wcsncpy;
+using _STLP_VENDOR_CSTD::wcspbrk;
+using _STLP_VENDOR_CSTD::wcschr;
+
+using _STLP_VENDOR_CSTD::wcsspn;
+using _STLP_VENDOR_CSTD::wcsxfrm;
+
+# endif
+
+#  if !defined (_STLP_WCHAR_BORLAND_EXCLUDE)
+
+using _STLP_VENDOR_CSTD::wcstod;
+using _STLP_VENDOR_CSTD::wcstol;
+
+# endif
+
+#  if !( defined (_STLP_WCHAR_SUNPRO_EXCLUDE) || defined(_STLP_WCHAR_HPACC_EXCLUDE) )
+
+using _STLP_VENDOR_CSTD::wcsstr;
+using _STLP_VENDOR_CSTD::wmemchr;
+
+#  if !defined (_STLP_WCHAR_BORLAND_EXCLUDE)
+
+#ifndef __DMC__
+using _STLP_VENDOR_CSTD::wctob;
+using _STLP_VENDOR_CSTD::wmemcmp;
+#endif
+using _STLP_VENDOR_CSTD::wmemmove;
+using _STLP_VENDOR_CSTD::wprintf;
+using _STLP_VENDOR_CSTD::wscanf;
+
+#  endif
+
+using _STLP_VENDOR_CSTD::wmemcpy;
+using _STLP_VENDOR_CSTD::wmemset;
+#  endif
+
+# endif /* _STLP_NO_NATIVE_WIDE_FUNCTIONS */
+_STLP_END_NAMESPACE
+# endif /* _STLP_IMPORT_VENDOR_CSTD */
+
+# undef _STLP_WCHAR_SUNPRO_EXCLUDE
+# undef _STLP_WCHAR_MSL_EXCLUDE
+
+# endif /* WINCE */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x120)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_CWCHAR */
+
diff --git a/main/source/stlport/stlport/cwctype b/main/source/stlport/stlport/cwctype
new file mode 100644
index 00000000..5b98d689
--- /dev/null
+++ b/main/source/stlport/stlport/cwctype
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_CWCTYPE
+# define _STLP_CWCTYPE
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x121
+#  include <stl/_prolog.h>
+# endif
+
+#ifdef __BORLANDC__
+# include <cctype>
+#endif
+
+# if defined (_STLP_USE_NEW_C_HEADERS)
+#  include _STLP_NATIVE_CPP_C_HEADER(cwctype)
+#  if defined  (__MSL__)
+namespace std {
+	typedef wchar_t wctrans_t;
+	wint_t 		towctrans(wint_t c, wctrans_t value);
+	wctrans_t 	wctrans(const char *name);
+}
+#  endif
+# else
+#  include _STLP_NATIVE_C_HEADER(wctype.h)
+# endif
+
+# ifdef _STLP_IMPORT_VENDOR_CSTD
+_STLP_BEGIN_NAMESPACE
+using _STLP_VENDOR_CSTD::wctype_t;
+using _STLP_VENDOR_CSTD::wint_t;
+# ifndef _STLP_NO_CSTD_FUNCTION_IMPORTS
+#  if ! defined (__BORLANDC__)
+using _STLP_VENDOR_CSTD::wctrans_t;
+using _STLP_VENDOR_CSTD::towctrans;
+using _STLP_VENDOR_CSTD::wctrans;
+using _STLP_VENDOR_CSTD::wctype;
+using _STLP_VENDOR_CSTD::iswctype;
+#  endif
+using _STLP_VENDOR_CSTD::iswalnum;
+using _STLP_VENDOR_CSTD::iswalpha;
+using _STLP_VENDOR_CSTD::iswcntrl;
+
+using _STLP_VENDOR_CSTD::iswdigit;
+using _STLP_VENDOR_CSTD::iswgraph;
+using _STLP_VENDOR_CSTD::iswlower;
+using _STLP_VENDOR_CSTD::iswprint;
+using _STLP_VENDOR_CSTD::iswpunct;
+using _STLP_VENDOR_CSTD::iswspace;
+using _STLP_VENDOR_CSTD::iswupper;
+using _STLP_VENDOR_CSTD::iswxdigit;
+
+using _STLP_VENDOR_CSTD::towlower;
+using _STLP_VENDOR_CSTD::towupper;
+#  endif /* _STLP_NO_CSTD_FUNCTION_IMPORTS */
+_STLP_END_NAMESPACE
+#endif /* _STLP_IMPORT_VENDOR_CSTD */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x121)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_CWCTYPE */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/deque b/main/source/stlport/stlport/deque
new file mode 100644
index 00000000..83f1faea
--- /dev/null
+++ b/main/source/stlport/stlport/deque
@@ -0,0 +1,55 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_DEQUE
+#define _STLP_DEQUE
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x22
+#  include <stl/_prolog.h>
+# endif
+
+#ifdef _STLP_PRAGMA_ONCE
+# pragma once
+#endif
+
+#ifndef _STLP_INTERNAL_DEQUE_H
+# include <stl/_deque.h>
+#endif
+
+#if defined (_STLP_WHOLE_VENDOR_STD)
+# include _STLP_NATIVE_HEADER(deque)
+#endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x22)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_DEQUE */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/exception b/main/source/stlport/stlport/exception
new file mode 100644
index 00000000..3afe66f1
--- /dev/null
+++ b/main/source/stlport/stlport/exception
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+// This header exists solely for portability.  Normally it just includes
+// the native header <exception>.
+
+// The header <exception> contains low-level functions that interact
+// with a compiler's exception-handling mechanism.  It is assumed to
+// be supplied with the compiler, rather than with the library, because
+// it is inherently tied very closely to the compiler itself.
+
+// On platforms where <exception> does not exist, this header defines
+// an exception base class.  This is *not* a substitute for everything
+// in <exception>, but it suffices to support a bare minimum of STL
+// functionality.
+
+# if !defined (_STLP_OUTERMOST_HEADER_ID)
+#  define _STLP_OUTERMOST_HEADER_ID 0x423
+#  include <stl/_prolog.h>
+# elif (_STLP_OUTERMOST_HEADER_ID == 0x423) && ! defined (_STLP_DONT_POP_0x423)
+#  define _STLP_DONT_POP_0x423
+# endif
+
+# if   ! defined (_STLP_NO_EXCEPTION_HEADER)
+
+#  if defined ( _UNCAUGHT_EXCEPTION )
+#   undef _STLP_INCOMPLETE_EXCEPTION_HEADER
+#  endif
+
+# if defined(_STLP_BROKEN_EXCEPTION_CLASS)
+#  define exception     _STLP_NULLIFIED_BROKEN_EXCEPTION_CLASS
+#  define bad_exception _STLP_NULLIFIED_BROKEN_BAD_EXCEPTION_CLASS
+#  if defined (_STLP_NO_NEW_NEW_HEADER)
+#   include _STLP_NATIVE_CPP_RUNTIME_HEADER(Exception.h)
+#  else
+#   include _STLP_NATIVE_CPP_RUNTIME_HEADER(Exception)
+#  endif
+#  undef exception
+#  undef bad_exception
+# else
+
+# if defined (_STLP_NO_NEW_NEW_HEADER)
+#  include _STLP_NATIVE_CPP_RUNTIME_HEADER(exception.h)
+# else
+#   include _STLP_NATIVE_CPP_RUNTIME_HEADER(exception)
+# endif
+
+# endif
+
+#    if defined (_STLP_MSVC) || defined (__ICL)
+// dwa 02/04/00 - here I'm assuming that __ICL uses the same library headers as vc6.
+// the header <yvals.h> which ships with vc6 and is included by its native <exception>
+// actually turns on warnings, so we have to turn them back off.
+#      include <config/_msvc_warnings_off.h>
+#    endif
+
+
+#  ifdef _STLP_USE_OWN_NAMESPACE
+
+_STLP_BEGIN_NAMESPACE
+
+#if !defined(_STLP_BROKEN_EXCEPTION_CLASS)
+using _STLP_VENDOR_EXCEPT_STD::exception;
+using _STLP_VENDOR_EXCEPT_STD::bad_exception;
+#endif
+
+# if ! defined (_STLP_NO_USING_FOR_GLOBAL_FUNCTIONS)
+
+// fbp : many platforms present strange mix of
+// those in various namespaces
+#  if !defined(_STLP_VENDOR_UNEXPECTED_STD)
+#   define _STLP_VENDOR_UNEXPECTED_STD _STLP_VENDOR_EXCEPT_STD
+#  endif
+
+// weird errors
+# if (! defined (__BORLANDC__)) || (defined (__STD_EXCEPTION) && defined (__RWSTD_EXCEPTION_SEEN) && defined ( _STLP_DONT_POP_0x423))
+using _STLP_VENDOR_UNEXPECTED_STD::unexpected;
+using _STLP_VENDOR_UNEXPECTED_STD::unexpected_handler;
+using _STLP_VENDOR_UNEXPECTED_STD::set_unexpected;
+using _STLP_VENDOR_UNEXPECTED_STD::terminate;
+using _STLP_VENDOR_UNEXPECTED_STD::terminate_handler;
+using _STLP_VENDOR_UNEXPECTED_STD::set_terminate;
+# endif
+
+# if !defined (_STLP_INCOMPLETE_EXCEPTION_HEADER) 
+using _STLP_VENDOR_UNEXPECTED_STD::uncaught_exception;
+# endif
+
+#  endif
+
+_STLP_END_NAMESPACE
+
+#  endif /* _STLP_OWN_NAMESPACE */
+
+#else /* _STLP_NO_EXCEPTION_HEADER */
+
+// fbp : absence of <exception> usually means that those
+// functions are not going to be called by compiler.
+// Still, define them for the user.
+typedef void (*unexpected_handler)();
+unexpected_handler set_unexpected(unexpected_handler f) _STLP_NOTHROW_INHERENTLY;
+void unexpected();
+
+typedef void (*terminate_handler)();
+terminate_handler set_terminate(terminate_handler f) _STLP_NOTHROW_INHERENTLY;
+void terminate();
+
+bool uncaught_exception(); // not implemented under mpw as of Jan/1999
+
+#endif  /* _STLP_NO_EXCEPTION_HEADER */	
+
+# if   defined (_STLP_NO_EXCEPTION_HEADER) || defined(_STLP_BROKEN_EXCEPTION_CLASS)
+# ifndef _STLP_EXCEPTION_H
+#  define _STLP_EXCEPTION_H
+
+_STLP_BEGIN_NAMESPACE
+
+// section 18.6.1
+	class _STLP_CLASS_DECLSPEC exception 
+	{
+	public:
+# ifdef _STLP_OWN_IOSTREAMS
+	        exception() _STLP_NOTHROW;
+	        virtual ~exception() _STLP_NOTHROW;
+		virtual const char* what() const _STLP_NOTHROW;
+# else
+	        exception() _STLP_NOTHROW {}
+		virtual ~exception() _STLP_NOTHROW {}
+		virtual const char* what() const _STLP_NOTHROW {return "class exception";}
+# endif
+	};
+	
+	
+
+// section 18.6.2.1
+	class _STLP_CLASS_DECLSPEC bad_exception : public exception 
+	{
+	public:
+# ifdef _STLP_OWN_IOSTREAMS
+	  bad_exception() _STLP_NOTHROW;
+	  ~bad_exception() _STLP_NOTHROW;
+	  const char* what() const _STLP_NOTHROW;
+# else
+	  bad_exception() _STLP_NOTHROW {}
+	  ~bad_exception() _STLP_NOTHROW {}
+	  const char* what() const _STLP_NOTHROW {return "class bad_exception";}
+# endif
+	};
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_NO_EXCEPTION_HEADER */
+
+_STLP_BEGIN_NAMESPACE
+// forward declaration
+class __Named_exception;
+_STLP_END_NAMESPACE
+#endif /* _STLP_EXCEPTION_H */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x423)
+#  if ! defined (_STLP_DONT_POP_0x423)
+#   include <stl/_epilog.h>
+#   undef  _STLP_OUTERMOST_HEADER_ID
+#   endif
+#   undef  _STLP_DONT_POP_0x423
+# endif
+
+// Local Variables:
+// mode:C++
+// End:
+
+
+
diff --git a/main/source/stlport/stlport/exception.h b/main/source/stlport/stlport/exception.h
new file mode 100644
index 00000000..a3008ffe
--- /dev/null
+++ b/main/source/stlport/stlport/exception.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_OLDSTD_exception
+# define _STLP_OLDSTD_exception
+
+# if !defined (_STLP_OUTERMOST_HEADER_ID)
+#  define _STLP_OUTERMOST_HEADER_ID 0x824
+#  include <stl/_prolog.h>
+# elif (_STLP_OUTERMOST_HEADER_ID == 0x824) && ! defined (_STLP_DONT_POP_0x824)
+#  define _STLP_DONT_POP_0x824
+# endif
+
+# if defined (__BORLANDC__)
+#  include <exception.>
+# elif defined (_MSC_VER)
+#  include <exception>
+# else
+#  include _STLP_NATIVE_CPP_RUNTIME_HEADER(exception.h)
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x824)
+#  if ! defined (_STLP_DONT_POP_0x824)
+#   include <stl/_epilog.h>
+#   undef  _STLP_OUTERMOST_HEADER_ID
+#   endif
+#   undef  _STLP_DONT_POP_0x824
+# endif
+
+#endif /* _STLP_OLDSTD_exception */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/export b/main/source/stlport/stlport/export
new file mode 100644
index 00000000..eefdc31e
--- /dev/null
+++ b/main/source/stlport/stlport/export
@@ -0,0 +1,85 @@
+./algorithm
+./bitset
+./cassert
+./cctype
+./cerrno
+./cfloat
+./climits
+./clocale
+./cmath
+./complex
+./csetjmp
+./csignal
+./cstdarg
+./cstddef
+./cstdio
+./cstdlib
+./cstring
+./ctime
+./ctype.h
+./cwchar
+./cwctype
+./deque
+./exception
+./exception.h
+./export
+./fstream
+./fstream.h
+./functional
+./hash_map
+./hash_set
+./iomanip
+./iomanip.h
+./ios
+./ios.h
+./iosfwd
+./iostream
+./iostream.h
+./istream
+./istream.h
+./iterator
+./limits
+./list
+./locale
+./locale.h
+./map
+./math.h
+./mem.h
+./memory
+./mmemory.h
+./new
+./new.h
+./numeric
+./ostream
+./ostream.h
+./pthread.h
+./pthread_alloc
+./queue
+./rope
+./set
+./setjmp.h
+./signal.h
+./slist
+./sstream
+./stack
+./stdarg.h
+./stddef.h
+./stdexcept
+./stdio.h
+./stdio_streambuf
+./stdlib.h
+./stl_user_config.h
+./streambuf
+./streambuf.h
+./string
+./string.h
+./strstream
+./strstream.h
+./time.h
+./typeinfo
+./typeinfo.h
+./utility
+./valarray
+./vector
+./wchar.h
+./wctype.h
diff --git a/main/source/stlport/stlport/export.sun b/main/source/stlport/stlport/export.sun
new file mode 100644
index 00000000..a778246c
--- /dev/null
+++ b/main/source/stlport/stlport/export.sun
@@ -0,0 +1,48 @@
+./algorithm.SUNWCCh
+./bitset.SUNWCCh
+./complex.SUNWCCh
+./deque.SUNWCCh
+./exception.SUNWCCh
+./fstream.SUNWCCh
+./fstream.h.SUNWCCh
+./functional.SUNWCCh
+./hash_map.SUNWCCh
+./hash_set.SUNWCCh
+./iomanip.SUNWCCh
+./iomanip.h.SUNWCCh
+./ios.SUNWCCh
+./ios.h.SUNWCCh
+./iosfwd.SUNWCCh
+./iostream.SUNWCCh
+./iostream.h.SUNWCCh
+./istream.SUNWCCh
+./istream.h.SUNWCCh
+./iterator.SUNWCCh
+./limits.SUNWCCh
+./list.SUNWCCh
+./locale.SUNWCCh
+./map.SUNWCCh
+./memory.SUNWCCh
+./new.SUNWCCh
+./numeric.SUNWCCh
+./ostream.SUNWCCh
+./ostream.h.SUNWCCh
+./pthread_alloc.SUNWCCh
+./queue.SUNWCCh
+./set.SUNWCCh
+./slist.SUNWCCh
+./sstream.SUNWCCh
+./stack.SUNWCCh
+./stdexcept.SUNWCCh
+./streambuf.SUNWCCh
+./streambuf.h.SUNWCCh
+./string.SUNWCCh
+./strstream.SUNWCCh
+./strstream.h.SUNWCCh
+./typeinfo.SUNWCCh
+./utility.SUNWCCh
+./valarray.SUNWCCh
+./vector.SUNWCCh
+
+
+
diff --git a/main/source/stlport/stlport/fstream b/main/source/stlport/stlport/fstream
new file mode 100644
index 00000000..31afc95d
--- /dev/null
+++ b/main/source/stlport/stlport/fstream
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+
+// This header defines classes basic_filebuf, basic_ifstream,
+// basic_ofstream, and basic_fstream.  These classes represent
+// streambufs and streams whose sources or destinations are files.
+
+#ifndef _STLP_FSTREAM
+#define _STLP_FSTREAM
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x1025
+#  include <stl/_prolog.h>
+# endif
+
+#ifdef _STLP_PRAGMA_ONCE
+# pragma once
+#endif
+
+# if defined (_STLP_OWN_IOSTREAMS)
+#  include <stl/_fstream.h>
+
+# ifndef __LOCALE_INITIALIZED
+#  define __LOCALE_INITIALIZED
+_STLP_BEGIN_NAMESPACE
+// Global initializer object, to ensure construction of static objects.
+static ios_base::_Loc_init _LocInit;
+_STLP_END_NAMESPACE
+# endif
+
+# elif !defined(_STLP_USE_NO_IOSTREAMS)
+#  include <wrap_std/fstream>
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x1025)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_FSTREAM */
+
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/fstream.h b/main/source/stlport/stlport/fstream.h
new file mode 100644
index 00000000..c5ac66d1
--- /dev/null
+++ b/main/source/stlport/stlport/fstream.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_FSTREAM_H
+# define _STLP_FSTREAM_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x2026
+#  include <stl/_prolog.h>
+# endif
+
+# if defined (_STLP_OWN_IOSTREAMS)
+#ifdef __BORLANDC__
+#  include <fstream.>
+#else
+#  include <fstream>
+#endif
+// get desired pollution
+#  include <iostream.h>
+
+# ifndef __LOCALE_INITIALIZED
+#  define __LOCALE_INITIALIZED
+// Global initializer object, to ensure initialization of locale subsystem.
+static ios_base::_Loc_init _LocInit;
+# endif
+
+#  ifndef _STLP_HAS_NO_NAMESPACES
+#   include <using/fstream>
+#  endif
+
+# elif ! defined (_STLP_USE_NO_IOSTREAMS)
+# include <wrap_std/h/fstream.h>
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x2026)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_FSTREAM_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/functional b/main/source/stlport/stlport/functional
new file mode 100644
index 00000000..bb2bf310
--- /dev/null
+++ b/main/source/stlport/stlport/functional
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_FUNCTIONAL
+#define _STLP_FUNCTIONAL
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x27
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+# if defined (_STLP_IMPORT_VENDOR_STD)
+#  include _STLP_NATIVE_HEADER(functional)
+# endif
+
+# ifndef _STLP_INTERNAL_FUNCTION_H
+#  include <stl/_function.h>
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x27)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_FUNCTIONAL */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/hash_map b/main/source/stlport/stlport/hash_map
new file mode 100644
index 00000000..8bd82270
--- /dev/null
+++ b/main/source/stlport/stlport/hash_map
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_HASH_MAP
+#define _STLP_HASH_MAP
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x4028
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+#include <stl/_hash_map.h>
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x4028)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_HASH_MAP */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/hash_set b/main/source/stlport/stlport/hash_set
new file mode 100644
index 00000000..6de416f7
--- /dev/null
+++ b/main/source/stlport/stlport/hash_set
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_HASH_SET
+#define _STLP_HASH_SET
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x4029
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+#include <stl/_hash_set.h>
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x4029)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_HASH_SET */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/iomanip b/main/source/stlport/stlport/iomanip
new file mode 100644
index 00000000..7c132d12
--- /dev/null
+++ b/main/source/stlport/stlport/iomanip
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+#ifndef _STLP_IOMANIP
+#define _STLP_IOMANIP
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x1030
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+# if defined ( _STLP_OWN_IOSTREAMS )
+
+#  include <stl/_istream.h>              // Includes <ostream> and <ios>
+
+_STLP_BEGIN_NAMESPACE
+
+//----------------------------------------------------------------------
+// Machinery for defining manipulators.
+
+// Class that calls one of ios_base's single-argument member functions.
+template <class _Arg>
+struct _Ios_Manip_1 {
+   typedef _Arg (ios_base::*__f_ptr_type)(_Arg);
+ 
+  _Ios_Manip_1(__f_ptr_type __f, const _Arg& __arg)  
+    : _M_f(__f), _M_arg(__arg)
+    {}
+  
+  void operator()(ios_base& __ios) const {
+    (__ios.*_M_f)(_M_arg);
+  }
+
+  __f_ptr_type _M_f;
+  _Arg _M_arg;
+};
+
+// Class that calls one of ios_base's two-argument member functions.
+struct _Ios_Setf_Manip {
+  ios_base::fmtflags _M_flag;
+  ios_base::fmtflags _M_mask;
+  bool _M_two_args;
+
+  _Ios_Setf_Manip(ios_base::fmtflags __f)
+    : _M_flag(__f), _M_mask(0), _M_two_args(false)
+    {}
+
+  _Ios_Setf_Manip(ios_base::fmtflags __f, ios_base::fmtflags __m)
+    : _M_flag(__f), _M_mask(__m), _M_two_args(true)
+    {}
+
+  void operator()(ios_base& __ios) const {
+    if (_M_two_args)
+      __ios.setf(_M_flag, _M_mask);
+    else
+      __ios.setf(_M_flag);
+  }
+};
+
+
+template <class _CharT, class _Traits, class _Arg>
+inline basic_istream<_CharT, _Traits>& _STLP_CALL
+operator>>(basic_istream<_CharT, _Traits>& __in,
+           const _Ios_Manip_1<_Arg>& __f)
+{
+  __f(__in);
+  return __in;
+}
+
+template <class _CharT, class _Traits, class _Arg>
+inline basic_ostream<_CharT, _Traits>& _STLP_CALL
+operator<<(basic_ostream<_CharT, _Traits>& __os,
+           const _Ios_Manip_1<_Arg>& __f)
+{
+  __f(__os);
+  return __os;
+}
+
+template <class _CharT, class _Traits>
+inline basic_istream<_CharT, _Traits>& _STLP_CALL
+operator>>(basic_istream<_CharT, _Traits>& __in, const _Ios_Setf_Manip& __f)
+{
+  __f(__in);
+  return __in;
+}
+
+template <class _CharT, class _Traits>
+inline basic_ostream<_CharT, _Traits>& _STLP_CALL
+operator<<(basic_ostream<_CharT, _Traits>& __os, const _Ios_Setf_Manip& __f)
+
+{
+  __f(__os);
+  return __os;
+}
+
+//----------------------------------------------------------------------
+// The ios_base manipulators.
+
+inline _Ios_Setf_Manip  _STLP_CALL resetiosflags(ios_base::fmtflags __mask) {
+  return _Ios_Setf_Manip(0, __mask);
+}
+
+inline _Ios_Setf_Manip _STLP_CALL setiosflags(ios_base::fmtflags __flag) {
+  return _Ios_Setf_Manip(__flag);
+}
+
+inline _Ios_Setf_Manip _STLP_CALL setbase(int __n) {
+  ios_base::fmtflags __base = __n == 8  ? ios_base::oct :
+                              __n == 10 ? ios_base::dec :
+                              __n == 16 ? ios_base::hex :
+                              ios_base::fmtflags(0);
+  return _Ios_Setf_Manip(__base, ios_base::basefield);
+}
+
+inline _Ios_Manip_1<streamsize> _STLP_CALL 
+setprecision(int __n) {
+  _Ios_Manip_1<streamsize>::__f_ptr_type __f = &ios_base::precision;
+  return _Ios_Manip_1<streamsize>(__f, __n);
+}
+
+inline _Ios_Manip_1<streamsize>  _STLP_CALL
+setw(int __n) {
+  _Ios_Manip_1<streamsize>::__f_ptr_type __f = &ios_base::width;	
+  return _Ios_Manip_1<streamsize>(__f, __n);
+}
+
+//----------------------------------------------------------------------
+// setfill, a manipulator that operates on basic_ios<> instead of ios_base.
+
+template <class _CharT>
+struct _Setfill_Manip {
+  _Setfill_Manip(_CharT __c) : _M_c(__c) {}
+  _CharT _M_c;
+};
+
+template <class _CharT, class _CharT2, class _Traits>
+inline basic_ostream<_CharT, _Traits>& _STLP_CALL 
+operator<<(basic_ostream<_CharT, _Traits>& __os, 
+           const _Setfill_Manip<_CharT2>& __m)
+{
+  __os.fill(__m._M_c);
+  return __os;
+}
+
+template <class _CharT, class _CharT2, class _Traits>
+inline basic_istream<_CharT, _Traits>& _STLP_CALL 
+operator>>(basic_istream<_CharT, _Traits>& __is, 
+           const _Setfill_Manip<_CharT2>& __m)
+{
+  __is.fill(__m._M_c);
+  return __is;
+}
+
+template <class _CharT>
+inline _Setfill_Manip<_CharT> _STLP_CALL 
+setfill(_CharT __c) {
+  return _Setfill_Manip<_CharT>(__c);
+}
+
+_STLP_END_NAMESPACE
+
+# elif !defined (_STLP_USE_NO_IOSTREAMS)
+#  include <wrap_std/iomanip>
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x1030)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_IOMANIP */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/iomanip.h b/main/source/stlport/stlport/iomanip.h
new file mode 100644
index 00000000..c7b5f32b
--- /dev/null
+++ b/main/source/stlport/stlport/iomanip.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_IOMANIP_H
+# define _STLP_IOMANIP_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x2031
+#  include <stl/_prolog.h>
+# endif
+
+# if defined ( _STLP_OWN_IOSTREAMS )
+
+#ifdef __BORLANDC__
+#  include <iomanip.>
+#else
+#  include <iomanip>
+#endif
+
+#  ifndef _STLP_HAS_NO_NAMESPACES
+#  ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace _STLP_STD;
+#  else
+using _STLP_STD::setiosflags;
+using _STLP_STD::resetiosflags;
+using _STLP_STD::setbase;
+using _STLP_STD::setfill;
+using _STLP_STD::setprecision;
+using _STLP_STD::setw;
+#  endif
+#  endif /* _STLP_HAS_NO_NAMESPACES */
+
+// get all the pollution we want
+# include <iostream.h>
+
+# elif !defined (_STLP_USE_NO_IOSTREAMS)
+
+# include _STLP_NATIVE_OLD_STREAMS_HEADER(iomanip.h)
+
+# if defined  (_STLP_USE_NAMESPACES) && ! defined (_STLP_BROKEN_USING_DIRECTIVE)
+_STLP_BEGIN_NAMESPACE
+# include <using/h/iomanip.h>
+_STLP_END_NAMESPACE
+#  endif /* _STLP_USE_NAMESPACES */
+
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x2031)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_IOMANIP_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/ios b/main/source/stlport/stlport/ios
new file mode 100644
index 00000000..7e2bb919
--- /dev/null
+++ b/main/source/stlport/stlport/ios
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+#ifndef _STLP_IOS
+#define _STLP_IOS
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x1032
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+# if defined ( _STLP_OWN_IOSTREAMS )
+#  include <stl/_ios.h>
+# elif !defined (_STLP_USE_NO_IOSTREAMS)
+#  include <wrap_std/ios>
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x1032)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_IOS */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/ios.h b/main/source/stlport/stlport/ios.h
new file mode 100644
index 00000000..c8cacb65
--- /dev/null
+++ b/main/source/stlport/stlport/ios.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_IOS_H
+# define _STLP_IOS_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x1033
+#  include <stl/_prolog.h>
+# endif
+
+# if defined (_STLP_OWN_IOSTREAMS)
+
+#ifdef __BORLANDC__
+#  include <ios.>
+#else
+#  include <ios>
+#endif
+
+# if defined (_STLP_USE_NAMESPACES)
+# include <using/ios>
+# endif
+
+# elif !defined (_STLP_USE_NO_IOSTREAMS)
+
+# include _STLP_NATIVE_OLD_STREAMS_HEADER(ios.h)
+# if defined (_STLP_USE_NAMESPACES) && !defined (_STLP_BROKEN_USING_DIRECTIVE)
+_STLP_BEGIN_NAMESPACE
+using _STLP_OLD_IO_NAMESPACE::ios;
+_STLP_END_NAMESPACE
+# endif /* _STLP_USE_OWN_NAMESPACE */
+
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x1033)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_IOS_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/iosfwd b/main/source/stlport/stlport/iosfwd
new file mode 100644
index 00000000..7c8d2790
--- /dev/null
+++ b/main/source/stlport/stlport/iosfwd
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+#ifndef _STLP_IOSFWD
+#define _STLP_IOSFWD
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x1034
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+# if defined (_STLP_OWN_IOSTREAMS)
+
+#  if defined (_STLP_HAS_WCHAR_T) && !defined (_STLP_CWCHAR)
+#   include <cwchar>
+#  endif			
+
+#  include <stl/_iosfwd.h>
+
+# elif defined (_STLP_USE_NO_IOSTREAMS)
+
+#  include <stl/char_traits.h> 
+
+# else
+
+_STLP_BEGIN_NAMESPACE
+template <class _Tp> class allocator;
+_STLP_END_NAMESPACE
+
+#  include <wrap_std/iosfwd>
+
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x1034)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_IOSFWD */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/iostream b/main/source/stlport/stlport/iostream
new file mode 100644
index 00000000..3432377c
--- /dev/null
+++ b/main/source/stlport/stlport/iostream
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+#ifndef _STLP_IOSTREAM
+#define _STLP_IOSTREAM
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x1037
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+# if defined (_STLP_OWN_IOSTREAMS)
+
+#include <stl/_iosfwd.h>
+#include <stl/_istream.h>
+
+_STLP_BEGIN_NAMESPACE
+
+#ifndef _STLP_USE_NAMESPACES
+// in case of SGI iostreams, we have to rename our streams not to clash with those
+// provided in native lib
+# define cin _STLP_cin
+# define cout _STLP_cout
+# define cerr _STLP_cerr
+# define clog _STLP_clog
+#endif
+
+// Note: cin and wcin are both associated with stdio.  The C standard
+// (Amendment 1, section 4.6.2.1) says that it is an error to mix
+// wide- and narrow-oriented I/O on the same stream.  This implies
+// that it is an error to use both cin and wcin in the same C++
+// program; the same applies to cout and wcout, and cerr/clog and
+// wcerr/wclog.
+
+extern _STLP_DECLSPEC istream cin;
+extern _STLP_DECLSPEC ostream cout;
+extern _STLP_DECLSPEC ostream cerr;
+extern _STLP_DECLSPEC ostream clog;
+
+# ifndef _STLP_NO_WCHAR_T
+extern _STLP_DECLSPEC wistream wcin;
+extern _STLP_DECLSPEC wostream wcout;
+extern _STLP_DECLSPEC wostream wcerr;
+extern _STLP_DECLSPEC wostream wclog;
+# endif
+
+# ifndef __LOCALE_INITIALIZED
+#  define __LOCALE_INITIALIZED
+// Global initializer object, to ensure initialization of locale subsystem.
+static ios_base::_Loc_init _LocInit;
+# endif
+
+# ifndef __IOS_BASE_INITIALIZED
+#  define __IOS_BASE_INITIALIZED
+// Global initializer object, to ensure construction of static objects.
+static ios_base::Init _IosInit;
+# endif
+
+_STLP_END_NAMESPACE
+
+# elif defined ( _STLP_USE_NO_IOSTREAMS )
+#  include <stl/_null_stream.h>
+# else
+
+#  include <wrap_std/iostream>
+
+# endif /* STL_USE_NO_IOSTREAMS */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x1037)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_IOSTREAM */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/iostream.h b/main/source/stlport/stlport/iostream.h
new file mode 100644
index 00000000..08303258
--- /dev/null
+++ b/main/source/stlport/stlport/iostream.h
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_IOSTREAM_H
+# define _STLP_IOSTREAM_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x2035
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_OWN_IOSTREAMS
+
+#ifdef __BORLANDC__
+# include <iostream.>
+#else
+# include <iostream>
+#endif
+
+// Those should be included all separately, as they do contain using declarations
+# include <streambuf.h>
+# include <ostream.h>
+# include <istream.h>
+
+# ifndef _STLP_HAS_NO_NAMESPACES
+
+#  ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace _STLP_STD;
+#  else
+using _STLP_STD::cin;
+using _STLP_STD::cout;
+using _STLP_STD::clog;
+using _STLP_STD::cerr;
+using _STLP_STD::iostream;
+
+#   ifndef _STLP_NO_WCHAR_T
+using _STLP_STD::wcin;
+using _STLP_STD::wcout;
+using _STLP_STD::wclog;
+using _STLP_STD::wcerr;
+#   endif
+
+#  endif
+
+# endif /* _STLP_HAS_NO_NAMESPACES */
+
+// Obsolete classes for old-style backwards compatibility
+
+
+class istream_withassign : public istream {
+ public:
+  istream_withassign() : istream((streambuf*)0) {}
+  ~istream_withassign() {}
+  
+  istream_withassign& operator=(istream& __s) { 
+    ios::init(__s.rdbuf()); 
+    return *this; 
+  }
+  istream_withassign& operator=(streambuf* __s) {
+    ios::init(__s); 
+    return *this; 
+  }
+};
+
+class ostream_withassign : public ostream {
+ public:
+  ostream_withassign() : ostream((streambuf*)0) {}
+  ~ostream_withassign() {}
+  
+  ostream_withassign& operator=(ostream& __s) { 
+    ios::init(__s.rdbuf()); 
+    return *this; 
+  }
+  ostream_withassign& operator=(streambuf* __s) { 
+    ios::init(__s); 
+    return *this; 
+  }
+};
+
+class iostream_withassign : public iostream {
+ public:
+  iostream_withassign() : iostream((streambuf*)0) {}
+  ~iostream_withassign() {}
+  iostream_withassign & operator=(ios& __i) {
+    ios::init(__i.rdbuf());
+    return *this; 
+  }
+  iostream_withassign & operator=(streambuf* __s) {
+    ios::init(__s); 
+    return *this; 
+  }
+} ;
+
+# elif ! defined (_STLP_USE_NO_IOSTREAMS)
+#  include <wrap_std/h/iostream.h>
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x2035)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_IOSTREAM_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/istream b/main/source/stlport/stlport/istream
new file mode 100644
index 00000000..cfb0e372
--- /dev/null
+++ b/main/source/stlport/stlport/istream
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+#ifndef _STLP_ISTREAM
+#define _STLP_ISTREAM
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x1036
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+# if defined (_STLP_OWN_IOSTREAMS)
+
+// boris : apparently, needed to resolve some
+// circular dependancies
+// #  include <iterator>
+#  include <stl/_istream.h>
+
+# elif !defined(_STLP_USE_NO_IOSTREAMS)
+
+#  include <wrap_std/istream>
+
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x1036)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_ISTREAM */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/istream.h b/main/source/stlport/stlport/istream.h
new file mode 100644
index 00000000..c3f102de
--- /dev/null
+++ b/main/source/stlport/stlport/istream.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_ISTREAM_H
+# define _STLP_ISTREAM_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x2037
+#  include <stl/_prolog.h>
+# endif
+
+# if defined (_STLP_OWN_IOSTREAMS)
+
+# include <istream>
+
+# ifndef _STLP_HAS_NO_NAMESPACES
+#  ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace _STLP_STD;
+#  else
+using _STLP_STD::basic_istream;
+using _STLP_STD::basic_iostream;
+using _STLP_STD::istream;
+using _STLP_STD::iostream;
+using _STLP_STD::ios;
+#   ifndef _STLP_NO_WCHAR_T
+using _STLP_STD::wistream;
+using _STLP_STD::wiostream;
+#   endif
+using _STLP_STD::ws;
+#  endif
+# endif
+
+# elif !defined (_STLP_USE_NO_IOSTREAMS)
+
+# include _STLP_NATIVE_OLD_STREAMS_HEADER(istream.h)
+
+# if defined (_STLP_USE_NAMESPACES) && !defined (_STLP_BROKEN_USING_DIRECTIVE)
+_STLP_BEGIN_NAMESPACE
+using _STLP_OLD_IO_NAMESPACE::istream;
+_STLP_END_NAMESPACE
+# endif /* _STLP_USE_OWN_NAMESPACE */
+
+# endif /* _STLP_OWN_IOSTREAMS */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x2037)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_ISTREAM_H */
+
diff --git a/main/source/stlport/stlport/iterator b/main/source/stlport/stlport/iterator
new file mode 100644
index 00000000..9bf50e0f
--- /dev/null
+++ b/main/source/stlport/stlport/iterator
@@ -0,0 +1,59 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_ITERATOR
+#define _STLP_ITERATOR
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x38
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+#if defined (_STLP_IMPORT_VENDOR_STD)
+# include _STLP_NATIVE_HEADER(iterator)
+#endif /* IMPORT */
+
+# ifndef _STLP_INTERNAL_ITERATOR_H
+#  include <stl/_iterator.h>
+# endif
+
+# ifndef _STLP_INTERNAL_STREAM_ITERATOR_H
+#  include <stl/_stream_iterator.h>
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x38)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_ITERATOR */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/limits b/main/source/stlport/stlport/limits
new file mode 100644
index 00000000..e6db5345
--- /dev/null
+++ b/main/source/stlport/stlport/limits
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_LIMITS
+#define _STLP_LIMITS
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x39
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+# ifndef _STLP_LIMITS_H
+#  include <stl/_limits.h>
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x39)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_LIMITS */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/list b/main/source/stlport/stlport/list
new file mode 100644
index 00000000..51bd19a9
--- /dev/null
+++ b/main/source/stlport/stlport/list
@@ -0,0 +1,55 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_LIST
+#define _STLP_LIST
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x40
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+#ifndef _STLP_INTERNAL_LIST_H
+# include <stl/_list.h>
+#endif
+
+#if defined (_STLP_WHOLE_VENDOR_STD)
+# include _STLP_NATIVE_HEADER(list)
+#endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x40)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_LIST */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/locale b/main/source/stlport/stlport/locale
new file mode 100644
index 00000000..9301351e
--- /dev/null
+++ b/main/source/stlport/stlport/locale
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+#ifndef _STLP_LOCALE
+#define _STLP_LOCALE
+
+// Basic framework: class locale and class locale::facet
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x1041
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+# if defined (_STLP_OWN_IOSTREAMS)
+
+// Individual facets
+#ifndef _STLP_INTERNAL_CTYPE_H
+#include <stl/_ctype.h>
+#endif
+#ifndef _STLP_INTERNAL_CODECVT_H
+#include <stl/_codecvt.h>
+#endif
+#ifndef _STLP_INTERNAL_COLLATE_H
+#include <stl/_collate.h>
+#endif
+#ifndef _STLP_INTERNAL_NUM_PUT_H
+# include <stl/_num_put.h>
+#endif
+
+#ifndef _STLP_INTERNAL_NUM_GET_H
+# include <stl/_num_get.h>
+#endif
+
+// those never included separately anyway
+#include <stl/_monetary.h>
+#include <stl/_time_facets.h>
+#include <stl/_messages_facets.h>
+
+// some stuff for streambuf iterators ended up defined there
+// Strictly speaking, _istream.h portion is only required for <iterator>, but it may break too many 
+// programs if we omit it
+#ifndef _STLP_ISTREAM_H
+# include <stl/_istream.h>
+#endif
+
+// Convenience interfaces
+#undef isspace
+#undef isprint
+#undef iscntrl
+#undef isupper
+#undef islower
+#undef isalpha
+#undef isdigit
+#undef ispunct
+#undef isxdigit
+#undef isalnum
+#undef isgraph
+#undef toupper
+#undef tolower
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _CharT> 
+inline bool isspace (_CharT c, const locale& loc) {
+  return (use_facet<ctype<_CharT> >(loc)).is(ctype_base::space, c);
+}
+
+template <class _CharT> 
+inline bool isprint (_CharT c, const locale& loc) {
+  return (use_facet<ctype<_CharT> >(loc)).is(ctype_base::print, c);
+}
+
+template <class _CharT> 
+inline bool iscntrl (_CharT c, const locale& loc) {
+  return (use_facet<ctype<_CharT> >(loc)).is(ctype_base::cntrl, c);
+}
+
+template <class _CharT> 
+inline bool isupper (_CharT c, const locale& loc) {
+  return (use_facet<ctype<_CharT> >(loc)).is(ctype_base::upper, c);
+}
+
+template <class _CharT> 
+inline bool islower (_CharT c, const locale& loc) {
+  return (use_facet<ctype<_CharT> >(loc)).is(ctype_base::lower, c);
+}
+
+template <class _CharT> 
+inline bool isalpha (_CharT c, const locale& loc) {
+  return (use_facet<ctype<_CharT> >(loc)).is(ctype_base::alpha, c);
+}
+
+template <class _CharT> 
+inline bool isdigit (_CharT c, const locale& loc) {
+  return (use_facet<ctype<_CharT> >(loc)).is(ctype_base::digit, c);
+}
+
+template <class _CharT> 
+inline bool ispunct (_CharT c, const locale& loc) {
+  return (use_facet<ctype<_CharT> >(loc)).is(ctype_base::punct, c);
+}
+
+template <class _CharT> 
+inline bool isxdigit (_CharT c, const locale& loc) {
+  return (use_facet<ctype<_CharT> >(loc)).is(ctype_base::xdigit, c);
+}
+
+template <class _CharT> 
+inline bool isalnum (_CharT c, const locale& loc) {
+  return (use_facet<ctype<_CharT> >(loc)).is(ctype_base::alnum, c);
+}
+
+template <class _CharT> 
+inline bool isgraph (_CharT c, const locale& loc) {
+  return (use_facet<ctype<_CharT> >(loc)).is(ctype_base::graph, c);
+}
+
+template <class _CharT>
+inline _CharT toupper(_CharT c, const locale& loc) {
+  return (use_facet<ctype<_CharT> >(loc)).toupper(c);
+}
+
+template <class _CharT>
+inline _CharT tolower(_CharT c, const locale& loc) {
+  return (use_facet<ctype<_CharT> >(loc)).tolower(c);
+}
+
+# ifndef __LOCALE_INITIALIZED
+#  define __LOCALE_INITIALIZED
+// Global initializer object, to ensure initialization of locale subsystem.
+static ios_base::_Loc_init _LocInit;
+# endif
+
+_STLP_END_NAMESPACE
+
+# elif !defined (_STLP_USE_NO_IOSTREAMS)
+#  include <wrap_std/locale> 
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x1041)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_LOCALE */
+
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/locale.h b/main/source/stlport/stlport/locale.h
new file mode 100644
index 00000000..4caea0f8
--- /dev/null
+++ b/main/source/stlport/stlport/locale.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# if !defined (_STLP_OUTERMOST_HEADER_ID)
+#  define _STLP_OUTERMOST_HEADER_ID 0x242
+#  include <stl/_prolog.h>
+# elif (_STLP_OUTERMOST_HEADER_ID == 0x242) && ! defined (_STLP_DONT_POP_0x242)
+#  define _STLP_DONT_POP_0x242
+# endif
+
+# include _STLP_NATIVE_C_HEADER(locale.h)
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x242)
+#  if ! defined (_STLP_DONT_POP_0x242)
+#   include <stl/_epilog.h>
+#   undef  _STLP_OUTERMOST_HEADER_ID
+#   endif
+#   undef  _STLP_DONT_POP_0x242
+# endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/map b/main/source/stlport/stlport/map
new file mode 100644
index 00000000..e7b59ea7
--- /dev/null
+++ b/main/source/stlport/stlport/map
@@ -0,0 +1,53 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_MAP
+#define _STLP_MAP
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x43
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+#include <stl/_map.h>
+
+#if defined (_STLP_WHOLE_VENDOR_STD)
+# include _STLP_NATIVE_HEADER(map)
+#endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x43)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_MAP */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/math.h b/main/source/stlport/stlport/math.h
new file mode 100644
index 00000000..c817b7c8
--- /dev/null
+++ b/main/source/stlport/stlport/math.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# if !defined (_STLP_OUTERMOST_HEADER_ID)
+#  define _STLP_OUTERMOST_HEADER_ID 0x244
+#  include <stl/_prolog.h>
+# elif (_STLP_OUTERMOST_HEADER_ID == 0x244) && ! defined (_STLP_DONT_POP_0x244)
+#  define _STLP_DONT_POP_0x244
+# endif
+
+# if ! defined (exception) && (! defined (__KCC) || (__KCC_VERSION < 4000)) && \
+   ! (defined(__IBMCPP__) && (500 <= __IBMCPP__))
+#  define __EXCEPTION_WAS_REDEFINED 1
+#  define exception __math_exception
+# endif
+
+# include _STLP_NATIVE_C_HEADER(math.h)
+
+# if defined (__EXCEPTION_WAS_REDEFINED)
+#  undef exception
+#  undef __EXCEPTION_WAS_REDEFINED
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x244)
+#  if ! defined (_STLP_DONT_POP_0x244)
+#   include <stl/_epilog.h>
+#   undef  _STLP_OUTERMOST_HEADER_ID
+#   endif
+#   undef  _STLP_DONT_POP_0x244
+# endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/mem.h b/main/source/stlport/stlport/mem.h
new file mode 100644
index 00000000..0b0232f1
--- /dev/null
+++ b/main/source/stlport/stlport/mem.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+// Boris : highly questionable header for BC++
+
+#ifndef _STLP_mem_h
+
+# if !defined (_STLP_OUTERMOST_HEADER_ID)
+#  define _STLP_OUTERMOST_HEADER_ID 0x245
+#  include <stl/_prolog.h>
+# elif (_STLP_OUTERMOST_HEADER_ID == 0x245) && ! defined (_STLP_DONT_POP_0x245)
+#  define _STLP_DONT_POP_0x245
+# endif
+
+# if (__BORLANDC__ > 0x530) && !defined(__linux__)
+#  include <rw/stddefs.h>
+# endif
+
+#   undef __USING_CNAME__
+
+#   include _STLP_NATIVE_C_HEADER(mem.h)
+
+# define _STLP_mem_h 1
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x245)
+#  if ! defined (_STLP_DONT_POP_0x245)
+#   include <stl/_epilog.h>
+#   undef  _STLP_OUTERMOST_HEADER_ID
+#   endif
+#   undef  _STLP_DONT_POP_0x245
+# endif
+
+#endif /* _STLP_mem_h */
+
+// #endif /* NATIVE */
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/memory b/main/source/stlport/stlport/memory
new file mode 100644
index 00000000..b00aff42
--- /dev/null
+++ b/main/source/stlport/stlport/memory
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 1997-1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_MEMORY
+# define _STLP_MEMORY
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x46
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+# ifndef _STLP_INTERNAL_ALLOC_H
+#  include <stl/_alloc.h>
+# endif
+
+# ifndef _STLP_INTERNAL_TEMPBUF_H
+#  include <stl/_tempbuf.h>
+# endif
+
+# ifndef _STLP_INTERNAL_RAW_STORAGE_ITER_H
+#  include <stl/_raw_storage_iter.h>
+# endif
+
+# include <stl/_auto_ptr.h>
+
+# if defined (_STLP_IMPORT_VENDOR_STD)
+
+#  if defined (__MSL__)
+#   include _STLP_NATIVE_HEADER(limits)
+#  endif
+
+#  include _STLP_NATIVE_HEADER(memory)
+
+#  if defined (__MSL__) && (__MSL__ >= 0x2405	 && __MSL__ < 0x5201) 
+/*  980401 vss  MSL 2.4  Pro 3 Release  */	
+#   include <new_mem.h>
+#  endif
+
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x46)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_MEMORY */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/mmemory.h b/main/source/stlport/stlport/mmemory.h
new file mode 100644
index 00000000..386a3c06
--- /dev/null
+++ b/main/source/stlport/stlport/mmemory.h
@@ -0,0 +1 @@
+CAUUSE A SYNTAX ERROR
diff --git a/main/source/stlport/stlport/new b/main/source/stlport/stlport/new
new file mode 100644
index 00000000..2fe63ddf
--- /dev/null
+++ b/main/source/stlport/stlport/new
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_NEW_HEADER
+# define _STLP_NEW_HEADER
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x447
+#  include <stl/_prolog.h>
+# endif
+
+#ifndef _STLP_CSTDDEF
+// size_t
+# include <cstddef>
+#endif
+
+#if defined (__BORLANDC__) && (__BORLANDC__ > 0x520)
+// new.h uses ::malloc ;(
+# include <cstdlib>
+using _STLP_VENDOR_CSTD::malloc;
+#endif
+
+# if !defined (_STLP_NO_NEW_NEW_HEADER)
+#   include _STLP_NATIVE_CPP_RUNTIME_HEADER(new)
+#  else
+#   include  <new.h>
+# endif
+
+#ifndef _STLP_NEW_H_HEADER
+# include <stl/_new.h>
+#endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x447)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_NEW */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/new.h b/main/source/stlport/stlport/new.h
new file mode 100644
index 00000000..d20daf41
--- /dev/null
+++ b/main/source/stlport/stlport/new.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+
+# if !defined (_STLP_OUTERMOST_HEADER_ID)
+#  define _STLP_OUTERMOST_HEADER_ID 0x848
+#  include <stl/_prolog.h>
+# elif (_STLP_OUTERMOST_HEADER_ID == 0x848) && ! defined (_STLP_DONT_POP_0x848)
+#  define _STLP_DONT_POP_0x848
+# endif
+
+# ifndef _STLP_WINCE
+# if defined (__BORLANDC__)
+#  include <new.>
+# elif (__INTEL_COMPILER >= 800)
+#   include _STLP_NATIVE_OLD_STREAMS_HEADER(new.h)
+# else
+#  if defined (__GNUC__) && (__GNUC__ >=3)
+#   include _STLP_NATIVE_OLD_STREAMS_HEADER(new.h)
+#  else
+#   include _STLP_NATIVE_CPP_RUNTIME_HEADER(new.h)
+#  endif
+# endif
+# endif /* STL_WINCE */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x848)
+#  if ! defined (_STLP_DONT_POP_0x848)
+#   include <stl/_epilog.h>
+#   undef  _STLP_OUTERMOST_HEADER_ID
+#   endif
+#   undef  _STLP_DONT_POP_0x848
+# endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/numeric b/main/source/stlport/stlport/numeric
new file mode 100644
index 00000000..46daa9ae
--- /dev/null
+++ b/main/source/stlport/stlport/numeric
@@ -0,0 +1,50 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_NUMERIC
+#define _STLP_NUMERIC
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x49
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+#ifndef _STLP_INTERNAL_FUNCTION_H
+# include <stl/_function.h>
+#endif
+
+#include <stl/_numeric.h>
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x49)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_NUMERIC */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/old_hp/algo.h b/main/source/stlport/stlport/old_hp/algo.h
new file mode 100644
index 00000000..27728916
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/algo.h
@@ -0,0 +1,146 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_ALGO_H
+#define _STLP_ALGO_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa001
+#  include <stl/_prolog.h>
+# endif
+
+# ifndef _STLP_ALGOBASE_H
+#  include <algobase.h>
+# endif
+
+# ifndef _STLP_TEMPBUF_H
+#  include <tempbuf.h>
+# endif
+
+# ifndef _STLP_INTERNAL_HEAP_H
+#  include <stl/_heap.h>
+# endif
+
+# ifndef _STLP_ITERATOR_H
+#  include <iterator.h>
+# endif
+
+# ifndef _STLP_INTERNAL_ALGO_H
+#  include <stl/_algo.h>
+# endif
+
+# ifndef _STLP_NUMERIC_H
+#  include <stl/_numeric.h>
+# endif
+
+#ifdef _STLP_USE_NAMESPACES
+
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace STLPORT;
+# else
+// Names from <stl/_algo.h>
+using STLPORT::for_each; 
+using STLPORT::find; 
+using STLPORT::find_if; 
+using STLPORT::adjacent_find; 
+using STLPORT::count; 
+using STLPORT::count_if; 
+using STLPORT::search; 
+using STLPORT::search_n; 
+using STLPORT::swap_ranges; 
+using STLPORT::transform; 
+using STLPORT::replace; 
+using STLPORT::replace_if; 
+using STLPORT::replace_copy; 
+using STLPORT::replace_copy_if; 
+using STLPORT::generate; 
+using STLPORT::generate_n; 
+// using STLPORT::remove; 
+using STLPORT::remove_if; 
+using STLPORT::remove_copy; 
+using STLPORT::remove_copy_if; 
+using STLPORT::unique; 
+using STLPORT::unique_copy; 
+using STLPORT::reverse; 
+using STLPORT::reverse_copy; 
+using STLPORT::rotate; 
+using STLPORT::rotate_copy; 
+using STLPORT::random_shuffle; 
+using STLPORT::random_sample; 
+using STLPORT::random_sample_n; 
+using STLPORT::partition; 
+using STLPORT::stable_partition; 
+using STLPORT::sort; 
+using STLPORT::stable_sort; 
+using STLPORT::partial_sort; 
+using STLPORT::partial_sort_copy; 
+using STLPORT::nth_element; 
+using STLPORT::lower_bound; 
+using STLPORT::upper_bound; 
+using STLPORT::equal_range; 
+using STLPORT::binary_search; 
+using STLPORT::merge; 
+using STLPORT::inplace_merge; 
+using STLPORT::includes; 
+using STLPORT::set_union; 
+using STLPORT::set_intersection; 
+using STLPORT::set_difference; 
+using STLPORT::set_symmetric_difference; 
+using STLPORT::min_element; 
+using STLPORT::max_element; 
+using STLPORT::next_permutation; 
+using STLPORT::prev_permutation; 
+using STLPORT::find_first_of; 
+using STLPORT::find_end; 
+using STLPORT::is_sorted; 
+using STLPORT::is_heap; 
+
+// Names from stl_heap.h
+using STLPORT::push_heap;
+using STLPORT::pop_heap;
+using STLPORT::make_heap;
+using STLPORT::sort_heap;
+
+// Names from <stl/_numeric.h>
+using STLPORT::accumulate; 
+using STLPORT::inner_product; 
+using STLPORT::partial_sum; 
+using STLPORT::adjacent_difference; 
+using STLPORT::power; 
+using STLPORT::iota; 
+
+# endif /* _STLP_BROKEN_USING_DIRECTIVE */
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa001)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_ALGO_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/old_hp/algobase.h b/main/source/stlport/stlport/old_hp/algobase.h
new file mode 100644
index 00000000..50991b98
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/algobase.h
@@ -0,0 +1,97 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_ALGOBASE_H
+#define _STLP_ALGOBASE_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa002
+#  include <stl/_prolog.h>
+# endif
+
+#ifndef _STLP_PAIR_H
+#include <pair.h>
+#endif
+
+// memmove
+#ifndef _STLP_CSTRING
+# include <cstring>
+#endif
+
+// CHAR_MAX
+#ifndef _STLP_CLIMITS
+# include <climits>
+#endif
+
+#ifndef _STLP_ITERATOR_H
+#include <iterator.h>
+#endif
+
+#ifndef _STLP_INTERNAL_ALGOBASE_H
+#include <stl/_algobase.h>
+#endif
+
+#ifndef _STLP_INTERNAL_UNINITIALIZED_H
+#include <stl/_uninitialized.h>
+#endif
+
+#ifdef _STLP_USE_NAMESPACES
+
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace STLPORT;
+# else
+// Names from stl_algobase.h
+using STLPORT::iter_swap; 
+using STLPORT::swap; 
+using STLPORT::min; 
+using STLPORT::max; 
+using STLPORT::copy; 
+using STLPORT::copy_backward; 
+using STLPORT::copy_n; 
+using STLPORT::fill; 
+using STLPORT::fill_n; 
+using STLPORT::mismatch; 
+using STLPORT::equal; 
+using STLPORT::lexicographical_compare; 
+using STLPORT::lexicographical_compare_3way; 
+
+// Names from stl_uninitialized.h
+using STLPORT::uninitialized_copy;
+using STLPORT::uninitialized_copy_n;
+using STLPORT::uninitialized_fill;
+using STLPORT::uninitialized_fill_n;
+# endif /* _STLP_BROKEN_USING_DIRECTIVE */
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa002)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_ALGOBASE_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/old_hp/alloc.h b/main/source/stlport/stlport/old_hp/alloc.h
new file mode 100644
index 00000000..037c2dda
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/alloc.h
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_ALLOC_H
+#define _STLP_ALLOC_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa003
+#  include <stl/_prolog.h>
+# endif
+
+#if defined  (_STLP_DEBUG) || defined (_STLP_ASSERTIONS) && !defined (_STLP_DEBUG_H)
+# include <stl/debug/_debug.h>
+#endif
+
+# ifndef _STLP_CSTDDEF
+#  include <cstddef>
+# endif
+# ifndef _STLP_CLIMITS
+#  include <climits>
+# endif
+# ifndef _STLP_CSTDLIB
+#  include <cstdlib>
+# endif
+# ifndef _STLP_CSTRING
+#  include <cstring>
+# endif
+# ifndef _STLP_CASSERT
+#  include <cassert>
+# endif
+
+#ifndef _STLP_INTERNAL_ALLOC_H
+#include <stl/_alloc.h>
+#endif
+
+// Old SGI names
+_STLP_BEGIN_NAMESPACE
+
+typedef __sgi_alloc alloc;
+typedef __malloc_alloc<0> malloc_alloc;
+#ifdef _STLP_USE_NEWALLOC
+typedef __new_alloc new_alloc;
+#endif
+
+#define simple_alloc __simple_alloc
+typedef __single_client_alloc  single_client_alloc; 
+typedef __multithreaded_alloc  multithreaded_alloc; 
+
+_STLP_END_NAMESPACE
+
+#ifdef _STLP_USE_NAMESPACES
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+
+using namespace STLPORT;
+
+# else
+
+# ifdef _STLP_USE_RAW_SGI_ALLOCATORS
+using _STLP_STD::simple_alloc;
+using _STLP_STD::alloc;
+# endif
+
+using _STLP_STD::malloc_alloc; 
+# ifdef _STLP_DEBUG_ALLOC
+using _STLP_STD::__debug_alloc;
+# endif 
+#ifdef _STLP_USE_NEWALLOC
+using _STLP_STD::new_alloc;
+#endif
+
+using _STLP_STD::single_client_alloc; 
+using _STLP_STD::multithreaded_alloc; 
+using _STLP_STD::allocator;
+
+# endif /* _STLP_BROKEN_USING_DIRECTIVE */
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa003)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_ALLOC_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/old_hp/bvector.h b/main/source/stlport/stlport/old_hp/bvector.h
new file mode 100644
index 00000000..56f1fb82
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/bvector.h
@@ -0,0 +1,68 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_BVECTOR_H
+#define _STLP_BVECTOR_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa004
+#  include <stl/_prolog.h>
+# endif
+
+#include <algobase.h>
+
+#include <stl/_range_errors.h>
+
+#ifdef _STLP_CLASS_PARTIAL_SPECIALIZATION
+#include <vector.h>
+#else
+#include <alloc.h>
+#endif 
+
+#include <stl/_vector.h>
+#include <stl/_bvector.h>
+
+#ifdef _STLP_USE_NAMESPACES
+
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace STLPORT;
+# else
+using _STLP_STD::bit_vector;
+# endif
+
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa004)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_BVECTOR_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
+
diff --git a/main/source/stlport/stlport/old_hp/defalloc.h b/main/source/stlport/stlport/old_hp/defalloc.h
new file mode 100644
index 00000000..529add39
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/defalloc.h
@@ -0,0 +1,87 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Hewlett-Packard Company makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ *
+ */
+
+// Inclusion of this file is DEPRECATED.  This is the original HP
+// default allocator.  It is provided only for backward compatibility.
+// This file WILL BE REMOVED in a future release.
+//
+// DO NOT USE THIS FILE unless you have an old container implementation
+// that requires an allocator with the HP-style interface.  
+//
+// Standard-conforming allocators have a very different interface.  The
+// standard default allocator is declared in the header <memory>.
+
+// Adaptation note: THIS version of allocator<T> is fully compatible with
+// SGI containers and works OK standalone. It is also as close to CD2 version
+// as possible w/o member templates.
+// However, explicit use of allocator<T>  is not recommended 
+// unless you have to do so ( for example, compiling third-party code).
+
+#ifndef _STLP_DEFALLOC_H
+#define _STLP_DEFALLOC_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa005
+#  include <stl/_prolog.h>
+# endif
+
+# if defined (_STLP_DEBUG) && ! defined ( _STLP_DEBUG_H )
+#  include <stl/debug/_debug.h>
+# endif
+
+#if defined (_STLP_USE_NEW_STYLE_HEADERS)
+# include <cstddef>
+# include <cstdlib>
+# include <cstring>
+# include <cassert>
+#else
+# include <stddef.h>
+# include <stdlib.h>
+# include <string.h>
+# include <assert.h>
+#endif
+
+# include <new>
+
+#ifdef _STLP_THREADS
+# include <stl/_threads.h>
+#endif
+
+# if !defined (__THROW_BAD_ALLOC) && !defined(_STLP_USE_EXCEPTIONS)
+#   if defined (_STLP_USE_NEW_STYLE_HEADERS)
+#    include <cstdio>
+#   else
+#    include <stdio.h>
+#   endif
+# endif
+#  include <stl/_alloc.h>
+
+// fbp: just for backwards compatibility,
+// hope this doesn't break anything.
+#ifdef _STLP_USE_NAMESPACES
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace STLPORT;
+# else
+using STLPORT::allocator;
+# endif /* _STLP_BROKEN_USING_DIRECTIVE */
+#endif /*  _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa005)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_DEFALLOC_H */
+
diff --git a/main/source/stlport/stlport/old_hp/deque.h b/main/source/stlport/stlport/old_hp/deque.h
new file mode 100644
index 00000000..b5024187
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/deque.h
@@ -0,0 +1,68 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_DEQUE_H
+#define _STLP_DEQUE_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa006
+#  include <stl/_prolog.h>
+# endif
+
+#ifndef _STLP_ALGOBASE_H
+# include <algobase.h>
+#endif
+
+#ifndef _STLP_RANGE_ERRORS_H
+# include <stl/_range_errors.h>
+#endif
+
+#ifndef _STLP_ALLOC_H
+# include <alloc.h>
+#endif
+
+#ifndef _STLP_INTERNAL_DEQUE_H
+# include <stl/_deque.h>
+#endif
+
+#ifdef _STLP_USE_NAMESPACES
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace STLPORT;
+# else
+using STLPORT::deque;
+using STLPORT::__deque__;
+# endif /*  _STLP_BROKEN_USING_DIRECTIVE */
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa006)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_DEQUE_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/old_hp/export b/main/source/stlport/stlport/old_hp/export
new file mode 100644
index 00000000..4c000fb7
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/export
@@ -0,0 +1,27 @@
+./algo.h
+./algobase.h
+./alloc.h
+./bvector.h
+./defalloc.h
+./deque.h
+./function.h
+./hash_map.h
+./hash_set.h
+./hashtable.h
+./heap.h
+./iterator.h
+./list.h
+./map.h
+./multimap.h
+./multiset.h
+./numeric.h
+./pair.h
+./pthread_alloc.h
+./queue.h
+./rope.h
+./set.h
+./slist.h
+./stack.h
+./tempbuf.h
+./tree.h
+./vector.h
diff --git a/main/source/stlport/stlport/old_hp/function.h b/main/source/stlport/stlport/old_hp/function.h
new file mode 100644
index 00000000..c5dc5f76
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/function.h
@@ -0,0 +1,126 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_FUNCTION_H
+#define _STLP_FUNCTION_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa008
+#  include <stl/_prolog.h>
+# endif
+
+#ifndef _STLP_CSTDDEF
+# include <cstddef>
+#endif
+
+#ifndef _STLP_INTERNAL_ALGOBASE_H
+#include <stl/_algobase.h>
+#endif
+
+#ifndef _STLP_INTERNAL_FUNCTION_H
+#include <stl/_function.h>
+#endif
+
+#ifdef _STLP_USE_NAMESPACES
+
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace STLPORT;
+#ifndef _STLP_NO_RELOPS_NAMESPACE
+using namespace STLPORT_RELOPS;
+#endif /* _STLP_USE_NAMESPACE_FOR_RELOPS */
+
+# else /* _STLP_BROKEN_USING_DIRECTIVE */
+
+// Names from stl_function.h
+using _STLP_STD::unary_function; 
+using _STLP_STD::binary_function; 
+using _STLP_STD::plus; 
+using _STLP_STD::minus; 
+using _STLP_STD::multiplies; 
+using _STLP_STD::divides; 
+using _STLP_STD::identity_element; 
+using _STLP_STD::modulus; 
+using _STLP_STD::negate; 
+using _STLP_STD::equal_to; 
+using _STLP_STD::not_equal_to; 
+using _STLP_STD::greater; 
+using _STLP_STD::less; 
+using _STLP_STD::greater_equal; 
+using _STLP_STD::less_equal; 
+using _STLP_STD::logical_and; 
+using _STLP_STD::logical_or; 
+using _STLP_STD::logical_not; 
+using _STLP_STD::unary_negate; 
+using _STLP_STD::binary_negate; 
+using _STLP_STD::not1; 
+using _STLP_STD::not2; 
+using _STLP_STD::binder1st; 
+using _STLP_STD::binder2nd; 
+using _STLP_STD::bind1st; 
+using _STLP_STD::bind2nd; 
+using _STLP_STD::unary_compose; 
+using _STLP_STD::binary_compose; 
+using _STLP_STD::compose1; 
+using _STLP_STD::compose2; 
+using _STLP_STD::pointer_to_unary_function; 
+using _STLP_STD::pointer_to_binary_function; 
+using _STLP_STD::ptr_fun; 
+using _STLP_STD::identity; 
+using _STLP_STD::select1st; 
+using _STLP_STD::select2nd; 
+using _STLP_STD::project1st; 
+using _STLP_STD::project2nd; 
+using _STLP_STD::constant_void_fun; 
+using _STLP_STD::constant_unary_fun; 
+using _STLP_STD::constant_binary_fun; 
+using _STLP_STD::constant0; 
+using _STLP_STD::constant1; 
+using _STLP_STD::constant2; 
+using _STLP_STD::subtractive_rng; 
+using _STLP_STD::mem_fun_t; 
+using _STLP_STD::const_mem_fun_t; 
+using _STLP_STD::mem_fun_ref_t; 
+using _STLP_STD::const_mem_fun_ref_t; 
+using _STLP_STD::mem_fun1_t; 
+using _STLP_STD::const_mem_fun1_t; 
+using _STLP_STD::mem_fun1_ref_t; 
+using _STLP_STD::const_mem_fun1_ref_t; 
+using _STLP_STD::mem_fun; 
+using _STLP_STD::mem_fun_ref; 
+using _STLP_STD::mem_fun1; 
+using _STLP_STD::mem_fun1_ref; 
+# endif
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa008)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_FUNCTION_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/old_hp/hash_map.h b/main/source/stlport/stlport/old_hp/hash_map.h
new file mode 100644
index 00000000..bbc77dca
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/hash_map.h
@@ -0,0 +1,62 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_HASH_MAP_H
+#define _STLP_HASH_MAP_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa009
+#  include <stl/_prolog.h>
+# endif
+
+#ifndef _STLP_HASHTABLE_H
+#include <hashtable.h>
+#endif 
+
+#include <stl/_hash_map.h>
+
+#ifdef _STLP_USE_NAMESPACES
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace STLPORT;
+# else
+using _STLP_STD::hash;
+using STLPORT::hashtable;
+using STLPORT::hash_map;
+using STLPORT::hash_multimap;
+using STLPORT::__hash_map__;
+using STLPORT::__hash_multimap__;
+# endif
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa009)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_HASH_MAP_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/old_hp/hash_set.h b/main/source/stlport/stlport/old_hp/hash_set.h
new file mode 100644
index 00000000..02bc50b0
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/hash_set.h
@@ -0,0 +1,58 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_HASH_SET_H
+#define _STLP_HASH_SET_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa010
+#  include <stl/_prolog.h>
+# endif
+
+#ifndef _STLP_HASHTABLE_H
+#include <hashtable.h>
+#endif 
+
+#include <stl/_hash_set.h>
+
+#ifdef _STLP_USE_NAMESPACES
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace STLPORT;
+# else
+using _STLP_STD::hash;
+using STLPORT::hashtable;
+using STLPORT::hash_set;
+using STLPORT::hash_multiset;
+using STLPORT::__hash_set__;
+using STLPORT::__hash_multiset__;
+# endif
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa010)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_HASH_SET_H */
diff --git a/main/source/stlport/stlport/old_hp/hashtable.h b/main/source/stlport/stlport/old_hp/hashtable.h
new file mode 100644
index 00000000..4cab02e5
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/hashtable.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_HASHTABLE_H
+#define _STLP_HASHTABLE_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa011
+#  include <stl/_prolog.h>
+# endif
+
+#ifndef _STLP_ALGO_H
+#include <algo.h>
+#endif
+#ifndef _STLP_ALLOC_H
+#include <alloc.h>
+#endif
+#ifndef _STLP_VECTOR_H
+#include <vector.h>
+#endif
+#ifndef _STLP_HASH_FUN_H
+#include <stl/_hash_fun.h>
+#endif
+#ifndef _STLP_INTERNAL_HASHTABLE_H
+#include <stl/_hashtable.h>
+#endif
+
+#ifdef _STLP_USE_NAMESPACES
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace STLPORT;
+# else
+using _STLP_STD::hash;
+using STLPORT::hashtable;
+# endif
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa011)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+#endif /* _STLP_HASHTABLE_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/old_hp/heap.h b/main/source/stlport/stlport/old_hp/heap.h
new file mode 100644
index 00000000..8d8b9095
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/heap.h
@@ -0,0 +1,58 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_HEAP_H
+#define _STLP_HEAP_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x12
+#  include <stl/_prolog.h>
+# endif
+
+#include <stl/_heap.h>
+
+#ifdef _STLP_USE_NAMESPACES
+
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace std;
+# else
+using STLPORT::push_heap;
+using STLPORT::pop_heap;
+using STLPORT::make_heap;
+using STLPORT::sort_heap;
+# endif
+
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x12)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_HEAP_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/old_hp/iterator.h b/main/source/stlport/stlport/old_hp/iterator.h
new file mode 100644
index 00000000..2f79c2ad
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/iterator.h
@@ -0,0 +1,147 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_ITERATOR_H
+#define _STLP_ITERATOR_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa013
+#  include <stl/_prolog.h>
+# endif
+
+#if defined  (_STLP_DEBUG) || defined (_STLP_ASSERTIONS) && !defined (_STLP_DEBUG_H)
+# include <stl/debug/_debug.h>
+#endif
+
+#if defined (_STLP_USE_NEW_STYLE_HEADERS)
+# include <cstddef>
+#else
+# include <stddef.h>
+#endif
+
+# ifndef _STLP_NEW
+#  include <new>
+# endif
+
+# ifndef __TYPE_TRAITS_H
+#  include <stl/type_traits.h>
+# endif
+
+#ifndef _STLP_FUNCTION_H
+#include <function.h>
+#endif
+
+# ifndef _STLP_IOSFWD
+#  include <iosfwd>
+# endif
+
+# ifndef _STLP_INTERNAL_ITERATOR_BASE_H
+#  include <stl/_iterator_base.h>
+# endif
+
+# ifndef _STLP_INTERNAL_ITERATOR_H
+#  include <stl/_iterator.h>
+# endif
+
+#ifndef _STLP_INTERNAL_CONSTRUCT_H
+#include <stl/_construct.h>
+#endif
+
+#ifndef _STLP_INTERNAL_RAW_STORAGE_ITERATOR_H
+#include <stl/_raw_storage_iter.h>
+#endif
+
+# ifndef _STLP_INTERNAL_STREAM_ITERATOR_H
+#  include <stl/_stream_iterator.h>
+# endif
+
+#ifdef _STLP_USE_NAMESPACES
+
+// Names from stl_iterator.h
+
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace STLPORT;
+# else
+
+using STLPORT::input_iterator_tag;
+using STLPORT::output_iterator_tag;
+using STLPORT::forward_iterator_tag;
+using STLPORT::bidirectional_iterator_tag;
+using STLPORT::random_access_iterator_tag;
+
+using STLPORT::input_iterator;
+using STLPORT::output_iterator;
+using STLPORT::forward_iterator;
+using STLPORT::bidirectional_iterator;
+using STLPORT::random_access_iterator;
+
+#ifdef _STLP_CLASS_PARTIAL_SPECIALIZATION
+using STLPORT::iterator_traits;
+#endif
+
+# ifdef _STLP_USE_OLD_HP_ITERATOR_QUERIES
+using STLPORT::iterator_category;
+using STLPORT::distance_type;
+using STLPORT::value_type;
+# endif
+
+using STLPORT::distance; 
+using STLPORT::advance; 
+
+using STLPORT::insert_iterator;
+using STLPORT::front_insert_iterator;
+using STLPORT::back_insert_iterator;
+using STLPORT::inserter;
+using STLPORT::front_inserter;
+using STLPORT::back_inserter;
+
+using STLPORT::reverse_iterator;
+# if ! defined ( _STLP_CLASS_PARTIAL_SPECIALIZATION ) || defined (_STLP_USE_OLD_HP_ITERATOR_QUERIES)
+using STLPORT::reverse_bidirectional_iterator;
+# endif
+using STLPORT::istream_iterator;
+using STLPORT::ostream_iterator;
+
+// Names from stl_construct.h
+using STLPORT::construct;
+using STLPORT::destroy;
+
+// Names from stl_raw_storage_iter.h
+using STLPORT::raw_storage_iterator;
+# endif
+
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa013)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_ITERATOR_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/old_hp/list.h b/main/source/stlport/stlport/old_hp/list.h
new file mode 100644
index 00000000..045c9d25
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/list.h
@@ -0,0 +1,62 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_LIST_H
+#define _STLP_LIST_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa014
+#  include <stl/_prolog.h>
+# endif
+
+#ifndef _STLP_ALGOBASE_H
+# include <algobase.h>
+#endif
+
+#ifndef _STLP_ALLOC_H
+# include <alloc.h>
+#endif
+
+#include <stl/_list.h>
+
+#ifdef _STLP_USE_NAMESPACES
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace STLPORT;
+# else
+using STLPORT::list;
+using STLPORT::__list__;
+# endif
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa014)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_LIST_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/old_hp/map.h b/main/source/stlport/stlport/old_hp/map.h
new file mode 100644
index 00000000..965cfe87
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/map.h
@@ -0,0 +1,60 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_MAP_H
+# define _STLP_MAP_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa015
+#  include <stl/_prolog.h>
+# endif
+
+#ifndef _STLP_TREE_H
+# include <tree.h>
+#endif
+
+# include <stl/_map.h>
+
+#ifdef _STLP_USE_NAMESPACES
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace STLPORT;
+# else
+using STLPORT::map;
+# ifdef _STLP_LIMITED_DEFAULT_TEMPLATES
+using STLPORT::__map;
+# endif
+# endif
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa015)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_MAP_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/old_hp/multimap.h b/main/source/stlport/stlport/old_hp/multimap.h
new file mode 100644
index 00000000..f1318231
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/multimap.h
@@ -0,0 +1,58 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_MULTIMAP_H
+#define _STLP_MULTIMAP_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa016
+#  include <stl/_prolog.h>
+# endif
+
+#ifndef _STLP_TREE_H
+# include <tree.h>
+#endif
+
+#include <stl/_map.h>
+
+#ifdef _STLP_USE_NAMESPACES
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace STLPORT;
+# else
+using STLPORT::multimap;
+using STLPORT::__multimap__;
+# endif
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa016)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_MULTIMAP_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/old_hp/multiset.h b/main/source/stlport/stlport/old_hp/multiset.h
new file mode 100644
index 00000000..178bfb60
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/multiset.h
@@ -0,0 +1,58 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_MULTISET_H
+#define _STLP_MULTISET_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa017
+#  include <stl/_prolog.h>
+# endif
+
+#ifndef _STLP_TREE_H
+# include <tree.h>
+#endif
+
+#include <stl/_set.h>
+
+#ifdef _STLP_USE_NAMESPACES
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace STLPORT;
+# else
+using STLPORT::multiset;
+using STLPORT::__multiset__;
+# endif
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa017)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_MULTISET_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/old_hp/numeric.h b/main/source/stlport/stlport/old_hp/numeric.h
new file mode 100644
index 00000000..590b75a2
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/numeric.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn, Inc. makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ *
+ */
+
+#ifndef _STLP_NUMERIC_H
+# define _STLP_NUMERIC_H
+
+#ifndef __MWERKS__
+# error This file should be removed from installations not using the Metrowerks Standard Library
+#else
+# include <numeric>
+//# include <algo.h>
+#endif
+
+# endif // _STLP_NUMERIC_H
diff --git a/main/source/stlport/stlport/old_hp/pair.h b/main/source/stlport/stlport/old_hp/pair.h
new file mode 100644
index 00000000..d0e87725
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/pair.h
@@ -0,0 +1,59 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_PAIR_H
+#define _STLP_PAIR_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa020
+#  include <stl/_prolog.h>
+# endif
+
+#ifndef _STLP_INTERNAL_ALGOBASE_H
+#  include <stl/_algobase.h>
+#endif
+
+#ifdef _STLP_USE_NAMESPACES
+
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace STLPORT;
+# else
+using _STLP_STD::pair;
+using _STLP_STD::make_pair;
+# endif
+
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa020)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_PAIR_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/old_hp/pthread_alloc.h b/main/source/stlport/stlport/old_hp/pthread_alloc.h
new file mode 100644
index 00000000..a2046395
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/pthread_alloc.h
@@ -0,0 +1,57 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_PTHREAD_ALLOC_H
+#define _STLP_PTHREAD_ALLOC_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa021
+#  include <stl/_prolog.h>
+# endif
+
+#if defined  (_STLP_DEBUG) || defined (_STLP_ASSERTIONS)
+# include <stl/debug/_debug.h>
+#endif
+
+#include <pthread_alloc>
+
+#ifdef _STLP_USE_NAMESPACES
+
+using STLPORT::_Pthread_alloc_template;
+using STLPORT::pthread_alloc;
+
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa021)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_PTHREAD_ALLOC_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/old_hp/queue.h b/main/source/stlport/stlport/old_hp/queue.h
new file mode 100644
index 00000000..77730bc4
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/queue.h
@@ -0,0 +1,23 @@
+/*
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef __QUEUE__
+# define __QUEUE__
+# include <queue>
+#endif
diff --git a/main/source/stlport/stlport/old_hp/rope.h b/main/source/stlport/stlport/old_hp/rope.h
new file mode 100644
index 00000000..3bcec55a
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/rope.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_ROPE_H
+#define _STLP_ROPE_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa022
+#  include <stl/_prolog.h>
+# endif
+
+#include <stl/_rope.h>
+
+#ifdef _STLP_USE_NAMESPACES
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace STLPORT;
+# else
+using STLPORT::char_producer; 
+using STLPORT::sequence_buffer; 
+using STLPORT::rope; 
+using STLPORT::crope; 
+using STLPORT::wrope; 
+# endif
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa022)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_ROPE_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/old_hp/set.h b/main/source/stlport/stlport/old_hp/set.h
new file mode 100644
index 00000000..14c963b1
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/set.h
@@ -0,0 +1,57 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_SET_H
+#define _STLP_SET_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa023
+#  include <stl/_prolog.h>
+# endif
+
+#ifndef _STLP_TREE_H
+# include <tree.h>
+#endif
+
+#include <stl/_set.h>
+
+#ifdef _STLP_USE_NAMESPACES
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace STLPORT;
+# else
+using STLPORT::set;
+using STLPORT::__set__;
+# endif
+#endif /* _STLP_USE_NAMESPACES */
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa023)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_SET_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/old_hp/slist.h b/main/source/stlport/stlport/old_hp/slist.h
new file mode 100644
index 00000000..00e3359d
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/slist.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_SLIST_H
+#define _STLP_SLIST_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa024
+#  include <stl/_prolog.h>
+# endif
+
+#ifndef _STLP_ALGOBASE_H
+# include <algobase.h>
+#endif
+
+#ifndef _STLP_ALLOC_H
+# include <alloc.h>
+#endif
+
+#include <stl/_slist.h>
+
+#ifdef _STLP_USE_NAMESPACES
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace STLPORT;
+# else
+using STLPORT::slist;
+#  ifdef _STLP_LIMITED_DEFAULT_TEMPLATES
+using STLPORT::__slist;
+#  endif
+# endif
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa024)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_SLIST_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/old_hp/stack.h b/main/source/stlport/stlport/old_hp/stack.h
new file mode 100644
index 00000000..ec4dd600
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/stack.h
@@ -0,0 +1,73 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_STACK_H
+#define _STLP_STACK_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa027
+#  include <stl/_prolog.h>
+# endif
+
+#ifndef _STLP_VECTOR_H
+#include <vector.h>
+#endif
+
+#ifndef _STLP_DEQUE_H
+#include <deque.h>
+#endif
+
+#ifndef _STLP_HEAP_H
+#include <heap.h>
+#endif
+
+#ifndef _STLP_INTERNAL_STACK_H
+#include <stl/_stack.h>
+#endif
+
+#ifndef _STLP_INTERNAL_QUEUE_H
+#include <stl/_queue.h>
+#endif
+
+#ifdef _STLP_USE_NAMESPACES
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace STLPORT;
+# else
+using _STLP_STD::stack;
+using _STLP_STD::queue;
+using _STLP_STD::priority_queue;
+# endif
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa027)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_STACK_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/old_hp/tempbuf.h b/main/source/stlport/stlport/old_hp/tempbuf.h
new file mode 100644
index 00000000..8336b6c3
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/tempbuf.h
@@ -0,0 +1,79 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_TEMPBUF_H
+#define _STLP_TEMPBUF_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa028
+#  include <stl/_prolog.h>
+# endif
+
+# ifndef _STLP_CLIMITS
+#  include <climits>
+# endif
+
+#ifndef _STLP_CSTDDEF
+# include <cstddef>
+#endif
+
+#ifndef _STLP_CSTDLIB
+# include <cstdlib>
+#endif
+
+#if !defined (_STLP_NEW)
+# include <new>
+#endif
+
+#ifndef __TYPE_TRAITS_H
+#include <stl/type_traits.h>
+#endif
+
+#ifndef _STLP_PAIR_H
+#include <pair.h>
+#endif
+
+#ifndef _STLP_INTERNAL_TEMPBUF_H
+#include <stl/_tempbuf.h>
+#endif
+
+#ifdef _STLP_USE_NAMESPACES
+
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace STLPORT;
+# else
+using _STLP_STD::get_temporary_buffer;
+using _STLP_STD::return_temporary_buffer;
+using _STLP_STD::temporary_buffer;
+# endif
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa028)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_TEMPBUF_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/old_hp/tree.h b/main/source/stlport/stlport/old_hp/tree.h
new file mode 100644
index 00000000..eb243d39
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/tree.h
@@ -0,0 +1,60 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_TREE_H
+#define _STLP_TREE_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa030
+#  include <stl/_prolog.h>
+# endif
+
+#ifndef _STLP_ALGOBASE_H
+#include <algobase.h>
+#endif
+
+#ifndef _STLP_ALLOC_H
+#include <alloc.h>
+#endif
+
+#ifndef _STLP_INTERNAL_TREE_H
+#include <stl/_tree.h>
+#endif
+
+#ifdef _STLP_USE_NAMESPACES
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace STLPORT;
+# else
+using _STLP_STD::rb_tree;
+# endif
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa030)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_TREE_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/old_hp/vector.h b/main/source/stlport/stlport/old_hp/vector.h
new file mode 100644
index 00000000..b8d0c0cc
--- /dev/null
+++ b/main/source/stlport/stlport/old_hp/vector.h
@@ -0,0 +1,65 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_VECTOR_H
+#define _STLP_VECTOR_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0xa031
+#  include <stl/_prolog.h>
+# endif
+
+#ifndef _STLP_ALGOBASE_H
+# include <algobase.h>
+#endif
+
+#ifndef _STLP_ALLOC_H
+# include <alloc.h>
+#endif
+
+# ifndef _STLP_RANGE_ERRORS_H
+#  include <stl/_range_errors.h>
+# endif
+
+#ifndef _STLP_INTERNAL_VECTOR_H
+# include <stl/_vector.h>
+#endif
+
+#ifdef _STLP_USE_NAMESPACES
+# ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace STLPORT;
+# else
+using STLPORT::vector;
+using STLPORT::__vector__;
+# endif
+#endif /* _STLP_USE_NAMESPACES */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0xa031)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_VECTOR_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/ostream b/main/source/stlport/stlport/ostream
new file mode 100644
index 00000000..f06dc1b4
--- /dev/null
+++ b/main/source/stlport/stlport/ostream
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+#ifndef _STLP_OSTREAM
+#define _STLP_OSTREAM
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x1050
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+# if defined (_STLP_OWN_IOSTREAMS)
+
+#  include <stl/_ostream.h>
+
+# elif !defined(_STLP_USE_NO_IOSTREAMS)
+
+#  include <wrap_std/ostream>
+
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x1050)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_OSTREAM */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/ostream.h b/main/source/stlport/stlport/ostream.h
new file mode 100644
index 00000000..438f945c
--- /dev/null
+++ b/main/source/stlport/stlport/ostream.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_OSTREAM_H
+# define _STLP_OSTREAM_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x2051
+#  include <stl/_prolog.h>
+# endif
+
+# if defined (_STLP_OWN_IOSTREAMS)
+
+#ifdef __BORLANDC__
+#  include <ostream.>
+#else
+#  include <ostream>
+#endif
+
+#  ifdef _STLP_USE_NAMESPACES
+#   include <using/ostream>
+#  endif
+
+# elif !defined (_STLP_USE_NO_IOSTREAMS)
+
+#  include _STLP_NATIVE_OLD_STREAMS_HEADER(ostream.h)
+#  if defined (_STLP_USE_NAMESPACES) && !defined (_STLP_BROKEN_USING_DIRECTIVE)
+_STLP_BEGIN_NAMESPACE
+#   include <using/h/ostream.h>
+_STLP_END_NAMESPACE
+#  endif /* _STLP_USE_NAMESPACES */
+
+# endif /* _STLP_USE_NO_IOSTREAMS */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x2051)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_OSTREAM_H */
+
diff --git a/main/source/stlport/stlport/pthread.h b/main/source/stlport/stlport/pthread.h
new file mode 100644
index 00000000..14eecc67
--- /dev/null
+++ b/main/source/stlport/stlport/pthread.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# if !defined (_STLP_OUTERMOST_HEADER_ID)
+#  define _STLP_OUTERMOST_HEADER_ID 0x280
+#  include <stl/_prolog.h>
+# elif (_STLP_OUTERMOST_HEADER_ID == 0x280) && ! defined (_STLP_DONT_POP_0x280)
+#  define _STLP_DONT_POP_0x280
+# endif
+
+# if defined (__SUNPRO_CC) || defined (__HP_aCC)
+# include "/usr/include/pthread.h"
+# else
+# include _STLP_NATIVE_C_HEADER(pthread.h)
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x280)
+#  if ! defined (_STLP_DONT_POP_0x280)
+#   include <stl/_epilog.h>
+#   undef  _STLP_OUTERMOST_HEADER_ID
+#  endif
+#  undef  _STLP_DONT_POP_0x280
+# endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/pthread_alloc b/main/source/stlport/stlport/pthread_alloc
new file mode 100644
index 00000000..31a4d5f1
--- /dev/null
+++ b/main/source/stlport/stlport/pthread_alloc
@@ -0,0 +1,49 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_PTHREAD_ALLOC
+#define _STLP_PTHREAD_ALLOC
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x52
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+# include <stl/_pthread_alloc.h>
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x52)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_PTHREAD_ALLOC */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/queue b/main/source/stlport/stlport/queue
new file mode 100644
index 00000000..aa384764
--- /dev/null
+++ b/main/source/stlport/stlport/queue
@@ -0,0 +1,55 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_QUEUE
+#define _STLP_QUEUE
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x53
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+#ifndef _STLP_INTERNAL_QUEUE_H
+# include <stl/_queue.h>
+#endif
+
+#ifndef _STLP_INTERNAL_FUNCTION_H
+# include <functional>
+#endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x53)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_QUEUE */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/rlocks.h b/main/source/stlport/stlport/rlocks.h
new file mode 100644
index 00000000..670c4df6
--- /dev/null
+++ b/main/source/stlport/stlport/rlocks.h
@@ -0,0 +1,11 @@
+#ifndef _STLP_misc_rlocks_h
+# define _STLP_misc_rlocks_h
+# if (__SUNPRO_CC >= 0x500 )
+#  include <../CCios/rlocks.h>
+# elif defined (__SUNPRO_CC) 
+#  include <../CC/rlocks.h>
+# else 
+#  error "This file is for SUN CC only. Please remove it if it causes any harm for other compilers." 
+# endif
+#endif
+
diff --git a/main/source/stlport/stlport/rope b/main/source/stlport/stlport/rope
new file mode 100644
index 00000000..a1adfc70
--- /dev/null
+++ b/main/source/stlport/stlport/rope
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Silicon Graphics makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ */
+
+#ifndef _STLP_ROPE
+#define _STLP_ROPE
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x54
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+# include <stl/_rope.h>
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x54)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_ROPE */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/set b/main/source/stlport/stlport/set
new file mode 100644
index 00000000..fcdd7ce2
--- /dev/null
+++ b/main/source/stlport/stlport/set
@@ -0,0 +1,53 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_SET
+#define _STLP_SET
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x55
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+#include <stl/_set.h>
+
+#if defined (_STLP_WHOLE_VENDOR_STD)
+# include _STLP_NATIVE_HEADER(set)
+#endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x55)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_SET */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/setjmp.h b/main/source/stlport/stlport/setjmp.h
new file mode 100644
index 00000000..01e27574
--- /dev/null
+++ b/main/source/stlport/stlport/setjmp.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# if !defined (_STLP_OUTERMOST_HEADER_ID)
+#  define _STLP_OUTERMOST_HEADER_ID 0x256
+#  include <stl/_prolog.h>
+# elif (_STLP_OUTERMOST_HEADER_ID == 0x256) && ! defined (_STLP_DONT_POP_0x256)
+#  define _STLP_DONT_POP_0x256
+# endif
+
+
+# ifndef setjmp
+#  include _STLP_NATIVE_C_HEADER(setjmp.h)
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x256)
+#  if ! defined (_STLP_DONT_POP_0x256)
+#   include <stl/_epilog.h>
+#   undef  _STLP_OUTERMOST_HEADER_ID
+#   endif
+#   undef  _STLP_DONT_POP_0x256
+# endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/signal.h b/main/source/stlport/stlport/signal.h
new file mode 100644
index 00000000..476cf877
--- /dev/null
+++ b/main/source/stlport/stlport/signal.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# if !defined (_STLP_OUTERMOST_HEADER_ID)
+#  define _STLP_OUTERMOST_HEADER_ID 0x257
+#  include <stl/_prolog.h>
+# elif (_STLP_OUTERMOST_HEADER_ID == 0x257) && ! defined (_STLP_DONT_POP_0x257)
+#  define _STLP_DONT_POP_0x257
+# endif
+
+# include _STLP_NATIVE_C_HEADER(signal.h)
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x257)
+#  if ! defined (_STLP_DONT_POP_0x257)
+#   include <stl/_epilog.h>
+#   undef  _STLP_OUTERMOST_HEADER_ID
+#   endif
+#   undef  _STLP_DONT_POP_0x257
+# endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/slist b/main/source/stlport/stlport/slist
new file mode 100644
index 00000000..9e4d34e9
--- /dev/null
+++ b/main/source/stlport/stlport/slist
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Silicon Graphics makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ *
+ */
+
+#ifndef _STLP_SLIST
+#define _STLP_SLIST
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x58
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+#ifndef _STLP_INTERNAL_SLIST_H
+# include <stl/_slist.h>
+#endif
+
+#if defined (_STLP_WHOLE_VENDOR_STD)
+# include _STLP_NATIVE_HEADER(slist)
+#endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x58)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_SLIST */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/sstream b/main/source/stlport/stlport/sstream
new file mode 100644
index 00000000..52f08751
--- /dev/null
+++ b/main/source/stlport/stlport/sstream
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+// This header defines classes basic_stringbuf, basic_istringstream,
+// basic_ostringstream, and basic_stringstream.  These classes 
+// represent streamsbufs and streams whose sources or destinations are
+// C++ strings.
+
+#ifndef _STLP_SSTREAM
+#define _STLP_SSTREAM
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x1059
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+# if defined (_STLP_OWN_IOSTREAMS)
+
+# include <stl/_sstream.h>
+
+# elif !defined (_STLP_USE_NO_IOSTREAMS)
+
+# include <wrap_std/sstream>
+
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x1059)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_SSTREAM */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stack b/main/source/stlport/stlport/stack
new file mode 100644
index 00000000..0df22eec
--- /dev/null
+++ b/main/source/stlport/stlport/stack
@@ -0,0 +1,55 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_STACK
+#define _STLP_STACK
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x60
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+#ifndef _STLP_INTERNAL_STACK_H
+#include <stl/_stack.h>
+#endif
+
+#if defined (_STLP_WHOLE_VENDOR_STD)
+# include _STLP_NATIVE_HEADER(stack)
+#endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x60)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_STACK */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stdarg.h b/main/source/stlport/stlport/stdarg.h
new file mode 100644
index 00000000..d5688a3d
--- /dev/null
+++ b/main/source/stlport/stlport/stdarg.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# if !defined (_STLP_OUTERMOST_HEADER_ID)
+#  define _STLP_OUTERMOST_HEADER_ID 0x261
+#  include <stl/_prolog.h>
+# elif (_STLP_OUTERMOST_HEADER_ID == 0x261) && ! defined (_STLP_DONT_POP_0x261)
+#  define _STLP_DONT_POP_0x261
+# endif
+
+# include _STLP_NATIVE_C_HEADER(stdarg.h)
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x261)
+#  if ! defined (_STLP_DONT_POP_0x261)
+#   include <stl/_epilog.h>
+#   undef  _STLP_OUTERMOST_HEADER_ID
+#   endif
+#   undef  _STLP_DONT_POP_0x261
+# endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stddef.h b/main/source/stlport/stlport/stddef.h
new file mode 100644
index 00000000..0bcbdc14
--- /dev/null
+++ b/main/source/stlport/stlport/stddef.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x262
+#  include <stl/_prolog.h>
+# endif
+
+# ifndef _STLP_WINCE
+
+# include _STLP_NATIVE_C_HEADER(stddef.h)
+
+# endif /* WINCE */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x262)
+#  if ! defined (_STLP_DONT_POP_0x262)
+#   include <stl/_epilog.h>
+#   undef  _STLP_OUTERMOST_HEADER_ID
+#   endif
+#   undef  _STLP_DONT_POP_0x262
+# endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stdexcept b/main/source/stlport/stlport/stdexcept
new file mode 100644
index 00000000..97d31478
--- /dev/null
+++ b/main/source/stlport/stlport/stdexcept
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_STDEXCEPT
+
+# if !defined (_STLP_OUTERMOST_HEADER_ID)
+#  define _STLP_OUTERMOST_HEADER_ID 0x63
+#  include <stl/_prolog.h>
+# elif (_STLP_OUTERMOST_HEADER_ID == 0x63) && ! defined (_STLP_DONT_POP_0x63)
+#  define _STLP_DONT_POP_0x63
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+# if !defined(_STLP_STDEXCEPT_SEEN) && \
+   (!defined (_STLP_USE_NATIVE_STDEXCEPT) || defined (_STLP_USE_OWN_NAMESPACE))
+
+#  define _STLP_STDEXCEPT_SEEN 1
+
+#  include <exception>
+
+#if defined(_STLP_USE_EXCEPTIONS) || \
+    !(defined(_MIPS_SIM) && defined(_ABIO32) && _MIPS_SIM == _ABIO32)
+
+# include <cstring>
+
+#ifndef _STLP_INTERNAL_ALLOC_H
+# include <stl/_alloc.h>
+#endif
+
+#ifndef _STLP_STRING_FWD_H
+# include <stl/_string_fwd.h>
+#endif
+
+# define _STLP_OWN_STDEXCEPT 1
+
+_STLP_BEGIN_NAMESPACE
+
+# if   ! defined (_STLP_NO_EXCEPTION_HEADER)
+# if !defined(_STLP_EXCEPTION_BASE) && !defined(_STLP_BROKEN_EXCEPTION_CLASS) && defined (_STLP_USE_NAMESPACES) && defined (_STLP_USE_OWN_NAMESPACE)
+using _STLP_VENDOR_EXCEPT_STD::exception;
+# endif
+# endif
+#  define _STLP_EXCEPTION_BASE exception
+
+class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
+public:
+  __Named_exception(const string& __str) 
+# ifdef _STLP_OWN_IOSTREAMS
+    ;
+  const char* what() const _STLP_NOTHROW_INHERENTLY;
+  ~__Named_exception() _STLP_NOTHROW_INHERENTLY;
+# else
+  {
+    strncpy(_M_name, __get_c_string(__str), _S_bufsize);
+    _M_name[_S_bufsize - 1] = '\0';
+  }
+  const char* what() const _STLP_NOTHROW_INHERENTLY { return _M_name; }
+# endif
+
+private:
+  enum { _S_bufsize = 256 };
+  char _M_name[_S_bufsize];
+};
+
+class _STLP_CLASS_DECLSPEC logic_error : public __Named_exception {
+public:
+  logic_error(const string& __s) : __Named_exception(__s) {}
+# ifdef _STLP_OWN_IOSTREAMS
+  ~logic_error() _STLP_NOTHROW_INHERENTLY;
+# endif
+};
+
+class _STLP_CLASS_DECLSPEC runtime_error : public __Named_exception {
+public:
+  runtime_error(const string& __s) : __Named_exception(__s) {}
+# ifdef _STLP_OWN_IOSTREAMS
+  ~runtime_error() _STLP_NOTHROW_INHERENTLY;
+# endif
+};
+
+class _STLP_CLASS_DECLSPEC domain_error : public logic_error {
+public:
+  domain_error(const string& __arg) : logic_error(__arg) {}
+# ifdef _STLP_OWN_IOSTREAMS
+  ~domain_error() _STLP_NOTHROW_INHERENTLY;
+# endif
+};
+
+class _STLP_CLASS_DECLSPEC invalid_argument : public logic_error {
+public:
+  invalid_argument(const string& __arg) : logic_error(__arg) {}
+# ifdef _STLP_OWN_IOSTREAMS
+  ~invalid_argument() _STLP_NOTHROW_INHERENTLY;
+# endif
+};
+
+class _STLP_CLASS_DECLSPEC length_error : public logic_error {
+public:
+  length_error(const string& __arg) : logic_error(__arg) {}
+# ifdef _STLP_OWN_IOSTREAMS
+  ~length_error() _STLP_NOTHROW_INHERENTLY;
+# endif
+};
+
+class _STLP_CLASS_DECLSPEC out_of_range : public logic_error {
+public:
+  out_of_range(const string& __arg) : logic_error(__arg) {}
+# ifdef _STLP_OWN_IOSTREAMS
+  ~out_of_range() _STLP_NOTHROW_INHERENTLY;
+# endif
+};
+
+class _STLP_CLASS_DECLSPEC range_error : public runtime_error {
+public:
+  range_error(const string& __arg) : runtime_error(__arg) {}
+# ifdef _STLP_OWN_IOSTREAMS
+  ~range_error() _STLP_NOTHROW_INHERENTLY;
+# endif
+};
+
+class _STLP_CLASS_DECLSPEC overflow_error : public runtime_error {
+public:
+  overflow_error(const string& __arg) : runtime_error(__arg) {}
+# ifdef _STLP_OWN_IOSTREAMS
+  ~overflow_error() _STLP_NOTHROW_INHERENTLY;
+# endif
+};
+
+class _STLP_CLASS_DECLSPEC underflow_error : public runtime_error {
+public:
+  underflow_error(const string& __arg) : runtime_error(__arg) {}
+# ifdef _STLP_OWN_IOSTREAMS
+  ~underflow_error() _STLP_NOTHROW_INHERENTLY;
+# endif
+};
+
+_STLP_END_NAMESPACE
+
+#endif /* Not o32, and no exceptions */
+# endif /* _STLP_STDEXCEPT_SEEN */
+
+
+#if defined (_STLP_USE_NATIVE_STDEXCEPT)
+#  include _STLP_NATIVE_HEADER(stdexcept)
+# endif
+
+#  define _STLP_STDEXCEPT 1
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x63)
+#  if ! defined (_STLP_DONT_POP_0x63)
+#   include <stl/_epilog.h>
+#   undef  _STLP_OUTERMOST_HEADER_ID
+#   endif
+#   undef  _STLP_DONT_POP_0x63
+# endif
+
+#endif /* _STLP_STDEXCEPT */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stdio.h b/main/source/stlport/stlport/stdio.h
new file mode 100644
index 00000000..f9f838ad
--- /dev/null
+++ b/main/source/stlport/stlport/stdio.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x264
+#  include <stl/_prolog.h>
+# endif
+
+# if ! defined (_STLP_WINCE)
+# include _STLP_NATIVE_C_HEADER(stdio.h)
+
+#if defined (__SUNPRO_CC) && !defined (_STRUCT_FILE)
+# define _STRUCT_FILE
+#endif
+
+# ifdef __MWERKS__
+#  undef stdin
+#  undef stdout
+#  undef stderr
+
+#  define stdin  	(&_STLP_VENDOR_CSTD::__files[0])
+#  define stdout	(&_STLP_VENDOR_CSTD::__files[1])
+#  define stderr	(&_STLP_VENDOR_CSTD::__files[2])
+# endif
+
+# endif /* WINCE */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x264)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stdio_streambuf b/main/source/stlport/stlport/stdio_streambuf
new file mode 100644
index 00000000..1d1faef4
--- /dev/null
+++ b/main/source/stlport/stlport/stdio_streambuf
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+// This header is an extension.  It defines two streambufs:
+// stdio_istreambuf, a read-only streambuf synchronized with a C stdio
+// FILE object, and stdio_ostreambuf, a write-only streambuf
+// synchronized with a C stdio FILE object.  Note that neither 
+// stdio_istreambuf nor stdio_ostreambuf is a template; both classes
+// are derived from basic_streambuf<char, char_traits<char> >.
+
+// Note: the imbue() member function is a no-op.  In particular, these
+// classes assume that codecvt<char, char, mbstate_t> is always an identity
+// transformation.  This is true of the default locale, and of all locales
+// defined for the C I/O library.  If you need to use a locale where 
+// the codecvt<char, char, mbstate_t> facet performs a nontrivial 
+// conversion, then you should use basic_filebuf<> instead of stdio_istreambuf
+// or stdio_ostreambuf.  (If you don't understand what any of this means, 
+// then it's not a feature you need to worry about.  Locales where 
+// codecvt<char, char, mbstate_t> does something nontrivial are a rare
+// corner case.)
+
+
+#ifndef _STLP_STDIO_STREAMBUF
+#define _STLP_STDIO_STREAMBUF
+
+#if !defined(STLP_WINCE)
+
+#include <streambuf>            // For basic_streambuf<>
+#include <cstdio>              // For FILE.
+
+# ifndef _STLP_HAS_NO_NAMESPACES
+// This is an extension.  It is in namespace SGI, not namespace std
+namespace _SgI {
+
+# ifdef _STLP_USE_NAMESPACES
+using namespace _STLP_STD;
+  // MSVC needs this
+using _STLP_STD::streamsize;
+using _STLP_STD::streambuf;
+using _STLP_STD::basic_streambuf;
+using _STLP_STD::ios_base;
+  // using _STLP_STD::ios_base::openmode;
+# endif
+# endif
+
+// Base class for features common to stdio_istreambuf and stdio_ostreambuf
+class stdio_streambuf_base : public basic_streambuf<char, _STLP_STD::char_traits<char> >
+{
+public:                         // Constructor, destructor.
+  // The argument may not be null.  It must be an open file pointer.
+  stdio_streambuf_base(FILE*);
+
+  // The destructor flushes the stream, but does not close it.
+  ~stdio_streambuf_base();
+
+protected:                      // Virtual functions from basic_streambuf.
+  streambuf* setbuf(char*, streamsize);
+
+  pos_type seekoff(off_type, ios_base::seekdir,
+                   ios_base::openmode
+                          = ios_base::in | ios_base::out);
+  pos_type seekpos(pos_type,
+                   ios_base::openmode
+                          = ios_base::in | ios_base::out);
+  int sync();
+
+protected:
+  FILE* _M_file;
+};
+
+class stdio_istreambuf : public stdio_streambuf_base
+{
+public:                         // Constructor, destructor.
+  stdio_istreambuf(FILE* __f) : stdio_streambuf_base(__f) {}
+
+  ~stdio_istreambuf();
+
+protected:                      // Virtual functions from basic_streambuf.
+  streamsize showmanyc();
+  int_type underflow();
+  int_type uflow();
+  virtual int_type pbackfail(int_type c = traits_type::eof());
+};
+
+class stdio_ostreambuf : public stdio_streambuf_base
+{
+public:                         // Constructor, destructor.
+  stdio_ostreambuf(FILE* __f) : stdio_streambuf_base(__f) {}
+  ~stdio_ostreambuf();
+
+protected:                      // Virtual functions from basic_streambuf.
+  streamsize showmanyc();
+  int_type overflow(int_type c = traits_type::eof());
+};
+
+# ifndef _STLP_HAS_NO_NAMESPACES
+} // Close namespace _SgI.
+# endif
+
+#endif /* _STLP_STDIO_STREAMBUF */
+
+#endif /* _STLP_WINCE */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stdiostream.h b/main/source/stlport/stlport/stdiostream.h
new file mode 100644
index 00000000..c01af21a
--- /dev/null
+++ b/main/source/stlport/stlport/stdiostream.h
@@ -0,0 +1,10 @@
+#ifndef _STLP_misc_stdiostream_h
+# define _STLP_misc_stdiostream_h
+# if (__SUNPRO_CC >= 0x500 )
+#  include <../CCios/stdiostream.h>
+# else if defined (__SUNPRO_CC)
+#  include <../CC/stdiostream.h>
+# else
+#  error "This file is for SUN CC only. Please remove it if it causes any harm for other compilers."
+# endif
+#endif
diff --git a/main/source/stlport/stlport/stdlib.h b/main/source/stlport/stlport/stdlib.h
new file mode 100644
index 00000000..ad853c62
--- /dev/null
+++ b/main/source/stlport/stlport/stdlib.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# if !defined (_STLP_OUTERMOST_HEADER_ID)
+#  define _STLP_OUTERMOST_HEADER_ID 0x265
+#  include <stl/_prolog.h>
+# elif (_STLP_OUTERMOST_HEADER_ID == 0x265) && ! defined (_STLP_DONT_POP_0x265)
+#  define _STLP_DONT_POP_0x265
+# endif
+
+# include _STLP_NATIVE_C_HEADER(stdlib.h)
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x265)
+#  if ! defined (_STLP_DONT_POP_0x265)
+#   include <stl/_epilog.h>
+#   undef  _STLP_OUTERMOST_HEADER_ID
+#  endif
+#  undef  _STLP_DONT_POP_0x265
+# endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_abbrevs.h b/main/source/stlport/stlport/stl/_abbrevs.h
new file mode 100644
index 00000000..eed30b85
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_abbrevs.h
@@ -0,0 +1,70 @@
+/*
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_ABBREVS_H
+# define _STLP_INTERNAL_ABBREVS_H
+
+// ugliness is intentional - to reduce conflicts
+#  define input_iterator_tag             _In__ItT
+#  define output_iterator_tag            _Ou__ItT
+#  define bidirectional_iterator_tag     _Bd__ItT
+#  define random_access_iterator_tag     _Ra__ItT
+#  define input_iterator                 _In__It
+#  define output_iterator                _Ou__It
+#  define bidirectional_iterator         _Bd__It
+#  define random_access_iterator         _Ra__It
+#  define reverse_bidirectional_iterator _rBd__It
+#  define reverse_iterator               _r__It
+#  define back_insert_iterator           _bI__It
+#  define front_insert_iterator          _fI__It
+#  define raw_storage_iterator           _rS__It
+#  define _Const_traits _C_Tr
+#  define _Nonconst_traits _N_Tr
+
+// ugliness is intentional - to reduce conflicts probability
+#  define __malloc_alloc   M__A
+#  define __node_alloc     D__A
+#  define __new_alloc      N__A
+#  define __debug_alloc    G__A
+
+#  define __deque_iterator         _dQ__It
+#  define _Buf_traits              _dQ__BTr
+#  define _Deque_iterator          _Dq__It
+
+#  define _Select1st _S1st
+#  define _Select2nd _S2nd
+
+#  define _Hashtable_iterator         _hT__It
+#  define _Hashtable_const_iterator   _hT__cIt
+#  define _Hashtable_node             _hT__N
+#  define _Hashtable_base             _hT__B
+#  define _Ht_iterator _Ht_It
+
+#  define __list_iterator         _L__It
+#  define __slist_iterator         _SL__It
+
+#  define _Rb_tree_node_base       _rbT__NB
+#  define _Rb_tree_node            _rbT__N
+#  define _Rb_base_iterator        _rbTB__It
+#  define _Rb_tree_base_iterator   _rbT__It
+#  define _Rb_tree_base            _rbT__B
+
+#endif
+
diff --git a/main/source/stlport/stlport/stl/_algo.c b/main/source/stlport/stlport/stl/_algo.c
new file mode 100644
index 00000000..d7179d47
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_algo.c
@@ -0,0 +1,1765 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_ALGO_C
+# define _STLP_ALGO_C
+
+# if !defined (_STLP_INTERNAL_ALGO_H)
+#  include <stl/_algo.h>
+# endif
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _BidirectionalIter, class _Distance, class _Compare>
+void __merge_without_buffer(_BidirectionalIter __first,
+                            _BidirectionalIter __middle,
+                            _BidirectionalIter __last,
+                            _Distance __len1, _Distance __len2,
+                            _Compare __comp);
+
+
+template <class _BidirectionalIter1, class _BidirectionalIter2,
+          class _BidirectionalIter3, class _Compare>
+_BidirectionalIter3 __merge_backward(_BidirectionalIter1 __first1,
+                                     _BidirectionalIter1 __last1,
+                                     _BidirectionalIter2 __first2,
+                                     _BidirectionalIter2 __last2,
+                                     _BidirectionalIter3 __result,
+                                     _Compare __comp);
+
+template <class _Tp>
+# if !(defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x420 ))
+inline 
+# endif
+const _Tp& __median(const _Tp& __a, const _Tp& __b, const _Tp& __c) {
+  if (__a < __b)
+    if (__b < __c)
+      return __b;
+    else if (__a < __c)
+      return __c;
+    else
+      return __a;
+  else if (__a < __c)
+    return __a;
+  else if (__b < __c)
+    return __c;
+  else
+    return __b;
+}
+
+template <class _Tp, class _Compare>
+# if !(defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x420 ))
+inline 
+# endif
+const _Tp&
+__median(const _Tp& __a, const _Tp& __b, const _Tp& __c, _Compare __comp) {
+  if (__comp(__a, __b))
+    if (__comp(__b, __c))
+      return __b;
+    else if (__comp(__a, __c))
+      return __c;
+    else
+      return __a;
+  else if (__comp(__a, __c))
+    return __a;
+  else if (__comp(__b, __c))
+    return __c;
+  else
+    return __b;
+}
+
+template <class _ForwardIter1, class _ForwardIter2>
+_ForwardIter1 search(_ForwardIter1 __first1, _ForwardIter1 __last1,
+                     _ForwardIter2 __first2, _ForwardIter2 __last2) 
+{
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+  _STLP_DEBUG_CHECK(__check_range(__first2, __last2))
+  // Test for empty ranges
+  if (__first1 == __last1 || __first2 == __last2)
+    return __first1;
+
+  // Test for a pattern of length 1.
+  _ForwardIter2 __tmp(__first2);
+  ++__tmp;
+  if (__tmp == __last2)
+    return find(__first1, __last1, *__first2);
+
+  // General case.
+  _ForwardIter2 __p1 = __first2; 
+  ++__p1;
+
+  _ForwardIter1 __current = __first1;
+
+  while (__first1 != __last1) {
+    __first1 = find(__first1, __last1, *__first2);
+    if (__first1 == __last1)
+      return __last1;
+
+    _ForwardIter2 __p = __p1;
+    __current = __first1; 
+    if (++__current == __last1)
+      return __last1;
+
+    while (*__current == *__p) {
+      if (++__p == __last2)
+        return __first1;
+      if (++__current == __last1)
+        return __last1;
+    }
+
+    ++__first1;
+  }
+  return __first1;
+}
+
+// search_n.  Search for __count consecutive copies of __val.
+
+template <class _ForwardIter, class _Integer, class _Tp>
+_ForwardIter search_n(_ForwardIter __first, _ForwardIter __last,
+                      _Integer __count, const _Tp& __val) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  if (__count <= 0)
+    return __first;
+  else {
+    __first = find(__first, __last, __val);
+    while (__first != __last) {
+      _Integer __n = __count - 1;
+      _ForwardIter __i = __first;
+      ++__i;
+      while (__i != __last && __n != 0 && *__i == __val) {
+        ++__i;
+        --__n;
+      }
+      if (__n == 0)
+        return __first;
+      else
+        __first = find(__i, __last, __val);
+    }
+    return __last;
+  }
+}
+
+template <class _ForwardIter, class _Integer, class _Tp, class _BinaryPred>
+_ForwardIter search_n(_ForwardIter __first, _ForwardIter __last,
+                      _Integer __count, const _Tp& __val,
+                      _BinaryPred __binary_pred) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  if (__count <= 0)
+    return __first;
+  else {
+    while (__first != __last) {
+      if (__binary_pred(*__first, __val))
+        break;
+      ++__first;
+    }
+    while (__first != __last) {
+      _Integer __n = __count - 1;
+      _ForwardIter __i = __first;
+      ++__i;
+      while (__i != __last && __n != 0 && __binary_pred(*__i, __val)) {
+        ++__i;
+        --__n;
+      }
+      if (__n == 0)
+        return __first;
+      else {
+        while (__i != __last) {
+          if (__binary_pred(*__i, __val))
+            break;
+          ++__i;
+        }
+        __first = __i;
+      }
+    }
+    return __last;
+  }
+} 
+
+template <class _ForwardIter1, class _ForwardIter2>
+_ForwardIter1 
+find_end(_ForwardIter1 __first1, _ForwardIter1 __last1, 
+         _ForwardIter2 __first2, _ForwardIter2 __last2)
+{
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+  _STLP_DEBUG_CHECK(__check_range(__first2, __last2))
+  return __find_end(__first1, __last1, __first2, __last2,
+# if defined (_STLP_CLASS_PARTIAL_SPECIALIZATION)
+                    _STLP_ITERATOR_CATEGORY(__first1, _ForwardIter1),
+                    _STLP_ITERATOR_CATEGORY(__first2, _ForwardIter2),
+# else
+		    forward_iterator_tag(),
+                    forward_iterator_tag(),
+# endif
+                    __equal_to(_STLP_VALUE_TYPE(__first1, _ForwardIter1))
+    );
+}
+
+// unique and unique_copy
+template <class _InputIterator, class _OutputIterator, class _BinaryPredicate,
+					    class _Tp>
+_STLP_INLINE_LOOP _OutputIterator 
+__unique_copy(_InputIterator __first, _InputIterator __last,
+              _OutputIterator __result,
+              _BinaryPredicate __binary_pred, _Tp*) {
+  _Tp __val = *__first;
+  *__result = __val;
+  while (++__first != __last)
+    if (!__binary_pred(__val, *__first)) {
+      __val = *__first;
+      *++__result = __val;
+    }
+  return ++__result;
+}
+
+template <class _InputIter, class _OutputIter, class _BinaryPredicate>
+inline _OutputIter 
+__unique_copy(_InputIter __first, _InputIter __last,_OutputIter __result,
+              _BinaryPredicate __binary_pred, const output_iterator_tag &) {
+  return __unique_copy(__first, __last, __result, __binary_pred, _STLP_VALUE_TYPE(__first, _InputIter));
+}
+
+template <class _InputIter, class _ForwardIter, class _BinaryPredicate>
+_STLP_INLINE_LOOP _ForwardIter 
+__unique_copy(_InputIter __first, _InputIter __last, _ForwardIter __result, 
+              _BinaryPredicate __binary_pred, const forward_iterator_tag &) {
+  *__result = *__first;
+  while (++__first != __last)
+    if (!__binary_pred(*__result, *__first)) *++__result = *__first;
+  return ++__result;
+}
+
+# if defined (_STLP_NONTEMPL_BASE_MATCH_BUG)
+template <class _InputIterator, class _BidirectionalIterator, class _BinaryPredicate>
+inline _BidirectionalIterator 
+__unique_copy(_InputIterator __first, _InputIterator __last,
+              _BidirectionalIterator __result, _BinaryPredicate __binary_pred,
+              const bidirectional_iterator_tag &) {
+  return __unique_copy(__first, __last, __result, __binary_pred, forward_iterator_tag());
+}
+
+template <class _InputIterator, class _RandomAccessIterator, class _BinaryPredicate>
+inline _RandomAccessIterator 
+__unique_copy(_InputIterator __first, _InputIterator __last,
+              _RandomAccessIterator __result, _BinaryPredicate __binary_pred,
+              const random_access_iterator_tag &) {
+  return __unique_copy(__first, __last, __result, __binary_pred, forward_iterator_tag());
+}
+# endif /* _STLP_NONTEMPL_BASE_MATCH_BUG */
+
+
+template <class _InputIter, class _OutputIter>
+_OutputIter 
+unique_copy(_InputIter __first, _InputIter __last, _OutputIter __result) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  if (__first == __last) return __result;
+  return __unique_copy(__first, __last, __result, __equal_to(_STLP_VALUE_TYPE(__first, _InputIter)),
+                       _STLP_ITERATOR_CATEGORY(__result, _OutputIter));
+}
+
+template <class _InputIter, class _OutputIter, class _BinaryPredicate>
+_OutputIter 
+unique_copy(_InputIter __first, _InputIter __last,_OutputIter __result,
+            _BinaryPredicate __binary_pred) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  if (__first == __last) return __result;
+  return __unique_copy(__first, __last, __result, __binary_pred,
+                       _STLP_ITERATOR_CATEGORY(__result, _OutputIter));
+}
+
+// rotate and rotate_copy, and their auxiliary functions
+
+template <class _ForwardIter, class _Distance>
+_ForwardIter __rotate(_ForwardIter __first,
+                      _ForwardIter __middle,
+                      _ForwardIter __last,
+                      _Distance*,
+                      const forward_iterator_tag &) {
+  if (__first == __middle)
+    return __last;
+  if (__last  == __middle)
+    return __first;
+
+  _ForwardIter __first2 = __middle;
+  do {
+    swap(*__first++, *__first2++);
+    if (__first == __middle)
+      __middle = __first2;
+  } while (__first2 != __last);
+
+  _ForwardIter __new_middle = __first;
+
+  __first2 = __middle;
+
+  while (__first2 != __last) {
+    swap (*__first++, *__first2++);
+    if (__first == __middle)
+      __middle = __first2;
+    else if (__first2 == __last)
+      __first2 = __middle;
+  }
+
+  return __new_middle;
+}
+
+template <class _BidirectionalIter, class _Distance>
+_BidirectionalIter __rotate(_BidirectionalIter __first,
+                            _BidirectionalIter __middle,
+                            _BidirectionalIter __last,
+                            _Distance*,
+                            const bidirectional_iterator_tag &) {
+  if (__first == __middle)
+    return __last;
+  if (__last  == __middle)
+    return __first;
+
+  __reverse(__first,  __middle, bidirectional_iterator_tag());
+  __reverse(__middle, __last,   bidirectional_iterator_tag());
+
+  while (__first != __middle && __middle != __last)
+    swap (*__first++, *--__last);
+
+  if (__first == __middle) {
+    __reverse(__middle, __last,   bidirectional_iterator_tag());
+    return __last;
+  }
+  else {
+    __reverse(__first,  __middle, bidirectional_iterator_tag());
+    return __first;
+  }
+}
+
+template <class _RandomAccessIter, class _Distance, class _Tp>
+_RandomAccessIter __rotate(_RandomAccessIter __first,
+                           _RandomAccessIter __middle,
+                           _RandomAccessIter __last,
+                           _Distance *, _Tp *) {
+
+  _Distance __n = __last   - __first;
+  _Distance __k = __middle - __first;
+  _Distance __l = __n - __k;
+  _RandomAccessIter __result = __first + (__last - __middle);
+
+  if (__k==0)  /* __first == middle */
+    return __last;
+
+  if (__k == __l) {
+    swap_ranges(__first, __middle, __middle);
+    return __result;
+  }
+
+  _Distance __d = __gcd(__n, __k);
+
+  for (_Distance __i = 0; __i < __d; __i++) {
+    _Tp __tmp = *__first;
+    _RandomAccessIter __p = __first;
+
+    if (__k < __l) {
+      for (_Distance __j = 0; __j < __l/__d; __j++) {
+	if (__p > __first + __l) {
+          *__p = *(__p - __l);
+          __p -= __l;
+        }
+
+        *__p = *(__p + __k);
+        __p += __k;
+      }
+    }
+
+    else {
+      for (_Distance __j = 0; __j < __k/__d - 1; __j ++) {
+        if (__p < __last - __k) {
+          *__p = *(__p + __k);
+          __p += __k;
+        }
+
+        *__p = * (__p - __l);
+        __p -= __l;
+      }
+    }
+
+    *__p = __tmp;
+    ++__first;
+  }
+
+  return __result;
+}
+
+template <class _RandomAccessIter, class _Distance>
+inline _RandomAccessIter 
+__rotate(_RandomAccessIter __first, _RandomAccessIter __middle, _RandomAccessIter __last,
+         _Distance * __dis, const random_access_iterator_tag &) {
+  return __rotate(__first, __middle, __last,
+                  __dis, _STLP_VALUE_TYPE(__first, _RandomAccessIter));
+}
+
+template <class _ForwardIter>
+_ForwardIter 
+rotate(_ForwardIter __first, _ForwardIter __middle, _ForwardIter __last) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __middle))
+  _STLP_DEBUG_CHECK(__check_range(__middle, __last))
+  return __rotate(__first, __middle, __last,
+                  _STLP_DISTANCE_TYPE(__first, _ForwardIter),
+                  _STLP_ITERATOR_CATEGORY(__first, _ForwardIter));
+}
+
+// Return a random number in the range [0, __n).  This function encapsulates
+// whether we're using rand (part of the standard C library) or lrand48
+// (not standard, but a much better choice whenever it's available).
+
+template <class _Distance>
+inline _Distance __random_number(_Distance __n) {
+#ifdef _STLP_NO_DRAND48
+  return rand() % __n;
+#else
+  return lrand48() % __n;
+#endif
+}
+
+template <class _RandomAccessIter>
+void random_shuffle(_RandomAccessIter __first,
+		    _RandomAccessIter __last) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  if (__first == __last) return;
+  for (_RandomAccessIter __i = __first + 1; __i != __last; ++__i)
+    iter_swap(__i, __first + __random_number((__i - __first) + 1));
+}
+
+template <class _RandomAccessIter, class _RandomNumberGenerator>
+void random_shuffle(_RandomAccessIter __first, _RandomAccessIter __last,
+                    _RandomNumberGenerator& __rand) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  if (__first == __last) return;
+  for (_RandomAccessIter __i = __first + 1; __i != __last; ++__i)
+    iter_swap(__i, __first + __rand((__i - __first) + 1));
+}
+
+# ifndef _STLP_NO_EXTENSIONS
+
+// random_sample and random_sample_n (extensions, not part of the standard).
+
+template <class _ForwardIter, class _OutputIter, class _Distance>
+_OutputIter random_sample_n(_ForwardIter __first, _ForwardIter __last,
+                            _OutputIter __out, const _Distance __n)
+{
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  _Distance __remaining = distance(__first, __last);
+  _Distance __m = (min) (__n, __remaining);
+
+  while (__m > 0) {
+    if (__random_number(__remaining) < __m) {
+      *__out = *__first;
+      ++__out;
+      --__m;
+    }
+
+    --__remaining;
+    ++__first;
+  }
+  return __out;
+}
+
+
+template <class _ForwardIter, class _OutputIter, class _Distance,
+          class _RandomNumberGenerator>
+_OutputIter random_sample_n(_ForwardIter __first, _ForwardIter __last,
+                            _OutputIter __out, const _Distance __n,
+                            _RandomNumberGenerator& __rand)
+{
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  _Distance __remaining = distance(__first, __last);
+  _Distance __m = (min) (__n, __remaining);
+
+  while (__m > 0) {
+    if (__rand(__remaining) < __m) {
+      *__out = *__first;
+      ++__out;
+      --__m;
+    }
+
+    --__remaining;
+    ++__first;
+  }
+  return __out;
+}
+
+template <class _InputIter, class _RandomAccessIter, class _Distance>
+_RandomAccessIter __random_sample(_InputIter __first, _InputIter __last,
+                                  _RandomAccessIter __out,
+                                  const _Distance __n)
+{
+  _Distance __m = 0;
+  _Distance __t = __n;
+  for ( ; __first != __last && __m < __n; ++__m, ++__first) 
+    __out[__m] = *__first;
+
+  while (__first != __last) {
+    ++__t;
+    _Distance __M = __random_number(__t);
+    if (__M < __n)
+      __out[__M] = *__first;
+    ++__first;
+  }
+
+  return __out + __m;
+}
+
+template <class _InputIter, class _RandomAccessIter,
+          class _RandomNumberGenerator, class _Distance>
+_RandomAccessIter __random_sample(_InputIter __first, _InputIter __last,
+                                  _RandomAccessIter __out,
+                                  _RandomNumberGenerator& __rand,
+                                  const _Distance __n)
+{
+  _Distance __m = 0;
+  _Distance __t = __n;
+  for ( ; __first != __last && __m < __n; ++__m, ++__first)
+    __out[__m] = *__first;
+
+  while (__first != __last) {
+    ++__t;
+    _Distance __M = __rand(__t);
+    if (__M < __n)
+      __out[__M] = *__first;
+    ++__first;
+  }
+
+  return __out + __m;
+}
+
+template <class _InputIter, class _RandomAccessIter>
+_RandomAccessIter
+random_sample(_InputIter __first, _InputIter __last,
+              _RandomAccessIter __out_first, _RandomAccessIter __out_last) 
+{
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  _STLP_DEBUG_CHECK(__check_range(__out_first, __out_last))
+  return __random_sample(__first, __last,
+                         __out_first, __out_last - __out_first);
+}
+
+template <class _InputIter, class _RandomAccessIter, class _RandomNumberGenerator>
+_RandomAccessIter
+random_sample(_InputIter __first, _InputIter __last,
+              _RandomAccessIter __out_first, _RandomAccessIter __out_last,
+              _RandomNumberGenerator& __rand) 
+{
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  _STLP_DEBUG_CHECK(__check_range(__out_first, __out_last))
+  return __random_sample(__first, __last,
+                         __out_first, __rand,
+                         __out_last - __out_first);
+}
+
+# endif /* _STLP_NO_EXTENSIONS */
+
+// partition, stable_partition, and their auxiliary functions
+
+template <class _ForwardIter, class _Predicate>
+_STLP_INLINE_LOOP _ForwardIter __partition(_ForwardIter __first,
+                                           _ForwardIter __last,
+                                           _Predicate   __pred,
+                                           const forward_iterator_tag &) {
+  if (__first == __last) return __first;
+
+  while (__pred(*__first))
+    if (++__first == __last) return __first;
+
+  _ForwardIter __next = __first;
+
+  while (++__next != __last)
+    if (__pred(*__next)) {
+      swap(*__first, *__next);
+      ++__first;
+    }
+  return __first;
+}
+
+template <class _BidirectionalIter, class _Predicate>
+_STLP_INLINE_LOOP _BidirectionalIter __partition(_BidirectionalIter __first,
+                                                 _BidirectionalIter __last,
+                                                 _Predicate __pred,
+                                                 const bidirectional_iterator_tag &) {
+  while (true) {
+    while (true)
+      if (__first == __last)
+        return __first;
+      else if (__pred(*__first))
+        ++__first;
+      else
+        break;
+    --__last;
+    while (true)
+      if (__first == __last)
+        return __first;
+      else if (!__pred(*__last))
+        --__last;
+      else
+        break;
+    iter_swap(__first, __last);
+    ++__first;
+  }
+}
+
+# if defined (_STLP_NONTEMPL_BASE_MATCH_BUG)
+template <class _BidirectionalIter, class _Predicate>
+inline
+_BidirectionalIter __partition(_BidirectionalIter __first,
+                               _BidirectionalIter __last,
+			       _Predicate __pred,
+			       const random_access_iterator_tag &) {
+  return __partition(__first, __last, __pred, bidirectional_iterator_tag());
+}
+# endif
+
+template <class _ForwardIter, class _Predicate>
+_ForwardIter partition(_ForwardIter __first, _ForwardIter __last, _Predicate   __pred) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  return __partition(__first, __last, __pred, _STLP_ITERATOR_CATEGORY(__first, _ForwardIter));
+}
+
+
+template <class _ForwardIter, class _Predicate, class _Distance>
+_ForwardIter __inplace_stable_partition(_ForwardIter __first,
+                                        _ForwardIter __last,
+                                        _Predicate __pred, _Distance __len) {
+  if (__len == 1)
+    return __pred(*__first) ? __last : __first;
+  _ForwardIter __middle = __first;
+  advance(__middle, __len / 2);
+  return rotate(__inplace_stable_partition(__first, __middle, __pred, 
+                                           __len / 2),
+                __middle,
+                __inplace_stable_partition(__middle, __last, __pred,
+                                           __len - __len / 2));
+}
+
+template <class _ForwardIter, class _Pointer, class _Predicate, 
+          class _Distance>
+_ForwardIter __stable_partition_adaptive(_ForwardIter __first,
+                                         _ForwardIter __last,
+                                         _Predicate __pred, _Distance __len,
+                                         _Pointer __buffer,
+                                         _Distance __buffer_size) 
+{
+  if (__len <= __buffer_size) {
+    _ForwardIter __result1 = __first;
+    _Pointer __result2 = __buffer;
+    for ( ; __first != __last ; ++__first)
+      if (__pred(*__first)) {
+        *__result1 = *__first;
+        ++__result1;
+      }
+      else {
+        *__result2 = *__first;
+        ++__result2;
+      }
+    copy(__buffer, __result2, __result1);
+    return __result1;
+  }
+  else {
+    _ForwardIter __middle = __first;
+    advance(__middle, __len / 2);
+    return rotate(__stable_partition_adaptive(
+                          __first, __middle, __pred,
+                          __len / 2, __buffer, __buffer_size),
+                    __middle,
+                    __stable_partition_adaptive(
+                          __middle, __last, __pred,
+                          __len - __len / 2, __buffer, __buffer_size));
+  }
+}
+
+template <class _ForwardIter, class _Predicate, class _Tp, class _Distance>
+inline _ForwardIter
+__stable_partition_aux(_ForwardIter __first, _ForwardIter __last, 
+                       _Predicate __pred, _Tp*, _Distance*)
+{
+  _Temporary_buffer<_ForwardIter, _Tp> __buf(__first, __last);
+  _STLP_MPWFIX_TRY		//*TY 06/01/2000 - they forget to call dtor for _Temporary_buffer if no try/catch block is present
+  return (__buf.size() > 0) ?
+    __stable_partition_adaptive(__first, __last, __pred,
+				_Distance(__buf.requested_size()),
+				__buf.begin(), __buf.size())  :
+    __inplace_stable_partition(__first, __last, __pred, 
+			       _Distance(__buf.requested_size()));
+  _STLP_MPWFIX_CATCH	//*TY 06/01/2000 - they forget to call dtor for _Temporary_buffer if no try/catch block is present
+}
+
+template <class _ForwardIter, class _Predicate>
+_ForwardIter 
+stable_partition(_ForwardIter __first, _ForwardIter __last, _Predicate __pred) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  if (__first == __last)
+    return __first;
+  else
+    return __stable_partition_aux(__first, __last, __pred,
+                                  _STLP_VALUE_TYPE(__first, _ForwardIter),
+                                  _STLP_DISTANCE_TYPE(__first, _ForwardIter));
+}
+
+template <class _RandomAccessIter, class _Tp, class _Compare>
+_RandomAccessIter __unguarded_partition(_RandomAccessIter __first, 
+                                        _RandomAccessIter __last, 
+                                        _Tp __pivot, _Compare __comp) 
+{
+  while (true) {
+    while (__comp(*__first, __pivot))
+      ++__first;
+    --__last;
+    while (__comp(__pivot, *__last))
+      --__last;
+    if (!(__first < __last))
+      return __first;
+    iter_swap(__first, __last);
+    ++__first;
+  }
+}
+
+// sort() and its auxiliary functions. 
+
+# define  __stl_threshold  16
+
+template <class _RandomAccessIter, class _Tp, class _Compare>
+void __unguarded_linear_insert(_RandomAccessIter __last, _Tp __val, 
+                               _Compare __comp) {
+  _RandomAccessIter __next = __last;
+  --__next;  
+  while (__comp(__val, *__next)) {
+    *__last = *__next;
+    __last = __next;
+    --__next;
+  }
+  *__last = __val;
+}
+
+template <class _RandomAccessIter, class _Tp, class _Compare>
+inline void __linear_insert(_RandomAccessIter __first, 
+                            _RandomAccessIter __last, _Tp __val, _Compare __comp) {		
+  //*TY 12/26/1998 - added __val as a paramter
+  //  _Tp __val = *__last;		    //*TY 12/26/1998 - __val supplied by caller
+  if (__comp(__val, *__first)) {
+    copy_backward(__first, __last, __last + 1);
+    *__first = __val;
+  }
+  else
+    __unguarded_linear_insert(__last, __val, __comp);
+}
+
+template <class _RandomAccessIter, class _Compare>
+void __insertion_sort(_RandomAccessIter __first,
+                      _RandomAccessIter __last, _Compare __comp) {
+  if (__first == __last) return;
+  for (_RandomAccessIter __i = __first + 1; __i != __last; ++__i)
+    __linear_insert(__first, __i, *__i, __comp);	//*TY 12/26/1998 - supply *__i as __val
+}
+
+template <class _RandomAccessIter, class _Tp, class _Compare>
+void __unguarded_insertion_sort_aux(_RandomAccessIter __first, 
+                                    _RandomAccessIter __last,
+                                    _Tp*, _Compare __comp) {
+  for (_RandomAccessIter __i = __first; __i != __last; ++__i)
+    __unguarded_linear_insert(__i, _Tp(*__i), __comp);
+}
+
+template <class _RandomAccessIter, class _Compare>
+inline void __unguarded_insertion_sort(_RandomAccessIter __first, 
+                                       _RandomAccessIter __last,
+                                       _Compare __comp) {
+  __unguarded_insertion_sort_aux(__first, __last, _STLP_VALUE_TYPE(__first, _RandomAccessIter), __comp);
+}
+
+template <class _RandomAccessIter, class _Compare>
+void __final_insertion_sort(_RandomAccessIter __first, 
+                            _RandomAccessIter __last, _Compare __comp) {
+  if (__last - __first > __stl_threshold) {
+    __insertion_sort(__first, __first + __stl_threshold, __comp);
+    __unguarded_insertion_sort(__first + __stl_threshold, __last, __comp);
+  }
+  else
+    __insertion_sort(__first, __last, __comp);
+}
+
+template <class _RandomAccessIter, class _Tp, class _Size, class _Compare>
+void __introsort_loop(_RandomAccessIter __first,
+                      _RandomAccessIter __last, _Tp*,
+                      _Size __depth_limit, _Compare __comp)
+{
+  while (__last - __first > __stl_threshold) {
+    if (__depth_limit == 0) {
+      partial_sort(__first, __last, __last, __comp);
+      return;
+    }
+    --__depth_limit;
+    _RandomAccessIter __cut =
+      __unguarded_partition(__first, __last,
+                            _Tp(__median(*__first,
+                                         *(__first + (__last - __first)/2),
+                                         *(__last - 1), __comp)),
+       __comp);
+    __introsort_loop(__cut, __last, (_Tp*) 0, __depth_limit, __comp);
+    __last = __cut;
+  }
+}
+
+template <class _RandomAccessIter>
+void sort(_RandomAccessIter __first, _RandomAccessIter __last) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  if (__first != __last) {
+    __introsort_loop(__first, __last,
+                     _STLP_VALUE_TYPE(__first, _RandomAccessIter),
+                     __lg(__last - __first) * 2, __less(_STLP_VALUE_TYPE(__first, _RandomAccessIter)) );
+    __final_insertion_sort(__first, __last, __less(_STLP_VALUE_TYPE(__first, _RandomAccessIter)));
+  }
+}
+
+template <class _RandomAccessIter, class _Compare>
+void sort(_RandomAccessIter __first, _RandomAccessIter __last, _Compare __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  if (__first != __last) {
+    __introsort_loop(__first, __last,
+                     _STLP_VALUE_TYPE(__first, _RandomAccessIter),
+                     __lg(__last - __first) * 2,
+                     __comp);
+    __final_insertion_sort(__first, __last, __comp);
+  }
+}
+
+// stable_sort() and its auxiliary functions.
+
+template <class _RandomAccessIter, class _Compare>
+void __inplace_stable_sort(_RandomAccessIter __first,
+                           _RandomAccessIter __last, _Compare __comp) {
+  if (__last - __first < 15) {
+    __insertion_sort(__first, __last, __comp);
+    return;
+  }
+  _RandomAccessIter __middle = __first + (__last - __first) / 2;
+  __inplace_stable_sort(__first, __middle, __comp);
+  __inplace_stable_sort(__middle, __last, __comp);
+  __merge_without_buffer(__first, __middle, __last,
+                         __middle - __first,
+                         __last - __middle,
+                         __comp);
+}
+
+template <class _RandomAccessIter1, class _RandomAccessIter2,
+          class _Distance, class _Compare>
+void __merge_sort_loop(_RandomAccessIter1 __first,
+                       _RandomAccessIter1 __last, 
+                       _RandomAccessIter2 __result, _Distance __step_size,
+                       _Compare __comp) {
+  _Distance __two_step = 2 * __step_size;
+
+  while (__last - __first >= __two_step) {
+    __result = merge(__first, __first + __step_size,
+                     __first + __step_size, __first + __two_step,
+                     __result,
+                     __comp);
+    __first += __two_step;
+  }
+  __step_size = (min) (_Distance(__last - __first), __step_size);
+
+  merge(__first, __first + __step_size,
+        __first + __step_size, __last,
+        __result,
+        __comp);
+}
+
+const int __stl_chunk_size = 7;
+        
+template <class _RandomAccessIter, class _Distance, class _Compare>
+void __chunk_insertion_sort(_RandomAccessIter __first, 
+                            _RandomAccessIter __last,
+                            _Distance __chunk_size, _Compare __comp)
+{
+  while (__last - __first >= __chunk_size) {
+    __insertion_sort(__first, __first + __chunk_size, __comp);
+    __first += __chunk_size;
+  }
+  __insertion_sort(__first, __last, __comp);
+}
+
+template <class _RandomAccessIter, class _Pointer, class _Distance,
+          class _Compare>
+void __merge_sort_with_buffer(_RandomAccessIter __first, 
+                              _RandomAccessIter __last, _Pointer __buffer,
+                              _Distance*, _Compare __comp) {
+  _Distance __len = __last - __first;
+  _Pointer __buffer_last = __buffer + __len;
+
+  _Distance __step_size = __stl_chunk_size;
+  __chunk_insertion_sort(__first, __last, __step_size, __comp);
+
+  while (__step_size < __len) {
+    __merge_sort_loop(__first, __last, __buffer, __step_size, __comp);
+    __step_size *= 2;
+    __merge_sort_loop(__buffer, __buffer_last, __first, __step_size, __comp);
+    __step_size *= 2;
+  }
+}
+
+template <class _BidirectionalIter1, class _BidirectionalIter2,
+          class _Distance>
+_BidirectionalIter1 __rotate_adaptive(_BidirectionalIter1 __first,
+                                      _BidirectionalIter1 __middle,
+                                      _BidirectionalIter1 __last,
+                                      _Distance __len1, _Distance __len2,
+                                      _BidirectionalIter2 __buffer,
+                                      _Distance __buffer_size) {
+  if (__len1 > __len2 && __len2 <= __buffer_size) {
+    _BidirectionalIter2 __buffer_end = copy(__middle, __last, __buffer);
+    copy_backward(__first, __middle, __last);
+    return copy(__buffer, __buffer_end, __first);
+  }
+  else if (__len1 <= __buffer_size) {
+    _BidirectionalIter2 __buffer_end = copy(__first, __middle, __buffer);
+    copy(__middle, __last, __first);
+    return copy_backward(__buffer, __buffer_end, __last);
+  }
+  else
+    return rotate(__first, __middle, __last);
+}
+
+template <class _BidirectionalIter, class _Distance, class _Pointer,
+          class _Compare>
+void __merge_adaptive(_BidirectionalIter __first, 
+                      _BidirectionalIter __middle, 
+                      _BidirectionalIter __last,
+                      _Distance __len1, _Distance __len2,
+                      _Pointer __buffer, _Distance __buffer_size,
+                      _Compare __comp) {
+  if (__len1 <= __len2 && __len1 <= __buffer_size) {
+    _Pointer __buffer_end = copy(__first, __middle, __buffer);
+    merge(__buffer, __buffer_end, __middle, __last, __first, __comp);
+  }
+  else if (__len2 <= __buffer_size) {
+    _Pointer __buffer_end = copy(__middle, __last, __buffer);
+    __merge_backward(__first, __middle, __buffer, __buffer_end, __last,
+                     __comp);
+  }
+  else {
+    _BidirectionalIter __first_cut = __first;
+    _BidirectionalIter __second_cut = __middle;
+    _Distance __len11 = 0;
+    _Distance __len22 = 0;
+    if (__len1 > __len2) {
+      __len11 = __len1 / 2;
+      advance(__first_cut, __len11);
+      __second_cut = lower_bound(__middle, __last, *__first_cut, __comp);
+      __len22 += distance(__middle, __second_cut);   
+    }
+    else {
+      __len22 = __len2 / 2;
+      advance(__second_cut, __len22);
+      __first_cut = upper_bound(__first, __middle, *__second_cut, __comp);
+      __len11 += distance(__first, __first_cut);
+    }
+    _BidirectionalIter __new_middle =
+      __rotate_adaptive(__first_cut, __middle, __second_cut, __len1 - __len11,
+                        __len22, __buffer, __buffer_size);
+    __merge_adaptive(__first, __first_cut, __new_middle, __len11,
+                     __len22, __buffer, __buffer_size, __comp);
+    __merge_adaptive(__new_middle, __second_cut, __last, __len1 - __len11,
+                     __len2 - __len22, __buffer, __buffer_size, __comp);
+  }
+}
+
+template <class _RandomAccessIter, class _Pointer, class _Distance, 
+          class _Compare>
+void __stable_sort_adaptive(_RandomAccessIter __first, 
+                            _RandomAccessIter __last, _Pointer __buffer,
+                            _Distance __buffer_size, _Compare __comp) {
+  _Distance __len = (__last - __first + 1) / 2;
+  _RandomAccessIter __middle = __first + __len;
+  if (__len > __buffer_size) {
+    __stable_sort_adaptive(__first, __middle, __buffer, __buffer_size, 
+                           __comp);
+    __stable_sort_adaptive(__middle, __last, __buffer, __buffer_size, 
+                           __comp);
+  }
+  else {
+    __merge_sort_with_buffer(__first, __middle, __buffer, (_Distance*)0,
+                               __comp);
+    __merge_sort_with_buffer(__middle, __last, __buffer, (_Distance*)0,
+                               __comp);
+  }
+  __merge_adaptive(__first, __middle, __last, _Distance(__middle - __first), 
+                   _Distance(__last - __middle), __buffer, __buffer_size,
+                   __comp);
+}
+
+template <class _RandomAccessIter, class _Tp, class _Distance, class _Compare>
+void __stable_sort_aux(_RandomAccessIter __first,
+			      _RandomAccessIter __last, _Tp*, _Distance*,
+			      _Compare __comp) {
+  _Temporary_buffer<_RandomAccessIter, _Tp> buf(__first, __last);
+  if (buf.begin() == 0)
+    __inplace_stable_sort(__first, __last, __comp);
+  else 
+    __stable_sort_adaptive(__first, __last, buf.begin(),
+                           _Distance(buf.size()),
+                           __comp);
+}
+
+template <class _RandomAccessIter>
+void stable_sort(_RandomAccessIter __first,
+		 _RandomAccessIter __last) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  __stable_sort_aux(__first, __last,
+                    _STLP_VALUE_TYPE(__first, _RandomAccessIter),
+                    _STLP_DISTANCE_TYPE(__first, _RandomAccessIter),
+                    __less(_STLP_VALUE_TYPE(__first, _RandomAccessIter)));
+}
+
+template <class _RandomAccessIter, class _Compare>
+void stable_sort(_RandomAccessIter __first,
+		 _RandomAccessIter __last, _Compare __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  __stable_sort_aux(__first, __last,
+                    _STLP_VALUE_TYPE(__first, _RandomAccessIter),
+                    _STLP_DISTANCE_TYPE(__first, _RandomAccessIter), 
+                    __comp);
+}
+
+// partial_sort, partial_sort_copy, and auxiliary functions.
+
+template <class _RandomAccessIter, class _Tp, class _Compare>
+void __partial_sort(_RandomAccessIter __first, _RandomAccessIter __middle,
+                    _RandomAccessIter __last, _Tp*, _Compare __comp) {
+  make_heap(__first, __middle, __comp);
+  for (_RandomAccessIter __i = __middle; __i < __last; ++__i)
+    if (__comp(*__i, *__first))
+      __pop_heap(__first, __middle, __i, _Tp(*__i), __comp,
+                 _STLP_DISTANCE_TYPE(__first, _RandomAccessIter));
+  sort_heap(__first, __middle, __comp);
+}
+
+
+template <class _RandomAccessIter>
+void 
+partial_sort(_RandomAccessIter __first,_RandomAccessIter __middle, _RandomAccessIter __last) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __middle))
+  _STLP_DEBUG_CHECK(__check_range(__middle, __last))
+  __partial_sort(__first, __middle, __last, _STLP_VALUE_TYPE(__first, _RandomAccessIter), 
+                 __less(_STLP_VALUE_TYPE(__first, _RandomAccessIter)));
+}
+
+template <class _RandomAccessIter, class _Compare>
+void partial_sort(_RandomAccessIter __first,_RandomAccessIter __middle,
+                  _RandomAccessIter __last, _Compare __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __middle))
+  _STLP_DEBUG_CHECK(__check_range(__middle, __last))
+  __partial_sort(__first, __middle, __last, _STLP_VALUE_TYPE(__first, _RandomAccessIter), __comp);
+}
+
+template <class _InputIter, class _RandomAccessIter, class _Compare,
+          class _Distance, class _Tp>
+_RandomAccessIter __partial_sort_copy(_InputIter __first,
+                                         _InputIter __last,
+                                         _RandomAccessIter __result_first,
+                                         _RandomAccessIter __result_last,
+                                         _Compare __comp, _Distance*, _Tp*) {
+  if (__result_first == __result_last) return __result_last;
+  _RandomAccessIter __result_real_last = __result_first;
+  while(__first != __last && __result_real_last != __result_last) {
+    *__result_real_last = *__first;
+    ++__result_real_last;
+    ++__first;
+  }
+  make_heap(__result_first, __result_real_last, __comp);
+  while (__first != __last) {
+    if (__comp(*__first, *__result_first))
+      __adjust_heap(__result_first, _Distance(0),
+                    _Distance(__result_real_last - __result_first),
+                    _Tp(*__first),
+                    __comp);
+    ++__first;
+  }
+  sort_heap(__result_first, __result_real_last, __comp);
+  return __result_real_last;
+}
+
+template <class _InputIter, class _RandomAccessIter>
+_RandomAccessIter
+partial_sort_copy(_InputIter __first, _InputIter __last,
+                  _RandomAccessIter __result_first, _RandomAccessIter __result_last) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  _STLP_DEBUG_CHECK(__check_range(__result_first, __result_last))
+  return __partial_sort_copy(__first, __last, __result_first, __result_last, 
+                             __less(_STLP_VALUE_TYPE(__first, _InputIter)),
+                             _STLP_DISTANCE_TYPE(__result_first, _RandomAccessIter),
+                             _STLP_VALUE_TYPE(__first, _InputIter));
+}
+
+template <class _InputIter, class _RandomAccessIter, class _Compare>
+_RandomAccessIter
+partial_sort_copy(_InputIter __first, _InputIter __last,
+                  _RandomAccessIter __result_first,
+                  _RandomAccessIter __result_last, _Compare __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  _STLP_DEBUG_CHECK(__check_range(__result_first, __result_last))
+  return __partial_sort_copy(__first, __last, __result_first, __result_last,
+                             __comp,
+                             _STLP_DISTANCE_TYPE(__result_first, _RandomAccessIter),
+                             _STLP_VALUE_TYPE(__first, _InputIter));
+}
+
+// nth_element() and its auxiliary functions.  
+
+template <class _RandomAccessIter, class _Tp, class _Compare>
+void __nth_element(_RandomAccessIter __first, _RandomAccessIter __nth,
+                   _RandomAccessIter __last, _Tp*, _Compare __comp) {
+  while (__last - __first > 3) {
+    _RandomAccessIter __cut =
+      __unguarded_partition(__first, __last,
+                            _Tp(__median(*__first,
+                                         *(__first + (__last - __first)/2), 
+                                         *(__last - 1),
+                                         __comp)),
+                            __comp);
+    if (__cut <= __nth)
+      __first = __cut;
+    else 
+      __last = __cut;
+  }
+  __insertion_sort(__first, __last, __comp);
+}
+
+
+template <class _RandomAccessIter>
+void nth_element(_RandomAccessIter __first, _RandomAccessIter __nth,
+                 _RandomAccessIter __last) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __nth))
+  _STLP_DEBUG_CHECK(__check_range(__nth, __last))
+  __nth_element(__first, __nth, __last, _STLP_VALUE_TYPE(__first, _RandomAccessIter), 
+                __less(_STLP_VALUE_TYPE(__first, _RandomAccessIter)));
+}
+
+template <class _RandomAccessIter, class _Compare>
+void nth_element(_RandomAccessIter __first, _RandomAccessIter __nth,
+                 _RandomAccessIter __last, _Compare __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __nth))
+  _STLP_DEBUG_CHECK(__check_range(__nth, __last))
+  __nth_element(__first, __nth, __last, _STLP_VALUE_TYPE(__first, _RandomAccessIter), __comp);
+}
+
+// Binary search (lower_bound, upper_bound, equal_range, binary_search).
+
+template <class _ForwardIter, class _Tp, class _Compare, class _Distance>
+_ForwardIter __upper_bound(_ForwardIter __first, _ForwardIter __last,
+                           const _Tp& __val, _Compare __comp, _Distance*)
+{
+  _Distance __len = distance(__first, __last);
+  _Distance __half;
+
+  while (__len > 0) {
+    __half = __len >> 1;
+    _ForwardIter __middle = __first;
+    advance(__middle, __half);
+    if (__comp(__val, *__middle))
+      __len = __half;
+    else {
+      __first = __middle;
+      ++__first;
+      __len = __len - __half - 1;
+    }
+  }
+  return __first;
+}
+
+template <class _ForwardIter, class _Tp, class _Compare, class _Distance>
+pair<_ForwardIter, _ForwardIter>
+__equal_range(_ForwardIter __first, _ForwardIter __last, const _Tp& __val,
+              _Compare __comp, _Distance*)
+{
+  _Distance __len = distance(__first, __last);
+  _Distance __half;
+
+  while (__len > 0) {
+    __half = __len >> 1;
+    _ForwardIter __middle = __first;
+    advance(__middle, __half);
+    if (__comp(*__middle, __val)) {
+      __first = __middle;
+      ++__first;
+      __len = __len - __half - 1;
+    }
+    else if (__comp(__val, *__middle))
+      __len = __half;
+    else {
+      _ForwardIter __left = lower_bound(__first, __middle, __val, __comp);
+      advance(__first, __len);
+      _ForwardIter __right = upper_bound(++__middle, __first, __val, __comp);
+      return pair<_ForwardIter, _ForwardIter>(__left, __right);
+    }
+  }
+  return pair<_ForwardIter, _ForwardIter>(__first, __first);
+}           
+
+template <class _InputIter1, class _InputIter2, class _OutputIter>
+_OutputIter merge(_InputIter1 __first1, _InputIter1 __last1,
+                  _InputIter2 __first2, _InputIter2 __last2,
+                  _OutputIter __result) {
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+  _STLP_DEBUG_CHECK(__check_range(__first2, __last2))
+  while (__first1 != __last1 && __first2 != __last2) {
+    if (*__first2 < *__first1) {
+      *__result = *__first2;
+      ++__first2;
+    }
+    else {
+      *__result = *__first1;
+      ++__first1;
+    }
+    ++__result;
+  }
+  return copy(__first2, __last2, copy(__first1, __last1, __result));
+}
+
+template <class _InputIter1, class _InputIter2, class _OutputIter,
+          class _Compare>
+_OutputIter merge(_InputIter1 __first1, _InputIter1 __last1,
+                  _InputIter2 __first2, _InputIter2 __last2,
+                  _OutputIter __result, _Compare __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+  _STLP_DEBUG_CHECK(__check_range(__first2, __last2))
+  while (__first1 != __last1 && __first2 != __last2) {
+    if (__comp(*__first2, *__first1)) {
+      *__result = *__first2;
+      ++__first2;
+    }
+    else {
+      *__result = *__first1;
+      ++__first1;
+    }
+    ++__result;
+  }
+  return copy(__first2, __last2, copy(__first1, __last1, __result));
+}
+
+template <class _BidirectionalIter, class _Distance, class _Compare>
+void __merge_without_buffer(_BidirectionalIter __first,
+                            _BidirectionalIter __middle,
+                            _BidirectionalIter __last,
+                            _Distance __len1, _Distance __len2,
+                            _Compare __comp) {
+  if (__len1 == 0 || __len2 == 0)
+    return;
+  if (__len1 + __len2 == 2) {
+    if (__comp(*__middle, *__first))
+      iter_swap(__first, __middle);
+    return;
+  }
+  _BidirectionalIter __first_cut = __first;
+  _BidirectionalIter __second_cut = __middle;
+  _Distance __len11 = 0;
+  _Distance __len22 = 0;
+  if (__len1 > __len2) {
+    __len11 = __len1 / 2;
+    advance(__first_cut, __len11);
+    __second_cut = lower_bound(__middle, __last, *__first_cut, __comp);
+    __len22 += distance(__middle, __second_cut);
+  }
+  else {
+    __len22 = __len2 / 2;
+    advance(__second_cut, __len22);
+    __first_cut = upper_bound(__first, __middle, *__second_cut, __comp);
+    __len11 +=distance(__first, __first_cut);
+  }
+  _BidirectionalIter __new_middle
+    = rotate(__first_cut, __middle, __second_cut);
+  __merge_without_buffer(__first, __first_cut, __new_middle, __len11, __len22,
+                         __comp);
+  __merge_without_buffer(__new_middle, __second_cut, __last, __len1 - __len11,
+                         __len2 - __len22, __comp);
+}
+
+template <class _BidirectionalIter1, class _BidirectionalIter2,
+          class _BidirectionalIter3, class _Compare>
+_BidirectionalIter3 __merge_backward(_BidirectionalIter1 __first1,
+                                     _BidirectionalIter1 __last1,
+                                     _BidirectionalIter2 __first2,
+                                     _BidirectionalIter2 __last2,
+                                     _BidirectionalIter3 __result,
+                                     _Compare __comp) {
+  if (__first1 == __last1)
+    return copy_backward(__first2, __last2, __result);
+  if (__first2 == __last2)
+    return copy_backward(__first1, __last1, __result);
+  --__last1;
+  --__last2;
+  while (true) {
+    if (__comp(*__last2, *__last1)) {
+      *--__result = *__last1;
+      if (__first1 == __last1)
+        return copy_backward(__first2, ++__last2, __result);
+      --__last1;
+    }
+    else {
+      *--__result = *__last2;
+      if (__first2 == __last2)
+        return copy_backward(__first1, ++__last1, __result);
+      --__last2;
+    }
+  }
+}
+
+template <class _BidirectionalIter, class _Tp, 
+          class _Distance, class _Compare>
+inline void __inplace_merge_aux(_BidirectionalIter __first,
+                                _BidirectionalIter __middle,
+                                _BidirectionalIter __last, _Tp*, _Distance*,
+                                _Compare __comp) {
+  _Distance __len1 = distance(__first, __middle);
+  _Distance __len2 = distance(__middle, __last);
+
+  _Temporary_buffer<_BidirectionalIter, _Tp> __buf(__first, __last);
+  if (__buf.begin() == 0)
+    __merge_without_buffer(__first, __middle, __last, __len1, __len2, __comp);
+  else
+    __merge_adaptive(__first, __middle, __last, __len1, __len2,
+                     __buf.begin(), _Distance(__buf.size()),
+                     __comp);
+}
+
+template <class _BidirectionalIter>
+void inplace_merge(_BidirectionalIter __first,
+		   _BidirectionalIter __middle,
+		   _BidirectionalIter __last) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __middle))
+  _STLP_DEBUG_CHECK(__check_range(__middle, __last))
+  if (__first == __middle || __middle == __last)
+    return;
+  __inplace_merge_aux(__first, __middle, __last,
+                      _STLP_VALUE_TYPE(__first, _BidirectionalIter), _STLP_DISTANCE_TYPE(__first, _BidirectionalIter),
+                      __less(_STLP_VALUE_TYPE(__first, _BidirectionalIter)));
+}
+
+template <class _BidirectionalIter, class _Compare>
+void inplace_merge(_BidirectionalIter __first,
+		   _BidirectionalIter __middle,
+		   _BidirectionalIter __last, _Compare __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __middle))
+  _STLP_DEBUG_CHECK(__check_range(__middle, __last))
+  if (__first == __middle || __middle == __last)
+    return;
+  __inplace_merge_aux(__first, __middle, __last,
+                      _STLP_VALUE_TYPE(__first, _BidirectionalIter), _STLP_DISTANCE_TYPE(__first, _BidirectionalIter),
+                      __comp);
+}
+
+
+template <class _InputIter1, class _InputIter2, class _Compare>
+bool __includes(_InputIter1 __first1, _InputIter1 __last1,
+                _InputIter2 __first2, _InputIter2 __last2, _Compare __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+  _STLP_DEBUG_CHECK(__check_range(__first2, __last2))
+  while (__first1 != __last1 && __first2 != __last2)
+    if (__comp(*__first2, *__first1))
+      return false;
+    else if(__comp(*__first1, *__first2)) 
+      ++__first1;
+    else
+      ++__first1, ++__first2;
+
+  return __first2 == __last2;
+}
+
+template <class _InputIter1, class _InputIter2, class _Compare>
+bool includes(_InputIter1 __first1, _InputIter1 __last1,
+              _InputIter2 __first2, _InputIter2 __last2, _Compare __comp) {
+  return __includes(__first1, __last1, __first2, __last2, __comp);
+}
+
+template <class _InputIter1, class _InputIter2>
+bool includes(_InputIter1 __first1, _InputIter1 __last1,
+              _InputIter2 __first2, _InputIter2 __last2) {
+  return __includes(__first1, __last1, __first2, __last2, __less(_STLP_VALUE_TYPE(__first1, _InputIter1)));
+}
+
+template <class _InputIter1, class _InputIter2, class _OutputIter,
+          class _Compare>
+_OutputIter __set_union(_InputIter1 __first1, _InputIter1 __last1,
+                        _InputIter2 __first2, _InputIter2 __last2,
+                        _OutputIter __result, _Compare __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+  _STLP_DEBUG_CHECK(__check_range(__first2, __last2))
+  while (__first1 != __last1 && __first2 != __last2) {
+    if (__comp(*__first1, *__first2)) {
+      *__result = *__first1;
+      ++__first1;
+    }
+    else if (__comp(*__first2, *__first1)) {
+      *__result = *__first2;
+      ++__first2;
+    }
+    else {
+      *__result = *__first1;
+      ++__first1;
+      ++__first2;
+    }
+    ++__result;
+  }
+  return copy(__first2, __last2, copy(__first1, __last1, __result));
+}
+
+template <class _InputIter1, class _InputIter2, class _OutputIter>
+_OutputIter set_union(_InputIter1 __first1, _InputIter1 __last1,
+                      _InputIter2 __first2, _InputIter2 __last2,
+                      _OutputIter __result) {
+  return __set_union(__first1, __last1, __first2, __last2, __result, __less(_STLP_VALUE_TYPE(__first1, _InputIter1)));  
+}
+
+template <class _InputIter1, class _InputIter2, class _OutputIter,
+          class _Compare>
+_OutputIter set_union(_InputIter1 __first1, _InputIter1 __last1,
+                      _InputIter2 __first2, _InputIter2 __last2,
+                      _OutputIter __result, _Compare __comp) {
+  return __set_union(__first1, __last1, __first2, __last2, __result, __comp);
+}
+
+template <class _InputIter1, class _InputIter2, class _OutputIter,
+          class _Compare>
+_OutputIter __set_intersection(_InputIter1 __first1, _InputIter1 __last1,
+                               _InputIter2 __first2, _InputIter2 __last2,
+                               _OutputIter __result, _Compare __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+  _STLP_DEBUG_CHECK(__check_range(__first2, __last2))
+  while (__first1 != __last1 && __first2 != __last2)
+    if (__comp(*__first1, *__first2))
+      ++__first1;
+    else if (__comp(*__first2, *__first1))
+      ++__first2;
+    else {
+      *__result = *__first1;
+      ++__first1;
+      ++__first2;
+      ++__result;
+    }
+  return __result;
+}
+
+template <class _InputIter1, class _InputIter2, class _OutputIter>
+_OutputIter set_intersection(_InputIter1 __first1, _InputIter1 __last1,
+                             _InputIter2 __first2, _InputIter2 __last2,
+                             _OutputIter __result) {
+  return __set_intersection(__first1, __last1, __first2, __last2, __result, __less(_STLP_VALUE_TYPE(__first1, _InputIter1)));  
+}
+
+template <class _InputIter1, class _InputIter2, class _OutputIter,
+          class _Compare>
+_OutputIter set_intersection(_InputIter1 __first1, _InputIter1 __last1,
+                             _InputIter2 __first2, _InputIter2 __last2,
+                             _OutputIter __result, _Compare __comp) {
+  return __set_intersection(__first1, __last1, __first2, __last2, __result, __comp);
+}
+
+template <class _InputIter1, class _InputIter2, class _OutputIter, 
+          class _Compare>
+_OutputIter __set_difference(_InputIter1 __first1, _InputIter1 __last1,
+                             _InputIter2 __first2, _InputIter2 __last2, 
+                             _OutputIter __result, _Compare __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+  _STLP_DEBUG_CHECK(__check_range(__first2, __last2))
+  while (__first1 != __last1 && __first2 != __last2)
+    if (__comp(*__first1, *__first2)) {
+      *__result = *__first1;
+      ++__first1;
+      ++__result;
+    }
+    else if (__comp(*__first2, *__first1))
+      ++__first2;
+    else {
+      ++__first1;
+      ++__first2;
+    }
+  return copy(__first1, __last1, __result);
+}
+
+template <class _InputIter1, class _InputIter2, class _OutputIter>
+_OutputIter set_difference(_InputIter1 __first1, _InputIter1 __last1,
+                           _InputIter2 __first2, _InputIter2 __last2,
+                           _OutputIter __result) {
+  return __set_difference(__first1, __last1, __first2, __last2, __result, 
+                          __less(_STLP_VALUE_TYPE(__first1, _InputIter1)));  
+}
+
+template <class _InputIter1, class _InputIter2, class _OutputIter, 
+          class _Compare>
+_OutputIter set_difference(_InputIter1 __first1, _InputIter1 __last1,
+                           _InputIter2 __first2, _InputIter2 __last2, 
+                           _OutputIter __result, _Compare __comp) {
+  return __set_difference(__first1, __last1, __first2, __last2, __result, __comp);
+}
+
+template <class _InputIter1, class _InputIter2, class _OutputIter, class _Compare>
+_OutputIter 
+__set_symmetric_difference(_InputIter1 __first1, _InputIter1 __last1,
+                           _InputIter2 __first2, _InputIter2 __last2,
+                           _OutputIter __result, _Compare __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+  _STLP_DEBUG_CHECK(__check_range(__first2, __last2))
+  while (__first1 != __last1 && __first2 != __last2)
+    if (__comp(*__first1, *__first2)) {
+      *__result = *__first1;
+      ++__first1;
+      ++__result;
+    }
+    else if (__comp(*__first2, *__first1)) {
+      *__result = *__first2;
+      ++__first2;
+      ++__result;
+    }
+    else {
+      ++__first1;
+      ++__first2;
+    }
+  return copy(__first2, __last2, copy(__first1, __last1, __result));
+}
+
+template <class _InputIter1, class _InputIter2, class _OutputIter>
+_OutputIter 
+set_symmetric_difference(_InputIter1 __first1, _InputIter1 __last1,
+                         _InputIter2 __first2, _InputIter2 __last2,
+                         _OutputIter __result) {
+  return __set_symmetric_difference(__first1, __last1, __first2, __last2, __result,
+                                    __less(_STLP_VALUE_TYPE(__first1, _InputIter1)));  
+}
+
+template <class _InputIter1, class _InputIter2, class _OutputIter, class _Compare>
+_OutputIter 
+set_symmetric_difference(_InputIter1 __first1, _InputIter1 __last1,
+                         _InputIter2 __first2, _InputIter2 __last2,
+                         _OutputIter __result,
+                         _Compare __comp) {
+  return __set_symmetric_difference(__first1, __last1, __first2, __last2, __result, __comp);
+}
+
+// min_element and max_element, with and without an explicitly supplied
+// comparison function.
+
+template <class _ForwardIter, class _Compare>
+_ForwardIter max_element(_ForwardIter __first, _ForwardIter __last,
+                            _Compare __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  if (__first == __last) return __first;
+  _ForwardIter __result = __first;
+  while (++__first != __last) 
+    if (__comp(*__result, *__first)) __result = __first;
+  return __result;
+}
+
+template <class _ForwardIter>
+_ForwardIter max_element(_ForwardIter __first, _ForwardIter __last) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  if (__first == __last) return __first;
+  _ForwardIter __result = __first;
+  while (++__first != __last) 
+    if (*__result < *__first)
+      __result = __first;
+  return __result;
+}
+
+template <class _ForwardIter>
+_ForwardIter min_element(_ForwardIter __first, _ForwardIter __last) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  if (__first == __last) return __first;
+  _ForwardIter __result = __first;
+  while (++__first != __last) 
+    if (*__first < *__result)
+      __result = __first;
+  return __result;
+}
+
+template <class _ForwardIter, class _Compare>
+_ForwardIter min_element(_ForwardIter __first, _ForwardIter __last,
+                            _Compare __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  if (__first == __last) return __first;
+  _ForwardIter __result = __first;
+  while (++__first != __last) 
+    if (__comp(*__first, *__result)) __result = __first;
+  return __result;
+}
+
+// next_permutation and prev_permutation, with and without an explicitly 
+// supplied comparison function.
+template <class _BidirectionalIter, class _Compare>
+bool __next_permutation(_BidirectionalIter __first, _BidirectionalIter __last,
+                        _Compare __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  if (__first == __last)
+    return false;
+  _BidirectionalIter __i = __first;
+  ++__i;
+  if (__i == __last)
+    return false;
+  __i = __last;
+  --__i;
+
+  for(;;) {
+    _BidirectionalIter __ii = __i;
+    --__i;
+    if (__comp(*__i, *__ii)) {
+      _BidirectionalIter __j = __last;
+      while (!__comp(*__i, *--__j))
+        {}
+      iter_swap(__i, __j);
+      reverse(__ii, __last);
+      return true;
+    }
+    if (__i == __first) {
+      reverse(__first, __last);
+      return false;
+    }
+  }
+#if defined(_STLP_NEED_UNREACHABLE_RETURN)
+    return 0;
+#endif
+}
+
+template <class _BidirectionalIter>
+bool next_permutation(_BidirectionalIter __first, _BidirectionalIter __last) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  return __next_permutation(__first, __last, __less(_STLP_VALUE_TYPE(__first, _BidirectionalIter)));
+}
+
+template <class _BidirectionalIter, class _Compare>
+bool next_permutation(_BidirectionalIter __first, _BidirectionalIter __last,
+                      _Compare __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  return __next_permutation(__first, __last, __comp);
+}
+
+template <class _BidirectionalIter, class _Compare>
+bool __prev_permutation(_BidirectionalIter __first, _BidirectionalIter __last,
+                      _Compare __comp) {
+  if (__first == __last)
+    return false;
+  _BidirectionalIter __i = __first;
+  ++__i;
+  if (__i == __last)
+    return false;
+  __i = __last;
+  --__i;
+
+  for(;;) {
+    _BidirectionalIter __ii = __i;
+    --__i;
+    if (__comp(*__ii, *__i)) {
+      _BidirectionalIter __j = __last;
+      while (!__comp(*--__j, *__i))
+        {}
+      iter_swap(__i, __j);
+      reverse(__ii, __last);
+      return true;
+    }
+    if (__i == __first) {
+      reverse(__first, __last);
+      return false;
+    }
+  }
+#if defined(_STLP_NEED_UNREACHABLE_RETURN)
+    return 0;
+#endif
+}
+
+template <class _BidirectionalIter>
+bool prev_permutation(_BidirectionalIter __first, _BidirectionalIter __last) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  return __prev_permutation(__first, __last, __less(_STLP_VALUE_TYPE(__first, _BidirectionalIter)));
+}
+
+template <class _BidirectionalIter, class _Compare>
+bool prev_permutation(_BidirectionalIter __first, _BidirectionalIter __last,
+                      _Compare __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  return __prev_permutation(__first, __last, __comp);
+}
+
+# ifndef _STLP_NO_EXTENSIONS
+
+// is_heap, a predicate testing whether or not a range is
+// a heap.  This function is an extension, not part of the C++
+// standard.
+
+
+template <class _RandomAccessIter, class _Distance, class _StrictWeakOrdering>
+bool __is_heap(_RandomAccessIter __first, _StrictWeakOrdering __comp,
+               _Distance __n)
+{
+  _Distance __parent = 0;
+  for (_Distance __child = 1; __child < __n; ++__child) {
+    if (__comp(__first[__parent], __first[__child]))
+      return false;
+    if ((__child & 1) == 0)
+      ++__parent;
+  }
+  return true;
+}
+
+template <class _RandomAccessIter>
+bool is_heap(_RandomAccessIter __first, _RandomAccessIter __last)
+{
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  return __is_heap(__first, __less(_STLP_VALUE_TYPE(__first, _RandomAccessIter)), __last - __first);
+}
+
+template <class _RandomAccessIter, class _StrictWeakOrdering>
+bool is_heap(_RandomAccessIter __first, _RandomAccessIter __last,
+	     _StrictWeakOrdering __comp)
+{
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  return __is_heap(__first, __comp, __last - __first);
+}
+
+
+template <class _ForwardIter, class _StrictWeakOrdering>
+bool __is_sorted(_ForwardIter __first, _ForwardIter __last,
+                 _StrictWeakOrdering __comp)
+{
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  if (__first == __last)
+    return true;
+
+  _ForwardIter __next = __first;
+  for (++__next; __next != __last; __first = __next, ++__next) {
+    if (__comp(*__next, *__first))
+      return false;
+  }
+
+  return true;
+}
+
+# endif /* _STLP_NO_EXTENSIONS */
+
+_STLP_END_NAMESPACE
+
+# undef __stl_threshold
+
+#endif /* _STLP_ALGO_C */
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_algo.h b/main/source/stlport/stlport/stl/_algo.h
new file mode 100644
index 00000000..e0fb0f99
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_algo.h
@@ -0,0 +1,740 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_ALGO_H
+#define _STLP_INTERNAL_ALGO_H
+
+# ifndef _STLP_INTERNAL_ALGOBASE_H
+#  include <stl/_algobase.h>
+# endif
+
+# ifndef _STLP_INTERNAL_TEMPBUF_H
+#  include <stl/_tempbuf.h>
+# endif
+
+# ifndef _STLP_INTERNAL_HEAP_H
+#  include <stl/_heap.h>
+# endif
+
+# ifndef _STLP_INTERNAL_ITERATOR_H
+#  include <stl/_iterator.h>
+# endif
+
+# ifndef _STLP_INTERNAL_FUNCTION_BASE_H
+#  include <stl/_function_base.h>
+# endif
+
+# ifdef __SUNPRO_CC
+// remove() conflict
+#  include <cstdio>
+# endif
+
+_STLP_BEGIN_NAMESPACE
+
+// for_each.  Apply a function to every element of a range.
+template <class _InputIter, class _Function>
+_STLP_INLINE_LOOP _Function 
+for_each(_InputIter __first, _InputIter __last, _Function __f) {
+  for ( ; __first != __last; ++__first)
+    __f(*__first);
+  return __f;
+}
+
+// count_if
+template <class _InputIter, class _Predicate>
+_STLP_INLINE_LOOP _STLP_DIFFERENCE_TYPE(_InputIter)
+count_if(_InputIter __first, _InputIter __last, _Predicate __pred) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+_STLP_DIFFERENCE_TYPE(_InputIter) __n = 0;
+  for ( ; __first != __last; ++__first)
+    if (__pred(*__first))
+      ++__n;
+  return __n;
+}
+
+// adjacent_find.
+
+template <class _ForwardIter, class _BinaryPredicate>
+_STLP_INLINE_LOOP _ForwardIter 
+adjacent_find(_ForwardIter __first, _ForwardIter __last,
+              _BinaryPredicate __binary_pred) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  if (__first == __last)
+    return __last;
+  _ForwardIter __next = __first;
+  while(++__next != __last) {
+    if (__binary_pred(*__first, *__next))
+      return __first;
+    __first = __next;
+  }
+  return __last;
+}
+
+template <class _ForwardIter>
+_STLP_INLINE_LOOP _ForwardIter 
+adjacent_find(_ForwardIter __first, _ForwardIter __last) {
+  return adjacent_find(__first, __last,
+		       __equal_to(_STLP_VALUE_TYPE(__first, _ForwardIter)));
+}
+
+# ifndef _STLP_NO_ANACHRONISMS
+template <class _InputIter, class _Tp, class _Size>
+_STLP_INLINE_LOOP void 
+count(_InputIter __first, _InputIter __last, const _Tp& __val, _Size& __n) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+    for ( ; __first != __last; ++__first)
+      if (*__first == __val)
+        ++__n;
+}
+
+template <class _InputIter, class _Predicate, class _Size>
+_STLP_INLINE_LOOP void 
+count_if(_InputIter __first, _InputIter __last, _Predicate __pred, _Size& __n) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  for ( ; __first != __last; ++__first)
+    if (__pred(*__first))
+      ++__n;
+}
+# endif
+
+template <class _ForwardIter1, class _ForwardIter2>
+_ForwardIter1 search(_ForwardIter1 __first1, _ForwardIter1 __last1,
+                     _ForwardIter2 __first2, _ForwardIter2 __last2);
+
+// search_n.  Search for __count consecutive copies of __val.
+template <class _ForwardIter, class _Integer, class _Tp>
+_ForwardIter search_n(_ForwardIter __first, _ForwardIter __last,
+                      _Integer __count, const _Tp& __val);
+template <class _ForwardIter, class _Integer, class _Tp, class _BinaryPred>
+_ForwardIter search_n(_ForwardIter __first, _ForwardIter __last,
+                      _Integer __count, const _Tp& __val, _BinaryPred __binary_pred);
+
+template <class _InputIter, class _ForwardIter>
+inline _InputIter find_first_of(_InputIter __first1, _InputIter __last1,
+                                _ForwardIter __first2, _ForwardIter __last2) {
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+  _STLP_DEBUG_CHECK(__check_range(__first2, __last2))
+  return __find_first_of(__first1, __last1, __first2, __last2,__equal_to(_STLP_VALUE_TYPE(__first1, _InputIter)));
+}
+
+template <class _InputIter, class _ForwardIter, class _BinaryPredicate>
+inline _InputIter 
+find_first_of(_InputIter __first1, _InputIter __last1,
+              _ForwardIter __first2, _ForwardIter __last2,_BinaryPredicate __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+  _STLP_DEBUG_CHECK(__check_range(__first2, __last2))
+  return __find_first_of(__first1, __last1, __first2, __last2,__comp);
+}
+
+template <class _ForwardIter1, class _ForwardIter2>
+_ForwardIter1 
+find_end(_ForwardIter1 __first1, _ForwardIter1 __last1, 
+         _ForwardIter2 __first2, _ForwardIter2 __last2);
+
+// swap_ranges
+template <class _ForwardIter1, class _ForwardIter2>
+_STLP_INLINE_LOOP _ForwardIter2 
+swap_ranges(_ForwardIter1 __first1, _ForwardIter1 __last1, _ForwardIter2 __first2) {
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+  for ( ; __first1 != __last1; ++__first1, ++__first2)
+    iter_swap(__first1, __first2);
+  return __first2;
+}
+
+// transform
+template <class _InputIter, class _OutputIter, class _UnaryOperation>
+_STLP_INLINE_LOOP _OutputIter 
+transform(_InputIter __first, _InputIter __last, _OutputIter __result, _UnaryOperation __opr) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  for ( ; __first != __last; ++__first, ++__result)
+    *__result = __opr(*__first);
+  return __result;
+}
+template <class _InputIter1, class _InputIter2, class _OutputIter, class _BinaryOperation>
+_STLP_INLINE_LOOP _OutputIter 
+transform(_InputIter1 __first1, _InputIter1 __last1, 
+          _InputIter2 __first2, _OutputIter __result,_BinaryOperation __binary_op) {
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+  for ( ; __first1 != __last1; ++__first1, ++__first2, ++__result)
+    *__result = __binary_op(*__first1, *__first2);
+  return __result;
+}
+
+// replace_if, replace_copy, replace_copy_if
+
+template <class _ForwardIter, class _Predicate, class _Tp>
+_STLP_INLINE_LOOP void 
+replace_if(_ForwardIter __first, _ForwardIter __last, _Predicate __pred, const _Tp& __new_value) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  for ( ; __first != __last; ++__first)
+    if (__pred(*__first))
+      *__first = __new_value;
+}
+
+template <class _InputIter, class _OutputIter, class _Tp>
+_STLP_INLINE_LOOP  _OutputIter 
+replace_copy(_InputIter __first, _InputIter __last,_OutputIter __result,
+             const _Tp& __old_value, const _Tp& __new_value) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  for ( ; __first != __last; ++__first, ++__result)
+    *__result = *__first == __old_value ? __new_value : *__first;
+  return __result;
+}
+
+template <class _Iterator, class _OutputIter, class _Predicate, class _Tp>
+_STLP_INLINE_LOOP _OutputIter 
+replace_copy_if(_Iterator __first, _Iterator __last,
+                _OutputIter __result,
+                _Predicate __pred, const _Tp& __new_value) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  for ( ; __first != __last; ++__first, ++__result)
+    *__result = __pred(*__first) ? __new_value : *__first;
+  return __result;
+}
+
+// generate and generate_n
+
+template <class _ForwardIter, class _Generator>
+_STLP_INLINE_LOOP void 
+generate(_ForwardIter __first, _ForwardIter __last, _Generator __gen) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  for ( ; __first != __last; ++__first)
+    *__first = __gen();
+}
+
+template <class _OutputIter, class _Size, class _Generator>
+_STLP_INLINE_LOOP _OutputIter 
+generate_n(_OutputIter __first, _Size __n, _Generator __gen) {
+  for ( ; __n > 0; --__n, ++__first)
+    *__first = __gen();
+  return __first;
+}
+
+// remove, remove_if, remove_copy, remove_copy_if
+
+template <class _InputIter, class _OutputIter, class _Tp>
+_STLP_INLINE_LOOP _OutputIter 
+remove_copy(_InputIter __first, _InputIter __last,_OutputIter __result, const _Tp& __val) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  for ( ; __first != __last; ++__first)
+    if (!(*__first == __val)) {
+      *__result = *__first;
+      ++__result;
+    }
+  return __result;
+}
+
+template <class _InputIter, class _OutputIter, class _Predicate>
+_STLP_INLINE_LOOP _OutputIter 
+remove_copy_if(_InputIter __first, _InputIter __last, _OutputIter __result, _Predicate __pred) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  for ( ; __first != __last; ++__first)
+    if (!__pred(*__first)) {
+      *__result = *__first;
+      ++__result;
+    }
+  return __result;
+}
+
+template <class _ForwardIter, class _Tp>
+_STLP_INLINE_LOOP _ForwardIter 
+remove(_ForwardIter __first, _ForwardIter __last, const _Tp& __val) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  __first = find(__first, __last, __val);
+  if (__first == __last)
+    return __first;
+  else { 
+    _ForwardIter __next = __first;
+    return remove_copy(++__next, __last, __first, __val);
+  }
+}
+
+template <class _ForwardIter, class _Predicate>
+_STLP_INLINE_LOOP _ForwardIter 
+remove_if(_ForwardIter __first, _ForwardIter __last, _Predicate __pred) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  __first = find_if(__first, __last, __pred);
+  if ( __first == __last )
+    return __first;
+  else {
+    _ForwardIter __next = __first;
+    return remove_copy_if(++__next, __last, __first, __pred);
+  }
+}
+
+// unique and unique_copy
+template <class _InputIter, class _OutputIter>
+_OutputIter unique_copy(_InputIter __first, _InputIter __last, _OutputIter __result);
+
+template <class _InputIter, class _OutputIter, class _BinaryPredicate>
+_OutputIter unique_copy(_InputIter __first, _InputIter __last,_OutputIter __result,
+                        _BinaryPredicate __binary_pred);
+
+template <class _ForwardIter>
+inline _ForwardIter unique(_ForwardIter __first, _ForwardIter __last) {
+  __first = adjacent_find(__first, __last);
+  return unique_copy(__first, __last, __first);
+}
+
+template <class _ForwardIter, class _BinaryPredicate>
+inline _ForwardIter unique(_ForwardIter __first, _ForwardIter __last,
+                    _BinaryPredicate __binary_pred) {
+  __first = adjacent_find(__first, __last, __binary_pred);
+  return unique_copy(__first, __last, __first, __binary_pred);
+}
+
+// reverse and reverse_copy, and their auxiliary functions
+
+template <class _BidirectionalIter>
+_STLP_INLINE_LOOP void 
+__reverse(_BidirectionalIter __first, _BidirectionalIter __last, const bidirectional_iterator_tag &) {
+  for(; __first != __last && __first != --__last; ++__first)
+    iter_swap(__first,__last);
+}
+
+
+template <class _RandomAccessIter>
+_STLP_INLINE_LOOP void 
+__reverse(_RandomAccessIter __first, _RandomAccessIter __last, const random_access_iterator_tag &) {
+  for (; __first < __last; ++__first) iter_swap(__first, --__last);
+}
+
+template <class _BidirectionalIter>
+inline void 
+reverse(_BidirectionalIter __first, _BidirectionalIter __last) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  __reverse(__first, __last, _STLP_ITERATOR_CATEGORY(__first, _BidirectionalIter));
+}
+
+template <class _BidirectionalIter, class _OutputIter>
+_STLP_INLINE_LOOP
+_OutputIter reverse_copy(_BidirectionalIter __first,
+                            _BidirectionalIter __last,
+                            _OutputIter __result) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  while (__first != __last) {
+    --__last;
+    *__result = *__last;
+    ++__result;
+  }
+  return __result;
+}
+
+// rotate and rotate_copy, and their auxiliary functions
+
+template <class _EuclideanRingElement>
+_STLP_INLINE_LOOP
+_EuclideanRingElement __gcd(_EuclideanRingElement __m,
+                            _EuclideanRingElement __n)
+{
+  while (__n != 0) {
+    _EuclideanRingElement __t = __m % __n;
+    __m = __n;
+    __n = __t;
+  }
+  return __m;
+}
+
+template <class _ForwardIter>
+_ForwardIter 
+rotate(_ForwardIter __first, _ForwardIter __middle, _ForwardIter __last);
+
+template <class _ForwardIter, class _OutputIter>
+inline _OutputIter rotate_copy(_ForwardIter __first, _ForwardIter __middle,
+                               _ForwardIter __last, _OutputIter __result) {
+  return copy(__first, __middle, copy(__middle, __last, __result));
+}
+
+// random_shuffle
+
+template <class _RandomAccessIter>
+void random_shuffle(_RandomAccessIter __first, _RandomAccessIter __last);
+
+template <class _RandomAccessIter, class _RandomNumberGenerator>
+void random_shuffle(_RandomAccessIter __first, _RandomAccessIter __last,
+                    _RandomNumberGenerator& __rand);
+
+# ifndef _STLP_NO_EXTENSIONS
+// random_sample and random_sample_n (extensions, not part of the standard).
+
+template <class _ForwardIter, class _OutputIter, class _Distance>
+_OutputIter random_sample_n(_ForwardIter __first, _ForwardIter __last,
+                            _OutputIter __out, const _Distance __n);
+
+template <class _ForwardIter, class _OutputIter, class _Distance,
+          class _RandomNumberGenerator>
+_OutputIter random_sample_n(_ForwardIter __first, _ForwardIter __last,
+                            _OutputIter __out, const _Distance __n,
+                            _RandomNumberGenerator& __rand);
+
+template <class _InputIter, class _RandomAccessIter>
+_RandomAccessIter
+random_sample(_InputIter __first, _InputIter __last,
+              _RandomAccessIter __out_first, _RandomAccessIter __out_last);
+
+template <class _InputIter, class _RandomAccessIter, 
+          class _RandomNumberGenerator>
+_RandomAccessIter
+random_sample(_InputIter __first, _InputIter __last,
+              _RandomAccessIter __out_first, _RandomAccessIter __out_last,
+              _RandomNumberGenerator& __rand);
+
+# endif /* _STLP_NO_EXTENSIONS */
+
+// partition, stable_partition, and their auxiliary functions
+
+template <class _ForwardIter, class _Predicate>
+_ForwardIter partition(_ForwardIter __first, _ForwardIter __last, _Predicate   __pred);
+
+
+template <class _ForwardIter, class _Predicate>
+_ForwardIter 
+stable_partition(_ForwardIter __first, _ForwardIter __last, _Predicate __pred);
+
+// sort() and its auxiliary functions. 
+
+template <class _Size>
+inline _Size __lg(_Size __n) {
+  _Size __k;
+  for (__k = 0; __n != 1; __n >>= 1) ++__k;
+  return __k;
+}
+
+template <class _RandomAccessIter>
+void sort(_RandomAccessIter __first, _RandomAccessIter __last);
+template <class _RandomAccessIter, class _Compare>
+void sort(_RandomAccessIter __first, _RandomAccessIter __last, _Compare __comp);
+
+// stable_sort() and its auxiliary functions.
+template <class _RandomAccessIter>
+void stable_sort(_RandomAccessIter __first,
+		 _RandomAccessIter __last);
+
+template <class _RandomAccessIter, class _Compare>
+void stable_sort(_RandomAccessIter __first,
+		 _RandomAccessIter __last, _Compare __comp);
+
+// partial_sort, partial_sort_copy, and auxiliary functions.
+
+template <class _RandomAccessIter>
+void 
+partial_sort(_RandomAccessIter __first,_RandomAccessIter __middle, _RandomAccessIter __last);
+
+template <class _RandomAccessIter, class _Compare>
+void 
+partial_sort(_RandomAccessIter __first,_RandomAccessIter __middle, 
+             _RandomAccessIter __last, _Compare __comp);
+
+template <class _InputIter, class _RandomAccessIter>
+_RandomAccessIter
+partial_sort_copy(_InputIter __first, _InputIter __last,
+                  _RandomAccessIter __result_first, _RandomAccessIter __result_last);
+
+template <class _InputIter, class _RandomAccessIter, class _Compare>
+_RandomAccessIter
+partial_sort_copy(_InputIter __first, _InputIter __last,
+                  _RandomAccessIter __result_first,
+                  _RandomAccessIter __result_last, _Compare __comp);
+
+// nth_element() and its auxiliary functions.  
+
+template <class _RandomAccessIter>
+void nth_element(_RandomAccessIter __first, _RandomAccessIter __nth,
+                 _RandomAccessIter __last);
+
+template <class _RandomAccessIter, class _Compare>
+void nth_element(_RandomAccessIter __first, _RandomAccessIter __nth,
+                 _RandomAccessIter __last, _Compare __comp);
+
+// auxiliary class for lower_bound, etc.
+template <class _T1, class _T2>
+struct __less_2 {
+  bool operator() (const _T1& __x, const _T2 __y) const { return __x < __y ; } 
+};
+
+template <class _T1, class _T2>
+__less_2<_T1,_T2> __less2(_T1*, _T2* ) { return __less_2<_T1, _T2>(); }
+
+#ifdef _STLP_FUNCTION_PARTIAL_ORDER
+template <class _Tp>
+less<_Tp> __less2(_Tp*, _Tp* ) { return less<_Tp>(); }
+#endif
+
+// Binary search (lower_bound, upper_bound, equal_range, binary_search).
+
+template <class _ForwardIter, class _Tp>
+inline _ForwardIter lower_bound(_ForwardIter __first, _ForwardIter __last,
+                                   const _Tp& __val) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+    return __lower_bound(__first, __last, __val, 
+			 __less2(_STLP_VALUE_TYPE(__first, _ForwardIter), (_Tp*)0),
+			 _STLP_DISTANCE_TYPE(__first, _ForwardIter));
+}
+
+template <class _ForwardIter, class _Tp, class _Compare>
+inline _ForwardIter lower_bound(_ForwardIter __first, _ForwardIter __last,
+                                const _Tp& __val, _Compare __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  return __lower_bound(__first, __last, __val, __comp, _STLP_DISTANCE_TYPE(__first, _ForwardIter));
+}
+
+template <class _ForwardIter, class _Tp, class _Compare, class _Distance>
+_ForwardIter __upper_bound(_ForwardIter __first, _ForwardIter __last,
+                           const _Tp& __val, _Compare __comp, _Distance*);
+
+template <class _ForwardIter, class _Tp>
+inline _ForwardIter upper_bound(_ForwardIter __first, _ForwardIter __last,
+                                const _Tp& __val) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  return __upper_bound(__first, __last, __val, 
+		       __less2(_STLP_VALUE_TYPE(__first, _ForwardIter), (_Tp*)0),
+                       _STLP_DISTANCE_TYPE(__first, _ForwardIter));
+}
+
+template <class _ForwardIter, class _Tp, class _Compare>
+inline _ForwardIter upper_bound(_ForwardIter __first, _ForwardIter __last,
+                                const _Tp& __val, _Compare __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  return __upper_bound(__first, __last, __val, __comp,
+                       _STLP_DISTANCE_TYPE(__first, _ForwardIter));
+}
+
+template <class _ForwardIter, class _Tp, class _Compare, class _Distance>
+pair<_ForwardIter, _ForwardIter>
+__equal_range(_ForwardIter __first, _ForwardIter __last, const _Tp& __val,
+              _Compare __comp, _Distance*);
+
+template <class _ForwardIter, class _Tp>
+inline pair<_ForwardIter, _ForwardIter>
+equal_range(_ForwardIter __first, _ForwardIter __last, const _Tp& __val) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  return __equal_range(__first, __last, __val,  
+		       __less2(_STLP_VALUE_TYPE(__first, _ForwardIter), (_Tp*)0),
+                       _STLP_DISTANCE_TYPE(__first, _ForwardIter));
+}
+
+template <class _ForwardIter, class _Tp, class _Compare>
+inline pair<_ForwardIter, _ForwardIter>
+equal_range(_ForwardIter __first, _ForwardIter __last, const _Tp& __val,
+            _Compare __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  return __equal_range(__first, __last, __val, __comp,
+                       _STLP_DISTANCE_TYPE(__first, _ForwardIter));
+} 
+
+template <class _ForwardIter, class _Tp>
+inline bool binary_search(_ForwardIter __first, _ForwardIter __last,
+                   const _Tp& __val) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  _ForwardIter __i = __lower_bound(__first, __last, __val, 
+                                   __less2(_STLP_VALUE_TYPE(__first, _ForwardIter), (_Tp*)0),
+                                   _STLP_DISTANCE_TYPE(__first, _ForwardIter));
+  return __i != __last && !(__val < *__i);
+}
+
+template <class _ForwardIter, class _Tp, class _Compare>
+inline bool binary_search(_ForwardIter __first, _ForwardIter __last,
+                   const _Tp& __val,
+                   _Compare __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  _ForwardIter __i = __lower_bound(__first, __last, __val, __comp, _STLP_DISTANCE_TYPE(__first, _ForwardIter));
+  return __i != __last && !__comp(__val, *__i);
+}
+
+// merge, with and without an explicitly supplied comparison function.
+
+template <class _InputIter1, class _InputIter2, class _OutputIter>
+_OutputIter merge(_InputIter1 __first1, _InputIter1 __last1,
+                  _InputIter2 __first2, _InputIter2 __last2,
+                  _OutputIter __result);
+ 
+template <class _InputIter1, class _InputIter2, class _OutputIter,
+          class _Compare>
+_OutputIter merge(_InputIter1 __first1, _InputIter1 __last1,
+                  _InputIter2 __first2, _InputIter2 __last2,
+                  _OutputIter __result, _Compare __comp);
+
+
+// inplace_merge and its auxiliary functions. 
+
+
+template <class _BidirectionalIter>
+void inplace_merge(_BidirectionalIter __first,
+		   _BidirectionalIter __middle,
+		   _BidirectionalIter __last) ;
+
+template <class _BidirectionalIter, class _Compare>
+void inplace_merge(_BidirectionalIter __first,
+		   _BidirectionalIter __middle,
+		   _BidirectionalIter __last, _Compare __comp);
+
+// Set algorithms: includes, set_union, set_intersection, set_difference,
+// set_symmetric_difference.  All of these algorithms have the precondition
+// that their input ranges are sorted and the postcondition that their output
+// ranges are sorted.
+
+template <class _InputIter1, class _InputIter2>
+bool includes(_InputIter1 __first1, _InputIter1 __last1,
+              _InputIter2 __first2, _InputIter2 __last2);
+
+template <class _InputIter1, class _InputIter2, class _Compare>
+bool includes(_InputIter1 __first1, _InputIter1 __last1,
+              _InputIter2 __first2, _InputIter2 __last2, _Compare __comp);
+ 
+template <class _InputIter1, class _InputIter2, class _OutputIter>
+_OutputIter set_union(_InputIter1 __first1, _InputIter1 __last1,
+                      _InputIter2 __first2, _InputIter2 __last2,
+                      _OutputIter __result);
+
+template <class _InputIter1, class _InputIter2, class _OutputIter,
+          class _Compare>
+_OutputIter set_union(_InputIter1 __first1, _InputIter1 __last1,
+                      _InputIter2 __first2, _InputIter2 __last2,
+                      _OutputIter __result, _Compare __comp);
+
+template <class _InputIter1, class _InputIter2, class _OutputIter>
+_OutputIter set_intersection(_InputIter1 __first1, _InputIter1 __last1,
+                             _InputIter2 __first2, _InputIter2 __last2,
+                             _OutputIter __result);
+
+template <class _InputIter1, class _InputIter2, class _OutputIter,
+          class _Compare>
+_OutputIter set_intersection(_InputIter1 __first1, _InputIter1 __last1,
+                             _InputIter2 __first2, _InputIter2 __last2,
+                             _OutputIter __result, _Compare __comp);
+
+
+
+template <class _InputIter1, class _InputIter2, class _OutputIter>
+_OutputIter set_difference(_InputIter1 __first1, _InputIter1 __last1,
+                           _InputIter2 __first2, _InputIter2 __last2,
+                           _OutputIter __result);
+
+template <class _InputIter1, class _InputIter2, class _OutputIter, 
+          class _Compare>
+_OutputIter set_difference(_InputIter1 __first1, _InputIter1 __last1,
+                           _InputIter2 __first2, _InputIter2 __last2, 
+                           _OutputIter __result, _Compare __comp);
+
+template <class _InputIter1, class _InputIter2, class _OutputIter>
+_OutputIter 
+set_symmetric_difference(_InputIter1 __first1, _InputIter1 __last1,
+                         _InputIter2 __first2, _InputIter2 __last2,
+                         _OutputIter __result);
+
+
+template <class _InputIter1, class _InputIter2, class _OutputIter,
+          class _Compare>
+_OutputIter 
+set_symmetric_difference(_InputIter1 __first1, _InputIter1 __last1,
+                         _InputIter2 __first2, _InputIter2 __last2,
+                         _OutputIter __result,
+                         _Compare __comp);
+
+
+// min_element and max_element, with and without an explicitly supplied
+// comparison function.
+
+template <class _ForwardIter>
+_ForwardIter max_element(_ForwardIter __first, _ForwardIter __last);
+template <class _ForwardIter, class _Compare>
+_ForwardIter max_element(_ForwardIter __first, _ForwardIter __last,
+                            _Compare __comp);
+
+template <class _ForwardIter>
+_ForwardIter min_element(_ForwardIter __first, _ForwardIter __last);
+
+template <class _ForwardIter, class _Compare>
+_ForwardIter min_element(_ForwardIter __first, _ForwardIter __last,
+                            _Compare __comp);
+
+// next_permutation and prev_permutation, with and without an explicitly 
+// supplied comparison function.
+
+template <class _BidirectionalIter>
+bool next_permutation(_BidirectionalIter __first, _BidirectionalIter __last);
+
+template <class _BidirectionalIter, class _Compare>
+bool next_permutation(_BidirectionalIter __first, _BidirectionalIter __last,
+                      _Compare __comp);
+
+
+template <class _BidirectionalIter>
+bool prev_permutation(_BidirectionalIter __first, _BidirectionalIter __last);
+
+
+template <class _BidirectionalIter, class _Compare>
+bool prev_permutation(_BidirectionalIter __first, _BidirectionalIter __last,
+                      _Compare __comp);
+
+# ifndef _STLP_NO_EXTENSIONS
+
+// is_heap, a predicate testing whether or not a range is
+// a heap.  This function is an extension, not part of the C++
+// standard.
+
+template <class _RandomAccessIter>
+bool is_heap(_RandomAccessIter __first, _RandomAccessIter __last);
+
+template <class _RandomAccessIter, class _StrictWeakOrdering>
+bool is_heap(_RandomAccessIter __first, _RandomAccessIter __last,
+	     _StrictWeakOrdering __comp);
+
+
+// is_sorted, a predicated testing whether a range is sorted in
+// nondescending order.  This is an extension, not part of the C++
+// standard.
+template <class _ForwardIter, class _StrictWeakOrdering>
+bool __is_sorted(_ForwardIter __first, _ForwardIter __last,
+                 _StrictWeakOrdering __comp);
+
+template <class _ForwardIter>
+inline bool is_sorted(_ForwardIter __first, _ForwardIter __last) {
+  return __is_sorted(__first, __last, __less(_STLP_VALUE_TYPE(__first, _ForwardIter)));
+}
+
+template <class _ForwardIter, class _StrictWeakOrdering>
+inline bool is_sorted(_ForwardIter __first, _ForwardIter __last,
+                      _StrictWeakOrdering __comp) {
+  return __is_sorted(__first, __last, __comp);
+}
+# endif
+
+_STLP_END_NAMESPACE
+
+# if !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_algo.c>
+# endif
+
+#endif /* _STLP_INTERNAL_ALGO_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_algobase.c b/main/source/stlport/stlport/stl/_algobase.c
new file mode 100644
index 00000000..3cd46132
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_algobase.c
@@ -0,0 +1,392 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+#ifndef _STLP_ALGOBASE_C
+#define _STLP_ALGOBASE_C
+
+# if !defined (_STLP_INTERNAL_ALGOBASE_H)
+#  include <stl/_algobase.h>
+# endif
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _InputIter1, class _InputIter2>
+bool lexicographical_compare(_InputIter1 __first1, _InputIter1 __last1,
+                             _InputIter2 __first2, _InputIter2 __last2) {
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+    _STLP_DEBUG_CHECK(__check_range(__first2, __last2))
+    for ( ; __first1 != __last1 && __first2 != __last2
+	    ; ++__first1, ++__first2) {
+      if (*__first1 < *__first2)
+	return true;
+      if (*__first2 < *__first1)
+	return false;
+    }
+  return __first1 == __last1 && __first2 != __last2;
+}
+
+template <class _InputIter1, class _InputIter2, class _Compare>
+bool lexicographical_compare(_InputIter1 __first1, _InputIter1 __last1,
+                             _InputIter2 __first2, _InputIter2 __last2,
+                             _Compare __comp) {
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+    _STLP_DEBUG_CHECK(__check_range(__first2, __last2))
+    for ( ; __first1 != __last1 && __first2 != __last2
+	    ; ++__first1, ++__first2) {
+      if (__comp(*__first1, *__first2))
+	return true;
+      if (__comp(*__first2, *__first1))
+	return false;
+    }
+  return __first1 == __last1 && __first2 != __last2;
+}
+
+# ifndef _STLP_NO_EXTENSIONS
+
+template <class _InputIter1, class _InputIter2>
+int __lexicographical_compare_3way(_InputIter1 __first1, _InputIter1 __last1,
+                                   _InputIter2 __first2, _InputIter2 __last2)
+{
+  while (__first1 != __last1 && __first2 != __last2) {
+    if (*__first1 < *__first2)
+      return -1;
+    if (*__first2 < *__first1)
+      return 1;
+    ++__first1;
+    ++__first2;
+  }
+  if (__first2 == __last2) {
+    return !(__first1 == __last1);
+  }
+  else {
+    return -1;
+  }
+}
+
+
+template <class _InputIter1, class _InputIter2>
+int lexicographical_compare_3way(_InputIter1 __first1, _InputIter1 __last1,
+                                 _InputIter2 __first2, _InputIter2 __last2)
+{
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+    _STLP_DEBUG_CHECK(__check_range(__first2, __last2))
+    return __lexicographical_compare_3way(__first1, __last1, __first2, __last2);
+}
+# endif
+
+template <class _RandomAccessIter, class _Tp>
+_STLP_INLINE_LOOP _RandomAccessIter __find(_RandomAccessIter __first, _RandomAccessIter __last,
+                                           const _Tp& __val,
+                                           const random_access_iterator_tag &)
+{
+  _STLP_DIFFERENCE_TYPE(_RandomAccessIter) __trip_count = (__last - __first) >> 2;
+
+  for ( ; __trip_count > 0 ; --__trip_count) {
+    if (*__first == __val) return __first;
+    ++__first;
+
+    if (*__first == __val) return __first;
+    ++__first;
+
+    if (*__first == __val) return __first;
+    ++__first;
+
+    if (*__first == __val) return __first;
+    ++__first;
+  }
+
+  switch(__last - __first) {
+  case 3:
+    if (*__first == __val) return __first;
+    ++__first;
+  case 2:
+    if (*__first == __val) return __first;
+    ++__first;
+  case 1:
+    if (*__first == __val) return __first;
+    ++__first;
+  case 0:
+  default:
+    return __last;
+  }
+}
+
+template <class _RandomAccessIter, class _Predicate>
+_STLP_INLINE_LOOP _RandomAccessIter __find_if(_RandomAccessIter __first, _RandomAccessIter __last,
+                                              _Predicate __pred,
+                                              const random_access_iterator_tag &)
+{
+  _STLP_DIFFERENCE_TYPE(_RandomAccessIter) __trip_count = (__last - __first) >> 2;
+
+  for ( ; __trip_count > 0 ; --__trip_count) {
+    if (__pred(*__first)) return __first;
+    ++__first;
+
+    if (__pred(*__first)) return __first;
+    ++__first;
+
+    if (__pred(*__first)) return __first;
+    ++__first;
+
+    if (__pred(*__first)) return __first;
+    ++__first;
+  }
+
+  switch(__last - __first) {
+  case 3:
+    if (__pred(*__first)) return __first;
+    ++__first;
+  case 2:
+    if (__pred(*__first)) return __first;
+    ++__first;
+  case 1:
+    if (__pred(*__first)) return __first;
+    //    ++__first;
+  case 0:
+  default:
+    return __last;
+  }
+}
+
+template <class _InputIter, class _Tp>
+inline _InputIter __find(_InputIter __first, _InputIter __last,
+			 const _Tp& __val,
+			 const input_iterator_tag &)
+{
+  while (__first != __last && !(*__first == __val))
+    ++__first;
+  return __first;
+}
+
+template <class _InputIter, class _Predicate>
+inline _InputIter __find_if(_InputIter __first, _STLP_MPW_EXTRA_CONST _InputIter __last,
+                            _Predicate __pred,
+                            const input_iterator_tag &)
+{
+  while (__first != __last && !__pred(*__first))
+    ++__first;
+  return __first;
+}
+
+template <class _InputIter, class _Predicate>
+_InputIter find_if(_InputIter __first, _InputIter __last,
+                   _Predicate __pred) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+    return __find_if(__first, __last, __pred, _STLP_ITERATOR_CATEGORY(__first, _InputIter));
+}
+
+template <class _InputIter, class _Tp>
+_InputIter find(_InputIter __first, _InputIter __last, const _Tp& __val)
+{
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+    return __find(__first, __last, __val, _STLP_ITERATOR_CATEGORY(__first, _InputIter));
+}
+
+template <class _ForwardIter1, class _ForwardIter2, class _BinaryPred>
+_ForwardIter1 search(_ForwardIter1 __first1, _ForwardIter1 __last1,
+                     _ForwardIter2 __first2, _ForwardIter2 __last2,
+                     _BinaryPred  __predicate) 
+{
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+    _STLP_DEBUG_CHECK(__check_range(__first2, __last2))
+    // Test for empty ranges
+    if (__first1 == __last1 || __first2 == __last2)
+      return __first1;
+
+  // Test for a pattern of length 1.
+  _ForwardIter2 __tmp(__first2);
+  ++__tmp;
+  if (__tmp == __last2) {
+    while (__first1 != __last1 && !__predicate(*__first1, *__first2))
+      ++__first1;
+    return __first1;    
+  }
+  
+  // General case.
+
+  _ForwardIter2 __p1, __p;
+
+  __p1 = __first2; ++__p1;
+
+  //  _ForwardIter1 __current = __first1;
+
+  while (__first1 != __last1) {
+    while (__first1 != __last1) {
+      if (__predicate(*__first1, *__first2))
+        break;
+      ++__first1;
+    }
+    while (__first1 != __last1 && !__predicate(*__first1, *__first2))
+      ++__first1;
+    if (__first1 == __last1)
+      return __last1;
+
+    __p = __p1;
+    _ForwardIter1 __current = __first1; 
+    if (++__current == __last1) return __last1;
+
+    while (__predicate(*__current, *__p)) {
+      if (++__p == __last2)
+        return __first1;
+      if (++__current == __last1)
+        return __last1;
+    }
+
+    ++__first1;
+  }
+  return __first1;
+}
+
+// find_first_of, with and without an explicitly supplied comparison function.
+
+template <class _InputIter, class _ForwardIter, class _BinaryPredicate>
+_InputIter __find_first_of(_InputIter __first1, _InputIter __last1,
+                           _ForwardIter __first2, _ForwardIter __last2,
+                           _BinaryPredicate __comp) {
+  for ( ; __first1 != __last1; ++__first1) 
+    for (_ForwardIter __iter = __first2; __iter != __last2; ++__iter)
+      if (__comp(*__first1, *__iter))
+        return __first1;
+  return __last1;
+}
+
+
+// find_end, with and without an explicitly supplied comparison function.
+// Search [first2, last2) as a subsequence in [first1, last1), and return
+// the *last* possible match.  Note that find_end for bidirectional iterators
+// is much faster than for forward iterators.
+
+// find_end for forward iterators. 
+
+template <class _ForwardIter1, class _ForwardIter2,
+  class _BinaryPredicate>
+_ForwardIter1 __find_end(_ForwardIter1 __first1, _ForwardIter1 __last1,
+                         _ForwardIter2 __first2, _ForwardIter2 __last2,
+                         const forward_iterator_tag &, const forward_iterator_tag &,
+                         _BinaryPredicate __comp)
+{
+  if (__first2 == __last2)
+    return __last1;
+  else {
+    _ForwardIter1 __result = __last1;
+    while (1) {
+      _ForwardIter1 __new_result
+        = search(__first1, __last1, __first2, __last2, __comp);
+      if (__new_result == __last1)
+        return __result;
+      else {
+        __result = __new_result;
+        __first1 = __new_result;
+        ++__first1;
+      }
+    }
+  }
+}
+
+// find_end for bidirectional iterators.  Requires partial specialization.
+#if defined ( _STLP_CLASS_PARTIAL_SPECIALIZATION )
+
+#if ! defined (_STLP_INTERNAL_ITERATOR_H)
+_STLP_END_NAMESPACE
+# include <stl/_iterator.h>
+_STLP_BEGIN_NAMESPACE 
+#endif
+
+template <class _BidirectionalIter1, class _BidirectionalIter2,
+  class _BinaryPredicate>
+_BidirectionalIter1
+__find_end(_BidirectionalIter1 __first1, _BidirectionalIter1 __last1,
+           _BidirectionalIter2 __first2, _BidirectionalIter2 __last2,
+           const bidirectional_iterator_tag &, const bidirectional_iterator_tag &, 
+           _BinaryPredicate __comp)
+{
+  typedef reverse_iterator<_BidirectionalIter1> _RevIter1;
+  typedef reverse_iterator<_BidirectionalIter2> _RevIter2;
+
+  _RevIter1 __rlast1(__first1);
+  _RevIter2 __rlast2(__first2);
+  _RevIter1 __rresult = search(_RevIter1(__last1), __rlast1,
+                               _RevIter2(__last2), __rlast2,
+                               __comp);
+
+  if (__rresult == __rlast1)
+    return __last1;
+  else {
+    _BidirectionalIter1 __result = __rresult.base();
+    advance(__result, -distance(__first2, __last2));
+    return __result;
+  }
+}
+#endif /* _STLP_CLASS_PARTIAL_SPECIALIZATION */
+
+template <class _ForwardIter1, class _ForwardIter2, 
+  class _BinaryPredicate>
+_ForwardIter1 
+find_end(_ForwardIter1 __first1, _ForwardIter1 __last1, 
+         _ForwardIter2 __first2, _ForwardIter2 __last2,
+         _BinaryPredicate __comp)
+{
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+    _STLP_DEBUG_CHECK(__check_range(__first2, __last2))
+    return __find_end(__first1, __last1, __first2, __last2,
+# if defined (_STLP_CLASS_PARTIAL_SPECIALIZATION)
+		      _STLP_ITERATOR_CATEGORY(__first1, _ForwardIter1),
+		      _STLP_ITERATOR_CATEGORY(__first2, _ForwardIter2),
+# else
+		      forward_iterator_tag(),
+		      forward_iterator_tag(),
+# endif
+		      __comp);
+}
+
+template <class _ForwardIter, class _Tp, class _Compare, class _Distance>
+_ForwardIter __lower_bound(_ForwardIter __first, _ForwardIter __last,
+			   const _Tp& __val, _Compare __comp, _Distance*)
+{
+  _Distance __len = distance(__first, __last);
+  _Distance __half;
+  _ForwardIter __middle;
+
+  while (__len > 0) {
+    __half = __len >> 1;
+    __middle = __first;
+    advance(__middle, __half);
+    if (__comp(*__middle, __val)) {
+      __first = __middle;
+      ++__first;
+      __len = __len - __half - 1;
+    }
+    else
+      __len = __half;
+  }
+  return __first;
+}
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_ALGOBASE_C */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_algobase.h b/main/source/stlport/stlport/stl/_algobase.h
new file mode 100644
index 00000000..5528b732
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_algobase.h
@@ -0,0 +1,583 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+
+#ifndef _STLP_INTERNAL_ALGOBASE_H
+#define _STLP_INTERNAL_ALGOBASE_H
+
+# if ! defined (_STLP_CSTDDEF)
+#  include <cstddef>
+# endif
+
+#ifndef _STLP_CSTRING
+# include <cstring>
+#endif
+
+#ifndef _STLP_CLIMITS
+# include <climits>
+#endif
+
+# if ! defined (_STLP_CSTDLIB)
+#  include <cstdlib>
+# endif
+
+# ifndef _STLP_INTERNAL_PAIR_H
+#  include <stl/_pair.h>
+# endif
+
+#ifndef _STLP_INTERNAL_ITERATOR_BASE_H
+# include <stl/_iterator_base.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+// swap and iter_swap
+template <class _Tp>
+inline void swap(_Tp& __a, _Tp& __b) {
+  _Tp __tmp = __a;
+  __a = __b;
+  __b = __tmp;
+}
+
+template <class _ForwardIter1, class _ForwardIter2>
+inline void iter_swap(_ForwardIter1 __i1, _ForwardIter2 __i2) {
+  swap(*__i1, *__i2);
+}
+
+//--------------------------------------------------
+// min and max
+
+# if !defined (__BORLANDC__) || defined (_STLP_USE_OWN_NAMESPACE)
+template <class _Tp>
+inline const _Tp& (min)(const _Tp& __a, const _Tp& __b) { return __b < __a ? __b : __a; }
+template <class _Tp>
+inline const _Tp& (max)(const _Tp& __a, const _Tp& __b) {  return  __a < __b ? __b : __a; }
+#endif /* __BORLANDC__ */
+
+# if defined (__BORLANDC__) && ( __BORLANDC__ < 0x530 || defined (_STLP_USE_OWN_NAMESPACE))
+inline unsigned long (min) (unsigned long __a, unsigned long __b) { return __b < __a ? __b : __a; }
+inline unsigned long (max) (unsigned long __a, unsigned long __b) {  return  __a < __b ? __b : __a; }
+# endif
+
+template <class _Tp, class _Compare>
+inline const _Tp& (min)(const _Tp& __a, const _Tp& __b, _Compare __comp) { 
+  return __comp(__b, __a) ? __b : __a;
+}
+
+template <class _Tp, class _Compare>
+inline const _Tp& (max)(const _Tp& __a, const _Tp& __b, _Compare __comp) {
+  return __comp(__a, __b) ? __b : __a;
+}
+
+//--------------------------------------------------
+// copy
+
+// All of these auxiliary functions serve two purposes.  (1) Replace
+// calls to copy with memmove whenever possible.  (Memmove, not memcpy,
+// because the input and output ranges are permitted to overlap.)
+// (2) If we're using random access iterators, then write the loop as
+// a for loop with an explicit count.
+
+template <class _InputIter, class _OutputIter, class _Distance>
+inline _OutputIter __copy(_InputIter __first, _InputIter __last,
+                          _OutputIter __result,
+                          const input_iterator_tag &, _Distance*) {
+  for ( ; __first != __last; ++__result, ++__first)
+    *__result = *__first;
+  return __result;
+}
+
+# if defined (_STLP_NONTEMPL_BASE_MATCH_BUG) 
+template <class _InputIter, class _OutputIter, class _Distance>
+inline _OutputIter __copy(_InputIter __first, _InputIter __last,
+			  _OutputIter __result, const forward_iterator_tag &, _Distance* ) {
+  for ( ; __first != __last; ++__result, ++__first)
+    *__result = *__first;
+  return __result;
+}
+
+
+template <class _InputIter, class _OutputIter, class _Distance>
+inline _OutputIter __copy(_InputIter __first, _InputIter __last,
+			  _OutputIter __result, const bidirectional_iterator_tag &, _Distance* __dis) {
+  for ( ; __first != __last; ++__result, ++__first)
+    *__result = *__first;
+  return __result;
+}
+# endif 
+
+template <class _RandomAccessIter, class _OutputIter, class _Distance>
+inline _OutputIter
+__copy(_RandomAccessIter __first, _RandomAccessIter __last,
+       _OutputIter __result, const random_access_iterator_tag &, _Distance*) {
+  for (_Distance __n = __last - __first; __n > 0; --__n) {
+    *__result = *__first;
+    ++__first;
+    ++__result;
+  }
+  return __result;
+}
+
+inline void*
+__copy_trivial(const void* __first, const void* __last, void* __result) {
+  return (__last == __first) ? __result : 
+    ((char*)memmove(__result, __first, ((const char*)__last - (const char*)__first))) + 
+    ((const char*)__last - (const char*)__first);
+}
+
+//--------------------------------------------------
+// copy_backward auxiliary functions
+
+template <class _BidirectionalIter1, class _BidirectionalIter2, 
+          class _Distance>
+inline _BidirectionalIter2 __copy_backward(_BidirectionalIter1 __first, 
+                                           _BidirectionalIter1 __last, 
+                                           _BidirectionalIter2 __result,
+                                           const bidirectional_iterator_tag &,
+                                           _Distance*) 
+{
+  while (__first != __last)
+    *--__result = *--__last;
+  return __result;
+}
+
+template <class _RandomAccessIter, class _BidirectionalIter, class _Distance>
+inline _BidirectionalIter __copy_backward(_RandomAccessIter __first, 
+                                          _RandomAccessIter __last, 
+                                          _BidirectionalIter __result,
+                                          const random_access_iterator_tag &,
+                                          _Distance*)
+{
+  for (_Distance __n = __last - __first; __n > 0; --__n)
+    *--__result = *--__last;
+  return __result;
+}
+
+inline void*
+__copy_trivial_backward(const void* __first, const void* __last, void* __result) {
+  const ptrdiff_t _Num = (const char*)__last - (const char*)__first;
+  return (_Num > 0) ? memmove((char*)__result - _Num, __first, _Num) : __result ;
+}
+
+template <class _InputIter, class _OutputIter>
+inline _OutputIter __copy_ptrs(_InputIter __first, _InputIter __last, _OutputIter __result, const __false_type&) {
+  return __copy(__first, __last, __result, 
+                _STLP_ITERATOR_CATEGORY(__first, _InputIter), 
+                _STLP_DISTANCE_TYPE(__first, _InputIter));
+}
+template <class _InputIter, class _OutputIter>
+inline _OutputIter __copy_ptrs(_InputIter __first, _InputIter __last, _OutputIter __result, const __true_type&) {
+// we know they all pointers, so this cast is OK 
+  //  return (_OutputIter)__copy_trivial(&(*__first), &(*__last), &(*__result));
+  return (_OutputIter)__copy_trivial(__first, __last, __result);
+}
+
+template <class _InputIter, class _OutputIter>
+inline _OutputIter __copy_aux(_InputIter __first, _InputIter __last, _OutputIter __result, const __true_type&) {
+  return __copy_ptrs(__first, __last, __result, 
+                     _IsOKToMemCpy(_STLP_VALUE_TYPE(__first, _InputIter), 
+                                   _STLP_VALUE_TYPE(__result, _OutputIter))._Ret());
+}
+
+template <class _InputIter, class _OutputIter>
+inline _OutputIter __copy_aux(_InputIter __first, _InputIter __last, _OutputIter __result, const __false_type&) {
+  return __copy(__first, __last, __result, 
+		_STLP_ITERATOR_CATEGORY(__first, _InputIter), _STLP_DISTANCE_TYPE(__first, _InputIter));
+}
+
+template <class _InputIter, class _OutputIter>
+inline _OutputIter copy(_InputIter __first, _InputIter __last, _OutputIter __result) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+    return __copy_aux(__first, __last, __result, _BothPtrType< _InputIter, _OutputIter> :: _Ret());
+}
+
+template <class _InputIter, class _OutputIter>
+inline _OutputIter __copy_backward_ptrs(_InputIter __first, _InputIter __last, _OutputIter __result, const __false_type&) {
+  return __copy_backward(__first, __last, __result, _STLP_ITERATOR_CATEGORY(__first, _InputIter), _STLP_DISTANCE_TYPE(__first, _InputIter));
+}
+template <class _InputIter, class _OutputIter>
+inline _OutputIter __copy_backward_ptrs(_InputIter __first, _InputIter __last, _OutputIter __result, const __true_type&) {
+  return (_OutputIter)__copy_trivial_backward(__first, __last, __result);  
+}
+
+template <class _InputIter, class _OutputIter>
+inline _OutputIter __copy_backward_aux(_InputIter __first, _InputIter __last, _OutputIter __result, const __false_type&) {
+  return __copy_backward(__first, __last, __result, _STLP_ITERATOR_CATEGORY(__first,_InputIter), _STLP_DISTANCE_TYPE(__first, _InputIter));
+}
+
+template <class _InputIter, class _OutputIter>
+inline _OutputIter __copy_backward_aux(_InputIter __first, _InputIter __last, _OutputIter __result, const __true_type&) {
+  return __copy_backward_ptrs(__first, __last, __result,  
+                              _IsOKToMemCpy(_STLP_VALUE_TYPE(__first, _InputIter), 
+                                            _STLP_VALUE_TYPE(__result, _OutputIter))._Ret());
+}
+
+template <class _InputIter, class _OutputIter>
+inline _OutputIter copy_backward(_InputIter __first, _InputIter __last, _OutputIter __result) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+    return __copy_backward_aux(__first, __last, __result, _BothPtrType< _InputIter, _OutputIter> :: _Ret() );
+}
+
+#if ! defined (_STLP_CLASS_PARTIAL_SPECIALIZATION) && ! defined ( _STLP_SIMULATE_PARTIAL_SPEC_FOR_TYPE_TRAITS )
+#define _STLP_DECLARE_COPY_TRIVIAL(_Tp)                                \
+inline _Tp* copy(const _Tp* __first, const _Tp* __last, _Tp* __result) \
+{ return (_Tp*)__copy_trivial(__first, __last, __result); } \
+inline _Tp* copy_backward(const _Tp* __first, const _Tp* __last, _Tp* __result) \
+{ return (_Tp*)__copy_trivial_backward(__first, __last, __result); }
+
+_STLP_DECLARE_COPY_TRIVIAL(char)
+# ifndef _STLP_NO_SIGNED_BUILTINS
+_STLP_DECLARE_COPY_TRIVIAL(signed char)
+# endif
+_STLP_DECLARE_COPY_TRIVIAL(unsigned char)
+_STLP_DECLARE_COPY_TRIVIAL(short)
+_STLP_DECLARE_COPY_TRIVIAL(unsigned short)
+_STLP_DECLARE_COPY_TRIVIAL(int)
+_STLP_DECLARE_COPY_TRIVIAL(unsigned int)
+_STLP_DECLARE_COPY_TRIVIAL(long)
+_STLP_DECLARE_COPY_TRIVIAL(unsigned long)
+#if !defined(_STLP_NO_WCHAR_T) && !defined (_STLP_WCHAR_T_IS_USHORT) 
+_STLP_DECLARE_COPY_TRIVIAL(wchar_t)
+#endif
+#ifdef _STLP_LONG_LONG
+_STLP_DECLARE_COPY_TRIVIAL(long long)
+_STLP_DECLARE_COPY_TRIVIAL(unsigned long long)
+#endif 
+_STLP_DECLARE_COPY_TRIVIAL(float)
+_STLP_DECLARE_COPY_TRIVIAL(double)
+# ifndef _STLP_NO_LONG_DOUBLE
+_STLP_DECLARE_COPY_TRIVIAL(long double)
+# endif
+#undef _STLP_DECLARE_COPY_TRIVIAL
+#endif /* _STLP_CLASS_PARTIAL_SPECIALIZATION */
+
+//--------------------------------------------------
+// copy_n (not part of the C++ standard)
+
+template <class _InputIter, class _Size, class _OutputIter>
+_STLP_INLINE_LOOP 
+pair<_InputIter, _OutputIter> __copy_n(_InputIter __first, _Size __count,
+                                       _OutputIter __result,
+                                       const input_iterator_tag &) {
+  for ( ; __count > 0; --__count) {
+    *__result = *__first;
+    ++__first;
+    ++__result;
+  }
+  return pair<_InputIter, _OutputIter>(__first, __result);
+}
+
+template <class _RAIter, class _Size, class _OutputIter>
+inline pair<_RAIter, _OutputIter>
+__copy_n(_RAIter __first, _Size __count,
+         _OutputIter __result,
+         const random_access_iterator_tag &) {
+  _RAIter __last = __first + __count;
+  return pair<_RAIter, _OutputIter>(__last, copy(__first, __last, __result));
+}
+
+template <class _InputIter, class _Size, class _OutputIter>
+inline pair<_InputIter, _OutputIter>
+__copy_n(_InputIter __first, _Size __count, _OutputIter __result) {
+  _STLP_FIX_LITERAL_BUG(__first)
+  return __copy_n(__first, __count, __result, _STLP_ITERATOR_CATEGORY(__first, _InputIter));
+}
+
+template <class _InputIter, class _Size, class _OutputIter>
+inline pair<_InputIter, _OutputIter>
+copy_n(_InputIter __first, _Size __count, _OutputIter __result) {
+  _STLP_FIX_LITERAL_BUG(__first)
+  return __copy_n(__first, __count, __result, _STLP_ITERATOR_CATEGORY(__first, _InputIter));
+}
+
+//--------------------------------------------------
+// fill and fill_n
+
+
+template <class _ForwardIter, class _Tp>
+_STLP_INLINE_LOOP
+void fill(_ForwardIter __first, _ForwardIter __last, const _Tp& __val) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  for ( ; __first != __last; ++__first)
+    *__first = __val;
+}
+
+template <class _OutputIter, class _Size, class _Tp>
+_STLP_INLINE_LOOP
+_OutputIter fill_n(_OutputIter __first, _Size __n, const _Tp& __val) {
+  _STLP_FIX_LITERAL_BUG(__first)
+  for ( ; __n > 0; --__n, ++__first)
+    *__first = __val;
+  return __first;
+}
+
+
+// Specialization: for one-byte types we can use memset.
+
+inline void fill(unsigned char* __first, unsigned char* __last,
+                 const unsigned char& __val) {
+  unsigned char __tmp = __val;
+  memset(__first, __tmp, __last - __first);
+}
+# ifndef _STLP_NO_SIGNED_BUILTINS
+inline void fill(signed char* __first, signed char* __last,
+                 const signed char& __val) {
+  signed char __tmp = __val;
+  memset(__first, __STATIC_CAST(unsigned char,__tmp), __last - __first);
+}
+# endif
+inline void fill(char* __first, char* __last, const char& __val) {
+  char __tmp = __val;
+  memset(__first, __STATIC_CAST(unsigned char,__tmp), __last - __first);
+}
+
+#ifdef _STLP_FUNCTION_TMPL_PARTIAL_ORDER
+
+template <class _Size>
+inline unsigned char* fill_n(unsigned char* __first, _Size __n,
+                             const unsigned char& __val) {
+  fill(__first, __first + __n, __val);
+  return __first + __n;
+}
+
+template <class _Size>
+inline signed char* fill_n(char* __first, _Size __n,
+                           const signed char& __val) {
+  fill(__first, __first + __n, __val);
+  return __first + __n;
+}
+
+template <class _Size>
+inline char* fill_n(char* __first, _Size __n, const char& __val) {
+  fill(__first, __first + __n, __val);
+  return __first + __n;
+}
+
+#endif /* _STLP_FUNCTION_TMPL_PARTIAL_ORDER */
+
+
+//--------------------------------------------------
+// equal and mismatch
+
+template <class _InputIter1, class _InputIter2>
+_STLP_INLINE_LOOP
+pair<_InputIter1, _InputIter2> mismatch(_InputIter1 __first1,
+                                        _InputIter1 __last1,
+                                        _InputIter2 __first2) {
+  _STLP_FIX_LITERAL_BUG(__first2)
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+  while (__first1 != __last1 && *__first1 == *__first2) {
+    ++__first1;
+    ++__first2;
+  }
+  return pair<_InputIter1, _InputIter2>(__first1, __first2);
+}
+
+template <class _InputIter1, class _InputIter2, class _BinaryPredicate>
+_STLP_INLINE_LOOP
+pair<_InputIter1, _InputIter2> mismatch(_InputIter1 __first1,
+                                        _InputIter1 __last1,
+                                        _InputIter2 __first2,
+                                        _BinaryPredicate __binary_pred) {
+  _STLP_FIX_LITERAL_BUG(__first2)
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+  while (__first1 != __last1 && __binary_pred(*__first1, *__first2)) {
+    ++__first1;
+    ++__first2;
+  }
+  return pair<_InputIter1, _InputIter2>(__first1, __first2);
+}
+
+template <class _InputIter1, class _InputIter2>
+_STLP_INLINE_LOOP
+bool equal(_InputIter1 __first1, _InputIter1 __last1,
+                  _InputIter2 __first2) {
+  _STLP_FIX_LITERAL_BUG(__first1) _STLP_FIX_LITERAL_BUG(__last1)  _STLP_FIX_LITERAL_BUG(__first2)
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+  for ( ; __first1 != __last1; ++__first1, ++__first2)
+    if (!(*__first1 == *__first2))
+      return false;
+  return true;
+}
+
+template <class _InputIter1, class _InputIter2, class _BinaryPredicate>
+_STLP_INLINE_LOOP
+bool equal(_InputIter1 __first1, _InputIter1 __last1,
+                  _InputIter2 __first2, _BinaryPredicate __binary_pred) {
+  _STLP_FIX_LITERAL_BUG(__first2)
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+  for ( ; __first1 != __last1; ++__first1, ++__first2)
+    if (!__binary_pred(*__first1, *__first2))
+      return false;
+  return true;
+}
+
+//--------------------------------------------------
+// lexicographical_compare and lexicographical_compare_3way.
+// (the latter is not part of the C++ standard.)
+
+template <class _InputIter1, class _InputIter2>
+bool lexicographical_compare(_InputIter1 __first1, _InputIter1 __last1,
+                             _InputIter2 __first2, _InputIter2 __last2);
+
+template <class _InputIter1, class _InputIter2, class _Compare>
+bool lexicographical_compare(_InputIter1 __first1, _InputIter1 __last1,
+                             _InputIter2 __first2, _InputIter2 __last2,
+                             _Compare __comp);
+
+inline bool 
+lexicographical_compare(const unsigned char* __first1,
+                        const unsigned char* __last1,
+                        const unsigned char* __first2,
+                        const unsigned char* __last2)
+{
+  const size_t __len1 = __last1 - __first1;
+  const size_t __len2 = __last2 - __first2;
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+  _STLP_DEBUG_CHECK(__check_range(__first2, __last2))
+
+  const int __result = memcmp(__first1, __first2, (min) (__len1, __len2));
+  return __result != 0 ? (__result < 0) : (__len1 < __len2);
+}
+
+
+# if !(CHAR_MAX == SCHAR_MAX)
+inline bool lexicographical_compare(const char* __first1, const char* __last1,
+                                    const char* __first2, const char* __last2)
+{
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1)) 
+  _STLP_DEBUG_CHECK(__check_range(__first2, __last2))
+
+  return lexicographical_compare((const unsigned char*) __first1,
+                                 (const unsigned char*) __last1,
+                                 (const unsigned char*) __first2,
+                                 (const unsigned char*) __last2);
+}
+#endif /* CHAR_MAX == SCHAR_MAX */
+
+template <class _InputIter1, class _InputIter2>
+int __lexicographical_compare_3way(_InputIter1 __first1, _InputIter1 __last1,
+                                   _InputIter2 __first2, _InputIter2 __last2);
+
+inline int
+__lexicographical_compare_3way(const unsigned char* __first1,
+                               const unsigned char* __last1,
+                               const unsigned char* __first2,
+                               const unsigned char* __last2)
+{
+  const ptrdiff_t __len1 = __last1 - __first1;
+  const ptrdiff_t __len2 = __last2 - __first2;
+  const int __result = memcmp(__first1, __first2, (min) (__len1, __len2));
+  return __result != 0 ? __result 
+                       : (__len1 == __len2 ? 0 : (__len1 < __len2 ? -1 : 1));
+}
+
+
+# if !(CHAR_MAX == SCHAR_MAX)
+inline int 
+__lexicographical_compare_3way(const char* __first1, const char* __last1,
+                               const char* __first2, const char* __last2)
+{
+  return __lexicographical_compare_3way((const unsigned char*) __first1,
+                                        (const unsigned char*) __last1,
+                                        (const unsigned char*) __first2,
+                                        (const unsigned char*) __last2);
+}
+# endif
+
+# ifndef _STLP_NO_EXTENSIONS
+
+template <class _InputIter1, class _InputIter2>
+int lexicographical_compare_3way(_InputIter1 __first1, _InputIter1 __last1,
+                                 _InputIter2 __first2, _InputIter2 __last2);
+
+# endif /* EXTENSIONS */
+
+// count
+template <class _InputIter, class _Tp>
+_STLP_INLINE_LOOP _STLP_DIFFERENCE_TYPE(_InputIter)
+count(_InputIter __first, _InputIter __last, const _Tp& __val) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  _STLP_DIFFERENCE_TYPE(_InputIter) __n = 0;
+  for ( ; __first != __last; ++__first)
+    if (*__first == __val)
+      ++__n;
+  return __n;
+}
+
+// find and find_if. Note find may be expressed in terms of find_if if appropriate binder was available.
+template <class _InputIter, class _Tp>
+_InputIter find(_InputIter __first, _InputIter __last, const _Tp& __val);
+template <class _InputIter, class _Predicate>
+_InputIter find_if(_InputIter __first, _InputIter __last, _Predicate __pred);
+
+// search.
+template <class _ForwardIter1, class _ForwardIter2, class _BinaryPred>
+_ForwardIter1 search(_ForwardIter1 __first1, _ForwardIter1 __last1,
+                     _ForwardIter2 __first2, _ForwardIter2 __last2, _BinaryPred  __predicate);
+
+// find_first_of
+template <class _InputIter, class _ForwardIter, class _BinaryPredicate>
+_InputIter __find_first_of(_InputIter __first1, _InputIter __last1,
+                           _ForwardIter __first2, _ForwardIter __last2,
+                           _BinaryPredicate __comp);
+
+template <class _ForwardIter1, class _ForwardIter2, 
+          class _BinaryPredicate>
+_ForwardIter1 
+find_end(_ForwardIter1 __first1, _ForwardIter1 __last1, 
+         _ForwardIter2 __first2, _ForwardIter2 __last2,
+         _BinaryPredicate __comp);
+
+// replace
+template <class _ForwardIter, class _Tp>
+_STLP_INLINE_LOOP void 
+replace(_ForwardIter __first, _ForwardIter __last,
+        const _Tp& __old_value, const _Tp& __new_value) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  for ( ; __first != __last; ++__first)
+    if (*__first == __old_value)
+      *__first = __new_value;
+}
+
+template <class _ForwardIter, class _Tp, class _Compare, class _Distance>
+_ForwardIter __lower_bound(_ForwardIter __first, _ForwardIter __last,
+                              const _Tp& __val, _Compare __comp, _Distance*);
+
+_STLP_END_NAMESPACE
+
+# if !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_algobase.c>
+# endif
+
+#endif /* _STLP_INTERNAL_ALGOBASE_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_alloc.c b/main/source/stlport/stlport/stl/_alloc.c
new file mode 100644
index 00000000..20f41c09
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_alloc.c
@@ -0,0 +1,370 @@
+/*
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+#ifndef _STLP_ALLOC_C
+#define _STLP_ALLOC_C
+
+#ifdef __WATCOMC__
+#pragma warning 13 9
+#pragma warning 367 9
+#pragma warning 368 9
+#endif
+
+#ifndef _STLP_INTERNAL_ALLOC_H
+#  include <stl/_alloc.h>
+#endif
+
+# if defined (_STLP_EXPOSE_GLOBALS_IMPLEMENTATION)
+
+# ifdef _STLP_SGI_THREADS
+  // We test whether threads are in use before locking.
+  // Perhaps this should be moved into stl_threads.h, but that
+  // probably makes it harder to avoid the procedure call when
+  // it isn't needed.
+    extern "C" {
+      extern int __us_rsthread_malloc;
+    }
+# endif
+
+
+// Specialised debug form of malloc which does not provide "false"
+// memory leaks when run with debug CRT libraries.
+#if defined(_STLP_MSVC) && (_STLP_MSVC>=1020 && defined(_STLP_DEBUG_ALLOC)) && ! defined (_STLP_WINCE)
+#  include <crtdbg.h>
+inline void* __stlp_chunk_malloc(size_t __bytes) { _STLP_CHECK_NULL_ALLOC(_malloc_dbg(__bytes, _CRT_BLOCK, __FILE__, __LINE__)); }
+#else	// !_DEBUG
+# ifdef _STLP_NODE_ALLOC_USE_MALLOC
+#  include <cstdlib>
+inline void* __stlp_chunk_malloc(size_t __bytes) { _STLP_CHECK_NULL_ALLOC(_STLP_VENDOR_CSTD::malloc(__bytes)); }
+# else
+inline void* __stlp_chunk_malloc(size_t __bytes) { return _STLP_STD::__stl_new(__bytes); }
+# endif
+#endif	// !_DEBUG
+
+
+#define _S_FREELIST_INDEX(__bytes) ((__bytes-size_t(1))>>(int)_ALIGN_SHIFT)
+
+_STLP_BEGIN_NAMESPACE
+
+template <int __inst>
+void *  _STLP_CALL __malloc_alloc<__inst>::_S_oom_malloc(size_t __n)
+{
+  __oom_handler_type __my_malloc_handler;
+  void * __result;
+
+  for (;;) {
+    __my_malloc_handler = __oom_handler;
+    if (0 == __my_malloc_handler) { __THROW_BAD_ALLOC; }
+    (*__my_malloc_handler)();
+    __result = malloc(__n);
+    if (__result) return(__result);
+  }
+#if defined(_STLP_NEED_UNREACHABLE_RETURN)
+  return 0;
+#endif
+
+}
+
+template <class _Alloc>
+void *  _STLP_CALL __debug_alloc<_Alloc>::allocate(size_t __n) {
+  size_t __real_n = __n + __extra_before_chunk() + __extra_after_chunk();
+  __alloc_header *__result = (__alloc_header *)__allocator_type::allocate(__real_n);
+  memset((char*)__result, __shred_byte, __real_n*sizeof(value_type));
+  __result->__magic = __magic;
+  __result->__type_size = sizeof(value_type);
+  __result->_M_size = (_STLP_UINT32_T)__n;
+  return ((char*)__result) + (long)__extra_before;
+}
+
+template <class _Alloc>
+void  _STLP_CALL
+__debug_alloc<_Alloc>::deallocate(void *__p, size_t __n) {
+  __alloc_header * __real_p = (__alloc_header*)((char *)__p -(long)__extra_before);
+  // check integrity
+  _STLP_VERBOSE_ASSERT(__real_p->__magic != __deleted_magic, _StlMsg_DBA_DELETED_TWICE)
+  _STLP_VERBOSE_ASSERT(__real_p->__magic == __magic, _StlMsg_DBA_NEVER_ALLOCATED)
+  _STLP_VERBOSE_ASSERT(__real_p->__type_size == 1,_StlMsg_DBA_TYPE_MISMATCH)
+  _STLP_VERBOSE_ASSERT(__real_p->_M_size == __n, _StlMsg_DBA_SIZE_MISMATCH)
+  // check pads on both sides
+  unsigned char* __tmp;
+  for (__tmp= (unsigned char*)(__real_p+1); __tmp < (unsigned char*)__p; __tmp++) {  
+    _STLP_VERBOSE_ASSERT(*__tmp==__shred_byte, _StlMsg_DBA_UNDERRUN)
+      }
+  
+  size_t __real_n= __n + __extra_before_chunk() + __extra_after_chunk();
+  
+  for (__tmp= ((unsigned char*)__p)+__n*sizeof(value_type); 
+       __tmp < ((unsigned char*)__real_p)+__real_n ; __tmp++) {
+    _STLP_VERBOSE_ASSERT(*__tmp==__shred_byte, _StlMsg_DBA_OVERRUN)
+      }
+  
+  // that may be unfortunate, just in case
+  __real_p->__magic=__deleted_magic;
+  memset((char*)__p, __shred_byte, __n*sizeof(value_type));
+  __allocator_type::deallocate(__real_p, __real_n);
+}
+
+// # ifdef _STLP_THREADS
+
+template <bool __threads, int __inst>
+class _Node_Alloc_Lock {
+public:
+  _Node_Alloc_Lock() { 
+    
+#  ifdef _STLP_SGI_THREADS
+    if (__threads && __us_rsthread_malloc)
+#  else /* !_STLP_SGI_THREADS */
+      if (__threads) 
+#  endif
+    	_S_lock._M_acquire_lock(); 
+  }
+  
+  ~_Node_Alloc_Lock() {
+#  ifdef _STLP_SGI_THREADS
+    if (__threads && __us_rsthread_malloc)
+#  else /* !_STLP_SGI_THREADS */
+      if (__threads)
+#  endif
+        _S_lock._M_release_lock(); 
+  }
+  
+  static _STLP_STATIC_MUTEX _S_lock;
+};
+
+// # endif  /* _STLP_THREADS */
+
+
+template <bool __threads, int __inst>
+void* _STLP_CALL
+__node_alloc<__threads, __inst>::_M_allocate(size_t __n) {
+  void*  __r;
+  _Obj * _STLP_VOLATILE * __my_free_list = _S_free_list + _S_FREELIST_INDEX(__n);
+  // #       ifdef _STLP_THREADS
+  /*REFERENCED*/
+  _Node_Alloc_Lock<__threads, __inst> __lock_instance;
+  // #       endif
+  // Acquire the lock here with a constructor call.
+  // This ensures that it is released in exit or during stack
+  // unwinding.
+  if ( (__r  = *__my_free_list) != 0 ) {
+    *__my_free_list = ((_Obj*)__r) -> _M_free_list_link;
+  } else {
+    __r = _S_refill(__n);
+  }
+  // lock is released here
+  return __r;
+}
+
+template <bool __threads, int __inst>
+void _STLP_CALL
+__node_alloc<__threads, __inst>::_M_deallocate(void *__p, size_t __n) {
+  _Obj * _STLP_VOLATILE * __my_free_list = _S_free_list + _S_FREELIST_INDEX(__n);
+  // #       ifdef _STLP_THREADS
+  /*REFERENCED*/
+  _Node_Alloc_Lock<__threads, __inst> __lock_instance;
+  // #       endif /* _STLP_THREADS */
+  // acquire lock
+  ((_Obj *)__p) -> _M_free_list_link = *__my_free_list;
+  *__my_free_list = (_Obj *)__p;
+  // lock is released here
+}
+
+/* We allocate memory in large chunks in order to avoid fragmenting     */
+/* the malloc heap too much.                                            */
+/* We assume that size is properly aligned.                             */
+/* We hold the allocation lock.                                         */
+template <bool __threads, int __inst>
+char* _STLP_CALL
+__node_alloc<__threads, __inst>::_S_chunk_alloc(size_t _p_size, 
+						int& __nobjs)
+{
+  char* __result;
+  size_t __total_bytes = _p_size * __nobjs;
+  size_t __bytes_left = _S_end_free - _S_start_free;
+
+  if (__bytes_left >= __total_bytes) {
+    __result = _S_start_free;
+    _S_start_free += __total_bytes;
+    return(__result);
+  } else if (__bytes_left >= _p_size) {
+    __nobjs = (int)(__bytes_left/_p_size);
+    __total_bytes = _p_size * __nobjs;
+    __result = _S_start_free;
+    _S_start_free += __total_bytes;
+    return(__result);
+  } else {
+    size_t __bytes_to_get = 
+      2 * __total_bytes + _S_round_up(_S_heap_size >> 4);
+    // Try to make use of the left-over piece.
+    if (__bytes_left > 0) {
+      _Obj* _STLP_VOLATILE* __my_free_list =
+	_S_free_list + _S_FREELIST_INDEX(__bytes_left);
+
+      ((_Obj*)_S_start_free) -> _M_free_list_link = *__my_free_list;
+      *__my_free_list = (_Obj*)_S_start_free;
+    }
+    _S_start_free = (char*)__stlp_chunk_malloc(__bytes_to_get);
+    if (0 == _S_start_free) {
+      size_t __i;
+      _Obj* _STLP_VOLATILE* __my_free_list;
+      _Obj* __p;
+      // Try to make do with what we have.  That can't
+      // hurt.  We do not try smaller requests, since that tends
+      // to result in disaster on multi-process machines.
+      for (__i = _p_size; __i <= (size_t)_MAX_BYTES; __i += (size_t)_ALIGN) {
+	__my_free_list = _S_free_list + _S_FREELIST_INDEX(__i);
+	__p = *__my_free_list;
+	if (0 != __p) {
+	  *__my_free_list = __p -> _M_free_list_link;
+	  _S_start_free = (char*)__p;
+	  _S_end_free = _S_start_free + __i;
+	  return(_S_chunk_alloc(_p_size, __nobjs));
+	  // Any leftover piece will eventually make it to the
+	  // right free list.
+	}
+      }
+      _S_end_free = 0;	// In case of exception.
+      _S_start_free = (char*)__stlp_chunk_malloc(__bytes_to_get);
+    /*
+      (char*)malloc_alloc::allocate(__bytes_to_get);
+      */
+
+      // This should either throw an
+      // exception or remedy the situation.  Thus we assume it
+      // succeeded.
+    }
+    _S_heap_size += __bytes_to_get;
+    _S_end_free = _S_start_free + __bytes_to_get;
+    return(_S_chunk_alloc(_p_size, __nobjs));
+  }
+}
+
+
+/* Returns an object of size __n, and optionally adds to size __n free list.*/
+/* We assume that __n is properly aligned.                                */
+/* We hold the allocation lock.                                         */
+template <bool __threads, int __inst>
+void* _STLP_CALL
+__node_alloc<__threads, __inst>::_S_refill(size_t __n)
+{
+  int __nobjs = 20;
+  __n = _S_round_up(__n);
+  char* __chunk = _S_chunk_alloc(__n, __nobjs);
+  _Obj* _STLP_VOLATILE* __my_free_list;
+  _Obj* __result;
+  _Obj* __current_obj;
+  _Obj* __next_obj;
+  int __i;
+
+  if (1 == __nobjs) return(__chunk);
+  __my_free_list = _S_free_list + _S_FREELIST_INDEX(__n);
+
+  /* Build free list in chunk */
+  __result = (_Obj*)__chunk;
+  *__my_free_list = __next_obj = (_Obj*)(__chunk + __n);
+  for (__i = 1; ; __i++) {
+    __current_obj = __next_obj;
+    __next_obj = (_Obj*)((char*)__next_obj + __n);
+    if (__nobjs - 1 == __i) {
+      __current_obj -> _M_free_list_link = 0;
+      break;
+    } else {
+      __current_obj -> _M_free_list_link = __next_obj;
+    }
+  }
+  return(__result);
+}
+
+# if ( _STLP_STATIC_TEMPLATE_DATA > 0 )
+// malloc_alloc out-of-memory handling
+template <int __inst>
+__oom_handler_type __malloc_alloc<__inst>::__oom_handler=(__oom_handler_type)0 ;
+
+// #ifdef _STLP_THREADS
+    template <bool __threads, int __inst>
+    _STLP_STATIC_MUTEX
+    _Node_Alloc_Lock<__threads, __inst>::_S_lock _STLP_MUTEX_INITIALIZER;
+// #endif
+
+template <bool __threads, int __inst>
+_Node_alloc_obj * _STLP_VOLATILE
+__node_alloc<__threads, __inst>::_S_free_list[_STLP_NFREELISTS]
+= {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+// The 16 zeros are necessary to make version 4.1 of the SunPro
+// compiler happy.  Otherwise it appears to allocate too little
+// space for the array.
+
+template <bool __threads, int __inst>
+char *__node_alloc<__threads, __inst>::_S_start_free = 0;
+
+template <bool __threads, int __inst>
+char *__node_alloc<__threads, __inst>::_S_end_free = 0;
+
+template <bool __threads, int __inst>
+size_t __node_alloc<__threads, __inst>::_S_heap_size = 0;
+
+
+# else /* ( _STLP_STATIC_TEMPLATE_DATA > 0 ) */
+
+__DECLARE_INSTANCE(__oom_handler_type, __malloc_alloc<0>::__oom_handler, =0);
+
+# define _STLP_ALLOC_NOTHREADS __node_alloc<false, 0>
+# define _STLP_ALLOC_THREADS   __node_alloc<true, 0>
+# define _STLP_ALLOC_NOTHREADS_LOCK _Node_Alloc_Lock<false, 0>
+# define _STLP_ALLOC_THREADS_LOCK   _Node_Alloc_Lock<true, 0>
+
+__DECLARE_INSTANCE(char *, _STLP_ALLOC_NOTHREADS::_S_start_free,=0);
+__DECLARE_INSTANCE(char *, _STLP_ALLOC_NOTHREADS::_S_end_free,=0);
+__DECLARE_INSTANCE(size_t, _STLP_ALLOC_NOTHREADS::_S_heap_size,=0);
+__DECLARE_INSTANCE(_Node_alloc_obj * _STLP_VOLATILE,
+                   _STLP_ALLOC_NOTHREADS::_S_free_list[_STLP_NFREELISTS],
+                   ={0});
+__DECLARE_INSTANCE(char *, _STLP_ALLOC_THREADS::_S_start_free,=0);
+__DECLARE_INSTANCE(char *, _STLP_ALLOC_THREADS::_S_end_free,=0);
+__DECLARE_INSTANCE(size_t, _STLP_ALLOC_THREADS::_S_heap_size,=0);
+__DECLARE_INSTANCE(_Node_alloc_obj * _STLP_VOLATILE,
+                   _STLP_ALLOC_THREADS::_S_free_list[_STLP_NFREELISTS],
+                   ={0});
+// #   ifdef _STLP_THREADS
+__DECLARE_INSTANCE(_STLP_STATIC_MUTEX,
+                   _STLP_ALLOC_NOTHREADS_LOCK::_S_lock,
+                   _STLP_MUTEX_INITIALIZER);
+__DECLARE_INSTANCE(_STLP_STATIC_MUTEX,
+                   _STLP_ALLOC_THREADS_LOCK::_S_lock,
+                   _STLP_MUTEX_INITIALIZER);
+// #   endif
+
+# undef _STLP_ALLOC_THREADS
+# undef _STLP_ALLOC_NOTHREADS
+
+#  endif /* _STLP_STATIC_TEMPLATE_DATA */
+
+_STLP_END_NAMESPACE
+
+# undef _S_FREELIST_INDEX
+
+# endif /* _STLP_EXPOSE_GLOBALS_IMPLEMENTATION */
+
+#endif /*  _STLP_ALLOC_C */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_alloc.h b/main/source/stlport/stlport/stl/_alloc.h
new file mode 100644
index 00000000..c5914b82
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_alloc.h
@@ -0,0 +1,531 @@
+/*
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_ALLOC_H
+#define _STLP_INTERNAL_ALLOC_H
+
+# ifndef _STLP_CSTDDEF
+#  include <cstddef>
+# endif
+
+#if !defined (_STLP_DEBUG_H) && (defined  (_STLP_DEBUG) || defined (_STLP_ASSERTIONS))
+# include <stl/debug/_debug.h>
+#endif
+
+# ifndef _STLP_CSTDLIB
+#  include <cstdlib>
+# endif
+# ifndef _STLP_CSTRING
+#  include <cstring>
+# endif
+
+# ifndef __THROW_BAD_ALLOC
+#  if !defined(_STLP_USE_EXCEPTIONS)
+#   if !defined (_STLP_CSTDIO)
+#    include <cstdio>
+#   endif
+#   if !defined (_STLP_CSTDLIB)
+#    include <cstdlib>
+#   endif
+#   define __THROW_BAD_ALLOC puts("out of memory\n"); exit(1)
+#  else /* !defined(_STLP_USE_EXCEPTIONS) */
+#   define __THROW_BAD_ALLOC throw _STLP_STD::bad_alloc()
+#  endif /* !defined(_STLP_USE_EXCEPTIONS) */
+# endif   /* __THROW_BAD_ALLOC */
+
+# ifndef _STLP_INTERNAL_NEW_HEADER
+#  include <stl/_new.h>
+# endif
+
+#if /* defined (_STLP_THREADS) && */ ! defined (_STLP_INTERNAL_THREADS_H)
+# include <stl/_threads.h>
+#endif
+
+#ifndef _STLP_INTERNAL_CONSTRUCT_H
+# include <stl/_construct.h>
+#endif
+
+#ifndef __ALLOC
+#   define __ALLOC __sgi_alloc
+#endif
+
+# ifndef __RESTRICT
+#  define __RESTRICT
+# endif
+
+#if defined (_STLP_THREADS) || (defined(_STLP_OWN_IOSTREAMS) && ! defined (_STLP_NO_THREADS) && ! defined (_NOTHREADS) )
+# define _STLP_NODE_ALLOCATOR_THREADS true
+#else
+# define _STLP_NODE_ALLOCATOR_THREADS false
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+# if defined (_STLP_USE_RAW_SGI_ALLOCATORS)
+template <class _Tp, class _Alloc> struct __allocator;
+# endif
+
+// Malloc-based allocator.  Typically slower than default alloc below.
+// Typically thread-safe and more storage efficient.
+
+typedef void (* __oom_handler_type)();
+
+template <int __inst>
+class __malloc_alloc {
+private:
+  static void* _STLP_CALL _S_oom_malloc(size_t);
+  static __oom_handler_type __oom_handler;
+public:
+  // this one is needed for proper simple_alloc wrapping
+  typedef char value_type;
+# if defined (_STLP_MEMBER_TEMPLATE_CLASSES) && defined (_STLP_USE_RAW_SGI_ALLOCATORS)
+  template <class _Tp1> struct rebind {
+    typedef __allocator<_Tp1, __malloc_alloc<__inst> > other;
+  };
+# endif
+  static void* _STLP_CALL allocate(size_t __n)    {
+    void* __result = malloc(__n);
+    if (0 == __result) __result = _S_oom_malloc(__n);
+    return __result;
+  }
+  static void _STLP_CALL deallocate(void* __p, size_t /* __n */) { free((char*)__p); }
+  static __oom_handler_type _STLP_CALL set_malloc_handler(__oom_handler_type __f) {
+    __oom_handler_type __old = __oom_handler;
+    __oom_handler = __f;
+    return(__old);
+  }
+};
+
+
+// New-based allocator.  Typically slower than default alloc below.
+// Typically thread-safe and more storage efficient.
+class _STLP_CLASS_DECLSPEC __new_alloc {
+public:
+  // this one is needed for proper simple_alloc wrapping
+  typedef char value_type;
+# if defined (_STLP_MEMBER_TEMPLATE_CLASSES) &&  defined(_STLP_USE_RAW_SGI_ALLOCATORS)
+  template <class _Tp1> struct rebind {
+    typedef __allocator<_Tp1, __new_alloc > other;
+  };
+# endif
+  static void* _STLP_CALL  allocate(size_t __n) {  return __stl_new(__n); }
+  static void _STLP_CALL deallocate(void* __p, size_t) { __stl_delete(__p); }
+};
+
+
+// Allocator adaptor to check size arguments for debugging.
+// Reports errors using assert.  Checking can be disabled with
+// NDEBUG, but it's far better to just use the underlying allocator
+// instead when no checking is desired.
+// There is some evidence that this can confuse Purify.
+// This adaptor can only be applied to raw allocators
+
+template <class _Alloc>
+class __debug_alloc : public _Alloc {
+public:
+  typedef _Alloc __allocator_type;
+  typedef typename _Alloc::value_type value_type;
+private:
+  struct __alloc_header {
+    size_t __magic: 16;
+    size_t __type_size:16;
+    _STLP_UINT32_T _M_size;
+  }; // that is 8 bytes for sure
+  // Sunpro CC has bug on enums, so extra_before/after set explicitly
+  enum { __pad=8, __magic=0xdeba, __deleted_magic = 0xdebd,
+	 __shred_byte= _STLP_SHRED_BYTE
+  };
+
+  enum { __extra_before = 16, __extra_after = 8 };
+  // Size of space used to store size.  Note
+  // that this must be large enough to preserve
+  // alignment.
+  static size_t _STLP_CALL __extra_before_chunk() {
+    return (long)__extra_before/sizeof(value_type)+
+      (size_t)((long)__extra_before%sizeof(value_type)>0);
+  }
+  static size_t _STLP_CALL __extra_after_chunk() {
+    return (long)__extra_after/sizeof(value_type)+
+      (size_t)((long)__extra_after%sizeof(value_type)>0);
+  }
+public:
+# if defined (_STLP_MEMBER_TEMPLATE_CLASSES) && defined (_STLP_USE_RAW_SGI_ALLOCATORS)
+  template <class _Tp1> struct rebind {
+    typedef __allocator< _Tp1, __debug_alloc<_Alloc> > other;
+  };
+# endif
+  __debug_alloc() {}
+  ~__debug_alloc() {}
+  static void * _STLP_CALL allocate(size_t);
+  static void _STLP_CALL deallocate(void *, size_t);
+};
+
+
+// Default node allocator.
+// With a reasonable compiler, this should be roughly as fast as the
+// original STL class-specific allocators, but with less fragmentation.
+// Default_alloc_template parameters are experimental and MAY
+// DISAPPEAR in the future.  Clients should just use alloc for now.
+//
+// Important implementation properties:
+// 1. If the client request an object of size > _MAX_BYTES, the resulting
+//    object will be obtained directly from malloc.
+// 2. In all other cases, we allocate an object of size exactly
+//    _S_round_up(requested_size).  Thus the client has enough size
+//    information that we can return the object to the proper free list
+//    without permanently losing part of the object.
+//
+
+// The first template parameter specifies whether more than one thread
+// may use this allocator.  It is safe to allocate an object from
+// one instance of a default_alloc and deallocate it with another
+// one.  This effectively transfers its ownership to the second one.
+// This may have undesirable effects on reference locality.
+// The second parameter is unreferenced and serves only to allow the
+// creation of multiple default_alloc instances.
+
+# if defined(__OS400__)
+enum {_ALIGN = 16, _ALIGN_SHIFT=4, _MAX_BYTES = 256};
+#  define  _STLP_NFREELISTS 16
+# else
+enum {_ALIGN = 8, _ALIGN_SHIFT=3, _MAX_BYTES = 128};
+#  define  _STLP_NFREELISTS 16
+# endif /* __OS400__ */
+
+class _STLP_CLASS_DECLSPEC _Node_alloc_obj {
+public:
+    _Node_alloc_obj * _M_free_list_link;
+};
+
+template <bool __threads, int __inst>
+class __node_alloc {
+  _STLP_PRIVATE:
+  static inline size_t _STLP_CALL _S_round_up(size_t __bytes) { return (((__bytes) + (size_t)_ALIGN-1) & ~((size_t)_ALIGN - 1)); }
+  typedef _Node_alloc_obj _Obj;
+private:
+  // Returns an object of size __n, and optionally adds to size __n free list.
+  static void*  _STLP_CALL _S_refill(size_t __n);
+  // Allocates a chunk for nobjs of size size.  nobjs may be reduced
+  // if it is inconvenient to allocate the requested number.
+  static char*  _STLP_CALL _S_chunk_alloc(size_t __p_size, int& __nobjs);
+  // Chunk allocation state.
+  static _Node_alloc_obj * _STLP_VOLATILE _S_free_list[_STLP_NFREELISTS]; 
+  static char* _S_start_free;
+  static char* _S_end_free;
+  static size_t _S_heap_size;
+  static void * _STLP_CALL _M_allocate(size_t __n);
+  /* __p may not be 0 */
+  static void _STLP_CALL _M_deallocate(void *__p, size_t __n);
+public:
+  // this one is needed for proper simple_alloc wrapping
+  typedef char value_type;
+# if defined (_STLP_MEMBER_TEMPLATE_CLASSES) && defined (_STLP_USE_RAW_SGI_ALLOCATORS)
+  template <class _Tp1> struct rebind {
+    typedef __allocator<_Tp1, __node_alloc<__threads, __inst> > other;
+  };
+# endif
+  /* __n must be > 0      */
+  static void * _STLP_CALL allocate(size_t __n) { return (__n > (size_t)_MAX_BYTES) ?  __stl_new(__n) : _M_allocate(__n); }
+  /* __p may not be 0 */
+  static void _STLP_CALL deallocate(void *__p, size_t __n) { if (__n > (size_t)_MAX_BYTES) __stl_delete(__p); else _M_deallocate(__p, __n); }
+};
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+_STLP_EXPORT_TEMPLATE_CLASS __malloc_alloc<0>;
+_STLP_EXPORT_TEMPLATE_CLASS __node_alloc<_STLP_NODE_ALLOCATOR_THREADS, 0>;
+# endif /* _STLP_USE_TEMPLATE_EXPORT */
+typedef __node_alloc<_STLP_NODE_ALLOCATOR_THREADS, 0> _Node_alloc;
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+_STLP_EXPORT_TEMPLATE_CLASS __debug_alloc<_Node_alloc>;
+_STLP_EXPORT_TEMPLATE_CLASS __debug_alloc<__new_alloc>;
+_STLP_EXPORT_TEMPLATE_CLASS __debug_alloc<__malloc_alloc<0> >;
+# endif
+
+# if defined (_STLP_USE_PERTHREAD_ALLOC)
+
+_STLP_END_NAMESPACE
+// include additional header here
+# include <stl/_pthread_alloc.h>
+_STLP_BEGIN_NAMESPACE
+
+#  if defined ( _STLP_DEBUG_ALLOC )
+typedef __debug_alloc<__pthread_alloc> __sgi_alloc;
+#  else
+typedef __pthread_alloc __sgi_alloc;
+#  endif /* _STLP_DEBUG_ALLOC */
+
+typedef __pthread_alloc __single_client_alloc;
+typedef __pthread_alloc __multithreaded_alloc;
+
+# else
+
+# if defined ( _STLP_USE_NEWALLOC )
+
+#  if defined ( _STLP_DEBUG_ALLOC )
+typedef __debug_alloc<__new_alloc> __sgi_alloc;
+#  else
+typedef __new_alloc __sgi_alloc;
+#  endif /* _STLP_DEBUG_ALLOC */
+
+typedef __new_alloc __single_client_alloc;
+typedef __new_alloc __multithreaded_alloc;
+
+#  elif defined (_STLP_USE_MALLOC)
+
+#   if defined ( _STLP_DEBUG_ALLOC )
+typedef __debug_alloc<__malloc_alloc<0> > __sgi_alloc;
+#   else
+typedef __malloc_alloc<0> __sgi_alloc;
+#   endif /* _STLP_DEBUG_ALLOC */
+
+typedef __malloc_alloc<0> __single_client_alloc;
+typedef __malloc_alloc<0> __multithreaded_alloc;
+
+# else
+
+#   if defined ( _STLP_DEBUG_ALLOC )
+typedef __debug_alloc<_Node_alloc> __sgi_alloc;
+#   else
+typedef _Node_alloc __sgi_alloc;
+#   endif
+
+typedef __node_alloc<false, 0> __single_client_alloc;
+typedef __node_alloc<true, 0>  __multithreaded_alloc;
+
+#  endif /* _STLP_USE_NEWALLOC */
+# endif /* PTHREAD_ALLOC */
+
+// This implements allocators as specified in the C++ standard.  
+//
+// Note that standard-conforming allocators use many language features
+// that are not yet widely implemented.  In particular, they rely on
+// member templates, partial specialization, partial ordering of function
+// templates, the typename keyword, and the use of the template keyword
+// to refer to a template member of a dependent type.
+
+template <class _Tp>
+class allocator {
+public:
+
+  typedef _Tp        value_type;
+  typedef value_type *       pointer;
+  typedef const _Tp* const_pointer;
+  typedef _Tp&       reference;
+  typedef const _Tp& const_reference;
+  typedef size_t     size_type;
+  typedef ptrdiff_t  difference_type;
+# if defined (_STLP_MEMBER_TEMPLATE_CLASSES)
+  template <class _Tp1> struct rebind {
+    typedef allocator<_Tp1> other;
+  };
+# endif
+  allocator() _STLP_NOTHROW {}
+ # if defined (_STLP_MEMBER_TEMPLATES)
+  template <class _Tp1> allocator(const allocator<_Tp1>&) _STLP_NOTHROW {}
+ # endif    
+  allocator(const allocator<_Tp>&) _STLP_NOTHROW {}
+  ~allocator() _STLP_NOTHROW {}
+  pointer address(reference __x) const { return &__x; }
+  const_pointer address(const_reference __x) const { return &__x; }
+  // __n is permitted to be 0.  The C++ standard says nothing about what the return value is when __n == 0.
+  _Tp* allocate(size_type __n, const void* = 0) { 
+    return __n != 0 ? __REINTERPRET_CAST(value_type*,__sgi_alloc::allocate(__n * sizeof(value_type))) : 0;
+  }
+  // __p is permitted to be a null pointer, only if n==0.
+  void deallocate(pointer __p, size_type __n) {
+    _STLP_ASSERT( (__p == 0) == (__n == 0) )
+      if (__p != 0) __sgi_alloc::deallocate((void*)__p, __n * sizeof(value_type));
+  }
+  // backwards compatibility
+  void deallocate(pointer __p) const {  if (__p != 0) __sgi_alloc::deallocate((void*)__p, sizeof(value_type)); }
+  size_type max_size() const _STLP_NOTHROW  { return size_t(-1) / sizeof(value_type); }
+  void construct(pointer __p, const _Tp& __val) { _STLP_STD::_Construct(__p, __val); }
+  void destroy(pointer __p) { _STLP_STD::_Destroy(__p); }
+# if defined(__MRC__)||(defined(__SC__) && !defined(__DMC__))
+  template <class _T2> bool operator==(const allocator<_T2>&) const  _STLP_NOTHROW { return true; }
+  template <class _T2> bool operator!=(const allocator<_T2>&) const _STLP_NOTHROW { return false; }
+# endif
+};
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC allocator<void> {
+public:
+  typedef size_t      size_type;
+  typedef ptrdiff_t   difference_type;
+  typedef void*       pointer;
+  typedef const void* const_pointer;
+# if defined (_STLP_CLASS_PARTIAL_SPECIALIZATION)
+  typedef void        value_type;
+# endif
+# if defined (_STLP_MEMBER_TEMPLATE_CLASSES)
+  template <class _Tp1> struct rebind {
+    typedef allocator<_Tp1> other;
+  };
+# endif
+# if defined(__MRC__)||(defined(__SC__)&&!defined(__DMC__))		//*ty 03/24/2001 - MPW compilers get confused on these operator definitions
+  template <class _T2> bool operator==(const allocator<_T2>&) const _STLP_NOTHROW { return true; }
+  template <class _T2> bool operator!=(const allocator<_T2>&) const _STLP_NOTHROW { return false; }
+# endif
+};
+
+#if !(defined(__MRC__)||(defined(__SC__)&&!defined(__DMC__)))		//*ty 03/24/2001 - MPW compilers get confused on these operator definitions
+template <class _T1, class _T2> inline bool  _STLP_CALL operator==(const allocator<_T1>&, const allocator<_T2>&) _STLP_NOTHROW { return true; }
+template <class _T1, class _T2> inline bool  _STLP_CALL operator!=(const allocator<_T1>&, const allocator<_T2>&) _STLP_NOTHROW { return false; }
+#endif
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+_STLP_EXPORT_TEMPLATE_CLASS allocator<char>;
+#  if defined (_STLP_HAS_WCHAR_T)
+_STLP_EXPORT_TEMPLATE_CLASS allocator<wchar_t>;
+#  endif
+# endif /* _STLP_USE_TEMPLATE_EXPORT */
+
+// Another allocator adaptor: _Alloc_traits.  This serves two
+// purposes.  First, make it possible to write containers that can use
+// either SGI-style allocators or standard-conforming allocator.
+
+// The fully general version.
+template <class _Tp, class _Allocator>
+struct _Alloc_traits
+{
+  typedef _Allocator _Orig;
+# if defined (_STLP_USE_NESTED_TCLASS_THROUGHT_TPARAM) 
+  typedef typename _Allocator::_STLP_TEMPLATE rebind<_Tp> _Rebind_type;
+  typedef typename _Rebind_type::other  allocator_type;
+  static allocator_type create_allocator(const _Orig& __a) { return allocator_type(__a); }
+# else
+  // this is not actually true, used only to pass this type through
+  // to dynamic overload selection in _STLP_alloc_proxy methods
+  typedef _Allocator allocator_type;
+# endif /* _STLP_USE_NESTED_TCLASS_THROUGHT_TPARAM */
+};
+
+#ifndef _STLP_FORCE_ALLOCATORS
+#define _STLP_FORCE_ALLOCATORS(a,y) 
+#endif
+
+#if defined (_STLP_CLASS_PARTIAL_SPECIALIZATION) && ! defined (_STLP_MEMBER_TEMPLATE_CLASSES)
+// The version for the default allocator, for rare occasion when we have partial spec w/o member template classes
+template <class _Tp, class _Tp1>
+struct _Alloc_traits<_Tp, allocator<_Tp1> > {
+  typedef allocator<_Tp1> _Orig;
+  typedef allocator<_Tp> allocator_type;
+  static allocator_type create_allocator(const allocator<_Tp1 >& __a) { return allocator_type(__a); }
+};
+#endif /* _STLP_CLASS_PARTIAL_SPECIALIZATION */
+
+/* macro to convert the allocator for initialization
+ * not using MEMBER_TEMPLATE_CLASSES as it should work given template constructor  */
+#if defined (_STLP_MEMBER_TEMPLATES) || ! defined (_STLP_CLASS_PARTIAL_SPECIALIZATION)
+/* if _STLP_NO_TEMPLATE_CONVERSIONS is set, the member template constructor is
+ * not used implicitly to convert allocator parameter, so let us do it explicitly */
+# if defined (_STLP_MEMBER_TEMPLATE_CLASSES) && defined (_STLP_NO_TEMPLATE_CONVERSIONS)
+#  define _STLP_CONVERT_ALLOCATOR(__a, _Tp) __stl_alloc_create(__a,(_Tp*)0)
+# else
+#  define _STLP_CONVERT_ALLOCATOR(__a, _Tp) __a
+# endif
+/* else convert, but only if partial specialization works, since else
+ * Container::allocator_type won't be different */
+#else 
+#  define _STLP_CONVERT_ALLOCATOR(__a, _Tp) __stl_alloc_create(__a,(_Tp*)0)
+#endif
+
+# if defined (_STLP_USE_NESTED_TCLASS_THROUGHT_TPARAM) 
+template <class _Tp, class _Alloc>
+inline _STLP_TYPENAME_ON_RETURN_TYPE _Alloc_traits<_Tp, _Alloc>::allocator_type  _STLP_CALL
+__stl_alloc_create(const _Alloc& __a, const _Tp*) {
+  typedef typename _Alloc::_STLP_TEMPLATE rebind<_Tp>::other _Rebound_type;
+  return _Rebound_type(__a);
+}
+#else
+// If custom allocators are being used without member template classes support :
+// user (on purpose) is forced to define rebind/get operations !!!
+template <class _Tp1, class _Tp2>
+inline allocator<_Tp2>& _STLP_CALL
+__stl_alloc_rebind(allocator<_Tp1>& __a, const _Tp2*) {  return (allocator<_Tp2>&)(__a); }
+template <class _Tp1, class _Tp2>
+inline allocator<_Tp2> _STLP_CALL
+__stl_alloc_create(const allocator<_Tp1>&, const _Tp2*) { return allocator<_Tp2>(); }
+#endif /* _STLP_USE_NESTED_TCLASS_THROUGHT_TPARAM */
+
+# ifdef _STLP_USE_RAW_SGI_ALLOCATORS
+// move obsolete stuff out of the way
+# include <stl/_alloc_old.h>
+# endif
+
+// inheritance is being used for EBO optimization
+template <class _Value, class _Tp, class _MaybeReboundAlloc>
+class _STLP_alloc_proxy : public _MaybeReboundAlloc {
+private:
+  typedef _MaybeReboundAlloc _Base;
+  typedef _STLP_alloc_proxy<_Value, _Tp, _MaybeReboundAlloc> _Self;
+public:
+  _Value _M_data;
+  inline _STLP_alloc_proxy(const _MaybeReboundAlloc& __a, _Value __p) : _MaybeReboundAlloc(__a), _M_data(__p) {}
+
+# if 0
+  inline _STLP_alloc_proxy(const _Self& __x) : _MaybeReboundAlloc(__x), _M_data(__x._M_data) {} 
+  // construction/destruction
+  inline _Self& operator = (const _Self& __x) { 
+    *(_MaybeReboundAlloc*)this = *(_MaybeReboundAlloc*)__x;
+    _M_data = __x._M_data; return *this; 
+  } 
+  inline _Self& operator = (const _Base& __x) { ((_Base&)*this) = __x; return *this; } 
+# endif
+  // Unified interface to perform allocate()/deallocate() with limited
+  // language support
+#if ! defined (_STLP_USE_NESTED_TCLASS_THROUGHT_TPARAM)
+  // else it is rebound already, and allocate() member is accessible
+  inline _Tp* allocate(size_t __n) { 
+    return __stl_alloc_rebind(__STATIC_CAST(_Base&,*this),(_Tp*)0).allocate(__n,0); 
+  }
+  inline void deallocate(_Tp* __p, size_t __n) { 
+    __stl_alloc_rebind(__STATIC_CAST(_Base&, *this),(_Tp*)0).deallocate(__p, __n); 
+  }
+#endif /* !_STLP_USE_NESTED_TCLASS_THROUGHT_TPARAM */
+};
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+_STLP_EXPORT_TEMPLATE_CLASS _STLP_alloc_proxy<char *,char,allocator<char> >;
+#  if defined (_STLP_HAS_WCHAR_T)
+_STLP_EXPORT_TEMPLATE_CLASS _STLP_alloc_proxy<wchar_t *,wchar_t,allocator<wchar_t> >;
+#  endif
+# endif /* _STLP_USE_TEMPLATE_EXPORT */
+
+# undef _STLP_NODE_ALLOCATOR_THREADS
+
+_STLP_END_NAMESPACE
+
+# if defined (_STLP_EXPOSE_GLOBALS_IMPLEMENTATION) && !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_alloc.c>
+# endif
+
+#endif /* _STLP_INTERNAL_ALLOC_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_alloc_old.h b/main/source/stlport/stlport/stl/_alloc_old.h
new file mode 100644
index 00000000..a6dfa4c6
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_alloc_old.h
@@ -0,0 +1,303 @@
+template<class _Tp, class _Alloc>
+class __simple_alloc {
+  typedef _Alloc __alloc_type;
+public:
+  typedef typename _Alloc::value_type __alloc_value_type;
+  typedef _Tp value_type;
+  static size_t  _STLP_CALL __chunk(size_t __n) { 
+    return (sizeof(__alloc_value_type)==sizeof(value_type)) ? __n : 
+	    ((__n*sizeof(value_type)+sizeof(__alloc_value_type)-1)/sizeof(__alloc_value_type));
+  }
+  static _Tp*  _STLP_CALL allocate(size_t __n) { return 0 == __n ? 0 : (_Tp*) __alloc_type::allocate(__chunk(__n)); }
+  static void  _STLP_CALL deallocate(_Tp * __p, size_t __n) { 
+    __alloc_type::deallocate((__alloc_value_type*)__p, __chunk(__n)); }
+};
+
+// Allocator adaptor to turn an SGI-style allocator (e.g. alloc, malloc_alloc)
+// into a standard-conforming allocator.   Note that this adaptor does
+// *not* assume that all objects of the underlying alloc class are
+// identical, nor does it assume that all of the underlying alloc's
+// member functions are static member functions.  Note, also, that 
+// __allocator<_Tp, alloc> is essentially the same thing as allocator<_Tp>.
+
+template <class _Tp, class _Alloc>
+struct __allocator : public _Alloc {
+  typedef _Alloc __underlying_alloc;
+
+  typedef size_t    size_type;
+  typedef ptrdiff_t difference_type;
+  typedef _Tp*       pointer;
+  typedef const _Tp* const_pointer;
+  typedef _Tp&       reference;
+  typedef const _Tp& const_reference;
+  typedef _Tp        value_type;
+
+# if defined (_STLP_MEMBER_TEMPLATE_CLASSES)
+  template <class _Tp1> struct rebind {
+    typedef __allocator<_Tp1, _Alloc> other;
+  };
+# endif
+  __allocator() _STLP_NOTHROW {}
+  __allocator(const _Alloc& ) _STLP_NOTHROW {}
+  __allocator(const __allocator<_Tp, _Alloc>& __a) _STLP_NOTHROW
+    : _Alloc(__a) {}
+# if defined (_STLP_MEMBER_TEMPLATES) && defined (_STLP_FUNCTION_TMPL_PARTIAL_ORDER)
+  template <class _Tp1> 
+  __allocator(const __allocator<_Tp1, _Alloc>& __a) _STLP_NOTHROW
+    : _Alloc(__a) {}
+# endif
+# ifdef _STLP_TRIVIAL_DESTRUCTOR_BUG
+  ~__allocator() _STLP_NOTHROW {}
+# endif
+  pointer address(reference __x) const { return &__x; }
+
+# if !defined (__WATCOM_CPLUSPLUS__)
+  const_pointer address(const_reference __x) const { return &__x; }
+# endif
+
+  // __n is permitted to be 0.
+  _Tp* allocate(size_type __n, const void* = 0) {
+    return __n != 0 
+        ? __STATIC_CAST(_Tp*,__underlying_alloc::allocate(__n * sizeof(_Tp))) 
+        : 0;
+  }
+
+  // __p is not permitted to be a null pointer.
+  void deallocate(pointer __p, size_type __n)
+    { if (__p) __underlying_alloc::deallocate(__p, __n * sizeof(_Tp)); }
+
+  size_type max_size() const _STLP_NOTHROW 
+    { return size_t(-1) / sizeof(_Tp); }
+
+  void construct(pointer __p, const _Tp& __val) { _STLP_STD::_Construct(__p, __val); }
+  void destroy(pointer __p) { _STLP_STD::_Destroy(__p); }
+
+  const __underlying_alloc& __get_underlying_alloc() const { return *this; }
+};
+
+#ifdef _STLP_CLASS_PARTIAL_SPECIALIZATION
+template <class _Alloc>
+class __allocator<void, _Alloc> {
+  typedef size_t      size_type;
+  typedef ptrdiff_t   difference_type;
+  typedef void*       pointer;
+  typedef const void* const_pointer;
+  typedef void        value_type;
+#ifdef _STLP_MEMBER_TEMPLATE_CLASSES
+  template <class _Tp1> struct rebind {
+    typedef __allocator<_Tp1, _Alloc> other;
+  };
+#endif
+};
+#endif
+
+template <class _Tp, class _Alloc>
+inline bool  _STLP_CALL operator==(const __allocator<_Tp, _Alloc>& __a1,
+                                   const __allocator<_Tp, _Alloc>& __a2)
+{
+  return __a1.__get_underlying_alloc() == __a2.__get_underlying_alloc();
+}
+
+#ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+template <class _Tp, class _Alloc>
+inline bool  _STLP_CALL operator!=(const __allocator<_Tp, _Alloc>& __a1,
+                                   const __allocator<_Tp, _Alloc>& __a2)
+{
+  return __a1.__get_underlying_alloc() != __a2.__get_underlying_alloc();
+}
+#endif /* _STLP_FUNCTION_TMPL_PARTIAL_ORDER */
+
+
+// Comparison operators for all of the predifined SGI-style allocators.
+// This ensures that __allocator<malloc_alloc> (for example) will
+// work correctly.
+
+#ifndef _STLP_NON_TYPE_TMPL_PARAM_BUG
+template <int inst>
+inline bool  _STLP_CALL operator==(const __malloc_alloc<inst>&,
+                                   const __malloc_alloc<inst>&)
+{
+  return true;
+}
+
+#ifdef _STLP_FUNCTION_TMPL_PARTIAL_ORDER
+template <int __inst>
+inline bool  _STLP_CALL operator!=(const __malloc_alloc<__inst>&,
+                                   const __malloc_alloc<__inst>&)
+{
+  return false;
+}
+#endif /* _STLP_FUNCTION_TMPL_PARTIAL_ORDER */
+
+inline bool _STLP_CALL operator==(const __new_alloc&, const __new_alloc&) { return true; }
+
+# ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+inline bool _STLP_CALL operator!=(const __new_alloc&, const __new_alloc&) { return false; }
+# endif
+
+
+template <bool __threads, int __inst>
+inline bool  _STLP_CALL operator==(const __node_alloc<__threads, __inst>&,
+                                   const __node_alloc<__threads, __inst>&)
+{
+  return true;
+}
+
+#if defined( _STLP_FUNCTION_TMPL_PARTIAL_ORDER )
+
+template <bool __threads, int __inst>
+inline bool  _STLP_CALL operator!=(const __node_alloc<__threads, __inst>&,
+                                   const __node_alloc<__threads, __inst>&)
+{
+  return false;
+}
+#endif /* _STLP_FUNCTION_TMPL_PARTIAL_ORDER */
+
+#endif /* _STLP_NON_TYPE_TMPL_PARAM_BUG */
+
+template <class _Alloc>
+inline bool  _STLP_CALL operator==(const __debug_alloc<_Alloc>&, const __debug_alloc<_Alloc>&) {  return true; }
+# ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+template <class _Alloc>
+inline bool  _STLP_CALL operator!=(const __debug_alloc<_Alloc>&, const __debug_alloc<_Alloc>&) {  return false; }
+# endif
+
+#if defined (_STLP_CLASS_PARTIAL_SPECIALIZATION)
+
+// Versions for the predefined SGI-style allocators.
+template <class _Tp, int __inst>
+struct _Alloc_traits<_Tp, __malloc_alloc<__inst> > {
+  typedef __allocator<_Tp, __malloc_alloc<__inst> > allocator_type;
+};
+
+
+template <class _Tp, bool __threads, int __inst>
+struct _Alloc_traits<_Tp, __node_alloc<__threads, __inst> > {
+  typedef __allocator<_Tp, __node_alloc<__threads, __inst> > 
+          allocator_type;
+};
+
+template <class _Tp, class _Alloc>
+struct _Alloc_traits<_Tp, __debug_alloc<_Alloc> > {
+  typedef __allocator<_Tp, __debug_alloc<_Alloc> > allocator_type;
+};
+
+// Versions for the __allocator adaptor used with the predefined
+// SGI-style allocators.
+
+template <class _Tp, class _Tp1, class _Alloc>
+struct _Alloc_traits<_Tp, __allocator<_Tp1, _Alloc > > {
+  typedef __allocator<_Tp, _Alloc > allocator_type;
+};
+
+#endif
+
+#if !defined (_STLP_USE_NESTED_TCLASS_THROUGHT_TPARAM) 
+
+// Versions for the predefined SGI-style allocators.
+
+
+#  if defined (_STLP_NON_TYPE_TMPL_PARAM_BUG)
+
+typedef __malloc_alloc<0> __malloc_alloc_dfl;
+typedef __node_alloc<false, 0> __single_client_node_alloc;
+typedef __node_alloc<true, 0>  __multithreaded_node_alloc;
+
+template <class _Tp>
+inline __allocator<_Tp, __malloc_alloc_dfl >& _STLP_CALL
+__stl_alloc_rebind(__malloc_alloc_dfl& __a, const _Tp*) {
+  return (__allocator<_Tp, __malloc_alloc_dfl >&)__a;
+}
+
+template <class _Tp>
+inline __allocator<_Tp, __single_client_node_alloc >& _STLP_CALL
+__stl_alloc_rebind(__single_client_node_alloc& __a, const _Tp*) {
+  return (__allocator<_Tp, __single_client_node_alloc >&)__a;
+}
+
+template <class _Tp>
+inline __allocator<_Tp, __multithreaded_node_alloc >& _STLP_CALL
+__stl_alloc_rebind(__multithreaded_node_alloc& __a, const _Tp*) {
+  return (__allocator<_Tp, __multithreaded_node_alloc >&)__a;
+}
+
+template <class _Tp>
+inline __allocator<_Tp, __malloc_alloc_dfl > _STLP_CALL
+__stl_alloc_create(const __malloc_alloc_dfl&, const _Tp*) {
+  return __allocator<_Tp, __malloc_alloc_dfl > ();
+}
+
+template <class _Tp>
+inline __allocator<_Tp, __single_client_node_alloc > _STLP_CALL
+__stl_alloc_create(const __single_client_node_alloc&, const _Tp*) {
+  return __allocator<_Tp, __single_client_node_alloc >();
+}
+
+template <class _Tp>
+inline __allocator<_Tp, __multithreaded_node_alloc > _STLP_CALL
+__stl_alloc_create(const __multithreaded_node_alloc&, const _Tp*) {
+  return __allocator<_Tp, __multithreaded_node_alloc >();
+}
+
+#  else
+
+template <class _Tp, int __inst>
+inline __allocator<_Tp, __malloc_alloc<__inst> >& _STLP_CALL
+__stl_alloc_rebind(__malloc_alloc<__inst>& __a, const _Tp*) {
+  return (__allocator<_Tp, __malloc_alloc<__inst> >&)__a;
+}
+
+template <class _Tp, bool __threads, int __inst>
+inline __allocator<_Tp, __node_alloc<__threads, __inst> >& _STLP_CALL
+__stl_alloc_rebind(__node_alloc<__threads, __inst>& __a, const _Tp*) {
+  return (__allocator<_Tp, __node_alloc<__threads, __inst> >&)__a;
+}
+
+template <class _Tp, int __inst>
+inline __allocator<_Tp, __malloc_alloc<__inst> > _STLP_CALL
+__stl_alloc_create(const __malloc_alloc<__inst>&, const _Tp*) {
+  return __allocator<_Tp, __malloc_alloc<__inst> >();
+}
+
+template <class _Tp, bool __threads, int __inst>
+inline __allocator<_Tp, __node_alloc<__threads, __inst> > _STLP_CALL
+__stl_alloc_create(const __node_alloc<__threads, __inst>&, const _Tp*) {
+  return __allocator<_Tp, __node_alloc<__threads, __inst> >();
+}
+
+#  endif
+
+template <class _Tp, class _Alloc>
+inline __allocator<_Tp, __debug_alloc<_Alloc> > _STLP_CALL
+__stl_alloc_create(const __debug_alloc<_Alloc>&, const _Tp*) {
+  return __allocator<_Tp, __debug_alloc<_Alloc> >();
+}
+template <class _Tp, class _Alloc>
+inline __allocator<_Tp, __debug_alloc<_Alloc> >& _STLP_CALL
+__stl_alloc_rebind(__debug_alloc<_Alloc>& __a, const _Tp*) {
+  return (__allocator<_Tp, __debug_alloc<_Alloc> >&)__a;
+}
+
+template <class _Tp>
+inline __allocator<_Tp, __new_alloc > _STLP_CALL
+__stl_alloc_create(const __new_alloc&, const _Tp*) {
+  return __allocator<_Tp, __new_alloc >();
+}
+template <class _Tp>
+inline __allocator<_Tp, __new_alloc >&  _STLP_CALL
+__stl_alloc_rebind(__new_alloc& __a, const _Tp*) {
+  return (__allocator<_Tp, __new_alloc >&)__a;
+}
+
+template <class _Tp1, class _Alloc, class _Tp2>
+inline __allocator<_Tp2, _Alloc>& _STLP_CALL
+__stl_alloc_rebind(__allocator<_Tp1, _Alloc>& __a, const _Tp2*) {
+  return (__allocator<_Tp2, _Alloc>&)__a;
+}
+
+template <class _Tp1, class _Alloc, class _Tp2>
+inline __allocator<_Tp2, _Alloc> _STLP_CALL
+__stl_alloc_create(const __allocator<_Tp1, _Alloc>&, const _Tp2*) {
+  return __allocator<_Tp2, _Alloc>();
+}
+#endif
diff --git a/main/source/stlport/stlport/stl/_auto_ptr.h b/main/source/stlport/stlport/stl/_auto_ptr.h
new file mode 100644
index 00000000..82fd11ae
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_auto_ptr.h
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 1997-1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_AUTO_PTR_H
+# define _STLP_AUTO_PTR_H
+
+_STLP_BEGIN_NAMESPACE
+// implementation primitive
+class __ptr_base {
+public:
+  void* _M_p;
+  void  __set(const void* p) { _M_p = __CONST_CAST(void*,p); }
+  void  __set(void* p) { _M_p = p; }
+};
+
+template <class _Tp> class auto_ptr_ref {
+public:
+  __ptr_base& _M_r;
+  _Tp* const _M_p;
+
+  auto_ptr_ref(__ptr_base& __r, _Tp* __p) : _M_r(__r), _M_p(__p) {  }
+
+  _Tp* release() const { _M_r.__set((void*)0); return _M_p; }
+
+};
+
+template<class _Tp> class auto_ptr :  public __ptr_base {
+public:	
+  typedef _Tp element_type;
+  typedef auto_ptr<_Tp>           _Self;
+  
+  _Tp* release() {  
+    _Tp* __px = this->get(); 
+    this->_M_p = 0; 
+    return __px; 
+  }
+  
+  void reset(_Tp* __px=0) {
+    _Tp* __pt = this->get();
+    if (__px != __pt) 
+      delete __pt; 
+    this->__set(__px); 
+  }
+
+  _Tp* get() const { return __REINTERPRET_CAST(_Tp*,__CONST_CAST(void*,_M_p)); } 
+
+# if !defined (_STLP_NO_ARROW_OPERATOR)
+  _Tp* operator->() const { 
+    _STLP_VERBOSE_ASSERT(get()!=0, _StlMsg_AUTO_PTR_NULL)
+    return get(); 
+  }
+# endif
+  _Tp& operator*() const  { 
+    _STLP_VERBOSE_ASSERT(get()!=0, _StlMsg_AUTO_PTR_NULL)
+    return *get(); 
+  }
+  
+  auto_ptr() { this->_M_p = 0; }
+  
+  explicit auto_ptr(_Tp* __px) { this->__set(__px); }
+  
+#if defined (_STLP_MEMBER_TEMPLATES)
+# if !defined (_STLP_NO_TEMPLATE_CONVERSIONS)
+  template<class _Tp1> auto_ptr(auto_ptr<_Tp1>& __r) {
+    _Tp* __conversionCheck = __r.release();
+    this->__set(__conversionCheck);
+  }
+# endif	
+  template<class _Tp1> auto_ptr<_Tp>& operator=(auto_ptr<_Tp1>& __r) {
+    _Tp* __conversionCheck = __r.release();
+    reset(__conversionCheck);
+    return *this;
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+  
+  auto_ptr(_Self& __r) { this->__set(__r.release()); }
+
+  _Self& operator=(_Self& __r)  {
+    reset(__r.release());
+    return *this;
+  }
+
+  ~auto_ptr() { /* boris : reset(0) might be better */ delete this->get(); }
+	
+  auto_ptr(auto_ptr_ref<_Tp> __r) {
+    this->__set(__r.release());
+  }
+	
+  _Self& operator=(auto_ptr_ref<_Tp> __r) {
+    reset(__r.release());
+    return *this;
+  }
+  
+# if defined(_STLP_MEMBER_TEMPLATES) && !defined(_STLP_NO_TEMPLATE_CONVERSIONS)
+  template<class _Tp1> operator auto_ptr_ref<_Tp1>() {
+    return auto_ptr_ref<_Tp1>(*this, this->get());
+  }
+  template<class _Tp1> operator auto_ptr<_Tp1>() {
+    return auto_ptr<_Tp1>(release());
+  }
+# else
+  operator auto_ptr_ref<_Tp>()
+  { return auto_ptr_ref<_Tp>(*this, this->get()); }
+# endif
+	
+};
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_AUTO_PTR_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_bitset.c b/main/source/stlport/stlport/stl/_bitset.c
new file mode 100644
index 00000000..d9155037
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_bitset.c
@@ -0,0 +1,407 @@
+/*
+ * Copyright (c) 1998
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_BITSET_C
+# define  _STLP_BITSET_C
+
+# ifndef _STLP_BITSET_H
+#  include <stl/_bitset.h>
+# endif
+
+# define __BITS_PER_WORD (CHAR_BIT*sizeof(unsigned long))
+
+_STLP_BEGIN_NAMESPACE
+
+//
+// Definitions of non-inline functions from _Base_bitset.
+// 
+
+
+template<size_t _Nw>
+void _Base_bitset<_Nw>::_M_do_left_shift(size_t __shift) 
+{
+
+  if (__shift != 0) {
+    const size_t __wshift = __shift / __BITS_PER_WORD;
+    const size_t __offset = __shift % __BITS_PER_WORD;
+
+    if (__offset == 0)
+      for (size_t __n = _Nw - 1; __n >= __wshift; --__n)
+        _M_w[__n] = _M_w[__n - __wshift];
+
+    else {
+      const size_t __sub_offset = __BITS_PER_WORD - __offset;
+      for (size_t __n = _Nw - 1; __n > __wshift; --__n)
+        _M_w[__n] = (_M_w[__n - __wshift] << __offset) | 
+                    (_M_w[__n - __wshift - 1] >> __sub_offset);
+      _M_w[__wshift] = _M_w[0] << __offset;
+    }
+
+    fill(_M_w + 0, _M_w + __wshift, __STATIC_CAST(_WordT,0));
+  }
+}
+
+template<size_t _Nw>
+void _Base_bitset<_Nw>::_M_do_right_shift(size_t __shift) 
+{
+
+  if (__shift != 0) {
+    const size_t __wshift = __shift / __BITS_PER_WORD;
+    const size_t __offset = __shift % __BITS_PER_WORD;
+    const size_t __limit = _Nw - __wshift - 1;
+
+    if (__offset == 0)
+      for (size_t __n = 0; __n <= __limit; ++__n)
+        _M_w[__n] = _M_w[__n + __wshift];
+
+    else {
+      const size_t __sub_offset = __BITS_PER_WORD - __offset;
+      for (size_t __n = 0; __n < __limit; ++__n)
+        _M_w[__n] = (_M_w[__n + __wshift] >> __offset) |
+                    (_M_w[__n + __wshift + 1] << __sub_offset);
+      _M_w[__limit] = _M_w[_Nw-1] >> __offset;
+    }
+
+    fill(_M_w + __limit + 1, _M_w + _Nw, __STATIC_CAST(_WordT,0));
+  }
+}
+
+template<size_t _Nw>
+unsigned long _Base_bitset<_Nw>::_M_do_to_ulong() const
+{
+  for (size_t __i = 1; __i < _Nw; ++__i) 
+    if (_M_w[__i]) 
+      __stl_throw_overflow_error("bitset");
+  return _M_w[0];
+} // End _M_do_to_ulong
+
+template<size_t _Nw>
+size_t _Base_bitset<_Nw>::_M_do_find_first(size_t __not_found) const 
+{
+  for ( size_t __i = 0; __i < _Nw; __i++ ) {
+    _WordT __thisword = _M_w[__i];
+    if ( __thisword != __STATIC_CAST(_WordT,0) ) {
+      // find byte within word
+      for ( size_t __j = 0; __j < sizeof(_WordT); __j++ ) {
+        unsigned char __this_byte
+          = __STATIC_CAST(unsigned char,(__thisword & (~(unsigned char)0)));
+        if ( __this_byte )
+          return __i*__BITS_PER_WORD + __j*CHAR_BIT +
+            _Bs_G<bool>::_S_first_one[__this_byte];
+
+        __thisword >>= CHAR_BIT;
+      }
+    }
+  }
+  // not found, so return an indication of failure.
+  return __not_found;
+}
+
+template<size_t _Nw>
+size_t
+_Base_bitset<_Nw>::_M_do_find_next(size_t __prev, 
+                                   size_t __not_found) const
+{
+  // make bound inclusive
+  ++__prev;
+
+  // check out of bounds
+  if ( __prev >= _Nw * __BITS_PER_WORD )
+    return __not_found;
+
+    // search first word
+  size_t __i = _S_whichword(__prev);
+  _WordT __thisword = _M_w[__i];
+
+    // mask off bits below bound
+  __thisword &= (~__STATIC_CAST(_WordT,0)) << _S_whichbit(__prev);
+
+  if ( __thisword != __STATIC_CAST(_WordT,0) ) {
+    // find byte within word
+    // get first byte into place
+    __thisword >>= _S_whichbyte(__prev) * CHAR_BIT;
+    for ( size_t __j = _S_whichbyte(__prev); __j < sizeof(_WordT); __j++ ) {
+      unsigned char __this_byte
+        = __STATIC_CAST(unsigned char,(__thisword & (~(unsigned char)0)));
+      if ( __this_byte )
+        return __i*__BITS_PER_WORD + __j*CHAR_BIT +
+          _Bs_G<bool>::_S_first_one[__this_byte];
+
+      __thisword >>= CHAR_BIT;
+    }
+  }
+
+  // check subsequent words
+  __i++;
+  for ( ; __i < _Nw; __i++ ) {
+    /* _WordT */ __thisword = _M_w[__i];
+    if ( __thisword != __STATIC_CAST(_WordT,0) ) {
+      // find byte within word
+      for ( size_t __j = 0; __j < sizeof(_WordT); __j++ ) {
+        unsigned char __this_byte
+          = __STATIC_CAST(unsigned char,(__thisword & (~(unsigned char)0)));
+        if ( __this_byte )
+          return __i*__BITS_PER_WORD + __j*CHAR_BIT +
+            _Bs_G<bool>::_S_first_one[__this_byte];
+
+        __thisword >>= CHAR_BIT;
+      }
+    }
+  }
+
+  // not found, so return an indication of failure.
+  return __not_found;
+} // end _M_do_find_next
+
+
+
+# if ! defined (_STLP_NON_TYPE_TMPL_PARAM_BUG)
+
+#if defined ( _STLP_USE_NEW_IOSTREAMS)
+
+template <class _CharT, class _Traits, size_t _Nb>
+basic_istream<_CharT, _Traits>& _STLP_CALL
+operator>>(basic_istream<_CharT, _Traits>& __is, bitset<_Nb>& __x)
+{
+  basic_string<_CharT, _Traits> __tmp;
+  __tmp.reserve(_Nb);
+
+  // Skip whitespace
+  typename basic_istream<_CharT, _Traits>::sentry __sentry(__is);
+  if (__sentry) {
+    basic_streambuf<_CharT, _Traits>* __buf = __is.rdbuf();
+    for (size_t __i = 0; __i < _Nb; ++__i) {
+      static typename _Traits::int_type __eof = _Traits::eof();
+
+      typename _Traits::int_type __c1 = __buf->sbumpc();
+      if (_Traits::eq_int_type(__c1, __eof)) {
+        __is.setstate(ios_base::eofbit);
+        break;
+      }
+      else {
+        char __c2 = _Traits::to_char_type(__c1);
+        char __c  = __is.narrow(__c2, '*');
+
+        if (__c == '0' || __c == '1')
+          __tmp.push_back(__c);
+        else if (_Traits::eq_int_type(__buf->sputbackc(__c2), __eof)) {
+          __is.setstate(ios_base::failbit);
+          break;
+        }
+      }
+    }
+
+    if (__tmp.empty())
+      __is.setstate(ios_base::failbit);
+    else
+      __x._M_copy_from_string(__tmp, __STATIC_CAST(size_t,0), _Nb);
+  }
+
+  return __is;
+}
+
+template <class _CharT, class _Traits, size_t _Nb>
+basic_ostream<_CharT, _Traits>& _STLP_CALL
+operator<<(basic_ostream<_CharT, _Traits>& __os,
+           const bitset<_Nb>& __x)
+{
+  basic_string<_CharT, _Traits> __tmp;
+  __x._M_copy_to_string(__tmp);
+  return __os << __tmp;
+}
+
+#elif ! defined ( _STLP_USE_NO_IOSTREAMS )
+
+// (reg) For Watcom IO, this tells if ostream class is in .exe or in .dll
+template <size_t _Nb>
+_ISTREAM_DLL& _STLP_CALL
+operator>>(_ISTREAM_DLL& __is, bitset<_Nb>& __x) {
+  string __tmp;
+  __tmp.reserve(_Nb);
+
+  // In new templatized iostreams, use istream::sentry
+  if (__is.flags() & ios::skipws) {
+    char __c;
+    do 
+      __is.get(__c);
+    while (__is && isspace(__c));
+    if (__is)
+      __is.putback(__c);
+  }
+
+  for (size_t __i = 0; __i < _Nb; ++__i) {
+    char __c;
+    __is.get(__c);
+
+    if (!__is)
+      break;
+    else if (__c != '0' && __c != '1') {
+      __is.putback(__c);
+      break;
+    }
+    else
+      __tmp.push_back(__c);
+  }
+
+  if (__tmp.empty()) 
+    __is.clear(__is.rdstate() | ios::failbit);
+  else
+    __x._M_copy_from_string(__tmp, __STATIC_CAST(size_t,0), _Nb);
+
+  return __is;
+}
+
+# endif /* _STLP_USE_NEW_IOSTREAMS */
+
+# endif /* _STLP_NON_TYPE_TMPL_PARAM_BUG */
+
+
+# if defined (_STLP_EXPOSE_GLOBALS_IMPLEMENTATION)
+
+// ------------------------------------------------------------
+// Lookup tables for find and count operations.
+
+# if ( _STLP_STATIC_TEMPLATE_DATA > 0 )
+template<class _Dummy>
+unsigned char _Bs_G<_Dummy>::_S_bit_count[256] = {
+# else
+unsigned char _Bs_G<bool>::_S_bit_count[256] _STLP_WEAK = {
+# endif
+  0, /*   0 */ 1, /*   1 */ 1, /*   2 */ 2, /*   3 */ 1, /*   4 */
+  2, /*   5 */ 2, /*   6 */ 3, /*   7 */ 1, /*   8 */ 2, /*   9 */
+  2, /*  10 */ 3, /*  11 */ 2, /*  12 */ 3, /*  13 */ 3, /*  14 */
+  4, /*  15 */ 1, /*  16 */ 2, /*  17 */ 2, /*  18 */ 3, /*  19 */
+  2, /*  20 */ 3, /*  21 */ 3, /*  22 */ 4, /*  23 */ 2, /*  24 */
+  3, /*  25 */ 3, /*  26 */ 4, /*  27 */ 3, /*  28 */ 4, /*  29 */
+  4, /*  30 */ 5, /*  31 */ 1, /*  32 */ 2, /*  33 */ 2, /*  34 */
+  3, /*  35 */ 2, /*  36 */ 3, /*  37 */ 3, /*  38 */ 4, /*  39 */
+  2, /*  40 */ 3, /*  41 */ 3, /*  42 */ 4, /*  43 */ 3, /*  44 */
+  4, /*  45 */ 4, /*  46 */ 5, /*  47 */ 2, /*  48 */ 3, /*  49 */
+  3, /*  50 */ 4, /*  51 */ 3, /*  52 */ 4, /*  53 */ 4, /*  54 */
+  5, /*  55 */ 3, /*  56 */ 4, /*  57 */ 4, /*  58 */ 5, /*  59 */
+  4, /*  60 */ 5, /*  61 */ 5, /*  62 */ 6, /*  63 */ 1, /*  64 */
+  2, /*  65 */ 2, /*  66 */ 3, /*  67 */ 2, /*  68 */ 3, /*  69 */
+  3, /*  70 */ 4, /*  71 */ 2, /*  72 */ 3, /*  73 */ 3, /*  74 */
+  4, /*  75 */ 3, /*  76 */ 4, /*  77 */ 4, /*  78 */ 5, /*  79 */
+  2, /*  80 */ 3, /*  81 */ 3, /*  82 */ 4, /*  83 */ 3, /*  84 */
+  4, /*  85 */ 4, /*  86 */ 5, /*  87 */ 3, /*  88 */ 4, /*  89 */
+  4, /*  90 */ 5, /*  91 */ 4, /*  92 */ 5, /*  93 */ 5, /*  94 */
+  6, /*  95 */ 2, /*  96 */ 3, /*  97 */ 3, /*  98 */ 4, /*  99 */
+  3, /* 100 */ 4, /* 101 */ 4, /* 102 */ 5, /* 103 */ 3, /* 104 */
+  4, /* 105 */ 4, /* 106 */ 5, /* 107 */ 4, /* 108 */ 5, /* 109 */
+  5, /* 110 */ 6, /* 111 */ 3, /* 112 */ 4, /* 113 */ 4, /* 114 */
+  5, /* 115 */ 4, /* 116 */ 5, /* 117 */ 5, /* 118 */ 6, /* 119 */
+  4, /* 120 */ 5, /* 121 */ 5, /* 122 */ 6, /* 123 */ 5, /* 124 */
+  6, /* 125 */ 6, /* 126 */ 7, /* 127 */ 1, /* 128 */ 2, /* 129 */
+  2, /* 130 */ 3, /* 131 */ 2, /* 132 */ 3, /* 133 */ 3, /* 134 */
+  4, /* 135 */ 2, /* 136 */ 3, /* 137 */ 3, /* 138 */ 4, /* 139 */
+  3, /* 140 */ 4, /* 141 */ 4, /* 142 */ 5, /* 143 */ 2, /* 144 */
+  3, /* 145 */ 3, /* 146 */ 4, /* 147 */ 3, /* 148 */ 4, /* 149 */
+  4, /* 150 */ 5, /* 151 */ 3, /* 152 */ 4, /* 153 */ 4, /* 154 */
+  5, /* 155 */ 4, /* 156 */ 5, /* 157 */ 5, /* 158 */ 6, /* 159 */
+  2, /* 160 */ 3, /* 161 */ 3, /* 162 */ 4, /* 163 */ 3, /* 164 */
+  4, /* 165 */ 4, /* 166 */ 5, /* 167 */ 3, /* 168 */ 4, /* 169 */
+  4, /* 170 */ 5, /* 171 */ 4, /* 172 */ 5, /* 173 */ 5, /* 174 */
+  6, /* 175 */ 3, /* 176 */ 4, /* 177 */ 4, /* 178 */ 5, /* 179 */
+  4, /* 180 */ 5, /* 181 */ 5, /* 182 */ 6, /* 183 */ 4, /* 184 */
+  5, /* 185 */ 5, /* 186 */ 6, /* 187 */ 5, /* 188 */ 6, /* 189 */
+  6, /* 190 */ 7, /* 191 */ 2, /* 192 */ 3, /* 193 */ 3, /* 194 */
+  4, /* 195 */ 3, /* 196 */ 4, /* 197 */ 4, /* 198 */ 5, /* 199 */
+  3, /* 200 */ 4, /* 201 */ 4, /* 202 */ 5, /* 203 */ 4, /* 204 */
+  5, /* 205 */ 5, /* 206 */ 6, /* 207 */ 3, /* 208 */ 4, /* 209 */
+  4, /* 210 */ 5, /* 211 */ 4, /* 212 */ 5, /* 213 */ 5, /* 214 */
+  6, /* 215 */ 4, /* 216 */ 5, /* 217 */ 5, /* 218 */ 6, /* 219 */
+  5, /* 220 */ 6, /* 221 */ 6, /* 222 */ 7, /* 223 */ 3, /* 224 */
+  4, /* 225 */ 4, /* 226 */ 5, /* 227 */ 4, /* 228 */ 5, /* 229 */
+  5, /* 230 */ 6, /* 231 */ 4, /* 232 */ 5, /* 233 */ 5, /* 234 */
+  6, /* 235 */ 5, /* 236 */ 6, /* 237 */ 6, /* 238 */ 7, /* 239 */
+  4, /* 240 */ 5, /* 241 */ 5, /* 242 */ 6, /* 243 */ 5, /* 244 */
+  6, /* 245 */ 6, /* 246 */ 7, /* 247 */ 5, /* 248 */ 6, /* 249 */
+  6, /* 250 */ 7, /* 251 */ 6, /* 252 */ 7, /* 253 */ 7, /* 254 */
+  8  /* 255 */
+}; // end _Bitset_global
+
+# if ( _STLP_STATIC_TEMPLATE_DATA > 0 )
+template<class _Dummy>
+unsigned char _Bs_G<_Dummy>::_S_first_one[256] = {
+# else
+unsigned char _Bs_G<bool>::_S_first_one[256] _STLP_WEAK = {
+# endif
+
+  0, /*   0 */ 0, /*   1 */ 1, /*   2 */ 0, /*   3 */ 2, /*   4 */
+  0, /*   5 */ 1, /*   6 */ 0, /*   7 */ 3, /*   8 */ 0, /*   9 */
+  1, /*  10 */ 0, /*  11 */ 2, /*  12 */ 0, /*  13 */ 1, /*  14 */
+  0, /*  15 */ 4, /*  16 */ 0, /*  17 */ 1, /*  18 */ 0, /*  19 */
+  2, /*  20 */ 0, /*  21 */ 1, /*  22 */ 0, /*  23 */ 3, /*  24 */
+  0, /*  25 */ 1, /*  26 */ 0, /*  27 */ 2, /*  28 */ 0, /*  29 */
+  1, /*  30 */ 0, /*  31 */ 5, /*  32 */ 0, /*  33 */ 1, /*  34 */
+  0, /*  35 */ 2, /*  36 */ 0, /*  37 */ 1, /*  38 */ 0, /*  39 */
+  3, /*  40 */ 0, /*  41 */ 1, /*  42 */ 0, /*  43 */ 2, /*  44 */
+  0, /*  45 */ 1, /*  46 */ 0, /*  47 */ 4, /*  48 */ 0, /*  49 */
+  1, /*  50 */ 0, /*  51 */ 2, /*  52 */ 0, /*  53 */ 1, /*  54 */
+  0, /*  55 */ 3, /*  56 */ 0, /*  57 */ 1, /*  58 */ 0, /*  59 */
+  2, /*  60 */ 0, /*  61 */ 1, /*  62 */ 0, /*  63 */ 6, /*  64 */
+  0, /*  65 */ 1, /*  66 */ 0, /*  67 */ 2, /*  68 */ 0, /*  69 */
+  1, /*  70 */ 0, /*  71 */ 3, /*  72 */ 0, /*  73 */ 1, /*  74 */
+  0, /*  75 */ 2, /*  76 */ 0, /*  77 */ 1, /*  78 */ 0, /*  79 */
+  4, /*  80 */ 0, /*  81 */ 1, /*  82 */ 0, /*  83 */ 2, /*  84 */
+  0, /*  85 */ 1, /*  86 */ 0, /*  87 */ 3, /*  88 */ 0, /*  89 */
+  1, /*  90 */ 0, /*  91 */ 2, /*  92 */ 0, /*  93 */ 1, /*  94 */
+  0, /*  95 */ 5, /*  96 */ 0, /*  97 */ 1, /*  98 */ 0, /*  99 */
+  2, /* 100 */ 0, /* 101 */ 1, /* 102 */ 0, /* 103 */ 3, /* 104 */
+  0, /* 105 */ 1, /* 106 */ 0, /* 107 */ 2, /* 108 */ 0, /* 109 */
+  1, /* 110 */ 0, /* 111 */ 4, /* 112 */ 0, /* 113 */ 1, /* 114 */
+  0, /* 115 */ 2, /* 116 */ 0, /* 117 */ 1, /* 118 */ 0, /* 119 */
+  3, /* 120 */ 0, /* 121 */ 1, /* 122 */ 0, /* 123 */ 2, /* 124 */
+  0, /* 125 */ 1, /* 126 */ 0, /* 127 */ 7, /* 128 */ 0, /* 129 */
+  1, /* 130 */ 0, /* 131 */ 2, /* 132 */ 0, /* 133 */ 1, /* 134 */
+  0, /* 135 */ 3, /* 136 */ 0, /* 137 */ 1, /* 138 */ 0, /* 139 */
+  2, /* 140 */ 0, /* 141 */ 1, /* 142 */ 0, /* 143 */ 4, /* 144 */
+  0, /* 145 */ 1, /* 146 */ 0, /* 147 */ 2, /* 148 */ 0, /* 149 */
+  1, /* 150 */ 0, /* 151 */ 3, /* 152 */ 0, /* 153 */ 1, /* 154 */
+  0, /* 155 */ 2, /* 156 */ 0, /* 157 */ 1, /* 158 */ 0, /* 159 */
+  5, /* 160 */ 0, /* 161 */ 1, /* 162 */ 0, /* 163 */ 2, /* 164 */
+  0, /* 165 */ 1, /* 166 */ 0, /* 167 */ 3, /* 168 */ 0, /* 169 */
+  1, /* 170 */ 0, /* 171 */ 2, /* 172 */ 0, /* 173 */ 1, /* 174 */
+  0, /* 175 */ 4, /* 176 */ 0, /* 177 */ 1, /* 178 */ 0, /* 179 */
+  2, /* 180 */ 0, /* 181 */ 1, /* 182 */ 0, /* 183 */ 3, /* 184 */
+  0, /* 185 */ 1, /* 186 */ 0, /* 187 */ 2, /* 188 */ 0, /* 189 */
+  1, /* 190 */ 0, /* 191 */ 6, /* 192 */ 0, /* 193 */ 1, /* 194 */
+  0, /* 195 */ 2, /* 196 */ 0, /* 197 */ 1, /* 198 */ 0, /* 199 */
+  3, /* 200 */ 0, /* 201 */ 1, /* 202 */ 0, /* 203 */ 2, /* 204 */
+  0, /* 205 */ 1, /* 206 */ 0, /* 207 */ 4, /* 208 */ 0, /* 209 */
+  1, /* 210 */ 0, /* 211 */ 2, /* 212 */ 0, /* 213 */ 1, /* 214 */
+  0, /* 215 */ 3, /* 216 */ 0, /* 217 */ 1, /* 218 */ 0, /* 219 */
+  2, /* 220 */ 0, /* 221 */ 1, /* 222 */ 0, /* 223 */ 5, /* 224 */
+  0, /* 225 */ 1, /* 226 */ 0, /* 227 */ 2, /* 228 */ 0, /* 229 */
+  1, /* 230 */ 0, /* 231 */ 3, /* 232 */ 0, /* 233 */ 1, /* 234 */
+  0, /* 235 */ 2, /* 236 */ 0, /* 237 */ 1, /* 238 */ 0, /* 239 */
+  4, /* 240 */ 0, /* 241 */ 1, /* 242 */ 0, /* 243 */ 2, /* 244 */
+  0, /* 245 */ 1, /* 246 */ 0, /* 247 */ 3, /* 248 */ 0, /* 249 */
+  1, /* 250 */ 0, /* 251 */ 2, /* 252 */ 0, /* 253 */ 1, /* 254 */
+  0, /* 255 */
+}; // end _Bitset_global
+
+# endif /* defined (_STLP_EXPOSE_GLOBALS_IMPLEMENTATION) */
+
+_STLP_END_NAMESPACE
+
+#  undef __BITS_PER_WORD
+#  undef bitset
+
+#endif /*  _STLP_BITSET_C */
diff --git a/main/source/stlport/stlport/stl/_bitset.h b/main/source/stlport/stlport/stl/_bitset.h
new file mode 100644
index 00000000..68298f3d
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_bitset.h
@@ -0,0 +1,768 @@
+/*
+ * Copyright (c) 1998
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_BITSET_H
+#define _STLP_BITSET_H
+
+// A bitset of size N has N % (sizeof(unsigned long) * CHAR_BIT) unused 
+// bits.  (They are the high- order bits in the highest word.)  It is
+// a class invariant of class bitset<> that those unused bits are
+// always zero.
+
+// Most of the actual code isn't contained in bitset<> itself, but in the 
+// base class _Base_bitset.  The base class works with whole words, not with
+// individual bits.  This allows us to specialize _Base_bitset for the
+// important special case where the bitset is only a single word.
+
+// The C++ standard does not define the precise semantics of operator[].
+// In this implementation the const version of operator[] is equivalent
+// to test(), except that it does no range checking.  The non-const version
+// returns a reference to a bit, again without doing any range checking.
+
+
+# ifndef _STLP_INTERNAL_ALGOBASE_H
+#  include <stl/_algobase.h>
+# endif
+
+# ifndef _STLP_INTERNAL_ALLOC_H
+#  include <stl/_alloc.h>
+# endif
+
+# ifndef _STLP_INTERNAL_ITERATOR_H
+#  include <stl/_iterator.h>
+# endif
+
+# ifndef _STLP_INTERNAL_UNINITIALIZED_H
+#  include <stl/_uninitialized.h>
+# endif
+
+# ifndef _STLP_RANGE_ERRORS_H
+#  include <stl/_range_errors.h>
+# endif
+
+# ifndef _STLP_STRING
+#  include <string>
+# endif
+
+# ifndef _STLP_ISTREAM
+#  include <istream>
+# endif
+
+#define __BITS_PER_WORD (CHAR_BIT*sizeof(unsigned long))
+#define __BITSET_WORDS(__n) ((__n + __BITS_PER_WORD - 1)/__BITS_PER_WORD)
+
+_STLP_BEGIN_NAMESPACE
+
+// structure to aid in counting bits
+template<class _Dummy> 
+class _Bs_G {
+public:
+  static unsigned char _S_bit_count[256];
+  // Mapping from 8 bit unsigned integers to the index of the first one
+  // bit:
+  static unsigned char _S_first_one[256];
+};
+
+//
+// Base class: general case.
+//
+
+template<size_t _Nw>
+struct _Base_bitset {
+  typedef unsigned long _WordT;
+
+  _WordT _M_w[_Nw];                // 0 is the least significant word.
+
+  _Base_bitset( void ) { _M_do_reset(); }
+
+  _Base_bitset(unsigned long __val) {
+    _M_do_reset();
+    _M_w[0] = __val;
+  }
+  
+  static size_t _STLP_CALL _S_whichword( size_t __pos ) {
+    return __pos / __BITS_PER_WORD;
+  }
+  static size_t _STLP_CALL _S_whichbyte( size_t __pos ) {
+    return (__pos % __BITS_PER_WORD) / CHAR_BIT;
+  }
+  static size_t _STLP_CALL _S_whichbit( size_t __pos ) {
+    return __pos % __BITS_PER_WORD;
+  }
+  static _WordT _STLP_CALL _S_maskbit( size_t __pos ) {
+    return __STATIC_CAST(_WordT,1) << _S_whichbit(__pos);
+  }
+
+  _WordT& _M_getword(size_t __pos)       { return _M_w[_S_whichword(__pos)]; }
+  _WordT  _M_getword(size_t __pos) const { return _M_w[_S_whichword(__pos)]; }
+
+  _WordT& _M_hiword()       { return _M_w[_Nw - 1]; }
+  _WordT  _M_hiword() const { return _M_w[_Nw - 1]; }
+
+  void _M_do_and(const _Base_bitset<_Nw>& __x) {
+    for ( size_t __i = 0; __i < _Nw; __i++ ) {
+      _M_w[__i] &= __x._M_w[__i];
+    }
+  }
+
+  void _M_do_or(const _Base_bitset<_Nw>& __x) {
+    for ( size_t __i = 0; __i < _Nw; __i++ ) {
+      _M_w[__i] |= __x._M_w[__i];
+    }
+  }
+
+  void _M_do_xor(const _Base_bitset<_Nw>& __x) {
+    for ( size_t __i = 0; __i < _Nw; __i++ ) {
+      _M_w[__i] ^= __x._M_w[__i];
+    }
+  }
+
+  void _M_do_left_shift(size_t __shift);
+
+  void _M_do_right_shift(size_t __shift);
+
+  void _M_do_flip() {
+    for ( size_t __i = 0; __i < _Nw; __i++ ) {
+      _M_w[__i] = ~_M_w[__i];
+    }
+  }
+
+  void _M_do_set() {
+    for ( size_t __i = 0; __i < _Nw; __i++ ) {
+      _M_w[__i] = ~__STATIC_CAST(_WordT,0);
+    }
+  }
+
+
+  void _M_do_reset() { memset(_M_w, 0, _Nw * sizeof(_WordT)); }
+
+  bool _M_is_equal(const _Base_bitset<_Nw>& __x) const {
+    for (size_t __i = 0; __i < _Nw; ++__i) {
+      if (_M_w[__i] != __x._M_w[__i])
+        return false;
+    }
+    return true;
+  }
+
+  bool _M_is_any() const {
+    for ( size_t __i = 0; __i < _Nw ; __i++ ) {
+      if ( _M_w[__i] != __STATIC_CAST(_WordT,0) )
+        return true;
+    }
+    return false;
+  }
+
+  size_t _M_do_count() const {
+    size_t __result = 0;
+    const unsigned char* __byte_ptr = (const unsigned char*)_M_w;
+    const unsigned char* __end_ptr = (const unsigned char*)(_M_w+_Nw);
+
+    while ( __byte_ptr < __end_ptr ) {
+      __result += _Bs_G<bool>::_S_bit_count[*__byte_ptr];
+      __byte_ptr++;
+    }
+    return __result;
+  }
+
+  unsigned long _M_do_to_ulong() const; 
+
+  // find first "on" bit
+  size_t _M_do_find_first(size_t __not_found) const;
+
+  // find the next "on" bit that follows "prev"
+  size_t _M_do_find_next(size_t __prev, size_t __not_found) const;
+};
+
+//
+// Base class: specialization for a single word.
+//
+
+_STLP_TEMPLATE_NULL
+struct _Base_bitset<1UL> {
+  typedef unsigned long _WordT;
+  typedef _Base_bitset<1UL> _Self;
+
+  _WordT _M_w;
+
+  _Base_bitset( void ) : _M_w(0) {}
+  _Base_bitset(unsigned long __val) : _M_w(__val) {}
+  
+  static size_t _STLP_CALL _S_whichword( size_t __pos ) {
+    return __pos / __BITS_PER_WORD ;
+  }
+  static size_t _STLP_CALL _S_whichbyte( size_t __pos ) {
+    return (__pos % __BITS_PER_WORD) / CHAR_BIT;
+  }
+  static size_t _STLP_CALL _S_whichbit( size_t __pos ) {
+    return __pos % __BITS_PER_WORD;
+  }
+  static _WordT _STLP_CALL _S_maskbit( size_t __pos ) {
+    return (__STATIC_CAST(_WordT,1)) << _S_whichbit(__pos);
+  }
+
+  _WordT& _M_getword(size_t)       { return _M_w; }
+  _WordT  _M_getword(size_t) const { return _M_w; }
+
+  _WordT& _M_hiword()       { return _M_w; }
+  _WordT  _M_hiword() const { return _M_w; }
+
+
+  void _M_do_and(const _Self& __x) { _M_w &= __x._M_w; }
+  void _M_do_or(const _Self& __x)  { _M_w |= __x._M_w; }
+  void _M_do_xor(const _Self& __x) { _M_w ^= __x._M_w; }
+  void _M_do_left_shift(size_t __shift)     { _M_w <<= __shift; }
+  void _M_do_right_shift(size_t __shift)    { _M_w >>= __shift; }
+  void _M_do_flip()                       { _M_w = ~_M_w; }
+  void _M_do_set()                        { _M_w = ~__STATIC_CAST(_WordT,0); }
+  void _M_do_reset()                      { _M_w = 0; }
+
+  bool _M_is_equal(const _Self& __x) const {
+    return _M_w == __x._M_w;
+  }
+  bool _M_is_any() const {
+    return _M_w != 0;
+  }
+
+  size_t _M_do_count() const {
+    size_t __result = 0;
+    const unsigned char* __byte_ptr = (const unsigned char*)&_M_w;
+    const unsigned char* __end_ptr = ((const unsigned char*)&_M_w)+sizeof(_M_w);
+    while ( __byte_ptr < __end_ptr ) {
+      __result += _Bs_G<bool>::_S_bit_count[*__byte_ptr];
+      __byte_ptr++;
+    }
+    return __result;
+  }
+
+  unsigned long _M_do_to_ulong() const { return _M_w; }
+
+  inline size_t _M_do_find_first(size_t __not_found) const;
+
+  // find the next "on" bit that follows "prev"
+  inline size_t _M_do_find_next(size_t __prev, size_t __not_found) const; 
+
+};
+
+
+// ------------------------------------------------------------
+//
+// Definitions of should-be-non-inline functions from the single-word version of
+//  _Base_bitset.
+//
+
+inline size_t 
+_Base_bitset<1UL>::_M_do_find_first(size_t __not_found) const
+{
+  //  typedef unsigned long _WordT;
+  _WordT __thisword = _M_w;
+
+  if ( __thisword != __STATIC_CAST(_WordT,0) ) {
+    // find byte within word
+    for ( size_t __j = 0; __j < sizeof(_WordT); __j++ ) {
+      unsigned char __this_byte
+        = __STATIC_CAST(unsigned char,(__thisword & (~(unsigned char)0)));
+      if ( __this_byte )
+        return __j*CHAR_BIT + _Bs_G<bool>::_S_first_one[__this_byte];
+
+      __thisword >>= CHAR_BIT;
+    }
+  }
+  // not found, so return a value that indicates failure.
+  return __not_found;
+}
+
+inline size_t 
+_Base_bitset<1UL>::_M_do_find_next(size_t __prev, 
+                                   size_t __not_found ) const
+{
+  // make bound inclusive
+  ++__prev;
+
+  // check out of bounds
+  if ( __prev >= __BITS_PER_WORD )
+    return __not_found;
+
+    // search first (and only) word
+  _WordT __thisword = _M_w;
+
+  // mask off bits below bound
+  __thisword &= (~__STATIC_CAST(_WordT,0)) << _S_whichbit(__prev);
+
+  if ( __thisword != __STATIC_CAST(_WordT,0) ) {
+    // find byte within word
+    // get first byte into place
+    __thisword >>= _S_whichbyte(__prev) * CHAR_BIT;
+    for ( size_t __j = _S_whichbyte(__prev); __j < sizeof(_WordT); __j++ ) {
+      unsigned char __this_byte
+        = __STATIC_CAST(unsigned char,(__thisword & (~(unsigned char)0)));
+      if ( __this_byte )
+        return __j*CHAR_BIT + _Bs_G<bool>::_S_first_one[__this_byte];
+
+      __thisword >>= CHAR_BIT;
+    }
+  }
+
+  // not found, so return a value that indicates failure.
+  return __not_found;
+} // end _M_do_find_next
+
+
+// ------------------------------------------------------------
+// Helper class to zero out the unused high-order bits in the highest word.
+
+template <size_t _Extrabits> struct _Sanitize {
+  static void _STLP_CALL _M_do_sanitize(unsigned long& __val)
+    { __val &= ~((~__STATIC_CAST(unsigned long,0)) << _Extrabits); }
+};
+
+_STLP_TEMPLATE_NULL struct _Sanitize<0UL> {
+  static void _STLP_CALL _M_do_sanitize(unsigned long) {}
+};
+
+// ------------------------------------------------------------
+// Class bitset.
+//   _Nb may be any nonzero number of type size_t.
+
+
+template<size_t _Nb>
+class bitset : public _Base_bitset<__BITSET_WORDS(_Nb) > 
+{
+public:
+  enum { _Words = __BITSET_WORDS(_Nb) } ;
+
+private:
+  typedef _Base_bitset< _Words > _Base;
+
+  void _M_do_sanitize() {
+    _Sanitize<_Nb%__BITS_PER_WORD >::_M_do_sanitize(this->_M_hiword());
+  }
+public:
+  typedef unsigned long _WordT;
+  struct reference;
+  friend struct reference;
+
+  // bit reference:
+  struct reference {
+  typedef _Base_bitset<_Words > _Bitset_base;
+  typedef bitset<_Nb> _Bitset;
+    //    friend _Bitset;
+    _WordT *_M_wp;
+    size_t _M_bpos;
+
+    // should be left undefined
+    reference() {}
+
+    reference( _Bitset& __b, size_t __pos ) {
+      _M_wp = &__b._M_getword(__pos);
+      _M_bpos = _Bitset_base::_S_whichbit(__pos);
+    }
+
+  public:
+    ~reference() {}
+
+    // for b[i] = __x;
+    reference& operator=(bool __x) {
+      if ( __x )
+        *_M_wp |= _Bitset_base::_S_maskbit(_M_bpos);
+      else
+        *_M_wp &= ~_Bitset_base::_S_maskbit(_M_bpos);
+
+      return *this;
+    }
+
+    // for b[i] = b[__j];
+    reference& operator=(const reference& __j) {
+      if ( (*(__j._M_wp) & _Bitset_base::_S_maskbit(__j._M_bpos)) )
+        *_M_wp |= _Bitset_base::_S_maskbit(_M_bpos);
+      else
+        *_M_wp &= ~_Bitset_base::_S_maskbit(_M_bpos);
+
+      return *this;
+    }
+
+    // flips the bit
+    bool operator~() const { return (*(_M_wp) & _Bitset_base::_S_maskbit(_M_bpos)) == 0; }
+
+    // for __x = b[i];
+    operator bool() const { return (*(_M_wp) & _Bitset_base::_S_maskbit(_M_bpos)) != 0; }
+
+    // for b[i].flip();
+    reference& flip() {
+      *_M_wp ^= _Bitset_base::_S_maskbit(_M_bpos);
+      return *this;
+    }
+  };
+
+  // 23.3.5.1 constructors:
+  bitset() {}
+
+  bitset(unsigned long __val) : _Base_bitset<_Words>(__val) { _M_do_sanitize(); }
+
+# ifdef _STLP_MEMBER_TEMPLATES
+  template<class _CharT, class _Traits, class _Alloc>
+  explicit bitset(const basic_string<_CharT,_Traits,_Alloc>& __s,
+                  size_t __pos = 0)
+    : _Base_bitset<_Words >() 
+  {
+    if (__pos > __s.size()) 
+      __stl_throw_out_of_range("bitset");
+    _M_copy_from_string(__s, __pos,
+                        basic_string<_CharT, _Traits, _Alloc>::npos);
+  }
+  template<class _CharT, class _Traits, class _Alloc>
+  bitset(const basic_string<_CharT, _Traits, _Alloc>& __s,
+          size_t __pos,
+          size_t __n)
+  : _Base_bitset<_Words >() 
+  {
+    if (__pos > __s.size()) 
+      __stl_throw_out_of_range("bitset");
+    _M_copy_from_string(__s, __pos, __n);
+  }
+#else /* _STLP_MEMBER_TEMPLATES */
+  explicit bitset(const string& __s,
+                  size_t __pos = 0,
+                  size_t __n = (size_t)-1) 
+    : _Base_bitset<_Words >() 
+  {
+    if (__pos > __s.size()) 
+      __stl_throw_out_of_range("bitset");
+    _M_copy_from_string(__s, __pos, __n);
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  // 23.3.5.2 bitset operations:
+  bitset<_Nb>& operator&=(const bitset<_Nb>& __rhs) {
+    this->_M_do_and(__rhs);
+    return *this;
+  }
+
+  bitset<_Nb>& operator|=(const bitset<_Nb>& __rhs) {
+    this->_M_do_or(__rhs);
+    return *this;
+  }
+
+  bitset<_Nb>& operator^=(const bitset<_Nb>& __rhs) {
+    this->_M_do_xor(__rhs);
+    return *this;
+  }
+
+  bitset<_Nb>& operator<<=(size_t __pos) {
+    this->_M_do_left_shift(__pos);
+    this->_M_do_sanitize();
+    return *this;
+  }
+
+  bitset<_Nb>& operator>>=(size_t __pos) {
+    this->_M_do_right_shift(__pos);
+    this->_M_do_sanitize();
+    return *this;
+  }
+
+  //
+  // Extension:
+  // Versions of single-bit set, reset, flip, test with no range checking.
+  //
+
+  bitset<_Nb>& _Unchecked_set(size_t __pos) {
+    this->_M_getword(__pos) |= _Base_bitset<_Words > ::_S_maskbit(__pos);
+    return *this;
+  }
+
+  bitset<_Nb>& _Unchecked_set(size_t __pos, int __val) {
+    if (__val)
+      this->_M_getword(__pos) |= this->_S_maskbit(__pos);
+    else
+      this->_M_getword(__pos) &= ~ this->_S_maskbit(__pos);
+
+    return *this;
+  }
+
+  bitset<_Nb>& _Unchecked_reset(size_t __pos) {
+    this->_M_getword(__pos) &= ~ this->_S_maskbit(__pos);
+    return *this;
+  }
+
+  bitset<_Nb>& _Unchecked_flip(size_t __pos) {
+    this->_M_getword(__pos) ^= this->_S_maskbit(__pos);
+    return *this;
+  }
+
+  bool _Unchecked_test(size_t __pos) const {
+    return (this->_M_getword(__pos) & this->_S_maskbit(__pos)) != __STATIC_CAST(_WordT,0);
+  }
+
+  // Set, reset, and flip.
+
+  bitset<_Nb>& set() {
+    this->_M_do_set();
+    this->_M_do_sanitize();
+    return *this;
+  }
+
+  bitset<_Nb>& set(size_t __pos) {
+    if (__pos >= _Nb)
+      __stl_throw_out_of_range("bitset");
+    return _Unchecked_set(__pos);
+  }
+
+  bitset<_Nb>& set(size_t __pos, int __val) {
+    if (__pos >= _Nb)
+      __stl_throw_out_of_range("bitset");
+    return _Unchecked_set(__pos, __val);
+  }
+
+  bitset<_Nb>& reset() {
+    this->_M_do_reset();
+    return *this;
+  }
+
+  bitset<_Nb>& reset(size_t __pos) {
+    if (__pos >= _Nb)
+      __stl_throw_out_of_range("bitset");
+
+    return _Unchecked_reset(__pos);
+  }
+
+  bitset<_Nb>& flip() {
+    this->_M_do_flip();
+    this->_M_do_sanitize();
+    return *this;
+  }
+
+  bitset<_Nb>& flip(size_t __pos) {
+    if (__pos >= _Nb)
+      __stl_throw_out_of_range("bitset");
+
+    return _Unchecked_flip(__pos);
+  }
+
+  bitset<_Nb> operator~() const { 
+    return bitset<_Nb>(*this).flip();
+  }
+
+  // element access:
+  //for b[i];
+  reference operator[](size_t __pos) { return reference(*this,__pos); }
+  bool operator[](size_t __pos) const { return _Unchecked_test(__pos); }
+
+  unsigned long to_ulong() const { return this->_M_do_to_ulong(); }
+
+#if defined (_STLP_MEMBER_TEMPLATES) && !  defined (_STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS)
+  template <class _CharT, class _Traits, class _Alloc>
+  basic_string<_CharT, _Traits, _Alloc> to_string() const {
+    basic_string<_CharT, _Traits, _Alloc> __result;
+    _M_copy_to_string(__result);
+    return __result;
+  }
+#else
+  string to_string() const {
+    string __result;
+    _M_copy_to_string(__result);
+    return __result;
+  }
+#endif /* _STLP_EXPLICIT_FUNCTION_TMPL_ARGS */
+
+  size_t count() const { return this->_M_do_count(); }
+
+  size_t size() const { return _Nb; }
+
+  bool operator==(const bitset<_Nb>& __rhs) const {
+    return this->_M_is_equal(__rhs);
+  }
+  bool operator!=(const bitset<_Nb>& __rhs) const {
+    return !this->_M_is_equal(__rhs);
+  }
+
+  bool test(size_t __pos) const {
+    if (__pos >= _Nb)
+      __stl_throw_out_of_range("bitset");
+    
+    return _Unchecked_test(__pos);
+  }
+
+  bool any() const { return this->_M_is_any(); }
+  bool none() const { return !this->_M_is_any(); }
+
+  bitset<_Nb> operator<<(size_t __pos) const { 
+    bitset<_Nb> __result(*this);
+    __result <<= __pos ;  return __result; 
+  }
+  bitset<_Nb> operator>>(size_t __pos) const { 
+    bitset<_Nb> __result(*this);
+    __result >>= __pos ;  return __result; 
+  }
+
+  //
+  // EXTENSIONS: bit-find operations.  These operations are
+  // experimental, and are subject to change or removal in future
+  // versions.
+  // 
+
+  // find the index of the first "on" bit
+  size_t _Find_first() const 
+    { return this->_M_do_find_first(_Nb); }
+
+  // find the index of the next "on" bit after prev
+  size_t _Find_next( size_t __prev ) const 
+    { return this->_M_do_find_next(__prev, _Nb); }
+
+//
+// Definitions of should-be non-inline member functions.
+//
+# if defined (_STLP_MEMBER_TEMPLATES)
+  template<class _CharT, class _Traits, class _Alloc>
+    void _M_copy_from_string(const basic_string<_CharT,_Traits,_Alloc>& __s,
+			     size_t __pos,
+			     size_t __n) {
+#else
+    void _M_copy_from_string(const string& __s,
+			     size_t __pos,
+			     size_t __n) {
+      typedef char_traits<char> _Traits;
+#endif
+      reset();
+      size_t __tmp = _Nb;
+      const size_t __Nbits = (min) (__tmp, (min) (__n, __s.size() - __pos));
+      for ( size_t __i= 0; __i < __Nbits; ++__i) {
+        typename _Traits::int_type __k = _Traits::to_int_type(__s[__pos + __Nbits - __i - 1]);
+        // boris : widen() ?
+        if (__k == '1')
+          set(__i);
+        else if (__k !='0')
+          __stl_throw_invalid_argument("bitset");
+      }
+    }
+  
+# if defined (_STLP_MEMBER_TEMPLATES)
+  template <class _CharT, class _Traits, class _Alloc>
+    void _M_copy_to_string(basic_string<_CharT, _Traits, _Alloc>& __s) const
+# else
+    void _M_copy_to_string(string& __s) const
+# endif
+    {
+      __s.assign(_Nb, '0');
+      
+      for (size_t __i = 0; __i < _Nb; ++__i) 
+	if (_Unchecked_test(__i))
+	  __s[_Nb - 1 - __i] = '1';
+    }
+
+# if defined (_STLP_NON_TYPE_TMPL_PARAM_BUG)
+  bitset<_Nb> operator&(const bitset<_Nb>& __y) const {
+    bitset<_Nb> __result(*this);
+    __result &= __y;
+    return __result;
+  }
+  bitset<_Nb> operator|(const bitset<_Nb>& __y) const {
+    bitset<_Nb> __result(*this);
+    __result |= __y;
+    return __result;
+  }
+  bitset<_Nb> operator^(const bitset<_Nb>& __y) const {
+    bitset<_Nb> __result(*this);
+    __result ^= __y;
+    return __result;
+  }
+# endif 
+
+};
+
+// ------------------------------------------------------------
+//
+// 23.3.5.3 bitset operations:
+//
+
+# if ! defined (_STLP_NON_TYPE_TMPL_PARAM_BUG)
+
+template <size_t _Nb>
+inline bitset<_Nb>  _STLP_CALL
+operator&(const bitset<_Nb>& __x,
+          const bitset<_Nb>& __y) {
+  bitset<_Nb> __result(__x);
+  __result &= __y;
+  return __result;
+}
+
+
+template <size_t _Nb>
+inline bitset<_Nb>  _STLP_CALL
+operator|(const bitset<_Nb>& __x,
+          const bitset<_Nb>& __y) {
+  bitset<_Nb> __result(__x);
+  __result |= __y;
+  return __result;
+}
+
+template <size_t _Nb>
+inline bitset<_Nb>  _STLP_CALL
+operator^(const bitset<_Nb>& __x,
+          const bitset<_Nb>& __y) {
+  bitset<_Nb> __result(__x);
+  __result ^= __y;
+  return __result;
+}
+
+#if defined ( _STLP_USE_NEW_IOSTREAMS )
+
+template <class _CharT, class _Traits, size_t _Nb>
+basic_istream<_CharT, _Traits>&  _STLP_CALL
+operator>>(basic_istream<_CharT, _Traits>& __is, bitset<_Nb>& __x);
+
+
+template <class _CharT, class _Traits, size_t _Nb>
+basic_ostream<_CharT, _Traits>& _STLP_CALL
+operator<<(basic_ostream<_CharT, _Traits>& __os, const bitset<_Nb>& __x);
+
+#elif ! defined ( _STLP_USE_NO_IOSTREAMS )
+
+// (reg) For Watcom IO, this tells if ostream class is in .exe or in .dll
+template <size_t _Nb>
+_ISTREAM_DLL& _STLP_CALL
+operator>>(_ISTREAM_DLL& __is, bitset<_Nb>& __x);
+
+template <size_t _Nb>
+inline _OSTREAM_DLL&  _STLP_CALL operator<<(_OSTREAM_DLL& __os, const bitset<_Nb>& __x) {
+  string __tmp;
+  __x._M_copy_to_string(__tmp);
+  return __os << __tmp;
+}
+
+#endif
+
+# endif /* _STLP_NON_TYPE_TMPL_PARAM_BUG */
+
+#  undef  bitset
+
+
+_STLP_END_NAMESPACE
+
+#  undef __BITS_PER_WORD
+#  undef __BITSET_WORDS
+
+# if !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_bitset.c>
+# endif
+
+#endif /* _STLP_BITSET_H */
+
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_bvector.h b/main/source/stlport/stlport/stl/_bvector.h
new file mode 100644
index 00000000..cf366378
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_bvector.h
@@ -0,0 +1,807 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_BVECTOR_H
+#define _STLP_INTERNAL_BVECTOR_H
+
+#ifndef _STLP_INTERNAL_VECTOR_H
+# include <stl/_vector.h>
+# endif
+
+#define __WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
+
+_STLP_BEGIN_NAMESPACE 
+
+struct _Bit_reference {
+  unsigned int* _M_p;
+  unsigned int _M_mask;
+  _Bit_reference(unsigned int* __x, unsigned int __y) 
+    : _M_p(__x), _M_mask(__y) {}
+
+public:
+  _Bit_reference() : _M_p(0), _M_mask(0) {}
+
+  operator bool() const { 
+	  return !(!(*_M_p & _M_mask)); 
+  }
+  _Bit_reference& operator=(bool __x) {
+    if (__x)  *_M_p |= _M_mask;
+    else      *_M_p &= ~_M_mask;
+    return *this;
+  }
+  _Bit_reference& operator=(const _Bit_reference& __x) {
+	  return *this = bool(__x); 
+  }
+  bool operator==(const _Bit_reference& __x) const {
+	  return bool(*this) == bool(__x); 
+  }
+  bool operator<(const _Bit_reference& __x) const {
+    return !bool(*this) && bool(__x);
+  }
+
+  _Bit_reference& operator |= (bool __x) {
+	  if (__x)
+		  *_M_p |= _M_mask;
+	  return *this;
+  }
+  _Bit_reference& operator &= (bool __x) {
+	  if (!__x)
+		  *_M_p &= ~_M_mask;
+	  return *this;
+  }
+  void flip() { *_M_p ^= _M_mask; }
+};
+
+
+inline void swap(_Bit_reference& __x, _Bit_reference& __y)
+{
+  bool __tmp = (bool)__x;
+  __x = __y;
+  __y = __tmp;
+}
+
+struct _Bit_iterator_base;
+
+struct _Bit_iterator_base
+{
+  typedef ptrdiff_t difference_type;
+
+  unsigned int* _M_p;
+  unsigned int  _M_offset;
+
+  void _M_bump_up() {
+    if (_M_offset++ == __WORD_BIT - 1) {
+      _M_offset = 0;
+      ++_M_p;
+    }
+  }
+
+  void _M_bump_down() {
+    if (_M_offset-- == 0) {
+      _M_offset = __WORD_BIT - 1;
+      --_M_p;
+    }
+  }
+
+  _Bit_iterator_base() : _M_p(0), _M_offset(0) {}
+  _Bit_iterator_base(unsigned int* __x, unsigned int __y) : _M_p(__x), _M_offset(__y) {}
+  //  _Bit_iterator_base( const _Bit_iterator_base& __x) : _M_p(__x._M_p), _M_offset(__x._M_offset) {}
+  //  _Bit_iterator_base& operator = ( const _Bit_iterator_base& __x) { _M_p = __x._M_p ; _M_offset = __x._M_offset ; return *this; }
+
+  void _M_advance (difference_type __i) {
+    difference_type __n = __i + _M_offset;
+    _M_p += __n / __WORD_BIT;
+    __n = __n % __WORD_BIT;
+    if (__n < 0) {
+      _M_offset = (unsigned int) __n + __WORD_BIT;
+      --_M_p;
+    } else
+      _M_offset = (unsigned int) __n;
+  }
+
+  difference_type _M_subtract(const _Bit_iterator_base& __x) const {
+    return __WORD_BIT * (_M_p - __x._M_p) + _M_offset - __x._M_offset;
+  }
+};
+
+inline bool  _STLP_CALL operator==(const _Bit_iterator_base& __x, const _Bit_iterator_base& __y) {
+  return __y._M_p == __x._M_p && __y._M_offset == __x._M_offset;
+}
+inline bool  _STLP_CALL operator!=(const _Bit_iterator_base& __x, const _Bit_iterator_base& __y) {
+  return __y._M_p != __x._M_p || __y._M_offset != __x._M_offset;
+}
+
+inline bool _STLP_CALL operator<(const _Bit_iterator_base& __x, const _Bit_iterator_base& __y) {
+  return __x._M_p < __y._M_p || (__x._M_p == __y._M_p && __x._M_offset < __y._M_offset);
+}
+
+inline bool _STLP_CALL operator>(const _Bit_iterator_base& __x, const _Bit_iterator_base& __y)  { 
+  return operator <(__y , __x); 
+}
+inline bool _STLP_CALL operator<=(const _Bit_iterator_base& __x, const _Bit_iterator_base& __y) { 
+  return !(__y < __x); 
+}
+inline bool _STLP_CALL operator>=(const _Bit_iterator_base& __x, const _Bit_iterator_base& __y) { 
+  return !(__x < __y); 
+}
+
+template <class _Ref, class _Ptr>
+struct _Bit_iter : public _Bit_iterator_base
+{
+  typedef _Ref  reference;
+  typedef _Ptr  pointer;
+  typedef _Bit_iter<_Ref, _Ptr> _Self;
+  typedef random_access_iterator_tag iterator_category;
+  typedef bool value_type;
+  typedef ptrdiff_t difference_type;
+  typedef size_t size_type;
+
+  _Bit_iter(unsigned int* __x, unsigned int __y) : _Bit_iterator_base(__x, __y) {}
+  _Bit_iter() {}
+
+  _Bit_iter(const _Bit_iter<_Bit_reference, _Bit_reference*>& __x): 
+    _Bit_iterator_base((const _Bit_iterator_base&)__x) {}
+
+  //  _Self& operator = (const _Bit_iter<_Bit_reference, _Bit_reference*>& __x)
+  //   { (_Bit_iterator_base&)*this = (const _Bit_iterator_base&)__x; return *this; }
+
+  reference operator*() const { 
+    return _Bit_reference(_M_p, 1UL << _M_offset); 
+  }
+  _Self& operator++() {
+    _M_bump_up();
+    return *this;
+  }
+  _Self operator++(int) {
+    _Self __tmp = *this;
+    _M_bump_up();
+    return __tmp;
+  }
+  _Self& operator--() {
+    _M_bump_down();
+    return *this;
+  }
+  _Self operator--(int) {
+    _Self __tmp = *this;
+    _M_bump_down();
+    return __tmp;
+  }
+  _Self& operator+=(difference_type __i) {
+    _M_advance(__i);
+    return *this;
+  }
+  _Self& operator-=(difference_type __i) {
+    *this += -__i;
+    return *this;
+  }
+  _Self operator+(difference_type __i) const {
+    _Self __tmp = *this;
+    return __tmp += __i;
+  }
+  _Self operator-(difference_type __i) const {
+    _Self __tmp = *this;
+    return __tmp -= __i;
+  }
+  difference_type operator-(const _Self& __x) const {
+    return _M_subtract(__x);
+  }
+  reference operator[](difference_type __i) { return *(*this + __i); }
+};
+
+template <class _Ref, class _Ptr>
+inline _Bit_iter<_Ref,_Ptr>  _STLP_CALL
+operator+(ptrdiff_t __n, const _Bit_iter<_Ref, _Ptr>& __x) {
+   return __x + __n;
+}
+
+# ifdef _STLP_USE_OLD_HP_ITERATOR_QUERIES
+inline random_access_iterator_tag  iterator_category(const _Bit_iterator_base&) {return random_access_iterator_tag();}
+inline ptrdiff_t* distance_type(const _Bit_iterator_base&) {return (ptrdiff_t*)0;}
+inline bool* value_type(const _Bit_iter<_Bit_reference, _Bit_reference*>&) {return (bool*)0;}
+inline bool* value_type(const _Bit_iter<bool, const bool*>&) {return (bool*)0;}
+# endif
+
+typedef _Bit_iter<bool, const bool*> _Bit_const_iterator;
+typedef _Bit_iter<_Bit_reference, _Bit_reference*> _Bit_iterator;
+
+// Bit-vector base class, which encapsulates the difference between
+//  old SGI-style allocators and standard-conforming allocators.
+
+
+template <class _Alloc>
+class _Bvector_base
+{
+public:
+  _STLP_FORCE_ALLOCATORS(bool, _Alloc)
+  typedef typename _Alloc_traits<bool, _Alloc>::allocator_type allocator_type;
+  typedef unsigned int __chunk_type;
+  typedef typename _Alloc_traits<__chunk_type, 
+          _Alloc>::allocator_type __chunk_allocator_type;
+  allocator_type get_allocator() const { 
+    return _STLP_CONVERT_ALLOCATOR((const __chunk_allocator_type&)_M_end_of_storage, bool); 
+  }
+  static allocator_type __get_dfl_allocator() { return allocator_type(); }
+   
+  _Bvector_base(const allocator_type& __a)
+    : _M_start(), _M_finish(), _M_end_of_storage(_STLP_CONVERT_ALLOCATOR(__a, __chunk_type),
+						 (__chunk_type*)0) {
+  }
+  ~_Bvector_base() { _M_deallocate();
+  }
+
+protected:
+
+  unsigned int* _M_bit_alloc(size_t __n) 
+    { return _M_end_of_storage.allocate((__n + __WORD_BIT - 1)/__WORD_BIT); }
+  void _M_deallocate() {
+    if (_M_start._M_p)
+      _M_end_of_storage.deallocate(_M_start._M_p,
+				   _M_end_of_storage._M_data - _M_start._M_p);
+  }
+
+  _Bit_iterator _M_start;
+  _Bit_iterator _M_finish;
+  _STLP_alloc_proxy<__chunk_type*, __chunk_type, __chunk_allocator_type> _M_end_of_storage;  
+};
+
+
+// The next few lines are confusing.  What we're doing is declaring a
+//  partial specialization of vector<T, Alloc> if we have the necessary
+//  compiler support.  Otherwise, we define a class bit_vector which uses
+//  the default allocator. 
+
+#if defined(_STLP_CLASS_PARTIAL_SPECIALIZATION) && ! defined(_STLP_NO_BOOL) && ! defined (__SUNPRO_CC)
+# define _STLP_VECBOOL_TEMPLATE
+# define __BVEC_TMPL_HEADER template <class _Alloc>
+#else
+# undef _STLP_VECBOOL_TEMPLATE
+# ifdef _STLP_NO_BOOL
+#  define __BVEC_TMPL_HEADER
+# else
+#  define __BVEC_TMPL_HEADER _STLP_TEMPLATE_NULL
+# endif
+# if !(defined(__MRC__)||(defined(__SC__)&&!defined(__DMC__)))			//*TY 12/17/2000 - 
+#  define _Alloc _STLP_DEFAULT_ALLOCATOR(bool)
+# else
+#  define _Alloc allocator<bool>
+# endif
+#endif
+
+#ifdef _STLP_NO_BOOL
+# define __BVECTOR_QUALIFIED bit_vector
+# define __BVECTOR           bit_vector
+#else
+# ifdef _STLP_VECBOOL_TEMPLATE
+#  define __BVECTOR_QUALIFIED __WORKAROUND_DBG_RENAME(vector) <bool, _Alloc>
+# else
+#  define __BVECTOR_QUALIFIED __WORKAROUND_DBG_RENAME(vector) <bool, allocator<bool> >
+# endif
+#if defined (_STLP_PARTIAL_SPEC_NEEDS_TEMPLATE_ARGS)
+# define __BVECTOR __BVECTOR_QUALIFIED
+#else
+# define __BVECTOR __WORKAROUND_DBG_RENAME(vector)
+#endif
+#endif
+
+
+__BVEC_TMPL_HEADER
+class __BVECTOR_QUALIFIED : public _Bvector_base<_Alloc >
+{
+  typedef _Bvector_base<_Alloc > _Base;
+  typedef __BVECTOR_QUALIFIED _Self;
+public:
+  typedef bool value_type;
+  typedef size_t size_type;
+  typedef ptrdiff_t difference_type; 
+  typedef _Bit_reference reference;
+  typedef bool const_reference;
+  typedef _Bit_reference* pointer;
+  typedef const bool* const_pointer;
+  typedef random_access_iterator_tag _Iterator_category;
+
+  typedef _Bit_iterator                iterator;
+  typedef _Bit_const_iterator          const_iterator;
+
+#if defined ( _STLP_CLASS_PARTIAL_SPECIALIZATION )
+  typedef _STLP_STD::reverse_iterator<const_iterator> const_reverse_iterator;
+  typedef _STLP_STD::reverse_iterator<iterator> reverse_iterator;
+#else /* _STLP_CLASS_PARTIAL_SPECIALIZATION */
+# if defined (_STLP_MSVC50_COMPATIBILITY)
+  typedef _STLP_STD::reverse_iterator<const_iterator, value_type, const_reference, 
+  const_pointer, difference_type> const_reverse_iterator;
+  typedef _STLP_STD::reverse_iterator<iterator, value_type, reference, reference*, 
+  difference_type> reverse_iterator;
+# else
+  typedef _STLP_STD::reverse_iterator<const_iterator, value_type, const_reference, 
+                                  difference_type> const_reverse_iterator;
+  typedef _STLP_STD::reverse_iterator<iterator, value_type, reference, difference_type>
+          reverse_iterator;
+# endif
+#endif /* _STLP_CLASS_PARTIAL_SPECIALIZATION */
+
+# ifdef _STLP_VECBOOL_TEMPLATE
+  typedef typename _Bvector_base<_Alloc >::allocator_type allocator_type;
+  typedef typename _Bvector_base<_Alloc >::__chunk_type __chunk_type ;
+# else
+  typedef _Bvector_base<_Alloc >::allocator_type allocator_type;
+  typedef _Bvector_base<_Alloc >::__chunk_type __chunk_type ;
+# endif
+
+protected:
+
+  void _M_initialize(size_type __n) {
+    unsigned int* __q = this->_M_bit_alloc(__n);
+    this->_M_end_of_storage._M_data = __q + (__n + __WORD_BIT - 1)/__WORD_BIT;
+    this->_M_start = iterator(__q, 0);
+    this->_M_finish = this->_M_start + difference_type(__n);
+  }
+  void _M_insert_aux(iterator __position, bool __x) {
+    if (this->_M_finish._M_p != this->_M_end_of_storage._M_data) {
+      __copy_backward(__position, this->_M_finish, this->_M_finish + 1, random_access_iterator_tag(), (difference_type*)0 );
+      *__position = __x;
+      ++this->_M_finish;
+    }
+    else {
+      size_type __len = size() ? 2 * size() : __WORD_BIT;
+      unsigned int* __q = this->_M_bit_alloc(__len);
+      iterator __i = copy(begin(), __position, iterator(__q, 0));
+      *__i++ = __x;
+      this->_M_finish = copy(__position, end(), __i);
+      this->_M_deallocate();
+      this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
+      this->_M_start = iterator(__q, 0);
+    }
+  }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIterator>
+  void _M_initialize_range(_InputIterator __first, _InputIterator __last,
+			const input_iterator_tag &) {
+    this->_M_start = iterator();
+    this->_M_finish = iterator();
+    this->_M_end_of_storage._M_data = 0;
+    for ( ; __first != __last; ++__first) 
+      push_back(*__first);
+  }
+
+  template <class _ForwardIterator>
+  void _M_initialize_range(_ForwardIterator __first, _ForwardIterator __last,
+                           const forward_iterator_tag &) {
+    size_type __n = distance(__first, __last);
+    _M_initialize(__n);
+    //    copy(__first, __last, _M_start);
+    copy(__first, __last, this->_M_start); // dwa 12/22/99 -- resolving ambiguous reference.
+  }
+
+  template <class _InputIterator>
+  void _M_insert_range(iterator __pos,
+                       _InputIterator __first, _InputIterator __last,
+                       const input_iterator_tag &) {
+    for ( ; __first != __last; ++__first) {
+      __pos = insert(__pos, *__first);
+      ++__pos;
+    }
+  }
+
+  template <class _ForwardIterator>
+  void _M_insert_range(iterator __position,
+                       _ForwardIterator __first, _ForwardIterator __last,
+                       const forward_iterator_tag &) {
+    if (__first != __last) {
+      size_type __n = distance(__first, __last);
+      if (capacity() - size() >= __n) {
+        __copy_backward(__position, end(), this->_M_finish + difference_type(__n), random_access_iterator_tag(), (difference_type*)0 );
+        copy(__first, __last, __position);
+        this->_M_finish += difference_type(__n);
+      }
+      else {
+        size_type __len = size() + (max)(size(), __n);
+        unsigned int* __q = this->_M_bit_alloc(__len);
+        iterator __i = copy(begin(), __position, iterator(__q, 0));
+        __i = copy(__first, __last, __i);
+        this->_M_finish = copy(__position, end(), __i);
+        this->_M_deallocate();
+        this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
+        this->_M_start = iterator(__q, 0);
+      }
+    }
+  }      
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+public:
+  iterator begin() { return this->_M_start; }
+  const_iterator begin() const { return this->_M_start; }
+  iterator end() { return this->_M_finish; }
+  const_iterator end() const { return this->_M_finish; }
+
+  reverse_iterator rbegin() { return reverse_iterator(end()); }
+  const_reverse_iterator rbegin() const { 
+    return const_reverse_iterator(end()); 
+  }
+  reverse_iterator rend() { return reverse_iterator(begin()); }
+  const_reverse_iterator rend() const { 
+    return const_reverse_iterator(begin()); 
+  }
+
+  size_type size() const { return size_type(end() - begin()); }
+  size_type max_size() const { return size_type(-1); }
+  size_type capacity() const {
+    return size_type(const_iterator(this->_M_end_of_storage._M_data, 0) - begin());
+  }
+  bool empty() const { return begin() == end(); }
+  reference operator[](size_type __n) 
+  { return *(begin() + difference_type(__n)); }
+  const_reference operator[](size_type __n) const 
+  { return *(begin() + difference_type(__n)); }
+
+  void _M_range_check(size_type __n) const {
+    if (__n >= this->size())
+      __stl_throw_range_error("vector<bool>");
+  }
+
+  reference at(size_type __n)
+    { _M_range_check(__n); return (*this)[__n]; }
+  const_reference at(size_type __n) const
+    { _M_range_check(__n); return (*this)[__n]; }
+
+  explicit __BVECTOR(const allocator_type& __a = allocator_type())
+    : _Bvector_base<_Alloc >(__a) {}
+
+  __BVECTOR(size_type __n, bool __val,
+            const allocator_type& __a = 
+	    allocator_type())
+    : _Bvector_base<_Alloc >(__a)
+  {
+    _M_initialize(__n);
+    fill(this->_M_start._M_p, (__chunk_type*)(this->_M_end_of_storage._M_data), __val ? ~0 : 0);
+  }
+
+  explicit __BVECTOR(size_type __n)
+    : _Bvector_base<_Alloc >(allocator_type())
+  {
+    _M_initialize(__n);
+    fill(this->_M_start._M_p, (__chunk_type*)(this->_M_end_of_storage._M_data), 0);
+  }
+
+  __BVECTOR(const _Self& __x) : _Bvector_base<_Alloc >(__x.get_allocator()) {
+    _M_initialize(__x.size());
+    copy(__x.begin(), __x.end(), this->_M_start);
+  }
+
+#if defined (_STLP_MEMBER_TEMPLATES)
+  template <class _Integer>
+  void _M_initialize_dispatch(_Integer __n, _Integer __x, const __true_type&) {
+    _M_initialize(__n);
+    fill(this->_M_start._M_p, this->_M_end_of_storage._M_data, __x ? ~0 : 0);
+  }
+    
+  template <class _InputIterator>
+  void _M_initialize_dispatch(_InputIterator __first, _InputIterator __last,
+                              const __false_type&) {
+    _M_initialize_range(__first, __last, _STLP_ITERATOR_CATEGORY(__first, _InputIterator));
+  }
+# ifdef _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS
+  // Check whether it's an integral type.  If so, it's not an iterator.
+  template <class _InputIterator>
+  __BVECTOR(_InputIterator __first, _InputIterator __last)
+    : _Base(allocator_type())
+  {
+    typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
+    _M_initialize_dispatch(__first, __last, _Integral());
+  }
+# endif
+  template <class _InputIterator>
+  __BVECTOR(_InputIterator __first, _InputIterator __last,
+            const allocator_type& __a _STLP_ALLOCATOR_TYPE_DFL)
+    : _Base(__a)
+  {
+    typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
+    _M_initialize_dispatch(__first, __last, _Integral());
+  }
+#else /* _STLP_MEMBER_TEMPLATES */
+  __BVECTOR(const_iterator __first, const_iterator __last,
+            const allocator_type& __a = allocator_type())
+    : _Bvector_base<_Alloc >(__a)
+  {
+    size_type __n = distance(__first, __last);
+    _M_initialize(__n);
+    copy(__first, __last, this->_M_start);
+  }
+  __BVECTOR(const bool* __first, const bool* __last,
+            const allocator_type& __a = allocator_type())
+    : _Bvector_base<_Alloc >(__a)
+  {
+    size_type __n = distance(__first, __last);
+    _M_initialize(__n);
+    copy(__first, __last, this->_M_start);
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  ~__BVECTOR() { }
+
+  __BVECTOR_QUALIFIED& operator=(const __BVECTOR_QUALIFIED& __x) {
+    if (&__x == this) return *this;
+    if (__x.size() > capacity()) {
+      this->_M_deallocate();
+      _M_initialize(__x.size());
+    }
+    copy(__x.begin(), __x.end(), begin());
+    this->_M_finish = begin() + difference_type(__x.size());
+    return *this;
+  }
+
+  // assign(), a generalized assignment member function.  Two
+  // versions: one that takes a count, and one that takes a range.
+  // The range version is a member template, so we dispatch on whether
+  // or not the type is an integer.
+
+  void _M_fill_assign(size_t __n, bool __x) {
+    if (__n > size()) {
+      fill(this->_M_start._M_p, (__chunk_type*)(this->_M_end_of_storage._M_data), __x ? ~0 : 0);
+      insert(end(), __n - size(), __x);
+    }
+    else {
+      erase(begin() + __n, end());
+      fill(this->_M_start._M_p, (__chunk_type*)(this->_M_end_of_storage._M_data), __x ? ~0 : 0);
+    }
+  }
+  void assign(size_t __n, bool __x) { _M_fill_assign(__n, __x); }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+
+  template <class _InputIterator>
+  void assign(_InputIterator __first, _InputIterator __last) {
+    typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
+    _M_assign_dispatch(__first, __last, _Integral());
+  }
+
+  template <class _Integer>
+  void _M_assign_dispatch(_Integer __n, _Integer __val, const __true_type&)
+    { _M_fill_assign((size_t) __n, (bool) __val); }
+
+  template <class _InputIter>
+  void _M_assign_dispatch(_InputIter __first, _InputIter __last, const __false_type&)
+    { _M_assign_aux(__first, __last, _STLP_ITERATOR_CATEGORY(__first, _InputIter)); }
+
+  template <class _InputIterator>
+  void _M_assign_aux(_InputIterator __first, _InputIterator __last,
+                     const input_iterator_tag &) {
+    iterator __cur = begin();
+    for ( ; __first != __last && __cur != end(); ++__cur, ++__first)
+      *__cur = *__first;
+    if (__first == __last)
+      erase(__cur, end());
+    else
+      insert(end(), __first, __last);
+  }
+
+  template <class _ForwardIterator>
+  void _M_assign_aux(_ForwardIterator __first, _ForwardIterator __last,
+                     const forward_iterator_tag &) {
+    size_type __len = distance(__first, __last);
+    if (__len < size())
+      erase(copy(__first, __last, begin()), end());
+    else {
+      _ForwardIterator __mid = __first;
+      advance(__mid, size());
+      copy(__first, __mid, begin());
+      insert(end(), __mid, __last);
+    }
+  }    
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  void reserve(size_type __n) {
+    if (capacity() < __n) {
+      unsigned int* __q = this->_M_bit_alloc(__n);
+      _Bit_iterator __z(__q, 0);
+      this->_M_finish = copy(begin(), end(), __z);
+      this->_M_deallocate();
+      this->_M_start = iterator(__q, 0);
+      this->_M_end_of_storage._M_data = __q + (__n + __WORD_BIT - 1)/__WORD_BIT;
+    }
+  }
+
+  reference front() { return *begin(); }
+  const_reference front() const { return *begin(); }
+  reference back() { return *(end() - 1); }
+  const_reference back() const { return *(end() - 1); }
+  void push_back(bool __x) {
+    if (this->_M_finish._M_p != this->_M_end_of_storage._M_data) {
+      *(this->_M_finish) = __x;
+      ++this->_M_finish;
+    }
+    else
+      _M_insert_aux(end(), __x);
+  }
+  void swap(__BVECTOR_QUALIFIED& __x) {
+    _STLP_STD::swap(this->_M_start, __x._M_start);
+    _STLP_STD::swap(this->_M_finish, __x._M_finish);
+    _STLP_STD::swap(this->_M_end_of_storage, __x._M_end_of_storage);
+  }
+  iterator insert(iterator __position, bool __x = bool()) {
+    difference_type __n = __position - begin();
+    if (this->_M_finish._M_p != this->_M_end_of_storage._M_data && __position == end()) {
+      *(this->_M_finish) = __x;
+      ++this->_M_finish;
+    }
+    else
+      _M_insert_aux(__position, __x);
+    return begin() + __n;
+  }
+
+#if defined ( _STLP_MEMBER_TEMPLATES )
+
+  template <class _Integer>
+  void _M_insert_dispatch(iterator __pos, _Integer __n, _Integer __x,
+                          const __true_type&) {
+    _M_fill_insert(__pos, (size_type) __n, (bool) __x);
+  }
+
+  template <class _InputIterator>
+  void _M_insert_dispatch(iterator __pos,
+                          _InputIterator __first, _InputIterator __last,
+                          const __false_type&) {
+    _M_insert_range(__pos, __first, __last, _STLP_ITERATOR_CATEGORY(__first, _InputIterator));
+  }
+
+  // Check whether it's an integral type.  If so, it's not an iterator.
+  template <class _InputIterator>
+  void insert(iterator __position,
+              _InputIterator __first, _InputIterator __last) {
+    typedef typename _Is_integer<_InputIterator>::_Integral _Is_Integral;
+    _M_insert_dispatch(__position, __first, __last, _Is_Integral());
+  }
+#else /* _STLP_MEMBER_TEMPLATES */
+  void insert(iterator __position,
+              const_iterator __first, const_iterator __last) {
+    if (__first == __last) return;
+    size_type __n = distance(__first, __last);
+    if (capacity() - size() >= __n) {
+      __copy_backward(__position, end(), this->_M_finish + __n,
+                      random_access_iterator_tag(), (difference_type*)0 );
+      copy(__first, __last, __position);
+      this->_M_finish += __n;
+    }
+    else {
+      size_type __len = size() + (max)(size(), __n);
+      unsigned int* __q = this->_M_bit_alloc(__len);
+      iterator __i = copy(begin(), __position, iterator(__q, 0));
+      __i = copy(__first, __last, __i);
+      this->_M_finish = copy(__position, end(), __i);
+      this->_M_deallocate();
+      this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
+      this->_M_start = iterator(__q, 0);
+    }
+  }
+
+  void insert(iterator __position, const bool* __first, const bool* __last) {
+    if (__first == __last) return;
+    size_type __n = distance(__first, __last);
+    if (capacity() - size() >= __n) {
+      __copy_backward(__position, end(), this->_M_finish + __n, 
+                      random_access_iterator_tag(), (difference_type*)0 );
+      copy(__first, __last, __position);
+      this->_M_finish += __n;
+    }
+    else {
+      size_type __len = size() + (max)(size(), __n);
+      unsigned int* __q = this->_M_bit_alloc(__len);
+      iterator __i = copy(begin(), __position, iterator(__q, 0));
+      __i = copy(__first, __last, __i);
+      this->_M_finish = copy(__position, end(), __i);
+      this->_M_deallocate();
+      this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
+      this->_M_start = iterator(__q, 0);
+    }
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+  
+  void _M_fill_insert(iterator __position, size_type __n, bool __x) {
+    if (__n == 0) return;
+    if (capacity() - size() >= __n) {
+      __copy_backward(__position, end(), this->_M_finish + difference_type(__n), random_access_iterator_tag(), (difference_type*)0 );
+      fill(__position, __position + difference_type(__n), __x);
+      this->_M_finish += difference_type(__n);
+    }
+    else {
+      size_type __len = size() + (max)(size(), __n);
+      unsigned int* __q = this->_M_bit_alloc(__len);
+      iterator __i = copy(begin(), __position, iterator(__q, 0));
+      fill_n(__i, __n, __x);
+      this->_M_finish = copy(__position, end(), __i + difference_type(__n));
+      this->_M_deallocate();
+      this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
+      this->_M_start = iterator(__q, 0);
+    }
+  }
+
+  void insert(iterator __position, size_type __n, bool __x) {
+    _M_fill_insert(__position, __n, __x);
+  }
+
+  void pop_back() {
+      --this->_M_finish; 
+  }
+  iterator erase(iterator __position) {
+    if (__position + 1 != end())
+      copy(__position + 1, end(), __position);
+      --this->_M_finish;
+    return __position;
+  }
+  iterator erase(iterator __first, iterator __last) {
+    this->_M_finish = copy(__last, end(), __first);
+    return __first;
+  }
+  void resize(size_type __new_size, bool __x = bool()) {
+    if (__new_size < size()) 
+      erase(begin() + difference_type(__new_size), end());
+    else
+      insert(end(), __new_size - size(), __x);
+  }
+  void flip() {
+    for (unsigned int* __p = this->_M_start._M_p; __p != this->_M_end_of_storage._M_data; ++__p)
+      *__p = ~*__p;
+  }
+
+  void clear() { erase(begin(), end()); }
+};
+
+# if defined  ( _STLP_NO_BOOL ) || defined (__HP_aCC) // fixed soon (03/17/2000)
+ 
+#define _STLP_TEMPLATE_HEADER __BVEC_TMPL_HEADER
+#define _STLP_TEMPLATE_CONTAINER __BVECTOR_QUALIFIED
+#include <stl/_relops_cont.h>
+#undef _STLP_TEMPLATE_CONTAINER
+#undef _STLP_TEMPLATE_HEADER
+  
+# endif /* NO_BOOL */
+  
+#if !defined (_STLP_NO_BOOL)
+// This typedef is non-standard.  It is provided for backward compatibility.
+  typedef __WORKAROUND_DBG_RENAME(vector) <bool, allocator<bool> > bit_vector;
+#endif
+
+_STLP_END_NAMESPACE
+
+#undef _Alloc
+#undef _STLP_VECBOOL_TEMPLATE
+#undef __BVECTOR
+#undef __BVECTOR_QUALIFIED
+#undef __BVEC_TMPL_HEADER
+
+# undef __WORD_BIT
+
+#endif /* _STLP_INTERNAL_BVECTOR_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_check_config.h b/main/source/stlport/stlport/stl/_check_config.h
new file mode 100644
index 00000000..a5b14397
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_check_config.h
@@ -0,0 +1,37 @@
+// This file is reserved to site configuration purpose
+// and should NEVER be overridden by user
+
+# if defined ( _STLP_NO_OWN_IOSTREAMS )
+
+// User choose not to use SGI iostreams, which means no
+// precompiled library will be used and he is free to override
+// any STLport configuration flags
+
+# else
+
+// The following will be defined in stl_config.h :
+// # define _STLP_OWN_IOSTREAMS 1
+# endif
+
+/*
+ *  Consistency check : if we use SGI iostreams, we have to use consistent
+ *  thread model (single-threaded or multi-threaded) with the compiled library
+ *  
+ *  Default is multithreaded build. If you want to build and use single-threaded
+ *  STLport, please change _STLP_NOTHREADS configuration setting above and rebuild the library
+ *
+ */
+
+# if defined (_STLP_OWN_IOSTREAMS) \
+  && !defined (_STLP_NO_THREADS) && !defined (_REENTRANT)
+
+#  if defined(_MSC_VER) && !defined(__MWERKS__) && !defined (__COMO__) && !defined(_MT)
+#   error "Only multi-threaded runtime library may be linked with STLport!"  
+#  endif
+
+// boris : you may change that to build non-threadsafe STLport library
+#  if defined (__BUILDING_STLPORT) /* || defined (_STLP_DEBUG) */
+#   define _REENTRANT 1
+#  endif
+
+# endif
diff --git a/main/source/stlport/stlport/stl/_cmath.h b/main/source/stlport/stlport/stl/_cmath.h
new file mode 100644
index 00000000..6ce56844
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_cmath.h
@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_CMATH_H_HEADER
+# define _STLP_CMATH_H_HEADER
+
+# include <cmath>
+
+_STLP_BEGIN_NAMESPACE
+
+# ifdef _STLP_SAME_FUNCTION_NAME_RESOLUTION_BUG
+
+// this proxy is needed for some compilers to resolve problems
+// calling sqrt() from within sqrt(), etc.
+template <class _Tp>
+struct _STL_math_proxy {
+  static inline _Tp _do_abs(const _Tp& __x)     { return _STLP_VENDOR_CSTD::fabs(__x); } 
+  static inline _Tp _do_acos(const _Tp& __x)    { return _STLP_VENDOR_CSTD::acos(__x); } 
+  static inline _Tp _do_asin(const _Tp& __x)    { return _STLP_VENDOR_CSTD::asin(__x); } 
+  static inline _Tp _do_atan(const _Tp& __x)    { return _STLP_VENDOR_CSTD::atan(__x); } 
+  static inline _Tp _do_atan2(const _Tp& __x, const _Tp& __y)  { return _STLP_VENDOR_CSTD::atan2(__x, __y); } 
+  static inline _Tp _do_cos(const _Tp& __x)     { return _STLP_VENDOR_CSTD::cos(__x); } 
+  static inline _Tp _do_cosh(const _Tp& __x)    { return _STLP_VENDOR_CSTD::cosh(__x); } 
+  static inline _Tp _do_floor(const _Tp& __x)    { return _STLP_VENDOR_CSTD::floor(__x); } 
+  static inline _Tp _do_ceil(const _Tp& __x)    { return _STLP_VENDOR_CSTD::ceil(__x); } 
+  static inline _Tp _do_fmod(const _Tp& __x, const _Tp& __y)    { return _STLP_VENDOR_CSTD::fmod(__x, __y); } 
+  static inline _Tp _do_frexp(const _Tp& __x, int* __y)    { return _STLP_VENDOR_CSTD::frexp(__x, __y); } 
+  static inline _Tp _do_ldexp(const _Tp& __x, int __y)    { return _STLP_VENDOR_CSTD::ldexp(__x, __y); } 
+  static inline _Tp _do_modf(const _Tp& __x, double* __y) { return _STLP_VENDOR_CSTD::modf(__x, __y); }
+  static inline _Tp _do_log(const _Tp& __x)     { return _STLP_VENDOR_CSTD::log(__x); } 
+  static inline _Tp _do_log10(const _Tp& __x)   { return _STLP_VENDOR_CSTD::log10(__x); } 
+  static inline _Tp _do_pow(const _Tp& __x, const _Tp& __y)    { return _STLP_VENDOR_CSTD::pow(__x, __y); } 
+  static inline _Tp _do_pow(const _Tp& __x, int __y)    { return _STLP_VENDOR_CSTD::pow(__x, __y); } 
+  static inline _Tp _do_sin(const _Tp& __x)     { return _STLP_VENDOR_CSTD::sin(__x); } 
+  static inline _Tp _do_sinh(const _Tp& __x)    { return _STLP_VENDOR_CSTD::sinh(__x); } 
+
+  static inline _Tp _do_sqrt(const _Tp& __x)    { return _STLP_VENDOR_CSTD::sqrt(__x); } 
+  static inline _Tp _do_tan(const _Tp& __x)     { return _STLP_VENDOR_CSTD::tan(__x); } 
+  static inline _Tp _do_tanh(const _Tp& __x)    { return _STLP_VENDOR_CSTD::tanh(__x); } 
+  static inline _Tp _do_exp(const _Tp& __x)     { return _STLP_VENDOR_CSTD::exp(__x); } 
+  static inline _Tp _do_hypot(const _Tp& __x, const _Tp& __y)   { return _STLP_VENDOR_CSTD::hypot(__x, __y); } 
+};
+
+#  define _STLP_DO_ABS(_Tp)   _STL_math_proxy<_Tp>::_do_abs
+#  define _STLP_DO_ACOS(_Tp)  _STL_math_proxy<_Tp>::_do_acos
+#  define _STLP_DO_ASIN(_Tp)  _STL_math_proxy<_Tp>::_do_asin
+#  define _STLP_DO_ATAN(_Tp)  _STL_math_proxy<_Tp>::_do_atan
+#  define _STLP_DO_ATAN2(_Tp) _STL_math_proxy<_Tp>::_do_atan2
+#  define _STLP_DO_COS(_Tp)   _STL_math_proxy<_Tp>::_do_cos
+#  define _STLP_DO_COSH(_Tp)  _STL_math_proxy<_Tp>::_do_cosh
+#  define _STLP_DO_FLOOR(_Tp) _STL_math_proxy<_Tp>::_do_floor
+#  define _STLP_DO_CEIL(_Tp) _STL_math_proxy<_Tp>::_do_ceil
+#  define _STLP_DO_FMOD(_Tp) _STL_math_proxy<_Tp>::_do_fmod
+#  define _STLP_DO_FREXP(_Tp) _STL_math_proxy<_Tp>::_do_frexp
+#  define _STLP_DO_LDEXP(_Tp) _STL_math_proxy<_Tp>::_do_ldexp
+#  define _STLP_DO_MODF(_Tp) _STL_math_proxy<_Tp>::_do_modf
+#  define _STLP_DO_LOG(_Tp)   _STL_math_proxy<_Tp>::_do_log
+#  define _STLP_DO_LOG10(_Tp) _STL_math_proxy<_Tp>::_do_log10
+#  define _STLP_DO_POW(_Tp)   _STL_math_proxy<_Tp>::_do_pow
+#  define _STLP_DO_SIN(_Tp)   _STL_math_proxy<_Tp>::_do_sin
+#  define _STLP_DO_SINH(_Tp)  _STL_math_proxy<_Tp>::_do_sinh
+#  define _STLP_DO_SQRT(_Tp)  _STL_math_proxy<_Tp>::_do_sqrt
+#  define _STLP_DO_TAN(_Tp)   _STL_math_proxy<_Tp>::_do_tan
+#  define _STLP_DO_TANH(_Tp)  _STL_math_proxy<_Tp>::_do_tanh
+#  define _STLP_DO_EXP(_Tp)   _STL_math_proxy<_Tp>::_do_exp
+#  define _STLP_DO_HYPOT(_Tp) _STL_math_proxy<_Tp>::_do_hypot
+# else
+
+#  define _STLP_DO_ABS(_Tp)   _STLP_VENDOR_CSTD::fabs
+#  define _STLP_DO_ACOS(_Tp)  _STLP_VENDOR_CSTD::acos
+#  define _STLP_DO_ASIN(_Tp)  _STLP_VENDOR_CSTD::asin
+#  define _STLP_DO_ATAN(_Tp)  _STLP_VENDOR_CSTD::atan
+#  define _STLP_DO_ATAN2(_Tp) _STLP_VENDOR_CSTD::atan2
+#  define _STLP_DO_COS(_Tp)   _STLP_VENDOR_CSTD::cos
+#  define _STLP_DO_COSH(_Tp)  _STLP_VENDOR_CSTD::cosh
+#  define _STLP_DO_FLOOR(_Tp)  _STLP_VENDOR_CSTD::floor
+#  define _STLP_DO_CEIL(_Tp)   _STLP_VENDOR_CSTD::ceil
+#  define _STLP_DO_FMOD(_Tp)   _STLP_VENDOR_CSTD::fmod
+#  define _STLP_DO_FREXP(_Tp) _STLP_VENDOR_CSTD::frexp
+#  define _STLP_DO_LDEXP(_Tp) _STLP_VENDOR_CSTD::ldexp
+#  define _STLP_DO_MODF(_Tp) _STLP_VENDOR_CSTD::modf
+#  define _STLP_DO_LOG(_Tp)   _STLP_VENDOR_CSTD::log
+#  define _STLP_DO_LOG10(_Tp) _STLP_VENDOR_CSTD::log10
+#  define _STLP_DO_POW(_Tp)   _STLP_VENDOR_CSTD::pow
+#  define _STLP_DO_SIN(_Tp)   _STLP_VENDOR_CSTD::sin
+#  define _STLP_DO_SINH(_Tp)  _STLP_VENDOR_CSTD::sinh
+#  define _STLP_DO_SQRT(_Tp)  _STLP_VENDOR_CSTD::sqrt
+#  define _STLP_DO_TAN(_Tp)   _STLP_VENDOR_CSTD::tan
+#  define _STLP_DO_TANH(_Tp)  _STLP_VENDOR_CSTD::tanh
+#  define _STLP_DO_EXP(_Tp)   _STLP_VENDOR_CSTD::exp
+//# if defined (__GNUC__) || defined ( __IBMCPP__ ) || defined (__SUNPRO_CC) || defined (__HP_aCC) || (_MSC_VER >= 1310)
+#  define _STLP_DO_HYPOT(_Tp) ::hypot
+// # else
+// #  define _STLP_DO_HYPOT(_Tp) _STLP_VENDOR_CSTD::hypot
+// # endif
+
+# endif
+
+_STLP_END_NAMESPACE
+
+# if (defined (_STLP_HAS_NO_NEW_C_HEADERS) || defined(_STLP_MSVC) || defined (__ICL)) && !defined (_STLP_HAS_NO_NAMESPACES)
+
+#if ! defined (_STLP_USE_NEW_C_HEADERS) 
+
+_STLP_BEGIN_NAMESPACE
+
+#  ifndef _STLP_HAS_NATIVE_FLOAT_ABS
+inline double abs(double __x)                 { return _STLP_DO_ABS(double)(__x); }
+inline float abs (float __x)                  { return _STLP_DO_ABS(float)(__x); }
+#  endif
+
+inline double pow(double __x, int __y)        { return _STLP_DO_POW(double)(__x, __y); }
+inline float acos (float __x)                 { return _STLP_DO_ACOS(float)(__x); }
+inline float asin (float __x)                 { return _STLP_DO_ASIN(float)(__x); }
+inline float atan (float __x)                 { return _STLP_DO_ATAN(float)(__x); }
+inline float atan2(float __x, float __y)      { return _STLP_DO_ATAN2(float)(__x, __y); }
+inline float ceil (float __x)                 { return _STLP_DO_CEIL(float)(__x); }
+inline float cos (float __x)                  { return _STLP_DO_COS(float)(__x); }
+inline float cosh (float __x)                 { return _STLP_DO_COSH(float)(__x); }
+inline float exp (float __x)                  { return _STLP_DO_EXP(float)(__x); }
+# ifdef _STLP_USE_NAMESPACES
+inline float fabs (float __x)                 { return _STLP_DO_ABS(float)(__x); }
+# endif
+inline float floor(float __x)                 { return _STLP_DO_FLOOR(float)(__x); }
+inline float fmod (float __x, float __y)      { return _STLP_DO_FMOD(float)(__x, __y); }
+inline float frexp(float __x, int* __y)       { return _STLP_DO_FREXP(float)(__x, __y); }
+inline float ldexp(float __x, int __y)        { return _STLP_DO_LDEXP(float)(__x, __y); }
+// fbp : float versions are not always available
+#if !defined(_STLP_VENDOR_LONG_DOUBLE_MATH)		//*ty 11/25/2001 - 
+inline float modf (float __x, float* __y)     { 
+  double __dd[2]; 
+  double __res = _STLP_DO_MODF(double)((double)__x, __dd); 
+  __y[0] = (float)__dd[0] ; __y[1] = (float)__dd[1]; 
+  return (float)__res; 
+}
+#else		//*ty 11/25/2001 - i.e. for apple SCpp
+inline float modf (float __x, float* __y)     { 
+  long double __dd[2]; 
+  long double __res = _STLP_DO_MODF(long double)((long double)__x, __dd); 
+  __y[0] = (float)__dd[0] ; __y[1] = (float)__dd[1]; 
+  return (float)__res; 
+}
+#endif		//*ty 11/25/2001 - 
+
+inline float log (float __x)                  { return _STLP_DO_LOG(float)(__x); }
+inline float log10(float __x)                 { return _STLP_DO_LOG10(float)(__x); }
+inline float pow (float __x, float __y)       { return _STLP_DO_POW(float)(__x, __y); }
+inline float pow (float __x, int __y)         { return _STLP_DO_POW(float)(__x, __y); }
+inline float sin (float __x)                  { return _STLP_DO_SIN(float)(__x); }
+inline float sinh (float __x)                 { return _STLP_DO_SINH(float)(__x); }
+inline float sqrt (float __x)                 { return _STLP_DO_SQRT(float)(__x); }
+inline float tan (float __x)                  { return _STLP_DO_TAN(float)(__x); }
+inline float tanh (float __x)                 { return _STLP_DO_TANH(float)(__x); }
+
+#  if ! (defined  (_STLP_NO_LONG_DOUBLE) || defined(_STLP_VENDOR_LONG_DOUBLE_MATH))
+
+#if !defined (__MVS__)
+inline long double abs (long double __x)                  { return _STLP_DO_ABS(long double)((double)__x); }
+#endif
+inline long double acos (long double __x)                 { return _STLP_DO_ACOS(long double)(__x); }
+inline long double asin (long double __x)                 { return _STLP_DO_ASIN(long double)(__x); }
+inline long double atan (long double __x)                 { return _STLP_DO_ATAN(long double)(__x); }
+inline long double atan2(long double __x, long double __y)      { return _STLP_DO_ATAN2(long double)(__x, __y); }
+inline long double ceil (long double __x)                 { return _STLP_DO_CEIL(long double)(__x); }
+inline long double cos (long double __x)                  { return _STLP_DO_COS(long double)(__x); }
+inline long double cosh (long double __x)                 { return _STLP_DO_COSH(long double)(__x); }
+inline long double exp (long double __x)                  { return _STLP_DO_EXP(long double)(__x); }
+inline long double fabs (long double __x)                 { return _STLP_DO_ABS(long double)(__x); }
+inline long double floor(long double __x)                 { return _STLP_DO_FLOOR(long double)(__x); }
+inline long double fmod (long double __x, long double __y)      { return _STLP_DO_FMOD(long double)(__x, __y); }
+inline long double frexp(long double __x, int* __y)       { return _STLP_DO_FREXP(long double)(__x, __y); }
+inline long double ldexp(long double __x, int __y)        { return _STLP_DO_LDEXP(long double)(__x, __y); }
+// fbp : long double versions are not available
+inline long double modf (long double __x, long double* __y)     { 
+  double __dd[2]; 
+  double __res = _STLP_DO_MODF(double)((double)__x, __dd); 
+  __y[0] = (long double)__dd[0] ; __y[1] = (long double)__dd[1]; 
+  return (long double)__res; 
+}
+inline long double log (long double __x)                  { return _STLP_DO_LOG(long double)(__x); }
+inline long double log10(long double __x)                 { return _STLP_DO_LOG10(long double)(__x); }
+inline long double pow (long double __x, long double __y)       { return _STLP_DO_POW(long double)(__x, __y); }
+inline long double pow (long double __x, int __y)         { return _STLP_DO_POW(long double)(__x, __y); }
+inline long double sin (long double __x)                  { return _STLP_DO_SIN(long double)(__x); }
+inline long double sinh (long double __x)                 { return _STLP_DO_SINH(long double)(__x); }
+inline long double sqrt (long double __x)                 { return _STLP_DO_SQRT(long double)(__x); }
+inline long double tan (long double __x)                  { return _STLP_DO_TAN(long double)(__x); }
+inline long double tanh (long double __x)                 { return _STLP_DO_TANH(long double)(__x); }
+#  endif
+
+_STLP_END_NAMESPACE
+
+# endif /* NEW_C_HEADERS */
+# endif /* NEW_C_HEADERS */
+
+#endif /* CMATH_H */
diff --git a/main/source/stlport/stlport/stl/_codecvt.h b/main/source/stlport/stlport/stl/_codecvt.h
new file mode 100644
index 00000000..140dca0a
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_codecvt.h
@@ -0,0 +1,307 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+// WARNING: This is an internal header file, included by other C++
+// standard library headers.  You should not attempt to use this header
+// file directly.
+
+
+#ifndef _STLP_INTERNAL_CODECVT_H
+#define _STLP_INTERNAL_CODECVT_H
+
+# ifndef _STLP_C_LOCALE_H
+#  include <stl/c_locale.h>
+# endif
+# ifndef _STLP_INTERNAL_LOCALE_H
+#  include <stl/_locale.h>
+# endif
+
+_STLP_BEGIN_NAMESPACE
+
+class _STLP_CLASS_DECLSPEC codecvt_base {
+public:
+  enum result {ok, partial, error, noconv};
+};
+
+template <class _InternT, class _ExternT, class _StateT>
+class codecvt : public locale::facet, public codecvt_base {
+  typedef _InternT intern_type;
+  typedef _ExternT extern_type;
+  typedef _StateT state_type;
+};
+ 
+template <class _InternT, class _ExternT, class _StateT>
+class codecvt_byname : public codecvt<_InternT, _ExternT, _StateT> {};
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC codecvt<char, char, mbstate_t>
+  : public locale::facet, public codecvt_base 
+{
+  friend class _Locale;
+public:
+  typedef char       intern_type;
+  typedef char       extern_type;
+  typedef mbstate_t  state_type;
+
+  explicit codecvt(size_t __refs = 0) : _BaseFacet(__refs) {}
+
+  result out(state_type&  __state,
+             const char*  __from,
+             const char*  __from_end,
+             const char*& __from_next,
+             char*        __to,
+             char*        __to_limit, 
+             char*&       __to_next) const {
+    return do_out(__state, 
+                  __from, __from_end, __from_next,
+                  __to,   __to_limit, __to_next);
+  }
+
+  result unshift(mbstate_t& __state,
+                 char* __to, char* __to_limit, char*& __to_next) const
+    { return do_unshift(__state, __to, __to_limit, __to_next); }
+    
+  result in(state_type&   __state,
+            const char*  __from,
+            const char*  __from_end,  
+            const char*& __from_next,
+            char*        __to, 
+            char*        __to_limit, 
+            char*&       __to_next) const {
+    return do_in(__state,
+                 __from, __from_end, __from_next,
+                 __to,   __to_limit, __to_next);
+  }
+
+  int encoding() const _STLP_NOTHROW { return do_encoding(); }
+
+  bool always_noconv() const _STLP_NOTHROW { return do_always_noconv(); }
+
+  int length(const state_type& __state,
+             const char* __from, const char* __end,
+             size_t __max) const
+    { return do_length(__state, __from, __end, __max); }
+  
+  int max_length() const _STLP_NOTHROW { return do_max_length(); }
+
+  _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
+
+protected:
+  ~codecvt();
+
+  virtual result do_out(mbstate_t&   /* __state */,
+                        const char*  __from,
+                        const char*  /* __from_end */,
+                        const char*& __from_next,
+                        char*        __to,
+                        char*        /* __to_limit */,
+                        char*&       __to_next) const;
+
+  virtual result do_in (mbstate_t&   /* __state */ , 
+                        const char*  __from,
+                        const char*  /* __from_end */,
+                        const char*& __from_next,
+                        char*        __to,
+                        char*        /* __to_end */,
+                        char*&       __to_next) const;
+
+  virtual result do_unshift(mbstate_t& /* __state */,
+                            char*      __to,
+                            char*      /* __to_limit */,
+                            char*&     __to_next) const;
+
+  virtual int do_encoding() const _STLP_NOTHROW;
+  virtual bool do_always_noconv() const _STLP_NOTHROW;
+  virtual int do_length(const mbstate_t&         __state,
+                        const  char* __from, 
+                        const  char* __end,
+                        size_t __max) const;
+  virtual int do_max_length() const _STLP_NOTHROW;
+private:
+  codecvt(const codecvt<char, char, mbstate_t>&);
+  codecvt<char, char, mbstate_t>& operator =(const codecvt<char, char, mbstate_t>&); 
+};
+
+# ifndef _STLP_NO_WCHAR_T
+ 
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC codecvt<wchar_t, char, mbstate_t>
+  : public locale::facet, public codecvt_base
+{
+  friend class _Locale;
+public:
+  typedef wchar_t    intern_type;
+  typedef char       extern_type;
+  typedef mbstate_t  state_type;
+
+  explicit codecvt(size_t __refs = 0) : _BaseFacet(__refs) {}
+
+  result out(mbstate_t       __state,
+             const wchar_t*  __from,
+             const wchar_t*  __from_end,
+             const wchar_t*& __from_next,
+             char*           __to,
+             char*           __to_limit,
+             char*&          __to_next) const {
+    return do_out(__state,
+                  __from, __from_end, __from_next, 
+                  __to,   __to_limit, __to_next);
+  }
+
+  result unshift(mbstate_t& __state,
+                 char*  __to, char*  __to_limit, char*& __to_next) const {
+    return do_unshift(__state, __to, __to_limit, __to_next);
+  }
+    
+  result in(mbstate_t    __state,
+            const char*  __from,
+            const char*  __from_end,  
+            const char*& __from_next,
+            wchar_t*     __to, 
+            wchar_t*     __to_limit, 
+            wchar_t*&    __to_next) const {
+    return do_in(__state, 
+                 __from, __from_end, __from_next,
+                 __to,  __to_limit, __to_next);
+  }
+
+  int encoding() const _STLP_NOTHROW { return do_encoding(); }
+
+  bool always_noconv() const _STLP_NOTHROW { return do_always_noconv(); }
+
+  int length(const mbstate_t&        __state,
+             const char* __from,
+             const char* __end,
+             size_t             __max) const
+    { return do_length(__state, __from, __end, __max); }
+  
+  int max_length() const _STLP_NOTHROW { return do_max_length(); }
+
+  _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
+
+protected:
+  ~codecvt();
+
+  virtual result do_out(mbstate_t&         __state,
+                        const wchar_t*  __from,
+                        const wchar_t*  __from_end,
+                        const wchar_t*& __from_next,
+                        char*        __to,
+                        char*        __to_limit,
+                        char*&       __to_next) const;
+
+  virtual result do_in (mbstate_t&         __state,
+                        const char*  __from,
+                        const char*  __from_end,
+                        const char*& __from_next,
+                        wchar_t*        __to,
+                        wchar_t*        __to_limit,
+                        wchar_t*&       __to_next) const;
+
+  virtual result do_unshift(mbstate_t&   __state,
+                            char*  __to, 
+                            char*  __to_limit,
+                            char*& __to_next) const;
+
+  virtual int do_encoding() const _STLP_NOTHROW;
+
+  virtual bool do_always_noconv() const _STLP_NOTHROW;
+  
+  virtual int do_length(const mbstate_t& __state,
+                        const  char* __from, 
+                        const  char* __end,
+                        size_t __max) const;
+
+  virtual int do_max_length() const _STLP_NOTHROW;
+
+private:
+  codecvt(const codecvt<wchar_t, char, mbstate_t>&);
+  codecvt<wchar_t, char, mbstate_t>& operator = (const codecvt<wchar_t, char, mbstate_t>&);  
+};
+
+# endif
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC codecvt_byname<char, char, mbstate_t>
+  : public codecvt<char, char, mbstate_t> {
+public:
+  explicit codecvt_byname(const char* __name, size_t __refs = 0);
+  ~codecvt_byname();
+private:
+  codecvt_byname(const codecvt_byname<char, char, mbstate_t>&);
+  codecvt_byname<char, char, mbstate_t>& operator =(const codecvt_byname<char, char, mbstate_t>&);  
+};
+
+# ifndef _STLP_NO_WCHAR_T
+_STLP_TEMPLATE_NULL
+class codecvt_byname<wchar_t, char, mbstate_t>
+  : public codecvt<wchar_t, char, mbstate_t> 
+{
+public:
+  explicit codecvt_byname(const char * __name, size_t __refs = 0);    
+
+protected:
+  ~codecvt_byname();
+
+  virtual result do_out(mbstate_t&         __state,
+                        const wchar_t*  __from,
+                        const wchar_t*  __from_end,
+                        const wchar_t*& __from_next,
+                        char*        __to,
+                        char*        __to_limit,
+                        char*&       __to_next) const;
+
+  virtual result do_in (mbstate_t&         __state,
+                        const char*  __from,
+                        const char*  __from_end,
+                        const char*& __from_next,
+                        wchar_t*        __to,
+                        wchar_t*        __to_limit,
+                        wchar_t*&       __to_next) const;
+
+  virtual result do_unshift(mbstate_t&   __state,
+                            char*  __to, 
+                            char*  __to_limit,
+                            char*& __to_next) const;
+
+  virtual int do_encoding() const _STLP_NOTHROW;
+
+  virtual bool do_always_noconv() const _STLP_NOTHROW;
+  
+  virtual int do_length(const mbstate_t&         __state,
+                        const  char* __from, 
+                        const  char* __end,
+                        size_t __max) const;
+
+  virtual int do_max_length() const _STLP_NOTHROW;
+
+private:
+  _Locale_ctype* _M_ctype;
+  codecvt_byname(const codecvt_byname<wchar_t, char, mbstate_t>&);
+  codecvt_byname<wchar_t, char, mbstate_t>& operator =(const codecvt_byname<wchar_t, char, mbstate_t>&);  
+};
+
+# endif
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_INTERNAL_CODECVT_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_collate.h b/main/source/stlport/stlport/stl/_collate.h
new file mode 100644
index 00000000..a34329d0
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_collate.h
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+// WARNING: This is an internal header file, included by other C++
+// standard library headers.  You should not attempt to use this header
+// file directly.
+
+#ifndef _STLP_INTERNAL_COLLATE_H
+#define _STLP_INTERNAL_COLLATE_H
+
+#ifndef _STLP_C_LOCALE_H
+# include <stl/c_locale.h>
+#endif
+
+#ifndef _STLP_INTERNAL_LOCALE_H
+# include <stl/_locale.h>
+#endif
+
+#ifndef _STLP_STRING_H
+# include <stl/_string.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+
+template <class _CharT> class collate {};
+template <class _CharT> class collate_byname {};
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC collate<char> : public locale::facet 
+{
+  friend class _Locale;
+public:
+  typedef char   char_type;
+  typedef string string_type;
+
+  explicit collate(size_t __refs = 0) : _BaseFacet(__refs) {}
+
+  int compare(const char* __low1, const char* __high1,
+              const char* __low2, const char* __high2) const {
+    return do_compare( __low1, __high1, __low2, __high2);
+  }
+
+  string_type transform(const char* __low, const char* __high) const {
+    return do_transform(__low, __high);
+  }
+
+  long hash(const char* __low, const char* __high) const
+    { return do_hash(__low, __high); }
+
+  _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
+
+protected:
+  ~collate();
+
+  virtual int do_compare(const char*, const char*,
+                         const char*, const char*) const;
+  virtual string_type do_transform(const char*, const char*) const;
+  virtual long do_hash(const char*, const char*) const;
+private:
+  collate(const collate<char>&);
+  collate<char>& operator =(const collate<char>&);  
+};
+
+# ifndef _STLP_NO_WCHAR_T
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC collate<wchar_t> : public locale::facet 
+{
+  friend class _Locale;
+public:
+  typedef wchar_t char_type;
+  typedef wstring string_type;
+
+  explicit collate(size_t __refs = 0) : _BaseFacet(__refs) {}
+
+  int compare(const wchar_t* __low1, const wchar_t* __high1,
+              const wchar_t* __low2, const wchar_t* __high2) const {
+    return do_compare( __low1, __high1, __low2, __high2);
+  }
+
+  string_type transform(const wchar_t* __low, const wchar_t* __high) const {
+    return do_transform(__low, __high);
+  }
+
+  long hash(const wchar_t* __low, const wchar_t* __high) const
+    { return do_hash(__low, __high); }
+
+  _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
+
+protected:
+  ~collate();
+
+  virtual int do_compare(const wchar_t*, const wchar_t*,
+                         const wchar_t*, const wchar_t*) const;
+  virtual string_type do_transform(const wchar_t*, const wchar_t*) const;
+  virtual long do_hash(const wchar_t* __low, const wchar_t* __high) const;
+private:
+  collate(const collate<wchar_t>&);
+  collate<wchar_t>& operator = (const collate<wchar_t>&);  
+};
+
+# endif /* NO_WCHAR_T */
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC collate_byname<char>: public collate<char> 
+{
+public:
+  explicit collate_byname(const char* __name, size_t __refs = 0);
+
+protected:
+  ~collate_byname();
+
+  virtual int do_compare(const char*, const char*,
+                         const char*, const char*) const;
+  virtual string_type do_transform(const char*, const char*) const;
+
+private:
+  _Locale_collate* _M_collate;
+  collate_byname(const collate_byname<char>&);
+  collate_byname<char>& operator =(const collate_byname<char>&);  
+};
+
+# ifndef _STLP_NO_WCHAR_T
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC collate_byname<wchar_t>: public collate<wchar_t> 
+{
+public:
+  explicit collate_byname(const char * __name, size_t __refs = 0);
+
+protected:
+  ~collate_byname();
+
+  virtual int do_compare(const wchar_t*, const wchar_t*,
+                         const wchar_t*, const wchar_t*) const;
+  virtual string_type do_transform(const wchar_t*, const wchar_t*) const;
+
+private:
+  _Locale_collate* _M_collate;
+  collate_byname(const collate_byname<wchar_t>&);
+  collate_byname<wchar_t>& operator =(const collate_byname<wchar_t>&);  
+};
+
+# endif /* NO_WCHAR_T */
+
+
+template <class _CharT>
+bool 
+__locale_do_operator_call (const locale* __that, 
+                           const basic_string<_CharT, char_traits<_CharT>, allocator<_CharT> >& __x,
+                           const basic_string<_CharT, char_traits<_CharT>, allocator<_CharT> >& __y) 
+{
+  collate<_CharT>* __f = (collate<_CharT>*)__that->_M_get_facet(collate<_CharT>::id);
+  if (!__f)
+    __that->_M_throw_runtime_error();
+  return __f->compare(__x.data(), __x.data() + __x.size(),
+                      __y.data(), __y.data() + __y.size()) < 0;
+  
+}
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_INTERNAL_COLLATE_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_complex.c b/main/source/stlport/stlport/stl/_complex.c
new file mode 100644
index 00000000..2ab9d773
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_complex.c
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+#ifndef _STLP_COMPLEX_C
+#define _STLP_COMPLEX_C
+
+# ifndef _STLP_internal_complex_h
+#  include <stl/_complex.h>
+# endif
+
+#include <istream>
+
+#ifdef _STLP_USE_NEW_IOSTREAMS
+# include <sstream>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+// Non-inline member functions.
+
+template <class _Tp>
+void complex<_Tp>::_div(const _Tp& __z1_r, const _Tp& __z1_i,
+                        const _Tp& __z2_r, const _Tp& __z2_i,
+                        _Tp& __res_r, _Tp& __res_i) {
+  _Tp __ar = __z2_r >= 0 ? __z2_r : -__z2_r;
+  _Tp __ai = __z2_i >= 0 ? __z2_i : -__z2_i;
+
+  if (__ar <= __ai) {
+    _Tp __ratio = __z2_r / __z2_i;
+    _Tp __denom = __z2_i * (1 + __ratio * __ratio);
+    __res_r = (__z1_r * __ratio + __z1_i) / __denom;
+    __res_i = (__z1_i * __ratio - __z1_r) / __denom;
+  }
+  else {
+    _Tp __ratio = __z2_i / __z2_r;
+    _Tp __denom = __z2_r * (1 + __ratio * __ratio);
+    __res_r = (__z1_r + __z1_i * __ratio) / __denom;
+    __res_i = (__z1_i - __z1_r * __ratio) / __denom;
+  }
+}
+
+template <class _Tp>
+void complex<_Tp>::_div(const _Tp& __z1_r,
+                        const _Tp& __z2_r, const _Tp& __z2_i,
+                        _Tp& __res_r, _Tp& __res_i) {
+  _Tp __ar = __z2_r >= 0 ? __z2_r : -__z2_r;
+  _Tp __ai = __z2_i >= 0 ? __z2_i : -__z2_i;
+
+  if (__ar <= __ai) {
+    _Tp __ratio = __z2_r / __z2_i;
+    _Tp __denom = __z2_i * (1 + __ratio * __ratio);
+    __res_r = (__z1_r * __ratio) / __denom;
+    __res_i = - __z1_r / __denom;
+  }
+  else {
+    _Tp __ratio = __z2_i / __z2_r;
+    _Tp __denom = __z2_r * (1 + __ratio * __ratio);
+    __res_r = __z1_r / __denom;
+    __res_i = - (__z1_r * __ratio) / __denom;
+  }
+}
+
+// I/O.
+
+#ifdef _STLP_USE_NEW_IOSTREAMS
+
+// Complex output, in the form (re,im).  We use a two-step process 
+// involving stringstream so that we get the padding right.  
+template <class _Tp, class _CharT, class _Traits>
+basic_ostream<_CharT, _Traits>& _STLP_CALL
+operator<<(basic_ostream<_CharT, _Traits>& __os, const complex<_Tp>& __z)
+{
+  basic_ostringstream<_CharT, _Traits, allocator<_CharT> > __tmp;
+  __tmp.flags(__os.flags());
+  __tmp.imbue(__os.getloc());
+  __tmp.precision(__os.precision());
+  __tmp << '(' << __z.real() << ',' << __z.imag() << ')';
+  return __os << __tmp.str();
+}
+
+// Complex input from arbitrary streams.  Note that results in some
+// locales may be confusing, since the decimal character varies with
+// locale and the separator between real and imaginary parts does not.
+
+template <class _Tp, class _CharT, class _Traits>
+basic_istream<_CharT, _Traits>& _STLP_CALL
+operator>>(basic_istream<_CharT, _Traits>& __is, complex<_Tp>& __z)
+{
+  _Tp  __re = 0;
+  _Tp  __im = 0;
+
+  // typedef ctype<_CharT> _Ctype;
+  //  locale __loc = __is.getloc();
+  //const _Ctype&  __c_type  = use_facet<_Ctype>(__loc);
+  const ctype<_CharT>& __c_type = *(const ctype<_CharT>*)__is._M_ctype_facet();
+
+  char   __punct[4] = "(,)";
+  _CharT __wpunct[3];
+  __c_type.widen(__punct, __punct + 3, __wpunct);
+
+  _CharT __c;
+
+  __is >> __c;
+  if (_Traits::eq(__c, __wpunct[0])) {  // Left paren
+    __is >> __re >> __c;
+    if (_Traits::eq(__c, __wpunct[1]))  // Comma
+      __is >> __im >> __c;
+    if (!_Traits::eq(__c, __wpunct[2])) // Right paren
+      __is.setstate(ios_base::failbit);
+  }
+  else {
+    __is.putback(__c);
+    __is >> __re;
+  }
+
+  if (__is)
+    __z = complex<_Tp>(__re, __im);
+  return __is;
+}
+
+
+#else /* _STLP_USE_NEW_IOSTREAMS */
+
+template <class _Tp>
+ostream& _STLP_CALL operator<<(ostream& s, const complex<_Tp>& __z)
+{
+  return s << "( " << __z._M_re <<", " << __z._M_im <<")";
+}
+
+template <class _Tp>
+istream& _STLP_CALL operator>>(istream& s, complex<_Tp>& a)
+{
+  _Tp re = 0, im = 0;
+  char 	c = 0;
+
+  s >> c;
+  if (c == '(') {
+    s >> re >> c;
+    if (c == ',') s >> im >> c;
+    if (c != ')') s.clear(ios::badbit);
+  }
+  else {
+    s.putback(c);
+    s >> re;
+  }
+
+  if (s) a = complex<_Tp>(re, im);
+  return s;
+}
+
+#endif /* _STLP_USE_NEW_IOSTREAMS */
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_COMPLEX_C */
diff --git a/main/source/stlport/stlport/stl/_complex.h b/main/source/stlport/stlport/stl/_complex.h
new file mode 100644
index 00000000..c5739f8c
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_complex.h
@@ -0,0 +1,969 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+#ifndef _STLP_internal_complex_h
+#define _STLP_internal_complex_h
+
+// This header declares the template class complex, as described in 
+// in the draft C++ standard.  Single-precision complex numbers
+// are complex<float>, double-precision are complex<double>, and
+// quad precision are complex<long double>.
+
+// Note that the template class complex is declared within namespace
+// std, as called for by the draft C++ standard.  
+
+#include <stl/_cmath.h>
+#include <iosfwd>
+
+_STLP_BEGIN_NAMESPACE
+
+#if !defined(_STLP_NO_COMPLEX_SPECIALIZATIONS)		//*TY 02/25/2000 - added for MPW compiler workaround
+
+template <class _Tp> struct complex;
+
+_STLP_TEMPLATE_NULL  struct _STLP_CLASS_DECLSPEC complex<float>;
+_STLP_TEMPLATE_NULL  struct _STLP_CLASS_DECLSPEC complex<double>;
+# ifndef _STLP_NO_LONG_DOUBLE
+_STLP_TEMPLATE_NULL  struct _STLP_CLASS_DECLSPEC complex<long double>;
+# endif
+# endif
+
+template <class _Tp>
+struct complex {
+  typedef _Tp value_type;
+  typedef complex<_Tp> _Self;
+
+  // Constructors, destructor, assignment operator.
+  complex() : _M_re(0), _M_im(0) {}
+  complex(const value_type& __x)
+    : _M_re(__x), _M_im(0) {}
+  complex(const value_type& __x, const value_type& __y)
+    : _M_re(__x), _M_im(__y) {}
+  complex(const _Self& __z)
+    : _M_re(__z._M_re), _M_im(__z._M_im) {}
+
+  _Self& operator=(const _Self& __z) {
+    _M_re = __z._M_re;
+    _M_im = __z._M_im;
+    return *this;
+  }
+
+#if defined (_STLP_MEMBER_TEMPLATES) && ( defined (_STLP_FUNCTION_TMPL_PARTIAL_ORDER) || defined(_STLP_NO_COMPLEX_SPECIALIZATIONS))
+  template <class _Tp2>
+  explicit complex(const complex<_Tp2>& __z)
+    : _M_re(__z._M_re), _M_im(__z._M_im) {}
+
+  template <class _Tp2>
+  _Self& operator=(const complex<_Tp2>& __z) {
+    _M_re = __z._M_re;
+    _M_im = __z._M_im;
+    return *this;
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  // Element access.
+  value_type real() const { return _M_re; }
+  value_type imag() const { return _M_im; }
+
+  // Arithmetic op= operations involving one real argument.
+
+  _Self& operator= (const value_type& __x) {
+    _M_re = __x;
+    _M_im = 0;
+    return *this;
+  }
+  _Self& operator+= (const value_type& __x) {
+    _M_re += __x;
+    return *this;
+  }
+  _Self& operator-= (const value_type& __x) {
+    _M_re -= __x;
+    return *this;
+  }
+  _Self& operator*= (const value_type& __x) {
+    _M_re *= __x;
+    _M_im *= __x;
+    return *this;
+  }
+  _Self& operator/= (const value_type& __x) {
+    _M_re /= __x;
+    _M_im /= __x;
+    return *this;
+  }
+
+  // Arithmetic op= operations involving two complex arguments.
+
+  static void  _STLP_CALL _div(const value_type& __z1_r, const value_type& __z1_i,
+                   const value_type& __z2_r, const value_type& __z2_i,
+                   value_type& __res_r, value_type& __res_i);
+
+  static void _STLP_CALL _div(const value_type& __z1_r, 
+                   const value_type& __z2_r, const value_type& __z2_i,
+                   value_type& __res_r, value_type& __res_i);
+
+#if defined ( _STLP_MEMBER_TEMPLATES ) // && defined (_STLP_FUNCTION_TMPL_PARTIAL_ORDER)
+
+  template <class _Tp2> _Self& operator+= (const complex<_Tp2>& __z) {
+    _M_re += __z._M_re;
+    _M_im += __z._M_im;
+    return *this;
+  }
+
+  template <class _Tp2> _Self& operator-= (const complex<_Tp2>& __z) {
+    _M_re -= __z._M_re;
+    _M_im -= __z._M_im;
+    return *this;
+  }
+
+  template <class _Tp2> _Self& operator*= (const complex<_Tp2>& __z) {
+    value_type __r = _M_re * __z._M_re - _M_im * __z._M_im;
+    value_type __i = _M_re * __z._M_im + _M_im * __z._M_re;
+    _M_re = __r;
+    _M_im = __i;
+    return *this;
+  }
+
+  template <class _Tp2> _Self& operator/= (const complex<_Tp2>& __z) {
+    value_type __r;
+    value_type __i;
+    _div(_M_re, _M_im, __z._M_re, __z._M_im, __r, __i);
+    _M_re = __r;
+    _M_im = __i;
+    return *this;
+  }
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  _Self& operator+= (const _Self& __z) {
+    _M_re += __z._M_re;
+    _M_im += __z._M_im;
+    return *this;
+  }
+
+  _Self& operator-= (const _Self& __z) {
+    _M_re -= __z._M_re;
+    _M_im -= __z._M_im;
+    return *this;
+  }
+  
+  _Self& operator*= (const _Self& __z) {
+    value_type __r = _M_re * __z._M_re - _M_im * __z._M_im;
+    value_type __i = _M_re * __z._M_im + _M_im * __z._M_re;
+    _M_re = __r;
+    _M_im = __i;
+    return *this;
+  }
+
+  _Self& operator/= (const _Self& __z) {
+    value_type __r;
+    value_type __i;
+    _div(_M_re, _M_im, __z._M_re, __z._M_im, __r, __i);
+    _M_re = __r;
+    _M_im = __i;
+    return *this;
+  }
+
+  // Data members.
+  value_type _M_re;
+  value_type _M_im;
+};
+
+#if !defined(_STLP_NO_COMPLEX_SPECIALIZATIONS)		//*TY 02/25/2000 - added for MPW compiler workaround
+// Explicit specializations for float, double, long double.  The only
+// reason for these specializations is to enable automatic conversions
+// from complex<float> to complex<double>, and complex<double> to
+// complex<long double>.
+
+
+_STLP_TEMPLATE_NULL
+struct _STLP_CLASS_DECLSPEC complex<float> {
+  typedef float value_type;
+  typedef complex<float> _Self;
+  // Constructors, destructor, assignment operator.
+
+  complex(value_type __x = 0.0, value_type __y = 0.0)
+    : _M_re(__x), _M_im(__y) {}
+
+  complex(const complex<float>& __z)    : _M_re(__z._M_re), _M_im(__z._M_im) {} 
+
+  inline explicit complex(const complex<double>& __z);
+# ifndef _STLP_NO_LONG_DOUBLE
+  inline explicit complex(const complex<long double>& __z);
+# endif
+  // Element access.
+  value_type real() const { return _M_re; }
+  value_type imag() const { return _M_im; }
+
+  // Arithmetic op= operations involving one real argument.
+
+  _Self& operator= (value_type __x) {
+    _M_re = __x;
+    _M_im = 0;
+    return *this;
+  }
+  _Self& operator+= (value_type __x) {
+    _M_re += __x;
+    return *this;
+  }
+  _Self& operator-= (value_type __x) {
+    _M_re -= __x;
+    return *this;
+  }
+  _Self& operator*= (value_type __x) {
+    _M_re *= __x;
+    _M_im *= __x;
+    return *this;
+  }
+  _Self& operator/= (value_type __x) {
+    _M_re /= __x;
+    _M_im /= __x;
+    return *this;
+  }
+
+  // Arithmetic op= operations involving two complex arguments.
+
+  static void _STLP_CALL _div(const float& __z1_r, const float& __z1_i,
+                              const float& __z2_r, const float& __z2_i,
+                              float& __res_r, float& __res_i);
+    
+  static void _STLP_CALL _div(const float& __z1_r, 
+                              const float& __z2_r, const float& __z2_i,
+                              float& __res_r, float& __res_i);
+    
+#if defined (_STLP_MEMBER_TEMPLATES)
+
+  template <class _Tp2>
+  complex<float>& operator=(const complex<_Tp2>& __z) {
+    _M_re = __z._M_re;
+    _M_im = __z._M_im;
+    return *this;
+  }
+
+  template <class _Tp2>
+  complex<float>& operator+= (const complex<_Tp2>& __z) {
+    _M_re += __z._M_re;
+    _M_im += __z._M_im;
+    return *this;
+  }
+
+  template <class _Tp2>
+  complex<float>& operator-= (const complex<_Tp2>& __z) {
+    _M_re -= __z._M_re;
+    _M_im -= __z._M_im;
+    return *this;
+  }
+
+  template <class _Tp2>
+  complex<float>& operator*= (const complex<_Tp2>& __z) {
+    float __r = _M_re * __z._M_re - _M_im * __z._M_im;
+    float __i = _M_re * __z._M_im + _M_im * __z._M_re;
+    _M_re = __r;
+    _M_im = __i;
+    return *this;
+  }
+
+  template <class _Tp2>
+  complex<float>& operator/= (const complex<_Tp2>& __z) {
+    float __r;
+    float __i;
+    _div(_M_re, _M_im, __z._M_re, __z._M_im, __r, __i);
+    _M_re = __r;
+    _M_im = __i;
+    return *this;
+  }
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  _Self& operator=(const _Self& __z) {
+    _M_re = __z._M_re;
+    _M_im = __z._M_im;
+    return *this;
+  }
+
+  _Self& operator+= (const _Self& __z) {
+    _M_re += __z._M_re;
+    _M_im += __z._M_im;
+    return *this;
+  }
+
+  _Self& operator-= (const _Self& __z) {
+    _M_re -= __z._M_re;
+    _M_im -= __z._M_im;
+    return *this;
+  }
+  
+  _Self& operator*= (const _Self& __z) {
+    value_type __r = _M_re * __z._M_re - _M_im * __z._M_im;
+    value_type __i = _M_re * __z._M_im + _M_im * __z._M_re;
+    _M_re = __r;
+    _M_im = __i;
+    return *this;
+  }
+
+  _Self& operator/= (const _Self& __z) {
+    value_type __r;
+    value_type __i;
+    _div(_M_re, _M_im, __z._M_re, __z._M_im, __r, __i);
+    _M_re = __r;
+    _M_im = __i;
+    return *this;
+  }
+
+  // Data members.
+  value_type _M_re;
+  value_type _M_im;
+};
+
+_STLP_TEMPLATE_NULL struct _STLP_CLASS_DECLSPEC complex<double> {
+  typedef double value_type;
+  typedef complex<double> _Self;
+
+  // Constructors, destructor, assignment operator.
+
+  complex(value_type __x = 0.0, value_type __y = 0.0)
+    : _M_re(__x), _M_im(__y) {}
+
+  complex(const complex<double>& __z)
+    : _M_re(__z._M_re), _M_im(__z._M_im) {}
+  inline complex(const complex<float>& __z);
+# ifndef _STLP_NO_LONG_DOUBLE
+  explicit inline complex(const complex<long double>& __z);
+# endif
+  // Element access.
+  value_type real() const { return _M_re; }
+  value_type imag() const { return _M_im; }
+
+  // Arithmetic op= operations involving one real argument.
+
+  _Self& operator= (value_type __x) {
+    _M_re = __x;
+    _M_im = 0;
+    return *this;
+  }
+  _Self& operator+= (value_type __x) {
+    _M_re += __x;
+    return *this;
+  }
+  _Self& operator-= (value_type __x) {
+    _M_re -= __x;
+    return *this;
+  }
+  _Self& operator*= (value_type __x) {
+    _M_re *= __x;
+    _M_im *= __x;
+    return *this;
+  }
+  _Self& operator/= (value_type __x) {
+    _M_re /= __x;
+    _M_im /= __x;
+    return *this;
+  }
+
+  // Arithmetic op= operations involving two complex arguments.
+
+  static void _STLP_CALL _div(const double& __z1_r, const double& __z1_i,
+                              const double& __z2_r, const double& __z2_i,
+                              double& __res_r, double& __res_i);
+  static void _STLP_CALL _div(const double& __z1_r, 
+                              const double& __z2_r, const double& __z2_i,
+                              double& __res_r, double& __res_i);
+    
+#if defined (_STLP_MEMBER_TEMPLATES) && defined (_STLP_FUNCTION_TMPL_PARTIAL_ORDER)
+
+  template <class _Tp2>
+  complex<double>& operator=(const complex<_Tp2>& __z) {
+    _M_re = __z._M_re;
+    _M_im = __z._M_im;
+    return *this;
+  }
+
+  template <class _Tp2>
+  complex<double>& operator+= (const complex<_Tp2>& __z) {
+    _M_re += __z._M_re;
+    _M_im += __z._M_im;
+    return *this;
+  }
+
+  template <class _Tp2>
+  complex<double>& operator-= (const complex<_Tp2>& __z) {
+    _M_re -= __z._M_re;
+    _M_im -= __z._M_im;
+    return *this;
+  }
+
+  template <class _Tp2>
+  complex<double>& operator*= (const complex<_Tp2>& __z) {
+    double __r = _M_re * __z._M_re - _M_im * __z._M_im;
+    double __i = _M_re * __z._M_im + _M_im * __z._M_re;
+    _M_re = __r;
+    _M_im = __i;
+    return *this;
+  }
+
+  template <class _Tp2>
+  complex<double>& operator/= (const complex<_Tp2>& __z) {
+    double __r;
+    double __i;
+    _div(_M_re, _M_im, __z._M_re, __z._M_im, __r, __i);
+    _M_re = __r;
+    _M_im = __i;
+    return *this;
+  }
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  _Self& operator=(const _Self& __z) {
+    _M_re = __z._M_re;
+    _M_im = __z._M_im;
+    return *this;
+  }
+
+  _Self& operator+= (const _Self& __z) {
+    _M_re += __z._M_re;
+    _M_im += __z._M_im;
+    return *this;
+  }
+
+  _Self& operator-= (const _Self& __z) {
+    _M_re -= __z._M_re;
+    _M_im -= __z._M_im;
+    return *this;
+  }
+  
+  _Self& operator*= (const _Self& __z) {
+    value_type __r = _M_re * __z._M_re - _M_im * __z._M_im;
+    value_type __i = _M_re * __z._M_im + _M_im * __z._M_re;
+    _M_re = __r;
+    _M_im = __i;
+    return *this;
+  }
+
+  _Self& operator/= (const _Self& __z) {
+    value_type __r;
+    value_type __i;
+    _div(_M_re, _M_im, __z._M_re, __z._M_im, __r, __i);
+    _M_re = __r;
+    _M_im = __i;
+    return *this;
+  }
+
+  // Data members.
+  value_type _M_re;
+  value_type _M_im;
+};
+
+# ifndef _STLP_NO_LONG_DOUBLE
+
+_STLP_TEMPLATE_NULL struct _STLP_CLASS_DECLSPEC complex<long double> {
+  typedef long double value_type;
+  typedef complex<long double> _Self;
+
+  // Constructors, destructor, assignment operator.
+  complex(value_type __x = 0.0, value_type __y = 0.0)
+    : _M_re(__x), _M_im(__y) {}
+
+  complex(const complex<long double>& __z)
+    : _M_re(__z._M_re), _M_im(__z._M_im) {}
+  inline complex(const complex<float>& __z);
+  inline complex(const complex<double>& __z);
+
+  // Element access.
+  value_type real() const { return _M_re; }
+  value_type imag() const { return _M_im; }
+
+  // Arithmetic op= operations involving one real argument.
+
+  _Self& operator= (value_type __x) {
+    _M_re = __x;
+    _M_im = 0;
+    return *this;
+  }
+  _Self& operator+= (value_type __x) {
+    _M_re += __x;
+    return *this;
+  }
+  _Self& operator-= (value_type __x) {
+    _M_re -= __x;
+    return *this;
+  }
+  _Self& operator*= (value_type __x) {
+    _M_re *= __x;
+    _M_im *= __x;
+    return *this;
+  }
+  _Self& operator/= (value_type __x) {
+    _M_re /= __x;
+    _M_im /= __x;
+    return *this;
+  }
+
+  // Arithmetic op= operations involving two complex arguments.
+
+  static void _STLP_CALL _div(const long double& __z1_r, const long double& __z1_i,
+                              const long double& __z2_r, const long double& __z2_i,
+                              long double& __res_r, long double& __res_i);
+
+  static void _STLP_CALL _div(const long double& __z1_r, 
+                              const long double& __z2_r, const long double& __z2_i,
+                              long double& __res_r, long double& __res_i);
+
+#if defined (_STLP_MEMBER_TEMPLATES) && defined (_STLP_FUNCTION_TMPL_PARTIAL_ORDER)
+
+  template <class _Tp2>
+  complex<long double>& operator=(const complex<_Tp2>& __z) {
+    _M_re = __z._M_re;
+    _M_im = __z._M_im;
+    return *this;
+  }
+
+  template <class _Tp2>
+  complex<long double>& operator+= (const complex<_Tp2>& __z) {
+    _M_re += __z._M_re;
+    _M_im += __z._M_im;
+    return *this;
+  }
+
+  template <class _Tp2>
+  complex<long double>& operator-= (const complex<_Tp2>& __z) {
+    _M_re -= __z._M_re;
+    _M_im -= __z._M_im;
+    return *this;
+  }
+
+  template <class _Tp2>
+  complex<long double>& operator*= (const complex<_Tp2>& __z) {
+    long double __r = _M_re * __z._M_re - _M_im * __z._M_im;
+    long double __i = _M_re * __z._M_im + _M_im * __z._M_re;
+    _M_re = __r;
+    _M_im = __i;
+    return *this;
+  }
+
+  template <class _Tp2>
+  complex<long double>& operator/= (const complex<_Tp2>& __z) {
+    long double __r;
+    long double __i;
+    _div(_M_re, _M_im, __z._M_re, __z._M_im, __r, __i);
+    _M_re = __r;
+    _M_im = __i;
+    return *this;
+  }
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  _Self& operator=(const _Self& __z) {
+    _M_re = __z._M_re;
+    _M_im = __z._M_im;
+    return *this;
+  }
+
+  _Self& operator+= (const _Self& __z) {
+    _M_re += __z._M_re;
+    _M_im += __z._M_im;
+    return *this;
+  }
+
+  _Self& operator-= (const _Self& __z) {
+    _M_re -= __z._M_re;
+    _M_im -= __z._M_im;
+    return *this;
+  }
+  
+  _Self& operator*= (const _Self& __z) {
+    value_type __r = _M_re * __z._M_re - _M_im * __z._M_im;
+    value_type __i = _M_re * __z._M_im + _M_im * __z._M_re;
+    _M_re = __r;
+    _M_im = __i;
+    return *this;
+  }
+
+  _Self& operator/= (const _Self& __z) {
+    value_type __r;
+    value_type __i;
+    _div(_M_re, _M_im, __z._M_re, __z._M_im, __r, __i);
+    _M_re = __r;
+    _M_im = __i;
+    return *this;
+  }
+
+  // Data members.
+  value_type _M_re;
+  value_type _M_im;
+};
+
+# endif /* _STLP_NO_LONG_DOUBLE */
+
+// Converting constructors from one of these three specialized types
+// to another.
+
+inline complex<float>::complex(const complex<double>& __z)
+  : _M_re(__z._M_re), _M_im(__z._M_im) {}
+inline complex<double>::complex(const complex<float>& __z)
+  : _M_re(__z._M_re), _M_im(__z._M_im) {}
+# ifndef _STLP_NO_LONG_DOUBLE
+inline complex<float>::complex(const complex<long double>& __z)
+  : _M_re(__z._M_re), _M_im(__z._M_im) {}
+inline complex<double>::complex(const complex<long double>& __z)
+  : _M_re(__z._M_re), _M_im(__z._M_im) {}
+inline complex<long double>::complex(const complex<float>& __z)
+  : _M_re(__z._M_re), _M_im(__z._M_im) {}
+inline complex<long double>::complex(const complex<double>& __z)
+  : _M_re(__z._M_re), _M_im(__z._M_im) {}
+# endif
+
+# endif /* SPECIALIZATIONS */
+
+// Unary non-member arithmetic operators.
+
+template <class _Tp>
+inline complex<_Tp> _STLP_CALL operator+(const complex<_Tp>& __z) {
+  return __z;
+}
+
+template <class _Tp>
+inline complex<_Tp> _STLP_CALL  operator-(const complex<_Tp>& __z) {
+  return complex<_Tp>(-__z._M_re, -__z._M_im);
+}
+
+// Non-member arithmetic operations involving one real argument.
+
+template <class _Tp> 
+inline complex<_Tp> _STLP_CALL operator+(const _Tp& __x, const complex<_Tp>& __z) {
+  return complex<_Tp>(__x + __z._M_re, __z._M_im);
+}
+
+template <class _Tp> 
+inline complex<_Tp> _STLP_CALL operator+(const complex<_Tp>& __z, const _Tp& __x) {
+  return complex<_Tp>(__z._M_re + __x, __z._M_im);
+}
+
+template <class _Tp> 
+inline complex<_Tp> _STLP_CALL operator-(const _Tp& __x, const complex<_Tp>& __z) {
+  return complex<_Tp>(__x - __z._M_re, -__z._M_im);
+}
+
+template <class _Tp> 
+inline complex<_Tp> _STLP_CALL operator-(const complex<_Tp>& __z, const _Tp& __x) {
+  return complex<_Tp>(__z._M_re - __x, __z._M_im);
+}
+
+template <class _Tp> 
+inline complex<_Tp> _STLP_CALL operator*(const _Tp& __x, const complex<_Tp>& __z) {
+  return complex<_Tp>(__x * __z._M_re, __x * __z._M_im);
+}
+
+template <class _Tp> 
+inline complex<_Tp> _STLP_CALL operator*(const complex<_Tp>& __z, const _Tp& __x) {
+  return complex<_Tp>(__z._M_re * __x, __z._M_im * __x);
+}
+
+template <class _Tp> 
+inline complex<_Tp> _STLP_CALL operator/(const _Tp& __x, const complex<_Tp>& __z) {
+  complex<_Tp> __result;
+  complex<_Tp>::_div(__x,
+                     __z._M_re, __z._M_im,
+                     __result._M_re, __result._M_im);
+  return __result;
+}
+
+template <class _Tp> 
+inline complex<_Tp> _STLP_CALL operator/(const complex<_Tp>& __z, const _Tp& __x) {
+  return complex<_Tp>(__z._M_re / __x, __z._M_im / __x);
+}
+
+// Non-member arithmetic operations involving two complex arguments
+
+template <class _Tp> 
+inline complex<_Tp> _STLP_CALL 
+operator+(const complex<_Tp>& __z1, const complex<_Tp>& __z2) {
+  return complex<_Tp>(__z1._M_re + __z2._M_re, __z1._M_im + __z2._M_im);
+}
+
+template <class _Tp> 
+inline complex<_Tp> _STLP_CALL 
+operator-(const complex<_Tp>& __z1, const complex<_Tp>& __z2) {
+  return complex<_Tp>(__z1._M_re - __z2._M_re, __z1._M_im - __z2._M_im);
+}
+
+template <class _Tp> 
+inline complex<_Tp> _STLP_CALL 
+operator*(const complex<_Tp>& __z1, const complex<_Tp>& __z2) {
+  return complex<_Tp>(__z1._M_re * __z2._M_re - __z1._M_im * __z2._M_im,
+                      __z1._M_re * __z2._M_im + __z1._M_im * __z2._M_re);
+}
+
+template <class _Tp> 
+inline complex<_Tp> _STLP_CALL 
+operator/(const complex<_Tp>& __z1, const complex<_Tp>& __z2) {
+  complex<_Tp> __result;
+  complex<_Tp>::_div(__z1._M_re, __z1._M_im,
+                     __z2._M_re, __z2._M_im,
+                     __result._M_re, __result._M_im);
+  return __result;
+}
+
+// Comparison operators.
+
+template <class _Tp> 
+inline bool _STLP_CALL operator==(const complex<_Tp>& __z1, const complex<_Tp>& __z2) {
+  return __z1._M_re == __z2._M_re && __z1._M_im == __z2._M_im;
+}
+
+template <class _Tp> 
+inline bool _STLP_CALL operator==(const complex<_Tp>& __z, const _Tp& __x) {
+  return __z._M_re == __x && __z._M_im == 0;
+}
+
+template <class _Tp> 
+inline bool _STLP_CALL operator==(const _Tp& __x, const complex<_Tp>& __z) {
+  return __x == __z._M_re && 0 == __z._M_im;
+}
+
+#ifdef _STLP_FUNCTION_TMPL_PARTIAL_ORDER
+
+template <class _Tp> 
+inline bool _STLP_CALL operator!=(const complex<_Tp>& __z1, const complex<_Tp>& __z2) {
+  return __z1._M_re != __z2._M_re || __z1._M_im != __z2._M_im;
+}
+
+#endif /* _STLP_FUNCTION_TMPL_PARTIAL_ORDER */
+
+template <class _Tp> 
+inline bool _STLP_CALL operator!=(const complex<_Tp>& __z, const _Tp& __x) {
+  return __z._M_re != __x || __z._M_im != 0;
+}
+
+template <class _Tp> 
+inline bool _STLP_CALL operator!=(const _Tp& __x, const complex<_Tp>& __z) {
+  return __x != __z._M_re || 0 != __z._M_im;
+}
+
+// Other basic arithmetic operations
+
+template <class _Tp> 
+inline _Tp _STLP_CALL real(const complex<_Tp>& __z) {
+  return __z._M_re;
+}
+
+template <class _Tp> 
+inline _Tp _STLP_CALL imag(const complex<_Tp>& __z) {
+  return __z._M_im;
+}
+
+template <class _Tp>
+_Tp _STLP_CALL abs(const complex<_Tp>& __z) {
+  return _Tp(abs(complex<double>(double(__z.real()), double(__z.imag()))));
+}
+
+template <class _Tp>
+_Tp _STLP_CALL arg(const complex<_Tp>& __z) {
+  return _Tp(arg(complex<double>(double(__z.real()), double(__z.imag()))));
+}
+
+template <class _Tp>
+inline _Tp _STLP_CALL norm(const complex<_Tp>& __z) {
+  return __z._M_re * __z._M_re + __z._M_im * __z._M_im;
+}
+
+template <class _Tp>
+inline complex<_Tp> _STLP_CALL conj(const complex<_Tp>& __z) {
+  return complex<_Tp>(__z._M_re, -__z._M_im);
+}
+
+template <class _Tp>
+complex<_Tp> _STLP_CALL polar(const _Tp& __rho) {
+  return complex<_Tp>(__rho, 0);
+}
+
+template <class _Tp>
+complex<_Tp> _STLP_CALL polar(const _Tp& __rho, const _Tp& __phi) {
+  complex<double> __tmp = polar(double(__rho), double(__phi));
+  return complex<_Tp>(_Tp(__tmp.real()), _Tp(__tmp.imag()));
+}
+
+
+_STLP_TEMPLATE_NULL
+_STLP_DECLSPEC float  _STLP_CALL abs(const complex<float>&);
+_STLP_TEMPLATE_NULL
+_STLP_DECLSPEC double  _STLP_CALL abs(const complex<double>&);
+_STLP_TEMPLATE_NULL
+_STLP_DECLSPEC float  _STLP_CALL arg(const complex<float>&);
+_STLP_TEMPLATE_NULL
+_STLP_DECLSPEC double  _STLP_CALL arg(const complex<double>&);
+_STLP_TEMPLATE_NULL
+_STLP_DECLSPEC complex<float> _STLP_CALL polar(const float& __rho, const float& __phi);
+_STLP_TEMPLATE_NULL
+_STLP_DECLSPEC complex<double> _STLP_CALL polar(const double& __rho, const double& __phi);
+
+
+# ifndef _STLP_NO_LONG_DOUBLE
+_STLP_TEMPLATE_NULL
+_STLP_DECLSPEC long double  _STLP_CALL arg(const complex<long double>&);
+_STLP_TEMPLATE_NULL
+_STLP_DECLSPEC long double  _STLP_CALL abs(const complex<long double>&);
+_STLP_TEMPLATE_NULL
+_STLP_DECLSPEC complex<long double> _STLP_CALL polar(const long double&, const long double&);
+# endif
+
+
+#ifdef _STLP_USE_NEW_IOSTREAMS
+
+// Complex output, in the form (re,im).  We use a two-step process 
+// involving stringstream so that we get the padding right.  
+template <class _Tp, class _CharT, class _Traits>
+basic_ostream<_CharT, _Traits>&  _STLP_CALL 
+operator<<(basic_ostream<_CharT, _Traits>& __os, const complex<_Tp>& __z);
+
+template <class _Tp, class _CharT, class _Traits>
+basic_istream<_CharT, _Traits>& _STLP_CALL 
+operator>>(basic_istream<_CharT, _Traits>& __is, complex<_Tp>& __z);
+
+// Specializations for narrow characters; lets us avoid widen.
+
+_STLP_OPERATOR_TEMPLATE
+_STLP_DECLSPEC basic_istream<char, char_traits<char> >& _STLP_CALL 
+operator>>(basic_istream<char, char_traits<char> >& __is, complex<float>& __z);
+
+_STLP_OPERATOR_TEMPLATE
+_STLP_DECLSPEC basic_istream<char, char_traits<char> >& _STLP_CALL 
+operator>>(basic_istream<char, char_traits<char> >& __is, complex<double>& __z);
+
+
+_STLP_OPERATOR_TEMPLATE
+_STLP_DECLSPEC basic_ostream<char, char_traits<char> >& _STLP_CALL 
+operator<<(basic_ostream<char, char_traits<char> >& __is, const complex<float>& __z);
+
+_STLP_OPERATOR_TEMPLATE
+_STLP_DECLSPEC basic_ostream<char, char_traits<char> >& _STLP_CALL 
+operator<<(basic_ostream<char, char_traits<char> >& __is, const complex<double>& __z);
+
+#  if ! defined (_STLP_NO_LONG_DOUBLE)
+_STLP_OPERATOR_TEMPLATE
+_STLP_DECLSPEC basic_istream<char, char_traits<char> >& _STLP_CALL 
+operator>>(basic_istream<char, char_traits<char> >& __is, complex<long double>& __z);
+
+_STLP_OPERATOR_TEMPLATE
+_STLP_DECLSPEC basic_ostream<char, char_traits<char> >& _STLP_CALL 
+operator<<(basic_ostream<char, char_traits<char> >& __is, const complex<long double>& __z);
+
+# endif
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT) && ! defined (_STLP_NO_WCHAR_T)
+
+_STLP_EXPORT_TEMPLATE basic_istream<wchar_t, char_traits<wchar_t> >& _STLP_CALL operator>>(
+        basic_istream<wchar_t, char_traits<wchar_t> >&, complex<double>&);
+_STLP_EXPORT_TEMPLATE basic_ostream<wchar_t, char_traits<wchar_t> >& _STLP_CALL operator<<(
+        basic_ostream<wchar_t, char_traits<wchar_t> >&, const complex<double>&);
+_STLP_EXPORT_TEMPLATE basic_istream<wchar_t, char_traits<wchar_t> >& _STLP_CALL operator>>(
+        basic_istream<wchar_t, char_traits<wchar_t> >&, complex<float>&);
+_STLP_EXPORT_TEMPLATE basic_ostream<wchar_t, char_traits<wchar_t> >& _STLP_CALL operator<<(
+        basic_ostream<wchar_t, char_traits<wchar_t> >&, const complex<float>&);
+
+#  ifndef _STLP_NO_LONG_DOUBLE
+_STLP_EXPORT_TEMPLATE basic_istream<wchar_t, char_traits<wchar_t> >& _STLP_CALL operator>>(
+        basic_istream<wchar_t, char_traits<wchar_t> >&, complex<long double>&);
+_STLP_EXPORT_TEMPLATE basic_ostream<wchar_t, char_traits<wchar_t> >& _STLP_CALL operator<<(
+        basic_ostream<wchar_t, char_traits<wchar_t> >&, const complex<long double>&);
+#  endif
+
+# endif /* USE_TEMPLATE_EXPORT */
+
+#else /* _STLP_USE_NEW_IOSTREAMS */
+
+template <class _Tp>
+ostream& _STLP_CALL operator<<(ostream& s, const complex<_Tp>& __z);
+
+template <class _Tp>
+istream& _STLP_CALL  operator>>(istream& s, complex<_Tp>& a);
+
+#endif /* _STLP_USE_NEW_IOSTREAMS */
+
+
+// Transcendental functions.  These are defined only for float, 
+//  double, and long double.  (Sqrt isn't transcendental, of course,
+//  but it's included in this section anyway.)
+
+_STLP_DECLSPEC complex<float> _STLP_CALL sqrt(const complex<float>&);
+
+_STLP_DECLSPEC complex<float> _STLP_CALL exp(const complex<float>&);
+_STLP_DECLSPEC complex<float> _STLP_CALL  log(const complex<float>&);
+_STLP_DECLSPEC complex<float> _STLP_CALL log10(const complex<float>&);
+
+_STLP_DECLSPEC complex<float> _STLP_CALL pow(const complex<float>&, int);
+_STLP_DECLSPEC complex<float> _STLP_CALL pow(const complex<float>&, const float&);
+_STLP_DECLSPEC complex<float> _STLP_CALL pow(const float&, const complex<float>&);
+_STLP_DECLSPEC complex<float> _STLP_CALL pow(const complex<float>&, const complex<float>&);
+
+_STLP_DECLSPEC complex<float> _STLP_CALL sin(const complex<float>&);
+_STLP_DECLSPEC complex<float> _STLP_CALL cos(const complex<float>&);
+_STLP_DECLSPEC complex<float> _STLP_CALL tan(const complex<float>&);
+
+_STLP_DECLSPEC complex<float> _STLP_CALL sinh(const complex<float>&);
+_STLP_DECLSPEC complex<float> _STLP_CALL cosh(const complex<float>&);
+_STLP_DECLSPEC complex<float> _STLP_CALL tanh(const complex<float>&);
+
+_STLP_DECLSPEC complex<double> _STLP_CALL sqrt(const complex<double>&);
+
+_STLP_DECLSPEC complex<double> _STLP_CALL exp(const complex<double>&);
+_STLP_DECLSPEC complex<double> _STLP_CALL log(const complex<double>&);
+_STLP_DECLSPEC complex<double> _STLP_CALL log10(const complex<double>&);
+
+_STLP_DECLSPEC complex<double> _STLP_CALL pow(const complex<double>&, int);
+_STLP_DECLSPEC complex<double> _STLP_CALL pow(const complex<double>&, const double&);
+_STLP_DECLSPEC complex<double> _STLP_CALL pow(const double&, const complex<double>&);
+_STLP_DECLSPEC complex<double> _STLP_CALL pow(const complex<double>&, const complex<double>&);
+
+_STLP_DECLSPEC complex<double> _STLP_CALL sin(const complex<double>&);
+_STLP_DECLSPEC complex<double> _STLP_CALL cos(const complex<double>&);
+_STLP_DECLSPEC complex<double> _STLP_CALL tan(const complex<double>&);
+
+_STLP_DECLSPEC complex<double> _STLP_CALL sinh(const complex<double>&);
+_STLP_DECLSPEC complex<double> _STLP_CALL cosh(const complex<double>&);
+_STLP_DECLSPEC complex<double> _STLP_CALL tanh(const complex<double>&);
+
+# ifndef _STLP_NO_LONG_DOUBLE
+_STLP_DECLSPEC complex<long double> _STLP_CALL sqrt(const complex<long double>&);
+_STLP_DECLSPEC complex<long double> _STLP_CALL exp(const complex<long double>&);
+_STLP_DECLSPEC complex<long double> _STLP_CALL log(const complex<long double>&);
+_STLP_DECLSPEC complex<long double> _STLP_CALL log10(const complex<long double>&);
+
+_STLP_DECLSPEC complex<long double> _STLP_CALL pow(const complex<long double>&, int);
+_STLP_DECLSPEC complex<long double> _STLP_CALL pow(const complex<long double>&, const long double&);
+_STLP_DECLSPEC complex<long double> _STLP_CALL pow(const long double&, const complex<long double>&);
+_STLP_DECLSPEC complex<long double> _STLP_CALL pow(const complex<long double>&,
+                                                   const complex<long double>&);
+
+_STLP_DECLSPEC complex<long double> _STLP_CALL sin(const complex<long double>&);
+_STLP_DECLSPEC complex<long double> _STLP_CALL cos(const complex<long double>&);
+_STLP_DECLSPEC complex<long double> _STLP_CALL tan(const complex<long double>&);
+
+_STLP_DECLSPEC complex<long double> _STLP_CALL sinh(const complex<long double>&);
+_STLP_DECLSPEC complex<long double> _STLP_CALL cosh(const complex<long double>&);
+_STLP_DECLSPEC complex<long double> _STLP_CALL tanh(const complex<long double>&);
+# endif
+
+_STLP_END_NAMESPACE
+
+# ifndef _STLP_LINK_TIME_INSTANTIATION
+#  include <stl/_complex.c>
+# endif
+
+#endif /* _STLP_template_complex */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_config.h b/main/source/stlport/stlport/stl/_config.h
new file mode 100644
index 00000000..ed1fe2ef
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_config.h
@@ -0,0 +1,1064 @@
+ /*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_CONFIG_H
+# define _STLP_CONFIG_H
+
+/*
+ * Purpose of this file :
+ *
+ * Defines all STLport settings.
+ * This file is actually a wrapper : it includes compiler-specific
+ * settings from <config/stlcomp.h>
+ * and user-defined settings from <stl_user_config.h>.
+ * See <config/stl_mycomp.h> and <stl_user_config.h> for the description
+ * of those macros
+ * 
+ */
+
+/* Other macros defined by this file:
+
+ * bool, true, and false, if _STLP_NO_BOOL is defined.
+ * typename, as a null macro if it's not already a keyword.
+ * explicit, as a null macro if it's not already a keyword.
+ * namespace-related macros (_STLP_STD, _STLP_BEGIN_NAMESPACE, etc.)
+ * exception-related macros (_STLP_TRY, _STLP_UNWIND, etc.)
+ * _STLP_ASSERT, either as a test or as a null macro, depending on
+   whether or not _STLP_ASSERTIONS is defined.
+*/
+
+/* The last SGI STL release we merged with */
+#   define __SGI_STL                                      0x330
+
+/* STLport version */
+#   define _STLPORT_VERSION                               0x461
+
+/* Placeholder for user to override settings.
+ * It could be also used to mask settings from 
+ * different directories.
+ */
+# include <stl_user_config.h>
+
+/* ========================================================= */
+/* This file is used for compatibility; it accepts old-style config
+   switches */
+#  include <stl/_config_compat.h>
+
+/* Common configuration file for this particular installation. */
+
+# include <stl/_site_config.h>
+
+/* Use per-version compiler recognition */
+#  include <config/stlcomp.h>
+
+/* ========================================================= */
+
+/* some fixes to configuration. This also includes modifications
+ * of STLport switches depending on compiler flags,
+ * or settings applicable to a group of compilers, such as
+ * to all who use EDG front-end.
+ */
+# include <config/stl_confix.h>
+
+
+/*
+ * Performs integrity check on user-specified parameters
+ * and site-specific settings.
+ */
+// # include <stl/_check_config.h>
+
+/* SGI terms */
+
+# if !defined (_STLP_NO_MEMBER_TEMPLATES) && !defined (_STLP_MEMBER_TEMPLATES)
+#  define _STLP_MEMBER_TEMPLATES 1
+# endif
+
+# if !defined (_STLP_NO_FRIEND_TEMPLATES) && !defined (_STLP_FRIEND_TEMPLATES)
+#  define _STLP_FRIEND_TEMPLATES 1
+# endif
+
+# if !defined (_STLP_NO_MEMBER_TEMPLATE_CLASSES) && !defined (_STLP_MEMBER_TEMPLATE_CLASSES)
+#  define _STLP_MEMBER_TEMPLATE_CLASSES 1
+# endif
+
+# if !defined (_STLP_NO_MEMBER_TEMPLATE_CLASSES) && !defined (_STLP_DONT_USE_NESTED_TCLASS_THROUGHT_TPARAM) && !defined (_STLP_USE_NESTED_TCLASS_THROUGHT_TPARAM)
+#  define _STLP_USE_NESTED_TCLASS_THROUGHT_TPARAM 1
+# endif
+
+#if !defined (_STLP_NO_CLASS_PARTIAL_SPECIALIZATION) && !defined (_STLP_CLASS_PARTIAL_SPECIALIZATION)
+#  define _STLP_CLASS_PARTIAL_SPECIALIZATION 1
+#endif
+
+#if !defined (_STLP_FUNCTION_TMPL_PARTIAL_ORDER) && !defined (_STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER)
+#  define _STLP_FUNCTION_TMPL_PARTIAL_ORDER 1
+#endif
+
+# if !defined (_STLP_BIG_ENDIAN) && ! defined (_STLP_LITTLE_ENDIAN)
+#  if defined(_MIPSEB) || defined (__sparc) || \
+      defined (_AIX) || defined (__hpux) || defined(macintosh) || defined (_MAC)
+#   define _STLP_BIG_ENDIAN 1
+#  elif defined(__i386) || defined(_M_IX86) 
+#   define _STLP_LITTLE_ENDIAN 1
+#  else
+#   define _STLP_UNKNOWN_ENDIAN 1
+#  endif
+# endif /* _STLP_BIG_ENDIAN */
+
+/* ==========================================================
+ * final workaround tuning based on given flags
+ * ========================================================== */
+
+#ifndef _STLP_UINT32_T
+# define _STLP_UINT32_T unsigned long
+#endif
+#ifndef _STLP_ABORT
+# define _STLP_ABORT() abort()
+#endif
+
+# if !defined (_STLP_HAS_NO_NAMESPACES)
+# if defined _STLP_NO_NAMESPACES
+#  undef _STLP_USE_NAMESPACES
+# else
+/* assume it as the default, turn it off later if NO_NAMESPACES selected */
+#  undef _STLP_USE_NAMESPACES
+#  define _STLP_USE_NAMESPACES 1
+# endif
+# endif
+
+# if defined (_STLP_NO_IOSTREAMS)
+#  define _STLP_USE_NO_IOSTREAMS
+# endif
+
+# if defined (_STLP_USE_NO_IOSTREAMS)
+#  undef _STLP_USE_NEW_IOSTREAMS
+# endif
+
+# if ( defined (_STLP_OWN_IOSTREAMS) || ! defined (_STLP_HAS_NO_NEW_IOSTREAMS)) \
+   && ! defined (_STLP_USE_NO_IOSTREAMS) && !defined (_STLP_USE_NEW_IOSTREAMS)
+#  define _STLP_USE_NEW_IOSTREAMS
+# endif
+
+# if defined (_STLP_NO_NEW_IOSTREAMS)
+#  undef _STLP_USE_NEW_IOSTREAMS
+#  undef _STLP_OWN_IOSTREAMS
+# endif
+
+/* Operating system recognition (basic) */
+# if defined (__unix) || defined (__linux__) || defined (__QNX__) || defined (_AIX)  || defined (__NetBSD__) || defined (__Lynx__)
+#  define _STLP_UNIX 1
+#  if defined (__linux__) && ! defined (_STLP_USE_GLIBC)
+#   define _STLP_USE_GLIBC 1
+#  endif
+# elif defined(macintosh) || defined (_MAC)
+#  define _STLP_MAC  1
+# elif defined (_WIN32) || defined (__WIN32) || defined (WIN32) || defined (__WIN32__)
+#  define _STLP_WIN32 1
+# elif defined (__WIN16) || defined (WIN16) || defined (_WIN16)
+#  define _STLP_WIN16
+# endif /* __unix */
+
+# if !defined(_STLP_MAKE_HEADER)
+#  define _STLP_MAKE_HEADER(path, header) <path/header>
+# endif
+
+#if !defined (_STLP_NATIVE_HEADER)
+# if !defined (_STLP_NATIVE_INCLUDE_PATH)
+#  define _STLP_NATIVE_INCLUDE_PATH ../include
+# endif
+# define _STLP_NATIVE_HEADER(header) _STLP_MAKE_HEADER(_STLP_NATIVE_INCLUDE_PATH,header)
+#endif
+
+/* For some compilers, C headers like <stdio.h> are located in separate directory */
+#if !defined (_STLP_NATIVE_C_HEADER)
+# if !defined (_STLP_NATIVE_C_INCLUDE_PATH)
+#  define _STLP_NATIVE_C_INCLUDE_PATH _STLP_NATIVE_INCLUDE_PATH
+# endif
+# define _STLP_NATIVE_C_HEADER(header)  _STLP_MAKE_HEADER(_STLP_NATIVE_C_INCLUDE_PATH,header)
+#endif
+
+/* For some compilers, C-library headers like <cstdio> are located in separate directory */
+#if !defined (_STLP_NATIVE_CPP_C_HEADER)
+# if !defined (_STLP_NATIVE_CPP_C_INCLUDE_PATH)
+#  define _STLP_NATIVE_CPP_C_INCLUDE_PATH _STLP_NATIVE_INCLUDE_PATH
+# endif
+# define _STLP_NATIVE_CPP_C_HEADER(header)  _STLP_MAKE_HEADER(_STLP_NATIVE_CPP_C_INCLUDE_PATH,header)
+#endif
+
+/* Some compilers have weird placement of old-style iostream headers */
+#if !defined ( _STLP_NATIVE_OLD_STREAMS_HEADER )
+# if !defined (_STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH)
+#  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH _STLP_NATIVE_INCLUDE_PATH
+# endif
+# define _STLP_NATIVE_OLD_STREAMS_HEADER(header)  _STLP_MAKE_HEADER(_STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH,header)
+#endif
+
+/* Some compilers locate basic C++ runtime support headers (<new>, <typeinfo>, <exception>) in separate directory */
+#if !defined ( _STLP_NATIVE_CPP_RUNTIME_HEADER )
+# if !defined (_STLP_NATIVE_CPP_RUNTIME_INCLUDE_PATH)
+#  define _STLP_NATIVE_CPP_RUNTIME_INCLUDE_PATH _STLP_NATIVE_INCLUDE_PATH
+# endif
+# define _STLP_NATIVE_CPP_RUNTIME_HEADER(header)  _STLP_MAKE_HEADER(_STLP_NATIVE_CPP_RUNTIME_INCLUDE_PATH,header)
+#endif
+
+/*  shared library tune-up */
+
+#if defined (__BUILDING_STLPORT)
+/*  if we are rebuilding right now as a DLL, place everything here */
+#  undef  _STLP_DESIGNATED_DLL
+#  define _STLP_DESIGNATED_DLL 1
+#endif
+
+/* Use own namespace always if possible and not explicitly instructed otherwise */
+# if defined (_STLP_USE_NAMESPACES) && !defined (_STLP_BROKEN_USING_DIRECTIVE) && \
+     /* !defined (_STLP_OWN_IOSTREAMS) && */ !defined(_STLP_NO_OWN_NAMESPACE)
+#  undef  _STLP_USE_OWN_NAMESPACE
+#  define _STLP_USE_OWN_NAMESPACE  1
+# else
+#  undef _STLP_WHOLE_NATIVE_STD
+# endif
+
+#  undef _STLP_NAMESPACE
+
+# if !defined(_NOTHREADS) && ! defined (_STLP_THREADS_DEFINED)
+
+#  ifndef _REENTRANT
+#     define _REENTRANT
+#  endif
+
+#  if defined(_PTHREADS)
+#     define _STLP_PTHREADS
+#     define _STLP_THREADS
+#  endif
+#  if defined(_UITHREADS)
+#     define _STLP_UITHREADS
+#     define _STLP_THREADS
+#  endif
+
+#   if defined (__sgi) && ! defined (__KCC) && ! defined (__GNUC__)  
+#    define _STLP_SGI_THREADS
+#   elif defined(__DECC) || defined(__DECCXX)
+#    define _STLP_DEC_THREADS
+#   elif defined (_STLP_WIN32) && ! defined (_STLP_PTHREADS)
+#    define _STLP_WIN32THREADS 1
+#   elif ((defined (__sun) && !defined (__linux__)) \
+     || defined(_UITHREADS) ) && !defined(_STLP_PTHREADS)
+#     define _STLP_UITHREADS
+#   elif defined (__OS2__)
+#     define _STLP_OS2THREADS
+#   elif defined(__BEOS__)
+#     define _STLP_BETHREADS
+#   else
+#     define _STLP_PTHREADS
+#   endif /* __sgi */
+#   define _STLP_THREADS_DEFINED
+# endif
+
+#  if defined (_REENTRANT) && ! defined (_STLP_THREADS)
+#   define _STLP_THREADS
+#  endif /* _REENTRANT */
+
+// warning : pthread_spinlock code was reported not to work on RedHat 3
+# if defined(__linux__) && defined(_STLP_USE_PTHREAD_SPINLOCK)
+#  include <features.h>
+#  ifndef __USE_XOPEN2K
+#   undef _STLP_USE_PTHREAD_SPINLOCK
+#  endif /* __USE_XOPEN2K */
+# endif /* __linux__ && _STLP_PTHREADS */
+
+# ifndef _STLP_STATIC_MUTEX
+#  define _STLP_STATIC_MUTEX _STLP_mutex_base
+# endif
+
+
+# if defined (_MFC_VER) && !defined (_STLP_USE_MFC)
+#  define _STLP_USE_MFC 1
+# endif
+
+#if defined (_STLP_THREADS)
+#   define _STLP_VOLATILE volatile
+/* windows.h _MUST be included before bool definition ;( */
+# if defined  (_STLP_WIN32THREADS) && defined (_STLP_NO_BOOL)
+#   undef  NOMINMAX
+#   define NOMINMAX
+#   ifdef _STLP_USE_MFC
+#    include <afx.h>
+#   else
+#    include <windows.h>
+#   endif
+#   define _STLP_WINDOWS_H_INCLUDED
+# endif
+#else
+#   define _STLP_VOLATILE
+#endif
+
+# if !defined ( _STLP_USE_NEW_C_HEADERS ) && !defined ( _STLP_HAS_NO_NEW_C_HEADERS )
+#  define _STLP_USE_NEW_C_HEADERS
+# endif
+/* disable new-style headers if requested */
+# if defined ( _STLP_NO_NEW_C_HEADERS )
+#  undef _STLP_USE_NEW_C_HEADERS
+# endif
+
+# if !defined ( _STLP_STATIC_TEMPLATE_DATA )
+# define _STLP_STATIC_TEMPLATE_DATA 1
+# endif
+
+# if defined (_STLP_BASE_TYPEDEF_BUG)
+#  undef  _STLP_BASE_TYPEDEF_OUTSIDE_BUG
+#  define _STLP_BASE_TYPEDEF_OUTSIDE_BUG 1
+# endif
+
+# if defined ( _STLP_NESTED_TYPE_PARAM_BUG ) || (defined (_STLP_MSVC) && (_STLP_MSVC < 1100))
+#  define _STLP_GLOBAL_NESTED_RETURN_TYPE_PARAM_BUG
+# endif
+
+/* SUNpro 4.2 inline string literal bug */
+#ifdef _STLP_INLINE_STRING_LITERAL_BUG
+# define _STLP_FIX_LITERAL_BUG(__x) __x=__x;
+#else
+# define _STLP_FIX_LITERAL_BUG(__x)
+#endif
+
+# if defined (_STLP_NON_TYPE_TMPL_PARAM_BUG)
+#  undef  _STLP_NO_DEFAULT_NON_TYPE_PARAM
+#  define _STLP_NO_DEFAULT_NON_TYPE_PARAM 1
+# endif
+
+# define _STLP_NEW new
+# define _STLP_PLACEMENT_NEW new
+
+# ifdef _STLP_DEBUG
+#  define _STLP_ASSERTIONS 1
+# endif
+
+/* apple mpw exception handling bug */
+#ifndef _STLP_MPWFIX_TRY
+# define _STLP_MPWFIX_TRY
+#endif
+#ifndef _STLP_MPWFIX_CATCH
+# define _STLP_MPWFIX_CATCH
+#endif
+#ifndef _STLP_MPWFIX_CATCH_ACTION
+# define _STLP_MPWFIX_CATCH_ACTION(action)
+#endif
+
+/* if _STLP_DEBUG or _STLP_ASSERTIONS are set, stl/debug/_debug.h defines those */
+
+# if !defined( _STLP_ASSERTIONS ) && !defined(_STLP_DEBUG) && !defined(_STLP_DEBUG_ALLOC)
+#  define _STLP_ASSERT(expr)
+# endif
+
+# ifndef _STLP_DEBUG
+#  define _STLP_VERBOSE_ASSERT(expr,diagnostic)
+#  define _STLP_DEBUG_CHECK(expr)
+#  define _STLP_DEBUG_DO(expr)
+# endif
+
+#  if !defined (_STLP_WEAK)
+#   define _STLP_WEAK 
+#  endif
+
+/* default parameters as template types derived from arguments ( not always supported ) */
+#  if defined (_STLP_LIMITED_DEFAULT_TEMPLATES)
+#   define __DFL_TMPL_PARAM( classname, defval ) class classname
+#   define __DFL_TMPL_ARG(classname) , classname
+#  else
+#   define _STLP_DEFAULT_TYPE_PARAM 1
+#   define __DFL_TMPL_PARAM( classname, defval ) class classname = defval
+#   define __DFL_TMPL_ARG(classname)  
+#  endif
+
+/* default parameters as complete types */
+# if defined ( _STLP_DEFAULT_TYPE_PARAM )
+#   define __DFL_TYPE_PARAM( classname, defval ) class classname = defval
+#   define __DFL_NON_TYPE_PARAM(type,name,val) type name = val
+#   define __DFL_TYPE_ARG(classname)
+# else
+#   define __DFL_TYPE_PARAM( classname, defval ) class classname
+#   define __DFL_NON_TYPE_PARAM(type,name,val) type name
+#   define __DFL_TYPE_ARG(classname) , classname
+# endif
+
+/* SGI compatibility */
+
+#ifdef _STLP_NO_WCHAR_T
+# ifndef _STLP_NO_NATIVE_WIDE_STREAMS
+#  define  _STLP_NO_NATIVE_WIDE_STREAMS 1
+# endif
+#else
+# define _STLP_HAS_WCHAR_T 1
+#endif
+
+#if !defined (_STLP_NO_AT_MEMBER_FUNCTION)
+# define _STLP_CAN_THROW_RANGE_ERRORS 1
+#endif
+
+# if !defined (_STLP_USE_RAW_SGI_ALLOCATORS)
+#   define _STLP_DEFAULT_ALLOCATOR(_Tp) allocator< _Tp >
+#   define _STLP_DEFAULT_ALLOCATOR_SELECT( _Tp ) __DFL_TMPL_PARAM(_Alloc, allocator< _Tp >)
+#   define _STLP_DEFAULT_PAIR_ALLOCATOR(_Key, _Tp) allocator< pair < _Key, _Tp > >
+#   if defined (_STLP_LIMITED_DEFAULT_TEMPLATES)
+#     define _STLP_DEFAULT_PAIR_ALLOCATOR_SELECT(_Key, _Tp ) class _Alloc
+#     define _STLP_USE_WRAPPER_FOR_ALLOC_PARAM 1
+#   else
+#     define _STLP_DEFAULT_PAIR_ALLOCATOR_SELECT(_Key, _Tp ) \
+             class _Alloc = allocator< pair < _Key, _Tp > >
+#   endif
+# else
+#   define _STLP_DEFAULT_ALLOCATOR( _Tp ) __sgi_alloc
+#   define _STLP_DEFAULT_ALLOCATOR_SELECT( _Tp ) __DFL_TYPE_PARAM(_Alloc,__sgi_alloc)
+#   define _STLP_DEFAULT_PAIR_ALLOCATOR( _Key, _Tp ) __sgi_alloc
+#   define _STLP_DEFAULT_PAIR_ALLOCATOR_SELECT(_Key, _Tp ) __DFL_TYPE_PARAM(_Alloc,__sgi_alloc)
+#   if defined (_STLP_LIMITED_DEFAULT_TEMPLATES) && !defined (_STLP_DEFAULT_TYPE_PARAM)
+#    define _STLP_USE_WRAPPER_FOR_ALLOC_PARAM 1
+#   endif
+# endif
+
+/* default parameters workaround tuning */
+#  if defined ( _STLP_USE_WRAPPER_FOR_ALLOC_PARAM )
+#    define __WORKAROUND_RENAME(X) __##X
+#  else
+#    define __WORKAROUND_RENAME(X) X
+#  endif
+#  if defined ( _STLP_DEBUG )
+#    define __WORKAROUND_DBG_RENAME(X) __##X
+#  else
+#    define __WORKAROUND_DBG_RENAME(X) __WORKAROUND_RENAME(X)
+#  endif
+#  define __FULL_NAME(X) __WORKAROUND_RENAME(X)
+
+/* this always mean the C library is in global namespace */
+# if defined (_STLP_HAS_NO_NEW_C_HEADERS) && ! defined (_STLP_VENDOR_GLOBAL_CSTD)
+#  define _STLP_VENDOR_GLOBAL_CSTD 1
+# endif
+
+/* Depending of whether compiler supports namespaces,
+ * tune the parameters for vendor-supplied libraries.
+ * This section is guarded by _STLP_HAS_NO_NAMESPACES, not by _STLP_USE_NAMESPACES,
+ * since it depends only on the native features, not on user's preference whether
+ * to use namespace for STLport or not.
+ */
+# if !defined (_STLP_HAS_NO_NAMESPACES)
+/* Import some vendor's headers into corresponding STLport ones if they might be needed
+ * (if we wrap native iostreams and use namepace other than std::) */
+#  if defined (_STLP_WHOLE_NATIVE_STD)
+#    define  _STLP_IMPORT_VENDOR_STD 1
+#    undef   _STLP_MINIMUM_IMPORT_STD
+#  elif (defined (_STLP_USE_OWN_NAMESPACE) || ( defined (_STLP_DEBUG) && defined (_STLP_USE_NAMESPACES))) \
+       && defined (_STLP_USE_NEW_IOSTREAMS) && ! defined (_STLP_OWN_IOSTREAMS)
+#    define  _STLP_IMPORT_VENDOR_STD 1
+#  endif
+
+/* if using stlport:: namespace or if C library stuff is not in vendor's std::,
+ * try importing 'em.
+ * MSVC has ambiguity problem when we try to import C-style std:: stuff back into global namespace */
+#  if defined (_STLP_USE_NAMESPACES) && /* ! defined (_STLP_OWN_IOSTREAMS) && */ \
+   ( defined(_STLP_USE_OWN_NAMESPACE) || defined (_STLP_VENDOR_GLOBAL_CSTD))
+#    define  _STLP_IMPORT_VENDOR_CSTD 1
+#  endif
+
+# if defined (_STLP_NO_USING_FOR_GLOBAL_FUNCTIONS) && ! defined (_STLP_DO_IMPORT_CSTD_FUNCTIONS)
+#  define _STLP_NO_CSTD_FUNCTION_IMPORTS
+# endif
+
+#  define  _STLP_USING_NAMESPACE(x) using namespace x ;
+
+namespace std { }
+namespace __std_alias = std;
+
+/* assume std:: namespace for C++ std library if not being told otherwise */
+#  ifdef _STLP_VENDOR_GLOBAL_STD
+#   define _STLP_VENDOR_STD
+#   define _STLP_USING_VENDOR_STD
+#  else
+#   define _STLP_VENDOR_STD __std_alias
+#   define _STLP_USING_VENDOR_STD _STLP_USING_NAMESPACE(_STLP_VENDOR_STD)
+// #   define _STLP_USING_VENDOR_STD
+#  endif
+
+/* tune things that come from C library */
+#  if  defined (_STLP_VENDOR_GLOBAL_CSTD) || !defined(_STLP_USE_NEW_C_HEADERS)
+/*  in old-style headers, C functions go to global scope. */
+#   define _STLP_VENDOR_CSTD
+#   define _STLP_USING_VENDOR_CSTD
+#  else
+#   define _STLP_VENDOR_CSTD  _STLP_VENDOR_STD
+#   define _STLP_USING_VENDOR_CSTD _STLP_USING_NAMESPACE(_STLP_VENDOR_CSTD)
+#  endif /* _STLP_VENDOR_CSTD */
+/* exception, typeinfo, new - always come from the vendor */
+#  ifndef _STLP_VENDOR_EXCEPT_STD
+#   ifdef _STLP_VENDOR_GLOBAL_EXCEPT_STD
+#    define _STLP_VENDOR_EXCEPT_STD
+#   else
+#    define _STLP_VENDOR_EXCEPT_STD _STLP_VENDOR_STD
+#   endif
+#  endif
+# define _STLP_OLD_IO_NAMESPACE
+# ifndef _STLP_VENDOR_MB_NAMESPACE
+#  define _STLP_VENDOR_MB_NAMESPACE _STLP_VENDOR_CSTD
+# endif
+# else 
+/* compiler has no namespace support */
+#  define _STLP_VENDOR_STD 
+#  define _STLP_VENDOR_CSTD
+#  define _STLP_USING_NAMESPACE(x)
+#  define _STLP_USING_VENDOR_CSTD
+#  define _STLP_USING_VENDOR_STD 
+#  define _STLP_VENDOR_EXCEPT_STD
+# endif
+
+# if defined (_STLP_USE_NAMESPACES)
+
+#  if defined (_STLP_USE_OWN_NAMESPACE)
+#   define _STLP_STD      _STL
+#  else
+#   ifdef _STLP_DEBUG
+namespace stdD = std;
+#   endif
+#   define _STLP_STD      std
+#  endif /* _STLP_USE_OWN_NAMESPACE */
+
+#  define _STLP_BEGIN_NAMESPACE namespace _STLP_STD {
+#  define _STLP_END_NAMESPACE }
+
+_STLP_BEGIN_NAMESPACE _STLP_END_NAMESPACE
+
+namespace stlport = _STLP_STD;
+// backward compatibility 
+# undef __STLPORT_NAMESPACE
+# define __STLPORT_NAMESPACE _STLP_STD
+
+/* decide whether or not we use separate namespace for rel ops */
+#   if defined(_STLP_NO_RELOPS_NAMESPACE)
+#     define _STLP_BEGIN_RELOPS_NAMESPACE _STLP_BEGIN_NAMESPACE namespace rel_ops {}
+#     define _STLP_END_RELOPS_NAMESPACE }
+#   else
+/* Use std::rel_ops namespace */
+#     define _STLP_BEGIN_RELOPS_NAMESPACE _STLP_BEGIN_NAMESPACE namespace rel_ops {
+#     define _STLP_END_RELOPS_NAMESPACE } }
+#     define _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+#   endif /* Use std::rel_ops namespace */
+
+# else /* _STLP_USE_NAMESPACES */
+/* STLport is being put into global namespace */
+#  define _STLP_STD
+#  define _STLP_BEGIN_NAMESPACE
+#  define _STLP_END_NAMESPACE
+
+/* boris : it was found out that _STLP_USE_SEPARATE_RELOPS_NAMESPACE 
+   causes less problems than having relational operator templates in global namespace
+   Please define _STLP_NO_RELOPS_NAMESPACE in stl_user_config.h if your code rely on them. */
+#  ifndef _STLP_NO_RELOPS_NAMESPACE
+#   define _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+#  endif
+#  define _STLP_BEGIN_RELOPS_NAMESPACE 
+#  define _STLP_END_RELOPS_NAMESPACE 
+#  undef  _STLP_USE_OWN_NAMESPACE
+# endif  /* _STLP_USE_NAMESPACES */
+
+# define STLPORT_CSTD _STLP_VENDOR_CSTD
+# define STLPORT      _STLP_STD
+
+#if defined(_STLP_BOGUS_TEMPLATE_TYPE_MATCHING_BUG)
+#  define _STLP_SIMPLE_TYPE(T) _stl_trivial_proxy<T>
+#else
+#  define _STLP_SIMPLE_TYPE(T) T
+#endif
+
+/* if we are going to use native new iostreams, use native <string> and <stdexcept> */
+#  if defined (_STLP_USE_NEW_IOSTREAMS) && !defined (_STLP_OWN_IOSTREAMS)
+#   define _STLP_USE_NATIVE_STRING      1
+#   define _STLP_USE_NATIVE_STDEXCEPT   1
+# endif
+
+# ifndef _STLP_RAND48
+# define _STLP_NO_DRAND48
+# endif
+
+/* backwards compatibility */
+# define __STL_NAMESPACE _STLP_STD
+# define __STL_NAME(name) _STLP_STD::name
+
+/* advanced keywords usage */
+#  ifndef  _STLP_NO_NEW_STYLE_CASTS
+#   define __CONST_CAST(__x,__y) const_cast<__x>(__y)
+#   define __STATIC_CAST(__x,__y) static_cast<__x>(__y)
+#   define __REINTERPRET_CAST(__x,__y) reinterpret_cast<__x>(__y)
+#   define __DYNAMIC_CAST(__x,__y) dynamic_cast<__x>(__y)
+#  else
+#   define __STATIC_CAST(__x,__y) ((__x)(__y))
+#   define __CONST_CAST(__x,__y) ((__x)(__y))
+#   define __REINTERPRET_CAST(__x,__y) ((__x)(__y))
+#   define __DYNAMIC_CAST(__x,__y) ((__x)(__y))
+#  endif
+#  if defined (_STLP_NEED_TYPENAME) && ! defined (typename)
+#   define typename
+#  endif
+#  if defined (_STLP_NEED_TYPENAME) || defined (_STLP_NO_TYPENAME_ON_RETURN_TYPE )
+#    define _STLP_TYPENAME_ON_RETURN_TYPE
+#  else
+#    define _STLP_TYPENAME_ON_RETURN_TYPE typename
+#  endif
+# ifdef _STLP_NO_TYPENAME_IN_TEMPLATE_HEADER
+#  define _STLP_HEADER_TYPENAME
+# else
+#  define _STLP_HEADER_TYPENAME typename
+# endif
+# ifndef _STLP_NO_MEMBER_TEMPLATE_KEYWORD
+#   define _STLP_TEMPLATE template
+# else
+#   define _STLP_TEMPLATE
+# endif
+#  if defined (_STLP_NEED_EXPLICIT) && ! defined (explicit)
+#   define explicit
+#  endif
+#  ifndef _STLP_NEED_MUTABLE
+#   define __ASSIGN_MUTABLE(type,x,y) x=y
+#  else
+#   define __ASSIGN_MUTABLE(type,x,y) __CONST_CAST(type,x)=y
+#   define mutable
+#  endif
+# if defined (_STLP_NO_SIGNED_BUILTINS)
+/* old HP-UX doesn't understand "signed" keyword */
+#  define signed
+# endif
+
+#  if defined (_STLP_LOOP_INLINE_PROBLEMS)
+#   define _STLP_INLINE_LOOP
+#  else
+#   define _STLP_INLINE_LOOP inline 
+#  endif
+
+#  define _STLP_PRIVATE public
+#  define _STLP_PROTECTED public
+
+#  ifndef _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX
+#   define _STLP_TEMPLATE_NULL template<>
+#  else
+#   define _STLP_TEMPLATE_NULL
+#  endif
+
+#ifdef _STLP_FUNCTION_TMPL_PARTIAL_ORDER
+#  define _STLP_OPERATOR_TEMPLATE
+# else 
+#  define _STLP_OPERATOR_TEMPLATE _STLP_TEMPLATE_NULL
+#endif
+
+# ifndef _STLP_CLASS_PARTIAL_SPECIALIZATION
+/* unless we have other compiler problem, try simulating partial spec here */
+# if ! defined (_STLP_DONT_SIMULATE_PARTIAL_SPEC_FOR_TYPE_TRAITS)
+#  define  _STLP_SIMULATE_PARTIAL_SPEC_FOR_TYPE_TRAITS
+# endif
+/* For your own iterators, please use inheritance from iterator<> instead of these obsolete queries. */
+#  if  ( defined (_STLP_NESTED_TYPE_PARAM_BUG) || !defined (_STLP_SIMULATE_PARTIAL_SPEC_FOR_TYPE_TRAITS))
+#   if ! defined ( _STLP_USE_OLD_HP_ITERATOR_QUERIES )
+#    define _STLP_USE_OLD_HP_ITERATOR_QUERIES
+#   endif
+#  elif defined ( _STLP_NO_ANACHRONISMS )
+#   undef _STLP_USE_OLD_HP_ITERATOR_QUERIES
+#  endif
+# endif
+
+# ifndef _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
+#   define _STLP_NULL_TMPL_ARGS <>
+# else
+#   define _STLP_NULL_TMPL_ARGS
+# endif
+
+# ifndef _STLP_ALLOCATOR_TYPE_DFL
+#  ifdef _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS 
+#   define _STLP_ALLOCATOR_TYPE_DFL 
+#  else
+#   define _STLP_ALLOCATOR_TYPE_DFL = allocator_type()
+#  endif
+# endif
+
+//When the compiler do not correctly initialized the basic types value in default parameters we prefer
+//to avoid them to be able to correct this bug.
+# if defined (_STLP_DEF_CONST_DEF_PARAM_BUG)
+#  define _STLP_DONT_SUP_DFLT_PARAM 1
+# endif
+
+# if defined (__SGI_STL_NO_ARROW_OPERATOR) && ! defined (_STLP_NO_ARROW_OPERATOR)
+# define _STLP_NO_ARROW_OPERATOR
+# endif
+
+# if !defined (_STLP_CLASS_PARTIAL_SPECIALIZATION)
+#  if !( defined (_STLP_NO_ARROW_OPERATOR)) \
+      && !defined (_STLP_NO_MSVC50_COMPATIBILITY) && !defined (_STLP_MSVC50_COMPATIBILITY)
+/* this one is needed for proper reverse_iterator<> operator ->() handling */
+#   define _STLP_MSVC50_COMPATIBILITY 1
+#  endif
+# endif
+
+#if defined ( _STLP_CLASS_PARTIAL_SPECIALIZATION )
+# if (defined(__IBMCPP__) && (500 <= __IBMCPP__) && (__IBMCPP__ < 600) )
+# define _STLP_DECLARE_REVERSE_ITERATORS(__reverse_iterator) \
+   typedef typename _STLP_STD :: reverse_iterator<const_iterator> const_reverse_iterator; \
+   typedef typename _STLP_STD :: reverse_iterator<iterator> reverse_iterator
+# elif (defined (__sgi) && ! defined (__GNUC__)) || defined (__SUNPRO_CC) || defined (__xlC__)
+#  define _STLP_DECLARE_REVERSE_ITERATORS(__reverse_iterator) \
+   typedef _STLP_STD:: _STLP_TEMPLATE reverse_iterator<const_iterator> const_reverse_iterator; \
+   typedef _STLP_STD:: _STLP_TEMPLATE reverse_iterator<iterator> reverse_iterator
+# else
+#  define _STLP_DECLARE_REVERSE_ITERATORS(__reverse_iterator) \
+   typedef _STLP_STD::reverse_iterator<const_iterator> const_reverse_iterator; \
+   typedef _STLP_STD::reverse_iterator<iterator> reverse_iterator
+# endif
+#else /* _STLP_CLASS_PARTIAL_SPECIALIZATION */
+# if defined (_STLP_MSVC50_COMPATIBILITY)
+# define _STLP_DECLARE_REVERSE_ITERATORS(__reverse_iterator) \
+  typedef _STLP_STD::__reverse_iterator<const_iterator, value_type, const_reference, \
+    const_pointer, difference_type>  const_reverse_iterator; \
+  typedef _STLP_STD::__reverse_iterator<iterator, value_type, reference, pointer, difference_type> \
+    reverse_iterator
+# else
+# define _STLP_DECLARE_REVERSE_ITERATORS(__reverse_iterator) \
+  typedef _STLP_STD::__reverse_iterator<const_iterator, value_type, const_reference, \
+    difference_type>  const_reverse_iterator; \
+  typedef _STLP_STD::__reverse_iterator<iterator, value_type, \
+    reference, difference_type> \
+    reverse_iterator
+# endif
+#endif /* _STLP_CLASS_PARTIAL_SPECIALIZATION */
+
+# define _STLP_DECLARE_BIDIRECTIONAL_REVERSE_ITERATORS \
+         _STLP_DECLARE_REVERSE_ITERATORS(reverse_bidirectional_iterator)
+# define _STLP_DECLARE_RANDOM_ACCESS_REVERSE_ITERATORS \
+         _STLP_DECLARE_REVERSE_ITERATORS(reverse_iterator)
+
+#  define __IMPORT_CONTAINER_TYPEDEFS(_Super)                            \
+    typedef typename _Super::value_type value_type;                      \
+    typedef typename _Super::size_type size_type;                        \
+    typedef typename _Super::difference_type difference_type;            \
+    typedef typename _Super::reference reference;                        \
+    typedef typename _Super::const_reference const_reference;            \
+    typedef typename _Super::pointer pointer;                            \
+    typedef typename _Super::const_pointer const_pointer;                \
+    typedef typename _Super::allocator_type allocator_type;
+
+
+#  define __IMPORT_ITERATORS(_Super)                                     \
+    typedef typename _Super::iterator iterator;                                   \
+    typedef typename _Super::const_iterator const_iterator; 
+
+#  define __IMPORT_REVERSE_ITERATORS(_Super)                             \
+    typedef typename _Super::const_reverse_iterator  const_reverse_iterator;      \
+    typedef typename _Super::reverse_iterator reverse_iterator;
+
+#  define  __IMPORT_SUPER_COPY_ASSIGNMENT(__derived_name, _Self, _SUPER)         \
+    __derived_name(const _Super& __x) : _SUPER(__x) {}          \
+    _Self& operator=(const _Super& __x) {                       \
+        *(_Super*)this = __x;                                   \
+        return *this;                                           \
+    }  \
+    __derived_name(const _Self& __x) : _SUPER(__x) {}          \
+    _Self& operator=(const _Self& __x) {                       \
+        *(_Super*)this = __x;                                   \
+        return *this;                                           \
+    }
+
+# define __IMPORT_WITH_ITERATORS(_Super) \
+__IMPORT_CONTAINER_TYPEDEFS(_Super) __IMPORT_ITERATORS(_Super)
+
+# define __IMPORT_WITH_REVERSE_ITERATORS(_Super) \
+__IMPORT_WITH_ITERATORS(_Super) __IMPORT_REVERSE_ITERATORS(_Super)
+
+# if defined (_STLP_TRIVIAL_CONSTRUCTOR_BUG) 
+#  define __TRIVIAL_CONSTRUCTOR(__type) __type() {}  
+# else
+#  define __TRIVIAL_CONSTRUCTOR(__type)
+# endif
+# if defined (_STLP_TRIVIAL_DESTRUCTOR_BUG)
+#  define __TRIVIAL_DESTRUCTOR(__type) ~__type() {}  
+# else
+#  define __TRIVIAL_DESTRUCTOR(__type) 
+# endif
+
+#  define __TRIVIAL_STUFF(__type)  \
+  __TRIVIAL_CONSTRUCTOR(__type) __TRIVIAL_DESTRUCTOR(__type)
+
+# if ! (defined ( _STLP_NO_EXCEPTIONS ) || defined (_STLP_HAS_NO_EXCEPTIONS) \
+	|| defined ( _STLP_USE_EXCEPTIONS ))
+#  define _STLP_USE_EXCEPTIONS
+# endif 
+
+# ifdef _STLP_USE_EXCEPTIONS
+#   define _STLP_TRY try
+#   define _STLP_CATCH_ALL catch(...)
+#   ifndef _STLP_THROW
+#    define _STLP_THROW(x) throw x
+#   endif
+#   define _STLP_RETHROW throw
+#   define _STLP_UNWIND(action) catch(...) { action; throw; }
+
+#   ifdef _STLP_THROW_RETURN_BUG
+#     define _STLP_RET_AFTER_THROW(data) return data
+#   else
+#     define _STLP_RET_AFTER_THROW(data)
+#   endif
+
+#   if !defined ( _STLP_NO_EXCEPTION_SPEC )
+#    define _STLP_THROWS_INHERENTLY(x) throw x
+#    define _STLP_NOTHROW_INHERENTLY throw()
+#   else
+#    define _STLP_THROWS_INHERENTLY(x)
+#    define _STLP_NOTHROW_INHERENTLY 
+#   endif
+/* We do not use exception throw specifications unless we are forced to */
+#   define _STLP_THROWS(x)
+#   define _STLP_NOTHROW 
+# else
+#   define _STLP_TRY 
+#   define _STLP_CATCH_ALL if (false)
+#   ifndef _STLP_THROW
+#    define _STLP_THROW(x)
+#   endif
+#   define _STLP_RETHROW {}
+#   define _STLP_UNWIND(action) 
+#   define _STLP_THROWS(x)
+#   define _STLP_NOTHROW
+#   define _STLP_RET_AFTER_THROW(data)
+#   define _STLP_THROWS_INHERENTLY(x)
+#   define _STLP_NOTHROW_INHERENTLY 
+# endif
+
+#if defined(_STLP_NO_BOOL)
+# if (defined (__IBMCPP__) && (__IBMCPP__ < 400)) && ! defined (_AIX)
+#  include <isynonym.hpp>
+#  if defined (__OS400__)
+    typedef int bool;
+#  elif !( defined (__xlC__) || defined (_AIX))
+    typedef Boolean bool;
+#  endif
+# else
+#  if defined(_STLP_YVALS_H)
+#   include <yvals.h>
+#  else
+#    if defined (_STLP_DONT_USE_BOOL_TYPEDEF)
+#     define bool int
+#    else
+      typedef int bool;
+#    endif
+#    define true 1
+#    define false 0
+#  endif
+# endif /* __IBMCPP__ */
+#else
+#    define _STLP_BOOL_KEYWORD 1
+#endif /* _STLP_NO_BOOL */
+
+# ifndef _STLP_MPW_EXTRA_CONST
+#  define _STLP_MPW_EXTRA_CONST
+# endif
+
+# ifndef _STLP_DEFAULTCHAR
+#  define _STLP_DEFAULTCHAR char
+# endif
+
+# if defined (_STLP_DEBUG_ALLOC) && ! defined (_STLP_ASSERTIONS)
+#  define _STLP_ASSERTIONS 1
+# endif
+
+/* uninitialized value filler */
+# ifndef _STLP_SHRED_BYTE
+/* This value is designed to cause problems if an error occurs */
+#   define _STLP_SHRED_BYTE 0xA3
+# endif /* _STLP_SHRED_BYTE */
+
+/* shared library tune-up */
+# ifndef _STLP_IMPORT_DECLSPEC
+#  define _STLP_IMPORT_DECLSPEC
+# endif
+
+/* a keyword used to instantiate export template */
+#  ifndef _STLP_EXPORT_TEMPLATE_KEYWORD
+#   define _STLP_EXPORT_TEMPLATE_KEYWORD
+#  endif
+# ifndef _STLP_IMPORT_TEMPLATE_KEYWORD
+#  define _STLP_IMPORT_TEMPLATE_KEYWORD
+# endif
+
+
+# if  defined (_STLP_DLLEXPORT_NEEDS_PREDECLARATION) && defined (_STLP_USE_DECLSPEC)
+#  if ! defined (_STLP_USE_TEMPLATE_EXPORT)
+/* this setting turns on "extern template" extension use */
+#   define _STLP_USE_TEMPLATE_EXPORT
+#  endif
+#  if defined (_STLP_DESIGNATED_DLL) && ! defined (_STLP_NO_FORCE_INSTANTIATE)
+#   define _STLP_NO_FORCE_INSTANTIATE
+#  endif
+# endif
+
+#   if defined (_STLP_DESIGNATED_DLL) /* This is a lib which will contain STLport exports */
+#    define  _STLP_EXPORT          _STLP_EXPORT_TEMPLATE_KEYWORD
+#   else
+#    define  _STLP_EXPORT          _STLP_IMPORT_TEMPLATE_KEYWORD
+#  endif
+
+# ifndef _STLP_EXPORT_TEMPLATE
+#  define  _STLP_EXPORT_TEMPLATE _STLP_EXPORT template
+# endif
+
+# if defined (_STLP_USE_DECLSPEC) /* using export/import technique */
+
+#  ifndef _STLP_EXPORT_DECLSPEC
+#   define _STLP_EXPORT_DECLSPEC
+#  endif
+#  ifndef _STLP_IMPORT_DECLSPEC
+#   define _STLP_IMPORT_DECLSPEC
+#  endif
+#  ifndef _STLP_CLASS_EXPORT_DECLSPEC
+#   define _STLP_CLASS_EXPORT_DECLSPEC
+#  endif
+#  ifndef _STLP_CLASS_IMPORT_DECLSPEC
+#   define _STLP_CLASS_IMPORT_DECLSPEC
+#  endif
+#  if defined (_STLP_DESIGNATED_DLL) /* This is a lib which will contain STLport exports */
+#   define  _STLP_DECLSPEC        _STLP_EXPORT_DECLSPEC 
+#   define  _STLP_CLASS_DECLSPEC  _STLP_CLASS_EXPORT_DECLSPEC 
+#  else
+#   define  _STLP_DECLSPEC        _STLP_IMPORT_DECLSPEC   /* Other modules, importing STLport exports */
+#   define  _STLP_CLASS_DECLSPEC  _STLP_CLASS_IMPORT_DECLSPEC
+#  endif
+
+#  ifndef _STLP_STATIC_CONST_INIT_BUG
+// constant data members cannot be exported; using workaround here
+#   define _STLP_STATIC_CONST_INIT_BUG
+#  endif
+# else /* Not using DLL export/import specifications */
+
+#  define _STLP_DECLSPEC
+#  define _STLP_CLASS_DECLSPEC
+
+# endif
+
+#  define _STLP_EXPORT_TEMPLATE_CLASS _STLP_EXPORT template class _STLP_CLASS_DECLSPEC
+
+#  if defined (_STLP_MSVC) || defined (__ICL) 
+#   define _STLP_STATIC_MEMBER_DECLSPEC
+#  else
+#   define _STLP_STATIC_MEMBER_DECLSPEC _STLP_DECLSPEC
+#  endif
+
+# if !defined (_STLP_CALL)
+#   define _STLP_CALL
+# endif
+
+#ifdef _STLP_OWN_IOSTREAMS
+
+#  if defined (__DECCXX) && ! defined (__USE_STD_IOSTREAM)
+#   define __USE_STD_IOSTREAM
+#  endif
+
+/* We only need to expose details of streams implementation 
+   if we use non-standard i/o or are building STLport*/
+# if defined (__BUILDING_STLPORT) ||  defined (_STLP_NO_FORCE_INSTANTIATE) || !defined(_STLP_NO_CUSTOM_IO)
+#  define _STLP_EXPOSE_STREAM_IMPLEMENTATION 1
+# endif
+
+/* We only need to expose details of global implementation if we are building STLport 
+   or have not instantiated everything in the lib */
+# if defined (__BUILDING_STLPORT) || defined (_STLP_NO_FORCE_INSTANTIATE)
+#   undef  _STLP_EXPOSE_GLOBALS_IMPLEMENTATION
+#   define _STLP_EXPOSE_GLOBALS_IMPLEMENTATION 1
+# endif
+
+#else
+/* when we are not using SGI iostreams, we must expose globals, but not streams implementation */
+#  define _STLP_EXPOSE_GLOBALS_IMPLEMENTATION
+#endif
+
+# ifdef _STLP_PARTIAL_SPEC_NEEDS_TEMPLATE_ARGS
+#  define _STLP_PSPEC2(t1,t2) < t1,t2 >
+#  define _STLP_PSPEC3(t1,t2,t3) < t1,t2,t3 >
+# else
+#  define _STLP_PSPEC2(t1,t2)	/* nothing */
+#  define _STLP_PSPEC3(t1,t2,t3)	/* nothing */
+# endif
+
+# ifdef _STLP_OPERATOR_SPEC_NEEDS_TEMPLATE_ARGS
+#  define _STLP_OPSPEC2(t1,t2) < t1,t2 >
+# else
+#  define _STLP_OPSPEC2(t1,t2)	/* nothing */
+# endif
+
+//Activation of the partial template workaround:
+# if !defined(_STLP_DONT_USE_PARTIAL_SPEC_WRKD) \
+    && (!defined(_STLP_CLASS_PARTIAL_SPECIALIZATION) || !defined(_STLP_FUNCTION_TMPL_PARTIAL_ORDER))
+#  define _STLP_USE_PARTIAL_SPEC_WORKAROUND
+# endif
+
+# if defined (_STLP_OWN_IOSTREAMS)
+#  define _STLP_NEW_IO_NAMESPACE _STLP_STD
+#  define _STLP_NO_WIDE_STREAMS  _STLP_NO_WCHAR_T
+# else
+#  ifdef _STLP_USE_NEW_IOSTREAMS
+#   define _STLP_NEW_IO_NAMESPACE _STLP_VENDOR_STD
+#   ifdef _STLP_NO_NATIVE_WIDE_STREAMS
+#    define _STLP_NO_WIDE_STREAMS _STLP_NO_NATIVE_WIDE_STREAMS
+#   endif /* _STLP_NO_NATIVE_WIDE_STREAMS */
+#  else
+#   define _STLP_NO_WIDE_STREAMS
+#   define _STLP_NEW_IO_NAMESPACE
+#  endif
+# endif
+
+#ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+# define _STLP_RELOPS_OPERATORS(_TMPL, _TP) \
+_TMPL inline bool _STLP_CALL operator!=(const _TP& __x, const _TP& __y) {return !(__x == __y);}\
+_TMPL inline bool _STLP_CALL operator>(const _TP& __x, const _TP& __y)  {return __y < __x;}\
+_TMPL inline bool _STLP_CALL operator<=(const _TP& __x, const _TP& __y) { return !(__y < __x);}\
+_TMPL inline bool _STLP_CALL operator>=(const _TP& __x, const _TP& __y) { return !(__x < __y);}
+# else
+#  define _STLP_RELOPS_OPERATORS(_TMPL, _TP)
+# endif
+
+# if defined (_STLP_FULL_ADL_IMPLEMENTED) && defined (_STLP_NO_OWN_IOSTREAMS)
+#  error "Invalid configuration, STLport wrapper iostream mode can't be used with compiler"\
+         "implementing full Argument Dependent Lookup. Please remove _STLP_NO_OWN_IOSTREAMS switch"\
+         "and build STLport library."
+# endif /* _STLP_FULL_ADL_IMPLEMENTED && _STLP_NO_OWN_IOSTREAMS */
+
+# if defined ( _STLP_USE_ABBREVS )
+#  include <stl/_abbrevs.h>
+# endif
+
+/* some cleanup */
+# undef _STLP_DONT_USE_BOOL_TYPEDEF
+# undef _STLP_YVALS_H
+# undef _STLP_LOOP_INLINE_PROBLEMS
+# undef _STLP_NEED_EXPLICIT
+# undef _STLP_NEED_TYPENAME
+# undef _STLP_NO_NEW_STYLE_CASTS
+# undef __AUTO_CONFIGURED
+
+#endif /* _STLP_CONFIG_H */
+
+/*
+ Local Variables:
+ mode:C++
+ End:
+*/
diff --git a/main/source/stlport/stlport/stl/_config_compat.h b/main/source/stlport/stlport/stl/_config_compat.h
new file mode 100644
index 00000000..cec977ac
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_config_compat.h
@@ -0,0 +1,89 @@
+
+/*
+ * Compatibility section
+ * This section sets new-style macros based on old-style ones, for compatibility
+ */
+
+# if (defined (__STL_NO_SGI_IOSTREAMS) || defined (_STLP_NO_SGI_IOSTREAMS)) \
+  && ! defined ( _STLP_NO_OWN_IOSTREAMS )
+#  define _STLP_NO_OWN_IOSTREAMS
+# endif
+
+# if defined (__STL_NO_NEW_IOSTREAMS) && ! defined ( _STLP_NO_NEW_IOSTREAMS )
+#  define _STLP_NO_NEW_IOSTREAMS __STL_NO_NEW_IOSTREAMS
+# endif
+# if defined (__STL_NO_IOSTREAMS) && ! defined ( _STLP_NO_IOSTREAMS )
+#  define _STLP_NO_IOSTREAMS __STL_NO_IOSTREAMS
+# endif
+# if defined (__STL_DEBUG) && ! defined ( _STLP_DEBUG )
+#  define _STLP_DEBUG __STL_DEBUG
+# endif
+# if defined (__STL_NO_ANACHRONISMS) && ! defined ( _STLP_NO_ANACHRONISMS )
+#  define _STLP_NO_ANACHRONISMS __STL_NO_ANACHRONISMS
+# endif
+# if defined (__STL_NO_EXTENSIONS) && ! defined ( _STLP_NO_EXTENSIONS )
+#  define _STLP_NO_EXTENSIONS __STL_NO_EXTENSIONS
+# endif
+# if defined (__STL_NO_EXCEPTIONS) && ! defined ( _STLP_NO_EXCEPTIONS )
+#  define _STLP_NO_EXCEPTIONS __STL_NO_EXCEPTIONS
+# endif
+# if defined (__STL_NO_NAMESPACES) && ! defined ( _STLP_NO_NAMESPACES )
+#  define _STLP_NO_NAMESPACES __STL_NO_NAMESPACES
+# endif
+# if defined (__STL_MINIMUM_DEFAULT_TEMPLATE_PARAMS) && ! defined ( _STLP_MINIMUM_DEFAULT_TEMPLATE_PARAMS )
+#  define _STLP_MINIMUM_DEFAULT_TEMPLATE_PARAMS __STL_MINIMUM_DEFAULT_TEMPLATE_PARAMS
+# endif
+# if defined (__STL_NO_OWN_NAMESPACE) && ! defined ( _STLP_NO_OWN_NAMESPACE )
+#  define _STLP_NO_OWN_NAMESPACE __STL_NO_OWN_NAMESPACE
+# endif
+
+# if defined (__STL_NO_RELOPS_NAMESPACE) && ! defined ( _STLP_NO_RELOPS_NAMESPACE )
+#  define _STLP_NO_RELOPS_NAMESPACE __STL_NO_RELOPS_NAMESPACE
+# endif
+
+# if defined (__STL_DEBUG_UNINITIALIZED) && ! defined ( _STLP_DEBUG_UNINITIALIZED )
+#  define _STLP_DEBUG_UNINITIALIZED __STL_DEBUG_UNINITIALIZED
+# endif
+# if defined (__STL_SHRED_BYTE) && ! defined ( _STLP_SHRED_BYTE )
+#  define _STLP_SHRED_BYTE __STL_SHRED_BYTE
+# endif
+# if defined (__STL_USE_MFC) && ! defined ( _STLP_USE_MFC )
+#  define _STLP_USE_MFC __STL_USE_MFC
+# endif
+
+# if defined (__STL_USE_NEWALLOC) && ! defined ( _STLP_USE_NEWALLOC )
+#  define _STLP_USE_NEWALLOC __STL_USE_NEWALLOC
+# endif
+# if defined (__STL_USE_MALLOC) && ! defined ( _STLP_USE_MALLOC )
+#  define _STLP_USE_MALLOC __STL_USE_MALLOC
+# endif
+
+# if defined (__STL_DEBUG_ALLOC) && ! defined ( _STLP_DEBUG_ALLOC )
+#  define _STLP_DEBUG_ALLOC __STL_DEBUG_ALLOC
+# endif
+
+# if defined (__STL_DEBUG_MESSAGE) && ! defined ( _STLP_DEBUG_MESSAGE )
+#  define _STLP_DEBUG_MESSAGE __STL_DEBUG_MESSAGE
+# endif
+
+# if defined (__STL_DEBUG_TERMINATE) && ! defined ( _STLP_DEBUG_TERMINATE )
+#  define _STLP_DEBUG_TERMINATE __STL_DEBUG_TERMINATE
+# endif
+
+# if defined (__STL_NO_DEBUG_EXCEPTIONS) && ! defined ( _STLP_NO_DEBUG_EXCEPTIONS )
+#  define _STLP_NO_DEBUG_EXCEPTIONS __STL_NO_DEBUG_EXCEPTIONS
+# endif
+
+# if defined (__STL_USE_ABBREVS) && ! defined ( _STLP_USE_ABBREVS )
+#  define _STLP_USE_ABBREVS __STL_USE_ABBREVS
+# endif
+
+# if defined (__STL_NO_MSVC50_COMPATIBILITY) && ! defined ( _STLP_NO_MSVC50_COMPATIBILITY )
+#  define _STLP_NO_MSVC50_COMPATIBILITY __STL_NO_MSVC50_COMPATIBILITY
+# endif
+
+# if defined (__STL_USE_RAW_SGI_ALLOCATORS) && ! defined ( _STLP_USE_RAW_SGI_ALLOCATORS )
+#  define _STLP_USE_RAW_SGI_ALLOCATORS __STL_USE_RAW_SGI_ALLOCATORS
+# endif
+
+
diff --git a/main/source/stlport/stlport/stl/_config_compat_post.h b/main/source/stlport/stlport/stl/_config_compat_post.h
new file mode 100644
index 00000000..f00a5db6
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_config_compat_post.h
@@ -0,0 +1,35 @@
+//==========================================
+
+# define __SGI_STL_PORT  _STLPORT_VERSION
+
+# if defined (_STLP_DEBUG) && ! defined ( __STL_DEBUG )
+#  define __STL_DEBUG _STLP_DEBUG
+# endif
+
+# if defined (_STLP_USE_NAMESPACES)
+#  undef  __STL_USE_NAMESPACES 
+#  define __STL_USE_NAMESPACES _STLP_USE_NAMESPACES
+# endif
+
+# if defined (_STLP_USE_EXCEPTIONS)
+#  undef  __STL_USE_EXCEPTIONS 
+#  define __STL_USE_EXCEPTIONS _STLP_USE_EXCEPTIONS
+# endif
+
+# if defined (_STLP_USE_NEW_IOSTREAMS) && ! defined ( __STL_USE_NEW_IOSTREAMS )
+#  define __STL_USE_NEW_IOSTREAMS _STLP_USE_NEW_IOSTREAMS
+# endif
+
+# if defined (_STLP_BEGIN_NAMESPACE) && ! defined ( __STL_BEGIN_NAMESPACE )
+#  define __STL_BEGIN_NAMESPACE _STLP_BEGIN_NAMESPACE
+#  define __STL_END_NAMESPACE _STLP_END_NAMESPACE
+#  define __STL_VENDOR_STD _STLP_VENDOR_STD
+#  define __STL_VENDOR_CSTD _STLP_VENDOR_CSTD
+# endif
+
+/*
+# if defined (_STLP_XXX) && ! defined ( __STL_XXX )
+#  define __STL_XXX _STLP_XXX
+# endif
+*/
+
diff --git a/main/source/stlport/stlport/stl/_construct.h b/main/source/stlport/stlport/stl/_construct.h
new file mode 100644
index 00000000..1a93dd7e
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_construct.h
@@ -0,0 +1,167 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_CONSTRUCT_H
+#define _STLP_INTERNAL_CONSTRUCT_H
+
+# if defined (_STLP_DEBUG_UNINITIALIZED) && ! defined (_STLP_CSTRING)
+# include <cstring>
+# endif
+
+# ifndef _STLP_INTERNAL_NEW_HEADER
+#  include <stl/_new.h>
+# endif
+
+
+#ifndef _STLP_INTERNAL_ITERATOR_BASE_H
+# include <stl/_iterator_base.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+# ifdef _STLP_TRIVIAL_DESTRUCTOR_BUG
+template <class _Tp>
+inline void __destroy_aux(_Tp* __pointer, const __false_type&) { __pointer->~_Tp(); }
+template <class _Tp>
+inline void __destroy_aux(_Tp* __pointer, const __true_type&) {}
+# endif
+
+template <class _Tp>
+inline void _Destroy(_Tp* __pointer) {
+# if _MSC_VER >= 1010
+  __pointer;
+# endif	// _MSC_VER >= 1000
+# ifdef _STLP_TRIVIAL_DESTRUCTOR_BUG
+  typedef typename __type_traits<_Tp>::has_trivial_destructor _Trivial_destructor;
+  __destroy_aux(__pointer, _Trivial_destructor());
+# else
+#  if ( defined (__BORLANDC__) && ( __BORLANDC__ < 0x500 ) )
+    __pointer->_Tp::~_Tp();
+#  else
+    __pointer->~_Tp();
+#  endif
+# endif
+# ifdef _STLP_DEBUG_UNINITIALIZED
+	memset((char*)__pointer, _STLP_SHRED_BYTE, sizeof(_Tp));
+# endif
+}
+
+# if defined (new)
+#   define _STLP_NEW_REDEFINE new
+#   undef new
+# endif 
+
+# ifdef _STLP_DEFAULT_CONSTRUCTOR_BUG
+template <class _T1>
+inline void _Construct_aux (_T1* __p, const __false_type&) {
+_STLP_PLACEMENT_NEW (__p) _T1();
+}
+
+template <class _T1>
+inline void _Construct_aux (_T1* __p, const __true_type&) {
+_STLP_PLACEMENT_NEW (__p) _T1(0);
+}
+# endif
+
+template <class _T1, class _T2>
+inline void _Construct(_T1* __p, const _T2& __val) {
+# ifdef _STLP_DEBUG_UNINITIALIZED
+	memset((char*)__p, _STLP_SHRED_BYTE, sizeof(_T1));
+# endif
+    _STLP_PLACEMENT_NEW (__p) _T1(__val);
+}
+
+template <class _T1>
+inline void _Construct(_T1* __p) {
+# ifdef _STLP_DEBUG_UNINITIALIZED
+  memset((char*)__p, _STLP_SHRED_BYTE, sizeof(_T1));
+# endif
+# ifdef _STLP_DEFAULT_CONSTRUCTOR_BUG
+typedef typename _Is_integer<_T1>::_Integral _Is_Integral;
+_Construct_aux (__p, _Is_Integral() );
+# else
+  _STLP_PLACEMENT_NEW (__p) _T1();
+# endif
+}
+
+# if defined(_STLP_NEW_REDEFINE)
+# ifdef DEBUG_NEW
+#  define new DEBUG_NEW
+# endif
+#  undef _STLP_NEW_REDEFINE
+# endif 
+
+template <class _ForwardIterator>
+_STLP_INLINE_LOOP void
+__destroy_aux(_ForwardIterator __first, _ForwardIterator __last, const __false_type&) {
+  for ( ; __first != __last; ++__first)
+    _STLP_STD::_Destroy(&*__first);
+}
+
+template <class _ForwardIterator> 
+inline void __destroy_aux(_ForwardIterator, _ForwardIterator, const __true_type&) {}
+
+template <class _ForwardIterator, class _Tp>
+inline void 
+__destroy(_ForwardIterator __first, _ForwardIterator __last, _Tp*) {
+  typedef typename __type_traits<_Tp>::has_trivial_destructor _Trivial_destructor;
+  __destroy_aux(__first, __last, _Trivial_destructor());
+}
+
+template <class _ForwardIterator>
+inline void _Destroy(_ForwardIterator __first, _ForwardIterator __last) {
+  __destroy(__first, __last, _STLP_VALUE_TYPE(__first, _ForwardIterator));
+}
+
+inline void _Destroy(char*, char*) {}
+# ifdef _STLP_HAS_WCHAR_T // dwa 8/15/97
+inline void _Destroy(wchar_t*, wchar_t*) {}
+inline void _Destroy(const wchar_t*, const wchar_t*) {}
+# endif
+
+# ifndef _STLP_NO_ANACHRONISMS
+// --------------------------------------------------
+// Old names from the HP STL.
+
+template <class _T1, class _T2>
+inline void construct(_T1* __p, const _T2& __val) {_Construct(__p, __val); }
+template <class _T1>
+inline void construct(_T1* __p) { _Construct(__p); }
+template <class _Tp>
+inline void destroy(_Tp* __pointer) {  _STLP_STD::_Destroy(__pointer); }
+template <class _ForwardIterator>
+inline void destroy(_ForwardIterator __first, _ForwardIterator __last) { _STLP_STD::_Destroy(__first, __last); }
+# endif
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_INTERNAL_CONSTRUCT_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_ctraits_fns.h b/main/source/stlport/stlport/stl/_ctraits_fns.h
new file mode 100644
index 00000000..40107f1b
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_ctraits_fns.h
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Silicon Graphics makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ */ 
+
+// WARNING: This is an internal header file, included by other C++
+// standard library headers.  You should not attempt to use this header
+// file directly.
+
+#ifndef _STLP_INTERNAL_CTRAITS_FUNCTIONS_H
+#define _STLP_INTERNAL_CTRAITS_FUNCTIONS_H
+
+# ifndef _STLP_INTERNAL_FUNCTION_H 
+#  include <stl/_function_base.h>
+# endif
+
+// This file contains a few small adapters that allow a character
+// traits class to be used as a function object.
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _Traits>
+struct _Eq_traits
+  : public binary_function<typename _Traits::char_type,
+                           typename _Traits::char_type,
+                           bool>
+{
+  bool operator()(const typename _Traits::char_type& __x,
+                  const typename _Traits::char_type& __y) const
+    { return _Traits::eq(__x, __y); }
+};
+
+template <class _Traits>
+struct _Eq_char_bound
+  : public unary_function<typename _Traits::char_type, bool>
+{
+  typename _Traits::char_type __val;
+  _Eq_char_bound(typename _Traits::char_type __c) : __val(__c) {}
+  bool operator()(const typename _Traits::char_type& __x) const
+    { return _Traits::eq(__x, __val); }
+};
+
+template <class _Traits>
+struct _Neq_char_bound
+  : public unary_function<typename _Traits::char_type, bool>
+{
+  typename _Traits::char_type __val;
+  _Neq_char_bound(typename _Traits::char_type __c) : __val(__c) {}
+  bool operator()(const typename _Traits::char_type& __x) const
+    { return !_Traits::eq(__x, __val); }
+};
+
+template <class _Traits>
+struct _Eq_int_bound
+  : public unary_function<typename _Traits::char_type, bool>
+{
+  typename _Traits::int_type __val;
+
+  _Eq_int_bound(typename _Traits::int_type __c) : __val(__c) {}
+  bool operator()(const typename _Traits::char_type& __x) const
+    { return _Traits::eq_int_type(_Traits::to_int_type(__x), __val); }
+};
+
+# if 0
+template <class _Traits>
+struct _Lt_traits
+  : public binary_function<typename _Traits::char_type,
+                           typename _Traits::char_type,
+                           bool>
+{
+  bool operator()(const typename _Traits::char_type& __x,
+                  const typename _Traits::char_type& __y) const
+    { return _Traits::lt(__x, __y); }
+};
+# endif
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_INTERNAL_CTRAITS_FUNCTIONS_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
+
+
+
diff --git a/main/source/stlport/stlport/stl/_ctype.h b/main/source/stlport/stlport/stl/_ctype.h
new file mode 100644
index 00000000..d37b4a7a
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_ctype.h
@@ -0,0 +1,269 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+// WARNING: This is an internal header file, included by other C++
+// standard library headers.  You should not attempt to use this header
+// file directly.
+
+#ifndef _STLP_INTERNAL_CTYPE_H
+#define _STLP_INTERNAL_CTYPE_H
+
+# ifndef _STLP_C_LOCALE_H
+#  include <stl/c_locale.h>
+# endif
+# ifndef _STLP_INTERNAL_LOCALE_H
+#  include <stl/_locale.h>
+# endif
+# ifndef _STLP_INTERNAL_ALGOBASE_H
+#  include <stl/_algobase.h>
+# endif
+
+_STLP_BEGIN_NAMESPACE
+
+class _STLP_CLASS_DECLSPEC ctype_base {
+public:
+  enum mask {
+    space   = _Locale_SPACE,
+    print   = _Locale_PRINT,
+    cntrl   = _Locale_CNTRL,
+    upper   = _Locale_UPPER,
+    lower   = _Locale_LOWER,
+    alpha   = _Locale_ALPHA,
+    digit   = _Locale_DIGIT,
+    punct   = _Locale_PUNCT,
+    xdigit  = _Locale_XDIGIT,
+    alnum   = alpha | digit,
+    graph   = alnum | punct
+  };
+};
+
+// ctype<> template
+
+template <class charT> class ctype {};
+template <class charT> class ctype_byname {};
+
+//ctype specializations
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC ctype<char> :   public locale::facet, public ctype_base 
+{
+
+# ifndef _STLP_NO_WCHAR_T
+#  ifdef _STLP_MSVC
+    typedef ctype<wchar_t> _Wctype;
+    friend _Wctype;
+#  else
+    friend class ctype<wchar_t>;
+#  endif
+# endif
+  friend class _Locale;
+public:
+
+  typedef char char_type;
+
+  explicit ctype(const mask* __tab = 0, bool __del = false, size_t __refs = 0);
+  bool is(mask __m, char __c) const
+    { return ((*(_M_ctype_table+(unsigned char)__c)) & __m) != 0; }
+
+  const char* is(const char* __low, const char* __high, mask* __vec) const {
+    for (const char* __p = __low;__p != __high; ++__p, ++__vec) {
+      *__vec = _M_ctype_table[(unsigned char)*__p];
+    }
+    return __high;
+  }
+
+  const char* scan_is(mask __m, const char* __low, const char* __high) const;
+  const char* scan_not(mask __m, const char* __low, const char* __high) const;
+
+  char        (toupper)(char __c) const { return do_toupper(__c); }
+  const char* (toupper)(char* __low, const char* __high) const { 
+    return do_toupper(__low, __high); 
+  }
+
+  char        (tolower)(char __c) const { return do_tolower(__c); }
+  const char* (tolower)(char* __low, const char* __high) const { 
+    return do_tolower(__low, __high); 
+  }
+  
+  char        widen(char __c) const { return do_widen(__c); }
+  const char* widen(const char* __low, const char* __high, char* __to) const { 
+    return do_widen(__low, __high, __to); 
+  }
+
+  char        narrow(char __c, char __dfault) const { 
+    return do_narrow(__c, __dfault); 
+  }
+  const char* narrow(const char* __low, const char* __high,
+                     char __dfault, char* __to) const { 
+    return do_narrow(__low, __high, __dfault, __to); 
+  }
+
+  _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
+# if defined(_STLP_STATIC_CONST_INIT_BUG)
+  enum __TableSize { table_size = 256 };
+# else
+  static const size_t table_size = 256;
+# endif
+
+protected:
+  const mask* table() const _STLP_NOTHROW {return _M_ctype_table;}
+  static const mask* _STLP_CALL classic_table() _STLP_NOTHROW { return & _S_classic_table [1]; }
+
+  ~ctype();
+
+  virtual char        do_toupper(char __c) const;
+  virtual char        do_tolower(char __c) const;
+  virtual const char* do_toupper(char* __low, const char* __high) const;
+  virtual const char* do_tolower(char* __low, const char* __high) const;
+  virtual char        do_widen(char __c) const;
+  virtual const char* do_widen(const char* __low, const char* __high,
+                               char* __to) const;
+  virtual char        do_narrow(char __c, char /* dfault */ ) const;
+  virtual const char* do_narrow(const char* __low, const char* __high,
+                                char /* dfault */, char* __to) const;
+private:
+  struct _Is_mask {
+    mask __m;
+    _Is_mask(mask __x): __m(__x) {}
+   bool operator()(char __c) {return (__m & (unsigned char) __c) != 0;}
+  };
+
+  static const mask _S_classic_table[257 /* table_size + 1 */];
+  const mask* _M_ctype_table;
+  bool _M_delete;
+
+  static const unsigned char _S_upper[256 /* table_size */];
+  static const unsigned char _S_lower[256 /* table_size */];
+};
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC ctype_byname<char>: public ctype<char> {
+public:
+  explicit ctype_byname(const char*, size_t = 0);
+  ~ctype_byname();
+
+  virtual char        do_toupper(char __c) const;
+  virtual char        do_tolower(char __c) const;
+
+  virtual const char* do_toupper(char*, const char*) const;
+  virtual const char* do_tolower(char*, const char*) const;
+
+private:
+  mask _M_byname_table[table_size + 1];
+  _Locale_ctype* _M_ctype;
+};
+
+
+# ifndef _STLP_NO_WCHAR_T
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC ctype<wchar_t> : public locale::facet, public ctype_base 
+{
+  friend class _Locale;
+public:
+  typedef wchar_t char_type;
+
+  explicit ctype(size_t __refs = 0) : _BaseFacet(__refs) {}
+
+  bool is(mask __m, wchar_t __c) const
+    { return do_is(__m, __c); }
+
+  const wchar_t* is(const wchar_t* __low, const wchar_t* __high,
+                    mask* __vec) const
+    { return do_is(__low, __high, __vec); }
+
+  const wchar_t* scan_is(mask __m, 
+                         const wchar_t* __low, const wchar_t* __high) const
+    { return do_scan_is(__m, __low, __high); }
+
+  const wchar_t* scan_not (mask __m, 
+                           const wchar_t* __low, const wchar_t* __high) const
+    { return do_scan_not(__m, __low, __high); }
+
+  wchar_t (toupper)(wchar_t __c) const { return do_toupper(__c); }
+  const wchar_t* (toupper)(wchar_t* __low, const wchar_t* __high) const
+    { return do_toupper(__low, __high); }
+
+  wchar_t (tolower)(wchar_t __c) const { return do_tolower(__c); }
+  const wchar_t* (tolower)(wchar_t* __low, const wchar_t* __high) const
+    { return do_tolower(__low, __high); }
+
+  wchar_t widen(char __c) const { return do_widen(__c); }
+  const char* widen(const char* __low, const char* __high,
+                    wchar_t* __to) const
+    { return do_widen(__low, __high, __to); }
+
+  char narrow(wchar_t __c, char __dfault) const
+    { return do_narrow(__c, __dfault); }
+  const wchar_t* narrow(const wchar_t* __low, const wchar_t* __high,
+                        char __dfault, char* __to) const
+    { return do_narrow(__low, __high, __dfault, __to); }
+
+  _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
+
+protected:
+  ~ctype();
+
+  virtual bool           do_is(mask __m, wchar_t __c) const;
+  virtual const wchar_t* do_is(const wchar_t*, const wchar_t*, mask*) const;
+  virtual const wchar_t* do_scan_is(mask,
+                                    const wchar_t*, const wchar_t*) const;
+  virtual const wchar_t* do_scan_not(mask,
+                                     const wchar_t*, const wchar_t*) const;
+  virtual wchar_t do_toupper(wchar_t __c) const;
+  virtual const wchar_t* do_toupper(wchar_t*, const wchar_t*) const;
+  virtual wchar_t do_tolower(wchar_t c) const;
+  virtual const wchar_t* do_tolower(wchar_t*, const wchar_t*) const;
+  virtual wchar_t do_widen(char c) const;
+  virtual const char* do_widen(const char*, const char*, wchar_t*) const;
+  virtual char  do_narrow(wchar_t __c, char __dfault) const;
+  virtual const wchar_t* do_narrow(const wchar_t*, const wchar_t*,
+                                   char, char*) const;
+};
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC ctype_byname<wchar_t>: public ctype<wchar_t> {
+public:
+  explicit ctype_byname(const char* __name, size_t __refs = 0);
+
+protected:
+  ~ctype_byname();
+
+  virtual bool           do_is(mask __m, wchar_t __c) const;
+  virtual const wchar_t* do_is(const wchar_t*, const wchar_t*, mask*) const;
+  virtual const wchar_t* do_scan_is(mask,
+                                    const wchar_t*, const wchar_t*) const;
+  virtual const wchar_t* do_scan_not(mask,
+                                     const wchar_t*, const wchar_t*) const;
+  virtual wchar_t do_toupper(wchar_t __c) const;
+  virtual const wchar_t* do_toupper(wchar_t*, const wchar_t*) const;
+  virtual wchar_t do_tolower(wchar_t c) const;
+  virtual const wchar_t* do_tolower(wchar_t*, const wchar_t*) const;
+
+private:
+  _Locale_ctype* _M_ctype;
+};
+
+# endif /* WCHAR_T */
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_INTERNAL_CTYPE_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_cwchar.h b/main/source/stlport/stlport/stl/_cwchar.h
new file mode 100644
index 00000000..22aa8da2
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_cwchar.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_CWCHAR_H
+# define _STLP_CWCHAR_H
+
+#ifndef _STLP_NO_WCHAR_T
+#ifdef __cplusplus
+# include <cwchar>
+#else
+# include <wchar.h>
+#endif
+#endif
+
+# if defined (__MRC__) || defined (__SC__) || defined (__BORLANDC__) || defined(__FreeBSD__) || (defined (__GNUC__) && defined (__APPLE__) || defined( __Lynx__ )) || defined (_STLP_NO_WCHAR_T)
+
+#  include _STLP_NATIVE_C_HEADER(stddef.h)
+#  if defined (__FreeBSD__) || defined (__Lynx__)
+#   ifndef _WINT_T
+typedef long int wint_t;
+#    define _WINT_T
+#   endif /* _WINT_T */
+#  endif
+# endif
+
+# if defined ( _STLP_OWN_IOSTREAMS ) && defined (_STLP_NO_NATIVE_MBSTATE_T) && ! defined (_STLP_NO_MBSTATE_T) && ! defined (_MBSTATE_T) && ! defined (__mbstate_t_defined)
+#  define _STLP_USE_OWN_MBSTATE_T
+#  define _MBSTATE_T
+# endif
+
+# ifdef _STLP_USE_OWN_MBSTATE_T
+
+// to be compatible across different SUN platforms
+#ifdef __sun
+# define __stl_mbstate_t __mbstate_t
+#endif
+
+struct __stl_mbstate_t;
+
+# ifdef __cplusplus
+struct __stl_mbstate_t { 
+  __stl_mbstate_t( long __st = 0 ) { _M_state[0] = __st ; }
+  __stl_mbstate_t& operator=(const long __st) {
+    _M_state[0] = __st;              
+    return *this;
+  } 
+  __stl_mbstate_t(const __stl_mbstate_t& __x) {_M_state[0]= __x._M_state[0]; }         
+  __stl_mbstate_t& operator=(const __stl_mbstate_t& __x) {
+    _M_state[0]= __x._M_state[0];              
+    return *this;
+  }
+# if defined (__sun)
+#  ifdef _LP64
+  long _M_state[4];
+#  else
+  int _M_state[6];
+#  endif
+# else       
+  long _M_state[1];
+# endif
+};          
+
+inline bool operator==(const __stl_mbstate_t& __x, const __stl_mbstate_t& __y) {
+  return ( __x._M_state[0] == __y._M_state[0] );
+}
+
+inline bool operator!=(const __stl_mbstate_t& __x, const __stl_mbstate_t& __y) {
+  return ( __x._M_state[0] == __y._M_state[0] );
+}
+# endif
+
+
+_STLP_BEGIN_NAMESPACE
+
+typedef __stl_mbstate_t mbstate_t;
+
+_STLP_END_NAMESPACE
+
+# endif /* _STLP_USE_OWN_MBSTATE_T */
+
+#if !defined (_STLP_NO_WCHAR_T)
+# ifndef WCHAR_MIN
+#  define WCHAR_MIN 0
+// SUNpro has some bugs with casts. wchar_t is size of int there anyway.
+#  if defined (__SUNPRO_CC) || defined (__DJGPP)
+#   define WCHAR_MAX (~0)
+#  else
+#   define WCHAR_MAX ((wchar_t)~0)
+#  endif
+# endif
+#endif
+
+# if defined  (_STLP_IMPORT_VENDOR_CSTD) && ! defined (_STLP_VENDOR_GLOBAL_CSTD)
+_STLP_BEGIN_NAMESPACE  
+using namespace _STLP_VENDOR_CSTD;
+_STLP_END_NAMESPACE
+#endif /* _STLP_IMPORT_VENDOR_CSTD */
+
+#endif /* _STLP_CWCHAR_H */
+
diff --git a/main/source/stlport/stlport/stl/_deque.c b/main/source/stlport/stlport/stl/_deque.c
new file mode 100644
index 00000000..9a684bd6
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_deque.c
@@ -0,0 +1,676 @@
+/*
+ *
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+#ifndef _STLP_DEQUE_C
+# define _STLP_DEQUE_C
+
+# ifndef _STLP_INTERNAL_DEQUE_H
+#  include <stl/_deque.h>
+# endif
+
+_STLP_BEGIN_NAMESPACE
+
+// Non-inline member functions from _Deque_base.
+
+template <class _Tp, class _Alloc >
+_Deque_base<_Tp,_Alloc >::~_Deque_base() {
+  if (_M_map._M_data) {
+    _M_destroy_nodes(_M_start._M_node, this->_M_finish._M_node + 1);
+    _M_map.deallocate(_M_map._M_data, _M_map_size._M_data);
+  }
+}
+
+template <class _Tp, class _Alloc >
+void
+_Deque_base<_Tp,_Alloc>::_M_initialize_map(size_t __num_elements)
+{
+  size_t __num_nodes = 
+    __num_elements / this->buffer_size() + 1 ;
+
+  _M_map_size._M_data = (max)((size_t) _S_initial_map_size, __num_nodes + 2);
+  _M_map._M_data = _M_map.allocate(_M_map_size._M_data);
+
+  _Tp** __nstart = _M_map._M_data + (_M_map_size._M_data - __num_nodes) / 2;
+  _Tp** __nfinish = __nstart + __num_nodes;
+    
+  _STLP_TRY {
+    _M_create_nodes(__nstart, __nfinish);
+  }
+  _STLP_UNWIND((_M_map.deallocate(_M_map._M_data, _M_map_size._M_data), 
+                _M_map._M_data = 0, _M_map_size._M_data = 0));
+  _M_start._M_set_node(__nstart);
+  this->_M_finish._M_set_node(__nfinish - 1);
+  _M_start._M_cur = _M_start._M_first;
+  this->_M_finish._M_cur = this->_M_finish._M_first +
+               __num_elements % this->buffer_size();
+}
+
+template <class _Tp, class _Alloc >
+void
+_Deque_base<_Tp,_Alloc>::_M_create_nodes(_Tp** __nstart,
+                                                  _Tp** __nfinish)
+{
+  _Tp** __cur;
+  _STLP_TRY {
+    for (__cur = __nstart; __cur < __nfinish; ++__cur)
+      *__cur = _M_map_size.allocate(this->buffer_size());
+  }
+  _STLP_UNWIND(_M_destroy_nodes(__nstart, __cur));
+}
+
+template <class _Tp, class _Alloc >
+void 
+_Deque_base<_Tp,_Alloc>::_M_destroy_nodes(_Tp** __nstart,
+                                                   _Tp** __nfinish)
+{
+  for (_Tp** __n = __nstart; __n < __nfinish; ++__n)
+    _M_map_size.deallocate(*__n, this->buffer_size());
+}
+
+
+
+// Non-inline member functions
+
+# if defined ( _STLP_NESTED_TYPE_PARAM_BUG )
+// qualified references 
+#   define __iterator__           _Deque_iterator<_Tp, _Nonconst_traits<_Tp> >
+#   define const_iterator         _Deque_iterator<_Tp, _Const_traits<_Tp>  > 
+#   define iterator               __iterator__
+#   define size_type              size_t
+#   define value_type             _Tp
+# else
+#  define __iterator__           _STLP_TYPENAME_ON_RETURN_TYPE __deque__<_Tp, _Alloc>::iterator
+# endif
+
+template <class _Tp, class _Alloc >
+__deque__<_Tp, _Alloc >&  
+__deque__<_Tp, _Alloc >::operator= (const __deque__<_Tp, _Alloc >& __x) {
+  const size_type __len = size();
+  if (&__x != this) {
+    if (__len >= __x.size())
+      erase(copy(__x.begin(), __x.end(), this->_M_start), this->_M_finish);
+    else {
+      const_iterator __mid = __x.begin() + difference_type(__len);
+      copy(__x.begin(), __mid, this->_M_start);
+      insert(this->_M_finish, __mid, __x.end());
+    }
+  }
+  return *this;
+}        
+
+template <class _Tp, class _Alloc >
+void 
+__deque__<_Tp, _Alloc >::_M_fill_insert(iterator __pos,
+					     size_type __n, const value_type& __x)
+{
+  if (__pos._M_cur == this->_M_start._M_cur) {
+    iterator __new_start = _M_reserve_elements_at_front(__n);
+    _STLP_TRY {
+      uninitialized_fill(__new_start, this->_M_start, __x);
+    }
+    _STLP_UNWIND(this->_M_destroy_nodes(__new_start._M_node, this->_M_start._M_node));
+    this->_M_start = __new_start;
+  }
+  else if (__pos._M_cur == this->_M_finish._M_cur) {
+    iterator __new_finish = _M_reserve_elements_at_back(__n);
+    _STLP_TRY {
+      uninitialized_fill(this->_M_finish, __new_finish, __x);
+    }
+    _STLP_UNWIND(this->_M_destroy_nodes(this->_M_finish._M_node+1, __new_finish._M_node+1));
+    this->_M_finish = __new_finish;
+  }
+  else 
+    _M_insert_aux(__pos, __n, __x);
+}
+
+#ifndef _STLP_MEMBER_TEMPLATES  
+
+template <class _Tp, class _Alloc >
+void __deque__<_Tp, _Alloc>::insert(iterator __pos,
+                                           const value_type* __first,
+                                           const value_type* __last) {
+  size_type __n = __last - __first;
+  if (__pos._M_cur == this->_M_start._M_cur) {
+    iterator __new_start = _M_reserve_elements_at_front(__n);
+    _STLP_TRY {
+      uninitialized_copy(__first, __last, __new_start);
+    }
+    _STLP_UNWIND(this->_M_destroy_nodes(__new_start._M_node, this->_M_start._M_node));
+    this->_M_start = __new_start;
+  }
+  else if (__pos._M_cur == this->_M_finish._M_cur) {
+    iterator __new_finish = _M_reserve_elements_at_back(__n);
+    _STLP_TRY {
+      uninitialized_copy(__first, __last, this->_M_finish);
+    }
+    _STLP_UNWIND(this->_M_destroy_nodes(this->_M_finish._M_node + 1, 
+                                  __new_finish._M_node + 1));
+    this->_M_finish = __new_finish;
+  }
+  else
+    _M_insert_aux(__pos, __first, __last, __n);
+}
+
+template <class _Tp, class _Alloc >
+void __deque__<_Tp,_Alloc>::insert(iterator __pos,
+                                         const_iterator __first,
+                                         const_iterator __last)
+{
+  size_type __n = __last - __first;
+  if (__pos._M_cur == this->_M_start._M_cur) {
+    iterator __new_start = _M_reserve_elements_at_front(__n);
+    _STLP_TRY {
+      uninitialized_copy(__first, __last, __new_start);
+    }
+    _STLP_UNWIND(this->_M_destroy_nodes(__new_start._M_node, this->_M_start._M_node));
+    this->_M_start = __new_start;
+  }
+  else if (__pos._M_cur == this->_M_finish._M_cur) {
+    iterator __new_finish = _M_reserve_elements_at_back(__n);
+    _STLP_TRY {
+      uninitialized_copy(__first, __last, this->_M_finish);
+    }
+    _STLP_UNWIND(this->_M_destroy_nodes(this->_M_finish._M_node + 1,__new_finish._M_node + 1));
+    this->_M_finish = __new_finish;
+  }
+  else
+    _M_insert_aux(__pos, __first, __last, __n);
+}
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+template <class _Tp, class _Alloc >
+__iterator__ 
+__deque__<_Tp,_Alloc>::erase(iterator __first, iterator __last)
+{
+  if (__first == this->_M_start && __last == this->_M_finish) {
+    clear();
+    return this->_M_finish;
+  }
+  else {
+    difference_type __n = __last - __first;
+    difference_type __elems_before = __first - this->_M_start;
+    if (__elems_before < difference_type(this->size() - __n) / 2) {
+      copy_backward(this->_M_start, __first, __last);
+      iterator __new_start = this->_M_start + __n;
+      _STLP_STD::_Destroy(this->_M_start, __new_start);
+      this->_M_destroy_nodes(this->_M_start._M_node, __new_start._M_node);
+      this->_M_start = __new_start;
+    }
+    else {
+      copy(__last, this->_M_finish, __first);
+      iterator __new_finish = this->_M_finish - __n;
+      _STLP_STD::_Destroy(__new_finish, this->_M_finish);
+      this->_M_destroy_nodes(__new_finish._M_node + 1, this->_M_finish._M_node + 1);
+      this->_M_finish = __new_finish;
+    }
+    return this->_M_start + __elems_before;
+  }
+}
+
+template <class _Tp, class _Alloc >
+void __deque__<_Tp,_Alloc>::clear()
+{
+  for (_Map_pointer __node = this->_M_start._M_node + 1;
+       __node < this->_M_finish._M_node;
+       ++__node) {
+    _STLP_STD::_Destroy(*__node, *__node + this->buffer_size());
+    this->_M_map_size.deallocate(*__node, this->buffer_size());
+  }
+
+  if (this->_M_start._M_node != this->_M_finish._M_node) {
+    _STLP_STD::_Destroy(this->_M_start._M_cur, this->_M_start._M_last);
+    _STLP_STD::_Destroy(this->_M_finish._M_first, this->_M_finish._M_cur);
+    this->_M_map_size.deallocate(this->_M_finish._M_first, this->buffer_size());
+  }
+  else
+    _STLP_STD::_Destroy(this->_M_start._M_cur, this->_M_finish._M_cur);
+
+  this->_M_finish = this->_M_start;
+}
+
+// Precondition: this->_M_start and this->_M_finish have already been initialized,
+// but none of the deque's elements have yet been constructed.
+template <class _Tp, class _Alloc >
+void 
+__deque__<_Tp,_Alloc>::_M_fill_initialize(const value_type& __val) {
+  _Map_pointer __cur;
+  _STLP_TRY {
+    for (__cur = this->_M_start._M_node; __cur < this->_M_finish._M_node; ++__cur)
+      uninitialized_fill(*__cur, *__cur + this->buffer_size(), __val);
+    uninitialized_fill(this->_M_finish._M_first, this->_M_finish._M_cur, __val);
+  }
+  _STLP_UNWIND(_STLP_STD::_Destroy(this->_M_start, iterator(*__cur, __cur)));
+}
+
+
+// Called only if this->_M_finish._M_cur == this->_M_finish._M_last - 1.
+template <class _Tp, class _Alloc >
+void
+__deque__<_Tp,_Alloc>::_M_push_back_aux_v(const value_type& __t)
+{
+  value_type __t_copy = __t;
+  _M_reserve_map_at_back();
+  *(this->_M_finish._M_node + 1) = this->_M_map_size.allocate(this->buffer_size());
+  _STLP_TRY {
+    _Construct(this->_M_finish._M_cur, __t_copy);
+    this->_M_finish._M_set_node(this->_M_finish._M_node + 1);
+    this->_M_finish._M_cur = this->_M_finish._M_first;
+  }
+  _STLP_UNWIND(this->_M_map_size.deallocate(*(this->_M_finish._M_node + 1), 
+				      this->buffer_size()));
+}
+
+# ifndef _STLP_NO_ANACHRONISMS
+// Called only if this->_M_finish._M_cur == this->_M_finish._M_last - 1.
+template <class _Tp, class _Alloc >
+void
+__deque__<_Tp,_Alloc>::_M_push_back_aux()
+{
+  _M_reserve_map_at_back();
+  *(this->_M_finish._M_node + 1) = this->_M_map_size.allocate(this->buffer_size());
+  _STLP_TRY {
+    _Construct(this->_M_finish._M_cur);
+    this->_M_finish._M_set_node(this->_M_finish._M_node + 1);
+    this->_M_finish._M_cur = this->_M_finish._M_first;
+  }
+  _STLP_UNWIND(this->_M_map_size.deallocate(*(this->_M_finish._M_node + 1), 
+				      this->buffer_size()));
+}
+# endif
+
+// Called only if this->_M_start._M_cur == this->_M_start._M_first.
+template <class _Tp, class _Alloc >
+void 
+__deque__<_Tp,_Alloc>::_M_push_front_aux_v(const value_type& __t)
+{
+  value_type __t_copy = __t;
+  _M_reserve_map_at_front();
+  *(this->_M_start._M_node - 1) = this->_M_map_size.allocate(this->buffer_size());
+  _STLP_TRY {
+    this->_M_start._M_set_node(this->_M_start._M_node - 1);
+    this->_M_start._M_cur = this->_M_start._M_last - 1;
+    _Construct(this->_M_start._M_cur, __t_copy);
+  }
+  _STLP_UNWIND((++this->_M_start, 
+		this->_M_map_size.deallocate(*(this->_M_start._M_node - 1), this->buffer_size())));
+} 
+
+
+# ifndef _STLP_NO_ANACHRONISMS
+// Called only if this->_M_start._M_cur == this->_M_start._M_first.
+template <class _Tp, class _Alloc >
+void 
+__deque__<_Tp,_Alloc>::_M_push_front_aux()
+{
+  _M_reserve_map_at_front();
+  *(this->_M_start._M_node - 1) = this->_M_map_size.allocate(this->buffer_size());
+  _STLP_TRY {
+    this->_M_start._M_set_node(this->_M_start._M_node - 1);
+    this->_M_start._M_cur = this->_M_start._M_last - 1;
+    _Construct(this->_M_start._M_cur);
+  }
+  _STLP_UNWIND((++this->_M_start, this->_M_map_size.deallocate(*(this->_M_start._M_node - 1), 
+						   this->buffer_size() )));
+} 
+# endif
+
+// Called only if this->_M_finish._M_cur == this->_M_finish._M_first.
+template <class _Tp, class _Alloc >
+void 
+__deque__<_Tp,_Alloc>::_M_pop_back_aux()
+{
+  this->_M_map_size.deallocate(this->_M_finish._M_first, this->buffer_size());
+  this->_M_finish._M_set_node(this->_M_finish._M_node - 1);
+  this->_M_finish._M_cur = this->_M_finish._M_last - 1;
+  _STLP_STD::_Destroy(this->_M_finish._M_cur);
+}
+
+// Called only if this->_M_start._M_cur == this->_M_start._M_last - 1.  Note that 
+// if the deque has at least one element (a precondition for this member 
+// function), and if this->_M_start._M_cur == this->_M_start._M_last, then the deque 
+// must have at least two nodes.
+template <class _Tp, class _Alloc >
+void 
+__deque__<_Tp,_Alloc>::_M_pop_front_aux()
+{
+  _STLP_STD::_Destroy(this->_M_start._M_cur);
+  this->_M_map_size.deallocate(this->_M_start._M_first, this->buffer_size());
+  this->_M_start._M_set_node(this->_M_start._M_node + 1);
+  this->_M_start._M_cur = this->_M_start._M_first;
+}      
+
+
+
+template <class _Tp, class _Alloc >
+__iterator__
+__deque__<_Tp,_Alloc>::_M_insert_aux_prepare(iterator __pos) {
+  difference_type __index = __pos - this->_M_start;
+  if (__index < difference_type(size() / 2)) {
+    push_front(front());
+    iterator __front1 = this->_M_start;
+    ++__front1;
+    iterator __front2 = __front1;
+    ++__front2;
+    __pos = this->_M_start + __index;
+    iterator __pos1 = __pos;
+    ++__pos1;
+    copy(__front2, __pos1, __front1);
+  }
+  else {
+    push_back(back());
+    iterator __back1 = this->_M_finish;
+    --__back1;
+    iterator __back2 = __back1;
+    --__back2;
+    __pos = this->_M_start + __index;
+    copy_backward(__pos, __back2, __back1);
+  }
+  return __pos;
+}
+
+template <class _Tp, class _Alloc >
+__iterator__
+__deque__<_Tp,_Alloc>::_M_insert_aux(iterator __pos,
+				     const value_type& __x) {
+  value_type __x_copy = __x;
+  _STLP_MPWFIX_TRY		//*TY 06/01/2000 - mpw forget to call dtor on __x_copy without this try block
+  __pos = _M_insert_aux_prepare(__pos);
+  *__pos = __x_copy;
+  return __pos;
+  _STLP_MPWFIX_CATCH		//*TY 06/01/2000 - 
+}
+
+template <class _Tp, class _Alloc >
+__iterator__
+__deque__<_Tp,_Alloc>::_M_insert_aux(iterator __pos)
+{
+  __pos = _M_insert_aux_prepare(__pos);
+  *__pos = value_type();
+  return __pos;
+}
+
+template <class _Tp, class _Alloc >
+void
+__deque__<_Tp,_Alloc>::_M_insert_aux(iterator __pos,
+                                           size_type __n,
+                                           const value_type& __x)
+{
+  const difference_type __elems_before = __pos - this->_M_start;
+  size_type __length = this->size();
+  value_type __x_copy = __x;
+  if (__elems_before < difference_type(__length / 2)) {
+    iterator __new_start = _M_reserve_elements_at_front(__n);
+    iterator __old_start = this->_M_start;
+    __pos = this->_M_start + __elems_before;
+    _STLP_TRY {
+      if (__elems_before >= difference_type(__n)) {
+        iterator __start_n = this->_M_start + difference_type(__n);
+        uninitialized_copy(this->_M_start, __start_n, __new_start);
+        this->_M_start = __new_start;
+        copy(__start_n, __pos, __old_start);
+        fill(__pos - difference_type(__n), __pos, __x_copy);
+      }
+      else {
+        __uninitialized_copy_fill(this->_M_start, __pos, __new_start, 
+	                          this->_M_start, __x_copy);
+        this->_M_start = __new_start;
+        fill(__old_start, __pos, __x_copy);
+      }
+    }
+    _STLP_UNWIND(this->_M_destroy_nodes(__new_start._M_node, this->_M_start._M_node));
+  }
+  else {
+    iterator __new_finish = _M_reserve_elements_at_back(__n);
+    iterator __old_finish = this->_M_finish;
+    const difference_type __elems_after = 
+      difference_type(__length) - __elems_before;
+    __pos = this->_M_finish - __elems_after;
+    _STLP_TRY {
+      if (__elems_after > difference_type(__n)) {
+        iterator __finish_n = this->_M_finish - difference_type(__n);
+        uninitialized_copy(__finish_n, this->_M_finish, this->_M_finish);
+        this->_M_finish = __new_finish;
+        copy_backward(__pos, __finish_n, __old_finish);
+        fill(__pos, __pos + difference_type(__n), __x_copy);
+      }
+      else {
+        __uninitialized_fill_copy(this->_M_finish, __pos + difference_type(__n),
+                                  __x_copy, __pos, this->_M_finish);
+        this->_M_finish = __new_finish;
+        fill(__pos, __old_finish, __x_copy);
+      }
+    }
+    _STLP_UNWIND(this->_M_destroy_nodes(this->_M_finish._M_node + 1, __new_finish._M_node + 1));
+  }
+}
+
+#ifndef _STLP_MEMBER_TEMPLATES 
+template <class _Tp, class _Alloc >
+void 
+__deque__<_Tp,_Alloc>::_M_insert_aux(iterator __pos,
+                                           const value_type* __first,
+                                           const value_type* __last,
+                                           size_type __n)
+{
+
+  const difference_type __elemsbefore = __pos - this->_M_start;
+  size_type __length = size();
+  if (__elemsbefore < difference_type(__length / 2)) {
+    iterator __new_start = _M_reserve_elements_at_front(__n);
+    iterator __old_start = this->_M_start;
+    __pos = this->_M_start + __elemsbefore;
+    _STLP_TRY {
+      if (__elemsbefore >= difference_type(__n)) {
+        iterator __start_n = this->_M_start + difference_type(__n);
+        uninitialized_copy(this->_M_start, __start_n, __new_start);
+        this->_M_start = __new_start;
+        copy(__start_n, __pos, __old_start);
+        copy(__first, __last, __pos - difference_type(__n));
+      }
+      else {
+        const value_type* __mid = 
+	  __first + (difference_type(__n) - __elemsbefore);
+        __uninitialized_copy_copy(this->_M_start, __pos, __first, __mid,
+                                  __new_start, _IsPODType());
+        this->_M_start = __new_start;
+        copy(__mid, __last, __old_start);
+      }
+    }
+    _STLP_UNWIND(this->_M_destroy_nodes(__new_start._M_node, this->_M_start._M_node));
+  }
+  else {
+    iterator __new_finish = _M_reserve_elements_at_back(__n);
+    iterator __old_finish = this->_M_finish;
+    const difference_type __elemsafter = 
+      difference_type(__length) - __elemsbefore;
+    __pos = this->_M_finish - __elemsafter;
+    _STLP_TRY {
+      if (__elemsafter > difference_type(__n)) {
+        iterator __finish_n = this->_M_finish - difference_type(__n);
+        uninitialized_copy(__finish_n, this->_M_finish, this->_M_finish);
+        this->_M_finish = __new_finish;
+        copy_backward(__pos, __finish_n, __old_finish);
+        copy(__first, __last, __pos);
+      }
+      else {
+        const value_type* __mid = __first + __elemsafter;
+        __uninitialized_copy_copy(__mid, __last, __pos, this->_M_finish, this->_M_finish, _IsPODType());
+        this->_M_finish = __new_finish;
+        copy(__first, __mid, __pos);
+      }
+    }
+    _STLP_UNWIND(this->_M_destroy_nodes(this->_M_finish._M_node + 1, __new_finish._M_node + 1));
+  }
+}
+
+template <class _Tp, class _Alloc >
+void
+__deque__<_Tp,_Alloc>::_M_insert_aux(iterator __pos,
+                                           const_iterator __first,
+                                           const_iterator __last,
+                                           size_type __n)
+{
+  const difference_type __elemsbefore = __pos - this->_M_start;
+  size_type __length = size();
+  if (__elemsbefore < difference_type(__length / 2)) {
+    iterator __new_start = _M_reserve_elements_at_front(__n);
+    iterator __old_start = this->_M_start;
+    __pos = this->_M_start + __elemsbefore;
+    _STLP_TRY {
+      if (__elemsbefore >= difference_type(__n)) {
+        iterator __start_n = this->_M_start + __n;
+        uninitialized_copy(this->_M_start, __start_n, __new_start);
+        this->_M_start = __new_start;
+        copy(__start_n, __pos, __old_start);
+        copy(__first, __last, __pos - difference_type(__n));
+      }
+      else {
+        const_iterator __mid = __first + (__n - __elemsbefore);
+        __uninitialized_copy_copy(this->_M_start, __pos, __first, __mid,
+                                  __new_start, _IsPODType());
+        this->_M_start = __new_start;
+        copy(__mid, __last, __old_start);
+      }
+    }
+    _STLP_UNWIND(this->_M_destroy_nodes(__new_start._M_node, this->_M_start._M_node));
+  }
+  else {
+    iterator __new_finish = _M_reserve_elements_at_back(__n);
+    iterator __old_finish = this->_M_finish;
+    const difference_type __elemsafter = __length - __elemsbefore;
+    __pos = this->_M_finish - __elemsafter;
+    _STLP_TRY {
+      if (__elemsafter > difference_type(__n)) {
+        iterator __finish_n = this->_M_finish - difference_type(__n);
+        uninitialized_copy(__finish_n, this->_M_finish, this->_M_finish);
+        this->_M_finish = __new_finish;
+        copy_backward(__pos, __finish_n, __old_finish);
+        copy(__first, __last, __pos);
+      }
+      else {
+        const_iterator __mid = __first + __elemsafter;
+        __uninitialized_copy_copy(__mid, __last, __pos, this->_M_finish, this->_M_finish, _IsPODType());
+        this->_M_finish = __new_finish;
+        copy(__first, __mid, __pos);
+      }
+    }
+    _STLP_UNWIND(this->_M_destroy_nodes(this->_M_finish._M_node + 1, __new_finish._M_node + 1));
+  }
+}
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+template <class _Tp, class _Alloc >
+void 
+__deque__<_Tp,_Alloc>::_M_new_elements_at_front(size_type __new_elems)
+{
+  size_type __new_nodes
+      = (__new_elems + this->buffer_size() - 1) / this->buffer_size();
+  _M_reserve_map_at_front(__new_nodes);
+  size_type __i =1;
+  _STLP_TRY {
+    for (; __i <= __new_nodes; ++__i)
+      *(this->_M_start._M_node - __i) = this->_M_map_size.allocate(this->buffer_size());
+  }
+#       ifdef _STLP_USE_EXCEPTIONS
+  catch(...) {
+    for (size_type __j = 1; __j < __i; ++__j)
+      this->_M_map_size.deallocate(*(this->_M_start._M_node - __j), this->buffer_size());
+    throw;
+  }
+#       endif /* _STLP_USE_EXCEPTIONS */
+}
+
+template <class _Tp, class _Alloc >
+void 
+__deque__<_Tp,_Alloc>::_M_new_elements_at_back(size_type __new_elems)
+{
+  size_type __new_nodes
+      = (__new_elems + this->buffer_size() - 1) / this->buffer_size();
+  _M_reserve_map_at_back(__new_nodes);
+  size_type __i = 1;
+  _STLP_TRY {
+    for (; __i <= __new_nodes; ++__i)
+      *(this->_M_finish._M_node + __i) = this->_M_map_size.allocate(this->buffer_size());
+  }
+#       ifdef _STLP_USE_EXCEPTIONS
+  catch(...) {
+    for (size_type __j = 1; __j < __i; ++__j)
+      this->_M_map_size.deallocate(*(this->_M_finish._M_node + __j), this->buffer_size());
+    throw;
+  }
+#       endif /* _STLP_USE_EXCEPTIONS */
+}
+
+template <class _Tp, class _Alloc >
+void 
+__deque__<_Tp,_Alloc>::_M_reallocate_map(size_type __nodes_to_add,
+                                              bool __add_at_front)
+{
+  size_type __old_num_nodes = this->_M_finish._M_node - this->_M_start._M_node + 1;
+  size_type __new_num_nodes = __old_num_nodes + __nodes_to_add;
+
+  _Map_pointer __new_nstart;
+  if (this->_M_map_size._M_data > 2 * __new_num_nodes) {
+    __new_nstart = this->_M_map._M_data + (this->_M_map_size._M_data - __new_num_nodes) / 2 
+                     + (__add_at_front ? __nodes_to_add : 0);
+    if (__new_nstart < this->_M_start._M_node)
+      copy(this->_M_start._M_node, this->_M_finish._M_node + 1, __new_nstart);
+    else
+      copy_backward(this->_M_start._M_node, this->_M_finish._M_node + 1, 
+                    __new_nstart + __old_num_nodes);
+  }
+  else {
+    size_type __new_map_size = 
+      this->_M_map_size._M_data + (max)((size_t)this->_M_map_size._M_data, __nodes_to_add) + 2;
+
+    _Map_pointer __new_map = this->_M_map.allocate(__new_map_size);
+    __new_nstart = __new_map + (__new_map_size - __new_num_nodes) / 2
+                         + (__add_at_front ? __nodes_to_add : 0);
+    copy(this->_M_start._M_node, this->_M_finish._M_node + 1, __new_nstart);
+    this->_M_map.deallocate(this->_M_map._M_data, this->_M_map_size._M_data);
+
+    this->_M_map._M_data = __new_map;
+    this->_M_map_size._M_data = __new_map_size;
+  }
+
+  this->_M_start._M_set_node(__new_nstart);
+  this->_M_finish._M_set_node(__new_nstart + __old_num_nodes - 1);
+}
+
+_STLP_END_NAMESPACE
+
+# undef __iterator__
+# undef iterator
+# undef const_iterator
+# undef size_type
+# undef value_type
+
+#endif /*  _STLP_DEQUE_C */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_deque.h b/main/source/stlport/stlport/stl/_deque.h
new file mode 100644
index 00000000..cd78a9f6
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_deque.h
@@ -0,0 +1,953 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_DEQUE_H
+#define _STLP_INTERNAL_DEQUE_H
+
+# ifndef _STLP_INTERNAL_ALGOBASE_H
+#  include <stl/_algobase.h>
+# endif
+
+# ifndef _STLP_INTERNAL_ALLOC_H
+#  include <stl/_alloc.h>
+# endif
+
+# ifndef _STLP_INTERNAL_ITERATOR_H
+#  include <stl/_iterator.h>
+# endif
+
+# ifndef _STLP_INTERNAL_UNINITIALIZED_H
+#  include <stl/_uninitialized.h>
+# endif
+
+# ifndef _STLP_RANGE_ERRORS_H
+#  include <stl/_range_errors.h>
+# endif
+
+/* Class invariants:
+ *  For any nonsingular iterator i:
+ *    i.node is the address of an element in the map array.  The
+ *      contents of i.node is a pointer to the beginning of a node.
+ *    i.first == *(i.node) 
+ *    i.last  == i.first + node_size
+ *    i.cur is a pointer in the range [i.first, i.last).  NOTE:
+ *      the implication of this is that i.cur is always a dereferenceable
+ *      pointer, even if i is a past-the-end iterator.
+ *  Start and Finish are always nonsingular iterators.  NOTE: this means
+ *    that an empty deque must have one node, and that a deque
+ *    with N elements, where N is the buffer size, must have two nodes.
+ *  For every node other than start.node and finish.node, every element
+ *    in the node is an initialized object.  If start.node == finish.node,
+ *    then [start.cur, finish.cur) are initialized objects, and
+ *    the elements outside that range are uninitialized storage.  Otherwise,
+ *    [start.cur, start.last) and [finish.first, finish.cur) are initialized
+ *    objects, and [start.first, start.cur) and [finish.cur, finish.last)
+ *    are uninitialized storage.
+ *  [map, map + map_size) is a valid, non-empty range.  
+ *  [start.node, finish.node] is a valid range contained within 
+ *    [map, map + map_size).  
+ *  A pointer in the range [map, map + map_size) points to an allocated node
+ *    if and only if the pointer is in the range [start.node, finish.node].
+ */
+
+# undef deque
+# define deque __WORKAROUND_DBG_RENAME(deque)
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _Tp>
+struct _Deque_iterator_base {
+
+  enum _Constants { 
+    _blocksize = _MAX_BYTES, 
+    __buffer_size = (sizeof(_Tp) < (size_t)_blocksize ?
+   		    ( (size_t)_blocksize / sizeof(_Tp)) : size_t(1))
+  };
+
+  typedef random_access_iterator_tag iterator_category;
+
+  typedef _Tp value_type;
+  typedef size_t size_type;
+  typedef ptrdiff_t difference_type;
+
+  typedef value_type** _Map_pointer;
+
+  typedef _Deque_iterator_base< _Tp > _Self;
+
+  value_type* _M_cur;
+  value_type* _M_first;
+  value_type* _M_last;
+  _Map_pointer _M_node;
+
+  _Deque_iterator_base(value_type* __x, _Map_pointer __y) 
+    : _M_cur(__x), _M_first(*__y),
+      _M_last(*__y + __buffer_size), _M_node(__y) {}
+  _Deque_iterator_base() : _M_cur(0), _M_first(0), _M_last(0), _M_node(0) {}
+
+  difference_type _M_subtract(const _Self& __x) const {
+    return difference_type(__buffer_size) * (_M_node - __x._M_node - 1) +
+      (_M_cur - _M_first) + (__x._M_last - __x._M_cur);
+  }
+
+  void _M_increment() {
+    if (++_M_cur == _M_last) {
+      _M_set_node(_M_node + 1);
+      _M_cur = _M_first;
+    }
+  }
+
+  void _M_decrement() {
+    if (_M_cur == _M_first) {
+      _M_set_node(_M_node - 1);
+      _M_cur = _M_last;
+    }
+    --_M_cur;
+  }
+
+  void _M_advance(difference_type __n)
+  {
+    difference_type __offset = __n + (_M_cur - _M_first);
+    if (__offset >= 0 && __offset < difference_type(__buffer_size))
+      _M_cur += __n;
+    else {
+      difference_type __node_offset =
+        __offset > 0 ? __offset / __buffer_size
+                   : -difference_type((-__offset - 1) / __buffer_size) - 1;
+      _M_set_node(_M_node + __node_offset);
+      _M_cur = _M_first + 
+        (__offset - __node_offset * difference_type(__buffer_size));
+    }
+  }
+
+  void _M_set_node(_Map_pointer __new_node) {
+    _M_last = (_M_first = *(_M_node = __new_node)) + difference_type(__buffer_size);
+  }
+};
+
+
+
+template <class _Tp, class _Traits>
+struct _Deque_iterator : public _Deque_iterator_base< _Tp> {
+
+  typedef random_access_iterator_tag iterator_category;
+  typedef _Tp value_type;
+  typedef typename _Traits::reference  reference;
+  typedef typename _Traits::pointer    pointer;
+  typedef size_t size_type;
+  typedef ptrdiff_t difference_type;
+  typedef value_type** _Map_pointer;
+
+  typedef _Deque_iterator_base< _Tp > _Base;
+  typedef _Deque_iterator<_Tp, _Traits> _Self;
+  typedef _Deque_iterator<_Tp, _Nonconst_traits<_Tp> > _Nonconst_self;
+  typedef _Deque_iterator<_Tp, _Const_traits<_Tp> > _Const_self;
+
+  _Deque_iterator(value_type* __x, _Map_pointer __y) :
+    _Deque_iterator_base<value_type>(__x,__y) {}
+
+  _Deque_iterator() {}
+  _Deque_iterator(const _Nonconst_self& __x) : 
+    _Deque_iterator_base<value_type>(__x) {}
+
+  reference operator*() const { 
+      return *this->_M_cur; 
+  }
+
+  _STLP_DEFINE_ARROW_OPERATOR
+
+  difference_type operator-(const _Self& __x) const { return this->_M_subtract(__x); }
+
+  _Self& operator++() { this->_M_increment(); return *this; }
+  _Self operator++(int)  {
+    _Self __tmp = *this;
+    ++*this;
+    return __tmp;
+  }
+
+  _Self& operator--() { this->_M_decrement(); return *this; }
+  _Self operator--(int) {
+    _Self __tmp = *this;
+    --*this;
+    return __tmp;
+  }
+
+  _Self& operator+=(difference_type __n) { this->_M_advance(__n); return *this; }
+  _Self operator+(difference_type __n) const
+  {
+    _Self __tmp = *this;
+    return __tmp += __n;
+  }
+
+  _Self& operator-=(difference_type __n) { return *this += -__n; }
+  _Self operator-(difference_type __n) const {
+    _Self __tmp = *this;
+    return __tmp -= __n;
+  }
+
+  reference operator[](difference_type __n) const { return *(*this + __n); }
+};
+
+template <class _Tp, class _Traits>
+inline _Deque_iterator<_Tp, _Traits> _STLP_CALL
+operator+(ptrdiff_t __n, const _Deque_iterator<_Tp, _Traits>& __x)
+{
+   return __x + __n;
+}
+
+
+#ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+
+template <class _Tp>
+inline bool _STLP_CALL 
+operator==(const _Deque_iterator_base<_Tp >& __x,
+	   const _Deque_iterator_base<_Tp >& __y) { 
+    return __x._M_cur == __y._M_cur; 
+}
+
+template <class _Tp>
+inline bool _STLP_CALL 
+operator < (const _Deque_iterator_base<_Tp >& __x,
+	    const _Deque_iterator_base<_Tp >& __y) { 
+  return (__x._M_node == __y._M_node) ? 
+    (__x._M_cur < __y._M_cur) : (__x._M_node < __y._M_node);
+}
+
+template <class _Tp>
+inline bool _STLP_CALL 
+operator!=(const _Deque_iterator_base<_Tp >& __x,
+	   const _Deque_iterator_base<_Tp >& __y) { 
+    return __x._M_cur != __y._M_cur; 
+}
+template <class _Tp>
+inline bool _STLP_CALL 
+operator>(const _Deque_iterator_base<_Tp >& __x,
+	  const _Deque_iterator_base<_Tp >& __y) { 
+    return __y < __x;
+}
+template <class _Tp>
+inline bool  _STLP_CALL operator>=(const _Deque_iterator_base<_Tp >& __x,
+                                   const _Deque_iterator_base<_Tp >& __y) { 
+    return !(__x < __y);
+}
+template <class _Tp>
+inline bool  _STLP_CALL operator<=(const _Deque_iterator_base<_Tp >& __x,
+                                   const _Deque_iterator_base<_Tp >& __y) { 
+    return !(__y < __x);
+}
+
+# else
+
+template <class _Tp, class _Traits1, class _Traits2>
+inline bool  _STLP_CALL
+operator==(const _Deque_iterator<_Tp, _Traits1 >& __x,
+	   const _Deque_iterator<_Tp, _Traits2 >& __y) { 
+    return __x._M_cur == __y._M_cur; 
+}
+
+template <class _Tp, class _Traits1, class _Traits2>
+inline bool _STLP_CALL 
+operator < (const _Deque_iterator<_Tp, _Traits1 >& __x,
+	    const _Deque_iterator<_Tp, _Traits2 >& __y) { 
+  return (__x._M_node == __y._M_node) ? 
+    (__x._M_cur < __y._M_cur) : (__x._M_node < __y._M_node);
+}
+
+template <class _Tp>
+inline bool _STLP_CALL 
+operator!=(const _Deque_iterator<_Tp, _Nonconst_traits<_Tp> >& __x,
+	   const _Deque_iterator<_Tp, _Const_traits<_Tp> >& __y) { 
+    return __x._M_cur != __y._M_cur; 
+}
+template <class _Tp>
+inline bool _STLP_CALL 
+operator>(const _Deque_iterator<_Tp, _Nonconst_traits<_Tp> >& __x,
+	  const _Deque_iterator<_Tp, _Const_traits<_Tp> >& __y) { 
+    return __y < __x;
+}
+template <class _Tp>
+inline bool  _STLP_CALL
+operator>=(const _Deque_iterator<_Tp, _Nonconst_traits<_Tp> >& __x,
+           const _Deque_iterator<_Tp, _Const_traits<_Tp> >& __y) { 
+    return !(__x < __y);
+}
+template <class _Tp>
+inline bool _STLP_CALL
+operator<=(const _Deque_iterator<_Tp, _Nonconst_traits<_Tp> >& __x,
+           const _Deque_iterator<_Tp, _Const_traits<_Tp> >& __y) { 
+    return !(__y < __x);
+}
+# endif
+
+# ifdef _STLP_USE_OLD_HP_ITERATOR_QUERIES
+template <class _Tp, class _Traits> inline _Tp*  _STLP_CALL value_type(const _Deque_iterator<_Tp, _Traits  >&) { return (_Tp*)0; }
+template <class _Tp, class _Traits> inline random_access_iterator_tag _STLP_CALL 
+iterator_category(const _Deque_iterator<_Tp, _Traits  >&) { return random_access_iterator_tag(); }
+template <class _Tp, class _Traits> inline ptrdiff_t* _STLP_CALL 
+distance_type(const _Deque_iterator<_Tp, _Traits  >&) { return 0; }
+#endif
+
+// Deque base class.  It has two purposes.  First, its constructor
+//  and destructor allocate (but don't initialize) storage.  This makes
+//  exception safety easier.  Second, the base class encapsulates all of
+//  the differences between SGI-style allocators and standard-conforming
+//  allocators.
+
+template <class _Tp, class _Alloc>
+class _Deque_base {
+public:
+  typedef _Tp value_type;
+  _STLP_FORCE_ALLOCATORS(_Tp, _Alloc)
+  typedef typename _Alloc_traits<_Tp,_Alloc>::allocator_type  allocator_type;
+  typedef typename _Alloc_traits<_Tp*, _Alloc>::allocator_type _Map_alloc_type;
+
+  typedef _Deque_iterator<_Tp, _Nonconst_traits<_Tp> > iterator;
+  typedef _Deque_iterator<_Tp, _Const_traits<_Tp> >   const_iterator;
+
+  static size_t  _STLP_CALL buffer_size() { return (size_t)_Deque_iterator_base<_Tp>::__buffer_size; } 
+
+  _Deque_base(const allocator_type& __a, size_t __num_elements)
+    : _M_start(), _M_finish(), _M_map(_STLP_CONVERT_ALLOCATOR(__a, _Tp*), 0),
+      _M_map_size(__a, (size_t)0) {
+	_M_initialize_map(__num_elements);
+  }
+  _Deque_base(const allocator_type& __a)
+    : _M_start(), _M_finish(), _M_map(_STLP_CONVERT_ALLOCATOR(__a, _Tp*), 0), 
+      _M_map_size(__a, (size_t)0) {
+  }
+  ~_Deque_base();    
+
+protected:
+  void _M_initialize_map(size_t);
+  void _M_create_nodes(_Tp** __nstart, _Tp** __nfinish);
+  void _M_destroy_nodes(_Tp** __nstart, _Tp** __nfinish);
+  enum { _S_initial_map_size = 8 };
+
+protected:
+  iterator _M_start;
+  iterator _M_finish;
+  _STLP_alloc_proxy<value_type**, value_type*, _Map_alloc_type>  _M_map;
+  _STLP_alloc_proxy<size_t, value_type,  allocator_type>   _M_map_size;  
+};
+
+
+template <class _Tp, _STLP_DEFAULT_ALLOCATOR_SELECT(_Tp) >
+class deque : protected _Deque_base<_Tp, _Alloc> {
+  typedef _Deque_base<_Tp, _Alloc> _Base;
+  typedef deque<_Tp, _Alloc> _Self;
+public:                         // Basic types
+  typedef _Tp value_type;
+  typedef value_type* pointer;
+  typedef const value_type* const_pointer;
+  typedef value_type& reference;
+  typedef const value_type& const_reference;
+  typedef size_t size_type;
+  typedef ptrdiff_t difference_type;
+  typedef random_access_iterator_tag _Iterator_category;
+  _STLP_FORCE_ALLOCATORS(_Tp, _Alloc)
+  typedef typename _Base::allocator_type allocator_type;
+
+public:                         // Iterators
+  typedef typename _Base::iterator       iterator;
+  typedef typename _Base::const_iterator const_iterator;
+
+  _STLP_DECLARE_RANDOM_ACCESS_REVERSE_ITERATORS;
+
+protected:                      // Internal typedefs
+  typedef pointer* _Map_pointer;
+  typedef typename  __type_traits<_Tp>::has_trivial_assignment_operator _TrivialAss;
+  typedef typename  __type_traits<_Tp>::has_trivial_assignment_operator _IsPODType;
+
+public:                         // Basic accessors
+  iterator begin() { return this->_M_start; }
+  iterator end() { return this->_M_finish; }
+  const_iterator begin() const { return const_iterator(this->_M_start); }
+  const_iterator end() const { return const_iterator(this->_M_finish); }
+
+  reverse_iterator rbegin() { return reverse_iterator(this->_M_finish); }
+  reverse_iterator rend() { return reverse_iterator(this->_M_start); }
+  const_reverse_iterator rbegin() const 
+    { return const_reverse_iterator(this->_M_finish); }
+  const_reverse_iterator rend() const 
+    { return const_reverse_iterator(this->_M_start); }
+
+  reference operator[](size_type __n)
+    { return this->_M_start[difference_type(__n)]; }
+  const_reference operator[](size_type __n) const 
+    { return this->_M_start[difference_type(__n)]; }
+
+  void _M_range_check(size_type __n) const {
+    if (__n >= this->size())
+      __stl_throw_out_of_range("deque");
+  }
+  reference at(size_type __n)
+    { _M_range_check(__n); return (*this)[__n]; }
+  const_reference at(size_type __n) const
+    { _M_range_check(__n); return (*this)[__n]; }
+
+  reference front() { return *this->_M_start; }
+  reference back() {
+    iterator __tmp = this->_M_finish;
+    --__tmp;
+    return *__tmp;
+  }
+  const_reference front() const { return *this->_M_start; }
+  const_reference back() const {
+    const_iterator __tmp = this->_M_finish;
+    --__tmp;
+    return *__tmp;
+  }
+
+  size_type size() const { return this->_M_finish - this->_M_start; }
+  size_type max_size() const { return size_type(-1); }
+  bool empty() const { return this->_M_finish == this->_M_start; }
+  allocator_type get_allocator() const { return this->_M_map_size; }
+
+public:                         // Constructor, destructor.
+  explicit deque(const allocator_type& __a = allocator_type()) 
+    : _Deque_base<_Tp, _Alloc>(__a, 0) {}
+
+  deque(const _Self& __x) : 
+    _Deque_base<_Tp, _Alloc>(__x.get_allocator(), __x.size()) { 
+      __uninitialized_copy(__x.begin(), __x.end(), this->_M_start, _IsPODType()); 
+  }
+
+  deque(size_type __n, const value_type& __val,
+        const allocator_type& __a = allocator_type()) : 
+    _Deque_base<_Tp, _Alloc>(__a, __n)
+    { _M_fill_initialize(__val); }
+  // int,long variants may be needed 
+  explicit deque(size_type __n) : _Deque_base<_Tp, _Alloc>(allocator_type(), __n)
+    { _M_fill_initialize(value_type()); }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+
+  template <class _Integer>
+  void _M_initialize_dispatch(_Integer __n, _Integer __x, const __true_type&) {
+    this->_M_initialize_map(__n);
+    _M_fill_initialize(__x);
+  }
+
+  template <class _InputIter>
+  void _M_initialize_dispatch(_InputIter __first, _InputIter __last,
+                              const __false_type&) {
+    _M_range_initialize(__first, __last, _STLP_ITERATOR_CATEGORY(__first, _InputIter));
+  }
+
+# ifdef _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS
+  // VC++ needs this
+  template <class _InputIterator>
+  deque(_InputIterator __first, _InputIterator __last) : 
+    _Deque_base<_Tp, _Alloc>(allocator_type()) {
+    typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
+    _M_initialize_dispatch(__first, __last, _Integral());
+  }
+# endif
+
+  // Check whether it's an integral type.  If so, it's not an iterator.
+  template <class _InputIterator>
+  deque(_InputIterator __first, _InputIterator __last,
+        const allocator_type& __a _STLP_ALLOCATOR_TYPE_DFL) : 
+    _Deque_base<_Tp, _Alloc>(__a) {
+    typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
+    _M_initialize_dispatch(__first, __last, _Integral());
+  }
+
+# else
+  deque(const value_type* __first, const value_type* __last,
+        const allocator_type& __a = allocator_type() ) 
+    : _Deque_base<_Tp, _Alloc>(__a, __last - __first) { 
+    __uninitialized_copy(__first, __last, this->_M_start, _IsPODType()); 
+  }
+
+  deque(const_iterator __first, const_iterator __last,
+        const allocator_type& __a = allocator_type() ) 
+    : _Deque_base<_Tp, _Alloc>(__a, __last - __first) { 
+    __uninitialized_copy(__first, __last, this->_M_start, _IsPODType()); 
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  ~deque() { 
+    _STLP_STD::_Destroy(this->_M_start, this->_M_finish); 
+  }
+
+  _Self& operator= (const _Self& __x);
+
+  void swap(_Self& __x) {
+    _STLP_STD::swap(this->_M_start, __x._M_start);
+    _STLP_STD::swap(this->_M_finish, __x._M_finish);
+    _STLP_STD::swap(this->_M_map, __x._M_map);
+    _STLP_STD::swap(this->_M_map_size, __x._M_map_size);
+  }
+
+public: 
+  // assign(), a generalized assignment member function.  Two
+  // versions: one that takes a count, and one that takes a range.
+  // The range version is a member template, so we dispatch on whether
+  // or not the type is an integer.
+
+  void _M_fill_assign(size_type __n, const _Tp& __val) {
+    if (__n > size()) {
+      _STLP_STD::fill(begin(), end(), __val);
+      insert(end(), __n - size(), __val);
+    }
+    else {
+      erase(begin() + __n, end());
+      _STLP_STD::fill(begin(), end(), __val);
+    }
+  }
+
+  void assign(size_type __n, const _Tp& __val) {
+    _M_fill_assign(__n, __val);
+  }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+
+  template <class _InputIterator>
+  void assign(_InputIterator __first, _InputIterator __last) {
+    typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
+    _M_assign_dispatch(__first, __last, _Integral());
+  }
+
+private:                        // helper functions for assign() 
+
+  template <class _Integer>
+  void _M_assign_dispatch(_Integer __n, _Integer __val, const __true_type&)
+    { _M_fill_assign((size_type) __n, (_Tp) __val); }
+
+  template <class _InputIterator>
+  void _M_assign_dispatch(_InputIterator __first, _InputIterator __last,
+                          const __false_type&) {
+    _M_assign_aux(__first, __last, _STLP_ITERATOR_CATEGORY(__first, _InputIterator));
+  }
+
+  template <class _InputIter>
+  void _M_assign_aux(_InputIter __first, _InputIter __last, const input_iterator_tag &) {
+    iterator __cur = begin();
+    for ( ; __first != __last && __cur != end(); ++__cur, ++__first)
+      *__cur = *__first;
+    if (__first == __last)
+      erase(__cur, end());
+    else
+      insert(end(), __first, __last);
+  }
+
+  template <class _ForwardIterator>
+  void _M_assign_aux(_ForwardIterator __first, _ForwardIterator __last,
+                     const forward_iterator_tag &) {
+    size_type __len = distance(__first, __last);
+    if (__len > size()) {
+      _ForwardIterator __mid = __first;
+      advance(__mid, size());
+      copy(__first, __mid, begin());
+      insert(end(), __mid, __last);
+    }
+    else
+      erase(copy(__first, __last, begin()), end());
+  }
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+public:                         // push_* and pop_*
+  
+  void push_back(const value_type& __t) {
+    if (this->_M_finish._M_cur != this->_M_finish._M_last - 1) {
+      _Construct(this->_M_finish._M_cur, __t);
+      ++this->_M_finish._M_cur;
+    }
+    else
+      _M_push_back_aux_v(__t);
+  }
+  void push_front(const value_type& __t) {
+    if (this->_M_start._M_cur != this->_M_start._M_first) {
+      _Construct(this->_M_start._M_cur - 1, __t);
+      --this->_M_start._M_cur;
+    }
+    else
+      _M_push_front_aux_v(__t);
+  }
+
+# ifndef _STLP_NO_ANACHRONISMS
+  void push_back() {
+    if (this->_M_finish._M_cur != this->_M_finish._M_last - 1) {
+      _Construct(this->_M_finish._M_cur);
+      ++this->_M_finish._M_cur;
+    }
+    else
+      _M_push_back_aux();
+  }
+  void push_front() {
+    if (this->_M_start._M_cur != this->_M_start._M_first) {
+      _Construct(this->_M_start._M_cur - 1);
+      --this->_M_start._M_cur;
+    }
+    else
+      _M_push_front_aux();
+  }
+# endif
+
+  void pop_back() {
+    if (this->_M_finish._M_cur != this->_M_finish._M_first) {
+      --this->_M_finish._M_cur;
+      _STLP_STD::_Destroy(this->_M_finish._M_cur);
+    }
+    else
+      _M_pop_back_aux();
+  }
+
+  void pop_front() {
+    if (this->_M_start._M_cur != this->_M_start._M_last - 1) {
+      _STLP_STD::_Destroy(this->_M_start._M_cur);
+      ++this->_M_start._M_cur;
+    }
+    else 
+      _M_pop_front_aux();
+  }
+
+public:                         // Insert
+
+  iterator insert(iterator __position, const value_type& __x) {
+    if (__position._M_cur == this->_M_start._M_cur) {
+      push_front(__x);
+      return this->_M_start;
+    }
+    else if (__position._M_cur == this->_M_finish._M_cur) {
+      push_back(__x);
+      iterator __tmp = this->_M_finish;
+      --__tmp;
+      return __tmp;
+    }
+    else {
+      return _M_insert_aux(__position, __x);
+    }
+  }
+
+  iterator insert(iterator __position)
+    { return insert(__position, value_type()); }
+
+  void insert(iterator __pos, size_type __n, const value_type& __x) {
+    _M_fill_insert(__pos, __n, __x);
+  }
+
+  void _M_fill_insert(iterator __pos, size_type __n, const value_type& __x);
+
+#ifdef _STLP_MEMBER_TEMPLATES  
+
+  // Check whether it's an integral type.  If so, it's not an iterator.
+  template <class _InputIterator>
+  void insert(iterator __pos, _InputIterator __first, _InputIterator __last) {
+    typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
+    _M_insert_dispatch(__pos, __first, __last, _Integral());
+  }
+
+  template <class _Integer>
+  void _M_insert_dispatch(iterator __pos, _Integer __n, _Integer __x,
+                          const __true_type&) {
+    _M_fill_insert(__pos, (size_type) __n, (value_type) __x);
+  }
+
+  template <class _InputIterator>
+  void _M_insert_dispatch(iterator __pos,
+                          _InputIterator __first, _InputIterator __last,
+                          const __false_type&) {
+    insert(__pos, __first, __last, _STLP_ITERATOR_CATEGORY(__first, _InputIterator));
+  }
+
+#else /* _STLP_MEMBER_TEMPLATES */
+
+  void insert(iterator __pos,
+              const value_type* __first, const value_type* __last);
+  void insert(iterator __pos,
+              const_iterator __first, const_iterator __last);
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  void resize(size_type __new_size, value_type __x) {
+    const size_type __len = size();
+    if (__new_size < __len) 
+      erase(this->_M_start + __new_size, this->_M_finish);
+    else
+      insert(this->_M_finish, __new_size - __len, __x);
+  }
+
+  void resize(size_type new_size) { resize(new_size, value_type()); }
+
+public:                         // Erase
+  iterator erase(iterator __pos) {
+    iterator __next = __pos;
+    ++__next;
+    difference_type __index = __pos - this->_M_start;
+    if (size_type(__index) < this->size() >> 1) {
+      copy_backward(this->_M_start, __pos, __next);
+      pop_front();
+    }
+    else {
+      copy(__next, this->_M_finish, __pos);
+      pop_back();
+    }
+    return this->_M_start + __index;
+  }
+
+  iterator erase(iterator __first, iterator __last);
+  void clear(); 
+
+protected:                        // Internal construction/destruction
+
+  void _M_fill_initialize(const value_type& __val);
+
+#ifdef _STLP_MEMBER_TEMPLATES 
+
+  template <class _InputIterator>
+  void _M_range_initialize(_InputIterator __first,
+			   _InputIterator __last,
+			   const input_iterator_tag &) {
+    this->_M_initialize_map(0);
+    _STLP_TRY {
+      for ( ; __first != __last; ++__first)
+        push_back(*__first);
+    }
+    _STLP_UNWIND(clear());
+  }
+ template <class _ForwardIterator>
+ void  _M_range_initialize(_ForwardIterator __first,
+                           _ForwardIterator __last,
+                           const forward_iterator_tag &)  {
+   size_type __n = distance(__first, __last);
+   this->_M_initialize_map(__n);
+   _Map_pointer __cur_node;
+   _STLP_TRY {
+    for (__cur_node = this->_M_start._M_node; 
+         __cur_node < this->_M_finish._M_node; 
+	 ++__cur_node) {
+      _ForwardIterator __mid = __first;
+      advance(__mid, this->buffer_size());
+      uninitialized_copy(__first, __mid, *__cur_node);
+      __first = __mid;
+    }
+    uninitialized_copy(__first, __last, this->_M_finish._M_first);
+   }
+  _STLP_UNWIND(_STLP_STD::_Destroy(this->_M_start, iterator(*__cur_node, __cur_node)));
+ }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+protected:                        // Internal push_* and pop_*
+
+  void _M_push_back_aux_v(const value_type&);
+  void _M_push_front_aux_v(const value_type&);
+# ifndef _STLP_NO_ANACHRONISMS
+  void _M_push_back_aux();
+  void _M_push_front_aux();
+# endif
+  void _M_pop_back_aux();
+  void _M_pop_front_aux();
+
+protected:                        // Internal insert functions
+
+#ifdef _STLP_MEMBER_TEMPLATES
+
+template <class _InputIterator>
+void 
+insert(iterator __pos,
+       _InputIterator __first,
+       _InputIterator __last,
+       const input_iterator_tag &)
+{
+  copy(__first, __last, inserter(*this, __pos));
+}
+
+template <class _ForwardIterator>
+void  insert(iterator __pos,
+	     _ForwardIterator __first,
+	     _ForwardIterator __last,
+	     const forward_iterator_tag &)
+ {
+  size_type __n = distance(__first, __last);
+  if (__pos._M_cur == this->_M_start._M_cur) {
+    iterator __new_start = _M_reserve_elements_at_front(__n);
+    _STLP_TRY {
+      uninitialized_copy(__first, __last, __new_start);
+      this->_M_start = __new_start;
+    }
+    _STLP_UNWIND(this->_M_destroy_nodes(__new_start._M_node, this->_M_start._M_node));
+  }
+  else if (__pos._M_cur == this->_M_finish._M_cur) {
+    iterator __new_finish = _M_reserve_elements_at_back(__n);
+    _STLP_TRY {
+      uninitialized_copy(__first, __last, this->_M_finish);
+      this->_M_finish = __new_finish;
+    }
+    _STLP_UNWIND(this->_M_destroy_nodes(this->_M_finish._M_node + 1, __new_finish._M_node + 1));
+  }
+  else
+    _M_insert_aux(__pos, __first, __last, __n);
+}
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  iterator _M_insert_aux(iterator __pos, const value_type& __x);
+  iterator _M_insert_aux(iterator __pos);
+  iterator _M_insert_aux_prepare(iterator __pos);
+
+  void _M_insert_aux(iterator __pos, size_type __n, const value_type& __x);
+
+#ifdef _STLP_MEMBER_TEMPLATES  
+  template <class _ForwardIterator>
+  void _M_insert_aux(iterator __pos,
+                     _ForwardIterator __first,
+                     _ForwardIterator __last,
+                     size_type __n) {
+    
+    const difference_type __elemsbefore = __pos - this->_M_start;
+    size_type __length = size();
+    if (__elemsbefore < difference_type(__length / 2)) {
+      iterator __new_start = _M_reserve_elements_at_front(__n);
+      iterator __old_start = this->_M_start;
+      __pos = this->_M_start + __elemsbefore;
+      _STLP_TRY {
+	if (__elemsbefore >= difference_type(__n)) {
+	  iterator __start_n = this->_M_start + difference_type(__n); 
+	  uninitialized_copy(this->_M_start, __start_n, __new_start);
+	  this->_M_start = __new_start;
+	  copy(__start_n, __pos, __old_start);
+	  copy(__first, __last, __pos - difference_type(__n));
+	}
+	else {
+	  _ForwardIterator __mid = __first;
+	  advance(__mid, difference_type(__n) - __elemsbefore);
+	  __uninitialized_copy_copy(this->_M_start, __pos, __first, __mid,
+				    __new_start, _IsPODType());
+	  this->_M_start = __new_start;
+	  copy(__mid, __last, __old_start);
+	}
+      }
+      _STLP_UNWIND(this->_M_destroy_nodes(__new_start._M_node, this->_M_start._M_node));
+    }
+    else {
+      iterator __new_finish = _M_reserve_elements_at_back(__n);
+      iterator __old_finish = this->_M_finish;
+      const difference_type __elemsafter = 
+	difference_type(__length) - __elemsbefore;
+      __pos = this->_M_finish - __elemsafter;
+      _STLP_TRY {
+      if (__elemsafter > difference_type(__n)) {
+        iterator __finish_n = this->_M_finish - difference_type(__n);
+        uninitialized_copy(__finish_n, this->_M_finish, this->_M_finish);
+        this->_M_finish = __new_finish;
+        copy_backward(__pos, __finish_n, __old_finish);
+        copy(__first, __last, __pos);
+      }
+      else {
+        _ForwardIterator __mid = __first;
+        advance(__mid, __elemsafter);
+        __uninitialized_copy_copy(__mid, __last, __pos, this->_M_finish, this->_M_finish, _IsPODType());
+        this->_M_finish = __new_finish;
+        copy(__first, __mid, __pos);
+      }
+      }
+      _STLP_UNWIND(this->_M_destroy_nodes(this->_M_finish._M_node + 1, __new_finish._M_node + 1));
+    }
+  }
+#else /* _STLP_MEMBER_TEMPLATES */
+  
+  void _M_insert_aux(iterator __pos,
+                     const value_type* __first, const value_type* __last,
+                     size_type __n);
+
+  void _M_insert_aux(iterator __pos, 
+                     const_iterator __first, const_iterator __last,
+                     size_type __n);
+ 
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  iterator _M_reserve_elements_at_front(size_type __n) {
+    size_type __vacancies = this->_M_start._M_cur - this->_M_start._M_first;
+    if (__n > __vacancies) 
+      _M_new_elements_at_front(__n - __vacancies);
+    return this->_M_start - difference_type(__n);
+  }
+
+  iterator _M_reserve_elements_at_back(size_type __n) {
+    size_type __vacancies = (this->_M_finish._M_last - this->_M_finish._M_cur) - 1;
+    if (__n > __vacancies)
+      _M_new_elements_at_back(__n - __vacancies);
+    return this->_M_finish + difference_type(__n);
+  }
+
+  void _M_new_elements_at_front(size_type __new_elements);
+  void _M_new_elements_at_back(size_type __new_elements);
+
+protected:                      // Allocation of _M_map and nodes
+
+  // Makes sure the _M_map has space for new nodes.  Does not actually
+  //  add the nodes.  Can invalidate _M_map pointers.  (And consequently, 
+  //  deque iterators.)
+
+  void _M_reserve_map_at_back (size_type __nodes_to_add = 1) {
+    if (__nodes_to_add + 1 > this->_M_map_size._M_data - (this->_M_finish._M_node - this->_M_map._M_data))
+      _M_reallocate_map(__nodes_to_add, false);
+  }
+
+  void _M_reserve_map_at_front (size_type __nodes_to_add = 1) {
+    if (__nodes_to_add > size_type(this->_M_start._M_node - this->_M_map._M_data))
+      _M_reallocate_map(__nodes_to_add, true);
+  }
+
+  void _M_reallocate_map(size_type __nodes_to_add, bool __add_at_front);
+ 
+};
+
+# define _STLP_TEMPLATE_CONTAINER deque<_Tp, _Alloc>
+# define _STLP_TEMPLATE_HEADER    template <class _Tp, class _Alloc>
+# include <stl/_relops_cont.h>
+# undef _STLP_TEMPLATE_CONTAINER
+# undef _STLP_TEMPLATE_HEADER
+
+_STLP_END_NAMESPACE 
+
+// do a cleanup
+# undef deque
+# undef __deque__
+# define __deque__ __WORKAROUND_DBG_RENAME(deque)
+
+# if !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_deque.c>
+# endif
+
+#if defined (_STLP_DEBUG)
+# include <stl/debug/_deque.h>
+#endif
+
+# if defined (_STLP_USE_WRAPPER_FOR_ALLOC_PARAM)
+#  include <stl/wrappers/_deque.h>
+# endif
+  
+#endif /* _STLP_INTERNAL_DEQUE_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_epilog.h b/main/source/stlport/stlport/stl/_epilog.h
new file mode 100644
index 00000000..b5e77bf2
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_epilog.h
@@ -0,0 +1,44 @@
+/* NOTE : this header has no guards and is MEANT for multiple inclusion !
+ * If you are using "header protection" option with your compiler,
+ * please also find #pragma which disables it and put it here, to
+ * allow reentrancy of this header.
+ */
+
+/* If the platform provides any specific epilog actions,
+   like #pragmas, do include platform-specific prolog file */
+# if defined (_STLP_HAS_SPECIFIC_PROLOG_EPILOG)
+#  include <config/_epilog.h>
+# endif
+
+# ifndef _STLP_NO_POST_COMPATIBLE_SECTION
+#  include <stl/_config_compat_post.h>
+# endif
+
+/* provide a mechanism to redefine std:: namespace in a way that is transparent to the 
+ * user. _STLP_REDEFINE_STD is being used for wrapper files that include native headers
+ * to temporary undef the std macro. */
+#  if defined ( _STLP_USE_NAMESPACES ) && (defined ( _STLP_USE_OWN_NAMESPACE ) && !defined ( _STLP_REDEFINE_STD ) )
+#   undef _STLP_REDEFINE_STD
+#   define _STLP_REDEFINE_STD 1
+#  endif
+
+# if defined (_STLP_REDEFINE_STD)
+/*  We redefine "std" to "stlport", so that user code may use std:: transparently */
+#   undef  std
+#   define std STLPORT
+# else
+# if defined(__cplusplus)
+#  ifndef _STLP_CONFIG_H
+#   include <stl/_config.h>
+#  endif
+
+# endif /* __cplusplus */
+# endif
+
+
+
+
+
+
+
+
diff --git a/main/source/stlport/stlport/stl/_exception.h b/main/source/stlport/stlport/stl/_exception.h
new file mode 100644
index 00000000..e69de29b
diff --git a/main/source/stlport/stlport/stl/_fstream.c b/main/source/stlport/stlport/stl/_fstream.c
new file mode 100644
index 00000000..06a34f81
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_fstream.c
@@ -0,0 +1,749 @@
+/*
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+#ifndef _STLP_FSTREAM_C
+#define _STLP_FSTREAM_C
+
+# ifndef _STLP_INTERNAL_FSTREAM_H
+#  include <stl/_fstream.h>
+# endif
+
+# if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION)
+
+_STLP_BEGIN_NAMESPACE
+
+# if defined ( _STLP_NESTED_TYPE_PARAM_BUG )
+// no wchar_t is supported for this mode
+# define __BF_int_type__ int
+# define __BF_pos_type__ streampos
+# define __BF_off_type__ streamoff
+# else
+# define __BF_int_type__ _STLP_TYPENAME_ON_RETURN_TYPE basic_filebuf<_CharT, _Traits>::int_type
+# define __BF_pos_type__ _STLP_TYPENAME_ON_RETURN_TYPE basic_filebuf<_CharT, _Traits>::pos_type
+# define __BF_off_type__ _STLP_TYPENAME_ON_RETURN_TYPE basic_filebuf<_CharT, _Traits>::off_type
+# endif
+
+
+//----------------------------------------------------------------------
+// Public basic_filebuf<> member functions
+
+template <class _CharT, class _Traits>
+basic_filebuf<_CharT, _Traits>::basic_filebuf()
+     :  basic_streambuf<_CharT, _Traits>(), _M_base(),
+    _M_constant_width(false), _M_always_noconv(false),
+    _M_int_buf_dynamic(false),
+    _M_in_input_mode(false), _M_in_output_mode(false),
+    _M_in_error_mode(false), _M_in_putback_mode(false),
+    _M_int_buf(0), _M_int_buf_EOS(0),
+    _M_ext_buf(0), _M_ext_buf_EOS(0),
+    _M_ext_buf_converted(0), _M_ext_buf_end(0),
+    _M_state(_STLP_DEFAULT_CONSTRUCTED(_State_type)),
+    _M_end_state(_STLP_DEFAULT_CONSTRUCTED(_State_type)),
+    _M_mmap_base(0), _M_mmap_len(0),
+    _M_saved_eback(0), _M_saved_gptr(0), _M_saved_egptr(0),
+    _M_codecvt(0),
+    _M_width(1), _M_max_width(1)
+{
+  this->_M_setup_codecvt(locale());
+}
+
+template <class _CharT, class _Traits>
+basic_filebuf<_CharT, _Traits>::~basic_filebuf() {
+  this->close();
+  _M_deallocate_buffers();
+}
+
+
+template <class _CharT, class _Traits>
+_STLP_TYPENAME_ON_RETURN_TYPE basic_filebuf<_CharT, _Traits>::int_type 
+basic_filebuf<_CharT, _Traits>::underflow() 
+{
+  return _Underflow<_CharT, _Traits>::_M_doit(this);
+}
+
+template <class _CharT, class _Traits>
+basic_filebuf<_CharT, _Traits>* 
+basic_filebuf<_CharT, _Traits>::close()
+{
+  bool __ok = this->is_open();
+
+  if (_M_in_output_mode) {
+    __ok = __ok && !_Traits::eq_int_type(this->overflow(traits_type::eof()),
+                                         traits_type::eof());
+    __ok == __ok && this->_M_unshift();
+  }
+  else if (_M_in_input_mode)
+      this->_M_exit_input_mode();
+
+  // Note order of arguments.  We close the file even if __ok is false.
+  __ok = _M_base._M_close() && __ok;
+
+  // Restore the initial state, except that we don't deallocate the buffer
+  // or mess with the cached codecvt information.
+  _M_state = _M_end_state = _State_type();
+  _M_ext_buf_converted = _M_ext_buf_end = 0;
+
+  _M_mmap_base = 0;
+  _M_mmap_len = 0;
+
+  this->setg(0, 0, 0);
+  this->setp(0, 0);
+
+  _M_saved_eback = _M_saved_gptr = _M_saved_egptr = 0;
+
+  _M_in_input_mode = _M_in_output_mode = _M_in_error_mode = _M_in_putback_mode
+    = false;
+
+  return __ok ? this : 0;
+}
+
+// This member function is called whenever we exit input mode.
+// It unmaps the memory-mapped file, if any, and sets
+// _M_in_input_mode to false.  
+template <class _CharT, class _Traits>
+void basic_filebuf<_CharT, _Traits>::_M_exit_input_mode()
+{
+   if (_M_mmap_base != 0)
+     _M_base._M_unmap(_M_mmap_base, _M_mmap_len); 
+   _M_in_input_mode = false;
+   _M_mmap_base = 0;
+}
+
+
+//----------------------------------------------------------------------
+// basic_filebuf<> overridden protected virtual member functions
+
+template <class _CharT, class _Traits>
+streamsize basic_filebuf<_CharT, _Traits>::showmanyc()
+{
+  // Is there any possibility that reads can succeed?
+  if (!this->is_open() || _M_in_output_mode || _M_in_error_mode)
+    return -1;
+
+  else if (_M_in_putback_mode)
+    return this->egptr() - this->gptr();
+
+  else if (_M_constant_width) {
+    streamoff __pos  = _M_base._M_seek(0, ios_base::cur);
+    streamoff __size = _M_base._M_file_size();
+    return __pos >= 0 && __size > __pos ? __size - __pos : 0;
+  }
+
+  else 
+    return 0;
+}
+
+
+// Make a putback position available, if necessary, by switching to a 
+// special internal buffer used only for putback.  The buffer is
+// [_M_pback_buf, _M_pback_buf + _S_pback_buf_size), but the base
+// class only sees a piece of it at a time.  (We want to make sure
+// that we don't try to read a character that hasn't been initialized.)
+// The end of the putback buffer is always _M_pback_buf + _S_pback_buf_size,
+// but the beginning is usually not _M_pback_buf.
+template <class _CharT, class _Traits>
+__BF_int_type__ 
+basic_filebuf<_CharT, _Traits>::pbackfail(int_type __c)
+{
+  const int_type __eof = traits_type::eof();
+
+  // If we aren't already in input mode, pushback is impossible.
+  if (!_M_in_input_mode)
+    return __eof;
+
+  // We can use the ordinary get buffer if there's enough space, and
+  // if it's a buffer that we're allowed to write to.
+  if (this->gptr() != this->eback() &&
+      (traits_type::eq_int_type(__c, __eof) ||
+       traits_type::eq(traits_type::to_char_type(__c), this->gptr()[-1]) ||
+       !_M_mmap_base)) {
+    this->gbump(-1);
+    if (traits_type::eq_int_type(__c, __eof) ||
+        traits_type::eq(traits_type::to_char_type(__c), *this->gptr()))
+      return traits_type::to_int_type(*this->gptr());
+  }
+  else if (!traits_type::eq_int_type(__c, __eof)) {
+    // Are we in the putback buffer already?
+    _CharT* __pback_end = _M_pback_buf + __STATIC_CAST(int,_S_pback_buf_size);
+    if (_M_in_putback_mode) {
+      // Do we have more room in the putback buffer?
+      if (this->eback() != _M_pback_buf) 
+        this->setg(this->egptr() - 1, this->egptr() - 1, __pback_end);
+      else
+        return __eof;           // No more room in the buffer, so fail.
+    }
+    else {                      // We're not yet in the putback buffer.
+      _M_saved_eback = this->eback();
+      _M_saved_gptr  = this->gptr();
+      _M_saved_egptr = this->egptr();
+      this->setg(__pback_end - 1, __pback_end - 1, __pback_end);
+      _M_in_putback_mode = true;
+    }
+  }
+  else
+    return __eof;
+
+  // We have made a putback position available.  Assign to it, and return.
+  *this->gptr() = traits_type::to_char_type(__c);
+  return __c;
+}
+
+// This member function flushes the put area, and also outputs the
+// character __c (unless __c is eof).  Invariant: we always leave room
+// in the internal buffer for one character more than the base class knows
+// about.  We see the internal buffer as [_M_int_buf, _M_int_buf_EOS), but
+// the base class only sees [_M_int_buf, _M_int_buf_EOS - 1).
+template <class _CharT, class _Traits>
+__BF_int_type__
+basic_filebuf<_CharT, _Traits>::overflow(int_type __c)
+{
+  // Switch to output mode, if necessary.
+  if (!_M_in_output_mode)
+    if (!_M_switch_to_output_mode())
+      return traits_type::eof();
+
+  _CharT* __ibegin = this->_M_int_buf;
+  _CharT* __iend   = this->pptr();
+  this->setp(_M_int_buf, _M_int_buf_EOS - 1);
+
+  // Put __c at the end of the internal buffer.
+  if (!traits_type::eq_int_type(__c, traits_type::eof()))
+    *__iend++ = __c;
+
+  // For variable-width encodings, output may take more than one pass.
+  while (__ibegin != __iend) {
+    const _CharT* __inext = __ibegin;
+    char* __enext         = _M_ext_buf;
+    typename _Codecvt::result __status
+      = _M_codecvt->out(_M_state, __ibegin, __iend, __inext,
+                                  _M_ext_buf, _M_ext_buf_EOS, __enext);
+    if (__status == _Codecvt::noconv)
+      return _Noconv_output<_Traits>::_M_doit(this, __ibegin, __iend)
+        ? traits_type::not_eof(__c)
+        : _M_output_error();
+
+    // For a constant-width encoding we know that the external buffer
+    // is large enough, so failure to consume the entire internal buffer
+    // or to produce the correct number of external characters, is an error.
+    // For a variable-width encoding, however, we require only that we 
+    // consume at least one internal character
+    else if (__status != _Codecvt::error && 
+             ((__inext == __iend && (__enext - _M_ext_buf == 
+                                     _M_width * (__iend - __ibegin))) ||
+              (!_M_constant_width && __inext != __ibegin))) {
+        // We successfully converted part or all of the internal buffer.
+      ptrdiff_t __n = __enext - _M_ext_buf;
+      if (_M_write(_M_ext_buf, __n))
+        __ibegin += __inext - __ibegin;
+      else
+        return _M_output_error();
+    }
+    else
+      return _M_output_error();
+  }
+
+  return traits_type::not_eof(__c);
+}
+
+// This member function must be called before any I/O has been
+// performed on the stream, otherwise it has no effect.
+//
+// __buf == 0 && __n == 0 means to make ths stream unbuffered.
+// __buf != 0 && __n > 0 means to use __buf as the stream's internal
+// buffer, rather than the buffer that would otherwise be allocated
+// automatically.  __buf must be a pointer to an array of _CharT whose
+// size is at least __n.
+template <class _CharT, class _Traits>
+basic_streambuf<_CharT, _Traits>*
+basic_filebuf<_CharT, _Traits>::setbuf(_CharT* __buf, streamsize __n)
+{
+  if (!_M_in_input_mode &&! _M_in_output_mode && !_M_in_error_mode &&
+      _M_int_buf == 0) {
+    if (__buf == 0 && __n == 0)
+      _M_allocate_buffers(0, 1);
+    else if (__buf != 0 && __n > 0)
+      _M_allocate_buffers(__buf, __n);
+  }
+  return this;
+}
+
+template <class _CharT, class _Traits>
+__BF_pos_type__
+basic_filebuf<_CharT, _Traits>::seekoff(off_type __off,
+                                        ios_base::seekdir __whence,
+                                        ios_base::openmode /* dummy */)
+{
+  if (this->is_open() &&
+      (__off == 0 || (_M_constant_width && this->_M_base._M_in_binary_mode()))) {
+
+    if (!_M_seek_init(__off != 0 || __whence != ios_base::cur))
+      return pos_type(-1);
+
+    // Seek to beginning or end, regardless of whether we're in input mode.
+    if (__whence == ios_base::beg || __whence == ios_base::end)
+      return _M_seek_return(_M_base._M_seek(_M_width * __off, __whence),
+                            _State_type());
+
+    // Seek relative to current position.  Complicated if we're in input mode.
+    else if (__whence == ios_base::cur) {
+
+      if (!_M_in_input_mode)
+        return _M_seek_return(_M_base._M_seek(_M_width * __off, __whence),
+                              _State_type());
+      else if (_M_mmap_base != 0) {
+        // __off is relative to gptr().  We need to do a bit of arithmetic
+        // to get an offset relative to the external file pointer.
+        streamoff __adjust = _M_mmap_len - (this->gptr() - (_CharT*) _M_mmap_base);
+
+        // if __off == 0, we do not need to exit input mode and to shift file pointer
+        if (__off == 0) {
+          return pos_type(_M_base._M_seek(0, ios_base::cur) - __adjust);
+        }
+        else
+          return _M_seek_return(_M_base._M_seek(__off - __adjust, ios_base::cur), _State_type());
+      }
+      else if (_M_constant_width) { // Get or set the position.  
+
+        streamoff __iadj = _M_width * (this->gptr() - this->eback());
+        
+        // Compensate for offset relative to gptr versus offset relative
+        // to external pointer.  For a text-oriented stream, where the 
+        // compensation is more than just pointer arithmetic, we may get
+        // but not set the current position.
+        
+        if (__iadj <= _M_ext_buf_end - _M_ext_buf) {
+          
+          streamoff __eadj =  _M_base._M_get_offset(_M_ext_buf + __iadj, _M_ext_buf_end);
+
+          if (__off == 0) {
+            return pos_type(_M_base._M_seek(0, ios_base::cur) - __eadj);
+          }  else {
+            return _M_seek_return(_M_base._M_seek(__off - __eadj, ios_base::cur), _State_type());
+          }
+        }
+        else
+          return pos_type(-1);
+      }
+      else {                    // Get the position.  Encoding is var width.
+        // Get position in internal buffer.
+        ptrdiff_t __ipos = this->gptr() - this->eback();
+        
+        // Get corresponding position in external buffer.
+        _State_type __state = _M_state;
+        int __epos = _M_codecvt->length(__state, _M_ext_buf, _M_ext_buf_end,
+                                        __ipos);
+
+        // Sanity check (expensive): make sure __epos is the right answer.
+        _State_type __tmp_state = _M_state;
+        _Filebuf_Tmp_Buf<_CharT> __buf(__ipos);
+        _CharT* __ibegin = __buf._M_ptr;
+        _CharT* __inext  = __ibegin;
+
+        const char* __dummy;
+        typename _Codecvt::result __status
+          = _M_codecvt->in(__tmp_state,
+                           _M_ext_buf, _M_ext_buf + __epos, __dummy,
+                           __ibegin, __ibegin + __ipos, __inext);
+        if (__status != _Codecvt::error &&
+            (__status == _Codecvt::noconv ||
+             (__inext == __ibegin + __ipos &&
+              equal(this->gptr(), this->eback(), __ibegin,
+                    _Eq_traits<traits_type>())))) {
+          // Get the current position (at the end of the external buffer),
+          // then adjust it.  Again, it might be a text-oriented stream.
+          streamoff __cur = _M_base._M_seek(0, ios_base::cur);
+          streamoff __adj =
+            _M_base._M_get_offset(_M_ext_buf, _M_ext_buf + __epos) -
+            _M_base._M_get_offset(_M_ext_buf, _M_ext_buf_end);
+          if (__cur != -1 && __cur + __adj >= 0)
+            return _M_seek_return(__cur + __adj, __state);
+          else
+            return pos_type(-1);
+        }
+        else                    // We failed the sanity check.
+          return pos_type(-1);
+      }
+    }
+    else                        // Unrecognized value for __whence.
+      return pos_type(-1);
+  }
+  else
+    return pos_type(-1);
+}
+
+
+template <class _CharT, class _Traits>
+__BF_pos_type__
+basic_filebuf<_CharT, _Traits>::seekpos(pos_type __pos,
+                                        ios_base::openmode /* dummy */)
+{
+  if (this->is_open()) {
+    if (!_M_seek_init(true))
+      return pos_type(-1);
+
+    streamoff __off = off_type(__pos);
+    if (__off != -1 && _M_base._M_seek(__off, ios_base::beg) != -1) {
+      _M_state = __pos.state();
+      return _M_seek_return(__off, __pos.state());
+    }
+    else
+      return pos_type(-1);
+  }
+  else
+    return pos_type(-1);
+}
+
+
+template <class _CharT, class _Traits>
+int basic_filebuf<_CharT, _Traits>::sync()
+{
+  if (_M_in_output_mode)
+    return traits_type::eq_int_type(this->overflow(traits_type::eof()),
+                                    traits_type::eof())
+      ? -1
+      : 0;
+  else
+    return 0;
+}
+
+
+// Change the filebuf's locale.  This member function has no effect
+// unless it is called before any I/O is performed on the stream.
+template <class _CharT, class _Traits>
+void basic_filebuf<_CharT, _Traits>::imbue(const locale& __loc)
+{
+  if (!_M_in_input_mode &&! _M_in_output_mode && !_M_in_error_mode) {
+    this->_M_setup_codecvt(__loc);
+  }
+}
+
+//----------------------------------------------------------------------
+// basic_filebuf<> helper functions.
+
+//----------------------------------------
+// Helper functions for switching between modes.
+
+// This member function is called if we're performing the first I/O
+// operation on a filebuf, or if we're performing an input operation 
+// immediately after a seek.
+template <class _CharT, class _Traits>
+bool basic_filebuf<_CharT, _Traits>::_M_switch_to_input_mode()
+{
+
+  if (this->is_open() && (((int)_M_base.__o_mode() & (int)ios_base::in) !=0)
+      && (_M_in_output_mode == 0) && (_M_in_error_mode == 0)) {
+    if (!_M_int_buf && !_M_allocate_buffers())
+      return false;
+
+    _M_ext_buf_converted = _M_ext_buf;
+    _M_ext_buf_end       = _M_ext_buf;
+
+    _M_end_state    = _M_state;
+
+    _M_in_input_mode = true;
+    return true;
+  }
+  else
+
+    return false;
+}
+
+
+// This member function is called if we're performing the first I/O
+// operation on a filebuf, or if we're performing an output operation 
+// immediately after a seek.
+template <class _CharT, class _Traits>
+bool basic_filebuf<_CharT, _Traits>::_M_switch_to_output_mode()
+{
+  if (this->is_open() && (_M_base.__o_mode() & (int)ios_base::out) &&
+      _M_in_input_mode == 0 && _M_in_error_mode == 0) {
+
+    if (!_M_int_buf && !_M_allocate_buffers())
+      return false;
+
+    // In append mode, every write does an implicit seek to the end
+    // of the file.  Whenever leaving output mode, the end of file
+    // get put in the initial shift state.
+    if (_M_base.__o_mode() & ios_base::app)
+      _M_state = _State_type();
+
+    this->setp(_M_int_buf, _M_int_buf_EOS - 1);
+    _M_in_output_mode = true;
+
+    return true;
+  }
+  else
+    return false;
+}
+
+
+//----------------------------------------
+// Helper functions for input
+
+// This member function is called if there is an error during input.
+// It puts the filebuf in error mode, clear the get area buffer, and
+// returns eof.
+// returns eof.  Error mode is sticky; it is cleared only by close or
+// seek.
+
+template <class _CharT, class _Traits>
+__BF_int_type__
+basic_filebuf<_CharT, _Traits>::_M_input_error()
+{
+   this->_M_exit_input_mode();   
+  _M_in_output_mode = false;
+  _M_in_error_mode = true;
+  this->setg(0, 0, 0);
+  return traits_type::eof();
+}
+
+template <class _CharT, class _Traits>
+__BF_int_type__ 
+basic_filebuf<_CharT, _Traits>::_M_underflow_aux() 
+{
+  // We have the state and file position from the end of the internal
+  // buffer.  This round, they become the beginning of the internal buffer.
+  _M_state    = _M_end_state;
+
+  // Fill the external buffer.  Start with any leftover characters that
+  // didn't get converted last time.
+  if (_M_ext_buf_end > _M_ext_buf_converted)
+
+    _M_ext_buf_end = copy(_M_ext_buf_converted, _M_ext_buf_end, _M_ext_buf);
+    // boris : copy_backward did not work
+    //_M_ext_buf_end = copy_backward(_M_ext_buf_converted, _M_ext_buf_end, 
+    //_M_ext_buf+ (_M_ext_buf_end - _M_ext_buf_converted));
+  else
+    _M_ext_buf_end = _M_ext_buf;
+
+  // Now fill the external buffer with characters from the file.  This is
+  // a loop because occasonally we don't get enough external characters
+  // to make progress.
+  while (true) {
+    ptrdiff_t __n = _M_base._M_read(_M_ext_buf_end, _M_ext_buf_EOS - _M_ext_buf_end);
+ 
+    // Don't enter error mode for a failed read.  Error mode is sticky,
+    // and we might succeed if we try again.
+    if (__n <= 0)
+      return traits_type::eof();
+
+    // Convert the external buffer to internal characters.  
+    _M_ext_buf_end += __n;
+    const char*   __enext;
+    _CharT* __inext;
+
+    typename _Codecvt::result __status
+      = _M_codecvt->in(_M_end_state,
+                       _M_ext_buf, _M_ext_buf_end, __enext,
+                       _M_int_buf, _M_int_buf_EOS, __inext);
+
+    // Error conditions: (1) Return value of error.  (2) Producing internal
+    // characters without consuming external characters.  (3) In fixed-width
+    // encodings, producing an internal sequence whose length is inconsistent
+    // with that of the internal sequence.  (4) Failure to produce any 
+    // characters if we have enough characters in the external buffer, where
+    // "enough" means the largest possible width of a single character.
+    if (__status == _Codecvt::noconv)
+      return _Noconv_input<_Traits>::_M_doit(this);
+
+    else if (__status == _Codecvt::error ||
+             (__inext != _M_int_buf && __enext == _M_ext_buf) ||
+             (_M_constant_width &&
+              //         __inext - _M_int_buf != _M_width * (__enext - _M_ext_buf)) ||
+              (__inext - _M_int_buf) *  _M_width != (__enext - _M_ext_buf)) ||
+             (__inext == _M_int_buf && __enext - _M_ext_buf >= _M_max_width))
+      return _M_input_error();
+    
+    else if (__inext != _M_int_buf) {
+      _M_ext_buf_converted = _M_ext_buf + (__enext - _M_ext_buf);
+      this->setg(_M_int_buf, _M_int_buf, __inext);
+      return traits_type::to_int_type(*_M_int_buf);
+    }
+    // We need to go around the loop again to get more external characters.
+  } 
+}
+
+//----------------------------------------
+// Helper functions for output
+
+// This member function is called if there is an error during output.
+// It puts the filebuf in error mode, clear the put area buffer, and
+// returns eof.  Error mode is sticky; it is cleared only by close or
+// seek.
+template <class _CharT, class _Traits>
+__BF_int_type__
+basic_filebuf<_CharT, _Traits>::_M_output_error()
+{
+  _M_in_output_mode = false;
+  _M_in_input_mode = false;
+  _M_in_error_mode = true;
+  this->setp(0, 0);
+  return traits_type::eof();
+}
+
+
+// Write whatever sequence of characters is necessary to get back to
+// the initial shift state.  This function overwrites the external
+// buffer, changes the external file position, and changes the state.
+// Precondition: the internal buffer is empty.
+template <class _CharT, class _Traits>
+bool basic_filebuf<_CharT, _Traits>::_M_unshift()
+{
+  if (_M_in_output_mode && !_M_constant_width) {
+    typename _Codecvt::result __status;
+    do {
+      char* __enext = _M_ext_buf;
+      __status = _M_codecvt->unshift(_M_state,
+                                     _M_ext_buf, _M_ext_buf_EOS, __enext);
+      if (__status == _Codecvt::noconv ||
+          (__enext == _M_ext_buf && __status == _Codecvt::ok))
+        return true;
+      else if (__status == _Codecvt::error)
+        return false;
+      else if (!_M_write(_M_ext_buf, __enext - _M_ext_buf))
+        return false;
+    } while(__status == _Codecvt::partial);
+  }
+
+  return true;
+}
+
+
+//----------------------------------------
+// Helper functions for buffer allocation and deallocation
+
+// This member function is called when we're initializing a filebuf's
+// internal and external buffers.  The argument is the size of the
+// internal buffer; the external buffer is sized using the character
+// width in the current encoding.  Preconditions: the buffers are currently
+// null.  __n >= 1.  __buf is either a null pointer or a pointer to an 
+// array show size is at least __n.
+
+// We need __n >= 1 for two different reasons.  For input, the base
+// class always needs a buffer because of the sementics of underflow().
+// For output, we want to have an internal buffer that's larger by one
+// element than the buffer that the base class knows about.  (See 
+// basic_filebuf<>::overflow() for the reason.)
+template <class _CharT, class _Traits>
+bool 
+basic_filebuf<_CharT, _Traits>::_M_allocate_buffers(_CharT* __buf, streamsize __n)
+{
+
+  if (__buf == 0) {
+    _M_int_buf = __STATIC_CAST(_CharT*,malloc(__n * sizeof(_CharT)));
+    if (! _M_int_buf)
+      return false;
+    _M_int_buf_dynamic = true;
+  }
+  else {
+    _M_int_buf = __buf;
+    _M_int_buf_dynamic = false;
+  }
+  
+  size_t __ebufsiz = (max)(__n * (max)(_M_codecvt->encoding(), 1),
+                      streamsize(_M_codecvt->max_length()));
+
+  _M_ext_buf = __STATIC_CAST(char*,malloc(__ebufsiz));
+  if (!_M_ext_buf) {
+    _M_deallocate_buffers();
+    return false;
+  }
+
+  _M_int_buf_EOS = _M_int_buf + __n;
+  _M_ext_buf_EOS = _M_ext_buf + __ebufsiz;
+  return true;
+}
+
+// Abbreviation for the most common case.
+template <class _CharT, class _Traits>
+bool basic_filebuf<_CharT, _Traits>::_M_allocate_buffers()
+{
+  // Choose a buffer that's at least 4096 characters long and that's a
+  // multiple of the page size.
+  streamsize __default_bufsiz =
+    ((_M_base.__page_size() + 4095UL) / _M_base.__page_size()) * _M_base.__page_size();
+  return _M_allocate_buffers(0, __default_bufsiz);
+}
+
+template <class _CharT, class _Traits>
+void basic_filebuf<_CharT, _Traits>::_M_deallocate_buffers()
+{
+  if (_M_int_buf_dynamic)
+    free(_M_int_buf);
+  free(_M_ext_buf);
+  _M_int_buf     = 0;
+  _M_int_buf_EOS = 0;
+  _M_ext_buf     = 0;
+  _M_ext_buf_EOS = 0;
+}
+
+
+//----------------------------------------
+// Helper functiosn for seek and imbue
+
+template <class _CharT, class _Traits>
+bool basic_filebuf<_CharT, _Traits>::_M_seek_init(bool __do_unshift) {
+  // If we're in error mode, leave it.
+   _M_in_error_mode = false;
+   
+  // Flush the output buffer if we're in output mode, and (conditionally)
+  // emit an unshift sequence.
+  if (_M_in_output_mode) {
+    bool __ok = !traits_type::eq_int_type(this->overflow(traits_type::eof()),
+                                          traits_type::eof());
+    if (__do_unshift)
+      __ok = __ok && this->_M_unshift();
+    if (!__ok) {
+      _M_in_output_mode = false;
+      _M_in_error_mode = true;
+      this->setp(0, 0);
+      return false;
+    }
+  }
+
+  // Discard putback characters, if any.
+  if (_M_in_input_mode && _M_in_putback_mode)
+    _M_exit_putback_mode();
+
+  return true;
+}
+
+
+// Change the filebuf's locale.  This member function has no effect
+// unless it is called before any I/O is performed on the stream.
+template <class _CharT, class _Traits>
+void basic_filebuf<_CharT, _Traits>::_M_setup_codecvt(const locale& __loc)
+{
+  _M_codecvt = &use_facet<_Codecvt>(__loc) ;
+  int __encoding    = _M_codecvt->encoding();
+
+  _M_width          = (max)(__encoding, 1);
+  _M_max_width      = _M_codecvt->max_length();
+  _M_constant_width = __encoding > 0;
+  _M_always_noconv  = _M_codecvt->always_noconv();
+}
+
+_STLP_END_NAMESPACE
+
+# undef __BF_int_type__
+# undef __BF_pos_type__
+# undef __BF_off_type__
+
+# endif /* defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION) */
+
+#endif /* _STLP_FSTREAM_C */
+
diff --git a/main/source/stlport/stlport/stl/_fstream.h b/main/source/stlport/stlport/stl/_fstream.h
new file mode 100644
index 00000000..6ae0330b
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_fstream.h
@@ -0,0 +1,741 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+// This header defines classes basic_filebuf, basic_ifstream,
+// basic_ofstream, and basic_fstream.  These classes represent
+// streambufs and streams whose sources or destinations are files.
+
+#ifndef _STLP_INTERNAL_FSTREAM_H
+#define _STLP_INTERNAL_FSTREAM_H
+
+#if defined(__sgi) && !defined(__GNUC__) && !defined(_STANDARD_C_PLUS_PLUS)
+#error This header file requires the -LANG:std option
+#endif
+
+#ifndef _STLP_INTERNAL_STREAMBUF
+# include <stl/_streambuf.h>
+#endif
+
+#ifndef _STLP_INTERNAL_ISTREAM_H
+#include <stl/_istream.h>
+#endif
+
+#ifndef _STLP_INTERNAL_CODECVT_H
+#include <stl/_codecvt.h>
+#endif
+
+#ifndef _STLP_STDIO_FILE_H
+#include <stl/_stdio_file.h>
+#endif
+
+#if !defined (_STLP_USE_UNIX_IO) && !defined(_STLP_USE_WIN32_IO) \
+    && ! defined (_STLP_USE_UNIX_EMULATION_IO) && !defined (_STLP_USE_STDIO_IO)
+
+# if defined (_STLP_UNIX)  || defined (__CYGWIN__) || defined (__amigaos__) || defined (__EMX__)
+// open/close/read/write
+#  define _STLP_USE_UNIX_IO
+# elif defined (_STLP_WIN32)  && ! defined (__CYGWIN__)
+// CreateFile/ReadFile/WriteFile
+#  define _STLP_USE_WIN32_IO
+# elif defined (_STLP_WIN16) || defined (_STLP_WIN32) || defined (_STLP_MAC)
+// _open/_read/_write
+#  define _STLP_USE_UNIX_EMULATION_IO
+# else
+// fopen/fread/fwrite
+#  define _STLP_USE_STDIO_IO
+# endif /* _STLP_UNIX */
+
+#endif /* mode selection */
+
+
+#if defined (_STLP_USE_WIN32_IO)
+typedef void* _STLP_fd;
+#elif defined (_STLP_USE_UNIX_EMULATION_IO) || defined (_STLP_USE_STDIO_IO) || defined (_STLP_USE_UNIX_IO)
+typedef int _STLP_fd;
+#else
+#error "Configure i/o !"
+#endif
+
+
+_STLP_BEGIN_NAMESPACE
+
+//----------------------------------------------------------------------
+// Class _Filebuf_base, a private base class to factor out the system-
+// dependent code from basic_filebuf<>.
+
+class _STLP_CLASS_DECLSPEC _Filebuf_base {
+public:                      // Opening and closing files.
+  _Filebuf_base();
+
+  bool _M_open(const char*, ios_base::openmode, long __protection);
+  bool _M_open(const char*, ios_base::openmode);
+  bool _M_open(int __id, ios_base::openmode = ios_base::__default_mode);
+  bool _M_close();
+
+public:                      // Low-level I/O, like Unix read/write
+  ptrdiff_t _M_read(char* __buf,  ptrdiff_t __n);
+  streamoff _M_seek(streamoff __offset, ios_base::seekdir __dir);
+  streamoff _M_file_size();
+  bool _M_write(char* __buf,  ptrdiff_t __n);
+
+public:                      // Memory-mapped I/O.
+  void* _M_mmap(streamoff __offset, streamoff __len);
+  void _M_unmap(void* __mmap_base, streamoff __len);
+
+public:
+  // Returns a value n such that, if pos is the file pointer at the
+  // beginning of the range [first, last), pos + n is the file pointer at
+  // the end.  On many operating systems n == __last - __first.
+  // In Unix, writing n characters always bumps the file position by n.
+  // In Windows text mode, however, it bumps the file position by n + m,
+  // where m is the number of newlines in the range.  That's because an
+  // internal \n corresponds to an external two-character sequence.
+  streamoff _M_get_offset(char* __first, char* __last) {
+#if defined (_STLP_UNIX) || defined (_STLP_MAC)
+    return __last - __first;
+#else // defined (_STLP_WIN32) || defined (_STLP_WIN16) || defined (_STLP_DOS)
+    return ( (_M_openmode & ios_base::binary) != 0 )
+      ? (__last - __first)
+      : count(__first, __last, '\n') + (__last - __first);
+#endif
+  }
+
+  // Returns true if we're in binary mode or if we're using an OS or file 
+  // system where there is no distinction between text and binary mode.
+  bool _M_in_binary_mode() const {
+# if defined (_STLP_UNIX) || defined (_STLP_MAC)  || defined(__BEOS__) || defined (__amigaos__) 
+    return true;
+# elif defined (_STLP_WIN32) || defined (_STLP_WIN16) || defined (_STLP_DOS) || defined (_STLP_VM) || defined (__EMX__)
+    return (_M_openmode & ios_base::binary) != 0;
+# else 
+#   error "Port!"
+# endif
+  }
+
+protected:                      // Static data members.
+  static size_t _M_page_size;
+
+protected:                      // Data members.
+  _STLP_fd _M_file_id;
+# ifdef _STLP_USE_STDIO_IO
+  // for stdio, the whole FILE* is being kept here
+  FILE* _M_file;
+# endif
+# ifdef _STLP_USE_WIN32_IO
+  void* _M_view_id; 
+# endif
+
+  ios_base::openmode _M_openmode     ;
+  unsigned char      _M_is_open      ;
+  unsigned char      _M_should_close ;
+  unsigned char      _M_regular_file ;
+
+public :
+  static size_t  _STLP_CALL __page_size() { return _M_page_size; } 
+  int  __o_mode() const { return (int)_M_openmode; } 
+  bool __is_open()      const { return (_M_is_open !=0 ); } 
+  bool __should_close() const { return (_M_should_close != 0); } 
+  bool __regular_file() const { return (_M_regular_file != 0); }
+  _STLP_fd __get_fd() const { return _M_file_id; }
+};
+
+
+
+
+//----------------------------------------------------------------------
+// Class basic_filebuf<>.
+
+// Forward declaration of two helper classes.
+template <class _Traits> class _Noconv_input;
+_STLP_TEMPLATE_NULL
+class _Noconv_input<char_traits<char> >;
+
+template <class _Traits> class _Noconv_output;
+_STLP_TEMPLATE_NULL
+class _Noconv_output< char_traits<char> >;
+
+// There is a specialized version of underflow, for basic_filebuf<char>,
+// in fstream.cxx.
+
+template <class _CharT, class _Traits>
+class _Underflow;
+
+ _STLP_TEMPLATE_NULL class _Underflow< char, char_traits<char> >;
+
+template <class _CharT, class _Traits>
+class basic_filebuf : public basic_streambuf<_CharT, _Traits>
+{
+public:                         // Types.
+  typedef _CharT                     char_type;
+  typedef typename _Traits::int_type int_type;
+  typedef typename _Traits::pos_type pos_type;
+  typedef typename _Traits::off_type off_type;
+  typedef _Traits                    traits_type;
+
+  typedef typename _Traits::state_type _State_type;
+  typedef basic_streambuf<_CharT, _Traits> _Base;
+  typedef basic_filebuf<_CharT, _Traits> _Self;
+
+public:                         // Constructors, destructor.
+  basic_filebuf();  
+  ~basic_filebuf();
+  
+public:                         // Opening and closing files.
+  bool is_open() const { return _M_base.__is_open(); }
+
+  _Self* open(const char* __s, ios_base::openmode __m) {
+    return _M_base._M_open(__s, __m) ? this : 0;
+  }
+
+# ifndef _STLP_NO_EXTENSIONS
+  // These two version of open() and file descriptor getter are extensions.
+  _Self* open(const char* __s, ios_base::openmode __m,
+		      long __protection) {
+    return _M_base._M_open(__s, __m, __protection) ? this : 0;
+  }
+  
+  _STLP_fd fd() const { return _M_base.__get_fd(); }
+
+  _Self* open(int __id, ios_base::openmode _Init_mode = ios_base::__default_mode) {
+    return this->_M_open(__id, _Init_mode);
+  }
+# endif
+
+  _Self* _M_open(int __id, ios_base::openmode _Init_mode = ios_base::__default_mode) {
+    return _M_base._M_open(__id, _Init_mode) ? this : 0;
+  }
+
+  _Self* close();
+
+protected:                      // Virtual functions from basic_streambuf.
+  virtual streamsize showmanyc();
+  virtual int_type underflow();
+
+  virtual int_type pbackfail(int_type = traits_type::eof());
+  virtual int_type overflow(int_type = traits_type::eof());
+
+  virtual basic_streambuf<_CharT, _Traits>* setbuf(char_type*, streamsize);
+  virtual pos_type seekoff(off_type, ios_base::seekdir,
+                           ios_base::openmode = ios_base::in | ios_base::out);
+  virtual pos_type seekpos(pos_type,
+                           ios_base::openmode = ios_base::in | ios_base::out);
+
+  virtual int sync();
+  virtual void imbue(const locale&);
+
+private:                        // Helper functions.
+
+  // Precondition: we are currently in putback input mode.  Effect:
+  // switches back to ordinary input mode.
+  void _M_exit_putback_mode() {
+    this->setg(_M_saved_eback, _M_saved_gptr, _M_saved_egptr);
+    _M_in_putback_mode = false;
+  }
+  bool _M_switch_to_input_mode();
+  void _M_exit_input_mode();
+  bool _M_switch_to_output_mode();
+
+  int_type _M_input_error();
+  int_type _M_underflow_aux();
+  //  friend class _Noconv_input<_Traits>;
+  //  friend class _Noconv_output<_Traits>;
+  friend class _Underflow<_CharT, _Traits>;
+
+  int_type _M_output_error();
+  bool _M_unshift();
+
+  bool _M_allocate_buffers(_CharT* __buf, streamsize __n);
+  bool _M_allocate_buffers();
+  void _M_deallocate_buffers();
+
+  pos_type _M_seek_return(off_type __off, _State_type __state) {
+    if (__off != -1) {
+      if (_M_in_input_mode)
+        _M_exit_input_mode();
+      _M_in_input_mode = false;
+      _M_in_output_mode = false;
+      _M_in_putback_mode = false;
+      _M_in_error_mode = false;
+      this->setg(0, 0, 0);
+      this->setp(0, 0);
+    }
+    
+    pos_type __result(__off);
+    __result.state(__state);
+    return __result;
+  }
+  
+  bool _M_seek_init(bool __do_unshift);
+
+  void _M_setup_codecvt(const locale&);
+
+private:                        // Data members used in all modes.
+
+  _Filebuf_base _M_base;
+
+private:                        // Locale-related information.
+
+  unsigned char _M_constant_width;
+  unsigned char _M_always_noconv;
+  
+  // private:                        // Mode flags.
+  unsigned char _M_int_buf_dynamic;  // True if internal buffer is heap allocated,
+  // false if it was supplied by the user.
+  unsigned char _M_in_input_mode;
+  unsigned char _M_in_output_mode;
+  unsigned char _M_in_error_mode;
+  unsigned char _M_in_putback_mode;
+  
+  // Internal buffer: characters seen by the filebuf's clients.
+  _CharT* _M_int_buf;
+  _CharT* _M_int_buf_EOS;
+  
+  // External buffer: characters corresponding to the external file.
+  char* _M_ext_buf;
+  char* _M_ext_buf_EOS;
+
+  // The range [_M_ext_buf, _M_ext_buf_converted) contains the external
+  // characters corresponding to the sequence in the internal buffer.  The
+  // range [_M_ext_buf_converted, _M_ext_buf_end) contains characters that
+  // have been read into the external buffer but have not been converted
+  // to an internal sequence.
+  char* _M_ext_buf_converted;
+  char* _M_ext_buf_end;
+
+  // State corresponding to beginning of internal buffer.
+  _State_type _M_state;
+
+private:                        // Data members used only in input mode.
+
+  // Similar to _M_state except that it corresponds to
+  // the end of the internal buffer instead of the beginning.
+  _State_type _M_end_state;
+
+  // This is a null pointer unless we are in mmap input mode.
+  void*     _M_mmap_base;
+  streamoff _M_mmap_len;
+
+private:                        // Data members used only in putback mode.
+  _CharT* _M_saved_eback;
+  _CharT* _M_saved_gptr;
+  _CharT* _M_saved_egptr;
+
+  typedef codecvt<_CharT, char, _State_type> _Codecvt;
+  const _Codecvt* _M_codecvt;
+
+  int _M_width;                 // Width of the encoding (if constant), else 1
+  int _M_max_width;             // Largest possible width of single character.
+
+
+  enum { _S_pback_buf_size = 8 };
+  _CharT _M_pback_buf[_S_pback_buf_size];
+
+  // for _Noconv_output
+public:
+  bool _M_write(char* __buf,  ptrdiff_t __n) {return _M_base._M_write(__buf, __n); }
+
+public:
+  int_type
+  _M_do_noconv_input() {
+    _M_ext_buf_converted = _M_ext_buf_end;
+    this->setg((char_type*)_M_ext_buf, (char_type*)_M_ext_buf, (char_type*)_M_ext_buf_end);
+    return traits_type::to_int_type(*_M_ext_buf);
+  }
+};
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+_STLP_EXPORT_TEMPLATE_CLASS basic_filebuf<char, char_traits<char> >;
+#  if ! defined (_STLP_NO_WCHAR_T)
+_STLP_EXPORT_TEMPLATE_CLASS basic_filebuf<wchar_t, char_traits<wchar_t> >;
+#  endif
+# endif /* _STLP_USE_TEMPLATE_EXPORT */
+
+// public:
+// helper class.
+template <class _CharT>
+struct _Filebuf_Tmp_Buf
+{
+  _CharT* _M_ptr;
+  _Filebuf_Tmp_Buf(ptrdiff_t __n) : _M_ptr(0) { _M_ptr = new _CharT[__n]; }
+  ~_Filebuf_Tmp_Buf() { delete[] _M_ptr; }
+};
+
+
+//
+// This class had to be designed very carefully to work
+// with Visual C++.
+//
+template <class _Traits>
+class _Noconv_output {
+public:
+  typedef typename _Traits::char_type char_type;
+  static bool  _STLP_CALL _M_doit(basic_filebuf<char_type, _Traits >*, 
+                                  char_type*, char_type*)
+  {
+      return false; 
+  }
+};
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC _Noconv_output< char_traits<char> > {
+public:
+  static bool  _STLP_CALL
+  _M_doit(basic_filebuf<char, char_traits<char> >* __buf, 
+          char* __first, char* __last)
+  {
+    ptrdiff_t __n = __last - __first;
+    if (__buf->_M_write(__first, __n)) {
+      return true;
+    }
+    else
+      return false; 
+  }
+};
+
+//----------------------------------------------------------------------
+// basic_filebuf<> helper functions.
+
+
+//----------------------------------------
+// Helper functions for switching between modes.
+
+//
+// This class had to be designed very carefully to work
+// with Visual C++.
+//
+template <class _Traits>
+class _Noconv_input {
+public:
+  typedef typename _Traits::int_type int_type;
+  typedef typename _Traits::char_type char_type;
+
+  static inline int_type _STLP_CALL
+  _M_doit(basic_filebuf<char_type, _Traits>*) 
+  {
+    return 0;
+  }
+};
+
+_STLP_TEMPLATE_NULL
+class _Noconv_input<char_traits<char> > {
+public:
+  static inline int _STLP_CALL
+  _M_doit(basic_filebuf<char, char_traits<char> >* __buf)  {
+    return __buf->_M_do_noconv_input();
+  }
+};
+
+// underflow() may be called for one of two reasons.  (1) We've
+// been going through the special putback buffer, and we need to move back
+// to the regular internal buffer.  (2) We've exhausted the internal buffer,
+// and we need to replentish it.  
+template <class _CharT, class _Traits>
+class _Underflow {
+public:
+  typedef typename _Traits::int_type int_type;
+  typedef _Traits                    traits_type;
+  
+  static int_type _STLP_CALL _M_doit(basic_filebuf<_CharT, _Traits>* __this);
+};
+
+
+// Specialization of underflow: if the character type is char, maybe
+// we can use mmap instead of read.
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC _Underflow< char, char_traits<char> > {
+public:
+  typedef char_traits<char>::int_type int_type;
+  typedef char_traits<char> traits_type;
+  static  int _STLP_CALL _M_doit(basic_filebuf<char, traits_type >* __this);
+};
+
+// There is a specialized version of underflow, for basic_filebuf<char>,
+// in fstream.cxx.
+
+template <class _CharT, class _Traits>
+_STLP_TYPENAME_ON_RETURN_TYPE _Underflow<_CharT, _Traits>::int_type // _STLP_CALL
+ _Underflow<_CharT, _Traits>::_M_doit(basic_filebuf<_CharT, _Traits>* __this)
+{
+  if (!__this->_M_in_input_mode) {
+    if (!__this->_M_switch_to_input_mode())
+      return traits_type::eof();
+  }
+  
+  else if (__this->_M_in_putback_mode) {
+    __this->_M_exit_putback_mode();
+    if (__this->gptr() != __this->egptr()) {
+      int_type __c = traits_type::to_int_type(*__this->gptr());
+      return __c;
+    }
+  }
+  
+  return __this->_M_underflow_aux();
+}
+
+#if defined( _STLP_USE_TEMPLATE_EXPORT ) && ! defined (_STLP_NO_WCHAR_T)
+_STLP_EXPORT_TEMPLATE_CLASS _Underflow<wchar_t, char_traits<wchar_t> >;
+#endif
+
+
+//----------------------------------------------------------------------
+// Class basic_ifstream<>
+
+template <class _CharT, class _Traits>
+class basic_ifstream : public basic_istream<_CharT, _Traits>
+{
+public:                         // Types
+  typedef _CharT                     char_type;
+  typedef typename _Traits::int_type int_type;
+  typedef typename _Traits::pos_type pos_type;
+  typedef typename _Traits::off_type off_type;
+  typedef _Traits                    traits_type;
+
+  typedef basic_ios<_CharT, _Traits>                _Basic_ios;
+  typedef basic_istream<_CharT, _Traits>            _Base;
+  typedef basic_filebuf<_CharT, _Traits>            _Buf;
+
+public:                         // Constructors, destructor.
+
+  basic_ifstream() : 
+    basic_ios<_CharT, _Traits>(),  basic_istream<_CharT, _Traits>(0), _M_buf() {
+      this->init(&_M_buf);
+  }
+
+  explicit basic_ifstream(const char* __s, ios_base::openmode __mod = ios_base::in) : 
+    basic_ios<_CharT, _Traits>(),  basic_istream<_CharT, _Traits>(0),
+    _M_buf() {
+      this->init(&_M_buf);
+      if (!_M_buf.open(__s, __mod | ios_base::in))
+	this->setstate(ios_base::failbit);
+  }
+
+# ifndef _STLP_NO_EXTENSIONS
+  explicit basic_ifstream(int __id, ios_base::openmode __mod = ios_base::in) : 
+    basic_ios<_CharT, _Traits>(),  basic_istream<_CharT, _Traits>(0), _M_buf() {
+    this->init(&_M_buf);
+    if (!_M_buf.open(__id, __mod | ios_base::in))
+      this->setstate(ios_base::failbit);
+  }
+  basic_ifstream(const char* __s, ios_base::openmode __m,
+		 long __protection) : 
+    basic_ios<_CharT, _Traits>(),  basic_istream<_CharT, _Traits>(0), _M_buf() {
+    this->init(&_M_buf);
+    if (!_M_buf.open(__s, __m | ios_base::in, __protection))
+      this->setstate(ios_base::failbit);  
+  }
+  
+# endif
+
+  ~basic_ifstream() {}
+
+public:                         // File and buffer operations.
+  basic_filebuf<_CharT, _Traits>* rdbuf() const
+    { return __CONST_CAST(_Buf*,&_M_buf); }
+
+  bool is_open() {
+    return this->rdbuf()->is_open();
+  }
+
+  void open(const char* __s, ios_base::openmode __mod = ios_base::in) {
+    if (!this->rdbuf()->open(__s, __mod | ios_base::in))
+      this->setstate(ios_base::failbit);
+  }
+
+  void close() {
+    if (!this->rdbuf()->close())
+      this->setstate(ios_base::failbit);
+  }
+
+
+private:
+  basic_filebuf<_CharT, _Traits> _M_buf;
+};
+
+
+//----------------------------------------------------------------------
+// Class basic_ofstream<>
+
+template <class _CharT, class _Traits>
+class basic_ofstream : public basic_ostream<_CharT, _Traits>
+{
+public:                         // Types
+  typedef _CharT                     char_type;
+  typedef typename _Traits::int_type int_type;
+  typedef typename _Traits::pos_type pos_type;
+  typedef typename _Traits::off_type off_type;
+  typedef _Traits                    traits_type;
+
+  typedef basic_ios<_CharT, _Traits>                _Basic_ios;
+  typedef basic_ostream<_CharT, _Traits>            _Base;
+  typedef basic_filebuf<_CharT, _Traits>            _Buf;
+
+public:                         // Constructors, destructor.
+  basic_ofstream() : 
+    basic_ios<_CharT, _Traits>(), 
+    basic_ostream<_CharT, _Traits>(0), _M_buf() {
+      this->init(&_M_buf);
+  }
+  explicit basic_ofstream(const char* __s, ios_base::openmode __mod = ios_base::out) 
+    : basic_ios<_CharT, _Traits>(), basic_ostream<_CharT, _Traits>(0),
+      _M_buf() {
+	this->init(&_M_buf);
+	if (!_M_buf.open(__s, __mod | ios_base::out))
+	  this->setstate(ios_base::failbit);
+  }
+
+# ifndef _STLP_NO_EXTENSIONS
+  explicit basic_ofstream(int __id, ios_base::openmode __mod = ios_base::out) 
+    : basic_ios<_CharT, _Traits>(), basic_ostream<_CharT, _Traits>(0),
+    _M_buf() {
+ 	this->init(&_M_buf);
+ 	if (!_M_buf.open(__id, __mod | ios_base::out))
+ 	  this->setstate(ios_base::failbit);
+  }
+  basic_ofstream(const char* __s, ios_base::openmode __m, long __protection) : 
+    basic_ios<_CharT, _Traits>(),  basic_ostream<_CharT, _Traits>(0), _M_buf() {
+    this->init(&_M_buf);
+    if (!_M_buf.open(__s, __m | ios_base::out, __protection))
+      this->setstate(ios_base::failbit);  
+  }
+# endif
+  
+  ~basic_ofstream() {}
+
+public:                         // File and buffer operations.
+  basic_filebuf<_CharT, _Traits>* rdbuf() const
+    { return __CONST_CAST(_Buf*,&_M_buf); } 
+
+  bool is_open() {
+    return this->rdbuf()->is_open();
+  }
+
+  void open(const char* __s, ios_base::openmode __mod= ios_base::out) {
+    if (!this->rdbuf()->open(__s, __mod | ios_base::out))
+      this->setstate(ios_base::failbit);
+  }
+
+  void close() {
+    if (!this->rdbuf()->close())
+      this->setstate(ios_base::failbit);
+  }
+
+private:
+  basic_filebuf<_CharT, _Traits> _M_buf;
+};
+
+
+//----------------------------------------------------------------------
+// Class basic_fstream<>
+
+template <class _CharT, class _Traits>
+class basic_fstream : public basic_iostream<_CharT, _Traits>
+{
+public:                         // Types
+  typedef _CharT                     char_type;
+  typedef typename _Traits::int_type int_type;
+  typedef typename _Traits::pos_type pos_type;
+  typedef typename _Traits::off_type off_type;
+  typedef _Traits                    traits_type;
+
+  typedef basic_ios<_CharT, _Traits>                _Basic_ios;
+  typedef basic_iostream<_CharT, _Traits>           _Base;
+  typedef basic_filebuf<_CharT, _Traits>            _Buf;
+
+public:                         // Constructors, destructor.
+  
+  basic_fstream()   
+    : basic_ios<_CharT, _Traits>(), basic_iostream<_CharT, _Traits>(0), _M_buf() {
+      this->init(&_M_buf);
+  }
+
+  explicit basic_fstream(const char* __s,
+                         ios_base::openmode __mod = ios_base::in | ios_base::out) :
+    basic_ios<_CharT, _Traits>(), basic_iostream<_CharT, _Traits>(0), _M_buf() {
+      this->init(&_M_buf);
+      if (!_M_buf.open(__s, __mod))
+	this->setstate(ios_base::failbit);
+  }
+
+# ifndef _STLP_NO_EXTENSIONS
+  explicit basic_fstream(int __id,
+                         ios_base::openmode __mod = ios_base::in | ios_base::out) :
+    basic_ios<_CharT, _Traits>(), basic_iostream<_CharT, _Traits>(0), _M_buf() {
+    this->init(&_M_buf);
+    if (!_M_buf.open(__id, __mod))
+      this->setstate(ios_base::failbit);
+  }
+  basic_fstream(const char* __s, ios_base::openmode __m, long __protection) : 
+    basic_ios<_CharT, _Traits>(),  basic_iostream<_CharT, _Traits>(0), _M_buf() {
+    this->init(&_M_buf);
+    if (!_M_buf.open(__s, __m, __protection))
+      this->setstate(ios_base::failbit);  
+  }
+# endif    
+  ~basic_fstream() {}
+
+public:                         // File and buffer operations.
+
+  basic_filebuf<_CharT, _Traits>* rdbuf() const
+    { return __CONST_CAST(_Buf*,&_M_buf); } 
+
+  bool is_open() {
+    return this->rdbuf()->is_open();
+  }
+
+  void open(const char* __s, 
+	    ios_base::openmode __mod = 
+	    ios_base::in | ios_base::out) {
+    if (!this->rdbuf()->open(__s, __mod))
+      this->setstate(ios_base::failbit);
+  }
+
+  void close() {
+    if (!this->rdbuf()->close())
+      this->setstate(ios_base::failbit);
+  }
+
+private:
+  basic_filebuf<_CharT, _Traits> _M_buf;
+};
+
+_STLP_END_NAMESPACE
+
+# if !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_fstream.c>
+# endif
+
+_STLP_BEGIN_NAMESPACE
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+_STLP_EXPORT_TEMPLATE_CLASS basic_ifstream<char, char_traits<char> >;
+_STLP_EXPORT_TEMPLATE_CLASS basic_ofstream<char, char_traits<char> >;
+_STLP_EXPORT_TEMPLATE_CLASS basic_fstream<char, char_traits<char> >;
+#  if ! defined (_STLP_NO_WCHAR_T)
+_STLP_EXPORT_TEMPLATE_CLASS basic_ifstream<wchar_t, char_traits<wchar_t> >;
+_STLP_EXPORT_TEMPLATE_CLASS basic_ofstream<wchar_t, char_traits<wchar_t> >;
+_STLP_EXPORT_TEMPLATE_CLASS basic_fstream<wchar_t, char_traits<wchar_t> >;
+#  endif
+# endif /* _STLP_USE_TEMPLATE_EXPORT */
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_FSTREAM */
+
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_function.h b/main/source/stlport/stlport/stl/_function.h
new file mode 100644
index 00000000..e3e26fba
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_function.h
@@ -0,0 +1,371 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996-1998
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_FUNCTION_H
+#define _STLP_INTERNAL_FUNCTION_H
+
+#ifndef _STLP_INTERNAL_FUNCTION_BASE_H
+#include <stl/_function_base.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+# ifndef _STLP_NO_EXTENSIONS
+// identity_element (not part of the C++ standard).
+template <class _Tp> inline _Tp identity_element(plus<_Tp>) {  return _Tp(0); }
+template <class _Tp> inline _Tp identity_element(multiplies<_Tp>) { return _Tp(1); }
+# endif
+
+#  if defined (_STLP_BASE_TYPEDEF_BUG)
+// this workaround is needed for SunPro 4.0.1
+// suggested by "Martin Abernethy" <gma@paston.co.uk>:
+
+// We have to introduce the XXary_predicate_aux structures in order to
+// access the argument and return types of predicate functions supplied
+// as type parameters. SUN C++ 4.0.1 compiler gives errors for template type parameters
+// of the form 'name1::name2', where name1 is itself a type parameter.
+template <class _Pair>
+struct __pair_aux : private _Pair
+{
+	typedef typename _Pair::first_type first_type;
+	typedef typename _Pair::second_type second_type;
+};
+
+template <class _Operation>
+struct __unary_fun_aux : private _Operation
+{
+	typedef typename _Operation::argument_type argument_type;
+	typedef typename _Operation::result_type result_type;
+};
+
+template <class _Operation>
+struct __binary_fun_aux  : private _Operation
+{
+	typedef typename _Operation::first_argument_type first_argument_type;
+	typedef typename _Operation::second_argument_type second_argument_type;
+	typedef typename _Operation::result_type result_type;
+};
+
+#  define __UNARY_ARG(__Operation,__type)  __unary_fun_aux<__Operation>::__type
+#  define __BINARY_ARG(__Operation,__type)  __binary_fun_aux<__Operation>::__type
+#  define __PAIR_ARG(__Pair,__type)  __pair_aux<__Pair>::__type
+# else
+#  define __UNARY_ARG(__Operation,__type)  __Operation::__type
+#  define __BINARY_ARG(__Operation,__type) __Operation::__type
+#  define __PAIR_ARG(__Pair,__type) __Pair::__type
+# endif
+
+template <class _Predicate>
+class unary_negate : 
+    public unary_function<typename __UNARY_ARG(_Predicate,argument_type), bool> {
+protected:
+  _Predicate _M_pred;
+public:
+  explicit unary_negate(const _Predicate& __x) : _M_pred(__x) {}
+  bool operator()(const typename _Predicate::argument_type& __x) const {
+    return !_M_pred(__x);
+  }
+};
+
+template <class _Predicate>
+inline unary_negate<_Predicate> 
+not1(const _Predicate& __pred)
+{
+  return unary_negate<_Predicate>(__pred);
+}
+
+template <class _Predicate> 
+class binary_negate 
+    : public binary_function<typename __BINARY_ARG(_Predicate,first_argument_type),
+			     typename __BINARY_ARG(_Predicate,second_argument_type), 
+                             bool> {
+protected:
+  _Predicate _M_pred;
+public:
+  explicit binary_negate(const _Predicate& __x) : _M_pred(__x) {}
+  bool operator()(const typename _Predicate::first_argument_type& __x, 
+                  const typename _Predicate::second_argument_type& __y) const
+  {
+    return !_M_pred(__x, __y); 
+  }
+};
+
+template <class _Predicate>
+inline binary_negate<_Predicate> 
+not2(const _Predicate& __pred)
+{
+  return binary_negate<_Predicate>(__pred);
+}
+
+template <class _Operation> 
+class binder1st : 
+    public unary_function<typename __BINARY_ARG(_Operation,second_argument_type),
+                          typename __BINARY_ARG(_Operation,result_type) > {
+protected:
+  _Operation _M_op;
+  typename _Operation::first_argument_type _M_value;
+public:
+  binder1st(const _Operation& __x,
+            const typename _Operation::first_argument_type& __y)
+      : _M_op(__x), _M_value(__y) {}
+
+  typename _Operation::result_type
+  operator()(const typename _Operation::second_argument_type& __x) const {
+    return _M_op(_M_value, __x); 
+  }
+
+  typename _Operation::result_type
+  operator()(typename _Operation::second_argument_type& __x) const {
+    return _M_op(_M_value, __x); 
+  }
+};
+
+template <class _Operation, class _Tp>
+inline binder1st<_Operation> 
+bind1st(const _Operation& __fn, const _Tp& __x) 
+{
+  typedef typename _Operation::first_argument_type _Arg1_type;
+  return binder1st<_Operation>(__fn, _Arg1_type(__x));
+}
+
+template <class _Operation> 
+class binder2nd
+  : public unary_function<typename __BINARY_ARG(_Operation,first_argument_type),
+                          typename __BINARY_ARG(_Operation,result_type)> {
+protected:
+  _Operation _M_op;
+  typename _Operation::second_argument_type value;
+public:
+  binder2nd(const _Operation& __x,
+            const typename _Operation::second_argument_type& __y) 
+      : _M_op(__x), value(__y) {}
+
+  typename _Operation::result_type
+  operator()(const typename _Operation::first_argument_type& __x) const {
+    return _M_op(__x, value); 
+  }
+
+  typename _Operation::result_type
+  operator()(typename _Operation::first_argument_type& __x) const {
+    return _M_op(__x, value); 
+  }
+};
+
+template <class _Operation, class _Tp>
+inline binder2nd<_Operation> 
+bind2nd(const _Operation& __fn, const _Tp& __x) 
+{
+  typedef typename _Operation::second_argument_type _Arg2_type;
+  return binder2nd<_Operation>(__fn, _Arg2_type(__x));
+}
+
+# ifndef _STLP_NO_EXTENSIONS
+// unary_compose and binary_compose (extensions, not part of the standard).
+
+template <class _Operation1, class _Operation2>
+class unary_compose : 
+  public unary_function<typename __UNARY_ARG(_Operation2,argument_type),
+                        typename __UNARY_ARG(_Operation1,result_type)> {
+protected:
+  _Operation1 _M_fn1;
+  _Operation2 _M_fn2;
+public:
+  unary_compose(const _Operation1& __x, const _Operation2& __y) 
+    : _M_fn1(__x), _M_fn2(__y) {}
+
+  typename _Operation1::result_type
+  operator()(const typename _Operation2::argument_type& __x) const {
+    return _M_fn1(_M_fn2(__x));
+  }
+
+  typename _Operation1::result_type
+  operator()(typename _Operation2::argument_type& __x) const {
+    return _M_fn1(_M_fn2(__x));
+  }
+};
+
+template <class _Operation1, class _Operation2>
+inline unary_compose<_Operation1,_Operation2> 
+compose1(const _Operation1& __fn1, const _Operation2& __fn2)
+{
+  return unary_compose<_Operation1,_Operation2>(__fn1, __fn2);
+}
+
+template <class _Operation1, class _Operation2, class _Operation3>
+class binary_compose : 
+    public unary_function<typename __UNARY_ARG(_Operation2,argument_type),
+                          typename __BINARY_ARG(_Operation1,result_type)> {
+protected:
+  _Operation1 _M_fn1;
+  _Operation2 _M_fn2;
+  _Operation3 _M_fn3;
+public:
+  binary_compose(const _Operation1& __x, const _Operation2& __y, 
+                 const _Operation3& __z) 
+    : _M_fn1(__x), _M_fn2(__y), _M_fn3(__z) { }
+
+  typename _Operation1::result_type
+  operator()(const typename _Operation2::argument_type& __x) const {
+    return _M_fn1(_M_fn2(__x), _M_fn3(__x));
+  }
+
+  typename _Operation1::result_type
+  operator()(typename _Operation2::argument_type& __x) const {
+    return _M_fn1(_M_fn2(__x), _M_fn3(__x));
+  }
+};
+
+template <class _Operation1, class _Operation2, class _Operation3>
+inline binary_compose<_Operation1, _Operation2, _Operation3> 
+compose2(const _Operation1& __fn1, const _Operation2& __fn2, 
+         const _Operation3& __fn3)
+{
+  return binary_compose<_Operation1,_Operation2,_Operation3>
+    (__fn1, __fn2, __fn3);
+}
+
+# endif /* _STLP_NO_EXTENSIONS */
+
+# ifndef _STLP_NO_EXTENSIONS
+
+// identity is an extension: it is not part of the standard.
+template <class _Tp> struct identity : public _Identity<_Tp> {};
+// select1st and select2nd are extensions: they are not part of the standard.
+template <class _Pair> struct select1st : public _Select1st<_Pair> {};
+template <class _Pair> struct select2nd : public _Select2nd<_Pair> {};
+
+template <class _Arg1, class _Arg2> 
+struct project1st : public _Project1st<_Arg1, _Arg2> {};
+
+template <class _Arg1, class _Arg2>
+struct project2nd : public _Project2nd<_Arg1, _Arg2> {};
+
+
+// constant_void_fun, constant_unary_fun, and constant_binary_fun are
+// extensions: they are not part of the standard.  (The same, of course,
+// is true of the helper functions constant0, constant1, and constant2.)
+
+template <class _Result>
+struct _Constant_void_fun {
+  typedef _Result result_type;
+  result_type _M_val;
+
+  _Constant_void_fun(const result_type& __v) : _M_val(__v) {}
+  const result_type& operator()() const { return _M_val; }
+};  
+
+
+template <class _Result>
+struct constant_void_fun : public _Constant_void_fun<_Result> {
+  constant_void_fun(const _Result& __v) : _Constant_void_fun<_Result>(__v) {}
+};  
+
+template <class _Result, __DFL_TMPL_PARAM( _Argument , _Result) >
+struct constant_unary_fun : public _Constant_unary_fun<_Result, _Argument>
+{
+  constant_unary_fun(const _Result& __v)
+    : _Constant_unary_fun<_Result, _Argument>(__v) {}
+};
+
+template <class _Result, __DFL_TMPL_PARAM( _Arg1 , _Result), __DFL_TMPL_PARAM( _Arg2 , _Arg1) >
+struct constant_binary_fun
+  : public _Constant_binary_fun<_Result, _Arg1, _Arg2>
+{
+  constant_binary_fun(const _Result& __v)
+    : _Constant_binary_fun<_Result, _Arg1, _Arg2>(__v) {}
+};
+
+template <class _Result>
+inline constant_void_fun<_Result> constant0(const _Result& __val)
+{
+  return constant_void_fun<_Result>(__val);
+}
+
+template <class _Result>
+inline constant_unary_fun<_Result,_Result> constant1(const _Result& __val)
+{
+  return constant_unary_fun<_Result,_Result>(__val);
+}
+
+template <class _Result>
+inline constant_binary_fun<_Result,_Result,_Result> 
+constant2(const _Result& __val)
+{
+  return constant_binary_fun<_Result,_Result,_Result>(__val);
+}
+
+// subtractive_rng is an extension: it is not part of the standard.
+// Note: this code assumes that int is 32 bits.
+class subtractive_rng : public unary_function<_STLP_UINT32_T, _STLP_UINT32_T> {
+private:
+  _STLP_UINT32_T _M_table[55];
+  _STLP_UINT32_T _M_index1;
+  _STLP_UINT32_T _M_index2;
+public:
+  _STLP_UINT32_T operator()(_STLP_UINT32_T __limit) {
+    _M_index1 = (_M_index1 + 1) % 55;
+    _M_index2 = (_M_index2 + 1) % 55;
+    _M_table[_M_index1] = _M_table[_M_index1] - _M_table[_M_index2];
+    return _M_table[_M_index1] % __limit;
+  }
+
+  void _M_initialize(_STLP_UINT32_T __seed)
+  {
+    _STLP_UINT32_T __k = 1;
+    _M_table[54] = __seed;
+    _STLP_UINT32_T __i;
+    for (__i = 0; __i < 54; __i++) {
+        _STLP_UINT32_T __ii = (21 * (__i + 1) % 55) - 1;
+        _M_table[__ii] = __k;
+        __k = __seed - __k;
+        __seed = _M_table[__ii];
+    }
+    for (int __loop = 0; __loop < 4; __loop++) {
+        for (__i = 0; __i < 55; __i++)
+            _M_table[__i] = _M_table[__i] - _M_table[(1 + __i + 30) % 55];
+    }
+    _M_index1 = 0;
+    _M_index2 = 31;
+  }
+
+  subtractive_rng(unsigned int __seed) { _M_initialize(__seed); }
+  subtractive_rng() { _M_initialize(161803398ul); }
+};
+
+# endif /* _STLP_NO_EXTENSIONS */
+
+_STLP_END_NAMESPACE
+
+#include <stl/_function_adaptors.h>
+
+#endif /* _STLP_INTERNAL_FUNCTION_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_function_adaptors.h b/main/source/stlport/stlport/stl/_function_adaptors.h
new file mode 100644
index 00000000..ed1fbf42
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_function_adaptors.h
@@ -0,0 +1,802 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996-1998
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * Copyright (c) 2000
+ * Pavel Kuznetsov
+ *
+ * Copyright (c) 2001
+ * Meridian'93
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+// This file has noo macro protection as it is meant to be included several times
+// from other header.
+// Adaptor function objects: pointers to member functions.
+
+// There are a total of 16 = 2^4 function objects in this family.
+//  (1) Member functions taking no arguments vs member functions taking
+//       one argument.
+//  (2) Call through pointer vs call through reference.
+//  (3) Member function with void return type vs member function with
+//      non-void return type.
+//  (4) Const vs non-const member function.
+
+// Note that choice (3) is nothing more than a workaround: according
+//  to the draft, compilers should handle void and non-void the same way.
+//  This feature is not yet widely implemented, though.  You can only use
+//  member functions returning void if your compiler supports partial
+//  specialization.
+
+// All of this complexity is in the function objects themselves.  You can
+//  ignore it by using the helper function mem_fun and mem_fun_ref,
+//  which create whichever type of adaptor is appropriate.
+
+_STLP_BEGIN_NAMESPACE
+
+//This implementation will only be used if needed, that is to say when there is the return void bug
+//and when there is no partial template specialization
+#if defined(_STLP_DONT_RETURN_VOID) && defined (_STLP_NO_CLASS_PARTIAL_SPECIALIZATION) && defined(_STLP_MEMBER_TEMPLATE_CLASSES)
+
+template<class _Result, class _Tp>
+class _Mem_fun0_ptr : public unary_function<_Tp*, _Result> {
+protected:
+  typedef _Result (_Tp::*__fun_type) ();
+  explicit _Mem_fun0_ptr(__fun_type __f) : _M_f(__f) {}
+
+public:
+  _Result operator ()(_Tp* __p) const { return (__p->*_M_f)(); }
+
+private:
+  __fun_type _M_f;
+};
+
+template<class _Result, class _Tp, class _Arg>
+class _Mem_fun1_ptr : public binary_function<_Tp*,_Arg,_Result> {
+protected:
+  typedef _Result (_Tp::*__fun_type) (_Arg);
+  explicit _Mem_fun1_ptr(__fun_type __f) : _M_f(__f) {}
+
+public:
+  _Result operator ()(_Tp* __p, _Arg __x) const { return (__p->*_M_f)(__x); }
+
+private:
+  __fun_type _M_f;
+};
+
+template<class _Result, class _Tp>
+class _Const_mem_fun0_ptr : public unary_function<const _Tp*,_Result> {
+protected:
+  typedef _Result (_Tp::*__fun_type) () const;
+  explicit _Const_mem_fun0_ptr(__fun_type __f) : _M_f(__f) {}
+
+public:
+  _Result operator ()(const _Tp* __p) const { return (__p->*_M_f)(); }
+
+private:
+  __fun_type _M_f;
+};
+
+template<class _Result, class _Tp, class _Arg>
+class _Const_mem_fun1_ptr : public binary_function<const _Tp*,_Arg,_Result> {
+protected:
+  typedef _Result (_Tp::*__fun_type) (_Arg) const;
+  explicit _Const_mem_fun1_ptr(__fun_type __f) : _M_f(__f) {}
+
+public:
+  _Result operator ()(const _Tp* __p, _Arg __x) const {
+    return (__p->*_M_f)(__x); }
+
+private:
+  __fun_type _M_f;
+};
+
+template<class _Result, class _Tp>
+class _Mem_fun0_ref : public unary_function<_Tp&,_Result> {
+protected:
+  typedef _Result (_Tp::*__fun_type) ();
+  explicit _Mem_fun0_ref(__fun_type __f) : _M_f(__f) {}
+
+public:
+  _Result operator ()(_Tp& __p) const { return (__p.*_M_f)(); }
+
+private:
+  __fun_type _M_f;
+};
+
+template<class _Result, class _Tp, class _Arg>
+class _Mem_fun1_ref : public binary_function<_Tp&,_Arg,_Result> {
+protected:
+  typedef _Result (_Tp::*__fun_type) (_Arg);
+  explicit _Mem_fun1_ref(__fun_type __f) : _M_f(__f) {}
+
+public:
+  _Result operator ()(_Tp& __p, _Arg __x) const { return (__p.*_M_f)(__x); }
+
+private:
+  __fun_type _M_f;
+};
+
+template<class _Result, class _Tp>
+class _Const_mem_fun0_ref : public unary_function<const _Tp&,_Result> {
+protected:
+  typedef _Result (_Tp::*__fun_type) () const;
+  explicit _Const_mem_fun0_ref(__fun_type __f) : _M_f(__f) {}
+
+public:
+  _Result operator ()(const _Tp& __p) const { return (__p.*_M_f)(); }
+
+private:
+  __fun_type _M_f;
+};
+
+template<class _Result, class _Tp, class _Arg>
+class _Const_mem_fun1_ref : public binary_function<const _Tp&,_Arg,_Result> {
+protected:
+  typedef _Result (_Tp::*__fun_type) (_Arg) const;
+  explicit _Const_mem_fun1_ref(__fun_type __f) : _M_f(__f) {}
+
+public:
+  _Result operator ()(const _Tp& __p, _Arg __x) const { return (__p.*_M_f)(__x); }
+
+private:
+  __fun_type _M_f;
+};
+
+template<class _Result> 
+struct _Mem_fun_traits {
+  template<class _Tp> 
+  struct _Args0 {
+    typedef _Mem_fun0_ptr<_Result,_Tp>            _Ptr;
+    typedef _Const_mem_fun0_ptr<_Result,_Tp>      _Ptr_const;
+    typedef _Mem_fun0_ref<_Result,_Tp>            _Ref;
+    typedef _Const_mem_fun0_ref<_Result,_Tp>      _Ref_const;
+  };
+
+  template<class _Tp, class _Arg>
+  struct _Args1 {
+    typedef _Mem_fun1_ptr<_Result,_Tp,_Arg>       _Ptr;
+    typedef _Const_mem_fun1_ptr<_Result,_Tp,_Arg> _Ptr_const;
+    typedef _Mem_fun1_ref<_Result,_Tp,_Arg>       _Ref;
+    typedef _Const_mem_fun1_ref<_Result,_Tp,_Arg> _Ref_const;
+  };
+};
+
+template<class _Arg, class _Result>
+class _Ptr_fun1_base : public unary_function<_Arg, _Result> {
+protected:
+  typedef _Result (*__fun_type) (_Arg);
+  explicit _Ptr_fun1_base(__fun_type __f) : _M_f(__f) {}
+
+public:
+  _Result operator()(_Arg __x) const { return _M_f(__x); }
+
+private:
+  __fun_type _M_f;
+};
+
+template <class _Arg1, class _Arg2, class _Result>
+class _Ptr_fun2_base : public binary_function<_Arg1,_Arg2,_Result> {
+protected:
+  typedef _Result (*__fun_type) (_Arg1, _Arg2);
+  explicit _Ptr_fun2_base(__fun_type __f) : _M_f(__f) {}
+
+public:
+  _Result operator()(_Arg1 __x, _Arg2 __y) const { return _M_f(__x, __y); }
+
+private:
+  __fun_type _M_f;
+};
+
+template<class _Result> 
+struct _Ptr_fun_traits {
+  template<class _Arg> struct _Args1 {
+    typedef _Ptr_fun1_base<_Arg,_Result> _Fun;
+  };
+
+  template<class _Arg1, class _Arg2> struct _Args2 {
+    typedef _Ptr_fun2_base<_Arg1,_Arg2,_Result> _Fun;
+  };
+};
+
+/*Specialization for void return type
+*/
+template<class _Tp>
+class _Void_mem_fun0_ptr : public unary_function<_Tp*,void> {
+protected:
+  typedef void (_Tp::*__fun_type) ();
+  explicit _Void_mem_fun0_ptr(__fun_type __f) : _M_f(__f) {}
+
+public:
+  void operator ()(_Tp* __p) const { (__p->*_M_f)(); }
+
+private:
+  __fun_type _M_f;
+};
+
+template<class _Tp, class _Arg>
+class _Void_mem_fun1_ptr : public binary_function<_Tp*,_Arg,void> {
+protected:
+  typedef void (_Tp::*__fun_type) (_Arg);
+  explicit _Void_mem_fun1_ptr(__fun_type __f) : _M_f(__f) {}
+
+public:
+  void operator ()(_Tp* __p, _Arg __x) const { (__p->*_M_f)(__x); }
+
+private:
+  __fun_type _M_f;
+};
+
+template<class _Tp>
+class _Void_const_mem_fun0_ptr : public unary_function<const _Tp*,void> {
+protected:
+  typedef void (_Tp::*__fun_type) () const;
+  explicit _Void_const_mem_fun0_ptr(__fun_type __f) : _M_f(__f) {}
+
+public:
+  void operator ()(const _Tp* __p) const { (__p->*_M_f)(); }
+
+private:
+  __fun_type _M_f;
+};
+
+template<class _Tp, class _Arg>
+class _Void_const_mem_fun1_ptr : public binary_function<const _Tp*,_Arg,void> {
+protected:
+  typedef void (_Tp::*__fun_type) (_Arg) const;
+  explicit _Void_const_mem_fun1_ptr(__fun_type __f) : _M_f(__f) {}
+
+public:
+  void operator ()(const _Tp* __p, _Arg __x) const { (__p->*_M_f)(__x); }
+
+private:
+  __fun_type _M_f;
+};
+
+template<class _Tp>
+class _Void_mem_fun0_ref : public unary_function<_Tp&,void> {
+protected:
+  typedef void (_Tp::*__fun_type) ();
+  explicit _Void_mem_fun0_ref(__fun_type __f) : _M_f(__f) {}
+
+public:
+  void operator ()(_Tp& __p) const { (__p.*_M_f)(); }
+
+private:
+  __fun_type _M_f;
+};
+
+template<class _Tp, class _Arg>
+class _Void_mem_fun1_ref : public binary_function<_Tp&,_Arg,void> {
+protected:
+  typedef void (_Tp::*__fun_type) (_Arg);
+  explicit _Void_mem_fun1_ref(__fun_type __f) : _M_f(__f) {}
+
+public:
+  void operator ()(_Tp& __p, _Arg __x) const { (__p.*_M_f)(__x); }
+
+private:
+  __fun_type _M_f;
+};
+
+template<class _Tp>
+class _Void_const_mem_fun0_ref : public unary_function<const _Tp&,void> {
+protected:
+  typedef void (_Tp::*__fun_type) () const;
+  explicit _Void_const_mem_fun0_ref(__fun_type __f) : _M_f(__f) {}
+
+public:
+  void operator ()(const _Tp& __p) const { (__p.*_M_f)(); }
+
+private:
+  __fun_type _M_f;
+};
+
+template<class _Tp, class _Arg>
+class _Void_const_mem_fun1_ref : public binary_function<const _Tp&,_Arg,void> {
+protected:
+  typedef void (_Tp::*__fun_type) (_Arg) const;
+  explicit _Void_const_mem_fun1_ref(__fun_type __f) : _M_f(__f) {}
+
+public:
+  void operator ()(const _Tp& __p, _Arg __x) const { (__p.*_M_f)(__x); }
+
+private:
+  __fun_type _M_f;
+};
+
+_STLP_TEMPLATE_NULL
+struct _Mem_fun_traits<void> {
+  template<class _Tp> struct _Args0 {
+    typedef _Void_mem_fun0_ptr<_Tp>             _Ptr;
+    typedef _Void_const_mem_fun0_ptr<_Tp>       _Ptr_const;
+    typedef _Void_mem_fun0_ref<_Tp>             _Ref;
+    typedef _Void_const_mem_fun0_ref<_Tp>       _Ref_const;
+  };
+
+  template<class _Tp, class _Arg> struct _Args1 {
+    typedef _Void_mem_fun1_ptr<_Tp,_Arg>        _Ptr;
+    typedef _Void_const_mem_fun1_ptr<_Tp,_Arg>  _Ptr_const;
+    typedef _Void_mem_fun1_ref<_Tp,_Arg>        _Ref;
+    typedef _Void_const_mem_fun1_ref<_Tp,_Arg>  _Ref_const;
+  };
+};
+
+template<class _Arg>
+class _Ptr_void_fun1_base : public unary_function<_Arg, void> {
+protected:
+  typedef void (*__fun_type) (_Arg);
+  explicit _Ptr_void_fun1_base(__fun_type __f) : _M_f(__f) {}
+
+public:
+  void operator()(_Arg __x) const { _M_f(__x); }
+
+private:
+  __fun_type _M_f;
+};
+
+template <class _Arg1, class _Arg2>
+class _Ptr_void_fun2_base : public binary_function<_Arg1,_Arg2,void> {
+protected:
+  typedef void (*__fun_type) (_Arg1, _Arg2);
+  explicit _Ptr_void_fun2_base(__fun_type __f) : _M_f(__f) {}
+
+public:
+  void operator()(_Arg1 __x, _Arg2 __y) const { _M_f(__x, __y); }
+
+private:
+  __fun_type _M_f;
+};
+
+_STLP_TEMPLATE_NULL
+struct _Ptr_fun_traits<void> {
+  template<class _Arg> struct _Args1 {
+    typedef _Ptr_void_fun1_base<_Arg> _Fun;
+  };
+  
+  template<class _Arg1, class _Arg2> struct _Args2 {
+    typedef _Ptr_void_fun2_base<_Arg1,_Arg2> _Fun;
+  };
+};
+
+// pavel: need extra level of inheritance here since MSVC++ does not
+// accept traits-based fake partial specialization for template
+// arguments other than first
+
+template<class _Result, class _Arg>
+class _Ptr_fun1 : 
+  public _Ptr_fun_traits<_Result>::_STLP_TEMPLATE _Args1<_Arg>::_Fun {
+protected:
+  typedef typename _Ptr_fun_traits<_Result>::_STLP_TEMPLATE _Args1<_Arg>::_Fun _Base;
+  explicit _Ptr_fun1(typename _Base::__fun_type __f) : _Base(__f) {}
+};
+
+template<class _Result, class _Arg1, class _Arg2>
+class _Ptr_fun2 : 
+  public _Ptr_fun_traits<_Result>::_STLP_TEMPLATE _Args2<_Arg1,_Arg2>::_Fun {
+protected:
+  typedef typename _Ptr_fun_traits<_Result>::_STLP_TEMPLATE _Args2<_Arg1,_Arg2>::_Fun _Base;
+  explicit _Ptr_fun2(typename _Base::__fun_type __f) : _Base(__f) {}
+};
+
+
+#endif /*_STLP_DONT_RETURN_VOID && _STLP_NO_CLASS_PARTIAL_SPECIALIZATION && _STLP_MEMBER_TEMPLATE_CLASSES*/
+
+
+#if !defined(_STLP_DONT_RETURN_VOID) || !defined(_STLP_NO_CLASS_PARTIAL_SPECIALIZATION) || !defined (_STLP_MEMBER_TEMPLATE_CLASSES)
+
+template <class _Ret, class _Tp>
+class mem_fun_t : public unary_function<_Tp*,_Ret> {
+  typedef _Ret (_Tp::*__fun_type)(void);
+public:
+  explicit mem_fun_t(__fun_type __pf) : _M_f(__pf) {}
+  _Ret operator()(_Tp* __p) const { return (__p->*_M_f)(); }
+private:
+  __fun_type _M_f;
+};
+
+template <class _Ret, class _Tp>
+class const_mem_fun_t : public unary_function<const _Tp*,_Ret> {
+  typedef _Ret (_Tp::*__fun_type)(void) const;
+public:
+  explicit const_mem_fun_t(__fun_type __pf) : _M_f(__pf) {}
+  _Ret operator()(const _Tp* __p) const { return (__p->*_M_f)(); }
+private:
+  __fun_type _M_f;
+};
+
+
+template <class _Ret, class _Tp>
+class mem_fun_ref_t : public unary_function<_Tp,_Ret> {
+  typedef _Ret (_Tp::*__fun_type)(void);
+public:
+  explicit mem_fun_ref_t(__fun_type __pf) : _M_f(__pf) {}
+  _Ret operator()(_Tp& __r) const { return (__r.*_M_f)(); }
+private:
+  __fun_type _M_f;
+};
+
+template <class _Ret, class _Tp>
+class const_mem_fun_ref_t : public unary_function<_Tp,_Ret> {
+  typedef _Ret (_Tp::*__fun_type)(void) const;
+public:
+  explicit const_mem_fun_ref_t(__fun_type __pf) : _M_f(__pf) {}
+  _Ret operator()(const _Tp& __r) const { return (__r.*_M_f)(); }
+private:
+  __fun_type _M_f;
+};
+
+template <class _Ret, class _Tp, class _Arg>
+class mem_fun1_t : public binary_function<_Tp*,_Arg,_Ret> {
+  typedef _Ret (_Tp::*__fun_type)(_Arg);
+public:
+  explicit mem_fun1_t(__fun_type __pf) : _M_f(__pf) {}
+  _Ret operator()(_Tp* __p, _Arg __x) const { return (__p->*_M_f)(__x); }
+private:
+  __fun_type _M_f;
+};
+
+template <class _Ret, class _Tp, class _Arg>
+class const_mem_fun1_t : public binary_function<const _Tp*,_Arg,_Ret> {
+  typedef _Ret (_Tp::*__fun_type)(_Arg) const;
+public:
+  explicit const_mem_fun1_t(__fun_type __pf) : _M_f(__pf) {}
+  _Ret operator()(const _Tp* __p, _Arg __x) const
+    { return (__p->*_M_f)(__x); }
+private:
+  __fun_type _M_f;
+};
+
+template <class _Ret, class _Tp, class _Arg>
+class mem_fun1_ref_t : public binary_function<_Tp,_Arg,_Ret> {
+  typedef _Ret (_Tp::*__fun_type)(_Arg);
+public:
+  explicit mem_fun1_ref_t(__fun_type __pf) : _M_f(__pf) {}
+  _Ret operator()(_Tp& __r, _Arg __x) const { return (__r.*_M_f)(__x); }
+private:
+  __fun_type _M_f;
+};
+
+template <class _Ret, class _Tp, class _Arg>
+class const_mem_fun1_ref_t : public binary_function<_Tp,_Arg,_Ret> {
+  typedef _Ret (_Tp::*__fun_type)(_Arg) const;
+public:
+  explicit const_mem_fun1_ref_t(__fun_type __pf) : _M_f(__pf) {}
+  _Ret operator()(const _Tp& __r, _Arg __x) const { return (__r.*_M_f)(__x); }
+private:
+  __fun_type _M_f;
+};
+
+template <class _Arg, class _Result>
+class pointer_to_unary_function : public unary_function<_Arg, _Result> {
+protected:
+  _Result (*_M_ptr)(_Arg);
+public:
+  pointer_to_unary_function() {}
+  explicit pointer_to_unary_function(_Result (*__x)(_Arg)) : _M_ptr(__x) {}
+  _Result operator()(_Arg __x) const { return _M_ptr(__x); }
+};
+
+template <class _Arg1, class _Arg2, class _Result>
+class pointer_to_binary_function : 
+  public binary_function<_Arg1,_Arg2,_Result> {
+protected:
+    _Result (*_M_ptr)(_Arg1, _Arg2);
+public:
+    pointer_to_binary_function() {}
+    explicit pointer_to_binary_function(_Result (*__x)(_Arg1, _Arg2)) 
+      : _M_ptr(__x) {}
+    _Result operator()(_Arg1 __x, _Arg2 __y) const {
+      return _M_ptr(__x, __y);
+    }
+};
+
+
+#if defined(_STLP_DONT_RETURN_VOID) && !defined(_STLP_NO_CLASS_PARTIAL_SPECIALIZATION)
+//Partial specialization for the void type
+template <class _Tp>
+class mem_fun_t<void, _Tp> : public unary_function<_Tp*,void> {
+  typedef void (_Tp::*__fun_type)(void);
+public:
+  explicit mem_fun_t _STLP_PSPEC2(void,_Tp) (__fun_type __pf) : _M_f(__pf) {}
+  void operator()(_Tp* __p) const { (__p->*_M_f)(); }
+private:
+  __fun_type _M_f;
+};
+
+template <class _Tp>
+class const_mem_fun_t<void, _Tp> : public unary_function<const _Tp*,void> {
+  typedef void (_Tp::*__fun_type)(void) const;
+public:
+  explicit const_mem_fun_t _STLP_PSPEC2(void,_Tp) (__fun_type __pf) : _M_f(__pf) {}
+  void operator()(const _Tp* __p) const { (__p->*_M_f)(); }
+private:
+  __fun_type _M_f;
+};
+
+template <class _Tp>
+class mem_fun_ref_t<void, _Tp> : public unary_function<_Tp,void> {
+  typedef void (_Tp::*__fun_type)(void);
+public:
+  explicit mem_fun_ref_t _STLP_PSPEC2(void,_Tp) (__fun_type __pf) : _M_f(__pf) {}
+  void operator()(_Tp& __r) const { (__r.*_M_f)(); }
+private:
+  __fun_type _M_f;
+};
+
+template <class _Tp>
+class const_mem_fun_ref_t<void, _Tp> : public unary_function<_Tp,void> {
+  typedef void (_Tp::*__fun_type)(void) const;
+public:
+  explicit const_mem_fun_ref_t _STLP_PSPEC2(void,_Tp) (__fun_type __pf) : _M_f(__pf) {}
+  void operator()(const _Tp& __r) const { (__r.*_M_f)(); }
+private:
+  __fun_type _M_f;
+};
+
+template <class _Tp, class _Arg>
+class mem_fun1_t<void, _Tp, _Arg> : public binary_function<_Tp*,_Arg,void> {
+  typedef void (_Tp::*__fun_type)(_Arg);
+public:
+  explicit mem_fun1_t _STLP_PSPEC3(void,_Tp,_Arg) (__fun_type __pf) : _M_f(__pf) {}
+  void operator()(_Tp* __p, _Arg __x) const { (__p->*_M_f)(__x); }
+private:
+  __fun_type _M_f;
+};
+
+template <class _Tp, class _Arg>
+class const_mem_fun1_t<void, _Tp, _Arg> 
+  : public binary_function<const _Tp*,_Arg,void> {
+  typedef void (_Tp::*__fun_type)(_Arg) const;
+public:
+  explicit const_mem_fun1_t _STLP_PSPEC3(void,_Tp,_Arg) (__fun_type __pf) : _M_f(__pf) {}
+  void operator()(const _Tp* __p, _Arg __x) const { (__p->*_M_f)(__x); }
+private:
+  __fun_type _M_f;
+};
+
+template <class _Tp, class _Arg>
+class mem_fun1_ref_t<void, _Tp, _Arg>
+  : public binary_function<_Tp,_Arg,void> {
+  typedef void (_Tp::*__fun_type)(_Arg);
+public:
+  explicit mem_fun1_ref_t _STLP_PSPEC3(void,_Tp,_Arg) (__fun_type __pf) : _M_f(__pf) {}
+  void operator()(_Tp& __r, _Arg __x) const { (__r.*_M_f)(__x); }
+private:
+  __fun_type _M_f;
+};
+
+template <class _Tp, class _Arg>
+class const_mem_fun1_ref_t<void, _Tp, _Arg>
+  : public binary_function<_Tp,_Arg,void> {
+  typedef void (_Tp::*__fun_type)(_Arg) const;
+public:
+  explicit const_mem_fun1_ref_t _STLP_PSPEC3(void,_Tp,_Arg) (__fun_type __pf) : _M_f(__pf) {}
+  void operator()(const _Tp& __r, _Arg __x) const { (__r.*_M_f)(__x); }
+private:
+  __fun_type _M_f;
+};
+
+template <class _Arg>
+class pointer_to_unary_function : public unary_function<_Arg, void> {
+  typedef void (*__fun_type)(_Arg);
+  __fun_type _M_ptr;
+public:
+  pointer_to_unary_function() {}
+  explicit pointer_to_unary_function(__fun_type __x) : _M_ptr(__x) {}
+  void operator()(_Arg __x) const { _M_ptr(__x); }
+};
+
+template <class _Arg1, class _Arg2>
+class pointer_to_binary_function : public binary_function<_Arg1,_Arg2,void> {
+  typedef void (*__fun_type)(_Arg1, _Arg2);
+  __fun_type _M_ptr;
+public:
+  pointer_to_binary_function() {}
+  explicit pointer_to_binary_function(__fun_type __x) : _M_ptr(__x) {}
+  void operator()(_Arg1 __x, _Arg2 __y) const { _M_ptr(__x, __y); }
+};
+
+#endif /*_STLP_DONT_RETURN_VOID && !_STLP_NO_CLASS_PARTIAL_SPECIALIZATION*/
+
+#else /*!_STLP_DONT_RETURN_VOID || !_STLP_NO_CLASS_PARTIAL_SPECIALIZATION || !_STLP_MEMBER_TEMPLATE_CLASSES*/
+
+//mem_fun_t
+template <class _Result, class _Tp>
+class mem_fun_t : 
+  public _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args0<_Tp>::_Ptr {
+  typedef typename
+    _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args0<_Tp>::_Ptr _Base;
+public:
+  explicit mem_fun_t(typename _Base::__fun_type __f) : _Base(__f) {}
+};
+
+//const_mem_fun_t
+template <class _Result, class _Tp>
+class const_mem_fun_t : 
+  public _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args0<_Tp>::_Ptr_const {
+  typedef typename
+    _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args0<_Tp>::_Ptr_const _Base;
+public:
+  explicit const_mem_fun_t(typename _Base::__fun_type __f) : _Base(__f) {}
+};
+
+//mem_fun_ref_t
+template <class _Result, class _Tp>
+class mem_fun_ref_t :
+  public _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args0<_Tp>::_Ref {
+  typedef typename
+    _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args0<_Tp>::_Ref _Base;
+public:
+  explicit mem_fun_ref_t(typename _Base::__fun_type __f) : _Base(__f) {}
+};
+
+//const_mem_fun_ref_t
+template <class _Result, class _Tp>
+class const_mem_fun_ref_t :
+  public _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args0<_Tp>::_Ref_const {
+  typedef typename
+    _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args0<_Tp>::_Ref_const _Base;
+public:
+  explicit const_mem_fun_ref_t(typename _Base::__fun_type __f) : _Base(__f) {}
+};
+
+//mem_fun1_t
+template <class _Result, class _Tp, class _Arg>
+class mem_fun1_t :
+  public _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args1<_Tp,_Arg>::_Ptr {
+  typedef typename
+    _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args1<_Tp,_Arg>::_Ptr _Base;
+public:
+  explicit mem_fun1_t(typename _Base::__fun_type __f) : _Base(__f) {}
+};
+
+//const_mem_fun1_t
+template <class _Result, class _Tp, class _Arg>
+class const_mem_fun1_t :
+  public _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args1<_Tp,_Arg>::_Ptr_const {
+  typedef typename
+    _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args1<_Tp,_Arg>::_Ptr_const _Base;
+public:
+  explicit const_mem_fun1_t(typename _Base::__fun_type __f) : _Base(__f) {}
+};
+
+//mem_fun1_ref_t
+template <class _Result, class _Tp, class _Arg>
+class mem_fun1_ref_t :
+  public _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args1<_Tp,_Arg>::_Ref {
+  typedef typename
+    _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args1<_Tp,_Arg>::_Ref _Base;
+public:
+  explicit mem_fun1_ref_t(typename _Base::__fun_type __f) : _Base(__f) {}
+};
+
+//const_mem_fun1_t
+template <class _Result, class _Tp, class _Arg>
+class const_mem_fun1_ref_t :
+  public _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args1<_Tp,_Arg>::_Ref_const {
+  typedef typename
+    _Mem_fun_traits<_Result>::_STLP_TEMPLATE _Args1<_Tp,_Arg>::_Ref_const _Base;
+public:
+  explicit const_mem_fun1_ref_t(typename _Base::__fun_type __f) : _Base(__f) {}
+};
+
+
+template <class _Arg, class _Result>
+class pointer_to_unary_function :
+public _Ptr_fun1<_Result,_Arg> {
+  typedef typename 
+    _Ptr_fun1<_Result,_Arg>::__fun_type __fun_type;
+public:
+  explicit pointer_to_unary_function(__fun_type __f)
+    : _Ptr_fun1<_Result,_Arg>(__f) {}
+};
+
+template <class _Arg1, class _Arg2, class _Result>
+class pointer_to_binary_function :
+public _Ptr_fun2<_Result,_Arg1,_Arg2> {
+  typedef typename
+    _Ptr_fun2<_Result,_Arg1,_Arg2>::__fun_type __fun_type;
+public:
+  explicit pointer_to_binary_function(__fun_type __f)
+    : _Ptr_fun2<_Result,_Arg1,_Arg2>(__f) {}
+};
+
+#endif /*!_STLP_DONT_RETURN_VOID || !_STLP_NO_CLASS_PARTIAL_SPECIALIZATION || !_STLP_MEMBER_TEMPLATE_CLASSES*/
+
+
+# if !defined (_STLP_MEMBER_POINTER_PARAM_BUG)
+// Mem_fun adaptor helper functions.  There are only two:
+//  mem_fun and mem_fun_ref.  (mem_fun1 and mem_fun1_ref 
+//  are provided for backward compatibility, but they are no longer
+//  part of the C++ standard.)
+
+template <class _Result, class _Tp>
+inline mem_fun_t<_Result,_Tp> 
+mem_fun(_Result (_Tp::*__f)()) { return mem_fun_t<_Result,_Tp>(__f); }
+
+template <class _Result, class _Tp>
+inline const_mem_fun_t<_Result,_Tp> 
+mem_fun(_Result (_Tp::*__f)() const)  { return const_mem_fun_t<_Result,_Tp>(__f); }
+
+template <class _Result, class _Tp>
+inline mem_fun_ref_t<_Result,_Tp> 
+mem_fun_ref(_Result (_Tp::*__f)())  { return mem_fun_ref_t<_Result,_Tp>(__f); }
+
+template <class _Result, class _Tp>
+inline const_mem_fun_ref_t<_Result,_Tp> 
+mem_fun_ref(_Result (_Tp::*__f)() const)  { return const_mem_fun_ref_t<_Result,_Tp>(__f); }
+
+template <class _Result, class _Tp, class _Arg>
+inline mem_fun1_t<_Result,_Tp,_Arg> 
+mem_fun(_Result (_Tp::*__f)(_Arg)) { return mem_fun1_t<_Result,_Tp,_Arg>(__f); }
+
+template <class _Result, class _Tp, class _Arg>
+inline const_mem_fun1_t<_Result,_Tp,_Arg> 
+mem_fun(_Result (_Tp::*__f)(_Arg) const) { return const_mem_fun1_t<_Result,_Tp,_Arg>(__f); }
+
+template <class _Result, class _Tp, class _Arg>
+inline mem_fun1_ref_t<_Result,_Tp,_Arg> 
+mem_fun_ref(_Result (_Tp::*__f)(_Arg)) { return mem_fun1_ref_t<_Result,_Tp,_Arg>(__f); }
+
+template <class _Result, class _Tp, class _Arg>
+inline const_mem_fun1_ref_t<_Result,_Tp,_Arg>
+mem_fun_ref(_Result (_Tp::*__f)(_Arg) const) { return const_mem_fun1_ref_t<_Result,_Tp,_Arg>(__f); }
+
+# if !(defined (_STLP_NO_EXTENSIONS) || defined (_STLP_NO_ANACHRONISMS))
+//  mem_fun1 and mem_fun1_ref are no longer part of the C++ standard,
+//  but they are provided for backward compatibility.
+template <class _Result, class _Tp, class _Arg>
+inline mem_fun1_t<_Result,_Tp,_Arg> 
+mem_fun1(_Result (_Tp::*__f)(_Arg)) { return mem_fun1_t<_Result,_Tp,_Arg>(__f); }
+
+template <class _Result, class _Tp, class _Arg>
+inline const_mem_fun1_t<_Result,_Tp,_Arg> 
+mem_fun1(_Result (_Tp::*__f)(_Arg) const) { return const_mem_fun1_t<_Result,_Tp,_Arg>(__f); }
+
+template <class _Result, class _Tp, class _Arg>
+inline mem_fun1_ref_t<_Result,_Tp,_Arg> 
+mem_fun1_ref(_Result (_Tp::*__f)(_Arg)) { return mem_fun1_ref_t<_Result,_Tp,_Arg>(__f); }
+
+template <class _Result, class _Tp, class _Arg>
+inline const_mem_fun1_ref_t<_Result,_Tp,_Arg>
+mem_fun1_ref(_Result (_Tp::*__f)(_Arg) const) { return const_mem_fun1_ref_t<_Result,_Tp,_Arg>(__f); }
+
+# endif /* _STLP_NO_EXTENSIONS */
+
+# endif /* _STLP_MEMBER_POINTER_PARAM_BUG */
+
+template <class _Arg, class _Result>
+inline pointer_to_unary_function<_Arg, _Result>
+ptr_fun(_Result (*__f)(_Arg)) 
+{ return pointer_to_unary_function<_Arg, _Result>(__f); }
+
+template <class _Arg1, class _Arg2, class _Result>
+inline pointer_to_binary_function<_Arg1,_Arg2,_Result> 
+ptr_fun(_Result (*__f)(_Arg1, _Arg2)) 
+{ return pointer_to_binary_function<_Arg1,_Arg2,_Result>(__f); }
+
+_STLP_END_NAMESPACE
diff --git a/main/source/stlport/stlport/stl/_function_base.h b/main/source/stlport/stlport/stl/_function_base.h
new file mode 100644
index 00000000..58ba2af5
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_function_base.h
@@ -0,0 +1,226 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996-1998
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_FUNCTION_BASE_H
+#define _STLP_INTERNAL_FUNCTION_BASE_H
+
+#ifndef _STLP_CONFIG_H
+#include <stl/_config.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _Arg, class _Result>
+struct unary_function {
+  typedef _Arg argument_type;
+  typedef _Result result_type;
+};
+
+template <class _Arg1, class _Arg2, class _Result>
+struct binary_function {
+  typedef _Arg1 first_argument_type;
+  typedef _Arg2 second_argument_type;
+  typedef _Result result_type;
+};      
+
+template <class _Tp>
+struct equal_to : public binary_function<_Tp,_Tp,bool> 
+{
+  bool operator()(const _Tp& __x, const _Tp& __y) const { return __x == __y; }
+};
+
+template <class _Tp>
+struct not_equal_to : public binary_function<_Tp,_Tp,bool> 
+{
+  bool operator()(const _Tp& __x, const _Tp& __y) const { return __x != __y; }
+};
+
+template <class _Tp>
+struct greater : public binary_function<_Tp,_Tp,bool> 
+{
+  bool operator()(const _Tp& __x, const _Tp& __y) const { return __x > __y; }
+};
+
+template <class _Tp>
+struct less : public binary_function<_Tp,_Tp,bool> 
+{
+  bool operator()(const _Tp& __x, const _Tp& __y) const { return __x < __y; }
+};
+
+template <class _Tp>
+struct greater_equal : public binary_function<_Tp,_Tp,bool>
+{
+  bool operator()(const _Tp& __x, const _Tp& __y) const { return __x >= __y; }
+};
+
+template <class _Tp>
+struct less_equal : public binary_function<_Tp,_Tp,bool> 
+{
+  bool operator()(const _Tp& __x, const _Tp& __y) const { return __x <= __y; }
+};
+
+template <class _Tp>
+less<_Tp> __less(_Tp* ) { return less<_Tp>(); }
+
+template <class _Tp>
+equal_to<_Tp> __equal_to(_Tp* ) { return equal_to<_Tp>(); }
+
+template <class _Tp>
+struct plus : public binary_function<_Tp,_Tp,_Tp> {
+  _Tp operator()(const _Tp& __x, const _Tp& __y) const { return __x + __y; }
+};
+
+template <class _Tp>
+struct minus : public binary_function<_Tp,_Tp,_Tp> {
+  _Tp operator()(const _Tp& __x, const _Tp& __y) const { return __x - __y; }
+};
+
+template <class _Tp>
+plus<_Tp> __plus(_Tp* ) { return plus<_Tp>(); }
+
+template <class _Tp>
+minus<_Tp> __minus(_Tp* ) { return minus<_Tp>(); }
+
+template <class _Tp>
+struct multiplies : public binary_function<_Tp,_Tp,_Tp> {
+  _Tp operator()(const _Tp& __x, const _Tp& __y) const { return __x * __y; }
+};
+
+template <class _Tp>
+struct divides : public binary_function<_Tp,_Tp,_Tp> {
+  _Tp operator()(const _Tp& __x, const _Tp& __y) const { return __x / __y; }
+};
+
+template <class _Tp>
+struct modulus : public binary_function<_Tp,_Tp,_Tp> 
+{
+  _Tp operator()(const _Tp& __x, const _Tp& __y) const { return __x % __y; }
+};
+
+template <class _Tp>
+struct negate : public unary_function<_Tp,_Tp> 
+{
+  _Tp operator()(const _Tp& __x) const { return -__x; }
+};
+
+template <class _Tp>
+struct logical_and : public binary_function<_Tp,_Tp,bool>
+{
+  bool operator()(const _Tp& __x, const _Tp& __y) const { return __x && __y; }
+};
+
+template <class _Tp>
+struct logical_or : public binary_function<_Tp,_Tp,bool>
+{
+  bool operator()(const _Tp& __x, const _Tp& __y) const { return __x || __y; }
+};
+
+template <class _Tp>
+struct logical_not : public unary_function<_Tp,bool>
+{
+  bool operator()(const _Tp& __x) const { return !__x; }
+};
+
+template <class _Pair>
+struct _Select1st : public unary_function<_Pair, typename _Pair::first_type> {
+  const typename _Pair::first_type& operator()(const _Pair& __x) const {
+    return __x.first;
+  }
+};
+
+template <class _Pair>
+struct _Select2nd : public unary_function<_Pair, typename _Pair::second_type>
+{
+  const typename _Pair::second_type& operator()(const _Pair& __x) const {
+    return __x.second;
+  }
+};
+
+// project1st and project2nd are extensions: they are not part of the standard
+template <class _Arg1, class _Arg2>
+struct _Project1st : public binary_function<_Arg1, _Arg2, _Arg1> {
+  _Arg1 operator()(const _Arg1& __x, const _Arg2&) const { return __x; }
+};
+
+template <class _Arg1, class _Arg2>
+struct _Project2nd : public binary_function<_Arg1, _Arg2, _Arg2> {
+  _Arg2 operator()(const _Arg1&, const _Arg2& __y) const { return __y; }
+};
+
+#ifdef _STLP_MULTI_CONST_TEMPLATE_ARG_BUG
+// fbp : sort of select1st just for maps
+template <class _Pair, class _Whatever>		
+// JDJ (CW Pro1 doesn't like const when first_type is also const)
+struct __Select1st_hint : public unary_function<_Pair, _Whatever> {
+    const _Whatever& operator () (const _Pair& __x) const { return __x.first; }
+};
+# define  _STLP_SELECT1ST(__x,__y) __Select1st_hint< __x, __y >
+# else
+# define  _STLP_SELECT1ST(__x, __y) _Select1st< __x >
+# endif
+
+template <class _Tp>
+struct _Identity : public unary_function<_Tp,_Tp> {
+  const _Tp& operator()(const _Tp& __x) const { return __x; }
+};
+
+template <class _Result, class _Argument>
+struct _Constant_unary_fun {
+  typedef _Argument argument_type;
+  typedef  _Result  result_type;
+  result_type _M_val;
+
+  _Constant_unary_fun(const result_type& __v) : _M_val(__v) {}
+  const result_type& operator()(const _Argument&) const { return _M_val; }
+};
+
+template <class _Result, class _Arg1, class _Arg2>
+struct _Constant_binary_fun {
+  typedef  _Arg1   first_argument_type;
+  typedef  _Arg2   second_argument_type;
+  typedef  _Result result_type;
+  _Result _M_val;
+
+  _Constant_binary_fun(const _Result& __v) : _M_val(__v) {}
+  const result_type& operator()(const _Arg1&, const _Arg2&) const {
+    return _M_val;
+  }
+};
+
+// identity_element (not part of the C++ standard).
+template <class _Tp> inline _Tp __identity_element(plus<_Tp>) {  return _Tp(0); }
+template <class _Tp> inline _Tp __identity_element(multiplies<_Tp>) { return _Tp(1); }
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_INTERNAL_FUNCTION_BASE_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_hash_fun.h b/main/source/stlport/stlport/stl/_hash_fun.h
new file mode 100644
index 00000000..550bcfd4
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_hash_fun.h
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 1996-1998
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Silicon Graphics makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ *
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Hewlett-Packard Company makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_HASH_FUN_H
+#define _STLP_HASH_FUN_H
+
+# ifndef _STLP_CSTDDEF
+#  include <cstddef>
+# endif
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _Key> struct hash { };
+
+inline size_t __stl_hash_string(const char* __s)
+{
+  _STLP_FIX_LITERAL_BUG(__s)
+  unsigned long __h = 0; 
+  for ( ; *__s; ++__s)
+    __h = 5*__h + *__s;
+  
+  return size_t(__h);
+}
+
+_STLP_TEMPLATE_NULL struct hash<char*>
+{
+  size_t operator()(const char* __s) const { _STLP_FIX_LITERAL_BUG(__s) return __stl_hash_string(__s); }
+};
+
+_STLP_TEMPLATE_NULL struct hash<const char*>
+{
+  size_t operator()(const char* __s) const { _STLP_FIX_LITERAL_BUG(__s) return __stl_hash_string(__s); }
+};
+
+_STLP_TEMPLATE_NULL struct hash<char> {
+  size_t operator()(char __x) const { return __x; }
+};
+_STLP_TEMPLATE_NULL struct hash<unsigned char> {
+  size_t operator()(unsigned char __x) const { return __x; }
+};
+#ifndef _STLP_NO_SIGNED_BUILTINS
+_STLP_TEMPLATE_NULL struct hash<signed char> {
+  size_t operator()(unsigned char __x) const { return __x; }
+};
+#endif
+_STLP_TEMPLATE_NULL struct hash<short> {
+  size_t operator()(short __x) const { return __x; }
+};
+_STLP_TEMPLATE_NULL struct hash<unsigned short> {
+  size_t operator()(unsigned short __x) const { return __x; }
+};
+_STLP_TEMPLATE_NULL struct hash<int> {
+  size_t operator()(int __x) const { return __x; }
+};
+_STLP_TEMPLATE_NULL struct hash<unsigned int> {
+  size_t operator()(unsigned int __x) const { return __x; }
+};
+_STLP_TEMPLATE_NULL struct hash<long> {
+  size_t operator()(long __x) const { return __x; }
+};
+_STLP_TEMPLATE_NULL struct hash<unsigned long> {
+  size_t operator()(unsigned long __x) const { return __x; }
+};
+
+# if defined (_STLP_LONG_LONG)
+_STLP_TEMPLATE_NULL struct hash<_STLP_LONG_LONG> {
+  size_t operator()(long x) const { return x; }
+};
+_STLP_TEMPLATE_NULL struct hash<unsigned _STLP_LONG_LONG> {
+  size_t operator()(unsigned long x) const { return x; }
+};
+# endif
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_HASH_FUN_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_hash_map.h b/main/source/stlport/stlport/stl/_hash_map.h
new file mode 100644
index 00000000..d9aaf8d7
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_hash_map.h
@@ -0,0 +1,468 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_HASH_MAP_H
+#define _STLP_INTERNAL_HASH_MAP_H
+
+#ifndef _STLP_INTERNAL_HASHTABLE_H
+# include <stl/_hashtable.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+# define  hash_map      __WORKAROUND_RENAME(hash_map)
+# define  hash_multimap __WORKAROUND_RENAME(hash_multimap)
+
+#  define _STLP_KEY_PAIR pair< const _Key, _Tp >
+#  define _STLP_HASHTABLE hashtable \
+      < pair < const _Key, _Tp >, _Key, _HashFcn, \
+      _STLP_SELECT1ST( _STLP_KEY_PAIR,  _Key ), _EqualKey, _Alloc >
+
+template <class _Key, class _Tp, __DFL_TMPL_PARAM(_HashFcn,hash<_Key>),
+          __DFL_TMPL_PARAM(_EqualKey,equal_to<_Key>),
+          _STLP_DEFAULT_PAIR_ALLOCATOR_SELECT(const _Key, _Tp) >
+class hash_map
+{
+private:
+  typedef _STLP_HASHTABLE _Ht;
+  typedef hash_map<_Key, _Tp, _HashFcn, _EqualKey, _Alloc> _Self;
+public:
+  typedef typename _Ht::key_type key_type;
+  typedef _Tp data_type;
+  typedef _Tp mapped_type;
+  typedef typename _Ht::value_type _value_type;
+  typedef typename _Ht::value_type value_type;
+  typedef typename _Ht::hasher hasher;
+  typedef typename _Ht::key_equal key_equal;
+  
+  typedef typename _Ht::size_type size_type;
+  typedef typename _Ht::difference_type difference_type;
+  typedef typename _Ht::pointer pointer;
+  typedef typename _Ht::const_pointer const_pointer;
+  typedef typename _Ht::reference reference;
+  typedef typename _Ht::const_reference const_reference;
+
+  typedef typename _Ht::iterator iterator;
+  typedef typename _Ht::const_iterator const_iterator;
+
+  typedef typename _Ht::allocator_type allocator_type;
+
+  hasher hash_funct() const { return _M_ht.hash_funct(); }
+  key_equal key_eq() const { return _M_ht.key_eq(); }
+  allocator_type get_allocator() const { return _M_ht.get_allocator(); }
+
+private:
+  _Ht _M_ht;
+public:
+  hash_map() : _M_ht(100, hasher(), key_equal(), allocator_type()) {}
+  explicit hash_map(size_type __n)
+    : _M_ht(__n, hasher(), key_equal(), allocator_type()) {}
+  hash_map(size_type __n, const hasher& __hf)
+    : _M_ht(__n, __hf, key_equal(), allocator_type()) {}
+  hash_map(size_type __n, const hasher& __hf, const key_equal& __eql,
+           const allocator_type& __a = allocator_type())
+    : _M_ht(__n, __hf, __eql, __a) {}
+
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIterator>
+  hash_map(_InputIterator __f, _InputIterator __l)
+    : _M_ht(100, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_unique(__f, __l); }
+  template <class _InputIterator>
+  hash_map(_InputIterator __f, _InputIterator __l, size_type __n)
+    : _M_ht(__n, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_unique(__f, __l); }
+  template <class _InputIterator>
+  hash_map(_InputIterator __f, _InputIterator __l, size_type __n,
+           const hasher& __hf)
+    : _M_ht(__n, __hf, key_equal(), allocator_type())
+    { _M_ht.insert_unique(__f, __l); }
+# ifdef _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS
+  template <class _InputIterator>
+  hash_map(_InputIterator __f, _InputIterator __l, size_type __n,
+           const hasher& __hf, const key_equal& __eql)
+    : _M_ht(__n, __hf, __eql, allocator_type())
+    { _M_ht.insert_unique(__f, __l); }
+# endif
+  template <class _InputIterator>
+  hash_map(_InputIterator __f, _InputIterator __l, size_type __n,
+           const hasher& __hf, const key_equal& __eql,
+           const allocator_type& __a _STLP_ALLOCATOR_TYPE_DFL)
+    : _M_ht(__n, __hf, __eql, __a)
+    { _M_ht.insert_unique(__f, __l); }
+
+#else
+  hash_map(const value_type* __f, const value_type* __l)
+    : _M_ht(100, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_unique(__f, __l); }
+  hash_map(const value_type* __f, const value_type* __l, size_type __n)
+    : _M_ht(__n, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_unique(__f, __l); }
+  hash_map(const value_type* __f, const value_type* __l, size_type __n,
+           const hasher& __hf)
+    : _M_ht(__n, __hf, key_equal(), allocator_type())
+    { _M_ht.insert_unique(__f, __l); }
+  hash_map(const value_type* __f, const value_type* __l, size_type __n,
+           const hasher& __hf, const key_equal& __eql,
+           const allocator_type& __a = allocator_type())
+    : _M_ht(__n, __hf, __eql, __a)
+    { _M_ht.insert_unique(__f, __l); }
+
+  hash_map(const_iterator __f, const_iterator __l)
+    : _M_ht(100, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_unique(__f, __l); }
+  hash_map(const_iterator __f, const_iterator __l, size_type __n)
+    : _M_ht(__n, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_unique(__f, __l); }
+  hash_map(const_iterator __f, const_iterator __l, size_type __n,
+           const hasher& __hf)
+    : _M_ht(__n, __hf, key_equal(), allocator_type())
+    { _M_ht.insert_unique(__f, __l); }
+  hash_map(const_iterator __f, const_iterator __l, size_type __n,
+           const hasher& __hf, const key_equal& __eql,
+           const allocator_type& __a = allocator_type())
+    : _M_ht(__n, __hf, __eql, __a)
+    { _M_ht.insert_unique(__f, __l); }
+#endif /*_STLP_MEMBER_TEMPLATES */
+
+public:
+  size_type size() const { return _M_ht.size(); }
+  size_type max_size() const { return _M_ht.max_size(); }
+  bool empty() const { return _M_ht.empty(); }
+  void swap(_Self& __hs) { _M_ht.swap(__hs._M_ht); }
+  iterator begin() { return _M_ht.begin(); }
+  iterator end() { return _M_ht.end(); }
+  const_iterator begin() const { return _M_ht.begin(); }
+  const_iterator end() const { return _M_ht.end(); }
+
+public:
+  pair<iterator,bool> insert(const value_type& __obj)
+    { return _M_ht.insert_unique(__obj); }
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIterator>
+  void insert(_InputIterator __f, _InputIterator __l)
+    { _M_ht.insert_unique(__f,__l); }
+#else
+  void insert(const value_type* __f, const value_type* __l) {
+    _M_ht.insert_unique(__f,__l);
+  }
+  void insert(const_iterator __f, const_iterator __l)
+    { _M_ht.insert_unique(__f, __l); }
+#endif /*_STLP_MEMBER_TEMPLATES */
+  pair<iterator,bool> insert_noresize(const value_type& __obj)
+    { return _M_ht.insert_unique_noresize(__obj); }    
+
+  iterator find(const key_type& __key) { return _M_ht.find(__key); }
+  const_iterator find(const key_type& __key) const { return _M_ht.find(__key); }
+
+  _Tp& operator[](const key_type& __key) {
+    iterator __it = _M_ht.find(__key);
+    return (__it == _M_ht.end() ? 
+	    _M_ht._M_insert(_value_type(__key, _Tp())).second : 
+	    (*__it).second );
+  }
+
+  size_type count(const key_type& __key) const { return _M_ht.count(__key); }
+  
+  pair<iterator, iterator> equal_range(const key_type& __key)
+    { return _M_ht.equal_range(__key); }
+  pair<const_iterator, const_iterator>
+  equal_range(const key_type& __key) const
+    { return _M_ht.equal_range(__key); }
+
+  size_type erase(const key_type& __key) {return _M_ht.erase(__key); }
+  void erase(iterator __it) { _M_ht.erase(__it); }
+  void erase(iterator __f, iterator __l) { _M_ht.erase(__f, __l); }
+  void clear() { _M_ht.clear(); }
+
+  void resize(size_type __hint) { _M_ht.resize(__hint); }
+  size_type bucket_count() const { return _M_ht.bucket_count(); }
+  size_type max_bucket_count() const { return _M_ht.max_bucket_count(); }
+  size_type elems_in_bucket(size_type __n) const
+    { return _M_ht.elems_in_bucket(__n); }
+  static bool _STLP_CALL _M_equal (const _Self& __x, const _Self& __y) {
+    return _Ht::_M_equal(__x._M_ht,__y._M_ht);
+  }
+};
+
+template <class _Key, class _Tp, __DFL_TMPL_PARAM(_HashFcn,hash<_Key>),
+          __DFL_TMPL_PARAM(_EqualKey,equal_to<_Key>),
+          _STLP_DEFAULT_PAIR_ALLOCATOR_SELECT(const _Key, _Tp) >
+class hash_multimap
+{
+private:
+  typedef _STLP_HASHTABLE _Ht;
+  typedef hash_multimap<_Key, _Tp, _HashFcn, _EqualKey, _Alloc> _Self;
+public:
+  typedef typename _Ht::key_type key_type;
+  typedef _Tp data_type;
+  typedef _Tp mapped_type;
+  typedef typename _Ht::value_type _value_type;
+  typedef _value_type value_type;
+  typedef typename _Ht::hasher hasher;
+  typedef typename _Ht::key_equal key_equal;
+
+  typedef typename _Ht::size_type size_type;
+  typedef typename _Ht::difference_type difference_type;
+  typedef typename _Ht::pointer pointer;
+  typedef typename _Ht::const_pointer const_pointer;
+  typedef typename _Ht::reference reference;
+  typedef typename _Ht::const_reference const_reference;
+
+  typedef typename _Ht::iterator iterator;
+  typedef typename _Ht::const_iterator const_iterator;
+
+  typedef typename _Ht::allocator_type allocator_type;
+
+  hasher hash_funct() const { return _M_ht.hash_funct(); }
+  key_equal key_eq() const { return _M_ht.key_eq(); }
+  allocator_type get_allocator() const { return _M_ht.get_allocator(); }
+
+private:
+  _Ht _M_ht;
+public:
+  hash_multimap() : _M_ht(100, hasher(), key_equal(), allocator_type()) {}
+  explicit hash_multimap(size_type __n)
+    : _M_ht(__n, hasher(), key_equal(), allocator_type()) {}
+  hash_multimap(size_type __n, const hasher& __hf)
+    : _M_ht(__n, __hf, key_equal(), allocator_type()) {}
+  hash_multimap(size_type __n, const hasher& __hf, const key_equal& __eql,
+                const allocator_type& __a = allocator_type())
+    : _M_ht(__n, __hf, __eql, __a) {}
+
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIterator>
+  hash_multimap(_InputIterator __f, _InputIterator __l)
+    : _M_ht(100, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_equal(__f, __l); }
+  template <class _InputIterator>
+  hash_multimap(_InputIterator __f, _InputIterator __l, size_type __n)
+    : _M_ht(__n, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_equal(__f, __l); }
+  template <class _InputIterator>
+  hash_multimap(_InputIterator __f, _InputIterator __l, size_type __n,
+                const hasher& __hf)
+    : _M_ht(__n, __hf, key_equal(), allocator_type())
+    { _M_ht.insert_equal(__f, __l); }
+# ifdef _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS
+  template <class _InputIterator>
+  hash_multimap(_InputIterator __f, _InputIterator __l, size_type __n,
+                const hasher& __hf, const key_equal& __eql)
+    : _M_ht(__n, __hf, __eql, allocator_type())
+    { _M_ht.insert_equal(__f, __l); }
+#  endif
+  template <class _InputIterator>
+  hash_multimap(_InputIterator __f, _InputIterator __l, size_type __n,
+                const hasher& __hf, const key_equal& __eql,
+                const allocator_type& __a _STLP_ALLOCATOR_TYPE_DFL)
+    : _M_ht(__n, __hf, __eql, __a)
+    { _M_ht.insert_equal(__f, __l); }
+
+#else
+  hash_multimap(const value_type* __f, const value_type* __l)
+    : _M_ht(100, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_equal(__f, __l); }
+  hash_multimap(const value_type* __f, const value_type* __l, size_type __n)
+    : _M_ht(__n, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_equal(__f, __l); }
+  hash_multimap(const value_type* __f, const value_type* __l, size_type __n,
+                const hasher& __hf)
+    : _M_ht(__n, __hf, key_equal(), allocator_type())
+    { _M_ht.insert_equal(__f, __l); }
+  hash_multimap(const value_type* __f, const value_type* __l, size_type __n,
+                const hasher& __hf, const key_equal& __eql,
+                const allocator_type& __a = allocator_type())
+    : _M_ht(__n, __hf, __eql, __a)
+    { _M_ht.insert_equal(__f, __l); }
+
+  hash_multimap(const_iterator __f, const_iterator __l)
+    : _M_ht(100, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_equal(__f, __l); }
+  hash_multimap(const_iterator __f, const_iterator __l, size_type __n)
+    : _M_ht(__n, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_equal(__f, __l); }
+  hash_multimap(const_iterator __f, const_iterator __l, size_type __n,
+                const hasher& __hf)
+    : _M_ht(__n, __hf, key_equal(), allocator_type())
+    { _M_ht.insert_equal(__f, __l); }
+  hash_multimap(const_iterator __f, const_iterator __l, size_type __n,
+                const hasher& __hf, const key_equal& __eql,
+                const allocator_type& __a = allocator_type())
+    : _M_ht(__n, __hf, __eql, __a)
+    { _M_ht.insert_equal(__f, __l); }
+#endif /*_STLP_MEMBER_TEMPLATES */
+
+public:
+  size_type size() const { return _M_ht.size(); }
+  size_type max_size() const { return _M_ht.max_size(); }
+  bool empty() const { return _M_ht.empty(); }
+  void swap(_Self& __hs) { _M_ht.swap(__hs._M_ht); }
+
+  iterator begin() { return _M_ht.begin(); }
+  iterator end() { return _M_ht.end(); }
+  const_iterator begin() const { return _M_ht.begin(); }
+  const_iterator end() const { return _M_ht.end(); }
+
+public:
+  iterator insert(const value_type& __obj) 
+    { return _M_ht.insert_equal(__obj); }
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIterator>
+  void insert(_InputIterator __f, _InputIterator __l) 
+    { _M_ht.insert_equal(__f,__l); }
+#else
+  void insert(const value_type* __f, const value_type* __l) {
+    _M_ht.insert_equal(__f,__l);
+  }
+  void insert(const_iterator __f, const_iterator __l) 
+    { _M_ht.insert_equal(__f, __l); }
+#endif /*_STLP_MEMBER_TEMPLATES */
+  iterator insert_noresize(const value_type& __obj)
+    { return _M_ht.insert_equal_noresize(__obj); }    
+
+  iterator find(const key_type& __key) { return _M_ht.find(__key); }
+  const_iterator find(const key_type& __key) const 
+    { return _M_ht.find(__key); }
+
+  size_type count(const key_type& __key) const { return _M_ht.count(__key); }
+  
+  pair<iterator, iterator> equal_range(const key_type& __key)
+    { return _M_ht.equal_range(__key); }
+  pair<const_iterator, const_iterator>
+  equal_range(const key_type& __key) const
+    { return _M_ht.equal_range(__key); }
+
+  size_type erase(const key_type& __key) {return _M_ht.erase(__key); }
+  void erase(iterator __it) { _M_ht.erase(__it); }
+  void erase(iterator __f, iterator __l) { _M_ht.erase(__f, __l); }
+  void clear() { _M_ht.clear(); }
+
+public:
+  void resize(size_type __hint) { _M_ht.resize(__hint); }
+  size_type bucket_count() const { return _M_ht.bucket_count(); }
+  size_type max_bucket_count() const { return _M_ht.max_bucket_count(); }
+  size_type elems_in_bucket(size_type __n) const
+    { return _M_ht.elems_in_bucket(__n); }
+  static bool _STLP_CALL _M_equal (const _Self& __x, const _Self& __y) {
+    return _Ht::_M_equal(__x._M_ht,__y._M_ht);
+  }
+};
+
+#define _STLP_TEMPLATE_HEADER template <class _Key, class _Tp, class _HashFcn, class _EqlKey, class _Alloc>
+#define _STLP_TEMPLATE_CONTAINER hash_map<_Key,_Tp,_HashFcn,_EqlKey,_Alloc>
+
+#include <stl/_relops_hash_cont.h>
+
+#undef _STLP_TEMPLATE_CONTAINER
+#define _STLP_TEMPLATE_CONTAINER hash_multimap<_Key,_Tp,_HashFcn,_EqlKey,_Alloc>
+#include <stl/_relops_hash_cont.h>
+
+#undef _STLP_TEMPLATE_CONTAINER
+#undef _STLP_TEMPLATE_HEADER
+
+// Specialization of insert_iterator so that it will work for hash_map
+// and hash_multimap.
+
+#ifdef _STLP_CLASS_PARTIAL_SPECIALIZATION
+
+template <class _Key, class _Tp, class _HashFn,  class _EqKey, class _Alloc>
+class insert_iterator<hash_map<_Key, _Tp, _HashFn, _EqKey, _Alloc> > {
+protected:
+  typedef hash_map<_Key, _Tp, _HashFn, _EqKey, _Alloc> _Container;
+  _Container* container;
+public:
+  typedef _Container          container_type;
+  typedef output_iterator_tag iterator_category;
+  typedef void                value_type;
+  typedef void                difference_type;
+  typedef void                pointer;
+  typedef void                reference;
+
+  insert_iterator(_Container& __x) : container(&__x) {}
+  insert_iterator(_Container& __x, typename _Container::iterator)
+    : container(&__x) {}
+  insert_iterator<_Container>&
+  operator=(const typename _Container::value_type& __val) { 
+    container->insert(__val);
+    return *this;
+  }
+  insert_iterator<_Container>& operator*() { return *this; }
+  insert_iterator<_Container>& operator++() { return *this; }
+  insert_iterator<_Container>& operator++(int) { return *this; }
+};
+
+template <class _Key, class _Tp, class _HashFn,  class _EqKey, class _Alloc>
+class insert_iterator<hash_multimap<_Key, _Tp, _HashFn, _EqKey, _Alloc> > {
+protected:
+  typedef hash_multimap<_Key, _Tp, _HashFn, _EqKey, _Alloc> _Container;
+  _Container* container;
+  typename _Container::iterator iter;
+public:
+  typedef _Container          container_type;
+  typedef output_iterator_tag iterator_category;
+  typedef void                value_type;
+  typedef void                difference_type;
+  typedef void                pointer;
+  typedef void                reference;
+
+  insert_iterator(_Container& __x) : container(&__x) {}
+  insert_iterator(_Container& __x, typename _Container::iterator)
+    : container(&__x) {}
+  insert_iterator<_Container>&
+  operator=(const typename _Container::value_type& __val) { 
+    container->insert(__val);
+    return *this;
+  }
+  insert_iterator<_Container>& operator*() { return *this; }
+  insert_iterator<_Container>& operator++() { return *this; }
+  insert_iterator<_Container>& operator++(int) { return *this; }
+};
+
+#endif /* _STLP_CLASS_PARTIAL_SPECIALIZATION */
+
+// do a cleanup
+# undef hash_map
+# undef hash_multimap
+
+# define __hash_map__ __FULL_NAME(hash_map)
+# define __hash_multimap__ __FULL_NAME(hash_multimap)
+
+
+_STLP_END_NAMESPACE
+
+# if defined (_STLP_USE_WRAPPER_FOR_ALLOC_PARAM) 
+#  include <stl/wrappers/_hash_map.h>
+# endif /*  WRAPPER */
+
+#endif /* _STLP_INTERNAL_HASH_MAP_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_hash_set.h b/main/source/stlport/stlport/stl/_hash_set.h
new file mode 100644
index 00000000..0a6334d9
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_hash_set.h
@@ -0,0 +1,470 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_HASH_SET_H
+#define _STLP_INTERNAL_HASH_SET_H
+
+#ifndef _STLP_INTERNAL_HASHTABLE_H
+# include <stl/_hashtable.h>
+#endif
+
+# define  hash_set      __WORKAROUND_RENAME(hash_set)
+# define  hash_multiset __WORKAROUND_RENAME(hash_multiset)
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _Value, __DFL_TMPL_PARAM(_HashFcn,hash<_Value>),
+          __DFL_TMPL_PARAM(_EqualKey,equal_to<_Value>),
+          _STLP_DEFAULT_ALLOCATOR_SELECT(_Value) >
+class hash_set
+{
+private:
+  typedef hashtable<_Value, _Value, _HashFcn, _Identity<_Value>, 
+                    _EqualKey, _Alloc> _Ht;
+  typedef hash_set<_Value, _HashFcn, _EqualKey, _Alloc> _Self;
+  typedef typename _Ht::iterator _ht_iterator;
+public:
+  typedef typename _Ht::key_type key_type;
+  typedef typename _Ht::value_type value_type;
+  typedef typename _Ht::hasher hasher;
+  typedef typename _Ht::key_equal key_equal;
+
+  typedef typename _Ht::size_type size_type;
+  typedef typename _Ht::difference_type difference_type;
+  typedef typename _Ht::pointer         pointer;
+  typedef typename _Ht::const_pointer   const_pointer;
+  typedef typename _Ht::reference       reference;
+  typedef typename _Ht::const_reference const_reference;
+
+  // SunPro bug
+  typedef typename _Ht::const_iterator const_iterator;
+  typedef const_iterator iterator;
+
+  typedef typename _Ht::allocator_type allocator_type;
+
+  hasher hash_funct() const { return _M_ht.hash_funct(); }
+  key_equal key_eq() const { return _M_ht.key_eq(); }
+  allocator_type get_allocator() const { return _M_ht.get_allocator(); }
+
+private:
+  _Ht _M_ht;
+
+public:
+  hash_set()
+    : _M_ht(100, hasher(), key_equal(), allocator_type()) {}
+  explicit hash_set(size_type __n)
+    : _M_ht(__n, hasher(), key_equal(), allocator_type()) {}
+  hash_set(size_type __n, const hasher& __hf)
+    : _M_ht(__n, __hf, key_equal(), allocator_type()) {}
+  hash_set(size_type __n, const hasher& __hf, const key_equal& __eql,
+           const allocator_type& __a = allocator_type())
+    : _M_ht(__n, __hf, __eql, __a) {}
+
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIterator>
+  hash_set(_InputIterator __f, _InputIterator __l)
+    : _M_ht(100, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_unique(__f, __l); }
+  template <class _InputIterator>
+  hash_set(_InputIterator __f, _InputIterator __l, size_type __n)
+    : _M_ht(__n, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_unique(__f, __l); }
+  template <class _InputIterator>
+  hash_set(_InputIterator __f, _InputIterator __l, size_type __n,
+           const hasher& __hf)
+    : _M_ht(__n, __hf, key_equal(), allocator_type())
+    { _M_ht.insert_unique(__f, __l); }
+# ifdef _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS
+  template <class _InputIterator>
+  hash_set(_InputIterator __f, _InputIterator __l, size_type __n,
+           const hasher& __hf, const key_equal& __eql)
+    : _M_ht(__n, __hf, __eql, allocator_type())
+    { _M_ht.insert_unique(__f, __l); }
+#  endif
+  template <class _InputIterator>
+  hash_set(_InputIterator __f, _InputIterator __l, size_type __n,
+           const hasher& __hf, const key_equal& __eql,
+           const allocator_type& __a _STLP_ALLOCATOR_TYPE_DFL)
+    : _M_ht(__n, __hf, __eql, __a)
+    { _M_ht.insert_unique(__f, __l); }
+#else
+
+  hash_set(const value_type* __f, const value_type* __l)
+    : _M_ht(100, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_unique(__f, __l); }
+  hash_set(const value_type* __f, const value_type* __l, size_type __n)
+    : _M_ht(__n, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_unique(__f, __l); }
+  hash_set(const value_type* __f, const value_type* __l, size_type __n,
+           const hasher& __hf)
+    : _M_ht(__n, __hf, key_equal(), allocator_type())
+    { _M_ht.insert_unique(__f, __l); }
+  hash_set(const value_type* __f, const value_type* __l, size_type __n,
+           const hasher& __hf, const key_equal& __eql,
+           const allocator_type& __a = allocator_type())
+    : _M_ht(__n, __hf, __eql, __a)
+    { _M_ht.insert_unique(__f, __l); }
+
+  hash_set(const_iterator __f, const_iterator __l)
+    : _M_ht(100, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_unique(__f, __l); }
+  hash_set(const_iterator __f, const_iterator __l, size_type __n)
+    : _M_ht(__n, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_unique(__f, __l); }
+  hash_set(const_iterator __f, const_iterator __l, size_type __n,
+           const hasher& __hf)
+    : _M_ht(__n, __hf, key_equal(), allocator_type())
+    { _M_ht.insert_unique(__f, __l); }
+  hash_set(const_iterator __f, const_iterator __l, size_type __n,
+           const hasher& __hf, const key_equal& __eql,
+           const allocator_type& __a = allocator_type())
+    : _M_ht(__n, __hf, __eql, __a)
+    { _M_ht.insert_unique(__f, __l); }
+#endif /*_STLP_MEMBER_TEMPLATES */
+
+public:
+  size_type size() const { return _M_ht.size(); }
+  size_type max_size() const { return _M_ht.max_size(); }
+  bool empty() const { return _M_ht.empty(); }
+  void swap(_Self& __hs) { _M_ht.swap(__hs._M_ht); }
+
+  iterator begin() const { return _M_ht.begin(); }
+  iterator end() const { return _M_ht.end(); }
+
+public:
+  pair<iterator, bool> insert(const value_type& __obj)
+    {
+      pair<_ht_iterator, bool> __p = _M_ht.insert_unique(__obj);
+      return pair<iterator,bool>(__REINTERPRET_CAST(const iterator&, __p.first), __p.second);
+    }
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIterator>
+  void insert(_InputIterator __f, _InputIterator __l) 
+    { _M_ht.insert_unique(__f,__l); }
+#else
+  void insert(const value_type* __f, const value_type* __l) {
+    _M_ht.insert_unique(__f,__l);
+  }
+  void insert(const_iterator __f, const_iterator __l) 
+    {_M_ht.insert_unique(__f, __l); }
+
+#endif /*_STLP_MEMBER_TEMPLATES */
+  pair<iterator, bool> insert_noresize(const value_type& __obj)
+  {
+    pair<_ht_iterator, bool> __p = 
+      _M_ht.insert_unique_noresize(__obj);
+    return pair<iterator, bool>(__p.first, __p.second);
+  }
+
+# if defined(_STLP_MEMBER_TEMPLATES) && ! defined ( _STLP_NO_EXTENSIONS )
+  template <class _KT>
+  iterator find(const _KT& __key) const { return _M_ht.find(__key); }
+# else
+  iterator find(const key_type& __key) const { return _M_ht.find(__key); }
+# endif
+  size_type count(const key_type& __key) const { return _M_ht.count(__key); }
+  
+  pair<iterator, iterator> equal_range(const key_type& __key) const
+    { return _M_ht.equal_range(__key); }
+
+  size_type erase(const key_type& __key) {return _M_ht.erase(__key); }
+  void erase(iterator __it) { _M_ht.erase(__it); }
+  void erase(iterator __f, iterator __l) { _M_ht.erase(__f, __l); }
+  void clear() { _M_ht.clear(); }
+
+public:
+  void resize(size_type __hint) { _M_ht.resize(__hint); }
+  size_type bucket_count() const { return _M_ht.bucket_count(); }
+  size_type max_bucket_count() const { return _M_ht.max_bucket_count(); }
+  size_type elems_in_bucket(size_type __n) const
+    { return _M_ht.elems_in_bucket(__n); }
+
+  static bool _STLP_CALL _M_equal (const _Self& __x, const _Self& __y) {
+    return _Ht::_M_equal(__x._M_ht,__y._M_ht);
+  }
+
+};
+
+template <class _Value, __DFL_TMPL_PARAM(_HashFcn,hash<_Value>),
+          __DFL_TMPL_PARAM(_EqualKey,equal_to<_Value>),
+          _STLP_DEFAULT_ALLOCATOR_SELECT(_Value) >
+class hash_multiset
+{
+private:
+  typedef hashtable<_Value, _Value, _HashFcn, _Identity<_Value>, 
+                    _EqualKey, _Alloc> _Ht;
+  typedef hash_multiset<_Value, _HashFcn, _EqualKey, _Alloc> _Self;
+
+public:
+  typedef typename _Ht::key_type key_type;
+  typedef typename _Ht::value_type value_type;
+  typedef typename _Ht::hasher hasher;
+  typedef typename _Ht::key_equal key_equal;
+
+  typedef typename _Ht::size_type size_type;
+  typedef typename _Ht::difference_type difference_type;
+  typedef typename _Ht::pointer       pointer;
+  typedef typename _Ht::const_pointer const_pointer;
+  typedef typename _Ht::reference reference;
+  typedef typename _Ht::const_reference const_reference;
+
+  typedef typename _Ht::const_iterator const_iterator;
+  // SunPro bug
+  typedef const_iterator iterator;
+
+  typedef typename _Ht::allocator_type allocator_type;
+
+  hasher hash_funct() const { return _M_ht.hash_funct(); }
+  key_equal key_eq() const { return _M_ht.key_eq(); }
+  allocator_type get_allocator() const { return _M_ht.get_allocator(); }
+
+private:
+  _Ht _M_ht;
+
+public:
+  hash_multiset()
+    : _M_ht(100, hasher(), key_equal(), allocator_type()) {}
+  explicit hash_multiset(size_type __n)
+    : _M_ht(__n, hasher(), key_equal(), allocator_type()) {}
+  hash_multiset(size_type __n, const hasher& __hf)
+    : _M_ht(__n, __hf, key_equal(), allocator_type()) {}
+  hash_multiset(size_type __n, const hasher& __hf, const key_equal& __eql)
+    : _M_ht(__n, __hf, __eql, allocator_type()) {}
+  hash_multiset(size_type __n, const hasher& __hf, const key_equal& __eql,
+                const allocator_type& __a)
+    : _M_ht(__n, __hf, __eql, __a) {}
+
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIterator>
+  hash_multiset(_InputIterator __f, _InputIterator __l)
+    : _M_ht(100, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_equal(__f, __l); }
+  template <class _InputIterator>
+  hash_multiset(_InputIterator __f, _InputIterator __l, size_type __n)
+    : _M_ht(__n, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_equal(__f, __l); }
+  template <class _InputIterator>
+  hash_multiset(_InputIterator __f, _InputIterator __l, size_type __n,
+                const hasher& __hf)
+    : _M_ht(__n, __hf, key_equal(), allocator_type())
+    { _M_ht.insert_equal(__f, __l); }
+
+# ifdef _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS
+  template <class _InputIterator>
+  hash_multiset(_InputIterator __f, _InputIterator __l, size_type __n,
+                const hasher& __hf, const key_equal& __eql)
+    : _M_ht(__n, __hf, __eql, allocator_type())
+    { _M_ht.insert_equal(__f, __l); }
+# endif
+  template <class _InputIterator>
+  hash_multiset(_InputIterator __f, _InputIterator __l, size_type __n,
+                const hasher& __hf, const key_equal& __eql,
+                const allocator_type& __a _STLP_ALLOCATOR_TYPE_DFL)
+    : _M_ht(__n, __hf, __eql, __a)
+    { _M_ht.insert_equal(__f, __l); }
+#else
+
+  hash_multiset(const value_type* __f, const value_type* __l)
+    : _M_ht(100, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_equal(__f, __l); }
+  hash_multiset(const value_type* __f, const value_type* __l, size_type __n)
+    : _M_ht(__n, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_equal(__f, __l); }
+  hash_multiset(const value_type* __f, const value_type* __l, size_type __n,
+                const hasher& __hf)
+    : _M_ht(__n, __hf, key_equal(), allocator_type())
+    { _M_ht.insert_equal(__f, __l); }
+  hash_multiset(const value_type* __f, const value_type* __l, size_type __n,
+                const hasher& __hf, const key_equal& __eql,
+                const allocator_type& __a = allocator_type())
+    : _M_ht(__n, __hf, __eql, __a)
+    { _M_ht.insert_equal(__f, __l); }
+
+  hash_multiset(const_iterator __f, const_iterator __l)
+    : _M_ht(100, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_equal(__f, __l); }
+  hash_multiset(const_iterator __f, const_iterator __l, size_type __n)
+    : _M_ht(__n, hasher(), key_equal(), allocator_type())
+    { _M_ht.insert_equal(__f, __l); }
+  hash_multiset(const_iterator __f, const_iterator __l, size_type __n,
+                const hasher& __hf)
+    : _M_ht(__n, __hf, key_equal(), allocator_type())
+    { _M_ht.insert_equal(__f, __l); }
+  hash_multiset(const_iterator __f, const_iterator __l, size_type __n,
+                const hasher& __hf, const key_equal& __eql,
+                const allocator_type& __a = allocator_type())
+    : _M_ht(__n, __hf, __eql, __a)
+    { _M_ht.insert_equal(__f, __l); }
+#endif /*_STLP_MEMBER_TEMPLATES */
+
+public:
+  size_type size() const { return _M_ht.size(); }
+  size_type max_size() const { return _M_ht.max_size(); }
+  bool empty() const { return _M_ht.empty(); }
+  void swap(_Self& hs) { _M_ht.swap(hs._M_ht); }
+
+  iterator begin() const { return _M_ht.begin(); }
+  iterator end() const { return _M_ht.end(); }
+
+public:
+  iterator insert(const value_type& __obj)
+    { return _M_ht.insert_equal(__obj); }
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIterator>
+  void insert(_InputIterator __f, _InputIterator __l) 
+    { _M_ht.insert_equal(__f,__l); }
+#else
+  void insert(const value_type* __f, const value_type* __l) {
+    _M_ht.insert_equal(__f,__l);
+  }
+  void insert(const_iterator __f, const_iterator __l) 
+    { _M_ht.insert_equal(__f, __l); }
+#endif /*_STLP_MEMBER_TEMPLATES */
+  iterator insert_noresize(const value_type& __obj)
+    { return _M_ht.insert_equal_noresize(__obj); }    
+
+# if defined(_STLP_MEMBER_TEMPLATES) && ! defined ( _STLP_NO_EXTENSIONS )
+  template <class _KT>
+  iterator find(const _KT& __key) const { return _M_ht.find(__key); }
+# else
+  iterator find(const key_type& __key) const { return _M_ht.find(__key); }
+# endif
+
+  size_type count(const key_type& __key) const { return _M_ht.count(__key); }
+  
+  pair<iterator, iterator> equal_range(const key_type& __key) const
+    { return _M_ht.equal_range(__key); }
+
+  size_type erase(const key_type& __key) {return _M_ht.erase(__key); }
+  void erase(iterator __it) { _M_ht.erase(__it); }
+  void erase(iterator __f, iterator __l) { _M_ht.erase(__f, __l); }
+  void clear() { _M_ht.clear(); }
+
+public:
+  void resize(size_type __hint) { _M_ht.resize(__hint); }
+  size_type bucket_count() const { return _M_ht.bucket_count(); }
+  size_type max_bucket_count() const { return _M_ht.max_bucket_count(); }
+  size_type elems_in_bucket(size_type __n) const
+    { return _M_ht.elems_in_bucket(__n); }
+  static bool _STLP_CALL _M_equal (const _Self& __x, const _Self& __y) {
+    return _Ht::_M_equal(__x._M_ht,__y._M_ht);
+  }
+};
+
+#define _STLP_TEMPLATE_HEADER template <class _Value, class _HashFcn, class _EqualKey, class _Alloc>
+#define _STLP_TEMPLATE_CONTAINER hash_set<_Value,_HashFcn,_EqualKey,_Alloc>
+
+#include <stl/_relops_hash_cont.h>
+
+#undef _STLP_TEMPLATE_CONTAINER
+#define _STLP_TEMPLATE_CONTAINER hash_multiset<_Value,_HashFcn,_EqualKey,_Alloc>
+#include <stl/_relops_hash_cont.h>
+
+#undef _STLP_TEMPLATE_CONTAINER
+#undef _STLP_TEMPLATE_HEADER
+
+// Specialization of insert_iterator so that it will work for hash_set
+// and hash_multiset.
+
+#ifdef _STLP_CLASS_PARTIAL_SPECIALIZATION
+
+template <class _Value, class _HashFcn, class _EqualKey, class _Alloc>
+class insert_iterator<hash_set<_Value, _HashFcn, _EqualKey, _Alloc> > {
+protected:
+  typedef hash_set<_Value, _HashFcn, _EqualKey, _Alloc> _Container;
+  _Container* container;
+public:
+  typedef _Container          container_type;
+  typedef output_iterator_tag iterator_category;
+  typedef void                value_type;
+  typedef void                difference_type;
+  typedef void                pointer;
+  typedef void                reference;
+
+  insert_iterator(_Container& __x) : container(&__x) {}
+  insert_iterator(_Container& __x, typename _Container::iterator)
+    : container(&__x) {}
+  insert_iterator<_Container>&
+  operator=(const typename _Container::value_type& __val) { 
+    container->insert(__val);
+    return *this;
+  }
+  insert_iterator<_Container>& operator*() { return *this; }
+  insert_iterator<_Container>& operator++() { return *this; }
+  insert_iterator<_Container>& operator++(int) { return *this; }
+};
+
+template <class _Value, class _HashFcn, class _EqualKey, class _Alloc>
+class insert_iterator<hash_multiset<_Value, _HashFcn, _EqualKey, _Alloc> > {
+protected:
+  typedef hash_multiset<_Value, _HashFcn, _EqualKey, _Alloc> _Container;
+  _Container* container;
+  typename _Container::iterator iter;
+public:
+  typedef _Container          container_type;
+  typedef output_iterator_tag iterator_category;
+  typedef void                value_type;
+  typedef void                difference_type;
+  typedef void                pointer;
+  typedef void                reference;
+
+  insert_iterator(_Container& __x) : container(&__x) {}
+  insert_iterator(_Container& __x, typename _Container::iterator)
+    : container(&__x) {}
+  insert_iterator<_Container>&
+  operator=(const typename _Container::value_type& __val) { 
+    container->insert(__val);
+    return *this;
+  }
+  insert_iterator<_Container>& operator*() { return *this; }
+  insert_iterator<_Container>& operator++() { return *this; }
+  insert_iterator<_Container>& operator++(int) { return *this; }
+};
+
+#endif /* _STLP_CLASS_PARTIAL_SPECIALIZATION */
+_STLP_END_NAMESPACE
+
+// do a cleanup
+#  undef hash_set
+#  undef hash_multiset
+
+// provide a uniform way to access full funclionality 
+#  define __hash_set__       __FULL_NAME(hash_set)
+#  define __hash_multiset__  __FULL_NAME(hash_multiset)
+
+# if defined ( _STLP_USE_WRAPPER_FOR_ALLOC_PARAM )
+#  include <stl/wrappers/_hash_set.h>
+# endif /*  WRAPPER */
+
+#endif /* _STLP_INTERNAL_HASH_SET_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_hashtable.c b/main/source/stlport/stlport/stl/_hashtable.c
new file mode 100644
index 00000000..5a283ee3
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_hashtable.c
@@ -0,0 +1,468 @@
+/*
+ *
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+#ifndef _STLP_HASHTABLE_C
+#define _STLP_HASHTABLE_C
+
+#ifndef _STLP_INTERNAL_HASHTABLE_H
+# include <stl/_hashtable.h>
+#endif
+
+#ifdef _STLP_DEBUG
+#  define hashtable __WORKAROUND_DBG_RENAME(hashtable)
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+# define __PRIME_LIST_BODY { \
+  53ul,         97ul,         193ul,       389ul,       769ul,      \
+  1543ul,       3079ul,       6151ul,      12289ul,     24593ul,    \
+  49157ul,      98317ul,      196613ul,    393241ul,    786433ul,   \
+  1572869ul,    3145739ul,    6291469ul,   12582917ul,  25165843ul, \
+  50331653ul,   100663319ul,  201326611ul, 402653189ul, 805306457ul,\
+  1610612741ul, 3221225473ul, 4294967291ul  \
+}
+
+#if ( _STLP_STATIC_TEMPLATE_DATA > 0 )
+template <class _Tp>
+const size_t _Stl_prime<_Tp>::_M_list[__stl_num_primes] = __PRIME_LIST_BODY;
+#else
+__DECLARE_INSTANCE(const size_t, 
+		   _Stl_prime_type::_M_list[], =__PRIME_LIST_BODY);
+#endif /* _STLP_STATIC_TEMPLATE_DATA */
+
+# undef __PRIME_LIST_BODY
+
+// fbp: these defines are for outline methods definitions.
+// needed to definitions to be portable. Should not be used in method bodies.
+
+# if defined ( _STLP_NESTED_TYPE_PARAM_BUG )
+#  define __size_type__       size_t
+#  define size_type           size_t
+#  define value_type      _Val
+#  define key_type        _Key
+#  define _Node           _Hashtable_node<_Val>
+#  define __reference__       _Val&
+
+#  define __iterator__        _Ht_iterator<_Val, _Nonconst_traits<_Val>, _Key, _HF, _ExK, _EqK, _All>
+#  define __const_iterator__  _Ht_iterator<_Val, _Const_traits<_Val>, _Key, _HF, _ExK, _EqK, _All>
+# else
+#  define __size_type__        _STLP_TYPENAME_ON_RETURN_TYPE hashtable<_Val, _Key, _HF, _ExK, _EqK, _All>::size_type
+#  define __reference__        _STLP_TYPENAME_ON_RETURN_TYPE  hashtable<_Val, _Key, _HF, _ExK, _EqK, _All>::reference
+#  define __iterator__         _STLP_TYPENAME_ON_RETURN_TYPE hashtable<_Val, _Key, _HF, _ExK, _EqK, _All>::iterator
+# endif
+
+template <class _Val, class _Key, class _HF, class _ExK, class _EqK, 
+          class _All>
+_Hashtable_node<_Val>*
+_Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>::_M_skip_to_next() {
+  size_t __bucket = _M_ht->_M_bkt_num(_M_cur->_M_val);
+  size_t __h_sz;
+  __h_sz = this->_M_ht->bucket_count();
+
+  _Node* __i=0;
+  while (__i==0 && ++__bucket < __h_sz)
+    __i = (_Node*)_M_ht->_M_buckets[__bucket];
+  return __i;
+}
+
+template <class _Val, class _Key, class _HF, class _ExK, class _EqK, 
+          class _All>
+__size_type__
+hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>::_M_next_size(size_type __n) const    { 
+  const size_type* __first = (const size_type*)_Stl_prime_type::_M_list;
+  const size_type* __last =  (const size_type*)_Stl_prime_type::_M_list + (int)__stl_num_primes;
+  const size_type* pos = __lower_bound(__first, __last, __n, __less((size_type*)0), (ptrdiff_t*)0);
+  return (pos == __last ? *(__last - 1) : *pos);
+}
+
+template <class _Val, class _Key, class _HF, class _ExK, class _EqK, class _All>
+bool 
+hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>::_M_equal(
+						  const hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>& __ht1,
+						  const hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>& __ht2)
+{
+  //  typedef _Hashtable_node<_Val> _Node;
+  if (__ht1.bucket_count() != __ht2.bucket_count())
+    return false;
+  for (size_t __n = 0; __n < __ht1.bucket_count(); ++__n) {
+    const _Node* __cur1 = __ht1._M_get_bucket(__n);
+    const _Node* __cur2 = __ht2._M_get_bucket(__n);
+    for ( ; __cur1 && __cur2 && __cur1->_M_val == __cur2->_M_val;
+          __cur1 = __cur1->_M_next, __cur2 = __cur2->_M_next)
+      {}
+    if (__cur1 || __cur2)
+      return false;
+  }
+  return true;
+}  
+
+template <class _Val, class _Key, class _HF, class _ExK, class _EqK, class _All>
+pair< _Ht_iterator<_Val, _Nonconst_traits<_Val>, _Key, _HF, _ExK, _EqK, _All> , bool> 
+hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>
+  ::insert_unique_noresize(const value_type& __obj)
+{
+  const size_type __n = _M_bkt_num(__obj);
+  _Node* __first = (_Node*)_M_buckets[__n];
+
+  for (_Node* __cur = __first; __cur; __cur = __cur->_M_next) 
+    if (_M_equals(_M_get_key(__cur->_M_val), _M_get_key(__obj)))
+      return pair<iterator, bool>(iterator(__cur, this), false);
+
+  _Node* __tmp = _M_new_node(__obj);
+  __tmp->_M_next = __first;
+  _M_buckets[__n] = __tmp;
+  ++_M_num_elements._M_data;
+  return pair<iterator, bool>(iterator(__tmp, this), true);
+}
+
+template <class _Val, class _Key, class _HF, class _ExK, class _EqK, class _All>
+__iterator__ 
+hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>
+  ::insert_equal_noresize(const value_type& __obj)
+{
+  const size_type __n = _M_bkt_num(__obj);
+  _Node* __first = (_Node*)_M_buckets[__n];
+
+  for (_Node* __cur = __first; __cur; __cur = __cur->_M_next) 
+    if (_M_equals(_M_get_key(__cur->_M_val), _M_get_key(__obj))) {
+      _Node* __tmp = _M_new_node(__obj);
+      __tmp->_M_next = __cur->_M_next;
+      __cur->_M_next = __tmp;
+      ++_M_num_elements._M_data;
+      return iterator(__tmp, this);
+    }
+
+  _Node* __tmp = _M_new_node(__obj);
+  __tmp->_M_next = __first;
+  _M_buckets[__n] = __tmp;
+  ++_M_num_elements._M_data;
+  return iterator(__tmp, this);
+}
+
+template <class _Val, class _Key, class _HF, class _ExK, class _EqK, class _All>
+__reference__ 
+hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>::_M_insert(const value_type& __obj)
+{
+  resize(_M_num_elements._M_data + 1);
+
+  size_type __n = _M_bkt_num(__obj);
+  _Node* __first = (_Node*)_M_buckets[__n];
+
+  _Node* __tmp = _M_new_node(__obj);
+  __tmp->_M_next = __first;
+  _M_buckets[__n] = __tmp;
+  ++_M_num_elements._M_data;
+  return __tmp->_M_val;
+}
+
+template <class _Val, class _Key, class _HF, class _ExK, class _EqK, class _All>
+__reference__ 
+hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>::find_or_insert(const value_type& __obj)
+{
+
+  _Node* __first = _M_find(_M_get_key(__obj));
+  if (__first)
+    return __first->_M_val;
+  else
+    return _M_insert(__obj);
+}
+
+template <class _Val, class _Key, class _HF, class _ExK, class _EqK, class _All>
+pair< _Ht_iterator<_Val, _Nonconst_traits<_Val>, _Key, _HF, _ExK, _EqK, _All>,
+      _Ht_iterator<_Val, _Nonconst_traits<_Val>, _Key, _HF, _ExK, _EqK, _All> > 
+hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>::equal_range(const key_type& __key)
+{
+  typedef pair<iterator, iterator> _Pii;
+  const size_type __n = _M_bkt_num_key(__key);
+
+  for (_Node* __first = (_Node*)_M_buckets[__n]; __first; __first = __first->_M_next)
+    if (_M_equals(_M_get_key(__first->_M_val), __key)) {
+      for (_Node* __cur = __first->_M_next; __cur; __cur = __cur->_M_next)
+        if (!_M_equals(_M_get_key(__cur->_M_val), __key))
+          return _Pii(iterator(__first, this), iterator(__cur, this));
+      for (size_type __m = __n + 1; __m < _M_buckets.size(); ++__m)
+        if (_M_buckets[__m])
+          return _Pii(iterator(__first, this),
+                     iterator((_Node*)_M_buckets[__m], this));
+      return _Pii(iterator(__first, this), end());
+    }
+  return _Pii(end(), end());
+}
+
+template <class _Val, class _Key, class _HF, class _ExK, class _EqK, class _All>
+pair< _Ht_iterator<_Val, _Const_traits<_Val>, _Key, _HF, _ExK, _EqK, _All>, 
+     _Ht_iterator<_Val, _Const_traits<_Val>, _Key, _HF, _ExK, _EqK, _All> > 
+hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>
+  ::equal_range(const key_type& __key) const
+{
+  typedef pair<const_iterator, const_iterator> _Pii;
+  const size_type __n = _M_bkt_num_key(__key);
+
+  for (const _Node* __first = (_Node*)_M_buckets[__n] ;
+       __first; 
+       __first = __first->_M_next) {
+    if (_M_equals(_M_get_key(__first->_M_val), __key)) {
+      for (const _Node* __cur = __first->_M_next;
+           __cur;
+           __cur = __cur->_M_next)
+        if (!_M_equals(_M_get_key(__cur->_M_val), __key))
+          return _Pii(const_iterator(__first, this),
+                      const_iterator(__cur, this));
+      for (size_type __m = __n + 1; __m < _M_buckets.size(); ++__m)
+        if (_M_buckets[__m])
+          return _Pii(const_iterator(__first, this),
+                      const_iterator((_Node*)_M_buckets[__m], this));
+      return _Pii(const_iterator(__first, this), end());
+    }
+  }
+  return _Pii(end(), end());
+}
+
+template <class _Val, class _Key, class _HF, class _ExK, class _EqK, class _All>
+__size_type__ 
+hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>::erase(const key_type& __key)
+{
+  const size_type __n = _M_bkt_num_key(__key);
+  _Node* __first = (_Node*)_M_buckets[__n];
+  size_type __erased = 0;
+
+  if (__first) {
+    _Node* __cur = __first;
+    _Node* __next = __cur->_M_next;
+    while (__next) {
+      if (_M_equals(_M_get_key(__next->_M_val), __key)) {
+        __cur->_M_next = __next->_M_next;
+        _M_delete_node(__next);
+        __next = __cur->_M_next;
+        ++__erased;
+        --_M_num_elements._M_data;
+      }
+      else {
+        __cur = __next;
+        __next = __cur->_M_next;
+      }
+    }
+    if (_M_equals(_M_get_key(__first->_M_val), __key)) {
+      _M_buckets[__n] = __first->_M_next;
+      _M_delete_node(__first);
+      ++__erased;
+      --_M_num_elements._M_data;
+    }
+  }
+  return __erased;
+}
+
+template <class _Val, class _Key, class _HF, class _ExK, class _EqK, class _All>
+void hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>::erase(const const_iterator& __it)
+{
+  // const iterator& __it = __REINTERPRET_CAST(const iterator&,_c_it);
+  const _Node* __p = __it._M_cur;
+  if (__p) {
+    const size_type __n = _M_bkt_num(__p->_M_val);
+    _Node* __cur = (_Node*)_M_buckets[__n];
+
+    if (__cur == __p) {
+      _M_buckets[__n] = __cur->_M_next;
+      _M_delete_node(__cur);
+      --_M_num_elements._M_data;
+    }
+    else {
+      _Node* __next = __cur->_M_next;
+      while (__next) {
+        if (__next == __p) {
+          __cur->_M_next = __next->_M_next;
+          _M_delete_node(__next);
+          --_M_num_elements._M_data;
+          break;
+        }
+        else {
+          __cur = __next;
+          __next = __cur->_M_next;
+        }
+      }
+    }
+  }
+}
+
+template <class _Val, class _Key, class _HF, class _ExK, class _EqK, class _All>
+void hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>
+  ::erase(const_iterator _c_first, const_iterator _c_last)
+{
+  iterator& __first = (iterator&)_c_first;
+  iterator& __last = (iterator&)_c_last;
+  size_type __f_bucket = __first._M_cur ? 
+    _M_bkt_num(__first._M_cur->_M_val) : _M_buckets.size();
+  size_type __l_bucket = __last._M_cur ? 
+    _M_bkt_num(__last._M_cur->_M_val) : _M_buckets.size();
+  if (__first._M_cur == __last._M_cur)
+    return;
+  else if (__f_bucket == __l_bucket)
+    _M_erase_bucket(__f_bucket, __first._M_cur, __last._M_cur);
+  else {
+    _M_erase_bucket(__f_bucket, __first._M_cur, 0);
+    for (size_type __n = __f_bucket + 1; __n < __l_bucket; ++__n)
+      _M_erase_bucket(__n, 0);
+    if (__l_bucket != _M_buckets.size())
+      _M_erase_bucket(__l_bucket, __last._M_cur);
+  }
+}
+
+template <class _Val, class _Key, class _HF, class _ExK, class _EqK, class _All>
+void hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>
+  ::resize(size_type __num_elements_hint)
+{
+  const size_type __old_n = _M_buckets.size();
+  if (__num_elements_hint > __old_n) {
+    const size_type __n = _M_next_size(__num_elements_hint);
+    if (__n > __old_n) {
+      _BucketVector __tmp(__n, (void*)(0),
+			  _M_buckets.get_allocator());
+      _STLP_TRY {
+        for (size_type __bucket = 0; __bucket < __old_n; ++__bucket) {
+          _Node* __first = (_Node*)_M_buckets[__bucket];
+          while (__first) {
+            size_type __new_bucket = _M_bkt_num(__first->_M_val, __n);
+            _M_buckets[__bucket] = __first->_M_next;
+            __first->_M_next = (_Node*)__tmp[__new_bucket];
+            __tmp[__new_bucket] = __first;
+            __first = (_Node*)_M_buckets[__bucket];          
+          }
+        }
+        _M_buckets.swap(__tmp);
+      }
+#         ifdef _STLP_USE_EXCEPTIONS
+      catch(...) {
+        for (size_type __bucket = 0; __bucket < __tmp.size(); ++__bucket) {
+          while (__tmp[__bucket]) {
+            _Node* __next = ((_Node*)__tmp[__bucket])->_M_next;
+            _M_delete_node((_Node*)__tmp[__bucket]);
+            __tmp[__bucket] = __next;
+          }
+        }
+        throw;
+      }
+#         endif /* _STLP_USE_EXCEPTIONS */
+    }
+  }
+}
+
+template <class _Val, class _Key, class _HF, class _ExK, class _EqK, class _All>
+void hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>
+  ::_M_erase_bucket(const size_type __n, _Node* __first, _Node* __last)
+{
+  _Node* __cur = (_Node*)_M_buckets[__n];
+  if (__cur == __first)
+    _M_erase_bucket(__n, __last);
+  else {
+    _Node* __next;
+    for (__next = __cur->_M_next; 
+         __next != __first; 
+         __cur = __next, __next = __cur->_M_next)
+      ;
+    while (__next != __last) {
+      __cur->_M_next = __next->_M_next;
+      _M_delete_node(__next);
+      __next = __cur->_M_next;
+      --_M_num_elements._M_data;
+    }
+  }
+}
+
+template <class _Val, class _Key, class _HF, class _ExK, class _EqK, class _All>
+void hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>
+  ::_M_erase_bucket(const size_type __n, _Node* __last)
+{
+  _Node* __cur = (_Node*)_M_buckets[__n];
+  while (__cur && __cur != __last) {
+    _Node* __next = __cur->_M_next;
+    _M_delete_node(__cur);
+    __cur = __next;
+    _M_buckets[__n] = __cur;
+    --_M_num_elements._M_data;
+  }
+}
+
+template <class _Val, class _Key, class _HF, class _ExK, class _EqK, class _All>
+void hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>::clear()
+{
+  for (size_type __i = 0; __i < _M_buckets.size(); ++__i) {
+    _Node* __cur = (_Node*)_M_buckets[__i];
+    while (__cur != 0) {
+      _Node* __next = __cur->_M_next;
+      _M_delete_node(__cur);
+      __cur = __next;
+    }
+    _M_buckets[__i] = 0;
+  }
+  _M_num_elements._M_data = 0;
+}
+
+    
+template <class _Val, class _Key, class _HF, class _ExK, class _EqK, class _All>
+void hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>
+  ::_M_copy_from(const hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>& __ht)
+{
+  _M_buckets.clear();
+  _M_buckets.reserve(__ht._M_buckets.size());
+  _M_buckets.insert(_M_buckets.end(), __ht._M_buckets.size(), (void*) 0);
+  _STLP_TRY {
+    for (size_type __i = 0; __i < __ht._M_buckets.size(); ++__i) {
+      const _Node* __cur = (_Node*)__ht._M_buckets[__i];
+      if (__cur) {
+        _Node* __xcopy = _M_new_node(__cur->_M_val);
+        _M_buckets[__i] = __xcopy;
+
+        for (_Node* __next = __cur->_M_next; 
+             __next; 
+             __cur = __next, __next = __cur->_M_next) {
+          __xcopy->_M_next = _M_new_node(__next->_M_val);
+          __xcopy = __xcopy->_M_next;
+        }
+      }
+    }
+    _M_num_elements._M_data = __ht._M_num_elements._M_data;
+  }
+  _STLP_UNWIND(clear());
+}
+
+# undef __iterator__ 
+# undef const_iterator
+# undef __size_type__
+# undef __reference__
+# undef size_type       
+# undef value_type      
+# undef key_type        
+# undef _Node            
+# undef __stl_num_primes
+# undef hashtable
+
+_STLP_END_NAMESPACE
+
+#endif /*  _STLP_HASHTABLE_C */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_hashtable.h b/main/source/stlport/stlport/stl/_hashtable.h
new file mode 100644
index 00000000..0f8b85f4
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_hashtable.h
@@ -0,0 +1,613 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_HASHTABLE_H
+#define _STLP_INTERNAL_HASHTABLE_H
+
+# ifndef _STLP_INTERNAL_VECTOR_H
+#  include <stl/_vector.h>
+# endif
+
+# ifndef _STLP_INTERNAL_ITERATOR_H
+#  include <stl/_iterator.h>
+# endif
+
+# ifndef _STLP_INTERNAL_FUNCTION_H
+#  include <stl/_function_base.h>
+# endif
+
+# ifndef _STLP_INTERNAL_ALGOBASE_H
+#  include <stl/_algobase.h>
+# endif
+
+# ifndef _STLP_HASH_FUN_H
+#  include <stl/_hash_fun.h>
+# endif
+
+// Hashtable class, used to implement the hashed associative containers
+// hash_set, hash_map, hash_multiset, and hash_multimap.
+
+#ifdef _STLP_DEBUG
+#  define hashtable __WORKAROUND_DBG_RENAME(hashtable)
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _Val>
+struct _Hashtable_node
+{
+  typedef _Hashtable_node<_Val> _Self;
+  _Self* _M_next;
+  _Val _M_val;
+  __TRIVIAL_STUFF(_Hashtable_node)
+};  
+
+// some compilers require the names of template parameters to be the same
+template <class _Val, class _Key, class _HF,
+          class _ExK, class _EqK, class _All>
+class hashtable;
+
+template <class _Val, class _Key, class _HF,
+          class _ExK, class _EqK, class _All>
+struct _Hashtable_iterator
+{
+  typedef hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>
+          _Hashtable;
+  typedef _Hashtable_node<_Val> _Node;
+
+  _Node* _M_cur;
+  _Hashtable* _M_ht;
+
+  _Hashtable_iterator(_Node* __n, _Hashtable* __tab) 
+    : _M_cur(__n), _M_ht(__tab) {}
+  _Hashtable_iterator() {}
+
+  _Node* _M_skip_to_next();
+};
+
+
+template <class _Val, class _Traits, class _Key, class _HF,
+          class _ExK, class _EqK, class _All>
+struct _Ht_iterator : public _Hashtable_iterator< _Val, _Key,_HF, _ExK,_EqK,_All>
+{
+  
+  typedef _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All> _Base;
+
+  //  typedef _Ht_iterator<_Val, _Nonconst_traits<_Val>,_Key,_HF,_ExK,_EqK,_All> iterator;
+  //  typedef _Ht_iterator<_Val, _Const_traits<_Val>,_Key,_HF,_ExK,_EqK,_All> const_iterator;
+  typedef _Ht_iterator<_Val, _Traits,_Key,_HF,_ExK,_EqK,_All> _Self;
+
+  typedef hashtable<_Val,_Key,_HF,_ExK,_EqK,_All> _Hashtable;
+  typedef _Hashtable_node<_Val> _Node;
+
+  typedef _Val value_type;
+  typedef forward_iterator_tag iterator_category;
+  typedef ptrdiff_t difference_type;
+  typedef size_t size_type;
+  typedef typename _Traits::reference reference;
+  typedef typename _Traits::pointer   pointer;
+
+  _Ht_iterator(const _Node* __n, const _Hashtable* __tab) :
+    _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>((_Node*)__n, (_Hashtable*)__tab) {}
+  _Ht_iterator() {}
+  _Ht_iterator(const _Ht_iterator<_Val, _Nonconst_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __it) : 
+    _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>(__it) {}
+
+  reference operator*() const { 
+      return this->_M_cur->_M_val; 
+  }
+  _STLP_DEFINE_ARROW_OPERATOR
+
+  _Self& operator++() {
+    _Node* __n = this->_M_cur->_M_next;
+    this->_M_cur =  (__n !=0 ? __n : this->_M_skip_to_next());
+    return *this;
+  }
+  inline  _Self operator++(int) {
+     _Self __tmp = *this;
+    ++*this;
+    return __tmp;
+  }
+};
+
+template <class _Val, class _Traits, class _Traits1, class _Key, class _HF,
+          class _ExK, class _EqK, class _All>
+inline bool 
+operator==(const _Ht_iterator<_Val, _Traits,_Key,_HF,_ExK,_EqK,_All>& __x, 
+	   const _Ht_iterator<_Val, _Traits1,_Key,_HF,_ExK,_EqK,_All>& __y) { 
+  return __x._M_cur == __y._M_cur; 
+}
+
+#ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+template <class _Val, class _Key, class _HF,
+          class _ExK, class _EqK, class _All>
+inline bool 
+operator!=(const _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>& __x, 
+	   const _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>& __y) { 
+  return __x._M_cur != __y._M_cur; 
+}
+#else
+
+# if (defined (__GNUC__) && (__GNUC_MINOR__ < 8))
+template <class _Val, class _Key, class _HF,
+          class _ExK, class _EqK, class _All>
+inline bool
+operator!=(const _Ht_iterator<_Val, _Const_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __x,
+           const _Ht_iterator<_Val, _Nonconst_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __y) {
+  return __x._M_cur != __y._M_cur;
+}
+# endif
+
+template <class _Val, class _Key, class _HF,
+          class _ExK, class _EqK, class _All>
+inline bool 
+operator!=(const _Ht_iterator<_Val, _Nonconst_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __x, 
+	   const _Ht_iterator<_Val, _Const_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __y) { 
+  return __x._M_cur != __y._M_cur; 
+}
+#endif
+
+# ifdef _STLP_USE_OLD_HP_ITERATOR_QUERIES
+template <class _Val, class _Traits, class _Key, class _HF, class _ExK, class _EqK, class _All>
+inline _Val* value_type(const _Ht_iterator<_Val, _Traits,_Key,_HF,_ExK,_EqK,_All>&) { return (_Val*) 0; }
+template <class _Val, class _Traits, class _Key, class _HF, class _ExK, class _EqK, class _All>
+inline forward_iterator_tag iterator_category(const _Ht_iterator<_Val, _Traits,_Key,_HF,_ExK,_EqK,_All>&) { return forward_iterator_tag(); }
+template <class _Val, class _Traits, class _Key, class _HF, class _ExK, class _EqK, class _All>
+inline ptrdiff_t* distance_type(const _Ht_iterator<_Val,_Traits,_Key,_HF,_ExK,_EqK,_All>&) { return (ptrdiff_t*) 0; }
+#endif
+
+#define __stl_num_primes  28
+template <class _Tp>
+class _Stl_prime {
+public:
+  static const size_t _M_list[__stl_num_primes];
+};
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT) 
+_STLP_EXPORT_TEMPLATE_CLASS _Stl_prime<bool>;
+# endif
+
+typedef _Stl_prime<bool> _Stl_prime_type;
+
+
+// Hashtables handle allocators a bit differently than other containers
+//  do.  If we're using standard-conforming allocators, then a hashtable
+//  unconditionally has a member variable to hold its allocator, even if
+//  it so happens that all instances of the allocator type are identical.
+// This is because, for hashtables, this extra storage is negligible.  
+//  Additionally, a base class wouldn't serve any other purposes; it 
+//  wouldn't, for example, simplify the exception-handling code.
+template <class _Val, class _Key, class _HF,
+          class _ExK, class _EqK, class _All>
+class hashtable {
+  typedef hashtable<_Val, _Key, _HF, _ExK, _EqK, _All> _Self;
+public:
+  typedef _Key key_type;
+  typedef _Val value_type;
+  typedef _HF hasher;
+  typedef _EqK key_equal;
+
+  typedef size_t            size_type;
+  typedef ptrdiff_t         difference_type;
+  typedef value_type*       pointer;
+  typedef const value_type* const_pointer;
+  typedef value_type&       reference;
+  typedef const value_type& const_reference;
+  typedef forward_iterator_tag _Iterator_category;
+
+  hasher hash_funct() const { return _M_hash; }
+  key_equal key_eq() const { return _M_equals; }
+
+private:
+  typedef _Hashtable_node<_Val> _Node;
+
+private:
+  _STLP_FORCE_ALLOCATORS(_Val, _All)
+  typedef typename _Alloc_traits<_Node, _All>::allocator_type _M_node_allocator_type;
+  typedef typename _Alloc_traits<void*, _All>::allocator_type _M_node_ptr_allocator_type;
+  typedef __vector__<void*, _M_node_ptr_allocator_type> _BucketVector;
+public:
+  typedef typename _Alloc_traits<_Val,_All>::allocator_type allocator_type;
+  allocator_type get_allocator() const { 
+    return _STLP_CONVERT_ALLOCATOR((const _M_node_allocator_type&)_M_num_elements, _Val); 
+  }
+private:
+  hasher                _M_hash;
+  key_equal             _M_equals;
+  _ExK                  _M_get_key;
+  _BucketVector         _M_buckets;
+  _STLP_alloc_proxy<size_type, _Node, _M_node_allocator_type>  _M_num_elements;
+  const _Node* _M_get_bucket(size_t __n) const { return (_Node*)_M_buckets[__n]; }
+
+public:
+  typedef _Const_traits<_Val> __const_val_traits;
+  typedef _Nonconst_traits<_Val> __nonconst_val_traits;
+  typedef _Ht_iterator<_Val, __const_val_traits,_Key,_HF,_ExK,_EqK, _All> const_iterator;
+  typedef _Ht_iterator<_Val, __nonconst_val_traits,_Key,_HF,_ExK,_EqK,_All> iterator;
+  friend struct _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>;
+  friend struct _Ht_iterator<_Val, _Nonconst_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>;
+  friend struct _Ht_iterator<_Val, _Const_traits<_Val>,_Key,_HF,_ExK,_EqK, _All>;
+
+public:
+  hashtable(size_type __n,
+            const _HF&  __hf,
+            const _EqK& __eql,
+            const _ExK& __ext,
+            const allocator_type& __a = allocator_type())
+    :
+      _M_hash(__hf),
+      _M_equals(__eql),
+      _M_get_key(__ext),
+      _M_buckets(_STLP_CONVERT_ALLOCATOR(__a,void*)),
+      _M_num_elements(_STLP_CONVERT_ALLOCATOR(__a,_Node), (size_type)0)
+  {
+    _M_initialize_buckets(__n);
+  }
+
+  hashtable(size_type __n,
+            const _HF&    __hf,
+            const _EqK&   __eql,
+            const allocator_type& __a = allocator_type())
+    :
+      _M_hash(__hf),
+      _M_equals(__eql),
+      _M_get_key(_ExK()),
+      _M_buckets(_STLP_CONVERT_ALLOCATOR(__a,void*)),
+      _M_num_elements(_STLP_CONVERT_ALLOCATOR(__a,_Node), (size_type)0)
+  {
+    _M_initialize_buckets(__n);
+  }
+
+  hashtable(const _Self& __ht)
+    :
+      _M_hash(__ht._M_hash),
+      _M_equals(__ht._M_equals),
+      _M_get_key(__ht._M_get_key),
+      _M_buckets(_STLP_CONVERT_ALLOCATOR(__ht.get_allocator(),void*)),
+      _M_num_elements((const _M_node_allocator_type&)__ht._M_num_elements, (size_type)0)
+  {
+    _M_copy_from(__ht);
+  }
+
+  _Self& operator= (const _Self& __ht)
+  {
+    if (&__ht != this) {
+      clear();
+      _M_hash = __ht._M_hash;
+      _M_equals = __ht._M_equals;
+      _M_get_key = __ht._M_get_key;
+      _M_copy_from(__ht);
+    }
+    return *this;
+  }
+
+  ~hashtable() { clear(); }
+
+  size_type size() const { return _M_num_elements._M_data; }
+  size_type max_size() const { return size_type(-1); }
+  bool empty() const { return size() == 0; }
+
+  void swap(_Self& __ht)
+  {
+    _STLP_STD::swap(_M_hash, __ht._M_hash);
+    _STLP_STD::swap(_M_equals, __ht._M_equals);
+    _STLP_STD::swap(_M_get_key, __ht._M_get_key);
+    _M_buckets.swap(__ht._M_buckets);
+    _STLP_STD::swap(_M_num_elements, __ht._M_num_elements);
+  }
+
+  iterator begin()
+  { 
+    for (size_type __n = 0; __n < _M_buckets.size(); ++__n)
+      if (_M_buckets[__n])
+        return iterator((_Node*)_M_buckets[__n], this);
+    return end();
+  }
+
+  iterator end() { return iterator((_Node*)0, this); }
+
+  const_iterator begin() const
+  {
+    for (size_type __n = 0; __n < _M_buckets.size(); ++__n)
+      if (_M_buckets[__n])
+        return const_iterator((_Node*)_M_buckets[__n], this);
+    return end();
+  }
+
+  const_iterator end() const { return const_iterator((_Node*)0, this); }
+
+  static bool _STLP_CALL _M_equal (const hashtable<_Val, _Key, _HF, _ExK, _EqK, _All>&,
+			const hashtable<_Val, _Key, _HF, _ExK, _EqK, _All>&);
+
+public:
+
+  size_type bucket_count() const { return _M_buckets.size(); }
+
+  size_type max_bucket_count() const
+    { return _Stl_prime_type::_M_list[(int)__stl_num_primes - 1]; } 
+
+  size_type elems_in_bucket(size_type __bucket) const
+  {
+    size_type __result = 0;
+    for (_Node* __cur = (_Node*)_M_buckets[__bucket]; __cur; __cur = __cur->_M_next)
+      __result += 1;
+    return __result;
+  }
+
+  pair<iterator, bool> insert_unique(const value_type& __obj)
+  {
+    resize(_M_num_elements._M_data + 1);
+    return insert_unique_noresize(__obj);
+  }
+
+  iterator insert_equal(const value_type& __obj)
+  {
+    resize(_M_num_elements._M_data + 1);
+    return insert_equal_noresize(__obj);
+  }
+
+  pair<iterator, bool> insert_unique_noresize(const value_type& __obj);
+  iterator insert_equal_noresize(const value_type& __obj);
+ 
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIterator>
+  void insert_unique(_InputIterator __f, _InputIterator __l)
+  {
+    insert_unique(__f, __l, _STLP_ITERATOR_CATEGORY(__f, _InputIterator));
+  }
+
+  template <class _InputIterator>
+  void insert_equal(_InputIterator __f, _InputIterator __l)
+  {
+    insert_equal(__f, __l, _STLP_ITERATOR_CATEGORY(__f, _InputIterator));
+  }
+
+  template <class _InputIterator>
+  void insert_unique(_InputIterator __f, _InputIterator __l,
+                     const input_iterator_tag &)
+  {
+    for ( ; __f != __l; ++__f)
+      insert_unique(*__f);
+  }
+
+  template <class _InputIterator>
+  void insert_equal(_InputIterator __f, _InputIterator __l,
+                    const input_iterator_tag &)
+  {
+    for ( ; __f != __l; ++__f)
+      insert_equal(*__f);
+  }
+
+  template <class _ForwardIterator>
+  void insert_unique(_ForwardIterator __f, _ForwardIterator __l,
+                     const forward_iterator_tag &)
+  {
+    size_type __n = distance(__f, __l);
+    resize(_M_num_elements._M_data + __n);
+    for ( ; __n > 0; --__n, ++__f)
+      insert_unique_noresize(*__f);
+  }
+
+  template <class _ForwardIterator>
+  void insert_equal(_ForwardIterator __f, _ForwardIterator __l,
+                    const forward_iterator_tag &)
+  {
+    size_type __n = distance(__f, __l);
+    resize(_M_num_elements._M_data + __n);
+    for ( ; __n > 0; --__n, ++__f)
+      insert_equal_noresize(*__f);
+  }
+
+#else /* _STLP_MEMBER_TEMPLATES */
+  void insert_unique(const value_type* __f, const value_type* __l)
+  {
+    size_type __n = __l - __f;
+    resize(_M_num_elements._M_data + __n);
+    for ( ; __n > 0; --__n, ++__f)
+      insert_unique_noresize(*__f);
+  }
+
+  void insert_equal(const value_type* __f, const value_type* __l)
+  {
+    size_type __n = __l - __f;
+    resize(_M_num_elements._M_data + __n);
+    for ( ; __n > 0; --__n, ++__f)
+      insert_equal_noresize(*__f);
+  }
+
+  void insert_unique(const_iterator __f, const_iterator __l)
+  {
+    size_type __n = distance(__f, __l);
+    resize(_M_num_elements._M_data + __n);
+    for ( ; __n > 0; --__n, ++__f)
+      insert_unique_noresize(*__f);
+  }
+
+  void insert_equal(const_iterator __f, const_iterator __l)
+  {
+    size_type __n = distance(__f, __l);
+    resize(_M_num_elements._M_data + __n);
+    for ( ; __n > 0; --__n, ++__f)
+      insert_equal_noresize(*__f);
+  }
+#endif /*_STLP_MEMBER_TEMPLATES */
+
+  reference find_or_insert(const value_type& __obj);
+
+private:
+# if defined(_STLP_MEMBER_TEMPLATES) && ! defined ( _STLP_NO_EXTENSIONS )  && !(defined(__MRC__)||(defined(__SC__)&&!defined(__DMC_)))
+  template <class _KT> 
+   _Node* _M_find(const _KT& __key) const
+# else
+   _Node* _M_find(const key_type& __key) const
+# endif
+  {
+    size_type __n = _M_hash(__key)% _M_buckets.size();
+    _Node* __first;
+    for ( __first = (_Node*)_M_buckets[__n];
+          __first && !_M_equals(_M_get_key(__first->_M_val), __key);
+          __first = __first->_M_next)
+      {}
+    return __first;
+  } 
+
+public:
+# if defined(_STLP_MEMBER_TEMPLATES) && ! defined ( _STLP_NO_EXTENSIONS )  && !(defined(__MRC__)||(defined(__SC__)&&!defined(__DMC__)))
+  template <class _KT> 
+  iterator find(const _KT& __key) 
+# else
+  iterator find(const key_type& __key) 
+# endif
+  {
+    return iterator(_M_find(__key), this);
+  } 
+
+# if defined(_STLP_MEMBER_TEMPLATES) && ! defined ( _STLP_NO_EXTENSIONS )  && !(defined(__MRC__)||(defined(__SC__)&&!defined(__DMC__)))
+  template <class _KT> 
+  const_iterator find(const _KT& __key) const
+# else
+  const_iterator find(const key_type& __key) const
+# endif
+  {
+    return const_iterator(_M_find(__key), this);
+  } 
+
+  size_type count(const key_type& __key) const
+  {
+    const size_type __n = _M_bkt_num_key(__key);
+    size_type __result = 0;
+
+    for (const _Node* __cur = (_Node*)_M_buckets[__n]; __cur; __cur = __cur->_M_next)
+      if (_M_equals(_M_get_key(__cur->_M_val), __key))
+        ++__result;
+    return __result;
+  }
+
+  pair<iterator, iterator> 
+  equal_range(const key_type& __key);
+
+  pair<const_iterator, const_iterator> 
+  equal_range(const key_type& __key) const;
+
+  size_type erase(const key_type& __key);
+  //   void erase(const iterator& __it); `
+  void erase(const const_iterator& __it) ;
+
+  //  void erase(const const_iterator& __first, const const_iterator __last) {
+  //     erase((const iterator&)__first, (const iterator&)__last);
+  //  }
+  void erase(const_iterator __first, const_iterator __last);
+  void resize(size_type __num_elements_hint);
+  void clear();
+
+public:
+  // this is for hash_map::operator[]
+  reference _M_insert(const value_type& __obj);
+
+private:
+
+  size_type _M_next_size(size_type __n) const;
+
+  void _M_initialize_buckets(size_type __n)
+  {
+    const size_type __n_buckets = _M_next_size(__n);
+    _M_buckets.reserve(__n_buckets);
+    _M_buckets.insert(_M_buckets.end(), __n_buckets, (void*) 0);
+    _M_num_elements._M_data = 0;
+  }
+
+  size_type _M_bkt_num_key(const key_type& __key) const
+  {
+    return _M_bkt_num_key(__key, _M_buckets.size());
+  }
+
+  size_type _M_bkt_num(const value_type& __obj) const
+  {
+    return _M_bkt_num_key(_M_get_key(__obj));
+  }
+
+  size_type _M_bkt_num_key(const key_type& __key, size_t __n) const
+  {
+    return _M_hash(__key) % __n;
+  }
+
+  size_type _M_bkt_num(const value_type& __obj, size_t __n) const
+  {
+    return _M_bkt_num_key(_M_get_key(__obj), __n);
+  }
+
+  _Node* _M_new_node(const value_type& __obj)
+  {
+    _Node* __n = _M_num_elements.allocate(1);
+    __n->_M_next = 0;
+    _STLP_TRY {
+      _Construct(&__n->_M_val, __obj);
+      //      return __n;
+    }
+    _STLP_UNWIND(_M_num_elements.deallocate(__n, 1));
+    return __n;
+  }
+  
+  void _M_delete_node(_Node* __n)
+  {
+    _STLP_STD::_Destroy(&__n->_M_val);
+    _M_num_elements.deallocate(__n, 1);
+  }
+
+  void _M_erase_bucket(const size_type __n, _Node* __first, _Node* __last);
+  void _M_erase_bucket(const size_type __n, _Node* __last);
+
+  void _M_copy_from(const _Self& __ht);
+};
+
+#define _STLP_TEMPLATE_HEADER template <class _Val, class _Key, class _HF, class _ExK, class _EqK, class _All>
+#define _STLP_TEMPLATE_CONTAINER hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>
+#include <stl/_relops_hash_cont.h>
+#undef _STLP_TEMPLATE_CONTAINER
+#undef _STLP_TEMPLATE_HEADER
+
+_STLP_END_NAMESPACE
+
+# undef hashtable
+
+# if !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_hashtable.c>
+# endif
+
+# if defined (_STLP_DEBUG)
+#  include <stl/debug/_hashtable.h>
+# endif
+
+#endif /* _STLP_INTERNAL_HASHTABLE_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
+
diff --git a/main/source/stlport/stlport/stl/_heap.c b/main/source/stlport/stlport/stl/_heap.c
new file mode 100644
index 00000000..58261803
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_heap.c
@@ -0,0 +1,242 @@
+/*
+ *
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+#ifndef _STLP_HEAP_C
+#define _STLP_HEAP_C
+
+#ifndef _STLP_INTERNAL_HEAP_H
+# include <stl/_heap.h>
+#endif
+
+#ifndef _STLP_INTERNAL_ITERATOR_BASE_H
+# include <stl/_iterator_base.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _RandomAccessIterator, class _Distance, class _Tp>
+_STLP_INLINE_LOOP
+void 
+__push_heap(_RandomAccessIterator __first,
+            _Distance __holeIndex, _Distance __topIndex, _Tp __val)
+{
+  _Distance __parent = (__holeIndex - 1) / 2;
+  while (__holeIndex > __topIndex && *(__first + __parent) < __val) {
+    *(__first + __holeIndex) = *(__first + __parent);
+    __holeIndex = __parent;
+    __parent = (__holeIndex - 1) / 2;
+  }    
+  *(__first + __holeIndex) = __val;
+}
+
+template <class _RandomAccessIterator, class _Distance, class _Tp>
+inline void 
+__push_heap_aux(_RandomAccessIterator __first,
+                _RandomAccessIterator __last, _Distance*, _Tp*)
+{
+  __push_heap(__first, _Distance((__last - __first) - 1), _Distance(0), 
+              _Tp(*(__last - 1)));
+}
+
+template <class _RandomAccessIterator>
+void 
+push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
+{
+  __push_heap_aux(__first, __last,
+                  _STLP_DISTANCE_TYPE(__first, _RandomAccessIterator), _STLP_VALUE_TYPE(__first, _RandomAccessIterator));
+}
+
+
+template <class _RandomAccessIterator, class _Distance, class _Tp, 
+          class _Compare>
+_STLP_INLINE_LOOP
+void
+__push_heap(_RandomAccessIterator __first, _Distance __holeIndex,
+            _Distance __topIndex, _Tp __val, _Compare __comp)
+{
+  _Distance __parent = (__holeIndex - 1) / 2;
+  while (__holeIndex > __topIndex && __comp(*(__first + __parent), __val)) {
+    *(__first + __holeIndex) = *(__first + __parent);
+    __holeIndex = __parent;
+    __parent = (__holeIndex - 1) / 2;
+  }
+  *(__first + __holeIndex) = __val;
+}
+
+template <class _RandomAccessIterator, class _Compare,
+          class _Distance, class _Tp>
+inline void 
+__push_heap_aux(_RandomAccessIterator __first,
+                _RandomAccessIterator __last, _Compare __comp,
+                _Distance*, _Tp*) 
+{
+  __push_heap(__first, _Distance((__last - __first) - 1), _Distance(0), 
+              _Tp(*(__last - 1)), __comp);
+}
+
+template <class _RandomAccessIterator, class _Compare>
+void 
+push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
+          _Compare __comp) 
+{
+  __push_heap_aux(__first, __last, __comp,
+                  _STLP_DISTANCE_TYPE(__first, _RandomAccessIterator), _STLP_VALUE_TYPE(__first, _RandomAccessIterator));
+}
+
+template <class _RandomAccessIterator, class _Distance, class _Tp>
+void 
+__adjust_heap(_RandomAccessIterator __first, _Distance __holeIndex,
+              _Distance __len, _Tp __val) {
+  _Distance __topIndex = __holeIndex;
+  _Distance __secondChild = 2 * __holeIndex + 2;
+  while (__secondChild < __len) {
+    if (*(__first + __secondChild) < *(__first + (__secondChild - 1)))
+      __secondChild--;
+    *(__first + __holeIndex) = *(__first + __secondChild);
+    __holeIndex = __secondChild;
+    __secondChild = 2 * (__secondChild + 1);
+  }
+  if (__secondChild == __len) {
+    *(__first + __holeIndex) = *(__first + (__secondChild - 1));
+    __holeIndex = __secondChild - 1;
+  }
+  __push_heap(__first, __holeIndex, __topIndex, __val);
+}
+
+
+template <class _RandomAccessIterator, class _Tp>
+inline void 
+__pop_heap_aux(_RandomAccessIterator __first, _RandomAccessIterator __last, _Tp*) {
+  __pop_heap(__first, __last - 1, __last - 1, 
+             _Tp(*(__last - 1)), _STLP_DISTANCE_TYPE(__first, _RandomAccessIterator));
+}
+
+template <class _RandomAccessIterator>
+void pop_heap(_RandomAccessIterator __first, 
+	      _RandomAccessIterator __last) {
+  __pop_heap_aux(__first, __last, _STLP_VALUE_TYPE(__first, _RandomAccessIterator));
+}
+
+template <class _RandomAccessIterator, class _Distance,
+          class _Tp, class _Compare>
+void
+__adjust_heap(_RandomAccessIterator __first, _Distance __holeIndex,
+              _Distance __len, _Tp __val, _Compare __comp)
+{
+  _Distance __topIndex = __holeIndex;
+  _Distance __secondChild = 2 * __holeIndex + 2;
+  while (__secondChild < __len) {
+    if (__comp(*(__first + __secondChild), *(__first + (__secondChild - 1))))
+      __secondChild--;
+    *(__first + __holeIndex) = *(__first + __secondChild);
+    __holeIndex = __secondChild;
+    __secondChild = 2 * (__secondChild + 1);
+  }
+  if (__secondChild == __len) {
+    *(__first + __holeIndex) = *(__first + (__secondChild - 1));
+    __holeIndex = __secondChild - 1;
+  }
+  __push_heap(__first, __holeIndex, __topIndex, __val, __comp);
+}
+
+
+template <class _RandomAccessIterator, class _Tp, class _Compare>
+inline void 
+__pop_heap_aux(_RandomAccessIterator __first,
+               _RandomAccessIterator __last, _Tp*, _Compare __comp)
+{
+  __pop_heap(__first, __last - 1, __last - 1, _Tp(*(__last - 1)), __comp,
+             _STLP_DISTANCE_TYPE(__first, _RandomAccessIterator));
+}
+
+
+template <class _RandomAccessIterator, class _Compare>
+void 
+pop_heap(_RandomAccessIterator __first,
+         _RandomAccessIterator __last, _Compare __comp)
+{
+    __pop_heap_aux(__first, __last, _STLP_VALUE_TYPE(__first, _RandomAccessIterator), __comp);
+}
+
+template <class _RandomAccessIterator, class _Tp, class _Distance>
+_STLP_INLINE_LOOP
+void 
+__make_heap(_RandomAccessIterator __first,
+            _RandomAccessIterator __last, _Tp*, _Distance*)
+{
+  if (__last - __first < 2) return;
+  _Distance __len = __last - __first;
+  _Distance __parent = (__len - 2)/2;
+    
+  while (true) {
+    __adjust_heap(__first, __parent, __len, _Tp(*(__first + __parent)));
+    if (__parent == 0) return;
+    __parent--;
+  }
+}
+
+template <class _RandomAccessIterator>
+void 
+make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
+{
+  __make_heap(__first, __last,
+              _STLP_VALUE_TYPE(__first, _RandomAccessIterator), _STLP_DISTANCE_TYPE(__first, _RandomAccessIterator));
+}
+
+template <class _RandomAccessIterator, class _Compare,
+          class _Tp, class _Distance>
+_STLP_INLINE_LOOP
+void
+__make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
+            _Compare __comp, _Tp*, _Distance*)
+{
+  if (__last - __first < 2) return;
+  _Distance __len = __last - __first;
+  _Distance __parent = (__len - 2)/2;
+    
+  while (true) {
+    __adjust_heap(__first, __parent, __len, _Tp(*(__first + __parent)),
+                  __comp);
+    if (__parent == 0) return;
+    __parent--;
+  }
+}
+
+template <class _RandomAccessIterator, class _Compare>
+void 
+make_heap(_RandomAccessIterator __first, 
+          _RandomAccessIterator __last, _Compare __comp)
+{
+  __make_heap(__first, __last, __comp,
+              _STLP_VALUE_TYPE(__first, _RandomAccessIterator), _STLP_DISTANCE_TYPE(__first, _RandomAccessIterator));
+}
+
+_STLP_END_NAMESPACE
+
+#endif /*  _STLP_HEAP_C */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_heap.h b/main/source/stlport/stlport/stl/_heap.h
new file mode 100644
index 00000000..3b11db72
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_heap.h
@@ -0,0 +1,129 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Hewlett-Packard Company makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ *
+ * Copyright (c) 1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Silicon Graphics makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_HEAP_H
+#define _STLP_INTERNAL_HEAP_H
+
+#ifndef _STLP_CONFIG_H
+#include <stl/_config.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+// Heap-manipulation functions: push_heap, pop_heap, make_heap, sort_heap.
+
+template <class _RandomAccessIterator>
+void 
+push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last);
+
+
+template <class _RandomAccessIterator, class _Compare>
+void 
+push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
+          _Compare __comp);
+
+template <class _RandomAccessIterator, class _Distance, class _Tp>
+void 
+__adjust_heap(_RandomAccessIterator __first, _Distance __holeIndex,
+              _Distance __len, _Tp __val);
+
+template <class _RandomAccessIterator, class _Tp, class _Distance>
+inline void 
+__pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
+           _RandomAccessIterator __result, _Tp __val, _Distance*)
+{
+  *__result = *__first;
+  __adjust_heap(__first, _Distance(0), _Distance(__last - __first), __val);
+}
+
+template <class _RandomAccessIterator>
+void pop_heap(_RandomAccessIterator __first, 
+	      _RandomAccessIterator __last);
+
+template <class _RandomAccessIterator, class _Distance,
+          class _Tp, class _Compare>
+void
+__adjust_heap(_RandomAccessIterator __first, _Distance __holeIndex,
+              _Distance __len, _Tp __val, _Compare __comp);
+
+template <class _RandomAccessIterator, class _Tp, class _Compare, 
+          class _Distance>
+inline void 
+__pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
+           _RandomAccessIterator __result, _Tp __val, _Compare __comp,
+           _Distance*)
+{
+  *__result = *__first;
+  __adjust_heap(__first, _Distance(0), _Distance(__last - __first), 
+                __val, __comp);
+}
+
+template <class _RandomAccessIterator, class _Compare>
+void 
+pop_heap(_RandomAccessIterator __first,
+         _RandomAccessIterator __last, _Compare __comp);
+
+template <class _RandomAccessIterator>
+void 
+make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last);
+
+template <class _RandomAccessIterator, class _Compare>
+void 
+make_heap(_RandomAccessIterator __first, 
+          _RandomAccessIterator __last, _Compare __comp);
+
+template <class _RandomAccessIterator>
+_STLP_INLINE_LOOP
+void sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
+{
+  while (__last - __first > 1)
+    pop_heap(__first, __last--);
+}
+
+template <class _RandomAccessIterator, class _Compare>
+_STLP_INLINE_LOOP
+void 
+sort_heap(_RandomAccessIterator __first,
+          _RandomAccessIterator __last, _Compare __comp)
+{
+  while (__last - __first > 1)
+    pop_heap(__first, __last--, __comp);
+}
+
+_STLP_END_NAMESPACE
+
+# if !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_heap.c>
+# endif
+
+#endif /* _STLP_INTERNAL_HEAP_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_ios.c b/main/source/stlport/stlport/stl/_ios.c
new file mode 100644
index 00000000..b53f40f6
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_ios.c
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+#ifndef _STLP_IOS_C
+#define _STLP_IOS_C
+
+#ifndef _STLP_INTERNAL_IOS_H
+# include <stl/_ios.h>
+#endif
+
+#if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION)
+
+#ifndef _STLP_INTERNAL_STREAMBUF
+# include <stl/_streambuf.h>
+#endif
+
+#ifndef _STLP_INTERNAL_NUMPUNCT_H
+# include <stl/_numpunct.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+// basic_ios<>'s non-inline member functions
+
+// Public constructor, taking a streambuf.
+template <class _CharT, class _Traits>
+basic_ios<_CharT, _Traits>
+  ::basic_ios(basic_streambuf<_CharT, _Traits>* __streambuf)
+    : ios_base(),
+      _M_fill(_STLP_NULL_CHAR_INIT(_CharT)), _M_streambuf(0), _M_tied_ostream(0)
+{
+  init(__streambuf);
+}
+
+template <class _CharT, class _Traits>
+basic_streambuf<_CharT, _Traits>*
+basic_ios<_CharT, _Traits>::rdbuf(basic_streambuf<_CharT, _Traits>* __buf)
+{
+  basic_streambuf<_CharT, _Traits>* __tmp = _M_streambuf;
+  _M_streambuf = __buf;
+  this->clear();
+  return __tmp;
+}
+
+template <class _CharT, class _Traits>
+basic_ios<_CharT, _Traits>&
+basic_ios<_CharT, _Traits>::copyfmt(const basic_ios<_CharT, _Traits>& __x)
+{
+  _M_invoke_callbacks(erase_event);
+  _M_copy_state(__x);           // Inherited from ios_base.
+  _M_fill = __x._M_fill;
+  _M_tied_ostream = __x._M_tied_ostream;
+  _M_invoke_callbacks(copyfmt_event);
+  this->_M_set_exception_mask(__x.exceptions());
+  return *this;
+}
+
+template <class _CharT, class _Traits>
+locale basic_ios<_CharT, _Traits>::imbue(const locale& __loc)
+{
+  locale __tmp = ios_base::imbue(__loc);
+
+  if (_M_streambuf)
+    _M_streambuf->pubimbue(__loc);
+
+  // no throwing here
+  this->_M_cached_ctype = __loc._M_get_facet(ctype<char_type>::id) ;
+  this->_M_cached_numpunct = __loc._M_get_facet(numpunct<char_type>::id) ;
+  this->_M_cached_grouping = ((numpunct<char_type>*)_M_cached_numpunct)->grouping() ;
+  return __tmp;
+}
+
+// Protected constructor and initialization functions. The default
+// constructor creates an uninitialized basic_ios, and init() initializes
+// all of the members to the values in Table 89 of the C++ standard.
+
+template <class _CharT, class _Traits>
+basic_ios<_CharT, _Traits>::basic_ios()
+  : ios_base(),
+    _M_fill(_STLP_NULL_CHAR_INIT(_CharT)), _M_streambuf(0), _M_tied_ostream(0)
+{}
+
+template <class _CharT, class _Traits>
+void
+basic_ios<_CharT, _Traits>::init(basic_streambuf<_CharT, _Traits>* __sb)
+{
+  this->rdbuf(__sb);
+  this->imbue(locale());
+  this->tie(0);
+  this->_M_set_exception_mask(ios_base::goodbit);
+  this->_M_clear_nothrow(__sb != 0 ? ios_base::goodbit : ios_base::badbit);
+  ios_base::flags(ios_base::skipws | ios_base::dec);
+  ios_base::width(0);
+  ios_base::precision(6);
+  this->fill(widen(' '));
+  // We don't need to worry about any of the three arrays: they are
+  // initialized correctly in ios_base's constructor.
+}
+
+// This is never called except from within a catch clause.
+template <class _CharT, class _Traits>
+void basic_ios<_CharT, _Traits>::_M_handle_exception(ios_base::iostate __flag)
+{
+  this->_M_setstate_nothrow(__flag);
+  if (this->_M_get_exception_mask() & __flag)
+    _STLP_RETHROW;
+}
+
+_STLP_END_NAMESPACE
+
+#endif /* defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION) */
+
+#endif /* _STLP_IOS_C */
diff --git a/main/source/stlport/stlport/stl/_ios.h b/main/source/stlport/stlport/stl/_ios.h
new file mode 100644
index 00000000..9744b784
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_ios.h
@@ -0,0 +1,199 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+#ifndef _STLP_INTERNAL_IOS_H
+#define _STLP_INTERNAL_IOS_H
+
+
+#ifndef _STLP_IOS_BASE_H
+# include <stl/_ios_base.h>
+#endif
+
+#ifndef _STLP_INTERNAL_CTYPE_H
+# include <stl/_ctype.h>
+#endif
+#ifndef _STLP_INTERNAL_NUMPUNCT_H
+# include <stl/_numpunct.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+// ----------------------------------------------------------------------
+
+// Class basic_ios, a subclass of ios_base.  The only important difference
+// between the two is that basic_ios is a class template, parameterized
+// by the character type.  ios_base exists to factor out all of the
+// common properties that don't depend on the character type.
+
+// The second template parameter, _Traits, defaults to char_traits<_CharT>.
+// The default is declared in header <iosfwd>, and it isn't declared here
+// because C++ language rules do not allow it to be declared twice.
+
+template <class _CharT, class _Traits>
+class basic_ios : public ios_base {
+  friend class ios_base;
+public:                         // Synonyms for types.
+  typedef _CharT                     char_type;
+  typedef typename _Traits::int_type int_type;
+  typedef typename _Traits::pos_type pos_type;
+  typedef typename _Traits::off_type off_type;
+  typedef _Traits                    traits_type;
+
+public:                         // Constructor, destructor.
+  explicit basic_ios(basic_streambuf<_CharT, _Traits>* __streambuf);
+  virtual ~basic_ios() {}
+
+public:                         // Members from clause 27.4.4.2
+  basic_ostream<_CharT, _Traits>* tie() const {
+    return _M_tied_ostream;
+  }
+  basic_ostream<_CharT, _Traits>*
+  tie(basic_ostream<char_type, traits_type>* __new_tied_ostream) {
+    basic_ostream<char_type, traits_type>* __tmp = _M_tied_ostream;
+    _M_tied_ostream = __new_tied_ostream;
+    return __tmp;
+  }
+
+  basic_streambuf<_CharT, _Traits>* rdbuf() const
+    { return _M_streambuf; }
+
+  basic_streambuf<_CharT, _Traits>*
+  rdbuf(basic_streambuf<char_type, traits_type>*);
+
+  // Copies __x's state to *this.
+  basic_ios<_CharT, _Traits>& copyfmt(const basic_ios<_CharT, _Traits>& __x);
+
+  char_type fill() const { return _M_fill; }
+  char_type fill(char_type __fill) {
+    char_type __tmp(_M_fill);
+    _M_fill = __fill;
+    return __tmp;
+  }
+
+public:                         // Members from 27.4.4.3.  These four functions
+                                // can almost be defined in ios_base.
+
+  void clear(iostate __state = goodbit) {
+    _M_clear_nothrow(this->rdbuf() ? __state : iostate(__state|ios_base::badbit));
+    _M_check_exception_mask();
+  }
+  void setstate(iostate __state) { this->clear(rdstate() | __state); }
+
+  iostate exceptions() const { return this->_M_get_exception_mask(); }
+  void exceptions(iostate __mask) {
+    this->_M_set_exception_mask(__mask);
+    this->clear(this->rdstate());
+  }
+
+public:                         // Locale-related member functions.
+  locale imbue(const locale&);
+
+  inline char narrow(_CharT, char) const ;
+  inline _CharT widen(char) const; 
+
+  // Helper function that makes testing for EOF more convenient.
+  static bool _STLP_CALL _S_eof(int_type __c) {
+    const int_type __eof = _Traits::eof();
+    return _Traits::eq_int_type(__c, __eof);
+  }
+
+protected:
+  basic_ios();
+
+  void init(basic_streambuf<_CharT, _Traits>* __streambuf);
+
+public:
+  
+  // Helper function used in istream and ostream.  It is called only from
+  // a catch clause.
+  void _M_handle_exception(ios_base::iostate __flag);
+  
+private:                        // Data members
+  char_type _M_fill;            // The fill character, used for padding.
+
+  basic_streambuf<_CharT, _Traits>* _M_streambuf;
+  basic_ostream<_CharT, _Traits>*   _M_tied_ostream;
+
+};
+
+
+template <class _CharT, class _Traits>
+inline char 
+basic_ios<_CharT, _Traits>::narrow(_CharT __c, char __default) const
+{ return ((const ctype<_CharT>*)this->_M_ctype_facet())->narrow(__c, __default); }
+
+template <class _CharT, class _Traits>
+inline _CharT 
+basic_ios<_CharT, _Traits>::widen(char __c) const
+{ 
+  return ((const ctype<_CharT>*)this->_M_ctype_facet())->widen(__c); }
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+_STLP_EXPORT_TEMPLATE_CLASS basic_ios<char, char_traits<char> >;
+#  if ! defined (_STLP_NO_WCHAR_T)
+_STLP_EXPORT_TEMPLATE_CLASS basic_ios<wchar_t, char_traits<wchar_t> >;
+#  endif
+# endif /* _STLP_USE_TEMPLATE_EXPORT */
+
+# if !defined (_STLP_NO_METHOD_SPECIALIZATION)
+_STLP_TEMPLATE_NULL
+inline char
+basic_ios<char, char_traits<char> >::narrow(char __c, char) const
+{
+  return __c;
+}
+
+_STLP_TEMPLATE_NULL
+inline char
+basic_ios<char, char_traits<char> >::widen(char __c) const
+{
+  return __c;
+}
+# endif /* _STLP_NO_METHOD_SPECIALIZATION */
+
+
+_STLP_END_NAMESPACE
+
+#if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION) && !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_ios.c>
+# endif
+
+// The following is needed to ensure that the inlined _Stl_loc_init functions
+// that ios_base::_Loc_init::_Loc_init() calls are found eventually.
+// Otherwise, undefined externs may be caused.
+
+#if defined(__BORLANDC__) && defined(_RTLDLL)
+# ifndef _STLP_INTERNAL_NUM_PUT_H
+#  include <stl/_num_put.h>
+# endif
+# ifndef _STLP_INTERNAL_NUM_GET_H
+#   include <stl/_num_get.h>
+# endif
+# ifndef _STLP_INTERNAL_MONETARY_H
+#  include <stl/_monetary.h>
+# endif
+# ifndef _STLP_INTERNAL_TIME_FACETS_H
+#  include <stl/_time_facets.h>
+# endif
+#endif
+
+#endif /* _STLP_IOS */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_ios_base.h b/main/source/stlport/stlport/stl/_ios_base.h
new file mode 100644
index 00000000..8a6339de
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_ios_base.h
@@ -0,0 +1,403 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+#ifndef _STLP_IOS_BASE_H
+#define _STLP_IOS_BASE_H
+
+#ifndef _STLP_STDEXCEPT
+#include <stdexcept>
+#endif
+#ifndef _STLP_UTILITY
+#include <utility>
+#endif
+#ifndef _STLP_INTERNAL_LOCALE_H
+#include <stl/_locale.h>
+#endif
+#ifndef _STLP_STRING_H
+# include <stl/_string.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+// ----------------------------------------------------------------------
+
+// Class ios_base.  This is the base class of the ios hierarchy, which
+// includes basic_istream and basic_ostream.  Classes in the ios
+// hierarchy are actually quite simple: they are just glorified
+// wrapper classes.  They delegate buffering and physical character
+// manipulation to the streambuf classes, and they delegate most
+// formatting tasks to a locale.
+
+class _STLP_CLASS_DECLSPEC ios_base {
+public:
+  
+  class _STLP_CLASS_DECLSPEC failure : public __Named_exception {
+  public:
+    explicit failure(const string&);
+    virtual ~failure() _STLP_NOTHROW_INHERENTLY;
+  };
+
+  typedef int fmtflags;
+  typedef int iostate;
+  typedef int openmode;
+  typedef int seekdir;
+
+# ifndef _STLP_NO_ANACHRONISMS
+  typedef fmtflags fmt_flags;
+# endif
+
+  // Formatting flags.
+# ifdef _STLP_STATIC_CONST_INIT_BUG
+  enum  {
+# else
+  // boris : type for all those constants is int   
+  static const int
+# endif
+    left       = 0x0001,
+    right      = 0x0002,
+    internal   = 0x0004,
+    dec        = 0x0008,
+    hex        = 0x0010,
+    oct        = 0x0020,
+    fixed      = 0x0040,
+    scientific = 0x0080,
+    boolalpha  = 0x0100,
+    showbase   = 0x0200,
+    showpoint  = 0x0400,
+    showpos    = 0x0800,
+    skipws     = 0x1000,
+    unitbuf    = 0x2000,
+    uppercase  = 0x4000,
+    adjustfield = left | right | internal,
+    basefield   = dec | hex | oct,
+    floatfield  = scientific | fixed,
+    
+    // State flags.
+    goodbit = 0x00,
+    badbit  = 0x01,
+    eofbit  = 0x02,
+    failbit = 0x04,
+    
+    // Openmode flags.
+    __default_mode = 0x0, /* implementation detail */
+    app    = 0x01,
+    ate    = 0x02,
+    binary = 0x04,
+    in     = 0x08,
+    out    = 0x10,
+    trunc  = 0x20,
+    
+    // Seekdir flags
+    
+    beg = 0x01,
+    cur = 0x02,
+    end = 0x04
+# ifdef _STLP_STATIC_CONST_INIT_BUG
+  }
+# endif
+  ;
+
+public:                         // Flag-manipulation functions.
+  fmtflags flags() const { return _M_fmtflags; }
+  fmtflags flags(fmtflags __flags) {
+    fmtflags __tmp = _M_fmtflags;
+    _M_fmtflags = __flags;
+    return __tmp;
+  }
+
+  fmtflags setf(fmtflags __flag) {
+    fmtflags __tmp = _M_fmtflags;
+    _M_fmtflags |= __flag;
+    return __tmp;
+  }
+  fmtflags setf(fmtflags __flag, fmtflags __mask) {
+    fmtflags __tmp = _M_fmtflags;
+    _M_fmtflags &= ~__mask;
+    _M_fmtflags |= __flag & __mask;
+    return __tmp;
+  }
+  void unsetf(fmtflags __mask) { _M_fmtflags &= ~__mask; }
+
+  streamsize precision() const { return _M_precision; }
+  streamsize precision(streamsize __newprecision) {
+    streamsize __tmp = _M_precision;
+    _M_precision = __newprecision;
+    return __tmp;
+  }
+
+  streamsize width() const { return _M_width; }
+  streamsize width(streamsize __newwidth) {
+    streamsize __tmp = _M_width;
+    _M_width = __newwidth;
+    return __tmp;
+  }
+
+public:                         // Locales
+  locale imbue(const locale&);
+  locale getloc() const { return _M_locale; }
+
+public:                         // Auxiliary storage.
+  static int _STLP_CALL xalloc();
+  long&  iword(int __index);
+  void*& pword(int __index);
+
+public:                         // Destructor.
+  virtual ~ios_base();
+
+public:                         // Callbacks.
+  enum event { erase_event, imbue_event, copyfmt_event };
+  typedef void (*event_callback)(event, ios_base&, int __index);
+  void register_callback(event_callback __fn, int __index);
+
+public:                         // This member function affects only
+                                // the eight predefined ios objects:
+                                // cin, cout, etc.
+  static bool _STLP_CALL sync_with_stdio(bool __sync = true);
+
+public:                         // The C++ standard requires only that these
+                                // member functions be defined in basic_ios.
+                                // We define them in the non-template
+                                // base class to avoid code duplication.
+  operator void*() const { return !fail() ? (void*) __CONST_CAST(ios_base*,this) : (void*) 0; }
+  bool operator!() const { return fail(); }
+
+  iostate rdstate() const { return _M_iostate; }
+
+  bool good() const { return _M_iostate == 0; }
+  bool eof() const { return (_M_iostate & eofbit) != 0; }
+  bool fail() const { return (_M_iostate & (failbit | badbit)) != 0; }
+  bool bad() const { return (_M_iostate & badbit) != 0; }
+
+protected:                      // The functional protected interface.
+
+  // Copies the state of __x to *this.  This member function makes it
+  // possible to implement basic_ios::copyfmt without having to expose
+  // ios_base's private data members.  Does not copy _M_exception_mask
+  // or _M_iostate.
+  void _M_copy_state(const ios_base& __x);
+
+  void _M_setstate_nothrow(iostate __state) { _M_iostate |= __state; }
+  void _M_clear_nothrow(iostate __state) { _M_iostate = __state; }
+  iostate _M_get_exception_mask() const { return _M_exception_mask; }
+  void _M_set_exception_mask(iostate __mask) { _M_exception_mask = __mask; }
+  void _M_check_exception_mask() { 
+    if (_M_iostate & _M_exception_mask)
+      _M_throw_failure(); 
+  }
+
+  void _M_invoke_callbacks(event);
+  void _M_throw_failure();
+
+  ios_base();                   // Default constructor.
+
+protected:                        // Initialization of the I/O system
+  static void _STLP_CALL _S_initialize();
+  static void _STLP_CALL _S_uninitialize();
+  static bool _S_was_synced;
+  
+private:                        // Invalidate the copy constructor and
+                                // assignment operator.
+  ios_base(const ios_base&);
+  void operator=(const ios_base&);
+
+private:                        // Data members.
+
+  fmtflags _M_fmtflags;         // Flags
+  iostate _M_iostate;
+  openmode _M_openmode;
+  seekdir _M_seekdir;
+  iostate _M_exception_mask;
+
+  streamsize _M_precision;
+  streamsize _M_width;
+
+  locale _M_locale;
+
+  pair<event_callback, int>* _M_callbacks;
+  size_t _M_num_callbacks;      // Size of the callback array.
+  size_t _M_callback_index;     // Index of the next available callback;
+                                // initially zero.
+
+  long* _M_iwords;              // Auxiliary storage.  The count is zero
+  size_t _M_num_iwords;         // if and only if the pointer is null.
+
+  void** _M_pwords;
+  size_t _M_num_pwords;
+
+  static int _S_index;
+
+protected:
+  // Cached copies of the curent locale's facets.  Set by init() and imbue().
+  locale::facet* _M_cached_ctype;
+  locale::facet* _M_cached_numpunct;
+  string         _M_cached_grouping;
+public:
+  // Equivalent to &use_facet< Facet >(getloc()), but faster.
+  const locale::facet* _M_ctype_facet() const { return _M_cached_ctype; }
+  const locale::facet* _M_numpunct_facet() const { return _M_cached_numpunct; }
+  const string&  _M_grouping() const { return _M_cached_grouping; }
+public:
+
+  // ----------------------------------------------------------------------
+  // Nested initializer class.  This is an implementation detail, but it's
+  // prescribed by the standard.  The static initializer object (on 
+  // implementations where such a thing is required) is declared in
+  // <iostream>
+  
+  class _STLP_CLASS_DECLSPEC Init {
+  public:
+    Init();
+    ~Init();
+  private:
+    static long _S_count;
+    friend class ios_base;
+  };
+
+  // this class is needed to ensure locale initialization w/o <iostream> inclusion
+  class _STLP_CLASS_DECLSPEC _Loc_init {
+  public:
+    _Loc_init();
+    ~_Loc_init();
+  private:
+    static long _S_count;
+    friend class locale;
+    friend class ios_base;
+  };
+
+  friend class Init;
+
+public:
+# ifndef _STLP_NO_ANACHRONISMS
+  //  31.6  Old iostreams members                         [depr.ios.members]
+  typedef iostate  io_state;
+  typedef openmode open_mode;
+  typedef seekdir  seek_dir;
+  typedef _STLP_STD::streamoff  streamoff;
+  typedef _STLP_STD::streampos  streampos;
+# endif  
+};
+
+// ----------------------------------------------------------------------
+// ios_base manipulator functions, from section 27.4.5 of the C++ standard.
+// All of them are trivial one-line wrapper functions.
+
+// fmtflag manipulators, section 27.4.5.1
+inline ios_base& _STLP_CALL boolalpha(ios_base& __s)
+  { __s.setf(ios_base::boolalpha); return __s;}
+
+inline ios_base& _STLP_CALL noboolalpha(ios_base& __s)
+  { __s.unsetf(ios_base::boolalpha); return __s;}
+
+inline ios_base& _STLP_CALL showbase(ios_base& __s)
+  { __s.setf(ios_base::showbase); return __s;}
+
+inline ios_base& _STLP_CALL noshowbase(ios_base& __s)
+  { __s.unsetf(ios_base::showbase); return __s;}
+
+inline ios_base& _STLP_CALL showpoint(ios_base& __s)
+  { __s.setf(ios_base::showpoint); return __s;}
+
+inline ios_base& _STLP_CALL noshowpoint(ios_base& __s)
+  { __s.unsetf(ios_base::showpoint); return __s;}
+
+inline ios_base& _STLP_CALL showpos(ios_base& __s)
+  { __s.setf(ios_base::showpos); return __s;}
+
+inline ios_base& _STLP_CALL noshowpos(ios_base& __s) 
+  { __s.unsetf(ios_base::showpos); return __s;}
+
+inline ios_base& _STLP_CALL skipws(ios_base& __s)
+  { __s.setf(ios_base::skipws); return __s;}
+
+inline ios_base& _STLP_CALL noskipws(ios_base& __s)
+  { __s.unsetf(ios_base::skipws); return __s;}
+
+inline ios_base& _STLP_CALL uppercase(ios_base& __s)
+  { __s.setf(ios_base::uppercase); return __s;}
+
+inline ios_base& _STLP_CALL nouppercase(ios_base& __s)
+  { __s.unsetf(ios_base::uppercase); return __s;}
+
+inline ios_base& _STLP_CALL unitbuf(ios_base& __s)
+  { __s.setf(ios_base::unitbuf); return __s;}
+
+inline ios_base& _STLP_CALL nounitbuf(ios_base& __s)
+  { __s.unsetf(ios_base::unitbuf); return __s;}
+
+
+// adjustfield manipulators, section 27.4.5.2
+inline ios_base& _STLP_CALL internal(ios_base& __s)
+  { __s.setf(ios_base::internal, ios_base::adjustfield); return __s; }
+
+inline ios_base& _STLP_CALL left(ios_base& __s)
+  { __s.setf(ios_base::left, ios_base::adjustfield); return __s; }
+
+inline ios_base& _STLP_CALL right(ios_base& __s)
+  { __s.setf(ios_base::right, ios_base::adjustfield); return __s; }
+
+// basefield manipulators, section 27.4.5.3
+inline ios_base& _STLP_CALL dec(ios_base& __s)
+  { __s.setf(ios_base::dec, ios_base::basefield); return __s; }
+
+inline ios_base& _STLP_CALL hex(ios_base& __s) 
+  { __s.setf(ios_base::hex, ios_base::basefield); return __s; }
+
+inline ios_base& _STLP_CALL oct(ios_base& __s)
+  { __s.setf(ios_base::oct, ios_base::basefield); return __s; }
+
+
+// floatfield manipulators, section 27.4.5.3
+inline ios_base& _STLP_CALL fixed(ios_base& __s)
+  { __s.setf(ios_base::fixed, ios_base::floatfield); return __s; }
+
+inline ios_base& _STLP_CALL scientific(ios_base& __s)
+  { __s.setf(ios_base::scientific, ios_base::floatfield); return __s; }
+
+#if defined(__BORLANDC__) && defined(_RTLDLL)
+
+long ios_base::_Loc_init::_S_count = 0;
+
+void _STLP_CALL _Stl_loc_init_num_put();
+void _STLP_CALL _Stl_loc_init_num_get();
+void _STLP_CALL _Stl_loc_init_monetary();
+void _STLP_CALL _Stl_loc_init_time_facets();
+
+inline ios_base::_Loc_init::_Loc_init() {
+  if (_S_count++ == 0) {
+      _Stl_loc_init_num_put();
+      _Stl_loc_init_num_get();
+      _Stl_loc_init_monetary();
+      _Stl_loc_init_time_facets();
+      locale::_S_initialize();
+  }
+}
+
+inline ios_base::_Loc_init::~_Loc_init() {
+    if (--_S_count == 0)
+      locale::_S_uninitialize();
+}
+
+#endif /* __BORLANDC__ */
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_IOS_BASE */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_iosfwd.h b/main/source/stlport/stlport/stl/_iosfwd.h
new file mode 100644
index 00000000..86eb0669
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_iosfwd.h
@@ -0,0 +1,159 @@
+# ifndef _STLP_INTERNAL_IOSFWD
+#  define _STLP_INTERNAL_IOSFWD
+
+#if defined(__sgi) && !defined(__GNUC__) && !defined(_STANDARD_C_PLUS_PLUS)
+#error This header file requires the -LANG:std option
+#endif
+
+// This file provides forward declarations of the most important I/O
+// classes.  Note that almost all of those classes are class templates,
+// with default template arguments.  According to the C++ standard, 
+// if a class template is declared more than once in the same scope
+// then only one of those declarations may have default arguments.  
+
+// <iosfwd> contains the same declarations as other headers, and including
+// both <iosfwd> and (say) <iostream> is permitted.  This means that only
+// one header may contain those default template arguments.
+
+// In this implementation, the declarations in <iosfwd> contain default
+// template arguments.  All of the other I/O headers include <iosfwd>.
+
+#ifndef _STLP_CHAR_TRAITS_H
+# include <stl/char_traits.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+class _STLP_CLASS_DECLSPEC ios_base;
+
+template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
+class basic_ios;
+
+template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
+class basic_streambuf;
+
+template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
+class basic_istream;
+
+template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
+class basic_ostream;
+
+template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
+class basic_iostream;
+
+template <class _CharT, __DFL_TMPL_PARAM( _Traits , char_traits<_CharT>),
+          __DFL_TMPL_PARAM(_Allocator , allocator<_CharT>) >
+class basic_stringbuf;
+
+template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>),
+          __DFL_TMPL_PARAM(_Allocator , allocator<_CharT>) >
+class basic_istringstream;
+
+template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>),
+          __DFL_TMPL_PARAM(_Allocator , allocator<_CharT>) >
+class basic_ostringstream;
+
+template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>),
+          __DFL_TMPL_PARAM(_Allocator , allocator<_CharT>) >
+class basic_stringstream;
+
+template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
+class basic_filebuf;
+
+template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
+class basic_ifstream;
+
+template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
+class basic_ofstream;
+
+template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
+class basic_fstream;
+
+template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
+class istreambuf_iterator;
+
+template <class _CharT, __DFL_TMPL_PARAM(_Traits , char_traits<_CharT>) >
+class ostreambuf_iterator;
+
+typedef basic_ios<char, char_traits<char> >    ios;
+
+# ifndef _STLP_NO_WCHAR_T
+typedef basic_ios<wchar_t, char_traits<wchar_t> > wios;
+# endif
+
+// Forward declaration of class locale, and of the most important facets.
+class locale;
+# ifdef _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
+template <class _Facet>
+struct _Use_facet {
+  const locale& __loc;
+  _Use_facet(const locale& __p_loc) : __loc(__p_loc) {}
+  inline const _Facet& operator *() const;
+};
+# define use_facet *_Use_facet
+# else
+template <class _Facet> inline const _Facet& use_facet(const locale&);
+# endif
+
+template <class _CharT> class ctype;
+template <class _CharT> class ctype_byname;
+template <class _CharT> class collate;
+template <class _CharT> class collate_byname;
+
+_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC ctype<char>;
+_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC ctype_byname<char>;
+_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC collate<char>;
+_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC collate_byname<char>;
+
+#  ifndef _STLP_NO_WCHAR_T
+_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC ctype<wchar_t>;
+_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC ctype_byname<wchar_t>;
+_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC collate<wchar_t>;
+_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC collate_byname<wchar_t>;
+#  endif
+
+# if !(defined (__SUNPRO_CC) && __SUNPRO_CC < 0x500 ) && !defined(_STLP_WINCE)
+// Typedefs for ordinary (narrow-character) streams.
+_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC basic_streambuf<char, char_traits<char> >;
+# endif
+
+typedef basic_istream<char, char_traits<char> >   istream;
+typedef basic_ostream<char, char_traits<char> >   ostream;
+typedef basic_iostream<char, char_traits<char> >  iostream;
+typedef basic_streambuf<char,char_traits<char> > streambuf;
+
+typedef basic_stringbuf<char, char_traits<char>, allocator<char> >     stringbuf;
+typedef basic_istringstream<char, char_traits<char>, allocator<char> > istringstream;
+typedef basic_ostringstream<char, char_traits<char>, allocator<char> > ostringstream;
+typedef basic_stringstream<char, char_traits<char>, allocator<char> >  stringstream;
+
+typedef basic_filebuf<char, char_traits<char> >  filebuf;
+typedef basic_ifstream<char, char_traits<char> > ifstream;
+typedef basic_ofstream<char, char_traits<char> > ofstream;
+typedef basic_fstream<char, char_traits<char> >  fstream;
+
+# ifndef _STLP_NO_WCHAR_T
+// Typedefs for wide-character streams.
+typedef basic_streambuf<wchar_t, char_traits<wchar_t> > wstreambuf;
+typedef basic_istream<wchar_t, char_traits<wchar_t> >   wistream;
+typedef basic_ostream<wchar_t, char_traits<wchar_t> >   wostream;
+typedef basic_iostream<wchar_t, char_traits<wchar_t> >  wiostream;
+
+typedef basic_stringbuf<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >     wstringbuf;
+typedef basic_istringstream<wchar_t, char_traits<wchar_t>, allocator<wchar_t> > wistringstream;
+typedef basic_ostringstream<wchar_t, char_traits<wchar_t>, allocator<wchar_t> > wostringstream;
+typedef basic_stringstream<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >  wstringstream;
+
+typedef basic_filebuf<wchar_t, char_traits<wchar_t> >  wfilebuf;
+typedef basic_ifstream<wchar_t, char_traits<wchar_t> > wifstream;
+typedef basic_ofstream<wchar_t, char_traits<wchar_t> > wofstream;
+typedef basic_fstream<wchar_t, char_traits<wchar_t> >  wfstream;
+# endif
+
+_STLP_END_NAMESPACE
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_istream.c b/main/source/stlport/stlport/stl/_istream.c
new file mode 100644
index 00000000..f664f6af
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_istream.c
@@ -0,0 +1,1430 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+#ifndef _STLP_ISTREAM_C
+#define _STLP_ISTREAM_C
+
+#ifndef _STLP_INTERNAL_ISTREAM_H
+# include <stl/_istream.h>
+#endif
+
+# if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION)
+
+#ifndef _STLP_LIMITS_H
+# include <stl/_limits.h>
+#endif
+
+#ifndef _STLP_INTERNAL_NUM_GET_H
+# include <stl/_num_get.h>
+#endif
+
+# if defined ( _STLP_NESTED_TYPE_PARAM_BUG )
+// no wchar_t is supported for this mode
+# define __BIS_int_type__ int
+# define __BIS_pos_type__ streampos
+# define __BIS_off_type__ streamoff
+# else
+# define __BIS_int_type__ _STLP_TYPENAME_ON_RETURN_TYPE basic_istream<_CharT, _Traits>::int_type
+# define __BIS_pos_type__ _STLP_TYPENAME_ON_RETURN_TYPE basic_istream<_CharT, _Traits>::pos_type
+# define __BIS_off_type__ _STLP_TYPENAME_ON_RETURN_TYPE basic_istream<_CharT, _Traits>::off_type
+# endif
+
+_STLP_BEGIN_NAMESPACE
+
+//----------------------------------------------------------------------
+// Function object structs used by some member functions.
+
+template <class _Traits>
+struct _Is_not_wspace {
+  typedef typename _Traits::char_type argument_type;
+  typedef bool                        result_type;
+
+  const ctype<argument_type>* _M_ctype;
+
+  _Is_not_wspace(const ctype<argument_type>* __c_type) : _M_ctype(__c_type) {}
+  bool operator()(argument_type __c) const
+    { return !_M_ctype->is(ctype_base::space, __c); }
+};
+
+template <class _Traits>
+struct _Is_wspace_null {
+  typedef typename _Traits::char_type argument_type;
+  typedef bool                        result_type;
+
+  const ctype<argument_type>* _M_ctype;
+
+  _Is_wspace_null(const ctype<argument_type>* __c_type) : _M_ctype(__c_type) {}
+  bool operator()(argument_type __c) const {
+    return _Traits::eq(__c, argument_type()) || 
+           _M_ctype->is(ctype_base::space, __c);
+  }
+};
+
+template <class _Traits>
+struct _Scan_for_wspace {
+  typedef typename _Traits::char_type  char_type;
+  typedef char_type*                   first_argument_type;
+  typedef char_type*                   second_argument_type;
+  typedef char_type*                   result_type;
+
+  const ctype<char_type>* _M_ctype;
+
+  _Scan_for_wspace(const ctype<char_type>* __ctype) : _M_ctype(__ctype) {}
+  const char_type*
+  operator()(const char_type* __first, const char_type* __last) const {
+    return _M_ctype->scan_is(ctype_base::space, __first, __last);
+  }
+};
+
+template <class _Traits>
+struct _Scan_wspace_null {
+  typedef typename _Traits::char_type  char_type;
+  typedef char_type*                   first_argument_type;
+  typedef char_type*                   second_argument_type;
+  typedef char_type*                   result_type;
+
+  const ctype<char_type>* _M_ctype;
+
+  _Scan_wspace_null(const ctype<char_type>* __c_type) : _M_ctype(__c_type) {}
+  const char_type*
+  operator()(const char_type* __first, const char_type* __last) const {
+    __last = find_if(__first, __last,
+                     _Eq_char_bound<_Traits>(char_type()));
+    return _M_ctype->scan_is(ctype_base::space, __first, __last);
+  }
+};
+
+template <class _Traits>
+struct _Scan_for_not_wspace {
+  typedef typename _Traits::char_type  char_type;
+  typedef char_type*                   first_argument_type;
+  typedef char_type*                   second_argument_type;
+  typedef char_type*                   result_type;
+
+  const ctype<char_type>* _M_ctype;
+
+  _Scan_for_not_wspace(const ctype<char_type>* __c_type) : _M_ctype(__c_type) {}
+  const char_type*
+  operator()(const char_type* __first, const char_type* __last) const {
+    return _M_ctype->scan_not(ctype_base::space, __first, __last);
+  }
+};
+
+template <class _Traits>
+struct _Scan_for_char_val
+{
+  typedef typename _Traits::char_type char_type;
+  typedef char_type*                  first_argument_type;
+  typedef char_type*                  second_argument_type;
+  typedef char_type*                  result_type;
+
+  char_type _M_val;
+
+  _Scan_for_char_val(char_type __val) : _M_val(__val) {}
+
+  const char_type*
+  operator()(const char_type* __first, const char_type* __last) const {
+    return find_if(__first, __last, _Eq_char_bound<_Traits>(_M_val)); 
+  }
+};
+
+template <class _Traits>
+struct _Scan_for_int_val
+{
+  typedef typename _Traits::char_type char_type;
+  typedef typename _Traits::int_type  int_type;
+  typedef char_type*                  first_argument_type;
+  typedef char_type*                  second_argument_type;
+  typedef char_type*                  result_type;
+
+  int_type _M_val;
+
+  _Scan_for_int_val(int_type __val) : _M_val(__val) {}
+
+  const char_type*
+  operator()(const char_type* __first, const char_type* __last) const {
+    return find_if(__first, __last,
+                   _Eq_int_bound<_Traits>(_M_val));
+  }
+};
+
+// Helper function: try to push back a character to a streambuf, 
+// return true if the pushback succeeded.  Does not throw.
+
+template <class _CharT, class _Traits> 
+bool _STLP_CALL
+__pushback(basic_streambuf<_CharT, _Traits>* __buf, _CharT __c)
+{
+  bool ret;
+  _STLP_TRY {
+    const typename _Traits::int_type __eof = _Traits::eof();
+    ret = !_Traits::eq_int_type(__buf->sputbackc(__c), __eof);
+  }
+  _STLP_CATCH_ALL {
+    ret = false;
+  }
+  return ret;
+}
+
+template <class _CharT, class _Traits>
+basic_istream<_CharT, _Traits>& _STLP_CALL
+ws(basic_istream<_CharT, _Traits>& __is)
+{
+  typedef typename basic_istream<_CharT, _Traits>::sentry      _Sentry;
+  _Sentry __sentry(__is, _No_Skip_WS()); // Don't skip whitespace.
+  if (__sentry)
+    __is._M_skip_whitespace(false);
+  return __is;
+}
+
+// Helper functions for istream<>::sentry constructor.
+template <class _CharT, class _Traits>
+bool
+_M_init_skip(basic_istream<_CharT, _Traits>& __is) {
+  if (__is.good()) {
+    if (__is.tie())
+      __is.tie()->flush();
+    
+    __is._M_skip_whitespace(true);
+  }
+  
+  if (!__is.good()) {
+    __is.setstate(ios_base::failbit);
+    return false;
+  } else
+    return true;
+}
+
+template <class _CharT, class _Traits>
+bool
+_M_init_noskip(basic_istream<_CharT, _Traits>& __is){
+  if (__is.good()) {
+    if (__is.tie())
+      __is.tie()->flush();
+    
+    if (!__is.rdbuf())
+      __is.setstate(ios_base::badbit);
+  }
+  else
+    __is.setstate(ios_base::failbit);
+  return __is.good();
+}
+
+//----------------------------------------------------------------------
+// Definitions of basic_istream<>'s noninline member functions.
+
+// Helper function for formatted input of numbers.
+template <class _CharT, class _Traits, class _Number> 
+ios_base::iostate _STLP_CALL 
+_M_get_num(basic_istream<_CharT, _Traits>& __that, _Number& __val)
+{
+  typedef typename basic_istream<_CharT, _Traits>::sentry _Sentry;
+  ios_base::iostate __err = 0;
+  _Sentry __sentry( __that );     // Skip whitespace.
+  if (__sentry) {
+    typedef num_get<_CharT, istreambuf_iterator<_CharT, _Traits> > _Num_get;
+    _STLP_TRY {
+      ((const _Num_get&)use_facet<_Num_get>(__that.getloc())).get(istreambuf_iterator<_CharT, _Traits>(__that.rdbuf()),
+					0, __that, __err, __val);
+    }
+    _STLP_CATCH_ALL {
+      __that._M_handle_exception(ios_base::badbit);
+    }
+    if (__err) __that.setstate(__err);
+  }
+  return __err;
+}
+
+
+// Unformatted input
+
+template <class _CharT, class _Traits>
+__BIS_int_type__
+basic_istream<_CharT, _Traits>::peek()
+{
+  typename _Traits::int_type __tmp = _Traits::eof();
+
+  this->_M_gcount = 0;
+  sentry __sentry(*this, _No_Skip_WS());
+
+  if (__sentry) {
+    _STLP_TRY {
+      __tmp = this->rdbuf()->sgetc();
+    }
+    _STLP_CATCH_ALL {
+      this->_M_handle_exception(ios_base::badbit);
+    }
+    if (this->_S_eof(__tmp))
+      this->setstate(ios_base::eofbit);
+  }
+
+  return __tmp;
+}
+
+
+template <class _CharT, class _Traits>
+__BIS_int_type__
+basic_istream<_CharT, _Traits>::get()
+{
+  typename _Traits::int_type __tmp = _Traits::eof();
+  sentry __sentry(*this, _No_Skip_WS());
+  this->_M_gcount = 0;
+
+  if (__sentry) {
+    _STLP_TRY {
+      __tmp = this->rdbuf()->sbumpc();
+    }
+    _STLP_CATCH_ALL {
+      this->_M_handle_exception(ios_base::badbit);
+    }
+
+    if (!this->_S_eof(__tmp))
+      this->_M_gcount = 1;
+  }
+
+  if (_M_gcount == 0)
+    this->setstate(ios_base::eofbit | ios_base::failbit);
+
+  return __tmp;
+}
+
+template <class _CharT, class _Traits>
+basic_istream<_CharT, _Traits>& 
+basic_istream<_CharT, _Traits>::get(_CharT& __c)
+{
+  sentry __sentry(*this, _No_Skip_WS());
+  this->_M_gcount = 0;
+
+  if (__sentry) {
+    typename _Traits::int_type __tmp = _Traits::eof();
+    _STLP_TRY {
+      __tmp = this->rdbuf()->sbumpc();
+    }
+    _STLP_CATCH_ALL {
+      this->_M_handle_exception(ios_base::badbit);
+    }
+
+    if (!this->_S_eof(__tmp)) {
+      this->_M_gcount = 1;
+      __c = _Traits::to_char_type(__tmp);
+    }
+  }
+
+  if (this->_M_gcount == 0)
+    this->setstate(ios_base::eofbit | ios_base::failbit);
+
+  return *this;
+}
+
+
+
+// Read characters and discard them.  The standard specifies a single
+// function with two arguments, each with a default.  We instead use
+// three overloded functions, because it's possible to implement the
+// first two more efficiently than the fully general third version.
+template <class _CharT, class _Traits>
+basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>::ignore()
+{
+  sentry __sentry(*this, _No_Skip_WS());
+  this->_M_gcount = 0;
+
+  if (__sentry) {
+    int_type __c;
+    _STLP_TRY {
+      __c = this->rdbuf()->sbumpc();
+    }
+    _STLP_CATCH_ALL {
+      this->_M_handle_exception(ios_base::badbit);
+      return *this;
+    }
+
+    if (!this->_S_eof(__c))
+      this->_M_gcount = 1;
+    else
+      this->setstate(ios_base::eofbit);
+  }
+
+  return *this;
+}
+
+// Putback
+
+template <class _CharT, class _Traits>
+basic_istream<_CharT, _Traits>& 
+basic_istream<_CharT, _Traits>::putback(_CharT __c) {
+  this->_M_gcount = 0;
+  sentry __sentry(*this, _No_Skip_WS());
+
+  if (__sentry) {
+    typename _Traits::int_type __tmp = _Traits::eof();
+    basic_streambuf<_CharT, _Traits>* __buf = this->rdbuf();
+//    if (!__buf || this->_S_eof(__buf->sputbackc(__c)))
+    if (__buf) {
+      _STLP_TRY {
+        __tmp = __buf->sputbackc(__c);
+      }
+      _STLP_CATCH_ALL {
+        this->_M_handle_exception(ios_base::badbit);
+      }
+    }
+    if (this->_S_eof(__tmp))
+      this->setstate(ios_base::badbit);
+  }
+  else
+    this->setstate(ios_base::failbit);
+
+  return *this;
+}
+
+template <class _CharT, class _Traits>
+basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>::unget() {
+  this->_M_gcount = 0;
+
+  sentry __sentry(*this, _No_Skip_WS());
+
+  if (__sentry) {
+    basic_streambuf<_CharT, _Traits>* __buf = this->rdbuf();
+    //     if (!__buf || _Traits::eq_int_type(__buf->sungetc(), _Traits::eof()))
+    if (__buf) {
+      _STLP_TRY {
+        _CharT __tmp;
+        __tmp = __buf->sungetc();
+        if (this->_S_eof(__tmp))
+          this->setstate(ios_base::badbit);
+      }
+      _STLP_CATCH_ALL {
+        this->_M_handle_exception(ios_base::badbit);
+      }
+    } else
+      this->setstate(ios_base::badbit);    
+  }
+  else
+    this->setstate(ios_base::failbit);
+
+  return *this;
+}
+
+// Positioning and buffer control.
+
+template <class _CharT, class _Traits>
+int basic_istream<_CharT, _Traits>::sync() {
+  sentry __sentry(*this, _No_Skip_WS());
+
+  basic_streambuf<_CharT, _Traits>* __buf = this->rdbuf();
+  if (__buf) {
+    if (__buf->pubsync() == -1) {
+      this->setstate(ios_base::badbit);
+      return -1;
+    }
+    else
+      return 0;
+  }
+  else
+    return -1;
+}
+
+template <class _CharT, class _Traits>
+__BIS_pos_type__
+basic_istream<_CharT, _Traits>::tellg() {
+  //   sentry __sentry(*this, _No_Skip_WS());
+  basic_streambuf<_CharT, _Traits>* __buf = this->rdbuf();
+  return (__buf && !this->fail()) ? __buf->pubseekoff(0, ios_base::cur, ios_base::in)
+    : pos_type(-1);
+}
+
+template <class _CharT, class _Traits>
+basic_istream<_CharT, _Traits>&
+basic_istream<_CharT, _Traits>::seekg(pos_type __pos) {
+  sentry __sentry(*this, _No_Skip_WS());
+
+  basic_streambuf<_CharT, _Traits>* __buf = this->rdbuf();
+  if (!this->fail() && __buf)
+    __buf->pubseekpos(__pos, ios_base::in);
+  return *this;
+}
+
+template <class _CharT, class _Traits>
+basic_istream<_CharT, _Traits>&
+basic_istream<_CharT, _Traits>::seekg(off_type __off, ios_base::seekdir __dir)
+{
+  sentry __sentry(*this, _No_Skip_WS());
+
+  basic_streambuf<_CharT, _Traits>* __buf = this->rdbuf();
+  if (!this->fail() && __buf)
+    __buf->pubseekoff(__off, __dir, ios_base::in);
+  return *this;
+}
+
+// Formatted input of characters and character arrays.
+
+template <class _CharT, class _Traits>
+void basic_istream<_CharT, _Traits>::_M_formatted_get(_CharT& __c)
+{
+//  typename _Traits::int_type __tmp = _Traits::eof();
+
+  sentry __sentry(*this); // Skip whitespace.
+
+  if (__sentry) {
+    typename _Traits::int_type __tmp = _Traits::eof();
+    
+    _STLP_TRY {
+      __tmp = this->rdbuf()->sbumpc();
+    }
+    _STLP_CATCH_ALL {
+      this->_M_handle_exception(ios_base::badbit);
+      return;
+    }
+
+    if (!this->_S_eof(__tmp))
+      __c = _Traits::to_char_type(__tmp);
+    else 
+      this->setstate(ios_base::eofbit | ios_base::failbit);
+  }
+}
+
+
+//---------------------------------------------------------------------------
+// istream's helper functions.
+
+// A generic function for unbuffered input.  We stop when we reach EOF,
+// or when we have extracted _Num characters, or when the function object
+// __is_delim return true.  In the last case, it extracts the character
+// for which __is_delim is true, if and only if __extract_delim is true. 
+// It appends a null character to the end of the string; this means that
+// it may store up to _Num + 1 characters.  
+//
+// __is_getline governs two corner cases: reading _Num characters without
+// encountering delim or eof (in which case failbit is set if __is_getline
+// is true); and reading _Num characters where the _Num+1'st character is
+// eof (in which case eofbit is set if __is_getline is true).
+//
+// It is assumed that __is_delim never throws.
+//
+// Return value is the number of characters extracted, including the
+// delimiter if it is extracted.  Note that the number of characaters
+// extracted isn't necessarily the same as the number stored.
+
+template < class _CharT, class _Traits, class _Is_Delim>
+streamsize _STLP_CALL 
+_M_read_unbuffered(basic_istream<_CharT, _Traits>* __that, basic_streambuf<_CharT, _Traits>* __buf,
+                       streamsize _Num, _CharT* __s,
+                       _Is_Delim __is_delim,
+                       bool __extract_delim, bool __append_null,
+                       bool __is_getline)
+{
+  streamsize __n = 0;
+  ios_base::iostate __status = 0;
+  
+  typedef typename basic_istream<_CharT, _Traits>::int_type int_type;
+  // The operations that can potentially throw are sbumpc, snextc, and sgetc.
+  _STLP_TRY {
+# if 0
+    int_type __c = __buf->sgetc();
+    while (true) {
+      if (__that->_S_eof(__c)) {
+        if (__n < _Num || __is_getline)
+          __status |= ios_base::eofbit;
+        break;
+      }
+
+      else if (__is_delim(__c)) {
+        if (__extract_delim) {  // Extract and discard current character.
+          __buf->sbumpc();
+          ++__n;
+        }
+        break;
+      }
+
+      else if (__n == _Num) {
+        if (__is_getline)
+          __status |= ios_base::failbit;
+        break;
+      }
+        
+      *__s++ = _Traits::to_char_type(__c);
+      ++__n;
+      __c = __buf->snextc();
+    }
+# else
+// int_type __c = __buf->sbumpc(); // __buf->sgetc();
+while (true) {
+
+int_type __c = __buf->sbumpc(); // sschwarz
+
+if (__that->_S_eof(__c)) {
+if (__n < _Num || __is_getline)
+__status |= ios_base::eofbit;
+break;
+}
+
+else if (__is_delim(__c)) {
+if (__extract_delim) { // Extract and discard current character.
+// __buf->sbumpc();
+++__n;
+}
+break;
+}
+
+else { // regular character
+
+*__s++ = _Traits::to_char_type(__c);
+++__n;
+
+}
+
+if (__n == _Num) {
+if (__is_getline) // didn't find delimiter as one of the _Num chars
+__status |= ios_base::failbit;
+break;
+}
+
+// *__s++ = _Traits::to_char_type(__c);
+// ++__n;
+
+}
+
+# endif
+
+  }
+  _STLP_CATCH_ALL {
+    __that->_M_handle_exception(ios_base::badbit);
+    *__s = _STLP_DEFAULT_CONSTRUCTED(_CharT);
+    return __n;
+  }
+
+  if (__append_null)
+    *__s =  _STLP_DEFAULT_CONSTRUCTED(_CharT);
+  if (__status)
+    __that->setstate(__status);    // This might throw.
+  return __n;
+}
+
+// Much like _M_read_unbuffered, but with one additional function object:
+// __scan_delim(first, last) returns the first pointer p in [first, last)
+// such that __is_delim(p) is true.  
+
+template < class _CharT, class _Traits, class _Is_Delim, class _Scan_Delim>
+streamsize _STLP_CALL 
+_M_read_buffered(basic_istream<_CharT, _Traits>* __that, basic_streambuf<_CharT, _Traits>* __buf,
+                     streamsize _Num, _CharT* __s,
+                     _Is_Delim __is_delim, _Scan_Delim __scan_delim,
+                     bool __extract_delim, bool __append_null,
+                     bool __is_getline)
+{
+  streamsize __n = 0;
+  ios_base::iostate __status = 0;
+  bool __done    = false;
+
+  _STLP_TRY {
+    while (__buf->_M_egptr() != __buf->_M_gptr() && !__done) {
+      const _CharT* __first = __buf->_M_gptr();
+      const _CharT* __last  = __buf->_M_egptr();
+      ptrdiff_t __request = _Num - __n;
+
+      const _CharT* __p  = __scan_delim(__first, __last);
+      ptrdiff_t __chunk = (min) (ptrdiff_t(__p - __first), __request);
+      _Traits::copy(__s, __first, __chunk);
+      __s += __chunk;
+      __n += __chunk;
+      __buf->_M_gbump((int)__chunk);
+
+      // We terminated by finding delim.
+      if (__p != __last && __p - __first <= __request) {
+        if (__extract_delim) {
+          __n += 1;
+          __buf->_M_gbump(1);
+        }
+        __done = true;
+      }
+
+      // We terminated by reading all the characters we were asked for.
+      else if(__n == _Num) {
+
+        // Find out if we have reached eof.  This matters for getline.
+        if (__is_getline) {
+          if (__chunk == __last - __first) {
+            if (__that->_S_eof(__buf->sgetc()))
+              __status |= ios_base::eofbit;            
+          }
+          else
+            __status |= ios_base::failbit;
+        }
+        __done   = true;
+      }
+
+      // The buffer contained fewer than _Num - __n characters.  Either we're
+      // at eof, or we should refill the buffer and try again.
+      else {
+	if (__that->_S_eof(__buf->sgetc())) {
+          __status |= ios_base::eofbit;
+          __done = true;
+        }
+      }
+    } // Close the while loop.
+  }
+  _STLP_CATCH_ALL {
+    __that->_M_handle_exception(ios_base::badbit);
+    __done = true;
+  }
+
+  if (__done) {
+    if (__append_null)
+        *__s =  _STLP_DEFAULT_CONSTRUCTED(_CharT);
+    if (__status != 0)
+      __that->setstate(__status);   // This might throw.
+    return __n;
+  }
+
+  // If execution has reached this point, then we have an empty buffer but
+  // we have not reached eof.  What that means is that the streambuf has
+  // decided to switch from buffered to unbuffered input.  We switch to
+  // to _M_read_unbuffered.
+
+  return __n + _M_read_unbuffered(__that,  __buf, _Num - __n, __s, __is_delim,
+                                  __extract_delim,__append_null,__is_getline);
+}
+
+
+
+
+template <class _CharT, class _Traits>
+basic_istream<_CharT, _Traits>&
+basic_istream<_CharT, _Traits>::get(_CharT* __s, streamsize __n,
+                                    _CharT __delim) {
+  sentry __sentry(*this, _No_Skip_WS());
+  this->_M_gcount = 0;
+
+  if (__sentry) {
+    if (__n > 0) {
+      basic_streambuf<_CharT, _Traits>* __buf = this->rdbuf();
+
+      if (__buf->egptr() != __buf->gptr())
+        this->_M_gcount =
+          _M_read_buffered(this,  __buf, __n - 1, __s,
+                           _Eq_char_bound<_Traits>(__delim),
+                           _Scan_for_char_val<_Traits>(__delim),
+                           false, true, false);
+      else
+        this->_M_gcount =
+          _M_read_unbuffered(this,  __buf, __n - 1, __s,
+                             _Eq_char_bound<_Traits>(__delim),
+                             false, true, false);
+    }
+  }
+
+  if (this->_M_gcount == 0)
+    this->setstate(ios_base::failbit);
+
+  return *this;
+}
+
+// Getline is essentially identical to get, except that it extracts
+// the delimiter.
+template <class _CharT, class _Traits>
+basic_istream<_CharT, _Traits>&
+basic_istream<_CharT, _Traits>::getline(_CharT* __s, streamsize __n,
+                                        _CharT __delim) {
+  sentry __sentry(*this, _No_Skip_WS());
+  this->_M_gcount = 0;
+
+  if (__sentry) {
+    if (__n > 0) {
+      basic_streambuf<_CharT, _Traits>* __buf = this->rdbuf();
+      this->_M_gcount = __buf->egptr() != __buf->gptr()
+        ? _M_read_buffered(this,  __buf, __n - 1, __s,
+                           _Eq_char_bound<_Traits>(__delim),
+                           _Scan_for_char_val<_Traits>(__delim),
+                           true, true, true)
+        : _M_read_unbuffered(this,  __buf, __n - 1, __s,
+                             _Eq_char_bound<_Traits>(__delim),
+                             true, true, true);
+    }
+  }
+
+  if (this->_M_gcount == 0)
+    this->setstate(ios_base::failbit);
+
+  return *this;
+}
+
+// Read n characters.  We don't look for any delimiter, and we don't
+// put in a terminating null character.
+template <class _CharT, class _Traits>
+basic_istream<_CharT, _Traits>&
+basic_istream<_CharT, _Traits>::read(char_type* __s, streamsize __n)
+{
+  sentry __sentry(*this, _No_Skip_WS());
+  this->_M_gcount = 0;
+
+  if (__sentry && !this->eof()) {
+    basic_streambuf<_CharT, _Traits>*__buf = this->rdbuf();
+    if (__buf->gptr() != __buf->egptr()) 
+      _M_gcount
+        = _M_read_buffered(this,  __buf, __n, __s,
+                           _Constant_unary_fun<bool, int_type>(false),
+                           _Project2nd<const _CharT*, const _CharT*>(),
+                           false, false, false);
+    else
+      _M_gcount
+        = _M_read_unbuffered(this,  __buf, __n, __s,
+                             _Constant_unary_fun<bool, int_type>(false),
+                             false, false, false);
+  }
+  else
+    this->setstate(ios_base::failbit);
+
+  if (this->eof())
+    this->setstate(ios_base::eofbit | ios_base::failbit);
+
+  return *this;
+}
+
+
+// Read n or fewer characters.  We don't look for any delimiter, and
+// we don't put in a terminating null character.
+template <class _CharT, class _Traits>
+streamsize
+basic_istream<_CharT, _Traits>::readsome(char_type* __s, streamsize __nmax)
+{
+  sentry __sentry(*this, _No_Skip_WS());
+  this->_M_gcount = 0;
+
+  if (__sentry && !this->eof() && __nmax >= 0) {
+
+    basic_streambuf<_CharT, _Traits>* __buf = this->rdbuf();
+    streamsize __avail = __buf->in_avail();
+
+    // fbp : isn't full-blown setstate required here ?
+    if (__avail == -1)
+      this->_M_setstate_nothrow(ios_base::eofbit);
+
+    else if (__avail != 0) {
+
+      if (__buf->gptr() != __buf->egptr()) 
+        _M_gcount
+          = _M_read_buffered(this,  __buf, (min) (__avail, __nmax), __s,
+                             _Constant_unary_fun<bool, int_type>(false),
+                             _Project2nd<const _CharT*, const _CharT*>(),
+                             false, false, false);
+      else
+        _M_gcount
+          = _M_read_unbuffered(this,  __buf, (min) (__avail, __nmax), __s,
+                               _Constant_unary_fun<bool, int_type>(false),
+                               false, false, false);
+    }
+  }
+  else {
+    // fbp : changed so that failbit is set only there, to pass Dietmar's test
+    if (this->eof())
+      this->setstate(ios_base::eofbit | ios_base::failbit);
+    else
+      this->setstate(ios_base::failbit);
+  }
+
+  //  if (this->eof())
+  //    this->setstate(ios_base::eofbit | ios_base::failbit);
+  
+  return _M_gcount;
+}
+
+template <class _CharT, class _Traits>
+void basic_istream<_CharT, _Traits>::_M_formatted_get(_CharT* __s)
+{
+  sentry __sentry(*this); // Skip whitespace.
+
+  if (__sentry) {
+    basic_streambuf<_CharT, _Traits>* __buf = this->rdbuf();
+    streamsize __nmax = this->width() > 0
+      ? this->width() - 1
+      : (numeric_limits<streamsize>::max)() / sizeof(_CharT) - 1;
+
+    streamsize __n = __buf->gptr() != __buf->egptr()
+      ? _M_read_buffered(this,  __buf, __nmax, __s,
+                         _Is_wspace_null<_Traits>((const ctype<_CharT>*)this->_M_ctype_facet()),
+                         _Scan_wspace_null<_Traits>((const ctype<_CharT>*)this->_M_ctype_facet()),
+			 false, true, false)
+      : _M_read_unbuffered(this,  __buf, __nmax, __s,
+                           _Is_wspace_null<_Traits>((const ctype<_CharT>*)this->_M_ctype_facet()),
+			   false, true, false);
+    if (__n == 0)
+      this->setstate(ios_base::failbit);
+  }
+  this->width(0);
+}
+
+// A generic unbuffered function for ignoring characters.  We stop
+// when we reach EOF, or when the function object __is_delim returns
+// true.  In the last case, it extracts the character for which
+// __is_delim is true, if and only if __extract_delim is true.
+
+template < class _CharT, class _Traits, class _Is_Delim>
+void _STLP_CALL 
+_M_ignore_unbuffered(basic_istream<_CharT, _Traits>* __that, 
+		     basic_streambuf<_CharT, _Traits>* __buf,
+		     _Is_Delim __is_delim,
+		     bool __extract_delim, bool __set_failbit)
+{
+  bool __done = false;
+  ios_base::iostate __status = 0;
+  typedef typename basic_istream<_CharT, _Traits>::int_type int_type;
+
+  _STLP_TRY {
+    while (!__done) {
+      int_type __c = __buf->sbumpc();
+
+      if (__that->_S_eof(__c)) {
+        __done = true;
+        __status |= __set_failbit ? ios_base::eofbit | ios_base::failbit
+                                  : ios_base::eofbit;
+      }
+
+      else if (__is_delim(__c)) {
+        __done = true;
+        if (!__extract_delim)
+          if (__that->_S_eof(__buf->sputbackc(_Traits::to_char_type(__c))))
+            __status |= ios_base::failbit;
+      }
+    }
+  }
+  _STLP_CATCH_ALL {
+    __that->_M_handle_exception(ios_base::badbit);
+  }
+
+  __that->setstate(__status);
+}
+
+// A generic buffered function for ignoring characters.  Much like
+// _M_ignore_unbuffered, but with one additional function object:
+// __scan_delim(first, last) returns the first pointer p in [first,
+// last) such that __is_delim(p) is true.
+
+template < class _CharT, class _Traits, class _Is_Delim, class _Scan_Delim>
+void _STLP_CALL 
+_M_ignore_buffered(basic_istream<_CharT, _Traits>* __that, 
+		   basic_streambuf<_CharT, _Traits>* __buf,
+		   _Is_Delim __is_delim, _Scan_Delim __scan_delim,
+		   bool __extract_delim, bool __set_failbit)
+{
+  bool __at_eof      = false;
+  bool __found_delim = false;
+
+  _STLP_TRY {
+    while (__buf->_M_egptr() != __buf->_M_gptr() && !__at_eof && !__found_delim) {
+      const _CharT* __p = __scan_delim(__buf->_M_gptr(), __buf->_M_egptr());
+      __buf->_M_gbump((int)(__p - __buf->_M_gptr()));
+    
+      if (__p != __buf->_M_egptr()) { // We found delim, so we're done.
+        if (__extract_delim)
+          __buf->_M_gbump(1);
+        __found_delim = true;
+      }
+
+      else                         // No delim.  Try to refil the buffer.
+        __at_eof = __that->_S_eof(__buf->sgetc());
+    }                              // Close the while loop.
+  }
+  _STLP_CATCH_ALL {
+    __that->_M_handle_exception(ios_base::badbit);
+    return;
+  }
+
+  if (__at_eof) {
+    __that->setstate(__set_failbit ? ios_base::eofbit | ios_base::failbit
+                                   : ios_base::eofbit);
+    return;
+  }
+  if (__found_delim)
+    return;
+
+  // If execution has reached this point, then we have an empty buffer but
+  // we have not reached eof.  What that means is that the streambuf has
+  // decided to switch from a buffered to an unbuffered mode.  We switch 
+  // to _M_ignore_unbuffered.
+  _M_ignore_unbuffered(__that,  __buf, __is_delim, __extract_delim, __set_failbit);
+}
+
+// Overloaded versions of _M_ignore_unbuffered and _M_ignore_unbuffered 
+// with an explicit count _Num.  Return value is the number of
+// characters extracted.
+//
+// The function object __max_chars takes two arguments, _Num and __n
+// (the latter being the number of characters we have already read), 
+// and returns the maximum number of characters to read from the buffer.
+// We parameterize _M_ignore_buffered so that we can use it for both
+// bounded and unbounded input; for the former the function object should
+// be minus<>, and for the latter it should return a constant maximum value.
+
+template < class _CharT, class _Traits, class _Max_Chars, class _Is_Delim>
+streamsize _STLP_CALL 
+_M_ignore_unbuffered(basic_istream<_CharT, _Traits>* __that,
+		     basic_streambuf<_CharT, _Traits>* __buf,
+		     streamsize _Num, _Max_Chars __max_chars,
+		     _Is_Delim __is_delim,
+		     bool __extract_delim, bool __set_failbit)
+{
+  streamsize __n = 0;
+  ios_base::iostate __status = 0;
+  typedef typename basic_istream<_CharT, _Traits>::int_type int_type;
+  
+  _STLP_TRY {
+    while (__max_chars(_Num, __n) > 0) {
+      int_type __c = __buf->sbumpc();
+      
+      if (__that->_S_eof(__c)) {
+        __status |= __set_failbit ? ios_base::eofbit | ios_base::failbit
+                                  : ios_base::eofbit;
+        break;
+      }
+
+      else if (__is_delim(__c)) {
+        if (__extract_delim)
+          ++__n;
+        else if (__that->_S_eof(__buf->sputbackc(_Traits::to_char_type(__c))))
+          __status |= ios_base::failbit;
+
+        break;
+      }
+      // fbp : added counter increment to pass Dietmar's test
+      ++__n;
+    }
+  }
+  _STLP_CATCH_ALL {
+    __that->_M_handle_exception(ios_base::badbit);
+  }
+
+  if (__status)
+    __that->setstate(__status);   // This might throw.
+  return __n;
+}
+
+template < class _CharT, class _Traits, class _Max_Chars, class _Is_Delim, class _Scan_Delim>
+streamsize _STLP_CALL 
+_M_ignore_buffered(basic_istream<_CharT, _Traits>* __that,
+		   basic_streambuf<_CharT, _Traits>* __buf,
+		   streamsize _Num,
+		   _Max_Chars __max_chars,
+		   _Is_Delim __is_delim, _Scan_Delim __scan_delim,
+		   bool __extract_delim, bool __set_failbit)
+{
+  streamsize __n = 0;
+  bool __at_eof = false;
+  bool __done   = false;
+
+  _STLP_TRY {
+    while (__buf->_M_egptr() != __buf->_M_gptr() && !__done) {
+      ptrdiff_t __avail = __buf->_M_egptr() - __buf->_M_gptr();
+      streamsize __m = __max_chars(_Num, __n);
+    
+      if (__avail >= __m) {       // We have more characters than we need.
+        const _CharT* __last = __buf->_M_gptr() + __m;
+        const _CharT* __p = __scan_delim(__buf->_M_gptr(), __last);
+        ptrdiff_t __chunk = __p - __buf->_M_gptr();
+        __n += __chunk;
+        __buf->_M_gbump((int)__chunk);
+
+        if (__extract_delim && __p != __last) {
+          __n += 1;
+          __buf->_M_gbump(1);
+        }
+
+        __done = true;
+      }
+
+      else {
+        const _CharT* __p = __scan_delim(__buf->_M_gptr(), __buf->_M_egptr());
+        ptrdiff_t __chunk = __p - __buf->_M_gptr();
+        __n += __chunk;
+        __buf->_M_gbump((int)__chunk);
+
+        if (__p != __buf->_M_egptr()) { // We found delim.
+          if (__extract_delim) {
+            __n += 1;
+            __buf->_M_gbump(1);
+          }
+
+          __done = true;
+        }
+
+        // We didn't find delim.  Try to refill the buffer.
+        else if (__that->_S_eof(__buf->sgetc())) {
+          __done   = true;
+          __at_eof = true;
+        } 
+      }
+    } // Close the while loop.
+  }
+  _STLP_CATCH_ALL {
+    __that->_M_handle_exception(ios_base::badbit);
+    return __n;
+  }
+
+  if (__at_eof)
+    __that->setstate(__set_failbit ? ios_base::eofbit | ios_base::failbit
+                                   : ios_base::eofbit);
+
+  if (__done)
+    return __n;
+
+  // If execution has reached this point, then we have an empty buffer but
+  // we have not reached eof.  What that means is that the streambuf has
+  // decided to switch from buffered to unbuffered input.  We switch to
+  // to _M_ignore_unbuffered.
+
+  return __n + _M_ignore_unbuffered( __that,  __buf, _Num, __max_chars,
+                                    __is_delim, __extract_delim, __set_failbit);
+}
+
+
+template <class _CharT, class _Traits>
+basic_istream<_CharT, _Traits>&
+basic_istream<_CharT, _Traits>::ignore(streamsize __n)
+{
+  sentry __sentry(*this, _No_Skip_WS());
+  this->_M_gcount = 0;
+
+  if (__sentry) {
+    basic_streambuf<_CharT, _Traits>* __buf = this->rdbuf();
+    typedef _Constant_unary_fun<bool, int_type> _Const_bool;
+    typedef _Constant_binary_fun<streamsize, streamsize, streamsize>
+      _Const_streamsize;
+    const streamsize __maxss = (numeric_limits<streamsize>::max)();
+
+    if (__n == (numeric_limits<int>::max)()) {
+      if (__buf->gptr() != __buf->egptr())
+        _M_gcount
+          = _M_ignore_buffered(this,  __buf,
+                               __maxss, _Const_streamsize(__maxss),
+                               _Const_bool(false),
+                               _Project2nd<const _CharT*, const _CharT*>(),
+                               false, false);
+      else
+        _M_gcount = _M_ignore_unbuffered(this,  __buf,
+                                         __maxss, _Const_streamsize(__maxss),
+                                         _Const_bool(false), false, false);
+    }
+    else {
+      if (__buf->gptr() != __buf->egptr())
+        _M_gcount
+          = _M_ignore_buffered(this,  __buf,
+                               __n, minus<streamsize>(),
+                               _Const_bool(false),
+                               _Project2nd<const _CharT*, const _CharT*>(),
+                               false, false);
+      else
+        _M_gcount = _M_ignore_unbuffered(this,  __buf, __n, minus<streamsize>(),
+                                         _Const_bool(false), false, false);
+    }
+  }
+
+  return *this;
+}
+
+template <class _CharT, class _Traits>
+basic_istream<_CharT, _Traits>&
+basic_istream<_CharT, _Traits>::ignore(streamsize __n, int_type __delim)
+{
+  sentry __sentry(*this, _No_Skip_WS());
+  this->_M_gcount = 0;
+
+  if (__sentry) {
+    basic_streambuf<_CharT, _Traits>* __buf = this->rdbuf();
+    typedef _Constant_unary_fun<bool, int_type> _Const_bool;
+    typedef _Constant_binary_fun<streamsize, streamsize, streamsize>
+      _Const_streamsize;
+    const streamsize __maxss = (numeric_limits<streamsize>::max)();
+
+    if (__n == (numeric_limits<int>::max)()) {
+      if (__buf->gptr() != __buf->egptr())
+        _M_gcount = _M_ignore_buffered(this,  __buf,
+                                       __maxss, _Const_streamsize(__maxss),
+                                       _Eq_int_bound<_Traits>(__delim),
+                                       _Scan_for_int_val<_Traits>(__delim),
+                                       true, false);
+      else
+        _M_gcount = _M_ignore_unbuffered(this,  __buf,
+                                         __maxss, _Const_streamsize(__maxss),
+                                         _Eq_int_bound<_Traits>(__delim),
+                                         true, false);
+    }
+    else {
+      if (__buf->gptr() != __buf->egptr())
+        _M_gcount = _M_ignore_buffered(this,  __buf,
+                                       __n, minus<streamsize>(),
+                                       _Eq_int_bound<_Traits>(
+                                               __delim),
+                                       _Scan_for_int_val<_Traits>(__delim),
+                                       true, false);
+      else
+        _M_gcount = _M_ignore_unbuffered(this,  __buf, __n, minus<streamsize>(),
+                                         _Eq_int_bound<_Traits>(__delim),
+                                         true, false);
+    }
+  }
+
+  return *this;
+}
+
+// This member function does not construct a sentry object, because
+// it is called from sentry's constructor.  
+template <class _CharT, class _Traits>
+void basic_istream<_CharT, _Traits>::_M_skip_whitespace(bool __set_failbit)
+{
+  basic_streambuf<_CharT, _Traits>* __buf = this->rdbuf();
+  if (!__buf)
+    this->setstate(ios_base::badbit);
+  else if (__buf->gptr() != __buf->egptr())
+    _M_ignore_buffered(this,  __buf,
+                       _Is_not_wspace<_Traits>((const ctype<_CharT>*)this->_M_ctype_facet()),
+                       _Scan_for_not_wspace<_Traits>((const ctype<_CharT>*)this->_M_ctype_facet()),
+                       false, __set_failbit);
+  else
+    _M_ignore_unbuffered(this,  __buf,
+                         _Is_not_wspace<_Traits>((const ctype<_CharT>*)this->_M_ctype_facet()),
+                         false, __set_failbit);
+}
+
+
+// This is a very simple loop that reads characters from __src and puts
+// them into __dest.  It looks complicated because of the (standard-
+// mandated) exception handling policy.
+//
+// We stop when we get an exception, when we fail to insert into the 
+// output streambuf, or when __is_delim is true.
+
+template < class _CharT, class _Traits, class _Is_Delim>
+streamsize _STLP_CALL 
+_M_copy_unbuffered( basic_istream<_CharT, _Traits>* __that, basic_streambuf<_CharT, _Traits>* __src,
+		    basic_streambuf<_CharT, _Traits>* __dest,
+		    _Is_Delim __is_delim,
+		    bool __extract_delim, bool __rethrow)
+{
+  streamsize __extracted = 0;
+  ios_base::iostate __status = 0;
+  typedef typename basic_istream<_CharT, _Traits>::int_type int_type;
+  int_type __c;
+
+  _STLP_TRY {
+  
+    while (true) {
+  
+      // Get a character. If there's an exception, catch and (maybe) rethrow it.
+      __c = __src->sbumpc();
+      
+      // If we failed to get a character, then quit.
+      if (__that->_S_eof(__c)) {
+        __status |= ios_base::eofbit;
+        break;
+      }  
+      // If it's the delimiter, then quit.
+      else if (__is_delim(__c)) {
+        if (!__extract_delim && !__pushback(__src, _Traits::to_char_type(__c)))
+          __status |= ios_base::failbit;
+        break;
+      }
+      
+      else {
+      
+        // Try to put the character in the output streambuf.
+        bool __failed = false;
+        _STLP_TRY {
+          if (!__that->_S_eof(__dest->sputc(__c)))
+            ++__extracted;
+          else
+            __failed = true;
+        }
+        _STLP_CATCH_ALL {
+          __failed = true;
+        }
+        
+        // If we failed to put the character in the output streambuf, then
+        // try to push it back to the input streambuf.
+        if (__failed && !__pushback(__src, _Traits::to_char_type(__c)))
+          __status |= ios_base::failbit;
+
+        // fbp : avoiding infinite loop in io-27-6-1-2-3.exp 
+        if (__failed)
+          break;
+      }
+
+    } /* while (true) */
+    
+  }
+  // fbp : this try/catch moved here in reasonable assumption
+  // __is_delim never throw (__pushback is guaranteed not to)
+  _STLP_CATCH_ALL {
+    // See 27.6.1.2.3, paragraph 13.
+    if (__rethrow && __extracted == 0)
+      __that->_M_handle_exception(ios_base::failbit);
+  }
+  __that->setstate(__status);
+  return __extracted;
+}
+      
+// Buffered copying from one streambuf to another.  We copy the characters
+// in chunks, rather than one at a time.  We still have to worry about all
+// of the error conditions we checked in _M_copy_unbuffered, plus one more:
+// the streambuf might decide to switch from a buffered to an unbuffered mode.
+
+template < class _CharT, class _Traits, class _Is_Delim, class _Scan_Delim>
+streamsize _STLP_CALL 
+_M_copy_buffered(basic_istream<_CharT, _Traits>* __that, basic_streambuf<_CharT, _Traits>* __src,
+                     basic_streambuf<_CharT, _Traits>* __dest,
+                     _Scan_Delim __scan_delim, _Is_Delim __is_delim,
+                     bool __extract_delim, bool __rethrow)
+{
+  streamsize __extracted = 0;
+  ios_base::iostate __status = 0;
+  typedef typename basic_istream<_CharT, _Traits>::int_type int_type;
+  int_type __c = _Traits::eof();
+  _CharT* __first = __src->_M_gptr();
+  ptrdiff_t __avail = __src->_M_egptr() - __first;
+  // fbp : introduced to move catch/try blocks out of the loop
+  bool __do_handle_exceptions;
+
+  _STLP_TRY {
+    while (true) {
+      __do_handle_exceptions = false ;
+      const _CharT* __last = __scan_delim(__first, __src->_M_egptr());
+      
+      // Try to copy the entire input buffer to the output buffer.
+      streamsize __n = __dest->sputn(__first, __extract_delim && __last != __src->_M_egptr()
+                                     ? (__last - __first) + 1
+                                     : (__last - __first));
+      __src->_M_gbump((int)__n);
+      __extracted += __n;
+      
+      // from this on, catch() will call _M_handle_exceptions()
+      __do_handle_exceptions = true;
+      
+      if (__n < __avail)          // We found the delimiter, or else failed to
+        break;                    // copy some characters.
+      
+      __c = __src->sgetc();
+
+      // Three possibilities: we succeeded in refilling the buffer, or 
+      // we got EOF, or the streambuf has switched to unbuffered mode.
+      __first = __src->_M_gptr();
+      __avail = __src->_M_egptr() - __first;
+      
+      if (__avail > 0)
+        {}	// dwa 1/16/00 -- suppress a Metrowerks warning
+      else if (__that->_S_eof(__c)) {
+        __status |= ios_base::eofbit;
+        break;
+      }
+      else 
+        return __extracted + _M_copy_unbuffered(__that,  __src, __dest, __is_delim,
+                                                __extract_delim, __rethrow);
+    } /* while */
+  }
+  
+  _STLP_CATCH_ALL {
+    // See 27.6.1.2.3, paragraph 13.
+    if (__rethrow && __do_handle_exceptions &&  __extracted == 0)
+      __that->_M_handle_exception(ios_base::failbit);
+  }
+  
+  if (__status)
+    __that->setstate(__status);   // This might throw.
+  return __extracted;
+} 
+
+
+
+template <class _CharT, class _Traits>
+basic_istream<_CharT, _Traits>& 
+basic_istream<_CharT, _Traits>
+  ::get(basic_streambuf<_CharT, _Traits>& __dest, _CharT __delim)
+{
+  sentry __sentry(*this, _No_Skip_WS());
+  this->_M_gcount = 0;
+
+  if (__sentry) {
+    basic_streambuf<_CharT, _Traits>* __src = this->rdbuf();
+
+    if (__src)
+      this->_M_gcount = __src->egptr() != __src->gptr()
+        ? _M_copy_buffered(this,  __src, &__dest,
+                           _Scan_for_char_val<_Traits>(__delim),
+                           _Eq_char_bound<_Traits>(__delim),
+                           false, false)
+        : _M_copy_unbuffered(this,  __src, &__dest,
+                             _Eq_char_bound<_Traits>(__delim),
+                             false, false);
+  }
+
+  if (this->_M_gcount == 0)
+    this->setstate(ios_base::failbit);
+
+  return *this;
+}
+
+// Copying characters into a streambuf.
+template <class _CharT, class _Traits> 
+basic_istream<_CharT, _Traits>& 
+basic_istream<_CharT, _Traits>
+  ::operator>>(basic_streambuf<_CharT, _Traits>* __dest)
+{
+  streamsize __n = 0;
+  typedef typename basic_istream<_CharT, _Traits>::sentry _Sentry;
+  _Sentry __sentry(*this);
+  if (__sentry) {
+    basic_streambuf<_CharT, _Traits>* __src = this->rdbuf();
+    if (__src && __dest)
+      __n = __src->egptr() != __src->gptr()
+        ? _M_copy_buffered(this,  __src, __dest,
+                           _Project2nd<const _CharT*, const _CharT*>(),
+                           _Constant_unary_fun<bool, int_type>(false),
+                           false, true)
+        : _M_copy_unbuffered(this,  __src, __dest,
+                             _Constant_unary_fun<bool, int_type>(false),
+                             false, true);
+  }
+
+  if (__n == 0)
+    this->setstate(ios_base::failbit);
+  
+  return *this;
+}
+
+// ----------------------------------------------------------------
+// basic_iostream<> class 
+// ----------------------------------------------------------------
+
+template <class _CharT, class _Traits>
+basic_iostream<_CharT, _Traits>
+  ::basic_iostream(basic_streambuf<_CharT, _Traits>* __buf)
+    : basic_ios<_CharT, _Traits>(),
+      basic_istream<_CharT, _Traits>(__buf),
+      basic_ostream<_CharT, _Traits>(__buf)
+{
+  this->init(__buf);
+}
+
+template <class _CharT, class _Traits>
+basic_iostream<_CharT, _Traits>::~basic_iostream()
+{}
+
+_STLP_END_NAMESPACE
+
+# undef __BIS_int_type__
+# undef __BIS_pos_type__
+# undef __BIS_off_type__
+
+# endif /* defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION) */
+
+#endif /* _STLP_ISTREAM_C */
diff --git a/main/source/stlport/stlport/stl/_istream.h b/main/source/stlport/stlport/stl/_istream.h
new file mode 100644
index 00000000..a221f7f6
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_istream.h
@@ -0,0 +1,344 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+#ifndef _STLP_INTERNAL_ISTREAM_H
+#define _STLP_INTERNAL_ISTREAM_H
+
+// this block is included by _ostream.h, we include it here to lower #include level
+# if defined (_STLP_HAS_WCHAR_T) && !defined (_STLP_CWCHAR_H)
+#  include <stl/_cwchar.h>
+# endif
+
+# ifndef _STLP_INTERNAL_IOS_H
+#  include <stl/_ios.h>                  // For basic_ios<>.  Includes <iosfwd>.
+# endif
+
+#ifndef _STLP_INTERNAL_OSTREAM_H
+# include <stl/_ostream.h>              // Needed as a base class of basic_iostream.
+#endif
+
+#ifndef _STLP_INTERNAL_ISTREAMBUF_ITERATOR_H
+# include <stl/_istreambuf_iterator.h>
+#endif
+
+#include <stl/_ctraits_fns.h>    // Helper functions that allow char traits
+                                // to be used as function objects.
+_STLP_BEGIN_NAMESPACE
+
+template <class _CharT, class _Traits, class _Number> 
+ios_base::iostate _STLP_CALL
+_M_get_num(basic_istream<_CharT, _Traits>& __that, _Number& __val);
+
+#if defined (_STLP_USE_TEMPLATE_EXPORT)
+template <class _CharT, class _Traits>
+class _Isentry;
+#endif
+
+struct _No_Skip_WS {};        // Dummy class used by sentry.
+
+template <class _CharT, class _Traits>
+bool _M_init_skip(basic_istream<_CharT, _Traits>& __is);
+template <class _CharT, class _Traits>
+bool _M_init_noskip(basic_istream<_CharT, _Traits>& __is);
+
+//----------------------------------------------------------------------
+// Class basic_istream, a class that performs formatted input through
+// a stream buffer.
+
+// The second template parameter, _Traits, defaults to char_traits<_CharT>.
+// The default is declared in header <iosfwd>, and it isn't declared here
+// because C++ language rules do not allow it to be declared twice. 
+
+template <class _CharT, class _Traits>
+class basic_istream : virtual public basic_ios<_CharT, _Traits> {
+public:
+                         // Types
+  typedef _CharT                     char_type;
+  typedef typename _Traits::int_type int_type;
+  typedef typename _Traits::pos_type pos_type;
+  typedef typename _Traits::off_type off_type;
+  typedef _Traits                    traits_type;
+  typedef basic_ios<_CharT, _Traits>     _Basic_ios;
+  typedef basic_istream<_CharT, _Traits> _Self;
+
+  typedef basic_ios<_CharT, _Traits>& (_STLP_CALL *__ios_fn)(basic_ios<_CharT, _Traits>&);
+  typedef ios_base& (_STLP_CALL *__ios_base_fn)(ios_base&);
+  typedef _Self& (_STLP_CALL *__istream_fn)(_Self&);
+
+public:                         // Constructor and destructor.
+  explicit basic_istream(basic_streambuf<_CharT, _Traits>* __buf) :
+    basic_ios<_CharT, _Traits>(), _M_gcount(0) {
+    this->init(__buf);
+  }
+  ~basic_istream() {};
+
+public:                         // Nested sentry class.
+
+public:                         // Hooks for manipulators.  The arguments are
+                                // function pointers.
+  _Self& operator>> (__istream_fn __f) { return __f(*this); }
+  _Self& operator>> (__ios_fn __f) {  __f(*this); return *this; }
+  _Self& operator>> (__ios_base_fn __f) { __f(*this); return *this; }
+
+public:                         // Formatted input of numbers.
+  _Self& operator>> (short& __val) {
+    long __lval;
+    unsigned short __uval;
+   _M_get_num(*this, __lval);
+    __val = __STATIC_CAST(short, __lval);
+    __uval = __lval;
+    // check if we lose digits
+    //    if ((__val != __lval) && ((unsigned short)__val != __lval))
+    if ((__val != __lval) && ((long)__uval != __lval))
+      this->setstate(ios_base::failbit); 
+    return *this; 
+  }
+  _Self& operator>> (int& __val) { 
+    long __lval;
+    unsigned int __uval;
+    _M_get_num(*this, __lval);
+    __val = __lval;
+    __uval = __lval;
+    // check if we lose digits
+    //    if ((__val != __lval) && ((unsigned int)__val != __lval))
+    if ((__val != __lval) && ((long)__uval != __lval))
+      this->setstate(ios_base::failbit); 
+    return *this;
+  }
+  _Self& operator>> (unsigned short& __val) { _M_get_num(*this, __val); return *this; }
+  _Self& operator>> (unsigned int& __val) { _M_get_num(*this, __val); return *this; }
+  _Self& operator>> (long& __val) { _M_get_num(*this, __val); return *this; }
+  _Self& operator>> (unsigned long& __val) { _M_get_num(*this, __val); return *this; }
+#ifdef _STLP_LONG_LONG
+  _Self& operator>> (_STLP_LONG_LONG& __val) { _M_get_num(*this, __val); return *this; }
+  _Self& operator>> (unsigned _STLP_LONG_LONG& __val) { _M_get_num(*this, __val); return *this; }
+#endif 
+  _Self& operator>> (float& __val)  { _M_get_num(*this, __val); return *this; }
+  _Self& operator>> (double& __val) { _M_get_num(*this, __val); return *this; }
+# ifndef _STLP_NO_LONG_DOUBLE
+  _Self& operator>> (long double& __val) { _M_get_num(*this, __val); return *this; }
+# endif
+# ifndef _STLP_NO_BOOL
+  _Self& operator>> (bool& __val) { _M_get_num(*this, __val); return *this; }
+# endif
+  _Self& operator>> (void*& __val) { _M_get_num(*this, __val); return *this; }
+
+public:                         // Copying characters into a streambuf.
+  _Self& operator>>(basic_streambuf<_CharT, _Traits>*);
+
+public:                         // Unformatted input.
+  streamsize gcount() const { return _M_gcount; }
+  int_type peek();
+
+public:                         // get() for single characters
+  int_type get();
+  _Self& get(char_type& __c);
+
+public:                         // get() for character arrays.
+  _Self& get(char_type* __s, streamsize __n, char_type __delim);
+  _Self& get(char_type* __s, streamsize __n)
+    { return get(__s, __n, this->widen('\n')); }
+
+public:                         // get() for streambufs
+  _Self& get(basic_streambuf<_CharT, _Traits>& __buf,
+                     char_type __delim);
+  _Self& get(basic_streambuf<_CharT, _Traits>& __buf)
+    { return get(__buf, this->widen('\n')); }
+
+public:                         // getline()
+  _Self& getline(char_type* __s, streamsize __n, char_type delim);
+  _Self& getline(char_type* __s, streamsize __n)
+    { return getline(__s, __n, this->widen('\n')); }
+
+public:                         // read(), readsome(), ignore()
+  _Self& ignore();
+  _Self& ignore(streamsize __n);
+#if (defined (_STLP_MSVC) && _STLP_MSVC < 1200)
+  inline
+#endif
+  _Self& ignore(streamsize __n, int_type __delim);
+
+  _Self& read(char_type* __s, streamsize __n);
+  streamsize readsome(char_type* __s, streamsize __n);
+
+public:                         // putback
+  _Self& putback(char_type __c);
+  _Self& unget();
+
+public:                         // Positioning and buffer control.
+  int sync();
+
+  pos_type tellg();
+  _Self& seekg(pos_type __pos);
+  _Self& seekg(off_type, ios_base::seekdir);
+
+public:                         // Helper functions for non-member extractors.
+  void _M_formatted_get(_CharT& __c);
+  void _M_formatted_get(_CharT* __s);
+  void _M_skip_whitespace(bool __set_failbit);
+
+private:                        // Number of characters extracted by the
+  streamsize _M_gcount;         // most recent unformatted input function.
+
+public:
+
+#if defined (_STLP_USE_TEMPLATE_EXPORT)
+  // If we are using DLL specs, we have not to use inner classes
+  // end class declaration here
+  typedef _Isentry<_CharT, _Traits>      sentry;
+};
+#  define sentry _Isentry
+template <class _CharT, class _Traits>
+class _Isentry {
+  typedef _Isentry<_CharT, _Traits> _Self;
+# else
+  class sentry {
+    typedef sentry _Self;
+#endif
+    
+  private:
+    const bool _M_ok;
+    //    basic_streambuf<_CharT, _Traits>* _M_buf;
+        
+  public:
+    typedef _Traits traits_type;
+    
+    explicit sentry(basic_istream<_CharT, _Traits>& __is,
+                    bool __noskipws = false) : 
+      _M_ok((__noskipws || !(__is.flags() & ios_base::skipws)) ? _M_init_noskip(__is) :  _M_init_skip(__is) )
+      /* , _M_buf(__is.rdbuf()) */
+      {}
+    
+    // Calling this constructor is the same as calling the previous one with 
+    // __noskipws = true, except that it doesn't require a runtime test.
+    sentry(basic_istream<_CharT, _Traits>& __is, _No_Skip_WS) : /* _M_buf(__is.rdbuf()), */
+      _M_ok(_M_init_noskip(__is)) {}
+    
+    ~sentry() {}
+    
+    operator bool() const { return _M_ok; }
+    
+  private:                        // Disable assignment and copy constructor.
+    sentry(const _Self&) : _M_ok(false) {}
+    void operator=(const _Self&) {}
+  };
+  
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+#  undef sentry
+# else
+  // close basic_istream class definition here
+};
+# endif
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+_STLP_EXPORT_TEMPLATE_CLASS _Isentry<char, char_traits<char> >;
+_STLP_EXPORT_TEMPLATE_CLASS basic_istream<char, char_traits<char> >;
+#  if ! defined (_STLP_NO_WCHAR_T)
+_STLP_EXPORT_TEMPLATE_CLASS _Isentry<wchar_t, char_traits<wchar_t> >;
+_STLP_EXPORT_TEMPLATE_CLASS basic_istream<wchar_t, char_traits<wchar_t> >;
+#  endif
+# endif /* _STLP_USE_TEMPLATE_EXPORT */
+
+// Non-member character and string extractor functions.
+
+template <class _CharT, class _Traits>
+inline basic_istream<_CharT, _Traits>& _STLP_CALL  
+operator>>(basic_istream<_CharT, _Traits>& __in, _CharT& __c) {
+  __in._M_formatted_get(__c);
+  return __in;
+}
+
+template <class _Traits>
+inline basic_istream<char, _Traits>& _STLP_CALL  
+operator>>(basic_istream<char, _Traits>& __in, unsigned char& __c) {
+  __in._M_formatted_get(__REINTERPRET_CAST(char&,__c));
+  return __in;
+}
+
+template <class _Traits>
+inline basic_istream<char, _Traits>& _STLP_CALL 
+operator>>(basic_istream<char, _Traits>& __in, signed char& __c) {
+  __in._M_formatted_get(__REINTERPRET_CAST(char&,__c));
+  return __in;
+}
+
+template <class _CharT, class _Traits>
+inline basic_istream<_CharT, _Traits>& _STLP_CALL 
+operator>>(basic_istream<_CharT, _Traits>& __in, _CharT* __s) {
+  __in._M_formatted_get(__s);
+  return __in;
+}
+
+template <class _Traits>
+inline basic_istream<char, _Traits>& _STLP_CALL 
+operator>>(basic_istream<char, _Traits>& __in, unsigned char* __s) {
+  __in._M_formatted_get(__REINTERPRET_CAST(char*,__s));
+  return __in;
+}
+
+template <class _Traits>
+inline basic_istream<char, _Traits>& _STLP_CALL 
+operator>>(basic_istream<char, _Traits>& __in, signed char* __s) {
+  __in._M_formatted_get(__REINTERPRET_CAST(char*,__s));
+  return __in;
+}
+
+//----------------------------------------------------------------------
+// istream manipulator.
+template <class _CharT, class _Traits>
+basic_istream<_CharT, _Traits>& _STLP_CALL
+ws(basic_istream<_CharT, _Traits>& __is);
+
+//----------------------------------------------------------------------
+// Class iostream.
+
+template <class _CharT, class _Traits>
+class basic_iostream 
+  : public basic_istream<_CharT, _Traits>,
+    public basic_ostream<_CharT, _Traits>
+{
+public:
+  typedef basic_ios<_CharT, _Traits> _Basic_ios;
+
+  explicit basic_iostream(basic_streambuf<_CharT, _Traits>* __buf);
+  virtual ~basic_iostream();
+};
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+_STLP_EXPORT_TEMPLATE_CLASS basic_iostream<char, char_traits<char> >;
+#  if ! defined (_STLP_NO_WCHAR_T)
+_STLP_EXPORT_TEMPLATE_CLASS basic_iostream<wchar_t, char_traits<wchar_t> >;
+#  endif
+# endif /* _STLP_USE_TEMPLATE_EXPORT */
+
+template <class _CharT, class _Traits>
+basic_streambuf<_CharT, _Traits>* _STLP_CALL _M_get_istreambuf(basic_istream<_CharT, _Traits>& __is) 
+{
+  return __is.rdbuf();
+}
+
+_STLP_END_NAMESPACE
+
+# if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION) && !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_istream.c>
+# endif
+
+#endif /* _STLP_INTERNAL_ISTREAM_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_istreambuf_iterator.h b/main/source/stlport/stlport/stl/_istreambuf_iterator.h
new file mode 100644
index 00000000..1941c7b1
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_istreambuf_iterator.h
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+// WARNING: This is an internal header file, included by other C++
+// standard library headers.  You should not attempt to use this header
+// file directly.
+
+
+#ifndef _STLP_INTERNAL_ISTREAMBUF_ITERATOR_H
+#define _STLP_INTERNAL_ISTREAMBUF_ITERATOR_H
+
+#ifndef _STLP_INTERNAL_ITERATOR_BASE_H
+# include <stl/_iterator_base.h>
+#endif
+
+#ifndef _STLP_INTERNAL_STREAMBUF
+# include <stl/_streambuf.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+// defined in _istream.h
+template <class _CharT, class _Traits>
+extern basic_streambuf<_CharT, _Traits>* _STLP_CALL _M_get_istreambuf(basic_istream<_CharT, _Traits>& ) ;
+
+// We do not read any characters until operator* is called. operator* calls sgetc 
+// unless the iterator is unchanged from the last call in which case a cached value is
+// used. Calls to operator++ use sbumpc.
+
+template<class _CharT, class _Traits>
+class istreambuf_iterator
+{
+public:
+  typedef _CharT                           char_type;
+  typedef _Traits                          traits_type;
+  typedef typename _Traits::int_type       int_type;
+  typedef basic_streambuf<_CharT, _Traits> streambuf_type;
+  typedef basic_istream<_CharT, _Traits>   istream_type;
+
+  typedef input_iterator_tag               iterator_category;
+  typedef _CharT                           value_type;
+  typedef typename _Traits::off_type       difference_type;
+  typedef const _CharT*                    pointer;
+  typedef const _CharT&                    reference;
+
+public:
+  istreambuf_iterator(streambuf_type* __p = 0) { this->_M_init(__p); }
+  //  istreambuf_iterator(basic_istream<_CharT, _Traits>& __is) { this->_M_init(_M_get_istreambuf(__is)); }
+  inline istreambuf_iterator(basic_istream<_CharT, _Traits>& __is);
+
+  char_type operator*() const { this->_M_getc(); return _M_c; }
+  istreambuf_iterator<_CharT, _Traits>& operator++() { this->_M_bumpc(); return *this; }
+  istreambuf_iterator<_CharT, _Traits>  operator++(int);
+
+  bool equal(const istreambuf_iterator<_CharT, _Traits>& __i) const {
+    if (this->_M_buf)
+      this->_M_getc();
+    if (__i._M_buf)
+      __i._M_getc(); 
+    return this->_M_eof == __i._M_eof;
+  }
+
+private:
+  void _M_init(streambuf_type* __p) {
+    _M_buf = __p;
+    _M_eof = !__p;
+    //    _M_is_initialized = _M_eof;
+    _M_have_c = false;
+  }
+
+  void _M_getc() const {
+    if (_M_have_c)
+      return;
+    int_type __c = _M_buf->sgetc();
+# if !defined (_STLP_NEED_MUTABLE) /* && ! defined (__SUNPRO_CC) */
+    _M_c = traits_type::to_char_type(__c);
+    _M_eof = traits_type::eq_int_type(__c, traits_type::eof());
+    _M_have_c = true;
+# else
+    typedef istreambuf_iterator<_CharT,_Traits> _Self;
+    _Self* __that = __CONST_CAST(_Self*, this);
+    __that->_M_c = __STATIC_CAST(_CharT, traits_type::to_char_type(__c));
+    __that->_M_eof = traits_type::eq_int_type(__c, traits_type::eof());
+    __that->_M_have_c = true;
+# endif
+  }
+
+  void _M_bumpc() {
+    _M_buf->sbumpc();
+    _M_have_c = false;
+  }
+
+private:
+  streambuf_type* _M_buf;
+  mutable _CharT _M_c;
+  mutable unsigned char _M_eof;
+  mutable unsigned char _M_have_c;
+};
+
+template<class _CharT, class _Traits>
+inline istreambuf_iterator<_CharT, _Traits>::istreambuf_iterator(basic_istream<_CharT, _Traits>& __is) 
+{ this->_M_init(_M_get_istreambuf(__is)); }
+
+template<class _CharT, class _Traits>
+inline bool _STLP_CALL operator==(const istreambuf_iterator<_CharT, _Traits>& __x,
+                                  const istreambuf_iterator<_CharT, _Traits>& __y) {
+  return __x.equal(__y);
+}
+
+#ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+
+template<class _CharT, class _Traits>
+inline bool _STLP_CALL operator!=(const istreambuf_iterator<_CharT, _Traits>& __x,
+                                  const istreambuf_iterator<_CharT, _Traits>& __y) {
+  return !__x.equal(__y);
+}
+
+#endif /* _STLP_USE_SEPARATE_RELOPS_NAMESPACE */
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+_STLP_EXPORT_TEMPLATE_CLASS istreambuf_iterator<char, char_traits<char> >;
+#  if defined (INSTANTIATE_WIDE_STREAMS)
+_STLP_EXPORT_TEMPLATE_CLASS istreambuf_iterator<wchar_t, char_traits<wchar_t> >;
+#  endif
+# endif /* _STLP_USE_TEMPLATE_EXPORT */
+
+# ifdef _STLP_USE_OLD_HP_ITERATOR_QUERIES
+template <class _CharT, class _Traits>
+inline input_iterator_tag _STLP_CALL iterator_category(const istreambuf_iterator<_CharT, _Traits>&) { return input_iterator_tag(); }
+template <class _CharT, class _Traits>
+inline streamoff* _STLP_CALL 
+distance_type(const istreambuf_iterator<_CharT, _Traits>&) { return (streamoff*)0; }
+template <class _CharT, class _Traits>
+inline _CharT* _STLP_CALL value_type(const istreambuf_iterator<_CharT, _Traits>&) { return (_CharT*)0; }
+# endif
+
+template <class _CharT, class _Traits>
+istreambuf_iterator<_CharT, _Traits>
+istreambuf_iterator<_CharT, _Traits>::operator++(int) {
+  istreambuf_iterator<_CharT, _Traits> __tmp = *this;
+  this->_M_bumpc();
+  this->_M_have_c = false;
+  return __tmp;
+}
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_INTERNAL_ISTREAMBUF_ITERATOR_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_iterator.h b/main/source/stlport/stlport/stl/_iterator.h
new file mode 100644
index 00000000..74a608d0
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_iterator.h
@@ -0,0 +1,269 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996-1998
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_ITERATOR_H
+#define _STLP_INTERNAL_ITERATOR_H
+
+#ifndef _STLP_INTERNAL_ITERATOR_BASE_H
+# include <stl/_iterator_base.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+#if defined ( _STLP_CLASS_PARTIAL_SPECIALIZATION )
+// This is the new version of reverse_iterator, as defined in the
+//  draft C++ standard.  It relies on the iterator_traits template,
+//  which in turn relies on partial specialization.  The class
+//  reverse_bidirectional_iterator is no longer part of the draft
+//  standard, but it is retained for backward compatibility.
+
+template <class _Iterator>
+class reverse_iterator : 
+  public iterator<typename iterator_traits<_Iterator>::iterator_category,
+                  typename iterator_traits<_Iterator>::value_type,
+                  typename iterator_traits<_Iterator>::difference_type,
+                  typename iterator_traits<_Iterator>::pointer,
+                  typename iterator_traits<_Iterator>::reference>
+{
+protected:
+  _Iterator current;
+  typedef reverse_iterator<_Iterator> _Self;
+public:
+  typedef typename iterator_traits<_Iterator>::iterator_category  iterator_category;
+  typedef typename iterator_traits<_Iterator>::value_type value_type;
+  typedef typename iterator_traits<_Iterator>::difference_type difference_type;
+  typedef typename iterator_traits<_Iterator>::pointer pointer;
+  typedef typename iterator_traits<_Iterator>::reference reference;
+  typedef _Iterator iterator_type;
+public:
+  reverse_iterator() {}
+  explicit reverse_iterator(iterator_type __x) : current(__x) {}
+  reverse_iterator(const _Self& __x) : current(__x.current) {}
+  _Self& operator = (const _Self& __x) { current = __x.base(); return *this; } 
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _Iter>
+  reverse_iterator(const reverse_iterator<_Iter>& __x) : current(__x.base()) {}
+  template <class _Iter>
+  _Self& operator = (const reverse_iterator<_Iter>& __x) { current = __x.base(); return *this; } 
+#endif /* _STLP_MEMBER_TEMPLATES */
+    
+  iterator_type base() const { return current; }
+  reference operator*() const {
+    _Iterator __tmp = current;
+    return *--__tmp;
+  }
+  _STLP_DEFINE_ARROW_OPERATOR
+  _Self& operator++() {
+    --current;
+    return *this;
+  }
+  _Self operator++(int) {
+    _Self __tmp = *this;
+    --current;
+    return __tmp;
+  }
+  _Self& operator--() {
+    ++current;
+    return *this;
+  }
+  _Self operator--(int) {
+    _Self __tmp = *this;
+    ++current;
+    return __tmp;
+  }
+
+  _Self operator+(difference_type __n) const {
+    return _Self(current - __n);
+  }
+  _Self& operator+=(difference_type __n) {
+    current -= __n;
+    return *this;
+  }
+  _Self operator-(difference_type __n) const {
+    return _Self(current + __n);
+  }
+  _Self& operator-=(difference_type __n) {
+    current += __n;
+    return *this;
+  }
+  reference operator[](difference_type __n) const { return *(*this + __n); }  
+}; 
+ 
+template <class _Iterator>
+inline bool  _STLP_CALL operator==(const reverse_iterator<_Iterator>& __x, 
+                       const reverse_iterator<_Iterator>& __y) {
+  return __x.base() == __y.base();
+}
+
+template <class _Iterator>
+inline bool _STLP_CALL operator<(const reverse_iterator<_Iterator>& __x, 
+                      const reverse_iterator<_Iterator>& __y) {
+  return __y.base() < __x.base();
+}
+
+#ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+
+template <class _Iterator>
+inline bool _STLP_CALL operator!=(const reverse_iterator<_Iterator>& __x, 
+                       const reverse_iterator<_Iterator>& __y) {
+  return !(__x == __y);
+}
+
+template <class _Iterator>
+inline bool _STLP_CALL operator>(const reverse_iterator<_Iterator>& __x, 
+                      const reverse_iterator<_Iterator>& __y) {
+  return __y < __x;
+}
+
+template <class _Iterator>
+inline bool _STLP_CALL operator<=(const reverse_iterator<_Iterator>& __x, 
+                       const reverse_iterator<_Iterator>& __y) {
+  return !(__y < __x);
+}
+
+template <class _Iterator>
+inline bool _STLP_CALL operator>=(const reverse_iterator<_Iterator>& __x, 
+                      const reverse_iterator<_Iterator>& __y) {
+  return !(__x < __y);
+}
+
+#endif /* _STLP_USE_SEPARATE_RELOPS_NAMESPACE */
+
+template <class _Iterator>
+# ifdef __SUNPRO_CC
+inline ptrdiff_t _STLP_CALL
+# else
+inline typename reverse_iterator<_Iterator>::difference_type _STLP_CALL
+# endif
+operator-(const reverse_iterator<_Iterator>& __x, 
+          const reverse_iterator<_Iterator>& __y) {
+  return __y.base() - __x.base();
+}
+
+template <class _Iterator, class _DifferenceType>
+inline reverse_iterator<_Iterator>  _STLP_CALL
+operator+(_DifferenceType n,const reverse_iterator<_Iterator>& x) {
+  return x.operator+(n);
+}
+
+# endif
+
+template <class _Container>
+class back_insert_iterator 
+  : public iterator<output_iterator_tag,void,void,void,void>
+{
+protected:
+  _Container* container;
+public:
+  typedef _Container          container_type;
+  typedef output_iterator_tag iterator_category;
+
+  explicit back_insert_iterator(_Container& __x) : container(&__x) {}
+  back_insert_iterator<_Container>&
+  operator=(const typename _Container::value_type& __val) { 
+    container->push_back(__val);
+    return *this;
+  }
+  back_insert_iterator<_Container>& operator*() { return *this; }
+  back_insert_iterator<_Container>& operator++() { return *this; }
+  back_insert_iterator<_Container>  operator++(int) { return *this; }
+};
+
+template <class _Container>
+inline back_insert_iterator<_Container>  _STLP_CALL back_inserter(_Container& __x) {
+  return back_insert_iterator<_Container>(__x);
+}
+
+template <class _Container>
+class front_insert_iterator 
+  : public iterator<output_iterator_tag,void,void,void,void>
+{
+protected:
+  _Container* container;
+public:
+  typedef _Container          container_type;
+  typedef output_iterator_tag iterator_category;
+  explicit front_insert_iterator(_Container& __x) : container(&__x) {}
+  front_insert_iterator<_Container>&
+  operator=(const typename _Container::value_type& __val) { 
+    container->push_front(__val);
+    return *this;
+  }
+  front_insert_iterator<_Container>& operator*() { return *this; }
+  front_insert_iterator<_Container>& operator++() { return *this; }
+  front_insert_iterator<_Container>& operator++(int) { return *this; }
+};
+
+template <class _Container>
+inline front_insert_iterator<_Container>  _STLP_CALL front_inserter(_Container& __x) {
+  return front_insert_iterator<_Container>(__x);
+}
+
+template <class _Container>
+class insert_iterator 
+  : public iterator<output_iterator_tag,void,void,void,void>
+{
+protected:
+  _Container* container;
+  typename _Container::iterator iter;
+public:
+  typedef _Container          container_type;
+  typedef output_iterator_tag iterator_category;
+  insert_iterator(_Container& __x, typename _Container::iterator __i) 
+    : container(&__x), iter(__i) {}
+  insert_iterator<_Container>&
+  operator=(const typename _Container::value_type& __val) { 
+    iter = container->insert(iter, __val);
+    ++iter;
+    return *this;
+  }
+  insert_iterator<_Container>& operator*() { return *this; }
+  insert_iterator<_Container>& operator++() { return *this; }
+  insert_iterator<_Container>& operator++(int) { return *this; }
+};
+
+template <class _Container, class _Iterator>
+inline insert_iterator<_Container>  _STLP_CALL
+inserter(_Container& __x, _Iterator __i)
+{
+  typedef typename _Container::iterator __iter;
+  return insert_iterator<_Container>(__x, __iter(__i));
+}
+
+_STLP_END_NAMESPACE
+
+#if ! defined ( _STLP_CLASS_PARTIAL_SPECIALIZATION ) || defined (_STLP_USE_OLD_HP_ITERATOR_QUERIES)
+# include <stl/_iterator_old.h>
+#endif /* __NO_PARTIAL_SPEC || ANACHRONISMS */
+
+#endif /* _STLP_INTERNAL_ITERATOR_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_iterator_base.h b/main/source/stlport/stlport/stl/_iterator_base.h
new file mode 100644
index 00000000..c22fd06b
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_iterator_base.h
@@ -0,0 +1,463 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996-1998
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_ITERATOR_BASE_H
+#define _STLP_INTERNAL_ITERATOR_BASE_H
+
+#ifndef _STLP_CSTDDEF
+# include <cstddef>
+#endif
+
+# if defined  (_STLP_IMPORT_VENDOR_CSTD) && ! defined (_STLP_VENDOR_GLOBAL_CSTD)
+_STLP_BEGIN_NAMESPACE  
+using namespace _STLP_VENDOR_CSTD;
+_STLP_END_NAMESPACE
+#endif /* _STLP_IMPORT_VENDOR_CSTD */
+
+#ifndef __TYPE_TRAITS_H
+# include <stl/type_traits.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+struct input_iterator_tag {};
+struct output_iterator_tag {};
+struct forward_iterator_tag : public input_iterator_tag {};
+struct bidirectional_iterator_tag : public forward_iterator_tag {};
+struct random_access_iterator_tag : public bidirectional_iterator_tag {};
+
+
+template <class _Category, class _Tp, __DFL_TMPL_PARAM(_Distance,ptrdiff_t),
+          __DFL_TMPL_PARAM(_Pointer,_Tp*), __DFL_TMPL_PARAM(_Reference,_Tp&) >
+struct iterator {
+  typedef _Category  iterator_category;
+  typedef _Tp        value_type;
+  typedef _Distance  difference_type;
+  typedef _Pointer   pointer;
+  typedef _Reference reference;
+};
+_STLP_TEMPLATE_NULL
+struct iterator<output_iterator_tag, void, void, void, void> {
+  typedef output_iterator_tag  iterator_category;
+#ifdef _STLP_CLASS_PARTIAL_SPECIALIZATION
+  typedef void                value_type;
+  typedef void                difference_type;
+  typedef void                pointer;
+  typedef void                reference;
+#endif
+};
+
+# ifdef _STLP_USE_OLD_HP_ITERATOR_QUERIES
+#  define _STLP_ITERATOR_CATEGORY(_It, _Tp) iterator_category(_It)
+#  define _STLP_DISTANCE_TYPE(_It, _Tp)     distance_type(_It)
+#  define _STLP_VALUE_TYPE(_It, _Tp)        value_type(_It)
+# else
+#  ifdef _STLP_CLASS_PARTIAL_SPECIALIZATION
+#   define _STLP_VALUE_TYPE(_It, _Tp)        (typename iterator_traits< _Tp >::value_type*)0
+#   define _STLP_DISTANCE_TYPE(_It, _Tp)     (typename iterator_traits< _Tp >::difference_type*)0
+#   if defined (__BORLANDC__) || defined (__SUNPRO_CC) || ( defined (__MWERKS__) && (__MWERKS__ <= 0x2303)) || ( defined (__sgi) && defined (_COMPILER_VERSION)) || defined (__DMC__)
+#    define _STLP_ITERATOR_CATEGORY(_It, _Tp) iterator_traits< _Tp >::iterator_category()
+#   else
+#    define _STLP_ITERATOR_CATEGORY(_It, _Tp) typename iterator_traits< _Tp >::iterator_category()
+#   endif
+#  else
+#   define _STLP_ITERATOR_CATEGORY(_It, _Tp) __iterator_category(_It, _IsPtrType<_Tp>::_Ret())
+#   define _STLP_DISTANCE_TYPE(_It, _Tp)     (ptrdiff_t*)0
+#   define _STLP_VALUE_TYPE(_It, _Tp)        __value_type(_It, _IsPtrType<_Tp>::_Ret() )
+#  endif
+# endif
+
+template <class _Iterator>
+struct iterator_traits {
+  typedef typename _Iterator::iterator_category iterator_category;
+  typedef typename _Iterator::value_type        value_type;
+  typedef typename _Iterator::difference_type   difference_type;
+  typedef typename _Iterator::pointer           pointer;
+  typedef typename _Iterator::reference         reference;
+};
+
+
+# if defined (_STLP_CLASS_PARTIAL_SPECIALIZATION) && ! defined (__SUNPRO_CC)
+#  define _STLP_DIFFERENCE_TYPE(_Iterator) typename iterator_traits<_Iterator>::difference_type
+# else
+#  define _STLP_DIFFERENCE_TYPE(_Iterator) ptrdiff_t
+# endif
+
+# ifdef _STLP_CLASS_PARTIAL_SPECIALIZATION
+
+// fbp : this order keeps gcc happy
+template <class _Tp>
+struct iterator_traits<const _Tp*> {
+  typedef random_access_iterator_tag iterator_category;
+  typedef _Tp                         value_type;
+  typedef ptrdiff_t                   difference_type;
+  typedef const _Tp*                  pointer;
+  typedef const _Tp&                  reference;
+};
+
+template <class _Tp>
+struct iterator_traits<_Tp*> {
+  typedef random_access_iterator_tag iterator_category;
+  typedef _Tp                         value_type;
+  typedef ptrdiff_t                   difference_type;
+  typedef _Tp*                        pointer;
+  typedef _Tp&                        reference;
+};
+
+#  if defined (__BORLANDC__)
+template <class _Tp>
+struct iterator_traits<_Tp* const> {
+  typedef random_access_iterator_tag iterator_category;
+  typedef _Tp                         value_type;
+  typedef ptrdiff_t                   difference_type;
+  typedef const _Tp*                  pointer;
+  typedef const _Tp&                  reference;
+};
+#  endif
+
+# endif /* _STLP_CLASS_PARTIAL_SPECIALIZATION */
+
+
+# if defined (_STLP_CLASS_PARTIAL_SPECIALIZATION) \
+  || (defined (_STLP_SIMULATE_PARTIAL_SPEC_FOR_TYPE_TRAITS) && ! defined (_STLP_NO_ARROW_OPERATOR))
+#  define _STLP_POINTERS_SPECIALIZE( _TpP )
+#  define _STLP_DEFINE_ARROW_OPERATOR  pointer operator->() const { return &(operator*()); }
+# else 
+#  include <stl/_ptrs_specialize.h>
+# endif
+
+# ifndef _STLP_USE_OLD_HP_ITERATOR_QUERIES
+// The overloaded functions iterator_category, distance_type, and
+// value_type are not part of the C++ standard.  (They have been
+// replaced by struct iterator_traits.)  They are included for
+// backward compatibility with the HP STL.
+// We introduce internal names for these functions.
+
+#  ifdef  _STLP_CLASS_PARTIAL_SPECIALIZATION
+
+template <class _Iter>
+inline typename iterator_traits<_Iter>::iterator_category __iterator_category(const _Iter&) {
+  typedef typename iterator_traits<_Iter>::iterator_category _Category;
+  return _Category();
+}
+
+template <class _Iter>
+inline typename iterator_traits<_Iter>::difference_type* __distance_type(const _Iter&) {
+  typedef typename iterator_traits<_Iter>::difference_type _diff_type;
+  return __STATIC_CAST(_diff_type*,0);
+}
+
+template <class _Iter>
+inline typename iterator_traits<_Iter>::value_type* __value_type(const _Iter&) {
+  typedef typename iterator_traits<_Iter>::value_type _value_type;
+  return __STATIC_CAST(_value_type*,0);
+}
+
+# else
+
+template <class _Iter>
+inline random_access_iterator_tag 
+__iterator_category(const _Iter&, const __true_type&) {
+  return random_access_iterator_tag();
+}
+
+template <class _Iter>
+inline _STLP_TYPENAME_ON_RETURN_TYPE iterator_traits<_Iter>::iterator_category
+__iterator_category(const _Iter&, const __false_type&) {
+  typedef typename iterator_traits<_Iter>::iterator_category _Category;
+  return _Category();
+}
+
+
+template <class _Iter>
+inline ptrdiff_t* _STLP_CALL __distance_type(const _Iter&) { return (ptrdiff_t*)(0); }
+
+template <class _Iter>
+inline _STLP_TYPENAME_ON_RETURN_TYPE iterator_traits<_Iter>::value_type* 
+__value_type(const _Iter&, const __false_type&) {
+  typedef typename iterator_traits<_Iter>::value_type _value_type;
+  return __STATIC_CAST(_value_type*,0);
+}
+
+template <class _Tp>
+inline _Tp*  
+__value_type(const _Tp*, const __true_type&) {
+  return __STATIC_CAST(_Tp*, 0);
+}
+
+# endif
+
+#else /* old queries */
+template <class _Category, class _Tp, class _Distance, class _Pointer, class _Reference>
+inline _Category _STLP_CALL iterator_category(const iterator<_Category,_Tp,_Distance,_Pointer,_Reference>&) { return _Category(); }
+template <class _Category, class _Tp, class _Distance, class _Pointer, class _Reference>
+inline _Tp* _STLP_CALL value_type(const iterator<_Category,_Tp,_Distance,_Pointer,_Reference>&) { return (_Tp*)(0); }
+template <class _Category, class _Tp, class _Distance, class _Pointer, class _Reference>
+inline _Distance* _STLP_CALL distance_type(const iterator<_Category,_Tp,_Distance,_Pointer,_Reference>&) { return (_Distance*)(0); }
+template <class _Tp>
+inline random_access_iterator_tag _STLP_CALL iterator_category(const _Tp*) { return random_access_iterator_tag(); }
+template <class _Tp>
+inline _Tp* _STLP_CALL value_type(const _Tp*) { return (_Tp*)(0); }
+template <class _Tp>
+inline ptrdiff_t* _STLP_CALL distance_type(const _Tp*) { return (ptrdiff_t*)(0); }
+#endif /* _STLP_USE_OLD_HP_ITERATOR_QUERIES */
+
+# if ! defined (_STLP_NO_ANACHRONISMS)
+// The base classes input_iterator, output_iterator, forward_iterator,
+// bidirectional_iterator, and random_access_iterator are not part of
+// the C++ standard.  (They have been replaced by struct iterator.)
+// They are included for backward compatibility with the HP STL.
+template <class _Tp, class _Distance> struct input_iterator : 
+  public iterator <input_iterator_tag, _Tp, _Distance, _Tp*, _Tp&> {};
+struct output_iterator : public iterator <output_iterator_tag, void, void, void, void> {};
+template <class _Tp, class _Distance> struct forward_iterator :
+  public iterator<forward_iterator_tag, _Tp, _Distance, _Tp*, _Tp&> {};
+template <class _Tp, class _Distance> struct bidirectional_iterator :
+  public iterator<bidirectional_iterator_tag, _Tp, _Distance, _Tp*, _Tp&> {};
+template <class _Tp, class _Distance> struct random_access_iterator :
+  public iterator<random_access_iterator_tag, _Tp, _Distance, _Tp*, _Tp&> {};
+
+# if defined (_STLP_BASE_MATCH_BUG) && defined (_STLP_USE_OLD_HP_ITERATOR_QUERIES)
+template <class _Tp, class _Distance> 
+inline input_iterator_tag _STLP_CALL 
+iterator_category(const input_iterator<_Tp, _Distance>&) { return input_iterator_tag(); }
+inline output_iterator_tag _STLP_CALL
+iterator_category(const output_iterator&) { return output_iterator_tag(); }
+template <class _Tp, class _Distance> 
+inline forward_iterator_tag _STLP_CALL
+iterator_category(const forward_iterator<_Tp, _Distance>&) { return forward_iterator_tag(); }
+template <class _Tp, class _Distance> 
+inline bidirectional_iterator_tag _STLP_CALL 
+iterator_category(const bidirectional_iterator<_Tp, _Distance>&) { return bidirectional_iterator_tag(); }
+template <class _Tp, class _Distance> 
+inline random_access_iterator_tag _STLP_CALL
+iterator_category(const random_access_iterator<_Tp, _Distance>&) { return random_access_iterator_tag(); }
+template <class _Tp, class _Distance> 
+inline _Tp*  _STLP_CALL value_type(const input_iterator<_Tp, _Distance>&) { return (_Tp*)(0); }
+template <class _Tp, class _Distance> 
+inline _Tp* _STLP_CALL value_type(const forward_iterator<_Tp, _Distance>&) { return (_Tp*)(0); }
+template <class _Tp, class _Distance> 
+inline _Tp* _STLP_CALL value_type(const bidirectional_iterator<_Tp, _Distance>&) { return (_Tp*)(0); }
+template <class _Tp, class _Distance> 
+inline _Tp* _STLP_CALL value_type(const random_access_iterator<_Tp, _Distance>&) { return (_Tp*)(0); }
+template <class _Tp, class _Distance> 
+inline _Distance* _STLP_CALL distance_type(const input_iterator<_Tp, _Distance>&) { return (_Distance*)(0); }
+template <class _Tp, class _Distance> 
+inline _Distance* _STLP_CALL distance_type(const forward_iterator<_Tp, _Distance>&) { return (_Distance*)(0); }
+template <class _Tp, class _Distance> 
+inline _Distance* _STLP_CALL distance_type(const bidirectional_iterator<_Tp, _Distance>&) { return (_Distance*)(0);}
+template <class _Tp, class _Distance> 
+inline _Distance* _STLP_CALL distance_type(const random_access_iterator<_Tp, _Distance>&) { return (_Distance*)(0); }
+# endif /* BASE_MATCH */
+
+#endif /* _STLP_NO_ANACHRONISMS */
+
+template <class _InputIterator, class _Distance>
+inline void _STLP_CALL __distance(const _InputIterator& __first, const _InputIterator& __last,
+				  _Distance& __n, const input_iterator_tag &) {
+  _InputIterator __it(__first);
+  while (__it != __last) { ++__it; ++__n; }
+}
+
+# if defined (_STLP_NONTEMPL_BASE_MATCH_BUG) 
+template <class _ForwardIterator, class _Distance>
+inline void _STLP_CALL __distance(const _ForwardIterator& __first, const _ForwardIterator& __last,
+				  _Distance& __n, const forward_iterator_tag &) {
+  _ForwardIterator __it(__first);
+  while (__it != __last) { ++__first; ++__n; }
+}
+
+template <class _BidirectionalIterator, class _Distance>
+_STLP_INLINE_LOOP void _STLP_CALL __distance(const _BidirectionalIterator& __first, 
+					     const _BidirectionalIterator& __last,
+					     _Distance& __n, const bidirectional_iterator_tag &) {
+  _BidirectionalIterator __it(__first);
+  while (__it != __last) { ++__it; ++__n; }
+}
+# endif
+
+template <class _RandomAccessIterator, class _Distance>
+inline void _STLP_CALL __distance(const _RandomAccessIterator& __first, 
+				  const _RandomAccessIterator& __last, 
+				  _Distance& __n, const random_access_iterator_tag &) {
+  __n += __last - __first;
+}
+
+#ifndef _STLP_NO_ANACHRONISMS 
+template <class _InputIterator, class _Distance>
+inline void _STLP_CALL distance(const _InputIterator& __first, 
+				const _InputIterator& __last, _Distance& __n) {
+  __distance(__first, __last, __n, _STLP_ITERATOR_CATEGORY(__first, _InputIterator));
+}
+#endif
+
+template <class _InputIterator>
+inline _STLP_DIFFERENCE_TYPE(_InputIterator) _STLP_CALL
+__distance(const _InputIterator& __first, const _InputIterator& __last, const input_iterator_tag &) {
+  _STLP_DIFFERENCE_TYPE(_InputIterator) __n = 0;
+  _InputIterator __it(__first);  
+  while (__it != __last) {
+    ++__it; ++__n;
+  }
+  return __n;
+}
+
+# if defined (_STLP_NONTEMPL_BASE_MATCH_BUG) 
+template <class _ForwardIterator>
+inline _STLP_DIFFERENCE_TYPE(_ForwardIterator) _STLP_CALL 
+__distance(const _ForwardIterator& __first, const _ForwardIterator& __last,
+           const forward_iterator_tag &)
+{
+  _STLP_DIFFERENCE_TYPE(_ForwardIterator) __n = 0;
+  _ForwardIterator __it(__first);
+  while (__it != __last) {
+    ++__it; ++__n;
+  }
+  return __n;
+}
+
+template <class _BidirectionalIterator>
+_STLP_INLINE_LOOP _STLP_DIFFERENCE_TYPE(_BidirectionalIterator) _STLP_CALL 
+__distance(const _BidirectionalIterator& __first, 
+           const _BidirectionalIterator& __last,
+           const bidirectional_iterator_tag &) {
+  _STLP_DIFFERENCE_TYPE(_BidirectionalIterator) __n = 0;
+  _BidirectionalIterator __it(__first);
+  while (__it != __last) {
+    ++__it; ++__n;
+  }
+  return __n;
+}
+# endif
+
+template <class _RandomAccessIterator>
+inline _STLP_DIFFERENCE_TYPE(_RandomAccessIterator) _STLP_CALL
+__distance(const _RandomAccessIterator& __first, const _RandomAccessIterator& __last,
+           const random_access_iterator_tag &) {
+  return __last - __first;
+}
+
+template <class _InputIterator>
+inline _STLP_DIFFERENCE_TYPE(_InputIterator) _STLP_CALL
+distance(const _InputIterator& __first, const _InputIterator& __last) {
+  return __distance(__first, __last, _STLP_ITERATOR_CATEGORY(__first, _InputIterator));  
+}
+
+
+// fbp: those are being used for iterator/const_iterator definitions everywhere
+template <class _Tp>
+struct _Nonconst_traits;
+
+template <class _Tp>
+struct _Const_traits {
+  typedef _Tp value_type;
+  typedef const _Tp&  reference;
+  typedef const _Tp*  pointer;
+  typedef _Nonconst_traits<_Tp> _Non_const_traits;
+};
+
+template <class _Tp>
+struct _Nonconst_traits {
+  typedef _Tp value_type;
+  typedef _Tp& reference;
+  typedef _Tp* pointer;
+  typedef _Nonconst_traits<_Tp> _Non_const_traits;
+};
+
+#  if defined (_STLP_BASE_TYPEDEF_BUG)
+// this workaround is needed for SunPro 4.0.1
+template <class _Traits>
+struct __cnst_traits_aux : private _Traits
+{
+  typedef typename _Traits::value_type value_type;
+};
+#  define __TRAITS_VALUE_TYPE(_Traits) __cnst_traits_aux<_Traits>::value_type
+#  else
+#  define __TRAITS_VALUE_TYPE(_Traits) _Traits::value_type
+#  endif
+
+# if defined (_STLP_MSVC)
+// MSVC specific
+template <class _InputIterator, class _Dist>
+inline void  _STLP_CALL _Distance(_InputIterator __first, 
+		      _InputIterator __last, _Dist& __n) {
+  __distance(__first, __last, __n, _STLP_ITERATOR_CATEGORY(__first, _InputIterator));
+}
+# endif
+
+template <class _InputIter, class _Distance>
+_STLP_INLINE_LOOP void  _STLP_CALL __advance(_InputIter& __i, _Distance __n, const input_iterator_tag &) {
+  while (__n--) ++__i;
+}
+
+// fbp : added output iterator tag variant
+template <class _InputIter, class _Distance>
+_STLP_INLINE_LOOP void  _STLP_CALL __advance(_InputIter& __i, _Distance __n, const output_iterator_tag &) {
+  while (__n--) ++__i;
+}
+
+# if defined (_STLP_NONTEMPL_BASE_MATCH_BUG)
+template <class _ForwardIterator, class _Distance>
+_STLP_INLINE_LOOP void _STLP_CALL __advance(_ForwardIterator& i, _Distance n, const forward_iterator_tag &) {
+    while (n--) ++i;
+}
+# endif
+
+template <class _BidirectionalIterator, class _Distance>
+_STLP_INLINE_LOOP void _STLP_CALL __advance(_BidirectionalIterator& __i, _Distance __n, 
+                      const bidirectional_iterator_tag &) {
+  if (__n > 0)
+    while (__n--) ++__i;
+  else
+    while (__n++) --__i;
+}
+
+template <class _RandomAccessIterator, class _Distance>
+inline void _STLP_CALL __advance(_RandomAccessIterator& __i, _Distance __n, 
+                      const random_access_iterator_tag &) {
+  __i += __n;
+}
+
+template <class _InputIterator, class _Distance>
+inline void _STLP_CALL advance(_InputIterator& __i, _Distance __n) {
+  __advance(__i, __n, _STLP_ITERATOR_CATEGORY(__i, _InputIterator));
+}
+
+_STLP_END_NAMESPACE
+
+# if defined (_STLP_DEBUG) && ! defined (_STLP_DEBUG_H)
+#  include <stl/debug/_debug.h>
+# endif
+
+#endif /* _STLP_INTERNAL_ITERATOR_BASE_H */
+
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_iterator_old.h b/main/source/stlport/stlport/stl/_iterator_old.h
new file mode 100644
index 00000000..e94a11fb
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_iterator_old.h
@@ -0,0 +1,351 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996-1998
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_ITERATOR_OLD_H
+#define _STLP_INTERNAL_ITERATOR_OLD_H
+
+#ifndef _STLP_INTERNAL_ITERATOR_BASE_H
+# include <stl/_iterator_base.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+# ifdef _STLP_USE_OLD_HP_ITERATOR_QUERIES
+
+template <class _Container>
+inline output_iterator_tag _STLP_CALL
+iterator_category(const back_insert_iterator<_Container>&) { return output_iterator_tag(); }
+template <class _Container>
+inline output_iterator_tag _STLP_CALL
+iterator_category(const front_insert_iterator<_Container>&) { return output_iterator_tag(); }
+template <class _Container>
+inline output_iterator_tag _STLP_CALL
+iterator_category(const insert_iterator<_Container>&) { return output_iterator_tag(); }
+
+# endif
+
+# if defined (_STLP_MSVC50_COMPATIBILITY)
+# define __Reference _Reference, class _Pointer
+# define Reference__ _Reference, _Pointer
+template <class _BidirectionalIterator, class _Tp, 
+    __DFL_TMPL_PARAM(_Reference, _Tp& ),
+    __DFL_TMPL_PARAM(_Pointer, _Tp*),
+    __DFL_TYPE_PARAM(_Distance, ptrdiff_t)> 
+# else
+# define __Reference _Reference
+# define Reference__ _Reference
+template <class _BidirectionalIterator, class _Tp, __DFL_TMPL_PARAM(_Reference, _Tp& ),
+    __DFL_TYPE_PARAM(_Distance, ptrdiff_t)> 
+# endif
+class reverse_bidirectional_iterator {
+  typedef reverse_bidirectional_iterator<_BidirectionalIterator, _Tp, 
+                                         Reference__, _Distance> _Self;
+  //  friend inline bool operator== _STLP_NULL_TMPL_ARGS (const _Self& x, const _Self& y);
+protected:
+  _BidirectionalIterator current;
+public:
+  typedef bidirectional_iterator_tag iterator_category;
+  typedef _Tp                        value_type;
+  typedef _Distance                  difference_type;
+# if defined (_STLP_MSVC50_COMPATIBILITY)
+  typedef _Pointer                   pointer;
+# else
+  typedef _Tp*                       pointer;
+# endif
+  typedef _Reference                 reference;
+
+  reverse_bidirectional_iterator() {}
+  explicit reverse_bidirectional_iterator(_BidirectionalIterator __x)
+    : current(__x) {}
+  _BidirectionalIterator base() const { return current; }
+  _Reference operator*() const {
+    _BidirectionalIterator __tmp = current;
+    return *--__tmp;
+  }
+# if !(defined _STLP_NO_ARROW_OPERATOR)
+  _STLP_DEFINE_ARROW_OPERATOR
+# endif
+  _Self& operator++() {
+    --current;
+    return *this;
+  }
+  _Self operator++(int) {
+    _Self __tmp = *this;
+    --current;
+    return __tmp;
+  }
+  _Self& operator--() {
+    ++current;
+    return *this;
+  }
+  _Self operator--(int) {
+    _Self __tmp = *this;
+    ++current;
+    return __tmp;
+  }
+};
+
+# ifdef _STLP_USE_OLD_HP_ITERATOR_QUERIES
+template <class _BidirectionalIterator, class _Tp, class __Reference, 
+          class _Distance>
+inline bidirectional_iterator_tag _STLP_CALL
+iterator_category(const reverse_bidirectional_iterator<_BidirectionalIterator, _Tp, Reference__, _Distance>&) 
+{ return bidirectional_iterator_tag(); }
+template <class _BidirectionalIterator, class _Tp, class __Reference, 
+  class _Distance>
+inline _Tp* _STLP_CALL
+value_type(const reverse_bidirectional_iterator<_BidirectionalIterator, _Tp, Reference__, _Distance>&)
+{ return (_Tp*) 0; }
+template <class _BidirectionalIterator, class _Tp, class __Reference, 
+          class _Distance>
+inline _Distance* _STLP_CALL
+distance_type(const reverse_bidirectional_iterator<_BidirectionalIterator, _Tp, Reference__, _Distance>&)
+{ return (_Distance*) 0; }
+#endif
+
+template <class _BidirectionalIterator, class _Tp, class __Reference, 
+          class _Distance>
+inline bool  _STLP_CALL operator==(
+    const reverse_bidirectional_iterator<_BidirectionalIterator, _Tp,
+                                               Reference__, _Distance>& __x,
+    const reverse_bidirectional_iterator<_BidirectionalIterator, _Tp,
+                                               Reference__, _Distance>& __y)
+{
+  return __x.base() == __y.base();
+}
+
+#ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+
+template <class _BiIter, class _Tp, class __Reference, class _Distance>
+inline bool  _STLP_CALL operator!=(
+    const reverse_bidirectional_iterator<_BiIter, _Tp, Reference__, _Distance>& __x, 
+    const reverse_bidirectional_iterator<_BiIter, _Tp, Reference__, _Distance>& __y)
+{
+  return !(__x == __y);
+}
+
+#endif /* _STLP_USE_SEPARATE_RELOPS_NAMESPACE */
+
+#if ! defined ( _STLP_CLASS_PARTIAL_SPECIALIZATION )
+
+// This is the old version of reverse_iterator, as found in the original
+//  HP STL.  It does not use partial specialization.
+
+template <class _RandomAccessIterator, 
+# if defined (__MSL__) && (__MSL__ >= 0x2405) \
+	|| defined(__MRC__) || (defined(__SC__) && !defined(__DMC__))		//*ty 03/22/2001 - give the default to the secont param under MPW. 
+												// I believe giving the default will cause any harm even though the 2nd type parameter 
+												// still have to be provided for T* type iterators.
+	__DFL_TMPL_PARAM(_Tp,iterator_traits<_RandomAccessIterator>::value_type),
+# else
+	class _Tp,
+#endif
+ __DFL_TMPL_PARAM(_Reference,_Tp&),
+# if defined (_STLP_MSVC50_COMPATIBILITY)
+        __DFL_TMPL_PARAM(_Pointer, _Tp*),
+# endif
+        __DFL_TYPE_PARAM(_Distance,ptrdiff_t)> 
+class reverse_iterator {
+  typedef reverse_iterator<_RandomAccessIterator, _Tp, Reference__, _Distance>
+          _Self;
+protected:
+  _RandomAccessIterator __current;
+public:
+  typedef random_access_iterator_tag iterator_category;
+  typedef _Tp                        value_type;
+  typedef _Distance                  difference_type;
+# if defined (_STLP_MSVC50_COMPATIBILITY)
+  typedef _Pointer                   pointer;
+# else
+  typedef _Tp*                       pointer;
+# endif
+  typedef _Reference                 reference;
+
+  reverse_iterator() {}
+  reverse_iterator(const _Self& __x) : __current(__x.base()) {}
+  explicit reverse_iterator(_RandomAccessIterator __x) : __current(__x) {}
+  _Self& operator=(const _Self& __x) {__current = __x.base(); return *this; }  
+       
+  _RandomAccessIterator base() const { return __current; }
+  _Reference operator*() const { return *(__current - (difference_type)1); }
+
+# if !(defined _STLP_NO_ARROW_OPERATOR)
+  _STLP_DEFINE_ARROW_OPERATOR
+# endif
+
+  _Self& operator++() {
+    --__current;
+    return *this;
+  }
+  _Self operator++(int) {
+    _Self __tmp = *this;
+    --__current;
+    return __tmp;
+  }
+  _Self& operator--() {
+    ++__current;
+    return *this;
+  }
+  _Self operator--(int) {
+    _Self __tmp = *this;
+    ++__current;
+    return __tmp;
+  }
+  _Self operator+(_Distance __n) const {
+    return _Self(__current - __n);
+  }
+  _Self& operator+=(_Distance __n) {
+    __current -= __n;
+    return *this;
+  }
+  _Self operator-(_Distance __n) const {
+    return _Self(__current + __n);
+  }
+  _Self& operator-=(_Distance __n) {
+    __current += __n;
+    return *this;
+  }
+  _Reference operator[](_Distance __n) const { return *(*this + __n); }
+};
+
+# ifdef _STLP_USE_OLD_HP_ITERATOR_QUERIES
+template <class _RandomAccessIterator, class _Tp, 
+          class __Reference, class _Distance>
+inline random_access_iterator_tag _STLP_CALL
+iterator_category(const reverse_iterator<_RandomAccessIterator, _Tp, Reference__, _Distance>&)
+{ return random_access_iterator_tag(); }
+template <class _RandomAccessIterator, class _Tp,
+  class __Reference, class _Distance>
+inline _Tp*  _STLP_CALL value_type(const reverse_iterator<_RandomAccessIterator, _Tp, Reference__, _Distance>&)
+{ return (_Tp*) 0; }
+template <class _RandomAccessIterator, class _Tp,
+          class __Reference, class _Distance>
+inline _Distance*  _STLP_CALL
+distance_type(const reverse_iterator<_RandomAccessIterator, _Tp, Reference__, _Distance>&)
+{ return (_Distance*) 0; }
+#endif
+
+template <class _RandomAccessIterator, class _Tp,
+          class __Reference, class _Distance>
+inline bool  _STLP_CALL
+operator==(const reverse_iterator<_RandomAccessIterator, _Tp,
+                                  Reference__, _Distance>& __x, 
+           const reverse_iterator<_RandomAccessIterator, _Tp,
+                                  Reference__, _Distance>& __y)
+{
+  return __x.base() == __y.base();
+}
+
+template <class _RandomAccessIterator, class _Tp,
+          class __Reference, class _Distance>
+inline bool _STLP_CALL 
+operator<(const reverse_iterator<_RandomAccessIterator, _Tp,
+                                 Reference__, _Distance>& __x, 
+          const reverse_iterator<_RandomAccessIterator, _Tp,
+                                 Reference__, _Distance>& __y)
+{
+  return __y.base() < __x.base();
+}
+
+#ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+
+template <class _RandomAccessIterator, class _Tp,
+          class __Reference, class _Distance>
+inline bool _STLP_CALL 
+operator!=(const reverse_iterator<_RandomAccessIterator, _Tp,
+                                  Reference__, _Distance>& __x, 
+           const reverse_iterator<_RandomAccessIterator, _Tp,
+                                  Reference__, _Distance>& __y) {
+  return !(__x == __y);
+}
+
+template <class _RandomAccessIterator, class _Tp,
+          class __Reference, class _Distance>
+inline bool _STLP_CALL 
+operator>(const reverse_iterator<_RandomAccessIterator, _Tp,
+                                 Reference__, _Distance>& __x, 
+          const reverse_iterator<_RandomAccessIterator, _Tp,
+                                 Reference__, _Distance>& __y) {
+  return __y < __x;
+}
+
+template <class _RandomAccessIterator, class _Tp,
+          class __Reference, class _Distance>
+inline bool _STLP_CALL 
+operator<=(const reverse_iterator<_RandomAccessIterator, _Tp,
+                                  Reference__, _Distance>& __x, 
+           const reverse_iterator<_RandomAccessIterator, _Tp,
+                                  Reference__, _Distance>& __y) {
+  return !(__y < __x);
+}
+
+template <class _RandomAccessIterator, class _Tp,
+          class __Reference, class _Distance>
+inline bool _STLP_CALL 
+operator>=(const reverse_iterator<_RandomAccessIterator, _Tp,
+                                  Reference__, _Distance>& __x, 
+           const reverse_iterator<_RandomAccessIterator, _Tp,
+                                  Reference__, _Distance>& __y) {
+  return !(__x < __y);
+}
+
+#endif /* _STLP_USE_SEPARATE_RELOPS_NAMESPACE */
+
+template <class _RandomAccessIterator, class _Tp,
+          class __Reference, class _Distance>
+inline _Distance  _STLP_CALL
+operator-(const reverse_iterator<_RandomAccessIterator, _Tp,
+                                 Reference__, _Distance>& __x, 
+          const reverse_iterator<_RandomAccessIterator, _Tp,
+                                 Reference__, _Distance>& __y)
+{
+  return __y.base() - __x.base();
+}
+
+template <class _RandomAccessIterator, class _Tp,
+          class __Reference, class _Distance>
+inline reverse_iterator<_RandomAccessIterator, _Tp,
+                        Reference__, _Distance>  _STLP_CALL
+operator+(_Distance __n,
+          const reverse_iterator<_RandomAccessIterator, _Tp,
+                                 Reference__, _Distance>& __x)
+{
+  return reverse_iterator<_RandomAccessIterator, _Tp,
+                          Reference__, _Distance>(__x.base() - __n);
+}
+
+#endif /* ! defined ( _STLP_CLASS_PARTIAL_SPECIALIZATION ) */
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_INTERNAL_ITERATOR_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_limits.c b/main/source/stlport/stlport/stl/_limits.c
new file mode 100644
index 00000000..780c8803
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_limits.c
@@ -0,0 +1,293 @@
+/*
+ * Copyright (c) 1998,1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# if !defined (_STLP_LIMITS_C)
+#  define _STLP_LIMITS_C
+
+#ifndef _STLP_INTERNAL_LIMITS_H
+# include <stl/_limits.h>
+#endif
+
+//==========================================================
+//  numeric_limits static members
+//==========================================================
+
+_STLP_BEGIN_NAMESPACE
+
+# if ! defined ( _STLP_STATIC_CONST_INIT_BUG)
+
+#   define __declare_numeric_base_member(__type, __mem, _Init) \
+template <class __number> \
+  const __type _Numeric_limits_base<__number>:: __mem
+
+__declare_numeric_base_member(bool, is_specialized, false);
+__declare_numeric_base_member(int, digits, 0);
+__declare_numeric_base_member(int, digits10, 0);
+__declare_numeric_base_member(bool, is_signed, false);
+__declare_numeric_base_member(bool, is_integer, false);
+__declare_numeric_base_member(bool, is_exact, false);
+__declare_numeric_base_member(int, radix, 0);
+__declare_numeric_base_member(int, min_exponent, 0);
+__declare_numeric_base_member(int, max_exponent, 0);
+__declare_numeric_base_member(int, min_exponent10, 0);
+__declare_numeric_base_member(int, max_exponent10, 0);
+__declare_numeric_base_member(bool, has_infinity, false);
+__declare_numeric_base_member(bool, has_quiet_NaN, false);
+__declare_numeric_base_member(bool, has_signaling_NaN, false);
+__declare_numeric_base_member(float_denorm_style, has_denorm, denorm_absent);
+__declare_numeric_base_member(bool, has_denorm_loss, false);
+__declare_numeric_base_member(bool, is_iec559, false);
+__declare_numeric_base_member(bool, is_bounded, false);
+__declare_numeric_base_member(bool, is_modulo, false);
+__declare_numeric_base_member(bool, traps, false);
+__declare_numeric_base_member(bool, tinyness_before, false);
+__declare_numeric_base_member(float_round_style, round_style, round_toward_zero);
+
+# undef __declare_numeric_base_member
+
+#   define __declare_integer_limits_member(__type, __mem, _Init) \
+template <class _Int, _STLP_LIMITS_MIN_TYPE __imin, _STLP_LIMITS_MAX_TYPE __imax, int __idigits, bool __ismod> \
+  const __type _Integer_limits<_Int, __imin, __imax, __idigits, __ismod>:: __mem
+
+__declare_integer_limits_member(bool, is_specialized, true);
+__declare_integer_limits_member(int, digits, (__idigits < 0) ? \
+			    ((int)((sizeof(_Int) * (CHAR_BIT))) - ((__imin == 0) ? 0 : 1)) \
+                            : (__idigits) );
+__declare_integer_limits_member(int, digits10, (int)(301UL * digits) /1000);
+__declare_integer_limits_member(bool, is_signed, __imin != 0);
+__declare_integer_limits_member(bool, is_integer, true);
+__declare_integer_limits_member(bool, is_exact, true);
+__declare_integer_limits_member(int, radix, 2);
+__declare_integer_limits_member(bool, is_bounded, true);
+__declare_integer_limits_member(bool, is_modulo, true);
+
+#   define __declare_float_limits_member(__type, __mem, _Init) \
+template <class __number,  \
+         int __Digits, int __Digits10,    \
+         int __MinExp, int __MaxExp,      \
+         int __MinExp10, int __MaxExp10,  \
+         bool __IsIEC559, \
+         float_round_style __RoundStyle> \
+const __type _Floating_limits< __number, __Digits, __Digits10,    \
+         __MinExp, __MaxExp, __MinExp10, __MaxExp10,  \
+         __IsIEC559, __RoundStyle>::\
+         __mem
+
+__declare_float_limits_member(bool, is_specialized, true);  
+__declare_float_limits_member(int, digits, __Digits);  
+__declare_float_limits_member(int, digits10, __Digits10);  
+__declare_float_limits_member(bool, is_signed, true);  
+__declare_float_limits_member(int, radix, FLT_RADIX);  
+__declare_float_limits_member(int, min_exponent, __MinExp);  
+__declare_float_limits_member(int, max_exponent, __MaxExp);  
+__declare_float_limits_member(int, min_exponent10, __MinExp10);  
+__declare_float_limits_member(int, max_exponent10, __MaxExp10);  
+__declare_float_limits_member(bool, has_infinity, true);
+__declare_float_limits_member(bool, has_quiet_NaN, true);
+__declare_float_limits_member(bool, has_signaling_NaN, true);
+__declare_float_limits_member(float_denorm_style, has_denorm, denorm_indeterminate);
+__declare_float_limits_member(bool, has_denorm_loss, false);
+__declare_float_limits_member(bool, is_iec559, __IsIEC559);
+__declare_float_limits_member(bool, is_bounded, true);
+__declare_float_limits_member(bool, traps, true);
+__declare_float_limits_member(bool, tinyness_before, false);
+__declare_float_limits_member(float_round_style, round_style, __RoundStyle);
+
+# endif /* _STLP_STATIC_CONST_INIT_BUG */
+
+
+# ifdef _STLP_EXPOSE_GLOBALS_IMPLEMENTATION
+
+# if defined(_STLP_BIG_ENDIAN)
+# if defined(__OS400__)
+#  define _STLP_FLOAT_INF_REP { 0x7f80, 0 }
+#  define _STLP_FLOAT_QNAN_REP { 0xffc0, 0 }
+#  define _STLP_FLOAT_SNAN_REP { 0xff80, 0 }
+#  define _STLP_DOUBLE_INF_REP { 0x7ff0, 0, 0, 0 }
+#  define _STLP_DOUBLE_QNAN_REP { 0xfff8, 0, 0, 0 }
+#  define _STLP_DOUBLE_SNAN_REP { 0xfff0, 0, 0, 0 }
+#  define _STLP_LDOUBLE_INF_REP { 0x7ff0, 0, 0, 0, 0, 0, 0, 0 }
+#  define _STLP_LDOUBLE_QNAN_REP { 0xfff8, 0, 0, 0, 0, 0, 0, 0 }
+#  define _STLP_LDOUBLE_SNAN_REP { 0xfff0, 0, 0, 0, 0, 0, 0, 0 }
+# else
+#  define _STLP_FLOAT_INF_REP   { 0x7f80, 0 }
+#  define _STLP_FLOAT_SNAN_REP  { 0x7f81, 0 }
+#  define _STLP_FLOAT_QNAN_REP  { 0x7fc1, 0 }
+#  define _STLP_DOUBLE_INF_REP  { 0x7ff0, 0, 0, 0 }
+#  define _STLP_DOUBLE_QNAN_REP { 0x7ff1, 0, 0, 0 }
+#  define _STLP_DOUBLE_SNAN_REP { 0x7ff9, 0, 0, 0 }
+#  define _STLP_LDOUBLE_INF_REP { 0x7ff0, 0, 0, 0, 0, 0, 0, 0 }
+#  define _STLP_LDOUBLE_SNAN_REP { 0x7ff1, 0, 0, 0, 0, 0, 0, 0 }
+#  define _STLP_LDOUBLE_QNAN_REP { 0x7ff9, 0, 0, 0, 0, 0, 0, 0 }
+# endif
+
+# elif defined (_STLP_LITTLE_ENDIAN)
+
+# if 0 /* defined(_STLP_MSVC) || defined(__linux__) */
+// some IA-32 platform ?? 
+#  define _STLP_FLOAT_INF_REP { 0, 0x7f80 }
+#  define _STLP_FLOAT_QNAN_REP { 0, 0xffc0 }
+#  define _STLP_FLOAT_SNAN_REP { 0, 0xff80 }
+
+#  define _STLP_DOUBLE_INF_REP { 0, 0, 0, 0x7ff0 }
+#  define _STLP_DOUBLE_QNAN_REP { 0, 0, 0, 0xfff8 }
+#  define _STLP_DOUBLE_SNAN_REP { 0, 0, 0, 0xfff0 }
+#  define _STLP_LDOUBLE_INF_REP { 0, 0, 0, 0x7FF0, 0 } // ????
+#  define _STLP_LDOUBLE_QNAN_REP { 0, 0, 0, 0xFFF8, 0 } // ????
+#  define _STLP_LDOUBLE_SNAN_REP { 0, 0, 0, 0xFFF0, 0 } // ????
+
+# elif defined(__DECCXX)
+
+#  define _STLP_FLOAT_INF_REP { 0, 0x7f80 }
+#  define _STLP_FLOAT_QNAN_REP { 0, 0xffc0 }
+#  define _STLP_FLOAT_SNAN_REP { 0x5555, 0x7f85 }
+
+#  define _STLP_DOUBLE_INF_REP { 0, 0, 0, 0x7ff0 }
+#  define _STLP_DOUBLE_QNAN_REP { 0, 0, 0, 0xfff8 }
+#  define _STLP_DOUBLE_SNAN_REP { 0x5555, 0x5555, 0x5555, 0x7ff5 }
+
+#  define _STLP_LDOUBLE_INF_REP { 0, 0, 0, 0, 0, 0, 0, 0x7fff }
+#  define _STLP_LDOUBLE_QNAN_REP { 0, 0, 0, 0, 0, 0, 0x8000, 0xffff }
+#  define _STLP_LDOUBLE_SNAN_REP { 0x5555, 0x5555, 0x5555, 0x5555, 0x5555, 0x5555, 0x5555, 0x7fff}
+# else
+#  define _STLP_FLOAT_INF_REP { 0, 0x7f80 }
+#  define _STLP_FLOAT_QNAN_REP { 0, 0x7fa0 }
+#  define _STLP_FLOAT_SNAN_REP { 0, 0x7fc0 }
+#  define _STLP_DOUBLE_INF_REP { 0, 0, 0, 0x7ff0 }
+#  define _STLP_DOUBLE_QNAN_REP { 0, 0, 0, 0x7ff4 }
+#  define _STLP_DOUBLE_SNAN_REP { 0, 0, 0, 0x7ff8 }
+#  if defined (_STLP_MSVC) || defined (__ICL) || defined (__BORLANDC__)
+#   define _STLP_LDOUBLE_INF_REP { 0, 0, 0, 0x7FF0, 0 } // ????
+#   define _STLP_LDOUBLE_QNAN_REP { 0, 0, 0, 0xFFF8, 0 } // ????
+#   define _STLP_LDOUBLE_SNAN_REP { 0, 0, 0, 0xFFF8, 0 }
+#  else
+#   define _STLP_LDOUBLE_INF_REP { 0, 0, 0, 0x8000, 0x7fff }
+#   define _STLP_LDOUBLE_QNAN_REP { 0, 0, 0, 0xa000, 0x7fff }
+#   define _STLP_LDOUBLE_SNAN_REP { 0, 0, 0, 0xc000, 0x7fff }
+#  endif
+# endif
+#else
+/* This is an architecture we don't know how to handle. Return some
+obviously wrong values. */
+# define _STLP_FLOAT_INF_REP { 0, 0 }
+# define _STLP_FLOAT_QNAN_REP { 0, 0 }
+# define _STLP_FLOAT_SNAN_REP { 0, 0 }
+# define _STLP_DOUBLE_INF_REP { 0, 0 }
+# define _STLP_DOUBLE_QNAN_REP { 0, 0 }
+# define _STLP_DOUBLE_SNAN_REP { 0, 0 }
+# define _STLP_LDOUBLE_INF_REP { 0 }
+# define _STLP_LDOUBLE_QNAN_REP { 0 }
+# define _STLP_LDOUBLE_SNAN_REP { 0 }
+
+#endif
+
+
+# if 0
+# if defined(_STLP_BIG_ENDIAN)
+
+# elif defined (_STLP_LITTLE_ENDIAN)
+#else 
+
+/* This is an architecture we don't know how to handle.  Return some 
+   obviously wrong values. */
+# define _STLP_FLOAT_INF_REP  { 0, 0 }
+# define _STLP_FLOAT_QNAN_REP { 0, 0 }
+# define _STLP_FLOAT_SNAN_REP { 0, 0 }
+# define _STLP_DOUBLE_INF_REP  { 0, 0 }
+# define _STLP_DOUBLE_QNAN_REP { 0, 0 }
+# define _STLP_DOUBLE_SNAN_REP { 0, 0 }
+# define _STLP_LDOUBLE_INF_REP  { 0 }
+# define _STLP_LDOUBLE_QNAN_REP { 0 }
+# define _STLP_LDOUBLE_SNAN_REP { 0 }
+
+#endif
+# endif
+
+#if ( _STLP_STATIC_TEMPLATE_DATA > 0 )
+
+# ifndef _STLP_NO_LONG_DOUBLE
+template <class __dummy>
+const _L_rep _LimG<__dummy>::_L_inf  = {_STLP_LDOUBLE_INF_REP}; 
+template <class __dummy>
+const _L_rep _LimG<__dummy>::_L_qNaN  = {_STLP_LDOUBLE_QNAN_REP}; 
+template <class __dummy>
+const _L_rep _LimG<__dummy>::_L_sNaN  = {_STLP_LDOUBLE_SNAN_REP}; 
+# endif
+template <class __dummy>
+const _D_rep _LimG<__dummy>::_D_inf  = {_STLP_DOUBLE_INF_REP}; 
+template <class __dummy>
+const _D_rep _LimG<__dummy>::_D_qNaN  = {_STLP_DOUBLE_QNAN_REP}; 
+template <class __dummy>
+const _D_rep _LimG<__dummy>::_D_sNaN  = {_STLP_DOUBLE_SNAN_REP}; 
+template <class __dummy>
+const _F_rep _LimG<__dummy>::_F_inf  = {_STLP_FLOAT_INF_REP}; 
+template <class __dummy>
+const _F_rep _LimG<__dummy>::_F_qNaN  = {_STLP_FLOAT_QNAN_REP}; 
+template <class __dummy>
+const _F_rep _LimG<__dummy>::_F_sNaN  = {_STLP_FLOAT_SNAN_REP}; 
+
+#else
+
+__DECLARE_INSTANCE( const _F_rep,
+                   _LimG<bool>::_F_inf,  = _STLP_FLOAT_INF_REP);
+__DECLARE_INSTANCE( const _F_rep,
+                   _LimG<bool>::_F_qNaN,  = _STLP_FLOAT_QNAN_REP);
+__DECLARE_INSTANCE( const _F_rep,
+                   _LimG<bool>::_F_sNaN,  = _STLP_FLOAT_SNAN_REP);
+__DECLARE_INSTANCE( const _D_rep,
+                   _LimG<bool>::_D_inf,  = _STLP_DOUBLE_INF_REP);
+__DECLARE_INSTANCE( const _D_rep,
+                   _LimG<bool>::_D_qNaN,  = _STLP_DOUBLE_QNAN_REP);
+__DECLARE_INSTANCE( const _D_rep,
+                   _LimG<bool>::_D_sNaN,  = _STLP_DOUBLE_SNAN_REP);
+# ifndef _STLP_NO_LONG_DOUBLE
+__DECLARE_INSTANCE( const _L_rep,
+                   _LimG<bool>::_L_inf,  = _STLP_LDOUBLE_INF_REP);
+__DECLARE_INSTANCE( const _L_rep,
+                   _LimG<bool>::_L_qNaN,  = _STLP_LDOUBLE_QNAN_REP);
+__DECLARE_INSTANCE( const _L_rep,
+                   _LimG<bool>::_L_sNaN,  = _STLP_LDOUBLE_SNAN_REP);
+# endif
+
+#endif /* STATIC_DATA */   
+
+# endif /* _STLP_EXPOSE_GLOBALS_IMPLEMENTATION */
+    
+# undef __declare_integer_limits_member
+# undef __declare_float_limits_member
+# undef __HACK_ILIMITS
+# undef __HACK_NOTHING
+# undef __declare_int_members
+# undef __declare_float_members
+# undef _STLP_LIMITS_MIN_TYPE
+# undef _STLP_LIMITS_MAX_TYPE
+
+# undef _STLP_FLOAT_INF_REP
+# undef _STLP_FLOAT_QNAN_REP
+# undef _STLP_FLOAT_SNAN_REP
+# undef _STLP_DOUBLE_INF_REP
+# undef _STLP_DOUBLE_QNAN_REP
+# undef _STLP_DOUBLE_SNAN_REP
+# undef _STLP_LDOUBLE_INF_REP
+# undef _STLP_LDOUBLE_QNAN_REP
+# undef _STLP_LDOUBLE_SNAN_REP
+
+_STLP_END_NAMESPACE
+
+
+#endif /* _STLP_LIMITS_C_INCLUDED */
diff --git a/main/source/stlport/stlport/stl/_limits.h b/main/source/stlport/stlport/stl/_limits.h
new file mode 100644
index 00000000..4c22e6d3
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_limits.h
@@ -0,0 +1,557 @@
+/*
+ * Copyright (c) 1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This may be not portable code. Parts of numeric_limits<> are
+ * inherently machine-dependent.  At present this file is suitable
+ * for the MIPS, SPARC, Alpha and ia32 architectures.
+ */
+
+#ifndef _STLP_INTERNAL_LIMITS_H
+# define _STLP_INTERNAL_LIMITS_H
+
+#ifndef _STLP_CLIMITS
+# include <climits>
+#endif
+
+#ifndef _STLP_CFLOAT
+# include <cfloat>
+#endif
+
+#if !defined (_STLP_NO_WCHAR_T) && !defined (_STLP_CWCHAR_H)
+# include <stl/_cwchar.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+enum float_round_style {
+  round_indeterminate       = -1,
+  round_toward_zero         =  0,
+  round_to_nearest          =  1,
+  round_toward_infinity     =  2,
+  round_toward_neg_infinity =  3
+};
+
+enum float_denorm_style {
+  denorm_indeterminate = -1,
+  denorm_absent        =  0,
+  denorm_present       =  1
+};
+
+// Base class for all specializations of numeric_limits.
+
+template <class __number>
+class _Numeric_limits_base {
+public:
+
+  static __number (_STLP_CALL min)() _STLP_NOTHROW { return __number(); }
+  static __number (_STLP_CALL max)() _STLP_NOTHROW { return __number(); }
+
+# if defined ( _STLP_STATIC_CONST_INIT_BUG)
+  enum {
+# else
+  static const int 
+# endif
+  
+  digits = 0,
+  digits10 = 0,
+  radix = 0,
+  min_exponent = 0,
+  min_exponent10 = 0,
+  max_exponent = 0,
+  max_exponent10 = 0
+
+# if defined ( _STLP_STATIC_CONST_INIT_BUG)
+  ,  
+  has_denorm = denorm_absent,
+  round_style = round_toward_zero,
+# else
+  ;
+  static const float_denorm_style has_denorm =  denorm_absent;
+  static const float_round_style round_style = round_toward_zero;
+  static const bool 
+# endif
+
+    is_specialized = false,
+    is_signed  = false,
+    is_integer = false,
+    is_exact = false,
+    has_infinity = false,
+    has_quiet_NaN = false,
+    has_signaling_NaN = false,
+    has_denorm_loss = false,
+    is_iec559 = false,
+    is_bounded = false,
+    is_modulo = false,
+    traps = false,
+    tinyness_before = false
+# if defined ( _STLP_STATIC_CONST_INIT_BUG)
+  }
+# endif
+  ;
+    
+  static __number _STLP_CALL epsilon() _STLP_NOTHROW     { return __number(); }
+  static __number _STLP_CALL round_error() _STLP_NOTHROW { return __number(); }
+
+  static __number _STLP_CALL infinity() _STLP_NOTHROW      { return __number(); }
+  static __number _STLP_CALL quiet_NaN() _STLP_NOTHROW     { return __number(); }
+  static __number _STLP_CALL signaling_NaN() _STLP_NOTHROW { return __number(); }
+  static __number _STLP_CALL denorm_min() _STLP_NOTHROW    { return __number(); }
+
+
+};
+
+// Base class for integers.
+
+# ifdef _STLP_LIMITED_DEFAULT_TEMPLATES
+#  ifdef _STLP_LONG_LONG
+#   define _STLP_LIMITS_MIN_TYPE _STLP_LONG_LONG
+#   define _STLP_LIMITS_MAX_TYPE unsigned _STLP_LONG_LONG
+#  else
+#   define _STLP_LIMITS_MIN_TYPE long
+#   define _STLP_LIMITS_MAX_TYPE unsigned long
+#  endif
+# else
+#   define _STLP_LIMITS_MIN_TYPE _Int
+#   define _STLP_LIMITS_MAX_TYPE _Int
+# endif /* _STLP_LIMITED_DEFAULT_TEMPLATES */
+
+template <class _Int,
+          _STLP_LIMITS_MIN_TYPE __imin,
+          _STLP_LIMITS_MAX_TYPE __imax,
+          int __idigits, bool __ismod>
+class _Integer_limits : public _Numeric_limits_base<_Int> 
+{
+public:
+
+  static _Int (_STLP_CALL min) () _STLP_NOTHROW { return (_Int)__imin; }
+  static _Int (_STLP_CALL max) () _STLP_NOTHROW { return (_Int)__imax; }
+
+# if defined ( _STLP_STATIC_CONST_INIT_BUG)
+  enum {
+# else
+  static const int 
+# endif  
+  digits = (__idigits < 0) ?
+  ((int)((sizeof(_Int) * (CHAR_BIT))) - ((__imin == 0) ? 0 : 1))
+  : (__idigits),
+  digits10 = (digits * 301UL) / 1000,
+  radix = 2
+# if ! defined ( _STLP_STATIC_CONST_INIT_BUG)
+  ;
+  static const bool
+# else
+  ,
+# endif
+  is_specialized = true,
+  is_signed = (__imin != 0),
+  is_integer = true,
+  is_exact = true,
+  is_bounded = true,
+  is_modulo = __ismod
+# if defined ( _STLP_STATIC_CONST_INIT_BUG)
+  }
+# endif
+  ;
+};
+
+// Base class for floating-point numbers.
+template <class __number,
+         int __Digits, int __Digits10,
+         int __MinExp, int __MaxExp,
+         int __MinExp10, int __MaxExp10,
+         bool __IsIEC559,
+         float_round_style __RoundStyle>
+class _Floating_limits : public _Numeric_limits_base<__number>
+{
+public:
+
+# if defined ( _STLP_STATIC_CONST_INIT_BUG)
+  enum {
+# else
+  static const int 
+# endif  
+
+  digits = __Digits,
+  digits10 = __Digits10,
+
+  radix = (  FLT_RADIX /* 2 */ ),
+  min_exponent = __MinExp, 
+  max_exponent = __MaxExp,
+  min_exponent10 = __MinExp10,
+  max_exponent10 = __MaxExp10
+
+# if defined (_STLP_STATIC_CONST_INIT_BUG)
+  ,  
+  has_denorm = denorm_indeterminate,
+  round_style = __RoundStyle,
+# else
+  ;
+  static const float_denorm_style has_denorm = denorm_indeterminate;
+  static const float_round_style round_style = __RoundStyle;
+  static const bool 
+# endif
+
+  is_specialized = true,
+  is_signed = true, 
+
+#if (!defined(_CRAY) || !defined(_CRAYIEEE))
+   has_infinity     =  true,
+   has_quiet_NaN    =  true,
+   has_signaling_NaN=  true,
+#else
+  has_infinity     =  false,
+  has_quiet_NaN    =  false,
+  has_signaling_NaN=  false,
+#endif
+
+  has_denorm_loss  =  false,
+  is_iec559      =  __IsIEC559,
+  is_bounded     =  true,
+  traps          =  true,
+  tinyness_before=  false
+
+# if defined ( _STLP_STATIC_CONST_INIT_BUG)
+  }
+# endif
+  ;
+
+};
+
+// Class numeric_limits
+
+// The unspecialized class.
+
+template<class _Tp> 
+class numeric_limits : public _Numeric_limits_base<_Tp> {};
+
+// Specializations for all built-in integral types.
+
+#ifndef _STLP_NO_BOOL
+
+_STLP_TEMPLATE_NULL
+class   numeric_limits<bool>
+  : public _Integer_limits<bool, false, true, 1, false>
+{};
+
+#endif /* _STLP_NO_BOOL */
+
+_STLP_TEMPLATE_NULL
+class   numeric_limits<char>
+  : public _Integer_limits<char, CHAR_MIN, CHAR_MAX, -1, true>
+{};
+
+# ifndef _STLP_NO_SIGNED_BUILTINS
+_STLP_TEMPLATE_NULL
+class   numeric_limits<signed char>
+  : public _Integer_limits<signed char, SCHAR_MIN, SCHAR_MAX, -1, true>
+{};
+# endif
+
+_STLP_TEMPLATE_NULL
+class   numeric_limits<unsigned char>
+  : public _Integer_limits<unsigned char, 0, UCHAR_MAX, -1, true>
+{};
+
+#if !(defined ( _STLP_NO_WCHAR_T ) || defined (_STLP_WCHAR_T_IS_USHORT))
+
+_STLP_TEMPLATE_NULL
+class   numeric_limits<wchar_t>
+  : public _Integer_limits<wchar_t, WCHAR_MIN, WCHAR_MAX, -1, true>
+{};
+
+#endif
+
+_STLP_TEMPLATE_NULL
+class   numeric_limits<short>
+  : public _Integer_limits<short, SHRT_MIN, SHRT_MAX, -1, true>
+{};
+
+_STLP_TEMPLATE_NULL
+class   numeric_limits<unsigned short>
+  : public _Integer_limits<unsigned short, 0, USHRT_MAX, -1, true>
+{};
+
+# if defined (__xlC__) && (__xlC__ == 0x500)
+#  undef INT_MIN
+#  define INT_MIN -2147483648
+# endif
+
+
+_STLP_TEMPLATE_NULL
+class   numeric_limits<int>
+  : public _Integer_limits<int, INT_MIN, INT_MAX, -1, true>
+{};
+
+_STLP_TEMPLATE_NULL
+class   numeric_limits<unsigned int>
+  : public _Integer_limits<unsigned int, 0, UINT_MAX, -1, true>
+{};
+
+_STLP_TEMPLATE_NULL
+class   numeric_limits<long>
+  : public _Integer_limits<long, LONG_MIN, LONG_MAX, -1, true>
+{};
+
+_STLP_TEMPLATE_NULL
+class   numeric_limits<unsigned long>
+  : public _Integer_limits<unsigned long, 0, ULONG_MAX, -1, true>
+{};
+
+#ifdef _STLP_LONG_LONG
+
+# if defined (_STLP_MSVC) || defined (__BORLANDC__)
+
+#    define LONGLONG_MAX     0x7fffffffffffffffi64
+#    define LONGLONG_MIN     (-LONGLONG_MAX-1i64)
+#    define ULONGLONG_MAX    0xffffffffffffffffUi64
+
+# else
+
+#  ifndef   LONGLONG_MAX
+#    define LONGLONG_MAX     0x7fffffffffffffffLL
+#  endif
+#  ifndef   LONGLONG_MIN
+#    define LONGLONG_MIN     (-LONGLONG_MAX-1LL)
+#  endif
+#  ifndef   ULONGLONG_MAX
+#    define ULONGLONG_MAX    0xffffffffffffffffULL
+#  endif
+
+# endif
+
+#if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ <= 96)
+
+_STLP_TEMPLATE_NULL
+class   numeric_limits<_STLP_LONG_LONG>
+  : public _Integer_limits<_STLP_LONG_LONG, LONGLONG_MIN, LONGLONG_MAX, -1, true>
+{};
+
+_STLP_TEMPLATE_NULL
+class   numeric_limits<unsigned _STLP_LONG_LONG>
+  : public _Integer_limits<unsigned _STLP_LONG_LONG, 0, ULONGLONG_MAX, -1, true>
+{};
+#else /* gcc 2.97 (after 2000-11-01), 2.98, 3.0 */
+/*
+ newest gcc has new mangling scheme, that has problem
+ with generating name [instantiated] of template specialization like
+ _Integer_limits<_STLP_LONG_LONG, LONGLONG_MIN, LONGLONG_MAX, -1, true>
+                                  ~~~~~~~~~~~~  ~~~~~~~~~~~~
+ Below is code that solve this problem.
+   - ptr
+ */
+_STLP_TEMPLATE_NULL
+class   numeric_limits<_STLP_LONG_LONG>
+  : public _Numeric_limits_base<_STLP_LONG_LONG> 
+{
+public:
+
+  static _STLP_LONG_LONG (_STLP_CALL min) () _STLP_NOTHROW { return LONGLONG_MIN; }
+  static _STLP_LONG_LONG (_STLP_CALL max) () _STLP_NOTHROW { return LONGLONG_MAX; }
+
+# if defined ( _STLP_STATIC_CONST_INIT_BUG)
+  enum {
+# else
+  static const int 
+# endif  
+  digits = ((int)((sizeof(_STLP_LONG_LONG) * (CHAR_BIT))) - 1),
+  digits10 = (digits * 301UL) / 1000,
+  radix = 2
+# if ! defined ( _STLP_STATIC_CONST_INIT_BUG)
+  ;
+  static const bool
+# else
+  ,
+# endif
+  is_specialized = true,
+  is_signed = true,
+  is_integer = true,
+  is_exact = true,
+  is_bounded = true,
+  is_modulo = true
+# if defined ( _STLP_STATIC_CONST_INIT_BUG)
+  }
+# endif
+  ;
+};
+
+_STLP_TEMPLATE_NULL
+class   numeric_limits<unsigned _STLP_LONG_LONG>
+  : public _Numeric_limits_base<unsigned _STLP_LONG_LONG> 
+{
+public:
+
+  static unsigned _STLP_LONG_LONG (_STLP_CALL min) () _STLP_NOTHROW { return 0ULL; }
+  static unsigned _STLP_LONG_LONG (_STLP_CALL max) () _STLP_NOTHROW { return ULONGLONG_MAX; }
+
+# if defined ( _STLP_STATIC_CONST_INIT_BUG)
+  enum {
+# else
+  static const int 
+# endif  
+  digits = ((int)((sizeof(unsigned _STLP_LONG_LONG) * (CHAR_BIT)))),
+  digits10 = (digits * 301UL) / 1000,
+  radix = 2
+# if ! defined ( _STLP_STATIC_CONST_INIT_BUG)
+  ;
+  static const bool
+# else
+  ,
+# endif
+  is_specialized = true,
+  is_signed = false,
+  is_integer = true,
+  is_exact = true,
+  is_bounded = true,
+  is_modulo = true
+# if defined ( _STLP_STATIC_CONST_INIT_BUG)
+  }
+# endif
+  ;
+};
+
+# endif /* __GNUC__ > 2000-11-01 */
+
+#endif /* _STLP_LONG_LONG */
+
+// Specializations for all built-in floating-point types.
+
+union _F_rep
+{
+  unsigned short rep[2];
+  float val;
+};
+union _D_rep
+{
+  unsigned short rep[4];
+  double val;
+};
+
+# ifndef _STLP_NO_LONG_DOUBLE
+union _L_rep
+{
+  unsigned short rep[8];
+  long double val;
+};
+# endif
+
+template <class __dummy>
+class _LimG 
+{
+public:  
+  static const _F_rep _F_inf;
+  static const _F_rep _F_qNaN;
+  static const _F_rep _F_sNaN;
+  static const _D_rep _D_inf;
+  static const _D_rep _D_qNaN;
+  static const _D_rep _D_sNaN;
+  
+# ifndef _STLP_NO_LONG_DOUBLE
+  static const _L_rep _L_inf;
+  static const _L_rep _L_qNaN;
+  static const _L_rep _L_sNaN;
+# endif
+};
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT) 
+_STLP_EXPORT_TEMPLATE_CLASS _LimG<bool>;
+# endif
+
+_STLP_TEMPLATE_NULL class   numeric_limits<float>
+  : public _Floating_limits<float, 
+                            FLT_MANT_DIG,   // Binary digits of precision
+                            FLT_DIG,        // Decimal digits of precision
+                            FLT_MIN_EXP,    // Minimum exponent
+                            FLT_MAX_EXP,    // Maximum exponent
+                            FLT_MIN_10_EXP, // Minimum base 10 exponent
+                            FLT_MAX_10_EXP, // Maximum base 10 exponent
+                            true,           // conforms to iec559
+                            round_to_nearest>
+{
+public:
+  static float (_STLP_CALL min) () _STLP_NOTHROW { return FLT_MIN; }
+  static float _STLP_CALL denorm_min() _STLP_NOTHROW { return FLT_MIN; }
+  static float (_STLP_CALL max) () _STLP_NOTHROW { _STLP_USING_VENDOR_CSTD return FLT_MAX; }
+  static float _STLP_CALL epsilon() _STLP_NOTHROW { return FLT_EPSILON; }
+  static float _STLP_CALL round_error() _STLP_NOTHROW { return 0.5f; } // Units: ulps.
+  static  float _STLP_CALL infinity() { return _LimG<bool>::_F_inf.val; }
+  static  float _STLP_CALL quiet_NaN() { return _LimG<bool>::_F_qNaN.val; }
+  static  float _STLP_CALL signaling_NaN() { return _LimG<bool>::_F_sNaN.val; }
+};
+
+_STLP_TEMPLATE_NULL class   numeric_limits<double>
+  : public _Floating_limits<double, 
+                            DBL_MANT_DIG,   // Binary digits of precision
+                            DBL_DIG,        // Decimal digits of precision
+                            DBL_MIN_EXP,    // Minimum exponent
+                            DBL_MAX_EXP,    // Maximum exponent
+                            DBL_MIN_10_EXP, // Minimum base 10 exponent
+                            DBL_MAX_10_EXP, // Maximum base 10 exponent
+                            true,           // conforms to iec559
+                            round_to_nearest>
+{
+public:
+  static double (_STLP_CALL min)() _STLP_NOTHROW { return DBL_MIN; }
+  static double _STLP_CALL denorm_min() _STLP_NOTHROW { return DBL_MIN; }
+  static double (_STLP_CALL max)() _STLP_NOTHROW { _STLP_USING_VENDOR_CSTD return DBL_MAX; }
+  static double _STLP_CALL epsilon() _STLP_NOTHROW { return DBL_EPSILON; }
+  static double _STLP_CALL round_error() _STLP_NOTHROW { return 0.5; } // Units: ulps.
+  static  double _STLP_CALL infinity() { return _LimG<bool>::_D_inf.val; }
+  static  double _STLP_CALL quiet_NaN(){ return _LimG<bool>::_D_qNaN.val; }
+  static  double _STLP_CALL signaling_NaN() { return _LimG<bool>::_D_sNaN.val; }
+};
+
+# ifndef _STLP_NO_LONG_DOUBLE
+
+_STLP_TEMPLATE_NULL 
+class   numeric_limits<long double>
+  : public _Floating_limits<long double, 
+                            LDBL_MANT_DIG,  // Binary digits of precision
+                            LDBL_DIG,       // Decimal digits of precision
+                            LDBL_MIN_EXP,   // Minimum exponent
+                            LDBL_MAX_EXP,   // Maximum exponent
+                            LDBL_MIN_10_EXP,// Minimum base 10 exponent
+                            LDBL_MAX_10_EXP,// Maximum base 10 exponent
+                            false,          // Doesn't conform to iec559
+                            round_to_nearest>
+{
+public:
+  static long double (_STLP_CALL min) () _STLP_NOTHROW { _STLP_USING_VENDOR_CSTD return LDBL_MIN; }
+  static long double _STLP_CALL denorm_min() _STLP_NOTHROW { _STLP_USING_VENDOR_CSTD return LDBL_MIN; }
+  static long double (_STLP_CALL max) () _STLP_NOTHROW { _STLP_USING_VENDOR_CSTD return LDBL_MAX; }
+  static long double _STLP_CALL epsilon() _STLP_NOTHROW { return LDBL_EPSILON; }
+  static long double _STLP_CALL round_error() _STLP_NOTHROW { return 4; } // Units: ulps.
+  static long double _STLP_CALL infinity() { return _LimG<bool>::_L_inf.val; } 
+  static long double _STLP_CALL quiet_NaN() { return _LimG<bool>::_L_qNaN.val; }
+  static long double _STLP_CALL signaling_NaN() { return _LimG<bool>::_L_sNaN.val; }
+};
+
+# endif
+
+// We write special values (Inf and NaN) as bit patterns and 
+// cast the the appropriate floating-point types. 
+_STLP_END_NAMESPACE
+
+# if !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_limits.c>
+# endif
+
+#endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_list.c b/main/source/stlport/stlport/stl/_list.c
new file mode 100644
index 00000000..20ecdf80
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_list.c
@@ -0,0 +1,210 @@
+/*
+ *
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+#ifndef _STLP_LIST_C
+#define _STLP_LIST_C
+
+#ifndef _STLP_INTERNAL_LIST_H
+# include <stl/_list.h>
+#endif
+
+#if defined (__WATCOMC__)
+#include <vector>
+#endif
+
+# undef list
+# define  list  __WORKAROUND_DBG_RENAME(list)
+
+_STLP_BEGIN_NAMESPACE
+
+# if defined (_STLP_EXPOSE_GLOBALS_IMPLEMENTATION)
+
+template <class _Dummy>
+void _STLP_CALL
+_List_global<_Dummy>::_Transfer(_List_node_base* __position, 
+				_List_node_base* __first, _List_node_base* __last) {
+  if (__position != __last) {
+    // Remove [first, last) from its old position.
+    ((_Node*) (__last->_M_prev))->_M_next = __position;
+    ((_Node*) (__first->_M_prev))->_M_next    = __last;
+    ((_Node*) (__position->_M_prev))->_M_next = __first; 
+    
+    // Splice [first, last) into its new position.
+    _Node* __tmp = (_Node*) (__position->_M_prev);
+    __position->_M_prev = __last->_M_prev;
+    __last->_M_prev      = __first->_M_prev; 
+    __first->_M_prev    = __tmp;
+  }
+}
+
+#endif /* defined (__BUILDING_STLPORT) || ! defined (_STLP_OWN_IOSTREAMS) */
+
+
+template <class _Tp, class _Alloc>
+void 
+_List_base<_Tp,_Alloc>::clear() 
+{
+  _List_node<_Tp>* __cur = (_List_node<_Tp>*) this->_M_node._M_data->_M_next;
+  while (__cur != this->_M_node._M_data) {
+    _List_node<_Tp>* __tmp = __cur;
+    __cur = (_List_node<_Tp>*) __cur->_M_next;
+    _STLP_STD::_Destroy(&__tmp->_M_data);
+    this->_M_node.deallocate(__tmp, 1);
+  }
+  this->_M_node._M_data->_M_next = this->_M_node._M_data;
+  this->_M_node._M_data->_M_prev = this->_M_node._M_data;
+}
+
+# if defined (_STLP_NESTED_TYPE_PARAM_BUG) 
+#  define size_type      size_t
+# endif
+
+template <class _Tp, class _Alloc>
+void list<_Tp, _Alloc>::resize(size_type __new_size, _Tp __x)
+{
+  iterator __i = begin();
+  size_type __len = 0;
+  for ( ; __i != end() && __len < __new_size; ++__i, ++__len);
+
+  if (__len == __new_size)
+    erase(__i, end());
+  else                          // __i == end()
+    insert(end(), __new_size - __len, __x);
+}
+
+template <class _Tp, class _Alloc>
+list<_Tp, _Alloc>& list<_Tp, _Alloc>::operator=(const list<_Tp, _Alloc>& __x)
+{
+  if (this != &__x) {
+    iterator __first1 = begin();
+    iterator __last1 = end();
+    const_iterator __first2 = __x.begin();
+    const_iterator __last2 = __x.end();
+    while (__first1 != __last1 && __first2 != __last2) 
+      *__first1++ = *__first2++;
+    if (__first2 == __last2)
+      erase(__first1, __last1);
+    else
+      insert(__last1, __first2, __last2);
+  }
+  return *this;
+}
+
+template <class _Tp, class _Alloc>
+void list<_Tp, _Alloc>::_M_fill_assign(size_type __n, const _Tp& __val) {
+  iterator __i = begin();
+  for ( ; __i != end() && __n > 0; ++__i, --__n)
+    *__i = __val;
+  if (__n > 0)
+    insert(end(), __n, __val);
+  else
+    erase(__i, end());
+}
+
+template <class _Tp, class _Alloc, class _Predicate> 
+void _S_remove_if(list<_Tp, _Alloc>& __that, _Predicate __pred)  {
+  typename list<_Tp, _Alloc>::iterator __first = __that.begin();
+  typename list<_Tp, _Alloc>::iterator __last = __that.end();
+  while (__first != __last) {
+    typename list<_Tp, _Alloc>::iterator __next = __first;
+    ++__next;
+    if (__pred(*__first)) __that.erase(__first);
+    __first = __next;
+  }
+}
+
+template <class _Tp, class _Alloc, class _BinaryPredicate>
+void _S_unique(list<_Tp, _Alloc>& __that, _BinaryPredicate __binary_pred) {
+  typename list<_Tp, _Alloc>::iterator __first = __that.begin();
+  typename list<_Tp, _Alloc>::iterator __last = __that.end();
+  if (__first == __last) return;
+  typename list<_Tp, _Alloc>::iterator __next = __first;
+  while (++__next != __last) {
+    if (__binary_pred(*__first, *__next))
+      __that.erase(__next);
+    else
+      __first = __next;
+    __next = __first;
+  }
+}
+
+template <class _Tp, class _Alloc, class _StrictWeakOrdering>
+void _S_merge(list<_Tp, _Alloc>& __that, list<_Tp, _Alloc>& __x,
+	      _StrictWeakOrdering __comp) {
+  typedef typename list<_Tp, _Alloc>::iterator _Literator;
+  _Literator __first1 = __that.begin();
+  _Literator __last1 = __that.end();
+  _Literator __first2 = __x.begin();
+  _Literator __last2 = __x.end();
+  while (__first1 != __last1 && __first2 != __last2)
+    if (__comp(*__first2, *__first1)) {
+      _Literator __next = __first2;
+      _List_global_inst::_Transfer(__first1._M_node, __first2._M_node, (++__next)._M_node);
+      __first2 = __next;
+    }
+    else
+      ++__first1;
+  if (__first2 != __last2) _List_global_inst::_Transfer(__last1._M_node, __first2._M_node, __last2._M_node);
+}
+
+template <class _Tp, class _Alloc, class _StrictWeakOrdering>
+void _S_sort(list<_Tp, _Alloc>& __that, _StrictWeakOrdering __comp) {
+  // Do nothing if the list has length 0 or 1.
+  if (__that._M_node._M_data->_M_next != __that._M_node._M_data &&
+      (__that._M_node._M_data->_M_next)->_M_next != __that._M_node._M_data) {
+    list<_Tp, _Alloc> __carry;
+#if !defined (__WATCOMC__)
+    list<_Tp, _Alloc> __counter[64];
+#else
+    __vector__<list<_Tp, _Alloc>, _Alloc> __counter(64);		
+#endif		//*TY 05/25/2000 - 
+    int __fill = 0;
+    while (!__that.empty()) {
+      __carry.splice(__carry.begin(), __that, __that.begin());
+      int __i = 0;
+      while(__i < __fill && !__counter[__i].empty()) {
+	_S_merge(__counter[__i], __carry, __comp);
+	__carry.swap(__counter[__i++]);
+      }
+      __carry.swap(__counter[__i]);         
+      if (__i == __fill) ++__fill;
+    } 
+    
+    for (int __i = 1; __i < __fill; ++__i) 
+      _S_merge(__counter[__i], __counter[__i-1], __comp);
+    __that.swap(__counter[__fill-1]);
+  }
+}
+
+# undef  list
+# undef  size_type
+
+_STLP_END_NAMESPACE
+
+#endif /*  _STLP_LIST_C */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_list.h b/main/source/stlport/stlport/stl/_list.h
new file mode 100644
index 00000000..0acf76f3
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_list.h
@@ -0,0 +1,575 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_LIST_H
+#define _STLP_INTERNAL_LIST_H
+
+# ifndef _STLP_INTERNAL_ALGOBASE_H
+#  include <stl/_algobase.h>
+# endif
+
+# ifndef _STLP_INTERNAL_ALLOC_H
+#  include <stl/_alloc.h>
+# endif
+
+# ifndef _STLP_INTERNAL_ITERATOR_H
+#  include <stl/_iterator.h>
+# endif
+
+# ifndef _STLP_INTERNAL_CONSTRUCT_H
+#  include <stl/_construct.h>
+# endif
+
+# ifndef _STLP_INTERNAL_FUNCTION_BASE_H
+#  include <stl/_function_base.h>
+# endif
+
+_STLP_BEGIN_NAMESPACE
+
+# undef list
+# define  list  __WORKAROUND_DBG_RENAME(list)
+
+struct _List_node_base {
+  _List_node_base* _M_next;
+  _List_node_base* _M_prev;
+};
+
+template <class _Dummy>
+class _List_global {
+public:
+  typedef _List_node_base _Node;
+  static void  _STLP_CALL _Transfer(_List_node_base* __position, 
+                                    _List_node_base* __first, _List_node_base* __last);
+};
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT) 
+_STLP_EXPORT_TEMPLATE_CLASS _List_global<bool>;
+# endif
+typedef _List_global<bool> _List_global_inst;
+
+template <class _Tp>
+struct _List_node : public _List_node_base {
+  _Tp _M_data;
+  __TRIVIAL_STUFF(_List_node)
+
+#ifdef __DMC__
+  // for some reason, Digital Mars C++ needs a constructor...
+ private:
+  _List_node();
+#endif
+};
+
+struct _List_iterator_base {
+  typedef size_t                     size_type;
+  typedef ptrdiff_t                  difference_type;
+  typedef bidirectional_iterator_tag iterator_category;
+
+  _List_node_base* _M_node;
+
+  _List_iterator_base(_List_node_base* __x) : _M_node(__x) {}
+  _List_iterator_base() {}
+
+  void _M_incr() { _M_node = _M_node->_M_next; }
+  void _M_decr() { _M_node = _M_node->_M_prev; }
+  bool operator==(const _List_iterator_base& __y ) const { 
+    return _M_node == __y._M_node; 
+  }
+  bool operator!=(const _List_iterator_base& __y ) const { 
+    return _M_node != __y._M_node; 
+  }
+};  
+
+
+
+
+template<class _Tp, class _Traits>
+struct _List_iterator : public _List_iterator_base {
+  typedef _Tp value_type;
+  typedef typename _Traits::pointer    pointer;
+  typedef typename _Traits::reference  reference;
+
+  typedef _List_iterator<_Tp, _Nonconst_traits<_Tp> > iterator;
+  typedef _List_iterator<_Tp, _Const_traits<_Tp> >    const_iterator;
+  typedef _List_iterator<_Tp, _Traits>                       _Self;
+
+  typedef bidirectional_iterator_tag iterator_category;
+  typedef _List_node<_Tp> _Node;
+  typedef size_t size_type;
+  typedef ptrdiff_t difference_type;
+
+  _List_iterator(_Node* __x) : _List_iterator_base(__x) {}
+  _List_iterator() {}
+  _List_iterator(const iterator& __x) :  _List_iterator_base(__x._M_node) {}
+
+  reference operator*() const { return ((_Node*)_M_node)->_M_data; }
+
+  _STLP_DEFINE_ARROW_OPERATOR
+
+  _Self& operator++() { 
+    this->_M_incr();
+    return *this;
+  }
+  _Self operator++(int) { 
+    _Self __tmp = *this;
+    this->_M_incr();
+    return __tmp;
+  }
+  _Self& operator--() { 
+    this->_M_decr();
+    return *this;
+  }
+  _Self operator--(int) { 
+    _Self __tmp = *this;
+    this->_M_decr();
+    return __tmp;
+  }
+};
+
+
+#ifdef _STLP_USE_OLD_HP_ITERATOR_QUERIES
+template <class _Tp, class _Traits>
+inline _Tp* value_type(const _List_iterator<_Tp, _Traits>&) { return 0; }
+inline bidirectional_iterator_tag iterator_category(const _List_iterator_base&) { return bidirectional_iterator_tag();}
+inline ptrdiff_t* distance_type(const _List_iterator_base&) { return 0; }
+#endif
+
+
+// Base class that encapsulates details of allocators and helps 
+// to simplify EH
+
+template <class _Tp, class _Alloc>
+class _List_base 
+{
+protected:
+  _STLP_FORCE_ALLOCATORS(_Tp, _Alloc)
+  typedef _List_node<_Tp> _Node;
+  typedef typename _Alloc_traits<_Node, _Alloc>::allocator_type
+           _Node_allocator_type;
+public:
+  typedef typename _Alloc_traits<_Tp, _Alloc>::allocator_type
+          allocator_type;
+
+  allocator_type get_allocator() const { 
+    return _STLP_CONVERT_ALLOCATOR((const _Node_allocator_type&)_M_node, _Tp);
+  }
+
+  _List_base(const allocator_type& __a) : _M_node(_STLP_CONVERT_ALLOCATOR(__a, _Node), (_Node*)0) {
+    _Node* __n = _M_node.allocate(1);
+    __n->_M_next = __n;
+    __n->_M_prev = __n;
+    _M_node._M_data = __n;
+  }
+  ~_List_base() {
+    clear();
+    _M_node.deallocate(_M_node._M_data, 1);
+  }
+
+  void clear();
+
+public:
+  _STLP_alloc_proxy<_Node*, _Node, _Node_allocator_type>  _M_node;
+};
+
+template <class _Tp, _STLP_DEFAULT_ALLOCATOR_SELECT(_Tp) >
+class list;
+
+// helper functions to reduce code duplication
+template <class _Tp, class _Alloc, class _Predicate> 
+void _S_remove_if(list<_Tp, _Alloc>& __that, _Predicate __pred);
+
+template <class _Tp, class _Alloc, class _BinaryPredicate>
+void _S_unique(list<_Tp, _Alloc>& __that, _BinaryPredicate __binary_pred);
+
+template <class _Tp, class _Alloc, class _StrictWeakOrdering>
+void _S_merge(list<_Tp, _Alloc>& __that, list<_Tp, _Alloc>& __x,
+	      _StrictWeakOrdering __comp);
+
+template <class _Tp, class _Alloc, class _StrictWeakOrdering>
+void _S_sort(list<_Tp, _Alloc>& __that, _StrictWeakOrdering __comp);
+
+template <class _Tp, class _Alloc>
+class list : public _List_base<_Tp, _Alloc> {
+  typedef _List_base<_Tp, _Alloc> _Base;
+  typedef list<_Tp, _Alloc> _Self;
+public:      
+  typedef _Tp value_type;
+  typedef value_type* pointer;
+  typedef const value_type* const_pointer;
+  typedef value_type& reference;
+  typedef const value_type& const_reference;
+  typedef _List_node<_Tp> _Node;
+  typedef size_t size_type;
+  typedef ptrdiff_t difference_type;
+  _STLP_FORCE_ALLOCATORS(_Tp, _Alloc)
+  typedef typename _Base::allocator_type allocator_type;
+  typedef bidirectional_iterator_tag _Iterator_category;
+
+public:
+  typedef _List_iterator<_Tp, _Nonconst_traits<_Tp> > iterator;
+  typedef _List_iterator<_Tp, _Const_traits<_Tp> >    const_iterator;
+  _STLP_DECLARE_BIDIRECTIONAL_REVERSE_ITERATORS;
+
+protected:
+  _Node* _M_create_node(const _Tp& __x)
+  {
+    _Node* __p = this->_M_node.allocate(1);
+    _STLP_TRY {
+      _Construct(&__p->_M_data, __x);
+    }
+    _STLP_UNWIND(this->_M_node.deallocate(__p, 1));
+    return __p;
+  }
+
+  _Node* _M_create_node()
+  {
+    _Node* __p = this->_M_node.allocate(1);
+    _STLP_TRY {
+      _Construct(&__p->_M_data);
+    }
+    _STLP_UNWIND(this->_M_node.deallocate(__p, 1));
+    return __p;
+  }
+
+public:
+# if !(defined(__MRC__)||(defined(__SC__) && !defined(__DMC__)))
+  explicit
+# endif
+  list(const allocator_type& __a = allocator_type()) :
+    _List_base<_Tp, _Alloc>(__a) {}
+
+  iterator begin()             { return iterator((_Node*)(this->_M_node._M_data->_M_next)); }
+  const_iterator begin() const { return const_iterator((_Node*)(this->_M_node._M_data->_M_next)); }
+
+  iterator end()             { return this->_M_node._M_data; }
+  const_iterator end() const { return this->_M_node._M_data; }
+
+  reverse_iterator rbegin() 
+    { return reverse_iterator(end()); }
+  const_reverse_iterator rbegin() const 
+    { return const_reverse_iterator(end()); }
+
+  reverse_iterator rend()
+    { return reverse_iterator(begin()); }
+  const_reverse_iterator rend() const
+    { return const_reverse_iterator(begin()); }
+
+  bool empty() const { return this->_M_node._M_data->_M_next == this->_M_node._M_data; }
+  size_type size() const {
+    size_type __result = distance(begin(), end());
+    return __result;
+  }
+  size_type max_size() const { return size_type(-1); }
+
+  reference front() { return *begin(); }
+  const_reference front() const { return *begin(); }
+  reference back() { return *(--end()); }
+  const_reference back() const { return *(--end()); }
+
+  void swap(list<_Tp, _Alloc>& __x) {
+    _STLP_STD::swap(this->_M_node, __x._M_node); 
+  }
+
+  iterator insert(iterator __position, const _Tp& __x) {
+
+    _Node* __tmp = _M_create_node(__x);
+    _List_node_base* __n = __position._M_node;
+    _List_node_base* __p = __n->_M_prev;
+    __tmp->_M_next = __n;
+    __tmp->_M_prev = __p;
+    __p->_M_next = __tmp;
+    __n->_M_prev = __tmp;
+    return __tmp;
+  }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIterator>
+  void insert(iterator __pos, _InputIterator __first, _InputIterator __last) {
+    typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
+    _M_insert_dispatch(__pos, __first, __last, _Integral());
+  }
+  // Check whether it's an integral type.  If so, it's not an iterator.
+  template<class _Integer>
+  void _M_insert_dispatch(iterator __pos, _Integer __n, _Integer __x,
+                          const __true_type&) {
+    _M_fill_insert(__pos, (size_type) __n, (_Tp) __x);
+  }
+  template <class _InputIter>
+  void 
+  _M_insert_dispatch(iterator __position,
+		     _InputIter __first, _InputIter __last,
+		     const __false_type&) 
+#else /* _STLP_MEMBER_TEMPLATES */
+  void insert(iterator __position, const _Tp* __first, const _Tp* __last) {
+    for ( ; __first != __last; ++__first)
+      insert(__position, *__first);
+  }
+  void insert(iterator __position, const_iterator __first, const_iterator __last)
+#endif /* _STLP_MEMBER_TEMPLATES */
+  {
+    for ( ; __first != __last; ++__first)
+      insert(__position, *__first);
+  }
+  void insert(iterator __pos, size_type __n, const _Tp& __x) { _M_fill_insert(__pos, __n, __x); }
+  
+  void _M_fill_insert(iterator __pos, size_type __n, const _Tp& __x) {
+    for ( ; __n > 0; --__n)
+      insert(__pos, __x);
+  } 
+  void push_front(const _Tp& __x) { insert(begin(), __x); }
+  void push_back(const _Tp& __x) { insert(end(), __x); }
+
+# ifndef _STLP_NO_ANACHRONISMS
+  iterator insert(iterator __position) { return insert(__position, _Tp()); }
+  void push_front() {insert(begin());}
+  void push_back() {insert(end());}
+# endif
+
+  iterator erase(iterator __position) {
+    _List_node_base* __next_node = __position._M_node->_M_next;
+    _List_node_base* __prev_node = __position._M_node->_M_prev;
+    _Node* __n = (_Node*) __position._M_node;
+    __prev_node->_M_next = __next_node;
+    __next_node->_M_prev = __prev_node;
+    _STLP_STD::_Destroy(&__n->_M_data);
+    this->_M_node.deallocate(__n, 1);
+    return iterator((_Node*)__next_node);
+    }
+  
+  iterator erase(iterator __first, iterator __last) {
+    while (__first != __last)
+      erase(__first++);
+    return __last;
+  }
+
+  void resize(size_type __new_size, _Tp __x);
+  void resize(size_type __new_size) { this->resize(__new_size, _Tp()); }
+
+  void pop_front() { erase(begin()); }
+  void pop_back() { 
+    iterator __tmp = end();
+    erase(--__tmp);
+  }
+  list(size_type __n, const _Tp& __val,
+       const allocator_type& __a = allocator_type())
+    : _List_base<_Tp, _Alloc>(__a)
+    { this->insert(begin(), __n, __val); }
+  explicit list(size_type __n)
+    : _List_base<_Tp, _Alloc>(allocator_type())
+    { this->insert(begin(), __n, _Tp()); }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+  // We don't need any dispatching tricks here, because insert does all of
+  // that anyway.
+# ifdef _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS
+  template <class _InputIterator>
+  list(_InputIterator __first, _InputIterator __last)
+    : _List_base<_Tp, _Alloc>(allocator_type())
+  { insert(begin(), __first, __last); }
+# endif  
+  template <class _InputIterator>
+  list(_InputIterator __first, _InputIterator __last,
+       const allocator_type& __a _STLP_ALLOCATOR_TYPE_DFL)
+    : _List_base<_Tp, _Alloc>(__a)
+  { insert(begin(), __first, __last); }
+  
+#else /* _STLP_MEMBER_TEMPLATES */
+
+  list(const _Tp* __first, const _Tp* __last,
+       const allocator_type& __a = allocator_type())
+    : _List_base<_Tp, _Alloc>(__a)
+    { insert(begin(), __first, __last); }
+  list(const_iterator __first, const_iterator __last,
+       const allocator_type& __a = allocator_type())
+    : _List_base<_Tp, _Alloc>(__a)
+    { insert(begin(), __first, __last); }
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+  list(const list<_Tp, _Alloc>& __x) : _List_base<_Tp, _Alloc>(__x.get_allocator())
+    { insert(begin(), __x.begin(), __x.end()); }
+
+  ~list() { }
+
+  list<_Tp, _Alloc>& operator=(const list<_Tp, _Alloc>& __x);
+
+public:
+  // assign(), a generalized assignment member function.  Two
+  // versions: one that takes a count, and one that takes a range.
+  // The range version is a member template, so we dispatch on whether
+  // or not the type is an integer.
+
+  void assign(size_type __n, const _Tp& __val) { _M_fill_assign(__n, __val); }
+
+  void _M_fill_assign(size_type __n, const _Tp& __val);
+
+#ifdef _STLP_MEMBER_TEMPLATES
+
+  template <class _InputIterator>
+  void assign(_InputIterator __first, _InputIterator __last) {
+    typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
+    _M_assign_dispatch(__first, __last, _Integral());
+  }
+
+  template <class _Integer>
+  void _M_assign_dispatch(_Integer __n, _Integer __val, const __true_type&)
+    { assign((size_type) __n, (_Tp) __val); }
+
+  template <class _InputIterator>
+  void _M_assign_dispatch(_InputIterator __first2, _InputIterator __last2,
+                          const __false_type&) {
+    iterator __first1 = begin();
+    iterator __last1 = end();
+    for ( ; __first1 != __last1 && __first2 != __last2; ++__first1, ++__first2)
+      *__first1 = *__first2;
+    if (__first2 == __last2)
+      erase(__first1, __last1);
+    else
+      insert(__last1, __first2, __last2);
+  }
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+public:
+  void splice(iterator __position, _Self& __x) {
+    if (!__x.empty()) 
+      _List_global_inst::_Transfer(__position._M_node, __x.begin()._M_node, __x.end()._M_node);
+  }
+  void splice(iterator __position, _Self&, iterator __i) {
+    iterator __j = __i;
+    ++__j;
+    if (__position == __i || __position == __j) return;
+    _List_global_inst::_Transfer(__position._M_node, __i._M_node, __j._M_node);
+  }
+  void splice(iterator __position, _Self&, iterator __first, iterator __last) {
+    if (__first != __last) 
+      _List_global_inst::_Transfer(__position._M_node, __first._M_node, __last._M_node);
+  }
+
+  void remove(const _Tp& __val) {
+    iterator __first = begin();
+    iterator __last = end();
+    while (__first != __last) {
+      iterator __next = __first;
+      ++__next;
+      if (__val == *__first) erase(__first);
+      __first = __next;
+    }
+  }
+  
+  void unique() {
+    _S_unique(*this, equal_to<_Tp>());
+  }
+  
+  void merge(_Self& __x) {
+    _S_merge(*this, __x, less<_Tp>());
+  }
+
+  void reverse() {
+    _List_node_base* __p = this->_M_node._M_data;
+    _List_node_base* __tmp = __p;
+    do {
+      _STLP_STD::swap(__tmp->_M_next, __tmp->_M_prev);
+      __tmp = __tmp->_M_prev;     // Old next node is now prev.
+    } while (__tmp != __p);
+  }    
+  
+  void sort() {
+    _S_sort(*this, less<_Tp>());
+  }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _Predicate> void remove_if(_Predicate __pred)  {
+    _S_remove_if(*this, __pred);
+  }
+  template <class _BinaryPredicate>
+    void unique(_BinaryPredicate __binary_pred) {
+    _S_unique(*this, __binary_pred);
+  }
+
+  template <class _StrictWeakOrdering>
+    void merge(list<_Tp, _Alloc>& __x,
+	  _StrictWeakOrdering __comp) {
+    _S_merge(*this, __x, __comp);
+  }
+
+  template <class _StrictWeakOrdering>
+    void sort(_StrictWeakOrdering __comp) {
+    _S_sort(*this, __comp);
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+};
+
+template <class _Tp, class _Alloc>
+_STLP_INLINE_LOOP bool  _STLP_CALL
+operator==(const list<_Tp,_Alloc>& __x, const list<_Tp,_Alloc>& __y)
+{
+  typedef typename list<_Tp,_Alloc>::const_iterator const_iterator;
+  const_iterator __end1 = __x.end();
+  const_iterator __end2 = __y.end();
+
+  const_iterator __i1 = __x.begin();
+  const_iterator __i2 = __y.begin();
+  while (__i1 != __end1 && __i2 != __end2 && *__i1 == *__i2) {
+    ++__i1;
+    ++__i2;
+  }
+  return __i1 == __end1 && __i2 == __end2;
+}
+
+# define _STLP_EQUAL_OPERATOR_SPECIALIZED
+# define _STLP_TEMPLATE_HEADER    template <class _Tp, class _Alloc>
+# define _STLP_TEMPLATE_CONTAINER list<_Tp, _Alloc>
+# include <stl/_relops_cont.h>
+# undef _STLP_TEMPLATE_CONTAINER
+# undef _STLP_TEMPLATE_HEADER
+# undef _STLP_EQUAL_OPERATOR_SPECIALIZED
+
+_STLP_END_NAMESPACE 
+
+# if !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_list.c>
+# endif
+
+// do a cleanup
+# undef list
+# define __list__ __FULL_NAME(list)
+
+#if defined (_STLP_DEBUG)
+# include <stl/debug/_list.h>
+#endif
+
+#if defined (_STLP_USE_WRAPPER_FOR_ALLOC_PARAM)
+# include <stl/wrappers/_list.h>
+#endif
+
+#endif /* _STLP_INTERNAL_LIST_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_locale.h b/main/source/stlport/stlport/stl/_locale.h
new file mode 100644
index 00000000..5025a7aa
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_locale.h
@@ -0,0 +1,233 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+// WARNING: This is an internal header file, included by other C++
+// standard library headers.  You should not attempt to use this header
+// file directly.
+
+
+#ifndef _STLP_INTERNAL_LOCALE_H
+#define _STLP_INTERNAL_LOCALE_H
+
+#ifndef _STLP_CSTDLIB
+# include <cstdlib>
+#endif
+
+#ifndef _STLP_CWCHAR_H
+# include <stl/_cwchar.h>
+#endif
+
+#ifndef _STLP_INTERNAL_THREADS_H
+# include <stl/_threads.h>
+#endif
+
+#ifndef _STLP_STRING_FWD_H
+# include <stl/_string_fwd.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+class _STLP_CLASS_DECLSPEC _Locale_impl;             // Forward declaration of opaque type.
+class _STLP_CLASS_DECLSPEC _Locale;             // Forward declaration of opaque type.
+class _STLP_CLASS_DECLSPEC locale;
+class _STLP_CLASS_DECLSPEC ios_base;
+
+
+template <class _CharT>
+bool 
+__locale_do_operator_call (const locale* __that, 
+                           const basic_string<_CharT, char_traits<_CharT>, allocator<_CharT> >& __x,
+                           const basic_string<_CharT, char_traits<_CharT>, allocator<_CharT> >& __y);
+
+#  define _BaseFacet locale::facet
+
+class _STLP_CLASS_DECLSPEC locale {
+public:
+  // types:
+
+  class _STLP_DECLSPEC facet : private _Refcount_Base {
+  protected:
+    explicit facet(size_t __no_del = 0) : _Refcount_Base(1), _M_delete(__no_del == 0) {}
+    virtual ~facet();
+    friend class locale;
+    friend class _Locale_impl;
+    friend class _Locale;
+    
+  private:                        // Invalidate assignment and copying.
+    facet(const facet& __f) : _Refcount_Base(1), _M_delete(__f._M_delete == 0)  {};       
+    void operator=(const facet&); 
+    
+  private:                        // Data members.
+    const bool _M_delete;
+  };
+  
+#if defined(__MVS__) || defined(__OS400__)
+  struct
+#else
+  class
+#endif
+  _STLP_DECLSPEC id {
+    friend class locale;
+    friend class _Locale_impl;
+  public:
+    size_t _M_index;
+    static size_t _S_max;
+  };
+
+  typedef int category;
+# if defined (_STLP_STATIC_CONST_INIT_BUG)
+  enum _Category {
+# else
+  static const category
+# endif
+    none      = 0x000,
+    collate   = 0x010,
+    ctype     = 0x020,
+    monetary  = 0x040,
+    numeric   = 0x100,
+    time      = 0x200,
+    messages  = 0x400,
+    all       = collate | ctype | monetary | numeric | time | messages
+# if defined (_STLP_STATIC_CONST_INIT_BUG)
+  }
+# endif
+  ;
+
+  // construct/copy/destroy:
+  locale();
+  locale(const locale&) _STLP_NOTHROW;
+  explicit locale(const char *);
+  locale(const locale&, const char*, category);
+
+  // those are for internal use
+  locale(_Locale_impl*);
+  locale(_Locale_impl*, bool);
+
+public:
+
+# if defined ( _STLP_MEMBER_TEMPLATES ) /* && defined (_STLP_FUNCTION_TMPL_PARTIAL_ORDER) */
+  template <class _Facet> 
+  locale(const locale& __loc, _Facet* __f) : _M_impl(0)
+    {
+      //      _M_impl = this->_S_copy_impl(__loc._M_impl, __f != 0);
+      new(this) locale(__loc._M_impl, __f != 0);
+      if (__f != 0)
+        this->_M_insert(__f, _Facet::id);
+    }
+# endif
+
+  locale(const locale&, const locale&, category);
+  ~locale() _STLP_NOTHROW;
+  const locale& operator=(const locale&) _STLP_NOTHROW;
+
+# if !(defined (_STLP_NO_MEMBER_TEMPLATES) || defined (_STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS))
+  template <class _Facet> locale combine(const locale& __loc) {
+    locale __result(__loc._M_impl, true);
+    if (facet* __f = __loc._M_get_facet(_Facet::id)) {
+      __result._M_insert(__f, _Facet::id);
+      __f->_M_incr();
+    }
+    else
+      _M_throw_runtime_error();    
+    return __result;
+  }
+# endif
+  // locale operations:
+  string name() const;
+
+  bool operator==(const locale&) const;
+  bool operator!=(const locale&) const;
+
+# if ! defined ( _STLP_MEMBER_TEMPLATES ) || defined (_STLP_INLINE_MEMBER_TEMPLATES) || (defined(__MWERKS__) && __MWERKS__ <= 0x2301)
+  bool operator()(const string& __x, const string& __y) const;
+#  ifndef _STLP_NO_WCHAR_T
+  bool operator()(const wstring& __x, const wstring& __y) const;
+#  endif
+# else
+  template <class _CharT, class _Traits, class _Alloc>
+  bool operator()(const basic_string<_CharT, _Traits, _Alloc>& __x,
+                  const basic_string<_CharT, _Traits, _Alloc>& __y) const  {
+    return __locale_do_operator_call(this, __x, __y);
+  }              
+# endif
+
+  // global locale objects:
+  static locale _STLP_CALL global(const locale&);
+  static const locale& _STLP_CALL classic();
+
+public:                         // Helper functions for locale globals.
+  facet* _M_get_facet(const id&) const;
+  // same, but throws
+  facet* _M_use_facet(const id&) const;
+  static void _STLP_CALL _M_throw_runtime_error(const char* = 0);
+  static void _STLP_CALL _S_initialize();
+  static void _STLP_CALL _S_uninitialize();
+
+private:                        // More helper functions.
+  //  static _Locale_impl* _STLP_CALL _S_copy_impl(_Locale_impl*, bool);
+  void _M_insert(facet* __f, id& __id);
+
+  // friends:
+  friend class _Locale_impl;
+  friend class _Locale;
+  friend class ios_base;
+
+private:                        // Data members
+  _Locale_impl* _M_impl;
+};
+
+//----------------------------------------------------------------------
+// locale globals
+
+# ifdef _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
+template <class _Facet>
+inline const _Facet& 
+_Use_facet<_Facet>::operator *() const
+# else
+template <class _Facet> inline const _Facet& use_facet(const locale& __loc)
+# endif
+{
+  return *__STATIC_CAST(const _Facet*,__loc._M_use_facet(_Facet::id));
+}
+
+ 
+# ifdef _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
+template <class _Facet> 
+struct has_facet {
+  const locale& __loc;
+  has_facet(const locale& __p_loc) : __loc(__p_loc) {}
+  operator bool() const _STLP_NOTHROW
+# else
+template <class _Facet> inline bool has_facet(const locale& __loc) _STLP_NOTHROW 
+# endif
+{
+  return (__loc._M_get_facet(_Facet::id) != 0);
+}
+
+# ifdef _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
+  // close class definition
+};
+# endif
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_INTERNAL_LOCALE_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_map.h b/main/source/stlport/stlport/stl/_map.h
new file mode 100644
index 00000000..12bb7097
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_map.h
@@ -0,0 +1,411 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_MAP_H
+#define _STLP_INTERNAL_MAP_H
+
+#ifndef _STLP_INTERNAL_TREE_H
+# include <stl/_tree.h>
+#endif
+
+#define map __WORKAROUND_RENAME(map)
+#define multimap __WORKAROUND_RENAME(multimap)
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _Key, class _Tp, __DFL_TMPL_PARAM(_Compare, less<_Key> ), 
+          _STLP_DEFAULT_PAIR_ALLOCATOR_SELECT(const _Key, _Tp) >
+class map {
+public:
+
+// typedefs:
+
+  typedef _Key                  key_type;
+  typedef _Tp                   data_type;
+  typedef _Tp                   mapped_type;
+  typedef pair<const _Key, _Tp> value_type;
+  typedef _Compare              key_compare;
+    
+  class value_compare
+    : public binary_function<value_type, value_type, bool> {
+  friend class map<_Key,_Tp,_Compare,_Alloc>;
+  protected :
+    _Compare _M_comp;
+    value_compare(_Compare __c) : _M_comp(__c) {}
+  public:
+    bool operator()(const value_type& __x, const value_type& __y) const {
+      return _M_comp(__x.first, __y.first);
+    }
+  };
+
+private:
+# ifdef _STLP_MULTI_CONST_TEMPLATE_ARG_BUG
+  typedef _Rb_tree<key_type, value_type, 
+                   _Select1st_hint<value_type, _Key>, key_compare, _Alloc> _Rep_type;
+# else
+  typedef _Rb_tree<key_type, value_type, 
+                   _Select1st<value_type>, key_compare, _Alloc> _Rep_type;
+# endif
+  _Rep_type _M_t;  // red-black tree representing map
+public:
+  typedef typename _Rep_type::pointer pointer;
+  typedef typename _Rep_type::const_pointer const_pointer;
+  typedef typename _Rep_type::reference reference;
+  typedef typename _Rep_type::const_reference const_reference;
+  typedef typename _Rep_type::iterator iterator;
+  typedef typename _Rep_type::const_iterator const_iterator;
+  typedef typename _Rep_type::reverse_iterator reverse_iterator;
+  typedef typename _Rep_type::const_reverse_iterator const_reverse_iterator;
+  typedef typename _Rep_type::size_type size_type;
+  typedef typename _Rep_type::difference_type difference_type;
+  typedef typename _Rep_type::allocator_type allocator_type;
+
+  // allocation/deallocation
+
+  map() : _M_t(_Compare(), allocator_type()) {}
+  explicit map(const _Compare& __comp,
+               const allocator_type& __a = allocator_type())
+    : _M_t(__comp, __a) {}
+
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIterator>
+  map(_InputIterator __first, _InputIterator __last)
+    : _M_t(_Compare(), allocator_type())
+    { _M_t.insert_unique(__first, __last); }
+
+  template <class _InputIterator>
+  map(_InputIterator __first, _InputIterator __last, const _Compare& __comp,
+      const allocator_type& __a _STLP_ALLOCATOR_TYPE_DFL)
+    : _M_t(__comp, __a) { _M_t.insert_unique(__first, __last); }
+
+# ifdef _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS
+  template <class _InputIterator>
+  map(_InputIterator __first, _InputIterator __last, const _Compare& __comp)
+    : _M_t(__comp, allocator_type()) { _M_t.insert_unique(__first, __last); }
+# endif
+
+#else
+  map(const value_type* __first, const value_type* __last)
+    : _M_t(_Compare(), allocator_type())
+    { _M_t.insert_unique(__first, __last); }
+
+  map(const value_type* __first,
+      const value_type* __last, const _Compare& __comp,
+      const allocator_type& __a = allocator_type())
+    : _M_t(__comp, __a) { _M_t.insert_unique(__first, __last); }
+
+  map(const_iterator __first, const_iterator __last)
+    : _M_t(_Compare(), allocator_type()) 
+    { _M_t.insert_unique(__first, __last); }
+
+  map(const_iterator __first, const_iterator __last, const _Compare& __comp,
+      const allocator_type& __a = allocator_type())
+    : _M_t(__comp, __a) { _M_t.insert_unique(__first, __last); }
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  map(const map<_Key,_Tp,_Compare,_Alloc>& __x) : _M_t(__x._M_t) {}
+  map<_Key,_Tp,_Compare,_Alloc>&
+  operator=(const map<_Key, _Tp, _Compare, _Alloc>& __x)
+  {
+    _M_t = __x._M_t;
+    return *this; 
+  }
+
+  // accessors:
+
+  key_compare key_comp() const { return _M_t.key_comp(); }
+  value_compare value_comp() const { return value_compare(_M_t.key_comp()); }
+  allocator_type get_allocator() const { return _M_t.get_allocator(); }
+
+  iterator begin() { return _M_t.begin(); }
+  const_iterator begin() const { return _M_t.begin(); }
+  iterator end() { return _M_t.end(); }
+  const_iterator end() const { return _M_t.end(); }
+  reverse_iterator rbegin() { return _M_t.rbegin(); }
+  const_reverse_iterator rbegin() const { return _M_t.rbegin(); }
+  reverse_iterator rend() { return _M_t.rend(); }
+  const_reverse_iterator rend() const { return _M_t.rend(); }
+  bool empty() const { return _M_t.empty(); }
+  size_type size() const { return _M_t.size(); }
+  size_type max_size() const { return _M_t.max_size(); }
+  _Tp& operator[](const key_type& __k) {
+    iterator __i = lower_bound(__k);
+    // __i->first is greater than or equivalent to __k.
+    if (__i == end() || key_comp()(__k, (*__i).first))
+      __i = insert(__i, value_type(__k, _STLP_DEFAULT_CONSTRUCTED(_Tp)));
+    return (*__i).second;
+  }
+  void swap(map<_Key,_Tp,_Compare,_Alloc>& __x) { _M_t.swap(__x._M_t); }
+
+  // insert/erase
+
+  pair<iterator,bool> insert(const value_type& __x) 
+    { return _M_t.insert_unique(__x); }
+  iterator insert(iterator position, const value_type& __x)
+    { return _M_t.insert_unique(position, __x); }
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIterator>
+  void insert(_InputIterator __first, _InputIterator __last) {
+    _M_t.insert_unique(__first, __last);
+  }
+#else
+  void insert(const value_type* __first, const value_type* __last) {
+    _M_t.insert_unique(__first, __last);
+  }
+  void insert(const_iterator __first, const_iterator __last) {
+    _M_t.insert_unique(__first, __last);
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  void erase(iterator __position) { _M_t.erase(__position); }
+  size_type erase(const key_type& __x) { return _M_t.erase(__x); }
+  void erase(iterator __first, iterator __last)
+    { _M_t.erase(__first, __last); }
+  void clear() { _M_t.clear(); }
+
+  // map operations:
+
+  iterator find(const key_type& __x) { return _M_t.find(__x); }
+  const_iterator find(const key_type& __x) const { return _M_t.find(__x); }
+  size_type count(const key_type& __x) const { 
+    return _M_t.find(__x) == _M_t.end() ? 0 : 1;
+  }
+  iterator lower_bound(const key_type& __x) {return _M_t.lower_bound(__x); }
+  const_iterator lower_bound(const key_type& __x) const {
+    return _M_t.lower_bound(__x); 
+  }
+  iterator upper_bound(const key_type& __x) {return _M_t.upper_bound(__x); }
+  const_iterator upper_bound(const key_type& __x) const {
+    return _M_t.upper_bound(__x); 
+  }
+  
+  pair<iterator,iterator> equal_range(const key_type& __x) {
+    return _M_t.equal_range(__x);
+  }
+  pair<const_iterator,const_iterator> equal_range(const key_type& __x) const {
+    return _M_t.equal_range(__x);
+  }
+};
+
+
+template <class _Key, class _Tp, __DFL_TMPL_PARAM(_Compare, less<_Key> ), 
+          _STLP_DEFAULT_PAIR_ALLOCATOR_SELECT(const _Key, _Tp) >
+class multimap {
+public:
+
+// typedefs:
+
+  typedef _Key                  key_type;
+  typedef _Tp                   data_type;
+  typedef _Tp                   mapped_type;
+  typedef pair<const _Key, _Tp> value_type;
+  typedef _Compare              key_compare;
+
+  class value_compare : public binary_function<value_type, value_type, bool> {
+  friend class multimap<_Key,_Tp,_Compare,_Alloc>;
+  protected:
+    _Compare _M_comp;
+    value_compare(_Compare __c) : _M_comp(__c) {}
+  public:
+    bool operator()(const value_type& __x, const value_type& __y) const {
+      return _M_comp(__x.first, __y.first);
+    }
+  };
+
+private:
+# ifdef _STLP_MULTI_CONST_TEMPLATE_ARG_BUG
+  typedef _Rb_tree<key_type, value_type, 
+                  _Select1st_hint<value_type, _Key>, key_compare, _Alloc> _Rep_type;
+# else
+  typedef _Rb_tree<key_type, value_type, 
+                  _Select1st<value_type>, key_compare, _Alloc> _Rep_type;
+# endif
+  _Rep_type _M_t;  // red-black tree representing multimap
+public:
+  typedef typename _Rep_type::pointer pointer;
+  typedef typename _Rep_type::const_pointer const_pointer;
+  typedef typename _Rep_type::reference reference;
+  typedef typename _Rep_type::const_reference const_reference;
+  typedef typename _Rep_type::iterator iterator;
+  typedef typename _Rep_type::const_iterator const_iterator; 
+  typedef typename _Rep_type::reverse_iterator reverse_iterator;
+  typedef typename _Rep_type::const_reverse_iterator const_reverse_iterator;
+  typedef typename _Rep_type::size_type size_type;
+  typedef typename _Rep_type::difference_type difference_type;
+  typedef typename _Rep_type::allocator_type allocator_type;
+
+// allocation/deallocation
+
+  multimap() : _M_t(_Compare(), allocator_type()) { }
+  explicit multimap(const _Compare& __comp,
+                    const allocator_type& __a = allocator_type())
+    : _M_t(__comp, __a) { }
+
+#ifdef _STLP_MEMBER_TEMPLATES  
+  template <class _InputIterator>
+  multimap(_InputIterator __first, _InputIterator __last)
+    : _M_t(_Compare(), allocator_type())
+    { _M_t.insert_equal(__first, __last); }
+# ifdef _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS
+  template <class _InputIterator>
+  multimap(_InputIterator __first, _InputIterator __last,
+           const _Compare& __comp)
+    : _M_t(__comp, allocator_type()) { _M_t.insert_equal(__first, __last); }
+#  endif
+  template <class _InputIterator>
+  multimap(_InputIterator __first, _InputIterator __last,
+           const _Compare& __comp,
+           const allocator_type& __a _STLP_ALLOCATOR_TYPE_DFL)
+    : _M_t(__comp, __a) { _M_t.insert_equal(__first, __last); }
+#else
+  multimap(const value_type* __first, const value_type* __last)
+    : _M_t(_Compare(), allocator_type())
+    { _M_t.insert_equal(__first, __last); }
+  multimap(const value_type* __first, const value_type* __last,
+           const _Compare& __comp,
+           const allocator_type& __a = allocator_type())
+    : _M_t(__comp, __a) { _M_t.insert_equal(__first, __last); }
+
+  multimap(const_iterator __first, const_iterator __last)
+    : _M_t(_Compare(), allocator_type())
+    { _M_t.insert_equal(__first, __last); }
+  multimap(const_iterator __first, const_iterator __last,
+           const _Compare& __comp,
+           const allocator_type& __a = allocator_type())
+    : _M_t(__comp, __a) { _M_t.insert_equal(__first, __last); }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  multimap(const multimap<_Key,_Tp,_Compare,_Alloc>& __x) : _M_t(__x._M_t) { }
+  multimap<_Key,_Tp,_Compare,_Alloc>&
+  operator=(const multimap<_Key,_Tp,_Compare,_Alloc>& __x) {
+    _M_t = __x._M_t;
+    return *this; 
+  }
+
+  // accessors:
+
+  key_compare key_comp() const { return _M_t.key_comp(); }
+  value_compare value_comp() const { return value_compare(_M_t.key_comp()); }
+  allocator_type get_allocator() const { return _M_t.get_allocator(); }
+
+  iterator begin() { return _M_t.begin(); }
+  const_iterator begin() const { return _M_t.begin(); }
+  iterator end() { return _M_t.end(); }
+  const_iterator end() const { return _M_t.end(); }
+  reverse_iterator rbegin() { return _M_t.rbegin(); }
+  const_reverse_iterator rbegin() const { return _M_t.rbegin(); }
+  reverse_iterator rend() { return _M_t.rend(); }
+  const_reverse_iterator rend() const { return _M_t.rend(); }
+  bool empty() const { return _M_t.empty(); }
+  size_type size() const { return _M_t.size(); }
+  size_type max_size() const { return _M_t.max_size(); }
+  void swap(multimap<_Key,_Tp,_Compare,_Alloc>& __x) { _M_t.swap(__x._M_t); }
+
+  // insert/erase
+
+  iterator insert(const value_type& __x) { return _M_t.insert_equal(__x); }
+  iterator insert(iterator __position, const value_type& __x) {
+    return _M_t.insert_equal(__position, __x);
+  }
+#ifdef _STLP_MEMBER_TEMPLATES  
+  template <class _InputIterator>
+  void insert(_InputIterator __first, _InputIterator __last) {
+    _M_t.insert_equal(__first, __last);
+  }
+#else
+  void insert(const value_type* __first, const value_type* __last) {
+    _M_t.insert_equal(__first, __last);
+  }
+  void insert(const_iterator __first, const_iterator __last) {
+    _M_t.insert_equal(__first, __last);
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+  void erase(iterator __position) { _M_t.erase(__position); }
+  size_type erase(const key_type& __x) { return _M_t.erase(__x); }
+  void erase(iterator __first, iterator __last)
+    { _M_t.erase(__first, __last); }
+  void clear() { _M_t.clear(); }
+
+  // multimap operations:
+
+  iterator find(const key_type& __x) { return _M_t.find(__x); }
+  const_iterator find(const key_type& __x) const { return _M_t.find(__x); }
+  size_type count(const key_type& __x) const { return _M_t.count(__x); }
+  iterator lower_bound(const key_type& __x) {return _M_t.lower_bound(__x); }
+  const_iterator lower_bound(const key_type& __x) const {
+    return _M_t.lower_bound(__x); 
+  }
+  iterator upper_bound(const key_type& __x) {return _M_t.upper_bound(__x); }
+  const_iterator upper_bound(const key_type& __x) const {
+    return _M_t.upper_bound(__x); 
+  }
+   pair<iterator,iterator> equal_range(const key_type& __x) {
+    return _M_t.equal_range(__x);
+  }
+  pair<const_iterator,const_iterator> equal_range(const key_type& __x) const {
+    return _M_t.equal_range(__x);
+  }
+};
+
+# define _STLP_TEMPLATE_HEADER template <class _Key, class _Tp, class _Compare, class _Alloc>
+
+# define _STLP_TEMPLATE_CONTAINER map<_Key,_Tp,_Compare,_Alloc>
+
+// fbp : if this template header gets protected against your will, report it !
+# include <stl/_relops_cont.h>
+
+# undef  _STLP_TEMPLATE_CONTAINER
+# define _STLP_TEMPLATE_CONTAINER multimap<_Key,_Tp,_Compare,_Alloc>
+
+// fbp : if this template header gets protected against your will, report it !
+# include <stl/_relops_cont.h>
+
+# undef  _STLP_TEMPLATE_CONTAINER
+# undef  _STLP_TEMPLATE_HEADER
+
+_STLP_END_NAMESPACE
+
+// do a cleanup
+#  undef map
+#  undef multimap
+// provide a way to access full funclionality 
+# define __map__  __FULL_NAME(map)
+# define __multimap__  __FULL_NAME(multimap)
+
+# ifdef _STLP_USE_WRAPPER_FOR_ALLOC_PARAM
+# include <stl/wrappers/_map.h>
+# endif
+
+#endif /* _STLP_INTERNAL_MAP_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_messages_facets.h b/main/source/stlport/stlport/stl/_messages_facets.h
new file mode 100644
index 00000000..442df507
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_messages_facets.h
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+// WARNING: This is an internal header file, included by other C++
+// standard library headers.  You should not attempt to use this header
+// file directly.
+
+
+#ifndef _STLP_INTERNAL_MESSAGES_H
+#define _STLP_INTERNAL_MESSAGES_H
+
+#ifndef _STLP_IOS_BASE_H
+# include <stl/_ios_base.h>
+#endif
+
+# ifndef _STLP_C_LOCALE_H
+#  include <stl/c_locale.h>
+# endif
+
+#ifndef _STLP_STRING_H
+# include <stl/_string.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+// messages facets
+
+class messages_base {
+public:
+  typedef int catalog;
+};
+
+template <class _CharT> class messages {};
+
+class _Messages;
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC messages<char> : public locale::facet, public messages_base 
+{
+  friend class _Locale;
+public:
+  typedef messages_base::catalog catalog;
+  typedef char                   char_type;
+  typedef string    string_type;
+
+  explicit messages(size_t __refs = 0);
+
+  catalog open(const string& __fn, const locale& __loc) const
+    { return do_open(__fn, __loc); }
+  string_type get(catalog __c, int __set, int __msgid,
+		  const string_type& __dfault) const
+    { return do_get(__c, __set, __msgid, __dfault); }
+  inline void close(catalog __c) const
+    { do_close(__c); }
+
+  _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
+
+  messages(_Messages*);
+
+protected:
+   messages(size_t, _Locale_messages*);
+  ~messages();
+
+  virtual catalog     do_open(const string& __fn, const locale& __loc) const;
+  virtual string_type do_get(catalog __c, int __set, int __msgid,
+                             const string_type& __dfault) const;
+  virtual void        do_close(catalog __c) const;
+
+  void _M_initialize(const char* __name);
+
+private:
+  _Messages* _M_impl;
+};
+
+# if !defined (_STLP_NO_WCHAR_T)
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC messages<wchar_t> : public locale::facet, public messages_base 
+{
+  friend class _Locale;
+public:
+  typedef messages_base::catalog catalog;
+  typedef wchar_t                char_type;
+  typedef wstring  string_type;
+
+  explicit messages(size_t __refs = 0);
+  
+  inline catalog open(const string& __fn, const locale& __loc) const
+    { return do_open(__fn, __loc); }
+  inline string_type get(catalog __c, int __set, int __msgid,
+                         const string_type& __dfault) const
+    { return do_get(__c, __set, __msgid, __dfault); }
+  inline void close(catalog __c) const
+    { do_close(__c); }
+
+  _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
+
+  messages(_Messages*);
+
+protected:
+
+  messages(size_t, _Locale_messages*);
+  ~messages();
+
+  virtual catalog     do_open(const string& __fn, const locale& __loc) const;
+  virtual string_type do_get(catalog __c, int __set, int __msgid,
+                             const string_type& __dfault) const;
+  virtual void        do_close(catalog __c) const;
+
+  void _M_initialize(const char* __name);
+
+private:
+  _Messages* _M_impl;
+};
+
+# endif /* WCHAR_T */
+
+template <class _CharT> class messages_byname {};
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC messages_byname<char> : public messages<char> {
+public:
+  typedef messages_base::catalog catalog;
+  typedef string     string_type;
+
+  explicit messages_byname(const char* __name, size_t __refs = 0);
+
+protected:
+  ~messages_byname();
+};
+
+# ifndef _STLP_NO_WCHAR_T
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC messages_byname<wchar_t> : public messages<wchar_t> {
+public:
+  typedef messages_base::catalog catalog;
+  typedef wstring                string_type;
+
+  explicit messages_byname(const char* __name, size_t __refs = 0);
+
+protected:
+  ~messages_byname();
+};
+# endif /* WCHAR_T */
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_INTERNAL_MESSAGES_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_monetary.c b/main/source/stlport/stlport/stl/_monetary.c
new file mode 100644
index 00000000..18d29fb8
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_monetary.c
@@ -0,0 +1,527 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+#ifndef _STLP_MONETARY_C
+#define _STLP_MONETARY_C
+
+# ifndef _STLP_INTERNAL_MONETARY_H
+#  include <stl/_monetary.h>
+# endif
+
+# if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION)
+
+#ifndef _STLP_INTERNAL_IOS_H
+# include <stl/_ios.h>
+#endif
+
+#ifndef _STLP_INTERNAL_NUM_PUT_H
+# include <stl/_num_put.h>
+#endif
+
+#ifndef _STLP_INTERNAL_NUM_GET_H
+# include <stl/_num_get.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+# if ( _STLP_STATIC_TEMPLATE_DATA > 0 )
+
+template <class _CharT, class _InputIterator>
+locale::id money_get<_CharT, _InputIterator>::id;
+
+template <class _CharT, class _OutputIterator>
+locale::id money_put<_CharT, _OutputIterator>::id;
+
+# else /* ( _STLP_STATIC_TEMPLATE_DATA > 0 ) */
+
+typedef money_get<char, const char*> money_get_char;
+typedef money_put<char, char*> money_put_char;
+typedef money_get<char, istreambuf_iterator<char, char_traits<char> > > money_get_char_2;
+typedef money_put<char, ostreambuf_iterator<char, char_traits<char> > > money_put_char_2;
+
+__DECLARE_INSTANCE(locale::id, money_get_char::id, );
+__DECLARE_INSTANCE(locale::id, money_put_char::id, );
+__DECLARE_INSTANCE(locale::id, money_get_char_2::id, );
+__DECLARE_INSTANCE(locale::id, money_put_char_2::id, );
+
+# ifndef _STLP_NO_WCHAR_T
+
+typedef money_get<wchar_t, const wchar_t*> money_get_wchar_t;
+typedef money_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > > money_get_wchar_t_2;
+typedef money_put<wchar_t, wchar_t*> money_put_wchar_t;
+typedef money_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > > money_put_wchar_t_2;
+
+__DECLARE_INSTANCE(locale::id, money_get_wchar_t::id, );
+__DECLARE_INSTANCE(locale::id, money_put_wchar_t::id, );
+__DECLARE_INSTANCE(locale::id, money_get_wchar_t_2::id, );
+__DECLARE_INSTANCE(locale::id, money_put_wchar_t_2::id, );
+
+# endif
+# endif /* ( _STLP_STATIC_TEMPLATE_DATA > 0 ) */
+
+// money_get facets
+
+
+// helper functions for do_get
+template <class _InIt1, class _InIt2>
+pair<_InIt1, bool> __get_string(_InIt1 __first,     _InIt1 __last,
+                               _InIt2 __str_first, _InIt2 __str_last) {
+  pair<_InIt1, _InIt2> __pr = mismatch(__first, __last, __str_first);
+  return make_pair(__pr.first, __pr.second == __str_last);
+}
+
+template <class _InIt, class _OuIt, class _CharT>
+bool
+__get_monetary_value(_InIt& __first, _InIt __last, _OuIt __out,
+                     const ctype<_CharT>& _c_type,
+                     _CharT   __point,
+                     int      __frac_digits,
+                     _CharT __sep,
+                     const string& __grouping,
+                     bool&         __syntax_ok)
+{
+  if (__first == __last || !_c_type.is(ctype_base::digit, *__first))
+    return false;
+
+  char __group_sizes[128];
+  char* __group_sizes_end = __grouping.size() == 0 ? 0 : __group_sizes;
+  char   __current_group_size = 0;
+
+  while (__first != __last) {
+    if (_c_type.is(ctype_base::digit, *__first)) {
+      ++__current_group_size;
+      *__out++ = *__first++;
+    }
+    else if (__group_sizes_end) {
+      if (*__first == __sep) {
+	*__group_sizes_end++ = __current_group_size;
+	__current_group_size = 0;
+	++__first;
+      }
+      else break;
+    }
+    else
+      break;
+  }
+
+  if (__grouping.size() == 0)
+    __syntax_ok = true;
+  else {
+    if (__group_sizes_end != __group_sizes)
+      *__group_sizes_end++ = __current_group_size;
+    
+    __syntax_ok = __valid_grouping(__group_sizes, __group_sizes_end,
+                                   __grouping.data(), __grouping.data()+ __grouping.size());  
+    
+    if (__first == __last || *__first != __point) {
+      for (int __digits = 0; __digits != __frac_digits; ++__digits)
+        *__out++ = _CharT('0');
+      return true; // OK not to have decimal point
+    }
+  }
+
+  ++__first;
+
+  size_t __digits = 0;
+
+  while (__first != __last && _c_type.is(ctype_base::digit, *__first)) {
+      *__out++ = *__first++;
+     ++__digits;
+  }
+
+  __syntax_ok = __syntax_ok && (__digits == __frac_digits);
+
+  return true;
+}
+
+# ifndef _STLP_NO_LONG_DOUBLE
+
+//===== methods ======
+template <class _CharT, class _InputIter>
+_InputIter 
+money_get<_CharT, _InputIter>::do_get(_InputIter __s, _InputIter  __end, bool  __intl,
+				      ios_base&  __str, ios_base::iostate& __err,
+				      long double& __units) const {
+  string_type __buf;
+  __s = do_get(__s, __end, __intl, __str, __err, __buf);
+
+  if (__err == ios_base::goodbit || __err == ios_base::eofbit) {
+    __buf.push_back(0);
+    typename string_type::iterator __b = __buf.begin(), __e = __buf.end();
+    // Can't use atold, since it might be wchar_t. Don't get confused by name below :
+    // it's perfectly capable of reading long double.
+    __get_decimal_integer(__b, __e, __units);
+  }
+  if (__s == __end)
+    __err |= ios_base::eofbit;
+  return __s;
+}
+# endif
+
+template <class _CharT, class _InputIter>
+_InputIter 
+money_get<_CharT, _InputIter>::do_get(iter_type __s, 
+				      iter_type  __end, bool  __intl,
+				      ios_base&  __str, ios_base::iostate&  __err,
+				      string_type& __digits) const {
+  if (__s == __end) {
+    __err |= ios_base::eofbit;
+    return __s;
+  }
+
+  typedef moneypunct<_CharT, false> _Punct;
+  typedef moneypunct<_CharT, true>  _Punct_intl;
+  typedef ctype<_CharT>             _Ctype;
+
+  locale __loc = __str.getloc();
+  const _Punct&      __punct      = use_facet<_Punct>(__loc) ;
+  const _Punct_intl& __punct_intl = use_facet<_Punct_intl>(__loc) ;
+  const _Ctype&      __c_type      = use_facet<_Ctype>(__loc) ;
+                   
+  money_base::pattern __format = __intl ? __punct_intl.neg_format()
+                                        : __punct.neg_format();
+  string_type __ns = __intl ? __punct_intl.negative_sign()
+                            : __punct.negative_sign();
+  string_type __ps = __intl ? __punct_intl.positive_sign()
+                            : __punct.positive_sign();
+  int __i;
+  bool __is_positive = true;
+  bool __symbol_required = (__str.flags() & ios_base::showbase) !=0;
+  string_type __buf;
+  back_insert_iterator<string_type> __out(__buf);
+//  pair<iter_type, bool> __result;
+
+  for (__i = 0; __i < 4; ++__i) {
+    switch (__format.field[__i]) {
+    case (char) money_base::none:
+      if (__i == 3) {
+        if (__c_type.is(ctype_base::space, *__s)) {
+          __err = ios_base::failbit;
+          return __s;
+        }
+        break;
+      }
+      while (__s != __end && __c_type.is(ctype_base::space, *__s))
+        ++__s;
+      break;
+    case (char) money_base::space:
+      if (!__c_type.is(ctype_base::space, *__s)) {
+        __err = ios_base::failbit;
+        return __s;
+      }
+      ++__s;
+      while (__s != __end && __c_type.is(ctype_base::space, *__s))
+        ++__s;
+      break;
+    case money_base::symbol: {
+      string_type __curs = __intl ? __punct_intl.curr_symbol()
+                                : __punct.curr_symbol();
+      pair<iter_type, bool>
+      __result  = __get_string(__s, __end, __curs.begin(), __curs.end());
+      if (!__result.second && __symbol_required)
+        __err = ios_base::failbit;
+      __s = __result.first;
+      break;
+    }
+    case money_base::sign: {
+      if (__s == __end) {
+        if (__ps.size() == 0)
+          break;
+        if (__ns.size() == 0) {
+          __is_positive = false;
+          break;
+        }
+        __err = ios_base::failbit;
+        return __s;
+      }
+      else {
+        if (__ps.size() == 0) {
+          if (__ns.size() == 0)
+            break;
+          if (*__s == ++__ns[0]) {
+            ++__s;
+            __is_positive = false;
+            break;
+          }
+          __err = ios_base::failbit;
+	  //          return __s;
+        } 
+        else {
+          if (*__s == __ps[0]) {
+            ++__s;
+            break;
+          }
+          if (__ns.size() == 0)
+            break;
+          if (*__s == __ns[0]) {
+            ++__s;
+            __is_positive = false;
+            break;
+          }
+          __err = ios_base::failbit;
+	  //          return __s;
+        }
+      }
+      return __s;
+      //      break;
+    }
+    case money_base::value: {
+      _CharT __point = __intl ? __punct_intl.decimal_point()
+                              : __punct.decimal_point();
+      int __frac_digits = __intl ? __punct_intl.frac_digits()
+                                 : __punct.frac_digits();
+      string __grouping = __intl ? __punct_intl.grouping()
+                                 : __punct.grouping();
+      bool __syntax_ok = true;
+
+      bool __result;
+
+      _CharT __sep = __grouping.size() == 0 ? _CharT() : 
+	__intl ? __punct_intl.thousands_sep() : __punct.thousands_sep();
+
+      __result = __get_monetary_value(__s, __end, __out, __c_type,
+                                      __point, __frac_digits,
+                                      __sep,
+                                      __grouping, __syntax_ok);      
+
+      if (!__syntax_ok)
+        __err |= ios_base::failbit;
+      if (!__result) {
+        __err = ios_base::failbit;
+        return __s;
+      }
+      break;
+      
+    }                           // Close money_base::value case
+
+
+    }                           // Close switch statement
+  }                             // Close for loop
+
+  if (__is_positive) {
+    if (__ps.size() > 1) {
+      pair<_InputIter, bool>
+        __result = __get_string(__s, __end, __ps.begin() + 1, __ps.end());
+      __s = __result.first;
+      if (!__result.second)
+	__err |= ios::failbit;
+    }
+    if (!(__err & ios_base::failbit))
+      __digits = __buf;
+  }
+  else {
+    if (__ns.size() > 1) {
+      pair<_InputIter, bool>
+        __result = __get_string(__s, __end, __ns.begin() + 1, __ns.end());
+      __s = __result.first;
+      if (!__result.second)
+	__err |= ios::failbit;
+    }
+    if (!(__err & ios::failbit)) {
+      __buf.insert(__buf.begin(),__c_type.widen('-'));
+      __digits = __buf;
+    }
+  }
+  if (__s == __end)
+    __err |= ios::eofbit;
+
+  return __s;
+}
+
+// money_put facets
+
+template <class _CharT, class _OutputIter>
+_OutputIter
+money_put<_CharT, _OutputIter>
+ ::do_put(_OutputIter __s, bool __intl, ios_base& __str,
+          char_type __fill,
+          const string_type& __digits) const { 
+  typedef ctype<_CharT>             _Ctype;
+  typedef moneypunct<_CharT, false> _Punct;
+  typedef moneypunct<_CharT, true>  _Punct_intl;
+
+  locale __loc = __str.getloc();
+  const _Ctype&      __c_type      = use_facet<_Ctype>(__loc) ;
+  const _Punct&      __punct      = use_facet<_Punct>(__loc) ;
+  const _Punct_intl& __punct_intl = use_facet<_Punct_intl>(__loc) ;
+
+  // some special characters
+
+  char_type __minus = __c_type.widen('-');
+  char_type __plus  = __c_type.widen('+');
+  char_type __space = __c_type.widen(' ');
+  char_type __zero  = __c_type.widen('0');
+  char_type __point = __intl ? __c_type.widen(__punct_intl.decimal_point())
+			     : __c_type.widen(__punct.decimal_point());
+
+  char_type __sep = __intl ? __punct_intl.thousands_sep()
+			   : __punct     .thousands_sep();
+
+  string __grouping = __intl ? __punct_intl.grouping()
+		             : __punct     .grouping();
+				
+  int __frac_digits      = __intl ? __punct_intl.frac_digits() 
+                                  : __punct.frac_digits();
+
+  string_type __curr_sym = __intl ? __punct_intl.curr_symbol() 
+                                  : __punct.curr_symbol();
+
+    // if there are no digits we are going to return __s.  If there
+    // are digits, but not enough to fill the frac_digits, we are
+    // going to add zeros.  I don't know whether this is right or
+    // not.
+
+  if (__digits.size() == 0) 
+    return __s;
+
+  typename string_type::const_iterator __digits_first = __digits.begin();
+  typename string_type::const_iterator __digits_last  = __digits.end();
+
+  bool __is_negative = *__digits_first == __minus;
+  if (__is_negative)
+    ++__digits_first;
+
+  string_type __sign = __intl ?
+			 __is_negative ? __punct_intl.negative_sign()
+				       : __punct_intl.positive_sign()
+			      :
+			 __is_negative ? __punct.negative_sign()
+				       : __punct.positive_sign();
+  typename string_type::const_iterator __cp = __digits_first;
+  while (__cp != __digits_last && __c_type.is(ctype_base::digit, *__cp))
+    ++__cp;
+  if (__cp == __digits_first)
+    return __s;
+  __digits_last = __cp;
+
+  // If grouping is required, we make a copy of __digits and
+  // insert the grouping.
+
+  // To handle the fractional digits, we augment the first group
+  // by frac_digits.  If there is only one group, we need first
+  // to duplicate it.
+
+  string_type __new_digits(__digits_first, __digits_last);
+
+  if (__grouping.size() != 0) {
+    if (__grouping.size() == 1)
+      __grouping.push_back(__grouping[0]);
+    __grouping[0] += __frac_digits;
+    _CharT* __data_ptr = __CONST_CAST(_CharT*,__new_digits.data());
+    _CharT* __data_end = __data_ptr + __new_digits.size();
+    
+    ptrdiff_t __value_length = __insert_grouping(__data_ptr,
+	  				         __data_end,
+					         __grouping,
+					         __sep,
+					         __plus, __minus, 0);
+    __digits_first = __new_digits.begin();
+    __digits_last  = __digits_first + __value_length;
+  }
+
+  // Determine the amount of padding required, if any.  
+    
+  size_t __width        = __str.width();
+
+#if defined(_STLP_DEBUG) && (defined(__HP_aCC) || (__HP_aCC <= 1))
+  size_t __value_length = operator -(__digits_last, __digits_first);
+#else
+  size_t __value_length = __digits_last - __digits_first;
+#endif
+
+  size_t __length       = __value_length;
+      
+  __length += __sign.size();
+  if (__frac_digits != 0)
+    ++__length;
+
+  bool __generate_curr = (__str.flags() & ios_base::showbase) !=0;
+  if (__generate_curr)
+    __length += __curr_sym.size();
+  money_base::pattern __format =
+    __intl ? (__is_negative ? __punct_intl.neg_format() 
+                            : __punct_intl.pos_format())
+           : (__is_negative ? __punct.neg_format() 
+                            : __punct.pos_format());
+  {
+    for (int __i = 0; __i < 4; ++__i)
+      if (__format.field[__i] == (char) money_base::space)
+        ++__length;
+  }
+
+  size_t __fill_amt = __length < __width ? __width - __length : 0;
+
+  ios_base::fmtflags __fill_pos = __str.flags() & ios_base::adjustfield;
+
+  if (__fill_amt != 0 &&
+      !(__fill_pos & (ios_base::left | ios_base::internal)))
+    __s = fill_n(__s, __fill_amt, __fill);
+    
+  for (int __i = 0; __i < 4; ++__i) {
+    char __ffield = __format.field[__i];
+    if (__ffield == money_base::none) {
+      if (__fill_amt != 0 && __fill_pos == ios_base::internal)
+        __s = fill_n(__s, __fill_amt, __fill);
+    }
+    else if (__ffield == money_base::space) {
+      *__s++ = __space;
+      if (__fill_amt != 0 && __fill_pos == ios_base::internal)
+        __s = fill_n(__s, __fill_amt, __fill);
+    }
+    else if (__ffield == money_base::symbol) {
+      if (__generate_curr)
+        __s = copy(__curr_sym.begin(), __curr_sym.end(), __s);
+    }
+    else if (__ffield == money_base::sign) {
+      if (__sign.size() != 0)
+        *__s++ = __sign[0];
+    }
+    else if (__ffield == money_base::value) {
+      if (__frac_digits == 0)
+        __s = copy(__digits_first, __digits_last, __s);
+      else {
+        if ((int)__value_length <= __frac_digits) {
+          *__s++ = __point;
+          __s = copy(__digits_first, __digits_last, __s);
+          __s =  fill_n(__s, __frac_digits - __value_length, __zero);
+        }
+        else {
+          __s = copy(__digits_first, __digits_last - __frac_digits, __s);
+          if (__frac_digits != 0) {
+            *__s++ = __point;
+            __s = copy(__digits_last - __frac_digits, __digits_last, __s);
+          }
+        }
+      }
+    }
+  } // Close for loop
+
+  // Ouput rest of sign if necessary.
+
+  if (__sign.size() > 1)
+    __s = copy(__sign.begin() + 1, __sign.end(), __s);
+  if (!(__fill_pos & (ios_base::right | ios_base::internal)))
+    __s = fill_n(__s, __fill_amt, __fill);
+  
+  return __s;
+}
+
+_STLP_END_NAMESPACE
+
+# endif /* EXPOSE */
+
+#endif /* _STLP_MONETARY_C */
diff --git a/main/source/stlport/stlport/stl/_monetary.h b/main/source/stlport/stlport/stl/_monetary.h
new file mode 100644
index 00000000..fc12a79b
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_monetary.h
@@ -0,0 +1,463 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+// WARNING: This is an internal header file, included by other C++
+// standard library headers.  You should not attempt to use this header
+// file directly.
+
+
+#ifndef _STLP_INTERNAL_MONETARY_H
+#define _STLP_INTERNAL_MONETARY_H
+
+#ifndef _STLP_INTERNAL_CTYPE_H
+# include <stl/_ctype.h>
+#endif
+
+#ifndef _STLP_INTERNAL_OSTREAMBUF_ITERATOR_H
+# include <stl/_ostreambuf_iterator.h>
+#endif
+
+#ifndef _STLP_INTERNAL_ISTREAMBUF_ITERATOR_H
+# include <stl/_istreambuf_iterator.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+class money_base {
+public:
+  enum part {none, space, symbol, sign, value};
+  struct pattern {
+    char field[4];
+  };
+};
+
+// moneypunct facets: forward declaration
+template <class _charT, __DFL_NON_TYPE_PARAM(bool, _International, false) > class moneypunct {};
+
+// money_get facets
+
+template <class _CharT, __DFL_TMPL_PARAM(_InputIter , istreambuf_iterator<_CharT>) >
+class money_get : public locale::facet 
+{
+  friend class _Locale;
+public:
+  typedef _CharT               char_type;
+  typedef _InputIter           iter_type;
+  typedef basic_string<_CharT, char_traits<_CharT>, allocator<_CharT> > string_type;
+
+  money_get(size_t __refs = 0) : _BaseFacet(__refs) {}
+# ifndef _STLP_NO_LONG_DOUBLE
+  iter_type get(iter_type __s, iter_type  __end, bool __intl,
+                ios_base&  __str, ios_base::iostate&  __err,
+                long double& __units) const
+    { return do_get(__s,  __end, __intl,  __str,  __err, __units); }
+# endif  
+  iter_type get(iter_type __s, iter_type  __end, bool __intl,
+                ios_base&  __str, ios_base::iostate& __err,
+                string_type& __digits) const
+    { return do_get(__s,  __end, __intl,  __str,  __err, __digits); }
+
+  _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
+
+protected:
+  ~money_get() {}
+# ifndef _STLP_NO_LONG_DOUBLE
+  virtual iter_type do_get(iter_type __s, iter_type  __end, bool  __intl,
+                           ios_base&  __str, ios_base::iostate& __err,
+                           long double& __units) const;
+# endif
+  virtual iter_type do_get(iter_type __s, iter_type __end, bool __intl,
+                           ios_base&  __str, ios_base::iostate& __err,
+                           string_type& __digits) const;
+};
+
+
+// moneypunct facets: definition of specializations
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC moneypunct<char, true> : public locale::facet, public money_base 
+{
+
+public:
+  typedef char                 char_type;
+  typedef string               string_type;
+  explicit moneypunct _STLP_PSPEC2(char, true) (size_t __refs = 0);
+
+  char        decimal_point() const { return do_decimal_point(); }
+  char        thousands_sep() const { return do_thousands_sep(); }
+  string      grouping()      const { return do_grouping(); }
+  string_type curr_symbol()   const { return do_curr_symbol(); }
+  string_type positive_sign() const { return do_positive_sign(); }
+  string_type negative_sign() const { return do_negative_sign(); }
+  int         frac_digits()   const { return do_frac_digits(); }
+  pattern     pos_format()    const { return do_pos_format(); }
+  pattern     neg_format()    const { return do_neg_format(); }
+
+  _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
+# if defined (_STLP_STATIC_CONST_INIT_BUG)
+  enum _IntlVal { intl = 1 } ;
+# else
+  static const bool intl = true;
+# endif
+
+protected:
+  pattern _M_pos_format;
+  pattern _M_neg_format;
+
+  ~moneypunct _STLP_PSPEC2(char, true) ();
+
+  virtual char        do_decimal_point() const;
+  virtual char        do_thousands_sep() const;
+  virtual string      do_grouping()      const;
+
+  virtual string      do_curr_symbol()   const;
+
+  virtual string      do_positive_sign() const;
+  virtual string      do_negative_sign() const;
+  virtual int         do_frac_digits()   const;
+  virtual pattern     do_pos_format()    const;
+  virtual pattern     do_neg_format()    const;
+
+  friend class _Locale;
+
+};
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC moneypunct<char, false> : public locale::facet, public money_base 
+{
+public:
+  typedef char                 char_type;
+  typedef string               string_type;
+
+  explicit moneypunct _STLP_PSPEC2(char, false) (size_t __refs = 0);
+
+  char        decimal_point() const { return do_decimal_point(); }
+  char        thousands_sep() const { return do_thousands_sep(); }
+  string      grouping()      const { return do_grouping(); }
+  string_type curr_symbol()   const { return do_curr_symbol(); }
+  string_type positive_sign() const { return do_positive_sign(); }
+  string_type negative_sign() const { return do_negative_sign(); }
+  int         frac_digits()   const { return do_frac_digits(); }
+  pattern     pos_format()    const { return do_pos_format(); }
+  pattern     neg_format()    const { return do_neg_format(); }
+
+  _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
+# if defined (_STLP_STATIC_CONST_INIT_BUG)
+  enum _IntlVal { intl = 0 } ;
+# else
+  static const bool intl = false;
+# endif
+
+protected:
+  pattern _M_pos_format;
+  pattern _M_neg_format;
+
+  ~moneypunct _STLP_PSPEC2(char, false) ();
+
+  virtual char        do_decimal_point() const;
+  virtual char        do_thousands_sep() const;
+  virtual string      do_grouping()      const;
+
+  virtual string      do_curr_symbol()   const;
+
+  virtual string      do_positive_sign() const;
+  virtual string      do_negative_sign() const;
+  virtual int         do_frac_digits()   const;
+  virtual pattern     do_pos_format()    const;
+  virtual pattern     do_neg_format()    const;
+
+  friend class _Locale;
+};
+
+
+# ifndef _STLP_NO_WCHAR_T
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC moneypunct<wchar_t, true> : public locale::facet, public money_base 
+{
+  friend class _Locale;
+public:
+  typedef wchar_t                 char_type;
+  typedef wstring                 string_type;
+  explicit moneypunct _STLP_PSPEC2(wchar_t, true) (size_t __refs = 0);
+  wchar_t     decimal_point() const { return do_decimal_point(); }
+  wchar_t     thousands_sep() const { return do_thousands_sep(); }
+  string      grouping()      const { return do_grouping(); }
+  string_type curr_symbol()   const { return do_curr_symbol(); }
+  string_type positive_sign() const { return do_positive_sign(); }
+  string_type negative_sign() const { return do_negative_sign(); }
+  int         frac_digits()   const { return do_frac_digits(); }
+  pattern     pos_format()    const { return do_pos_format(); }
+  pattern     neg_format()    const { return do_neg_format(); }
+
+  _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
+# if defined (_STLP_STATIC_CONST_INIT_BUG)
+  enum _IntlVal { intl = 1 } ;
+# else
+  static const bool intl = true;
+# endif
+
+protected:
+  pattern _M_pos_format;
+  pattern _M_neg_format;
+
+  ~moneypunct _STLP_PSPEC2(wchar_t, true) ();
+
+  virtual wchar_t     do_decimal_point() const;
+  virtual wchar_t     do_thousands_sep() const;
+  virtual string      do_grouping()      const;
+
+  virtual string_type do_curr_symbol()   const;
+
+  virtual string_type do_positive_sign() const;
+  virtual string_type do_negative_sign() const;
+  virtual int         do_frac_digits()   const;
+  virtual pattern     do_pos_format()    const;
+  virtual pattern     do_neg_format()    const;
+};
+
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC moneypunct<wchar_t, false> : public locale::facet, public money_base 
+{
+  friend class _Locale;
+public:
+  typedef wchar_t                 char_type;
+  typedef wstring                 string_type;
+  explicit moneypunct _STLP_PSPEC2(wchar_t, false) (size_t __refs = 0);
+  wchar_t     decimal_point() const { return do_decimal_point(); }
+  wchar_t     thousands_sep() const { return do_thousands_sep(); }
+  string      grouping()      const { return do_grouping(); }
+  string_type curr_symbol()   const { return do_curr_symbol(); }
+  string_type positive_sign() const { return do_positive_sign(); }
+  string_type negative_sign() const { return do_negative_sign(); }
+  int         frac_digits()   const { return do_frac_digits(); }
+  pattern     pos_format()    const { return do_pos_format(); }
+  pattern     neg_format()    const { return do_neg_format(); }
+
+  _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
+# if defined (_STLP_STATIC_CONST_INIT_BUG)
+  enum _IntlVal { intl = 0 } ;
+# else
+  static const bool intl = false;
+# endif
+
+protected:
+  pattern _M_pos_format;
+  pattern _M_neg_format;
+
+  ~moneypunct _STLP_PSPEC2(wchar_t, false) ();
+
+  virtual wchar_t     do_decimal_point() const;
+  virtual wchar_t     do_thousands_sep() const;
+  virtual string      do_grouping()      const;
+
+  virtual string_type do_curr_symbol()   const;
+
+  virtual string_type do_positive_sign() const;
+  virtual string_type do_negative_sign() const;
+  virtual int         do_frac_digits()   const;
+  virtual pattern     do_pos_format()    const;
+  virtual pattern     do_neg_format()    const;
+};
+
+# endif
+
+template <class _charT, __DFL_NON_TYPE_PARAM(bool , _International , false) > class moneypunct_byname {};
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC moneypunct_byname<char, true> : public moneypunct<char, true> 
+{
+public:
+  typedef money_base::pattern   pattern;
+  typedef char                  char_type;
+  typedef string                string_type;
+
+  explicit moneypunct_byname _STLP_PSPEC2(char, true) (const char * __name, size_t __refs = 0);
+
+protected:
+  _Locale_monetary* _M_monetary;
+  ~moneypunct_byname _STLP_PSPEC2(char, true) ();
+  virtual char        do_decimal_point() const;
+  virtual char        do_thousands_sep() const;
+  virtual string      do_grouping()      const;
+
+  virtual string_type do_curr_symbol()   const;
+
+  virtual string_type do_positive_sign() const;
+  virtual string_type do_negative_sign() const;
+  virtual int         do_frac_digits()   const;
+};
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC moneypunct_byname<char, false> : public moneypunct<char, false> 
+{
+public:
+  typedef money_base::pattern   pattern;
+  typedef char                  char_type;
+  typedef string                string_type;
+
+  explicit moneypunct_byname _STLP_PSPEC2(char, false) (const char * __name, size_t __refs = 0);
+
+protected:
+  _Locale_monetary* _M_monetary;
+  ~moneypunct_byname _STLP_PSPEC2(char, false) ();
+  virtual char        do_decimal_point() const;
+  virtual char        do_thousands_sep() const;
+  virtual string      do_grouping()      const;
+
+  virtual string_type do_curr_symbol()   const;
+
+  virtual string_type do_positive_sign() const;
+  virtual string_type do_negative_sign() const;
+  virtual int         do_frac_digits()   const;
+};
+
+# ifndef _STLP_NO_WCHAR_T
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC moneypunct_byname<wchar_t, true> : public moneypunct<wchar_t, true> 
+{
+public:
+  typedef money_base::pattern   pattern;
+  typedef wchar_t               char_type;
+  typedef wstring               string_type;
+
+  explicit moneypunct_byname _STLP_PSPEC2(wchar_t, true) (const char * __name, size_t __refs = 0);
+
+protected:
+  _Locale_monetary* _M_monetary;
+  ~moneypunct_byname _STLP_PSPEC2(wchar_t, true) ();
+  virtual wchar_t     do_decimal_point() const;
+  virtual wchar_t     do_thousands_sep() const;
+  virtual string      do_grouping()      const;
+
+  virtual string_type do_curr_symbol()   const;
+
+  virtual string_type do_positive_sign() const;
+  virtual string_type do_negative_sign() const;
+  virtual int         do_frac_digits()   const;
+};
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC moneypunct_byname<wchar_t, false> : public moneypunct<wchar_t, false> 
+{
+public:
+  typedef money_base::pattern   pattern;
+  typedef wchar_t               char_type;
+  typedef wstring               string_type;
+
+  explicit moneypunct_byname _STLP_PSPEC2(wchar_t, false) (const char * __name, size_t __refs = 0);
+
+protected:
+  _Locale_monetary* _M_monetary;
+  ~moneypunct_byname _STLP_PSPEC2(wchar_t, false) ();
+  virtual wchar_t     do_decimal_point() const;
+  virtual wchar_t     do_thousands_sep() const;
+  virtual string      do_grouping()      const;
+
+  virtual string_type do_curr_symbol()   const;
+
+  virtual string_type do_positive_sign() const;
+  virtual string_type do_negative_sign() const;
+  virtual int         do_frac_digits()   const;
+};
+# endif
+
+//===== methods ======
+
+
+// money_put facets
+
+template <class _CharT, __DFL_TMPL_PARAM( _OutputIter , ostreambuf_iterator<_CharT>) >
+class money_put : public locale::facet {
+  friend class _Locale;
+
+public:
+  typedef _CharT               char_type;
+  typedef _OutputIter          iter_type;
+  typedef basic_string<_CharT, char_traits<_CharT>, allocator<_CharT> > string_type;
+
+  money_put(size_t __refs = 0) : _BaseFacet(__refs) {}
+# ifndef _STLP_NO_LONG_DOUBLE
+  iter_type put(iter_type __s, bool __intl, ios_base& __str,
+                char_type  __fill, long double __units) const
+    { return do_put(__s, __intl, __str, __fill, __units); }
+# endif
+  iter_type put(iter_type __s, bool __intl, ios_base& __str,
+                char_type  __fill, 
+                const string_type& __digits) const
+    { return do_put(__s, __intl, __str, __fill, __digits); }
+
+  _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
+
+protected:
+  ~money_put() {}
+# ifndef _STLP_NO_LONG_DOUBLE
+  virtual iter_type do_put(iter_type __s, bool  __intl, ios_base&  __str,
+                           char_type __fill, long double /*  __units */ ) const {
+
+    locale __loc = __str.getloc();
+    _CharT  __buf[64];
+    return do_put(__s, __intl, __str, __fill, __buf + 0);
+  }
+# endif    
+  virtual iter_type do_put(iter_type __s, bool  __intl, ios_base&  __str,
+                           char_type __fill,
+                           const string_type& __digits) const;
+};
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+_STLP_EXPORT_TEMPLATE_CLASS money_get<char, istreambuf_iterator<char, char_traits<char> > >;
+_STLP_EXPORT_TEMPLATE_CLASS money_put<char, ostreambuf_iterator<char, char_traits<char> > >;
+// _STLP_EXPORT_TEMPLATE_CLASS money_get<char, const char* >;
+// _STLP_EXPORT_TEMPLATE_CLASS money_put<char, char* >;
+#  if ! defined (_STLP_NO_WCHAR_T)
+_STLP_EXPORT_TEMPLATE_CLASS money_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >;
+_STLP_EXPORT_TEMPLATE_CLASS money_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >;
+// _STLP_EXPORT_TEMPLATE_CLASS money_get<wchar_t, const wchar_t* >;
+// _STLP_EXPORT_TEMPLATE_CLASS money_put<wchar_t, wchar_t* >;
+#  endif
+# endif /* _STLP_USE_TEMPLATE_EXPORT */
+
+# if defined (__BORLANDC__) && defined (_RTLDLL)
+inline void _Stl_loc_init_monetary() {
+  money_get<char, istreambuf_iterator<char, char_traits<char> > >::id._M_index                     = 8;
+  money_get<char, const char*>::id._M_index        = 9;
+  money_put<char, ostreambuf_iterator<char, char_traits<char> > >::id._M_index                     = 10;
+  money_put<char, char*>::id._M_index              = 11;
+# ifndef _STLP_NO_WCHAR_T
+  money_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >::id._M_index                  = 27;
+  money_get<wchar_t, const wchar_t*>::id._M_index  = 28;
+  money_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >::id._M_index                  = 29;
+  money_put<wchar_t, wchar_t*>::id._M_index        = 30;
+# endif  
+}
+#endif
+
+_STLP_END_NAMESPACE
+
+# if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION) && !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_monetary.c>
+# endif
+
+#endif /* _STLP_INTERNAL_MONETARY_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
+
diff --git a/main/source/stlport/stlport/stl/_new.h b/main/source/stlport/stlport/stl/_new.h
new file mode 100644
index 00000000..4cf67ffc
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_new.h
@@ -0,0 +1,93 @@
+
+#ifndef _STLP_NEW_H_HEADER
+# define _STLP_NEW_H_HEADER
+
+# ifdef _STLP_NO_BAD_ALLOC
+
+# ifndef _STLP_NEW_DONT_THROW
+#   define _STLP_NEW_DONT_THROW 1
+# endif /* _STLP_NEW_DONT_THROW */
+
+#  include <exception>
+
+_STLP_BEGIN_NAMESPACE
+
+struct nothrow_t {};
+
+# ifdef _STLP_OWN_IOSTREAMS
+extern _STLP_DECLSPEC const nothrow_t nothrow;
+# else
+#  define nothrow nothrow_t()
+# endif
+
+class bad_alloc : public _STLP_EXCEPTION_BASE { 
+public:
+  bad_alloc () _STLP_NOTHROW_INHERENTLY { }
+  bad_alloc(const bad_alloc&) _STLP_NOTHROW_INHERENTLY { }
+  bad_alloc& operator=(const bad_alloc&) _STLP_NOTHROW_INHERENTLY {return *this;}
+  ~bad_alloc () _STLP_NOTHROW_INHERENTLY { }
+  const char* what() const _STLP_NOTHROW_INHERENTLY { return "bad alloc"; }
+};
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_NO_BAD_ALLOC */
+
+#ifdef _STLP_WINCE
+_STLP_BEGIN_NAMESPACE
+
+inline void* _STLP_CALL __stl_new(size_t __n) {
+  return ::malloc(__n);
+}
+
+inline void _STLP_CALL __stl_delete(void* __p) {
+  free(__p);
+}
+_STLP_END_NAMESPACE
+
+#else /* _STLP_WINCE */
+
+#include <new>
+
+# ifndef _STLP_NO_BAD_ALLOC
+#  ifdef _STLP_USE_OWN_NAMESPACE
+
+    _STLP_BEGIN_NAMESPACE
+    using _STLP_VENDOR_EXCEPT_STD::bad_alloc;
+    using _STLP_VENDOR_EXCEPT_STD::nothrow_t;
+    using _STLP_VENDOR_EXCEPT_STD::nothrow;
+
+#  if defined (_STLP_GLOBAL_NEW_HANDLER)
+    using ::new_handler;
+    using ::set_new_handler;
+#  else
+    using _STLP_VENDOR_EXCEPT_STD::new_handler;
+    using _STLP_VENDOR_EXCEPT_STD::set_new_handler;
+#  endif
+    
+    _STLP_END_NAMESPACE
+
+#  endif /* _STLP_OWN_NAMESPACE */
+
+# endif /* _STLP_NO_BAD_ALLOC */
+
+# if defined (_STLP_NO_NEW_NEW_HEADER) || defined (_STLP_NEW_DONT_THROW) && ! defined (_STLP_CHECK_NULL_ALLOC)
+#  define _STLP_CHECK_NULL_ALLOC(__x) void* __y = __x;if (__y == 0){_STLP_THROW(bad_alloc());}return __y
+# else
+#  define _STLP_CHECK_NULL_ALLOC(__x) return __x
+# endif
+
+_STLP_BEGIN_NAMESPACE
+
+#if (( defined(__IBMCPP__)|| defined(__OS400__) || defined (__xlC__) || defined (qTidyHeap)) && defined(__DEBUG_ALLOC__) )
+inline void*  _STLP_CALL __stl_new(size_t __n) {  _STLP_CHECK_NULL_ALLOC(::operator _STLP_NEW(__n, __FILE__, __LINE__)); }
+inline void _STLP_CALL __stl_delete(void* __p) { ::operator delete(__p, __FILE__, __LINE__); }
+#else
+inline void*  _STLP_CALL __stl_new(size_t __n)   { _STLP_CHECK_NULL_ALLOC(::operator _STLP_NEW(__n)); }
+inline void   _STLP_CALL __stl_delete(void* __p) { ::operator delete(__p); }
+#endif
+_STLP_END_NAMESPACE
+
+# endif /* _STLP_WINCE */
+
+#endif /* _STLP_NEW_H_HEADER */
diff --git a/main/source/stlport/stlport/stl/_null_stream.h b/main/source/stlport/stlport/stl/_null_stream.h
new file mode 100644
index 00000000..ff7e3acd
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_null_stream.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2000
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_NULL_STREAM_H
+# define _STLP_NULL_STREAM_H
+
+_STLP_BEGIN_NAMESPACE
+
+struct __null_stream 
+{
+    void flush() { }
+};
+
+template <class _Tp>
+__null_stream& operator <<(__null_stream& __x, const _Tp& ) 
+{
+    return __x;
+}
+
+template <class _Tp>
+__null_stream& operator >>(const _Tp&, __null_stream& __x ) 
+{
+    return __x;
+}
+
+extern __null_stream cin, cout, cerr, endl, ws, hex, dec;
+
+_STLP_END_NAMESPACE
+
+# endif
diff --git a/main/source/stlport/stlport/stl/_num_get.c b/main/source/stlport/stlport/stl/_num_get.c
new file mode 100644
index 00000000..3cb8ff5a
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_num_get.c
@@ -0,0 +1,671 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+#ifndef _STLP_NUM_GET_C
+#define _STLP_NUM_GET_C
+
+#ifndef _STLP_INTERNAL_NUM_GET_H
+# include <stl/_num_get.h>
+#endif
+
+# if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION)
+
+#ifndef _STLP_LIMITS_H
+# include <stl/_limits.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+extern const unsigned char __digit_val_table[];
+
+template < class _InputIter, class _Integer, class _CharT>
+_InputIter _STLP_CALL
+_M_do_get_integer(_InputIter&, _InputIter&, ios_base&, ios_base::iostate&, _Integer&, _CharT*);
+
+// _M_do_get_integer and its helper functions.  
+
+inline bool _STLP_CALL __get_fdigit(char& __c, const char*)
+  { return __c >= '0' && __c <= '9'; }
+
+inline bool _STLP_CALL __get_fdigit_or_sep(char& __c, char __sep, const char *)
+{ 
+  if (__c == __sep) { 
+    __c = ',' ; 
+    return true ;
+  } else
+    return  ( __c >= '0' && __c <= '9');
+}
+
+inline int _STLP_CALL
+__get_digit_from_table(unsigned __index)
+{
+  return (__index > 127 ? 0xFF : __digit_val_table[__index]);
+}
+
+extern const char __narrow_atoms[];
+
+template <class _InputIter, class _CharT>
+int 
+_M_get_base_or_zero(_InputIter& __in, _InputIter& __end, ios_base& __str, _CharT*)
+{
+  _CharT __atoms[5];
+  const ctype<_CharT>& __c_type = use_facet< ctype<_CharT> >(__str.getloc());
+  // const ctype<_CharT>& __c_type = *(const ctype<_CharT>*)__str._M_ctype_facet();
+
+  __c_type.widen(__narrow_atoms, __narrow_atoms + 5, __atoms);
+
+  bool __negative = false;
+  _CharT __c = *__in;
+
+  if (__c == __atoms[1] /* __xminus_char */ ) {
+    __negative = true;
+    ++__in;
+  }
+  else if (__c == __atoms[0] /* __xplus_char */ ) 
+    ++__in;
+
+
+  int __base;
+  int __valid_zero = 0;
+  
+  ios_base::fmtflags __basefield = __str.flags() & ios_base::basefield; 
+
+  switch (__basefield) {
+  case ios_base::oct:
+    __base = 8;
+    break;
+  case ios_base::dec:
+    __base = 10;
+    break;
+  case ios_base::hex:
+    __base = 16;
+    if (__in != __end && *__in == __atoms[2] /* __zero_char */ ) {
+      ++__in;
+      if (__in != __end &&
+          (*__in == __atoms[3] /* __x_char */ || *__in == __atoms[4] /* __X_char */ ))
+        ++__in;
+      else
+        __valid_zero = 1; // That zero is valid by itself.
+    }
+    break;
+  default:
+    if (__in != __end && *__in == __atoms[2] /* __zero_char */ ) {
+      ++__in;
+      if (__in != __end &&
+          (*__in == __atoms[3] /* __x_char */ || *__in == __atoms[4] /* __X_char */ )) {
+        ++__in;
+        __base = 16;
+      }
+      else
+        {
+          __base = 8;
+          __valid_zero = 1; // That zero is still valid by itself.
+        }
+    }
+    else
+      __base = 10;
+    break;
+  }
+  return (__base << 2) | ((int)__negative << 1) | __valid_zero;
+}
+
+
+template <class _InputIter, class _Integer>
+bool _STLP_CALL
+__get_integer(_InputIter& __first, _InputIter& __last,
+	      int __base, _Integer& __val, 
+	      int __got, bool __is_negative, char __separator, const string& __grouping, const __true_type&) 
+{
+  bool __ovflow = false;
+  _Integer __result = 0;
+  bool __is_group = !__grouping.empty();
+  char __group_sizes[64];
+  int __current_group_size = 0;
+  char* __group_sizes_end = __group_sizes;
+  
+  _Integer __over_base = (numeric_limits<_Integer>::min)() / __STATIC_CAST(_Integer, __base);
+
+   for ( ; __first != __last ; ++__first) {
+  
+     const char __c = *__first;
+     
+     if (__is_group && __c == __separator) {
+       *__group_sizes_end++ = __current_group_size;
+       __current_group_size = 0;
+       continue;
+     }
+     
+     int __n = __get_digit_from_table(__c);
+     
+     if (__n >= __base)
+       break;
+     
+     ++__got;
+     ++__current_group_size;
+     
+     if (__result < __over_base)
+       __ovflow = true;  // don't need to keep accumulating
+     else {
+       _Integer __next = __STATIC_CAST(_Integer, __base * __result - __n);
+       if (__result != 0)
+	 __ovflow = __ovflow || __next >= __result;
+       __result = __next;
+     }
+   }
+
+   if (__is_group && __group_sizes_end != __group_sizes) {
+     *__group_sizes_end++ = __current_group_size;
+   }
+
+   // fbp : added to not modify value if nothing was read
+   if (__got > 0) {
+       __val = __ovflow
+	 ? __is_negative ? (numeric_limits<_Integer>::min)()
+	 : (numeric_limits<_Integer>::max)()
+	 : (__is_negative ? __result : __STATIC_CAST(_Integer, -__result));
+   }
+  // overflow is being treated as failure
+  return ((__got > 0) && !__ovflow) && (__is_group == 0 || __valid_grouping(__group_sizes, __group_sizes_end,
+									    __grouping.data(), __grouping.data()+ __grouping.size())) ;
+}
+
+template <class _InputIter, class _Integer>
+bool _STLP_CALL
+__get_integer(_InputIter& __first, _InputIter& __last,
+	      int __base, _Integer& __val, 
+	      int __got, bool __is_negative, char __separator, const string& __grouping, const __false_type&) 
+{
+  bool __ovflow = false;
+  _Integer __result = 0;
+  bool __is_group = !__grouping.empty();
+  char __group_sizes[64];
+  int __current_group_size = 0;
+  char* __group_sizes_end = __group_sizes;
+
+  _Integer  __over_base = (numeric_limits<_Integer>::max)() / __STATIC_CAST(_Integer, __base);
+
+  for ( ; __first != __last ; ++__first) {
+
+    const char __c = *__first;
+    
+    if (__is_group && __c == __separator) {
+      *__group_sizes_end++ = __current_group_size;
+      __current_group_size = 0;
+      continue;
+    }
+    
+    int __n = __get_digit_from_table(__c);
+    
+    if (__n >= __base)
+      break;
+    
+    ++__got;
+    ++__current_group_size;
+
+    if (__result > __over_base)
+      __ovflow = true;  //don't need to keep accumulating
+    else {
+      _Integer __next = __STATIC_CAST(_Integer, __base * __result + __n);
+	if (__result != 0)
+	  __ovflow = __ovflow || __next <= __result;
+	__result = __next;
+      }      
+  }
+
+  if (__is_group && __group_sizes_end != __group_sizes) {
+      *__group_sizes_end++ = __current_group_size;
+  }
+
+  // fbp : added to not modify value if nothing was read
+  if (__got > 0) {
+      __val = __ovflow
+	? (numeric_limits<_Integer>::max)()
+	: (__is_negative ? __STATIC_CAST(_Integer, -__result) : __result);      
+  }
+  // overflow is being treated as failure
+  return ((__got > 0) && !__ovflow) && 
+    (__is_group == 0 || __valid_grouping(__group_sizes, __group_sizes_end,
+					 __grouping.data(), __grouping.data()+ __grouping.size())) ;
+}
+
+
+template <class _InputIter, class _Integer>
+bool _STLP_CALL
+__get_decimal_integer(_InputIter& __first, _InputIter& __last, _Integer& __val)
+{
+  string __grp;
+  return __get_integer(__first, __last, 10, __val, 0, false, ' ', __grp, __false_type());
+}
+
+template <class _InputIter, class _Integer, class _CharT>
+_InputIter _STLP_CALL
+_M_do_get_integer(_InputIter& __in, _InputIter& __end, ios_base& __str,
+                  ios_base::iostate& __err, _Integer& __val, _CharT* __pc) 
+{
+
+#if defined(__HP_aCC) && (__HP_aCC == 1)
+  bool _IsSigned = !((_Integer)(-1) > 0);
+#else
+  typedef typename __bool2type<numeric_limits<_Integer>::is_signed>::_Ret _IsSigned;
+#endif
+
+  const numpunct<_CharT>& __numpunct = *(const numpunct<_CharT>*)__str._M_numpunct_facet();
+  const string& __grouping = __str._M_grouping(); // cached copy
+
+  const int __base_or_zero = _M_get_base_or_zero(__in, __end, __str, __pc);
+  int  __got = __base_or_zero & 1;
+
+  bool __result;
+
+  if (__in == __end) {      // We may have already read a 0.  If so,
+
+    if (__got > 0) {       // the result is 0 even if we're at eof.
+      __val = 0;
+      __result = true;
+    }
+    else
+      __result = false;    
+  } else {
+
+    const bool __negative = __base_or_zero & 2;
+    const int __base = __base_or_zero >> 2;
+
+#if defined(__HP_aCC) && (__HP_aCC == 1)
+     if (_IsSigned)
+       __result = __get_integer(__in, __end, __base,  __val, __got, __negative, __numpunct.thousands_sep(), __grouping, __true_type() );
+     else
+      __result = __get_integer(__in, __end, __base,  __val, __got, __negative, __numpunct.thousands_sep(), __grouping, __false_type() );
+#else
+    __result = __get_integer(__in, __end, __base,  __val, __got, __negative, __numpunct.thousands_sep(), __grouping, _IsSigned());
+# endif
+  }
+
+  __err = __STATIC_CAST(ios_base::iostate, __result ? ios_base::goodbit : ios_base::failbit);
+
+  if (__in == __end)
+    __err |= ios_base::eofbit;
+  return __in;
+}
+
+// _M_read_float and its helper functions.
+template <class _InputIter, class _CharT>
+_InputIter  _STLP_CALL
+__copy_sign(_InputIter __first, _InputIter __last, string& __v,
+            _CharT __xplus, _CharT __xminus) {
+    if (__first != __last) {
+    _CharT __c = *__first;
+    if (__c == __xplus)
+      ++__first;
+    else if (__c == __xminus) {
+      __v.push_back('-');
+      ++__first;
+    }
+  }
+  return __first;
+}
+
+
+template <class _InputIter, class _CharT>
+bool _STLP_CALL
+__copy_digits(_InputIter& __first, _InputIter& __last,
+              string& __v, const _CharT* __digits)
+{
+  bool __ok = false;
+
+  for ( ; __first != __last; ++__first) {
+    _CharT __c = *__first;
+    if (__get_fdigit(__c, __digits)) {
+      __v.push_back((char)__c);
+      __ok = true;
+    }
+    else
+      break;
+  }
+  return __ok;
+}
+
+template <class _InputIter, class _CharT>
+bool _STLP_CALL
+__copy_grouped_digits(_InputIter& __first, _InputIter& __last,
+		      string& __v, const _CharT * __digits,
+		      _CharT __sep, const string& __grouping,
+		      bool& __grouping_ok)
+{
+  bool __ok = false;
+  char __group_sizes[64];
+  char*__group_sizes_end = __group_sizes;
+  char __current_group_size = 0;
+
+  for ( ; __first != __last; ++__first) {
+    _CharT __c = *__first;
+    bool __tmp = __get_fdigit_or_sep(__c, __sep, __digits);
+    if (__tmp) {
+      if (__c == ',') {
+        *__group_sizes_end++ = __current_group_size;
+        __current_group_size = 0;
+      }
+      else {
+        __ok = true;
+        __v.push_back((char)__c);
+        ++__current_group_size;
+      }
+    }
+    else
+      break;
+  }
+  
+  if (__group_sizes_end != __group_sizes)
+    *__group_sizes_end++ = __current_group_size;
+  __grouping_ok = __valid_grouping(__group_sizes, __group_sizes_end, __grouping.data(), __grouping.data() + __grouping.size());
+  return __ok;	
+}
+
+
+template <class _InputIter, class _CharT>
+bool _STLP_CALL
+_M_read_float(string& __buf, _InputIter& __in, _InputIter& __end, ios_base& __s, _CharT*)
+{
+  // Create a string, copying characters of the form 
+  // [+-]? [0-9]* .? [0-9]* ([eE] [+-]? [0-9]+)?
+
+  bool __digits_before_dot /* = false */;
+  bool __digits_after_dot = false;
+  bool __ok;
+
+  bool   __grouping_ok = true;
+
+  const ctype<_CharT>& __ct = use_facet< ctype<_CharT> >(__s.getloc());
+  // const ctype<_CharT>& __ct = *(const ctype<_CharT>*)__s._M_ctype_facet();
+  const numpunct<_CharT>& __numpunct = *(const numpunct<_CharT>*)__s._M_numpunct_facet();
+  const string& __grouping = __s._M_grouping(); // cached copy
+
+  _CharT __dot = __numpunct.decimal_point();
+  _CharT __sep = __numpunct.thousands_sep();
+
+  _CharT __digits[10];
+  _CharT __xplus;
+  _CharT __xminus;
+
+  _CharT __pow_e;
+  _CharT __pow_E;
+
+  _Initialize_get_float(__ct, __xplus, __xminus, __pow_e, __pow_E, __digits);
+
+  // Get an optional sign
+  __in = __copy_sign(__in, __end, __buf, __xplus, __xminus);
+
+  // Get an optional string of digits.
+  if (__grouping.size() != 0)
+    __digits_before_dot = __copy_grouped_digits(__in, __end, __buf, __digits,
+						__sep, __grouping, __grouping_ok);
+  else
+    __digits_before_dot = __copy_digits(__in, __end, __buf, __digits);
+
+  // Get an optional decimal point, and an optional string of digits.
+  if (__in != __end && *__in == __dot) {
+    __buf.push_back('.');
+    ++__in;
+    __digits_after_dot = __copy_digits(__in, __end, __buf, __digits);
+  }
+
+  // There have to be some digits, somewhere.
+  __ok = __digits_before_dot || __digits_after_dot;
+  
+  // Get an optional exponent.
+  if (__ok && __in != __end && (*__in == __pow_e || *__in == __pow_E)) {
+    __buf.push_back('e');
+    ++__in;
+    __in = __copy_sign(__in, __end, __buf, __xplus, __xminus);
+    __ok = __copy_digits(__in, __end, __buf, __digits);
+    // If we have an exponent then the sign 
+    // is optional but the digits aren't.
+  }
+  
+  return __ok;
+}
+
+//
+// num_get<>, num_put<>
+//
+
+# if ( _STLP_STATIC_TEMPLATE_DATA > 0 ) 
+template <class _CharT, class _InputIterator>
+locale::id num_get<_CharT, _InputIterator>::id;
+# else
+
+typedef num_get<char, const char*> num_get_char;
+typedef num_get<char, istreambuf_iterator<char, char_traits<char> > > num_get_char_2;
+
+__DECLARE_INSTANCE(locale::id, num_get_char::id, );
+__DECLARE_INSTANCE(locale::id, num_get_char_2::id, );
+
+# ifndef _STLP_NO_WCHAR_T
+
+typedef num_get<wchar_t, const wchar_t*> num_get_wchar_t;
+typedef num_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > > num_get_wchar_t_2;
+
+__DECLARE_INSTANCE(locale::id, num_get_wchar_t::id, );
+__DECLARE_INSTANCE(locale::id, num_get_wchar_t_2::id, );
+
+# endif
+
+# endif /* ( _STLP_STATIC_TEMPLATE_DATA > 0 ) */
+
+# ifndef _STLP_NO_BOOL
+template <class _CharT, class _InputIter>
+_InputIter
+num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end,
+                                    ios_base& __s,
+                                    ios_base::iostate& __err, bool& __x) const
+{
+  if (__s.flags() & ios_base::boolalpha) {
+    locale __loc = __s.getloc();
+    const _Numpunct& __np = *(const _Numpunct*)__s._M_numpunct_facet();
+    //    const numpunct<_CharT>& __np = use_facet<numpunct<_CharT> >(__loc) ;
+//    const ctype<_CharT>& __ct =    use_facet<ctype<_CharT> >(__loc) ;
+
+    const basic_string<_CharT> __truename  = __np.truename();
+    const basic_string<_CharT> __falsename = __np.falsename();
+    bool __true_ok  = true;
+    bool __false_ok = true;
+
+    size_t __n = 0;
+    for ( ; __in != __end; ++__in) {
+      _CharT __c = *__in;
+      __true_ok  = __true_ok  && (__c == __truename[__n]);
+      __false_ok = __false_ok && (__c == __falsename[__n]);
+      ++__n;
+
+      if ((!__true_ok && !__false_ok) ||
+          (__true_ok  && __n >= __truename.size()) ||
+          (__false_ok && __n >= __falsename.size())) {
+	++__in;
+        break;
+      }
+    }
+    if (__true_ok  && __n < __truename.size())  __true_ok  = false;
+    if (__false_ok && __n < __falsename.size()) __false_ok = false;
+    
+    if (__true_ok || __false_ok) {
+      __err = ios_base::goodbit;
+      __x = __true_ok;
+    }
+    else
+      __err = ios_base::failbit;
+
+    if (__in == __end)
+      __err |= ios_base::eofbit;
+
+    return __in;
+  }
+
+  else {
+    long __lx;
+    _InputIter __tmp = this->do_get(__in, __end, __s, __err, __lx);
+    if (!(__err & ios_base::failbit)) {
+      if (__lx == 0)
+        __x = false;
+      else if (__lx == 1)
+        __x = true;
+      else
+        __err |= ios_base::failbit;
+    }
+    return __tmp;
+  }
+}
+
+# endif /* _STLP_NO_BOOL */
+
+# ifdef _STLP_FIX_LIBRARY_ISSUES
+template <class _CharT, class _InputIter>  
+_InputIter 
+num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                                    ios_base::iostate& __err, short& __val) const {
+  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
+}
+
+template <class _CharT, class _InputIter>  
+_InputIter 
+num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                                    ios_base::iostate& __err, int& __val) const {
+  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
+}
+
+# endif
+
+template <class _CharT, class _InputIter>  
+_InputIter 
+num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                                    ios_base::iostate& __err, long& __val) const {
+  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
+}
+
+template <class _CharT, class _InputIter>  
+_InputIter 
+num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                                    ios_base::iostate& __err,
+                                    unsigned short& __val) const {
+  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
+}
+
+template <class _CharT, class _InputIter>  
+_InputIter 
+num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                                    ios_base::iostate& __err, 
+                                    unsigned int& __val) const {
+  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
+}
+
+template <class _CharT, class _InputIter>  
+_InputIter 
+num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                                    ios_base::iostate& __err,
+                                    unsigned long& __val) const {
+  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
+}
+
+
+template <class _CharT, class _InputIter>  
+_InputIter 
+num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                                    ios_base::iostate& __err,
+                                    float& __val) const {
+  string __buf ;
+  bool __ok = _M_read_float(__buf, __in, __end, __str, (_CharT*)0 );
+  __string_to_float(__buf, __val);  
+  __err = __STATIC_CAST(ios_base::iostate, __ok ? ios_base::goodbit : ios_base::failbit);
+  if (__in == __end)
+    __err |= ios_base::eofbit;
+  return __in;
+}
+
+template <class _CharT, class _InputIter>  
+_InputIter 
+num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                                    ios_base::iostate& __err, 
+                                    double& __val) const {
+  string __buf ;
+  bool __ok = _M_read_float(__buf, __in, __end, __str, (_CharT*)0 );
+  __string_to_float(__buf, __val);
+  __err = __STATIC_CAST(ios_base::iostate, __ok ? ios_base::goodbit : ios_base::failbit);
+  if (__in == __end)
+    __err |= ios_base::eofbit;
+  return __in;
+}
+
+#ifndef _STLP_NO_LONG_DOUBLE
+template <class _CharT, class _InputIter>  
+_InputIter 
+num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+				    ios_base::iostate& __err,
+                                    long double& __val) const {
+  string __buf ;
+  bool __ok = _M_read_float(__buf, __in, __end, __str, (_CharT*)0 );
+  __string_to_float(__buf, __val);
+  __err = __STATIC_CAST(ios_base::iostate, __ok ? ios_base::goodbit : ios_base::failbit);
+  if (__in == __end)
+    __err |= ios_base::eofbit;
+  return __in;
+}
+#endif /* _STLP_NO_LONG_DOUBLE */
+
+template <class _CharT, class _InputIter>  
+_InputIter 
+num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                           ios_base::iostate& __err,
+                           void*& __p) const {
+# if defined(_STLP_LONG_LONG)&&!defined(__MRC__)		//*ty 12/07/2001 - MrCpp can not cast from long long to void*
+  unsigned _STLP_LONG_LONG __val;
+# else
+  unsigned long __val;
+# endif
+    iter_type __tmp = _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
+    if (!(__err & ios_base::failbit))
+      __p = __REINTERPRET_CAST(void*,__val);
+    return __tmp;
+  }
+
+
+#ifdef _STLP_LONG_LONG
+
+template <class _CharT, class _InputIter>  
+_InputIter 
+num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                                    ios_base::iostate& __err,
+                                    _STLP_LONG_LONG& __val) const {
+  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
+}
+
+template <class _CharT, class _InputIter>  
+_InputIter 
+num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                                    ios_base::iostate& __err,
+                                    unsigned _STLP_LONG_LONG& __val) const {
+  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
+}
+
+#endif /* _STLP_LONG_LONG */
+
+_STLP_END_NAMESPACE
+
+# endif /* _STLP_EXPOSE_STREAM_IMPLEMENTATION */
+
+#endif /* _STLP_NUMERIC_FACETS_C */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_num_get.h b/main/source/stlport/stlport/stl/_num_get.h
new file mode 100644
index 00000000..8c115ebc
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_num_get.h
@@ -0,0 +1,259 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+// WARNING: This is an internal header file, included by other C++
+// standard library headers.  You should not attempt to use this header
+// file directly.
+
+
+#ifndef _STLP_INTERNAL_NUM_GET_H
+#define _STLP_INTERNAL_NUM_GET_H
+
+#ifndef _STLP_INTERNAL_ISTREAMBUF_ITERATOR_H
+# include <stl/_istreambuf_iterator.h>
+#endif
+
+# ifndef _STLP_C_LOCALE_H
+#  include <stl/c_locale.h>
+# endif
+
+#ifndef _STLP_INTERNAL_NUMPUNCT_H
+# include <stl/_numpunct.h>
+#endif
+#ifndef _STLP_INTERNAL_CTYPE_H
+# include <stl/_ctype.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+//----------------------------------------------------------------------
+// num_get facets
+
+# ifdef _STLP_LIMITED_DEFAULT_TEMPLATES
+template <class _CharT, class _InputIter>  
+# else
+template <class _CharT, class _InputIter = istreambuf_iterator<_CharT> >  
+# endif
+class num_get: public locale::facet
+{
+  friend class _Locale;
+public:
+  typedef _CharT     char_type;
+  typedef _InputIter iter_type;
+
+  explicit num_get(size_t __refs = 0): locale::facet(__refs) {}
+    
+# ifndef _STLP_NO_BOOL
+  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
+                ios_base::iostate& __err, bool& __val) const {
+    return do_get(__in, __end, __str, __err, __val);
+  }
+# endif
+
+# ifdef _STLP_FIX_LIBRARY_ISSUES
+  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
+                ios_base::iostate& __err, short& __val) const {
+    return do_get(__in, __end, __str, __err, __val);
+  }
+
+  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
+                ios_base::iostate& __err, int& __val) const {
+    return do_get(__in, __end, __str, __err, __val);
+  }
+# endif
+
+  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
+                ios_base::iostate& __err, long& __val) const {
+    return do_get(__in, __end, __str, __err, __val);
+  }
+
+  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
+                ios_base::iostate& __err, unsigned short& __val) const {
+    return do_get(__in, __end, __str, __err, __val);
+  }
+
+  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
+                ios_base::iostate& __err, unsigned int& __val) const {
+    return do_get(__in, __end, __str, __err, __val);
+  }
+
+  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
+                ios_base::iostate& __err, unsigned long& __val) const {
+    return do_get(__in, __end, __str, __err, __val);
+  }
+
+#ifdef _STLP_LONG_LONG
+
+  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
+                ios_base::iostate& __err, _STLP_LONG_LONG& __val) const {
+    return do_get(__in, __end, __str, __err, __val);
+  }
+
+  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
+                ios_base::iostate& __err, unsigned _STLP_LONG_LONG& __val) const {
+    return do_get(__in, __end, __str, __err, __val);
+  }
+
+#endif /* _STLP_LONG_LONG */
+
+  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
+                 ios_base::iostate& __err, float& __val) const {
+    return do_get(__in, __end, __str, __err, __val);
+  }
+
+  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
+                ios_base::iostate& __err, double& __val) const {
+    return do_get(__in, __end, __str, __err, __val);
+  }
+
+# ifndef _STLP_NO_LONG_DOUBLE
+
+  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
+                ios_base::iostate& __err, long double& __val) const {
+    return do_get(__in, __end, __str, __err, __val);
+  }
+# endif
+
+  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
+                ios_base::iostate& __err, void*& __val) const {
+    return do_get(__in, __end, __str, __err, __val);
+  }
+
+  _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
+
+protected:
+  ~num_get() {}
+
+  typedef string               string_type; 
+  typedef ctype<_CharT>        _Ctype;
+  typedef numpunct<_CharT>     _Numpunct;
+
+# ifndef _STLP_NO_BOOL
+  virtual _InputIter do_get(_InputIter __in, _InputIter __end,
+                           ios_base& __str, ios_base::iostate& __err, bool& __val) const;
+# endif
+
+  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                           ios_base::iostate& __err, long& __val) const;
+  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                           ios_base::iostate& __err, unsigned short& __val) const;
+  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                           ios_base::iostate& __err, unsigned int& __val) const;
+  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                           ios_base::iostate& __err, unsigned long& __val) const;
+# ifdef _STLP_FIX_LIBRARY_ISSUES
+  // issue 118 : those are actually not supposed to be here
+  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                           ios_base::iostate& __err, short& __val) const;
+  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                           ios_base::iostate& __err, int& __val) const;
+# endif
+  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                          ios_base::iostate& __err, float& __val) const;
+  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                           ios_base::iostate& __err, double& __val) const;
+  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                           ios_base::iostate& __err,
+                           void*& __p) const;
+
+#ifndef _STLP_NO_LONG_DOUBLE
+  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                           ios_base::iostate& __err, long double& __val) const;
+#endif /* _STLP_NO_LONG_DOUBLE */
+
+#ifdef _STLP_LONG_LONG
+
+  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                            ios_base::iostate& __err, _STLP_LONG_LONG& __val) const;
+  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
+                           ios_base::iostate& __err, unsigned _STLP_LONG_LONG& __val) const;
+#endif /* _STLP_LONG_LONG */
+
+};
+
+
+# ifdef _STLP_USE_TEMPLATE_EXPORT
+_STLP_EXPORT_TEMPLATE_CLASS num_get<char, istreambuf_iterator<char, char_traits<char> > >;
+// _STLP_EXPORT_TEMPLATE_CLASS num_get<char, const char*>;
+#  ifndef _STLP_NO_WCHAR_T
+_STLP_EXPORT_TEMPLATE_CLASS num_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >;
+// _STLP_EXPORT_TEMPLATE_CLASS num_get<wchar_t, const wchar_t*>;
+#  endif /* _STLP_NO_WCHAR_T */
+# endif
+
+# if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION)
+
+extern bool  _STLP_CALL __valid_grouping(const char*, const char*, const char*, const char*);
+
+template <class _InputIter, class _Integer>
+bool _STLP_CALL
+__get_decimal_integer(_InputIter& __first, _InputIter& __last, _Integer& __val);
+
+inline bool _STLP_CALL __get_fdigit(char& __c, const char*);
+inline bool _STLP_CALL __get_fdigit_or_sep(char& __c, char __sep, const char *);
+# ifndef _STLP_NO_WCHAR_T
+bool _STLP_CALL __get_fdigit(wchar_t&, const wchar_t*);
+bool _STLP_CALL __get_fdigit_or_sep(wchar_t&, wchar_t, const wchar_t*);
+# endif
+
+inline void  _STLP_CALL
+_Initialize_get_float(const ctype<char>&,
+                       char& Plus, char& Minus,
+                       char& pow_e, char& pow_E,
+                       char*)
+{
+  Plus = '+';
+  Minus = '-';
+  pow_e = 'e';
+  pow_E = 'E';
+}
+
+# ifndef _STLP_NO_WCHAR_T
+void  _STLP_CALL _Initialize_get_float(const ctype<wchar_t>&,
+                                        wchar_t&, wchar_t&, wchar_t&, wchar_t&, wchar_t*);
+# endif
+void  _STLP_CALL __string_to_float(const string&, float&);
+void  _STLP_CALL __string_to_float(const string&, double&);
+# ifndef _STLP_NO_LONG_DOUBLE
+void  _STLP_CALL __string_to_float(const string&, long double&);
+# endif
+# endif
+
+# if defined (__BORLANDC__) && defined (_RTLDLL)
+inline void _Stl_loc_init_num_get() {  
+  num_get<char, istreambuf_iterator<char, char_traits<char> > >::id._M_index = 12;
+  num_get<char, const char*>::id._M_index = 13;
+  
+# ifndef _STLP_NO_WCHAR_T
+  num_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >::id._M_index = 31;
+  num_get<wchar_t, const wchar_t*>::id._M_index = 32;
+# endif
+} 
+# endif
+
+_STLP_END_NAMESPACE
+
+#  if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION) && ! defined (_STLP_LINK_TIME_INSTANTIATION)
+#   include <stl/_num_get.c>
+#  endif
+
+#endif /* _STLP_INTERNAL_NUM_GET_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_num_put.c b/main/source/stlport/stlport/stl/_num_put.c
new file mode 100644
index 00000000..6bcd6a8e
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_num_put.c
@@ -0,0 +1,553 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+#ifndef _STLP_NUM_PUT_C
+#define _STLP_NUM_PUT_C
+
+#ifndef _STLP_INTERNAL_NUM_PUT_H
+# include <stl/_num_put.h>
+#endif
+
+# if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION)
+
+#ifndef _STLP_LIMITS_H
+# include <stl/_limits.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+// _M_do_put_float and its helper functions.  Strategy: write the output
+// to a buffer of char, transform the buffer to _CharT, and then copy
+// it to the output.
+
+template <class _CharT, class _OutputIter,class _Float>
+_OutputIter _STLP_CALL
+_M_do_put_float(_OutputIter __s, ios_base& __f, _CharT __fill,_Float    __x);
+
+
+//----------------------------------------------------------------------
+// num_put facet
+
+template <class _CharT, class _OutputIter>
+_OutputIter  _STLP_CALL
+__copy_float_and_fill(const _CharT* __first, const _CharT* __last,
+                      _OutputIter __out,
+                      ios_base::fmtflags __flags,
+                      streamsize __width, _CharT __fill,
+                      _CharT __xplus, _CharT __xminus) {
+  if (__width <= __last - __first)
+    return copy(__first, __last, __out);
+  else {
+    streamsize __pad = __width - (__last - __first);
+    ios_base::fmtflags __dir = __flags & ios_base::adjustfield;
+
+    if (__dir == ios_base::left) {
+      __out = copy(__first, __last, __out);
+      return fill_n(__out, __pad, __fill);
+    }
+    else if (__dir == ios_base::internal && __first != __last &&
+             (*__first == __xplus || *__first == __xminus)) {
+      *__out++ = *__first++;
+      __out = fill_n(__out, __pad, __fill);
+      return copy(__first, __last, __out);
+    }
+    else {
+      __out = fill_n(__out, __pad, __fill);
+      return copy(__first, __last, __out);
+    }
+  }
+}
+
+#ifndef _STLP_NO_WCHAR_T
+// Helper routine for wchar_t
+template <class _OutputIter>
+_OutputIter  _STLP_CALL
+__put_float(char* __ibuf, char* __iend, _OutputIter __out,
+            ios_base& __f, wchar_t __fill,
+            wchar_t __decimal_point,
+            wchar_t __sep, const string& __grouping)
+{
+  const ctype<wchar_t>& __ct = *(ctype<wchar_t>*)__f._M_ctype_facet() ;
+
+  wchar_t __wbuf[128];
+  wchar_t* __eend = __convert_float_buffer(__ibuf, __iend, __wbuf,
+                                           __ct, __decimal_point);
+  if (!__grouping.empty()) {
+    // In order to do separator-insertion only to the left of the
+    // decimal point, we adjust the size of the first (right-most)
+    // group.  We need to be careful if there is only one entry in
+    // grouping:  in this case we need to duplicate the first entry.
+
+    string __new_grouping = __grouping;
+    wchar_t* __decimal_pos = find(__wbuf, __eend, __decimal_point);
+    if (__grouping.size() == 1)
+      __new_grouping.push_back(__grouping[0]);
+
+	// dwa 1/24/00 - try as I might, there doesn't seem to be a way
+    // to suppress the warning
+    __new_grouping[0] += __STATIC_CAST(char, __eend - __decimal_pos);
+    ptrdiff_t __len = __insert_grouping(__wbuf, __eend, __new_grouping,
+					__sep,
+					__ct.widen('+'), __ct.widen('-'),
+					0);
+    __eend = __wbuf + __len;
+  }
+
+  return __copy_float_and_fill(__wbuf, __eend, __out,
+                               __f.flags(), __f.width(0), __fill,
+                               __ct.widen('+'), __ct.widen('-')); 
+}
+# endif /* WCHAR_T */
+
+// Helper routine for char
+template <class _OutputIter>
+_OutputIter  _STLP_CALL
+__put_float(char* __ibuf, char* __iend, _OutputIter __out,
+            ios_base& __f, char __fill,
+            char __decimal_point,
+            char __sep, const string& __grouping)
+{
+  __adjust_float_buffer(__ibuf, __iend, __decimal_point);
+  if (!__grouping.empty()) {
+    string __new_grouping = __grouping;
+    const char * __decimal_pos = find(__ibuf, __iend, __decimal_point);
+    if (__grouping.size() == 1)
+      __new_grouping.push_back(__grouping[0]);
+    __new_grouping[0] += __STATIC_CAST(char, (__iend - __decimal_pos));
+    ptrdiff_t __len = __insert_grouping(__ibuf, __iend, __new_grouping,
+					__sep, '+', '-', 0);
+    __iend = __ibuf + __len;
+  }
+
+  return __copy_float_and_fill(__ibuf, __iend, __out,
+                               __f.flags(), __f.width(0), __fill, '+', '-');
+}
+
+template <class _CharT, class _OutputIter, class _Float>
+_OutputIter _STLP_CALL
+_M_do_put_float(_OutputIter __s, ios_base& __f,
+                _CharT __fill, _Float __x)
+{
+  string __buf;
+  __buf.reserve(128);
+  __write_float(__buf, __f.flags(), (int)__f.precision(), __x);
+
+  const numpunct<_CharT>& __np = *(const numpunct<_CharT>*)__f._M_numpunct_facet();
+  
+  return __put_float(__CONST_CAST(char*, __buf.c_str()), 
+                     __CONST_CAST(char*, __buf.c_str()) + __buf.size(),
+                     __s, __f, __fill,
+                     __np.decimal_point(),
+		                 __np.thousands_sep(), __f._M_grouping());
+}
+
+// _M_do_put_integer and its helper functions.
+
+template <class _CharT, class _OutputIter>
+_OutputIter _STLP_CALL
+__copy_integer_and_fill(const _CharT* __buf, ptrdiff_t __len,
+                        _OutputIter __out,
+                        ios_base::fmtflags __flg, streamsize __wid, _CharT __fill,
+                        _CharT __xplus, _CharT __xminus)
+{
+  if (__len >= __wid)
+    return copy(__buf, __buf + __len, __out);
+  else {
+    ptrdiff_t __pad = __wid - __len;
+    ios_base::fmtflags __dir = __flg & ios_base::adjustfield;
+
+    if (__dir == ios_base::left) {
+      __out = copy(__buf, __buf + __len, __out);
+      return fill_n(__out, __pad, __fill);
+    }
+    else if (__dir == ios_base::internal && __len != 0 &&
+             (__buf[0] == __xplus || __buf[0] == __xminus)) {
+      *__out++ = __buf[0];
+      __out = fill_n(__out, __pad, __fill);
+      return copy(__buf + 1, __buf + __len, __out);
+    }
+    else if (__dir == ios_base::internal && __len >= 2 &&
+             (__flg & ios_base::showbase) &&
+             (__flg & ios_base::basefield) == ios_base::hex) {
+      *__out++ = __buf[0];
+      *__out++ = __buf[1];
+      __out = fill_n(__out, __pad, __fill);
+      return copy(__buf + 2, __buf + __len, __out);
+    }
+    else {
+      __out = fill_n(__out, __pad, __fill);
+      return copy(__buf, __buf + __len, __out);
+    }
+  }
+}
+
+#ifndef _STLP_NO_WCHAR_T
+// Helper function for wchar_t
+template <class _OutputIter>
+_OutputIter _STLP_CALL
+__put_integer(char* __buf, char* __iend, _OutputIter __s,
+              ios_base& __f,
+              ios_base::fmtflags __flags, wchar_t __fill)
+{
+  locale __loc = __f.getloc();
+  //  const ctype<wchar_t>& __ct = use_facet<ctype<wchar_t> >(__loc);
+  const ctype<wchar_t>& __ct = *(const ctype<wchar_t>*)__f._M_ctype_facet();
+
+  wchar_t __xplus  = __ct.widen('+');
+  wchar_t __xminus = __ct.widen('-');
+
+  wchar_t __wbuf[64];
+  __ct.widen(__buf, __iend, __wbuf);
+  ptrdiff_t __len = __iend - __buf;
+  wchar_t* __eend = __wbuf + __len;
+
+  //  const numpunct<wchar_t>& __np = use_facet<numpunct<wchar_t> >(__loc);
+  //  const string& __grouping = __np.grouping();
+
+  const numpunct<wchar_t>& __np = *(const numpunct<wchar_t>*)__f._M_numpunct_facet();
+  const string& __grouping = __f._M_grouping();
+
+  if (!__grouping.empty()) {
+    int __basechars;
+    if (__flags & ios_base::showbase)
+      switch (__flags & ios_base::basefield) {
+	case ios_base::hex: __basechars = 2; break;
+	case ios_base::oct: __basechars = 1; break;
+	default: __basechars = 0;
+      }
+    else
+      __basechars = 0;
+
+    __len = __insert_grouping(__wbuf, __eend, __grouping, __np.thousands_sep(),
+			      __xplus, __xminus, __basechars);
+  }
+
+  return __copy_integer_and_fill((wchar_t*)__wbuf, __len, __s,
+                                 __flags, __f.width(0), __fill, __xplus, __xminus);
+}
+#endif
+
+// Helper function for char
+template <class _OutputIter>
+_OutputIter _STLP_CALL
+__put_integer(char* __buf, char* __iend, _OutputIter __s,
+              ios_base& __f, ios_base::fmtflags __flags, char __fill)
+{
+  ptrdiff_t __len = __iend - __buf;
+  char __grpbuf[64];
+
+  //  const numpunct<char>& __np = use_facet<numpunct<char> >(__f.getloc());
+  //  const string& __grouping = __np.grouping();
+
+  const numpunct<char>& __np = *(const numpunct<char>*)__f._M_numpunct_facet();
+  const string& __grouping = __f._M_grouping();
+
+  if (!__grouping.empty()) {
+    int __basechars;
+    if (__flags & ios_base::showbase)
+      switch (__flags & ios_base::basefield) {
+	case ios_base::hex: __basechars = 2; break;
+	case ios_base::oct: __basechars = 1; break;
+	default: __basechars = 0;
+      }
+    else
+      __basechars = 0;
+ 
+     // make sure there is room at the end of the buffer
+     // we pass to __insert_grouping
+
+    copy(__buf, __iend, (char *) __grpbuf);
+    __buf = __grpbuf;
+    __iend = __grpbuf + __len; 
+    __len = __insert_grouping(__buf, __iend, __grouping, __np.thousands_sep(), 
+                              '+', '-', __basechars);
+  }
+  
+  return __copy_integer_and_fill(__buf, __len, __s, __flags, __f.width(0), __fill, '+', '-');
+}
+
+#ifdef _STLP_LONG_LONG
+typedef _STLP_LONG_LONG __max_int_t;
+typedef unsigned _STLP_LONG_LONG __umax_int_t;
+#else
+typedef long __max_int_t;
+typedef unsigned long __umax_int_t;
+#endif
+
+extern const char __hex_char_table_lo[];
+extern const char __hex_char_table_hi[];
+
+template <class _Integer>
+inline char* _STLP_CALL
+__write_decimal_backward(char* __ptr, _Integer __x, ios_base::fmtflags __flags, const __true_type& /* is_signed */)
+{
+  const bool __negative = __x < 0 ;
+  __max_int_t __temp = __x;
+  __umax_int_t __utemp = __negative?-__temp:__temp;
+
+  for (; __utemp != 0; __utemp /= 10)
+    *--__ptr = (int)(__utemp % 10) + '0';	  
+  // put sign if needed or requested
+  if (__negative)
+    *--__ptr = '-';
+  else if (__flags & ios_base::showpos)
+    *--__ptr = '+';
+  return __ptr;
+}
+
+template <class _Integer>
+inline char* _STLP_CALL
+__write_decimal_backward(char* __ptr, _Integer __x, ios_base::fmtflags __flags, const __false_type& /* is_signed */)
+{
+  for (; __x != 0; __x /= 10)
+    *--__ptr = (int)(__x % 10) + '0';
+  // put sign if requested
+  if (__flags & ios_base::showpos)
+    *--__ptr = '+';
+  return __ptr;
+}
+
+template <class _Integer>
+char* _STLP_CALL
+__write_integer_backward(char* __buf, ios_base::fmtflags __flags, _Integer __x)
+{
+  char* __ptr = __buf;
+  __umax_int_t __temp;
+
+  if (__x == 0) {
+    *--__ptr = '0';
+    if ((__flags & ios_base::showpos) && ( (__flags & (ios_base::hex | ios_base::oct)) == 0 ))
+      *--__ptr = '+';
+  }
+  else {
+    
+    switch (__flags & ios_base::basefield) {
+    case ios_base::oct:
+      __temp = __x;
+      // if the size of integer is less than 8, clear upper part
+      if ( sizeof(__x) < 8  && sizeof(__umax_int_t) >= 8 )
+        __temp &= 0xFFFFFFFF;
+
+      for (; __temp != 0; __temp >>=3)
+        *--__ptr = (((unsigned)__temp)& 0x7) + '0';
+      
+      // put leading '0' is showbase is set
+      if (__flags & ios_base::showbase)
+        *--__ptr = '0';
+      break;
+    case ios_base::hex: 
+      {
+        const char* __table_ptr = (__flags & ios_base::uppercase) ? 
+          __hex_char_table_hi : __hex_char_table_lo;
+      __temp = __x;
+      // if the size of integer is less than 8, clear upper part
+      if ( sizeof(__x) < 8  && sizeof(__umax_int_t) >= 8 )
+        __temp &= 0xFFFFFFFF;
+
+        for (; __temp != 0; __temp >>=4)
+          *--__ptr = __table_ptr[((unsigned)__temp & 0xF)];
+        
+        if (__flags & ios_base::showbase) {
+          *--__ptr = __table_ptr[16];
+          *--__ptr = '0';
+        }
+      }
+      break;
+    default: 
+      {
+#if defined(__HP_aCC) && (__HP_aCC == 1)
+        bool _IsSigned = !((_Integer)-1 > 0);
+	if (_IsSigned)
+	  __ptr = __write_decimal_backward(__ptr, __x, __flags, __true_type() );
+        else
+	  __ptr = __write_decimal_backward(__ptr, __x, __flags, __false_type() );
+#else
+	typedef typename __bool2type<numeric_limits<_Integer>::is_signed>::_Ret _IsSigned;
+	__ptr = __write_decimal_backward(__ptr, __x, __flags, _IsSigned());
+# endif
+      }
+      break;
+    }  
+  }
+  // return pointer to beginning of the string
+  return __ptr;
+}
+
+//
+// num_put<>
+//
+
+# if ( _STLP_STATIC_TEMPLATE_DATA > 0 )
+
+template <class _CharT, class _OutputIterator>
+locale::id num_put<_CharT, _OutputIterator>::id;
+# else /* ( _STLP_STATIC_TEMPLATE_DATA > 0 ) */
+
+typedef num_put<char, const char*> num_put_char;
+typedef num_put<char, char*> num_put_char_2;
+typedef num_put<char, ostreambuf_iterator<char, char_traits<char> > > num_put_char_3;
+
+__DECLARE_INSTANCE(locale::id, num_put_char::id, );
+__DECLARE_INSTANCE(locale::id, num_put_char_2::id, );
+__DECLARE_INSTANCE(locale::id, num_put_char_3::id, );
+
+# ifndef _STLP_NO_WCHAR_T
+
+typedef num_put<wchar_t, const wchar_t*> num_put_wchar_t;
+typedef num_put<wchar_t, wchar_t*> num_put_wchar_t_2;
+typedef num_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > > num_put_wchar_t_3;
+
+__DECLARE_INSTANCE(locale::id, num_put_wchar_t::id, );
+__DECLARE_INSTANCE(locale::id, num_put_wchar_t_2::id, );
+__DECLARE_INSTANCE(locale::id, num_put_wchar_t_3::id, );
+
+# endif
+
+# endif /* ( _STLP_STATIC_TEMPLATE_DATA > 0 ) */
+
+// issue 118
+
+# ifndef _STLP_NO_BOOL
+
+template <class _CharT, class _OutputIter>  
+_OutputIter 
+num_put<_CharT, _OutputIter>::do_put(_OutputIter __s, ios_base& __f, 
+                                     char_type __fill,  bool __val) const {
+  if (!(__f.flags() & ios_base::boolalpha))
+    return this->do_put(__s, __f, __fill, __STATIC_CAST(long,__val));
+
+  locale __loc = __f.getloc();
+  //  typedef numpunct<_CharT> _Punct;
+  //  const _Punct& __np = use_facet<_Punct>(__loc);
+
+  const numpunct<_CharT>& __np = *(const numpunct<_CharT>*)__f._M_numpunct_facet();
+
+  basic_string<_CharT> __str = __val ? __np.truename() : __np.falsename();
+
+  // Reuse __copy_integer_and_fill.  Since internal padding makes no
+  // sense for bool, though, make sure we use something else instead.
+  // The last two argument to __copy_integer_and_fill are dummies.
+  ios_base::fmtflags __flags = __f.flags();
+  if ((__flags & ios_base::adjustfield) == ios_base::internal)
+    __flags = (__flags & ~ios_base::adjustfield) | ios_base::right;
+
+  return __copy_integer_and_fill(__str.c_str(), __str.size(), __s,
+                                 __flags, __f.width(0), __fill,
+                                 (_CharT) 0, (_CharT) 0);
+}
+
+# endif
+
+template <class _CharT, class _OutputIter>
+_OutputIter 
+num_put<_CharT, _OutputIter>::do_put(_OutputIter __s, ios_base& __f, _CharT __fill,
+                                     long __val) const {
+
+  char __buf[64];               // Large enough for a base 8 64-bit integer,
+                                // plus any necessary grouping.  
+  ios_base::fmtflags __flags = __f.flags();
+  char* __ibeg = __write_integer_backward((char*)__buf+64, __flags, __val);  
+  return __put_integer(__ibeg, (char*)__buf+64, __s, __f, __flags, __fill);
+}
+
+
+template <class _CharT, class _OutputIter>  
+_OutputIter 
+num_put<_CharT, _OutputIter>::do_put(_OutputIter __s, ios_base& __f, _CharT __fill,
+				     unsigned long __val) const {
+  char __buf[64];               // Large enough for a base 8 64-bit integer,
+                                // plus any necessary grouping.
+  
+  ios_base::fmtflags __flags = __f.flags();
+  char* __ibeg = __write_integer_backward((char*)__buf+64, __flags, __val);
+  return __put_integer(__ibeg, (char*)__buf+64, __s, __f, __flags, __fill);
+}
+
+template <class _CharT, class _OutputIter>  
+_OutputIter 
+num_put<_CharT, _OutputIter>::do_put(_OutputIter __s, ios_base& __f, _CharT __fill,
+                                     double __val) const {
+  return _M_do_put_float(__s, __f, __fill, __val);
+}
+
+#ifndef _STLP_NO_LONG_DOUBLE
+template <class _CharT, class _OutputIter>  
+_OutputIter 
+num_put<_CharT, _OutputIter>::do_put(_OutputIter __s, ios_base& __f, _CharT __fill,
+                                     long double __val) const {
+  return _M_do_put_float(__s, __f, __fill, __val);
+}
+#endif
+
+#ifdef _STLP_LONG_LONG
+template <class _CharT, class _OutputIter>  
+_OutputIter 
+num_put<_CharT, _OutputIter>::do_put(_OutputIter __s, ios_base& __f, _CharT __fill,
+                                     _STLP_LONG_LONG __val) const {
+  char __buf[64];               // Large enough for a base 8 64-bit integer,
+                                // plus any necessary grouping.
+  
+  ios_base::fmtflags __flags = __f.flags();
+  char* __ibeg = __write_integer_backward((char*)__buf+64, __flags, __val);
+  return __put_integer(__ibeg, (char*)__buf+64, __s, __f, __flags, __fill);
+}
+
+template <class _CharT, class _OutputIter>  
+_OutputIter 
+num_put<_CharT, _OutputIter>::do_put(_OutputIter __s, ios_base& __f, _CharT __fill,
+                                     unsigned _STLP_LONG_LONG __val) const {
+  char __buf[64];               // Large enough for a base 8 64-bit integer,
+                                // plus any necessary grouping.
+  
+  ios_base::fmtflags __flags = __f.flags();
+  char* __ibeg = __write_integer_backward((char*)__buf+64, __flags, __val);  
+  return __put_integer(__ibeg, (char*)__buf+64, __s, __f, __flags, __fill);
+}
+
+#endif /* _STLP_LONG_LONG */
+
+
+// lib.facet.num.put.virtuals "12 For conversion from void* the specifier is %p."
+template <class _CharT, class _OutputIter>
+_OutputIter
+num_put<_CharT, _OutputIter>::do_put(_OutputIter __s, ios_base& __f, _CharT /*__fill*/,
+				     const void* __val) const {
+  const ctype<_CharT>& __c_type = *(const ctype<_CharT>*)__f._M_ctype_facet();
+  ios_base::fmtflags __save_flags = __f.flags();
+
+  __f.setf(ios_base::hex, ios_base::basefield);
+  __f.setf(ios_base::showbase);
+  __f.setf(ios_base::internal, ios_base::adjustfield);
+  __f.width((sizeof(void*) * 2) + 2); // digits in pointer type plus '0x' prefix
+# if defined(_STLP_LONG_LONG) && !defined(__MRC__) //*ty 11/24/2001 - MrCpp can not cast from void* to long long
+  _OutputIter result = this->do_put(__s, __f, __c_type.widen('0'), __REINTERPRET_CAST(unsigned _STLP_LONG_LONG,__val));
+# else
+  _OutputIter result = this->do_put(__s, __f, __c_type.widen('0'), __REINTERPRET_CAST(unsigned long,__val));
+# endif
+  __f.flags(__save_flags);
+  return result;
+}
+
+_STLP_END_NAMESPACE
+
+# endif /* _STLP_EXPOSE_STREAM_IMPLEMENTATION */
+
+#endif /* _STLP_NUM_PUT_C */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_num_put.h b/main/source/stlport/stlport/stl/_num_put.h
new file mode 100644
index 00000000..9d6578ce
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_num_put.h
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+// WARNING: This is an internal header file, included by other C++
+// standard library headers.  You should not attempt to use this header
+// file directly.
+
+
+#ifndef _STLP_INTERNAL_NUM_PUT_H
+#define _STLP_INTERNAL_NUM_PUT_H
+
+#ifndef _STLP_INTERNAL_NUMPUNCT_H
+# include <stl/_numpunct.h>
+#endif
+#ifndef _STLP_INTERNAL_CTYPE_H
+# include <stl/_ctype.h>
+#endif
+#ifndef _STLP_INTERNAL_OSTREAMBUF_ITERATOR_H
+# include <stl/_ostreambuf_iterator.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+//----------------------------------------------------------------------
+// num_put facet
+
+# ifdef _STLP_LIMITED_DEFAULT_TEMPLATES
+template <class _CharT, class _OutputIter>  
+# else
+template <class _CharT, class _OutputIter = ostreambuf_iterator<_CharT, char_traits<_CharT> > >  
+# endif
+class num_put: public locale::facet
+{
+  friend class _Locale;
+public:
+  typedef _CharT      char_type;
+  typedef _OutputIter iter_type;
+
+  explicit num_put(size_t __refs = 0) : _BaseFacet(__refs) {}
+
+# ifndef _STLP_NO_BOOL
+  iter_type put(iter_type __s, ios_base& __f, char_type __fill,
+                bool __val) const {
+    return do_put(__s, __f, __fill, __val);
+  }
+# endif
+  iter_type put(iter_type __s, ios_base& __f, char_type __fill,
+               long __val) const {
+    return do_put(__s, __f, __fill, __val);
+  }
+
+  iter_type put(iter_type __s, ios_base& __f, char_type __fill,
+                unsigned long __val) const {
+    return do_put(__s, __f, __fill, __val);
+  }
+
+#ifdef _STLP_LONG_LONG
+  iter_type put(iter_type __s, ios_base& __f, char_type __fill,
+                _STLP_LONG_LONG __val) const {
+    return do_put(__s, __f, __fill, __val);
+  }
+
+  iter_type put(iter_type __s, ios_base& __f, char_type __fill,
+                unsigned _STLP_LONG_LONG __val) const {
+    return do_put(__s, __f, __fill, __val);
+  }
+#endif
+
+  iter_type put(iter_type __s, ios_base& __f, char_type __fill,
+                double __val) const {
+    return do_put(__s, __f, __fill, (double)__val);
+  }
+
+#ifndef _STLP_NO_LONG_DOUBLE
+  iter_type put(iter_type __s, ios_base& __f, char_type __fill,
+                long double __val) const {
+    return do_put(__s, __f, __fill, __val);
+  }
+# endif
+
+  iter_type put(iter_type __s, ios_base& __f, char_type __fill,
+                const void * __val) const {
+    return do_put(__s, __f, __fill, __val);
+  }
+
+  _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
+
+protected:
+  ~num_put() {}   
+# ifndef _STLP_NO_BOOL
+  virtual _OutputIter do_put(_OutputIter __s, ios_base& __f, _CharT __fill, bool __val) const;
+# endif
+  virtual _OutputIter do_put(_OutputIter __s, ios_base& __f, _CharT __fill, long __val) const;
+  virtual _OutputIter do_put(_OutputIter __s, ios_base& __f, _CharT __fill, unsigned long __val) const;
+  virtual _OutputIter do_put(_OutputIter __s, ios_base& __f, _CharT __fill, double __val) const;
+#ifndef _STLP_NO_LONG_DOUBLE
+  virtual _OutputIter do_put(_OutputIter __s, ios_base& __f, _CharT __fill, long double __val) const;
+#endif
+
+#ifdef _STLP_LONG_LONG
+  virtual _OutputIter do_put(_OutputIter __s, ios_base& __f, _CharT __fill, _STLP_LONG_LONG __val) const;
+  virtual _OutputIter do_put(_OutputIter __s, ios_base& __f, _CharT __fill, 
+                           unsigned _STLP_LONG_LONG __val) const ;
+#endif /* _STLP_LONG_LONG  */
+  virtual _OutputIter do_put(_OutputIter __s, ios_base& __f, _CharT __fill, const void* __val) const;
+};
+
+# ifdef _STLP_USE_TEMPLATE_EXPORT
+_STLP_EXPORT_TEMPLATE_CLASS num_put<char, ostreambuf_iterator<char, char_traits<char> > >;
+// _STLP_EXPORT_TEMPLATE_CLASS num_put<char, char*>;
+#  ifndef _STLP_NO_WCHAR_T
+_STLP_EXPORT_TEMPLATE_CLASS num_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >;
+// _STLP_EXPORT_TEMPLATE_CLASS num_put<wchar_t, wchar_t*>;
+#  endif /* _STLP_NO_WCHAR_T */
+# endif
+
+# if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION)
+
+template <class _Integer>
+char* _STLP_CALL
+__write_integer_backward(char* __buf, ios_base::fmtflags __flags, _Integer __x);
+
+void  _STLP_CALL __string_to_float(const string&, float&);
+void  _STLP_CALL __string_to_float(const string&, double&);
+extern void _STLP_CALL __write_float(string&, ios_base::fmtflags, int, double);
+# ifndef _STLP_NO_LONG_DOUBLE
+void  _STLP_CALL __string_to_float(const string&, long double&);
+extern void _STLP_CALL __write_float(string&, ios_base::fmtflags, int, long double);
+# endif
+
+#ifndef _STLP_NO_WCHAR_T
+extern wchar_t* _STLP_CALL __convert_float_buffer(const char*, const char*, wchar_t*, const ctype<wchar_t>&, wchar_t);
+#endif
+extern void _STLP_CALL __adjust_float_buffer(char*, char*, char);
+
+extern char* _STLP_CALL
+__write_integer(char* buf, ios_base::fmtflags flags, long x);
+
+extern ptrdiff_t _STLP_CALL __insert_grouping(char* first, char* last, const string&, char, char, char, int);
+#  ifndef _STLP_NO_WCHAR_T
+extern ptrdiff_t _STLP_CALL __insert_grouping(wchar_t*, wchar_t*, const string&, wchar_t, wchar_t, wchar_t, int);
+#  endif
+
+# endif
+
+# if defined (__BORLANDC__) && defined (_RTLDLL)
+inline void _Stl_loc_init_num_put() {
+  
+  num_put<char, ostreambuf_iterator<char, char_traits<char> > >::id._M_index = 14;
+  num_put<char, char*>::id._M_index = 15;
+  
+# ifndef _STLP_NO_WCHAR_T
+  num_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > > ::id._M_index = 33;
+  num_put<wchar_t, wchar_t*>::id._M_index = 34;
+# endif
+  
+}
+ 
+# endif
+
+_STLP_END_NAMESPACE
+
+#  if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION) && ! defined (_STLP_LINK_TIME_INSTANTIATION)
+#   include <stl/_num_put.c>
+#  endif
+
+#endif /* _STLP_INTERNAL_NUMERIC_FACETS_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_numeric.c b/main/source/stlport/stlport/stl/_numeric.c
new file mode 100644
index 00000000..2694432f
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_numeric.c
@@ -0,0 +1,104 @@
+/*
+ *
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+#ifndef _STLP_NUMERIC_C
+#define _STLP_NUMERIC_C
+
+#ifndef _STLP_INTERNAL_NUMERIC_H
+# include <stl/_numeric.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _InputIterator, class _OutputIterator, class _Tp,
+          class _BinaryOperation>
+_OutputIterator 
+__partial_sum(_InputIterator __first, _InputIterator __last, 
+              _OutputIterator __result, _Tp*, _BinaryOperation __binary_op)
+{
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  if (__first == __last) return __result;
+  *__result = *__first;
+
+  _Tp __val = *__first;
+  while (++__first != __last) {
+    __val = __binary_op(__val, *__first);
+    *++__result = __val;
+  }
+  return ++__result;
+}
+
+template <class _InputIterator, class _OutputIterator, class _Tp, 
+          class _BinaryOperation>
+_OutputIterator
+__adjacent_difference(_InputIterator __first, _InputIterator __last, 
+                      _OutputIterator __result, _Tp*,
+                      _BinaryOperation __binary_op) {
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  if (__first == __last) return __result;
+  *__result = *__first;
+  _Tp __val = *__first;
+  while (++__first != __last) {
+    _Tp __tmp = *__first;
+    *++__result = __binary_op(__tmp, __val);
+    __val = __tmp;
+  }
+  return ++__result;
+}
+
+
+template <class _Tp, class _Integer, class _MonoidOperation>
+_Tp __power(_Tp __x, _Integer __n, _MonoidOperation __opr) 
+{
+  _STLP_MPWFIX_TRY
+  if (__n == 0)
+    return __identity_element(__opr);
+  else {
+    while ((__n & 1) == 0) {
+      __n >>= 1;
+      __x = __opr(__x, __x);
+    }
+    _Tp __result = __x;
+	_STLP_MPWFIX_TRY
+    __n >>= 1;
+    while (__n != 0) {
+      __x = __opr(__x, __x);
+      if ((__n & 1) != 0)
+        __result = __opr(__result, __x);
+      __n >>= 1;
+    }
+    return __result;
+	_STLP_MPWFIX_CATCH
+  }
+  _STLP_MPWFIX_CATCH_ACTION(__x = _Tp())
+}
+
+_STLP_END_NAMESPACE
+
+#endif /*  _STLP_NUMERIC_C */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_numeric.h b/main/source/stlport/stlport/stl/_numeric.h
new file mode 100644
index 00000000..d80171aa
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_numeric.h
@@ -0,0 +1,186 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+
+#ifndef _STLP_INTERNAL_NUMERIC_H
+#define _STLP_INTERNAL_NUMERIC_H
+
+#ifndef _STLP_INTERNAL_FUNCTION_H
+# include <stl/_function_base.h>
+#endif
+
+#ifndef _STLP_INTERNAL_ITERATOR_BASE_H
+# include <stl/_iterator_base.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _InputIterator, class _Tp>
+_STLP_INLINE_LOOP
+_Tp accumulate(_InputIterator __first, _InputIterator __last, _Tp _Init)
+{
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  for ( ; __first != __last; ++__first)
+    _Init = _Init + *__first;
+  return _Init;
+}
+
+template <class _InputIterator, class _Tp, class _BinaryOperation>
+_STLP_INLINE_LOOP
+_Tp accumulate(_InputIterator __first, _InputIterator __last, _Tp _Init,
+               _BinaryOperation __binary_op)
+{
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  for ( ; __first != __last; ++__first)
+    _Init = __binary_op(_Init, *__first);
+  return _Init;
+}
+
+template <class _InputIterator1, class _InputIterator2, class _Tp>
+_STLP_INLINE_LOOP
+_Tp inner_product(_InputIterator1 __first1, _InputIterator1 __last1,
+                  _InputIterator2 __first2, _Tp _Init)
+{
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+  for ( ; __first1 != __last1; ++__first1, ++__first2)
+    _Init = _Init + (*__first1 * *__first2);
+  return _Init;
+}
+
+template <class _InputIterator1, class _InputIterator2, class _Tp,
+          class _BinaryOperation1, class _BinaryOperation2>
+_STLP_INLINE_LOOP
+_Tp inner_product(_InputIterator1 __first1, _InputIterator1 __last1,
+                  _InputIterator2 __first2, _Tp _Init, 
+                  _BinaryOperation1 __binary_op1,
+                  _BinaryOperation2 __binary_op2)
+{
+  _STLP_DEBUG_CHECK(__check_range(__first1, __last1))
+  for ( ; __first1 != __last1; ++__first1, ++__first2)
+    _Init = __binary_op1(_Init, __binary_op2(*__first1, *__first2));
+  return _Init;
+}
+
+template <class _InputIterator, class _OutputIterator, class _Tp,
+          class _BinaryOperation>
+_OutputIterator 
+__partial_sum(_InputIterator __first, _InputIterator __last, 
+              _OutputIterator __result, _Tp*, _BinaryOperation __binary_op);
+
+
+template <class _InputIterator, class _OutputIterator>
+inline _OutputIterator 
+partial_sum(_InputIterator __first, _InputIterator __last,
+            _OutputIterator __result) {
+  return __partial_sum(__first, __last, __result, _STLP_VALUE_TYPE(__first, _InputIterator),
+                       __plus(_STLP_VALUE_TYPE(__first, _InputIterator)));
+}
+
+template <class _InputIterator, class _OutputIterator, class _BinaryOperation>
+inline _OutputIterator 
+partial_sum(_InputIterator __first, _InputIterator __last,
+            _OutputIterator __result, _BinaryOperation __binary_op) {
+  return __partial_sum(__first, __last, __result, _STLP_VALUE_TYPE(__first, _InputIterator), 
+                       __binary_op);
+}
+
+
+template <class _InputIterator, class _OutputIterator, class _Tp, 
+          class _BinaryOperation>
+_OutputIterator
+__adjacent_difference(_InputIterator __first, _InputIterator __last, 
+                      _OutputIterator __result, _Tp*,
+                      _BinaryOperation __binary_op);
+
+template <class _InputIterator, class _OutputIterator>
+inline _OutputIterator
+adjacent_difference(_InputIterator __first,
+                    _InputIterator __last, _OutputIterator __result) {
+  return __adjacent_difference(__first, __last, __result,
+                               _STLP_VALUE_TYPE(__first, _InputIterator),
+                               __minus(_STLP_VALUE_TYPE(__first, _InputIterator)));
+}
+
+template <class _InputIterator, class _OutputIterator, class _BinaryOperation>
+_OutputIterator 
+adjacent_difference(_InputIterator __first, _InputIterator __last,
+                    _OutputIterator __result, _BinaryOperation __binary_op) {
+  return __adjacent_difference(__first, __last, __result,
+                               _STLP_VALUE_TYPE(__first, _InputIterator),
+                               __binary_op);
+}
+
+template <class _Tp, class _Integer, class _MonoidOperation>
+_Tp __power(_Tp __x, _Integer __n, _MonoidOperation __opr);
+
+# ifndef _STLP_NO_EXTENSIONS
+
+// Returns __x ** __n, where __n >= 0.  _Note that "multiplication"
+// is required to be associative, but not necessarily commutative.
+
+template <class _Tp, class _Integer>
+inline _Tp __power(_Tp __x, _Integer __n)
+{
+  return __power(__x, __n, multiplies<_Tp>());
+}
+
+// Alias for the internal name __power.  Note that power is an extension,
+// not part of the C++ standard.
+template <class _Tp, class _Integer, class _MonoidOperation>
+inline _Tp power(_Tp __x, _Integer __n, _MonoidOperation __opr) {
+  return __power(__x, __n, __opr);
+}
+
+
+template <class _Tp, class _Integer>
+inline _Tp power(_Tp __x, _Integer __n) {
+  return __power(__x, __n, multiplies<_Tp>());
+}
+
+// iota is not part of the C++ standard.  It is an extension.
+
+template <class _ForwardIterator, class _Tp>
+_STLP_INLINE_LOOP
+void 
+iota(_ForwardIterator __first, _ForwardIterator __last, _Tp __val)
+{
+  _STLP_DEBUG_CHECK(__check_range(__first, __last))
+  while (__first != __last)
+    *__first++ = __val++;
+}
+# endif
+
+_STLP_END_NAMESPACE
+
+# if !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_numeric.c>
+# endif
+
+#endif /* _STLP_INTERNAL_NUMERIC_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_numpunct.h b/main/source/stlport/stlport/stl/_numpunct.h
new file mode 100644
index 00000000..65cdf945
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_numpunct.h
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+// WARNING: This is an internal header file, included by other C++
+// standard library headers.  You should not attempt to use this header
+// file directly.
+
+
+#ifndef _STLP_INTERNAL_NUMPUNCT_H
+#define _STLP_INTERNAL_NUMPUNCT_H
+
+#ifndef _STLP_IOS_BASE_H
+# include <stl/_ios_base.h>
+#endif
+
+# ifndef _STLP_C_LOCALE_H
+#  include <stl/c_locale.h>
+# endif
+
+#ifndef _STLP_STRING_H
+# include <stl/_string.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+//----------------------------------------------------------------------
+// numpunct facets
+
+template <class _CharT> class numpunct {};
+template <class _CharT> class numpunct_byname {};
+template <class _Ch, class _InIt> class num_get;
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC numpunct<char> : public locale::facet
+{
+  friend class _Locale;
+# ifndef _STLP_NO_FRIEND_TEMPLATES
+  template <class _Ch, class _InIt> friend class num_get;
+# endif
+public:
+  typedef char               char_type;
+  typedef string             string_type;
+
+  explicit numpunct(size_t __refs = 0) : _BaseFacet(__refs) {}
+
+  char decimal_point() const { return do_decimal_point(); }
+  char thousands_sep() const { return do_thousands_sep(); }
+  string grouping() const { return do_grouping(); }
+  string truename() const { return do_truename(); }
+  string falsename() const { return do_falsename(); }
+
+  _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
+
+# ifndef _STLP_NO_FRIEND_TEMPLATES
+protected:
+# endif
+  ~numpunct();
+
+  _STLP_STATIC_MEMBER_DECLSPEC static string  _M_truename;
+  _STLP_STATIC_MEMBER_DECLSPEC static string  _M_falsename;
+  _STLP_STATIC_MEMBER_DECLSPEC static string  _M_grouping;
+
+  virtual char do_decimal_point() const;
+  virtual char do_thousands_sep() const;
+  virtual string do_grouping() const;
+  virtual string do_truename() const;
+  virtual string do_falsename()  const;
+};
+
+# if ! defined (_STLP_NO_WCHAR_T)
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC numpunct<wchar_t> : public locale::facet
+{
+  friend class _Locale;
+public:
+  typedef wchar_t               char_type;
+  typedef wstring               string_type;
+
+  explicit numpunct(size_t __refs = 0) : _BaseFacet(__refs) {}
+
+  wchar_t decimal_point() const { return do_decimal_point(); }
+  wchar_t thousands_sep() const { return do_thousands_sep(); }
+  string grouping() const { return do_grouping(); }
+  wstring truename() const { return do_truename(); }
+  wstring falsename() const { return do_falsename(); }
+
+  _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
+
+protected:
+  _STLP_STATIC_MEMBER_DECLSPEC static wstring _M_truename;
+  _STLP_STATIC_MEMBER_DECLSPEC static wstring _M_falsename;
+  _STLP_STATIC_MEMBER_DECLSPEC static string _M_grouping;
+
+  ~numpunct();
+
+  virtual wchar_t do_decimal_point() const;
+  virtual wchar_t do_thousands_sep() const;
+  virtual string do_grouping() const;
+  virtual wstring do_truename() const;
+  virtual wstring do_falsename()  const;
+};
+
+# endif /* WCHAR_T */
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC numpunct_byname<char> : public numpunct<char> {
+public:
+  typedef char                char_type;
+  typedef string              string_type;
+
+  explicit numpunct_byname(const char* __name, size_t __refs = 0);
+
+protected:
+
+  ~numpunct_byname();
+
+  virtual char   do_decimal_point() const;
+  virtual char   do_thousands_sep() const;
+  virtual string do_grouping()      const;
+
+private:
+  _Locale_numeric* _M_numeric;
+};
+
+# ifndef _STLP_NO_WCHAR_T
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC numpunct_byname<wchar_t>: public numpunct<wchar_t> {
+public:
+  typedef wchar_t               char_type;
+  typedef wstring               string_type;
+
+  explicit numpunct_byname(const char* __name, size_t __refs = 0);
+
+protected:
+
+  ~numpunct_byname();
+
+  virtual wchar_t   do_decimal_point() const;
+  virtual wchar_t   do_thousands_sep() const;
+  virtual string do_grouping() const;
+
+private:
+  _Locale_numeric* _M_numeric;
+};
+
+# endif /* WCHAR_T */
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_NUMPUNCT_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_ostream.c b/main/source/stlport/stlport/stl/_ostream.c
new file mode 100644
index 00000000..f635305b
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_ostream.c
@@ -0,0 +1,382 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+#ifndef _STLP_OSTREAM_C
+#define _STLP_OSTREAM_C
+
+
+#ifndef _STLP_INTERNAL_OSTREAM_H
+# include <stl/_ostream.h>
+#endif
+
+#if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION)
+
+#if !defined (_STLP_INTERNAL_NUM_PUT_H)
+# include <stl/_num_put.h>            // For basic_streambuf and iterators
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+// Helper functions for istream<>::sentry constructor.
+template <class _CharT, class _Traits>
+bool
+_M_init(basic_ostream<_CharT, _Traits>& __str) {
+  if (__str.good()) {
+    // boris : check if this is needed !
+    if (!__str.rdbuf())
+      __str.setstate(ios_base::badbit);
+    if (__str.tie())
+      __str.tie()->flush();
+    return __str.good();
+  } else
+    return false;
+}
+
+//----------------------------------------------------------------------
+// Definitions of non-inline member functions.
+
+// Constructor, destructor
+
+template <class _CharT, class _Traits>
+basic_ostream<_CharT, _Traits>
+  ::basic_ostream(basic_streambuf<_CharT, _Traits>* __buf)
+    : basic_ios<_CharT, _Traits>() 
+{
+  this->init(__buf);
+}
+
+template <class _CharT, class _Traits>
+basic_ostream<_CharT, _Traits>::~basic_ostream()
+{}
+
+// Output directly from a streambuf.
+template <class _CharT, class _Traits>
+basic_ostream<_CharT, _Traits>& 
+basic_ostream<_CharT, _Traits>::operator<<(basic_streambuf<_CharT, _Traits>* __from)
+{
+  sentry __sentry(*this);
+  if (__sentry) {
+    if (__from) {
+      bool __any_inserted = __from->gptr() != __from->egptr()
+        ? this->_M_copy_buffered(__from, this->rdbuf())
+        : this->_M_copy_unbuffered(__from, this->rdbuf());
+      if (!__any_inserted)
+        this->setstate(ios_base::failbit);
+    }
+    else
+      this->setstate(ios_base::badbit);
+  }
+
+  return *this;
+}
+
+// Helper functions for the streambuf version of operator<<.  The
+// exception-handling code is complicated because exceptions thrown
+// while extracting characters are treated differently than exceptions
+// thrown while inserting characters.
+
+template <class _CharT, class _Traits>
+bool basic_ostream<_CharT, _Traits>
+  ::_M_copy_buffered(basic_streambuf<_CharT, _Traits>* __from,
+                     basic_streambuf<_CharT, _Traits>* __to)
+{
+  bool __any_inserted = false;
+
+  while (__from->egptr() != __from->gptr()) {
+    const ptrdiff_t __avail = __from->egptr() - __from->gptr();
+
+    streamsize __nwritten;
+    _STLP_TRY {
+      __nwritten = __to->sputn(__from->gptr(), __avail);
+      __from->gbump((int)__nwritten);
+    }
+    _STLP_CATCH_ALL {
+      this->_M_handle_exception(ios_base::badbit);
+      return __any_inserted;
+    }
+
+    if (__nwritten == __avail) {
+      _STLP_TRY {
+        if (this->_S_eof(__from->sgetc()))
+          return true;
+        else
+          __any_inserted = true;
+      }
+      _STLP_CATCH_ALL {
+        this->_M_handle_exception(ios_base::failbit);
+        return false;
+      }
+    }
+
+    else if (__nwritten != 0)
+      return true;
+
+    else
+      return __any_inserted;
+  }
+
+  // No characters are in the buffer, but we aren't at EOF.  Switch to
+  // unbuffered mode.
+  return __any_inserted || this->_M_copy_unbuffered(__from, __to);
+}
+
+template <class _CharT, class _Traits>
+bool basic_ostream<_CharT, _Traits>
+  ::_M_copy_unbuffered(basic_streambuf<_CharT, _Traits>* __from,
+                       basic_streambuf<_CharT, _Traits>* __to)
+{
+  bool __any_inserted = false;
+
+  while (true) {
+    int_type __c;
+    _STLP_TRY {
+      __c = __from->sbumpc();
+    }
+    _STLP_CATCH_ALL {
+      this->_M_handle_exception(ios_base::failbit);
+      return __any_inserted;
+    }
+
+    if (this->_S_eof(__c))
+      return __any_inserted;
+
+    else {
+      int_type __tmp;
+      _STLP_TRY {
+        __tmp = __to->sputc(__c);
+      }
+      _STLP_CATCH_ALL {
+        this->_M_handle_exception(ios_base::badbit);
+        return __any_inserted;
+      }
+
+      if (this->_S_eof(__tmp)) {
+        _STLP_TRY {
+          /* __tmp = */ __from->sputbackc(__c);
+        }
+        _STLP_CATCH_ALL {
+          this->_M_handle_exception(ios_base::badbit);
+          return __any_inserted;
+        }
+      }
+      else
+        __any_inserted = true;
+    }
+  }
+}
+
+// Helper function for numeric output.
+
+template <class _CharT, class _Traits, class _Number>
+basic_ostream<_CharT, _Traits>&  _STLP_CALL
+_M_put_num(basic_ostream<_CharT, _Traits>& __os, _Number __x)
+{
+  typedef typename basic_ostream<_CharT, _Traits>::sentry _Sentry;
+  _Sentry __sentry(__os);
+  bool __failed = true;
+
+  if (__sentry) {
+    _STLP_TRY {
+      typedef num_put<_CharT, ostreambuf_iterator<_CharT, _Traits> > _NumPut;      
+      __failed = (use_facet<_NumPut>(__os.getloc())).put(
+                                                         ostreambuf_iterator<_CharT, _Traits>(__os.rdbuf()), 
+                                                         __os, __os.fill(),
+                                                         __x).failed();
+    }
+    _STLP_CATCH_ALL {
+      __os._M_handle_exception(ios_base::badbit);
+    }
+  }
+  if (__failed)
+    __os.setstate(ios_base::badbit); 
+  return __os;
+}
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT)  && defined (__BUILDING_STLPORT)
+_STLP_EXPORT_TEMPLATE _STLP_DECLSPEC basic_ostream<char, char_traits<char> >& _STLP_CALL
+_M_put_num(basic_ostream<char, char_traits<char> >&, unsigned long);
+_STLP_EXPORT_TEMPLATE _STLP_DECLSPEC basic_ostream<char, char_traits<char> >&  _STLP_CALL
+_M_put_num(basic_ostream<char, char_traits<char> >&, long);
+#  if defined (_STLP_LONG_LONG)
+_STLP_EXPORT_TEMPLATE _STLP_DECLSPEC basic_ostream<char, char_traits<char> >&  _STLP_CALL
+_M_put_num(basic_ostream<char, char_traits<char> >&, unsigned _STLP_LONG_LONG);
+_STLP_EXPORT_TEMPLATE _STLP_DECLSPEC basic_ostream<char, char_traits<char> >&  _STLP_CALL
+_M_put_num(basic_ostream<char, char_traits<char> >&, _STLP_LONG_LONG );
+#  endif
+# endif
+
+template <class _CharT, class _Traits>
+void basic_ostream<_CharT, _Traits>::_M_put_char(_CharT __c)
+{
+  sentry __sentry(*this);
+  if (__sentry) {
+    bool __failed = true;
+    _STLP_TRY {
+      streamsize __npad = this->width() > 0 ? this->width() - 1 : 0;
+      //      if (__npad <= 1)
+      if (__npad == 0)
+        __failed = this->_S_eof(this->rdbuf()->sputc(__c));
+      else if ((this->flags() & ios_base::adjustfield) == ios_base::left) {
+        __failed = this->_S_eof(this->rdbuf()->sputc(__c));
+        __failed = __failed || 
+                   this->rdbuf()->_M_sputnc(this->fill(), __npad) != __npad;
+      }
+      else {
+        __failed = this->rdbuf()->_M_sputnc(this->fill(), __npad) != __npad;
+        __failed = __failed || this->_S_eof(this->rdbuf()->sputc(__c));
+      }
+
+      this->width(0);
+    }
+    _STLP_CATCH_ALL {
+      this->_M_handle_exception(ios_base::badbit);
+    }
+
+    if (__failed)
+      this->setstate(ios_base::badbit);
+  }
+}
+
+template <class _CharT, class _Traits>
+void basic_ostream<_CharT, _Traits>::_M_put_nowiden(const _CharT* __s)
+{
+  sentry __sentry(*this);
+  if (__sentry) {
+    bool __failed = true;
+    streamsize __n = _Traits::length(__s);
+    streamsize __npad = this->width() > __n ? this->width() - __n : 0;
+
+    _STLP_TRY {
+      if (__npad == 0)
+        __failed = this->rdbuf()->sputn(__s, __n) != __n;
+      else if ((this->flags() & ios_base::adjustfield) == ios_base::left) {
+        __failed = this->rdbuf()->sputn(__s, __n) != __n;
+        __failed = __failed || 
+                   this->rdbuf()->_M_sputnc(this->fill(), __npad) != __npad;
+      }
+      else {
+        __failed = this->rdbuf()->_M_sputnc(this->fill(), __npad) != __npad;
+        __failed = __failed || this->rdbuf()->sputn(__s, __n) != __n;
+      }
+
+      this->width(0);
+    }
+    _STLP_CATCH_ALL {
+      this->_M_handle_exception(ios_base::badbit);
+    }
+
+    if (__failed)
+      this->setstate(ios_base::failbit);
+  }
+}
+
+template <class _CharT, class _Traits>
+void basic_ostream<_CharT, _Traits>::_M_put_widen(const char* __s)
+{
+  sentry __sentry(*this);
+  if (__sentry) {
+    bool __failed = true;
+    streamsize __n = char_traits<char>::length(__s);
+    streamsize __npad = this->width() > __n ? this->width() - __n : 0;
+
+    _STLP_TRY {
+      if (__npad == 0)
+        __failed = !this->_M_put_widen_aux(__s, __n);
+      else if ((this->flags() & ios_base::adjustfield) == ios_base::left) {
+        __failed = !this->_M_put_widen_aux(__s, __n);
+        __failed = __failed || 
+                   this->rdbuf()->_M_sputnc(this->fill(), __npad) != __npad;
+      }
+      else {
+        __failed = this->rdbuf()->_M_sputnc(this->fill(), __npad) != __npad;
+        __failed = __failed || !this->_M_put_widen_aux(__s, __n);
+      }
+
+      this->width(0);
+    }
+    _STLP_CATCH_ALL {
+      this->_M_handle_exception(ios_base::badbit);
+    }
+
+    if (__failed)
+      this->setstate(ios_base::failbit);
+  }
+}
+
+template <class _CharT, class _Traits>
+bool basic_ostream<_CharT, _Traits>::_M_put_widen_aux(const char* __s,
+                                                      streamsize __n)
+{
+  basic_streambuf<_CharT, _Traits>* __buf = this->rdbuf();
+
+  for ( ; __n > 0 ; --__n)
+    if (this->_S_eof(__buf->sputc(this->widen(*__s++))))
+      return false;
+  return true;
+}
+
+// Unformatted output of a single character.
+template <class _CharT, class _Traits>
+basic_ostream<_CharT, _Traits>&
+basic_ostream<_CharT, _Traits>::put(char_type __c)
+{
+  sentry __sentry(*this);
+  bool __failed = true;
+
+  if (__sentry) {
+    _STLP_TRY {
+      __failed = this->_S_eof(this->rdbuf()->sputc(__c));
+    }
+    _STLP_CATCH_ALL {
+      this->_M_handle_exception(ios_base::badbit);
+    }
+  }
+
+  if (__failed)
+    this->setstate(ios_base::badbit);
+
+  return *this;
+}
+
+// Unformatted output of a single character.
+template <class _CharT, class _Traits>
+basic_ostream<_CharT, _Traits>&
+basic_ostream<_CharT, _Traits>::write(const char_type* __s, streamsize __n)
+{
+  sentry __sentry(*this);
+  bool __failed = true;
+
+  if (__sentry) {
+    _STLP_TRY {
+      __failed = this->rdbuf()->sputn(__s, __n) != __n;
+    }
+    _STLP_CATCH_ALL {
+      this->_M_handle_exception(ios_base::badbit);
+    }
+  }
+
+  if (__failed)
+    this->setstate(ios_base::badbit);
+
+  return *this;
+}
+
+_STLP_END_NAMESPACE
+
+#endif /* defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION) */
+
+#endif /* _STLP_OSTREAM_C */
diff --git a/main/source/stlport/stlport/stl/_ostream.h b/main/source/stlport/stlport/stl/_ostream.h
new file mode 100644
index 00000000..de92b81b
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_ostream.h
@@ -0,0 +1,356 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+
+#ifndef _STLP_INTERNAL_OSTREAM_H
+#define _STLP_INTERNAL_OSTREAM_H
+
+#ifndef _STLP_INTERNAL_IOS_H
+# include <stl/_ios.h>                  // For basic_ios<>.  Includes <iosfwd>.
+#endif
+
+#ifndef _STLP_INTERNAL_OSTREAMBUF_ITERATOR_H
+# include <stl/_ostreambuf_iterator.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _CharT, class _Traits, class _Number> 
+basic_ostream<_CharT, _Traits>& _STLP_CALL
+_M_put_num(basic_ostream<_CharT, _Traits>& __os, _Number __x);
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+template <class _CharT, class _Traits>
+class _Osentry;
+# endif
+
+template <class _CharT, class _Traits>
+bool
+_M_init(basic_ostream<_CharT, _Traits>& __str);
+
+//----------------------------------------------------------------------
+// class basic_ostream<>
+
+template <class _CharT, class _Traits>
+class basic_ostream : virtual public basic_ios<_CharT, _Traits>
+{
+  typedef basic_ostream<_CharT, _Traits> _Self;
+  
+public:                         // Types
+  typedef _CharT                     char_type;
+  typedef typename _Traits::int_type int_type;
+  typedef typename _Traits::pos_type pos_type;
+  typedef typename _Traits::off_type off_type;
+  typedef _Traits                    traits_type;
+  typedef basic_ios<_CharT, _Traits> _Basic_ios;
+
+public:                         // Constructor and destructor.
+  explicit basic_ostream(basic_streambuf<_CharT, _Traits>* __buf);
+  ~basic_ostream();
+
+public:                         // Hooks for manipulators.
+  typedef basic_ios<_CharT, _Traits>& (_STLP_CALL *__ios_fn)(basic_ios<_CharT, _Traits>&);
+  typedef ios_base& (_STLP_CALL *__ios_base_fn)(ios_base&);
+  typedef _Self& (_STLP_CALL *__ostream_fn)(_Self&);
+  _Self& operator<< (__ostream_fn __f) { return __f(*this); }
+  _Self & operator<< (__ios_base_fn __f) { __f(*this); return *this; }
+  _Self& operator<< (__ios_fn __ff) { __ff(*this); return *this; }
+
+private:
+  bool _M_copy_buffered(basic_streambuf<_CharT, _Traits>* __from,
+                        basic_streambuf<_CharT, _Traits>* __to);
+  bool _M_copy_unbuffered(basic_streambuf<_CharT, _Traits>* __from,
+                          basic_streambuf<_CharT, _Traits>* __to);
+
+public:
+  void _M_put_char(_CharT __c);
+
+  void _M_put_nowiden(const _CharT* __s);
+  void _M_put_widen(const char* __s);
+  bool _M_put_widen_aux(const char* __s, streamsize __n);
+
+public:                         // Unformatted output.
+  _Self& put(char_type __c);
+  _Self& write(const char_type* __s, streamsize __n);
+
+public:                         // Formatted output.
+  // Formatted output from a streambuf.
+  _Self& operator<<(basic_streambuf<_CharT, _Traits>* __buf);
+# ifndef _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER
+  // this is needed for compiling with option char = unsigned
+  _Self& operator<<(unsigned char __x) { _M_put_char(__x); return *this; }
+# endif
+  _Self& operator<<(short __x) { return _M_put_num(*this,  __STATIC_CAST(long,__x)); }
+  _Self& operator<<(unsigned short __x) { return _M_put_num(*this,  __STATIC_CAST(unsigned long,__x)); }
+  _Self& operator<<(int __x) { return _M_put_num(*this,  __STATIC_CAST(long,__x)); }
+  _Self& operator<<(unsigned int __x) { return _M_put_num(*this,  __STATIC_CAST(unsigned long,__x)); }
+  _Self& operator<<(long __x) { return _M_put_num(*this,  __x); }
+  _Self& operator<<(unsigned long __x) { return _M_put_num(*this,  __x); }
+#ifdef _STLP_LONG_LONG
+  _Self& operator<< (_STLP_LONG_LONG __x)     { return _M_put_num(*this,  __x); }
+  _Self& operator<< (unsigned _STLP_LONG_LONG __x) { return _M_put_num(*this,  __x); }
+#endif 
+  _Self& operator<<(float __x)
+    { return _M_put_num(*this,  __STATIC_CAST(double,__x)); }
+  _Self& operator<<(double __x) { return _M_put_num(*this,  __x); }
+# ifndef _STLP_NO_LONG_DOUBLE
+  _Self& operator<<(long double __x) { return _M_put_num(*this,  __x); }
+# endif
+  _Self& operator<<(const void* __x) { return _M_put_num(*this,  __x); }
+# ifndef _STLP_NO_BOOL
+  _Self& operator<<(bool __x) { return _M_put_num(*this,  __x); }
+# endif
+
+public:                         // Buffer positioning and manipulation.
+  _Self& flush() {
+    if (this->rdbuf())
+      if (this->rdbuf()->pubsync() == -1)
+        this->setstate(ios_base::badbit);
+    return *this;
+  }
+
+  pos_type tellp() {
+    return this->rdbuf() && !this->fail()
+      ? this->rdbuf()->pubseekoff(0, ios_base::cur, ios_base::out)
+      : pos_type(-1);
+  }
+
+  _Self& seekp(pos_type __pos) {
+    if (this->rdbuf() && !this->fail())
+      this->rdbuf()->pubseekpos(__pos, ios_base::out);
+    return *this;
+  }
+
+  _Self& seekp(off_type __off, ios_base::seekdir __dir) {
+    if (this->rdbuf() && !this->fail())
+      this->rdbuf()->pubseekoff(__off, __dir, ios_base::out);
+    return *this;
+  }
+
+#if defined (_STLP_USE_TEMPLATE_EXPORT)
+  // If we are using DLL specs, we have not to use inner classes
+  // end class declaration here
+  typedef _Osentry<_CharT, _Traits>  sentry;
+};
+#  define sentry _Osentry
+  template <class _CharT, class _Traits>
+  class _Osentry {
+    typedef _Osentry<_CharT, _Traits> _Self;
+# else
+    class sentry {
+      typedef sentry _Self;
+# endif
+    private:
+      basic_ostream<_CharT, _Traits>& _M_str;
+      //      basic_streambuf<_CharT, _Traits>* _M_buf;
+      bool _M_ok;
+    public:
+      explicit sentry(basic_ostream<_CharT, _Traits>& __str)
+        : _M_str(__str), /* _M_buf(__str.rdbuf()), */ _M_ok(_M_init(__str))
+      {
+      }
+      
+      ~sentry() {
+        if (_M_str.flags() & ios_base::unitbuf)
+# ifndef _STLP_INCOMPLETE_EXCEPTION_HEADER 
+          if (!_STLP_VENDOR_EXCEPT_STD::uncaught_exception())
+# endif
+            _M_str.flush();
+      }
+
+      operator bool() const { return _M_ok; }
+    private:                        // Disable assignment and copy constructor.
+      sentry(const _Self& __s) : _M_str (__s._M_str) {};
+      void operator=(const _Self&) {};
+    };
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+#  undef sentry
+# else
+  // close basic_ostream class definition here    
+};
+# endif
+  
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+_STLP_EXPORT_TEMPLATE_CLASS basic_ostream<char, char_traits<char> >;
+_STLP_EXPORT_TEMPLATE_CLASS _Osentry<char, char_traits<char> >;
+#  if !defined (_STLP_NO_WCHAR_T)
+_STLP_EXPORT_TEMPLATE_CLASS basic_ostream<wchar_t, char_traits<wchar_t> >;
+_STLP_EXPORT_TEMPLATE_CLASS _Osentry<wchar_t, char_traits<wchar_t> >;
+#  endif
+# endif /* _STLP_USE_TEMPLATE_EXPORT */
+
+template <class _CharT, class _Traits>
+inline basic_streambuf<_CharT, _Traits>* _STLP_CALL 
+_M_get_ostreambuf(basic_ostream<_CharT, _Traits>& __St) 
+{
+  return __St.rdbuf();
+}
+
+// Non-member functions.
+
+template <class _CharT, class _Traits>
+inline basic_ostream<_CharT, _Traits>& _STLP_CALL
+operator<<(basic_ostream<_CharT, _Traits>& __os, _CharT __c) {
+  __os._M_put_char(__c);
+  return __os;
+}
+
+template <class _CharT, class _Traits>
+inline basic_ostream<_CharT, _Traits>& _STLP_CALL
+operator<<(basic_ostream<_CharT, _Traits>& __os, const _CharT* __s) {
+  __os._M_put_nowiden(__s);
+  return __os;
+}
+
+# ifdef _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER
+// some specializations
+
+inline basic_ostream<char, char_traits<char> >& _STLP_CALL
+operator<<(basic_ostream<char, char_traits<char> >& __os, char __c) {
+  __os._M_put_char(__c);
+  return __os;
+}
+
+inline basic_ostream<char, char_traits<char> >& _STLP_CALL
+operator<<(basic_ostream<char, char_traits<char> >& __os, signed char __c) {
+  __os._M_put_char(__c);
+  return __os;
+}
+
+inline basic_ostream<char, char_traits<char> >& _STLP_CALL
+operator<<(basic_ostream<char, char_traits<char> >& __os, unsigned char __c) {
+  __os._M_put_char(__c);
+  return __os;
+}
+
+inline basic_ostream<char, char_traits<char> >& _STLP_CALL
+operator<<(basic_ostream<char, char_traits<char> >& __os, const char* __s) {
+  __os._M_put_nowiden(__s);
+  return __os;
+}
+
+inline basic_ostream<char, char_traits<char> >& _STLP_CALL
+operator<<(basic_ostream<char, char_traits<char> >& __os, const signed char* __s) {
+  __os._M_put_nowiden(__REINTERPRET_CAST(const char*,__s));
+  return __os;
+}
+
+inline basic_ostream<char, char_traits<char> >&
+operator<<(basic_ostream<char, char_traits<char> >& __os, const unsigned char* __s) {
+  __os._M_put_nowiden(__REINTERPRET_CAST(const char*,__s));
+  return __os;
+}
+
+# else
+
+// also for compilers who might use that
+template <class _CharT, class _Traits>
+inline basic_ostream<_CharT, _Traits>& _STLP_CALL
+operator<<(basic_ostream<_CharT, _Traits>& __os, char __c) {
+  __os._M_put_char(__os.widen(__c));
+  return __os;
+}
+
+template <class _Traits>
+inline basic_ostream<char, _Traits>& _STLP_CALL
+operator<<(basic_ostream<char, _Traits>& __os, char __c) {
+  __os._M_put_char(__c);
+  return __os;
+}
+
+template <class _Traits>
+inline basic_ostream<char, _Traits>& _STLP_CALL
+operator<<(basic_ostream<char, _Traits>& __os, signed char __c) {
+  __os._M_put_char(__c);
+  return __os;
+}
+
+template <class _Traits>
+inline basic_ostream<char, _Traits>& _STLP_CALL
+operator<<(basic_ostream<char, _Traits>& __os, unsigned char __c) {
+  __os._M_put_char(__c);
+  return __os;
+}
+
+template <class _CharT, class _Traits>
+inline basic_ostream<_CharT, _Traits>& _STLP_CALL
+operator<<(basic_ostream<_CharT, _Traits>& __os, const char* __s) {
+  __os._M_put_widen(__s);
+  return __os;
+}
+
+template <class _Traits>
+inline basic_ostream<char, _Traits>& _STLP_CALL
+operator<<(basic_ostream<char, _Traits>& __os, const char* __s) {
+  __os._M_put_nowiden(__s);
+  return __os;
+}
+
+template <class _Traits>
+inline basic_ostream<char, _Traits>& _STLP_CALL
+operator<<(basic_ostream<char, _Traits>& __os, const signed char* __s) {
+  __os._M_put_nowiden(__REINTERPRET_CAST(const char*,__s));
+  return __os;
+}
+
+template <class _Traits>
+inline basic_ostream<char, _Traits>&
+operator<<(basic_ostream<char, _Traits>& __os, const unsigned char* __s) {
+  __os._M_put_nowiden(__REINTERPRET_CAST(const char*,__s));
+  return __os;
+}
+# endif /* _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER */
+
+//----------------------------------------------------------------------
+// basic_ostream manipulators.
+
+template <class _CharT, class _Traits>
+inline basic_ostream<_CharT, _Traits>& _STLP_CALL
+endl(basic_ostream<_CharT, _Traits>& __os) {
+  __os.put(__os.widen('\n'));
+  __os.flush();
+  return __os;
+}
+
+template <class _CharT, class _Traits>
+inline basic_ostream<_CharT, _Traits>& _STLP_CALL
+ends(basic_ostream<_CharT, _Traits>& __os) {
+  __os.put(_STLP_DEFAULT_CONSTRUCTED(_CharT));
+  return __os;
+}
+
+template <class _CharT, class _Traits>
+inline basic_ostream<_CharT, _Traits>& _STLP_CALL
+flush(basic_ostream<_CharT, _Traits>& __os) {
+  __os.flush();
+  return __os;
+}
+
+_STLP_END_NAMESPACE
+
+#  undef _STLP_MANIP_INLINE
+
+#if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION) && !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_ostream.c>
+# endif
+
+#endif /* _STLP_INTERNAL_OSTREAM_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_ostreambuf_iterator.h b/main/source/stlport/stlport/stl/_ostreambuf_iterator.h
new file mode 100644
index 00000000..c23590ad
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_ostreambuf_iterator.h
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+// WARNING: This is an internal header file, included by other C++
+// standard library headers.  You should not attempt to use this header
+// file directly.
+
+
+#ifndef _STLP_INTERNAL_OSTREAMBUF_ITERATOR_H
+#define _STLP_INTERNAL_OSTREAMBUF_ITERATOR_H
+
+#ifndef _STLP_INTERNAL_STREAMBUF
+# include <stl/_streambuf.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _CharT, class _Traits>
+extern basic_streambuf<_CharT, _Traits>* _STLP_CALL _M_get_ostreambuf(basic_ostream<_CharT, _Traits>& ) ;
+
+// The default template argument is declared in iosfwd
+template<class _CharT, class _Traits>
+class ostreambuf_iterator
+{
+public:
+  typedef _CharT                           char_type;
+  typedef _Traits                          traits_type;
+  typedef typename _Traits::int_type       int_type;
+  typedef basic_streambuf<_CharT, _Traits> streambuf_type;
+  typedef basic_ostream<_CharT, _Traits>   ostream_type;
+
+  typedef output_iterator_tag              iterator_category;
+  typedef void                             value_type;
+  typedef void                             difference_type;
+  typedef void                             pointer;
+  typedef void                             reference;
+
+public:
+  ostreambuf_iterator(streambuf_type* __buf) _STLP_NOTHROW : _M_buf(__buf), _M_ok(__buf!=0) {}
+  //  ostreambuf_iterator(ostream_type& __o) _STLP_NOTHROW : _M_buf(_M_get_ostreambuf(__o)), _M_ok(_M_buf != 0) {}
+  inline ostreambuf_iterator(ostream_type& __o) _STLP_NOTHROW;
+
+  ostreambuf_iterator<_CharT, _Traits>& operator=(char_type __c) {
+    _M_ok = _M_ok && !traits_type::eq_int_type(_M_buf->sputc(__c),
+                                               traits_type::eof());
+    return *this;
+  }    
+  
+  ostreambuf_iterator<_CharT, _Traits>& operator*()     { return *this; }
+  ostreambuf_iterator<_CharT, _Traits>& operator++()    { return *this; }
+  ostreambuf_iterator<_CharT, _Traits>& operator++(int) { return *this; }
+
+  bool failed() const { return !_M_ok; }
+
+private:
+  streambuf_type* _M_buf;
+  bool _M_ok;
+};
+
+template <class _CharT, class _Traits>
+inline ostreambuf_iterator<_CharT, _Traits>::ostreambuf_iterator(basic_ostream<_CharT, _Traits>& __o) _STLP_NOTHROW : _M_buf(_M_get_ostreambuf(__o)), _M_ok(_M_buf != 0) {}
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+_STLP_EXPORT_TEMPLATE_CLASS ostreambuf_iterator<char, char_traits<char> >;
+#  if defined (INSTANTIATE_WIDE_STREAMS)
+_STLP_EXPORT_TEMPLATE_CLASS ostreambuf_iterator<wchar_t, char_traits<wchar_t> >;
+#  endif
+# endif /* _STLP_USE_TEMPLATE_EXPORT */
+
+# ifdef _STLP_USE_OLD_HP_ITERATOR_QUERIES
+template <class _CharT, class _Traits>
+inline output_iterator_tag _STLP_CALL 
+iterator_category(const ostreambuf_iterator<_CharT, _Traits>&) { return output_iterator_tag(); }
+# endif
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_INTERNAL_OSTREAMBUF_ITERATOR_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_pair.h b/main/source/stlport/stlport/stl/_pair.h
new file mode 100644
index 00000000..aba41245
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_pair.h
@@ -0,0 +1,161 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_PAIR_H
+#define _STLP_INTERNAL_PAIR_H
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _T1, class _T2>
+struct pair {
+  typedef _T1 first_type;
+  typedef _T2 second_type;
+
+  _T1 first;
+  _T2 second;
+# if defined (_STLP_CONST_CONSTRUCTOR_BUG)
+  pair() {}
+# else
+  pair() : first(_T1()), second(_T2()) {}
+# endif
+  pair(const _T1& __a, const _T2& __b) : first(__a), second(__b) {}
+
+#if defined (_STLP_MEMBER_TEMPLATES) && !(defined (_STLP_MSVC) && (_STLP_MSVC < 1200))
+  template <class _U1, class _U2>
+  pair(const pair<_U1, _U2>& __p) : first(__p.first), second(__p.second) {}
+
+  pair(const pair<_T1,_T2>& __o) : first(__o.first), second(__o.second) {}
+#endif
+  __TRIVIAL_DESTRUCTOR(pair)
+};
+
+template <class _T1, class _T2>
+inline bool _STLP_CALL operator==(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
+{ 
+  return __x.first == __y.first && __x.second == __y.second; 
+}
+
+template <class _T1, class _T2>
+inline bool _STLP_CALL operator<(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
+{ 
+  return __x.first < __y.first || 
+         (!(__y.first < __x.first) && __x.second < __y.second); 
+}
+
+#ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+
+template <class _T1, class _T2>
+inline bool _STLP_CALL operator!=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) {
+  return !(__x == __y);
+}
+
+template <class _T1, class _T2>
+inline bool _STLP_CALL operator>(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) {
+  return __y < __x;
+}
+
+template <class _T1, class _T2>
+inline bool _STLP_CALL operator<=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) {
+  return !(__y < __x);
+}
+
+template <class _T1, class _T2>
+inline bool _STLP_CALL operator>=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) {
+  return !(__x < __y);
+}
+
+#endif /* _STLP_USE_SEPARATE_RELOPS_NAMESPACE */
+
+
+#if defined(_STLP_FUNCTION_TMPL_PARTIAL_ORDER) && ! defined (_STLP_NO_EXTENSIONS) && ! defined (__BORLANDC__) && ! defined (__DMC__)
+template <class _T1, class _T2, int _Sz>
+inline pair<_T1, _T2 const*> make_pair(_T1 const& __x,
+                                       _T2 const (&__y)[_Sz])
+{
+  return pair<_T1, _T2 const*>(__x, static_cast<_T2 const*>(__y));
+}
+
+template <class _T1, class _T2, int _Sz>
+inline pair<_T1 const*, _T2> make_pair(_T1 const (&__x)[_Sz],
+                                       _T2 const& __y)
+{
+  return pair<_T1 const*, _T2>(static_cast<_T1 const*>(__x), __y);
+}
+
+template <class _T1, class _T2, int _Sz1, int _Sz2>
+inline pair<_T1 const*, _T2 const*> make_pair(_T1 const (&__x)[_Sz1],
+                                              _T2 const (&__y)[_Sz2])
+{
+  return pair<_T1 const*, _T2 const*>(static_cast<_T1 const*>(__x),
+                                      static_cast<_T2 const*>(__y));
+}
+#endif
+
+template <class _T1, class _T2>
+inline pair<_T1, _T2> _STLP_CALL make_pair(const _T1& __x, const _T2& __y)
+{
+  return pair<_T1, _T2>(__x, __y);
+}
+
+
+_STLP_END_NAMESPACE
+
+# if defined (_STLP_USE_NAMESPACES) || ! defined (_STLP_USE_SEPARATE_RELOPS_NAMESPACE) 
+_STLP_BEGIN_RELOPS_NAMESPACE
+
+template <class _Tp>
+inline bool _STLP_CALL operator!=(const _Tp& __x, const _Tp& __y) {
+  return !(__x == __y);
+}
+
+template <class _Tp>
+inline bool _STLP_CALL operator>(const _Tp& __x, const _Tp& __y) {
+  return __y < __x;
+}
+
+template <class _Tp>
+inline bool _STLP_CALL operator<=(const _Tp& __x, const _Tp& __y) {
+  return !(__y < __x);
+}
+
+template <class _Tp>
+inline bool _STLP_CALL  operator>=(const _Tp& __x, const _Tp& __y) {
+  return !(__x < __y);
+}
+
+_STLP_END_RELOPS_NAMESPACE
+
+# endif
+
+#endif /* _STLP_INTERNAL_PAIR_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_prolog.h b/main/source/stlport/stlport/stl/_prolog.h
new file mode 100644
index 00000000..2e8dd24e
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_prolog.h
@@ -0,0 +1,17 @@
+/* NOTE : this header has no guards and is MEANT for multiple inclusion !
+ * If you are using "header protection" option with your compiler,
+ * please also find #pragma which disables it and put it here, to
+ * allow reentrancy of this header.
+ */
+/* We undef "std" on entry , as STLport headers may include native ones. */
+# undef std
+
+# ifndef _STLP_CONFIG_H
+#  include <stl/_config.h>
+# endif
+
+/* If the platform provides any specific prolog actions,
+ * like #pragmas, do include platform-specific prolog file */
+# if defined (_STLP_HAS_SPECIFIC_PROLOG_EPILOG)
+#  include <config/_prolog.h>
+# endif
diff --git a/main/source/stlport/stlport/stl/_pthread_alloc.c b/main/source/stlport/stlport/stl/_pthread_alloc.c
new file mode 100644
index 00000000..9774ebfa
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_pthread_alloc.c
@@ -0,0 +1,262 @@
+/*
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+#ifndef _STLP_PTHREAD_ALLOC_C
+#define _STLP_PTHREAD_ALLOC_C
+
+#ifdef __WATCOMC__
+#pragma warning 13 9
+#pragma warning 367 9
+#pragma warning 368 9
+#endif
+
+#ifndef _STLP_PTHREAD_ALLOC_H
+# include <stl/_pthread_alloc.h>
+#endif
+
+# if defined (_STLP_EXPOSE_GLOBALS_IMPLEMENTATION)
+
+# include <cerrno>
+
+_STLP_BEGIN_NAMESPACE
+
+template <size_t _Max_size>
+void _Pthread_alloc<_Max_size>::_S_destructor(void * __instance)
+{
+    _M_lock __lock_instance;	// Need to acquire lock here.
+    _Pthread_alloc_per_thread_state<_Max_size>* __s =
+        (_Pthread_alloc_per_thread_state<_Max_size> *)__instance;
+    __s -> __next = _S_free_per_thread_states;
+    _S_free_per_thread_states = __s;
+}
+
+template <size_t _Max_size>
+_Pthread_alloc_per_thread_state<_Max_size> *
+_Pthread_alloc<_Max_size>::_S_new_per_thread_state()
+{    
+    /* lock already held here.	*/
+    if (0 != _S_free_per_thread_states) {
+        _Pthread_alloc_per_thread_state<_Max_size> *__result =
+					_S_free_per_thread_states;
+        _S_free_per_thread_states = _S_free_per_thread_states -> __next;
+        return __result;
+    } else {
+        return _STLP_NEW _Pthread_alloc_per_thread_state<_Max_size>;
+    }
+}
+
+template <size_t _Max_size>
+_Pthread_alloc_per_thread_state<_Max_size> *
+_Pthread_alloc<_Max_size>::_S_get_per_thread_state()
+{
+
+    int __ret_code;
+    __state_type* __result;
+    
+    if (_S_key_initialized && (__result = (__state_type*) pthread_getspecific(_S_key)))
+      return __result;
+    
+    /*REFERENCED*/
+    _M_lock __lock_instance;	// Need to acquire lock here.
+    if (!_S_key_initialized) {
+      if (pthread_key_create(&_S_key, _S_destructor)) {
+	__THROW_BAD_ALLOC;  // failed
+      }
+      _S_key_initialized = true;
+    }
+
+    __result = _S_new_per_thread_state();
+    __ret_code = pthread_setspecific(_S_key, __result);
+    if (__ret_code) {
+      if (__ret_code == ENOMEM) {
+	__THROW_BAD_ALLOC;
+      } else {
+	// EINVAL
+	_STLP_ABORT();
+      }
+    }
+    return __result;
+}
+
+/* We allocate memory in large chunks in order to avoid fragmenting     */
+/* the malloc heap too much.                                            */
+/* We assume that size is properly aligned.                             */
+template <size_t _Max_size>
+char *_Pthread_alloc<_Max_size>
+::_S_chunk_alloc(size_t __p_size, size_t &__nobjs)
+{
+  {
+    char * __result;
+    size_t __total_bytes;
+    size_t __bytes_left;
+    /*REFERENCED*/
+    _M_lock __lock_instance;         // Acquire lock for this routine
+
+    __total_bytes = __p_size * __nobjs;
+    __bytes_left = _S_end_free - _S_start_free;
+    if (__bytes_left >= __total_bytes) {
+        __result = _S_start_free;
+        _S_start_free += __total_bytes;
+        return(__result);
+    } else if (__bytes_left >= __p_size) {
+        __nobjs = __bytes_left/__p_size;
+        __total_bytes = __p_size * __nobjs;
+        __result = _S_start_free;
+        _S_start_free += __total_bytes;
+        return(__result);
+    } else {
+        size_t __bytes_to_get =
+		2 * __total_bytes + _S_round_up(_S_heap_size >> 4);
+        // Try to make use of the left-over piece.
+        if (__bytes_left > 0) {
+            _Pthread_alloc_per_thread_state<_Max_size>* __a = 
+                (_Pthread_alloc_per_thread_state<_Max_size>*)
+			pthread_getspecific(_S_key);
+            __obj * volatile * __my_free_list =
+                        __a->__free_list + _S_freelist_index(__bytes_left);
+
+            ((__obj *)_S_start_free) -> __free_list_link = *__my_free_list;
+            *__my_free_list = (__obj *)_S_start_free;
+        }
+#       ifdef _SGI_SOURCE
+          // Try to get memory that's aligned on something like a
+          // cache line boundary, so as to avoid parceling out
+          // parts of the same line to different threads and thus
+          // possibly different processors.
+          {
+            const int __cache_line_size = 128;  // probable upper bound
+            __bytes_to_get &= ~(__cache_line_size-1);
+            _S_start_free = (char *)memalign(__cache_line_size, __bytes_to_get); 
+            if (0 == _S_start_free) {
+              _S_start_free = (char *)__malloc_alloc<0>::allocate(__bytes_to_get);
+            }
+          }
+#       else  /* !SGI_SOURCE */
+          _S_start_free = (char *)__malloc_alloc<0>::allocate(__bytes_to_get);
+#       endif
+        _S_heap_size += __bytes_to_get;
+        _S_end_free = _S_start_free + __bytes_to_get;
+    }
+  }
+  // lock is released here
+  return(_S_chunk_alloc(__p_size, __nobjs));
+}
+
+
+/* Returns an object of size n, and optionally adds to size n free list.*/
+/* We assume that n is properly aligned.                                */
+/* We hold the allocation lock.                                         */
+template <size_t _Max_size>
+void *_Pthread_alloc_per_thread_state<_Max_size>
+::_M_refill(size_t __n)
+{
+    size_t __nobjs = 128;
+    char * __chunk =
+	_Pthread_alloc<_Max_size>::_S_chunk_alloc(__n, __nobjs);
+    __obj * volatile * __my_free_list;
+    __obj * __result;
+    __obj * __current_obj, * __next_obj;
+    int __i;
+
+    if (1 == __nobjs)  {
+        return(__chunk);
+    }
+    __my_free_list = __free_list
+		 + _Pthread_alloc<_Max_size>::_S_freelist_index(__n);
+
+    /* Build free list in chunk */
+      __result = (__obj *)__chunk;
+      *__my_free_list = __next_obj = (__obj *)(__chunk + __n);
+      for (__i = 1; ; __i++) {
+        __current_obj = __next_obj;
+        __next_obj = (__obj *)((char *)__next_obj + __n);
+        if (__nobjs - 1 == __i) {
+            __current_obj -> __free_list_link = 0;
+            break;
+        } else {
+            __current_obj -> __free_list_link = __next_obj;
+        }
+      }
+    return(__result);
+}
+
+template <size_t _Max_size>
+void *_Pthread_alloc<_Max_size>
+::reallocate(void *__p, size_t __old_sz, size_t __new_sz)
+{
+    void * __result;
+    size_t __copy_sz;
+
+    if (__old_sz > _Max_size
+	&& __new_sz > _Max_size) {
+        return(realloc(__p, __new_sz));
+    }
+    if (_S_round_up(__old_sz) == _S_round_up(__new_sz)) return(__p);
+    __result = allocate(__new_sz);
+    __copy_sz = __new_sz > __old_sz? __old_sz : __new_sz;
+    memcpy(__result, __p, __copy_sz);
+    deallocate(__p, __old_sz);
+    return(__result);
+}
+
+#if defined (_STLP_STATIC_TEMPLATE_DATA) && (_STLP_STATIC_TEMPLATE_DATA > 0)
+
+template <size_t _Max_size>
+_Pthread_alloc_per_thread_state<_Max_size> * _Pthread_alloc<_Max_size>::_S_free_per_thread_states = 0;
+
+template <size_t _Max_size>
+pthread_key_t _Pthread_alloc<_Max_size>::_S_key =0;
+
+template <size_t _Max_size>
+bool _Pthread_alloc<_Max_size>::_S_key_initialized = false;
+
+template <size_t _Max_size>
+_STLP_mutex_base _Pthread_alloc<_Max_size>::_S_chunk_allocator_lock _STLP_MUTEX_INITIALIZER;
+
+template <size_t _Max_size>
+char *_Pthread_alloc<_Max_size>::_S_start_free = 0;
+
+template <size_t _Max_size>
+char *_Pthread_alloc<_Max_size>::_S_end_free = 0;
+
+template <size_t _Max_size>
+size_t _Pthread_alloc<_Max_size>::_S_heap_size = 0;
+
+ # else
+ 
+ __DECLARE_INSTANCE(template <size_t _Max_size> _Pthread_alloc_per_thread_state<_Max_size> *, _Pthread_alloc<_Max_size>::_S_free_per_thread_states, = 0);
+ __DECLARE_INSTANCE(template <size_t _Max_size> pthread_key_t, _Pthread_alloc<_Max_size>::_S_key, = 0);
+ __DECLARE_INSTANCE(template <size_t _Max_size> bool, _Pthread_alloc<_Max_size>::_S_key_initialized, = false);
+ __DECLARE_INSTANCE(template <size_t _Max_size> char *, _Pthread_alloc<_Max_size>::_S_start_free, = 0);
+ __DECLARE_INSTANCE(template <size_t _Max_size> char *, _Pthread_alloc<_Max_size>::_S_end_free, = 0);
+ __DECLARE_INSTANCE(template <size_t _Max_size> size_t, _Pthread_alloc<_Max_size>::_S_heap_size, = 0);
+
+# endif
+
+_STLP_END_NAMESPACE
+
+# endif /* _STLP_EXPOSE_GLOBALS_IMPLEMENTATION */
+
+#endif /*  _STLP_PTHREAD_ALLOC_C */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_pthread_alloc.h b/main/source/stlport/stlport/stl/_pthread_alloc.h
new file mode 100644
index 00000000..a92cbb1d
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_pthread_alloc.h
@@ -0,0 +1,489 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_PTHREAD_ALLOC_H
+#define _STLP_PTHREAD_ALLOC_H
+
+// Pthread-specific node allocator.
+// This is similar to the default allocator, except that free-list
+// information is kept separately for each thread, avoiding locking.
+// This should be reasonably fast even in the presence of threads.
+// The down side is that storage may not be well-utilized.
+// It is not an error to allocate memory in thread A and deallocate
+// it in thread B.  But this effectively transfers ownership of the memory,
+// so that it can only be reallocated by thread B.  Thus this can effectively
+// result in a storage leak if it's done on a regular basis.
+// It can also result in frequent sharing of
+// cache lines among processors, with potentially serious performance
+// consequences.
+
+#include <pthread.h>
+
+#ifndef _STLP_INTERNAL_ALLOC_H
+#include <stl/_alloc.h>
+#endif
+
+#ifndef __RESTRICT
+#  define __RESTRICT
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+#define _STLP_DATA_ALIGNMENT 8
+
+union _Pthread_alloc_obj {
+    union _Pthread_alloc_obj * __free_list_link;
+    char __client_data[_STLP_DATA_ALIGNMENT];    /* The client sees this.    */
+};
+
+// Pthread allocators don't appear to the client to have meaningful
+// instances.  We do in fact need to associate some state with each
+// thread.  That state is represented by
+// _Pthread_alloc_per_thread_state<_Max_size>.
+
+template<size_t _Max_size>
+struct _Pthread_alloc_per_thread_state {
+  typedef _Pthread_alloc_obj __obj;
+  enum { _S_NFREELISTS = _Max_size/_STLP_DATA_ALIGNMENT };
+
+  // Free list link for list of available per thread structures.
+  // When one of these becomes available for reuse due to thread
+  // termination, any objects in its free list remain associated
+  // with it.  The whole structure may then be used by a newly
+  // created thread.
+  _Pthread_alloc_per_thread_state() : __next(0)
+  {
+    memset((void *)__free_list, 0, (size_t)_S_NFREELISTS * sizeof(__obj *));
+  }
+  // Returns an object of size __n, and possibly adds to size n free list.
+  void *_M_refill(size_t __n);
+  
+  _Pthread_alloc_obj* volatile __free_list[_S_NFREELISTS]; 
+  _Pthread_alloc_per_thread_state<_Max_size> * __next; 
+  // this data member is only to be used by per_thread_allocator, which returns memory to the originating thread.
+  _STLP_mutex _M_lock;
+
+ };
+
+// Pthread-specific allocator.
+// The argument specifies the largest object size allocated from per-thread
+// free lists.  Larger objects are allocated using malloc_alloc.
+// Max_size must be a power of 2.
+template < __DFL_NON_TYPE_PARAM(size_t, _Max_size, _MAX_BYTES) >
+class _Pthread_alloc {
+
+public: // but only for internal use:
+
+  typedef _Pthread_alloc_obj __obj;
+  typedef _Pthread_alloc_per_thread_state<_Max_size> __state_type;
+  typedef char value_type;
+
+  // Allocates a chunk for nobjs of size size.  nobjs may be reduced
+  // if it is inconvenient to allocate the requested number.
+  static char *_S_chunk_alloc(size_t __size, size_t &__nobjs);
+
+  enum {_S_ALIGN = _STLP_DATA_ALIGNMENT};
+
+  static size_t _S_round_up(size_t __bytes) {
+        return (((__bytes) + (int)_S_ALIGN-1) & ~((int)_S_ALIGN - 1));
+  }
+  static size_t _S_freelist_index(size_t __bytes) {
+        return (((__bytes) + (int)_S_ALIGN-1)/(int)_S_ALIGN - 1);
+  }
+
+private:
+  // Chunk allocation state. And other shared state.
+  // Protected by _S_chunk_allocator_lock.
+  static _STLP_mutex_base _S_chunk_allocator_lock;
+  static char *_S_start_free;
+  static char *_S_end_free;
+  static size_t _S_heap_size;
+  static _Pthread_alloc_per_thread_state<_Max_size>* _S_free_per_thread_states;
+  static pthread_key_t _S_key;
+  static bool _S_key_initialized;
+        // Pthread key under which per thread state is stored. 
+        // Allocator instances that are currently unclaimed by any thread.
+  static void _S_destructor(void *instance);
+        // Function to be called on thread exit to reclaim per thread
+        // state.
+  static _Pthread_alloc_per_thread_state<_Max_size> *_S_new_per_thread_state();
+public:
+        // Return a recycled or new per thread state.
+  static _Pthread_alloc_per_thread_state<_Max_size> *_S_get_per_thread_state();
+private:
+        // ensure that the current thread has an associated
+        // per thread state.
+  class _M_lock;
+  friend class _M_lock;
+  class _M_lock {
+      public:
+        _M_lock () { _S_chunk_allocator_lock._M_acquire_lock(); }
+        ~_M_lock () { _S_chunk_allocator_lock._M_release_lock(); }
+  };
+
+public:
+
+  /* n must be > 0      */
+  static void * allocate(size_t __n)
+  {
+    __obj * volatile * __my_free_list;
+    __obj * __RESTRICT __result;
+    __state_type* __a;
+
+    if (__n > _Max_size) {
+        return(__malloc_alloc<0>::allocate(__n));
+    }
+
+    __a = _S_get_per_thread_state();
+
+    __my_free_list = __a -> __free_list + _S_freelist_index(__n);
+    __result = *__my_free_list;
+    if (__result == 0) {
+        void *__r = __a -> _M_refill(_S_round_up(__n));
+        return __r;
+    }
+    *__my_free_list = __result -> __free_list_link;
+    return (__result);
+  };
+
+  /* p may not be 0 */
+  static void deallocate(void *__p, size_t __n)
+  {
+    __obj *__q = (__obj *)__p;
+    __obj * volatile * __my_free_list;
+    __state_type* __a;
+
+    if (__n > _Max_size) {
+        __malloc_alloc<0>::deallocate(__p, __n);
+        return;
+    }
+
+    __a = _S_get_per_thread_state();
+    
+    __my_free_list = __a->__free_list + _S_freelist_index(__n);
+    __q -> __free_list_link = *__my_free_list;
+    *__my_free_list = __q;
+  }
+
+  // boris : versions for per_thread_allocator
+  /* n must be > 0      */
+  static void * allocate(size_t __n, __state_type* __a)
+  {
+    __obj * volatile * __my_free_list;
+    __obj * __RESTRICT __result;
+
+    if (__n > _Max_size) {
+        return(__malloc_alloc<0>::allocate(__n));
+    }
+
+    // boris : here, we have to lock per thread state, as we may be getting memory from
+    // different thread pool.
+    _STLP_mutex_lock __lock(__a->_M_lock);
+
+    __my_free_list = __a -> __free_list + _S_freelist_index(__n);
+    __result = *__my_free_list;
+    if (__result == 0) {
+        void *__r = __a -> _M_refill(_S_round_up(__n));
+        return __r;
+    }
+    *__my_free_list = __result -> __free_list_link;
+    return (__result);
+  };
+
+  /* p may not be 0 */
+  static void deallocate(void *__p, size_t __n, __state_type* __a)
+  {
+    __obj *__q = (__obj *)__p;
+    __obj * volatile * __my_free_list;
+
+    if (__n > _Max_size) {
+        __malloc_alloc<0>::deallocate(__p, __n);
+        return;
+    }
+
+    // boris : here, we have to lock per thread state, as we may be returning memory from
+    // different thread.
+    _STLP_mutex_lock __lock(__a->_M_lock);
+
+    __my_free_list = __a->__free_list + _S_freelist_index(__n);
+    __q -> __free_list_link = *__my_free_list;
+    *__my_free_list = __q;
+  }
+
+  static void * reallocate(void *__p, size_t __old_sz, size_t __new_sz);
+
+} ;
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+_STLP_EXPORT_TEMPLATE_CLASS _Pthread_alloc<_MAX_BYTES>;
+# endif
+
+typedef _Pthread_alloc<_MAX_BYTES> __pthread_alloc;
+typedef __pthread_alloc pthread_alloc;
+
+template <class _Tp>
+class pthread_allocator {
+  typedef pthread_alloc _S_Alloc;          // The underlying allocator.
+public:
+  typedef size_t     size_type;
+  typedef ptrdiff_t  difference_type;
+  typedef _Tp*       pointer;
+  typedef const _Tp* const_pointer;
+  typedef _Tp&       reference;
+  typedef const _Tp& const_reference;
+  typedef _Tp        value_type;
+
+#ifdef _STLP_MEMBER_TEMPLATE_CLASSES
+  template <class _NewType> struct rebind {
+    typedef pthread_allocator<_NewType> other;
+  };
+#endif
+
+  pthread_allocator() _STLP_NOTHROW {}
+  pthread_allocator(const pthread_allocator<_Tp>& a) _STLP_NOTHROW {}
+
+#if defined (_STLP_MEMBER_TEMPLATES) /* && defined (_STLP_FUNCTION_PARTIAL_ORDER) */
+  template <class _OtherType> pthread_allocator(const pthread_allocator<_OtherType>&)
+		_STLP_NOTHROW {}
+#endif
+
+  ~pthread_allocator() _STLP_NOTHROW {}
+
+  pointer address(reference __x) const { return &__x; }
+  const_pointer address(const_reference __x) const { return &__x; }
+
+  // __n is permitted to be 0.  The C++ standard says nothing about what
+  // the return value is when __n == 0.
+  _Tp* allocate(size_type __n, const void* = 0) {
+    return __n != 0 ? __STATIC_CAST(_Tp*,_S_Alloc::allocate(__n * sizeof(_Tp)))
+                    : 0;
+  }
+
+  // p is not permitted to be a null pointer.
+  void deallocate(pointer __p, size_type __n)
+    { _S_Alloc::deallocate(__p, __n * sizeof(_Tp)); }
+
+  size_type max_size() const _STLP_NOTHROW 
+    { return size_t(-1) / sizeof(_Tp); }
+
+  void construct(pointer __p, const _Tp& __val) { _STLP_PLACEMENT_NEW (__p) _Tp(__val); }
+  void destroy(pointer _p) { _p->~_Tp(); }
+};
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC pthread_allocator<void> {
+public:
+  typedef size_t      size_type;
+  typedef ptrdiff_t   difference_type;
+  typedef void*       pointer;
+  typedef const void* const_pointer;
+  typedef void        value_type;
+#ifdef _STLP_MEMBER_TEMPLATE_CLASSES
+  template <class _NewType> struct rebind {
+    typedef pthread_allocator<_NewType> other;
+  };
+#endif
+};
+
+template <class _T1, class _T2>
+inline bool operator==(const pthread_allocator<_T1>&,
+                       const pthread_allocator<_T2>& a2) 
+{
+  return true;
+}
+
+#ifdef _STLP_FUNCTION_TMPL_PARTIAL_ORDER
+template <class _T1, class _T2>
+inline bool operator!=(const pthread_allocator<_T1>&,
+                       const pthread_allocator<_T2>&)
+{
+  return false;
+}
+#endif
+
+
+#ifdef _STLP_CLASS_PARTIAL_SPECIALIZATION
+
+# ifdef _STLP_USE_RAW_SGI_ALLOCATORS
+template <class _Tp, size_t _Max_size>
+struct _Alloc_traits<_Tp, _Pthread_alloc<_Max_size> >
+{
+  typedef __allocator<_Tp, _Pthread_alloc<_Max_size> > 
+          allocator_type;
+};
+# endif
+
+template <class _Tp, class _Atype>
+struct _Alloc_traits<_Tp, pthread_allocator<_Atype> >
+{
+  typedef pthread_allocator<_Tp> allocator_type;
+};
+
+#endif
+
+#if !defined (_STLP_USE_NESTED_TCLASS_THROUGHT_TPARAM)
+
+template <class _Tp1, class _Tp2>
+inline pthread_allocator<_Tp2>&
+__stl_alloc_rebind(pthread_allocator<_Tp1>& __x, const _Tp2*) {
+  return (pthread_allocator<_Tp2>&)__x;
+}
+
+template <class _Tp1, class _Tp2>
+inline pthread_allocator<_Tp2>
+__stl_alloc_create(pthread_allocator<_Tp1>&, const _Tp2*) {
+  return pthread_allocator<_Tp2>();
+}
+
+#endif /* _STLP_USE_NESTED_TCLASS_THROUGHT_TPARAM */
+
+//
+// per_thread_allocator<> : this allocator always return memory to the same thread 
+// it was allocated from.
+//
+
+template <class _Tp>
+class per_thread_allocator {
+  typedef pthread_alloc _S_Alloc;          // The underlying allocator.
+  typedef pthread_alloc::__state_type __state_type;
+public:
+  typedef size_t     size_type;
+  typedef ptrdiff_t  difference_type;
+  typedef _Tp*       pointer;
+  typedef const _Tp* const_pointer;
+  typedef _Tp&       reference;
+  typedef const _Tp& const_reference;
+  typedef _Tp        value_type;
+
+#ifdef _STLP_MEMBER_TEMPLATE_CLASSES
+  template <class _NewType> struct rebind {
+    typedef per_thread_allocator<_NewType> other;
+  };
+#endif
+
+  per_thread_allocator() _STLP_NOTHROW { 
+    _M_state = _S_Alloc::_S_get_per_thread_state();
+  }
+  per_thread_allocator(const per_thread_allocator<_Tp>& __a) _STLP_NOTHROW : _M_state(__a._M_state){}
+
+#if defined (_STLP_MEMBER_TEMPLATES) /* && defined (_STLP_FUNCTION_PARTIAL_ORDER) */
+  template <class _OtherType> per_thread_allocator(const per_thread_allocator<_OtherType>& __a)
+		_STLP_NOTHROW : _M_state(__a._M_state) {}
+#endif
+
+  ~per_thread_allocator() _STLP_NOTHROW {}
+
+  pointer address(reference __x) const { return &__x; }
+  const_pointer address(const_reference __x) const { return &__x; }
+
+  // __n is permitted to be 0.  The C++ standard says nothing about what
+  // the return value is when __n == 0.
+  _Tp* allocate(size_type __n, const void* = 0) {
+    return __n != 0 ? __STATIC_CAST(_Tp*,_S_Alloc::allocate(__n * sizeof(_Tp), _M_state)): 0;
+  }
+
+  // p is not permitted to be a null pointer.
+  void deallocate(pointer __p, size_type __n)
+    { _S_Alloc::deallocate(__p, __n * sizeof(_Tp), _M_state); }
+
+  size_type max_size() const _STLP_NOTHROW 
+    { return size_t(-1) / sizeof(_Tp); }
+
+  void construct(pointer __p, const _Tp& __val) { _STLP_PLACEMENT_NEW (__p) _Tp(__val); }
+  void destroy(pointer _p) { _p->~_Tp(); }
+
+  // state is being kept here
+  __state_type* _M_state;
+};
+
+_STLP_TEMPLATE_NULL
+class _STLP_CLASS_DECLSPEC per_thread_allocator<void> {
+public:
+  typedef size_t      size_type;
+  typedef ptrdiff_t   difference_type;
+  typedef void*       pointer;
+  typedef const void* const_pointer;
+  typedef void        value_type;
+#ifdef _STLP_MEMBER_TEMPLATE_CLASSES
+  template <class _NewType> struct rebind {
+    typedef per_thread_allocator<_NewType> other;
+  };
+#endif
+};
+
+template <class _T1, class _T2>
+inline bool operator==(const per_thread_allocator<_T1>& __a1,
+                       const per_thread_allocator<_T2>& __a2) 
+{
+  return __a1._M_state == __a2._M_state;
+}
+
+#ifdef _STLP_FUNCTION_TMPL_PARTIAL_ORDER
+template <class _T1, class _T2>
+inline bool operator!=(const per_thread_allocator<_T1>& __a1,
+                       const per_thread_allocator<_T2>& __a2)
+{
+  return __a1._M_state != __a2._M_state;
+}
+#endif
+
+
+#ifdef _STLP_CLASS_PARTIAL_SPECIALIZATION
+
+template <class _Tp, class _Atype>
+struct _Alloc_traits<_Tp, per_thread_allocator<_Atype> >
+{
+  typedef per_thread_allocator<_Tp> allocator_type;
+};
+
+#endif
+
+#if !defined (_STLP_USE_NESTED_TCLASS_THROUGHT_TPARAM)
+
+template <class _Tp1, class _Tp2>
+inline per_thread_allocator<_Tp2>&
+__stl_alloc_rebind(per_thread_allocator<_Tp1>& __x, const _Tp2*) {
+  return (per_thread_allocator<_Tp2>&)__x;
+}
+
+template <class _Tp1, class _Tp2>
+inline per_thread_allocator<_Tp2>
+__stl_alloc_create(per_thread_allocator<_Tp1>&, const _Tp2*) {
+  return per_thread_allocator<_Tp2>();
+}
+
+#endif /* _STLP_USE_NESTED_TCLASS_THROUGHT_TPARAM */
+
+_STLP_END_NAMESPACE
+
+# if defined (_STLP_EXPOSE_GLOBALS_IMPLEMENTATION) && !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_pthread_alloc.c>
+# endif
+
+#endif /* _STLP_PTHREAD_ALLOC */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_ptrs_specialize.h b/main/source/stlport/stlport/stl/_ptrs_specialize.h
new file mode 100644
index 00000000..bcf77d14
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_ptrs_specialize.h
@@ -0,0 +1,72 @@
+#ifndef _STLP_PTRS_SPECIALIZE_H
+# define _STLP_PTRS_SPECIALIZE_H
+
+// the following is a workaround for arrow operator problems
+#  if defined  ( _STLP_NO_ARROW_OPERATOR ) 
+// User wants to disable proxy -> operators
+#    define _STLP_DEFINE_ARROW_OPERATOR
+#    define _STLP_ARROW_SPECIALIZE_WITH_PTRS(_Tp)
+# else
+// Compiler can handle generic -> operator.
+#  define _STLP_ARROW_SPECIALIZE_WITH_PTRS(_Tp)
+#  ifdef __BORLANDC__
+#   define _STLP_DEFINE_ARROW_OPERATOR  pointer operator->() const { return &(*(*this)); }
+#  elif defined ( _STLP_WINCE ) || defined(__WATCOMC__)
+#   define _STLP_DEFINE_ARROW_OPERATOR pointer operator->() const { reference x = operator*(); return &x; }
+#  else
+#   define _STLP_DEFINE_ARROW_OPERATOR  pointer operator->() const { return &(operator*()); }
+#  endif
+# endif /* _STLP_NO_ARROW_OPERATOR */
+
+// Important pointers specializations
+
+# ifdef _STLP_SIMULATE_PARTIAL_SPEC_FOR_TYPE_TRAITS
+#  define _STLP_TYPE_TRAITS_POD_SPECIALIZE_V(_Type)
+#  define _STLP_TYPE_TRAITS_POD_SPECIALIZE(_Type)
+# else
+#  define _STLP_TYPE_TRAITS_POD_SPECIALIZE(_Type) _STLP_TEMPLATE_NULL struct __type_traits<_Type> : __type_traits_aux<true> {};
+#  define _STLP_TYPE_TRAITS_POD_SPECIALIZE_V(_Type) \
+_STLP_TYPE_TRAITS_POD_SPECIALIZE(_Type*) \
+_STLP_TYPE_TRAITS_POD_SPECIALIZE(const _Type*) \
+_STLP_TYPE_TRAITS_POD_SPECIALIZE(_Type**) \
+_STLP_TYPE_TRAITS_POD_SPECIALIZE(_Type* const *) \
+_STLP_TYPE_TRAITS_POD_SPECIALIZE(const _Type**) \
+_STLP_TYPE_TRAITS_POD_SPECIALIZE(_Type***) \
+_STLP_TYPE_TRAITS_POD_SPECIALIZE(const _Type***)
+# endif
+
+# define _STLP_POINTERS_SPECIALIZE(_Type) _STLP_TYPE_TRAITS_POD_SPECIALIZE_V(_Type) _STLP_ARROW_SPECIALIZE_WITH_PTRS(_Type)
+
+#  if !defined ( _STLP_NO_BOOL )
+_STLP_POINTERS_SPECIALIZE( bool )
+#  endif
+_STLP_TYPE_TRAITS_POD_SPECIALIZE_V(void)
+# ifndef _STLP_NO_SIGNED_BUILTINS
+  _STLP_POINTERS_SPECIALIZE( signed char )
+# endif
+  _STLP_POINTERS_SPECIALIZE( char )
+  _STLP_POINTERS_SPECIALIZE( unsigned char )
+  _STLP_POINTERS_SPECIALIZE( short )
+  _STLP_POINTERS_SPECIALIZE( unsigned short )
+  _STLP_POINTERS_SPECIALIZE( int )
+  _STLP_POINTERS_SPECIALIZE( unsigned int )
+  _STLP_POINTERS_SPECIALIZE( long )
+  _STLP_POINTERS_SPECIALIZE( unsigned long )
+  _STLP_POINTERS_SPECIALIZE( float )
+  _STLP_POINTERS_SPECIALIZE( double )
+#  if !defined ( _STLP_NO_LONG_DOUBLE )
+  _STLP_POINTERS_SPECIALIZE( long double )
+#  endif
+#  if defined ( _STLP_LONG_LONG)
+  _STLP_POINTERS_SPECIALIZE( _STLP_LONG_LONG )
+  _STLP_POINTERS_SPECIALIZE( unsigned _STLP_LONG_LONG )
+#  endif
+#if defined ( _STLP_HAS_WCHAR_T ) && ! defined (_STLP_WCHAR_T_IS_USHORT)
+  _STLP_POINTERS_SPECIALIZE( wchar_t )
+#  endif
+
+# undef _STLP_ARROW_SPECIALIZE
+# undef _STLP_ARROW_SPECIALIZE_WITH_PTRS
+# undef _STLP_TYPE_TRAITS_POD_SPECIALIZE_V
+
+#endif
diff --git a/main/source/stlport/stlport/stl/_queue.h b/main/source/stlport/stlport/stl/_queue.h
new file mode 100644
index 00000000..348363c0
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_queue.h
@@ -0,0 +1,212 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_QUEUE_H
+#define _STLP_INTERNAL_QUEUE_H
+
+#ifndef _STLP_INTERNAL_DEQUE_H
+# include <stl/_deque.h>
+#endif
+
+#ifndef _STLP_INTERNAL_VECTOR_H
+# include <stl/_vector.h>
+#endif
+
+#ifndef _STLP_INTERNAL_HEAP_H
+# include <stl/_heap.h>
+#endif
+
+#ifndef _STLP_INTERNAL_FUNCTION_H
+# include <stl/_function.h>
+#endif
+
+#if defined(__SC__) && !defined(__DMC__)		//*ty 12/07/2001 - since "comp" is a built-in type and reserved under SCpp
+#define comp _Comp
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+# if ! defined ( _STLP_LIMITED_DEFAULT_TEMPLATES )
+template <class _Tp, class _Sequence = deque<_Tp> >
+# elif defined ( _STLP_MINIMUM_DEFAULT_TEMPLATE_PARAMS )
+#  define _STLP_QUEUE_ARGS _Tp
+template <class _Tp>
+# else
+template <class _Tp, class _Sequence>
+# endif
+
+class queue {
+# if defined ( _STLP_QUEUE_ARGS )
+  typedef deque<_Tp> _Sequence;
+# endif
+public:
+  typedef typename _Sequence::value_type      value_type;
+  typedef typename _Sequence::size_type       size_type;
+  typedef          _Sequence                  container_type;
+
+  typedef typename _Sequence::reference       reference;
+  typedef typename _Sequence::const_reference const_reference;
+
+protected:
+  _Sequence c;
+public:
+  queue() : c() {}
+  explicit queue(const _Sequence& __c) : c(__c) {}
+
+  bool empty() const { return c.empty(); }
+  size_type size() const { return c.size(); }
+  reference front() { return c.front(); }
+  const_reference front() const { return c.front(); }
+  reference back() { return c.back(); }
+  const_reference back() const { return c.back(); }
+  void push(const value_type& __x) { c.push_back(__x); }
+  void pop() { c.pop_front(); }
+  const _Sequence& _Get_c() const { return c; }
+};
+
+# ifndef _STLP_QUEUE_ARGS
+#  define _STLP_QUEUE_ARGS _Tp, _Sequence
+#  define _STLP_QUEUE_HEADER_ARGS class _Tp, class _Sequence
+# else
+#  define _STLP_QUEUE_HEADER_ARGS class _Tp
+# endif
+
+template < _STLP_QUEUE_HEADER_ARGS >
+inline bool _STLP_CALL 
+operator==(const queue<_STLP_QUEUE_ARGS >& __x, const queue<_STLP_QUEUE_ARGS >& __y)
+{
+  return __x._Get_c() == __y._Get_c();
+}
+
+template < _STLP_QUEUE_HEADER_ARGS >
+inline bool _STLP_CALL
+operator<(const queue<_STLP_QUEUE_ARGS >& __x, const queue<_STLP_QUEUE_ARGS >& __y)
+{
+  return __x._Get_c() < __y._Get_c();
+}
+
+_STLP_RELOPS_OPERATORS( template < _STLP_QUEUE_HEADER_ARGS >, queue<_STLP_QUEUE_ARGS > )
+
+# if !(defined ( _STLP_LIMITED_DEFAULT_TEMPLATES ) || defined ( _STLP_TEMPLATE_PARAM_SUBTYPE_BUG ))
+template <class _Tp, class _Sequence = vector<_Tp>, 
+          class _Compare = less<_STLP_HEADER_TYPENAME _Sequence::value_type> >
+# elif defined ( _STLP_MINIMUM_DEFAULT_TEMPLATE_PARAMS )
+template <class _Tp>
+# else
+template <class _Tp, class _Sequence, class _Compare>
+# endif
+class  priority_queue {
+# ifdef _STLP_MINIMUM_DEFAULT_TEMPLATE_PARAMS
+  typedef vector<_Tp> _Sequence;
+  typedef less< typename vector<_Tp>::value_type> _Compare; 
+# endif
+public:
+  typedef typename _Sequence::value_type      value_type;
+  typedef typename _Sequence::size_type       size_type;
+  typedef          _Sequence                  container_type;
+
+  typedef typename _Sequence::reference       reference;
+  typedef typename _Sequence::const_reference const_reference;
+protected:
+  _Sequence c;
+  _Compare comp;
+public:
+  priority_queue() : c() {}
+  explicit priority_queue(const _Compare& __x) :  c(), comp(__x) {}
+  priority_queue(const _Compare& __x, const _Sequence& __s) 
+    : c(__s), comp(__x)
+    { make_heap(c.begin(), c.end(), comp); }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIterator>
+  priority_queue(_InputIterator __first, _InputIterator __last) 
+    : c(__first, __last) { make_heap(c.begin(), c.end(), comp); }
+
+  template <class _InputIterator>
+  priority_queue(_InputIterator __first, 
+                 _InputIterator __last, const _Compare& __x)
+    : c(__first, __last), comp(__x)
+    { make_heap(c.begin(), c.end(), comp); }
+
+  template <class _InputIterator>
+  priority_queue(_InputIterator __first, _InputIterator __last,
+                 const _Compare& __x, const _Sequence& __s)
+  : c(__s), comp(__x)
+  { 
+    c.insert(c.end(), __first, __last);
+    make_heap(c.begin(), c.end(), comp);
+  }
+
+#else /* _STLP_MEMBER_TEMPLATES */
+  priority_queue(const value_type* __first, const value_type* __last) 
+    : c(__first, __last) { make_heap(c.begin(), c.end(), comp); }
+
+  priority_queue(const value_type* __first, const value_type* __last, 
+                 const _Compare& __x) 
+    : c(__first, __last), comp(__x)
+    { make_heap(c.begin(), c.end(), comp); }
+
+  priority_queue(const value_type* __first, const value_type* __last, 
+                 const _Compare& __x, const _Sequence& __c)
+    : c(__c), comp(__x)
+  { 
+    c.insert(c.end(), __first, __last);
+    make_heap(c.begin(), c.end(), comp);
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  bool empty() const { return c.empty(); }
+  size_type size() const { return c.size(); }
+  const_reference top() const { return c.front(); }
+  void push(const value_type& __x) {
+    _STLP_TRY {
+      c.push_back(__x); 
+      push_heap(c.begin(), c.end(), comp);
+    }
+    _STLP_UNWIND(c.clear());
+  }
+  void pop() {
+    _STLP_TRY {
+      pop_heap(c.begin(), c.end(), comp);
+      c.pop_back();
+    }
+    _STLP_UNWIND(c.clear());
+  }
+};
+
+_STLP_END_NAMESPACE
+
+#  undef _STLP_QUEUE_ARGS
+#  undef _STLP_QUEUE_HEADER_ARGS
+
+#endif /* _STLP_INTERNAL_QUEUE_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_range_errors.h b/main/source/stlport/stlport/stl/_range_errors.h
new file mode 100644
index 00000000..8b299448
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_range_errors.h
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Silicon Graphics makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ *
+ */
+
+#ifndef _STLP_RANGE_ERRORS_H
+#define _STLP_RANGE_ERRORS_H
+
+// A few places in the STL throw range errors, using standard exception
+// classes defined in <stdexcept>.  This header file provides functions
+// to throw those exception objects.
+
+// _STLP_DONT_THROW_RANGE_ERRORS is a hook so that users can disable
+// this exception throwing.
+#if defined(_STLP_CAN_THROW_RANGE_ERRORS) && defined(_STLP_USE_EXCEPTIONS) \
+    && !defined(_STLP_DONT_THROW_RANGE_ERRORS)
+# define _STLP_THROW_RANGE_ERRORS
+#endif
+
+// For the STLport iostreams, only declaration here, definition is in the lib
+
+#if defined ( _STLP_OWN_IOSTREAMS  ) && ! defined (_STLP_EXTERN_RANGE_ERRORS) 
+#  define _STLP_EXTERN_RANGE_ERRORS
+# endif
+
+#if defined (_STLP_EXTERN_RANGE_ERRORS)
+_STLP_BEGIN_NAMESPACE
+void  _STLP_DECLSPEC _STLP_CALL __stl_throw_range_error(const char* __msg);
+void  _STLP_DECLSPEC _STLP_CALL __stl_throw_out_of_range(const char* __msg);
+void  _STLP_DECLSPEC _STLP_CALL __stl_throw_length_error(const char* __msg);
+void  _STLP_DECLSPEC _STLP_CALL __stl_throw_invalid_argument(const char* __msg);
+void  _STLP_DECLSPEC _STLP_CALL __stl_throw_overflow_error(const char* __msg);
+_STLP_END_NAMESPACE
+#else
+
+#if defined(_STLP_THROW_RANGE_ERRORS)
+# ifndef _STLP_STDEXCEPT
+#  include <stdexcept>
+# endif
+# ifndef _STLP_STRING
+#  include <string>
+# endif
+# define _STLP_THROW_MSG(ex,msg)  throw ex(string(msg))
+#else
+# if defined (_STLP_WINCE)
+#  define _STLP_THROW_MSG(ex,msg)  TerminateProcess(GetCurrentProcess(), 0)
+# else
+#  include <cstdlib>
+#  include <cstdio>
+#  define _STLP_THROW_MSG(ex,msg)  puts(msg),_STLP_ABORT()
+# endif
+#endif
+
+// For wrapper mode and throwing range errors, include the
+// stdexcept header and throw the appropriate exceptions directly.
+
+_STLP_BEGIN_NAMESPACE
+inline void _STLP_DECLSPEC _STLP_CALL __stl_throw_range_error(const char* __msg) { 
+  _STLP_THROW_MSG(range_error, __msg); 
+}
+
+inline void _STLP_DECLSPEC _STLP_CALL __stl_throw_out_of_range(const char* __msg) { 
+  _STLP_THROW_MSG(out_of_range, __msg); 
+}
+
+inline void _STLP_DECLSPEC _STLP_CALL __stl_throw_length_error(const char* __msg) { 
+  _STLP_THROW_MSG(length_error, __msg); 
+}
+
+inline void _STLP_DECLSPEC _STLP_CALL __stl_throw_invalid_argument(const char* __msg) { 
+  _STLP_THROW_MSG(invalid_argument, __msg); 
+}
+
+inline void _STLP_DECLSPEC _STLP_CALL __stl_throw_overflow_error(const char* __msg) { 
+  _STLP_THROW_MSG(overflow_error, __msg); 
+}
+_STLP_END_NAMESPACE
+
+# undef _STLP_THROW_MSG
+
+# endif /* EXTERN_RANGE_ERRORS */
+
+
+#endif /* _STLP_RANGE_ERRORS_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_raw_storage_iter.h b/main/source/stlport/stlport/stl/_raw_storage_iter.h
new file mode 100644
index 00000000..1b18b4ff
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_raw_storage_iter.h
@@ -0,0 +1,82 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ * You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_RAW_STORAGE_ITERATOR_H
+#define _STLP_INTERNAL_RAW_STORAGE_ITERATOR_H
+
+#ifndef _STLP_INTERNAL_ITERATOR_BASE_H
+#  include <stl/_iterator_base.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _ForwardIterator, class _Tp>
+class raw_storage_iterator 
+# ifdef _STLP_HAS_VOID_SPECIALIZATION
+      : public iterator<output_iterator_tag,void,void,void,void>
+# endif
+{
+protected:
+  _ForwardIterator _M_iter;
+public:
+  typedef output_iterator_tag iterator_category;
+# ifdef _STLP_CLASS_PARTIAL_SPECIALIZATION
+  typedef void                value_type;
+  typedef void                difference_type;
+  typedef void                pointer;
+  typedef void                reference;
+# endif
+  explicit raw_storage_iterator(_ForwardIterator __x) : _M_iter(__x) {}
+  raw_storage_iterator<_ForwardIterator, _Tp>& operator*() { return *this; }
+  raw_storage_iterator<_ForwardIterator, _Tp>& operator=(const _Tp& __element) {
+    _Construct(&*_M_iter, __element);
+    return *this;
+  }        
+  raw_storage_iterator<_ForwardIterator, _Tp>& operator++() {
+    ++_M_iter;
+    return *this;
+  }
+  raw_storage_iterator<_ForwardIterator, _Tp> operator++(int) {
+    raw_storage_iterator<_ForwardIterator, _Tp> __tmp = *this;
+    ++_M_iter;
+    return __tmp;
+  }
+};
+
+# ifdef _STLP_USE_OLD_HP_ITERATOR_QUERIES
+template <class _ForwardIterator, class _Tp>
+inline output_iterator_tag iterator_category(const raw_storage_iterator<_ForwardIterator, _Tp>&) { return output_iterator_tag(); }
+#endif
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_INTERNAL_RAW_STORAGE_ITERATOR_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_relops.h b/main/source/stlport/stlport/stl/_relops.h
new file mode 100644
index 00000000..1206be4d
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_relops.h
@@ -0,0 +1,33 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Hewlett-Packard Company makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Silicon Graphics makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_relops_cont.h b/main/source/stlport/stlport/stl/_relops_cont.h
new file mode 100644
index 00000000..246ce3ba
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_relops_cont.h
@@ -0,0 +1,29 @@
+// This is an implementation file which
+// is intended to be included multiple times with different _STLP_ASSOCIATIVE_CONTAINER
+// setting
+
+#ifndef _STLP_EQUAL_OPERATOR_SPECIALIZED
+_STLP_TEMPLATE_HEADER
+inline bool  _STLP_CALL operator==(const _STLP_TEMPLATE_CONTAINER& __x, 
+                                   const _STLP_TEMPLATE_CONTAINER& __y) {
+  return __x.size() == __y.size() &&
+    equal(__x.begin(), __x.end(), __y.begin());
+}
+#endif /* _STLP_EQUAL_OPERATOR_SPECIALIZED */
+
+_STLP_TEMPLATE_HEADER
+inline bool  _STLP_CALL operator<(const _STLP_TEMPLATE_CONTAINER& __x, 
+                                  const _STLP_TEMPLATE_CONTAINER& __y) {
+  return lexicographical_compare(__x.begin(), __x.end(), 
+				 __y.begin(), __y.end());
+}
+
+_STLP_RELOPS_OPERATORS( _STLP_TEMPLATE_HEADER , _STLP_TEMPLATE_CONTAINER )
+    
+#ifdef _STLP_FUNCTION_TMPL_PARTIAL_ORDER
+_STLP_TEMPLATE_HEADER
+inline void  _STLP_CALL swap(_STLP_TEMPLATE_CONTAINER& __x, 
+                             _STLP_TEMPLATE_CONTAINER& __y) {
+  __x.swap(__y);
+}
+#endif /* _STLP_FUNCTION_TMPL_PARTIAL_ORDER */
diff --git a/main/source/stlport/stlport/stl/_relops_hash_cont.h b/main/source/stlport/stlport/stl/_relops_hash_cont.h
new file mode 100644
index 00000000..17cf2b1d
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_relops_hash_cont.h
@@ -0,0 +1,32 @@
+// This is an implementation file which
+// is intended to be included multiple times with different _STLP_ASSOCIATIVE_CONTAINER
+// setting
+
+_STLP_TEMPLATE_HEADER
+inline bool _STLP_CALL 
+operator==(const _STLP_TEMPLATE_CONTAINER& __hm1, const _STLP_TEMPLATE_CONTAINER& __hm2)
+{
+  return _STLP_TEMPLATE_CONTAINER::_M_equal(__hm1, __hm2);
+}
+
+#ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+
+_STLP_TEMPLATE_HEADER
+inline bool _STLP_CALL 
+operator!=(const _STLP_TEMPLATE_CONTAINER& __hm1, const _STLP_TEMPLATE_CONTAINER& __hm2) {
+  return !(__hm1 == __hm2);
+}
+
+#endif /* _STLP_USE_SEPARATE_RELOPS_NAMESPACE */
+
+#ifdef _STLP_FUNCTION_TMPL_PARTIAL_ORDER
+
+_STLP_TEMPLATE_HEADER
+inline void _STLP_CALL 
+swap(_STLP_TEMPLATE_CONTAINER& __hm1, _STLP_TEMPLATE_CONTAINER& __hm2)
+{
+  __hm1.swap(__hm2);
+}
+
+#endif /* _STLP_FUNCTION_TMPL_PARTIAL_ORDER */
+
diff --git a/main/source/stlport/stlport/stl/_relops_template.h b/main/source/stlport/stlport/stl/_relops_template.h
new file mode 100644
index 00000000..d3f5a12f
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_relops_template.h
@@ -0,0 +1 @@
+
diff --git a/main/source/stlport/stlport/stl/_rope.c b/main/source/stlport/stlport/stl/_rope.c
new file mode 100644
index 00000000..503ec79f
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_rope.c
@@ -0,0 +1,1540 @@
+/*
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+// Set buf_start, buf_end, and buf_ptr appropriately, filling tmp_buf
+// if necessary.  Assumes path_end[leaf_index] and leaf_pos are correct.
+// Results in a valid buf_ptr if the iterator can be legitimately
+// dereferenced.
+# ifndef _STLP_ROPEIMPL_H
+# define _STLP_ROPEIMPL_H
+
+#ifndef _STLP_INTERNAL_ROPE_H
+# include <stl/_rope.h>
+#endif
+
+# ifndef _STLP_CSTDIO
+#  include <cstdio>
+# endif
+
+#ifndef _STLP_IOSTREAM
+# include <iostream>
+#endif
+
+# include <stl/_range_errors.h>
+
+_STLP_BEGIN_NAMESPACE
+
+# if defined ( _STLP_NESTED_TYPE_PARAM_BUG )
+# define __allocator__ _Alloc
+# else
+# define __allocator__ allocator_type
+# endif
+
+template<class _CharT, class _Alloc>
+_Rope_iterator<_CharT, _Alloc>::_Rope_iterator(rope<_CharT,_Alloc>* __r, size_t __pos)
+  : _Rope_iterator_base<_CharT,_Alloc>(__r->_M_tree_ptr._M_data, __pos),
+  _M_root_rope(__r) { _RopeRep::_S_ref(this->_M_root); }
+
+template<class _CharT, class _Alloc>
+_Rope_iterator<_CharT, _Alloc>::_Rope_iterator(rope<_CharT,_Alloc>& __r, size_t __pos): 
+  _Rope_iterator_base<_CharT,_Alloc>(__r._M_tree_ptr._M_data, __pos), 
+  _M_root_rope(&__r) {
+  _RopeRep::_S_ref(this->_M_root); if (!(__r.empty()))_S_setcache(*this);
+}
+
+template<class _CharT, class _Alloc>
+void 
+_Rope_RopeRep<_CharT, _Alloc>::_M_free_c_string()
+{
+  _CharT* __cstr = _M_c_string;
+  if (0 != __cstr) {
+    size_t _p_size = _M_size._M_data + 1;
+    _STLP_STD::_Destroy(__cstr, __cstr + _p_size);
+    _M_size.deallocate(__cstr, _p_size);
+  }
+}
+
+
+// Set buf_start, buf_end, and buf_ptr appropriately, filling tmp_buf
+// if necessary.  Assumes _M_path_end[leaf_index] and leaf_pos are correct.
+// Results in a valid buf_ptr if the iterator can be legitimately
+// dereferenced.
+template <class _CharT, class _Alloc>
+void _Rope_iterator_base<_CharT,_Alloc>::_S_setbuf( 
+  _Rope_iterator_base<_CharT,_Alloc>& __x)
+{
+    const _RopeRep* __leaf = __x._M_path_end[__x._M_leaf_index];
+    size_t __leaf_pos = __x._M_leaf_pos;
+    size_t __pos = __x._M_current_pos;
+
+    switch(__leaf->_M_tag) {
+	case _RopeRep::_S_leaf:
+	    __x._M_buf_start = 
+	      ((_Rope_RopeLeaf<_CharT,_Alloc>*)__leaf)->_M_data;
+	    __x._M_buf_ptr = __x._M_buf_start + (__pos - __leaf_pos);
+	    __x._M_buf_end = __x._M_buf_start + __leaf->_M_size._M_data;
+	    break;
+	case _RopeRep::_S_function:
+	case _RopeRep::_S_substringfn:
+	    {
+		size_t __len = _S_iterator_buf_len;
+		size_t __buf_start_pos = __leaf_pos;
+		size_t __leaf_end = __leaf_pos + __leaf->_M_size._M_data;
+		char_producer<_CharT>* __fn =
+			((_Rope_RopeFunction<_CharT,_Alloc>*)__leaf)->_M_fn;
+
+		if (__buf_start_pos + __len <= __pos) {
+		    __buf_start_pos = __pos - __len/4;
+		    if (__buf_start_pos + __len > __leaf_end) {
+			__buf_start_pos = __leaf_end - __len;
+		    }
+		}
+		if (__buf_start_pos + __len > __leaf_end) {
+		    __len = __leaf_end - __buf_start_pos;
+		}
+		(*__fn)(__buf_start_pos - __leaf_pos, __len, __x._M_tmp_buf);
+		__x._M_buf_ptr = __x._M_tmp_buf + (__pos - __buf_start_pos);
+		__x._M_buf_start = __x._M_tmp_buf;
+		__x._M_buf_end = __x._M_tmp_buf + __len;
+	    }
+	    break;
+	default:
+      _STLP_ASSERT(0)
+        ;
+    }
+}
+
+// Set path and buffer inside a rope iterator.  We assume that 
+// pos and root are already set.
+template <class _CharT, class _Alloc>
+void _Rope_iterator_base<_CharT,_Alloc>::_S_setcache
+(_Rope_iterator_base<_CharT,_Alloc>& __x)
+{
+    const _RopeRep* __path[_RopeRep::_S_max_rope_depth+1];
+    const _RopeRep* __curr_rope;
+    int __curr_depth = -1;  /* index into path    */
+    size_t __curr_start_pos = 0;
+    size_t __pos = __x._M_current_pos;
+    unsigned char __dirns = 0; // Bit vector marking right turns in the path
+
+    _STLP_ASSERT(__pos <= __x._M_root->_M_size._M_data)
+    if (__pos >= __x._M_root->_M_size._M_data) {
+	__x._M_buf_ptr = 0;
+	return;
+    }
+    __curr_rope = __x._M_root;
+    if (0 != __curr_rope->_M_c_string) {
+	/* Treat the root as a leaf. */
+	__x._M_buf_start = __curr_rope->_M_c_string;
+	__x._M_buf_end = __curr_rope->_M_c_string + __curr_rope->_M_size._M_data;
+	__x._M_buf_ptr = __curr_rope->_M_c_string + __pos;
+	__x._M_path_end[0] = __curr_rope;
+	__x._M_leaf_index = 0;
+	__x._M_leaf_pos = 0;
+	return;
+    }
+    for(;;) {
+	++__curr_depth;
+	_STLP_ASSERT(__curr_depth <= _RopeRep::_S_max_rope_depth)
+	__path[__curr_depth] = __curr_rope;
+	switch(__curr_rope->_M_tag) {
+	  case _RopeRep::_S_leaf:
+	  case _RopeRep::_S_function:
+	  case _RopeRep::_S_substringfn:
+	    __x._M_leaf_pos = __curr_start_pos;
+	    goto done;
+	  case _RopeRep::_S_concat:
+	    {
+		_Rope_RopeConcatenation<_CharT,_Alloc>* __c =
+			(_Rope_RopeConcatenation<_CharT,_Alloc>*)__curr_rope;
+		_RopeRep* __left = __c->_M_left;
+		size_t __left_len = __left->_M_size._M_data;
+		
+		__dirns <<= 1;
+		if (__pos >= __curr_start_pos + __left_len) {
+		    __dirns |= 1;
+		    __curr_rope = __c->_M_right;
+		    __curr_start_pos += __left_len;
+		} else {
+		    __curr_rope = __left;
+		}
+	    }
+	    break;
+	}
+    }
+  done:
+    // Copy last section of path into _M_path_end.
+      {
+	int __i = -1;
+	int __j = __curr_depth + 1 - _S_path_cache_len;
+
+	if (__j < 0) __j = 0;
+	while (__j <= __curr_depth) {
+	    __x._M_path_end[++__i] = __path[__j++];
+	}
+	__x._M_leaf_index = __i;
+      }
+      __x._M_path_directions = __dirns;
+      _S_setbuf(__x);
+}
+
+// Specialized version of the above.  Assumes that
+// the path cache is valid for the previous position.
+template <class _CharT, class _Alloc>
+void _Rope_iterator_base<_CharT,_Alloc>::_S_setcache_for_incr
+(_Rope_iterator_base<_CharT,_Alloc>& __x)
+{
+    int __current_index = __x._M_leaf_index;
+    const _RopeRep* __current_node = __x._M_path_end[__current_index];
+    size_t __len = __current_node->_M_size._M_data;
+    size_t __node_start_pos = __x._M_leaf_pos;
+    unsigned char __dirns = __x._M_path_directions;
+    _Rope_RopeConcatenation<_CharT,_Alloc>* __c;
+
+    _STLP_ASSERT(__x._M_current_pos <= __x._M_root->_M_size._M_data)
+    if (__x._M_current_pos - __node_start_pos < __len) {
+	/* More stuff in this leaf, we just didn't cache it. */
+	_S_setbuf(__x);
+	return;
+    }
+    _STLP_ASSERT(__node_start_pos + __len == __x._M_current_pos)
+    //  node_start_pos is starting position of last_node.
+    while (--__current_index >= 0) {
+	if (!(__dirns & 1) /* Path turned left */) 
+	  break;
+	__current_node = __x._M_path_end[__current_index];
+	__c = (_Rope_RopeConcatenation<_CharT,_Alloc>*)__current_node;
+	// Otherwise we were in the right child.  Thus we should pop
+	// the concatenation node.
+	__node_start_pos -= __c->_M_left->_M_size._M_data;
+	__dirns >>= 1;
+    }
+    if (__current_index < 0) {
+	// We underflowed the cache. Punt.
+	_S_setcache(__x);
+	return;
+    }
+    __current_node = __x._M_path_end[__current_index];
+    __c = (_Rope_RopeConcatenation<_CharT,_Alloc>*)__current_node;
+    // current_node is a concatenation node.  We are positioned on the first
+    // character in its right child.
+    // node_start_pos is starting position of current_node.
+    __node_start_pos += __c->_M_left->_M_size._M_data;
+    __current_node = __c->_M_right;
+    __x._M_path_end[++__current_index] = __current_node;
+    __dirns |= 1;
+    while (_RopeRep::_S_concat == __current_node->_M_tag) {
+	++__current_index;
+	if (_S_path_cache_len == __current_index) {
+	    int __i;
+	    for (__i = 0; __i < _S_path_cache_len-1; __i++) {
+		__x._M_path_end[__i] = __x._M_path_end[__i+1];
+	    }
+	    --__current_index;
+	}
+	__current_node =
+	    ((_Rope_RopeConcatenation<_CharT,_Alloc>*)__current_node)->_M_left;
+	__x._M_path_end[__current_index] = __current_node;
+	__dirns <<= 1;
+	// node_start_pos is unchanged.
+    }
+    __x._M_leaf_index = __current_index;
+    __x._M_leaf_pos = __node_start_pos;
+    __x._M_path_directions = __dirns;
+    _S_setbuf(__x);
+}
+
+template <class _CharT, class _Alloc>
+void _Rope_iterator_base<_CharT,_Alloc>::_M_incr(size_t __n) {
+    _M_current_pos += __n;
+    if (0 != _M_buf_ptr) {
+        size_t __chars_left = _M_buf_end - _M_buf_ptr;
+        if (__chars_left > __n) {
+            _M_buf_ptr += __n;
+        } else if (__chars_left == __n) {
+            _M_buf_ptr += __n;
+            _S_setcache_for_incr(*this);
+        } else {
+            _M_buf_ptr = 0;
+        }
+    }
+}
+
+template <class _CharT, class _Alloc>
+void _Rope_iterator_base<_CharT,_Alloc>::_M_decr(size_t __n) {
+    if (0 != _M_buf_ptr) {
+        size_t __chars_left = _M_buf_ptr - _M_buf_start;
+        if (__chars_left >= __n) {
+            _M_buf_ptr -= __n;
+        } else {
+            _M_buf_ptr = 0;
+        }
+    }
+    _M_current_pos -= __n;
+}
+
+template <class _CharT, class _Alloc>
+void _Rope_iterator<_CharT,_Alloc>::_M_check() {
+    if (_M_root_rope->_M_tree_ptr._M_data != this->_M_root) {
+        // _Rope was modified.  Get things fixed up.
+        _RopeRep::_S_unref(this->_M_root);
+        this->_M_root = _M_root_rope->_M_tree_ptr._M_data;
+        _RopeRep::_S_ref(this->_M_root);
+        this->_M_buf_ptr = 0;
+    }
+}
+
+# ifndef _GC
+//  There are several reasons for not doing this with virtual destructors
+//  and a class specific delete operator:
+//  - A class specific delete operator can't easily get access to
+//    allocator instances if we need them.
+//  - Any virtual function would need a 4 or byte vtable pointer;
+//    this only requires a one byte tag per object.
+template <class _CharT, class _Alloc>
+void _Rope_RopeRep<_CharT,_Alloc>::_M_free_tree()
+{
+    switch(_M_tag) {
+	case _S_leaf:
+	    {
+	      typedef _Rope_RopeLeaf<_CharT,_Alloc> _Rope_RopeLeaf_T;
+          _Rope_RopeLeaf_T* __l = (_Rope_RopeLeaf_T*)this;
+          _STLP_STD::_Destroy(__l); // ->_Rope_RopeLeaf<_CharT,_Alloc>::~_Rope_RopeLeaf();
+	      _STLP_CREATE_ALLOCATOR(allocator_type,(const allocator_type&)_M_size, _Rope_RopeLeaf_T).deallocate(__l, 1);
+	        break;
+	    }
+	case _S_concat:
+	    {
+               typedef _Rope_RopeConcatenation<_CharT,_Alloc> _Rope_RopeConcatenation_T;
+               _Rope_RopeConcatenation_T* __c  = (_Rope_RopeConcatenation_T*)this;
+               _STLP_STD::_Destroy(__c);
+               _STLP_CREATE_ALLOCATOR(allocator_type,(const allocator_type&)_M_size, 
+                               _Rope_RopeConcatenation_T).deallocate(__c, 1);
+	        break;
+	    }
+	case _S_function:
+	    {
+            typedef _Rope_RopeFunction<_CharT,_Alloc> _Rope_RopeFunctionT;
+              _Rope_RopeFunctionT* __f = (_Rope_RopeFunctionT*)this;
+              _STLP_STD::_Destroy(__f);
+              _STLP_CREATE_ALLOCATOR(allocator_type,(const allocator_type&)_M_size, 
+                                 _Rope_RopeFunctionT).deallocate(__f, 1);
+	        break;
+	    }
+	case _S_substringfn:
+	    {
+            typedef _Rope_RopeSubstring<_CharT,_Alloc> _Rope_RopeSubstring_T;
+              _Rope_RopeSubstring_T* __ss = (_Rope_RopeSubstring_T*)this;
+              _STLP_STD::_Destroy(__ss);
+              _STLP_CREATE_ALLOCATOR(allocator_type,(const allocator_type&)_M_size, 
+                              _Rope_RopeSubstring_T).deallocate(__ss, 1);
+		break;
+	    }
+    }
+}
+#endif
+
+# if defined ( _STLP_NESTED_TYPE_PARAM_BUG )
+#   define __RopeLeaf__ _Rope_RopeLeaf<_CharT,_Alloc>
+#   define __RopeRep__ _Rope_RopeRep<_CharT,_Alloc>
+#   define _RopeLeaf _Rope_RopeLeaf<_CharT,_Alloc>
+#   define _RopeRep _Rope_RopeRep<_CharT,_Alloc>
+#   define size_type size_t
+# else
+#   define __RopeLeaf__ _STLP_TYPENAME_ON_RETURN_TYPE rope<_CharT,_Alloc>::_RopeLeaf
+#   define __RopeRep__ _STLP_TYPENAME_ON_RETURN_TYPE rope<_CharT,_Alloc>::_RopeRep
+# endif
+
+// Concatenate a C string onto a leaf rope by copying the rope data.
+// Used for short ropes.
+template <class _CharT, class _Alloc>
+__RopeLeaf__*
+rope<_CharT,_Alloc>::_S_leaf_concat_char_iter
+		(_RopeLeaf* __r, const _CharT* __iter, size_t __len)
+{
+    size_t __old_len = __r->_M_size._M_data;
+    _CharT* __new_data = __r->_M_size.allocate(_S_rounded_up_size(__old_len + __len));
+    _RopeLeaf* __result;
+    
+    uninitialized_copy_n(__r->_M_data, __old_len, __new_data);
+    uninitialized_copy_n(__iter, __len, __new_data + __old_len);
+    _S_cond_store_eos(__new_data[__old_len + __len]);
+    _STLP_TRY {
+	__result = _S_new_RopeLeaf(__new_data, __old_len + __len,
+				   __r->get_allocator());
+    }
+    _STLP_UNWIND(_RopeRep::_S_free_string(__new_data, __old_len + __len,
+					     __r->get_allocator()));
+    return __result;
+}
+
+#ifndef __GC
+// As above, but it's OK to clobber original if refcount is 1
+template <class _CharT, class _Alloc>
+__RopeLeaf__*
+rope<_CharT,_Alloc>::_S_destr_leaf_concat_char_iter
+		(_RopeLeaf* __r, const _CharT* __iter, size_t __len)
+{
+    _STLP_ASSERT(__r->_M_ref_count >= 1)
+    if (__r->_M_ref_count > 1)
+      return _S_leaf_concat_char_iter(__r, __iter, __len);
+    size_t __old_len = __r->_M_size._M_data;
+    if (_S_allocated_capacity(__old_len) >= __old_len + __len) {
+	// The space has been partially initialized for the standard
+	// character types.  But that doesn't matter for those types.
+	uninitialized_copy_n(__iter, __len, __r->_M_data + __old_len);
+	if (_S_is_basic_char_type((_CharT*)0)) {
+	    _S_cond_store_eos(__r->_M_data[__old_len + __len]);
+	    _STLP_ASSERT(__r->_M_c_string == __r->_M_data)
+	} else if (__r->_M_c_string != __r->_M_data && 0 != __r->_M_c_string) {
+	    __r->_M_free_c_string();
+	    __r->_M_c_string = 0;
+	}
+	__r->_M_size._M_data = __old_len + __len;
+	_STLP_ASSERT(__r->_M_ref_count == 1)
+	__r->_M_ref_count = 2;
+	return __r;
+    } else {
+	_RopeLeaf* __result = _S_leaf_concat_char_iter(__r, __iter, __len);
+	_STLP_ASSERT(__result->_M_ref_count == 1)
+	return __result;
+    }
+}
+#endif
+
+// Assumes left and right are not 0.
+// Does not increment (nor decrement on exception) child reference counts.
+// Result has ref count 1.
+template <class _CharT, class _Alloc>
+__RopeRep__*
+rope<_CharT,_Alloc>::_S_tree_concat (_RopeRep* __left, _RopeRep* __right)
+{
+    _RopeConcatenation* __result =
+      _S_new_RopeConcatenation(__left, __right, __left->get_allocator());
+    size_t __depth = __result->_M_depth;
+    
+    _STLP_ASSERT(__left->get_allocator() == __right->get_allocator())
+    if (__depth > 20 && (__result->_M_size._M_data < 1000 ||
+			 __depth > _RopeRep::_S_max_rope_depth)) {
+        _RopeRep* __balanced;
+      
+	_STLP_TRY {
+	   __balanced = _S_balance(__result);
+#          ifndef __GC
+	     if (__result != __balanced) {
+		_STLP_ASSERT(1 == __result->_M_ref_count
+			     && 1 == __balanced->_M_ref_count)
+	     }
+#          endif
+	   __result->_M_unref_nonnil();
+        }
+      _STLP_UNWIND((_STLP_CREATE_ALLOCATOR(allocator_type,(allocator_type&)__left->_M_size,
+                                    _RopeConcatenation).deallocate(__result,1)));
+		// In case of exception, we need to deallocate
+		// otherwise dangling result node.  But caller
+		// still owns its children.  Thus unref is
+		// inappropriate.
+	return __balanced;
+    } else {
+	return __result;
+    }
+}
+
+template <class _CharT, class _Alloc>
+__RopeRep__*
+rope<_CharT,_Alloc>::_S_concat_char_iter
+		(_RopeRep* __r, const _CharT*__s, size_t __slen)
+{
+    _RopeRep* __result;
+    if (0 == __slen) {
+	_S_ref(__r);
+	return __r;
+    }
+    if (0 == __r)
+      return _STLP_ROPE_FROM_UNOWNED_CHAR_PTR(__s, __slen,
+					      /* __r->get_allocator()*/ allocator_type() );
+    if (_RopeRep::_S_leaf == __r->_M_tag && 
+          __r->_M_size._M_data + __slen <= _S_copy_max) {
+	__result = _S_leaf_concat_char_iter((_RopeLeaf*)__r, __s, __slen);
+#       ifndef __GC
+	  _STLP_ASSERT(1 == __result->_M_ref_count)
+#       endif
+	return __result;
+    }
+    if (_RopeRep::_S_concat == __r->_M_tag
+	&& _RopeRep::_S_leaf == ((_RopeConcatenation*)__r)->_M_right->_M_tag) {
+	_RopeLeaf* __right = 
+	  (_RopeLeaf* )(((_RopeConcatenation* )__r)->_M_right);
+	if (__right->_M_size._M_data + __slen <= _S_copy_max) {
+	  _RopeRep* __left = ((_RopeConcatenation*)__r)->_M_left;
+	  _RopeRep* __nright = 
+	    _S_leaf_concat_char_iter((_RopeLeaf*)__right, __s, __slen);
+	  __left->_M_ref_nonnil();
+	  _STLP_TRY {
+	    __result = _S_tree_concat(__left, __nright);
+          }
+	  _STLP_UNWIND(_S_unref(__left); _S_unref(__nright));
+#         ifndef __GC
+	    _STLP_ASSERT(1 == __result->_M_ref_count)
+#         endif
+	  return __result;
+	}
+    }
+    _RopeRep* __nright =
+      _STLP_ROPE_FROM_UNOWNED_CHAR_PTR(__s, __slen, __r->get_allocator());
+    _STLP_TRY {
+      __r->_M_ref_nonnil();
+      __result = _S_tree_concat(__r, __nright);
+    }
+    _STLP_UNWIND(_S_unref(__r); _S_unref(__nright));
+#   ifndef __GC
+      _STLP_ASSERT(1 == __result->_M_ref_count)
+#   endif
+    return __result;
+}
+
+#ifndef __GC
+template <class _CharT, class _Alloc>
+__RopeRep__* 
+rope<_CharT,_Alloc>::_S_destr_concat_char_iter(
+  _RopeRep* __r, const _CharT* __s, size_t __slen)
+{
+    _RopeRep* __result;
+    if (0 == __r)
+      return _STLP_ROPE_FROM_UNOWNED_CHAR_PTR(__s, __slen,
+					      /* __r-> */allocator_type());
+    size_t __count = __r->_M_ref_count;
+    size_t __orig_size = __r->_M_size._M_data;
+    _STLP_ASSERT(__count >= 1)
+    if (__count > 1) return _S_concat_char_iter(__r, __s, __slen);
+    if (0 == __slen) {
+	__r->_M_ref_count = 2;      // One more than before
+	return __r;
+    }
+    if (__orig_size + __slen <= _S_copy_max && 
+          _RopeRep::_S_leaf == __r->_M_tag) {
+	__result = _S_destr_leaf_concat_char_iter((_RopeLeaf*)__r, __s, __slen);
+	return __result;
+    }
+    if (_RopeRep::_S_concat == __r->_M_tag) {
+	_RopeLeaf* __right = (_RopeLeaf*)(((_RopeConcatenation*)__r)->_M_right);
+	if (_RopeRep::_S_leaf == __right->_M_tag
+	    && __right->_M_size._M_data + __slen <= _S_copy_max) {
+	  _RopeRep* __new_right = 
+	    _S_destr_leaf_concat_char_iter(__right, __s, __slen);
+	  if (__right == __new_right) {
+	      _STLP_ASSERT(__new_right->_M_ref_count == 2)
+	      __new_right->_M_ref_count = 1;
+	  } else {
+	      _STLP_ASSERT(__new_right->_M_ref_count >= 1)
+	      __right->_M_unref_nonnil();
+	  }
+	  _STLP_ASSERT(__r->_M_ref_count == 1)
+	  __r->_M_ref_count = 2;    // One more than before.
+      ((_RopeConcatenation*)__r)->_M_right = __new_right;
+      // E.Musser : moved below
+      //	  __r->_M_size._M_data = __orig_size + __slen;
+	  if (0 != __r->_M_c_string) {
+	      __r->_M_free_c_string();
+	      __r->_M_c_string = 0;
+	  }
+	  __r->_M_size._M_data = __orig_size + __slen;
+	  return __r;
+	}
+    }
+    _RopeRep* __right =
+      _STLP_ROPE_FROM_UNOWNED_CHAR_PTR(__s, __slen, __r->get_allocator());
+    __r->_M_ref_nonnil();
+    _STLP_TRY {
+      __result = _S_tree_concat(__r, __right);
+    }
+    _STLP_UNWIND(_S_unref(__r); _S_unref(__right))
+    _STLP_ASSERT(1 == __result->_M_ref_count)
+    return __result;
+}
+#endif /* !__GC */
+
+template <class _CharT, class _Alloc>
+__RopeRep__*
+rope<_CharT,_Alloc>::_S_concat_rep(_RopeRep* __left, _RopeRep* __right)
+{
+    if (0 == __left) {
+	_S_ref(__right);
+	return __right;
+    }
+    if (0 == __right) {
+	__left->_M_ref_nonnil();
+	return __left;
+    }
+    if (_RopeRep::_S_leaf == __right->_M_tag) {
+	if (_RopeRep::_S_leaf == __left->_M_tag) {
+	  if (__right->_M_size._M_data + __left->_M_size._M_data <= _S_copy_max) {
+	    return _S_leaf_concat_char_iter((_RopeLeaf*)__left,
+					 ((_RopeLeaf*)__right)->_M_data,
+					 __right->_M_size._M_data);
+	  }
+	} else if (_RopeRep::_S_concat == __left->_M_tag
+		   && _RopeRep::_S_leaf ==
+		      ((_RopeConcatenation*)__left)->_M_right->_M_tag) {
+	  _RopeLeaf* __leftright =
+		    (_RopeLeaf*)(((_RopeConcatenation*)__left)->_M_right); 
+	  if (__leftright->_M_size._M_data + __right->_M_size._M_data <= _S_copy_max) {
+	    _RopeRep* __leftleft = ((_RopeConcatenation*)__left)->_M_left;
+	    _RopeRep* __rest = _S_leaf_concat_char_iter(__leftright,
+					   ((_RopeLeaf*)__right)->_M_data,
+					   __right->_M_size._M_data);
+	    __leftleft->_M_ref_nonnil();
+	    _STLP_TRY {
+	      return(_S_tree_concat(__leftleft, __rest));
+            }
+	    _STLP_UNWIND(_S_unref(__leftleft); _S_unref(__rest))
+	  }
+	}
+    }
+    __left->_M_ref_nonnil();
+    __right->_M_ref_nonnil();
+    _STLP_TRY {
+      return(_S_tree_concat(__left, __right));
+    }
+    _STLP_UNWIND(_S_unref(__left); _S_unref(__right));
+#ifdef _STLP_THROW_RETURN_BUG
+	return 0;
+#endif
+}
+
+template <class _CharT, class _Alloc>
+__RopeRep__*
+rope<_CharT,_Alloc>::_S_substring(_RopeRep* __base, 
+                               size_t __start, size_t __endp1)
+{
+    if (0 == __base) return 0;
+    size_t __len = __base->_M_size._M_data;
+    size_t __adj_endp1;
+    const size_t __lazy_threshold = 128;
+    
+    if (__endp1 >= __len) {
+	if (0 == __start) {
+	    __base->_M_ref_nonnil();
+	    return __base;
+	} else {
+	    __adj_endp1 = __len;
+	}
+    } else {
+	__adj_endp1 = __endp1;
+    }
+    switch(__base->_M_tag) {
+	case _RopeRep::_S_concat:
+	    {
+		_RopeConcatenation* __c = (_RopeConcatenation*)__base;
+		_RopeRep* __left = __c->_M_left;
+		_RopeRep* __right = __c->_M_right;
+		size_t __left_len = __left->_M_size._M_data;
+		_RopeRep* __result;
+
+		if (__adj_endp1 <= __left_len) {
+		    return _S_substring(__left, __start, __endp1);
+		} else if (__start >= __left_len) {
+		    return _S_substring(__right, __start - __left_len,
+				  __adj_endp1 - __left_len);
+		}
+		_Self_destruct_ptr __left_result(
+		  _S_substring(__left, __start, __left_len));
+		_Self_destruct_ptr __right_result(
+		  _S_substring(__right, 0, __endp1 - __left_len));
+		_STLP_MPWFIX_TRY		//*TY 06/01/2000 - mpw forgets to call dtor on __left_result and __right_result without this try block
+		__result = _S_concat_rep(__left_result, __right_result);
+#               ifndef __GC
+		  _STLP_ASSERT(1 == __result->_M_ref_count)
+#               endif
+		return __result;
+		_STLP_MPWFIX_CATCH		//*TY 06/01/2000 - 
+	    }
+	case _RopeRep::_S_leaf:
+	    {
+		_RopeLeaf* __l = (_RopeLeaf*)__base;
+		_RopeLeaf* __result;
+		size_t __result_len;
+		if (__start >= __adj_endp1) return 0;
+		__result_len = __adj_endp1 - __start;
+		if (__result_len > __lazy_threshold) goto lazy;
+#               ifdef __GC
+		    const _CharT* __section = __l->_M_data + __start;
+		    __result = _S_new_RopeLeaf(__section, __result_len,
+					  __base->get_allocator());
+		    __result->_M_c_string = 0;  // Not eos terminated.
+#               else
+		    // We should sometimes create substring node instead.
+		    __result = _STLP_ROPE_FROM_UNOWNED_CHAR_PTR(
+					__l->_M_data + __start, __result_len,
+					__base->get_allocator());
+#               endif
+		return __result;
+	    }
+	case _RopeRep::_S_substringfn:
+	    // Avoid introducing multiple layers of substring nodes.
+	    {
+		_RopeSubstring* __old = (_RopeSubstring*)__base;
+		size_t __result_len;
+		if (__start >= __adj_endp1) return 0;
+		__result_len = __adj_endp1 - __start;
+		if (__result_len > __lazy_threshold) {
+		    _RopeSubstring* __result =
+			_S_new_RopeSubstring(__old->_M_base,
+					  __start + __old->_M_start,
+					  __adj_endp1 - __start,
+					  __base->get_allocator());
+		    return __result;
+
+		} // *** else fall through: ***
+	    }
+	case _RopeRep::_S_function:
+	    {
+		_RopeFunction* __f = (_RopeFunction*)__base;
+		if (__start >= __adj_endp1) return 0;
+		size_t __result_len = __adj_endp1 - __start;
+
+		if (__result_len > __lazy_threshold) goto lazy;
+		_CharT* __section = __base->_M_size.allocate(_S_rounded_up_size(__result_len));
+		_STLP_TRY {
+		  (*(__f->_M_fn))(__start, __result_len, __section);
+                }
+		_STLP_UNWIND(_RopeRep::_S_free_string(
+	               __section, __result_len, __base->get_allocator()));
+		_S_cond_store_eos(__section[__result_len]);
+		return _S_new_RopeLeaf(__section, __result_len,
+				       __base->get_allocator());
+	    }
+    }
+    /*NOTREACHED*/
+    _STLP_ASSERT(false)
+  lazy:
+    {
+	// Create substring node.
+	return _S_new_RopeSubstring(__base, __start, __adj_endp1 - __start,
+			       __base->get_allocator());
+    }
+}
+
+template<class _CharT>
+class _Rope_flatten_char_consumer : public _Rope_char_consumer<_CharT> {
+    private:
+	_CharT* _M_buf_ptr;
+    public:
+	//  _CharT* _M_buffer;  // XXX not used
+
+	_Rope_flatten_char_consumer(_CharT* __buffer) {
+	    _M_buf_ptr = __buffer;
+	};
+	~_Rope_flatten_char_consumer() {}
+	bool operator() (const _CharT* __leaf, size_t __n) {
+	    uninitialized_copy_n(__leaf, __n, _M_buf_ptr);
+	    _M_buf_ptr += __n;
+	    return true;
+	}
+};
+	    
+template<class _CharT>
+class _Rope_find_char_char_consumer : public _Rope_char_consumer<_CharT> {
+    private:
+	_CharT _M_pattern;
+    public:
+	size_t _M_count;  // Number of nonmatching characters
+	_Rope_find_char_char_consumer(_CharT __p) 
+	  : _M_pattern(__p), _M_count(0) {}
+	~_Rope_find_char_char_consumer() {}
+	bool operator() (const _CharT* __leaf, size_t __n) {
+	    size_t __i;
+	    for (__i = 0; __i < __n; __i++) {
+		if (__leaf[__i] == _M_pattern) {
+		    _M_count += __i; return false;
+		}
+	    }
+	    _M_count += __n; return true;
+	}
+};
+
+#if !defined (_STLP_USE_NO_IOSTREAMS)	    
+#if defined (_STLP_USE_NEW_IOSTREAMS)
+  template<class _CharT, class _Traits>
+  // Here _CharT is both the stream and rope character type.
+#else
+ template<class _CharT>
+  // Here _CharT is the rope character type.  Unlike in the
+  // above case, we somewhat handle the case in which it doesn't
+  // match the stream character type, i.e. char.
+#endif
+class _Rope_insert_char_consumer : public _Rope_char_consumer<_CharT> {
+    private:
+#       if defined (_STLP_USE_NEW_IOSTREAMS)
+	  typedef basic_ostream<_CharT,_Traits> _Insert_ostream;
+#	else
+ 	typedef ostream _Insert_ostream;
+#	endif
+	_Insert_ostream& _M_o;
+    public:
+	// _CharT* buffer;    // XXX not used
+	_Rope_insert_char_consumer(_Insert_ostream& __writer) 
+	  : _M_o(__writer) {};
+#if defined(__MRC__)||(defined(__SC__) && !defined(__DMC__))		//*TY 05/23/2000 - added support for mpw compiler's trigger function approach to generate vtable
+  ~_Rope_insert_char_consumer();		//*TY 05/23/2000 - 
+#else		//*TY 05/23/2000 - 
+  ~_Rope_insert_char_consumer() {}
+#endif		//*TY 05/23/2000 - 
+		// Caller is presumed to own the ostream
+	bool operator() (const _CharT* __leaf, size_t __n);
+		// Returns true to continue traversal.
+};
+	    
+# if defined ( _STLP_USE_NEW_IOSTREAMS )
+#  if defined(__MRC__)||(defined(__SC__) && !defined(__DMC__))		//*TY 05/23/2000 - added support for mpw compiler's trigger function approach to generate vtable
+  template<class _CharT, class _Traits>
+  _Rope_insert_char_consumer<_CharT, _Traits>::  ~_Rope_insert_char_consumer() {}
+#  endif		//*TY 05/23/2000 - 
+
+  template<class _CharT, class _Traits>
+  bool _Rope_insert_char_consumer<_CharT, _Traits>::operator()
+					(const _CharT* __leaf, size_t __n)
+{
+    size_t __i;
+    //  We assume that formatting is set up correctly for each element.
+    for (__i = 0; __i < __n; __i++) _M_o.put(__leaf[__i]);
+    return true;
+}
+# else
+#  if defined(__MRC__)||(defined(__SC__) && !defined(__DMC__))		//*TY 05/23/2000 - added support for mpw compiler's trigger function approach to generate vtable
+  template<class _CharT>
+  _Rope_insert_char_consumer<_CharT>::  ~_Rope_insert_char_consumer() {}
+#  endif		//*TY 05/23/2000 - 
+
+  template<class _CharT>
+  bool _Rope_insert_char_consumer<_CharT>::operator()
+					(const _CharT* __leaf, size_t __n)
+  {
+    size_t __i;
+    //  We assume that formatting is set up correctly for each element.
+    for (__i = 0; __i < __n; __i++) _M_o << __leaf[__i];
+    return true;
+  }
+
+# if !defined (_STLP_NO_METHOD_SPECIALIZATION)
+_STLP_TEMPLATE_NULL
+inline bool 
+_Rope_insert_char_consumer<char>::operator()
+					(const char* __leaf, size_t __n)
+{
+    size_t __i;
+    for (__i = 0; __i < __n; __i++) _M_o.put(__leaf[__i]);
+    return true;
+}
+
+#endif /* _STLP_METHOD_SPECIALIZATION */
+#endif /* _STLP_USE_NEW_IOSTREAM */
+#endif /* if !defined (_STLP_USE_NO_IOSTREAMS) */
+
+template <class _CharT, class _Alloc>
+bool rope<_CharT, _Alloc>::_S_apply_to_pieces(
+				_Rope_char_consumer<_CharT>& __c,
+				const _RopeRep* __r,
+				size_t __begin, size_t __end)
+{
+    if (0 == __r) return true;
+    switch(__r->_M_tag) {
+	case _RopeRep::_S_concat:
+	    {
+		_RopeConcatenation* __conc = (_RopeConcatenation*)__r;
+		_RopeRep* __left =  __conc->_M_left;
+		size_t __left_len = __left->_M_size._M_data;
+		if (__begin < __left_len) {
+		    size_t __left_end = (min) (__left_len, __end);
+		    if (!_S_apply_to_pieces(__c, __left, __begin, __left_end))
+			return false;
+		}
+		if (__end > __left_len) {
+		    _RopeRep* __right =  __conc->_M_right;
+		    size_t __right_start = (max)(__left_len, __begin);
+		    if (!_S_apply_to_pieces(__c, __right,
+					 __right_start - __left_len,
+					 __end - __left_len)) {
+			return false;
+		    }
+		}
+	    }
+	    return true;
+	case _RopeRep::_S_leaf:
+	    {
+		_RopeLeaf* __l = (_RopeLeaf*)__r;
+		return __c.operator()(__l->_M_data + __begin, __end - __begin);
+	    }
+	case _RopeRep::_S_function:
+	case _RopeRep::_S_substringfn:
+	    {
+		_RopeFunction* __f = (_RopeFunction*)__r;
+		size_t __len = __end - __begin;
+		bool __result;
+		_CharT* __buffer =
+		  (_CharT*)__sgi_alloc::allocate(__len * sizeof(_CharT));
+		_STLP_TRY {
+		  (*(__f->_M_fn))(__begin, __len, __buffer);
+		  __result = __c.operator()(__buffer, __len);
+                  __sgi_alloc::deallocate(__buffer, __len * sizeof(_CharT));
+                }
+		_STLP_UNWIND((__sgi_alloc::deallocate(__buffer,
+						      __len * sizeof(_CharT))))
+		return __result;
+	    }
+	default:
+	    _STLP_ASSERT(false)
+	    /*NOTREACHED*/
+	    return false;
+    }
+}
+
+template <class _CharT> inline bool _Rope_is_simple(_CharT*) { return false; }
+inline bool _Rope_is_simple(char*) { return true; }
+# ifdef _STLP_HAS_WCHAR_T
+inline bool _Rope_is_simple(wchar_t*) { return true; }
+# endif
+
+#if !defined (_STLP_USE_NO_IOSTREAMS)
+#if defined (_STLP_USE_NEW_IOSTREAMS)
+  template<class _CharT, class _Traits>
+  inline void _Rope_fill(basic_ostream<_CharT, _Traits>& __o, size_t __n)
+#else
+inline void _Rope_fill(ostream& __o, size_t __n)
+#endif
+{
+    char __f = __o.fill();
+    size_t __i;
+
+    for (__i = 0; __i < __n; __i++) __o.put(__f);
+}
+    
+#if defined (_STLP_USE_NEW_IOSTREAMS)
+  template<class _CharT, class _Traits, class _Alloc>
+  basic_ostream<_CharT, _Traits>& operator<<
+					(basic_ostream<_CharT, _Traits>& __o,
+					 const rope<_CharT, _Alloc>& __r)
+# else
+template<class _CharT, class _Alloc>
+ostream& operator<< (ostream& __o, const rope<_CharT, _Alloc>& __r)
+#endif
+{
+    size_t __w = __o.width();
+    bool __left = bool(__o.flags() & ios::left);
+    size_t __pad_len;
+    size_t __rope_len = __r.size();
+#   if defined (_STLP_USE_NEW_IOSTREAMS)
+      _Rope_insert_char_consumer<_CharT, _Traits> __c(__o);
+#   else
+    _Rope_insert_char_consumer<_CharT> __c(__o);
+#   endif
+    bool __is_simple = _Rope_is_simple((_CharT*)0);
+    
+    if (__rope_len < __w) {
+	__pad_len = __w - __rope_len;
+    } else {
+	__pad_len = 0;
+    }
+    if (!__is_simple) __o.width(__w/__rope_len);
+    _STLP_TRY {
+      if (__is_simple && !__left && __pad_len > 0) {
+	_Rope_fill(__o, __pad_len);
+      }
+      __r.apply_to_pieces(0, __r.size(), __c);
+      if (__is_simple && __left && __pad_len > 0) {
+	_Rope_fill(__o, __pad_len);
+      }
+      if (!__is_simple)
+        __o.width(__w);
+    }
+    _STLP_UNWIND(if (!__is_simple) __o.width(__w))
+    return __o;
+}
+
+#endif /* NO_IOSTREAMS */
+
+template <class _CharT, class _Alloc>
+_CharT*
+rope<_CharT,_Alloc>::_S_flatten(_RopeRep* __r,
+				 size_t __start, size_t __len,
+				 _CharT* __buffer)
+{
+    _Rope_flatten_char_consumer<_CharT> __c(__buffer);
+    _S_apply_to_pieces(__c, __r, __start, __start + __len);
+    return(__buffer + __len);
+}
+
+template <class _CharT, class _Alloc>
+size_t
+rope<_CharT,_Alloc>::find(_CharT __pattern, size_t __start) const
+{
+    _Rope_find_char_char_consumer<_CharT> __c(__pattern);
+    _S_apply_to_pieces(__c, _M_tree_ptr._M_data, __start, size());
+    size_type __result_pos = __start + __c._M_count;
+#   ifndef _STLP_OLD_ROPE_SEMANTICS
+	if (__result_pos == size()) __result_pos = npos;
+#   endif
+    return __result_pos;
+}
+
+template <class _CharT, class _Alloc>
+_CharT*
+rope<_CharT,_Alloc>::_S_flatten(_Rope_RopeRep<_CharT, _Alloc>* __r, _CharT* __buffer)
+{
+    if (0 == __r) return __buffer;
+    switch(__r->_M_tag) {
+	case _RopeRep::_S_concat:
+	    {
+		_RopeConcatenation* __c = (_RopeConcatenation*)__r;
+		_RopeRep* __left = __c->_M_left;
+		_RopeRep* __right = __c->_M_right;
+		_CharT* __rest = _S_flatten(__left, __buffer);
+		return _S_flatten(__right, __rest);
+	    }
+	case _RopeRep::_S_leaf:
+	    {
+		_RopeLeaf* __l = (_RopeLeaf*)__r;
+		return copy_n(__l->_M_data, __l->_M_size._M_data, __buffer).second;
+	    }
+	case _RopeRep::_S_function:
+	case _RopeRep::_S_substringfn:
+	    // We dont yet do anything with substring nodes.
+	    // This needs to be fixed before ropefiles will work well.
+	    {
+		_RopeFunction* __f = (_RopeFunction*)__r;
+		(*(__f->_M_fn))(0, __f->_M_size._M_data, __buffer);
+		return __buffer + __f->_M_size._M_data;
+	    }
+	default:
+	    _STLP_ASSERT(false)
+	    /*NOTREACHED*/
+	    return 0;
+    }
+}
+
+
+// This needs work for _CharT != char
+template <class _CharT, class _Alloc>
+void
+rope<_CharT,_Alloc>::_S_dump(_RopeRep* __r, int __indent)
+{
+    for (int __i = 0; __i < __indent; __i++) putchar(' ');
+    if (0 == __r) {
+      printf("NULL\n"); return;
+    }
+    if (_RopeRep::_S_concat == __r->_M_tag) {
+	_RopeConcatenation* __c = (_RopeConcatenation*)__r;
+	_RopeRep* __left = __c->_M_left;
+	_RopeRep* __right = __c->_M_right;
+
+#       ifdef __GC
+	  printf("Concatenation %p (depth = %d, len = %ld, %s balanced)\n",
+	    __r, __r->_M_depth, __r->_M_size._M_data, __r->_M_is_balanced? "" : "not");
+#       else
+	  printf("Concatenation %p (rc = %ld, depth = %d, "
+	           "len = %ld, %s balanced)\n",
+		 __r, __r->_M_ref_count, __r->_M_depth, __r->_M_size._M_data,
+		 __r->_M_is_balanced? "" : "not");
+#       endif
+	_S_dump(__left, __indent + 2);
+	_S_dump(__right, __indent + 2);
+	return;
+    } else {
+	const char* __kind;
+
+	switch (__r->_M_tag) {
+	    case _RopeRep::_S_leaf:
+		__kind = "Leaf";
+		break;
+	    case _RopeRep::_S_function:
+		__kind = "Function";
+		break;
+	    case _RopeRep::_S_substringfn:
+		__kind = "Function representing substring";
+		break;
+	    default:
+		__kind = "(corrupted kind field!)";
+	}
+#       ifdef __GC
+	  printf("%s %p (depth = %d, len = %ld) ",
+		 __kind, __r, __r->_M_depth, __r->_M_size._M_data);
+#       else
+	  printf("%s %p (rc = %ld, depth = %d, len = %ld) ",
+		 __kind, __r, __r->_M_ref_count, __r->_M_depth, __r->_M_size._M_data);
+#       endif
+	if (_S_is_one_byte_char_type((_CharT*)0)) {
+	    const int __max_len = 40;
+	    _Self_destruct_ptr __prefix(_S_substring(__r, 0, __max_len));
+	    _CharT __buffer[__max_len + 1];
+	    bool __too_big = __r->_M_size._M_data > __prefix->_M_size._M_data;
+
+	    _S_flatten(__prefix, __buffer);
+	    __buffer[__prefix->_M_size._M_data] = _S_eos((_CharT*)0); 
+	    printf("%s%s\n", 
+	           (char*)__buffer, __too_big? "...\n" : "\n");
+	} else {
+	    printf("\n");
+	}
+    }
+}
+
+# define __ROPE_TABLE_BODY  = { \
+/* 0 */1, /* 1 */2, /* 2 */3, /* 3 */5, /* 4 */8, /* 5 */13, /* 6 */21,         \
+/* 7 */34, /* 8 */55, /* 9 */89, /* 10 */144, /* 11 */233, /* 12 */377,         \
+/* 13 */610, /* 14 */987, /* 15 */1597, /* 16 */2584, /* 17 */4181,             \
+/* 18 */6765ul, /* 19 */10946ul, /* 20 */17711ul, /* 21 */28657ul, /* 22 */46368ul,   \
+/* 23 */75025ul, /* 24 */121393ul, /* 25 */196418ul, /* 26 */317811ul,                \
+/* 27 */514229ul, /* 28 */832040ul, /* 29 */1346269ul, /* 30 */2178309ul,             \
+/* 31 */3524578ul, /* 32 */5702887ul, /* 33 */9227465ul, /* 34 */14930352ul,          \
+/* 35 */24157817ul, /* 36 */39088169ul, /* 37 */63245986ul, /* 38 */102334155ul,      \
+/* 39 */165580141ul, /* 40 */267914296ul, /* 41 */433494437ul,                        \
+/* 42 */701408733ul, /* 43 */1134903170ul, /* 44 */1836311903ul,                      \
+/* 45 */2971215073ul }
+
+# if ( _STLP_STATIC_TEMPLATE_DATA > 0 )
+template <class _CharT, class _Alloc>
+const unsigned long
+rope<_CharT,_Alloc>::_S_min_len[__ROPE_DEPTH_SIZE] __ROPE_TABLE_BODY ;
+# else 
+__DECLARE_INSTANCE(const unsigned long, 
+                   crope::_S_min_len[__ROPE_DEPTH_SIZE],
+                   __ROPE_TABLE_BODY);
+#  ifndef _STLP_NO_WCHAR_T
+__DECLARE_INSTANCE(const unsigned long, 
+                   wrope::_S_min_len[__ROPE_DEPTH_SIZE],
+                   __ROPE_TABLE_BODY);
+#  endif
+# endif
+# undef __ROPE_DEPTH_SIZE
+# undef __ROPE_MAX_DEPTH
+# undef __ROPE_TABLE_BODY
+
+// These are Fibonacci numbers < 2**32.
+
+template <class _CharT, class _Alloc>
+__RopeRep__*
+rope<_CharT,_Alloc>::_S_balance(_RopeRep* __r)
+{
+    _RopeRep* __forest[_RopeRep::_S_max_rope_depth + 1];
+    _RopeRep* __result = 0;
+    int __i;
+    // Invariant:
+    // The concatenation of forest in descending order is equal to __r.
+    // __forest[__i]._M_size._M_data >= _S_min_len[__i]
+    // __forest[__i]._M_depth = __i
+    // References from forest are included in refcount.
+
+    for (__i = 0; __i <= _RopeRep::_S_max_rope_depth; ++__i) 
+      __forest[__i] = 0;
+    _STLP_TRY {
+      _S_add_to_forest(__r, __forest);
+      for (__i = 0; __i <= _RopeRep::_S_max_rope_depth; ++__i) 
+        if (0 != __forest[__i]) {
+#	ifndef __GC
+	  _Self_destruct_ptr __old(__result);
+#	endif
+	  __result = _S_concat_rep(__forest[__i], __result);
+	__forest[__i]->_M_unref_nonnil();
+#	if !defined(__GC) && defined(_STLP_USE_EXCEPTIONS)
+	  __forest[__i] = 0;
+#	endif
+      }
+    }
+    _STLP_UNWIND(for(__i = 0; __i <= _RopeRep::_S_max_rope_depth; __i++)
+		 _S_unref(__forest[__i]))
+    if (__result->_M_depth > _RopeRep::_S_max_rope_depth) {
+	__stl_throw_range_error("rope too long");
+    }
+    return(__result);
+}
+
+
+template <class _CharT, class _Alloc>
+void
+rope<_CharT,_Alloc>::_S_add_to_forest(_RopeRep* __r, _RopeRep** __forest)
+{
+    if (__r -> _M_is_balanced) {
+	_S_add_leaf_to_forest(__r, __forest);
+	return;
+    }
+    _STLP_ASSERT(__r->_M_tag == _RopeRep::_S_concat)
+    {
+	_RopeConcatenation* __c = (_RopeConcatenation*)__r;
+
+	_S_add_to_forest(__c->_M_left, __forest);
+	_S_add_to_forest(__c->_M_right, __forest);
+    }
+}
+
+
+template <class _CharT, class _Alloc>
+void
+rope<_CharT,_Alloc>::_S_add_leaf_to_forest(_RopeRep* __r, _RopeRep** __forest)
+{
+    _RopeRep* __insertee;   		// included in refcount
+    _RopeRep* __too_tiny = 0;    	// included in refcount
+    int __i;  				// forest[0..__i-1] is empty
+    size_t __s = __r->_M_size._M_data;
+
+    for (__i = 0; __s >= _S_min_len[__i+1]/* not this bucket */; ++__i) {
+	if (0 != __forest[__i]) {
+#	    ifndef __GC
+	      _Self_destruct_ptr __old(__too_tiny);
+#	    endif
+	    __too_tiny = _S_concat_and_set_balanced(__forest[__i], __too_tiny);
+	    __forest[__i]->_M_unref_nonnil();
+	    __forest[__i] = 0;
+	}
+    }
+    {
+#	ifndef __GC
+	  _Self_destruct_ptr __old(__too_tiny);
+#	endif
+	__insertee = _S_concat_and_set_balanced(__too_tiny, __r);
+    }
+    // Too_tiny dead, and no longer included in refcount.
+    // Insertee is live and included.
+    _STLP_ASSERT(_S_is_almost_balanced(__insertee))
+    _STLP_ASSERT(__insertee->_M_depth <= __r->_M_depth + 1)
+    for (;; ++__i) {
+	if (0 != __forest[__i]) {
+#	    ifndef __GC
+	      _Self_destruct_ptr __old(__insertee);
+#	    endif
+	    __insertee = _S_concat_and_set_balanced(__forest[__i], __insertee);
+	    __forest[__i]->_M_unref_nonnil();
+	    __forest[__i] = 0;
+	    _STLP_ASSERT(_S_is_almost_balanced(__insertee))
+	}
+	_STLP_ASSERT(_S_min_len[__i] <= __insertee->_M_size._M_data)
+	_STLP_ASSERT(__forest[__i] == 0)
+	if (__i == _RopeRep::_S_max_rope_depth || 
+	      __insertee->_M_size._M_data < _S_min_len[__i+1]) {
+	    __forest[__i] = __insertee;
+	    // refcount is OK since __insertee is now dead.
+	    return;
+	}
+    }
+}
+
+template <class _CharT, class _Alloc>
+_CharT
+rope<_CharT,_Alloc>::_S_fetch(_RopeRep* __r, size_type __i)
+{
+    __GC_CONST _CharT* __cstr = __r->_M_c_string;
+
+    _STLP_ASSERT(__i < __r->_M_size._M_data)
+    if (0 != __cstr) return __cstr[__i]; 
+    for(;;) {
+      switch(__r->_M_tag) {
+	case _RopeRep::_S_concat:
+	    {
+		_RopeConcatenation* __c = (_RopeConcatenation*)__r;
+		_RopeRep* __left = __c->_M_left;
+		size_t __left_len = __left->_M_size._M_data;
+
+		if (__i >= __left_len) {
+		    __i -= __left_len;
+		    __r = __c->_M_right;
+		} else {
+		    __r = __left;
+		}
+	    }
+	    break;
+	case _RopeRep::_S_leaf:
+	    {
+		_RopeLeaf* __l = (_RopeLeaf*)__r;
+		return __l->_M_data[__i];
+	    }
+	case _RopeRep::_S_function:
+	case _RopeRep::_S_substringfn:
+	    {
+		_RopeFunction* __f = (_RopeFunction*)__r;
+		_CharT __result;
+
+		(*(__f->_M_fn))(__i, 1, &__result);
+		return __result;
+	    }
+      }
+    }
+#if defined(_STLP_NEED_UNREACHABLE_RETURN)
+    return 0;
+#endif
+}
+
+# ifndef __GC
+// Return a uniquely referenced character slot for the given
+// position, or 0 if that's not possible.
+template <class _CharT, class _Alloc>
+_CharT*
+rope<_CharT,_Alloc>::_S_fetch_ptr(_RopeRep* __r, size_type __i)
+{
+    _RopeRep* __clrstack[_RopeRep::_S_max_rope_depth];
+    size_t __csptr = 0;
+
+    for(;;) {
+      if (__r->_M_ref_count > 1) return 0;
+      switch(__r->_M_tag) {
+	case _RopeRep::_S_concat:
+	    {
+		_RopeConcatenation* __c = (_RopeConcatenation*)__r;
+		_RopeRep* __left = __c->_M_left;
+		size_t __left_len = __left->_M_size._M_data;
+
+		if (__c->_M_c_string != 0) __clrstack[__csptr++] = __c;
+		if (__i >= __left_len) {
+		    __i -= __left_len;
+		    __r = __c->_M_right;
+		} else {
+		    __r = __left;
+		}
+	    }
+	    break;
+	case _RopeRep::_S_leaf:
+	    {
+		_RopeLeaf* __l = (_RopeLeaf*)__r;
+		if (__l->_M_c_string != __l->_M_data && __l->_M_c_string != 0)
+		    __clrstack[__csptr++] = __l;
+		while (__csptr > 0) {
+		    -- __csptr;
+		    _RopeRep* __d = __clrstack[__csptr];
+		    __d->_M_free_c_string();
+		    __d->_M_c_string = 0;
+		}
+		return __l->_M_data + __i;
+	    }
+	case _RopeRep::_S_function:
+	case _RopeRep::_S_substringfn:
+	    return 0;
+      }
+    }
+#if defined(_STLP_NEED_UNREACHABLE_RETURN)
+    return 0;
+#endif
+
+}
+# endif /* __GC */
+
+// The following could be implemented trivially using
+// lexicographical_compare_3way.
+// We do a little more work to avoid dealing with rope iterators for
+// flat strings.
+template <class _CharT, class _Alloc>
+int
+rope<_CharT,_Alloc>::_S_compare (const _RopeRep* __left, 
+                                 const _RopeRep* __right)
+{
+    size_t __left_len;
+    size_t __right_len;
+
+    if (0 == __right) return 0 != __left;
+    if (0 == __left) return -1;
+    __left_len = __left->_M_size._M_data;
+    __right_len = __right->_M_size._M_data;
+    if (_RopeRep::_S_leaf == __left->_M_tag) {
+	_RopeLeaf* __l = (_RopeLeaf*) __left;
+	if (_RopeRep::_S_leaf == __right->_M_tag) {
+	    _RopeLeaf* __r = (_RopeLeaf*) __right;
+	    return lexicographical_compare_3way(
+			__l->_M_data, __l->_M_data + __left_len,
+			__r->_M_data, __r->_M_data + __right_len);
+	} else {
+	    const_iterator __rstart(__right, 0);
+	    const_iterator __rend(__right, __right_len);
+	    return lexicographical_compare_3way(
+			__l->_M_data, __l->_M_data + __left_len,
+			__rstart, __rend);
+	}
+    } else {
+	const_iterator __lstart(__left, 0);
+	const_iterator __lend(__left, __left_len);
+	if (_RopeRep::_S_leaf == __right->_M_tag) {
+	    _RopeLeaf* __r = (_RopeLeaf*) __right;
+	    return lexicographical_compare_3way(
+				   __lstart, __lend,
+				   __r->_M_data, __r->_M_data + __right_len);
+	} else {
+	    const_iterator __rstart(__right, 0);
+	    const_iterator __rend(__right, __right_len);
+	    return lexicographical_compare_3way(
+				   __lstart, __lend,
+				   __rstart, __rend);
+	}
+    }
+}
+
+// Assignment to reference proxies.
+template <class _CharT, class _Alloc>
+_Rope_char_ref_proxy<_CharT, _Alloc>&
+_Rope_char_ref_proxy<_CharT, _Alloc>::operator= (_CharT __c) {
+    _RopeRep* __old = _M_root->_M_tree_ptr._M_data;
+#   ifndef __GC
+	// First check for the case in which everything is uniquely
+	// referenced.  In that case we can do this destructively.
+	_CharT* __ptr = _My_rope::_S_fetch_ptr(__old, _M_pos);
+	if (0 != __ptr) {
+	    *__ptr = __c;
+	    return *this;
+	}
+#   endif
+    _Self_destruct_ptr __left(
+      _My_rope::_S_substring(__old, 0, _M_pos));
+    _Self_destruct_ptr __right(
+      _My_rope::_S_substring(__old, _M_pos+1, __old->_M_size._M_data));
+    _Self_destruct_ptr __result_left(
+      _My_rope::_S_destr_concat_char_iter(__left, &__c, 1));
+
+#   ifndef __GC
+      _STLP_ASSERT(__left == __result_left || 1 == __result_left->_M_ref_count)
+#   endif
+    _RopeRep* __result =
+      _My_rope::_S_concat_rep(__result_left, __right);
+#   ifndef __GC
+      _STLP_ASSERT(1 <= __result->_M_ref_count)
+      _RopeRep::_S_unref(__old);
+#   endif
+    _M_root->_M_tree_ptr._M_data = __result;
+    return *this;
+}
+
+template <class _CharT, class _Alloc>
+_Rope_char_ptr_proxy<_CharT, _Alloc>
+_Rope_char_ref_proxy<_CharT, _Alloc>::operator& () const {
+    return _Rope_char_ptr_proxy<_CharT, _Alloc>(*this);
+}
+
+# if ( _STLP_STATIC_TEMPLATE_DATA > 0 )
+template<class _CharT, class _Alloc>
+_CharT rope<_CharT,_Alloc>::_S_empty_c_str[1] = { _CharT() };
+# else
+__DECLARE_INSTANCE(char, crope::_S_empty_c_str[1], ={0});
+# ifdef _STLP_HAS_WCHAR_T
+__DECLARE_INSTANCE(wchar_t, wrope::_S_empty_c_str[1], ={0});
+# endif /* _STLP_HAS_WCHAR_T */
+# endif /* _STLP_STATIC_TEMPLATE_DATA */
+// # endif
+
+template<class _CharT, class _Alloc>
+const _CharT* rope<_CharT,_Alloc>::c_str() const {
+    if (0 == _M_tree_ptr._M_data) {
+        _S_empty_c_str[0] = _S_eos((_CharT*)0);  // Possibly redundant,
+					     // but probably fast.
+        return _S_empty_c_str;
+    }
+    __GC_CONST _CharT* __old_c_string = _M_tree_ptr._M_data->_M_c_string;
+    if (0 != __old_c_string) return(__old_c_string);
+    size_t __s = size();
+   _CharT* __result = _STLP_CREATE_ALLOCATOR(allocator_type,(const allocator_type&)_M_tree_ptr, _CharT).allocate(__s + 1);
+    _S_flatten(_M_tree_ptr._M_data, __result);
+    __result[__s] = _S_eos((_CharT*)0);
+#   ifdef __GC
+	_M_tree_ptr._M_data->_M_c_string = __result;
+#   else
+      if ((__old_c_string = (__GC_CONST _CharT*)
+	   _Atomic_swap((__stl_atomic_t *)(&(_M_tree_ptr._M_data->_M_c_string)),
+			(__stl_atomic_t)__result)) != 0) {
+	// It must have been added in the interim.  Hence it had to have been
+	// separately allocated.  Deallocate the old copy, since we just
+	// replaced it.
+	_STLP_STD::_Destroy(__old_c_string, __old_c_string + __s + 1);
+      _STLP_CREATE_ALLOCATOR(allocator_type,(const allocator_type&)_M_tree_ptr, _CharT).deallocate(__old_c_string, __s + 1);
+      }
+#   endif
+    return(__result);
+}
+
+template<class _CharT, class _Alloc>
+const _CharT* rope<_CharT,_Alloc>::replace_with_c_str() {
+    if (0 == _M_tree_ptr._M_data) {
+        _S_empty_c_str[0] = _S_eos((_CharT*)0);
+        return _S_empty_c_str;
+    }
+    __GC_CONST _CharT* __old_c_string = _M_tree_ptr._M_data->_M_c_string;
+    if (_RopeRep::_S_leaf == _M_tree_ptr._M_data->_M_tag && 0 != __old_c_string) {
+	return(__old_c_string);
+    }
+    size_t __s = size();
+    _CharT* __result = _M_tree_ptr.allocate(_S_rounded_up_size(__s));
+    _S_flatten(_M_tree_ptr._M_data, __result);
+    __result[__s] = _S_eos((_CharT*)0);
+    _M_tree_ptr._M_data->_M_unref_nonnil();
+    _M_tree_ptr._M_data = _S_new_RopeLeaf(__result, __s, get_allocator());
+    return(__result);
+}
+
+// Algorithm specializations.  More should be added.
+
+#ifndef _STLP_MSVC
+// I couldn't get this to work with VC++
+template<class _CharT,class _Alloc>
+void
+_Rope_rotate(_Rope_iterator<_CharT,_Alloc> __first,
+              _Rope_iterator<_CharT,_Alloc> __middle,
+              _Rope_iterator<_CharT,_Alloc> __last)
+{
+    _STLP_ASSERT(__first.container() == __middle.container()
+                 && __middle.container() == __last.container())
+    rope<_CharT,_Alloc>& __r(__first.container());
+    rope<_CharT,_Alloc> __prefix = __r.substr(0, __first.index());
+    rope<_CharT,_Alloc> __suffix = 
+      __r.substr(__last.index(), __r.size() - __last.index());
+    rope<_CharT,_Alloc> __part1 = 
+      __r.substr(__middle.index(), __last.index() - __middle.index());
+    rope<_CharT,_Alloc> __part2 = 
+      __r.substr(__first.index(), __middle.index() - __first.index());
+    __r = __prefix;
+    __r += __part1;
+    __r += __part2;
+    __r += __suffix;
+}
+
+
+# if 0
+// Probably not useful for several reasons:
+// - for SGIs 7.1 compiler and probably some others,
+//   this forces lots of rope<wchar_t, ...> instantiations, creating a
+//   code bloat and compile time problem.  (Fixed in 7.2.)
+// - wchar_t is 4 bytes wide on most UNIX platforms, making it unattractive
+//   for unicode strings.  Unsigned short may be a better character
+//   type.
+inline void rotate(
+		_Rope_iterator<wchar_t,_STLP_DEFAULT_ALLOCATOR(char) > __first,
+                _Rope_iterator<wchar_t,_STLP_DEFAULT_ALLOCATOR(char) > __middle,
+                _Rope_iterator<wchar_t,_STLP_DEFAULT_ALLOCATOR(char) > __last) {
+    _Rope_rotate(__first, __middle, __last);
+}
+# endif
+#endif /* _STLP_MSVC */
+
+#   undef __RopeLeaf__ 
+#   undef __RopeRep__ 
+#   undef __RopeLeaf 
+#   undef __RopeRep 
+#   undef size_type
+
+_STLP_END_NAMESPACE
+
+# endif /* ROPEIMPL_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_rope.h b/main/source/stlport/stlport/stl/_rope.h
new file mode 100644
index 00000000..3e73c52c
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_rope.h
@@ -0,0 +1,2518 @@
+/*
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+// rope<_CharT,_Alloc> is a sequence of _CharT.
+// Ropes appear to be mutable, but update operations
+// really copy enough of the data structure to leave the original
+// valid.  Thus ropes can be logically copied by just copying
+// a pointer value.
+
+#ifndef _STLP_INTERNAL_ROPE_H
+# define _STLP_INTERNAL_ROPE_H
+
+# ifndef _STLP_INTERNAL_ALGOBASE_H
+#  include <stl/_algobase.h>
+# endif
+
+# ifndef _STLP_IOSFWD
+#  include <iosfwd>
+# endif
+
+# ifndef _STLP_INTERNAL_ALLOC_H
+#  include <stl/_alloc.h>
+# endif
+
+# ifndef _STLP_INTERNAL_ITERATOR_H
+#  include <stl/_iterator.h>
+# endif
+
+# ifndef _STLP_INTERNAL_ALGO_H
+#  include <stl/_algo.h>
+# endif
+
+# ifndef _STLP_INTERNAL_FUNCTION_H
+#  include <stl/_function.h>
+# endif
+
+# ifndef _STLP_INTERNAL_NUMERIC_H
+#  include <stl/_numeric.h>
+# endif
+
+# ifndef _STLP_INTERNAL_HASH_FUN_H
+#  include <stl/_hash_fun.h>
+# endif
+
+# ifdef __GC
+#   define __GC_CONST const
+# else
+# include <stl/_threads.h>
+#   define __GC_CONST   // constant except for deallocation
+# endif
+# ifdef _STLP_SGI_THREADS
+#    include <mutex.h>
+# endif
+
+#ifdef _STLP_USE_NESTED_TCLASS_THROUGHT_TPARAM 
+#  define _STLP_CREATE_ALLOCATOR(__atype,__a, _Tp) (_Alloc_traits<_Tp,__atype>::create_allocator(__a)) 
+#elif defined(__MRC__)||defined(__SC__) 
+#  define _STLP_CREATE_ALLOCATOR(__atype,__a, _Tp) __stl_alloc_create<_Tp,__atype>(__a,(_Tp*)0) 
+#else 
+#  define _STLP_CREATE_ALLOCATOR(__atype,__a, _Tp) __stl_alloc_create(__a,(_Tp*)0) 
+#endif 
+
+_STLP_BEGIN_NAMESPACE
+
+// First a lot of forward declarations.  The standard seems to require
+// much stricter "declaration before use" than many of the implementations
+// that preceded it.
+template<class _CharT, _STLP_DEFAULT_ALLOCATOR_SELECT(_CharT) > class rope;
+template<class _CharT, class _Alloc> struct _Rope_RopeConcatenation;
+template<class _CharT, class _Alloc> struct _Rope_RopeRep;
+template<class _CharT, class _Alloc> struct _Rope_RopeLeaf;
+template<class _CharT, class _Alloc> struct _Rope_RopeFunction;
+template<class _CharT, class _Alloc> struct _Rope_RopeSubstring;
+template<class _CharT, class _Alloc> class _Rope_iterator;
+template<class _CharT, class _Alloc> class _Rope_const_iterator;
+template<class _CharT, class _Alloc> class _Rope_char_ref_proxy;
+template<class _CharT, class _Alloc> class _Rope_char_ptr_proxy;
+
+// Some helpers, so we can use power on ropes.
+// See below for why this isn't local to the implementation.
+
+// This uses a nonstandard refcount convention.
+// The result has refcount 0.
+template<class _CharT, class _Alloc>
+struct _Rope_Concat_fn
+  : public binary_function<rope<_CharT,_Alloc>, rope<_CharT,_Alloc>,
+  rope<_CharT,_Alloc> > {
+  rope<_CharT,_Alloc> operator() (const rope<_CharT,_Alloc>& __x,
+                                  const rope<_CharT,_Alloc>& __y) {
+    return __x + __y;
+  }
+};
+
+template <class _CharT, class _Alloc>
+inline
+rope<_CharT,_Alloc>
+__identity_element(_Rope_Concat_fn<_CharT, _Alloc>)
+{
+  return rope<_CharT,_Alloc>();
+}
+
+// The _S_eos function is used for those functions that
+// convert to/from C-like strings to detect the end of the string.
+
+// The end-of-C-string character.
+// This is what the draft standard says it should be.
+template <class _CharT>
+inline _CharT _S_eos(_CharT*) { return _CharT(); }
+
+// fbp : some compilers fail to zero-initialize builtins ;(
+inline const char _S_eos(const char*) { return 0; }
+# ifdef _STLP_HAS_WCHAR_T
+inline const wchar_t _S_eos(const wchar_t*) { return 0; }
+# endif
+
+// Test for basic character types.
+// For basic character types leaves having a trailing eos.
+template <class _CharT>
+inline bool _S_is_basic_char_type(_CharT*) { return false; }
+template <class _CharT>
+inline bool _S_is_one_byte_char_type(_CharT*) { return false; }
+
+inline bool _S_is_basic_char_type(char*) { return true; }
+inline bool _S_is_one_byte_char_type(char*) { return true; }
+# ifdef _STLP_HAS_WCHAR_T
+inline bool _S_is_basic_char_type(wchar_t*) { return true; }
+# endif
+
+// Store an eos iff _CharT is a basic character type.
+// Do not reference _S_eos if it isn't.
+template <class _CharT>
+inline void _S_cond_store_eos(_CharT&) {}
+
+inline void _S_cond_store_eos(char& __c) { __c = 0; }
+# ifdef _STLP_HAS_WCHAR_T
+inline void _S_cond_store_eos(wchar_t& __c) { __c = 0; }
+# endif
+
+// char_producers are logically functions that generate a section of
+// a string.  These can be convereted to ropes.  The resulting rope
+// invokes the char_producer on demand.  This allows, for example,
+// files to be viewed as ropes without reading the entire file.
+template <class _CharT>
+class char_producer {
+public:
+  virtual ~char_producer() {};
+  virtual void operator()(size_t __start_pos, size_t __len, 
+                          _CharT* __buffer) = 0;
+  // Buffer should really be an arbitrary output iterator.
+  // That way we could flatten directly into an ostream, etc.
+  // This is thoroughly impossible, since iterator types don't
+  // have runtime descriptions.
+};
+
+// Sequence buffers:
+//
+// Sequence must provide an append operation that appends an
+// array to the sequence.  Sequence buffers are useful only if
+// appending an entire array is cheaper than appending element by element.
+// This is true for many string representations.
+// This should  perhaps inherit from ostream<sequence::value_type>
+// and be implemented correspondingly, so that they can be used
+// for formatted.  For the sake of portability, we don't do this yet.
+//
+// For now, sequence buffers behave as output iterators.  But they also
+// behave a little like basic_ostringstream<sequence::value_type> and a
+// little like containers.
+
+template<class _Sequence
+# if !(defined (_STLP_NON_TYPE_TMPL_PARAM_BUG) || \
+       defined ( _STLP_NO_DEFAULT_NON_TYPE_PARAM ))
+, size_t _Buf_sz = 100
+#   if defined(__sgi) && !defined(__GNUC__)
+#	 define __TYPEDEF_WORKAROUND
+,class _V = typename _Sequence::value_type
+#   endif /* __sgi */
+# endif /* _STLP_NON_TYPE_TMPL_PARAM_BUG */
+>
+// The 3rd parameter works around a common compiler bug.
+class sequence_buffer : public iterator <output_iterator_tag, void, void, void, void> {
+public:
+#       ifndef __TYPEDEF_WORKAROUND
+  typedef typename _Sequence::value_type value_type;
+  typedef sequence_buffer<_Sequence
+# if !(defined (_STLP_NON_TYPE_TMPL_PARAM_BUG) || \
+       defined ( _STLP_NO_DEFAULT_NON_TYPE_PARAM ))
+  , _Buf_sz
+  > _Self;
+# else /* _STLP_NON_TYPE_TMPL_PARAM_BUG */
+  > _Self;
+  enum { _Buf_sz = 100}; 
+# endif /* _STLP_NON_TYPE_TMPL_PARAM_BUG */
+  // # endif
+#	else /* __TYPEDEF_WORKAROUND */
+  typedef _V value_type;
+  typedef sequence_buffer<_Sequence, _Buf_sz, _V> _Self;
+#	endif /* __TYPEDEF_WORKAROUND */
+protected:
+  _Sequence* _M_prefix;
+  value_type _M_buffer[_Buf_sz];
+  size_t     _M_buf_count;
+public:
+  void flush() {
+    _M_prefix->append(_M_buffer, _M_buffer + _M_buf_count);
+    _M_buf_count = 0;
+  }
+  ~sequence_buffer() { flush(); }
+  sequence_buffer() : _M_prefix(0), _M_buf_count(0) {}
+  sequence_buffer(const _Self& __x) {
+    _M_prefix = __x._M_prefix;
+    _M_buf_count = __x._M_buf_count;
+    copy(__x._M_buffer, __x._M_buffer + __x._M_buf_count, _M_buffer);
+  }
+  sequence_buffer(_Self& __x) {
+    __x.flush();
+    _M_prefix = __x._M_prefix;
+    _M_buf_count = 0;
+  }
+  sequence_buffer(_Sequence& __s) : _M_prefix(&__s), _M_buf_count(0) {}
+  _Self& operator= (_Self& __x) {
+    __x.flush();
+    _M_prefix = __x._M_prefix;
+    _M_buf_count = 0;
+    return *this;
+  }
+  _Self& operator= (const _Self& __x) {
+    _M_prefix = __x._M_prefix;
+    _M_buf_count = __x._M_buf_count;
+    copy(__x._M_buffer, __x._M_buffer + __x._M_buf_count, _M_buffer);
+    return *this;
+  }
+  void push_back(value_type __x)
+  {
+    if (_M_buf_count < _Buf_sz) {
+      _M_buffer[_M_buf_count] = __x;
+      ++_M_buf_count;
+    } else {
+      flush();
+      _M_buffer[0] = __x;
+      _M_buf_count = 1;
+    }
+  }
+  void append(value_type* __s, size_t __len)
+  {
+    if (__len + _M_buf_count <= _Buf_sz) {
+      size_t __i = _M_buf_count;
+      size_t __j = 0;
+      for (; __j < __len; __i++, __j++) {
+        _M_buffer[__i] = __s[__j];
+      }
+      _M_buf_count += __len;
+    } else if (0 == _M_buf_count) {
+      _M_prefix->append(__s, __s + __len);
+    } else {
+      flush();
+      append(__s, __len);
+    }
+  }
+  _Self& write(value_type* __s, size_t __len)
+  {
+    append(__s, __len);
+    return *this;
+  }
+  _Self& put(value_type __x)
+  {
+    push_back(__x);
+    return *this;
+  }
+  _Self& operator=(const value_type& __rhs)
+  {
+    push_back(__rhs);
+    return *this;
+  }
+  _Self& operator*() { return *this; }
+  _Self& operator++() { return *this; }
+  _Self& operator++(int) { return *this; }
+};
+
+// The following should be treated as private, at least for now.
+template<class _CharT>
+class _Rope_char_consumer {
+public:
+  // If we had member templates, these should not be virtual.
+  // For now we need to use run-time parametrization where
+  // compile-time would do.  _Hence this should all be private
+  // for now.
+  // The symmetry with char_producer is accidental and temporary.
+  virtual ~_Rope_char_consumer() {};
+  virtual bool operator()(const _CharT* __buffer, size_t __len) = 0;
+};
+
+//
+// What follows should really be local to rope.  Unfortunately,
+// that doesn't work, since it makes it impossible to define generic
+// equality on rope iterators.  According to the draft standard, the
+// template parameters for such an equality operator cannot be inferred
+// from the occurence of a member class as a parameter.
+// (SGI compilers in fact allow this, but the __result wouldn't be
+// portable.)
+// Similarly, some of the static member functions are member functions
+// only to avoid polluting the global namespace, and to circumvent
+// restrictions on type inference for template functions.
+//
+
+//
+// The internal data structure for representing a rope.  This is
+// private to the implementation.  A rope is really just a pointer
+// to one of these.
+//
+// A few basic functions for manipulating this data structure
+// are members of _RopeRep.  Most of the more complex algorithms
+// are implemented as rope members.
+//
+// Some of the static member functions of _RopeRep have identically
+// named functions in rope that simply invoke the _RopeRep versions.
+//
+// A macro to introduce various allocation and deallocation functions
+// These need to be defined differently depending on whether or not
+// we are using standard conforming allocators, and whether the allocator
+// instances have real state.  Thus this macro is invoked repeatedly
+// with different definitions of __ROPE_DEFINE_ALLOC.
+
+#if defined (_STLP_MEMBER_TEMPLATE_CLASSES)
+# define __ROPE_DEFINE_ALLOC(_Tp, __name, _M_proxy) \
+        typedef typename \
+          _Alloc_traits<_Tp,_Alloc>::allocator_type __name##Allocator;
+
+#define __ROPE_DEFINE_ALLOCS(__a, _M_proxy) \
+        __ROPE_DEFINE_ALLOC(_CharT,_Data, _M_proxy) /* character data */ \
+        typedef _Rope_RopeConcatenation<_CharT,__a> __C; \
+        __ROPE_DEFINE_ALLOC(__C,_C, _M_proxy) \
+        typedef _Rope_RopeLeaf<_CharT,__a> __L; \
+        __ROPE_DEFINE_ALLOC(__L,_L, _M_proxy) \
+        typedef _Rope_RopeFunction<_CharT,__a> __F; \
+        __ROPE_DEFINE_ALLOC(__F,_F, _M_proxy) \
+        typedef _Rope_RopeSubstring<_CharT,__a> __S; \
+        __ROPE_DEFINE_ALLOC(__S,_S,_M_proxy)
+#else
+#define __ROPE_DEFINE_ALLOC(_Tp, __name, _M_proxy) 
+#define __ROPE_DEFINE_ALLOCS(__a, _M_proxy)
+#endif
+
+
+template<class _CharT, class _Alloc>
+struct _Rope_RopeRep
+# ifndef __GC
+  : public _Refcount_Base
+# endif
+{
+  typedef _Rope_RopeRep<_CharT, _Alloc> _Self;
+public:
+#  define __ROPE_MAX_DEPTH  45
+#  define __ROPE_DEPTH_SIZE 46
+  enum { _S_max_rope_depth = __ROPE_MAX_DEPTH };
+  enum _Tag {_S_leaf, _S_concat, _S_substringfn, _S_function};
+  // Apparently needed by VC++
+  // The data fields of leaves are allocated with some
+  // extra space, to accomodate future growth and for basic
+  // character types, to hold a trailing eos character.
+  enum { _S_alloc_granularity = 8 };
+
+  
+  _Tag _M_tag:8;
+  bool _M_is_balanced:8;
+
+  _STLP_FORCE_ALLOCATORS(_CharT, _Alloc)
+  typedef typename _Alloc_traits<_CharT,_Alloc>::allocator_type
+  allocator_type;
+  
+  allocator_type get_allocator() const { return allocator_type(_M_size);  }
+
+  unsigned char _M_depth;
+  __GC_CONST _CharT* _M_c_string;
+  _STLP_alloc_proxy<size_t, _CharT, allocator_type> _M_size;
+
+# ifdef _STLP_NO_ARROW_OPERATOR
+  _Rope_RopeRep() : _Refcount_Base(1), _M_size(allocator_type(), 0) {}
+# endif
+
+  /* Flattened version of string, if needed.  */
+  /* typically 0.                             */
+  /* If it's not 0, then the memory is owned  */
+  /* by this node.                            */
+  /* In the case of a leaf, this may point to */
+  /* the same memory as the data field.       */
+  _Rope_RopeRep(_Tag __t, int __d, bool __b, size_t _p_size,
+                allocator_type __a) :
+#         ifndef __GC
+    _Refcount_Base(1),
+#	  endif
+    _M_tag(__t), _M_is_balanced(__b), _M_depth(__d), _M_c_string(0), _M_size(__a, _p_size)
+  { }
+#   ifdef __GC
+  void _M_incr () {}
+#   endif
+
+  // fbp : moved from RopeLeaf
+  static size_t _S_rounded_up_size(size_t __n) {
+    size_t __size_with_eos;
+    
+    if (_S_is_basic_char_type((_CharT*)0)) {
+      __size_with_eos = __n + 1;
+    } else {
+      __size_with_eos = __n;
+    }
+#       ifdef __GC
+    return __size_with_eos;
+#       else
+    // Allow slop for in-place expansion.
+    return (__size_with_eos + _S_alloc_granularity-1)
+      &~ (_S_alloc_granularity-1);
+#       endif
+  }
+
+  static void _S_free_string(__GC_CONST _CharT* __s, size_t __len,
+                             allocator_type __a) {
+
+    if (!_S_is_basic_char_type((_CharT*)0)) {
+      _STLP_STD::_Destroy(__s, __s + __len);
+    }
+    //  This has to be a static member, so this gets a bit messy
+#   ifdef _STLP_USE_NESTED_TCLASS_THROUGHT_TPARAM
+    __a.deallocate(__s, _S_rounded_up_size(__len));		//*ty 03/24/2001 - restored not to use __stl_alloc_rebind() since it is not defined under _STLP_MEMBER_TEMPLATE_CLASSES
+#   else
+    __stl_alloc_rebind (__a, (_CharT*)0).deallocate(__s, _S_rounded_up_size(__len));
+#   endif
+  }
+  
+  // Deallocate data section of a leaf.
+  // This shouldn't be a member function.
+  // But its hard to do anything else at the
+  // moment, because it's templatized w.r.t.
+  // an allocator.
+  // Does nothing if __GC is defined.
+#   ifndef __GC
+  void _M_free_c_string();
+  void _M_free_tree();
+  // Deallocate t. Assumes t is not 0.
+  void _M_unref_nonnil()
+  {
+    _M_decr(); if (!_M_ref_count) _M_free_tree();
+  }
+  void _M_ref_nonnil()
+  {
+    _M_incr();
+  }
+  static void _S_unref(_Self* __t)
+  {
+    if (0 != __t) {
+      __t->_M_unref_nonnil();
+    }
+  }
+  static void _S_ref(_Self* __t)
+  {
+    if (0 != __t) __t->_M_incr();
+  }
+  static void _S_free_if_unref(_Self* __t)
+  {
+    if (0 != __t && 0 == __t->_M_ref_count) __t->_M_free_tree();
+  }
+#   else /* __GC */
+  void _M_unref_nonnil() {}
+  void _M_ref_nonnil() {}
+  static void _S_unref(_Self*) {}
+  static void _S_ref(_Self*) {}
+  static void _S_free_if_unref(_Self*) {}
+#   endif
+
+  __ROPE_DEFINE_ALLOCS(_Alloc, _M_size)
+    };
+
+template<class _CharT, class _Alloc>
+struct _Rope_RopeLeaf : public _Rope_RopeRep<_CharT,_Alloc> {
+public:
+  __GC_CONST _CharT* _M_data; /* Not necessarily 0 terminated. */
+                                /* The allocated size is         */
+                                /* _S_rounded_up_size(size), except */
+                                /* in the GC case, in which it   */
+                                /* doesn't matter.               */
+  _STLP_FORCE_ALLOCATORS(_CharT, _Alloc)
+  typedef typename _Rope_RopeRep<_CharT,_Alloc>::allocator_type allocator_type;
+  _Rope_RopeLeaf(__GC_CONST _CharT* __d, size_t _p_size, allocator_type __a)
+    : _Rope_RopeRep<_CharT,_Alloc>(_Rope_RopeRep<_CharT,_Alloc>::_S_leaf, 0, true, _p_size, __a), 
+    _M_data(__d)
+  {
+    _STLP_ASSERT(_p_size > 0)
+    if (_S_is_basic_char_type((_CharT *)0)) {
+      // already eos terminated.
+      this->_M_c_string = __d;
+    }
+  }
+
+# ifdef _STLP_NO_ARROW_OPERATOR
+  _Rope_RopeLeaf() {}
+  _Rope_RopeLeaf(const _Rope_RopeLeaf<_CharT, _Alloc>& ) {}
+# endif
+  
+// The constructor assumes that d has been allocated with
+  // the proper allocator and the properly padded size.
+  // In contrast, the destructor deallocates the data:
+# ifndef __GC
+  ~_Rope_RopeLeaf() {
+    if (_M_data != this->_M_c_string) {
+      this->_M_free_c_string();
+    }
+    _S_free_string(_M_data, this->_M_size._M_data, this->get_allocator());
+  }
+# endif
+};
+
+template<class _CharT, class _Alloc>
+struct _Rope_RopeConcatenation : public _Rope_RopeRep<_CharT,_Alloc> {
+public:
+  _Rope_RopeRep<_CharT,_Alloc>* _M_left;
+  _Rope_RopeRep<_CharT,_Alloc>* _M_right;
+  _STLP_FORCE_ALLOCATORS(_CharT, _Alloc)
+  typedef typename _Rope_RopeRep<_CharT,_Alloc>::allocator_type allocator_type;
+  _Rope_RopeConcatenation(_Rope_RopeRep<_CharT,_Alloc>* __l,
+                          _Rope_RopeRep<_CharT,_Alloc>* __r,
+                          allocator_type __a)
+    :   _Rope_RopeRep<_CharT,_Alloc>(
+                                     _Rope_RopeRep<_CharT,_Alloc>::_S_concat, 
+				     (max)(__l->_M_depth, __r->_M_depth) + 1, false,
+                                     __l->_M_size._M_data + __r->_M_size._M_data, __a), _M_left(__l), _M_right(__r)
+  {}
+# ifdef _STLP_NO_ARROW_OPERATOR
+  _Rope_RopeConcatenation() {}
+  _Rope_RopeConcatenation(const _Rope_RopeConcatenation<_CharT, _Alloc>&) {}
+# endif
+
+# ifndef __GC
+  ~_Rope_RopeConcatenation() {
+    this->_M_free_c_string();
+    _M_left->_M_unref_nonnil();
+    _M_right->_M_unref_nonnil();
+  }
+# endif
+};
+
+template<class _CharT, class _Alloc>
+struct _Rope_RopeFunction : public _Rope_RopeRep<_CharT,_Alloc> {
+public:
+  char_producer<_CharT>* _M_fn;
+#   ifndef __GC
+  bool _M_delete_when_done; // Char_producer is owned by the
+                                // rope and should be explicitly
+                                // deleted when the rope becomes
+                                // inaccessible.
+#   else
+  // In the GC case, we either register the rope for
+  // finalization, or not.  Thus the field is unnecessary;
+  // the information is stored in the collector data structures.
+  // We do need a finalization procedure to be invoked by the
+  // collector.
+  static void _S_fn_finalization_proc(void * __tree, void *) {
+    delete ((_Rope_RopeFunction *)__tree) -> _M_fn;
+  }
+#   endif
+  _STLP_FORCE_ALLOCATORS(_CharT, _Alloc)
+  typedef typename _Rope_RopeRep<_CharT,_Alloc>::allocator_type allocator_type;
+# ifdef _STLP_NO_ARROW_OPERATOR
+  _Rope_RopeFunction() {}
+  _Rope_RopeFunction(const _Rope_RopeFunction<_CharT, _Alloc>& ) {}
+# endif
+
+  _Rope_RopeFunction(char_producer<_CharT>* __f, size_t _p_size,
+                     bool __d, allocator_type __a)
+    :
+    _Rope_RopeRep<_CharT,_Alloc>(_Rope_RopeRep<_CharT,_Alloc>::_S_function, 0, true, _p_size, __a),
+    _M_fn(__f)
+#       ifndef __GC
+    , _M_delete_when_done(__d)
+#       endif
+  {
+    _STLP_ASSERT(_p_size > 0)
+#       ifdef __GC
+    if (__d) {
+      GC_REGISTER_FINALIZER(
+                            this, _Rope_RopeFunction::_S_fn_finalization_proc, 0, 0, 0);
+    }
+#       endif
+  }
+# ifndef __GC
+  ~_Rope_RopeFunction() {
+    this->_M_free_c_string();
+    if (_M_delete_when_done) {
+      delete _M_fn;
+    }
+  }
+# endif
+};
+// Substring results are usually represented using just
+// concatenation nodes.  But in the case of very long flat ropes
+// or ropes with a functional representation that isn't practical.
+// In that case, we represent the __result as a special case of
+// RopeFunction, whose char_producer points back to the rope itself.
+// In all cases except repeated substring operations and
+// deallocation, we treat the __result as a RopeFunction.
+template<class _CharT, class _Alloc>
+# if  ( defined (__IBMCPP__) && (__IBMCPP__ == 500) )  // JFA 10-Aug-2000 for some reason xlC cares about the order
+struct _Rope_RopeSubstring : public char_producer<_CharT> , public _Rope_RopeFunction<_CharT,_Alloc>
+# else
+struct _Rope_RopeSubstring : public _Rope_RopeFunction<_CharT,_Alloc>,
+                             public char_producer<_CharT>
+# endif
+{
+public:
+  // XXX this whole class should be rewritten.
+  typedef _Rope_RopeRep<_CharT,_Alloc> _Base;
+  _Rope_RopeRep<_CharT,_Alloc>* _M_base;      // not 0
+  size_t _M_start;
+  virtual void operator()(size_t __start_pos, size_t __req_len,
+                          _CharT* __buffer) {
+    switch(_M_base->_M_tag) {
+    case _Base::_S_function:
+    case _Base::_S_substringfn:
+      {
+        char_producer<_CharT>* __fn =
+          ((_Rope_RopeFunction<_CharT,_Alloc>*)_M_base)->_M_fn;
+        _STLP_ASSERT(__start_pos + __req_len <= this->_M_size._M_data)
+        _STLP_ASSERT(_M_start + this->_M_size._M_data <= _M_base->_M_size._M_data)
+        (*__fn)(__start_pos + _M_start, __req_len, __buffer);
+      }
+      break;
+    case _Base::_S_leaf:
+      {
+        __GC_CONST _CharT* __s =
+          ((_Rope_RopeLeaf<_CharT,_Alloc>*)_M_base)->_M_data;
+        uninitialized_copy_n(__s + __start_pos + _M_start, __req_len,
+                             __buffer);
+      }
+      break;
+    default:
+      _STLP_ASSERT(false)
+        ;
+    }
+  }
+
+  _STLP_FORCE_ALLOCATORS(_CharT, _Alloc)
+  typedef typename _Rope_RopeRep<_CharT,_Alloc>::allocator_type allocator_type;
+
+  _Rope_RopeSubstring(_Rope_RopeRep<_CharT,_Alloc>* __b, size_t __s,
+                      size_t __l, allocator_type __a)
+    : _Rope_RopeFunction<_CharT,_Alloc>(this, __l, false, __a),
+	_M_base(__b),
+    _M_start(__s)
+       
+  {
+    _STLP_ASSERT(__l > 0)
+    _STLP_ASSERT(__s + __l <= __b->_M_size._M_data)
+#       ifndef __GC
+    _M_base->_M_ref_nonnil();
+#       endif
+    this->_M_tag = _Base::_S_substringfn;
+  }
+  virtual ~_Rope_RopeSubstring()
+  { 
+#       ifndef __GC
+    _M_base->_M_unref_nonnil();
+#       endif
+  }
+};
+
+// Self-destructing pointers to Rope_rep.
+// These are not conventional smart pointers.  Their
+// only purpose in life is to ensure that unref is called
+// on the pointer either at normal exit or if an exception
+// is raised.  It is the caller's responsibility to
+// adjust reference counts when these pointers are initialized
+// or assigned to.  (This convention significantly reduces
+// the number of potentially expensive reference count
+// updates.)
+#ifndef __GC
+template<class _CharT, class _Alloc>
+struct _Rope_self_destruct_ptr {
+  _Rope_RopeRep<_CharT,_Alloc>* _M_ptr;
+  ~_Rope_self_destruct_ptr() 
+  { _Rope_RopeRep<_CharT,_Alloc>::_S_unref(_M_ptr); }
+#   ifdef _STLP_USE_EXCEPTIONS
+  _Rope_self_destruct_ptr() : _M_ptr(0) {};
+#   else
+  _Rope_self_destruct_ptr() {};
+#   endif
+  _Rope_self_destruct_ptr(_Rope_RopeRep<_CharT,_Alloc>* __p) : _M_ptr(__p) {}
+  _Rope_RopeRep<_CharT,_Alloc>& operator*() { return *_M_ptr; }
+  _Rope_RopeRep<_CharT,_Alloc>* operator->() { return _M_ptr; }
+  operator _Rope_RopeRep<_CharT,_Alloc>*() { return _M_ptr; }
+  _Rope_self_destruct_ptr<_CharT, _Alloc>& 
+  operator= (_Rope_RopeRep<_CharT,_Alloc>* __x)
+  { _M_ptr = __x; return *this; }
+};
+#endif
+
+// Dereferencing a nonconst iterator has to return something
+// that behaves almost like a reference.  It's not possible to
+// return an actual reference since assignment requires extra
+// work.  And we would get into the same problems as with the
+// CD2 version of basic_string.
+template<class _CharT, class _Alloc>
+class _Rope_char_ref_proxy {
+  typedef _Rope_char_ref_proxy<_CharT, _Alloc> _Self;
+  friend class rope<_CharT,_Alloc>;
+  friend class _Rope_iterator<_CharT,_Alloc>;
+  friend class _Rope_char_ptr_proxy<_CharT,_Alloc>;
+#   ifdef __GC
+  typedef _Rope_RopeRep<_CharT,_Alloc>* _Self_destruct_ptr;
+#   else
+  typedef _Rope_self_destruct_ptr<_CharT,_Alloc> _Self_destruct_ptr;
+#   endif
+  typedef _Rope_RopeRep<_CharT,_Alloc> _RopeRep;
+  typedef rope<_CharT,_Alloc> _My_rope;
+  size_t _M_pos;
+  _CharT _M_current;
+  bool _M_current_valid;
+  _My_rope* _M_root;     // The whole rope.
+public:
+  _Rope_char_ref_proxy(_My_rope* __r, size_t __p) :
+    _M_pos(__p), _M_current_valid(false), _M_root(__r) {}
+  _Rope_char_ref_proxy(const _Self& __x) :
+    _M_pos(__x._M_pos), _M_current_valid(false), _M_root(__x._M_root) {}
+  // Don't preserve cache if the reference can outlive the
+  // expression.  We claim that's not possible without calling
+  // a copy constructor or generating reference to a proxy
+  // reference.  We declare the latter to have undefined semantics.
+  _Rope_char_ref_proxy(_My_rope* __r, size_t __p,
+                       _CharT __c) :
+    _M_pos(__p), _M_current(__c), _M_current_valid(true), _M_root(__r) {}
+  inline operator _CharT () const;
+  _Self& operator= (_CharT __c);
+  _Rope_char_ptr_proxy<_CharT, _Alloc> operator& () const;
+  _Self& operator= (const _Self& __c) {
+    return operator=((_CharT)__c); 
+  }
+};
+
+#ifdef _STLP_FUNCTION_TMPL_PARTIAL_ORDER
+template<class _CharT, class __Alloc>
+inline void swap(_Rope_char_ref_proxy <_CharT, __Alloc > __a,
+                 _Rope_char_ref_proxy <_CharT, __Alloc > __b) {
+  _CharT __tmp = __a;
+  __a = __b;
+  __b = __tmp;
+}
+#else
+// There is no really acceptable way to handle this.  The default
+// definition of swap doesn't work for proxy references.
+// It can't really be made to work, even with ugly hacks, since
+// the only unusual operation it uses is the copy constructor, which
+// is needed for other purposes.  We provide a macro for
+// full specializations, and instantiate the most common case.
+# define _ROPE_SWAP_SPECIALIZATION(_CharT, __Alloc) \
+    inline void swap(_Rope_char_ref_proxy <_CharT, __Alloc > __a, \
+                     _Rope_char_ref_proxy <_CharT, __Alloc > __b) { \
+        _CharT __tmp = __a; \
+        __a = __b; \
+        __b = __tmp; \
+    }
+
+_ROPE_SWAP_SPECIALIZATION(char,_STLP_DEFAULT_ALLOCATOR(char) )
+
+#endif /* !_STLP_FUNCTION_TMPL_PARTIAL_ORDER */
+
+  template<class _CharT, class _Alloc>
+class _Rope_char_ptr_proxy {
+  // XXX this class should be rewritten.
+public:
+  typedef _Rope_char_ptr_proxy<_CharT, _Alloc> _Self;
+  friend class _Rope_char_ref_proxy<_CharT,_Alloc>;
+  size_t _M_pos;
+  rope<_CharT,_Alloc>* _M_root;     // The whole rope.
+
+  _Rope_char_ptr_proxy(const _Rope_char_ref_proxy<_CharT,_Alloc>& __x) 
+    : _M_pos(__x._M_pos), _M_root(__x._M_root) {}
+  _Rope_char_ptr_proxy(const _Self& __x)
+    : _M_pos(__x._M_pos), _M_root(__x._M_root) {}
+  _Rope_char_ptr_proxy() {}
+  _Rope_char_ptr_proxy(_CharT* __x) : _M_pos(0), _M_root(0) {
+    _STLP_ASSERT(0 == __x)
+  }
+  _Self& 
+  operator= (const _Self& __x) {
+    _M_pos = __x._M_pos;
+    _M_root = __x._M_root;
+    return *this;
+  }
+
+  _Rope_char_ref_proxy<_CharT,_Alloc> operator*() const {
+    return _Rope_char_ref_proxy<_CharT,_Alloc>(_M_root, _M_pos);
+  }
+};
+
+
+// Rope iterators:
+// Unlike in the C version, we cache only part of the stack
+// for rope iterators, since they must be efficiently copyable.
+// When we run out of cache, we have to reconstruct the iterator
+// value.
+// Pointers from iterators are not included in reference counts.
+// Iterators are assumed to be thread private.  Ropes can
+// be shared.
+
+template<class _CharT, class _Alloc>
+class _Rope_iterator_base
+/*   : public random_access_iterator<_CharT, ptrdiff_t>  */
+{
+  friend class rope<_CharT,_Alloc>;
+  typedef _Rope_iterator_base<_CharT, _Alloc> _Self;
+public:
+  typedef _Rope_RopeRep<_CharT,_Alloc> _RopeRep;
+  // Borland doesnt want this to be protected.
+  //  protected:
+  enum { _S_path_cache_len = 4 }; // Must be <= 9.
+  enum { _S_iterator_buf_len = 15 };
+  size_t _M_current_pos;
+  _RopeRep* _M_root;     // The whole rope.
+  size_t _M_leaf_pos;    // Starting position for current leaf
+  __GC_CONST _CharT* _M_buf_start;
+  // Buffer possibly
+  // containing current char.
+  __GC_CONST _CharT* _M_buf_ptr;
+  // Pointer to current char in buffer.
+  // != 0 ==> buffer valid.
+  __GC_CONST _CharT* _M_buf_end;
+  // One past __last valid char in buffer.
+  // What follows is the path cache.  We go out of our
+  // way to make this compact.
+  // Path_end contains the bottom section of the path from
+  // the root to the current leaf.
+  const _RopeRep* _M_path_end[_S_path_cache_len];
+  int _M_leaf_index;     // Last valid __pos in path_end;
+  // _M_path_end[0] ... _M_path_end[leaf_index-1]
+  // point to concatenation nodes.
+  unsigned char _M_path_directions;
+  // (path_directions >> __i) & 1 is 1
+  // iff we got from _M_path_end[leaf_index - __i - 1]
+  // to _M_path_end[leaf_index - __i] by going to the
+  // __right. Assumes path_cache_len <= 9.
+  _CharT _M_tmp_buf[_S_iterator_buf_len];
+  // Short buffer for surrounding chars.
+  // This is useful primarily for 
+  // RopeFunctions.  We put the buffer
+  // here to avoid locking in the
+  // multithreaded case.
+  // The cached path is generally assumed to be valid
+  // only if the buffer is valid.
+  static void _S_setbuf(_Rope_iterator_base<_CharT, _Alloc>& __x);
+  // Set buffer contents given
+  // path cache.
+  static void _S_setcache(_Rope_iterator_base<_CharT, _Alloc>& __x);
+  // Set buffer contents and
+  // path cache.
+  static void _S_setcache_for_incr(_Rope_iterator_base<_CharT, _Alloc>& __x);
+  // As above, but assumes path
+  // cache is valid for previous posn.
+  _Rope_iterator_base() {}
+  _Rope_iterator_base(_RopeRep* __root, size_t __pos)
+    : _M_current_pos(__pos),_M_root(__root),  _M_buf_ptr(0) {}
+  void _M_incr(size_t __n);
+  void _M_decr(size_t __n);
+public:
+  size_t index() const { return _M_current_pos; }
+  _Rope_iterator_base(const _Self& __x) {
+    if (0 != __x._M_buf_ptr) {
+      *this = __x;
+    } else {
+      _M_current_pos = __x._M_current_pos;
+      _M_root = __x._M_root;
+      _M_buf_ptr = 0;
+    }
+  }
+};
+
+template<class _CharT, class _Alloc> class _Rope_iterator;
+
+template<class _CharT, class _Alloc>
+class _Rope_const_iterator : public _Rope_iterator_base<_CharT,_Alloc> {
+  friend class rope<_CharT,_Alloc>;
+  typedef  _Rope_const_iterator<_CharT, _Alloc> _Self;
+  typedef _Rope_iterator_base<_CharT,_Alloc> _Base;
+  //  protected:
+public:
+#   ifndef _STLP_HAS_NO_NAMESPACES
+  typedef _Rope_RopeRep<_CharT,_Alloc> _RopeRep;
+  // The one from the base class may not be directly visible.
+#   endif
+  _Rope_const_iterator(const _RopeRep* __root, size_t __pos):
+    _Rope_iterator_base<_CharT,_Alloc>(
+                                       __CONST_CAST(_RopeRep*,__root), __pos)
+    // Only nonconst iterators modify root ref count
+  {}
+public:
+  typedef _CharT reference;   // Really a value.  Returning a reference
+                                // Would be a mess, since it would have
+                                // to be included in refcount.
+  typedef const _CharT* pointer;
+  typedef _CharT value_type;
+  typedef ptrdiff_t difference_type;
+  typedef random_access_iterator_tag iterator_category;
+
+public:
+  _Rope_const_iterator() {};
+  _Rope_const_iterator(const _Self& __x) :
+    _Rope_iterator_base<_CharT,_Alloc>(__x) { }
+  _Rope_const_iterator(const _Rope_iterator<_CharT,_Alloc>& __x): 
+    _Rope_iterator_base<_CharT,_Alloc>(__x) {}
+  _Rope_const_iterator(const rope<_CharT,_Alloc>& __r, size_t __pos) :
+    _Rope_iterator_base<_CharT,_Alloc>(__r._M_tree_ptr._M_data, __pos) {}
+  _Self& operator= (const _Self& __x) {
+    if (0 != __x._M_buf_ptr) {
+      *(__STATIC_CAST(_Base*,this)) = __x;
+    } else {
+      this->_M_current_pos = __x._M_current_pos;
+      this->_M_root = __x._M_root;
+      this->_M_buf_ptr = 0;
+    }
+    return(*this);
+  }
+  reference operator*() {
+    if (0 == this->_M_buf_ptr) _S_setcache(*this);
+    return *(this->_M_buf_ptr);
+  }
+  _Self& operator++() {
+    __GC_CONST _CharT* __next;
+    if (0 != this->_M_buf_ptr && (__next = this->_M_buf_ptr + 1) < this->_M_buf_end) {
+      this->_M_buf_ptr = __next;
+      ++this->_M_current_pos;
+    } else {
+      this->_M_incr(1);
+    }
+    return *this;
+  }
+  _Self& operator+=(ptrdiff_t __n) {
+    if (__n >= 0) {
+      this->_M_incr(__n);
+    } else {
+      this->_M_decr(-__n);
+    }
+    return *this;
+  }
+  _Self& operator--() {
+    this->_M_decr(1);
+    return *this;
+  }
+  _Self& operator-=(ptrdiff_t __n) {
+    if (__n >= 0) {
+      this->_M_decr(__n);
+    } else {
+      this->_M_incr(-__n);
+    }
+    return *this;
+  }
+  _Self operator++(int) {
+    size_t __old_pos = this->_M_current_pos;
+    this->_M_incr(1);
+    return _Rope_const_iterator<_CharT,_Alloc>(this->_M_root, __old_pos);
+    // This makes a subsequent dereference expensive.
+    // Perhaps we should instead copy the iterator
+    // if it has a valid cache?
+  }
+  _Self operator--(int) {
+    size_t __old_pos = this->_M_current_pos;
+    this->_M_decr(1);
+    return _Rope_const_iterator<_CharT,_Alloc>(this->_M_root, __old_pos);
+  }
+  inline reference operator[](size_t __n);
+};
+
+template<class _CharT, class _Alloc>
+class _Rope_iterator : public _Rope_iterator_base<_CharT,_Alloc> {
+  friend class rope<_CharT,_Alloc>;
+  typedef _Rope_iterator<_CharT, _Alloc> _Self;
+  typedef _Rope_iterator_base<_CharT,_Alloc> _Base;
+  typedef _Rope_RopeRep<_CharT,_Alloc> _RopeRep;
+  //  protected:
+public:
+  rope<_CharT,_Alloc>* _M_root_rope;
+  // root is treated as a cached version of this,
+  // and is used to detect changes to the underlying
+  // rope.
+  // Root is included in the reference count.
+  // This is necessary so that we can detect changes reliably.
+  // Unfortunately, it requires careful bookkeeping for the
+  // nonGC case.
+  _Rope_iterator(rope<_CharT,_Alloc>* __r, size_t __pos);
+  
+  void _M_check();
+public:
+  typedef _Rope_char_ref_proxy<_CharT,_Alloc>  reference;
+  typedef _Rope_char_ref_proxy<_CharT,_Alloc>* pointer;
+  typedef _CharT value_type;
+  typedef ptrdiff_t difference_type;
+  typedef random_access_iterator_tag iterator_category;
+public:
+  ~_Rope_iterator() 		//*TY 5/6/00 - added dtor to balance reference count
+  {
+    _RopeRep::_S_unref(this->_M_root);
+  }
+  
+  rope<_CharT,_Alloc>& container() { return *_M_root_rope; }
+  _Rope_iterator() {
+    this->_M_root = 0;  // Needed for reference counting.
+  };
+  _Rope_iterator(const  _Self& __x) :
+    _Rope_iterator_base<_CharT,_Alloc>(__x) {
+    _M_root_rope = __x._M_root_rope;
+    _RopeRep::_S_ref(this->_M_root);
+  }
+  _Rope_iterator(rope<_CharT,_Alloc>& __r, size_t __pos);
+  _Self& operator= (const  _Self& __x) {
+    _RopeRep* __old = this->_M_root;
+    
+    _RopeRep::_S_ref(__x._M_root);
+    if (0 != __x._M_buf_ptr) {
+      _M_root_rope = __x._M_root_rope;
+      *(__STATIC_CAST(_Base*,this)) = __x;
+    } else {
+      this->_M_current_pos = __x._M_current_pos;
+      this->_M_root = __x._M_root;
+      _M_root_rope = __x._M_root_rope;
+      this->_M_buf_ptr = 0;
+    }
+    _RopeRep::_S_unref(__old);
+    return(*this);
+  }
+  reference operator*() {
+    _M_check();
+    if (0 == this->_M_buf_ptr) {
+      return _Rope_char_ref_proxy<_CharT,_Alloc>(
+                                                 _M_root_rope, this->_M_current_pos);
+    } else {
+      return _Rope_char_ref_proxy<_CharT,_Alloc>(
+                                                 _M_root_rope, this->_M_current_pos, *(this->_M_buf_ptr));
+    }
+  }
+  _Self& operator++() {
+    this->_M_incr(1);
+    return *this;
+  }
+  _Self& operator+=(ptrdiff_t __n) {
+    if (__n >= 0) {
+      this->_M_incr(__n);
+    } else {
+      this->_M_decr(-__n);
+    }
+    return *this;
+  }
+  _Self& operator--() {
+    this->_M_decr(1);
+    return *this;
+  }
+  _Self& operator-=(ptrdiff_t __n) {
+    if (__n >= 0) {
+      this->_M_decr(__n);
+    } else {
+      this->_M_incr(-__n);
+    }
+    return *this;
+  }
+  _Self operator++(int) {
+    size_t __old_pos = this->_M_current_pos;
+    this->_M_incr(1);
+    return _Rope_iterator<_CharT,_Alloc>(_M_root_rope, __old_pos);
+  }
+  _Self operator--(int) {
+    size_t __old_pos = this->_M_current_pos;
+    this->_M_decr(1);
+    return _Rope_iterator<_CharT,_Alloc>(_M_root_rope, __old_pos);
+  }
+  reference operator[](ptrdiff_t __n) {
+    return _Rope_char_ref_proxy<_CharT,_Alloc>(
+                                               _M_root_rope, this->_M_current_pos + __n);
+  }
+};
+
+# ifdef _STLP_USE_OLD_HP_ITERATOR_QUERIES
+template <class _CharT, class _Alloc>
+inline random_access_iterator_tag
+iterator_category(const _Rope_iterator<_CharT,_Alloc>&) {  return random_access_iterator_tag();}
+template <class _CharT, class _Alloc>
+inline _CharT* value_type(const _Rope_iterator<_CharT,_Alloc>&) { return 0; }
+template <class _CharT, class _Alloc>
+inline ptrdiff_t* distance_type(const _Rope_iterator<_CharT,_Alloc>&) { return 0; }
+template <class _CharT, class _Alloc>
+inline random_access_iterator_tag
+iterator_category(const _Rope_const_iterator<_CharT,_Alloc>&) { return random_access_iterator_tag(); }
+template <class _CharT, class _Alloc>
+inline _CharT* value_type(const _Rope_const_iterator<_CharT,_Alloc>&) { return 0; }
+template <class _CharT, class _Alloc>
+inline ptrdiff_t* distance_type(const _Rope_const_iterator<_CharT,_Alloc>&) { return 0; }
+#endif
+
+template <class _CharT, class _Alloc>
+class rope {
+  typedef rope<_CharT,_Alloc> _Self;
+public:
+  typedef _CharT value_type;
+  typedef ptrdiff_t difference_type;
+  typedef size_t size_type;
+  typedef _CharT const_reference;
+  typedef const _CharT* const_pointer;
+  typedef _Rope_iterator<_CharT,_Alloc> iterator;
+  typedef _Rope_const_iterator<_CharT,_Alloc> const_iterator;
+  typedef _Rope_char_ref_proxy<_CharT,_Alloc> reference;
+  typedef _Rope_char_ptr_proxy<_CharT,_Alloc> pointer;
+  
+  friend class _Rope_iterator<_CharT,_Alloc>;
+  friend class _Rope_const_iterator<_CharT,_Alloc>;
+  friend struct _Rope_RopeRep<_CharT,_Alloc>;
+  friend class _Rope_iterator_base<_CharT,_Alloc>;
+  friend class _Rope_char_ptr_proxy<_CharT,_Alloc>;
+  friend class _Rope_char_ref_proxy<_CharT,_Alloc>;
+  friend struct _Rope_RopeSubstring<_CharT,_Alloc>;
+
+  _STLP_DECLARE_RANDOM_ACCESS_REVERSE_ITERATORS;
+  
+protected:
+  typedef __GC_CONST _CharT* _Cstrptr;
+  
+  static _CharT _S_empty_c_str[1];
+  
+  static bool _S_is0(_CharT __c) { return __c == _S_eos((_CharT*)0); }
+  enum { _S_copy_max = 23 };
+  // For strings shorter than _S_copy_max, we copy to
+  // concatenate.
+  
+public:
+  typedef _Rope_RopeRep<_CharT, _Alloc> _RopeRep;
+  _STLP_FORCE_ALLOCATORS(_CharT, _Alloc)
+  typedef typename _Alloc_traits<_CharT,_Alloc>::allocator_type  allocator_type;
+  allocator_type get_allocator() const { return allocator_type(_M_tree_ptr); }
+public:
+  // The only data member of a rope:
+  _STLP_alloc_proxy<_RopeRep*, _CharT, allocator_type> _M_tree_ptr;
+
+  typedef _Rope_RopeConcatenation<_CharT,_Alloc> _RopeConcatenation;
+  typedef _Rope_RopeLeaf<_CharT,_Alloc> _RopeLeaf;
+  typedef _Rope_RopeFunction<_CharT,_Alloc> _RopeFunction;
+  typedef _Rope_RopeSubstring<_CharT,_Alloc> _RopeSubstring;
+
+
+
+  // Retrieve a character at the indicated position.
+  static _CharT _S_fetch(_RopeRep* __r, size_type __pos);
+
+#       ifndef __GC
+  // Obtain a pointer to the character at the indicated position.
+  // The pointer can be used to change the character.
+  // If such a pointer cannot be produced, as is frequently the
+  // case, 0 is returned instead.
+  // (Returns nonzero only if all nodes in the path have a refcount
+  // of 1.)
+  static _CharT* _S_fetch_ptr(_RopeRep* __r, size_type __pos);
+#       endif
+
+  static bool _S_apply_to_pieces(
+                                // should be template parameter
+                                 _Rope_char_consumer<_CharT>& __c,
+                                 const _RopeRep* __r,
+                                 size_t __begin, size_t __end);
+                                // begin and end are assumed to be in range.
+
+#       ifndef __GC
+  static void _S_unref(_RopeRep* __t)
+  {
+    _RopeRep::_S_unref(__t);
+  }
+  static void _S_ref(_RopeRep* __t)
+  {
+    _RopeRep::_S_ref(__t);
+  }
+#       else /* __GC */
+  static void _S_unref(_RopeRep*) {}
+  static void _S_ref(_RopeRep*) {}
+#       endif
+
+
+#       ifdef __GC
+  typedef _Rope_RopeRep<_CharT,_Alloc>* _Self_destruct_ptr;
+#       else
+  typedef _Rope_self_destruct_ptr<_CharT,_Alloc> _Self_destruct_ptr;
+#       endif
+
+  // _Result is counted in refcount.
+  static _RopeRep* _S_substring(_RopeRep* __base,
+                                size_t __start, size_t __endp1);
+
+  static _RopeRep* _S_concat_char_iter(_RopeRep* __r,
+                                       const _CharT* __iter, size_t __slen);
+  // Concatenate rope and char ptr, copying __s.
+  // Should really take an arbitrary iterator.
+  // Result is counted in refcount.
+  static _RopeRep* _S_destr_concat_char_iter(_RopeRep* __r,
+                                             const _CharT* __iter, size_t __slen)
+    // As above, but one reference to __r is about to be
+    // destroyed.  Thus the pieces may be recycled if all
+    // relevent reference counts are 1.
+#           ifdef __GC
+    // We can't really do anything since refcounts are unavailable.
+  { return _S_concat_char_iter(__r, __iter, __slen); }
+#           else
+  ;
+#           endif
+
+  static _RopeRep* _S_concat_rep(_RopeRep* __left, _RopeRep* __right);
+  // General concatenation on _RopeRep.  _Result
+  // has refcount of 1.  Adjusts argument refcounts.
+
+public:
+  void apply_to_pieces( size_t __begin, size_t __end,
+                        _Rope_char_consumer<_CharT>& __c) const {
+    _S_apply_to_pieces(__c, _M_tree_ptr._M_data, __begin, __end);
+  }
+
+
+protected:
+
+  static size_t _S_rounded_up_size(size_t __n) {
+    return _RopeRep::_S_rounded_up_size(__n);
+  }
+
+  static size_t _S_allocated_capacity(size_t __n) {
+    if (_S_is_basic_char_type((_CharT*)0)) {
+      return _S_rounded_up_size(__n) - 1;
+    } else {
+      return _S_rounded_up_size(__n);
+    }
+  }
+                
+  // Allocate and construct a RopeLeaf using the supplied allocator
+  // Takes ownership of s instead of copying.
+  static _RopeLeaf* _S_new_RopeLeaf(__GC_CONST _CharT *__s,
+                                    size_t _p_size, allocator_type __a)
+  {
+   _RopeLeaf* __space = _STLP_CREATE_ALLOCATOR(allocator_type,__a, _RopeLeaf).allocate(1,(const void*)0);
+    _STLP_TRY {
+      _STLP_PLACEMENT_NEW(__space) _RopeLeaf(__s, _p_size, __a);
+    }
+   _STLP_UNWIND(_STLP_CREATE_ALLOCATOR(allocator_type,__a, 
+                                   _RopeLeaf).deallocate(__space, 1))
+	  return __space;
+  }
+
+  static _RopeConcatenation* _S_new_RopeConcatenation(
+                                                      _RopeRep* __left, _RopeRep* __right,
+                                                      allocator_type __a)
+  {
+   _RopeConcatenation* __space = _STLP_CREATE_ALLOCATOR(allocator_type,__a,
+                                                    _RopeConcatenation).allocate(1,(const void*)0);
+    return _STLP_PLACEMENT_NEW(__space) _RopeConcatenation(__left, __right, __a);
+  }
+
+  static _RopeFunction* _S_new_RopeFunction(char_producer<_CharT>* __f,
+                                            size_t _p_size, bool __d, allocator_type __a)
+  {
+   _RopeFunction* __space = _STLP_CREATE_ALLOCATOR(allocator_type,__a, 
+                                               _RopeFunction).allocate(1,(const void*)0);
+    return _STLP_PLACEMENT_NEW(__space) _RopeFunction(__f, _p_size, __d, __a);
+  }
+
+  static _RopeSubstring* _S_new_RopeSubstring(
+                                              _Rope_RopeRep<_CharT,_Alloc>* __b, size_t __s,
+                                              size_t __l, allocator_type __a)
+  {
+   _RopeSubstring* __space = _STLP_CREATE_ALLOCATOR(allocator_type,__a, 
+                                                _RopeSubstring).allocate(1,(const void*)0);
+    return _STLP_PLACEMENT_NEW(__space) _RopeSubstring(__b, __s, __l, __a);
+  }
+
+#         define _STLP_ROPE_FROM_UNOWNED_CHAR_PTR(__s, _p_size, __a) \
+                _S_RopeLeaf_from_unowned_char_ptr(__s, _p_size, __a)     
+
+  static
+  _RopeLeaf* _S_RopeLeaf_from_unowned_char_ptr(const _CharT *__s,
+                                               size_t _p_size, allocator_type __a)
+  {
+    if (0 == _p_size) return 0;
+
+   _CharT* __buf = _STLP_CREATE_ALLOCATOR(allocator_type,__a, _CharT).allocate(_S_rounded_up_size(_p_size));
+
+    uninitialized_copy_n(__s, _p_size, __buf);
+    _S_cond_store_eos(__buf[_p_size]);
+
+    _STLP_TRY {
+      return _S_new_RopeLeaf(__buf, _p_size, __a);
+    }
+    _STLP_UNWIND(_RopeRep::_S_free_string(__buf, _p_size, __a))
+            
+# if defined (_STLP_THROW_RETURN_BUG)
+      return 0;
+# endif
+  }
+            
+
+  // Concatenation of nonempty strings.
+  // Always builds a concatenation node.
+  // Rebalances if the result is too deep.
+  // Result has refcount 1.
+  // Does not increment left and right ref counts even though
+  // they are referenced.
+  static _RopeRep*
+  _S_tree_concat(_RopeRep* __left, _RopeRep* __right);
+
+  // Concatenation helper functions
+  static _RopeLeaf*
+  _S_leaf_concat_char_iter(_RopeLeaf* __r,
+                           const _CharT* __iter, size_t __slen);
+  // Concatenate by copying leaf.
+  // should take an arbitrary iterator
+  // result has refcount 1.
+#       ifndef __GC
+  static _RopeLeaf* _S_destr_leaf_concat_char_iter
+  (_RopeLeaf* __r, const _CharT* __iter, size_t __slen);
+  // A version that potentially clobbers __r if __r->_M_ref_count == 1.
+#       endif
+
+
+  // A helper function for exponentiating strings.
+  // This uses a nonstandard refcount convention.
+  // The result has refcount 0.
+  friend struct _Rope_Concat_fn<_CharT,_Alloc>;
+  typedef _Rope_Concat_fn<_CharT,_Alloc> _Concat_fn;
+
+public:
+  static size_t _S_char_ptr_len(const _CharT* __s) {
+    const _CharT* __p = __s;
+	  
+    while (!_S_is0(*__p)) { ++__p; }
+    return (__p - __s);
+  }
+
+public: /* for operators */
+  rope(_RopeRep* __t, const allocator_type& __a = allocator_type())
+    : _M_tree_ptr(__a, __t) { }
+private:
+  // Copy __r to the _CharT buffer.
+  // Returns __buffer + __r->_M_size._M_data.
+  // Assumes that buffer is uninitialized.
+  static _CharT* _S_flatten(_RopeRep* __r, _CharT* __buffer);
+
+  // Again, with explicit starting position and length.
+  // Assumes that buffer is uninitialized.
+  static _CharT* _S_flatten(_RopeRep* __r,
+                            size_t __start, size_t __len,
+                            _CharT* __buffer);
+
+  // fbp : HP aCC prohibits access to protected min_len from within static methods ( ?? )
+public:
+  static const unsigned long _S_min_len[46];
+protected:
+  static bool _S_is_balanced(_RopeRep* __r)
+  { return (__r->_M_size._M_data >= _S_min_len[__r->_M_depth]); }
+
+  static bool _S_is_almost_balanced(_RopeRep* __r)
+  { return (__r->_M_depth == 0 ||
+            __r->_M_size._M_data >= _S_min_len[__r->_M_depth - 1]); }
+
+  static bool _S_is_roughly_balanced(_RopeRep* __r)
+  { return (__r->_M_depth <= 1 ||
+            __r->_M_size._M_data >= _S_min_len[__r->_M_depth - 2]); }
+
+  // Assumes the result is not empty.
+  static _RopeRep* _S_concat_and_set_balanced(_RopeRep* __left,
+                                              _RopeRep* __right)
+  {
+    _RopeRep* __result = _S_concat_rep(__left, __right);
+    if (_S_is_balanced(__result)) __result->_M_is_balanced = true;
+    return __result;
+  }
+
+  // The basic rebalancing operation.  Logically copies the
+  // rope.  The result has refcount of 1.  The client will
+  // usually decrement the reference count of __r.
+  // The result is within height 2 of balanced by the above
+  // definition.
+  static _RopeRep* _S_balance(_RopeRep* __r);
+
+  // Add all unbalanced subtrees to the forest of balanceed trees.
+  // Used only by balance.
+  static void _S_add_to_forest(_RopeRep*__r, _RopeRep** __forest);
+        
+  // Add __r to forest, assuming __r is already balanced.
+  static void _S_add_leaf_to_forest(_RopeRep* __r, _RopeRep** __forest);
+
+  // Print to stdout, exposing structure
+  static void _S_dump(_RopeRep* __r, int __indent = 0);
+
+  // Return -1, 0, or 1 if __x < __y, __x == __y, or __x > __y resp.
+  static int _S_compare(const _RopeRep* __x, const _RopeRep* __y);
+
+public:
+  bool empty() const { return 0 == _M_tree_ptr._M_data; }
+
+  // Comparison member function.  This is public only for those
+  // clients that need a ternary comparison.  Others
+  // should use the comparison operators below.
+  int compare(const _Self& __y) const {
+    return _S_compare(_M_tree_ptr._M_data, __y._M_tree_ptr._M_data);
+  }
+
+  rope(const _CharT* __s, const allocator_type& __a = allocator_type())
+    : _M_tree_ptr(__a, _STLP_ROPE_FROM_UNOWNED_CHAR_PTR(__s, _S_char_ptr_len(__s),__a))
+  { }
+
+  rope(const _CharT* __s, size_t __len,
+       const allocator_type& __a = allocator_type())
+    : _M_tree_ptr(__a, (_STLP_ROPE_FROM_UNOWNED_CHAR_PTR(__s, __len, __a)))
+  { }
+
+  // Should perhaps be templatized with respect to the iterator type
+  // and use Sequence_buffer.  (It should perhaps use sequence_buffer
+  // even now.)
+  rope(const _CharT *__s, const _CharT *__e,
+       const allocator_type& __a = allocator_type())
+    : _M_tree_ptr(__a, _STLP_ROPE_FROM_UNOWNED_CHAR_PTR(__s, __e - __s, __a))
+  { }
+
+  rope(const const_iterator& __s, const const_iterator& __e,
+       const allocator_type& __a = allocator_type())
+    : _M_tree_ptr(__a, _S_substring(__s._M_root, __s._M_current_pos,
+                                    __e._M_current_pos))
+  { }
+
+  rope(const iterator& __s, const iterator& __e,
+       const allocator_type& __a = allocator_type())
+    : _M_tree_ptr(__a, _S_substring(__s._M_root, __s._M_current_pos,
+                                    __e._M_current_pos))
+  { }
+
+  rope(_CharT __c, const allocator_type& __a = allocator_type())
+    : _M_tree_ptr(__a, (_RopeRep*)0)
+  {
+    _CharT* __buf = _M_tree_ptr.allocate(_S_rounded_up_size(1));
+
+    _Construct(__buf, __c);
+    _STLP_TRY {
+      _M_tree_ptr._M_data = _S_new_RopeLeaf(__buf, 1, __a);
+    }
+    _STLP_UNWIND(_RopeRep::_S_free_string(__buf, 1, __a))
+      }
+
+  rope(size_t __n, _CharT __c,     
+       const allocator_type& __a = allocator_type()):
+    _M_tree_ptr(__a, (_RopeRep*)0) {
+    rope<_CharT,_Alloc> __result;
+# define  __exponentiate_threshold size_t(32)
+    _RopeRep* __remainder;
+    rope<_CharT,_Alloc> __remainder_rope;
+	    
+    // gcc-2.7.2 bugs
+    typedef _Rope_Concat_fn<_CharT,_Alloc> _Concat_fn;
+	    
+    if (0 == __n)
+      return;
+	    
+    size_t __exponent = __n / __exponentiate_threshold;
+    size_t __rest = __n % __exponentiate_threshold;
+    if (0 == __rest) {
+      __remainder = 0;
+    } else {
+      _CharT* __rest_buffer = _M_tree_ptr.allocate(_S_rounded_up_size(__rest));
+      uninitialized_fill_n(__rest_buffer, __rest, __c);
+      _S_cond_store_eos(__rest_buffer[__rest]);
+      _STLP_TRY {
+		__remainder = _S_new_RopeLeaf(__rest_buffer, __rest, __a);
+      }
+      _STLP_UNWIND(_RopeRep::_S_free_string(__rest_buffer, __rest, __a))
+		}
+    __remainder_rope._M_tree_ptr._M_data = __remainder;
+    if (__exponent != 0) {
+      _CharT* __base_buffer =
+		_M_tree_ptr.allocate(_S_rounded_up_size(__exponentiate_threshold));
+      _RopeLeaf* __base_leaf;
+      rope<_CharT,_Alloc> __base_rope;
+      uninitialized_fill_n(__base_buffer, __exponentiate_threshold, __c);
+      _S_cond_store_eos(__base_buffer[__exponentiate_threshold]);
+      _STLP_TRY {
+		__base_leaf = _S_new_RopeLeaf(__base_buffer,
+                                      __exponentiate_threshold, __a);
+      }
+      _STLP_UNWIND(_RopeRep::_S_free_string(__base_buffer, 
+                                            __exponentiate_threshold, __a))
+		__base_rope._M_tree_ptr._M_data = __base_leaf;
+      if (1 == __exponent) {
+		__result = __base_rope;
+#         ifndef __GC
+		_STLP_ASSERT(2 == __result._M_tree_ptr._M_data->_M_ref_count)
+		// One each for base_rope and __result
+#         endif
+      } else {
+		__result = power(__base_rope, __exponent, _Concat_fn());
+      }
+      if (0 != __remainder) {
+		__result += __remainder_rope;
+      }
+    } else {
+      __result = __remainder_rope;
+    }
+    _M_tree_ptr._M_data = __result._M_tree_ptr._M_data;
+    _M_tree_ptr._M_data->_M_ref_nonnil();
+# undef __exponentiate_threshold
+  }
+
+  rope(const allocator_type& __a = allocator_type())
+    : _M_tree_ptr(__a, (_RopeRep*)0) {}
+
+  // Construct a rope from a function that can compute its members
+  rope(char_producer<_CharT> *__fn, size_t __len, bool __delete_fn,
+       const allocator_type& __a = allocator_type())
+    : _M_tree_ptr(__a, (_RopeRep*)0)
+  {
+    _M_tree_ptr._M_data = (0 == __len) ?
+      0 : _S_new_RopeFunction(__fn, __len, __delete_fn, __a);
+  }
+
+  rope(const _Self& __x)
+    : _M_tree_ptr(__x.get_allocator(), __x._M_tree_ptr._M_data)
+  {
+    _S_ref(_M_tree_ptr._M_data);
+  }
+
+  ~rope()
+  {
+    _S_unref(_M_tree_ptr._M_data);
+  }
+
+  _Self& operator=(const _Self& __x)
+  {
+    _RopeRep* __old = _M_tree_ptr._M_data;
+    _STLP_ASSERT(get_allocator() == __x.get_allocator())
+    _M_tree_ptr._M_data = __x._M_tree_ptr._M_data;
+    _S_ref(_M_tree_ptr._M_data);
+    _S_unref(__old);
+    return(*this);
+  }
+  void clear()
+  {
+    _S_unref(_M_tree_ptr._M_data);
+    _M_tree_ptr._M_data = 0;
+  }
+  void push_back(_CharT __x)
+  {
+    _RopeRep* __old = _M_tree_ptr._M_data;
+    _M_tree_ptr._M_data = _S_destr_concat_char_iter(_M_tree_ptr._M_data, &__x, 1);
+    _S_unref(__old);
+  }
+
+  void pop_back()
+  {
+    _RopeRep* __old = _M_tree_ptr._M_data;
+    _M_tree_ptr._M_data = 
+      _S_substring(_M_tree_ptr._M_data, 0, _M_tree_ptr._M_data->_M_size._M_data - 1);
+    _S_unref(__old);
+  }
+
+  _CharT back() const
+  {
+    return _S_fetch(_M_tree_ptr._M_data, _M_tree_ptr._M_data->_M_size._M_data - 1);
+  }
+
+  void push_front(_CharT __x)
+  {
+    _RopeRep* __old = _M_tree_ptr._M_data;
+    _RopeRep* __left =
+      _STLP_ROPE_FROM_UNOWNED_CHAR_PTR(&__x, 1, get_allocator());
+    _STLP_TRY {
+      _M_tree_ptr._M_data = _S_concat_rep(__left, _M_tree_ptr._M_data);
+      _S_unref(__old);
+      _S_unref(__left);
+    }
+    _STLP_UNWIND(_S_unref(__left))
+      }
+
+  void pop_front()
+  {
+    _RopeRep* __old = _M_tree_ptr._M_data;
+    _M_tree_ptr._M_data = _S_substring(_M_tree_ptr._M_data, 1, _M_tree_ptr._M_data->_M_size._M_data);
+    _S_unref(__old);
+  }
+
+  _CharT front() const
+  {
+    return _S_fetch(_M_tree_ptr._M_data, 0);
+  }
+
+  void balance()
+  {
+    _RopeRep* __old = _M_tree_ptr._M_data;
+    _M_tree_ptr._M_data = _S_balance(_M_tree_ptr._M_data);
+    _S_unref(__old);
+  }
+
+  void copy(_CharT* __buffer) const {
+    _STLP_STD::_Destroy(__buffer, __buffer + size());
+    _S_flatten(_M_tree_ptr._M_data, __buffer);
+  }
+
+  // This is the copy function from the standard, but
+  // with the arguments reordered to make it consistent with the
+  // rest of the interface.
+  // Note that this guaranteed not to compile if the draft standard
+  // order is assumed.
+  size_type copy(size_type __pos, size_type __n, _CharT* __buffer) const 
+  {
+    size_t _p_size = size();
+    size_t __len = (__pos + __n > _p_size? _p_size - __pos : __n);
+
+    _STLP_STD::_Destroy(__buffer, __buffer + __len);
+    _S_flatten(_M_tree_ptr._M_data, __pos, __len, __buffer);
+    return __len;
+  }
+
+  // Print to stdout, exposing structure.  May be useful for
+  // performance debugging.
+  void dump() {
+    _S_dump(_M_tree_ptr._M_data);
+  }
+
+  // Convert to 0 terminated string in new allocated memory.
+  // Embedded 0s in the input do not terminate the copy.
+  const _CharT* c_str() const;
+
+  // As above, but lso use the flattened representation as the
+  // the new rope representation.
+  const _CharT* replace_with_c_str();
+
+  // Reclaim memory for the c_str generated flattened string.
+  // Intentionally undocumented, since it's hard to say when this
+  // is safe for multiple threads.
+  void delete_c_str () {
+    if (0 == _M_tree_ptr._M_data) return;
+    if (_RopeRep::_S_leaf == _M_tree_ptr._M_data->_M_tag && 
+        ((_RopeLeaf*)_M_tree_ptr._M_data)->_M_data == 
+        _M_tree_ptr._M_data->_M_c_string) {
+      // Representation shared
+      return;
+    }
+#           ifndef __GC
+    _M_tree_ptr._M_data->_M_free_c_string();
+#           endif
+    _M_tree_ptr._M_data->_M_c_string = 0;
+  }
+
+  _CharT operator[] (size_type __pos) const {
+    return _S_fetch(_M_tree_ptr._M_data, __pos);
+  }
+
+  _CharT at(size_type __pos) const {
+    // if (__pos >= size()) throw out_of_range;  // XXX
+    return (*this)[__pos];
+  }
+
+  const_iterator begin() const {
+    return(const_iterator(_M_tree_ptr._M_data, 0));
+  }
+
+  // An easy way to get a const iterator from a non-const container.
+  const_iterator const_begin() const {
+    return(const_iterator(_M_tree_ptr._M_data, 0));
+  }
+
+  const_iterator end() const {
+    return(const_iterator(_M_tree_ptr._M_data, size()));
+  }
+
+  const_iterator const_end() const {
+    return(const_iterator(_M_tree_ptr._M_data, size()));
+  }
+
+  size_type size() const { 
+    return(0 == _M_tree_ptr._M_data? 0 : _M_tree_ptr._M_data->_M_size._M_data);
+  }
+
+  size_type length() const {
+    return size();
+  }
+
+  size_type max_size() const {
+    return _S_min_len[__ROPE_MAX_DEPTH-1] - 1;
+    //  Guarantees that the result can be sufficirntly
+    //  balanced.  Longer ropes will probably still work,
+    //  but it's harder to make guarantees.
+  }
+
+  const_reverse_iterator rbegin() const {
+    return const_reverse_iterator(end());
+  }
+
+  const_reverse_iterator const_rbegin() const {
+    return const_reverse_iterator(end());
+  }
+
+  const_reverse_iterator rend() const {
+    return const_reverse_iterator(begin());
+  }
+
+  const_reverse_iterator const_rend() const {
+    return const_reverse_iterator(begin());
+  }
+  // The symmetric cases are intentionally omitted, since they're presumed
+  // to be less common, and we don't handle them as well.
+
+  // The following should really be templatized.
+  // The first argument should be an input iterator or
+  // forward iterator with value_type _CharT.
+  _Self& append(const _CharT* __iter, size_t __n) {
+    _RopeRep* __result = 
+      _S_destr_concat_char_iter(_M_tree_ptr._M_data, __iter, __n);
+    _S_unref(_M_tree_ptr._M_data);
+    _M_tree_ptr._M_data = __result;
+    return *this;
+  }
+
+  _Self& append(const _CharT* __c_string) {
+    size_t __len = _S_char_ptr_len(__c_string);
+    append(__c_string, __len);
+    return(*this);
+  }
+
+  _Self& append(const _CharT* __s, const _CharT* __e) {
+    _RopeRep* __result =
+      _S_destr_concat_char_iter(_M_tree_ptr._M_data, __s, __e - __s);
+    _S_unref(_M_tree_ptr._M_data);
+    _M_tree_ptr._M_data = __result;
+    return *this;
+  }
+
+  _Self& append(const_iterator __s, const_iterator __e) {
+    _STLP_ASSERT(__s._M_root == __e._M_root)
+    _STLP_ASSERT(get_allocator() == __s._M_root->get_allocator())
+    _Self_destruct_ptr __appendee(_S_substring(
+                                               __s._M_root, __s._M_current_pos, __e._M_current_pos));
+    _RopeRep* __result = 
+      _S_concat_rep(_M_tree_ptr._M_data, (_RopeRep*)__appendee);
+    _S_unref(_M_tree_ptr._M_data);
+    _M_tree_ptr._M_data = __result;
+    return *this;
+  }
+
+  _Self& append(_CharT __c) {
+    _RopeRep* __result = 
+      _S_destr_concat_char_iter(_M_tree_ptr._M_data, &__c, 1);
+    _S_unref(_M_tree_ptr._M_data);
+    _M_tree_ptr._M_data = __result;
+    return *this;
+  }
+
+  _Self& append() { return append(_CharT()); }  // XXX why?
+
+  _Self& append(const _Self& __y) {
+    _STLP_ASSERT(__y.get_allocator() == get_allocator())
+    _RopeRep* __result = _S_concat_rep(_M_tree_ptr._M_data, __y._M_tree_ptr._M_data);
+    _S_unref(_M_tree_ptr._M_data);
+    _M_tree_ptr._M_data = __result;
+    return *this;
+  }
+
+  _Self& append(size_t __n, _CharT __c) {
+    rope<_CharT,_Alloc> __last(__n, __c);
+    return append(__last);
+  }
+
+  void swap(_Self& __b) {
+    _STLP_ASSERT(get_allocator() == __b.get_allocator())
+    _RopeRep* __tmp = _M_tree_ptr._M_data;
+    _M_tree_ptr._M_data = __b._M_tree_ptr._M_data;
+    __b._M_tree_ptr._M_data = __tmp;
+  }
+
+
+protected:
+  // Result is included in refcount.
+  static _RopeRep* replace(_RopeRep* __old, size_t __pos1,
+                           size_t __pos2, _RopeRep* __r) {
+    if (0 == __old) { _S_ref(__r); return __r; }
+    _Self_destruct_ptr __left(
+                              _S_substring(__old, 0, __pos1));
+    _Self_destruct_ptr __right(
+                               _S_substring(__old, __pos2, __old->_M_size._M_data));
+	_STLP_MPWFIX_TRY	//*TY 06/01/2000 - 
+    _RopeRep* __result;
+
+    if (0 == __r) {
+      __result = _S_concat_rep(__left, __right);
+    } else {
+      _STLP_ASSERT(__old->get_allocator() == __r->get_allocator())
+      _Self_destruct_ptr __left_result(_S_concat_rep(__left, __r));
+      __result = _S_concat_rep(__left_result, __right);
+    }
+    return __result;
+	_STLP_MPWFIX_CATCH	//*TY 06/01/2000 - 
+  }
+
+public:
+  void insert(size_t __p, const _Self& __r) {
+    _RopeRep* __result = 
+      replace(_M_tree_ptr._M_data, __p, __p, __r._M_tree_ptr._M_data);
+    _STLP_ASSERT(get_allocator() == __r.get_allocator())
+    _S_unref(_M_tree_ptr._M_data);
+    _M_tree_ptr._M_data = __result;
+  }
+
+  void insert(size_t __p, size_t __n, _CharT __c) {
+    rope<_CharT,_Alloc> __r(__n,__c);
+    insert(__p, __r);
+  }
+
+  void insert(size_t __p, const _CharT* __i, size_t __n) {
+    _Self_destruct_ptr __left(_S_substring(_M_tree_ptr._M_data, 0, __p));
+    _Self_destruct_ptr __right(_S_substring(_M_tree_ptr._M_data, __p, size()));
+    _Self_destruct_ptr __left_result(
+                                     _S_concat_char_iter(__left, __i, __n));
+    // _S_ destr_concat_char_iter should be safe here.
+    // But as it stands it's probably not a win, since __left
+    // is likely to have additional references.
+    _RopeRep* __result = _S_concat_rep(__left_result, __right);
+    _S_unref(_M_tree_ptr._M_data);
+    _M_tree_ptr._M_data = __result;
+  }
+
+  void insert(size_t __p, const _CharT* __c_string) {
+    insert(__p, __c_string, _S_char_ptr_len(__c_string));
+  }
+
+  void insert(size_t __p, _CharT __c) {
+    insert(__p, &__c, 1);
+  }
+
+  void insert(size_t __p) {
+    _CharT __c = _CharT();
+    insert(__p, &__c, 1);
+  }
+
+  void insert(size_t __p, const _CharT* __i, const _CharT* __j) {
+    _Self __r(__i, __j);
+    insert(__p, __r);
+  }
+
+  void insert(size_t __p, const const_iterator& __i,
+              const const_iterator& __j) {
+    _Self __r(__i, __j);
+    insert(__p, __r);
+  }
+
+  void insert(size_t __p, const iterator& __i,
+              const iterator& __j) {
+    _Self __r(__i, __j);
+    insert(__p, __r);
+  }
+
+  // (position, length) versions of replace operations:
+
+  void replace(size_t __p, size_t __n, const _Self& __r) {
+    _RopeRep* __result = 
+      replace(_M_tree_ptr._M_data, __p, __p + __n, __r._M_tree_ptr._M_data);
+    _S_unref(_M_tree_ptr._M_data);
+    _M_tree_ptr._M_data = __result;
+  }
+
+  void replace(size_t __p, size_t __n, 
+               const _CharT* __i, size_t __i_len) {
+    _Self __r(__i, __i_len);
+    replace(__p, __n, __r);
+  }
+
+  void replace(size_t __p, size_t __n, _CharT __c) {
+    _Self __r(__c);
+    replace(__p, __n, __r);
+  }
+
+  void replace(size_t __p, size_t __n, const _CharT* __c_string) {
+    _Self __r(__c_string);
+    replace(__p, __n, __r);
+  }
+
+  void replace(size_t __p, size_t __n, 
+               const _CharT* __i, const _CharT* __j) {
+    _Self __r(__i, __j);
+    replace(__p, __n, __r);
+  }
+
+  void replace(size_t __p, size_t __n,
+               const const_iterator& __i, const const_iterator& __j) {
+    _Self __r(__i, __j);
+    replace(__p, __n, __r);
+  }
+
+  void replace(size_t __p, size_t __n,
+               const iterator& __i, const iterator& __j) {
+    _Self __r(__i, __j);
+    replace(__p, __n, __r);
+  }
+
+  // Single character variants:
+  void replace(size_t __p, _CharT __c) {
+    iterator __i(this, __p);
+    *__i = __c;
+  }
+
+  void replace(size_t __p, const _Self& __r) {
+    replace(__p, 1, __r);
+  }
+
+  void replace(size_t __p, const _CharT* __i, size_t __i_len) {
+    replace(__p, 1, __i, __i_len);
+  }
+
+  void replace(size_t __p, const _CharT* __c_string) {
+    replace(__p, 1, __c_string);
+  }
+
+  void replace(size_t __p, const _CharT* __i, const _CharT* __j) {
+    replace(__p, 1, __i, __j);
+  }
+
+  void replace(size_t __p, const const_iterator& __i,
+               const const_iterator& __j) {
+    replace(__p, 1, __i, __j);
+  }
+
+  void replace(size_t __p, const iterator& __i,
+               const iterator& __j) {
+    replace(__p, 1, __i, __j);
+  }
+
+  // Erase, (position, size) variant.
+  void erase(size_t __p, size_t __n) {
+    _RopeRep* __result = replace(_M_tree_ptr._M_data, __p, __p + __n, 0);
+    _S_unref(_M_tree_ptr._M_data);
+    _M_tree_ptr._M_data = __result;
+  }
+
+  // Erase, single character
+  void erase(size_t __p) {
+    erase(__p, __p + 1);
+  }
+
+  // Insert, iterator variants.  
+  iterator insert(const iterator& __p, const _Self& __r)
+  { insert(__p.index(), __r); return __p; }
+  iterator insert(const iterator& __p, size_t __n, _CharT __c)
+  { insert(__p.index(), __n, __c); return __p; }
+  iterator insert(const iterator& __p, _CharT __c) 
+  { insert(__p.index(), __c); return __p; }
+  iterator insert(const iterator& __p ) 
+  { insert(__p.index()); return __p; }
+  iterator insert(const iterator& __p, const _CharT* c_string) 
+  { insert(__p.index(), c_string); return __p; }
+  iterator insert(const iterator& __p, const _CharT* __i, size_t __n)
+  { insert(__p.index(), __i, __n); return __p; }
+  iterator insert(const iterator& __p, const _CharT* __i, 
+                  const _CharT* __j)
+  { insert(__p.index(), __i, __j);  return __p; }
+  iterator insert(const iterator& __p,
+                  const const_iterator& __i, const const_iterator& __j)
+  { insert(__p.index(), __i, __j); return __p; }
+  iterator insert(const iterator& __p,
+                  const iterator& __i, const iterator& __j)
+  { insert(__p.index(), __i, __j); return __p; }
+
+  // Replace, range variants.
+  void replace(const iterator& __p, const iterator& __q,
+               const _Self& __r)
+  { replace(__p.index(), __q.index() - __p.index(), __r); }
+  void replace(const iterator& __p, const iterator& __q, _CharT __c)
+  { replace(__p.index(), __q.index() - __p.index(), __c); }
+  void replace(const iterator& __p, const iterator& __q,
+               const _CharT* __c_string)
+  { replace(__p.index(), __q.index() - __p.index(), __c_string); }
+  void replace(const iterator& __p, const iterator& __q,
+               const _CharT* __i, size_t __n)
+  { replace(__p.index(), __q.index() - __p.index(), __i, __n); }
+  void replace(const iterator& __p, const iterator& __q,
+               const _CharT* __i, const _CharT* __j)
+  { replace(__p.index(), __q.index() - __p.index(), __i, __j); }
+  void replace(const iterator& __p, const iterator& __q,
+               const const_iterator& __i, const const_iterator& __j)
+  { replace(__p.index(), __q.index() - __p.index(), __i, __j); }
+  void replace(const iterator& __p, const iterator& __q,
+               const iterator& __i, const iterator& __j)
+  { replace(__p.index(), __q.index() - __p.index(), __i, __j); }
+
+  // Replace, iterator variants.
+  void replace(const iterator& __p, const _Self& __r)
+  { replace(__p.index(), __r); }
+  void replace(const iterator& __p, _CharT __c)
+  { replace(__p.index(), __c); }
+  void replace(const iterator& __p, const _CharT* __c_string)
+  { replace(__p.index(), __c_string); }
+  void replace(const iterator& __p, const _CharT* __i, size_t __n)
+  { replace(__p.index(), __i, __n); }
+  void replace(const iterator& __p, const _CharT* __i, const _CharT* __j)
+  { replace(__p.index(), __i, __j); }
+  void replace(const iterator& __p, const_iterator __i, 
+               const_iterator __j)
+  { replace(__p.index(), __i, __j); }
+  void replace(const iterator& __p, iterator __i, iterator __j)
+  { replace(__p.index(), __i, __j); }
+
+  // Iterator and range variants of erase
+  iterator erase(const iterator& __p, const iterator& __q) {
+    size_t __p_index = __p.index();
+    erase(__p_index, __q.index() - __p_index);
+    return iterator(this, __p_index);
+  }
+  iterator erase(const iterator& __p) {
+    size_t __p_index = __p.index();
+    erase(__p_index, 1);
+    return iterator(this, __p_index);
+  }
+
+  _Self substr(size_t __start, size_t __len = 1) const {
+    return rope<_CharT,_Alloc>(
+                               _S_substring(_M_tree_ptr._M_data, __start, __start + __len));
+  }
+
+  _Self substr(iterator __start, iterator __end) const {
+    return rope<_CharT,_Alloc>(
+                               _S_substring(_M_tree_ptr._M_data, __start.index(), __end.index()));
+  }
+        
+  _Self substr(iterator __start) const {
+    size_t __pos = __start.index();
+    return rope<_CharT,_Alloc>(
+                               _S_substring(_M_tree_ptr._M_data, __pos, __pos + 1));
+  }
+        
+  _Self substr(const_iterator __start, const_iterator __end) const {
+    // This might eventually take advantage of the cache in the
+    // iterator.
+    return rope<_CharT,_Alloc>(
+                               _S_substring(_M_tree_ptr._M_data, __start.index(), __end.index()));
+  }
+
+  rope<_CharT,_Alloc> substr(const_iterator __start) {
+    size_t __pos = __start.index();
+    return rope<_CharT,_Alloc>(
+                               _S_substring(_M_tree_ptr._M_data, __pos, __pos + 1));
+  }
+
+  enum { npos = -1 };
+
+  //         static const size_type npos;
+
+  size_type find(_CharT __c, size_type __pos = 0) const;
+  size_type find(const _CharT* __s, size_type __pos = 0) const {
+    size_type __result_pos;
+    const_iterator __result = search(const_begin() + (ptrdiff_t)__pos, const_end(),
+                                     __s, __s + _S_char_ptr_len(__s));
+    __result_pos = __result.index();
+#           ifndef _STLP_OLD_ROPE_SEMANTICS
+    if (__result_pos == size()) __result_pos = npos;
+#           endif
+    return __result_pos;
+  }
+
+  iterator mutable_begin() {
+    return(iterator(this, 0));
+  }
+
+  iterator mutable_end() {
+    return(iterator(this, size()));
+  }
+
+  reverse_iterator mutable_rbegin() {
+    return reverse_iterator(mutable_end());
+  }
+
+  reverse_iterator mutable_rend() {
+    return reverse_iterator(mutable_begin());
+  }
+
+  reference mutable_reference_at(size_type __pos) {
+    return reference(this, __pos);
+  }
+
+#       ifdef __STD_STUFF
+  reference operator[] (size_type __pos) {
+    return reference(this, __pos);
+  }
+
+  reference at(size_type __pos) {
+    // if (__pos >= size()) throw out_of_range;  // XXX
+    return (*this)[__pos];
+  }
+
+  void resize(size_type, _CharT) {}
+  void resize(size_type) {}
+  void reserve(size_type = 0) {}
+  size_type capacity() const {
+    return max_size();
+  }
+
+  // Stuff below this line is dangerous because it's error prone.
+  // I would really like to get rid of it.
+  // copy function with funny arg ordering.
+  size_type copy(_CharT* __buffer, size_type __n, 
+                 size_type __pos = 0) const {
+    return copy(__pos, __n, __buffer);
+  }
+
+  iterator end() { return mutable_end(); }
+
+  iterator begin() { return mutable_begin(); }
+
+  reverse_iterator rend() { return mutable_rend(); }
+
+  reverse_iterator rbegin() { return mutable_rbegin(); }
+
+#       else
+
+  const_iterator end() { return const_end(); }
+
+  const_iterator begin() { return const_begin(); }
+
+  const_reverse_iterator rend() { return const_rend(); }
+  
+  const_reverse_iterator rbegin() { return const_rbegin(); }
+
+#	endif
+
+  __ROPE_DEFINE_ALLOCS(_Alloc, _M_tree_ptr)
+    };
+
+# undef __ROPE_DEFINE_ALLOC
+# undef __ROPE_DEFINE_ALLOCS
+
+template <class _CharT, class _Alloc>
+inline _CharT 
+_Rope_const_iterator< _CharT, _Alloc>::operator[](size_t __n)
+{
+  return rope<_CharT,_Alloc>::_S_fetch(this->_M_root, this->_M_current_pos + __n);
+}
+
+template <class _CharT, class _Alloc>
+inline bool operator== (const _Rope_const_iterator<_CharT,_Alloc>& __x,
+                        const _Rope_const_iterator<_CharT,_Alloc>& __y) {
+  return (__x._M_current_pos == __y._M_current_pos && 
+          __x._M_root == __y._M_root);
+}
+
+template <class _CharT, class _Alloc>
+inline bool operator< (const _Rope_const_iterator<_CharT,_Alloc>& __x,
+                       const _Rope_const_iterator<_CharT,_Alloc>& __y) {
+  return (__x._M_current_pos < __y._M_current_pos);
+}
+
+#ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+
+template <class _CharT, class _Alloc>
+inline bool operator!= (const _Rope_const_iterator<_CharT,_Alloc>& __x,
+                        const _Rope_const_iterator<_CharT,_Alloc>& __y) {
+  return !(__x == __y);
+}
+
+template <class _CharT, class _Alloc>
+inline bool operator> (const _Rope_const_iterator<_CharT,_Alloc>& __x,
+                       const _Rope_const_iterator<_CharT,_Alloc>& __y) {
+  return __y < __x;
+}
+
+template <class _CharT, class _Alloc>
+inline bool operator<= (const _Rope_const_iterator<_CharT,_Alloc>& __x,
+                        const _Rope_const_iterator<_CharT,_Alloc>& __y) {
+  return !(__y < __x);
+}
+
+template <class _CharT, class _Alloc>
+inline bool operator>= (const _Rope_const_iterator<_CharT,_Alloc>& __x,
+                        const _Rope_const_iterator<_CharT,_Alloc>& __y) {
+  return !(__x < __y);
+}
+
+#endif /* _STLP_USE_SEPARATE_RELOPS_NAMESPACE */
+
+template <class _CharT, class _Alloc>
+inline ptrdiff_t operator-(const _Rope_const_iterator<_CharT,_Alloc>& __x,
+                           const _Rope_const_iterator<_CharT,_Alloc>& __y) {
+  return (ptrdiff_t)__x._M_current_pos - (ptrdiff_t)__y._M_current_pos;
+}
+
+#if !defined( __MWERKS__ ) || __MWERKS__ >= 0x2000		// dwa 8/21/97  - "ambiguous access to overloaded function" bug.
+template <class _CharT, class _Alloc>
+inline _Rope_const_iterator<_CharT,_Alloc>
+operator-(const _Rope_const_iterator<_CharT,_Alloc>& __x, ptrdiff_t __n) {
+  return _Rope_const_iterator<_CharT,_Alloc>(
+                                             __x._M_root, __x._M_current_pos - __n);
+}
+# endif
+
+template <class _CharT, class _Alloc>
+inline _Rope_const_iterator<_CharT,_Alloc>
+operator+(const _Rope_const_iterator<_CharT,_Alloc>& __x, ptrdiff_t __n) {
+  return _Rope_const_iterator<_CharT,_Alloc>(
+                                             __x._M_root, __x._M_current_pos + __n);
+}
+
+template <class _CharT, class _Alloc>
+inline _Rope_const_iterator<_CharT,_Alloc>
+operator+(ptrdiff_t __n, const _Rope_const_iterator<_CharT,_Alloc>& __x) {
+  return _Rope_const_iterator<_CharT,_Alloc>(
+                                             __x._M_root, __x._M_current_pos + __n);
+}
+
+template <class _CharT, class _Alloc>
+inline bool operator== (const _Rope_iterator<_CharT,_Alloc>& __x,
+                        const _Rope_iterator<_CharT,_Alloc>& __y) {
+  return (__x._M_current_pos == __y._M_current_pos && 
+          __x._M_root_rope == __y._M_root_rope);
+}
+
+template <class _CharT, class _Alloc>
+inline bool operator< (const _Rope_iterator<_CharT,_Alloc>& __x,
+                       const _Rope_iterator<_CharT,_Alloc>& __y) {
+  return (__x._M_current_pos < __y._M_current_pos);
+}
+
+#ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+
+template <class _CharT, class _Alloc>
+inline bool operator!= (const _Rope_iterator<_CharT,_Alloc>& __x,
+                        const _Rope_iterator<_CharT,_Alloc>& __y) {
+  return !(__x == __y);
+}
+
+template <class _CharT, class _Alloc>
+inline bool operator> (const _Rope_iterator<_CharT,_Alloc>& __x,
+                       const _Rope_iterator<_CharT,_Alloc>& __y) {
+  return __y < __x;
+}
+
+template <class _CharT, class _Alloc>
+inline bool operator<= (const _Rope_iterator<_CharT,_Alloc>& __x,
+                        const _Rope_iterator<_CharT,_Alloc>& __y) {
+  return !(__y < __x);
+}
+
+template <class _CharT, class _Alloc>
+inline bool operator>= (const _Rope_iterator<_CharT,_Alloc>& __x,
+                        const _Rope_iterator<_CharT,_Alloc>& __y) {
+  return !(__x < __y);
+}
+
+#endif /* _STLP_USE_SEPARATE_RELOPS_NAMESPACE */
+
+template <class _CharT, class _Alloc>
+inline ptrdiff_t operator-(const _Rope_iterator<_CharT,_Alloc>& __x,
+                           const _Rope_iterator<_CharT,_Alloc>& __y) {
+  return (ptrdiff_t)__x._M_current_pos - (ptrdiff_t)__y._M_current_pos;
+}
+
+#if !defined( __MWERKS__ ) || __MWERKS__ >= 0x2000		// dwa 8/21/97  - "ambiguous access to overloaded function" bug.
+template <class _CharT, class _Alloc>
+inline _Rope_iterator<_CharT,_Alloc>
+operator-(const _Rope_iterator<_CharT,_Alloc>& __x,
+          ptrdiff_t __n) {
+  return _Rope_iterator<_CharT,_Alloc>(
+                                       __x._M_root_rope, __x._M_current_pos - __n);
+}
+# endif
+
+template <class _CharT, class _Alloc>
+inline _Rope_iterator<_CharT,_Alloc>
+operator+(const _Rope_iterator<_CharT,_Alloc>& __x,
+          ptrdiff_t __n) {
+  return _Rope_iterator<_CharT,_Alloc>(
+                                       __x._M_root_rope, __x._M_current_pos + __n);
+}
+
+template <class _CharT, class _Alloc>
+inline _Rope_iterator<_CharT,_Alloc>
+operator+(ptrdiff_t __n, const _Rope_iterator<_CharT,_Alloc>& __x) {
+  return _Rope_iterator<_CharT,_Alloc>(
+                                       __x._M_root_rope, __x._M_current_pos + __n);
+}
+
+template <class _CharT, class _Alloc>
+inline
+rope<_CharT,_Alloc>
+operator+ (const rope<_CharT,_Alloc>& __left,
+           const rope<_CharT,_Alloc>& __right)
+{
+  _STLP_ASSERT(__left.get_allocator() == __right.get_allocator())
+  return rope<_CharT,_Alloc>(rope<_CharT,_Alloc>::_S_concat_rep(__left._M_tree_ptr._M_data, __right._M_tree_ptr._M_data));
+  // Inlining this should make it possible to keep __left and
+  // __right in registers.
+}
+
+template <class _CharT, class _Alloc>
+inline
+rope<_CharT,_Alloc>&
+operator+= (rope<_CharT,_Alloc>& __left, 
+            const rope<_CharT,_Alloc>& __right)
+{
+  __left.append(__right);
+  return __left;
+}
+
+template <class _CharT, class _Alloc>
+inline
+rope<_CharT,_Alloc>
+operator+ (const rope<_CharT,_Alloc>& __left,
+           const _CharT* __right) {
+  size_t __rlen = rope<_CharT,_Alloc>::_S_char_ptr_len(__right);
+  return rope<_CharT,_Alloc>(
+                             rope<_CharT,_Alloc>::_S_concat_char_iter(
+                                                                      __left._M_tree_ptr._M_data, __right, __rlen)); 
+}
+
+template <class _CharT, class _Alloc>
+inline
+rope<_CharT,_Alloc>&
+operator+= (rope<_CharT,_Alloc>& __left,
+            const _CharT* __right) {
+  __left.append(__right);
+  return __left;
+}
+
+template <class _CharT, class _Alloc>
+inline
+rope<_CharT,_Alloc>
+operator+ (const rope<_CharT,_Alloc>& __left, _STLP_SIMPLE_TYPE(_CharT) __right) {
+  return rope<_CharT,_Alloc>(
+                             rope<_CharT,_Alloc>::_S_concat_char_iter(
+                                                                      __left._M_tree_ptr._M_data, &__right, 1));
+}
+
+template <class _CharT, class _Alloc>
+inline
+rope<_CharT,_Alloc>&
+operator+= (rope<_CharT,_Alloc>& __left, _STLP_SIMPLE_TYPE(_CharT) __right) {
+  __left.append(__right);
+  return __left;
+}
+
+template <class _CharT, class _Alloc>
+inline bool
+operator< (const rope<_CharT,_Alloc>& __left, 
+           const rope<_CharT,_Alloc>& __right) {
+  return __left.compare(__right) < 0;
+}
+        
+template <class _CharT, class _Alloc>
+inline bool
+operator== (const rope<_CharT,_Alloc>& __left, 
+            const rope<_CharT,_Alloc>& __right) {
+  return __left.compare(__right) == 0;
+}
+
+#ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+
+template <class _CharT, class _Alloc>
+inline bool
+operator!= (const rope<_CharT,_Alloc>& __x, const rope<_CharT,_Alloc>& __y) {
+  return !(__x == __y);
+}
+
+template <class _CharT, class _Alloc>
+inline bool
+operator> (const rope<_CharT,_Alloc>& __x, const rope<_CharT,_Alloc>& __y) {
+  return __y < __x;
+}
+
+template <class _CharT, class _Alloc>
+inline bool
+operator<= (const rope<_CharT,_Alloc>& __x, const rope<_CharT,_Alloc>& __y) {
+  return !(__y < __x);
+}
+
+template <class _CharT, class _Alloc>
+inline bool
+operator>= (const rope<_CharT,_Alloc>& __x, const rope<_CharT,_Alloc>& __y) {
+  return !(__x < __y);
+}
+
+template <class _CharT, class _Alloc>
+inline bool operator!= (const _Rope_char_ptr_proxy<_CharT,_Alloc>& __x,
+                        const _Rope_char_ptr_proxy<_CharT,_Alloc>& __y) {
+  return !(__x == __y);
+}
+
+#endif /* _STLP_USE_SEPARATE_RELOPS_NAMESPACE */
+
+template <class _CharT, class _Alloc>
+inline bool operator== (const _Rope_char_ptr_proxy<_CharT,_Alloc>& __x,
+                        const _Rope_char_ptr_proxy<_CharT,_Alloc>& __y) {
+  return (__x._M_pos == __y._M_pos && __x._M_root == __y._M_root);
+}
+
+#ifdef _STLP_USE_NEW_IOSTREAMS
+template<class _CharT, class _Traits, class _Alloc>
+basic_ostream<_CharT, _Traits>& operator<< (
+                                            basic_ostream<_CharT, _Traits>& __o,
+                                            const rope<_CharT, _Alloc>& __r);
+#elif ! defined (_STLP_USE_NO_IOSTREAMS)
+template<class _CharT, class _Alloc>
+ostream& operator<< (ostream& __o, const rope<_CharT,_Alloc>& __r);        
+#endif
+        
+typedef rope<char, _STLP_DEFAULT_ALLOCATOR(char) > crope;
+# ifdef _STLP_HAS_WCHAR_T
+typedef rope<wchar_t, _STLP_DEFAULT_ALLOCATOR(wchar_t) > wrope;
+# endif
+
+inline crope::reference __mutable_reference_at(crope& __c, size_t __i)
+{
+  return __c.mutable_reference_at(__i);
+}
+
+# ifdef _STLP_HAS_WCHAR_T
+inline wrope::reference __mutable_reference_at(wrope& __c, size_t __i)
+{
+  return __c.mutable_reference_at(__i);
+}
+# endif
+
+#ifdef _STLP_FUNCTION_TMPL_PARTIAL_ORDER
+
+template <class _CharT, class _Alloc>
+inline void swap(rope<_CharT,_Alloc>& __x, rope<_CharT,_Alloc>& __y) {
+  __x.swap(__y);
+}
+#else
+
+inline void swap(crope& __x, crope& __y) { __x.swap(__y); }
+# ifdef _STLP_HAS_WCHAR_T	// dwa 8/21/97
+inline void swap(wrope& __x, wrope& __y) { __x.swap(__y); }
+# endif
+
+#endif /* _STLP_FUNCTION_TMPL_PARTIAL_ORDER */
+
+
+// Hash functions should probably be revisited later:
+_STLP_TEMPLATE_NULL struct hash<crope>
+{
+  size_t operator()(const crope& __str) const
+  {
+    size_t _p_size = __str.size();
+
+    if (0 == _p_size) return 0;
+    return 13*__str[0] + 5*__str[_p_size - 1] + _p_size;
+  }
+};
+
+# ifdef _STLP_HAS_WCHAR_T	// dwa 8/21/97
+_STLP_TEMPLATE_NULL struct hash<wrope>
+{
+  size_t operator()(const wrope& __str) const
+  {
+    size_t _p_size = __str.size();
+
+    if (0 == _p_size) return 0;
+    return 13*__str[0] + 5*__str[_p_size - 1] + _p_size;
+  }
+};
+#endif
+
+#ifndef _STLP_MSVC
+// I couldn't get this to work with VC++
+template<class _CharT,class _Alloc>
+void
+_Rope_rotate(_Rope_iterator<_CharT,_Alloc> __first,
+             _Rope_iterator<_CharT,_Alloc> __middle,
+             _Rope_iterator<_CharT,_Alloc> __last);
+
+#if !defined(__GNUC__)
+// Appears to confuse g++
+inline void rotate(_Rope_iterator<char,_STLP_DEFAULT_ALLOCATOR(char) > __first,
+                   _Rope_iterator<char,_STLP_DEFAULT_ALLOCATOR(char) > __middle,
+                   _Rope_iterator<char,_STLP_DEFAULT_ALLOCATOR(char) > __last) {
+  _Rope_rotate(__first, __middle, __last);
+}
+#endif
+
+#endif
+
+template <class _CharT, class _Alloc>
+inline _Rope_char_ref_proxy<_CharT, _Alloc>::operator _CharT () const
+{
+  if (_M_current_valid) {
+	return _M_current;
+  } else {
+    return _My_rope::_S_fetch(_M_root->_M_tree_ptr._M_data, _M_pos);
+  }
+}
+_STLP_END_NAMESPACE
+
+# if !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_rope.c>
+# endif
+
+# endif /* _STLP_INTERNAL_ROPE_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_set.h b/main/source/stlport/stlport/stl/_set.h
new file mode 100644
index 00000000..0e9d4bc0
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_set.h
@@ -0,0 +1,372 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_SET_H
+#define _STLP_INTERNAL_SET_H
+
+#ifndef _STLP_INTERNAL_TREE_H
+#include <stl/_tree.h>
+#endif
+
+#define set __WORKAROUND_RENAME(set)
+#define multiset __WORKAROUND_RENAME(multiset)
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _Key, __DFL_TMPL_PARAM(_Compare,less<_Key>), 
+                     _STLP_DEFAULT_ALLOCATOR_SELECT(_Key) >
+class set {
+public:
+// typedefs:
+  typedef _Key     key_type;
+  typedef _Key     value_type;
+  typedef _Compare key_compare;
+  typedef _Compare value_compare;
+private:
+  typedef _Rb_tree<key_type, value_type, 
+    _Identity<value_type>, key_compare, _Alloc> _Rep_type;
+public:
+  typedef typename _Rep_type::pointer pointer;
+  typedef typename _Rep_type::const_pointer const_pointer;
+  typedef typename _Rep_type::reference reference;
+  typedef typename _Rep_type::const_reference const_reference;
+  typedef typename _Rep_type::const_iterator const_iterator;
+  typedef const_iterator iterator;
+  typedef typename _Rep_type::const_reverse_iterator reverse_iterator;
+  typedef typename _Rep_type::const_reverse_iterator const_reverse_iterator;
+  typedef typename _Rep_type::size_type size_type;
+  typedef typename _Rep_type::difference_type difference_type;
+  typedef typename _Rep_type::allocator_type allocator_type;
+
+private:
+  _Rep_type _M_t;  // red-black tree representing set
+public:
+
+  // allocation/deallocation
+
+  set() : _M_t(_Compare(), allocator_type()) {}
+  explicit set(const _Compare& __comp,
+	       const allocator_type& __a = allocator_type())
+    : _M_t(__comp, __a) {}
+
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIterator>
+  set(_InputIterator __first, _InputIterator __last)
+    : _M_t(_Compare(), allocator_type())
+    { _M_t.insert_unique(__first, __last); }
+
+# ifdef _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS
+  template <class _InputIterator>
+  set(_InputIterator __first, _InputIterator __last, const _Compare& __comp)
+    : _M_t(__comp, allocator_type()) { _M_t.insert_unique(__first, __last); }
+# endif
+  template <class _InputIterator>
+  set(_InputIterator __first, _InputIterator __last, const _Compare& __comp,
+      const allocator_type& __a _STLP_ALLOCATOR_TYPE_DFL)
+    : _M_t(__comp, __a) { _M_t.insert_unique(__first, __last); }
+#else
+  set(const value_type* __first, const value_type* __last) 
+    : _M_t(_Compare(), allocator_type()) 
+    { _M_t.insert_unique(__first, __last); }
+
+  set(const value_type* __first, 
+      const value_type* __last, const _Compare& __comp,
+      const allocator_type& __a = allocator_type())
+    : _M_t(__comp, __a) { _M_t.insert_unique(__first, __last); }
+
+  set(const_iterator __first, const_iterator __last)
+    : _M_t(_Compare(), allocator_type()) 
+    { _M_t.insert_unique(__first, __last); }
+
+  set(const_iterator __first, const_iterator __last, const _Compare& __comp,
+      const allocator_type& __a = allocator_type())
+    : _M_t(__comp, __a) { _M_t.insert_unique(__first, __last); }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  set(const set<_Key,_Compare,_Alloc>& __x) : _M_t(__x._M_t) {}
+  set<_Key,_Compare,_Alloc>& operator=(const set<_Key, _Compare, _Alloc>& __x)
+  { 
+    _M_t = __x._M_t; 
+    return *this;
+  }
+
+  // accessors:
+
+  key_compare key_comp() const { return _M_t.key_comp(); }
+  value_compare value_comp() const { return _M_t.key_comp(); }
+  allocator_type get_allocator() const { return _M_t.get_allocator(); }
+
+  iterator begin() const { return _M_t.begin(); }
+  iterator end() const { return _M_t.end(); }
+  reverse_iterator rbegin() const { return _M_t.rbegin(); } 
+  reverse_iterator rend() const { return _M_t.rend(); }
+  bool empty() const { return _M_t.empty(); }
+  size_type size() const { return _M_t.size(); }
+  size_type max_size() const { return _M_t.max_size(); }
+  void swap(set<_Key,_Compare,_Alloc>& __x) { _M_t.swap(__x._M_t); }
+
+  // insert/erase
+  pair<iterator,bool> insert(const value_type& __x) { 
+    typedef typename _Rep_type::iterator _Rep_iterator;
+    pair<_Rep_iterator, bool> __p = _M_t.insert_unique(__x); 
+    return pair<iterator, bool>(__REINTERPRET_CAST(const iterator&,__p.first), __p.second);
+  }
+  iterator insert(iterator __position, const value_type& __x) {
+    typedef typename _Rep_type::iterator _Rep_iterator;
+    return _M_t.insert_unique((_Rep_iterator&)__position, __x);
+  }
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIterator>
+  void insert(_InputIterator __first, _InputIterator __last) {
+    _M_t.insert_unique(__first, __last);
+  }
+#else
+  void insert(const_iterator __first, const_iterator __last) {
+    _M_t.insert_unique(__first, __last);
+  }
+  void insert(const value_type* __first, const value_type* __last) {
+    _M_t.insert_unique(__first, __last);
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+  void erase(iterator __position) { 
+    typedef typename _Rep_type::iterator _Rep_iterator;
+    _M_t.erase((_Rep_iterator&)__position); 
+  }
+  size_type erase(const key_type& __x) { 
+    return _M_t.erase(__x); 
+  }
+  void erase(iterator __first, iterator __last) { 
+    typedef typename _Rep_type::iterator _Rep_iterator;
+    _M_t.erase((_Rep_iterator&)__first, (_Rep_iterator&)__last); 
+  }
+  void clear() { _M_t.clear(); }
+
+  // set operations:
+# if defined(_STLP_MEMBER_TEMPLATES) && ! defined ( _STLP_NO_EXTENSIONS )
+  template <class _KT>
+  iterator find(const _KT& __x) const { return _M_t.find(__x); }
+# else
+  iterator find(const key_type& __x) const { return _M_t.find(__x); }
+# endif
+  size_type count(const key_type& __x) const { 
+    return _M_t.find(__x) == _M_t.end() ? 0 : 1 ; 
+  }
+  iterator lower_bound(const key_type& __x) const {
+    return _M_t.lower_bound(__x);
+  }
+  iterator upper_bound(const key_type& __x) const {
+    return _M_t.upper_bound(__x); 
+  }
+  pair<iterator,iterator> equal_range(const key_type& __x) const {
+    return _M_t.equal_range(__x);
+  }
+};
+
+template <class _Key, __DFL_TMPL_PARAM(_Compare,less<_Key>), 
+                     _STLP_DEFAULT_ALLOCATOR_SELECT(_Key) >
+class multiset {
+public:
+  // typedefs:
+
+  typedef _Key     key_type;
+  typedef _Key     value_type;
+  typedef _Compare key_compare;
+  typedef _Compare value_compare;
+private:
+  typedef _Rb_tree<key_type, value_type, 
+                  _Identity<value_type>, key_compare, _Alloc> _Rep_type;
+public:
+  typedef typename _Rep_type::pointer pointer;
+  typedef typename _Rep_type::const_pointer const_pointer;
+  typedef typename _Rep_type::reference reference;
+  typedef typename _Rep_type::const_reference const_reference;
+  typedef typename _Rep_type::const_iterator const_iterator;
+  typedef const_iterator iterator;
+  typedef typename _Rep_type::const_reverse_iterator reverse_iterator;
+  typedef typename _Rep_type::const_reverse_iterator const_reverse_iterator;
+  typedef typename _Rep_type::size_type size_type;
+  typedef typename _Rep_type::difference_type difference_type;
+  typedef typename _Rep_type::allocator_type allocator_type;
+
+private:
+  _Rep_type _M_t;  // red-black tree representing multiset
+public:
+  // allocation/deallocation
+
+  multiset() : _M_t(_Compare(), allocator_type()) {}
+  explicit multiset(const _Compare& __comp,
+                    const allocator_type& __a = allocator_type())
+    : _M_t(__comp, __a) {}
+
+#ifdef _STLP_MEMBER_TEMPLATES
+
+  template <class _InputIterator>
+  multiset(_InputIterator __first, _InputIterator __last)
+    : _M_t(_Compare(), allocator_type())
+    { _M_t.insert_equal(__first, __last); }
+
+# ifdef _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS
+  template <class _InputIterator>
+  multiset(_InputIterator __first, _InputIterator __last,
+           const _Compare& __comp)
+    : _M_t(__comp, allocator_type()) { _M_t.insert_equal(__first, __last); }
+# endif
+  template <class _InputIterator>
+  multiset(_InputIterator __first, _InputIterator __last,
+           const _Compare& __comp,
+           const allocator_type& __a _STLP_ALLOCATOR_TYPE_DFL)
+    : _M_t(__comp, __a) { _M_t.insert_equal(__first, __last); }
+
+#else
+
+  multiset(const value_type* __first, const value_type* __last)
+    : _M_t(_Compare(), allocator_type())
+    { _M_t.insert_equal(__first, __last); }
+
+  multiset(const value_type* __first, const value_type* __last,
+           const _Compare& __comp,
+           const allocator_type& __a = allocator_type())
+    : _M_t(__comp, __a) { _M_t.insert_equal(__first, __last); }
+
+  multiset(const_iterator __first, const_iterator __last)
+    : _M_t(_Compare(), allocator_type())
+    { _M_t.insert_equal(__first, __last); }
+
+  multiset(const_iterator __first, const_iterator __last,
+           const _Compare& __comp,
+           const allocator_type& __a = allocator_type())
+    : _M_t(__comp, __a) { _M_t.insert_equal(__first, __last); }
+   
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  multiset(const multiset<_Key,_Compare,_Alloc>& __x) : _M_t(__x._M_t) {}
+  multiset<_Key,_Compare,_Alloc>&
+  operator=(const multiset<_Key,_Compare,_Alloc>& __x) {
+    _M_t = __x._M_t; 
+    return *this;
+  }
+
+  // accessors:
+
+  key_compare key_comp() const { return _M_t.key_comp(); }
+  value_compare value_comp() const { return _M_t.key_comp(); }
+  allocator_type get_allocator() const { return _M_t.get_allocator(); }
+
+  iterator begin() const { return _M_t.begin(); }
+  iterator end() const { return _M_t.end(); }
+  reverse_iterator rbegin() const { return _M_t.rbegin(); } 
+  reverse_iterator rend() const { return _M_t.rend(); }
+  bool empty() const { return _M_t.empty(); }
+  size_type size() const { return _M_t.size(); }
+  size_type max_size() const { return _M_t.max_size(); }
+  void swap(multiset<_Key,_Compare,_Alloc>& __x) { _M_t.swap(__x._M_t); }
+
+  // insert/erase
+  iterator insert(const value_type& __x) { 
+    return _M_t.insert_equal(__x);
+  }
+  iterator insert(iterator __position, const value_type& __x) {
+    typedef typename _Rep_type::iterator _Rep_iterator;
+    return _M_t.insert_equal((_Rep_iterator&)__position, __x);
+  }
+
+#ifdef _STLP_MEMBER_TEMPLATES  
+  template <class _InputIterator>
+  void insert(_InputIterator __first, _InputIterator __last) {
+    _M_t.insert_equal(__first, __last);
+  }
+#else
+  void insert(const value_type* __first, const value_type* __last) {
+    _M_t.insert_equal(__first, __last);
+  }
+  void insert(const_iterator __first, const_iterator __last) {
+    _M_t.insert_equal(__first, __last);
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+  void erase(iterator __position) { 
+    typedef typename _Rep_type::iterator _Rep_iterator;
+    _M_t.erase((_Rep_iterator&)__position); 
+  }
+  size_type erase(const key_type& __x) { 
+    return _M_t.erase(__x); 
+  }
+  void erase(iterator __first, iterator __last) { 
+    typedef typename _Rep_type::iterator _Rep_iterator;
+    _M_t.erase((_Rep_iterator&)__first, (_Rep_iterator&)__last); 
+  }
+  void clear() { _M_t.clear(); }
+
+  // multiset operations:
+
+# if defined(_STLP_MEMBER_TEMPLATES) && ! defined ( _STLP_NO_EXTENSIONS )
+  template <class _KT>
+  iterator find(const _KT& __x) const { return _M_t.find(__x); }
+# else
+  iterator find(const key_type& __x) const { return _M_t.find(__x); }
+# endif
+  size_type count(const key_type& __x) const { return _M_t.count(__x); }
+  iterator lower_bound(const key_type& __x) const {
+    return _M_t.lower_bound(__x);
+  }
+  iterator upper_bound(const key_type& __x) const {
+    return _M_t.upper_bound(__x); 
+  }
+  pair<iterator,iterator> equal_range(const key_type& __x) const {
+    return _M_t.equal_range(__x);
+  }
+};
+
+# define _STLP_TEMPLATE_HEADER template <class _Key, class _Compare, class _Alloc>
+# define _STLP_TEMPLATE_CONTAINER set<_Key,_Compare,_Alloc>
+# include <stl/_relops_cont.h>
+# undef  _STLP_TEMPLATE_CONTAINER
+# define _STLP_TEMPLATE_CONTAINER multiset<_Key,_Compare,_Alloc>
+# include <stl/_relops_cont.h>
+# undef  _STLP_TEMPLATE_CONTAINER
+# undef  _STLP_TEMPLATE_HEADER
+
+_STLP_END_NAMESPACE
+
+// do a cleanup
+# undef set
+# undef multiset
+// provide a way to access full funclionality 
+# define __set__  __FULL_NAME(set)
+# define __multiset__  __FULL_NAME(multiset)
+
+# ifdef _STLP_USE_WRAPPER_FOR_ALLOC_PARAM
+# include <stl/wrappers/_set.h>
+# endif
+
+#endif /* _STLP_INTERNAL_SET_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_site_config.h b/main/source/stlport/stlport/stl/_site_config.h
new file mode 100644
index 00000000..dc69ccc0
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_site_config.h
@@ -0,0 +1,194 @@
+// 
+// This file defines site configuration.
+//
+//
+
+/* 
+ * _STLP_NO_THREADS: if defined, STLport don't use any 
+ * multithreading support. Synonym is _NOTHREADS
+ */
+// #define _NOTHREADS
+// #define _STLP_NO_THREADS
+
+/* _PTHREADS: if defined, use Posix threads for multithreading support. */
+// #define _PTHREADS
+
+// compatibility section
+
+# if defined (_STLP_NO_IOSTREAMS) || defined (_STLP_NO_NEW_IOSTREAMS) && ! defined ( _STLP_NO_OWN_IOSTREAMS )
+#  define _STLP_NO_OWN_IOSTREAMS
+# endif
+
+# if !defined (_STLP_NO_OWN_IOSTREAMS) &&  ! defined (_STLP_OWN_IOSTREAMS)
+#  define _STLP_OWN_IOSTREAMS
+# endif
+
+# if (defined (_STLP_NOTHREADS) || defined (_STLP_NO_THREADS) || defined (NOTHREADS))
+#  if ! defined (_NOTHREADS)
+#   define _NOTHREADS
+#  endif
+#  if ! defined (_STLP_NO_THREADS)
+#   define _STLP_NO_THREADS
+#  endif
+# endif
+
+/*
+ * Turn _STLP_USE_DYNAMIC_LIB to enforce use of .dll version of STLport library.
+ * NOTE : please do that only if you know what you are doing !
+ * Changing default will require you to change makefile in "src" accordingly
+ * and to rebuild STLPort library !
+ * On UNIX, this has no effect. 
+ *
+ */
+// # define _STLP_USE_DYNAMIC_LIB
+
+/*
+ * Turn _STLP_USE_STATIC_LIB to enforce use of static version of STLport library.
+ * NOTE : please do that only if you know what you are doing !
+ * Changing default will require you to change makefile in "src" accordingly
+ * and to rebuild STLPort library !
+ * On UNIX, this has no effect. 
+ *
+ */
+// # define _STLP_USE_STATIC_LIB
+
+
+/* 
+ * Edit relative path below (or put full path) to get native 
+ * compiler vendor's headers included. Default is "../include"
+ * Hint : never install STLport in the directory that ends with "include"
+ */
+// #  undef _STLP_NATIVE_INCLUDE_PATH
+// #  define _STLP_NATIVE_INCLUDE_PATH ../include
+// same for C library headers like <cstring>
+// #  undef _STLP_NATIVE_CPP_C_INCLUDE_PATH
+// #  define _STLP_NATIVE_CPP_C_INCLUDE_PATH ../include
+// same for C headers like <string.h>
+// #  undef _STLP_NATIVE_C_INCLUDE_PATH
+// #  define _STLP_NATIVE_C_INCLUDE_PATH ../include
+
+
+/* 
+ * _STLP_USE_OWN_NAMESPACE/_STLP_NO_OWN_NAMESPACE
+ * If defined, STLport uses _STL:: namespace, else std::
+ * The reason you have to use separate namespace in wrapper mode is that new-style IO
+ * compiled library may have its own idea about STL stuff (string, vector, etc.),
+ * so redefining them in the same namespace would break ODR and may cause
+ * undefined behaviour. Rule of thumb is - if new-style iostreams are
+ * available, there WILL be a conflict. Otherwise you should be OK.
+ * In STLport iostreams mode, there is no need for this flag other than to facilitate
+ * link with third-part libraries compiled with different standard library implementation.
+ */
+// #  define _STLP_USE_OWN_NAMESPACE 1
+// #  define _STLP_NO_OWN_NAMESPACE  1
+
+
+/* 
+ * Uncomment _STLP_USE_NEWALLOC to force allocator<T> to use plain "new"
+ * instead of STLport optimized node allocator engine.
+ */
+// #define   _STLP_USE_NEWALLOC   1
+
+/* 
+ * Uncomment _STLP_USE_MALLOC to force allocator<T> to use plain "malloc" 
+ * instead of STLport optimized node allocator engine.
+ */
+// #define   _STLP_USE_MALLOC 1
+
+/*
+ * Set _STLP_DEBUG_ALLOC to use allocators that perform memory debugging,
+ * such as padding/checking for memory consistency 
+ */
+// #define   _STLP_DEBUG_ALLOC 1
+
+
+/*
+ * Uncomment this to force all debug diagnostic to be directed through a
+ * user-defined global function:
+ *	void __stl_debug_message(const char * format_str, ...)
+ * instead of predefined STLport routine. 
+ * This allows you to take control of debug message output.
+ * Default routine calls fprintf(stderr,...)
+ * Note : If you set this macro, you must supply __stl_debug_message 
+ * function definition somewhere.
+ */
+//#define _STLP_DEBUG_MESSAGE 1
+
+/*
+ * Uncomment this to force all failed assertions to be executed through
+ * user-defined global function:
+ *	void __stl_debug_terminate(void). This allows
+ * you to take control of assertion behaviour for debugging purposes.
+ * Default routine throws unique exception if _STLP_USE_EXCEPTIONS is set,
+ * calls _STLP_ABORT() otherwise.
+ * Note : If you set this macro, you must supply __stl_debug_terminate 
+ * function definition somewhere.
+ */
+//#define _STLP_DEBUG_TERMINATE 1
+
+/*
+ * Comment this out to enable throwing exceptions from default __stl_debug_terminate()
+ * instead of calling _STLP_ABORT().
+ */
+#define   _STLP_NO_DEBUG_EXCEPTIONS 1
+
+/* 
+ * Uncomment that to disable exception handling code 
+ */
+// #define   _STLP_NO_EXCEPTIONS 1
+
+/*
+ * _STLP_NO_NAMESPACES: if defined, don't put the library in namespace
+ * stlport:: or std::, even if the compiler supports namespaces
+ */
+
+// #define   _STLP_NO_NAMESPACES 1
+
+//==========================================================
+// Compatibility section
+//==========================================================
+
+/* 
+ * Use abbreviated class names for linker benefit (don't affect interface).
+ * This option is obsolete, but should work in this release.
+ *
+ */
+// # define _STLP_USE_ABBREVS
+
+/* 
+ * This definition precludes STLport reverse_iterator to be compatible with
+ * other parts of MSVC library. (With partial specialization, it just
+ * has no effect).
+ * Use it _ONLY_ if you use SGI-style reverse_iterator<> template explicitly
+ */
+// #    define _STLP_NO_MSVC50_COMPATIBILITY 1
+
+/*
+ * _STLP_USE_RAW_SGI_ALLOCATORS is a hook so that users can disable use of
+ * allocator<T> as default parameter for containers, and use SGI
+ * raw allocators as default ones, without having to edit library headers.
+ * Use of this macro is strongly discouraged.
+ */
+// #define   _STLP_USE_RAW_SGI_ALLOCATORS 1
+
+/*
+ * Use obsolete overloaded template functions iterator_category(), value_type(), distance_type()
+ * for querying iterator properties. Please note those names are non-standard and are not guaranteed
+ * to be used by every implementation. However, this setting is on by default when partial specialization
+ * is not implemented in the compiler and cannot be sumulated (only if _STLP_NO_ANACHRONISMS is not set). 
+ * Use of those interfaces for user-defined iterators is strongly discouraged: 
+ * please use public inheritance from iterator<> template to achieve desired effect. 
+ * Second form is to disable old-style queries in any case.
+ */
+// # define _STLP_USE_OLD_HP_ITERATOR_QUERIES
+// # define _STLP_NO_OLD_HP_ITERATOR_QUERIES
+
+
+//==========================================================================
+
+// This section contains swithes which should be off by default,
+// but so few compilers would have it undefined, so that we set them here,
+// with the option to be turned off later in compiler-specific file
+
+# define _STLP_INCOMPLETE_EXCEPTION_HEADER
+
diff --git a/main/source/stlport/stlport/stl/_slist.c b/main/source/stlport/stlport/stl/_slist.c
new file mode 100644
index 00000000..d2e4f313
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_slist.c
@@ -0,0 +1,179 @@
+/*
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+#ifndef _STLP_SLIST_C
+#define _STLP_SLIST_C
+
+#ifndef _STLP_INTERNAL_SLIST_H
+# include <stl/_slist.h>
+#endif
+
+# undef slist
+# define  slist  __WORKAROUND_DBG_RENAME(slist)
+# if defined (_STLP_NESTED_TYPE_PARAM_BUG) 
+#  define size_type          size_t
+# endif
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _Tp, class _Alloc> 
+_Slist_node_base*
+_Slist_base<_Tp,_Alloc>::_M_erase_after(_Slist_node_base* __before_first,
+                                        _Slist_node_base* __last_node) {
+  _Slist_node<_Tp>* __cur = (_Slist_node<_Tp>*) (__before_first->_M_next);
+  while (__cur != __last_node) {
+    _Slist_node<_Tp>* __tmp = __cur;
+    __cur = (_Slist_node<_Tp>*) __cur->_M_next;
+    _STLP_STD::_Destroy(&__tmp->_M_data);
+    _M_head.deallocate(__tmp,1);
+  }
+  __before_first->_M_next = __last_node;
+  return __last_node;
+}
+
+template <class _Tp, class _Alloc>
+slist<_Tp,_Alloc>& slist<_Tp,_Alloc>::operator=(const slist<_Tp,_Alloc>& __x)
+{
+  if (&__x != this) {
+    _Node_base* __p1 = &this->_M_head._M_data;
+    _Node* __n1 = (_Node*) this->_M_head._M_data._M_next;
+    const _Node* __n2 = (const _Node*) __x._M_head._M_data._M_next;
+    while (__n1 && __n2) {
+      __n1->_M_data = __n2->_M_data;
+      __p1 = __n1;
+      __n1 = (_Node*) __n1->_M_next;
+      __n2 = (const _Node*) __n2->_M_next;
+    }
+    if (__n2 == 0)
+      this->_M_erase_after(__p1, 0);
+    else
+      _M_insert_after_range(__p1, const_iterator((_Node*)__n2), 
+                                  const_iterator(0));
+  }
+  return *this;
+}
+
+template <class _Tp, class _Alloc>
+void slist<_Tp, _Alloc>::_M_fill_assign(size_type __n, const _Tp& __val) {
+  _Node_base* __prev = &this->_M_head._M_data;
+  _Node* __node = (_Node*) this->_M_head._M_data._M_next;
+  for ( ; __node != 0 && __n > 0 ; --__n) {
+    __node->_M_data = __val;
+    __prev = __node;
+    __node = (_Node*) __node->_M_next;
+  }
+  if (__n > 0)
+    _M_insert_after_fill(__prev, __n, __val);
+  else
+    this->_M_erase_after(__prev, 0);
+}
+
+
+template <class _Tp, class _Alloc>
+void slist<_Tp,_Alloc>::resize(size_type __len, const _Tp& __x)
+{
+  _Node_base* __cur = &this->_M_head._M_data;
+  while (__cur->_M_next != 0 && __len > 0) {
+    --__len;
+    __cur = __cur->_M_next;
+  }
+  if (__cur->_M_next) 
+    this->_M_erase_after(__cur, 0);
+  else
+    _M_insert_after_fill(__cur, __len, __x);
+}
+
+template <class _Tp, class _Alloc>
+void slist<_Tp,_Alloc>::remove(const _Tp& __val)
+{
+  _Node_base* __cur = &this->_M_head._M_data;
+  while (__cur && __cur->_M_next) {
+    if (((_Node*) __cur->_M_next)->_M_data == __val)
+      this->_M_erase_after(__cur);
+    else
+      __cur = __cur->_M_next;
+  }
+}
+
+template <class _Tp, class _Alloc> 
+void slist<_Tp,_Alloc>::unique()
+{
+  _Node_base* __cur = this->_M_head._M_data._M_next;
+  if (__cur) {
+    while (__cur->_M_next) {
+      if (((_Node*)__cur)->_M_data == 
+          ((_Node*)(__cur->_M_next))->_M_data)
+        this->_M_erase_after(__cur);
+      else
+        __cur = __cur->_M_next;
+    }
+  }
+}
+
+template <class _Tp, class _Alloc>
+void slist<_Tp,_Alloc>::merge(slist<_Tp,_Alloc>& __x)
+{
+  _Node_base* __n1 = &this->_M_head._M_data;
+  while (__n1->_M_next && __x._M_head._M_data._M_next) {
+    if (((_Node*) __x._M_head._M_data._M_next)->_M_data < 
+        ((_Node*)       __n1->_M_next)->_M_data) 
+      _Sl_global_inst::__splice_after(__n1, &__x._M_head._M_data, __x._M_head._M_data._M_next);
+    __n1 = __n1->_M_next;
+  }
+  if (__x._M_head._M_data._M_next) {
+    __n1->_M_next = __x._M_head._M_data._M_next;
+    __x._M_head._M_data._M_next = 0;
+  }
+}
+
+template <class _Tp, class _Alloc>
+void slist<_Tp,_Alloc>::sort()
+{
+  if (this->_M_head._M_data._M_next && this->_M_head._M_data._M_next->_M_next) {
+    _Self __carry;
+    _Self __counter[64];
+    int __fill = 0;
+    while (!empty()) {
+      _Sl_global_inst::__splice_after(&__carry._M_head._M_data, &this->_M_head._M_data, this->_M_head._M_data._M_next);
+      int __i = 0;
+      while (__i < __fill && !__counter[__i].empty()) {
+        __counter[__i].merge(__carry);
+        __carry.swap(__counter[__i]);
+        ++__i;
+      }
+      __carry.swap(__counter[__i]);
+      if (__i == __fill)
+        ++__fill;
+    }
+
+    for (int __i = 1; __i < __fill; ++__i)
+      __counter[__i].merge(__counter[__i-1]);
+    this->swap(__counter[__fill-1]);
+  }
+}
+
+# undef slist
+# undef size_type
+
+_STLP_END_NAMESPACE
+
+#endif /*  _STLP_SLIST_C */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_slist.h b/main/source/stlport/stlport/stl/_slist.h
new file mode 100644
index 00000000..baaf7cc4
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_slist.h
@@ -0,0 +1,741 @@
+/*
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_SLIST_H
+#define _STLP_INTERNAL_SLIST_H
+
+
+# ifndef _STLP_INTERNAL_ALGOBASE_H
+#  include <stl/_algobase.h>
+# endif
+
+# ifndef _STLP_INTERNAL_ALLOC_H
+#  include <stl/_alloc.h>
+# endif
+
+# ifndef _STLP_INTERNAL_ITERATOR_H
+#  include <stl/_iterator.h>
+# endif
+
+# ifndef _STLP_INTERNAL_CONSTRUCT_H
+#  include <stl/_construct.h>
+# endif
+
+# ifndef _STLP_INTERNAL_SLIST_BASE_H
+#  include <stl/_slist_base.h>
+# endif
+
+# undef slist
+# define  slist  __WORKAROUND_DBG_RENAME(slist)
+
+_STLP_BEGIN_NAMESPACE 
+
+template <class _Tp>
+struct _Slist_node : public _Slist_node_base
+{
+  _Tp _M_data;
+  __TRIVIAL_STUFF(_Slist_node)
+};
+
+struct _Slist_iterator_base {
+
+  typedef size_t               size_type;
+  typedef ptrdiff_t            difference_type;
+  typedef forward_iterator_tag iterator_category;
+
+  _Slist_node_base* _M_node;
+
+  _Slist_iterator_base(_Slist_node_base* __x) : _M_node(__x) {}
+
+  void _M_incr() { 
+//    _STLP_VERBOSE_ASSERT(_M_node != 0, _StlMsg_INVALID_ADVANCE)
+    _M_node = _M_node->_M_next; 
+  }
+  bool operator==(const _Slist_iterator_base& __y ) const { 
+    return _M_node == __y._M_node; 
+  }
+  bool operator!=(const _Slist_iterator_base& __y ) const { 
+    return _M_node != __y._M_node; 
+  }
+};
+
+# ifdef _STLP_USE_OLD_HP_ITERATOR_QUERIES
+inline ptrdiff_t* _STLP_CALL distance_type(const _Slist_iterator_base&) { return 0; }
+inline forward_iterator_tag _STLP_CALL iterator_category(const _Slist_iterator_base&) { return forward_iterator_tag(); }
+#endif
+
+template <class _Tp, class _Traits>
+struct _Slist_iterator : public _Slist_iterator_base
+{
+  typedef _Tp value_type;
+  typedef typename _Traits::pointer    pointer;
+  typedef typename _Traits::reference  reference;
+  typedef forward_iterator_tag iterator_category;
+  typedef size_t size_type;
+  typedef ptrdiff_t difference_type;
+  
+  typedef _Slist_iterator<_Tp, _Nonconst_traits<_Tp> > iterator;
+  typedef _Slist_iterator<_Tp, _Const_traits<_Tp> >    const_iterator;
+  typedef _Slist_iterator<_Tp, _Traits>                       _Self;
+
+  typedef _Slist_node<value_type> _Node;
+
+  _Slist_iterator(_Node* __x) : _Slist_iterator_base(__x) {}
+  _Slist_iterator() : _Slist_iterator_base(0) {}
+  _Slist_iterator(const iterator& __x) : _Slist_iterator_base(__x._M_node) {}
+
+  reference operator*() const { return ((_Node*) _M_node)->_M_data; }
+
+  _STLP_DEFINE_ARROW_OPERATOR
+
+  _Self& operator++()
+  {
+    _M_incr();
+    return *this;
+  }
+  _Self operator++(int)
+  {
+    _Self __tmp = *this;
+    _M_incr();
+    return __tmp;
+  }
+};
+
+#ifdef _STLP_USE_OLD_HP_ITERATOR_QUERIES
+template <class _Tp, class _Traits>
+inline _Tp* _STLP_CALL value_type(const _Slist_iterator<_Tp, _Traits>&) { return (_Tp*)0; }
+#endif /* OLD_QUERIES */
+
+// Base class that encapsulates details of allocators and simplifies EH
+
+template <class _Tp, class _Alloc> 
+struct _Slist_base {
+  _STLP_FORCE_ALLOCATORS(_Tp, _Alloc)
+  typedef typename _Alloc_traits<_Tp,_Alloc>::allocator_type allocator_type;
+  typedef _Slist_node<_Tp> _Node;
+
+  _Slist_base(const allocator_type& __a) : 
+    _M_head(_STLP_CONVERT_ALLOCATOR(__a, _Node), _Slist_node_base() ) { 
+    _M_head._M_data._M_next = 0; 
+  }
+  ~_Slist_base() { _M_erase_after(&_M_head._M_data, 0); }
+
+protected:
+  typedef typename _Alloc_traits<_Node,_Alloc>::allocator_type _M_node_allocator_type;
+
+  _Slist_node_base* _M_erase_after(_Slist_node_base* __pos)
+  {
+    _Node* __next = (_Node*) (__pos->_M_next);
+    _Slist_node_base* __next_next = __next->_M_next;
+    __pos->_M_next = __next_next;
+    _STLP_STD::_Destroy(&__next->_M_data);
+    _M_head.deallocate(__next,1);
+    return __next_next;
+  }
+  _Slist_node_base* _M_erase_after(_Slist_node_base*, _Slist_node_base*);
+
+public:
+  allocator_type get_allocator() const { 
+    return _STLP_CONVERT_ALLOCATOR((const _M_node_allocator_type&)_M_head, _Tp); 
+  }
+  _STLP_alloc_proxy<_Slist_node_base, _Node, _M_node_allocator_type> _M_head;
+};  
+
+template <class _Tp, _STLP_DEFAULT_ALLOCATOR_SELECT(_Tp) >
+class slist : protected _Slist_base<_Tp,_Alloc>
+{
+private:
+  typedef _Slist_base<_Tp,_Alloc> _Base;
+  typedef slist<_Tp,_Alloc> _Self;
+public:
+  typedef _Tp                value_type;
+  typedef value_type*       pointer;
+  typedef const value_type* const_pointer;
+  typedef value_type&       reference;
+  typedef const value_type& const_reference;
+  typedef size_t            size_type;
+  typedef ptrdiff_t         difference_type;
+  typedef forward_iterator_tag _Iterator_category;
+
+  typedef _Slist_iterator<_Tp, _Nonconst_traits<_Tp> >  iterator;
+  typedef _Slist_iterator<_Tp, _Const_traits<_Tp> >     const_iterator;
+
+  _STLP_FORCE_ALLOCATORS(_Tp, _Alloc)
+  typedef typename _Base::allocator_type allocator_type;
+
+
+private:
+  typedef _Slist_node<_Tp>      _Node;
+  typedef _Slist_node_base      _Node_base;
+  typedef _Slist_iterator_base  _Iterator_base;
+
+  _Node* _M_create_node(const value_type& __x) {
+    _Node* __node = this->_M_head.allocate(1);
+    _STLP_TRY {
+      _Construct(&__node->_M_data, __x);
+      __node->_M_next = 0;
+    }
+    _STLP_UNWIND(this->_M_head.deallocate(__node, 1));
+    return __node;
+  }
+  
+  _Node* _M_create_node() {
+    _Node* __node = this->_M_head.allocate(1);
+    _STLP_TRY {
+      _Construct(&__node->_M_data);
+      __node->_M_next = 0;
+    }
+    _STLP_UNWIND(this->_M_head.deallocate(__node, 1));
+    return __node;
+  }
+
+public:
+  allocator_type get_allocator() const { return _Base::get_allocator(); }
+
+  explicit slist(const allocator_type& __a = allocator_type()) : _Slist_base<_Tp,_Alloc>(__a) {}
+
+  slist(size_type __n, const value_type& __x,
+        const allocator_type& __a =  allocator_type()) : _Slist_base<_Tp,_Alloc>(__a)
+    { _M_insert_after_fill(&this->_M_head._M_data, __n, __x); }
+
+  explicit slist(size_type __n) : _Slist_base<_Tp,_Alloc>(allocator_type())
+    { _M_insert_after_fill(&this->_M_head._M_data, __n, value_type()); }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+  // We don't need any dispatching tricks here, because _M_insert_after_range
+  // already does them.
+  template <class _InputIterator>
+  slist(_InputIterator __first, _InputIterator __last,
+        const allocator_type& __a _STLP_ALLOCATOR_TYPE_DFL) : 
+    _Slist_base<_Tp,_Alloc>(__a)
+  { _M_insert_after_range(&this->_M_head._M_data, __first, __last); }
+# ifdef _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS
+  // VC++ needs this crazyness
+  template <class _InputIterator>
+  slist(_InputIterator __first, _InputIterator __last) :
+    _Slist_base<_Tp,_Alloc>(allocator_type())
+  { _M_insert_after_range(&this->_M_head._M_data, __first, __last); }
+# endif  
+#else /* _STLP_MEMBER_TEMPLATES */
+  slist(const_iterator __first, const_iterator __last,
+        const allocator_type& __a =  allocator_type() ) :
+    _Slist_base<_Tp,_Alloc>(__a)
+    { _M_insert_after_range(&this->_M_head._M_data, __first, __last); }
+  slist(const value_type* __first, const value_type* __last,
+        const allocator_type& __a =  allocator_type()) : 
+    _Slist_base<_Tp,_Alloc>(__a)
+    { _M_insert_after_range(&this->_M_head._M_data, __first, __last); }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  slist(const _Self& __x) : _Slist_base<_Tp,_Alloc>(__x.get_allocator())
+    { _M_insert_after_range(&this->_M_head._M_data, __x.begin(), __x.end()); }
+
+  _Self& operator= (const _Self& __x);
+
+  ~slist() {}
+
+public:
+  // assign(), a generalized assignment member function.  Two
+  // versions: one that takes a count, and one that takes a range.
+  // The range version is a member template, so we dispatch on whether
+  // or not the type is an integer.
+
+  void assign(size_type __n, const _Tp& __val)
+    { _M_fill_assign(__n, __val); }
+
+  void _M_fill_assign(size_type __n, const _Tp& __val);
+
+#ifdef _STLP_MEMBER_TEMPLATES
+
+  template <class _InputIterator>
+  void assign(_InputIterator __first, _InputIterator __last) {
+    typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
+    _M_assign_dispatch(__first, __last, _Integral());
+  }
+
+  template <class _Integer>
+  void _M_assign_dispatch(_Integer __n, _Integer __val, const __true_type&)
+    { _M_fill_assign((size_type) __n, (_Tp) __val); }
+
+  template <class _InputIter>
+  void
+  _M_assign_dispatch(_InputIter __first, _InputIter __last,
+		     const __false_type&) {
+    _Node_base* __prev = &this->_M_head._M_data;
+    _Node* __node = (_Node*) this->_M_head._M_data._M_next;
+    while (__node != 0 && __first != __last) {
+      __node->_M_data = *__first;
+      __prev = __node;
+      __node = (_Node*) __node->_M_next;
+      ++__first;
+    }
+    if (__first != __last)
+      _M_insert_after_range(__prev, __first, __last);
+    else
+      this->_M_erase_after(__prev, 0);
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+public:
+
+  // Experimental new feature: before_begin() returns a
+  // non-dereferenceable iterator that, when incremented, yields
+  // begin().  This iterator may be used as the argument to
+  // insert_after, erase_after, etc.  Note that even for an empty 
+  // slist, before_begin() is not the same iterator as end().  It 
+  // is always necessary to increment before_begin() at least once to
+  // obtain end().
+  iterator before_begin() { return iterator((_Node*) &this->_M_head._M_data); }
+  const_iterator before_begin() const
+    { return const_iterator((_Node*) &this->_M_head._M_data); }
+
+  iterator begin() { return iterator((_Node*)this->_M_head._M_data._M_next); }
+  const_iterator begin() const 
+    { return const_iterator((_Node*)this->_M_head._M_data._M_next);}
+
+  iterator end() { return iterator(0); }
+  const_iterator end() const { return const_iterator(0); }
+
+  size_type size() const { return _Sl_global_inst::size(this->_M_head._M_data._M_next); }
+  
+  size_type max_size() const { return size_type(-1); }
+
+  bool empty() const { return this->_M_head._M_data._M_next == 0; }
+
+  void swap(_Self& __x) { 
+    _STLP_STD::swap(this->_M_head, __x._M_head); 
+  }
+
+public:
+  reference front() { return ((_Node*) this->_M_head._M_data._M_next)->_M_data; }
+  const_reference front() const 
+    { return ((_Node*) this->_M_head._M_data._M_next)->_M_data; }
+  void push_front(const value_type& __x)   {
+    __slist_make_link(&this->_M_head._M_data, _M_create_node(__x));
+  }
+
+# ifndef _STLP_NO_ANACHRONISMS
+  void push_front() { __slist_make_link(&this->_M_head._M_data, _M_create_node());}
+# endif
+
+  void pop_front() {
+    _Node* __node = (_Node*) this->_M_head._M_data._M_next;
+    this->_M_head._M_data._M_next = __node->_M_next;
+    _STLP_STD::_Destroy(&__node->_M_data);
+    this->_M_head.deallocate(__node, 1);
+  }
+
+  iterator previous(const_iterator __pos) {
+    return iterator((_Node*) _Sl_global_inst::__previous(&this->_M_head._M_data, __pos._M_node));
+  }
+  const_iterator previous(const_iterator __pos) const {
+    return const_iterator((_Node*) _Sl_global_inst::__previous(&this->_M_head._M_data, __pos._M_node));
+  }
+
+private:
+  _Node* _M_insert_after(_Node_base* __pos, const value_type& __x) {
+    return (_Node*) (__slist_make_link(__pos, _M_create_node(__x)));
+  }
+
+  _Node* _M_insert_after(_Node_base* __pos) {
+    return (_Node*) (__slist_make_link(__pos, _M_create_node()));
+  }
+
+  void _M_insert_after_fill(_Node_base* __pos,
+                            size_type __n, const value_type& __x) {
+    for (size_type __i = 0; __i < __n; ++__i)
+      __pos = __slist_make_link(__pos, _M_create_node(__x));
+  }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+
+  // Check whether it's an integral type.  If so, it's not an iterator.
+  template <class _InIter>
+  void _M_insert_after_range(_Node_base* __pos, 
+                             _InIter __first, _InIter __last) {
+    typedef typename _Is_integer<_InIter>::_Integral _Integral;
+    _M_insert_after_range(__pos, __first, __last, _Integral());
+  }
+
+  template <class _Integer>
+  void _M_insert_after_range(_Node_base* __pos, _Integer __n, _Integer __x,
+                             const __true_type&) {
+    _M_insert_after_fill(__pos, __n, __x);
+  }
+
+  template <class _InIter>
+  void _M_insert_after_range(_Node_base* __pos,
+                             _InIter __first, _InIter __last,
+                             const __false_type&) {
+    while (__first != __last) {
+      __pos = __slist_make_link(__pos, _M_create_node(*__first));
+      ++__first;
+    }
+  }
+
+#else /* _STLP_MEMBER_TEMPLATES */
+
+  void _M_insert_after_range(_Node_base* __pos,
+                             const_iterator __first, const_iterator __last) {
+    while (__first != __last) {
+      __pos = __slist_make_link(__pos, _M_create_node(*__first));
+      ++__first;
+    }
+  }
+  void _M_insert_after_range(_Node_base* __pos,
+                             const value_type* __first,
+                             const value_type* __last) {
+    while (__first != __last) {
+      __pos = __slist_make_link(__pos, _M_create_node(*__first));
+      ++__first;
+    }
+  }
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+public:
+
+  iterator insert_after(iterator __pos, const value_type& __x) {
+    return iterator(_M_insert_after(__pos._M_node, __x));
+  }
+
+  iterator insert_after(iterator __pos) {
+    return insert_after(__pos, value_type());
+  }
+
+  void insert_after(iterator __pos, size_type __n, const value_type& __x) {
+    _M_insert_after_fill(__pos._M_node, __n, __x);
+  }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+
+  // We don't need any dispatching tricks here, because _M_insert_after_range
+  // already does them.
+  template <class _InIter>
+  void insert_after(iterator __pos, _InIter __first, _InIter __last) {
+    _M_insert_after_range(__pos._M_node, __first, __last);
+  }
+
+#else /* _STLP_MEMBER_TEMPLATES */
+
+  void insert_after(iterator __pos,
+                    const_iterator __first, const_iterator __last) {
+    _M_insert_after_range(__pos._M_node, __first, __last);
+  }
+  void insert_after(iterator __pos,
+                    const value_type* __first, const value_type* __last) {
+    _M_insert_after_range(__pos._M_node, __first, __last);
+  }
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  iterator insert(iterator __pos, const value_type& __x) {
+    return iterator(_M_insert_after(_Sl_global_inst::__previous(&this->_M_head._M_data, __pos._M_node),
+                    __x));
+  }
+
+  iterator insert(iterator __pos) {
+    return iterator(_M_insert_after(_Sl_global_inst::__previous(&this->_M_head._M_data, __pos._M_node),
+                                    value_type()));
+  }
+
+  void insert(iterator __pos, size_type __n, const value_type& __x) {
+    _M_insert_after_fill(_Sl_global_inst::__previous(&this->_M_head._M_data, __pos._M_node), __n, __x);
+  } 
+    
+#ifdef _STLP_MEMBER_TEMPLATES
+
+  // We don't need any dispatching tricks here, because _M_insert_after_range
+  // already does them.
+  template <class _InIter>
+  void insert(iterator __pos, _InIter __first, _InIter __last) {
+    _M_insert_after_range(_Sl_global_inst::__previous(&this->_M_head._M_data, __pos._M_node), 
+                          __first, __last);
+  }
+
+#else /* _STLP_MEMBER_TEMPLATES */
+
+  void insert(iterator __pos, const_iterator __first, const_iterator __last) {
+    _M_insert_after_range(_Sl_global_inst::__previous(&this->_M_head._M_data, __pos._M_node), 
+                          __first, __last);
+  }
+  void insert(iterator __pos, const value_type* __first, 
+                              const value_type* __last) {
+    _M_insert_after_range(_Sl_global_inst::__previous(&this->_M_head._M_data, __pos._M_node), 
+                          __first, __last);
+  }
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+
+public:
+  iterator erase_after(iterator __pos) {
+    return iterator((_Node*) this->_M_erase_after(__pos._M_node));
+  }
+  iterator erase_after(iterator __before_first, iterator __last) {
+    return iterator((_Node*) this->_M_erase_after(__before_first._M_node, 
+                                            __last._M_node));
+  } 
+
+  iterator erase(iterator __pos) {
+    return iterator((_Node*) this->_M_erase_after(_Sl_global_inst::__previous(&this->_M_head._M_data, 
+                                                    __pos._M_node)));
+  }
+  iterator erase(iterator __first, iterator __last) {
+    return iterator((_Node*) this->_M_erase_after(
+      _Sl_global_inst::__previous(&this->_M_head._M_data, __first._M_node), __last._M_node));
+  }
+
+  void resize(size_type new_size, const _Tp& __x);
+  void resize(size_type new_size) { resize(new_size, _Tp()); }
+  void clear() {
+    this->_M_erase_after(&this->_M_head._M_data, 0); 
+  }
+
+public:
+  // Moves the range [__before_first + 1, __before_last + 1) to *this,
+  //  inserting it immediately after __pos.  This is constant time.
+  void splice_after(iterator __pos, 
+                    iterator __before_first, iterator __before_last)
+  {
+    if (__before_first != __before_last) {
+      _Sl_global_inst::__splice_after(__pos._M_node, __before_first._M_node, 
+                           __before_last._M_node);
+    }
+  }
+
+  // Moves the element that follows __prev to *this, inserting it immediately
+  //  after __pos.  This is constant time.
+  void splice_after(iterator __pos, iterator __prev)
+  {
+    _Sl_global_inst::__splice_after(__pos._M_node,
+                         __prev._M_node, __prev._M_node->_M_next);
+  }
+
+  // Removes all of the elements from the list __x to *this, inserting
+  // them immediately after __pos.  __x must not be *this.  Complexity:
+  // linear in __x.size().
+  void splice_after(iterator __pos, _Self& __x)
+  {
+    _Sl_global_inst::__splice_after(__pos._M_node, &__x._M_head._M_data);
+  }
+
+  // Linear in distance(begin(), __pos), and linear in __x.size().
+  void splice(iterator __pos, _Self& __x) {
+    if (__x._M_head._M_data._M_next)
+      _Sl_global_inst::__splice_after(_Sl_global_inst::__previous(&this->_M_head._M_data, __pos._M_node),
+                           &__x._M_head._M_data, _Sl_global_inst::__previous(&__x._M_head._M_data, 0));
+  }
+
+  // Linear in distance(begin(), __pos), and in distance(__x.begin(), __i).
+  void splice(iterator __pos, _Self& __x, iterator __i) {
+    _Sl_global_inst::__splice_after(_Sl_global_inst::__previous(&this->_M_head._M_data, __pos._M_node),
+                         _Sl_global_inst::__previous(&__x._M_head._M_data, __i._M_node),
+                         __i._M_node);
+  }
+
+  // Linear in distance(begin(), __pos), in distance(__x.begin(), __first),
+  // and in distance(__first, __last).
+  void splice(iterator __pos, _Self& __x, iterator __first, iterator __last)
+  {
+    if (__first != __last)
+      _Sl_global_inst::__splice_after(_Sl_global_inst::__previous(&this->_M_head._M_data, __pos._M_node),
+                           _Sl_global_inst::__previous(&__x._M_head._M_data, __first._M_node),
+                           _Sl_global_inst::__previous(__first._M_node, __last._M_node));
+  }
+
+public:
+  void reverse() { 
+    if (this->_M_head._M_data._M_next)
+      this->_M_head._M_data._M_next = _Sl_global_inst::__reverse(this->_M_head._M_data._M_next);
+  }
+
+  void remove(const _Tp& __val); 
+  void unique(); 
+  void merge(_Self& __x);
+  void sort();     
+
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _Predicate>
+  void remove_if(_Predicate __pred) {
+    _Node_base* __cur = &this->_M_head._M_data;
+    while (__cur->_M_next) {
+      if (__pred(((_Node*) __cur->_M_next)->_M_data))
+	this->_M_erase_after(__cur);
+      else
+	__cur = __cur->_M_next;
+    }
+  }
+
+  template <class _BinaryPredicate> 
+  void unique(_BinaryPredicate __pred) {
+    _Node* __cur = (_Node*) this->_M_head._M_data._M_next;
+    if (__cur) {
+      while (__cur->_M_next) {
+	if (__pred(((_Node*)__cur)->_M_data, 
+		   ((_Node*)(__cur->_M_next))->_M_data))
+	  this->_M_erase_after(__cur);
+	else
+	  __cur = (_Node*) __cur->_M_next;
+      }
+    }
+  }
+
+  template <class _StrictWeakOrdering>
+  void merge(slist<_Tp,_Alloc>& __x,
+	     _StrictWeakOrdering __comp) {
+    _Node_base* __n1 = &this->_M_head._M_data;
+    while (__n1->_M_next && __x._M_head._M_data._M_next) {
+      if (__comp(((_Node*) __x._M_head._M_data._M_next)->_M_data,
+		 ((_Node*)       __n1->_M_next)->_M_data))
+	_Sl_global_inst::__splice_after(__n1, &__x._M_head._M_data, __x._M_head._M_data._M_next);
+      __n1 = __n1->_M_next;
+    }
+    if (__x._M_head._M_data._M_next) {
+      __n1->_M_next = __x._M_head._M_data._M_next;
+      __x._M_head._M_data._M_next = 0;
+    }
+  }
+
+  template <class _StrictWeakOrdering> 
+  void sort(_StrictWeakOrdering __comp) {
+    if (this->_M_head._M_data._M_next && this->_M_head._M_data._M_next->_M_next) {
+      slist __carry;
+      slist __counter[64];
+      int __fill = 0;
+      while (!empty()) {
+	_Sl_global_inst::__splice_after(&__carry._M_head._M_data, &this->_M_head._M_data, this->_M_head._M_data._M_next);
+	int __i = 0;
+	while (__i < __fill && !__counter[__i].empty()) {
+	  __counter[__i].merge(__carry, __comp);
+	  __carry.swap(__counter[__i]);
+	  ++__i;
+	}
+	__carry.swap(__counter[__i]);
+	if (__i == __fill)
+	  ++__fill;
+      }
+      
+      for (int __i = 1; __i < __fill; ++__i)
+	__counter[__i].merge(__counter[__i-1], __comp);
+      this->swap(__counter[__fill-1]);
+    }
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+};
+
+template <class _Tp, class _Alloc>
+inline bool  _STLP_CALL
+operator==(const slist<_Tp,_Alloc>& _SL1, const slist<_Tp,_Alloc>& _SL2)
+{
+  typedef typename slist<_Tp,_Alloc>::const_iterator const_iterator;
+  const_iterator __end1 = _SL1.end();
+  const_iterator __end2 = _SL2.end();
+
+  const_iterator __i1 = _SL1.begin();
+  const_iterator __i2 = _SL2.begin();
+  while (__i1 != __end1 && __i2 != __end2 && *__i1 == *__i2) {
+    ++__i1;
+    ++__i2;
+   }
+  return __i1 == __end1 && __i2 == __end2;
+}
+
+# define _STLP_EQUAL_OPERATOR_SPECIALIZED
+# define _STLP_TEMPLATE_HEADER    template <class _Tp, class _Alloc>
+# define _STLP_TEMPLATE_CONTAINER slist<_Tp, _Alloc>
+# include <stl/_relops_cont.h>
+# undef _STLP_TEMPLATE_CONTAINER
+# undef _STLP_TEMPLATE_HEADER
+# undef _STLP_EQUAL_OPERATOR_SPECIALIZED
+
+_STLP_END_NAMESPACE
+
+# if !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_slist.c>
+# endif
+
+#  undef  slist
+#  define __slist__ __FULL_NAME(slist)
+
+#if defined (_STLP_DEBUG) && !defined (_STLP_INTERNAL_DBG_SLIST_H)
+# include <stl/debug/_slist.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+// Specialization of insert_iterator so that insertions will be constant
+// time rather than linear time.
+
+#ifdef _STLP_CLASS_PARTIAL_SPECIALIZATION
+
+template <class _Tp, class _Alloc>
+class insert_iterator<slist<_Tp, _Alloc> > {
+protected:
+  typedef slist<_Tp, _Alloc> _Container;
+  _Container* container;
+  typename _Container::iterator iter;
+public:
+  typedef _Container          container_type;
+  typedef output_iterator_tag iterator_category;
+  typedef void                value_type;
+  typedef void                difference_type;
+  typedef void                pointer;
+  typedef void                reference;
+
+  insert_iterator(_Container& __x, typename _Container::iterator __i) 
+    : container(&__x) {
+    if (__i == __x.begin())
+      iter = __x.before_begin();
+    else
+      iter = __x.previous(__i);
+  }
+
+  insert_iterator<_Container>&
+  operator=(const typename _Container::value_type& __val) { 
+    iter = container->insert_after(iter, __val);
+    return *this;
+  }
+  insert_iterator<_Container>& operator*() { return *this; }
+  insert_iterator<_Container>& operator++() { return *this; }
+  insert_iterator<_Container>& operator++(int) { return *this; }
+};
+
+#endif /* _STLP_CLASS_PARTIAL_SPECIALIZATION */
+
+_STLP_END_NAMESPACE
+
+
+# if defined ( _STLP_USE_WRAPPER_FOR_ALLOC_PARAM )
+# include <stl/wrappers/_slist.h>
+# endif
+
+#endif /* _STLP_INTERNAL_SLIST_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_slist_base.c b/main/source/stlport/stlport/stl/_slist_base.c
new file mode 100644
index 00000000..a7f862af
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_slist_base.c
@@ -0,0 +1,109 @@
+/*
+ *
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+#ifndef _STLP_SLIST_BASE_C
+#define _STLP_SLIST_BASE_C
+
+#ifndef _STLP_INTERNAL_SLIST_BASE_H
+# include <stl/_slist_base.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+# if defined (_STLP_EXPOSE_GLOBALS_IMPLEMENTATION)
+
+template <class _Dummy>
+_Slist_node_base*  _STLP_CALL
+_Sl_global<_Dummy>::__previous(_Slist_node_base* __head,
+			       const _Slist_node_base* __node)
+{
+  while (__head && __head->_M_next != __node)
+    __head = __head->_M_next;
+  return __head;
+}
+
+template <class _Dummy>
+void _STLP_CALL
+_Sl_global<_Dummy>::__splice_after(_Slist_node_base* __pos, _Slist_node_base* __head)
+{
+  _Slist_node_base* __before_last = __previous(__head, 0);
+  if (__before_last != __head) {
+    _Slist_node_base* __after = __pos->_M_next;
+    __pos->_M_next = __head->_M_next;
+    __head->_M_next = 0;
+    __before_last->_M_next = __after;
+  }
+}
+
+template <class _Dummy>
+void _STLP_CALL
+_Sl_global<_Dummy>::__splice_after(_Slist_node_base* __pos,
+				   _Slist_node_base* __before_first,
+				   _Slist_node_base* __before_last)
+{
+  if (__pos != __before_first && __pos != __before_last) {
+    _Slist_node_base* __first = __before_first->_M_next;
+    _Slist_node_base* __after = __pos->_M_next;
+    __before_first->_M_next = __before_last->_M_next;
+    __pos->_M_next = __first;
+    __before_last->_M_next = __after;
+  }
+}
+
+template <class _Dummy>
+_Slist_node_base* _STLP_CALL
+_Sl_global<_Dummy>::__reverse(_Slist_node_base* __node)
+{
+  _Slist_node_base* __result = __node;
+  __node = __node->_M_next;
+  __result->_M_next = 0;
+  while(__node) {
+    _Slist_node_base* __next = __node->_M_next;
+    __node->_M_next = __result;
+    __result = __node;
+    __node = __next;
+  }
+  return __result;
+}
+
+template <class _Dummy> 
+size_t _STLP_CALL
+_Sl_global<_Dummy>::size(_Slist_node_base* __node)
+{
+  size_t __result = 0;
+  for ( ; __node != 0; __node = __node->_M_next)
+    ++__result;
+  return __result;
+}
+
+#endif /* defined (__BUILDING_STLPORT) || ! defined (_STLP_OWN_IOSTREAMS) */
+
+_STLP_END_NAMESPACE
+
+#endif /*  _STLP_SLIST_BASE_C */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_slist_base.h b/main/source/stlport/stlport/stl/_slist_base.h
new file mode 100644
index 00000000..ac8cd64a
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_slist_base.h
@@ -0,0 +1,87 @@
+/*
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_SLIST_BASE_H
+#define _STLP_INTERNAL_SLIST_BASE_H
+
+#ifndef _STLP_CSTDDEF
+#include <cstddef>
+#endif
+
+_STLP_BEGIN_NAMESPACE 
+
+struct _Slist_node_base
+{
+  _Slist_node_base* _M_next;
+};
+
+inline _Slist_node_base*
+__slist_make_link(_Slist_node_base* __prev_node,
+                  _Slist_node_base* __new_node)
+{
+  __new_node->_M_next = __prev_node->_M_next;
+  __prev_node->_M_next = __new_node;
+  return __new_node;
+}
+
+
+template <class _Dummy>
+class _Sl_global {
+public:
+  // those used to be global functions 
+  // moved here to reduce code bloat without templatizing _Slist_iterator_base
+  static size_t _STLP_CALL size(_Slist_node_base* __node);
+  static _Slist_node_base* _STLP_CALL __reverse(_Slist_node_base* __node);
+  static void _STLP_CALL __splice_after(_Slist_node_base* __pos,
+                                        _Slist_node_base* __before_first,
+                                        _Slist_node_base* __before_last);
+  
+  static void _STLP_CALL __splice_after(_Slist_node_base* __pos, _Slist_node_base* __head);
+
+  static _Slist_node_base* _STLP_CALL __previous(_Slist_node_base* __head,
+                                                 const _Slist_node_base* __node);
+  static const _Slist_node_base* _STLP_CALL __previous(const _Slist_node_base* __head,
+					    const _Slist_node_base* __node) {
+    return _Sl_global<_Dummy>::__previous((_Slist_node_base*)__head, __node);
+  }
+};
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT) 
+_STLP_EXPORT_TEMPLATE_CLASS _Sl_global<bool>;
+# endif
+typedef _Sl_global<bool> _Sl_global_inst;
+
+_STLP_END_NAMESPACE
+
+# if !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_slist_base.c>
+# endif
+
+#endif /* _STLP_INTERNAL_SLIST_BASE_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_sparc_atomic.h b/main/source/stlport/stlport/stl/_sparc_atomic.h
new file mode 100644
index 00000000..acdfdaaa
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_sparc_atomic.h
@@ -0,0 +1,60 @@
+
+// Currently, SUN CC requires object file
+
+#if defined (__GNUC__)
+
+/*
+**  int _STLP_atomic_exchange (__stl_atomic_t *pvalue, __stl_atomic_t value)
+*/
+ 
+# ifdef __sparc_v9__
+
+#  ifdef __arch64__
+
+#   define _STLP_EXCH_ASM  asm volatile ("casx [%3], %4, %0 ;  membar  #LoadLoad | #LoadStore " : \
+                   "=r" (_L_value2), "=m" (*_L_pvalue1) : \
+                   "m" (*_L_pvalue1), "r" (_L_pvalue1), "r" (_L_value1), "0" (_L_value2) )
+
+#  else /* __arch64__ */
+
+#   define _STLP_EXCH_ASM  asm volatile ("cas [%3], %4, %0" : \
+                   "=r" (_L_value2), "=m" (*_L_pvalue1) : \
+                   "m" (*_L_pvalue1), "r" (_L_pvalue1), "r" (_L_value1), "0" (_L_value2) )
+#  endif
+
+# else /* __sparc_v9__ */
+
+#  define _STLP_EXCH_ASM asm volatile ("swap [%3], %0 " : \
+                                       "=r" (_L_value2), "=m" (*_L_pvalue1) : \
+                                       "m" (*_L_pvalue1), "r" (_L_pvalue1),  "0" (_L_value2) )
+# endif
+
+
+#  define _STLP_ATOMIC_EXCHANGE(__pvalue1, __value2) \
+ ({  register volatile __stl_atomic_t *_L_pvalue1 = __pvalue1; \
+     register __stl_atomic_t _L_value1, _L_value2 =  __value2 ; \
+     do { _L_value1 = *_L_pvalue1; _STLP_EXCH_ASM; } while ( _L_value1 != _L_value2 ) ; \
+     _L_value1; })
+
+#  define _STLP_ATOMIC_INCREMENT(__pvalue1) \
+ {  register volatile __stl_atomic_t *_L_pvalue1 = __pvalue1; \
+    register __stl_atomic_t _L_value1, _L_value2; \
+    do { _L_value1 = *_L_pvalue1;  _L_value2 = _L_value1+1; _STLP_EXCH_ASM; } while ( _L_value1 != _L_value2 ) ; }
+
+#  define _STLP_ATOMIC_DECREMENT(__pvalue1) \
+ {  register volatile __stl_atomic_t *_L_pvalue1 = __pvalue1; \
+    register __stl_atomic_t _L_value1, _L_value2; \
+    do { _L_value1 = *_L_pvalue1;  _L_value2 = _L_value1-1; _STLP_EXCH_ASM; } while ( _L_value1 != _L_value2 ) ; }
+
+# elif ! defined (_STLP_NO_EXTERN_INLINE) 
+
+extern "C" __stl_atomic_t _STLP_atomic_exchange(__stl_atomic_t * __x, __stl_atomic_t __v);
+extern "C" void _STLP_atomic_decrement(__stl_atomic_t* i);
+extern "C" void _STLP_atomic_increment(__stl_atomic_t* i);
+
+#  define _STLP_ATOMIC_INCREMENT(__x)           _STLP_atomic_increment((__stl_atomic_t*)__x)
+#  define _STLP_ATOMIC_DECREMENT(__x)           _STLP_atomic_decrement((__stl_atomic_t*)__x)
+#  define _STLP_ATOMIC_EXCHANGE(__x, __y)       _STLP_atomic_exchange((__stl_atomic_t*)__x, (__stl_atomic_t)__y)
+
+# endif
+
diff --git a/main/source/stlport/stlport/stl/_sstream.c b/main/source/stlport/stlport/stl/_sstream.c
new file mode 100644
index 00000000..19ada4c6
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_sstream.c
@@ -0,0 +1,543 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+#ifndef _STLP_SSTREAM_C
+#define _STLP_SSTREAM_C
+
+#ifndef _STLP_SSTREAM_H
+# include <stl/_sstream.h>
+#endif
+
+# if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION)
+
+# if defined ( _STLP_NESTED_TYPE_PARAM_BUG )
+// no wint_t is supported for this mode
+# define __BSB_int_type__ int
+# define __BSB_pos_type__ streampos
+# else
+# define __BSB_int_type__ _STLP_TYPENAME_ON_RETURN_TYPE basic_stringbuf<_CharT, _Traits, _Alloc>::int_type
+# define __BSB_pos_type__ _STLP_TYPENAME_ON_RETURN_TYPE basic_stringbuf<_CharT, _Traits, _Alloc>::pos_type
+# endif
+
+_STLP_BEGIN_NAMESPACE
+
+//----------------------------------------------------------------------
+// Non-inline stringbuf member functions.
+
+// Constructors.  Note that the base class constructor sets all of the
+// get and area pointers to null.
+
+template <class _CharT, class _Traits, class _Alloc>
+basic_stringbuf<_CharT, _Traits, _Alloc>
+  ::basic_stringbuf(ios_base::openmode __mode)
+    : basic_streambuf<_CharT, _Traits>(), _M_mode(__mode), _M_str()
+{}
+
+template <class _CharT, class _Traits, class _Alloc>
+basic_stringbuf<_CharT, _Traits, _Alloc>
+  ::basic_stringbuf(const basic_string<_CharT, _Traits, _Alloc>& __s, ios_base::openmode __mode)
+    : basic_streambuf<_CharT, _Traits>(), _M_mode(__mode), _M_str(__s)
+{
+  _M_set_ptrs();
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+basic_stringbuf<_CharT, _Traits, _Alloc>::~basic_stringbuf()
+{}
+
+// Set the underlying string to a new value.
+template <class _CharT, class _Traits, class _Alloc>
+void 
+basic_stringbuf<_CharT, _Traits, _Alloc>::str(const basic_string<_CharT, _Traits, _Alloc>& __s)
+{
+  _M_str = __s;
+  _M_set_ptrs();
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+void 
+basic_stringbuf<_CharT, _Traits, _Alloc>::_M_set_ptrs() {
+  _CharT* __data_ptr = __CONST_CAST(_CharT*,_M_str.data());
+  _CharT* __data_end = __data_ptr + _M_str.size();
+  // The initial read position is the beginning of the string.
+  if (_M_mode & ios_base::in)
+    this->setg(__data_ptr, __data_ptr, __data_end);
+  
+  // The initial write position is the beginning of the string.
+  if (_M_mode & ios_base::out) {
+    if (_M_mode & ios_base::app)
+      this->setp(__data_end, __data_end);
+    else
+      this->setp(__data_ptr, __data_end);
+  }
+}
+
+// Precondition: gptr() >= egptr().  Returns a character, if one is available.
+template <class _CharT, class _Traits, class _Alloc>
+__BSB_int_type__
+basic_stringbuf<_CharT, _Traits, _Alloc>::underflow()
+{
+  return this->gptr() != this->egptr()
+    ? _Traits::to_int_type(*this->gptr())
+    : _Traits::eof();
+}
+
+// Precondition: gptr() >= egptr().
+template <class _CharT, class _Traits, class _Alloc>
+__BSB_int_type__
+basic_stringbuf<_CharT, _Traits, _Alloc>::uflow()
+{
+  if (this->gptr() != this->egptr()) {
+    int_type __c = _Traits::to_int_type(*this->gptr());
+    this->gbump(1);
+    return __c;
+  }
+  else
+    return _Traits::eof();
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+__BSB_int_type__
+basic_stringbuf<_CharT, _Traits, _Alloc>::pbackfail(int_type __c)
+{
+  if (this->gptr() != this->eback()) {
+    if (!_Traits::eq_int_type(__c, _Traits::eof())) {
+      if (_Traits::eq(_Traits::to_char_type(__c), this->gptr()[-1])) {
+        this->gbump(-1);
+        return __c;
+      }
+      else if (_M_mode & ios_base::out) {
+        this->gbump(-1);
+        *this->gptr() = __c;
+        return __c;
+      }
+      else
+        return _Traits::eof();
+    }
+    else {
+      this->gbump(-1);
+      return _Traits::not_eof(__c);
+    }
+  }
+  else
+    return _Traits::eof();
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+__BSB_int_type__
+basic_stringbuf<_CharT, _Traits, _Alloc>::overflow(int_type __c)
+{
+  // fbp : reverse order of "ifs" to pass Dietmar's test.
+  // Apparently, standard allows overflow with eof even for read-only streams.
+  if (!_Traits::eq_int_type(__c, _Traits::eof())) {
+    if (_M_mode & ios_base::out) {
+      if (!(_M_mode & ios_base::in)) {
+        // It's a write-only streambuf, so we can use special append buffer.
+        if (this->pptr() == this->epptr())
+          this->_M_append_buffer();
+      
+        if (this->pptr() != this->epptr()) {
+          *this->pptr() = _Traits::to_char_type(__c);
+          this->pbump(1);
+          return __c;
+        }
+        else
+          return _Traits::eof();
+      }
+
+      else {
+        // We're not using a special append buffer, just the string itself.
+        if (this->pptr() == this->epptr()) {
+          ptrdiff_t __offset = this->gptr() - this->eback();
+          _M_str.push_back(_Traits::to_char_type(__c));
+
+	  _CharT* __data_ptr = __CONST_CAST(_CharT*,_M_str.data());
+	  size_t __data_size = _M_str.size();
+
+          this->setg(__data_ptr, __data_ptr + __offset, __data_ptr+__data_size);
+          this->setp(__data_ptr, __data_ptr + __data_size);
+          this->pbump((int)__data_size);
+          return __c;
+        }
+        else {
+          *this->pptr() = _Traits::to_char_type(__c);
+          this->pbump(1);
+          return __c;
+        }
+      }
+    }
+    else                          // Overflow always fails if it's read-only 
+      return _Traits::eof();
+  }
+  else                        // __c is EOF, so we don't have to do anything
+    return _Traits::not_eof(__c);
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+streamsize 
+basic_stringbuf<_CharT, _Traits, _Alloc>::xsputn(const char_type* __s,
+                                                 streamsize __n)
+{
+  streamsize __nwritten = 0;
+
+  if ((_M_mode & ios_base::out) && __n > 0) {
+    // If the put pointer is somewhere in the middle of the string,
+    // then overwrite instead of append.
+    if (this->pbase() == _M_str.data() ) {
+      ptrdiff_t __avail = _M_str.data() + _M_str.size() - this->pptr();
+      if (__avail > __n) {
+        _Traits::copy(this->pptr(), __s, __n);
+        this->pbump((int)__n);
+        return __n;
+      }
+      else {
+        _Traits::copy(this->pptr(), __s, __avail);
+        __nwritten += __avail;
+        __n -= __avail;
+        __s += __avail;
+        this->setp(_M_Buf, _M_Buf + __STATIC_CAST(int,_S_BufSiz));
+      }
+    }
+
+    // At this point we know we're appending.
+    if (_M_mode & ios_base::in) {
+      ptrdiff_t __get_offset = this->gptr() - this->eback();
+      _M_str.append(__s, __s + __n);
+      
+      _CharT* __data_ptr = __CONST_CAST(_CharT*,_M_str.data());
+      size_t __data_size = _M_str.size();
+
+      this->setg(__data_ptr, __data_ptr + __get_offset, __data_ptr+__data_size);
+      this->setp(__data_ptr, __data_ptr + __data_size);
+      this->pbump((int)__data_size);
+    }
+    else {
+      _M_append_buffer();
+      _M_str.append(__s, __s + __n);
+    }
+
+    __nwritten += __n;
+  }
+
+  return __nwritten;
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+streamsize 
+basic_stringbuf<_CharT, _Traits, _Alloc>::_M_xsputnc(char_type __c,
+                                                     streamsize __n)
+{
+  streamsize __nwritten = 0;
+
+  if ((_M_mode & ios_base::out) && __n > 0) {
+    // If the put pointer is somewhere in the middle of the string,
+    // then overwrite instead of append.
+    if (this->pbase() == _M_str.data()) {
+      ptrdiff_t __avail = _M_str.data() + _M_str.size() - this->pptr();
+      if (__avail > __n) {
+        _Traits::assign(this->pptr(), __n, __c);
+        this->pbump((int)__n);
+        return __n;
+      }
+      else {
+        _Traits::assign(this->pptr(), __avail, __c);
+        __nwritten += __avail;
+        __n -= __avail;
+        this->setp(_M_Buf, _M_Buf + __STATIC_CAST(int,_S_BufSiz));
+      }
+    }
+
+    // At this point we know we're appending.
+    if (this->_M_mode & ios_base::in) {
+      ptrdiff_t __get_offset = this->gptr() - this->eback();
+      _M_str.append(__n, __c);
+
+      _CharT* __data_ptr = __CONST_CAST(_CharT*,_M_str.data());
+      size_t __data_size = _M_str.size();
+
+      this->setg(__data_ptr, __data_ptr + __get_offset, __data_ptr+__data_size);
+      this->setp(__data_ptr, __data_ptr + __data_size);
+      this->pbump((int)__data_size);
+
+    }
+    else {
+      _M_append_buffer();
+      _M_str.append(__n, __c);      
+    }
+
+    __nwritten += __n;
+  }
+
+  return __nwritten;
+}
+
+// According to the C++ standard the effects of setbuf are implementation
+// defined, except that setbuf(0, 0) has no effect.  In this implementation,
+// setbuf(<anything>, n), for n > 0, calls reserve(n) on the underlying
+// string.
+template <class _CharT, class _Traits, class _Alloc>
+basic_streambuf<_CharT, _Traits>*
+basic_stringbuf<_CharT, _Traits, _Alloc>::setbuf(_CharT*, streamsize __n)
+{
+  if (__n > 0) {
+    bool __do_get_area = false;
+    bool __do_put_area = false;
+    ptrdiff_t __offg = 0;
+    ptrdiff_t __offp = 0;
+
+    if (this->pbase() == _M_str.data()) {
+      __do_put_area = true;
+      __offp = this->pptr() - this->pbase();
+    }
+
+    if (this->eback() == _M_str.data()) {
+      __do_get_area = true;
+      __offg = this->gptr() - this->eback();
+    }
+
+    if ((_M_mode & ios_base::out) && !(_M_mode & ios_base::in))
+      _M_append_buffer();
+
+    _M_str.reserve(__n);
+
+    _CharT* __data_ptr = __CONST_CAST(_CharT*,_M_str.data());
+    size_t __data_size = _M_str.size();
+
+    if (__do_get_area) {
+      this->setg(__data_ptr, __data_ptr + __offg, __data_ptr+__data_size);
+    }
+
+    if (__do_put_area) {
+      this->setp(__data_ptr, __data_ptr+__data_size);
+      this->pbump((int)__offp);
+    }
+  }
+
+  return this;
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+__BSB_pos_type__
+basic_stringbuf<_CharT, _Traits, _Alloc>::seekoff(off_type __off, 
+            ios_base::seekdir __dir,
+            ios_base::openmode __mode)
+{
+  bool __in  = false;
+  bool __out = false;
+  
+  if ((__mode & (ios_base::in | ios_base::out)) == (ios_base::in | ios_base::out) ) {
+    if (__dir == ios_base::beg || __dir == ios_base::end)
+      __in = __out = true;
+  }
+  else if (__mode & ios_base::in)
+    __in = true;
+  else if (__mode & ios_base::out)
+    __out = true;
+
+  if (!__in && !__out)
+    return pos_type(off_type(-1));
+  else if ((__in  && (!(_M_mode & ios_base::in) || this->gptr() == 0)) ||
+           (__out && (!(_M_mode & ios_base::out) || this->pptr() == 0)))
+    return pos_type(off_type(-1));
+
+  if ((_M_mode & ios_base::out) && !(_M_mode & ios_base::in))
+    _M_append_buffer();
+
+  streamoff __newoff;
+  switch(__dir) {
+  case ios_base::beg:
+    __newoff = 0;
+    break;
+  case ios_base::end:
+    __newoff = _M_str.size();
+    break;
+  case ios_base::cur:
+    __newoff = __in ? this->gptr() - this->eback() 
+                    : this->pptr() - this->pbase();
+    break;
+  default:
+    return pos_type(off_type(-1));
+  }
+
+  __off += __newoff;
+
+  if (__in) {
+    ptrdiff_t __n = this->egptr() - this->eback();
+
+    if (__off < 0 || __off > __n)
+      return pos_type(off_type(-1));
+    else
+      this->setg(this->eback(), this->eback() + __off, this->eback() + __n);
+  }
+
+  if (__out) {
+    ptrdiff_t __n = this->epptr() - this->pbase();
+
+    if (__off < 0 || __off > __n)
+      return pos_type(off_type(-1));
+    else {
+      this->setp(this->pbase(), this->pbase() + __n);
+      this->pbump((int)__off);
+    }
+  }
+
+  return pos_type(__off);
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+__BSB_pos_type__
+basic_stringbuf<_CharT, _Traits, _Alloc>
+  ::seekpos(pos_type __pos, ios_base::openmode __mode)
+{
+  bool __in  = (__mode & ios_base::in) != 0;
+  bool __out = (__mode & ios_base::out) != 0;
+
+  if ((__in  && (!(_M_mode & ios_base::in) || this->gptr() == 0)) ||
+      (__out && (!(_M_mode & ios_base::out) || this->pptr() == 0)))
+    return pos_type(off_type(-1));
+
+  const off_type __n = __pos - pos_type(off_type(0));
+  if ((_M_mode & ios_base::out) && !(_M_mode & ios_base::in))
+    _M_append_buffer();
+
+  if (__in) {
+    if (__n < 0 || __n > this->egptr() - this->eback())
+      return pos_type(off_type(-1));
+    this->setg(this->eback(), this->eback() + __n, this->egptr());
+  }
+
+  if (__out) {
+    if (__n < 0 || size_t(__n) > _M_str.size())
+      return pos_type(off_type(-1));
+
+    _CharT* __data_ptr = __CONST_CAST(_CharT*,_M_str.data());
+    size_t __data_size = _M_str.size();
+    
+    this->setp(__data_ptr, __data_ptr+__data_size);
+    this->pbump((int)__n);
+  }
+
+  return __pos;
+}
+
+// This is declared as a const member function because it is 
+// called by basic_stringbuf<>::str().  Precondition: this is a
+// write-only stringbuf.  We can't use an output buffer for read-
+// write stringbufs.  Postcondition: pptr is reset to the beginning
+// of the buffer.
+template <class _CharT, class _Traits, class _Alloc>
+void basic_stringbuf<_CharT, _Traits, _Alloc>::_M_append_buffer() const
+
+{
+  // Do we have a buffer to append?
+  if (this->pbase() == this->_M_Buf && this->pptr() != this->_M_Buf) {
+    basic_stringbuf<_CharT, _Traits, _Alloc>* __this = __CONST_CAST(_Self*,this);
+    __this->_M_str.append((const _CharT*)this->pbase(), (const _CharT*)this->pptr());
+    __this->setp(__CONST_CAST(_CharT*,_M_Buf),
+                 __CONST_CAST(_CharT*,_M_Buf + __STATIC_CAST(int,_S_BufSiz)));
+  }
+
+  // Have we run off the end of the string?
+  else if (this->pptr() == this->epptr()) {
+    basic_stringbuf<_CharT, _Traits, _Alloc>* __this = __CONST_CAST(_Self*,this);
+    __this->setp(__CONST_CAST(_CharT*,_M_Buf),
+                 __CONST_CAST(_CharT*,_M_Buf + __STATIC_CAST(int,_S_BufSiz)));
+  }
+}
+
+//----------------------------------------------------------------------
+// Non-inline istringstream member functions.
+
+template <class _CharT, class _Traits, class _Alloc>
+basic_istringstream<_CharT, _Traits, _Alloc>
+  ::basic_istringstream(ios_base::openmode __mode)
+    : basic_istream<_CharT, _Traits>(0),
+      _M_buf(__mode | ios_base::in)
+{
+  this->init(&_M_buf);
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+basic_istringstream<_CharT, _Traits, _Alloc>
+  ::basic_istringstream(const _String& __str,ios_base::openmode __mode)
+    : basic_istream<_CharT, _Traits>(0),
+      _M_buf(__str, __mode | ios_base::in)
+{
+  this->init(&_M_buf);
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+basic_istringstream<_CharT, _Traits, _Alloc>::~basic_istringstream()
+{}
+
+//----------------------------------------------------------------------
+// Non-inline ostringstream member functions.
+
+template <class _CharT, class _Traits, class _Alloc>
+basic_ostringstream<_CharT, _Traits, _Alloc>
+  ::basic_ostringstream(ios_base::openmode __mode)
+    : basic_ostream<_CharT, _Traits>(0),
+      _M_buf(__mode | ios_base::out)
+{
+  this->init(&_M_buf);
+}
+  
+template <class _CharT, class _Traits, class _Alloc>
+basic_ostringstream<_CharT, _Traits, _Alloc>
+  ::basic_ostringstream(const _String& __str, ios_base::openmode __mode)
+    : basic_ostream<_CharT, _Traits>(0),
+      _M_buf(__str, __mode | ios_base::out)
+{
+  this->init(&_M_buf);
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+basic_ostringstream<_CharT, _Traits, _Alloc>::~basic_ostringstream()
+{}
+
+//----------------------------------------------------------------------
+// Non-inline stringstream member functions.
+
+template <class _CharT, class _Traits, class _Alloc>
+basic_stringstream<_CharT, _Traits, _Alloc>
+  ::basic_stringstream(ios_base::openmode __mode)
+    : basic_iostream<_CharT, _Traits>(0), _M_buf(__mode)
+{
+   this->init(&_M_buf);
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+basic_stringstream<_CharT, _Traits, _Alloc>
+  ::basic_stringstream(const _String& __str, ios_base::openmode __mode)
+    : basic_iostream<_CharT, _Traits>(0), _M_buf(__str, __mode)
+{
+  this->init(&_M_buf);
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+basic_stringstream<_CharT, _Traits, _Alloc>::~basic_stringstream()
+{}
+
+_STLP_END_NAMESPACE
+
+# undef __BSB_int_type__
+# undef __BSB_pos_type__
+
+# endif /* EXPOSE */
+
+#endif /* _STLP_SSTREAM_C */
diff --git a/main/source/stlport/stlport/stl/_sstream.h b/main/source/stlport/stlport/stl/_sstream.h
new file mode 100644
index 00000000..3faef5b8
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_sstream.h
@@ -0,0 +1,252 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+
+// This header defines classes basic_stringbuf, basic_istringstream,
+// basic_ostringstream, and basic_stringstream.  These classes 
+// represent streamsbufs and streams whose sources or destinations are
+// C++ strings.
+
+#ifndef _STLP_SSTREAM_H
+#define _STLP_SSTREAM_H
+
+#ifndef _STLP_INTERNAL_STREAMBUF
+# include <stl/_streambuf.h>
+#endif
+
+#ifndef _STLP_INTERNAL_ISTREAM_H
+# include <stl/_istream.h> // Includes <ostream>, <ios>, <iosfwd>
+#endif
+
+#ifndef _STLP_STRING_H
+# include <stl/_string.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+//----------------------------------------------------------------------
+// This version of basic_stringbuf relies on the internal details of
+// basic_string.  It relies on the fact that, in this implementation,
+// basic_string's iterators are pointers.  It also assumes (as allowed
+// by the standard) that _CharT is a POD type.
+
+// We have a very small buffer for the put area, just so that we don't
+// have to use append() for every sputc.  Conceptually, the buffer
+// immediately follows the end of the underlying string.  We use this
+// buffer when appending to write-only streambufs, but we don't use it
+// for read-write streambufs.
+
+template <class _CharT, class _Traits, class _Alloc>
+class basic_stringbuf : public basic_streambuf<_CharT, _Traits>
+{
+public:                         // Typedefs.
+  typedef _CharT                     char_type;
+  typedef typename _Traits::int_type int_type;
+  typedef typename _Traits::pos_type pos_type;
+  typedef typename _Traits::off_type off_type;
+  typedef _Traits                    traits_type;
+
+  typedef basic_streambuf<_CharT, _Traits>          _Base;
+  typedef basic_stringbuf<_CharT, _Traits, _Alloc>  _Self;
+  typedef basic_string<_CharT, _Traits, _Alloc>     _String;
+
+public:                         // Constructors, destructor.
+  explicit basic_stringbuf(ios_base::openmode __mode
+                                      = ios_base::in | ios_base::out);
+  explicit basic_stringbuf(const _String& __s, ios_base::openmode __mode
+                                      = ios_base::in | ios_base::out);
+  virtual ~basic_stringbuf();
+
+public:                         // Get or set the string.
+  _String str() const { _M_append_buffer(); return _M_str; }
+  void str(const _String& __s);
+
+protected:                      // Overridden virtual member functions.
+  virtual int_type underflow();
+  virtual int_type uflow();
+  virtual int_type pbackfail(int_type __c);
+  virtual int_type overflow(int_type __c);
+  int_type pbackfail() {return pbackfail(_Traits::eof());}
+  int_type overflow() {return overflow(_Traits::eof());}
+
+  virtual streamsize xsputn(const char_type* __s, streamsize __n);
+  virtual streamsize _M_xsputnc(char_type __c, streamsize __n);
+
+  virtual _Base* setbuf(_CharT* __buf, streamsize __n);
+  virtual pos_type seekoff(off_type __off, ios_base::seekdir __dir,
+                           ios_base::openmode __mode 
+                                      = ios_base::in | ios_base::out);
+  virtual pos_type seekpos(pos_type __pos, ios_base::openmode __mode 
+                                      = ios_base::in | ios_base::out);
+
+private:                        // Helper functions.
+  // Append the internal buffer to the string if necessary.
+  void _M_append_buffer() const;
+  void _M_set_ptrs();
+
+private:
+  ios_base::openmode _M_mode;
+  mutable basic_string<_CharT, _Traits, _Alloc> _M_str;
+
+  enum _JustName { _S_BufSiz = 8 };
+  _CharT _M_Buf[ 8 /* _S_BufSiz */];
+};
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+_STLP_EXPORT_TEMPLATE_CLASS basic_stringbuf<char, char_traits<char>, allocator<char> >;
+#  if !defined (_STLP_NO_WCHAR_T)
+_STLP_EXPORT_TEMPLATE_CLASS basic_stringbuf<wchar_t, char_traits<wchar_t>, allocator<wchar_t>  >;
+#  endif
+# endif /* _STLP_USE_TEMPLATE_EXPORT */
+
+//----------------------------------------------------------------------
+// Class basic_istringstream, an input stream that uses a stringbuf.
+
+template <class _CharT, class _Traits, class _Alloc>
+class basic_istringstream : public basic_istream<_CharT, _Traits>
+{
+public:                         // Typedefs
+  typedef typename _Traits::char_type   char_type;
+  typedef typename _Traits::int_type    int_type;
+  typedef typename _Traits::pos_type    pos_type;
+  typedef typename _Traits::off_type    off_type;
+  typedef _Traits traits_type;
+
+  typedef basic_ios<_CharT, _Traits>                _Basic_ios;
+  typedef basic_istream<_CharT, _Traits>            _Base;
+  typedef basic_string<_CharT, _Traits, _Alloc>     _String;
+  typedef basic_stringbuf<_CharT, _Traits, _Alloc>  _Buf;
+
+public:                         // Constructors, destructor.
+  basic_istringstream(ios_base::openmode __mode = ios_base::in);
+  basic_istringstream(const _String& __str,
+                      ios_base::openmode __mode = ios_base::in);
+  ~basic_istringstream();
+
+public:                         // Member functions
+
+  basic_stringbuf<_CharT, _Traits, _Alloc>* rdbuf() const
+    { return __CONST_CAST(_Buf*,&_M_buf); }
+
+  _String str() const { return _M_buf.str(); }
+  void str(const _String& __s) { _M_buf.str(__s); }
+  
+private:
+  basic_stringbuf<_CharT, _Traits, _Alloc> _M_buf;
+};
+
+
+//----------------------------------------------------------------------
+// Class basic_ostringstream, an output stream that uses a stringbuf.
+
+template <class _CharT, class _Traits, class _Alloc>
+class basic_ostringstream : public basic_ostream<_CharT, _Traits>
+{
+public:                         // Typedefs
+  typedef typename _Traits::char_type   char_type;
+  typedef typename _Traits::int_type    int_type;
+  typedef typename _Traits::pos_type    pos_type;
+  typedef typename _Traits::off_type    off_type;
+  typedef _Traits traits_type;
+
+  typedef basic_ios<_CharT, _Traits>                _Basic_ios;
+  typedef basic_ostream<_CharT, _Traits>            _Base;
+  typedef basic_string<_CharT, _Traits, _Alloc>     _String;
+  typedef basic_stringbuf<_CharT, _Traits, _Alloc>  _Buf;
+
+public:                         // Constructors, destructor.
+  basic_ostringstream(ios_base::openmode __mode = ios_base::out);
+  basic_ostringstream(const _String& __str,
+                      ios_base::openmode __mode = ios_base::out);
+  ~basic_ostringstream();
+
+public:                         // Member functions.
+
+  basic_stringbuf<_CharT, _Traits, _Alloc>* rdbuf() const
+    { return __CONST_CAST(_Buf*,&_M_buf); }
+
+  _String str() const { return _M_buf.str(); }
+    void str(const _String& __s) { _M_buf.str(__s); } // dwa 02/07/00 - BUG STOMPER DAVE
+
+
+private:
+  basic_stringbuf<_CharT, _Traits, _Alloc> _M_buf;
+};
+
+
+//----------------------------------------------------------------------
+// Class basic_stringstream, a bidirectional stream that uses a stringbuf.
+
+template <class _CharT, class _Traits, class _Alloc>
+class basic_stringstream : public basic_iostream<_CharT, _Traits>
+{
+public:                         // Typedefs
+  typedef typename _Traits::char_type char_type;
+  typedef typename _Traits::int_type  int_type;
+  typedef typename _Traits::pos_type  pos_type;
+  typedef typename _Traits::off_type  off_type;
+  typedef _Traits  traits_type;
+
+  typedef basic_ios<_CharT, _Traits>                 _Basic_ios;
+  typedef basic_iostream<_CharT, _Traits>            _Base;
+  typedef basic_string<_CharT, _Traits, _Alloc>      _String;
+  typedef basic_stringbuf<_CharT, _Traits, _Alloc>  _Buf;
+  
+  typedef ios_base::openmode openmode;
+
+public:                         // Constructors, destructor.
+  basic_stringstream(openmode __mod = ios_base::in | ios_base::out);
+  basic_stringstream(const _String& __str,
+                     openmode __mod = ios_base::in | ios_base::out);
+  ~basic_stringstream();
+
+public:                         // Member functions.
+
+  basic_stringbuf<_CharT, _Traits, _Alloc>* rdbuf() const
+    { return __CONST_CAST(_Buf*,&_M_buf); }
+
+  _String str() const { return _M_buf.str(); }
+    void str(const _String& __s) { _M_buf.str(__s); }
+
+private:
+  basic_stringbuf<_CharT, _Traits, _Alloc> _M_buf;
+};
+
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+_STLP_EXPORT_TEMPLATE_CLASS basic_istringstream<char, char_traits<char>, allocator<char> >;
+_STLP_EXPORT_TEMPLATE_CLASS basic_ostringstream<char, char_traits<char>, allocator<char> >;
+_STLP_EXPORT_TEMPLATE_CLASS basic_stringstream<char, char_traits<char>, allocator<char> >;
+#  if !defined (_STLP_NO_WCHAR_T)
+_STLP_EXPORT_TEMPLATE_CLASS basic_istringstream<wchar_t, char_traits<wchar_t>, allocator<wchar_t>  >;
+_STLP_EXPORT_TEMPLATE_CLASS basic_ostringstream<wchar_t, char_traits<wchar_t>, allocator<wchar_t>  >;
+_STLP_EXPORT_TEMPLATE_CLASS basic_stringstream<wchar_t, char_traits<wchar_t>, allocator<wchar_t>  >;
+#  endif
+# endif /* _STLP_USE_TEMPLATE_EXPORT */
+
+_STLP_END_NAMESPACE
+
+# if  defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION) && !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_sstream.c>
+# endif
+
+#endif /* _STLP_SSTREAM_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_stack.h b/main/source/stlport/stlport/stl/_stack.h
new file mode 100644
index 00000000..f2af1ed6
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_stack.h
@@ -0,0 +1,105 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_STACK_H
+#define _STLP_INTERNAL_STACK_H
+
+#ifndef _STLP_INTERNAL_DEQUE_H
+# include <stl/_deque.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+# if !defined ( _STLP_LIMITED_DEFAULT_TEMPLATES )
+template <class _Tp, class _Sequence = deque<_Tp> >
+# elif defined ( _STLP_MINIMUM_DEFAULT_TEMPLATE_PARAMS )
+# define _STLP_STACK_ARGS _Tp
+template <class _Tp>
+# else
+template <class _Tp, class _Sequence>
+# endif
+class stack {
+
+# ifdef _STLP_STACK_ARGS 
+  typedef deque<_Tp> _Sequence;
+# endif
+
+public:
+  typedef typename _Sequence::value_type      value_type;
+  typedef typename _Sequence::size_type       size_type;
+  typedef          _Sequence                  container_type;
+
+  typedef typename _Sequence::reference       reference;
+  typedef typename _Sequence::const_reference const_reference;
+protected:
+  _Sequence c;
+public:
+  stack() : c() {}
+  explicit stack(const _Sequence& __s) : c(__s) {}
+
+  bool empty() const { return c.empty(); }
+  size_type size() const { return c.size(); }
+  reference top() { return c.back(); }
+  const_reference top() const { return c.back(); }
+  void push(const value_type& __x) { c.push_back(__x); }
+  void pop() { c.pop_back(); }
+  const _Sequence& _Get_c() const { return c; }
+};
+
+# ifndef _STLP_STACK_ARGS
+#  define _STLP_STACK_ARGS _Tp, _Sequence
+#  define _STLP_STACK_HEADER_ARGS class _Tp, class _Sequence
+# else
+#  define _STLP_STACK_HEADER_ARGS class _Tp
+# endif
+
+template < _STLP_STACK_HEADER_ARGS >
+inline bool _STLP_CALL  operator==(const stack< _STLP_STACK_ARGS >& __x, const stack< _STLP_STACK_ARGS >& __y)
+{
+  return __x._Get_c() == __y._Get_c();
+}
+
+template < _STLP_STACK_HEADER_ARGS >
+inline bool _STLP_CALL  operator<(const stack< _STLP_STACK_ARGS >& __x, const stack< _STLP_STACK_ARGS >& __y)
+{
+  return __x._Get_c() < __y._Get_c();
+}
+
+_STLP_RELOPS_OPERATORS(template < _STLP_STACK_HEADER_ARGS >, stack< _STLP_STACK_ARGS >)
+    
+_STLP_END_NAMESPACE
+
+#  undef _STLP_STACK_ARGS
+#  undef _STLP_STACK_HEADER_ARGS
+
+#endif /* _STLP_INTERNAL_STACK_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_stdio_file.h b/main/source/stlport/stlport/stl/_stdio_file.h
new file mode 100644
index 00000000..7b127df6
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_stdio_file.h
@@ -0,0 +1,758 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+
+// WARNING: This is an internal header file, included by other C++
+// standard library headers.  You should not attempt to use this header
+// file directly.
+
+
+#ifndef _STLP_STDIO_FILE_H
+#define _STLP_STDIO_FILE_H
+
+// This file provides a low-level interface between the internal 
+// representation of struct FILE, from the C stdio library, and 
+// the C++ I/O library.  The C++ I/O library views a FILE object as
+// a collection of three pointers: the beginning of the buffer, the
+// current read/write position, and the end of the buffer.
+
+// The interface:
+// - char* _FILE_[IO]_begin(const FILE *__f);
+//       Returns a pointer to the beginning of the buffer.
+// - char* _FILE_[IO]_next(const FILE *__f);
+//       Returns the current read/write position within the buffer.
+// - char* _FILE_[IO]_end(const FILE *__f);
+//       Returns a pointer immediately past the end of the buffer.
+// - char* _FILE_[IO]_avail(const FILE *__f);
+//       Returns the number of characters remaining in the buffer, i.e.
+//       _FILE_[IO]_end(__f) - _FILE_[IO]_next(__f).
+// - char& _FILE_[IO]_preincr(FILE *__f)
+//       Increments the current read/write position by 1, returning the 
+//       character at the old position.
+// - char& _FILE_[IO]_postincr(FILE *__f)
+//       Increments the current read/write position by 1, returning the 
+//       character at the old position.
+// - char& _FILE_[IO]_predecr(FILE *__f)
+//       Decrements the current read/write position by 1, returning the 
+//       character at the old position.
+// - char& _FILE_[IO]_postdecr(FILE *__f)
+//       Decrements the current read/write position by 1, returning the 
+//       character at the old position.
+// - void _FILE_[IO]_bump(FILE *__f, int __n)
+//       Increments the current read/write position by __n.
+// - void _FILE_[IO]_set(FILE *__f, char* __begin, char* __next, char* __end);
+//       Sets the beginning of the bufer to __begin, the current read/write
+//       position to __next, and the buffer's past-the-end pointer to __end.
+//       If any of those pointers is null, then all of them must be null.
+
+// Each function comes in two versions, one for a FILE used as an input
+// buffer and one for a FILE used as an output buffer.  In some stdio
+// implementations the two functions are identical, but in others they are
+// not.
+
+#ifndef _STLP_CSTDIO
+# include <cstdio>
+#endif
+#ifndef _STLP_CSTDDEF
+# include <cstddef>
+#endif
+
+#if defined(__MSL__)
+# include <unix.h>	// get the definition of fileno
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+#if !defined(_STLP_WINCE)
+//----------------------------------------------------------------------
+// Implementation for the IRIX C library.
+// Solaris interface looks to be identical.
+#if !defined(_STLP_USE_GLIBC) && \
+    ( defined(__sgi) || \
+      ( defined(__sun) && ! defined (_LP64) )  || \
+      defined (__osf__) || defined(__DECCXX) || \
+      defined (_STLP_MSVC) || defined (__ICL) || defined (__MINGW32__) || defined(__DJGPP) || defined (_AIX) || defined (_CRAY))
+
+#if defined ( _MSC_VER ) || defined (__ICL) || defined (__MINGW32__) || defined(__DJGPP)
+typedef  char* _File_ptr_type;
+#else
+typedef  unsigned char* _File_ptr_type;
+#endif
+
+inline int   _FILE_fd(const FILE *__f) { return __f->_file; }
+inline char* _FILE_I_begin(const FILE *__f) { return (char*) __f->_base; }
+inline char* _FILE_I_next(const FILE *__f) { return (char*) __f->_ptr; }  
+inline char* _FILE_I_end(const FILE *__f)
+  { return (char*) __f->_ptr + __f->_cnt; }
+
+inline ptrdiff_t _FILE_I_avail(const FILE *__f) { return __f->_cnt; }
+
+inline char& _FILE_I_preincr(FILE *__f)
+  { --__f->_cnt; return *(char*) (++__f->_ptr); }
+inline char& _FILE_I_postincr(FILE *__f)
+  { --__f->_cnt; return *(char*) (__f->_ptr++); }
+inline char& _FILE_I_predecr(FILE *__f)
+  { ++__f->_cnt; return *(char*) (--__f->_ptr); }
+inline char& _FILE_I_postdecr(FILE *__f)
+  { ++__f->_cnt; return *(char*) (__f->_ptr--); }
+inline void  _FILE_I_bump(FILE *__f, int __n)
+  { __f->_ptr += __n; __f->_cnt -= __n; }
+
+inline void _FILE_I_set(FILE *__f, char* __begin, char* __next, char* __end) {
+  __f->_base = (_File_ptr_type) __begin;
+  __f->_ptr  = (_File_ptr_type) __next;
+  __f->_cnt  = __end - __next;
+}
+
+# define _STLP_FILE_I_O_IDENTICAL 1
+
+#elif defined(__EMX__)
+
+inline int   _FILE_fd(const FILE* __f) { return __f->_handle; }
+inline char* _FILE_I_begin(const FILE* __f) { return (char*) __f->_buffer; }
+inline char* _FILE_I_next(const FILE* __f) { return (char*) __f->_ptr; }
+inline char* _FILE_I_end(const FILE* __f) { return (char *) __f->_ptr + __f->_rcount; }
+inline ptrdiff_t _FILE_I_avail(const FILE* __f) { return __f->_rcount; }
+inline char& _FILE_I_preincr(FILE* __f) { --__f->_rcount; return *(char*) (++__f->_ptr); }
+inline char& _FILE_I_postincr(FILE* __f) { --__f->_rcount; return *(char*) (__f->_ptr++); }
+inline char& _FILE_I_predecr(FILE* __f) { ++__f->_rcount; return *(char*) (--__f->_ptr); }
+inline char& _FILE_I_postdecr(FILE* __f) { ++__f->_rcount; return *(char*) (__f->_ptr--); }
+inline void  _FILE_I_bump(FILE* __f, int __n) { __f->_ptr += __n; __f->_rcount -= __n; }
+inline void _FILE_I_set(FILE* __f, char* __begin, char* __next, char* __end) {
+  __f->_buffer = __begin;
+  __f->_ptr  = __next;
+  __f->_rcount  = __end - __next;
+}
+
+inline char* _FILE_O_begin(const FILE* __f) { return (char*) __f->_buffer; }
+inline char* _FILE_O_next(const FILE* __f) { return (char*) __f->_ptr; }
+inline char* _FILE_O_end(const FILE* __f) { return (char*) __f->_ptr + __f->_wcount; }
+inline ptrdiff_t _FILE_O_avail(const FILE* __f) { return __f->_wcount; }
+inline char& _FILE_O_preincr(FILE* __f) { --__f->_wcount; return *(char*) (++__f->_ptr); }
+inline char& _FILE_O_postincr(FILE* __f) { --__f->_wcount; return *(char*) (__f->_ptr++); }
+inline char& _FILE_O_predecr(FILE* __f) { ++__f->_wcount; return *(char*) (--__f->_ptr); }
+inline char& _FILE_O_postdecr(FILE* __f) { ++__f->_wcount; return *(char*) (__f->_ptr--); }
+inline void _FILE_O_bump(FILE* __f, int __n) { __f->_ptr += __n; __f->_wcount -= __n; }
+inline void _FILE_O_set(FILE* __f, char* __begin, char* __next, char* __end) {
+  __f->_buffer = __begin;
+  __f->_ptr  = __next;
+  __f->_wcount  = __end - __next;
+}
+
+
+# undef _STLP_FILE_I_O_IDENTICAL
+
+# elif defined(_STLP_SCO_OPENSERVER) || defined(__NCR_SVR)
+
+typedef  unsigned char* _File_ptr_type;
+
+inline int   _FILE_fd(const FILE *__f) { return __f->__file; }
+inline char* _FILE_I_begin(const FILE *__f) { return (char*) __f->__base; }
+inline char* _FILE_I_next(const FILE *__f) { return (char*) __f->__ptr; }
+inline char* _FILE_I_end(const FILE *__f)
+  { return (char*) __f->__ptr + __f->__cnt; }
+
+inline ptrdiff_t _FILE_I_avail(const FILE *__f) { return __f->__cnt; }
+
+inline char& _FILE_I_preincr(FILE *__f)
+  { --__f->__cnt; return *(char*) (++__f->__ptr); }
+inline char& _FILE_I_postincr(FILE *__f)
+  { --__f->__cnt; return *(char*) (__f->__ptr++); }
+inline char& _FILE_I_predecr(FILE *__f)
+  { ++__f->__cnt; return *(char*) (--__f->__ptr); }
+inline char& _FILE_I_postdecr(FILE *__f)
+  { ++__f->__cnt; return *(char*) (__f->__ptr--); }
+inline void  _FILE_I_bump(FILE *__f, int __n)
+  { __f->__ptr += __n; __f->__cnt -= __n; }
+
+inline void _FILE_I_set(FILE *__f, char* __begin, char* __next, char* __end) {
+  __f->__base = (_File_ptr_type) __begin;
+  __f->__ptr  = (_File_ptr_type) __next;
+  __f->__cnt  = __end - __next;
+}
+
+# define _STLP_FILE_I_O_IDENTICAL 1
+
+# elif defined(__sun) && defined( _LP64)
+
+typedef long _File_ptr_type;
+
+inline int _FILE_fd(const FILE *__f) { return (int) __f->__pad[2]; }
+inline char* _FILE_I_begin(const FILE *__f) { return (char*)
+__f->__pad[1]; }
+inline char* _FILE_I_next(const FILE *__f) { return (char*)
+__f->__pad[0]; }
+inline char* _FILE_I_end(const FILE *__f)
+{ return (char*) __f->__pad[0] + __f->__pad[3]; }
+
+inline ptrdiff_t _FILE_I_avail(const FILE *__f) { return __f->__pad[3]; }
+
+inline char& _FILE_I_preincr(FILE *__f)
+{ --__f->__pad[3]; return *(char*) (++__f->__pad[0]); }
+inline char& _FILE_I_postincr(FILE *__f)
+{ --__f->__pad[3]; return *(char*) (__f->__pad[0]++); }
+inline char& _FILE_I_predecr(FILE *__f)
+{ ++__f->__pad[3]; return *(char*) (--__f->__pad[0]); }
+inline char& _FILE_I_postdecr(FILE *__f)
+{ ++__f->__pad[3]; return *(char*) (__f->__pad[0]--); }
+inline void _FILE_I_bump(FILE *__f, long __n)
+{ __f->__pad[0] += __n; __f->__pad[3] -= __n; }
+
+inline void _FILE_I_set(FILE *__f, char* __begin, char* __next, char*
+__end) {
+__f->__pad[1] = (_File_ptr_type) __begin;
+__f->__pad[0] = (_File_ptr_type) __next;
+__f->__pad[3] = __end - __next;
+}
+
+# define _STLP_FILE_I_O_IDENTICAL
+
+#elif defined (__CYGWIN__) || defined(__FreeBSD__)  || defined(__NetBSD__) \
+  || defined(__amigaos__) || ( defined(__GNUC__) && defined(__APPLE__) )
+
+inline int _FILE_fd(const FILE *__f) { return __f->_file; }
+inline char* _FILE_I_begin(const FILE *__f) { return (char*)
+						__f->_bf._base; }
+inline char* _FILE_I_next(const FILE *__f) { return (char*) __f->_p; } 
+inline char* _FILE_I_end(const FILE *__f)
+{ return (char*) __f->_p + __f->_r; }
+
+inline ptrdiff_t _FILE_I_avail(const FILE *__f) { return __f->_r; }
+
+inline char& _FILE_I_preincr(FILE *__f)
+{ --__f->_r; --__f->_bf._size; return *(char*) (++__f->_p); }
+inline char& _FILE_I_postincr(FILE *__f)
+{ --__f->_r; --__f->_bf._size; return *(char*) (__f->_p++); }
+inline char& _FILE_I_predecr(FILE *__f)
+{ ++__f->_r; ++ __f->_bf._size; return *(char*) (--__f->_p); }
+inline char& _FILE_I_postdecr(FILE *__f)
+{ ++__f->_r; ++__f->_bf._size; return *(char*) (__f->_p--); }
+inline void _FILE_I_bump(FILE *__f, int __n)
+{ __f->_p += __n; __f->_bf._size+=__n; __f->_r -= __n; }
+
+inline void _FILE_I_set(FILE *__f, char* __begin, char* __next, char*
+			__end) {
+  __f->_bf._base = (unsigned char*) __begin;
+  __f->_p = (unsigned char*) __next;
+  __f->_r = __f->_bf._size = __end - __next;
+}
+inline char* _FILE_O_begin(const FILE *__f) { return (char*)
+						__f->_bf._base; }
+inline char* _FILE_O_next(const FILE *__f) { return (char*) __f->_p; } 
+inline char* _FILE_O_end(const FILE *__f)
+{ return (char*) __f->_p + __f->_w; }
+
+inline ptrdiff_t _FILE_O_avail(const FILE *__f) { return __f->_w; }
+
+inline char& _FILE_O_preincr(FILE *__f)
+{ --__f->_w; --__f->_bf._size; return *(char*) (++__f->_p); }
+inline char& _FILE_O_postincr(FILE *__f)
+{ --__f->_w; --__f->_bf._size; return *(char*) (__f->_p++); }
+inline char& _FILE_O_predecr(FILE *__f)
+{ ++__f->_w; ++__f->_bf._size; return *(char*) (--__f->_p); }
+inline char& _FILE_O_postdecr(FILE *__f)
+{ ++__f->_w; ++__f->_bf._size; return *(char*) (__f->_p--); }
+inline void _FILE_O_bump(FILE *__f, int __n)
+{ __f->_p += __n; __f->_bf._size+=__n; __f->_w -= __n; }
+
+inline void _FILE_O_set(FILE *__f, char* __begin, char* __next, char*
+			__end) {
+  __f->_bf._base = (unsigned char*) __begin;
+  __f->_p = (unsigned char*) __next;
+  __f->_w = __f->_bf._size = __end - __next;
+}
+
+# undef _STLP_FILE_I_O_IDENTICAL
+
+#elif defined(_STLP_USE_GLIBC)
+
+inline int   _FILE_fd(const FILE *__f) { return __f->_fileno; }
+inline char* _FILE_I_begin(const FILE *__f) { return __f->_IO_read_base; }
+inline char* _FILE_I_next(const FILE *__f)  { return __f->_IO_read_ptr; }
+inline char* _FILE_I_end(const FILE *__f)   { return __f->_IO_read_end; }
+
+inline ptrdiff_t _FILE_I_avail(const FILE *__f) 
+  { return __f->_IO_read_end - __f->_IO_read_ptr; }
+
+inline char& _FILE_I_preincr(FILE *__f)  { return *++__f->_IO_read_ptr; }
+inline char& _FILE_I_postincr(FILE *__f) { return *__f->_IO_read_ptr++; }
+inline char& _FILE_I_predecr(FILE *__f)  { return *--__f->_IO_read_ptr; }
+inline char& _FILE_I_postdecr(FILE *__f) { return *__f->_IO_read_ptr--; }
+inline void  _FILE_I_bump(FILE *__f, int __n) { __f->_IO_read_ptr += __n; }
+
+inline void _FILE_I_set(FILE *__f, char* __begin, char* __next, char* __end) {
+  __f->_IO_read_base = __begin; 
+  __f->_IO_read_ptr  = __next; 
+  __f->_IO_read_end  = __end; 
+}
+
+inline char* _FILE_O_begin(const FILE *__f) { return __f->_IO_write_base; }
+inline char* _FILE_O_next(const FILE *__f)  { return __f->_IO_write_ptr; }
+inline char* _FILE_O_end(const FILE *__f)   { return __f->_IO_write_end; }
+
+inline ptrdiff_t _FILE_O_avail(const FILE *__f) 
+  { return __f->_IO_write_end - __f->_IO_write_ptr; }
+
+inline char& _FILE_O_preincr(FILE *__f)  { return *++__f->_IO_write_ptr; }
+inline char& _FILE_O_postincr(FILE *__f) { return *__f->_IO_write_ptr++; }
+inline char& _FILE_O_predecr(FILE *__f)  { return *--__f->_IO_write_ptr; }
+inline char& _FILE_O_postdecr(FILE *__f) { return *__f->_IO_write_ptr--; }
+inline void  _FILE_O_bump(FILE *__f, int __n) { __f->_IO_write_ptr += __n; }
+
+inline void _FILE_O_set(FILE *__f, char* __begin, char* __next, char* __end) {
+  __f->_IO_write_base = __begin; 
+  __f->_IO_write_ptr  = __next; 
+  __f->_IO_write_end  = __end; 
+
+}
+
+#elif defined(__hpux) /* && defined(__hppa) && defined(__HP_aCC)) */
+
+#ifndef _INCLUDE_HPUX_SOURCE
+extern "C" unsigned char *__bufendtab[];
+#  undef  _bufend
+#  define _bufend(__p) \
+     (*(((__p)->__flag & _IOEXT)  ? &(((_FILEX *)(__p))->__bufendp)      \
+ 				    : &(__bufendtab[(__p) - __iob])))
+ 
+#  define _bufsiz(__p)  (_bufend(__p) - (__p)->__base)
+#endif /* _INCLUDE_HPUX_SOURCE */
+
+#if defined(_STLP_HPACC_BROKEN_BUFEND)
+#  undef  _bufend
+#  define _bufend(__p) \
+     (*(((__p)->__flag & _IOEXT)  ? &((__REINTERPRET_CAST(_FILEX*,(__p)))->__bufendp)  \
+                               : &(__bufendtab[__REINTERPRET_CAST(FILE*,(__p)) - __iob])))
+#endif
+
+inline int   _FILE_fd(const FILE *__f) { return fileno(__CONST_CAST(FILE *,__f)); }
+inline char* _FILE_I_begin(const FILE *__f) { return (__REINTERPRET_CAST(char*, __f->__base)); }
+inline char* _FILE_I_next(const FILE *__f)  { return (__REINTERPRET_CAST(char*, __f->__ptr)); }
+inline char* _FILE_I_end(const FILE *__f)   { return (__REINTERPRET_CAST(char*, __f->__ptr +__f->__cnt)); }
+
+inline ptrdiff_t _FILE_I_avail(const FILE *__f)  { return __f->__cnt; }
+
+inline char& _FILE_I_preincr(FILE *__f)  { --__f->__cnt; return *__REINTERPRET_CAST(char*, ++__f->__ptr); }
+inline char& _FILE_I_postincr(FILE *__f) { --__f->__cnt; return *__REINTERPRET_CAST(char*, __f->__ptr++); }
+inline char& _FILE_I_predecr(FILE *__f)  { ++__f->__cnt; return *__REINTERPRET_CAST(char*,--__f->__ptr); }
+inline char& _FILE_I_postdecr(FILE *__f) { ++__f->__cnt; return *__REINTERPRET_CAST(char*,__f->__ptr--); }
+inline void  _FILE_I_bump(FILE *__f, int __n) { __f->__cnt -= __n; __f->__ptr += __n; }
+ 
+inline void _FILE_I_set(FILE *__f, char* __begin, char* __next, char* __end) {
+# if defined(__hpux)
+   if( (unsigned long) (__f - &__iob[0]) > _NFILE)
+        __f->__flag |= _IOEXT;  // used by stdio's _bufend macro and goodness knows what else...
+# endif
+  __f->__cnt  = __end - __next; 
+  __f->__base = __REINTERPRET_CAST(unsigned char*, __begin); 
+  __f->__ptr  = __REINTERPRET_CAST(unsigned char*, __next);
+  _bufend(__f) = __REINTERPRET_CAST(unsigned char*, __end); 
+}
+
+// For HPUX stdio, input and output FILE manipulation is identical.
+
+# define _STLP_FILE_I_O_IDENTICAL
+
+#elif defined (__BORLANDC__)
+
+typedef unsigned char* _File_ptr_type;
+
+inline int _FILE_fd(const FILE *__f) { return __f->fd; }
+inline char* _FILE_I_begin(const FILE *__f) { return (char*) __f->buffer;
+}
+inline char* _FILE_I_next(const FILE *__f) 
+{ return (char*)__f->curp; } 
+inline char* _FILE_I_end(const FILE *__f)
+{ return (char*) __f->curp + __f->level; }
+
+inline ptrdiff_t _FILE_I_avail(const FILE *__f) { return __f->level; }
+
+inline char& _FILE_I_preincr(FILE *__f)
+{ --__f->level; return *(char*) (++__f->curp); }
+inline char& _FILE_I_postincr(FILE *__f)
+{ --__f->level; return *(char*) (__f->curp++); }
+inline char& _FILE_I_predecr(FILE *__f)
+{ ++__f->level; return *(char*) (--__f->curp); }
+inline char& _FILE_I_postdecr(FILE *__f)
+{ ++__f->level; return *(char*) (__f->curp--); }
+inline void _FILE_I_bump(FILE *__f, int __n)
+{ __f->curp += __n; __f->level -= __n; }
+
+inline void _FILE_I_set(FILE *__f, char* __begin, char* __next, char*
+			__end) {
+  __f->buffer = (_File_ptr_type) __begin;
+  __f->curp = (_File_ptr_type) __next;
+  __f->level = __end - __next;
+}
+
+# define _STLP_FILE_I_O_IDENTICAL
+
+#elif defined( __MWERKS__ )
+
+// using MWERKS-specific defines here to detect other OS targets
+// dwa: I'm not sure they provide fileno for all OS's, but this should
+// work for Win32 and WinCE
+# if __dest_os == __mac_os
+inline int   _FILE_fd(const FILE *__f) { return ::fileno(__CONST_CAST(FILE*, __f)); }
+# else
+inline int   _FILE_fd(const FILE *__f) { return ::_fileno(__CONST_CAST(FILE*, __f)); }
+# endif
+
+//       Returns a pointer to the beginning of the buffer.
+inline char* _FILE_I_begin(const FILE *__f) { return __REINTERPRET_CAST(char*, __f->buffer); }
+//       Returns the current read/write position within the buffer.
+inline char* _FILE_I_next(const FILE *__f) { return __REINTERPRET_CAST(char*, __f->buffer_ptr); }
+
+//       Returns a pointer immediately past the end of the buffer.
+inline char* _FILE_I_end(const FILE *__f) { return __REINTERPRET_CAST(char*, __f->buffer_ptr + __f->buffer_len); }
+
+//       Returns the number of characters remaining in the buffer, i.e.
+//       _FILE_[IO]_end(__f) - _FILE_[IO]_next(__f).
+inline ptrdiff_t _FILE_I_avail(const FILE *__f) { return __f->buffer_len; }
+
+//       Increments the current read/write position by 1, returning the 
+//       character at the old position.
+inline char& _FILE_I_preincr(FILE *__f)
+  { --__f->buffer_len; return *(char*) (++__f->buffer_ptr); }
+inline char& _FILE_I_postincr(FILE *__f)
+  { --__f->buffer_len; return *(char*) (__f->buffer_ptr++); }
+inline char& _FILE_I_predecr(FILE *__f)
+  { ++__f->buffer_len; return *(char*) (--__f->buffer_ptr); }
+inline char& _FILE_I_postdecr(FILE *__f)
+  { ++__f->buffer_len; return *(char*) (__f->buffer_ptr--); }
+inline void  _FILE_I_bump(FILE *__f, int __n)
+  { __f->buffer_ptr += __n; __f->buffer_len -= __n; }
+
+inline void _FILE_I_set(FILE *__f, char* __begin, char* __next, char* __end) {
+  __f->buffer = __REINTERPRET_CAST(unsigned char*, __begin);
+  __f->buffer_ptr   = __REINTERPRET_CAST(unsigned char*, __next);
+  __f->buffer_len  = __end - __next;
+  __f->buffer_size = __end - __begin;
+}
+
+# define _STLP_FILE_I_O_IDENTICAL
+
+#elif defined(__DMC__)
+
+inline int   _FILE_fd(const FILE *__f) { return __f->_file; }
+
+//       Returns a pointer to the beginning of the buffer.
+inline char* _FILE_I_begin(const FILE *__f) { return __f->_base; }
+
+//       Returns the current read/write position within the buffer.
+inline char* _FILE_I_next(const FILE *__f) { return __f->_ptr; }
+
+//       Returns a pointer immediately past the end of the buffer.
+inline char* _FILE_I_end(const FILE *__f) { return __f->_ptr + __f->_cnt; }
+
+//       Returns the number of characters remaining in the buffer, i.e.
+//       _FILE_[IO]_end(__f) - _FILE_[IO]_next(__f).
+inline ptrdiff_t _FILE_I_avail(const FILE *__f) { return __f->_cnt; }
+
+//       Increments the current read/write position by 1, returning the 
+//       character at the NEW position.
+inline char& _FILE_I_preincr(FILE *__f) { --__f->_cnt; return *(++__f->_ptr); }
+
+
+//       Increments the current read/write position by 1, returning the 
+//       character at the old position.
+inline char& _FILE_I_postincr(FILE *__f) { --__f->_cnt; return *(__f->_ptr++); }
+
+//       Decrements the current read/write position by 1, returning the 
+//       character at the NEW position.
+inline char& _FILE_I_predecr(FILE *__f) { ++__f->_cnt; return *(--__f->_ptr); }
+
+//       Decrements the current read/write position by 1, returning the 
+//       character at the old position.
+inline char& _FILE_I_postdecr(FILE *__f) { ++__f->_cnt; return *(__f->_ptr--); }
+
+//       Increments the current read/write position by __n.
+inline void _FILE_I_bump(FILE *__f, int __n) { __f->_cnt -= __n; __f->_ptr += __n; }
+
+//       Sets the beginning of the bufer to __begin, the current read/write
+//       position to __next, and the buffer's past-the-end pointer to __end.
+//       If any of those pointers is null, then all of them must be null.
+inline void _FILE_I_set(FILE *__f, char* __begin, char* __next, char* __end)
+{
+	__f->_base = __begin;
+	__f->_ptr = __next;
+	__f->_cnt = __end - __next;
+	__f->_bufsiz = __end - __begin;
+}
+
+# define _STLP_FILE_I_O_IDENTICAL
+
+#elif defined(__MRC__) || defined(__SC__)		//*TY 02/24/2000 - added support for MPW
+
+inline int   _FILE_fd(const FILE *__f) { return __f->_file; }
+
+//       Returns a pointer to the beginning of the buffer.
+inline char* _FILE_I_begin(const FILE *__f) { return (char*) __f->_base; }
+
+//       Returns the current read/write position within the buffer.
+inline char* _FILE_I_next(const FILE *__f) { return (char*) __f->_ptr; }
+
+//       Returns a pointer immediately past the end of the buffer.
+inline char* _FILE_I_end(const FILE *__f) { return (char*)__f->_end; }
+
+//       Returns the number of characters remaining in the buffer, i.e.
+//       _FILE_[IO]_end(__f) - _FILE_[IO]_next(__f).
+inline ptrdiff_t _FILE_I_avail(const FILE *__f) { return __f->_cnt; }
+
+//       Increments the current read/write position by 1, returning the 
+//       character at the NEW position.
+inline char& _FILE_I_preincr(FILE *__f) { --__f->_cnt; return*(char*) (++__f->_ptr); }
+
+
+//       Increments the current read/write position by 1, returning the 
+//       character at the old position.
+inline char& _FILE_I_postincr(FILE *__f) { --__f->_cnt; return*(char*) (__f->_ptr++); }
+
+//       Decrements the current read/write position by 1, returning the 
+//       character at the NEW position.
+inline char& _FILE_I_predecr(FILE *__f) { ++__f->_cnt; return*(char*) (--__f->_ptr); }
+
+//       Decrements the current read/write position by 1, returning the 
+//       character at the old position.
+inline char& _FILE_I_postdecr(FILE *__f) { ++__f->_cnt; return*(char*) (__f->_ptr--); }
+
+//       Increments the current read/write position by __n.
+inline void _FILE_I_bump(FILE *__f, int __n) { __f->_cnt -= __n; __f->_ptr += __n; }
+
+//       Sets the beginning of the bufer to __begin, the current read/write
+//       position to __next, and the buffer's past-the-end pointer to __end.
+//       If any of those pointers is null, then all of them must be null.
+inline void _FILE_I_set(FILE *__f, char* __begin, char* __next, char* __end)
+{
+	__f->_base = (unsigned char*)__begin;
+	__f->_ptr  = (unsigned char*)__next;
+	__f->_end  = (unsigned char*)__end;
+	__f->_cnt  = __end - __next;
+	__f->_size = __end - __begin;
+}
+
+# define _STLP_FILE_I_O_IDENTICAL
+
+#elif defined (__MVS__)
+
+typedef unsigned char* _File_ptr_type;
+
+inline int _FILE_fd(const FILE *__f) { return fileno(__CONST_CAST(FILE
+								  *,__f)); }
+inline char* _FILE_I_begin(const FILE *__f) { return (char*)
+						__f->__fp->__bufPtr; }
+inline char* _FILE_I_next(const FILE *__f) { return (char*)
+					       __f->__fp->__bufPtr; }
+inline char* _FILE_I_end(const FILE *__f)
+{ return (char*) __f->__fp->__bufPtr + __f->__fp->__countIn; }
+
+inline ptrdiff_t _FILE_I_avail(const FILE *__f) { return
+						    __f->__fp->__countIn; }
+
+inline char& _FILE_I_preincr(FILE *__f)
+{ --__f->__fp->__countIn; return *(char*) (++__f->__fp->__bufPtr); }
+inline char& _FILE_I_postincr(FILE *__f)
+{ --__f->__fp->__countIn; return *(char*) (__f->__fp->__bufPtr++); }
+inline char& _FILE_I_predecr(FILE *__f)
+{ ++__f->__fp->__countIn; return *(char*) (--__f->__fp->__bufPtr); }
+inline char& _FILE_I_postdecr(FILE *__f)
+{ ++__f->__fp->__countIn; return *(char*) (__f->__fp->__bufPtr--); }
+inline void _FILE_I_bump(FILE *__f, int __n)
+{ __f->__fp->__bufPtr += __n; __f->__fp->__countIn -= __n; }
+
+inline void _FILE_I_set(FILE *__f, char* __begin, char* __next, char*
+			__end) {
+  // __f->_base = (_File_ptr_type) __begin;
+  if(__f->__fp) {
+    __f->__fp->__bufPtr = (_File_ptr_type) __next;
+    __f->__fp->__countIn = __end - __next;
+  }
+}
+
+inline char* _FILE_O_begin(const FILE *__f) { return (char*)__f->__fp->__bufPtr;}
+inline char* _FILE_O_next(const FILE *__f) { return (char*) __f->__fp->__bufPtr;}
+inline char* _FILE_O_end(const FILE *__f) { return (char*) __f->__fp->__bufPtr + __f->__fp->__countOut; }
+inline ptrdiff_t _FILE_O_avail(const FILE *__f) { return __f->__fp->__countOut; }
+
+inline char& _FILE_O_preincr(FILE *__f)
+{ --__f->__fp->__countOut; return *(char*) (++__f->__fp->__bufPtr); }
+inline char& _FILE_O_postincr(FILE *__f)
+{ --__f->__fp->__countOut; return *(char*) (__f->__fp->__bufPtr++); }
+inline char& _FILE_O_predecr(FILE *__f)
+{ ++__f->__fp->__countOut; return *(char*) (--__f->__fp->__bufPtr); }
+inline char& _FILE_O_postdecr(FILE *__f)
+{ ++__f->__fp->__countOut; return *(char*) (__f->__fp->__bufPtr--); }
+inline void _FILE_O_bump(FILE *__f, int __n)
+{ __f->__fp->__bufPtr += __n; __f->__fp->__countOut -= __n; }
+
+inline void _FILE_O_set(FILE *__f, char* __begin, char* __next, char*
+			__end) {
+  // __f->_base = (_File_ptr_type) __begin;
+  if(__f->__fp) {
+    __f->__fp->__bufPtr = (_File_ptr_type) __next;
+    __f->__fp->__countOut = __end - __next;
+  }
+}
+
+#elif defined(__QNXNTO__)
+
+inline int _FILE_fd(const FILE *__f) { return __f->_handle;
+}
+inline char* _FILE_I_begin(const FILE *__f) { return
+                                                (char*) __f->_base; }
+inline char* _FILE_I_next(const FILE *__f) { return
+                                               (char*) __f->_ptr; }
+inline char* _FILE_I_end(const FILE *__f)
+{ return (char*) __f->_ptr + __f->_cnt; }
+
+inline ptrdiff_t _FILE_I_avail(const FILE *__f) { return
+                                                    __f->_cnt; }
+
+inline char& _FILE_I_preincr(FILE *__f)
+{ --__f->_cnt; return *(char*) (++__f->_ptr); }
+inline char& _FILE_I_postincr(FILE *__f)
+{ --__f->_cnt; return *(char*) (__f->_ptr++); }
+inline char& _FILE_I_predecr(FILE *__f)
+{ ++__f->_cnt; return *(char*) (--__f->_ptr); }
+inline char& _FILE_I_postdecr(FILE *__f)
+{ ++__f->_cnt; return *(char*) (__f->_ptr--); }
+inline void _FILE_I_bump(FILE *__f, int __n)
+{ __f->_ptr += __n; __f->_cnt -= __n; }
+
+inline void _FILE_I_set(FILE *__f, char* __begin, char*
+                        __next, char*
+                        __end) {
+  __f->_base = (unsigned char*) __begin;
+  __f->_ptr = (unsigned char*) __next;
+  __f->_cnt = __end - __next;
+}
+
+# define _STLP_FILE_I_O_IDENTICAL
+ 
+#elif defined(__WATCOMC__)                   // Nikolaev
+ 
+inline int       _FILE_fd      (const FILE *__f) { return __f->_handle;}
+inline char*     _FILE_I_begin (const FILE *__f) { return __REINTERPRET_CAST(char*, __f->_link); }
+inline char*     _FILE_I_next  (const FILE *__f) { return __REINTERPRET_CAST(char*, __f->_ptr); }
+inline char*     _FILE_I_end   (const FILE *__f) { return __REINTERPRET_CAST(char*, __f->_ptr + __f->_cnt); }
+inline ptrdiff_t _FILE_I_avail (const FILE *__f) { return __f->_cnt; }
+ 
+inline char& _FILE_I_preincr(FILE *__f)
+{
+  --__f->_cnt;
+  return *__REINTERPRET_CAST(char*, ++__f->_ptr);
+}
+ 
+inline char& _FILE_I_postincr(FILE *__f)
+{
+  --__f->_cnt;
+  return *__REINTERPRET_CAST(char*, __f->_ptr++);
+}
+
+inline char& _FILE_I_predecr(FILE *__f)
+{
+  ++__f->_cnt;
+  return *__REINTERPRET_CAST(char*, --__f->_ptr);
+}
+ 
+inline char& _FILE_I_postdecr(FILE *__f)
+{
+  ++__f->_cnt;
+  return *__REINTERPRET_CAST(char*, __f->_ptr--);
+}
+ 
+inline void _FILE_I_bump(FILE *__f, int __n)
+{
+  __f->_ptr += __n;
+  __f->_cnt -= __n;
+}
+ 
+inline void _FILE_I_set(FILE *__f, char* __begin, char* __next, char* __end)
+{
+  __f->_link = __REINTERPRET_CAST(__stream_link*, __begin);
+  __f->_ptr  = __REINTERPRET_CAST(unsigned char*, __next);
+  __f->_cnt  = __end - __next;
+}
+ 
+# define _STLP_FILE_I_O_IDENTICAL
+
+#elif defined (__Lynx__)
+
+// the prototypes are taken from LynxOS patch for STLport 4.0
+inline int   _FILE_fd(const FILE *__f) { return __f->_fd; }
+inline char* _FILE_I_begin(const FILE *__f) { return (char*) __f->_base; }
+inline char* _FILE_I_next(const FILE *__f) { return (char*) __f->_ptr; }  
+inline char* _FILE_I_end(const FILE *__f)
+  { return (char*) __f->_ptr + __f->_cnt; }
+ 
+inline ptrdiff_t _FILE_I_avail(const FILE *__f) { return __f->_cnt; }
+ 
+inline char& _FILE_I_preincr(FILE *__f)
+  { --__f->_cnt; return *(char*) (++__f->_ptr); }
+inline char& _FILE_I_postincr(FILE *__f)
+  { --__f->_cnt; return *(char*) (__f->_ptr++); }
+inline char& _FILE_I_predecr(FILE *__f)
+   { ++__f->_cnt; return *(char*) (--__f->_ptr); }
+inline char& _FILE_I_postdecr(FILE *__f)
+  { ++__f->_cnt; return *(char*) (__f->_ptr--); }
+inline void  _FILE_I_bump(FILE *__f, int __n)
+  { __f->_ptr += __n; __f->_cnt -= __n; }
+
+inline void _FILE_I_set(FILE *__f, char* __begin, char* __next, char* __end) {
+  __f->_base = __begin;
+  __f->_ptr  = __next;
+  __f->_cnt  = __end - __next;
+}
+# define _STLP_FILE_I_O_IDENTICAL
+
+#else  /* A C library that we don't have an implementation for. */
+
+# error The C++ I/O library is not configured for this compiler
+
+#endif
+
+
+// For most stdio's , input and output FILE manipulation is identical.
+# ifdef _STLP_FILE_I_O_IDENTICAL
+inline char* _FILE_O_begin(const FILE *__f) { return _FILE_I_begin(__f); }
+inline char* _FILE_O_next(const FILE *__f)  { return _FILE_I_next(__f); }
+inline char* _FILE_O_end(const FILE *__f)   { return _FILE_I_end(__f); }
+
+inline ptrdiff_t _FILE_O_avail(const FILE *__f) { return _FILE_I_avail(__f); }
+
+inline char& _FILE_O_preincr(FILE *__f)  { return _FILE_I_preincr(__f); }
+inline char& _FILE_O_postincr(FILE *__f) { return _FILE_I_postincr(__f); }
+inline char& _FILE_O_predecr(FILE *__f)  { return _FILE_I_predecr(__f); }
+inline char& _FILE_O_postdecr(FILE *__f) { return _FILE_I_postdecr(__f); }
+
+inline void  _FILE_O_bump(FILE *__f, int __n) { _FILE_I_bump(__f, __n); }
+inline void _FILE_O_set(FILE *__f, char* __begin, char* __next, char* __end)
+  { _FILE_I_set(__f, __begin, __next, __end); }
+# endif
+
+#else
+inline int _FILE_fd(const FILE *__f) { return (int)::_fileno(__CONST_CAST(FILE *, __f)); }
+#endif /* _STLP_WINCE */
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_STDIO_FILE_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_stream_iterator.h b/main/source/stlport/stlport/stl/_stream_iterator.h
new file mode 100644
index 00000000..abb95809
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_stream_iterator.h
@@ -0,0 +1,343 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996-1998
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#if !defined (_STLP_INTERNAL_STREAM_ITERATOR_H) && ! defined (_STLP_USE_NO_IOSTREAMS)
+#define _STLP_INTERNAL_STREAM_ITERATOR_H
+
+#ifndef _STLP_INTERNAL_ITERATOR_BASE_H
+# include <stl/_iterator_base.h>
+#endif
+
+// streambuf_iterators predeclarations must appear first
+#ifndef _STLP_IOSFWD
+# include <iosfwd>
+#endif
+
+#ifndef _STLP_INTERNAL_ALGOBASE_H
+#include <stl/_algobase.h>
+#endif
+
+#if defined (_STLP_OWN_IOSTREAMS)
+
+#ifndef _STLP_INTERNAL_OSTREAMBUF_ITERATOR_H
+# include <stl/_ostreambuf_iterator.h>
+#endif
+
+#ifndef _STLP_INTERNAL_ISTREAMBUF_ITERATOR_H
+# include <stl/_istreambuf_iterator.h>
+#endif
+
+#ifndef _STLP_INTERNAL_ISTREAM_H
+# include <stl/_istream.h>
+#endif
+#endif /* _STLP_OWN_IOSTREAMS */
+
+// istream_iterator and ostream_iterator look very different if we're
+// using new, templatized iostreams than if we're using the old cfront
+// version.
+
+# if defined (_STLP_USE_NEW_IOSTREAMS) 
+
+_STLP_BEGIN_NAMESPACE
+
+#  ifndef _STLP_LIMITED_DEFAULT_TEMPLATES
+template <class _Tp, 
+          class _CharT = _STLP_DEFAULTCHAR, class _Traits = char_traits<_CharT>,
+          class _Dist = ptrdiff_t> 
+#   define __ISI_TMPL_HEADER_ARGUMENTS class _Tp, class _CharT, class _Traits, class _Dist
+#   define __ISI_TMPL_ARGUMENTS _Tp, _CharT, _Traits, _Dist
+class istream_iterator : public iterator<input_iterator_tag, _Tp , _Dist,
+                         const _Tp*, const _Tp& > {
+#  else
+
+#   if defined (_STLP_MINIMUM_DEFAULT_TEMPLATE_PARAMS) && ! defined (_STLP_DEFAULT_TYPE_PARAM)
+#    define __ISI_TMPL_HEADER_ARGUMENTS class _Tp
+#    define __ISI_TMPL_ARGUMENTS        _Tp
+template <class _Tp>
+class istream_iterator : public iterator<input_iterator_tag, _Tp , ptrdiff_t, 
+                         const _Tp*, const _Tp& > {
+#   else
+#    define __ISI_TMPL_HEADER_ARGUMENTS class _Tp, class _Dist
+#    define __ISI_TMPL_ARGUMENTS        _Tp, _Dist
+template <class _Tp,__DFL_TYPE_PARAM(_Dist, ptrdiff_t)>
+class istream_iterator : public iterator<input_iterator_tag, _Tp, _Dist , 
+                                         const _Tp*, const _Tp& > {
+#   endif /* _STLP_MINIMUM_DEFAULT_TEMPLATE_PARAMS */
+
+#  endif /* _STLP_LIMITED_DEFAULT_TEMPLATES */
+
+# ifdef _STLP_LIMITED_DEFAULT_TEMPLATES
+  typedef char _CharT;
+  typedef char_traits<char> _Traits;
+#  if defined (_STLP_MINIMUM_DEFAULT_TEMPLATE_PARAMS) && ! defined (_STLP_DEFAULT_TYPE_PARAM)
+  typedef ptrdiff_t _Dist;
+#  endif
+# endif
+
+  typedef istream_iterator< __ISI_TMPL_ARGUMENTS > _Self;
+public:
+  typedef _CharT                         char_type;
+  typedef _Traits                        traits_type;
+  typedef basic_istream<_CharT, _Traits> istream_type;
+
+  typedef input_iterator_tag             iterator_category;
+  typedef _Tp                            value_type;
+  typedef _Dist                          difference_type;
+  typedef const _Tp*                     pointer;
+  typedef const _Tp&                     reference;
+
+  istream_iterator() : _M_stream(0), _M_ok(false) {}
+  istream_iterator(istream_type& __s) : _M_stream(&__s) { _M_read(); }
+
+  reference operator*() const { return _M_value; }
+
+  _STLP_DEFINE_ARROW_OPERATOR
+
+  _Self& operator++() { 
+    _M_read(); 
+    return *this;
+  }
+  _Self operator++(int)  {
+    _Self __tmp = *this;
+    _M_read();
+    return __tmp;
+  }
+
+  bool _M_equal(const _Self& __x) const
+    { return (_M_ok == __x._M_ok) && (!_M_ok || _M_stream == __x._M_stream); }
+
+private:
+  istream_type* _M_stream;
+  _Tp _M_value;
+  bool _M_ok;
+
+  void _M_read() {
+    _M_ok = (_M_stream && *_M_stream) ? true : false;
+    if (_M_ok) {
+      *_M_stream >> _M_value;
+      _M_ok = *_M_stream ? true : false;
+    }
+  }
+};
+
+#ifndef _STLP_LIMITED_DEFAULT_TEMPLATES
+template <class _TpP,
+          class _CharT = _STLP_DEFAULTCHAR, class _Traits = char_traits<_CharT> >
+#else
+template <class _TpP>
+#endif
+class ostream_iterator: public iterator<output_iterator_tag, void, void, void, void> {
+# ifdef _STLP_LIMITED_DEFAULT_TEMPLATES
+  typedef char _CharT;
+  typedef char_traits<char> _Traits;
+  typedef ostream_iterator<_TpP> _Self;
+# else
+  typedef ostream_iterator<_TpP, _CharT, _Traits> _Self;
+# endif
+public:
+  typedef _CharT                         char_type;
+  typedef _Traits                        traits_type;
+  typedef basic_ostream<_CharT, _Traits> ostream_type;
+
+  typedef output_iterator_tag            iterator_category;
+
+  ostream_iterator(ostream_type& __s) : _M_stream(&__s), _M_string(0) {}
+  ostream_iterator(ostream_type& __s, const _CharT* __c) 
+    : _M_stream(&__s), _M_string(__c)  {}
+  _Self& operator=(const _TpP& __val) { 
+    *_M_stream << __val;
+    if (_M_string) *_M_stream << _M_string;
+    return *this;
+  }
+  _Self& operator*() { return *this; }
+  _Self& operator++() { return *this; } 
+  _Self& operator++(int) { return *this; } 
+private:
+  ostream_type* _M_stream;
+  const _CharT* _M_string;
+};
+
+# ifdef _STLP_USE_OLD_HP_ITERATOR_QUERIES
+#  ifdef _STLP_LIMITED_DEFAULT_TEMPLATES
+template <class _TpP>
+inline output_iterator_tag _STLP_CALL 
+iterator_category(const ostream_iterator<_TpP>&) { return output_iterator_tag(); }
+# else
+template <class _TpP, class _CharT, class _Traits>
+inline output_iterator_tag _STLP_CALL 
+iterator_category(const ostream_iterator<_TpP, _CharT, _Traits>&) { return output_iterator_tag(); }
+#  endif
+# endif
+
+_STLP_END_NAMESPACE
+
+# elif ! defined(_STLP_USE_NO_IOSTREAMS)
+
+_STLP_BEGIN_NAMESPACE
+
+#  if defined (_STLP_MINIMUM_DEFAULT_TEMPLATE_PARAMS) && ! defined (_STLP_DEFAULT_TYPE_PARAM)
+#  define __ISI_TMPL_HEADER_ARGUMENTS class _Tp
+#  define __ISI_TMPL_ARGUMENTS        _Tp
+template <class _Tp>
+class istream_iterator : public iterator<input_iterator_tag, _Tp, ptrdiff_t, 
+                         const _Tp*, const _Tp& > {
+#  else
+#  define __ISI_TMPL_HEADER_ARGUMENTS class _Tp, class _Dist
+#  define __ISI_TMPL_ARGUMENTS        _Tp, _Dist
+template <class _Tp, __DFL_TYPE_PARAM(_Dist, ptrdiff_t)>
+class istream_iterator : public iterator<input_iterator_tag, _Tp, _Dist, 
+                         const _Tp*, const _Tp& > {
+#  endif
+
+protected:
+  istream* _M_stream;
+  _Tp _M_value;
+  bool _M_end_marker;
+  void _M_read() {
+    _M_end_marker = (*_M_stream) ? true : false;
+    if (_M_end_marker) *_M_stream >> _M_value;
+    _M_end_marker = (*_M_stream) ? true : false;
+}
+public:
+  typedef input_iterator_tag  iterator_category;
+  typedef _Tp                 value_type;
+  typedef _Dist               difference_type;
+  typedef const _Tp*          pointer;
+  typedef const _Tp&          reference;
+
+  istream_iterator() : _M_stream(&cin), _M_end_marker(false) {}
+  istream_iterator(istream& __s) : _M_stream(&__s) { _M_read(); }
+  reference operator*() const { return _M_value; }
+
+  _STLP_DEFINE_ARROW_OPERATOR
+
+  istream_iterator< __ISI_TMPL_ARGUMENTS >& operator++() { 
+    _M_read(); 
+    return *this;
+  }
+  istream_iterator< __ISI_TMPL_ARGUMENTS > operator++(int)  {
+    istream_iterator< __ISI_TMPL_ARGUMENTS > __tmp = *this;
+    _M_read();
+    return __tmp;
+  }
+  inline bool _M_equal(const istream_iterator< __ISI_TMPL_ARGUMENTS >& __y) const {
+    return (_M_stream == __y._M_stream &&
+	    _M_end_marker == __y._M_end_marker) ||
+      _M_end_marker == false && __y._M_end_marker == false;
+  }
+};
+
+template <class _Tp>
+class ostream_iterator {
+protected:
+  ostream* _M_stream;
+  const char* _M_string;
+public:
+  typedef output_iterator_tag iterator_category;
+# ifdef _STLP_CLASS_PARTIAL_SPECIALIZATION
+  typedef void                value_type;
+  typedef void                difference_type;
+  typedef void                pointer;
+  typedef void                reference;
+# endif
+  ostream_iterator(ostream& __s) : _M_stream(&__s), _M_string(0) {}
+  ostream_iterator(ostream& __s, const char* __c) 
+    : _M_stream(&__s), _M_string(__c)  {}
+  ostream_iterator<_Tp>& operator=(const _Tp& __val) { 
+    *_M_stream << __val;
+    if (_M_string) *_M_stream << _M_string;
+    return *this;
+  }
+  ostream_iterator<_Tp>& operator*() { return *this; }
+  ostream_iterator<_Tp>& operator++() { return *this; } 
+  ostream_iterator<_Tp>& operator++(int) { return *this; } 
+};
+
+# ifdef _STLP_USE_OLD_HP_ITERATOR_QUERIES
+template <class _Tp> inline output_iterator_tag 
+iterator_category(const ostream_iterator<_Tp>&) { return output_iterator_tag(); }
+#endif
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_USE_NEW_IOSTREAMS */
+
+// form-independent definiotion of stream iterators
+_STLP_BEGIN_NAMESPACE
+
+template < __ISI_TMPL_HEADER_ARGUMENTS >
+inline bool _STLP_CALL 
+operator==(const istream_iterator< __ISI_TMPL_ARGUMENTS >& __x,
+           const istream_iterator< __ISI_TMPL_ARGUMENTS >& __y) {
+  return __x._M_equal(__y);
+}
+
+#  ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+
+template < __ISI_TMPL_HEADER_ARGUMENTS >
+inline bool _STLP_CALL 
+operator!=(const istream_iterator< __ISI_TMPL_ARGUMENTS >& __x,
+           const istream_iterator< __ISI_TMPL_ARGUMENTS >& __y) {
+  return !__x._M_equal(__y);
+}
+
+#  endif /* _STLP_USE_SEPARATE_RELOPS_NAMESPACE */
+
+# ifdef _STLP_USE_OLD_HP_ITERATOR_QUERIES
+template < __ISI_TMPL_HEADER_ARGUMENTS >
+inline input_iterator_tag _STLP_CALL 
+iterator_category(const istream_iterator< __ISI_TMPL_ARGUMENTS >&)
+{ return input_iterator_tag(); }
+template < __ISI_TMPL_HEADER_ARGUMENTS >
+inline _Tp* _STLP_CALL 
+value_type(const istream_iterator< __ISI_TMPL_ARGUMENTS >&) { return (_Tp*) 0; }
+
+#  if defined (_STLP_MINIMUM_DEFAULT_TEMPLATE_PARAMS) && ! defined (_STLP_DEFAULT_TYPE_PARAM)
+template < __ISI_TMPL_HEADER_ARGUMENTS >
+inline ptrdiff_t* _STLP_CALL 
+distance_type(const istream_iterator< __ISI_TMPL_ARGUMENTS >&) { return (ptrdiff_t*)0; }
+#  else
+template < __ISI_TMPL_HEADER_ARGUMENTS >
+inline _Dist* _STLP_CALL 
+distance_type(const istream_iterator< __ISI_TMPL_ARGUMENTS >&) { return (_Dist*)0; }
+#  endif /* _STLP_MINIMUM_DEFAULT_TEMPLATE_PARAMS */
+
+# endif 
+
+_STLP_END_NAMESPACE
+
+#  undef __ISI_TMPL_HEADER_ARGUMENTS
+#  undef __ISI_TMPL_ARGUMENTS
+
+
+#endif /* _STLP_INTERNAL_STREAM_ITERATOR_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_streambuf.c b/main/source/stlport/stlport/stl/_streambuf.c
new file mode 100644
index 00000000..8ccd2512
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_streambuf.c
@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+#ifndef _STLP_STREAMBUF_C
+#define _STLP_STREAMBUF_C
+
+#ifndef _STLP_INTERNAL_STREAMBUF
+# include <stl/_streambuf.h>
+#endif
+
+# if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION)
+
+_STLP_BEGIN_NAMESPACE
+//----------------------------------------------------------------------
+// Non-inline basic_streambuf<> member functions.
+
+template <class _CharT, class _Traits>
+basic_streambuf<_CharT, _Traits>::basic_streambuf()
+  : _M_gbegin(0), _M_gnext(0), _M_gend(0),
+    _M_pbegin(0), _M_pnext(0), _M_pend(0),
+    _M_locale()
+{
+  //  _M_lock._M_initialize();
+}
+
+template <class _CharT, class _Traits>
+basic_streambuf<_CharT, _Traits>::~basic_streambuf() 
+{}
+
+
+template <class _CharT, class _Traits>
+locale 
+basic_streambuf<_CharT, _Traits>::pubimbue(const locale& __loc) {
+  this->imbue(__loc);
+  locale __tmp = _M_locale;
+  _M_locale = __loc;
+  return __tmp;
+}
+
+template <class _CharT, class _Traits>
+streamsize
+basic_streambuf<_CharT, _Traits>::xsgetn(_CharT* __s, streamsize __n)
+{
+  streamsize __result = 0;
+  const int_type __eof = _Traits::eof();
+
+  while (__result < __n) {
+    if (_M_gnext < _M_gend) {
+      size_t __chunk = (min) (__STATIC_CAST(size_t,_M_gend - _M_gnext),
+                           __STATIC_CAST(size_t,__n - __result));
+      _Traits::copy(__s, _M_gnext, __chunk);
+      __result += __chunk;
+      __s += __chunk;
+      _M_gnext += __chunk;
+    }
+    else {
+      int_type __c = this->sbumpc();
+      if (!_Traits::eq_int_type(__c, __eof)) {
+        *__s = __c;
+        ++__result;
+	++__s;
+      }
+      else
+        break; 
+    }
+  }
+  
+  return __result;
+}
+
+template <class _CharT, class _Traits>
+streamsize
+basic_streambuf<_CharT, _Traits>::xsputn(const _CharT* __s, streamsize __n)
+{
+  streamsize __result = 0;
+  const int_type __eof = _Traits::eof();
+
+  while (__result < __n) {
+    if (_M_pnext < _M_pend) {
+      size_t __chunk = (min) (__STATIC_CAST(size_t,_M_pend - _M_pnext),
+                           __STATIC_CAST(size_t,__n - __result));
+      _Traits::copy(_M_pnext, __s, __chunk);
+      __result += __chunk;
+      __s += __chunk;
+      _M_pnext += __chunk;
+    }
+
+    else if (!_Traits::eq_int_type(this->overflow(_Traits::to_int_type(*__s)),
+                                   __eof)) {
+      ++__result;
+      ++__s;
+    }
+    else
+      break;
+  }
+  return __result;
+}
+
+template <class _CharT, class _Traits>
+streamsize
+basic_streambuf<_CharT, _Traits>::_M_xsputnc(_CharT __c, streamsize __n)
+{
+  streamsize __result = 0;
+  const int_type __eof = _Traits::eof();
+
+  while (__result < __n) {
+    if (_M_pnext < _M_pend) {
+      size_t __chunk = (min) (__STATIC_CAST(size_t,_M_pend - _M_pnext),
+                           __STATIC_CAST(size_t,__n - __result));
+      _Traits::assign(_M_pnext, __chunk, __c);
+      __result += __chunk;
+      _M_pnext += __chunk;
+    }
+
+    else if (!_Traits::eq_int_type(this->overflow(_Traits::to_int_type(__c)),
+                                   __eof))
+      ++__result;
+    else
+      break;
+  }
+  return __result;
+}
+
+template <class _CharT, class _Traits>
+_STLP_TYPENAME_ON_RETURN_TYPE basic_streambuf<_CharT, _Traits>::int_type 
+basic_streambuf<_CharT, _Traits>::_M_snextc_aux()  
+{
+  int_type __eof = _Traits::eof();
+  if (_M_gend == _M_gnext)
+    return _Traits::eq_int_type(this->uflow(), __eof) ? __eof : this->sgetc();
+  else {
+    _M_gnext = _M_gend;
+    return this->underflow();
+  }
+}
+
+template <class _CharT, class _Traits>
+_STLP_TYPENAME_ON_RETURN_TYPE basic_streambuf<_CharT, _Traits>::int_type 
+basic_streambuf<_CharT, _Traits>::pbackfail(int_type) { 
+ return _Traits::eof(); 
+}
+
+template <class _CharT, class _Traits>
+_STLP_TYPENAME_ON_RETURN_TYPE basic_streambuf<_CharT, _Traits>::int_type 
+basic_streambuf<_CharT, _Traits>::overflow(int_type) { 
+  return _Traits::eof(); 
+}
+
+template <class _CharT, class _Traits>
+_STLP_TYPENAME_ON_RETURN_TYPE basic_streambuf<_CharT, _Traits>::int_type 
+basic_streambuf<_CharT, _Traits>::uflow() {
+    return ( _Traits::eq_int_type(this->underflow(),_Traits::eof()) ?
+             _Traits::eof() :
+             _Traits::to_int_type(*_M_gnext++));
+}
+
+template <class _CharT, class _Traits>
+_STLP_TYPENAME_ON_RETURN_TYPE basic_streambuf<_CharT, _Traits>::int_type 
+basic_streambuf<_CharT, _Traits>::underflow()
+{ return _Traits::eof(); }
+
+template <class _CharT, class _Traits>
+streamsize 
+basic_streambuf<_CharT, _Traits>::showmanyc()
+{ return 0; }
+
+template <class _CharT, class _Traits>
+void 
+basic_streambuf<_CharT, _Traits>::imbue(const locale&) {}
+
+template <class _CharT, class _Traits>
+int
+basic_streambuf<_CharT, _Traits>::sync() { return 0; }
+
+template <class _CharT, class _Traits>
+_STLP_TYPENAME_ON_RETURN_TYPE basic_streambuf<_CharT, _Traits>::pos_type 
+basic_streambuf<_CharT, _Traits>::seekpos(pos_type, ios_base::openmode)
+{ return pos_type(-1); }
+
+template <class _CharT, class _Traits>
+_STLP_TYPENAME_ON_RETURN_TYPE basic_streambuf<_CharT, _Traits>::pos_type 
+basic_streambuf<_CharT, _Traits>::seekoff(off_type, ios_base::seekdir,
+					  ios_base::openmode)
+{ return pos_type(-1); }
+
+template <class _CharT, class _Traits>
+basic_streambuf<_CharT, _Traits>* 
+basic_streambuf<_CharT, _Traits>:: setbuf(char_type*, streamsize)
+{ return this; }
+
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+#  if !defined (_STLP_NO_WCHAR_T)
+_STLP_EXPORT_TEMPLATE_CLASS basic_streambuf<wchar_t, char_traits<wchar_t> >;
+#  endif
+# endif /* _STLP_USE_TEMPLATE_EXPORT */
+
+_STLP_END_NAMESPACE
+
+# endif /* EXPOSE */
+
+#endif
diff --git a/main/source/stlport/stlport/stl/_streambuf.h b/main/source/stlport/stlport/stl/_streambuf.h
new file mode 100644
index 00000000..2549f6af
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_streambuf.h
@@ -0,0 +1,526 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+#ifndef _STLP_INTERNAL_STREAMBUF
+#define _STLP_INTERNAL_STREAMBUF
+
+#ifndef _STLP_IOS_BASE_H
+#include <stl/_ios_base.h>      // Needed for ios_base bitfield members.
+                                // <ios_base> includes <iosfwd>.
+#endif
+
+#ifndef _STLP_STDIO_FILE_H
+#include <stl/_stdio_file.h>     // Declaration of struct FILE, and of
+                                // functions to manipulate it.
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+//----------------------------------------------------------------------
+// Class basic_streambuf<>, the base class of the streambuf hierarchy.
+
+// A basic_streambuf<> manages an input (get) area and an output (put)
+// area.  Each is described by three pointers: a beginning, an end, and a
+// current position.  basic_streambuf<> contains some very simple member
+// functions that manipulate those six pointers, but almost all of the real
+// functionality gets delegated to protected virtual member functions.
+// All of the public member functions are inline, and most of the protected
+// member functions are virtual.
+
+// Although basic_streambuf<> is not abstract, it is useful only as a base
+// class.  Its virtual member functions have default definitions such that
+// reading from a basic_streambuf<> will always yield EOF, and writing to a
+// basic_streambuf<> will always fail.
+
+// The second template parameter, _Traits, defaults to char_traits<_CharT>.
+// The default is declared in header <iosfwd>, and it isn't declared here
+// because C++ language rules do not allow it to be declared twice. 
+
+template <class _CharT, class _Traits>
+class basic_streambuf
+{
+  friend class basic_istream<_CharT, _Traits>;
+  friend class basic_ostream<_CharT, _Traits>;
+
+public:                         // Typedefs.
+  typedef _CharT                     char_type;
+  typedef typename _Traits::int_type int_type;
+  typedef typename _Traits::pos_type pos_type;
+  typedef typename _Traits::off_type off_type;
+  typedef _Traits                    traits_type;
+
+private:                        // Data members.
+
+  char_type* _M_gbegin;         // Beginning of get area
+  char_type* _M_gnext;          // Current position within the get area
+  char_type* _M_gend;           // End of get area
+
+  char_type* _M_pbegin;         // Beginning of put area
+  char_type* _M_pnext;          // Current position within the put area
+  char_type* _M_pend;           // End of put area
+
+  locale _M_locale;             // The streambuf's locale object
+
+public:                         // Extension: locking, for thread safety.
+  _STLP_mutex _M_lock;
+
+public:                         // Destructor.
+  virtual ~basic_streambuf();
+
+protected:                      // The default constructor.
+  basic_streambuf();
+
+protected:                      // Protected interface to the get area.
+  char_type* eback() const { return _M_gbegin; } // Beginning
+  char_type* gptr()  const { return _M_gnext; }  // Current position
+  char_type* egptr() const { return _M_gend; }   // End
+  
+  void gbump(int __n) { _M_gnext += __n; }
+  void setg(char_type* __gbegin, char_type* __gnext, char_type* __gend) {
+    _M_gbegin = __gbegin;
+    _M_gnext  = __gnext;
+    _M_gend   = __gend;
+  }
+
+public:
+  // An alternate public interface to the above functions
+  // which allows us to avoid using templated friends which
+  // are not supported on some compilers.
+
+  char_type* _M_eback() const { return eback(); }
+  char_type* _M_gptr()  const { return gptr(); }
+  char_type* _M_egptr() const { return egptr(); }
+  void _M_gbump(int __n)      { gbump(__n); }
+  void _M_setg(char_type* __gbegin, char_type* __gnext, char_type* __gend)
+    { setg(__gbegin, __gnext, __gend); }
+
+protected:                      // Protected interface to the put area
+
+  char_type* pbase() const { return _M_pbegin; } // Beginning
+  char_type* pptr()  const { return _M_pnext; }  // Current position
+  char_type* epptr() const { return _M_pend; }   // End
+
+  void pbump(int __n) { _M_pnext += __n; }
+  void setp(char_type* __pbegin, char_type* __pend) {
+    _M_pbegin = __pbegin;
+    _M_pnext  = __pbegin;
+    _M_pend   = __pend;
+  }
+
+protected:                      // Virtual buffer management functions.
+
+  virtual basic_streambuf<_CharT, _Traits>* setbuf(char_type*, streamsize);
+
+  // Alters the stream position, using an integer offset.  In this
+  // class seekoff does nothing; subclasses are expected to override it.
+  virtual pos_type seekoff(off_type, ios_base::seekdir,
+                           ios_base::openmode = ios_base::in | ios_base::out);
+
+  // Alters the stream position, using a previously obtained streampos.  In
+  // this class seekpos does nothing; subclasses are expected to override it.
+  virtual pos_type
+  seekpos(pos_type, ios_base::openmode = ios_base::in | ios_base::out);
+
+  // Synchronizes (i.e. flushes) the buffer.  All subclasses are expected to 
+  // override this virtual member function.
+  virtual int sync();
+
+
+public:                         // Buffer management.
+  basic_streambuf<_CharT, _Traits>* pubsetbuf(char_type* __s, streamsize __n) 
+    { return this->setbuf(__s, __n); }
+
+  pos_type pubseekoff(off_type __offset, ios_base::seekdir __way,
+                      ios_base::openmode __mod = ios_base::in | ios_base::out)
+    { return this->seekoff(__offset, __way, __mod); }
+
+  pos_type pubseekpos(pos_type __sp,
+                      ios_base::openmode __mod = ios_base::in | ios_base::out)
+    { return this->seekpos(__sp, __mod); }
+
+  int pubsync() { return this->sync(); }
+
+protected:                      // Virtual get area functions, as defined in
+                                // 17.5.2.4.3 and 17.5.2.4.4 of the standard.
+  // Returns a lower bound on the number of characters that we can read,
+  // with underflow, before reaching end of file.  (-1 is a special value:
+  // it means that underflow will fail.)  Most subclasses should probably
+  // override this virtual member function.
+  virtual streamsize showmanyc();
+
+  // Reads up to __n characters.  Return value is the number of 
+  // characters read.
+  virtual streamsize xsgetn(char_type* __s, streamsize __n);
+
+  // Called when there is no read position, i.e. when gptr() is null
+  // or when gptr() >= egptr().  Subclasses are expected to override
+  // this virtual member function.
+  virtual int_type underflow();
+
+  // Similar to underflow(), but used for unbuffered input.  Most 
+  // subclasses should probably override this virtual member function.
+  virtual int_type uflow();
+
+  // Called when there is no putback position, i.e. when gptr() is null
+  // or when gptr() == eback().  All subclasses are expected to override
+  // this virtual member function.
+  virtual int_type pbackfail(int_type = traits_type::eof());
+
+protected:                      // Virtual put area functions, as defined in
+                                // 27.5.2.4.5 of the standard.
+
+  // Writes up to __n characters.  Return value is the number of characters
+  // written.
+  virtual streamsize xsputn(const char_type* __s, streamsize __n);
+
+  // Extension: writes up to __n copies of __c.  Return value is the number
+  // of characters written.
+  virtual streamsize _M_xsputnc(char_type __c, streamsize __n);
+
+  // Called when there is no write position.  All subclasses are expected to
+  // override this virtual member function.
+  virtual int_type overflow(int_type = traits_type::eof());
+
+public:                         // Public members for writing characters.
+  // Write a single character.
+  int_type sputc(char_type __c) {
+    return ((_M_pnext < _M_pend) ? _Traits::to_int_type(*_M_pnext++ = __c)
+      : this->overflow(_Traits::to_int_type(__c)));
+  }
+
+  // Write __n characters.
+  streamsize sputn(const char_type* __s, streamsize __n)
+    { return this->xsputn(__s, __n); }
+
+  // Extension: write __n copies of __c.
+  streamsize _M_sputnc(char_type __c, streamsize __n)
+    { return this->_M_xsputnc(__c, __n); }
+
+private:                        // Helper functions.
+  int_type _M_snextc_aux();
+
+
+public:                         // Public members for reading characters.
+  streamsize in_avail() {
+    return (_M_gnext < _M_gend) ? (_M_gend - _M_gnext) : this->showmanyc();
+  }
+  
+  // Advance to the next character and return it.
+  int_type snextc() {
+	return ( _M_gend - _M_gnext > 1 ?
+             _Traits::to_int_type(*++_M_gnext) :
+             this->_M_snextc_aux());
+  }
+
+  // Return the current character and advance to the next.
+  int_type sbumpc() {
+    return _M_gnext < _M_gend ? _Traits::to_int_type(*_M_gnext++) 
+      : this->uflow();
+  }
+  
+  // Return the current character without advancing to the next.
+  int_type sgetc() {
+    return _M_gnext < _M_gend ? _Traits::to_int_type(*_M_gnext) 
+      : this->underflow();
+  }
+  
+  streamsize sgetn(char_type* __s, streamsize __n)
+  { return this->xsgetn(__s, __n); }
+  
+  int_type sputbackc(char_type __c) {
+    return ((_M_gbegin < _M_gnext) && _Traits::eq(__c, *(_M_gnext - 1)))
+      ? _Traits::to_int_type(*--_M_gnext)
+      : this->pbackfail(_Traits::to_int_type(__c));
+  }
+  
+  int_type sungetc() {
+    return (_M_gbegin < _M_gnext)
+      ? _Traits::to_int_type(*--_M_gnext)
+      : this->pbackfail();
+  }
+
+protected:                      // Virtual locale functions.
+
+  // This is a hook, called by pubimbue() just before pubimbue()
+  // sets the streambuf's locale to __loc.  Note that imbue should
+  // not (and cannot, since it has no access to streambuf's private
+  // members) set the streambuf's locale itself.
+  virtual void imbue(const locale&);
+
+public:                         // Locale-related functions.
+  locale pubimbue(const locale&);
+  locale getloc() const { return _M_locale; }
+
+# ifndef _STLP_NO_ANACHRONISMS
+  void stossc() { this->sbumpc(); }
+# endif
+#if defined(__MVS__) || defined(__OS400__)
+private: // Data members.
+
+  char_type* _M_gbegin; // Beginning of get area
+  char_type* _M_gnext; // Current position within the get area
+  char_type* _M_gend; // End of get area
+
+  char_type* _M_pbegin; // Beginning of put area
+  char_type* _M_pnext; // Current position within the put area
+  char_type* _M_pend; // End of put area
+#endif
+};
+
+
+//----------------------------------------------------------------------
+// Specialization: basic_streambuf<char, char_traits<char> >
+
+// We implement basic_streambuf<char, char_traits<char> > very differently
+// than the general basic_streambuf<> template.  The main reason for this
+// difference is a requirement in the C++ standard: the standard input
+// and output streams cin and cout are required by default to be synchronized
+// with the C library components stdin and stdout.  This means it must be
+// possible to synchronize a basic_streambuf<char> with a C buffer.
+//
+// There are two basic ways to do that.  First, the streambuf could be
+// unbuffered and delegate all buffering to stdio operations.  This
+// would be correct, but slow: it would require at least one virtual
+// function call for every character.  Second, the streambuf could use 
+// a C stdio FILE as its buffer.  
+//
+// We choose the latter option.  Every streambuf has pointers to two
+// FILE objects, one for the get area and one for the put area.  Ordinarily
+// it just uses a FILE object as a convenient way to package the three
+// get/put area pointers.  If a basic_streambuf<char> is synchronized with
+// a stdio stream, though, then the pointers are to a FILE object that's
+// also used by the C library.
+//
+// The header <stl/_stdio_file.h> encapsulates the implementation details
+// of struct FILE.  It contains low-level inline functions that convert
+// between whe FILE's internal representation and the three-pointer 
+// representation that basic_streambuf<> needs.
+
+_STLP_TEMPLATE_NULL 
+class _STLP_CLASS_DECLSPEC basic_streambuf<char, char_traits<char> >
+{
+  friend class basic_istream<char, char_traits<char> >;
+  friend class basic_ostream<char, char_traits<char> >;
+public:                         // Typedefs.
+  typedef char                        char_type;
+  typedef char_traits<char>::int_type int_type;
+  typedef char_traits<char>::pos_type pos_type;
+  typedef char_traits<char>::off_type off_type;
+  typedef char_traits<char>           traits_type;
+
+private:                        // Data members.
+
+  FILE* _M_get;                 // Reference to the get area
+  FILE* _M_put;                 // Reference to the put area
+
+#if defined(__hpux)
+  _FILEX  _M_default_get;          // Get area, unless we're syncing with stdio.
+  _FILEX  _M_default_put;          // Put area, unless we're syncing with stdio.
+#else
+  FILE  _M_default_get;          // Get area, unless we're syncing with stdio.
+  FILE  _M_default_put;          // Put area, unless we're syncing with stdio.
+#endif
+
+  locale _M_locale;
+
+public:                         // Extension: locking, for thread safety.
+  _STLP_mutex _M_lock;
+
+public:                         // Destructor.
+  virtual ~basic_streambuf _STLP_PSPEC2(char, char_traits<char>) ();
+
+protected:                      // Constructors.
+
+  // The default constructor; defined here inline as some compilers require it
+  basic_streambuf _STLP_PSPEC2(char, char_traits<char>) ()
+    : _M_get(__REINTERPRET_CAST(FILE*,&_M_default_get)),
+      _M_put(__REINTERPRET_CAST(FILE*,&_M_default_put)), _M_locale()
+  {
+    // _M_lock._M_initialize();
+    _FILE_I_set(_M_get, 0, 0, 0);
+    _FILE_O_set(_M_put, 0, 0, 0);
+  }
+  
+  // Extension: a constructor for streambufs synchronized with C stdio files.
+  basic_streambuf _STLP_PSPEC2(char, char_traits<char>) (FILE* __get, FILE* __put);
+
+protected:                      // Protected interface to the get area.
+  char_type* eback() const { return _FILE_I_begin(_M_get); }
+  char_type* gptr()  const { return _FILE_I_next(_M_get); }
+  char_type* egptr() const { return _FILE_I_end(_M_get); }
+  void gbump(int __n) { _FILE_I_bump(_M_get, __n); }
+  void setg(char_type* __gbegin, char_type* __gnext, char_type* __gend)
+    { _FILE_I_set(_M_get, __gbegin, __gnext, __gend); }
+
+public:
+  // An alternate public interface to the above functions
+  // which allows us to avoid using templated friends which
+  // are not supported on some compilers.
+
+  char_type* _M_eback() const { return _FILE_I_begin(_M_get); }
+  char_type* _M_gptr()  const { return _FILE_I_next(_M_get); }
+  char_type* _M_egptr() const { return _FILE_I_end(_M_get); }
+
+  void _M_gbump(int __n) { _FILE_I_bump(_M_get, __n); }
+  void _M_setg(char_type* __gbegin, char_type* __gnext, char_type* __gend)
+    { _FILE_I_set(_M_get, __gbegin, __gnext, __gend); }
+
+protected:                      // Protected interface to the put area
+  char_type* pbase() const { return _FILE_O_begin(_M_put); }
+  char_type* pptr()  const { return _FILE_O_next(_M_put); }
+  char_type* epptr() const { return _FILE_O_end(_M_put); }
+
+  void pbump(int __n) { _FILE_O_bump(_M_put, __n); }
+  void setp(char_type* __pbegin, char_type* __pend)
+    { _FILE_O_set(_M_put, __pbegin, __pbegin, __pend); }
+
+protected:                      // Virtual buffer-management functions.
+  virtual basic_streambuf<char, char_traits<char> >* setbuf(char_type*, streamsize);
+  virtual pos_type seekoff(off_type, ios_base::seekdir,
+                           ios_base::openmode = ios_base::in | ios_base::out);
+  virtual pos_type
+  seekpos(pos_type, ios_base::openmode = ios_base::in | ios_base::out);
+  virtual int sync();
+
+public:                         // Buffer management.
+  basic_streambuf<char, char_traits<char> >* pubsetbuf(char_type* __s, streamsize __n) 
+    { return this->setbuf(__s, __n); }
+
+  pos_type pubseekoff(off_type __offset, ios_base::seekdir __way,
+                      ios_base::openmode __mod = ios_base::in | ios_base::out)
+    { return this->seekoff(__offset, __way, __mod); }
+
+  pos_type pubseekpos(pos_type __sp,
+                      ios_base::openmode __mod = ios_base::in | ios_base::out)
+    { return this->seekpos(__sp, __mod); }
+
+  int pubsync() { return this->sync(); }
+
+protected:                      // Virtual get area functions.
+  virtual streamsize showmanyc();
+  virtual streamsize xsgetn(char_type* __s, streamsize __n);
+  virtual int_type underflow();
+  virtual int_type uflow();
+  virtual int_type pbackfail(int_type __c = traits_type::eof());
+
+protected:                      // Virtual put area functions.
+  virtual streamsize xsputn(const char_type* __s, streamsize __n);
+  virtual streamsize _M_xsputnc(char_type __c, streamsize __n);
+  virtual int_type overflow(int_type = traits_type::eof());
+
+public:                         // Public members for writing characters.
+  // Write a single character.
+  int_type sputc(char_type __c) {
+    int_type __res;
+	if( _FILE_O_avail(_M_put) > 0 )
+	{
+		_FILE_O_postincr(_M_put) = __c;
+		__res = traits_type::to_int_type(__c);
+	}
+	else
+      __res = this->overflow(traits_type::to_int_type(__c));
+    return __res;
+  }
+
+  // Write __n characters.
+  streamsize sputn(const char_type* __s, streamsize __n)
+    { return this->xsputn(__s, __n); }
+
+  // Extension: write __n copies of __c.
+  streamsize _M_sputnc(char_type __c, streamsize __n)
+    { return this->_M_xsputnc(__c, __n); }
+
+private:                        // Helper functions.
+  int_type _M_snextc_aux();
+
+public:                         // Public members for reading characters.
+  streamsize in_avail()
+    { return _FILE_I_avail(_M_get) > 0 ? _FILE_I_avail(_M_get) 
+                                     : this->showmanyc(); }
+  
+  // Advance to the next character and return it.
+  int_type snextc() {
+    return _FILE_I_avail(_M_get) > 1
+      ? traits_type::to_int_type(_FILE_I_preincr(_M_get))
+      : this->_M_snextc_aux();
+  }
+
+  // Return the current character and advance to the next.
+  int_type sbumpc() {
+    return _FILE_I_avail(_M_get) > 0
+      ? traits_type::to_int_type(_FILE_I_postincr(_M_get))
+      : this->uflow();
+  }
+
+  // Return the current character without advancing to the next.
+  int_type sgetc() {
+    return _FILE_I_avail(_M_get) > 0
+      ? traits_type::to_int_type(*_FILE_I_next(_M_get))
+      : this->underflow();
+  }
+    
+  streamsize sgetn(char_type* __s, streamsize __n)
+    { return this->xsgetn(__s, __n); }
+
+  int_type sputbackc(char_type __c) {
+    return _FILE_I_begin(_M_get) < _FILE_I_next(_M_get) &&
+           __c == *(_FILE_I_next(_M_get) - 1)
+      ? traits_type::to_int_type(_FILE_I_predecr(_M_get))
+      : this->pbackfail(traits_type::to_int_type(__c));
+  }
+
+  int_type sungetc() {
+    return _FILE_I_begin(_M_get) < _FILE_I_next(_M_get)
+      ? traits_type::to_int_type(_FILE_I_predecr(_M_get))
+      : this->pbackfail();
+  }
+
+protected:                      // Virtual locale functions.
+  virtual void imbue(const locale&);
+
+public:                         // Locale-related functions.
+  locale pubimbue(const locale&);
+  locale getloc() const { return _M_locale; }
+
+# ifndef _STLP_NO_ANACHRONISMS
+public:
+  void stossc() { this->sbumpc(); }
+# endif
+
+#if defined(__MVS__) || defined(__OS400__)
+private: // Data members.
+
+  char_type* _M_gbegin; // Beginning of get area
+  char_type* _M_gnext; // Current position within the get area
+  char_type* _M_gend; // End of get area
+
+  char_type* _M_pbegin; // Beginning of put area
+  char_type* _M_pnext; // Current position within the put area
+  char_type* _M_pend; // End of put area
+#endif
+
+};
+_STLP_END_NAMESPACE
+
+# if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION) && !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_streambuf.c>
+# endif
+
+#endif
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_streambuf_iterator.h b/main/source/stlport/stlport/stl/_streambuf_iterator.h
new file mode 100644
index 00000000..4bbd8852
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_streambuf_iterator.h
@@ -0,0 +1,83 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996-1998
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#if !defined (_STLP_INTERNAL_STREAMBUF_ITERATOR_H)
+#define _STLP_INTERNAL_STREAMBUF_ITERATOR_H
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _CharT, class _Traits>
+basic_streambuf<_CharT, _Traits>* _STLP_CALL _M_get_ostreambuf(basic_ostream<_CharT, _Traits>& ) ;
+
+// The default template argument is declared in iosfwd
+template<class _CharT, class _Traits>
+class ostreambuf_iterator
+{
+public:
+  typedef _CharT                           char_type;
+  typedef _Traits                          traits_type;
+  typedef typename _Traits::int_type       int_type;
+  typedef basic_streambuf<_CharT, _Traits> streambuf_type;
+  typedef basic_ostream<_CharT, _Traits>   ostream_type;
+
+  typedef output_iterator_tag              iterator_category;
+  typedef void                             value_type;
+  typedef void                             difference_type;
+  typedef void                             pointer;
+  typedef void                             reference;
+
+public:
+  ostreambuf_iterator(streambuf_type* __buf) _STLP_NOTHROW : _M_buf(__buf), _M_ok(__buf!=0) {}
+  ostreambuf_iterator(ostream_type& __o) _STLP_NOTHROW : _M_buf(_M_get_ostreambuf(__o)), _M_ok(_M_buf != 0) {}
+
+  ostreambuf_iterator<_CharT, _Traits>& operator=(char_type __c) {
+    _M_ok = _M_ok && !traits_type::eq_int_type(_M_buf->sputc(__c),
+                                               traits_type::eof());
+    return *this;
+  }    
+  
+  ostreambuf_iterator<_CharT, _Traits>& operator*()     { return *this; }
+  ostreambuf_iterator<_CharT, _Traits>& operator++()    { return *this; }
+  ostreambuf_iterator<_CharT, _Traits>& operator++(int) { return *this; }
+
+  bool failed() const { return !_M_ok; }
+
+private:
+  streambuf_type* _M_buf;
+  bool _M_ok;
+};
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_INTERNAL_STREAMBUF_ITERATOR_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_string.c b/main/source/stlport/stlport/stl/_string.c
new file mode 100644
index 00000000..27ede956
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_string.c
@@ -0,0 +1,580 @@
+/*
+ *
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+#ifndef _STLP_STRING_C
+#define _STLP_STRING_C
+
+#ifndef _STLP_STRING_H
+# include <stl/_string.h>
+#endif
+
+# ifdef _STLP_DEBUG
+#  define basic_string _Nondebug_string
+# endif
+
+# if defined (_STLP_USE_OWN_NAMESPACE) || !defined (_STLP_USE_NATIVE_STRING)
+
+# if defined (_STLP_NESTED_TYPE_PARAM_BUG)
+#  define __size_type__ size_t
+#  define size_type size_t
+#  define iterator   _CharT*
+# else
+#  define __size_type__ _STLP_TYPENAME_ON_RETURN_TYPE basic_string<_CharT,_Traits,_Alloc>::size_type
+# endif
+
+_STLP_BEGIN_NAMESPACE
+
+// ------------------------------------------------------------
+// Non-inline declarations.
+
+
+// Change the string's capacity so that it is large enough to hold
+//  at least __res_arg elements, plus the terminating _CharT().  Note that,
+//  if __res_arg < capacity(), this member function may actually decrease
+//  the string's capacity.
+template <class _CharT, class _Traits, class _Alloc> void basic_string<_CharT,_Traits,_Alloc>::reserve(size_type __res_arg) {
+
+  if (__res_arg >= capacity())
+    {      
+      if (__res_arg > max_size())
+	this->_M_throw_length_error();
+
+      size_type __n = __res_arg + 1;
+      pointer __new_start = this->_M_end_of_storage.allocate(__n);
+      pointer __new_finish = __new_start;
+      
+      _STLP_TRY {
+	__new_finish = uninitialized_copy(this->_M_start, this->_M_finish, __new_start);
+	_M_construct_null(__new_finish);
+      }
+      _STLP_UNWIND((_STLP_STD::_Destroy(__new_start, __new_finish), 
+		    this->_M_end_of_storage.deallocate(__new_start, __n)));
+      
+      _STLP_STD::_Destroy(this->_M_start, this->_M_finish + 1);
+      this->_M_deallocate_block();
+      this->_M_start = __new_start;
+      this->_M_finish = __new_finish;
+      this->_M_end_of_storage._M_data = __new_start + __n;
+    }
+}
+
+template <class _CharT, class _Traits, class _Alloc> basic_string<_CharT,_Traits,_Alloc>& basic_string<_CharT,_Traits,_Alloc>::append(size_type __n, _CharT __c) {
+  if (__n > max_size() || size() > max_size() - __n)
+    this->_M_throw_length_error();
+  if (size() + __n > capacity())
+    reserve(size() + (max)(size(), __n));
+  if (__n > 0) {
+    uninitialized_fill_n(this->_M_finish + 1, __n - 1, __c);
+    _STLP_TRY {
+      _M_construct_null(this->_M_finish + __n);
+    }
+    _STLP_UNWIND(_STLP_STD::_Destroy(this->_M_finish + 1, this->_M_finish + __n));
+    _Traits::assign(*end(), __c);
+    this->_M_finish += __n;
+  }
+  return *this;
+}
+
+#ifndef _STLP_MEMBER_TEMPLATES
+
+template <class _CharT, class _Traits, class _Alloc> basic_string<_CharT, _Traits, _Alloc>& basic_string<_CharT, _Traits, _Alloc>::append(const _CharT* __first,
+					      const _CharT* __last)
+{
+  if (__first != __last) {
+    const size_type __old_size = size();
+    ptrdiff_t __n = __last - __first;
+    if ((size_type)__n > max_size() || __old_size > max_size() - __n)
+      this->_M_throw_length_error();
+    if (__old_size + __n > capacity()) {
+      const size_type __len = __old_size + (max)(__old_size, (size_t) __n) + 1;
+      pointer __new_start = this->_M_end_of_storage.allocate(__len);
+      pointer __new_finish = __new_start;
+      _STLP_TRY {
+        __new_finish = uninitialized_copy(this->_M_start, this->_M_finish, __new_start);
+        __new_finish = uninitialized_copy(__first, __last, __new_finish);
+        _M_construct_null(__new_finish);
+      }
+      _STLP_UNWIND((_STLP_STD::_Destroy(__new_start,__new_finish),
+                    this->_M_end_of_storage.deallocate(__new_start,__len)));
+      _STLP_STD::_Destroy(this->_M_start, this->_M_finish + 1);
+      this->_M_deallocate_block();
+      this->_M_start = __new_start;
+      this->_M_finish = __new_finish;
+      this->_M_end_of_storage._M_data = __new_start + __len; 
+    }
+    else {
+      const _CharT* __f1 = __first;
+      ++__f1;
+      uninitialized_copy(__f1, __last, this->_M_finish + 1);
+      _STLP_TRY {
+        _M_construct_null(this->_M_finish + __n);
+      }
+      _STLP_UNWIND(_STLP_STD::_Destroy(this->_M_finish + 1, this->_M_finish + __n));
+      _Traits::assign(*end(), *__first);
+      this->_M_finish += __n;
+    }
+  }
+  return *this;  
+}
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+template <class _CharT, class _Traits, class _Alloc> 
+basic_string<_CharT,_Traits,_Alloc>& 
+basic_string<_CharT,_Traits,_Alloc>::assign(size_type __n, _CharT __c) {
+  if (__n <= size()) {
+    _Traits::assign(this->_M_start, __n, __c);
+    erase(begin() + __n, end());
+  }
+  else {
+    _Traits::assign(this->_M_start, size(), __c);
+    append(__n - size(), __c);
+  }
+  return *this;
+}
+
+template <class _CharT, class _Traits, class _Alloc> _CharT* 
+basic_string<_CharT,_Traits,_Alloc> ::_M_insert_aux(_CharT* __p,
+                  _CharT __c)
+{
+  pointer __new_pos = __p;
+  if (this->_M_finish + 1 < this->_M_end_of_storage._M_data) {
+    _M_construct_null(this->_M_finish + 1);
+    _Traits::move(__p + 1, __p, this->_M_finish - __p);
+    _Traits::assign(*__p, __c);
+    ++this->_M_finish;
+  }
+  else {
+    const size_type __old_len = size();
+    const size_type __len = __old_len +
+                            (max)(__old_len, __STATIC_CAST(size_type,1)) + 1;
+    pointer __new_start = this->_M_end_of_storage.allocate(__len);
+    pointer __new_finish = __new_start;
+    _STLP_TRY {
+      __new_pos = uninitialized_copy(this->_M_start, __p, __new_start);
+      _Construct(__new_pos, __c);
+      __new_finish = __new_pos + 1;
+      __new_finish = uninitialized_copy(__p, this->_M_finish, __new_finish);
+      _M_construct_null(__new_finish);
+    }
+    _STLP_UNWIND((_STLP_STD::_Destroy(__new_start,__new_finish), 
+                  this->_M_end_of_storage.deallocate(__new_start,__len)));
+    _STLP_STD::_Destroy(this->_M_start, this->_M_finish + 1);
+    this->_M_deallocate_block();
+    this->_M_start = __new_start;
+    this->_M_finish = __new_finish;
+    this->_M_end_of_storage._M_data = __new_start + __len;
+  }
+  return __new_pos;
+}
+
+template <class _CharT, class _Traits, class _Alloc> void basic_string<_CharT,_Traits,_Alloc>::insert(iterator __position,
+           size_t __n, _CharT __c)
+{
+  if (__n != 0) {
+    if (size_type(this->_M_end_of_storage._M_data - this->_M_finish) >= __n + 1) {
+      const size_type __elems_after = this->_M_finish - __position;
+      pointer __old_finish = this->_M_finish;
+      if (__elems_after >= __n) {
+        uninitialized_copy((this->_M_finish - __n) + 1, this->_M_finish + 1,
+                           this->_M_finish + 1);
+        this->_M_finish += __n;
+        _Traits::move(__position + __n,
+                      __position, (__elems_after - __n) + 1);
+        _Traits::assign(__position, __n, __c);
+      }
+      else {
+        uninitialized_fill_n(this->_M_finish + 1, __n - __elems_after - 1, __c);
+        this->_M_finish += __n - __elems_after;
+        _STLP_TRY {
+          uninitialized_copy(__position, __old_finish + 1, this->_M_finish);
+          this->_M_finish += __elems_after;
+        }
+        _STLP_UNWIND((_STLP_STD::_Destroy(__old_finish + 1, this->_M_finish), 
+                      this->_M_finish = __old_finish));
+        _Traits::assign(__position, __elems_after + 1, __c);
+      }
+    }
+    else {
+      const size_type __old_size = size();        
+      const size_type __len = __old_size + (max)(__old_size, __n) + 1;
+      pointer __new_start = this->_M_end_of_storage.allocate(__len);
+      pointer __new_finish = __new_start;
+      _STLP_TRY {
+        __new_finish = uninitialized_copy(this->_M_start, __position, __new_start);
+        __new_finish = uninitialized_fill_n(__new_finish, __n, __c);
+        __new_finish = uninitialized_copy(__position, this->_M_finish,
+                                          __new_finish);
+        _M_construct_null(__new_finish);
+      }
+      _STLP_UNWIND((_STLP_STD::_Destroy(__new_start,__new_finish),
+                    this->_M_end_of_storage.deallocate(__new_start,__len)));
+      _STLP_STD::_Destroy(this->_M_start, this->_M_finish + 1);
+      this->_M_deallocate_block();
+      this->_M_start = __new_start;
+      this->_M_finish = __new_finish;
+      this->_M_end_of_storage._M_data = __new_start + __len;    
+    }
+  }
+}
+
+#ifndef _STLP_MEMBER_TEMPLATES
+
+template <class _CharT, class _Traits, class _Alloc> void 
+basic_string<_CharT,_Traits,_Alloc>::insert(iterator __position,
+                                            const _CharT* __first, 
+                                            const _CharT* __last)
+{
+  if (__first != __last) {
+    const ptrdiff_t __n = __last - __first;
+    if (this->_M_end_of_storage._M_data - this->_M_finish >= __n + 1) {
+      const ptrdiff_t __elems_after = this->_M_finish - __position;
+      pointer __old_finish = this->_M_finish;
+      if (__elems_after >= __n) {
+        uninitialized_copy((this->_M_finish - __n) + 1, this->_M_finish + 1,
+                           this->_M_finish + 1);
+        this->_M_finish += __n;
+        _Traits::move(__position + __n,
+                      __position, (__elems_after - __n) + 1);
+        _M_copy(__first, __last, __position);
+      }
+      else {
+        const _CharT* __mid = __first;
+        advance(__mid, __elems_after + 1);
+        uninitialized_copy(__mid, __last, this->_M_finish + 1);
+        this->_M_finish += __n - __elems_after;
+        _STLP_TRY {
+          uninitialized_copy(__position, __old_finish + 1, this->_M_finish);
+          this->_M_finish += __elems_after;
+        }
+        _STLP_UNWIND((_STLP_STD::_Destroy(__old_finish + 1, this->_M_finish), 
+                      this->_M_finish = __old_finish));
+        _M_copy(__first, __mid, __position);
+      }
+    }
+    else {
+      size_type __old_size = size();        
+      size_type __len
+        = __old_size + (max)(__old_size, __STATIC_CAST(const size_type,__n)) + 1;
+      pointer __new_start = this->_M_end_of_storage.allocate(__len);
+      pointer __new_finish = __new_start;
+      _STLP_TRY {
+        __new_finish = uninitialized_copy(this->_M_start, __position, __new_start);
+        __new_finish = uninitialized_copy(__first, __last, __new_finish);
+        __new_finish
+          = uninitialized_copy(__position, this->_M_finish, __new_finish);
+        _M_construct_null(__new_finish);
+      }
+      _STLP_UNWIND((_STLP_STD::_Destroy(__new_start,__new_finish),
+                    this->_M_end_of_storage.deallocate(__new_start,__len)));
+      _STLP_STD::_Destroy(this->_M_start, this->_M_finish + 1);
+      this->_M_deallocate_block();
+      this->_M_start = __new_start;
+      this->_M_finish = __new_finish;
+      this->_M_end_of_storage._M_data = __new_start + __len; 
+    }
+  }
+}
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+template <class _CharT, class _Traits, class _Alloc> basic_string<_CharT,_Traits,_Alloc>& basic_string<_CharT,_Traits,_Alloc> ::replace(iterator __first, iterator __last, size_type __n, _CharT __c)
+{
+  size_type __len = (size_type)(__last - __first);
+  
+  if (__len >= __n) {
+    _Traits::assign(__first, __n, __c);
+    erase(__first + __n, __last);
+  }
+  else {
+    _Traits::assign(__first, __len, __c);
+    insert(__last, __n - __len, __c);
+  }
+  return *this;
+}
+
+#ifndef _STLP_MEMBER_TEMPLATES
+
+
+template <class _CharT, class _Traits, class _Alloc> basic_string<_CharT,_Traits,_Alloc>& basic_string<_CharT,_Traits,_Alloc> ::replace(iterator __first, iterator __last,
+            const _CharT* __f, const _CharT* __l)
+{
+  const ptrdiff_t         __n = __l - __f;
+  const difference_type __len = __last - __first;
+  if (__len >= __n) {
+    _M_copy(__f, __l, __first);
+    erase(__first + __n, __last);
+  }
+  else {
+    const _CharT* __m = __f + __len;
+    _M_copy(__f, __m, __first);
+    insert(__last, __m, __l);
+  }
+  return *this;
+}
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+template <class _CharT, class _Traits, class _Alloc> __size_type__
+basic_string<_CharT,_Traits,_Alloc> ::find(const _CharT* __s, size_type __pos, size_type __n) const 
+{
+  if (__pos + __n > size())
+    return npos;
+  else {
+    const const_pointer __result =
+      _STLP_STD::search((const _CharT*)this->_M_start + __pos, (const _CharT*)this->_M_finish, 
+			__s, __s + __n, _Eq_traits<_Traits>());
+    return __result != this->_M_finish ? __result - this->_M_start : npos;
+  }
+}
+
+template <class _CharT, class _Traits, class _Alloc> __size_type__
+basic_string<_CharT,_Traits,_Alloc> ::find(_CharT __c, size_type __pos) const 
+{
+  if (__pos >= size())
+    return npos;
+  else {
+    const const_pointer __result =
+      _STLP_STD::find_if((const _CharT*)this->_M_start + __pos, (const _CharT*)this->_M_finish,
+			 _Eq_char_bound<_Traits>(__c));
+    return __result != this->_M_finish ? __result - this->_M_start : npos;
+  }
+}    
+
+template <class _CharT, class _Traits, class _Alloc> __size_type__
+basic_string<_CharT,_Traits,_Alloc> ::rfind(const _CharT* __s, size_type __pos, size_type __n) const 
+{
+  const size_t __len = size();
+
+  if (__n > __len)
+    return npos;
+  else if (__n == 0)
+    return (min) (__len, __pos);
+  else {
+    const_pointer __last = this->_M_start + (min) (__len - __n, __pos) + __n;
+    const_pointer __result = _STLP_STD::find_end((const_pointer)this->_M_start, __last,
+						 __s, __s + __n,
+						 _Eq_traits<_Traits>());
+    return __result != __last ? __result - this->_M_start : npos;
+  }
+}
+
+template <class _CharT, class _Traits, class _Alloc> __size_type__
+basic_string<_CharT,_Traits,_Alloc> ::rfind(_CharT __c, size_type __pos) const 
+{
+  const size_type __len = size();
+
+  if (__len < 1)
+    return npos;
+  else {
+    const const_iterator __last = begin() + (min) (__len - 1, __pos) + 1;
+    const_reverse_iterator __rresult =
+      _STLP_STD::find_if(const_reverse_iterator(__last), rend(),
+              _Eq_char_bound<_Traits>(__c));
+    return __rresult != rend() ? (__rresult.base() - 1) - begin() : npos;
+  }
+}
+
+template <class _CharT, class _Traits, class _Alloc> __size_type__
+basic_string<_CharT,_Traits,_Alloc> ::find_first_of(const _CharT* __s, size_type __pos, size_type __n) const
+{
+  if (__pos >= size())
+    return npos;
+  else {
+    const_iterator __result = __find_first_of(begin() + __pos, end(),
+                                              __s, __s + __n,
+                                              _Eq_traits<_Traits>());
+    return __result != end() ? __result - begin() : npos;
+  }
+}
+
+
+template <class _CharT, class _Traits, class _Alloc> __size_type__
+basic_string<_CharT,_Traits,_Alloc> ::find_last_of(const _CharT* __s, size_type __pos, size_type __n) const
+{
+  const size_type __len = size();
+
+  if (__len < 1)
+    return npos;
+  else {
+    const const_iterator __last = begin() + (min) (__len - 1, __pos) + 1;
+    const const_reverse_iterator __rresult =
+      __find_first_of(const_reverse_iterator(__last), rend(),
+                      __s, __s + __n,
+                      _Eq_traits<_Traits>());
+    return __rresult != rend() ? (__rresult.base() - 1) - begin() : npos;
+  }
+}
+
+
+template <class _CharT, class _Traits, class _Alloc> __size_type__
+basic_string<_CharT,_Traits,_Alloc> ::find_first_not_of(const _CharT* __s, size_type __pos, size_type __n) const
+{
+  typedef typename _Traits::char_type _CharType;
+  if (__pos > size())
+    return npos;
+  else {
+    const_pointer __result = _STLP_STD::find_if((const _CharT*)this->_M_start + __pos, 
+				      (const _CharT*)this->_M_finish,
+                                _Not_within_traits<_Traits>((const _CharType*)__s, 
+							    (const _CharType*)__s + __n));
+    return __result != this->_M_finish ? __result - this->_M_start : npos;
+  }
+}
+
+template <class _CharT, class _Traits, class _Alloc> __size_type__
+basic_string<_CharT,_Traits,_Alloc> ::find_first_not_of(_CharT __c, size_type __pos) const
+{
+  if (__pos > size())
+    return npos;
+  else {
+    const_pointer __result = _STLP_STD::find_if((const _CharT*)this->_M_start + __pos, (const _CharT*)this->_M_finish,
+						_Neq_char_bound<_Traits>(__c));
+    return __result != this->_M_finish ? __result - this->_M_start : npos;
+  }
+}    
+
+template <class _CharT, class _Traits, class _Alloc> __size_type__
+basic_string<_CharT,_Traits,_Alloc> ::find_last_not_of(const _CharT* __s, size_type __pos, size_type __n) const 
+{
+  typedef typename _Traits::char_type _CharType;
+  const size_type __len = size();
+
+  if (__len < 1)
+    return npos;
+  else {
+    const_iterator __last = begin() + (min) (__len - 1, __pos) + 1;
+    const_reverse_iterator __rlast = const_reverse_iterator(__last);
+    const_reverse_iterator __rresult =
+      _STLP_STD::find_if(__rlast, rend(),
+			 _Not_within_traits<_Traits>((const _CharType*)__s, 
+						     (const _CharType*)__s + __n));
+    return __rresult != rend() ? (__rresult.base() - 1) - begin() : npos;
+  }
+}
+
+template <class _CharT, class _Traits, class _Alloc> __size_type__
+basic_string<_CharT, _Traits, _Alloc> ::find_last_not_of(_CharT __c, size_type __pos) const 
+{
+  const size_type __len = size();
+
+  if (__len < 1)
+    return npos;
+  else {
+    const_iterator __last = begin() + (min) (__len - 1, __pos) + 1;
+    const_reverse_iterator __rlast = const_reverse_iterator(__last);
+    const_reverse_iterator __rresult =
+      _STLP_STD::find_if(__rlast, rend(),
+			 _Neq_char_bound<_Traits>(__c));
+    return __rresult != rend() ? (__rresult.base() - 1) - begin() : npos;
+  }
+}
+
+template <class _CharT, class _Traits, class _Alloc> void _STLP_CALL _S_string_copy(const basic_string<_CharT,_Traits,_Alloc>& __s,
+                    _CharT* __buf,
+                    size_t __n)
+{
+  if (__n > 0) {
+    __n = (min) (__n - 1, __s.size());
+    _STLP_STD::copy(__s.begin(), __s.begin() + __n, __buf);
+    __buf[__n] = _CharT();
+  }
+}
+_STLP_END_NAMESPACE
+
+// _string_fwd has to see clean basic_string
+# undef basic_string
+
+# if !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_string_fwd.c> 
+# endif
+
+# ifdef _STLP_DEBUG
+#  define basic_string _Nondebug_string
+# endif
+
+# include <stl/_range_errors.h>  
+_STLP_BEGIN_NAMESPACE
+
+// _String_base methods
+template <class _Tp, class _Alloc> void _String_base<_Tp,_Alloc>::_M_throw_length_error() const {
+    __stl_throw_length_error("basic_string");
+}
+
+template <class _Tp, class _Alloc> void _String_base<_Tp, _Alloc>::_M_throw_out_of_range() const {
+    __stl_throw_out_of_range("basic_string");
+}
+
+template <class _Tp, class _Alloc> void _String_base<_Tp, _Alloc>::_M_allocate_block(size_t __n) {  
+  if ((__n <= (max_size()+1)) && (__n>0)){ 
+    _M_start  = _M_end_of_storage.allocate(__n); 
+    _M_finish = _M_start; 
+    _M_end_of_storage._M_data = _M_start + __n; 
+  } 
+    else 
+      _M_throw_length_error(); 
+} 
+ 
+template <class _CharT, class _Traits, class _Alloc> basic_string<_CharT, _Traits, _Alloc>::basic_string()
+  : _String_base<_CharT,_Alloc>(allocator_type()) {  
+  this->_M_start = this->_M_end_of_storage.allocate(8); 
+  this->_M_finish = this->_M_start; 
+  this->_M_end_of_storage._M_data = this->_M_start + 8; 
+  _M_terminate_string();  
+} 
+
+
+template <class _CharT, class _Traits, class _Alloc> basic_string<_CharT, _Traits, _Alloc>::basic_string(const _CharT* __s, 
+						    const allocator_type& __a) 
+  : _String_base<_CharT,_Alloc>(__a)  
+{ 
+  _STLP_FIX_LITERAL_BUG(__s) 
+    _M_range_initialize(__s, __s + traits_type::length(__s));  
+} 
+
+
+template <class _CharT, class _Traits, class _Alloc> basic_string<_CharT, _Traits, _Alloc>::basic_string(const basic_string<_CharT, _Traits, _Alloc> & __s)  
+  : _String_base<_CharT,_Alloc>(__s.get_allocator())  
+{  
+  _M_range_initialize(__s._M_start, __s._M_finish);  
+} 
+  
+# if defined ( __SUNPRO_CC) && ! defined(_STLP_STATIC_CONST_INIT_BUG)
+template <class _CharT, class _Traits, class _Alloc> const size_t basic_string<_CharT, _Traits, _Alloc>::npos;
+# endif
+
+_STLP_END_NAMESPACE
+
+# undef basic_string
+# undef __size_type__
+# undef size_type
+# undef iterator
+# endif /* NATIVE */
+
+#endif /*  _STLP_STRING_C */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_string.h b/main/source/stlport/stlport/stl/_string.h
new file mode 100644
index 00000000..8f7e9e95
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_string.h
@@ -0,0 +1,1501 @@
+/*
+ * Copyright (c) 1997-1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_STRING_H
+#define _STLP_STRING_H
+
+#ifndef _STLP_MEMORY
+# include <memory> 
+#endif
+
+# ifndef _STLP_CCTYPE
+#  include <cctype> 
+# endif
+
+#ifndef _STLP_STRING_FWD_H
+#  include <stl/_string_fwd.h> 
+#endif
+
+#ifndef _STLP_INTERNAL_FUNCTION_BASE_H
+# include <stl/_function.h> 
+#endif
+
+# include <stl/_ctraits_fns.h>  
+#ifndef _STLP_INTERNAL_ALGOBASE_H
+# include <stl/_algobase.h> 
+#endif
+
+#ifndef _STLP_INTERNAL_ITERATOR_H
+# include <stl/_iterator.h> 
+#endif
+
+#if defined( __MWERKS__ ) && ! defined (_STLP_USE_OWN_NAMESPACE)
+
+// MSL implementation classes expect to see the definition of streampos
+// when this header is included. We expect this to be fixed in later MSL
+// implementations
+# if !defined( __MSL_CPP__ ) || __MSL_CPP__ < 0x4105
+#  include <stl/msl_string.h> 
+# endif
+
+#endif // __MWERKS__
+
+// Standard C++ string class.  This class has performance
+// characteristics very much like vector<>, meaning, for example, that
+// it does not perform reference-count or copy-on-write, and that
+// concatenation of two strings is an O(N) operation. 
+
+// There are three reasons why basic_string is not identical to
+// vector.  First, basic_string always stores a null character at the
+// end; this makes it possible for c_str to be a fast operation.
+// Second, the C++ standard requires basic_string to copy elements
+// using char_traits<>::assign, char_traits<>::copy, and
+// char_traits<>::move.  This means that all of vector<>'s low-level
+// operations must be rewritten.  Third, basic_string<> has a lot of
+// extra functions in its interface that are convenient but, strictly
+// speaking, redundant.
+
+// Additionally, the C++ standard imposes a major restriction: according
+// to the standard, the character type _CharT must be a POD type.  This
+// implementation weakens that restriction, and allows _CharT to be a
+// a user-defined non-POD type.  However, _CharT must still have a
+// default constructor.
+
+_STLP_BEGIN_NAMESPACE
+
+# ifdef _STLP_DEBUG
+#  define basic_string _Nondebug_string
+# endif
+
+// A helper class to use a char_traits as a function object.
+
+template <class _Traits> struct _Not_within_traits
+  : public unary_function<typename _Traits::char_type, bool> {
+  typedef typename _Traits::char_type _CharT;
+  const _CharT* _M_first;
+  const _CharT* _M_last;
+
+  _Not_within_traits(const typename _Traits::char_type* __f, 
+		     const typename _Traits::char_type* __l) 
+    : _M_first(__f), _M_last(__l) {}
+
+  bool operator()(const typename _Traits::char_type& __x) const {
+    return find_if(_M_first, _M_last, 
+                   _Eq_char_bound<_Traits>(__x)) == _M_last;
+  }
+};
+
+// ------------------------------------------------------------
+// Class _String_base.  
+
+// _String_base is a helper class that makes it it easier to write an
+// exception-safe version of basic_string.  The constructor allocates,
+// but does not initialize, a block of memory.  The destructor
+// deallocates, but does not destroy elements within, a block of
+// memory.  The destructor assumes that _M_start either is null, or else
+// points to a block of memory that was allocated using _String_base's 
+// allocator and whose size is _M_end_of_storage._M_data - _M_start.
+
+template <class _Tp, class _Alloc> class _String_base {
+public:
+  _STLP_FORCE_ALLOCATORS(_Tp, _Alloc)
+  typedef typename _Alloc_traits<_Tp, _Alloc>::allocator_type allocator_type;
+  _Tp*    _M_start;
+  _Tp*    _M_finish;
+  _STLP_alloc_proxy<_Tp*, _Tp, allocator_type> _M_end_of_storage;
+                                // Precondition: 0 < __n <= max_size().
+  void _M_allocate_block(size_t);
+  void _M_deallocate_block() 
+    { _M_end_of_storage.deallocate(_M_start, _M_end_of_storage._M_data - _M_start); }
+  
+  size_t max_size() const { return (size_t(-1) / sizeof(_Tp)) - 1; }
+
+  _String_base(const allocator_type& __a)
+    : _M_start(0), _M_finish(0), _M_end_of_storage(__a, (_Tp*)0) {}
+  
+  _String_base(const allocator_type& __a, size_t __n)
+    : _M_start(0), _M_finish(0), _M_end_of_storage(__a, (_Tp*)0)
+    { _M_allocate_block(__n); }
+
+  ~_String_base() { _M_deallocate_block(); }
+
+  void _M_throw_length_error() const;
+  void _M_throw_out_of_range() const;
+};
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+_STLP_EXPORT_TEMPLATE_CLASS _String_base<char, allocator<char> >;
+#  if defined (_STLP_HAS_WCHAR_T)
+_STLP_EXPORT_TEMPLATE_CLASS _String_base<wchar_t, allocator<wchar_t> >;
+#  endif
+# endif /* _STLP_USE_TEMPLATE_EXPORT */
+
+// ------------------------------------------------------------
+// Class basic_string.  
+
+// Class invariants:
+// (1) [start, finish) is a valid range.
+// (2) Each iterator in [start, finish) points to a valid object
+//     of type value_type.
+// (3) *finish is a valid object of type value_type; in particular,
+//     it is value_type().
+// (4) [finish + 1, end_of_storage) is a valid range.
+// (5) Each iterator in [finish + 1, end_of_storage) points to 
+//     unininitialized memory.
+
+// Note one important consequence: a string of length n must manage
+// a block of memory whose size is at least n + 1.  
+
+struct _String_reserve_t {};
+
+template <class _CharT, class _Traits, class _Alloc> class basic_string : protected _String_base<_CharT,_Alloc> {
+private:                        // Protected members inherited from base.
+  typedef _String_base<_CharT,_Alloc> _Base;
+  typedef basic_string<_CharT, _Traits, _Alloc> _Self;
+  // fbp : used to optimize char/wchar_t cases, and to simplify
+  // _STLP_DEFAULT_CONSTRUCTOR_BUG problem workaround
+  typedef typename _Is_integer<_CharT>::_Integral _Char_Is_Integral;
+public:
+  typedef _CharT value_type;
+  typedef _Traits traits_type;
+
+  typedef value_type* pointer;
+  typedef const value_type* const_pointer;
+  typedef value_type& reference;
+  typedef const value_type& const_reference;
+  typedef size_t size_type;
+  typedef ptrdiff_t difference_type;
+  typedef random_access_iterator_tag _Iterator_category;
+
+  typedef const value_type*                const_iterator;
+  typedef value_type*                      iterator;
+
+  _STLP_DECLARE_RANDOM_ACCESS_REVERSE_ITERATORS;
+
+# if defined(_STLP_STATIC_CONST_INIT_BUG)
+  enum { npos = -1 };
+# elif __GNUC__ == 2 && __GNUC_MINOR__ == 96
+  // inline initializer conflicts with 'extern template' 
+  static const size_t npos ;
+# else
+  static const size_t npos = ~(size_t)0;
+# endif
+
+  typedef _String_reserve_t _Reserve_t;
+# if defined (_STLP_USE_NATIVE_STRING) && ! defined (_STLP_DEBUG)
+#  if (defined(__IBMCPP__) && (500 <= __IBMCPP__) && (__IBMCPP__ < 600) )
+   // this typedef is being used for conversions
+   typedef typename _STLP_VENDOR_STD::basic_string<_CharT,_Traits, 
+    typename _STLP_VENDOR_STD::allocator<_CharT> > __std_string;
+#  else
+   // this typedef is being used for conversions
+   typedef _STLP_VENDOR_STD::basic_string<_CharT,_Traits, 
+    _STLP_VENDOR_STD::allocator<_CharT> > __std_string;
+#  endif
+# endif
+  
+public:                         // Constructor, destructor, assignment.
+  typedef typename _String_base<_CharT,_Alloc>::allocator_type allocator_type;
+
+  allocator_type get_allocator() const {
+    return _STLP_CONVERT_ALLOCATOR((const allocator_type&)this->_M_end_of_storage, _CharT);
+  }
+
+  basic_string();
+
+  explicit basic_string(const allocator_type& __a)
+    : _String_base<_CharT,_Alloc>(__a, 8) { 
+    _M_terminate_string(); 
+  }
+
+  basic_string(_Reserve_t, size_t __n,
+               const allocator_type& __a = allocator_type())
+    : _String_base<_CharT,_Alloc>(__a, __n + 1) { 
+    _M_terminate_string(); 
+  }
+
+  basic_string(const basic_string<_CharT, _Traits, _Alloc>&);
+
+  basic_string(const _Self& __s, size_type __pos, size_type __n = npos,
+               const allocator_type& __a = allocator_type()) 
+    : _String_base<_CharT,_Alloc>(__a) {
+    if (__pos > __s.size())
+      this->_M_throw_out_of_range();
+    else
+      _M_range_initialize(__s._M_start + __pos,
+                          __s._M_start + __pos + (min) (__n, __s.size() - __pos));
+  }
+
+  basic_string(const _CharT* __s, size_type __n,
+               const allocator_type& __a = allocator_type()) 
+    : _String_base<_CharT,_Alloc>(__a) 
+    { 
+      _STLP_FIX_LITERAL_BUG(__s)
+      _M_range_initialize(__s, __s + __n); 
+    }
+
+  basic_string(const _CharT* __s,
+               const allocator_type& __a = allocator_type());
+
+  basic_string(size_type __n, _CharT __c,
+               const allocator_type& __a = allocator_type())
+    : _String_base<_CharT,_Alloc>(__a, __n + 1)
+  {
+    this->_M_finish = uninitialized_fill_n(this->_M_start, __n, __c);
+    _M_terminate_string();
+  }
+
+  // Check to see if _InputIterator is an integer type.  If so, then
+  // it can't be an iterator.
+#if defined (_STLP_MEMBER_TEMPLATES) && !(defined(__MRC__)||(defined(__SC__) && !defined(__DMC__)))		//*ty 04/30/2001 - mpw compilers choke on this ctor
+# ifdef _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS
+  template <class _InputIterator> basic_string(_InputIterator __f, _InputIterator __l)
+    : _String_base<_CharT,_Alloc>(allocator_type())
+  {
+    typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
+    _M_initialize_dispatch(__f, __l, _Integral());
+  }
+# endif
+  template <class _InputIterator> basic_string(_InputIterator __f, _InputIterator __l,
+               const allocator_type & __a _STLP_ALLOCATOR_TYPE_DFL)
+    : _String_base<_CharT,_Alloc>(__a)
+  {
+    typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
+    _M_initialize_dispatch(__f, __l, _Integral());
+  }
+#else /* _STLP_MEMBER_TEMPLATES */
+
+  basic_string(const _CharT* __f, const _CharT* __l,
+               const allocator_type& __a = allocator_type())
+    : _String_base<_CharT,_Alloc>(__a)
+  {
+    _STLP_FIX_LITERAL_BUG(__f)  _STLP_FIX_LITERAL_BUG(__l)
+    _M_range_initialize(__f, __l);
+  }
+
+#endif
+
+# if defined (_STLP_USE_NATIVE_STRING) && ! defined (_STLP_DEBUG)
+  // these conversion operations still needed for
+  // strstream, etc.
+  basic_string (const __std_string& __x): _String_base<_CharT,_Alloc>(allocator_type())
+    {
+      const _CharT* __s = __x.data();
+      _M_range_initialize(__s, __s + __x.size()); 
+    }
+  
+  operator __std_string() const { return __std_string(this->data(), this->size()); }
+# endif
+
+  ~basic_string() { _STLP_STD::_Destroy(this->_M_start, this->_M_finish + 1); }
+    
+  _Self& operator=(const _Self& __s) {
+    if (&__s != this) 
+      assign(__s._M_start, __s._M_finish);
+    return *this;
+  }
+
+  _Self& operator=(const _CharT* __s) { 
+    _STLP_FIX_LITERAL_BUG(__s)
+    return assign(__s, __s + traits_type::length(__s)); 
+  }
+
+  _Self& operator=(_CharT __c)
+    { return assign(__STATIC_CAST(size_type,1), __c); }
+
+  static _CharT _STLP_CALL _M_null() {
+    return _STLP_DEFAULT_CONSTRUCTED(_CharT);
+  }
+
+private:                        // Helper functions used by constructors
+                                // and elsewhere.
+  // fbp : simplify integer types (char, wchar)
+  void _M_construct_null_aux(_CharT* __p, const __false_type&) {
+    _Construct(__p);
+  }
+  void _M_construct_null_aux(_CharT* __p, const __true_type&) {
+    *__p = 0;
+  }
+
+  void _M_construct_null(_CharT* __p) {
+    _M_construct_null_aux(__p, _Char_Is_Integral());
+  }
+
+private:                        
+  // Helper functions used by constructors.  It is a severe error for
+  // any of them to be called anywhere except from within constructors.
+
+  void _M_terminate_string_aux(const __false_type&) {
+    _STLP_TRY {
+      _M_construct_null(this->_M_finish);
+    }
+    _STLP_UNWIND(_STLP_STD::_Destroy(this->_M_start, this->_M_finish));
+  }
+
+  void _M_terminate_string_aux(const __true_type&) {
+    *(this->_M_finish)=0;
+  }
+
+  void _M_terminate_string() {
+    _M_terminate_string_aux(_Char_Is_Integral());
+  }
+
+#ifndef _STLP_MEMBER_TEMPLATES
+  bool _M_inside(const _CharT* __s ) const {
+    return (__s >= this->_M_start) && (__s < this->_M_finish);
+  }
+#else
+  template <class _InputIter>
+  bool _M_inside(_InputIter __i) const {
+    const _CharT* __s = __STATIC_CAST(const _CharT*, &(*__i));
+    return (__s >= this->_M_start) && (__s < this->_M_finish);
+  }
+#endif /*_STLP_MEMBER_TEMPLATES*/
+
+#ifdef _STLP_MEMBER_TEMPLATES
+    
+  template <class _InputIter> void _M_range_initialize(_InputIter __f, _InputIter __l,
+                           const input_iterator_tag &) {
+    this->_M_allocate_block(8);
+    _M_construct_null(this->_M_finish);
+    _STLP_TRY {
+      append(__f, __l);
+    }
+    _STLP_UNWIND(_STLP_STD::_Destroy(this->_M_start, this->_M_finish + 1));
+  }
+
+  template <class _ForwardIter> void _M_range_initialize(_ForwardIter __f, _ForwardIter __l, 
+                           const forward_iterator_tag &) {
+    difference_type __n = distance(__f, __l);
+    this->_M_allocate_block(__n + 1);
+    this->_M_finish = uninitialized_copy(__f, __l, this->_M_start);
+    _M_terminate_string();
+  }
+
+  template <class _InputIter> void _M_range_initialize(_InputIter __f, _InputIter __l) {
+    _M_range_initialize(__f, __l, _STLP_ITERATOR_CATEGORY(__f, _InputIter));
+  }
+
+  template <class _Integer> void _M_initialize_dispatch(_Integer __n, _Integer __x, const __true_type&) {
+    this->_M_allocate_block(__n + 1);
+    this->_M_finish = uninitialized_fill_n(this->_M_start, __n, __x);
+    _M_terminate_string();
+  }
+
+  template <class _InputIter> void _M_initialize_dispatch(_InputIter __f, _InputIter __l, const __false_type&) {
+     _M_range_initialize(__f, __l);
+  }
+    
+#else /* _STLP_MEMBER_TEMPLATES */
+
+  void _M_range_initialize(const _CharT* __f, const _CharT* __l) {
+    ptrdiff_t __n = __l - __f;
+    this->_M_allocate_block(__n + 1);
+    this->_M_finish = uninitialized_copy(__f, __l, this->_M_start);
+    _M_terminate_string();
+  }
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+public:                         // Iterators.
+  iterator begin()             { return this->_M_start; }
+  iterator end()               { return this->_M_finish; }
+  const_iterator begin() const { return this->_M_start; }
+  const_iterator end()   const { return this->_M_finish; }  
+
+  reverse_iterator rbegin()             
+    { return reverse_iterator(this->_M_finish); }
+  reverse_iterator rend()               
+    { return reverse_iterator(this->_M_start); }
+  const_reverse_iterator rbegin() const 
+    { return const_reverse_iterator(this->_M_finish); }
+  const_reverse_iterator rend()   const 
+    { return const_reverse_iterator(this->_M_start); }
+
+public:                         // Size, capacity, etc.
+  size_type size() const { return this->_M_finish - this->_M_start; }
+  size_type length() const { return size(); }
+
+  size_t max_size() const { return _Base::max_size(); }
+
+
+  void resize(size_type __n, _CharT __c) {
+    if (__n <= size())
+      erase(begin() + __n, end());
+    else
+      append(__n - size(), __c);
+  }
+  void resize(size_type __n) { resize(__n, _M_null()); }
+
+  void reserve(size_type = 0);
+
+  size_type capacity() const { return (this->_M_end_of_storage._M_data - this->_M_start) - 1; }
+
+  void clear() {
+    if (!empty()) {
+      _Traits::assign(*(this->_M_start), _M_null());
+      _STLP_STD::_Destroy(this->_M_start+1, this->_M_finish+1);
+      this->_M_finish = this->_M_start;
+    }
+  } 
+
+  bool empty() const { return this->_M_start == this->_M_finish; }    
+
+public:                         // Element access.
+
+  const_reference operator[](size_type __n) const
+    { return *(this->_M_start + __n); }
+  reference operator[](size_type __n)
+    { return *(this->_M_start + __n); }
+
+  const_reference at(size_type __n) const {
+    if (__n >= size())
+      this->_M_throw_out_of_range();
+    return *(this->_M_start + __n);
+  }
+
+  reference at(size_type __n) {
+    if (__n >= size())
+      this->_M_throw_out_of_range();
+    return *(this->_M_start + __n);
+  }
+
+public:                         // Append, operator+=, push_back.
+
+  _Self& operator+=(const _Self& __s) { return append(__s); }
+  _Self& operator+=(const _CharT* __s) { _STLP_FIX_LITERAL_BUG(__s) return append(__s); }
+  _Self& operator+=(_CharT __c) { push_back(__c); return *this; }
+
+  _Self& append(const _Self& __s) 
+    { return append(__s._M_start, __s._M_finish); }
+
+  _Self& append(const _Self& __s,
+                       size_type __pos, size_type __n)
+  {
+    if (__pos > __s.size())
+      this->_M_throw_out_of_range();
+    return append(__s._M_start + __pos,
+                  __s._M_start + __pos + (min) (__n, __s.size() - __pos));
+  }
+
+  _Self& append(const _CharT* __s, size_type __n) 
+    { _STLP_FIX_LITERAL_BUG(__s) return append(__s, __s+__n); }
+  _Self& append(const _CharT* __s) 
+    { _STLP_FIX_LITERAL_BUG(__s) return append(__s, __s + traits_type::length(__s)); }
+  _Self& append(size_type __n, _CharT __c);
+
+#ifdef _STLP_MEMBER_TEMPLATES
+
+  // Check to see if _InputIterator is an integer type.  If so, then
+  // it can't be an iterator.
+  template <class _InputIter> _Self& append(_InputIter __first, _InputIter __last) {
+    typedef typename _Is_integer<_InputIter>::_Integral _Integral;
+    return _M_append_dispatch(__first, __last, _Integral());
+  }
+
+#else /* _STLP_MEMBER_TEMPLATES */
+
+  _Self& append(const _CharT* __first, const _CharT* __last);
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  void push_back(_CharT __c) {
+    if (this->_M_finish + 1 == this->_M_end_of_storage._M_data)
+      reserve(size() + (max)(size(), __STATIC_CAST(size_type,1)));
+    _M_construct_null(this->_M_finish + 1);
+    _Traits::assign(*(this->_M_finish), __c);
+    ++this->_M_finish;
+  }
+
+  void pop_back() {
+    _Traits::assign(*(this->_M_finish - 1), _M_null());
+    _STLP_STD::_Destroy(this->_M_finish);
+    --this->_M_finish;
+  }
+
+private:                        // Helper functions for append.
+
+#ifdef _STLP_MEMBER_TEMPLATES
+
+  template <class _InputIter> _Self& append(_InputIter __first, _InputIter __last, const input_iterator_tag &)
+  {
+	  for ( ; __first != __last ; ++__first)
+	    push_back(*__first);
+	  return *this;
+	}
+
+  template <class _ForwardIter> _Self& append(_ForwardIter __first, _ForwardIter __last, 
+                       const forward_iterator_tag &)  {
+    if (__first != __last) {
+	    const size_type __old_size = size();
+	    difference_type __n = distance(__first, __last);
+	    if (__STATIC_CAST(size_type,__n) > max_size() || __old_size > max_size() - __STATIC_CAST(size_type,__n))
+	      this->_M_throw_length_error();
+	    if (__old_size + __n > capacity()) {
+	      const size_type __len = __old_size +
+	                            (max)(__old_size, __STATIC_CAST(size_type,__n)) + 1;
+	      pointer __new_start = this->_M_end_of_storage.allocate(__len);
+	      pointer __new_finish = __new_start;
+	      _STLP_TRY {
+	        __new_finish = uninitialized_copy(this->_M_start, this->_M_finish, __new_start);
+	        __new_finish = uninitialized_copy(__first, __last, __new_finish);
+	        _M_construct_null(__new_finish);
+	      }
+	      _STLP_UNWIND((_STLP_STD::_Destroy(__new_start,__new_finish),
+	                    this->_M_end_of_storage.deallocate(__new_start,__len)));
+	      _STLP_STD::_Destroy(this->_M_start, this->_M_finish + 1);
+	      this->_M_deallocate_block();
+	      this->_M_start = __new_start;
+	      this->_M_finish = __new_finish;
+	      this->_M_end_of_storage._M_data = __new_start + __len; 
+	    }
+	    else {
+	      _ForwardIter __f1 = __first;
+	      ++__f1;
+	      uninitialized_copy(__f1, __last, this->_M_finish + 1);
+	      _STLP_TRY {
+	        _M_construct_null(this->_M_finish + __n);
+	      }
+	      _STLP_UNWIND(_STLP_STD::_Destroy(this->_M_finish + 1, this->_M_finish + __n));
+	      _Traits::assign(*end(), *__first);
+	      this->_M_finish += __n;
+	    }
+	  }
+	  return *this;  
+	}
+
+  template <class _Integer> _Self& _M_append_dispatch(_Integer __n, _Integer __x, const __true_type&) {
+    return append((size_type) __n, (_CharT) __x);
+  }
+
+  template <class _InputIter> _Self& _M_append_dispatch(_InputIter __f, _InputIter __l,
+                                   const __false_type&) {
+    return append(__f, __l, _STLP_ITERATOR_CATEGORY(__f, _InputIter));
+  }
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+public:                         // Assign
+  
+  _Self& assign(const _Self& __s) 
+    { return assign(__s._M_start, __s._M_finish); }
+
+  _Self& assign(const _Self& __s, 
+                       size_type __pos, size_type __n) {
+    if (__pos > __s.size())
+      this->_M_throw_out_of_range();
+    return assign(__s._M_start + __pos, 
+                  __s._M_start + __pos + (min) (__n, __s.size() - __pos));
+  }
+
+  _Self& assign(const _CharT* __s, size_type __n)
+    { _STLP_FIX_LITERAL_BUG(__s) return assign(__s, __s + __n); }
+
+  _Self& assign(const _CharT* __s)
+    { _STLP_FIX_LITERAL_BUG(__s) return assign(__s, __s + _Traits::length(__s)); }
+
+  _Self& assign(size_type __n, _CharT __c);
+
+#ifdef _STLP_MEMBER_TEMPLATES
+
+private:                        // Helper functions for assign.
+
+  template <class _Integer> 
+  _Self& _M_assign_dispatch(_Integer __n, _Integer __x, const __true_type&) {
+    return assign((size_type) __n, (_CharT) __x);
+  }
+
+  template <class _InputIter> 
+  _Self& _M_assign_dispatch(_InputIter __f, _InputIter __l,
+			    const __false_type&)  {
+    pointer __cur = this->_M_start;
+    while (__f != __l && __cur != this->_M_finish) {
+      _Traits::assign(*__cur, *__f);
+      ++__f;
+      ++__cur;
+    }
+    if (__f == __l)
+      erase(__cur, end());
+    else
+      append(__f, __l);
+    return *this;
+  }
+  
+public:
+  // Check to see if _InputIterator is an integer type.  If so, then
+  // it can't be an iterator.
+  template <class _InputIter> _Self& assign(_InputIter __first, _InputIter __last) {
+    typedef typename _Is_integer<_InputIter>::_Integral _Integral;
+    return _M_assign_dispatch(__first, __last, _Integral());
+  }
+#endif  /* _STLP_MEMBER_TEMPLATES */
+
+  // if member templates are on, this works as specialization 
+  _Self& assign(const _CharT* __f, const _CharT* __l)
+  {
+    ptrdiff_t __n = __l - __f;
+    if (__STATIC_CAST(size_type,__n) <= size()) {
+      _Traits::copy(this->_M_start, __f, __n);
+      erase(begin() + __n, end());
+    }
+    else {
+      _Traits::copy(this->_M_start, __f, size());
+      append(__f + size(), __l);
+    }
+    return *this;
+  }
+  
+public:                         // Insert
+
+  _Self& insert(size_type __pos, const _Self& __s) {
+    if (__pos > size())
+      this->_M_throw_out_of_range();
+    if (size() > max_size() - __s.size())
+      this->_M_throw_length_error();
+    insert(begin() + __pos, __s._M_start, __s._M_finish);
+    return *this;
+  }
+
+  _Self& insert(size_type __pos, const _Self& __s,
+                       size_type __beg, size_type __n) {
+    if (__pos > size() || __beg > __s.size())
+      this->_M_throw_out_of_range();
+    size_type __len = (min) (__n, __s.size() - __beg);
+    if (size() > max_size() - __len)
+      this->_M_throw_length_error();
+    insert(begin() + __pos,
+           __s._M_start + __beg, __s._M_start + __beg + __len);
+    return *this;
+  }
+
+  _Self& insert(size_type __pos, const _CharT* __s, size_type __n) {
+    _STLP_FIX_LITERAL_BUG(__s)
+    if (__pos > size())
+      this->_M_throw_out_of_range();
+    if (size() > max_size() - __n)
+      this->_M_throw_length_error();
+    insert(begin() + __pos, __s, __s + __n);
+    return *this;
+  }
+
+  _Self& insert(size_type __pos, const _CharT* __s) {
+    _STLP_FIX_LITERAL_BUG(__s)
+    if (__pos > size())
+      this->_M_throw_out_of_range();
+    size_type __len = _Traits::length(__s);
+    if (size() > max_size() - __len)
+      this->_M_throw_length_error();
+    insert(this->_M_start + __pos, __s, __s + __len);
+    return *this;
+  }
+    
+  _Self& insert(size_type __pos, size_type __n, _CharT __c) {
+    if (__pos > size())
+      this->_M_throw_out_of_range();
+    if (size() > max_size() - __n)
+      this->_M_throw_length_error();
+    insert(begin() + __pos, __n, __c);
+    return *this;
+  }
+
+  iterator insert(iterator __p, _CharT __c) {
+    _STLP_FIX_LITERAL_BUG(__p)
+    if (__p == end()) {
+      push_back(__c);
+      return this->_M_finish - 1;
+    }
+    else
+      return _M_insert_aux(__p, __c);
+  }
+
+  void insert(iterator __p, size_t __n, _CharT __c);
+
+#ifdef _STLP_MEMBER_TEMPLATES
+
+  // Check to see if _InputIterator is an integer type.  If so, then
+  // it can't be an iterator.
+  template <class _InputIter> void insert(iterator __p, _InputIter __first, _InputIter __last) {
+    typedef typename _Is_integer<_InputIter>::_Integral _Integral;
+    _M_insert_dispatch(__p, __first, __last, _Integral());
+  }
+
+#else /* _STLP_MEMBER_TEMPLATES */
+
+  void insert(iterator __p, const _CharT* __first, const _CharT* __last);
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+private:                        // Helper functions for insert.
+
+#ifdef _STLP_MEMBER_TEMPLATES
+
+  template <class _InputIter> void insert(iterator __p, _InputIter __first, _InputIter __last,
+	      const input_iterator_tag &)
+  {
+	  for ( ; __first != __last; ++__first) {
+	    __p = insert(__p, *__first);
+	    ++__p;
+	  }
+	}
+
+  template <class _ForwardIter> 
+  void insert(iterator __position, _ForwardIter __first, _ForwardIter __last, 
+	      const forward_iterator_tag &)  {
+    if (__first != __last) {
+      difference_type __n = distance(__first, __last);
+      if (this->_M_end_of_storage._M_data - this->_M_finish >= __n + 1) {
+	const difference_type __elems_after = this->_M_finish - __position;
+	pointer __old_finish = this->_M_finish;
+	if (__elems_after >= __n) {
+	  uninitialized_copy((this->_M_finish - __n) + 1, this->_M_finish + 1,
+			     this->_M_finish + 1);
+	  this->_M_finish += __n;
+	  _Traits::move(__position + __n,
+			__position, (__elems_after - __n) + 1);
+	  _M_move(__first, __last, __position);
+	      }
+	else {
+	  _ForwardIter __mid = __first;
+	  advance(__mid, __elems_after + 1);
+	  uninitialized_copy(__mid, __last, this->_M_finish + 1);
+	  this->_M_finish += __n - __elems_after;
+	        _STLP_TRY {
+	          uninitialized_copy(__position, __old_finish + 1, this->_M_finish);
+	          this->_M_finish += __elems_after;
+	        }
+	        _STLP_UNWIND((_STLP_STD::_Destroy(__old_finish + 1, this->_M_finish), 
+	                      this->_M_finish = __old_finish));
+	        _M_move(__first, __mid, __position);
+	}
+      }
+      else {
+	const size_type __old_size = size();        
+	const size_type __len
+	  = __old_size + (max)(__old_size, __STATIC_CAST(size_type,__n)) + 1;
+	      pointer __new_start = this->_M_end_of_storage.allocate(__len);
+	      pointer __new_finish = __new_start;
+	      _STLP_TRY {
+	        __new_finish = uninitialized_copy(this->_M_start, __position, __new_start);
+	        __new_finish = uninitialized_copy(__first, __last, __new_finish);
+	        __new_finish
+	          = uninitialized_copy(__position, this->_M_finish, __new_finish);
+	        _M_construct_null(__new_finish);
+	      }
+	      _STLP_UNWIND((_STLP_STD::_Destroy(__new_start,__new_finish),
+	                    this->_M_end_of_storage.deallocate(__new_start,__len)));
+	      _STLP_STD::_Destroy(this->_M_start, this->_M_finish + 1);
+	      this->_M_deallocate_block();
+	      this->_M_start = __new_start;
+	      this->_M_finish = __new_finish;
+	      this->_M_end_of_storage._M_data = __new_start + __len; 
+	    }
+    }
+  }
+
+  template <class _Integer> void _M_insert_dispatch(iterator __p, _Integer __n, _Integer __x,
+                          const __true_type&) {
+    insert(__p, (size_type) __n, (_CharT) __x);
+  }
+
+  template <class _InputIter> void _M_insert_dispatch(iterator __p, _InputIter __first, _InputIter __last,
+                          const __false_type&) {
+    insert(__p, __first, __last, _STLP_ITERATOR_CATEGORY(__first, _InputIter));
+  }
+
+  template <class _InputIterator> void 
+  _M_copy(_InputIterator __first, _InputIterator __last, pointer __result) {
+    for ( ; __first != __last; ++__first, ++__result)
+      _Traits::assign(*__result, *__first);
+  }
+
+  template <class _InputIterator>
+  void _M_move(_InputIterator __first, _InputIterator __last, pointer __result) {
+    //call _M_copy as being here means that __result is not within [__first, __last)
+    for ( ; __first != __last; ++__first, ++__result)
+      _Traits::assign(*__result, *__first);
+  }
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  pointer _M_insert_aux(pointer, _CharT);
+
+  void 
+  _M_copy(const _CharT* __first, const _CharT* __last, _CharT* __result) {
+    _Traits::copy(__result, __first, __last - __first);
+  }
+  void _M_move(const _CharT* __first, const _CharT* __last, _CharT* __result) {
+    _Traits::move(__result, __first, __last - __first);
+  }
+
+public:                         // Erase.
+
+  _Self& erase(size_type __pos = 0, size_type __n = npos) {
+    if (__pos > size())
+      this->_M_throw_out_of_range();
+    erase(begin() + __pos, begin() + __pos + (min) (__n, size() - __pos));
+    return *this;
+  }  
+
+  iterator erase(iterator __position) {
+                                // The move includes the terminating _CharT().
+    _Traits::move(__position, __position + 1, this->_M_finish - __position);
+    _STLP_STD::_Destroy(this->_M_finish);
+    --this->_M_finish;
+    return __position;
+  }
+
+  iterator erase(iterator __first, iterator __last) {
+    if (__first != __last) {
+                                // The move includes the terminating _CharT().
+      traits_type::move(__first, __last, (this->_M_finish - __last) + 1);
+      pointer __new_finish = this->_M_finish - (__last - __first);
+      _STLP_STD::_Destroy(__new_finish + 1, this->_M_finish + 1);
+      this->_M_finish = __new_finish;
+    }
+    return __first;
+  }
+
+public:                         // Replace.  (Conceptually equivalent
+                                // to erase followed by insert.)
+  _Self& replace(size_type __pos, size_type __n, 
+                        const _Self& __s) {
+    if (__pos > size())
+      this->_M_throw_out_of_range();
+    const size_type __len = (min) (__n, size() - __pos);
+    if (size() - __len >= max_size() - __s.size())
+      this->_M_throw_length_error();
+    return replace(begin() + __pos, begin() + __pos + __len, 
+                   __s._M_start, __s._M_finish);
+  }
+
+  _Self& replace(size_type __pos1, size_type __n1,
+                        const _Self& __s,
+                        size_type __pos2, size_type __n2) {
+    if (__pos1 > size() || __pos2 > __s.size())
+      this->_M_throw_out_of_range();
+    const size_type __len1 = (min) (__n1, size() - __pos1);
+    const size_type __len2 = (min) (__n2, __s.size() - __pos2);
+    if (size() - __len1 >= max_size() - __len2)
+      this->_M_throw_length_error();
+    return replace(begin() + __pos1, begin() + __pos1 + __len1,
+                   __s._M_start + __pos2, __s._M_start + __pos2 + __len2);
+  }
+
+  _Self& replace(size_type __pos, size_type __n1,
+                        const _CharT* __s, size_type __n2) {
+    _STLP_FIX_LITERAL_BUG(__s)
+    if (__pos > size())
+      this->_M_throw_out_of_range();
+    const size_type __len = (min) (__n1, size() - __pos);
+    if (__n2 > max_size() || size() - __len >= max_size() - __n2)
+      this->_M_throw_length_error();
+    return replace(begin() + __pos, begin() + __pos + __len,
+                   __s, __s + __n2);
+  }
+
+  _Self& replace(size_type __pos, size_type __n1,
+                        const _CharT* __s) {
+    _STLP_FIX_LITERAL_BUG(__s)
+    if (__pos > size())
+      this->_M_throw_out_of_range();
+    const size_type __len = (min) (__n1, size() - __pos);
+    const size_type __n2 = _Traits::length(__s);
+    if (__n2 > max_size() || size() - __len >= max_size() - __n2)
+      this->_M_throw_length_error();
+    return replace(begin() + __pos, begin() + __pos + __len,
+                   __s, __s + _Traits::length(__s));
+  }
+
+  _Self& replace(size_type __pos, size_type __n1,
+                        size_type __n2, _CharT __c) {
+    if (__pos > size())
+      this->_M_throw_out_of_range();
+    const size_type __len = (min) (__n1, size() - __pos);
+    if (__n2 > max_size() || size() - __len >= max_size() - __n2)
+      this->_M_throw_length_error();
+    return replace(begin() + __pos, begin() + __pos + __len, __n2, __c);
+  }
+
+  _Self& replace(iterator __first, iterator __last, 
+                        const _Self& __s) 
+    { return replace(__first, __last, __s._M_start, __s._M_finish); }
+
+  _Self& replace(iterator __first, iterator __last,
+                        const _CharT* __s, size_type __n) 
+    { _STLP_FIX_LITERAL_BUG(__s) return replace(__first, __last, __s, __s + __n); }
+
+  _Self& replace(iterator __first, iterator __last,
+                        const _CharT* __s) {
+    _STLP_FIX_LITERAL_BUG(__s)
+    return replace(__first, __last, __s, __s + _Traits::length(__s));
+  }
+
+  _Self& replace(iterator __first, iterator __last, 
+                        size_type __n, _CharT __c);
+
+  // Check to see if _InputIterator is an integer type.  If so, then
+  // it can't be an iterator.
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIter> _Self& replace(iterator __first, iterator __last,
+                        _InputIter __f, _InputIter __l) {
+    typedef typename _Is_integer<_InputIter>::_Integral _Integral;
+    return _M_replace_dispatch(__first, __last, __f, __l,  _Integral());
+  }
+#else /* _STLP_MEMBER_TEMPLATES */
+  _Self& replace(iterator __first, iterator __last,
+		 const _CharT* __f, const _CharT* __l);
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+private:                        // Helper functions for replace.
+
+#ifdef _STLP_MEMBER_TEMPLATES
+
+  template <class _Integer> _Self& _M_replace_dispatch(iterator __first, iterator __last,
+                                    _Integer __n, _Integer __x,
+                                    const __true_type&) {
+    return replace(__first, __last, (size_type) __n, (_CharT) __x);
+  }
+
+  template <class _InputIter> _Self& _M_replace_dispatch(iterator __first, iterator __last,
+                                    _InputIter __f, _InputIter __l,
+                                    const __false_type&) {
+    return replace(__first, __last, __f, __l, _STLP_ITERATOR_CATEGORY(__f, _InputIter));
+  }
+
+  template <class _InputIter> _Self& replace(iterator __first, iterator __last,
+                        _InputIter __f, _InputIter __l, const input_iterator_tag &)  {
+	  for ( ; __first != __last && __f != __l; ++__first, ++__f)
+	    _Traits::assign(*__first, *__f);
+
+	  if (__f == __l)
+	    erase(__first, __last);
+	  else
+	    insert(__last, __f, __l);
+	  return *this;
+	}
+
+  template <class _InputIter>
+  _Self& replace(iterator __first, iterator __last,
+                 _InputIter __f, _InputIter __l, const random_access_iterator_tag &) {
+    //might be overlapping
+    if (_M_inside(__f)) {
+      difference_type __n = __l - __f;
+      const difference_type __len = __last - __first;
+      if (__len >= __n) {
+        _M_move(__f, __l, __first);
+        erase(__first + __n, __last);
+      }
+      else {
+        _InputIter __m = __f + __len;
+        if ((__l <= __first) || (__f >= __last)) {
+				  //no overlap:
+          _M_copy(__f, __m, __first);
+          insert(__last, __m, __l);
+        }
+        else {
+				  //we have to take care of reallocation:
+				  const difference_type __off_dest = __first - this->begin();
+				  const difference_type __off_src = __f - this->begin();
+				  insert(__last, __m, __l);
+				  _Traits::move(begin() + __off_dest, begin() + __off_src, __n);
+        }
+      }
+      return *this;
+    }
+	  else {
+		  return replace(__first, __last, __f, __l, forward_iterator_tag());
+	  }
+  }
+
+
+  template <class _ForwardIter> _Self& replace(iterator __first, iterator __last,
+                        _ForwardIter __f, _ForwardIter __l, 
+                        const forward_iterator_tag &)  {
+	  difference_type __n = distance(__f, __l);
+	  const difference_type __len = __last - __first;
+	  if (__len >= __n) {
+	    _M_copy(__f, __l, __first);
+	    erase(__first + __n, __last);
+	  }
+	  else {
+	    _ForwardIter __m = __f;
+	    advance(__m, __len);
+	    _M_copy(__f, __m, __first);
+	    insert(__last, __m, __l);
+	  }
+	  return *this;
+	}
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+public:                         // Other modifier member functions.
+
+  size_type copy(_CharT* __s, size_type __n, size_type __pos = 0) const {
+    _STLP_FIX_LITERAL_BUG(__s)
+    if (__pos > size())
+      this->_M_throw_out_of_range();
+    const size_type __len = (min) (__n, size() - __pos);
+    _Traits::copy(__s, this->_M_start + __pos, __len);
+    return __len;
+  }
+
+  void swap(_Self& __s) {
+    _STLP_STD::swap(this->_M_start, __s._M_start);
+    _STLP_STD::swap(this->_M_finish, __s._M_finish);
+    _STLP_STD::swap(this->_M_end_of_storage, __s._M_end_of_storage);
+  }
+
+public:                         // Conversion to C string.
+
+  const _CharT* c_str() const { return this->_M_start; }
+  const _CharT* data()  const { return this->_M_start; }
+
+public:                         // find.
+
+  size_type find(const _Self& __s, size_type __pos = 0) const 
+    { return find(__s._M_start, __pos, __s.size()); }
+
+  size_type find(const _CharT* __s, size_type __pos = 0) const 
+    { _STLP_FIX_LITERAL_BUG(__s) return find(__s, __pos, _Traits::length(__s)); }
+
+  size_type find(const _CharT* __s, size_type __pos, size_type __n) const;
+
+  // WIE: Versant schema compiler 5.2.2 ICE workaround
+  size_type find(_CharT __c) const
+    { return find(__c, 0) ; }
+  size_type find(_CharT __c, size_type __pos /* = 0 */) const;
+
+public:                         // rfind.
+
+  size_type rfind(const _Self& __s, size_type __pos = npos) const 
+    { return rfind(__s._M_start, __pos, __s.size()); }
+
+  size_type rfind(const _CharT* __s, size_type __pos = npos) const 
+    { _STLP_FIX_LITERAL_BUG(__s) return rfind(__s, __pos, _Traits::length(__s)); }
+
+  size_type rfind(const _CharT* __s, size_type __pos, size_type __n) const;
+  size_type rfind(_CharT __c, size_type __pos = npos) const;
+
+public:                         // find_first_of
+  
+  size_type find_first_of(const _Self& __s, size_type __pos = 0) const 
+    { return find_first_of(__s._M_start, __pos, __s.size()); }
+
+  size_type find_first_of(const _CharT* __s, size_type __pos = 0) const 
+    { _STLP_FIX_LITERAL_BUG(__s) return find_first_of(__s, __pos, _Traits::length(__s)); }
+
+  size_type find_first_of(const _CharT* __s, size_type __pos, 
+                          size_type __n) const;
+
+  size_type find_first_of(_CharT __c, size_type __pos = 0) const 
+    { return find(__c, __pos); }
+
+public:                         // find_last_of
+
+  size_type find_last_of(const _Self& __s,
+                         size_type __pos = npos) const
+    { return find_last_of(__s._M_start, __pos, __s.size()); }
+
+  size_type find_last_of(const _CharT* __s, size_type __pos = npos) const 
+    { _STLP_FIX_LITERAL_BUG(__s) return find_last_of(__s, __pos, _Traits::length(__s)); }
+
+  size_type find_last_of(const _CharT* __s, size_type __pos, 
+                         size_type __n) const;
+
+  size_type find_last_of(_CharT __c, size_type __pos = npos) const {
+    return rfind(__c, __pos);
+  }
+
+public:                         // find_first_not_of
+
+  size_type find_first_not_of(const _Self& __s, 
+                              size_type __pos = 0) const 
+    { return find_first_not_of(__s._M_start, __pos, __s.size()); }
+
+  size_type find_first_not_of(const _CharT* __s, size_type __pos = 0) const 
+    { _STLP_FIX_LITERAL_BUG(__s) return find_first_not_of(__s, __pos, _Traits::length(__s)); }
+
+  size_type find_first_not_of(const _CharT* __s, size_type __pos,
+                              size_type __n) const;
+
+  size_type find_first_not_of(_CharT __c, size_type __pos = 0) const;
+
+public:                         // find_last_not_of
+
+  size_type find_last_not_of(const _Self& __s, 
+                             size_type __pos = npos) const
+    { return find_last_not_of(__s._M_start, __pos, __s.size()); }
+
+  size_type find_last_not_of(const _CharT* __s, size_type __pos = npos) const
+    { _STLP_FIX_LITERAL_BUG(__s) return find_last_not_of(__s, __pos, _Traits::length(__s)); }
+
+  size_type find_last_not_of(const _CharT* __s, size_type __pos,
+                             size_type __n) const;
+
+  size_type find_last_not_of(_CharT __c, size_type __pos = npos) const;
+
+public:                         // Substring.
+
+  _Self substr(size_type __pos = 0, size_type __n = npos) const {
+    if (__pos > size())
+      this->_M_throw_out_of_range();
+    return _Self(this->_M_start + __pos, 
+                        this->_M_start + __pos + (min) (__n, size() - __pos));
+  }
+
+public:                         // Compare
+
+  int compare(const _Self& __s) const 
+    { return _M_compare(this->_M_start, this->_M_finish, __s._M_start, __s._M_finish); }
+
+  int compare(size_type __pos1, size_type __n1,
+              const _Self& __s) const {
+    if (__pos1 > size())
+      this->_M_throw_out_of_range();
+    return _M_compare(this->_M_start + __pos1, 
+                      this->_M_start + __pos1 + (min) (__n1, size() - __pos1),
+                      __s._M_start, __s._M_finish);
+  }
+    
+  int compare(size_type __pos1, size_type __n1,
+              const _Self& __s,
+              size_type __pos2, size_type __n2) const {
+    if (__pos1 > size() || __pos2 > __s.size())
+      this->_M_throw_out_of_range();
+    return _M_compare(this->_M_start + __pos1, 
+                      this->_M_start + __pos1 + (min) (__n1, size() - __pos1),
+                      __s._M_start + __pos2, 
+                      __s._M_start + __pos2 + (min) (__n2, __s.size() - __pos2));
+  }
+
+  int compare(const _CharT* __s) const {
+    _STLP_FIX_LITERAL_BUG(__s) 
+      return _M_compare(this->_M_start, this->_M_finish, __s, __s + _Traits::length(__s));
+  }
+
+  int compare(size_type __pos1, size_type __n1, const _CharT* __s) const {
+    _STLP_FIX_LITERAL_BUG(__s)
+    if (__pos1 > size())
+      this->_M_throw_out_of_range();
+    return _M_compare(this->_M_start + __pos1, 
+                      this->_M_start + __pos1 + (min) (__n1, size() - __pos1),
+                      __s, __s + _Traits::length(__s));
+  }
+
+  int compare(size_type __pos1, size_type __n1, const _CharT* __s,
+              size_type __n2) const {
+    _STLP_FIX_LITERAL_BUG(__s)
+    if (__pos1 > size())
+      this->_M_throw_out_of_range();
+    return _M_compare(this->_M_start + __pos1, 
+                      this->_M_start + __pos1 + (min) (__n1, size() - __pos1),
+                      __s, __s + __n2);
+  }
+
+public:                        // Helper functions for compare.
+  
+  static int _STLP_CALL _M_compare(const _CharT* __f1, const _CharT* __l1,
+                        const _CharT* __f2, const _CharT* __l2) {
+    const ptrdiff_t __n1 = __l1 - __f1;
+    const ptrdiff_t __n2 = __l2 - __f2;
+    const int cmp = _Traits::compare(__f1, __f2, (min) (__n1, __n2));
+    return cmp != 0 ? cmp : (__n1 < __n2 ? -1 : (__n1 > __n2 ? 1 : 0));
+  }
+};
+
+#if ! defined (__STLP_STATIC_CONST_INIT_BUG) && \
+  __GNUC__ == 2 && __GNUC_MINOR__ == 96
+template <class _CharT, class _Traits, class _Alloc>
+const size_t basic_string<_CharT, _Traits, _Alloc>::npos = ~(size_t) 0;
+#endif
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+_STLP_EXPORT_TEMPLATE_CLASS basic_string<char, char_traits<char>, allocator<char> >;
+#  if defined (_STLP_HAS_WCHAR_T)
+_STLP_EXPORT_TEMPLATE_CLASS basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >;
+#  endif
+# endif /* _STLP_USE_TEMPLATE_EXPORT */
+
+// ------------------------------------------------------------
+// Non-member functions.
+
+template <class _CharT, class _Traits, class _Alloc> inline basic_string<_CharT,_Traits,_Alloc> _STLP_CALL
+operator+(const basic_string<_CharT,_Traits,_Alloc>& __s,
+          const basic_string<_CharT,_Traits,_Alloc>& __y)
+{
+  typedef basic_string<_CharT,_Traits,_Alloc> _Str;
+  typedef typename _Str::_Reserve_t _Reserve_t;
+# ifdef __GNUC__
+  // gcc counts this as a function
+  _Str __result  = _Str(_Reserve_t(),__s.size() + __y.size());
+# else
+  _Str __result(_Reserve_t(), __s.size() + __y.size());
+# endif
+  __result.append(__s);
+  __result.append(__y);
+  return __result;
+}
+
+# if defined (__GNUC__) || defined (__MLCCPP__)
+#  define _STLP_INIT_AMBIGUITY 1
+# endif
+
+template <class _CharT, class _Traits, class _Alloc> inline basic_string<_CharT,_Traits,_Alloc> _STLP_CALL
+operator+(const _CharT* __s,
+          const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  typedef basic_string<_CharT,_Traits,_Alloc> _Str;
+  typedef typename _Str::_Reserve_t _Reserve_t;
+  const size_t __n = _Traits::length(__s);
+# ifdef _STLP_INIT_AMBIGUITY
+  _Str __result = _Str(_Reserve_t(), __n + __y.size());
+# else
+  _Str __result(_Reserve_t(), __n + __y.size());
+# endif
+  __result.append(__s, __s + __n);
+  __result.append(__y);
+  return __result;
+}
+
+template <class _CharT, class _Traits, class _Alloc> inline basic_string<_CharT,_Traits,_Alloc> _STLP_CALL
+operator+(_CharT __c,
+          const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  typedef basic_string<_CharT,_Traits,_Alloc> _Str;
+  typedef typename _Str::_Reserve_t _Reserve_t;
+# ifdef _STLP_INIT_AMBIGUITY
+  _Str __result = _Str(_Reserve_t(), 1 + __y.size());
+# else
+  _Str __result(_Reserve_t(), 1 + __y.size());
+# endif
+  __result.push_back(__c);
+  __result.append(__y);
+  return __result;
+}
+
+template <class _CharT, class _Traits, class _Alloc> inline basic_string<_CharT,_Traits,_Alloc> _STLP_CALL
+operator+(const basic_string<_CharT,_Traits,_Alloc>& __x,
+          const _CharT* __s) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  typedef basic_string<_CharT,_Traits,_Alloc> _Str;
+  typedef typename _Str::_Reserve_t _Reserve_t;
+  const size_t __n = _Traits::length(__s);
+# ifdef _STLP_INIT_AMBIGUITY
+  _Str __result = _Str(_Reserve_t(), __x.size() + __n, __x.get_allocator());
+# else
+  _Str __result(_Reserve_t(), __x.size() + __n, __x.get_allocator());
+# endif
+  __result.append(__x);
+  __result.append(__s, __s + __n);
+  return __result;
+}
+
+template <class _CharT, class _Traits, class _Alloc> inline basic_string<_CharT,_Traits,_Alloc> _STLP_CALL
+operator+(const basic_string<_CharT,_Traits,_Alloc>& __x,
+          const _CharT __c) {
+  typedef basic_string<_CharT,_Traits,_Alloc> _Str;
+  typedef typename _Str::_Reserve_t _Reserve_t;
+# ifdef _STLP_INIT_AMBIGUITY
+  _Str __result = _Str(_Reserve_t(), __x.size() + 1, __x.get_allocator());
+# else
+  _Str __result(_Reserve_t(), __x.size() + 1, __x.get_allocator());
+# endif
+  __result.append(__x);
+  __result.push_back(__c);
+  return __result;
+}
+
+# undef _STLP_INIT_AMBIGUITY
+
+// Operator== and operator!=
+
+template <class _CharT, class _Traits, class _Alloc> inline bool _STLP_CALL
+operator==(const basic_string<_CharT,_Traits,_Alloc>& __x,
+           const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  return __x.size() == __y.size() && _Traits::compare(__x.data(), __y.data(), __x.size()) == 0;
+}
+
+template <class _CharT, class _Traits, class _Alloc> inline bool _STLP_CALL
+operator==(const _CharT* __s,
+           const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  size_t __n = _Traits::length(__s);
+  return __n == __y.size() && _Traits::compare(__s, __y.data(), __n) == 0;
+}
+
+template <class _CharT, class _Traits, class _Alloc> inline bool _STLP_CALL
+operator==(const basic_string<_CharT,_Traits,_Alloc>& __x,
+           const _CharT* __s) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  size_t __n = _Traits::length(__s);
+  return __x.size() == __n && _Traits::compare(__x.data(), __s, __n) == 0;
+}
+
+// Operator< (and also >, <=, and >=).
+
+template <class _CharT, class _Traits, class _Alloc> inline bool _STLP_CALL
+operator<(const basic_string<_CharT,_Traits,_Alloc>& __x,
+          const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  return basic_string<_CharT,_Traits,_Alloc> ::_M_compare(__x.begin(), __x.end(), 
+		 __y.begin(), __y.end()) < 0;
+}
+
+template <class _CharT, class _Traits, class _Alloc> inline bool _STLP_CALL
+operator<(const _CharT* __s,
+          const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  size_t __n = _Traits::length(__s);
+  return basic_string<_CharT,_Traits,_Alloc> ::_M_compare(__s, __s + __n, __y.begin(), __y.end()) < 0;
+}
+
+template <class _CharT, class _Traits, class _Alloc> inline bool _STLP_CALL
+operator<(const basic_string<_CharT,_Traits,_Alloc>& __x,
+          const _CharT* __s) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  size_t __n = _Traits::length(__s);
+  return basic_string<_CharT,_Traits,_Alloc> ::_M_compare(__x.begin(), __x.end(), __s, __s + __n) < 0;
+}
+
+#ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+
+template <class _CharT, class _Traits, class _Alloc> inline bool _STLP_CALL
+operator!=(const basic_string<_CharT,_Traits,_Alloc>& __x,
+           const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  return !(__x == __y);
+}
+
+template <class _CharT, class _Traits, class _Alloc> inline bool _STLP_CALL
+operator>(const basic_string<_CharT,_Traits,_Alloc>& __x,
+          const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  return __y < __x;
+}
+
+template <class _CharT, class _Traits, class _Alloc> inline bool _STLP_CALL
+operator<=(const basic_string<_CharT,_Traits,_Alloc>& __x,
+           const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  return !(__y < __x);
+}
+
+template <class _CharT, class _Traits, class _Alloc> inline bool _STLP_CALL
+operator>=(const basic_string<_CharT,_Traits,_Alloc>& __x,
+           const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  return !(__x < __y);
+}
+
+#endif /* _STLP_USE_SEPARATE_RELOPS_NAMESPACE */
+
+template <class _CharT, class _Traits, class _Alloc> inline bool _STLP_CALL 
+operator!=(const _CharT* __s,
+           const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  return !(__s == __y);
+}
+
+template <class _CharT, class _Traits, class _Alloc> inline bool _STLP_CALL 
+operator!=(const basic_string<_CharT,_Traits,_Alloc>& __x,
+           const _CharT* __s) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  return !(__x == __s);
+}
+
+template <class _CharT, class _Traits, class _Alloc> inline bool _STLP_CALL
+operator>(const _CharT* __s,
+          const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  return __y < __s;
+}
+
+template <class _CharT, class _Traits, class _Alloc> inline bool _STLP_CALL
+operator>(const basic_string<_CharT,_Traits,_Alloc>& __x,
+          const _CharT* __s) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  return __s < __x;
+}
+
+template <class _CharT, class _Traits, class _Alloc> inline bool _STLP_CALL
+operator<=(const _CharT* __s,
+           const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  return !(__y < __s);
+}
+
+template <class _CharT, class _Traits, class _Alloc> inline bool _STLP_CALL
+operator<=(const basic_string<_CharT,_Traits,_Alloc>& __x,
+           const _CharT* __s) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  return !(__s < __x);
+}
+
+template <class _CharT, class _Traits, class _Alloc> inline bool _STLP_CALL
+operator>=(const _CharT* __s,
+           const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  return !(__s < __y);
+}
+
+template <class _CharT, class _Traits, class _Alloc> inline bool _STLP_CALL
+operator>=(const basic_string<_CharT,_Traits,_Alloc>& __x,
+           const _CharT* __s) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  return !(__x < __s);
+}
+
+
+// Swap.
+
+#ifdef _STLP_FUNCTION_TMPL_PARTIAL_ORDER
+
+template <class _CharT, class _Traits, class _Alloc> inline void _STLP_CALL
+swap(basic_string<_CharT,_Traits,_Alloc>& __x,
+     basic_string<_CharT,_Traits,_Alloc>& __y) {
+  __x.swap(__y);
+}
+
+#endif /* _STLP_FUNCTION_TMPL_PARTIAL_ORDER */
+
+template <class _CharT, class _Traits, class _Alloc> void  _STLP_CALL _S_string_copy(const basic_string<_CharT,_Traits,_Alloc>& __s,
+                    _CharT* __buf,
+                    size_t __n);
+
+# undef basic_string
+
+#if defined(_STLP_WINCE)
+// A couple of functions to transfer between ASCII/Unicode
+
+wstring __ASCIIToWide(const char *ascii);
+string __WideToASCII(const wchar_t *wide);
+#endif
+
+_STLP_END_NAMESPACE
+
+# ifdef _STLP_DEBUG
+#  include <stl/debug/_string.h> 
+# endif
+
+# if !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_string.c> 
+# endif
+
+# include <stl/_string_io.h>  
+# include <stl/_string_hash.h>  
+
+#endif /* _STLP_STRING_H */
+
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_string_fwd.c b/main/source/stlport/stlport/stl/_string_fwd.c
new file mode 100644
index 00000000..67086860
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_string_fwd.c
@@ -0,0 +1,48 @@
+/*
+ *
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_STRING_FWD_H
+# include <stl/_string_fwd.h>
+#endif
+
+#if !defined ( _STLP_STRING_FWD_C) && ! defined (_STLP_OWN_IOSTREAMS)
+#define _STLP_STRING_FWD_C
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _CharT, class _Traits, class _Alloc>
+const char* _STLP_CALL
+__get_c_string(const basic_string<_CharT,_Traits,_Alloc>& __str) { 
+  return __str.c_str(); 
+}
+
+_STLP_END_NAMESPACE
+
+#endif /*  _STLP_STRING_FWD_C */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_string_fwd.h b/main/source/stlport/stlport/stl/_string_fwd.h
new file mode 100644
index 00000000..06a649aa
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_string_fwd.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_STRING_FWD_H
+#define _STLP_STRING_FWD_H
+
+#ifndef _STLP_IOSFWD
+# include <iosfwd>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+# if !defined (_STLP_LIMITED_DEFAULT_TEMPLATES)
+template <class _CharT, 
+          class _Traits = char_traits<_CharT>, 
+          class _Alloc = allocator<_CharT> >
+class basic_string;
+# else
+template <class _CharT, 
+          class _Traits, 
+          class _Alloc>
+class basic_string;
+# endif /* _STLP_LIMITED_DEFAULT_TEMPLATES */
+
+typedef basic_string<char, char_traits<char>, allocator<char> > string;
+
+#  ifdef _STLP_HAS_WCHAR_T
+typedef basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t> > wstring;
+#  endif
+
+# ifdef _STLP_OWN_IOSTREAMS
+_STLP_DECLSPEC const char*  _STLP_CALL
+__get_c_string(const string& __str);
+# else
+template <class _CharT, class _Traits, class _Alloc>
+const char* _STLP_CALL
+__get_c_string(const basic_string<_CharT, _Traits, _Alloc>& __str);
+# endif
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_STRING_FWD_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_string_hash.h b/main/source/stlport/stlport/stl/_string_hash.h
new file mode 100644
index 00000000..aeee6f5b
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_string_hash.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 1997-1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_STRING_HASH_H
+# define _STLP_STRING_HASH_H
+
+#ifndef _STLP_HASH_FUN_H
+# include <stl/_hash_fun.h>
+#endif
+
+#ifndef _STLP_STRING_H
+# include <stl/_string.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _CharT, class _Traits, class _Alloc>
+_STLP_INLINE_LOOP size_t
+__stl_string_hash(const basic_string<_CharT,_Traits,_Alloc>& __s) {
+  unsigned long __h = 0;
+  typedef typename basic_string<_CharT,_Traits,_Alloc>::const_pointer const_ptr;
+  size_t __len = __s.size();
+  const _CharT* __data = __s.data();
+  for ( size_t __i = 0; __i < __len; ++__i)
+    __h = 5*__h + __data[__i];
+  return size_t(__h);
+}
+
+#ifdef _STLP_CLASS_PARTIAL_SPECIALIZATION
+
+template <class _CharT, class _Traits, class _Alloc>
+struct hash<basic_string<_CharT,_Traits,_Alloc> > {
+  size_t operator()(const basic_string<_CharT,_Traits,_Alloc>& __s) const
+    { return __stl_string_hash(__s); }
+};
+
+#else
+
+_STLP_TEMPLATE_NULL struct _STLP_CLASS_DECLSPEC hash<string> {
+  size_t operator()(const string& __s) const
+    { return __stl_string_hash(__s); }
+};
+
+# if defined (_STLP_HAS_WCHAR_T)
+_STLP_TEMPLATE_NULL struct _STLP_CLASS_DECLSPEC hash<wstring> {
+  size_t operator()(const wstring& __s) const
+    { return __stl_string_hash(__s); }
+};
+# endif
+
+#endif /* _STLP_CLASS_PARTIAL_SPECIALIZATION */
+
+_STLP_END_NAMESPACE
+
+#endif
diff --git a/main/source/stlport/stlport/stl/_string_io.c b/main/source/stlport/stlport/stl/_string_io.c
new file mode 100644
index 00000000..311894a1
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_string_io.c
@@ -0,0 +1,334 @@
+#ifndef _STLP_STRING_IO_C
+#define _STLP_STRING_IO_C
+
+#ifndef _STLP_STRING_IO_H
+# include <stl/_string_io.h>
+#endif
+
+#ifndef _STLP_INTERNAL_CTYPE_H
+# include <stl/_ctype.h>
+#endif
+
+# ifdef _STLP_DEBUG
+#  define basic_string _Nondebug_string
+# endif
+
+_STLP_BEGIN_NAMESPACE
+
+# if defined (_STLP_OWN_IOSTREAMS)
+#  define _STLP_USING_IO
+# else
+#  define _STLP_USING_IO _STLP_USING_VENDOR_STD
+# endif
+
+#if defined (_STLP_USE_NEW_IOSTREAMS)
+
+template <class _CharT, class _Traits>
+bool _STLP_CALL
+__stlp_string_fill(basic_ostream<_CharT, _Traits>& __os,
+                  basic_streambuf<_CharT, _Traits>* __buf,
+                  size_t __n)
+{
+  _CharT __f = __os.fill();
+  size_t __i;
+  bool __ok = true;
+
+  for (__i = 0; __i < __n; ++__i)
+    __ok = __ok && !_Traits::eq_int_type(__buf->sputc(__f), _Traits::eof());
+  return __ok;
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+basic_ostream<_CharT, _Traits>& _STLP_CALL
+operator<<(basic_ostream<_CharT, _Traits>& __os, 
+           const basic_string<_CharT,_Traits,_Alloc>& __s)
+{
+
+  _STLP_USING_IO
+  typedef basic_ostream<_CharT, _Traits> __ostream;
+  typename __ostream::sentry __sentry(__os);
+  bool __ok = false;
+
+  if (__sentry) {
+    __ok = true;
+    size_t __n = __s.size();
+    size_t __pad_len = 0;
+    const bool __left = (__os.flags() & __ostream::left) != 0;
+    const size_t __w = __os.width(0);
+    basic_streambuf<_CharT, _Traits>* __buf = __os.rdbuf();
+
+    if (__n < __w) {
+      __pad_len = __w - __n;
+    }
+    
+    if (!__left)
+      __ok = __stlp_string_fill(__os, __buf, __pad_len);    
+
+    __ok = __ok && (__buf->sputn(__s.data(), streamsize(__n)) == streamsize(__n));
+
+    if (__left)
+      __ok = __ok && __stlp_string_fill(__os, __buf, __pad_len);
+  }
+
+  if (!__ok)
+    __os.setstate(__ostream::failbit);
+
+  return __os;
+}
+ 
+template <class _CharT, class _Traits, class _Alloc>
+basic_istream<_CharT, _Traits>& _STLP_CALL 
+operator>>(basic_istream<_CharT, _Traits>& __is,
+           basic_string<_CharT,_Traits, _Alloc>& __s)
+{
+  _STLP_USING_IO
+  typedef basic_istream<_CharT, _Traits> __istream;
+  typename __istream::sentry __sentry(__is);
+
+  if (__sentry) {
+    basic_streambuf<_CharT, _Traits>* __buf = __is.rdbuf();
+    typedef ctype<_CharT> _C_type;
+
+#ifdef _STLP_OWN_IOSTREAMS
+    //    const _C_type& _Ctype = use_facet<_C_type>(__loc);
+    const _C_type& _Ctype = *(const _C_type*)__is._M_ctype_facet();
+#else
+# if defined (_STLP_MSVC) && (_STLP_MSVC <= 1200 ) || defined (__ICL)
+    const locale& __loc = __is.getloc();
+    const _C_type& _Ctype = use_facet(__loc , ( _C_type * ) 0, true);
+# elif defined (__SUNPRO_CC)
+    const locale& __loc = __is.getloc();
+    const _C_type& _Ctype = use_facet(__loc , ( _C_type * ) 0);
+# else
+    const locale& __loc = __is.getloc();
+    const _C_type& _Ctype = use_facet<_C_type>(__loc);
+# endif
+#endif
+    __s.clear();
+    size_t __n = __is.width(0);
+    if (__n == 0)
+      __n = __STATIC_CAST(size_t,-1);
+    else
+      __s.reserve(__n);
+    
+
+    while (__n-- > 0) {
+      typename _Traits::int_type __c1 = __buf->sbumpc();
+      if (_Traits::eq_int_type(__c1, _Traits::eof())) {
+        __is.setstate(__istream::eofbit);
+        break;
+      }
+      else {
+        _CharT __c = _Traits::to_char_type(__c1);
+
+        if (_Ctype.is(_C_type::space, __c)) {
+          if (_Traits::eq_int_type(__buf->sputbackc(__c), _Traits::eof()))
+            __is.setstate(__istream::failbit);
+          break;
+        }
+        else
+          __s.push_back(__c);
+      }
+    }
+    
+    // If we have read no characters, then set failbit.
+    if (__s.size() == 0)
+      __is.setstate(__istream::failbit);
+  }
+  else
+    __is.setstate(__istream::failbit);
+
+  return __is;
+}
+
+template <class _CharT, class _Traits, class _Alloc>    
+basic_istream<_CharT, _Traits>& _STLP_CALL 
+getline(basic_istream<_CharT, _Traits>& __is,
+        basic_string<_CharT,_Traits,_Alloc>& __s,
+        _CharT __delim)
+{
+  _STLP_USING_IO
+  typedef basic_istream<_CharT, _Traits> __istream;
+  size_t __nread = 0;
+  typename basic_istream<_CharT, _Traits>::sentry __sentry(__is, true);
+  if (__sentry) {
+    basic_streambuf<_CharT, _Traits>* __buf = __is.rdbuf();
+    __s.clear();
+
+    while (__nread < __s.max_size()) {
+      int __c1 = __buf->sbumpc();
+      if (_Traits::eq_int_type(__c1, _Traits::eof())) {
+        __is.setstate(__istream::eofbit);
+        break;
+      }
+      else {
+        ++__nread;
+        _CharT __c = _Traits::to_char_type(__c1);
+        if (!_Traits::eq(__c, __delim)) 
+          __s.push_back(__c);
+        else
+          break;              // Character is extracted but not appended.
+      }
+    }
+  }
+  if (__nread == 0 || __nread >= __s.max_size())
+    __is.setstate(__istream::failbit);
+
+  return __is;
+}
+
+#elif ! defined ( _STLP_USE_NO_IOSTREAMS )
+
+// (reg) For Watcom IO, _OSTREAM_DLL tells if ostream class is in .exe or in .dll
+
+template <class _CharT, class _Traits, class _Alloc>
+_OSTREAM_DLL&  _STLP_CALL operator<<(_OSTREAM_DLL& __os, 
+                    const basic_string<_CharT,_Traits,_Alloc>& __s)
+{
+  _STLP_USING_IO
+  streambuf* __buf = __os.rdbuf();
+  if (__buf) {
+    size_t __n = __s.size();
+    size_t __pad_len = 0;
+    const bool __left = (__os.flags() & ios::left) !=0;
+    const size_t __w = __os.width();
+
+    if (__n < __w) { 
+      __pad_len = __w - __n; 
+    } 
+    
+    if (!__left)
+      __stlp_string_fill(__os, __buf, __pad_len);
+  
+    const size_t __nwritten = __buf->sputn(__s.data(), __n);
+
+    if (__left)
+      __stlp_string_fill(__os, __buf, __pad_len);
+
+    if (__nwritten != __n)
+      __os.clear(__os.rdstate() | ios::failbit);
+
+    __os.width(0);
+  }
+  else
+    __os.clear(__os.rdstate() | ios::badbit);
+
+  return __os;
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+_ISTREAM_DLL& _STLP_CALL operator>>(_ISTREAM_DLL& __is, basic_string<_CharT,_Traits,_Alloc>& __s)
+{
+  _STLP_USING_IO
+  if (!__is)
+    return __is;
+
+  streambuf* __buf = __is.rdbuf();
+  if (__buf) {
+
+    if (__is.flags() & ios::skipws) {
+      //      _CharT __c;
+      int __c;
+      do {
+        __c = __buf->sbumpc();
+      }
+      while (__c != EOF && isspace((unsigned char)__c));
+
+      if (__c == EOF) {
+        __is.clear(__is.rdstate() | ios::eofbit | ios::failbit);
+      }
+      else {
+	if (__buf->sputbackc(__c) == EOF)
+	  __is.clear(__is.rdstate() | ios::failbit);
+      }
+    }
+
+    // If we arrive at end of file (or fail for some other reason) while
+    // still discarding whitespace, then we don't try to read the string.
+    if (__is) {
+      __s.clear();
+
+      size_t __n = __is.width();
+      if (__n == 0)
+        __n = __STATIC_CAST(size_t,-1);
+      else
+        __s.reserve(__n);
+
+      while (__n-- > 0) {
+        int __c1 = __buf->sbumpc();
+        if (__c1 == EOF) {
+          __is.clear(__is.rdstate() | ios::eofbit);
+          break;
+        }
+        else {
+          _CharT __c = _Traits::to_char_type(__c1);
+
+          if (isspace((unsigned char) __c)) {
+            if (__buf->sputbackc(__c) == EOF)
+              __is.clear(__is.rdstate() | ios::failbit);
+            break;
+          }
+          else
+            __s.push_back(__c);
+        }
+      }
+    
+      // If we have read no characters, then set failbit.
+      if (__s.size() == 0)
+        __is.clear(__is.rdstate() | ios::failbit);
+    }
+
+    __is.width(0);
+  }
+  else                          // We have no streambuf.
+    __is.clear(__is.rdstate() | ios::badbit);
+
+  return __is;
+}
+
+template <class _CharT, class _Traits, class _Alloc>    
+_ISTREAM_DLL& _STLP_CALL getline(_ISTREAM_DLL& __is,
+                 basic_string<_CharT,_Traits,_Alloc>& __s,
+                 _CharT __delim)
+{
+  _STLP_USING_IO
+  streambuf* __buf = __is.rdbuf();
+  if (__buf) {
+    size_t __nread = 0;
+    if (__is) {
+      __s.clear();
+
+      while (__nread < __s.max_size()) {
+        int __c1 = __buf->sbumpc();
+        if (__c1 == EOF) {
+          __is.clear(__is.rdstate() | ios::eofbit);
+          break;
+        }
+        else {
+          ++__nread;
+          _CharT __c = _Traits::to_char_type(__c1);
+          if (!_Traits::eq(__c, __delim)) 
+            __s.push_back(__c);
+          else
+            break;              // Character is extracted but not appended.
+        }
+      }
+    }
+
+    if (__nread == 0 || __nread >= __s.max_size())
+      __is.clear(__is.rdstate() | ios::failbit);
+  }
+  else
+    __is.clear(__is.rdstate() | ios::badbit);
+
+  return __is;
+}
+
+# endif /* _STLP_NEW_IOSTREAMS */
+
+_STLP_END_NAMESPACE
+
+// # undef _STLP_USING_IO
+# undef basic_string
+
+#endif
diff --git a/main/source/stlport/stlport/stl/_string_io.h b/main/source/stlport/stlport/stl/_string_io.h
new file mode 100644
index 00000000..73bb69f7
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_string_io.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 1997-1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_STRING_IO_H
+#define _STLP_STRING_IO_H
+
+// this is for link-time instantiation
+#if !defined  ( _STLP_STRING )
+# include <string>
+# endif
+
+//#ifndef _STLP_LOCALE
+//# include <locale>
+//#endif
+
+# ifdef _STLP_DEBUG
+#  define basic_string _Nondebug_string
+# endif
+
+// I/O.  
+_STLP_BEGIN_NAMESPACE
+
+#if defined (_STLP_USE_NEW_IOSTREAMS)
+
+template <class _CharT, class _Traits, class _Alloc>
+basic_ostream<_CharT, _Traits>& _STLP_CALL
+operator<<(basic_ostream<_CharT, _Traits>& __os, 
+           const basic_string<_CharT,_Traits,_Alloc>& __s);
+
+template <class _CharT, class _Traits, class _Alloc>
+basic_istream<_CharT, _Traits>&  _STLP_CALL
+operator>>(basic_istream<_CharT, _Traits>& __is,
+           basic_string<_CharT,_Traits,_Alloc>& __s);
+
+template <class _CharT, class _Traits, class _Alloc>    
+basic_istream<_CharT, _Traits>& _STLP_CALL 
+getline(basic_istream<_CharT, _Traits>& __is,
+        basic_string<_CharT,_Traits,_Alloc>& __s,
+        _CharT __delim);
+
+# if !(defined (__BORLANDC__) && ! defined (_STLP_USE_OWN_NAMESPACE))
+
+template <class _CharT, class _Traits, class _Alloc>    
+inline basic_istream<_CharT, _Traits>& _STLP_CALL 
+getline(basic_istream<_CharT, _Traits>& __is,
+        basic_string<_CharT,_Traits,_Alloc>& __s)
+{
+  return getline(__is, __s, __is.widen('\n'));
+}
+# endif
+
+template <class _CharT, class _Traits>
+bool _STLP_CALL
+__stlp_string_fill(basic_ostream<_CharT, _Traits>& __os,
+                  basic_streambuf<_CharT, _Traits>* __buf,
+                  size_t __n);
+#elif ! defined ( _STLP_USE_NO_IOSTREAMS )
+
+// (reg) For Watcom IO, this tells if ostream class is in .exe or in .dll
+# ifdef _WPRTLINK
+typedef _WPRTLINK ostream _OSTREAM_DLL;
+typedef _WPRTLINK istream _ISTREAM_DLL;
+#else
+typedef           ostream _OSTREAM_DLL;
+typedef           istream _ISTREAM_DLL;
+#endif
+
+template <class _CharT, class _Traits, class _Alloc>
+_OSTREAM_DLL& _STLP_CALL operator<<(_OSTREAM_DLL& __os, 
+                    const basic_string<_CharT,_Traits,_Alloc>& __s);
+
+template <class _CharT, class _Traits, class _Alloc>
+_ISTREAM_DLL& _STLP_CALL operator>>(_ISTREAM_DLL& __is, basic_string<_CharT,_Traits,_Alloc>& __s);
+
+template <class _CharT, class _Traits, class _Alloc>    
+_ISTREAM_DLL& _STLP_CALL getline(_ISTREAM_DLL& __is,
+                 basic_string<_CharT,_Traits,_Alloc>& __s,
+                 _CharT __delim);
+
+
+template <class _CharT, class _Traits, class _Alloc>    
+inline _ISTREAM_DLL& _STLP_CALL 
+getline(_ISTREAM_DLL& __is, basic_string<_CharT,_Traits,_Alloc>& __s)
+{
+  return getline(__is, __s, '\n');
+}
+
+inline void  _STLP_CALL
+__stlp_string_fill(_OSTREAM_DLL& __os, streambuf* __buf, size_t __n)
+{
+  char __f = __os.fill();
+  size_t __i;
+
+  for (__i = 0; __i < __n; ++__i) __buf->sputc(__f);
+}
+
+#endif /* _STLP_USE_NEW_IOSTREAMS */
+
+_STLP_END_NAMESPACE
+
+# undef basic_string
+
+# if !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_string_io.c>
+# endif
+
+#endif /* _STLP_STRING_IO_H */
diff --git a/main/source/stlport/stlport/stl/_strstream.h b/main/source/stlport/stlport/stl/_strstream.h
new file mode 100644
index 00000000..00004999
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_strstream.h
@@ -0,0 +1,141 @@
+
+#ifndef _STLP_INTERNAL_STREAMBUF
+#include <stl/_streambuf.h>
+#endif
+#ifndef _STLP_ISTREAM
+#include <istream>              // Includes <ostream>, <ios>, <iosfwd>
+#endif
+#ifndef _STLP_STRING_H
+#include <stl/_string.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+#ifndef _STLP_USE_NAMESPACES
+# define strstream _STLP_strstream 
+# define ostrstream _STLP_ostrstream
+# define istrstream _STLP_istrstream
+# define strstreambuf _STLP_strstreambuf
+#endif
+
+//----------------------------------------------------------------------
+// Class strstreambuf, a streambuf class that manages an array of char.
+// Note that this class is not a template.
+
+class _STLP_CLASS_DECLSPEC strstreambuf : public basic_streambuf<char, char_traits<char> >
+{
+public:                         // Types.
+  typedef char_traits<char>              _Traits;
+  typedef basic_streambuf<char, char_traits<char> > _Base;
+  typedef void* (*__alloc_fn)(size_t);
+  typedef void (*__free_fn)(void*);
+public:                         // Constructor, destructor
+
+  explicit strstreambuf(streamsize _Initial_capacity = 0);
+
+  strstreambuf(__alloc_fn, __free_fn);
+
+  strstreambuf(char* __get, streamsize __n, char* __put = 0);
+  strstreambuf(signed char* __get, streamsize __n, signed char* __put = 0);
+  strstreambuf(unsigned char* __get, streamsize __n, unsigned char* __put=0);
+
+  strstreambuf(const char* __get, streamsize __n);
+  strstreambuf(const signed char* __get, streamsize __n);
+  strstreambuf(const unsigned char* __get, streamsize __n);
+
+  virtual ~strstreambuf();
+
+public:                         // strstreambuf operations.
+  void freeze(bool = true);
+  char* str();
+  int pcount() const;
+
+protected:                      // Overridden virtual member functions.
+  virtual int_type overflow(int_type __c  = _Traits::eof());
+  virtual int_type pbackfail(int_type __c = _Traits::eof());
+  virtual int_type underflow();
+  virtual _Base* setbuf(char* __buf, streamsize __n);
+  virtual pos_type seekoff(off_type __off, ios_base::seekdir __dir,
+                           ios_base::openmode __mode 
+                                      = ios_base::in | ios_base::out);
+  virtual pos_type seekpos(pos_type __pos, ios_base::openmode __mode 
+                                      = ios_base::in | ios_base::out);
+
+private:                        // Helper functions.
+  // Dynamic allocation, possibly using _M_alloc_fun and _M_free_fun.
+  char* _M_alloc(size_t);
+  void  _M_free(char*);
+
+  // Helper function used in constructors.
+  void _M_setup(char* __get, char* __put, streamsize __n);
+private:                        // Data members.
+  __alloc_fn _M_alloc_fun;
+  __free_fn  _M_free_fun;
+  bool _M_dynamic  : 1;
+  bool _M_frozen   : 1;
+  bool _M_constant : 1;
+};
+
+//----------------------------------------------------------------------
+// Class istrstream, an istream that manages a strstreambuf.
+
+class _STLP_CLASS_DECLSPEC istrstream : public basic_istream<char, char_traits<char> >
+{
+public:
+  explicit istrstream(char*);
+  explicit istrstream(const char*);
+  istrstream(char* , streamsize);
+  istrstream(const char*, streamsize);
+  virtual ~istrstream();
+  
+  strstreambuf* rdbuf() const;
+  char* str();
+
+private:
+  strstreambuf _M_buf;
+};
+
+//----------------------------------------------------------------------
+// Class ostrstream
+
+class _STLP_CLASS_DECLSPEC ostrstream : public basic_ostream<char, char_traits<char> >
+{
+public:
+  ostrstream();
+  ostrstream(char*, int, ios_base::openmode = ios_base::out);
+  virtual ~ostrstream();
+
+  strstreambuf* rdbuf() const;
+  void freeze(bool = true);
+  char* str();
+  int pcount() const;
+
+private:
+  strstreambuf _M_buf;
+};
+
+//----------------------------------------------------------------------
+// Class strstream
+
+class _STLP_CLASS_DECLSPEC strstream : public basic_iostream<char, char_traits<char> >
+{
+public:
+  typedef char                        char_type;
+  typedef char_traits<char>::int_type int_type;
+  typedef char_traits<char>::pos_type pos_type;
+  typedef char_traits<char>::off_type off_type;
+
+  strstream();
+  strstream(char*, int, ios_base::openmode = ios_base::in | ios_base::out);
+  virtual ~strstream();
+
+  strstreambuf* rdbuf() const;
+  void freeze(bool = true);
+  int pcount() const;
+  char* str();
+
+private:
+  strstreambuf _M_buf;
+};
+
+_STLP_END_NAMESPACE
diff --git a/main/source/stlport/stlport/stl/_tempbuf.c b/main/source/stlport/stlport/stl/_tempbuf.c
new file mode 100644
index 00000000..ebae6bb2
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_tempbuf.c
@@ -0,0 +1,57 @@
+/*
+ *
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+#ifndef _STLP_TEMPBUF_C
+#define _STLP_TEMPBUF_C
+
+#ifndef _STLP_INTERNAL_TEMPBUF_H
+# include <stl/_tempbuf.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _Tp>
+pair<_Tp*, ptrdiff_t> _STLP_CALL 
+__get_temporary_buffer(ptrdiff_t __len, _Tp*)
+{
+  if (__len > ptrdiff_t(INT_MAX / sizeof(_Tp)))
+    __len = INT_MAX / sizeof(_Tp);
+
+  while (__len > 0) {
+    _Tp* __tmp = (_Tp*) malloc((size_t)__len * sizeof(_Tp));
+    if (__tmp != 0)
+      return pair<_Tp*, ptrdiff_t>(__tmp, __len);
+    __len /= 2;
+  }
+
+  return pair<_Tp*, ptrdiff_t>((_Tp*)0, 0);
+}
+_STLP_END_NAMESPACE
+
+#endif /*  _STLP_TEMPBUF_C */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_tempbuf.h b/main/source/stlport/stlport/stl/_tempbuf.h
new file mode 100644
index 00000000..429d84ce
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_tempbuf.h
@@ -0,0 +1,165 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_TEMPBUF_H
+#define _STLP_INTERNAL_TEMPBUF_H
+
+# ifndef _STLP_CLIMITS
+#  include <climits>
+# endif
+# ifndef _STLP_CSTDLIB
+#  include <cstdlib>
+# endif
+# ifndef _STLP_INTERNAL_UNINITIALIZED_H
+#  include <stl/_uninitialized.h>
+# endif
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _Tp>
+pair<_Tp*, ptrdiff_t>  _STLP_CALL
+__get_temporary_buffer(ptrdiff_t __len, _Tp*);
+
+#ifndef _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
+
+template <class _Tp>
+inline pair<_Tp*, ptrdiff_t>  _STLP_CALL get_temporary_buffer(ptrdiff_t __len) {
+  return __get_temporary_buffer(__len, (_Tp*) 0);
+}
+
+# if ! defined(_STLP_NO_EXTENSIONS)
+// This overload is not required by the standard; it is an extension.
+// It is supported for backward compatibility with the HP STL, and
+// because not all compilers support the language feature (explicit
+// function template arguments) that is required for the standard
+// version of get_temporary_buffer.
+template <class _Tp>
+inline pair<_Tp*, ptrdiff_t>  _STLP_CALL
+get_temporary_buffer(ptrdiff_t __len, _Tp*) {
+  return __get_temporary_buffer(__len, (_Tp*) 0);
+}
+# endif
+#endif
+
+template <class _Tp>
+inline void  _STLP_CALL return_temporary_buffer(_Tp* __p) {
+// SunPro brain damage
+  free((char*)__p);
+}
+
+template <class _ForwardIterator, class _Tp>
+class _Temporary_buffer {
+private:
+  ptrdiff_t  _M_original_len;
+  ptrdiff_t  _M_len;
+  _Tp*       _M_buffer;
+
+  void _M_allocate_buffer() {
+    _M_original_len = _M_len;
+    _M_buffer = 0;
+
+    if (_M_len > (ptrdiff_t)(INT_MAX / sizeof(_Tp)))
+      _M_len = INT_MAX / sizeof(_Tp);
+
+    while (_M_len > 0) {
+      _M_buffer = (_Tp*) malloc(_M_len * sizeof(_Tp));
+      if (_M_buffer)
+        break;
+      _M_len /= 2;
+    }
+  }
+
+  void _M_initialize_buffer(const _Tp&, const __true_type&) {}
+  void _M_initialize_buffer(const _Tp& val, const __false_type&) {
+    uninitialized_fill_n(_M_buffer, _M_len, val);
+  }
+
+public:
+  ptrdiff_t size() const { return _M_len; }
+  ptrdiff_t requested_size() const { return _M_original_len; }
+  _Tp* begin() { return _M_buffer; }
+  _Tp* end() { return _M_buffer + _M_len; }
+
+  _Temporary_buffer(_ForwardIterator __first, _ForwardIterator __last) {
+    // Workaround for a __type_traits bug in the pre-7.3 compiler.
+#   if defined(__sgi) && !defined(__GNUC__) && _COMPILER_VERSION < 730
+    typedef typename __type_traits<_Tp>::is_POD_type _Trivial;
+#   else
+     typedef typename __type_traits<_Tp>::has_trivial_default_constructor  _Trivial;
+#   endif
+    _STLP_TRY {
+      _M_len = distance(__first, __last);
+      _M_allocate_buffer();
+      if (_M_len > 0)
+        _M_initialize_buffer(*__first, _Trivial());
+    }
+    _STLP_UNWIND(free(_M_buffer); _M_buffer = 0; _M_len = 0);
+  }
+ 
+  ~_Temporary_buffer() {  
+    _STLP_STD::_Destroy(_M_buffer, _M_buffer + _M_len);
+    free(_M_buffer);
+  }
+
+private:
+  // Disable copy constructor and assignment operator.
+  _Temporary_buffer(const _Temporary_buffer<_ForwardIterator, _Tp>&) {}
+  void operator=(const _Temporary_buffer<_ForwardIterator, _Tp>&) {}
+};
+
+# ifndef _STLP_NO_EXTENSIONS
+
+// Class temporary_buffer is not part of the standard.  It is an extension.
+
+template <class _ForwardIterator, 
+          class _Tp 
+#ifdef _STLP_CLASS_PARTIAL_SPECIALIZATION
+                    = typename iterator_traits<_ForwardIterator>::value_type
+#endif /* _STLP_CLASS_PARTIAL_SPECIALIZATION */
+         >
+struct temporary_buffer : public _Temporary_buffer<_ForwardIterator, _Tp>
+{
+  temporary_buffer(_ForwardIterator __first, _ForwardIterator __last)
+    : _Temporary_buffer<_ForwardIterator, _Tp>(__first, __last) {}
+  ~temporary_buffer() {}
+};
+
+# endif /* _STLP_NO_EXTENSIONS */
+    
+_STLP_END_NAMESPACE
+
+# ifndef _STLP_LINK_TIME_INSTANTIATION
+#  include <stl/_tempbuf.c>
+# endif
+
+#endif /* _STLP_INTERNAL_TEMPBUF_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_threads.c b/main/source/stlport/stlport/stl/_threads.c
new file mode 100644
index 00000000..9e82b99f
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_threads.c
@@ -0,0 +1,172 @@
+/*
+ *
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+#ifndef _STLP_THREADS_C
+#define _STLP_THREADS_C
+
+#ifndef _STLP_INTERNAL_THREADS_H
+# include <stl/_threads.h>
+#endif
+
+# if defined (_STLP_EXPOSE_GLOBALS_IMPLEMENTATION)
+
+# if defined(_STLP_SGI_THREADS)
+#  include <time.h>
+# elif defined (_STLP_UNIX)
+#  include <ctime>
+# if defined (_STLP_USE_NAMESPACES) && ! defined (_STLP_VENDOR_GLOBAL_CSTD)
+using _STLP_VENDOR_CSTD::time_t;
+# endif
+#  include <sys/time.h>
+# endif
+
+_STLP_BEGIN_NAMESPACE
+
+# if (_STLP_STATIC_TEMPLATE_DATA > 0)
+
+#  ifdef _STLP_THREADS
+#  if !defined(_STLP_ATOMIC_EXCHANGE) && (defined(_STLP_PTHREADS) || defined(_STLP_UITHREADS) || defined(_STLP_OS2THREADS) || defined(_STLP_USE_PTHREAD_SPINLOCK))
+template<int __dummy>
+_STLP_STATIC_MUTEX
+_Swap_lock_struct<__dummy>::_S_swap_lock _STLP_MUTEX_INITIALIZER;
+#  endif
+#  endif //_STLP_THREADS
+
+#  ifndef _STLP_USE_PTHREAD_SPINLOCK
+template <int __inst>
+unsigned _STLP_mutex_spin<__inst>::__max = _STLP_mutex_spin<__inst>::__low_max;
+
+template <int __inst>
+unsigned _STLP_mutex_spin<__inst>::__last = 0;
+#  endif // _STLP_USE_PTHREAD_SPINLOCK
+
+# else /* ( _STLP_STATIC_TEMPLATE_DATA > 0 ) */
+
+#  if defined(_STLP_PTHREADS) || defined(_STLP_UITHREADS) || defined(_STLP_OS2THREADS)
+__DECLARE_INSTANCE(_STLP_STATIC_MUTEX, _Swap_lock_struct<0>::_S_swap_lock, 
+                   _STLP_MUTEX_INITIALIZER  );
+#  endif /* _STLP_PTHREADS */
+
+#  ifndef _STLP_USE_PTHREAD_SPINLOCK
+__DECLARE_INSTANCE(unsigned, _STLP_mutex_spin<0>::__max,  =30);
+__DECLARE_INSTANCE(unsigned, _STLP_mutex_spin<0>::__last, =0);
+#  endif // _STLP_USE_PTHREAD_SPINLOCK
+
+# endif /* ( _STLP_STATIC_TEMPLATE_DATA > 0 ) */
+
+#ifndef _STLP_USE_PTHREAD_SPINLOCK
+
+#ifdef _STLP_SPARC_SOLARIS_THREADS
+// underground function in libc.so; we do not want dependance on librt
+extern "C" int __nanosleep(const struct timespec*, struct timespec*);
+# define _STLP_NANOSLEEP __nanosleep
+#else
+# define _STLP_NANOSLEEP nanosleep
+#endif
+
+template <int __inst>
+void _STLP_CALL
+_STLP_mutex_spin<__inst>::_S_nsec_sleep(int __log_nsec) {
+#     if defined(_STLP_WIN32THREADS)
+	  if (__log_nsec <= 20) {
+        // Note from boost (www.boost.org): 
+        // Changed to Sleep(1) from Sleep(0).
+        // According to MSDN, Sleep(0) will never yield
+        // to a lower-priority thread, whereas Sleep(1)
+        // will. Performance seems not to be affected.
+	      Sleep(1);
+	  } else {
+	      Sleep(1 << (__log_nsec - 20));
+	  }
+#    elif defined(_STLP_OS2THREADS)
+      if (__log_nsec <= 20) {
+         DosSleep(0);
+      } else {
+         DosSleep(1 << (__log_nsec - 20));
+      }
+#     elif defined (_STLP_UNIX)
+          timespec __ts;
+          /* Max sleep is 2**27nsec ~ 60msec      */
+          __ts.tv_sec = 0;
+          __ts.tv_nsec = 1 << __log_nsec;
+          _STLP_NANOSLEEP(&__ts, 0);
+#     endif
+  }
+
+
+template <int __inst>
+void  _STLP_CALL
+_STLP_mutex_spin<__inst>::_M_do_lock(volatile __stl_atomic_t* __lock)
+{
+#if defined(_STLP_ATOMIC_EXCHANGE)
+  if (_Atomic_swap(__lock, 1)) {
+    unsigned __my_spin_max = _STLP_mutex_spin<0>::__max;
+    unsigned __my_last_spins = _STLP_mutex_spin<0>::__last;
+    volatile unsigned __junk = 17; 	// Value doesn't matter.
+    unsigned  __i;
+    
+    for (__i = 0; __i < __my_spin_max; ++__i) {
+      if (__i < __my_last_spins/2 || *__lock) {
+        __junk *= __junk; __junk *= __junk;
+        __junk *= __junk; __junk *= __junk;
+      } else {
+        if (!_Atomic_swap(__lock, 1)) {
+          // got it!
+          // Spinning worked.  Thus we're probably not being scheduled
+          // against the other process with which we were contending.
+          // Thus it makes sense to spin longer the next time.
+          _STLP_mutex_spin<0>::__last = __i;
+          _STLP_mutex_spin<0>::__max = _STLP_mutex_spin<0>::__high_max;
+	    return;
+        }
+      }
+    }
+    
+    // We are probably being scheduled against the other process.  Sleep.
+    _STLP_mutex_spin<0>::__max = _STLP_mutex_spin<0>::__low_max;
+    
+    for (__i = 0 ;; ++__i) {
+      int __log_nsec = __i + 6;
+      
+      if (__log_nsec > 27) __log_nsec = 27;
+      if (!_Atomic_swap(__lock, 1)) {
+	  break;
+      }
+      _S_nsec_sleep(__log_nsec);
+    }
+    
+  } /* first _Atomic_swap */
+# endif
+}
+#endif // _STLP_USE_PTHREAD_SPINLOCK
+
+_STLP_END_NAMESPACE
+
+# endif /* BUILDING_STLPORT */
+#endif /*  _STLP_THREADS_C */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_threads.h b/main/source/stlport/stlport/stl/_threads.h
new file mode 100644
index 00000000..4f404a11
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_threads.h
@@ -0,0 +1,722 @@
+/*
+ * Copyright (c) 1997-1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+// WARNING: This is an internal header file, included by other C++
+// standard library headers.  You should not attempt to use this header
+// file directly.
+// Stl_config.h should be included before this file.
+
+
+#ifndef _STLP_INTERNAL_THREADS_H
+#define _STLP_INTERNAL_THREADS_H
+
+// Supported threading models are native SGI, pthreads, uithreads
+// (similar to pthreads, but based on an earlier draft of the Posix
+// threads standard), and Win32 threads.  Uithread support by Jochen
+// Schlick, 1999, and Solaris threads generalized to them.
+
+#ifndef _STLP_CONFIG_H
+#include <stl/_config.h>
+#endif
+
+# if ! defined (_STLP_CSTDDEF)
+#  include <cstddef>
+# endif
+
+# if ! defined (_STLP_CSTDLIB)
+#  include <cstdlib>
+# endif
+
+// On SUN and Mac OS X gcc, zero-initialization works just fine...
+# if defined (__sun) || ( defined(__GNUC__) && defined(__APPLE__) )
+# define _STLP_MUTEX_INITIALIZER
+# endif
+
+# if defined (_STLP_WIN32) || defined (__sgi) || defined (_STLP_SPARC_SOLARIS_THREADS)
+  typedef long __stl_atomic_t;
+# else 
+# if defined (_STLP_USE_NAMESPACES) && ! defined (_STLP_VENDOR_GLOBAL_CSTD)
+// using _STLP_VENDOR_CSTD::size_t;
+using namespace _STLP_VENDOR_CSTD;
+# endif
+  typedef size_t __stl_atomic_t;
+#endif  
+
+# if defined(_STLP_SGI_THREADS)
+#  include <mutex.h>
+// Hack for SGI o32 compilers.
+#if !defined(__add_and_fetch) && \
+    (__mips < 3 || !(defined (_ABIN32) || defined(_ABI64)))
+#  define __add_and_fetch(__l,__v) add_then_test((unsigned long*)__l,__v)  
+#  define __test_and_set(__l,__v)  test_and_set(__l,__v)
+#endif /* o32 */
+
+# if __mips < 3 || !(defined (_ABIN32) || defined(_ABI64))
+#  define _STLP_ATOMIC_EXCHANGE(__p, __q) test_and_set(__p, __q)
+# else
+#  define _STLP_ATOMIC_EXCHANGE(__p, __q) __test_and_set((unsigned long*)__p, (unsigned long)__q)
+# endif
+
+#  define _STLP_ATOMIC_INCREMENT(__x) __add_and_fetch(__x, 1)
+#  define _STLP_ATOMIC_DECREMENT(__x) __add_and_fetch(__x, (size_t) -1)
+
+# elif defined (__GNUC__) && defined (__i386__) && defined (__unix__) && defined (_STLP_USE_INLINE_X86_SPINLOCK) 
+
+// gcc on i386 linux, freebsd, etc. 
+
+// This enables the memory caching on x86 linux.  It is critical for SMP
+// without it the performace is DISMAL!
+static inline unsigned long __xchg(volatile __stl_atomic_t* target, int source)
+{
+
+  // The target is refernce in memory rather than the register
+  // because making a copy of it from memory to the register and
+  // back again would ruin the atomic nature of the call.
+  // the source does not need to be delt with atomicly so it can
+  // be copied about as needed.
+  //
+  // The casting of the source is used to prevent gcc from optimizing 
+  // in such a way that breaks the atomic nature of this call.
+  //
+  __asm__ __volatile__("xchgl %1,%0"
+		       :"=m" (*(volatile long *) target), "=r" (source)
+		       :"m" (*(volatile long *) target), "r" (source) );
+  return source;
+
+  //  The assembly above does the following atomicly:
+  //   int temp=source;
+  //   source=(int)(*target);
+  //   (int)(*target)=temp;
+  // return source
+}
+
+static inline void __inc_and_fetch(volatile __stl_atomic_t* __x)
+{
+  // Referenced in memory rather than register to preserve the atomic nature.
+  //
+  __asm__ __volatile__(
+      "lock; incl %0"
+      :"=m" (*__x)
+      :"m" (*__x) );
+
+  //  The assembly above does the following atomicly:
+  //   ++(int)(*__x);
+
+}
+static inline void __dec_and_fetch(volatile __stl_atomic_t* __x)
+{
+  // Referenced in memory rather than register to preserve the atomic nature.
+  //
+  __asm__ __volatile__(
+      "lock; decl %0"
+      :"=m" (*__x)
+      :"m" (*__x) );
+
+  //  The assembly above does the following atomicly:
+  //   --(int)(*__x);
+}
+
+#  define _STLP_ATOMIC_EXCHANGE(target, newValue) ((__xchg(target, newValue)))
+#  define _STLP_ATOMIC_INCREMENT(__x) __inc_and_fetch(__x)
+#  define _STLP_ATOMIC_DECREMENT(__x) __dec_and_fetch(__x)
+
+# elif defined(_STLP_PTHREADS)
+
+#  include <pthread.h>
+#  ifndef _STLP_USE_PTHREAD_SPINLOCK
+#   if defined(PTHREAD_MUTEX_INITIALIZER) && !defined(_STLP_MUTEX_INITIALIZER)
+#    define _STLP_MUTEX_INITIALIZER = { PTHREAD_MUTEX_INITIALIZER }
+#   endif
+
+//HPUX variants have (on some platforms optional) non-standard "DCE" pthreads impl
+#   if defined(_DECTHREADS_) && (defined(_PTHREAD_USE_D4) || defined(__hpux)) && !defined(_CMA_SUPPRESS_EXTERNALS_)
+#    define _STLP_PTHREAD_ATTR_DEFAULT pthread_mutexattr_default
+#   else
+#    define _STLP_PTHREAD_ATTR_DEFAULT 0
+#   endif
+#  endif // !_STLP_USE_PTHREAD_SPINLOCK 
+
+# elif defined(_STLP_WIN32THREADS)
+#  if !defined (_STLP_WINDOWS_H_INCLUDED) && ! defined (_WINDOWS_H)
+#   if ! (defined ( _STLP_MSVC ) || defined (__BORLANDC__) || defined (__ICL) || defined (__WATCOMC__) || defined (__MINGW32__) || defined (__DMC__))
+#    ifdef _STLP_USE_MFC
+#     include <afx.h>
+#    else
+#     include <windows.h>
+#    endif
+#    define _STLP_WINDOWS_H_INCLUDED
+#   else 
+// This section serves as a replacement for windows.h header for Visual C++
+extern "C" {
+#   if (defined(_M_MRX000) || defined(_M_ALPHA) \
+       || (defined(_M_PPC) && (_MSC_VER >= 1000))) && !defined(RC_INVOKED)
+#    define InterlockedIncrement       _InterlockedIncrement
+#    define InterlockedDecrement       _InterlockedDecrement
+#    define InterlockedExchange        _InterlockedExchange
+#    define _STLP_STDCALL
+#   else
+#    ifdef _MAC
+#     define _STLP_STDCALL _cdecl
+#    else
+#     define _STLP_STDCALL __stdcall
+#    endif
+#   endif
+
+#if (_MSC_VER >= 1300) || defined (_STLP_NEW_PLATFORM_SDK)
+_STLP_IMPORT_DECLSPEC long _STLP_STDCALL InterlockedIncrement(long volatile *);
+_STLP_IMPORT_DECLSPEC long _STLP_STDCALL InterlockedDecrement(long volatile *);
+_STLP_IMPORT_DECLSPEC long _STLP_STDCALL InterlockedExchange(long volatile *, long);
+#else
+  // boris : for the latest SDK, you may actually need the other version of the declaration (above)
+  // even for earlier VC++ versions. There is no way to tell SDK versions apart, sorry ...
+_STLP_IMPORT_DECLSPEC long _STLP_STDCALL InterlockedIncrement(long*);
+_STLP_IMPORT_DECLSPEC long _STLP_STDCALL InterlockedDecrement(long*);
+_STLP_IMPORT_DECLSPEC long _STLP_STDCALL InterlockedExchange(long*, long);
+#endif
+
+_STLP_IMPORT_DECLSPEC void _STLP_STDCALL Sleep(unsigned long);
+_STLP_IMPORT_DECLSPEC void _STLP_STDCALL OutputDebugStringA( const char* lpOutputString );
+
+#ifdef _STLP_DEBUG
+typedef unsigned long DWORD;
+_STLP_IMPORT_DECLSPEC DWORD _STLP_STDCALL GetCurrentThreadId();
+#endif /* _STLP_DEBUG */
+
+#    if defined (InterlockedIncrement)
+#     pragma intrinsic(_InterlockedIncrement)
+#     pragma intrinsic(_InterlockedDecrement)
+#     pragma intrinsic(_InterlockedExchange)
+#    endif
+} /* extern "C" */
+
+#   endif /* STL_MSVC */
+
+#   define _STLP_WINDOWS_H_INCLUDED
+
+#  endif /* _STLP_WIN32 */
+
+#  ifndef _STLP_ATOMIC_INCREMENT
+#   define _STLP_ATOMIC_INCREMENT(__x)           InterlockedIncrement((long*)__x)
+#   define _STLP_ATOMIC_DECREMENT(__x)           InterlockedDecrement((long*)__x)
+#   define _STLP_ATOMIC_EXCHANGE(__x, __y)       InterlockedExchange((long*)__x, (long)__y)
+#  endif
+# elif defined(__DECC) || defined(__DECCXX)
+#  include <machine/builtins.h>
+#  define _STLP_ATOMIC_EXCHANGE __ATOMIC_EXCH_LONG
+#  define _STLP_ATOMIC_INCREMENT(__x) __ATOMIC_ADD_LONG(__x, 1)
+#  define _STLP_ATOMIC_DECREMENT(__x) __ATOMIC_ADD_LONG(__x, -1)
+# elif defined(_STLP_SPARC_SOLARIS_THREADS)
+#  include <stl/_sparc_atomic.h>
+# elif defined (_STLP_UITHREADS)
+// this inclusion is potential hazard to bring up all sorts
+// of old-style headers. Let's assume vendor already know how
+// to deal with that.
+#  include <ctime>
+# if defined (_STLP_USE_NAMESPACES) && ! defined (_STLP_VENDOR_GLOBAL_CSTD)
+using _STLP_VENDOR_CSTD::time_t;
+# endif
+#  include <synch.h>
+#  include <cstdio>
+#  include <stl/_cwchar.h>
+# elif defined (_STLP_BETHREADS)
+#  include <OS.h>
+#include <cassert>
+#include <stdio.h>
+#  define _STLP_MUTEX_INITIALIZER = { 0 }
+#elif defined(_STLP_OS2THREADS)
+# ifdef __GNUC__
+#  define INCL_DOSSEMAPHORES
+#  include <os2.h>
+# else
+  // This section serves to replace os2.h for VisualAge C++
+  typedef unsigned long ULONG;
+  #ifndef __HEV__  /* INCL_SEMAPHORE may also define HEV */
+    #define __HEV__
+    typedef ULONG HEV;
+    typedef HEV*  PHEV;
+  #endif
+  typedef ULONG APIRET;
+  typedef ULONG HMTX;
+  typedef HMTX*  PHMTX;
+  typedef const char*  PCSZ;
+  typedef ULONG BOOL32;
+  APIRET _System DosCreateMutexSem(PCSZ pszName, PHEV phev, ULONG flAttr, BOOL32 fState);
+  APIRET _System DosRequestMutexSem(HMTX hmtx, ULONG ulTimeout);
+  APIRET _System DosReleaseMutexSem(HMTX hmtx);
+  APIRET _System DosCloseMutexSem(HMTX hmtx);
+# define _STLP_MUTEX_INITIALIZER = { 0 };
+#  endif /* GNUC */
+# endif
+
+# ifndef _STLP_MUTEX_INITIALIZER
+#   if defined(_STLP_ATOMIC_EXCHANGE)
+// we are using our own spinlock. 
+#     define _STLP_MUTEX_INITIALIZER = { 0 }
+#   elif defined(_STLP_UITHREADS)
+// known case
+#     define _STLP_MUTEX_INITIALIZER = { DEFAULTMUTEX }
+#   else
+// we do not have static initializer available. therefore, on-demand synchronization is needed.
+#     define _STLP_MUTEX_INITIALIZER
+#     define _STLP_MUTEX_NEEDS_ONDEMAND_INITIALIZATION
+#   endif
+# endif
+
+_STLP_BEGIN_NAMESPACE
+
+#ifndef _STLP_USE_PTHREAD_SPINLOCK
+// Helper struct.  This is a workaround for various compilers that don't
+// handle static variables in inline functions properly.
+template <int __inst>
+struct _STLP_mutex_spin {
+  enum { __low_max = 30, __high_max = 1000 };
+  // Low if we suspect uniprocessor, high for multiprocessor.
+  static unsigned __max;
+  static unsigned __last;
+  static void _STLP_CALL _M_do_lock(volatile __stl_atomic_t* __lock);
+  static void _STLP_CALL _S_nsec_sleep(int __log_nsec);
+};
+#endif // !_STLP_USE_PTHREAD_SPINLOCK
+
+
+// Locking class.  Note that this class *does not have a constructor*.
+// It must be initialized either statically, with _STLP_MUTEX_INITIALIZER,
+// or dynamically, by explicitly calling the _M_initialize member function.
+// (This is similar to the ways that a pthreads mutex can be initialized.)
+// There are explicit member functions for acquiring and releasing the lock.
+
+// There is no constructor because static initialization is essential for
+// some uses, and only a class aggregate (see section 8.5.1 of the C++
+// standard) can be initialized that way.  That means we must have no
+// constructors, no base classes, no virtual functions, and no private or
+// protected members.
+
+// For non-static cases, clients should use  _STLP_mutex.
+
+struct _STLP_CLASS_DECLSPEC _STLP_mutex_base
+{
+#if defined(_STLP_ATOMIC_EXCHANGE) || defined(_STLP_SGI_THREADS)
+  // It should be relatively easy to get this to work on any modern Unix.
+  volatile __stl_atomic_t _M_lock;
+#endif
+
+#ifdef _STLP_THREADS
+
+# ifdef _STLP_ATOMIC_EXCHANGE
+  inline void _M_initialize() { _M_lock=0; }
+  inline void _M_destroy() {}
+
+  void _M_acquire_lock() {
+    _STLP_mutex_spin<0>::_M_do_lock(&_M_lock);
+  }
+
+  inline void _M_release_lock() {
+    volatile __stl_atomic_t* __lock = &_M_lock;
+#  if defined(_STLP_SGI_THREADS) && defined(__GNUC__) && __mips >= 3
+        asm("sync");
+        *__lock = 0;
+#  elif defined(_STLP_SGI_THREADS) && __mips >= 3 \
+	 && (defined (_ABIN32) || defined(_ABI64))
+        __lock_release(__lock);
+#  elif defined (_STLP_SPARC_SOLARIS_THREADS)
+#   if defined (__WORD64) || defined (__arch64__) || defined (__sparcv9) || defined (__sparcv8plus)
+	asm("membar #StoreStore ; membar #LoadStore");
+#   else
+	asm(" stbar ");
+#   endif
+        *__lock = 0;	
+#  else
+        *__lock = 0;
+        // This is not sufficient on many multiprocessors, since
+        // writes to protected variables and the lock may be reordered.
+#  endif
+  }
+# elif defined(_STLP_PTHREADS)
+#  ifdef _STLP_USE_PTHREAD_SPINLOCK
+  pthread_spinlock_t _M_lock;
+  inline void _M_initialize() { pthread_spin_init( &_M_lock, 0 ); }
+  inline void _M_destroy() { pthread_spin_destroy( &_M_lock ); }
+
+  inline void _M_acquire_lock() { 
+    // we do not care about race conditions here : there is only one thread at this point 
+    if(!_M_lock) pthread_spin_init( &_M_lock, 0 );
+
+    // fbp: here, initialization on demand should happen before the lock
+    // we use simple strategy as we are sure this only happens on initialization
+    pthread_spin_lock( &_M_lock );
+  }
+
+  inline void _M_acquire_lock_nodemand() { 
+    pthread_spin_lock( &_M_lock ); 
+  }
+  inline void _M_release_lock() { pthread_spin_unlock( &_M_lock ); }
+#  else // !_STLP_USE_PTHREAD_SPINLOCK
+  pthread_mutex_t _M_lock;
+
+  inline void _M_initialize() {
+    pthread_mutex_init(&_M_lock,_STLP_PTHREAD_ATTR_DEFAULT);
+  }
+  inline void _M_destroy() {
+    pthread_mutex_destroy(&_M_lock);
+  }
+  inline void _M_acquire_lock_nodemand() { 
+    pthread_mutex_lock(&_M_lock);
+  }
+
+  inline void _M_acquire_lock() { 
+#    if defined (__hpux) && !defined (PTHREAD_MUTEX_INITIALIZER)
+      if (!_M_lock.field1)  _M_initialize();
+#    endif
+     pthread_mutex_lock(&_M_lock);
+  }
+  inline void _M_release_lock() { pthread_mutex_unlock(&_M_lock); }
+#  endif // !_STLP_USE_PTHREAD_SPINLOCK
+  
+# elif defined (_STLP_UITHREADS)
+  mutex_t _M_lock;
+  inline void _M_initialize() {
+    mutex_init(&_M_lock,0,NULL);	
+  }
+  inline void _M_destroy() {
+    mutex_destroy(&_M_lock);
+  }
+  inline void _M_acquire_lock() { mutex_lock(&_M_lock); }
+  inline void _M_release_lock() { mutex_unlock(&_M_lock); }
+
+# elif defined(_STLP_OS2THREADS)
+  HMTX _M_lock;
+  inline void _M_initialize() { DosCreateMutexSem(NULL, &_M_lock, 0, false); }
+  inline void _M_destroy() { DosCloseMutexSem(_M_lock); }
+  inline void _M_acquire_lock_nodemand() {
+    DosRequestMutexSem(_M_lock, SEM_INDEFINITE_WAIT);
+  }  
+  inline void _M_acquire_lock() {
+    if(!_M_lock) _M_initialize();
+    DosRequestMutexSem(_M_lock, SEM_INDEFINITE_WAIT);
+  }
+  inline void _M_release_lock() { DosReleaseMutexSem(_M_lock); }
+# elif defined(_STLP_BETHREADS)
+  sem_id sem;
+  inline void _M_initialize() 
+  {
+     sem = create_sem(1, "STLPort");
+     assert(sem > 0);
+  }
+  inline void _M_destroy() 
+  {
+     int t = delete_sem(sem);
+     assert(t == B_NO_ERROR);
+  }
+  inline void _M_acquire_lock_nodemand()
+  {
+    status_t t;
+    t = acquire_sem(sem);
+    assert(t == B_NO_ERROR);
+  }
+  inline void _M_acquire_lock();
+  inline void _M_release_lock() 
+  {
+     status_t t = release_sem(sem);
+     assert(t == B_NO_ERROR);
+  }
+# else		//*ty 11/24/2001 - added configuration check
+#  error "Unknown thread facility configuration"
+# endif
+#else /* No threads */
+  inline void _M_initialize() {}
+  inline void _M_destroy() {}
+  inline void _M_acquire_lock() {}
+  inline void _M_release_lock() {}
+#endif // _STLP_PTHREADS
+};
+
+
+
+#if defined (_STLP_MUTEX_NEEDS_ONDEMAND_INITIALIZATION)
+// for use in _STLP_mutex, our purposes do not require ondemand initialization
+// also, mutex_base may use some hacks to determine uninitialized state by zero data, which only works for globals.
+class _STLP_CLASS_DECLSPEC _STLP_mutex_nodemand : public _STLP_mutex_base {
+  inline void _M_acquire_lock() { 
+    _M_acquire_lock_nodemand();
+  }
+};
+#else
+typedef _STLP_mutex_base _STLP_mutex_nodemand;
+#endif
+
+
+// Locking class.  The constructor initializes the lock, the destructor destroys it.
+// Well - behaving class, does not need static initializer
+class _STLP_CLASS_DECLSPEC _STLP_mutex : public _STLP_mutex_nodemand {
+  public:
+    inline _STLP_mutex () { _M_initialize(); }
+    inline ~_STLP_mutex () { _M_destroy(); }
+  private:
+    _STLP_mutex(const _STLP_mutex&);
+    void operator=(const _STLP_mutex&);
+};
+
+#if 0 /* def _STLP_DEBUG */
+/*
+ * Recursive Safe locking class.
+*/
+# ifndef _STLP_THREADS
+class _STLP_mutex_RS
+{};
+# else
+class _STLP_CLASS_DECLSPEC _STLP_mutex_RS : public _STLP_mutex
+{
+  public:
+    _STLP_mutex_RS()
+      : _count( 0 )
+#  if defined(_STLP_UITHREADS)
+        ,_id( __STATIC_CAST(thread_t,-1) )
+#  elif defined(_STLP_PTHREADS)
+#   if !defined(__FreeBSD__) && !defined(__DECCXX)
+        ,_id( __STATIC_CAST(pthread_t,-1) )
+#   else
+        ,_id( __STATIC_CAST(pthread_t,0) )
+#   endif /*__FreeBSD__*/
+#  elif defined(__FIT_NOVELL_THREADS)
+        ,_id( -1 )
+#  elif defined(_STLP_WIN32THREADS)
+        ,_id( NULL )
+#  else
+#   error "New _STLP_mutex_RS class not yet ported to this platform"
+#  endif
+    {}
+
+    ~_STLP_mutex_RS()
+    {}
+
+    void _M_acquire_lock() {
+#  if defined(_STLP_PTHREADS)
+      pthread_t _c_id = pthread_self();
+#  elif defined(_STLP_UITHREADS)
+      thread_t _c_id = thr_self();
+#  elif defined(__FIT_NOVELL_THREADS)
+      int _c_id = GetThreadID();
+#  elif defined(_STLP_WIN32THREADS)
+      DWORD _c_id = GetCurrentThreadId();
+#  endif
+      if ( _c_id == _id ) {
+        ++_count;
+        return;
+      }
+      _STLP_mutex::_M_acquire_lock();
+      _id = _c_id;
+      ++_count;
+    }
+
+    void _M_release_lock() {
+      if ( --_count == 0 ) {
+#  if defined(_STLP_UITHREADS)
+        _id = __STATIC_CAST(thread_t,-1);
+#  elif defined(_STLP_PTHREADS)
+#   if !defined(__FreeBSD__) && !defined(__DECCXX)
+        _id =  __STATIC_CAST(pthread_t,-1);
+#   else
+        _id =  __STATIC_CAST(pthread_t,0);
+#   endif /*__FreeBSD__*/
+#  elif defined(__FIT_NOVELL_THREADS)
+        _id = -1;
+#  elif defined(_STLP_WIN32THREADS)
+        _id = NULL;
+#  endif
+        _STLP_mutex::_M_release_lock();
+      }
+    }
+
+  protected:
+    unsigned int _count;
+
+#  if defined(_STLP_PTHREADS)
+    pthread_t _id;
+#  elif defined(_STLP_UITHREADS)
+    thread_t  _id;
+#  elif defined(__FIT_NOVELL_THREADS)
+    int _id;
+#  elif defined(_STLP_WIN32THREADS)
+    DWORD _id;
+#  endif
+};
+
+# endif /* _STLP_THREADS */
+
+#endif /* OBSOLETE, _STLP_DEBUG */
+
+
+/*
+ * Class _Refcount_Base provides a type, __stl_atomic_t, a data member,
+ * _M_ref_count, and member functions _M_incr and _M_decr, which perform
+ * atomic preincrement/predecrement.  The constructor initializes 
+ * _M_ref_count.
+ */
+struct _STLP_CLASS_DECLSPEC _Refcount_Base
+{
+  // The data member _M_ref_count
+  volatile __stl_atomic_t _M_ref_count;
+
+# if !defined (_STLP_ATOMIC_EXCHANGE)
+  _STLP_mutex _M_mutex;
+# endif
+
+  // Constructor
+  _Refcount_Base(__stl_atomic_t __n) : _M_ref_count(__n) {}
+
+  // _M_incr and _M_decr
+# if defined (_STLP_THREADS) && defined (_STLP_ATOMIC_EXCHANGE)
+   void _M_incr() { _STLP_ATOMIC_INCREMENT((__stl_atomic_t*)&_M_ref_count); }
+   void _M_decr() { _STLP_ATOMIC_DECREMENT((__stl_atomic_t*)&_M_ref_count); }
+# elif defined(_STLP_THREADS)
+  void _M_incr() {
+    _M_mutex._M_acquire_lock();
+    ++_M_ref_count;
+    _M_mutex._M_release_lock();
+  }
+  void _M_decr() {
+    _M_mutex._M_acquire_lock();
+    --_M_ref_count;
+    _M_mutex._M_release_lock();
+  }
+# else  /* No threads */
+  void _M_incr() { ++_M_ref_count; }
+  void _M_decr() { --_M_ref_count; }
+# endif
+};
+
+// Atomic swap on unsigned long
+// This is guaranteed to behave as though it were atomic only if all
+// possibly concurrent updates use _Atomic_swap.
+// In some cases the operation is emulated with a lock.
+# if defined (_STLP_THREADS)
+#  ifdef _STLP_ATOMIC_EXCHANGE
+inline __stl_atomic_t _Atomic_swap(volatile __stl_atomic_t * __p, __stl_atomic_t __q) {
+  return (__stl_atomic_t) _STLP_ATOMIC_EXCHANGE(__p,__q);
+}
+#  elif defined(_STLP_PTHREADS) || defined (_STLP_UITHREADS) || defined (_STLP_OS2THREADS) || defined(_STLP_USE_PTHREAD_SPINLOCK)
+// We use a template here only to get a unique initialized instance.
+template<int __dummy>
+struct _Swap_lock_struct {
+  static _STLP_STATIC_MUTEX _S_swap_lock;
+};
+
+
+// This should be portable, but performance is expected
+// to be quite awful.  This really needs platform specific
+// code.
+inline __stl_atomic_t _Atomic_swap(volatile __stl_atomic_t * __p, __stl_atomic_t __q) {
+  _Swap_lock_struct<0>::_S_swap_lock._M_acquire_lock();
+  __stl_atomic_t __result = *__p;
+  *__p = __q;
+  _Swap_lock_struct<0>::_S_swap_lock._M_release_lock();
+  return __result;
+}
+#  endif // _STLP_PTHREADS || _STLP_UITHREADS || _STLP_OS2THREADS || _STLP_USE_PTHREAD_SPINLOCK
+# else // !_STLP_THREADS
+/* no threads */
+static inline __stl_atomic_t  _STLP_CALL
+_Atomic_swap(volatile __stl_atomic_t * __p, __stl_atomic_t __q) {
+  __stl_atomic_t __result = *__p;
+  *__p = __q;
+  return __result;
+}
+# endif // _STLP_THREADS
+
+// A locking class that uses _STLP_STATIC_MUTEX.  The constructor takes
+// a reference to an _STLP_STATIC_MUTEX, and acquires a lock.  The destructor
+// releases the lock.
+
+struct _STLP_CLASS_DECLSPEC _STLP_auto_lock
+{
+  _STLP_STATIC_MUTEX& _M_lock;
+  
+  _STLP_auto_lock(_STLP_STATIC_MUTEX& __lock) : _M_lock(__lock)
+    { _M_lock._M_acquire_lock(); }
+  ~_STLP_auto_lock() { _M_lock._M_release_lock(); }
+
+private:
+  void operator=(const _STLP_auto_lock&);
+  _STLP_auto_lock(const _STLP_auto_lock&);
+};
+
+typedef _STLP_auto_lock _STLP_mutex_lock;
+
+#ifdef _STLP_BETHREADS
+
+template <int __inst>
+struct _STLP_beos_static_lock_data
+{
+	static bool is_init;
+	struct mutex_t : public _STLP_mutex
+	{
+		mutex_t()
+		{
+			_STLP_beos_static_lock_data<0>::is_init = true;
+		}
+		~mutex_t()
+		{
+			_STLP_beos_static_lock_data<0>::is_init = false;
+		}
+	};
+	static mutex_t mut;
+};
+
+template <int __inst>
+bool _STLP_beos_static_lock_data<__inst>::is_init = false;
+template <int __inst>
+typename _STLP_beos_static_lock_data<__inst>::mutex_t _STLP_beos_static_lock_data<__inst>::mut;
+
+
+inline void _STLP_mutex_base::_M_acquire_lock() 
+{
+	if(sem == 0)
+	{
+		// we need to initialise on demand here
+		// to prevent race conditions use our global
+		// mutex if it's available:
+		if(_STLP_beos_static_lock_data<0>::is_init)
+		{
+			_STLP_auto_lock al(_STLP_beos_static_lock_data<0>::mut);
+			if(sem == 0) _M_initialize();
+		}
+		else
+		{
+			// no lock available, we must still be
+			// in startup code, THERE MUST BE ONE THREAD
+			// ONLY active at this point.
+			_M_initialize();
+		}
+	}
+	_M_acquire_lock_nodemand();
+}
+
+#endif
+
+_STLP_END_NAMESPACE
+
+# if !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_threads.c>
+# endif
+
+#endif /* _STLP_INTERNAL_THREADS_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/_time_facets.c b/main/source/stlport/stlport/stl/_time_facets.c
new file mode 100644
index 00000000..9dd991e3
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_time_facets.c
@@ -0,0 +1,497 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+#ifndef _STLP_TIME_FACETS_C
+#define _STLP_TIME_FACETS_C
+
+#ifndef _STLP_INTERNAL_TIME_FACETS_H
+# include <stl/_time_facets.h>
+#endif
+
+#if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION)
+
+#ifndef _STLP_INTERNAL_NUM_PUT_H
+# include <stl/_num_put.h>
+#endif
+
+#ifndef _STLP_INTERNAL_NUM_GET_H
+# include <stl/_num_get.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+//----------------------------------------------------------------------
+// Declarations of static template members.
+# if ( _STLP_STATIC_TEMPLATE_DATA > 0 )
+
+template <class _CharT, class _InputIterator>
+locale::id time_get<_CharT, _InputIterator>::id;
+
+template <class _CharT, class _OutputIterator>
+locale::id time_put<_CharT, _OutputIterator>::id;
+
+# else /* ( _STLP_STATIC_TEMPLATE_DATA > 0 ) */
+
+typedef time_get<char, const char*> time_get_char;
+typedef time_get<char, char*> time_get_char_2;
+typedef time_get<char, istreambuf_iterator<char, char_traits<char> > > time_get_char_3;
+typedef time_put<char, const char*> time_put_char;
+typedef time_put<char, char*> time_put_char_2;
+typedef time_put<char, ostreambuf_iterator<char, char_traits<char> > > time_put_char_3;
+
+__DECLARE_INSTANCE(locale::id, time_get_char::id, );
+__DECLARE_INSTANCE(locale::id, time_get_char_2::id, );
+__DECLARE_INSTANCE(locale::id, time_get_char_3::id, );
+__DECLARE_INSTANCE(locale::id, time_put_char::id, );
+__DECLARE_INSTANCE(locale::id, time_put_char_2::id, );
+__DECLARE_INSTANCE(locale::id, time_put_char_3::id, );
+
+# ifndef _STLP_NO_WCHAR_T
+
+typedef time_get<wchar_t, const wchar_t*> time_get_wchar_t;
+typedef time_get<wchar_t, wchar_t*> time_get_wchar_t_2;
+typedef time_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > > time_get_wchar_t_3;
+typedef time_put<wchar_t, const wchar_t*> time_put_wchar_t;
+typedef time_put<wchar_t, wchar_t*> time_put_wchar_t_2;
+typedef time_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > > time_put_wchar_t_3;
+
+__DECLARE_INSTANCE(locale::id, time_get_wchar_t::id, );
+__DECLARE_INSTANCE(locale::id, time_get_wchar_t_2::id, );
+__DECLARE_INSTANCE(locale::id, time_get_wchar_t_3::id, );
+__DECLARE_INSTANCE(locale::id, time_put_wchar_t::id, );
+__DECLARE_INSTANCE(locale::id, time_put_wchar_t_2::id, );
+__DECLARE_INSTANCE(locale::id, time_put_wchar_t_3::id, );
+
+# endif
+
+# endif /* ( _STLP_STATIC_TEMPLATE_DATA > 0 ) */
+
+template <class _InIt, class _RAIt, class _DiffType>
+_RAIt _STLP_CALL
+__match(_InIt& __first, _InIt& __last, _RAIt __name, _RAIt __name_end, _DiffType*) {
+  typedef _DiffType difference_type;
+  difference_type __n = __name_end - __name;
+  size_t __max_pos = 0;
+  difference_type __i;
+  difference_type __pos = 0;
+  difference_type __check_count = __n;
+  bool __do_check[_MAXNAMES];
+  _RAIt __matching_name[_MAX_NAME_LENGTH];
+
+  for (__i = 0; __i < __n; ++__i)
+    __max_pos = (max)(__max_pos,  __name[__i].size());
+
+  for (__i = 0; __i < _MAXNAMES; ++__i)
+    __do_check[__i] = true;
+
+
+
+  for (__i = 0; __i < _MAX_NAME_LENGTH; ++__i)
+    __matching_name[__i] = __name_end;
+
+  while (__first != __last) {
+    for (__i = 0; __i < __n; ++__i)
+      if (__do_check[__i])
+        if (*__first == __name[__i][__pos]) {
+          if (__pos == _DiffType(__name[__i].size()) - 1) {
+            __do_check[__i] = 0;
+            __matching_name[__pos+1] = __name + __i;
+            --__check_count;
+            if (__check_count == 0) {
+              ++__first; 
+	      return __name + __i;
+	    }
+          }
+        }
+        else {
+          __do_check[__i] = 0;
+          --__check_count;
+          if (__check_count == 0) 
+            return __matching_name[__pos];
+        }
+
+    ++__first; ++__pos;
+  }
+
+  return __matching_name[__pos];
+}
+
+template <class _InIt, class _RAIt>
+_RAIt _STLP_CALL
+__match(_InIt& __first, _InIt& __last, _RAIt __name, _RAIt __name_end) {
+  return __match((_InIt&)__first, (_InIt&)__last, __name, __name_end, _STLP_DISTANCE_TYPE(__name, _InIt));
+}
+
+// __get_formatted_time reads input that is assumed to be formatted
+// according to the rules for the C strftime function (C standard,
+// 7.12.3.5).  This function is used to implement the do_get_time
+// and do_get_date virtual functions, which depend on the locale
+// specifications for the time and day formats respectively.
+// Note the catchall default case, intended mainly for the '%Z'
+// format designator, which does not make sense here since the
+// representation of timezones is not part of the locale.
+//
+// The case branches are implemented either by doing a match using
+// the appopriate name table or by doing a __get_integer_nogroup.
+//
+// 'y' format is assumed to mean that the input represents years
+// since 1900.  That is, 2002 should be represented as 102.  There
+// is no century-guessing.
+//
+// The match is successful if and only if the second component of the
+// return value is format_end.
+
+// Note that the antepenultimate parameter is being used only to determine
+// the correct overloading for the calls to __get_integer_nogroup.
+
+template <class _InIt1, class _InIt2 /* , class _Ch */ >
+_InIt2 _STLP_CALL
+__get_formatted_time _STLP_WEAK (_InIt1 __first,  _InIt1 __last,
+                     _InIt2 __format, _InIt2 __format_end,
+				 /* _Ch, */ const _Time_Info& __table,
+		     ios_base::iostate& __err,
+                     tm*         __t) {
+  while(__first != __last && __format != __format_end) {
+    if (*__format == '%') {
+      ++__format;
+      char __c = *__format;
+      switch (__c) {
+        case 'a': {
+          const string* __pr =
+            __match(__first, __last,
+		    (string*)__table._M_dayname + 0 , (string*)__table._M_dayname + 7);
+            if (__pr == (string*)__table._M_dayname + 7)
+              return __format;
+            __t->tm_wday = (int)(__pr - (string*)__table._M_dayname);
+            break;
+        }
+
+        case 'A': {
+          const string* __pr =
+            __match(__first, __last,
+		    (string*)__table._M_dayname + 7, (string*)__table._M_dayname + 14);
+            if (__pr == (string*)__table._M_dayname + 14)
+              return __format;
+            __t->tm_wday = (int)(__pr - (string*)__table._M_dayname - 7);
+            break;
+        }
+
+        case 'b': {
+          const string* __pr =
+            __match(__first, __last,
+		    (string*)__table._M_monthname + 0, (string*)__table._M_monthname + 12);
+            if (__pr == (string*)__table._M_monthname + 12)
+              return __format;
+            __t->tm_mon = (int)(__pr - (string*)__table._M_monthname);
+            break;
+        }
+
+        case 'B': {
+          const string* __pr =
+            __match(__first, __last,
+		    (string*)__table._M_monthname + 12, (string*)__table._M_monthname + 24);
+            if (__pr == (string*)__table._M_monthname + 24)
+              return __format;
+            __t->tm_mon = (int)(__pr - (string*)__table._M_monthname - 12);
+            break;
+        }
+
+        case 'd': {
+          bool __pr =
+            __get_decimal_integer(__first, __last, __t->tm_mday);
+          if (!__pr || __t->tm_mday < 1 || __t->tm_mday > 31) {
+	    __err |= ios_base::failbit;
+            return __format;
+	  }
+          break;
+        }
+        
+        case 'H': case 'I': {
+          bool __pr =
+            __get_decimal_integer(__first, __last, __t->tm_hour);
+            if (!__pr)
+              return __format;
+            break;
+        }
+
+        case 'j': {
+          bool __pr =
+            __get_decimal_integer(__first, __last, __t->tm_yday);
+          if (!__pr)
+            return __format;
+          break;
+        }
+
+        case 'm': {
+          bool __pr =
+            __get_decimal_integer(__first, __last, __t->tm_mon);
+	    --__t->tm_mon;
+          if (!__pr || __t->tm_mon < 0 || __t->tm_mon > 11) {
+	    __err |= ios_base::failbit;
+            return __format;
+	  }
+          break;
+        }
+
+        case 'M': {
+          bool __pr =
+            __get_decimal_integer(__first, __last, __t->tm_min);
+          if (!__pr)
+            return __format;
+          break;
+        }
+
+        case 'p': {
+          const string* __pr =
+            __match(__first, __last, (string*)__table._M_am_pm + 0, (string*)__table._M_am_pm + 2);
+          if (__pr == (string*)__table._M_am_pm + 2)
+            return __format;
+          if (__pr == (string*)__table._M_am_pm + 1)
+            __t->tm_hour += 12;
+          break;
+        }
+
+        case 'S': {
+          bool __pr =
+            __get_decimal_integer(__first, __last, __t->tm_sec);
+          if (!__pr)
+            return __format;
+          break;
+        }
+
+	case 'y': {
+	  bool __pr =
+	    __get_decimal_integer(__first, __last, __t->tm_year);
+	  if (!__pr)
+	    return __format;
+	  break;
+        }
+
+        case 'Y': {
+	  bool __pr =
+            __get_decimal_integer(__first, __last, __t->tm_year);
+          __t->tm_year -= 1900;
+          if (!__pr)
+            return __format;
+          break;
+        }
+
+        default:
+          break;
+      }
+
+    }
+    else {
+      if (*__first++ != *__format) break;
+    }
+    
+    ++__format;
+  }
+
+  return __format;
+}
+
+template <class _InIt>
+bool _STLP_CALL
+__get_short_or_long_dayname(_InIt& __first, _InIt& __last,
+                            const _Time_Info& __table, tm* __t) {
+  const string* __pr =
+    __match(__first, __last, __table._M_dayname + 0, __table._M_dayname + 14);
+  __t->tm_wday = (int)(__pr - __table._M_dayname) % 7;
+  return __pr != __table._M_dayname + 14;
+}
+
+template <class _InIt>
+bool _STLP_CALL
+__get_short_or_long_monthname(_InIt& __first, _InIt& __last,
+                              const _Time_Info& __table, tm* __t) {
+  const string* __pr =
+    __match(__first, __last, (string*)__table._M_monthname + 0, (string*)__table._M_monthname + 24);
+  __t->tm_mon = (int)(__pr - __table._M_monthname) % 12;
+  return __pr != __table._M_monthname + 24;
+}
+
+# ifndef _STLP_NO_WCHAR_T
+template <class _OuIt>
+_OuIt _STLP_CALL
+__put_time(char * __first, char * __last, _OuIt __out,
+           const ios_base& __s, wchar_t) {
+    const ctype<wchar_t>& __ct = *(ctype<wchar_t>*)__s._M_ctype_facet();
+    wchar_t __wbuf[64];
+    __ct.widen(__first, __last, __wbuf);
+    ptrdiff_t __len = __last - __first;
+    wchar_t * __eend = __wbuf + __len;
+    return copy((wchar_t*)__wbuf, __eend, __out);
+}
+# endif
+
+template <class _Ch, class _InIt>
+_InIt
+time_get<_Ch, _InIt>::do_get_date(_InIt __s, _InIt  __end,
+				  ios_base& /* __str */, ios_base::iostate&  __err,
+				  tm* __t) const 
+{
+  typedef string::const_iterator string_iterator;
+
+  string_iterator __format
+    = _M_timeinfo._M_date_format.begin();
+  string_iterator __format_end
+    = _M_timeinfo._M_date_format.end();
+  
+  string_iterator __result
+    = __get_formatted_time(__s, __end, __format, __format_end,
+                           /* _Ch() ,*/  _M_timeinfo, __err, __t);
+  if (__result == __format_end)
+    __err = ios_base::goodbit;
+  else {
+    __err = ios_base::failbit;
+    if (__s == __end)
+      __err |= ios_base::eofbit;
+  }
+  return __s;
+}
+
+template <class _Ch, class _InIt>
+_InIt
+time_get<_Ch, _InIt>::do_get_time(_InIt __s, _InIt  __end,
+				  ios_base& /* __str */, ios_base::iostate&  __err,
+				  tm* __t) const 
+{
+  typedef string::const_iterator string_iterator;
+  string_iterator __format
+    = _M_timeinfo._M_time_format.begin();
+  string_iterator __format_end
+    = _M_timeinfo._M_time_format.end();
+  
+  string_iterator __result
+    = __get_formatted_time(__s, __end, __format, __format_end,
+			   /* _Ch() , */ _M_timeinfo, __err, __t);
+  __err = __result == __format_end ? ios_base::goodbit 
+    : ios_base::failbit;
+  if (__s == __end)
+    __err |= ios_base::eofbit;
+  return __s;
+}
+
+template <class _Ch, class _InIt>
+_InIt
+time_get<_Ch, _InIt>::do_get_year(_InIt __s, _InIt  __end,
+				  ios_base&, 
+				  ios_base::iostate&  __err,
+				  tm* __t) const
+{
+  
+  if (__s == __end) {
+    __err = ios_base::failbit | ios_base::eofbit;
+    return __s;
+  }
+  
+  bool __pr =  __get_decimal_integer(__s, __end, __t->tm_year);
+  __t->tm_year -= 1900;
+  __err = __pr ? ios_base::goodbit : ios_base::failbit;
+  if (__s == __end)
+    __err |= ios_base::eofbit;
+  
+  return __s;
+}
+
+template <class _Ch, class _InIt>
+_InIt
+time_get<_Ch, _InIt>::do_get_weekday(_InIt __s, _InIt  __end,
+				     ios_base& /* __str */, 
+				     ios_base::iostate&  __err,
+				     tm* __t) const 
+{
+    bool __result =
+      __get_short_or_long_dayname(__s, __end, _M_timeinfo, __t);
+    if (__result)
+      __err = ios_base::goodbit;
+    else {
+      __err = ios_base::failbit;
+      if (__s == __end)
+        __err |= ios_base::eofbit;
+    }
+    return __s;
+}
+
+template <class _Ch, class _InIt>
+_InIt
+time_get<_Ch, _InIt>::do_get_monthname(_InIt __s, _InIt  __end,
+				       ios_base& /* __str */, 
+				       ios_base::iostate&  __err,
+				       tm* __t) const 
+{
+  bool __result =
+    __get_short_or_long_monthname(__s, __end, _M_timeinfo, __t);
+  if (__result)
+    __err = ios_base::goodbit;
+  else {
+    __err = ios_base::failbit;
+    if (__s == __end)
+      __err |= ios_base::eofbit;
+  }
+  return __s;
+}
+
+template<class _Ch, class _OutputIter>
+_OutputIter
+time_put<_Ch,_OutputIter>::put(_OutputIter __s, ios_base& __f, _Ch __fill,
+			       const tm* __tmb,
+			       const _Ch* __pat, const _Ch* __pat_end) const 
+{
+  //  locale __loc = __f.getloc();
+  //  const ctype<_Ch>& _Ct = use_facet<ctype<_Ch> >(__loc); 
+  const ctype<_Ch>& _Ct = *(ctype<_Ch>*)__f._M_ctype_facet(); 
+  while (__pat != __pat_end) {
+    char __c = _Ct.narrow(*__pat, 0);
+    if (__c == '%') {
+      char __mod = 0;
+      ++__pat;
+      __c = _Ct.narrow(*__pat++, 0);
+      if(__c == '#') { // MS extension
+        __mod = __c;
+        __c = _Ct.narrow(*__pat++, 0);
+      }
+      __s = do_put(__s, __f, __fill, __tmb, __c, __mod);
+    }
+    else
+      *__s++ = *__pat++;
+  }
+  return __s;
+}
+
+template<class _Ch, class _OutputIter>
+_OutputIter
+time_put<_Ch,_OutputIter>::do_put(_OutputIter __s, ios_base& __f, _Ch     /* __fill */ ,
+				  const tm* __tmb,
+				  char __format, char __modifier ) const 
+{
+  char __buf[64];
+  char * __iend = __write_formatted_time(__buf, __format, __modifier,
+					 _M_timeinfo, __tmb);
+  //  locale __loc = __f.getloc();
+  return __put_time(__buf, __iend, __s, __f, _Ch());
+}
+
+_STLP_END_NAMESPACE
+
+# endif /* defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION) */
+#endif /* _STLP_TIME_FACETS_C */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_time_facets.h b/main/source/stlport/stlport/stl/_time_facets.h
new file mode 100644
index 00000000..b8c56f3d
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_time_facets.h
@@ -0,0 +1,315 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+// WARNING: This is an internal header file, included by other C++
+// standard library headers.  You should not attempt to use this header
+// file directly.
+
+
+#ifndef _STLP_INTERNAL_TIME_FACETS_H
+#define _STLP_INTERNAL_TIME_FACETS_H
+
+#ifndef _STLP_CTIME
+# include <ctime>                // Needed (for struct tm) by time facets
+#endif
+
+#include <stl/c_locale.h>
+#include <stl/_ios_base.h>
+
+_STLP_BEGIN_NAMESPACE
+
+// Template functions used by time_get
+
+// Matching input against a list of names
+
+// Alphabetic input of the names of months and the names
+// of weekdays requires matching input against a list of names.
+// We use a simple generic algorithm to accomplish this.  This
+// algorithm is not very efficient, especially for longer lists
+// of names, but it probably does not matter for the initial
+// implementation and it may never matter, since we do not expect
+// this kind of input to be used very often.  The algorithm
+// could be improved fairly simply by creating a new list of
+// names still in the running at each iteration.  A more sophisticated
+// approach would be to build a trie to do the matching.
+//
+// We compare each character of the input to the corresponding
+// character of each name on the list that has not been eliminated,
+// either because every character in the name has already been
+// matched, or because some character has not been matched.  We
+// continue only as long as there are some names that have not been
+// eliminated.
+
+// We do not really need a random access iterator (a forward iterator
+// would do), but the extra generality makes the notation clumsier,
+// and we don't really need it.
+
+// We can recognize a failed match by the fact that the second
+// component of the return value will be __name_end.
+
+#define _MAXNAMES        64
+#define _MAX_NAME_LENGTH 64
+
+// Both time_get and time_put need a structure of type _Time_Info
+// to provide names and abbreviated names for months and days,
+// as well as the am/pm designator.  The month and weekday tables
+// have the all the abbreviated names before all the full names.
+// The _Time_Info tables are initialized using the non-template
+// function _Init_timeinfo, which has two overloadings:  one
+// with a single reference parameter for the table to be initialized,
+// and one with a second _Locale_time * parameter.  The first form
+// is called by the default constructor and the second by a special
+// constructor invoked from the _byname subclass constructor to
+// construct the base class.
+
+class _STLP_CLASS_DECLSPEC _Time_Info {
+public:
+  string _M_dayname[14];
+  string _M_monthname[24];
+  string _M_am_pm[2];
+  string _M_time_format;
+  string _M_date_format;
+  string _M_date_time_format;
+  string _M_long_date_format;
+  string _M_long_date_time_format;
+};
+
+void _STLP_CALL _Init_timeinfo(_Time_Info&);
+void _STLP_CALL _Init_timeinfo(_Time_Info&, _Locale_time*);
+
+class _STLP_CLASS_DECLSPEC time_base {
+public:
+  enum dateorder {no_order, dmy, mdy, ymd, ydm};
+};
+
+
+template <class _Ch, __DFL_TMPL_PARAM( _InIt , istreambuf_iterator<_Ch>) >
+class time_get : public locale::facet, public time_base 
+{
+  friend class _Locale;
+
+public:
+  typedef _Ch   char_type;
+  typedef _InIt iter_type;
+
+  explicit time_get(size_t __refs = 0)   : _BaseFacet(__refs) {
+      _Init_timeinfo(_M_timeinfo);
+  }
+  dateorder date_order() const { return do_date_order(); }
+  iter_type get_time(iter_type __s, iter_type  __end, ios_base&  __str,
+                     ios_base::iostate&  __err, tm* __t) const
+    { return do_get_time(__s,  __end,  __str,  __err, __t); }
+  iter_type get_date(iter_type __s, iter_type  __end, ios_base&  __str,
+                     ios_base::iostate&  __err, tm* __t) const
+    { return do_get_date(__s,  __end,  __str,  __err, __t); }
+  iter_type get_weekday(iter_type __s, iter_type  __end, ios_base&  __str,
+                        ios_base::iostate&  __err, tm* __t) const
+    { return do_get_weekday(__s,  __end,  __str,  __err, __t); }
+  iter_type get_monthname(iter_type __s, iter_type  __end, ios_base&  __str,
+                          ios_base::iostate&  __err, tm* __t) const
+    { return do_get_monthname(__s,  __end,  __str,  __err, __t); }
+  iter_type get_year(iter_type __s, iter_type  __end, ios_base&  __str,
+                     ios_base::iostate&  __err, tm* __t) const
+    { return do_get_year(__s,  __end,  __str,  __err, __t); }
+
+  _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
+
+protected:
+  _Time_Info _M_timeinfo;
+
+  time_get(_Locale_time *, size_t __refs) : _BaseFacet(__refs) {}
+
+  ~time_get() {}
+
+  virtual dateorder do_date_order() const {return no_order;}
+    
+  virtual iter_type do_get_time(iter_type __s, iter_type  __end,
+                                ios_base&, ios_base::iostate&  __err,
+                                tm* __t) const;
+    
+  virtual iter_type do_get_date(iter_type __s, iter_type  __end,
+                                ios_base&, ios_base::iostate& __err,
+                                tm* __t) const;
+
+  virtual iter_type do_get_weekday(iter_type __s, iter_type  __end,
+                                   ios_base&,
+                                   ios_base::iostate& __err,
+                                   tm* __t) const;
+  virtual iter_type do_get_monthname(iter_type __s, iter_type  __end,
+                                     ios_base&,
+                                     ios_base::iostate& __err,
+                                     tm* __t) const;
+  
+  virtual iter_type do_get_year(iter_type __s, iter_type  __end,
+                                ios_base&, ios_base::iostate& __err,
+                                tm* __t) const;
+};
+
+time_base::dateorder _STLP_CALL
+__get_date_order(_Locale_time*);
+_Locale_time* _STLP_CALL __acquire_time(const char* __name);
+void          _STLP_CALL __release_time(_Locale_time* __time);
+
+template <class _Ch, __DFL_TMPL_PARAM( _InIt , istreambuf_iterator<_Ch>) >
+class time_get_byname : public time_get<_Ch, _InIt> 
+{
+public:
+  typedef  time_base::dateorder dateorder;
+  typedef _InIt                 iter_type;
+
+  explicit time_get_byname(const char* __name, size_t __refs = 0)
+    : time_get<_Ch, _InIt>((_Locale_time*) 0, __refs),
+      _M_time(__acquire_time(__name))
+    { _Init_timeinfo(this->_M_timeinfo, this->_M_time); }
+
+protected:
+  ~time_get_byname() { __release_time(_M_time); }
+  dateorder do_date_order() const { return __get_date_order(_M_time); }
+private:
+  _Locale_time* _M_time;
+};
+
+// time_put facet
+
+// For the formats 'x, 'X', and 'c', do_put calls the first form of
+// put with the pattern obtained from _M_timeinfo._M_date_format or
+// _M_timeinfo._M_time_format.
+
+// Helper function:  __  takes a single-character
+// format.  As indicated by the foregoing remark, this will never be
+// 'x', 'X', or 'c'.
+
+char * _STLP_CALL
+__write_formatted_time(char * __buf, char __format, char __modifier,
+                       const _Time_Info& __table, const tm* __t);
+
+template <class _OuIt>
+inline _OuIt _STLP_CALL __put_time(char * __first, char * __last, _OuIt __out,
+                                   const ios_base& /* __loc */, char) {
+    return copy(__first, __last, __out);
+}
+
+# ifndef _STLP_NO_WCHAR_T
+template <class _OuIt>
+_OuIt _STLP_CALL __put_time(char * __first, char * __last, _OuIt __out,
+                            const ios_base& __s, wchar_t);
+# endif
+
+template<class _Ch, __DFL_TMPL_PARAM( _OutputIter , ostreambuf_iterator<_Ch> ) >
+class time_put : public locale::facet, public time_base
+{
+  friend class _Locale;
+public:
+  typedef _Ch      char_type;
+  typedef _OutputIter iter_type;
+
+  explicit time_put(size_t __refs = 0) : _BaseFacet(__refs) {
+    _Init_timeinfo(_M_timeinfo);
+  }
+
+  _OutputIter put(iter_type __s, ios_base& __f, _Ch __fill,
+		  const tm* __tmb,
+		  const _Ch* __pat, const _Ch* __pat_end) const;
+  
+  _OutputIter put(iter_type __s, ios_base& __f, _Ch  __fill,
+		  const tm* __tmb, char __format, char __modifier = 0) const { 
+    return do_put(__s, __f,  __fill, __tmb, __format, __modifier); 
+  }
+  
+  _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
+  
+protected:
+  _Time_Info _M_timeinfo;
+
+  time_put(_Locale_time* /*__time*/, size_t __refs) : _BaseFacet(__refs) {
+    //    _Init_timeinfo(_M_timeinfo, __time);
+  }
+
+  ~time_put() {}
+  virtual iter_type do_put(iter_type __s, ios_base& __f,
+                           char_type  /* __fill */, const tm* __tmb,
+                           char __format, char /* __modifier */) const;
+};
+
+template <class _Ch, __DFL_TMPL_PARAM( _InIt , ostreambuf_iterator<_Ch> ) >
+class time_put_byname : public time_put<_Ch, _InIt> 
+{
+  friend class _Locale;
+public:
+  typedef time_base::dateorder dateorder;
+  typedef _InIt iter_type;
+  typedef _Ch   char_type;
+
+  explicit time_put_byname(const char * __name, size_t __refs = 0)
+    : time_put<_Ch, _InIt>((_Locale_time*) 0, __refs),
+    _M_time(__acquire_time(__name))
+  { _Init_timeinfo(this->_M_timeinfo, this->_M_time); }
+  
+protected:
+  ~time_put_byname() { __release_time(_M_time); }
+
+private:
+  _Locale_time* _M_time;
+};
+
+# ifdef _STLP_USE_TEMPLATE_EXPORT
+_STLP_EXPORT_TEMPLATE_CLASS time_get<char, istreambuf_iterator<char, char_traits<char> > >;
+_STLP_EXPORT_TEMPLATE_CLASS time_put<char, ostreambuf_iterator<char, char_traits<char> > >;
+// _STLP_EXPORT_TEMPLATE_CLASS time_get<char, const char*>;
+// _STLP_EXPORT_TEMPLATE_CLASS time_put<char, char*>;
+#  ifndef _STLP_NO_WCHAR_T
+_STLP_EXPORT_TEMPLATE_CLASS time_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >;
+_STLP_EXPORT_TEMPLATE_CLASS time_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >;
+// _STLP_EXPORT_TEMPLATE_CLASS time_get<wchar_t, const wchar_t*>;
+// _STLP_EXPORT_TEMPLATE_CLASS time_put<wchar_t, wchar_t*>;
+#  endif /* INSTANTIATE_WIDE_STREAMS */
+
+# endif
+
+# if defined (__BORLANDC__) && defined (_RTLDLL)
+inline void _Stl_loc_init_time_facets() {
+  
+  time_get<char, istreambuf_iterator<char, char_traits<char> > >::id._M_index                      = 16;
+  time_get<char, const char*>::id._M_index         = 17;
+  time_put<char, ostreambuf_iterator<char, char_traits<char> > >::id._M_index                      = 18;
+  time_put<char, char*>::id._M_index               = 19;
+  
+# ifndef _STLP_NO_WCHAR_T
+  
+  time_get<wchar_t, istreambuf_iterator<wchar_t, char_traits<wchar_t> > >::id._M_index                   = 35;
+  time_get<wchar_t, const wchar_t*>::id._M_index   = 36;
+  time_put<wchar_t, ostreambuf_iterator<wchar_t, char_traits<wchar_t> > >::id._M_index                   = 37;
+  time_put<wchar_t, wchar_t*>::id._M_index         = 38;
+  
+# endif
+  
+}
+# endif
+
+_STLP_END_NAMESPACE
+
+#if defined (_STLP_EXPOSE_STREAM_IMPLEMENTATION) && !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_time_facets.c>
+# endif
+
+#endif /* _STLP_INTERNAL_TIME_FACETS_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
+
diff --git a/main/source/stlport/stlport/stl/_tree.c b/main/source/stlport/stlport/stl/_tree.c
new file mode 100644
index 00000000..0cf30dce
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_tree.c
@@ -0,0 +1,715 @@
+/*
+ *
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ * Modified CRP 7/10/00 for improved conformance / efficiency on insert_unique /
+ * insert_equal with valid hint -- efficiency is improved all around, and it is
+ * should now be standard conforming for complexity on insert point immediately
+ * after hint (amortized constant time).
+ *
+ */
+#ifndef _STLP_TREE_C
+#define _STLP_TREE_C
+
+#ifndef _STLP_INTERNAL_TREE_H
+# include <stl/_tree.h>
+#endif
+
+// fbp: these defines are for outline methods definitions.
+// needed for definitions to be portable. Should not be used in method bodies.
+# if defined  ( _STLP_NESTED_TYPE_PARAM_BUG )
+#  define __iterator__        _Rb_tree_iterator<_Value, _Nonconst_traits<_Value> > 
+#  define __size_type__       size_t
+#  define iterator __iterator__
+# else
+#  define __iterator__  _STLP_TYPENAME_ON_RETURN_TYPE _Rb_tree<_Key, _Value, _KeyOfValue, _Compare, _Alloc>::iterator
+#  define __size_type__  _STLP_TYPENAME_ON_RETURN_TYPE _Rb_tree<_Key, _Value, _KeyOfValue, _Compare, _Alloc>::size_type
+# endif
+
+#if defined ( _STLP_DEBUG)
+#  define _Rb_tree __WORKAROUND_DBG_RENAME(Rb_tree)
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+# if defined (_STLP_EXPOSE_GLOBALS_IMPLEMENTATION)
+
+template <class _Dummy> void _STLP_CALL
+_Rb_global<_Dummy>::_Rotate_left(_Rb_tree_node_base* __x, _Rb_tree_node_base*& __root)
+{
+  _Rb_tree_node_base* __y = __x->_M_right;
+  __x->_M_right = __y->_M_left;
+  if (__y->_M_left !=0)
+    __y->_M_left->_M_parent = __x;
+  __y->_M_parent = __x->_M_parent;
+
+  if (__x == __root)
+    __root = __y;
+  else if (__x == __x->_M_parent->_M_left)
+    __x->_M_parent->_M_left = __y;
+  else
+    __x->_M_parent->_M_right = __y;
+  __y->_M_left = __x;
+  __x->_M_parent = __y;
+}
+
+template <class _Dummy> void _STLP_CALL 
+_Rb_global<_Dummy>::_Rotate_right(_Rb_tree_node_base* __x, _Rb_tree_node_base*& __root)
+{
+  _Rb_tree_node_base* __y = __x->_M_left;
+  __x->_M_left = __y->_M_right;
+  if (__y->_M_right != 0)
+    __y->_M_right->_M_parent = __x;
+  __y->_M_parent = __x->_M_parent;
+
+  if (__x == __root)
+    __root = __y;
+  else if (__x == __x->_M_parent->_M_right)
+    __x->_M_parent->_M_right = __y;
+  else
+    __x->_M_parent->_M_left = __y;
+  __y->_M_right = __x;
+  __x->_M_parent = __y;
+}
+
+template <class _Dummy> void _STLP_CALL
+_Rb_global<_Dummy>::_Rebalance(_Rb_tree_node_base* __x, 
+			       _Rb_tree_node_base*& __root)
+{
+  __x->_M_color = _S_rb_tree_red;
+  while (__x != __root && __x->_M_parent->_M_color == _S_rb_tree_red) {
+    if (__x->_M_parent == __x->_M_parent->_M_parent->_M_left) {
+      _Rb_tree_node_base* __y = __x->_M_parent->_M_parent->_M_right;
+      if (__y && __y->_M_color == _S_rb_tree_red) {
+        __x->_M_parent->_M_color = _S_rb_tree_black;
+        __y->_M_color = _S_rb_tree_black;
+        __x->_M_parent->_M_parent->_M_color = _S_rb_tree_red;
+        __x = __x->_M_parent->_M_parent;
+      }
+      else {
+        if (__x == __x->_M_parent->_M_right) {
+          __x = __x->_M_parent;
+          _Rotate_left(__x, __root);
+        }
+        __x->_M_parent->_M_color = _S_rb_tree_black;
+        __x->_M_parent->_M_parent->_M_color = _S_rb_tree_red;
+        _Rotate_right(__x->_M_parent->_M_parent, __root);
+      }
+    }
+    else {
+      _Rb_tree_node_base* __y = __x->_M_parent->_M_parent->_M_left;
+      if (__y && __y->_M_color == _S_rb_tree_red) {
+        __x->_M_parent->_M_color = _S_rb_tree_black;
+        __y->_M_color = _S_rb_tree_black;
+        __x->_M_parent->_M_parent->_M_color = _S_rb_tree_red;
+        __x = __x->_M_parent->_M_parent;
+      }
+      else {
+        if (__x == __x->_M_parent->_M_left) {
+          __x = __x->_M_parent;
+          _Rotate_right(__x, __root);
+        }
+        __x->_M_parent->_M_color = _S_rb_tree_black;
+        __x->_M_parent->_M_parent->_M_color = _S_rb_tree_red;
+        _Rotate_left(__x->_M_parent->_M_parent, __root);
+      }
+    }
+  }
+  __root->_M_color = _S_rb_tree_black;
+}
+
+template <class _Dummy> _Rb_tree_node_base* _STLP_CALL
+_Rb_global<_Dummy>::_Rebalance_for_erase(_Rb_tree_node_base* __z,
+					 _Rb_tree_node_base*& __root,
+					 _Rb_tree_node_base*& __leftmost,
+					 _Rb_tree_node_base*& __rightmost)
+{
+  _Rb_tree_node_base* __y = __z;
+  _Rb_tree_node_base* __x = 0;
+  _Rb_tree_node_base* __x_parent = 0;
+  if (__y->_M_left == 0)     // __z has at most one non-null child. y == z.
+    __x = __y->_M_right;     // __x might be null.
+  else
+    if (__y->_M_right == 0)  // __z has exactly one non-null child. y == z.
+      __x = __y->_M_left;    // __x is not null.
+    else {                   // __z has two non-null children.  Set __y to
+      __y = __y->_M_right;   //   __z's successor.  __x might be null.
+      while (__y->_M_left != 0)
+        __y = __y->_M_left;
+      __x = __y->_M_right;
+    }
+  if (__y != __z) {          // relink y in place of z.  y is z's successor
+    __z->_M_left->_M_parent = __y; 
+    __y->_M_left = __z->_M_left;
+    if (__y != __z->_M_right) {
+      __x_parent = __y->_M_parent;
+      if (__x) __x->_M_parent = __y->_M_parent;
+      __y->_M_parent->_M_left = __x;      // __y must be a child of _M_left
+      __y->_M_right = __z->_M_right;
+      __z->_M_right->_M_parent = __y;
+    }
+    else
+      __x_parent = __y;  
+    if (__root == __z)
+      __root = __y;
+    else if (__z->_M_parent->_M_left == __z)
+      __z->_M_parent->_M_left = __y;
+    else 
+      __z->_M_parent->_M_right = __y;
+    __y->_M_parent = __z->_M_parent;
+    _STLP_STD::swap(__y->_M_color, __z->_M_color);
+    __y = __z;
+    // __y now points to node to be actually deleted
+  }
+  else {                        // __y == __z
+    __x_parent = __y->_M_parent;
+    if (__x) __x->_M_parent = __y->_M_parent;   
+    if (__root == __z)
+      __root = __x;
+    else 
+      if (__z->_M_parent->_M_left == __z)
+        __z->_M_parent->_M_left = __x;
+      else
+        __z->_M_parent->_M_right = __x;
+    if (__leftmost == __z) 
+      if (__z->_M_right == 0)        // __z->_M_left must be null also
+        __leftmost = __z->_M_parent;
+    // makes __leftmost == _M_header if __z == __root
+      else
+        __leftmost = _Rb_tree_node_base::_S_minimum(__x);
+    if (__rightmost == __z)  
+      if (__z->_M_left == 0)         // __z->_M_right must be null also
+        __rightmost = __z->_M_parent;  
+    // makes __rightmost == _M_header if __z == __root
+      else                      // __x == __z->_M_left
+        __rightmost = _Rb_tree_node_base::_S_maximum(__x);
+  }
+  if (__y->_M_color != _S_rb_tree_red) { 
+    while (__x != __root && (__x == 0 || __x->_M_color == _S_rb_tree_black))
+      if (__x == __x_parent->_M_left) {
+        _Rb_tree_node_base* __w = __x_parent->_M_right;
+        if (__w->_M_color == _S_rb_tree_red) {
+          __w->_M_color = _S_rb_tree_black;
+          __x_parent->_M_color = _S_rb_tree_red;
+          _Rotate_left(__x_parent, __root);
+          __w = __x_parent->_M_right;
+        }
+        if ((__w->_M_left == 0 || 
+             __w->_M_left->_M_color == _S_rb_tree_black) && (__w->_M_right == 0 || 
+             __w->_M_right->_M_color == _S_rb_tree_black)) {
+          __w->_M_color = _S_rb_tree_red;
+          __x = __x_parent;
+          __x_parent = __x_parent->_M_parent;
+        } else {
+          if (__w->_M_right == 0 || 
+              __w->_M_right->_M_color == _S_rb_tree_black) {
+            if (__w->_M_left) __w->_M_left->_M_color = _S_rb_tree_black;
+            __w->_M_color = _S_rb_tree_red;
+            _Rotate_right(__w, __root);
+            __w = __x_parent->_M_right;
+          }
+          __w->_M_color = __x_parent->_M_color;
+          __x_parent->_M_color = _S_rb_tree_black;
+          if (__w->_M_right) __w->_M_right->_M_color = _S_rb_tree_black;
+          _Rotate_left(__x_parent, __root);
+          break;
+        }
+      } else {                  // same as above, with _M_right <-> _M_left.
+        _Rb_tree_node_base* __w = __x_parent->_M_left;
+        if (__w->_M_color == _S_rb_tree_red) {
+          __w->_M_color = _S_rb_tree_black;
+          __x_parent->_M_color = _S_rb_tree_red;
+          _Rotate_right(__x_parent, __root);
+          __w = __x_parent->_M_left;
+        }
+        if ((__w->_M_right == 0 || 
+             __w->_M_right->_M_color == _S_rb_tree_black) && (__w->_M_left == 0 || 
+             __w->_M_left->_M_color == _S_rb_tree_black)) {
+          __w->_M_color = _S_rb_tree_red;
+          __x = __x_parent;
+          __x_parent = __x_parent->_M_parent;
+        } else {
+          if (__w->_M_left == 0 || 
+              __w->_M_left->_M_color == _S_rb_tree_black) {
+            if (__w->_M_right) __w->_M_right->_M_color = _S_rb_tree_black;
+            __w->_M_color = _S_rb_tree_red;
+            _Rotate_left(__w, __root);
+            __w = __x_parent->_M_left;
+          }
+          __w->_M_color = __x_parent->_M_color;
+          __x_parent->_M_color = _S_rb_tree_black;
+          if (__w->_M_left) __w->_M_left->_M_color = _S_rb_tree_black;
+          _Rotate_right(__x_parent, __root);
+          break;
+        }
+      }
+    if (__x) __x->_M_color = _S_rb_tree_black;
+  }
+  return __y;
+}
+
+template <class _Dummy> _Rb_tree_node_base* _STLP_CALL
+_Rb_global<_Dummy>::_M_decrement(_Rb_tree_node_base* _M_node)
+{
+  if (_M_node->_M_color == _S_rb_tree_red && _M_node->_M_parent->_M_parent == _M_node)
+    _M_node = _M_node->_M_right;
+  else if (_M_node->_M_left != 0) {
+    _Base_ptr __y = _M_node->_M_left;
+    while (__y->_M_right != 0)
+      __y = __y->_M_right;
+    _M_node = __y;
+  }
+  else {
+    _Base_ptr __y = _M_node->_M_parent;
+    while (_M_node == __y->_M_left) {
+      _M_node = __y;
+      __y = __y->_M_parent;
+    }
+    _M_node = __y;
+  }
+  return _M_node;
+}
+
+template <class _Dummy> _Rb_tree_node_base* _STLP_CALL
+_Rb_global<_Dummy>::_M_increment(_Rb_tree_node_base* _M_node)
+{
+  if (_M_node->_M_right != 0) {
+    _M_node = _M_node->_M_right;
+    while (_M_node->_M_left != 0)
+      _M_node = _M_node->_M_left;
+  }
+  else {
+    _Base_ptr __y = _M_node->_M_parent;
+    while (_M_node == __y->_M_right) {
+      _M_node = __y;
+      __y = __y->_M_parent;
+    }
+    if (_M_node->_M_right != __y)
+      _M_node = __y;
+  }
+  return _M_node;
+}
+
+#endif /* defined (__BUILDING_STLPORT) || ! defined (_STLP_OWN_IOSTREAMS) */
+
+
+template <class _Key, class _Value, class _KeyOfValue, 
+          class _Compare, class _Alloc> _Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>& _Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc> ::operator=(const _Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>& __x)
+{
+  if (this != &__x) {
+                                // Note that _Key may be a constant type.
+    clear();
+    _M_node_count = 0;
+    _M_key_compare = __x._M_key_compare;        
+    if (__x._M_root() == 0) {
+      _M_root() = 0;
+      _M_leftmost() = this->_M_header._M_data;
+      _M_rightmost() = this->_M_header._M_data;
+    }
+    else {
+      _M_root() = _M_copy(__x._M_root(), this->_M_header._M_data);
+      _M_leftmost() = _S_minimum(_M_root());
+      _M_rightmost() = _S_maximum(_M_root());
+      _M_node_count = __x._M_node_count;
+    }
+  }
+  return *this;
+}
+
+// CRP 7/10/00 inserted argument __w_, which is another hint (meant to
+// act like __x_ and ignore a portion of the if conditions -- specify
+// __w_ != 0 to bypass comparison as false or __x_ != 0 to bypass
+// comparison as true)
+template <class _Key, class _Value, class _KeyOfValue, 
+          class _Compare, class _Alloc> __iterator__ 
+_Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc> ::_M_insert(_Rb_tree_node_base* __x_, _Rb_tree_node_base* __y_, const _Value& __v,
+  _Rb_tree_node_base* __w_)
+{
+  _Link_type __w = (_Link_type) __w_;
+  _Link_type __x = (_Link_type) __x_;
+  _Link_type __y = (_Link_type) __y_;
+  _Link_type __z;
+
+  if ( __y == this->_M_header._M_data ||
+       ( __w == 0 && // If w != 0, the remainder fails to false
+         ( __x != 0 ||     // If x != 0, the remainder succeeds to true
+           _M_key_compare( _KeyOfValue()(__v), _S_key(__y) ) )
+	 )
+       ) {
+    
+    __z = _M_create_node(__v);
+    _S_left(__y) = __z;               // also makes _M_leftmost() = __z 
+                                      //    when __y == _M_header
+    if (__y == this->_M_header._M_data) {
+      _M_root() = __z;
+      _M_rightmost() = __z;
+    }
+    else if (__y == _M_leftmost())
+      _M_leftmost() = __z;   // maintain _M_leftmost() pointing to min node
+  }
+  else {
+    __z = _M_create_node(__v);
+    _S_right(__y) = __z;
+    if (__y == _M_rightmost())
+      _M_rightmost() = __z;  // maintain _M_rightmost() pointing to max node
+  }
+  _S_parent(__z) = __y;
+  _S_left(__z) = 0;
+  _S_right(__z) = 0;
+  _Rb_global_inst::_Rebalance(__z, this->_M_header._M_data->_M_parent);
+  ++_M_node_count;
+  return iterator(__z);
+}
+
+template <class _Key, class _Value, class _KeyOfValue, 
+          class _Compare, class _Alloc> __iterator__
+_Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc> ::insert_equal(const _Value& __v)
+{
+  _Link_type __y = this->_M_header._M_data;
+  _Link_type __x = _M_root();
+  while (__x != 0) {
+    __y = __x;
+    __x = _M_key_compare(_KeyOfValue()(__v), _S_key(__x)) ? 
+            _S_left(__x) : _S_right(__x);
+  }
+  return _M_insert(__x, __y, __v);
+}
+
+
+template <class _Key, class _Value, class _KeyOfValue, 
+          class _Compare, class _Alloc> pair< _Rb_tree_iterator<_Value, _Nonconst_traits<_Value> >, bool> _Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc> ::insert_unique(const _Value& __v)
+{
+  _Link_type __y = this->_M_header._M_data;
+  _Link_type __x = _M_root();
+  bool __comp = true;
+  while (__x != 0) {
+    __y = __x;
+    __comp = _M_key_compare(_KeyOfValue()(__v), _S_key(__x));
+    __x = __comp ? _S_left(__x) : _S_right(__x);
+  }
+  iterator __j = iterator(__y);   
+  if (__comp)
+    if (__j == begin())     
+      return pair<iterator,bool>(_M_insert(/* __x*/ __y, __y, __v), true);
+    else
+      --__j;
+  if (_M_key_compare(_S_key(__j._M_node), _KeyOfValue()(__v)))
+    return pair<iterator,bool>(_M_insert(__x, __y, __v), true);
+  return pair<iterator,bool>(__j, false);
+}
+
+// Modifications CRP 7/10/00 as noted to improve conformance and
+// efficiency.
+template <class _Key, class _Value, class _KeyOfValue, 
+          class _Compare, class _Alloc> __iterator__ 
+_Rb_tree<_Key, _Value, _KeyOfValue, _Compare, _Alloc> ::insert_unique(iterator __position, const _Value& __v)
+{
+  if (__position._M_node == this->_M_header._M_data->_M_left) { // begin()
+
+    // if the container is empty, fall back on insert_unique.
+    if (size() <= 0)
+      return insert_unique(__v).first;
+
+    if ( _M_key_compare(_KeyOfValue()(__v), _S_key(__position._M_node)))
+      return _M_insert(__position._M_node, __position._M_node, __v);
+    // first argument just needs to be non-null 
+    else
+      {
+	bool __comp_pos_v = _M_key_compare( _S_key(__position._M_node), _KeyOfValue()(__v) );
+	
+	if (__comp_pos_v == false)  // compare > and compare < both false so compare equal
+	  return __position;
+	//Below __comp_pos_v == true
+
+	// Standard-conformance - does the insertion point fall immediately AFTER
+	// the hint?
+	iterator __after = __position;
+	++__after;
+
+	// Check for only one member -- in that case, __position points to itself,
+	// and attempting to increment will cause an infinite loop.
+	if (__after._M_node == this->_M_header._M_data)
+	  // Check guarantees exactly one member, so comparison was already
+	  // performed and we know the result; skip repeating it in _M_insert
+	  // by specifying a non-zero fourth argument.
+	  return _M_insert(0, __position._M_node, __v, __position._M_node);
+		
+	
+	// All other cases:
+	
+	// Optimization to catch insert-equivalent -- save comparison results,
+	// and we get this for free.
+	if(_M_key_compare( _KeyOfValue()(__v), _S_key(__after._M_node) )) {
+	  if (_S_right(__position._M_node) == 0)
+	    return _M_insert(0, __position._M_node, __v, __position._M_node);
+	  else
+	    return _M_insert(__after._M_node, __after._M_node, __v);
+	} else {
+	    return insert_unique(__v).first;
+	}
+      }
+
+  } else if (__position._M_node == this->_M_header._M_data) { // end()
+    if (_M_key_compare(_S_key(_M_rightmost()), _KeyOfValue()(__v)))
+      // pass along to _M_insert that it can skip comparing
+      // v, Key ; since compare Key, v was true, compare v, Key must be false.
+      return _M_insert(0, _M_rightmost(), __v, __position._M_node); // Last argument only needs to be non-null
+    else
+      return insert_unique(__v).first;
+  } else {
+    iterator __before = __position;
+    --__before;
+    
+    bool __comp_v_pos = _M_key_compare(_KeyOfValue()(__v), _S_key(__position._M_node));
+
+    if (__comp_v_pos
+      && _M_key_compare( _S_key(__before._M_node), _KeyOfValue()(__v) )) {
+
+      if (_S_right(__before._M_node) == 0)
+        return _M_insert(0, __before._M_node, __v, __before._M_node); // Last argument only needs to be non-null
+      else
+        return _M_insert(__position._M_node, __position._M_node, __v);
+    // first argument just needs to be non-null 
+    } else
+      {
+	// Does the insertion point fall immediately AFTER the hint?
+	iterator __after = __position;
+	++__after;
+	
+	// Optimization to catch equivalent cases and avoid unnecessary comparisons
+	bool __comp_pos_v = !__comp_v_pos;  // Stored this result earlier
+	// If the earlier comparison was true, this comparison doesn't need to be
+	// performed because it must be false.  However, if the earlier comparison
+	// was false, we need to perform this one because in the equal case, both will
+	// be false.
+	if (!__comp_v_pos) __comp_pos_v = _M_key_compare(_S_key(__position._M_node), _KeyOfValue()(__v));
+	
+	if ( (!__comp_v_pos) // comp_v_pos true implies comp_v_pos false
+	     && __comp_pos_v
+	     && (__after._M_node == this->_M_header._M_data ||
+	        _M_key_compare( _KeyOfValue()(__v), _S_key(__after._M_node) ))) {
+	  
+	  if (_S_right(__position._M_node) == 0)
+	    return _M_insert(0, __position._M_node, __v, __position._M_node);
+	  else
+	    return _M_insert(__after._M_node, __after._M_node, __v);
+	} else {
+	  // Test for equivalent case
+	  if (__comp_v_pos == __comp_pos_v)
+	    return __position;
+	  else
+	    return insert_unique(__v).first;
+	}
+      }
+  }
+}
+
+
+template <class _Key, class _Value, class _KeyOfValue, 
+          class _Compare, class _Alloc> __iterator__ 
+_Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc> ::insert_equal(iterator __position, const _Value& __v)
+{
+  if (__position._M_node == this->_M_header._M_data->_M_left) { // begin()
+
+    // Check for zero members
+    if (size() <= 0)
+        return insert_equal(__v);
+
+    if (!_M_key_compare(_S_key(__position._M_node), _KeyOfValue()(__v)))
+      return _M_insert(__position._M_node, __position._M_node, __v);
+    else    {
+      // Check for only one member
+      if (__position._M_node->_M_left == __position._M_node)
+        // Unlike insert_unique, can't avoid doing a comparison here.
+        return _M_insert(0, __position._M_node, __v);
+                
+      // All other cases:
+      // Standard-conformance - does the insertion point fall immediately AFTER
+      // the hint?
+      iterator __after = __position;
+      ++__after;
+      
+      // Already know that compare(pos, v) must be true!
+      // Therefore, we want to know if compare(after, v) is false.
+      // (i.e., we now pos < v, now we want to know if v <= after)
+      // If not, invalid hint.
+      if ( __after._M_node==this->_M_header._M_data ||
+	   !_M_key_compare( _S_key(__after._M_node), _KeyOfValue()(__v) ) ) {
+        if (_S_right(__position._M_node) == 0)
+          return _M_insert(0, __position._M_node, __v, __position._M_node);
+        else
+          return _M_insert(__after._M_node, __after._M_node, __v);
+      } else // Invalid hint
+        return insert_equal(__v);
+    }
+  } else if (__position._M_node == this->_M_header._M_data) {// end()
+    if (!_M_key_compare(_KeyOfValue()(__v), _S_key(_M_rightmost())))
+      return _M_insert(0, _M_rightmost(), __v, __position._M_node); // Last argument only needs to be non-null
+    else
+      return insert_equal(__v);
+  } else {
+    iterator __before = __position;
+    --__before;
+    // store the result of the comparison between pos and v so
+    // that we don't have to do it again later.  Note that this reverses the shortcut
+    // on the if, possibly harming efficiency in comparisons; I think the harm will
+    // be negligible, and to do what I want to do (save the result of a comparison so
+    // that it can be re-used) there is no alternative.  Test here is for before <= v <= pos.
+    bool __comp_pos_v = _M_key_compare(_S_key(__position._M_node), _KeyOfValue()(__v));
+    if (!__comp_pos_v
+        && !_M_key_compare(_KeyOfValue()(__v), _S_key(__before._M_node))) {
+      if (_S_right(__before._M_node) == 0)
+        return _M_insert(0, __before._M_node, __v, __before._M_node); // Last argument only needs to be non-null
+      else
+        return _M_insert(__position._M_node, __position._M_node, __v);
+    } else  {
+      // Does the insertion point fall immediately AFTER the hint?
+      // Test for pos < v <= after
+      iterator __after = __position;
+      ++__after;
+      
+      if (__comp_pos_v
+	  && ( __after._M_node==this->_M_header._M_data 
+	       || !_M_key_compare( _S_key(__after._M_node), _KeyOfValue()(__v) ) ) ) {
+        if (_S_right(__position._M_node) == 0)
+          return _M_insert(0, __position._M_node, __v, __position._M_node);
+        else
+          return _M_insert(__after._M_node, __after._M_node, __v);
+      } else // Invalid hint
+        return insert_equal(__v);
+    }
+  }
+}
+
+template <class _Key, class _Value, class _KeyOfValue, class _Compare, class _Alloc> _Rb_tree_node<_Value>* 
+_Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc> ::_M_copy(_Rb_tree_node<_Value>* __x, _Rb_tree_node<_Value>* __p)
+{
+                        // structural copy.  __x and __p must be non-null.
+  _Link_type __top = _M_clone_node(__x);
+  __top->_M_parent = __p;
+  
+  _STLP_TRY {
+    if (__x->_M_right)
+      __top->_M_right = _M_copy(_S_right(__x), __top);
+    __p = __top;
+    __x = _S_left(__x);
+
+    while (__x != 0) {
+      _Link_type __y = _M_clone_node(__x);
+      __p->_M_left = __y;
+      __y->_M_parent = __p;
+      if (__x->_M_right)
+        __y->_M_right = _M_copy(_S_right(__x), __y);
+      __p = __y;
+      __x = _S_left(__x);
+    }
+  }
+  _STLP_UNWIND(_M_erase(__top));
+
+  return __top;
+}
+
+// this has to stay out-of-line : it's recursive
+template <class _Key, class _Value, class _KeyOfValue, 
+          class _Compare, class _Alloc> void 
+_Rb_tree<_Key,_Value,_KeyOfValue,
+  _Compare,_Alloc>::_M_erase(_Rb_tree_node<_Value>* __x)
+{
+                                // erase without rebalancing
+  while (__x != 0) {
+    _M_erase(_S_right(__x));
+    _Link_type __y = _S_left(__x);
+    _STLP_STD::_Destroy(&__x->_M_value_field);
+    this->_M_header.deallocate(__x,1);
+    __x = __y;
+  }
+}
+
+template <class _Key, class _Value, class _KeyOfValue, 
+          class _Compare, class _Alloc> __size_type__ 
+_Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc> ::count(const _Key& __k) const
+{
+  pair<const_iterator, const_iterator> __p = equal_range(__k);
+  size_type __n = distance(__p.first, __p.second);
+  return __n;
+}
+
+inline int 
+__black_count(_Rb_tree_node_base* __node, _Rb_tree_node_base* __root)
+{
+  if (__node == 0)
+    return 0;
+  else {
+    int __bc = __node->_M_color == _S_rb_tree_black ? 1 : 0;
+    if (__node == __root)
+      return __bc;
+    else
+      return __bc + __black_count(__node->_M_parent, __root);
+  }
+}
+
+template <class _Key, class _Value, class _KeyOfValue, 
+          class _Compare, class _Alloc> bool _Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>::__rb_verify() const
+{
+  if (_M_node_count == 0 || begin() == end())
+    return _M_node_count == 0 && begin() == end() && this->_M_header._M_data->_M_left == this->_M_header._M_data
+      && this->_M_header._M_data->_M_right == this->_M_header._M_data;
+  
+  int __len = __black_count(_M_leftmost(), _M_root());
+  for (const_iterator __it = begin(); __it != end(); ++__it) {
+    _Link_type __x = (_Link_type) __it._M_node;
+    _Link_type __L = _S_left(__x);
+    _Link_type __R = _S_right(__x);
+
+    if (__x->_M_color == _S_rb_tree_red)
+      if ((__L && __L->_M_color == _S_rb_tree_red) ||
+          (__R && __R->_M_color == _S_rb_tree_red))
+        return false;
+
+    if (__L && _M_key_compare(_S_key(__x), _S_key(__L)))
+      return false;
+    if (__R && _M_key_compare(_S_key(__R), _S_key(__x)))
+      return false;
+
+    if (!__L && !__R && __black_count(__x, _M_root()) != __len)
+      return false;
+  }
+
+  if (_M_leftmost() != _Rb_tree_node_base::_S_minimum(_M_root()))
+    return false;
+  if (_M_rightmost() != _Rb_tree_node_base::_S_maximum(_M_root()))
+    return false;
+
+  return true;
+}
+_STLP_END_NAMESPACE
+
+# undef __iterator__        
+# undef iterator
+# undef __size_type__  
+
+#endif /*  _STLP_TREE_C */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_tree.h b/main/source/stlport/stlport/stl/_tree.h
new file mode 100644
index 00000000..43829730
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_tree.h
@@ -0,0 +1,622 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_TREE_H
+#define _STLP_INTERNAL_TREE_H
+
+/*
+
+Red-black tree class, designed for use in implementing STL
+associative containers (set, multiset, map, and multimap). The
+insertion and deletion algorithms are based on those in Cormen,
+Leiserson, and Rivest, Introduction to Algorithms (MIT Press, 1990),
+except that
+
+(1) the header cell is maintained with links not only to the root
+but also to the leftmost node of the tree, to enable constant time
+begin(), and to the rightmost node of the tree, to enable linear time
+performance when used with the generic set algorithms (set_union,
+etc.);
+
+(2) when a node being deleted has two children its successor node is
+relinked into its place, rather than copied, so that the only
+iterators invalidated are those referring to the deleted node.
+
+*/
+
+# ifndef _STLP_INTERNAL_ALGOBASE_H
+#  include <stl/_algobase.h> 
+# endif
+
+# ifndef _STLP_INTERNAL_ALLOC_H
+#  include <stl/_alloc.h> 
+# endif
+
+# ifndef _STLP_INTERNAL_ITERATOR_H
+#  include <stl/_iterator.h> 
+# endif
+
+# ifndef _STLP_INTERNAL_CONSTRUCT_H
+#  include <stl/_construct.h> 
+# endif
+
+# ifndef _STLP_INTERNAL_FUNCTION_H
+#  include <stl/_function_base.h> 
+# endif
+
+#if defined ( _STLP_DEBUG)
+#  define _Rb_tree __WORKAROUND_DBG_RENAME(Rb_tree)
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+typedef bool _Rb_tree_Color_type;
+//const _Rb_tree_Color_type _S_rb_tree_red = false;
+//const _Rb_tree_Color_type _S_rb_tree_black = true;
+
+#define _S_rb_tree_red false
+#define _S_rb_tree_black true
+
+struct _Rb_tree_node_base
+{
+  typedef _Rb_tree_Color_type _Color_type;
+  typedef _Rb_tree_node_base* _Base_ptr;
+
+  _Color_type _M_color; 
+  _Base_ptr _M_parent;
+  _Base_ptr _M_left;
+  _Base_ptr _M_right;
+
+  static _Base_ptr _STLP_CALL _S_minimum(_Base_ptr __x)
+  {
+    while (__x->_M_left != 0) __x = __x->_M_left;
+    return __x;
+  }
+
+  static _Base_ptr _STLP_CALL _S_maximum(_Base_ptr __x)
+  {
+    while (__x->_M_right != 0) __x = __x->_M_right;
+    return __x;
+  }
+};
+
+template <class _Value> struct _Rb_tree_node : public _Rb_tree_node_base
+{
+  _Value _M_value_field;
+  __TRIVIAL_STUFF(_Rb_tree_node)
+};
+
+struct _Rb_tree_base_iterator;
+
+template <class _Dummy> class _Rb_global {
+public:
+  typedef _Rb_tree_node_base* _Base_ptr;
+  // those used to be global functions 
+  static void _STLP_CALL _Rebalance(_Rb_tree_node_base* __x, _Rb_tree_node_base*& __root);
+  static _Rb_tree_node_base* _STLP_CALL _Rebalance_for_erase(_Rb_tree_node_base* __z,
+                                                             _Rb_tree_node_base*& __root,
+                                                             _Rb_tree_node_base*& __leftmost,
+                                                             _Rb_tree_node_base*& __rightmost);
+  // those are from _Rb_tree_base_iterator - moved here to reduce code bloat
+  // moved here to reduce code bloat without templatizing _Rb_tree_base_iterator
+  static _Rb_tree_node_base*  _STLP_CALL _M_increment(_Rb_tree_node_base*);
+  static _Rb_tree_node_base*  _STLP_CALL _M_decrement(_Rb_tree_node_base*);
+  static void _STLP_CALL _Rotate_left(_Rb_tree_node_base* __x, _Rb_tree_node_base*& __root);
+  static void _STLP_CALL _Rotate_right(_Rb_tree_node_base* __x, _Rb_tree_node_base*& __root); 
+};
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT) 
+_STLP_EXPORT_TEMPLATE_CLASS _Rb_global<bool>;
+# endif
+
+typedef _Rb_global<bool> _Rb_global_inst;
+
+struct _Rb_tree_base_iterator
+{
+  typedef _Rb_tree_node_base*        _Base_ptr;
+  typedef bidirectional_iterator_tag iterator_category;
+  typedef ptrdiff_t                  difference_type;
+  _Base_ptr _M_node;
+  bool operator==(const _Rb_tree_base_iterator& __y) const {
+    return _M_node == __y._M_node;
+  }
+  bool operator!=(const _Rb_tree_base_iterator& __y) const {
+    return _M_node != __y._M_node;
+  }
+};
+
+
+template <class _Value, class _Traits> struct _Rb_tree_iterator : public _Rb_tree_base_iterator
+{
+  typedef _Value value_type;
+  typedef typename _Traits::reference  reference;
+  typedef typename _Traits::pointer    pointer;
+  typedef _Rb_tree_iterator<_Value, _Traits> _Self;
+  typedef _Rb_tree_node<_Value>* _Link_type;
+
+  _Rb_tree_iterator() { _M_node = 0; }
+  _Rb_tree_iterator(_Link_type __x) { _M_node = __x; }
+  _Rb_tree_iterator(const _Rb_tree_iterator<_Value, 
+                    _Nonconst_traits<_Value> >& __it) { _M_node = __it._M_node; }
+
+  reference operator*() const { 
+    return _Link_type(_M_node)->_M_value_field; 
+  }
+  
+  _STLP_DEFINE_ARROW_OPERATOR
+
+  _Self& operator++() { _M_node = _Rb_global_inst::_M_increment(_M_node); return *this; }
+  _Self operator++(int) {
+    _Self __tmp = *this;
+    _M_node = _Rb_global_inst::_M_increment(_M_node);
+    return __tmp;
+  }
+    
+  _Self& operator--() { _M_node = _Rb_global_inst::_M_decrement(_M_node); return *this; }
+  _Self operator--(int) {
+    _Self __tmp = *this;
+    _M_node = _Rb_global_inst::_M_decrement(_M_node);
+    return __tmp;
+  }
+};
+
+# ifdef _STLP_USE_OLD_HP_ITERATOR_QUERIES
+template <class _Value, class _Traits> inline _Value* value_type(const _Rb_tree_iterator<_Value, _Traits>&) { return (_Value*)0; }
+inline bidirectional_iterator_tag iterator_category(const _Rb_tree_base_iterator&) { return bidirectional_iterator_tag(); }
+inline ptrdiff_t* distance_type(const _Rb_tree_base_iterator&) { return (ptrdiff_t*) 0; }
+#endif /* _STLP_CLASS_PARTIAL_SPECIALIZATION */
+
+// Base class to help EH
+
+template <class _Tp, class _Alloc> struct _Rb_tree_base
+{
+  typedef _Rb_tree_node<_Tp> _Node;
+  _STLP_FORCE_ALLOCATORS(_Tp, _Alloc)
+  typedef typename _Alloc_traits<_Tp, _Alloc>::allocator_type allocator_type;
+
+  _Rb_tree_base(const allocator_type& __a) : 
+    _M_header(_STLP_CONVERT_ALLOCATOR(__a, _Node), (_Node*)0) { 
+      _M_header._M_data = _M_header.allocate(1); 
+  }
+  ~_Rb_tree_base() { 
+    _M_header.deallocate(_M_header._M_data,1); 
+  }
+  allocator_type get_allocator() const { 
+    return _STLP_CONVERT_ALLOCATOR(_M_header, _Tp); 
+  }
+protected:
+  typedef typename _Alloc_traits<_Node, _Alloc>::allocator_type _M_node_allocator_type;
+  _STLP_alloc_proxy<_Node*, _Node, _M_node_allocator_type> _M_header;
+};
+
+
+template <class _Key, class _Value, class _KeyOfValue, class _Compare,
+          _STLP_DEFAULT_ALLOCATOR_SELECT(_Value) > class _Rb_tree : public _Rb_tree_base<_Value, _Alloc> {
+  typedef _Rb_tree_base<_Value, _Alloc> _Base;
+protected:
+  typedef _Rb_tree_node_base* _Base_ptr;
+  typedef _Rb_tree_node<_Value> _Node;
+  typedef _Rb_tree_Color_type _Color_type;
+public:
+  typedef _Key key_type;
+  typedef _Value value_type;
+  typedef value_type* pointer;
+  typedef const value_type* const_pointer;
+  typedef value_type& reference;
+  typedef const value_type& const_reference;
+  typedef _Rb_tree_node<_Value>* _Link_type;
+  typedef size_t size_type;
+  typedef ptrdiff_t difference_type;
+  typedef bidirectional_iterator_tag _Iterator_category;
+  typedef typename _Base::allocator_type allocator_type;
+  
+protected:
+
+  _Link_type _M_create_node(const value_type& __x)
+  {
+    _Link_type __tmp = this->_M_header.allocate(1);
+    _STLP_TRY {
+      _Construct(&__tmp->_M_value_field, __x);
+    }
+    _STLP_UNWIND(this->_M_header.deallocate(__tmp,1));
+    return __tmp;
+  }
+
+  _Link_type _M_clone_node(_Link_type __x)
+  {
+    _Link_type __tmp = _M_create_node(__x->_M_value_field);
+    __tmp->_M_color = __x->_M_color;
+    __tmp->_M_left = 0;
+    __tmp->_M_right = 0;
+    return __tmp;
+  }
+
+protected:
+  size_type _M_node_count; // keeps track of size of tree
+  _Compare _M_key_compare;
+
+  _Link_type& _M_root() const 
+    { return (_Link_type&) this->_M_header._M_data->_M_parent; }
+  _Link_type& _M_leftmost() const 
+    { return (_Link_type&) this->_M_header._M_data->_M_left; }
+  _Link_type& _M_rightmost() const 
+    { return (_Link_type&) this->_M_header._M_data->_M_right; }
+
+  static _Link_type& _STLP_CALL _S_left(_Link_type __x)
+    { return (_Link_type&)(__x->_M_left); }
+  static _Link_type& _STLP_CALL _S_right(_Link_type __x)
+    { return (_Link_type&)(__x->_M_right); }
+  static _Link_type& _STLP_CALL _S_parent(_Link_type __x)
+    { return (_Link_type&)(__x->_M_parent); }
+  static reference  _STLP_CALL _S_value(_Link_type __x)
+    { return __x->_M_value_field; }
+  static const _Key& _STLP_CALL _S_key(_Link_type __x)
+    { return _KeyOfValue()(_S_value(__x)); }
+  static _Color_type& _STLP_CALL _S_color(_Link_type __x)
+    { return (_Color_type&)(__x->_M_color); }
+
+  static _Link_type& _STLP_CALL _S_left(_Base_ptr __x)
+    { return (_Link_type&)(__x->_M_left); }
+  static _Link_type& _STLP_CALL _S_right(_Base_ptr __x)
+    { return (_Link_type&)(__x->_M_right); }
+  static _Link_type& _STLP_CALL _S_parent(_Base_ptr __x)
+    { return (_Link_type&)(__x->_M_parent); }
+  static reference  _STLP_CALL _S_value(_Base_ptr __x)
+    { return ((_Link_type)__x)->_M_value_field; }
+  static const _Key& _STLP_CALL _S_key(_Base_ptr __x)
+    { return _KeyOfValue()(_S_value(_Link_type(__x)));} 
+  static _Color_type& _STLP_CALL _S_color(_Base_ptr __x)
+    { return (_Color_type&)(_Link_type(__x)->_M_color); }
+
+  static _Link_type  _STLP_CALL _S_minimum(_Link_type __x) 
+    { return (_Link_type)  _Rb_tree_node_base::_S_minimum(__x); }
+
+  static _Link_type  _STLP_CALL _S_maximum(_Link_type __x)
+    { return (_Link_type) _Rb_tree_node_base::_S_maximum(__x); }
+
+public:
+  typedef _Rb_tree_iterator<value_type, _Nonconst_traits<value_type> > iterator;
+  typedef _Rb_tree_iterator<value_type, _Const_traits<value_type> > const_iterator;
+  _STLP_DECLARE_BIDIRECTIONAL_REVERSE_ITERATORS;
+
+private:
+  iterator _M_insert(_Base_ptr __x, _Base_ptr __y, const value_type& __v, _Base_ptr __w = 0);
+  _Link_type _M_copy(_Link_type __x, _Link_type __p);
+  void _M_erase(_Link_type __x);
+
+public:
+                                // allocation/deallocation
+  _Rb_tree()
+    : _Rb_tree_base<_Value, _Alloc>(allocator_type()), _M_node_count(0), _M_key_compare(_Compare())
+    { _M_empty_initialize(); }
+
+  _Rb_tree(const _Compare& __comp)
+    : _Rb_tree_base<_Value, _Alloc>(allocator_type()), _M_node_count(0), _M_key_compare(__comp) 
+    { _M_empty_initialize(); }
+
+  _Rb_tree(const _Compare& __comp, const allocator_type& __a)
+    : _Rb_tree_base<_Value, _Alloc>(__a), _M_node_count(0), _M_key_compare(__comp) 
+    { _M_empty_initialize(); }
+
+  _Rb_tree(const _Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>& __x) 
+    : _Rb_tree_base<_Value, _Alloc>(__x.get_allocator()),
+      _M_node_count(0), _M_key_compare(__x._M_key_compare)
+  { 
+    if (__x._M_root() == 0)
+      _M_empty_initialize();
+    else {
+      _S_color(this->_M_header._M_data) = _S_rb_tree_red;
+      _M_root() = _M_copy(__x._M_root(), this->_M_header._M_data);
+      _M_leftmost() = _S_minimum(_M_root());
+      _M_rightmost() = _S_maximum(_M_root());
+    }
+    _M_node_count = __x._M_node_count;
+  }
+  ~_Rb_tree() { clear(); }
+  _Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>& operator=(const _Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>& __x);
+
+private:
+  void _M_empty_initialize() {
+    _S_color(this->_M_header._M_data) = _S_rb_tree_red; // used to distinguish header from 
+                                          // __root, in iterator.operator++
+    _M_root() = 0;
+    _M_leftmost() = this->_M_header._M_data;
+    _M_rightmost() = this->_M_header._M_data;
+  }
+
+public:    
+                                // accessors:
+  _Compare key_comp() const { return _M_key_compare; }
+
+  iterator begin() { return iterator(_M_leftmost()); }
+  const_iterator begin() const { return const_iterator(_M_leftmost()); }
+  iterator end() { return iterator(this->_M_header._M_data); }
+  const_iterator end() const { return const_iterator(this->_M_header._M_data); }
+
+  reverse_iterator rbegin() { return reverse_iterator(end()); }
+  const_reverse_iterator rbegin() const { 
+    return const_reverse_iterator(end()); 
+  }
+  reverse_iterator rend() { return reverse_iterator(begin()); }
+  const_reverse_iterator rend() const { 
+    return const_reverse_iterator(begin());
+  } 
+  bool empty() const { return _M_node_count == 0; }
+  size_type size() const { return _M_node_count; }
+  size_type max_size() const { return size_type(-1); }
+
+  void swap(_Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>& __t) {
+    _STLP_STD::swap(this->_M_header, __t._M_header);
+    _STLP_STD::swap(_M_node_count, __t._M_node_count);
+    _STLP_STD::swap(_M_key_compare, __t._M_key_compare);
+  }
+    
+public:
+                                // insert/erase
+  pair<iterator,bool> insert_unique(const value_type& __x);
+  iterator insert_equal(const value_type& __x);
+
+  iterator insert_unique(iterator __position, const value_type& __x);
+  iterator insert_equal(iterator __position, const value_type& __x);
+
+#ifdef _STLP_MEMBER_TEMPLATES  
+  template<class _II> void insert_equal(_II __first, _II __last) {
+    for ( ; __first != __last; ++__first)
+      insert_equal(*__first);
+  }
+  template<class _II> void insert_unique(_II __first, _II __last) {
+    for ( ; __first != __last; ++__first)
+      insert_unique(*__first);
+  }
+#else /* _STLP_MEMBER_TEMPLATES */
+  void insert_unique(const_iterator __first, const_iterator __last) {
+    for ( ; __first != __last; ++__first)
+      insert_unique(*__first);
+  }
+  void insert_unique(const value_type* __first, const value_type* __last) {
+    for ( ; __first != __last; ++__first)
+      insert_unique(*__first);
+  }
+  void insert_equal(const_iterator __first, const_iterator __last) {
+    for ( ; __first != __last; ++__first)
+      insert_equal(*__first);
+  }
+  void insert_equal(const value_type* __first, const value_type* __last) {
+    for ( ; __first != __last; ++__first)
+      insert_equal(*__first);
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  void erase(iterator __position) {
+    _Link_type __y = 
+      (_Link_type) _Rb_global_inst::_Rebalance_for_erase(__position._M_node,
+							 this->_M_header._M_data->_M_parent,
+							 this->_M_header._M_data->_M_left,
+							 this->_M_header._M_data->_M_right);
+    _STLP_STD::_Destroy(&__y->_M_value_field);
+    this->_M_header.deallocate(__y,1);
+    --_M_node_count;
+  }
+  
+  size_type erase(const key_type& __x) {
+    pair<iterator,iterator> __p = equal_range(__x);
+    size_type __n = distance(__p.first, __p.second);
+    erase(__p.first, __p.second);
+    return __n;
+  }
+  
+  void erase(iterator __first, iterator __last) {
+    if (__first == begin() && __last == end())
+      clear();
+    else
+      while (__first != __last) erase(__first++);
+  }
+
+  void erase(const key_type* __first, const key_type* __last) {
+    while (__first != __last) erase(*__first++);
+  }
+
+  void clear() {
+    if (_M_node_count != 0) {
+      _M_erase(_M_root());
+      _M_leftmost() = this->_M_header._M_data;
+      _M_root() = 0;
+      _M_rightmost() = this->_M_header._M_data;
+      _M_node_count = 0;
+    }
+  }      
+
+public:
+                                // set operations:
+# if defined(_STLP_MEMBER_TEMPLATES) && ! defined ( _STLP_NO_EXTENSIONS ) && !defined(__MRC__) && !(defined(__SC__) && !defined(__DMC__))
+  template <class _KT> iterator find(const _KT& __x) { return iterator(_M_find(__x)); }
+  template <class _KT> const_iterator find(const _KT& __x) const { return const_iterator(_M_find(__x)); }
+private:
+  template <class _KT> _Rb_tree_node<_Value>* _M_find(const _KT& __k) const
+# else
+  iterator find(const key_type& __x) { return iterator(_M_find(__x)); }
+  const_iterator find(const key_type& __x) const { return const_iterator(_M_find(__x)); }
+private:
+  _Rb_tree_node<_Value>* _M_find(const key_type& __k) const
+# endif
+  {
+    _Link_type __y = this->_M_header._M_data;      // Last node which is not less than __k. 
+    _Link_type __x = _M_root();      // Current node. 
+    
+    while (__x != 0) 
+      if (!_M_key_compare(_S_key(__x), __k))
+	__y = __x, __x = _S_left(__x);
+      else
+	__x = _S_right(__x);
+    if (__y == this->_M_header._M_data || _M_key_compare(__k, _S_key(__y)))
+      __y = this->_M_header._M_data;
+    return __y;
+  }
+  
+  _Link_type _M_lower_bound(const key_type& __k) const {
+    _Link_type __y = this->_M_header._M_data; /* Last node which is not less than __k. */
+    _Link_type __x = _M_root(); /* Current node. */
+    
+    while (__x != 0) 
+      if (!_M_key_compare(_S_key(__x), __k))
+	__y = __x, __x = _S_left(__x);
+      else
+	__x = _S_right(__x);
+    
+    return __y;
+  }
+
+  _Link_type _M_upper_bound(const key_type& __k) const {
+    _Link_type __y = this->_M_header._M_data; /* Last node which is greater than __k. */
+    _Link_type __x = _M_root(); /* Current node. */
+    
+    while (__x != 0) 
+      if (_M_key_compare(__k, _S_key(__x)))
+	__y = __x, __x = _S_left(__x);
+      else
+	__x = _S_right(__x);
+    
+    return __y;
+  }
+  
+public:  
+  size_type count(const key_type& __x) const;
+  iterator lower_bound(const key_type& __x) { return iterator(_M_lower_bound(__x)); }
+  const_iterator lower_bound(const key_type& __x) const { return const_iterator(_M_lower_bound(__x)); }
+  iterator upper_bound(const key_type& __x) { return iterator(_M_upper_bound(__x)); }
+  const_iterator upper_bound(const key_type& __x) const { return const_iterator(_M_upper_bound(__x)); }
+  pair<iterator,iterator> equal_range(const key_type& __x) {
+    return pair<iterator, iterator>(lower_bound(__x), upper_bound(__x));
+  }
+  pair<const_iterator, const_iterator> equal_range(const key_type& __x) const {
+    return pair<const_iterator,const_iterator>(lower_bound(__x),
+					       upper_bound(__x));
+  }
+
+public:
+                                // Debugging.
+  bool __rb_verify() const;
+};
+
+template <class _Key, class _Value, class _KeyOfValue, 
+          class _Compare, class _Alloc> inline bool _STLP_CALL 
+operator==(const _Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>& __x, 
+           const _Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>& __y)
+{
+  return __x.size() == __y.size() && equal(__x.begin(), __x.end(), __y.begin());
+}
+
+template <class _Key, class _Value, class _KeyOfValue, 
+          class _Compare, class _Alloc> inline bool _STLP_CALL 
+operator<(const _Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>& __x, 
+          const _Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>& __y)
+{
+  return lexicographical_compare(__x.begin(), __x.end(), 
+                                 __y.begin(), __y.end());
+}
+
+#ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+
+template <class _Key, class _Value, class _KeyOfValue, 
+          class _Compare, class _Alloc> inline bool _STLP_CALL 
+operator!=(const _Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>& __x, 
+           const _Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>& __y) {
+  return !(__x == __y);
+}
+
+template <class _Key, class _Value, class _KeyOfValue, 
+          class _Compare, class _Alloc> inline bool _STLP_CALL 
+operator>(const _Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>& __x, 
+          const _Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>& __y) {
+  return __y < __x;
+}
+
+template <class _Key, class _Value, class _KeyOfValue, 
+          class _Compare, class _Alloc> inline bool _STLP_CALL 
+operator<=(const _Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>& __x, 
+           const _Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>& __y) {
+  return !(__y < __x);
+}
+
+template <class _Key, class _Value, class _KeyOfValue, 
+          class _Compare, class _Alloc> inline bool _STLP_CALL 
+operator>=(const _Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>& __x, 
+           const _Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>& __y) {
+  return !(__x < __y);
+}
+
+#endif /* _STLP_USE_SEPARATE_RELOPS_NAMESPACE */
+
+#ifdef _STLP_FUNCTION_TMPL_PARTIAL_ORDER
+
+template <class _Key, class _Value, class _KeyOfValue, 
+          class _Compare, class _Alloc> inline void _STLP_CALL 
+swap(_Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>& __x, 
+     _Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>& __y)
+{
+  __x.swap(__y);
+}
+
+#endif /* _STLP_FUNCTION_TMPL_PARTIAL_ORDER */
+         
+_STLP_END_NAMESPACE
+
+# if !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_tree.c> 
+# endif
+
+# undef _Rb_tree
+
+#if defined (_STLP_DEBUG)
+# include <stl/debug/_tree.h> 
+#endif
+
+_STLP_BEGIN_NAMESPACE
+// Class rb_tree is not part of the C++ standard.  It is provided for
+// compatibility with the HP STL.
+
+template <class _Key, class _Value, class _KeyOfValue, class _Compare,
+          _STLP_DEFAULT_ALLOCATOR_SELECT(_Value) > struct rb_tree : public _Rb_tree<_Key, _Value, _KeyOfValue, _Compare, _Alloc> {
+  typedef _Rb_tree<_Key, _Value, _KeyOfValue, _Compare, _Alloc> _Base;
+  typedef typename _Base::allocator_type allocator_type;
+
+  rb_tree()
+     : _Rb_tree<_Key, _Value, _KeyOfValue, _Compare, _Alloc>(_Compare(), allocator_type()) {}
+  rb_tree(const _Compare& __comp,
+          const allocator_type& __a = allocator_type())
+    : _Rb_tree<_Key, _Value, _KeyOfValue, _Compare, _Alloc>(__comp, __a) {} 
+  ~rb_tree() {}
+};
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_INTERNAL_TREE_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_uninitialized.h b/main/source/stlport/stlport/stl/_uninitialized.h
new file mode 100644
index 00000000..c065e2a1
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_uninitialized.h
@@ -0,0 +1,287 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_UNINITIALIZED_H
+#define _STLP_INTERNAL_UNINITIALIZED_H
+
+# ifndef _STLP_CSTRING
+#  include <cstring>
+# endif
+
+# ifndef _STLP_INTERNAL_ALGOBASE_H
+#  include <stl/_algobase.h>
+# endif
+
+# ifndef _STLP_INTERNAL_CONSTRUCT_H
+#  include <stl/_construct.h>
+# endif
+
+_STLP_BEGIN_NAMESPACE
+
+// uninitialized_copy
+
+// Valid if copy construction is equivalent to assignment, and if the
+//  destructor is trivial.
+template <class _InputIter, class _ForwardIter>
+inline _ForwardIter 
+__uninitialized_copy(_InputIter __first, _InputIter __last, _ForwardIter __result,
+                     const __true_type&) {
+  return __copy_aux(__first, __last, __result, _BothPtrType< _InputIter, _ForwardIter> :: _Ret());
+}
+
+template <class _InputIter, class _ForwardIter>
+_STLP_INLINE_LOOP
+_ForwardIter 
+__uninitialized_copy(_InputIter __first, _InputIter __last, _ForwardIter __result,
+                     const __false_type&)
+{
+  _ForwardIter __cur = __result;
+  _STLP_TRY {
+    for ( ; __first != __last; ++__first, ++__cur)
+      _Construct(&*__cur, *__first);
+    return __cur;
+  }
+  _STLP_UNWIND(_STLP_STD::_Destroy(__result, __cur));
+# ifdef _STLP_THROW_RETURN_BUG
+  return __cur;
+# endif
+}
+
+template <class _InputIter, class _ForwardIter>
+inline _ForwardIter
+uninitialized_copy(_InputIter __first, _InputIter __last, _ForwardIter __result) {
+  return __uninitialized_copy(__first, __last, __result,  _IS_POD_ITER(__result, _ForwardIter));
+}
+
+inline char* 
+uninitialized_copy(const char* __first, const char* __last, char* __result) {
+  return  (char*)__copy_trivial (__first, __last, __result);
+}
+
+#  ifdef _STLP_HAS_WCHAR_T // dwa 8/15/97
+inline wchar_t* 
+uninitialized_copy(const wchar_t* __first, const wchar_t* __last, wchar_t* __result) {
+  return  (wchar_t*)__copy_trivial (__first, __last, __result);
+}
+#  endif /* _STLP_HAS_WCHAR_T */
+
+# ifndef _STLP_NO_EXTENSIONS
+// uninitialized_copy_n (not part of the C++ standard)
+
+template <class _InputIter, class _Size, class _ForwardIter>
+_STLP_INLINE_LOOP 
+pair<_InputIter, _ForwardIter>
+__uninitialized_copy_n(_InputIter __first, _Size __count,
+                       _ForwardIter __result,
+                       const input_iterator_tag &)
+{
+  _ForwardIter __cur = __result;
+  _STLP_TRY {
+    for ( ; __count > 0 ; --__count, ++__first, ++__cur) 
+      _Construct(&*__cur, *__first);
+    return pair<_InputIter, _ForwardIter>(__first, __cur);
+  }
+  _STLP_UNWIND(_STLP_STD::_Destroy(__result, __cur));
+# ifdef _STLP_THROW_RETURN_BUG
+  return pair<_InputIter, _ForwardIter>(__first, __cur);
+# endif
+}
+
+# if defined(_STLP_NONTEMPL_BASE_MATCH_BUG) 
+template <class _InputIterator, class _Size, class _ForwardIterator>
+inline pair<_InputIterator, _ForwardIterator>
+__uninitialized_copy_n(_InputIterator __first, _Size __count,
+                       _ForwardIterator __result,
+                       const forward_iterator_tag &) {
+  return __uninitialized_copy_n(__first, __count, __result, input_iterator_tag());
+}
+
+template <class _InputIterator, class _Size, class _ForwardIterator>
+inline pair<_InputIterator, _ForwardIterator>
+__uninitialized_copy_n(_InputIterator __first, _Size __count,
+                       _ForwardIterator __result,
+                       const bidirectional_iterator_tag &) {
+  return __uninitialized_copy_n(__first, __count, __result, input_iterator_tag());
+}
+# endif
+
+
+template <class _RandomAccessIter, class _Size, class _ForwardIter>
+inline pair<_RandomAccessIter, _ForwardIter>
+__uninitialized_copy_n(_RandomAccessIter __first, _Size __count, _ForwardIter __result, const random_access_iterator_tag &) {
+  _RandomAccessIter __last = __first + __count;
+  return pair<_RandomAccessIter, _ForwardIter>( __last, __uninitialized_copy(__first, __last, __result, 
+                                                                             _IS_POD_ITER(__result, _ForwardIter)));
+}
+
+// this is used internally in <rope> , which is extension itself.
+template <class _InputIter, class _Size, class _ForwardIter>
+inline pair<_InputIter, _ForwardIter>
+uninitialized_copy_n(_InputIter __first, _Size __count,
+                     _ForwardIter __result) {
+  return __uninitialized_copy_n(__first, __count, __result, _STLP_ITERATOR_CATEGORY(__first, _InputIter));
+}
+# endif /* _STLP_NO_EXTENSIONS */
+
+// Valid if copy construction is equivalent to assignment, and if the
+// destructor is trivial.
+template <class _ForwardIter, class _Tp>
+inline void
+__uninitialized_fill(_ForwardIter __first, _ForwardIter __last, 
+                     const _Tp& __x, const __true_type&) {
+  _STLP_STD::fill(__first, __last, __x);
+}
+
+template <class _ForwardIter, class _Tp>
+_STLP_INLINE_LOOP void
+__uninitialized_fill(_ForwardIter __first, _ForwardIter __last, 
+                     const _Tp& __x, const __false_type&)
+{
+  _ForwardIter __cur = __first;
+  _STLP_TRY {
+    for ( ; __cur != __last; ++__cur)
+      _Construct(&*__cur, __x);
+  }
+  _STLP_UNWIND(_STLP_STD::_Destroy(__first, __cur));
+}
+
+template <class _ForwardIter, class _Tp>
+inline void uninitialized_fill(_ForwardIter __first, _ForwardIter __last,  const _Tp& __x) {
+  __uninitialized_fill(__first, __last, __x, _IS_POD_ITER(__first, _ForwardIter));
+}
+
+// Valid if copy construction is equivalent to assignment, and if the
+//  destructor is trivial.
+template <class _ForwardIter, class _Size, class _Tp>
+inline _ForwardIter
+__uninitialized_fill_n(_ForwardIter __first, _Size __n,
+                       const _Tp& __x, const __true_type&) {
+  return _STLP_STD::fill_n(__first, __n, __x);
+}
+
+template <class _ForwardIter, class _Size, class _Tp>
+_STLP_INLINE_LOOP _ForwardIter
+__uninitialized_fill_n(_ForwardIter __first, _Size __n,
+                       const _Tp& __x, const __false_type&)
+{
+  _ForwardIter __cur = __first;
+  _STLP_TRY {
+    for ( ; __n > 0; --__n, ++__cur)
+      _Construct(&*__cur, __x);
+    return __cur;
+  }
+  _STLP_UNWIND(_STLP_STD::_Destroy(__first, __cur));
+# ifdef _STLP_THROW_RETURN_BUG
+  return __cur;
+# endif
+}
+
+template <class _ForwardIter, class _Size, class _Tp>
+inline _ForwardIter 
+uninitialized_fill_n(_ForwardIter __first, _Size __n, const _Tp& __x) {
+  return __uninitialized_fill_n(__first, __n, __x, _IS_POD_ITER(__first, _ForwardIter));
+}
+
+// Extensions: __uninitialized_copy_copy, __uninitialized_copy_fill, 
+// __uninitialized_fill_copy.
+
+// __uninitialized_copy_copy
+// Copies [first1, last1) into [result, result + (last1 - first1)), and
+//  copies [first2, last2) into
+//  [result, result + (last1 - first1) + (last2 - first2)).
+
+template <class _InputIter1, class _InputIter2, class _ForwardIter>
+inline _ForwardIter
+__uninitialized_copy_copy(_InputIter1 __first1, _InputIter1 __last1,
+                          _InputIter2 __first2, _InputIter2 __last2,
+                          _ForwardIter __result, __true_type)
+{
+  return __uninitialized_copy(__first2, __last2, 
+                              __uninitialized_copy(__first1, __last1, __result, __true_type()), __true_type());
+}
+
+template <class _InputIter1, class _InputIter2, class _ForwardIter>
+inline _ForwardIter
+__uninitialized_copy_copy(_InputIter1 __first1, _InputIter1 __last1,
+                          _InputIter2 __first2, _InputIter2 __last2,
+                          _ForwardIter __result, __false_type)
+{
+  _ForwardIter __mid = __uninitialized_copy(__first1, __last1, __result, _IS_POD_ITER(__result, _ForwardIter));
+  _STLP_TRY {
+    return __uninitialized_copy(__first2, __last2, __mid , _IS_POD_ITER(__result, _ForwardIter));
+  }
+  _STLP_UNWIND(_STLP_STD::_Destroy(__result, __mid));
+# ifdef _STLP_THROW_RETURN_BUG
+  return __mid;
+# endif
+}
+
+// __uninitialized_fill_copy
+// Fills [result, mid) with x, and copies [first, last) into
+//  [mid, mid + (last - first)).
+template <class _ForwardIter, class _Tp, class _InputIter>
+inline _ForwardIter 
+__uninitialized_fill_copy(_ForwardIter __result, _ForwardIter __mid, const _Tp& __x,
+                          _InputIter __first, _InputIter __last)
+{
+  typedef typename __type_traits<_Tp>::is_POD_type _I_POD;
+  __uninitialized_fill(__result, __mid, __x, _I_POD());
+  _STLP_TRY {
+    return __uninitialized_copy(__first, __last, __mid, _I_POD());
+  }
+  _STLP_UNWIND(_STLP_STD::_Destroy(__result, __mid));
+# ifdef _STLP_THROW_RETURN_BUG
+  return __result;
+# endif
+}
+
+// __uninitialized_copy_fill
+// Copies [first1, last1) into [first2, first2 + (last1 - first1)), and
+//  fills [first2 + (last1 - first1), last2) with x.
+template <class _InputIter, class _ForwardIter, class _Tp>
+inline void
+__uninitialized_copy_fill(_InputIter __first1, _InputIter __last1,
+                          _ForwardIter __first2, _ForwardIter __last2,
+                          const _Tp& __x)
+{
+  typedef typename __type_traits<_Tp>::is_POD_type _I_POD;
+  _ForwardIter __mid2 = __uninitialized_copy(__first1, __last1, __first2, _I_POD());
+  _STLP_TRY {
+    __uninitialized_fill(__mid2, __last2, __x, _I_POD());
+  }
+  _STLP_UNWIND(_STLP_STD::_Destroy(__first2, __mid2));
+}
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_INTERNAL_UNINITIALIZED_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_valarray.c b/main/source/stlport/stlport/stl/_valarray.c
new file mode 100644
index 00000000..7738feff
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_valarray.c
@@ -0,0 +1,197 @@
+/*
+ *
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+#ifndef _STLP_VALARRAY_C
+#define _STLP_VALARRAY_C
+
+#ifndef _STLP_VALARRAY_H
+# include <stl/_valarray.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _Tp>
+_Valarray_bool valarray<_Tp>:: operator!() const {
+  _Valarray_bool __tmp(this->size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < this->size(); ++__i)
+    __tmp[__i] = !(*this)[__i];
+  return __tmp;
+}
+
+// Behavior is undefined if __x and *this have different sizes
+template <class _Tp>
+valarray<_Tp>& valarray<_Tp>::operator=(const slice_array<_Tp>& __x)
+{
+  size_t __index = __x._M_slice.start();
+  for (size_t __i = 0;
+       __i < __x._M_slice.size();
+       ++__i, __index += __x._M_slice.stride())
+    (*this)[__i] = __x._M_array[__index];
+  return *this;
+}
+
+template <class _Tp>
+valarray<_Tp> valarray<_Tp>::operator[](slice __slice) const {
+  valarray<_Tp> __tmp(__slice.size(), _NoInit());
+  size_t __index = __slice.start();
+  for (size_t __i = 0;
+       __i < __slice.size();
+       ++__i, __index += __slice.stride())
+    __tmp[__i] = (*this)[__index];
+  return __tmp;
+}
+
+template <class _Size>
+bool _Gslice_Iter_tmpl<_Size>::_M_incr() {
+  size_t __dim = _M_indices.size() - 1;
+  ++_M_step;
+  while (true) {
+    _M_1d_idx += _M_gslice._M_strides[__dim];
+    if (++_M_indices[__dim] != _M_gslice._M_lengths[__dim])
+      return true;
+    else if (__dim != 0) {
+      _M_1d_idx -=
+	_M_gslice._M_strides[__dim] * _M_gslice._M_lengths[__dim];
+      _M_indices[__dim] = 0;
+      --__dim;
+    }
+    else
+      return false;
+  }
+}
+
+// Behavior is undefined if __x and *this have different sizes, or if
+// __x was constructed from a degenerate gslice.
+template <class _Tp>
+valarray<_Tp>& valarray<_Tp>::operator=(const gslice_array<_Tp>& __x)
+{
+  if (this->size() != 0) {
+    _Gslice_Iter __i(__x._M_gslice);
+    do
+      (*this)[__i._M_step] = __x._M_array[__i._M_1d_idx];
+    while(__i._M_incr());
+  }
+  return *this;
+}
+
+template <class _Tp>
+valarray<_Tp> valarray<_Tp>::operator[](gslice __slice) const
+{
+  valarray<_Tp> __tmp(__slice._M_size(), _NoInit());
+  if (__tmp.size() != 0) {
+    _Gslice_Iter __i(__slice);
+    do __tmp[__i._M_step] = (*this)[__i._M_1d_idx]; while(__i._M_incr());
+  }
+  return __tmp;
+}
+
+template <class _Tp>
+valarray<_Tp> valarray<_Tp>::operator[](const _Valarray_bool& __mask) const
+{
+  size_t _p_size = 0;
+  {
+    for (size_t __i = 0; __i < __mask.size(); ++__i)
+      if (__mask[__i]) ++_p_size;
+  }
+
+  valarray<_Tp> __tmp(_p_size, _NoInit());
+  size_t __idx = 0;
+  {
+    for (size_t __i = 0; __i < __mask.size(); ++__i)
+      if (__mask[__i]) __tmp[__idx++] = (*this)[__i];
+  }
+
+  return __tmp;
+}
+
+template <class _Tp>
+valarray<_Tp>& valarray<_Tp>::operator=(const indirect_array<_Tp>& __x) {
+  for (size_t __i = 0; __i < __x._M_addr.size(); ++__i)
+    (*this)[__i] = __x._M_array[__x._M_addr[__i]];
+  return *this;
+}
+
+template <class _Tp>
+valarray<_Tp>
+valarray<_Tp>::operator[](const _Valarray_size_t& __addr) const
+{
+  valarray<_Tp> __tmp(__addr.size(), _NoInit());
+  for (size_t __i = 0; __i < __addr.size(); ++__i)
+    __tmp[__i] = (*this)[__addr[__i]];
+  return __tmp;
+}
+
+//----------------------------------------------------------------------
+// Other valarray noninline member functions
+
+// Shift and cshift
+
+template <class _Tp>
+valarray<_Tp> valarray<_Tp>::shift(int __n) const
+{
+  valarray<_Tp> __tmp(this->size());
+
+  if (__n >= 0) {
+    if (__n < this->size())
+      copy(this->_M_first + __n, this->_M_first + this->size(),
+           __tmp._M_first);
+  }
+  else {
+    if (-__n < this->size())
+      copy(this->_M_first, this->_M_first + this->size() + __n,
+           __tmp._M_first - __n);
+  }
+  return __tmp;
+}
+
+template <class _Tp>
+valarray<_Tp> valarray<_Tp>::cshift(int __m) const
+{
+  valarray<_Tp> __tmp(this->size());
+
+  // Reduce __m to an equivalent number in the range [0, size()).  We
+  // have to be careful with negative numbers, since the sign of a % b
+  // is unspecified when a < 0.
+  long __n = __m;
+  if (this->size() < (numeric_limits<long>::max)())
+    __n %= long(this->size());
+  if (__n < 0)
+    __n += this->size();
+
+  copy(this->_M_first,       this->_M_first + __n,
+       __tmp._M_first + (this->size() - __n));
+  copy(this->_M_first + __n, this->_M_first + this->size(),
+       __tmp._M_first);
+
+  return __tmp;
+}
+
+_STLP_END_NAMESPACE
+
+#endif /*  _STLP_VALARRAY_C */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_valarray.h b/main/source/stlport/stlport/stl/_valarray.h
new file mode 100644
index 00000000..a3a8701f
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_valarray.h
@@ -0,0 +1,1657 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+#ifndef _STLP_VALARRAY_H
+#define _STLP_VALARRAY_H
+
+#ifndef _STLP_CMATH_H_HEADER
+#include <stl/_cmath.h>
+#endif
+#ifndef _STLP_INTERNAL_NEW_HEADER
+#include <stl/_new.h>
+#endif
+#ifndef _STLP_INTERNAL_ALGO_H
+#include <stl/_algo.h>
+#endif
+#ifndef _STLP_INTERNAL_NUMERIC_H
+#include <stl/_numeric.h>
+#endif
+#ifndef _STLP_LIMITS_H
+#include <limits>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+class slice;
+class gslice;
+
+template <class _Tp> class valarray;
+typedef valarray<bool>    _Valarray_bool;
+typedef valarray<size_t>  _Valarray_size_t;
+
+template <class _Tp> class slice_array;
+template <class _Tp> class gslice_array;
+template <class _Tp> class mask_array;
+template <class _Tp> class indirect_array;
+
+//----------------------------------------------------------------------
+// class valarray
+
+// Base class to handle memory allocation and deallocation.  We can't just
+// use vector<>, because vector<bool> would be unsuitable as an internal 
+// representation for valarray<bool>.
+
+template <class _Tp> 
+struct _Valarray_base
+{
+  _Tp*   _M_first;
+  size_t _M_size;
+
+  _Valarray_base() : _M_first(0), _M_size(0) {}
+  _Valarray_base(size_t __n) : _M_first(0), _M_size(0) { _M_allocate(__n); }
+  ~_Valarray_base() { _M_deallocate(); }
+
+  void _M_allocate(size_t __n) {
+    if (__n != 0) {
+      _M_first = __STATIC_CAST(_Tp*, (malloc(__n * sizeof(_Tp))));
+      _M_size  = __n;
+#   if !defined(_STLP_NO_BAD_ALLOC) && defined(_STLP_USE_EXCEPTIONS)
+      if (_M_first == 0) {
+        _M_size = 0;
+        throw _STLP_STD::bad_alloc();
+      }
+#   endif
+    }
+    else {
+      _M_first = 0;
+      _M_size = 0;
+    }
+  }
+
+  void _M_deallocate() {
+    free(_M_first);
+    _M_first = 0;
+    _M_size = 0;
+  }
+};
+
+template <class _Tp> 
+class valarray : private _Valarray_base<_Tp>
+{
+  friend class gslice;
+
+public:
+  typedef _Tp value_type;
+
+  // Basic constructors
+  valarray() : _Valarray_base<_Tp>() {}
+  valarray(size_t __n) : _Valarray_base<_Tp>(__n)
+    { uninitialized_fill_n(this->_M_first, this->_M_size, value_type()); }
+  valarray(const value_type& __x, size_t __n) : _Valarray_base<_Tp>(__n)
+    { uninitialized_fill_n(this->_M_first, this->_M_size, __x); }
+  valarray(const value_type* __p, size_t __n) : _Valarray_base<_Tp>(__n)
+    { uninitialized_copy(__p, __p + __n, this->_M_first); } 
+  valarray(const valarray<_Tp>& __x) : _Valarray_base<_Tp>(__x._M_size) {
+    uninitialized_copy(__x._M_first, __x._M_first + __x._M_size,
+                       this->_M_first);
+  }
+
+  // Constructors from auxiliary array types
+  valarray(const slice_array<_Tp>&);
+  valarray(const gslice_array<_Tp>&);
+  valarray(const mask_array<_Tp>&);
+  valarray(const indirect_array<_Tp>&);
+
+  // Destructor
+  ~valarray() { _STLP_STD::_Destroy(this->_M_first, this->_M_first + this->_M_size); }
+
+  // Extension: constructor that doesn't initialize valarray elements to a
+  // specific value.  This is faster for types such as int and double.
+private:
+  void _M_initialize(const __true_type&) {}
+  void _M_initialize(const __false_type&)
+    { uninitialized_fill_n(this->_M_first, this->_M_size, value_type()); }
+
+public:
+  struct _NoInit {};
+  valarray(size_t __n, _NoInit) : _Valarray_base<_Tp>(__n) {
+    typedef typename __type_traits<_Tp>::has_trivial_default_constructor _Is_Trivial;
+    _M_initialize(_Is_Trivial());
+  }
+
+public:                         // Assignment
+  // Basic assignment.  Note that 'x = y' is undefined if x.size() != y.size()
+  valarray<_Tp>& operator=(const valarray<_Tp>& __x) {
+    _STLP_ASSERT(__x.size() == this->size())
+    if (this != &__x)
+      copy(__x._M_first, __x._M_first + __x._M_size, this->_M_first);
+    return *this;
+  }
+
+  // Scalar assignment
+  valarray<_Tp>& operator=(const value_type& __x) {
+    fill_n(this->_M_first, this->_M_size, __x);
+    return *this;
+  }
+
+  // Assignment of auxiliary array types
+  valarray<_Tp>& operator=(const slice_array<_Tp>&);
+  valarray<_Tp>& operator=(const gslice_array<_Tp>&);
+  valarray<_Tp>& operator=(const mask_array<_Tp>&);
+  valarray<_Tp>& operator=(const indirect_array<_Tp>&);
+
+public:                         // Element access
+  value_type  operator[](size_t __n) const { return this->_M_first[__n]; }
+  value_type& operator[](size_t __n)       { return this->_M_first[__n]; }
+  size_t size() const { return this->_M_size; }
+
+public:                         // Subsetting operations with auxiliary type
+  valarray<_Tp>            operator[](slice) const;
+  slice_array<_Tp>    operator[](slice);
+  valarray<_Tp>            operator[](gslice) const;
+  gslice_array<_Tp>   operator[](const gslice&);  
+  valarray<_Tp>            operator[](const _Valarray_bool&) const;
+  mask_array<_Tp>     operator[](const _Valarray_bool&);
+  valarray<_Tp>            operator[](const _Valarray_size_t&) const;
+  indirect_array<_Tp> operator[](const _Valarray_size_t&);
+  
+public:                         // Unary operators.
+  valarray<_Tp> operator+() const { return *this; }
+
+  valarray<_Tp> operator-() const {
+    valarray<_Tp> __tmp(this->size(), _NoInit());
+    for (size_t __i = 0; __i < this->size(); ++__i)
+      __tmp[__i] = -(*this)[__i];
+    return __tmp;
+  }
+  
+  valarray<_Tp> operator~() const {
+    valarray<_Tp> __tmp(this->size(), _NoInit());
+    for (size_t __i = 0; __i < this->size(); ++__i)
+      __tmp[__i] = ~(*this)[__i];
+    return __tmp;
+  }
+
+  _Valarray_bool operator!() const;
+
+public:                         // Scalar computed assignment.
+  valarray<_Tp>& operator*= (const value_type& __x) {
+    for (size_t __i = 0; __i < this->size(); ++__i)
+      (*this)[__i] *= __x;
+    return *this;
+  }
+    
+  valarray<_Tp>& operator/= (const value_type& __x) {
+    for (size_t __i = 0; __i < this->size(); ++__i)
+      (*this)[__i] /= __x;
+    return *this;
+  }
+
+  valarray<_Tp>& operator%= (const value_type& __x) {
+    for (size_t __i = 0; __i < this->size(); ++__i)
+      (*this)[__i] %= __x;
+    return *this;
+  }
+
+  valarray<_Tp>& operator+= (const value_type& __x) {
+    for (size_t __i = 0; __i < this->size(); ++__i)
+      (*this)[__i] += __x;
+    return *this;
+  }
+
+  valarray<_Tp>& operator-= (const value_type& __x) {
+    for (size_t __i = 0; __i < this->size(); ++__i)
+      (*this)[__i] -= __x;
+    return *this;
+  }
+
+  valarray<_Tp>& operator^= (const value_type& __x) {
+    for (size_t __i = 0; __i < this->size(); ++__i)
+      (*this)[__i] ^= __x;
+    return *this;
+  }
+
+  valarray<_Tp>& operator&= (const value_type& __x) {
+    for (size_t __i = 0; __i < this->size(); ++__i)
+      (*this)[__i] &= __x;
+    return *this;
+  }
+
+  valarray<_Tp>& operator|= (const value_type& __x) {
+    for (size_t __i = 0; __i < this->size(); ++__i)
+      (*this)[__i] |= __x;
+    return *this;
+  }
+
+  valarray<_Tp>& operator<<= (const value_type& __x) {
+    for (size_t __i = 0; __i < this->size(); ++__i)
+      (*this)[__i] <<= __x;
+    return *this;
+  }
+
+  valarray<_Tp>& operator>>= (const value_type& __x) {
+    for (size_t __i = 0; __i < this->size(); ++__i)
+      (*this)[__i] >>= __x;
+    return *this;
+  }
+
+public:                         // Array computed assignment.
+  valarray<_Tp>& operator*= (const valarray<_Tp>& __x) {
+    for (size_t __i = 0; __i < this->size(); ++__i)
+      (*this)[__i] *= __x[__i];
+    return *this;
+  }
+    
+  valarray<_Tp>& operator/= (const valarray<_Tp>& __x) {
+    for (size_t __i = 0; __i < this->size(); ++__i)
+      (*this)[__i] /= __x[__i];
+    return *this;
+  }
+
+  valarray<_Tp>& operator%= (const valarray<_Tp>& __x) {
+    for (size_t __i = 0; __i < this->size(); ++__i)
+      (*this)[__i] %= __x[__i];
+    return *this;
+  }
+
+  valarray<_Tp>& operator+= (const valarray<_Tp>& __x) {
+    for (size_t __i = 0; __i < this->size(); ++__i)
+      (*this)[__i] += __x[__i];
+    return *this;
+  }
+
+  valarray<_Tp>& operator-= (const valarray<_Tp>& __x) {
+    for (size_t __i = 0; __i < this->size(); ++__i)
+      (*this)[__i] -= __x[__i];
+    return *this;
+  }
+
+  valarray<_Tp>& operator^= (const valarray<_Tp>& __x) {
+    for (size_t __i = 0; __i < this->size(); ++__i)
+      (*this)[__i] ^= __x[__i];
+    return *this;
+  }
+
+  valarray<_Tp>& operator&= (const valarray<_Tp>& __x) {
+    for (size_t __i = 0; __i < this->size(); ++__i)
+      (*this)[__i] &= __x[__i];
+    return *this;
+  }
+
+  valarray<_Tp>& operator|= (const valarray<_Tp>& __x) {
+    for (size_t __i = 0; __i < this->size(); ++__i)
+      (*this)[__i] |= __x[__i];
+    return *this;
+  }
+
+  valarray<_Tp>& operator<<= (const valarray<_Tp>& __x) {
+    for (size_t __i = 0; __i < this->size(); ++__i)
+      (*this)[__i] <<= __x[__i];
+    return *this;
+  }
+
+  valarray<_Tp>& operator>>= (const valarray<_Tp>& __x) {
+    for (size_t __i = 0; __i < this->size(); ++__i)
+      (*this)[__i] >>= __x[__i];
+    return *this;
+  }
+
+public:                         // Other member functions.
+
+  // The result is undefined for zero-length arrays
+  value_type sum() const {
+    return accumulate(this->_M_first + 1, this->_M_first + this->_M_size,
+                      (*this)[0]);
+  }
+
+  // The result is undefined for zero-length arrays
+  value_type (min) () const {
+    return *min_element(this->_M_first + 0, this->_M_first + this->_M_size);
+  }
+
+  value_type (max) () const {
+    return *max_element(this->_M_first + 0, this->_M_first + this->_M_size);
+  }
+
+  valarray<_Tp> shift(int __n) const;
+  valarray<_Tp> cshift(int __n) const;
+
+  valarray<_Tp> apply(value_type __f(value_type)) const {
+    valarray<_Tp> __tmp(this->size());
+    transform(this->_M_first + 0, this->_M_first + this->_M_size, __tmp._M_first,
+              __f);
+    return __tmp;
+  }
+  valarray<_Tp> apply(value_type __f(const value_type&)) const {
+    valarray<_Tp> __tmp(this->size());
+    transform(this->_M_first + 0, this->_M_first + this->_M_size, __tmp._M_first,
+              __f);
+    return __tmp;
+  }
+  
+  void resize(size_t __n, value_type __x = value_type()) {
+    _STLP_STD::_Destroy(this->_M_first, this->_M_first + this->_M_size);
+    this->_Valarray_base<_Tp>::_M_deallocate();
+    this->_Valarray_base<_Tp>::_M_allocate(__n);
+    uninitialized_fill_n(this->_M_first, this->_M_size, __x);
+  }
+};
+
+//----------------------------------------------------------------------
+// valarray non-member functions.
+
+// Binary arithmetic operations between two arrays.  Behavior is
+// undefined if the two arrays do not have the same length.
+
+template <class _Tp> 
+inline valarray<_Tp>  _STLP_CALL operator*(const valarray<_Tp>& __x,
+                                           const valarray<_Tp>& __y) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] * __y[__i];
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp>  _STLP_CALL operator/(const valarray<_Tp>& __x,
+                                           const valarray<_Tp>& __y) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] / __y[__i];
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp>  _STLP_CALL operator%(const valarray<_Tp>& __x,
+                                           const valarray<_Tp>& __y) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] % __y[__i];
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp>  _STLP_CALL operator+(const valarray<_Tp>& __x,
+                                           const valarray<_Tp>& __y) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] + __y[__i];
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp>  _STLP_CALL operator-(const valarray<_Tp>& __x,
+                                           const valarray<_Tp>& __y) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] - __y[__i];
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator^(const valarray<_Tp>& __x,
+                               const valarray<_Tp>& __y) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] ^ __y[__i];
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator&(const valarray<_Tp>& __x,
+                               const valarray<_Tp>& __y) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] & __y[__i];
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator|(const valarray<_Tp>& __x,
+                               const valarray<_Tp>& __y) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] | __y[__i];
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator<<(const valarray<_Tp>& __x,
+                               const valarray<_Tp>& __y) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] << __y[__i];
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator>>(const valarray<_Tp>& __x,
+                               const valarray<_Tp>& __y) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] >> __y[__i];
+  return __tmp;
+}
+
+// Binary arithmetic operations between an array and a scalar.
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator*(const valarray<_Tp>& __x, const _Tp& __c) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i]  * __c;
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator*(const _Tp& __c, const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __c * __x[__i];
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator/(const valarray<_Tp>& __x, const _Tp& __c) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i]  / __c;
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator/(const _Tp& __c, const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __c / __x[__i];
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator%(const valarray<_Tp>& __x, const _Tp& __c) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i]  % __c;
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator%(const _Tp& __c, const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __c % __x[__i];
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator+(const valarray<_Tp>& __x, const _Tp& __c) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i]  + __c;
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator+(const _Tp& __c, const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __c + __x[__i];
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator-(const valarray<_Tp>& __x, const _Tp& __c) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i]  - __c;
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator-(const _Tp& __c, const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __c - __x[__i];
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator^(const valarray<_Tp>& __x, const _Tp& __c) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i]  ^ __c;
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator^(const _Tp& __c, const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __c ^ __x[__i];
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator&(const valarray<_Tp>& __x, const _Tp& __c) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i]  & __c;
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator&(const _Tp& __c, const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __c & __x[__i];
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator|(const valarray<_Tp>& __x, const _Tp& __c) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i]  | __c;
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator|(const _Tp& __c, const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __c | __x[__i];
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator<<(const valarray<_Tp>& __x, const _Tp& __c) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i]  << __c;
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator<<(const _Tp& __c, const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __c << __x[__i];
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator>>(const valarray<_Tp>& __x, const _Tp& __c) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i]  >> __c;
+  return __tmp;
+}
+
+template <class _Tp> 
+inline valarray<_Tp> _STLP_CALL operator>>(const _Tp& __c, const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __c >> __x[__i];
+  return __tmp;
+}
+
+// Binary logical operations between two arrays.  Behavior is undefined
+// if the two arrays have different lengths.  Note that operator== does
+// not do what you might at first expect.
+
+template <class _Tp> 
+inline _Valarray_bool _STLP_CALL operator==(const valarray<_Tp>& __x,
+                                 const valarray<_Tp>& __y)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] == __y[__i];
+  return __tmp;  
+}
+
+template <class _Tp> 
+inline _Valarray_bool _STLP_CALL operator<(const valarray<_Tp>& __x,
+                                const valarray<_Tp>& __y)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] < __y[__i];
+  return __tmp;  
+}
+
+#ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+
+template <class _Tp> 
+inline _Valarray_bool _STLP_CALL operator!=(const valarray<_Tp>& __x,
+                                 const valarray<_Tp>& __y)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] != __y[__i];
+  return __tmp;  
+}
+
+template <class _Tp> 
+inline _Valarray_bool _STLP_CALL operator>(const valarray<_Tp>& __x,
+                                const valarray<_Tp>& __y)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] > __y[__i];
+  return __tmp;  
+}
+
+template <class _Tp> 
+inline _Valarray_bool _STLP_CALL operator<=(const valarray<_Tp>& __x,
+                                 const valarray<_Tp>& __y)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] <= __y[__i];
+  return __tmp;  
+}
+
+template <class _Tp> 
+inline _Valarray_bool _STLP_CALL operator>=(const valarray<_Tp>& __x,
+                                 const valarray<_Tp>& __y)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] >= __y[__i];
+  return __tmp;  
+}
+
+#endif /* _STLP_USE_SEPARATE_RELOPS_NAMESPACE */
+// fbp : swap ?
+
+template <class _Tp> 
+inline _Valarray_bool _STLP_CALL operator&&(const valarray<_Tp>& __x,
+                                 const valarray<_Tp>& __y)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] && __y[__i];
+  return __tmp;  
+}
+
+template <class _Tp> 
+inline _Valarray_bool _STLP_CALL operator||(const valarray<_Tp>& __x,
+                                 const valarray<_Tp>& __y)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] || __y[__i];
+  return __tmp;  
+}
+
+// Logical operations between an array and a scalar.
+
+template <class _Tp>
+inline _Valarray_bool _STLP_CALL operator==(const valarray<_Tp>& __x, const _Tp& __c)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] == __c;
+  return __tmp;  
+}
+
+template <class _Tp>
+inline _Valarray_bool _STLP_CALL operator==(const _Tp& __c, const valarray<_Tp>& __x)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __c == __x[__i];
+  return __tmp;  
+}
+
+template <class _Tp>
+inline _Valarray_bool _STLP_CALL operator!=(const valarray<_Tp>& __x, const _Tp& __c)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] != __c;
+  return __tmp;  
+}
+
+template <class _Tp>
+inline _Valarray_bool _STLP_CALL operator!=(const _Tp& __c, const valarray<_Tp>& __x)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __c != __x[__i];
+  return __tmp;  
+}
+
+template <class _Tp>
+inline _Valarray_bool _STLP_CALL operator<(const valarray<_Tp>& __x, const _Tp& __c)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] < __c;
+  return __tmp;  
+}
+
+template <class _Tp>
+inline _Valarray_bool _STLP_CALL operator<(const _Tp& __c, const valarray<_Tp>& __x)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __c < __x[__i];
+  return __tmp;  
+}
+
+template <class _Tp>
+inline _Valarray_bool _STLP_CALL operator>(const valarray<_Tp>& __x, const _Tp& __c)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] > __c;
+  return __tmp;  
+}
+
+template <class _Tp>
+inline _Valarray_bool _STLP_CALL operator>(const _Tp& __c, const valarray<_Tp>& __x)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __c > __x[__i];
+  return __tmp;  
+}
+
+template <class _Tp>
+inline _Valarray_bool _STLP_CALL operator<=(const valarray<_Tp>& __x, const _Tp& __c)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i]  <= __c;
+  return __tmp;  
+}
+
+template <class _Tp>
+inline _Valarray_bool _STLP_CALL operator<=(const _Tp& __c, const valarray<_Tp>& __x)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __c <= __x[__i];
+  return __tmp;  
+}
+
+template <class _Tp>
+inline _Valarray_bool _STLP_CALL operator>=(const valarray<_Tp>& __x, const _Tp& __c)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] >= __c;
+  return __tmp;  
+}
+
+template <class _Tp>
+inline _Valarray_bool _STLP_CALL operator>=(const _Tp& __c, const valarray<_Tp>& __x)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __c >= __x[__i];
+  return __tmp;  
+}
+
+template <class _Tp>
+inline _Valarray_bool _STLP_CALL operator&&(const valarray<_Tp>& __x, const _Tp& __c)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] && __c;
+  return __tmp;  
+}
+
+template <class _Tp>
+inline _Valarray_bool _STLP_CALL operator&&(const _Tp& __c, const valarray<_Tp>& __x)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __c && __x[__i];
+  return __tmp;  
+}
+
+template <class _Tp>
+inline _Valarray_bool _STLP_CALL operator||(const valarray<_Tp>& __x, const _Tp& __c)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __x[__i] || __c;
+  return __tmp;  
+}
+
+template <class _Tp>
+inline _Valarray_bool _STLP_CALL operator||(const _Tp& __c, const valarray<_Tp>& __x)
+{
+  _Valarray_bool __tmp(__x.size(), _Valarray_bool::_NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = __c || __x[__i];
+  return __tmp;  
+}
+
+// valarray "transcendentals" (the list includes abs and sqrt, which,
+// of course, are not transcendental).
+
+template <class _Tp>
+inline valarray<_Tp> abs(const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = _STLP_DO_ABS(_Tp)(__x[__i]);
+  return __tmp;
+}
+
+template <class _Tp>
+inline valarray<_Tp> acos(const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = _STLP_DO_ACOS(_Tp)(__x[__i]);
+  return __tmp;
+}
+
+template <class _Tp>
+inline valarray<_Tp> asin(const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = _STLP_DO_ASIN(_Tp)(__x[__i]);
+  return __tmp;
+}
+
+template <class _Tp>
+inline valarray<_Tp> atan(const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = _STLP_DO_ATAN(_Tp)(__x[__i]);
+  return __tmp;
+}
+
+template <class _Tp>
+inline valarray<_Tp> atan2(const valarray<_Tp>& __x,
+                           const valarray<_Tp>& __y) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = _STLP_DO_ATAN2(_Tp)(__x[__i], __y[__i]);
+  return __tmp;
+}
+
+template <class _Tp>
+inline valarray<_Tp> atan2(const valarray<_Tp>& __x, const _Tp& __c) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = _STLP_DO_ATAN2(_Tp)(__x[__i], __c);
+  return __tmp;
+}
+
+template <class _Tp>
+inline valarray<_Tp> atan2(const _Tp& __c, const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = _STLP_DO_ATAN2(_Tp)(__c, __x[__i]);
+  return __tmp;
+}
+
+template <class _Tp>
+inline valarray<_Tp> cos(const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = _STLP_DO_COS(_Tp)(__x[__i]);
+  return __tmp;
+}
+
+template <class _Tp>
+inline valarray<_Tp> cosh(const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = _STLP_DO_COSH(_Tp)(__x[__i]);
+  return __tmp;
+}
+
+template <class _Tp>
+inline valarray<_Tp> exp(const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = _STLP_DO_EXP(_Tp)(__x[__i]);
+  return __tmp;
+}
+
+template <class _Tp>
+inline valarray<_Tp> log(const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = _STLP_DO_LOG(_Tp)(__x[__i]);
+  return __tmp;
+}
+
+template <class _Tp>
+inline valarray<_Tp> log10(const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = _STLP_DO_LOG10(_Tp)(__x[__i]);
+  return __tmp;
+}
+
+template <class _Tp>
+inline valarray<_Tp> pow(const valarray<_Tp>& __x,
+                           const valarray<_Tp>& __y) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = _STLP_DO_POW(_Tp)(__x[__i], __y[__i]);
+  return __tmp;
+}
+
+template <class _Tp>
+inline valarray<_Tp> pow(const valarray<_Tp>& __x, const _Tp& __c) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = _STLP_DO_POW(_Tp)(__x[__i], __c);
+  return __tmp;
+}
+
+template <class _Tp>
+inline valarray<_Tp> pow(const _Tp& __c, const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = _STLP_DO_POW(_Tp)(__c, __x[__i]);
+  return __tmp;
+}
+
+template <class _Tp>
+inline valarray<_Tp> sin(const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = _STLP_DO_SIN(_Tp)(__x[__i]);
+  return __tmp;
+}
+
+template <class _Tp>
+inline valarray<_Tp> sinh(const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = _STLP_DO_SINH(_Tp)(__x[__i]);
+  return __tmp;
+}
+
+template <class _Tp>
+inline valarray<_Tp> sqrt(const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = _STLP_DO_SQRT(_Tp)(__x[__i]);
+  return __tmp;
+}
+
+template <class _Tp>
+inline valarray<_Tp> tan(const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = _STLP_DO_TAN(_Tp)(__x[__i]);
+  return __tmp;
+}
+
+template <class _Tp>
+inline valarray<_Tp> tanh(const valarray<_Tp>& __x) {
+  typedef typename valarray<_Tp>::_NoInit _NoInit;
+  valarray<_Tp> __tmp(__x.size(), _NoInit());
+  for (size_t __i = 0; __i < __x.size(); ++__i)
+    __tmp[__i] = _STLP_DO_TANH(_Tp)(__x[__i]);
+  return __tmp;
+}
+
+//----------------------------------------------------------------------
+// slice and slice_array
+
+class slice {
+public:
+  slice() : _M_start(0), _M_length(0), _M_stride(0) {}
+  slice(size_t __start, size_t __length, size_t __stride)
+    : _M_start(__start), _M_length(__length), _M_stride(__stride)
+    {}
+  __TRIVIAL_DESTRUCTOR(slice)
+
+  size_t start()  const { return _M_start; }
+  size_t size()   const { return _M_length; }
+  size_t stride() const { return _M_stride; }
+
+   
+private:
+  size_t _M_start;
+  size_t _M_length;
+  size_t _M_stride;
+};
+
+template <class _Tp>
+class slice_array {
+  friend class valarray<_Tp>;
+public:
+  typedef _Tp value_type;
+
+  void operator=(const valarray<value_type>& __x) const {
+    size_t __index = _M_slice.start();
+    for (size_t __i = 0;
+         __i < _M_slice.size();
+         ++__i, __index += _M_slice.stride())
+      _M_array[__index] = __x[__i];
+  }
+
+  void operator*=(const valarray<value_type>& __x) const {
+    size_t __index = _M_slice.start();
+    for (size_t __i = 0;
+         __i < _M_slice.size();
+         ++__i, __index += _M_slice.stride())
+      _M_array[__index] *= __x[__i];
+  }
+
+  void operator/=(const valarray<value_type>& __x) const {
+    size_t __index = _M_slice.start();
+    for (size_t __i = 0;
+         __i < _M_slice.size();
+         ++__i, __index += _M_slice.stride())
+      _M_array[__index] /= __x[__i];
+  }
+
+  void operator%=(const valarray<value_type>& __x) const {
+    size_t __index = _M_slice.start();
+    for (size_t __i = 0;
+         __i < _M_slice.size();
+         ++__i, __index += _M_slice.stride())
+      _M_array[__index] %= __x[__i];
+  }
+
+  void operator+=(const valarray<value_type>& __x) const {
+    size_t __index = _M_slice.start();
+    for (size_t __i = 0;
+         __i < _M_slice.size();
+         ++__i, __index += _M_slice.stride())
+      _M_array[__index] += __x[__i];
+  }
+
+  void operator-=(const valarray<value_type>& __x) const {
+    size_t __index = _M_slice.start();
+    for (size_t __i = 0;
+         __i < _M_slice.size();
+         ++__i, __index += _M_slice.stride())
+      _M_array[__index] -= __x[__i];
+  }
+
+  void operator^=(const valarray<value_type>& __x) const {
+    size_t __index = _M_slice.start();
+    for (size_t __i = 0;
+         __i < _M_slice.size();
+         ++__i, __index += _M_slice.stride())
+      _M_array[__index] ^= __x[__i];
+  }
+
+  void operator&=(const valarray<value_type>& __x) const {
+    size_t __index = _M_slice.start();
+    for (size_t __i = 0;
+         __i < _M_slice.size();
+         ++__i, __index += _M_slice.stride())
+      _M_array[__index] &= __x[__i];
+  }
+
+  void operator|=(const valarray<value_type>& __x) const {
+    size_t __index = _M_slice.start();
+    for (size_t __i = 0;
+         __i < _M_slice.size();
+         ++__i, __index += _M_slice.stride())
+      _M_array[__index] |= __x[__i];
+  }
+
+  void operator<<=(const valarray<value_type>& __x) const {
+    size_t __index = _M_slice.start();
+    for (size_t __i = 0;
+         __i < _M_slice.size();
+         ++__i, __index += _M_slice.stride())
+      _M_array[__index] <<= __x[__i];
+  }
+
+  void operator>>=(const valarray<value_type>& __x) const {
+    size_t __index = _M_slice.start();
+    for (size_t __i = 0;
+         __i < _M_slice.size();
+         ++__i, __index += _M_slice.stride())
+      _M_array[__index] >>= __x[__i];
+  }
+
+  void operator=(const value_type& __c) {
+    size_t __index = _M_slice.start();
+    for (size_t __i = 0;
+         __i < _M_slice.size();
+         ++__i, __index += _M_slice.stride())
+      _M_array[__index] = __c;
+  }
+
+  ~slice_array() {}
+
+private:
+  slice_array(const slice& __slice, valarray<_Tp>& __array)
+    : _M_slice(__slice), _M_array(__array)
+    {}
+
+  slice          _M_slice;
+  valarray<_Tp>& _M_array;
+
+private:                        // Disable assignment and default constructor
+  slice_array();
+};
+
+// valarray member functions dealing with slice and slice_array
+
+template <class _Tp>
+inline valarray<_Tp>::valarray(const slice_array<_Tp>& __x)
+  : _Valarray_base<_Tp>(__x._M_slice.size())
+{
+  typedef typename __type_traits<_Tp>::has_trivial_default_constructor
+          _Is_Trivial;
+  _M_initialize(_Is_Trivial());  
+  *this = __x;
+}
+
+
+template <class _Tp>
+inline slice_array<_Tp> valarray<_Tp>::operator[](slice __slice) {
+  return slice_array<_Tp>(__slice, *this);
+}
+
+//----------------------------------------------------------------------
+// gslice and gslice_array
+
+template <class _Size>
+struct _Gslice_Iter_tmpl;
+
+class gslice {
+  friend struct _Gslice_Iter_tmpl<size_t>;
+public:
+  gslice() : _M_start(0), _M_lengths(0), _M_strides(0) {}
+  gslice(size_t __start,
+         const _Valarray_size_t& __lengths, const _Valarray_size_t& __strides)
+    : _M_start(__start), _M_lengths(__lengths), _M_strides(__strides)
+    {}
+  __TRIVIAL_DESTRUCTOR(gslice)
+
+  size_t start()            const { return _M_start; }
+  _Valarray_size_t size()   const { return _M_lengths; }
+  _Valarray_size_t stride() const { return _M_strides; }
+
+  // Extension: check for an empty gslice.
+  bool _M_empty() const { return _M_lengths.size() == 0; }
+
+  // Extension: number of indices this gslice represents.  (For a degenerate
+  // gslice, they're not necessarily all distinct.)
+  size_t _M_size() const {
+    return !this->_M_empty()
+      ? accumulate(_M_lengths._M_first + 1,
+                   _M_lengths._M_first + _M_lengths._M_size,
+                   _M_lengths[0],
+                   multiplies<size_t>())
+      : 0;
+  }
+
+# ifndef __HP_aCC
+private:
+# endif
+
+  size_t _M_start;
+  _Valarray_size_t _M_lengths;
+  _Valarray_size_t _M_strides;
+};
+
+// This is not an STL iterator.  It is constructed from a gslice, and it
+// steps through the gslice indices in sequence.  See 23.3.6 of the C++
+// standard, paragraphs 2-3, for an explanation of the sequence.  At
+// each step we get two things: the ordinal (i.e. number of steps taken),
+// and the one-dimensional index.
+
+template <class _Size>
+struct _Gslice_Iter_tmpl {
+  _Gslice_Iter_tmpl(const gslice& __gslice)
+    : _M_step(0), _M_1d_idx(__gslice.start()),
+      _M_indices(size_t(0), __gslice._M_lengths.size()),
+      _M_gslice(__gslice)
+    {}
+    
+  bool _M_done() const { return _M_indices[0] == _M_gslice._M_lengths[0]; }
+
+  bool _M_incr();
+
+  _Size _M_step;
+  _Size _M_1d_idx;
+
+  valarray<_Size> _M_indices;
+  const gslice& _M_gslice;
+};
+
+typedef _Gslice_Iter_tmpl<size_t> _Gslice_Iter;
+
+template <class _Tp>
+class gslice_array {
+  friend class valarray<_Tp>;
+public:
+  typedef _Tp value_type;
+
+  void operator= (const valarray<value_type>& __x) const {
+    if (!_M_gslice._M_empty()) {
+      _Gslice_Iter __i(_M_gslice);
+      do _M_array[__i._M_1d_idx] = __x[__i._M_step]; while(__i._M_incr());
+    }
+  }
+
+  void operator*= (const valarray<value_type>& __x) const {
+    if (!_M_gslice._M_empty()) {
+      _Gslice_Iter __i(_M_gslice);
+      do _M_array[__i._M_1d_idx] *= __x[__i._M_step]; while(__i._M_incr());
+    }
+  }
+
+  void operator/= (const valarray<value_type>& __x) const {
+    if (!_M_gslice._M_empty()) {
+      _Gslice_Iter __i(_M_gslice);
+      do _M_array[__i._M_1d_idx] /= __x[__i._M_step]; while(__i._M_incr());
+    }
+  }
+
+  void operator%= (const valarray<value_type>& __x) const {
+    if (!_M_gslice._M_empty()) {
+      _Gslice_Iter __i(_M_gslice);
+      do _M_array[__i._M_1d_idx] %= __x[__i._M_step]; while(__i._M_incr());
+    }
+  }
+
+  void operator+= (const valarray<value_type>& __x) const {
+    if (!_M_gslice._M_empty()) {
+      _Gslice_Iter __i(_M_gslice);
+      do _M_array[__i._M_1d_idx] += __x[__i._M_step]; while(__i._M_incr());
+    }
+  }
+
+  void operator-= (const valarray<value_type>& __x) const {
+    if (!_M_gslice._M_empty()) {
+      _Gslice_Iter __i(_M_gslice);
+      do _M_array[__i._M_1d_idx] -= __x[__i._M_step]; while(__i._M_incr());
+    }
+  }
+
+  void operator^= (const valarray<value_type>& __x) const {
+    if (!_M_gslice._M_empty()) {
+      _Gslice_Iter __i(_M_gslice);
+      do _M_array[__i._M_1d_idx] ^= __x[__i._M_step]; while(__i._M_incr());
+    }
+  }
+
+  void operator&= (const valarray<value_type>& __x) const {
+    if (!_M_gslice._M_empty()) {
+      _Gslice_Iter __i(_M_gslice);
+      do _M_array[__i._M_1d_idx] &= __x[__i._M_step]; while(__i._M_incr());
+    }
+  }
+
+  void operator|= (const valarray<value_type>& __x) const {
+    if (!_M_gslice._M_empty()) {
+      _Gslice_Iter __i(_M_gslice);
+      do _M_array[__i._M_1d_idx] |= __x[__i._M_step]; while(__i._M_incr());
+    }
+  }
+
+  void operator<<= (const valarray<value_type>& __x) const {
+    if (!_M_gslice._M_empty()) {
+      _Gslice_Iter __i(_M_gslice);
+      do _M_array[__i._M_1d_idx] <<= __x[__i._M_step]; while(__i._M_incr());
+    }
+  }
+
+  void operator>>= (const valarray<value_type>& __x) const {
+    if (!_M_gslice._M_empty()) {
+      _Gslice_Iter __i(_M_gslice);
+      do _M_array[__i._M_1d_idx] >>= __x[__i._M_step]; while(__i._M_incr());
+    }
+  }
+
+  void operator= (const value_type& __c) {
+    if (!_M_gslice._M_empty()) {
+      _Gslice_Iter __i(_M_gslice);
+      do _M_array[__i._M_1d_idx] = __c; while(__i._M_incr());
+    }
+  }
+
+  ~gslice_array() {}
+
+private:                        
+  gslice_array(gslice __gslice, valarray<_Tp>& __array)
+    : _M_gslice(__gslice), _M_array(__array)
+    {}
+
+  gslice                _M_gslice;
+  valarray<value_type>& _M_array;
+
+private:                        // Disable assignment
+  void operator=(const gslice_array<_Tp>&);
+};
+
+// valarray member functions dealing with gslice and gslice_array.  Note
+// that it is illegal (behavior is undefined) to construct a gslice_array
+// from a degenerate gslice.
+
+template <class _Tp>
+inline valarray<_Tp>::valarray(const gslice_array<_Tp>& __x)
+  : _Valarray_base<_Tp>(__x._M_gslice._M_size())
+{
+  typedef typename __type_traits<_Tp>::has_trivial_default_constructor
+          _Is_Trivial;
+  _M_initialize(_Is_Trivial());  
+  *this = __x;
+}
+
+template <class _Tp>
+inline gslice_array<_Tp> valarray<_Tp>::operator[](const gslice& __slice) {
+  return gslice_array<_Tp>(__slice, *this);
+}
+
+
+//----------------------------------------------------------------------
+// mask_array
+
+template <class _Tp>
+class mask_array {
+  friend class valarray<_Tp>;
+public:
+  typedef _Tp value_type;
+
+  void operator=(const valarray<value_type>& __x) const {
+    size_t __idx = 0;
+    for (size_t __i = 0; __i < _M_array.size(); ++__i)
+      if (_M_mask[__i]) _M_array[__i] = __x[__idx++];
+  }
+
+  void operator*=(const valarray<value_type>& __x) const {
+    size_t __idx = 0;
+    for (size_t __i = 0; __i < _M_array.size(); ++__i)
+      if (_M_mask[__i]) _M_array[__i] *= __x[__idx++];
+  }
+
+  void operator/=(const valarray<value_type>& __x) const {
+    size_t __idx = 0;
+    for (size_t __i = 0; __i < _M_array.size(); ++__i)
+      if (_M_mask[__i]) _M_array[__i] /= __x[__idx++];
+  }
+
+  void operator%=(const valarray<value_type>& __x) const {
+    size_t __idx = 0;
+    for (size_t __i = 0; __i < _M_array.size(); ++__i)
+      if (_M_mask[__i]) _M_array[__i] %= __x[__idx++];
+  }
+
+  void operator+=(const valarray<value_type>& __x) const {
+    size_t __idx = 0;
+    for (size_t __i = 0; __i < _M_array.size(); ++__i)
+      if (_M_mask[__i]) _M_array[__i] += __x[__idx++];
+  }
+
+  void operator-=(const valarray<value_type>& __x) const {
+    size_t __idx = 0;
+    for (size_t __i = 0; __i < _M_array.size(); ++__i)
+      if (_M_mask[__i]) _M_array[__i] -= __x[__idx++];
+  }
+  
+  void operator^=(const valarray<value_type>& __x) const {
+    size_t __idx = 0;
+    for (size_t __i = 0; __i < _M_array.size(); ++__i)
+      if (_M_mask[__i]) _M_array[__i] ^= __x[__idx++];
+  }
+
+  void operator&=(const valarray<value_type>& __x) const {
+    size_t __idx = 0;
+    for (size_t __i = 0; __i < _M_array.size(); ++__i)
+      if (_M_mask[__i]) _M_array[__i] &= __x[__idx++];
+  }
+
+  void operator|=(const valarray<value_type>& __x) const {
+    size_t __idx = 0;
+    for (size_t __i = 0; __i < _M_array.size(); ++__i)
+      if (_M_mask[__i]) _M_array[__i] |= __x[__idx++];
+  }
+
+  void operator<<=(const valarray<value_type>& __x) const {
+    size_t __idx = 0;
+    for (size_t __i = 0; __i < _M_array.size(); ++__i)
+      if (_M_mask[__i]) _M_array[__i] <<= __x[__idx++];
+  }
+
+  void operator>>=(const valarray<value_type>& __x) const {
+    size_t __idx = 0;
+    for (size_t __i = 0; __i < _M_array.size(); ++__i)
+      if (_M_mask[__i]) _M_array[__i] >>= __x[__idx++];
+  }
+
+  void operator=(const value_type& __c) const {
+    for (size_t __i = 0; __i < _M_array.size(); ++__i)
+      if (_M_mask[__i]) _M_array[__i] = __c;
+  }
+
+  ~mask_array() {}
+
+  // Extension: number of true values in the mask
+  size_t _M_num_true() const {
+    size_t __result = 0;
+    for (size_t __i = 0; __i < _M_mask.size(); ++__i)
+      if (_M_mask[__i]) ++__result;
+    return __result;
+  }
+
+private:
+  mask_array(const _Valarray_bool& __mask, valarray<_Tp>& __array)
+    : _M_mask(__mask), _M_array(__array)
+    {}
+
+  _Valarray_bool _M_mask;
+  valarray<_Tp>& _M_array;
+
+private:                        // Disable assignment
+  void operator=(const mask_array<_Tp>&);
+};
+
+// valarray member functions dealing with mask_array
+
+template <class _Tp>
+inline valarray<_Tp>::valarray(const mask_array<_Tp>& __x)
+  : _Valarray_base<_Tp>(__x._M_num_true())
+{
+  typedef typename __type_traits<_Tp>::has_trivial_default_constructor
+          _Is_Trivial;
+  _M_initialize(_Is_Trivial());  
+  *this = __x;
+}
+
+// Behavior is undefined if __x._M_num_true() != this->size()
+template <class _Tp>
+inline valarray<_Tp>& valarray<_Tp>::operator=(const mask_array<_Tp>& __x) {
+  size_t __idx = 0;
+  for (size_t __i = 0; __i < __x._M_array.size(); ++__i)
+    if (__x._M_mask[__i]) (*this)[__idx++] = __x._M_array[__i];
+  return *this;
+}
+
+template <class _Tp>
+inline mask_array<_Tp> valarray<_Tp>::operator[](const _Valarray_bool& __mask)
+{
+  return mask_array<_Tp>(__mask, *this);
+}
+
+
+//----------------------------------------------------------------------
+// indirect_array
+
+template <class _Tp>
+class indirect_array {
+  friend class valarray<_Tp>;
+public:
+  typedef _Tp value_type;
+
+  void operator=(const valarray<value_type>& __x) const {
+    for (size_t __i = 0; __i < _M_addr.size(); ++__i)
+      _M_array[_M_addr[__i]] = __x[__i];
+  }
+
+  void operator*=(const valarray<value_type>& __x) const {
+    for (size_t __i = 0; __i < _M_addr.size(); ++__i)
+      _M_array[_M_addr[__i]] *= __x[__i];
+  }
+
+  void operator/=(const valarray<value_type>& __x) const {
+    for (size_t __i = 0; __i < _M_addr.size(); ++__i)
+      _M_array[_M_addr[__i]] /= __x[__i];
+  }
+
+  void operator%=(const valarray<value_type>& __x) const {
+    for (size_t __i = 0; __i < _M_addr.size(); ++__i)
+      _M_array[_M_addr[__i]] %= __x[__i];
+  }
+
+  void operator+=(const valarray<value_type>& __x) const {
+    for (size_t __i = 0; __i < _M_addr.size(); ++__i)
+      _M_array[_M_addr[__i]] += __x[__i];
+  }
+
+  void operator-=(const valarray<value_type>& __x) const {
+    for (size_t __i = 0; __i < _M_addr.size(); ++__i)
+      _M_array[_M_addr[__i]] -= __x[__i];
+  }
+
+  void operator^=(const valarray<value_type>& __x) const {
+    for (size_t __i = 0; __i < _M_addr.size(); ++__i)
+      _M_array[_M_addr[__i]] ^= __x[__i];
+  }
+
+  void operator&=(const valarray<value_type>& __x) const {
+    for (size_t __i = 0; __i < _M_addr.size(); ++__i)
+      _M_array[_M_addr[__i]] &= __x[__i];
+  }
+
+  void operator|=(const valarray<value_type>& __x) const {
+    for (size_t __i = 0; __i < _M_addr.size(); ++__i)
+      _M_array[_M_addr[__i]] |= __x[__i];
+  }
+
+  void operator<<=(const valarray<value_type>& __x) const {
+    for (size_t __i = 0; __i < _M_addr.size(); ++__i)
+      _M_array[_M_addr[__i]] <<= __x[__i];
+  }
+
+  void operator>>=(const valarray<value_type>& __x) const {
+    for (size_t __i = 0; __i < _M_addr.size(); ++__i)
+      _M_array[_M_addr[__i]] >>= __x[__i];
+  }
+
+  void operator=(const value_type& __c) const {
+    for (size_t __i = 0; __i < _M_addr.size(); ++__i)
+      _M_array[_M_addr[__i]] = __c;
+  }
+
+  ~indirect_array() {}
+
+private:
+  indirect_array(const _Valarray_size_t& __addr, valarray<_Tp>& __array)
+    : _M_addr(__addr), _M_array(__array)
+    {}
+
+  _Valarray_size_t _M_addr;
+  valarray<_Tp>&   _M_array;
+
+private:                        // Disable assignment
+  void operator=(const indirect_array<_Tp>&);
+};
+
+// valarray member functions dealing with indirect_array
+
+template <class _Tp>
+inline valarray<_Tp>::valarray(const indirect_array<_Tp>& __x)
+  : _Valarray_base<_Tp>(__x._M_addr.size())
+{
+  typedef typename __type_traits<_Tp>::has_trivial_default_constructor
+          _Is_Trivial;
+  _M_initialize(_Is_Trivial());  
+  *this = __x;
+}
+
+
+template <class _Tp>
+inline indirect_array<_Tp>
+valarray<_Tp>::operator[](const _Valarray_size_t& __addr)
+{
+  return indirect_array<_Tp>(__addr, *this);
+}
+
+_STLP_END_NAMESPACE
+
+# if !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_valarray.c>
+# endif
+
+#endif /* _STLP_VALARRAY */
+
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/_vector.c b/main/source/stlport/stlport/stl/_vector.c
new file mode 100644
index 00000000..3dc1d9b6
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_vector.c
@@ -0,0 +1,137 @@
+/*
+ *
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+#ifndef _STLP_VECTOR_C
+#define _STLP_VECTOR_C
+
+# if !defined (_STLP_INTERNAL_VECTOR_H)
+#  include <stl/_vector.h>
+# endif
+
+# if defined ( _STLP_NESTED_TYPE_PARAM_BUG )
+#  define iterator       _Tp*
+#  define size_type           size_t
+# endif
+
+#  undef  vector
+#  define vector __WORKAROUND_DBG_RENAME(vector)
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _Tp, class _Alloc>
+void 
+__vector__<_Tp, _Alloc>::reserve(size_type __n) {
+  if (capacity() < __n) {
+    const size_type __old_size = size();
+    pointer __tmp;
+    if (this->_M_start) {
+      __tmp = _M_allocate_and_copy(__n, this->_M_start, this->_M_finish);
+      _M_clear();
+    } else {
+      __tmp = this->_M_end_of_storage.allocate(__n);
+    }
+    _M_set(__tmp, __tmp + __old_size, __tmp + __n);
+  }
+}
+
+template <class _Tp, class _Alloc>
+void 
+__vector__<_Tp, _Alloc>::_M_fill_insert(
+				    iterator __position, 
+				    size_type __n, const _Tp& __x) {
+  if (__n != 0) {
+    if (size_type(this->_M_end_of_storage._M_data - this->_M_finish) >= __n) {
+      _Tp __x_copy = __x;
+      const size_type __elems_after = this->_M_finish - __position;
+      pointer __old_finish = this->_M_finish;
+      if (__elems_after > __n) {
+        __uninitialized_copy(this->_M_finish - __n, this->_M_finish, this->_M_finish, _IsPODType());
+        this->_M_finish += __n;
+        __copy_backward_ptrs(__position, __old_finish - __n, __old_finish, _TrivialAss());
+        _STLP_STD::fill(__position, __position + __n, __x_copy);
+      }
+      else {
+        uninitialized_fill_n(this->_M_finish, __n - __elems_after, __x_copy);
+        this->_M_finish += __n - __elems_after;
+        __uninitialized_copy(__position, __old_finish, this->_M_finish, _IsPODType());
+        this->_M_finish += __elems_after;
+        _STLP_STD::fill(__position, __old_finish, __x_copy);
+      }
+    }
+    else 
+      _M_insert_overflow(__position, __x, _IsPODType(), __n);
+  }
+}
+
+template <class _Tp, class _Alloc>
+__vector__<_Tp,_Alloc>& 
+__vector__<_Tp,_Alloc>::operator=(const __vector__<_Tp, _Alloc>& __x)
+{
+  if (&__x != this) {
+    const size_type __xlen = __x.size();
+    if (__xlen > capacity()) {
+      pointer __tmp = _M_allocate_and_copy(__xlen, (const_pointer)__x._M_start+0, (const_pointer)__x._M_finish+0);
+      _M_clear();
+      this->_M_start = __tmp;
+      this->_M_end_of_storage._M_data = this->_M_start + __xlen;
+    }
+    else if (size() >= __xlen) {
+      pointer __i = __copy_ptrs((const_pointer)__x._M_start+0, (const_pointer)__x._M_finish+0, (pointer)this->_M_start, _TrivialAss());
+      _STLP_STD::_Destroy(__i, this->_M_finish);
+    }
+    else {
+      __copy_ptrs((const_pointer)__x._M_start, (const_pointer)__x._M_start + size(), (pointer)this->_M_start, _TrivialAss());
+      __uninitialized_copy((const_pointer)__x._M_start + size(), (const_pointer)__x._M_finish+0, this->_M_finish, _IsPODType());
+    }
+    this->_M_finish = this->_M_start + __xlen;
+  }
+  return *this;
+}
+
+template <class _Tp, class _Alloc>
+void __vector__<_Tp, _Alloc>::_M_fill_assign(size_t __n, const _Tp& __val) {
+  if (__n > capacity()) {
+    __vector__<_Tp, _Alloc> __tmp(__n, __val, get_allocator());
+    __tmp.swap(*this);
+  }
+  else if (__n > size()) {
+    fill(begin(), end(), __val);
+    this->_M_finish = _STLP_STD::uninitialized_fill_n(this->_M_finish, __n - size(), __val);
+  }
+  else
+    erase(_STLP_STD::fill_n(begin(), __n, __val), end());
+}
+
+_STLP_END_NAMESPACE
+
+# undef size_type
+# undef iterator
+# undef vector
+
+#endif /*  _STLP_VECTOR_C */
+
+      // Local Variables:
+	// mode:C++
+	// End:
diff --git a/main/source/stlport/stlport/stl/_vector.h b/main/source/stlport/stlport/stl/_vector.h
new file mode 100644
index 00000000..cfb920e8
--- /dev/null
+++ b/main/source/stlport/stlport/stl/_vector.h
@@ -0,0 +1,591 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_VECTOR_H
+#define _STLP_INTERNAL_VECTOR_H
+
+
+
+# ifndef _STLP_INTERNAL_ALGOBASE_H
+#  include <stl/_algobase.h>
+# endif
+
+# ifndef _STLP_INTERNAL_ALLOC_H
+#  include <stl/_alloc.h>
+# endif
+
+# ifndef _STLP_INTERNAL_ITERATOR_H
+#  include <stl/_iterator.h>
+# endif
+
+# ifndef _STLP_INTERNAL_UNINITIALIZED_H
+#  include <stl/_uninitialized.h>
+# endif
+
+# ifndef _STLP_RANGE_ERRORS_H
+#  include <stl/_range_errors.h>
+# endif
+
+#  undef  vector
+#  define vector __WORKAROUND_DBG_RENAME(vector)
+
+_STLP_BEGIN_NAMESPACE 
+
+// The vector base class serves two purposes.  First, its constructor
+// and destructor allocate (but don't initialize) storage.  This makes
+// exception safety easier.
+
+template <class _Tp, class _Alloc> 
+class _Vector_base {
+public:
+
+  _STLP_FORCE_ALLOCATORS(_Tp, _Alloc)
+  typedef typename _Alloc_traits<_Tp, _Alloc>::allocator_type allocator_type;
+
+  _Vector_base(const _Alloc& __a)
+    : _M_start(0), _M_finish(0), _M_end_of_storage(__a, 0) {
+  }
+  _Vector_base(size_t __n, const _Alloc& __a)
+    : _M_start(0), _M_finish(0), _M_end_of_storage(__a, 0)
+  {
+    _M_start = _M_end_of_storage.allocate(__n);
+    _M_finish = _M_start;
+    _M_end_of_storage._M_data = _M_start + __n;
+	_STLP_MPWFIX_TRY _STLP_MPWFIX_CATCH
+  }
+
+  ~_Vector_base() { 
+    if (_M_start !=0) 
+    _M_end_of_storage.deallocate(_M_start, _M_end_of_storage._M_data - _M_start); 
+  }
+
+protected:
+  _Tp* _M_start;
+  _Tp* _M_finish;
+  _STLP_alloc_proxy<_Tp*, _Tp, allocator_type> _M_end_of_storage;
+};
+
+template <class _Tp, _STLP_DEFAULT_ALLOCATOR_SELECT(_Tp) >
+class vector : public _Vector_base<_Tp, _Alloc> 
+{
+private:
+  typedef _Vector_base<_Tp, _Alloc> _Base;
+public:
+  typedef _Tp value_type;
+  typedef value_type* pointer;
+  typedef const value_type* const_pointer;
+  typedef value_type* iterator;
+  typedef const value_type* const_iterator;
+
+public:
+  typedef value_type& reference;
+  typedef const value_type& const_reference;
+  typedef size_t size_type;
+  typedef ptrdiff_t difference_type;
+  typedef random_access_iterator_tag _Iterator_category;
+
+  _STLP_DECLARE_RANDOM_ACCESS_REVERSE_ITERATORS;
+  _STLP_FORCE_ALLOCATORS(_Tp, _Alloc)
+  typedef typename _Vector_base<_Tp, _Alloc>::allocator_type allocator_type;
+
+  allocator_type get_allocator() const {
+    return _STLP_CONVERT_ALLOCATOR((const allocator_type&)this->_M_end_of_storage, _Tp);
+  }
+protected:
+  typedef typename  __type_traits<_Tp>::has_trivial_assignment_operator _TrivialAss;
+  typedef typename  __type_traits<_Tp>::has_trivial_assignment_operator _IsPODType;
+
+  // handles insertions on overflow
+  void _M_insert_overflow(pointer __position, const _Tp& __x, const __false_type&, 
+			  size_type __fill_len, bool __atend = false) {
+    const size_type __old_size = size();
+    const size_type __len = __old_size + (max)(__old_size, __fill_len);
+    
+    pointer __new_start = this->_M_end_of_storage.allocate(__len);
+    pointer __new_finish = __new_start;
+    _STLP_TRY {
+      __new_finish = __uninitialized_copy(this->_M_start, __position, __new_start, __false_type());
+      // handle insertion
+      if (__fill_len == 1) {
+        _Construct(__new_finish, __x);
+        ++__new_finish;
+      } else
+        __new_finish = __uninitialized_fill_n(__new_finish, __fill_len, __x, __false_type());
+      if (!__atend)
+        // copy remainder
+        __new_finish = __uninitialized_copy(__position, this->_M_finish, __new_finish, __false_type());
+    }
+    _STLP_UNWIND((_Destroy(__new_start,__new_finish), 
+                  this->_M_end_of_storage.deallocate(__new_start,__len)));
+    _M_clear();
+    _M_set(__new_start, __new_finish, __new_start + __len);
+  }
+
+  void _M_insert_overflow(pointer __position, const _Tp& __x, const __true_type&, 
+			  size_type __fill_len, bool __atend = false) {
+    const size_type __old_size = size();
+    const size_type __len = __old_size + (max)(__old_size, __fill_len);
+    
+    pointer __new_start = this->_M_end_of_storage.allocate(__len);
+    pointer __new_finish = (pointer)__copy_trivial(this->_M_start, __position, __new_start);
+      // handle insertion
+    __new_finish = fill_n(__new_finish, __fill_len, __x);
+    if (!__atend)
+      // copy remainder
+      __new_finish = (pointer)__copy_trivial(__position, this->_M_finish, __new_finish);
+    _M_clear();
+    _M_set(__new_start, __new_finish, __new_start + __len);
+  }
+ 
+  void _M_range_check(size_type __n) const {
+    if (__n >= size_type(this->_M_finish-this->_M_start))
+      __stl_throw_out_of_range("vector");
+  }
+
+public:
+  iterator begin()             { return this->_M_start; }
+  const_iterator begin() const { return this->_M_start; }
+  iterator end()               { return this->_M_finish; }
+  const_iterator end() const   { return this->_M_finish; }
+
+  reverse_iterator rbegin()              { return reverse_iterator(end()); }
+  const_reverse_iterator rbegin() const  { return const_reverse_iterator(end()); }
+  reverse_iterator rend()                { return reverse_iterator(begin()); }
+  const_reverse_iterator rend() const    { return const_reverse_iterator(begin()); }
+
+  size_type size() const        { return size_type(this->_M_finish - this->_M_start); }
+  size_type max_size() const    { return size_type(-1) / sizeof(_Tp); }
+  size_type capacity() const    { return size_type(this->_M_end_of_storage._M_data - this->_M_start); }
+  bool empty() const            { return this->_M_start == this->_M_finish; }
+
+  reference operator[](size_type __n) { return *(begin() + __n); }
+  const_reference operator[](size_type __n) const { return *(begin() + __n); }
+
+  reference front()             { return *begin(); }
+  const_reference front() const { return *begin(); }
+  reference back()              { return *(end() - 1); }
+  const_reference back() const  { return *(end() - 1); }
+
+  reference at(size_type __n) { _M_range_check(__n); return (*this)[__n]; }
+  const_reference at(size_type __n) const { _M_range_check(__n); return (*this)[__n]; }
+
+  explicit vector(const allocator_type& __a = allocator_type()) : 
+    _Vector_base<_Tp, _Alloc>(__a) {}
+
+  vector(size_type __n, const _Tp& __val,
+         const allocator_type& __a = allocator_type()) 
+    : _Vector_base<_Tp, _Alloc>(__n, __a) { 
+    this->_M_finish = uninitialized_fill_n(this->_M_start, __n, __val); 
+  }
+
+  explicit vector(size_type __n)
+    : _Vector_base<_Tp, _Alloc>(__n, allocator_type() ) {
+    this->_M_finish = uninitialized_fill_n(this->_M_start, __n, _Tp()); 
+  }
+
+  vector(const vector<_Tp, _Alloc>& __x) 
+    : _Vector_base<_Tp, _Alloc>(__x.size(), __x.get_allocator()) { 
+    this->_M_finish = __uninitialized_copy((const_pointer)__x._M_start, 
+                                           (const_pointer)__x._M_finish, this->_M_start, _IsPODType());
+  }
+  
+#if defined (_STLP_MEMBER_TEMPLATES)
+
+  template <class _Integer>
+  void _M_initialize_aux(_Integer __n, _Integer __val, const __true_type&) {
+    this->_M_start = this->_M_end_of_storage.allocate(__n);
+    this->_M_end_of_storage._M_data = this->_M_start + __n; 
+    this->_M_finish = uninitialized_fill_n(this->_M_start, __n, __val);
+  }
+
+  template <class _InputIterator>
+  void _M_initialize_aux(_InputIterator __first, _InputIterator __last,
+                         const __false_type&) {
+    _M_range_initialize(__first, __last, _STLP_ITERATOR_CATEGORY(__first, _InputIterator));
+  }
+
+  // Check whether it's an integral type.  If so, it's not an iterator.
+ # ifdef _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS
+  template <class _InputIterator>
+  vector(_InputIterator __first, _InputIterator __last) :
+    _Vector_base<_Tp, _Alloc>(allocator_type()) {
+    typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
+    _M_initialize_aux(__first, __last, _Integral());
+  }
+ # endif
+  template <class _InputIterator>
+  vector(_InputIterator __first, _InputIterator __last,
+         const allocator_type& __a _STLP_ALLOCATOR_TYPE_DFL ) :
+    _Vector_base<_Tp, _Alloc>(__a) {
+    typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
+    _M_initialize_aux(__first, __last, _Integral());
+  }
+
+#else
+  vector(const _Tp* __first, const _Tp* __last,
+         const allocator_type& __a = allocator_type())
+    : _Vector_base<_Tp, _Alloc>(__last - __first, __a) { 
+      this->_M_finish = __uninitialized_copy(__first, __last, this->_M_start, _IsPODType()); 
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  ~vector() { _Destroy(this->_M_start, this->_M_finish); }
+
+  vector<_Tp, _Alloc>& operator=(const vector<_Tp, _Alloc>& __x);
+
+  void reserve(size_type __n);
+
+  // assign(), a generalized assignment member function.  Two
+  // versions: one that takes a count, and one that takes a range.
+  // The range version is a member template, so we dispatch on whether
+  // or not the type is an integer.
+
+  void assign(size_type __n, const _Tp& __val) { _M_fill_assign(__n, __val); }
+  void _M_fill_assign(size_type __n, const _Tp& __val);
+  
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _ForwardIter>
+  void _M_assign_aux(_ForwardIter __first, _ForwardIter __last, const forward_iterator_tag &)
+#else
+  void assign(const_iterator __first, const_iterator __last)
+#endif
+  {
+    size_type __len = distance(__first, __last);
+    
+    if (__len > capacity()) {
+      iterator __tmp = _M_allocate_and_copy(__len, __first, __last);
+    _M_clear();
+    _M_set(__tmp, __tmp + __len, __tmp + __len);
+    }
+    else if (size() >= __len) {
+      iterator __new_finish = copy(__first, __last, this->_M_start);
+      _Destroy(__new_finish, this->_M_finish);
+      this->_M_finish = __new_finish;
+    }
+    else {
+# if defined ( _STLP_MEMBER_TEMPLATES )
+          _ForwardIter __mid = __first;
+          advance(__mid, size());
+# else
+          const_iterator __mid = __first + size() ;
+# endif
+    copy(__first, __mid, this->_M_start);
+    this->_M_finish = __uninitialized_copy(__mid, __last, this->_M_finish, _IsPODType());
+    }
+  }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIter>
+  void _M_assign_aux(_InputIter __first, _InputIter __last,
+		     const input_iterator_tag &) {
+    iterator __cur = begin();
+    for ( ; __first != __last && __cur != end(); ++__cur, ++__first)
+      *__cur = *__first;
+    if (__first == __last)
+      erase(__cur, end());
+    else
+      insert(end(), __first, __last);
+  }
+  
+  template <class _Integer>
+  void _M_assign_dispatch(_Integer __n, _Integer __val, const __true_type&)
+    { assign((size_type) __n, (_Tp) __val); }
+
+  template <class _InputIter>
+  void _M_assign_dispatch(_InputIter __first, _InputIter __last, const __false_type&)
+    { _M_assign_aux(__first, __last, _STLP_ITERATOR_CATEGORY(__first, _InputIter)); }
+
+  template <class _InputIterator>
+  void assign(_InputIterator __first, _InputIterator __last) {
+    typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
+    _M_assign_dispatch(__first, __last, _Integral());
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  void push_back(const _Tp& __x) {
+    if (this->_M_finish != this->_M_end_of_storage._M_data) {
+      _Construct(this->_M_finish, __x);
+      ++this->_M_finish;
+    }
+    else
+      _M_insert_overflow(this->_M_finish, __x, _IsPODType(), 1UL, true);
+  }
+
+  void swap(vector<_Tp, _Alloc>& __x) {
+    _STLP_STD::swap(this->_M_start, __x._M_start);
+    _STLP_STD::swap(this->_M_finish, __x._M_finish);
+    _STLP_STD::swap(this->_M_end_of_storage, __x._M_end_of_storage);
+  }
+
+  iterator insert(iterator __position, const _Tp& __x) {
+    size_type __n = __position - begin();
+    if (this->_M_finish != this->_M_end_of_storage._M_data) {
+      if (__position == end()) {
+        _Construct(this->_M_finish, __x);
+        ++this->_M_finish;
+      } else {
+        _Construct(this->_M_finish, *(this->_M_finish - 1));
+        ++this->_M_finish;
+        _Tp __x_copy = __x;
+        __copy_backward_ptrs(__position, this->_M_finish - 2, this->_M_finish - 1, _TrivialAss());
+        *__position = __x_copy;
+      }
+    }
+    else
+      _M_insert_overflow(__position, __x, _IsPODType(), 1UL);
+    return begin() + __n;
+  }
+
+# ifndef _STLP_NO_ANACHRONISMS
+  void push_back() { push_back(_Tp()); }
+  iterator insert(iterator __position) { return insert(__position, _Tp()); }
+# endif
+
+  void _M_fill_insert (iterator __pos, size_type __n, const _Tp& __x);
+
+#if defined ( _STLP_MEMBER_TEMPLATES)
+
+  template <class _Integer>
+  void _M_insert_dispatch(iterator __pos, _Integer __n, _Integer __val,
+                          const __true_type&) {
+    _M_fill_insert(__pos, (size_type) __n, (_Tp) __val);
+  }
+
+  template <class _InputIterator>
+  void _M_insert_dispatch(iterator __pos,
+                          _InputIterator __first, _InputIterator __last,
+                          const __false_type&) {
+    _M_range_insert(__pos, __first, __last, _STLP_ITERATOR_CATEGORY(__first, _InputIterator));
+  }
+
+  // Check whether it's an integral type.  If so, it's not an iterator.
+  template <class _InputIterator>
+  void insert(iterator __pos, _InputIterator __first, _InputIterator __last) {
+    typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
+    _M_insert_dispatch(__pos, __first, __last, _Integral());
+  }
+
+  template <class _InputIterator>
+  void _M_range_insert(iterator __pos, 
+		       _InputIterator __first, 
+		       _InputIterator __last,
+		       const input_iterator_tag &) {
+    for ( ; __first != __last; ++__first) {
+      __pos = insert(__pos, *__first);
+      ++__pos;
+    }
+  }
+
+  template <class _ForwardIterator>
+  void _M_range_insert(iterator __position,
+                       _ForwardIterator __first,
+                       _ForwardIterator __last,
+                       const forward_iterator_tag &) 
+#else /* _STLP_MEMBER_TEMPLATES */
+  void insert(iterator __position,
+              const_iterator __first, const_iterator __last)
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  {
+    if (__first != __last) {
+      size_type __n = distance(__first, __last);
+
+      if (size_type(this->_M_end_of_storage._M_data - this->_M_finish) >= __n) {
+        const size_type __elems_after = this->_M_finish - __position;
+        pointer __old_finish = this->_M_finish;
+        if (__elems_after > __n) {
+          __uninitialized_copy(this->_M_finish - __n, this->_M_finish, this->_M_finish, _IsPODType());
+          this->_M_finish += __n;
+          __copy_backward_ptrs(__position, __old_finish - __n, __old_finish, _TrivialAss());
+          copy(__first, __last, __position);
+        }
+        else {
+# if defined ( _STLP_MEMBER_TEMPLATES )
+          _ForwardIterator __mid = __first;
+          advance(__mid, __elems_after);
+# else
+          const_pointer __mid = __first + __elems_after;
+# endif
+          __uninitialized_copy(__mid, __last, this->_M_finish, _IsPODType());
+          this->_M_finish += __n - __elems_after;
+          __uninitialized_copy(__position, __old_finish, this->_M_finish, _IsPODType());
+          this->_M_finish += __elems_after;
+          copy(__first, __mid, __position);
+        } /* elems_after */
+      }
+      else {
+        const size_type __old_size = size();
+        const size_type __len = __old_size + (max)(__old_size, __n);
+        pointer __new_start = this->_M_end_of_storage.allocate(__len);
+        pointer __new_finish = __new_start;
+        _STLP_TRY {
+          __new_finish = __uninitialized_copy(this->_M_start, __position, __new_start, _IsPODType());
+          __new_finish = __uninitialized_copy(__first, __last, __new_finish, _IsPODType());
+          __new_finish = __uninitialized_copy(__position, this->_M_finish, __new_finish, _IsPODType());
+        }
+        _STLP_UNWIND((_Destroy(__new_start,__new_finish), 
+                      this->_M_end_of_storage.deallocate(__new_start,__len)));
+        _M_clear();
+        _M_set(__new_start, __new_finish, __new_start + __len);
+      }
+    }
+  }
+  void insert (iterator __pos, size_type __n, const _Tp& __x)
+  { _M_fill_insert(__pos, __n, __x); }
+  
+  void pop_back() {
+    --this->_M_finish;
+    _Destroy(this->_M_finish);
+  }
+  iterator erase(iterator __position) {
+    if (__position + 1 != end())
+      __copy_ptrs(__position + 1, this->_M_finish, __position, _TrivialAss());
+    --this->_M_finish;
+    _Destroy(this->_M_finish);
+    return __position;
+  }
+  iterator erase(iterator __first, iterator __last) {
+    pointer __i = __copy_ptrs(__last, this->_M_finish, __first, _TrivialAss());
+    _Destroy(__i, this->_M_finish);
+    this->_M_finish = __i;
+    return __first;
+  }
+
+  void resize(size_type __new_size, _Tp __x) {
+    if (__new_size < size()) 
+      erase(begin() + __new_size, end());
+    else
+      insert(end(), __new_size - size(), __x);
+  }
+  void resize(size_type __new_size) { resize(__new_size, _Tp()); }
+  void clear() { 
+    erase(begin(), end());
+  }
+
+protected:
+
+  void _M_clear() {
+    //    if (this->_M_start) {
+    _Destroy(this->_M_start, this->_M_finish);
+    this->_M_end_of_storage.deallocate(this->_M_start, this->_M_end_of_storage._M_data - this->_M_start);
+    //    }
+  }
+
+  void _M_set(pointer __s, pointer __f, pointer __e) {
+    this->_M_start = __s;
+    this->_M_finish = __f;
+    this->_M_end_of_storage._M_data = __e;
+  }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _ForwardIterator>
+  pointer _M_allocate_and_copy(size_type __n, _ForwardIterator __first, 
+				_ForwardIterator __last)
+#else /* _STLP_MEMBER_TEMPLATES */
+  pointer _M_allocate_and_copy(size_type __n, const_pointer __first, 
+			       const_pointer __last)
+#endif /* _STLP_MEMBER_TEMPLATES */
+  {
+    pointer __result = this->_M_end_of_storage.allocate(__n);
+    _STLP_TRY {
+#if !defined(__MRC__)		//*TY 12/17/2000 - added workaround for MrCpp. it confuses on nested try/catch block
+      __uninitialized_copy(__first, __last, __result, _IsPODType());
+#else
+      uninitialized_copy(__first, __last, __result);
+#endif
+      return __result;
+    }
+    _STLP_UNWIND(this->_M_end_of_storage.deallocate(__result, __n));
+# ifdef _STLP_THROW_RETURN_BUG
+	return __result;
+# endif
+  }
+
+
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIterator>
+  void _M_range_initialize(_InputIterator __first,  
+                           _InputIterator __last, const input_iterator_tag &) {
+    for ( ; __first != __last; ++__first)
+      push_back(*__first);
+  }
+  // This function is only called by the constructor. 
+  template <class _ForwardIterator>
+  void _M_range_initialize(_ForwardIterator __first,
+                           _ForwardIterator __last, const forward_iterator_tag &) {
+    size_type __n = distance(__first, __last);
+    this->_M_start = this->_M_end_of_storage.allocate(__n);
+    this->_M_end_of_storage._M_data = this->_M_start + __n;
+    this->_M_finish = __uninitialized_copy(__first, __last, this->_M_start, _IsPODType());
+  }
+  
+#endif /* _STLP_MEMBER_TEMPLATES */
+};
+
+# define _STLP_TEMPLATE_CONTAINER vector<_Tp, _Alloc>
+# define _STLP_TEMPLATE_HEADER    template <class _Tp, class _Alloc>
+# include <stl/_relops_cont.h>
+# undef _STLP_TEMPLATE_CONTAINER
+# undef _STLP_TEMPLATE_HEADER
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT) 
+_STLP_EXPORT_TEMPLATE_CLASS allocator<void*>;
+_STLP_EXPORT_TEMPLATE_CLASS _STLP_alloc_proxy<void**, void*, allocator<void*> >;
+_STLP_EXPORT_TEMPLATE_CLASS _Vector_base<void*,allocator<void*> >;
+_STLP_EXPORT_TEMPLATE_CLASS vector<void*,allocator<void*> >;
+# endif
+
+#  undef  vector
+#  undef  __vector__
+#  define __vector__ __WORKAROUND_RENAME(vector)
+
+_STLP_END_NAMESPACE
+
+# if !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/_vector.c>
+# endif
+
+#ifndef _STLP_INTERNAL_BVECTOR_H
+# include <stl/_bvector.h>
+#endif
+
+# if defined (_STLP_DEBUG)
+#  include <stl/debug/_vector.h>
+# endif
+
+# if defined (_STLP_USE_WRAPPER_FOR_ALLOC_PARAM)
+#  include <stl/wrappers/_vector.h>
+# endif
+
+#endif /* _STLP_VECTOR_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/c_locale.h b/main/source/stlport/stlport/stl/c_locale.h
new file mode 100644
index 00000000..4fb4b5f0
--- /dev/null
+++ b/main/source/stlport/stlport/stl/c_locale.h
@@ -0,0 +1,436 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+
+#ifndef _STLP_C_LOCALE_H
+# define _STLP_C_LOCALE_H
+
+/*
+ * Implementation dependent definitions
+ */
+#ifdef __cplusplus
+#  include <stl/_config.h>
+#endif
+
+#if defined(__sgi) 
+# if defined(ROOT_65) /* IRIX 6.5.x */
+#  include <sgidefs.h>
+#  include <standards.h>
+#  include <wchar.h>
+#  include <ctype.h>
+
+# else
+                  /* IRIX pre-6.5 */
+#  include <sgidefs.h>
+#  include <standards.h>
+
+#  if !defined(_SIZE_T) && !defined(_SIZE_T_)
+#   define _SIZE_T
+#    if (_MIPS_SZLONG == 32)
+typedef unsigned int    size_t;
+#    endif
+#    if (_MIPS_SZLONG == 64)
+typedef unsigned long   size_t;
+#    endif
+#   endif
+
+#   ifndef _WCHAR_T
+#    define _WCHAR_T
+#     if (_MIPS_SZLONG == 32)
+typedef long wchar_t;
+#     endif
+#     if (_MIPS_SZLONG == 64)
+typedef __int32_t wchar_t;
+#     endif
+#    endif /* _WCHAR_T */
+
+#    ifndef _WINT_T
+#     define _WINT_T
+#     if (_MIPS_SZLONG == 32)
+        typedef long    wint_t;
+#     endif
+#     if (_MIPS_SZLONG == 64)
+        typedef __int32_t wint_t;
+#     endif
+#    endif /* _WINT_T */
+
+#    ifndef _MBSTATE_T
+#    define _MBSTATE_T
+#    ifdef _MSC_VER
+		typedef int		mbstate_t;
+#    else
+        typedef char    mbstate_t;
+#    endif
+#    endif /* _MBSTATE_T */
+
+#   endif /* ROOT65 */ 
+
+#  else /* __sgi */
+
+# ifdef __cplusplus
+# ifndef _STLP_CSTDDEF
+#  include <cstddef>
+# endif
+# ifndef _STLP_CWCHAR_H
+#  include <stl/_cwchar.h>
+# endif
+# ifndef _STLP_CCTYPE
+#  include <cctype>
+# endif
+# else
+#  include <stddef.h>
+#  include <wchar.h>
+#  include <ctype.h>
+# endif
+
+#endif /* __sgi */
+
+/*
+ * GENERAL FRAMEWORK
+ */
+
+struct _Locale_ctype;
+struct _Locale_numeric;
+struct _Locale_time;
+struct _Locale_collate;
+struct _Locale_monetary;
+struct _Locale_messages;
+
+/*
+  Bitmask macros.  
+*/
+
+/*
+ * For narrow characters, we expose the lookup table interface.
+ */
+
+/* Internal bitmask macros, os-specific. */
+
+#if defined(__sgi)              /* IRIX */
+
+#define _Locale_S      0x00000008      /* Spacing character */
+#define _Locale_A      0x00004000      /* Alphabetical characters only */
+#define _Locale_B      0x00000040      /* Obsolete: was space char only */
+#define _Locale_PR     0x00008000      /* Printable characters only */
+#define _Locale_G      0x40000000      /* Graphic characters only */
+#define _Locale_BL     0x80000000      /* The blank character class */
+
+/* Public bitmask macros, must be defined for every OS. These values, of
+ * course, are specific to IRIX. */
+
+#define _Locale_CNTRL  0x00000020      /* Control character */
+#define _Locale_UPPER  0x00000001      /* Upper case */
+#define _Locale_LOWER  0x00000002      /* Lower case */
+#define _Locale_DIGIT  0x00000004      /* Numeral (digit) */
+#define _Locale_XDIGIT 0x00000080      /* heXadecimal digit */
+#define _Locale_PUNCT  0x00000010      /* Punctuation */
+#define _Locale_SPACE  (_Locale_S | _Locale_BL)
+#define _Locale_PRINT  (_Locale_PUNCT | _Locale_UPPER | _Locale_LOWER | \
+                        _Locale_DIGIT | _Locale_A | _Locale_XDIGIT | \
+                        _Locale_PR)
+#define _Locale_ALPHA  _Locale_A
+
+/*
+* All of these except for graph and blank are from the C standard;
+* graph and blank are XPG4.  (graph in XPG4 doesn't mean quite the
+* same thing as graph in the C++ library)
+*/
+
+#endif /* IRIX */
+
+
+#if defined( __Lynx__ )
+ /* azov: On Lynx isalpha defined as (_U | _L), which gives us a mask 
+  * unusable in ctype_table. So we have to redefine it and use hard-coded 
+  * numbers (to avoid potential clashes if system headers change).
+  *
+  * P.S. Actually, I see no reason in using platform-specific masks - 
+  * having just one set of masks for all platforms should work just as
+  * well - we only use them internally and they don't have to be equal 
+  * to whatever defined in local ctype.h
+  *
+  */ 
+#   define _Locale_CNTRL  040     /* _C, Control character */
+#   define _Locale_UPPER  01      /* _U, Upper case */
+#   define _Locale_LOWER  02      /* _L, Lower case */
+#   define _Locale_DIGIT  04      /* _N, Numeral (digit) */
+#   define _Locale_XDIGIT 0200    /* _X, heXadecimal digit */
+#   define _Locale_PUNCT  020     /* _P, Punctuation */
+#   define _Locale_SPACE  010     /* _S, Spacing */
+#   define _Locale_ALPHA  040000  /* none, Alphanumerical */
+#   define _Locale_PRINT  (_Locale_PUNCT | _Locale_UPPER | _Locale_LOWER | \
+                           _Locale_DIGIT | _Locale_ALPHA | _Locale_XDIGIT |\
+                           _Locale_SPACE ) /* Printable */
+# endif /* __Lynx__ */
+
+#if defined(__GNUC__) || defined (__BORLANDC__) || defined (__COMO__)
+
+# if defined (__CYGWIN__)
+
+#  define _Locale_CNTRL  040
+#  define _Locale_UPPER  02
+#  define _Locale_LOWER  01
+#  define _Locale_DIGIT  04
+#  define _Locale_XDIGIT ( 0100 | _Locale_DIGIT )
+#  define _Locale_PUNCT  020
+#  define _Locale_SPACE  010
+#  define _Locale_ALPHA  (_Locale_UPPER | _Locale_LOWER)
+#  define _Locale_PRINT  (_Locale_ALPHA | _Locale_DIGIT | _Locale_PUNCT | 0200 )
+
+# elif defined (__FreeBSD__)
+
+# define _Locale_CNTRL _CTYPE_C
+# define _Locale_UPPER _CTYPE_U
+# define _Locale_LOWER _CTYPE_L
+# define _Locale_DIGIT _CTYPE_D
+# define _Locale_XDIGIT _CTYPE_X
+# define _Locale_PUNCT _CTYPE_P
+# define _Locale_SPACE _CTYPE_S
+# define _Locale_PRINT _CTYPE_R
+# define _Locale_ALPHA _CTYPE_A
+
+# elif defined (__NetBSD__) || defined (__amigaos__)
+ 
+#  define _Locale_CNTRL _C
+#  define _Locale_UPPER _U
+#  define _Locale_LOWER _L
+#  define _Locale_DIGIT _N
+#  define _Locale_XDIGIT (_N|_X)
+#  define _Locale_PUNCT _P
+#  define _Locale_SPACE _S
+#  define _Locale_PRINT (_P|_U|_L|_N|_B)
+#  define _Locale_ALPHA (_U|_L)
+# elif defined(__EMX__) /* OS/2 with emx runtime */
+#  define _Locale_CNTRL _CNTRL
+#  define _Locale_UPPER _UPPER
+#  define _Locale_LOWER _LOWER
+#  define _Locale_DIGIT _DIGIT
+#  define _Locale_XDIGIT _XDIGIT
+#  define _Locale_PUNCT _PUNCT
+#  define _Locale_SPACE _SPACE
+#  define _Locale_PRINT _PRINT
+#  define _Locale_ALPHA (_UPPER|_LOWER)
+
+# elif defined(_STLP_USE_GLIBC) /* linux, using the gnu compiler */
+
+/* This section uses macros defined in the gnu libc ctype.h header */
+
+#  define _Locale_CNTRL  _IScntrl
+#  define _Locale_UPPER  _ISupper
+#  define _Locale_LOWER  _ISlower
+#  define _Locale_DIGIT  _ISdigit
+#  define _Locale_XDIGIT _ISxdigit
+#  define _Locale_PUNCT  _ISpunct
+#  define _Locale_SPACE  _ISspace
+#  define _Locale_PRINT  _ISprint
+#  define _Locale_ALPHA  _ISalpha
+
+#  endif /* GLIBC */
+
+#endif /* gnu */
+
+#if ( defined(__sun) && defined (__SVR4) ) \
+    || (defined (__digital__) && defined (__unix__)) \
+    || defined(_AIX)
+/* fbp : condition from AT&T code*/
+#if !(defined(__XPG4_CHAR_CLASS__) || defined(_XPG4_2) || \
+    (defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 == 4))) && ! defined (_ISCNTRL)
+  /* fbp : on 2.5.1, the defines are different ;( */
+  // # if ( defined (__sun) && defined (__SVR4) && ! defined (_ISCNTRL) )
+#   define _ISCNTRL _C
+#   define _ISUPPER _U
+#   define _ISLOWER _L
+#   define _ISDIGIT _N
+#   define _ISXDIGIT _X
+#   define _ISPUNCT _P
+#   define _ISSPACE _S
+#   define _ISPRINT (_P | _U | _L | _N | _B)
+#   define _ISALPHA (_U | _L)
+#  endif 
+
+#  define _Locale_CNTRL  _ISCNTRL
+#  define _Locale_UPPER  _ISUPPER
+#  define _Locale_LOWER  _ISLOWER
+#  define _Locale_DIGIT  _ISDIGIT
+#  define _Locale_XDIGIT _ISXDIGIT
+#  define _Locale_PUNCT  _ISPUNCT
+#  define _Locale_SPACE  _ISSPACE
+#  define _Locale_PRINT  _ISPRINT
+#  define _Locale_ALPHA  _ISALPHA
+#elif defined (__MWERKS__)
+#  define _Locale_CNTRL  __control_char
+#  define _Locale_UPPER  __upper_case
+#  define _Locale_LOWER  __lower_case
+#  define _Locale_DIGIT  __digit
+#  define _Locale_XDIGIT __hex_digit
+#  define _Locale_PUNCT  __punctuation
+#  define _Locale_SPACE  __space_char
+#  define _Locale_PRINT  __printable
+#  define _Locale_ALPHA  __alphanumeric
+#elif defined (__BORLANDC__)
+#  define _Locale_CNTRL  _IS_CTL
+#  define _Locale_UPPER  _IS_UPP
+#  define _Locale_LOWER  _IS_LOW
+#  define _Locale_DIGIT  _IS_DIG
+#  define _Locale_XDIGIT _IS_HEX
+#  define _Locale_PUNCT  _IS_PUN
+#  define _Locale_SPACE  _IS_SP
+#  define _Locale_PRINT  (_IS_SP|_IS_PUN|_IS_UPP|_IS_LOW|_IS_DIG)
+#  define _Locale_ALPHA  _IS_ALPHA
+#elif defined (_MSC_VER) || defined (__MINGW32__)
+#  define _Locale_CNTRL  _CONTROL
+#  define _Locale_UPPER  _UPPER
+#  define _Locale_LOWER  _LOWER
+#  define _Locale_DIGIT  _DIGIT
+#  define _Locale_XDIGIT _HEX
+#  define _Locale_PUNCT  _PUNCT
+#  define _Locale_SPACE  _SPACE
+#  define _Locale_PRINT  (_ALPHA | _DIGIT | _BLANK | _PUNCT)
+// is this one has to be so complex ?  
+#  define _Locale_ALPHA  ( _ALPHA & ~ (_UPPER | _LOWER )) 
+#elif defined (__DMC__)
+#  define _Locale_CNTRL  _CONTROL
+#  define _Locale_UPPER  _UPPER
+#  define _Locale_LOWER  _LOWER
+#  define _Locale_DIGIT  _DIGIT
+#  define _Locale_XDIGIT _HEX
+#  define _Locale_PUNCT  _PUNCT
+#  define _Locale_SPACE  _SPACE
+#  define _Locale_PRINT  (_UPPER | _LOWER | _DIGIT | _PUNCT | _SPACE)
+#  define _Locale_ALPHA  _ALPHA
+#elif defined(__MRC__) || defined(__SC__)		//*TY 02/24/2000 - added support for MPW
+#  define _Locale_CNTRL  _CTL
+#  define _Locale_UPPER  _UPP
+#  define _Locale_LOWER  _LOW
+#  define _Locale_DIGIT  _DIG
+#  define _Locale_XDIGIT _HEX
+#  define _Locale_PUNCT  _PUN
+#  define _Locale_SPACE  _BLA
+#  define _Locale_PRINT  (_UPP | _LOW | _DIG | _PUN | _BLA)
+#  define _Locale_ALPHA  (_UPP | _LOW)
+#elif defined(__MLCCPP__)
+#  define _Locale_CNTRL    1
+#  define _Locale_UPPER    2
+#  define _Locale_LOWER    4
+#  define _Locale_DIGIT    8
+#  define _Locale_XDIGIT  16
+#  define _Locale_PUNCT   32
+#  define _Locale_SPACE   64
+#  define _Locale_PRINT  128
+#  define _Locale_ALPHA  256
+
+# elif defined (__GNUC__) && defined (__APPLE__)
+ 
+# define _Locale_CNTRL _C
+# define _Locale_UPPER _U
+# define _Locale_LOWER _L
+# define _Locale_DIGIT _D
+# define _Locale_XDIGIT _X
+# define _Locale_PUNCT _P
+# define _Locale_SPACE _S
+# define _Locale_PRINT _R
+# define _Locale_ALPHA _A
+
+# elif defined (__hpux) || defined (__osf__)
+ 
+#   if defined(__HP_aCC) && !defined(_INCLUDE_HPUX_SOURCE)
+#     define _ISALPHA      0x001
+#     define _ISALNUM      0x002
+#     define _ISBLANK      0x004
+#     define _ISCNTRL      0x008
+#     define _ISDIGIT      0x010
+#     define _ISGRAPH      0x020
+#     define _ISLOWER      0x040
+#     define _ISPRINT      0x080
+#     define _ISPUNCT      0x100
+#     define _ISSPACE      0x200
+#     define _ISUPPER      0x400
+#     define _ISXDIGIT     0x800
+#  endif
+#  define _Locale_CNTRL  _ISCNTRL
+#  define _Locale_UPPER  _ISUPPER
+#  define _Locale_LOWER  _ISLOWER
+#  define _Locale_DIGIT  _ISDIGIT
+#  define _Locale_XDIGIT _ISXDIGIT
+#  define _Locale_PUNCT  _ISPUNCT
+#  define _Locale_SPACE  _ISSPACE
+#  define _Locale_PRINT  _ISPRINT
+#  define _Locale_ALPHA  _ISALPHA
+# elif defined (__MVS__) || defined(__OS400__)
+#  define _Locale_CNTRL __ISCNTRL
+#  define _Locale_UPPER __ISUPPER
+#  define _Locale_LOWER __ISLOWER
+#  define _Locale_DIGIT __ISDIGIT
+#  define _Locale_XDIGIT __ISXDIGIT
+#  define _Locale_PUNCT __ISPUNCT
+#  define _Locale_SPACE __ISSPACE
+#  define _Locale_PRINT __ISPRINT
+#  define _Locale_ALPHA __ISALPHA
+# elif defined (__QNXNTO__)  || defined (__WATCOMC__)
+# define _Locale_CNTRL _CNTRL
+# define _Locale_UPPER _UPPER
+# define _Locale_LOWER _LOWER
+# define _Locale_DIGIT _DIGIT
+# define _Locale_XDIGIT _XDIGT
+# define _Locale_PUNCT _PUNCT
+# define _Locale_SPACE _SPACE
+# define _Locale_PRINT _PRINT
+# define _Locale_ALPHA (_UPPER | _LOWER)
+#elif defined (__DJGPP)
+#  define _Locale_CNTRL  __dj_ISCNTRL
+#  define _Locale_UPPER  __dj_ISUPPER
+#  define _Locale_LOWER  __dj_ISLOWER
+#  define _Locale_DIGIT  __dj_ISDIGIT
+#  define _Locale_XDIGIT __dj_ISXDIGIT
+#  define _Locale_PUNCT  __dj_ISPUNCT
+#  define _Locale_SPACE  __dj_ISSPACE
+#  define _Locale_PRINT  __dj_ISPRINT
+#  define _Locale_ALPHA  __dj_ISALPHA
+#elif defined (_STLP_SCO_OPENSERVER)
+#  define _Locale_CNTRL _C
+#  define _Locale_UPPER _U
+#  define _Locale_LOWER _L
+#  define _Locale_DIGIT _N
+#  define _Locale_XDIGIT _X
+#  define _Locale_PUNCT _P
+#  define _Locale_SPACE _S
+#  define _Locale_PRINT _R
+#  define _Locale_ALPHA _A
+#elif defined (__NCR_SVR)
+#  define _Locale_CNTRL _C
+#  define _Locale_UPPER _U
+#  define _Locale_LOWER _L
+#  define _Locale_DIGIT _N
+#  define _Locale_XDIGIT _X
+#  define _Locale_PUNCT _P
+#  define _Locale_SPACE _S
+#  define _Locale_PRINT (_P | _U | _L | _N | _B)
+#  define _Locale_ALPHA (_U | _L)
+#elif defined (_CRAY)
+#  define _Locale_CNTRL  _CNTRL
+#  define _Locale_UPPER  _UPPER
+#  define _Locale_LOWER  _LOWER
+#  define _Locale_DIGIT  _DIGIT
+#  define _Locale_XDIGIT _XDIGIT
+#  define _Locale_PUNCT  _PUNCT
+#  define _Locale_SPACE  _SPACE
+#  define _Locale_PRINT  _PRINT
+#  define _Locale_ALPHA  _ALPHA
+#endif
+
+# endif /* _STLP_C_LOCALE_H */
diff --git a/main/source/stlport/stlport/stl/char_traits.h b/main/source/stlport/stlport/stl/char_traits.h
new file mode 100644
index 00000000..e80ff68b
--- /dev/null
+++ b/main/source/stlport/stlport/stl/char_traits.h
@@ -0,0 +1,266 @@
+/*
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_CHAR_TRAITS_H
+#define _STLP_CHAR_TRAITS_H
+
+// Define char_traits
+
+# if defined (_STLP_OWN_IOSTREAMS) || ! defined (_STLP_USE_NEW_IOSTREAMS)
+
+# if ! defined (_STLP_CSTDDEF)
+#  include <cstddef>
+# endif
+
+#if ! defined (_STLP_CSTRING)
+#  include <cstring>
+#endif
+
+#if defined (_STLP_UNIX) && defined (_STLP_HAS_NO_NEW_C_HEADERS)
+#include <sys/types.h>          // For off_t
+#endif /* __unix */
+
+#ifdef __BORLANDC__
+# include <mem.h>
+# include <string.h>
+# include <_stddef.h>
+// class mbstate_t;
+#endif
+
+#ifndef __TYPE_TRAITS_H
+# include <stl/type_traits.h>
+#endif
+
+# if !defined (_STLP_CWCHAR)
+#  include <stl/_cwchar.h>
+# endif			
+
+_STLP_BEGIN_NAMESPACE
+
+# ifdef _STLP_OWN_IOSTREAMS
+
+template <class _Tp> class allocator;
+
+#define _STLP_NULL_CHAR_INIT(_ChT) _STLP_DEFAULT_CONSTRUCTED(_ChT)
+
+#if defined (__sgi) && defined (_STLP_HAS_NO_NEW_C_HEADERS) /* IRIX */
+typedef off64_t   streamoff;
+// #elif defined (__unix) && defined (_STLP_HAS_NO_NEW_C_HEADERS) /* Other version of UNIX */
+// typedef off_t     streamoff;
+#else /* __unix */
+// boris : here, it's not ptrdiff_t as some Solaris systems have confusing definitions of these.
+typedef long streamoff;
+#endif /* _STLP_HAS_NO_NEW_C_HEADERS */
+
+typedef ptrdiff_t streamsize;
+
+// Class fpos, which represents a position within a file.  (The C++
+// standard calls for it to be defined in <ios>.  This implementation
+// moves it to <iosfwd>, which is included by <ios>.)
+template <class _StateT> class fpos
+{
+public:                         // From table 88 of the C++ standard.
+  fpos(streamoff __pos) : _M_pos(__pos), _M_st(_STLP_NULL_CHAR_INIT(_StateT)) {}
+  fpos() : _M_pos(0), _M_st(_STLP_NULL_CHAR_INIT(_StateT)) {}
+
+  operator streamoff() const { return _M_pos; }
+
+  bool  _STLP_CALL operator==(const fpos<_StateT>& __y) const
+    { return _M_pos == __y._M_pos; }
+  bool _STLP_CALL operator!=(const fpos<_StateT>& __y) const
+    { return _M_pos != __y._M_pos; }
+
+  fpos<_StateT>& operator+=(streamoff __off) {
+    _M_pos += __off;
+    return *this;
+  }
+  fpos<_StateT>& operator-=(streamoff __off) {
+    _M_pos -= __off;
+    return *this;
+  }
+
+  fpos<_StateT> operator+(streamoff __off) {
+    fpos<_StateT> __tmp(*this);
+    __tmp += __off;
+    return __tmp;
+  }
+  fpos<_StateT> operator-(streamoff __off) {
+    fpos<_StateT> __tmp(*this);
+    __tmp -= __off;
+    return __tmp;
+  }
+
+public:                         // Manipulation of the state member.
+  _StateT state() const { return _M_st; }
+  void state(_StateT __st) { _M_st = __st; }
+private:
+  streamoff _M_pos;
+  _StateT _M_st;
+};
+
+typedef fpos<mbstate_t> streampos;
+typedef fpos<mbstate_t> wstreampos;
+# endif
+
+// Class __char_traits_base.
+
+template <class _CharT, class _IntT> class __char_traits_base {
+public:
+  typedef _CharT char_type;
+  typedef _IntT int_type;
+#ifdef _STLP_USE_NEW_IOSTREAMS
+  typedef streamoff off_type;
+  typedef streampos pos_type;
+# ifdef _STLP_NO_MBSTATE_T
+  typedef char      state_type;
+# else
+  typedef mbstate_t state_type;
+# endif
+#endif /* _STLP_USE_NEW_IOSTREAMS */
+
+  static void _STLP_CALL assign(char_type& __c1, const char_type& __c2) { __c1 = __c2; }
+  static bool _STLP_CALL eq(const _CharT& __c1, const _CharT& __c2) 
+    { return __c1 == __c2; }
+  static bool _STLP_CALL lt(const _CharT& __c1, const _CharT& __c2) 
+    { return __c1 < __c2; }
+
+  static int _STLP_CALL compare(const _CharT* __s1, const _CharT* __s2, size_t __n) {
+    for (size_t __i = 0; __i < __n; ++__i)
+      if (!eq(__s1[__i], __s2[__i]))
+        return __s1[__i] < __s2[__i] ? -1 : 1;
+    return 0;
+  }
+
+  static size_t _STLP_CALL length(const _CharT* __s) {
+    const _CharT _NullChar = _STLP_DEFAULT_CONSTRUCTED(_CharT);
+    size_t __i;
+    for (__i = 0; !eq(__s[__i], _NullChar); ++__i)
+      {}
+    return __i;
+  }
+
+  static const _CharT* _STLP_CALL find(const _CharT* __s, size_t __n, const _CharT& __c) {
+    for ( ; __n > 0 ; ++__s, --__n)
+      if (eq(*__s, __c))
+        return __s;
+    return 0;
+  }
+
+
+  static _CharT* _STLP_CALL move(_CharT* __s1, const _CharT* __s2, size_t _Sz) {    
+    return (_Sz == 0 ? __s1 : (_CharT*)memmove(__s1, __s2, _Sz * sizeof(_CharT)));
+  }
+  
+  static _CharT* _STLP_CALL copy(_CharT* __s1, const _CharT* __s2, size_t __n) {
+    return (__n == 0 ? __s1 :
+	    (_CharT*)memcpy(__s1, __s2, __n * sizeof(_CharT)));
+    } 
+
+  static _CharT* _STLP_CALL assign(_CharT* __s, size_t __n, _CharT __c) {
+    for (size_t __i = 0; __i < __n; ++__i)
+      __s[__i] = __c;
+    return __s;
+  }
+
+  static int_type _STLP_CALL not_eof(const int_type& __c) {
+    return !eq_int_type(__c, eof()) ? __c : __STATIC_CAST(int_type, 0);
+  }
+
+  static char_type _STLP_CALL to_char_type(const int_type& __c) {
+    return (char_type)__c;
+  }
+
+  static int_type _STLP_CALL to_int_type(const char_type& __c) {
+    return (int_type)__c;
+  }
+
+  static bool _STLP_CALL eq_int_type(const int_type& __c1, const int_type& __c2) {
+    return __c1 == __c2;
+  }
+
+  static int_type _STLP_CALL eof() {
+    return (int_type)-1;
+    //    return __STATIC_CAST(int_type,-1);
+  }
+};
+
+// Generic char_traits class.  Note that this class is provided only
+//  as a base for explicit specialization; it is unlikely to be useful
+//  as is for any particular user-defined type.  In particular, it 
+//  *will not work* for a non-POD type.
+
+template <class _CharT> class char_traits
+  : public __char_traits_base<_CharT, _CharT>
+{};
+
+// Specialization for char.
+
+_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC char_traits<char> 
+  : public __char_traits_base<char, int>
+{
+public:
+  typedef char char_type;
+  typedef int int_type;
+#ifdef _STLP_USE_NEW_IOSTREAMS
+  typedef streamoff off_type;
+# ifndef _STLP_NO_MBSTATE_T
+  typedef streampos pos_type;
+  typedef mbstate_t state_type;
+# endif
+#endif /* _STLP_USE_NEW_IOSTREAMS */
+
+  static char _STLP_CALL to_char_type(const int& __c) {
+    return (char)(unsigned char)__c;
+  }
+
+  static int _STLP_CALL to_int_type(const char& __c) {
+    return (unsigned char)__c;
+  }
+
+  static int _STLP_CALL compare(const char* __s1, const char* __s2, size_t __n) 
+    { return memcmp(__s1, __s2, __n); }
+  
+  static size_t _STLP_CALL length(const char* __s) { return strlen(__s); }
+
+  static void _STLP_CALL assign(char& __c1, const char& __c2) { __c1 = __c2; }
+
+  static char* _STLP_CALL assign(char* __s, size_t __n, char __c)
+    { memset(__s, __c, __n); return __s; }
+};
+
+# if defined (_STLP_HAS_WCHAR_T)
+// Specialization for wchar_t.
+_STLP_TEMPLATE_NULL class _STLP_CLASS_DECLSPEC char_traits<wchar_t>
+  : public __char_traits_base<wchar_t, wint_t>
+{};
+# endif
+
+_STLP_END_NAMESPACE
+
+# else /* OWN_IOSTREAMS */
+
+#  include <wrap_std/iosfwd>
+
+# endif /* OWN_IOSTREAMS */
+
+#endif /* _STLP_CHAR_TRAITS_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/concept_checks.h b/main/source/stlport/stlport/stl/concept_checks.h
new file mode 100644
index 00000000..189478bf
--- /dev/null
+++ b/main/source/stlport/stlport/stl/concept_checks.h
@@ -0,0 +1,810 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Silicon Graphics makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ */
+
+#ifndef __CONCEPT_CHECKS_H
+#define __CONCEPT_CHECKS_H
+
+/*
+  Use these macro like assertions, but they assert properties
+  on types (usually template arguments). In technical terms they
+  verify whether a type "models" a "concept".
+
+  This set of requirements and the terminology used here is derived
+  from the book "Generic Programming and the STL" by Matt Austern
+  (Addison Wesley). For further information please consult that
+  book. The requirements also are intended to match the ANSI/ISO C++
+  standard.
+
+  This file covers the basic concepts and the iterator concepts.
+  There are several other files that provide the requirements
+  for the STL containers:
+    container_concepts.h
+    sequence_concepts.h
+    assoc_container_concepts.h
+
+  Jeremy Siek, 1999
+
+  TO DO:
+    - some issues with regards to concept classification and mutability
+      including AssociativeContianer -> ForwardContainer
+      and SortedAssociativeContainer -> ReversibleContainer
+    - HashedAssociativeContainer
+    - Allocator
+    - Function Object Concepts
+
+  */
+
+#ifndef _STLP_USE_CONCEPT_CHECKS
+
+// Some compilers lack the features that are necessary for concept checks.
+// On those compilers we define the concept check macros to do nothing.
+#define _STLP_REQUIRES(__type_var, __concept) do {} while(0)
+#define _STLP_CLASS_REQUIRES(__type_var, __concept) \
+  static int  __##__type_var##_##__concept
+#define _STLP_CONVERTIBLE(__type_x, __type_y) do {} while(0)
+#define _STLP_REQUIRES_SAME_TYPE(__type_x, __type_y) do {} while(0)
+#define _STLP_CLASS_REQUIRES_SAME_TYPE(__type_x, __type_y) \
+  static int  __##__type_x##__type_y##_require_same_type
+#define _STLP_GENERATOR_CHECK(__func, __ret) do {} while(0)
+#define _STLP_CLASS_GENERATOR_CHECK(__func, __ret) \
+  static int  __##__func##__ret##_generator_check
+#define _STLP_UNARY_FUNCTION_CHECK(__func, __ret, __arg) do {} while(0)
+#define _STLP_CLASS_UNARY_FUNCTION_CHECK(__func, __ret, __arg) \
+  static int  __##__func##__ret##__arg##_unary_function_check
+#define _STLP_BINARY_FUNCTION_CHECK(__func, __ret, __first, __second) \
+  do {} while(0)
+#define _STLP_CLASS_BINARY_FUNCTION_CHECK(__func, __ret, __first, __second) \
+  static int  __##__func##__ret##__first##__second##_binary_function_check
+#define _STLP_REQUIRES_BINARY_OP(__opname, __ret, __first, __second) \
+  do {} while(0)
+#define _STLP_CLASS_REQUIRES_BINARY_OP(__opname, __ret, __first, __second) \
+  static int __##__opname##__ret##__first##__second##_require_binary_op
+
+#else /* _STLP_USE_CONCEPT_CHECKS */
+
+// This macro tests whether the template argument "__type_var"
+// satisfies the requirements of "__concept".  Here is a list of concepts
+// that we know how to check:
+//       _Allocator
+//       _Assignable
+//       _DefaultConstructible
+//       _EqualityComparable
+//       _LessThanComparable
+//       _TrivialIterator
+//       _InputIterator
+//       _OutputIterator
+//       _ForwardIterator
+//       _BidirectionalIterator
+//       _RandomAccessIterator
+//       _Mutable_TrivialIterator
+//       _Mutable_ForwardIterator
+//       _Mutable_BidirectionalIterator
+//       _Mutable_RandomAccessIterator
+
+#define _STLP_REQUIRES(__type_var, __concept) \
+do { \
+  void (*__x)( __type_var ) = __concept##_concept_specification< __type_var >\
+    ::##__concept##_requirement_violation; __x = __x; } while (0)
+
+// Use this to check whether type X is convertible to type Y
+#define _STLP_CONVERTIBLE(__type_x, __type_y) \
+do { \
+  void (*__x)( __type_x , __type_y ) = _STL_CONVERT_ERROR< __type_x , \
+  __type_y >::__type_X_is_not_convertible_to_type_Y; \
+  __x = __x; } while (0)
+
+// Use this to test whether two template arguments are the same type
+#define _STLP_REQUIRES_SAME_TYPE(__type_x, __type_y) \
+do { \
+  void (*__x)( __type_x , __type_y ) = _STL_SAME_TYPE_ERROR< __type_x, \
+    __type_y  >::__type_X_not_same_as_type_Y; \
+  __x = __x; } while (0)
+
+
+// function object checks
+#define _STLP_GENERATOR_CHECK(__func, __ret) \
+do { \
+  __ret (*__x)( __func&) = \
+     _STL_GENERATOR_ERROR< \
+  __func, __ret>::__generator_requirement_violation; \
+  __x = __x; } while (0)
+
+
+#define _STLP_UNARY_FUNCTION_CHECK(__func, __ret, __arg) \
+do { \
+  __ret (*__x)( __func&, const __arg& ) = \
+     _STL_UNARY_FUNCTION_ERROR< \
+  __func, __ret, __arg>::__unary_function_requirement_violation; \
+  __x = __x; } while (0)
+
+
+#define _STLP_BINARY_FUNCTION_CHECK(__func, __ret, __first, __second) \
+do { \
+  __ret (*__x)( __func&, const __first&, const __second& ) = \
+     _STL_BINARY_FUNCTION_ERROR< \
+  __func, __ret, __first, __second>::__binary_function_requirement_violation; \
+  __x = __x; } while (0)
+
+
+#define _STLP_REQUIRES_BINARY_OP(__opname, __ret, __first, __second) \
+    do { \
+  __ret (*__x)( __first&, __second& ) = _STL_BINARY##__opname##_ERROR< \
+    __ret, __first, __second>::__binary_operator_requirement_violation; \
+  __ret (*__y)( const __first&, const __second& ) = \
+    _STL_BINARY##__opname##_ERROR< __ret, __first, __second>:: \
+      __const_binary_operator_requirement_violation; \
+  __y = __y; __x = __x; } while (0)
+
+
+#ifdef _STLP_NO_FUNCTION_PTR_IN_CLASS_TEMPLATE
+
+#define _STLP_CLASS_REQUIRES(__type_var, __concept)
+#define _STLP_CLASS_REQUIRES_SAME_TYPE(__type_x, __type_y)
+#define _STLP_CLASS_GENERATOR_CHECK(__func, __ret)
+#define _STLP_CLASS_UNARY_FUNCTION_CHECK(__func, __ret, __arg)
+#define _STLP_CLASS_BINARY_FUNCTION_CHECK(__func, __ret, __first, __second)
+#define _STLP_CLASS_REQUIRES_BINARY_OP(__opname, __ret, __first, __second)
+
+#else
+
+// Use this macro inside of template classes, where you would
+// like to place requirements on the template arguments to the class
+// Warning: do not pass pointers and such (e.g. T*) in as the __type_var,
+// since the type_var is used to construct identifiers. Instead typedef
+// the pointer type, then use the typedef name for the __type_var.
+#define _STLP_CLASS_REQUIRES(__type_var, __concept) \
+  typedef void (* __func##__type_var##__concept)( __type_var ); \
+  template <__func##__type_var##__concept _Tp1> \
+  struct __dummy_struct_##__type_var##__concept { }; \
+  static __dummy_struct_##__type_var##__concept< \
+    __concept##_concept_specification< \
+      __type_var>::__concept##_requirement_violation>  \
+  __dummy_ptr_##__type_var##__concept
+
+
+#define _STLP_CLASS_REQUIRES_SAME_TYPE(__type_x, __type_y) \
+  typedef void (* __func_##__type_x##__type_y##same_type)( __type_x, \
+                                                            __type_y ); \
+  template < __func_##__type_x##__type_y##same_type _Tp1> \
+  struct __dummy_struct_##__type_x##__type_y##_same_type { }; \
+  static __dummy_struct_##__type_x##__type_y##_same_type< \
+    _STL_SAME_TYPE_ERROR<__type_x, __type_y>::__type_X_not_same_as_type_Y>  \
+  __dummy_ptr_##__type_x##__type_y##_same_type
+
+
+#define _STLP_CLASS_GENERATOR_CHECK(__func, __ret) \
+  typedef __ret (* __f_##__func##__ret##_generator)( __func& ); \
+  template <__f_##__func##__ret##_generator _Tp1> \
+  struct __dummy_struct_##__func##__ret##_generator { }; \
+  static __dummy_struct_##__func##__ret##_generator< \
+    _STL_GENERATOR_ERROR< \
+      __func, __ret>::__generator_requirement_violation>  \
+  __dummy_ptr_##__func##__ret##_generator
+
+
+#define _STLP_CLASS_UNARY_FUNCTION_CHECK(__func, __ret, __arg) \
+  typedef __ret (* __f_##__func##__ret##__arg##_unary_check)( __func&, \
+                                                         const __arg& ); \
+  template <__f_##__func##__ret##__arg##_unary_check _Tp1> \
+  struct __dummy_struct_##__func##__ret##__arg##_unary_check { }; \
+  static __dummy_struct_##__func##__ret##__arg##_unary_check< \
+    _STL_UNARY_FUNCTION_ERROR< \
+      __func, __ret, __arg>::__unary_function_requirement_violation>  \
+  __dummy_ptr_##__func##__ret##__arg##_unary_check
+
+
+#define _STLP_CLASS_BINARY_FUNCTION_CHECK(__func, __ret, __first, __second) \
+  typedef __ret (* __f_##__func##__ret##__first##__second##_binary_check)( __func&, const __first&,\
+                                                    const __second& ); \
+  template <__f_##__func##__ret##__first##__second##_binary_check _Tp1> \
+  struct __dummy_struct_##__func##__ret##__first##__second##_binary_check { }; \
+  static __dummy_struct_##__func##__ret##__first##__second##_binary_check< \
+    _STL_BINARY_FUNCTION_ERROR<__func, __ret, __first, __second>:: \
+  __binary_function_requirement_violation>  \
+  __dummy_ptr_##__func##__ret##__first##__second##_binary_check
+
+
+#define _STLP_CLASS_REQUIRES_BINARY_OP(__opname, __ret, __first, __second) \
+  typedef __ret (* __f_##__func##__ret##__first##__second##_binary_op)(const __first&, \
+                                                    const __second& ); \
+  template <__f_##__func##__ret##__first##__second##_binary_op _Tp1> \
+  struct __dummy_struct_##__func##__ret##__first##__second##_binary_op { }; \
+  static __dummy_struct_##__func##__ret##__first##__second##_binary_op< \
+    _STL_BINARY##__opname##_ERROR<__ret, __first, __second>:: \
+  __binary_operator_requirement_violation>  \
+  __dummy_ptr_##__func##__ret##__first##__second##_binary_op
+
+#endif
+
+/* helper class for finding non-const version of a type. Need to have
+   something to assign to etc. when testing constant iterators. */
+
+template <class _Tp>
+struct _Mutable_trait {
+  typedef _Tp _Type;
+};
+template <class _Tp>
+struct _Mutable_trait<const _Tp> {
+  typedef _Tp _Type;
+};
+
+
+/* helper function for avoiding compiler warnings about unused variables */
+template <class _Type>
+void __sink_unused_warning(_Type) { }
+
+template <class _TypeX, class _TypeY>
+struct _STL_CONVERT_ERROR {
+  static void
+  __type_X_is_not_convertible_to_type_Y(_TypeX __x, _TypeY) {
+    _TypeY __y = __x;
+    __sink_unused_warning(__y);
+  }
+};
+
+
+template <class _Type> struct __check_equal { };
+
+template <class _TypeX, class _TypeY>
+struct _STL_SAME_TYPE_ERROR {
+  static void
+  __type_X_not_same_as_type_Y(_TypeX , _TypeY ) { 
+    __check_equal<_TypeX> t1 = __check_equal<_TypeY>();
+  }
+};
+
+
+// Some Functon Object Checks
+
+template <class _Func, class _Ret>
+struct _STL_GENERATOR_ERROR {
+  static _Ret __generator_requirement_violation(_Func& __f) {
+    return __f();
+  }
+};
+
+template <class _Func>
+struct _STL_GENERATOR_ERROR<_Func, void> {
+  static void __generator_requirement_violation(_Func& __f) {
+    __f();
+  }
+};
+
+
+template <class _Func, class _Ret, class _Arg>
+struct _STL_UNARY_FUNCTION_ERROR {
+  static _Ret
+  __unary_function_requirement_violation(_Func& __f,
+                                          const _Arg& __arg) {
+    return __f(__arg);
+  }
+};
+
+template <class _Func, class _Arg>
+struct _STL_UNARY_FUNCTION_ERROR<_Func, void, _Arg> {
+  static void
+  __unary_function_requirement_violation(_Func& __f,
+                                          const _Arg& __arg) {
+    __f(__arg);
+  }
+};
+
+template <class _Func, class _Ret, class _First, class _Second>
+struct _STL_BINARY_FUNCTION_ERROR {
+  static _Ret
+  __binary_function_requirement_violation(_Func& __f,
+                                          const _First& __first, 
+                                          const _Second& __second) {
+    return __f(__first, __second);
+  }
+};
+
+template <class _Func, class _First, class _Second>
+struct _STL_BINARY_FUNCTION_ERROR<_Func, void, _First, _Second> {
+  static void
+  __binary_function_requirement_violation(_Func& __f,
+                                          const _First& __first, 
+                                          const _Second& __second) {
+    __f(__first, __second);
+  }
+};
+
+
+#define _STLP_DEFINE_BINARY_OP_CHECK(_OP, _NAME) \
+template <class _Ret, class _First, class _Second> \
+struct _STL_BINARY##_NAME##_ERROR { \
+  static _Ret \
+  __const_binary_operator_requirement_violation(const _First& __first,  \
+                                                const _Second& __second) { \
+    return __first _OP __second; \
+  } \
+  static _Ret \
+  __binary_operator_requirement_violation(_First& __first,  \
+                                          _Second& __second) { \
+    return __first _OP __second; \
+  } \
+}
+
+_STLP_DEFINE_BINARY_OP_CHECK(==, _OP_EQUAL);
+_STLP_DEFINE_BINARY_OP_CHECK(!=, _OP_NOT_EQUAL);
+_STLP_DEFINE_BINARY_OP_CHECK(<, _OP_LESS_THAN);
+_STLP_DEFINE_BINARY_OP_CHECK(<=, _OP_LESS_EQUAL);
+_STLP_DEFINE_BINARY_OP_CHECK(>, _OP_GREATER_THAN);
+_STLP_DEFINE_BINARY_OP_CHECK(>=, _OP_GREATER_EQUAL);
+_STLP_DEFINE_BINARY_OP_CHECK(+, _OP_PLUS);
+_STLP_DEFINE_BINARY_OP_CHECK(*, _OP_TIMES);
+_STLP_DEFINE_BINARY_OP_CHECK(/, _OP_DIVIDE);
+_STLP_DEFINE_BINARY_OP_CHECK(-, _OP_SUBTRACT);
+_STLP_DEFINE_BINARY_OP_CHECK(%, _OP_MOD);
+// ...
+
+// TODO, add unary operators (prefix and postfix)
+
+/*
+  The presence of this class is just to trick EDG into displaying
+  these error messages before any other errors. Without the
+  classes, the errors in the functions get reported after
+  other class errors deep inside the library. The name
+  choice just makes for an eye catching error message :)
+ */
+struct _STL_ERROR {
+
+  template <class _Type>
+  static _Type
+  __default_constructor_requirement_violation(_Type) {
+    return _Type();
+  }
+  template <class _Type>
+  static _Type
+  __assignment_operator_requirement_violation(_Type __a) {
+    __a = __a;
+    return __a;
+  }
+  template <class _Type>
+  static _Type
+  __copy_constructor_requirement_violation(_Type __a) {
+    _Type __c(__a);
+    return __c;
+  }
+  template <class _Type>
+  static _Type
+  __const_parameter_required_for_copy_constructor(_Type /* __a */, 
+                                                  const _Type& __b) {
+    _Type __c(__b);
+    return __c;
+  }
+  template <class _Type>
+  static _Type
+  __const_parameter_required_for_assignment_operator(_Type __a, 
+                                                     const _Type& __b) {
+    __a = __b;
+    return __a;
+  }
+  template <class _Type>
+  static _Type
+  __less_than_comparable_requirement_violation(_Type __a, _Type __b) {
+    if (__a < __b || __a > __b || __a <= __b || __a >= __b) return __a;
+    return __b;
+  }
+  template <class _Type>
+  static _Type
+  __equality_comparable_requirement_violation(_Type __a, _Type __b) {
+    if (__a == __b || __a != __b) return __a;
+    return __b;
+  }
+  template <class _Iterator>
+  static void
+  __dereference_operator_requirement_violation(_Iterator __i) {
+    __sink_unused_warning(*__i);
+  }
+  template <class _Iterator>
+  static void
+  __dereference_operator_and_assignment_requirement_violation(_Iterator __i) {
+    *__i = *__i;
+  }
+  template <class _Iterator>
+  static void
+  __preincrement_operator_requirement_violation(_Iterator __i) {
+    ++__i;
+  }
+  template <class _Iterator>
+  static void
+  __postincrement_operator_requirement_violation(_Iterator __i) {
+    __i++;
+  }
+  template <class _Iterator>
+  static void
+  __predecrement_operator_requirement_violation(_Iterator __i) {
+    --__i;
+  }
+  template <class _Iterator>
+  static void
+  __postdecrement_operator_requirement_violation(_Iterator __i) {
+    __i--;
+  }
+  template <class _Iterator, class _Type>
+  static void
+  __postincrement_operator_and_assignment_requirement_violation(_Iterator __i,
+                                                                _Type __t) {
+    *__i++ = __t;
+  }
+  template <class _Iterator, class _Distance>
+  static _Iterator
+  __iterator_addition_assignment_requirement_violation(_Iterator __i, 
+                                                       _Distance __n) {
+    __i += __n;
+    return __i;
+  }
+  template <class _Iterator, class _Distance>
+  static _Iterator
+  __iterator_addition_requirement_violation(_Iterator __i, _Distance __n) {
+    __i = __i + __n;
+    __i = __n + __i;
+    return __i;
+  }
+  template <class _Iterator, class _Distance>
+  static _Iterator
+  __iterator_subtraction_assignment_requirement_violation(_Iterator __i,
+                                                          _Distance __n) {
+    __i -= __n;
+    return __i;
+  }
+  template <class _Iterator, class _Distance>
+  static _Iterator
+  __iterator_subtraction_requirement_violation(_Iterator __i, _Distance __n) {
+    __i = __i - __n;
+    return __i;
+  }
+  template <class _Iterator, class _Distance>
+  static _Distance
+  __difference_operator_requirement_violation(_Iterator __i, _Iterator __j,
+                                              _Distance __n) {
+    __n = __i - __j;
+    return __n;
+  }
+  template <class _Exp, class _Type, class _Distance>
+  static _Type
+  __element_access_operator_requirement_violation(_Exp __x, _Type*,
+                                                  _Distance __n) {
+    return __x[__n];
+  }
+  template <class _Exp, class _Type, class _Distance>
+  static void
+  __element_assignment_operator_requirement_violation(_Exp __x,
+                                                      _Type* __t,
+                                                      _Distance __n) {
+    __x[__n] = *__t;
+  }
+
+}; /* _STL_ERROR */
+
+/* Associated Type Requirements */
+
+_STLP_BEGIN_NAMESPACE
+template <class _Iterator> struct iterator_traits;
+_STLP_END_NAMESPACE
+
+template <class _Iter> 
+struct __value_type_type_definition_requirement_violation {
+  typedef typename __STD::iterator_traits<_Iter>::value_type value_type;
+};
+
+template <class _Iter> 
+struct __difference_type_type_definition_requirement_violation {
+  typedef typename __STD::iterator_traits<_Iter>::difference_type
+          difference_type;
+};
+
+template <class _Iter> 
+struct __reference_type_definition_requirement_violation {
+  typedef typename __STD::iterator_traits<_Iter>::reference reference;
+};
+
+template <class _Iter> 
+struct __pointer_type_definition_requirement_violation {
+  typedef typename __STD::iterator_traits<_Iter>::pointer pointer;
+};
+
+template <class _Iter> 
+struct __iterator_category_type_definition_requirement_violation {
+  typedef typename __STD::iterator_traits<_Iter>::iterator_category 
+          iterator_category;
+};
+
+/* Assignable Requirements */
+
+
+template <class _Type>
+struct _Assignable_concept_specification {
+  static void _Assignable_requirement_violation(_Type __a) {
+    _STL_ERROR::__assignment_operator_requirement_violation(__a);
+    _STL_ERROR::__copy_constructor_requirement_violation(__a);
+    _STL_ERROR::__const_parameter_required_for_copy_constructor(__a,__a);
+    _STL_ERROR::__const_parameter_required_for_assignment_operator(__a,__a);
+  }
+};
+
+/* DefaultConstructible Requirements */
+
+
+template <class _Type>
+struct _DefaultConstructible_concept_specification {
+  static void _DefaultConstructible_requirement_violation(_Type __a) {
+    _STL_ERROR::__default_constructor_requirement_violation(__a);
+  }
+};
+
+/* EqualityComparable Requirements */
+
+template <class _Type>
+struct _EqualityComparable_concept_specification {
+  static void _EqualityComparable_requirement_violation(_Type __a) {
+    _STL_ERROR::__equality_comparable_requirement_violation(__a, __a);
+  }
+};
+
+/* LessThanComparable Requirements */
+template <class _Type>
+struct _LessThanComparable_concept_specification {
+  static void _LessThanComparable_requirement_violation(_Type __a) {
+    _STL_ERROR::__less_than_comparable_requirement_violation(__a, __a);
+  }
+};
+
+/* TrivialIterator Requirements */
+
+template <class _TrivialIterator>
+struct _TrivialIterator_concept_specification {
+static void
+_TrivialIterator_requirement_violation(_TrivialIterator __i) {
+  typedef typename
+    __value_type_type_definition_requirement_violation<_TrivialIterator>::
+    value_type __T;
+  // Refinement of Assignable
+  _Assignable_concept_specification<_TrivialIterator>::
+    _Assignable_requirement_violation(__i);
+  // Refinement of DefaultConstructible
+  _DefaultConstructible_concept_specification<_TrivialIterator>::
+    _DefaultConstructible_requirement_violation(__i);
+  // Refinement of EqualityComparable
+  _EqualityComparable_concept_specification<_TrivialIterator>::
+    _EqualityComparable_requirement_violation(__i);
+  // Valid Expressions
+  _STL_ERROR::__dereference_operator_requirement_violation(__i);
+}
+};
+
+template <class _TrivialIterator>
+struct _Mutable_TrivialIterator_concept_specification {
+static void
+_Mutable_TrivialIterator_requirement_violation(_TrivialIterator __i) {
+  _TrivialIterator_concept_specification<_TrivialIterator>::
+    _TrivialIterator_requirement_violation(__i);
+  // Valid Expressions
+  _STL_ERROR::__dereference_operator_and_assignment_requirement_violation(__i);
+}
+};
+
+/* InputIterator Requirements */
+
+template <class _InputIterator>
+struct _InputIterator_concept_specification {
+static void
+_InputIterator_requirement_violation(_InputIterator __i) {
+  // Refinement of TrivialIterator
+  _TrivialIterator_concept_specification<_InputIterator>::
+    _TrivialIterator_requirement_violation(__i);
+  // Associated Types
+  __difference_type_type_definition_requirement_violation<_InputIterator>();
+  __reference_type_definition_requirement_violation<_InputIterator>();
+  __pointer_type_definition_requirement_violation<_InputIterator>();
+  __iterator_category_type_definition_requirement_violation<_InputIterator>();
+  // Valid Expressions
+  _STL_ERROR::__preincrement_operator_requirement_violation(__i);
+  _STL_ERROR::__postincrement_operator_requirement_violation(__i);
+}
+};
+
+/* OutputIterator Requirements */
+
+template <class _OutputIterator>
+struct _OutputIterator_concept_specification {
+static void
+_OutputIterator_requirement_violation(_OutputIterator __i) {
+  // Refinement of Assignable
+  _Assignable_concept_specification<_OutputIterator>::
+    _Assignable_requirement_violation(__i);
+  // Associated Types
+  __iterator_category_type_definition_requirement_violation<_OutputIterator>();
+  // Valid Expressions
+  _STL_ERROR::__dereference_operator_requirement_violation(__i);
+  _STL_ERROR::__preincrement_operator_requirement_violation(__i);
+  _STL_ERROR::__postincrement_operator_requirement_violation(__i);
+  _STL_ERROR::
+    __postincrement_operator_and_assignment_requirement_violation(__i, *__i);
+}
+};
+
+/* ForwardIterator Requirements */
+
+template <class _ForwardIterator>
+struct _ForwardIterator_concept_specification {
+static void
+_ForwardIterator_requirement_violation(_ForwardIterator __i) {
+  // Refinement of InputIterator
+  _InputIterator_concept_specification<_ForwardIterator>::
+    _InputIterator_requirement_violation(__i);
+}
+};
+
+template <class _ForwardIterator>
+struct _Mutable_ForwardIterator_concept_specification {
+static void
+_Mutable_ForwardIterator_requirement_violation(_ForwardIterator __i) {
+  _ForwardIterator_concept_specification<_ForwardIterator>::
+    _ForwardIterator_requirement_violation(__i);
+  // Refinement of OutputIterator
+  _OutputIterator_concept_specification<_ForwardIterator>::
+    _OutputIterator_requirement_violation(__i);
+}
+};
+
+/* BidirectionalIterator Requirements */
+
+template <class _BidirectionalIterator>
+struct _BidirectionalIterator_concept_specification {
+static void
+_BidirectionalIterator_requirement_violation(_BidirectionalIterator __i) {
+  // Refinement of ForwardIterator
+  _ForwardIterator_concept_specification<_BidirectionalIterator>::
+    _ForwardIterator_requirement_violation(__i);
+  // Valid Expressions
+  _STL_ERROR::__predecrement_operator_requirement_violation(__i);
+  _STL_ERROR::__postdecrement_operator_requirement_violation(__i);
+}
+};
+
+template <class _BidirectionalIterator>
+struct _Mutable_BidirectionalIterator_concept_specification {
+static void
+_Mutable_BidirectionalIterator_requirement_violation(
+       _BidirectionalIterator __i)
+{
+  _BidirectionalIterator_concept_specification<_BidirectionalIterator>::
+    _BidirectionalIterator_requirement_violation(__i);
+  // Refinement of mutable_ForwardIterator
+  _Mutable_ForwardIterator_concept_specification<_BidirectionalIterator>::
+    _Mutable_ForwardIterator_requirement_violation(__i);
+  typedef typename
+    __value_type_type_definition_requirement_violation<
+    _BidirectionalIterator>::value_type __T;
+  typename _Mutable_trait<__T>::_Type* __tmp_ptr = 0;
+  // Valid Expressions
+  _STL_ERROR::
+    __postincrement_operator_and_assignment_requirement_violation(__i,
+                                                                  *__tmp_ptr);
+}
+};
+
+/* RandomAccessIterator Requirements */
+
+template <class _RandAccIter>
+struct _RandomAccessIterator_concept_specification {
+static void
+_RandomAccessIterator_requirement_violation(_RandAccIter __i) {
+  // Refinement of BidirectionalIterator
+  _BidirectionalIterator_concept_specification<_RandAccIter>::
+    _BidirectionalIterator_requirement_violation(__i);
+  // Refinement of LessThanComparable
+  _LessThanComparable_concept_specification<_RandAccIter>::
+    _LessThanComparable_requirement_violation(__i);
+  typedef typename 
+        __value_type_type_definition_requirement_violation<_RandAccIter>
+        ::value_type
+    value_type;
+  typedef typename
+        __difference_type_type_definition_requirement_violation<_RandAccIter>
+        ::difference_type 
+    _Dist;
+  typedef typename _Mutable_trait<_Dist>::_Type _MutDist;
+
+  // Valid Expressions
+  _STL_ERROR::__iterator_addition_assignment_requirement_violation(__i,
+                                                                   _MutDist());
+  _STL_ERROR::__iterator_addition_requirement_violation(__i,
+                                                        _MutDist());
+  _STL_ERROR::
+    __iterator_subtraction_assignment_requirement_violation(__i,
+                                                            _MutDist());
+  _STL_ERROR::__iterator_subtraction_requirement_violation(__i,
+                                                           _MutDist());
+  _STL_ERROR::__difference_operator_requirement_violation(__i, __i,
+                                                          _MutDist());
+  typename _Mutable_trait<value_type>::_Type* __dummy_ptr = 0;
+  _STL_ERROR::__element_access_operator_requirement_violation(__i,
+                                                              __dummy_ptr,
+                                                              _MutDist());
+}
+};
+
+template <class _RandAccIter>
+struct _Mutable_RandomAccessIterator_concept_specification {
+static void
+_Mutable_RandomAccessIterator_requirement_violation(_RandAccIter __i)
+{
+  _RandomAccessIterator_concept_specification<_RandAccIter>::
+    _RandomAccessIterator_requirement_violation(__i);
+  // Refinement of mutable_BidirectionalIterator
+  _Mutable_BidirectionalIterator_concept_specification<_RandAccIter>::
+    _Mutable_BidirectionalIterator_requirement_violation(__i);
+  typedef typename
+        __value_type_type_definition_requirement_violation<_RandAccIter>
+        ::value_type
+    value_type;
+  typedef typename
+        __difference_type_type_definition_requirement_violation<_RandAccIter>
+        ::difference_type
+    _Dist;
+
+  typename _Mutable_trait<value_type>::_Type* __tmp_ptr = 0;
+  // Valid Expressions
+  _STL_ERROR::__element_assignment_operator_requirement_violation(__i,
+                  __tmp_ptr, _Dist());
+}
+};
+
+#define _STLP_TYPEDEF_REQUIREMENT(__REQUIREMENT) \
+template <class Type> \
+struct __##__REQUIREMENT##__typedef_requirement_violation { \
+  typedef typename Type::__REQUIREMENT __REQUIREMENT; \
+};
+
+_STLP_TYPEDEF_REQUIREMENT(value_type);
+_STLP_TYPEDEF_REQUIREMENT(difference_type);
+_STLP_TYPEDEF_REQUIREMENT(size_type);
+_STLP_TYPEDEF_REQUIREMENT(reference);
+_STLP_TYPEDEF_REQUIREMENT(const_reference);
+_STLP_TYPEDEF_REQUIREMENT(pointer);
+_STLP_TYPEDEF_REQUIREMENT(const_pointer);
+
+
+template <class _Alloc>
+struct _Allocator_concept_specification {
+static void
+_Allocator_requirement_violation(_Alloc __a) {
+  // Refinement of DefaultConstructible
+  _DefaultConstructible_concept_specification<_Alloc>::
+    _DefaultConstructible_requirement_violation(__a);
+  // Refinement of EqualityComparable
+  _EqualityComparable_concept_specification<_Alloc>::
+    _EqualityComparable_requirement_violation(__a);
+  // Associated Types
+  __value_type__typedef_requirement_violation<_Alloc>();
+  __difference_type__typedef_requirement_violation<_Alloc>();
+  __size_type__typedef_requirement_violation<_Alloc>();
+  __reference__typedef_requirement_violation<_Alloc>();
+  __const_reference__typedef_requirement_violation<_Alloc>();
+  __pointer__typedef_requirement_violation<_Alloc>();
+  __const_pointer__typedef_requirement_violation<_Alloc>();
+  typedef typename _Alloc::value_type _Type;
+  _STLP_REQUIRES_SAME_TYPE(typename _Alloc::rebind<_Type>::other, _Alloc);
+}
+};
+
+#endif /* _STLP_USE_CONCEPT_CHECKS */
+
+#endif /* __CONCEPT_CHECKS_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/debug/_debug.c b/main/source/stlport/stlport/stl/debug/_debug.c
new file mode 100644
index 00000000..4b23c183
--- /dev/null
+++ b/main/source/stlport/stlport/stl/debug/_debug.c
@@ -0,0 +1,490 @@
+/*
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# ifndef _STLP_DEBUG_C
+#  define  _STLP_DEBUG_C
+
+#if defined ( _STLP_DEBUG )
+
+# ifdef _STLP_THREADS
+#  ifndef _STLP_NEED_MUTABLE 
+#   define _STLP_ACQUIRE_LOCK(_Lock) _Lock._M_acquire_lock();
+#   define _STLP_RELEASE_LOCK(_Lock) _Lock._M_release_lock();
+#  else
+#   define _STLP_ACQUIRE_LOCK(_Lock) ((_STLP_mutex&)_Lock)._M_acquire_lock();
+#   define _STLP_RELEASE_LOCK(_Lock) ((_STLP_mutex&)_Lock)._M_release_lock();
+#  endif /* _STLP_NEED_MUTABLE */
+# else
+#  define _STLP_ACQUIRE_LOCK(_Lock)
+#  define _STLP_RELEASE_LOCK(_Lock)
+# endif /* _STLP_THREADS */
+
+_STLP_BEGIN_NAMESPACE
+
+//==========================================================
+//  global non-inline functions
+//==========================================================
+
+// [ i1, i2)
+template <class _Iterator>
+inline bool  _STLP_CALL
+__in_range_aux(const _Iterator& __it, const _Iterator& __first,
+               const _Iterator& __last, const random_access_iterator_tag &) {
+    return ( __it >= __first && 
+             __it < __last);
+}
+
+template <class _Iterator1, class _Iterator>
+# if defined (_STLP_MSVC) && (_STLP_MSVC >= 1100)
+inline bool _STLP_CALL  __in_range_aux(_Iterator1 __it, const _Iterator& __first,
+# else
+inline bool _STLP_CALL  __in_range_aux(const _Iterator1& __it, const _Iterator& __first,
+# endif
+                                       const _Iterator& __last, const forward_iterator_tag &) {
+    _Iterator1 __i(__first);
+    for (;  __i != __last && __i != __it; ++__i);
+    return (__i!=__last);
+}
+
+# if defined (_STLP_NONTEMPL_BASE_MATCH_BUG)
+template <class _Iterator1, class _Iterator>
+inline bool  _STLP_CALL
+__in_range_aux(const _Iterator1& __it, const _Iterator& __first,
+               const _Iterator& __last, const bidirectional_iterator_tag &) {
+    _Iterator1 __i(__first);
+    for (;  __i != __last && __i != __it; ++__i);
+    return (__i !=__last);
+}
+# endif
+
+template <class _Iterator>
+bool _STLP_CALL  __check_range(const _Iterator& __first, const _Iterator& __last) {
+    _STLP_VERBOSE_RETURN(__valid_range(__first,__last), _StlMsg_INVALID_RANGE )
+    return true;
+}
+
+template <class _Iterator>
+bool _STLP_CALL  __check_range(const _Iterator& __it, 
+                               const _Iterator& __start, const _Iterator& __finish) {
+    _STLP_VERBOSE_RETURN(__in_range(__it,__start, __finish), 
+                         _StlMsg_NOT_IN_RANGE_1)
+    return true;
+}
+
+template <class _Iterator>
+bool _STLP_CALL  __check_range(const _Iterator& __first, const _Iterator& __last, 
+                               const _Iterator& __start, const _Iterator& __finish) {
+    _STLP_VERBOSE_RETURN(__in_range(__first, __last, __start, __finish), 
+                         _StlMsg_NOT_IN_RANGE_2)
+    return true;
+}
+
+//===============================================================
+
+template <class _Iterator>
+void  _STLP_CALL __invalidate_range(const __owned_list* __base, 
+                                    const _Iterator& __first,
+                                    const _Iterator& __last)
+{
+    typedef _Iterator* _Safe_iterator_ptr;
+    typedef __owned_link _L_type;
+    _STLP_ACQUIRE_LOCK(__base->_M_lock)
+    _L_type* __pos;
+    _L_type* __prev;
+
+    for (__prev = (_L_type*)&__base->_M_node, __pos= (_L_type*)__prev->_M_next; 
+         __pos!=0;) {	    
+        if ((!(&__first == (_Iterator*)__pos || &__last == (_Iterator*)__pos))
+            &&  __in_range_aux(
+			       ((_Iterator*)__pos)->_M_iterator,
+			       __first._M_iterator,
+			       __last._M_iterator,
+			       _STLP_ITERATOR_CATEGORY(__first, _Iterator))) {
+	  __pos->_M_owner = 0;
+	  __pos = (_L_type*) (__prev->_M_next = __pos->_M_next);
+	}
+	else {
+	  __prev = __pos;
+	  __pos=(_L_type*)__pos->_M_next;
+	}
+    }
+    _STLP_RELEASE_LOCK(__base->_M_lock)    
+}
+
+template <class _Iterator>
+void  _STLP_CALL __invalidate_iterator(const __owned_list* __base, 
+                                       const _Iterator& __it)
+{
+    typedef __owned_link   _L_type;
+    _L_type*  __position, *__prev;
+    _STLP_ACQUIRE_LOCK(__base->_M_lock)
+    for (__prev = (_L_type*)&__base->_M_node, __position = (_L_type*)__prev->_M_next; 
+         __position!= 0;) {
+      // this requires safe iterators to be derived from __owned_link
+       if ((__position != (_L_type*)&__it) && ((_Iterator*)__position)->_M_iterator ==__it._M_iterator) {
+	    __position->_M_owner = 0;
+	    __position = (_L_type*) (__prev->_M_next = __position->_M_next);
+        }
+       else {
+	 __prev = __position;
+	 __position=(_L_type*)__position->_M_next;
+       }
+    }
+    _STLP_RELEASE_LOCK(__base->_M_lock)
+}
+
+_STLP_END_NAMESPACE
+
+# endif /* _STLP_DEBUG */
+
+# if defined (_STLP_EXPOSE_GLOBALS_IMPLEMENTATION)
+
+// dwa 12/26/99 -- for abort
+#  if defined (_STLP_USE_NEW_C_HEADERS)
+#   include <cstdlib>
+#  else
+#   include <stdlib.h>
+#  endif
+
+# if defined (_STLP_WIN32)
+#  include <stl/_threads.h>
+# endif
+
+//==========================================================
+// .c section
+//  owned_list non-inline methods and global functions 
+//==========================================================
+
+#if defined ( _STLP_ASSERTIONS )
+
+_STLP_BEGIN_NAMESPACE
+
+# ifndef _STLP_STRING_LITERAL
+# define _STLP_STRING_LITERAL(__x) __x
+# endif
+
+# ifdef _STLP_WINCE
+#  define _STLP_PERCENT_S "%hs" 
+# else
+#  define _STLP_PERCENT_S "%s" 
+# endif
+
+# define _STLP_MESSAGE_TABLE_BODY = { \
+_STLP_STRING_LITERAL("\n" _STLP_PERCENT_S "(%d): STL error: %s\n"), \
+_STLP_STRING_LITERAL(_STLP_PERCENT_S "(%d): STL assertion failure : " _STLP_PERCENT_S "\n" _STLP_ASSERT_MSG_TRAILER), \
+_STLP_STRING_LITERAL("\n" _STLP_PERCENT_S "(%d): STL error : " _STLP_PERCENT_S "\n" _STLP_PERCENT_S "(%d): STL assertion failure:     " _STLP_PERCENT_S " \n" _STLP_ASSERT_MSG_TRAILER), \
+_STLP_STRING_LITERAL("Invalid argument to operation (see operation documentation)"),                  \
+_STLP_STRING_LITERAL("Taking an iterator out of destroyed (or otherwise corrupted) container"),       \
+_STLP_STRING_LITERAL("Trying to extract an object out from empty container"),\
+_STLP_STRING_LITERAL("Past-the-end iterator could not be erased"),  \
+_STLP_STRING_LITERAL("Index out of bounds"),  \
+_STLP_STRING_LITERAL("Container doesn't own the iterator"),  \
+_STLP_STRING_LITERAL("Uninitialized or invalidated (by mutating operation) iterator used"),  \
+_STLP_STRING_LITERAL("Uninitialized or invalidated (by mutating operation) lefthand iterator in expression"),  \
+_STLP_STRING_LITERAL("Uninitialized or invalidated (by mutating operation) righthand iterator in expression"),  \
+_STLP_STRING_LITERAL("Iterators used in expression are from different owners"),  \
+_STLP_STRING_LITERAL("Iterator could not be dereferenced (past-the-end ?)"),  \
+_STLP_STRING_LITERAL("Range [first,last) is invalid"),  \
+_STLP_STRING_LITERAL("Iterator is not in range [first,last)"),  \
+_STLP_STRING_LITERAL("Range [first,last) is not in range [start,finish)"),  \
+_STLP_STRING_LITERAL("The advance would produce invalid iterator"),  \
+_STLP_STRING_LITERAL("Iterator is singular (advanced beyond the bounds ?)"),  \
+_STLP_STRING_LITERAL("Memory block deallocated twice"),  \
+_STLP_STRING_LITERAL("Deallocating a block that was never allocated"),  \
+_STLP_STRING_LITERAL("Deallocating a memory block allocated for another type"),  \
+_STLP_STRING_LITERAL("Size of block passed to deallocate() doesn't match block size"),  \
+_STLP_STRING_LITERAL("Pointer underrun - safety margin at front of memory block overwritten"),  \
+_STLP_STRING_LITERAL("Pointer overrrun - safety margin at back of memory block overwritten"),   \
+_STLP_STRING_LITERAL("Attempt to dereference null pointer returned by auto_ptr::get()"),   \
+_STLP_STRING_LITERAL("Unknown problem") \
+  }
+
+# if ( _STLP_STATIC_TEMPLATE_DATA > 0 )
+template <class _Dummy>
+const char* __stl_debug_engine<_Dummy>::_Message_table[_StlMsg_MAX]  _STLP_MESSAGE_TABLE_BODY;
+
+# else
+__DECLARE_INSTANCE(const char*, __stl_debug_engine<bool>::_Message_table[_StlMsg_MAX],
+		   _STLP_MESSAGE_TABLE_BODY);
+
+# endif
+
+# undef _STLP_STRING_LITERAL
+# undef _STLP_PERCENT_S
+_STLP_END_NAMESPACE
+
+// abort()
+#    include <cstdlib>
+
+#  if !defined( _STLP_DEBUG_MESSAGE )
+
+#    include <cstdarg>
+#    include <cstdio>
+
+_STLP_BEGIN_NAMESPACE
+
+template <class _Dummy>
+void _STLP_CALL  
+__stl_debug_engine<_Dummy>::_Message(const char * __format_str, ...)
+{
+	STLPORT_CSTD::va_list __args;
+	va_start( __args, __format_str );
+
+# if defined (_STLP_WINCE)
+	TCHAR __buffer[512];
+	int _convert = strlen(__format_str) + 1;
+	LPWSTR _lpw = (LPWSTR)alloca(_convert*sizeof(wchar_t));
+	_lpw[0] = '\0';
+	MultiByteToWideChar(GetACP(), 0, __format_str, -1, _lpw, _convert);
+	wvsprintf(__buffer, _lpw, __args);
+	//	wvsprintf(__buffer, __format_str, __args);
+	_STLP_WINCE_TRACE(__buffer);
+# elif defined (_STLP_WIN32) && ( defined(_STLP_MSVC) || defined (__ICL) || defined (__BORLANDC__))
+    char __buffer [4096];
+    _vsnprintf(__buffer, sizeof(__buffer) / sizeof(char),
+               __format_str, __args);
+    OutputDebugStringA(__buffer);
+# elif defined (__amigaos__)
+    STLPORT_CSTD::vfprintf(stderr, __format_str, (char *)__args);
+# else
+    STLPORT_CSTD::vfprintf(stderr, __format_str, __args);
+# endif /* WINCE */
+
+# ifdef _STLP_DEBUG_MESSAGE_POST
+	_STLP_DEBUG_MESSAGE_POST
+# endif
+
+    va_end(__args);
+
+}
+
+_STLP_END_NAMESPACE
+
+#  endif /* _STLP_DEBUG_MESSAGE */
+
+
+_STLP_BEGIN_NAMESPACE
+
+
+template <class _Dummy>
+void _STLP_CALL  
+__stl_debug_engine<_Dummy>::_IndexedError(int __error_ind, const char* __f, int __l)
+{
+  __stl_debug_message(_Message_table[_StlFormat_ERROR_RETURN], 
+		      __f, __l, _Message_table[__error_ind]);
+}
+
+template <class _Dummy>
+void _STLP_CALL  
+__stl_debug_engine<_Dummy>::_VerboseAssert(const char* __expr, int __error_ind, const char* __f, int __l)
+{
+  __stl_debug_message(_Message_table[_StlFormat_VERBOSE_ASSERTION_FAILURE],
+		      __f, __l, _Message_table[__error_ind], __f, __l, __expr);
+  __stl_debug_terminate();
+}
+
+template <class _Dummy>
+void _STLP_CALL 
+__stl_debug_engine<_Dummy>::_Assert(const char* __expr, const char* __f, int __l)
+{
+  __stl_debug_message(_Message_table[_StlFormat_ASSERTION_FAILURE],__f, __l, __expr);
+  __stl_debug_terminate();
+}
+
+// if exceptions are present, sends unique exception
+// if not, calls abort() to terminate
+template <class _Dummy>
+void _STLP_CALL 
+__stl_debug_engine<_Dummy>::_Terminate()
+{
+# ifdef _STLP_USE_NAMESPACES
+  using namespace _STLP_STD;
+# endif
+# if defined (_STLP_USE_EXCEPTIONS) && ! defined (_STLP_NO_DEBUG_EXCEPTIONS)
+  throw __stl_debug_exception();
+# else
+  _STLP_ABORT();
+# endif
+}
+
+_STLP_END_NAMESPACE
+
+# endif /* _STLP_ASSERTIONS */
+
+#ifdef _STLP_DEBUG
+
+_STLP_BEGIN_NAMESPACE
+
+//==========================================================
+//  owned_list non-inline methods 
+//==========================================================
+
+template <class _Dummy>
+void  _STLP_CALL
+__stl_debug_engine<_Dummy>::_Invalidate_all(__owned_list* __l) {
+  _STLP_ACQUIRE_LOCK(__l->_M_lock);
+  _Stamp_all(__l, 0);
+  __l->_M_node._M_next =0;
+  _STLP_RELEASE_LOCK(__l->_M_lock);
+}
+
+// boris : this is unasafe routine; should be used from within critical section only !
+template <class _Dummy>
+void  _STLP_CALL
+__stl_debug_engine<_Dummy>::_Stamp_all(__owned_list* __l, __owned_list* __o) {
+  // crucial
+  if (__l->_M_node._M_owner) {
+    for (__owned_link*  __position = (__owned_link*)__l->_M_node._M_next; 
+	 __position != 0; __position= (__owned_link*)__position->_M_next) {
+      _STLP_ASSERT(__position->_Owner()== __l)
+      __position->_M_owner=__o;
+    }
+  }
+}
+
+template <class _Dummy>
+void  _STLP_CALL
+__stl_debug_engine<_Dummy>::_Verify(const __owned_list* __l) {
+  _STLP_ACQUIRE_LOCK(__l->_M_lock);
+  if (__l) {
+    _STLP_ASSERT(__l->_M_node._Owner() != 0)
+    for (__owned_link* __position = (__owned_link*)__l->_M_node._M_next; 
+         __position != 0; __position= (__owned_link*)__position->_M_next) {
+      _STLP_ASSERT(__position->_Owner()== __l)
+    }
+  }
+  _STLP_RELEASE_LOCK(__l->_M_lock);
+}
+
+template <class _Dummy>
+void _STLP_CALL  
+__stl_debug_engine<_Dummy>::_Swap_owners(__owned_list& __x, __owned_list& __y) {
+
+  //  according to the standard : --no swap() function invalidates any references, 
+  //  pointers,  or  iterators referring to the elements of the containers being swapped.
+
+  __owned_link* __tmp;
+
+  // boris : there is a deadlock potential situation here if we lock two containers sequentially.
+  // As user is supposed to provide its own synchronization around swap() ( it is unsafe to do any container/iterator access
+  // in parallel with swap()), we just do not use any locking at all -- that behaviour is closer to non-debug version
+
+  __tmp = __x._M_node._M_next;
+
+  _Stamp_all(&__x, &__y);
+  _Stamp_all(&__y, &__x);
+
+  __x._M_node._M_next = __y._M_node._M_next;
+  __y._M_node._M_next = __tmp;  
+
+}
+
+template <class _Dummy>
+void _STLP_CALL 
+__stl_debug_engine<_Dummy>::_M_detach(__owned_list* __l, __owned_link* __c_node) {
+  if (__l  != 0) {
+
+    _STLP_VERBOSE_ASSERT(__l->_Owner()!=0, _StlMsg_INVALID_CONTAINER)
+
+    _STLP_ACQUIRE_LOCK(__l->_M_lock)
+      // boris : re-test the condition in case someone else already deleted us
+      if(__c_node->_M_owner != 0) {
+        __owned_link* __prev, *__next;
+        
+        for (__prev = &__l->_M_node; (__next = __prev->_M_next) != __c_node; 
+             __prev = __next) {
+          _STLP_ASSERT(__next && __next->_Owner() == __l)
+            }
+        
+        __prev->_M_next = __c_node->_M_next;
+        __c_node->_M_owner=0;
+      }
+    _STLP_RELEASE_LOCK(__l->_M_lock)
+  }
+}
+
+template <class _Dummy>
+void _STLP_CALL 
+__stl_debug_engine<_Dummy>::_M_attach(__owned_list* __l, __owned_link* __c_node) {
+  if (__l ==0) {
+    (__c_node)->_M_owner = 0;    
+  } else {
+    _STLP_VERBOSE_ASSERT(__l->_Owner()!=0, _StlMsg_INVALID_CONTAINER)
+    _STLP_ACQUIRE_LOCK(__l->_M_lock)
+    __c_node->_M_owner = __l;
+    __c_node->_M_next = __l->_M_node._M_next;
+    __l->_M_node._M_next = __c_node;
+    _STLP_RELEASE_LOCK(__l->_M_lock)
+  }
+}
+
+
+template <class _Dummy>
+void* _STLP_CALL
+__stl_debug_engine<_Dummy>::_Get_container_ptr(const __owned_link* __l) {
+  const __owned_list* __owner    = __l->_Owner();
+  _STLP_VERBOSE_RETURN_0(__owner != 0, _StlMsg_INVALID_ITERATOR)
+  void* __ret = __CONST_CAST(void*,__owner->_Owner());
+  _STLP_VERBOSE_RETURN_0(__ret !=0, _StlMsg_INVALID_CONTAINER)
+  return __ret;
+}
+
+template <class _Dummy>
+bool _STLP_CALL
+__stl_debug_engine<_Dummy>::_Check_same_owner( const __owned_link& __i1, 
+                                               const __owned_link& __i2)
+{
+  _STLP_VERBOSE_RETURN(__i1._Valid(), _StlMsg_INVALID_LEFTHAND_ITERATOR)
+  _STLP_VERBOSE_RETURN(__i2._Valid(), _StlMsg_INVALID_RIGHTHAND_ITERATOR)
+  _STLP_VERBOSE_RETURN((__i1._Owner()==__i2._Owner()), _StlMsg_DIFFERENT_OWNERS)
+  return true;
+}
+
+template <class _Dummy>
+bool  _STLP_CALL
+__stl_debug_engine<_Dummy>::_Check_same_owner_or_null( const __owned_link& __i1, 
+						       const __owned_link& __i2)
+{
+  _STLP_VERBOSE_RETURN(__i1._Owner()==__i2._Owner(), _StlMsg_DIFFERENT_OWNERS)
+  return true;
+}
+
+template <class _Dummy>
+bool _STLP_CALL
+__stl_debug_engine<_Dummy>::_Check_if_owner( const __owned_list * __l, const __owned_link& __it)
+{
+  const __owned_list* __owner_ptr = __it._Owner();
+  _STLP_VERBOSE_RETURN(__owner_ptr!=0, _StlMsg_INVALID_ITERATOR)
+  _STLP_VERBOSE_RETURN(__l==__owner_ptr, _StlMsg_NOT_OWNER)
+  return true;
+}
+
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_DEBUG */
+
+#endif /* if defined (EXPOSE_GLOBALS_IMPLEMENTATION) */
+
+#endif /* header guard */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/debug/_debug.h b/main/source/stlport/stlport/stl/debug/_debug.h
new file mode 100644
index 00000000..79d624ef
--- /dev/null
+++ b/main/source/stlport/stlport/stl/debug/_debug.h
@@ -0,0 +1,426 @@
+/*
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_DEBUG_H
+# define _STLP_DEBUG_H
+
+# if defined (_STLP_ASSERTIONS) || defined (_STLP_DEBUG)
+
+#ifndef _STLP_CONFIG_H
+# include <stl/_config.h>
+#endif
+
+# if !defined (_STLP_EXTRA_OPERATORS_FOR_DEBUG) && \
+     ( defined (_STLP_BASE_MATCH_BUG) || (defined (_STLP_MSVC) && _STLP_MSVC < 1100 ) )
+#  define _STLP_EXTRA_OPERATORS_FOR_DEBUG
+# endif
+
+# if !defined(_STLP_FILE__)
+#   define _STLP_FILE__ __FILE__
+# endif
+ 
+enum {
+  _StlFormat_ERROR_RETURN,
+  _StlFormat_ASSERTION_FAILURE,
+  _StlFormat_VERBOSE_ASSERTION_FAILURE,
+  _StlMsg_INVALID_ARGUMENT,
+  _StlMsg_INVALID_CONTAINER,
+  _StlMsg_EMPTY_CONTAINER,
+  _StlMsg_ERASE_PAST_THE_END,
+  _StlMsg_OUT_OF_BOUNDS,
+  _StlMsg_NOT_OWNER,
+  _StlMsg_INVALID_ITERATOR,
+  _StlMsg_INVALID_LEFTHAND_ITERATOR,
+  _StlMsg_INVALID_RIGHTHAND_ITERATOR,
+  _StlMsg_DIFFERENT_OWNERS     ,
+  _StlMsg_NOT_DEREFERENCEABLE  ,
+  _StlMsg_INVALID_RANGE        ,
+  _StlMsg_NOT_IN_RANGE_1       ,
+  _StlMsg_NOT_IN_RANGE_2       ,
+  _StlMsg_INVALID_ADVANCE      ,
+  _StlMsg_SINGULAR_ITERATOR    ,
+  // debug alloc messages
+  _StlMsg_DBA_DELETED_TWICE    ,
+  _StlMsg_DBA_NEVER_ALLOCATED  ,
+  _StlMsg_DBA_TYPE_MISMATCH    ,
+  _StlMsg_DBA_SIZE_MISMATCH    ,
+  _StlMsg_DBA_UNDERRUN         ,
+  _StlMsg_DBA_OVERRUN          ,
+  // auto_ptr messages
+  _StlMsg_AUTO_PTR_NULL    ,
+  _StlMsg_UNKNOWN
+  /* _StlMsg_MAX */
+};
+
+/* have to hardcode that ;() */
+# define _StlMsg_MAX 27
+
+_STLP_BEGIN_NAMESPACE
+
+// This class is unique (not inherited from exception),
+// to disallow catch in anything but (...)
+struct __stl_debug_exception {
+  // no members
+};
+
+class _STLP_CLASS_DECLSPEC __owned_link;
+class _STLP_CLASS_DECLSPEC __owned_list;
+
+template <class _Dummy>
+struct __stl_debug_engine {
+
+  // Basic routine to report any debug message
+  // Use _STLP_DEBUG_MESSAGE to override
+  static void _STLP_CALL _Message(const char * format_str, ...);
+
+  // Micsellanous function to report indexed error message
+  static void _STLP_CALL  _IndexedError(int __ind, const char* __f, int __l);
+
+  // Basic assertion report mechanism.
+  // Reports failed assertion via __stl_debug_message and calls _Terminate
+  // if _STLP_DEBUG_TERMINATE is specified, calls __stl_debug_terminate instead
+  static void _STLP_CALL  _Assert(const char* __expr, const char* __f, int __l);
+
+  // The same, with additional diagnostics
+  static void _STLP_CALL  _VerboseAssert(const char* __expr, int __error_ind, const char* __f, int __l);
+
+  // If exceptions are present, sends unique exception
+  // If not, calls _STLP_ABORT() to terminate
+  // Use _STLP_DEBUG_TERMINATE to override
+  static void _STLP_CALL  _Terminate();
+
+# ifdef _STLP_DEBUG
+
+  // owned_list/link delegate non-inline functions here
+
+  static bool _STLP_CALL  _Check_same_owner( const __owned_link& __i1, 
+                                             const __owned_link& __i2);
+  static bool _STLP_CALL  _Check_same_owner_or_null( const __owned_link& __i1, 
+                                                     const __owned_link& __i2);
+  static bool  _STLP_CALL _Check_if_owner( const __owned_list*, const __owned_link&);
+
+  static void _STLP_CALL  _Verify(const __owned_list*);
+  
+  static void _STLP_CALL  _Swap_owners(__owned_list&, __owned_list& /*, bool __swap_roots */ );
+ 
+  static void _STLP_CALL  _Invalidate_all(__owned_list*);
+  
+  static void _STLP_CALL  _Stamp_all(__owned_list*, __owned_list*);
+
+  static void _STLP_CALL  _M_detach(__owned_list*, __owned_link*);
+
+  static void _STLP_CALL  _M_attach(__owned_list*, __owned_link*);
+
+  // accessor : check and get pointer to the container
+  static void* _STLP_CALL  _Get_container_ptr(const __owned_link*);
+# endif /* _STLP_DEBUG */
+
+  // debug messages and formats
+   _STLP_STATIC_MEMBER_DECLSPEC static const char* _Message_table[_StlMsg_MAX];
+};
+
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+_STLP_EXPORT_TEMPLATE struct _STLP_CLASS_DECLSPEC __stl_debug_engine<bool>;
+# endif /* _STLP_USE_TEMPLATE_EXPORT */
+
+typedef __stl_debug_engine<bool> __stl_debugger;
+
+_STLP_END_NAMESPACE
+
+#  ifndef _STLP_ASSERT
+#   define _STLP_ASSERT(expr) \
+     if (!(expr)) {STLPORT::__stl_debugger::_Assert( # expr, _STLP_FILE__, __LINE__);}
+#  endif
+
+# endif /* _STLP_ASSERTIONS || _STLP_DEBUG */
+
+
+// this section is for _STLP_DEBUG only 
+#if defined ( _STLP_DEBUG )
+
+# ifndef _STLP_VERBOSE_ASSERT
+// fbp : new form not requiring ";"
+#  define _STLP_VERBOSE_ASSERT(expr,__diag_num) \
+    if (!(expr)) { STLPORT::__stl_debugger::_VerboseAssert\
+                                 ( # expr,  __diag_num, _STLP_FILE__, __LINE__ ); \
+         }
+# endif
+
+#  define _STLP_DEBUG_CHECK(expr) _STLP_ASSERT(expr)
+#  define _STLP_DEBUG_DO(expr)    expr;
+
+# ifndef _STLP_VERBOSE_RETURN
+#  define _STLP_VERBOSE_RETURN(__expr,__diag_num) if (!(__expr)) { \
+       __stl_debugger::_IndexedError(__diag_num, __FILE__ , __LINE__); \
+       return false; }
+# endif
+
+# ifndef _STLP_VERBOSE_RETURN_0
+#  define _STLP_VERBOSE_RETURN_0(__expr,__diag_num) if (!(__expr)) { \
+       __stl_debugger::_IndexedError(__diag_num, __FILE__ , __LINE__); \
+       return 0; }
+# endif
+
+#if ! defined (_STLP_INTERNAL_THREADS_H)
+# include <stl/_threads.h>
+#endif
+
+#ifndef _STLP_INTERNAL_ITERATOR_BASE_H
+# include <stl/_iterator_base.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+//=============================================================
+template <class _Iterator>
+inline bool  _STLP_CALL __valid_range(const _Iterator& __i1 ,const _Iterator& __i2, 
+                                      const random_access_iterator_tag&) { 
+    return (__i1< __i2) || (__i1 == __i2);
+}
+
+template <class _Iterator>
+inline bool  _STLP_CALL __valid_range(const _Iterator& __i1 ,const _Iterator& __i2,
+                                      const bidirectional_iterator_tag&) { 
+    // check if comparable
+    bool __dummy(__i1==__i2);
+    return (__dummy==__dummy); 
+}
+
+template <class _Iterator>
+inline bool  _STLP_CALL __valid_range(const _Iterator& __i1 ,const _Iterator& __i2, const forward_iterator_tag&) { 
+    // check if comparable
+    bool __dummy(__i1==__i2);
+    return (__dummy==__dummy); 
+}
+
+template <class _Iterator>
+inline bool  _STLP_CALL __valid_range(const _Iterator&,const _Iterator&, const input_iterator_tag&) { 
+    return true; 
+}
+
+template <class _Iterator>
+inline bool  _STLP_CALL __valid_range(const _Iterator&,const _Iterator&, const output_iterator_tag&) { 
+    return true; 
+}
+
+template <class _Iterator>
+inline bool  _STLP_CALL __valid_range(const _Iterator& __i1, const _Iterator& __i2) { 
+    return __valid_range(__i1,__i2,_STLP_ITERATOR_CATEGORY(__i1, _Iterator));
+}
+
+// Note : that means in range [i1, i2].
+template <class _Iterator>
+inline bool  _STLP_CALL __in_range(const _Iterator& _It, const _Iterator& __i1,
+                                   const _Iterator& __i2) { 
+    return __valid_range(__i1,_It,_STLP_ITERATOR_CATEGORY(__i1, _Iterator)) && 
+        __valid_range(_It,__i2,_STLP_ITERATOR_CATEGORY(_It, _Iterator));
+}
+
+template <class _Iterator>
+inline bool  _STLP_CALL __in_range(const _Iterator& __first, const _Iterator& __last, 
+                                   const _Iterator& __start, const _Iterator& __finish) { 
+    return __valid_range(__first,__last,_STLP_ITERATOR_CATEGORY(__first, _Iterator)) &&
+        __valid_range(__start,__first,_STLP_ITERATOR_CATEGORY(__first, _Iterator)) && 
+        __valid_range(__last,__finish,_STLP_ITERATOR_CATEGORY(__last, _Iterator));
+}
+
+//==========================================================
+
+
+class _STLP_CLASS_DECLSPEC __owned_link {
+public:
+
+  __owned_link() : _M_owner(0) {}
+  __owned_link(const __owned_list* __c) : _M_owner(0), _M_next(0) {
+    __stl_debugger::_M_attach(__CONST_CAST(__owned_list*,__c), this);
+  }
+  __owned_link(const __owned_link& __rhs): _M_owner(0) {
+    __stl_debugger::_M_attach(__CONST_CAST(__owned_list*,__rhs._M_owner), this);
+  }
+  __owned_link& operator=(const __owned_link& __rhs) {
+    __owned_list* __new_owner = __CONST_CAST(__owned_list*,__rhs._M_owner);
+    __owned_list* __old_owner = _M_owner;
+    if ( __old_owner != __new_owner ) {
+      __stl_debugger::_M_detach(__old_owner, this);
+      __stl_debugger::_M_attach(__new_owner, this);
+    }
+    return *this;
+  }
+  ~__owned_link() {
+    __stl_debugger::_M_detach(_M_owner, this);
+    _Invalidate();
+  }
+  
+  const __owned_list* _Owner() const { 
+    return _M_owner; 
+  }
+  __owned_list* _Owner() { 
+    return _M_owner; 
+  }
+  void _Set_owner(const __owned_list* __o)  { 
+    _M_owner= __CONST_CAST(__owned_list*,__o); 
+  }
+  bool  _Valid() const { 
+    return _M_owner !=0; 
+  }
+
+  void _Invalidate() { _M_owner=0; _M_next = 0; }
+  void _Link_to_self() { _M_next= 0; }
+
+  __owned_link* _Next() { return _M_next; }
+  const __owned_link* _Next() const { return _M_next; }
+
+public:
+  __owned_list* _M_owner;
+  __owned_link* _M_next;
+};
+
+
+class _STLP_CLASS_DECLSPEC __owned_list {
+public:
+  __owned_list(const void* __o) {
+    //    fprintf(stderr, "__owned_list(): %p\n",(void*)this);
+    _M_node._M_owner = __CONST_CAST(__owned_list*, __REINTERPRET_CAST(const __owned_list*,__o)); 
+    _M_node._M_next=0;
+  }
+  ~__owned_list() {
+    //    fprintf(stderr, "~__owned_list(): %p\n",(void*)this);
+    _Invalidate_all();
+    // that prevents detach
+    _M_node._Invalidate();
+  }
+  const void* _Owner() const { 
+    return (const void*)_M_node._M_owner; 
+  }
+  void* _Owner() { 
+    return (void*)_M_node._M_owner; 
+  }
+  bool  _Valid() const { 
+    return _M_node._M_owner!=0; 
+  }
+  void _Invalidate() { _M_node._M_owner=0; }
+  
+  __owned_link* _First() { return _M_node._Next(); }
+  __owned_link* _Last() { return 0 ; }
+
+  const __owned_link* _First() const { return (__owned_link*)_M_node._M_next; }
+  const __owned_link* _Last() const { return 0 ;}
+  
+  void _Verify() const {
+    __stl_debugger::_Verify(this); 
+  }
+  
+  void _Swap_owners(__owned_list& __y) { 
+    __stl_debugger::_Swap_owners(*this, __y); 
+  }
+ 
+  void _Invalidate_all() { 
+    __stl_debugger::_Invalidate_all(this);
+  }
+  
+  mutable __owned_link              _M_node; 
+  mutable _STLP_mutex            _M_lock;
+  
+private:
+  // should never be called, should be left undefined,
+  // but some compilers complain about it ;(
+  __owned_list(const __owned_list&){}
+  void operator=(const __owned_list&) {}
+
+  friend class __owned_link;
+  friend struct __stl_debug_engine<bool>;
+};
+
+
+//==========================================================
+
+// forward declaratioins
+
+template <class _Iterator>
+bool  _STLP_CALL __check_range(const _Iterator&, const _Iterator&);
+template <class _Iterator>
+bool _STLP_CALL  __check_range(const _Iterator&, 
+                               const _Iterator&, const _Iterator&);
+template <class _Iterator>
+bool _STLP_CALL  __check_range(const _Iterator&, const _Iterator& , 
+                               const _Iterator&, const _Iterator& );
+
+template <class _Iterator>
+void _STLP_CALL  __invalidate_range(const __owned_list* __base, 
+                                    const _Iterator& __first,
+                                    const _Iterator& __last);
+
+template <class _Iterator>
+void  _STLP_CALL __invalidate_iterator(const __owned_list* __base, 
+                                       const _Iterator& __it);
+
+//============================================================
+
+inline bool _STLP_CALL 
+__check_same_owner( const __owned_link& __i1, const __owned_link& __i2) {
+  return __stl_debugger::_Check_same_owner(__i1,__i2);
+}
+inline bool _STLP_CALL  
+__check_same_owner_or_null( const __owned_link& __i1, const __owned_link& __i2) {
+  return __stl_debugger::_Check_same_owner_or_null(__i1,__i2);
+}
+
+template <class _Iterator>
+inline bool _STLP_CALL  __check_if_owner( const __owned_list* __owner, 
+                                          const _Iterator& __it) {
+  return __stl_debugger::_Check_if_owner(__owner, (const __owned_link&)__it);
+}
+
+_STLP_END_NAMESPACE
+
+# endif /* _STLP_DEBUG */
+
+#if defined ( _STLP_ASSERTIONS )
+
+# ifndef _STLP_ASSERT_MSG_TRAILER
+#  define _STLP_ASSERT_MSG_TRAILER
+# endif
+
+// dwa 12/30/98 - if _STLP_DEBUG_MESSAGE is defined, the user can supply own definition.
+# if !defined( _STLP_DEBUG_MESSAGE )
+#   define __stl_debug_message __stl_debugger::_Message
+# else
+    extern  void __stl_debug_message(const char * format_str, ...);
+# endif
+
+// fbp: if _STLP_DEBUG_TERMINATE is defined, the user can supply own definition.
+# if !defined( _STLP_DEBUG_TERMINATE )
+#   define __stl_debug_terminate __stl_debugger::_Terminate
+# else
+    extern  void __stl_debug_terminate(void);
+# endif
+
+#endif
+
+# if !defined (_STLP_LINK_TIME_INSTANTIATION)
+#  include <stl/debug/_debug.c>
+# endif
+
+#endif /* DEBUG_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/debug/_deque.h b/main/source/stlport/stlport/stl/debug/_deque.h
new file mode 100644
index 00000000..c212a226
--- /dev/null
+++ b/main/source/stlport/stlport/stl/debug/_deque.h
@@ -0,0 +1,281 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_DBG_DEQUE_H
+#define _STLP_INTERNAL_DBG_DEQUE_H
+
+#include <stl/debug/_iterator.h>
+
+# if !defined (_STLP_USE_WRAPPER_FOR_ALLOC_PARAM) && !defined (_STLP_NO_DEFAULT_NON_TYPE_PARAM)
+#  undef  _DBG_deque
+#  define _DBG_deque deque
+# endif
+
+# define _DEQUE_WRAPPER _DBG_deque<_Tp,_Alloc>
+
+# define _STLP_DEQUE_SUPER   __WORKAROUND_DBG_RENAME(deque) <_Tp,_Alloc>
+
+_STLP_BEGIN_NAMESPACE
+
+# ifdef _STLP_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS
+template <class _Tp, class _Alloc>
+inline _Tp* value_type(const  _DBG_iter_base< _STLP_DEQUE_SUPER >&) {
+  return (_Tp*)0;
+}
+template <class _Tp, class _Alloc>
+inline random_access_iterator_tag iterator_category(const  _DBG_iter_base< _STLP_DEQUE_SUPER >&) {
+  return random_access_iterator_tag();
+}
+# endif
+
+template <class _Tp, _STLP_DBG_ALLOCATOR_SELECT(_Tp) >
+class _DBG_deque : public _STLP_DEQUE_SUPER {
+
+  typedef _DBG_deque<_Tp,_Alloc> _Self;
+  typedef _STLP_DEQUE_SUPER _Base;
+
+public:                         // Basic types
+
+  __IMPORT_CONTAINER_TYPEDEFS(_Base)
+
+public:                         // Iterators
+  typedef _DBG_iter< _STLP_DEQUE_SUPER, _Nonconst_traits<value_type> >    iterator;
+  typedef _DBG_iter< _STLP_DEQUE_SUPER, _Const_traits<value_type> >   const_iterator;
+
+  _STLP_DECLARE_RANDOM_ACCESS_REVERSE_ITERATORS;
+
+protected:
+  __owned_list _M_iter_list;
+  void _Invalidate_iterator(const iterator& __it) { 
+    __invalidate_iterator(&_M_iter_list,__it);
+  }
+  void _Invalidate_all() {
+      _M_iter_list._Invalidate_all();
+  }
+
+public:                         // Basic accessors
+  iterator begin() { return iterator(&_M_iter_list, this->_M_start); }
+  iterator end() { return iterator(&_M_iter_list, this->_M_finish); }
+  const_iterator begin() const { 
+    return const_iterator(&_M_iter_list, this->_M_start); 
+  }
+  const_iterator end() const { 
+    return const_iterator(&_M_iter_list,  this->_M_finish); 
+  }
+
+  reverse_iterator rbegin() { return reverse_iterator(end()); }
+  reverse_iterator rend() { return reverse_iterator(begin()); }
+  const_reverse_iterator rbegin() const 
+    { return const_reverse_iterator(end()); }
+  const_reverse_iterator rend() const 
+    { return const_reverse_iterator(begin()); }
+
+  reference operator[](size_type __n)
+    { return begin()[difference_type(__n)]; }
+  const_reference operator[](size_type __n) const 
+    { return begin()[difference_type(__n)]; }
+
+  reference front() { return *begin(); }
+  reference back() {
+    iterator __tmp = end();
+    --__tmp;
+    return *__tmp;
+  }
+  const_reference front() const { return *begin(); }
+  const_reference back() const {
+    const_iterator __tmp = end();
+    --__tmp;
+    return *__tmp;
+  }
+
+public:                         // Constructor, destructor.
+
+  const _Base* _Get_base() const { return (const _Base*)this; }
+
+  explicit _DBG_deque(const allocator_type& __a = allocator_type()) :
+    _STLP_DEQUE_SUPER(__a), _M_iter_list(_Get_base()) {}
+  _DBG_deque(const _Self& __x) : _STLP_DEQUE_SUPER(__x), _M_iter_list(_Get_base()) {}
+  _DBG_deque(size_type __n, const value_type& __value,
+        const allocator_type& __a = allocator_type()) : 
+    _STLP_DEQUE_SUPER(__n, __value, __a), _M_iter_list(_Get_base()) {}
+  explicit _DBG_deque(size_type __n) : _STLP_DEQUE_SUPER(__n), _M_iter_list(_Get_base()) {}
+
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIterator>
+  _DBG_deque(_InputIterator __first, _InputIterator __last,
+        const allocator_type& __a _STLP_ALLOCATOR_TYPE_DFL) : 
+    _STLP_DEQUE_SUPER(__first, __last, __a) , _M_iter_list(_Get_base()) {}
+# ifdef _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS
+  template <class _InputIterator>
+  _DBG_deque(_InputIterator __first, _InputIterator __last):
+    _STLP_DEQUE_SUPER(__first, __last, allocator_type()) , _M_iter_list(_Get_base()) {}
+# endif
+#else /* _STLP_MEMBER_TEMPLATES */
+  _DBG_deque(const value_type* __first, const value_type* __last,
+        const allocator_type& __a = allocator_type()) 
+    : _STLP_DEQUE_SUPER(__first, __last, __a), _M_iter_list(_Get_base()) {}
+
+  _DBG_deque(const_iterator __first, const_iterator __last,
+        const allocator_type& __a = allocator_type()) 
+    : _STLP_DEQUE_SUPER(__first._M_iterator, __last._M_iterator, __a), 
+      _M_iter_list(_Get_base()) {}
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  _Self& operator= (const _Self& __x) {
+    _Invalidate_all();
+    (_Base&)*this = (const _Base&)__x; 
+    return *this;
+  }
+
+  void swap(_Self& __x) {
+    _M_iter_list._Swap_owners(__x._M_iter_list);
+    _Base::swap(__x);
+  }
+
+public: 
+  void assign(size_type __n, const _Tp& __val) {
+    _Base::assign(__n, __val);
+  }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+
+  template <class _InputIterator>
+  void assign(_InputIterator __first, _InputIterator __last) {
+    _Base::assign(__first, __last);
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+public:                         // push_* and pop_*
+  
+  void push_back(const value_type& __t) {
+    _Invalidate_all();
+    _Base::push_back(__t);
+  }
+
+  void push_back() {
+    _Invalidate_all();
+    _Base::push_back();
+  }
+
+  void push_front(const value_type& __t) {
+    _Invalidate_all();
+    _Base::push_front(__t);
+  }
+
+  void push_front() {
+    _Base::push_front();
+    _Invalidate_all();
+  }
+
+
+  void pop_back() {
+    _Invalidate_iterator(end());
+    _Base::pop_back();
+  }
+
+  void pop_front() {
+    _Invalidate_iterator(begin());        
+    _Base::pop_front();
+  }
+
+public:                         // Insert
+
+  iterator insert(iterator __position, const value_type& __x) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __position))
+    // fbp : invalidation !
+    return iterator(&_M_iter_list, _Base::insert(__position._M_iterator, __x));
+  }
+
+  iterator insert(iterator __position) { 
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __position))
+    // fbp : invalidation !
+    return iterator(&_M_iter_list, _Base::insert(__position._M_iterator));
+  }
+
+  void insert(iterator __position, size_type __n, const value_type& __x) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __position))
+    // fbp : invalidation !
+    _Base::insert(__position._M_iterator, __n, __x);
+  }
+
+#ifdef _STLP_MEMBER_TEMPLATES  
+  template <class _InputIterator>
+  void insert(iterator __position, _InputIterator __first, _InputIterator __last) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __position))
+    // fbp : invalidation !
+    _Base::insert(__position._M_iterator, __first, __last);
+  }
+#else /* _STLP_MEMBER_TEMPLATES */
+  void insert(iterator __position,
+              const value_type* __first, const value_type* __last) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __position))
+    _Base::insert(__position._M_iterator, __first, __last);
+  }
+  void insert(iterator __position,
+              const_iterator __first, const_iterator __last) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __position))
+    _Base::insert(__position._M_iterator, __first._M_iterator, __last._M_iterator);
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+public:                         // Erase
+  iterator erase(iterator __pos) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __pos) && (__pos != end()))
+    return iterator (&_M_iter_list, _Base::erase(__pos._M_iterator));
+  }
+
+  iterator erase(iterator __first, iterator __last) {
+    _STLP_DEBUG_CHECK(__first >= begin() && __last <= end())
+    return iterator (&_M_iter_list, _Base::erase(__first._M_iterator, __last._M_iterator));
+  }
+  
+  void clear() {
+    _Invalidate_all();
+    _Base::clear();
+  }
+};
+
+#define _STLP_TEMPLATE_HEADER template <class _Tp, class _Alloc>
+#define _STLP_TEMPLATE_CONTAINER _DBG_deque<_Tp, _Alloc>
+#define _STLP_TEMPLATE_CONTAINER_BASE _STLP_DEQUE_SUPER
+#include <stl/debug/_relops_cont.h>
+#undef _STLP_TEMPLATE_CONTAINER_BASE
+#undef _STLP_TEMPLATE_CONTAINER
+#undef _STLP_TEMPLATE_HEADER
+
+_STLP_END_NAMESPACE 
+
+# undef _DBG_deque
+# undef _STLP_DEQUE_SUPER
+  
+#endif /* _STLP_INTERNAL_DEQUE_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/debug/_hashtable.h b/main/source/stlport/stlport/stl/debug/_hashtable.h
new file mode 100644
index 00000000..308bf7b9
--- /dev/null
+++ b/main/source/stlport/stlport/stl/debug/_hashtable.h
@@ -0,0 +1,261 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_DBG_HASHTABLE_H
+#define _STLP_INTERNAL_DBG_HASHTABLE_H
+
+// Hashtable class, used to implement the hashed associative containers
+// hash_set, hash_map, hash_multiset, and hash_multimap.
+
+# include <stl/debug/_iterator.h>
+
+#  undef  hashtable
+#  undef  _DBG_hashtable
+#  define _DBG_hashtable  hashtable
+
+#  define _STLP_DBG_HT_SUPER \
+__WORKAROUND_DBG_RENAME(hashtable) <_Val, _Key, _HF, _ExK, _EqK, _All>
+
+_STLP_BEGIN_NAMESPACE
+
+# ifdef _STLP_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS
+template <class _Val, class _Key, class _HF,
+          class _ExK, class _EqK, class _All>
+inline _Val*
+value_type(const  _DBG_iter_base< _STLP_DBG_HT_SUPER >&) {
+  return (_Val*)0;
+}
+
+template <class _Val, class _Key, class _HF,
+          class _ExK, class _EqK, class _All>
+inline forward_iterator_tag
+iterator_category(const  _DBG_iter_base< _STLP_DBG_HT_SUPER >&) {
+  return forward_iterator_tag();
+}
+# endif
+
+template <class _Val, class _Key, class _HF,
+          class _ExK, class _EqK, class _All>
+class _DBG_hashtable : public _STLP_DBG_HT_SUPER {
+  typedef _DBG_hashtable<_Val, _Key, _HF, _ExK, _EqK, _All> _Self;
+  typedef _STLP_DBG_HT_SUPER _Base;
+
+public:
+  typedef _Key key_type;
+  typedef _HF hasher;
+  typedef _EqK key_equal;
+
+  __IMPORT_CONTAINER_TYPEDEFS(_Base)
+
+public:
+  typedef _DBG_iter<_Base, _Nonconst_traits<value_type> >  iterator;
+  typedef _DBG_iter<_Base, _Const_traits<value_type> > const_iterator;
+  typedef typename _Base::iterator _Base_iterator;
+  typedef typename _Base::const_iterator _Base_const_iterator;
+
+protected:
+  void _Invalidate_all() {_M_iter_list._Invalidate_all();}
+
+  void _Invalidate_iterator(const const_iterator& __it) { 
+    __invalidate_iterator(&_M_iter_list,__it); 
+  }
+  void _Invalidate_iterators(const const_iterator& __first, const const_iterator& __last) {
+    const_iterator __cur = __first;
+    while (__cur != __last) __invalidate_iterator(&_M_iter_list, __cur++); 
+  }
+
+  const _Base* _Get_base() const { return (const _Base*)this; }
+  _Base* _Get_base() { return (_Base*)this; }
+
+public:
+  _DBG_hashtable(size_type __n,
+		 const _HF&  __hf,
+		 const _EqK& __eql,
+		 const _ExK& __ext,
+		 const allocator_type& __a = allocator_type()):
+    _STLP_DBG_HT_SUPER(__n, __hf, __eql, __ext, __a),
+    _M_iter_list(_Get_base()) {}
+  
+  _DBG_hashtable(size_type __n,
+		 const _HF&    __hf,
+		 const _EqK&   __eql,
+		 const allocator_type& __a = allocator_type()):
+    
+    _STLP_DBG_HT_SUPER(__n, __hf, __eql, __a),
+    _M_iter_list(_Get_base()) {}
+  
+  _DBG_hashtable(const _Self& __ht):
+    _STLP_DBG_HT_SUPER(__ht),
+    _M_iter_list(_Get_base()) {}
+  
+  _Self& operator= (const _Self& __ht) {
+    _Invalidate_all();
+    _Base::operator=(__ht);
+    return *this;
+  }
+  
+  void swap(_Self& __ht)
+  {
+   _M_iter_list._Swap_owners(__ht._M_iter_list);
+   _Base::swap(__ht);
+  }
+
+  iterator begin() { return iterator(&_M_iter_list, _Base::begin()); }
+  iterator end()   { return iterator(&_M_iter_list, _Base::end()); }
+
+  const_iterator begin() const { return const_iterator(&_M_iter_list, _Base::begin()); }
+  const_iterator end() const { return const_iterator(&_M_iter_list, _Base::end()); }
+
+  pair<iterator, bool> insert_unique(const value_type& __obj)
+  {
+    pair < _Base_iterator, bool> __res =
+      _Base::insert_unique(__obj);
+    return pair<iterator, bool> ( iterator(&_M_iter_list, __res.first), __res.second);
+  }
+
+  iterator insert_equal(const value_type& __obj) {
+    return iterator(&_M_iter_list, _Base::insert_equal(__obj));
+  }
+  
+  pair<iterator, bool> insert_unique_noresize(const value_type& __obj) {
+    pair < _Base_iterator, bool> __res =
+      _Base::insert_unique_noresize(__obj);
+    return pair<iterator, bool> ( iterator(&_M_iter_list, __res.first), __res.second);
+  }
+  
+  iterator insert_equal_noresize(const value_type& __obj) {
+    return iterator(&_M_iter_list, _Base::insert_equal_noresize(__obj));
+  }
+  
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIterator>
+  void insert_unique(_InputIterator __f, _InputIterator __l) {
+    _Base::insert_unique(__f, __l);
+  }
+
+  template <class _InputIterator>
+  void insert_equal(_InputIterator __f, _InputIterator __l){
+    _Base::insert_equal(__f, __l);
+  }
+
+#else /* _STLP_MEMBER_TEMPLATES */
+
+  void insert_unique(const value_type* __f, const value_type* __l) {
+    _Base::insert_unique(__f, __l);
+  }
+  
+  void insert_equal(const value_type* __f, const value_type* __l) {
+    _Base::insert_equal(__f, __l);
+  }
+  
+  void insert_unique(const_iterator __f, const_iterator __l) {
+    _Base::insert_unique(__f._M_iterator, __l._M_iterator);
+  }
+  
+  void insert_equal(const_iterator __f, const_iterator __l) {
+    _Base::insert_equal(__f._M_iterator, __l._M_iterator);
+  }
+#endif /*_STLP_MEMBER_TEMPLATES */
+  
+  iterator find(const key_type& __key) {
+    return iterator(&_M_iter_list, _Base::find(__key));
+  } 
+
+  const_iterator find(const key_type& __key) const {
+    return const_iterator(&_M_iter_list, _Base::find(__key));
+  } 
+
+  pair<iterator, iterator> 
+  equal_range(const key_type& __key) {
+    pair < _Base_iterator, _Base_iterator > __res =
+      _Base::equal_range(__key);
+    return pair<iterator,iterator> (iterator(&_M_iter_list,__res.first),
+				    iterator(&_M_iter_list,__res.second));
+  }
+
+  pair<const_iterator, const_iterator> 
+  equal_range(const key_type& __key) const {
+    pair <  _Base_const_iterator, _Base_const_iterator > __res =
+      _Base::equal_range(__key);
+    return pair<const_iterator,const_iterator> (const_iterator(&_M_iter_list,__res.first),
+				    const_iterator(&_M_iter_list,__res.second));
+  }
+
+  size_type erase(const key_type& __key) {
+    pair<const_iterator, const_iterator> __p = equal_range(__key);
+    size_type __n = distance(__p.first, __p.second);
+    _Invalidate_iterators(__p.first, __p.second);
+    _Base::erase(__p.first._M_iterator, __p.second._M_iterator);
+    return __n;
+  }
+
+  void erase(const const_iterator& __it) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __it))
+    _STLP_DEBUG_CHECK(_Dereferenceable(__it))
+    _Invalidate_iterator(__it);
+    _Base::erase(__it._M_iterator);
+  }
+  void erase(const_iterator __first, const_iterator __last) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __first)&&
+                      __check_if_owner(&_M_iter_list, __last))
+    _Invalidate_iterators(__first, __last);
+    _Base::erase(__first._M_iterator, __last._M_iterator);
+  }
+  void resize(size_type __num_elements_hint) {
+    _Base::resize(__num_elements_hint);
+  }
+  
+  void clear() {
+    _Invalidate_all();
+    _Base::clear();
+  }
+
+private:
+  __owned_list _M_iter_list;
+
+};
+
+#define _STLP_TEMPLATE_HEADER template <class _Val, class _Key, class _HF, class _ExK, class _EqK, class _All>
+#define _STLP_TEMPLATE_CONTAINER _DBG_hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>
+#define _STLP_TEMPLATE_CONTAINER_BASE hashtable<_Val,_Key,_HF,_ExK,_EqK,_All>
+#include <stl/debug/_relops_hash_cont.h>
+#undef _STLP_TEMPLATE_CONTAINER_BASE
+#undef _STLP_TEMPLATE_CONTAINER
+#undef _STLP_TEMPLATE_HEADER
+
+_STLP_END_NAMESPACE
+#  undef  hashtable
+
+#endif /* _STLP_INTERNAL_HASHTABLE_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
+
diff --git a/main/source/stlport/stlport/stl/debug/_iterator.h b/main/source/stlport/stlport/stl/debug/_iterator.h
new file mode 100644
index 00000000..bbb89cce
--- /dev/null
+++ b/main/source/stlport/stlport/stl/debug/_iterator.h
@@ -0,0 +1,394 @@
+/*
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_DBG_ITERATOR_H
+# define _STLP_DBG_ITERATOR_H
+
+# include <stl/_pair.h>
+# include <stl/_alloc.h>
+
+# define _STLP_DBG_ALLOCATOR_SELECT( _Tp ) _STLP_DEFAULT_ALLOCATOR_SELECT( _Tp )
+
+_STLP_BEGIN_NAMESPACE
+
+//============================================================
+
+template <class _Iterator>
+void _Decrement(_Iterator& __it, const bidirectional_iterator_tag &) {
+  --__it;
+}
+
+template <class _Iterator>
+void _Decrement(_Iterator& __it, const random_access_iterator_tag &) {
+  --__it;
+}
+
+template <class _Iterator>
+void _Decrement(_Iterator& __it, const forward_iterator_tag &) {
+  _STLP_ASSERT(0)
+}
+
+template <class _Iterator>
+void _Advance(_Iterator&, ptrdiff_t, const forward_iterator_tag &) {
+  _STLP_ASSERT(0)
+}
+
+template <class _Iterator>
+void _Advance(_Iterator& __it, ptrdiff_t, const bidirectional_iterator_tag &) {
+  _STLP_ASSERT(0)  
+}
+
+template <class _Iterator>
+void _Advance(_Iterator& __it, ptrdiff_t __n, const random_access_iterator_tag &) {
+  __it += __n;
+}
+
+template <class _Iterator>
+ptrdiff_t _DBG_distance(const _Iterator& __x, const _Iterator& __y, const random_access_iterator_tag &) {
+  return __x - __y;
+}
+
+template <class _Iterator>
+ptrdiff_t _DBG_distance(const _Iterator&, const _Iterator&, const forward_iterator_tag &) {
+  _STLP_ASSERT(0)
+  return 0;
+}
+
+template <class _Iterator>
+ptrdiff_t _DBG_distance(const _Iterator&, const _Iterator&, const bidirectional_iterator_tag &) {
+  _STLP_ASSERT(0)  
+  return 0;
+}
+
+template <class _Iterator>
+bool _CompareIt(const _Iterator&, const _Iterator&, const forward_iterator_tag &) {
+  _STLP_ASSERT(0)
+  return false;
+}
+
+template <class _Iterator>
+bool _CompareIt(const _Iterator&, const _Iterator&, const bidirectional_iterator_tag &) {
+  _STLP_ASSERT(0)  
+  return false;
+}
+
+template <class _Iterator>
+bool _CompareIt(const _Iterator& __x, const _Iterator& __y, const random_access_iterator_tag &) {
+  return __x < __y;
+}
+
+
+template <class _Iterator>
+bool _Dereferenceable(_Iterator __it) {
+  return (__it._Get_container_ptr() !=0) && !(__it._M_iterator == (__it._Get_container_ptr())->end());
+}
+
+
+template <class _Iterator>
+bool _Incrementable(const _Iterator& __it, ptrdiff_t __n, const forward_iterator_tag &) {
+  return (__n == 1) && _Dereferenceable(__it);
+}
+
+template <class _Iterator>
+bool _Incrementable(const _Iterator& __it, ptrdiff_t __n, const bidirectional_iterator_tag &) {
+  typedef typename _Iterator::_Container_type __container_type;
+  __container_type* __c = __it._Get_container_ptr();
+  return (__c!=0) && ((__n == 1 && __it._M_iterator != __c->end() ) ||
+    (__n == -1 && __it._M_iterator != __c->begin()));
+}
+
+template <class _Iterator>
+bool _Incrementable(const _Iterator& __it, ptrdiff_t __n, const random_access_iterator_tag &) {
+  typedef typename _Iterator::_Container_type __container_type;
+  __container_type* __c = __it._Get_container_ptr();
+  if (!__c) return false;
+  ptrdiff_t __new_pos = (__it._M_iterator - __c->begin()) + __n;
+  return  (__new_pos >=0) && (__STATIC_CAST(typename __container_type::size_type,__new_pos) <=__c->size());
+}
+
+
+template <class _Container>
+struct _DBG_iter_base : public __owned_link {
+public:
+  typedef typename _Container::value_type value_type;
+  typedef typename _Container::reference  reference;
+  typedef typename _Container::pointer    pointer;
+  typedef ptrdiff_t difference_type;
+  //private:
+  typedef typename _Container::iterator        _Nonconst_iterator;
+  typedef typename _Container::const_iterator  _Const_iterator;
+  typedef _Container                     _Container_type;
+    
+# ifdef _STLP_CLASS_PARTIAL_SPECIALIZATION
+  typedef typename iterator_traits<_Const_iterator>::iterator_category _Iterator_category;
+# else
+  typedef typename _Container::_Iterator_category  _Iterator_category;
+# endif
+  typedef _Iterator_category iterator_category;
+
+  _DBG_iter_base() : __owned_link(0)  {}
+  _DBG_iter_base(const __owned_list* __c, const _Const_iterator& __it) :
+# ifdef __HP_aCC
+    __owned_link(__c), _M_iterator(*__REINTERPRET_CAST(const _Nonconst_iterator *, &__it)) {}
+# else
+    __owned_link(__c), _M_iterator(*(const _Nonconst_iterator*)&__it) {}
+# endif  
+  _Container* _Get_container_ptr() const { 
+    return (_Container*)__stl_debugger::_Get_container_ptr(this); 
+  }
+
+  void __increment() {
+    _STLP_DEBUG_CHECK(_Incrementable(*this,1,_Iterator_category()))
+    ++_M_iterator;
+  }
+  
+  void __decrement() {
+    _STLP_DEBUG_CHECK(_Incrementable(*this,-1,_Iterator_category()))
+    _Decrement(_M_iterator, _Iterator_category());
+  }
+
+  void __advance(difference_type __n) {
+    _STLP_DEBUG_CHECK(_Incrementable(*this,__n, _Iterator_category()))
+    _Advance(_M_iterator,__n, _Iterator_category());
+  }
+
+// protected:
+  _Nonconst_iterator _M_iterator;
+};
+
+template <class _Container>
+ptrdiff_t operator-(const _DBG_iter_base<_Container>& __x,
+                    const _DBG_iter_base<_Container>& __y ) {
+  typedef typename _DBG_iter_base<_Container>::_Iterator_category  _Iterator_category;
+  _STLP_DEBUG_CHECK(__check_same_owner(__x, __y))
+  return _DBG_distance(__x._M_iterator,__y._M_iterator, _Iterator_category());
+}
+
+template <class _Container, class _Traits>
+struct _DBG_iter_mid : public _DBG_iter_base<_Container>
+{
+  typedef _DBG_iter_mid<_Container, typename _Traits::_Non_const_traits> _Nonconst_self;
+  typedef typename _Container::iterator        _Nonconst_iterator;
+  typedef typename _Container::const_iterator  _Const_iterator;
+
+  _DBG_iter_mid() {}
+
+  explicit _DBG_iter_mid(const _Nonconst_self& __it) :
+      _DBG_iter_base<_Container>(__it) {}
+        
+  _DBG_iter_mid(const __owned_list* __c, const _Const_iterator& __it) :
+      _DBG_iter_base<_Container>(__c, __it) {}
+};
+
+template <class _Container, class _Traits>
+struct _DBG_iter : public _DBG_iter_mid<_Container, _Traits> {
+  typedef _DBG_iter_base<_Container>          _Base;
+public:
+  typedef typename _Base::value_type value_type;
+  typedef typename _Base::difference_type difference_type;    
+  typedef typename _Traits::reference  reference;
+  typedef typename _Traits::pointer    pointer;
+
+private:
+  typedef typename _Base::_Nonconst_iterator _Nonconst_iterator;
+  typedef typename _Base::_Const_iterator _Const_iterator;
+
+  typedef _DBG_iter<_Container, _Traits>     _Self;
+  typedef _DBG_iter_mid<_Container, typename _Traits::_Non_const_traits> _Nonconst_mid;
+
+public:
+
+# ifdef _STLP_CLASS_PARTIAL_SPECIALIZATION
+  typedef typename _Base::iterator_category iterator_category;
+# endif
+  typedef typename _Base::_Iterator_category  _Iterator_category;
+    
+public:
+  _DBG_iter() {}
+    // boris : real type of iter would be nice
+  _DBG_iter(const __owned_list* __c, const _Const_iterator& __it) :
+    _DBG_iter_mid<_Container, _Traits>(__c, __it) {}
+
+  // This allows conversions from iterator to const_iterator without being
+  // redundant with the copy constructor below.
+  _DBG_iter(const _Nonconst_mid& __rhs) :
+    _DBG_iter_mid<_Container, _Traits>(__rhs) {}
+
+  _DBG_iter(const  _Self& __rhs) :
+    _DBG_iter_mid<_Container, _Traits>(__rhs) {}
+  
+  // This allows conversions from iterator to const_iterator without being
+  // redundant with the copy assignment operator below.
+  _Self& operator=(const _Nonconst_mid& __rhs)  
+  {
+    (_Base&)*this = __rhs;
+    return *this;
+  }
+
+  _Self& operator=(const  _Self& __rhs) 
+  {
+    (_Base&)*this = __rhs;
+    return *this;
+  }
+  
+  reference operator*() const {
+    _STLP_DEBUG_CHECK(_Dereferenceable(*this))
+    return *this->_M_iterator;
+  }
+
+  _STLP_DEFINE_ARROW_OPERATOR
+  
+  _Self& operator++() {
+    this->__increment();
+    return *this;
+  }
+  _Self operator++(int) {
+    _Self __tmp = *this;
+    this->__increment();
+    return __tmp;
+  }
+  _Self& operator--() {
+    this->__decrement();
+    return *this;
+  }
+  _Self operator--(int) {
+    _Self __tmp = *this;
+    this->__decrement();
+    return __tmp;
+  }
+  
+  _Self& operator+=(difference_type __n) {
+    this->__advance(__n);
+    return *this;
+  }
+  
+  _Self& operator-=(difference_type __n) {
+    this->__advance(-__n);
+    return *this;
+  }
+  _Self operator+(difference_type __n) const {
+    _Self __tmp(*this);
+    __tmp.__advance(__n);
+    return __tmp;
+  }
+  _Self operator-(difference_type __n) const {
+    _Self __tmp(*this);
+    __tmp.__advance(-__n);
+    return __tmp;
+  }
+  reference operator[](difference_type __n) const { return *(*this + __n); }
+};
+
+template <class _Container>
+inline bool 
+operator==(const _DBG_iter_base<_Container>& __x, const _DBG_iter_base<_Container>& __y) {
+  _STLP_DEBUG_CHECK(__check_same_owner_or_null(__x, __y))
+  return __x._M_iterator==__y._M_iterator;
+}
+
+template <class _Container>
+inline bool 
+operator<(const _DBG_iter_base<_Container>& __x, const _DBG_iter_base<_Container>& __y) {
+  _STLP_DEBUG_CHECK(__check_same_owner_or_null(__x, __y))
+  typedef typename _DBG_iter_base<_Container>::_Iterator_category _Category;
+  return _CompareIt(__x._M_iterator , __y._M_iterator, _Category());
+}
+
+template <class _Container>
+inline bool 
+operator>(const _DBG_iter_base<_Container>& __x,
+	  const _DBG_iter_base<_Container>& __y) { 
+  typedef typename _DBG_iter_base<_Container>::_Iterator_category _Category;
+  return _CompareIt(__y._M_iterator , __x._M_iterator, _Category());
+}
+
+template <class _Container>
+inline bool 
+operator>=(const _DBG_iter_base<_Container>& __x, const _DBG_iter_base<_Container>& __y) {
+  _STLP_DEBUG_CHECK(__check_same_owner_or_null(__x, __y))
+  typedef typename _DBG_iter_base<_Container>::_Iterator_category _Category;
+  return !_CompareIt(__x._M_iterator , __y._M_iterator, _Category());
+}
+
+template <class _Container>
+inline bool 
+operator<=(const _DBG_iter_base<_Container>& __x,
+	  const _DBG_iter_base<_Container>& __y) {
+  typedef typename _DBG_iter_base<_Container>::_Iterator_category _Category; 
+  return !_CompareIt(__y._M_iterator , __x._M_iterator, _Category());
+}
+
+template <class _Container>
+inline bool 
+operator!=(const _DBG_iter_base<_Container>& __x, 
+	   const _DBG_iter_base<_Container>& __y) {
+  _STLP_DEBUG_CHECK(__check_same_owner_or_null(__x, __y))
+  return __x._M_iterator != __y._M_iterator;
+}
+
+//------------------------------------------
+
+template <class _Container, class _Traits>
+inline _DBG_iter<_Container, _Traits> 
+operator+(ptrdiff_t __n, const _DBG_iter<_Container, _Traits>& __it) {
+    _DBG_iter<_Container, _Traits> __tmp(__it);
+    return __tmp += __n;
+}
+
+
+# ifdef _STLP_USE_OLD_HP_ITERATOR_QUERIES
+# if defined (_STLP_NESTED_TYPE_PARAM_BUG) \
+   || ( defined (__SUNPRO_CC) && __SUNPRO_CC < 0x600) \
+   || ( defined (_STLP_MSVC) && (_STLP_MSVC < 1100) )
+#  define _STLP_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS 1
+# endif
+
+template <class _Container>
+inline ptrdiff_t* 
+distance_type(const  _DBG_iter_base<_Container>&) { return (ptrdiff_t*) 0; }
+
+# if !defined (_STLP_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS)
+template <class _Container>
+inline _STLP_TYPENAME_ON_RETURN_TYPE _DBG_iter_base<_Container>::value_type*
+value_type(const  _DBG_iter_base<_Container>&) {
+  typedef typename _DBG_iter_base<_Container>::value_type _Val;
+  return (_Val*)0;
+}
+
+template <class _Container>
+inline _STLP_TYPENAME_ON_RETURN_TYPE _DBG_iter_base<_Container>::_Iterator_category 
+iterator_category(const  _DBG_iter_base<_Container>&) {
+  typedef typename _DBG_iter_base<_Container>::_Iterator_category _Category;
+  return _Category();
+}
+# endif
+
+#  endif /* _STLP_USE_OLD_HP_ITERATOR_QUERIES */
+
+# define _Get_iter(__x)   __x
+# define _Debug_iter(__x, __y) __y
+
+_STLP_END_NAMESPACE
+
+#endif /* INTERNAL_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/debug/_list.h b/main/source/stlport/stlport/stl/debug/_list.h
new file mode 100644
index 00000000..d7f5604e
--- /dev/null
+++ b/main/source/stlport/stlport/stl/debug/_list.h
@@ -0,0 +1,318 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_DBG_LIST_H
+#define _STLP_INTERNAL_DBG_LIST_H
+
+#include <stl/debug/_iterator.h>
+
+# ifndef _STLP_USE_WRAPPER_FOR_ALLOC_PARAM
+#  undef  _DBG_list
+#  define _DBG_list list
+# endif
+
+#  define _STLP_DBG_LIST_BASE \
+__WORKAROUND_DBG_RENAME(list) <_Tp, _Alloc>
+
+_STLP_BEGIN_NAMESPACE
+
+# ifdef _STLP_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS
+template <class _Tp, class _Alloc>
+inline _Tp*
+value_type(const  _DBG_iter_base< _STLP_DBG_LIST_BASE >&) {
+  return (_Tp*)0;
+}
+template <class _Tp, class _Alloc>
+inline bidirectional_iterator_tag
+iterator_category(const _DBG_iter_base< _STLP_DBG_LIST_BASE >&) {
+  return bidirectional_iterator_tag();
+}
+# endif
+
+template <class _Tp, _STLP_DEFAULT_ALLOCATOR_SELECT(_Tp) >
+class _DBG_list : public _STLP_DBG_LIST_BASE {
+
+  typedef _STLP_DBG_LIST_BASE _Base;
+  typedef _DBG_list<_Tp, _Alloc> _Self;
+
+public:      
+  __IMPORT_CONTAINER_TYPEDEFS(_Base)
+
+public:
+  typedef _DBG_iter<_Base, _Nonconst_traits<value_type> >     iterator;
+  typedef _DBG_iter<_Base, _Const_traits<value_type> >    const_iterator;
+
+  _STLP_DECLARE_BIDIRECTIONAL_REVERSE_ITERATORS;
+
+protected:
+  mutable __owned_list _M_iter_list;
+  void _Invalidate_all() { _M_iter_list._Invalidate_all();}
+
+public:
+  const _Base* _Get_base() const { return (const _Base*)this; }
+  _Base* _Get_base() { return (_Base*)this; }
+  explicit _DBG_list(const allocator_type& __a = allocator_type()) :
+    _STLP_DBG_LIST_BASE(__a), _M_iter_list(_Get_base()) {}
+  _DBG_list(size_type __n, const _Tp& __value,
+	    const allocator_type& __a = allocator_type())
+    : _STLP_DBG_LIST_BASE(__n, __value, __a), _M_iter_list(_Get_base()) {}
+  explicit _DBG_list(size_type __n)
+    : _STLP_DBG_LIST_BASE(__n), _M_iter_list(_Get_base()) {}
+  
+#ifdef _STLP_MEMBER_TEMPLATES
+
+  // We don't need any dispatching tricks here, because insert does all of
+  // that anyway.  
+#  ifdef _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS
+  template <class _InputIterator>
+  _DBG_list(_InputIterator __first, _InputIterator __last)
+    : _STLP_DBG_LIST_BASE(__first, __last, allocator_type()), _M_iter_list(_Get_base()) {}
+#  endif
+  template <class _InputIterator>
+  _DBG_list(_InputIterator __first, _InputIterator __last,
+       const allocator_type& __a _STLP_ALLOCATOR_TYPE_DFL)
+    : _STLP_DBG_LIST_BASE(__first, __last, __a), _M_iter_list(_Get_base()) {}
+#else /* _STLP_MEMBER_TEMPLATES */
+
+  _DBG_list(const _Tp* __first, const _Tp* __last,
+       const allocator_type& __a = allocator_type())
+    : _STLP_DBG_LIST_BASE(__first, __last, __a), _M_iter_list(_Get_base()) {}
+  _DBG_list(const_iterator __first, const_iterator __last,
+       const allocator_type& __a = allocator_type()):
+    _STLP_DBG_LIST_BASE(__first._M_iterator, __last._M_iterator, __a),
+    _M_iter_list(_Get_base()) {}
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  _DBG_list(const _Self& __x) : 
+    _STLP_DBG_LIST_BASE(__x) , _M_iter_list(_Get_base()) {}
+
+  _Self& operator=(const _Self& __x) {
+    _Invalidate_all();
+    _Base::operator=((const _Base&)__x);
+    return *this;
+  }
+
+public:
+  iterator begin()             { return iterator(&_M_iter_list, _Base::begin()); }
+  const_iterator begin() const { return const_iterator(&_M_iter_list, _Base::begin()); }
+
+  iterator end()               { return iterator(&_M_iter_list, _Base::end()); }
+  const_iterator end() const   { return const_iterator(&_M_iter_list, _Base::end()); }
+
+  reverse_iterator rbegin()    { return reverse_iterator(end()); }
+  reverse_iterator rend()      { return reverse_iterator(begin()); }
+
+  const_reverse_iterator rbegin() const { return const_reverse_iterator(end()); }
+  const_reverse_iterator rend() const { return const_reverse_iterator(begin()); }
+
+  // those are here to enforce checking
+  reference front() { return *begin(); }
+  const_reference front() const { return *begin(); }
+  reference back() { return *(--end()); }
+  const_reference back() const { return *(--end()); }
+
+  void swap(_Self& __x) {
+    _M_iter_list._Swap_owners(__x._M_iter_list);
+    _Base::swap(__x); 
+  }
+
+  iterator insert(iterator __position, const _Tp& __x) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__position))
+      return iterator(&_M_iter_list,_Base::insert(__position._M_iterator, __x) );
+  }
+
+# ifndef _STLP_NO_ANACHRONISMS
+  iterator insert(iterator __position) { return insert(__position, _Tp()); }
+# endif
+
+#ifdef _STLP_MEMBER_TEMPLATES
+
+  template <class _InputIterator>
+  void insert(iterator __position, _InputIterator __first, _InputIterator __last) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__position))
+    _Base::insert(__position._M_iterator, __first, __last);
+  }
+
+#else
+
+  void insert(iterator __position, const _Tp* __first, const _Tp* __last) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__position))
+    _Base::insert(__position._M_iterator, __first, __last);
+  }
+
+  void insert(iterator __position,
+	      const_iterator __first, const_iterator __last) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__position))
+    _Base::insert(__position._M_iterator, __first._M_iterator, __last._M_iterator);
+  }
+  
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  void insert(iterator __position, size_type __n, const _Tp& __x) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__position))
+    _Base::insert(__position._M_iterator, __n, __x);    
+  }
+
+  void pop_back() {
+    _STLP_VERBOSE_ASSERT(!this->empty(), _StlMsg_EMPTY_CONTAINER)
+    __invalidate_iterator(&_M_iter_list,end());
+    _Base::pop_back();
+  }
+
+  void pop_front() {
+    _STLP_VERBOSE_ASSERT(!this->empty(), _StlMsg_EMPTY_CONTAINER)
+    __invalidate_iterator(&_M_iter_list,begin());
+    _Base::pop_front();
+  }
+
+  iterator erase(iterator __position) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__position))
+    _STLP_VERBOSE_ASSERT(__position._M_iterator._M_node!=this->_M_node._M_data, 
+			 _StlMsg_ERASE_PAST_THE_END)
+    // fbp : CHECK !!!
+    __invalidate_iterator(&_M_iter_list, __position);
+    return iterator(&_M_iter_list,_Base::erase(__position._M_iterator));
+  }
+  iterator erase(iterator __first, iterator __last) {
+    while (__first != __last)
+      erase(__first++);
+    return __last;
+  }
+
+  void resize(size_type __new_size, const _Tp& __x) {
+    typename _Base::iterator __i = _Base::begin();
+    size_type __len = 0;
+    for ( ; __i != _Base::end() && __len < __new_size; ++__i, ++__len);
+    
+    if (__len == __new_size)
+      erase(iterator(&_M_iter_list,__i), end());
+    else                          // __i == end()
+      _Base::insert(_Base::end(), __new_size - __len, __x);
+  }
+
+  void resize(size_type __new_size) { this->resize(__new_size, _Tp()); }
+
+  void remove(const _Tp& __value) {
+    typename _Base::iterator __first = _Base::begin();
+    typename _Base::iterator __last = _Base::end();
+    while (__first != __last) {
+      typename _Base::iterator __next = __first;
+      ++__next;
+      if (__value == *__first) erase(iterator(&_M_iter_list,__first));
+      __first = __next;
+    }
+  }
+
+  void clear() {   
+    _Invalidate_all();
+    _Base::clear(); 
+  }
+
+public:
+  void splice(iterator __position, _Self& __x) {
+    _STLP_VERBOSE_ASSERT(&__x!=this, _StlMsg_INVALID_ARGUMENT)
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__position))
+    _Base::splice(__position._M_iterator, __x);
+    __x._Invalidate_all();
+  }
+
+  void splice(iterator __position, _Self& __x, iterator __i) {
+      _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__position) &&
+                        __check_if_owner(&__x._M_iter_list ,__i))
+    _STLP_DEBUG_CHECK(_Dereferenceable(__i))
+    // fbp : CHECK !!!
+	// __invalidate_iterator(&__x._M_iter_list, __i);
+    _Base::splice(__position._M_iterator, __x, __i._M_iterator);
+  }
+
+  void splice(iterator __position, _Self& __x, iterator __first, iterator __last) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __position))
+    _STLP_VERBOSE_ASSERT(__first._Owner()==&__x._M_iter_list && __last._Owner()==&__x._M_iter_list, 
+			 _StlMsg_NOT_OWNER)
+    _Base::splice(__position._M_iterator, __x, __first._M_iterator, __last._M_iterator);
+  }
+
+  void merge(_Self& __x) {   
+    __x._Invalidate_all();
+    _Base::merge(__x); 
+  }
+  void reverse() {
+    _Invalidate_all();
+    _Base::reverse();
+  }
+  void unique() {
+    _Invalidate_all();
+    _Base::unique();
+  }
+  void sort() {
+    _Invalidate_all();
+    _Base::sort();
+  }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+
+  template <class _Predicate> void remove_if(_Predicate __pred)  {
+    _Base::remove_if(__pred);
+  }
+  template <class _BinaryPredicate>
+    void unique(_BinaryPredicate __binary_pred) {
+    _Base::unique(__binary_pred);
+  }
+  template <class _StrictWeakOrdering>
+    void merge(_Self& __x,
+	       _StrictWeakOrdering __comp) {
+    __x._Invalidate_all();
+    _Base::merge(__x, __comp);
+  }
+
+  template <class _StrictWeakOrdering>
+  void sort(_StrictWeakOrdering __comp) {
+      _Invalidate_all();
+      _Base::sort(__comp);
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+};
+
+#define _STLP_TEMPLATE_HEADER template <class _Tp, class _Alloc>
+#define _STLP_TEMPLATE_CONTAINER _DBG_list<_Tp,_Alloc>
+#define _STLP_TEMPLATE_CONTAINER_BASE _STLP_DBG_LIST_BASE
+#include <stl/debug/_relops_cont.h>
+#undef _STLP_TEMPLATE_CONTAINER_BASE
+#undef _STLP_TEMPLATE_CONTAINER
+#undef _STLP_TEMPLATE_HEADER
+
+_STLP_END_NAMESPACE 
+
+#endif /* _STLP_INTERNAL_LIST_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/debug/_relops_cont.h b/main/source/stlport/stlport/stl/debug/_relops_cont.h
new file mode 100644
index 00000000..5f770267
--- /dev/null
+++ b/main/source/stlport/stlport/stl/debug/_relops_cont.h
@@ -0,0 +1,41 @@
+// This is an implementation file which
+// is intended to be included multiple times with different _STLP_ASSOCIATIVE_CONTAINER
+// setting
+
+#ifdef _STLP_EXTRA_OPERATORS_FOR_DEBUG
+
+_STLP_TEMPLATE_HEADER
+inline  bool _STLP_CALL
+operator==(const _STLP_TEMPLATE_CONTAINER& __x, const _STLP_TEMPLATE_CONTAINER& __y)
+{
+  return (const _STLP_TEMPLATE_CONTAINER_BASE&)__x == (const _STLP_TEMPLATE_CONTAINER_BASE&)__y; 
+}
+
+_STLP_TEMPLATE_HEADER
+inline  bool _STLP_CALL
+operator<(const _STLP_TEMPLATE_CONTAINER& __x, const _STLP_TEMPLATE_CONTAINER& __y)
+{
+  return (const _STLP_TEMPLATE_CONTAINER_BASE&)__x < (const _STLP_TEMPLATE_CONTAINER_BASE&)__y; 
+}
+
+_STLP_RELOPS_OPERATORS( _STLP_TEMPLATE_HEADER , _STLP_TEMPLATE_CONTAINER )
+
+#endif /* _STLP_EXTRA_OPERATORS_FOR_DEBUG */
+
+#ifdef _STLP_FUNCTION_TMPL_PARTIAL_ORDER
+
+_STLP_TEMPLATE_HEADER
+inline void _STLP_CALL swap(_STLP_TEMPLATE_CONTAINER& __x, _STLP_TEMPLATE_CONTAINER& __y)
+{
+  __x.swap(__y);
+}
+
+#endif /* _STLP_FUNCTION_TMPL_PARTIAL_ORDER */
+
+#if 0 /* def _STLP_CLASS_PARTIAL_SPECIALIZATION */
+
+_STLP_TEMPLATE_HEADER
+struct __type_traits<_STLP_STD::_STLP_TEMPLATE_CONTAINER > : __type_traits_aux<0, 1>
+{};
+
+#endif /* _STLP_CLASS_PARTIAL_SPECIALIZATION */
diff --git a/main/source/stlport/stlport/stl/debug/_relops_hash_cont.h b/main/source/stlport/stlport/stl/debug/_relops_hash_cont.h
new file mode 100644
index 00000000..c37e2198
--- /dev/null
+++ b/main/source/stlport/stlport/stl/debug/_relops_hash_cont.h
@@ -0,0 +1,34 @@
+// This is an implementation file which
+// is intended to be included multiple times with different _STLP_ASSOCIATIVE_CONTAINER
+// setting
+
+#ifdef _STLP_EXTRA_OPERATORS_FOR_DEBUG
+_STLP_TEMPLATE_HEADER
+inline bool _STLP_CALL 
+operator==(const _STLP_TEMPLATE_CONTAINER& __hm1, const _STLP_TEMPLATE_CONTAINER& __hm2)
+{
+  return _STLP_TEMPLATE_CONTAINER_BASE::_M_equal(__hm1, __hm2);
+}
+
+#ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+
+_STLP_TEMPLATE_HEADER
+inline bool _STLP_CALL 
+operator!=(const _STLP_TEMPLATE_CONTAINER& __hm1, const _STLP_TEMPLATE_CONTAINER& __hm2) {
+  return !(__hm1 == __hm2);
+}
+
+#endif /* _STLP_USE_SEPARATE_RELOPS_NAMESPACE */
+
+#endif /* _STLP_EXTRA_OPERATORS_FOR_DEBUG */
+
+#ifdef _STLP_FUNCTION_TMPL_PARTIAL_ORDER
+
+_STLP_TEMPLATE_HEADER
+inline void _STLP_CALL 
+swap(_STLP_TEMPLATE_CONTAINER& __hm1, _STLP_TEMPLATE_CONTAINER& __hm2)
+{
+  __hm1.swap(__hm2);
+}
+
+#endif /* _STLP_FUNCTION_TMPL_PARTIAL_ORDER */
diff --git a/main/source/stlport/stlport/stl/debug/_slist.h b/main/source/stlport/stlport/stl/debug/_slist.h
new file mode 100644
index 00000000..f70b5e6d
--- /dev/null
+++ b/main/source/stlport/stlport/stl/debug/_slist.h
@@ -0,0 +1,399 @@
+/*
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_DBG_SLIST_H
+#define _STLP_INTERNAL_DBG_SLIST_H
+
+#include <stl/debug/_iterator.h>
+
+# ifndef _STLP_USE_WRAPPER_FOR_ALLOC_PARAM
+#  undef  _DBG_slist
+#  define _DBG_slist slist
+# endif
+
+#  define _STLP_DBG_SLIST_BASE __WORKAROUND_DBG_RENAME(slist) <_Tp, _Alloc>
+
+_STLP_BEGIN_NAMESPACE
+
+# ifdef _STLP_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS
+template <class _Tp, class _Alloc>
+inline _Tp*
+value_type(const _DBG_iter_base< _STLP_DBG_SLIST_BASE >&) {
+  return (_Tp*)0;
+}
+
+template <class _Tp, class _Alloc>
+inline forward_iterator_tag
+iterator_category(const _DBG_iter_base< _STLP_DBG_SLIST_BASE >&) {
+  return forward_iterator_tag();
+}
+# endif
+
+template <class _Tp, _STLP_DEFAULT_ALLOCATOR_SELECT(_Tp) >
+class _DBG_slist : public _STLP_DBG_SLIST_BASE
+{
+private:
+  typedef _STLP_DBG_SLIST_BASE _Base;
+  typedef _DBG_slist<_Tp,_Alloc> _Self;
+
+public:
+
+  __IMPORT_CONTAINER_TYPEDEFS(_Base)
+
+  typedef _DBG_iter<_Base, _Nonconst_traits<value_type> >      iterator;
+  typedef _DBG_iter<_Base, _Const_traits<value_type> >     const_iterator;
+
+protected:
+  friend class __owned_link;
+  mutable __owned_list _M_iter_list;
+  void _Invalidate_all() { _M_iter_list._Invalidate_all();}
+  void _Invalidate_iterator(const iterator& __it) {__invalidate_iterator(&_M_iter_list, __it); }
+
+public:
+  const _Base* _Get_base() const { return (const _Base*)this; }
+  _Base* _Get_base() { return (_Base*)this; }
+
+public:
+
+  explicit _DBG_slist(const allocator_type& __a = allocator_type()) :
+    _STLP_DBG_SLIST_BASE(__a) , _M_iter_list(_Get_base()) {}
+  
+  _DBG_slist(size_type __n, const value_type& __x,
+	     const allocator_type& __a =  allocator_type()) :
+    _STLP_DBG_SLIST_BASE(__n, __x, __a), _M_iter_list(_Get_base()) {}
+  
+  explicit _DBG_slist(size_type __n) : _STLP_DBG_SLIST_BASE(__n) , _M_iter_list(_Get_base()) {}
+  
+#ifdef _STLP_MEMBER_TEMPLATES
+  // We don't need any dispatching tricks here, because _M_insert_after_range
+  // already does them.
+# ifdef _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS
+  template <class _InputIterator>
+  _DBG_slist(_InputIterator __first, _InputIterator __last) :
+    _STLP_DBG_SLIST_BASE(__first, __last, allocator_type()), _M_iter_list(_Get_base()) {} 
+# endif
+  template <class _InputIterator>
+  _DBG_slist(_InputIterator __first, _InputIterator __last,
+	     const allocator_type& __a _STLP_ALLOCATOR_TYPE_DFL) : 
+    _STLP_DBG_SLIST_BASE(__first, __last, __a), _M_iter_list(_Get_base()) {} 
+
+#else /* _STLP_MEMBER_TEMPLATES */
+
+  _DBG_slist(const_iterator __first, const_iterator __last,
+	     const allocator_type& __a = allocator_type() ) :
+    _STLP_DBG_SLIST_BASE(__first._M_iterator, __last._M_iterator, __a),
+    _M_iter_list(_Get_base()) {}
+  
+  _DBG_slist(const value_type* __first, const value_type* __last,
+        const allocator_type& __a =  allocator_type()) : 
+    _STLP_DBG_SLIST_BASE(__first, __last, __a), _M_iter_list(_Get_base())  {}
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  _DBG_slist(const _Self& __x) : _STLP_DBG_SLIST_BASE(__x), _M_iter_list(_Get_base()) {}
+  
+  _Self& operator= (const _Self& __x) {
+    _Invalidate_all();
+    (_Base&)*this = (const _Base&)__x;
+    return *this;
+  }
+  
+  ~_DBG_slist() {}
+
+public:
+  void assign(size_type __n, const _Tp& __val) {
+    // fbp :check invalidation here !
+    _Base::assign(__n, __val); 
+  }
+
+public:
+
+  iterator before_begin() { return iterator(&_M_iter_list, _Base::before_begin()); }
+  const_iterator before_begin() const
+    { return const_iterator(&_M_iter_list, _Base::before_begin()); }
+
+  iterator begin() { return iterator(&_M_iter_list, _Base::begin()); }
+  const_iterator begin() const 
+    { return const_iterator(&_M_iter_list,_Base::begin());}
+
+  iterator end() { return iterator(&_M_iter_list, _Base::end()); }
+  const_iterator end() const { return const_iterator(&_M_iter_list, _Base::end()); }
+
+  void swap(_Self& __x) { 
+    _M_iter_list._Swap_owners(__x._M_iter_list);
+    _Base::swap(__x); 
+  }
+
+public:
+  // fbp : checks here !
+  reference front() { 
+    _STLP_VERBOSE_ASSERT(!this->empty(), _StlMsg_EMPTY_CONTAINER)
+    return _Base::front(); 
+  }
+  const_reference front() const { 
+    _STLP_VERBOSE_ASSERT(!this->empty(), _StlMsg_EMPTY_CONTAINER)
+    return _Base::front(); 
+  }
+  void pop_front() {
+    _STLP_VERBOSE_ASSERT(!this->empty(), _StlMsg_EMPTY_CONTAINER)
+    _Base::pop_front();
+  }
+  iterator previous(const_iterator __pos) {
+    return iterator(&_M_iter_list,_Base::previous(__pos._M_iterator));
+  }
+  const_iterator previous(const_iterator __pos) const {
+    return const_iterator(&_M_iter_list,_Base::previous(__pos._M_iterator));
+  }
+
+public:
+
+  iterator insert_after(iterator __pos, const value_type& __x) {
+    return iterator(&_M_iter_list,_Base::insert_after(__pos._M_iterator, __x));
+  }
+
+  iterator insert_after(iterator __pos) {
+    return iterator(&_M_iter_list,_Base::insert_after(__pos._M_iterator));
+  }
+
+  void insert_after(iterator __pos, size_type __n, const value_type& __x) {
+    _Base::insert_after(__pos._M_iterator, __n, __x);
+  }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+
+  template <class _InputIterator>
+  void assign(_InputIterator __first, _InputIterator __last) {
+    // fbp :check invalidation here !
+    _Base::assign(__first, __last);
+  }
+
+  // We don't need any dispatching tricks here, because _M_insert_after_range
+  // already does them.
+  template <class _InIter>
+  void insert_after(iterator __pos, _InIter __first, _InIter __last) {
+    _Base::insert_after(__pos._M_iterator, __first, __last);
+  }
+
+  // We don't need any dispatching tricks here, because _M_insert_after_range
+  // already does them.
+  template <class _InIter>
+  void insert(iterator __pos, _InIter __first, _InIter __last) {
+    _Base::insert(__pos._M_iterator, __first, __last);
+
+  }
+
+#else /* _STLP_MEMBER_TEMPLATES */
+
+  void insert_after(iterator __pos,
+                    const_iterator __first, const_iterator __last) {
+    _Base::insert_after(__pos._M_iterator, __first._M_iterator, __last._M_iterator);
+  }
+  void insert_after(iterator __pos,
+                    const value_type* __first, const value_type* __last) {
+    _Base::insert_after(__pos._M_iterator, __first, __last);
+  }
+
+  void insert(iterator __pos, const_iterator __first, const_iterator __last) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__pos))
+    _Base::insert(__pos._M_iterator, __first._M_iterator, __last._M_iterator);
+  }
+  void insert(iterator __pos, const value_type* __first, 
+                              const value_type* __last) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__pos))
+    _Base::insert(__pos._M_iterator, __first, __last);
+  }
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  iterator insert(iterator __pos, const value_type& __x) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__pos))
+    return iterator(&_M_iter_list, _Base::insert(__pos._M_iterator, __x));
+  }
+
+  iterator insert(iterator __pos) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__pos))
+    return iterator(&_M_iter_list, _Base::insert(__pos._M_iterator));
+  }
+
+  void insert(iterator __pos, size_type __n, const value_type& __x) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__pos))
+    _Base::insert(__pos._M_iterator, __n, __x);
+  } 
+    
+public:
+  iterator erase_after(iterator __pos) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__pos))
+    return iterator(&_M_iter_list, _Base::erase_after(__pos._M_iterator));
+  }
+  iterator erase_after(iterator __before_first, iterator __last) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__before_first))
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__last))
+    return iterator(&_M_iter_list, 
+		    _Base::erase_after(__before_first._M_iterator, __last._M_iterator));
+  } 
+
+  iterator erase(iterator __pos) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__pos))
+    return iterator(&_M_iter_list, _Base::erase(__pos._M_iterator));
+  }
+  iterator erase(iterator __first, iterator __last) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__first))
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__last))
+    return iterator(&_M_iter_list, 
+		    _Base::erase(__first._M_iterator, __last._M_iterator));
+  }
+
+  void resize(size_type __new_size, const _Tp& __x) {
+    _Base::resize(__new_size, __x);
+  }
+  void resize(size_type new_size) { resize(new_size, _Tp()); }
+
+  void clear() {
+    _Invalidate_all();      
+    _Base::clear();
+  }
+
+public:
+  // Moves the range [__before_first + 1, __before_last + 1) to *this,
+  //  inserting it immediately after __pos.  This is constant time.
+  void splice_after(iterator __pos, 
+                    iterator __before_first, iterator __before_last)
+  {
+    if (__before_first != __before_last) {
+      _Base::splice_after(__pos._M_iterator, 
+                          __before_first._M_iterator, __before_last._M_iterator);
+      __before_first++;
+      __before_last++;
+      __invalidate_range(__before_first._Owner(), 
+                         __before_first, __before_last);
+    }
+  }
+
+  // Moves the element that follows __prev to *this, inserting it immediately
+  //  after __pos.  This is constant time.
+  void splice_after(iterator __pos, iterator __prev)
+  {
+    _Base::splice_after(__pos._M_iterator, __prev._M_iterator);
+    __invalidate_iterator(__prev._Owner(), ++__prev);
+  }
+
+  // Removes all of the elements from the list __x to *this, inserting
+  // them immediately after __pos.  __x must not be *this.  Complexity:
+  // linear in __x.size().
+  void splice_after(iterator __pos, _Self& __x)
+  {
+    _Base::splice_after(__pos._M_iterator, (_Base&)__x);
+    __x._Invalidate_all();
+  }
+
+  // Linear in distance(begin(), __pos), and linear in __x.size().
+  void splice(iterator __pos, _Self& __x) {
+    _STLP_VERBOSE_ASSERT(!(&__x==this), _StlMsg_INVALID_ARGUMENT)
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__pos))
+    _Base::splice(__pos._M_iterator, (_Base&)__x);
+    __x._Invalidate_all();
+  }
+
+  // Linear in distance(begin(), __pos), and in distance(__x.begin(), __i).
+  void splice(iterator __pos, _Self& __x, iterator __i) {
+    _STLP_VERBOSE_ASSERT(&__x!=this, _StlMsg_INVALID_ARGUMENT)
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__pos) && 
+                      __check_if_owner(&__x._M_iter_list ,__i))
+    _Base::splice(__pos._M_iterator, (_Base&)__x, __i._M_iterator);
+    __x._Invalidate_iterator(__i);
+  }
+
+  // Linear in distance(begin(), __pos), in distance(__x.begin(), __first),
+  // and in distance(__first, __last).
+  void splice(iterator __pos, _Self& __x, iterator __first, iterator __last)
+  {
+    _STLP_VERBOSE_ASSERT(&__x!=this, _StlMsg_INVALID_ARGUMENT)
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__pos))
+    if (__first != __last)
+      _Base::splice(__pos._M_iterator, (_Base&)__x, __first._M_iterator, __last._M_iterator);      
+    __invalidate_range(&__x._M_iter_list, __first, __last);
+  }
+
+public:
+
+  void remove(const _Tp& __val) {
+    _Base::remove(__val);
+    //    __x._Invalidate_all();    
+  }
+  void unique() {
+    _Base::unique();
+  }
+  void merge(_Self& __x) {
+    _Base::merge((_Base&)__x);
+    __x._Invalidate_all();
+  }
+  void sort() {
+    _Invalidate_all();
+    _Base::sort();
+  }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+
+  template <class _Predicate> 
+  void remove_if(_Predicate __pred) {
+    _Base::remove_if(__pred);
+  }
+
+  template <class _BinaryPredicate> 
+  void unique(_BinaryPredicate __pred) {
+    _Base::unique(__pred);
+  }
+
+  template <class _StrictWeakOrdering> 
+  void merge(_Self& __x, _StrictWeakOrdering __ord) {
+    _Base::merge((_Base&)__x, __ord);
+    __x._Invalidate_all();    
+  }
+
+  template <class _StrictWeakOrdering>
+  void sort(_StrictWeakOrdering __comp) {
+      _Invalidate_all();
+      _Base::sort(__comp);
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+};
+
+#define _STLP_TEMPLATE_HEADER template <class _Tp, class _Alloc>
+#define _STLP_TEMPLATE_CONTAINER _DBG_slist<_Tp,_Alloc>
+#define _STLP_TEMPLATE_CONTAINER_BASE _STLP_DBG_SLIST_BASE
+#include <stl/debug/_relops_cont.h>
+#undef _STLP_TEMPLATE_CONTAINER_BASE
+#undef _STLP_TEMPLATE_CONTAINER
+#undef _STLP_TEMPLATE_HEADER
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_INTERNAL_DBG_SLIST_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/debug/_string.h b/main/source/stlport/stlport/stl/debug/_string.h
new file mode 100644
index 00000000..361e7c6c
--- /dev/null
+++ b/main/source/stlport/stlport/stl/debug/_string.h
@@ -0,0 +1,772 @@
+/*
+ * Copyright (c) 1997-1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_DBG_STRING_H
+#define _STLP_DBG_STRING_H
+
+#include <stl/debug/_iterator.h>
+
+# define _STLP_DBG_STRING_BASE _Nondebug_string <_CharT, _Traits, _Alloc>
+
+_STLP_BEGIN_NAMESPACE
+
+# ifdef _STLP_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS
+template <class _CharT,class _Traits, class _Alloc>
+inline _CharT*
+value_type(const  _DBG_iter_base< _STLP_DBG_STRING_BASE >&) {
+return (_CharT*)0;
+}
+template <class _CharT, class _Traits, class _Alloc>
+inline random_access_iterator_tag
+iterator_category(const  _DBG_iter_base< _STLP_DBG_STRING_BASE >&) {
+  return random_access_iterator_tag();
+}
+# endif
+
+template <class _CharT, class _Traits, class _Alloc> 
+class basic_string : public _STLP_DBG_STRING_BASE {
+private:
+  typedef _STLP_DBG_STRING_BASE _Base;
+  typedef basic_string<_CharT, _Traits, _Alloc> _Self;
+protected:
+  mutable __owned_list _M_iter_list;
+public:
+  __IMPORT_CONTAINER_TYPEDEFS(_Base)
+  typedef _DBG_iter<_Base, _Nonconst_traits<value_type> > iterator;
+  typedef _DBG_iter<_Base, _Const_traits<value_type> > const_iterator;
+  _STLP_DECLARE_RANDOM_ACCESS_REVERSE_ITERATORS;
+# ifdef _STLP_USE_NATIVE_STRING
+  // this typedef is being used for conversions
+  typedef _STLP_VENDOR_STD::basic_string<_CharT,_Traits, 
+    _STLP_VENDOR_STD::allocator<_CharT> >  __std_string;
+# endif
+public:                         // Constructor, destructor, assignment.
+  typedef typename _Base::_Reserve_t _Reserve_t;
+
+  const _Base* _Get_base() const { return (const _Base*)this; }
+  _Base* _Get_base() { return (_Base*)this; }
+
+  basic_string() :_STLP_DBG_STRING_BASE(), _M_iter_list(_Get_base()) {}
+  
+  explicit basic_string(const allocator_type& __a): 
+    _STLP_DBG_STRING_BASE(__a), _M_iter_list(_Get_base()) {}
+
+  basic_string(_Reserve_t __r, size_t __n,
+               const allocator_type& __a = allocator_type())
+    : _STLP_DBG_STRING_BASE(__r, __n, __a), _M_iter_list(_Get_base()) {}
+
+  basic_string(const _Self& __s): 
+    _STLP_DBG_STRING_BASE(__s), _M_iter_list(_Get_base()) {}
+
+  basic_string(const _Self& __s, size_type __pos, size_type __n = _Base::npos,
+               const allocator_type& __a = allocator_type()):
+    _STLP_DBG_STRING_BASE(__s, __pos, __n, __a), _M_iter_list(_Get_base()) {}
+
+  basic_string(const _CharT* __s, size_type __n,
+		    const allocator_type& __a = allocator_type()):
+    _STLP_DBG_STRING_BASE(__s, __n, __a), _M_iter_list(_Get_base()) {}
+
+  basic_string(const _CharT* __s,
+		    const allocator_type& __a = allocator_type()):
+    _STLP_DBG_STRING_BASE(__s, __a), _M_iter_list(_Get_base()) {}
+
+  basic_string(size_type __n, _CharT __c,
+		    const allocator_type& __a = allocator_type()):
+    _STLP_DBG_STRING_BASE(__n, __c, __a), _M_iter_list(_Get_base()) {}
+
+#if defined (_STLP_MEMBER_TEMPLATES) && !(defined(__MRC__)||(defined(__SC__) && !defined(__DMC__)))
+# ifdef _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS
+  template <class _InputIterator>
+  basic_string(_InputIterator __f, _InputIterator __l):
+    _STLP_DBG_STRING_BASE(__f, __l), _M_iter_list(_Get_base()) {}
+#  endif
+  template <class _InputIterator>
+  basic_string(_InputIterator __f, _InputIterator __l,
+		    const allocator_type & __a _STLP_ALLOCATOR_TYPE_DFL):
+    _STLP_DBG_STRING_BASE(__f, __l, __a), _M_iter_list(_Get_base()) {}
+#else /* _STLP_MEMBER_TEMPLATES */
+  basic_string(const_iterator __f, const_iterator __l, 
+		    const allocator_type & __a = allocator_type()):
+    _STLP_DBG_STRING_BASE(__f._M_iterator, __l._M_iterator, __a), 
+     _M_iter_list(_Get_base()) {}
+
+  basic_string(const _CharT* __f, const _CharT* __l,
+               const allocator_type& __a = allocator_type()):
+   _STLP_DBG_STRING_BASE(__f, __l, __a), _M_iter_list(_Get_base()) {}
+#endif
+
+# ifdef _STLP_USE_NATIVE_STRING
+  // these conversion operations still needed for
+  // strstream, etc.
+  basic_string (const __std_string& __x)
+    : _STLP_DBG_STRING_BASE(__x.begin(), __x.end()), _M_iter_list(_Get_base()) {}
+  operator __std_string() const { return __std_string(this->data()); }
+# endif
+
+  // constructor from non-debug version
+  basic_string (const _Base& __x)
+    : _STLP_DBG_STRING_BASE(__x), _M_iter_list(_Get_base()) {}
+
+  _Self& operator=(const _Self& __s) {
+    _Base::operator=(__s);
+    return *this;
+  }
+
+  _Self& operator=(const _CharT* __s) { 
+    _STLP_FIX_LITERAL_BUG(__s)
+    _Base::operator=(__s);
+    return *this;
+  }
+
+  _Self& operator=(_CharT __c) {
+    _Base::operator=(__c);
+    return *this;
+  }
+
+public:                         // Iterators.
+
+  iterator begin() { return iterator(&_M_iter_list, this->_M_start); }
+  const_iterator begin() const { return const_iterator(&_M_iter_list,this->_M_start); }
+  iterator end() { return iterator(&_M_iter_list,this->_M_finish); }
+  const_iterator end() const { return const_iterator(&_M_iter_list,this->_M_finish); }
+  void _M_deallocate_block() {
+    _M_iter_list._Invalidate_all();
+    _Base::_M_deallocate_block();
+  }
+
+  reverse_iterator rbegin()             
+    { return reverse_iterator(iterator(&_M_iter_list,this->_M_finish)); }
+  reverse_iterator rend()               
+    { return reverse_iterator(iterator(&_M_iter_list,this->_M_start)); }
+  const_reverse_iterator rbegin() const 
+    { return const_reverse_iterator(const_iterator(&_M_iter_list,this->_M_finish)); }
+  const_reverse_iterator rend()   const 
+    { return const_reverse_iterator(const_iterator(&_M_iter_list,this->_M_start)); }
+
+public:                         // Size, capacity, etc.
+
+  void resize(size_type __n, _CharT __c) {
+    _Base::resize(__n, __c);
+  }
+  void resize(size_type __n) { resize(__n, this->_M_null()); }
+
+  void reserve(size_type __s= 0) {
+    _Base::reserve(__s);
+  }
+
+  void clear() {
+    _M_iter_list._Invalidate_all();
+    _Base::clear();
+  } 
+
+public:                         // Element access.
+
+  const_reference operator[](size_type __n) const
+    { return *(begin() + __n); }
+  reference operator[](size_type __n)
+    { return *(begin() + __n); }
+
+  const_reference at(size_type __n) const {
+    if (__n >= this->size())
+      this->_M_throw_out_of_range();
+    return *(begin() + __n);
+  }
+
+  reference at(size_type __n) {
+    if (__n >= this->size())
+      this->_M_throw_out_of_range();
+    return *(begin() + __n);
+  }
+
+public:                         // Append, operator+=, push_back.
+
+  _Self& operator+=(const _Self& __s) { return append(__s); }
+  _Self& operator+=(const _CharT* __s) { _STLP_FIX_LITERAL_BUG(__s) return append(__s); }
+  _Self& operator+=(_CharT __c) { push_back(__c); return *this; }
+
+  _Self& append(const _Self& __s) { return append(__s._M_start, __s._M_finish); }
+
+  _Self& append(const _Self& __s,
+                       size_type __pos, size_type __n)
+  {
+    _Base::append(__s, __pos, __n);
+    return *this;
+  }
+
+  _Self& append(const _CharT* __s, size_type __n) 
+    { _STLP_FIX_LITERAL_BUG(__s) return append(__s, __s+__n); }
+
+  _Self& append(const _CharT* __s) 
+    { _STLP_FIX_LITERAL_BUG(__s) return append(__s, __s + _Traits::length(__s)); }
+
+  _Self& append(size_type __n, _CharT __c){
+	  _Base::append(__n, __c);
+	  return *this;
+  }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+
+  // Check to see if _InputIterator is an integer type.  If so, then
+  // it can't be an iterator.
+  template <class _InputIter>
+  _Self& append(_InputIter __first, _InputIter __last) {
+    _Base::append(__first, __last);
+    return *this;
+  }
+
+#ifdef _STLP_MSVC
+// specialization for append
+ template <>
+ inline _Self& append(iterator __f, iterator __l) {
+ _STLP_FIX_LITERAL_BUG(__f) _STLP_FIX_LITERAL_BUG(__l)
+  __check_range(__f, __l);
+  _Base::append(__f._M_iterator, __l._M_iterator);
+  return *this;
+ }
+#endif
+
+#else /* _STLP_MEMBER_TEMPLATES */
+
+  _Self& append(const _CharT* __first, const _CharT* __last) {
+    _Base::append(__first, __last);
+    return *this;
+  }
+
+  _Self& append(const_iterator __first, const_iterator __last) {
+    _Base::append(__first._M_iterator, __last._M_iterator);
+    return *this;
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  void push_back(_CharT __c) {
+    _Base::push_back(__c);
+  }
+
+  void pop_back() {
+    __invalidate_iterator(&_M_iter_list,end());
+    _Base::pop_back();
+  }
+
+
+public:                         // Assign
+  
+  _Self& assign(const _Self& __s) {
+    _Base::assign(__s); 
+    return *this; 
+  }
+
+  _Self& assign(const _Self& __s, 
+                       size_type __pos, size_type __n) {
+    _Base::assign(__s, __pos, __n);
+    return *this;
+  }
+
+  _Self& assign(const _CharT* __s, size_type __n)
+    { _STLP_FIX_LITERAL_BUG(__s) return assign(__s, __s + __n); }
+
+  _Self& assign(const _CharT* __s)
+    { _STLP_FIX_LITERAL_BUG(__s) return assign(__s, __s + _Traits::length(__s)); }
+
+  _Self& assign(size_type __n, _CharT __c) {
+    _Base::assign(__n, __c);
+    return *this;    
+  }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIter>
+  inline _Self& assign(_InputIter __first, _InputIter __last) {
+      _STLP_FIX_LITERAL_BUG(__first) _STLP_FIX_LITERAL_BUG(__last)
+      __check_range(__first, __last);
+      _Base::assign(__first, __last);
+      return *this;    
+  }
+
+#ifdef _STLP_MSVC
+// partial specialization for assign
+template <>
+inline _Self& assign(iterator __f, iterator __l) {
+  _STLP_FIX_LITERAL_BUG(__f) _STLP_FIX_LITERAL_BUG(__l)
+    __check_range(__f, __l);
+  _Base::assign(__f._M_iterator, __l._M_iterator);
+  return *this;
+  }
+#endif
+
+#else
+  _Self& assign(const _CharT* __f, const _CharT* __l) {
+    _STLP_FIX_LITERAL_BUG(__f) _STLP_FIX_LITERAL_BUG(__l)
+      __check_range(__f, __l);
+      _Base::assign(__f, __l);
+    return *this;
+  }
+  _Self& assign(const_iterator __f, const_iterator __l) {
+
+      _Base::assign(__f._M_iterator, __l._M_iterator);
+    return *this;
+  }
+#endif  /* _STLP_MEMBER_TEMPLATES */
+    
+public:                         // Insert
+
+  _Self& insert(size_type __pos, const _Self& __s) {
+    _Base::insert(__pos, __s);
+    return *this;
+  }
+
+  _Self& insert(size_type __pos, const _Self& __s,
+                       size_type __beg, size_type __n) {
+    _Base::insert(__pos, __s, __beg, __n);
+    return *this;
+  }
+
+  _Self& insert(size_type __pos, const _CharT* __s, size_type __n) {
+    _STLP_FIX_LITERAL_BUG(__s)
+    _Base::insert(__pos, __s, __n);
+    return *this;
+  }
+
+  _Self& insert(size_type __pos, const _CharT* __s) {
+    _STLP_FIX_LITERAL_BUG(__s)
+    _Base::insert(__pos, __s);      
+    return *this;
+  }
+    
+  _Self& insert(size_type __pos, size_type __n, _CharT __c) {
+    _Base::insert(__pos, __n, __c);
+    return *this;
+  }
+
+  iterator insert(iterator __p, _CharT __c) {
+    _STLP_FIX_LITERAL_BUG(__p)
+    __check_if_owner(&_M_iter_list,__p);
+    return iterator(&_M_iter_list,_Base::insert(__p._M_iterator, __c));
+  }
+
+  void insert(iterator __p, size_t __n, _CharT __c) {
+    __check_if_owner(&_M_iter_list,__p);
+    _Base::insert(__p._M_iterator, __n, __c);
+  }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIter>
+  void insert(iterator __p, _InputIter __first, _InputIter __last) {
+    __check_if_owner(&_M_iter_list,__p);
+    __check_range(__first,__last);
+    _Base::insert(__p._M_iterator, __first, __last);
+  }
+#else /* _STLP_MEMBER_TEMPLATES */
+  void insert(iterator __p, const _CharT* __first, const _CharT* __last) {
+    _STLP_FIX_LITERAL_BUG(__first) _STLP_FIX_LITERAL_BUG(__last)
+    __check_if_owner(&_M_iter_list,__p);
+    __check_range(__first,__last);
+    _Base::insert(__p._M_iterator, __first, __last);
+  }
+  void insert(iterator __p, const_iterator __first, const_iterator __last) {
+    __check_range(__first,__last);
+    _Base::insert(__p._M_iterator, __first._M_iterator, __last._M_iterator); 
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+public:                         // Erase.
+  _Self& erase(size_type __pos = 0, size_type __n = _Base::npos) {
+    _Base::erase(__pos, __n);
+    return *this;
+  }  
+  iterator erase(iterator __position) {
+    __check_if_owner(&_M_iter_list, __position);
+    __invalidate_iterator(&_M_iter_list,end());
+    return iterator(&_M_iter_list, _Base::erase(__position._M_iterator));
+  }
+  iterator erase(iterator __first, iterator __last) {
+    __check_range(__first, __last)&&__check_if_owner(&_M_iter_list,__first);
+    if (__first != __last) {
+      __invalidate_range(&_M_iter_list, __last, end());
+    }
+    return iterator(&_M_iter_list, _Base::erase(__first._M_iterator, __last._M_iterator));   
+  }
+
+public:                         // Substring.
+  _Self substr(size_type __pos = 0, size_type __n = _Base::npos) const {
+    if (__pos > this->size())
+      this->_M_throw_out_of_range();
+    return _Self(this->begin() + __pos, 
+                 this->begin() + __pos + min(__n, this->size() - __pos),
+                 allocator_type());
+  }
+public:                         // Replace.  (Conceptually equivalent
+                                // to erase followed by insert.)
+  _Self& replace(size_type __pos, size_type __n, 
+                        const _Self& __s) {
+    _Base::replace(__pos, __n, __s);
+    return *this;
+  }
+
+  _Self& replace(size_type __pos1, size_type __n1,
+                        const _Self& __s,
+                        size_type __pos2, size_type __n2) {
+    _Base::replace(__pos1, __n1, (const _Base&)__s, __pos2, __n2);
+    return *this;
+  }
+
+  _Self& replace(size_type __pos, size_type __n1,
+                        const _CharT* __s, size_type __n2) {    
+    _STLP_FIX_LITERAL_BUG(__s)
+    _Base::replace(__pos, __n1, __s, __n2);
+    return *this;
+  }
+
+  _Self& replace(size_type __pos, size_type __n1,
+                        const _CharT* __s) {
+    _STLP_FIX_LITERAL_BUG(__s)
+    _Base::replace(__pos, __n1, __s);
+    return *this;
+  }
+
+  _Self& replace(size_type __pos, size_type __n1,
+                        size_type __n2, _CharT __c) {
+    _Base::replace(__pos, __n1, __n2, __c);
+    return *this;
+  }
+
+  _Self& replace(iterator __first, iterator __last, 
+                        const _Self& __s) { 
+    __check_if_owner(&_M_iter_list,__first);
+    __check_range(__first, __last);
+    _Base::replace(__first._M_iterator, __last._M_iterator,__s);
+    return *this;
+  }
+
+  _Self& replace(iterator __first, iterator __last,
+                        const _CharT* __s, size_type __n) { 
+    _STLP_FIX_LITERAL_BUG(__s)
+    __check_if_owner(&_M_iter_list,__first);
+    __check_range(__first, __last);
+    _Base::replace(__first._M_iterator, __last._M_iterator,__s, __n);
+    return *this;
+  }
+
+  _Self& replace(iterator __first, iterator __last,
+                        const _CharT* __s) {
+    _STLP_FIX_LITERAL_BUG(__s)
+    __check_if_owner(&_M_iter_list,__first);
+    __check_range(__first, __last);
+    _Base::replace(__first._M_iterator, __last._M_iterator,__s);
+    return *this;
+  }
+
+  _Self& replace(iterator __first, iterator __last, 
+		 size_type __n, _CharT __c) {
+    __check_if_owner(&_M_iter_list,__first);
+    __check_range(__first, __last);
+    _Base::replace(__first._M_iterator, __last._M_iterator, __n, __c);
+    return *this;
+  }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+  template <class _InputIter>
+  _Self& replace(iterator __first, iterator __last,
+                        _InputIter __f, _InputIter __l) {
+    __check_if_owner(&_M_iter_list, __first);
+    __check_range(__first, __last);
+    __check_range(__f, __l);
+    _Base::replace(__first._M_iterator, __last._M_iterator, __f, __l);
+    return *this;    
+  }
+#else /* _STLP_MEMBER_TEMPLATES */
+  _Self& replace(iterator __first, iterator __last,
+		 const _CharT* __f, const _CharT* __l) {
+    __check_if_owner(&_M_iter_list, __first);
+    __check_range(__first, __last);
+    __check_range(__f, __l);
+    _Base::replace(__first._M_iterator, __last._M_iterator, __f, __l);
+    return *this;    
+  }
+ 
+  _Self& replace(iterator __first, iterator __last,
+		 const_iterator __f, const_iterator __l) {
+    __check_if_owner(&_M_iter_list, __first);
+    __check_range(__first, __last);
+    __check_range(__f, __l);
+    _Base::replace(__first._M_iterator, __last._M_iterator, 
+		   __f._M_iterator, __l._M_iterator);
+    return *this; 
+  } 
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+public:                         // Other modifier member functions.
+
+  void swap(_Self& __s) {
+    _M_iter_list._Swap_owners(__s._M_iter_list);
+    _Base::swap(__s);
+  }
+};
+
+
+// This is a hook to instantiate STLport exports in a designated DLL
+# if defined (_STLP_USE_TEMPLATE_EXPORT)
+_STLP_EXPORT template class _STLP_CLASS_DECLSPEC basic_string<char, char_traits<char>, allocator<char> >;
+#  if defined (_STLP_HAS_WCHAR_T)
+_STLP_EXPORT template class _STLP_CLASS_DECLSPEC basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >;
+#  endif
+# endif /* _STLP_USE_TEMPLATE_EXPORT */
+
+
+// ------------------------------------------------------------
+// Non-member functions.
+
+template <class _CharT, class _Traits, class _Alloc>
+inline basic_string<_CharT,_Traits,_Alloc> _STLP_CALL
+operator+(const basic_string<_CharT,_Traits,_Alloc>& __s,
+          const basic_string<_CharT,_Traits,_Alloc>& __y)
+{
+  return basic_string<_CharT,_Traits,_Alloc>(*__s._Get_base() + *__y._Get_base());
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+inline basic_string<_CharT,_Traits,_Alloc> _STLP_CALL
+operator+(const _CharT* __s,
+          const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  return basic_string<_CharT,_Traits,_Alloc>(__s + *__y._Get_base());
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+inline basic_string<_CharT,_Traits,_Alloc> _STLP_CALL
+operator+(_CharT __c,
+          const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  return basic_string<_CharT,_Traits,_Alloc>(__c + *__y._Get_base());
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+inline basic_string<_CharT,_Traits,_Alloc> _STLP_CALL
+operator+(const basic_string<_CharT,_Traits,_Alloc>& __x,
+          const _CharT* __s) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  return basic_string<_CharT,_Traits,_Alloc>(*__x._Get_base()+ __s);
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+inline basic_string<_CharT,_Traits,_Alloc> _STLP_CALL
+operator+(const basic_string<_CharT,_Traits,_Alloc>& __x,
+          const _CharT __c) {
+  return basic_string<_CharT,_Traits,_Alloc>(*__x._Get_base() + __c);
+}
+
+#ifdef _STLP_EXTRA_OPERATORS_FOR_DEBUG
+
+// Operator== and operator!=
+
+template <class _CharT, class _Traits, class _Alloc>
+inline bool _STLP_CALL
+operator==(const basic_string<_CharT,_Traits,_Alloc>& __x,
+           const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  return (*__x._Get_base() == *__y._Get_base());
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+inline bool _STLP_CALL
+operator==(const _CharT* __s,
+           const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  return (__s == *__y._Get_base());
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+inline bool _STLP_CALL
+operator==(const basic_string<_CharT,_Traits,_Alloc>& __x,
+           const _CharT* __s) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  return (*__x._Get_base() == __s);
+}
+
+// Operator< (and also >, <=, and >=).
+
+template <class _CharT, class _Traits, class _Alloc>
+inline bool _STLP_CALL
+operator<(const basic_string<_CharT,_Traits,_Alloc>& __x,
+          const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  return (*__x._Get_base() < *__y._Get_base());
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+inline bool _STLP_CALL
+operator<(const _CharT* __s,
+          const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  return (__s < *__y._Get_base());    
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+inline bool _STLP_CALL
+operator<(const basic_string<_CharT,_Traits,_Alloc>& __x,
+          const _CharT* __s) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  return (*__x._Get_base() < __s);
+}
+
+#ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
+
+template <class _CharT, class _Traits, class _Alloc>
+inline bool _STLP_CALL
+operator!=(const basic_string<_CharT,_Traits,_Alloc>& __x,
+           const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  return !(__x == __y);
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+inline bool _STLP_CALL
+operator>(const basic_string<_CharT,_Traits,_Alloc>& __x,
+          const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  return __y < __x;
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+inline bool _STLP_CALL
+operator<=(const basic_string<_CharT,_Traits,_Alloc>& __x,
+           const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  return !(__y < __x);
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+inline bool _STLP_CALL
+operator>=(const basic_string<_CharT,_Traits,_Alloc>& __x,
+           const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  return !(__x < __y);
+}
+
+#endif /* _STLP_USE_SEPARATE_RELOPS_NAMESPACE */
+
+template <class _CharT, class _Traits, class _Alloc>
+inline bool _STLP_CALL
+operator!=(const _CharT* __s,
+           const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  return !(__s == __y);
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+inline bool _STLP_CALL
+operator!=(const basic_string<_CharT,_Traits,_Alloc>& __x,
+           const _CharT* __s) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  return !(__x == __s);
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+inline bool _STLP_CALL
+operator>(const _CharT* __s,
+          const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  return __y < __s;
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+inline bool _STLP_CALL
+operator>(const basic_string<_CharT,_Traits,_Alloc>& __x,
+          const _CharT* __s) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  return __s < __x;
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+inline bool _STLP_CALL
+operator<=(const _CharT* __s,
+           const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  return !(__y < __s);
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+inline bool _STLP_CALL
+operator<=(const basic_string<_CharT,_Traits,_Alloc>& __x,
+           const _CharT* __s) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  return !(__s < __x);
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+inline bool _STLP_CALL
+operator>=(const _CharT* __s,
+           const basic_string<_CharT,_Traits,_Alloc>& __y) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  return !(__s < __y);
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+inline bool _STLP_CALL
+operator>=(const basic_string<_CharT,_Traits,_Alloc>& __x,
+           const _CharT* __s) {
+  _STLP_FIX_LITERAL_BUG(__s)
+  return !(__x < __s);
+}
+#endif /*  if 0 */
+
+// Swap.
+#ifdef _STLP_FUNCTION_TMPL_PARTIAL_ORDER
+template <class _CharT, class _Traits, class _Alloc>
+inline void swap(basic_string<_CharT,_Traits,_Alloc>& __x,
+                 basic_string<_CharT,_Traits,_Alloc>& __y) {
+  __x.swap(__y);
+}
+#endif /* _STLP_FUNCTION_TMPL_PARTIAL_ORDER */
+
+// I/O.  
+
+#ifdef _STLP_EXTRA_OPERATORS_FOR_DEBUG
+#if defined (_STLP_USE_NEW_IOSTREAMS) && ! defined (_STLP_OWN_IOSTREAMS)
+
+template <class _CharT, class _Traits, class _Alloc>
+basic_ostream<_CharT, _Traits>& _STLP_CALL
+operator<<(basic_ostream<_CharT, _Traits>& __os, 
+           const basic_string<_CharT,_Traits,_Alloc>& __s) {
+  return __os << *__s._Get_base();
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+basic_istream<_CharT, _Traits>&  _STLP_CALL
+operator>>(basic_istream<_CharT, _Traits>& __is,
+           basic_string<_CharT,_Traits,_Alloc>& __s) {
+    return __is >> *__s._Get_base();
+}
+
+#elif ! defined ( _STLP_USE_NO_IOSTREAMS )
+
+template <class _CharT, class _Traits, class _Alloc>
+ostream& _STLP_CALL operator<<(ostream& __os, 
+                    const basic_string<_CharT,_Traits,_Alloc>& __s) {
+  return __os << *__s._Get_base();
+}
+
+template <class _CharT, class _Traits, class _Alloc>
+istream& _STLP_CALL operator>>(istream& __is, basic_string<_CharT,_Traits,_Alloc>& __s) {
+    return __is >> *__s._Get_base();
+}
+
+#endif /* _STLP_USE_NEW_IOSTREAMS */
+#endif /* if _STLP_EXTRA_OPERATORS_FOR_DEBUG */
+
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_DBG_STRING */
+
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/debug/_tree.h b/main/source/stlport/stlport/stl/debug/_tree.h
new file mode 100644
index 00000000..3ec12440
--- /dev/null
+++ b/main/source/stlport/stlport/stl/debug/_tree.h
@@ -0,0 +1,249 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_DBG_TREE_H
+#define _STLP_INTERNAL_DBG_TREE_H
+
+#include <stl/debug/_iterator.h>
+#include <stl/_function.h>
+#include <stl/_alloc.h>
+
+#  undef _DBG_Rb_tree
+#  define _DBG_Rb_tree _Rb_tree
+
+# define _STLP_DBG_TREE_SUPER __WORKAROUND_DBG_RENAME(Rb_tree) <_Key, _Value, _KeyOfValue, _Compare, _Alloc>
+
+_STLP_BEGIN_NAMESPACE
+
+# ifdef _STLP_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS
+template <class _Key, class _Value, class _KeyOfValue, class _Compare, class _Alloc >
+inline _Value*
+value_type(const  _DBG_iter_base< _STLP_DBG_TREE_SUPER >&) {
+  return (_Value*)0;
+}
+template <class _Key, class _Value, class _KeyOfValue, class _Compare, class _Alloc >
+inline bidirectional_iterator_tag
+iterator_category(const  _DBG_iter_base< _STLP_DBG_TREE_SUPER >&) {
+  return bidirectional_iterator_tag();
+}
+# endif
+
+template <class _Key, class _Value, class _KeyOfValue, class _Compare,
+          _STLP_DBG_ALLOCATOR_SELECT(_Value) >
+class _DBG_Rb_tree : public _STLP_DBG_TREE_SUPER {
+  typedef _STLP_DBG_TREE_SUPER _Base;
+  typedef _DBG_Rb_tree<_Key, _Value, _KeyOfValue, _Compare, _Alloc> _Self;
+protected:
+  friend class __owned_link;
+  mutable __owned_list _M_iter_list;
+
+public:
+  __IMPORT_CONTAINER_TYPEDEFS(_Base)
+    typedef typename _Base::key_type key_type;
+  
+  typedef _DBG_iter<_Base, _Nonconst_traits<value_type> > iterator;
+  typedef _DBG_iter<_Base, _Const_traits<value_type> > const_iterator;
+
+  _STLP_DECLARE_BIDIRECTIONAL_REVERSE_ITERATORS;
+
+protected:
+
+  //typedef typename _Base::key_param_type key_param_type;
+  //typedef typename _Base::val_param_type val_param_type;
+
+  void _Invalidate_all() {_M_iter_list._Invalidate_all();}
+
+  void _Invalidate_iterator(const iterator& __it) { 
+    __invalidate_iterator(&_M_iter_list,__it); 
+  }
+  void _Invalidate_iterators(const iterator& __first, const iterator& __last) {
+    iterator __cur = __first;
+    while (__cur != __last) __invalidate_iterator(&_M_iter_list, __cur++); 
+  }
+
+  const _Base* _Get_base() const { return (const _Base*)this; }
+  _Base* _Get_base() { return (_Base*)this; }
+
+public:
+  _DBG_Rb_tree() : _STLP_DBG_TREE_SUPER(), 
+    _M_iter_list(_Get_base()) {}
+  _DBG_Rb_tree(const _Compare& __comp) : 
+    _STLP_DBG_TREE_SUPER(__comp), _M_iter_list(_Get_base()) {}
+  _DBG_Rb_tree(const _Compare& __comp, const allocator_type& __a): 
+    _STLP_DBG_TREE_SUPER(__comp, __a), _M_iter_list(_Get_base()) {}
+  _DBG_Rb_tree(const _Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>& __x):
+    _STLP_DBG_TREE_SUPER(__x), _M_iter_list(_Get_base()) {}
+  ~_DBG_Rb_tree() { _Invalidate_all(); }
+
+  _Self& operator=(const _Self& __x) {
+    _Invalidate_all();
+    (_Base&)*this = (const _Base&)__x;
+    return *this;
+  }
+  
+  iterator begin() { return iterator(&_M_iter_list,_Base::begin()); }
+  const_iterator begin() const { return const_iterator(&_M_iter_list, _Base::begin()); }
+  iterator end() { return iterator(&_M_iter_list, _Base::end()); }
+  const_iterator end() const { return const_iterator(&_M_iter_list,_Base::end()); }
+
+public:
+  reverse_iterator rbegin() { return reverse_iterator(end()); }
+  const_reverse_iterator rbegin() const { 
+    return const_reverse_iterator(end()); 
+  }
+  reverse_iterator rend() { return reverse_iterator(begin()); }
+  const_reverse_iterator rend() const { 
+    return const_reverse_iterator(begin());
+  }
+  void swap(_Self& __t) {
+    _Base::swap(__t);
+    _M_iter_list._Swap_owners(__t._M_iter_list);
+  }
+    
+public:
+
+  iterator find(const key_type& __x) {
+    return iterator(&_M_iter_list, _Base::find(__x));    
+  }
+  const_iterator find(const key_type& __x) const {
+    return const_iterator(&_M_iter_list, _Base::find(__x));    
+  }
+
+  iterator lower_bound(const key_type& __x) {
+    return iterator(&_M_iter_list, _Base::lower_bound(__x));    
+  }
+  const_iterator lower_bound(const key_type& __x) const {
+    return const_iterator(&_M_iter_list, _Base::lower_bound(__x));    
+  }
+
+  iterator upper_bound(const key_type& __x) {
+    return iterator(&_M_iter_list, _Base::upper_bound(__x));    
+  }
+  const_iterator upper_bound(const key_type& __x) const {
+    return const_iterator(&_M_iter_list, _Base::upper_bound(__x));    
+  }
+
+  pair<iterator,iterator> equal_range(const key_type& __x) {
+    return pair<iterator, iterator>(iterator(&_M_iter_list, _Base::lower_bound(__x)),
+				    iterator(&_M_iter_list, _Base::upper_bound(__x)));
+  }
+  pair<const_iterator, const_iterator> equal_range(const key_type& __x) const {
+    return pair<const_iterator,const_iterator>(const_iterator(&_M_iter_list, _Base::lower_bound(__x)),
+					       const_iterator(&_M_iter_list, _Base::upper_bound(__x)));
+  }
+
+  pair<iterator,bool> insert_unique(const value_type& __x) {
+    _STLP_STD::pair<_STLP_HEADER_TYPENAME _Base::iterator, bool> __res = _Base::insert_unique(__x);
+    return pair<iterator,bool>( iterator(&_M_iter_list, __res.first), __res.second ) ;
+  }
+  iterator insert_equal(const value_type& __x) {
+    return iterator(&_M_iter_list, _Base::insert_equal(__x));
+  }
+
+  iterator insert_unique(iterator __position, const value_type& __x) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__position))
+    return iterator(&_M_iter_list, _Base::insert_unique(__position._M_iterator, __x));
+  }
+  iterator insert_equal(iterator __position, const value_type& __x) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__position))
+    return iterator(&_M_iter_list, _Base::insert_equal(__position._M_iterator, __x));
+  }
+
+#ifdef _STLP_MEMBER_TEMPLATES  
+  template<class _II>
+  void insert_equal(_II __first, _II __last) {
+    _Base::insert_equal(__first, __last);
+  }
+  template<class _II>
+  void insert_unique(_II __first, _II __last) {
+    _Base::insert_unique(__first, __last);
+  }
+#else /* _STLP_MEMBER_TEMPLATES */
+  void insert_unique(const_iterator __first, const_iterator __last) {
+    _Base::insert_unique(__first._M_iterator, __last._M_iterator);
+  }
+  void insert_unique(const value_type* __first, const value_type* __last) {
+    _Base::insert_unique(__first, __last);    
+  }
+  void insert_equal(const_iterator __first, const_iterator __last) {
+    _Base::insert_equal(__first._M_iterator, __last._M_iterator);
+  }
+  void insert_equal(const value_type* __first, const value_type* __last) {
+    _Base::insert_equal(__first, __last);
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  void erase(iterator __position) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list,__position))
+    _STLP_DEBUG_CHECK(_Dereferenceable(__position))
+    _Invalidate_iterator(__position);
+    _Base::erase(__position._M_iterator);
+  }
+  size_type erase(const key_type& __x) {
+    pair<iterator,iterator> __p = equal_range(__x);
+    size_type __n = distance(__p.first, __p.second);
+    _Invalidate_iterators(__p.first, __p.second);
+    _Base::erase(__p.first._M_iterator, __p.second._M_iterator);
+	return __n;
+  }
+
+  void erase(iterator __first, iterator __last) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __first)&&
+		      __check_if_owner(&_M_iter_list, __last))
+    _Invalidate_iterators(__first, __last);
+    _Base::erase(__first._M_iterator, __last._M_iterator);    
+  }
+  void erase(const key_type* __first, const key_type* __last) {
+    while (__first != __last) erase(*__first++);
+  }
+
+  void clear() {
+    _Invalidate_all();
+    _Base::clear();
+  }      
+};
+
+#define _STLP_TEMPLATE_HEADER template <class _Key, class _Value, class _KeyOfValue, class _Compare, class _Alloc>
+#define _STLP_TEMPLATE_CONTAINER _DBG_Rb_tree<_Key,_Value,_KeyOfValue,_Compare,_Alloc>
+#define _STLP_TEMPLATE_CONTAINER_BASE _STLP_DBG_TREE_SUPER
+#include <stl/debug/_relops_cont.h>
+#undef _STLP_TEMPLATE_CONTAINER_BASE
+#undef _STLP_TEMPLATE_CONTAINER
+#undef _STLP_TEMPLATE_HEADER
+         
+_STLP_END_NAMESPACE
+
+# undef  _STLP_DBG_TREE_SUPER
+
+#endif /* _STLP_INTERNAL_DBG_TREE_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/debug/_vector.h b/main/source/stlport/stlport/stl/debug/_vector.h
new file mode 100644
index 00000000..e73794e0
--- /dev/null
+++ b/main/source/stlport/stlport/stl/debug/_vector.h
@@ -0,0 +1,300 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_DBG_VECTOR_H
+#define _STLP_INTERNAL_DBG_VECTOR_H
+
+#include <stl/debug/_iterator.h>
+
+# ifndef _STLP_USE_WRAPPER_FOR_ALLOC_PARAM
+#  undef  _DBG_vector
+#  define _DBG_vector vector
+# endif
+
+#  define _STLP_DBG_VECTOR_BASE __WORKAROUND_DBG_RENAME(vector) <_Tp, _Alloc>
+
+_STLP_BEGIN_NAMESPACE
+
+# ifdef _STLP_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS
+template <class _Tp, class _Alloc>
+inline _Tp*
+value_type(const  _DBG_iter_base< _STLP_DBG_VECTOR_BASE >&) {
+  return (_Tp*)0;
+}
+template <class _Tp, class _Alloc>
+inline random_access_iterator_tag
+iterator_category(const  _DBG_iter_base< _STLP_DBG_VECTOR_BASE >&) {
+  return random_access_iterator_tag();
+}
+# endif
+
+template <class _Tp, class _NcIt>
+struct _Vector_nonconst_traits
+{
+	typedef _Nonconst_traits<_Tp> _BaseT;
+	typedef _Tp value_type;
+	typedef _Tp& reference;
+	typedef _Tp* pointer;
+	typedef _Vector_nonconst_traits<_Tp, _NcIt> _Non_const_traits;
+};
+
+template <class _Tp, class _NcIt>
+struct _Vector_const_traits
+{
+	typedef _Const_traits<_Tp> _BaseT;
+	typedef _Tp value_type;
+	typedef const _Tp& reference;
+	typedef const _Tp* pointer;
+	typedef _Vector_nonconst_traits<_Tp, _NcIt> _Non_const_traits;
+};
+
+_STLP_TEMPLATE_NULL
+struct _Vector_nonconst_traits<bool, _Bit_iterator>
+{
+	typedef _Bit_iterator::value_type value_type;
+	typedef _Bit_iterator::reference reference;
+	typedef _Bit_iterator::pointer pointer;
+	typedef _Vector_nonconst_traits<bool, _Bit_iterator> _Non_const_traits;
+};
+
+_STLP_TEMPLATE_NULL
+struct _Vector_const_traits<bool, _Bit_iterator>
+{
+	typedef _Bit_const_iterator::value_type value_type;
+	typedef _Bit_const_iterator::reference reference;
+	typedef _Bit_const_iterator::pointer pointer;
+	typedef _Vector_nonconst_traits<bool, _Bit_iterator> _Non_const_traits;
+};
+
+template <class _Tp, _STLP_DBG_ALLOCATOR_SELECT(_Tp) >
+class _DBG_vector : public  _STLP_DBG_VECTOR_BASE {
+private:
+  typedef _STLP_DBG_VECTOR_BASE _Base;
+  typedef _DBG_vector<_Tp, _Alloc> _Self;
+  mutable __owned_list _M_iter_list;
+
+public:
+
+  __IMPORT_CONTAINER_TYPEDEFS(_Base)
+
+  typedef _DBG_iter<_Base,
+      _Vector_nonconst_traits<value_type, typename _Base::iterator> > iterator;
+    
+  typedef _DBG_iter<_Base,
+      _Vector_const_traits<value_type, typename _Base::iterator> > const_iterator;
+
+  _STLP_DECLARE_RANDOM_ACCESS_REVERSE_ITERATORS;
+
+  iterator begin() { return iterator(&_M_iter_list, this->_M_start); }
+  const_iterator begin() const { return const_iterator(&_M_iter_list, this->_M_start); }
+  iterator end() { return iterator(&_M_iter_list, this->_M_finish); }
+  const_iterator end() const { return const_iterator(&_M_iter_list, this->_M_finish); }
+
+  reverse_iterator rbegin()
+    { return reverse_iterator(end()); }
+  const_reverse_iterator rbegin() const
+    { return const_reverse_iterator(end()); }
+  reverse_iterator rend()
+    { return reverse_iterator(begin()); }
+  const_reverse_iterator rend() const
+    { return const_reverse_iterator(begin()); }
+
+  reference operator[](size_type __n) {
+    _STLP_VERBOSE_ASSERT(__n < _Base::size(), _StlMsg_OUT_OF_BOUNDS)
+    return _Base::operator[](__n);
+  }
+
+  const_reference operator[](size_type __n) const {
+    _STLP_VERBOSE_ASSERT(__n < _Base::size(), _StlMsg_OUT_OF_BOUNDS)
+    return _Base::operator[](__n);
+  }
+
+  _Base* _Get_base() { return (_Base*)this; }
+  const _Base* _Get_base() const { return (const _Base*)this; }
+
+  explicit _DBG_vector(const allocator_type& __a = allocator_type())
+    : _STLP_DBG_VECTOR_BASE(__a), _M_iter_list((const _Base*)this)  {}
+
+  _DBG_vector(size_type __n, const _Tp& __value,
+         const allocator_type& __a = allocator_type()) 
+    : _STLP_DBG_VECTOR_BASE(__n, __value, __a), _M_iter_list((const _Base*)this) {}
+
+  explicit _DBG_vector(size_type __n)
+    : _STLP_DBG_VECTOR_BASE(__n), _M_iter_list((const _Base*)this) {}
+
+
+  _DBG_vector(const _Self& __x) 
+    : _STLP_DBG_VECTOR_BASE(__x), _M_iter_list((const _Base*)this) {}
+
+#if defined (_STLP_MEMBER_TEMPLATES)
+# ifdef _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS
+  template <class _InputIterator>
+  _DBG_vector(_InputIterator __first, _InputIterator __last):
+    _STLP_DBG_VECTOR_BASE(__first, __last), _M_iter_list((const _Base*)this) {}
+# endif
+  template <class _InputIterator>
+  _DBG_vector(_InputIterator __first, _InputIterator __last,
+         const allocator_type& __a _STLP_ALLOCATOR_TYPE_DFL) :
+    _STLP_DBG_VECTOR_BASE(__first, __last, __a), _M_iter_list((const _Base*)this) {}
+
+#else
+  _DBG_vector(const _Tp* __first, const _Tp* __last,
+         const allocator_type& __a = allocator_type())
+    : _STLP_DBG_VECTOR_BASE(__first, __last, __a), _M_iter_list((const _Base*)this) {}
+
+  // mysterious VC++ bug ?
+  _DBG_vector(const_iterator __first, const_iterator __last , 
+	      const allocator_type& __a = allocator_type())
+    : _STLP_DBG_VECTOR_BASE(__first._M_iterator, __last._M_iterator, __a),
+      _M_iter_list((const _Base*)this) { }
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  _Self& operator=(const _Self& __x) {
+    _M_iter_list._Invalidate_all();
+    (_Base&)*this = (const _Base&)__x;
+    return *this;
+  }
+
+  reference front() { return *begin(); }
+  const_reference front() const { return *begin(); }
+
+  reference back() {
+    iterator __tmp = end();
+    --__tmp;
+    return *__tmp;
+  }
+  const_reference back() const {
+    const_iterator __tmp = end();
+    --__tmp;
+    return *__tmp;
+  }
+
+  void swap(_Self& __x) {
+    _M_iter_list._Swap_owners(__x._M_iter_list);
+    _Base::swap((_Base&)__x);
+  }
+
+  iterator insert(iterator __position, const _Tp& __x) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __position))
+    if (this->size()+1 > this->capacity()) _M_iter_list._Invalidate_all();  
+    return iterator(&_M_iter_list, _Base::insert(__position._M_iterator, __x));
+  }
+
+  iterator insert(iterator __position) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __position))
+    if (this->size()+1 > this->capacity()) _M_iter_list._Invalidate_all();  
+    return iterator(&_M_iter_list, _Base::insert(__position._M_iterator));    
+  }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+  // Check whether it's an integral type.  If so, it's not an iterator.
+  template <class _InputIterator>
+  void insert(iterator __position, _InputIterator __first, _InputIterator __last) {
+    _STLP_DEBUG_CHECK(__check_range(__first,__last))
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __position))
+    size_type __n = distance(__first, __last);
+    if (this->size()+__n > this->capacity()) _M_iter_list._Invalidate_all();  
+    _Base::insert(__position._M_iterator, __first, __last);    
+  }
+#else /* _STLP_MEMBER_TEMPLATES */
+  void insert(iterator __position,
+              const_iterator __first, const_iterator __last) {
+    _STLP_DEBUG_CHECK(__check_range(__first,__last))
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __position))
+    size_type __n = distance(__first, __last);
+    if (this->size()+__n > this->capacity()) _M_iter_list._Invalidate_all();  
+    _Base::insert(__position._M_iterator,
+		  __first._M_iterator, __last._M_iterator);        
+  }
+
+  void insert (iterator __position, const_pointer __first, const_pointer __last) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __position))
+    _STLP_DEBUG_CHECK(__check_range(__first,__last))
+    size_type __n = distance(__first, __last);
+    if (this->size()+__n > this->capacity()) _M_iter_list._Invalidate_all();  
+    _Base::insert(__position._M_iterator, __first, __last);  
+}
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  void insert (iterator __position, size_type __n, const _Tp& __x){
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __position))
+    if (this->size()+__n > this->capacity()) _M_iter_list._Invalidate_all();  
+    _Base::insert(__position._M_iterator, __n, __x);
+  }
+  
+  void pop_back() {
+    _STLP_VERBOSE_ASSERT(!this->empty(), _StlMsg_EMPTY_CONTAINER)
+    __invalidate_iterator(&_M_iter_list,end());
+    _Base::pop_back();
+  }
+  iterator erase(iterator __position) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __position))
+    _STLP_VERBOSE_ASSERT(__position._M_iterator !=this->_M_finish,_StlMsg_ERASE_PAST_THE_END)
+    __invalidate_range(&_M_iter_list, __position+1, end());
+    return iterator(&_M_iter_list,_Base::erase(__position._M_iterator));
+  }
+  iterator erase(iterator __first, iterator __last) {
+    _STLP_DEBUG_CHECK(__check_range(__first,__last, begin(), end()))
+    __invalidate_range(&_M_iter_list, __first._M_iterator == this->_M_finish ? 
+		       __first : __first+1, end());
+    return iterator(&_M_iter_list, _Base::erase(__first._M_iterator, __last._M_iterator));
+  }
+  void clear() { 
+    _M_iter_list._Invalidate_all();
+    _Base::clear();
+  }
+  void push_back(const _Tp& __x) {
+    if (this->size()+1 > this->capacity()) _M_iter_list._Invalidate_all();
+    _Base::push_back(__x);
+  }
+};
+
+#define _STLP_TEMPLATE_HEADER template <class _Tp, class _Alloc>
+#define _STLP_TEMPLATE_CONTAINER _DBG_vector<_Tp, _Alloc>
+#define _STLP_TEMPLATE_CONTAINER_BASE _STLP_DBG_VECTOR_BASE
+#include <stl/debug/_relops_cont.h>
+#undef _STLP_TEMPLATE_CONTAINER_BASE
+#undef _STLP_TEMPLATE_CONTAINER
+#undef _STLP_TEMPLATE_HEADER
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT) 
+ _STLP_EXPORT_TEMPLATE_CLASS _DBG_vector <void*,allocator<void*> >;
+#  endif /* _STLP_USE_TEMPLATE_EXPORT */
+
+_STLP_END_NAMESPACE
+
+# undef _STLP_DBG_VECTOR_BASE
+# undef _DBG_vector
+
+#endif /* _STLP_DBG_VECTOR_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/msl_string.h b/main/source/stlport/stlport/stl/msl_string.h
new file mode 100644
index 00000000..c974919f
--- /dev/null
+++ b/main/source/stlport/stlport/stl/msl_string.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 1998
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn, Inc. makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ *
+ */
+#if defined( _STLP_USE_MSIPL ) && !defined( _STLP_MSL_STRING_H_ )
+#define _STLP_MSL_STRING_H_
+
+//# define char_traits __msl_char_traits
+# define basic_string __msl_basic_string
+# define b_str_ref __msl_b_str_ref
+# define basic_istream __msl_basic_istream
+# define basic_ostream __msl_basic_ostream
+# define string __msl_string
+# define wstring __msl_wstring
+# define iterator_traits __msl_iterator_traits
+
+namespace std
+{
+	template<class charT, class traits> class basic_istream;
+	template<class charT, class traits> class basic_ostream;
+}
+
+# include _STLP_NATIVE_HEADER(string)
+// # undef char_traits
+# undef basic_string
+# undef b_str_ref
+# undef basic_istream
+# undef basic_ostream
+# undef string
+# undef wstring
+# undef iterator_traits
+
+#endif
diff --git a/main/source/stlport/stlport/stl/type_traits.h b/main/source/stlport/stlport/stl/type_traits.h
new file mode 100644
index 00000000..a9d010cd
--- /dev/null
+++ b/main/source/stlport/stlport/stl/type_traits.h
@@ -0,0 +1,418 @@
+/*
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_TYPE_TRAITS_H
+#define _STLP_TYPE_TRAITS_H
+
+/*
+This header file provides a framework for allowing compile time dispatch
+based on type attributes. This is useful when writing template code.
+For example, when making a copy of an array of an unknown type, it helps
+to know if the type has a trivial copy constructor or not, to help decide
+if a memcpy can be used.
+
+The class template __type_traits provides a series of typedefs each of
+which is either __true_type or __false_type. The argument to
+__type_traits can be any type. The typedefs within this template will
+attain their correct values by one of these means:
+    1. The general instantiation contain conservative values which work
+       for all types.
+    2. Specializations may be declared to make distinctions between types.
+    3. Some compilers (such as the Silicon Graphics N32 and N64 compilers)
+       will automatically provide the appropriate specializations for all
+       types.
+
+EXAMPLE:
+
+//Copy an array of elements which have non-trivial copy constructors
+template <class T> void copy(T* source, T* destination, int n, __false_type);
+//Copy an array of elements which have trivial copy constructors. Use memcpy.
+template <class T> void copy(T* source, T* destination, int n, __true_type);
+
+//Copy an array of any type by using the most efficient copy mechanism
+template <class T> inline void copy(T* source,T* destination,int n) {
+   copy(source, destination, n,
+        typename __type_traits<T>::has_trivial_copy_constructor());
+}
+*/
+
+#ifdef __WATCOMC__
+# include <stl/_cwchar.h>
+#endif
+
+_STLP_BEGIN_NAMESPACE
+
+struct __true_type {};
+struct __false_type {};
+
+
+template <int _Is> struct __bool2type {
+  typedef __false_type _Ret; 
+};
+
+_STLP_TEMPLATE_NULL
+struct __bool2type<1> { typedef __true_type _Ret; };
+
+_STLP_TEMPLATE_NULL
+struct __bool2type<0> { typedef __false_type _Ret; };
+
+// logical end of 3 predicated
+template <class _P1, class _P2, class _P3>
+struct _Land3 {
+  typedef __false_type _Ret;
+};
+
+_STLP_TEMPLATE_NULL
+struct _Land3<__true_type, __true_type, __true_type> {
+  typedef __true_type _Ret;
+};
+
+
+// Forward declarations.
+template <class _Tp> struct __type_traits; 
+template <int _IsPOD> struct __type_traits_aux {
+   typedef __false_type    has_trivial_default_constructor;
+   typedef __false_type    has_trivial_copy_constructor;
+   typedef __false_type    has_trivial_assignment_operator;
+   typedef __false_type    has_trivial_destructor;
+   typedef __false_type    is_POD_type;
+};
+
+_STLP_TEMPLATE_NULL
+struct __type_traits_aux<0> {
+   typedef __false_type    has_trivial_default_constructor;
+   typedef __false_type    has_trivial_copy_constructor;
+   typedef __false_type    has_trivial_assignment_operator;
+   typedef __false_type    has_trivial_destructor;
+   typedef __false_type    is_POD_type;
+};
+
+_STLP_TEMPLATE_NULL
+struct __type_traits_aux<1> { 
+   typedef __true_type    has_trivial_default_constructor;
+   typedef __true_type    has_trivial_copy_constructor;
+   typedef __true_type    has_trivial_assignment_operator;
+   typedef __true_type    has_trivial_destructor;
+   typedef __true_type    is_POD_type;
+};
+
+# ifdef _STLP_SIMULATE_PARTIAL_SPEC_FOR_TYPE_TRAITS
+
+// Boris : simulation technique is used here according to Adobe Open Source License Version 1.0.
+// Copyright 2000 Adobe Systems Incorporated and others. All rights reserved.
+// Authors: Mat Marcus and Jesse Jones
+// The original version of this source code may be found at
+// http://opensource.adobe.com.
+
+struct _PointerShim {
+  // Since the compiler only allows at most one non-trivial
+  // implicit conversion we can make use of a shim class to
+  // be sure that IsPtr below doesn't accept classes with
+  // implicit pointer conversion operators
+  _PointerShim(const volatile void*); // no implementation
+};
+
+// These are the discriminating functions
+
+char _STLP_CALL _IsP(bool, _PointerShim); // no implementation is required
+char* _STLP_CALL _IsP(bool, ...);          // no implementation is required
+
+template <class _Tp>
+char _STLP_CALL _IsSameFun(bool, _Tp*, _Tp*); // no implementation is required
+char* _STLP_CALL _IsSameFun(bool, ...);          // no implementation is required
+
+template <class _Tp1, class _Tp2>
+struct _IsSame {
+  // boris : check!
+  static _Tp1* __null_rep1();
+  static _Tp2* __null_rep2();
+  enum { _Ret = (sizeof(_IsSameFun(false,__null_rep1(),__null_rep2())) == sizeof(char)) };
+};
+
+template <class _Tp>
+struct _IsPtr {
+  
+  // This template meta function takes a type T
+  // and returns true exactly when T is a pointer.
+  // One can imagine meta-functions discriminating on
+  // other criteria.
+  static _Tp& __null_rep();
+  enum { _Ret = (sizeof(_IsP(false,__null_rep())) == sizeof(char)) };
+
+};
+
+template <class _Tp>
+struct _IsPtrType {
+  enum { _Is =  _IsPtr<_Tp>::_Ret } ;
+  typedef __bool2type< _Is > _BT;
+  typedef typename _BT::_Ret _Type;
+  static _Type _Ret() { return _Type(); }
+};
+
+template <class _Tp1, class _Tp2>
+struct _BothPtrType {
+  typedef __bool2type< _IsPtr<_Tp1>::_Ret> _B1;
+  typedef __bool2type< _IsPtr<_Tp2>::_Ret> _B2;
+  typedef typename _B1::_Ret _Type1;
+  typedef typename _B2::_Ret _Type2;
+  typedef typename _Land3<_Type1, _Type2, __true_type>::_Ret _Type;
+  static _Type _Ret() { return _Type(); }
+};
+
+// we make general case dependant on the fact the type is actually a pointer.
+ 
+template <class _Tp>
+struct __type_traits : __type_traits_aux<_IsPtr<_Tp>::_Ret> {};
+
+# else
+
+template <class _Tp>
+struct __type_traits { 
+   typedef __true_type     this_dummy_member_must_be_first;
+                   /* Do not remove this member. It informs a compiler which
+                      automatically specializes __type_traits that this
+                      __type_traits template is special. It just makes sure that
+                      things work if an implementation is using a template
+                      called __type_traits for something unrelated. */
+
+   /* The following restrictions should be observed for the sake of
+      compilers which automatically produce type specific specializations 
+      of this class:
+          - You may reorder the members below if you wish
+          - You may remove any of the members below if you wish
+          - You must not rename members without making the corresponding
+            name change in the compiler
+          - Members you add will be treated like regular members unless
+            you add the appropriate support in the compiler. */
+   typedef __false_type    has_trivial_default_constructor;
+   typedef __false_type    has_trivial_copy_constructor;
+   typedef __false_type    has_trivial_assignment_operator;
+   typedef __false_type    has_trivial_destructor;
+   typedef __false_type    is_POD_type;
+};
+
+
+template <class _Tp>  struct _IsPtr { enum { _Ret = 0 }; };
+template <class _Tp>  struct _IsPtrType { 
+  static __false_type _Ret() { return __false_type();} 
+};
+template <class _Tp1, class _Tp2>  struct _BothPtrType { 
+  static __false_type _Ret() { return __false_type();} 
+};
+
+template <class _Tp1, class _Tp2>
+struct _IsSame { enum { _Ret = 0 }; };
+
+// template <class _Tp1, class _Tp2>
+// struct _IsSameType {   static __false_type _Ret() { return __false_type(); }  };
+
+#  ifdef _STLP_CLASS_PARTIAL_SPECIALIZATION
+template <class _Tp>  struct _IsPtr<_Tp*> { enum { _Ret = 1 }; };
+template <class _Tp>  struct _IsPtrType<_Tp*> { 
+  static __true_type _Ret() { return __true_type();} 
+};
+template <class _Tp1, class _Tp2>  struct _BothPtrType<_Tp1*, _Tp2*> { 
+  static __true_type _Ret() { return __true_type();} 
+};
+template <class _Tp>
+struct _IsSame<_Tp, _Tp> { enum { _Ret = 1 }; };
+#  endif
+
+# endif /* _STLP_SIMULATE_PARTIAL_SPEC_FOR_TYPE_TRAITS */
+
+// Provide some specializations.  This is harmless for compilers that
+//  have built-in __types_traits support, and essential for compilers
+//  that don't.
+#ifndef _STLP_NO_BOOL
+_STLP_TEMPLATE_NULL struct __type_traits<bool> : __type_traits_aux<1> {};
+#endif /* _STLP_NO_BOOL */
+_STLP_TEMPLATE_NULL struct __type_traits<char> : __type_traits_aux<1> {};
+#ifndef _STLP_NO_SIGNED_BUILTINS
+_STLP_TEMPLATE_NULL struct __type_traits<signed char> : __type_traits_aux<1> {};
+# endif
+_STLP_TEMPLATE_NULL struct __type_traits<unsigned char> : __type_traits_aux<1> {};
+#if defined ( _STLP_HAS_WCHAR_T ) && ! defined (_STLP_WCHAR_T_IS_USHORT)
+_STLP_TEMPLATE_NULL struct __type_traits<wchar_t> : __type_traits_aux<1> {};
+#endif /* _STLP_HAS_WCHAR_T */
+
+_STLP_TEMPLATE_NULL struct __type_traits<short> : __type_traits_aux<1> {};
+_STLP_TEMPLATE_NULL struct __type_traits<unsigned short> : __type_traits_aux<1> {};
+_STLP_TEMPLATE_NULL struct __type_traits<int> : __type_traits_aux<1> {};
+_STLP_TEMPLATE_NULL struct __type_traits<unsigned int> : __type_traits_aux<1> {};
+_STLP_TEMPLATE_NULL struct __type_traits<long> : __type_traits_aux<1> {};
+_STLP_TEMPLATE_NULL struct __type_traits<unsigned long> : __type_traits_aux<1> {};
+
+#ifdef _STLP_LONG_LONG
+_STLP_TEMPLATE_NULL struct __type_traits<_STLP_LONG_LONG> : __type_traits_aux<1> {};
+_STLP_TEMPLATE_NULL struct __type_traits<unsigned _STLP_LONG_LONG> : __type_traits_aux<1> {};
+#endif /* _STLP_LONG_LONG */
+
+_STLP_TEMPLATE_NULL struct __type_traits<float> : __type_traits_aux<1> {};
+_STLP_TEMPLATE_NULL struct __type_traits<double> : __type_traits_aux<1> {};
+
+# if !defined ( _STLP_NO_LONG_DOUBLE )
+_STLP_TEMPLATE_NULL struct __type_traits<long double> : __type_traits_aux<1> {};
+# endif
+
+#ifdef _STLP_CLASS_PARTIAL_SPECIALIZATION
+template <class _Tp> struct __type_traits<_Tp*> : __type_traits_aux<1> {};
+#endif
+
+// The following could be written in terms of numeric_limits.  
+// We're doing it separately to reduce the number of dependencies.
+
+template <class _Tp> struct _Is_integer {
+  typedef __false_type _Integral;
+};
+
+#ifndef _STLP_NO_BOOL
+
+_STLP_TEMPLATE_NULL struct _Is_integer<bool> {
+  typedef __true_type _Integral;
+};
+
+#endif /* _STLP_NO_BOOL */
+
+_STLP_TEMPLATE_NULL struct _Is_integer<char> {
+  typedef __true_type _Integral;
+};
+
+#ifndef _STLP_NO_SIGNED_BUILTINS
+
+_STLP_TEMPLATE_NULL struct _Is_integer<signed char> {
+  typedef __true_type _Integral;
+};
+#endif
+
+_STLP_TEMPLATE_NULL struct _Is_integer<unsigned char> {
+  typedef __true_type _Integral;
+};
+
+#if defined ( _STLP_HAS_WCHAR_T ) && ! defined (_STLP_WCHAR_T_IS_USHORT)
+
+_STLP_TEMPLATE_NULL struct _Is_integer<wchar_t> {
+  typedef __true_type _Integral;
+};
+
+#endif /* _STLP_HAS_WCHAR_T */
+
+_STLP_TEMPLATE_NULL struct _Is_integer<short> {
+  typedef __true_type _Integral;
+};
+
+_STLP_TEMPLATE_NULL struct _Is_integer<unsigned short> {
+  typedef __true_type _Integral;
+};
+
+_STLP_TEMPLATE_NULL struct _Is_integer<int> {
+  typedef __true_type _Integral;
+};
+
+_STLP_TEMPLATE_NULL struct _Is_integer<unsigned int> {
+  typedef __true_type _Integral;
+};
+
+_STLP_TEMPLATE_NULL struct _Is_integer<long> {
+  typedef __true_type _Integral;
+};
+
+_STLP_TEMPLATE_NULL struct _Is_integer<unsigned long> {
+  typedef __true_type _Integral;
+};
+
+#ifdef _STLP_LONG_LONG
+
+_STLP_TEMPLATE_NULL struct _Is_integer<_STLP_LONG_LONG> {
+  typedef __true_type _Integral;
+};
+
+_STLP_TEMPLATE_NULL struct _Is_integer<unsigned _STLP_LONG_LONG> {
+  typedef __true_type _Integral;
+};
+
+#endif /* _STLP_LONG_LONG */
+
+template <class _Tp1, class _Tp2>
+struct _OKToMemCpy {
+  enum { _Same = _IsSame<_Tp1,_Tp2>::_Ret } ;
+  typedef typename __type_traits<_Tp1>::has_trivial_assignment_operator _Tr1;
+  typedef typename __type_traits<_Tp2>::has_trivial_assignment_operator _Tr2;
+  typedef typename __bool2type< _Same >::_Ret _Tr3;
+  typedef typename _Land3<_Tr1, _Tr2, _Tr3>::_Ret _Type;
+  static _Type _Ret() { return _Type(); }
+};
+
+template <class _Tp1, class _Tp2>
+inline _OKToMemCpy<_Tp1, _Tp2> _IsOKToMemCpy(_Tp1*, _Tp2*)  {
+  return _OKToMemCpy<_Tp1, _Tp2>();
+}
+
+template <class _Tp> 
+struct _IsPOD {
+  typedef typename __type_traits<_Tp>::is_POD_type _Type;
+  static _Type _Ret() { return _Type(); }
+};
+
+template <class _Tp> 
+inline _IsPOD<_Tp>  _Is_POD (_Tp*) { return _IsPOD<_Tp>(); } 
+
+#  ifdef _STLP_CLASS_PARTIAL_SPECIALIZATION
+#   if defined (__BORLANDC__) || defined (__SUNPRO_CC) || ( defined (__MWERKS__) && (__MWERKS__ <= 0x2303)) || ( defined (__sgi) && defined (_COMPILER_VERSION)) || defined (__DMC__)
+#   define _IS_POD_ITER(_It, _Tp) __type_traits< typename iterator_traits< _Tp >::value_type >::is_POD_type()
+#   else
+#   define _IS_POD_ITER(_It, _Tp) typename __type_traits< typename iterator_traits< _Tp >::value_type >::is_POD_type()
+#   endif
+#  else
+#   define _IS_POD_ITER(_It, _Tp) _Is_POD( _STLP_VALUE_TYPE( _It, _Tp ) )._Ret()
+#  endif
+
+# ifdef _STLP_DEFAULT_CONSTRUCTOR_BUG
+// Those adaptors are here to fix common compiler bug regarding builtins:
+// expressions like int k = int() should initialize k to 0
+template <class _Tp>
+inline _Tp __default_constructed_aux(_Tp*, const __false_type&) {
+  return _Tp();
+}
+template <class _Tp>
+inline _Tp __default_constructed_aux(_Tp*, const __true_type&) {
+  return _Tp(0);
+}
+
+template <class _Tp>
+inline _Tp __default_constructed(_Tp* __p) {
+  typedef typename _Is_integer<_Tp>::_Integral _Is_Integral;
+  return __default_constructed_aux(__p, _Is_Integral());
+}
+
+#  define _STLP_DEFAULT_CONSTRUCTED(_TTp) __default_constructed((_TTp*)0)
+# else
+#  define _STLP_DEFAULT_CONSTRUCTED(_TTp) _TTp()
+# endif
+
+_STLP_END_NAMESPACE
+
+#endif /* __TYPE_TRAITS_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/stl/wrappers/_deque.h b/main/source/stlport/stlport/stl/wrappers/_deque.h
new file mode 100644
index 00000000..84f08e6d
--- /dev/null
+++ b/main/source/stlport/stlport/stl/wrappers/_deque.h
@@ -0,0 +1,76 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_INTERNAL_DEQUE_H
+# include <stl/_deque.h>
+#endif
+
+# if defined (_STLP_DEBUG)
+#  define _DEQUE_SUPER_NAME _DBG_deque
+# else
+#  define _DEQUE_SUPER_NAME __deque__
+# endif
+
+# define _DEQUE_SUPER   _DEQUE_SUPER_NAME<_Tp, _STLP_DEFAULT_ALLOCATOR(_Tp) >
+
+_STLP_BEGIN_NAMESPACE
+
+// provide a "default" deque adaptor
+template <class _Tp>
+class deque : public _DEQUE_SUPER {
+public:
+  typedef deque<_Tp> _Self;
+  typedef _DEQUE_SUPER _Super;
+  __IMPORT_WITH_REVERSE_ITERATORS(_Super)
+    __IMPORT_SUPER_COPY_ASSIGNMENT(deque, _Self, _DEQUE_SUPER)
+    deque() : _DEQUE_SUPER() { }
+  deque(size_type __n, const _Tp& __value) : _DEQUE_SUPER(__n, __value) { }
+  explicit deque(size_type __n) : _DEQUE_SUPER(__n) { }
+  deque(const _Tp* __first, const _Tp* __last) : _DEQUE_SUPER(__first, __last) { }
+  deque(const_iterator __first, const_iterator __last) : _DEQUE_SUPER(__first, __last) { }
+  ~deque() { }
+};
+
+#  if defined (_STLP_BASE_MATCH_BUG)
+template <class _Tp>
+inline bool 
+operator==(const deque<_Tp>& __x, const deque<_Tp>& __y) {
+    return __x.size() == __y.size() && equal(__x.begin(), __x.end(), __y.begin());
+}
+
+template <class _Tp>
+inline bool 
+operator<(const deque<_Tp>& __x, const deque<_Tp>& __y) {
+    return lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());
+}
+#  endif /* BASE_MATCH_BUG */
+
+# undef _DEQUE_SUPER
+
+_STLP_END_NAMESPACE  
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/wrappers/_hash_map.h b/main/source/stlport/stlport/stl/wrappers/_hash_map.h
new file mode 100644
index 00000000..ccf6af93
--- /dev/null
+++ b/main/source/stlport/stlport/stl/wrappers/_hash_map.h
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 1999, 2000
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_WRAP_HASH_MAP_H
+#define _STLP_INTERNAL_WRAP_HASH_MAP_H
+
+#ifndef _STLP_INTERNAL_HASH_MAP_H
+# include <stl/_hash_map.h>
+#endif
+
+# ifdef _STLP_USE_NAMESPACES
+namespace STLPORT { 
+# endif
+
+// provide a "default" hash_map adaptor
+#  if defined (_STLP_MINIMUM_DEFAULT_TEMPLATE_PARAMS)
+#   define __HM_TEMPLATE_HEADER  template <class _Key, class _Tp>
+#   define __HM_ARGUMENTS        _Key, _Tp
+#   define __HM_BASE_ARGUMENTS   _Key, _Tp, hash<_Key>, equal_to<_Key>, _STLP_DEFAULT_PAIR_ALLOCATOR(const _Key, _Tp)
+#  else
+#   define __HM_TEMPLATE_HEADER  template <class _Key, class _Tp, class _HashFcn, class _EqualKey >
+#   define __HM_ARGUMENTS        _Key, _Tp, _HashFcn, _EqualKey
+#   define __HM_BASE_ARGUMENTS   _Key, _Tp, _HashFcn, _EqualKey, _STLP_DEFAULT_PAIR_ALLOCATOR(const _Key, _Tp)
+#  endif
+
+
+# define __HM_SUPER  __hash_map< __HM_BASE_ARGUMENTS >
+# define __HMM_SUPER __hash_multimap< __HM_BASE_ARGUMENTS >
+
+__HM_TEMPLATE_HEADER
+class hash_map : public __HM_SUPER
+{
+  typedef hash_map< __HM_ARGUMENTS > _Self;
+public:
+  typedef __HM_SUPER _Super;
+  __IMPORT_WITH_ITERATORS(_Super)
+  typedef typename _Super::key_type key_type;
+  typedef typename _Super::hasher hasher;
+  typedef typename _Super::key_equal key_equal;
+  typedef _Tp data_type;
+  hash_map() {}
+  hash_map(size_type __n) : __HM_SUPER(__n) {}
+  hash_map(size_type __n, const hasher& __hf) : __HM_SUPER(__n, __hf) {}
+  hash_map(size_type __n, const hasher& __hf, const key_equal& __eql): __HM_SUPER(__n, __hf, __eql) {}
+  hash_map(const value_type* __f, const value_type* __l) : __HM_SUPER(__f,__l) {}
+  hash_map(const value_type* __f, const value_type* __l, size_type __n): __HM_SUPER(__f,__l,__n) {}
+  hash_map(const value_type* __f, const value_type* __l, size_type __n, 
+           const hasher& __hf) : __HM_SUPER(__f,__l,__n,__hf) {}
+  hash_map(const value_type* __f, const value_type* __l, size_type __n,
+           const hasher& __hf, const key_equal& __eql) : __HM_SUPER(__f,__l,__n,__hf, __eql) {}
+  hash_map(const_iterator __f, const_iterator __l) : __HM_SUPER(__f,__l) { }
+  hash_map(const_iterator __f, const_iterator __l, size_type __n) : __HM_SUPER(__f,__l,__n) { }
+  hash_map(const_iterator __f, const_iterator __l, size_type __n,
+           const hasher& __hf) : __HM_SUPER(__f, __l, __n, __hf) { }
+  hash_map(const_iterator __f, const_iterator __l, size_type __n,
+           const hasher& __hf, const key_equal& __eql) : __HM_SUPER(__f, __l, __n, __hf, __eql) { }
+# if defined (_STLP_BASE_MATCH_BUG)
+  friend inline bool operator== _STLP_NULL_TMPL_ARGS (const _Self& __hm1, const _Self& __hm2);
+# endif
+};
+
+
+# if defined (_STLP_BASE_MATCH_BUG)
+__HM_TEMPLATE_HEADER
+inline bool operator==(const hash_map< __HM_ARGUMENTS >& __hm1, 
+                       const hash_map< __HM_ARGUMENTS >& __hm2)
+{
+    typedef __HM_SUPER _Super;
+    return (const _Super&)__hm1 == (const _Super&)__hm2; 
+}
+# endif
+
+// provide a "default" hash_multimap adaptor
+__HM_TEMPLATE_HEADER
+class hash_multimap : public __HMM_SUPER
+{
+  typedef hash_multimap< __HM_ARGUMENTS > _Self;
+public:
+  typedef __HMM_SUPER _Super;
+  __IMPORT_WITH_ITERATORS(_Super)
+  typedef typename _Super::key_type key_type;
+  typedef typename _Super::hasher hasher;
+  typedef typename _Super::key_equal key_equal;
+  typedef _Tp data_type;
+  hash_multimap() {}
+  hash_multimap(size_type __n) : __HMM_SUPER(__n) {}
+  hash_multimap(size_type __n, const hasher& __hf) : __HMM_SUPER(__n, __hf) {}
+  hash_multimap(size_type __n, const hasher& __hf, const key_equal& __eql): __HMM_SUPER(__n, __hf, __eql) {}
+  hash_multimap(const value_type* __f, const value_type* __l) : __HMM_SUPER(__f,__l) {}
+  hash_multimap(const value_type* __f, const value_type* __l, size_type __n): __HMM_SUPER(__f,__l,__n) {}
+  hash_multimap(const value_type* __f, const value_type* __l, size_type __n, 
+           const hasher& __hf) : __HMM_SUPER(__f,__l,__n,__hf) {}
+  hash_multimap(const value_type* __f, const value_type* __l, size_type __n,
+           const hasher& __hf, const key_equal& __eql) : __HMM_SUPER(__f,__l,__n,__hf, __eql) {}
+
+  hash_multimap(const_iterator __f, const_iterator __l) : __HMM_SUPER(__f,__l) { }
+  hash_multimap(const_iterator __f, const_iterator __l, size_type __n) : __HMM_SUPER(__f,__l,__n) { }
+  hash_multimap(const_iterator __f, const_iterator __l, size_type __n,
+           const hasher& __hf) : __HMM_SUPER(__f, __l, __n, __hf) { }
+  hash_multimap(const_iterator __f, const_iterator __l, size_type __n,
+           const hasher& __hf, const key_equal& __eql) : __HMM_SUPER(__f, __l, __n, __hf, __eql) { }
+# if defined (_STLP_BASE_MATCH_BUG)
+  friend inline bool operator== _STLP_NULL_TMPL_ARGS (const _Self& __hm1, const _Self& __hm2);
+# endif
+};
+
+# if defined (_STLP_BASE_MATCH_BUG)
+__HM_TEMPLATE_HEADER
+inline bool operator==(const hash_multimap< __HM_ARGUMENTS >& __hm1, 
+                       const hash_multimap< __HM_ARGUMENTS >& __hm2)
+{
+    typedef __HMM_SUPER _Super;
+    return (const _Super&)__hm1 == (const _Super&)__hm2; 
+}
+# endif
+
+# undef __HM_SUPER
+# undef __HMM_SUPER
+# undef __HM_TEMPLATE_HEADER
+# undef __HM_ARGUMENTS
+# undef __HM_BASE_ARGUMENTS
+
+# ifdef _STLP_USE_NAMESPACES
+} /* namespace STLPORT */
+# endif
+
+#endif /* _STLP_INTERNAL_HASH_SET_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/wrappers/_hash_set.h b/main/source/stlport/stlport/stl/wrappers/_hash_set.h
new file mode 100644
index 00000000..420ca1f2
--- /dev/null
+++ b/main/source/stlport/stlport/stl/wrappers/_hash_set.h
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 1999, 2000
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_WRAP_HASH_SET_H
+#define _STLP_INTERNAL_WRAP_HASH_SET_H
+
+#ifndef _STLP_INTERNAL_HASH_SET_H
+# include <stl/_hash_set.h>
+#endif
+
+# ifdef _STLP_USE_NAMESPACES
+namespace STLPORT { 
+# endif
+
+#  if defined (_STLP_MINIMUM_DEFAULT_TEMPLATE_PARAMS)
+#   define __HS_TEMPLATE_HEADER  template <class _Value>
+#   define __HS_ARGUMENTS        _Value
+#   define __HS_BASE_ARGUMENTS   _Value, hash<_Value>, equal_to<_Value>, _STLP_DEFAULT_ALLOCATOR(_Value)
+#  else
+#   define __HS_TEMPLATE_HEADER  template <class _Value, class _HashFcn, class _EqualKey >
+#   define __HS_ARGUMENTS        _Value, _HashFcn, _EqualKey
+#   define __HS_BASE_ARGUMENTS   _Value, _HashFcn, _EqualKey, _STLP_DEFAULT_ALLOCATOR(_Value)
+#  endif
+
+
+#  define __HS_SUPER  __hash_set< __HS_BASE_ARGUMENTS >
+#  define __HMS_SUPER __hash_multiset< __HS_BASE_ARGUMENTS >
+
+
+// provide a "default" hash_set adaptor
+__HS_TEMPLATE_HEADER
+class hash_set : public __HS_SUPER 
+{
+  typedef hash_set< __HS_ARGUMENTS > _Self;
+public:
+  typedef  __HS_SUPER _Super;
+  __IMPORT_WITH_ITERATORS(_Super)
+  typedef typename _Super::key_type key_type;
+  typedef typename _Super::hasher hasher;
+  typedef typename _Super::key_equal key_equal;
+  hash_set() {}
+  hash_set(size_type n) : __HS_SUPER(n) {}
+  hash_set(size_type n, const hasher& hf) : __HS_SUPER(n, hf) {}
+  hash_set(size_type n, const hasher& hf, const key_equal& eql): __HS_SUPER(n, hf, eql) {}
+
+  hash_set(const value_type* f, const value_type* l) : __HS_SUPER(f,l) {}
+  hash_set(const value_type* f, const value_type* l, size_type n): __HS_SUPER(f,l,n) {}
+  hash_set(const value_type* f, const value_type* l, size_type n,
+           const hasher& hf) : __HS_SUPER(f,l,n,hf) {}
+  hash_set(const value_type* f, const value_type* l, size_type n,
+           const hasher& hf, const key_equal& eql) : __HS_SUPER(f,l,n,hf, eql) {}
+
+  hash_set(const_iterator f, const_iterator l) : __HS_SUPER(f,l) { }
+  hash_set(const_iterator f, const_iterator l, size_type n) : __HS_SUPER(f,l,n) { }
+  hash_set(const_iterator f, const_iterator l, size_type n,
+           const hasher& hf) : __HS_SUPER(f, l, n, hf) { }
+  hash_set(const_iterator f, const_iterator l, size_type n,
+           const hasher& hf, const key_equal& eql) : __HS_SUPER(f, l, n, hf, eql) { }
+# if defined (_STLP_BASE_MATCH_BUG)
+    friend inline bool operator== _STLP_NULL_TMPL_ARGS (const _Self& hs1, const _Self& hs2);
+# endif
+};
+
+# if defined (_STLP_BASE_MATCH_BUG)
+__HS_TEMPLATE_HEADER
+inline bool operator==(const hash_set< __HS_ARGUMENTS >& hs1, 
+                       const hash_set< __HS_ARGUMENTS >& hs2)
+{
+    typedef __HS_SUPER _Super;
+    return (const _Super&)hs1 == (const _Super&)hs2; 
+}
+# endif
+
+// provide a "default" hash_multiset adaptor
+__HS_TEMPLATE_HEADER
+class hash_multiset : public __HMS_SUPER
+{
+  typedef hash_multiset< __HS_ARGUMENTS > _Self;
+public:
+  typedef __HMS_SUPER _Super;
+  __IMPORT_WITH_ITERATORS(_Super)
+  typedef typename _Super::key_type key_type;
+  typedef typename _Super::hasher hasher;
+  typedef typename _Super::key_equal key_equal;
+
+  hash_multiset() {}
+  hash_multiset(size_type __n) : __HMS_SUPER(__n) {}
+  hash_multiset(size_type __n, const hasher& __hf) : __HMS_SUPER(__n, __hf) {}
+  hash_multiset(size_type __n, const hasher& __hf, const key_equal& __eql): __HMS_SUPER(__n, __hf, __eql) {}
+
+  hash_multiset(const value_type* __f, const value_type* __l) : __HMS_SUPER(__f,__l) {}
+  hash_multiset(const value_type* __f, const value_type* __l, size_type __n): __HMS_SUPER(__f,__l,__n) {}
+  hash_multiset(const value_type* __f, const value_type* __l, size_type __n,
+           const hasher& __hf) : __HMS_SUPER(__f,__l,__n,__hf) {}
+  hash_multiset(const value_type* __f, const value_type* __l, size_type __n,
+           const hasher& __hf, const key_equal& __eql) : __HMS_SUPER(__f,__l,__n,__hf, __eql) {}
+
+  hash_multiset(const_iterator __f, const_iterator __l) : __HMS_SUPER(__f,__l) { }
+  hash_multiset(const_iterator __f, const_iterator __l, size_type __n) : __HMS_SUPER(__f,__l,__n) { }
+  hash_multiset(const_iterator __f, const_iterator __l, size_type __n,
+           const hasher& __hf) : __HMS_SUPER(__f, __l, __n, __hf) { }
+  hash_multiset(const_iterator __f, const_iterator __l, size_type __n,
+           const hasher& __hf, const key_equal& __eql) : __HMS_SUPER(__f, __l, __n, __hf, __eql) { }
+# if defined (_STLP_BASE_MATCH_BUG)
+  friend inline bool operator== _STLP_NULL_TMPL_ARGS (const _Self& __hs1, const _Self& __hs2);
+# endif
+};
+
+# if defined (_STLP_BASE_MATCH_BUG)
+__HS_TEMPLATE_HEADER
+inline bool operator==(const hash_multiset< __HS_ARGUMENTS >& __hs1, 
+                       const hash_multiset< __HS_ARGUMENTS >& __hs2)
+{
+    typedef __HMS_SUPER  __s;
+    return _STLP_STD::operator==((const __s&)__hs1,(const __s&)__hs2);
+}
+# endif
+
+
+# undef __HS_SUPER
+# undef __HMS_SUPER
+# undef __HS_ARGUMENTS
+# undef __HS_BASE_ARGUMENTS
+# undef __HS_TEMPLATE_HEADER
+
+# ifdef _STLP_USE_NAMESPACES
+} /* namespace STLPORT */
+# endif
+
+#endif /* _STLP_INTERNAL_HASH_SET_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/wrappers/_list.h b/main/source/stlport/stlport/stl/wrappers/_list.h
new file mode 100644
index 00000000..9b7aaf99
--- /dev/null
+++ b/main/source/stlport/stlport/stl/wrappers/_list.h
@@ -0,0 +1,86 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_WRAP_LIST_H
+#define _STLP_INTERNAL_WRAP_LIST_H
+
+#ifndef _STLP_INTERNAL_LIST_H
+# include <stl/_list.h>
+#endif
+
+# ifdef _STLP_USE_NAMESPACES
+namespace STLPORT { 
+# endif
+
+# if defined (_STLP_DEBUG)
+#  define __LIST_SUPER _DBG_list<_Tp, _STLP_DEFAULT_ALLOCATOR(_Tp) >
+# else
+#  define __LIST_SUPER __list__<_Tp, _STLP_DEFAULT_ALLOCATOR(_Tp) >
+# endif
+
+
+// provide a "default" list adaptor
+template <class _Tp>
+class list : public __LIST_SUPER
+{
+public:
+    typedef __LIST_SUPER _Super;
+    __IMPORT_WITH_REVERSE_ITERATORS(_Super)
+    __IMPORT_SUPER_COPY_ASSIGNMENT(list, list<_Tp>, __LIST_SUPER)
+    list() { }
+    explicit list(size_type __n, const _Tp& __value) : __LIST_SUPER(__n, __value) { }
+    explicit list(size_type __n) :  __LIST_SUPER(__n) { } 
+    list(const _Tp* __first, const _Tp* __last) : __LIST_SUPER(__first, __last) { } 
+    list(const_iterator __first, const_iterator __last) : __LIST_SUPER(__first, __last) { }
+# undef __LIST_SUPER
+};
+
+#  if defined (_STLP_BASE_MATCH_BUG)
+template <class _Tp>
+inline bool operator==(const list<_Tp>& __x, const list<_Tp>& __y) {
+    typedef typename list<_Tp>::_Super _Super;
+    return operator == ((const _Super&)__x,(const _Super&)__y);
+}
+
+template <class _Tp>
+inline bool operator<(const list<_Tp>& __x, const list<_Tp>& __y) {
+  return lexicographical_compare(__x.begin(), __x.end(),
+                                 __y.begin(), __y.end());
+}
+#  endif
+
+# ifdef _STLP_USE_NAMESPACES
+} /* namespace STLPORT */
+# endif
+
+#endif /* _STLP_INTERNAL_LIST_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/wrappers/_map.h b/main/source/stlport/stlport/stl/wrappers/_map.h
new file mode 100644
index 00000000..965714c8
--- /dev/null
+++ b/main/source/stlport/stlport/stl/wrappers/_map.h
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 1999, 2000
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_WRAP_MAP_H
+#define _STLP_INTERNAL_WRAP_MAP_H
+
+#ifndef _STLP_INTERNAL_MAP_H
+# include <stl/_map.h>
+#endif
+
+# ifdef _STLP_USE_NAMESPACES
+namespace STLPORT { 
+# endif
+
+#  if defined (_STLP_MINIMUM_DEFAULT_TEMPLATE_PARAMS)
+#   define __MAP_TEMPLATE_HEADER  template <class _Key, class _Tp>
+#   define __MAP_ARGUMENTS        _Key, _Tp
+#   define __MMAP_TEMPLATE_HEADER  template <class _Key, class _Tp>
+#   define __MMAP_ARGUMENTS        _Key, _Tp
+#   define _Compare less<_Key>
+#  else
+#   define __MAP_TEMPLATE_HEADER  template <class _Key, class _Tp, class _Compare >
+#   define __MAP_ARGUMENTS        _Key, _Tp, _Compare
+#   define __MMAP_TEMPLATE_HEADER  template <class _Key, class _Tp, class _Compare >
+#   define __MMAP_ARGUMENTS        _Key, _Tp, _Compare
+#  endif
+
+
+#  define __MAP_SUPER  __map< _Key, _Tp, _Compare, _STLP_DEFAULT_PAIR_ALLOCATOR(const _Key, _Tp) >
+#  define __MMAP_SUPER  __multimap< _Key, _Tp, _Compare, _STLP_DEFAULT_PAIR_ALLOCATOR(const _Key, _Tp) >
+
+// provide a "default" map adaptor
+__MAP_TEMPLATE_HEADER
+class map : public __MAP_SUPER
+{
+  typedef map< __MAP_ARGUMENTS > _Self;
+public:
+    typedef __MAP_SUPER _Super;
+    __IMPORT_WITH_REVERSE_ITERATORS(_Super)
+    __IMPORT_SUPER_COPY_ASSIGNMENT(map, _Self, __MAP_SUPER)
+    map() : __MAP_SUPER(_Compare()) {}
+    explicit map(const _Compare& __comp) : __MAP_SUPER(__comp) {}
+    map(const typename _Super::value_type* __first, 
+	const typename _Super::value_type* __last) : 
+      __MAP_SUPER(__first, __last, _Compare()) { }
+    map(const typename _Super::value_type* __first, 
+	const typename _Super::value_type* __last, 
+        const _Compare& __comp) : __MAP_SUPER(__first, __last, __comp) { }
+    map(typename _Super::const_iterator __first, 
+	typename _Super::const_iterator __last) : 
+        __MAP_SUPER(__first, __last, _Compare()) { }
+    map(typename _Super::const_iterator __first, 
+	typename _Super::const_iterator __last, 
+        const _Compare& __comp) : __MAP_SUPER(__first, __last, __comp) { }
+};
+
+#  if defined (_STLP_BASE_MATCH_BUG)
+__MAP_TEMPLATE_HEADER
+inline bool operator==(const map< __MAP_ARGUMENTS >& __x, 
+                       const map< __MAP_ARGUMENTS >& __y) {
+  typedef __MAP_SUPER _Super;
+  return operator==((const _Super&)__x,(const _Super&)__y);
+}
+
+__MAP_TEMPLATE_HEADER
+inline bool operator<(const map< __MAP_ARGUMENTS >& __x, 
+                      const map< __MAP_ARGUMENTS >& __y) {
+  typedef __MAP_SUPER _Super;
+  return operator < ((const _Super&)__x,(const _Super&)__y);
+}
+#  endif /* _STLP_BASE_MATCH_BUG */
+
+
+// provide a "default" multimap adaptor
+__MMAP_TEMPLATE_HEADER
+class multimap : public __MMAP_SUPER
+{
+  typedef multimap< __MMAP_ARGUMENTS > _Self;
+public:
+    typedef __MMAP_SUPER  _Super;
+    __IMPORT_WITH_REVERSE_ITERATORS(_Super)
+    // copy & assignment from super
+    __IMPORT_SUPER_COPY_ASSIGNMENT(multimap, _Self, __MMAP_SUPER)
+    multimap() : __MMAP_SUPER(_Compare()) {}
+    explicit multimap(const _Compare& __comp) : __MMAP_SUPER(__comp) {}
+    multimap(const typename _Super::value_type* __first, 
+	     const typename _Super::value_type* __last) : 
+        __MMAP_SUPER(__first, __last, _Compare()) { }
+    multimap(const typename _Super::value_type* __first,
+	     const typename _Super::value_type* __last, 
+	     const _Compare& __comp) : __MMAP_SUPER(__first, __last, __comp) { }
+    multimap(typename _Super::const_iterator __first, 
+	     typename _Super::const_iterator __last) : 
+      __MMAP_SUPER(__first, __last, _Compare()) { }
+    multimap(typename _Super::const_iterator __first, 
+	     typename _Super::const_iterator __last, 
+	     const _Compare& __comp) : __MMAP_SUPER(__first, __last, __comp) { }
+};
+
+#  if defined (_STLP_BASE_MATCH_BUG)
+__MMAP_TEMPLATE_HEADER
+inline bool operator==(const multimap< __MMAP_ARGUMENTS >& __x, 
+                       const multimap< __MMAP_ARGUMENTS >& __y) {
+  typedef __MMAP_SUPER  _Super;
+  return (const _Super&)__x == (const _Super&)__y;
+}
+
+__MMAP_TEMPLATE_HEADER
+inline bool operator<(const multimap< __MMAP_ARGUMENTS >& __x, 
+                      const multimap< __MMAP_ARGUMENTS >& __y) {
+  typedef __MMAP_SUPER  _Super;
+  return (const _Super&)__x < (const _Super&)__y;
+}
+#  endif
+
+# undef __MMAP_TEMPLATE_HEADER
+# undef __MMAP_ARGUMENTS
+# undef __MMAP_SUPER
+
+# undef __MAP_TEMPLATE_HEADER
+# undef __MAP_ARGUMENTS
+# undef __MAP_SUPER
+
+# undef _Compare
+
+# ifdef _STLP_USE_NAMESPACES
+} /* namespace STLPORT */
+# endif
+
+#endif /* _STLP_INTERNAL_WRAP_MAP_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/wrappers/_mmap.h b/main/source/stlport/stlport/stl/wrappers/_mmap.h
new file mode 100644
index 00000000..0d4da133
--- /dev/null
+++ b/main/source/stlport/stlport/stl/wrappers/_mmap.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 1999, 2000
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_WRAP_MULTIMAP_H
+#define _STLP_INTERNAL_WRAP_MULTIMAP_H
+
+# ifdef _STLP_USE_NAMESPACES
+namespace STLPORT { 
+# endif
+
+#  if defined (_STLP_MINIMUM_DEFAULT_TEMPLATE_PARAMS)
+#   define _Compare less<_Key>
+#  else
+#  endif
+
+# if defined (_STLP_DEBUG) && ! defined (_STLP_USE_NAMESPACES)
+# else
+
+# endif
+
+
+# ifdef _STLP_USE_NAMESPACES
+} /* namespace STLPORT */
+# endif
+
+#endif /* _STLP_INTERNAL_WRAP_MULTIMAP_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/wrappers/_set.h b/main/source/stlport/stlport/stl/wrappers/_set.h
new file mode 100644
index 00000000..787df810
--- /dev/null
+++ b/main/source/stlport/stlport/stl/wrappers/_set.h
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 1999, 2000
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_WRAP_SET_H
+#define _STLP_INTERNAL_WRAP_SET_H
+
+#ifndef _STLP_INTERNAL_SET_H
+# include <stl/_set.h>
+#endif
+
+# ifdef _STLP_USE_NAMESPACES
+namespace STLPORT { 
+# endif
+
+#  if defined (_STLP_MINIMUM_DEFAULT_TEMPLATE_PARAMS)
+#   define __SET_TEMPLATE_HEADER  template <class _Key>
+#   define __SET_ARGUMENTS        _Key
+#   define __MSET_TEMPLATE_HEADER  template <class _Key>
+#   define __MSET_ARGUMENTS        _Key
+#   define _Compare less<_Key>
+#  else
+#   define __SET_TEMPLATE_HEADER  template <class _Key, class _Compare >
+#   define __SET_ARGUMENTS        _Key, _Compare
+#   define __MSET_TEMPLATE_HEADER  template <class _Key, class _Compare >
+#   define __MSET_ARGUMENTS        _Key, _Compare
+#  endif
+
+#   define __SET_SUPER  __set< _Key, _Compare, _STLP_DEFAULT_ALLOCATOR(_Key) >
+#   define __MSET_SUPER __multiset< _Key, _Compare, _STLP_DEFAULT_ALLOCATOR(_Key) >
+
+// provide a "default" set adaptor
+__SET_TEMPLATE_HEADER
+class set : public __SET_SUPER
+{
+  typedef set< __SET_ARGUMENTS > _Self;
+public:
+    typedef __SET_SUPER _Super;
+    __IMPORT_WITH_REVERSE_ITERATORS(_Super)
+    // copy & assignment from super
+    __IMPORT_SUPER_COPY_ASSIGNMENT(set,_Self,__SET_SUPER)
+    // specific constructors
+    explicit set() : __SET_SUPER(_Compare()) {}
+    explicit set(const _Compare& __comp) : __SET_SUPER(__comp) {}
+    set(const value_type* __first, const value_type* __last) : 
+        __SET_SUPER(__first, __last, _Compare()) { }
+    set(const value_type* __first, const value_type* __last, 
+        const _Compare& __comp) : __SET_SUPER(__first, __last, __comp) { }
+    set(const_iterator __first, const_iterator __last) : 
+        __SET_SUPER(__first, __last, _Compare()) { }
+    set(const_iterator __first, const_iterator __last, 
+        const _Compare& __comp) : __SET_SUPER(__first, __last, __comp) { }
+};
+
+#  if defined (_STLP_BASE_MATCH_BUG)
+__SET_TEMPLATE_HEADER 
+inline bool operator==(const set< __SET_ARGUMENTS >& __x, 
+                       const set< __SET_ARGUMENTS >& __y) {
+  typedef __SET_SUPER _Super;
+  return operator==((const _Super&)__x,(const _Super&)__y);
+}
+
+__SET_TEMPLATE_HEADER 
+inline bool operator<(const set< __SET_ARGUMENTS >& __x, 
+                      const set< __SET_ARGUMENTS >& __y) {
+  typedef __SET_SUPER _Super;
+  return operator < ((const _Super&)__x , (const _Super&)__y);
+}
+#  endif
+
+// provide a "default" multiset adaptor
+__MSET_TEMPLATE_HEADER 
+class multiset : public __MSET_SUPER
+{
+    typedef multiset< __MSET_ARGUMENTS > _Self;
+public:
+    typedef __MSET_SUPER _Super;
+    __IMPORT_WITH_REVERSE_ITERATORS(_Super)
+    // copy & assignment from super
+    __IMPORT_SUPER_COPY_ASSIGNMENT(multiset, _Self, __MSET_SUPER)
+    explicit multiset() : __MSET_SUPER(_Compare()) {}
+    explicit multiset(const _Compare& __comp) : __MSET_SUPER(__comp) {}
+    multiset(const value_type* __first, const value_type* __last) : 
+        __MSET_SUPER(__first, __last, _Compare()) { }
+    multiset(const value_type* __first, const value_type* __last, 
+        const _Compare& __comp) : __MSET_SUPER(__first, __last, __comp) { }
+    multiset(const_iterator __first, const_iterator __last) : 
+        __MSET_SUPER(__first, __last, _Compare()) { }
+    multiset(const_iterator __first, const_iterator __last, 
+        const _Compare& __comp) : __MSET_SUPER(__first, __last, __comp) { }
+};
+
+#  if defined (_STLP_BASE_MATCH_BUG)   
+__MSET_TEMPLATE_HEADER 
+inline bool operator==(const multiset< __MSET_ARGUMENTS >& __x, 
+                       const multiset< __MSET_ARGUMENTS >& __y) {
+  typedef __MSET_SUPER  _Super;
+  return (const _Super&)__x == (const _Super&)__y;
+}
+
+__MSET_TEMPLATE_HEADER 
+inline bool operator<(const multiset< __MSET_ARGUMENTS >& __x, 
+                      const multiset< __MSET_ARGUMENTS >& __y) {
+  typedef __MSET_SUPER _Super;
+  return (const _Super&)__x < (const _Super&)__y;
+}
+#  endif
+
+# undef __MSET_TEMPLATE_HEADER
+# undef __MSET_ARGUMENTS
+# undef __MSET_SUPER
+
+# undef __SET_TEMPLATE_HEADER
+# undef __SET_ARGUMENTS
+# undef __SET_SUPER 
+# undef _Compare
+
+# ifdef _STLP_USE_NAMESPACES
+} /* namespace STLPORT */
+# endif
+
+#endif /* _STLP_INTERNAL_WRAP_SET_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/wrappers/_slist.h b/main/source/stlport/stlport/stl/wrappers/_slist.h
new file mode 100644
index 00000000..e0d89020
--- /dev/null
+++ b/main/source/stlport/stlport/stl/wrappers/_slist.h
@@ -0,0 +1,83 @@
+/*
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_WRAP_SLIST_H
+#define _STLP_INTERNAL_WRAP_SLIST_H
+
+#ifndef _STLP_INTERNAL_SLIST_H
+# include <stl/_slist.h>
+#endif
+
+# if defined (_STLP_DEBUG)
+#  define __SL_SUPER _DBG_slist<_Tp, _STLP_DEFAULT_ALLOCATOR(_Tp) >
+# else
+#  define __SL_SUPER __slist__<_Tp, _STLP_DEFAULT_ALLOCATOR(_Tp) >
+# endif
+
+
+# ifdef _STLP_USE_NAMESPACES
+namespace STLPORT { 
+# endif
+ 
+// provide a "default" list adaptor
+template <class _Tp>
+class slist : public  __SL_SUPER
+{
+public:
+    typedef __SL_SUPER _Super;
+    __IMPORT_WITH_ITERATORS(_Super)
+    __IMPORT_SUPER_COPY_ASSIGNMENT(slist, slist<_Tp>, __SL_SUPER)
+    slist() { }
+    explicit slist(size_type __n, const _Tp& __value) : __SL_SUPER(__n, __value) { }
+    explicit slist(size_type __n) :  __SL_SUPER(__n) { } 
+    slist(const _Tp* __first, const _Tp* __last) : __SL_SUPER(__first, __last) { } 
+    slist(const_iterator __first, const_iterator __last) : __SL_SUPER(__first, __last) { }
+};
+
+#  if defined (_STLP_BASE_MATCH_BUG)
+template <class _Tp>
+inline bool operator==(const slist<_Tp>& __x, const slist<_Tp>& __y) {
+    typedef typename slist<_Tp>::_Super _Super;
+    return operator == ((const _Super&)__x,(const _Super&)__y);
+}
+
+template <class _Tp>
+inline bool operator<(const slist<_Tp>& __x, const slist<_Tp>& __y) {
+    typedef typename slist<_Tp>::_Super _Super;
+    return operator < ((const _Super&)__x,(const _Super&)__y);
+}
+#  endif
+#  undef __SL_SUPER
+
+# ifdef _STLP_USE_NAMESPACES
+} /* namespace STLPORT */
+# endif
+
+#endif /* _STLP_INTERNAL_WRAP_SLIST_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl/wrappers/_vector.h b/main/source/stlport/stlport/stl/wrappers/_vector.h
new file mode 100644
index 00000000..3ed4bf10
--- /dev/null
+++ b/main/source/stlport/stlport/stl/wrappers/_vector.h
@@ -0,0 +1,89 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_WRAP_VECTOR_H
+#define _STLP_INTERNAL_WRAP_VECTOR_H
+
+#ifndef _STLP_INTERNAL_VECTOR_H
+# include <stl/_vector.h>
+#endif
+
+# if defined (_STLP_DEBUG)
+#  define _VEC_SUPER _DBG_vector<_Tp, _STLP_DEFAULT_ALLOCATOR(_Tp) >
+# else
+#  define _VEC_SUPER __vector__<_Tp, _STLP_DEFAULT_ALLOCATOR(_Tp) >
+# endif
+
+# ifdef _STLP_USE_NAMESPACES
+namespace STLPORT { 
+# endif
+
+template <class _Tp>
+class vector : public _VEC_SUPER
+{
+public:
+    typedef _VEC_SUPER  _Super;
+    __IMPORT_WITH_REVERSE_ITERATORS(_Super)
+    __IMPORT_SUPER_COPY_ASSIGNMENT(vector, vector<_Tp>, _VEC_SUPER)
+    vector() {}
+    explicit vector(size_type __n, const _Tp& __value) : _VEC_SUPER(__n, __value) { }
+    explicit vector(size_type __n) : _VEC_SUPER(__n) { }
+    vector(const_iterator __first, const_iterator __last) : _VEC_SUPER(__first,__last) { }
+# ifdef _STLP_DEBUG
+  // certainly, no member templates here !
+    vector(const _Tp* __first, const _Tp* __last) : _VEC_SUPER(__first,__last) { }    
+# endif
+    ~vector() {}
+};
+
+#  if defined (_STLP_BASE_MATCH_BUG)
+template <class _Tp>
+inline bool operator==(const vector<_Tp>& __x, const vector<_Tp>& __y) {
+  return __x.size() == __y.size() &&
+    equal(__x.begin(), __x.end(), __y.begin());
+}
+
+template <class _Tp>
+inline bool operator<(const vector<_Tp>& __x, const vector<_Tp>& __y) {
+  return lexicographical_compare(__x.begin(), __x.end(), 
+				 __y.begin(), __y.end());
+}
+#  endif /* _STLP_BASE_MATCH_BUG */
+#  undef _VEC_SUPER
+
+// close std namespace
+# ifdef _STLP_USE_NAMESPACES
+}
+# endif
+
+#endif /* _STLP_WRAP_VECTOR_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/stl_user_config.h b/main/source/stlport/stlport/stl_user_config.h
new file mode 100644
index 00000000..936d0b24
--- /dev/null
+++ b/main/source/stlport/stlport/stl_user_config.h
@@ -0,0 +1,203 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/*
+ * Purpose of this file :
+ *
+ * To hold user-definable portion of STLport settings which may be overridden
+ * on per-project basis.
+ * Please note that if you use STLport iostreams (compiled library) then you have
+ * to use consistent settings when you compile STLport library and your project. 
+ * Those settings are defined in _site_config.h and have to be the same for a given
+ * STLport installation.
+ *
+ */
+
+
+//==========================================================
+// User-settable macros that control compilation:
+//              Features selection
+//==========================================================
+
+/* _STLP_NO_OWN_IOSTREAMS: 
+ * __STL_NO_SGI_IOSTREAMS (in older versions)
+ *  This is major configuration switch.
+ *  Turn it on to disable use of SGI iostreams and use wrappers 
+ *  around your compiler's iostreams, like before.
+ *  Keep it off if you want to use  SGI iostreams 
+ *  (Note that in this case you have to compile library in ../src
+ *  and supply resulting library at link time).
+ *
+ */
+
+// # define   _STLP_NO_OWN_IOSTREAMS	1
+
+
+/* 
+ * This macro only works in non-SGI iostreams mode.
+ *
+ * Uncomment to suppress using new-style streams even if they are
+ * available.
+ * Beware - _STLP_USE_OWN_NAMESPACE depends on this macro, too.
+ * Do that only if you are absolutely sure backwards-compatible 
+ * <iostream.h> is not actually a wrapper with <iostream>
+ * Hint : In VC++ 6.x, they are not.
+ */
+
+// #define   _STLP_NO_NEW_IOSTREAMS	1
+
+/*
+ * Use this switch for embedded systems where no iostreams are available
+ * at all. STLport own iostreams will also get disabled automatically then.
+ */
+// # define _STLP_NO_IOSTREAMS 1
+
+/* 
+ * Set _STLP_DEBUG to turn the "Debug Mode" on.
+ * That gets you checked iterators/ranges in the manner
+ * of "Safe STL". Very useful for debugging. Thread-safe.
+ * Please do not forget to link proper STLport library flavor
+ * (e.g libstlport_gcc_stldebug.a) when you set this flag in STLport iostreams mode.
+ */
+//#define   _STLP_DEBUG 1
+
+
+/* 
+ *
+ *  _STLP_NO_CUSTOM_IO : define this if you do not instantiate basic_xxx iostream classes  with custom types (which is most likely the case).
+ *  Custom means types other than char, wchar and char_traits<>,
+ *  like basic_ostream<my_char_type, my_traits<my_char_type> >
+ *  When this option is on, most non-inline template functions definitions for iostreams are not seen by the client.
+ *  Default is off, just not to break compilation for those who do use those types.
+ *  which saves a lot of compile time for most compilers, also object and executable size for some.
+ *  That also guarantees that you still use optimized standard i/o when you compile your program without optimization. 
+ *  Option does not affect STLport library build; you may use the same binary library with and without this option, 
+ *  on per-project basis.
+ *
+ */
+//#define _STLP_NO_CUSTOM_IO
+
+
+/* 
+ * _STLP_NO_RELOPS_NAMESPACE: if defined, don't put the relational
+ * operator templates (>, <=. >=, !=) in namespace std::rel_ops, even
+ * if the compiler supports namespaces.
+ * Note : if the compiler do not support namespaces, those operators are not be provided by default,
+ * to simulate hiding them into rel_ops. This was proved to resolve many compiler bugs with ambiguity.
+ */
+
+// #define _STLP_NO_RELOPS_NAMESPACE 1
+
+
+/*
+ * If _STLP_USE_OWN_NAMESPACE is in effect, STLport by default will not try
+ * to rename std:: for the user
+ * to _STL::. If you do want this feature, please define the following switch :
+ */
+// # define _STLP_REDEFINE_STD 1
+
+
+/*
+ * _STLP_WHOLE_NATIVE_STD : only meaningful in _STLP_USE_OWN_NAMESPACE mode.
+ * Normally, STLport only imports necessary components from native std:: namespace -
+ * those not yet provided by STLport (<iostream>, <complex>, etc.) 
+ * and their dependencies (<string>, <stdexcept>). 
+ * You might want everything from std:: being available in std:: namespace when you
+ * include corresponding STLport header (like STLport <map> provides std::map as well, etc.),
+ * if you are going to use both stlport:: and std:: components in your code.
+ * Otherwise this option is not recommended as it increases the size of your object files
+ * and slows down compilation.
+ */
+//# define _STLP_WHOLE_NATIVE_STD 1
+//# define _STLP_NO_CSTD_FUNCTION_IMPORTS 1
+
+/*
+ * Use this option to catch uninitialized members in your classes.
+ * When it is set, construct() and destroy() fill the class storage
+ * with _STLP_SHRED_BYTE (see below). 
+ * Note : _STLP_DEBUG and _STLP_DEBUG_ALLOC don't set this option automatically.
+ */
+
+// # define _STLP_DEBUG_UNINITIALIZED 1
+
+/*
+ * Uncomment and provide a definition for the byte with which raw memory
+ * will be filled if _STLP_DEBUG_ALLOC or _STLP_DEBUG_UNINITIALIZED is defined. 
+ * Choose a value which is likely to cause a noticeable problem if dereferenced 
+ * or otherwise abused. A good value may already be defined for your platform; see
+ * stl_config.h
+ */
+// #define _STLP_SHRED_BYTE 0xA3
+
+/*
+ *  This option is for gcc users only and only affects systems where native linker
+ *  does not let gcc to implement automatic instantiation of static template data members/
+ *  It is being put in this file as there is no way to check if we are using GNU ld automatically,
+ *  so it becomes user's responsibility.
+ * 
+ */
+
+//#define _STLP_GCC_USES_GNU_LD 1
+
+
+//==========================================================
+// Compatibility section
+//==========================================================
+
+/*
+ *  Define this macro to disable anachronistic constructs (like the ones used in HP STL and
+ *  not included in final standard, etc. 
+ */
+// define _STLP_NO_ANACHRONISMS 1
+
+/*
+ *  Define this macro to disable STLport extensions (for example, to make sure your code will 
+ *  compile with some other implementation )
+ */
+// define _STLP_NO_EXTENSIONS   1
+
+
+/* 
+ * You should define this macro if compiling with MFC - STLport <stl/_config.h>
+ * then include <afx.h> instead of <windows.h> to get synchronisation primitives 
+ *
+ */
+
+// # define _STLP_USE_MFC 1
+
+
+// boris : this setting is here as we cannot detect precense of new Platform SDK automatically 
+// If you are using new PSDK with VC++ 6.0 or lower, please define this to get correct prototypes for InterlockedXXX functions
+//# define _STLP_NEW_PLATFORM_SDK 1
+
+/*
+ * Use minimum set of default arguments on template classes that have more
+ * than one - for example map<>, set<>.
+ * This has effect only if _STLP_LIMITED_DEFAULT_TEMPLATES is on.
+ * If _STLP_MINIMUM_DEFAULT_TEMPLATE_PARAMS is set, you'll be able to compile
+ * set<T> with those compilers, but you'll have to use __set__<T, less<T>>
+ *
+ * Affects : map<>, multimap<>, set<>, multiset<>, hash_*<>, 
+ * queue<>, priority_queue<>, stack<>, istream_iterator<>
+ */
+
+// # define _STLP_MINIMUM_DEFAULT_TEMPLATE_PARAMS 1
+
+//==========================================================
+//#define _STLP_HAS_NO_NEW_C_HEADERS 1
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/streambuf b/main/source/stlport/stlport/streambuf
new file mode 100644
index 00000000..d71e2ae3
--- /dev/null
+++ b/main/source/stlport/stlport/streambuf
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+#ifndef _STLP_STREAMBUF
+#define _STLP_STREAMBUF
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x1066
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+# if defined ( _STLP_OWN_IOSTREAMS )
+#  include <stl/_streambuf.h>
+# elif !defined (_STLP_USE_NO_IOSTREAMS)
+#  include <wrap_std/streambuf>
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x1066)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_STREAMBUF */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/streambuf.h b/main/source/stlport/stlport/streambuf.h
new file mode 100644
index 00000000..06dfc2ed
--- /dev/null
+++ b/main/source/stlport/stlport/streambuf.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+#ifndef _STLP_STREAMBUF_H
+# define _STLP_STREAMBUF_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x2067
+#  include <stl/_prolog.h>
+# endif
+
+# if defined ( _STLP_OWN_IOSTREAMS )
+
+#ifdef __BORLANDC__
+#  include <streambuf.>
+#else
+#  include <streambuf>
+#endif
+
+# include <ios.h>
+
+# ifndef _STLP_HAS_NO_NAMESPACES
+#  ifdef _STLP_BROKEN_USING_DIRECTIVE
+   using namespace _STLP_STD;
+#  else
+using _STLP_STD::basic_streambuf;
+using _STLP_STD::streambuf;
+#   ifndef _STLP_NO_WCHAR_T
+using _STLP_STD::wstreambuf;
+#   endif
+#  endif
+# endif /* _STLP_HAS_NO_NAMESPACES */
+
+# elif !defined (_STLP_USE_NO_IOSTREAMS)
+
+# include _STLP_NATIVE_OLD_STREAMS_HEADER(streambuf.h)
+
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x2067)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_STREAMBUF_H */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/string b/main/source/stlport/stlport/string
new file mode 100644
index 00000000..9664480d
--- /dev/null
+++ b/main/source/stlport/stlport/string
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 1997-1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_STRING
+# define _STLP_STRING
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x68
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+#if defined (_STLP_USE_NATIVE_STRING)
+
+// as part of compiled runtime library depends on it.
+
+# if defined (_STLP_MSVC)
+#  include <streambuf>
+#  include <istream>
+# endif
+
+#  include _STLP_NATIVE_HEADER(string)
+
+# endif /* _STLP_USE_NATIVE_STRING */
+
+# if !defined (_STLP_USE_NATIVE_STRING) || defined (_STLP_USE_OWN_NAMESPACE)
+# include <stl/_string.h>
+# else
+# include <stl/_string_hash.h>
+# endif /*_STLP_USE_NATIVE_STRING */
+
+// cleanup
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x68)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_STRING */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/string.h b/main/source/stlport/stlport/string.h
new file mode 100644
index 00000000..277812a8
--- /dev/null
+++ b/main/source/stlport/stlport/string.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x269
+#  include <stl/_prolog.h>
+# endif
+
+# if defined (__BORLANDC__)
+#  include _STLP_NATIVE_CPP_C_HEADER(_str.h)
+# else
+#  include _STLP_NATIVE_C_HEADER(string.h)
+# endif
+
+# if defined (__BORLANDC__) && defined (_STLP_IMPORT_VENDOR_CSTD)
+#  include <using/cstring>
+# endif /* BORLAND */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x269)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/strstream b/main/source/stlport/stlport/strstream
new file mode 100644
index 00000000..b62a7776
--- /dev/null
+++ b/main/source/stlport/stlport/strstream
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+// WARNING: The classes defined in this header are DEPRECATED.  This
+// header is defined in section D.7.1 of the C++ standard, and it
+// MAY BE REMOVED in a future standard revision.  You should use the
+// header <sstream> instead.
+
+
+#ifndef _STLP_STRSTREAM
+#define _STLP_STRSTREAM
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x1070
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+# if defined (_STLP_OWN_IOSTREAMS)
+
+#  include <stl/_strstream.h>
+
+# elif !defined (_STLP_USE_NO_IOSTREAMS)
+
+#  if defined (_STLP_USE_NEW_IOSTREAMS)
+#   include <wrap_std/strstream>
+#  else
+#   include <wrap_std/h/strstream.h>
+#  endif
+
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x1070)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_STRSTREAM */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/strstream.h b/main/source/stlport/stlport/strstream.h
new file mode 100644
index 00000000..6703cd31
--- /dev/null
+++ b/main/source/stlport/stlport/strstream.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_STRSTREAM_H
+# define _STLP_STRSTREAM_H
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x2071
+#  include <stl/_prolog.h>
+# endif
+
+# if defined ( _STLP_USE_NEW_IOSTREAMS )
+
+// fbp - if we are going to use that consistently, let's do it
+#ifdef __BORLANDC__
+#  include <strstream.>
+#else
+#  include <strstream>
+#endif
+
+# include  <iostream.h>
+
+
+# ifndef _STLP_HAS_NO_NAMESPACES
+
+#  ifdef _STLP_BROKEN_USING_DIRECTIVE
+
+using namespace _STLP_STD;
+
+#  else
+
+using _STLP_STD::strstreambuf;
+using _STLP_STD::istrstream;
+using _STLP_STD::ostrstream;
+using _STLP_STD::strstream;
+
+#  endif /* _STLP_BROKEN_USING_DIRECTIVE */
+
+# endif /* _STLP_HAS_NO_NAMESPACES */
+
+# else
+
+
+// just include old-style strstream.h
+#  if defined (_MSC_VER) && (_MSC_VER <= 1200)
+#   include _STLP_NATIVE_OLD_STREAMS_HEADER(strstrea.h)
+#  else
+#   include _STLP_NATIVE_OLD_STREAMS_HEADER(strstream.h)
+#  endif
+
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x2071)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_STRSTREAM_H */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/time.h b/main/source/stlport/stlport/time.h
new file mode 100644
index 00000000..0ba88b62
--- /dev/null
+++ b/main/source/stlport/stlport/time.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# if !defined (_STLP_OUTERMOST_HEADER_ID)
+#  define _STLP_OUTERMOST_HEADER_ID 0x272
+#  include <stl/_prolog.h>
+# elif (_STLP_OUTERMOST_HEADER_ID == 0x272) && ! defined (_STLP_DONT_POP_0x272)
+#  define _STLP_DONT_POP_0x272
+# endif
+
+# include _STLP_NATIVE_C_HEADER(time.h)
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x272)
+#  if ! defined (_STLP_DONT_POP_0x272)
+#   include <stl/_epilog.h>
+#   undef  _STLP_OUTERMOST_HEADER_ID
+#   endif
+#   undef  _STLP_DONT_POP_0x272
+# endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/typeinfo b/main/source/stlport/stlport/typeinfo
new file mode 100644
index 00000000..2c62f0dc
--- /dev/null
+++ b/main/source/stlport/stlport/typeinfo
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_TYPEINFO
+# define _STLP_TYPEINFO
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x473
+#  include <stl/_prolog.h>
+# endif
+
+# ifndef _STLP_NO_TYPEINFO
+
+# if defined (_STLP_NO_NEW_NEW_HEADER)
+#  include <typeinfo.h>
+# else
+#  include _STLP_NATIVE_CPP_RUNTIME_HEADER(typeinfo)
+# endif
+
+# if defined(_STLP_MSVC) && (_STLP_MSVC >= 1300)
+// In .NET, <typeinfo> actually includes <typeinfo.h> 
+#  undef _STLP_OLDSTD_typeinfo
+# endif
+
+// if <typeinfo.h> already included, do not import anything
+# if defined  (_STLP_USE_NAMESPACES) && ! defined (_STLP_OLDSTD_typeinfo) \
+&& ( defined (_STLP_VENDOR_GLOBAL_EXCEPT_STD) || defined (_STLP_USE_OWN_NAMESPACE) || defined (_STLP_DEBUG))
+# if defined(_STLP_MSVC) && (_STLP_MSVC < 1300)
+class bad_cast : public exception {};
+# endif
+_STLP_BEGIN_NAMESPACE
+
+// VC++ 6 has only this guy in ::
+// # if !(defined(_STLP_MSVC)&& (_STLP_MSVC <= 1200))
+using _STLP_VENDOR_EXCEPT_STD::type_info;
+// # endif
+
+#  if !(defined(__MRC__) || defined(__SC__) || defined(__DMC__))
+using _STLP_VENDOR_EXCEPT_STD::bad_typeid;
+#  endif
+
+//#if defined( __xlC__ ) && (__xlC__ < 0x500)
+//# include <exception>
+//struct bad_cast : exception {};
+//#endif
+# if defined(_STLP_MSVC) && (_STLP_MSVC < 1300)
+using ::bad_cast;
+# else
+using _STLP_VENDOR_EXCEPT_STD::bad_cast;
+# endif
+
+_STLP_END_NAMESPACE
+#endif /* _STLP_OWN_NAMESPACE */
+
+#else
+
+# include <exception>
+_STLP_BEGIN_NAMESPACE
+# ifndef __DMC__
+struct bad_cast : exception {};
+# endif
+_STLP_END_NAMESPACE
+#endif  /* NO_TYPEINFO */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x473)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_TYPEINFO */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/typeinfo.h b/main/source/stlport/stlport/typeinfo.h
new file mode 100644
index 00000000..99c6eb8d
--- /dev/null
+++ b/main/source/stlport/stlport/typeinfo.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_OLDSTD_typeinfo
+# define _STLP_OLDSTD_typeinfo
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x874
+#  include <stl/_prolog.h>
+# endif
+
+# ifndef _STLP_NO_TYPEINFO
+
+#if defined (__GNUC__)
+# undef _STLP_OLDSTD_typeinfo
+#  include <typeinfo>
+# define _STLP_OLDSTD_typeinfo
+#else
+#  include _STLP_NATIVE_CPP_RUNTIME_HEADER(typeinfo.h)
+#endif
+
+// if <typeinfo> already included, do not import anything
+
+# if defined  (_STLP_USE_OWN_NAMESPACE) && ! (defined (_STLP_TYPEINFO) && !defined(_STLP_NO_NEW_NEW_HEADER))
+
+_STLP_BEGIN_NAMESPACE
+
+using /*_STLP_VENDOR_EXCEPT_STD */ :: type_info;
+# if !(defined(__MRC__) || (defined(__SC__) && !defined(__DMC__)))
+using /* _STLP_VENDOR_EXCEPT_STD */ :: bad_typeid;
+# endif
+using /* _STLP_VENDOR_EXCEPT_STD */ :: bad_cast;
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_OWN_NAMESPACE */
+
+# endif /* _STLP_NO_TYPEINFO */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x874)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_OLDSTD_typeinfo */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/using/cstring b/main/source/stlport/stlport/using/cstring
new file mode 100644
index 00000000..479b49a6
--- /dev/null
+++ b/main/source/stlport/stlport/using/cstring
@@ -0,0 +1,54 @@
+using _STLP_VENDOR_CSTD::size_t;
+
+#  ifndef _STLP_NO_CSTD_FUNCTION_IMPORTS
+#   if defined(__MSL__) && __MC68K__ && !_No_BlockMove && __dest_os == __mac_os
+#    undef memcpy
+#    undef memmove
+inline void* memcpy(void* dst, const void* src, size_t len)
+{
+	return _STLP_VENDOR_CSTD::__memcpy(dst, src, len);
+}
+inline void* memmove(void* dst, const void* src, size_t len)
+{
+	return _STLP_VENDOR_CSTD::__memmove(dst, src, len);
+}
+#   else
+
+ using _STLP_VENDOR_CSTD::memmove;
+ using _STLP_VENDOR_CSTD::memcpy;
+
+#   endif
+
+# if ! defined (__BORLANDC__)
+using _STLP_VENDOR_CSTD::memchr;
+using _STLP_VENDOR_CSTD::strchr;
+using _STLP_VENDOR_CSTD::strpbrk;
+using _STLP_VENDOR_CSTD::strrchr;
+using _STLP_VENDOR_CSTD::strstr;
+# endif
+
+using _STLP_VENDOR_CSTD::memcmp;
+using _STLP_VENDOR_CSTD::memset;
+
+using _STLP_VENDOR_CSTD::strcat;
+
+# if !defined (strcmp)
+using _STLP_VENDOR_CSTD::strcmp;
+# endif
+
+using _STLP_VENDOR_CSTD::strcoll;
+# if !defined (strcpy)
+using _STLP_VENDOR_CSTD::strcpy;
+# endif
+using _STLP_VENDOR_CSTD::strcspn;
+using _STLP_VENDOR_CSTD::strerror;
+using _STLP_VENDOR_CSTD::strlen;
+using _STLP_VENDOR_CSTD::strncat;
+using _STLP_VENDOR_CSTD::strncmp;
+
+using _STLP_VENDOR_CSTD::strncpy;
+using _STLP_VENDOR_CSTD::strspn;
+
+using _STLP_VENDOR_CSTD::strtok;
+using _STLP_VENDOR_CSTD::strxfrm;
+#  endif /* _STLP_NO_CSTD_FUNCTION_IMPORTS */
diff --git a/main/source/stlport/stlport/using/export b/main/source/stlport/stlport/using/export
new file mode 100644
index 00000000..ee3f264c
--- /dev/null
+++ b/main/source/stlport/stlport/using/export
@@ -0,0 +1,12 @@
+cstring
+fstream
+iomanip
+ios
+iosfwd
+iostream
+istream
+locale
+ostream
+sstream
+streambuf
+strstream
diff --git a/main/source/stlport/stlport/using/fstream b/main/source/stlport/stlport/using/fstream
new file mode 100644
index 00000000..ec4f19b0
--- /dev/null
+++ b/main/source/stlport/stlport/using/fstream
@@ -0,0 +1,19 @@
+#ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace _STLP_STD;
+#else
+using _STLP_NEW_IO_NAMESPACE::basic_filebuf;
+using _STLP_NEW_IO_NAMESPACE::filebuf;
+using _STLP_NEW_IO_NAMESPACE::basic_ifstream;
+using _STLP_NEW_IO_NAMESPACE::basic_ofstream;
+using _STLP_NEW_IO_NAMESPACE::ifstream;
+using _STLP_NEW_IO_NAMESPACE::ofstream;
+using _STLP_NEW_IO_NAMESPACE::basic_fstream;
+using _STLP_NEW_IO_NAMESPACE::fstream;
+
+# ifndef _STLP_NO_WIDE_STREAMS
+using _STLP_NEW_IO_NAMESPACE::wofstream;
+using _STLP_NEW_IO_NAMESPACE::wfilebuf;
+using _STLP_NEW_IO_NAMESPACE::wifstream;
+using _STLP_NEW_IO_NAMESPACE::wfstream;
+# endif
+#endif
diff --git a/main/source/stlport/stlport/using/h/fstream.h b/main/source/stlport/stlport/using/h/fstream.h
new file mode 100644
index 00000000..7f99f2db
--- /dev/null
+++ b/main/source/stlport/stlport/using/h/fstream.h
@@ -0,0 +1,4 @@
+using ::streambuf;
+using ::ifstream;
+using ::ofstream;
+using ::fstream;
diff --git a/main/source/stlport/stlport/using/h/iomanip.h b/main/source/stlport/stlport/using/h/iomanip.h
new file mode 100644
index 00000000..f5a2bce7
--- /dev/null
+++ b/main/source/stlport/stlport/using/h/iomanip.h
@@ -0,0 +1,6 @@
+using ::setiosflags;
+using ::resetiosflags;
+// using ::setbase;
+using ::setfill;
+using ::setprecision;
+using ::setw;
diff --git a/main/source/stlport/stlport/using/h/iostream.h b/main/source/stlport/stlport/using/h/iostream.h
new file mode 100644
index 00000000..2e5bff9f
--- /dev/null
+++ b/main/source/stlport/stlport/using/h/iostream.h
@@ -0,0 +1,24 @@
+using _STLP_OLD_IO_NAMESPACE::istream;
+using _STLP_OLD_IO_NAMESPACE::ostream;
+
+/* HP aCC include files re-define these when THREAD_SAFE */
+#if !defined(cin)
+using _STLP_OLD_IO_NAMESPACE::cin;
+#endif
+#if !defined(cout)
+using _STLP_OLD_IO_NAMESPACE::cout;
+#endif
+#if !defined(cerr)
+using _STLP_OLD_IO_NAMESPACE::cerr;
+#endif
+#if !defined(clog)
+using _STLP_OLD_IO_NAMESPACE::clog;
+#endif
+
+using _STLP_OLD_IO_NAMESPACE::endl;
+using _STLP_OLD_IO_NAMESPACE::ends;
+
+using _STLP_OLD_IO_NAMESPACE::ios;
+using _STLP_OLD_IO_NAMESPACE::flush;
+
+// using _STLP_OLD_IO_NAMESPACE::ws;
diff --git a/main/source/stlport/stlport/using/h/ostream.h b/main/source/stlport/stlport/using/h/ostream.h
new file mode 100644
index 00000000..df12dcad
--- /dev/null
+++ b/main/source/stlport/stlport/using/h/ostream.h
@@ -0,0 +1,6 @@
+using _STLP_OLD_IO_NAMESPACE::ostream;
+using _STLP_OLD_IO_NAMESPACE::endl;
+using _STLP_OLD_IO_NAMESPACE::ends;
+using _STLP_OLD_IO_NAMESPACE::flush;
+
+// using _STLP_OLD_IO_NAMESPACE::ws;
diff --git a/main/source/stlport/stlport/using/h/streambuf.h b/main/source/stlport/stlport/using/h/streambuf.h
new file mode 100644
index 00000000..2b729765
--- /dev/null
+++ b/main/source/stlport/stlport/using/h/streambuf.h
@@ -0,0 +1 @@
+using ::streambuf;
diff --git a/main/source/stlport/stlport/using/h/strstream.h b/main/source/stlport/stlport/using/h/strstream.h
new file mode 100644
index 00000000..fb632dc1
--- /dev/null
+++ b/main/source/stlport/stlport/using/h/strstream.h
@@ -0,0 +1,4 @@
+using _STLP_OLD_IO_NAMESPACE::strstreambuf;
+using _STLP_OLD_IO_NAMESPACE::istrstream;
+using _STLP_OLD_IO_NAMESPACE::ostrstream;
+using _STLP_OLD_IO_NAMESPACE::strstream;
diff --git a/main/source/stlport/stlport/using/iomanip b/main/source/stlport/stlport/using/iomanip
new file mode 100644
index 00000000..e918d406
--- /dev/null
+++ b/main/source/stlport/stlport/using/iomanip
@@ -0,0 +1,6 @@
+using _STLP_NEW_IO_NAMESPACE::setiosflags;
+using _STLP_NEW_IO_NAMESPACE::resetiosflags;
+using _STLP_NEW_IO_NAMESPACE::setbase;
+using _STLP_NEW_IO_NAMESPACE::setfill;
+using _STLP_NEW_IO_NAMESPACE::setprecision;
+using _STLP_NEW_IO_NAMESPACE::setw;
diff --git a/main/source/stlport/stlport/using/ios b/main/source/stlport/stlport/using/ios
new file mode 100644
index 00000000..5534aaf0
--- /dev/null
+++ b/main/source/stlport/stlport/using/ios
@@ -0,0 +1,41 @@
+#  ifdef _STLP_BROKEN_USING_DIRECTIVE
+using namespace _STLP_NEW_IO_NAMESPACE;
+#  else
+
+using _STLP_NEW_IO_NAMESPACE::ios;
+using _STLP_NEW_IO_NAMESPACE::streamoff;
+using _STLP_NEW_IO_NAMESPACE::streamsize;
+
+using _STLP_NEW_IO_NAMESPACE::ios_base;
+using _STLP_NEW_IO_NAMESPACE::basic_ios;
+
+// _lib.std.ios.manip_, manipulators:	
+using _STLP_NEW_IO_NAMESPACE::boolalpha;
+using _STLP_NEW_IO_NAMESPACE::noboolalpha;
+using _STLP_NEW_IO_NAMESPACE::showbase;
+using _STLP_NEW_IO_NAMESPACE::noshowbase;
+using _STLP_NEW_IO_NAMESPACE::showpoint;
+using _STLP_NEW_IO_NAMESPACE::noshowpoint;
+using _STLP_NEW_IO_NAMESPACE::showpos;
+using _STLP_NEW_IO_NAMESPACE::noshowpos;
+using _STLP_NEW_IO_NAMESPACE::skipws;
+using _STLP_NEW_IO_NAMESPACE::noskipws;
+using _STLP_NEW_IO_NAMESPACE::uppercase;
+using _STLP_NEW_IO_NAMESPACE::nouppercase;
+
+// _lib.adjustfield.manip_ adjustfield:
+using _STLP_NEW_IO_NAMESPACE::internal;
+using _STLP_NEW_IO_NAMESPACE::left;
+using _STLP_NEW_IO_NAMESPACE::right;
+
+// _lib.basefield.manip_ basefield:
+using _STLP_NEW_IO_NAMESPACE::dec;
+using _STLP_NEW_IO_NAMESPACE::hex;
+using _STLP_NEW_IO_NAMESPACE::oct;
+
+// _lib.floatfield.manip_ floatfield:
+using _STLP_NEW_IO_NAMESPACE::fixed;
+using _STLP_NEW_IO_NAMESPACE::scientific;
+
+#  endif  /* _STLP_BROKEN_USING_DIRECTIVE */
+
diff --git a/main/source/stlport/stlport/using/iosfwd b/main/source/stlport/stlport/using/iosfwd
new file mode 100644
index 00000000..d02b9120
--- /dev/null
+++ b/main/source/stlport/stlport/using/iosfwd
@@ -0,0 +1,54 @@
+# if defined (_STLP_USE_NEW_IOSTREAMS)
+using _STLP_NEW_IO_NAMESPACE::char_traits;
+using _STLP_NEW_IO_NAMESPACE::basic_ios;
+using _STLP_NEW_IO_NAMESPACE::basic_streambuf;
+using _STLP_NEW_IO_NAMESPACE::basic_istream;
+using _STLP_NEW_IO_NAMESPACE::basic_ostream;
+using _STLP_NEW_IO_NAMESPACE::basic_iostream;
+using _STLP_NEW_IO_NAMESPACE::basic_stringbuf;
+using _STLP_NEW_IO_NAMESPACE::basic_istringstream;
+using _STLP_NEW_IO_NAMESPACE::basic_ostringstream;
+using _STLP_NEW_IO_NAMESPACE::basic_stringstream;
+using _STLP_NEW_IO_NAMESPACE::basic_filebuf;
+using _STLP_NEW_IO_NAMESPACE::basic_ifstream;
+using _STLP_NEW_IO_NAMESPACE::basic_ofstream;
+using _STLP_NEW_IO_NAMESPACE::basic_fstream;
+using _STLP_NEW_IO_NAMESPACE::fpos;
+using _STLP_NEW_IO_NAMESPACE::istreambuf_iterator;
+using _STLP_NEW_IO_NAMESPACE::ostreambuf_iterator;
+using _STLP_NEW_IO_NAMESPACE::stringbuf;
+using _STLP_NEW_IO_NAMESPACE::istringstream;
+using _STLP_NEW_IO_NAMESPACE::ostringstream;
+using _STLP_NEW_IO_NAMESPACE::stringstream;
+# endif
+
+using _STLP_NEW_IO_NAMESPACE::ios;
+using _STLP_NEW_IO_NAMESPACE::streambuf;
+using _STLP_NEW_IO_NAMESPACE::istream;
+using _STLP_NEW_IO_NAMESPACE::ostream;
+using _STLP_NEW_IO_NAMESPACE::iostream;
+
+using _STLP_NEW_IO_NAMESPACE::filebuf;
+using _STLP_NEW_IO_NAMESPACE::ifstream;
+using _STLP_NEW_IO_NAMESPACE::ofstream;
+using _STLP_NEW_IO_NAMESPACE::fstream;
+
+using _STLP_NEW_IO_NAMESPACE::streampos;
+using _STLP_NEW_IO_NAMESPACE::streamoff;
+
+# if !defined (_STLP_NO_WIDE_STREAMS)
+using _STLP_NEW_IO_NAMESPACE::wios;
+using _STLP_NEW_IO_NAMESPACE::wstreambuf;
+using _STLP_NEW_IO_NAMESPACE::wistream;
+using _STLP_NEW_IO_NAMESPACE::wostream;
+using _STLP_NEW_IO_NAMESPACE::wiostream;
+using _STLP_NEW_IO_NAMESPACE::wstringbuf;
+using _STLP_NEW_IO_NAMESPACE::wistringstream;
+using _STLP_NEW_IO_NAMESPACE::wostringstream;
+using _STLP_NEW_IO_NAMESPACE::wstringstream;
+using _STLP_NEW_IO_NAMESPACE::wfilebuf;
+using _STLP_NEW_IO_NAMESPACE::wifstream;
+using _STLP_NEW_IO_NAMESPACE::wofstream;
+using _STLP_NEW_IO_NAMESPACE::wfstream;
+using _STLP_NEW_IO_NAMESPACE::wstreampos;
+# endif
diff --git a/main/source/stlport/stlport/using/iostream b/main/source/stlport/stlport/using/iostream
new file mode 100644
index 00000000..29ac5ad3
--- /dev/null
+++ b/main/source/stlport/stlport/using/iostream
@@ -0,0 +1,14 @@
+
+# include <using/istream>
+
+using _STLP_VENDOR_STD::cin;
+using _STLP_VENDOR_STD::cout;
+using _STLP_VENDOR_STD::cerr;
+using _STLP_VENDOR_STD::clog;
+
+# if ! defined (_STLP_NO_WIDE_STREAMS)
+using _STLP_VENDOR_STD::wcin;
+using _STLP_VENDOR_STD::wcout;
+using _STLP_VENDOR_STD::wcerr;
+using _STLP_VENDOR_STD::wclog;
+# endif
diff --git a/main/source/stlport/stlport/using/istream b/main/source/stlport/stlport/using/istream
new file mode 100644
index 00000000..7486fb32
--- /dev/null
+++ b/main/source/stlport/stlport/using/istream
@@ -0,0 +1,16 @@
+# include <using/ostream>
+
+using _STLP_NEW_IO_NAMESPACE::basic_istream;
+using _STLP_NEW_IO_NAMESPACE::basic_iostream;
+
+using _STLP_NEW_IO_NAMESPACE::istream;
+using _STLP_NEW_IO_NAMESPACE::iostream;
+
+# if !defined (_STLP_NO_NATIVE_WIDE_STREAMS)
+using _STLP_NEW_IO_NAMESPACE::wistream;
+using _STLP_NEW_IO_NAMESPACE::wiostream;
+# endif
+
+#if !(defined (_STLP_MSVC) && (_STLP_MSVC < 1200))
+using _STLP_NEW_IO_NAMESPACE::ws;
+#endif
diff --git a/main/source/stlport/stlport/using/locale b/main/source/stlport/stlport/using/locale
new file mode 100644
index 00000000..1eede715
--- /dev/null
+++ b/main/source/stlport/stlport/using/locale
@@ -0,0 +1,65 @@
+#if !defined(_STLP_NO_IMPORT_LOCALE)
+
+// from <cwchar>
+#if !defined (_STLP_NO_MBSTATE_T)
+using _STLP_VENDOR_MB_NAMESPACE::mbstate_t;
+#endif
+
+// _lib.locale_, locale:
+using _STLP_NEW_IO_NAMESPACE::locale;
+using _STLP_NEW_IO_NAMESPACE::use_facet;
+using _STLP_NEW_IO_NAMESPACE::has_facet;
+
+// _lib.locale.convenience_, convenience interfaces:
+using _STLP_NEW_IO_NAMESPACE::isspace;
+using _STLP_NEW_IO_NAMESPACE::isprint;
+using _STLP_NEW_IO_NAMESPACE::iscntrl;
+using _STLP_NEW_IO_NAMESPACE::isupper;
+using _STLP_NEW_IO_NAMESPACE::islower;
+using _STLP_NEW_IO_NAMESPACE::isalpha;
+using _STLP_NEW_IO_NAMESPACE::isdigit;
+using _STLP_NEW_IO_NAMESPACE::ispunct;
+using _STLP_NEW_IO_NAMESPACE::isxdigit;
+using _STLP_NEW_IO_NAMESPACE::isalnum;
+using _STLP_NEW_IO_NAMESPACE::isgraph;
+using _STLP_NEW_IO_NAMESPACE::toupper;
+using _STLP_NEW_IO_NAMESPACE::tolower;
+
+// _lib.category.ctype_ and _lib.facet.ctype.special_, ctype:
+using _STLP_NEW_IO_NAMESPACE::ctype_base;
+using _STLP_NEW_IO_NAMESPACE::ctype;
+using _STLP_NEW_IO_NAMESPACE::ctype_byname;
+using _STLP_NEW_IO_NAMESPACE::codecvt_base;
+using _STLP_NEW_IO_NAMESPACE::codecvt;
+using _STLP_NEW_IO_NAMESPACE::codecvt_byname;
+
+// _lib.category.numeric_ and _lib.facet.numpunct_, numeric:
+using _STLP_NEW_IO_NAMESPACE::num_get;
+using _STLP_NEW_IO_NAMESPACE::num_put;
+using _STLP_NEW_IO_NAMESPACE::numpunct;
+using _STLP_NEW_IO_NAMESPACE::numpunct_byname;
+
+// _lib.category.collate_, collation:
+using _STLP_NEW_IO_NAMESPACE::collate;
+using _STLP_NEW_IO_NAMESPACE::collate_byname;
+
+// _lib.category.time_, date and time:
+using _STLP_NEW_IO_NAMESPACE::time_base;
+using _STLP_NEW_IO_NAMESPACE::time_get;
+using _STLP_NEW_IO_NAMESPACE::time_get_byname;
+using _STLP_NEW_IO_NAMESPACE::time_put;
+using _STLP_NEW_IO_NAMESPACE::time_put_byname;
+
+// _lib.category.monetary_, money:
+using _STLP_NEW_IO_NAMESPACE::money_base;
+using _STLP_NEW_IO_NAMESPACE::money_get;
+using _STLP_NEW_IO_NAMESPACE::money_put;
+using _STLP_NEW_IO_NAMESPACE::moneypunct;
+using _STLP_NEW_IO_NAMESPACE::moneypunct_byname;
+
+#if !defined (_STLP_OWN_IOSTREAMS) && !defined (_STLP_NO_NATIVE_MESSAGE_FACET)
+using _STLP_NEW_IO_NAMESPACE::messages_base;
+using _STLP_NEW_IO_NAMESPACE::messages;
+using _STLP_NEW_IO_NAMESPACE::messages_byname;
+#endif // _MSL_NO_MESSAGE_FACET
+#endif /* !defined(_STLP_NO_IMPORT_LOCALE) */
diff --git a/main/source/stlport/stlport/using/ostream b/main/source/stlport/stlport/using/ostream
new file mode 100644
index 00000000..f505f1cb
--- /dev/null
+++ b/main/source/stlport/stlport/using/ostream
@@ -0,0 +1,10 @@
+using _STLP_NEW_IO_NAMESPACE::basic_ostream;
+using _STLP_NEW_IO_NAMESPACE::ostream;
+
+# ifndef _STLP_NO_WIDE_STREAMS
+using _STLP_NEW_IO_NAMESPACE::wostream;
+# endif
+
+using _STLP_NEW_IO_NAMESPACE::endl;
+using _STLP_NEW_IO_NAMESPACE::ends;
+using _STLP_NEW_IO_NAMESPACE::flush;
diff --git a/main/source/stlport/stlport/using/sstream b/main/source/stlport/stlport/using/sstream
new file mode 100644
index 00000000..f9ab695c
--- /dev/null
+++ b/main/source/stlport/stlport/using/sstream
@@ -0,0 +1,16 @@
+using _STLP_NEW_IO_NAMESPACE::basic_stringbuf;
+using _STLP_NEW_IO_NAMESPACE::stringbuf;
+
+using _STLP_NEW_IO_NAMESPACE::basic_istringstream;
+using _STLP_NEW_IO_NAMESPACE::basic_ostringstream;
+using _STLP_NEW_IO_NAMESPACE::basic_stringstream;
+using _STLP_NEW_IO_NAMESPACE::istringstream;
+using _STLP_NEW_IO_NAMESPACE::ostringstream;
+using _STLP_NEW_IO_NAMESPACE::stringstream;
+
+#ifndef _STLP_NO_WIDE_STREAMS
+using _STLP_NEW_IO_NAMESPACE::wstringbuf;
+using _STLP_NEW_IO_NAMESPACE::wistringstream;
+using _STLP_NEW_IO_NAMESPACE::wostringstream;
+using _STLP_NEW_IO_NAMESPACE::wstringstream;
+#endif
diff --git a/main/source/stlport/stlport/using/streambuf b/main/source/stlport/stlport/using/streambuf
new file mode 100644
index 00000000..9507277c
--- /dev/null
+++ b/main/source/stlport/stlport/using/streambuf
@@ -0,0 +1,5 @@
+using _STLP_NEW_IO_NAMESPACE::basic_streambuf;
+using _STLP_NEW_IO_NAMESPACE::streambuf;
+#ifndef _STLP_NO_WIDE_STREAMS
+using _STLP_NEW_IO_NAMESPACE::wstreambuf;
+# endif
diff --git a/main/source/stlport/stlport/using/strstream b/main/source/stlport/stlport/using/strstream
new file mode 100644
index 00000000..d1049058
--- /dev/null
+++ b/main/source/stlport/stlport/using/strstream
@@ -0,0 +1,4 @@
+using _STLP_NEW_IO_NAMESPACE::strstreambuf;
+using _STLP_NEW_IO_NAMESPACE::istrstream;
+using _STLP_NEW_IO_NAMESPACE::ostrstream;
+using _STLP_NEW_IO_NAMESPACE::strstream;
diff --git a/main/source/stlport/stlport/utility b/main/source/stlport/stlport/utility
new file mode 100644
index 00000000..3b0d212b
--- /dev/null
+++ b/main/source/stlport/stlport/utility
@@ -0,0 +1,65 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_UTILITY
+#define _STLP_UTILITY
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x75
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+# ifndef __TYPE_TRAITS_H
+#  include <stl/type_traits.h>
+# endif
+
+# if !defined (_STLP_DEBUG_H) && (defined  (_STLP_DEBUG) || defined (_STLP_ASSERTIONS))
+#  include <stl/debug/_debug.h>
+# endif
+
+# ifndef _STLP_INTERNAL_PAIR_H
+#  include <stl/_pair.h>
+# endif
+
+# if defined (_STLP_IMPORT_VENDOR_STD)
+#   include _STLP_NATIVE_HEADER(utility)
+# else
+#  if defined (_STLP_MSVC) && ! defined (_STLP_INTERNAL_ITERATOR_H)
+#   include <stl/_iterator.h>
+#  endif
+# endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x75)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_UTILITY */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/valarray b/main/source/stlport/stlport/valarray
new file mode 100644
index 00000000..fa985095
--- /dev/null
+++ b/main/source/stlport/stlport/valarray
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */ 
+
+#ifndef _STLP_VALARRAY
+#define _STLP_VALARRAY
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x76
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+#include <stl/_valarray.h>
+
+#if defined (_STLP_WHOLE_VENDOR_STD)
+# include _STLP_NATIVE_HEADER(valarray)
+#endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x76)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_VALARRAY */
+
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/vector b/main/source/stlport/stlport/vector
new file mode 100644
index 00000000..e78b26c3
--- /dev/null
+++ b/main/source/stlport/stlport/vector
@@ -0,0 +1,57 @@
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#ifndef _STLP_VECTOR
+#define _STLP_VECTOR
+
+# ifndef _STLP_OUTERMOST_HEADER_ID
+#  define _STLP_OUTERMOST_HEADER_ID 0x77
+#  include <stl/_prolog.h>
+# endif
+
+# ifdef _STLP_PRAGMA_ONCE
+#  pragma once
+# endif
+
+# ifndef _STLP_INTERNAL_ALGOBASE_H
+#  include <stl/_algobase.h>
+# endif
+
+#ifndef _STLP_INTERNAL_VECTOR_H
+# include <stl/_vector.h>
+#endif
+
+#if defined (_STLP_IMPORT_VENDOR_STD) && ! defined (_STLP_MINIMUM_IMPORT_STD)
+#  include _STLP_NATIVE_HEADER(vector)
+#endif
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x77)
+#  include <stl/_epilog.h>
+#  undef _STLP_OUTERMOST_HEADER_ID
+# endif
+
+#endif /* _STLP_VECTOR */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/wchar.h b/main/source/stlport/stlport/wchar.h
new file mode 100644
index 00000000..c6b656d7
--- /dev/null
+++ b/main/source/stlport/stlport/wchar.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# if !defined (_STLP_OUTERMOST_HEADER_ID)
+#  define _STLP_OUTERMOST_HEADER_ID 0x278
+#  include <stl/_prolog.h>
+# elif (_STLP_OUTERMOST_HEADER_ID == 0x278) && ! defined (_STLP_DONT_POP_0x278)
+#  define _STLP_DONT_POP_0x278
+# endif
+
+# if ! defined (_STLP_WINCE) && ! defined (_STLP_NO_WCHAR_T)
+
+# if defined ( __BORLANDC__ ) && (__BORLANDC__) >= 0x530
+// #  include <cstring>
+# include _STLP_NATIVE_CPP_C_HEADER(_str.h)
+using _STLP_VENDOR_CSTD::strlen;
+using _STLP_VENDOR_CSTD::strspn;
+# endif
+
+# if defined (__GNUC__) && defined (__APPLE__)
+#  include _STLP_NATIVE_C_HEADER(stddef.h)
+# else
+#  include _STLP_NATIVE_C_HEADER(wchar.h)
+# endif
+
+# endif /* WINCE */
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x278)
+#  if ! defined (_STLP_DONT_POP_0x278)
+#   include <stl/_epilog.h>
+#   undef  _STLP_OUTERMOST_HEADER_ID
+#   endif
+#   undef  _STLP_DONT_POP_0x278
+# endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/wctype.h b/main/source/stlport/stlport/wctype.h
new file mode 100644
index 00000000..2ad63ea0
--- /dev/null
+++ b/main/source/stlport/stlport/wctype.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# if !defined (_STLP_OUTERMOST_HEADER_ID)
+#  define _STLP_OUTERMOST_HEADER_ID 0x279
+#  include <stl/_prolog.h>
+# elif (_STLP_OUTERMOST_HEADER_ID == 0x279) && ! defined (_STLP_DONT_POP_0x279)
+#  define _STLP_DONT_POP_0x279
+# endif
+
+# include _STLP_NATIVE_C_HEADER(wctype.h)
+
+# if (_STLP_OUTERMOST_HEADER_ID == 0x279)
+#  if ! defined (_STLP_DONT_POP_0x279)
+#   include <stl/_epilog.h>
+#   undef  _STLP_OUTERMOST_HEADER_ID
+#   endif
+#   undef  _STLP_DONT_POP_0x279
+# endif
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/wrap_std/complex b/main/source/stlport/stlport/wrap_std/complex
new file mode 100644
index 00000000..a59d526c
--- /dev/null
+++ b/main/source/stlport/stlport/wrap_std/complex
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# include _STLP_NATIVE_HEADER(complex)
+
+# if defined (_STLP_USE_OWN_NAMESPACE)
+_STLP_BEGIN_NAMESPACE
+
+using _STLP_COMPLEX_NAMESPACE::complex;
+
+using _STLP_COMPLEX_NAMESPACE::real;
+using _STLP_COMPLEX_NAMESPACE::imag;
+using _STLP_COMPLEX_NAMESPACE::abs;
+using _STLP_COMPLEX_NAMESPACE::arg;
+using _STLP_COMPLEX_NAMESPACE::norm;
+
+using _STLP_COMPLEX_NAMESPACE::conj;
+using _STLP_COMPLEX_NAMESPACE::polar;
+
+using _STLP_COMPLEX_NAMESPACE::cos;
+using _STLP_COMPLEX_NAMESPACE::cosh;
+using _STLP_COMPLEX_NAMESPACE::exp;
+using _STLP_COMPLEX_NAMESPACE::log;
+using _STLP_COMPLEX_NAMESPACE::log10;
+using _STLP_COMPLEX_NAMESPACE::pow;
+using _STLP_COMPLEX_NAMESPACE::sin;
+using _STLP_COMPLEX_NAMESPACE::sinh;
+using _STLP_COMPLEX_NAMESPACE::sqrt;
+using _STLP_COMPLEX_NAMESPACE::tan;
+using _STLP_COMPLEX_NAMESPACE::tanh;
+
+_STLP_END_NAMESPACE
+# endif /* USE_OWN_NAMESPACE */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/wrap_std/export b/main/source/stlport/stlport/wrap_std/export
new file mode 100644
index 00000000..40144556
--- /dev/null
+++ b/main/source/stlport/stlport/wrap_std/export
@@ -0,0 +1,13 @@
+./complex
+./export
+./fstream
+./iomanip
+./ios
+./iosfwd
+./iostream
+./istream
+./locale
+./ostream
+./sstream
+./streambuf
+./strstream
diff --git a/main/source/stlport/stlport/wrap_std/fstream b/main/source/stlport/stlport/wrap_std/fstream
new file mode 100644
index 00000000..59ff9557
--- /dev/null
+++ b/main/source/stlport/stlport/wrap_std/fstream
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# if defined (_STLP_USE_NEW_IOSTREAMS)
+# include _STLP_NATIVE_HEADER(fstream)
+# if defined (_STLP_USE_OWN_NAMESPACE)
+_STLP_BEGIN_NAMESPACE
+# include <using/fstream>
+_STLP_END_NAMESPACE
+# endif /* _STLP_OWN_NAMESPACE */
+# else
+# include <wrap_std/h/fstream.h>
+# endif /* _STLP_USE_NEW_IOSTREAMS */
diff --git a/main/source/stlport/stlport/wrap_std/h/fstream.h b/main/source/stlport/stlport/wrap_std/h/fstream.h
new file mode 100644
index 00000000..c1106df4
--- /dev/null
+++ b/main/source/stlport/stlport/wrap_std/h/fstream.h
@@ -0,0 +1,7 @@
+# include _STLP_NATIVE_OLD_STREAMS_HEADER(fstream.h)
+# if defined  (_STLP_USE_NAMESPACES) && ! defined (_STLP_BROKEN_USING_DIRECTIVE)
+_STLP_BEGIN_NAMESPACE
+#  include <using/h/fstream.h>
+_STLP_END_NAMESPACE
+# endif /* _STLP_OWN_NAMESPACE */
+
diff --git a/main/source/stlport/stlport/wrap_std/h/iostream.h b/main/source/stlport/stlport/wrap_std/h/iostream.h
new file mode 100644
index 00000000..b6e6d447
--- /dev/null
+++ b/main/source/stlport/stlport/wrap_std/h/iostream.h
@@ -0,0 +1,11 @@
+// # ifndef  _STLP_NO_WCHAR_T
+// #   include <wchar.h>
+// # endif
+
+# include _STLP_NATIVE_OLD_STREAMS_HEADER(iostream.h)
+
+# if defined (_STLP_USE_OWN_NAMESPACE)
+_STLP_BEGIN_NAMESPACE
+# include <using/h/iostream.h>
+_STLP_END_NAMESPACE
+# endif /* _STLP_USE_OWN_NAMESPACE */
diff --git a/main/source/stlport/stlport/wrap_std/h/streambuf.h b/main/source/stlport/stlport/wrap_std/h/streambuf.h
new file mode 100644
index 00000000..822f8557
--- /dev/null
+++ b/main/source/stlport/stlport/wrap_std/h/streambuf.h
@@ -0,0 +1,9 @@
+//*TY 02/11/2000 - added missing header file
+
+# include _STLP_NATIVE_OLD_STREAMS_HEADER(iostream.h)
+
+# if defined (_STLP_USE_OWN_NAMESPACE)
+_STLP_BEGIN_NAMESPACE
+# include <using/h/streambuf.h>
+_STLP_END_NAMESPACE
+# endif /* _STLP_USE_OWN_NAMESPACE */
diff --git a/main/source/stlport/stlport/wrap_std/h/strstream.h b/main/source/stlport/stlport/wrap_std/h/strstream.h
new file mode 100644
index 00000000..6a255d34
--- /dev/null
+++ b/main/source/stlport/stlport/wrap_std/h/strstream.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+#  if defined (_MSC_VER) && (_MSC_VER <= 1200)
+#   include _STLP_NATIVE_OLD_STREAMS_HEADER(strstrea.h)
+#  else
+#   include _STLP_NATIVE_OLD_STREAMS_HEADER(strstream.h)
+#  endif
+
+# ifdef _STLP_USE_OWN_NAMESPACE
+_STLP_BEGIN_NAMESPACE
+#  include <using/h/strstream.h>
+_STLP_END_NAMESPACE
+#endif /* _STLP_OWN_NAMESPACE */
+
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/wrap_std/iomanip b/main/source/stlport/stlport/wrap_std/iomanip
new file mode 100644
index 00000000..a66ddf24
--- /dev/null
+++ b/main/source/stlport/stlport/wrap_std/iomanip
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# if defined (_STLP_USE_NEW_IOSTREAMS)
+
+#  include _STLP_NATIVE_HEADER(iomanip)
+
+#  ifdef _STLP_USE_OWN_NAMESPACE
+_STLP_BEGIN_NAMESPACE
+#   include <using/iomanip>
+_STLP_END_NAMESPACE
+#  endif /* _STLP_OWN_NAMESPACE */
+
+# else
+
+#  include _STLP_NATIVE_OLD_STREAMS_HEADER(iomanip.h)
+
+# if defined  (_STLP_USE_NAMESPACES) && ! defined (_STLP_BROKEN_USING_DIRECTIVE)
+_STLP_BEGIN_NAMESPACE
+#   include <using/h/iomanip.h>
+_STLP_END_NAMESPACE
+#  endif /* _STLP_USE_OWN_NAMESPACE */
+
+# endif /* _STLP_USE_NEW_IOSTREAMS */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/wrap_std/ios b/main/source/stlport/stlport/wrap_std/ios
new file mode 100644
index 00000000..52810471
--- /dev/null
+++ b/main/source/stlport/stlport/wrap_std/ios
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# if defined (_STLP_USE_NEW_IOSTREAMS)
+#  include _STLP_NATIVE_HEADER(ios)
+# ifdef _STLP_USE_OWN_NAMESPACE
+_STLP_BEGIN_NAMESPACE
+#  include <using/ios>
+_STLP_END_NAMESPACE
+#endif /* _STLP_OWN_NAMESPACE */
+# else
+#  include <wrap_std/h/iostream.h>
+# endif /* USE_NEW_IOSTREAMS */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/wrap_std/iosfwd b/main/source/stlport/stlport/wrap_std/iosfwd
new file mode 100644
index 00000000..7808dd1f
--- /dev/null
+++ b/main/source/stlport/stlport/wrap_std/iosfwd
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# ifndef _STLP_CSTDDEF
+#  include <cstddef> /* wchar_t */
+# endif
+
+# ifndef _STLP_CSTRING
+#  include <cstring>
+# endif
+
+# if defined (_STLP_USE_NEW_IOSTREAMS)
+
+#   include _STLP_NATIVE_HEADER(iosfwd)
+
+#  if defined ( __MWERKS__ ) || defined (__KCC)
+// MSL leaves a few important things out of <iosfwd>.
+// We expect this to be fixed in later MSL implementations
+# if !defined( __MSL_CPP__ ) || __MSL_CPP__ <= 0x4105
+
+#    ifdef MSIPL_USING_NAMESPACE
+namespace std {
+#    endif
+
+// A few things that seem to be missing from CodeWarrior's <iosfwd>
+#    ifdef __MWERKS__
+template <class charT, class traits = char_traits<charT> >
+  class istreambuf_iterator;
+
+template <class charT, class traits = char_traits<charT> >
+  class ostreambuf_iterator;
+#    endif /* __MWERKS__ */
+
+#  if defined (_STLP_NO_NATIVE_WIDE_STREAMS)
+class streampos;
+#  endif
+
+#  ifdef MSIPL_USING_NAMESPACE
+	} // namespace std
+#    endif
+
+#   endif    /* __MSL__ version */
+#  endif  /* MWERKS */
+
+# else 
+
+_STLP_BEGIN_NAMESPACE
+template <class _Tp> class allocator;
+_STLP_END_NAMESPACE
+
+// use old-style iostreams
+#  include <iostream.h>
+#  include <fstream.h>
+
+#ifndef _STLP_CHAR_TRAITS_H
+// that defines char_traits or imports std::char_traits
+# include <stl/char_traits.h>
+#endif
+
+# endif /* _STLP_USE_NEW_IOSTREAMS */
+
+# ifdef _STLP_USE_ABBREVS
+#  define istream_iterator               _iS__It
+#  define ostream_iterator               _oS__It
+# endif
+
+# if  defined (_STLP_USE_OWN_NAMESPACE)
+_STLP_BEGIN_NAMESPACE
+#  include <using/iosfwd>
+_STLP_END_NAMESPACE
+# endif 
+
+// Local Variables:
+// mode:C++
+// End:
+
+
+
+
+
+
+
diff --git a/main/source/stlport/stlport/wrap_std/iostream b/main/source/stlport/stlport/wrap_std/iostream
new file mode 100644
index 00000000..a42db0c2
--- /dev/null
+++ b/main/source/stlport/stlport/wrap_std/iostream
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# if defined (_STLP_MSVC) && (_STLP_MSVC < 1200)
+#  include <cwchar>
+// lower ifdef level
+#  include <ios>
+# endif
+
+# if defined (_STLP_USE_NEW_IOSTREAMS)
+#  include _STLP_NATIVE_HEADER(iostream)
+#   if defined  (_STLP_USE_OWN_NAMESPACE)
+_STLP_BEGIN_NAMESPACE
+#    include <using/iostream>
+_STLP_END_NAMESPACE
+#  endif
+# else
+#  include <wrap_std/h/iostream.h>
+# endif /* _STLP_USE_NEW_STYLE_IOSTREAMS */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/wrap_std/istream b/main/source/stlport/stlport/wrap_std/istream
new file mode 100644
index 00000000..4191a527
--- /dev/null
+++ b/main/source/stlport/stlport/wrap_std/istream
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# if defined (_STLP_MSVC) && (_STLP_MSVC < 1200)
+// #  include <cwchar>
+// lower ifdef level
+#  include <ios>
+# endif
+
+# if defined (_STLP_USE_NEW_IOSTREAMS)
+
+# include _STLP_NATIVE_HEADER(istream)
+
+# if defined  (_STLP_USE_OWN_NAMESPACE)
+_STLP_BEGIN_NAMESPACE
+#  include <using/istream>
+_STLP_END_NAMESPACE
+#  endif /* _STLP_OWN_NAMESPACE */
+
+# else
+
+# include _STLP_NATIVE_OLD_STREAMS_HEADER(iostream.h)
+# if defined  (_STLP_USE_NAMESPACES)
+_STLP_BEGIN_NAMESPACE
+using ::istream;
+// using ::ws;
+_STLP_END_NAMESPACE
+# endif /* NAMESPACES */
+
+# endif /* if defined (_STLP_USE_NEW_IOSTREAMS) */
+
+// Local Variables:
+// mode:C++
+// End:
+
diff --git a/main/source/stlport/stlport/wrap_std/locale b/main/source/stlport/stlport/wrap_std/locale
new file mode 100644
index 00000000..2f8d5494
--- /dev/null
+++ b/main/source/stlport/stlport/wrap_std/locale
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# ifndef _STLP_CSTDLIB
+#  include <cstdlib>
+# endif
+
+# include _STLP_NATIVE_HEADER(locale)
+
+# ifdef _STLP_USE_OWN_NAMESPACE
+_STLP_BEGIN_NAMESPACE
+#  include <using/locale>
+_STLP_END_NAMESPACE
+#endif /* _STLP_OWN_NAMESPACE */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/wrap_std/ostream b/main/source/stlport/stlport/wrap_std/ostream
new file mode 100644
index 00000000..44fe9eec
--- /dev/null
+++ b/main/source/stlport/stlport/wrap_std/ostream
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# if defined (_STLP_MSVC) && (_STLP_MSVC < 1200)
+// #  include <cwchar>
+// lower ifdef level
+#  include <ios>
+# endif
+
+# if defined (_STLP_USE_NEW_IOSTREAMS) || defined (__IN_STLPORT_OSTREAM)
+
+#  include _STLP_NATIVE_HEADER(ostream)
+
+#  if defined (_STLP_USE_OWN_NAMESPACE)
+_STLP_BEGIN_NAMESPACE
+# include <using/ostream>
+_STLP_END_NAMESPACE
+#   endif /* _STLP_OWN_NAMESPACE */
+
+# else
+
+#  include _STLP_NATIVE_OLD_STREAMS_HEADER(iostream.h)
+
+# if defined  (_STLP_USE_NAMESPACES) && ! defined (_STLP_BROKEN_USING_DIRECTIVE)
+_STLP_BEGIN_NAMESPACE
+# include <using/h/ostream.h>
+_STLP_END_NAMESPACE
+#   endif /* _STLP_NAMESPACE */
+# endif /* if defined (_STLP_USE_NEW_IOSTREAMS) */
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/wrap_std/sstream b/main/source/stlport/stlport/wrap_std/sstream
new file mode 100644
index 00000000..aac75787
--- /dev/null
+++ b/main/source/stlport/stlport/wrap_std/sstream
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# include _STLP_NATIVE_HEADER(sstream)
+# ifdef _STLP_USE_OWN_NAMESPACE
+_STLP_BEGIN_NAMESPACE
+#  include <using/sstream>
+_STLP_END_NAMESPACE
+#endif /* _STLP_OWN_NAMESPACE */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/wrap_std/streambuf b/main/source/stlport/stlport/wrap_std/streambuf
new file mode 100644
index 00000000..651fdc3e
--- /dev/null
+++ b/main/source/stlport/stlport/wrap_std/streambuf
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# if defined (_STLP_USE_NEW_IOSTREAMS)
+#  include _STLP_NATIVE_HEADER(streambuf)
+# else
+#  include <wrap_std/h/streambuf.h>		
+# endif
+
+# if defined (_STLP_USE_OWN_NAMESPACE) && defined (_STLP_USE_NEW_IOSTREAMS)
+_STLP_BEGIN_NAMESPACE
+#  include <using/streambuf> 
+_STLP_END_NAMESPACE
+# endif /* _STLP_OWN_NAMESPACE */
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/stlport/wrap_std/strstream b/main/source/stlport/stlport/wrap_std/strstream
new file mode 100644
index 00000000..b3c6056e
--- /dev/null
+++ b/main/source/stlport/stlport/wrap_std/strstream
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+# include _STLP_NATIVE_HEADER(strstream)
+
+# ifdef _STLP_USE_OWN_NAMESPACE
+_STLP_BEGIN_NAMESPACE
+#  include <using/strstream>
+_STLP_END_NAMESPACE
+#endif /* _STLP_OWN_NAMESPACE */
+
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/main/source/stlport/test/eh/LeakCheck.h b/main/source/stlport/test/eh/LeakCheck.h
new file mode 100644
index 00000000..14e0c550
--- /dev/null
+++ b/main/source/stlport/test/eh/LeakCheck.h
@@ -0,0 +1,219 @@
+/*
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ */
+/***********************************************************************************
+	LeakCheck.h
+	
+		SUMMARY: A suite of template functions for verifying the behavior of
+			operations in the presence of exceptions. Requires that the operations
+			be written so that each operation that could cause an exception causes
+			simulate_possible_failure() to be called (see "nc_alloc.h").
+		
+***********************************************************************************/
+#if !INCLUDED_MOTU_LeakCheck
+#define INCLUDED_MOTU_LeakCheck 1
+
+# include "Prefix.h"
+
+# include "nc_alloc.h"
+
+# if defined (EH_NEW_HEADERS)
+#  include <cstdio>
+#  include <cassert>
+#  include <iterator>
+# else
+#  include <stdio.h>
+#  include <assert.h>
+#  include <iterator.h>
+# endif
+
+# if defined (EH_NEW_IOSTREAMS)
+#  include <iostream>
+# else
+#  include <iostream.h>
+# endif
+
+EH_BEGIN_NAMESPACE
+
+template <class T1, class T2>
+inline ostream& operator << ( 
+ostream& s, 
+const pair <T1, T2>& p) {
+    return s<<'['<<p.first<<":"<<p.second<<']';
+}
+EH_END_NAMESPACE
+
+/*===================================================================================
+	CheckInvariant
+
+	EFFECTS:  Generalized function to check an invariant on a container. Specialize
+		this for particular containers if such a check is available.
+====================================================================================*/
+template <class C>
+void CheckInvariant(const C&)
+{
+}
+
+/*===================================================================================
+	WeakCheck
+
+	EFFECTS: Given a value and an operation, repeatedly applies the operation to a
+		copy of the value triggering the nth possible exception, where n increments
+		with each repetition until no exception is thrown or max_iters is reached.
+		Reports any detected memory leaks and checks any invariant defined for the
+		value type whether the operation succeeds or fails.
+====================================================================================*/
+template <class Value, class Operation>
+void WeakCheck( const Value& v, const Operation& op, long max_iters = 2000000 )
+{
+    bool succeeded = false;
+    bool failed = false;
+    gTestController.SetCurrentTestCategory("weak");
+    for ( long count = 0; !succeeded && !failed && count < max_iters; count++ )
+    {
+        gTestController.BeginLeakDetection();
+        {
+            Value dup = v;
+# ifndef EH_NO_EXCEPTIONS
+            try {
+# endif
+                gTestController.SetFailureCountdown(count);
+                op( dup );
+                succeeded = true;
+# ifndef EH_NO_EXCEPTIONS
+            }
+            catch(...) {}	// Just try again.
+# endif
+            gTestController.CancelFailureCountdown();
+            CheckInvariant(dup);
+        }
+        failed = gTestController.ReportLeaked();
+        EH_ASSERT( !failed );
+        
+        if ( succeeded )
+			gTestController.ReportSuccess(count);
+    }
+    EH_ASSERT( succeeded || failed );	// Make sure the count hasn't gone over
+}
+
+/*===================================================================================
+	ConstCheck
+
+	EFFECTS:  Similar to WeakCheck (above), but for operations which may not modify
+		their arguments. The operation is performed on the value itself, and no
+		invariant checking is performed. Leak checking still occurs.
+====================================================================================*/
+template <class Value, class Operation>
+void ConstCheck( const Value& v, const Operation& op, long max_iters = 2000000 )
+{
+    bool succeeded = false;
+    bool failed = false;
+    gTestController.SetCurrentTestCategory("const");
+    for ( long count = 0; !succeeded && !failed && count < max_iters; count++ )
+    {
+        gTestController.BeginLeakDetection();
+        {
+# ifndef EH_NO_EXCEPTIONS
+            try {
+# endif
+                gTestController.SetFailureCountdown(count);
+                op( v );
+                succeeded = true;
+# ifndef EH_NO_EXCEPTIONS
+            }
+            catch(...) {}	// Just try again.
+# endif
+            gTestController.CancelFailureCountdown();
+        }
+        failed = gTestController.ReportLeaked();
+        EH_ASSERT( !failed );
+
+        if ( succeeded )
+			gTestController.ReportSuccess(count);
+    }
+    EH_ASSERT( succeeded || failed );	// Make sure the count hasn't gone over
+}
+
+/*===================================================================================
+	StrongCheck
+
+	EFFECTS:  Similar to WeakCheck (above), but additionally checks a component of
+		the "strong guarantee": if the operation fails due to an exception, the
+		value being operated on must be unchanged, as checked with operator==().
+		
+	CAVEATS: Note that this does not check everything required for the strong
+		guarantee, which says that if an exception is thrown, the operation has no
+		effects. Do do that we would have to check that no there were no side-effects
+		on objects which are not part of v (e.g. iterator validity must be preserved).
+		
+====================================================================================*/
+template <class Value, class Operation>
+void StrongCheck( const Value& v, const Operation& op, long max_iters = 2000000 )
+{
+    bool succeeded = false;
+    bool failed = false;
+    gTestController.SetCurrentTestCategory("strong");
+    for ( long count = 0; !succeeded && !failed && count < max_iters; count++ )
+    {
+        gTestController.BeginLeakDetection();
+
+        {
+            Value dup = v;
+            {
+# ifndef EH_NO_EXCEPTIONS
+            try
+# endif
+			{
+                gTestController.SetFailureCountdown(count);
+                op( dup );
+                succeeded = true;
+                gTestController.CancelFailureCountdown();
+			}
+# ifndef EH_NO_EXCEPTIONS
+            catch(...)
+            {
+                gTestController.CancelFailureCountdown();
+                bool unchanged = dup == v;
+                EH_ASSERT( unchanged );
+                
+                if ( !unchanged )
+                {
+#if 0
+                    typedef typename Value::value_type value_type;
+                    EH_STD::ostream_iterator<value_type> o(EH_STD::cerr, " ");
+                    EH_STD::cerr<<"EH test FAILED:\nStrong guaranee failed !\n";
+                    EH_STD::copy(dup.begin(), dup.end(), o);
+                    EH_STD::cerr<<"\nOriginal is:\n";
+                    EH_STD::copy(v.begin(), v.end(), o);
+                    EH_STD::cerr<<EH_STD::endl;
+#endif
+                    failed = true;
+                }
+            }	// Just try again.
+# endif
+            CheckInvariant(v);
+        }
+
+        }
+
+	bool leaked = gTestController.ReportLeaked();
+	EH_ASSERT( !leaked );
+	if ( leaked )
+	  failed = true;
+    
+        if ( succeeded )
+			gTestController.ReportSuccess(count);
+    }
+    EH_ASSERT( succeeded || failed );	// Make sure the count hasn't gone over
+}
+
+#endif // INCLUDED_MOTU_LeakCheck
diff --git a/main/source/stlport/test/eh/Prefix.h b/main/source/stlport/test/eh/Prefix.h
new file mode 100644
index 00000000..b3271d7f
--- /dev/null
+++ b/main/source/stlport/test/eh/Prefix.h
@@ -0,0 +1,317 @@
+/***********************************************************************************
+  Prefix.h
+
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+			
+		SUMMARY: Configuration #defines for STL EH test suite
+		
+***********************************************************************************/
+
+#if ! defined (INCLUDED_MOTU_Prefix)
+#define INCLUDED_MOTU_Prefix 1
+
+// Gives much more thorough checking, but may slow the tests
+// considerably if your malloc is slow.
+#define TESTCLASS_DEEP_DATA 1
+
+# ifndef NO_FAST_ALLOCATOR
+// #  define NO_FAST_ALLOCATOR
+# endif
+
+// Define this to use the SGI STL. Undefine it to test a different installation
+#ifndef EH_NO_SGI_STL
+# define EH_USE_SGI_STL 1
+#endif
+
+
+#if EH_USE_SGI_STL
+
+#define EH_ASSERT _STLP_ASSERT
+
+//=========================================================================
+// SGI STL-specific #defines
+//	These control the behavior of the test suite when used with the SGI
+//	STL. They have no effect when testing other STL implementations.
+//=========================================================================
+
+// # define _STLP_USE_RAW_SGI_ALLOCATORS
+# ifndef _STLP_USE_NEWALLOC
+#  define _STLP_USE_NEWALLOC
+# endif
+# if !defined  (_STLP_NO_CUSTOM_IO) && ! defined (__BORLANDC__)
+#  define _STLP_NO_CUSTOM_IO
+# endif
+
+// Just include something to get whatever configuration header we're using.
+# include <stl/_config.h>
+
+# ifndef _STLP_CALL
+#  define _STLP_CALL
+# endif
+
+# if defined(_STLP_USE_NAMESPACES)
+#  define EH_USE_NAMESPACES _STLP_USE_NAMESPACES
+# endif
+
+# define EH_BEGIN_NAMESPACE _STLP_BEGIN_NAMESPACE
+# define EH_END_NAMESPACE _STLP_END_NAMESPACE
+
+#  define EH_NEW_HEADERS 1
+
+# if defined (_STLP_USE_NEW_IOSTREAMS)
+#  define EH_NEW_IOSTREAMS 1
+# endif
+
+# if !defined (_STLP_USE_EXCEPTIONS)
+#  define EH_NO_EXCEPTIONS
+# endif
+
+# if defined (_STLP_TEMPLATE_PARAM_SUBTYPE_BUG)
+#  define EH_TEMPLATE_PARAM_SUBTYPE_BUG _STLP_TEMPLATE_PARAM_SUBTYPE_BUG
+# endif
+
+# if defined(_STLP_MULTI_CONST_TEMPLATE_ARG_BUG)
+#  define EH_MULTI_CONST_TEMPLATE_ARG_BUG _STLP_MULTI_CONST_TEMPLATE_ARG_BUG
+# endif
+
+# if defined (STLPORT)
+#  define EH_STD STLPORT
+# elif defined(__STD)
+#  define EH_STD __STD
+# endif
+
+// we want to be portable here, so std:: won't work.
+# if defined(STLPORT_CSTD)
+#  define EH_CSTD STLPORT_CSTD
+# else
+#  define EH_CSTD std
+# endif
+
+
+# define EH_DISTANCE( a, b, result ) EH_STD::distance( a, b, result )
+
+# define EH_HASHED_CONTAINERS_IMPLEMENTED 1
+# define EH_HASH_CONTAINERS_SUPPORT_RESIZE 1
+# define EH_HASH_CONTAINERS_SUPPORT_ITERATOR_CONSTRUCTION 1
+# define EH_SLIST_IMPLEMENTED 1
+# define EH_SELECT1ST_HINT __select1st_hint
+// fbp : DEC cxx is unable to compile it for some reason
+# if !( defined (__DECCXX)  || defined (__amigaos__) || (defined (__GNUC__) && (__GNUC_MINOR__ < 8)))
+#  define EH_ROPE_IMPLEMENTED 1
+# endif
+# define EH_STRING_IMPLEMENTED 1
+// # define EH_BITSET_IMPLEMENTED 1
+//# define EH_VALARRAY_IMPLEMENTED 1	- we have no tests yet for valarray
+
+# define stl_destroy EH_STD::destroy
+# include <memory>
+
+template <class _Tp>
+class _STLP_CLASS_DECLSPEC EH_allocator;
+
+template <class _Tp>
+class _STLP_CLASS_DECLSPEC EH_allocator {
+public:
+
+  typedef _Tp        value_type;
+  typedef value_type *       pointer;
+  typedef const _Tp* const_pointer;
+  typedef _Tp&       reference;
+  typedef const _Tp& const_reference;
+  typedef size_t     size_type;
+  typedef ptrdiff_t  difference_type;
+# if defined (_STLP_MEMBER_TEMPLATE_CLASSES)
+  template <class _Tp1> struct rebind {
+    typedef EH_allocator<_Tp1> other;
+  };
+# endif
+  EH_allocator() _STLP_NOTHROW {}
+ # if defined (_STLP_MEMBER_TEMPLATES)
+  template <class _Tp1> EH_allocator(const EH_allocator<_Tp1>&) _STLP_NOTHROW {}
+ # endif    
+  EH_allocator(const EH_allocator<_Tp>&) _STLP_NOTHROW {}
+  ~EH_allocator() _STLP_NOTHROW {}
+  pointer address(reference __x) { return &__x; }
+  const_pointer address(const_reference __x) const { return &__x; }
+  // __n is permitted to be 0.  The C++ standard says nothing about what the return value is when __n == 0.
+  _Tp* allocate(size_type __n, const void* = 0) const { 
+    return __n != 0 ? __REINTERPRET_CAST(value_type*,EH_STD::__new_alloc::allocate(__n * sizeof(value_type))) : 0;
+  }
+  // __p is permitted to be a null pointer, only if n==0.
+  void deallocate(pointer __p, size_type __n) const {
+    _STLP_ASSERT( (__p == 0) == (__n == 0) )
+      if (__p != 0) EH_STD::__new_alloc::deallocate((void*)__p, __n * sizeof(value_type));
+  }
+  // backwards compatibility
+  void deallocate(pointer __p) const {  if (__p != 0) EH_STD::__new_alloc::deallocate((void*)__p, sizeof(value_type)); }
+  size_type max_size() const _STLP_NOTHROW  { return size_t(-1) / sizeof(value_type); }
+  void construct(pointer __p, const _Tp& __val) const { _STLP_STD::construct(__p, __val); }
+  void destroy(pointer __p) const { _STLP_STD::destroy(__p); }
+
+};
+
+template <class _T1> inline bool  _STLP_CALL operator==(const EH_allocator<_T1>&, const EH_allocator<_T1>&)  { return true; }
+template <class _T1> inline bool  _STLP_CALL operator!=(const EH_allocator<_T1>&, const EH_allocator<_T1>&) { return false; }
+
+_STLP_BEGIN_NAMESPACE
+// If custom allocators are being used without member template classes support :
+// user (on purpose) is forced to define rebind/get operations !!!
+template <class _Tp1, class _Tp2>
+inline EH_allocator<_Tp2>& _STLP_CALL
+__stl_alloc_rebind(EH_allocator<_Tp1>& __a, const _Tp2*) {  return (EH_allocator<_Tp2>&)(__a); }
+template <class _Tp1, class _Tp2>
+inline EH_allocator<_Tp2> _STLP_CALL
+__stl_alloc_create(const EH_allocator<_Tp1>&, const _Tp2*) { return EH_allocator<_Tp2>(); }
+_STLP_END_NAMESPACE
+
+# define eh_allocator(T) ::EH_allocator<T>
+
+# define EH_BIT_VECTOR_IMPLEMENTED
+
+# if defined(_STLP_CLASS_PARTIAL_SPECIALIZATION) && !defined(_STLP_NO_BOOL)
+#  define EH_BIT_VECTOR EH_STD::vector<bool, eh_allocator(bool) >
+# else
+#  ifdef _STLP_NO_BOOL
+#  undef   EH_BIT_VECTOR_IMPLEMENTED
+#  else
+#   define EH_BIT_VECTOR EH_STD::__vector__<bool, eh_allocator(bool) >
+#  endif
+# endif
+
+#else // !USE_SGI_STL
+//=========================================================================
+// Configuration for testing other non-SGI STL implementations
+//=========================================================================
+
+// Metrowerks configuration
+# ifdef __MWERKS__
+
+# define EH_ASSERT assert
+// Get MSL configuration header
+#  include <ansi_parms.h>
+
+#  if __MSL__ >= 24
+
+#   define EH_NEW_HEADERS 1
+#   if defined (_MSL_USING_NAMESPACE)
+#    define EH_USE_NAMESPACES 1
+#   endif
+#	define EH_BIT_VECTOR vector<bool>
+#   define EH_DISTANCE( a, b, result ) do { result = distance( a, b ); } while (0)
+
+#  else
+
+#   error No configuration for earlier versions of MSL
+
+#  endif	// __MSL__ >= 24
+
+// Bugs fixed in CWPro3
+#  if __MWERKS__ < 0x2100
+#   define EH_TEMPLATE_PARAM_SUBTYPE_BUG 1
+#  endif
+
+// Bugs in CWPro3
+#  if __MWERKS__ <= 0x2110
+#   define EH_MULTI_CONST_TEMPLATE_ARG_BUG 1
+#  else
+#   pragma warning not sure the above bug is fixed yet
+#  endif
+
+#  define EH_SLIST_IMPLEMENTED 1
+//#  define EH_HASHED_CONTAINERS_IMPLEMENTED 1
+
+#  define EH_NEW_IOSTREAMS 1
+#  define EH_USE_NOTHROW 1
+# endif // Metrowerks configuration
+
+#if defined (__SUNPRO_CC)
+# define stl_destroy __RWSTD::__destroy
+# define EH_DISTANCE( a, b, result ) distance( a, b, result )
+# define EH_BIT_VECTOR EH_STD::vector<bool>
+# define EH_NEW_HEADERS 1
+# define EH_USE_NAMESPACES 1
+# define EH_NEW_IOSTREAMS 1
+# define EH_ASSERT assert
+# define EH_STRING_IMPLEMENTED 1
+# elif defined (__KCC)
+# define stl_destroy EH_STD::destroy
+# define EH_DISTANCE( a, b, result ) do { result = distance( a, b ); } while (0)
+# define EH_BIT_VECTOR EH_STD::vector<bool>
+# define EH_NEW_HEADERS 1
+# define EH_USE_NAMESPACES 1
+# define EH_NEW_IOSTREAMS 1
+# define EH_ASSERT assert
+# define EH_CSTD
+# define EH_STRING_IMPLEMENTED 1
+# define EH_MULTI_CONST_TEMPLATE_ARG_BUG 1
+# define EH_SELECT1ST_HINT select1st
+# else
+# define stl_destroy destroy
+#endif
+
+//
+// Compiler-independent configuration
+//
+# ifdef EH_USE_NAMESPACES
+# ifdef STLPORT
+#  define EH_STD STLPORT
+# else
+#  define EH_STD std
+# endif
+# ifdef STLPORT_CSTD
+#  define EH_STD STLPORT_CSTD
+# else
+#  define EH_STD std
+# endif
+#  define EH_BEGIN_NAMESPACE namespace EH_STD {
+#  define EH_END_NAMESPACE   }
+# else
+#  define EH_BEGIN_NAMESPACE
+#  define EH_END_NAMESPACE
+#  define EH_STD
+# endif
+
+# ifndef EH_CSTD
+#  define EH_CSTD EH_STD
+# endif
+
+#endif // !USE_SGI_STL
+
+
+//
+// Library-independent configuration.
+//
+#if defined( EH_MULTI_CONST_TEMPLATE_ARG_BUG) && !defined( EH_SELECT1ST_HINT )
+template <class Pair, class U>		
+// JDJ (CW Pro1 doesn't like const when first_type is also const)
+struct eh_select1st_hint : public unary_function<Pair, U> {
+    const U& operator () (const Pair& x) const { return x.first; }
+};
+# define EH_SELECT1ST_HINT eh_select1st_hint
+#endif
+
+
+#if EH_USE_NAMESPACES
+# define EH_USE_STD using namespace EH_STD;
+#else
+# define EH_USE_STD
+#endif
+
+#if defined (EH_USE_NAMESPACES) && !defined(_STLP_VENDOR_GLOBAL_CSTD)
+# define USING_CSTD_NAME(name) using EH_CSTD :: name;
+#else
+# define USING_CSTD_NAME(name)
+#endif
+
+#endif // INCLUDED_MOTU_Prefix
+
+
diff --git a/main/source/stlport/test/eh/SortClass.h b/main/source/stlport/test/eh/SortClass.h
new file mode 100644
index 00000000..e7f1c0c4
--- /dev/null
+++ b/main/source/stlport/test/eh/SortClass.h
@@ -0,0 +1,76 @@
+/***********************************************************************************
+	SortClass.h
+	
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+		
+		SUMMARY: A class designed to test operations that compares objects. All
+			comparisons on SortClass may fail. Also records its own address for
+			the sake of testing the stability of sorting algorithms.
+		
+***********************************************************************************/
+#if ! defined (INCLUDED_MOTU_SortClass)
+#define INCLUDED_MOTU_SortClass 1
+
+# include "Prefix.h"
+# include "TestClass.h"
+
+class SortClass : public TestClass
+{
+public:
+	enum { kRange = 100 };
+
+	SortClass( int v ) : TestClass( v ), addr(this) {}
+	SortClass() : TestClass( (int)get_random(kRange) ), addr(this) {}
+	
+	bool operator<( const TestClass& rhs ) const
+	{
+		simulate_possible_failure();
+		return (const TestClass&)*this < ( rhs );
+	}
+	
+	bool operator==( const TestClass& rhs ) const
+	{
+		simulate_possible_failure();
+		return (const TestClass&)*this == ( rhs );
+	}
+	
+	SortClass* GetAddress() const { return addr; }
+	void ResetAddress() { addr = this; }
+	
+private:
+	SortClass* addr;
+};
+
+inline bool operator>( const SortClass& lhs, const SortClass& rhs ) {
+    return rhs < lhs;
+}
+
+inline bool operator<=( const SortClass& lhs, const SortClass& rhs ) {
+    return !(rhs < lhs);
+}
+
+inline bool operator>=( const SortClass& lhs, const SortClass& rhs ) {
+    return !(lhs < rhs);
+}
+
+inline bool operator != ( const SortClass& lhs, const SortClass& rhs ) {
+    return !(lhs == rhs);
+}
+
+#if defined( __MWERKS__ ) && __MWERKS__ <= 0x3000 && !__SGI_STL
+# if defined( __MSL__ ) && __MSL__ < 0x2406
+__MSL_FIX_ITERATORS__(SortClass);
+__MSL_FIX_ITERATORS__(const SortClass);
+# endif
+#endif
+
+#endif // INCLUDED_MOTU_SortClass
diff --git a/main/source/stlport/test/eh/TestClass.cpp b/main/source/stlport/test/eh/TestClass.cpp
new file mode 100644
index 00000000..484a1e9d
--- /dev/null
+++ b/main/source/stlport/test/eh/TestClass.cpp
@@ -0,0 +1,35 @@
+/***********************************************************************************
+	TestClass.cpp
+	
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+
+***********************************************************************************/
+#include "TestClass.h"
+
+# if defined (EH_NEW_IOSTREAMS)
+#include <iostream>
+# else
+#include <iostream.h>
+# endif
+
+# ifdef EH_NEW_IOSTREAMS
+EH_STD::ostream& 
+operator << (EH_STD::ostream& s, 
+	     const TestClass& t) { 
+  return s<<t.value(); 
+} 
+
+# else
+ostream& 
+operator << (ostream& s, const TestClass& t) { return s<<t.value(); } 
+# endif
+
diff --git a/main/source/stlport/test/eh/TestClass.h b/main/source/stlport/test/eh/TestClass.h
new file mode 100644
index 00000000..65f009e3
--- /dev/null
+++ b/main/source/stlport/test/eh/TestClass.h
@@ -0,0 +1,172 @@
+/***********************************************************************************
+	TestClass.h
+	
+ * Copyright (c) 1997-1998
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+		
+		SUMMARY: TestClass simulates a class that uses resources. It is designed to
+			cause exceptions when it is constructed or copied.
+		
+***********************************************************************************/
+#ifndef INCLUDED_MOTU_TestClass
+#define INCLUDED_MOTU_TestClass 1
+
+# include "Prefix.h"
+
+# if defined (EH_NEW_HEADERS)
+#  include <functional>
+#  include <utility>
+#  include <climits>
+# else
+#  include <function.h>
+#  include <pair.h>
+#  include <limits.h>
+# endif
+
+
+#include <iosfwd>
+#include "random_number.h"
+#include "nc_alloc.h"
+
+class TestClass
+{
+public:
+    inline TestClass();
+    inline TestClass( int value );
+    inline TestClass( const TestClass& rhs );
+    inline ~TestClass();
+    
+    inline TestClass& operator=( const TestClass& rhs );
+    inline int value() const;
+	
+    inline TestClass operator!() const;
+
+    bool operator==( const TestClass& rhs ) const
+    {
+      return value() == rhs.value();
+    }
+
+    bool operator<( const TestClass& rhs ) const {
+      return value() < rhs.value();
+    }
+
+protected:
+    static inline unsigned int get_random(unsigned range = UINT_MAX);
+private:
+	inline void Init( int value );
+
+#if TESTCLASS_DEEP_DATA
+    int *p;
+#else
+	int v;
+#endif
+};
+
+#if defined( __MWERKS__ ) && __MWERKS__ <= 0x3000 && !__SGI_STL
+# if defined( __MSL__ ) && __MSL__ < 0x2406
+#  include <iterator.h>
+__MSL_FIX_ITERATORS__(TestClass);
+__MSL_FIX_ITERATORS__(const TestClass);
+typedef EH_STD::pair<const TestClass, TestClass> pair_testclass_testclass;
+__MSL_FIX_ITERATORS__( pair_testclass_testclass );
+__MSL_FIX_ITERATORS__( const pair_testclass_testclass );
+# endif
+#endif
+
+inline void TestClass::Init( int value )
+{
+#if TESTCLASS_DEEP_DATA
+	p = new int( value );
+#else
+	simulate_constructor();
+	v = value;
+#endif
+}
+
+inline TestClass::TestClass()
+{
+	Init( int(get_random()) );
+}
+
+inline TestClass::TestClass( int value )
+{
+	Init( value );
+}
+
+inline TestClass::TestClass( const TestClass& rhs )
+{
+	Init( rhs.value() );
+}
+
+inline TestClass::~TestClass()
+{
+#if TESTCLASS_DEEP_DATA
+	delete p;
+#else
+	simulate_destructor();
+#endif
+}
+
+inline TestClass& TestClass::operator=( const TestClass& rhs )
+{
+#if TESTCLASS_DEEP_DATA
+	int *newP = new int( rhs.value() );
+	delete p;
+	p = newP;
+#else
+	simulate_possible_failure();
+    v = rhs.value();
+#endif
+    return *this;
+}
+
+inline int TestClass::value() const
+{
+#if TESTCLASS_DEEP_DATA
+	return *p;
+#else
+	return v;
+#endif
+}
+
+inline TestClass TestClass::operator!() const
+{
+    return TestClass( value()+1 );
+}
+
+inline bool operator>( const TestClass& lhs, const TestClass& rhs ) {
+    return rhs < lhs;
+}
+
+inline bool operator>=( const TestClass& lhs, const TestClass& rhs ) {
+    return !(lhs < rhs);
+}
+
+inline bool operator<=( const TestClass& lhs, const TestClass& rhs ) {
+    return !(rhs < lhs);
+}
+
+inline bool operator != ( const TestClass& lhs, const TestClass& rhs ) {
+    return lhs.value() != rhs.value();
+}
+
+inline unsigned int TestClass::get_random( unsigned range )
+{
+    return random_number( range );
+}
+
+# ifdef EH_NEW_IOSTREAMS
+extern EH_STD::ostream& operator << ( EH_STD::ostream& s, const TestClass&);
+# else
+extern ostream& operator << ( ostream& s, const TestClass&);
+# endif
+
+#endif // INCLUDED_MOTU_TestClass
diff --git a/main/source/stlport/test/eh/Tests.h b/main/source/stlport/test/eh/Tests.h
new file mode 100644
index 00000000..5f504493
--- /dev/null
+++ b/main/source/stlport/test/eh/Tests.h
@@ -0,0 +1,59 @@
+/***********************************************************************************
+	Tests.h
+	
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+		
+		SUMMARY: Declarations of all of the tests in the exception test suite.
+		
+***********************************************************************************/
+#if ! defined (INCLUDED_MOTU_Tests)
+#define INCLUDED_MOTU_Tests 1
+
+# include "Prefix.h"
+
+void test_algobase();
+void test_algo();
+void test_list();
+void test_map();
+void test_multimap();
+void test_set();
+void test_multiset();
+void test_vector();
+void test_deque();
+void test_bit_vector();
+
+#if defined( EH_HASHED_CONTAINERS_IMPLEMENTED )
+void test_hash_map();
+void test_hash_multimap();
+void test_hash_set();
+void test_hash_multiset();
+#endif
+
+#if defined( EH_ROPE_IMPLEMENTED )
+void test_rope();
+#endif
+
+#if defined( EH_SLIST_IMPLEMENTED )
+void test_slist();
+#endif
+
+#if defined( EH_STRING_IMPLEMENTED )
+void test_string();
+#endif
+#if defined( EH_BITSET_IMPLEMENTED )
+void test_bitset();
+#endif
+#if defined( EH_VALARRAY_IMPLEMENTED )
+void test_valarray();
+#endif
+
+#endif // INCLUDED_MOTU_Tests
diff --git a/main/source/stlport/test/eh/ThrowCompare.h b/main/source/stlport/test/eh/ThrowCompare.h
new file mode 100644
index 00000000..d3d3f761
--- /dev/null
+++ b/main/source/stlport/test/eh/ThrowCompare.h
@@ -0,0 +1,51 @@
+/***********************************************************************************
+	ThrowCompare.h
+	
+		Interface for the ThrowCompare class
+		
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+				
+***********************************************************************************/
+#ifndef ThrowCompare_H_
+#define ThrowCompare_H_
+
+# include "Prefix.h"
+# include "TestClass.h"
+
+struct ThrowCompare
+{
+	bool operator()( const TestClass& a, const TestClass& b ) const {
+	  simulate_possible_failure();
+	  return a < b;
+	}
+};
+
+
+struct ThrowEqual
+{
+	inline bool operator()( const TestClass& a, const TestClass& b ) const
+	{
+		simulate_possible_failure();
+		return a == b;
+	}
+};
+
+struct ThrowHash // : private ThrowCompare
+{
+	inline EH_CSTD::size_t operator()( const TestClass& a ) const
+	{
+		simulate_possible_failure();
+		return EH_CSTD::size_t(a.value());
+	}
+};
+
+#endif // ThrowCompare_H_
diff --git a/main/source/stlport/test/eh/bcb.mak b/main/source/stlport/test/eh/bcb.mak
new file mode 100644
index 00000000..eec9abdd
--- /dev/null
+++ b/main/source/stlport/test/eh/bcb.mak
@@ -0,0 +1,78 @@
+# ---------------------------------------------------------------------------
+BCC32=bcc32
+CPP32=cpp32
+
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+# ---------------------------------------------------------------------------
+PROJECT = eh_test.exe
+OBJFILES = TestClass.obj \
+  nc_alloc.obj \
+  random_number.obj \
+  test_algo.obj \
+  test_algobase.obj \
+  test_bit_vector.obj \
+  test_bitset.obj \
+  test_deque.obj \
+  test_hash_map.obj \
+  test_hash_set.obj \
+  test_list.obj \
+  test_map.obj \
+  test_rope.obj \
+  test_set.obj \
+  test_slist.obj \
+  test_string.obj \
+  test_valarray.obj \
+  test_vector.obj main.obj
+
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHPAS = .;
+PATHASM = .;
+PATHRC = .;
+
+# USERDEFINES = _STLP_NO_OWN_IOSTREAMS
+
+USERDEFINES = _DEBUG
+
+SYSDEFINES = _RTLDLL;NO_STRICT;USEPACKAGES
+# SYSDEFINES = NO_STRICT;USEPACKAGES
+ # ---------------------------------------------------------------------------
+CFLAG1 = -w- -jb -j1  -I.;..\..\stlport;$(BCB)\include; -Od -v -N -x -xp -tWC -D$(SYSDEFINES);$(USERDEFINES)
+
+LDFLAGS = -L..\..\lib;$(BCB)\..\lib cw32i.lib stlp.4.5.lib
+
+.autodepend
+# ---------------------------------------------------------------------------
+
+all : $(PROJECT)
+        cd ..\..\lib
+	..\test\eh\eh_test.exe -s 100
+
+$(PROJECT) : $(OBJFILES)
+	$(BCC32) -e$(PROJECT) $(CFLAG1) $(LDFLAGS) $(OBJFILES)
+
+clean:
+	del *.obj *.exe *.core *.tds
+
+# ---------------------------------------------------------------------------
+.cpp.obj:
+    $(BCC32) $(CFLAG1) -n$(@D) -c $<
+
+.cpp.exe:
+    $(BCC32) $(CFLAG1) $(LDFLAGS) -n$(@D) $<
+
+.cpp.i:
+    $(CPP32) $(CFLAG1) -n. -Sr -Ss -Sd {$< }
+# ---------------------------------------------------------------------------
+
diff --git a/main/source/stlport/test/eh/bug.cpp b/main/source/stlport/test/eh/bug.cpp
new file mode 100644
index 00000000..ef696ca8
--- /dev/null
+++ b/main/source/stlport/test/eh/bug.cpp
@@ -0,0 +1,39 @@
+#include <set>
+#include <vector>
+#include <iostream>
+#include <boost/timer.hpp>
+#include <boost/lexical_cast.hpp>
+
+struct compare
+{
+    bool operator()(int* x, int* y)
+        { return *x < *y; }
+            
+};
+
+int main(int argc, char const* const argv[])
+{
+    std::size_t niters = argc < 2 ? 1000 : boost::lexical_cast<std::size_t>(argv[1]);
+    
+    boost::timer t;
+    
+    std::vector<int> v;
+    for (int n = 0; n < niters; ++n)
+    {
+        v.insert(v.begin() + v.size()/2, n);
+    }
+
+    std::cout << "vector fill: " << t.elapsed() << std::endl;
+    
+    std::multiset<int*,compare> m;
+    for (int n = 0; n < niters; ++n)
+    {
+        m.insert(&v[n]);
+    }
+    std::cout << "map fill 1: " << t.elapsed() << std::endl;
+    for (int n = 0; n < niters; ++n)
+    {
+        m.insert(&v[n]);
+    }
+    std::cout << "map fill 2: " << t.elapsed() << std::endl;
+}
diff --git a/main/source/stlport/test/eh/como.mak b/main/source/stlport/test/eh/como.mak
new file mode 100644
index 00000000..8023a769
--- /dev/null
+++ b/main/source/stlport/test/eh/como.mak
@@ -0,0 +1,67 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+srcdir = .
+VPATH = .
+
+# point this to proper location
+STL_INCL=../../stlport
+
+AUX_LIST=TestClass.cpp main.cpp nc_alloc.cpp random_number.cpp
+
+TEST_LIST=test_algo.cpp  \
+test_algobase.cpp     test_list.cpp test_slist.cpp \
+test_bit_vector.cpp   test_vector.cpp \
+test_deque.cpp test_set.cpp test_map.cpp \
+test_hash_map.cpp  test_hash_set.cpp test_rope.cpp \
+test_string.cpp test_bitset.cpp test_valarray.cpp
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = ./eh_test
+TEST  = ./eh_test.out
+
+CC = e:\lang\como\bin\como
+CXX = $(CC) 
+
+# __COMO__ appears not to be defined automatically ;(
+CXXFLAGS = -D__COMO__ -D_MSC_VER=1200 --exceptions --microsoft -D_STLP_DEBUG -I${STL_INCL}  -I. ${CXX_EXTRA_FLAGS}
+
+LIBS = -lm 
+LIBSTDCXX = 
+
+check: $(TEST)
+
+$(TEST_EXE) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+
+
+$(TEST) : $(TEST_EXE)
+	$(TEST_EXE)
+
+SUFFIXES: .cpp.o.exe.out.res
+
+%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H -o $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -g -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) -o $*
+	./$* > $@
+	-rm -f $*
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+%.E: %.cpp
+	$(CXX) $(CXXFLAGS) -E $<  -o $@
+
+clean:
+	-rm -fr ${TEST_EXE} *.o *.rpo *.obj *.out core *~ Templates.DB
diff --git a/main/source/stlport/test/eh/cray.mak b/main/source/stlport/test/eh/cray.mak
new file mode 100644
index 00000000..a64bca05
--- /dev/null
+++ b/main/source/stlport/test/eh/cray.mak
@@ -0,0 +1,56 @@
+
+SHELL=/bin/sh
+
+# srcdir = .
+# VPATH = .
+
+STL_INCL=-I${PWD}/../../stlport/
+
+AUX_LIST=TestClass.o main.o nc_alloc.o random_number.o
+
+TEST_LIST=test_algo.o  \
+test_algobase.o     test_list.o test_slist.o \
+test_bit_vector.o   test_vector.o \
+test_deque_cray.o test_set.o test_map.o \
+test_hash_map.o  test_hash_set.o test_rope.o \
+test_string.o test_bitset.o test_valarray.o
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST)
+EXECS = $(LIST:%.o=%)
+TESTS = $(LIST:%.o=%.out)
+TEST_EXE  = eh_test
+TEST  = eh_test.out
+
+CC = CC
+CXX = $(CC)
+
+#CXXFLAGS = -hexceptions -DEH_DELETE_HAS_THROW_SPEC -I. ${STL_INCL} ${DEBUG_FLAGS}
+CXXFLAGS = -D_STLP_HAS_NO_EXCEPTIONS -I. ${STL_INCL} ${DEBUG_FLAGS}
+
+#LIBS = -L../../lib -lstlportx -lpthread
+LIBS = -L../../lib -lstlport -lpthread
+
+.SUFFIXES: .cpp .i .o .out
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(LIBS) $(OBJECTS) -o $(TEST_EXE)
+	./$(TEST_EXE) -s 100
+
+.cpp.o:
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+.cpp.i:
+	$(CXX) $(CXXFLAGS) $< -E > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $*.cpp -c -USINGLE -DMAIN -g -o $*.o
+	$(CXX) $(CXXFLAGS) $(LIBS) $*.o -o $*
+	./$* -q
+	-rm -f $*
+
+clean:
+	-rm -fr ${TEST_EXE} *.o *.ii *.out core
diff --git a/main/source/stlport/test/eh/cygwin.mak b/main/source/stlport/test/eh/cygwin.mak
new file mode 100644
index 00000000..6b6b146e
--- /dev/null
+++ b/main/source/stlport/test/eh/cygwin.mak
@@ -0,0 +1,123 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+srcdir = .
+VPATH = .
+
+# point this to proper location
+STL_INCL=-I../../stlport
+
+AUX_LIST=TestClass.cpp main.cpp nc_alloc.cpp random_number.cpp
+
+TEST_LIST=test_algo.cpp  \
+test_algobase.cpp     test_list.cpp test_slist.cpp \
+test_bit_vector.cpp   test_vector.cpp \
+test_deque.cpp test_set.cpp test_map.cpp \
+test_hash_map.cpp  test_hash_set.cpp test_rope.cpp \
+test_string.cpp test_bitset.cpp test_valarray.cpp
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST:%.cpp=obj/%.o) $(STAT_MODULE)
+D_OBJECTS = $(LIST:%.cpp=d_obj/%.o) $(STAT_MODULE)
+NOSGI_OBJECTS = $(LIST:%.cpp=nosgi_obj/%.o) $(STAT_MODULE)
+
+EXECS = $(LIST:%.cpp=%)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = ./eh_test
+D_TEST_EXE = ./eh_test_d
+NOSGI_TEST_EXE = ./eh_test_nosgi
+
+TEST  = ./eh_test.out
+D_TEST = ./eh_test_d.out
+NOSGI_TEST = ./eh_test_nosgi.out
+
+CC = c++
+CXX = $(CC)
+
+# dwa 12/22/99 -- had to turn off -ansi flag so we could use SGI IOSTREAMS
+# also, test_slist won't compile with -O3/-O2 when targeting PPC. It fails 
+# in the assembler with 'invalid relocation type'
+CXXFLAGS = -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW
+D_CXXFLAGS = -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -D_STLP_DEBUG -D_STLP_USE_STATIC_LIB
+NOSGI_CXXFLAGS = -Wall -g -O2 ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -D_STLP_NO_OWN_IOSTREAMS -D_STLP_DEBUG_UNINITIALIZED -DEH_VECTOR_OPERATOR_NEW
+
+check: $(TEST)
+
+LIBS = -lm 
+D_LIBSTLPORT = -L../../lib -lstlport_cygwin_stldebug
+LIBSTLPORT = -L../../lib -lstlport_cygwin
+
+all: $(TEST_EXE) $(D_TEST_EXE) $(NOSGI_TEST_EXE)
+
+check_nosgi: $(NOSGI_TEST)
+check_d: $(D_TEST)
+
+OBJDIR=obj
+D_OBJDIR=d_obj
+NOSGI_OBJDIR=nosgi_obj
+
+$(OBJDIR):
+	mkdir obj
+$(D_OBJDIR):
+	mkdir d_obj
+$(NOSGI_OBJDIR):
+	mkdir nosgi_obj
+
+$(TEST_EXE) : $(OBJDIR) $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBSTLPORT) $(LIBS) -o $(TEST_EXE)
+
+$(D_TEST_EXE) : $(D_OBJDIR) $(D_OBJECTS)
+	$(CXX) $(D_CXXFLAGS) $(D_OBJECTS) $(D_LIBSTLPORT) $(LIBS) -o $(D_TEST_EXE)
+
+$(NOSGI_TEST_EXE) : $(NOSGI_OBJDIR) $(NOSGI_OBJECTS)
+	$(CXX) $(NOSGI_CXXFLAGS) $(NOSGI_OBJECTS) $(LIBS) -o $(NOSGI_TEST_EXE)
+
+
+$(TEST) : $(TEST_EXE)
+	echo "Cygwin has bugs in exception handling, runnning w/o throwing exceptions..."
+	./$(TEST_EXE) -e
+
+$(D_TEST) : $(D_TEST_EXE)
+	echo "Cygwin has bugs in exception handling, runnning w/o throwing exceptions..."
+	./$(D_TEST_EXE) -e
+
+$(NOSGI_TEST) : $(NOSGI_TEST_EXE)
+	echo "Cygwin has bugs in exception handling, runnning w/o throwing exceptions..."
+	./$(NOSGI_TEST_EXE) -e
+
+SUFFIXES: .cpp.o.exe.out.res
+
+nosgi_obj/%.o : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -c -o $@
+
+d_obj/%.o : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -c -o $@
+
+obj/%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+nosgi_obj/%.i : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -E -H > $@
+
+d_obj/%.i : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -E -H > $@
+
+obj/%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -g -D_STLP_DEBUG -D_REENTRANT -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(D_LIBSTLPORT) $(LIBS) -o $*
+	./$* > $@
+	-rm -f $*
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+%.E: %.cpp
+	$(CXX) $(CXXFLAGS) -E $<  -o $@
+
+clean:
+	-rm -fr ${TEST_EXE} *.o */*.o *.rpo *.obj *.out core *~ Templates.DB
diff --git a/main/source/stlport/test/eh/deccxx.mak b/main/source/stlport/test/eh/deccxx.mak
new file mode 100644
index 00000000..1e12dc56
--- /dev/null
+++ b/main/source/stlport/test/eh/deccxx.mak
@@ -0,0 +1,73 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+SHELL=/bin/sh
+
+# srcdir = .
+# VPATH = .
+
+
+# point this to proper location
+STL_INCL= -I../../stlport
+
+# STL_INCL= -DEH_NO_SGI_STL
+
+AUX_LIST=TestClass.o main.o nc_alloc.o random_number.o
+
+TEST_LIST=test_algo.o  \
+test_algobase.o     test_list.o test_slist.o \
+test_bit_vector.o   test_vector.o \
+test_deque.o test_set.o test_map.o \
+test_hash_map.o  test_hash_set.o test_rope.o \
+test_string.o test_bitset.o test_valarray.o
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST)
+EXECS = $(LIST:%.o=%)
+TESTS = $(LIST:%.o=%.out)
+TEST_EXE  = eh_test
+TEST  = eh_test.out
+
+CC = cxx
+CXX = $(CC)
+
+# -std strict_ansi_errors
+
+CXXFLAGS = ${STL_INCL} -std strict_ansi_errors -DEH_VECTOR_OPERATOR_NEW -DEH_DELETE_HAS_THROW_SPEC -gall
+
+# CXXFLAGS = ${STL_INCL} -std strict_ansi_errors -DEH_VECTOR_OPERATOR_NEW -DEH_DELETE_HAS_THROW_SPEC
+
+# This is to test with native STL
+# CXXFLAGS = +w2 -xildoff -D_STLP_USE_NEWALLOC -DEH_NO_SGI_STL -DEH_NEW_HEADERS -DEH_VECTOR_OPERATOR_NEW -DEH_DELETE_HAS_THROW_SPEC
+
+
+LIBS = -L../../lib -lstlport_dec -lm 
+LIBSTDCXX = 
+
+.SUFFIXES: .cpp .i .o .out .res
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	LD_LIBRARY_PATH="../../lib:$(LD_LIBRARY_PATH)" ./$(TEST_EXE) -s 100
+
+.cpp.o:
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+.cpp.i:
+	$(CXX) $(CXXFLAGS) $< -E > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $*.cpp -c -USINGLE -DMAIN -g -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) -o $*
+	./$* -q
+	-rm -f $*
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $*.cpp  -o $@
+
+clean:
+	-rm -fr ${TEST_EXE} *.o *.rpo *.obj *.out core *~ Templates.DB SunWS_cache cxx_repository
diff --git a/main/source/stlport/test/eh/descrip.mms b/main/source/stlport/test/eh/descrip.mms
new file mode 100644
index 00000000..39f4faeb
--- /dev/null
+++ b/main/source/stlport/test/eh/descrip.mms
@@ -0,0 +1,54 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated manually for MMS
+
+# point this to proper location
+STL_INCL= /include="../../stlport"
+
+
+# STL_INCL= -DEH_NO_SGI_STL
+
+.SUFFIXES .obj .cpp
+
+all : check
+
+AUX_LIST=TestClass.obj,main.obj,nc_alloc.obj,random_number.obj
+
+TEST_LIST=test_algo.obj,-
+test_algobase.obj,test_list.obj,test_slist.obj,-
+test_bit_vector.obj,test_vector.obj,-
+test_deque.obj,test_set.obj,test_map.obj,-
+test_hash_map.obj,test_hash_set.obj,test_rope.obj,-
+test_string.obj,test_bitset.obj,test_valarray.obj
+
+LIST=$(AUX_LIST),$(TEST_LIST)
+
+OBJECTS = $(LIST)
+EXECS = $(LIST:%.obj=%.exe)
+TESTS = $(LIST:%.obj=%.out)
+TEST_EXE  = eh_test.exe
+TEST  = eh_test.out
+
+CC = cxx
+CXX = $(CC)
+LINK = cxxlink
+
+# -std strict_ansi_errors
+
+CXXFLAGS = $(STL_INCL) /define=(__NO_USE_STD_IOSTREAM,EH_VECTOR_OPERATOR_NEW,EH_DELETE_HAS_THROW_SPEC)
+
+# This is to test with native STL
+# CXXFLAGS = +w2 -xildoff -D__STL_USE_NEWALLOC -DEH_NO_SGI_STL -DEH_NEW_HEADERS -DEH_VECTOR_OPERATOR_NEW -DEH_DELETE_HAS_THROW_SPEC
+
+
+LIBS = 
+LIBSTDCXX = 
+
+check : $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(LINK)/exe=$(TEST_EXE) $(OBJECTS) $(LIBS)
+	run $(TEST_EXE)
+
+.cpp.obj :
+	$(CXX) $(CXXFLAGS) /obj=$@ $< 
+
diff --git a/main/source/stlport/test/eh/djgpp.mak b/main/source/stlport/test/eh/djgpp.mak
new file mode 100644
index 00000000..8ffa381e
--- /dev/null
+++ b/main/source/stlport/test/eh/djgpp.mak
@@ -0,0 +1,121 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+srcdir = .
+VPATH = .
+
+# point this to proper location
+STL_INCL=-I../../stlport
+
+AUX_LIST=TestClass.cpp main.cpp nc_alloc.cpp random_number.cpp
+
+TEST_LIST=test_algo.cpp  \
+test_algobase.cpp     test_list.cpp test_slist.cpp \
+test_bit_vector.cpp   test_vector.cpp \
+test_deque.cpp test_set.cpp test_map.cpp \
+test_hash_map.cpp  test_hash_set.cpp test_rope.cpp \
+test_string.cpp test_bitset.cpp test_valarray.cpp
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST:%.cpp=obj/%.o) $(STAT_MODULE)
+D_OBJECTS = $(LIST:%.cpp=d_obj/%.o) $(STAT_MODULE)
+NOSGI_OBJECTS = $(LIST:%.cpp=nosgi_obj/%.o) $(STAT_MODULE)
+
+EXECS = $(LIST:%.cpp=%)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = ./eh_test
+D_TEST_EXE = ./eh_test_d
+NOSGI_TEST_EXE = ./eh_test_nosgi
+
+TEST  = ./eh_test.out
+D_TEST = ./eh_test_d.out
+NOSGI_TEST = ./eh_test_nosgi.out
+
+CC = gcc
+CXX = $(CC)
+
+# dwa 12/22/99 -- had to turn off -ansi flag so we could use SGI IOSTREAMS
+# also, test_slist won't compile with -O3/-O2 when targeting PPC. It fails 
+# in the assembler with 'invalid relocation type'
+CXXFLAGS = -Wall -ftemplate-depth-32 -mbnu210 -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -D_STLP_NO_SGI_IOSTREAMS
+D_CXXFLAGS = -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -D_STLP_DEBUG -D_STLP_USE_STATIC_LIB
+NOSGI_CXXFLAGS = -Wall -g -O2 ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -D_STLP_NO_SGI_IOSTREAMS -D_STLP_DEBUG_UNINITIALIZED -DEH_VECTOR_OPERATOR_NEW
+
+check: $(TEST)
+
+LIBS = -lstdcxx -lm 
+D_LIBSTLPORT = ../../lib/libstlport_djgpp_debug_static.a
+LIBSTLPORT = ../../lib/libstlport_djgpp_stldebug_static.a
+
+all: $(TEST_EXE) $(D_TEST_EXE) $(NOSGI_TEST_EXE)
+
+check_nosgi: $(NOSGI_TEST)
+check_d: $(D_TEST)
+
+
+OBJDIR=obj
+D_OBJDIR=d_obj
+NOSGI_OBJDIR=nosgi_obj
+
+$(OBJDIR):
+	mkdir obj
+$(D_OBJDIR):
+	mkdir d_obj
+$(NOSGI_OBJDIR):
+	mkdir nosgi_obj
+
+$(TEST_EXE) : $(OBJDIR) $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBSTLPORT) $(LIBS) -o $(TEST_EXE)
+
+$(D_TEST_EXE) : $(D_OBJDIR) $(D_OBJECTS)
+	$(CXX) $(D_CXXFLAGS) $(D_OBJECTS) $(D_LIBSTLPORT) $(LIBS) -o $(D_TEST_EXE)
+
+$(NOSGI_TEST_EXE) : $(NOSGI_OBJDIR) $(NOSGI_OBJECTS)
+	$(CXX) $(NOSGI_CXXFLAGS) $(NOSGI_OBJECTS) $(LIBS) -o $(NOSGI_TEST_EXE)
+
+
+$(TEST) : $(TEST_EXE)
+	$(TEST_EXE)
+
+$(D_TEST) : $(D_TEST_EXE)
+	$(D_TEST_EXE)
+
+$(NOSGI_TEST) : $(NOSGI_TEST_EXE)
+	$(NOSGI_TEST_EXE)
+
+SUFFIXES: .cpp.o.exe.out.res
+
+nosgi_obj/%.o : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -c -o $@
+
+d_obj/%.o : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -c -o $@
+
+obj/%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+nosgi_obj/%.i : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -E -H > $@
+
+d_obj/%.i : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -E -H > $@
+
+obj/%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -g -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) -o $*
+	./$* > $@
+	-rm -f $*
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+%.E: %.cpp
+	$(CXX) $(CXXFLAGS) -E $<  -o $@
+
+clean:
+	-rm -fr ${TEST_EXE} *.o */*.o *.rpo *.obj *.out core *~ Templates.DB
diff --git a/main/source/stlport/test/eh/egcs.mak b/main/source/stlport/test/eh/egcs.mak
new file mode 100644
index 00000000..576e1646
--- /dev/null
+++ b/main/source/stlport/test/eh/egcs.mak
@@ -0,0 +1,75 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+srcdir = .
+VPATH = .
+
+# point this to proper location
+STL_INCL=../../stlport
+
+AUX_LIST=TestClass.cpp main.cpp nc_alloc.cpp random_number.cpp
+
+TEST_LIST=test_algo.cpp  \
+test_algobase.cpp     test_list.cpp test_slist.cpp \
+test_bit_vector.cpp   test_vector.cpp \
+test_deque.cpp test_set.cpp test_map.cpp \
+test_hash_map.cpp  test_hash_set.cpp test_rope.cpp \
+test_string.cpp test_bitset.cpp test_valarray.cpp
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = ./eh_test
+TEST  = ./eh_test.out
+
+CC = egcs-c++
+CXX = $(CC)
+
+# for egcs
+REPO_FLAGS =
+
+# CXXFLAGS = -g -Wall -I${STL_INCL}  -I. -D_STLP_USE_NEWALLOC -D_STLP_DEBUG_ALLOC ${REPO_FLAGS} -DEH_NEW_HEADERS 
+
+# CXXFLAGS = -Wall -ansi -I${STL_INCL}  -I. -D_STLP_DEBUG ${REPO_FLAGS} ${CXX_EXTRA_FLAGS}
+CXXFLAGS = -Wall -g  -D_STLP_USE_NEWALLOC -DNO_FAST_ALLOCATOR -ansi -I${STL_INCL}  -I. ${REPO_FLAGS} ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -D_STLP_DEBUG -D_STLP_NO_DEBUG_EXCEPTIONS
+
+# CXXFLAGS = -Wall -I${STL_INCL}  -I. -D_STLP_USE_NEWALLOC ${REPO_FLAGS} ${CXX_EXTRA_FLAGS}
+
+
+LIBS = -lm 
+LIBSTDCXX = 
+
+check: $(TEST)
+
+$(TEST_EXE) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+
+
+$(TEST) : $(TEST_EXE)
+	$(TEST_EXE)
+
+SUFFIXES: .cpp.o.exe.out.res
+
+%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H -o $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -g -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) -o $*
+	./$* > $@
+	-rm -f $*
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+%.E: %.cpp
+	$(CXX) $(CXXFLAGS) -E $<  -o $@
+
+clean:
+	-rm -fr ${TEST_EXE} $(OBJDIR) $(D_OBJDIR) $(NOSGI_OBJDIR) *.o *.rpo *.obj *.out core *~ Templates.DB
diff --git a/main/source/stlport/test/eh/export b/main/source/stlport/test/eh/export
new file mode 100644
index 00000000..7dec9847
--- /dev/null
+++ b/main/source/stlport/test/eh/export
@@ -0,0 +1,37 @@
+LeakCheck.h
+Prefix.h
+SortClass.h
+TestClass.cpp
+TestClass.h
+Tests.h
+ThrowCompare.h
+export
+gcc.mak
+main.cpp
+nc_alloc.cpp
+nc_alloc.h
+random_number.cpp
+random_number.h
+sunpro.mak
+test_algo.cpp
+test_algobase.cpp
+test_assign_op.h
+test_bit_vector.cpp
+test_bitset.cpp
+test_construct.h
+test_deque.cpp
+test_hash_map.cpp
+test_hash_resize.h
+test_hash_set.cpp
+test_insert.h
+test_list.cpp
+test_map.cpp
+test_push_back.h
+test_push_front.h
+test_rope.cpp
+test_set.cpp
+test_slist.cpp
+test_string.cpp
+test_valarray.cpp
+test_vector.cpp
+vc.mak
diff --git a/main/source/stlport/test/eh/gcc-99r1.mak b/main/source/stlport/test/eh/gcc-99r1.mak
new file mode 100644
index 00000000..35373c92
--- /dev/null
+++ b/main/source/stlport/test/eh/gcc-99r1.mak
@@ -0,0 +1,109 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+srcdir = .
+VPATH = .
+
+# point this to proper location
+STL_INCL=-I../../stlport
+
+AUX_LIST=TestClass.cpp main.cpp nc_alloc.cpp random_number.cpp
+
+TEST_LIST=test_algo.cpp  \
+test_algobase.cpp     test_list.cpp test_slist.cpp \
+test_bit_vector.cpp   test_vector.cpp \
+test_deque.cpp test_set.cpp test_map.cpp \
+test_hash_map.cpp  test_hash_set.cpp test_rope.cpp \
+test_string.cpp test_bitset.cpp test_valarray.cpp
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST:%.cpp=obj/%.o) $(STAT_MODULE)
+D_OBJECTS = $(LIST:%.cpp=d_obj/%.o) $(STAT_MODULE)
+NOSGI_OBJECTS = $(LIST:%.cpp=nosgi_obj/%.o) $(STAT_MODULE)
+
+EXECS = $(LIST:%.cpp=%)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = ./eh_test
+D_TEST_EXE = ./eh_test_d
+NOSGI_TEST_EXE = ./eh_test_nosgi
+
+TEST  = ./eh_test.out
+D_TEST = ./eh_test_d.out
+NOSGI_TEST = ./eh_test_nosgi.out
+
+CC =c++
+CXX = $(CC)
+
+# dwa 12/22/99 -- had to turn off -ansi flag so we could use SGI IOSTREAMS
+# also, test_slist won't compile with -O3/-O2 when targeting PPC. It fails 
+# in the assembler with 'invalid relocation type'
+CXXFLAGS = -Wall -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -g -D_STLP_HAS_NO_NAMESPACES
+D_CXXFLAGS = -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -D_STLP_DEBUG
+NOSGI_CXXFLAGS = -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -D_STLP_NO_OWN_IOSTREAMS -DEH_VECTOR_OPERATOR_NEW
+
+check: $(TEST)
+
+LIBS = -lm 
+D_LIBSTLPORT = -L../../lib -lstlport_gcc_stldebug
+LIBSTLPORT = -L../../lib -lstlport_gcc
+
+all: $(TEST_EXE) $(D_TEST_EXE) $(NOSGI_TEST_EXE)
+
+check_nosgi: $(NOSGI_TEST)
+check_d: $(D_TEST)
+
+
+$(TEST_EXE) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBSTLPORT) $(LIBS) -o $(TEST_EXE)
+
+$(D_TEST_EXE) : $(D_OBJECTS)
+	$(CXX) $(D_CXXFLAGS) $(D_OBJECTS) $(D_LIBSTLPORT) $(LIBS) -o $(D_TEST_EXE)
+
+$(NOSGI_TEST_EXE) : $(NOSGI_OBJECTS)
+	$(CXX) $(NOSGI_CXXFLAGS) $(NOSGI_OBJECTS) $(LIBS) -o $(NOSGI_TEST_EXE)
+
+
+$(TEST) : $(TEST_EXE)
+	LD_LIBRARY_PATH="../../lib:$(LD_LIBRARY_PATH)" time ./$(TEST_EXE) -s 100
+
+$(D_TEST) : $(D_TEST_EXE)
+	$(D_TEST_EXE)
+
+$(NOSGI_TEST) : $(NOSGI_TEST_EXE)
+	$(NOSGI_TEST_EXE)
+
+SUFFIXES: .cpp.o.exe.out.res
+
+nosgi_obj/%.o : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -c -o $@
+
+d_obj/%.o : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -c -o $@
+
+obj/%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+nosgi_obj/%.i : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -E -H > $@
+
+d_obj/%.i : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -E -H > $@
+
+obj/%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -O2 -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBSTLPORT) $(LIBS) -o $*
+	./$* > $@
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+%.E: %.cpp
+	$(CXX) $(CXXFLAGS) -E $<  -o $@
+
+clean:
+	-rm -fr ${TEST_EXE} $(D_TEST_EXE) *.o */*.o *.rpo *.obj *.out core *~ Templates.DB
diff --git a/main/source/stlport/test/eh/gcc-amigaos-m68k.mak b/main/source/stlport/test/eh/gcc-amigaos-m68k.mak
new file mode 100644
index 00000000..ed8f22f5
--- /dev/null
+++ b/main/source/stlport/test/eh/gcc-amigaos-m68k.mak
@@ -0,0 +1,119 @@
+#
+# This requires GNU make.
+#
+
+srcdir = .
+VPATH = .
+SHELL = /bin/sh
+
+# point this to proper location
+STL_INCL = -I../../stlport
+
+AUX_LIST = TestClass.cpp main.cpp nc_alloc.cpp random_number.cpp
+
+TEST_LIST = test_algo.cpp  \
+	test_algobase.cpp test_list.cpp test_slist.cpp \
+	test_bit_vector.cpp test_vector.cpp \
+	test_deque.cpp test_set.cpp test_map.cpp \
+	test_hash_map.cpp  test_hash_set.cpp test_rope.cpp \
+	test_string.cpp test_bitset.cpp test_valarray.cpp
+
+LIST = ${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST:%.cpp=obj/%.o) $(STAT_MODULE)
+D_OBJECTS = $(LIST:%.cpp=d_obj/%.o) $(STAT_MODULE)
+NOSGI_OBJECTS = $(LIST:%.cpp=nosgi_obj/%.o) $(STAT_MODULE)
+
+EXECS = $(LIST:%.cpp=%)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = ./eh_test
+D_TEST_EXE = ./eh_test_d
+NOSGI_TEST_EXE = ./eh_test_nosgi
+
+TEST  = ./eh_test.out
+D_TEST = ./eh_test_d.out
+NOSGI_TEST = ./eh_test_nosgi.out
+
+CC = gcc
+CXX = g++
+
+CXXFLAGS = -s -noixemul -m68020 -Wall -O2 ${STL_INCL} -I. -DEH_VECTOR_OPERATOR_NEW
+D_CXXFLAGS = -Wall -g -O ${STL_INCL} -I. -DEH_VECTOR_OPERATOR_NEW -D_STLP_DEBUG -D_STLP_USE_STATIC_LIB
+NOSGI_CXXFLAGS = -Wall -g -O2 ${STL_INCL} -I. -D_STLP_NO_OWN_IOSTREAMS -D_STLP_DEBUG_UNINITIALIZED -DEH_VECTOR_OPERATOR_NEW
+
+check: $(TEST)
+
+LIBS = -lm
+D_LIBSTLPORT = -L../../lib -lstlport_gcc_stldebug
+LIBSTLPORT = -L../../lib -lstlport_gcc
+
+all: $(TEST_EXE)
+
+check_nosgi: $(NOSGI_TEST)
+check_d: $(D_TEST)
+
+
+OBJDIR=obj
+D_OBJDIR=d_obj
+NOSGI_OBJDIR=nosgi_obj
+
+$(OBJDIR):
+	mkdir obj
+$(D_OBJDIR):
+	mkdir d_obj
+$(NOSGI_OBJDIR):
+	mkdir nosgi_obj
+
+$(TEST_EXE) : $(OBJDIR) $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBSTLPORT) $(LIBS) -o $(TEST_EXE)
+
+$(D_TEST_EXE) : $(D_OBJDIR) $(D_OBJECTS)
+	$(CXX) $(D_CXXFLAGS) $(D_OBJECTS) $(D_LIBSTLPORT) $(LIBS) -o $(D_TEST_EXE)
+
+$(NOSGI_TEST_EXE) : $(NOSGI_OBJDIR) $(NOSGI_OBJECTS)
+	$(CXX) $(NOSGI_CXXFLAGS) $(NOSGI_OBJECTS) $(LIBS) -o $(NOSGI_TEST_EXE)
+
+$(TEST) : $(TEST_EXE)
+	$(TEST_EXE) -s 100
+
+$(D_TEST) : $(D_TEST_EXE)
+	LD_LIBRARY_PATH="../../lib:$(LD_LIBRARY_PATH)" ./$(D_TEST_EXE) -s 100
+
+
+$(NOSGI_TEST) : $(NOSGI_TEST_EXE)
+	$(NOSGI_TEST_EXE)
+
+SUFFIXES: .cpp.o.exe.out.res
+
+nosgi_obj/%.o : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -c -o $@
+
+d_obj/%.o : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -c -o $@
+
+obj/%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+nosgi_obj/%.i : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -E -H > $@
+
+d_obj/%.i : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -E -H > $@
+
+obj/%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -g -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) -o $*
+	./$* > $@
+	-rm -f $*
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+%.E: %.cpp
+	$(CXX) $(CXXFLAGS) -E $<  -o $@
+
+clean:
+	-rm -fr ${TEST_EXE} *.o */*.o *.rpo *.obj *.out core *~ Templates.DB
diff --git a/main/source/stlport/test/eh/gcc-apple-macosx.mak b/main/source/stlport/test/eh/gcc-apple-macosx.mak
new file mode 100644
index 00000000..27aecd7c
--- /dev/null
+++ b/main/source/stlport/test/eh/gcc-apple-macosx.mak
@@ -0,0 +1,122 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+srcdir = .
+VPATH = .
+SHELL=/bin/sh
+
+# point this to proper location
+STL_INCL=-I../../stlport
+
+AUX_LIST=TestClass.cpp main.cpp nc_alloc.cpp random_number.cpp
+
+TEST_LIST=test_algo.cpp  \
+test_algobase.cpp     test_list.cpp test_slist.cpp \
+test_bit_vector.cpp   test_vector.cpp \
+test_deque.cpp test_set.cpp test_map.cpp \
+test_hash_map.cpp  test_hash_set.cpp test_rope.cpp \
+test_string.cpp test_bitset.cpp test_valarray.cpp
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST:%.cpp=obj/%.o) $(STAT_MODULE)
+D_OBJECTS = $(LIST:%.cpp=d_obj/%.o) $(STAT_MODULE)
+NOSGI_OBJECTS = $(LIST:%.cpp=nosgi_obj/%.o) $(STAT_MODULE)
+
+EXECS = $(LIST:%.cpp=%)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = ./eh_test
+D_TEST_EXE = ./eh_test_d
+NOSGI_TEST_EXE = ./eh_test_nosgi
+
+TEST  = ./eh_test.out
+D_TEST = ./eh_test_d.out
+NOSGI_TEST = ./eh_test_nosgi.out
+
+CC = g++
+CXX = $(CC)
+
+# dwa 12/22/99 -- had to turn off -ansi flag so we could use SGI IOSTREAMS
+# also, test_slist won't compile with -O3/-O2 when targeting PPC. It fails 
+# in the assembler with 'invalid relocation type'
+CXXFLAGS = -Wall -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW
+D_CXXFLAGS = -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -D_STLP_DEBUG -D_STLP_USE_STATIC_LIB
+NOSGI_CXXFLAGS = -Wall -g -O2 ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -D_STLP_NO_OWN_IOSTREAMS -D_STLP_DEBUG_UNINITIALIZED -DEH_VECTOR_OPERATOR_NEW
+
+check: $(TEST)
+
+LIBS = -lm 
+D_LIBSTLPORT = -L../../lib -lstlport_gcc_debug
+LIBSTLPORT = -L../../lib -lstlport_gcc
+
+all: $(TEST_EXE) $(D_TEST_EXE) $(NOSGI_TEST_EXE)
+
+check_nosgi: $(NOSGI_TEST)
+check_d: $(D_TEST)
+
+
+OBJDIR=obj
+D_OBJDIR=d_obj
+NOSGI_OBJDIR=nosgi_obj
+
+$(OBJDIR):
+	mkdir obj
+$(D_OBJDIR):
+	mkdir d_obj
+$(NOSGI_OBJDIR):
+	mkdir nosgi_obj
+
+$(TEST_EXE) : $(OBJDIR) $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBSTLPORT) $(LIBS) -o $(TEST_EXE)
+
+$(D_TEST_EXE) : $(D_OBJDIR) $(D_OBJECTS)
+	$(CXX) $(D_CXXFLAGS) $(D_OBJECTS) $(D_LIBSTLPORT) $(LIBS) -o $(D_TEST_EXE)
+
+$(NOSGI_TEST_EXE) : $(NOSGI_OBJDIR) $(NOSGI_OBJECTS)
+	$(CXX) $(NOSGI_CXXFLAGS) $(NOSGI_OBJECTS) $(LIBS) -o $(NOSGI_TEST_EXE)
+
+$(TEST) : $(TEST_EXE)
+	LD_LIBRARY_PATH="../../lib:$(LD_LIBRARY_PATH)" time ./$(TEST_EXE) -s 100
+
+$(D_TEST) : $(D_TEST_EXE)
+	LD_LIBRARY_PATH="../../lib:$(LD_LIBRARY_PATH)" ./$(D_TEST_EXE) -s 100
+
+
+$(NOSGI_TEST) : $(NOSGI_TEST_EXE)
+	$(NOSGI_TEST_EXE)
+
+SUFFIXES: .cpp.o.exe.out.res
+
+nosgi_obj/%.o : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -c -o $@
+
+d_obj/%.o : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -c -o $@
+
+obj/%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+nosgi_obj/%.i : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -E -H > $@
+
+d_obj/%.i : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -E -H > $@
+
+obj/%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -g -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBSTLPORT) $(LIBS) -o $*
+	./$* > $@
+#	-rm -f $*
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+%.E: %.cpp
+	$(CXX) $(CXXFLAGS) -E $<  -o $@
+
+clean:
+	-rm -fr ${TEST_EXE} *.o */*.o *.rpo *.obj *.out core *~ Templates.DB
diff --git a/main/source/stlport/test/eh/gcc-freebsd.mak b/main/source/stlport/test/eh/gcc-freebsd.mak
new file mode 100644
index 00000000..0c4e46eb
--- /dev/null
+++ b/main/source/stlport/test/eh/gcc-freebsd.mak
@@ -0,0 +1,123 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+srcdir = .
+VPATH = .
+SHELL=/bin/sh
+
+# point this to proper location
+STL_INCL=-I../../stlport
+
+AUX_LIST=TestClass.cpp main.cpp nc_alloc.cpp random_number.cpp
+
+TEST_LIST=test_algo.cpp  \
+test_algobase.cpp     test_list.cpp test_slist.cpp \
+test_bit_vector.cpp   test_vector.cpp \
+test_deque.cpp test_set.cpp test_map.cpp \
+test_hash_map.cpp  test_hash_set.cpp test_rope.cpp \
+test_string.cpp test_bitset.cpp test_valarray.cpp
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST:%.cpp=obj/%.o) $(STAT_MODULE)
+D_OBJECTS = $(LIST:%.cpp=d_obj/%.o) $(STAT_MODULE)
+NOSGI_OBJECTS = $(LIST:%.cpp=nosgi_obj/%.o) $(STAT_MODULE)
+
+EXECS = $(LIST:%.cpp=%)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = ./eh_test
+D_TEST_EXE = ./eh_test_d
+NOSGI_TEST_EXE = ./eh_test_nosgi
+
+TEST  = ./eh_test.out
+D_TEST = ./eh_test_d.out
+NOSGI_TEST = ./eh_test_nosgi.out
+
+CC = c++ -pthread
+CXX = $(CC)
+
+# dwa 12/22/99 -- had to turn off -ansi flag so we could use SGI IOSTREAMS
+# also, test_slist won't compile with -O3/-O2 when targeting PPC. It fails 
+# in the assembler with 'invalid relocation type'
+CXXFLAGS = -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW
+
+D_CXXFLAGS = -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -D_STLP_DEBUG -D_STLP_USE_STATIC_LIB
+NOSGI_CXXFLAGS = -Wall -g -O2 ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -D_STLP_NO_OWN_IOSTREAMS -D_STLP_DEBUG_UNINITIALIZED -DEH_VECTOR_OPERATOR_NEW
+
+check: $(TEST)
+
+LIBS = -lm 
+D_LIBSTLPORT = -L../../lib -lstlport_gcc_stldebug
+LIBSTLPORT = -L../../lib -lstlport_gcc
+
+all: $(TEST_EXE) $(D_TEST_EXE) $(NOSGI_TEST_EXE)
+
+check_nosgi: $(NOSGI_TEST)
+check_d: $(D_TEST)
+
+OBJDIR=obj
+D_OBJDIR=d_obj
+NOSGI_OBJDIR=nosgi_obj
+
+$(OBJDIR):
+	mkdir obj
+$(D_OBJDIR):
+	mkdir d_obj
+$(NOSGI_OBJDIR):
+	mkdir nosgi_obj
+
+
+$(TEST_EXE) : $(OBJDIR) $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBSTLPORT) $(LIBS) -o $(TEST_EXE)
+
+$(D_TEST_EXE) : $(D_OBJDIR) $(D_OBJECTS)
+	$(CXX) $(D_CXXFLAGS) $(D_OBJECTS) $(D_LIBSTLPORT) $(LIBS) -o $(D_TEST_EXE)
+
+$(NOSGI_TEST_EXE) : $(NOSGI_OBJDIR) $(NOSGI_OBJECTS)
+	$(CXX) $(NOSGI_CXXFLAGS) $(NOSGI_OBJECTS) $(LIBS) -o $(NOSGI_TEST_EXE)
+
+
+$(TEST) : $(TEST_EXE)
+	LD_LIBRARY_PATH="../../lib:$(LD_LIBRARY_PATH)" ./$(TEST_EXE) -s 100
+
+$(D_TEST) : $(D_TEST_EXE)
+	LD_LIBRARY_PATH="../../lib:$(LD_LIBRARY_PATH)" ./$(D_TEST_EXE) -s 100
+
+$(NOSGI_TEST) : $(NOSGI_TEST_EXE)
+	$(NOSGI_TEST_EXE)
+
+SUFFIXES: .cpp.o.exe.out.res
+
+nosgi_obj/%.o : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -c -o $@
+
+d_obj/%.o : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -c -o $@
+
+obj/%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+nosgi_obj/%.i : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -E -H > $@
+
+d_obj/%.i : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -E -H > $@
+
+obj/%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -g -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) -o $*
+	./$* > $@
+	-rm -f $*
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+%.E: %.cpp
+	$(CXX) $(CXXFLAGS) -E $<  -o $@
+
+clean:
+	-rm -fr ${TEST_EXE} *.o */*.o *.rpo *.obj *.out core *~ Templates.DB
diff --git a/main/source/stlport/test/eh/gcc-hp11.mak b/main/source/stlport/test/eh/gcc-hp11.mak
new file mode 100644
index 00000000..66bd3328
--- /dev/null
+++ b/main/source/stlport/test/eh/gcc-hp11.mak
@@ -0,0 +1,123 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+srcdir = .
+VPATH = .
+SHELL=/bin/sh
+
+# point this to proper location
+STL_INCL=-I../../stlport
+
+AUX_LIST=TestClass.cpp main.cpp nc_alloc.cpp random_number.cpp
+
+TEST_LIST=test_algo.cpp  \
+test_algobase.cpp     test_list.cpp test_slist.cpp \
+test_bit_vector.cpp   test_vector.cpp \
+test_deque.cpp test_set.cpp test_map.cpp \
+test_hash_map.cpp  test_hash_set.cpp test_rope.cpp \
+test_string.cpp test_bitset.cpp test_valarray.cpp
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST:%.cpp=obj/%.o) $(STAT_MODULE)
+D_OBJECTS = $(LIST:%.cpp=d_obj/%.o) $(STAT_MODULE)
+NOSGI_OBJECTS = $(LIST:%.cpp=nosgi_obj/%.o) $(STAT_MODULE)
+
+EXECS = $(LIST:%.cpp=%)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = ./eh_test
+D_TEST_EXE = ./eh_test_d
+NOSGI_TEST_EXE = ./eh_test_nosgi
+
+TEST  = ./eh_test.out
+D_TEST = ./eh_test_d.out
+NOSGI_TEST = ./eh_test_nosgi.out
+
+# CC = g++ -pthreads
+CC = g++ -D_REENTRANT -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
+CXX = $(CC)
+
+# dwa 12/22/99 -- had to turn off -ansi flag so we could use SGI IOSTREAMS
+# also, test_slist won't compile with -O3/-O2 when targeting PPC. It fails 
+# in the assembler with 'invalid relocation type'
+CXXFLAGS = -Wall -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW
+D_CXXFLAGS = -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -D_STLP_DEBUG -D_STLP_USE_STATIC_LIB
+NOSGI_CXXFLAGS = -Wall -g -O2 ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -D_STLP_NO_OWN_IOSTREAMS -D_STLP_DEBUG_UNINITIALIZED -DEH_VECTOR_OPERATOR_NEW
+
+check: $(TEST)
+
+LIBS = -lpthread -lm 
+D_LIBSTLPORT = -L../../lib -lstlport_gcc_debug
+LIBSTLPORT = -L../../lib -lstlport_gcc
+
+all: $(TEST_EXE) $(D_TEST_EXE) $(NOSGI_TEST_EXE)
+
+check_nosgi: $(NOSGI_TEST)
+check_d: $(D_TEST)
+
+OBJDIR=obj
+D_OBJDIR=d_obj
+NOSGI_OBJDIR=nosgi_obj
+
+$(OBJDIR):
+	mkdir obj
+$(D_OBJDIR):
+	mkdir d_obj
+$(NOSGI_OBJDIR):
+	mkdir nosgi_obj
+
+$(TEST_EXE) : $(OBJDIR) $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBSTLPORT) $(LIBS) -o $(TEST_EXE)
+
+$(D_TEST_EXE) : $(D_OBJDIR) $(D_OBJECTS)
+	$(CXX) $(D_CXXFLAGS) $(D_OBJECTS) $(D_LIBSTLPORT) $(LIBS) -o $(D_TEST_EXE)
+
+$(NOSGI_TEST_EXE) : $(NOSGI_OBJDIR) $(NOSGI_OBJECTS)
+	$(CXX) $(NOSGI_CXXFLAGS) $(NOSGI_OBJECTS) $(LIBS) -o $(NOSGI_TEST_EXE)
+
+
+$(TEST) : $(TEST_EXE)
+	LD_LIBRARY_PATH="../../lib:$(LD_LIBRARY_PATH)" time ./$(TEST_EXE) -s 100
+
+$(D_TEST) : $(D_TEST_EXE)
+	LD_LIBRARY_PATH="../../lib:$(LD_LIBRARY_PATH)" ./$(D_TEST_EXE) -s 100
+
+
+$(NOSGI_TEST) : $(NOSGI_TEST_EXE)
+	$(NOSGI_TEST_EXE)
+
+SUFFIXES: .cpp.o.exe.out.res
+
+nosgi_obj/%.o : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -c -o $@
+
+d_obj/%.o : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -c -o $@
+
+obj/%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+nosgi_obj/%.i : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -E -H > $@
+
+d_obj/%.i : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -E -H > $@
+
+obj/%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -D_STLP_DEBUG -D_STLP_NO_OWN_IOSTREAMS -g -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBSTLPORT) $(LIBS) -o $*
+	./$* > $@
+#	-rm -f $*
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+%.E: %.cpp
+	$(CXX) $(CXXFLAGS) -E $<  -o $@
+
+clean:
+	-rm -fr ${TEST_EXE} *.o */*.o *.rpo *.obj *.out core *~ Templates.DB
diff --git a/main/source/stlport/test/eh/gcc-irix.mak b/main/source/stlport/test/eh/gcc-irix.mak
new file mode 100644
index 00000000..609bb452
--- /dev/null
+++ b/main/source/stlport/test/eh/gcc-irix.mak
@@ -0,0 +1,122 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+srcdir = .
+VPATH = .
+SHELL=/bin/sh
+
+# point this to proper location
+STL_INCL=-I../../stlport
+
+AUX_LIST=TestClass.cpp main.cpp nc_alloc.cpp random_number.cpp
+
+TEST_LIST=test_algo.cpp  \
+test_algobase.cpp     test_list.cpp test_slist.cpp \
+test_bit_vector.cpp   test_vector.cpp \
+test_deque.cpp test_set.cpp test_map.cpp \
+test_hash_map.cpp  test_hash_set.cpp test_rope.cpp \
+test_string.cpp test_bitset.cpp test_valarray.cpp
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST:%.cpp=obj/%.o) $(STAT_MODULE)
+D_OBJECTS = $(LIST:%.cpp=d_obj/%.o) $(STAT_MODULE)
+NOSGI_OBJECTS = $(LIST:%.cpp=nosgi_obj/%.o) $(STAT_MODULE)
+
+EXECS = $(LIST:%.cpp=%)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = ./eh_test
+D_TEST_EXE = ./eh_test_d
+NOSGI_TEST_EXE = ./eh_test_nosgi
+
+TEST  = ./eh_test.out
+D_TEST = ./eh_test_d.out
+NOSGI_TEST = ./eh_test_nosgi.out
+
+CC = g++
+CXX = $(CC)
+
+# dwa 12/22/99 -- had to turn off -ansi flag so we could use SGI IOSTREAMS
+# also, test_slist won't compile with -O3/-O2 when targeting PPC. It fails 
+# in the assembler with 'invalid relocation type'
+CXXFLAGS = -Wall -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW
+D_CXXFLAGS = -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -D_STLP_DEBUG -D_STLP_USE_STATIC_LIB
+NOSGI_CXXFLAGS = -Wall -g -O2 ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -D_STLP_NO_OWN_IOSTREAMS -D_STLP_DEBUG_UNINITIALIZED -DEH_VECTOR_OPERATOR_NEW
+
+check: $(TEST)
+
+LIBS = -lm 
+D_LIBSTLPORT = -L../../lib -lstlport_gcc_debug
+LIBSTLPORT = -L../../lib -lstlport_gcc
+
+all: $(TEST_EXE) $(D_TEST_EXE) $(NOSGI_TEST_EXE)
+
+check_nosgi: $(NOSGI_TEST)
+check_d: $(D_TEST)
+
+
+OBJDIR=obj
+D_OBJDIR=d_obj
+NOSGI_OBJDIR=nosgi_obj
+
+$(OBJDIR):
+	mkdir obj
+$(D_OBJDIR):
+	mkdir obj
+$(NOSGI_OBJDIR):
+	mkdir obj
+
+$(TEST_EXE) : $(OBJDIR) $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBSTLPORT) $(LIBS) -o $(TEST_EXE)
+
+$(D_TEST_EXE) : $(D_OBJDIR) $(D_OBJECTS)
+	$(CXX) $(D_CXXFLAGS) $(D_OBJECTS) $(D_LIBSTLPORT) $(LIBS) -o $(D_TEST_EXE)
+
+$(NOSGI_TEST_EXE) : $(NOSGI_OBJDIR) $(NOSGI_OBJECTS)
+	$(CXX) $(NOSGI_CXXFLAGS) $(NOSGI_OBJECTS) $(LIBS) -o $(NOSGI_TEST_EXE)
+
+$(TEST) : $(TEST_EXE)
+	LD_LIBRARY_PATH="../../lib:$(LD_LIBRARY_PATH)" time ./$(TEST_EXE) -s 100
+
+$(D_TEST) : $(D_TEST_EXE)
+	LD_LIBRARY_PATH="../../lib:$(LD_LIBRARY_PATH)" ./$(D_TEST_EXE) -s 100
+
+
+$(NOSGI_TEST) : $(NOSGI_TEST_EXE)
+	$(NOSGI_TEST_EXE)
+
+SUFFIXES: .cpp.o.exe.out.res
+
+nosgi_obj/%.o : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -c -o $@
+
+d_obj/%.o : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -c -o $@
+
+obj/%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+nosgi_obj/%.i : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -E -H > $@
+
+d_obj/%.i : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -E -H > $@
+
+obj/%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -D_STLP_DEBUG -D_STLP_NO_OWN_IOSTREAMS -g -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBSTLPORT) $(LIBS) -o $*
+	./$* > $@
+#	-rm -f $*
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $< -o $@
+
+%.E: %.cpp
+	$(CXX) $(CXXFLAGS) -E $< -o $@
+
+clean:
+	-rm -fr ${TEST_EXE} *.o */*.o *.rpo *.obj *.out core *~ Templates.DB
diff --git a/main/source/stlport/test/eh/gcc-linux.mak b/main/source/stlport/test/eh/gcc-linux.mak
new file mode 100644
index 00000000..59d821bf
--- /dev/null
+++ b/main/source/stlport/test/eh/gcc-linux.mak
@@ -0,0 +1,120 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+SHELL=/bin/sh
+
+srcdir = .
+VPATH = .
+
+# point this to proper location
+STL_INCL=-I../../stlport
+
+AUX_LIST=TestClass.cpp main.cpp nc_alloc.cpp random_number.cpp
+
+TEST_LIST=test_algo.cpp  \
+test_algobase.cpp     test_list.cpp test_slist.cpp \
+test_bit_vector.cpp   test_vector.cpp \
+test_deque.cpp test_set.cpp test_map.cpp \
+test_hash_map.cpp  test_hash_set.cpp test_rope.cpp \
+test_string.cpp test_bitset.cpp test_valarray.cpp
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST:%.cpp=obj/%.o) $(STAT_MODULE)
+D_OBJECTS = $(LIST:%.cpp=d_obj/%.o) $(STAT_MODULE)
+NOSGI_OBJECTS = $(LIST:%.cpp=nosgi_obj/%.o) $(STAT_MODULE)
+
+EXECS = $(LIST:%.cpp=%)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = ./eh_test
+D_TEST_EXE = ./eh_test_d
+NOSGI_TEST_EXE = ./eh_test_nosgi
+
+TEST  = ./eh_test.out
+D_TEST = ./eh_test_d.out
+NOSGI_TEST = ./eh_test_nosgi.out
+
+CC = c++ -pthread
+CXX = $(CC)
+
+# dwa 12/22/99 -- had to turn off -ansi flag so we could use SGI IOSTREAMS
+# also, test_slist won't compile with -O3/-O2 when targeting PPC. It fails 
+# in the assembler with 'invalid relocation type'
+CXXFLAGS = -Wall ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW
+D_CXXFLAGS = -Wall -g ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -D_STLP_DEBUG -D_STLP_USE_STATIC_LIB
+NOSGI_CXXFLAGS = -Wall -g -O2 ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -D_STLP_NO_OWN_IOSTREAMS -D_STLP_DEBUG_UNINITIALIZED -DEH_VECTOR_OPERATOR_NEW
+
+check: $(TEST)
+
+LIBS = -lm 
+D_LIBSTLPORT = -L../../lib -lstlport_gcc_stldebug
+LIBSTLPORT = -L../../lib -lstlport_gcc
+
+all: $(TEST_EXE) $(D_TEST_EXE) $(NOSGI_TEST_EXE)
+
+check_nosgi: $(NOSGI_TEST)
+check_d: $(D_TEST)
+
+OBJDIR=obj
+D_OBJDIR=d_obj
+NOSGI_OBJDIR=nosgi_obj
+
+$(OBJDIR):
+	mkdir obj
+$(D_OBJDIR):
+	mkdir d_obj
+$(NOSGI_OBJDIR):
+	mkdir nosgi_obj
+
+$(TEST_EXE) : $(OBJDIR) $(OBJECTS) 
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBSTLPORT) $(LIBS) -o $(TEST_EXE)
+
+$(D_TEST_EXE) : $(D_OBJDIR) $(D_OBJECTS)
+	$(CXX) $(D_CXXFLAGS) $(D_OBJECTS) $(D_LIBSTLPORT) $(LIBS) -o $(D_TEST_EXE)
+
+$(NOSGI_TEST_EXE) : $(NOSGI_OBJDIR) $(NOSGI_OBJECTS)
+	$(CXX) $(NOSGI_CXXFLAGS) $(NOSGI_OBJECTS) $(LIBS) -o $(NOSGI_TEST_EXE)
+
+$(TEST) : $(TEST_EXE)
+	LD_LIBRARY_PATH="../../lib:$(LD_LIBRARY_PATH)" ./$(TEST_EXE) -s 100
+
+$(D_TEST) : $(D_TEST_EXE)
+	LD_LIBRARY_PATH="../../lib:$(LD_LIBRARY_PATH)" ./$(D_TEST_EXE) -s 100
+
+$(NOSGI_TEST) : $(NOSGI_TEST_EXE)
+	$(NOSGI_TEST_EXE)
+
+SUFFIXES: .cpp.o.exe.out.res
+
+nosgi_obj/%.o : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -c -o $@
+
+d_obj/%.o : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -c -o $@
+
+obj/%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+nosgi_obj/%.i : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -E -H > $@
+
+d_obj/%.i : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -E -H > $@
+
+obj/%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -c -USINGLE -DMAIN -o $*.o
+	$(CXX) $(D_CXXFLAGS) $*.o $(LIBS) $(D_LIBSTLPORT)  -o $*
+	./$* > $@
+#	-rm -f $*
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+%.E: %.cpp
+	$(CXX) $(CXXFLAGS) -E $<  -o $@
+
+clean:
+	-rm -fr ${TEST_EXE} *.o */*.o *.rpo *.obj *.out core *~ Templates.DB
diff --git a/main/source/stlport/test/eh/gcc-netbsd.mak b/main/source/stlport/test/eh/gcc-netbsd.mak
new file mode 100644
index 00000000..be75443b
--- /dev/null
+++ b/main/source/stlport/test/eh/gcc-netbsd.mak
@@ -0,0 +1,122 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+srcdir = .
+VPATH = .
+SHELL=/bin/sh
+
+# point this to proper location
+STL_INCL=-I../../stlport
+
+AUX_LIST=TestClass.cpp main.cpp nc_alloc.cpp random_number.cpp
+
+TEST_LIST=test_algo.cpp  \
+test_algobase.cpp     test_list.cpp test_slist.cpp \
+test_bit_vector.cpp   test_vector.cpp \
+test_deque.cpp test_set.cpp test_map.cpp \
+test_hash_map.cpp  test_hash_set.cpp test_rope.cpp \
+test_string.cpp test_bitset.cpp test_valarray.cpp
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST:%.cpp=obj/%.o) $(STAT_MODULE)
+D_OBJECTS = $(LIST:%.cpp=d_obj/%.o) $(STAT_MODULE)
+NOSGI_OBJECTS = $(LIST:%.cpp=nosgi_obj/%.o) $(STAT_MODULE)
+
+EXECS = $(LIST:%.cpp=%)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = ./eh_test
+D_TEST_EXE = ./eh_test_d
+NOSGI_TEST_EXE = ./eh_test_nosgi
+
+TEST  = ./eh_test.out
+D_TEST = ./eh_test_d.out
+NOSGI_TEST = ./eh_test_nosgi.out
+
+CC = c++ 
+CXX = $(CC)
+
+# dwa 12/22/99 -- had to turn off -ansi flag so we could use SGI IOSTREAMS
+# also, test_slist won't compile with -O3/-O2 when targeting PPC. It fails 
+# in the assembler with 'invalid relocation type'
+CXXFLAGS = -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW
+D_CXXFLAGS = -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -D_STLP_DEBUG -D_STLP_USE_STATIC_LIB
+NOSGI_CXXFLAGS = -Wall -g -O2 ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -D_STLP_NO_OWN_IOSTREAMS -D_STLP_DEBUG_UNINITIALIZED -DEH_VECTOR_OPERATOR_NEW
+
+check: $(TEST)
+
+LIBS = -lm -lpthread
+D_LIBSTLPORT = -L../../lib -R../../lib -lstlport_gcc_stldebug
+LIBSTLPORT = -L../../lib -R../../lib -lstlport_gcc
+
+all: $(TEST_EXE) $(D_TEST_EXE) $(NOSGI_TEST_EXE)
+
+check_nosgi: $(NOSGI_TEST)
+check_d: $(D_TEST)
+
+OBJDIR=obj
+D_OBJDIR=d_obj
+NOSGI_OBJDIR=nosgi_obj
+
+$(OBJDIR):
+	mkdir obj
+$(D_OBJDIR):
+	mkdir d_obj
+$(NOSGI_OBJDIR):
+	mkdir nosgi_obj
+
+$(TEST_EXE) : $(OBJDIR) $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBSTLPORT) $(LIBS) -o $(TEST_EXE)
+
+$(D_TEST_EXE) : $(D_OBJDIR) $(D_OBJECTS)
+	$(CXX) $(D_CXXFLAGS) $(D_OBJECTS) $(D_LIBSTLPORT) $(LIBS) -o $(D_TEST_EXE)
+
+$(NOSGI_TEST_EXE) : $(NOSGI_OBJDIR) $(NOSGI_OBJECTS)
+	$(CXX) $(NOSGI_CXXFLAGS) $(NOSGI_OBJECTS) $(LIBS) -o $(NOSGI_TEST_EXE)
+
+
+$(TEST) : $(TEST_EXE)
+	LD_LIBRARY_PATH="../../lib:$(LD_LIBRARY_PATH)" ./$(TEST_EXE) -s 100
+
+$(D_TEST) : $(D_TEST_EXE)
+	LD_LIBRARY_PATH="../../lib:$(LD_LIBRARY_PATH)" ./$(D_TEST_EXE) -s 100
+
+
+$(NOSGI_TEST) : $(NOSGI_TEST_EXE)
+	$(NOSGI_TEST_EXE)
+
+SUFFIXES: .cpp.o.exe.out.res
+
+nosgi_obj/%.o : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -c -o $@
+
+d_obj/%.o : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -c -o $@
+
+obj/%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+nosgi_obj/%.i : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -E -H > $@
+
+d_obj/%.i : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -E -H > $@
+
+obj/%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -g -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) -o $*
+	./$* > $@
+	-rm -f $*
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+%.E: %.cpp
+	$(CXX) $(CXXFLAGS) -E $<  -o $@
+
+clean:
+	-rm -fr ${TEST_EXE} *.o */*.o *.rpo *.obj *.out core *~ Templates.DB
diff --git a/main/source/stlport/test/eh/gcc.mak b/main/source/stlport/test/eh/gcc.mak
new file mode 100644
index 00000000..0047c53e
--- /dev/null
+++ b/main/source/stlport/test/eh/gcc.mak
@@ -0,0 +1,122 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+srcdir = .
+VPATH = .
+SHELL=/bin/sh
+
+# point this to proper location
+STL_INCL=-I../../stlport
+
+AUX_LIST=TestClass.cpp main.cpp nc_alloc.cpp random_number.cpp
+
+TEST_LIST=test_algo.cpp  \
+test_algobase.cpp     test_list.cpp test_slist.cpp \
+test_bit_vector.cpp   test_vector.cpp \
+test_deque.cpp test_set.cpp test_map.cpp \
+test_hash_map.cpp  test_hash_set.cpp test_rope.cpp \
+test_string.cpp test_bitset.cpp test_valarray.cpp
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST:%.cpp=obj/%.o) $(STAT_MODULE)
+D_OBJECTS = $(LIST:%.cpp=d_obj/%.o) $(STAT_MODULE)
+NOSGI_OBJECTS = $(LIST:%.cpp=nosgi_obj/%.o) $(STAT_MODULE)
+
+EXECS = $(LIST:%.cpp=%)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = ./eh_test
+D_TEST_EXE = ./eh_test_d
+NOSGI_TEST_EXE = ./eh_test_nosgi
+
+TEST  = ./eh_test.out
+D_TEST = ./eh_test_d.out
+NOSGI_TEST = ./eh_test_nosgi.out
+
+CC = g++ -pthread
+CXX = $(CC)
+
+# dwa 12/22/99 -- had to turn off -ansi flag so we could use SGI IOSTREAMS
+# also, test_slist won't compile with -O3/-O2 when targeting PPC. It fails 
+# in the assembler with 'invalid relocation type'
+CXXFLAGS = -Wall -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW
+D_CXXFLAGS = -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -D_STLP_DEBUG -D_STLP_USE_STATIC_LIB
+NOSGI_CXXFLAGS = -Wall -g -O2 ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -D_STLP_NO_OWN_IOSTREAMS -D_STLP_DEBUG_UNINITIALIZED -DEH_VECTOR_OPERATOR_NEW
+
+check: $(TEST)
+
+LIBS = -lm 
+D_LIBSTLPORT = -L../../lib -lstlport_gcc_debug
+LIBSTLPORT = -L../../lib -lstlport_gcc
+
+all: $(TEST_EXE) $(D_TEST_EXE) $(NOSGI_TEST_EXE)
+
+check_nosgi: $(NOSGI_TEST)
+check_d: $(D_TEST)
+
+
+OBJDIR=obj
+D_OBJDIR=d_obj
+NOSGI_OBJDIR=nosgi_obj
+
+$(OBJDIR):
+	mkdir obj
+$(D_OBJDIR):
+	mkdir d_obj
+$(NOSGI_OBJDIR):
+	mkdir nosgi_obj
+
+$(TEST_EXE) : $(OBJDIR) $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBSTLPORT) $(LIBS) -o $(TEST_EXE)
+
+$(D_TEST_EXE) : $(D_OBJDIR) $(D_OBJECTS)
+	$(CXX) $(D_CXXFLAGS) $(D_OBJECTS) $(D_LIBSTLPORT) $(LIBS) -o $(D_TEST_EXE)
+
+$(NOSGI_TEST_EXE) : $(NOSGI_OBJDIR) $(NOSGI_OBJECTS)
+	$(CXX) $(NOSGI_CXXFLAGS) $(NOSGI_OBJECTS) $(LIBS) -o $(NOSGI_TEST_EXE)
+
+$(TEST) : $(TEST_EXE)
+	LD_LIBRARY_PATH="../../lib:$(LD_LIBRARY_PATH)" time ./$(TEST_EXE) -s 100
+
+$(D_TEST) : $(D_TEST_EXE)
+	LD_LIBRARY_PATH="../../lib:$(LD_LIBRARY_PATH)" ./$(D_TEST_EXE) -s 100
+
+
+$(NOSGI_TEST) : $(NOSGI_TEST_EXE)
+	$(NOSGI_TEST_EXE)
+
+SUFFIXES: .cpp.o.exe.out.res
+
+nosgi_obj/%.o : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -c -o $@
+
+d_obj/%.o : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -c -o $@
+
+obj/%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+nosgi_obj/%.i : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -E -H > $@
+
+d_obj/%.i : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -E -H > $@
+
+obj/%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -g -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBSTLPORT) $(LIBS) -o $*
+	./$* > $@
+#	-rm -f $*
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+%.E: %.cpp
+	$(CXX) $(CXXFLAGS) -E $<  -o $@
+
+clean:
+	-rm -fr ${TEST_EXE} *.o */*.o *.rpo *.obj *.out core *~ Templates.DB
diff --git a/main/source/stlport/test/eh/gcc7.mak b/main/source/stlport/test/eh/gcc7.mak
new file mode 100644
index 00000000..53ac7450
--- /dev/null
+++ b/main/source/stlport/test/eh/gcc7.mak
@@ -0,0 +1,93 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+srcdir = .
+VPATH = .
+
+# point this to proper location
+STL_INCL=-I../../stlport
+
+AUX_LIST=TestClass.cpp main.cpp nc_alloc.cpp random_number.cpp
+
+TEST_LIST=test_algo.cpp  \
+test_algobase.cpp     test_list.cpp test_slist.cpp \
+test_bit_vector.cpp   test_vector.cpp \
+test_deque.cpp test_set.cpp test_map.cpp \
+test_hash_map.cpp  test_hash_set.cpp test_rope.cpp \
+test_string.cpp test_bitset.cpp test_valarray.cpp
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST:%.cpp=obj/%.o) $(STAT_MODULE)
+D_OBJECTS = $(LIST:%.cpp=d_obj/%.o) $(STAT_MODULE)
+NOSGI_OBJECTS = $(LIST:%.cpp=nosgi_obj/%.o) $(STAT_MODULE)
+
+EXECS = $(LIST:%.cpp=%)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = ./eh_test
+D_TEST_EXE = ./eh_test_d
+NOSGI_TEST_EXE = ./eh_test_nosgi
+
+TEST  = ./eh_test.out
+D_TEST = ./eh_test_d.out
+NOSGI_TEST = ./eh_test_nosgi.out
+
+CC = c++
+CXX = $(CC)
+
+CXXFLAGS = -Wall -fhandle-exceptions -g ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -D_STLP_NO_OWN_IOSTREAMS -D_STLP_DEBUG_UNINITIALIZED
+
+check: $(TEST)
+
+LIBS = -lm 
+D_LIBSTLPORT = -L../../lib -lstlport_gcc_debug
+LIBSTLPORT = -L../../lib -lstlport_gcc
+
+all: $(TEST_EXE) $(D_TEST_EXE) $(NOSGI_TEST_EXE)
+
+check_nosgi: $(NOSGI_TEST)
+check_d: $(D_TEST)
+
+
+$(TEST_EXE) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+
+
+$(TEST) : $(TEST_EXE)
+	$(TEST_EXE)
+
+$(D_TEST) : $(D_TEST_EXE)
+	$(D_TEST_EXE)
+
+$(NOSGI_TEST) : $(NOSGI_TEST_EXE)
+	$(NOSGI_TEST_EXE)
+
+SUFFIXES: .cpp.o.exe.out.res
+
+nosgi_obj/%.o : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -c -o $@
+
+d_obj/%.o : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -c -o $@
+
+obj/%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+obj/%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -g -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) -o $*
+	./$* > $@
+	-rm -f $*
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+%.E: %.cpp
+	$(CXX) $(CXXFLAGS) -E $<  -o $@
+
+clean:
+	-rm -fr ${TEST_EXE} *.o */*.o *.rpo *.obj *.out core *~ Templates.DB
diff --git a/main/source/stlport/test/eh/hp.mak b/main/source/stlport/test/eh/hp.mak
new file mode 100644
index 00000000..b0be0725
--- /dev/null
+++ b/main/source/stlport/test/eh/hp.mak
@@ -0,0 +1,81 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+# SHELL=/bin/sh
+# srcdir = .
+# VPATH = .
+
+
+# point this to proper location
+STL_INCL= -I../../stlport
+
+AUX_LIST=TestClass.cpp main.cpp nc_alloc.cpp random_number.cpp
+
+TEST_LIST=test_algo.cpp  \
+test_algobase.cpp     test_list.cpp test_slist.cpp \
+test_bit_vector.cpp   test_vector.cpp \
+test_deque.cpp test_set.cpp test_map.cpp \
+test_hash_map.cpp  test_hash_set.cpp test_rope.cpp \
+test_string.cpp test_bitset.cpp test_valarray.cpp
+
+OBJECTS = test_algo.o  \
+test_algobase.o     test_list.o test_slist.o \
+test_bit_vector.o   test_vector.o \
+test_deque.o test_set.o test_map.o \
+test_hash_map.o  test_hash_set.o test_rope.o \
+test_string.o test_bitset.o test_valarray.o
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+# OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = eh_test
+TEST  = eh_test.out
+
+CC = CC
+CXX = $(CC)
+
+CXXFLAGS = -w ${STL_INCL} -D_STLP_NO_CUSTOM_IO
+
+LIBS = -lm 
+
+LIBSTLPORT = -L../../lib -lstlport_hp
+
+check: $(TEST)
+
+all: $(TEST_EXE)
+	echo done.
+
+$(TEST_EXE) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) ${LIBSTLPORT} $(LIBS) -o $(TEST_EXE)
+
+$(TEST) : $(TEST_EXE)
+	$(TEST_EXE)
+
+SUFFIXES: .cpp .o .i .s .out .res .y
+
+.cpp.o :
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+.cpp.i :
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+.cpp.out:
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -g -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) -o $*
+	./$* -q
+	-rm -f $*
+
+.cpp.s:
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+clean:
+	-rm -fr ${TEST_EXE} *.o *.rpo *.obj *.out core *~ Templates.DB SunWS_cache
+
+
+
+
+
+
diff --git a/main/source/stlport/test/eh/hpacc.mak b/main/source/stlport/test/eh/hpacc.mak
new file mode 100644
index 00000000..671a54c2
--- /dev/null
+++ b/main/source/stlport/test/eh/hpacc.mak
@@ -0,0 +1,119 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+srcdir = .
+VPATH = .
+
+# point this to proper location
+STL_INCL=-I../../stlport
+
+AUX_LIST=TestClass.cpp main.cpp nc_alloc.cpp random_number.cpp
+
+TEST_LIST=test_algo.cpp  \
+test_algobase.cpp     test_list.cpp test_slist.cpp \
+test_bit_vector.cpp   test_vector.cpp \
+test_deque.cpp test_set.cpp test_map.cpp \
+test_hash_map.cpp  test_hash_set.cpp test_rope.cpp \
+test_string.cpp test_bitset.cpp test_valarray.cpp
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST:%.cpp=obj/%.o) $(STAT_MODULE)
+D_OBJECTS = $(LIST:%.cpp=d_obj/%.o) $(STAT_MODULE)
+NOSGI_OBJECTS = $(LIST:%.cpp=nosgi_obj/%.o) $(STAT_MODULE)
+
+EXECS = $(LIST:%.cpp=%)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = ./eh_test
+D_TEST_EXE = ./eh_test_d
+NOSGI_TEST_EXE = ./eh_test_nosgi
+
+TEST  = ./eh_test.out
+D_TEST = ./eh_test_d.out
+NOSGI_TEST = ./eh_test_nosgi.out
+
+CC = aCC
+CXX = $(CC)
+
+CXX_EXTRA_FLAGS = -AA -DEH_DELETE_HAS_THROW_SPEC
+# dwa 12/22/99 -- had to turn off -ansi flag so we could use SGI IOSTREAMS
+# also, test_slist won't compile with -O3/-O2 when targeting PPC. It fails 
+# in the assembler with 'invalid relocation type'
+CXXFLAGS = -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW
+D_CXXFLAGS = -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -D_STLP_DEBUG -D_STLP_USE_STATIC_LIB
+NOSGI_CXXFLAGS = -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -D_STLP_NO_OWN_IOSTREAMS -D_STLP_DEBUG_UNINITIALIZED -DEH_VECTOR_OPERATOR_NEW
+
+check: $(TEST)
+
+HP_VERSION=$(shell uname -r)
+ifeq (${HP_VERSION},B.10.20)
+PTHREAD_LIB=-lcma
+else
+PTHREAD_LIB=-lpthread +nostl
+endif
+
+LIBS = $(PTHREAD_LIB) -lm
+ 
+D_LIBSTLPORT = -L../../lib -lstlport_aCC_debug
+LIBSTLPORT = -L../../lib -lstlport_aCC
+
+all: $(TEST_EXE) $(D_TEST_EXE) $(NOSGI_TEST_EXE)
+
+check_nosgi: $(NOSGI_TEST)
+check_d: $(D_TEST)
+
+
+$(TEST_EXE) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBSTLPORT) $(LIBS) -o $(TEST_EXE)
+
+$(D_TEST_EXE) : $(D_OBJECTS)
+	$(CXX) $(D_CXXFLAGS) $(D_OBJECTS) $(D_LIBSTLPORT) $(LIBS) -o $(D_TEST_EXE)
+
+$(NOSGI_TEST_EXE) : $(NOSGI_OBJECTS)
+	$(CXX) $(NOSGI_CXXFLAGS) $(NOSGI_OBJECTS) $(LIBS) -o $(NOSGI_TEST_EXE)
+
+
+$(TEST) : $(TEST_EXE)
+	$(TEST_EXE)
+
+$(D_TEST) : $(D_TEST_EXE)
+	$(D_TEST_EXE)
+
+$(NOSGI_TEST) : $(NOSGI_TEST_EXE)
+	$(NOSGI_TEST_EXE)
+
+SUFFIXES: .cpp.o.exe.out.res
+
+nosgi_obj/%.o : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -c -o $@
+
+d_obj/%.o : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -c -o $@
+
+obj/%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+nosgi_obj/%.i : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -E -H > $@
+
+d_obj/%.i : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -E -H > $@
+
+obj/%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -g -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) -o $*
+	./$* > $@
+	-rm -f $*
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+%.E: %.cpp
+	$(CXX) $(CXXFLAGS) -E $<  -o $@
+
+clean:
+	-rm -fr ${TEST_EXE} *.o */*.o *.rpo *.obj *.out core *~ Templates.DB
diff --git a/main/source/stlport/test/eh/intel.mak b/main/source/stlport/test/eh/intel.mak
new file mode 100644
index 00000000..b16bea55
--- /dev/null
+++ b/main/source/stlport/test/eh/intel.mak
@@ -0,0 +1,69 @@
+# Microsoft Developer Studio Generated NMAKE File, Format Version 4.10
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+################################################################################
+# Begin Project
+RSC=rc.exe
+CPP=icl.exe
+F90=fl32.exe
+
+OUTDIR=.
+INTDIR=.
+
+# set this directories 
+STL_INCL=../../stlport
+VC_INCL=.
+# d:/vc41/msdev/include
+
+Dep_stl = TestClass.obj main.obj nc_alloc.obj \
+random_number.obj test_algo.obj test_algobase.obj test_bit_vector.obj test_deque.obj \
+test_hash_map.obj test_hash_set.obj test_list.obj test_map.obj test_rope.obj test_set.obj \
+test_slist.obj test_vector.obj test_string.obj test_bitset.obj test_valarray.obj
+
+LINK32=link.exe
+
+CPP_PROJ=/nologo /W3 /GX /D "WIN32" /MTd /Zi /Gm /Od /D "_CONSOLE"   /I$(STL_INCL) /I. /D_DEBUG
+
+CPP_LIBS = /link /libpath:"..\..\lib"
+
+check: eh_test.out
+
+eh_test.out : $(Dep_stl)
+	$(CPP) $(CPP_PROJ) $(Dep_stl) -o eh_test.exe $(CPP_LIBS)
+	.\eh_test.exe
+	echo done
+
+clean :
+	-@erase "$(INTDIR)\*.obj"
+	-@erase "$(OUTDIR)\*.exe"
+	-@erase "$(OUTDIR)\*.obj"
+
+
+.exe.out:
+	$< > $@
+
+.cpp.exe:
+  $(CPP) $(CPP_PROJ) -DMAIN $< $(CPP_LIBS)
+
+.c.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cpp.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cxx.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cpp.E:
+   $(CPP) $(CPP_PROJ) -E $< >$*.E  
+
+.cpp.sbr:
+   $(CPP) $(CPP_PROJ) $<  
diff --git a/main/source/stlport/test/eh/intel45.mak b/main/source/stlport/test/eh/intel45.mak
new file mode 100644
index 00000000..4cb26715
--- /dev/null
+++ b/main/source/stlport/test/eh/intel45.mak
@@ -0,0 +1,109 @@
+# Microsoft Developer Studio Generated NMAKE File, Format Version 4.10
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+################################################################################
+# Begin Project
+RSC=rc.exe
+CPP=icl.exe
+LINK32=xilink.exe
+
+OUTDIR=.
+INTDIR=.
+
+# set this directories 
+STL_PATH=..\..
+
+Dep_stl = TestClass.obj main.obj nc_alloc.obj \
+random_number.obj test_algo.obj test_algobase.obj test_bit_vector.obj test_deque.obj \
+test_hash_map.obj test_hash_set.obj test_list.obj test_map.obj test_rope.obj test_set.obj \
+test_slist.obj test_vector.obj test_string.obj test_bitset.obj test_valarray.obj
+
+CPP_LIBS = /link /incremental:no /LIBPATH:$(STL_PATH)\lib
+
+#disable warnings complaining about debug ...info exceeded....
+CPP_PRJ_EXTRA = /Qwd985
+CPP_PRJ_CMN = /nologo /W3 /GR /GX /DWIN32 /D_WINDOWS /D_CONSOLE /I$(STL_PATH)\stlport /I.
+
+#
+LIBTYPE = STATIC
+# LIBTYPE = DYNAMIC
+#
+#DEBUG = STL
+DEBUG = ON
+#DEBUG =
+# 
+IOS = SGI
+#IOS = NOSGI
+#IOS = NONE
+
+!IF "$(IOS)" == "NOSGI"
+CPP_PRJ_IOS = /D_STLP_NO_OWN_IOSTREAMS
+!ELSEIF "$(IOS)" == "NONE"
+CPP_PRJ_IOS = /D_STLP_NO_IOSTREAM
+!ELSE
+CPP_PRJ_IOS =
+!ENDIF
+
+#MT/MD etc should be LAST in CPP_PRJ_LIBTYP string!!!
+#Library selection should be BEFORE debug processing!!!
+!IF "$(LIBTYPE)" == "STATIC"
+CPP_PRJ_LIBTYP = /MT
+!ELSE
+CPP_PRJ_LIBTYP = /MD
+!ENDIF
+
+!IF "$(DEBUG)" == ""
+CPP_PRJ_DBG = /DNDEBUG /O2 /Qsox-
+!ELSE
+CPP_PRJ_LIBTYP = $(CPP_PRJ_LIBTYP)d
+CPP_PRJ_DBG = /D_DEBUG /Od
+!IF "$(DEBUG)" == "STL"
+CPP_PRJ_DBG = $(CPP_PRJ_DBG) /D_STLP_DEBUG
+!ENDIF
+CPP_PRJ_CMN = $(CPP_PRJ_CMN) /Zi /Gm
+!ENDIF
+
+CPP_PROJ = $(CPP_PRJ_CMN) $(CPP_PRJ_EXTRA) $(CPP_PRJ_IOS) $(CPP_PRJ_LIBTYP) $(CPP_PRJ_DBG)
+
+check: eh_test.out
+
+eh_test.out : $(Dep_stl)
+	$(CPP) $(CPP_PROJ) $(Dep_stl) /Feeh_test.exe $(CPP_LIBS)
+        cd ..\..\lib
+	..\test\eh\eh_test.exe -s 100
+	echo done
+
+clean :
+	-@erase "$(INTDIR)\*.obj"
+	-@erase "$(OUTDIR)\*.exe"
+	-@erase "$(OUTDIR)\*.obj"
+
+
+.exe.out:
+	$< > $@
+
+.cpp.exe:
+  $(CPP) $(CPP_PROJ) -DMAIN $<
+
+.c.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cpp.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cxx.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cpp.E:
+   $(CPP) $(CPP_PROJ) -E $< >$*.E  
+
+.cpp.sbr:
+   $(CPP) $(CPP_PROJ) $<  
diff --git a/main/source/stlport/test/eh/intel50.mak b/main/source/stlport/test/eh/intel50.mak
new file mode 100644
index 00000000..9ce07b68
--- /dev/null
+++ b/main/source/stlport/test/eh/intel50.mak
@@ -0,0 +1,115 @@
+# Microsoft Developer Studio Generated NMAKE File, Format Version 4.10
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+################################################################################
+# Begin Project
+RSC=rc.exe
+CPP=icl.exe
+LINK32=xilink.exe
+
+OUTDIR=.
+INTDIR=.
+
+# set this directories 
+STL_PATH=..\..
+
+Dep_stl = TestClass.obj main.obj nc_alloc.obj \
+random_number.obj test_algo.obj test_algobase.obj test_bit_vector.obj test_deque.obj \
+test_hash_map.obj test_hash_set.obj test_list.obj test_map.obj test_rope.obj test_set.obj \
+test_slist.obj test_vector.obj test_string.obj test_bitset.obj test_valarray.obj
+
+# linker finds proper STLport lib automatically, only path to the library is needed
+CPP_PRJ_LINK = /link /incremental:no /LIBPATH:$(STL_PATH)\lib
+
+#disable warnings complaining about debug ...info exceeded....
+CPP_PRJ_EXTRA = /Qwd985
+CPP_PRJ_CMN = /nologo /W3 /GR /GX /DWIN32 /D_WINDOWS /D_CONSOLE /I$(STL_PATH)\stlport /I.
+	
+#
+LIBTYPE = STATIC
+# LIBTYPE = DYNAMIC
+#
+#DEBUG = STL
+DEBUG = ON
+#DEBUG =
+# 
+IOS = SGI
+#IOS = NOSGI
+#IOS = NONE
+
+!IF "$(IOS)" == "NOSGI"
+CPP_PRJ_IOS = /D_STLP_NO_SGI_IOSTREAMS
+!ELSEIF "$(IOS)" == "NONE"
+CPP_PRJ_IOS = /D_STLP_NO_IOSTREAM
+!ELSE
+CPP_PRJ_IOS =
+!ENDIF
+
+#MT/MD etc should be LAST in CPP_PRJ_LIBTYP string!!!
+#Library selection should be BEFORE debug processing!!!
+!IF "$(LIBTYPE)" == "STATIC"
+CPP_PRJ_LIBTYP = /D_STLP_USE_STATIC_LIB /MT
+!ELSE
+CPP_PRJ_LIBTYP = /D_STLP_USE_DYNAMIC_LIB /MD
+!ENDIF
+
+!IF "$(DEBUG)" == ""
+CPP_PRJ_DBG = /DNDEBUG /O2 /Qsox-
+!ELSE
+CPP_PRJ_LIBTYP = $(CPP_PRJ_LIBTYP)d
+CPP_PRJ_DBG = /D_DEBUG /Od
+!IF "$(DEBUG)" == "STL"
+CPP_PRJ_DBG = $(CPP_PRJ_DBG) /D_STLP_DEBUG
+!ENDIF
+CPP_PRJ_CMN = $(CPP_PRJ_CMN) /Zi /Gm
+!ENDIF
+
+CPP_IGNORE_LIB = LIBCMT
+#CPP_PRJ_LINK = $(CPP_PRJ_LINK) /NODEFAULTLIB:$(CPP_IGNORE_LIB)
+CPP_PRJ_LINK = $(CPP_PRJ_LINK) /VERBOSE:LIB
+
+CPP_PROJ = $(CPP_PRJ_CMN) $(CPP_PRJ_EXTRA) $(CPP_PRJ_IOS) $(CPP_PRJ_LIBTYP) $(CPP_PRJ_DBG)
+
+check: eh_test.out
+
+eh_test.out : $(Dep_stl)
+	$(CPP) $(CPP_PROJ) $(Dep_stl) /Feeh_test.exe $(CPP_PRJ_LINK)
+#  	    fbp : this is to locate DLL
+        cd ..\..\lib
+	..\test\eh\eh_test.exe -s 100
+	echo done
+
+clean :
+	-@erase "$(INTDIR)\*.obj"
+	-@erase "$(OUTDIR)\*.exe"
+	-@erase "$(OUTDIR)\*.obj"
+
+
+.exe.out:
+	$< > $@
+
+.cpp.exe:
+  $(CPP) $(CPP_PROJ) -DMAIN $< $(CPP_PRJ_LINK)
+
+.c.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cpp.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cxx.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cpp.E:
+   $(CPP) $(CPP_PROJ) -E $< >$*.E  
+
+.cpp.sbr:
+   $(CPP) $(CPP_PROJ) $<  
diff --git a/main/source/stlport/test/eh/kai.mak b/main/source/stlport/test/eh/kai.mak
new file mode 100644
index 00000000..17d2996b
--- /dev/null
+++ b/main/source/stlport/test/eh/kai.mak
@@ -0,0 +1,65 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+
+# point this to proper location
+STL_INCL= -I../../stlport 
+# STL_INCL= -DEH_NO_SGI_STL
+
+AUX_LIST=TestClass.cpp main.cpp nc_alloc.cpp random_number.cpp
+
+TEST_LIST=test_algo.cpp  \
+test_algobase.cpp     test_list.cpp test_slist.cpp \
+test_bit_vector.cpp   test_vector.cpp \
+test_deque.cpp test_set.cpp test_map.cpp \
+test_hash_map.cpp  test_hash_set.cpp test_rope.cpp \
+test_string.cpp test_bitset.cpp test_valarray.cpp
+
+# TEST_LIST=test_deque.cpp
+
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = eh_test
+TEST  = eh_test.out
+
+CC = KCC
+CXX = $(CC)
+
+CXXFLAGS = -w -mt --one_per ${STL_INCL} -D_STLP_USE_NEWALLOC -DEH_VECTOR_OPERATOR_NEW -DEH_DELETE_HAS_THROW_SPEC
+
+# This is to test with native STL
+# CXXFLAGS = -w -mt --one_per -D_STLP_USE_NEWALLOC -DEH_NO_SGI_STL -DEH_NEW_HEADERS -DEH_VECTOR_OPERATOR_NEW -DEH_DELETE_HAS_THROW_SPEC
+
+# This is to test with STLport iostreams
+LIBS = -L../../lib -lstlport_kcc -lm 
+
+LIBSTDCXX = 
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	$(TEST_EXE)
+
+SUFFIXES: .cpp.o.out.res
+
+%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -g -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) -o $*
+	./$* -q
+	-rm -f $*
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+clean:
+	-rm -fr ${TEST_EXE} *.o *.rpo *.obj *.out core *~ Templates.DB SunWS_cache ti_files
diff --git a/main/source/stlport/test/eh/locale.cpp b/main/source/stlport/test/eh/locale.cpp
new file mode 100644
index 00000000..2df87138
--- /dev/null
+++ b/main/source/stlport/test/eh/locale.cpp
@@ -0,0 +1,60 @@
+#include <exception>
+#include <iostream>
+#include <locale>
+#include <ctime>
+
+using namespace std;
+
+void main()
+{
+	try
+	{
+		locale c_loc;
+		//locale sys(c_loc, "LC_TIME=UKR_UKR.OCP;LC_NUMERIC=RUS_RUS.OCP;LC_CTYPE=ukr_ukr.ocp;", locale::numeric | locale::time | locale::ctype);
+		locale sys(".ocp");
+		locale::global(sys);
+		cin.imbue(sys);
+		cout.imbue(sys);
+
+		cout<<"Locale name is: "<<sys.name().c_str()<<'\n';
+
+		cout<<"Enter real number:";
+		double value;
+		cin>>value;
+		cout<<value<<'\n';
+
+        // Time test.
+        long lcur_time;
+        time(&lcur_time);
+        struct tm* cur_time=localtime(&lcur_time);
+
+        const numpunct<char>& num_punct=use_facet<numpunct<char> >(cout.getloc());
+        cout << num_punct.decimal_point() << '\n';
+        const time_put<char, ostreambuf_iterator<char, char_traits<char> > >& time_fac=
+        use_facet<time_put<char, ostreambuf_iterator<char, char_traits<char> > > >(cout.getloc());
+        time_fac.put(cout, cout, NULL, cur_time, 'x'); cout<<'\n';
+        time_fac.put(cout, cout, NULL, cur_time, 'x', '#'); cout<<'\n';
+        time_fac.put(cout, cout, NULL, cur_time, 'X'); cout<<'\n';
+        time_fac.put(cout, cout, NULL, cur_time, 'c'); cout<<'\n';
+        time_fac.put(cout, cout, NULL, cur_time, 'c', '#'); cout<<'\n';
+        time_fac.put(cout, cout, NULL, cur_time, 'I'); cout<<'\n';
+
+        const ctype<char>& char_type=use_facet<ctype<char> >(cout.getloc());
+        if(char_type.is(ctype_base::upper, '�')) puts("Upper");
+        if(char_type.is(ctype_base::lower, '¯')) puts("Lower");
+        puts("Next");
+        if(isupper('�', cout.getloc())) puts("Upper");
+        if(islower('¯', cout.getloc())) puts("Lower");
+        /*for(int ch=128; ch<256; ch++)
+        	printf("Character %c (%d) - upper %c, lower %c\n",(char)ch, ch,toupper((char)ch, cout.getloc()), tolower((char)ch, cout.getloc()));*/
+	}
+	catch(exception &e)
+	{
+		cout<<"Exception fired:\n"<<e.what()<<'\n';
+	}
+	catch(...)
+	{
+		cout<<"Unknown exception throwed!\n";
+	}
+	cout.flush();
+}
diff --git a/main/source/stlport/test/eh/main.cpp b/main/source/stlport/test/eh/main.cpp
new file mode 100644
index 00000000..0f5e4153
--- /dev/null
+++ b/main/source/stlport/test/eh/main.cpp
@@ -0,0 +1,381 @@
+/***********************************************************************************
+	Main.cpp
+	
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Moscow Center for SPARC Technology makes 
+no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+
+***********************************************************************************/
+#include "Prefix.h"
+#include "Tests.h"
+
+#if defined (EH_NEW_IOSTREAMS)
+# include <iostream>
+# else
+# include <iostream.h>
+#endif
+
+#if defined(macintosh)&&(!defined(__MRC__) && !defined(__SC__)) || defined (_MAC) && defined(__MWERKS__)
+
+# include <console.h>
+# include <Types.h>
+# include <Strings.h>
+
+# ifdef EH_NEW_HEADERS
+#  include <cstdio>
+#  include <cstring>
+#  include <cassert>
+# else
+#  include <stdio.h>
+#  include <string.h>
+#  include <assert.h>
+# endif
+
+# if defined ( EH_USE_SGI_STL ) 
+// Override assertion behavior
+#  include <cstdarg>
+//#  include <stldebug.h>
+void __stl_debug_message(const char * format_str, ...)
+{
+	std::va_list args;
+	va_start( args, format_str );
+	char msg[256];
+	std::vsnprintf(msg, sizeof(msg)/sizeof(*msg) - 1, format_str, args );
+	DebugStr( c2pstr(msg) );
+}
+# else
+/*===================================================================================
+	__assertion_failed  (override standard library function)
+
+	EFFECTS: Breaks into the debugger and shows the assertion. This implementation
+		is Mac-specific; others could be added for other platforms.
+====================================================================================*/
+extern "C"
+{
+	void __assertion_failed(char *condition, char *testfilename, int lineno);
+	void __assertion_failed(char *condition, char *testfilename, int lineno)
+	{
+	    char msg[256];
+	    std::strncpy( msg, condition, 255 );
+	    std::strncat( msg, ": ", 255 );
+	    std::strncat(  msg, testfilename, 255 );
+	    std::strncat( msg, ", ", 255 );
+	    char line[20];
+	    std::sprintf( line, "%d", lineno );
+	    std::strncat(  msg, line, 255 );
+	    DebugStr( c2pstr( msg ) );
+	}
+}
+# endif
+
+#endif
+
+#include "nc_alloc.h"
+
+#if defined (EH_NEW_HEADERS)
+# include <vector>
+# include <cstring>
+# else
+# include <vector.h>
+# include <string.h>
+#endif
+
+#include "TestClass.h"
+#include "LeakCheck.h"
+#include "test_construct.h"
+#ifdef __BORLANDC__
+# include <except.h>
+#endif
+
+EH_USE_STD
+
+
+/*===================================================================================
+	usage  (file-static helper)
+
+	EFFECTS: Prints a message describing the command-line parameters
+====================================================================================*/
+static void usage(const char* name)
+{
+    cerr<<name<< 
+        " Usage : leak_test [-n <iterations>] [-s <size>] [-l] [-e] [-q]/[-v] [-t] [test_name...]\n";
+    cerr<<"\t[-n <iterations>] : number of test iterations, default==100;"<<endl;
+    cerr<<"\t[-s <size>] : base value for random container sizes, default==1000;"<<endl;
+    cerr<<"\t[-e] : don't throw exceptions, test for leak in normal conditions;"<<endl;
+// This option was never actually used -- dwa 9/22/97
+//    cerr<<"\t[-i] : ignore leak errors;"<<endl;
+    cerr<<"\t[-q] : quiet mode;"<<endl;
+    cerr<<"\t[-v] : verbose mode;"<<endl;
+    cerr<<"\t[-t] : track each allocation;"<<endl;
+    cerr<<"\t[test name [test name...]] : run only some of the tests by name (default==all tests):"<<endl;
+    cerr<<"\t\tpossible test names are : algo vector bit_vector list slist deque set map hash_set hash_map rope string bitset valarray"<<endl;
+    EH_CSTD::exit(1);
+}
+
+# ifdef EH_NEW_HEADERS
+#  include <set>
+# else
+#  include <set.h>
+# endif
+
+int _STLP_CALL main(int argc, char** argv)
+{
+#if defined( __MWERKS__ ) && defined( macintosh )	// Get command line.
+	argc = ccommand(&argv);
+	// Allow the i/o window to be repositioned.
+//	EH_STD::string s;
+//	getline(EH_STD::cin, s);
+#endif
+    unsigned int niters=2;
+    bool run_all=true;
+    bool run_slist = false;
+    bool run_list = false;
+    bool run_vector = false;
+    bool run_bit_vector = false;
+    bool run_deque = false;
+    bool run_hash_map = false;
+    bool run_hash_set = false;
+    bool run_set = false;
+    bool run_map = false;
+    bool run_algo = false;
+    bool run_algobase = false;
+    bool run_rope = false;
+    bool run_string = false;
+    bool run_bitset = false;
+    bool run_valarray = false;
+
+    int cur_argv;
+    char *p, *p1;
+#if defined (EH_NEW_IOSTREAMS)
+    std::ios_base::sync_with_stdio(false);
+#endif
+
+    cerr << argv[0]<<" : Exception handling testsuite.\n";
+    cerr.flush();
+	
+	bool track_allocations = false;
+    // parse parameters :
+    // leak_test [-iterations] [-test] ...
+    for (cur_argv=1; cur_argv<argc; cur_argv++) {
+        p = argv[cur_argv];
+        if (*p == '-') {
+            switch (p[1]) {
+            case 'q':
+                gTestController.SetVerbose(false);
+                break;
+            case 'v':
+                gTestController.SetVerbose(true);
+                break;
+#if 0	// This option was never actually used -- dwa 9/22/97
+            case 'i':
+                gTestController.IgnoreLeaks(true);
+                break;
+#endif
+            case 'n':
+                p1 = argv[++cur_argv];
+                if (p1 && EH_CSTD::sscanf(p1, "%i", &niters)==1)
+                    cerr <<" Doing "<<niters<<" iterations\n";
+                else
+                    usage(argv[0]);
+                break;
+            case 't':
+            	track_allocations = true;
+            	break;
+            case 'e':
+                gTestController.TurnOffExceptions();
+                break;
+            case 's':
+                p1 = argv[++cur_argv];
+                if (p1 && EH_CSTD::sscanf(p1, "%i", &random_base)==1)
+                    cerr <<" Setting  "<<random_base<<" as base for random sizes.\n";
+                else
+                    usage(argv[0]);
+                break;
+            default:
+                usage(argv[0]);
+                break;
+            }
+        } else {
+            run_all = false;
+            // test name 
+            if (EH_CSTD::strcmp(p, "algo")==0) {
+                run_algo=true;
+            } else if (EH_CSTD::strcmp(p, "vector")==0) {
+                run_vector=true;               
+            } else if (EH_CSTD::strcmp(p, "bit_vector")==0) {
+                run_bit_vector=true; 
+            } else if (EH_CSTD::strcmp(p, "list")==0) {
+                run_list=true;               
+            } else if (EH_CSTD::strcmp(p, "slist")==0) {
+                run_slist=true;               
+            } else if (EH_CSTD::strcmp(p, "deque")==0) {
+                run_deque=true;               
+            } else if (EH_CSTD::strcmp(p, "set")==0) {
+                run_set=true;               
+            } else if (EH_CSTD::strcmp(p, "map")==0) {
+                run_map=true;               
+            } else if (EH_CSTD::strcmp(p, "hash_set")==0) {
+                run_hash_set=true;               
+            } else if (EH_CSTD::strcmp(p, "hash_map")==0) {
+                run_hash_map=true;               
+            } else if (EH_CSTD::strcmp(p, "rope")==0) {
+                run_rope=true;               
+            } else if (EH_CSTD::strcmp(p, "string")==0) {
+                run_string=true;               
+            } else if (EH_CSTD::strcmp(p, "bitset")==0) {
+                run_bitset=true;               
+            } else if (EH_CSTD::strcmp(p, "valarray")==0) {
+                run_valarray=true;               
+            } else {
+                usage(argv[0]);
+            }
+            
+        }
+    }
+
+	gTestController.TrackAllocations( track_allocations );
+
+    // Over and over...
+    for ( unsigned i = 0; i < niters ; i++ )
+    {
+   	cerr << "iteration #" << i << "\n";
+        if (run_all || run_algobase) {
+            gTestController.SetCurrentContainer("algobase");
+            cerr << "EH test : algobase" << endl;
+            test_algobase();
+        }
+        if (run_all || run_algo) {
+            gTestController.SetCurrentContainer("algo");
+            cerr << "EH test : algo" << endl;
+            test_algo();
+        }
+
+        if (run_all || run_vector) {
+            gTestController.SetCurrentContainer("vector");
+            cerr << "EH test : vector" << endl;
+            test_vector();
+        }
+
+#if defined( EH_BIT_VECTOR_IMPLEMENTED )
+        if (run_all || run_bit_vector) {
+            gTestController.SetCurrentContainer("bit_vector");
+           cerr << "EH test : bit_vector" << endl;
+            test_bit_vector();
+        }
+#endif
+
+        if (run_all || run_list) {
+            gTestController.SetCurrentContainer("list");
+            cerr << "EH test : list" << endl;
+            test_list();
+        }
+        
+#if defined( EH_SLIST_IMPLEMENTED )
+        if (run_all || run_slist) {
+            gTestController.SetCurrentContainer("slist");
+            cerr << "EH test : slist" << endl;
+            test_slist();
+        }
+#endif // EH_SLIST_IMPLEMENTED
+
+        if (run_all || run_deque) {
+            gTestController.SetCurrentContainer("deque");
+            cerr << "EH test : deque" << endl;
+            test_deque();
+        }
+        if (run_all || run_set) {
+            gTestController.SetCurrentContainer("set");
+            cerr << "EH test : set" << endl;
+            test_set();
+            gTestController.SetCurrentContainer("multiset");
+            cerr << "EH test : multiset" << endl;
+            test_multiset();
+        }
+
+        if (run_all || run_map) {
+            gTestController.SetCurrentContainer("map");
+            cerr << "EH test : map" << endl;
+            test_map();
+            gTestController.SetCurrentContainer("multimap");
+            cerr << "EH test : multimap" << endl;
+            test_multimap();
+        }
+
+#if defined( EH_HASHED_CONTAINERS_IMPLEMENTED )
+        if (run_all || run_hash_map) {
+            gTestController.SetCurrentContainer("hash_map");
+            cerr << "EH test : hash_map" << endl;
+            test_hash_map();
+            gTestController.SetCurrentContainer("hash_multimap");
+            cerr << "EH test : hash_multimap" << endl;
+            test_hash_multimap();
+        }
+
+        if (run_all || run_hash_set) {
+            gTestController.SetCurrentContainer("hash_set");
+            cerr << "EH test : hash_set" << endl;
+            test_hash_set();
+            gTestController.SetCurrentContainer("hash_multiset");
+            cerr << "EH test : hash_multiset" << endl;
+            test_hash_multiset();
+        }
+#endif // EH_HASHED_CONTAINERS_IMPLEMENTED
+
+#if defined( EH_ROPE_IMPLEMENTED )
+	// CW1.8 can't compile this for some reason!
+#if !( defined(__MWERKS__) && __MWERKS__ < 0x1900 )
+        if (run_all || run_rope) {
+            gTestController.SetCurrentContainer("rope");
+            cerr << "EH test : rope" << endl;
+            test_rope();
+        }
+#endif
+#endif // EH_ROPE_IMPLEMENTED
+#if defined( EH_STRING_IMPLEMENTED )
+        if (run_all || run_string) {
+            gTestController.SetCurrentContainer("string");
+            cerr << "EH test : string" << endl;
+            test_string();
+        }
+#endif
+#if defined( EH_BITSET_IMPLEMENTED )
+        if (run_all || run_bitset) {
+            gTestController.SetCurrentContainer("bitset");
+            cerr << "EH test : bitset" << endl;
+            test_bitset();
+        }
+#endif
+#if defined( EH_VALARRAY_IMPLEMENTED )
+        if (run_all || run_bitset) {
+            gTestController.SetCurrentContainer("valarray");
+            cerr << "EH test : valarray" << endl;
+            test_valarray();
+        }
+#endif
+    }
+
+	gTestController.TrackAllocations( false );
+	
+    cerr << "EH test : Done\n";
+    return 0;
+}
+
diff --git a/main/source/stlport/test/eh/mingw32.mak b/main/source/stlport/test/eh/mingw32.mak
new file mode 100644
index 00000000..e584eb42
--- /dev/null
+++ b/main/source/stlport/test/eh/mingw32.mak
@@ -0,0 +1,111 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+srcdir = .
+VPATH = .
+
+# point this to proper location
+STL_INCL=-I../../stlport
+
+AUX_LIST=TestClass.cpp main.cpp nc_alloc.cpp random_number.cpp
+
+TEST_LIST=test_algo.cpp  \
+test_algobase.cpp     test_list.cpp test_slist.cpp \
+test_bit_vector.cpp   test_vector.cpp \
+test_deque.cpp test_set.cpp test_map.cpp \
+test_hash_map.cpp  test_hash_set.cpp test_rope.cpp \
+test_string.cpp test_bitset.cpp test_valarray.cpp
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST:%.cpp=obj/%.o) $(STAT_MODULE)
+D_OBJECTS = $(LIST:%.cpp=d_obj/%.o) $(STAT_MODULE)
+NOSGI_OBJECTS = $(LIST:%.cpp=nosgi_obj/%.o) $(STAT_MODULE)
+
+EXECS = $(LIST:%.cpp=%)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = ./eh_test
+D_TEST_EXE = ./eh_test_d
+NOSGI_TEST_EXE = ./eh_test_nosgi
+
+TEST  = ./eh_test.out
+D_TEST = ./eh_test_d.out
+NOSGI_TEST = ./eh_test_nosgi.out
+
+CC = c++
+CXX = $(CC)
+
+# dwa 12/22/99 -- had to turn off -ansi flag so we could use SGI IOSTREAMS
+# also, test_slist won't compile with -O3/-O2 when targeting PPC. It fails 
+# in the assembler with 'invalid relocation type'
+CXXFLAGS = -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW
+D_CXXFLAGS = -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -D_STLP_DEBUG -D_STLP_USE_STATIC_LIB
+NOSGI_CXXFLAGS = -Wall -g -O2 ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -D_STLP_NO_OWN_IOSTREAMS -D_STLP_DEBUG_UNINITIALIZED -DEH_VECTOR_OPERATOR_NEW
+
+check: $(TEST)
+
+LIBS = -lm 
+
+D_LIBSTLPORT = -L../../lib -lstlport_mingw32_debug_static
+LIBSTLPORT = -L../../lib -lstlport_mingw32_static
+
+all: $(TEST_EXE) $(D_TEST_EXE) $(NOSGI_TEST_EXE)
+
+check_nosgi: $(NOSGI_TEST)
+check_d: $(D_TEST)
+
+
+$(TEST_EXE) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBSTLPORT) $(LIBS) -o $(TEST_EXE)
+
+$(D_TEST_EXE) : $(D_OBJECTS)
+	$(CXX) $(D_CXXFLAGS) $(D_OBJECTS) $(D_LIBSTLPORT) $(LIBS) -o $(D_TEST_EXE)
+
+$(NOSGI_TEST_EXE) : $(NOSGI_OBJECTS)
+	$(CXX) $(NOSGI_CXXFLAGS) $(NOSGI_OBJECTS) $(LIBS) -o $(NOSGI_TEST_EXE)
+
+
+$(TEST) : $(TEST_EXE)
+	$(TEST_EXE)
+
+$(D_TEST) : $(D_TEST_EXE)
+	$(D_TEST_EXE)
+
+$(NOSGI_TEST) : $(NOSGI_TEST_EXE)
+	$(NOSGI_TEST_EXE)
+
+SUFFIXES: .cpp.o.exe.out.res
+
+nosgi_obj/%.o : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -c -o $@
+
+d_obj/%.o : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -c -o $@
+
+obj/%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+nosgi_obj/%.i : %.cpp
+	$(CXX) $(NOSGI_CXXFLAGS) $< -E -H > $@
+
+d_obj/%.i : %.cpp
+	$(CXX) $(D_CXXFLAGS) $< -E -H > $@
+
+obj/%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -g -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) -o $*
+	./$* > $@
+	-rm -f $*
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+%.E: %.cpp
+	$(CXX) $(CXXFLAGS) -E $<  -o $@
+
+clean:
+	-rm -fr ${TEST_EXE} *.o */*.o *.rpo *.obj *.out core *~ Templates.DB
diff --git a/main/source/stlport/test/eh/mwerks_debug_prefix.h b/main/source/stlport/test/eh/mwerks_debug_prefix.h
new file mode 100644
index 00000000..53231c5a
--- /dev/null
+++ b/main/source/stlport/test/eh/mwerks_debug_prefix.h
@@ -0,0 +1,4 @@
+//mwerks_debug_prefix.h
+#define _STLP_NO_FORCE_INSTANTIATE 1// for debugging
+#define EH_VECTOR_OPERATOR_NEW 1
+#define _STLP_DEBUG 1 // enable the use of allocation debugging
diff --git a/main/source/stlport/test/eh/mwerks_nosgi_debug_prefix.h b/main/source/stlport/test/eh/mwerks_nosgi_debug_prefix.h
new file mode 100644
index 00000000..6796e3dd
--- /dev/null
+++ b/main/source/stlport/test/eh/mwerks_nosgi_debug_prefix.h
@@ -0,0 +1,5 @@
+//mwerks_nosgi_debug_prefix.h
+#define _STLP_NO_SGI_IOSTREAMS 1
+#define _STLP_NO_FORCE_INSTANTIATE 1 // for debugging
+#define _STLP_DEBUG_UNINITIALIZED 1 // enable the use of allocation debugging
+#define EH_VECTOR_OPERATOR_NEW 1
diff --git a/main/source/stlport/test/eh/mwerks_nosgi_prefix.h b/main/source/stlport/test/eh/mwerks_nosgi_prefix.h
new file mode 100644
index 00000000..b6109550
--- /dev/null
+++ b/main/source/stlport/test/eh/mwerks_nosgi_prefix.h
@@ -0,0 +1,5 @@
+//mwerks_nosgi_prefix.h
+#define _STLP_NO_SGI_IOSTREAMS 1
+#define _STLP_NO_FORCE_INSTANTIATE 1 // for debugging
+#define EH_VECTOR_OPERATOR_NEW 1
+#define NDEBUG 1
diff --git a/main/source/stlport/test/eh/mwerks_prefix.h b/main/source/stlport/test/eh/mwerks_prefix.h
new file mode 100644
index 00000000..46e6fb3a
--- /dev/null
+++ b/main/source/stlport/test/eh/mwerks_prefix.h
@@ -0,0 +1,4 @@
+//mwerks_prefix.h
+#define _STLP_NO_FORCE_INSTANTIATE 1// for debugging
+#define EH_VECTOR_OPERATOR_NEW 1
+#define NDEBUG 1
diff --git a/main/source/stlport/test/eh/mwerks_prj/EH.mcp b/main/source/stlport/test/eh/mwerks_prj/EH.mcp
new file mode 100644
index 00000000..658c42b7
Binary files /dev/null and b/main/source/stlport/test/eh/mwerks_prj/EH.mcp differ
diff --git a/main/source/stlport/test/eh/mwerks_prj/tlib.cfg b/main/source/stlport/test/eh/mwerks_prj/tlib.cfg
new file mode 100644
index 00000000..e87f7c18
--- /dev/null
+++ b/main/source/stlport/test/eh/mwerks_prj/tlib.cfg
@@ -0,0 +1,2 @@
+include ..\..\..\..\..\..\tlibuser.cfg
+include ..\..\..\..\..\..\tlibproj.cfg
diff --git a/main/source/stlport/test/eh/nc_alloc.cpp b/main/source/stlport/test/eh/nc_alloc.cpp
new file mode 100644
index 00000000..56aff0e7
--- /dev/null
+++ b/main/source/stlport/test/eh/nc_alloc.cpp
@@ -0,0 +1,374 @@
+/************************************************************************************************
+ NC_ALLOC.CPP
+
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+
+************************************************************************************************/
+
+#include "nc_alloc.h"
+#include <string>
+
+#if defined (EH_NEW_HEADERS)
+# include <new>
+# include <cassert>
+# include <cstdlib>
+#else
+# include <assert.h>
+# include <stdlib.h>
+# include <new.h>
+#endif
+
+#if defined (EH_NEW_IOSTREAMS)
+# include <iostream>
+#else
+# include <iostream.h>
+#endif
+
+long alloc_count = 0;
+long object_count = 0;
+long TestController::possible_failure_count = 0;
+const char* TestController::current_test = "<unknown>";
+const char* TestController::current_test_category = "no category";
+const char* TestController::current_container = 0;
+bool  TestController::nc_verbose = true;
+bool  TestController::never_fail = false;
+bool  TestController::track_allocations = false;
+bool  TestController::leak_detection_enabled = false;
+TestController gTestController;
+
+//************************************************************************************************
+void TestController::maybe_fail(long)
+{
+    if ( never_fail || Failure_threshold() == kNotInExceptionTest )
+        return;
+
+    // throw if allocation would satisfy the threshold
+    if ( possible_failure_count++ >= Failure_threshold() )
+    {
+
+        // what about doing some standard new_handler() behavior here (to test it!) ???
+
+        // reset and simulate an out-of-memory failure
+        Failure_threshold() = kNotInExceptionTest;
+# ifndef EH_NO_EXCEPTIONS
+        throw EH_STD::bad_alloc();
+# endif
+    }
+}
+
+# if defined( EH_HASHED_CONTAINERS_IMPLEMENTED )
+
+#  if defined (__SGI_STL )
+
+#   if defined (EH_NEW_HEADERS)
+#    include <hash_set>
+#   else
+#    include <hash_set.h>
+#   endif
+#  elif defined (__MSL__)
+#   include <hashset.h>
+#  else
+#   error what do I include to get hash_set?
+#  endif
+
+# else
+
+#  if defined (EH_NEW_HEADERS)
+#   include <set>
+#  else
+#  include <set.h>
+#  endif
+# endif
+
+# if !defined( EH_HASHED_CONTAINERS_IMPLEMENTED )
+typedef EH_STD::set<void*, EH_STD::less<void*> > allocation_set;
+#else
+
+USING_CSTD_NAME(size_t)
+
+struct hash_void
+{
+  size_t operator()(void* x) const { return (size_t)x; }
+};
+
+typedef EH_STD::hash_set<void*, ::hash_void, EH_STD::equal_to<void*> > allocation_set;
+# endif
+
+static allocation_set& alloc_set()
+{
+	static allocation_set s;
+	return s;
+}
+
+// Prevents infinite recursion during allocation
+static bool using_alloc_set = false;
+
+# if !defined (NO_FAST_ALLOCATOR)
+//
+//	FastAllocator -- speeds up construction of TestClass objects when
+// TESTCLASS_DEEP_DATA is enabled, and speeds up tracking of allocations
+// when the suite is run with the -t option.
+//
+class FastAllocator
+{
+public:
+//	FastAllocator() : mFree(0), mUsed(0) {}
+	
+	static void *Allocate( size_t s )
+	{
+	  void *result = 0;
+
+		if ( s <= sizeof( Block ) )
+		{
+			if ( mFree != 0 )
+			{
+				result = mFree;
+				mFree = mFree->next;
+			}
+			else if ( mBlocks != 0 && mUsed < kBlockCount )
+			{
+				result =  (void*)&mBlocks[mUsed++];
+			}
+		}
+	 	return result;
+	}
+	
+	static bool Free( void* p )
+	{
+		Block* b = (Block*)p;
+		if ( mBlocks == 0 || b < mBlocks || b >= mBlocks + kBlockCount )
+			return false;
+		b->next = mFree;
+		mFree = b;
+		return true;
+	}
+	
+	struct Block;
+	friend struct Block;
+	
+	enum
+	{
+		// Number of fast allocation blocks to create.
+		kBlockCount = 1500,
+		
+		// You may need to adjust this number for your platform.
+		// A good choice will speed tests. A bad choice will still work.
+		kMinBlockSize = 48
+	};
+	
+	struct Block
+	{
+		union { 
+                    Block *next;
+                    double dummy; // fbp - force alignment
+                    char dummy2[kMinBlockSize];
+                };
+	};
+	
+	static Block* mBlocks;
+	static Block *mFree;
+	static size_t mUsed;
+};
+
+FastAllocator::Block *FastAllocator::mBlocks = 
+(FastAllocator::Block*)EH_CSTD::calloc( sizeof(FastAllocator::Block), FastAllocator::kBlockCount );
+FastAllocator::Block *FastAllocator::mFree;
+size_t FastAllocator::mUsed;
+
+
+static FastAllocator gFastAllocator;
+# endif
+
+inline char* AllocateBlock( size_t s )
+{
+# if !defined (NO_FAST_ALLOCATOR)    
+    char * const p = (char*)gFastAllocator.Allocate( s );
+    if ( p != 0 )
+    	return p;
+# endif    
+
+    return (char*)EH_CSTD::malloc(s);
+}
+
+static void* OperatorNew( size_t s )
+{
+    if ( !using_alloc_set )
+	{
+		simulate_possible_failure();
+    	alloc_count++;
+    }
+    
+    char *p = AllocateBlock(s);
+	
+	if ( gTestController.TrackingEnabled()
+		&& gTestController.LeakDetectionEnabled()
+		&& !using_alloc_set )
+	{
+		using_alloc_set = true;
+		EH_ASSERT( alloc_set().find( p ) == alloc_set().end() );
+		alloc_set().insert( p );
+		using_alloc_set = false;
+	}
+
+    return p;
+}
+
+void* _STLP_CALL operator new(size_t s) 
+#ifdef EH_DELETE_HAS_THROW_SPEC
+throw(EH_STD::bad_alloc)
+#endif
+{
+	return OperatorNew( s );
+}
+
+#ifdef EH_USE_NOTHROW
+void* _STLP_CALL operator new(size_t size, const EH_STD::nothrow_t&) throw()
+{
+	try
+	{
+		return OperatorNew( size );
+	}
+	catch(...)
+	{
+		return 0;
+	}
+}
+#endif
+
+# if defined (EH_VECTOR_OPERATOR_NEW)
+void* _STLP_CALL operator new[](size_t size ) throw(EH_STD::bad_alloc)
+{
+	return OperatorNew( size );
+}
+
+#ifdef EH_USE_NOTHROW
+void* _STLP_CALL operator new[](size_t size, const EH_STD::nothrow_t&) throw()
+{
+	try
+	{
+		return OperatorNew( size );
+	}
+	catch(...)
+	{
+		return 0;
+	}
+}
+#endif
+
+void _STLP_CALL operator delete[](void* ptr) throw()
+{
+	operator delete( ptr );
+}
+# endif
+
+# if defined (EH_DELETE_HAS_THROW_SPEC)
+void _STLP_CALL operator delete(void* s) throw()
+# else
+void _STLP_CALL operator delete(void* s)
+# endif
+{
+	if ( s != 0 )
+	{
+	    if ( !using_alloc_set )
+	    {
+	    	alloc_count--;
+
+			if ( gTestController.TrackingEnabled() && gTestController.LeakDetectionEnabled() )
+			{
+				using_alloc_set = true;
+				allocation_set::iterator p = alloc_set().find( (char*)s );
+				EH_ASSERT( p != alloc_set().end() );
+				alloc_set().erase( p );
+				using_alloc_set = false;
+			}
+		}
+# if ! defined (NO_FAST_ALLOCATOR)	
+		if ( !gFastAllocator.Free( s ) )
+# endif   
+		    EH_CSTD::free(s);
+	}
+}
+
+
+/*===================================================================================
+	ClearAllocationSet  (private helper)
+
+	EFFECTS:  Empty the set of allocated blocks.
+====================================================================================*/
+void TestController::ClearAllocationSet()
+{
+	if ( !using_alloc_set )
+	{
+		using_alloc_set = true;
+		alloc_set().clear();
+		using_alloc_set = false;
+	}
+}
+
+
+bool TestController::ReportLeaked()
+{
+
+  EndLeakDetection();
+	
+  if (using_alloc_set)
+	  EH_ASSERT( alloc_count == static_cast<int>(alloc_set().size()) );
+
+    if ( alloc_count!=0 || object_count!=0 )
+    {
+        EH_STD::cerr<<"\nEH TEST FAILURE !\n";
+        PrintTestName(true);
+        if (alloc_count)
+            EH_STD::cerr<<"ERROR : "<<alloc_count<<" outstanding allocations.\n";
+        if (object_count)
+          EH_STD::cerr<<"ERROR : "<<object_count<<" non-destroyed objects.\n";
+	alloc_count = object_count = 0;
+
+    return true;
+
+    }
+    return false;
+
+}
+
+
+
+/*===================================================================================
+	PrintTestName
+
+	EFFECTS: Prints information about the current test. If err is false, ends with
+		an ellipsis, because the test is ongoing. If err is true an error is being
+		reported, and the output ends with an endl.
+====================================================================================*/
+
+void
+TestController::PrintTestName(bool err) {
+    if (current_container)
+        EH_STD::cerr<<"["<<current_container<<"] :";
+    EH_STD::cerr<<"testing "<<current_test <<" (" << current_test_category <<")";
+    if (err)
+        EH_STD::cerr<<EH_STD::endl;
+    else
+        EH_STD::cerr<<" ... ";
+}
+
+void TestController::ReportSuccess(int count) {
+    if (nc_verbose)
+        EH_STD::cerr<<(count+1)<<" try successful"<<EH_STD::endl;
+}
+
+long& TestController::Failure_threshold()
+{
+	static long failure_threshold = kNotInExceptionTest;
+	return failure_threshold;
+}
+
diff --git a/main/source/stlport/test/eh/nc_alloc.h b/main/source/stlport/test/eh/nc_alloc.h
new file mode 100644
index 00000000..38cd629e
--- /dev/null
+++ b/main/source/stlport/test/eh/nc_alloc.h
@@ -0,0 +1,197 @@
+/***********************************************************************************
+	TestController.h
+	
+		SUMMARY: An "faux-singleton" object to encapsulate a hodgepodge of state and
+			functionality relating to the test suite. Probably should be broken
+			into smaller pieces.
+
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+		
+***********************************************************************************/
+#if !INCLUDED_MOTU_nc_alloc
+#define INCLUDED_MOTU_nc_alloc 1
+
+#include "Prefix.h"
+
+# if defined (EH_NEW_HEADERS)
+#  include <utility>
+# else
+#  include <pair.h>
+# endif
+
+extern long alloc_count;
+extern long object_count;
+
+struct TestController
+{
+    // Report that the current test has succeeded.
+    static void ReportSuccess(int);
+
+	//
+	// Leak detection
+	//
+	
+	// Turn the recording of the addresses of individual allocated
+	// blocks on or off. If not called, allocations will only be
+	// counted, but deallocations won't be checked for validity.
+	static void TrackAllocations( bool );
+	static bool TrackingEnabled();
+	
+	// Call this to begin a new leak-detection cycle. Resets all
+	// allocation counts, etc.
+    static void BeginLeakDetection();
+	
+	// Returns true iff leak detection is currently in effect
+	static bool LeakDetectionEnabled();
+	
+	// Ends leak detection and reports any resource leaks.
+	// Returns true if any occurred.
+    static bool ReportLeaked();
+
+	//
+	// Exception-safety
+	//
+	
+	// Don't test for exception-safety
+    static void TurnOffExceptions();
+    
+	// Set operator new to fail on the nth invocation
+    static void SetFailureCountdown( long n );
+	
+	// Set operator new to never fail.
+    static void CancelFailureCountdown();
+
+	// Throws an exception if the count has been reached. Call this
+	// before every operation that might fail in the real world.
+    static void maybe_fail(long);
+
+	//
+	// Managing verbose feedback.
+	//
+
+	// Call to begin a strong, weak, or const test. If verbose
+	// reporting is enabled, prints the test category.
+    static void SetCurrentTestCategory( const char* str );
+
+	// Call to set the name of the container being tested.
+    static void SetCurrentContainer( const char* str );
+
+	// Sets the name of the current test.
+    static void SetCurrentTestName(const char* str);
+
+    // Turn verbose reporting on or off.
+    static void SetVerbose(bool val);
+
+private:
+	enum { kNotInExceptionTest = -1 };
+	
+	static void ClearAllocationSet();
+    static void EndLeakDetection();
+	static void PrintTestName( bool err=false );
+	
+    static long& Failure_threshold();
+	static long possible_failure_count;
+    static const char* current_test;
+    static const char* current_test_category;
+    static const char* current_container;
+    static bool  nc_verbose;
+    static bool  never_fail;
+    static bool track_allocations;
+    static bool leak_detection_enabled;
+};
+
+extern TestController gTestController;
+
+//
+// inline implementations
+//
+
+inline void simulate_possible_failure()
+{
+   gTestController.maybe_fail(0);
+}
+
+inline void simulate_constructor()
+{
+   gTestController.maybe_fail(0);
+   object_count++;
+}
+
+inline void simulate_destructor()
+{
+   object_count--;
+}
+
+inline void TestController::TrackAllocations( bool track )
+{
+	track_allocations = track;
+}
+
+inline bool TestController::TrackingEnabled()
+{
+	return track_allocations;
+}
+
+inline void TestController::SetFailureCountdown(long count) {
+    Failure_threshold() = count;
+	possible_failure_count = 0;
+}
+
+inline void TestController::CancelFailureCountdown() {
+    Failure_threshold() = kNotInExceptionTest;
+}
+
+inline void TestController::BeginLeakDetection()
+{
+    alloc_count = 0;
+    object_count = 0;
+   	ClearAllocationSet();
+   	leak_detection_enabled = true;
+}
+
+inline bool TestController::LeakDetectionEnabled()
+{
+	return leak_detection_enabled;
+}
+
+inline void TestController::EndLeakDetection()
+{
+	leak_detection_enabled = false;
+}
+
+inline void TestController::SetCurrentTestCategory(const char* str)
+{
+    current_test_category=str;
+    if (nc_verbose)
+        PrintTestName();
+}
+
+inline void TestController::SetCurrentContainer(const char* str) {
+    current_container=str;
+}
+
+inline void TestController::SetCurrentTestName(const char* str)
+{
+    current_test=str;
+}
+
+inline void TestController::SetVerbose(bool val)
+{
+	nc_verbose=val;
+}
+
+inline void TestController::TurnOffExceptions()
+{
+	never_fail = true;
+}
+
+#endif // INCLUDED_MOTU_nc_alloc
diff --git a/main/source/stlport/test/eh/random_number.cpp b/main/source/stlport/test/eh/random_number.cpp
new file mode 100644
index 00000000..377c6d47
--- /dev/null
+++ b/main/source/stlport/test/eh/random_number.cpp
@@ -0,0 +1,39 @@
+/***********************************************************************************
+	random_number.cpp
+	
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+
+***********************************************************************************/
+#include "random_number.h"
+#include "Prefix.h"
+#if defined (EH_NEW_HEADERS)
+# include <functional>
+# include <cstdlib>
+#else
+# include <function.h>
+# include <stdlib.h>
+#endif
+
+unsigned random_number( unsigned range )
+{
+#if !defined( __SGI_STL )
+	if (range == 0) return 0;
+	return (unsigned)(EH_STD::rand() + EH_STD::rand()) % range;
+#else
+	static EH_STD::subtractive_rng rnd;
+        if (range==0) return 0;
+        return rnd(range);
+#endif
+}
+
+// default base for random container sizes
+unsigned random_base = 1000;
diff --git a/main/source/stlport/test/eh/random_number.h b/main/source/stlport/test/eh/random_number.h
new file mode 100644
index 00000000..09f3cebc
--- /dev/null
+++ b/main/source/stlport/test/eh/random_number.h
@@ -0,0 +1,25 @@
+/***********************************************************************************
+	random_number.h
+	
+ * Copyright (c) 1997-1998
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+		
+***********************************************************************************/
+#ifndef RANDOM_NUMBER_DWA120298_H_
+#define RANDOM_NUMBER_DWA120298_H_
+
+// Return a random number in the given range.
+unsigned random_number( unsigned range );
+
+// default base for random container sizes
+extern unsigned random_base;
+
+#endif // #include guard
diff --git a/main/source/stlport/test/eh/sgi_mipspro.mak b/main/source/stlport/test/eh/sgi_mipspro.mak
new file mode 100644
index 00000000..0fd255d4
--- /dev/null
+++ b/main/source/stlport/test/eh/sgi_mipspro.mak
@@ -0,0 +1,62 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+SHELL=/bin/sh
+
+# srcdir = .
+# VPATH = .
+
+
+STL_INCL=-I${PWD}/../../stlport/
+
+# STL_INCL= -DEH_NO_SGI_STL
+
+AUX_LIST=TestClass.o main.o nc_alloc.o random_number.o
+
+TEST_LIST=test_algo.o  \
+test_algobase.o     test_list.o test_slist.o \
+test_bit_vector.o   test_vector.o \
+test_deque.o test_set.o test_map.o \
+test_hash_map.o  test_hash_set.o test_rope.o \
+test_string.o test_bitset.o test_valarray.o
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST)
+EXECS = $(LIST:%.o=%)
+TESTS = $(LIST:%.o=%.out)
+TEST_EXE  = eh_test
+TEST  = eh_test.out
+
+CC = CC
+CXX = $(CC)
+
+# CXXFLAGS = -J 4 -ansi -LANG:std -I. ${STL_INCL} ${DEBUG_FLAGS} -I. -D_STLP_NO_OWN_IOSTREAMS -D_STLP_NO_NEW_IOSTREAMS
+CXXFLAGS = -J 4 -ansi -LANG:std -I. ${STL_INCL} ${DEBUG_FLAGS} -I.
+
+LIBS = -L../../lib -lstlport_mipspro -lm 
+LIBSTDCXX = 
+
+.SUFFIXES: .cpp .i .o .out .res
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	LD_LIBRARY_PATH="../../lib:$(LD_LIBRARY_PATH)" ./$(TEST_EXE) -s 100
+
+.cpp.o:
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+.cpp.i:
+	$(CXX) $(CXXFLAGS) $< -E > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $*.cpp -c -USINGLE -DMAIN -g -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) -o $*
+	./$* -q
+	-rm -f $*
+
+clean:
+	-rm -fr ${TEST_EXE} *.o *.rpo *.obj *.out core *~ Templates.DB SunWS_cache cxx_repository
diff --git a/main/source/stlport/test/eh/sunpro-64.mak b/main/source/stlport/test/eh/sunpro-64.mak
new file mode 100644
index 00000000..1f4edb05
--- /dev/null
+++ b/main/source/stlport/test/eh/sunpro-64.mak
@@ -0,0 +1,69 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+
+SHELL=/bin/sh
+
+# point this to proper location
+STL_INCL= -I${PWD}/../../stlport
+
+# STL_INCL= -DEH_NO_SGI_STL
+
+AUX_LIST=TestClass.cpp main.cpp nc_alloc.cpp random_number.cpp
+
+TEST_LIST=test_algo.cpp  \
+test_algobase.cpp     test_list.cpp test_slist.cpp \
+test_bit_vector.cpp   test_vector.cpp \
+test_deque.cpp test_set.cpp test_map.cpp \
+test_hash_map.cpp  test_hash_set.cpp test_rope.cpp \
+test_string.cpp test_bitset.cpp test_valarray.cpp
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = eh_test
+TEST  = eh_test.out
+
+CC = CC
+CXX = $(CC)
+
+CXXFLAGS = ${STL_INCL} -xarch=v9 -library=no%Cstd -features=rtti -DEH_VECTOR_OPERATOR_NEW -DEH_DELETE_HAS_THROW_SPEC -xildoff -g -D_REENTRANT -DNO_FAST_ALLOCATOR
+
+# This is to test with native STL
+# CXXFLAGS = +w2 -xildoff -D_STLP_USE_NEWALLOC -DEH_NO_SGI_STL -DEH_NEW_HEADERS -DEH_VECTOR_OPERATOR_NEW -DEH_DELETE_HAS_THROW_SPEC
+
+
+LIBS = -lm 
+LIBSTDCXX = 
+
+LIBSTLPORT = -library=no%Cstd -L../../lib -lstlport_sunpro64
+
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) ${LIBSTLPORT} $(LIBS) -o $(TEST_EXE)
+	LD_LIBRARY_PATH="../../lib;${LD_LIBRARY_PATH}" ./$(TEST_EXE) -s 100
+
+SUFFIXES: .cpp.o.out.res
+
+%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -g -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) -o $*
+	./$* -q
+	-rm -f $*
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+clean:
+	-rm -fr ${TEST_EXE} *.o *.rpo *.obj *.out core *~ Templates.DB SunWS_cache
diff --git a/main/source/stlport/test/eh/sunpro.mak b/main/source/stlport/test/eh/sunpro.mak
new file mode 100644
index 00000000..26b88e7f
--- /dev/null
+++ b/main/source/stlport/test/eh/sunpro.mak
@@ -0,0 +1,71 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+
+SHELL=/bin/sh
+
+# point this to proper location
+STL_INCL= -I${PWD}/../../stlport
+
+# STL_INCL= -DEH_NO_SGI_STL
+
+AUX_LIST=TestClass.cpp main.cpp nc_alloc.cpp random_number.cpp
+
+TEST_LIST=test_algo.cpp  \
+test_algobase.cpp     test_list.cpp test_slist.cpp \
+test_bit_vector.cpp   test_vector.cpp \
+test_deque.cpp test_set.cpp test_map.cpp \
+test_hash_map.cpp  test_hash_set.cpp test_rope.cpp \
+test_string.cpp test_bitset.cpp test_valarray.cpp
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = eh_test
+TEST  = eh_test.out
+
+CC = CC
+CXX = $(CC)
+
+# CXXFLAGS = ${STL_INCL} -library=no%Cstd -qoption ccfe -instlib=../../lib/libstlport_sunpro.so -features=rtti -DEH_VECTOR_OPERATOR_NEW -DEH_DELETE_HAS_THROW_SPEC
+
+CXXFLAGS = ${STL_INCL} -library=no%Cstd -features=rtti -DEH_VECTOR_OPERATOR_NEW -DEH_DELETE_HAS_THROW_SPEC
+
+# This is to test with native STL
+# CXXFLAGS = +w2 -xildoff -D_STLP_USE_NEWALLOC -DEH_NO_SGI_STL -DEH_NEW_HEADERS -DEH_VECTOR_OPERATOR_NEW -DEH_DELETE_HAS_THROW_SPEC
+
+
+LIBS = -lm 
+LIBSTDCXX = 
+
+LIBSTLPORT = -library=no%Cstd -L../../lib -lstlport_sunpro
+
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) ${LIBSTLPORT} $(LIBS) -o $(TEST_EXE)
+	LD_LIBRARY_PATH="../../lib;${LD_LIBRARY_PATH}" ./$(TEST_EXE) -s 100
+
+SUFFIXES: .cpp.o.out.res
+
+%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -g -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) ${LIBSTLPORT} -o $*
+	LD_LIBRARY_PATH="../../lib;${LD_LIBRARY_PATH}" ./$* 
+
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+clean:
+	-rm -fr ${TEST_EXE} *.o *.rpo *.obj *.out core *~ Templates.DB SunWS_cache
diff --git a/main/source/stlport/test/eh/sunpro42.mak b/main/source/stlport/test/eh/sunpro42.mak
new file mode 100644
index 00000000..b6e9cf22
--- /dev/null
+++ b/main/source/stlport/test/eh/sunpro42.mak
@@ -0,0 +1,76 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+# SHELL=/bin/sh
+# srcdir = .
+# VPATH = .
+
+SHELL=/bin/sh
+
+# point this to proper location
+STL_INCL= -I../../stlport
+
+# STL_INCL= -DEH_NO_SGI_STL
+
+AUX_LIST=TestClass.cpp main.cpp nc_alloc.cpp random_number.cpp
+
+TEST_LIST=test_algo.cpp  \
+test_algobase.cpp     test_list.cpp test_slist.cpp \
+test_bit_vector.cpp   test_vector.cpp \
+test_deque.cpp test_set.cpp test_map.cpp \
+test_hash_map.cpp  test_hash_set.cpp test_rope.cpp \
+test_string.cpp test_bitset.cpp test_valarray.cpp
+
+LIST=${AUX_LIST} ${TEST_LIST}
+
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = eh_test
+TEST  = eh_test.out
+
+CC = CC
+CXX = $(CC)
+
+CXXFLAGS = $(ARCHF) +w2 -mt -features=rtti ${STL_INCL}
+# CXXFLAGS = +w2 ${STL_INCL}
+
+
+
+LIBS = -lm 
+
+LIBSTLPORT = -L../../lib -lstlport_sunpro42
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	echo 'Info: For CC 4.x, warnings from ld in the form "symbol `XXX' has differing sizes" are normal.'
+	$(CXX) $(CXXFLAGS) $(OBJECTS) ${LIBSTLPORT} $(LIBS) -o $(TEST_EXE)
+	LD_LIBRARY_PATH="../../lib:$(LD_LIBRARY_PATH)" ./$(TEST_EXE) -s 100
+
+SUFFIXES: .cpp.o.out.res
+
+%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -g -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBSTLPORT) $(LIBS) -o $*
+	./$* -q
+	-rm -f $*
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
+
+clean:
+	-rm -fr ${TEST_EXE} *.o *.rpo *.obj *.out core *~ Templates.DB SunWS_cache
+
+
+
+
+
+
diff --git a/main/source/stlport/test/eh/test.cpp b/main/source/stlport/test/eh/test.cpp
new file mode 100644
index 00000000..a921af99
--- /dev/null
+++ b/main/source/stlport/test/eh/test.cpp
@@ -0,0 +1,42 @@
+           #include <iostream>
+           #include <set>
+           #include <vector>
+
+           template<class T>
+           inline void printElements(const T& coll, const char* msg = "")
+           {
+           typename T::const_iterator it;
+           std::cout << msg;
+           for(it = coll.begin(); it != coll.end(); ++it) {
+           std::cout << *it << ' ';
+           }
+           std::cout << std:: endl;
+           }
+
+           int main(int /* argc */, char** /* argv */)
+           {
+           std::set<int> set1, set2;
+           std::vector<int> aVector;
+
+           aVector.push_back(1);
+           aVector.push_back(1);
+
+           set1.insert(aVector.begin(), aVector.end());
+
+           set2.insert(1);
+           set2.insert(1);
+
+           printElements(aVector, "vector: ");
+           printElements(set1, "set1 : ");
+           printElements(set2, "set2 : ");
+
+           return 0;
+           }
+# if 0
+# include <iostream>
+main() 
+{
+  // std::stringstream tstr;
+  std::cout<<"hello world\n";
+}
+# endif
diff --git a/main/source/stlport/test/eh/test_algo.cpp b/main/source/stlport/test/eh/test_algo.cpp
new file mode 100644
index 00000000..134c771e
--- /dev/null
+++ b/main/source/stlport/test/eh/test_algo.cpp
@@ -0,0 +1,255 @@
+/***********************************************************************************
+	test_algo.cpp
+		
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+
+***********************************************************************************/
+#include "Tests.h"
+#include "LeakCheck.h"
+#include "SortClass.h"
+
+#if defined (EH_NEW_HEADERS)
+# include <algorithm>
+# include <cassert>
+#else
+# include <algo.h>
+# include <assert.h>
+#endif
+
+#if defined (EH_NEW_IOSTREAMS)
+# include <iostream>
+#else
+# include <iostream.h>
+#endif
+
+
+//
+// SortBuffer -- a buffer of SortClass objects that can be used to test sorting.
+//
+struct SortBuffer
+{
+    enum { kBufferSize = 100 };
+	
+    SortClass* begin() { return items; }
+    const SortClass* begin() const { return items; }
+    SortClass* end() { return items + kBufferSize; }
+    const SortClass* end() const { return items + kBufferSize; }
+	
+	// Sort each half of the buffer and reset the address of each element
+	// so that merge() can be tested for stability.
+    void PrepareMerge()
+    {
+        EH_STD::sort( begin(), begin() + ( end() - begin() )/2 );
+        EH_STD::sort( begin() + ( end() - begin() )/2, end() );
+        for ( SortClass* p = begin(); p != end(); p++ )
+            p->ResetAddress();
+    }
+    
+  SortBuffer()
+  {
+    PrepareMerge();
+  }
+  
+  SortBuffer( const SortBuffer& rhs )
+  {
+    SortClass* q = begin();
+    for ( const SortClass* p = rhs.begin() ; p != rhs.end(); p++,q++ )
+      *q = *p;
+  }
+
+private:	
+    SortClass items[kBufferSize];
+};
+
+//
+// less_by_reference -- a functor for comparing objects against a
+// 	constant value.
+//
+template <class T>
+struct less_by_reference
+{
+    less_by_reference( const T& arg ) : fArg(arg) {}
+    bool operator()( const T& x ) const { return x < fArg; }
+private:
+    const T& fArg;
+};
+
+struct test_stable_partition
+{
+    test_stable_partition( const SortBuffer& buf )
+        : orig( buf ), partitionPoint(SortClass::kRange / 2) {
+        gTestController.SetCurrentTestName("stable_partition()");
+        }
+
+    void operator()( SortBuffer& buf ) const
+    {
+        less_by_reference<SortClass> throw_cmp( partitionPoint );
+		
+        SortClass* d = EH_STD::stable_partition( buf.begin(), buf.end(), throw_cmp );
+		
+		// If we get here no exception occurred during the operation.
+		// Stop any potential failures that might occur during verification.
+        gTestController.CancelFailureCountdown();
+        
+        // Prepare an array of counts of the occurrence of each value in
+        // the legal range.
+        unsigned counts[SortClass::kRange];
+        EH_STD::fill_n( counts, (int)SortClass::kRange, 0 );
+        for ( const SortClass *q = orig.begin(); q != orig.end(); q++ )
+            counts[ q->value() ]++;
+			
+        less_by_reference<TestClass> cmp( partitionPoint );
+        for ( const SortClass* p = buf.begin(); p != buf.end(); p++ )
+        {
+        	// Check that adjacent items with the same value haven't been
+        	// reordered. This could be a more thorough test.
+            if ( p != buf.begin() && p->value() == p[-1].value() )
+                EH_ASSERT( p->GetAddress() > p[-1].GetAddress() );
+            
+            // Check that the partitioning worked.
+            EH_ASSERT( (p < d) == cmp( *p ) );
+            
+            // Decrement the appropriate count for each value.
+            counts[ p->value() ]--;
+        }
+        
+        // Check that the values were only rearranged, and none were lost.
+        for ( unsigned j = 0; j < SortClass::kRange; j++ )
+            EH_ASSERT( counts[j] == 0 );
+    }
+	
+private:
+    const SortBuffer& orig;
+    SortClass partitionPoint;
+};
+
+void assert_sorted_version( const SortBuffer& orig, const SortBuffer& buf );
+
+/*===================================================================================
+	assert_sorted_version
+
+	EFFECTS: Asserts that buf is a stable-sorted version of orig.
+====================================================================================*/
+void assert_sorted_version( const SortBuffer& orig, const SortBuffer& buf )
+{
+	// Stop any potential failures that might occur during verification.
+    gTestController.CancelFailureCountdown();
+    
+    // Prepare an array of counts of the occurrence of each value in
+    // the legal range.
+    unsigned counts[SortClass::kRange];
+    EH_STD::fill_n( counts, (int)SortClass::kRange, 0 );
+    for ( const SortClass *q = orig.begin(); q != orig.end(); q++ )
+        counts[ q->value() ]++;
+	
+	// Check that each element is greater than the previous one, or if they are
+	// equal, that their order has been preserved.
+    for ( const SortClass* p = buf.begin(); p != buf.end(); p++ )
+    {
+        if ( p != buf.begin() )
+            EH_ASSERT( p->value() > p[-1].value()
+                    || p->value() == p[-1].value() && p->GetAddress() > p[-1].GetAddress() );
+		// Decrement the appropriate count for each value.
+        counts[ p->value() ]--;
+    }
+    
+	// Check that the values were only rearranged, and none were lost.
+    for ( unsigned j = 0; j < SortClass::kRange; j++ )
+        EH_ASSERT( counts[j] == 0 );
+}
+
+//
+// The test operators
+//
+struct test_stable_sort_1
+{
+    test_stable_sort_1( const SortBuffer& buf )
+        : orig( buf ) {
+        gTestController.SetCurrentTestName("stable_sort() #1");
+        }
+
+    void operator()( SortBuffer& buf ) const
+    {
+        EH_STD::stable_sort( buf.begin(), buf.end() );
+        assert_sorted_version( orig, buf );
+    }
+	
+private:
+    const SortBuffer& orig;
+};
+
+struct test_stable_sort_2
+{
+    test_stable_sort_2( const SortBuffer& buf )
+        : orig( buf ) {        
+            gTestController.SetCurrentTestName("stable_sort() #2");
+        }
+
+    void operator()( SortBuffer& buf ) const
+    {
+      EH_STD::stable_sort( buf.begin(), buf.end(), EH_STD::less<SortClass>() );
+      assert_sorted_version( orig, buf );
+    }
+	
+private:
+    const SortBuffer& orig;
+};
+
+struct test_inplace_merge_1
+{
+    test_inplace_merge_1( SortBuffer& buf )
+        : orig( buf ) {
+        gTestController.SetCurrentTestName("inplace_merge #1()");
+        }
+
+    void operator()( SortBuffer& buf ) const
+    {
+        EH_STD::inplace_merge( buf.begin(), buf.begin() + ( buf.end() - buf.begin() )/2, buf.end() );
+        assert_sorted_version( orig, buf );
+    }
+	
+private:
+    const SortBuffer& orig;
+};
+
+struct test_inplace_merge_2
+{
+    test_inplace_merge_2( SortBuffer& buf )
+        : orig( buf ) {
+        gTestController.SetCurrentTestName("inplace_merge() #2");
+        }
+
+    void operator()( SortBuffer& buf ) const
+    {
+        EH_STD::inplace_merge( buf.begin(), buf.begin() + ( buf.end() - buf.begin() )/2, buf.end(), 
+                       EH_STD::less<SortClass>() );
+        assert_sorted_version( orig, buf );
+    }
+	
+private:
+    const SortBuffer& orig;
+};
+
+void test_algo()
+{
+    SortBuffer mergeBuf;
+    mergeBuf.PrepareMerge();
+    
+    EH_STD::cerr<<"EH test : testing algo.h"<<EH_STD::endl;
+    WeakCheck( mergeBuf, test_inplace_merge_1( mergeBuf ) );
+    WeakCheck( mergeBuf, test_inplace_merge_2( mergeBuf ) );
+
+    SortBuffer buf;
+    WeakCheck( buf, test_stable_sort_1( buf ) );
+    WeakCheck( buf, test_stable_sort_2( buf ) );
+    WeakCheck( buf, test_stable_partition( buf ) );
+}
diff --git a/main/source/stlport/test/eh/test_algobase.cpp b/main/source/stlport/test/eh/test_algobase.cpp
new file mode 100644
index 00000000..25ea4d73
--- /dev/null
+++ b/main/source/stlport/test/eh/test_algobase.cpp
@@ -0,0 +1,98 @@
+/***********************************************************************************
+	test_algobase.cpp
+		
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+
+***********************************************************************************/
+
+# include "Prefix.h"
+# if defined (EH_NEW_HEADERS)
+# ifdef __SUNPRO_CC
+# include <stdio.h>
+# endif
+#include <algorithm>
+# else
+#include <algo.h>
+# endif
+#include "Tests.h"
+#include "LeakCheck.h"
+#include "TestClass.h"
+
+// EH_USE_STD
+
+enum { kBufferSize = 100 };
+
+struct test_uninitialized_copy
+{
+    test_uninitialized_copy()
+        : stuff( new TestClass[kBufferSize] ), end_of_stuff(stuff + kBufferSize) {
+        gTestController.SetCurrentTestName("uninitialized_copy()");
+        }
+
+    ~test_uninitialized_copy() { delete[] stuff; }
+	
+    void operator()( TestClass* buffer ) const
+    {
+        EH_STD::uninitialized_copy((TestClass*)stuff, (TestClass*)end_of_stuff, buffer );
+        EH_ASSERT( EH_STD::equal( (TestClass*)stuff, (TestClass*)end_of_stuff, buffer ) );
+        stl_destroy( buffer, buffer+kBufferSize );
+    }
+	
+private:
+    TestClass * stuff;
+    TestClass * end_of_stuff;
+};
+
+struct test_uninitialized_fill
+{
+    test_uninitialized_fill() {
+        gTestController.SetCurrentTestName("uninitialized_fill()");
+    }
+
+    void operator()( TestClass* buffer ) const
+    {
+        TestClass* buf_end = buffer + kBufferSize;
+        EH_STD::uninitialized_fill( buffer, buf_end, testValue );
+        for ( EH_CSTD::size_t i = 0; i < kBufferSize; i++ )
+            EH_ASSERT( buffer[i] == testValue );
+        stl_destroy( buffer, buf_end );
+    }
+private:
+    TestClass testValue;
+};
+
+struct test_uninitialized_fill_n
+{
+    test_uninitialized_fill_n() {
+        gTestController.SetCurrentTestName("uninitialized_fill_n()");
+    }
+    void operator()( TestClass* buffer ) const
+    {
+        TestClass* end = buffer + kBufferSize;        
+        EH_STD::uninitialized_fill_n( buffer, (EH_CSTD::size_t)kBufferSize, testValue );
+        for ( EH_CSTD::size_t i = 0; i < kBufferSize; i++ )
+            EH_ASSERT( buffer[i] == testValue );
+        stl_destroy( buffer, end );
+    }
+private:
+    TestClass testValue;
+};
+
+void test_algobase()
+{
+  // force alignment
+  double arr[ sizeof(TestClass) * kBufferSize ];
+  TestClass* c = (TestClass*)arr;
+  WeakCheck( c, test_uninitialized_copy() );
+  WeakCheck( c, test_uninitialized_fill() );
+  WeakCheck( c, test_uninitialized_fill_n() );
+}
diff --git a/main/source/stlport/test/eh/test_assign_op.h b/main/source/stlport/test/eh/test_assign_op.h
new file mode 100644
index 00000000..03783c08
--- /dev/null
+++ b/main/source/stlport/test/eh/test_assign_op.h
@@ -0,0 +1,50 @@
+/***********************************************************************************
+	test_assign_op.h
+	
+		SUMMARY: Test functor template for assignment operators.
+
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+		
+***********************************************************************************/
+#ifndef test_assign_op_H_
+#define test_assign_op_H_
+
+# include "Prefix.h"
+# ifdef EH_NEW_HEADERS
+#  include <cassert>
+# else
+#  include <assert.h>
+# endif
+#include "nc_alloc.h"
+
+template <class T>
+struct test_assign_op
+{
+	test_assign_op( const T& src )
+		: source(src)
+	{
+        gTestController.SetCurrentTestName("assignment operator");
+    }
+	
+	void operator()( T& t ) const
+	{
+		t = source;
+		
+		// Prevent simulated failures during verification
+		gTestController.CancelFailureCountdown();
+		EH_ASSERT( source == t );
+	}
+private:
+	const T& source;
+};
+
+#endif // test_assign_op_H_
diff --git a/main/source/stlport/test/eh/test_bit_vector.cpp b/main/source/stlport/test/eh/test_bit_vector.cpp
new file mode 100644
index 00000000..a6eff0c1
--- /dev/null
+++ b/main/source/stlport/test/eh/test_bit_vector.cpp
@@ -0,0 +1,129 @@
+/***********************************************************************************
+	test_bit_vector.cpp
+	
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+
+***********************************************************************************/
+#include "Tests.h"
+
+#if defined( EH_BIT_VECTOR_IMPLEMENTED )
+
+# if defined (EH_NEW_HEADERS)
+# ifdef __SUNPRO_CC
+# include <stdio.h>
+# endif
+#include <vector>
+# else
+#include <bvector.h>
+# endif
+
+#include "LeakCheck.h"
+#include "test_construct.h"
+#include "test_assign_op.h"
+#include "test_push_back.h"
+#include "test_insert.h"
+#include "test_push_front.h"
+
+typedef EH_BIT_VECTOR BitVector;
+
+inline sequence_container_tag
+container_category(const BitVector&)
+{
+	return sequence_container_tag();
+}
+
+USING_CSTD_NAME(size_t)
+
+  //
+// test_BitVector_reserve
+//
+struct test_BitVector_reserve
+{
+    test_BitVector_reserve( size_t n ) : fAmount(n)
+    {
+        gTestController.SetCurrentTestName("BitVector::reserve()");
+    }
+	
+    void operator()( BitVector& v ) const
+    {
+        v.reserve( fAmount );
+    }
+private:
+    size_t fAmount;
+};
+
+/*===================================================================================
+	test_bit_vector
+
+	EFFECTS:  Performs tests on bit vectors
+====================================================================================*/
+void test_bit_vector()
+{
+	#define __WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
+	
+	// Make some bit vectors to work with.
+    BitVector emptyVector;
+    BitVector testVector, testVector2;
+    
+    EH_ASSERT( testVector.size() == 0 );
+    
+    size_t BitVectorSize = random_number( random_base );
+    // Half the time, choose a size that will guarantee immediate reallocation
+    if ( random_number(2) )
+    	BitVectorSize = BitVectorSize / __WORD_BIT * __WORD_BIT;
+	
+    EH_ASSERT( testVector.size() == 0 );
+    testVector.reserve(BitVectorSize);
+    EH_ASSERT( testVector.size() == 0 );
+    while ( testVector.size() < BitVectorSize )
+    {
+        testVector.push_back( bool(random_number(2)) );
+        testVector2.push_back( bool(random_number(2)) );
+    }
+	
+	// Test insertions
+    StrongCheck( testVector, test_insert_one<BitVector>(testVector) );
+    StrongCheck( testVector, test_insert_one<BitVector>(testVector,0) );
+    StrongCheck( testVector, test_insert_one<BitVector>(testVector, (int)testVector.size()) );
+
+    StrongCheck( testVector, test_insert_n<BitVector>(testVector, random_number(random_base) ) );
+    StrongCheck( testVector, test_insert_n<BitVector>(testVector, random_number(random_base),0 ) );
+    StrongCheck( testVector, test_insert_n<BitVector>(testVector, random_number(random_base), (int)testVector.size()) );
+# if 0	
+	// Allocate some random bools to insert
+    size_t insCnt = 1 + random_number(random_base);
+    bool *insFirst = new BitVector::value_type[insCnt];
+    for ( size_t n = 0; n < insCnt; n++ )
+        insFirst[n] = random_number(2);
+    StrongCheck( testVector, insert_range_tester(testVector, insFirst, insFirst+insCnt) );
+    StrongCheck( testVector, insert_range_at_begin_tester(testVector, insFirst, insFirst+insCnt) );
+    StrongCheck( testVector, insert_range_at_end_tester(testVector, insFirst, insFirst+insCnt) );
+    ConstCheck( 0, test_construct_pointer_range<BitVector>( insFirst, insFirst + insCnt ) );
+    delete[] insFirst;
+# endif
+    StrongCheck( testVector, insert_range_tester(testVector, testVector2.begin(), testVector2.end() ) );
+    StrongCheck( testVector, insert_range_at_begin_tester(testVector, testVector2.begin(), 
+							  testVector2.end() ) );
+    StrongCheck( testVector, insert_range_at_end_tester(testVector, testVector2.begin(), 
+							  testVector2.end() ) );
+    StrongCheck( testVector, test_BitVector_reserve( testVector.capacity() + random_number(50) ) );
+    StrongCheck( testVector, test_push_back<BitVector>(testVector) );
+    StrongCheck( emptyVector, test_push_back<BitVector>(emptyVector) );	
+
+    ConstCheck( 0, test_default_construct<BitVector>() );
+    ConstCheck( 0, test_construct_n<BitVector>( random_number(random_base) ) );
+    ConstCheck( 0, test_construct_n_instance<BitVector>( random_number(random_base) ) );
+    ConstCheck( 0, test_construct_iter_range<BitVector>( testVector2 ) );
+    ConstCheck( testVector, test_copy_construct<BitVector>() );
+    WeakCheck( testVector, test_assign_op<BitVector>( testVector2 ) );
+}
+# endif /* BIT_VECTOR_IMPLEMENTED */
diff --git a/main/source/stlport/test/eh/test_bitset.cpp b/main/source/stlport/test/eh/test_bitset.cpp
new file mode 100644
index 00000000..8ff302e8
--- /dev/null
+++ b/main/source/stlport/test/eh/test_bitset.cpp
@@ -0,0 +1,39 @@
+/***********************************************************************************
+	test_bitset.cpp
+	
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+
+***********************************************************************************/
+#include "Prefix.h"
+#if defined( EH_BITSET_IMPLEMENTED )
+#include "Tests.h"
+#include <bitset>
+#include "TestClass.h"
+#include "LeakCheck.h"
+#include "test_construct.h"
+#include "test_assign_op.h"
+#include "test_push_back.h"
+#include "test_insert.h"
+#include "test_push_front.h"
+
+typedef bitset<100> TestBitset;
+
+inline sequence_container_tag
+container_category(const TestBitset&)
+{
+  return sequence_container_tag();
+}
+
+void test_bitset()
+{
+}
+#endif // EH_BITSET_IMPLEMENTED
diff --git a/main/source/stlport/test/eh/test_construct.h b/main/source/stlport/test/eh/test_construct.h
new file mode 100644
index 00000000..6472c348
--- /dev/null
+++ b/main/source/stlport/test/eh/test_construct.h
@@ -0,0 +1,145 @@
+/***********************************************************************************
+	test_construct.h
+	
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+		
+***********************************************************************************/
+#ifndef test_construct_H_
+#define test_construct_H_
+
+# include "Prefix.h"
+# if defined (EH_NEW_HEADERS)
+#  include <algorithm>
+#  include <cassert>
+#  include <cstdlib>
+# else
+#  include <algo.h>
+#  include <assert.h>
+#  include <stdlib.h>
+# endif
+
+
+USING_CSTD_NAME(size_t)
+
+template <class T>
+struct test_copy_construct
+{
+    test_copy_construct()
+    {
+        gTestController.SetCurrentTestName("copy constructor");
+    }
+    
+	void operator()( const T& t ) const
+	{
+		T aCopy( t );
+		// Prevent simulated failures during verification
+		gTestController.CancelFailureCountdown();
+		EH_ASSERT( aCopy == t );
+		CheckInvariant(t);
+	}
+};
+
+template <class T>
+struct test_default_construct
+{
+    test_default_construct()
+    {
+        gTestController.SetCurrentTestName("default constructor");
+    }
+    
+	void operator()( int ) const
+	{
+		T t;
+		CheckInvariant(t);
+	}
+};
+
+template <class T>
+struct test_construct_n
+{
+	test_construct_n( size_t _n ) : n(_n+1)
+	{
+        gTestController.SetCurrentTestName("n-size constructor");
+    }
+	
+	void operator()( int ) const
+	{
+		T t(n);
+		CheckInvariant(t);
+	}
+	
+	size_t n;
+};
+
+template <class T>
+struct test_construct_n_instance
+{
+	test_construct_n_instance( size_t _n )
+		: n(_n+1)
+	{
+	    gTestController.SetCurrentTestName("n-size with instance constructor");
+	}
+	
+	void operator()( int ) const
+	{
+        typedef typename T::value_type Value_type;
+		Value_type Val = 0;
+		T t( n, Val );
+		CheckInvariant(t);
+	}
+	
+	size_t n;
+};
+
+template <class T>
+struct test_construct_pointer_range
+{
+	test_construct_pointer_range( const typename T::value_type *first, 
+                                  const typename T::value_type* last )
+		: fItems( first ), fEnd( last )
+    {
+        gTestController.SetCurrentTestName("pointer range constructor");
+    }
+	
+	void operator()( int ) const
+	{
+		T t( fItems, fEnd );
+		// Prevent simulated failures during verification
+        gTestController.CancelFailureCountdown();
+		CheckInvariant(t);
+	}
+	
+	const typename T::value_type* fItems, *fEnd;
+};
+
+template <class T>
+struct test_construct_iter_range
+{
+	test_construct_iter_range( const T& src ) : fItems( src )
+	{
+        gTestController.SetCurrentTestName("iterator range constructor");
+    }
+	
+	void operator()( int ) const
+	{
+		T t( fItems.begin(), fItems.end() );
+		// Prevent simulated failures during verification
+        gTestController.CancelFailureCountdown();
+		EH_ASSERT( t == fItems );
+		CheckInvariant(t);
+	}
+	
+	const T& fItems;
+};
+
+#endif // test_construct_H_
+
diff --git a/main/source/stlport/test/eh/test_deque.cpp b/main/source/stlport/test/eh/test_deque.cpp
new file mode 100644
index 00000000..add45ad1
--- /dev/null
+++ b/main/source/stlport/test/eh/test_deque.cpp
@@ -0,0 +1,99 @@
+/***********************************************************************************
+	test_deque.cpp
+	
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+
+***********************************************************************************/
+
+#include "Tests.h"
+# if defined (EH_NEW_HEADERS)
+#  ifdef __SUNPRO_CC
+#   include <stdio.h>
+#  else
+#   include <cstdio>
+#  endif
+#  include <deque>
+# else
+#  include <stdio.h>
+#  include <deque.h>
+# endif
+#include "TestClass.h"
+#include "LeakCheck.h"
+#include "test_construct.h"
+#include "test_assign_op.h"
+#include "test_push_back.h"
+#include "test_insert.h"
+#include "test_push_front.h"
+
+typedef TestClass DQTestClass;
+
+typedef EH_STD::__deque__<DQTestClass, eh_allocator(DQTestClass) > TestDeque;
+
+inline sequence_container_tag
+container_category(const TestDeque&)
+{
+  return sequence_container_tag();
+}
+
+void test_deque()
+{
+    size_t dequeSize = random_number(random_base);
+    TestDeque emptyDeque;
+    TestDeque testDeque, testDeque2;
+    while ( testDeque.size() < dequeSize )
+    {
+        DQTestClass x;
+        testDeque.push_back( x );
+        testDeque2.push_back( DQTestClass() );
+    }
+
+    ConstCheck( testDeque, test_copy_construct<TestDeque>() );
+    WeakCheck( testDeque, test_insert_one<TestDeque>(testDeque) );
+    StrongCheck( testDeque, test_insert_one<TestDeque>(testDeque,0) );
+    StrongCheck( testDeque, test_insert_one<TestDeque>(testDeque, testDeque.size()) );
+
+    WeakCheck( testDeque, test_insert_n<TestDeque>(testDeque, random_number(random_base) ) );
+    StrongCheck( testDeque, test_insert_n<TestDeque>(testDeque, random_number(random_base), 0 ) );
+    StrongCheck( testDeque, test_insert_n<TestDeque>(testDeque, random_number(random_base), testDeque.size() ) );
+
+    size_t insCnt = random_number(random_base);
+    DQTestClass *insFirst = new TestDeque::value_type[insCnt+1];
+
+    WeakCheck( testDeque, insert_range_tester(testDeque, (DQTestClass *)insFirst, 
+					      insFirst+insCnt) );
+    StrongCheck( testDeque, insert_range_at_begin_tester(testDeque, (DQTestClass *)insFirst,
+							 insFirst+insCnt) );
+    StrongCheck( testDeque, insert_range_at_end_tester(testDeque, (DQTestClass *)insFirst, 
+						       insFirst+insCnt) );
+
+    ConstCheck( 0, test_construct_pointer_range<TestDeque>( (DQTestClass *)insFirst, 
+							    insFirst+insCnt ) );
+    delete[] insFirst;
+
+    WeakCheck( testDeque, insert_range_tester(testDeque, testDeque2.begin(), testDeque2.end() ) );
+
+    StrongCheck( testDeque, test_push_back<TestDeque>(testDeque) );
+    StrongCheck( emptyDeque, test_push_back<TestDeque>(emptyDeque) );
+    StrongCheck( testDeque, test_push_front<TestDeque>(testDeque) );
+    StrongCheck( emptyDeque, test_push_front<TestDeque>(emptyDeque) );
+
+
+    ConstCheck( 0, test_default_construct<TestDeque>() );
+    ConstCheck( 0, test_construct_n<TestDeque>( random_number(random_base) ) );
+    ConstCheck( 0, test_construct_n_instance<TestDeque>( random_number(random_base) ) );
+    ConstCheck( 0, test_construct_iter_range<TestDeque>( testDeque2 ) );
+
+    testDeque2.resize( testDeque.size() * 3 / 2 );
+    WeakCheck( testDeque, test_assign_op<TestDeque>( testDeque2 ) );
+    testDeque2.resize( testDeque.size() * 2 / 3 );
+    WeakCheck( testDeque, test_assign_op<TestDeque>( testDeque2 ) );
+}
diff --git a/main/source/stlport/test/eh/test_hash_map.cpp b/main/source/stlport/test/eh/test_hash_map.cpp
new file mode 100644
index 00000000..122e21cc
--- /dev/null
+++ b/main/source/stlport/test/eh/test_hash_map.cpp
@@ -0,0 +1,141 @@
+/***********************************************************************************
+	test_hash_map.cpp
+	
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+
+***********************************************************************************/
+#include "Tests.h"
+#if defined( EH_HASHED_CONTAINERS_IMPLEMENTED )
+#include "TestClass.h"
+#include "LeakCheck.h"
+#if defined (__SGI_STL)
+# if defined (EH_NEW_HEADERS)
+#  include <hash_map>
+# else
+#  include <hash_map.h>
+# endif
+#elif defined (__MSL__)
+# include <hashmap.h>
+# include <hashmmap.h>
+#else
+# error where do I get hash_map/hash_multimap?
+#endif
+#include "test_construct.h"
+#include "test_assign_op.h"
+#include "test_push_back.h"
+#include "test_insert.h"
+#include "test_push_front.h"
+#include "ThrowCompare.h"
+#include "test_hash_resize.h"
+/*
+template struct pair<const TestClass, TestClass>;
+template struct __hashtable_node<pair<const TestClass, TestClass> >;
+template class hash_map<TestClass, TestClass, ThrowHash, ThrowEqual>;
+template class hash_multimap<TestClass, TestClass, ThrowHash, ThrowEqual>;
+*/
+
+typedef EH_STD::__hash_multimap__<TestClass, TestClass, ThrowHash, ThrowEqual,
+  eh_allocator(TestClass) > TestMultiMap;
+
+
+inline multimap_tag
+container_category(const TestMultiMap&)
+{
+	return multimap_tag();
+}
+
+void test_hash_multimap()
+{
+# if !(defined (_MSC_VER) && (_MSC_VER < 1100))
+	TestMultiMap testMultiMap, testMultiMap2;
+	
+        const size_t hash_mapSize = random_number(random_base);
+	
+	while ( testMultiMap.size() < hash_mapSize )
+	{
+		TestMultiMap::value_type x;
+		testMultiMap.insert( x );
+		testMultiMap2.insert( TestMultiMap::value_type() );
+	}
+
+#  if defined( EH_HASH_CONTAINERS_SUPPORT_RESIZE )
+	WeakCheck( testMultiMap, test_hash_resize<TestMultiMap>() );
+	StrongCheck( testMultiMap, test_insert_noresize<TestMultiMap>(testMultiMap) );
+#  endif
+	WeakCheck( testMultiMap, test_insert_value<TestMultiMap>(testMultiMap) );
+
+	size_t insCnt = random_number(random_base);
+	TestMultiMap::value_type *insFirst = new TestMultiMap::value_type[1+insCnt];
+	WeakCheck( testMultiMap, insert_range_tester(testMultiMap, insFirst, insFirst+insCnt) );
+	ConstCheck( 0, test_construct_pointer_range<TestMultiMap>(insFirst, insFirst+insCnt) );
+	delete[] insFirst;
+	
+	WeakCheck( testMultiMap, insert_range_tester(testMultiMap, testMultiMap2.begin(), testMultiMap2.end() ) );
+	
+	ConstCheck( 0, test_default_construct<TestMultiMap>() );
+#  if EH_HASH_CONTAINERS_SUPPORT_ITERATOR_CONSTRUCTION
+	ConstCheck( 0, test_construct_iter_range_n<TestMultiMap>( testMultiMap2 ) );
+#  endif
+	ConstCheck( testMultiMap, test_copy_construct<TestMultiMap>() );
+	
+	WeakCheck( testMultiMap, test_assign_op<TestMultiMap>( testMultiMap2 ) );
+# endif
+}
+
+typedef EH_STD::__hash_map__<TestClass, TestClass, ThrowHash, 
+  ThrowEqual, eh_allocator(TestClass) > TestMap;
+
+inline map_tag
+container_category(const TestMap&)
+{
+	return map_tag();
+}
+
+void test_hash_map()
+{
+# if !(defined (_MSC_VER) && (_MSC_VER < 1100))
+	TestMap testMap, testMap2;
+	
+    const size_t hash_mapSize = random_number(random_base);
+
+	while ( testMap.size() < hash_mapSize )
+	{
+		TestMap::value_type x;
+		testMap.insert( x );
+		testMap2.insert( TestMap::value_type() );
+	}
+
+#if defined( EH_HASH_CONTAINERS_SUPPORT_RESIZE )
+	WeakCheck( testMap, test_hash_resize<TestMap>() );
+	StrongCheck( testMap, test_insert_noresize<TestMap>(testMap) );
+#endif
+	WeakCheck( testMap, test_insert_value<TestMap>(testMap) );
+
+	size_t insCnt = random_number(random_base);
+	TestMap::value_type *insFirst = new TestMap::value_type[1+insCnt];
+	WeakCheck( testMap, insert_range_tester(testMap, insFirst, insFirst+insCnt) );
+	ConstCheck( 0, test_construct_pointer_range<TestMap>(insFirst, insFirst+insCnt) );
+	delete[] insFirst;
+	
+	WeakCheck( testMap, insert_range_tester(testMap, testMap2.begin(), testMap2.end() ) );
+	
+	ConstCheck( 0, test_default_construct<TestMap>() );
+#  if EH_HASH_CONTAINERS_SUPPORT_ITERATOR_CONSTRUCTION
+	ConstCheck( 0, test_construct_iter_range_n<TestMap>( testMap2 ) );
+#  endif
+	ConstCheck( testMap, test_copy_construct<TestMap>() );
+	
+	WeakCheck( testMap, test_assign_op<TestMap>( testMap2 ) );
+# endif
+}
+
+#endif	// EH_HASHED_CONTAINERS_IMPLEMENTED
diff --git a/main/source/stlport/test/eh/test_hash_resize.h b/main/source/stlport/test/eh/test_hash_resize.h
new file mode 100644
index 00000000..b8ff0b0e
--- /dev/null
+++ b/main/source/stlport/test/eh/test_hash_resize.h
@@ -0,0 +1,56 @@
+/***********************************************************************************
+	test_hash_resize.h
+	
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+		
+***********************************************************************************/
+#ifndef test_hash_resize__
+#define test_hash_resize__
+
+#include "random_number.h"
+#include "nc_alloc.h"
+
+template <class T>
+struct test_hash_resize
+{
+    test_hash_resize()
+    {
+	    gTestController.SetCurrentTestName("hash resize");
+    }
+    
+	void operator()( T& t ) const
+	{
+		t.resize( 1+random_number(random_base) + t.bucket_count() );
+	}
+};
+
+template <class T>
+struct test_construct_iter_range_n
+{
+	test_construct_iter_range_n( const T& src )
+		: fItems( src )
+	{
+        gTestController.SetCurrentTestName("iterator range n-size constructor");
+    }
+	
+	void operator()( int ) const
+	{
+		T t( fItems.begin(), fItems.end(), fItems.size() );
+		// prevent simulated failures during verification
+		gTestController.CancelFailureCountdown();
+		CheckInvariant(t);
+	}
+	
+	const T& fItems;
+};
+
+#endif //__test_hash_resize__
diff --git a/main/source/stlport/test/eh/test_hash_set.cpp b/main/source/stlport/test/eh/test_hash_set.cpp
new file mode 100644
index 00000000..b46c48e4
--- /dev/null
+++ b/main/source/stlport/test/eh/test_hash_set.cpp
@@ -0,0 +1,133 @@
+/***********************************************************************************
+	test_hash_set.cpp
+	
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+
+***********************************************************************************/
+#include "Tests.h"
+#if defined( EH_HASHED_CONTAINERS_IMPLEMENTED )
+#if defined (__SGI_STL)
+# if defined (EH_NEW_HEADERS)
+#  include <hash_set>
+# else
+#  include <hash_set.h>
+# endif
+#elif defined (__MSL__)
+# include <hashset.h>
+# include <hashmset.h>
+#else
+# error where do I get hash_set/hash_multiset?
+#endif
+#include "TestClass.h"
+#include "LeakCheck.h"
+#include "test_construct.h"
+#include "test_assign_op.h"
+#include "test_push_back.h"
+#include "test_insert.h"
+#include "test_push_front.h"
+#include "ThrowCompare.h"
+#include "test_hash_resize.h"
+
+typedef EH_STD::__hash_multiset__<TestClass, ThrowHash, ThrowEqual,
+  eh_allocator(TestClass) > TestMultiSet;
+
+inline multiset_tag
+container_category(const TestMultiSet&)
+{
+  return multiset_tag();
+}
+
+void test_hash_multiset()
+{
+# if !(defined (_MSC_VER) && (_MSC_VER < 1100))
+	TestMultiSet testMultiSet, testMultiSet2;
+	
+        const size_t hash_setSize = random_number(random_base);
+	
+	while ( testMultiSet.size() < hash_setSize )
+	{
+		TestMultiSet::value_type x;
+		testMultiSet.insert( x );
+		testMultiSet2.insert( TestMultiSet::value_type() );
+	}
+
+#  if defined( EH_HASH_CONTAINERS_SUPPORT_RESIZE )
+	WeakCheck( testMultiSet, test_hash_resize<TestMultiSet>() );
+	StrongCheck( testMultiSet, test_insert_noresize<TestMultiSet>(testMultiSet) );
+#  endif
+	WeakCheck( testMultiSet, test_insert_value<TestMultiSet>(testMultiSet) );
+
+	size_t insCnt = random_number(random_base);
+	TestMultiSet::value_type *insFirst = new TestMultiSet::value_type[1+insCnt];
+	WeakCheck( testMultiSet, insert_range_tester(testMultiSet, insFirst, insFirst+insCnt) );
+	ConstCheck( 0, test_construct_pointer_range<TestMultiSet>(insFirst, insFirst+insCnt) );
+	delete[] insFirst;
+	
+	WeakCheck( testMultiSet, insert_range_tester(testMultiSet, testMultiSet2.begin(), testMultiSet2.end() ) );
+	
+	ConstCheck( 0, test_default_construct<TestMultiSet>() );
+#  if EH_HASH_CONTAINERS_SUPPORT_ITERATOR_CONSTRUCTION
+	ConstCheck( 0, test_construct_iter_range_n<TestMultiSet>( testMultiSet2 ) );
+#  endif
+	ConstCheck( testMultiSet, test_copy_construct<TestMultiSet>() );
+	
+	WeakCheck( testMultiSet, test_assign_op<TestMultiSet>( testMultiSet2 ) );
+# endif
+}
+
+typedef EH_STD::__hash_set__<TestClass, ThrowHash, ThrowEqual, eh_allocator(TestClass) > TestSet;
+
+inline set_tag
+container_category(const TestSet&)
+{
+  return set_tag();
+}
+
+void test_hash_set()
+{
+# if !(defined (_MSC_VER) && (_MSC_VER < 1100))
+	TestSet testSet, testSet2;
+	
+        const size_t hash_setSize = random_number(random_base);
+
+	while ( testSet.size() < hash_setSize )
+	{
+		TestSet::value_type x;
+		testSet.insert( x );
+		testSet2.insert( TestSet::value_type() );
+	}
+
+#  if defined( EH_HASH_CONTAINERS_SUPPORT_RESIZE )
+	WeakCheck( testSet, test_hash_resize<TestSet>() );
+	StrongCheck( testSet, test_insert_noresize<TestSet>(testSet) );
+#  endif
+	WeakCheck( testSet, test_insert_value<TestSet>(testSet) );
+
+	size_t insCnt = random_number(random_base);
+	TestSet::value_type *insFirst = new TestSet::value_type[1+insCnt];
+	WeakCheck( testSet, insert_range_tester(testSet, insFirst, insFirst+insCnt) );
+	ConstCheck( 0, test_construct_pointer_range<TestSet>(insFirst, insFirst+insCnt) );
+	delete[] insFirst;
+	
+	WeakCheck( testSet, insert_range_tester(testSet, testSet2.begin(), testSet2.end() ) );
+	
+	ConstCheck( 0, test_default_construct<TestSet>() );
+#  if EH_HASH_CONTAINERS_SUPPORT_ITERATOR_CONSTRUCTION
+	ConstCheck( 0, test_construct_iter_range_n<TestSet>( testSet2 ) );
+#  endif
+	ConstCheck( testSet, test_copy_construct<TestSet>() );
+	
+	WeakCheck( testSet, test_assign_op<TestSet>( testSet2 ) );
+# endif
+}
+
+#endif	// EH_HASHED_CONTAINERS_IMPLEMENTED
diff --git a/main/source/stlport/test/eh/test_insert.h b/main/source/stlport/test/eh/test_insert.h
new file mode 100644
index 00000000..d41652f8
--- /dev/null
+++ b/main/source/stlport/test/eh/test_insert.h
@@ -0,0 +1,551 @@
+/***********************************************************************************
+	test_insert.h
+	
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+
+***********************************************************************************/
+#ifndef test_insert_H_
+#define test_insert_H_
+
+# include "Prefix.h"
+# if defined (EH_NEW_HEADERS)
+#  include <utility>
+#  include <vector>
+#  include <cassert>
+#  include <climits>
+# else
+#  include <vector.h>
+#  include <assert.h>
+#  include <limits.h>
+# endif
+#include "random_number.h"
+#include "nc_alloc.h"
+#include "ThrowCompare.h"
+
+// A classification system for containers, for verification
+struct container_tag {};
+struct sequence_container_tag  {};
+struct associative_container_tag  {}; 
+
+struct set_tag  {};
+struct multiset_tag  {};
+struct map_tag {};
+struct multimap_tag {};
+
+template <class C, class Iter>
+size_t CountNewItems( const C&, const Iter& firstNew, 
+                      const Iter& lastNew, sequence_container_tag )
+{
+    size_t dist = 0;
+#if 0 //def __SUNPRO_CC
+    EH_DISTANCE( firstNew, lastNew, dist );
+#else
+    EH_DISTANCE( Iter(firstNew), Iter(lastNew), dist );
+#endif
+    return dist;
+}
+
+template <class C, class Iter>
+size_t CountNewItems( const C& c, const Iter& firstNew, 
+                      const Iter& lastNew, multimap_tag )
+{
+    return CountNewItems( c, firstNew, lastNew, sequence_container_tag() );
+}
+
+template <class C, class Iter>
+size_t CountNewItems( const C& c, const Iter& firstNew, 
+                      const Iter& lastNew, multiset_tag )
+{
+    return CountNewItems( c, firstNew, lastNew, sequence_container_tag() );
+}
+
+
+template <class C, class Iter, class KeyOfValue>
+#ifdef __BORLANDC__
+size_t CountUniqueItems_Aux( const C& original, const Iter& firstNew, 
+#else
+size_t CountUniqueItems_Aux( const C& original, Iter firstNew, 
+#endif
+                             Iter lastNew, const KeyOfValue& keyOfValue )
+{
+	typedef typename C::key_type key;
+	typedef typename C::const_iterator const_iter;
+	typedef EH_STD::vector<key> key_list;
+	typedef typename key_list::iterator key_iterator;
+	key_list keys;
+	size_t dist = 0;
+#ifdef __SUNPRO_CC
+	EH_DISTANCE( firstNew, lastNew, dist );
+#else
+	EH_DISTANCE( Iter(firstNew), Iter(lastNew), dist );
+#endif
+	keys.reserve( dist );
+	for ( Iter x = firstNew; x != lastNew; ++x )
+		keys.push_back( keyOfValue(*x) );
+		
+	EH_STD::sort( keys.begin(), keys.end() );
+	key_iterator last = EH_STD::unique( keys.begin(), keys.end() );
+	 
+    size_t cnt = 0;
+    for ( key_iterator tmp = keys.begin(); tmp != last; ++tmp )
+    {
+        if ( const_iter(original.find( *tmp )) == const_iter(original.end()) )
+            ++cnt;
+    }
+    return cnt;
+}
+
+#if ! defined (__SGI_STL)
+EH_BEGIN_NAMESPACE
+template <class T>
+struct identity
+{
+	const T& operator()( const T& x ) const { return x; }
+};
+# if ! defined (__KCC)
+template <class _Pair>
+struct select1st : public unary_function<_Pair, typename _Pair::first_type> {
+  const typename _Pair::first_type& operator()(const _Pair& __x) const {
+    return __x.first;
+  }
+};
+# endif
+EH_END_NAMESPACE
+#endif
+
+template <class C, class Iter>
+size_t CountUniqueItems( const C& original, const Iter& firstNew, 
+                         const Iter& lastNew, set_tag )
+{
+    typedef typename C::value_type value_type;
+    return CountUniqueItems_Aux( original, firstNew, lastNew, 
+                                 EH_STD::identity<value_type>() );
+}
+
+template <class C, class Iter>
+size_t CountUniqueItems( const C& original, const Iter& firstNew, 
+                         const Iter& lastNew, map_tag )
+{
+#ifdef EH_MULTI_CONST_TEMPLATE_ARG_BUG
+    return CountUniqueItems_Aux( original, firstNew, lastNew, 
+                                 EH_SELECT1ST_HINT<C::value_type, C::key_type>() );
+#else
+    typedef typename C::value_type value_type;
+    return CountUniqueItems_Aux( original, firstNew, lastNew, 
+                                 EH_STD::select1st<value_type>() );
+#endif
+}
+
+template <class C, class Iter>
+size_t CountNewItems( const C& original, const Iter& firstNew, 
+                      const Iter& lastNew, map_tag )
+{
+    return CountUniqueItems( original, firstNew, lastNew, 
+                             container_category( original ) );
+}
+
+template <class C, class Iter>
+size_t CountNewItems( const C& original, const Iter& firstNew, 
+                      const Iter& lastNew, set_tag )
+{
+    return CountUniqueItems( original, firstNew, lastNew, 
+                             container_category( original ) );
+}
+
+template <class C, class SrcIter>
+inline void VerifyInsertion( const C& original, const C& result, 
+                             const SrcIter& firstNew, const SrcIter& lastNew, 
+                             size_t, associative_container_tag )
+{
+    typedef typename C::const_iterator DstIter;
+    DstIter first1 = original.begin();
+    DstIter first2 = result.begin();
+
+    DstIter* from_orig = new DstIter[original.size()];
+    DstIter* last_from_orig = from_orig;
+    
+    // fbp : for hashed containers, the following is needed :
+    while ( first2 != result.end() )
+    {
+        EH_STD::pair<DstIter, DstIter> p = EH_STD::mismatch( first1, original.end(), first2 );
+        if ( p.second != result.end() )
+        {
+            SrcIter srcItem = EH_STD::find( SrcIter(firstNew), SrcIter(lastNew), *p.second );
+			
+            if (srcItem == lastNew)
+            {                           
+                // not found in input range, probably re-ordered from the orig
+                DstIter* tmp;
+                tmp = EH_STD::find( from_orig, last_from_orig, p.first );
+                
+                // if already here, exclude
+                if (tmp != last_from_orig)
+                {
+                    EH_STD::copy(tmp+1, last_from_orig, tmp);
+                    last_from_orig--;
+                }
+                else
+                {
+                    // register re-ordered element
+                    DstIter dstItem;
+                    dstItem = EH_STD::find( first1, original.end(), *p.first );
+                    EH_ASSERT( dstItem != original.end() );
+                    *last_from_orig = dstItem;
+                    last_from_orig++;
+                    ++p.first;
+                }
+            }
+            ++p.second;
+        }
+        first1 = p.first;
+        first2 = p.second;
+    }
+	
+    delete [] from_orig;
+}
+
+// VC++ 
+template <class C, class SrcIter>
+inline void VerifyInsertion(
+    const C& original, const C& result, const SrcIter& firstNew, 
+    const SrcIter& lastNew, size_t, set_tag )
+{
+    VerifyInsertion( original, result, firstNew, lastNew, 
+                     size_t(0), associative_container_tag() );
+}
+
+template <class C, class SrcIter>
+inline void VerifyInsertion(const C& original, const C& result, 
+                            const SrcIter& firstNew, const SrcIter& lastNew, 
+                            size_t, multiset_tag )
+{
+    VerifyInsertion( original, result, firstNew, lastNew, 
+                     size_t(0), associative_container_tag() );
+}
+
+template <class C, class SrcIter>
+inline void VerifyInsertion(
+    const C& original, const C& result, const SrcIter& firstNew, 
+    const SrcIter& lastNew, size_t, map_tag )
+{
+    VerifyInsertion( original, result, firstNew, lastNew, 
+                     size_t(0), associative_container_tag() );
+}
+
+template <class C, class SrcIter>
+inline void VerifyInsertion(
+    const C& original, const C& result, const SrcIter& firstNew, 
+    const SrcIter& lastNew, size_t, multimap_tag )
+{
+    VerifyInsertion( original, result, firstNew, lastNew, 
+                     size_t(0), associative_container_tag() );
+}
+
+template <class C, class SrcIter>
+void VerifyInsertion(
+# ifdef _MSC_VER
+    const C& original, const C& result, SrcIter firstNew, 
+    SrcIter lastNew, size_t insPos, sequence_container_tag )
+# else
+    const C& original, const C& result, const SrcIter& firstNew, 
+    const SrcIter& lastNew, size_t insPos, sequence_container_tag )
+# endif
+{
+    typename C::const_iterator p1 = original.begin();
+    typename C::const_iterator p2 = result.begin();
+    SrcIter tmp(firstNew);
+    
+    for ( size_t n = 0; n < insPos; n++, ++p1, ++p2)
+        EH_ASSERT( *p1 == *p2 );
+
+    for (; tmp != lastNew; ++p2, ++tmp ) {
+        EH_ASSERT(p2 != result.end());
+        EH_ASSERT(*p2 == *tmp);
+    }
+
+    for (;  p2 != result.end(); ++p1, ++p2 )
+        EH_ASSERT( *p1 == *p2 );
+    EH_ASSERT( p1 == original.end() );
+}
+
+template <class C, class SrcIter>
+inline void VerifyInsertion( const C& original, const C& result, 
+                             const SrcIter& firstNew, 
+                             const SrcIter& lastNew, size_t insPos )
+{
+    EH_ASSERT( result.size() == original.size() + 
+            CountNewItems( original, firstNew, lastNew, 
+                           container_category(original) ) );
+    VerifyInsertion( original, result, firstNew, lastNew, insPos, 
+                     container_category(original) );
+}
+
+template <class C, class Value>
+void VerifyInsertN( const C& original, const C& result, size_t insCnt, 
+                    const Value& val, size_t insPos )
+{
+    typename C::const_iterator p1 = original.begin();
+    typename C::const_iterator p2 = result.begin();
+	(void)val;		//*TY 02/06/2000 - to suppress unused variable warning under nondebug build
+
+    for ( size_t n = 0; n < insPos; n++ )
+        EH_ASSERT( *p1++ == *p2++ );
+
+    while ( insCnt-- > 0 )
+    {
+        EH_ASSERT(p2 != result.end());
+        EH_ASSERT(*p2 == val );
+        ++p2;
+    }
+	
+    while ( p2 != result.end() ) {
+        EH_ASSERT( *p1 == *p2 );
+        ++p1; ++p2;
+    }
+    EH_ASSERT( p1 == original.end() );
+}
+
+template <class C>
+void prepare_insert_n( C&, size_t ) {}
+
+// Metrowerks 1.8 compiler requires that specializations appear first (!!)
+// or it won't call them. Fixed in 1.9, though.
+inline void MakeRandomValue(bool& b) { b = bool(random_number(2)); }
+
+template<class T>
+inline void MakeRandomValue(T&) {}
+
+template <class C>
+struct test_insert_one
+{
+    test_insert_one( const C& orig, int pos =-1 )
+        : original( orig ), fPos( random_number( orig.size() ))
+    {
+        MakeRandomValue( fInsVal );
+        if ( pos != -1 )
+        {
+            fPos = size_t(pos);
+            if ( pos == 0 )
+                gTestController.SetCurrentTestName("single insertion at begin()");
+            else
+                gTestController.SetCurrentTestName("single insertion at end()");
+        }
+        else
+            gTestController.SetCurrentTestName("single insertion at random position");
+    }
+	
+    void operator()( C& c ) const
+    {
+        prepare_insert_n( c, (size_t)1 );
+        typename C::iterator pos = c.begin();
+        EH_STD::advance( pos, size_t(fPos) );
+        c.insert( pos, fInsVal );
+		
+        // Prevent simulated failures during verification
+        gTestController.CancelFailureCountdown();
+        // Success. Check results.
+        VerifyInsertion( original, c, &fInsVal, 1+&fInsVal, fPos );
+    }
+private:
+    typename C::value_type fInsVal;
+    const C& original;
+    size_t fPos;
+};
+
+template <class C>
+struct test_insert_n
+{
+    test_insert_n( const C& orig, size_t insCnt, int pos =-1 )
+        : original( orig ), fPos( random_number( orig.size() )), fInsCnt(insCnt)
+    {
+        MakeRandomValue( fInsVal );
+        if (pos!=-1)
+        {
+            fPos=size_t(pos);
+            if (pos==0)
+                gTestController.SetCurrentTestName("n-ary insertion at begin()");
+            else
+                gTestController.SetCurrentTestName("n-ary insertion at end()");
+        }
+        else
+            gTestController.SetCurrentTestName("n-ary insertion at random position");
+    }
+	
+    void operator()( C& c ) const
+    {
+        prepare_insert_n( c, fInsCnt );
+        typename C::iterator pos = c.begin();
+        EH_STD::advance( pos, fPos );
+        c.insert( pos, fInsCnt, fInsVal );
+		
+        // Prevent simulated failures during verification
+        gTestController.CancelFailureCountdown();
+        // Success. Check results.
+        VerifyInsertN( original, c, fInsCnt, fInsVal, fPos );
+    }
+private:
+    typename C::value_type fInsVal;
+    const C& original;
+    size_t fPos;
+    size_t fInsCnt;
+};
+
+template <class C>
+struct test_insert_value
+{
+    test_insert_value( const C& orig )
+        : original( orig )
+    {
+        MakeRandomValue( fInsVal );
+        gTestController.SetCurrentTestName("insertion or random value");
+    }
+	
+    void operator()( C& c ) const
+    {
+        c.insert( fInsVal );
+		
+        // Prevent simulated failures during verification
+        gTestController.CancelFailureCountdown();
+        // Success. Check results.
+        VerifyInsertion( original, c, &fInsVal, 1+&fInsVal, size_t(0) );
+    }
+private:
+    typename C::value_type fInsVal;
+    const C& original;
+};
+
+template <class C>
+struct test_insert_noresize
+{
+    test_insert_noresize( const C& orig )
+        : original( orig )
+    {
+        MakeRandomValue( fInsVal );
+        gTestController.SetCurrentTestName("insertion of random value without resize");
+    }
+
+    void operator()( C& c ) const
+    {
+        c.insert_noresize( fInsVal );
+
+        // Prevent simulated failures during verification
+        gTestController.CancelFailureCountdown();
+        // Success. Check results.
+        VerifyInsertion( original, c, &fInsVal, 1+&fInsVal, size_t(0) );
+    }
+private:
+    typename C::value_type fInsVal;
+    const C& original;
+};
+
+template <class C, class Position, class Iter>
+void do_insert_range( C& c_inst, Position offset, 
+                      Iter first, Iter last, sequence_container_tag )
+{
+    typedef typename C::iterator CIter;
+    CIter pos = c_inst.begin();
+    EH_STD::advance( pos, offset );
+    c_inst.insert( pos, first, last );
+}
+
+template <class C, class Position, class Iter>
+void do_insert_range( C& c, Position, 
+                      Iter first, Iter last, associative_container_tag )
+{
+    c.insert( first, last );
+}
+
+template <class C, class Position, class Iter>
+void do_insert_range( C& c, Position, Iter first, Iter last, multiset_tag )
+{
+    c.insert( first, last );
+}
+
+template <class C, class Position, class Iter>
+void do_insert_range( C& c, Position, Iter first, Iter last, multimap_tag )
+{
+    c.insert( first, last );
+}
+
+template <class C, class Position, class Iter>
+void do_insert_range( C& c, Position, Iter first, Iter last, set_tag )
+{
+    c.insert( first, last );
+}
+
+template <class C, class Position, class Iter>
+void do_insert_range( C& c, Position, Iter first, Iter last, map_tag )
+{
+    c.insert( first, last );
+}
+
+/*
+template <class C, class Iter>
+void prepare_insert_range( C&, size_t, Iter, Iter) {}
+*/
+
+template <class C, class Iter>
+struct test_insert_range
+{
+    test_insert_range( const C& orig, Iter first, Iter last, int pos=-1 )
+        : fFirst( first ),
+          fLast( last ),
+          original( orig ),
+          fPos( random_number( orig.size() ))
+    {
+        gTestController.SetCurrentTestName("range insertion");
+        if ( pos != -1 )
+        {
+            fPos = size_t(pos);
+            if ( pos == 0 )
+                gTestController.SetCurrentTestName("range insertion at begin()");
+            else
+                gTestController.SetCurrentTestName("range insertion at end()");
+        }
+        else
+            gTestController.SetCurrentTestName("range insertion at random position");
+    }
+
+    void operator()( C& c ) const
+    {
+//        prepare_insert_range( c, fPos, fFirst, fLast );
+        do_insert_range( c, fPos, fFirst, fLast, container_category(c) );
+		
+        // Prevent simulated failures during verification
+        gTestController.CancelFailureCountdown();
+        // Success. Check results.
+        VerifyInsertion( original, c, fFirst, fLast, fPos );
+    }
+private:
+    Iter fFirst, fLast;
+    const C& original;
+    size_t fPos;
+};
+
+template <class C, class Iter>
+test_insert_range<C, Iter> insert_range_tester( const C& orig, const Iter& first, const Iter& last )
+{
+    return test_insert_range<C, Iter>( orig, first, last );
+}
+
+template <class C, class Iter>
+test_insert_range<C, Iter> insert_range_at_begin_tester( const C& orig, const Iter& first, const Iter& last )
+{
+	return test_insert_range<C, Iter>( orig, first, last , 0);
+}
+
+template <class C, class Iter>
+test_insert_range<C, Iter> insert_range_at_end_tester( const C& orig, const Iter& first, const Iter& last )
+{
+	return test_insert_range<C, Iter>( orig, first, last , (int)orig.size());
+}
+#endif // test_insert_H_
diff --git a/main/source/stlport/test/eh/test_list.cpp b/main/source/stlport/test/eh/test_list.cpp
new file mode 100644
index 00000000..3adb49c5
--- /dev/null
+++ b/main/source/stlport/test/eh/test_list.cpp
@@ -0,0 +1,108 @@
+/***********************************************************************************
+	test_list.cpp
+	
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+
+***********************************************************************************/
+#include "Tests.h"
+#include "TestClass.h"
+#include "LeakCheck.h"
+# if defined (EH_NEW_HEADERS)
+#include <list>
+#else
+#include <list.h>
+#endif
+#include "test_construct.h"
+#include "test_assign_op.h"
+#include "test_push_back.h"
+#include "test_insert.h"
+#include "test_push_front.h"
+#include "nc_alloc.h"
+
+typedef EH_STD::__list__<TestClass, eh_allocator(TestClass) > TestList;
+
+inline sequence_container_tag
+container_category(const TestList&)
+{
+  return sequence_container_tag();
+}
+
+//
+//	list sort() member test operation. Does not verify stability.
+//
+struct test_list_sort
+{
+    test_list_sort()
+    {
+        gTestController.SetCurrentTestName("list::sort()");
+    }
+    
+    void operator()( TestList& list ) const
+    {
+        list.sort();
+        
+        gTestController.CancelFailureCountdown();
+        
+        for ( TestList::iterator p = list.begin(); p != list.end(); p++ )
+            if ( p != list.begin() ) {
+                TestList::iterator tmp=p;
+                --tmp;
+                EH_ASSERT( *p >= *tmp );
+            }
+    }
+};
+
+void test_list()
+{
+    TestList testList, testList2;
+    size_t listSize = random_number(random_base);
+	
+    while ( testList.size() < listSize )
+    {
+        TestClass x;
+        testList.push_back( x );
+        testList2.push_back( TestClass() );
+    }
+
+    StrongCheck( testList, test_insert_one<TestList>(testList) );
+    StrongCheck( testList, test_insert_one<TestList>(testList, 0) );
+    StrongCheck( testList, test_insert_one<TestList>(testList, (int)testList.size()) );
+
+    WeakCheck( testList, test_insert_n<TestList>(testList, random_number(random_base) ) );
+    WeakCheck( testList, test_insert_n<TestList>(testList, random_number(random_base), 0 ) );
+    WeakCheck( testList, test_insert_n<TestList>(testList, random_number(random_base), (int)testList.size() ) );
+	
+    size_t insCnt = random_number(random_base);
+    TestClass *insFirst = new TestList::value_type[1+insCnt];
+
+    WeakCheck( testList, insert_range_tester(testList, insFirst, insFirst+insCnt) );
+    WeakCheck( testList, insert_range_at_begin_tester(testList, insFirst, insFirst+insCnt) );
+    WeakCheck( testList, insert_range_at_end_tester(testList, insFirst, insFirst+insCnt) );
+
+    ConstCheck( 0, test_construct_pointer_range<TestList>(insFirst, insFirst+insCnt) );
+    delete[] insFirst;
+
+    WeakCheck( testList, insert_range_tester(testList, testList2.begin(), testList2.end() ) );
+
+    StrongCheck( testList, test_push_front<TestList>(testList) );
+    StrongCheck( testList, test_push_back<TestList>(testList) );
+
+    StrongCheck( testList, test_list_sort() );	// Simply to verify strength.
+       
+    ConstCheck( 0, test_default_construct<TestList>() );
+    ConstCheck( 0, test_construct_n<TestList>( random_number(random_base) ) );
+    ConstCheck( 0, test_construct_n_instance<TestList>( random_number(random_base) ) );
+    ConstCheck( 0, test_construct_iter_range<TestList>( testList2 ) );
+    ConstCheck( testList, test_copy_construct<TestList>() );
+
+    WeakCheck( testList, test_assign_op<TestList>( testList2 ) );
+}
diff --git a/main/source/stlport/test/eh/test_map.cpp b/main/source/stlport/test/eh/test_map.cpp
new file mode 100644
index 00000000..c6612eeb
--- /dev/null
+++ b/main/source/stlport/test/eh/test_map.cpp
@@ -0,0 +1,127 @@
+/***********************************************************************************
+	test_map.cpp
+	
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+
+***********************************************************************************/
+#include "Tests.h"
+#include "TestClass.h"
+#include "LeakCheck.h"
+# if defined (EH_NEW_HEADERS)
+#include <map>
+# else
+#include <multimap.h>
+#include <map.h>
+# endif
+
+#include "test_construct.h"
+#include "test_assign_op.h"
+#include "test_push_back.h"
+#include "test_insert.h"
+#include "test_push_front.h"
+#include "ThrowCompare.h"
+#include "test_insert.h"
+
+template <class K, class V, class Comp, class A>
+inline multimap_tag
+container_category(const EH_STD::__multimap__<K,V,Comp, A>&)
+{
+    return multimap_tag();
+}
+
+template <class K, class V, class Comp, class A >
+inline map_tag
+container_category(const EH_STD::__map__<K,V,Comp, A>&)
+{
+    return map_tag();
+}
+
+typedef EH_STD::__multimap__<TestClass, TestClass, ThrowCompare, eh_allocator(TestClass) > TestMultiMap;
+
+void test_multimap()
+{
+    TestMultiMap testMultiMap, testMultiMap2;
+	
+    const size_t mapSize = random_number(random_base);
+	
+    while ( testMultiMap.size() < mapSize )
+    {
+        TestMultiMap::value_type x;
+        testMultiMap.insert( x );
+        testMultiMap2.insert( TestMultiMap::value_type() );
+    }
+
+    StrongCheck( testMultiMap, test_insert_value<TestMultiMap>(testMultiMap) );
+
+    size_t insCnt = 1 + random_number(random_base);
+    TestMultiMap::value_type *insFirst = new TestMultiMap::value_type[insCnt];
+
+    WeakCheck( testMultiMap, insert_range_tester(testMultiMap, insFirst, insFirst+insCnt) );
+
+    ConstCheck( 0, test_construct_pointer_range<TestMultiMap>(insFirst, insFirst+insCnt) );
+    delete[] insFirst;
+	
+	
+    WeakCheck( testMultiMap, insert_range_tester(testMultiMap, testMultiMap2.begin(), testMultiMap2.end() ) );
+	
+
+    ConstCheck( 0, test_default_construct<TestMultiMap>() );
+
+    ConstCheck( 0, test_construct_iter_range<TestMultiMap>( testMultiMap2 ) );
+
+    ConstCheck( testMultiMap, test_copy_construct<TestMultiMap>() );	
+
+    WeakCheck( testMultiMap, test_assign_op<TestMultiMap>( testMultiMap2 ) );
+}
+
+typedef EH_STD::__map__<TestClass, TestClass, ThrowCompare, eh_allocator(TestClass) > TestMap;
+
+void CheckInvariant( const TestMap& m );
+
+void CheckInvariant( const TestMap& m )
+{	
+//	assert( map.__rb_verify() );
+    size_t total = 0;
+    EH_DISTANCE( m.begin(), m.end(), total );
+    assert( m.size() == total );
+}
+
+void test_map()
+{
+    TestMap testMap, testMap2;
+	
+    const size_t mapSize = random_number(random_base);
+	
+    while ( testMap.size() < mapSize )
+    {
+        TestMap::value_type x;
+        testMap.insert( x );
+        testMap2.insert( TestMap::value_type() );
+    }
+
+    StrongCheck( testMap, test_insert_value<TestMap>(testMap) );
+
+    size_t insCnt = random_number(random_base);
+    TestMap::value_type *insFirst = new TestMap::value_type[1+insCnt];
+
+    WeakCheck( testMap, insert_range_tester(testMap, insFirst, insFirst+insCnt) );
+
+    ConstCheck( 0, test_construct_pointer_range<TestMap>(insFirst, insFirst+insCnt) );
+    delete[] insFirst;
+
+    WeakCheck( testMap, insert_range_tester(testMap, testMap2.begin(), testMap2.end() ) );
+    ConstCheck( 0, test_default_construct<TestMap>() );
+    ConstCheck( 0, test_construct_iter_range<TestMap>( testMap2 ) );
+    ConstCheck( testMap, test_copy_construct<TestMap>() );
+    WeakCheck( testMap, test_assign_op<TestMap>( testMap2 ) );
+}
+
diff --git a/main/source/stlport/test/eh/test_push_back.h b/main/source/stlport/test/eh/test_push_back.h
new file mode 100644
index 00000000..4066aca6
--- /dev/null
+++ b/main/source/stlport/test/eh/test_push_back.h
@@ -0,0 +1,50 @@
+/***********************************************************************************
+	test_push_back.h
+	
+		Interface for the test_push_back class
+		
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+		
+***********************************************************************************/
+#ifndef test_push_back_H_
+#define test_push_back_H_
+# ifdef EH_NEW_HEADERS
+#  include <cassert>
+# else
+#  include <assert.h>
+# endif
+
+# include "Prefix.h"
+#include "nc_alloc.h"
+
+template <class C>
+struct test_push_back
+{
+	test_push_back( const C& orig ) : original( orig )
+	{
+        gTestController.SetCurrentTestName("push_back() method");
+    }
+	
+	void operator()( C& c ) const
+	{
+      typedef typename C::value_type _value_type;
+		c.push_back(_value_type() );
+		// Prevent simulated failures during verification
+        gTestController.CancelFailureCountdown();
+		EH_ASSERT( c.size() == original.size() + 1 );
+		EH_ASSERT( EH_STD::equal( original.begin(), original.end(), c.begin() ) );
+	}
+private:
+	const C& original;
+};
+
+#endif // test_push_back_H_
diff --git a/main/source/stlport/test/eh/test_push_front.h b/main/source/stlport/test/eh/test_push_front.h
new file mode 100644
index 00000000..7f964f4b
--- /dev/null
+++ b/main/source/stlport/test/eh/test_push_front.h
@@ -0,0 +1,46 @@
+/***********************************************************************************
+	test_push_front.h
+	
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+		
+***********************************************************************************/
+#ifndef test_push_front_H_
+#define test_push_front_H_
+
+# if defined (EH_NEW_HEADERS)
+#  include <cassert>
+# else
+#  include <assert.h>
+# endif
+# include "Prefix.h"
+
+template <class C>
+struct test_push_front
+{
+	test_push_front( const C& orig ) : original( orig ) {
+            gTestController.SetCurrentTestName("push_front() method");
+        }
+	
+	void operator()( C& c ) const
+	{
+      typedef typename C::value_type _value_type;
+		c.push_front( _value_type() );
+		EH_ASSERT( c.size() == original.size() + 1 );
+		typename C::const_iterator next = c.begin();
+
+		EH_ASSERT( EH_STD::equal( original.begin(), original.end(), ++next ) );
+	}
+private:
+	const C& original;
+};
+
+#endif // test_push_front_H_
diff --git a/main/source/stlport/test/eh/test_rope.cpp b/main/source/stlport/test/eh/test_rope.cpp
new file mode 100644
index 00000000..aa9c62de
--- /dev/null
+++ b/main/source/stlport/test/eh/test_rope.cpp
@@ -0,0 +1,117 @@
+/***********************************************************************************
+	test_rope.cpp
+	
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+
+***********************************************************************************/
+
+# ifdef __SUNPRO_CC
+#  define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1
+# endif
+
+#include "Prefix.h"
+#include "Tests.h"
+#include "TestClass.h"
+#include "LeakCheck.h"
+#include "test_construct.h"
+#include "test_assign_op.h"
+#include "test_push_back.h"
+#include "test_insert.h"
+#include "test_push_front.h"
+
+#if defined( EH_ROPE_IMPLEMENTED )
+#if !( defined(__MWERKS__) && __MWERKS__ < 0x1900 )    // CW1.8 can't compile this!
+# define __STD_STUFF 1
+# if defined (EH_NEW_HEADERS)
+#include <rope>
+#else
+#include <rope.h>
+#endif
+
+
+typedef STLPORT::rope<char, eh_allocator(char) > TestRope;
+
+# if ( _STLP_STATIC_TEMPLATE_DATA < 1 )
+
+// Instantiate TestRope static data members
+const unsigned long TestRope::_S_min_len[46] = { \
+/* 0 */1, /* 1 */2, /* 2 */3, /* 3 */5, /* 4 */8, /* 5 */13, /* 6 */21,         \
+/* 7 */34, /* 8 */55, /* 9 */89, /* 10 */144, /* 11 */233, /* 12 */377,         \
+/* 13 */610, /* 14 */987, /* 15 */1597, /* 16 */2584, /* 17 */4181,             \
+/* 18 */6765ul, /* 19 */10946ul, /* 20 */17711ul, /* 21 */28657ul, /* 22 */46368ul,   \
+/* 23 */75025ul, /* 24 */121393ul, /* 25 */196418ul, /* 26 */317811ul,                \
+/* 27 */514229ul, /* 28 */832040ul, /* 29 */1346269ul, /* 30 */2178309ul,             \
+/* 31 */3524578ul, /* 32 */5702887ul, /* 33 */9227465ul, /* 34 */14930352ul,          \
+/* 35 */24157817ul, /* 36 */39088169ul, /* 37 */63245986ul, /* 38 */102334155ul,      \
+/* 39 */165580141ul, /* 40 */267914296ul, /* 41 */433494437ul,                        \
+/* 42 */701408733ul, /* 43 */1134903170ul, /* 44 */1836311903ul,                      \
+/* 45 */2971215073ul };
+
+# endif /* ( _STLP_STATIC_TEMPLATE_DATA < 1 ) */
+
+inline sequence_container_tag
+container_category(const TestRope&)
+{
+  return sequence_container_tag();
+}
+
+void test_rope()
+{
+    TestRope testRope, testRope2;
+    size_t ropeSize = random_number(random_base);
+	
+    while ( testRope.size() < ropeSize )
+    {
+        TestRope::value_type x = TestRope::value_type(random_number(random_base));	// initialize before use
+        testRope.push_back( x );
+        testRope2.push_back( TestRope::value_type() );
+    }
+    WeakCheck( testRope, test_insert_one<TestRope>(testRope) );
+    WeakCheck( testRope, test_insert_one<TestRope>(testRope, 0) );
+    WeakCheck( testRope, test_insert_one<TestRope>(testRope, (int)testRope.size()) );
+
+    WeakCheck( testRope, test_insert_n<TestRope>(testRope, random_number(random_base) ) );
+    WeakCheck( testRope, test_insert_n<TestRope>(testRope, random_number(random_base), 0 ) );
+    WeakCheck( testRope, test_insert_n<TestRope>(testRope, random_number(random_base), (int)testRope.size() ) );
+	
+    size_t insCnt = random_number(random_base);
+    TestRope::value_type *insFirst = new TestRope::value_type[1+insCnt];
+
+    WeakCheck( testRope, insert_range_tester(testRope, insFirst, insFirst+insCnt) );
+    WeakCheck( testRope, insert_range_at_begin_tester(testRope, insFirst, insFirst+insCnt) );
+    WeakCheck( testRope, insert_range_at_end_tester(testRope, insFirst, insFirst+insCnt) );
+
+    ConstCheck( 0, test_construct_pointer_range<TestRope>(insFirst, insFirst+insCnt) );
+    delete[] insFirst;
+
+    WeakCheck( testRope, insert_range_tester(testRope, testRope2.begin(), testRope2.end() ) );
+
+    WeakCheck( testRope, test_push_front<TestRope>(testRope) );
+    WeakCheck( testRope, test_push_back<TestRope>(testRope) );
+
+    ConstCheck( 0, test_default_construct<TestRope>() );
+    
+// dwa 1/25/00 - not actually valid for rope, because it doesn't
+// have the constructor in question! The code will compile, but with the
+// wrong result (the constructor that gets used does something different).
+
+//  ConstCheck( 0, test_construct_n<TestRope>( random_number(random_base) ) );
+
+    ConstCheck( 0, test_construct_n_instance<TestRope>( random_number(random_base) ) );
+    ConstCheck( 0, test_construct_iter_range<TestRope>( testRope2 ) );
+    ConstCheck( testRope, test_copy_construct<TestRope>() );
+
+    WeakCheck( testRope, test_assign_op<TestRope>( testRope2 ) );
+}
+#endif // __MWERKS__
+
+#endif // EH_ROPE_IMPLEMENTED
diff --git a/main/source/stlport/test/eh/test_set.cpp b/main/source/stlport/test/eh/test_set.cpp
new file mode 100644
index 00000000..df5edd89
--- /dev/null
+++ b/main/source/stlport/test/eh/test_set.cpp
@@ -0,0 +1,107 @@
+/***********************************************************************************
+	test_set.cpp
+	
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+
+***********************************************************************************/
+#include "Tests.h"
+#include "TestClass.h"
+#include "LeakCheck.h"
+# if defined (EH_NEW_HEADERS)
+#include <set>
+# else
+#include <multiset.h>
+#include <set.h>
+# endif
+#include "test_construct.h"
+#include "test_assign_op.h"
+#include "test_push_back.h"
+#include "test_insert.h"
+#include "test_push_front.h"
+#include "ThrowCompare.h"
+
+void test_multiset();
+
+typedef EH_STD::__multiset__<TestClass, ThrowCompare, eh_allocator(TestClass) > TestMultiSet;
+
+inline multiset_tag
+container_category(const TestMultiSet&)
+{
+  return multiset_tag();
+}
+
+void test_multiset()
+{
+    TestMultiSet testMultiSet, testMultiSet2;
+	
+    const size_t setSize = random_number(random_base);
+	
+	while ( testMultiSet.size() < setSize )
+	{
+        TestMultiSet::value_type x;
+        testMultiSet.insert( x );
+        testMultiSet2.insert( TestMultiSet::value_type() );
+	}
+
+    StrongCheck( testMultiSet, test_insert_value<TestMultiSet>(testMultiSet) );
+
+    size_t insCnt = random_number(random_base);
+    TestMultiSet::value_type *insFirst = new TestMultiSet::value_type[1+insCnt];
+    WeakCheck( testMultiSet, insert_range_tester(testMultiSet, insFirst, insFirst+insCnt) );
+    ConstCheck( 0, test_construct_pointer_range<TestMultiSet>(insFirst, insFirst+insCnt) );
+    delete[] insFirst;
+    WeakCheck( testMultiSet, insert_range_tester(testMultiSet, testMultiSet2.begin(), testMultiSet2.end() ) );
+	
+
+    ConstCheck( 0, test_default_construct<TestMultiSet>() );
+    ConstCheck( 0, test_construct_iter_range<TestMultiSet>( testMultiSet2 ) );
+    ConstCheck( testMultiSet, test_copy_construct<TestMultiSet>() );
+
+    WeakCheck( testMultiSet, test_assign_op<TestMultiSet>( testMultiSet2 ) );
+}
+
+typedef EH_STD::__set__<TestClass, ThrowCompare, eh_allocator(TestClass) > TestSet;
+
+inline set_tag
+container_category(const TestSet&)
+{
+  return set_tag();
+}
+
+void test_set()
+{
+    TestSet testSet, testSet2;
+	
+    const size_t setSize = random_number(random_base);
+	
+	while ( testSet.size() < setSize )
+	{
+        TestSet::value_type x;
+        testSet.insert( x );
+        testSet2.insert( TestSet::value_type() );
+	}
+    StrongCheck( testSet, test_insert_value<TestSet>(testSet) );
+
+    size_t insCnt = random_number(random_base);
+    TestSet::value_type *insFirst = new TestSet::value_type[1+insCnt];
+
+    WeakCheck( testSet, insert_range_tester(testSet, insFirst, insFirst+insCnt) );
+
+    ConstCheck( 0, test_construct_pointer_range<TestSet>(insFirst, insFirst+insCnt) );
+    delete[] insFirst;
+    WeakCheck( testSet, insert_range_tester(testSet, testSet2.begin(), testSet2.end() ) );
+
+    ConstCheck( 0, test_default_construct<TestSet>() );
+    ConstCheck( 0, test_construct_iter_range<TestSet>( testSet2 ) );
+    ConstCheck( testSet, test_copy_construct<TestSet>() );
+    WeakCheck( testSet, test_assign_op<TestSet>( testSet2 ) );
+}
diff --git a/main/source/stlport/test/eh/test_slist.cpp b/main/source/stlport/test/eh/test_slist.cpp
new file mode 100644
index 00000000..547755d4
--- /dev/null
+++ b/main/source/stlport/test/eh/test_slist.cpp
@@ -0,0 +1,91 @@
+/***********************************************************************************
+	test_slist.cpp
+
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+
+***********************************************************************************/
+#include "Tests.h"
+#if defined( EH_SLIST_IMPLEMENTED )
+#include "TestClass.h"
+#include "LeakCheck.h"
+# if defined (EH_NEW_HEADERS) && defined (EH_USE_SGI_STL)
+#include <slist>
+#else
+#include <slist.h>
+#endif
+#include "test_construct.h"
+#include "test_assign_op.h"
+#include "test_push_back.h"
+#include "test_insert.h"
+#include "test_push_front.h"
+
+typedef EH_STD::__slist__<TestClass, eh_allocator(TestClass) > TestSList;
+
+inline sequence_container_tag
+container_category(const TestSList&)
+{
+  return sequence_container_tag();
+}
+
+struct test_slist_sort
+{
+    test_slist_sort() {
+        gTestController.SetCurrentTestName("slist::sort()");
+    }
+	void operator()( TestSList& slist ) const
+	{
+		slist.sort();
+		for ( TestSList::iterator p = slist.begin(), q; p != slist.end(); q = p, p++ )
+			if ( p != slist.begin() )
+				EH_ASSERT( *p >= *q );
+	}
+};
+
+void test_slist()
+{
+	TestSList testSList, testSList2;
+	size_t slistSize = random_number(random_base);
+	
+	while ( testSList.size() < slistSize )
+	{
+		TestClass x;
+		testSList.push_front( x );
+		testSList2.push_front( TestClass() );
+	}
+
+	StrongCheck( testSList, test_insert_one<TestSList>(testSList) );
+	StrongCheck( testSList, test_insert_one<TestSList>(testSList, 0) );
+	StrongCheck( testSList, test_insert_one<TestSList>(testSList, (int)testSList.size()) );
+
+	WeakCheck( testSList, test_insert_n<TestSList>(testSList, random_number(random_base) ) );
+	WeakCheck( testSList, test_insert_n<TestSList>(testSList, random_number(random_base), 0 ) );
+	WeakCheck( testSList, test_insert_n<TestSList>(testSList, random_number(random_base), (int)testSList.size() ) );
+
+	size_t insCnt = random_number(random_base);
+	TestClass *insFirst = new TestSList::value_type[1+insCnt];
+	WeakCheck( testSList, insert_range_tester(testSList, insFirst, insFirst+insCnt) );
+
+	ConstCheck( 0, test_construct_pointer_range<TestSList>(insFirst, insFirst+insCnt) );
+	delete[] insFirst;
+	WeakCheck( testSList, test_insert_range<TestSList,TestSList::iterator>(testSList, testSList2.begin(), testSList2.end() ) );
+	StrongCheck( testSList, test_push_front<TestSList>(testSList) );
+	StrongCheck( testSList, test_slist_sort() );	// Simply to verify strength.	
+  
+	ConstCheck( 0, test_default_construct<TestSList>() );
+	ConstCheck( 0, test_construct_n<TestSList>( random_number(random_base) ) );
+	ConstCheck( 0, test_construct_n_instance<TestSList>( random_number(random_base) ) );
+	ConstCheck( 0, test_construct_iter_range<TestSList>( testSList2 ) );
+	ConstCheck( testSList, test_copy_construct<TestSList>() );
+	WeakCheck( testSList, test_assign_op<TestSList>( testSList2 ) );
+
+}
+#endif // EH_SLIST_IMPLEMENTED
diff --git a/main/source/stlport/test/eh/test_string.cpp b/main/source/stlport/test/eh/test_string.cpp
new file mode 100644
index 00000000..cdd2ec45
--- /dev/null
+++ b/main/source/stlport/test/eh/test_string.cpp
@@ -0,0 +1,82 @@
+/***********************************************************************************
+	test_string.cpp
+	
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+
+***********************************************************************************/
+#include "Prefix.h"
+#if defined( EH_STRING_IMPLEMENTED )
+#include "Tests.h"
+#include "TestClass.h"
+#include "LeakCheck.h"
+#include "test_construct.h"
+#include "test_assign_op.h"
+#include "test_push_back.h"
+#include "test_insert.h"
+#include "test_push_front.h"
+#include <string>
+
+USING_CSTD_NAME(size_t)
+  
+typedef EH_STD::basic_string<char, EH_STD::char_traits<char>, eh_allocator(char) > TestString;
+
+inline sequence_container_tag
+container_category(const TestString&)
+{
+  return sequence_container_tag();
+}
+
+void test_string()
+{
+    TestString testString, testString2;
+    size_t ropeSize = random_number(random_base);
+	
+    while ( testString.size() < ropeSize )
+    {
+        TestString::value_type x = TestString::value_type(random_number(random_base)) ;	// initialize before use
+        testString.append(1, x );
+        testString2.append(1, TestString::value_type() );
+    }
+    WeakCheck( testString, test_insert_one<TestString>(testString) );
+    WeakCheck( testString, test_insert_one<TestString>(testString, 0) );
+    WeakCheck( testString, test_insert_one<TestString>(testString, (int)testString.size()) );
+
+    WeakCheck( testString, test_insert_n<TestString>(testString, random_number(random_base) ) );
+    WeakCheck( testString, test_insert_n<TestString>(testString, random_number(random_base), 0 ) );
+    WeakCheck( testString, test_insert_n<TestString>(testString, random_number(random_base), (int)testString.size() ) );
+	
+    size_t insCnt = random_number(random_base);
+    TestString::value_type *insFirst = new TestString::value_type[1+insCnt];
+
+    WeakCheck( testString, insert_range_tester(testString, insFirst, insFirst+insCnt) );
+    WeakCheck( testString, insert_range_at_begin_tester(testString, insFirst, insFirst+insCnt) );
+    WeakCheck( testString, insert_range_at_end_tester(testString, insFirst, insFirst+insCnt) );
+
+    ConstCheck( 0, test_construct_pointer_range<TestString>(insFirst, insFirst+insCnt) );
+    delete[] insFirst;
+
+    WeakCheck( testString, insert_range_tester(testString, testString2.begin(), testString2.end() ) );
+    /*
+    WeakCheck( testString, test_push_front<TestString>(testString) );
+    WeakCheck( testString, test_push_back<TestString>(testString) );
+    */
+    ConstCheck( 0, test_default_construct<TestString>() );
+    // requires _Reserve_t    ConstCheck( 0, test_construct_n<TestString>( random_number(random_base) ) );
+    ConstCheck( 0, test_construct_n_instance<TestString>( random_number(random_base) ) );
+    ConstCheck( 0, test_construct_iter_range<TestString>( testString2 ) );
+    ConstCheck( testString, test_copy_construct<TestString>() );
+
+    WeakCheck( testString, test_assign_op<TestString>( testString2 ) );
+}
+
+#endif // EH_ROPE_IMPLEMENTED
+
diff --git a/main/source/stlport/test/eh/test_valarray.cpp b/main/source/stlport/test/eh/test_valarray.cpp
new file mode 100644
index 00000000..7ecc26ae
--- /dev/null
+++ b/main/source/stlport/test/eh/test_valarray.cpp
@@ -0,0 +1,81 @@
+// Boris - this file is, um, rather incomplete. Please remove from distribution.
+
+/***********************************************************************************
+	test_string.cpp
+	
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+
+***********************************************************************************/
+#include "Prefix.h"
+#if defined( EH_VALARRAY_IMPLEMENTED )
+#include "Tests.h"
+#include <valarray>
+#include "TestClass.h"
+#include "LeakCheck.h"
+#include "test_construct.h"
+#include "test_assign_op.h"
+#include "test_push_back.h"
+#include "test_insert.h"
+#include "test_push_front.h"
+
+typedef __valarray__<TestClass, eh_allocator(TestClass) > TestValarray;
+
+inline sequence_container_tag
+container_category(const TestValarray&)
+{
+  return sequence_container_tag();
+}
+
+void test_rope()
+{
+    TestValarray testValarray, testValarray2;
+    size_t ropeSize = random_number(random_base);
+	
+    while ( testValarray.size() < ropeSize )
+    {
+        TestValarray::value_type x = random_number(random_base) ;	// initialize before use
+        testValarray.push_back( x );
+        testValarray2.push_back( TestValarray::value_type() );
+    }
+    WeakCheck( testValarray, test_insert_one<TestValarray>(testValarray) );
+    WeakCheck( testValarray, test_insert_one<TestValarray>(testValarray, 0) );
+    WeakCheck( testValarray, test_insert_one<TestValarray>(testValarray, testValarray.size()) );
+
+    WeakCheck( testValarray, test_insert_n<TestValarray>(testValarray, random_number(random_base) ) );
+    WeakCheck( testValarray, test_insert_n<TestValarray>(testValarray, random_number(random_base), 0 ) );
+    WeakCheck( testValarray, test_insert_n<TestValarray>(testValarray, random_number(random_base), testValarray.size() ) );
+	
+    size_t insCnt = random_number(random_base);
+    TestValarray::value_type *insFirst = new TestValarray::value_type[1+insCnt];
+
+    WeakCheck( testValarray, insert_range_tester(testValarray, insFirst, insFirst+insCnt) );
+    WeakCheck( testValarray, insert_range_at_begin_tester(testValarray, insFirst, insFirst+insCnt) );
+    WeakCheck( testValarray, insert_range_at_end_tester(testValarray, insFirst, insFirst+insCnt) );
+
+    ConstCheck( 0, test_construct_pointer_range<TestValarray>(insFirst, insFirst+insCnt) );
+    delete[] insFirst;
+
+    WeakCheck( testValarray, insert_range_tester(testValarray, testValarray2.begin(), testValarray2.end() ) );
+
+    WeakCheck( testValarray, test_push_front<TestValarray>(testValarray) );
+    WeakCheck( testValarray, test_push_back<TestValarray>(testValarray) );
+
+    ConstCheck( 0, test_default_construct<TestValarray>() );
+    ConstCheck( 0, test_construct_n<TestValarray>( random_number(random_base) ) );
+    ConstCheck( 0, test_construct_n_instance<TestValarray>( random_number(random_base) ) );
+    ConstCheck( 0, test_construct_iter_range<TestValarray>( testValarray2 ) );
+    ConstCheck( testValarray, test_copy_construct<TestValarray>() );
+
+    WeakCheck( testValarray, test_assign_op<TestValarray>( testValarray2 ) );
+}
+
+#endif // EH_ROPE_IMPLEMENTED
diff --git a/main/source/stlport/test/eh/test_vector.cpp b/main/source/stlport/test/eh/test_vector.cpp
new file mode 100644
index 00000000..4155d042
--- /dev/null
+++ b/main/source/stlport/test/eh/test_vector.cpp
@@ -0,0 +1,122 @@
+/***********************************************************************************
+	test_vector.cpp
+	
+ * Copyright (c) 1997
+ * Mark of the Unicorn, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Mark of the Unicorn makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+
+***********************************************************************************/
+#include "Tests.h"
+#include "TestClass.h"
+#include "LeakCheck.h"
+# if defined (EH_NEW_HEADERS)
+#include <vector>
+#else
+#include <vector.h>
+#endif
+#include "test_construct.h"
+#include "test_assign_op.h"
+#include "test_push_back.h"
+#include "test_insert.h"
+#include "test_push_front.h"
+
+typedef EH_STD::__vector__<TestClass, eh_allocator(TestClass) > TestVector;
+
+inline sequence_container_tag
+container_category(const TestVector&)
+{
+  return sequence_container_tag();
+}
+
+void prepare_insert_n( TestVector& c, size_t insCnt );
+
+void prepare_insert_n( TestVector& c, size_t insCnt )
+{
+    if ( random_number(2) )
+        c.reserve( c.size() + insCnt );
+}
+
+struct test_reserve
+{
+    test_reserve( size_t n ) : fAmount(n) {
+            gTestController.SetCurrentTestName("vector::reserve()");
+    }
+	
+    void operator()( TestVector& v ) const
+    {
+        v.reserve( fAmount );
+    }
+private:
+    size_t fAmount;
+};
+
+inline void prepare_insert_range( TestVector& vec, size_t, TestClass* first, TestClass* last )
+{
+    if ( random_number(2) )
+    {
+        ptrdiff_t d = 0;
+        EH_DISTANCE( first, last, d );
+        vec.reserve( vec.size() + d );
+    }
+}
+
+void test_vector()
+{
+
+    ConstCheck( 0, test_construct_n<TestVector>( random_number(random_base) ) );
+   
+    TestVector emptyVector;
+    TestVector testVector, testVector2;
+    size_t vectorSize = random_number(random_base);
+	
+    testVector.reserve(vectorSize*4);
+    while ( testVector.size() < vectorSize )
+    {
+        TestClass x;
+        testVector.push_back( x );
+        testVector2.push_back( TestClass() );
+    }
+	
+    size_t insCnt = random_number(random_base);
+    TestClass *insFirst = new TestVector::value_type[1+ insCnt];
+
+    ConstCheck( 0, test_construct_pointer_range<TestVector>(insFirst, insFirst+insCnt) );
+
+    WeakCheck( testVector, insert_range_tester(testVector, insFirst, insFirst+insCnt) );
+    WeakCheck( testVector, insert_range_at_begin_tester(testVector, insFirst, insFirst+insCnt) );
+    WeakCheck( testVector, insert_range_at_end_tester(testVector, insFirst, insFirst+insCnt) );
+    delete[] insFirst;
+
+    WeakCheck( testVector, test_insert_one<TestVector>(testVector) );
+    WeakCheck( testVector, test_insert_one<TestVector>(testVector, 0) );
+    WeakCheck( testVector, test_insert_one<TestVector>(testVector, (int)testVector.size()) );
+
+    WeakCheck( testVector, test_insert_n<TestVector>(testVector, random_number(random_base) ) );
+    WeakCheck( testVector, test_insert_n<TestVector>(testVector, random_number(random_base), 0 ) );
+    WeakCheck( testVector, test_insert_n<TestVector>(testVector, random_number(random_base), (int)testVector.size() ) );
+
+    WeakCheck( testVector, insert_range_tester(testVector, testVector2.begin(), testVector2.end() ) );
+	
+
+    StrongCheck( testVector, test_reserve( testVector.capacity() + random_number(random_base) ) );
+    StrongCheck( testVector, test_push_back<TestVector>(testVector) );
+    StrongCheck( emptyVector, test_push_back<TestVector>(emptyVector) );
+
+    ConstCheck( 0, test_default_construct<TestVector>() );
+    ConstCheck( 0, test_construct_n_instance<TestVector>( random_number(random_base) ) );
+    ConstCheck( 0, test_construct_iter_range<TestVector>( testVector2 ) );
+    ConstCheck( testVector, test_copy_construct<TestVector>() );
+
+    testVector2.resize( testVector.size() * 3 / 2 );
+    WeakCheck( testVector, test_assign_op<TestVector>( testVector2 ) );
+    testVector2.clear();
+    testVector2.resize( testVector.size() * 2 / 3 );
+    WeakCheck( testVector, test_assign_op<TestVector>( testVector2 ) );
+}
diff --git a/main/source/stlport/test/eh/vc-static.mak b/main/source/stlport/test/eh/vc-static.mak
new file mode 100644
index 00000000..5d827edd
--- /dev/null
+++ b/main/source/stlport/test/eh/vc-static.mak
@@ -0,0 +1,74 @@
+# Microsoft Developer Studio Generated NMAKE File, Format Version 4.10
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+################################################################################
+# Begin Project
+RSC=rc.exe
+CPP=cl.exe
+F90=fl32.exe
+
+OUTDIR=.
+INTDIR=.
+
+# set this directories 
+STL_INCL=../../stlport
+VC_INCL=.
+# d:/vc41/msdev/include
+
+Dep_stl = TestClass.obj main.obj nc_alloc.obj \
+random_number.obj test_algo.obj test_algobase.obj test_bit_vector.obj test_deque.obj \
+test_hash_map.obj test_hash_set.obj test_list.obj test_map.obj test_rope.obj test_set.obj \
+test_slist.obj test_vector.obj test_string.obj test_bitset.obj test_valarray.obj
+
+LINK32=link.exe
+
+# CPP_PROJ=/nologo /Gr /MDd /W3 /GX /GR /D "WIN32" /D "_CONSOLE" /I$(STL_INCL) /I. /D "_STLP_DEBUG"
+CPP_PROJ=/nologo /MT /W3 /GX /GR /D "WIN32" /D "_CONSOLE" /I$(STL_INCL) /I.
+
+# linker finds proper STLport lib automatically, only path to the
+# library is needed
+CPP_LIBS = /link /libpath:"..\..\lib"
+
+check: eh_test.exe
+#  fbp : this is to locate DLL
+	cd ..\..\lib
+	..\test\eh\eh_test.exe -s 100
+	echo done
+
+eh_test.exe : $(Dep_stl)
+	$(CC) $(CPP_PROJ) $(Dep_stl) -o eh_test.exe $(CPP_LIBS)
+
+clean :
+	-@erase "$(INTDIR)\*.obj"
+	-@erase "$(OUTDIR)\*.exe"
+	-@erase "$(OUTDIR)\*.obj"
+
+
+.exe.out:
+	$< > $@
+
+.cpp.exe:
+  $(CPP) $(CPP_PROJ) -DMAIN $< $(CPP_LIBS)
+
+.c.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cpp.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cxx.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cpp.E:
+   $(CPP) $(CPP_PROJ) -E $< >$*.E  
+
+.cpp.sbr:
+   $(CPP) $(CPP_PROJ) $<  
diff --git a/main/source/stlport/test/eh/vc.mak b/main/source/stlport/test/eh/vc.mak
new file mode 100644
index 00000000..db2c408e
--- /dev/null
+++ b/main/source/stlport/test/eh/vc.mak
@@ -0,0 +1,74 @@
+# Microsoft Developer Studio Generated NMAKE File, Format Version 4.10
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+################################################################################
+# Begin Project
+RSC=rc.exe
+CPP=cl.exe
+F90=fl32.exe
+
+OUTDIR=.
+INTDIR=.
+
+# set this directories 
+STL_INCL=../../stlport
+VC_INCL=.
+# d:/vc41/msdev/include
+
+Dep_stl = TestClass.obj main.obj nc_alloc.obj \
+random_number.obj test_algo.obj test_algobase.obj test_bit_vector.obj test_deque.obj \
+test_hash_map.obj test_hash_set.obj test_list.obj test_map.obj test_rope.obj test_set.obj \
+test_slist.obj test_vector.obj test_string.obj test_bitset.obj test_valarray.obj
+
+LINK32=link.exe
+
+# CPP_PROJ=/nologo /Gr /MDd /W3 /GX /GR /D "WIN32" /D "_CONSOLE" /I$(STL_INCL) /I. /D "_STLP_DEBUG" /D "_STLP_NO_CUSTOM_IO"
+CPP_PROJ=/nologo /MD /W3 /GX /GR /D "WIN32" /D "_CONSOLE" /I$(STL_INCL) /I.
+
+# linker finds proper STLport lib automatically, only path to the
+# library is needed
+CPP_LIBS = /link /libpath:"..\..\lib"
+
+check: eh_test.exe
+#  fbp : this is to locate DLL
+	cd ..\..\lib
+	..\test\eh\eh_test.exe -s 100
+	echo done
+
+eh_test.exe : $(Dep_stl)
+	$(CC) $(CPP_PROJ) $(Dep_stl) -o eh_test.exe $(CPP_LIBS)
+
+clean :
+	-@erase "$(INTDIR)\*.obj"
+	-@erase "$(OUTDIR)\*.exe"
+	-@erase "$(OUTDIR)\*.obj"
+
+
+.exe.out:
+	$< > $@
+
+.cpp.exe:
+  $(CPP) $(CPP_PROJ) -DMAIN $< $(CPP_LIBS)
+
+.c.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cpp.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cxx.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cpp.E:
+   $(CPP) $(CPP_PROJ) -E $< >$*.E  
+
+.cpp.sbr:
+   $(CPP) $(CPP_PROJ) $<  
diff --git a/main/source/stlport/test/eh/vc5.mak b/main/source/stlport/test/eh/vc5.mak
new file mode 100644
index 00000000..a2ed1791
--- /dev/null
+++ b/main/source/stlport/test/eh/vc5.mak
@@ -0,0 +1,74 @@
+# Microsoft Developer Studio Generated NMAKE File, Format Version 4.10
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+################################################################################
+# Begin Project
+RSC=rc.exe
+CPP=cl.exe
+F90=fl32.exe
+
+OUTDIR=.
+INTDIR=.
+
+# set this directories 
+STL_INCL=../../stlport
+VC_INCL=.
+# d:/vc41/msdev/include
+
+Dep_stl = TestClass.obj main.obj nc_alloc.obj \
+random_number.obj test_algo.obj test_algobase.obj test_bit_vector.obj test_deque.obj \
+test_hash_map.obj test_hash_set.obj test_list.obj test_map.obj test_rope.obj test_set.obj \
+test_slist.obj test_vector.obj test_string.obj test_bitset.obj test_valarray.obj
+
+LINK32=link.exe
+
+CPP_PROJ=/nologo /Gr /MTd /W3 /GX /GR /D "WIN32" /D "_CONSOLE" /I$(STL_INCL) /I. /D "_STLP_DEBUG"
+# CPP_PROJ=/nologo /MDd /W3 /GX /GR /D "WIN32" /D "_CONSOLE" /I$(STL_INCL) /I.
+
+# linker finds proper STLport lib automatically, only path to the
+# library is needed
+CPP_LIBS = /link /libpath:"..\..\lib"
+
+check: eh_test.exe
+#  fbp : this is to locate DLL
+	cd ..\..\lib
+	..\test\eh\eh_test.exe -s 100
+	echo done
+
+eh_test.exe : $(Dep_stl)
+	$(CC) $(CPP_PROJ) $(Dep_stl) -o eh_test.exe $(CPP_LIBS)
+
+clean :
+	-@erase "$(INTDIR)\*.obj"
+	-@erase "$(OUTDIR)\*.exe"
+	-@erase "$(OUTDIR)\*.obj"
+
+
+.exe.out:
+	$< > $@
+
+.cpp.exe:
+  $(CPP) $(CPP_PROJ) -DMAIN $<
+
+.c.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cpp.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cxx.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cpp.E:
+   $(CPP) $(CPP_PROJ) -E $< >$*.E  
+
+.cpp.sbr:
+   $(CPP) $(CPP_PROJ) $<  
diff --git a/main/source/stlport/test/eh/vc6.mak b/main/source/stlport/test/eh/vc6.mak
new file mode 100644
index 00000000..b144ff63
--- /dev/null
+++ b/main/source/stlport/test/eh/vc6.mak
@@ -0,0 +1,116 @@
+# Microsoft Developer Studio Generated NMAKE File, Format Version 4.10
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+################################################################################
+# Begin Project
+RSC=rc.exe
+CPP=cl.exe
+F90=fl32.exe
+LINK32=link.exe
+
+OUTDIR=.
+INTDIR=.
+
+# set this directories 
+STL_PATH=../..
+
+Dep_stl = TestClass.obj main.obj nc_alloc.obj \
+random_number.obj test_algo.obj test_algobase.obj test_bit_vector.obj test_deque.obj \
+test_hash_map.obj test_hash_set.obj test_list.obj test_map.obj test_rope.obj test_set.obj \
+test_slist.obj test_vector.obj test_string.obj test_bitset.obj test_valarray.obj
+
+# linker finds proper STLport lib automatically, only path to the library is needed
+CPP_PRJ_LINK = /link /incremental:no /LIBPATH:$(STL_PATH)/lib
+
+#disable warnings complaining about debug ...info exceeded....
+CPP_PRJ_EXTRA =
+CPP_PRJ_CMN = /nologo /W3 /GR /GX /DWIN32 /D_WINDOWS /D_CONSOLE /I$(STL_PATH)/stlport /I.
+
+#
+LIBTYPE = STATIC
+# LIBTYPE = DYNAMIC
+#
+#DEBUG = STL
+DEBUG = ON
+#DEBUG =
+# 
+IOS = SGI
+#IOS = NOSGI
+#IOS = NONE
+
+!IF "$(IOS)" == "NOSGI"
+CPP_PRJ_IOS = /D_STLP_NO_OWN_IOSTREAMS
+!ELSEIF "$(IOS)" == "NONE"
+CPP_PRJ_IOS = /D_STLP_NO_IOSTREAM
+!ELSE
+CPP_PRJ_IOS =
+!ENDIF
+
+#MT/MD etc should be LAST in CPP_PRJ_LIBTYP string!!!
+#Library selection should be BEFORE debug processing!!!
+!IF "$(LIBTYPE)" == "STATIC"
+CPP_PRJ_LIBTYP = /D_STLP_USE_STATIC_LIB /MT
+!ELSE
+CPP_PRJ_LIBTYP = /D_STLP_USE_DYNAMIC_LIB /MD
+!ENDIF
+
+!IF "$(DEBUG)" == ""
+CPP_PRJ_DBG = /DNDEBUG /O2 /Qsox-
+!ELSE
+CPP_PRJ_LIBTYP = $(CPP_PRJ_LIBTYP)d
+CPP_PRJ_DBG = /D_DEBUG /Od
+!IF "$(DEBUG)" == "STL"
+CPP_PRJ_DBG = $(CPP_PRJ_DBG) /D_STLP_DEBUG
+!ENDIF
+CPP_PRJ_CMN = $(CPP_PRJ_CMN) /Zi /Gm
+!ENDIF
+
+CPP_IGNORE_LIB = LIBCMT
+#CPP_PRJ_LINK = $(CPP_PRJ_LINK) /NODEFAULTLIB:$(CPP_IGNORE_LIB)
+CPP_PRJ_LINK = $(CPP_PRJ_LINK) /VERBOSE:LIB
+
+CPP_PROJ = $(CPP_PRJ_CMN) $(CPP_PRJ_EXTRA) $(CPP_PRJ_IOS) $(CPP_PRJ_LIBTYP) $(CPP_PRJ_DBG)
+
+check: eh_test.out
+
+eh_test.out : $(Dep_stl)
+	$(CPP) $(CPP_PROJ) $(Dep_stl) /Feeh_test.exe $(CPP_PRJ_LINK)
+#  	    fbp : this is to locate DLL
+        cd ..\..\lib
+	..\test\eh\eh_test.exe -s 100
+	echo done
+
+clean :
+	-@erase "$(INTDIR)\*.obj"
+	-@erase "$(OUTDIR)\*.exe"
+	-@erase "$(OUTDIR)\*.obj"
+
+
+.exe.out:
+	$< > $@
+
+.cpp.exe:
+  $(CPP) $(CPP_PROJ) -DMAIN $< $(CPP_PRJ_LINK)
+
+.c.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cpp.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cxx.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cpp.E:
+   $(CPP) $(CPP_PROJ) -E $< >$*.E  
+
+.cpp.sbr:
+   $(CPP) $(CPP_PROJ) $<  
diff --git a/main/source/stlport/test/regression/BccW32.cfg b/main/source/stlport/test/regression/BccW32.cfg
new file mode 100644
index 00000000..6a728deb
--- /dev/null
+++ b/main/source/stlport/test/regression/BccW32.cfg
@@ -0,0 +1,8 @@
+-w
+-R
+-v
+-vi
+-H
+-WC
+-g255
+-H-
diff --git a/main/source/stlport/test/regression/MrCpp.mak b/main/source/stlport/test/regression/MrCpp.mak
new file mode 100644
index 00000000..e7c971a2
--- /dev/null
+++ b/main/source/stlport/test/regression/MrCpp.mak
@@ -0,0 +1,335 @@
+!include "{stl}:src:MrCpp.mak"
+
+MAKEFILE     = MrCpp.mak
+
+
+Needed_SysLibs = ¶
+#		"{PPCLibraries}MrCIOStreams.o" ¶
+		"{STL}:lib:STLportLib{config_}.o" ¶
+		"{SharedLibraries}InterfaceLib" ¶
+		"{SharedLibraries}StdCLib_3.7" ¶
+		"{SharedLibraries}MathLib" ¶
+		"{PPCLibraries}StdCRuntime.o" ¶
+		"{PPCLibraries}PPCCRuntime.o" ¶
+		"{PPCLibraries}PPCToolLibs.o" ¶
+		"{PPCLibraries}MrCPlusLib.o" ¶
+		"{SharedLibraries}MrCExceptionsLib_4.1" ¶
+		# end
+
+
+##################################################################################
+#	test:regression: build rule
+##################################################################################
+Regression_Objects_PPC  = ¶
+	"{ObjDir}accum1.cpp.x" ¶
+	"{ObjDir}accum2.cpp.x" ¶
+	"{ObjDir}adjdiff0.cpp.x" ¶
+	"{ObjDir}adjdiff1.cpp.x" ¶
+	"{ObjDir}adjdiff2.cpp.x" ¶
+	"{ObjDir}adjfind0.cpp.x" ¶
+	"{ObjDir}adjfind1.cpp.x" ¶
+	"{ObjDir}adjfind2.cpp.x" ¶
+	"{ObjDir}advance.cpp.x" ¶
+	"{ObjDir}alg1.cpp.x" ¶
+	"{ObjDir}alg2.cpp.x" ¶
+	"{ObjDir}alg3.cpp.x" ¶
+	"{ObjDir}alg4.cpp.x" ¶
+	"{ObjDir}alg5.cpp.x" ¶
+	"{ObjDir}bcompos1.cpp.x" ¶
+	"{ObjDir}bcompos2.cpp.x" ¶
+	"{ObjDir}bind1st1.cpp.x" ¶
+	"{ObjDir}bind1st2.cpp.x" ¶
+	"{ObjDir}bind2nd1.cpp.x" ¶
+	"{ObjDir}bind2nd2.cpp.x" ¶
+	"{ObjDir}binsert1.cpp.x" ¶
+	"{ObjDir}binsert2.cpp.x" ¶
+	"{ObjDir}binsrch1.cpp.x" ¶
+	"{ObjDir}binsrch2.cpp.x" ¶
+	"{ObjDir}bitset1.cpp.x" ¶
+	"{ObjDir}bnegate1.cpp.x" ¶
+	"{ObjDir}bnegate2.cpp.x" ¶
+	"{ObjDir}bvec1.cpp.x" ¶
+	"{ObjDir}copy1.cpp.x" ¶
+	"{ObjDir}copy2.cpp.x" ¶
+	"{ObjDir}copy3.cpp.x" ¶
+	"{ObjDir}copy4.cpp.x" ¶
+	"{ObjDir}copyb.cpp.x" ¶
+	"{ObjDir}copyb0.cpp.x" ¶
+	"{ObjDir}count0.cpp.x" ¶
+	"{ObjDir}count1.cpp.x" ¶
+	"{ObjDir}countif1.cpp.x" ¶
+	"{ObjDir}deque1.cpp.x" ¶
+	"{ObjDir}divides.cpp.x" ¶
+	"{ObjDir}eqlrnge0.cpp.x" ¶
+	"{ObjDir}eqlrnge1.cpp.x" ¶
+	"{ObjDir}eqlrnge2.cpp.x" ¶
+	"{ObjDir}equal0.cpp.x" ¶
+	"{ObjDir}equal1.cpp.x" ¶
+	"{ObjDir}equal2.cpp.x" ¶
+	"{ObjDir}equalto.cpp.x" ¶
+	"{ObjDir}fill1.cpp.x" ¶
+	"{ObjDir}filln1.cpp.x" ¶
+	"{ObjDir}find0.cpp.x" ¶
+	"{ObjDir}find1.cpp.x" ¶
+	"{ObjDir}findif0.cpp.x" ¶
+	"{ObjDir}findif1.cpp.x" ¶
+	"{ObjDir}finsert1.cpp.x" ¶
+	"{ObjDir}finsert2.cpp.x" ¶
+	"{ObjDir}foreach0.cpp.x" ¶
+	"{ObjDir}foreach1.cpp.x" ¶
+	"{ObjDir}func1.cpp.x" ¶
+	"{ObjDir}func2.cpp.x" ¶
+	"{ObjDir}func3.cpp.x" ¶
+	"{ObjDir}gener1.cpp.x" ¶
+	"{ObjDir}gener2.cpp.x" ¶
+	"{ObjDir}genern1.cpp.x" ¶
+	"{ObjDir}genern2.cpp.x" ¶
+	"{ObjDir}greateq.cpp.x" ¶
+	"{ObjDir}greater.cpp.x" ¶
+	"{ObjDir}hmap1.cpp.x" ¶
+	"{ObjDir}hmmap1.cpp.x" ¶
+	"{ObjDir}hmset1.cpp.x" ¶
+	"{ObjDir}hset2.cpp.x" ¶
+	"{ObjDir}incl0.cpp.x" ¶
+	"{ObjDir}incl1.cpp.x" ¶
+	"{ObjDir}incl2.cpp.x" ¶
+	"{ObjDir}inplmrg1.cpp.x" ¶
+	"{ObjDir}inplmrg2.cpp.x" ¶
+	"{ObjDir}inrprod0.cpp.x" ¶
+	"{ObjDir}inrprod1.cpp.x" ¶
+	"{ObjDir}inrprod2.cpp.x" ¶
+	"{ObjDir}insert1.cpp.x" ¶
+	"{ObjDir}insert2.cpp.x" ¶
+	"{ObjDir}iota1.cpp.x" ¶
+	"{ObjDir}istmit1.cpp.x" ¶
+	"{ObjDir}iter1.cpp.x" ¶
+	"{ObjDir}iter2.cpp.x" ¶
+	"{ObjDir}iter3.cpp.x" ¶
+	"{ObjDir}iter4.cpp.x" ¶
+	"{ObjDir}iterswp0.cpp.x" ¶
+	"{ObjDir}iterswp1.cpp.x" ¶
+	"{ObjDir}less.cpp.x" ¶
+	"{ObjDir}lesseq.cpp.x" ¶
+	"{ObjDir}lexcmp1.cpp.x" ¶
+	"{ObjDir}lexcmp2.cpp.x" ¶
+	"{ObjDir}list1.cpp.x" ¶
+	"{ObjDir}list2.cpp.x" ¶
+	"{ObjDir}list3.cpp.x" ¶
+	"{ObjDir}list4.cpp.x" ¶
+	"{ObjDir}logicand.cpp.x" ¶
+	"{ObjDir}logicnot.cpp.x" ¶
+	"{ObjDir}logicor.cpp.x" ¶
+	"{ObjDir}lwrbnd1.cpp.x" ¶
+	"{ObjDir}lwrbnd2.cpp.x" ¶
+	"{ObjDir}map1.cpp.x" ¶
+	"{ObjDir}max1.cpp.x" ¶
+	"{ObjDir}max2.cpp.x" ¶
+	"{ObjDir}maxelem1.cpp.x" ¶
+	"{ObjDir}maxelem2.cpp.x" ¶
+	"{ObjDir}memfunptr.cpp.x" ¶
+	"{ObjDir}merge0.cpp.x" ¶
+	"{ObjDir}merge1.cpp.x" ¶
+	"{ObjDir}merge2.cpp.x" ¶
+	"{ObjDir}min1.cpp.x" ¶
+	"{ObjDir}min2.cpp.x" ¶
+	"{ObjDir}minelem1.cpp.x" ¶
+	"{ObjDir}minelem2.cpp.x" ¶
+	"{ObjDir}minus.cpp.x" ¶
+	"{ObjDir}mismtch0.cpp.x" ¶
+	"{ObjDir}mismtch1.cpp.x" ¶
+	"{ObjDir}mismtch2.cpp.x" ¶
+	"{ObjDir}mkheap0.cpp.x" ¶
+	"{ObjDir}mkheap1.cpp.x" ¶
+	"{ObjDir}mmap1.cpp.x" ¶
+	"{ObjDir}mmap2.cpp.x" ¶
+	"{ObjDir}modulus.cpp.x" ¶
+	"{ObjDir}mset1.cpp.x" ¶
+	"{ObjDir}mset3.cpp.x" ¶
+	"{ObjDir}mset4.cpp.x" ¶
+	"{ObjDir}mset5.cpp.x" ¶
+	"{ObjDir}negate.cpp.x" ¶
+	"{ObjDir}nequal.cpp.x" ¶
+	"{ObjDir}nextprm0.cpp.x" ¶
+	"{ObjDir}nextprm1.cpp.x" ¶
+	"{ObjDir}nextprm2.cpp.x" ¶
+	"{ObjDir}nthelem0.cpp.x" ¶
+	"{ObjDir}nthelem1.cpp.x" ¶
+	"{ObjDir}nthelem2.cpp.x" ¶
+	"{ObjDir}ostmit.cpp.x" ¶
+	"{ObjDir}pair0.cpp.x" ¶
+	"{ObjDir}pair1.cpp.x" ¶
+	"{ObjDir}pair2.cpp.x" ¶
+	"{ObjDir}parsrt0.cpp.x" ¶
+	"{ObjDir}parsrt1.cpp.x" ¶
+	"{ObjDir}parsrt2.cpp.x" ¶
+	"{ObjDir}parsrtc0.cpp.x" ¶
+	"{ObjDir}parsrtc1.cpp.x" ¶
+	"{ObjDir}parsrtc2.cpp.x" ¶
+	"{ObjDir}partsrt0.cpp.x" ¶
+	"{ObjDir}partsum0.cpp.x" ¶
+	"{ObjDir}partsum1.cpp.x" ¶
+	"{ObjDir}partsum2.cpp.x" ¶
+	"{ObjDir}pheap1.cpp.x" ¶
+	"{ObjDir}pheap2.cpp.x" ¶
+	"{ObjDir}plus.cpp.x" ¶
+	"{ObjDir}pqueue1.cpp.x" ¶
+	"{ObjDir}prevprm0.cpp.x" ¶
+	"{ObjDir}prevprm1.cpp.x" ¶
+	"{ObjDir}prevprm2.cpp.x" ¶
+	"{ObjDir}ptition0.cpp.x" ¶
+	"{ObjDir}ptition1.cpp.x" ¶
+	"{ObjDir}ptrbinf1.cpp.x" ¶
+	"{ObjDir}ptrbinf2.cpp.x" ¶
+	"{ObjDir}ptrunf1.cpp.x" ¶
+	"{ObjDir}ptrunf2.cpp.x" ¶
+	"{ObjDir}queue1.cpp.x" ¶
+	"{ObjDir}rawiter.cpp.x" ¶
+	"{ObjDir}remcopy1.cpp.x" ¶
+	"{ObjDir}remcpif1.cpp.x" ¶
+	"{ObjDir}remif1.cpp.x" ¶
+	"{ObjDir}remove1.cpp.x" ¶
+	"{ObjDir}repcpif1.cpp.x" ¶
+	"{ObjDir}replace0.cpp.x" ¶
+	"{ObjDir}replace1.cpp.x" ¶
+	"{ObjDir}replcpy1.cpp.x" ¶
+	"{ObjDir}replif1.cpp.x" ¶
+	"{ObjDir}revbit1.cpp.x" ¶
+	"{ObjDir}revbit2.cpp.x" ¶
+	"{ObjDir}revcopy1.cpp.x" ¶
+	"{ObjDir}reverse1.cpp.x" ¶
+	"{ObjDir}reviter1.cpp.x" ¶
+	"{ObjDir}reviter2.cpp.x" ¶
+	"{ObjDir}rndshuf0.cpp.x" ¶
+	"{ObjDir}rndshuf1.cpp.x" ¶
+	"{ObjDir}rndshuf2.cpp.x" ¶
+	"{ObjDir}rotate0.cpp.x" ¶
+	"{ObjDir}rotate1.cpp.x" ¶
+	"{ObjDir}rotcopy0.cpp.x" ¶
+	"{ObjDir}rotcopy1.cpp.x" ¶
+	"{ObjDir}search0.cpp.x" ¶
+	"{ObjDir}search1.cpp.x" ¶
+	"{ObjDir}search2.cpp.x" ¶
+	"{ObjDir}set1.cpp.x" ¶
+	"{ObjDir}set2.cpp.x" ¶
+	"{ObjDir}setdiff0.cpp.x" ¶
+	"{ObjDir}setdiff1.cpp.x" ¶
+	"{ObjDir}setdiff2.cpp.x" ¶
+	"{ObjDir}setintr0.cpp.x" ¶
+	"{ObjDir}setintr1.cpp.x" ¶
+	"{ObjDir}setintr2.cpp.x" ¶
+	"{ObjDir}setsymd0.cpp.x" ¶
+	"{ObjDir}setsymd1.cpp.x" ¶
+	"{ObjDir}setsymd2.cpp.x" ¶
+	"{ObjDir}setunon0.cpp.x" ¶
+	"{ObjDir}setunon1.cpp.x" ¶
+	"{ObjDir}setunon2.cpp.x" ¶
+#	"{ObjDir}single.cpp.x" ¶
+	"{ObjDir}slist1.cpp.x" ¶
+	"{ObjDir}sort1.cpp.x" ¶
+	"{ObjDir}sort2.cpp.x" ¶
+	"{ObjDir}stack1.cpp.x" ¶
+	"{ObjDir}stack2.cpp.x" ¶
+#	"{ObjDir}stat.cpp.x" ¶
+	"{ObjDir}stblptn0.cpp.x" ¶
+	"{ObjDir}stblptn1.cpp.x" ¶
+	"{ObjDir}stblsrt1.cpp.x" ¶
+	"{ObjDir}stblsrt2.cpp.x" ¶
+#	"{ObjDir}stl_single.cpp.x" ¶
+	"{ObjDir}stl_test.cpp.x" ¶
+	"{ObjDir}string1.cpp.x" ¶
+	"{ObjDir}swap1.cpp.x" ¶
+	"{ObjDir}swprnge1.cpp.x" ¶
+	"{ObjDir}times.cpp.x" ¶
+	"{ObjDir}trnsfrm1.cpp.x" ¶
+	"{ObjDir}trnsfrm2.cpp.x" ¶
+	"{ObjDir}ucompos1.cpp.x" ¶
+	"{ObjDir}ucompos2.cpp.x" ¶
+	"{ObjDir}unegate1.cpp.x" ¶
+	"{ObjDir}unegate2.cpp.x" ¶
+	"{ObjDir}uniqcpy1.cpp.x" ¶
+	"{ObjDir}uniqcpy2.cpp.x" ¶
+	"{ObjDir}unique1.cpp.x" ¶
+	"{ObjDir}unique2.cpp.x" ¶
+	"{ObjDir}uprbnd1.cpp.x" ¶
+	"{ObjDir}uprbnd2.cpp.x" ¶
+	"{ObjDir}vec1.cpp.x" ¶
+	"{ObjDir}vec2.cpp.x" ¶
+	"{ObjDir}vec3.cpp.x" ¶
+	"{ObjDir}vec4.cpp.x" ¶
+	"{ObjDir}vec5.cpp.x" ¶
+	"{ObjDir}vec6.cpp.x" ¶
+	"{ObjDir}vec7.cpp.x" ¶
+	"{ObjDir}vec8.cpp.x" ¶
+	# end
+
+Regression_test ÄÄ setup
+Regression_test ÄÄ "{ObjDir}"Regression_test.PPC
+	echo "¶n'{ObjDir}Regression_test.PPC' < '{stl}:test:regression:stdin' # execute it"
+
+"{ObjDir}"Regression_test.PPC ÄÄ {¥MondoBuild¥} {Regression_Objects_PPC} {Needed_SysLibs}
+	###########
+	if "{compile_status}"
+		echo "### LINK NOT PERFORMED DUE TO COMPILE ERROR"
+		exit "{compile_status}"
+	end
+	echo "¶nLinking:        {Targ}"
+	if "`exists {Targ}`" 
+		delete {Targ}		#*TY 01/14/1999 - it is faster to generate executable from the ground up than modifying the existing ones.
+	end
+	PPCLink ¶
+		-t 'MPST' ¶
+		-o {Targ} ¶
+		{Regression_Objects_PPC} ¶
+		{Needed_SysLibs} ¶
+		{Link_options} ¶
+		# end
+
+
+
+##################################################################################
+#	test:eh: build rule
+##################################################################################
+eh_Objects_PPC  = ¶
+	"{ObjDir}main.cpp.x" ¶
+	"{ObjDir}nc_alloc.cpp.x" ¶
+	"{ObjDir}random_number.cpp.x" ¶
+	"{ObjDir}test_algo.cpp.x" ¶
+	"{ObjDir}test_algobase.cpp.x" ¶
+	"{ObjDir}test_bit_vector.cpp.x" ¶
+	"{ObjDir}test_bitset.cpp.x" ¶
+	"{ObjDir}test_deque.cpp.x" ¶
+	"{ObjDir}test_hash_map.cpp.x" ¶
+	"{ObjDir}test_hash_set.cpp.x" ¶
+	"{ObjDir}test_list.cpp.x" ¶
+	"{ObjDir}test_map.cpp.x" ¶
+	"{ObjDir}test_rope.cpp.x" ¶
+	"{ObjDir}test_set.cpp.x" ¶
+	"{ObjDir}test_slist.cpp.x" ¶
+	"{ObjDir}test_string.cpp.x" ¶
+	"{ObjDir}test_valarray.cpp.x" ¶
+	"{ObjDir}test_vector.cpp.x" ¶
+	"{ObjDir}TestClass.cpp.x" ¶
+	#end
+
+EH_test ÄÄ setup
+EH_test ÄÄ "{ObjDir}"EH_test.PPC
+	echo "¶n'{ObjDir}EH_test.PPC' # execute it"
+
+"{ObjDir}"EH_test.PPC ÄÄ "{stl}:test:regression:{¥MondoBuild¥}" {eh_Objects_PPC} {Needed_SysLibs}
+	###########
+	if "{compile_status}"
+		echo "### LINK NOT PERFORMED DUE TO COMPILE TIME ERROR"
+		exit "{compile_status}"
+	end
+	echo "¶nLinking:        {Targ}"
+	if "`exists {Targ}`" 
+		delete {Targ}
+	end
+	PPCLink ¶
+		-t 'MPST' ¶
+		-o {Targ} ¶
+		{eh_Objects_PPC} ¶
+		{Link_options} ¶
+		{Needed_SysLibs} ¶
+		# end
+
diff --git a/main/source/stlport/test/regression/README.txt b/main/source/stlport/test/regression/README.txt
new file mode 100644
index 00000000..8c46ed26
--- /dev/null
+++ b/main/source/stlport/test/regression/README.txt
@@ -0,0 +1,65 @@
+Test suite for SGI STL implementation
+
+Boris P. Fomitchev <fbp@metabyte.com>
+
+Last updated : Nov 14, 1997
+
+----------------------------------------------------------------------------
+
+Preface
+
+One of the problems one is faced when deciding whether using STL or not is
+the question of portability and reliability. It's not a rare case when
+compiler begins to crash when template constructs get too complex. While
+it's not possible to predict such effects on arbitrary code, it is often
+useful to test basic STL compatibility of the compiler. That's what this
+testsuite is for. It don't use too complex construct with STL items. But it
+do instantiate about every item to see if it works properly.
+
+----------------------------------------------------------------------------
+
+Genesis
+
+This testsuite is derived from Cygnus Solutions STL testsuite, which is
+based on ObjectSpace STL examples. The changes that have been made mostly
+involve restructuring. You can run a single short test for particular STL
+construct , or try to compile them all and link to single executable. You
+may also test if your compiler can handle extremely long source files by
+compiling a single source including all others.
+
+----------------------------------------------------------------------------
+
+Platforms
+
+Makefiles for gcc, SUNPro, Borland, Visual C++ compilers are provided with
+the suite. Look for .mak files in the distribution. It should be not
+difficult to adjust one of them to your compiler.
+
+----------------------------------------------------------------------------
+
+Trying it out
+
+After unpacking, edit appropriate makefile to fit your compiler and include
+directories . After you've done, try "make check". This target is output
+(stl_test.out) of single executable containing all the tests. Compare it
+with stl_test.exp output (or stl_test.rand.exp, see below). 
+There should be no differences. If some test fails
+to compile, you may try "make test_name.out" to produce single test
+executable and run it.
+
+----------------------------------------------------------------------------
+
+Expected differences
+
+As many tests use pseudo-random generators, you may get differences
+in test output. 
+Basically, there are 2 random generator scemes used :
+via rand() function : expected result in stl_test.rand.exp
+via lrand48() function : expected result in stl_test.exp.
+
+System-dependent notices:
+ If you are using STLport on OS390 machine, you should compare with stl_test.ibm390.exp.
+
+ Linux libc uses different random generator which doesn't match any of the above. Be prepared.
+ 
+map1_test : some compilers don't zero-initialize data when builtin-type default constructor called, thus you may see some garbage instead of 0 in the output. 
diff --git a/main/source/stlport/test/regression/ReadMe.MPW b/main/source/stlport/test/regression/ReadMe.MPW
new file mode 100644
index 00000000..e4f6284e
--- /dev/null
+++ b/main/source/stlport/test/regression/ReadMe.MPW
@@ -0,0 +1,356 @@
+#	MPW adaptation of STLport
+#	
+#	written by Tsutomu Yoshida, Minokamo, Japan. Aug/14/1998
+#	#*TY 05/23/1999 - updated for STLport-3.2
+#	#*TY 08/03/1999 - updated for STLport-3.2.1
+# 	#*TY 05/21/2000 - updated for STLport-4.0
+#	#*TY 05/13/2001 - updated for STLport-4.1
+#	
+#	this document describes the detailed instructions for building and running the STL testsuite (regression and eh) 
+#	as the mpw tools, as well as building STLportLib which provides the standard conforming iostream.
+
+
+#	*** IMPORTANT NOTES ON ENVIRONMENT CONFIGURATION
+#
+#	¥ STLport under MPW expects CIncludes folder (or alias of it) be presented at the same level as "stlport" folder.
+#	¥ C++ Compilers should be given the chance to search include files in "stlport" folder before searching in "CIncludes" folder.
+#	¥ If you use old style STL header (i.e., map.h, etc.), "stoport:old_hp" folder also has to be added in the include 
+#		search paths (old style headers are not verified to work. use them on your own risk).
+#	¥ This version of STLport uses <exception> header supplied with the package. <exception> supplied elsewhere is not used, 
+#		unlike the earlier version of STLport.
+#	¥ You may have to increase the stack size of MPW shell since MrCpp's backend uses a lot of stack space for code optimization. 
+#		Use a shell command shown below.
+	SetShellSize -s 1280k # relaunch of MPW shell required to take effect
+
+
+#	*** how to setup STL under MPW environment:
+#	===============================================================================================================
+#	(1) run the MPW script shown below to setup the shell variable {STL} to point to the STLport
+#	directory. to run this script, open this file (ReadMe.MPW) under MPW and select the script block below
+#	and then press "enter' key (not the 'return' key).
+#
+#	Note: 	this setup script will install a startup script named "!STL_Folder_SetUp" 
+#			under "{ShellDirectory}Startup Items:" directory.
+#	
+#(# INSTALL (1)
+begin
+	unset STL # to unconditionally re-setup STL variable
+	if !"{STL}"
+		Set exit 0
+		Set temp "{Boot}"
+		unset STL
+		if "{active}" =~ /(Å)¨1:Å/
+			directory "{¨1}:"
+			set temp "{¨1}:::"
+			(Set temp `ResolveAlias "{temp}stlport:"`)·dev:null
+		end
+		Loop
+			If  !"`Exists "{temp}stl:_config.h"`"
+				Alert "The folder you have chosen, ¶'{temp}¶', does not appear to be the correct STL folder."¶
+				"¶nPlease choose the main STLport folder (the folder which contains stl_config.h)."
+			Else
+				Break
+			End
+			Set temp "`(GetFileName "{temp}" -q -d -m "Where is your ¶"STLport¶" folder?")³dev:null`"
+			exit if !"{temp}"
+		End
+		Set -e STL "{temp}"
+		set STL > "{ShellDirectory}Startup Items:!STL_Folder_SetUp" # save the {STL} setting so that you do not have to run this script every time mpw is booted.
+		unset temp
+		Set exit 1
+	else
+		alert "the path to ¶"¶{STL¶}¶" has been set up as: ¶n'{STL}' .¶nMake sure this is up to date."
+	end
+end ·· "{worksheet}"
+#)#
+
+#	===============================================================================================================
+#	(2) make alias for the CIncludes folder at the same level as 'stlport' folder.
+#
+#(# INSTALL (2)
+begin
+	SendAE -e "FNDRsali" -t "Finder" -----alis "{CIncludes}:CIncludes" ·dev:null 	# create the alias
+	set alias_ `exists -a "{CIncludes}:"ÅCIncludesÅ` 								# get the exact name for the alias
+	duplicate -y "{alias_}" "{STL}:CIncludes" 										# copy it into the destination
+	delete -ay "{alias_}" 															# clean up
+end ·· "{worksheet}"
+#)#
+
+
+#	===============================================================================================================
+#	(3) OPTIONAL: change the creator of files to MPW, colorize them to Blue and set the default font information
+#
+#		WARNING: THIS STEP IS QUITE TIME CONSUMING
+#
+#(# INSTALL (3) OPTIONAL
+begin
+	set -e exit 0
+	if !"{Font}";set -e Font "Monaco";end
+	if !"{FontSize}";set -e FontSize 9;end
+	set self_ "{active}"
+	for f_ in	`exists -f ¶
+				"{stl}"[Â.]+ "{stl}"Å.[hc]Å ¶
+				"{stl}config:"Å.[hc]Å ¶
+				"{stl}old_hp:"Å.[hc]Å ¶
+				"{stl}stl:"[Â.]+ "{stl}stl:"Å.[hc]Å ¶
+				"{stl}stl:debug:"Å.[hc]Å ¶
+				"{stl}stl:wrappers:"Å.[hc]Å ¶
+				"{stl}wrap_std:"Å[Â.]+ ¶
+				"{stl}wrap_std:h:"Å.[hc]Å ¶
+				"{stl}using:"[Â.]+ ¶
+				"{stl}using:h:"Å.[hc]Å ¶
+				"{stl}:src:"Å.[hc]Å ¶
+				"{stl}:test:regression:"Å.[hc]Å ¶
+				"{stl}:test:eh:"Å.[hc]Å ¶
+				`
+		SetFile -a l "{f_}"
+		Open -h -r "{f_}"
+		Format -l 'C/C++/Objective-C'  -f "{Font}" -s "{FontSize}" "{f_}" 
+		Close "{f_}"
+		SetFile -c 'MPS ' -label 3 -a L "{f_}"
+	end
+	for f_ in	`exists -f ¶
+				"{stl}:src:"Å.mak ¶
+				"{stl}:test:regression:"Å.mak ¶
+				"{stl}:test:eh:"Å.mak ¶
+				`
+		SetFile -a l "{f_}"
+		Open -h -r "{f_}"
+		Format -l 'MPW Shell Script' -f "{Font}" -s "{FontSize}" "{f_}"
+		Close "{f_}"
+		SetFile -c 'MPS ' -label 4 -a L "{f_}" # blue color
+	end
+	open "{self_}"
+	SetFile -a l "{self_}"
+	Format -l 'MPW Shell Script' -f "{Font}" -s "{FontSize}" "{self_}"
+	SetFile -c 'MPS ' -label 6  "{self_}" # sky color
+	set -e exit 1
+end ·· "{worksheet}"
+#)#
+
+
+#	===============================================================================================================
+#	(4) build and install PPC version of STLportLib into "{stl}:lib:" folder. Both debugging and non-debugging versions will be built.
+#
+#	target compiler: apple's mpw MrCpp 5.0.0 or better
+#	
+#(# INSTALL (4) PPC STLportLib
+begin
+	set -e MrCpp `which MrCpp`	# ver.5.0.0 or better is required
+	save -a						# save all files (optional)
+	directory "{stl}:src:"		# setup the working directory
+	target "{worksheet}"
+	echo -n "¶n####### START BUILDING PPC VERSION OF STLportLib LIBRARY ####### "; date -s
+	unset fullbuild
+#	set -e fullbuild "-e"			# uncomment this line to force full build
+
+	for debug_build in '-d DEBUG' ''
+		make {fullbuild} {debug_build} install -f "{stl}:src:MrCpp.mak" > MrCpp.MakeIt; execute MrCpp.MakeIt
+	end
+	echo "Finished building STLportLib (PPC)¶n"
+end ·· "{worksheet}"
+#)#
+
+
+#	===============================================================================================================
+#	(5) build and install 68K version of STLportLib into "{stl}:lib:" folder. Both debugging and non-debugging versions will be built.
+#
+#	target compiler: apple's mpw SCpp 8.9.0 or better
+#	
+#(# INSTALL (5) 68K STLportLib
+begin
+	set -e SCpp `which SCpp`	# ver.8.9.0 or better is required
+	save -a						# save all files (optional)
+	directory "{stl}:src:"		# setup the working directory
+	target "{worksheet}"
+	echo -n "¶n####### START BUILDING 68K VERSION OF STLportLib LIBRARY ####### "; date -s
+	unset fullbuild
+#	set -e fullbuild "-e"			# uncomment this line to force full build
+
+	set -e other_SCpp_Options "-seg STLPortLib"
+	
+	for debug_build in '-d DEBUG' ''
+		make {fullbuild} {debug_build} install -f "{stl}:src:SCpp.mak" > SCpp.MakeIt; execute SCpp.MakeIt
+	end
+	unset other_SCpp_Options
+	echo "Finished building STLportLib (68K)¶n"
+end ·· "{worksheet}"
+#)#
+
+
+
+
+
+#	*** how to try out the regression testsuite (PPC version):
+#	===============================================================================================================
+#	target compiler: apple's mpw MrCpp 5.0.0
+#	
+#	(1) run the shell script listed below to compile and link the PPC version of testsuite as the mpw
+#	tool by selecting it and press enter.
+#
+#(# PPC (1) Regression Build
+begin
+	set -e MrCpp `which MrCpp` # ver.5.0.0 or better is required
+	save -a					# save all files (optional)
+	directory "{stl}:test:regression:"		# setup the working directory
+	target "{worksheet}"
+	echo -n "¶n####### START BUILDING PPC VERSION OF STL REGRESSION TEST SUITE ####### "; date -s
+	unset other_STL_Options
+	unset other_MrCpp_Options
+	unset fullbuild
+#	set -e fullbuild "-e"			# uncomment this line to force full build
+	unset debug_build
+	set -e debug_build '-d DEBUG'	# uncomment this line to build non-debug version
+	make -w {fullbuild} {debug_build} Regression_test -f "{stl}:test:regression:MrCpp.mak" > MrCpp.MakeIt
+	set -e exit 0
+	execute MrCpp.MakeIt
+	set -e exit 1
+end ·· "{worksheet}"
+#)#
+
+
+#	(2) run the shell script listed below to execute the PPC version of testsuite mpw tool and
+#	compare the output with the standard "stl_test.exp" output.
+#
+#(# PPC (2)
+	set proj "{stl}:test:regression:"
+	set obj "{proj}.PPC.DBG:"
+	set Regression_test.PPC.output "{obj}"MrCpp.exp		# output to separate file
+	#set Regression_test.PPC.output "dev:stdout"	# output to {worksheet}
+	directory "{proj}"
+	target "{worksheet}"
+	begin
+		echo 'a string' > "{proj}"stdin # prepare input
+		echo "###### START:    Regression_test.PPC"
+		"{obj}"Regression_test.PPC < "{proj}"stdin > "{Regression_test.PPC.output}"	# run
+		echo "###### FINISHED: Regression_test.PPC"
+	end ·· "{worksheet}"
+	if "{Regression_test.PPC.output}" != "dev:stdout"
+		set exit 0
+		comparefiles "{Regression_test.PPC.output}" "{proj}"stl_test.exp # compare output file
+		set exit 1
+	end ·· "{worksheet}"
+#)#
+
+
+#	*** how to try out the EH testsuite (PPC version):
+#	===============================================================================================================
+#	target compiler: apple's mpw MrCpp 5.0.0
+#	
+#	(3) run the shell script listed below to compile and link the PPC version of testsuite as the mpw
+#	tool by selecting it and press enter.
+#
+#	Note: MrCpp and SCpp still can not pass all eh tests. You will get failed assertion when run the test.
+#
+#(# PPC (3)
+begin
+	set -e MrCpp `which MrCpp` # ver.5.0.0 or better is required
+	save -a					# save all files (optional)
+	directory "{stl}:test:eh:"		# setup the working directory
+	target "{worksheet}"
+	echo -n "¶n####### START BUILDING PPC VERSION OF STL EH TEST SUITE ####### "; date -s
+	unset other_STL_Options
+	unset other_MrCpp_Options
+	unset fullbuild
+#	set -e fullbuild "-e"			# uncomment this line to force full build
+	unset debug_build
+#	set -e debug_build '-d DEBUG'	# debug flavor can not pass the eh test yet.
+	make -w {fullbuild} {debug_build} EH_test -f "{stl}:test:regression:MrCpp.mak" > MrCpp.MakeIt
+	set -e exit 0
+	execute MrCpp.MakeIt
+	set -e exit 1
+end ·· "{worksheet}"
+#)#
+
+
+
+
+
+#	*** how to try out the testsuite (68K version):
+#	===============================================================================================================
+#	target compiler: apple's mpw SCpp 8.9.0
+#
+#	(1) run the shell script listed below to compile and link the 68K version of testsuite as the mpw
+#	tool by selecting it and press enter.
+#
+#(# 68K (1)
+begin
+	set SCpp `which SCpp` # ver.8.9.0 or better is required
+	save -a					# save all files (optional)
+	directory "{stl}:test:regression:"		# setup the working directory
+	target "{worksheet}"
+	echo -n "¶n####### START BUILDING 68K VERSION OF STL REGRESSION TEST SUITE ####### "; date -s
+	unset other_STL_Options
+	unset other_SCpp_Options
+	unset fullbuild
+#		set fullbuild "-e"	# uncomment this line to force full build
+	unset debug_build
+	set -e debug_build '-d DEBUG'	# uncomment this line to build non-debug version
+	set -e other_SCpp_Options "-model far"
+	make -w {fullbuild}  {debug_build} Regression_test -f "{stl}:test:regression:SCpp.mak" > SCpp.MakeIt
+	set -e exit 0
+	execute SCpp.MakeIt
+	set -e exit 1
+	unset other_SCpp_Options
+end ·· "{worksheet}"
+#)#
+
+
+#	(2) run the shell script listed below to execute the 68K version of testsuite mpw tool and
+#	compare the output with the standard "stl_test.exp" output.
+#
+#(# 68K (2)
+	set -e proj "{stl}:test:regression:"
+	set -e obj "{proj}.68K.DBG:"
+	set Regression_test.68K.output "{obj}"SCpp.exp		# output to separate file
+	#set Regression_test.68K.output "dev:stdout"	# output to {worksheet}
+	if "{active}" =~ /(Å)¨1:Å/
+		directory "{¨1}:"	# setup the working directory
+	end
+	target "{worksheet}"
+	begin
+		echo 'a string' > "{proj}"stdin # prepare input
+		echo "###### START:    Regression_test.68K"
+		"{obj}"Regression_test.68K < "{proj}"stdin > "{Regression_test.68K.output}"	# run
+		echo "###### FINISHED: Regression_test.68K"
+	end ·· "{worksheet}"
+	if "{Regression_test.68K.output}" != "dev:stdout"
+		set exit 0
+		comparefiles "{Regression_test.68K.output}" "{proj}"stl_test.exp # compare output file
+		set exit 1
+	end ·· "{worksheet}"
+#)#
+
+
+#	*** how to try out the eh testsuite (68K version):
+#	===============================================================================================================
+#	target compiler: apple's mpw SCpp 8.9.0
+#
+#	(1) run the shell script listed below to compile and link the 68K version of testsuite as the mpw
+#	tool by selecting it and press enter. 
+#
+#	Note: MrCpp and SCpp still can not pass all eh tests. You will get failed assertion when run the test.
+#
+#(# 68K (1)
+begin
+	set SCpp `which SCpp` # ver.8.9.0 or better is required
+	save -a					# save all files (optional)
+	directory "{stl}:test:eh:"		# setup the working directory
+	target "{worksheet}"
+	echo -n "¶n####### START BUILDING 68K VERSION OF STL EH TEST SUITE ####### "; date -s
+	unset other_STL_Options
+	unset other_SCpp_Options
+	unset fullbuild
+#		set fullbuild "-e"	# uncomment this line to force full build
+	unset debug_build
+	set -e debug_build '-d DEBUG'
+	set -e other_SCpp_Options "-model far"
+	make -w {fullbuild} {debug_build} EH_test -f "{stl}:test:regression:SCpp.mak" > SCpp.MakeIt
+	set -e exit 0
+	execute SCpp.MakeIt 
+	set -e exit 1
+end ·· "{worksheet}"
+#)#
+
+
+# - end of ReadMe.MPW
diff --git a/main/source/stlport/test/regression/SCpp.mak b/main/source/stlport/test/regression/SCpp.mak
new file mode 100644
index 00000000..c6843fb3
--- /dev/null
+++ b/main/source/stlport/test/regression/SCpp.mak
@@ -0,0 +1,666 @@
+!include "{stl}:src:SCpp.mak"
+
+MAKEFILE     = SCpp.mak
+
+
+Needed_SysLibs = ¶
+#		"{CLibraries}IOStreams.o" ¶
+		"{STL}:lib:STLportLib{config_}.o" ¶
+		"{Libraries}Stubs.o" ¶
+		"{Libraries}MathLib.o" ¶
+		"{CLibraries}CPlusLib.o" ¶
+		"{CLibraries}StdCLib.o" ¶
+		"{Libraries}MacRuntime.o" ¶
+		"{Libraries}IntEnv.o" ¶
+		#"{Libraries}ToolLibs.o" ¶
+		"{Libraries}Interface.o" ¶
+		# end
+
+
+##################################################################################
+#	test:regression: build rule
+##################################################################################
+Regression_Objects_68K  = ¶
+	"{ObjDir}accum1.cpp.o" ¶
+	"{ObjDir}accum2.cpp.o" ¶
+	"{ObjDir}adjdiff0.cpp.o" ¶
+	"{ObjDir}adjdiff1.cpp.o" ¶
+	"{ObjDir}adjdiff2.cpp.o" ¶
+	"{ObjDir}adjfind0.cpp.o" ¶
+	"{ObjDir}adjfind1.cpp.o" ¶
+	"{ObjDir}adjfind2.cpp.o" ¶
+	"{ObjDir}advance.cpp.o" ¶
+	"{ObjDir}alg1.cpp.o" ¶
+	"{ObjDir}alg2.cpp.o" ¶
+	"{ObjDir}alg3.cpp.o" ¶
+	"{ObjDir}alg4.cpp.o" ¶
+	"{ObjDir}alg5.cpp.o" ¶
+	"{ObjDir}bcompos1.cpp.o" ¶
+	"{ObjDir}bcompos2.cpp.o" ¶
+	"{ObjDir}bind1st1.cpp.o" ¶
+	"{ObjDir}bind1st2.cpp.o" ¶
+	"{ObjDir}bind2nd1.cpp.o" ¶
+	"{ObjDir}bind2nd2.cpp.o" ¶
+	"{ObjDir}binsert1.cpp.o" ¶
+	"{ObjDir}binsert2.cpp.o" ¶
+	"{ObjDir}binsrch1.cpp.o" ¶
+	"{ObjDir}binsrch2.cpp.o" ¶
+	"{ObjDir}bitset1.cpp.o" ¶
+	"{ObjDir}bnegate1.cpp.o" ¶
+	"{ObjDir}bnegate2.cpp.o" ¶
+	"{ObjDir}bvec1.cpp.o" ¶
+	"{ObjDir}copy1.cpp.o" ¶
+	"{ObjDir}copy2.cpp.o" ¶
+	"{ObjDir}copy3.cpp.o" ¶
+	"{ObjDir}copy4.cpp.o" ¶
+	"{ObjDir}copyb.cpp.o" ¶
+	"{ObjDir}copyb0.cpp.o" ¶
+	"{ObjDir}count0.cpp.o" ¶
+	"{ObjDir}count1.cpp.o" ¶
+	"{ObjDir}countif1.cpp.o" ¶
+	"{ObjDir}deque1.cpp.o" ¶
+	"{ObjDir}divides.cpp.o" ¶
+	"{ObjDir}eqlrnge0.cpp.o" ¶
+	"{ObjDir}eqlrnge1.cpp.o" ¶
+	"{ObjDir}eqlrnge2.cpp.o" ¶
+	"{ObjDir}equal0.cpp.o" ¶
+	"{ObjDir}equal1.cpp.o" ¶
+	"{ObjDir}equal2.cpp.o" ¶
+	"{ObjDir}equalto.cpp.o" ¶
+	"{ObjDir}fill1.cpp.o" ¶
+	"{ObjDir}filln1.cpp.o" ¶
+	"{ObjDir}find0.cpp.o" ¶
+	"{ObjDir}find1.cpp.o" ¶
+	"{ObjDir}findif0.cpp.o" ¶
+	"{ObjDir}findif1.cpp.o" ¶
+	"{ObjDir}finsert1.cpp.o" ¶
+	"{ObjDir}finsert2.cpp.o" ¶
+	"{ObjDir}foreach0.cpp.o" ¶
+	"{ObjDir}foreach1.cpp.o" ¶
+	"{ObjDir}func1.cpp.o" ¶
+	"{ObjDir}func2.cpp.o" ¶
+	"{ObjDir}func3.cpp.o" ¶
+	"{ObjDir}gener1.cpp.o" ¶
+	"{ObjDir}gener2.cpp.o" ¶
+	"{ObjDir}genern1.cpp.o" ¶
+	"{ObjDir}genern2.cpp.o" ¶
+	"{ObjDir}greateq.cpp.o" ¶
+	"{ObjDir}greater.cpp.o" ¶
+	"{ObjDir}hmap1.cpp.o" ¶
+	"{ObjDir}hmmap1.cpp.o" ¶
+	"{ObjDir}hmset1.cpp.o" ¶
+	"{ObjDir}hset2.cpp.o" ¶
+	"{ObjDir}incl0.cpp.o" ¶
+	"{ObjDir}incl1.cpp.o" ¶
+	"{ObjDir}incl2.cpp.o" ¶
+	"{ObjDir}inplmrg1.cpp.o" ¶
+	"{ObjDir}inplmrg2.cpp.o" ¶
+	"{ObjDir}inrprod0.cpp.o" ¶
+	"{ObjDir}inrprod1.cpp.o" ¶
+	"{ObjDir}inrprod2.cpp.o" ¶
+	"{ObjDir}insert1.cpp.o" ¶
+	"{ObjDir}insert2.cpp.o" ¶
+	"{ObjDir}iota1.cpp.o" ¶
+	"{ObjDir}istmit1.cpp.o" ¶
+	"{ObjDir}iter1.cpp.o" ¶
+	"{ObjDir}iter2.cpp.o" ¶
+	"{ObjDir}iter3.cpp.o" ¶
+	"{ObjDir}iter4.cpp.o" ¶
+	"{ObjDir}iterswp0.cpp.o" ¶
+	"{ObjDir}iterswp1.cpp.o" ¶
+	"{ObjDir}less.cpp.o" ¶
+	"{ObjDir}lesseq.cpp.o" ¶
+	"{ObjDir}lexcmp1.cpp.o" ¶
+	"{ObjDir}lexcmp2.cpp.o" ¶
+	"{ObjDir}list1.cpp.o" ¶
+	"{ObjDir}list2.cpp.o" ¶
+	"{ObjDir}list3.cpp.o" ¶
+	"{ObjDir}list4.cpp.o" ¶
+	"{ObjDir}logicand.cpp.o" ¶
+	"{ObjDir}logicnot.cpp.o" ¶
+	"{ObjDir}logicor.cpp.o" ¶
+	"{ObjDir}lwrbnd1.cpp.o" ¶
+	"{ObjDir}lwrbnd2.cpp.o" ¶
+	"{ObjDir}map1.cpp.o" ¶
+	"{ObjDir}max1.cpp.o" ¶
+	"{ObjDir}max2.cpp.o" ¶
+	"{ObjDir}maxelem1.cpp.o" ¶
+	"{ObjDir}maxelem2.cpp.o" ¶
+	"{ObjDir}merge0.cpp.o" ¶
+	"{ObjDir}merge1.cpp.o" ¶
+	"{ObjDir}merge2.cpp.o" ¶
+	"{ObjDir}min1.cpp.o" ¶
+	"{ObjDir}min2.cpp.o" ¶
+	"{ObjDir}minelem1.cpp.o" ¶
+	"{ObjDir}minelem2.cpp.o" ¶
+	"{ObjDir}minus.cpp.o" ¶
+	"{ObjDir}mismtch0.cpp.o" ¶
+	"{ObjDir}mismtch1.cpp.o" ¶
+	"{ObjDir}mismtch2.cpp.o" ¶
+	"{ObjDir}mkheap0.cpp.o" ¶
+	"{ObjDir}mkheap1.cpp.o" ¶
+	"{ObjDir}mmap1.cpp.o" ¶
+	"{ObjDir}mmap2.cpp.o" ¶
+	"{ObjDir}modulus.cpp.o" ¶
+	"{ObjDir}mset1.cpp.o" ¶
+	"{ObjDir}mset3.cpp.o" ¶
+	"{ObjDir}mset4.cpp.o" ¶
+	"{ObjDir}mset5.cpp.o" ¶
+	"{ObjDir}negate.cpp.o" ¶
+	"{ObjDir}nequal.cpp.o" ¶
+	"{ObjDir}nextprm0.cpp.o" ¶
+	"{ObjDir}nextprm1.cpp.o" ¶
+	"{ObjDir}nextprm2.cpp.o" ¶
+	"{ObjDir}nthelem0.cpp.o" ¶
+	"{ObjDir}nthelem1.cpp.o" ¶
+	"{ObjDir}nthelem2.cpp.o" ¶
+	"{ObjDir}ostmit.cpp.o" ¶
+	"{ObjDir}pair0.cpp.o" ¶
+	"{ObjDir}pair1.cpp.o" ¶
+	"{ObjDir}pair2.cpp.o" ¶
+	"{ObjDir}parsrt0.cpp.o" ¶
+	"{ObjDir}parsrt1.cpp.o" ¶
+	"{ObjDir}parsrt2.cpp.o" ¶
+	"{ObjDir}parsrtc0.cpp.o" ¶
+	"{ObjDir}parsrtc1.cpp.o" ¶
+	"{ObjDir}parsrtc2.cpp.o" ¶
+	"{ObjDir}partsrt0.cpp.o" ¶
+	"{ObjDir}partsum0.cpp.o" ¶
+	"{ObjDir}partsum1.cpp.o" ¶
+	"{ObjDir}partsum2.cpp.o" ¶
+	"{ObjDir}pheap1.cpp.o" ¶
+	"{ObjDir}pheap2.cpp.o" ¶
+	"{ObjDir}plus.cpp.o" ¶
+	"{ObjDir}pqueue1.cpp.o" ¶
+	"{ObjDir}prevprm0.cpp.o" ¶
+	"{ObjDir}prevprm1.cpp.o" ¶
+	"{ObjDir}prevprm2.cpp.o" ¶
+	"{ObjDir}ptition0.cpp.o" ¶
+	"{ObjDir}ptition1.cpp.o" ¶
+	"{ObjDir}ptrbinf1.cpp.o" ¶
+	"{ObjDir}ptrbinf2.cpp.o" ¶
+	"{ObjDir}ptrunf1.cpp.o" ¶
+	"{ObjDir}ptrunf2.cpp.o" ¶
+	"{ObjDir}queue1.cpp.o" ¶
+	"{ObjDir}rawiter.cpp.o" ¶
+	"{ObjDir}remcopy1.cpp.o" ¶
+	"{ObjDir}remcpif1.cpp.o" ¶
+	"{ObjDir}remif1.cpp.o" ¶
+	"{ObjDir}remove1.cpp.o" ¶
+	"{ObjDir}repcpif1.cpp.o" ¶
+	"{ObjDir}replace0.cpp.o" ¶
+	"{ObjDir}replace1.cpp.o" ¶
+	"{ObjDir}replcpy1.cpp.o" ¶
+	"{ObjDir}replif1.cpp.o" ¶
+	"{ObjDir}revbit1.cpp.o" ¶
+	"{ObjDir}revbit2.cpp.o" ¶
+	"{ObjDir}revcopy1.cpp.o" ¶
+	"{ObjDir}reverse1.cpp.o" ¶
+	"{ObjDir}reviter1.cpp.o" ¶
+	"{ObjDir}reviter2.cpp.o" ¶
+	"{ObjDir}rndshuf0.cpp.o" ¶
+	"{ObjDir}rndshuf1.cpp.o" ¶
+	"{ObjDir}rndshuf2.cpp.o" ¶
+	"{ObjDir}rotate0.cpp.o" ¶
+	"{ObjDir}rotate1.cpp.o" ¶
+	"{ObjDir}rotcopy0.cpp.o" ¶
+	"{ObjDir}rotcopy1.cpp.o" ¶
+	"{ObjDir}search0.cpp.o" ¶
+	"{ObjDir}search1.cpp.o" ¶
+	"{ObjDir}search2.cpp.o" ¶
+	"{ObjDir}set1.cpp.o" ¶
+	"{ObjDir}set2.cpp.o" ¶
+	"{ObjDir}setdiff0.cpp.o" ¶
+	"{ObjDir}setdiff1.cpp.o" ¶
+	"{ObjDir}setdiff2.cpp.o" ¶
+	"{ObjDir}setintr0.cpp.o" ¶
+	"{ObjDir}setintr1.cpp.o" ¶
+	"{ObjDir}setintr2.cpp.o" ¶
+	"{ObjDir}setsymd0.cpp.o" ¶
+	"{ObjDir}setsymd1.cpp.o" ¶
+	"{ObjDir}setsymd2.cpp.o" ¶
+	"{ObjDir}setunon0.cpp.o" ¶
+	"{ObjDir}setunon1.cpp.o" ¶
+	"{ObjDir}setunon2.cpp.o" ¶
+#	"{ObjDir}single.cpp.o" ¶
+	"{ObjDir}slist1.cpp.o" ¶
+	"{ObjDir}sort1.cpp.o" ¶
+	"{ObjDir}sort2.cpp.o" ¶
+	"{ObjDir}stack1.cpp.o" ¶
+	"{ObjDir}stack2.cpp.o" ¶
+#	"{ObjDir}stat.cpp.o" ¶
+	"{ObjDir}stblptn0.cpp.o" ¶
+	"{ObjDir}stblptn1.cpp.o" ¶
+	"{ObjDir}stblsrt1.cpp.o" ¶
+	"{ObjDir}stblsrt2.cpp.o" ¶
+#	"{ObjDir}stl_single.cpp.o" ¶
+	"{ObjDir}stl_test.cpp.o" ¶
+	"{ObjDir}string1.cpp.o" ¶
+	"{ObjDir}swap1.cpp.o" ¶
+	"{ObjDir}swprnge1.cpp.o" ¶
+	"{ObjDir}times.cpp.o" ¶
+	"{ObjDir}trnsfrm1.cpp.o" ¶
+	"{ObjDir}trnsfrm2.cpp.o" ¶
+	"{ObjDir}ucompos1.cpp.o" ¶
+	"{ObjDir}ucompos2.cpp.o" ¶
+	"{ObjDir}unegate1.cpp.o" ¶
+	"{ObjDir}unegate2.cpp.o" ¶
+	"{ObjDir}uniqcpy1.cpp.o" ¶
+	"{ObjDir}uniqcpy2.cpp.o" ¶
+	"{ObjDir}unique1.cpp.o" ¶
+	"{ObjDir}unique2.cpp.o" ¶
+	"{ObjDir}uprbnd1.cpp.o" ¶
+	"{ObjDir}uprbnd2.cpp.o" ¶
+	"{ObjDir}vec1.cpp.o" ¶
+	"{ObjDir}vec2.cpp.o" ¶
+	"{ObjDir}vec3.cpp.o" ¶
+	"{ObjDir}vec4.cpp.o" ¶
+	"{ObjDir}vec5.cpp.o" ¶
+	"{ObjDir}vec6.cpp.o" ¶
+	"{ObjDir}vec7.cpp.o" ¶
+	"{ObjDir}vec8.cpp.o" ¶
+#	end
+
+
+Regression_test ÄÄ setup
+Regression_test ÄÄ "{ObjDir}"Regression_test.68K
+	echo "¶n'{ObjDir}Regression_test.68K' < '{stl}:test:regression:stdin' # execute it"
+
+"{ObjDir}"Regression_test.68K ÄÄ {¥MondoBuild¥} {Regression_Objects_68K} {Needed_SysLibs}
+	###########
+	if "{compile_status}"
+		echo "### LINK NOT PERFORMED DUE TO COMPILE ERROR"
+		exit "{compile_status}"
+	end
+	echo ¶n¶nLinking:    "{Targ}"
+	ILink ¶
+	#Link ¶
+		-t 'MPST' ¶
+		-o {Targ} ¶
+		{Regression_Objects_68K} ¶
+		{Link_options} ¶
+		{Needed_SysLibs} ¶
+		# end
+
+
+##################################################################################
+#	test:eh: build rule
+##################################################################################
+eh_Objects_68K  = ¶
+	"{ObjDir}main.cpp.o" ¶
+	"{ObjDir}nc_alloc.cpp.o" ¶
+	"{ObjDir}random_number.cpp.o" ¶
+	"{ObjDir}test_algo.cpp.o" ¶
+	"{ObjDir}test_algobase.cpp.o" ¶
+	"{ObjDir}test_bit_vector.cpp.o" ¶
+	"{ObjDir}test_bitset.cpp.o" ¶
+	"{ObjDir}test_deque.cpp.o" ¶
+	"{ObjDir}test_hash_map.cpp.o" ¶
+	"{ObjDir}test_hash_set.cpp.o" ¶
+	"{ObjDir}test_list.cpp.o" ¶
+	"{ObjDir}test_map.cpp.o" ¶
+	"{ObjDir}test_rope.cpp.o" ¶
+	"{ObjDir}test_set.cpp.o" ¶
+	"{ObjDir}test_slist.cpp.o" ¶
+	"{ObjDir}test_string.cpp.o" ¶
+	"{ObjDir}test_valarray.cpp.o" ¶
+	"{ObjDir}test_vector.cpp.o" ¶
+	"{ObjDir}TestClass.cpp.o" ¶
+	#end
+
+EH_test ÄÄ setup
+EH_test ÄÄ "{ObjDir}"EH_test.68K
+	echo "¶n'{ObjDir}EH_test.68K' # execute it"
+
+
+"{ObjDir}"EH_test.68K ÄÄ "{stl}:test:regression:{¥MondoBuild¥}" {eh_Objects_68K} {Needed_SysLibs}
+	###########
+	if "{compile_status}"
+		echo "### LINK NOT PERFORMED DUE TO COMPILE TIME ERROR"
+		exit "{compile_status}"
+	end
+	echo ¶n¶nLinking:    "{Targ}"
+	ILink ¶
+	#Link ¶
+		-t 'MPST' ¶
+		-o {Targ} ¶
+		{eh_Objects_68K} ¶
+		{Link_options} ¶
+		{Needed_SysLibs} ¶
+		# end
+
+
+=======
+!include "{stl}:src:SCpp.mak"

+

+MAKEFILE     = SCpp.mak

+

+

+Needed_SysLibs = ¶

+#		"{CLibraries}IOStreams.o" ¶

+		"{STL}:lib:STLportLib{config_}.o" ¶

+		"{Libraries}Stubs.o" ¶

+		"{Libraries}MathLib.o" ¶

+		"{CLibraries}CPlusLib.o" ¶

+		"{CLibraries}StdCLib.o" ¶

+		"{Libraries}MacRuntime.o" ¶

+		"{Libraries}IntEnv.o" ¶

+		#"{Libraries}ToolLibs.o" ¶

+		"{Libraries}Interface.o" ¶

+		# end

+

+

+##################################################################################

+#	test:regression: build rule

+##################################################################################

+Regression_Objects_68K  = ¶

+	"{ObjDir}accum1.cpp.o" ¶

+	"{ObjDir}accum2.cpp.o" ¶

+	"{ObjDir}adjdiff0.cpp.o" ¶

+	"{ObjDir}adjdiff1.cpp.o" ¶

+	"{ObjDir}adjdiff2.cpp.o" ¶

+	"{ObjDir}adjfind0.cpp.o" ¶

+	"{ObjDir}adjfind1.cpp.o" ¶

+	"{ObjDir}adjfind2.cpp.o" ¶

+	"{ObjDir}advance.cpp.o" ¶

+	"{ObjDir}alg1.cpp.o" ¶

+	"{ObjDir}alg2.cpp.o" ¶

+	"{ObjDir}alg3.cpp.o" ¶

+	"{ObjDir}alg4.cpp.o" ¶

+	"{ObjDir}alg5.cpp.o" ¶

+	"{ObjDir}bcompos1.cpp.o" ¶

+	"{ObjDir}bcompos2.cpp.o" ¶

+	"{ObjDir}bind1st1.cpp.o" ¶

+	"{ObjDir}bind1st2.cpp.o" ¶

+	"{ObjDir}bind2nd1.cpp.o" ¶

+	"{ObjDir}bind2nd2.cpp.o" ¶

+	"{ObjDir}binsert1.cpp.o" ¶

+	"{ObjDir}binsert2.cpp.o" ¶

+	"{ObjDir}binsrch1.cpp.o" ¶

+	"{ObjDir}binsrch2.cpp.o" ¶

+	"{ObjDir}bitset1.cpp.o" ¶

+	"{ObjDir}bnegate1.cpp.o" ¶

+	"{ObjDir}bnegate2.cpp.o" ¶

+	"{ObjDir}bvec1.cpp.o" ¶

+	"{ObjDir}copy1.cpp.o" ¶

+	"{ObjDir}copy2.cpp.o" ¶

+	"{ObjDir}copy3.cpp.o" ¶

+	"{ObjDir}copy4.cpp.o" ¶

+	"{ObjDir}copyb.cpp.o" ¶

+	"{ObjDir}copyb0.cpp.o" ¶

+	"{ObjDir}count0.cpp.o" ¶

+	"{ObjDir}count1.cpp.o" ¶

+	"{ObjDir}countif1.cpp.o" ¶

+	"{ObjDir}deque1.cpp.o" ¶

+	"{ObjDir}divides.cpp.o" ¶

+	"{ObjDir}eqlrnge0.cpp.o" ¶

+	"{ObjDir}eqlrnge1.cpp.o" ¶

+	"{ObjDir}eqlrnge2.cpp.o" ¶

+	"{ObjDir}equal0.cpp.o" ¶

+	"{ObjDir}equal1.cpp.o" ¶

+	"{ObjDir}equal2.cpp.o" ¶

+	"{ObjDir}equalto.cpp.o" ¶

+	"{ObjDir}fill1.cpp.o" ¶

+	"{ObjDir}filln1.cpp.o" ¶

+	"{ObjDir}find0.cpp.o" ¶

+	"{ObjDir}find1.cpp.o" ¶

+	"{ObjDir}findif0.cpp.o" ¶

+	"{ObjDir}findif1.cpp.o" ¶

+	"{ObjDir}finsert1.cpp.o" ¶

+	"{ObjDir}finsert2.cpp.o" ¶

+	"{ObjDir}foreach0.cpp.o" ¶

+	"{ObjDir}foreach1.cpp.o" ¶

+	"{ObjDir}func1.cpp.o" ¶

+	"{ObjDir}func2.cpp.o" ¶

+	"{ObjDir}func3.cpp.o" ¶

+	"{ObjDir}gener1.cpp.o" ¶

+	"{ObjDir}gener2.cpp.o" ¶

+	"{ObjDir}genern1.cpp.o" ¶

+	"{ObjDir}genern2.cpp.o" ¶

+	"{ObjDir}greateq.cpp.o" ¶

+	"{ObjDir}greater.cpp.o" ¶

+	"{ObjDir}hmap1.cpp.o" ¶

+	"{ObjDir}hmmap1.cpp.o" ¶

+	"{ObjDir}hmset1.cpp.o" ¶

+	"{ObjDir}hset2.cpp.o" ¶

+	"{ObjDir}incl0.cpp.o" ¶

+	"{ObjDir}incl1.cpp.o" ¶

+	"{ObjDir}incl2.cpp.o" ¶

+	"{ObjDir}inplmrg1.cpp.o" ¶

+	"{ObjDir}inplmrg2.cpp.o" ¶

+	"{ObjDir}inrprod0.cpp.o" ¶

+	"{ObjDir}inrprod1.cpp.o" ¶

+	"{ObjDir}inrprod2.cpp.o" ¶

+	"{ObjDir}insert1.cpp.o" ¶

+	"{ObjDir}insert2.cpp.o" ¶

+	"{ObjDir}iota1.cpp.o" ¶

+	"{ObjDir}istmit1.cpp.o" ¶

+	"{ObjDir}iter1.cpp.o" ¶

+	"{ObjDir}iter2.cpp.o" ¶

+	"{ObjDir}iter3.cpp.o" ¶

+	"{ObjDir}iter4.cpp.o" ¶

+	"{ObjDir}iterswp0.cpp.o" ¶

+	"{ObjDir}iterswp1.cpp.o" ¶

+	"{ObjDir}less.cpp.o" ¶

+	"{ObjDir}lesseq.cpp.o" ¶

+	"{ObjDir}lexcmp1.cpp.o" ¶

+	"{ObjDir}lexcmp2.cpp.o" ¶

+	"{ObjDir}list1.cpp.o" ¶

+	"{ObjDir}list2.cpp.o" ¶

+	"{ObjDir}list3.cpp.o" ¶

+	"{ObjDir}list4.cpp.o" ¶

+	"{ObjDir}logicand.cpp.o" ¶

+	"{ObjDir}logicnot.cpp.o" ¶

+	"{ObjDir}logicor.cpp.o" ¶

+	"{ObjDir}lwrbnd1.cpp.o" ¶

+	"{ObjDir}lwrbnd2.cpp.o" ¶

+	"{ObjDir}map1.cpp.o" ¶

+	"{ObjDir}max1.cpp.o" ¶

+	"{ObjDir}max2.cpp.o" ¶

+	"{ObjDir}maxelem1.cpp.o" ¶

+	"{ObjDir}maxelem2.cpp.o" ¶
	"{ObjDir}memfunptr.cpp.o" ¶
+	"{ObjDir}merge0.cpp.o" ¶

+	"{ObjDir}merge1.cpp.o" ¶

+	"{ObjDir}merge2.cpp.o" ¶

+	"{ObjDir}min1.cpp.o" ¶

+	"{ObjDir}min2.cpp.o" ¶

+	"{ObjDir}minelem1.cpp.o" ¶

+	"{ObjDir}minelem2.cpp.o" ¶

+	"{ObjDir}minus.cpp.o" ¶

+	"{ObjDir}mismtch0.cpp.o" ¶

+	"{ObjDir}mismtch1.cpp.o" ¶

+	"{ObjDir}mismtch2.cpp.o" ¶

+	"{ObjDir}mkheap0.cpp.o" ¶

+	"{ObjDir}mkheap1.cpp.o" ¶

+	"{ObjDir}mmap1.cpp.o" ¶

+	"{ObjDir}mmap2.cpp.o" ¶

+	"{ObjDir}modulus.cpp.o" ¶

+	"{ObjDir}mset1.cpp.o" ¶

+	"{ObjDir}mset3.cpp.o" ¶

+	"{ObjDir}mset4.cpp.o" ¶

+	"{ObjDir}mset5.cpp.o" ¶

+	"{ObjDir}negate.cpp.o" ¶

+	"{ObjDir}nequal.cpp.o" ¶

+	"{ObjDir}nextprm0.cpp.o" ¶

+	"{ObjDir}nextprm1.cpp.o" ¶

+	"{ObjDir}nextprm2.cpp.o" ¶

+	"{ObjDir}nthelem0.cpp.o" ¶

+	"{ObjDir}nthelem1.cpp.o" ¶

+	"{ObjDir}nthelem2.cpp.o" ¶

+	"{ObjDir}ostmit.cpp.o" ¶

+	"{ObjDir}pair0.cpp.o" ¶

+	"{ObjDir}pair1.cpp.o" ¶

+	"{ObjDir}pair2.cpp.o" ¶

+	"{ObjDir}parsrt0.cpp.o" ¶

+	"{ObjDir}parsrt1.cpp.o" ¶

+	"{ObjDir}parsrt2.cpp.o" ¶

+	"{ObjDir}parsrtc0.cpp.o" ¶

+	"{ObjDir}parsrtc1.cpp.o" ¶

+	"{ObjDir}parsrtc2.cpp.o" ¶

+	"{ObjDir}partsrt0.cpp.o" ¶

+	"{ObjDir}partsum0.cpp.o" ¶

+	"{ObjDir}partsum1.cpp.o" ¶

+	"{ObjDir}partsum2.cpp.o" ¶

+	"{ObjDir}pheap1.cpp.o" ¶

+	"{ObjDir}pheap2.cpp.o" ¶

+	"{ObjDir}plus.cpp.o" ¶

+	"{ObjDir}pqueue1.cpp.o" ¶

+	"{ObjDir}prevprm0.cpp.o" ¶

+	"{ObjDir}prevprm1.cpp.o" ¶

+	"{ObjDir}prevprm2.cpp.o" ¶

+	"{ObjDir}ptition0.cpp.o" ¶

+	"{ObjDir}ptition1.cpp.o" ¶

+	"{ObjDir}ptrbinf1.cpp.o" ¶

+	"{ObjDir}ptrbinf2.cpp.o" ¶

+	"{ObjDir}ptrunf1.cpp.o" ¶

+	"{ObjDir}ptrunf2.cpp.o" ¶

+	"{ObjDir}queue1.cpp.o" ¶

+	"{ObjDir}rawiter.cpp.o" ¶

+	"{ObjDir}remcopy1.cpp.o" ¶

+	"{ObjDir}remcpif1.cpp.o" ¶

+	"{ObjDir}remif1.cpp.o" ¶

+	"{ObjDir}remove1.cpp.o" ¶

+	"{ObjDir}repcpif1.cpp.o" ¶

+	"{ObjDir}replace0.cpp.o" ¶

+	"{ObjDir}replace1.cpp.o" ¶

+	"{ObjDir}replcpy1.cpp.o" ¶

+	"{ObjDir}replif1.cpp.o" ¶

+	"{ObjDir}revbit1.cpp.o" ¶

+	"{ObjDir}revbit2.cpp.o" ¶

+	"{ObjDir}revcopy1.cpp.o" ¶

+	"{ObjDir}reverse1.cpp.o" ¶

+	"{ObjDir}reviter1.cpp.o" ¶

+	"{ObjDir}reviter2.cpp.o" ¶

+	"{ObjDir}rndshuf0.cpp.o" ¶

+	"{ObjDir}rndshuf1.cpp.o" ¶

+	"{ObjDir}rndshuf2.cpp.o" ¶

+	"{ObjDir}rotate0.cpp.o" ¶

+	"{ObjDir}rotate1.cpp.o" ¶

+	"{ObjDir}rotcopy0.cpp.o" ¶

+	"{ObjDir}rotcopy1.cpp.o" ¶

+	"{ObjDir}search0.cpp.o" ¶

+	"{ObjDir}search1.cpp.o" ¶

+	"{ObjDir}search2.cpp.o" ¶

+	"{ObjDir}set1.cpp.o" ¶

+	"{ObjDir}set2.cpp.o" ¶

+	"{ObjDir}setdiff0.cpp.o" ¶

+	"{ObjDir}setdiff1.cpp.o" ¶

+	"{ObjDir}setdiff2.cpp.o" ¶

+	"{ObjDir}setintr0.cpp.o" ¶

+	"{ObjDir}setintr1.cpp.o" ¶

+	"{ObjDir}setintr2.cpp.o" ¶

+	"{ObjDir}setsymd0.cpp.o" ¶

+	"{ObjDir}setsymd1.cpp.o" ¶

+	"{ObjDir}setsymd2.cpp.o" ¶

+	"{ObjDir}setunon0.cpp.o" ¶

+	"{ObjDir}setunon1.cpp.o" ¶

+	"{ObjDir}setunon2.cpp.o" ¶

+#	"{ObjDir}single.cpp.o" ¶

+	"{ObjDir}slist1.cpp.o" ¶

+	"{ObjDir}sort1.cpp.o" ¶

+	"{ObjDir}sort2.cpp.o" ¶

+	"{ObjDir}stack1.cpp.o" ¶

+	"{ObjDir}stack2.cpp.o" ¶

+#	"{ObjDir}stat.cpp.o" ¶

+	"{ObjDir}stblptn0.cpp.o" ¶

+	"{ObjDir}stblptn1.cpp.o" ¶

+	"{ObjDir}stblsrt1.cpp.o" ¶

+	"{ObjDir}stblsrt2.cpp.o" ¶

+#	"{ObjDir}stl_single.cpp.o" ¶

+	"{ObjDir}stl_test.cpp.o" ¶

+	"{ObjDir}string1.cpp.o" ¶

+	"{ObjDir}swap1.cpp.o" ¶

+	"{ObjDir}swprnge1.cpp.o" ¶

+	"{ObjDir}times.cpp.o" ¶

+	"{ObjDir}trnsfrm1.cpp.o" ¶

+	"{ObjDir}trnsfrm2.cpp.o" ¶

+	"{ObjDir}ucompos1.cpp.o" ¶

+	"{ObjDir}ucompos2.cpp.o" ¶

+	"{ObjDir}unegate1.cpp.o" ¶

+	"{ObjDir}unegate2.cpp.o" ¶

+	"{ObjDir}uniqcpy1.cpp.o" ¶

+	"{ObjDir}uniqcpy2.cpp.o" ¶

+	"{ObjDir}unique1.cpp.o" ¶

+	"{ObjDir}unique2.cpp.o" ¶

+	"{ObjDir}uprbnd1.cpp.o" ¶

+	"{ObjDir}uprbnd2.cpp.o" ¶

+	"{ObjDir}vec1.cpp.o" ¶

+	"{ObjDir}vec2.cpp.o" ¶

+	"{ObjDir}vec3.cpp.o" ¶

+	"{ObjDir}vec4.cpp.o" ¶

+	"{ObjDir}vec5.cpp.o" ¶

+	"{ObjDir}vec6.cpp.o" ¶

+	"{ObjDir}vec7.cpp.o" ¶

+	"{ObjDir}vec8.cpp.o" ¶

+#	end

+

+

+Regression_test ÄÄ setup

+Regression_test ÄÄ "{ObjDir}"Regression_test.68K

+	echo "¶n'{ObjDir}Regression_test.68K' < '{stl}:test:regression:stdin' # execute it"

+

+"{ObjDir}"Regression_test.68K ÄÄ {¥MondoBuild¥} {Regression_Objects_68K} {Needed_SysLibs}

+	###########

+	if "{compile_status}"

+		echo "### LINK NOT PERFORMED DUE TO COMPILE ERROR"

+		exit "{compile_status}"

+	end

+	echo ¶n¶nLinking:    "{Targ}"

+	ILink ¶

+	#Link ¶

+		-t 'MPST' ¶

+		-o {Targ} ¶

+		{Regression_Objects_68K} ¶

+		{Link_options} ¶

+		{Needed_SysLibs} ¶

+		# end

+

+

+##################################################################################

+#	test:eh: build rule

+##################################################################################

+eh_Objects_68K  = ¶

+	"{ObjDir}main.cpp.o" ¶

+	"{ObjDir}nc_alloc.cpp.o" ¶

+	"{ObjDir}random_number.cpp.o" ¶

+	"{ObjDir}test_algo.cpp.o" ¶

+	"{ObjDir}test_algobase.cpp.o" ¶

+	"{ObjDir}test_bit_vector.cpp.o" ¶

+	"{ObjDir}test_bitset.cpp.o" ¶

+	"{ObjDir}test_deque.cpp.o" ¶

+	"{ObjDir}test_hash_map.cpp.o" ¶

+	"{ObjDir}test_hash_set.cpp.o" ¶

+	"{ObjDir}test_list.cpp.o" ¶

+	"{ObjDir}test_map.cpp.o" ¶

+	"{ObjDir}test_rope.cpp.o" ¶

+	"{ObjDir}test_set.cpp.o" ¶

+	"{ObjDir}test_slist.cpp.o" ¶

+	"{ObjDir}test_string.cpp.o" ¶

+	"{ObjDir}test_valarray.cpp.o" ¶

+	"{ObjDir}test_vector.cpp.o" ¶

+	"{ObjDir}TestClass.cpp.o" ¶

+	#end

+

+EH_test ÄÄ setup

+EH_test ÄÄ "{ObjDir}"EH_test.68K

+	echo "¶n'{ObjDir}EH_test.68K' # execute it"

+

+

+"{ObjDir}"EH_test.68K ÄÄ "{stl}:test:regression:{¥MondoBuild¥}" {eh_Objects_68K} {Needed_SysLibs}

+	###########

+	if "{compile_status}"

+		echo "### LINK NOT PERFORMED DUE TO COMPILE TIME ERROR"

+		exit "{compile_status}"

+	end

+	echo ¶n¶nLinking:    "{Targ}"

+	ILink ¶

+	#Link ¶

+		-t 'MPST' ¶

+		-o {Targ} ¶

+		{eh_Objects_68K} ¶

+		{Link_options} ¶

+		{Needed_SysLibs} ¶

+		# end

+

+

+
diff --git a/main/source/stlport/test/regression/accum1.cpp b/main/source/stlport/test/regression/accum1.cpp
new file mode 100644
index 00000000..cbcc6b6a
--- /dev/null
+++ b/main/source/stlport/test/regression/accum1.cpp
@@ -0,0 +1,26 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <numeric>
+#include <iostream>
+
+#ifdef MAIN 
+#define accum1_test main
+#endif
+
+#if !defined (STLPORT) || defined(_STLP_USE_NAMESPACES)
+using namespace std;
+#endif
+
+
+int accum1_test(int, char**)
+{
+  cout<<"Results of accum1_test:"<<endl;
+  vector <int> v(5);
+  for(int i = 0; i < v.size(); i++)
+    v[i] = i + 1;
+  int sum = accumulate(v.begin(), v.end(), 0);
+  cout << "sum = " << sum << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/accum2.cpp b/main/source/stlport/test/regression/accum2.cpp
new file mode 100644
index 00000000..df8df979
--- /dev/null
+++ b/main/source/stlport/test/regression/accum2.cpp
@@ -0,0 +1,30 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#include <vector>
+#include <numeric>
+#include <iostream>
+
+
+#ifdef MAIN 
+#define accum2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+static int mult(int initial_, int element_)
+{
+  return initial_ * element_;
+}
+int accum2_test(int, char**)
+{
+  cout<<"Results of accum2_test:"<<endl;
+
+  vector <int> v(5);
+  for(int i = 0; i < v.size(); i++)
+    v[i] = i + 1;
+  int prod = accumulate(v.begin(), v.end(), 1, mult);
+  cout << "prod = " << prod << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/adjdiff0.cpp b/main/source/stlport/test/regression/adjdiff0.cpp
new file mode 100644
index 00000000..71cf8653
--- /dev/null
+++ b/main/source/stlport/test/regression/adjdiff0.cpp
@@ -0,0 +1,31 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <numeric>
+#include <iostream>
+
+
+#ifdef MAIN 
+#define adjdiff0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+int adjdiff0_test(int, char**)
+{
+  cout<<"Results of adjdiff0_test:"<<endl;
+int numbers[5] = { 1, 2, 4, 8, 16 };
+
+  int difference[5];
+  adjacent_difference(numbers, numbers + 5, (int*)difference);
+  int i;
+  for(i = 0; i < 5; i++)
+    cout << numbers[i] << ' ';
+  cout << endl;
+  for(i = 0; i < 5; i++)
+    cout << difference[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/adjdiff1.cpp b/main/source/stlport/test/regression/adjdiff1.cpp
new file mode 100644
index 00000000..c71f3063
--- /dev/null
+++ b/main/source/stlport/test/regression/adjdiff1.cpp
@@ -0,0 +1,31 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <numeric>
+#include <iterator>
+#include <iostream>
+
+#ifdef MAIN 
+#define adjdiff1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int adjdiff1_test(int, char**)
+{
+  cout<<"Results of adjdiff1_test:"<<endl;
+  vector <int> v(10);
+  for(int i = 0; i < v.size(); i++)
+    v[i] = i * i;
+  vector <int> result(v.size());
+  adjacent_difference(v.begin(), v.end(), result.begin());
+  ostream_iterator<int> iter(cout, " ");
+  // vector<int>::iterator iter;
+  copy(v.begin(), v.end(), iter);
+  cout << endl;
+  copy(result.begin(), result.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/adjdiff2.cpp b/main/source/stlport/test/regression/adjdiff2.cpp
new file mode 100644
index 00000000..b8d80703
--- /dev/null
+++ b/main/source/stlport/test/regression/adjdiff2.cpp
@@ -0,0 +1,35 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#include <vector>
+#include <numeric>
+#include <iterator>
+#include <iostream>
+
+
+#ifdef MAIN 
+#define adjdiff2_test main
+#endif
+static int mult(int a_, int b_)
+{
+  return a_ * b_;
+}
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int adjdiff2_test(int, char**)
+{
+  cout<<"Results of adjdiff2_test:"<<endl;
+
+  vector <int> v(10);
+  for(int i = 0; i < v.size(); i++)
+    v[i] = i + 1;
+  vector <int> rslt(v.size());
+  adjacent_difference(v.begin(), v.end(), rslt.begin(), mult);
+  ostream_iterator<int> iter(cout, " ");
+  copy(v.begin(), v.end(), iter);
+  cout << endl;
+  copy(rslt.begin(), rslt.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/adjfind0.cpp b/main/source/stlport/test/regression/adjfind0.cpp
new file mode 100644
index 00000000..4e45e397
--- /dev/null
+++ b/main/source/stlport/test/regression/adjfind0.cpp
@@ -0,0 +1,43 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+
+#ifdef MAIN 
+#define adjfind0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int adjfind0_test(int, char**)
+{
+  cout<<"Results of adjfind0_test:"<<endl;
+int numbers1 [5] = { 1, 2, 4, 8, 16 };
+int numbers2 [5] = { 5, 3, 2, 1, 1 };
+
+  int* location = adjacent_find((int*)numbers1, (int*)numbers1 + 5);
+
+  if(location != numbers1 + 5)
+    cout
+      << "Found adjacent pair of: "
+      << *location
+      << " at offset "
+      <<(location - numbers1)
+      << endl;
+  else
+    cout << "No adjacent pairs" << endl;
+  location = adjacent_find((int*)numbers2, (int*)numbers2 + 5);
+  if(location != numbers2 + 5)
+    cout
+      << "Found adjacent pair of: "
+      << *location
+      << " at offset "
+      <<(location - numbers2)
+      << endl;
+  else
+    cout << "No adjacent pairs" << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/adjfind1.cpp b/main/source/stlport/test/regression/adjfind1.cpp
new file mode 100644
index 00000000..c30843c6
--- /dev/null
+++ b/main/source/stlport/test/regression/adjfind1.cpp
@@ -0,0 +1,35 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define adjfind1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int adjfind1_test(int, char**)
+{
+  cout<<"Results of adjfind1_test:"<<endl;
+  typedef vector<int> IntVector;
+  IntVector v(10);
+  for(int i = 0; i < v.size(); i++)
+    v[i] = i;
+  IntVector::iterator location;
+  location = adjacent_find(v.begin(), v.end());
+  if(location != v.end())
+    cout << "Found adjacent pair of: " << *location << endl;
+  else
+    cout << "No adjacent pairs" << endl;
+  v[6] = 7;
+  location = adjacent_find(v.begin(), v.end());
+  if(location != v.end())
+    cout << "Found adjacent pair of: " << *location << endl;
+  else
+    cout << "No adjacent pairs" << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/adjfind2.cpp b/main/source/stlport/test/regression/adjfind2.cpp
new file mode 100644
index 00000000..0910df24
--- /dev/null
+++ b/main/source/stlport/test/regression/adjfind2.cpp
@@ -0,0 +1,43 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <string>
+#include <vector>
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define adjfind2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+static int equal_length(const char* v1_, const char* v2_)
+{
+  return ::strlen(v1_) == ::strlen(v2_);
+}
+int adjfind2_test(int, char**)
+{
+  cout<<"Results of adjfind2_test:"<<endl;
+typedef vector <char*> CStrVector;
+
+char* names[] = { "Brett", "Graham", "Jack", "Mike", "Todd" };
+
+  const int nameCount = sizeof(names)/sizeof(names[0]);
+  CStrVector v(nameCount);
+  for(int i = 0; i < nameCount; i++)
+    v[i] = names[i];
+  CStrVector::iterator location;
+  location = adjacent_find(v.begin(), v.end(), equal_length);
+  if(location != v.end())
+    cout
+      << "Found two adjacent strings of equal length: "
+      << *location
+      << " -and- "
+      << *(location + 1)
+      << endl;
+  else
+    cout << "Didn't find two adjacent strings of equal length.";
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/advance.cpp b/main/source/stlport/test/regression/advance.cpp
new file mode 100644
index 00000000..3a1c03f0
--- /dev/null
+++ b/main/source/stlport/test/regression/advance.cpp
@@ -0,0 +1,27 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define advance_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int advance_test(int, char**)
+{
+  cout<<"Results of advance_test:"<<endl;
+  typedef vector <int> IntVector;
+  IntVector v(10);
+  for(int i = 0; i < v.size(); i++)
+    v[i] = i;
+  IntVector::iterator location = v.begin();
+  cout << "At Beginning: " << *location << endl;
+  advance(location, 5);
+  cout << "At Beginning + 5: " << *location << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/alg1.cpp b/main/source/stlport/test/regression/alg1.cpp
new file mode 100644
index 00000000..32fa6b53
--- /dev/null
+++ b/main/source/stlport/test/regression/alg1.cpp
@@ -0,0 +1,23 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+
+#ifdef MAIN 
+#define alg1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int alg1_test(int, char**)
+{
+  cout<<"Results of alg1_test:"<<endl;
+  int i = min(4, 7);
+  cout << "min(4, 7) = " << i << endl;
+  char c = max('a', 'z');
+  cout << "max('a', 'z') = " << c << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/alg2.cpp b/main/source/stlport/test/regression/alg2.cpp
new file mode 100644
index 00000000..b3b4b3dd
--- /dev/null
+++ b/main/source/stlport/test/regression/alg2.cpp
@@ -0,0 +1,23 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#include <algorithm>
+#include <iostream>
+
+
+#ifdef MAIN 
+#define alg2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int alg2_test(int, char**)
+{
+  cout<<"Results of alg2_test:"<<endl;
+int n = 0;
+int i [] = { 1, 4, 2, 8, 2, 2 };
+
+  count(i, i + 6, 2, n);
+  cout << "Count of 2s = " << n << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/alg3.cpp b/main/source/stlport/test/regression/alg3.cpp
new file mode 100644
index 00000000..14989544
--- /dev/null
+++ b/main/source/stlport/test/regression/alg3.cpp
@@ -0,0 +1,30 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <iostream>
+
+
+#ifdef MAIN 
+#define alg3_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int alg3_test(int, char**)
+{
+  cout<<"Results of alg3_test:"<<endl;
+  int n=0;
+  vector<int> i;
+  i.push_back(1);
+  i.push_back(4);
+  i.push_back(2);
+  i.push_back(8);
+  i.push_back(2);
+  i.push_back(2);
+  count(i.begin(), i.end(), 2, n);
+  cout << "Count of 2s = " << n << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/alg4.cpp b/main/source/stlport/test/regression/alg4.cpp
new file mode 100644
index 00000000..8ea7b550
--- /dev/null
+++ b/main/source/stlport/test/regression/alg4.cpp
@@ -0,0 +1,28 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#include <vector>
+#include <algorithm>
+#include <iostream>
+
+
+#ifdef MAIN 
+#define alg4_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int alg4_test(int, char**)
+{
+  cout<<"Results of alg4_test:"<<endl;
+  vector<int> years;
+  years.push_back(1962);
+  years.push_back(1992);
+  years.push_back(2001);
+  years.push_back(1999);
+  sort(years.begin(), years.end());
+  vector<int>::const_iterator i;
+  for(i = years.begin(); i != years.end(); i++)
+    cout << *i << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/alg5.cpp b/main/source/stlport/test/regression/alg5.cpp
new file mode 100644
index 00000000..ef7210d2
--- /dev/null
+++ b/main/source/stlport/test/regression/alg5.cpp
@@ -0,0 +1,27 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <deque>
+#include <algorithm>
+
+#ifdef MAIN 
+#define alg5_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int alg5_test(int, char**)
+{
+  cout<<"Results of alg5_test:"<<endl;
+  deque<int> years;
+  years.push_back(1962);
+  years.push_back(1992);
+  years.push_back(2001);
+  years.push_back(1999);
+  deque<int>::iterator i;
+  for(i = years.begin(); i != years.end(); i++)
+    cout << *i << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/bc.mak b/main/source/stlport/test/regression/bc.mak
new file mode 100644
index 00000000..d36e49ef
--- /dev/null
+++ b/main/source/stlport/test/regression/bc.mak
@@ -0,0 +1,1714 @@
+.AUTODEPEND
+
+
+#
+# Borland C++ tools
+#
+
+# set this variables to your locations
+BCROOT = D:\BC5
+STLINCL = ..\..\STLPORT\OLD_HP;..\..\STLPORT
+
+IMPLIB  = Implib
+BCC=bcc32 +BccW32.cfg
+BCC32   = Bcc32 +BccW32.cfg 
+BCC32I  = Bcc32i +BccW32.cfg 
+TLINK32 = TLink32
+TLIB    = TLib
+BRC32   = Brc32
+TASM32  = Tasm32
+
+#
+# Options
+#
+
+IDE_LinkFLAGS32 =  -L${BCROOT}\LIB
+LinkerLocalOptsAtC32_osdexe =  -Tpe -ap -c
+ResLocalOptsAtC32_osdexe = 
+BLocalOptsAtC32_osdexe = 
+CompInheritOptsAt_osdexe = -I.;${STLINCL};${BCROOT}\INCLUDE -D_RTLDLL -D_STLP_NO_OWN_IOSTREAMS;
+LinkerInheritOptsAt_osdexe = -x
+LinkerOptsAt_osdexe = $(LinkerLocalOptsAtC32_osdexe)
+ResOptsAt_osdexe = $(ResLocalOptsAtC32_osdexe)
+BOptsAt_osdexe = $(BLocalOptsAtC32_osdexe)
+
+#
+# Dependency List
+#
+Dep_os = stl_test.exe
+
+check: $(Dep_os)
+	stl_test.exe < stdin > stl_test.out
+
+Dep_osdexe = \
+   vec2.obj\
+   vec7.obj\
+   vec6.obj\
+   vec5.obj\
+   vec4.obj\
+   vec3.obj\
+   vec8.obj\
+   stat.obj\
+   uprbnd2.obj\
+   uprbnd1.obj\
+   unique2.obj\
+   unique1.obj\
+   uniqcpy2.obj\
+   uniqcpy1.obj\
+   unegate2.obj\
+   unegate1.obj\
+   ucompos2.obj\
+   ucompos1.obj\
+   trnsfrm2.obj\
+   trnsfrm1.obj\
+   times.obj\
+   swprnge1.obj\
+   swap1.obj\
+   stl_test.obj\
+   stblsrt2.obj\
+   stblsrt1.obj\
+   stblptn1.obj\
+   stblptn0.obj\
+   vec1.obj\
+   rotcopy0.obj\
+   stack1.obj\
+   sort2.obj\
+   sort1.obj\
+   setunon2.obj\
+   setunon1.obj\
+   setunon0.obj\
+   setsymd2.obj\
+   setsymd1.obj\
+   setsymd0.obj\
+   setintr2.obj\
+   setintr1.obj\
+   setintr0.obj\
+   setdiff2.obj\
+   setdiff1.obj\
+   setdiff0.obj\
+   set2.obj\
+   set1.obj\
+   search2.obj\
+   search1.obj\
+   search0.obj\
+   rotcopy1.obj\
+   stack2.obj\
+   ptrunf1.obj\
+   rotate0.obj\
+   rndshuf2.obj\
+   rndshuf1.obj\
+   rndshuf0.obj\
+   reviter2.obj\
+   reviter1.obj\
+   reverse1.obj\
+   revcopy1.obj\
+   revbit2.obj\
+   revbit1.obj\
+   replif1.obj\
+   replcpy1.obj\
+   replace1.obj\
+   replace0.obj\
+   repcpif1.obj\
+   remove1.obj\
+   remif1.obj\
+   remcpif1.obj\
+   remcopy1.obj\
+   rawiter.obj\
+   queue1.obj\
+   ptrunf2.obj\
+   rotate1.obj\
+   pair0.obj\
+   ptrbinf1.obj\
+   ptition1.obj\
+   ptition0.obj\
+   prevprm2.obj\
+   prevprm1.obj\
+   prevprm0.obj\
+   pqueue1.obj\
+   plus.obj\
+   pheap2.obj\
+   pheap1.obj\
+   partsum2.obj\
+   partsum1.obj\
+   partsum0.obj\
+   partsrt0.obj\
+   parsrtc2.obj\
+   parsrtc1.obj\
+   parsrtc0.obj\
+   parsrt2.obj\
+   parsrt1.obj\
+   parsrt0.obj\
+   pair2.obj\
+   pair1.obj\
+   ptrbinf2.obj\
+   minelem1.obj\
+   nthelem2.obj\
+   nthelem1.obj\
+   nthelem0.obj\
+   nextprm2.obj\
+   nextprm1.obj\
+   nextprm0.obj\
+   nequal.obj\
+   negate.obj\
+   mset5.obj\
+   mset4.obj\
+   mset3.obj\
+   mset1.obj\
+   modulus.obj\
+   mmap2.obj\
+   mmap1.obj\
+   mkheap1.obj\
+   mkheap0.obj\
+   mismtch2.obj\
+   mismtch1.obj\
+   mismtch0.obj\
+   minus.obj\
+   minelem2.obj\
+   ostmit.obj\
+   iterswp1.obj\
+   min1.obj\
+   memfunptr.obj \
+   merge2.obj\
+   merge1.obj\
+   merge0.obj\
+   maxelem2.obj\
+   maxelem1.obj\
+   max2.obj\
+   max1.obj\
+   map1.obj\
+   lwrbnd2.obj\
+   lwrbnd1.obj\
+   logicor.obj\
+   logicnot.obj\
+   logicand.obj\
+   list4.obj\
+   list3.obj\
+   list2.obj\
+   list1.obj\
+   lexcmp2.obj\
+   lexcmp1.obj\
+   lesseq.obj\
+   less.obj\
+   min2.obj\
+   greater.obj\
+   iter4.obj\
+   iter3.obj\
+   iter2.obj\
+   iter1.obj\
+   istmit1.obj\
+   iota1.obj\
+   insert2.obj\
+   insert1.obj\
+   inrprod2.obj\
+   inrprod1.obj\
+   inrprod0.obj\
+   inplmrg2.obj\
+   inplmrg1.obj\
+   incl2.obj\
+   incl1.obj\
+   incl0.obj\
+   iterswp0.obj\
+   eqlrnge2.obj\
+   genern2.obj\
+   genern1.obj\
+   gener2.obj\
+   gener1.obj\
+   func3.obj\
+   func2.obj\
+   func1.obj\
+   foreach1.obj\
+   foreach0.obj\
+   finsert2.obj\
+   finsert1.obj\
+   findif1.obj\
+   findif0.obj\
+   find1.obj\
+   find0.obj\
+   filln1.obj\
+   fill1.obj\
+   equalto.obj\
+   equal2.obj\
+   equal1.obj\
+   equal0.obj\
+   greateq.obj\
+   binsrch1.obj\
+   eqlrnge0.obj\
+   divides.obj\
+   deque1.obj\
+   countif1.obj\
+   count1.obj\
+   count0.obj\
+   copyb0.obj\
+   copyb.obj\
+   copy4.obj\
+   copy3.obj\
+   copy2.obj\
+   copy1.obj\
+   bvec1.obj\
+   bnegate2.obj\
+   bnegate1.obj\
+   binsrch2.obj\
+   eqlrnge1.obj\
+   accum1.obj\
+   binsert1.obj\
+   bind2nd2.obj\
+   bind2nd1.obj\
+   bind1st1.obj\
+   bind1st2.obj\
+   bcompos2.obj\
+   bcompos1.obj\
+   alg5.obj\
+   alg4.obj\
+   alg3.obj\
+   alg2.obj\
+   alg1.obj\
+   advance.obj\
+   adjfind2.obj\
+   adjfind1.obj\
+   adjfind0.obj\
+   adjdiff2.obj\
+   adjdiff1.obj\
+   adjdiff0.obj\
+   accum2.obj\
+   binsert2.obj\
+   hmap1.obj hmmap1.obj hset2.obj hmset1.obj \
+   os.def
+
+stl_test.exe : $(Dep_osdexe)
+  $(TLINK32) @&&|
+ /v $(IDE_LinkFLAGS32) $(LinkerOptsAt_osdexe) $(LinkerInheritOptsAt_osdexe) +
+${BCROOT}\LIB\c0x32.obj+
+vec2.obj+
+vec7.obj+
+vec6.obj+
+vec5.obj+
+vec4.obj+
+vec3.obj+
+vec8.obj+
+stat.obj+
+uprbnd2.obj+
+uprbnd1.obj+
+unique2.obj+
+unique1.obj+
+uniqcpy2.obj+
+uniqcpy1.obj+
+unegate2.obj+
+unegate1.obj+
+ucompos2.obj+
+ucompos1.obj+
+trnsfrm2.obj+
+trnsfrm1.obj+
+times.obj+
+swprnge1.obj+
+swap1.obj+
+stl_test.obj+
+stblsrt2.obj+
+stblsrt1.obj+
+stblptn1.obj+
+stblptn0.obj+
+vec1.obj+
+rotcopy0.obj+
+stack1.obj+
+sort2.obj+
+sort1.obj+
+setunon2.obj+
+setunon1.obj+
+setunon0.obj+
+setsymd2.obj+
+setsymd1.obj+
+setsymd0.obj+
+setintr2.obj+
+setintr1.obj+
+setintr0.obj+
+setdiff2.obj+
+setdiff1.obj+
+setdiff0.obj+
+set2.obj+
+set1.obj+
+search2.obj+
+search1.obj+
+search0.obj+
+rotcopy1.obj+
+stack2.obj+
+ptrunf1.obj+
+rotate0.obj+
+rndshuf2.obj+
+rndshuf1.obj+
+rndshuf0.obj+
+reviter2.obj+
+reviter1.obj+
+reverse1.obj+
+revcopy1.obj+
+revbit2.obj+
+revbit1.obj+
+replif1.obj+
+replcpy1.obj+
+replace1.obj+
+replace0.obj+
+repcpif1.obj+
+remove1.obj+
+remif1.obj+
+remcpif1.obj+
+remcopy1.obj+
+rawiter.obj+
+queue1.obj+
+ptrunf2.obj+
+rotate1.obj+
+pair0.obj+
+ptrbinf1.obj+
+ptition1.obj+
+ptition0.obj+
+prevprm2.obj+
+prevprm1.obj+
+prevprm0.obj+
+pqueue1.obj+
+plus.obj+
+pheap2.obj+
+pheap1.obj+
+partsum2.obj+
+partsum1.obj+
+partsum0.obj+
+partsrt0.obj+
+parsrtc2.obj+
+parsrtc1.obj+
+parsrtc0.obj+
+parsrt2.obj+
+parsrt1.obj+
+parsrt0.obj+
+pair2.obj+
+pair1.obj+
+ptrbinf2.obj+
+minelem1.obj+
+nthelem2.obj+
+nthelem1.obj+
+nthelem0.obj+
+nextprm2.obj+
+nextprm1.obj+
+nextprm0.obj+
+nequal.obj+
+negate.obj+
+mset5.obj+
+mset4.obj+
+mset3.obj+
+mset1.obj+
+modulus.obj+
+mmap2.obj+
+mmap1.obj+
+mkheap1.obj+
+mkheap0.obj+
+mismtch2.obj+
+mismtch1.obj+
+mismtch0.obj+
+minus.obj+
+minelem2.obj+
+ostmit.obj+
+iterswp1.obj+
+min1.obj+
+merge2.obj+
+merge1.obj+
+merge0.obj+
+maxelem2.obj+
+maxelem1.obj+
+max2.obj+
+max1.obj+
+map1.obj+
+lwrbnd2.obj+
+lwrbnd1.obj+
+logicor.obj+
+logicnot.obj+
+logicand.obj+
+list4.obj+
+list3.obj+
+list2.obj+
+list1.obj+
+lexcmp2.obj+
+lexcmp1.obj+
+lesseq.obj+
+less.obj+
+min2.obj+
+greater.obj+
+iter4.obj+
+iter3.obj+
+iter2.obj+
+iter1.obj+
+istmit1.obj+
+iota1.obj+
+insert2.obj+
+insert1.obj+
+inrprod2.obj+
+inrprod1.obj+
+inrprod0.obj+
+inplmrg2.obj+
+inplmrg1.obj+
+incl2.obj+
+incl1.obj+
+incl0.obj+
+iterswp0.obj+
+eqlrnge2.obj+
+genern2.obj+
+genern1.obj+
+gener2.obj+
+gener1.obj+
+func3.obj+
+func2.obj+
+func1.obj+
+foreach1.obj+
+foreach0.obj+
+finsert2.obj+
+finsert1.obj+
+findif1.obj+
+findif0.obj+
+find1.obj+
+find0.obj+
+filln1.obj+
+fill1.obj+
+equalto.obj+
+equal2.obj+
+equal1.obj+
+equal0.obj+
+greateq.obj+
+binsrch1.obj+
+eqlrnge0.obj+
+divides.obj+
+deque1.obj+
+countif1.obj+
+count1.obj+
+count0.obj+
+copyb0.obj+
+copyb.obj+
+copy4.obj+
+copy3.obj+
+copy2.obj+
+copy1.obj+
+bvec1.obj+
+bnegate2.obj+
+bnegate1.obj+
+binsrch2.obj+
+eqlrnge1.obj+
+accum1.obj+
+binsert1.obj+
+bind2nd2.obj+
+bind2nd1.obj+
+bind1st1.obj+
+bind1st2.obj+
+bcompos2.obj+
+bcompos1.obj+
+alg5.obj+
+alg4.obj+
+alg3.obj+
+alg2.obj+
+alg1.obj+
+advance.obj+
+adjfind2.obj+
+adjfind1.obj+
+adjfind0.obj+
+adjdiff2.obj+
+adjdiff1.obj+
+adjdiff0.obj+
+accum2.obj+
+hmap1.obj+
+hmmap1.obj+
+hset2.obj+
+hmset1.obj+
+binsert2.obj
+$<,$*
+${BCROOT}\LIB\import32.lib+
+${BCROOT}\LIB\cw32i.lib
+stl_test.def
+
+|
+
+hmset1.obj :  hmset1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ hmset1.cpp
+|
+
+hset2.obj :  hset2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ hset2.cpp
+|
+
+hmmap1.obj :  hmmap1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ hmmap1.cpp
+|
+
+hmap1.obj :  hmap1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ hmap1.cpp
+|
+
+slist1.obj :  slist1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ slist1.cpp
+|
+
+vec2.obj :  vec2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ vec2.cpp
+|
+
+vec7.obj :  vec7.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ vec7.cpp
+|
+
+vec6.obj :  vec6.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ vec6.cpp
+|
+
+vec5.obj :  vec5.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ vec5.cpp
+|
+
+vec4.obj :  vec4.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ vec4.cpp
+|
+
+vec3.obj :  vec3.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ vec3.cpp
+|
+
+vec8.obj :  vec8.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ vec8.cpp
+|
+
+stat.obj :  stat.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ stat.cpp
+|
+
+uprbnd2.obj :  uprbnd2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ uprbnd2.cpp
+|
+
+uprbnd1.obj :  uprbnd1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ uprbnd1.cpp
+|
+
+unique2.obj :  unique2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ unique2.cpp
+|
+
+unique1.obj :  unique1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ unique1.cpp
+|
+
+uniqcpy2.obj :  uniqcpy2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ uniqcpy2.cpp
+|
+
+uniqcpy1.obj :  uniqcpy1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ uniqcpy1.cpp
+|
+
+unegate2.obj :  unegate2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ unegate2.cpp
+|
+
+unegate1.obj :  unegate1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ unegate1.cpp
+|
+
+ucompos2.obj :  ucompos2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ ucompos2.cpp
+|
+
+ucompos1.obj :  ucompos1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ ucompos1.cpp
+|
+
+trnsfrm2.obj :  trnsfrm2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ trnsfrm2.cpp
+|
+
+trnsfrm1.obj :  trnsfrm1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ trnsfrm1.cpp
+|
+
+times.obj :  times.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ times.cpp
+|
+
+swprnge1.obj :  swprnge1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ swprnge1.cpp
+|
+
+swap1.obj :  swap1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ swap1.cpp
+|
+
+stl_test.obj :  stl_test.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ stl_test.cpp
+|
+
+stblsrt2.obj :  stblsrt2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ stblsrt2.cpp
+|
+
+stblsrt1.obj :  stblsrt1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ stblsrt1.cpp
+|
+
+stblptn1.obj :  stblptn1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ stblptn1.cpp
+|
+
+stblptn0.obj :  stblptn0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ stblptn0.cpp
+|
+
+vec1.obj :  vec1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ vec1.cpp
+|
+
+rotcopy0.obj :  rotcopy0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ rotcopy0.cpp
+|
+
+stack1.obj :  stack1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ stack1.cpp
+|
+
+sort2.obj :  sort2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ sort2.cpp
+|
+
+sort1.obj :  sort1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ sort1.cpp
+|
+
+setunon2.obj :  setunon2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ setunon2.cpp
+|
+
+setunon1.obj :  setunon1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ setunon1.cpp
+|
+
+setunon0.obj :  setunon0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ setunon0.cpp
+|
+
+setsymd2.obj :  setsymd2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ setsymd2.cpp
+|
+
+setsymd1.obj :  setsymd1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ setsymd1.cpp
+|
+
+setsymd0.obj :  setsymd0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ setsymd0.cpp
+|
+
+setintr2.obj :  setintr2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ setintr2.cpp
+|
+
+setintr1.obj :  setintr1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ setintr1.cpp
+|
+
+setintr0.obj :  setintr0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ setintr0.cpp
+|
+
+setdiff2.obj :  setdiff2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ setdiff2.cpp
+|
+
+setdiff1.obj :  setdiff1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ setdiff1.cpp
+|
+
+setdiff0.obj :  setdiff0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ setdiff0.cpp
+|
+
+set2.obj :  set2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ set2.cpp
+|
+
+set1.obj :  set1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ set1.cpp
+|
+
+search2.obj :  search2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ search2.cpp
+|
+
+search1.obj :  search1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ search1.cpp
+|
+
+search0.obj :  search0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ search0.cpp
+|
+
+rotcopy1.obj :  rotcopy1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ rotcopy1.cpp
+|
+
+stack2.obj :  stack2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ stack2.cpp
+|
+
+ptrunf1.obj :  ptrunf1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ ptrunf1.cpp
+|
+
+rotate0.obj :  rotate0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ rotate0.cpp
+|
+
+rndshuf2.obj :  rndshuf2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ rndshuf2.cpp
+|
+
+rndshuf1.obj :  rndshuf1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ rndshuf1.cpp
+|
+
+rndshuf0.obj :  rndshuf0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ rndshuf0.cpp
+|
+
+reviter2.obj :  reviter2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ reviter2.cpp
+|
+
+reviter1.obj :  reviter1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ reviter1.cpp
+|
+
+reverse1.obj :  reverse1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ reverse1.cpp
+|
+
+revcopy1.obj :  revcopy1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ revcopy1.cpp
+|
+
+revbit2.obj :  revbit2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ revbit2.cpp
+|
+
+revbit1.obj :  revbit1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ revbit1.cpp
+|
+
+replif1.obj :  replif1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ replif1.cpp
+|
+
+replcpy1.obj :  replcpy1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ replcpy1.cpp
+|
+
+replace1.obj :  replace1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ replace1.cpp
+|
+
+replace0.obj :  replace0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ replace0.cpp
+|
+
+repcpif1.obj :  repcpif1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ repcpif1.cpp
+|
+
+remove1.obj :  remove1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ remove1.cpp
+|
+
+remif1.obj :  remif1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ remif1.cpp
+|
+
+remcpif1.obj :  remcpif1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ remcpif1.cpp
+|
+
+remcopy1.obj :  remcopy1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ remcopy1.cpp
+|
+
+rawiter.obj :  rawiter.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ rawiter.cpp
+|
+
+queue1.obj :  queue1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ queue1.cpp
+|
+
+ptrunf2.obj :  ptrunf2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ ptrunf2.cpp
+|
+
+rotate1.obj :  rotate1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ rotate1.cpp
+|
+
+pair0.obj :  pair0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ pair0.cpp
+|
+
+ptrbinf1.obj :  ptrbinf1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ ptrbinf1.cpp
+|
+
+ptition1.obj :  ptition1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ ptition1.cpp
+|
+
+ptition0.obj :  ptition0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ ptition0.cpp
+|
+
+prevprm2.obj :  prevprm2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ prevprm2.cpp
+|
+
+prevprm1.obj :  prevprm1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ prevprm1.cpp
+|
+
+prevprm0.obj :  prevprm0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ prevprm0.cpp
+|
+
+pqueue1.obj :  pqueue1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ pqueue1.cpp
+|
+
+plus.obj :  plus.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ plus.cpp
+|
+
+pheap2.obj :  pheap2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ pheap2.cpp
+|
+
+pheap1.obj :  pheap1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ pheap1.cpp
+|
+
+partsum2.obj :  partsum2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ partsum2.cpp
+|
+
+partsum1.obj :  partsum1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ partsum1.cpp
+|
+
+partsum0.obj :  partsum0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ partsum0.cpp
+|
+
+partsrt0.obj :  partsrt0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ partsrt0.cpp
+|
+
+parsrtc2.obj :  parsrtc2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ parsrtc2.cpp
+|
+
+parsrtc1.obj :  parsrtc1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ parsrtc1.cpp
+|
+
+parsrtc0.obj :  parsrtc0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ parsrtc0.cpp
+|
+
+parsrt2.obj :  parsrt2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ parsrt2.cpp
+|
+
+parsrt1.obj :  parsrt1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ parsrt1.cpp
+|
+
+parsrt0.obj :  parsrt0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ parsrt0.cpp
+|
+
+pair2.obj :  pair2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ pair2.cpp
+|
+
+pair1.obj :  pair1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ pair1.cpp
+|
+
+ptrbinf2.obj :  ptrbinf2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ ptrbinf2.cpp
+|
+
+minelem1.obj :  minelem1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ minelem1.cpp
+|
+
+nthelem2.obj :  nthelem2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ nthelem2.cpp
+|
+
+nthelem1.obj :  nthelem1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ nthelem1.cpp
+|
+
+nthelem0.obj :  nthelem0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ nthelem0.cpp
+|
+
+nextprm2.obj :  nextprm2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ nextprm2.cpp
+|
+
+nextprm1.obj :  nextprm1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ nextprm1.cpp
+|
+
+nextprm0.obj :  nextprm0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ nextprm0.cpp
+|
+
+nequal.obj :  nequal.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ nequal.cpp
+|
+
+negate.obj :  negate.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ negate.cpp
+|
+
+mset5.obj :  mset5.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ mset5.cpp
+|
+
+mset4.obj :  mset4.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ mset4.cpp
+|
+
+mset3.obj :  mset3.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ mset3.cpp
+|
+
+mset1.obj :  mset1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ mset1.cpp
+|
+
+modulus.obj :  modulus.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ modulus.cpp
+|
+
+mmap2.obj :  mmap2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ mmap2.cpp
+|
+
+mmap1.obj :  mmap1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ mmap1.cpp
+|
+
+mkheap1.obj :  mkheap1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ mkheap1.cpp
+|
+
+mkheap0.obj :  mkheap0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ mkheap0.cpp
+|
+
+mismtch2.obj :  mismtch2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ mismtch2.cpp
+|
+
+mismtch1.obj :  mismtch1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ mismtch1.cpp
+|
+
+mismtch0.obj :  mismtch0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ mismtch0.cpp
+|
+
+minus.obj :  minus.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ minus.cpp
+|
+
+minelem2.obj :  minelem2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ minelem2.cpp
+|
+
+ostmit.obj :  ostmit.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ ostmit.cpp
+|
+
+iterswp1.obj :  iterswp1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ iterswp1.cpp
+|
+
+min1.obj :  min1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ min1.cpp
+|
+
+merge2.obj :  merge2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ merge2.cpp
+|
+
+merge1.obj :  merge1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ merge1.cpp
+|
+
+merge0.obj :  merge0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ merge0.cpp
+|
+
+maxelem2.obj :  maxelem2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ maxelem2.cpp
+|
+
+maxelem1.obj :  maxelem1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ maxelem1.cpp
+|
+
+max2.obj :  max2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ max2.cpp
+|
+
+max1.obj :  max1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ max1.cpp
+|
+
+map1.obj :  map1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ map1.cpp
+|
+
+lwrbnd2.obj :  lwrbnd2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ lwrbnd2.cpp
+|
+
+lwrbnd1.obj :  lwrbnd1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ lwrbnd1.cpp
+|
+
+logicor.obj :  logicor.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ logicor.cpp
+|
+
+logicnot.obj :  logicnot.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ logicnot.cpp
+|
+
+logicand.obj :  logicand.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ logicand.cpp
+|
+
+list4.obj :  list4.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ list4.cpp
+|
+
+list3.obj :  list3.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ list3.cpp
+|
+
+list2.obj :  list2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ list2.cpp
+|
+
+list1.obj :  list1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ list1.cpp
+|
+
+lexcmp2.obj :  lexcmp2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ lexcmp2.cpp
+|
+
+lexcmp1.obj :  lexcmp1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ lexcmp1.cpp
+|
+
+lesseq.obj :  lesseq.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ lesseq.cpp
+|
+
+less.obj :  less.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ less.cpp
+|
+
+min2.obj :  min2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ min2.cpp
+|
+
+greater.obj :  greater.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ greater.cpp
+|
+
+iter4.obj :  iter4.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ iter4.cpp
+|
+
+iter3.obj :  iter3.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ iter3.cpp
+|
+
+iter2.obj :  iter2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ iter2.cpp
+|
+
+iter1.obj :  iter1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ iter1.cpp
+|
+
+istmit1.obj :  istmit1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ istmit1.cpp
+|
+
+iota1.obj :  iota1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ iota1.cpp
+|
+
+insert2.obj :  insert2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ insert2.cpp
+|
+
+insert1.obj :  insert1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ insert1.cpp
+|
+
+inrprod2.obj :  inrprod2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ inrprod2.cpp
+|
+
+inrprod1.obj :  inrprod1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ inrprod1.cpp
+|
+
+inrprod0.obj :  inrprod0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ inrprod0.cpp
+|
+
+inplmrg2.obj :  inplmrg2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ inplmrg2.cpp
+|
+
+inplmrg1.obj :  inplmrg1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ inplmrg1.cpp
+|
+
+incl2.obj :  incl2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ incl2.cpp
+|
+
+incl1.obj :  incl1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ incl1.cpp
+|
+
+incl0.obj :  incl0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ incl0.cpp
+|
+
+iterswp0.obj :  iterswp0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ iterswp0.cpp
+|
+
+eqlrnge2.obj :  eqlrnge2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ eqlrnge2.cpp
+|
+
+genern2.obj :  genern2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ genern2.cpp
+|
+
+genern1.obj :  genern1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ genern1.cpp
+|
+
+gener2.obj :  gener2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ gener2.cpp
+|
+
+gener1.obj :  gener1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ gener1.cpp
+|
+
+func3.obj :  func3.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ func3.cpp
+|
+
+func2.obj :  func2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ func2.cpp
+|
+
+func1.obj :  func1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ func1.cpp
+|
+
+foreach1.obj :  foreach1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ foreach1.cpp
+|
+
+foreach0.obj :  foreach0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ foreach0.cpp
+|
+
+finsert2.obj :  finsert2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ finsert2.cpp
+|
+
+finsert1.obj :  finsert1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ finsert1.cpp
+|
+
+findif1.obj :  findif1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ findif1.cpp
+|
+
+findif0.obj :  findif0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ findif0.cpp
+|
+
+find1.obj :  find1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ find1.cpp
+|
+
+find0.obj :  find0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ find0.cpp
+|
+
+filln1.obj :  filln1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ filln1.cpp
+|
+
+fill1.obj :  fill1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ fill1.cpp
+|
+
+equalto.obj :  equalto.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ equalto.cpp
+|
+
+equal2.obj :  equal2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ equal2.cpp
+|
+
+equal1.obj :  equal1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ equal1.cpp
+|
+
+equal0.obj :  equal0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ equal0.cpp
+|
+
+greateq.obj :  greateq.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ greateq.cpp
+|
+
+binsrch1.obj :  binsrch1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ binsrch1.cpp
+|
+
+eqlrnge0.obj :  eqlrnge0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ eqlrnge0.cpp
+|
+
+divides.obj :  divides.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ divides.cpp
+|
+
+deque1.obj :  deque1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ deque1.cpp
+|
+
+countif1.obj :  countif1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ countif1.cpp
+|
+
+count1.obj :  count1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ count1.cpp
+|
+
+count0.obj :  count0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ count0.cpp
+|
+
+copyb0.obj :  copyb0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ copyb0.cpp
+|
+
+copyb.obj :  copyb.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ copyb.cpp
+|
+
+copy4.obj :  copy4.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ copy4.cpp
+|
+
+copy3.obj :  copy3.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ copy3.cpp
+|
+
+copy2.obj :  copy2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ copy2.cpp
+|
+
+copy1.obj :  copy1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ copy1.cpp
+|
+
+bvec1.obj :  bvec1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ bvec1.cpp
+|
+
+bnegate2.obj :  bnegate2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ bnegate2.cpp
+|
+
+bnegate1.obj :  bnegate1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ bnegate1.cpp
+|
+
+binsrch2.obj :  binsrch2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ binsrch2.cpp
+|
+
+eqlrnge1.obj :  eqlrnge1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ eqlrnge1.cpp
+|
+
+accum1.obj :  accum1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ accum1.cpp
+|
+
+binsert1.obj :  binsert1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ binsert1.cpp
+|
+
+bind2nd2.obj :  bind2nd2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ bind2nd2.cpp
+|
+
+bind2nd1.obj :  bind2nd1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ bind2nd1.cpp
+|
+
+bind1st1.obj :  bind1st1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ bind1st1.cpp
+|
+
+bind1st2.obj :  bind1st2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ bind1st2.cpp
+|
+
+bcompos2.obj :  bcompos2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ bcompos2.cpp
+|
+
+bcompos1.obj :  bcompos1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ bcompos1.cpp
+|
+
+alg5.obj :  alg5.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ alg5.cpp
+|
+
+alg4.obj :  alg4.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ alg4.cpp
+|
+
+alg3.obj :  alg3.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ alg3.cpp
+|
+
+alg2.obj :  alg2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ alg2.cpp
+|
+
+alg1.obj :  alg1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ alg1.cpp
+|
+
+advance.obj :  advance.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ advance.cpp
+|
+
+adjfind2.obj :  adjfind2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ adjfind2.cpp
+|
+
+adjfind1.obj :  adjfind1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ adjfind1.cpp
+|
+
+adjfind0.obj :  adjfind0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ adjfind0.cpp
+|
+
+adjdiff2.obj :  adjdiff2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ adjdiff2.cpp
+|
+
+adjdiff1.obj :  adjdiff1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ adjdiff1.cpp
+|
+
+adjdiff0.obj :  adjdiff0.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ adjdiff0.cpp
+|
+
+accum2.obj :  accum2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ accum2.cpp
+|
+
+binsert2.obj :  binsert2.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ binsert2.cpp
+|
+
+string1.obj :  string1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ string1.cpp
+|
+
+bitset1.obj :  bitset1.cpp
+  $(BCC32) -c @&&|
+ $(CompOptsAt_osdexe) $(CompInheritOptsAt_osdexe) -o$@ bitset1.cpp
+|
+
+# Compiler configuration file
+BccW32.cfg : 
+   Copy &&|
+-w
+-R
+-v
+-vi
+-H
+-WC
+-g255
+-H-
+| $@
+
+
diff --git a/main/source/stlport/test/regression/bc502.mak b/main/source/stlport/test/regression/bc502.mak
new file mode 100644
index 00000000..5ee748ba
--- /dev/null
+++ b/main/source/stlport/test/regression/bc502.mak
@@ -0,0 +1,279 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+BCC32=bcc32
+CPP32=cpp32
+
+# ---------------------------------------------------------------------------
+PROJECT = stl_test.exe
+
+OBJFILES = \
+   vec2.obj\
+   vec7.obj\
+   vec6.obj\
+   vec5.obj\
+   vec4.obj\
+   vec3.obj\
+   vec8.obj\
+   stat.obj\
+   uprbnd2.obj\
+   uprbnd1.obj\
+   unique2.obj\
+   unique1.obj\
+   uniqcpy2.obj\
+   uniqcpy1.obj\
+   unegate2.obj\
+   unegate1.obj\
+   ucompos2.obj\
+   ucompos1.obj\
+   trnsfrm2.obj\
+   trnsfrm1.obj\
+   times.obj\
+   swprnge1.obj\
+   swap1.obj\
+   stl_test.obj\
+   stblsrt2.obj\
+   stblsrt1.obj\
+   stblptn1.obj\
+   stblptn0.obj\
+   vec1.obj\
+   rotcopy0.obj\
+   stack1.obj\
+   sort2.obj\
+   sort1.obj\
+   setunon2.obj\
+   setunon1.obj\
+   setunon0.obj\
+   setsymd2.obj\
+   setsymd1.obj\
+   setsymd0.obj\
+   setintr2.obj\
+   setintr1.obj\
+   setintr0.obj\
+   setdiff2.obj\
+   setdiff1.obj\
+   setdiff0.obj\
+   set2.obj\
+   set1.obj\
+   search2.obj\
+   search1.obj\
+   search0.obj\
+   rotcopy1.obj\
+   stack2.obj\
+   ptrunf1.obj\
+   rotate0.obj\
+   rndshuf2.obj\
+   rndshuf1.obj\
+   rndshuf0.obj\
+   reviter2.obj\
+   reviter1.obj\
+   reverse1.obj\
+   revcopy1.obj\
+   revbit2.obj\
+   revbit1.obj\
+   replif1.obj\
+   replcpy1.obj\
+   replace1.obj\
+   replace0.obj\
+   repcpif1.obj\
+   remove1.obj\
+   remif1.obj\
+   remcpif1.obj\
+   remcopy1.obj\
+   rawiter.obj\
+   queue1.obj\
+   ptrunf2.obj\
+   rotate1.obj\
+   pair0.obj\
+   ptrbinf1.obj\
+   ptition1.obj\
+   ptition0.obj\
+   prevprm2.obj\
+   prevprm1.obj\
+   prevprm0.obj\
+   pqueue1.obj\
+   plus.obj\
+   pheap2.obj\
+   pheap1.obj\
+   partsum2.obj\
+   partsum1.obj\
+   partsum0.obj\
+   partsrt0.obj\
+   parsrtc2.obj\
+   parsrtc1.obj\
+   parsrtc0.obj\
+   parsrt2.obj\
+   parsrt1.obj\
+   parsrt0.obj\
+   pair2.obj\
+   pair1.obj\
+   ptrbinf2.obj\
+   minelem1.obj\
+   nthelem2.obj\
+   nthelem1.obj\
+   nthelem0.obj\
+   nextprm2.obj\
+   nextprm1.obj\
+   nextprm0.obj\
+   nequal.obj\
+   negate.obj\
+   mset5.obj\
+   mset4.obj\
+   mset3.obj\
+   mset1.obj\
+   modulus.obj\
+   mmap2.obj\
+   mmap1.obj\
+   mkheap1.obj\
+   mkheap0.obj\
+   mismtch2.obj\
+   mismtch1.obj\
+   mismtch0.obj\
+   minus.obj\
+   minelem2.obj\
+   ostmit.obj\
+   iterswp1.obj\
+   min1.obj\
+   memfunptr.obj \
+   merge2.obj\
+   merge1.obj\
+   merge0.obj\
+   maxelem2.obj\
+   maxelem1.obj\
+   max2.obj\
+   max1.obj\
+   map1.obj\
+   lwrbnd2.obj\
+   lwrbnd1.obj\
+   logicor.obj\
+   logicnot.obj\
+   logicand.obj\
+   list4.obj\
+   list3.obj\
+   list2.obj\
+   list1.obj\
+   lexcmp2.obj\
+   lexcmp1.obj\
+   lesseq.obj\
+   less.obj\
+   min2.obj\
+   greater.obj\
+   iter4.obj\
+   iter3.obj\
+   iter2.obj\
+   iter1.obj\
+   istmit1.obj\
+   iota1.obj\
+   insert2.obj\
+   insert1.obj\
+   inrprod2.obj\
+   inrprod1.obj\
+   inrprod0.obj\
+   inplmrg2.obj\
+   inplmrg1.obj\
+   incl2.obj\
+   incl1.obj\
+   incl0.obj\
+   iterswp0.obj\
+   eqlrnge2.obj\
+   genern2.obj\
+   genern1.obj\
+   gener2.obj\
+   gener1.obj\
+   func3.obj\
+   func2.obj\
+   func1.obj\
+   foreach1.obj\
+   foreach0.obj\
+   finsert2.obj\
+   finsert1.obj\
+   findif1.obj\
+   findif0.obj\
+   find1.obj\
+   find0.obj\
+   filln1.obj\
+   fill1.obj\
+   equalto.obj\
+   equal2.obj\
+   equal1.obj\
+   equal0.obj\
+   greateq.obj\
+   binsrch1.obj\
+   eqlrnge0.obj\
+   divides.obj\
+   deque1.obj\
+   countif1.obj\
+   count1.obj\
+   count0.obj\
+   copyb0.obj\
+   copyb.obj\
+   copy4.obj\
+   copy3.obj\
+   copy2.obj\
+   copy1.obj\
+   bvec1.obj\
+   bnegate2.obj\
+   bnegate1.obj\
+   binsrch2.obj\
+   eqlrnge1.obj\
+   accum1.obj\
+   binsert1.obj\
+   bind2nd2.obj\
+   bind2nd1.obj\
+   bind1st1.obj\
+   bind1st2.obj\
+   bcompos2.obj\
+   bcompos1.obj\
+   alg5.obj\
+   alg4.obj\
+   alg3.obj\
+   alg2.obj\
+   alg1.obj\
+   advance.obj\
+   adjfind2.obj\
+   adjfind1.obj\
+   adjfind0.obj\
+   adjdiff2.obj\
+   adjdiff1.obj\
+   adjdiff0.obj\
+   accum2.obj\
+   binsert2.obj\
+   hmap1.obj hmmap1.obj hset2.obj hmset1.obj \
+   slist1.cpp string1.cpp bitset1.cpp
+
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHPAS = .;
+PATHASM = .;
+PATHRC = .;
+
+# USERDEFINES = _STLP_NO_OWN_IOSTREAMS
+SYSDEFINES = _RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG
+
+ # ---------------------------------------------------------------------------
+CFLAG1 = -w- -j1  -I.;..\..\stlport\BC50;..\..\stlport;$(BCB)\include; -Od -v -N -x -xp -tWC -D$(SYSDEFINES);$(USERDEFINES)  -L..\..\lib
+# CFLAG1 = -w- -jb -j1  -I.;..\..\stlport;$(BCB)\include; -tWC -D$(SYSDEFINES);$(USERDEFINES)  -L..\..\lib
+
+.autodepend
+# ---------------------------------------------------------------------------
+
+all : $(PROJECT)
+
+$(PROJECT) : $(OBJFILES)
+	$(BCB)\BIN\$(BCC32) -e$(PROJECT) $(CFLAG1) $(OBJFILES)
+
+clean:
+	del *.obj *.exe *.core *.tds
+
+# ---------------------------------------------------------------------------
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) -n$(@D) -c $<
+
+.cpp.exe:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) -DMAIN  -n$(@D) $<
+
+.cpp.i:
+    $(BCB)\BIN\$(CPP32) $(CFLAG1) -n. -Sd {$< }
+# ---------------------------------------------------------------------------
diff --git a/main/source/stlport/test/regression/bcb.mak b/main/source/stlport/test/regression/bcb.mak
new file mode 100644
index 00000000..57cd92d6
--- /dev/null
+++ b/main/source/stlport/test/regression/bcb.mak
@@ -0,0 +1,284 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+BCC32=bcc32
+CPP32=cpp32
+
+# ---------------------------------------------------------------------------
+PROJECT = stl_test.exe
+
+OBJFILES = \
+   vec2.obj\
+   vec7.obj\
+   vec6.obj\
+   vec5.obj\
+   vec4.obj\
+   vec3.obj\
+   vec8.obj\
+   stat.obj\
+   uprbnd2.obj\
+   uprbnd1.obj\
+   unique2.obj\
+   unique1.obj\
+   uniqcpy2.obj\
+   uniqcpy1.obj\
+   unegate2.obj\
+   unegate1.obj\
+   ucompos2.obj\
+   ucompos1.obj\
+   trnsfrm2.obj\
+   trnsfrm1.obj\
+   times.obj\
+   swprnge1.obj\
+   swap1.obj\
+   stl_test.obj\
+   stblsrt2.obj\
+   stblsrt1.obj\
+   stblptn1.obj\
+   stblptn0.obj\
+   vec1.obj\
+   rotcopy0.obj\
+   stack1.obj\
+   sort2.obj\
+   sort1.obj\
+   setunon2.obj\
+   setunon1.obj\
+   setunon0.obj\
+   setsymd2.obj\
+   setsymd1.obj\
+   setsymd0.obj\
+   setintr2.obj\
+   setintr1.obj\
+   setintr0.obj\
+   setdiff2.obj\
+   setdiff1.obj\
+   setdiff0.obj\
+   set2.obj\
+   set1.obj\
+   search2.obj\
+   search1.obj\
+   search0.obj\
+   rotcopy1.obj\
+   stack2.obj\
+   ptrunf1.obj\
+   rotate0.obj\
+   rndshuf2.obj\
+   rndshuf1.obj\
+   rndshuf0.obj\
+   reviter2.obj\
+   reviter1.obj\
+   reverse1.obj\
+   revcopy1.obj\
+   revbit2.obj\
+   revbit1.obj\
+   replif1.obj\
+   replcpy1.obj\
+   replace1.obj\
+   replace0.obj\
+   repcpif1.obj\
+   remove1.obj\
+   remif1.obj\
+   remcpif1.obj\
+   remcopy1.obj\
+   rawiter.obj\
+   queue1.obj\
+   ptrunf2.obj\
+   rotate1.obj\
+   pair0.obj\
+   ptrbinf1.obj\
+   ptition1.obj\
+   ptition0.obj\
+   prevprm2.obj\
+   prevprm1.obj\
+   prevprm0.obj\
+   pqueue1.obj\
+   plus.obj\
+   pheap2.obj\
+   pheap1.obj\
+   partsum2.obj\
+   partsum1.obj\
+   partsum0.obj\
+   partsrt0.obj\
+   parsrtc2.obj\
+   parsrtc1.obj\
+   parsrtc0.obj\
+   parsrt2.obj\
+   parsrt1.obj\
+   parsrt0.obj\
+   pair2.obj\
+   pair1.obj\
+   ptrbinf2.obj\
+   minelem1.obj\
+   nthelem2.obj\
+   nthelem1.obj\
+   nthelem0.obj\
+   nextprm2.obj\
+   nextprm1.obj\
+   nextprm0.obj\
+   nequal.obj\
+   negate.obj\
+   mset5.obj\
+   mset4.obj\
+   mset3.obj\
+   mset1.obj\
+   modulus.obj\
+   mmap2.obj\
+   mmap1.obj\
+   mkheap1.obj\
+   mkheap0.obj\
+   mismtch2.obj\
+   mismtch1.obj\
+   mismtch0.obj\
+   minus.obj\
+   minelem2.obj\
+   ostmit.obj\
+   iterswp1.obj\
+   min1.obj\
+   memfunptr.obj \
+   merge2.obj\
+   merge1.obj\
+   merge0.obj\
+   maxelem2.obj\
+   maxelem1.obj\
+   max2.obj\
+   max1.obj\
+   map1.obj\
+   lwrbnd2.obj\
+   lwrbnd1.obj\
+   logicor.obj\
+   logicnot.obj\
+   logicand.obj\
+   list4.obj\
+   list3.obj\
+   list2.obj\
+   list1.obj\
+   lexcmp2.obj\
+   lexcmp1.obj\
+   lesseq.obj\
+   less.obj\
+   min2.obj\
+   greater.obj\
+   iter4.obj\
+   iter3.obj\
+   iter2.obj\
+   iter1.obj\
+   istmit1.obj\
+   iota1.obj\
+   insert2.obj\
+   insert1.obj\
+   inrprod2.obj\
+   inrprod1.obj\
+   inrprod0.obj\
+   inplmrg2.obj\
+   inplmrg1.obj\
+   incl2.obj\
+   incl1.obj\
+   incl0.obj\
+   iterswp0.obj\
+   eqlrnge2.obj\
+   genern2.obj\
+   genern1.obj\
+   gener2.obj\
+   gener1.obj\
+   func3.obj\
+   func2.obj\
+   func1.obj\
+   foreach1.obj\
+   foreach0.obj\
+   finsert2.obj\
+   finsert1.obj\
+   findif1.obj\
+   findif0.obj\
+   find1.obj\
+   find0.obj\
+   filln1.obj\
+   fill1.obj\
+   equalto.obj\
+   equal2.obj\
+   equal1.obj\
+   equal0.obj\
+   greateq.obj\
+   binsrch1.obj\
+   eqlrnge0.obj\
+   divides.obj\
+   deque1.obj\
+   countif1.obj\
+   count1.obj\
+   count0.obj\
+   copyb0.obj\
+   copyb.obj\
+   copy4.obj\
+   copy3.obj\
+   copy2.obj\
+   copy1.obj\
+   bvec1.obj\
+   bnegate2.obj\
+   bnegate1.obj\
+   binsrch2.obj\
+   eqlrnge1.obj\
+   accum1.obj\
+   binsert1.obj\
+   bind2nd2.obj\
+   bind2nd1.obj\
+   bind1st1.obj\
+   bind1st2.obj\
+   bcompos2.obj\
+   bcompos1.obj\
+   alg5.obj\
+   alg4.obj\
+   alg3.obj\
+   alg2.obj\
+   alg1.obj\
+   advance.obj\
+   adjfind2.obj\
+   adjfind1.obj\
+   adjfind0.obj\
+   adjdiff2.obj\
+   adjdiff1.obj\
+   adjdiff0.obj\
+   accum2.obj\
+   binsert2.obj\
+   hmap1.obj hmmap1.obj hset2.obj hmset1.obj \
+   slist1.cpp string1.cpp bitset1.cpp
+
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHPAS = .;
+PATHASM = .;
+PATHRC = .;
+
+USERDEFINES = _DEBUG
+SYSDEFINES = NO_STRICT;USEPACKAGES
+
+ # ---------------------------------------------------------------------------
+# CFLAG1 = -w- -jb -j1  -I.;..\..\stlport;$(BCB)\include; -Od -v -N -x -xp -tWCR -D$(SYSDEFINES);$(USERDEFINES)  -L..\..\lib
+
+# CFLAG1 = -w- -jb -j1  -I.;..\..\stlport;$(BCB)\include; -tWCR -w-par -w-inl -w-stl -D$(SYSDEFINES);$(USERDEFINES)
+
+CFLAG1 = -w- -jb -j1  -I.;..\..\stlport;$(BCB)\include; -Od -v -N -x -xp -tWC -D$(SYSDEFINES);$(USERDEFINES) -L..\..\lib
+
+LDFLAGS =  -L..\..\lib;$(BCB)\..\lib stlpst.lib
+
+.autodepend
+# ---------------------------------------------------------------------------
+
+all : $(PROJECT)
+
+$(PROJECT) : $(OBJFILES)
+	$(BCB)\BIN\$(BCC32) -e$(PROJECT) $(CFLAG1) $(LDFLAGS) $(OBJFILES)
+
+clean:
+	del *.obj *.exe *.core *.tds
+
+# ---------------------------------------------------------------------------
+.cpp.obj:
+    $(BCC32) $(CFLAG1) -n$(@D) -c $<
+
+.cpp.exe:
+    $(BCC32) $(CFLAG1) -DMAIN  -n$(@D) $<
+
+.cpp.i:
+    $(CPP32) $(CFLAG1) -n. -Sr -Ss -Sd {$< }
+# ---------------------------------------------------------------------------
diff --git a/main/source/stlport/test/regression/bcompos1.cpp b/main/source/stlport/test/regression/bcompos1.cpp
new file mode 100644
index 00000000..545dacab
--- /dev/null
+++ b/main/source/stlport/test/regression/bcompos1.cpp
@@ -0,0 +1,31 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#include "unary.h"
+
+
+#ifdef MAIN 
+#define bcompos1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int bcompos1_test(int, char**)
+{
+  cout<<"Results of bcompos1_test:"<<endl;
+
+int array [6] = { -2, -1, 0, 1, 2, 3 };
+
+  binary_compose<logical_and<bool>, odd, positive> 
+    b = binary_compose<logical_and<bool>, odd, positive>
+(logical_and<bool>(), odd(), positive());
+  int* p = find_if((int*)array, (int*)array + 6, b);
+  if(p != array + 6)
+    cout << *p << " is odd and positive" << endl;
+
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/bcompos2.cpp b/main/source/stlport/test/regression/bcompos2.cpp
new file mode 100644
index 00000000..8edd8734
--- /dev/null
+++ b/main/source/stlport/test/regression/bcompos2.cpp
@@ -0,0 +1,28 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#include "unary.h"
+
+
+#ifdef MAIN 
+#define bcompos2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int bcompos2_test(int, char**)
+{
+  cout<<"Results of bcompos2_test:"<<endl;
+
+int array [6] = { -2, -1 , 0, 1, 2, 3 };
+
+  int* p = find_if((int*)array, (int*)array + 6, 
+    compose2(logical_and<bool>(), odd(), positive()));
+  if(p != array + 6)
+    cout << *p << " is odd and positive" << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/bind1st1.cpp b/main/source/stlport/test/regression/bind1st1.cpp
new file mode 100644
index 00000000..77f03c7b
--- /dev/null
+++ b/main/source/stlport/test/regression/bind1st1.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <functional>
+
+#ifdef MAIN 
+#define bind1st1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int bind1st1_test(int, char**)
+{
+  cout<<"Results of bind1st1_test:"<<endl;
+  int array [3] = { 1, 2, 3 };
+  int* p = remove_if((int*)array, (int*)array + 3, 
+    bind1st(less<int>(), 2));
+  for(int* i = array; i != p; i++)
+    cout << *i << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/bind1st2.cpp b/main/source/stlport/test/regression/bind1st2.cpp
new file mode 100644
index 00000000..22fc22f4
--- /dev/null
+++ b/main/source/stlport/test/regression/bind1st2.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <functional>
+
+#ifdef MAIN 
+#define bind1st2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int bind1st2_test(int, char**)
+{
+  cout<<"Results of bind1st2_test:"<<endl;
+int array [3] = { 1, 2, 3 };
+
+  int* p = remove_if((int*)array, (int*)array + 3, bind1st(less<int>(), 2));
+  for(int* i = array; i != p; i++)
+    cout << *i << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/bind2nd1.cpp b/main/source/stlport/test/regression/bind2nd1.cpp
new file mode 100644
index 00000000..630a4f79
--- /dev/null
+++ b/main/source/stlport/test/regression/bind2nd1.cpp
@@ -0,0 +1,25 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <functional>
+
+#ifdef MAIN 
+#define bind2nd1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int bind2nd1_test(int, char**)
+{
+  cout<<"Results of bind2nd1_test:"<<endl;
+int array [3] = { 1, 2, 3 };
+
+  replace_if(array, array + 3, 
+    binder2nd<greater<int> >(greater<int>(), 2), 4);
+  for(int i = 0; i < 3; i++)
+    cout << array[i] << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/bind2nd2.cpp b/main/source/stlport/test/regression/bind2nd2.cpp
new file mode 100644
index 00000000..e7865637
--- /dev/null
+++ b/main/source/stlport/test/regression/bind2nd2.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <functional>
+
+#ifdef MAIN 
+#define bind2nd2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int bind2nd2_test(int, char**)
+{
+  cout<<"Results of bind2nd2_test:"<<endl;
+int array [3] = { 1, 2, 3 };
+
+  replace_if(array, array + 3, bind2nd(greater<int>(), 2), 4);
+  for(int i = 0; i < 3; i++)
+    cout << array[i] << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/binsert1.cpp b/main/source/stlport/test/regression/binsert1.cpp
new file mode 100644
index 00000000..6d2cb73b
--- /dev/null
+++ b/main/source/stlport/test/regression/binsert1.cpp
@@ -0,0 +1,26 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <vector>
+#include <algorithm>
+
+#ifdef MAIN 
+#define binsert1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int binsert1_test(int, char**)
+{
+  cout<<"Results of binsert1_test:"<<endl;
+char* array [] = { "laurie", "jennifer", "leisa" };
+
+  vector<char*> names;
+  copy(array, array + 3, back_insert_iterator<vector <char*> >(names));
+  std::vector<char*>::iterator i;
+  for(i = names.begin(); i != names.end(); i++)
+    cout << *i << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/binsert2.cpp b/main/source/stlport/test/regression/binsert2.cpp
new file mode 100644
index 00000000..a8ba13e5
--- /dev/null
+++ b/main/source/stlport/test/regression/binsert2.cpp
@@ -0,0 +1,26 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <vector>
+#include <algorithm>
+
+#ifdef MAIN 
+#define binsert2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int binsert2_test(int, char**)
+{
+  cout<<"Results of binsert2_test:"<<endl;
+char* array [] = { "laurie", "jennifer", "leisa" };
+
+  vector<char*> names;
+  copy(array, array + 3, back_inserter(names));
+  std::vector<char*>::iterator i;
+  for(i = names.begin(); i != names.end(); i++)
+    cout << *i << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/binsrch1.cpp b/main/source/stlport/test/regression/binsrch1.cpp
new file mode 100644
index 00000000..32311d32
--- /dev/null
+++ b/main/source/stlport/test/regression/binsrch1.cpp
@@ -0,0 +1,25 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+
+#ifdef MAIN 
+#define binsrch1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int binsrch1_test(int, char**)
+{
+  cout<<"Results of binsrch1_test:"<<endl;
+  int vector[100];
+  for(int i = 0; i < 100; i++)
+    vector[i] = i;
+  if(binary_search(vector, vector + 100, 42))
+    cout << "found 42" << endl;
+  else
+    cout << "did not find 42" << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/binsrch2.cpp b/main/source/stlport/test/regression/binsrch2.cpp
new file mode 100644
index 00000000..c163694e
--- /dev/null
+++ b/main/source/stlport/test/regression/binsrch2.cpp
@@ -0,0 +1,33 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <cstring>
+
+#ifdef MAIN 
+#define binsrch2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+static bool str_compare(const char* a_, const char* b_)
+{
+  return strcmp(a_, b_) < 0 ? 1 : 0;
+}
+int binsrch2_test(int, char**)
+{
+  cout<<"Results of binsrch2_test:"<<endl;
+
+char* labels[] = { "aa", "dd", "ff", "jj", "ss", "zz" };
+
+  const unsigned count = sizeof(labels) / sizeof(labels[0]);
+  // DEC C++ generates incorrect template instatiation code 
+  // for "ff" so must cast 
+  if(binary_search(labels, labels + count, (const char *)"ff", str_compare))
+    cout << "ff is in labels." << endl;
+  else
+    cout << "ff is not in labels." << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/bitset1.cpp b/main/source/stlport/test/regression/bitset1.cpp
new file mode 100644
index 00000000..c0dc4540
--- /dev/null
+++ b/main/source/stlport/test/regression/bitset1.cpp
@@ -0,0 +1,58 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+
+#include <stdexcept>
+#include <iostream>
+#include <bitset>
+#include <algorithm>
+
+#if defined (_STLP_MSVC) && (_MSC_VER < 1300)
+# define _STLP_NON_TYPE_TMPL_PARAM_BUG
+# define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
+#endif
+
+# ifdef _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
+# define CHART
+# else
+# define CHART <char, char_traits<char>, allocator<char> >
+# endif
+
+#ifdef MAIN 
+#define bitset1_test main
+#endif
+
+#if !defined (STLPORT) || defined(_STLP_USE_NAMESPACES)
+using namespace std;
+#endif
+
+int bitset1_test(int, char**)
+{
+  cout<<"Results of bitset1_test:"<<endl;
+
+# if ! (defined (_STLP_MSVC) && (_MSC_VER < 1300)) && ! (defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500))
+  bitset<13U> b1(0xFFFF);
+  bitset<13U> b2(0x1111);
+  // Boris : MSVC just cannot take it right
+  cout << "b1 size = " << b1.size() << endl;
+# if !defined (_STLP_NON_TYPE_TMPL_PARAM_BUG)
+  cout << "b1 = "<<b1<<endl;
+# else
+  cout << "b1 = "<<b1.to_string CHART ()<<endl;
+# endif
+  cout << "b2 size = " << b2.size() << endl;
+# if defined (_STLP_NON_TYPE_TMPL_PARAM_BUG)
+  cout << "b2 = "<<b2.to_string CHART ()<<endl;
+# else
+  cout << "b2 = "<<b2<<endl;
+# endif
+  b1 = b1^(b2<<2);
+# ifdef _STLP_NON_TYPE_TMPL_PARAM_BUG
+  cout << "b1 = "<<b1.to_string CHART ()<<endl;
+# else
+  cout << "b1 = "<<b1<<endl;
+# endif
+# endif /* MSVC */
+  return 0;
+}
+
diff --git a/main/source/stlport/test/regression/bnegate1.cpp b/main/source/stlport/test/regression/bnegate1.cpp
new file mode 100644
index 00000000..3f0fccf4
--- /dev/null
+++ b/main/source/stlport/test/regression/bnegate1.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <functional>
+
+#ifdef MAIN 
+#define bnegate1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int bnegate1_test(int, char**)
+{
+  cout<<"Results of bnegate1_test:"<<endl;
+int array [4] = { 4, 9, 7, 1 };
+
+  sort(array, array + 4, binary_negate<greater<int> >(greater<int>()));
+  for(int i = 0; i < 4; i++)
+    cout << array[i] << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/bnegate2.cpp b/main/source/stlport/test/regression/bnegate2.cpp
new file mode 100644
index 00000000..d6b601af
--- /dev/null
+++ b/main/source/stlport/test/regression/bnegate2.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream> 
+#include <algorithm>
+#include <functional>
+
+#ifdef MAIN 
+#define bnegate2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int bnegate2_test(int, char**)
+{
+  cout<<"Results of bnegate2_test:"<<endl;
+int array [4] = { 4, 9, 7, 1 };
+
+  sort(array, array + 4, not2(greater<int>()));
+  for(int i = 0; i < 4; i++)
+    cout << array[i] << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/bug.cpp b/main/source/stlport/test/regression/bug.cpp
new file mode 100644
index 00000000..33cd4144
--- /dev/null
+++ b/main/source/stlport/test/regression/bug.cpp
@@ -0,0 +1,98 @@
+# include <iostream>
+# include <string>
+
+# if 0
+namespace N1 {
+     template <class T>
+     struct X {};
+}
+
+namespace N2 {
+  using N1::X;
+  //  using namespace N1;
+  
+  class AA 
+  {
+    
+    X<int> xint;
+  }
+  ;
+  typedef X<int> xint;
+  
+  
+  template <class T>
+     struct X1 : N1::X<T> {}; // fatal error C1001:Internal compiler error
+}
+
+namespace N3 {
+  using N1::X;
+  using N2::X;
+  using N2::xint;
+  
+  N2::xint x;
+  N2::X<int> y;
+}
+
+
+using N2::X;
+N2::X<int> y;
+
+N2::X1<int> y;
+
+main()
+{
+  std::basic_ostream<char, std::char_traits<char> > os;
+  
+  return 0;
+}
+
+# endif
+
+# include <iostream>
+
+using namespace std;
+
+# if 0
+class mystream : public std::istream 
+{
+public:
+    typedef std::istream _Base;
+    
+    mystream(const std::istream& s) :  _Base(s)
+        {
+        }
+
+    mystream& operator >>(char& c) 
+        {
+            using std::istream;
+            ((std::istream&)*this)>> ( c ) ;
+//            istream::operator>>(c);
+            
+            return ( *this ) ;
+        }
+    
+    
+}
+;
+
+mystream& aaa ( mystream& m, char& c)
+{
+    m>>c;
+    return m;
+}
+# endif
+
+
+main()
+{
+    string sss = "Hello World";
+    string ss2 = "aaa";
+    
+    if (ss2 >= 'c' + sss)
+        cout<<(sss+ss2);
+    
+//    mystream mm(std::cin);
+//    char cc;
+//    aaa(mm, cc);
+    
+}
diff --git a/main/source/stlport/test/regression/bvec1.cpp b/main/source/stlport/test/regression/bvec1.cpp
new file mode 100644
index 00000000..a6eb7908
--- /dev/null
+++ b/main/source/stlport/test/regression/bvec1.cpp
@@ -0,0 +1,51 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <vector>
+
+#ifdef MAIN 
+#define bvec1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+int bvec1_test(int, char**)
+{
+  bool ii[3]= {1,0,1};
+  cout<<"Results of bvec1_test:"<<endl;
+  bit_vector b(3);
+  int i;
+  for(i = 0; i < b.size(); i++)
+    cout << b[i];
+  cout << endl;
+  b[0] = b[2] = 1;
+  for(i = 0; i < b.size(); i++)
+    cout << b[i];
+  cout << endl;
+  b.insert(b.begin(),(bool*)ii, ii+2);
+  for(i = 0; i < b.size(); i++)
+    cout << b[i];
+  cout << endl;
+  bit_vector bb = b;
+  if (bb != b)
+    exit(1);
+
+  b[0] |= 0;
+  b[1] |= 0;
+  b[2] |= 1;
+  b[3] |= 1;
+  if ((b[0] != 1) || (b[1] != 0) || (b[2] != 1) || (b[3] != 1))
+    exit(1);
+  
+  bb[0] &= 0;
+  bb[1] &= 0;
+  bb[2] &= 1;
+  bb[3] &= 1;
+  if ((bb[0] != 0) || (bb[1] != 0) || (bb[2] != 1) || (bb[3] != 0))
+    exit(1);
+  
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/c_test.cpp b/main/source/stlport/test/regression/c_test.cpp
new file mode 100644
index 00000000..cc3db9dd
--- /dev/null
+++ b/main/source/stlport/test/regression/c_test.cpp
@@ -0,0 +1,59 @@
+#include <string>
+#include <iostream>
+#include <fstream>
+#include <list>
+
+#ifndef STLPORT
+//#error You Did not get the STLport include files!
+#endif
+
+using namespace std;
+
+main (int argc, char *argv[])
+{
+#ifdef STLPORT
+  string s2 = "STLport included";
+  cout << s2 << endl;
+#else
+  string s2 = "STLport NOT included!";
+  cout << s2 << endl;
+#endif
+
+  string s = "hello";
+  cout << s << endl;
+  ofstream fstr("testfile");
+  fstr << s << endl;
+
+
+  list<int> L;
+  for (int i = 0; i < 10; ++i) {
+    L.push_back(i);
+  }
+  for (list<int>::const_reverse_iterator cri = L.rbegin();
+       cri != (list<int>::const_reverse_iterator) L.rend(); ++cri) {
+    cout << *cri << endl;
+  }
+
+#ifdef STLPORT
+  string s3 = "PASSED";
+  if (strstr(argv[0], "nostlport"))
+    s3 = "FAILED";
+  cout << s3 << endl;
+#else
+  string s3 = "PASSED";
+  if (!strstr(argv[0], "nostlport"))
+    s3 = "FAILED";
+  cout << s3 << endl;
+#endif
+
+}
+
+
+
+
+
+
+
+
+
+
diff --git a/main/source/stlport/test/regression/como.mak b/main/source/stlport/test/regression/como.mak
new file mode 100644
index 00000000..dcb92046
--- /dev/null
+++ b/main/source/stlport/test/regression/como.mak
@@ -0,0 +1,171 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+.SUFFIXES:	.cc .cpp .o .exe .out
+
+srcdir = .
+VPATH = .
+
+# This makefile assumes STLport is configured as primary lib
+# STL_INCL=-I../../stlport
+
+LIST  = stl_test.cpp accum1.cpp accum2.cpp \
+	adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp \
+	advance.cpp \
+	alg1.cpp alg2.cpp alg3.cpp alg4.cpp alg5.cpp \
+	bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp \
+	bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp \
+	binsrch1.cpp binsrch2.cpp \
+	bnegate1.cpp bnegate2.cpp bvec1.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp \
+	copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp \
+	countif1.cpp \
+	deque1.cpp \
+	divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp \
+	equal0.cpp equal1.cpp equal2.cpp \
+	equalto.cpp \
+	fill1.cpp filln1.cpp \
+	find0.cpp find1.cpp \
+	findif0.cpp findif1.cpp \
+	finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp \
+	func1.cpp func2.cpp func3.cpp \
+	gener1.cpp gener2.cpp \
+	genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp \
+	incl0.cpp incl1.cpp incl2.cpp \
+	inplmrg1.cpp inplmrg2.cpp \
+	inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp \
+	iota1.cpp \
+	istmit1.cpp \
+	iter1.cpp iter2.cpp iter3.cpp iter4.cpp \
+	iterswp0.cpp iterswp1.cpp \
+	less.cpp \
+	lesseq.cpp \
+	lexcmp1.cpp lexcmp2.cpp \
+	list1.cpp list2.cpp list3.cpp list4.cpp \
+	logicand.cpp logicnot.cpp \
+	logicor.cpp \
+	lwrbnd1.cpp lwrbnd2.cpp \
+	map1.cpp \
+	max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp \
+	memfunptr.cpp \
+	merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp \
+	minelem1.cpp minelem2.cpp \
+	minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp \
+	mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp \
+	modulus.cpp \
+	mset1.cpp mset3.cpp mset4.cpp mset5.cpp \
+	negate.cpp nequal.cpp \
+	nextprm0.cpp nextprm1.cpp nextprm2.cpp \
+	nthelem0.cpp nthelem1.cpp nthelem2.cpp \
+	ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp \
+	parsrt0.cpp parsrt1.cpp parsrt2.cpp \
+	parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp \
+	partsum0.cpp partsum1.cpp partsum2.cpp \
+	pheap1.cpp pheap2.cpp \
+	plus.cpp \
+	pqueue1.cpp \
+	prevprm0.cpp prevprm1.cpp prevprm2.cpp \
+	ptition0.cpp ptition1.cpp \
+	ptrbinf1.cpp ptrbinf2.cpp \
+	ptrunf1.cpp ptrunf2.cpp \
+	queue1.cpp \
+	rawiter.cpp \
+	remcopy1.cpp \
+	remcpif1.cpp \
+	remif1.cpp \
+	remove1.cpp \
+	repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp \
+	revbit1.cpp revbit2.cpp \
+	revcopy1.cpp reverse1.cpp reviter1.cpp reviter2.cpp \
+	rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp \
+	search0.cpp search1.cpp search2.cpp \
+	set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp \
+	setintr0.cpp setintr1.cpp setintr2.cpp \
+	setsymd0.cpp setsymd1.cpp setsymd2.cpp \
+	setunon0.cpp setunon1.cpp setunon2.cpp \
+	sort1.cpp sort2.cpp \
+	stack1.cpp stack2.cpp \
+	stblptn0.cpp stblptn1.cpp \
+	stblsrt1.cpp stblsrt2.cpp \
+	swap1.cpp \
+	swprnge1.cpp \
+	times.cpp \
+	trnsfrm1.cpp trnsfrm2.cpp \
+	ucompos1.cpp ucompos2.cpp \
+	unegate1.cpp unegate2.cpp \
+	uniqcpy1.cpp uniqcpy2.cpp \
+	unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp \
+	vec1.cpp vec2.cpp vec3.cpp vec4.cpp vec5.cpp vec6.cpp vec7.cpp vec8.cpp \
+        hmmap1.cpp hset2.cpp hmset1.cpp slist1.cpp hmap1.cpp string1.cpp bitset1.cpp
+
+
+# STAT_MODULE=stat.o
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%.exe)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CC = como
+CXX = $(CC)
+
+DEBUG_FLAGS= -D_STLP_DEBUG
+
+CXXFLAGS = -DLIBCIO= --diag_suppress=68 ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} ${STL_VERSION_FLAGS}
+# CXXFLAGS = -Wall ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} ${STL_VERSION_FLAGS} 
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	echo 'a string' | ./$(TEST_EXE) > $(TEST)
+
+
+.cc.o .cxx.o .C.o .cpp.o:
+	${CXX} ${CXXFLAGS} ${DEBUG_FLAGS} ${REPO_FLAGS} -c -o $*.o $<
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} -USINGLE -DMAIN=1 $< -c -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(STAT_MODULE) $(LIBS) -o $*.exe
+	./$*.exe > $@
+	-rm -f $*.exe
+
+istmit1.out: istmit1.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} $< $(STAT_MODULE) $(LIBSTDCXX) -lstdc++ $(LIBS) -o istmit1
+	echo 'a string' | ./istmit1 > istmit1.out
+	-rm -f ./istmit1
+
+$(STAT_MODULE): stat.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} -c $< -o $@
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O3 -fno-exceptions -D_STLP_NO_EXCEPTIONS -S $<  -o $*.s
+
+%.i: %.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} -E $<  > $@
+
+clean:
+	-rm -rf *.exe *.out *.o *.rpo core *.out Templates.DB
+
+
+
+
+
diff --git a/main/source/stlport/test/regression/copy1.cpp b/main/source/stlport/test/regression/copy1.cpp
new file mode 100644
index 00000000..907367ee
--- /dev/null
+++ b/main/source/stlport/test/regression/copy1.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <cstring>
+
+#ifdef MAIN 
+#define copy1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int copy1_test(int, char**)
+{
+  cout<<"Results of copy1_test:"<<endl;
+char string[23] = "A string to be copied.";
+
+  char result[23];
+  copy(string, string + 23, result);
+  cout << " Src: " << string << "\nDest: " << result << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/copy2.cpp b/main/source/stlport/test/regression/copy2.cpp
new file mode 100644
index 00000000..4200de23
--- /dev/null
+++ b/main/source/stlport/test/regression/copy2.cpp
@@ -0,0 +1,26 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <iostream>
+#include <iterator>
+
+#ifdef MAIN 
+#define copy2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int copy2_test(int, char**)
+{
+  cout<<"Results of copy2_test:"<<endl;
+  vector <int> v(10);
+  for(int i = 0; i < v.size(); i++)
+    v[i] = i;
+  ostream_iterator<int> iter(cout, " ");
+  copy(v.begin(), v.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/copy3.cpp b/main/source/stlport/test/regression/copy3.cpp
new file mode 100644
index 00000000..2cf673fe
--- /dev/null
+++ b/main/source/stlport/test/regression/copy3.cpp
@@ -0,0 +1,28 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <iostream>
+#include <iterator>
+
+#ifdef MAIN 
+#define copy3_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int copy3_test(int, char**)
+{
+  cout<<"Results of copy3_test:"<<endl;
+  vector <int> v1(10);
+  for(int i = 0; i < v1.size(); i++)
+    v1[i] = i;
+  vector <int> v2(10);
+  copy(v1.begin(), v1.end(), v2.begin());
+  ostream_iterator<int> iter(cout, " ");
+  copy(v2.begin(), v2.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/copy4.cpp b/main/source/stlport/test/regression/copy4.cpp
new file mode 100644
index 00000000..9d5ff860
--- /dev/null
+++ b/main/source/stlport/test/regression/copy4.cpp
@@ -0,0 +1,30 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <iostream>
+#include <iterator>
+
+#ifdef MAIN 
+#define copy4_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int copy4_test(int, char**)
+{
+  cout<<"Results of copy4_test:"<<endl;
+  typedef vector<int> IVec;
+  vector<int> v1(10);
+  for(int loc = 0; loc < v1.size(); loc++)
+    v1[loc] = loc;
+  vector<int> v2;
+  insert_iterator<IVec> i(v2, v2.begin());
+  copy(v1.begin(), v1.end(), i);
+  ostream_iterator<int> outIter(cout, " ");
+  copy(v2.begin(), v2.end(), outIter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/copyb.cpp b/main/source/stlport/test/regression/copyb.cpp
new file mode 100644
index 00000000..ccdc83f4
--- /dev/null
+++ b/main/source/stlport/test/regression/copyb.cpp
@@ -0,0 +1,28 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <iterator>
+#include <iostream>
+
+#ifdef MAIN 
+#define copyb_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int copyb_test(int, char**)
+{
+  cout<<"Results of copyb_test:"<<endl;
+  vector <int> v1(10);
+  for(int i = 0; i < v1.size(); i++)
+    v1[i] = i;
+  vector <int> v2(v1.size());
+  copy_backward(v1.begin(), v1.end(), v2.end());
+  ostream_iterator<int> iter(cout, " ");
+  copy(v2.begin(), v2.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/copyb0.cpp b/main/source/stlport/test/regression/copyb0.cpp
new file mode 100644
index 00000000..20ea45de
--- /dev/null
+++ b/main/source/stlport/test/regression/copyb0.cpp
@@ -0,0 +1,29 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define copyb0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int copyb0_test(int, char**)
+{
+  cout<<"Results of copyb0_test:"<<endl;
+int numbers[5] = { 1, 2, 3, 4, 5 };
+
+  int result[5];
+  copy_backward(numbers, numbers + 5, (int*)result + 5);
+  int i;
+  for(i = 0; i < 5; i++)
+    cout << numbers[i] << ' ';
+  cout << endl;
+  for(i = 0; i < 5; i++)
+    cout << result[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/count0.cpp b/main/source/stlport/test/regression/count0.cpp
new file mode 100644
index 00000000..6f8588a9
--- /dev/null
+++ b/main/source/stlport/test/regression/count0.cpp
@@ -0,0 +1,23 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define count0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int count0_test(int, char**)
+{
+  cout<<"Results of count0_test:"<<endl;
+int numbers[10] = { 1, 2, 4, 1, 2, 4, 1, 2, 4, 1 };
+
+  int result = 0;
+  count(numbers, numbers + 10, 1, result);
+  cout << "Found " << result << " 1's." << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/count1.cpp b/main/source/stlport/test/regression/count1.cpp
new file mode 100644
index 00000000..6f0e1cf7
--- /dev/null
+++ b/main/source/stlport/test/regression/count1.cpp
@@ -0,0 +1,25 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <vector>
+#include <iostream>
+
+#ifdef MAIN 
+#define count1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int count1_test(int, char**)
+{
+  cout<<"Results of count1_test:"<<endl;
+  vector <int> numbers(100);
+  for(int i = 0; i < 100; i++)
+    numbers[i] = i % 3;
+  int elements = 0;
+  count(numbers.begin(), numbers.end(), 2, elements);
+  cout << "Found " << elements << " 2's." << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/countif1.cpp b/main/source/stlport/test/regression/countif1.cpp
new file mode 100644
index 00000000..9e61ef0b
--- /dev/null
+++ b/main/source/stlport/test/regression/countif1.cpp
@@ -0,0 +1,30 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define countif1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+static int odd(int a_)
+{
+  return a_ % 2;
+}
+int countif1_test(int, char**)
+{
+  cout<<"Results of countif1_test:"<<endl;
+
+  vector <int> numbers(100);
+  for(int i = 0; i < 100; i++)
+    numbers[i] = i % 3;
+  int elements = 0;
+  count_if(numbers.begin(), numbers.end(), odd, elements);
+  cout << "Found " << elements << " odd elements." << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/cray.mak b/main/source/stlport/test/regression/cray.mak
new file mode 100644
index 00000000..1a3a08de
--- /dev/null
+++ b/main/source/stlport/test/regression/cray.mak
@@ -0,0 +1,268 @@
+# This requires GNU make.
+.POSIX:
+
+srcdir = .
+VPATH = .
+
+# point this to proper location
+STL_INCL=-I${PWD}/../../stlport/
+
+LIST  = stl_test.cpp accum1.cpp accum2.cpp \
+	adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp \
+	advance.cpp \
+	alg1.cpp alg2.cpp alg3.cpp alg4.cpp alg5.cpp \
+	bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp \
+	bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp \
+	binsrch1.cpp binsrch2.cpp \
+	bnegate1.cpp bnegate2.cpp bvec1.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp \
+	copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp \
+	countif1.cpp \
+	deque1.cpp \
+	divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp \
+	equal0.cpp equal1.cpp equal2.cpp \
+	equalto.cpp \
+	fill1.cpp filln1.cpp \
+	find0.cpp find1.cpp \
+	findif0.cpp findif1.cpp \
+	finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp \
+	func1.cpp func2.cpp func3.cpp \
+	gener1.cpp gener2.cpp \
+	genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp \
+	incl0.cpp incl1.cpp incl2.cpp \
+	inplmrg1.cpp inplmrg2.cpp \
+	inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp \
+	iota1.cpp \
+	istmit1.cpp \
+	iter1.cpp iter2.cpp iter3.cpp iter4.cpp \
+	iterswp0.cpp iterswp1.cpp \
+	less.cpp \
+	lesseq.cpp \
+	lexcmp1.cpp lexcmp2.cpp \
+	list1.cpp list2.cpp list3.cpp list4.cpp \
+	logicand.cpp logicnot.cpp \
+	logicor.cpp \
+	lwrbnd1.cpp lwrbnd2.cpp \
+	map1.cpp \
+	max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp \
+	merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp \
+	minelem1.cpp minelem2.cpp \
+	minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp \
+	mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp \
+	modulus.cpp \
+	mset1.cpp mset3.cpp mset4.cpp mset5.cpp \
+	negate.cpp nequal.cpp \
+	nextprm0.cpp nextprm1.cpp nextprm2.cpp \
+	nthelem0.cpp nthelem1.cpp nthelem2.cpp \
+	ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp \
+	parsrt0.cpp parsrt1.cpp parsrt2.cpp \
+	parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp \
+	partsum0.cpp partsum1.cpp partsum2.cpp \
+	pheap1.cpp pheap2.cpp \
+	plus.cpp \
+	pqueue1.cpp \
+	prevprm0.cpp prevprm1.cpp prevprm2.cpp \
+	ptition0.cpp ptition1.cpp \
+	ptrbinf1.cpp ptrbinf2.cpp \
+	ptrunf1.cpp ptrunf2.cpp \
+	queue1.cpp \
+	rawiter.cpp \
+	remcopy1.cpp \
+	remcpif1.cpp \
+	remif1.cpp \
+	remove1.cpp \
+	repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp \
+	revbit1.cpp revbit2.cpp \
+	revcopy1.cpp reverse1.cpp reviter1.cpp reviter2.cpp \
+	rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp \
+	search0.cpp search1.cpp search2.cpp \
+	set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp \
+	setintr0.cpp setintr1.cpp setintr2.cpp \
+	setsymd0.cpp setsymd1.cpp setsymd2.cpp \
+	setunon0.cpp setunon1.cpp setunon2.cpp \
+	sort1.cpp sort2.cpp \
+	stack1.cpp stack2.cpp \
+	stblptn0.cpp stblptn1.cpp \
+	stblsrt1.cpp stblsrt2.cpp \
+	swap1.cpp \
+	swprnge1.cpp \
+	times.cpp \
+	trnsfrm1.cpp trnsfrm2.cpp \
+	ucompos1.cpp ucompos2.cpp \
+	unegate1.cpp unegate2.cpp \
+	uniqcpy1.cpp uniqcpy2.cpp \
+	unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp \
+	vec1.cpp vec2.cpp vec3.cpp vec4.cpp vec5.cpp vec6.cpp vec7.cpp vec8.cpp \
+        hmap1.cpp hmmap1.cpp hset2.cpp hmset1.cpp slist1.cpp string1.cpp bitset1.cpp
+
+OBJECTS  = stl_test.o accum1.o accum2.o \
+	adjdiff0.o adjdiff1.o adjdiff2.o \
+	adjfind0.o adjfind1.o adjfind2.o \
+	advance.o \
+	alg1.o alg2.o alg3.o alg4.o alg5.o \
+	bcompos1.o bcompos2.o \
+	bind1st1.o bind1st2.o \
+	bind2nd1.o bind2nd2.o \
+	binsert1.o binsert2.o \
+	binsrch1.o binsrch2.o \
+	bnegate1.o bnegate2.o bvec1.o \
+	copy1.o copy2.o copy3.o copy4.o \
+	copyb.o copyb0.o \
+	count0.o count1.o \
+	countif1.o \
+	deque1.o \
+	divides.o \
+	eqlrnge0.o eqlrnge1.o eqlrnge2.o \
+	equal0.o equal1.o equal2.o \
+	equalto.o \
+	fill1.o filln1.o \
+	find0.o find1.o \
+	findif0.o findif1.o \
+	finsert1.o finsert2.o \
+	foreach0.o foreach1.o \
+	func1.o func2.o func3.o \
+	gener1.o gener2.o \
+	genern1.o genern2.o \
+	greateq.o greater.o \
+	incl0.o incl1.o incl2.o \
+	inplmrg1.o inplmrg2.o \
+	inrprod0.o inrprod1.o inrprod2.o \
+	insert1.o insert2.o \
+	iota1.o \
+	istmit1.o \
+	iter1.o iter2.o iter3.o iter4.o \
+	iterswp0.o iterswp1.o \
+	less.o \
+	lesseq.o \
+	lexcmp1.o lexcmp2.o \
+	list1.o list2.o list3.o list4.o \
+	logicand.o logicnot.o \
+	logicor.o \
+	lwrbnd1.o lwrbnd2.o \
+	map1.o \
+	max1.o max2.o \
+	maxelem1.o maxelem2.o \
+	merge0.o merge1.o merge2.o \
+	min1.o min2.o \
+	minelem1.o minelem2.o \
+	minus.o \
+	mismtch0.o mismtch1.o mismtch2.o \
+	mkheap0.o mkheap1.o \
+	mmap1.o mmap2.o \
+	modulus.o \
+	mset1.o mset3.o mset4.o mset5.o \
+	negate.o nequal.o \
+	nextprm0.o nextprm1.o nextprm2.o \
+	nthelem0.o nthelem1.o nthelem2.o \
+	ostmit.o \
+	pair0.o pair1.o pair2.o \
+	parsrt0.o parsrt1.o parsrt2.o \
+	parsrtc0.o parsrtc1.o parsrtc2.o \
+	partsrt0.o \
+	partsum0.o partsum1.o partsum2.o \
+	pheap1.o pheap2.o \
+	plus.o \
+	pqueue1.o \
+	prevprm0.o prevprm1.o prevprm2.o \
+	ptition0.o ptition1.o \
+	ptrbinf1.o ptrbinf2.o \
+	ptrunf1.o ptrunf2.o \
+	queue1.o \
+	rawiter.o \
+	remcopy1.o \
+	remcpif1.o \
+	remif1.o \
+	remove1.o \
+	repcpif1.o \
+	replace0.o replace1.o replcpy1.o replif1.o \
+	revbit1.o revbit2.o \
+	revcopy1.o reverse1.o reviter1.o reviter2.o \
+	rndshuf0.o rndshuf1.o rndshuf2.o \
+	rotate0.o rotate1.o rotcopy0.o rotcopy1.o \
+	search0.o search1.o search2.o \
+	set1.o set2.o \
+	setdiff0.o setdiff1.o setdiff2.o \
+	setintr0.o setintr1.o setintr2.o \
+	setsymd0.o setsymd1.o setsymd2.o \
+	setunon0.o setunon1.o setunon2.o \
+	sort1.o sort2.o \
+	stack1.o stack2.o \
+	stblptn0.o stblptn1.o \
+	stblsrt1.o stblsrt2.o \
+	swap1.o \
+	swprnge1.o \
+	times.o \
+	trnsfrm1.o trnsfrm2.o \
+	ucompos1.o ucompos2.o \
+	unegate1.o unegate2.o \
+	uniqcpy1.o uniqcpy2.o \
+	unique1.o unique2.o \
+	uprbnd1.o uprbnd2.o \
+	vec1.o vec2.o vec3.o vec4.o vec5.o vec6.o vec7.o vec8.o \
+        hmap1.o hmmap1.o hset2.o hmset1.o string1.o bitset1.o slist1.o
+
+EXECS = $(LIST:%.cpp=%.exe)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CC = CC
+CXX = $(CC)
+
+CXXFLAGS = -D_STLP_HAS_NO_EXCEPTIONS -I. ${STL_INCL} ${DEBUG_FLAGS}
+#CXXFLAGS = -D_STLP_HAS_NO_EXCEPTIONS -D_STLP_DEBUG -I. ${STL_INCL} ${DEBUG_FLAGS}
+#CXXFLAGS = -hexceptions -I. ${STL_INCL} ${DEBUG_FLAGS}
+#CXXFLAGS = -hexceptions -D_STLP_DEBUG -I. ${STL_INCL} ${DEBUG_FLAGS}
+
+
+LIBS = -L ../../lib -lstlport -lpthread
+#LIBS = -L ../../lib -lstlport_stldebug -lpthread
+#LIBS = -L ../../lib -lstlportx -lpthread
+#LIBS = -L ../../lib -lstlport_stldebugx -lpthread
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(LIBS) $(OBJECTS) -o $(TEST_EXE)
+	echo 'a string' | ./$(TEST_EXE) > $(TEST)
+
+.SUFFIXES: .cpp .o .exe .out .res .s
+
+.cpp.o:
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+.cpp.out:
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -o $*.o
+	$(CXX) $(CXXFLAGS) $(LIBS) $*.o -o $*.exe
+	./$*.exe > $@
+	-rm -f $*.exe
+
+istmit1.out: istmit1.cpp
+	$(CXX) $(CXXFLAGS) $(LIBS) -DMAIN $< -o istmit1
+	echo 'a string' | ./istmit1 > istmit1.out
+	-rm -f ./istmit1
+
+.cpp.s:
+	$(CXX) $(CXXFLAGS) -S $<  -o $@
+
+
+clean:
+	-rm -fr *.exe *.o *.ii *.obj *.out *.s
diff --git a/main/source/stlport/test/regression/deccxx.mak b/main/source/stlport/test/regression/deccxx.mak
new file mode 100644
index 00000000..59043095
--- /dev/null
+++ b/main/source/stlport/test/regression/deccxx.mak
@@ -0,0 +1,265 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+srcdir = .
+VPATH = .
+
+# point this to proper location
+STL_INCL=-I../../stlport
+
+# This is for dumb native make
+OBJ_LIST  = stl_test.o accum1.o accum2.o \
+	adjdiff0.o adjdiff1.o adjdiff2.o \
+	adjfind0.o adjfind1.o adjfind2.o \
+	advance.o \
+	alg1.o alg2.o alg3.o alg4.o alg5.o \
+	bcompos1.o bcompos2.o \
+	bind1st1.o bind1st2.o \
+	bind2nd1.o bind2nd2.o \
+	binsert1.o binsert2.o \
+	binsrch1.o binsrch2.o \
+	bnegate1.o bnegate2.o bvec1.o \
+	copy1.o copy2.o copy3.o copy4.o \
+	copyb.o copyb0.o \
+	count0.o count1.o \
+	countif1.o \
+	deque1.o \
+	divides.o \
+	eqlrnge0.o eqlrnge1.o eqlrnge2.o \
+	equal0.o equal1.o equal2.o \
+	equalto.o \
+	fill1.o filln1.o \
+	find0.o find1.o \
+	findif0.o findif1.o \
+	finsert1.o finsert2.o \
+	foreach0.o foreach1.o \
+	func1.o func2.o func3.o \
+	gener1.o gener2.o \
+	genern1.o genern2.o \
+	greateq.o greater.o \
+	incl0.o incl1.o incl2.o \
+	inplmrg1.o inplmrg2.o \
+	inrprod0.o inrprod1.o inrprod2.o \
+	insert1.o insert2.o \
+	iota1.o \
+	istmit1.o \
+	iter1.o iter2.o iter3.o iter4.o \
+	iterswp0.o iterswp1.o \
+	less.o \
+	lesseq.o \
+	lexcmp1.o lexcmp2.o \
+	list1.o list2.o list3.o list4.o \
+	logicand.o logicnot.o \
+	logicor.o \
+	lwrbnd1.o lwrbnd2.o \
+	map1.o \
+	max1.o max2.o \
+	maxelem1.o maxelem2.o \
+	memfunptr.o \
+	merge0.o merge1.o merge2.o \
+	min1.o min2.o \
+	minelem1.o minelem2.o \
+	minus.o \
+	mismtch0.o mismtch1.o mismtch2.o \
+	mkheap0.o mkheap1.o \
+	mmap1.o mmap2.o \
+	modulus.o \
+	mset1.o mset3.o mset4.o mset5.o \
+	negate.o nequal.o \
+	nextprm0.o nextprm1.o nextprm2.o \
+	nthelem0.o nthelem1.o nthelem2.o \
+	ostmit.o \
+	pair0.o pair1.o pair2.o \
+	parsrt0.o parsrt1.o parsrt2.o \
+	parsrtc0.o parsrtc1.o parsrtc2.o \
+	partsrt0.o \
+	partsum0.o partsum1.o partsum2.o \
+	pheap1.o pheap2.o \
+	plus.o \
+	pqueue1.o \
+	prevprm0.o prevprm1.o prevprm2.o \
+	ptition0.o ptition1.o \
+	ptrbinf1.o ptrbinf2.o \
+	ptrunf1.o ptrunf2.o \
+	queue1.o \
+	rawiter.o \
+	remcopy1.o \
+	remcpif1.o \
+	remif1.o \
+	remove1.o \
+	repcpif1.o \
+	replace0.o replace1.o replcpy1.o replif1.o \
+	revbit1.o revbit2.o \
+	revcopy1.o reverse1.o reviter1.o reviter2.o \
+	rndshuf0.o rndshuf1.o rndshuf2.o \
+	rotate0.o rotate1.o rotcopy0.o rotcopy1.o \
+	search0.o search1.o search2.o \
+	set1.o set2.o \
+	setdiff0.o setdiff1.o setdiff2.o \
+	setintr0.o setintr1.o setintr2.o \
+	setsymd0.o setsymd1.o setsymd2.o \
+	setunon0.o setunon1.o setunon2.o \
+	sort1.o sort2.o \
+	stack1.o stack2.o \
+	stblptn0.o stblptn1.o \
+	stblsrt1.o stblsrt2.o \
+	swap1.o \
+	swprnge1.o \
+	times.o \
+	trnsfrm1.o trnsfrm2.o \
+	ucompos1.o ucompos2.o \
+	unegate1.o unegate2.o \
+	uniqcpy1.o uniqcpy2.o \
+	unique1.o unique2.o \
+	uprbnd1.o uprbnd2.o \
+	vec1.o vec2.o vec3.o vec4.o vec5.o vec6.o vec7.o vec8.o \
+        hmap1.o hmmap1.o hset2.o hmset1.o string1.o bitset1.o slist1.o
+
+LIST  = stl_test.cpp accum1.cpp accum2.cpp \
+	adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp \
+	advance.cpp \
+	alg1.cpp alg2.cpp alg3.cpp alg4.cpp alg5.cpp \
+	bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp \
+	bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp \
+	binsrch1.cpp binsrch2.cpp \
+	bnegate1.cpp bnegate2.cpp bvec1.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp \
+	copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp \
+	countif1.cpp \
+	deque1.cpp \
+	divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp \
+	equal0.cpp equal1.cpp equal2.cpp \
+	equalto.cpp \
+	fill1.cpp filln1.cpp \
+	find0.cpp find1.cpp \
+	findif0.cpp findif1.cpp \
+	finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp \
+	func1.cpp func2.cpp func3.cpp \
+	gener1.cpp gener2.cpp \
+	genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp \
+	incl0.cpp incl1.cpp incl2.cpp \
+	inplmrg1.cpp inplmrg2.cpp \
+	inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp \
+	iota1.cpp \
+	istmit1.cpp \
+	iter1.cpp iter2.cpp iter3.cpp iter4.cpp \
+	iterswp0.cpp iterswp1.cpp \
+	less.cpp \
+	lesseq.cpp \
+	lexcmp1.cpp lexcmp2.cpp \
+	list1.cpp list2.cpp list3.cpp list4.cpp \
+	logicand.cpp logicnot.cpp \
+	logicor.cpp \
+	lwrbnd1.cpp lwrbnd2.cpp \
+	map1.cpp \
+	max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp \
+	merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp \
+	minelem1.cpp minelem2.cpp \
+	minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp \
+	mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp \
+	modulus.cpp \
+	mset1.cpp mset3.cpp mset4.cpp mset5.cpp \
+	negate.cpp nequal.cpp \
+	nextprm0.cpp nextprm1.cpp nextprm2.cpp \
+	nthelem0.cpp nthelem1.cpp nthelem2.cpp \
+	ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp \
+	parsrt0.cpp parsrt1.cpp parsrt2.cpp \
+	parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp \
+	partsum0.cpp partsum1.cpp partsum2.cpp \
+	pheap1.cpp pheap2.cpp \
+	plus.cpp \
+	pqueue1.cpp \
+	prevprm0.cpp prevprm1.cpp prevprm2.cpp \
+	ptition0.cpp ptition1.cpp \
+	ptrbinf1.cpp ptrbinf2.cpp \
+	ptrunf1.cpp ptrunf2.cpp \
+	queue1.cpp \
+	rawiter.cpp \
+	remcopy1.cpp \
+	remcpif1.cpp \
+	remif1.cpp \
+	remove1.cpp \
+	repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp \
+	revbit1.cpp revbit2.cpp \
+	revcopy1.cpp reverse1.cpp reviter1.cpp reviter2.cpp \
+	rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp \
+	search0.cpp search1.cpp search2.cpp \
+	set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp \
+	setintr0.cpp setintr1.cpp setintr2.cpp \
+	setsymd0.cpp setsymd1.cpp setsymd2.cpp \
+	setunon0.cpp setunon1.cpp setunon2.cpp \
+	sort1.cpp sort2.cpp \
+	stack1.cpp stack2.cpp \
+	stblptn0.cpp stblptn1.cpp \
+	stblsrt1.cpp stblsrt2.cpp \
+	swap1.cpp \
+	swprnge1.cpp \
+	times.cpp \
+	trnsfrm1.cpp trnsfrm2.cpp \
+	ucompos1.cpp ucompos2.cpp \
+	unegate1.cpp unegate2.cpp \
+	uniqcpy1.cpp uniqcpy2.cpp \
+	unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp \
+	vec1.cpp vec2.cpp vec3.cpp vec4.cpp vec5.cpp vec6.cpp vec7.cpp vec8.cpp \
+        hmap1.cpp hmmap1.cpp hset2.cpp hmset1.cpp string1.cpp bitset1.cpp
+
+OBJECTS = $(OBJ_LIST)
+EXECS = $(LIST:%.cpp=%.exe)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CC = cxx
+CXX = $(CC)
+# CXXFLAGS = -O -w0 ${STL_INCL}  -I.
+CXXFLAGS =  ${STL_INCL}  -std strict_ansi_errors -I. -D__NO_USE_STD_IOSTREAM -D_STLP_NO_OWN_IOSTREAMS -D_STLP_DEBUG
+
+LIBS = -lm 
+LIBSTDCXX = 
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	echo 'a string' | $(TEST_EXE) > $(TEST)
+
+.SUFFIXES: .cpp .i .o .exe .out .res
+
+%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $*.cpp -c -o $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $*.cpp -c -USINGLE -DMAIN -g -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) -o $*.exe
+	./$*.exe > $@
+	-rm -f $*.exe
+
+istmit1.out: istmit1.cpp
+	$(CXX) $(CXXFLAGS) istmit1.cpp $(STAT_MODULE) $(LIBSTDCXX) -lstdc++ $(LIBS) -o istmit1
+	echo 'a string' | ./istmit1 > istmit1.out
+	-rm -f ./istmit1
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O5 -S -pta -noex $*.cpp  -o $@
+
+clean:
+	-rm -fr *.exe *.o *.rpo *.obj *.out cxx_repository
diff --git a/main/source/stlport/test/regression/deque1.cpp b/main/source/stlport/test/regression/deque1.cpp
new file mode 100644
index 00000000..4c38f27e
--- /dev/null
+++ b/main/source/stlport/test/regression/deque1.cpp
@@ -0,0 +1,41 @@
+
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <deque>
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define deque1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+int deque1_test(int, char**)
+{
+  cout<<"Results of deque1_test:"<<endl;
+  deque<int> d;
+  d.push_back(4); // Add after end.
+  d.push_back(9);
+  d.push_back(16);
+  d.push_front(1); // Insert at beginning.
+  int i;
+  for(i = 0; i < d.size(); i++)
+    cout << "d[" << i << "] = " << d[i] << endl;
+  cout << endl;
+
+  d.pop_front(); // Erase first element.
+
+  d[2] = 25; // Replace last element.
+  for(i = 0; i < d.size(); i++)
+    cout << "d[" << i << "] = " << d[i] << endl;
+  return 0;
+
+}
+
+
+
+
diff --git a/main/source/stlport/test/regression/divides.cpp b/main/source/stlport/test/regression/divides.cpp
new file mode 100644
index 00000000..18e9eea9
--- /dev/null
+++ b/main/source/stlport/test/regression/divides.cpp
@@ -0,0 +1,22 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <numeric>
+
+#ifdef MAIN 
+#define divides_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int divides_test(int, char**)
+{
+  cout<<"Results of divides_test:"<<endl;
+int input [3] = { 2, 3, 4 };
+
+  int result = accumulate(input, input + 3, 48, divides<int>());
+  cout << "result = " << result << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/djgpp.mak b/main/source/stlport/test/regression/djgpp.mak
new file mode 100644
index 00000000..fa82ca41
--- /dev/null
+++ b/main/source/stlport/test/regression/djgpp.mak
@@ -0,0 +1,180 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+# Modified from gcc.mak by Tanes Sriviroolchai (tanes73@yahoo.com) for
+# using with DJGPP. It will use gcc to compile and link. While linking
+# if _STLP_NO_OWN_IOSTREAMS is defined, we need to link with libstdcxx
+# also. 
+
+.SUFFIXES:	.cc .cpp .o .exe .out
+
+srcdir = .
+VPATH = .
+
+STL_INCL=-I../../stlport
+
+LIST  = stl_test.cpp accum1.cpp accum2.cpp \
+	adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp \
+	advance.cpp \
+	alg1.cpp alg2.cpp alg3.cpp alg4.cpp alg5.cpp \
+	bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp \
+	bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp \
+	binsrch1.cpp binsrch2.cpp \
+	bnegate1.cpp bnegate2.cpp bvec1.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp \
+	copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp \
+	countif1.cpp \
+	deque1.cpp \
+	divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp \
+	equal0.cpp equal1.cpp equal2.cpp \
+	equalto.cpp \
+	fill1.cpp filln1.cpp \
+	find0.cpp find1.cpp \
+	findif0.cpp findif1.cpp \
+	finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp \
+	func1.cpp func2.cpp func3.cpp \
+	gener1.cpp gener2.cpp \
+	genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp \
+	incl0.cpp incl1.cpp incl2.cpp \
+	inplmrg1.cpp inplmrg2.cpp \
+	inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp \
+	iota1.cpp \
+	istmit1.cpp \
+	iter1.cpp iter2.cpp iter3.cpp iter4.cpp \
+	iterswp0.cpp iterswp1.cpp \
+	less.cpp \
+	lesseq.cpp \
+	lexcmp1.cpp lexcmp2.cpp \
+	list1.cpp list2.cpp list3.cpp list4.cpp \
+	logicand.cpp logicnot.cpp \
+	logicor.cpp \
+	lwrbnd1.cpp lwrbnd2.cpp \
+	map1.cpp \
+	max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp \
+	memfunptr.cpp \
+	merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp \
+	minelem1.cpp minelem2.cpp \
+	minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp \
+	mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp \
+	modulus.cpp \
+	mset1.cpp mset3.cpp mset4.cpp mset5.cpp \
+	negate.cpp nequal.cpp \
+	nextprm0.cpp nextprm1.cpp nextprm2.cpp \
+	nthelem0.cpp nthelem1.cpp nthelem2.cpp \
+	ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp \
+	parsrt0.cpp parsrt1.cpp parsrt2.cpp \
+	parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp \
+	partsum0.cpp partsum1.cpp partsum2.cpp \
+	pheap1.cpp pheap2.cpp \
+	plus.cpp \
+	pqueue1.cpp \
+	prevprm0.cpp prevprm1.cpp prevprm2.cpp \
+	ptition0.cpp ptition1.cpp \
+	ptrbinf1.cpp ptrbinf2.cpp \
+	ptrunf1.cpp ptrunf2.cpp \
+	queue1.cpp \
+	rawiter.cpp \
+	remcopy1.cpp \
+	remcpif1.cpp \
+	remif1.cpp \
+	remove1.cpp \
+	repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp \
+	revbit1.cpp revbit2.cpp \
+	revcopy1.cpp reverse1.cpp reviter1.cpp reviter2.cpp \
+	rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp \
+	search0.cpp search1.cpp search2.cpp \
+	set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp \
+	setintr0.cpp setintr1.cpp setintr2.cpp \
+	setsymd0.cpp setsymd1.cpp setsymd2.cpp \
+	setunon0.cpp setunon1.cpp setunon2.cpp \
+	sort1.cpp sort2.cpp \
+	stack1.cpp stack2.cpp \
+	stblptn0.cpp stblptn1.cpp \
+	stblsrt1.cpp stblsrt2.cpp \
+	swap1.cpp \
+	swprnge1.cpp \
+	times.cpp \
+	trnsfrm1.cpp trnsfrm2.cpp \
+	ucompos1.cpp ucompos2.cpp \
+	unegate1.cpp unegate2.cpp \
+	uniqcpy1.cpp uniqcpy2.cpp \
+	unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp \
+	vec1.cpp vec2.cpp vec3.cpp vec4.cpp vec5.cpp vec6.cpp vec7.cpp vec8.cpp \
+        hmmap1.cpp hset2.cpp hmset1.cpp slist1.cpp hmap1.cpp string1.cpp bitset1.cpp
+
+
+# STAT_MODULE=stat.o
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%.exe)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CC = gcc
+CXX = $(CC)
+
+# DEBUG_FLAGS= -D_STLP_DEBUG
+
+#CXXFLAGS = -Wall -D_STLP_NO_OWN_IOSTREAMS -D_STLP_WHOLE_NATIVE_STD -fhonor-std -D__HONOR_STD ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} ${STL_VERSION_FLAGS}
+
+CXXFLAGS = -Wall -mbnu210 -ftemplate-depth-32 -D_STLP_NO_OWN_IOSTREAMS ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} ${STL_VERSION_FLAGS}
+
+LIBS = ../../lib/libstlport_djgpp_static.a -lstdcxx -lm 
+LIBSTDCXX = 
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) ${REPO_FLAGS} $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	echo 'a string' | $(TEST_EXE) > $(TEST)
+
+
+.cc.o .cxx.o .C.o .cpp.o:
+	${CXX} ${CXXFLAGS} ${DEBUG_FLAGS} ${REPO_FLAGS} -c -o $*.o $<
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} -USINGLE -DMAIN=1 $< -c -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(STAT_MODULE) $(LIBS) -o $*.exe
+	./$*.exe > $@
+	-rm -f $*.exe
+
+istmit1.out: istmit1.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} $< $(STAT_MODULE) $(LIBSTDCXX) -lstdc++ $(LIBS) -o istmit1
+	echo 'a string' | ./istmit1 > istmit1.out
+	-rm -f ./istmit1
+
+$(STAT_MODULE): stat.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} -c $< -o $@
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O3 -fno-exceptions -D_STLP_NO_EXCEPTIONS -S $<  -o $*.s
+
+%.i: %.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} -E $<  > $@
+
+clean:
+	-rm -rf *.exe *.out *.o *.rpo core *.out Templates.DB
+
+
+
+
+
diff --git a/main/source/stlport/test/regression/dm.mak b/main/source/stlport/test/regression/dm.mak
new file mode 100644
index 00000000..257ec910
--- /dev/null
+++ b/main/source/stlport/test/regression/dm.mak
@@ -0,0 +1,653 @@
+.SUFFIXES: .cpp .c .o .so .a .exe .obj .output
+
+# bug.cpp fstream1.cpp don't work for some reason
+
+# bvec1.cpp seek.cpp and sstream1.cpp only work with the STLport
+# iostreams library
+
+SRCS = accum1.cpp accum2.cpp adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp advance.cpp alg1.cpp \
+	alg2.cpp alg3.cpp alg4.cpp alg5.cpp bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp binsrch1.cpp binsrch2.cpp \
+	bitset1.cpp bnegate1.cpp bnegate2.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp countif1.cpp deque1.cpp divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp equal0.cpp equal1.cpp \
+	equal2.cpp equalto.cpp fill1.cpp filln1.cpp find0.cpp \
+	find1.cpp findif0.cpp findif1.cpp finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp func1.cpp func2.cpp \
+	func3.cpp gener1.cpp gener2.cpp genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp hmap1.cpp hmmap1.cpp hmset1.cpp \
+	hset2.cpp incl0.cpp incl1.cpp incl2.cpp inplmrg1.cpp \
+	inplmrg2.cpp inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp iota1.cpp istmit1.cpp iter1.cpp \
+	iter2.cpp iter3.cpp iter4.cpp iterswp0.cpp iterswp1.cpp \
+	less.cpp lesseq.cpp lexcmp1.cpp lexcmp2.cpp list1.cpp \
+	list2.cpp list3.cpp list4.cpp logicand.cpp logicnot.cpp \
+	logicor.cpp lwrbnd1.cpp lwrbnd2.cpp map1.cpp max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp memfunptr.cpp merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp minelem1.cpp minelem2.cpp minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp modulus.cpp mset1.cpp mset3.cpp mset4.cpp \
+	mset5.cpp negate.cpp nequal.cpp nextprm0.cpp nextprm1.cpp \
+	nextprm2.cpp nthelem0.cpp nthelem1.cpp nthelem2.cpp ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp parsrt0.cpp parsrt1.cpp \
+	parsrt2.cpp parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp partsum0.cpp partsum1.cpp partsum2.cpp pheap1.cpp \
+	pheap2.cpp plus.cpp pqueue1.cpp prevprm0.cpp prevprm1.cpp \
+	prevprm2.cpp ptition0.cpp ptition1.cpp ptrbinf1.cpp \
+	ptrbinf2.cpp ptrunf1.cpp ptrunf2.cpp queue1.cpp rawiter.cpp \
+	remcopy1.cpp remcpif1.cpp remif1.cpp remove1.cpp repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp revbit1.cpp \
+	revbit2.cpp revcopy1.cpp reverse1.cpp reviter1.cpp \
+	reviter2.cpp rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp search0.cpp \
+	search1.cpp search2.cpp set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp setintr0.cpp \
+	setintr1.cpp setintr2.cpp setsymd0.cpp setsymd1.cpp \
+	setsymd2.cpp setunon0.cpp setunon1.cpp setunon2.cpp \
+	slist1.cpp sort1.cpp sort2.cpp stack1.cpp \
+	stack2.cpp stat.cpp stblptn0.cpp stblptn1.cpp stblsrt1.cpp \
+	stblsrt2.cpp strass1.cpp \
+	string1.cpp swap1.cpp swprnge1.cpp times.cpp trnsfrm1.cpp \
+	trnsfrm2.cpp tstdeq.cpp ucompos1.cpp ucompos2.cpp unegate1.cpp \
+	unegate2.cpp uniqcpy1.cpp uniqcpy2.cpp unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp vec1.cpp vec2.cpp vec3.cpp vec4.cpp \
+	vec5.cpp vec6.cpp vec7.cpp vec8.cpp
+
+
+.cpp.exe:
+	dmc -Ae -Ar -DMAIN -I../../stlport $<
+
+all:	$(SRCS:.cpp=.exe)
+#	-*- Makefile -*-
+.SUFFIXES: .cpp .c .obj .dll .exe .rc .res
+
+
+CXX=dmc
+CC=dmc -cpp
+LIB=lib
+LINK=dmc
+RC=rcc
+
+LIB_BASENAME=stlp45dm
+
+OBJS = build\c_locale.obj build\c_locale_stub.obj build\codecvt.obj \
+	build\collate.obj build\complex.obj build\complex_exp.obj \
+	build\complex_io.obj build\complex_io_w.obj build\complex_trig.obj \
+	build\ctype.obj build\dll_main.obj \
+	build\facets_byname.obj build\fstream.obj build\ios.obj \
+	build\iostream.obj build\istream.obj build\locale.obj \
+	build\locale_catalog.obj build\locale_impl.obj \
+	build\messages.obj build\monetary.obj build\num_get.obj \
+	build\num_get_float.obj build\num_put.obj \
+	build\num_put_float.obj build\numpunct.obj build\ostream.obj \
+	build\sstream.obj build\stdio_streambuf.obj \
+	build\streambuf.obj build\string_w.obj build\strstream.obj \
+	build\time_facets.obj
+
+BUILD_DIRS=..\lib ..\build \
+	..\build\static ..\build\static\release \
+	..\build\static\debug ..\build\static\stldebug \
+	..\build\staticx ..\build\staticx\release \
+	..\build\staticx\debug ..\build\staticx\stldebug \
+	..\build\dynamic ..\build\dynamic\release \
+	..\build\dynamic\debug ..\build\dynamic\stldebug \
+	..\build\sdynamic ..\build\sdynamic\release \
+	..\build\sdynamic\debug ..\build\sdynamic\stldebug
+
+
+CXXFLAGS_COMMON = -Ae -Ar -DSTRICT -D__BUILDING_STLPORT -I../stlport
+
+# four versions are currently supported:
+#  - static: static STLport library, static RTL
+#  - staticx: static STLport library, dynamic RTL
+#  - dynamic: dynamic STLport library, dynamic RTL
+#  - sdynamic: dynamic STLport library, static RTL
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -Nc -o+all -D_MT
+CXXFLAGS_RELEASE_staticx = $(CXXFLAGS_COMMON) -Nc -o+all -ND
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -WD -o+all -ND
+CXXFLAGS_RELEASE_sdynamic = $(CXXFLAGS_COMMON) -WD -o+all -D_MT
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -Nc -g -D_MT
+CXXFLAGS_DEBUG_staticx = $(CXXFLAGS_COMMON) -Nc -g -ND
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -WD -g -ND
+CXXFLAGS_DEBUG_sdynamic = $(CXXFLAGS_COMMON) -WD -g -D_MT
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_staticx = $(CXXFLAGS_DEBUG_staticx) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_sdynamic = $(CXXFLAGS_DEBUG_sdynamic) -D_STLP_DEBUG
+
+
+.cpp{..\build\static\release}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_RELEASE_static) "$<"
+
+.cpp{..\build\static\debug}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_DEBUG_static) "$<"
+
+.cpp{..\build\static\stldebug}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_STLDEBUG_static) "$<"
+
+.cpp{..\build\staticx\release}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_RELEASE_staticx) "$<"
+
+.cpp{..\build\staticx\debug}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_DEBUG_staticx) "$<"
+
+.cpp{..\build\staticx\stldebug}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_STLDEBUG_staticx) "$<"
+
+.cpp{..\build\dynamic\release}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_RELEASE_dynamic) "$<"
+
+.cpp{..\build\dynamic\debug}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_DEBUG_dynamic) "$<"
+
+.cpp{..\build\dynamic\stldebug}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_STLDEBUG_dynamic) "$<"
+
+.cpp{..\build\sdynamic\release}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_RELEASE_sdynamic) "$<"
+
+.cpp{..\build\sdynamic\debug}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_DEBUG_sdynamic) "$<"
+
+.cpp{..\build\sdynamic\stldebug}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_STLDEBUG_sdynamic) "$<"
+
+.c{..\build\static\release}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_RELEASE_static) "$<"
+
+.c{..\build\static\debug}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_DEBUG_static) "$<"
+
+.c{..\build\static\stldebug}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_STLDEBUG_static) "$<"
+
+.c{..\build\staticx\release}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_RELEASE_staticx) "$<"
+
+.c{..\build\staticx\debug}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_DEBUG_staticx) "$<"
+
+.c{..\build\staticx\stldebug}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_STLDEBUG_staticx) "$<"
+
+.c{..\build\dynamic\release}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_RELEASE_dynamic) "$<"
+
+.c{..\build\dynamic\debug}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_DEBUG_dynamic) "$<"
+
+.c{..\build\dynamic\stldebug}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_STLDEBUG_dynamic) "$<"
+
+.c{..\build\sdynamic\release}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_RELEASE_sdynamic) "$<"
+
+.c{..\build\sdynamic\debug}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_DEBUG_sdynamic) "$<"
+
+.c{..\build\sdynamic\stldebug}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_STLDEBUG_sdynamic) "$<"
+
+
+.rc{..\build}.res:
+	$(RC) -32 -o"$@" "$<"
+
+
+all:	directories all_static all_staticx all_dynamic all_sdynamic
+
+
+directories:	$(BUILD_DIRS)
+
+$(BUILD_DIRS):
+	mkdir $@
+
+
+all_static:	..\lib\$(LIB_BASENAME)_static.lib ..\lib\$(LIB_BASENAME)_debug_static.lib ..\lib\$(LIB_BASENAME)_stldebug_static.lib
+
+..\lib\$(LIB_BASENAME)_static.lib:	$(OBJS:build\=..\build\static\release\)
+	*$(LIB) -c -n -p64 "$@" "$**"
+
+..\lib\$(LIB_BASENAME)_debug_static.lib:	$(OBJS:build\=..\build\static\debug\)
+	*$(LIB) -c -n -p128 "$@" "$**"
+
+..\lib\$(LIB_BASENAME)_stldebug_static.lib:	$(OBJS:build\=..\build\static\stldebug\)
+	*$(LIB) -c -n -p256 "$@" "$**"
+
+
+all_staticx:	..\lib\$(LIB_BASENAME)_staticx.lib ..\lib\$(LIB_BASENAME)_debug_staticx.lib ..\lib\$(LIB_BASENAME)_stldebug_staticx.lib
+
+..\lib\$(LIB_BASENAME)_staticx.lib:	$(OBJS:build\=..\build\staticx\release\)
+	*$(LIB) -c -n -p64 "$@" "$**"
+
+..\lib\$(LIB_BASENAME)_debug_staticx.lib:	$(OBJS:build\=..\build\staticx\debug\)
+	*$(LIB) -c -n -p128 "$@" "$**"
+
+..\lib\$(LIB_BASENAME)_stldebug_staticx.lib:	$(OBJS:build\=..\build\staticx\stldebug\)
+	*$(LIB) -c -n -p256 "$@" "$**"
+
+
+all_dynamic:	..\lib\$(LIB_BASENAME).dll ..\lib\$(LIB_BASENAME)_debug.dll ..\lib\$(LIB_BASENAME)_stldebug.dll
+
+..\lib\$(LIB_BASENAME).dll:	$(OBJS:build\=..\build\dynamic\release\) ..\build\stlport.res
+	*$(LINK) -WD -ND -L/IMPLIB:$(@R).lib -L/DE -L/NODEBUG -o"$@" "$**" user32.lib kernel32.lib <<$(@R).def
+LIBRARY "$(@F)"
+DESCRIPTION 'STLport DLL for Digital Mars C/C++'
+EXETYPE NT
+SUBSYSTEM WINDOWS
+CODE SHARED EXECUTE
+DATA READWRITE
+
+EXPORTS
+	"?cin@std@@3V?$basic_istream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cout@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cerr@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?clog@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?wcin@std@@3V?$basic_istream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcout@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcerr@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wclog@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+<<
+
+..\lib\$(LIB_BASENAME)_debug.dll:	$(OBJS:build\=..\build\dynamic\debug\) ..\build\stlport.res
+	*$(LINK) -WD -ND -g -L/IMPLIB:$(@R).lib -L/DE -L/DEBUG -o"$@" "$**" user32.lib kernel32.lib <<$(@R).def
+LIBRARY "$(@F)"
+DESCRIPTION 'STLport DLL for Digital Mars C/C++'
+EXETYPE NT
+SUBSYSTEM WINDOWS
+CODE SHARED EXECUTE
+DATA READWRITE
+
+EXPORTS
+	"?cin@std@@3V?$basic_istream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cout@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cerr@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?clog@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?wcin@std@@3V?$basic_istream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcout@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcerr@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wclog@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+<<
+
+..\lib\$(LIB_BASENAME)_stldebug.dll:	$(OBJS:build\=..\build\dynamic\stldebug\) ..\build\stlport.res
+	*$(LINK) -WD -ND -g -L/IMPLIB:$(@R).lib -L/DE -L/DEBUG -o"$@" "$**" user32.lib kernel32.lib <<$(@R).def
+LIBRARY "$(@F)"
+DESCRIPTION 'STLport DLL for Digital Mars C/C++'
+EXETYPE NT
+SUBSYSTEM WINDOWS
+CODE SHARED EXECUTE
+DATA READWRITE
+
+EXPORTS
+	"?cin@std@@3V?$basic_istream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cout@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cerr@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?clog@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?wcin@std@@3V?$basic_istream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcout@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcerr@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wclog@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+<<
+
+
+all_sdynamic:	..\lib\$(LIB_BASENAME)s.dll ..\lib\$(LIB_BASENAME)s_debug.dll ..\lib\$(LIB_BASENAME)s_stldebug.dll
+
+..\lib\$(LIB_BASENAME)s.dll:	$(OBJS:build\=..\build\sdynamic\release\) ..\build\stlport.res
+	*$(LINK) -WD -ND -L/IMPLIB:$(@R).lib -L/DE -L/NODEBUG -o"$@" "$**" user32.lib kernel32.lib <<$(@R).def
+LIBRARY "$(@F)"
+DESCRIPTION 'STLport DLL for Digital Mars C/C++'
+EXETYPE NT
+SUBSYSTEM WINDOWS
+CODE SHARED EXECUTE
+DATA READWRITE
+
+EXPORTS
+	"?cin@std@@3V?$basic_istream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cout@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cerr@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?clog@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?wcin@std@@3V?$basic_istream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcout@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcerr@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wclog@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+<<
+
+..\lib\$(LIB_BASENAME)s_debug.dll:	$(OBJS:build\=..\build\sdynamic\debug\) ..\build\stlport.res
+	*$(LINK) -WD -ND -g -L/IMPLIB:$(@R).lib -L/DE -L/DEBUG -o"$@" "$**" user32.lib kernel32.lib <<$(@R).def
+LIBRARY "$(@F)"
+DESCRIPTION 'STLport DLL for Digital Mars C/C++'
+EXETYPE NT
+SUBSYSTEM WINDOWS
+CODE SHARED EXECUTE
+DATA READWRITE
+
+EXPORTS
+	"?cin@std@@3V?$basic_istream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cout@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cerr@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?clog@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?wcin@std@@3V?$basic_istream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcout@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcerr@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wclog@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+<<
+
+..\lib\$(LIB_BASENAME)s_stldebug.dll:	$(OBJS:build\=..\build\sdynamic\stldebug\) ..\build\stlport.res
+	*$(LINK) -WD -ND -g -L/IMPLIB:$(@R).lib -L/DE -L/DEBUG -o"$@" "$**" user32.lib kernel32.lib <<$(@R).def
+LIBRARY "$(@F)"
+DESCRIPTION 'STLport DLL for Digital Mars C/C++'
+EXETYPE NT
+SUBSYSTEM WINDOWS
+CODE SHARED EXECUTE
+DATA READWRITE
+
+EXPORTS
+	"?cin@std@@3V?$basic_istream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cout@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cerr@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?clog@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?wcin@std@@3V?$basic_istream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcout@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcerr@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wclog@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+<<
+#	-*- Makefile -*-
+.SUFFIXES: .cpp .c .obj .dll .exe .rc .res
+
+
+CXX=dmc
+CC=dmc -cpp
+LIB=lib
+LINK=dmc
+RC=rcc
+
+LIB_BASENAME=stlp45dm
+
+OBJS = build\c_locale.obj build\c_locale_stub.obj build\codecvt.obj \
+	build\collate.obj build\complex.obj build\complex_exp.obj \
+	build\complex_io.obj build\complex_io_w.obj build\complex_trig.obj \
+	build\ctype.obj build\dll_main.obj \
+	build\facets_byname.obj build\fstream.obj build\ios.obj \
+	build\iostream.obj build\istream.obj build\locale.obj \
+	build\locale_catalog.obj build\locale_impl.obj \
+	build\messages.obj build\monetary.obj build\num_get.obj \
+	build\num_get_float.obj build\num_put.obj \
+	build\num_put_float.obj build\numpunct.obj build\ostream.obj \
+	build\sstream.obj build\stdio_streambuf.obj \
+	build\streambuf.obj build\string_w.obj build\strstream.obj \
+	build\time_facets.obj
+
+BUILD_DIRS=..\lib ..\build \
+	..\build\static ..\build\static\release \
+	..\build\static\debug ..\build\static\stldebug \
+	..\build\staticx ..\build\staticx\release \
+	..\build\staticx\debug ..\build\staticx\stldebug \
+	..\build\dynamic ..\build\dynamic\release \
+	..\build\dynamic\debug ..\build\dynamic\stldebug \
+	..\build\sdynamic ..\build\sdynamic\release \
+	..\build\sdynamic\debug ..\build\sdynamic\stldebug
+
+
+CXXFLAGS_COMMON = -Ae -Ar -DSTRICT -D__BUILDING_STLPORT -I../stlport
+
+# four versions are currently supported:
+#  - static: static STLport library, static RTL
+#  - staticx: static STLport library, dynamic RTL
+#  - dynamic: dynamic STLport library, dynamic RTL
+#  - sdynamic: dynamic STLport library, static RTL
+
+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -Nc -o+all -D_MT
+CXXFLAGS_RELEASE_staticx = $(CXXFLAGS_COMMON) -Nc -o+all -ND
+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -WD -o+all -ND
+CXXFLAGS_RELEASE_sdynamic = $(CXXFLAGS_COMMON) -WD -o+all -D_MT
+
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -Nc -g -D_MT
+CXXFLAGS_DEBUG_staticx = $(CXXFLAGS_COMMON) -Nc -g -ND
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -WD -g -ND
+CXXFLAGS_DEBUG_sdynamic = $(CXXFLAGS_COMMON) -WD -g -D_MT
+
+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_staticx = $(CXXFLAGS_DEBUG_staticx) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+CXXFLAGS_STLDEBUG_sdynamic = $(CXXFLAGS_DEBUG_sdynamic) -D_STLP_DEBUG
+
+
+.cpp{..\build\static\release}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_RELEASE_static) "$<"
+
+.cpp{..\build\static\debug}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_DEBUG_static) "$<"
+
+.cpp{..\build\static\stldebug}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_STLDEBUG_static) "$<"
+
+.cpp{..\build\staticx\release}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_RELEASE_staticx) "$<"
+
+.cpp{..\build\staticx\debug}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_DEBUG_staticx) "$<"
+
+.cpp{..\build\staticx\stldebug}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_STLDEBUG_staticx) "$<"
+
+.cpp{..\build\dynamic\release}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_RELEASE_dynamic) "$<"
+
+.cpp{..\build\dynamic\debug}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_DEBUG_dynamic) "$<"
+
+.cpp{..\build\dynamic\stldebug}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_STLDEBUG_dynamic) "$<"
+
+.cpp{..\build\sdynamic\release}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_RELEASE_sdynamic) "$<"
+
+.cpp{..\build\sdynamic\debug}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_DEBUG_sdynamic) "$<"
+
+.cpp{..\build\sdynamic\stldebug}.obj:
+	$(CXX) -c -o"$@" $(CXXFLAGS_STLDEBUG_sdynamic) "$<"
+
+.c{..\build\static\release}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_RELEASE_static) "$<"
+
+.c{..\build\static\debug}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_DEBUG_static) "$<"
+
+.c{..\build\static\stldebug}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_STLDEBUG_static) "$<"
+
+.c{..\build\staticx\release}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_RELEASE_staticx) "$<"
+
+.c{..\build\staticx\debug}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_DEBUG_staticx) "$<"
+
+.c{..\build\staticx\stldebug}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_STLDEBUG_staticx) "$<"
+
+.c{..\build\dynamic\release}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_RELEASE_dynamic) "$<"
+
+.c{..\build\dynamic\debug}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_DEBUG_dynamic) "$<"
+
+.c{..\build\dynamic\stldebug}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_STLDEBUG_dynamic) "$<"
+
+.c{..\build\sdynamic\release}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_RELEASE_sdynamic) "$<"
+
+.c{..\build\sdynamic\debug}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_DEBUG_sdynamic) "$<"
+
+.c{..\build\sdynamic\stldebug}.obj:
+	$(CC) -c -o"$@" $(CXXFLAGS_STLDEBUG_sdynamic) "$<"
+
+
+.rc{..\build}.res:
+	$(RC) -32 -o"$@" "$<"
+
+
+all:	directories all_static all_staticx all_dynamic all_sdynamic
+
+
+directories:	$(BUILD_DIRS)
+
+$(BUILD_DIRS):
+	mkdir $@
+
+
+all_static:	..\lib\$(LIB_BASENAME)_static.lib ..\lib\$(LIB_BASENAME)_debug_static.lib ..\lib\$(LIB_BASENAME)_stldebug_static.lib
+
+..\lib\$(LIB_BASENAME)_static.lib:	$(OBJS:build\=..\build\static\release\)
+	*$(LIB) -c -n -p64 "$@" "$**"
+
+..\lib\$(LIB_BASENAME)_debug_static.lib:	$(OBJS:build\=..\build\static\debug\)
+	*$(LIB) -c -n -p128 "$@" "$**"
+
+..\lib\$(LIB_BASENAME)_stldebug_static.lib:	$(OBJS:build\=..\build\static\stldebug\)
+	*$(LIB) -c -n -p256 "$@" "$**"
+
+
+all_staticx:	..\lib\$(LIB_BASENAME)_staticx.lib ..\lib\$(LIB_BASENAME)_debug_staticx.lib ..\lib\$(LIB_BASENAME)_stldebug_staticx.lib
+
+..\lib\$(LIB_BASENAME)_staticx.lib:	$(OBJS:build\=..\build\staticx\release\)
+	*$(LIB) -c -n -p64 "$@" "$**"
+
+..\lib\$(LIB_BASENAME)_debug_staticx.lib:	$(OBJS:build\=..\build\staticx\debug\)
+	*$(LIB) -c -n -p128 "$@" "$**"
+
+..\lib\$(LIB_BASENAME)_stldebug_staticx.lib:	$(OBJS:build\=..\build\staticx\stldebug\)
+	*$(LIB) -c -n -p256 "$@" "$**"
+
+
+all_dynamic:	..\lib\$(LIB_BASENAME).dll ..\lib\$(LIB_BASENAME)_debug.dll ..\lib\$(LIB_BASENAME)_stldebug.dll
+
+..\lib\$(LIB_BASENAME).dll:	$(OBJS:build\=..\build\dynamic\release\) ..\build\stlport.res
+	*$(LINK) -WD -ND -L/IMPLIB:$(@R).lib -L/DE -L/NODEBUG -o"$@" "$**" user32.lib kernel32.lib <<$(@R).def
+LIBRARY "$(@F)"
+DESCRIPTION 'STLport DLL for Digital Mars C/C++'
+EXETYPE NT
+SUBSYSTEM WINDOWS
+CODE SHARED EXECUTE
+DATA READWRITE
+
+EXPORTS
+	"?cin@std@@3V?$basic_istream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cout@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cerr@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?clog@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?wcin@std@@3V?$basic_istream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcout@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcerr@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wclog@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+<<
+
+..\lib\$(LIB_BASENAME)_debug.dll:	$(OBJS:build\=..\build\dynamic\debug\) ..\build\stlport.res
+	*$(LINK) -WD -ND -g -L/IMPLIB:$(@R).lib -L/DE -L/DEBUG -o"$@" "$**" user32.lib kernel32.lib <<$(@R).def
+LIBRARY "$(@F)"
+DESCRIPTION 'STLport DLL for Digital Mars C/C++'
+EXETYPE NT
+SUBSYSTEM WINDOWS
+CODE SHARED EXECUTE
+DATA READWRITE
+
+EXPORTS
+	"?cin@std@@3V?$basic_istream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cout@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cerr@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?clog@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?wcin@std@@3V?$basic_istream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcout@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcerr@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wclog@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+<<
+
+..\lib\$(LIB_BASENAME)_stldebug.dll:	$(OBJS:build\=..\build\dynamic\stldebug\) ..\build\stlport.res
+	*$(LINK) -WD -ND -g -L/IMPLIB:$(@R).lib -L/DE -L/DEBUG -o"$@" "$**" user32.lib kernel32.lib <<$(@R).def
+LIBRARY "$(@F)"
+DESCRIPTION 'STLport DLL for Digital Mars C/C++'
+EXETYPE NT
+SUBSYSTEM WINDOWS
+CODE SHARED EXECUTE
+DATA READWRITE
+
+EXPORTS
+	"?cin@std@@3V?$basic_istream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cout@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cerr@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?clog@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?wcin@std@@3V?$basic_istream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcout@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcerr@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wclog@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+<<
+
+
+all_sdynamic:	..\lib\$(LIB_BASENAME)s.dll ..\lib\$(LIB_BASENAME)s_debug.dll ..\lib\$(LIB_BASENAME)s_stldebug.dll
+
+..\lib\$(LIB_BASENAME)s.dll:	$(OBJS:build\=..\build\sdynamic\release\) ..\build\stlport.res
+	*$(LINK) -WD -ND -L/IMPLIB:$(@R).lib -L/DE -L/NODEBUG -o"$@" "$**" user32.lib kernel32.lib <<$(@R).def
+LIBRARY "$(@F)"
+DESCRIPTION 'STLport DLL for Digital Mars C/C++'
+EXETYPE NT
+SUBSYSTEM WINDOWS
+CODE SHARED EXECUTE
+DATA READWRITE
+
+EXPORTS
+	"?cin@std@@3V?$basic_istream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cout@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cerr@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?clog@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?wcin@std@@3V?$basic_istream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcout@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcerr@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wclog@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+<<
+
+..\lib\$(LIB_BASENAME)s_debug.dll:	$(OBJS:build\=..\build\sdynamic\debug\) ..\build\stlport.res
+	*$(LINK) -WD -ND -g -L/IMPLIB:$(@R).lib -L/DE -L/DEBUG -o"$@" "$**" user32.lib kernel32.lib <<$(@R).def
+LIBRARY "$(@F)"
+DESCRIPTION 'STLport DLL for Digital Mars C/C++'
+EXETYPE NT
+SUBSYSTEM WINDOWS
+CODE SHARED EXECUTE
+DATA READWRITE
+
+EXPORTS
+	"?cin@std@@3V?$basic_istream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cout@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cerr@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?clog@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?wcin@std@@3V?$basic_istream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcout@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcerr@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wclog@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+<<
+
+..\lib\$(LIB_BASENAME)s_stldebug.dll:	$(OBJS:build\=..\build\sdynamic\stldebug\) ..\build\stlport.res
+	*$(LINK) -WD -ND -g -L/IMPLIB:$(@R).lib -L/DE -L/DEBUG -o"$@" "$**" user32.lib kernel32.lib <<$(@R).def
+LIBRARY "$(@F)"
+DESCRIPTION 'STLport DLL for Digital Mars C/C++'
+EXETYPE NT
+SUBSYSTEM WINDOWS
+CODE SHARED EXECUTE
+DATA READWRITE
+
+EXPORTS
+	"?cin@std@@3V?$basic_istream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cout@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?cerr@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?clog@std@@3V?$basic_ostream@std@DV?$char_traits@std@D@1@@1@A"
+	"?wcin@std@@3V?$basic_istream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcout@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wcerr@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+	"?wclog@std@@3V?$basic_ostream@std@_YV?$char_traits@std@_Y@1@@1@A"
+<<
diff --git a/main/source/stlport/test/regression/egcs.mak b/main/source/stlport/test/regression/egcs.mak
new file mode 100644
index 00000000..80fc820e
--- /dev/null
+++ b/main/source/stlport/test/regression/egcs.mak
@@ -0,0 +1,164 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+.SUFFIXES:	.cc .cpp .o .exe .out
+
+srcdir = .
+VPATH = .
+
+STL_INCL=-I../../stlport
+
+LIST  = stl_test.cpp accum1.cpp accum2.cpp \
+	adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp \
+	advance.cpp \
+	alg1.cpp alg2.cpp alg3.cpp alg4.cpp alg5.cpp \
+	bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp \
+	bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp \
+	binsrch1.cpp binsrch2.cpp \
+	bnegate1.cpp bnegate2.cpp bvec1.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp \
+	copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp \
+	countif1.cpp \
+	deque1.cpp \
+	divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp \
+	equal0.cpp equal1.cpp equal2.cpp \
+	equalto.cpp \
+	fill1.cpp filln1.cpp \
+	find0.cpp find1.cpp \
+	findif0.cpp findif1.cpp \
+	finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp \
+	func1.cpp func2.cpp func3.cpp \
+	gener1.cpp gener2.cpp \
+	genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp \
+	incl0.cpp incl1.cpp incl2.cpp \
+	inplmrg1.cpp inplmrg2.cpp \
+	inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp \
+	iota1.cpp \
+	istmit1.cpp \
+	iter1.cpp iter2.cpp iter3.cpp iter4.cpp \
+	iterswp0.cpp iterswp1.cpp \
+	less.cpp \
+	lesseq.cpp \
+	lexcmp1.cpp lexcmp2.cpp \
+	list1.cpp list2.cpp list3.cpp list4.cpp \
+	logicand.cpp logicnot.cpp \
+	logicor.cpp \
+	lwrbnd1.cpp lwrbnd2.cpp \
+	map1.cpp \
+	max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp \
+	memfunptr.cpp \
+	merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp \
+	minelem1.cpp minelem2.cpp \
+	minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp \
+	mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp \
+	modulus.cpp \
+	mset1.cpp mset3.cpp mset4.cpp mset5.cpp \
+	negate.cpp nequal.cpp \
+	nextprm0.cpp nextprm1.cpp nextprm2.cpp \
+	nthelem0.cpp nthelem1.cpp nthelem2.cpp \
+	ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp \
+	parsrt0.cpp parsrt1.cpp parsrt2.cpp \
+	parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp \
+	partsum0.cpp partsum1.cpp partsum2.cpp \
+	pheap1.cpp pheap2.cpp \
+	plus.cpp \
+	pqueue1.cpp \
+	prevprm0.cpp prevprm1.cpp prevprm2.cpp \
+	ptition0.cpp ptition1.cpp \
+	ptrbinf1.cpp ptrbinf2.cpp \
+	ptrunf1.cpp ptrunf2.cpp \
+	queue1.cpp \
+	rawiter.cpp \
+	remcopy1.cpp \
+	remcpif1.cpp \
+	remif1.cpp \
+	remove1.cpp \
+	repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp \
+	revbit1.cpp revbit2.cpp \
+	revcopy1.cpp reverse1.cpp reviter1.cpp reviter2.cpp \
+	rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp \
+	search0.cpp search1.cpp search2.cpp \
+	set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp \
+	setintr0.cpp setintr1.cpp setintr2.cpp \
+	setsymd0.cpp setsymd1.cpp setsymd2.cpp \
+	setunon0.cpp setunon1.cpp setunon2.cpp \
+	sort1.cpp sort2.cpp \
+	stack1.cpp stack2.cpp \
+	stblptn0.cpp stblptn1.cpp \
+	stblsrt1.cpp stblsrt2.cpp \
+	swap1.cpp \
+	swprnge1.cpp \
+	times.cpp \
+	trnsfrm1.cpp trnsfrm2.cpp \
+	ucompos1.cpp ucompos2.cpp \
+	unegate1.cpp unegate2.cpp \
+	uniqcpy1.cpp uniqcpy2.cpp \
+	unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp \
+	vec1.cpp vec2.cpp vec3.cpp vec4.cpp vec5.cpp vec6.cpp vec7.cpp vec8.cpp \
+        hmmap1.cpp hset2.cpp hmset1.cpp slist1.cpp hmap1.cpp string1.cpp bitset1.cpp
+
+
+# STAT_MODULE=stat.o
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%.exe)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CC = egcs-c++
+CXX = $(CC)
+
+# DEBUG_FLAGS= -D_STLP_DEBUG
+
+CXXFLAGS = -Wall -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} ${STL_VERSION_FLAGS}
+
+LIBS = -lm 
+LIBSTDCXX = 
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) ${REPO_FLAGS} $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	echo 'a string' | $(TEST_EXE) > $(TEST)
+
+
+.cc.o .cxx.o .C.o .cpp.o:
+	${CXX} ${CXXFLAGS} ${DEBUG_FLAGS} ${REPO_FLAGS} -c -o $*.o $<
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} -USINGLE -DMAIN=1 $< -c -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(STAT_MODULE) $(LIBS) -o $*.exe
+	./$*.exe > $@
+	-rm -f $*.exe
+
+istmit1.out: istmit1.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} $< $(STAT_MODULE) $(LIBSTDCXX) -lstdc++ $(LIBS) -o istmit1
+	echo 'a string' | ./istmit1 > istmit1.out
+	-rm -f ./istmit1
+
+$(STAT_MODULE): stat.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} -c $< -o $@
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O3 -fno-exceptions -D_STLP_NO_EXCEPTIONS -S $<  -o $*.s
+
+clean:
+	-rm -rf *.exe *.out *.o *.rpo core *.out Templates.DB
diff --git a/main/source/stlport/test/regression/eqlrnge0.cpp b/main/source/stlport/test/regression/eqlrnge0.cpp
new file mode 100644
index 00000000..d663378a
--- /dev/null
+++ b/main/source/stlport/test/regression/eqlrnge0.cpp
@@ -0,0 +1,27 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define eqlrnge0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int eqlrnge0_test(int, char**)
+{
+  cout<<"Results of eqlrnge0_test:"<<endl;
+int numbers[10] = { 0, 0, 1, 1, 2, 2, 2, 2, 3, 3 };
+
+  pair <int*, int*> range = equal_range((int*)numbers, (int*)numbers + 10, 2);
+  cout
+    << "2 can be inserted from before index "
+    <<(range.first - numbers)
+    << " to before index "
+    <<(range.second - numbers)
+    << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/eqlrnge1.cpp b/main/source/stlport/test/regression/eqlrnge1.cpp
new file mode 100644
index 00000000..b7be4d55
--- /dev/null
+++ b/main/source/stlport/test/regression/eqlrnge1.cpp
@@ -0,0 +1,35 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <iterator>
+#include <iostream>
+
+#ifdef MAIN 
+#define eqlrnge1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int eqlrnge1_test(int, char**)
+{
+  cout<<"Results of eqlrnge1_test:"<<endl;
+  typedef vector <int> IntVec;
+  IntVec v(10);
+  for(int i = 0; i < v.size(); i++)
+    v[i] = i / 3;
+  ostream_iterator<int> iter(cout, " ");
+  cout << "Within the collection:\n\t";
+  copy(v.begin(), v.end(), iter);
+  pair <IntVec::iterator, IntVec::iterator> range =
+	equal_range(v.begin(), v.end(), 2);
+  cout
+    << "\n2 can be inserted from before index "
+    <<(range.first - v.begin())
+    << " to before index "
+    <<(range.second - v.begin())
+    << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/eqlrnge2.cpp b/main/source/stlport/test/regression/eqlrnge2.cpp
new file mode 100644
index 00000000..44dd2078
--- /dev/null
+++ b/main/source/stlport/test/regression/eqlrnge2.cpp
@@ -0,0 +1,35 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <iterator>
+#include <string>
+#include <functional>
+
+#ifdef MAIN 
+#define eqlrnge2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int eqlrnge2_test(int, char**)
+{
+  cout<<"Results of eqlrnge2_test:"<<endl;
+char chars[] = "aabbccddggghhklllmqqqqssyyzz";
+
+  const unsigned count = sizeof(chars) - 1;
+  ostream_iterator<char> iter(cout);
+  cout << "Within the collection:\n\t";
+  copy(chars, chars + count, iter);
+  pair <char*, char*> range =
+	 equal_range((char*)chars, (char*)chars + count, 'q', less<char>());
+  cout
+    << "\nq can be inserted from before index "
+    <<(range.first - chars)
+    << " to before index "
+    <<(range.second - chars)
+    << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/equal0.cpp b/main/source/stlport/test/regression/equal0.cpp
new file mode 100644
index 00000000..1f8c3862
--- /dev/null
+++ b/main/source/stlport/test/regression/equal0.cpp
@@ -0,0 +1,30 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define equal0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int equal0_test(int, char**)
+{
+  cout<<"Results of equal0_test:"<<endl;
+int numbers1[5] = { 1, 2, 3, 4, 5 };
+int numbers2[5] = { 1, 2, 4, 8, 16 };
+int numbers3[2] = { 1, 2 };
+
+  if(equal(numbers1, numbers1 + 5, numbers2))
+    cout << "numbers1 is equal to numbers2" << endl;
+  else
+    cout << "numbers1 is not equal to numbers2" << endl;
+  if(equal(numbers3, numbers3 + 2, numbers1))
+    cout << "numbers3 is equal to numbers1" << endl;
+  else
+    cout << "numbers3 is not equal to numbers1" << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/equal1.cpp b/main/source/stlport/test/regression/equal1.cpp
new file mode 100644
index 00000000..4dd2238e
--- /dev/null
+++ b/main/source/stlport/test/regression/equal1.cpp
@@ -0,0 +1,32 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define equal1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int equal1_test(int, char**)
+{
+  cout<<"Results of equal1_test:"<<endl;
+  vector <int> v1(10);
+  for(int i = 0; i < v1.size(); i++)
+    v1[i] = i;
+  vector <int> v2(10);
+  if(equal(v1.begin(), v1.end(), v2.begin()))
+    cout << "v1 is equal to v2" << endl;
+  else
+    cout << "v1 is not equal to v2" << endl;
+  copy(v1.begin(), v1.end(), v2.begin());
+  if(equal(v1.begin(), v1.end(), v2.begin()))
+    cout << "v1 is equal to v2" << endl;
+  else
+    cout << "v1 is not equal to v2" << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/equal2.cpp b/main/source/stlport/test/regression/equal2.cpp
new file mode 100644
index 00000000..df10e7d0
--- /dev/null
+++ b/main/source/stlport/test/regression/equal2.cpp
@@ -0,0 +1,35 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define equal2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+bool values_squared(int a_, int b_)
+{
+  return(a_ * a_ == b_);
+}
+int equal2_test(int, char**)
+{
+  cout<<"Results of equal2_test:"<<endl;
+
+  vector <int> v1(10);
+  vector <int> v2(10);
+  for(int i = 0; i < v1.size(); i++)
+  {
+    v1[i] = i;
+    v2[i] = i * i;
+  }
+  if(equal(v1.begin(), v1.end(), v2.begin(), values_squared))
+    cout << "v2[i] == v1[i] * v1[i]" << endl;
+  else
+    cout << "v2[i] != v1[i] * v1[i]" << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/equalto.cpp b/main/source/stlport/test/regression/equalto.cpp
new file mode 100644
index 00000000..1ed79204
--- /dev/null
+++ b/main/source/stlport/test/regression/equalto.cpp
@@ -0,0 +1,27 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <functional>
+
+#ifdef MAIN 
+#define equalto_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int equalto_test(int, char**)
+{
+  cout<<"Results of equalto_test:"<<endl;
+int input1 [4] = { 1, 7, 2, 2 };
+int input2 [4] = { 1, 6, 2, 3 };
+
+  int output [4];
+  transform((int*)input1, (int*)input1 + 4, (int*)input2, (int*)output, equal_to<int>());
+  for(int i = 0; i < 4; i++)
+    cout << output[i] << endl;
+  return 0;
+}
+
diff --git a/main/source/stlport/test/regression/fadapter.h b/main/source/stlport/test/regression/fadapter.h
new file mode 100644
index 00000000..08994c13
--- /dev/null
+++ b/main/source/stlport/test/regression/fadapter.h
@@ -0,0 +1,81 @@
+#ifndef	_fadapter_h_
+#define	_fadapter_h_
+
+#include <functional>
+
+// used as adaptor's return/argument type, 
+// to allow binders/composers usage
+struct __void_tag {};
+
+# if !defined (STLPORT) || defined (__STL_USE_NAMESPACES)
+using std::unary_function;
+# endif
+
+template <class Result>
+class pointer_to_void_function {
+protected:
+    Result (*ptr)();
+public:
+    explicit pointer_to_void_function(Result (*x)()) : ptr(x) {}
+    Result operator()() const { return ptr(); }
+    Result operator()(__void_tag) const { return ptr(); }
+};
+
+// to feed composers
+template <class Arg1>
+struct projectvoid :
+  public unary_function<Arg1,__void_tag> {
+  __void_tag operator()(const Arg1& x) const { return __void_tag(); }
+};
+
+# if !defined (_STLP_MEMBER_POINTER_PARAM_BUG)
+
+template <class Result>
+pointer_to_void_function<Result> ptr_fun(Result (*x)()) {
+    return pointer_to_void_function<Result>(x);
+}
+
+// alternate name
+template <class Result>
+pointer_to_void_function<Result> ptr_gen(Result (*x)()) {
+    return pointer_to_void_function<Result>(x);
+}
+
+# endif /*  !defined (__STL_MEMBER_POINTER_PARAM_BUG) */
+
+
+template <class Arg>
+class	pointer_to_unary_procedure /* :public unary_function<Arg, __void_tag> */ {
+protected:
+	typedef void	(*fun_type)(Arg);
+        fun_type ptr;
+public:
+    typedef Arg argument_type;
+	pointer_to_unary_procedure()	{}
+	pointer_to_unary_procedure(fun_type x) : ptr(x)	{}
+	void	operator() (Arg x) const	{ ptr(x); }
+};
+template <class Arg>
+inline pointer_to_unary_procedure<Arg> ptr_proc(void (*x)(Arg)) {
+	return pointer_to_unary_procedure<Arg>(x);
+}
+
+template <class Arg1, class Arg2>
+class   pointer_to_binary_procedure /* : public unary_function<Arg1, Arg2, __void_tag> */ {
+protected:
+    typedef void    (*fun_type)(Arg1, Arg2);
+    fun_type ptr;
+public:
+    typedef Arg1 first_argument_type;
+    typedef Arg2 second_argument_type;
+        pointer_to_binary_procedure()    {}
+        pointer_to_binary_procedure(fun_type x) : ptr(x)    {}
+        void    operator() (Arg1 x, Arg2 y) const        { ptr(x, y); }
+};
+template <class Arg1, class Arg2>
+inline pointer_to_binary_procedure<Arg1, Arg2> ptr_proc(void (*x)(Arg1, Arg2)) {
+        return pointer_to_binary_procedure<Arg1, Arg2>(x);
+}
+
+#endif
+
diff --git a/main/source/stlport/test/regression/fib.h b/main/source/stlport/test/regression/fib.h
new file mode 100644
index 00000000..53047c73
--- /dev/null
+++ b/main/source/stlport/test/regression/fib.h
@@ -0,0 +1,21 @@
+#ifndef _fib_h
+#define _fib_h
+class Fibonacci
+{
+  public:
+    Fibonacci() : v1(0), v2(1) {}
+    inline int operator()();
+  private:
+    int v1;
+    int v2;
+};
+
+inline int
+Fibonacci::operator()()
+{
+  int r = v1 + v2;
+  v1 = v2;
+  v2 = r;
+  return v1;
+}
+#endif // _fib_h
diff --git a/main/source/stlport/test/regression/fill1.cpp b/main/source/stlport/test/regression/fill1.cpp
new file mode 100644
index 00000000..1eb2a4cc
--- /dev/null
+++ b/main/source/stlport/test/regression/fill1.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define fill1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int fill1_test(int, char**)
+{
+  cout<<"Results of fill1_test:"<<endl;
+  vector <int> v(10);
+  fill(v.begin(), v.end(), 42);
+  for(int i = 0; i < 10; i++)
+    cout << v[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/filln1.cpp b/main/source/stlport/test/regression/filln1.cpp
new file mode 100644
index 00000000..bcad76f2
--- /dev/null
+++ b/main/source/stlport/test/regression/filln1.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define filln1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int filln1_test(int, char**)
+{
+  cout<<"Results of filln1_test:"<<endl;
+  vector <int> v(10);
+  fill_n(v.begin(), v.size(), 42);
+  for(int i = 0; i < 10; i++)
+    cout << v[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/find0.cpp b/main/source/stlport/test/regression/find0.cpp
new file mode 100644
index 00000000..2cf6216e
--- /dev/null
+++ b/main/source/stlport/test/regression/find0.cpp
@@ -0,0 +1,23 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define find0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int find0_test(int, char**)
+{
+  cout<<"Results of find0_test:"<<endl;
+int numbers[10] = { 0, 1, 4, 9, 16, 25, 36, 49, 64 };
+
+  int* location;
+  location = find((int*)numbers, (int*)numbers + 10, 25);
+  cout << "Found 25 at offset " <<(location - numbers) << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/find1.cpp b/main/source/stlport/test/regression/find1.cpp
new file mode 100644
index 00000000..f6478eed
--- /dev/null
+++ b/main/source/stlport/test/regression/find1.cpp
@@ -0,0 +1,23 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define find1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int find1_test(int, char**)
+{
+  cout<<"Results of find1_test:"<<endl;
+int years[] = { 1942, 1952, 1962, 1972, 1982, 1992 };
+
+  const unsigned yearCount = sizeof(years) / sizeof(years[0]);
+  int* location = find((int*)years, (int*)years + yearCount, 1972);
+  cout << "Found 1972 at offset " <<(location - years) << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/findif0.cpp b/main/source/stlport/test/regression/findif0.cpp
new file mode 100644
index 00000000..b22c27c0
--- /dev/null
+++ b/main/source/stlport/test/regression/findif0.cpp
@@ -0,0 +1,34 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define findif0_test main
+#endif
+static bool odd(int a_)
+{
+  return a_ % 2;
+}
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int findif0_test(int, char**)
+{
+  cout<<"Results of findif0_test:"<<endl;
+
+int numbers[6] = { 2, 4, 8, 15, 32, 64 };
+
+  int* location = find_if((int*)numbers, (int*)numbers + 6, odd);
+  if(location != numbers + 6)
+    cout
+      << "Value "
+      << *location
+      << " at offset "
+      <<(location - numbers)
+      << " is odd"
+      << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/findif1.cpp b/main/source/stlport/test/regression/findif1.cpp
new file mode 100644
index 00000000..097fbb5b
--- /dev/null
+++ b/main/source/stlport/test/regression/findif1.cpp
@@ -0,0 +1,38 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define findif1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+static bool div_3(int a_)
+{
+  return a_ % 3 ? 0 : 1;
+}
+int findif1_test(int, char**)
+{
+  cout<<"Results of findif1_test:"<<endl;
+
+  typedef vector <int> IntVec;
+  IntVec v(10);
+  for(int i = 0; i < v.size(); i++)
+    v[i] =(i + 1) *(i + 1);
+  IntVec::iterator iter;
+  iter = find_if(v.begin(), v.end(), div_3);
+  if(iter != v.end())
+    cout
+      << "Value "
+      << *iter
+      << " at offset "
+      <<(iter - v.begin())
+      << " is divisible by 3"
+      << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/finsert1.cpp b/main/source/stlport/test/regression/finsert1.cpp
new file mode 100644
index 00000000..fedfa715
--- /dev/null
+++ b/main/source/stlport/test/regression/finsert1.cpp
@@ -0,0 +1,26 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <deque>
+#include <algorithm>
+
+#ifdef MAIN 
+#define finsert1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int finsert1_test(int, char**)
+{
+  cout<<"Results of finsert1_test:"<<endl;
+char* array [] = { "laurie", "jennifer", "leisa" };
+
+  deque<char*> names;
+  copy(array, array + 3, front_insert_iterator<deque <char*> >(names));
+  deque<char*>::iterator i;
+  for(i = names.begin(); i != names.end(); i++)
+    cout << *i << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/finsert2.cpp b/main/source/stlport/test/regression/finsert2.cpp
new file mode 100644
index 00000000..312f8bfd
--- /dev/null
+++ b/main/source/stlport/test/regression/finsert2.cpp
@@ -0,0 +1,26 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <deque>
+#include <algorithm>
+
+#ifdef MAIN 
+#define finsert2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int finsert2_test(int, char**)
+{
+  cout<<"Results of finsert2_test:"<<endl;
+char* array [] = { "laurie", "jennifer", "leisa" };
+
+  deque<char*> names;
+  copy(array, array + 3, front_inserter(names));
+  deque<char*>::iterator i;
+  for(i = names.begin(); i != names.end(); i++)
+    cout << *i << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/foreach0.cpp b/main/source/stlport/test/regression/foreach0.cpp
new file mode 100644
index 00000000..5104e62d
--- /dev/null
+++ b/main/source/stlport/test/regression/foreach0.cpp
@@ -0,0 +1,29 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#include "fadapter.h"
+
+#ifdef MAIN 
+#define foreach0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+static void print(int a_)
+{
+  cout << a_ << ' ';
+}
+int foreach0_test(int, char**)
+{
+  cout<<"Results of foreach0_test:"<<endl;
+
+int numbers[10] = { 1, 1, 2, 3, 5, 8, 13, 21, 34, 55 };
+
+  for_each(numbers, numbers + 10, ptr_proc(print));
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/foreach1.cpp b/main/source/stlport/test/regression/foreach1.cpp
new file mode 100644
index 00000000..9b1e677d
--- /dev/null
+++ b/main/source/stlport/test/regression/foreach1.cpp
@@ -0,0 +1,31 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <iostream>
+
+#include "fadapter.h"
+
+#ifdef MAIN 
+#define foreach1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+static void print_sqr(int a_)
+{
+  cout << a_ * a_ << " ";
+}
+int foreach1_test(int, char**)
+{
+  cout<<"Results of foreach1_test:"<<endl;
+
+  vector <int> v1(10);
+  for(int i = 0; i < v1.size(); i++)
+    v1[i] = i;
+  for_each(v1.begin(), v1.end(), ptr_proc(print_sqr) );
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/fstream.txt b/main/source/stlport/test/regression/fstream.txt
new file mode 100644
index 00000000..12678c45
--- /dev/null
+++ b/main/source/stlport/test/regression/fstream.txt
@@ -0,0 +1,4 @@
+this
+is
+a
+test
diff --git a/main/source/stlport/test/regression/fstream1.cpp b/main/source/stlport/test/regression/fstream1.cpp
new file mode 100644
index 00000000..24fc55ce
--- /dev/null
+++ b/main/source/stlport/test/regression/fstream1.cpp
@@ -0,0 +1,129 @@
+// Regression test for STL seekg
+
+#include <cstdio> // I really like formatted output.
+#include <cstdarg>
+#include <fstream>
+#include <vector>
+#include <iostream>
+
+#ifndef cstd
+#ifdef _MSC_VER
+#define cstd
+#else
+#define cstd std
+#endif
+#endif
+
+class Error : public std::exception
+{
+public:
+Error(const char *pszfmt, ...);
+const char *what() const;
+private:
+char mMessage[256];
+};
+
+#define countof(x) (sizeof(x)/sizeof((x)[0]))
+
+Error::Error(const char *pszfmt, ...)
+{
+  using cstd::va_list;
+  
+  cstd::va_list ap;
+va_start(ap, pszfmt);
+cstd::vsnprintf(mMessage, countof(mMessage), pszfmt, ap);
+va_end(ap);
+}
+
+const char *Error::what() const
+{
+return mMessage;
+}
+
+// usage: testseek filename
+int main(int argc, char **argv)
+{
+try
+{
+if (argc != 2) {
+throw Error("Wrong number of arguments (Usage: testseek filename)");
+}
+std::ifstream ifs;
+ifs.exceptions(std::ios::badbit);
+ifs.open(argv[1]);
+
+// First pass: read contents of file into character vector
+std::vector<char> charvec;
+cstd::printf("First pass:\n");
+for(;;)
+{
+char ch;
+if (!ifs.get(ch)) {
+break;
+}
+cstd::printf("%c", ch);
+charvec.push_back(ch);
+}
+cstd::printf("First pass done\n");
+
+// Second pass: get positions into pos vector, checking chars
+std::vector<std::ios::pos_type> posvec;
+ifs.clear(); // necessary?
+ifs.seekg(0);
+std::vector<char>::const_iterator char_it;
+cstd::printf("Second pass:\n");
+for(char_it = charvec.begin(); char_it != charvec.end(); ++char_it)
+{
+std::ios::pos_type pos = ifs.tellg();
+posvec.push_back(pos);
+char ch;
+if (!ifs.get(ch)) {
+break;
+}
+cstd::printf("%c", ch);
+if (ch != *char_it) {
+throw Error("Character mismatch: got '%c', expected '%c'",
+ch, *char_it);
+}
+}
+if (char_it != charvec.end()) {
+throw Error("Unexpected end of file");
+}
+cstd::printf("Second pass done\n");
+
+// Third pass: seek to each saved position and read next char
+ifs.clear(); // necessary, but I don't like it
+std::vector<std::ios::pos_type>::const_iterator pos_it;
+cstd::printf("Third pass:\n");
+for(char_it = charvec.begin(), pos_it = posvec.begin();
+char_it != charvec.end(); ++char_it, ++pos_it)
+{
+ifs.seekg(*pos_it);
+char ch;
+if (!ifs.get(ch)) {
+throw Error("End of file when expecting '%c'", *char_it);
+}
+cstd::printf("%c", ch);
+if (ch != *char_it) {
+throw Error("Character mismatch: got '%c', expected '%c'",
+ch, *char_it);
+}
+}
+cstd::printf("Third pass done\n");
+cstd::printf("Test passed\n");
+std::cerr<<"Testing cerr...\n";
+std::cerr<<"Testing cerr"<<std::endl;
+std::cerr<<"Testing cerr with char "<<(char)'5'<<std::endl;
+std::cerr<<"Testing cerr with float "<<(float)5.555<<std::endl;
+std::cerr<<"Testing cerr with int "<<(int)5<<std::endl;
+
+}
+catch (std::exception &e)
+{
+cstd::printf("\nCaught exception: %s\n", e.what());
+cstd::printf("Test failed!\n");
+return 1;
+}
+return 0;
+}
+// end of program
diff --git a/main/source/stlport/test/regression/func1.cpp b/main/source/stlport/test/regression/func1.cpp
new file mode 100644
index 00000000..2ebca7c1
--- /dev/null
+++ b/main/source/stlport/test/regression/func1.cpp
@@ -0,0 +1,31 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <vector>
+#include <algorithm>
+
+#ifdef MAIN 
+#define func1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+static bool bigger(int i_)
+{
+  return i_ > 3;
+}
+int func1_test(int, char**)
+{
+  cout<<"Results of func1_test:"<<endl;
+
+  vector<int>v;
+  v.push_back(4);
+  v.push_back(1);
+  v.push_back(5);
+  int n = 0;
+  count_if(v.begin(), v.end(), bigger, n);
+  cout << "Number greater than 3 = " << n << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/func2.cpp b/main/source/stlport/test/regression/func2.cpp
new file mode 100644
index 00000000..ae204c1e
--- /dev/null
+++ b/main/source/stlport/test/regression/func2.cpp
@@ -0,0 +1,33 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <vector>
+#include <algorithm>
+
+#ifdef MAIN 
+#define func2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+static bool bigger_than(int x_, int y_)
+{
+  return x_ > y_;
+}
+int func2_test(int, char**)
+{
+  cout<<"Results of func2_test:"<<endl;
+
+  std::vector<int>v;
+  v.push_back(4);
+  v.push_back(1);
+  v.push_back(5);
+  sort(v.begin(), v.end(), bigger_than);
+  std::vector<int>::iterator i;
+  for(i = v.begin(); i != v.end(); i++)
+    cout << *i << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/func3.cpp b/main/source/stlport/test/regression/func3.cpp
new file mode 100644
index 00000000..8a5785b3
--- /dev/null
+++ b/main/source/stlport/test/regression/func3.cpp
@@ -0,0 +1,28 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <vector>
+#include <algorithm>
+#include <functional>
+
+#ifdef MAIN 
+#define func3_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int func3_test(int, char**)
+{
+  cout<<"Results of func3_test:"<<endl;
+  vector<int>v;
+  v.push_back(4);
+  v.push_back(1);
+  v.push_back(5);
+  sort(v.begin(), v.end(), greater<int>());
+  std::vector<int>::iterator i;
+  for(i = v.begin(); i != v.end(); i++)
+    cout << *i << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/gcc-99r1.mak b/main/source/stlport/test/regression/gcc-99r1.mak
new file mode 100644
index 00000000..c6756d3f
--- /dev/null
+++ b/main/source/stlport/test/regression/gcc-99r1.mak
@@ -0,0 +1,175 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+.SUFFIXES:	.cc .cpp .o .exe .out
+
+srcdir = .
+VPATH = .
+
+STL_INCL=-I../../stlport
+
+LIST  = stl_test.cpp accum1.cpp accum2.cpp \
+	adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp \
+	advance.cpp \
+	alg1.cpp alg2.cpp alg3.cpp alg4.cpp alg5.cpp \
+	bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp \
+	bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp \
+	binsrch1.cpp binsrch2.cpp \
+	bnegate1.cpp bnegate2.cpp bvec1.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp \
+	copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp \
+	countif1.cpp \
+	deque1.cpp \
+	divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp \
+	equal0.cpp equal1.cpp equal2.cpp \
+	equalto.cpp \
+	fill1.cpp filln1.cpp \
+	find0.cpp find1.cpp \
+	findif0.cpp findif1.cpp \
+	finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp \
+	func1.cpp func2.cpp func3.cpp \
+	gener1.cpp gener2.cpp \
+	genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp \
+	incl0.cpp incl1.cpp incl2.cpp \
+	inplmrg1.cpp inplmrg2.cpp \
+	inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp \
+	iota1.cpp \
+	istmit1.cpp \
+	iter1.cpp iter2.cpp iter3.cpp iter4.cpp \
+	iterswp0.cpp iterswp1.cpp \
+	less.cpp \
+	lesseq.cpp \
+	lexcmp1.cpp lexcmp2.cpp \
+	list1.cpp list2.cpp list3.cpp list4.cpp \
+	logicand.cpp logicnot.cpp \
+	logicor.cpp \
+	lwrbnd1.cpp lwrbnd2.cpp \
+	map1.cpp \
+	max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp \
+	memfunptr.cpp \
+	merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp \
+	minelem1.cpp minelem2.cpp \
+	minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp \
+	mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp \
+	modulus.cpp \
+	mset1.cpp mset3.cpp mset4.cpp mset5.cpp \
+	negate.cpp nequal.cpp \
+	nextprm0.cpp nextprm1.cpp nextprm2.cpp \
+	nthelem0.cpp nthelem1.cpp nthelem2.cpp \
+	ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp \
+	parsrt0.cpp parsrt1.cpp parsrt2.cpp \
+	parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp \
+	partsum0.cpp partsum1.cpp partsum2.cpp \
+	pheap1.cpp pheap2.cpp \
+	plus.cpp \
+	pqueue1.cpp \
+	prevprm0.cpp prevprm1.cpp prevprm2.cpp \
+	ptition0.cpp ptition1.cpp \
+	ptrbinf1.cpp ptrbinf2.cpp \
+	ptrunf1.cpp ptrunf2.cpp \
+	queue1.cpp \
+	rawiter.cpp \
+	remcopy1.cpp \
+	remcpif1.cpp \
+	remif1.cpp \
+	remove1.cpp \
+	repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp \
+	revbit1.cpp revbit2.cpp \
+	revcopy1.cpp reverse1.cpp reviter1.cpp reviter2.cpp \
+	rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp \
+	search0.cpp search1.cpp search2.cpp \
+	set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp \
+	setintr0.cpp setintr1.cpp setintr2.cpp \
+	setsymd0.cpp setsymd1.cpp setsymd2.cpp \
+	setunon0.cpp setunon1.cpp setunon2.cpp \
+	sort1.cpp sort2.cpp \
+	stack1.cpp stack2.cpp \
+	stblptn0.cpp stblptn1.cpp \
+	stblsrt1.cpp stblsrt2.cpp \
+	swap1.cpp \
+	swprnge1.cpp \
+	times.cpp \
+	trnsfrm1.cpp trnsfrm2.cpp \
+	ucompos1.cpp ucompos2.cpp \
+	unegate1.cpp unegate2.cpp \
+	uniqcpy1.cpp uniqcpy2.cpp \
+	unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp \
+	vec1.cpp vec2.cpp vec3.cpp vec4.cpp vec5.cpp vec6.cpp vec7.cpp vec8.cpp \
+        hmmap1.cpp hset2.cpp hmset1.cpp slist1.cpp hmap1.cpp string1.cpp bitset1.cpp
+
+
+# STAT_MODULE=stat.o
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%.exe)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CC = /lang/cygnus/99r1/bin/c++ -R/lang/cygnus/99r1/lib
+CXX = $(CC)
+
+DEBUG_FLAGS= -D_STLP_DEBUG
+
+# CXXFLAGS = -Wall -D_STLP_NO_OWN_IOSTREAMS -fhonor-std -D__HONOR_STD ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} ${STL_VERSION_FLAGS}
+
+# CXXFLAGS = -Wall -D_STLP_NO_OWN_IOSTREAMS ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} ${DEBUG_FLAGS} ${STL_VERSION_FLAGS}
+CXXFLAGS = -Wall ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} ${DEBUG_FLAGS} ${STL_VERSION_FLAGS}
+
+LIBS =  -L../../lib -lstlport_gcc_stldebug -lm 
+LIBSTDCXX = 
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) ${REPO_FLAGS} $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	echo 'a string' | ./$(TEST_EXE) > $(TEST)
+
+
+.cc.o .cxx.o .C.o .cpp.o:
+	${CXX} ${CXXFLAGS} ${DEBUG_FLAGS} ${REPO_FLAGS} -c -o $*.o $<
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} -USINGLE -DMAIN=1 $< -c -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(STAT_MODULE) $(LIBS) -o $*.exe
+	./$*.exe > $@
+	-rm -f $*.exe
+
+istmit1.out: istmit1.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} $< $(STAT_MODULE) $(LIBSTDCXX) -lstdc++ $(LIBS) -o istmit1
+	echo 'a string' | ./istmit1 > istmit1.out
+	-rm -f ./istmit1
+
+$(STAT_MODULE): stat.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} -c $< -o $@
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O3 -fno-exceptions -D_STLP_NO_EXCEPTIONS -S $<  -o $*.s
+
+%.i: %.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} -E $<  > $@
+
+clean:
+	-rm -rf *.exe *.out *.o *.rpo core *.out Templates.DB
+
+
+
+
+
diff --git a/main/source/stlport/test/regression/gcc-hp11.mak b/main/source/stlport/test/regression/gcc-hp11.mak
new file mode 100644
index 00000000..ab53ae7b
--- /dev/null
+++ b/main/source/stlport/test/regression/gcc-hp11.mak
@@ -0,0 +1,176 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+.SUFFIXES:	.cc .cpp .o .exe .out
+
+srcdir = .
+VPATH = .
+
+STL_INCL=-I../../stlport
+
+LIST  = stl_test.cpp accum1.cpp accum2.cpp \
+	adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp \
+	advance.cpp \
+	alg1.cpp alg2.cpp alg3.cpp alg4.cpp alg5.cpp \
+	bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp \
+	bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp \
+	binsrch1.cpp binsrch2.cpp \
+	bnegate1.cpp bnegate2.cpp bvec1.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp \
+	copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp \
+	countif1.cpp \
+	deque1.cpp \
+	divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp \
+	equal0.cpp equal1.cpp equal2.cpp \
+	equalto.cpp \
+	fill1.cpp filln1.cpp \
+	find0.cpp find1.cpp \
+	findif0.cpp findif1.cpp \
+	finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp \
+	func1.cpp func2.cpp func3.cpp \
+	gener1.cpp gener2.cpp \
+	genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp \
+	incl0.cpp incl1.cpp incl2.cpp \
+	inplmrg1.cpp inplmrg2.cpp \
+	inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp \
+	iota1.cpp \
+	istmit1.cpp \
+	iter1.cpp iter2.cpp iter3.cpp iter4.cpp \
+	iterswp0.cpp iterswp1.cpp \
+	less.cpp \
+	lesseq.cpp \
+	lexcmp1.cpp lexcmp2.cpp \
+	list1.cpp list2.cpp list3.cpp list4.cpp \
+	logicand.cpp logicnot.cpp \
+	logicor.cpp \
+	lwrbnd1.cpp lwrbnd2.cpp \
+	map1.cpp \
+	max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp \
+	memfunptr.cpp \
+	merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp \
+	minelem1.cpp minelem2.cpp \
+	minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp \
+	mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp \
+	modulus.cpp \
+	mset1.cpp mset3.cpp mset4.cpp mset5.cpp \
+	negate.cpp nequal.cpp \
+	nextprm0.cpp nextprm1.cpp nextprm2.cpp \
+	nthelem0.cpp nthelem1.cpp nthelem2.cpp \
+	ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp \
+	parsrt0.cpp parsrt1.cpp parsrt2.cpp \
+	parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp \
+	partsum0.cpp partsum1.cpp partsum2.cpp \
+	pheap1.cpp pheap2.cpp \
+	plus.cpp \
+	pqueue1.cpp \
+	prevprm0.cpp prevprm1.cpp prevprm2.cpp \
+	ptition0.cpp ptition1.cpp \
+	ptrbinf1.cpp ptrbinf2.cpp \
+	ptrunf1.cpp ptrunf2.cpp \
+	queue1.cpp \
+	rawiter.cpp \
+	remcopy1.cpp \
+	remcpif1.cpp \
+	remif1.cpp \
+	remove1.cpp \
+	repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp \
+	revbit1.cpp revbit2.cpp \
+	revcopy1.cpp reverse1.cpp reviter1.cpp reviter2.cpp \
+	rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp \
+	search0.cpp search1.cpp search2.cpp \
+	set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp \
+	setintr0.cpp setintr1.cpp setintr2.cpp \
+	setsymd0.cpp setsymd1.cpp setsymd2.cpp \
+	setunon0.cpp setunon1.cpp setunon2.cpp \
+	sort1.cpp sort2.cpp \
+	stack1.cpp stack2.cpp \
+	stblptn0.cpp stblptn1.cpp \
+	stblsrt1.cpp stblsrt2.cpp \
+	swap1.cpp \
+	swprnge1.cpp \
+	times.cpp \
+	trnsfrm1.cpp trnsfrm2.cpp \
+	ucompos1.cpp ucompos2.cpp \
+	unegate1.cpp unegate2.cpp \
+	uniqcpy1.cpp uniqcpy2.cpp \
+	unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp \
+	vec1.cpp vec2.cpp vec3.cpp vec4.cpp vec5.cpp vec6.cpp vec7.cpp vec8.cpp \
+        hmmap1.cpp hset2.cpp hmset1.cpp slist1.cpp hmap1.cpp string1.cpp bitset1.cpp
+
+
+# STAT_MODULE=stat.o
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%.exe)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CC = c++
+CXX = $(CC)
+
+DEBUG_FLAGS= -g -D_REENTRANT -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -D_STLP_DEBUG -D_STLP_USE_MALLOC
+DEBUG_FLAGS= -g -D_REENTRANT -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -D_STLP_USE_MALLOC
+
+
+CXXFLAGS = -Wall -D_STLP_NO_OWN_IOSTREAMS ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} ${STL_VERSION_FLAGS}
+# CXXFLAGS = -Wall ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} ${STL_VERSION_FLAGS} 
+
+# LIBS = -L../../lib -lstlport_gcc_stldebug -lm 
+LIBS= ${DEBUG_FLAGS} -lpthread -lm -lc
+LIBSTDCXX = 
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) ${REPO_FLAGS} $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	echo 'a string' | ./$(TEST_EXE) > $(TEST)
+
+
+.cc.o .cxx.o .C.o .cpp.o:
+	${CXX} ${CXXFLAGS} ${DEBUG_FLAGS} ${REPO_FLAGS} -c -o $*.o $<
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} -USINGLE -DMAIN=1 $< -c -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(STAT_MODULE) $(LIBS) -o $*.exe
+	./$*.exe > $@
+	-rm -f $*.exe
+
+istmit1.out: istmit1.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} $< $(STAT_MODULE) $(LIBSTDCXX) -lstdc++ $(LIBS) -o istmit1
+	echo 'a string' | ./istmit1 > istmit1.out
+	-rm -f ./istmit1
+
+$(STAT_MODULE): stat.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} -c $< -o $@
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O3 -fno-exceptions -D_STLP_NO_EXCEPTIONS -S $<  -o $*.s
+
+%.i: %.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} -E $<  > $@
+
+clean:
+	-rm -rf *.exe *.out *.o *.rpo core *.out Templates.DB
+
+
+
+
+
diff --git a/main/source/stlport/test/regression/gcc-repo.mak b/main/source/stlport/test/regression/gcc-repo.mak
new file mode 100644
index 00000000..1d30c7a3
--- /dev/null
+++ b/main/source/stlport/test/regression/gcc-repo.mak
@@ -0,0 +1,174 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+.SUFFIXES:	.cc .cpp .o .exe .out
+
+srcdir = .
+VPATH = .
+
+STL_INCL=-I../../stlport
+
+LIST  = stl_test.cpp accum1.cpp accum2.cpp \
+	adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp \
+	advance.cpp \
+	alg1.cpp alg2.cpp alg3.cpp alg4.cpp alg5.cpp \
+	bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp \
+	bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp \
+	binsrch1.cpp binsrch2.cpp \
+	bnegate1.cpp bnegate2.cpp bvec1.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp \
+	copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp \
+	countif1.cpp \
+	deque1.cpp \
+	divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp \
+	equal0.cpp equal1.cpp equal2.cpp \
+	equalto.cpp \
+	fill1.cpp filln1.cpp \
+	find0.cpp find1.cpp \
+	findif0.cpp findif1.cpp \
+	finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp \
+	func1.cpp func2.cpp func3.cpp \
+	gener1.cpp gener2.cpp \
+	genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp \
+	incl0.cpp incl1.cpp incl2.cpp \
+	inplmrg1.cpp inplmrg2.cpp \
+	inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp \
+	iota1.cpp \
+	istmit1.cpp \
+	iter1.cpp iter2.cpp iter3.cpp iter4.cpp \
+	iterswp0.cpp iterswp1.cpp \
+	less.cpp \
+	lesseq.cpp \
+	lexcmp1.cpp lexcmp2.cpp \
+	list1.cpp list2.cpp list3.cpp list4.cpp \
+	logicand.cpp logicnot.cpp \
+	logicor.cpp \
+	lwrbnd1.cpp lwrbnd2.cpp \
+	map1.cpp \
+	max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp \
+	memfunptr.cpp \
+	merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp \
+	minelem1.cpp minelem2.cpp \
+	minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp \
+	mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp \
+	modulus.cpp \
+	mset1.cpp mset3.cpp mset4.cpp mset5.cpp \
+	negate.cpp nequal.cpp \
+	nextprm0.cpp nextprm1.cpp nextprm2.cpp \
+	nthelem0.cpp nthelem1.cpp nthelem2.cpp \
+	ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp \
+	parsrt0.cpp parsrt1.cpp parsrt2.cpp \
+	parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp \
+	partsum0.cpp partsum1.cpp partsum2.cpp \
+	pheap1.cpp pheap2.cpp \
+	plus.cpp \
+	pqueue1.cpp \
+	prevprm0.cpp prevprm1.cpp prevprm2.cpp \
+	ptition0.cpp ptition1.cpp \
+	ptrbinf1.cpp ptrbinf2.cpp \
+	ptrunf1.cpp ptrunf2.cpp \
+	queue1.cpp \
+	rawiter.cpp \
+	remcopy1.cpp \
+	remcpif1.cpp \
+	remif1.cpp \
+	remove1.cpp \
+	repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp \
+	revbit1.cpp revbit2.cpp \
+	revcopy1.cpp reverse1.cpp reviter1.cpp reviter2.cpp \
+	rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp \
+	search0.cpp search1.cpp search2.cpp \
+	set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp \
+	setintr0.cpp setintr1.cpp setintr2.cpp \
+	setsymd0.cpp setsymd1.cpp setsymd2.cpp \
+	setunon0.cpp setunon1.cpp setunon2.cpp \
+	sort1.cpp sort2.cpp \
+	stack1.cpp stack2.cpp \
+	stblptn0.cpp stblptn1.cpp \
+	stblsrt1.cpp stblsrt2.cpp \
+	swap1.cpp \
+	swprnge1.cpp \
+	times.cpp \
+	trnsfrm1.cpp trnsfrm2.cpp \
+	ucompos1.cpp ucompos2.cpp \
+	unegate1.cpp unegate2.cpp \
+	uniqcpy1.cpp uniqcpy2.cpp \
+	unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp \
+	vec1.cpp vec2.cpp vec3.cpp vec4.cpp vec5.cpp vec6.cpp vec7.cpp vec8.cpp \
+        hmmap1.cpp hset2.cpp hmset1.cpp slist1.cpp hmap1.cpp string1.cpp bitset1.cpp
+
+
+# STAT_MODULE=stat.o
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%.exe)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CC = c++
+CXX = $(CC)
+
+# DEBUG_FLAGS= -D_STLP_DEBUG
+
+CXXFLAGS = -Wall -D_STLP_NO_OWN_IOSTREAMS -D_STLP_WHOLE_NATIVE_STD -fhonor-std -D__HONOR_STD ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} ${STL_VERSION_FLAGS}
+
+CXXFLAGS = -frepo -Wall -D_STLP_NO_OWN_IOSTREAMS ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} ${STL_VERSION_FLAGS}
+
+LIBS = -lm 
+LIBSTDCXX = 
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) ${REPO_FLAGS} $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	echo 'a string' | $(TEST_EXE) > $(TEST)
+
+
+.cc.o .cxx.o .C.o .cpp.o:
+	${CXX} ${CXXFLAGS} ${DEBUG_FLAGS} ${REPO_FLAGS} -c -o $*.o $<
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} -USINGLE -DMAIN=1 $< -c -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(STAT_MODULE) $(LIBS) -o $*.exe
+	./$*.exe > $@
+	-rm -f $*.exe
+
+istmit1.out: istmit1.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} $< $(STAT_MODULE) $(LIBSTDCXX) -lstdc++ $(LIBS) -o istmit1
+	echo 'a string' | ./istmit1 > istmit1.out
+	-rm -f ./istmit1
+
+$(STAT_MODULE): stat.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} -c $< -o $@
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O3 -fno-exceptions -D_STLP_NO_EXCEPTIONS -S $<  -o $*.s
+
+%.i: %.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} -E $<  > $@
+
+clean:
+	-rm -rf *.exe *.out *.o *.rpo core *.out Templates.DB
+
+
+
+
+
diff --git a/main/source/stlport/test/regression/gcc.gmake b/main/source/stlport/test/regression/gcc.gmake
new file mode 100644
index 00000000..88959216
--- /dev/null
+++ b/main/source/stlport/test/regression/gcc.gmake
@@ -0,0 +1,155 @@
+# makefile for g++-2.95.1 tests
+# This requires GNU make.
+CC=gcc
+CXX=g++
+
+OBJ=.o
+REPO_FLAGS=
+.SUFFIXES:	.cc .cpp $(OBJ) .exe .out
+
+srcdir = .
+VPATH = .
+
+STL_INCL=-I../../stlport
+
+DEBUG_FLAGS= 
+CXX_EXTRA_FLAGS= 
+
+LIST  = stl_test.cpp accum1.cpp accum2.cpp \
+	adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp \
+	advance.cpp \
+	alg1.cpp alg2.cpp alg3.cpp alg4.cpp alg5.cpp \
+	bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp \
+	bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp \
+	binsrch1.cpp binsrch2.cpp \
+	bnegate1.cpp bnegate2.cpp bvec1.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp \
+	copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp \
+	countif1.cpp \
+	deque1.cpp \
+	divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp \
+	equal0.cpp equal1.cpp equal2.cpp \
+	equalto.cpp \
+	fill1.cpp filln1.cpp \
+	find0.cpp find1.cpp \
+	findif0.cpp findif1.cpp \
+	finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp \
+	func1.cpp func2.cpp func3.cpp \
+	gener1.cpp gener2.cpp \
+	genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp \
+	incl0.cpp incl1.cpp incl2.cpp \
+	inplmrg1.cpp inplmrg2.cpp \
+	inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp \
+	iota1.cpp \
+	istmit1.cpp \
+	iter1.cpp iter2.cpp iter3.cpp iter4.cpp \
+	iterswp0.cpp iterswp1.cpp \
+	less.cpp \
+	lesseq.cpp \
+	lexcmp1.cpp lexcmp2.cpp \
+	list1.cpp list2.cpp list3.cpp list4.cpp \
+	logicand.cpp logicnot.cpp \
+	logicor.cpp \
+	lwrbnd1.cpp lwrbnd2.cpp \
+	map1.cpp \
+	max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp \
+	merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp \
+	minelem1.cpp minelem2.cpp \
+	minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp \
+	mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp \
+	modulus.cpp \
+	mset1.cpp mset3.cpp mset4.cpp mset5.cpp \
+	negate.cpp nequal.cpp \
+	nextprm0.cpp nextprm1.cpp nextprm2.cpp \
+	nthelem0.cpp nthelem1.cpp nthelem2.cpp \
+	ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp \
+	parsrt0.cpp parsrt1.cpp parsrt2.cpp \
+	parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp \
+	partsum0.cpp partsum1.cpp partsum2.cpp \
+	pheap1.cpp pheap2.cpp \
+	plus.cpp \
+	pqueue1.cpp \
+	prevprm0.cpp prevprm1.cpp prevprm2.cpp \
+	ptition0.cpp ptition1.cpp \
+	ptrbinf1.cpp ptrbinf2.cpp \
+	ptrunf1.cpp ptrunf2.cpp \
+	queue1.cpp \
+	rawiter.cpp \
+	remcopy1.cpp \
+	remcpif1.cpp \
+	remif1.cpp \
+	remove1.cpp \
+	repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp \
+	revbit1.cpp revbit2.cpp \
+	revcopy1.cpp reverse1.cpp reviter1.cpp reviter2.cpp \
+	rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp \
+	search0.cpp search1.cpp search2.cpp \
+	set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp \
+	setintr0.cpp setintr1.cpp setintr2.cpp \
+	setsymd0.cpp setsymd1.cpp setsymd2.cpp \
+	setunon0.cpp setunon1.cpp setunon2.cpp \
+	sort1.cpp sort2.cpp \
+	stack1.cpp stack2.cpp \
+	stblptn0.cpp stblptn1.cpp \
+	stblsrt1.cpp stblsrt2.cpp \
+	swap1.cpp \
+	swprnge1.cpp \
+	times.cpp \
+	trnsfrm1.cpp trnsfrm2.cpp \
+	ucompos1.cpp ucompos2.cpp \
+	unegate1.cpp unegate2.cpp \
+	uniqcpy1.cpp uniqcpy2.cpp \
+	unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp \
+	vec1.cpp vec2.cpp vec3.cpp vec4.cpp vec5.cpp vec6.cpp vec7.cpp vec8.cpp \
+        hmmap1.cpp hset2.cpp hmset1.cpp slist1.cpp hmap1.cpp string1.cpp bitset1.cpp
+
+
+STAT_MODULE=stat$(OBJ) 
+OBJECTS=$(LIST:%.cpp=%$(OBJ)) $(STAT_MODULE)
+EXECS=$(LIST:%.cpp=%.exe)
+TESTS=$(LIST:%.cpp=%.out)
+TEST_EXE=stl_test.exe
+TEST=stl_test.out
+
+CXXFLAGS = -Wall $(STL_INCL) -I. $(CXX_EXTRA_FLAGS)
+LIBS = -lm 
+
+LIBSTDCXX = 
+
+all:
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS) stl_test.out
+# 	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	echo 'a string' | ./$(TEST_EXE) > $(TEST)
+
+%$(OBJ): %.cpp
+	$(CXX) $(CXXFLAGS) $(DEBUG_FLAGS) $(REPO_FLAGS) -c $<
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} -USINGLE -DMAIN $< 
+	$(CXX) $(CXXFLAGS) $*$(OBJ) $(STAT_MODULE) $(LIBS) -o $*.exe
+	./$*.exe > $@
+	-rm -f $*.exe
+
+clean:
+	-rm -rf *.exe *.out *$(OBJ) *.rpo core *.out Templates.DB
diff --git a/main/source/stlport/test/regression/gcc.mak b/main/source/stlport/test/regression/gcc.mak
new file mode 100644
index 00000000..7b3780c7
--- /dev/null
+++ b/main/source/stlport/test/regression/gcc.mak
@@ -0,0 +1,173 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+.SUFFIXES:	.cc .cpp .o .exe .out
+
+srcdir = .
+VPATH = .
+
+STL_INCL=-I../../stlport
+
+LIST  = stl_test.cpp accum1.cpp accum2.cpp \
+	adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp \
+	advance.cpp \
+	alg1.cpp alg2.cpp alg3.cpp alg4.cpp alg5.cpp \
+	bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp \
+	bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp \
+	binsrch1.cpp binsrch2.cpp \
+	bnegate1.cpp bnegate2.cpp bvec1.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp \
+	copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp \
+	countif1.cpp \
+	deque1.cpp \
+	divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp \
+	equal0.cpp equal1.cpp equal2.cpp \
+	equalto.cpp \
+	fill1.cpp filln1.cpp \
+	find0.cpp find1.cpp \
+	findif0.cpp findif1.cpp \
+	finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp \
+	func1.cpp func2.cpp func3.cpp \
+	gener1.cpp gener2.cpp \
+	genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp \
+	incl0.cpp incl1.cpp incl2.cpp \
+	inplmrg1.cpp inplmrg2.cpp \
+	inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp \
+	iota1.cpp \
+	istmit1.cpp \
+	iter1.cpp iter2.cpp iter3.cpp iter4.cpp \
+	iterswp0.cpp iterswp1.cpp \
+	less.cpp \
+	lesseq.cpp \
+	lexcmp1.cpp lexcmp2.cpp \
+	list1.cpp list2.cpp list3.cpp list4.cpp \
+	logicand.cpp logicnot.cpp \
+	logicor.cpp \
+	lwrbnd1.cpp lwrbnd2.cpp \
+	map1.cpp \
+	max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp \
+	memfunptr.cpp \
+	merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp \
+	minelem1.cpp minelem2.cpp \
+	minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp \
+	mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp \
+	modulus.cpp \
+	mset1.cpp mset3.cpp mset4.cpp mset5.cpp \
+	negate.cpp nequal.cpp \
+	nextprm0.cpp nextprm1.cpp nextprm2.cpp \
+	nthelem0.cpp nthelem1.cpp nthelem2.cpp \
+	ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp \
+	parsrt0.cpp parsrt1.cpp parsrt2.cpp \
+	parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp \
+	partsum0.cpp partsum1.cpp partsum2.cpp \
+	pheap1.cpp pheap2.cpp \
+	plus.cpp \
+	pqueue1.cpp \
+	prevprm0.cpp prevprm1.cpp prevprm2.cpp \
+	ptition0.cpp ptition1.cpp \
+	ptrbinf1.cpp ptrbinf2.cpp \
+	ptrunf1.cpp ptrunf2.cpp \
+	queue1.cpp \
+	rawiter.cpp \
+	remcopy1.cpp \
+	remcpif1.cpp \
+	remif1.cpp \
+	remove1.cpp \
+	repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp \
+	revbit1.cpp revbit2.cpp \
+	revcopy1.cpp reverse1.cpp reviter1.cpp reviter2.cpp \
+	rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp \
+	search0.cpp search1.cpp search2.cpp \
+	set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp \
+	setintr0.cpp setintr1.cpp setintr2.cpp \
+	setsymd0.cpp setsymd1.cpp setsymd2.cpp \
+	setunon0.cpp setunon1.cpp setunon2.cpp \
+	sort1.cpp sort2.cpp \
+	stack1.cpp stack2.cpp \
+	stblptn0.cpp stblptn1.cpp \
+	stblsrt1.cpp stblsrt2.cpp \
+	swap1.cpp \
+	swprnge1.cpp \
+	times.cpp \
+	trnsfrm1.cpp trnsfrm2.cpp \
+	ucompos1.cpp ucompos2.cpp \
+	unegate1.cpp unegate2.cpp \
+	uniqcpy1.cpp uniqcpy2.cpp \
+	unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp \
+	vec1.cpp vec2.cpp vec3.cpp vec4.cpp vec5.cpp vec6.cpp vec7.cpp vec8.cpp \
+  hmmap1.cpp hset2.cpp hmset1.cpp slist1.cpp hmap1.cpp string1.cpp bitset1.cpp
+
+
+# STAT_MODULE=stat.o
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%.exe)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CC = c++
+CXX = $(CC)
+
+DEBUG_FLAGS= -g -D_STLP_DEBUG
+
+CXXFLAGS = -pthread -Wall ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} ${STL_VERSION_FLAGS}
+# CXXFLAGS = -Wall ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} ${STL_VERSION_FLAGS} 
+
+LIBS = -L../../lib -Wl,--rpath=../../lib -lstlport_gcc_stldebug -lm 
+LIBSTDCXX = 
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	echo 'a string' | ./$(TEST_EXE) > $(TEST)
+
+
+.cc.o .cxx.o .C.o .cpp.o:
+	${CXX} ${CXXFLAGS} ${DEBUG_FLAGS} ${REPO_FLAGS} -c -o $*.o $<
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} -USINGLE -DMAIN=1 $< -c -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(STAT_MODULE) $(LIBS) -o $*.exe
+	./$*.exe > $@
+	-rm -f $*.exe
+
+istmit1.out: istmit1.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} $< $(STAT_MODULE) $(LIBSTDCXX) -lstdc++ $(LIBS) -o istmit1
+	echo 'a string' | ./istmit1 > istmit1.out
+	-rm -f ./istmit1
+
+$(STAT_MODULE): stat.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} -c $< -o $@
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O3 -fno-exceptions -D_STLP_NO_EXCEPTIONS -S $<  -o $*.s
+
+%.i: %.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} -E $<  > $@
+
+clean:
+	-rm -rf *.exe *.out *.o *.rpo core *.out Templates.DB
+
+
+
+
+
diff --git a/main/source/stlport/test/regression/gcc3.mak b/main/source/stlport/test/regression/gcc3.mak
new file mode 100644
index 00000000..a06b6b89
--- /dev/null
+++ b/main/source/stlport/test/regression/gcc3.mak
@@ -0,0 +1,174 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+.SUFFIXES:	.cc .cpp .o .exe .out
+
+srcdir = .
+VPATH = .
+
+STL_INCL=-I../../stlport
+
+LIST  = stl_test.cpp accum1.cpp accum2.cpp \
+	adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp \
+	advance.cpp \
+	alg1.cpp alg2.cpp alg3.cpp alg4.cpp alg5.cpp \
+	bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp \
+	bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp \
+	binsrch1.cpp binsrch2.cpp \
+	bnegate1.cpp bnegate2.cpp bvec1.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp \
+	copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp \
+	countif1.cpp \
+	deque1.cpp \
+	divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp \
+	equal0.cpp equal1.cpp equal2.cpp \
+	equalto.cpp \
+	fill1.cpp filln1.cpp \
+	find0.cpp find1.cpp \
+	findif0.cpp findif1.cpp \
+	finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp \
+	func1.cpp func2.cpp func3.cpp \
+	gener1.cpp gener2.cpp \
+	genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp \
+	incl0.cpp incl1.cpp incl2.cpp \
+	inplmrg1.cpp inplmrg2.cpp \
+	inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp \
+	iota1.cpp \
+	istmit1.cpp \
+	iter1.cpp iter2.cpp iter3.cpp iter4.cpp \
+	iterswp0.cpp iterswp1.cpp \
+	less.cpp \
+	lesseq.cpp \
+	lexcmp1.cpp lexcmp2.cpp \
+	list1.cpp list2.cpp list3.cpp list4.cpp \
+	logicand.cpp logicnot.cpp \
+	logicor.cpp \
+	lwrbnd1.cpp lwrbnd2.cpp \
+	map1.cpp \
+	max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp \
+	memfunptr.cpp \
+	merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp \
+	minelem1.cpp minelem2.cpp \
+	minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp \
+	mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp \
+	modulus.cpp \
+	mset1.cpp mset3.cpp mset4.cpp mset5.cpp \
+	negate.cpp nequal.cpp \
+	nextprm0.cpp nextprm1.cpp nextprm2.cpp \
+	nthelem0.cpp nthelem1.cpp nthelem2.cpp \
+	ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp \
+	parsrt0.cpp parsrt1.cpp parsrt2.cpp \
+	parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp \
+	partsum0.cpp partsum1.cpp partsum2.cpp \
+	pheap1.cpp pheap2.cpp \
+	plus.cpp \
+	pqueue1.cpp \
+	prevprm0.cpp prevprm1.cpp prevprm2.cpp \
+	ptition0.cpp ptition1.cpp \
+	ptrbinf1.cpp ptrbinf2.cpp \
+	ptrunf1.cpp ptrunf2.cpp \
+	queue1.cpp \
+	rawiter.cpp \
+	remcopy1.cpp \
+	remcpif1.cpp \
+	remif1.cpp \
+	remove1.cpp \
+	repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp \
+	revbit1.cpp revbit2.cpp \
+	revcopy1.cpp reverse1.cpp reviter1.cpp reviter2.cpp \
+	rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp \
+	search0.cpp search1.cpp search2.cpp \
+	set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp \
+	setintr0.cpp setintr1.cpp setintr2.cpp \
+	setsymd0.cpp setsymd1.cpp setsymd2.cpp \
+	setunon0.cpp setunon1.cpp setunon2.cpp \
+	sort1.cpp sort2.cpp \
+	stack1.cpp stack2.cpp \
+	stblptn0.cpp stblptn1.cpp \
+	stblsrt1.cpp stblsrt2.cpp \
+	swap1.cpp \
+	swprnge1.cpp \
+	times.cpp \
+	trnsfrm1.cpp trnsfrm2.cpp \
+	ucompos1.cpp ucompos2.cpp \
+	unegate1.cpp unegate2.cpp \
+	uniqcpy1.cpp uniqcpy2.cpp \
+	unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp \
+	vec1.cpp vec2.cpp vec3.cpp vec4.cpp vec5.cpp vec6.cpp vec7.cpp vec8.cpp \
+        hmmap1.cpp hset2.cpp hmset1.cpp slist1.cpp hmap1.cpp string1.cpp bitset1.cpp
+
+
+# STAT_MODULE=stat.o
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%.exe)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CC = c++
+CXX = $(CC)
+
+DEBUG_FLAGS= -D_STLP_DEBUG
+
+CXXFLAGS = -Wall ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} ${STL_VERSION_FLAGS}
+# CXXFLAGS = -Wall ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} ${STL_VERSION_FLAGS} 
+
+LIBS = -L../../lib -lstlport_gcc_stldebug -lm 
+
+LIBSTDCXX = 
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	echo 'a string' | ./$(TEST_EXE) > $(TEST)
+
+
+.cc.o .cxx.o .C.o .cpp.o:
+	${CXX} ${CXXFLAGS} ${DEBUG_FLAGS} ${REPO_FLAGS} -c -o $*.o $<
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} -USINGLE -DMAIN=1 $< -c -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(STAT_MODULE) $(LIBS) -o $*.exe
+	./$*.exe > $@
+	-rm -f $*.exe
+
+istmit1.out: istmit1.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} $< $(STAT_MODULE) $(LIBSTDCXX) -lstdc++ $(LIBS) -o istmit1
+	echo 'a string' | ./istmit1 > istmit1.out
+	-rm -f ./istmit1
+
+$(STAT_MODULE): stat.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} -c $< -o $@
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O3 -fno-exceptions -D_STLP_NO_EXCEPTIONS -S $<  -o $*.s
+
+%.i: %.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} -E $<  > $@
+
+clean:
+	-rm -rf *.exe *.out *.o *.rpo core *.out Templates.DB
+
+
+
+
+
diff --git a/main/source/stlport/test/regression/gener1.cpp b/main/source/stlport/test/regression/gener1.cpp
new file mode 100644
index 00000000..c9b8268e
--- /dev/null
+++ b/main/source/stlport/test/regression/gener1.cpp
@@ -0,0 +1,34 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <cstdlib>
+
+#include "fadapter.h"
+
+#ifdef MAIN 
+#define gener1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+static  int cxxrand() { return rand();}
+
+int gener1_test(int, char**)
+{
+  cout<<"Results of gener1_test:"<<endl;
+  int numbers[10];
+#if defined(__MVS__)
+  generate(numbers, numbers + 10, ptr_gen(cxxrand));
+#else
+  generate(numbers, numbers + 10, cxxrand);
+#endif
+
+  for(int i = 0; i < 10; i++)
+    cout << numbers[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/gener2.cpp b/main/source/stlport/test/regression/gener2.cpp
new file mode 100644
index 00000000..3ad6480a
--- /dev/null
+++ b/main/source/stlport/test/regression/gener2.cpp
@@ -0,0 +1,32 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <iostream>
+#include <string>
+#include <cstdlib>
+#include <iterator>
+
+#include "fib.h"
+
+
+#ifdef MAIN 
+#define gener2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+int gener2_test(int, char**)
+{
+  cout<<"Results of gener2_test:"<<endl;
+  vector <int> v1(10);
+  Fibonacci generator;
+  generate(v1.begin(), v1.end(), generator);
+  ostream_iterator<int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/genern1.cpp b/main/source/stlport/test/regression/genern1.cpp
new file mode 100644
index 00000000..579dfdc5
--- /dev/null
+++ b/main/source/stlport/test/regression/genern1.cpp
@@ -0,0 +1,39 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <iostream>
+#include <cstdlib>
+
+#include "fadapter.h"
+
+#ifdef MAIN 
+#define genern1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+
+static int cxxrand() { return rand();}
+
+int genern1_test(int, char**)
+{
+  cout<<"Results of genern1_test:"<<endl;
+
+#ifndef __STL_MEMBER_POINTER_PARAM_BUG		//*TY 07/18/98 - added conditional
+											// since ptr_gen() is not defined under this condition 
+											// (see xfunction.h)
+  vector <int> v1(10);
+
+  generate_n(v1.begin(), v1.size(), ptr_gen(cxxrand));
+
+  for(int i = 0; i < 10; i++)
+    cout << v1[i] << ' ';
+  cout << endl;
+#endif	//	__STL_MEMBER_POINTER_PARAM_BUG	//*TY 07/18/98 - added
+
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/genern2.cpp b/main/source/stlport/test/regression/genern2.cpp
new file mode 100644
index 00000000..24eadec6
--- /dev/null
+++ b/main/source/stlport/test/regression/genern2.cpp
@@ -0,0 +1,29 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <iterator>
+#include <algorithm>
+#include <iostream>
+#include <cstdlib>
+#include "fib.h"
+
+#ifdef MAIN 
+#define genern2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int genern2_test(int, char**)
+{
+  cout<<"Results of genern2_test:"<<endl;
+
+  vector <int> v1(10);
+  Fibonacci generator;
+  generate_n(v1.begin(), v1.size(), generator);
+  ostream_iterator<int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/greateq.cpp b/main/source/stlport/test/regression/greateq.cpp
new file mode 100644
index 00000000..d57646fc
--- /dev/null
+++ b/main/source/stlport/test/regression/greateq.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <functional>
+
+#ifdef MAIN 
+#define greateq_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int greateq_test(int, char**)
+{
+  cout<<"Results of greateq_test:"<<endl;
+int array [4] = { 3, 1, 4, 2 };
+
+  sort(array, array + 4, greater_equal<int>());
+  for(int i = 0; i < 4; i++)
+    cout << array[i] << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/greater.cpp b/main/source/stlport/test/regression/greater.cpp
new file mode 100644
index 00000000..6e76e48c
--- /dev/null
+++ b/main/source/stlport/test/regression/greater.cpp
@@ -0,0 +1,25 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+// #include <functional>
+
+
+#ifdef MAIN 
+#define greater_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int greater_test(int, char**)
+{
+  cout<<"Results of greater_test:"<<endl;
+int array [4] = { 3, 1, 4, 2 };
+
+  sort(array, array + 4, greater<int>());
+  for(int i = 0; i < 4; i++)
+    cout << array[i] << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/hmap1.cpp b/main/source/stlport/test/regression/hmap1.cpp
new file mode 100644
index 00000000..56cfe555
--- /dev/null
+++ b/main/source/stlport/test/regression/hmap1.cpp
@@ -0,0 +1,42 @@
+
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <hash_map>
+#include <rope>
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+#ifdef MAIN 
+#define hmap1_test main
+#endif
+
+int hmap1_test(int, char**)
+{
+  cout<<"Results of hmap1_test:"<<endl;
+  typedef hash_map<char, crope, hash<char>, equal_to<char> > maptype;
+  maptype m;
+  // Store mappings between roman numerals and decimals.
+  m['l'] = "50";
+  m['x'] = "20"; // Deliberate mistake.
+  m['v'] = "5";
+  m['i'] = "1";
+  cout << "m['x'] = " << m['x'] << endl;
+  m['x'] = "10"; // Correct mistake.
+  cout << "m['x'] = " << m['x'] << endl;
+  cout << "m['z'] = " << m['z'] << endl; // Note default value is added.
+  cout << "m.count('z') = " << m.count('z') << endl;
+  pair<maptype::iterator, bool> p =
+      m.insert(pair<const char, crope>('c', crope("100")));
+  if(p.second)
+    cout << "First insertion successful" << endl;
+  p = m.insert(pair<const char, crope>('c', crope("100")));
+  if(p.second)
+    cout << "Second insertion successful" << endl;
+  else
+    cout << "Existing pair " <<(*(p.first)).first
+         << " -> " <<(*(p.first)).second << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/hmmap1.cpp b/main/source/stlport/test/regression/hmmap1.cpp
new file mode 100644
index 00000000..f0b80ba7
--- /dev/null
+++ b/main/source/stlport/test/regression/hmmap1.cpp
@@ -0,0 +1,47 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <hash_map>
+#include <rope>
+
+#ifdef MAIN 
+#define hmmap1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+//struct hash<string>
+//{
+//  size_t operator()(const string& s) const { return __stl_hash_string(s.c_str()); }
+//};
+
+// typedef _Hashtable_node< pair< const char, int > >* nodeptr;
+// __STL_TYPE_TRAITS_POD_SPECIALIZE(nodeptr);
+
+
+int hmmap1_test(int, char**)
+{
+  cout<<"Results of hmmap1_test:"<<endl;
+  typedef hash_multimap<char, int, hash<char>,equal_to<char> > mmap;
+  mmap m;
+  cout << "count('X') = " << m.count('X') << endl;
+  m.insert(pair<const char,int>('X', 10)); // Standard way.
+  cout << "count('X') = " << m.count('X') << endl;
+//  m.insert('X', 20); // Non-standard, but very convenient!
+  m.insert(pair<const char,int>('X', 20));	// jbuck: standard way
+  cout << "count('X') = " << m.count('X') << endl;
+//  m.insert('Y', 32);
+  m.insert(pair<const char,int>('Y', 32));	// jbuck: standard way
+  mmap::iterator i = m.find('X'); // Find first match.
+  while(i != m.end()) // Loop until end is reached.
+  {
+    cout <<(*i).first << " -> " <<(*i).second << endl;
+    i++;
+  }
+  int count = m.erase('X');
+  cout << "Erased " << count << " items" << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/hmset1.cpp b/main/source/stlport/test/regression/hmset1.cpp
new file mode 100644
index 00000000..b6c901b5
--- /dev/null
+++ b/main/source/stlport/test/regression/hmset1.cpp
@@ -0,0 +1,51 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <hash_set>
+
+#ifdef MAIN 
+#define hmset1_test main
+#endif
+
+// struct hash<string> {
+//      size_t operator()(const string& s) const { return __stl_hash_string(s.c_str()); }
+//};
+
+#if defined (__MVS__)
+  #define star   92 
+#else
+  #define star   42
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+#endif
+
+typedef hash_multiset<char, hash<char>, equal_to<char> > hmset;
+// __STL_TYPE_TRAITS_POD_SPECIALIZE(_Hashtable_node<char>*);
+
+
+int hmset1_test(int, char**)
+{
+  cout<<"Results of hmset1_test:"<<endl;
+  hmset s;
+  cout << "count(" << star << ") = " << s.count(star) << endl;
+  s.insert(star);
+  cout << "count(" << star << ") = " << s.count(star) << endl;
+  s.insert(star);
+  cout << "count(" << star << ") = " << s.count(star) << endl;
+  hmset::iterator i = s.find(40);
+  if(i == s.end())
+    cout << "40 Not found" << endl;
+  else
+    cout << "Found " << *i << endl;
+  i = s.find(star);
+  if(i == s.end())
+    cout << "Not found" << endl;
+  else
+    cout << "Found " << *i << endl;
+  int count = s.erase(star);
+  cout << "Erased " << count << " instances" << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/hpacc.mak b/main/source/stlport/test/regression/hpacc.mak
new file mode 100644
index 00000000..2fe8b816
--- /dev/null
+++ b/main/source/stlport/test/regression/hpacc.mak
@@ -0,0 +1,183 @@
+# 
+# Makefile for HP aCC
+#
+
+.SUFFIXES:	.cc .cpp .o .exe .out
+
+srcdir = .
+VPATH = .
+
+STL_INCL=-I../../stlport
+
+HP_VERSION=$(shell uname -r)
+ifeq (${HP_VERSION},B.10.20)
+PTHREAD_LIB=-lcma
+else
+PTHREAD_LIB=-lpthread
+endif
+
+LIST  = stl_test.cpp accum1.cpp accum2.cpp \
+	adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp \
+	advance.cpp \
+	alg1.cpp alg2.cpp alg3.cpp alg4.cpp alg5.cpp \
+	bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp \
+	bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp \
+	binsrch1.cpp binsrch2.cpp \
+	bnegate1.cpp bnegate2.cpp bvec1.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp \
+	copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp \
+	countif1.cpp \
+	deque1.cpp \
+	divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp \
+	equal0.cpp equal1.cpp equal2.cpp \
+	equalto.cpp \
+	fill1.cpp filln1.cpp \
+	find0.cpp find1.cpp \
+	findif0.cpp findif1.cpp \
+	finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp \
+	func1.cpp func2.cpp func3.cpp \
+	gener1.cpp gener2.cpp \
+	genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp \
+	incl0.cpp incl1.cpp incl2.cpp \
+	inplmrg1.cpp inplmrg2.cpp \
+	inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp \
+	iota1.cpp \
+	istmit1.cpp \
+	iter1.cpp iter2.cpp iter3.cpp iter4.cpp \
+	iterswp0.cpp iterswp1.cpp \
+	less.cpp \
+	lesseq.cpp \
+	lexcmp1.cpp lexcmp2.cpp \
+	list1.cpp list2.cpp list3.cpp list4.cpp \
+	logicand.cpp logicnot.cpp \
+	logicor.cpp \
+	lwrbnd1.cpp lwrbnd2.cpp \
+	map1.cpp \
+	max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp \
+	memfunptr.cpp \
+	merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp \
+	minelem1.cpp minelem2.cpp \
+	minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp \
+	mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp \
+	modulus.cpp \
+	mset1.cpp mset3.cpp mset4.cpp mset5.cpp \
+	negate.cpp nequal.cpp \
+	nextprm0.cpp nextprm1.cpp nextprm2.cpp \
+	nthelem0.cpp nthelem1.cpp nthelem2.cpp \
+	ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp \
+	parsrt0.cpp parsrt1.cpp parsrt2.cpp \
+	parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp \
+	partsum0.cpp partsum1.cpp partsum2.cpp \
+	pheap1.cpp pheap2.cpp \
+	plus.cpp \
+	pqueue1.cpp \
+	prevprm0.cpp prevprm1.cpp prevprm2.cpp \
+	ptition0.cpp ptition1.cpp \
+	ptrbinf1.cpp ptrbinf2.cpp \
+	ptrunf1.cpp ptrunf2.cpp \
+	queue1.cpp \
+	rawiter.cpp \
+	remcopy1.cpp \
+	remcpif1.cpp \
+	remif1.cpp \
+	remove1.cpp \
+	repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp \
+	revbit1.cpp revbit2.cpp \
+	revcopy1.cpp reverse1.cpp reviter1.cpp reviter2.cpp \
+	rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp \
+	search0.cpp search1.cpp search2.cpp \
+	set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp \
+	setintr0.cpp setintr1.cpp setintr2.cpp \
+	setsymd0.cpp setsymd1.cpp setsymd2.cpp \
+	setunon0.cpp setunon1.cpp setunon2.cpp \
+	sort1.cpp sort2.cpp \
+	stack1.cpp stack2.cpp \
+	stblptn0.cpp stblptn1.cpp \
+	stblsrt1.cpp stblsrt2.cpp \
+	swap1.cpp \
+	swprnge1.cpp \
+	times.cpp \
+	trnsfrm1.cpp trnsfrm2.cpp \
+	ucompos1.cpp ucompos2.cpp \
+	unegate1.cpp unegate2.cpp \
+	uniqcpy1.cpp uniqcpy2.cpp \
+	unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp \
+	vec1.cpp vec2.cpp vec3.cpp vec4.cpp vec5.cpp vec6.cpp vec7.cpp vec8.cpp \
+        hmmap1.cpp hset2.cpp hmset1.cpp slist1.cpp hmap1.cpp string1.cpp bitset1.cpp
+
+
+# STAT_MODULE=stat.o
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%.exe)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CC = aCC
+CXX = $(CC)
+
+# DEBUG_FLAGS= -D_STLP_DEBUG
+
+# CXXFLAGS = -Wl,+vshlibunsats -AA ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} ${STL_VERSION_FLAGS}
+CXXFLAGS = -AA ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} ${STL_VERSION_FLAGS}
+
+LIBS = +nostl -L../../lib -lstlport_aCC -lm ${PTHREAD_LIB}
+LIBSTDCXX = 
+
+check: $(TEST)
+
+#Run test each time
+#If test crashes, still move .out away
+$(TEST) : $(OBJECTS)  
+	$(CXX) $(CXXFLAGS) ${REPO_FLAGS} $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	-echo 'a string' | $(TEST_EXE) > $(TEST) 
+	mv -f $(TEST) $(TEST).bak
+
+
+.cc.o .cxx.o .C.o .cpp.o:
+	${CXX} ${CXXFLAGS} ${DEBUG_FLAGS} ${REPO_FLAGS} -c -o $*.o $<
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} -USINGLE -DMAIN=1 $< -c -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(STAT_MODULE) $(LIBS) -o $*.exe
+	./$*.exe > $@
+	-rm -f $*.exe
+
+istmit1.out: istmit1.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} $< $(STAT_MODULE) $(LIBSTDCXX) $(LIBS) -USINGLE -DMAIN -o istmit1
+	echo 'a string' | ./istmit1 > istmit1.out
+	-rm -f ./istmit1
+
+$(STAT_MODULE): stat.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} -c $< -o $@
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) +O3 +noeh -D_STLP_NO_EXCEPTIONS -S $<  -o $*.s
+
+%.i: %.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} -E $<  > $@
+clean:
+	-rm -rf *.exe *.out *.o *.rpo core *.out Templates.DB
+
+#Work around bug in compiler: disable inlining
+hmap1.o: hmap1.cpp
+	aCC +d -g0 -Wl,+vshlibunsats -AA -I../../stlport -I. hmap1.cpp -c -o hmap1.o
+
diff --git a/main/source/stlport/test/regression/hset2.cpp b/main/source/stlport/test/regression/hset2.cpp
new file mode 100644
index 00000000..2513dc72
--- /dev/null
+++ b/main/source/stlport/test/regression/hset2.cpp
@@ -0,0 +1,33 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <hash_set>
+
+#ifdef MAIN 
+#define hset2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+// __STL_TYPE_TRAITS_POD_SPECIALIZE(_Hashtable_node<int>*);
+
+int hset2_test(int, char**)
+{
+  cout<<"Results of hset2_test:"<<endl;
+  hash_set<int, hash<int>, equal_to<int> > s;
+  pair<std::hash_set<int, hash<int>, equal_to<int> >::const_iterator, bool> p = s.insert(42);
+  if(p.second)
+   cout << "Inserted new element " << *(p.first) << endl;
+  else
+   cout << "Existing element = " << *(p.first) << endl;
+  p = s.insert(42);
+  if(p.second)
+   cout << "Inserted new element " << *(p.first) << endl;
+  else
+   cout << "Existing element = " << *(p.first) << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/ibm390.mak b/main/source/stlport/test/regression/ibm390.mak
new file mode 100644
index 00000000..e54efc09
--- /dev/null
+++ b/main/source/stlport/test/regression/ibm390.mak
@@ -0,0 +1,158 @@
+# ------------------------------------------------------
+# Makefile for IBM C/C++ for OS/390
+# ------------------------------------------------------
+# point this to proper location
+STL_INCL=-I../../stlport
+
+# list of objects
+OBJECTS  = stl_test.o accum1.o accum2.o \
+	adjdiff0.o adjdiff1.o adjdiff2.o \
+	adjfind0.o adjfind1.o adjfind2.o \
+	advance.o \
+	alg1.o alg2.o alg3.o alg4.o alg5.o \
+	bcompos1.o bcompos2.o \
+	bind1st1.o bind1st2.o \
+	bind2nd1.o bind2nd2.o \
+	binsert1.o binsert2.o \
+	binsrch1.o binsrch2.o \
+	bnegate1.o bnegate2.o bvec1.o \
+	copy1.o copy2.o copy3.o copy4.o \
+	copyb.o copyb0.o \
+	count0.o count1.o \
+	countif1.o \
+	deque1.o \
+	divides.o \
+	eqlrnge0.o eqlrnge1.o eqlrnge2.o \
+	equal0.o equal1.o equal2.o \
+	equalto.o \
+	fill1.o filln1.o \
+	find0.o find1.o \
+	findif0.o findif1.o \
+	finsert1.o finsert2.o \
+	foreach0.o foreach1.o \
+	func1.o func2.o func3.o \
+	gener1.o gener2.o \
+	genern1.o genern2.o \
+	greateq.o greater.o \
+	incl0.o incl1.o incl2.o \
+	inplmrg1.o inplmrg2.o \
+	inrprod0.o inrprod1.o inrprod2.o \
+	insert1.o insert2.o \
+	iota1.o \
+	istmit1.o \
+	iter1.o iter2.o iter3.o iter4.o \
+	iterswp0.o iterswp1.o \
+	less.o \
+	lesseq.o \
+	lexcmp1.o lexcmp2.o \
+	list1.o list2.o list3.o list4.o \
+	logicand.o logicnot.o \
+	logicor.o \
+	lwrbnd1.o lwrbnd2.o \
+	map1.o \
+	max1.o max2.o \
+	maxelem1.o maxelem2.o \
+	memfunptr.o \
+	merge0.o merge1.o merge2.o \
+	min1.o min2.o \
+	minelem1.o minelem2.o \
+	minus.o \
+	mismtch0.o mismtch1.o mismtch2.o \
+	mkheap0.o mkheap1.o \
+	mmap1.o mmap2.o \
+	modulus.o \
+	mset1.o mset3.o mset4.o mset5.o \
+	negate.o nequal.o \
+	nextprm0.o nextprm1.o nextprm2.o \
+	nthelem0.o nthelem1.o nthelem2.o \
+	ostmit.o \
+	pair0.o pair1.o pair2.o \
+	parsrt0.o parsrt1.o parsrt2.o \
+	parsrtc0.o parsrtc1.o parsrtc2.o \
+	partsrt0.o \
+	partsum0.o partsum1.o partsum2.o \
+	pheap1.o pheap2.o \
+	plus.o \
+	pqueue1.o \
+	prevprm0.o prevprm1.o prevprm2.o \
+	ptition0.o ptition1.o \
+	ptrbinf1.o ptrbinf2.o \
+	ptrunf1.o ptrunf2.o \
+	queue1.o \
+	rawiter.o \
+	remcopy1.o \
+	remcpif1.o \
+	remif1.o \
+	remove1.o \
+	repcpif1.o \
+	replace0.o replace1.o replcpy1.o replif1.o \
+	revbit1.o revbit2.o \
+	revcopy1.o reverse1.o reviter1.o reviter2.o \
+	rndshuf0.o rndshuf1.o rndshuf2.o \
+	rotate0.o rotate1.o rotcopy0.o rotcopy1.o \
+	search0.o search1.o search2.o \
+	set1.o set2.o \
+	setdiff0.o setdiff1.o setdiff2.o \
+	setintr0.o setintr1.o setintr2.o \
+	setsymd0.o setsymd1.o setsymd2.o \
+	setunon0.o setunon1.o setunon2.o \
+	sort1.o sort2.o \
+	stack1.o stack2.o \
+	stblptn0.o stblptn1.o \
+	stblsrt1.o stblsrt2.o \
+	swap1.o \
+	swprnge1.o \
+	times.o \
+	trnsfrm1.o trnsfrm2.o \
+	ucompos1.o ucompos2.o \
+	unegate1.o unegate2.o \
+	uniqcpy1.o uniqcpy2.o \
+	unique1.o unique2.o \
+	uprbnd1.o uprbnd2.o \
+	vec1.o vec2.o vec3.o vec4.o vec5.o vec6.o vec7.o vec8.o \
+        hmap1.o hmmap1.o hset2.o hmset1.o slist1.o string1.o bitset1.o
+
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CC = c++
+CXX = $(CC)
+DEBUG_FLAGS=
+# Use this for a debug version
+# DEBUG_FLAGS=-g
+CXXFLAGS = ${STL_INCL} ${DEBUG_FLAGS} -I. -W c,"langlvl(extended)"
+
+check: $(TEST)
+
+$(TEST) : $(TEST_EXE)
+	echo 'a string' | $(TEST_EXE) > $(TEST)
+
+$(TEST_EXE) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) -o $(TEST_EXE)
+
+.SUFFIXES: .cpp .o .exe .out .C
+
+.cpp.o:
+	_CXX_CXXSUFFIX=cpp $(CXX) $(CXXFLAGS) -c $<
+
+.C.o:
+	_CXX_CXXSUFFIX=C $(CXX) $(CXXFLAGS) -c $<
+
+.cpp.out:
+	_CXX_CXXSUFFIX=cpp $(CXX) $(CXXFLAGS) -c -USINGLE -DMAIN $<
+	$(CXX) $(CXXFLAGS) $*.o -o $*.exe
+	./$*.exe > $@
+	rm -f $*.exe
+
+.cpp.exe:
+	_CXX_CXXSUFFIX=cpp $(CXX) $(CXXFLAGS) -c -USINGLE -DMAIN $<
+	$(CXX) $(CXXFLAGS) $*.o -o $*.exe
+
+istmit1.out: istmit1.cpp
+	_CXX_CXXSUFFIX=cpp $(CXX) $(CXXFLAGS) -c -USINGLE -DMAIN $<
+	$(CXX) $(CXXFLAGS) $*.o -o $*.exe
+	echo 'a string' | ./$*.exe > $@
+	rm -f ./$*.exe
+
+clean:
+	-rm -fr *.exe *.o *.obj *.out tempinc
diff --git a/main/source/stlport/test/regression/incl0.cpp b/main/source/stlport/test/regression/incl0.cpp
new file mode 100644
index 00000000..651556fc
--- /dev/null
+++ b/main/source/stlport/test/regression/incl0.cpp
@@ -0,0 +1,30 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+
+#ifdef MAIN 
+#define incl0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int incl0_test(int, char**)
+{
+  cout<<"Results of incl0_test:"<<endl;
+int numbers1[5] = { 1, 2, 3, 4, 5 };
+int numbers2[5] = { 1, 2, 4, 8, 16 };
+int numbers3[2] = { 4, 8 };
+
+  if(includes(numbers1, numbers1 + 5, numbers3, numbers3 + 2))
+    cout << "numbers1 includes numbers3" << endl;
+  else
+    cout << "numbers1 does not include numbers3" << endl;
+  if(includes(numbers2, numbers2 + 5, numbers3, numbers3 + 2))
+    cout << "numbers2 includes numbers3" << endl;
+  else
+    cout << "numbers2 does not include numbers3" << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/incl1.cpp b/main/source/stlport/test/regression/incl1.cpp
new file mode 100644
index 00000000..fcb52f96
--- /dev/null
+++ b/main/source/stlport/test/regression/incl1.cpp
@@ -0,0 +1,36 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define incl1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int incl1_test(int, char**)
+{
+  cout<<"Results of incl1_test:"<<endl;
+  vector<int> v1(10);
+  vector<int> v2(3);
+  int i;
+  for(i = 0; i < v1.size(); i++)
+  {
+    v1[i] = i;
+  }
+  if(includes(v1.begin(), v1.end(), v2.begin(), v2.end()))
+    cout << "v1 includes v2" << endl;
+  else
+    cout << "v1 does not include v2" << endl;
+  for(i = 0; i < v2.size(); i++)
+    v2[i] = i + 3;
+  if(includes(v1.begin(), v1.end(), v2.begin(), v2.end()))
+    cout << "v1 includes v2" << endl;
+  else
+    cout << "v1 does not include v2" << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/incl2.cpp b/main/source/stlport/test/regression/incl2.cpp
new file mode 100644
index 00000000..c1b2c05f
--- /dev/null
+++ b/main/source/stlport/test/regression/incl2.cpp
@@ -0,0 +1,58 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <iostream>
+#include <cstring>
+
+#ifdef MAIN 
+#define incl2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+static bool compare_strings(const char* s1_, const char* s2_)
+{
+  return strcmp(s1_, s2_) < 0 ? 1 : 0;
+}
+int incl2_test(int, char**)
+{
+  cout<<"Results of incl2_test:"<<endl;
+
+char* names[] = {  "Todd", "Mike", "Graham", "Jack", "Brett"};
+
+  const unsigned nameSize = sizeof(names)/sizeof(names[0]);
+  vector <char*> v1(nameSize);
+  for(int i = 0; i < v1.size(); i++)
+  {
+    v1[i] = names[i];
+  }
+  vector <char*> v2(2);
+
+  v2[0] = "foo";
+  v2[1] = "bar";
+  sort(v1.begin(), v1.end(), compare_strings);
+//  cout << "v1 sorted;\n";
+  sort(v2.begin(), v2.end(), compare_strings);
+//  cout << "v1 sorted;\n";
+
+  bool inc = includes(v1.begin(), v1.end(),
+                       v2.begin(), v2.end(),
+                       compare_strings);
+  if(inc)
+    cout << "v1 includes v2" << endl;
+  else
+    cout << "v1 does not include v2" << endl;
+  v2[0] = "Brett";
+  v2[1] = "Todd";
+  inc = includes(v1.begin(), v1.end(),
+                  v2.begin(), v2.end(),
+                  compare_strings);
+  if(inc)
+    cout << "v1 includes v2" << endl;
+  else
+    cout << "v1 does not include v2" << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/inplmrg1.cpp b/main/source/stlport/test/regression/inplmrg1.cpp
new file mode 100644
index 00000000..d8d05b79
--- /dev/null
+++ b/main/source/stlport/test/regression/inplmrg1.cpp
@@ -0,0 +1,28 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define inplmrg1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int inplmrg1_test(int, char**)
+{
+  cout<<"Results of inplmrg1_test:"<<endl;
+int numbers[6] = { 1, 10, 42, 3, 16, 32 };
+
+  int i;
+  for(i = 0; i < 6; i++)
+    cout << numbers[i] << ' ';
+  cout << endl;
+  inplace_merge(numbers, numbers + 3, numbers + 6);
+  for(i = 0; i < 6; i++)
+    cout << numbers[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/inplmrg2.cpp b/main/source/stlport/test/regression/inplmrg2.cpp
new file mode 100644
index 00000000..64e2f7d7
--- /dev/null
+++ b/main/source/stlport/test/regression/inplmrg2.cpp
@@ -0,0 +1,32 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <functional>
+#include <iterator>
+#include <iostream>
+
+#ifdef MAIN 
+#define inplmrg2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int inplmrg2_test(int, char**)
+{
+  cout<<"Results of inplmrg2_test:"<<endl;
+  vector <int> v1(10);
+  for(int i = 0; i < v1.size(); i++)
+    v1[i] =(v1.size() - i - 1) % 5;
+  ostream_iterator <int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  inplace_merge(v1.begin(), v1.begin() + 5,
+                 v1.end(),
+                 greater<int>());
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/inrprod0.cpp b/main/source/stlport/test/regression/inrprod0.cpp
new file mode 100644
index 00000000..3c281f8a
--- /dev/null
+++ b/main/source/stlport/test/regression/inrprod0.cpp
@@ -0,0 +1,25 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <numeric>
+#include <iostream>
+
+#ifdef MAIN 
+#define inrprod0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int inrprod0_test(int, char**)
+{
+  cout<<"Results of inrprod0_test:"<<endl;
+int vector1[5] = { 1, 2, 3, 4, 5 };
+int vector2[5] = { 1, 2, 3, 4, 5 };
+
+  int result;
+  result = inner_product(vector1, vector1 + 5, vector2, 0);
+  cout << "Inner product = " << result << endl;
+  return 0;
+}
+
diff --git a/main/source/stlport/test/regression/inrprod1.cpp b/main/source/stlport/test/regression/inrprod1.cpp
new file mode 100644
index 00000000..1e8391de
--- /dev/null
+++ b/main/source/stlport/test/regression/inrprod1.cpp
@@ -0,0 +1,35 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <numeric>
+#include <iostream>
+#include <iterator>
+#include <string>
+
+#ifdef MAIN 
+#define inrprod1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int inrprod1_test(int, char**)
+{
+  cout<<"Results of inrprod1_test:"<<endl;
+  vector <int> v1(3);
+  vector <int> v2(v1.size());
+  for(int i = 0; i < v1.size(); i++)
+  {
+    v1[i] = i + 1;
+    v2[i] = v1.size() - i;
+  }
+  ostream_iterator<int> iter(cout, " ");
+  cout << "Inner product(sum of products) of:\n\t";
+  copy(v1.begin(), v1.end(), iter);
+  cout << "\n\t";
+  copy(v2.begin(), v2.end(), iter);
+  int result = inner_product(v1.begin(), v1.end(), v2.begin(), 0);
+  cout << "\nis: " << result << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/inrprod2.cpp b/main/source/stlport/test/regression/inrprod2.cpp
new file mode 100644
index 00000000..f140633c
--- /dev/null
+++ b/main/source/stlport/test/regression/inrprod2.cpp
@@ -0,0 +1,49 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <numeric>
+#include <iostream>
+#include <iterator>
+#include <string>
+
+#ifdef MAIN 
+#define inrprod2_test main
+#endif
+static int add(int a_, int b_)
+{
+  return a_ + b_;
+}
+
+static int mult(int a_, int b_)
+{
+  return a_ * b_;
+}
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int inrprod2_test(int, char**)
+{
+  cout<<"Results of inrprod2_test:"<<endl;
+
+  vector <int> v1(3);
+  vector <int> v2(v1.size());
+  for(int i = 0; i < v1.size(); i++)
+  {
+    v1[i] = i + 1;
+    v2[i] = v1.size() - i;
+  }
+  ostream_iterator<int> iter(cout, " ");
+  cout << "Inner product(product of sums):\n\t";
+  copy(v1.begin(), v1.end(), iter);
+  cout << "\n\t";
+  copy(v2.begin(), v2.end(), iter);
+  int result =
+    inner_product(v1.begin(), v1.end(),
+                   v2.begin(),
+                   1,
+                   mult, add);
+  cout << "\nis: " << result << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/insert1.cpp b/main/source/stlport/test/regression/insert1.cpp
new file mode 100644
index 00000000..85a84427
--- /dev/null
+++ b/main/source/stlport/test/regression/insert1.cpp
@@ -0,0 +1,28 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#include <iostream>
+#include <deque>
+#include <algorithm>
+
+#ifdef MAIN 
+#define insert1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+int insert1_test(int, char**)
+{
+  cout<<"Results of insert1_test:"<<endl;
+  char* array1 [] = { "laurie", "jennifer", "leisa" };
+  char* array2 [] = { "amanda", "saskia", "carrie" };
+
+  deque<char*> names(array1, array1 + 3);
+  std::deque<char*>::iterator i = names.begin() + 2;
+  copy(array2, array2 + 3, insert_iterator<deque <char*> >(names, i));
+  std::deque<char*>::iterator j;
+  for(j = names.begin(); j != names.end(); j++)
+    cout << *j << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/insert2.cpp b/main/source/stlport/test/regression/insert2.cpp
new file mode 100644
index 00000000..e066efe9
--- /dev/null
+++ b/main/source/stlport/test/regression/insert2.cpp
@@ -0,0 +1,29 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <deque>
+#include <algorithm>
+
+#ifdef MAIN 
+#define insert2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+int insert2_test(int, char**)
+{
+  cout<<"Results of insert2_test:"<<endl;
+  char* array1 [] = { "laurie", "jennifer", "leisa" };
+  char* array2 [] = { "amanda", "saskia", "carrie" };
+
+  deque<char*> names(array1, array1 + 3);
+  deque<char*>::iterator i = names.begin() + 2;
+  copy(array2, array2 + 3, inserter(names, i));
+  std::deque<char*>::iterator j;
+  for(j = names.begin(); j != names.end(); j++)
+    std::cout << *j << std::endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/intel.mak b/main/source/stlport/test/regression/intel.mak
new file mode 100644
index 00000000..8d0d519c
--- /dev/null
+++ b/main/source/stlport/test/regression/intel.mak
@@ -0,0 +1,179 @@
+# Microsoft Developer Studio Generated NMAKE File, Format Version 4.10
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+################################################################################
+# Begin Project
+RSC=rc.exe
+CPP=icl.exe
+F90=fl32.exe
+
+OUTDIR=.
+INTDIR=.
+
+# set this directories 
+
+STL_INCL=-I../../stlport
+
+VC_INCL=.
+# d:/vc41/msdev/include
+
+Dep_stl = stl_test.obj accum1.obj accum2.obj \
+	adjdiff0.obj adjdiff1.obj adjdiff2.obj \
+	adjfind0.obj adjfind1.obj adjfind2.obj \
+	advance.obj \
+	alg1.obj alg2.obj alg3.obj alg4.obj alg5.obj \
+	bcompos1.obj bcompos2.obj \
+	bind1st1.obj bind1st2.obj \
+	bind2nd1.obj bind2nd2.obj \
+	binsert1.obj binsert2.obj \
+	binsrch1.obj binsrch2.obj \
+	bnegate1.obj bnegate2.obj bvec1.obj \
+	copy1.obj copy2.obj copy3.obj copy4.obj \
+	copyb.obj copyb0.obj \
+	count0.obj count1.obj \
+	countif1.obj \
+	deque1.obj \
+	divides.obj \
+	eqlrnge0.obj eqlrnge1.obj eqlrnge2.obj \
+	equal0.obj equal1.obj equal2.obj \
+	equalto.obj \
+	fill1.obj filln1.obj \
+	find0.obj find1.obj \
+	findif0.obj findif1.obj \
+	finsert1.obj finsert2.obj \
+	foreach0.obj foreach1.obj \
+	func1.obj func2.obj func3.obj \
+	gener1.obj gener2.obj \
+	genern1.obj genern2.obj \
+	greateq.obj greater.obj \
+	incl0.obj incl1.obj incl2.obj \
+	inplmrg1.obj inplmrg2.obj \
+	inrprod0.obj inrprod1.obj inrprod2.obj \
+	insert1.obj insert2.obj \
+	iota1.obj \
+	istmit1.obj \
+	iter1.obj iter2.obj iter3.obj iter4.obj \
+	iterswp0.obj iterswp1.obj \
+	less.obj \
+	lesseq.obj \
+	lexcmp1.obj lexcmp2.obj \
+	list1.obj list2.obj list3.obj list4.obj \
+	logicand.obj logicnot.obj \
+	logicor.obj \
+	lwrbnd1.obj lwrbnd2.obj \
+	map1.obj \
+	max1.obj max2.obj \
+	maxelem1.obj maxelem2.obj \
+	memfunptr.obj \
+	merge0.obj merge1.obj merge2.obj \
+	min1.obj min2.obj \
+	minelem1.obj minelem2.obj \
+	minus.obj \
+	mismtch0.obj mismtch1.obj mismtch2.obj \
+	mkheap0.obj mkheap1.obj \
+	mmap1.obj mmap2.obj \
+	modulus.obj \
+	mset1.obj mset3.obj mset4.obj mset5.obj \
+	negate.obj nequal.obj \
+	nextprm0.obj nextprm1.obj nextprm2.obj \
+	nthelem0.obj nthelem1.obj nthelem2.obj \
+	ostmit.obj \
+	pair0.obj pair1.obj pair2.obj \
+	parsrt0.obj parsrt1.obj parsrt2.obj \
+	parsrtc0.obj parsrtc1.obj parsrtc2.obj \
+	partsrt0.obj \
+	partsum0.obj partsum1.obj partsum2.obj \
+	pheap1.obj pheap2.obj \
+	plus.obj \
+	pqueue1.obj \
+	prevprm0.obj prevprm1.obj prevprm2.obj \
+	ptition0.obj ptition1.obj \
+	ptrbinf1.obj ptrbinf2.obj \
+	ptrunf1.obj ptrunf2.obj \
+	queue1.obj \
+	rawiter.obj \
+	remcopy1.obj \
+	remcpif1.obj \
+	remif1.obj \
+	remove1.obj \
+	repcpif1.obj \
+	replace0.obj replace1.obj replcpy1.obj replif1.obj \
+	revbit1.obj revbit2.obj \
+	revcopy1.obj reverse1.obj reviter1.obj reviter2.obj \
+	rndshuf0.obj rndshuf1.obj rndshuf2.obj \
+	rotate0.obj rotate1.obj rotcopy0.obj rotcopy1.obj \
+	search0.obj search1.obj search2.obj \
+	set1.obj set2.obj \
+	setdiff0.obj setdiff1.obj setdiff2.obj \
+	setintr0.obj setintr1.obj setintr2.obj \
+	setsymd0.obj setsymd1.obj setsymd2.obj \
+	setunon0.obj setunon1.obj setunon2.obj \
+	sort1.obj sort2.obj \
+	stack1.obj stack2.obj \
+	stblptn0.obj stblptn1.obj \
+	stblsrt1.obj stblsrt2.obj \
+	swap1.obj \
+	swprnge1.obj \
+	times.obj \
+	trnsfrm1.obj trnsfrm2.obj \
+	ucompos1.obj ucompos2.obj \
+	unegate1.obj unegate2.obj \
+	uniqcpy1.obj uniqcpy2.obj \
+	unique1.obj unique2.obj \
+	uprbnd1.obj uprbnd2.obj \
+	vec1.obj vec2.obj vec3.obj vec4.obj vec5.obj vec6.obj vec7.obj vec8.obj \
+        hmap1.obj hmmap1.obj hset2.obj hmset1.obj slist1.obj string1.obj bitset1.obj
+
+LINK32=link.exe
+
+# ADD BASE F90 /Ox /c /nologo
+# ADD F90 /Ox /c /nologo
+F90_PROJ=/Ox /c /nologo
+
+CPP_PROJ=/nologo /W4 /MD /GX /Zd /D "WIN32" /D "_STLP_DEBUG" /D "_CONSOLE" $(STL_INCL) -D_STLP_NO_OWN_IOSTREAMS /I$(VC_INCL) /I.
+CPP_LIBS = /link /libpath:"..\..\lib"
+
+check: stl_test.out
+
+stl_test.out : $(Dep_stl)
+	$(CPP) $(CPP_PROJ) $(Dep_stl) $(CPP_LIBS)
+	stl_test > stl_test.out < stdin
+	echo done
+
+clean :
+	-@erase "$(INTDIR)\*.obj"
+	-@erase "$(OUTDIR)\*.exe"
+	-@erase "$(OUTDIR)\*.obj"
+
+
+.exe.out:
+	$< > $@
+
+.cpp.exe:
+  $(CPP) $(CPP_PROJ) -DMAIN $< $(CPP_LIBS)
+
+.c.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cpp.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cxx.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.c.sbr:
+   $(CPP) $(CPP_PROJ) $<  
+
+.cpp.E:
+   $(CPP) $(CPP_PROJ) -E $< >$*.E  
+
+.cpp.sbr:
+   $(CPP) $(CPP_PROJ) $<  
diff --git a/main/source/stlport/test/regression/intel45.mak b/main/source/stlport/test/regression/intel45.mak
new file mode 100644
index 00000000..4f67297b
--- /dev/null
+++ b/main/source/stlport/test/regression/intel45.mak
@@ -0,0 +1,211 @@
+# Microsoft Developer Studio Generated NMAKE File, Format Version 4.10
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+################################################################################
+# Begin Project
+RSC=rc.exe
+CPP=icl.exe
+LINK32=xilink.exe
+
+OUTDIR=.
+INTDIR=.
+
+# set this directories 
+STL_PATH=..\..
+
+Dep_stl = stl_test.obj accum1.obj accum2.obj \
+	adjdiff0.obj adjdiff1.obj adjdiff2.obj \
+	adjfind0.obj adjfind1.obj adjfind2.obj \
+	advance.obj \
+	alg1.obj alg2.obj alg3.obj alg4.obj alg5.obj \
+	bcompos1.obj bcompos2.obj \
+	bind1st1.obj bind1st2.obj \
+	bind2nd1.obj bind2nd2.obj \
+	binsert1.obj binsert2.obj \
+	binsrch1.obj binsrch2.obj \
+	bnegate1.obj bnegate2.obj bvec1.obj \
+	copy1.obj copy2.obj copy3.obj copy4.obj \
+	copyb.obj copyb0.obj \
+	count0.obj count1.obj \
+	countif1.obj \
+	deque1.obj \
+	divides.obj \
+	eqlrnge0.obj eqlrnge1.obj eqlrnge2.obj \
+	equal0.obj equal1.obj equal2.obj \
+	equalto.obj \
+	fill1.obj filln1.obj \
+	find0.obj find1.obj \
+	findif0.obj findif1.obj \
+	finsert1.obj finsert2.obj \
+	foreach0.obj foreach1.obj \
+	func1.obj func2.obj func3.obj \
+	gener1.obj gener2.obj \
+	genern1.obj genern2.obj \
+	greateq.obj greater.obj \
+	incl0.obj incl1.obj incl2.obj \
+	inplmrg1.obj inplmrg2.obj \
+	inrprod0.obj inrprod1.obj inrprod2.obj \
+	insert1.obj insert2.obj \
+	iota1.obj \
+	istmit1.obj \
+	iter1.obj iter2.obj iter3.obj iter4.obj \
+	iterswp0.obj iterswp1.obj \
+	less.obj \
+	lesseq.obj \
+	lexcmp1.obj lexcmp2.obj \
+	list1.obj list2.obj list3.obj list4.obj \
+	logicand.obj logicnot.obj \
+	logicor.obj \
+	lwrbnd1.obj lwrbnd2.obj \
+	map1.obj \
+	max1.obj max2.obj \
+	maxelem1.obj maxelem2.obj \
+	memfunptr.obj \
+	merge0.obj merge1.obj merge2.obj \
+	min1.obj min2.obj \
+	minelem1.obj minelem2.obj \
+	minus.obj \
+	mismtch0.obj mismtch1.obj mismtch2.obj \
+	mkheap0.obj mkheap1.obj \
+	mmap1.obj mmap2.obj \
+	modulus.obj \
+	mset1.obj mset3.obj mset4.obj mset5.obj \
+	negate.obj nequal.obj \
+	nextprm0.obj nextprm1.obj nextprm2.obj \
+	nthelem0.obj nthelem1.obj nthelem2.obj \
+	ostmit.obj \
+	pair0.obj pair1.obj pair2.obj \
+	parsrt0.obj parsrt1.obj parsrt2.obj \
+	parsrtc0.obj parsrtc1.obj parsrtc2.obj \
+	partsrt0.obj \
+	partsum0.obj partsum1.obj partsum2.obj \
+	pheap1.obj pheap2.obj \
+	plus.obj \
+	pqueue1.obj \
+	prevprm0.obj prevprm1.obj prevprm2.obj \
+	ptition0.obj ptition1.obj \
+	ptrbinf1.obj ptrbinf2.obj \
+	ptrunf1.obj ptrunf2.obj \
+	queue1.obj \
+	rawiter.obj \
+	remcopy1.obj \
+	remcpif1.obj \
+	remif1.obj \
+	remove1.obj \
+	repcpif1.obj \
+	replace0.obj replace1.obj replcpy1.obj replif1.obj \
+	revbit1.obj revbit2.obj \
+	revcopy1.obj reverse1.obj reviter1.obj reviter2.obj \
+	rndshuf0.obj rndshuf1.obj rndshuf2.obj \
+	rotate0.obj rotate1.obj rotcopy0.obj rotcopy1.obj \
+	search0.obj search1.obj search2.obj \
+	set1.obj set2.obj \
+	setdiff0.obj setdiff1.obj setdiff2.obj \
+	setintr0.obj setintr1.obj setintr2.obj \
+	setsymd0.obj setsymd1.obj setsymd2.obj \
+	setunon0.obj setunon1.obj setunon2.obj \
+	sort1.obj sort2.obj \
+	stack1.obj stack2.obj \
+	stblptn0.obj stblptn1.obj \
+	stblsrt1.obj stblsrt2.obj \
+	swap1.obj \
+	swprnge1.obj \
+	times.obj \
+	trnsfrm1.obj trnsfrm2.obj \
+	ucompos1.obj ucompos2.obj \
+	unegate1.obj unegate2.obj \
+	uniqcpy1.obj uniqcpy2.obj \
+	unique1.obj unique2.obj \
+	uprbnd1.obj uprbnd2.obj \
+	vec1.obj vec2.obj vec3.obj vec4.obj vec5.obj vec6.obj vec7.obj vec8.obj \
+        hmap1.obj hmmap1.obj hset2.obj hmset1.obj slist1.obj string1.obj bitset1.obj
+
+CPP_PRJ_LINK = /link /incremental:no /LIBPATH:$(STL_PATH)\lib
+
+CPP_PRJ_CMN = /nologo /W3 /GR /GX /DWIN32 /D_WINDOWS /D_CONSOLE /I$(STL_PATH)\stlport /I.
+
+#
+#LIBTYPE = STATIC
+LIBTYPE = DYNAMIC
+#
+#DEBUG = STL
+#DEBUG = ON
+DEBUG =
+# 
+IOS = SGI
+#IOS = NOSGI
+#IOS = NONE
+
+!IF "$(IOS)" == "NOSGI"
+CPP_PRJ_IOS = /D_STLP_NO_OWN_IOSTREAMS
+!ELSEIF "$(IOS)" == "NONE"
+CPP_PRJ_IOS = /D_STLP_NO_IOSTREAM
+!ELSE
+CPP_PRJ_IOS = 
+!ENDIF
+
+#MT/MD etc should be LAST in CPP_PRJ_LIBTYP string!!!
+#Library selection should be BEFORE debug processing!!!
+!IF "$(LIBTYPE)" == "STATIC"
+CPP_PRJ_LIBTYP = /D_STLP_USE_STATIC_LIB /MT
+!ELSE
+CPP_PRJ_LIBTYP = /D_STLP_USE_DYNAMIC_LIB /MD
+!ENDIF
+
+!IF "$(DEBUG)" == ""
+CPP_PRJ_DBG = /DNDEBUG /O2 /Qsox-
+!ELSE
+CPP_PRJ_LIBTYP = $(CPP_PRJ_LIBTYP)d
+CPP_PRJ_DBG = /D_DEBUG /Od
+!IF "$(DEBUG)" == "STL"
+CPP_PRJ_DBG = $(CPP_PRJ_DBG) /D_STLP_DEBUG
+!ENDIF
+CPP_PRJ_CMN = $(CPP_PRJ_CMN) /Zi
+!ENDIF
+
+CPP_PROJ = $(CPP_PRJ_CMN) $(CPP_PRJ_IOS) $(CPP_PRJ_LIBTYP) $(CPP_PRJ_DBG)
+
+check: stl_test.out
+
+stl_test.out : $(Dep_stl)
+	$(CPP) $(CPP_PROJ) $(Dep_stl) $(CPP_PRJ_LINK)
+	stl_test > stl_test.out < stdin
+	echo done
+
+clean :
+	-@erase "$(INTDIR)\*.obj"
+	-@erase "$(OUTDIR)\*.exe"
+	-@erase "$(OUTDIR)\*.obj"
+
+
+.exe.out:
+	$< > $@
+
+.cpp.exe:
+  $(CPP) $(CPP_PROJ) -DMAIN $< $(CPP_PRJ_LINK)
+
+.c.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cpp.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cxx.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.c.sbr:
+   $(CPP) $(CPP_PROJ) $<  
+
+.cpp.E:
+   $(CPP) $(CPP_PROJ) -E $< >$*.E  
+
+.cpp.sbr:
+   $(CPP) $(CPP_PROJ) $<  
diff --git a/main/source/stlport/test/regression/intel50.mak b/main/source/stlport/test/regression/intel50.mak
new file mode 100644
index 00000000..4f67297b
--- /dev/null
+++ b/main/source/stlport/test/regression/intel50.mak
@@ -0,0 +1,211 @@
+# Microsoft Developer Studio Generated NMAKE File, Format Version 4.10
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+################################################################################
+# Begin Project
+RSC=rc.exe
+CPP=icl.exe
+LINK32=xilink.exe
+
+OUTDIR=.
+INTDIR=.
+
+# set this directories 
+STL_PATH=..\..
+
+Dep_stl = stl_test.obj accum1.obj accum2.obj \
+	adjdiff0.obj adjdiff1.obj adjdiff2.obj \
+	adjfind0.obj adjfind1.obj adjfind2.obj \
+	advance.obj \
+	alg1.obj alg2.obj alg3.obj alg4.obj alg5.obj \
+	bcompos1.obj bcompos2.obj \
+	bind1st1.obj bind1st2.obj \
+	bind2nd1.obj bind2nd2.obj \
+	binsert1.obj binsert2.obj \
+	binsrch1.obj binsrch2.obj \
+	bnegate1.obj bnegate2.obj bvec1.obj \
+	copy1.obj copy2.obj copy3.obj copy4.obj \
+	copyb.obj copyb0.obj \
+	count0.obj count1.obj \
+	countif1.obj \
+	deque1.obj \
+	divides.obj \
+	eqlrnge0.obj eqlrnge1.obj eqlrnge2.obj \
+	equal0.obj equal1.obj equal2.obj \
+	equalto.obj \
+	fill1.obj filln1.obj \
+	find0.obj find1.obj \
+	findif0.obj findif1.obj \
+	finsert1.obj finsert2.obj \
+	foreach0.obj foreach1.obj \
+	func1.obj func2.obj func3.obj \
+	gener1.obj gener2.obj \
+	genern1.obj genern2.obj \
+	greateq.obj greater.obj \
+	incl0.obj incl1.obj incl2.obj \
+	inplmrg1.obj inplmrg2.obj \
+	inrprod0.obj inrprod1.obj inrprod2.obj \
+	insert1.obj insert2.obj \
+	iota1.obj \
+	istmit1.obj \
+	iter1.obj iter2.obj iter3.obj iter4.obj \
+	iterswp0.obj iterswp1.obj \
+	less.obj \
+	lesseq.obj \
+	lexcmp1.obj lexcmp2.obj \
+	list1.obj list2.obj list3.obj list4.obj \
+	logicand.obj logicnot.obj \
+	logicor.obj \
+	lwrbnd1.obj lwrbnd2.obj \
+	map1.obj \
+	max1.obj max2.obj \
+	maxelem1.obj maxelem2.obj \
+	memfunptr.obj \
+	merge0.obj merge1.obj merge2.obj \
+	min1.obj min2.obj \
+	minelem1.obj minelem2.obj \
+	minus.obj \
+	mismtch0.obj mismtch1.obj mismtch2.obj \
+	mkheap0.obj mkheap1.obj \
+	mmap1.obj mmap2.obj \
+	modulus.obj \
+	mset1.obj mset3.obj mset4.obj mset5.obj \
+	negate.obj nequal.obj \
+	nextprm0.obj nextprm1.obj nextprm2.obj \
+	nthelem0.obj nthelem1.obj nthelem2.obj \
+	ostmit.obj \
+	pair0.obj pair1.obj pair2.obj \
+	parsrt0.obj parsrt1.obj parsrt2.obj \
+	parsrtc0.obj parsrtc1.obj parsrtc2.obj \
+	partsrt0.obj \
+	partsum0.obj partsum1.obj partsum2.obj \
+	pheap1.obj pheap2.obj \
+	plus.obj \
+	pqueue1.obj \
+	prevprm0.obj prevprm1.obj prevprm2.obj \
+	ptition0.obj ptition1.obj \
+	ptrbinf1.obj ptrbinf2.obj \
+	ptrunf1.obj ptrunf2.obj \
+	queue1.obj \
+	rawiter.obj \
+	remcopy1.obj \
+	remcpif1.obj \
+	remif1.obj \
+	remove1.obj \
+	repcpif1.obj \
+	replace0.obj replace1.obj replcpy1.obj replif1.obj \
+	revbit1.obj revbit2.obj \
+	revcopy1.obj reverse1.obj reviter1.obj reviter2.obj \
+	rndshuf0.obj rndshuf1.obj rndshuf2.obj \
+	rotate0.obj rotate1.obj rotcopy0.obj rotcopy1.obj \
+	search0.obj search1.obj search2.obj \
+	set1.obj set2.obj \
+	setdiff0.obj setdiff1.obj setdiff2.obj \
+	setintr0.obj setintr1.obj setintr2.obj \
+	setsymd0.obj setsymd1.obj setsymd2.obj \
+	setunon0.obj setunon1.obj setunon2.obj \
+	sort1.obj sort2.obj \
+	stack1.obj stack2.obj \
+	stblptn0.obj stblptn1.obj \
+	stblsrt1.obj stblsrt2.obj \
+	swap1.obj \
+	swprnge1.obj \
+	times.obj \
+	trnsfrm1.obj trnsfrm2.obj \
+	ucompos1.obj ucompos2.obj \
+	unegate1.obj unegate2.obj \
+	uniqcpy1.obj uniqcpy2.obj \
+	unique1.obj unique2.obj \
+	uprbnd1.obj uprbnd2.obj \
+	vec1.obj vec2.obj vec3.obj vec4.obj vec5.obj vec6.obj vec7.obj vec8.obj \
+        hmap1.obj hmmap1.obj hset2.obj hmset1.obj slist1.obj string1.obj bitset1.obj
+
+CPP_PRJ_LINK = /link /incremental:no /LIBPATH:$(STL_PATH)\lib
+
+CPP_PRJ_CMN = /nologo /W3 /GR /GX /DWIN32 /D_WINDOWS /D_CONSOLE /I$(STL_PATH)\stlport /I.
+
+#
+#LIBTYPE = STATIC
+LIBTYPE = DYNAMIC
+#
+#DEBUG = STL
+#DEBUG = ON
+DEBUG =
+# 
+IOS = SGI
+#IOS = NOSGI
+#IOS = NONE
+
+!IF "$(IOS)" == "NOSGI"
+CPP_PRJ_IOS = /D_STLP_NO_OWN_IOSTREAMS
+!ELSEIF "$(IOS)" == "NONE"
+CPP_PRJ_IOS = /D_STLP_NO_IOSTREAM
+!ELSE
+CPP_PRJ_IOS = 
+!ENDIF
+
+#MT/MD etc should be LAST in CPP_PRJ_LIBTYP string!!!
+#Library selection should be BEFORE debug processing!!!
+!IF "$(LIBTYPE)" == "STATIC"
+CPP_PRJ_LIBTYP = /D_STLP_USE_STATIC_LIB /MT
+!ELSE
+CPP_PRJ_LIBTYP = /D_STLP_USE_DYNAMIC_LIB /MD
+!ENDIF
+
+!IF "$(DEBUG)" == ""
+CPP_PRJ_DBG = /DNDEBUG /O2 /Qsox-
+!ELSE
+CPP_PRJ_LIBTYP = $(CPP_PRJ_LIBTYP)d
+CPP_PRJ_DBG = /D_DEBUG /Od
+!IF "$(DEBUG)" == "STL"
+CPP_PRJ_DBG = $(CPP_PRJ_DBG) /D_STLP_DEBUG
+!ENDIF
+CPP_PRJ_CMN = $(CPP_PRJ_CMN) /Zi
+!ENDIF
+
+CPP_PROJ = $(CPP_PRJ_CMN) $(CPP_PRJ_IOS) $(CPP_PRJ_LIBTYP) $(CPP_PRJ_DBG)
+
+check: stl_test.out
+
+stl_test.out : $(Dep_stl)
+	$(CPP) $(CPP_PROJ) $(Dep_stl) $(CPP_PRJ_LINK)
+	stl_test > stl_test.out < stdin
+	echo done
+
+clean :
+	-@erase "$(INTDIR)\*.obj"
+	-@erase "$(OUTDIR)\*.exe"
+	-@erase "$(OUTDIR)\*.obj"
+
+
+.exe.out:
+	$< > $@
+
+.cpp.exe:
+  $(CPP) $(CPP_PROJ) -DMAIN $< $(CPP_PRJ_LINK)
+
+.c.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cpp.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cxx.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.c.sbr:
+   $(CPP) $(CPP_PROJ) $<  
+
+.cpp.E:
+   $(CPP) $(CPP_PROJ) -E $< >$*.E  
+
+.cpp.sbr:
+   $(CPP) $(CPP_PROJ) $<  
diff --git a/main/source/stlport/test/regression/iota1.cpp b/main/source/stlport/test/regression/iota1.cpp
new file mode 100644
index 00000000..e997bfdf
--- /dev/null
+++ b/main/source/stlport/test/regression/iota1.cpp
@@ -0,0 +1,23 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <numeric>
+#include <iostream>
+
+#ifdef MAIN 
+#define iota1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int iota1_test(int, char**)
+{
+  cout<<"Results of iota1_test:"<<endl;
+  int numbers[10];
+  iota(numbers, numbers + 10, 42);
+  for(int i = 0; i < 10; i++)
+    cout << numbers[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/istmit1.cpp b/main/source/stlport/test/regression/istmit1.cpp
new file mode 100644
index 00000000..da4f3f54
--- /dev/null
+++ b/main/source/stlport/test/regression/istmit1.cpp
@@ -0,0 +1,37 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <functional>
+#include <iterator>
+
+#ifdef MAIN 
+#define istmit1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int istmit1_test(int, char**)
+{
+  cout<<"Results of istmit1_test:"<<endl;
+  char buffer [100];
+  int i = 0;
+  cin.unsetf(ios::skipws); // Disable white-space skipping.
+  cout << "Please enter a string: ";
+#ifndef _STLP_LIMITED_DEFAULT_TEMPLATES
+  istream_iterator<char> s(cin),meos;		//*TY 01/10/1999 - added eos()
+#else
+  istream_iterator<char, ptrdiff_t> s(cin),meos;		//*TY 01/10/1999 - added eos()
+#endif
+  while(!(s == meos)  &&		
+	//*TY 01/10/1999 - added end of stream check 
+	// NOTE operator!= should not be used here ifndef __STL_FUNCTION_TMPL_PARTIAL_ORDER
+  		*s != '\n' &&
+  		(i < sizeof(buffer)/sizeof(buffer[0])) )		//*TY 07/28/98 - added index check
+    buffer[i++] = *s++;
+  buffer[i] = '\0'; // Null terminate buffer.
+  cout << "read " << buffer << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/iter1.cpp b/main/source/stlport/test/regression/iter1.cpp
new file mode 100644
index 00000000..28d05c16
--- /dev/null
+++ b/main/source/stlport/test/regression/iter1.cpp
@@ -0,0 +1,26 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <vector>
+#include <algorithm>
+
+#ifdef MAIN 
+#define iter1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int iter1_test(int, char**)
+{
+  cout<<"Results of iter1_test:"<<endl;
+  vector<const char*> v; // Vector of character strings.
+  v.push_back((char*) "zippy"); // First element.
+  v.push_back((char*) "motorboy"); // Second element.
+  typedef vector<const char*> vec;
+  vec::iterator i = v.begin(); // Position at end.
+  for(i = v.begin(); i != v.end(); i++)
+    cout << *i << endl; // Display item.
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/iter2.cpp b/main/source/stlport/test/regression/iter2.cpp
new file mode 100644
index 00000000..f821b997
--- /dev/null
+++ b/main/source/stlport/test/regression/iter2.cpp
@@ -0,0 +1,29 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <vector>
+#include <algorithm>
+
+#ifdef MAIN 
+#define iter2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+static void print(const vector<const char*>& v_)
+{
+  std::vector<const char*>::const_iterator i;
+  for(i = v_.begin(); i != v_.end(); i++)
+    cout << *i << endl;
+}
+int iter2_test(int, char**)
+{
+  cout<<"Results of iter2_test:"<<endl;
+  vector<const char*> v;
+  v.push_back((char*) "zippy");
+  v.push_back((char*) "motorboy");
+  print(v);
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/iter3.cpp b/main/source/stlport/test/regression/iter3.cpp
new file mode 100644
index 00000000..26a6c648
--- /dev/null
+++ b/main/source/stlport/test/regression/iter3.cpp
@@ -0,0 +1,27 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <vector>
+#include <algorithm>
+
+#ifdef MAIN 
+#define iter3_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+int iter3_test(int, char**)
+{
+  cout<<"Results of iter3_test:"<<endl;
+  typedef vector<const char*> Vec;
+  Vec v; // Vector of character strings.
+  v.push_back((char*) "zippy"); // First element.
+  v.push_back((char*) "motorboy"); // Second element.
+  Vec::reverse_iterator it;
+  for(it = v.rbegin(); it != v.rend(); it++)
+    cout << *it << endl; // Display item.
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/iter4.cpp b/main/source/stlport/test/regression/iter4.cpp
new file mode 100644
index 00000000..9f7fc7fb
--- /dev/null
+++ b/main/source/stlport/test/regression/iter4.cpp
@@ -0,0 +1,29 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <vector>
+#include <algorithm>
+
+#ifdef MAIN 
+#define iter4_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int iter4_test(int, char**)
+{
+  cout<<"Results of iter4_test:"<<endl;
+  vector<int> v; // Empty vector of integers.
+  v.push_back(1);
+  v.push_back(2);
+  v.push_back(3);
+  // Position immediately after last item.
+  std::vector<int>::iterator i = v.end(); 
+  // Move back one and then access.
+  cout << "last element is " << *--i << endl; 
+  i -= 2; // Jump back two items.
+  cout << "first element is " << *i << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/iterswp0.cpp b/main/source/stlport/test/regression/iterswp0.cpp
new file mode 100644
index 00000000..c9c7597c
--- /dev/null
+++ b/main/source/stlport/test/regression/iterswp0.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define iterswp0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int iterswp0_test(int, char**)
+{
+  cout<<"Results of iterswp0_test:"<<endl;
+int numbers[6] = { 0, 1, 2, 3, 4, 5 };
+
+  iter_swap(numbers, numbers + 3);
+  for(int i = 0; i < 6; i++)
+    cout << numbers[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/iterswp1.cpp b/main/source/stlport/test/regression/iterswp1.cpp
new file mode 100644
index 00000000..ffca1d22
--- /dev/null
+++ b/main/source/stlport/test/regression/iterswp1.cpp
@@ -0,0 +1,27 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <numeric>
+#include <iostream>
+#include <iterator>
+
+#ifdef MAIN 
+#define iterswp1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int iterswp1_test(int, char**)
+{
+  cout<<"Results of iterswp1_test:"<<endl;
+  vector <int> v1(6);
+  iota(v1.begin(), v1.end(), 0);
+  iter_swap(v1.begin(), v1.begin() + 3);
+  ostream_iterator <int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/kai.mak b/main/source/stlport/test/regression/kai.mak
new file mode 100644
index 00000000..7e2af90f
--- /dev/null
+++ b/main/source/stlport/test/regression/kai.mak
@@ -0,0 +1,177 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+srcdir = .
+VPATH = .
+
+# point this to proper location
+
+STL_INCL=-I../../stlport
+
+LIST  = stl_test.cpp accum1.cpp accum2.cpp \
+	adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp \
+	advance.cpp \
+	alg1.cpp alg2.cpp alg3.cpp alg4.cpp alg5.cpp \
+	bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp \
+	bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp \
+	binsrch1.cpp binsrch2.cpp \
+	bnegate1.cpp bnegate2.cpp bvec1.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp \
+	copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp \
+	countif1.cpp \
+	deque1.cpp \
+	divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp \
+	equal0.cpp equal1.cpp equal2.cpp \
+	equalto.cpp \
+	fill1.cpp filln1.cpp \
+	find0.cpp find1.cpp \
+	findif0.cpp findif1.cpp \
+	finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp \
+	func1.cpp func2.cpp func3.cpp \
+	gener1.cpp gener2.cpp \
+	genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp \
+	incl0.cpp incl1.cpp incl2.cpp \
+	inplmrg1.cpp inplmrg2.cpp \
+	inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp \
+	iota1.cpp \
+	istmit1.cpp \
+	iter1.cpp iter2.cpp iter3.cpp iter4.cpp \
+	iterswp0.cpp iterswp1.cpp \
+	less.cpp \
+	lesseq.cpp \
+	lexcmp1.cpp lexcmp2.cpp \
+	list1.cpp list2.cpp list3.cpp list4.cpp \
+	logicand.cpp logicnot.cpp \
+	logicor.cpp \
+	lwrbnd1.cpp lwrbnd2.cpp \
+	map1.cpp \
+	max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp \
+	memfunptr.cpp \
+	merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp \
+	minelem1.cpp minelem2.cpp \
+	minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp \
+	mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp \
+	modulus.cpp \
+	mset1.cpp mset3.cpp mset4.cpp mset5.cpp \
+	negate.cpp nequal.cpp \
+	nextprm0.cpp nextprm1.cpp nextprm2.cpp \
+	nthelem0.cpp nthelem1.cpp nthelem2.cpp \
+	ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp \
+	parsrt0.cpp parsrt1.cpp parsrt2.cpp \
+	parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp \
+	partsum0.cpp partsum1.cpp partsum2.cpp \
+	pheap1.cpp pheap2.cpp \
+	plus.cpp \
+	pqueue1.cpp \
+	prevprm0.cpp prevprm1.cpp prevprm2.cpp \
+	ptition0.cpp ptition1.cpp \
+	ptrbinf1.cpp ptrbinf2.cpp \
+	ptrunf1.cpp ptrunf2.cpp \
+	queue1.cpp \
+	rawiter.cpp \
+	remcopy1.cpp \
+	remcpif1.cpp \
+	remif1.cpp \
+	remove1.cpp \
+	repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp \
+	revbit1.cpp revbit2.cpp \
+	revcopy1.cpp reverse1.cpp reviter1.cpp reviter2.cpp \
+	rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp \
+	search0.cpp search1.cpp search2.cpp \
+	set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp \
+	setintr0.cpp setintr1.cpp setintr2.cpp \
+	setsymd0.cpp setsymd1.cpp setsymd2.cpp \
+	setunon0.cpp setunon1.cpp setunon2.cpp \
+	sort1.cpp sort2.cpp \
+	stack1.cpp stack2.cpp \
+	stblptn0.cpp stblptn1.cpp \
+	stblsrt1.cpp stblsrt2.cpp \
+	swap1.cpp \
+	swprnge1.cpp \
+	times.cpp \
+	trnsfrm1.cpp trnsfrm2.cpp \
+	ucompos1.cpp ucompos2.cpp \
+	unegate1.cpp unegate2.cpp \
+	uniqcpy1.cpp uniqcpy2.cpp \
+	unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp \
+	vec1.cpp vec2.cpp vec3.cpp vec4.cpp vec5.cpp vec6.cpp vec7.cpp vec8.cpp \
+        hmap1.cpp hmmap1.cpp hset2.cpp hmset1.cpp slist1.cpp string1.cpp bitset1.cpp
+
+# STAT_MODULE=stat.o
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%.exe)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CC = KCC
+CXX = $(CC)
+# DEBUG_FLAGS=-g
+DEBUG_FLAGS=-O
+# DEBUG_FLAGS=-O4
+DEBUG_FLAGS=-D_STLP_DEBUG
+DEBUG_FLAGS=
+
+
+CXXFLAGS = --strict --thread_safe -D__KAI_STRICT ${STL_INCL} ${DEBUG_FLAGS} -I.
+
+LIBS = -L../../libstlport -lstlport -lm 
+LIBSTDCXX = 
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(DEBUG_FLAGS) $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	echo 'a string' | $(TEST_EXE) > $(TEST)
+
+SUFFIXES: .cpp.o.exe.out.res
+
+%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) -o $*.exe
+	./$*.exe > $@
+	-rm -f $*.exe
+
+istmit1.out: istmit1.cpp
+	$(CXX) $(CXXFLAGS) $< $(STAT_MODULE) $(LIBSTDCXX) -lstdc++ $(LIBS) -o istmit1
+	echo 'a string' | ./istmit1 > istmit1.out
+	-rm -f ./istmit1
+
+$(STAT_MODULE): stat.cpp
+	$(CXX) $(CXXFLAGS) -c $< -o $@
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O5 -D_STLP_USE_MALLOC -S -pto $<  -o $@
+
+#	$(CXX) $(CXXFLAGS) -O5 -D_STLP_USE_MALLOC -noex -D_STLP_NO_EXCEPTIONS -S -pto $<  -o $@
+
+#	$(CXX) $(CXXFLAGS) -O4 -noex -D_STLP_NO_EXCEPTIONS -D_STLP_NO_EXCEPTIONS -S -pta $<  -o $@
+
+clean:
+	-rm -fr *.exe *.o *.rpo *.obj *.out Templates.DB SunWS_cache ti_files
+
diff --git a/main/source/stlport/test/regression/kcc-new.mak b/main/source/stlport/test/regression/kcc-new.mak
new file mode 100644
index 00000000..9845e017
--- /dev/null
+++ b/main/source/stlport/test/regression/kcc-new.mak
@@ -0,0 +1,178 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+srcdir = .
+VPATH = .
+
+# point this to proper location
+
+STL_INCL= -I../../stlport
+
+
+LIST  = stl_test.cpp accum1.cpp accum2.cpp \
+	adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp \
+	advance.cpp \
+	alg1.cpp alg2.cpp alg3.cpp alg4.cpp alg5.cpp \
+	bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp \
+	bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp \
+	binsrch1.cpp binsrch2.cpp \
+	bnegate1.cpp bnegate2.cpp bvec1.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp \
+	copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp \
+	countif1.cpp \
+	deque1.cpp \
+	divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp \
+	equal0.cpp equal1.cpp equal2.cpp \
+	equalto.cpp \
+	fill1.cpp filln1.cpp \
+	find0.cpp find1.cpp \
+	findif0.cpp findif1.cpp \
+	finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp \
+	func1.cpp func2.cpp func3.cpp \
+	gener1.cpp gener2.cpp \
+	genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp \
+	incl0.cpp incl1.cpp incl2.cpp \
+	inplmrg1.cpp inplmrg2.cpp \
+	inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp \
+	iota1.cpp \
+	istmit1.cpp \
+	iter1.cpp iter2.cpp iter3.cpp iter4.cpp \
+	iterswp0.cpp iterswp1.cpp \
+	less.cpp \
+	lesseq.cpp \
+	lexcmp1.cpp lexcmp2.cpp \
+	list1.cpp list2.cpp list3.cpp list4.cpp \
+	logicand.cpp logicnot.cpp \
+	logicor.cpp \
+	lwrbnd1.cpp lwrbnd2.cpp \
+	map1.cpp \
+	max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp \
+	memfunptr.cpp \
+	merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp \
+	minelem1.cpp minelem2.cpp \
+	minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp \
+	mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp \
+	modulus.cpp \
+	mset1.cpp mset3.cpp mset4.cpp mset5.cpp \
+	negate.cpp nequal.cpp \
+	nextprm0.cpp nextprm1.cpp nextprm2.cpp \
+	nthelem0.cpp nthelem1.cpp nthelem2.cpp \
+	ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp \
+	parsrt0.cpp parsrt1.cpp parsrt2.cpp \
+	parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp \
+	partsum0.cpp partsum1.cpp partsum2.cpp \
+	pheap1.cpp pheap2.cpp \
+	plus.cpp \
+	pqueue1.cpp \
+	prevprm0.cpp prevprm1.cpp prevprm2.cpp \
+	ptition0.cpp ptition1.cpp \
+	ptrbinf1.cpp ptrbinf2.cpp \
+	ptrunf1.cpp ptrunf2.cpp \
+	queue1.cpp \
+	rawiter.cpp \
+	remcopy1.cpp \
+	remcpif1.cpp \
+	remif1.cpp \
+	remove1.cpp \
+	repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp \
+	revbit1.cpp revbit2.cpp \
+	revcopy1.cpp reverse1.cpp reviter1.cpp reviter2.cpp \
+	rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp \
+	search0.cpp search1.cpp search2.cpp \
+	set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp \
+	setintr0.cpp setintr1.cpp setintr2.cpp \
+	setsymd0.cpp setsymd1.cpp setsymd2.cpp \
+	setunon0.cpp setunon1.cpp setunon2.cpp \
+	sort1.cpp sort2.cpp \
+	stack1.cpp stack2.cpp \
+	stblptn0.cpp stblptn1.cpp \
+	stblsrt1.cpp stblsrt2.cpp \
+	swap1.cpp \
+	swprnge1.cpp \
+	times.cpp \
+	trnsfrm1.cpp trnsfrm2.cpp \
+	ucompos1.cpp ucompos2.cpp \
+	unegate1.cpp unegate2.cpp \
+	uniqcpy1.cpp uniqcpy2.cpp \
+	unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp \
+	vec1.cpp vec2.cpp vec3.cpp vec4.cpp vec5.cpp vec6.cpp vec7.cpp vec8.cpp \
+        hmap1.cpp hmmap1.cpp hset2.cpp hmset1.cpp slist1.cpp string1.cpp bitset1.cpp
+
+# STAT_MODULE=stat.o
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%.exe)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CC = KCC
+CXX = $(CC)
+# DEBUG_FLAGS=-g
+DEBUG_FLAGS=-O
+# DEBUG_FLAGS=-O4
+DEBUG_FLAGS=-D_STLP_DEBUG
+DEBUG_FLAGS=
+
+
+CXXFLAGS = --strict --thread_safe -D__KAI_STRICT ${STL_INCL} ${DEBUG_FLAGS} -I.
+
+LIBS = -L../../libstlport -lstlport -lm 
+LIBSTDCXX = 
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(DEBUG_FLAGS) $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	echo 'a string' | $(TEST_EXE) > $(TEST)
+
+SUFFIXES: .cpp.o.exe.out.res
+
+%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) -o $*.exe
+	./$*.exe > $@
+	-rm -f $*.exe
+
+istmit1.out: istmit1.cpp
+	$(CXX) $(CXXFLAGS) $< $(STAT_MODULE) $(LIBSTDCXX) -lstdc++ $(LIBS) -o istmit1
+	echo 'a string' | ./istmit1 > istmit1.out
+	-rm -f ./istmit1
+
+$(STAT_MODULE): stat.cpp
+	$(CXX) $(CXXFLAGS) -c $< -o $@
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O5 -D_STLP_USE_MALLOC -S -pto $<  -o $@
+
+#	$(CXX) $(CXXFLAGS) -O5 -D_STLP_USE_MALLOC -noex -D_STLP_NO_EXCEPTIONS -S -pto $<  -o $@
+
+#	$(CXX) $(CXXFLAGS) -O4 -noex -D_STLP_NO_EXCEPTIONS -D_STLP_NO_EXCEPTIONS -S -pta $<  -o $@
+
+clean:
+	-rm -fr *.exe *.o *.rpo *.obj *.out Templates.DB SunWS_cache ti_files
+
diff --git a/main/source/stlport/test/regression/kcc.mak b/main/source/stlport/test/regression/kcc.mak
new file mode 100644
index 00000000..9f5b0b91
--- /dev/null
+++ b/main/source/stlport/test/regression/kcc.mak
@@ -0,0 +1,176 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+
+srcdir = .
+VPATH = .
+
+# point this to proper location
+
+STL_INCL=-I../../stlport
+
+
+LIST  = stl_test.cpp accum1.cpp accum2.cpp \
+	adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp \
+	advance.cpp \
+	alg1.cpp alg2.cpp alg3.cpp alg4.cpp alg5.cpp \
+	bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp \
+	bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp \
+	binsrch1.cpp binsrch2.cpp \
+	bnegate1.cpp bnegate2.cpp bvec1.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp \
+	copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp \
+	countif1.cpp \
+	deque1.cpp \
+	divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp \
+	equal0.cpp equal1.cpp equal2.cpp \
+	equalto.cpp \
+	fill1.cpp filln1.cpp \
+	find0.cpp find1.cpp \
+	findif0.cpp findif1.cpp \
+	finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp \
+	func1.cpp func2.cpp func3.cpp \
+	gener1.cpp gener2.cpp \
+	genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp \
+	incl0.cpp incl1.cpp incl2.cpp \
+	inplmrg1.cpp inplmrg2.cpp \
+	inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp \
+	iota1.cpp \
+	istmit1.cpp \
+	iter1.cpp iter2.cpp iter3.cpp iter4.cpp \
+	iterswp0.cpp iterswp1.cpp \
+	less.cpp \
+	lesseq.cpp \
+	lexcmp1.cpp lexcmp2.cpp \
+	list1.cpp list2.cpp list3.cpp list4.cpp \
+	logicand.cpp logicnot.cpp \
+	logicor.cpp \
+	lwrbnd1.cpp lwrbnd2.cpp \
+	map1.cpp \
+	max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp \
+	memfunptr.cpp \
+	merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp \
+	minelem1.cpp minelem2.cpp \
+	minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp \
+	mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp \
+	modulus.cpp \
+	mset1.cpp mset3.cpp mset4.cpp mset5.cpp \
+	negate.cpp nequal.cpp \
+	nextprm0.cpp nextprm1.cpp nextprm2.cpp \
+	nthelem0.cpp nthelem1.cpp nthelem2.cpp \
+	ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp \
+	parsrt0.cpp parsrt1.cpp parsrt2.cpp \
+	parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp \
+	partsum0.cpp partsum1.cpp partsum2.cpp \
+	pheap1.cpp pheap2.cpp \
+	plus.cpp \
+	pqueue1.cpp \
+	prevprm0.cpp prevprm1.cpp prevprm2.cpp \
+	ptition0.cpp ptition1.cpp \
+	ptrbinf1.cpp ptrbinf2.cpp \
+	ptrunf1.cpp ptrunf2.cpp \
+	queue1.cpp \
+	rawiter.cpp \
+	remcopy1.cpp \
+	remcpif1.cpp \
+	remif1.cpp \
+	remove1.cpp \
+	repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp \
+	revbit1.cpp revbit2.cpp \
+	revcopy1.cpp reverse1.cpp reviter1.cpp reviter2.cpp \
+	rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp \
+	search0.cpp search1.cpp search2.cpp \
+	set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp \
+	setintr0.cpp setintr1.cpp setintr2.cpp \
+	setsymd0.cpp setsymd1.cpp setsymd2.cpp \
+	setunon0.cpp setunon1.cpp setunon2.cpp \
+	sort1.cpp sort2.cpp \
+	stack1.cpp stack2.cpp \
+	stblptn0.cpp stblptn1.cpp \
+	stblsrt1.cpp stblsrt2.cpp \
+	swap1.cpp \
+	swprnge1.cpp \
+	times.cpp \
+	trnsfrm1.cpp trnsfrm2.cpp \
+	ucompos1.cpp ucompos2.cpp \
+	unegate1.cpp unegate2.cpp \
+	uniqcpy1.cpp uniqcpy2.cpp \
+	unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp \
+	vec1.cpp vec2.cpp vec3.cpp vec4.cpp vec5.cpp vec6.cpp vec7.cpp vec8.cpp \
+        hmap1.cpp hmmap1.cpp hset2.cpp hmset1.cpp slist1.cpp string1.cpp bitset1.cpp
+
+# STAT_MODULE=stat.o
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%.exe)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CC = KCC
+CXX = $(CC)
+# DEBUG_FLAGS=-g
+DEBUG_FLAGS=-O
+# DEBUG_FLAGS=-O4
+DEBUG_FLAGS=-D__STL_DEBUG
+DEBUG_FLAGS=
+
+
+CXXFLAGS = -D_STLP_NO_OWN_IOSTREAMS ${STL_INCL} ${DEBUG_FLAGS} -I.
+
+LIBS = -lm 
+LIBSTDCXX = 
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(DEBUG_FLAGS) $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	echo 'a string' | $(TEST_EXE) > $(TEST)
+
+SUFFIXES: .cpp.o.exe.out.res
+
+%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) -o $*.exe
+	./$*.exe > $@
+	-rm -f $*.exe
+
+istmit1.out: istmit1.cpp
+	$(CXX) $(CXXFLAGS) $< $(STAT_MODULE) $(LIBSTDCXX) -lstdc++ $(LIBS) -o istmit1
+	echo 'a string' | ./istmit1 > istmit1.out
+	-rm -f ./istmit1
+
+$(STAT_MODULE): stat.cpp
+	$(CXX) $(CXXFLAGS) -c $< -o $@
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O5 -D__STL_USE_MALLOC -S -pto $<  -o $@
+
+#	$(CXX) $(CXXFLAGS) -O5 -D__STL_USE_MALLOC -noex -D__STL_NO_EXCEPTIONS -S -pto $<  -o $@
+
+#	$(CXX) $(CXXFLAGS) -O4 -noex -D__STL_NO_EXCEPTIONS -D__STL_NO_EXCEPTIONS -S -pta $<  -o $@
+
+clean:
+	-rm -fr *.exe *.o *.rpo *.obj *.out Templates.DB SunWS_cache
diff --git a/main/source/stlport/test/regression/less.cpp b/main/source/stlport/test/regression/less.cpp
new file mode 100644
index 00000000..305f6ea4
--- /dev/null
+++ b/main/source/stlport/test/regression/less.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <functional>
+
+#ifdef MAIN 
+#define less_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int less_test(int, char**)
+{
+  cout<<"Results of less_test:"<<endl;
+int array [4] = { 3, 1, 4, 2 };
+
+  sort(array, array + 4, less<int>());
+  for(int i = 0; i < 4; i++)
+    cout << array[i] << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/lesseq.cpp b/main/source/stlport/test/regression/lesseq.cpp
new file mode 100644
index 00000000..c26d4088
--- /dev/null
+++ b/main/source/stlport/test/regression/lesseq.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <functional>
+
+#ifdef MAIN 
+#define lesseq_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int lesseq_test(int, char**)
+{
+  cout<<"Results of lesseq_test:"<<endl;
+int array [4] = { 3, 1, 4, 2 };
+
+  sort(array, array + 4, less_equal<int>());
+  for(int i = 0; i < 4; i++)
+    cout << array[i] << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/lexcmp1.cpp b/main/source/stlport/test/regression/lexcmp1.cpp
new file mode 100644
index 00000000..76ec34d5
--- /dev/null
+++ b/main/source/stlport/test/regression/lexcmp1.cpp
@@ -0,0 +1,27 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+
+#ifdef MAIN 
+#define lexcmp1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int lexcmp1_test(int, char**)
+{
+  cout<<"Results of lexcmp1_test:"<<endl;
+const unsigned size = 6;
+char n1[size] = "shoe";
+char n2[size] = "shine";
+
+  bool before = lexicographical_compare(n1, n1 + size, n2, n2 + size);
+  if(before)
+    cout << n1 << " is before " << n2 << endl;
+  else
+    cout << n2 << " is before " << n1 << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/lexcmp2.cpp b/main/source/stlport/test/regression/lexcmp2.cpp
new file mode 100644
index 00000000..42536d40
--- /dev/null
+++ b/main/source/stlport/test/regression/lexcmp2.cpp
@@ -0,0 +1,31 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <functional>
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define lexcmp2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int lexcmp2_test(int, char**)
+{
+  cout<<"Results of lexcmp2_test:"<<endl;
+const unsigned size = 6;
+char n1[size] = "shoe";
+char n2[size] = "shine";
+
+  bool before =
+    lexicographical_compare(n1, n1 + size,
+                             n2, n2 + size,
+                             greater<char>());
+  if(before)
+    cout << n1 << " is after " << n2 << endl;
+  else
+    cout << n2 << " is after " << n1 << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/list1.cpp b/main/source/stlport/test/regression/list1.cpp
new file mode 100644
index 00000000..8fb2c3de
--- /dev/null
+++ b/main/source/stlport/test/regression/list1.cpp
@@ -0,0 +1,28 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <list>
+
+#ifdef MAIN 
+#define list1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int list1_test(int, char**)
+{
+  cout<<"Results of list1_test:"<<endl;
+int array1 [] = { 9, 16, 36 };
+int array2 [] = { 1, 4 };
+
+  list<int> l1(array1, array1 + 3);
+  list<int> l2(array2, array2 + 2);
+  std::list<int>::iterator i1 = l1.begin();
+  l1.splice(i1, l2);
+  std::list<int>::iterator i2 = l1.begin();
+  while(i2 != l1.end())
+    cout << *i2++ << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/list2.cpp b/main/source/stlport/test/regression/list2.cpp
new file mode 100644
index 00000000..3d08e7ea
--- /dev/null
+++ b/main/source/stlport/test/regression/list2.cpp
@@ -0,0 +1,29 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <list>
+
+#ifdef MAIN 
+#define list2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int list2_test(int, char**)
+{
+  cout<<"Results of list2_test:"<<endl;
+int array1 [] = { 1, 16 };
+int array2 [] = { 4, 9 };
+
+  list<int> l1(array1, array1 + 2);
+  list<int> l2(array2, array2 + 2);
+  std::list<int>::iterator i = l1.begin();
+  i++;
+  l1.splice(i, l2, l2.begin(), l2.end());
+  i = l1.begin();
+  while(i != l1.end())
+    cout << *i++ << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/list3.cpp b/main/source/stlport/test/regression/list3.cpp
new file mode 100644
index 00000000..d9560f2b
--- /dev/null
+++ b/main/source/stlport/test/regression/list3.cpp
@@ -0,0 +1,46 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <list>
+
+#ifdef MAIN 
+#define list3_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int list3_test(int, char**)
+{
+  cout<<"Results of list3_test:"<<endl;
+char array [] = { 'x', 'l', 'x', 't', 's', 's' };
+
+  list<char> str(array, array + 6);
+  std::list<char>::iterator i;
+  cout << "original: ";
+  for(i = str.begin(); i != str.end(); i++)
+    cout << *i;
+  cout << endl;
+  cout << "reversed: ";
+  str.reverse();
+  for(i = str.begin(); i != str.end(); i++)
+    cout << *i;
+  cout << endl;
+  cout << "removed: ";
+  str.remove('x');
+  for(i = str.begin(); i != str.end(); i++)
+    cout << *i;
+  cout << endl;
+  cout << "uniqued: ";
+  str.unique();
+  for(i = str.begin(); i != str.end(); i++)
+    cout << *i;
+  cout << endl;
+  cout << "sorted: ";
+  str.sort();
+  for(i = str.begin(); i != str.end(); i++)
+    cout << *i;
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/list4.cpp b/main/source/stlport/test/regression/list4.cpp
new file mode 100644
index 00000000..a282dc7f
--- /dev/null
+++ b/main/source/stlport/test/regression/list4.cpp
@@ -0,0 +1,27 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <list>
+
+#ifdef MAIN 
+#define list4_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int list4_test(int, char**)
+{
+  cout<<"Results of list4_test:"<<endl;
+int array1 [] = { 1, 3, 6, 7 };
+int array2 [] = { 2, 4 };
+
+  list<int> l1(array1, array1 + 4);
+  list<int> l2(array2, array2 + 2);
+  l1.merge(l2);
+  for(std::list<int>::iterator i = l1.begin(); i != l1.end(); i++)
+    cout << *i;
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/log b/main/source/stlport/test/regression/log
new file mode 100644
index 00000000..792589ec
--- /dev/null
+++ b/main/source/stlport/test/regression/log
@@ -0,0 +1,746 @@
+MAKE Version 5.2  Copyright (c) 1987, 2000 Borland
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c vec6.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+vec6.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c vec5.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+vec5.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c vec4.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+vec4.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c vec3.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+vec3.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c vec8.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+vec8.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c stat.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+stat.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c uprbnd2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+uprbnd2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c uprbnd1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+uprbnd1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c unique2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+unique2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c unique1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+unique1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c uniqcpy2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+uniqcpy2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c uniqcpy1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+uniqcpy1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c unegate2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+unegate2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c unegate1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+unegate1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c ucompos2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+ucompos2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c ucompos1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+ucompos1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c trnsfrm2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+trnsfrm2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c trnsfrm1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+trnsfrm1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c times.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+times.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c swprnge1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+swprnge1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c swap1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+swap1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c stl_test.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+stl_test.cpp:
+Error ..\..\stlport\stl/_deque.h 132: Not an allowed type in template _STL::_Buf_size_traits<_Tp,_BufSize>
+Error ..\..\stlport\stl/_deque.h 132: Too many error or warning messages in template _STL::_Buf_size_traits<_Tp,_BufSize>
+*** 2 errors in Compile ***
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c stblsrt2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+stblsrt2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c stblsrt1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+stblsrt1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c stblptn1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+stblptn1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c stblptn0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+stblptn0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c vec1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+vec1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c rotcopy0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+rotcopy0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c stack1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+stack1.cpp:
+Error ..\..\stlport\stl/_deque.h 132: Not an allowed type in template _STL::_Buf_size_traits<_Tp,_BufSize>
+Error ..\..\stlport\stl/_deque.h 132: Too many error or warning messages in template _STL::_Buf_size_traits<_Tp,_BufSize>
+*** 2 errors in Compile ***
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c sort2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+sort2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c sort1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+sort1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c setunon2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+setunon2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c setunon1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+setunon1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c setunon0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+setunon0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c setsymd2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+setsymd2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c setsymd1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+setsymd1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c setsymd0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+setsymd0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c setintr2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+setintr2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c setintr1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+setintr1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c setintr0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+setintr0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c setdiff2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+setdiff2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c setdiff1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+setdiff1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c setdiff0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+setdiff0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c set2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+set2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c set1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+set1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c search2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+search2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c search1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+search1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c search0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+search0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c rotcopy1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+rotcopy1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c stack2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+stack2.cpp:
+Error ..\..\stlport\stl/_deque.h 132: Not an allowed type in template _STL::_Buf_size_traits<_Tp,_BufSize>
+Error ..\..\stlport\stl/_deque.h 132: Too many error or warning messages in template _STL::_Buf_size_traits<_Tp,_BufSize>
+*** 2 errors in Compile ***
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c ptrunf1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+ptrunf1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c rotate0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+rotate0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c rndshuf2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+rndshuf2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c rndshuf1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+rndshuf1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c rndshuf0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+rndshuf0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c reviter2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+reviter2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c reviter1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+reviter1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c reverse1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+reverse1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c revcopy1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+revcopy1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c revbit2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+revbit2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c revbit1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+revbit1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c replif1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+replif1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c replcpy1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+replcpy1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c replace1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+replace1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c replace0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+replace0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c repcpif1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+repcpif1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c remove1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+remove1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c remif1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+remif1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c remcpif1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+remcpif1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c remcopy1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+remcopy1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c rawiter.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+rawiter.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c queue1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+queue1.cpp:
+Error ..\..\stlport\stl/_deque.h 132: Not an allowed type in template _STL::_Buf_size_traits<_Tp,_BufSize>
+Error ..\..\stlport\stl/_deque.h 132: Too many error or warning messages in template _STL::_Buf_size_traits<_Tp,_BufSize>
+*** 2 errors in Compile ***
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c ptrunf2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+ptrunf2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c rotate1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+rotate1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c pair0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+pair0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c ptrbinf1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+ptrbinf1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c ptition1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+ptition1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c ptition0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+ptition0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c prevprm2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+prevprm2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c prevprm1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+prevprm1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c prevprm0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+prevprm0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c pqueue1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+pqueue1.cpp:
+Error ..\..\stlport\stl/_deque.h 132: Not an allowed type in template _STL::_Buf_size_traits<_Tp,_BufSize>
+Error ..\..\stlport\stl/_deque.h 132: Too many error or warning messages in template _STL::_Buf_size_traits<_Tp,_BufSize>
+*** 2 errors in Compile ***
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c plus.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+plus.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c pheap2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+pheap2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c pheap1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+pheap1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c partsum2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+partsum2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c partsum1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+partsum1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c partsum0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+partsum0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c partsrt0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+partsrt0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c parsrtc2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+parsrtc2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c parsrtc1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+parsrtc1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c parsrtc0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+parsrtc0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c parsrt2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+parsrt2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c parsrt1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+parsrt1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c parsrt0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+parsrt0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c pair2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+pair2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c pair1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+pair1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c ptrbinf2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+ptrbinf2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c minelem1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+minelem1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c nthelem2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+nthelem2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c nthelem1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+nthelem1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c nthelem0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+nthelem0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c nextprm2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+nextprm2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c nextprm1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+nextprm1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c nextprm0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+nextprm0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c nequal.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+nequal.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c negate.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+negate.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c mset5.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+mset5.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c mset4.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+mset4.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c mset3.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+mset3.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c mset1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+mset1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c modulus.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+modulus.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c mmap2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+mmap2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c mmap1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+mmap1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c mkheap1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+mkheap1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c mkheap0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+mkheap0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c mismtch2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+mismtch2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c mismtch1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+mismtch1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c mismtch0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+mismtch0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c minus.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+minus.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c minelem2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+minelem2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c ostmit.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+ostmit.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c iterswp1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+iterswp1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c min1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+min1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c merge2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+merge2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c merge1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+merge1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c merge0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+merge0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c maxelem2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+maxelem2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c maxelem1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+maxelem1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c max2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+max2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c max1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+max1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c map1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+map1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c lwrbnd2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+lwrbnd2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c lwrbnd1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+lwrbnd1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c logicor.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+logicor.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c logicnot.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+logicnot.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c logicand.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+logicand.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c list4.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+list4.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c list3.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+list3.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c list2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+list2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c list1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+list1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c lexcmp2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+lexcmp2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c lexcmp1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+lexcmp1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c lesseq.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+lesseq.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c less.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+less.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c min2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+min2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c greater.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+greater.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c iter4.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+iter4.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c iter3.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+iter3.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c iter2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+iter2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c iter1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+iter1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c istmit1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+istmit1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c iota1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+iota1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c insert2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+insert2.cpp:
+Error ..\..\stlport\stl/_deque.h 132: Not an allowed type in template _STL::_Buf_size_traits<_Tp,_BufSize>
+Error ..\..\stlport\stl/_deque.h 132: Too many error or warning messages in template _STL::_Buf_size_traits<_Tp,_BufSize>
+*** 2 errors in Compile ***
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c insert1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+insert1.cpp:
+Error ..\..\stlport\stl/_deque.h 132: Not an allowed type in template _STL::_Buf_size_traits<_Tp,_BufSize>
+Error ..\..\stlport\stl/_deque.h 132: Too many error or warning messages in template _STL::_Buf_size_traits<_Tp,_BufSize>
+*** 2 errors in Compile ***
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c inrprod2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+inrprod2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c inrprod1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+inrprod1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c inrprod0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+inrprod0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c inplmrg2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+inplmrg2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c inplmrg1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+inplmrg1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c incl2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+incl2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c incl1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+incl1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c incl0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+incl0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c iterswp0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+iterswp0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c eqlrnge2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+eqlrnge2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c genern2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+genern2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c genern1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+genern1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c gener2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+gener2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c gener1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+gener1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c func3.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+func3.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c func2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+func2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c func1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+func1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c foreach1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+foreach1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c foreach0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+foreach0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c finsert2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+finsert2.cpp:
+Error ..\..\stlport\stl/_deque.h 132: Not an allowed type in template _STL::_Buf_size_traits<_Tp,_BufSize>
+Error ..\..\stlport\stl/_deque.h 132: Too many error or warning messages in template _STL::_Buf_size_traits<_Tp,_BufSize>
+*** 2 errors in Compile ***
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c finsert1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+finsert1.cpp:
+Error ..\..\stlport\stl/_deque.h 132: Not an allowed type in template _STL::_Buf_size_traits<_Tp,_BufSize>
+Error ..\..\stlport\stl/_deque.h 132: Too many error or warning messages in template _STL::_Buf_size_traits<_Tp,_BufSize>
+*** 2 errors in Compile ***
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c findif1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+findif1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c findif0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+findif0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c find1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+find1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c find0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+find0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c filln1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+filln1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c fill1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+fill1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c equalto.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+equalto.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c equal2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+equal2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c equal1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+equal1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c equal0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+equal0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c greateq.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+greateq.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c binsrch1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+binsrch1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c eqlrnge0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+eqlrnge0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c divides.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+divides.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c deque1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+deque1.cpp:
+Error ..\..\stlport\stl/_deque.h 132: Not an allowed type in template _STL::_Buf_size_traits<_Tp,_BufSize>
+Error ..\..\stlport\stl/_deque.h 132: Too many error or warning messages in template _STL::_Buf_size_traits<_Tp,_BufSize>
+*** 2 errors in Compile ***
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c countif1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+countif1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c count1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+count1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c count0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+count0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c copyb0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+copyb0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c copyb.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+copyb.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c copy4.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+copy4.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c copy3.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+copy3.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c copy2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+copy2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c copy1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+copy1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c bvec1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+bvec1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c bnegate2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+bnegate2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c bnegate1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+bnegate1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c binsrch2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+binsrch2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c eqlrnge1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+eqlrnge1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c accum1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+accum1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c binsert1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+binsert1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c bind2nd2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+bind2nd2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c bind2nd1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+bind2nd1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c bind1st1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+bind1st1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c bind1st2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+bind1st2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c bcompos2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+bcompos2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c bcompos1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+bcompos1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c alg5.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+alg5.cpp:
+Error ..\..\stlport\stl/_deque.h 132: Not an allowed type in template _STL::_Buf_size_traits<_Tp,_BufSize>
+Error ..\..\stlport\stl/_deque.h 132: Too many error or warning messages in template _STL::_Buf_size_traits<_Tp,_BufSize>
+*** 2 errors in Compile ***
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c alg4.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+alg4.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c alg3.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+alg3.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c alg2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+alg2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c alg1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+alg1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c advance.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+advance.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c adjfind2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+adjfind2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c adjfind1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+adjfind1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c adjfind0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+adjfind0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c adjdiff2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+adjdiff2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c adjdiff1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+adjdiff1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c adjdiff0.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+adjdiff0.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c accum2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+accum2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c binsert2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+binsert2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c hmap1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+hmap1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c hmmap1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+hmmap1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c hset2.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+hset2.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib -n -c hmset1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+hmset1.cpp:
+	c:\lang\Borland\Bc502\bin\..\BIN\bcc32 -estl_test.exe -w- -j1 -I.;..\..\stlport\BC50;..\..\stlport;c:\lang\Borland\Bc502\bin\..\include; -Od -v -N -x -xp -tWC -D_RTLDLL;NO_STRICT;USEPACKAGES;_DEBUG; -L..\..\lib vec2.obj  vec7.obj  vec6.obj  vec5.obj  vec4.obj  vec3.obj  vec8.obj  stat.obj  uprbnd2.obj  uprbnd1.obj  unique2.obj  unique1.obj  uniqcpy2.obj  uniqcpy1.obj  unegate2.obj  unegate1.obj  ucompos2.obj  ucompos1.obj  trnsfrm2.obj  trnsfrm1.obj  times.obj  swprnge1.obj  swap1.obj  stl_test.obj  stblsrt2.obj  stblsrt1.obj  stblptn1.obj  stblptn0.obj  vec1.obj  rotcopy0.obj  stack1.obj  sort2.obj  sort1.obj  setunon2.obj  setunon1.obj  setunon0.obj  setsymd2.obj  setsymd1.obj  setsymd0.obj  setintr2.obj  setintr1.obj  setintr0.obj  setdiff2.obj  setdiff1.obj  setdiff0.obj  set2.obj  set1.obj  search2.obj  search1.obj  search0.obj  rotcopy1.obj  stack2.obj  ptrunf1.obj  rotate0.obj  rndshuf2.obj  rndshuf1.obj  rndshuf0.obj  reviter2.obj  reviter1.obj  reverse1.obj  revcopy1.obj  revbit2.obj  revbit1.obj  replif1.obj  replcpy1.obj  replace1.obj  replace0.obj  repcpif1.obj  remove1.obj  remif1.obj  remcpif1.obj  remcopy1.obj  rawiter.obj  queue1.obj  ptrunf2.obj  rotate1.obj  pair0.obj  ptrbinf1.obj  ptition1.obj  ptition0.obj  prevprm2.obj  prevprm1.obj  prevprm0.obj  pqueue1.obj  plus.obj  pheap2.obj  pheap1.obj  partsum2.obj  partsum1.obj  partsum0.obj  partsrt0.obj  parsrtc2.obj  parsrtc1.obj  parsrtc0.obj  parsrt2.obj  parsrt1.obj  parsrt0.obj  pair2.obj  pair1.obj  ptrbinf2.obj  minelem1.obj  nthelem2.obj  nthelem1.obj  nthelem0.obj  nextprm2.obj  nextprm1.obj  nextprm0.obj  nequal.obj  negate.obj  mset5.obj  mset4.obj  mset3.obj  mset1.obj  modulus.obj  mmap2.obj  mmap1.obj  mkheap1.obj  mkheap0.obj  mismtch2.obj  mismtch1.obj  mismtch0.obj  minus.obj  minelem2.obj  ostmit.obj  iterswp1.obj  min1.obj  merge2.obj  merge1.obj  merge0.obj  maxelem2.obj  maxelem1.obj  max2.obj  max1.obj  map1.obj  lwrbnd2.obj  lwrbnd1.obj  logicor.obj  logicnot.obj  logicand.obj  list4.obj  list3.obj  list2.obj  list1.obj  lexcmp2.obj  lexcmp1.obj  lesseq.obj  less.obj  min2.obj  greater.obj  iter4.obj  iter3.obj  iter2.obj  iter1.obj  istmit1.obj  iota1.obj  insert2.obj  insert1.obj  inrprod2.obj  inrprod1.obj  inrprod0.obj  inplmrg2.obj  inplmrg1.obj  incl2.obj  incl1.obj  incl0.obj  iterswp0.obj  eqlrnge2.obj  genern2.obj  genern1.obj  gener2.obj  gener1.obj  func3.obj  func2.obj  func1.obj  foreach1.obj  foreach0.obj  finsert2.obj  finsert1.obj  findif1.obj  findif0.obj  find1.obj  find0.obj  filln1.obj  fill1.obj  equalto.obj  equal2.obj  equal1.obj  equal0.obj  greateq.obj  binsrch1.obj  eqlrnge0.obj  divides.obj  deque1.obj  countif1.obj  count1.obj  count0.obj  copyb0.obj  copyb.obj  copy4.obj  copy3.obj  copy2.obj  copy1.obj  bvec1.obj  bnegate2.obj  bnegate1.obj  binsrch2.obj  eqlrnge1.obj  accum1.obj  binsert1.obj  bind2nd2.obj  bind2nd1.obj  bind1st1.obj  bind1st2.obj  bcompos2.obj  bcompos1.obj  alg5.obj  alg4.obj  alg3.obj  alg2.obj  alg1.obj  advance.obj  adjfind2.obj  adjfind1.obj  adjfind0.obj  adjdiff2.obj  adjdiff1.obj  adjdiff0.obj  accum2.obj  binsert2.obj  hmap1.obj hmmap1.obj hset2.obj hmset1.obj   slist1.cpp string1.cpp bitset1.cpp
+Borland C++ 5.2 for Win32 Copyright (c) 1993, 1997 Borland International
+Error: Could not find file 'stl_test.obj'
+Error: Could not find file 'stack1.obj'
+Error: Could not find file 'stack2.obj'
+Error: Could not find file 'queue1.obj'
+Error: Could not find file 'pqueue1.obj'
+Error: Could not find file 'insert2.obj'
+Error: Could not find file 'insert1.obj'
+Error: Could not find file 'finsert2.obj'
+Error: Could not find file 'finsert1.obj'
+Error: Could not find file 'deque1.obj'
+Error: Could not find file 'alg5.obj'
+slist1.cpp:
+string1.cpp:
+bitset1.cpp:
+Error ..\..\stlport\stl/_bitset.h 339: Not an allowed type in template _STL::__bitset<_Nb,_WordT>
+Error ..\..\stlport\stl/_bitset.h 339: Too many error or warning messages in template _STL::__bitset<_Nb,_WordT>
+*** 2 errors in Compile ***
diff --git a/main/source/stlport/test/regression/logicand.cpp b/main/source/stlport/test/regression/logicand.cpp
new file mode 100644
index 00000000..747bee5a
--- /dev/null
+++ b/main/source/stlport/test/regression/logicand.cpp
@@ -0,0 +1,26 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <functional>
+#include <iostream>
+#include <algorithm>
+
+#ifdef MAIN 
+#define logicand_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int logicand_test(int, char**)
+{
+  cout<<"Results of logicand_test:"<<endl;
+int input1 [4] = { 1, 1, 0, 1 };
+int input2 [4] = { 0, 1, 0, 0 };
+
+  int output [4];
+  transform((int*)input1, (int*)input1 + 4, (int*)input2, (int*)output, logical_and<bool>());
+  for(int i = 0; i < 4; i++)
+    cout << output[i] << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/logicnot.cpp b/main/source/stlport/test/regression/logicnot.cpp
new file mode 100644
index 00000000..15b9bdee
--- /dev/null
+++ b/main/source/stlport/test/regression/logicnot.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <functional>
+#include <algorithm>
+
+#ifdef MAIN 
+#define logicnot_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int logicnot_test(int, char**)
+{
+  cout<<"Results of logicnot_test:"<<endl;
+bool input [7] = { 1, 0, 0, 1, 1, 1, 1 };
+
+  int n = 0;
+  count_if(input, input + 7, logical_not<bool>(), n);
+  cout << "count = " << n << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/logicor.cpp b/main/source/stlport/test/regression/logicor.cpp
new file mode 100644
index 00000000..0024bbd4
--- /dev/null
+++ b/main/source/stlport/test/regression/logicor.cpp
@@ -0,0 +1,26 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <functional>
+
+#ifdef MAIN 
+#define logicor_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int logicor_test(int, char**)
+{
+  cout<<"Results of logicor_test:"<<endl;
+int input1 [4] = { 1, 1, 0, 1 };
+int input2 [4] = { 0, 1, 0, 0 };
+
+  int output [4];
+  transform((int*)input1, (int*)input1 + 4, (int*)input2, (int*)output, logical_or<bool>());
+  for(int i = 0; i < 4; i++)
+    cout << output[i] << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/lwrbnd1.cpp b/main/source/stlport/test/regression/lwrbnd1.cpp
new file mode 100644
index 00000000..619b6e08
--- /dev/null
+++ b/main/source/stlport/test/regression/lwrbnd1.cpp
@@ -0,0 +1,30 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <vector>
+#include <iostream>
+
+#ifdef MAIN 
+#define lwrbnd1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int lwrbnd1_test(int, char**)
+{
+  cout<<"Results of lwrbnd1_test:"<<endl;
+  std::vector <int> v1(20);
+  for(int i = 0; i < v1.size(); i++)
+  {
+    v1[i] = i/4;
+    cout << v1[i] << ' ';
+  }
+  std::vector <int>::iterator location =  lower_bound(v1.begin(), v1.end(), 3);
+  cout
+    << "\n3 can be inserted at index: "
+    <<(location - v1.begin())
+    << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/lwrbnd2.cpp b/main/source/stlport/test/regression/lwrbnd2.cpp
new file mode 100644
index 00000000..6e8e8e68
--- /dev/null
+++ b/main/source/stlport/test/regression/lwrbnd2.cpp
@@ -0,0 +1,34 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <cstring>
+
+#ifdef MAIN 
+#define lwrbnd2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+static bool char_str_less(const char* a_, const char* b_)
+{
+  return strcmp(a_, b_) < 0 ? 1 : 0;
+}
+
+int lwrbnd2_test(int, char**)
+{
+  cout<<"Results of lwrbnd2_test:"<<endl;
+
+char* str [] = { "a", "a", "b", "b", "q", "w", "z" };
+
+  const unsigned strCt = sizeof(str)/sizeof(str[0]);
+  // DEC C++ generates incorrect template instatiation code 
+  // for "d" so must cast 
+  cout
+    << "d can be inserted at index: "
+    <<(lower_bound((char**)str,  (char**)str + strCt, (const char *)"d", char_str_less) - str)
+    << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/map1.cpp b/main/source/stlport/test/regression/map1.cpp
new file mode 100644
index 00000000..59a56824
--- /dev/null
+++ b/main/source/stlport/test/regression/map1.cpp
@@ -0,0 +1,45 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <map>
+
+#ifdef MAIN 
+#define map1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+#include "map1.hpp"
+ostream& operator<<(ostream& s, Int x)
+  { return s << x.val; }
+
+int map1_test(int, char**)
+{
+  cout<<"Results of map1_test:"<<endl;
+  typedef map<char, Int, less<char> > maptype;
+  maptype m;
+  // Store mappings between roman numerals and decimals.
+  m['l'] = 50;
+  m['x'] = 20; // Deliberate mistake.
+  m['v'] = 5;
+  m['i'] = 1;
+  cout << "m['x'] = " << m['x'] << endl;
+  m['x'] = 10; // Correct mistake.
+  cout << "m['x'] = " << m['x'] << endl;
+  cout << "m['z'] = " << m['z'] << endl; // Note default value is added.
+  cout << "m.count('z') = " << m.count('z') << endl;
+  pair<maptype::iterator, bool> p =
+      m.insert(pair<const char, Int>('c', 100));
+  if(p.second)
+    cout << "First insertion successful" << endl;
+  p = m.insert(pair<const char, Int>('c', 100));
+  if(p.second)
+    cout << "Second insertion successful" << endl;
+  else
+    cout << "Existing pair " <<(*(p.first)).first
+         << " -> " <<(*(p.first)).second << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/map1.hpp b/main/source/stlport/test/regression/map1.hpp
new file mode 100644
index 00000000..f985e848
--- /dev/null
+++ b/main/source/stlport/test/regression/map1.hpp
@@ -0,0 +1,10 @@
+
+// class Int is defined here because the primitive 'int' does not have a 
+// default constructor. The default constructor is used when map['z']
+// accesses an uninitialized element.
+struct Int
+  {
+  Int(int x = 0) : val(x) {};
+  int val;
+  };
+
diff --git a/main/source/stlport/test/regression/max1.cpp b/main/source/stlport/test/regression/max1.cpp
new file mode 100644
index 00000000..4fed24f8
--- /dev/null
+++ b/main/source/stlport/test/regression/max1.cpp
@@ -0,0 +1,19 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define max1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int max1_test(int, char**)
+{
+  cout<<"Results of max1_test:"<<endl;
+  cout << max(42, 100) << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/max2.cpp b/main/source/stlport/test/regression/max2.cpp
new file mode 100644
index 00000000..2c8476f1
--- /dev/null
+++ b/main/source/stlport/test/regression/max2.cpp
@@ -0,0 +1,26 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <cstring>
+
+#ifdef MAIN 
+#define max2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+static bool str_compare(const char* a_, const char* b_)
+{
+  return strcmp(a_, b_) < 0 ? 1 : 0;
+}
+
+int max2_test(int, char**)
+{
+  cout<<"Results of max2_test:"<<endl;
+
+  cout << max((char *)"shoe",(char *)"shine", str_compare) << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/maxelem1.cpp b/main/source/stlport/test/regression/maxelem1.cpp
new file mode 100644
index 00000000..acd2e8ed
--- /dev/null
+++ b/main/source/stlport/test/regression/maxelem1.cpp
@@ -0,0 +1,21 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define maxelem1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int maxelem1_test(int, char**)
+{
+  cout<<"Results of maxelem1_test:"<<endl;
+int numbers[6] = { 4, 10, 56, 11, -42, 19 };
+
+  cout << *max_element((int*)numbers, (int*)numbers + 6) << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/maxelem2.cpp b/main/source/stlport/test/regression/maxelem2.cpp
new file mode 100644
index 00000000..87cfa3db
--- /dev/null
+++ b/main/source/stlport/test/regression/maxelem2.cpp
@@ -0,0 +1,30 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <cstring>
+
+#ifdef MAIN 
+#define maxelem2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+static bool str_compare(const char* a_, const char* b_)
+{
+  return strcmp(a_, b_) < 0 ? 1 : 0;
+}
+
+int maxelem2_test(int, char**)
+{
+  cout<<"Results of maxelem2_test:"<<endl;
+
+char* names[] = { "Brett", "Graham", "Jack", "Mike", "Todd" };
+
+  const unsigned namesCt = sizeof(names)/sizeof(names[0]);
+  cout << *max_element((char**)names, (char**)names + namesCt, str_compare) << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/memfunptr.cpp b/main/source/stlport/test/regression/memfunptr.cpp
new file mode 100644
index 00000000..7f4044cb
--- /dev/null
+++ b/main/source/stlport/test/regression/memfunptr.cpp
@@ -0,0 +1,171 @@
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// mem_ptr_fun_test.cpp
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Copyright(c) 2001 Meridian'93
+//  http://www.meridian93.com
+//  mailto:info@meridian93.com
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <functional>
+#include <memory>
+
+#ifdef MAIN
+#define mem_ptr_fun_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+#if defined(_STLP_DONT_RETURN_VOID) && (defined(_STLP_NO_MEMBER_TEMPLATE_CLASSES) && defined(_STLP_NO_CLASS_PARTIAL_SPECIALIZATION))
+#  define _STLP_DONT_TEST_RETURN_VOID
+#endif /*_STLP_DONT_RETURN_VOID*/
+//else there is no workaround for the return void bug
+
+struct S1 { } s1;
+struct S2 { } s2;
+
+int f1(S1&);
+int f2(S1&, S2&);
+int f1c(const S1&);
+int f2c(const S1&, const S2&);
+
+void vf1(S1&);
+void vf2(S1&, S2&);
+void vf1c(const S1&);
+void vf2c(const S1&, const S2&);
+
+class Class {
+public:
+  int f0();
+  int f1(const S1&);
+
+  void vf0();
+  void vf1(const S1&);
+
+  int f0c() const;
+  int f1c(const S1&) const;
+
+  void vf0c() const;
+  void vf1c(const S1&) const;
+};
+
+int mem_ptr_fun_test(int, char**)
+{
+  Class obj;
+  const Class& objc = obj;
+
+  // ptr_fun
+
+  ptr_fun(f1)(s1);
+  ptr_fun(f2)(s1, s2);
+
+  ptr_fun(f1c)(s1);
+  ptr_fun(f2c)(s1, s2);
+
+#ifndef _STLP_DONT_TEST_RETURN_VOID
+  ptr_fun(vf1)(s1);
+  ptr_fun(vf2)(s1, s2);
+
+  ptr_fun(vf1c)(s1);
+  ptr_fun(vf2c)(s1, s2);
+#endif /* _STLP_DONT_TEST_RETURN_VOID */
+
+  // mem_fun
+
+  mem_fun(&Class::f0)(&obj);
+  mem_fun(&Class::f1)(&obj, s1);
+
+#ifndef _STLP_DONT_TEST_RETURN_VOID
+  mem_fun(&Class::vf0)(&obj);
+  mem_fun(&Class::vf1)(&obj, s1);
+#endif /* _STLP_DONT_TEST_RETURN_VOID */
+
+  // mem_fun (const)
+
+  mem_fun(&Class::f0c)(&objc);
+  mem_fun(&Class::f1c)(&objc, s1);
+
+#ifndef _STLP_DONT_TEST_RETURN_VOID
+  mem_fun(&Class::vf0c)(&objc);
+  mem_fun(&Class::vf1c)(&objc, s1);
+#endif /* _STLP_DONT_TEST_RETURN_VOID */
+
+  // mem_fun_ref
+
+  mem_fun_ref(&Class::f0)(obj);
+  mem_fun_ref(&Class::f1)(obj, s1);
+
+#ifndef _STLP_DONT_TEST_RETURN_VOID
+  mem_fun_ref(&Class::vf0)(obj);
+  mem_fun_ref(&Class::vf1)(obj, s1);
+#endif /* _STLP_DONT_TEST_RETURN_VOID */
+
+  // mem_fun_ref (const)
+
+  mem_fun_ref(&Class::f0c)(objc);
+  mem_fun_ref(&Class::f1c)(objc, s1);
+
+#ifndef _STLP_DONT_TEST_RETURN_VOID
+  mem_fun_ref(&Class::vf0c)(objc);
+  mem_fun_ref(&Class::vf1c)(objc, s1);
+#endif /* _STLP_DONT_TEST_RETURN_VOID */
+
+  return 0;
+}
+
+int f1(S1&)
+{return 1;}
+
+int f2(S1&, S2&)
+{return 2;}
+
+int f1c(const S1&)
+{return 1;}
+
+int f2c(const S1&, const S2&)
+{return 2;}
+
+void vf1(S1&)
+{}
+
+void vf2(S1&, S2&)
+{}
+
+void vf1c(const S1&)
+{}
+
+void vf2c(const S1&, const S2&)
+{}
+
+int Class::f0()
+{return 0;}
+
+int Class::f1(const S1&)
+{return 1;}
+
+void Class::vf0()
+{}
+
+void Class::vf1(const S1&)
+{}
+
+int Class::f0c() const
+{return 0;}
+
+int Class::f1c(const S1&) const
+{return 1;}
+
+void Class::vf0c() const
+{}
+
+void Class::vf1c(const S1&) const
+{}
+
+
+#ifdef _STLP_DONT_TEST_RETURN_VOID
+#  undef _STLP_DONT_TEST_RETURN_VOID
+#endif
\ No newline at end of file
diff --git a/main/source/stlport/test/regression/merge0.cpp b/main/source/stlport/test/regression/merge0.cpp
new file mode 100644
index 00000000..b81a6b44
--- /dev/null
+++ b/main/source/stlport/test/regression/merge0.cpp
@@ -0,0 +1,26 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define merge0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int merge0_test(int, char**)
+{
+  cout<<"Results of merge0_test:"<<endl;
+int numbers1[5] = { 1, 6, 13, 25, 101 };
+int numbers2[5] = {-5, 26, 36, 46, 99 };
+
+  int result[10];
+  merge((int*)numbers1, (int*)numbers1 + 5, (int*)numbers2, (int*)numbers2 + 5, (int*)result);
+  for(int i = 0; i < 10; i++)
+    cout << result[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/merge1.cpp b/main/source/stlport/test/regression/merge1.cpp
new file mode 100644
index 00000000..8a91207c
--- /dev/null
+++ b/main/source/stlport/test/regression/merge1.cpp
@@ -0,0 +1,34 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <numeric>
+#include <iostream>
+#include <iterator>
+
+#ifdef MAIN 
+#define merge1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int merge1_test(int, char**)
+{
+  cout<<"Results of merge1_test:"<<endl;
+  vector <int> v1(5);
+  vector <int> v2(v1.size());
+  iota(v1.begin(), v1.end(), 0);
+  iota(v2.begin(), v2.end(), 3);
+  vector <int> result(v1.size() + v2.size());
+  merge(v1.begin(), v1.end(), v2.begin(), v2.end(), result.begin());
+  ostream_iterator <int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  copy(v2.begin(), v2.end(), iter);
+  cout << endl;
+  copy(result.begin(), result.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/merge2.cpp b/main/source/stlport/test/regression/merge2.cpp
new file mode 100644
index 00000000..e51b50f3
--- /dev/null
+++ b/main/source/stlport/test/regression/merge2.cpp
@@ -0,0 +1,40 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <functional>
+#include <iterator>
+#include <iostream>
+
+#ifdef MAIN 
+#define merge2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int merge2_test(int, char**)
+{
+  cout<<"Results of merge2_test:"<<endl;
+  vector <int> v1(5);
+  vector <int> v2(v1.size());
+  for(int i = 0; i < v1.size(); i++)
+  {
+    v1[i] = 10 - i;
+    v2[i] =  7 - i;
+  }
+  vector <int> result(v1.size() + v2.size());
+  merge(v1.begin(), v1.end(),
+         v2.begin(), v2.end(),
+         result.begin(),
+         greater<int>() );
+  ostream_iterator <int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  copy(v2.begin(), v2.end(), iter);
+  cout << endl;
+  copy(result.begin(), result.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/min1.cpp b/main/source/stlport/test/regression/min1.cpp
new file mode 100644
index 00000000..8834600b
--- /dev/null
+++ b/main/source/stlport/test/regression/min1.cpp
@@ -0,0 +1,19 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define min1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int min1_test(int, char**)
+{
+  cout<<"Results of min1_test:"<<endl;
+  cout << min(42, 100) << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/min2.cpp b/main/source/stlport/test/regression/min2.cpp
new file mode 100644
index 00000000..14da4854
--- /dev/null
+++ b/main/source/stlport/test/regression/min2.cpp
@@ -0,0 +1,27 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <cstring>
+
+#ifdef MAIN 
+#define min2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+static bool str_compare(const char* a_, const char* b_)
+{
+  return strcmp(a_, b_) < 0 ? 1 : 0;
+}
+
+int min2_test(int, char**)
+{
+  cout<<"Results of min2_test:"<<endl;
+
+  cout << min((char *)"shoe",(char *)"shine", str_compare) << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/minelem1.cpp b/main/source/stlport/test/regression/minelem1.cpp
new file mode 100644
index 00000000..4d216932
--- /dev/null
+++ b/main/source/stlport/test/regression/minelem1.cpp
@@ -0,0 +1,21 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define minelem1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int minelem1_test(int, char**)
+{
+  cout<<"Results of minelem1_test:"<<endl;
+int numbers[6] = { -10, 15, -100, 36, -242, 42 };
+
+  cout << *min_element((int*)numbers, (int*)numbers + 6) << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/minelem2.cpp b/main/source/stlport/test/regression/minelem2.cpp
new file mode 100644
index 00000000..5dd77494
--- /dev/null
+++ b/main/source/stlport/test/regression/minelem2.cpp
@@ -0,0 +1,30 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <cstring>
+
+#ifdef MAIN 
+#define minelem2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+static bool str_compare(const char* a_, const char* b_)
+{
+  return strcmp(a_, b_) < 0 ? 1 : 0;
+}
+
+int minelem2_test(int, char**)
+{
+  cout<<"Results of minelem2_test:"<<endl;
+
+char* names[] = { "Brett", "Graham", "Jack", "Mike", "Todd" };
+
+  const unsigned namesCt = sizeof(names)/sizeof(names[0]);
+  cout << *min_element((char**)names, (char**)names + namesCt, str_compare) << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/minus.cpp b/main/source/stlport/test/regression/minus.cpp
new file mode 100644
index 00000000..01569031
--- /dev/null
+++ b/main/source/stlport/test/regression/minus.cpp
@@ -0,0 +1,26 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <functional>
+
+#ifdef MAIN 
+#define minus_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int minus_test(int, char**)
+{
+  cout<<"Results of minus_test:"<<endl;
+int input1 [4] = { 1, 5, 7, 8 };
+int input2 [4] = { 1, 4, 8, 3 };
+
+  int output [4];
+  transform((int*)input1, (int*)input1 + 4, (int*)input2, (int*)output, minus<int>());
+  for(int i = 0; i < 4; i++)
+    cout << output[i] << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/mismtch0.cpp b/main/source/stlport/test/regression/mismtch0.cpp
new file mode 100644
index 00000000..db44a052
--- /dev/null
+++ b/main/source/stlport/test/regression/mismtch0.cpp
@@ -0,0 +1,32 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define mismtch0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int mismtch0_test(int, char**)
+{
+  cout<<"Results of mismtch0_test:"<<endl;
+int n1[5] = { 1, 2, 3, 4, 5 };
+int n2[5] = { 1, 2, 3, 4, 5 };
+int n3[5] = { 1, 2, 3, 2, 1 };
+
+  pair <int*, int*> result = mismatch((int*)n1, (int*)n1 + 5, (int*)n2);
+  if(result.first ==(n1 + 5) && result.second ==(n2 + 5))
+    cout << "n1 and n2 are the same" << endl;
+  else
+    cout << "Mismatch at offset: " <<(result.first - n1) << endl;
+  result = mismatch((int*)n1, (int*)n1 + 5, (int*)n3);
+  if(result.first ==(n1 + 5) && result.second ==(n3 + 5))
+    cout << "n1 and n3 are the same" << endl;
+  else
+    cout << "Mismatch at offset: " <<(result.first - n1) << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/mismtch1.cpp b/main/source/stlport/test/regression/mismtch1.cpp
new file mode 100644
index 00000000..f66c1d42
--- /dev/null
+++ b/main/source/stlport/test/regression/mismtch1.cpp
@@ -0,0 +1,37 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <numeric>
+#include <iostream>
+
+#ifdef MAIN 
+#define mismtch1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int mismtch1_test(int, char**)
+{
+  cout<<"Results of mismtch1_test:"<<endl;
+  typedef vector<int> IntVec;
+  IntVec v1(10);
+  IntVec v2(v1.size());
+  iota(v1.begin(), v1.end(), 0);
+  iota(v2.begin(), v2.end(), 0);
+  pair <IntVec::iterator, IntVec::iterator> result =
+      mismatch(v1.begin(), v1.end(), v2.begin());
+  if(result.first == v1.end() && result.second == v2.end())
+    cout << "v1 and v2 are the same" << endl;
+  else
+    cout << "mismatch at index: " <<(result.first - v1.begin()) << endl;
+  v2[v2.size()/2] = 42;
+  result = mismatch(v1.begin(), v1.end(), v2.begin());
+  if(result.first == v1.end() && result.second == v2.end())
+    cout << "v1 and v2 are the same" << endl;
+  else
+    cout << "mismatch at index: " <<(result.first - v1.begin()) << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/mismtch2.cpp b/main/source/stlport/test/regression/mismtch2.cpp
new file mode 100644
index 00000000..348e78ff
--- /dev/null
+++ b/main/source/stlport/test/regression/mismtch2.cpp
@@ -0,0 +1,42 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <cstring>
+
+#ifdef MAIN 
+#define mismtch2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+bool str_equal(const char* a_, const char* b_)
+{
+  return strcmp(a_, b_) == 0 ? 1 : 0;
+}
+
+int mismtch2_test(int, char**)
+{
+  cout<<"Results of mismtch2_test:"<<endl;
+
+const unsigned size = 5;
+char* n1[size] = { "Brett", "Graham", "Jack", "Mike", "Todd" };
+
+  char* n2[size];
+  copy(n1, n1 + 5, (char**)n2);
+  pair <char**, char**> result = mismatch((char**)n1, (char**)n1 + size, (char**)n2, str_equal);
+  if(result.first == n1 + size && result.second == n2 + size)
+    cout << "n1 and n2 are the same" << endl;
+  else
+    cout << "mismatch at index: " <<(result.first - n1) << endl;
+  n2[2] = "QED";
+  result = mismatch((char**)n1, (char**)n1 + size, (char**)n2, str_equal);
+  if(result.first == n2 + size && result.second == n2 + size)
+    cout << "n1 and n2 are the same" << endl;
+  else
+    cout << "mismatch at index: " <<(result.first - n1) << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/mkheap0.cpp b/main/source/stlport/test/regression/mkheap0.cpp
new file mode 100644
index 00000000..b7f947a5
--- /dev/null
+++ b/main/source/stlport/test/regression/mkheap0.cpp
@@ -0,0 +1,26 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define mkheap0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int mkheap0_test(int, char**)
+{
+  cout<<"Results of mkheap0_test:"<<endl;
+int numbers[6] = { 5, 10, 4, 13, 11, 19 };
+
+  make_heap(numbers, numbers + 6);
+  for(int i = 6; i >= 1; i--)
+  {
+    cout << numbers[0] << endl;
+    pop_heap(numbers, numbers + i);
+  }
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/mkheap1.cpp b/main/source/stlport/test/regression/mkheap1.cpp
new file mode 100644
index 00000000..4b2c2709
--- /dev/null
+++ b/main/source/stlport/test/regression/mkheap1.cpp
@@ -0,0 +1,27 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <functional>
+
+#ifdef MAIN 
+#define mkheap1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int mkheap1_test(int, char**)
+{
+  cout<<"Results of mkheap1_test:"<<endl;
+int numbers[6] = { 5, 10, 4, 13, 11, 19 };
+
+  make_heap(numbers, numbers + 6, greater<int>());
+  for(int i = 6; i >= 1; i--)
+  {
+    cout << numbers[0] << endl;
+    pop_heap(numbers, numbers + i, greater<int>());
+  }
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/mmap1.cpp b/main/source/stlport/test/regression/mmap1.cpp
new file mode 100644
index 00000000..3e029e03
--- /dev/null
+++ b/main/source/stlport/test/regression/mmap1.cpp
@@ -0,0 +1,36 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <map>
+#include <iostream>
+
+#ifdef MAIN 
+#define mmap1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int mmap1_test(int, char**)
+{
+  cout<<"Results of mmap1_test:"<<endl;
+  typedef multimap<char, int, less<char> > mmap;
+  mmap m;
+  cout << "count('X') = " << m.count('X') << endl;
+  m.insert(pair<const char, int>('X', 10)); // Standard way.
+  cout << "count('X') = " << m.count('X') << endl;
+//  m.insert('X', 20); // Non-standard, but very convenient!
+  m.insert(pair<const char, int>('X', 20));	// jbuck: standard way
+  cout << "count('X') = " << m.count('X') << endl;
+//  m.insert('Y', 32);
+  m.insert(pair<const char, int>('Y', 32));	// jbuck: standard way
+  mmap::iterator i = m.find('X'); // Find first match.
+  while(i != m.end()) // Loop until end is reached.
+  {
+    cout <<(*i).first << " -> " <<(*i).second << endl;
+    i++;
+  }
+  int count = m.erase('X');
+  cout << "Erased " << count << " items" << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/mmap2.cpp b/main/source/stlport/test/regression/mmap2.cpp
new file mode 100644
index 00000000..87f05369
--- /dev/null
+++ b/main/source/stlport/test/regression/mmap2.cpp
@@ -0,0 +1,51 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#include <iostream>
+#include <map>
+
+#ifdef MAIN 
+#define mmap2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+int mmap2_test(int, char**)
+{
+  cout<<"Results of mmap2_test:"<<endl;
+static int hook=0;
+int bb=0;
+
+
+typedef pair<const int, char> pair_type;
+
+pair_type p1(3, 'c');
+pair_type p2(6, 'f');
+pair_type p3(1, 'a');
+pair_type p4(2, 'b');
+pair_type p5(3, 'x');
+pair_type p6(6, 'f');
+
+  typedef multimap<int, char, less<int> > mmap;
+
+pair_type array [] =
+  {
+    p1,
+    p2,
+    p3,
+    p4,
+    p5,
+    p6
+  };
+
+  mmap m(array+0, array + 6);
+  mmap::iterator i;
+  i = m.lower_bound(3);
+  cout << "lower bound:" << endl;
+  cout <<(*i).first << " -> " <<(*i).second << endl;
+  i = m.upper_bound(3);
+  cout << "upper bound:" << endl;
+  cout <<(*i).first << " -> " <<(*i).second << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/modulus.cpp b/main/source/stlport/test/regression/modulus.cpp
new file mode 100644
index 00000000..f029f402
--- /dev/null
+++ b/main/source/stlport/test/regression/modulus.cpp
@@ -0,0 +1,26 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <functional>
+
+#ifdef MAIN 
+#define modulus_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int modulus_test(int, char**)
+{
+  cout<<"Results of modulus_test:"<<endl;
+int input1 [4] = { 6, 8, 10, 2 };
+int input2 [4] = { 4, 2, 11, 3 };
+
+  int output [4];
+  transform((int*)input1, (int*)input1 + 4, (int*)input2, (int*)output, modulus<int>());
+  for(int i = 0; i < 4; i++)
+    cout << output[i] << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/mset1.cpp b/main/source/stlport/test/regression/mset1.cpp
new file mode 100644
index 00000000..f493766b
--- /dev/null
+++ b/main/source/stlport/test/regression/mset1.cpp
@@ -0,0 +1,40 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <set>
+#include <functional>
+
+#ifdef MAIN 
+#define mset1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+typedef multiset<int, less<int> > mset;
+
+int mset1_test(int, char**)
+{
+  cout<<"Results of mset1_test:"<<endl;
+  mset s;
+  cout << "count(42) = " << s.count(42) << endl;
+  s.insert(42);
+  cout << "count(42) = " << s.count(42) << endl;
+  s.insert(42);
+  cout << "count(42) = " << s.count(42) << endl;
+  mset::iterator i = s.find(40);
+  if(i == s.end())
+    cout << "40 Not found" << endl;
+  else
+    cout << "Found " << *i << endl;
+  i = s.find(42);
+  if(i == s.end())
+    cout << "Not found" << endl;
+  else
+    cout << "Found " << *i << endl;
+  int count = s.erase(42);
+  cout << "Erased " << count << " instances" << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/mset3.cpp b/main/source/stlport/test/regression/mset3.cpp
new file mode 100644
index 00000000..50d6910b
--- /dev/null
+++ b/main/source/stlport/test/regression/mset3.cpp
@@ -0,0 +1,26 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <set>
+
+#ifdef MAIN 
+#define mset3_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int mset3_test(int, char**)
+{
+  cout<<"Results of mset3_test:"<<endl;
+int array [] = { 3, 6, 1, 2, 3, 2, 6, 7, 9 };
+
+  multiset<int, less<int> > s(array, array + 9);
+  std::multiset<int, less<int> >::iterator i;
+  i = s.lower_bound(3);
+  cout << "lower bound = " << *i << endl;
+  i = s.upper_bound(3);
+  cout << "upper bound = " << *i << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/mset4.cpp b/main/source/stlport/test/regression/mset4.cpp
new file mode 100644
index 00000000..806a625b
--- /dev/null
+++ b/main/source/stlport/test/regression/mset4.cpp
@@ -0,0 +1,25 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <set>
+
+#ifdef MAIN 
+#define mset4_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int mset4_test(int, char**)
+{
+  cout<<"Results of mset4_test:"<<endl;
+int array [] = { 3, 6, 1, 2, 3, 2, 6, 7, 9 };
+
+  typedef multiset<int, less<int> > mset;
+  mset s(array, array + 9);
+  pair<mset::const_iterator, mset::const_iterator> p = s.equal_range(3);
+  cout << "lower bound = " << *(p.first) << endl;
+  cout << "upper bound = " << *(p.second) << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/mset5.cpp b/main/source/stlport/test/regression/mset5.cpp
new file mode 100644
index 00000000..107f2cf2
--- /dev/null
+++ b/main/source/stlport/test/regression/mset5.cpp
@@ -0,0 +1,53 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+
+#include <iostream>
+#include <set>
+// #include <algorithm>
+#include <functional>
+
+
+#ifdef MAIN 
+#define mset5_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+static bool less_than(int a_, int b_)
+{
+  return a_ < b_;
+}
+ 
+static bool greater_than(int a_, int b_)
+{
+  return a_ > b_;
+}
+
+int mset5_test(int, char**)
+{
+  cout<<"Results of mset5_test:"<<endl;
+  int array [] = { 3, 6, 1, 9 };
+  
+  typedef pointer_to_binary_function<int, int, bool> fn_type;
+  typedef __multiset__<int, fn_type, allocator<int> > mset;
+  fn_type f(less_than);
+
+  mset s1(array+0, array + 4 , f );
+  mset::const_iterator i = s1.begin();
+
+  cout << "Using less_than: " << endl;
+  while(i != s1.end())
+    cout << *i++ << endl;
+  fn_type g(greater_than);
+  mset s2(array, array + 4, g);
+  i = s2.begin();
+  cout << "Using greater_than: " << endl;
+  while(i != s2.end())
+    cout << *i++ << endl;
+
+  return 0;
+}
+
diff --git a/main/source/stlport/test/regression/negate.cpp b/main/source/stlport/test/regression/negate.cpp
new file mode 100644
index 00000000..6f439d6c
--- /dev/null
+++ b/main/source/stlport/test/regression/negate.cpp
@@ -0,0 +1,25 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <functional>
+
+#ifdef MAIN 
+#define negate_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int negate_test(int, char**)
+{
+  cout<<"Results of negate_test:"<<endl;
+int input [3] = { 1, 2, 3 };
+
+  int output[3];
+  transform((int*)input, (int*)input + 3, (int*)output, negate<int>());
+  for(int i = 0; i < 3; i++)
+    cout << output[i] << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/nequal.cpp b/main/source/stlport/test/regression/nequal.cpp
new file mode 100644
index 00000000..f69312de
--- /dev/null
+++ b/main/source/stlport/test/regression/nequal.cpp
@@ -0,0 +1,26 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <functional>
+
+#ifdef MAIN 
+#define nequal_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int nequal_test(int, char**)
+{
+  cout<<"Results of nequal_test:"<<endl;
+int input1 [4] = { 1, 7, 2, 2 };
+int input2 [4] = { 1, 6, 2, 3 };
+
+  int output [4];
+  transform((int*)input1, (int*)input1 + 4, (int*)input2, (int*)output, not_equal_to<int>());
+  for(int i = 0; i < 4; i++)
+    cout << output[i] << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/nextprm0.cpp b/main/source/stlport/test/regression/nextprm0.cpp
new file mode 100644
index 00000000..22a37bd1
--- /dev/null
+++ b/main/source/stlport/test/regression/nextprm0.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+
+#ifdef MAIN 
+#define nextprm0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int nextprm0_test(int, char**)
+{
+  cout<<"Results of nextprm0_test:"<<endl;
+int v1[3] = { 0, 1, 2 };
+
+  next_permutation(v1, v1 + 3);
+  for(int i = 0; i < 3; i++)
+    cout << v1[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/nextprm1.cpp b/main/source/stlport/test/regression/nextprm1.cpp
new file mode 100644
index 00000000..530f77c7
--- /dev/null
+++ b/main/source/stlport/test/regression/nextprm1.cpp
@@ -0,0 +1,32 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <numeric>
+#include <iterator>
+#include <iostream>
+
+#ifdef MAIN 
+#define nextprm1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int nextprm1_test(int, char**)
+{
+  cout<<"Results of nextprm1_test:"<<endl;
+  vector <int> v1(3);
+  iota(v1.begin(), v1.end(), 0);
+  ostream_iterator<int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  for(int i = 0; i < 9; i++)
+  {
+    next_permutation(v1.begin(), v1.end());
+    copy(v1.begin(), v1.end(), iter);
+    cout << endl;
+  }
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/nextprm2.cpp b/main/source/stlport/test/regression/nextprm2.cpp
new file mode 100644
index 00000000..ab955814
--- /dev/null
+++ b/main/source/stlport/test/regression/nextprm2.cpp
@@ -0,0 +1,33 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#include <iterator>
+
+#include <vector>
+#include <algorithm>
+#include <numeric>
+#include <iterator>
+#include <iostream>
+
+#ifdef MAIN 
+#define nextprm2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int nextprm2_test(int, char**)
+{
+  cout<<"Results of nextprm2_test:"<<endl;
+  vector <char> v1(3);
+  iota(v1.begin(), v1.end(), 'A');
+  ostream_iterator<char> iter(cout);
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  for(int i = 0; i < 9; i++)
+  {
+    next_permutation(v1.begin(), v1.end(), less<char>());
+    copy(v1.begin(), v1.end(), iter);
+    cout << endl;
+  }
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/nthelem0.cpp b/main/source/stlport/test/regression/nthelem0.cpp
new file mode 100644
index 00000000..95ea2ea4
--- /dev/null
+++ b/main/source/stlport/test/regression/nthelem0.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define nthelem0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int nthelem0_test(int, char**)
+{
+  cout<<"Results of nthelem0_test:"<<endl;
+int numbers[7] = { 5, 2, 4, 1, 0, 3 ,77};
+
+  nth_element(numbers, numbers + 3, numbers + 6);
+  for(int i = 0; i < 6; i++)
+    cout << numbers[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/nthelem1.cpp b/main/source/stlport/test/regression/nthelem1.cpp
new file mode 100644
index 00000000..312dd083
--- /dev/null
+++ b/main/source/stlport/test/regression/nthelem1.cpp
@@ -0,0 +1,32 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <cstdlib>
+#include <iterator>
+#include <iostream>
+
+#ifdef MAIN 
+#define nthelem1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int nthelem1_test(int, char**)
+{
+  cout<<"Results of nthelem1_test:"<<endl;
+  vector <int> v1(10);
+  for(int i = 0; i < v1.size(); i++)
+    v1[i] = rand() % 10;
+  ostream_iterator<int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  nth_element(v1.begin(),
+               v1.begin() + v1.size() / 2,
+               v1.end());
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/nthelem2.cpp b/main/source/stlport/test/regression/nthelem2.cpp
new file mode 100644
index 00000000..d31e71f2
--- /dev/null
+++ b/main/source/stlport/test/regression/nthelem2.cpp
@@ -0,0 +1,34 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <functional>
+#include <algorithm>
+#include <cstdlib>
+#include <iostream>
+#include <iterator>
+
+#ifdef MAIN 
+#define nthelem2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int nthelem2_test(int, char**)
+{
+  cout<<"Results of nthelem2_test:"<<endl;
+  vector <int> v1(10);
+  for(int i = 0; i < v1.size(); i++)
+    v1[i] = rand() % 10;
+  ostream_iterator<int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  nth_element(v1.begin(),
+               v1.begin() + v1.size() / 2,
+               v1.end(),
+               greater<int>());
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/ostmit.cpp b/main/source/stlport/test/regression/ostmit.cpp
new file mode 100644
index 00000000..5876a474
--- /dev/null
+++ b/main/source/stlport/test/regression/ostmit.cpp
@@ -0,0 +1,28 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <iterator>
+
+#ifdef MAIN 
+#define ostmit_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int ostmit_test(int, char**)
+{
+  cout<<"Results of ostmit_test:"<<endl;
+int array [] = { 1, 5, 2, 4 };
+
+  char* string = "hello";
+  ostream_iterator<char> it1(cout);
+  copy(string, string + 5, it1);
+  cout << endl;
+  ostream_iterator<int> it2(cout);
+  copy(array, array + 4, it2);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/pair0.cpp b/main/source/stlport/test/regression/pair0.cpp
new file mode 100644
index 00000000..30359b24
--- /dev/null
+++ b/main/source/stlport/test/regression/pair0.cpp
@@ -0,0 +1,20 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <utility>
+#include <iostream>
+
+#ifdef MAIN 
+#define pair0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int pair0_test(int, char**)
+{
+  cout<<"Results of pair0_test:"<<endl;
+  pair<int, int> p = make_pair(1, 10);
+  cout << "p.first = " << p.first << ", p.second = " << p.second << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/pair1.cpp b/main/source/stlport/test/regression/pair1.cpp
new file mode 100644
index 00000000..caf417b3
--- /dev/null
+++ b/main/source/stlport/test/regression/pair1.cpp
@@ -0,0 +1,20 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <utility>
+#include <iostream>
+
+#ifdef MAIN 
+#define pair1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int pair1_test(int, char**)
+{
+  cout<<"Results of pair1_test:"<<endl;
+  pair<int, int> p = make_pair(1, 10);
+  cout << "p.first = " << p.first << ", p.second = " << p.second << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/pair2.cpp b/main/source/stlport/test/regression/pair2.cpp
new file mode 100644
index 00000000..ee00c960
--- /dev/null
+++ b/main/source/stlport/test/regression/pair2.cpp
@@ -0,0 +1,21 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <utility>
+#include <iostream>
+
+#ifdef MAIN 
+#define pair2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int pair2_test(int, char**)
+{
+  cout<<"Results of pair2_test:"<<endl;
+  pair<int, int> p = make_pair(1, 10);
+  cout << "p.first = " << p.first << endl;
+  cout << "p.second = " << p.second << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/parsrt0.cpp b/main/source/stlport/test/regression/parsrt0.cpp
new file mode 100644
index 00000000..372ff8cd
--- /dev/null
+++ b/main/source/stlport/test/regression/parsrt0.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define parsrt0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int parsrt0_test(int, char**)
+{
+  cout<<"Results of parsrt0_test:"<<endl;
+int numbers[6] = { 5, 2, 4, 3, 1, 6 };
+
+  partial_sort((int*)numbers, (int*)numbers + 3, (int*)numbers + 6);
+  for(int i = 0; i < 6; i++)
+    cout << numbers[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/parsrt1.cpp b/main/source/stlport/test/regression/parsrt1.cpp
new file mode 100644
index 00000000..8927f20a
--- /dev/null
+++ b/main/source/stlport/test/regression/parsrt1.cpp
@@ -0,0 +1,32 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <cstdlib>
+#include <iostream>
+#include <iterator>
+
+#ifdef MAIN 
+#define parsrt1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int parsrt1_test(int, char**)
+{
+  cout<<"Results of parsrt1_test:"<<endl;
+  vector <int> v1(10);
+  for(int i = 0; i < v1.size(); i++)
+    v1[i] = rand() % 10;
+  ostream_iterator<int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  partial_sort(v1.begin(),
+                v1.begin() + v1.size() / 2,
+                v1.end());
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/parsrt2.cpp b/main/source/stlport/test/regression/parsrt2.cpp
new file mode 100644
index 00000000..8d1de519
--- /dev/null
+++ b/main/source/stlport/test/regression/parsrt2.cpp
@@ -0,0 +1,43 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <iostream>
+#include <cstring>
+#include <iterator>
+
+#ifdef MAIN 
+#define parsrt2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+static bool str_compare(const char* a_, const char* b_)
+{
+  return strcmp(a_, b_) < 0 ? 1 : 0;
+}
+
+int parsrt2_test(int, char**)
+{
+  cout<<"Results of parsrt2_test:"<<endl;
+
+char* names[] = { "aa", "ff", "dd", "ee", "cc", "bb" };
+
+  const unsigned nameSize = sizeof(names) / sizeof(names[0]);
+  vector <char*> v1(nameSize);
+  for(int i = 0; i < v1.size(); i++)
+    v1[i] = names[i];
+  ostream_iterator<char*> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  partial_sort(v1.begin(),
+                v1.begin() + nameSize / 2,
+                v1.end(),
+                str_compare);
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/parsrtc0.cpp b/main/source/stlport/test/regression/parsrtc0.cpp
new file mode 100644
index 00000000..f1359bf7
--- /dev/null
+++ b/main/source/stlport/test/regression/parsrtc0.cpp
@@ -0,0 +1,25 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define parsrtc0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int parsrtc0_test(int, char**)
+{
+  cout<<"Results of parsrtc0_test:"<<endl;
+int numbers[6] = { 5, 2, 4, 3, 1, 6 };
+
+  int result[3];
+  partial_sort_copy((int*)numbers, (int*)numbers + 6, (int*)result, (int*)result + 3);
+  for(int i = 0; i < 3; i++)
+    cout << result[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/parsrtc1.cpp b/main/source/stlport/test/regression/parsrtc1.cpp
new file mode 100644
index 00000000..263ba652
--- /dev/null
+++ b/main/source/stlport/test/regression/parsrtc1.cpp
@@ -0,0 +1,34 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <vector>
+#include <algorithm>
+#include <cstdlib>
+#include <iostream>
+#include <iterator>
+
+#ifdef MAIN 
+#define parsrtc1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int parsrtc1_test(int, char**)
+{
+  cout<<"Results of parsrtc1_test:"<<endl;
+  vector <int> v1(10);
+  for(int i = 0; i < v1.size(); i++)
+    v1[i] = rand() % 10;
+  vector <int> result(5);
+  ostream_iterator<int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  partial_sort_copy(v1.begin(),
+                     v1.end(),
+                     result.begin(),
+                     result.end());
+  copy(result.begin(), result.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/parsrtc2.cpp b/main/source/stlport/test/regression/parsrtc2.cpp
new file mode 100644
index 00000000..8b9533ab
--- /dev/null
+++ b/main/source/stlport/test/regression/parsrtc2.cpp
@@ -0,0 +1,45 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iterator>
+#include <vector>
+#include <algorithm>
+#include <iostream>
+#include <cstring>
+
+#ifdef MAIN 
+#define parsrtc2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+static bool str_compare(const char* a_, const char* b_)
+{
+  return strcmp(a_, b_) < 0 ? 1 : 0;
+}
+
+int parsrtc2_test(int, char**)
+{
+  cout<<"Results of parsrtc2_test:"<<endl;
+
+char* names[] = { "aa", "ff", "dd", "ee", "cc", "bb" };
+
+  const unsigned nameSize = sizeof(names) / sizeof(names[0]);
+  vector <char*> v1(nameSize);
+  for(int i = 0; i < v1.size(); i++)
+    v1[i] = names[i];
+  ostream_iterator<char*> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  vector <char*> result(5);
+  partial_sort_copy(v1.begin(),
+                     v1.end(),
+                     result.begin(),
+                     result.end(),
+                     str_compare);
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/partsrt0.cpp b/main/source/stlport/test/regression/partsrt0.cpp
new file mode 100644
index 00000000..ea0b759e
--- /dev/null
+++ b/main/source/stlport/test/regression/partsrt0.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define partsrt0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int partsrt0_test(int, char**)
+{
+  cout<<"Results of partsrt0_test:"<<endl;
+int numbers[6] = { 5, 2, 4, 3, 1, 6 };
+
+  partial_sort((int*)numbers, (int*)numbers + 3, (int*)numbers + 6);
+  for(int i = 0; i < 6; i++)
+    cout << numbers[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/partsum0.cpp b/main/source/stlport/test/regression/partsum0.cpp
new file mode 100644
index 00000000..a80912a1
--- /dev/null
+++ b/main/source/stlport/test/regression/partsum0.cpp
@@ -0,0 +1,26 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <numeric>
+#include <iostream>
+
+#ifdef MAIN 
+#define partsum0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int partsum0_test(int, char**)
+{
+  cout<<"Results of partsum0_test:"<<endl;
+int numbers[6] = { 1, 2, 3, 4, 5, 6 };
+
+  int result[6];
+  partial_sum((int*)numbers, (int*)numbers + 6, (int*)result);
+  for(int i = 0; i < 6; i ++)
+    cout << result[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/partsum1.cpp b/main/source/stlport/test/regression/partsum1.cpp
new file mode 100644
index 00000000..2b9f1bad
--- /dev/null
+++ b/main/source/stlport/test/regression/partsum1.cpp
@@ -0,0 +1,31 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#include <iterator>
+
+#include <vector>
+#include <algorithm>
+#include <iostream>
+#include <numeric>
+#include <iterator>
+
+#ifdef MAIN 
+#define partsum1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int partsum1_test(int, char**)
+{
+  cout<<"Results of partsum1_test:"<<endl;
+  vector <int> v1(10);
+  iota(v1.begin(), v1.end(), 0);
+  vector <int> v2(v1.size());
+  partial_sum(v1.begin(), v1.end(), v2.begin());
+  ostream_iterator <int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  copy(v2.begin(), v2.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/partsum2.cpp b/main/source/stlport/test/regression/partsum2.cpp
new file mode 100644
index 00000000..c536c9b1
--- /dev/null
+++ b/main/source/stlport/test/regression/partsum2.cpp
@@ -0,0 +1,32 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#include <iterator>
+
+#include <vector>
+#include <algorithm>
+#include <iostream>
+#include <iterator>
+#include <functional>
+#include <numeric>
+
+#ifdef MAIN 
+#define partsum2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int partsum2_test(int, char**)
+{
+  cout<<"Results of partsum2_test:"<<endl;
+  vector <int> v1(5);
+  iota(v1.begin(), v1.end(), 1);
+  vector <int> v2(v1.size());
+  partial_sum(v1.begin(), v1.end(), v2.begin(), multiplies<int>());
+  ostream_iterator <int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  copy(v2.begin(), v2.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/pheap1.cpp b/main/source/stlport/test/regression/pheap1.cpp
new file mode 100644
index 00000000..50f16b32
--- /dev/null
+++ b/main/source/stlport/test/regression/pheap1.cpp
@@ -0,0 +1,35 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <vector>
+#include <iostream>
+#include <iterator>
+
+#ifdef MAIN 
+#define pheap1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int pheap1_test(int, char**)
+{
+  cout<<"Results of pheap1_test:"<<endl;
+  vector<int> v;
+
+  v.push_back(1);
+  v.push_back(20);
+  v.push_back(4);
+  make_heap(v.begin(), v.end());
+
+  v.push_back(7);
+  push_heap(v.begin(), v.end());
+
+  sort_heap(v.begin(), v.end());
+  ostream_iterator<int> iter(cout, " ");
+  copy(v.begin(), v.end(), iter);
+  cout << endl;
+
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/pheap2.cpp b/main/source/stlport/test/regression/pheap2.cpp
new file mode 100644
index 00000000..bc0e3e88
--- /dev/null
+++ b/main/source/stlport/test/regression/pheap2.cpp
@@ -0,0 +1,36 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <functional>
+#include <algorithm>
+#include <vector>
+#include <iterator>
+#include <iostream>
+
+#ifdef MAIN 
+#define pheap2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int pheap2_test(int, char**)
+{
+  cout<<"Results of pheap2_test:"<<endl;
+  vector<int> v;
+
+  v.push_back(1);
+  v.push_back(20);
+  v.push_back(4);
+  make_heap(v.begin(), v.end(), greater<int>());
+
+  v.push_back(7);
+  push_heap(v.begin(), v.end(), greater<int>());
+
+  sort_heap(v.begin(), v.end(), greater<int>());
+  ostream_iterator<int> iter(cout, " ");
+  copy(v.begin(), v.end(), iter);
+  cout << endl;
+
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/plus.cpp b/main/source/stlport/test/regression/plus.cpp
new file mode 100644
index 00000000..4ed74921
--- /dev/null
+++ b/main/source/stlport/test/regression/plus.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <numeric>
+
+#ifdef MAIN 
+#define plus_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int plus_test(int, char**)
+{
+  cout<<"Results of plus_test:"<<endl;
+int input1 [4] = { 1, 6, 11, 8 };
+int input2 [4] = { 1, 5, 2, 3 };
+
+  int total = 
+    inner_product(input1, input1 + 4, input2, 0, plus<int>(), multiplies <int>());
+  cout << "total = " << total << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/pqueue1.cpp b/main/source/stlport/test/regression/pqueue1.cpp
new file mode 100644
index 00000000..d3ad52c5
--- /dev/null
+++ b/main/source/stlport/test/regression/pqueue1.cpp
@@ -0,0 +1,29 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <deque>
+#include <queue>
+
+#ifdef MAIN 
+#define pqueue1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int pqueue1_test(int, char**)
+{
+  cout<<"Results of pqueue1_test:"<<endl;
+  priority_queue<int, deque<int>, less<int> > q;
+  q.push(42);
+  q.push(101);
+  q.push(69);
+  while(!q.empty())
+  {
+    cout << q.top() << endl;
+    q.pop();
+  }
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/prevprm0.cpp b/main/source/stlport/test/regression/prevprm0.cpp
new file mode 100644
index 00000000..29c4bf91
--- /dev/null
+++ b/main/source/stlport/test/regression/prevprm0.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define prevprm0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int prevprm0_test(int, char**)
+{
+  cout<<"Results of prevprm0_test:"<<endl;
+int v1[3] = { 0, 1, 2 };
+
+  prev_permutation(v1, v1 + 3);
+  for(int i = 0; i < 3; i++)
+    cout << v1[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/prevprm1.cpp b/main/source/stlport/test/regression/prevprm1.cpp
new file mode 100644
index 00000000..f9a78846
--- /dev/null
+++ b/main/source/stlport/test/regression/prevprm1.cpp
@@ -0,0 +1,34 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#include <iterator>
+
+#include <algorithm>
+#include <vector>
+#include <iostream>
+#include <iterator>
+// #include <functional>
+#include <numeric>
+
+#ifdef MAIN 
+#define prevprm1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int prevprm1_test(int, char**)
+{
+  cout<<"Results of prevprm1_test:"<<endl;
+  vector <int> v1(3);
+  iota(v1.begin(), v1.end(), 0);
+  ostream_iterator<int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  for(int i = 0; i < 9; i++)
+  {
+    prev_permutation(v1.begin(), v1.end());
+    copy(v1.begin(), v1.end(), iter);
+    cout << endl;
+  }
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/prevprm2.cpp b/main/source/stlport/test/regression/prevprm2.cpp
new file mode 100644
index 00000000..686b27a9
--- /dev/null
+++ b/main/source/stlport/test/regression/prevprm2.cpp
@@ -0,0 +1,34 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#include <iterator>
+
+#include <algorithm>
+#include <vector>
+#include <iterator>
+// #include <functional>
+#include <numeric>
+#include <iostream>
+
+#ifdef MAIN 
+#define prevprm2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int prevprm2_test(int, char**)
+{
+  cout<<"Results of prevprm2_test:"<<endl;
+  vector <int> v1(3);
+  iota(v1.begin(), v1.end(), 0);
+  ostream_iterator<int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  for(int i = 0; i < 9; i++)
+  {
+    prev_permutation(v1.begin(), v1.end(), greater<int>());
+    copy(v1.begin(), v1.end(), iter);
+    cout << endl;
+  }
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/ptition0.cpp b/main/source/stlport/test/regression/ptition0.cpp
new file mode 100644
index 00000000..ad3d40ab
--- /dev/null
+++ b/main/source/stlport/test/regression/ptition0.cpp
@@ -0,0 +1,29 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define ptition0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+static int less_10(int a_)
+{
+  return a_ < 10 ? 1 : 0;
+}
+
+int ptition0_test(int, char**)
+{
+  cout<<"Results of ptition0_test:"<<endl;
+int numbers[6] = { 6, 12, 3, 10, 1, 20 };
+
+  partition((int*)numbers, (int*)numbers + 6, less_10);
+  for(int i = 0; i < 6; i++)
+    cout << numbers[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/ptition1.cpp b/main/source/stlport/test/regression/ptition1.cpp
new file mode 100644
index 00000000..7a80c9ce
--- /dev/null
+++ b/main/source/stlport/test/regression/ptition1.cpp
@@ -0,0 +1,31 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <vector>
+#include <cstdlib>
+#include <iostream>
+#include <iterator>
+#include <functional>
+
+#ifdef MAIN 
+#define ptition1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int ptition1_test(int, char**)
+{
+  cout<<"Results of ptition1_test:"<<endl;
+  vector <int> v1(10);
+  for(int i = 0; i < v1.size(); i++)
+    v1[i] = rand() % 20;
+  ostream_iterator <int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  partition(v1.begin(), v1.end(), bind2nd(less<int>(), 11));
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/ptrbinf1.cpp b/main/source/stlport/test/regression/ptrbinf1.cpp
new file mode 100644
index 00000000..5933223c
--- /dev/null
+++ b/main/source/stlport/test/regression/ptrbinf1.cpp
@@ -0,0 +1,33 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <iterator>
+#include <functional>
+
+#ifdef MAIN 
+#define ptrbinf1_test main
+#endif
+static int sum(int x_, int y_)
+{
+  return x_ + y_;
+}
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int ptrbinf1_test(int, char**)
+{
+  cout<<"Results of ptrbinf1_test:"<<endl;
+
+int input1 [4] = { 7, 2, 3, 5 };
+int input2 [4] = { 1, 5, 5, 8 };
+
+  int output [4];
+  transform((int*)input1, (int*)input1 + 4, (int*)input2, (int*)output, 
+    pointer_to_binary_function<int, int, int>(sum));
+  for(int i = 0; i < 4; i++)
+    cout << output[i] << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/ptrbinf2.cpp b/main/source/stlport/test/regression/ptrbinf2.cpp
new file mode 100644
index 00000000..ad0b6c5d
--- /dev/null
+++ b/main/source/stlport/test/regression/ptrbinf2.cpp
@@ -0,0 +1,32 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <iterator>
+#include <functional>
+
+#ifdef MAIN 
+#define ptrbinf2_test main
+#endif
+static int sum(int x_, int y_)
+{
+  return x_ + y_;
+}
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int ptrbinf2_test(int, char**)
+{
+  cout<<"Results of ptrbinf2_test:"<<endl;
+
+int input1 [4] = { 7, 2, 3, 5 };
+int input2 [4] = { 1, 5, 5, 8 };
+
+  int output [4];
+  transform((int*)input1, (int*)input1 + 4, (int*)input2, (int*)output, ptr_fun(sum));
+  for(int i = 0; i < 4; i++)
+    cout << output[i] << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/ptrunf1.cpp b/main/source/stlport/test/regression/ptrunf1.cpp
new file mode 100644
index 00000000..4e0a7438
--- /dev/null
+++ b/main/source/stlport/test/regression/ptrunf1.cpp
@@ -0,0 +1,31 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <iterator>
+#include <functional>
+
+#ifdef MAIN 
+#define ptrunf1_test main
+#endif
+bool even(int n_)
+{
+  return(n_ % 2) == 0;
+}
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int ptrunf1_test(int, char**)
+{
+  cout<<"Results of ptrunf1_test:"<<endl;
+
+int array [3] = { 1, 2, 3 };
+
+  int* p = find_if((int*)array, (int*)array + 3, 
+    pointer_to_unary_function<int, bool>(even));
+  if(p != array + 3)
+    cout << *p << " is even" << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/ptrunf2.cpp b/main/source/stlport/test/regression/ptrunf2.cpp
new file mode 100644
index 00000000..7c4b7bb0
--- /dev/null
+++ b/main/source/stlport/test/regression/ptrunf2.cpp
@@ -0,0 +1,30 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <iterator>
+#include <functional>
+
+#ifdef MAIN 
+#define ptrunf2_test main
+#endif
+static bool even(int n_)
+{
+  return(n_ % 2) == 0;
+}
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int ptrunf2_test(int, char**)
+{
+  cout<<"Results of ptrunf2_test:"<<endl;
+
+int array [3] = { 1, 2, 3 };
+
+  int* p = find_if((int*)array, (int*)array + 3, ptr_fun(even));
+  if(p != array + 3)
+    cout << *p << " is even" << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/queue1.cpp b/main/source/stlport/test/regression/queue1.cpp
new file mode 100644
index 00000000..d1b75306
--- /dev/null
+++ b/main/source/stlport/test/regression/queue1.cpp
@@ -0,0 +1,29 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <queue>
+#include <list>
+
+#ifdef MAIN 
+#define queue1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int queue1_test(int, char**)
+{
+  cout<<"Results of queue1_test:"<<endl;
+  queue<int, list<int> > q;
+  q.push(42);
+  q.push(101);
+  q.push(69);
+  while(!q.empty())
+  {
+    cout << q.front() << endl;
+    q.pop();
+  }
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/rand.h b/main/source/stlport/test/regression/rand.h
new file mode 100644
index 00000000..0f9e2124
--- /dev/null
+++ b/main/source/stlport/test/regression/rand.h
@@ -0,0 +1,18 @@
+#ifndef _rand_h
+#define _rand_h
+#include <cstdlib>
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+class MyRandomGenerator
+{
+  public:
+    unsigned long operator()(unsigned long n_)
+      {
+      return rand() % n_;
+      }
+};
+
+#endif // _rand_h
diff --git a/main/source/stlport/test/regression/rawiter.cpp b/main/source/stlport/test/regression/rawiter.cpp
new file mode 100644
index 00000000..96933131
--- /dev/null
+++ b/main/source/stlport/test/regression/rawiter.cpp
@@ -0,0 +1,40 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <iterator>
+#include <memory>
+
+#ifdef MAIN 
+#define rawiter_test main
+#endif
+
+#include "rawiter.hpp"
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+int rawiter_test(int, char**)
+{
+  cout<<"Results of rawiter_test:"<<endl;
+
+  allocator<X> a;
+  typedef X* x_pointer;
+  x_pointer save_p, p;
+  p = a.allocate(5); 
+  save_p=p;
+  raw_storage_iterator<X*, X> r(p);
+  int i;
+  for(i = 0; i < 5; i++)
+    *r++ = X(i);
+  for(i = 0; i < 5; i++)
+    cout << *p++ << endl;
+# ifdef __STLPORT_VERSION
+  a.deallocate(save_p,5);
+# else
+  a.deallocate(save_p);
+# endif
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/rawiter.hpp b/main/source/stlport/test/regression/rawiter.hpp
new file mode 100644
index 00000000..734a492c
--- /dev/null
+++ b/main/source/stlport/test/regression/rawiter.hpp
@@ -0,0 +1,11 @@
+class X
+{
+  public:
+    X(int i_ = 0) : i(i_) {}
+    ~X() {}
+    operator int() const { return i; }
+ 
+  private:
+    int i;
+};
+
diff --git a/main/source/stlport/test/regression/remcopy1.cpp b/main/source/stlport/test/regression/remcopy1.cpp
new file mode 100644
index 00000000..2d18aeb8
--- /dev/null
+++ b/main/source/stlport/test/regression/remcopy1.cpp
@@ -0,0 +1,25 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define remcopy1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int remcopy1_test(int, char**)
+{
+  cout<<"Results of remcopy1_test:"<<endl;
+int numbers[6] = { 1, 2, 3, 1, 2, 3 };
+int result[6] = { 0, 0, 0, 0, 0, 0 };
+
+  remove_copy((int*)numbers, (int*)numbers + 6, (int*)result, 2);
+  for(int i = 0; i < 6; i++)
+    cout << result[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/remcpif1.cpp b/main/source/stlport/test/regression/remcpif1.cpp
new file mode 100644
index 00000000..c80dc066
--- /dev/null
+++ b/main/source/stlport/test/regression/remcpif1.cpp
@@ -0,0 +1,30 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define remcpif1_test main
+#endif
+static bool odd(int a_)
+{
+  return a_ % 2;
+}
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int remcpif1_test(int, char**)
+{
+  cout<<"Results of remcpif1_test:"<<endl;
+
+int numbers[6] = { 1, 2, 3, 1, 2, 3 };
+int result[6] = { 0, 0, 0, 0, 0, 0 };
+
+  remove_copy_if((int*)numbers, (int*)numbers + 6, (int*)result, odd);
+  for(int i = 0; i < 6; i++)
+    cout << result[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/remif1.cpp b/main/source/stlport/test/regression/remif1.cpp
new file mode 100644
index 00000000..e475490d
--- /dev/null
+++ b/main/source/stlport/test/regression/remif1.cpp
@@ -0,0 +1,29 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define remif1_test main
+#endif
+static bool odd(int a_)
+{
+  return a_ % 2;
+}
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int remif1_test(int, char**)
+{
+  cout<<"Results of remif1_test:"<<endl;
+
+int numbers[6] = { 0, 0, 1, 1, 2, 2 };
+
+  remove_if((int*)numbers, (int*)numbers + 6, odd);
+  for(int i = 0; i < 6; i++)
+    cout << numbers[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/remove1.cpp b/main/source/stlport/test/regression/remove1.cpp
new file mode 100644
index 00000000..d7453fb8
--- /dev/null
+++ b/main/source/stlport/test/regression/remove1.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define remove1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int remove1_test(int, char**)
+{
+  cout<<"Results of remove1_test:"<<endl;
+int numbers[6] = { 1, 2, 3, 1, 2, 3 };
+
+  remove((int*)numbers, (int*)numbers + 6, 1);
+  for(int i = 0; i < 6; i++)
+    cout << numbers[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/repcpif1.cpp b/main/source/stlport/test/regression/repcpif1.cpp
new file mode 100644
index 00000000..943b2b8f
--- /dev/null
+++ b/main/source/stlport/test/regression/repcpif1.cpp
@@ -0,0 +1,38 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <vector>
+#include <iostream>
+#include <iterator>
+#include <functional>
+
+#ifdef MAIN 
+#define repcpif1_test main
+#endif
+static bool odd(int a_)
+{
+  return a_ % 2;
+}
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int repcpif1_test(int, char**)
+{
+  cout<<"Results of repcpif1_test:"<<endl;
+
+  vector <int> v1(10);
+  for(int i = 0; i < v1.size(); i++)
+    v1[i] = i % 5;
+  ostream_iterator <int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  vector <int> v2(v1.size());
+  replace_copy_if(v1.begin(), v1.end(), v2.begin(), odd, 42);
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  copy(v2.begin(), v2.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/replace0.cpp b/main/source/stlport/test/regression/replace0.cpp
new file mode 100644
index 00000000..878b7514
--- /dev/null
+++ b/main/source/stlport/test/regression/replace0.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define replace0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int replace0_test(int, char**)
+{
+  cout<<"Results of replace0_test:"<<endl;
+int numbers[6] = { 0, 1, 2, 0, 1, 2 };
+
+  replace(numbers, numbers + 6, 2, 42);
+  for(int i = 0; i < 6; i++)
+    cout << numbers[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/replace1.cpp b/main/source/stlport/test/regression/replace1.cpp
new file mode 100644
index 00000000..00d2ecbf
--- /dev/null
+++ b/main/source/stlport/test/regression/replace1.cpp
@@ -0,0 +1,31 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <vector>
+#include <iostream>
+#include <iterator>
+#include <functional>
+#include <iterator>
+
+#ifdef MAIN 
+#define replace1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int replace1_test(int, char**)
+{
+  cout<<"Results of replace1_test:"<<endl;
+  vector <int> v1(10);
+  for(int i = 0; i < v1.size(); i++)
+    v1[i] = i % 5;
+  ostream_iterator <int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  replace(v1.begin(), v1.end(), 2, 42);
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/replcpy1.cpp b/main/source/stlport/test/regression/replcpy1.cpp
new file mode 100644
index 00000000..13b86081
--- /dev/null
+++ b/main/source/stlport/test/regression/replcpy1.cpp
@@ -0,0 +1,25 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define replcpy1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int replcpy1_test(int, char**)
+{
+  cout<<"Results of replcpy1_test:"<<endl;
+int numbers[6] = { 0, 1, 2, 0, 1, 2 };
+int result[6] = { 0, 0, 0, 0, 0, 0 };
+
+  replace_copy((int*)numbers, (int*)numbers + 6, (int*)result, 2, 42);
+  for(int i = 0; i < 6; i++)
+    cout << result[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/replif1.cpp b/main/source/stlport/test/regression/replif1.cpp
new file mode 100644
index 00000000..2ee3d0e3
--- /dev/null
+++ b/main/source/stlport/test/regression/replif1.cpp
@@ -0,0 +1,36 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <vector>
+#include <iostream>
+
+#ifdef MAIN 
+#define replif1_test main
+#endif
+static bool odd(int a_)
+{
+  return a_ % 2;
+}
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int replif1_test(int, char**)
+{
+  cout<<"Results of replif1_test:"<<endl;
+
+  vector <int> v1(10);
+  int i;
+  for(i = 0; i < v1.size(); i++)
+  {
+    v1[i] = i % 5;
+    cout << v1[i] << ' ';
+  }
+  cout << endl;
+  replace_if(v1.begin(), v1.end(), odd, 42);
+  for(i = 0; i < v1.size(); i++)
+    cout << v1[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/revbit1.cpp b/main/source/stlport/test/regression/revbit1.cpp
new file mode 100644
index 00000000..f21a0a11
--- /dev/null
+++ b/main/source/stlport/test/regression/revbit1.cpp
@@ -0,0 +1,25 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <list>
+
+#ifdef MAIN 
+#define revbit1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int revbit1_test(int, char**)
+{
+  cout<<"Results of revbit1_test:"<<endl;
+int array [] = { 1, 5, 2, 3 };
+
+  list<int> v(array, array + 4);
+  std::list<int>::reverse_iterator r(v.rbegin());
+  while(!(r == v.rend()))
+    cout << *r++ << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/revbit2.cpp b/main/source/stlport/test/regression/revbit2.cpp
new file mode 100644
index 00000000..7febd4f9
--- /dev/null
+++ b/main/source/stlport/test/regression/revbit2.cpp
@@ -0,0 +1,25 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <list>
+
+#ifdef MAIN 
+#define revbit2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int revbit2_test(int, char**)
+{
+  cout<<"Results of revbit2_test:"<<endl;
+int array [] = { 1, 5, 2, 3 };
+
+  list<int> v(array, array + 4);
+  std::list<int>::reverse_iterator r;
+  for(r = v.rbegin(); !(r == v.rend()); r++)
+    cout << *r << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/revcopy1.cpp b/main/source/stlport/test/regression/revcopy1.cpp
new file mode 100644
index 00000000..7dbb3b54
--- /dev/null
+++ b/main/source/stlport/test/regression/revcopy1.cpp
@@ -0,0 +1,29 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define revcopy1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int revcopy1_test(int, char**)
+{
+  cout<<"Results of revcopy1_test:"<<endl;
+int numbers[6] = { 0, 1, 2, 3, 4, 5 };
+
+  int result[6];
+  reverse_copy((int*)numbers, (int*)numbers + 6, (int*)result);
+  int i;
+  for(i = 0; i < 6; i++)
+    cout << numbers[i] << ' ';
+  cout << endl;
+  for(i = 0; i < 6; i++)
+    cout << result[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/reverse1.cpp b/main/source/stlport/test/regression/reverse1.cpp
new file mode 100644
index 00000000..ef9544de
--- /dev/null
+++ b/main/source/stlport/test/regression/reverse1.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define reverse1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int reverse1_test(int, char**)
+{
+  cout<<"Results of reverse1_test:"<<endl;
+int numbers[6] = { 0, 1, 2, 3, 4, 5 };
+
+  reverse(numbers, numbers + 6);
+  for(int i = 0; i < 6; i++)
+    cout << numbers[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/reviter1.cpp b/main/source/stlport/test/regression/reviter1.cpp
new file mode 100644
index 00000000..ad78e720
--- /dev/null
+++ b/main/source/stlport/test/regression/reviter1.cpp
@@ -0,0 +1,26 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <vector>
+#include <algorithm>
+
+#ifdef MAIN 
+#define reviter1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int reviter1_test(int, char**)
+{
+  cout<<"Results of reviter1_test:"<<endl;
+int array [] = { 1, 5, 2, 3 };
+
+  vector<int> v(array, array + 4);
+  typedef std::vector<int>::reverse_iterator reviter;
+  reviter r(v.end());
+  while(!(r ==v.rbegin()))
+    cout << *r++ << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/reviter2.cpp b/main/source/stlport/test/regression/reviter2.cpp
new file mode 100644
index 00000000..00a21e85
--- /dev/null
+++ b/main/source/stlport/test/regression/reviter2.cpp
@@ -0,0 +1,25 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <vector>
+#include <algorithm>
+
+#ifdef MAIN 
+#define reviter2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int reviter2_test(int, char**)
+{
+  cout<<"Results of reviter2_test:"<<endl;
+int array [] = { 1, 5, 2, 3 };
+
+  std::vector<int> v(array, array + 4);
+  std::vector<int>::reverse_iterator r;
+  for(r = v.rbegin(); r != v.rend(); r++)
+    cout << *r << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/rndshuf0.cpp b/main/source/stlport/test/regression/rndshuf0.cpp
new file mode 100644
index 00000000..c3e05dbc
--- /dev/null
+++ b/main/source/stlport/test/regression/rndshuf0.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define rndshuf0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int rndshuf0_test(int, char**)
+{
+  cout<<"Results of rndshuf0_test:"<<endl;
+int numbers[6] = { 1, 2, 3, 4, 5, 6 };
+
+  random_shuffle(numbers, numbers + 6);
+  for(int i = 0; i < 6; i++)
+    cout << numbers[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/rndshuf1.cpp b/main/source/stlport/test/regression/rndshuf1.cpp
new file mode 100644
index 00000000..337e159f
--- /dev/null
+++ b/main/source/stlport/test/regression/rndshuf1.cpp
@@ -0,0 +1,34 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#include <iterator>
+
+#include <algorithm>
+#include <vector>
+#include <iostream>
+#include <iterator>
+#include <numeric>
+//#include <functional>
+
+#ifdef MAIN 
+#define rndshuf1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int rndshuf1_test(int, char**)
+{
+  cout<<"Results of rndshuf1_test:"<<endl;
+  vector <int> v1(10);
+  iota(v1.begin(), v1.end(), 0);
+  ostream_iterator <int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  for(int i = 0; i < 3; i++)
+  {
+    random_shuffle(v1.begin(), v1.end());
+    copy(v1.begin(), v1.end(), iter);
+    cout << endl;
+  }
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/rndshuf2.cpp b/main/source/stlport/test/regression/rndshuf2.cpp
new file mode 100644
index 00000000..9423177f
--- /dev/null
+++ b/main/source/stlport/test/regression/rndshuf2.cpp
@@ -0,0 +1,38 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#include <iterator>
+
+#include <algorithm>
+#include <vector>
+#include <iostream>
+#include "rand.h"
+#include <iterator>
+#include <functional>
+#include <numeric>
+
+#ifdef MAIN 
+#define rndshuf2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+int rndshuf2_test(int, char**)
+{
+  cout<<"Results of rndshuf2_test:"<<endl;
+
+  vector <int> v1(10);
+  iota(v1.begin(), v1.end(), 0);
+  ostream_iterator <int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  MyRandomGenerator r;
+  for(int i = 0; i < 3; i++)
+  {
+    random_shuffle(v1.begin(), v1.end(), r);
+    copy(v1.begin(), v1.end(), iter);
+    cout << endl;
+  }
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/rotate0.cpp b/main/source/stlport/test/regression/rotate0.cpp
new file mode 100644
index 00000000..2b843b19
--- /dev/null
+++ b/main/source/stlport/test/regression/rotate0.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define rotate0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int rotate0_test(int, char**)
+{
+  cout<<"Results of rotate0_test:"<<endl;
+int numbers[6] = { 0, 1, 2, 3, 4, 5 };
+
+  rotate((int*)numbers, numbers + 3, numbers + 6);
+  for(int i = 0; i < 6; i++)
+    cout << numbers[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/rotate1.cpp b/main/source/stlport/test/regression/rotate1.cpp
new file mode 100644
index 00000000..0d706522
--- /dev/null
+++ b/main/source/stlport/test/regression/rotate1.cpp
@@ -0,0 +1,36 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#include <iterator>
+
+#include <algorithm>
+#include <vector>
+#include <iostream>
+#include <iterator>
+// #include <functional>
+#include <numeric>
+
+#ifdef MAIN 
+#define rotate1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int rotate1_test(int, char**)
+{
+  cout<<"Results of rotate1_test:"<<endl;
+  vector <int> v1(10);
+  iota(v1.begin(), v1.end(), 0);
+  ostream_iterator <int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  for(int i = 0; i < v1.size(); i++)
+  {
+    rotate(v1.begin(), v1.begin() + i, v1.end());
+    ostream_iterator <int> iter(cout, " ");
+    copy(v1.begin(), v1.end(), iter);
+    cout << endl;
+  }
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/rotcopy0.cpp b/main/source/stlport/test/regression/rotcopy0.cpp
new file mode 100644
index 00000000..5a5c706e
--- /dev/null
+++ b/main/source/stlport/test/regression/rotcopy0.cpp
@@ -0,0 +1,25 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define rotcopy0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int rotcopy0_test(int, char**)
+{
+  cout<<"Results of rotcopy0_test:"<<endl;
+int numbers[6] = { 0, 1, 2, 3, 4, 5 };
+
+  int result[6];
+  rotate_copy((int*)numbers, (int*)numbers + 3, (int*)numbers + 6, (int*)result);
+  for(int i = 0; i < 6; i++)
+    cout << result[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/rotcopy1.cpp b/main/source/stlport/test/regression/rotcopy1.cpp
new file mode 100644
index 00000000..caad5867
--- /dev/null
+++ b/main/source/stlport/test/regression/rotcopy1.cpp
@@ -0,0 +1,40 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#include <iterator>
+
+#include <algorithm>
+#include <vector>
+#include <iostream>
+#include <iterator>
+// #include <functional>
+#include <numeric>
+
+#ifdef MAIN 
+#define rotcopy1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int rotcopy1_test(int, char**)
+{
+  cout<<"Results of rotcopy1_test:"<<endl;
+  vector <int> v1(10);
+  iota(v1.begin(), v1.end(), 0);
+  ostream_iterator <int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  vector <int> v2(v1.size());
+  for(int i = 0; i < v1.size(); i++)
+  {
+    rotate_copy(v1.begin(),
+                 v1.begin() + i,
+                 v1.end(),
+                 v2.begin());
+    ostream_iterator <int> iter(cout, " ");
+    copy(v2.begin(), v2.end(), iter);
+    cout << endl;
+  }
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/search0.cpp b/main/source/stlport/test/regression/search0.cpp
new file mode 100644
index 00000000..acdf7a07
--- /dev/null
+++ b/main/source/stlport/test/regression/search0.cpp
@@ -0,0 +1,33 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define search0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int search0_test(int, char**)
+{
+  cout<<"Results of search0_test:"<<endl;
+int v1[6] = { 1, 1, 2, 3, 5, 8 };
+int v2[6] = { 0, 1, 2, 3, 4, 5 };
+int v3[2] = { 3, 4 };
+
+  int* location;
+  location = search((int*)v1, (int*)v1 + 6, (int*)v3, (int*)v3 + 2);
+  if(location == v1 + 6)
+    cout << "v3 not contained in v1" << endl;
+  else
+    cout << "Found v3 in v1 at offset: " << location - v1 << endl;
+  location = search((int*)v2, (int*)v2 + 6, (int*)v3, (int*)v3 + 2);
+  if(location == v2 + 6)
+    cout << "v3 not contained in v2" << endl;
+  else
+    cout << "Found v3 in v2 at offset: " << location - v2 << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/search1.cpp b/main/source/stlport/test/regression/search1.cpp
new file mode 100644
index 00000000..abb0381f
--- /dev/null
+++ b/main/source/stlport/test/regression/search1.cpp
@@ -0,0 +1,60 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#include <iterator>
+
+#include <algorithm>
+#include <vector>
+#include <iostream>
+#include <iterator>
+// #include <functional>
+#include <numeric>
+
+#ifdef MAIN 
+#define search1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int search1_test(int, char**)
+{
+  cout<<"Results of search1_test:"<<endl;
+  typedef vector <int> IntVec;
+  IntVec v1(10);
+  iota(v1.begin(), v1.end(), 0);
+  IntVec v2(3);
+  iota(v2.begin(), v2.end(), 50);
+  ostream_iterator <int> iter(cout, " ");
+
+  cout << "v1: ";
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  cout << "v2: ";
+  copy(v2.begin(), v2.end(), iter);
+  cout << endl;
+
+  IntVec::iterator location;
+  location = search(v1.begin(), v1.end(), v2.begin(), v2.end());
+
+  if(location == v1.end())
+    cout << "v2 not contained in v1" << endl;
+  else
+    cout << "Found v2 in v1 at offset: " << location - v1.begin() << endl;
+
+  iota(v2.begin(), v2.end(), 4);
+  cout << "v1: ";
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  cout << "v2: ";
+  copy(v2.begin(), v2.end(), iter);
+  cout << endl;
+
+  location = search(v1.begin(), v1.end(), v2.begin(), v2.end());
+
+  if(location == v1.end())
+    cout << "v2 not contained in v1" << endl;
+  else
+    cout << "Found v2 in v1 at offset: " << location - v1.begin() << endl;
+
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/search2.cpp b/main/source/stlport/test/regression/search2.cpp
new file mode 100644
index 00000000..023aae6d
--- /dev/null
+++ b/main/source/stlport/test/regression/search2.cpp
@@ -0,0 +1,66 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <cstring>
+#include <iterator>
+#include <functional>
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+#ifdef MAIN 
+#define search2_test main
+#endif
+static bool str_equal(const char* a_, const char* b_)
+{
+  return strcmp(a_, b_) == 0 ? 1 : 0;
+}
+
+int search2_test(int, char**)
+{
+  cout<<"Results of search2_test:"<<endl;
+
+char* grades[] = { "A", "B", "C", "D", "F" };
+char* letters[] = { "Q", "E", "D" };
+
+  const unsigned gradeCount = sizeof(grades) / sizeof(grades[0]);
+  const unsigned letterCount = sizeof(letters) / sizeof(letters[0]);
+  ostream_iterator <char*> iter(cout, " ");
+  cout << "grades: ";
+  copy(grades, grades + gradeCount, iter);
+  cout << "\nletters:";
+  copy(letters, letters + letterCount, iter);
+  cout << endl;
+
+  char** location =
+    search((char**)grades, (char**)grades + gradeCount,
+            (char**)letters, (char**)letters + letterCount,
+            str_equal);
+
+  if(location == grades + gradeCount)
+    cout << "letters not found in grades" << endl;
+  else
+    cout << "letters found in grades at offset: " << location - grades << endl;
+
+  copy((char**)grades + 1, (char**)grades + 1 + letterCount, (char**)letters);
+
+  cout << "grades: ";
+  copy(grades, grades + gradeCount, iter);
+  cout << "\nletters:";
+  copy(letters, letters + letterCount, iter);
+  cout << endl;
+
+  location = search((char**)grades, (char**)grades + gradeCount,
+                     (char**)letters, (char**)letters + letterCount,
+                     str_equal);
+
+  if(location == grades + gradeCount)
+    cout << "letters not found in grades" << endl;
+  else
+    cout
+      << "letters found in grades at offset: " << location - grades << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/seek.cpp b/main/source/stlport/test/regression/seek.cpp
new file mode 100644
index 00000000..d3359bd3
--- /dev/null
+++ b/main/source/stlport/test/regression/seek.cpp
@@ -0,0 +1,138 @@
+
+
+// Regression test for STL seekg
+
+#include <cstdio>       // I really like formatted output.
+#include <cstdarg>
+#include <fstream>
+#include <vector>
+
+#ifndef cstd
+#ifdef _MSC_VER
+#define cstd
+#else
+#define cstd std
+#endif
+#endif
+
+#ifndef USING_STLPORT
+#define vsnprintf _vsnprintf
+#endif
+
+class Error : public std::exception
+{
+ public:
+    Error(const char *pszfmt, ...);
+    const char *what() const;
+ private:
+    char mMessage[256];
+};
+
+#define countof(x) (sizeof(x)/sizeof((x)[0]))
+
+Error::Error(const char *pszfmt, ...)
+{
+    cstd::va_list ap;
+    va_start(ap, pszfmt);
+    cstd::vsnprintf(mMessage, countof(mMessage), pszfmt, ap);
+    va_end(ap);
+}
+
+const char *Error::what() const
+{
+    return mMessage;
+}
+
+// usage: testseek filename
+int main(int argc, char **argv)
+{
+    try
+    {
+        if (argc != 2) {
+            throw Error("Wrong number of arguments (Usage: testseek filename)");
+        }
+        std::ifstream ifs(argv[1]);
+        if (!ifs) {
+            throw Error("Failed to open file \"%s\"", argv[1]);
+        }
+
+        ifs.exceptions(std::ios::badbit);
+        // First pass: read contents of file into character vector
+        std::vector<char> charvec;
+        cstd::printf("First pass:\n");
+        for(;;)
+        {
+            char ch;
+            if (!ifs.get(ch)) {
+                break;
+            }
+            cstd::printf("%c", ch);
+            charvec.push_back(ch);
+        }
+        printf("First pass done\n");
+
+        // Second pass: get positions into pos vector, checking chars
+        std::vector<std::ios::pos_type> posvec;
+        ifs.clear();    // necessary?
+        ifs.seekg(0);
+        std::vector<char>::const_iterator char_it;
+        printf("Second pass:\n");
+        for(char_it = charvec.begin(); char_it != charvec.end(); ++char_it)
+        {
+            std::ios::pos_type pos = ifs.tellg();
+            posvec.push_back(pos);
+            char ch;
+            if (!ifs.get(ch)) {
+                break;
+            }
+            cstd::printf("%c", ch);
+            if (ch != *char_it) {
+                throw Error("Character mismatch: got '%c', expected '%c'",
+                            ch, *char_it);
+            }
+        }
+        if (char_it != charvec.end()) {
+            throw Error("Unexpected end of file");
+        }
+
+        printf("Second pass done\n");
+
+        // Third pass: seek to each saved position and read next char
+        ifs.clear();    // necessary, but I don't like it
+        std::vector<std::ios::pos_type>::const_iterator pos_it;
+
+        for(pos_it = posvec.begin();
+            pos_it != posvec.end(); ++pos_it)
+        {
+            printf ("%d ", (int)*pos_it);
+        }
+        printf ("\n");
+
+        printf("Third pass:\n");
+        for(char_it = charvec.begin(), pos_it = posvec.begin();
+            char_it != charvec.end(); ++char_it, ++pos_it)
+        {
+            ifs.seekg(*pos_it);
+            char ch;
+            if (!ifs.get(ch)) {
+                throw Error("End of file when expecting '%c'", *char_it);
+            }
+            cstd::printf("%c", ch);
+            if (ch != *char_it) {
+                throw Error("Character mismatch: got '%c', expected '%c'",
+                            ch, *char_it);
+            }
+        }
+        printf("Third pass done\n");
+        printf("Test passed\n");
+        
+            
+    }
+    catch (std::exception &e)
+    {
+        cstd::printf("\nCaught exception: %s\n", e.what());
+        cstd::printf("Test failed!\n");
+        return 1;
+    }
+    return 0;
+}
diff --git a/main/source/stlport/test/regression/seek.res b/main/source/stlport/test/regression/seek.res
new file mode 100644
index 00000000..0b27d27c
--- /dev/null
+++ b/main/source/stlport/test/regression/seek.res
@@ -0,0 +1,20 @@
+First pass:
+this
+is
+a
+test
+First pass done
+Second pass:
+this
+is
+a
+test
+Second pass done
+0 1 2 3 4 6 7 8 10 11 13 14 15 16 17 
+Third pass:
+this
+is
+a
+test
+Third pass done
+Test passed
diff --git a/main/source/stlport/test/regression/seek.txt b/main/source/stlport/test/regression/seek.txt
new file mode 100644
index 00000000..12678c45
--- /dev/null
+++ b/main/source/stlport/test/regression/seek.txt
@@ -0,0 +1,4 @@
+this
+is
+a
+test
diff --git a/main/source/stlport/test/regression/set1.cpp b/main/source/stlport/test/regression/set1.cpp
new file mode 100644
index 00000000..b8917328
--- /dev/null
+++ b/main/source/stlport/test/regression/set1.cpp
@@ -0,0 +1,27 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <set>
+
+#ifdef MAIN 
+#define set1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int set1_test(int, char**)
+{
+  cout<<"Results of set1_test:"<<endl;
+  set<int, less<int> > s;
+  cout << "count(42) = " << s.count(42) << endl;
+  s.insert(42);
+  cout << "count(42) = " << s.count(42) << endl;
+  s.insert(42);
+  cout << "count(42) = " << s.count(42) << endl;
+  int count = s.erase(42);
+  cout << count << " elements erased" << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/set2.cpp b/main/source/stlport/test/regression/set2.cpp
new file mode 100644
index 00000000..e33f09d5
--- /dev/null
+++ b/main/source/stlport/test/regression/set2.cpp
@@ -0,0 +1,30 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <set>
+
+#ifdef MAIN 
+#define set2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int set2_test(int, char**)
+{
+  cout<<"Results of set2_test:"<<endl;
+  set<int, less<int> > s;
+  pair<std::set<int, less<int> >::const_iterator, bool> p = s.insert(42);
+  if(p.second)
+   cout << "Inserted new element " << *(p.first) << endl;
+  else
+   cout << "Existing element = " << *(p.first) << endl;
+  p = s.insert(42);
+  if(p.second)
+   cout << "Inserted new element " << *(p.first) << endl;
+  else
+   cout << "Existing element = " << *(p.first) << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/setdiff0.cpp b/main/source/stlport/test/regression/setdiff0.cpp
new file mode 100644
index 00000000..0b073eb2
--- /dev/null
+++ b/main/source/stlport/test/regression/setdiff0.cpp
@@ -0,0 +1,31 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define setdiff0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int setdiff0_test(int, char**)
+{
+  cout<<"Results of setdiff0_test:"<<endl;
+int v1[3] = { 13, 18, 23 };
+int v2[4] = { 10, 13, 17, 23 };
+int result[4] = { 0, 0, 0, 0 };
+
+  set_difference((int*)v1, (int*)v1 + 3, (int*)v2, (int*)v2 + 4, (int*)result);
+  int i;
+  for(i = 0; i < 4; i++)
+    cout << result[i] << ' ';
+  cout << endl;
+  set_difference((int*)v2, (int*)v2 + 4, (int*)v1, (int*)v1 + 2, (int*)result);
+  for(i = 0; i < 4; i++)
+    cout << result[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/setdiff1.cpp b/main/source/stlport/test/regression/setdiff1.cpp
new file mode 100644
index 00000000..3e8aec98
--- /dev/null
+++ b/main/source/stlport/test/regression/setdiff1.cpp
@@ -0,0 +1,35 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#include <iterator>
+
+#include <algorithm>
+#include <vector>
+#include <iostream>
+#include <iterator>
+// #include <functional>
+#include <numeric>
+
+#ifdef MAIN 
+#define setdiff1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int setdiff1_test(int, char**)
+{
+  cout<<"Results of setdiff1_test:"<<endl;
+  vector <int> v1(10);
+  iota(v1.begin(), v1.end(), 0);
+  vector <int> v2(10);
+  iota(v2.begin(), v2.end(), 7);
+  ostream_iterator <int> iter(cout, " ");
+  cout << "v1: ";
+  copy(v1.begin(), v1.end(), iter);
+  cout << "\nv2: ";
+  copy(v2.begin(), v2.end(), iter);
+  cout << endl;
+  set_difference(v1.begin(), v1.end(), v2.begin(), v2.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/setdiff2.cpp b/main/source/stlport/test/regression/setdiff2.cpp
new file mode 100644
index 00000000..6d0691c6
--- /dev/null
+++ b/main/source/stlport/test/regression/setdiff2.cpp
@@ -0,0 +1,35 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <cstring>
+#include <iterator>
+#include <functional>
+
+#ifdef MAIN 
+#define setdiff2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int setdiff2_test(int, char**)
+{
+  cout<<"Results of setdiff2_test:"<<endl;
+char* word1 = "ABCDEFGHIJKLMNO";
+char* word2 = "LMNOPQRSTUVWXYZ";
+
+  ostream_iterator <char> iter(cout, " ");
+  cout << "word1: ";
+  copy(word1, word1 + ::strlen(word1), iter);
+  cout << "\nword2: ";
+  copy(word2, word2 + ::strlen(word2), iter);
+  cout << endl;
+  set_difference(word1, word1 + ::strlen(word1),
+                  word2, word2 + ::strlen(word2),
+                  iter,
+                  less<char>());
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/setintr0.cpp b/main/source/stlport/test/regression/setintr0.cpp
new file mode 100644
index 00000000..a5d2c74d
--- /dev/null
+++ b/main/source/stlport/test/regression/setintr0.cpp
@@ -0,0 +1,26 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define setintr0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int setintr0_test(int, char**)
+{
+  cout<<"Results of setintr0_test:"<<endl;
+int v1[3] = { 13, 18, 23 };
+int v2[4] = { 10, 13, 17, 23 };
+int result[4] = { 0, 0, 0, 0 };
+
+  set_intersection((int*)v1, (int*)v1 + 3, (int*)v2, (int*)v2 + 4, (int*)result);
+  for(int i = 0; i < 4; i++)
+    cout << result[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/setintr1.cpp b/main/source/stlport/test/regression/setintr1.cpp
new file mode 100644
index 00000000..d503777a
--- /dev/null
+++ b/main/source/stlport/test/regression/setintr1.cpp
@@ -0,0 +1,35 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#include <iterator>
+
+#include <algorithm>
+#include <vector>
+#include <iostream>
+#include <iterator>
+// #include <functional>
+#include <numeric>
+
+#ifdef MAIN 
+#define setintr1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int setintr1_test(int, char**)
+{
+  cout<<"Results of setintr1_test:"<<endl;
+  vector <int> v1(10);
+  iota(v1.begin(), v1.end(), 0);
+  vector <int> v2(10);
+  iota(v2.begin(), v2.end(), 7);
+  ostream_iterator <int> iter(cout, " ");
+  cout << "v1: ";
+  copy(v1.begin(), v1.end(), iter);
+  cout << "\nv2: ";
+  copy(v2.begin(), v2.end(), iter);
+  cout << endl;
+  set_intersection(v1.begin(), v1.end(), v2.begin(), v2.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/setintr2.cpp b/main/source/stlport/test/regression/setintr2.cpp
new file mode 100644
index 00000000..919c7b80
--- /dev/null
+++ b/main/source/stlport/test/regression/setintr2.cpp
@@ -0,0 +1,35 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <cstring>
+#include <iterator>
+#include <functional>
+
+#ifdef MAIN 
+#define setintr2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int setintr2_test(int, char**)
+{
+  cout<<"Results of setintr2_test:"<<endl;
+char* word1 = "ABCDEFGHIJKLMNO";
+char* word2 = "LMNOPQRSTUVWXYZ";
+
+  ostream_iterator <char> iter(cout, " ");
+  cout << "word1: ";
+  copy(word1, word1 + ::strlen(word1), iter);
+  cout << "\nword2: ";
+  copy(word2, word2 + ::strlen(word2), iter);
+  cout << endl;
+  set_intersection(word1, word1 + ::strlen(word1),
+                    word2, word2 + ::strlen(word2),
+                    iter,
+                    less<char>());
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/setsymd0.cpp b/main/source/stlport/test/regression/setsymd0.cpp
new file mode 100644
index 00000000..c61fd8ca
--- /dev/null
+++ b/main/source/stlport/test/regression/setsymd0.cpp
@@ -0,0 +1,26 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define setsymd0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int setsymd0_test(int, char**)
+{
+  cout<<"Results of setsymd0_test:"<<endl;
+int v1[3] = { 13, 18, 23 };
+int v2[4] = { 10, 13, 17, 23 };
+int result[4] = { 0, 0, 0, 0 };
+
+  set_symmetric_difference((int*)v1, (int*)v1 + 3, (int*)v2, (int*)v2 + 4, (int*)result);
+  for(int i = 0; i < 4; i++)
+    cout << result[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/setsymd1.cpp b/main/source/stlport/test/regression/setsymd1.cpp
new file mode 100644
index 00000000..8d438414
--- /dev/null
+++ b/main/source/stlport/test/regression/setsymd1.cpp
@@ -0,0 +1,36 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#include <iterator>
+
+#include <algorithm>
+#include <vector>
+#include <iostream>
+#include <iterator>
+#include <numeric>
+// #include <functional>
+
+#ifdef MAIN 
+#define setsymd1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int setsymd1_test(int, char**)
+{
+  cout<<"Results of setsymd1_test:"<<endl;
+  vector <int> v1(10);
+  iota(v1.begin(), v1.end(), 0);
+  vector <int> v2(10);
+  iota(v2.begin(), v2.end(), 7);
+  ostream_iterator <int> iter(cout, " ");
+  cout << "v1: ";
+  copy(v1.begin(), v1.end(), iter);
+  cout << "\nv2: ";
+  copy(v2.begin(), v2.end(), iter);
+  cout << endl;
+  set_symmetric_difference(v1.begin(), v1.end(), 
+                           v2.begin(), v2.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/setsymd2.cpp b/main/source/stlport/test/regression/setsymd2.cpp
new file mode 100644
index 00000000..79f5529b
--- /dev/null
+++ b/main/source/stlport/test/regression/setsymd2.cpp
@@ -0,0 +1,35 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <cstring>
+#include <iterator>
+#include <functional>
+
+#ifdef MAIN 
+#define setsymd2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int setsymd2_test(int, char**)
+{
+  cout<<"Results of setsymd2_test:"<<endl;
+char* word1 = "ABCDEFGHIJKLMNO";
+char* word2 = "LMNOPQRSTUVWXYZ";
+
+  ostream_iterator <char> iter(cout, " ");
+  cout << "word1: ";
+  copy(word1, word1 + ::strlen(word1), iter);
+  cout << "\nword2: ";
+  copy(word2, word2 + ::strlen(word2), iter);
+  cout << endl;
+  set_symmetric_difference(word1, word1 + ::strlen(word1),
+                            word2, word2 + ::strlen(word2),
+                            iter,
+                            less<char>());
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/setunon0.cpp b/main/source/stlport/test/regression/setunon0.cpp
new file mode 100644
index 00000000..a9572936
--- /dev/null
+++ b/main/source/stlport/test/regression/setunon0.cpp
@@ -0,0 +1,26 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define setunon0_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int setunon0_test(int, char**)
+{
+  cout<<"Results of setunon0_test:"<<endl;
+int v1[3] = { 13, 18, 23 };
+int v2[4] = { 10, 13, 17, 23 };
+int result[7] = { 0, 0, 0, 0, 0, 0, 0 };
+
+  set_union((int*)v1, (int*)v1 + 3, (int*)v2, (int*)v2 + 4, (int*)result);
+  for(int i = 0; i < 7; i++)
+    cout << result[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/setunon1.cpp b/main/source/stlport/test/regression/setunon1.cpp
new file mode 100644
index 00000000..c58d2d82
--- /dev/null
+++ b/main/source/stlport/test/regression/setunon1.cpp
@@ -0,0 +1,35 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#include <iterator>
+
+#include <algorithm>
+#include <vector>
+#include <iostream>
+#include <iterator>
+// #include <functional>
+#include <numeric>
+
+#ifdef MAIN 
+#define setunon1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int setunon1_test(int, char**)
+{
+  cout<<"Results of setunon1_test:"<<endl;
+  vector <int> v1(10);
+  iota(v1.begin(), v1.end(), 0);
+  vector <int> v2(10);
+  iota(v2.begin(), v2.end(), 7);
+  ostream_iterator <int> iter(cout, " ");
+  cout << "v1: ";
+  copy(v1.begin(), v1.end(), iter);
+  cout << "\nv2: ";
+  copy(v2.begin(), v2.end(), iter);
+  cout << endl;
+  set_union(v1.begin(), v1.end(), v2.begin(), v2.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/setunon2.cpp b/main/source/stlport/test/regression/setunon2.cpp
new file mode 100644
index 00000000..91f20a66
--- /dev/null
+++ b/main/source/stlport/test/regression/setunon2.cpp
@@ -0,0 +1,35 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <cstring>
+#include <iterator>
+#include <functional>
+
+#ifdef MAIN 
+#define setunon2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int setunon2_test(int, char**)
+{
+  cout<<"Results of setunon2_test:"<<endl;
+char* word1 = "ABCDEFGHIJKLMNO";
+char* word2 = "LMNOPQRSTUVWXYZ";
+
+  ostream_iterator <char> iter(cout, " ");
+  cout << "word1: ";
+  copy(word1, word1 + ::strlen(word1), iter);
+  cout << "\nword2: ";
+  copy(word2, word2 + ::strlen(word2), iter);
+  cout << endl;
+  set_union(word1, word1 + ::strlen(word1),
+             word2, word2 + ::strlen(word2),
+             iter,
+             less<char>());
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/sgi_mipspro.mak b/main/source/stlport/test/regression/sgi_mipspro.mak
new file mode 100644
index 00000000..f6488806
--- /dev/null
+++ b/main/source/stlport/test/regression/sgi_mipspro.mak
@@ -0,0 +1,270 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+.POSIX:
+
+srcdir = .
+VPATH = .
+
+# point this to proper location
+STL_INCL=-I${PWD}/../../stlport/
+
+LIST  = stl_test.cpp accum1.cpp accum2.cpp \
+	adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp \
+	advance.cpp \
+	alg1.cpp alg2.cpp alg3.cpp alg4.cpp alg5.cpp \
+	bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp \
+	bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp \
+	binsrch1.cpp binsrch2.cpp \
+	bnegate1.cpp bnegate2.cpp bvec1.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp \
+	copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp \
+	countif1.cpp \
+	deque1.cpp \
+	divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp \
+	equal0.cpp equal1.cpp equal2.cpp \
+	equalto.cpp \
+	fill1.cpp filln1.cpp \
+	find0.cpp find1.cpp \
+	findif0.cpp findif1.cpp \
+	finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp \
+	func1.cpp func2.cpp func3.cpp \
+	gener1.cpp gener2.cpp \
+	genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp \
+	incl0.cpp incl1.cpp incl2.cpp \
+	inplmrg1.cpp inplmrg2.cpp \
+	inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp \
+	iota1.cpp \
+	istmit1.cpp \
+	iter1.cpp iter2.cpp iter3.cpp iter4.cpp \
+	iterswp0.cpp iterswp1.cpp \
+	less.cpp \
+	lesseq.cpp \
+	lexcmp1.cpp lexcmp2.cpp \
+	list1.cpp list2.cpp list3.cpp list4.cpp \
+	logicand.cpp logicnot.cpp \
+	logicor.cpp \
+	lwrbnd1.cpp lwrbnd2.cpp \
+	map1.cpp \
+	max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp \
+	memfunptr.cpp \
+	merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp \
+	minelem1.cpp minelem2.cpp \
+	minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp \
+	mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp \
+	modulus.cpp \
+	mset1.cpp mset3.cpp mset4.cpp mset5.cpp \
+	negate.cpp nequal.cpp \
+	nextprm0.cpp nextprm1.cpp nextprm2.cpp \
+	nthelem0.cpp nthelem1.cpp nthelem2.cpp \
+	ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp \
+	parsrt0.cpp parsrt1.cpp parsrt2.cpp \
+	parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp \
+	partsum0.cpp partsum1.cpp partsum2.cpp \
+	pheap1.cpp pheap2.cpp \
+	plus.cpp \
+	pqueue1.cpp \
+	prevprm0.cpp prevprm1.cpp prevprm2.cpp \
+	ptition0.cpp ptition1.cpp \
+	ptrbinf1.cpp ptrbinf2.cpp \
+	ptrunf1.cpp ptrunf2.cpp \
+	queue1.cpp \
+	rawiter.cpp \
+	remcopy1.cpp \
+	remcpif1.cpp \
+	remif1.cpp \
+	remove1.cpp \
+	repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp \
+	revbit1.cpp revbit2.cpp \
+	revcopy1.cpp reverse1.cpp reviter1.cpp reviter2.cpp \
+	rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp \
+	search0.cpp search1.cpp search2.cpp \
+	set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp \
+	setintr0.cpp setintr1.cpp setintr2.cpp \
+	setsymd0.cpp setsymd1.cpp setsymd2.cpp \
+	setunon0.cpp setunon1.cpp setunon2.cpp \
+	sort1.cpp sort2.cpp \
+	stack1.cpp stack2.cpp \
+	stblptn0.cpp stblptn1.cpp \
+	stblsrt1.cpp stblsrt2.cpp \
+	swap1.cpp \
+	swprnge1.cpp \
+	times.cpp \
+	trnsfrm1.cpp trnsfrm2.cpp \
+	ucompos1.cpp ucompos2.cpp \
+	unegate1.cpp unegate2.cpp \
+	uniqcpy1.cpp uniqcpy2.cpp \
+	unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp \
+	vec1.cpp vec2.cpp vec3.cpp vec4.cpp vec5.cpp vec6.cpp vec7.cpp vec8.cpp \
+        hmap1.cpp hmmap1.cpp hset2.cpp hmset1.cpp slist1.cpp string1.cpp bitset1.cpp
+
+OBJECTS  = stl_test.o accum1.o accum2.o \
+	adjdiff0.o adjdiff1.o adjdiff2.o \
+	adjfind0.o adjfind1.o adjfind2.o \
+	advance.o \
+	alg1.o alg2.o alg3.o alg4.o alg5.o \
+	bcompos1.o bcompos2.o \
+	bind1st1.o bind1st2.o \
+	bind2nd1.o bind2nd2.o \
+	binsert1.o binsert2.o \
+	binsrch1.o binsrch2.o \
+	bnegate1.o bnegate2.o bvec1.o \
+	copy1.o copy2.o copy3.o copy4.o \
+	copyb.o copyb0.o \
+	count0.o count1.o \
+	countif1.o \
+	deque1.o \
+	divides.o \
+	eqlrnge0.o eqlrnge1.o eqlrnge2.o \
+	equal0.o equal1.o equal2.o \
+	equalto.o \
+	fill1.o filln1.o \
+	find0.o find1.o \
+	findif0.o findif1.o \
+	finsert1.o finsert2.o \
+	foreach0.o foreach1.o \
+	func1.o func2.o func3.o \
+	gener1.o gener2.o \
+	genern1.o genern2.o \
+	greateq.o greater.o \
+	incl0.o incl1.o incl2.o \
+	inplmrg1.o inplmrg2.o \
+	inrprod0.o inrprod1.o inrprod2.o \
+	insert1.o insert2.o \
+	iota1.o \
+	istmit1.o \
+	iter1.o iter2.o iter3.o iter4.o \
+	iterswp0.o iterswp1.o \
+	less.o \
+	lesseq.o \
+	lexcmp1.o lexcmp2.o \
+	list1.o list2.o list3.o list4.o \
+	logicand.o logicnot.o \
+	logicor.o \
+	lwrbnd1.o lwrbnd2.o \
+	map1.o \
+	max1.o max2.o \
+	maxelem1.o maxelem2.o \
+	merge0.o merge1.o merge2.o \
+	min1.o min2.o \
+	minelem1.o minelem2.o \
+	minus.o \
+	mismtch0.o mismtch1.o mismtch2.o \
+	mkheap0.o mkheap1.o \
+	mmap1.o mmap2.o \
+	modulus.o \
+	mset1.o mset3.o mset4.o mset5.o \
+	negate.o nequal.o \
+	nextprm0.o nextprm1.o nextprm2.o \
+	nthelem0.o nthelem1.o nthelem2.o \
+	ostmit.o \
+	pair0.o pair1.o pair2.o \
+	parsrt0.o parsrt1.o parsrt2.o \
+	parsrtc0.o parsrtc1.o parsrtc2.o \
+	partsrt0.o \
+	partsum0.o partsum1.o partsum2.o \
+	pheap1.o pheap2.o \
+	plus.o \
+	pqueue1.o \
+	prevprm0.o prevprm1.o prevprm2.o \
+	ptition0.o ptition1.o \
+	ptrbinf1.o ptrbinf2.o \
+	ptrunf1.o ptrunf2.o \
+	queue1.o \
+	rawiter.o \
+	remcopy1.o \
+	remcpif1.o \
+	remif1.o \
+	remove1.o \
+	repcpif1.o \
+	replace0.o replace1.o replcpy1.o replif1.o \
+	revbit1.o revbit2.o \
+	revcopy1.o reverse1.o reviter1.o reviter2.o \
+	rndshuf0.o rndshuf1.o rndshuf2.o \
+	rotate0.o rotate1.o rotcopy0.o rotcopy1.o \
+	search0.o search1.o search2.o \
+	set1.o set2.o \
+	setdiff0.o setdiff1.o setdiff2.o \
+	setintr0.o setintr1.o setintr2.o \
+	setsymd0.o setsymd1.o setsymd2.o \
+	setunon0.o setunon1.o setunon2.o \
+	sort1.o sort2.o \
+	stack1.o stack2.o \
+	stblptn0.o stblptn1.o \
+	stblsrt1.o stblsrt2.o \
+	swap1.o \
+	swprnge1.o \
+	times.o \
+	trnsfrm1.o trnsfrm2.o \
+	ucompos1.o ucompos2.o \
+	unegate1.o unegate2.o \
+	uniqcpy1.o uniqcpy2.o \
+	unique1.o unique2.o \
+	uprbnd1.o uprbnd2.o \
+	vec1.o vec2.o vec3.o vec4.o vec5.o vec6.o vec7.o vec8.o \
+        hmap1.o hmmap1.o hset2.o hmset1.o string1.o bitset1.o slist1.o
+
+EXECS = $(LIST:%.cpp=%.exe)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CC = CC
+CXX = $(CC)
+
+CXXFLAGS = -J 4 -ansi -LANG:std -I. -D_STLP_DEBUG ${STL_INCL} ${DEBUG_FLAGS} -I. -D_STLP_NO_OWN_IOSTREAMS -D_STLP_NO_NEW_IOSTREAMS
+CXXFLAGS = -J 4 -ansi -LANG:std -I. -D_STLP_DEBUG ${STL_INCL} ${DEBUG_FLAGS} -I. -D_STLP_NO_OWN_IOSTREAMS
+
+
+LIBS = -lm 
+LIBSTDCXX = 
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(DEBUG_FLAGS) $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	echo 'a string' | ./$(TEST_EXE) > $(TEST)
+
+.SUFFIXES: .cpp .o .exe .out .res
+
+.cpp.o:
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+.cpp.out:
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) -g -o $*.exe
+	./$*.exe > $@
+	-rm -f $*.exe
+
+istmit1.out: istmit1.cpp
+	$(CXX) $(CXXFLAGS) $< $(STAT_MODULE) $(LIBSTDCXX) -lstdc++ $(LIBS) -o istmit1
+	echo 'a string' | ./istmit1 > istmit1.out
+	-rm -f ./istmit1
+
+.cpp.s:
+	$(CXX) $(CXXFLAGS) -O5 -D_STLP_USE_MALLOC -S -pto $<  -o $@
+
+#	$(CXX) $(CXXFLAGS) -O5 -D_STLP_USE_MALLOC -noex -D_STLP_NO_EXCEPTIONS -S -pto $<  -o $@
+
+#	$(CXX) $(CXXFLAGS) -O4 -noex -D_STLP_NO_EXCEPTIONS -D_STLP_NO_EXCEPTIONS -S -pta $<  -o $@
+
+clean:
+	-rm -fr *.exe *.o *.rpo *.obj *.out Templates.DB SunWS_cache
diff --git a/main/source/stlport/test/regression/single.cpp b/main/source/stlport/test/regression/single.cpp
new file mode 100644
index 00000000..ad61b3f5
--- /dev/null
+++ b/main/source/stlport/test/regression/single.cpp
@@ -0,0 +1,475 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#include "stl_test.h"
+#include "accum1.cpp"
+#include "accum2.cpp"
+#include "adjdiff0.cpp"
+#include "adjdiff1.cpp"
+#include "adjdiff2.cpp"
+#include "adjfind0.cpp"
+#include "adjfind1.cpp"
+#include "adjfind2.cpp"
+#include "advance.cpp"
+#include "alg1.cpp"
+#include "alg2.cpp"
+#include "alg3.cpp"
+#include "alg4.cpp"
+#include "alg5.cpp"
+#include "bcompos1.cpp"
+#include "bcompos2.cpp"
+#include "bind1st1.cpp"
+#include "bind1st2.cpp"
+#include "bind2nd1.cpp"
+#include "bind2nd2.cpp"
+#include "binsert1.cpp"
+#include "binsert2.cpp"
+#include "binsrch1.cpp"
+#include "binsrch2.cpp"
+#include "bnegate1.cpp"
+#include "bnegate2.cpp"
+#include "bvec1.cpp"
+#include "copy1.cpp"
+#include "copy2.cpp"
+#include "copy3.cpp"
+#include "copy4.cpp"
+#include "copyb.cpp"
+#include "copyb0.cpp"
+#include "count0.cpp"
+#include "count1.cpp"
+#include "countif1.cpp"
+#include "deque1.cpp"
+#include "divides.cpp"
+#include "eqlrnge0.cpp"
+#include "eqlrnge1.cpp"
+#include "eqlrnge2.cpp"
+#include "equal0.cpp"
+#include "equal1.cpp"
+#include "equal2.cpp"
+#include "equalto.cpp"
+#include "error1.cpp"
+#include "fill1.cpp"
+#include "filln1.cpp"
+#include "find0.cpp"
+#include "find1.cpp"
+#include "findif0.cpp"
+#include "findif1.cpp"
+#include "finsert1.cpp"
+#include "finsert2.cpp"
+#include "foreach0.cpp"
+#include "foreach1.cpp"
+#include "func1.cpp"
+#include "func2.cpp"
+#include "func3.cpp"
+#include "gener1.cpp"
+#include "gener2.cpp"
+#include "genern1.cpp"
+#include "genern2.cpp"
+#include "greateq.cpp"
+#include "greater.cpp"
+#include "incl0.cpp"
+#include "incl1.cpp"
+#include "incl2.cpp"
+#include "inplmrg1.cpp"
+#include "inplmrg2.cpp"
+#include "inrprod0.cpp"
+#include "inrprod1.cpp"
+#include "inrprod2.cpp"
+#include "insert1.cpp"
+#include "insert2.cpp"
+#include "iota1.cpp"
+#include "istmit1.cpp"
+#include "iter1.cpp"
+#include "iter2.cpp"
+#include "iter3.cpp"
+#include "iter4.cpp"
+#include "iterswp0.cpp"
+#include "iterswp1.cpp"
+#include "less.cpp"
+#include "lesseq.cpp"
+#include "lexcmp1.cpp"
+#include "lexcmp2.cpp"
+#include "list1.cpp"
+#include "list2.cpp"
+#include "list3.cpp"
+#include "list4.cpp"
+#include "logicand.cpp"
+#include "logicnot.cpp"
+#include "logicor.cpp"
+#include "lwrbnd1.cpp"
+#include "lwrbnd2.cpp"
+#include "map1.cpp"
+#include "max1.cpp"
+#include "max2.cpp"
+#include "maxelem1.cpp"
+#include "maxelem2.cpp"
+#include "merge0.cpp"
+#include "merge1.cpp"
+#include "merge2.cpp"
+#include "min1.cpp"
+#include "min2.cpp"
+#include "minelem1.cpp"
+#include "minelem2.cpp"
+#include "minus.cpp"
+#include "mismtch0.cpp"
+#include "mismtch1.cpp"
+#include "mismtch2.cpp"
+#include "mkheap0.cpp"
+#include "mkheap1.cpp"
+#include "mmap1.cpp"
+#include "mmap2.cpp"
+#include "modulus.cpp"
+#include "mset1.cpp"
+#include "mset3.cpp"
+#include "mset4.cpp"
+#include "mset5.cpp"
+#include "negate.cpp"
+#include "nequal.cpp"
+#include "nextprm0.cpp"
+#include "nextprm1.cpp"
+#include "nextprm2.cpp"
+#include "nthelem0.cpp"
+#include "nthelem1.cpp"
+#include "nthelem2.cpp"
+#include "ostmit.cpp"
+#include "pair0.cpp"
+#include "pair1.cpp"
+#include "pair2.cpp"
+#include "parsrt0.cpp"
+#include "parsrt1.cpp"
+#include "parsrt2.cpp"
+#include "parsrtc0.cpp"
+#include "parsrtc1.cpp"
+#include "parsrtc2.cpp"
+#include "partsrt0.cpp"
+#include "partsum0.cpp"
+#include "partsum1.cpp"
+#include "partsum2.cpp"
+#include "pheap1.cpp"
+#include "pheap2.cpp"
+#include "plus.cpp"
+#include "pqueue1.cpp"
+#include "prevprm0.cpp"
+#include "prevprm1.cpp"
+#include "prevprm2.cpp"
+#include "ptition0.cpp"
+#include "ptition1.cpp"
+#include "ptrbinf1.cpp"
+#include "ptrbinf2.cpp"
+#include "ptrunf1.cpp"
+#include "ptrunf2.cpp"
+#include "queue1.cpp"
+#include "rawiter.cpp"
+#include "remcopy1.cpp"
+#include "remcpif1.cpp"
+#include "remif1.cpp"
+#include "remove1.cpp"
+#include "repcpif1.cpp"
+#include "replace0.cpp"
+#include "replace1.cpp"
+#include "replcpy1.cpp"
+#include "replif1.cpp"
+#include "revbit1.cpp"
+#include "revbit2.cpp"
+#include "revcopy1.cpp"
+#include "reverse1.cpp"
+#include "reviter1.cpp"
+#include "reviter2.cpp"
+#include "rndshuf0.cpp"
+#include "rndshuf1.cpp"
+#include "rndshuf2.cpp"
+#include "rotate0.cpp"
+#include "rotate1.cpp"
+#include "rotcopy0.cpp"
+#include "rotcopy1.cpp"
+#include "search0.cpp"
+#include "search1.cpp"
+#include "search2.cpp"
+#include "set1.cpp"
+#include "set2.cpp"
+#include "setdiff0.cpp"
+#include "setdiff1.cpp"
+#include "setdiff2.cpp"
+#include "setintr0.cpp"
+#include "setintr1.cpp"
+#include "setintr2.cpp"
+#include "setsymd0.cpp"
+#include "setsymd1.cpp"
+#include "setsymd2.cpp"
+#include "setunon0.cpp"
+#include "setunon1.cpp"
+#include "setunon2.cpp"
+#include "single.cpp"
+#include "sort1.cpp"
+#include "sort2.cpp"
+#include "stack1.cpp"
+#include "stack2.cpp"
+#include "stat.cpp"
+#include "stblptn0.cpp"
+#include "stblptn1.cpp"
+#include "stblsrt1.cpp"
+#include "stblsrt2.cpp"
+#include "swap1.cpp"
+#include "swprnge1.cpp"
+#include "times.cpp"
+#include "trnsfrm1.cpp"
+#include "trnsfrm2.cpp"
+#include "ucompos1.cpp"
+#include "ucompos2.cpp"
+#include "unegate1.cpp"
+#include "unegate2.cpp"
+#include "uniqcpy1.cpp"
+#include "uniqcpy2.cpp"
+#include "unique1.cpp"
+#include "unique2.cpp"
+#include "uprbnd1.cpp"
+#include "uprbnd2.cpp"
+#include "vec1.cpp"
+#include "vec2.cpp"
+#include "vec3.cpp"
+#include "vec4.cpp"
+#include "vec5.cpp"
+#include "vec6.cpp"
+#include "vec7.cpp"
+#include "vec8.cpp"
+#include "stl_test.h"
+#ifdef MAIN 
+#define single_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int single_test(int, char**)
+{
+  cout<<"Results of single_test:"<<endl;
+int main(int argc, char** argv) {
+accum1_test(argc, argv);
+accum2_test(argc, argv);
+adjdiff0_test(argc, argv);
+adjdiff1_test(argc, argv);
+adjdiff2_test(argc, argv);
+adjfind0_test(argc, argv);
+adjfind1_test(argc, argv);
+adjfind2_test(argc, argv);
+advance_test(argc, argv);
+alg1_test(argc, argv);
+alg2_test(argc, argv);
+alg3_test(argc, argv);
+alg4_test(argc, argv);
+alg5_test(argc, argv);
+bcompos1_test(argc, argv);
+bcompos2_test(argc, argv);
+bind1st1_test(argc, argv);
+bind1st2_test(argc, argv);
+bind2nd1_test(argc, argv);
+bind2nd2_test(argc, argv);
+binsert1_test(argc, argv);
+binsert2_test(argc, argv);
+binsrch1_test(argc, argv);
+binsrch2_test(argc, argv);
+bnegate1_test(argc, argv);
+bnegate2_test(argc, argv);
+bvec1_test(argc, argv);
+copy1_test(argc, argv);
+copy2_test(argc, argv);
+copy3_test(argc, argv);
+copy4_test(argc, argv);
+copyb_test(argc, argv);
+copyb0_test(argc, argv);
+count0_test(argc, argv);
+count1_test(argc, argv);
+countif1_test(argc, argv);
+deque1_test(argc, argv);
+divides_test(argc, argv);
+eqlrnge0_test(argc, argv);
+eqlrnge1_test(argc, argv);
+eqlrnge2_test(argc, argv);
+equal0_test(argc, argv);
+equal1_test(argc, argv);
+equal2_test(argc, argv);
+equalto_test(argc, argv);
+error1_test(argc, argv);
+fill1_test(argc, argv);
+filln1_test(argc, argv);
+find0_test(argc, argv);
+find1_test(argc, argv);
+findif0_test(argc, argv);
+findif1_test(argc, argv);
+finsert1_test(argc, argv);
+finsert2_test(argc, argv);
+foreach0_test(argc, argv);
+foreach1_test(argc, argv);
+func1_test(argc, argv);
+func2_test(argc, argv);
+func3_test(argc, argv);
+gener1_test(argc, argv);
+gener2_test(argc, argv);
+genern1_test(argc, argv);
+genern2_test(argc, argv);
+greateq_test(argc, argv);
+greater_test(argc, argv);
+incl0_test(argc, argv);
+incl1_test(argc, argv);
+incl2_test(argc, argv);
+inplmrg1_test(argc, argv);
+inplmrg2_test(argc, argv);
+inrprod0_test(argc, argv);
+inrprod1_test(argc, argv);
+inrprod2_test(argc, argv);
+insert1_test(argc, argv);
+insert2_test(argc, argv);
+iota1_test(argc, argv);
+istmit1_test(argc, argv);
+iter1_test(argc, argv);
+iter2_test(argc, argv);
+iter3_test(argc, argv);
+iter4_test(argc, argv);
+iterswp0_test(argc, argv);
+iterswp1_test(argc, argv);
+less_test(argc, argv);
+lesseq_test(argc, argv);
+lexcmp1_test(argc, argv);
+lexcmp2_test(argc, argv);
+list1_test(argc, argv);
+list2_test(argc, argv);
+list3_test(argc, argv);
+list4_test(argc, argv);
+logicand_test(argc, argv);
+logicnot_test(argc, argv);
+logicor_test(argc, argv);
+lwrbnd1_test(argc, argv);
+lwrbnd2_test(argc, argv);
+map1_test(argc, argv);
+max1_test(argc, argv);
+max2_test(argc, argv);
+maxelem1_test(argc, argv);
+maxelem2_test(argc, argv);
+merge0_test(argc, argv);
+merge1_test(argc, argv);
+merge2_test(argc, argv);
+min1_test(argc, argv);
+min2_test(argc, argv);
+minelem1_test(argc, argv);
+minelem2_test(argc, argv);
+minus_test(argc, argv);
+mismtch0_test(argc, argv);
+mismtch1_test(argc, argv);
+mismtch2_test(argc, argv);
+mkheap0_test(argc, argv);
+mkheap1_test(argc, argv);
+mmap1_test(argc, argv);
+mmap2_test(argc, argv);
+modulus_test(argc, argv);
+mset1_test(argc, argv);
+mset3_test(argc, argv);
+mset4_test(argc, argv);
+mset5_test(argc, argv);
+negate_test(argc, argv);
+nequal_test(argc, argv);
+nextprm0_test(argc, argv);
+nextprm1_test(argc, argv);
+nextprm2_test(argc, argv);
+nthelem0_test(argc, argv);
+nthelem1_test(argc, argv);
+nthelem2_test(argc, argv);
+ostmit_test(argc, argv);
+pair0_test(argc, argv);
+pair1_test(argc, argv);
+pair2_test(argc, argv);
+parsrt0_test(argc, argv);
+parsrt1_test(argc, argv);
+parsrt2_test(argc, argv);
+parsrtc0_test(argc, argv);
+parsrtc1_test(argc, argv);
+parsrtc2_test(argc, argv);
+partsrt0_test(argc, argv);
+partsum0_test(argc, argv);
+partsum1_test(argc, argv);
+partsum2_test(argc, argv);
+pheap1_test(argc, argv);
+pheap2_test(argc, argv);
+plus_test(argc, argv);
+pqueue1_test(argc, argv);
+prevprm0_test(argc, argv);
+prevprm1_test(argc, argv);
+prevprm2_test(argc, argv);
+ptition0_test(argc, argv);
+ptition1_test(argc, argv);
+ptrbinf1_test(argc, argv);
+ptrbinf2_test(argc, argv);
+ptrunf1_test(argc, argv);
+ptrunf2_test(argc, argv);
+queue1_test(argc, argv);
+rawiter_test(argc, argv);
+remcopy1_test(argc, argv);
+remcpif1_test(argc, argv);
+remif1_test(argc, argv);
+remove1_test(argc, argv);
+repcpif1_test(argc, argv);
+replace0_test(argc, argv);
+replace1_test(argc, argv);
+replcpy1_test(argc, argv);
+replif1_test(argc, argv);
+revbit1_test(argc, argv);
+revbit2_test(argc, argv);
+revcopy1_test(argc, argv);
+reverse1_test(argc, argv);
+reviter1_test(argc, argv);
+reviter2_test(argc, argv);
+rndshuf0_test(argc, argv);
+rndshuf1_test(argc, argv);
+rndshuf2_test(argc, argv);
+rotate0_test(argc, argv);
+rotate1_test(argc, argv);
+rotcopy0_test(argc, argv);
+rotcopy1_test(argc, argv);
+search0_test(argc, argv);
+search1_test(argc, argv);
+search2_test(argc, argv);
+set1_test(argc, argv);
+set2_test(argc, argv);
+setdiff0_test(argc, argv);
+setdiff1_test(argc, argv);
+setdiff2_test(argc, argv);
+setintr0_test(argc, argv);
+setintr1_test(argc, argv);
+setintr2_test(argc, argv);
+setsymd0_test(argc, argv);
+setsymd1_test(argc, argv);
+setsymd2_test(argc, argv);
+setunon0_test(argc, argv);
+setunon1_test(argc, argv);
+setunon2_test(argc, argv);
+sort1_test(argc, argv);
+sort2_test(argc, argv);
+stack1_test(argc, argv);
+stack2_test(argc, argv);
+stat_test(argc, argv);
+stblptn0_test(argc, argv);
+stblptn1_test(argc, argv);
+stblsrt1_test(argc, argv);
+stblsrt2_test(argc, argv);
+swap1_test(argc, argv);
+swprnge1_test(argc, argv);
+times_test(argc, argv);
+trnsfrm1_test(argc, argv);
+trnsfrm2_test(argc, argv);
+ucompos1_test(argc, argv);
+ucompos2_test(argc, argv);
+unegate1_test(argc, argv);
+unegate2_test(argc, argv);
+uniqcpy1_test(argc, argv);
+uniqcpy2_test(argc, argv);
+unique1_test(argc, argv);
+unique2_test(argc, argv);
+uprbnd1_test(argc, argv);
+uprbnd2_test(argc, argv);
+vec1_test(argc, argv);
+vec2_test(argc, argv);
+vec3_test(argc, argv);
+vec4_test(argc, argv);
+vec5_test(argc, argv);
+vec6_test(argc, argv);
+vec7_test(argc, argv);
+vec8_test(argc, argv);
+}
diff --git a/main/source/stlport/test/regression/slist1.cpp b/main/source/stlport/test/regression/slist1.cpp
new file mode 100644
index 00000000..9d20799d
--- /dev/null
+++ b/main/source/stlport/test/regression/slist1.cpp
@@ -0,0 +1,47 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <slist>
+#include <iterator>
+
+#ifdef MAIN 
+#define slist1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+int slist1_test(int, char**)
+{
+  cout<<"Results of slist1_test:"<<endl;
+char array [] = { 'x', 'l', 'x', 't', 's', 's' };
+  ostream_iterator<char> o(cout,"");
+  slist<char> str(array+0, array + 6);
+  std::slist<char>::iterator i;
+  cout << "original: ";
+  copy(str.begin(), str.end(),o);
+  cout << endl;
+  cout << "reversed: ";
+  str.reverse();
+  for(i = str.begin(); i != str.end(); i++)
+    cout << *i;
+  cout << endl;
+  cout << "removed: ";
+  str.remove('x');
+  for(i = str.begin(); i != str.end(); i++)
+    cout << *i;
+  cout << endl;
+  cout << "uniqued: ";
+  str.unique();
+  for(i = str.begin(); i != str.end(); i++)
+    cout << *i;
+  cout << endl;
+  cout << "sorted: ";
+  str.sort();
+  for(i = str.begin(); i != str.end(); i++)
+    cout << *i;
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/sort1.cpp b/main/source/stlport/test/regression/sort1.cpp
new file mode 100644
index 00000000..829b7297
--- /dev/null
+++ b/main/source/stlport/test/regression/sort1.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define sort1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int sort1_test(int, char**)
+{
+  cout<<"Results of sort1_test:"<<endl;
+int array[6] = { 1, 50, -10, 11, 42, 19 };
+
+  sort(array, array + 6);
+  for(int i = 0; i < 6; i++)
+    cout << array[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/sort2.cpp b/main/source/stlport/test/regression/sort2.cpp
new file mode 100644
index 00000000..2df43a4a
--- /dev/null
+++ b/main/source/stlport/test/regression/sort2.cpp
@@ -0,0 +1,30 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <iterator>
+#include <functional>
+
+#ifdef MAIN 
+#define sort2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int sort2_test(int, char**)
+{
+  cout<<"Results of sort2_test:"<<endl;
+int array[] = { 1, 50, -10, 11, 42, 19 };
+
+  int count = sizeof(array) / sizeof(array[0]);
+  ostream_iterator <int> iter(cout, " ");
+  cout << "before: ";
+  copy(array, array + count, iter);
+  cout << "\nafter: ";
+  sort(array, array + count, greater<int>());
+  copy(array, array + count, iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/sstream1.cpp b/main/source/stlport/test/regression/sstream1.cpp
new file mode 100644
index 00000000..8afb0f24
--- /dev/null
+++ b/main/source/stlport/test/regression/sstream1.cpp
@@ -0,0 +1,45 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <sstream>
+#include <cassert>
+
+#ifdef MAIN 
+#define sstream1_test main
+#endif
+
+int sstream1_test(int, char**)
+{
+    
+    std::istringstream iss;
+	int x[9];
+	std::fill_n(x, 9, 999);
+	iss.str(std::string("0-0+0 010-010+010 0x1-0x1+0x1"));
+	iss >> std::hex;
+	iss >> x[0] >> x[1] >> x[2] >> x[3] >> x[4] >> x[5] >> x[6] >> x[7] >> x[8];
+	assert(x[0] == 0x0);
+	assert(x[1] == -0x0);
+	assert(x[2] == +0x0);
+	assert(x[3] == 0x010);
+	assert(x[4] == -0x010);
+	assert(x[5] == +0x010);
+	assert(x[6] == 0x1);
+	assert(x[7] == -0x1);
+	assert(x[8] == +0x1);
+	
+	iss.clear();
+	iss.str(std::string("0-0+0 010-010+010 0x1-0x1+0x1"));
+	iss.unsetf(std::ios_base::dec | std::ios_base::hex);
+	std::fill_n(x, 9, 999);
+	iss >> x[0] >> x[1] >> x[2] >> x[3] >> x[4] >> x[5] >> x[6] >> x[7] >> x[8];
+	assert(x[0] == 0);
+	assert(x[1] == -0);
+	assert(x[2] == +0);
+	assert(x[3] == 010);
+	assert(x[4] == -010);
+	assert(x[5] == +010);
+	assert(x[6] == 0x1);
+	assert(x[7] == -0x1);
+	assert(x[8] == +0x1);
+}
+
diff --git a/main/source/stlport/test/regression/stack1.cpp b/main/source/stlport/test/regression/stack1.cpp
new file mode 100644
index 00000000..9095d3d3
--- /dev/null
+++ b/main/source/stlport/test/regression/stack1.cpp
@@ -0,0 +1,31 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <queue>
+#include <deque>
+#include <stack>
+
+
+#ifdef MAIN 
+#define stack1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int stack1_test(int, char**)
+{
+  cout<<"Results of stack1_test:"<<endl;
+  stack<int, deque<int> > s;
+  s.push(42);
+  s.push(101);
+  s.push(69);
+  while(!s.empty())
+  {
+    cout << s.top() << endl;
+    s.pop();
+  }
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/stack2.cpp b/main/source/stlport/test/regression/stack2.cpp
new file mode 100644
index 00000000..2002bc5e
--- /dev/null
+++ b/main/source/stlport/test/regression/stack2.cpp
@@ -0,0 +1,30 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <queue>
+#include <list>
+#include <stack>
+
+#ifdef MAIN 
+#define stack2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int stack2_test(int, char**)
+{
+  cout<<"Results of stack2_test:"<<endl;
+  stack<int, list<int> > s;
+  s.push(42);
+  s.push(101);
+  s.push(69);
+  while(!s.empty())
+  {
+    cout << s.top() << endl;
+    s.pop();
+  }
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/stat.cpp b/main/source/stlport/test/regression/stat.cpp
new file mode 100644
index 00000000..58bece46
--- /dev/null
+++ b/main/source/stlport/test/regression/stat.cpp
@@ -0,0 +1,3 @@
+
+
+
diff --git a/main/source/stlport/test/regression/stblptn0.cpp b/main/source/stlport/test/regression/stblptn0.cpp
new file mode 100644
index 00000000..cc99e538
--- /dev/null
+++ b/main/source/stlport/test/regression/stblptn0.cpp
@@ -0,0 +1,30 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define stblptn0_test main
+#endif
+static bool less_10(int a_)
+{
+  return a_ < 10 ? 1 : 0;
+}
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int stblptn0_test(int, char**)
+{
+  cout<<"Results of stblptn0_test:"<<endl;
+
+int numbers[6] = { 10, 5, 11, 20, 6, -2 };
+
+  stable_partition((int*)numbers, (int*)numbers + 6, less_10);
+  for(int i = 0; i < 6; i++)
+    cout << numbers[i] << ' ';
+  cout << endl;
+  cout.flush();
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/stblptn1.cpp b/main/source/stlport/test/regression/stblptn1.cpp
new file mode 100644
index 00000000..94b4c3ee
--- /dev/null
+++ b/main/source/stlport/test/regression/stblptn1.cpp
@@ -0,0 +1,31 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <vector>
+#include <cstdlib>
+#include <iostream>
+#include <iterator>
+#include <functional>
+
+#ifdef MAIN 
+#define stblptn1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int stblptn1_test(int, char**)
+{
+  cout<<"Results of stblptn1_test:"<<endl;
+  vector <int> v1(10);
+  for(int i = 0; i < v1.size(); i++)
+    v1[i] = rand() % 20;
+  ostream_iterator <int> iter(cout, " ");
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  stable_partition(v1.begin(), v1.end(), bind2nd(less<int>(), 11));
+  copy(v1.begin(), v1.end(), iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/stblsrt1.cpp b/main/source/stlport/test/regression/stblsrt1.cpp
new file mode 100644
index 00000000..a81aa248
--- /dev/null
+++ b/main/source/stlport/test/regression/stblsrt1.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define stblsrt1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int stblsrt1_test(int, char**)
+{
+  cout<<"Results of stblsrt1_test:"<<endl;
+int array[6] = { 1, 50, -10, 11, 42, 19 };
+
+  stable_sort(array, array + 6);
+  for(int i = 0; i < 6; i++)
+    cout << array[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/stblsrt2.cpp b/main/source/stlport/test/regression/stblsrt2.cpp
new file mode 100644
index 00000000..50bda393
--- /dev/null
+++ b/main/source/stlport/test/regression/stblsrt2.cpp
@@ -0,0 +1,32 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <cstring>
+
+#ifdef MAIN 
+#define stblsrt2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+static bool string_less(const char* a_, const char* b_)
+{
+  return strcmp(a_, b_) < 0 ? 1 : 0;
+}
+
+int stblsrt2_test(int, char**)
+{
+  cout<<"Results of stblsrt2_test:"<<endl;
+
+char* letters[6] = {"bb", "aa", "ll", "dd", "qq", "cc" };
+
+  stable_sort(letters, letters + 6, string_less);
+  for(int i = 0; i < 6; i++)
+    cout << letters[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/stdin b/main/source/stlport/test/regression/stdin
new file mode 100644
index 00000000..d5fe2ead
--- /dev/null
+++ b/main/source/stlport/test/regression/stdin
@@ -0,0 +1 @@
+a string
diff --git a/main/source/stlport/test/regression/stl.h b/main/source/stlport/test/regression/stl.h
new file mode 100644
index 00000000..7b45685d
--- /dev/null
+++ b/main/source/stlport/test/regression/stl.h
@@ -0,0 +1,20 @@
+#include<algorithm>
+#include<numeric>
+#include<new>
+#include<deque>
+#include<functional>
+#include<hash_map>
+#include<hash_set>
+#include<iterator>
+#include<list>
+#include<map>
+#include<set>
+#include<stack>
+#include<vector>
+#include <slist>
+#ifndef __WATCOMC__
+#include <rope>
+#endif
+#ifdef TEST_PTHREAD
+#include<pthread_alloc>
+#endif
diff --git a/main/source/stlport/test/regression/stl_single.cpp b/main/source/stlport/test/regression/stl_single.cpp
new file mode 100644
index 00000000..49ef5023
--- /dev/null
+++ b/main/source/stlport/test/regression/stl_single.cpp
@@ -0,0 +1,235 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#define SINGLE
+#include "stl_test.h"
+#include "accum1.cpp"
+#include "accum2.cpp"
+#include "adjdiff0.cpp"
+#include "adjdiff1.cpp"
+#include "adjdiff2.cpp"
+#include "adjfind0.cpp"
+#include "adjfind1.cpp"
+#include "adjfind2.cpp"
+#include "advance.cpp"
+#include "alg1.cpp"
+#include "alg2.cpp"
+#include "alg3.cpp"
+#include "alg4.cpp"
+#include "alg5.cpp"
+#include "bcompos1.cpp"
+#include "bcompos2.cpp"
+#include "bind1st1.cpp"
+#include "bind1st2.cpp"
+#include "bind2nd1.cpp"
+#include "bind2nd2.cpp"
+#include "binsert1.cpp"
+#include "binsert2.cpp"
+#include "binsrch1.cpp"
+#include "binsrch2.cpp"
+#include "bnegate1.cpp"
+#include "bnegate2.cpp"
+#include "bvec1.cpp"
+#include "copy1.cpp"
+#include "copy2.cpp"
+#include "copy3.cpp"
+#include "copy4.cpp"
+#include "copyb.cpp"
+#include "copyb0.cpp"
+#include "count0.cpp"
+#include "count1.cpp"
+#include "countif1.cpp"
+#include "deque1.cpp"
+#include "divides.cpp"
+#include "eqlrnge0.cpp"
+#include "eqlrnge1.cpp"
+#include "eqlrnge2.cpp"
+#include "equal0.cpp"
+#include "equal1.cpp"
+#include "equal2.cpp"
+#include "equalto.cpp"
+#include "error1.cpp"
+#include "fill1.cpp"
+#include "filln1.cpp"
+#include "find0.cpp"
+#include "find1.cpp"
+#include "findif0.cpp"
+#include "findif1.cpp"
+#include "finsert1.cpp"
+#include "finsert2.cpp"
+#include "foreach0.cpp"
+#include "foreach1.cpp"
+#include "func1.cpp"
+#include "func2.cpp"
+#include "func3.cpp"
+#include "gener1.cpp"
+#include "gener2.cpp"
+#include "genern1.cpp"
+#include "genern2.cpp"
+#include "greateq.cpp"
+#include "greater.cpp"
+#include "incl0.cpp"
+#include "incl1.cpp"
+#include "incl2.cpp"
+#include "inplmrg1.cpp"
+#include "inplmrg2.cpp"
+#include "inrprod0.cpp"
+#include "inrprod1.cpp"
+#include "inrprod2.cpp"
+#include "insert1.cpp"
+#include "insert2.cpp"
+#include "iota1.cpp"
+#include "istmit1.cpp"
+#include "iter1.cpp"
+#include "iter2.cpp"
+#include "iter3.cpp"
+#include "iter4.cpp"
+#include "iterswp0.cpp"
+#include "iterswp1.cpp"
+#include "less.cpp"
+#include "lesseq.cpp"
+#include "lexcmp1.cpp"
+#include "lexcmp2.cpp"
+#include "list1.cpp"
+#include "list2.cpp"
+#include "list3.cpp"
+#include "list4.cpp"
+#include "logicand.cpp"
+#include "logicnot.cpp"
+#include "logicor.cpp"
+#include "lwrbnd1.cpp"
+#include "lwrbnd2.cpp"
+#include "map1.cpp"
+#include "max1.cpp"
+#include "max2.cpp"
+#include "maxelem1.cpp"
+#include "maxelem2.cpp"
+#include "merge0.cpp"
+#include "merge1.cpp"
+#include "merge2.cpp"
+#include "min1.cpp"
+#include "min2.cpp"
+#include "minelem1.cpp"
+#include "minelem2.cpp"
+#include "minus.cpp"
+#include "mismtch0.cpp"
+#include "mismtch1.cpp"
+#include "mismtch2.cpp"
+#include "mkheap0.cpp"
+#include "mkheap1.cpp"
+#include "mmap1.cpp"
+#include "mmap2.cpp"
+#include "modulus.cpp"
+#include "mset1.cpp"
+#include "mset3.cpp"
+#include "mset4.cpp"
+#include "mset5.cpp"
+#include "negate.cpp"
+#include "nequal.cpp"
+#include "nextprm0.cpp"
+#include "nextprm1.cpp"
+#include "nextprm2.cpp"
+#include "nthelem0.cpp"
+#include "nthelem1.cpp"
+#include "nthelem2.cpp"
+#include "ostmit.cpp"
+#include "pair0.cpp"
+#include "pair1.cpp"
+#include "pair2.cpp"
+#include "parsrt0.cpp"
+#include "parsrt1.cpp"
+#include "parsrt2.cpp"
+#include "parsrtc0.cpp"
+#include "parsrtc1.cpp"
+#include "parsrtc2.cpp"
+#include "partsrt0.cpp"
+#include "partsum0.cpp"
+#include "partsum1.cpp"
+#include "partsum2.cpp"
+#include "pheap1.cpp"
+#include "pheap2.cpp"
+#include "plus.cpp"
+#include "pqueue1.cpp"
+#include "prevprm0.cpp"
+#include "prevprm1.cpp"
+#include "prevprm2.cpp"
+#include "ptition0.cpp"
+#include "ptition1.cpp"
+#include "ptrbinf1.cpp"
+#include "ptrbinf2.cpp"
+#include "ptrunf1.cpp"
+#include "ptrunf2.cpp"
+#include "queue1.cpp"
+#include "rawiter.cpp"
+#include "remcopy1.cpp"
+#include "remcpif1.cpp"
+#include "remif1.cpp"
+#include "remove1.cpp"
+#include "repcpif1.cpp"
+#include "replace0.cpp"
+#include "replace1.cpp"
+#include "replcpy1.cpp"
+#include "replif1.cpp"
+#include "revbit1.cpp"
+#include "revbit2.cpp"
+#include "revcopy1.cpp"
+#include "reverse1.cpp"
+#include "reviter1.cpp"
+#include "reviter2.cpp"
+#include "rndshuf0.cpp"
+#include "rndshuf1.cpp"
+#include "rndshuf2.cpp"
+#include "rotate0.cpp"
+#include "rotate1.cpp"
+#include "rotcopy0.cpp"
+#include "rotcopy1.cpp"
+#include "search0.cpp"
+#include "search1.cpp"
+#include "search2.cpp"
+#include "set1.cpp"
+#include "set2.cpp"
+#include "setdiff0.cpp"
+#include "setdiff1.cpp"
+#include "setdiff2.cpp"
+#include "setintr0.cpp"
+#include "setintr1.cpp"
+#include "setintr2.cpp"
+#include "setsymd0.cpp"
+#include "setsymd1.cpp"
+#include "setsymd2.cpp"
+#include "setunon0.cpp"
+#include "setunon1.cpp"
+#include "setunon2.cpp"
+#include "single.cpp"
+#include "sort1.cpp"
+#include "sort2.cpp"
+#include "stack1.cpp"
+#include "stack2.cpp"
+#include "stat.cpp"
+#include "stblptn0.cpp"
+#include "stblptn1.cpp"
+#include "stblsrt1.cpp"
+#include "stblsrt2.cpp"
+#include "swap1.cpp"
+#include "swprnge1.cpp"
+#include "times.cpp"
+#include "trnsfrm1.cpp"
+#include "trnsfrm2.cpp"
+#include "ucompos1.cpp"
+#include "ucompos2.cpp"
+#include "unegate1.cpp"
+#include "unegate2.cpp"
+#include "uniqcpy1.cpp"
+#include "uniqcpy2.cpp"
+#include "unique1.cpp"
+#include "unique2.cpp"
+#include "uprbnd1.cpp"
+#include "uprbnd2.cpp"
+#include "vec1.cpp"
+#include "vec2.cpp"
+#include "vec3.cpp"
+#include "vec4.cpp"
+#include "vec5.cpp"
+#include "vec6.cpp"
+#include "vec7.cpp"
+#include "vec8.cpp"
+#include "stl_test.cpp"
diff --git a/main/source/stlport/test/regression/stl_test.cpp b/main/source/stlport/test/regression/stl_test.cpp
new file mode 100644
index 00000000..32d20922
--- /dev/null
+++ b/main/source/stlport/test/regression/stl_test.cpp
@@ -0,0 +1,496 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#define  __DECLARE_GLOBALS_HERE
+#define  __PUT_STATIC_DATA_MEMBERS_HERE
+#include "stl.h"
+#include <iostream>
+#include "stl_test.h"
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+int main(int argc, char** argv) {
+    int iter_count = ( argc>1 ? 10000 : 1);
+    for (; iter_count; iter_count--) {
+        accum1_test(argc, argv);
+        cout.flush();
+        accum2_test(argc, argv);
+        cout.flush();
+        adjdiff0_test(argc, argv);
+        cout.flush();
+        adjdiff1_test(argc, argv);
+        cout.flush();
+        adjdiff2_test(argc, argv);
+        cout.flush();
+        adjfind0_test(argc, argv);
+        cout.flush();
+        adjfind1_test(argc, argv);
+        cout.flush();
+        adjfind2_test(argc, argv);
+        cout.flush();
+        advance_test(argc, argv);
+        cout.flush();
+        alg1_test(argc, argv);
+        cout.flush();
+        alg2_test(argc, argv);
+        cout.flush();
+        alg3_test(argc, argv);
+        cout.flush();
+        alg4_test(argc, argv);
+        cout.flush();
+        alg5_test(argc, argv);
+        cout.flush();
+        bcompos1_test(argc, argv);
+        cout.flush();
+        bcompos2_test(argc, argv);
+        cout.flush();
+        bind1st1_test(argc, argv);
+        cout.flush();
+        bind1st2_test(argc, argv);
+        cout.flush();
+        bind2nd1_test(argc, argv);
+        cout.flush();
+        bind2nd2_test(argc, argv);
+        cout.flush();
+        binsert1_test(argc, argv);
+        cout.flush();
+        binsert2_test(argc, argv);
+        cout.flush();
+        binsrch1_test(argc, argv);
+        cout.flush();
+        binsrch2_test(argc, argv);
+        cout.flush();
+        bnegate1_test(argc, argv);
+        cout.flush();
+        bnegate2_test(argc, argv);
+        cout.flush();
+	bvec1_test(argc, argv);
+        cout.flush();
+        copy1_test(argc, argv);
+        cout.flush();
+        copy2_test(argc, argv);
+        cout.flush();
+        copy3_test(argc, argv);
+        cout.flush();
+        copy4_test(argc, argv);
+        cout.flush();
+        copyb_test(argc, argv);
+        cout.flush();
+        copyb0_test(argc, argv);
+        cout.flush();
+        count0_test(argc, argv);
+        cout.flush();
+        count1_test(argc, argv);
+        cout.flush();
+        countif1_test(argc, argv);
+        cout.flush();
+        deque1_test(argc, argv);
+        cout.flush();
+        divides_test(argc, argv);
+        cout.flush();
+        eqlrnge0_test(argc, argv);
+        cout.flush();
+        eqlrnge1_test(argc, argv);
+        cout.flush();
+        eqlrnge2_test(argc, argv);
+        cout.flush();
+        equal0_test(argc, argv);
+        cout.flush();
+        equal1_test(argc, argv);
+        cout.flush();
+        equal2_test(argc, argv);
+        cout.flush();
+        equalto_test(argc, argv);
+        cout.flush();
+        fill1_test(argc, argv);
+        cout.flush();
+        filln1_test(argc, argv);
+        cout.flush();
+        find0_test(argc, argv);
+        cout.flush();
+        find1_test(argc, argv);
+        cout.flush();
+        findif0_test(argc, argv);
+        cout.flush();
+        findif1_test(argc, argv);
+        cout.flush();
+        finsert1_test(argc, argv);
+        cout.flush();
+        finsert2_test(argc, argv);
+        cout.flush();
+        foreach0_test(argc, argv);
+        cout.flush();
+        foreach1_test(argc, argv);
+        cout.flush();
+        func1_test(argc, argv);
+        cout.flush();
+        func2_test(argc, argv);
+        cout.flush();
+        func3_test(argc, argv);
+        cout.flush();
+        gener1_test(argc, argv);
+        cout.flush();
+        gener2_test(argc, argv);
+        cout.flush();
+        genern1_test(argc, argv);
+        cout.flush();
+        genern2_test(argc, argv);
+        cout.flush();
+        greateq_test(argc, argv);
+        cout.flush();
+        greater_test(argc, argv);
+        cout.flush();
+        incl0_test(argc, argv);
+        cout.flush();
+        incl1_test(argc, argv);
+        cout.flush();
+        incl2_test(argc, argv);
+        cout.flush();
+        inplmrg1_test(argc, argv);
+        cout.flush();
+        inplmrg2_test(argc, argv);
+        cout.flush();
+        inrprod0_test(argc, argv);
+        cout.flush();
+        inrprod1_test(argc, argv);
+        cout.flush();
+        inrprod2_test(argc, argv);
+        cout.flush();
+        insert1_test(argc, argv);
+        cout.flush();
+        insert2_test(argc, argv);
+        cout.flush();
+        iota1_test(argc, argv);
+        cout.flush();
+        istmit1_test(argc, argv);
+        cout.flush();
+        iter1_test(argc, argv);
+        cout.flush();
+        iter2_test(argc, argv);
+        cout.flush();
+#if ! (defined(__SUNPRO_CC) && (__SUNPRO_CC<=0x401))
+        iter3_test(argc, argv);
+        cout.flush();
+#endif
+        iter4_test(argc, argv);
+        cout.flush();
+        iterswp0_test(argc, argv);
+        cout.flush();
+        iterswp1_test(argc, argv);
+        cout.flush();
+        less_test(argc, argv);
+        cout.flush();
+        lesseq_test(argc, argv);
+        cout.flush();
+        lexcmp1_test(argc, argv);
+        cout.flush();
+        lexcmp2_test(argc, argv);
+        cout.flush();
+        list1_test(argc, argv);
+        cout.flush();
+        list2_test(argc, argv);
+        cout.flush();
+        list3_test(argc, argv);
+        cout.flush();
+        list4_test(argc, argv);
+        cout.flush();
+        logicand_test(argc, argv);
+        cout.flush();
+        logicnot_test(argc, argv);
+        cout.flush();
+        logicor_test(argc, argv);
+        cout.flush();
+        lwrbnd1_test(argc, argv);
+        cout.flush();
+        lwrbnd2_test(argc, argv);
+        cout.flush();
+        map1_test(argc, argv);
+        cout.flush();
+        max1_test(argc, argv);
+        cout.flush();
+        max2_test(argc, argv);
+        cout.flush();
+        maxelem1_test(argc, argv);
+        cout.flush();
+        maxelem2_test(argc, argv);
+        cout.flush();
+        mem_ptr_fun_test(argc, argv);
+        cout.flush();
+        merge0_test(argc, argv);
+        cout.flush();
+        merge1_test(argc, argv);
+        cout.flush();
+        merge2_test(argc, argv);
+        cout.flush();
+        min1_test(argc, argv);
+        cout.flush();
+        min2_test(argc, argv);
+        cout.flush();
+        minelem1_test(argc, argv);
+        cout.flush();
+        minelem2_test(argc, argv);
+        cout.flush();
+        minus_test(argc, argv);
+        cout.flush();
+        mismtch0_test(argc, argv);
+        cout.flush();
+        mismtch1_test(argc, argv);
+        cout.flush();
+        mismtch2_test(argc, argv);
+        cout.flush();
+        mkheap0_test(argc, argv);
+        cout.flush();
+        mkheap1_test(argc, argv);
+        cout.flush();
+        mmap1_test(argc, argv);
+        cout.flush();
+        mmap2_test(argc, argv);
+        cout.flush();
+        modulus_test(argc, argv);
+        cout.flush();
+        mset1_test(argc, argv);
+        cout.flush();
+        mset3_test(argc, argv);
+        cout.flush();
+        mset4_test(argc, argv);
+        cout.flush();
+        mset5_test(argc, argv);
+        cout.flush();
+        negate_test(argc, argv);
+        cout.flush();
+        nequal_test(argc, argv);
+        cout.flush();
+        nextprm0_test(argc, argv);
+        cout.flush();
+        nextprm1_test(argc, argv);
+        cout.flush();
+        nextprm2_test(argc, argv);
+#if ! (defined(__SUNPRO_CC) && (__SUNPRO_CC<=0x410))
+        nthelem0_test(argc, argv);
+        cout.flush();
+        nthelem1_test(argc, argv);
+        cout.flush();
+        nthelem2_test(argc, argv);
+        cout.flush();
+#endif
+        ostmit_test(argc, argv);
+        cout.flush();
+        pair0_test(argc, argv);
+        cout.flush();
+        pair1_test(argc, argv);
+        cout.flush();
+        pair2_test(argc, argv);
+        cout.flush();
+        parsrt0_test(argc, argv);
+        cout.flush();
+        parsrt1_test(argc, argv);
+        cout.flush();
+        parsrt2_test(argc, argv);
+        cout.flush();
+        parsrtc0_test(argc, argv);
+        cout.flush();
+        parsrtc1_test(argc, argv);
+        cout.flush();
+        parsrtc2_test(argc, argv);
+        cout.flush();
+        partsrt0_test(argc, argv);
+        cout.flush();
+        partsum0_test(argc, argv);
+        cout.flush();
+        partsum1_test(argc, argv);
+        cout.flush();
+        partsum2_test(argc, argv);
+        cout.flush();
+        pheap1_test(argc, argv);
+        cout.flush();
+        pheap2_test(argc, argv);
+        cout.flush();
+        plus_test(argc, argv);
+        cout.flush();
+        pqueue1_test(argc, argv);
+        cout.flush();
+        prevprm0_test(argc, argv);
+        cout.flush();
+        prevprm1_test(argc, argv);
+        cout.flush();
+        prevprm2_test(argc, argv);
+        cout.flush();
+        ptition0_test(argc, argv);
+        cout.flush();
+        ptition1_test(argc, argv);
+        cout.flush();
+        ptrbinf1_test(argc, argv);
+        cout.flush();
+        ptrbinf2_test(argc, argv);
+        cout.flush();
+        ptrunf1_test(argc, argv);
+        cout.flush();
+        ptrunf2_test(argc, argv);
+        cout.flush();
+        queue1_test(argc, argv);
+        cout.flush();
+        rawiter_test(argc, argv);
+        cout.flush();
+        remcopy1_test(argc, argv);
+        cout.flush();
+        remcpif1_test(argc, argv);
+        cout.flush();
+        remif1_test(argc, argv);
+        cout.flush();
+        remove1_test(argc, argv);
+        cout.flush();
+        repcpif1_test(argc, argv);
+        cout.flush();
+        replace0_test(argc, argv);
+        cout.flush();
+        replace1_test(argc, argv);
+        cout.flush();
+        replcpy1_test(argc, argv);
+        cout.flush();
+        replif1_test(argc, argv);
+        cout.flush();
+#if ! (defined(__SUNPRO_CC) && (__SUNPRO_CC<0x410))
+        revbit1_test(argc, argv);
+        cout.flush();
+        revbit2_test(argc, argv);
+        cout.flush();
+#endif
+        revcopy1_test(argc, argv);
+        cout.flush();
+        reverse1_test(argc, argv);
+        cout.flush();
+#if ! (defined(__SUNPRO_CC) && (__SUNPRO_CC<0x410))
+        reviter1_test(argc, argv);
+        cout.flush();
+        reviter2_test(argc, argv);
+        cout.flush();
+#endif
+        rndshuf0_test(argc, argv);
+        cout.flush();
+        rndshuf1_test(argc, argv);
+        cout.flush();
+        rndshuf2_test(argc, argv);
+        cout.flush();
+        rotate0_test(argc, argv);
+        cout.flush();
+        rotate1_test(argc, argv);
+        cout.flush();
+        rotcopy0_test(argc, argv);
+        cout.flush();
+        rotcopy1_test(argc, argv);
+        cout.flush();
+        search0_test(argc, argv);
+        cout.flush();
+        search1_test(argc, argv);
+        cout.flush();
+        search2_test(argc, argv);
+        cout.flush();
+        set1_test(argc, argv);
+        cout.flush();
+        set2_test(argc, argv);
+        cout.flush();
+        setdiff0_test(argc, argv);
+        cout.flush();
+        setdiff1_test(argc, argv);
+        cout.flush();
+        setdiff2_test(argc, argv);
+        cout.flush();
+        setintr0_test(argc, argv);
+        cout.flush();
+        setintr1_test(argc, argv);
+        cout.flush();
+        setintr2_test(argc, argv);
+        cout.flush();
+        setsymd0_test(argc, argv);
+        cout.flush();
+        setsymd1_test(argc, argv);
+        cout.flush();
+        setsymd2_test(argc, argv);
+        cout.flush();
+        setunon0_test(argc, argv);
+        cout.flush();
+        setunon1_test(argc, argv);
+        cout.flush();
+        setunon2_test(argc, argv);
+        cout.flush();
+        sort1_test(argc, argv);
+        cout.flush();
+        sort2_test(argc, argv);
+        cout.flush();
+        stack1_test(argc, argv);
+        cout.flush();
+        stack2_test(argc, argv);
+        cout.flush();
+        stblptn0_test(argc, argv);
+        cout.flush();
+        stblptn1_test(argc, argv);
+        cout.flush();
+        stblsrt1_test(argc, argv);
+        cout.flush();
+        stblsrt2_test(argc, argv);
+        cout.flush();
+        swap1_test(argc, argv);
+        cout.flush();
+        swprnge1_test(argc, argv);
+        cout.flush();
+        times_test(argc, argv);
+        cout.flush();
+        trnsfrm1_test(argc, argv);
+        cout.flush();
+        trnsfrm2_test(argc, argv);
+        cout.flush();
+        ucompos1_test(argc, argv);
+        cout.flush();
+        ucompos2_test(argc, argv);
+        cout.flush();
+        unegate1_test(argc, argv);
+        cout.flush();
+        unegate2_test(argc, argv);
+        cout.flush();
+        uniqcpy1_test(argc, argv);
+        cout.flush();
+        uniqcpy2_test(argc, argv);
+        cout.flush();
+        unique1_test(argc, argv);
+        cout.flush();
+        unique2_test(argc, argv);
+        cout.flush();
+        uprbnd1_test(argc, argv);
+        cout.flush();
+        uprbnd2_test(argc, argv);
+        cout.flush();
+        vec1_test(argc, argv);
+        cout.flush();
+        vec2_test(argc, argv);
+        cout.flush();
+        vec3_test(argc, argv);
+        cout.flush();
+        vec4_test(argc, argv);
+        cout.flush();
+        vec5_test(argc, argv);
+        cout.flush();
+        vec6_test(argc, argv);
+        cout.flush();
+        vec7_test(argc, argv);
+        cout.flush();
+        vec8_test(argc, argv);
+        cout.flush();
+        hmap1_test  ( argc, argv);
+        cout.flush();
+        hmmap1_test  ( argc, argv);
+        cout.flush();
+        hset2_test  ( argc, argv);
+        cout.flush();
+        hmset1_test  ( argc, argv);
+        cout.flush();
+        slist1_test (argc, argv);
+        cout.flush();
+        string1_test (argc, argv);
+        cout.flush();
+	bitset1_test (argc, argv); 
+        cout.flush();
+        string_mt_test(argc, argv);
+    }
+    return 0;
+}
diff --git a/main/source/stlport/test/regression/stl_test.djgpp.exp b/main/source/stlport/test/regression/stl_test.djgpp.exp
new file mode 100644
index 00000000..61967928
--- /dev/null
+++ b/main/source/stlport/test/regression/stl_test.djgpp.exp
@@ -0,0 +1,870 @@
+Results of accum1_test:
+sum = 15
+Results of accum2_test:
+prod = 120
+Results of adjdiff0_test:
+1 2 4 8 16 
+1 1 2 4 8 
+Results of adjdiff1_test:
+0 1 4 9 16 25 36 49 64 81 
+0 1 3 5 7 9 11 13 15 17 
+Results of adjdiff2_test:
+1 2 3 4 5 6 7 8 9 10 
+1 2 6 12 20 30 42 56 72 90 
+Results of adjfind0_test:
+No adjacent pairs
+Found adjacent pair of: 1 at offset 3
+Results of adjfind1_test:
+No adjacent pairs
+Found adjacent pair of: 7
+Results of adjfind2_test:
+Found two adjacent strings of equal length: Jack -and- Mike
+Results of advance_test:
+At Beginning: 0
+At Beginning + 5: 5
+Results of alg1_test:
+min(4, 7) = 4
+max('a', 'z') = z
+Results of alg2_test:
+Count of 2s = 3
+Results of alg3_test:
+Count of 2s = 3
+Results of alg4_test:
+1962
+1992
+1999
+2001
+Results of alg5_test:
+1962
+1992
+2001
+1999
+Results of bcompos1_test:
+1 is odd and positive
+Results of bcompos2_test:
+1 is odd and positive
+Results of bind1st1_test:
+1
+2
+Results of bind1st2_test:
+1
+2
+Results of bind2nd1_test:
+1
+2
+4
+Results of bind2nd2_test:
+1
+2
+4
+Results of binsert1_test:
+laurie
+jennifer
+leisa
+Results of binsert2_test:
+laurie
+jennifer
+leisa
+Results of binsrch1_test:
+found 42
+Results of binsrch2_test:
+ff is in labels.
+Results of bnegate1_test:
+1
+4
+7
+9
+Results of bnegate2_test:
+1
+4
+7
+9
+Results of bvec1_test:
+000
+101
+10101
+Results of copy1_test:
+ Src: A string to be copied.
+Dest: A string to be copied.
+Results of copy2_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copy3_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copy4_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copyb_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copyb0_test:
+1 2 3 4 5 
+1 2 3 4 5 
+Results of count0_test:
+Found 4 1's.
+Results of count1_test:
+Found 33 2's.
+Results of countif1_test:
+Found 33 odd elements.
+Results of deque1_test:
+d[0] = 1
+d[1] = 4
+d[2] = 9
+d[3] = 16
+
+d[0] = 4
+d[1] = 9
+d[2] = 25
+Results of divides_test:
+result = 2
+Results of eqlrnge0_test:
+2 can be inserted from before index 4 to before index 8
+Results of eqlrnge1_test:
+Within the collection:
+	0 0 0 1 1 1 2 2 2 3 
+2 can be inserted from before index 6 to before index 9
+Results of eqlrnge2_test:
+Within the collection:
+	aabbccddggghhklllmqqqqssyyzz
+q can be inserted from before index 18 to before index 22
+Results of equal0_test:
+numbers1 is not equal to numbers2
+numbers3 is equal to numbers1
+Results of equal1_test:
+v1 is not equal to v2
+v1 is equal to v2
+Results of equal2_test:
+v2[i] == v1[i] * v1[i]
+Results of equalto_test:
+1
+0
+1
+0
+Results of fill1_test:
+42 42 42 42 42 42 42 42 42 42 
+Results of filln1_test:
+42 42 42 42 42 42 42 42 42 42 
+Results of find0_test:
+Found 25 at offset 5
+Results of find1_test:
+Found 1972 at offset 3
+Results of findif0_test:
+Value 15 at offset 3 is odd
+Results of findif1_test:
+Value 9 at offset 2 is divisible by 3
+Results of finsert1_test:
+leisa
+jennifer
+laurie
+Results of finsert2_test:
+leisa
+jennifer
+laurie
+Results of foreach0_test:
+1 1 2 3 5 8 13 21 34 55 
+Results of foreach1_test:
+0 1 4 9 16 25 36 49 64 81 
+Results of func1_test:
+Number greater than 3 = 2
+Results of func2_test:
+5
+4
+1
+Results of func3_test:
+5
+4
+1
+Results of gener1_test:
+262236772 208042609 800207362 428428949 47718728 1793958355 1543227091 1255063701 1245922717 448084510 
+Results of gener2_test:
+1 1 2 3 5 8 13 21 34 55 
+Results of genern1_test:
+1841298076 1050803247 489249763 634882132 437249775 192858938 1769723075 2017244079 451954759 998335072 
+Results of genern2_test:
+1 1 2 3 5 8 13 21 34 55 
+Results of greateq_test:
+4
+3
+2
+1
+Results of greater_test:
+4
+3
+2
+1
+Results of incl0_test:
+numbers1 does not include numbers3
+numbers2 includes numbers3
+Results of incl1_test:
+v1 does not include v2
+v1 includes v2
+Results of incl2_test:
+v1 does not include v2
+v1 includes v2
+Results of inplmrg1_test:
+1 10 42 3 16 32 
+1 3 10 16 32 42 
+Results of inplmrg2_test:
+4 3 2 1 0 4 3 2 1 0 
+4 4 3 3 2 2 1 1 0 0 
+Results of inrprod0_test:
+Inner product = 55
+Results of inrprod1_test:
+Inner product(sum of products) of:
+	1 2 3 
+	3 2 1 
+is: 10
+Results of inrprod2_test:
+Inner product(product of sums):
+	1 2 3 
+	3 2 1 
+is: 64
+Results of insert1_test:
+laurie
+jennifer
+amanda
+saskia
+carrie
+leisa
+Results of insert2_test:
+laurie
+jennifer
+amanda
+saskia
+carrie
+leisa
+Results of iota1_test:
+42 43 44 45 46 47 48 49 50 51 
+Results of istmit1_test:
+Please enter a string: read a string
+
+Results of iter1_test:
+zippy
+motorboy
+Results of iter2_test:
+zippy
+motorboy
+Results of iter3_test:
+motorboy
+zippy
+Results of iter4_test:
+last element is 3
+first element is 1
+Results of iterswp0_test:
+3 1 2 0 4 5 
+Results of iterswp1_test:
+3 1 2 0 4 5 
+Results of less_test:
+1
+2
+3
+4
+Results of lesseq_test:
+1
+2
+3
+4
+Results of lexcmp1_test:
+shine is before shoe
+Results of lexcmp2_test:
+shoe is after shine
+Results of list1_test:
+1
+4
+9
+16
+36
+Results of list2_test:
+1
+4
+9
+16
+Results of list3_test:
+original: xlxtss
+reversed: sstxlx
+removed: sstl
+uniqued: stl
+sorted: lst
+Results of list4_test:
+123467
+Results of logicand_test:
+0
+1
+0
+0
+Results of logicnot_test:
+count = 2
+Results of logicor_test:
+1
+1
+0
+1
+Results of lwrbnd1_test:
+0 0 0 0 1 1 1 1 2 2 2 2 3 3 3 3 4 4 4 4 
+3 can be inserted at index: 12
+Results of lwrbnd2_test:
+d can be inserted at index: 4
+Results of map1_test:
+m['x'] = 20
+m['x'] = 10
+m['z'] = 0
+m.count('z') = 1
+First insertion successful
+Existing pair c -> 100
+Results of max1_test:
+100
+Results of max2_test:
+shoe
+Results of maxelem1_test:
+56
+Results of maxelem2_test:
+Todd
+Results of merge0_test:
+-5 1 6 13 25 26 36 46 99 101 
+Results of merge1_test:
+0 1 2 3 4 
+3 4 5 6 7 
+0 1 2 3 3 4 4 5 6 7 
+Results of merge2_test:
+10 9 8 7 6 
+7 6 5 4 3 
+10 9 8 7 7 6 6 5 4 3 
+Results of min1_test:
+42
+Results of min2_test:
+shine
+Results of minelem1_test:
+-242
+Results of minelem2_test:
+Brett
+Results of minus_test:
+0
+1
+-1
+5
+Results of mismtch0_test:
+n1 and n2 are the same
+Mismatch at offset: 3
+Results of mismtch1_test:
+v1 and v2 are the same
+mismatch at index: 5
+Results of mismtch2_test:
+n1 and n2 are the same
+mismatch at index: 2
+Results of mkheap0_test:
+19
+13
+11
+10
+5
+4
+Results of mkheap1_test:
+4
+5
+10
+11
+13
+19
+Results of mmap1_test:
+count('X') = 0
+count('X') = 1
+count('X') = 2
+X -> 10
+X -> 20
+Y -> 32
+Erased 2 items
+Results of mmap2_test:
+lower bound:
+3 -> c
+upper bound:
+6 -> f
+Results of modulus_test:
+2
+0
+10
+2
+Results of mset1_test:
+count(42) = 0
+count(42) = 1
+count(42) = 2
+40 Not found
+Found 42
+Erased 2 instances
+Results of mset3_test:
+lower bound = 3
+upper bound = 6
+Results of mset4_test:
+lower bound = 3
+upper bound = 6
+Results of mset5_test:
+Using less_than: 
+1
+3
+6
+9
+Using greater_than: 
+9
+6
+3
+1
+Results of negate_test:
+-1
+-2
+-3
+Results of nequal_test:
+0
+1
+0
+1
+Results of nextprm0_test:
+0 2 1 
+Results of nextprm1_test:
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+2 0 1 
+2 1 0 
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+Results of nextprm2_test:
+ABC
+ACB
+BAC
+BCA
+CAB
+CBA
+ABC
+ACB
+BAC
+BCA
+Results of nthelem0_test:
+1 0 2 3 4 5 
+Results of nthelem1_test:
+2 0 0 2 6 3 6 3 3 0 
+0 0 0 2 2 3 3 6 3 6 
+Results of nthelem2_test:
+4 8 3 2 7 4 0 6 8 9 
+9 8 8 6 7 4 0 2 3 4 
+Results of ostmit_test:
+hello
+1524
+Results of pair0_test:
+p.first = 1, p.second = 10
+Results of pair1_test:
+p.first = 1, p.second = 10
+Results of pair2_test:
+p.first = 1
+p.second = 10
+Results of parsrt0_test:
+1 2 3 5 4 6 
+Results of parsrt1_test:
+4 1 9 1 2 6 8 5 7 7 
+1 1 2 4 5 9 8 6 7 7 
+Results of parsrt2_test:
+aa ff dd ee cc bb 
+aa bb cc ff ee dd 
+Results of parsrtc0_test:
+1 2 3 
+Results of parsrtc1_test:
+9 6 0 8 8 0 9 1 1 3 
+0 0 1 1 3 
+Results of parsrtc2_test:
+aa ff dd ee cc bb 
+aa ff dd ee cc bb 
+Results of partsrt0_test:
+1 2 3 5 4 6 
+Results of partsum0_test:
+1 3 6 10 15 21 
+Results of partsum1_test:
+0 1 2 3 4 5 6 7 8 9 
+0 1 3 6 10 15 21 28 36 45 
+Results of partsum2_test:
+1 2 3 4 5 
+1 2 6 24 120 
+Results of pheap1_test:
+1 4 7 20 
+Results of pheap2_test:
+20 7 4 1 
+Results of plus_test:
+total = 77
+Results of pqueue1_test:
+101
+69
+42
+Results of prevprm0_test:
+2 1 0 
+Results of prevprm1_test:
+0 1 2 
+2 1 0 
+2 0 1 
+1 2 0 
+1 0 2 
+0 2 1 
+0 1 2 
+2 1 0 
+2 0 1 
+1 2 0 
+Results of prevprm2_test:
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+2 0 1 
+2 1 0 
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+Results of ptition0_test:
+6 1 3 10 12 20 
+Results of ptition1_test:
+16 19 14 5 11 8 1 14 18 1 
+1 1 8 5 11 14 19 14 18 16 
+Results of ptrbinf1_test:
+8
+7
+8
+13
+Results of ptrbinf2_test:
+8
+7
+8
+13
+Results of ptrunf1_test:
+2 is even
+Results of ptrunf2_test:
+2 is even
+Results of queue1_test:
+42
+101
+69
+Results of rawiter_test:
+0
+1
+2
+3
+4
+Results of remcopy1_test:
+1 3 1 3 0 0 
+Results of remcpif1_test:
+2 2 0 0 0 0 
+Results of remif1_test:
+0 0 2 2 2 2 
+Results of remove1_test:
+2 3 2 3 2 3 
+Results of repcpif1_test:
+0 1 2 3 4 0 1 2 3 4 
+0 1 2 3 4 0 1 2 3 4 
+0 42 2 42 4 0 42 2 42 4 
+Results of replace0_test:
+0 1 42 0 1 42 
+Results of replace1_test:
+0 1 2 3 4 0 1 2 3 4 
+0 1 42 3 4 0 1 42 3 4 
+Results of replcpy1_test:
+0 1 42 0 1 42 
+Results of replif1_test:
+0 1 2 3 4 0 1 2 3 4 
+0 42 2 42 4 0 42 2 42 4 
+Results of revbit1_test:
+3
+2
+5
+1
+Results of revbit2_test:
+3
+2
+5
+1
+Results of revcopy1_test:
+0 1 2 3 4 5 
+5 4 3 2 1 0 
+Results of reverse1_test:
+5 4 3 2 1 0 
+Results of reviter1_test:
+Results of reviter2_test:
+3
+2
+5
+1
+Results of rndshuf0_test:
+5 6 3 2 4 1 
+Results of rndshuf1_test:
+0 1 2 3 4 5 6 7 8 9 
+6 9 4 5 8 7 3 1 2 0 
+6 9 8 1 7 2 5 4 0 3 
+7 3 8 1 4 9 5 2 0 6 
+Results of rndshuf2_test:
+0 1 2 3 4 5 6 7 8 9 
+5 2 9 0 6 8 4 7 1 3 
+1 3 6 0 4 8 5 2 7 9 
+2 9 3 5 1 4 8 0 7 6 
+Results of rotate0_test:
+3 4 5 0 1 2 
+Results of rotate1_test:
+0 1 2 3 4 5 6 7 8 9 
+0 1 2 3 4 5 6 7 8 9 
+1 2 3 4 5 6 7 8 9 0 
+3 4 5 6 7 8 9 0 1 2 
+6 7 8 9 0 1 2 3 4 5 
+0 1 2 3 4 5 6 7 8 9 
+5 6 7 8 9 0 1 2 3 4 
+1 2 3 4 5 6 7 8 9 0 
+8 9 0 1 2 3 4 5 6 7 
+6 7 8 9 0 1 2 3 4 5 
+5 6 7 8 9 0 1 2 3 4 
+
+Results of rotcopy0_test:
+3 4 5 0 1 2 
+Results of rotcopy1_test:
+0 1 2 3 4 5 6 7 8 9 
+0 1 2 3 4 5 6 7 8 9 
+1 2 3 4 5 6 7 8 9 0 
+2 3 4 5 6 7 8 9 0 1 
+3 4 5 6 7 8 9 0 1 2 
+4 5 6 7 8 9 0 1 2 3 
+5 6 7 8 9 0 1 2 3 4 
+6 7 8 9 0 1 2 3 4 5 
+7 8 9 0 1 2 3 4 5 6 
+8 9 0 1 2 3 4 5 6 7 
+9 0 1 2 3 4 5 6 7 8 
+
+Results of search0_test:
+v3 not contained in v1
+Found v3 in v2 at offset: 3
+Results of search1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 50 51 52 
+v2 not contained in v1
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 4 5 6 
+Found v2 in v1 at offset: 4
+Results of search2_test:
+grades: A B C D F 
+letters:Q E D 
+letters not found in grades
+grades: A B C D F 
+letters:B C D 
+letters found in grades at offset: 1
+Results of set1_test:
+count(42) = 0
+count(42) = 1
+count(42) = 1
+1 elements erased
+Results of set2_test:
+Inserted new element 42
+Existing element = 42
+Results of setdiff0_test:
+18 0 0 0 
+10 17 23 0 
+Results of setdiff1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+0 1 2 3 4 5 6 
+Results of setdiff2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+A B C D E F G H I J K 
+Results of setintr0_test:
+13 23 0 0 
+Results of setintr1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+7 8 9 
+Results of setintr2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+L M N O 
+Results of setsymd0_test:
+10 17 18 0 
+Results of setsymd1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+0 1 2 3 4 5 6 10 11 12 13 14 15 16 
+Results of setsymd2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+A B C D E F G H I J K P Q R S T U V W X Y Z 
+Results of setunon0_test:
+10 13 17 18 23 0 0 
+Results of setunon1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 
+Results of setunon2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+A B C D E F G H I J K L M N O P Q R S T U V W X Y Z 
+Results of sort1_test:
+-10 1 11 19 42 50 
+Results of sort2_test:
+before: 1 50 -10 11 42 19 
+after: 50 42 19 11 1 -10 
+Results of stack1_test:
+69
+101
+42
+Results of stack2_test:
+69
+101
+42
+Results of stblptn0_test:
+5 6 -2 10 11 20 
+Results of stblptn1_test:
+1 3 14 12 2 15 7 14 6 16 
+1 3 2 7 6 14 12 15 14 16 
+Results of stblsrt1_test:
+-10 1 11 19 42 50 
+Results of stblsrt2_test:
+aa bb cc dd ll qq 
+Results of swap1_test:
+a = 42 b = 19
+a = 19 b = 42
+Results of swprnge1_test:
+World Hello
+Hello World
+Results of times_test:
+total = 70
+Results of trnsfrm1_test:
+5 1 0 -1 -6 -11 
+Results of trnsfrm2_test:
+Hello World!
+Results of ucompos1_test:
+1
+2
+4
+Results of ucompos2_test:
+1
+2
+4
+Results of unegate1_test:
+2
+Results of unegate2_test:
+2
+Results of uniqcpy1_test:
+0 1 2 3 4 0 0 0 
+Results of uniqcpy2_test:
+QQWWEERTTYY
+QQWWEERTTYY
+QWERTY
+Results of unique1_test:
+0 1 2 3 4 2 3 4 
+Results of unique2_test:
+QQWWEERTTYY
+QWERTYRTTYY
+Results of uprbnd1_test:
+0 0 0 0 1 1 1 1 2 2 2 2 3 3 3 3 4 4 4 4 
+3 can be inserted at index: 16
+Results of uprbnd2_test:
+d can be inserted at index: 4
+Results of vec1_test:
+empty = 1
+size = 0
+max_size = 1073741823
+size = 1
+v1[0] = 42
+Results of vec2_test:
+v1 = 32.1 40.5 
+v2 = 3.56 
+v1 = 3.56 
+v2 = 32.1 40.5 
+v2 = 3.56 
+Results of vec3_test:
+v1 = hi
+v2 = ho
+(v1 == v2) = 0
+(v1 < v2) = 1
+Results of vec4_test:
+front = 1
+back = 16, size = 4
+back = 25, size = 5
+back = 16, size = 4
+Results of vec5_test:
+v[0] = 1
+v[1] = 4
+v[2] = 9
+v[3] = 16
+Results of vec6_test:
+v[0] = 1
+v[1] = 4
+v[2] = 9
+v[3] = 16
+v[4] = 25
+v[5] = 36
+
+v[0] = 4
+v[1] = 9
+v[2] = 16
+v[3] = 25
+v[4] = 36
+
+v[0] = 4
+v[1] = 9
+v[2] = 16
+v[3] = 25
+
+v[0] = 4
+v[1] = 25
+
+Results of vec7_test:
+v[0] = 0
+v[1] = 1
+v[2] = 4
+v[3] = 25
+v[4] = 36
+
+v[0] = 0
+v[1] = 1
+v[2] = 4
+v[3] = 9
+v[4] = 16
+v[5] = 25
+v[6] = 36
+
+Results of vec8_test:
+capacity = 0
+capacity = 1
+capacity = 5000
+Results of hmap1_test:
+m['x'] = 20
+m['x'] = 10
+m['z'] = 
+m.count('z') = 1
+First insertion successful
+Existing pair c -> 100
+Results of hmmap1_test:
+count('X') = 0
+count('X') = 1
+count('X') = 2
+X -> 10
+X -> 20
+Y -> 32
+Erased 2 items
+Results of hset2_test:
+Inserted new element 42
+Existing element = 42
+Results of hmset1_test:
+count(42) = 0
+count(42) = 1
+count(42) = 2
+40 Not found
+Found *
+Erased 2 instances
+Results of slist1_test:
+original: xlxtss
+reversed: sstxlx
+removed: sstl
+uniqued: stl
+sorted: lst
+Results of string1_test:
+Hello, World!
+v[0] = H
+v[1] = !
+
+Hello, World!
+Results of bitset1_test:
+b1 size = 13
+b1 = 1111111111111
+b2 size = 13
+b2 = 1000100010001
+b1 = 1101110111011
diff --git a/main/source/stlport/test/regression/stl_test.exp b/main/source/stlport/test/regression/stl_test.exp
new file mode 100644
index 00000000..d3cc1d7a
--- /dev/null
+++ b/main/source/stlport/test/regression/stl_test.exp
@@ -0,0 +1,869 @@
+Results of accum1_test:
+sum = 15
+Results of accum2_test:
+prod = 120
+Results of adjdiff0_test:
+1 2 4 8 16 
+1 1 2 4 8 
+Results of adjdiff1_test:
+0 1 4 9 16 25 36 49 64 81 
+0 1 3 5 7 9 11 13 15 17 
+Results of adjdiff2_test:
+1 2 3 4 5 6 7 8 9 10 
+1 2 6 12 20 30 42 56 72 90 
+Results of adjfind0_test:
+No adjacent pairs
+Found adjacent pair of: 1 at offset 3
+Results of adjfind1_test:
+No adjacent pairs
+Found adjacent pair of: 7
+Results of adjfind2_test:
+Found two adjacent strings of equal length: Jack -and- Mike
+Results of advance_test:
+At Beginning: 0
+At Beginning + 5: 5
+Results of alg1_test:
+min(4, 7) = 4
+max('a', 'z') = z
+Results of alg2_test:
+Count of 2s = 3
+Results of alg3_test:
+Count of 2s = 3
+Results of alg4_test:
+1962
+1992
+1999
+2001
+Results of alg5_test:
+1962
+1992
+2001
+1999
+Results of bcompos1_test:
+1 is odd and positive
+Results of bcompos2_test:
+1 is odd and positive
+Results of bind1st1_test:
+1
+2
+Results of bind1st2_test:
+1
+2
+Results of bind2nd1_test:
+1
+2
+4
+Results of bind2nd2_test:
+1
+2
+4
+Results of binsert1_test:
+laurie
+jennifer
+leisa
+Results of binsert2_test:
+laurie
+jennifer
+leisa
+Results of binsrch1_test:
+found 42
+Results of binsrch2_test:
+ff is in labels.
+Results of bnegate1_test:
+1
+4
+7
+9
+Results of bnegate2_test:
+1
+4
+7
+9
+Results of bvec1_test:
+000
+101
+10101
+Results of copy1_test:
+ Src: A string to be copied.
+Dest: A string to be copied.
+Results of copy2_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copy3_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copy4_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copyb_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copyb0_test:
+1 2 3 4 5 
+1 2 3 4 5 
+Results of count0_test:
+Found 4 1's.
+Results of count1_test:
+Found 33 2's.
+Results of countif1_test:
+Found 33 odd elements.
+Results of deque1_test:
+d[0] = 1
+d[1] = 4
+d[2] = 9
+d[3] = 16
+
+d[0] = 4
+d[1] = 9
+d[2] = 25
+Results of divides_test:
+result = 2
+Results of eqlrnge0_test:
+2 can be inserted from before index 4 to before index 8
+Results of eqlrnge1_test:
+Within the collection:
+	0 0 0 1 1 1 2 2 2 3 
+2 can be inserted from before index 6 to before index 9
+Results of eqlrnge2_test:
+Within the collection:
+	aabbccddggghhklllmqqqqssyyzz
+q can be inserted from before index 18 to before index 22
+Results of equal0_test:
+numbers1 is not equal to numbers2
+numbers3 is equal to numbers1
+Results of equal1_test:
+v1 is not equal to v2
+v1 is equal to v2
+Results of equal2_test:
+v2[i] == v1[i] * v1[i]
+Results of equalto_test:
+1
+0
+1
+0
+Results of fill1_test:
+42 42 42 42 42 42 42 42 42 42 
+Results of filln1_test:
+42 42 42 42 42 42 42 42 42 42 
+Results of find0_test:
+Found 25 at offset 5
+Results of find1_test:
+Found 1972 at offset 3
+Results of findif0_test:
+Value 15 at offset 3 is odd
+Results of findif1_test:
+Value 9 at offset 2 is divisible by 3
+Results of finsert1_test:
+leisa
+jennifer
+laurie
+Results of finsert2_test:
+leisa
+jennifer
+laurie
+Results of foreach0_test:
+1 1 2 3 5 8 13 21 34 55 
+Results of foreach1_test:
+0 1 4 9 16 25 36 49 64 81 
+Results of func1_test:
+Number greater than 3 = 2
+Results of func2_test:
+5
+4
+1
+Results of func3_test:
+5
+4
+1
+Results of gener1_test:
+16838 5758 10113 17515 31051 5627 23010 7419 16212 4086 
+Results of gener2_test:
+1 1 2 3 5 8 13 21 34 55 
+Results of genern1_test:
+2749 12767 9084 12060 32225 17543 25089 21183 25137 25566 
+Results of genern2_test:
+1 1 2 3 5 8 13 21 34 55 
+Results of greateq_test:
+4
+3
+2
+1
+Results of greater_test:
+4
+3
+2
+1
+Results of incl0_test:
+numbers1 does not include numbers3
+numbers2 includes numbers3
+Results of incl1_test:
+v1 does not include v2
+v1 includes v2
+Results of incl2_test:
+v1 does not include v2
+v1 includes v2
+Results of inplmrg1_test:
+1 10 42 3 16 32 
+1 3 10 16 32 42 
+Results of inplmrg2_test:
+4 3 2 1 0 4 3 2 1 0 
+4 4 3 3 2 2 1 1 0 0 
+Results of inrprod0_test:
+Inner product = 55
+Results of inrprod1_test:
+Inner product(sum of products) of:
+	1 2 3 
+	3 2 1 
+is: 10
+Results of inrprod2_test:
+Inner product(product of sums):
+	1 2 3 
+	3 2 1 
+is: 64
+Results of insert1_test:
+laurie
+jennifer
+amanda
+saskia
+carrie
+leisa
+Results of insert2_test:
+laurie
+jennifer
+amanda
+saskia
+carrie
+leisa
+Results of iota1_test:
+42 43 44 45 46 47 48 49 50 51 
+Results of istmit1_test:
+Please enter a string: read a string
+Results of iter1_test:
+zippy
+motorboy
+Results of iter2_test:
+zippy
+motorboy
+Results of iter3_test:
+motorboy
+zippy
+Results of iter4_test:
+last element is 3
+first element is 1
+Results of iterswp0_test:
+3 1 2 0 4 5 
+Results of iterswp1_test:
+3 1 2 0 4 5 
+Results of less_test:
+1
+2
+3
+4
+Results of lesseq_test:
+1
+2
+3
+4
+Results of lexcmp1_test:
+shine is before shoe
+Results of lexcmp2_test:
+shoe is after shine
+Results of list1_test:
+1
+4
+9
+16
+36
+Results of list2_test:
+1
+4
+9
+16
+Results of list3_test:
+original: xlxtss
+reversed: sstxlx
+removed: sstl
+uniqued: stl
+sorted: lst
+Results of list4_test:
+123467
+Results of logicand_test:
+0
+1
+0
+0
+Results of logicnot_test:
+count = 2
+Results of logicor_test:
+1
+1
+0
+1
+Results of lwrbnd1_test:
+0 0 0 0 1 1 1 1 2 2 2 2 3 3 3 3 4 4 4 4 
+3 can be inserted at index: 12
+Results of lwrbnd2_test:
+d can be inserted at index: 4
+Results of map1_test:
+m['x'] = 20
+m['x'] = 10
+m['z'] = 0
+m.count('z') = 1
+First insertion successful
+Existing pair c -> 100
+Results of max1_test:
+100
+Results of max2_test:
+shoe
+Results of maxelem1_test:
+56
+Results of maxelem2_test:
+Todd
+Results of merge0_test:
+-5 1 6 13 25 26 36 46 99 101 
+Results of merge1_test:
+0 1 2 3 4 
+3 4 5 6 7 
+0 1 2 3 3 4 4 5 6 7 
+Results of merge2_test:
+10 9 8 7 6 
+7 6 5 4 3 
+10 9 8 7 7 6 6 5 4 3 
+Results of min1_test:
+42
+Results of min2_test:
+shine
+Results of minelem1_test:
+-242
+Results of minelem2_test:
+Brett
+Results of minus_test:
+0
+1
+-1
+5
+Results of mismtch0_test:
+n1 and n2 are the same
+Mismatch at offset: 3
+Results of mismtch1_test:
+v1 and v2 are the same
+mismatch at index: 5
+Results of mismtch2_test:
+n1 and n2 are the same
+mismatch at index: 2
+Results of mkheap0_test:
+19
+13
+11
+10
+5
+4
+Results of mkheap1_test:
+4
+5
+10
+11
+13
+19
+Results of mmap1_test:
+count('X') = 0
+count('X') = 1
+count('X') = 2
+X -> 10
+X -> 20
+Y -> 32
+Erased 2 items
+Results of mmap2_test:
+lower bound:
+3 -> c
+upper bound:
+6 -> f
+Results of modulus_test:
+2
+0
+10
+2
+Results of mset1_test:
+count(42) = 0
+count(42) = 1
+count(42) = 2
+40 Not found
+Found 42
+Erased 2 instances
+Results of mset3_test:
+lower bound = 3
+upper bound = 6
+Results of mset4_test:
+lower bound = 3
+upper bound = 6
+Results of mset5_test:
+Using less_than: 
+1
+3
+6
+9
+Using greater_than: 
+9
+6
+3
+1
+Results of negate_test:
+-1
+-2
+-3
+Results of nequal_test:
+0
+1
+0
+1
+Results of nextprm0_test:
+0 2 1 
+Results of nextprm1_test:
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+2 0 1 
+2 1 0 
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+Results of nextprm2_test:
+ABC
+ACB
+BAC
+BCA
+CAB
+CBA
+ABC
+ACB
+BAC
+BCA
+Results of nthelem0_test:
+1 0 2 3 4 5 
+Results of nthelem1_test:
+6 8 5 1 7 4 1 5 2 6 
+1 1 4 2 5 5 6 7 8 6 
+Results of nthelem2_test:
+4 5 4 2 1 7 4 3 1 6 
+6 7 4 4 5 4 3 2 1 1 
+Results of ostmit_test:
+hello
+1524
+Results of pair0_test:
+p.first = 1, p.second = 10
+Results of pair1_test:
+p.first = 1, p.second = 10
+Results of pair2_test:
+p.first = 1
+p.second = 10
+Results of parsrt0_test:
+1 2 3 5 4 6 
+Results of parsrt1_test:
+8 8 5 3 7 6 5 3 2 4 
+2 3 3 4 5 8 8 7 6 5 
+Results of parsrt2_test:
+aa ff dd ee cc bb 
+aa bb cc ff ee dd 
+Results of parsrtc0_test:
+1 2 3 
+Results of parsrtc1_test:
+3 0 4 3 2 8 2 7 7 5 
+0 2 2 3 3 
+Results of parsrtc2_test:
+aa ff dd ee cc bb 
+aa ff dd ee cc bb 
+Results of partsrt0_test:
+1 2 3 5 4 6 
+Results of partsum0_test:
+1 3 6 10 15 21 
+Results of partsum1_test:
+0 1 2 3 4 5 6 7 8 9 
+0 1 3 6 10 15 21 28 36 45 
+Results of partsum2_test:
+1 2 3 4 5 
+1 2 6 24 120 
+Results of pheap1_test:
+1 4 7 20 
+Results of pheap2_test:
+20 7 4 1 
+Results of plus_test:
+total = 77
+Results of pqueue1_test:
+101
+69
+42
+Results of prevprm0_test:
+2 1 0 
+Results of prevprm1_test:
+0 1 2 
+2 1 0 
+2 0 1 
+1 2 0 
+1 0 2 
+0 2 1 
+0 1 2 
+2 1 0 
+2 0 1 
+1 2 0 
+Results of prevprm2_test:
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+2 0 1 
+2 1 0 
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+Results of ptition0_test:
+6 1 3 10 12 20 
+Results of ptition1_test:
+19 3 11 14 10 19 8 17 9 6 
+6 3 9 8 10 19 14 17 11 19 
+Results of ptrbinf1_test:
+8
+7
+8
+13
+Results of ptrbinf2_test:
+8
+7
+8
+13
+Results of ptrunf1_test:
+2 is even
+Results of ptrunf2_test:
+2 is even
+Results of queue1_test:
+42
+101
+69
+Results of rawiter_test:
+0
+1
+2
+3
+4
+Results of remcopy1_test:
+1 3 1 3 0 0 
+Results of remcpif1_test:
+2 2 0 0 0 0 
+Results of remif1_test:
+0 0 2 2 2 2 
+Results of remove1_test:
+2 3 2 3 2 3 
+Results of repcpif1_test:
+0 1 2 3 4 0 1 2 3 4 
+0 1 2 3 4 0 1 2 3 4 
+0 42 2 42 4 0 42 2 42 4 
+Results of replace0_test:
+0 1 42 0 1 42 
+Results of replace1_test:
+0 1 2 3 4 0 1 2 3 4 
+0 1 42 3 4 0 1 42 3 4 
+Results of replcpy1_test:
+0 1 42 0 1 42 
+Results of replif1_test:
+0 1 2 3 4 0 1 2 3 4 
+0 42 2 42 4 0 42 2 42 4 
+Results of revbit1_test:
+3
+2
+5
+1
+Results of revbit2_test:
+3
+2
+5
+1
+Results of revcopy1_test:
+0 1 2 3 4 5 
+5 4 3 2 1 0 
+Results of reverse1_test:
+5 4 3 2 1 0 
+Results of reviter1_test:
+Results of reviter2_test:
+3
+2
+5
+1
+Results of rndshuf0_test:
+2 5 4 1 6 3 
+Results of rndshuf1_test:
+0 1 2 3 4 5 6 7 8 9 
+5 8 0 6 3 1 9 2 4 7 
+2 3 4 6 0 8 9 1 5 7 
+5 7 2 9 0 4 8 6 3 1 
+Results of rndshuf2_test:
+0 1 2 3 4 5 6 7 8 9 
+6 9 7 1 2 3 4 5 0 8 
+9 6 5 4 3 7 2 0 1 8 
+6 9 3 5 4 2 8 0 1 7 
+Results of rotate0_test:
+3 4 5 0 1 2 
+Results of rotate1_test:
+0 1 2 3 4 5 6 7 8 9 
+0 1 2 3 4 5 6 7 8 9 
+1 2 3 4 5 6 7 8 9 0 
+3 4 5 6 7 8 9 0 1 2 
+6 7 8 9 0 1 2 3 4 5 
+0 1 2 3 4 5 6 7 8 9 
+5 6 7 8 9 0 1 2 3 4 
+1 2 3 4 5 6 7 8 9 0 
+8 9 0 1 2 3 4 5 6 7 
+6 7 8 9 0 1 2 3 4 5 
+5 6 7 8 9 0 1 2 3 4 
+
+Results of rotcopy0_test:
+3 4 5 0 1 2 
+Results of rotcopy1_test:
+0 1 2 3 4 5 6 7 8 9 
+0 1 2 3 4 5 6 7 8 9 
+1 2 3 4 5 6 7 8 9 0 
+2 3 4 5 6 7 8 9 0 1 
+3 4 5 6 7 8 9 0 1 2 
+4 5 6 7 8 9 0 1 2 3 
+5 6 7 8 9 0 1 2 3 4 
+6 7 8 9 0 1 2 3 4 5 
+7 8 9 0 1 2 3 4 5 6 
+8 9 0 1 2 3 4 5 6 7 
+9 0 1 2 3 4 5 6 7 8 
+
+Results of search0_test:
+v3 not contained in v1
+Found v3 in v2 at offset: 3
+Results of search1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 50 51 52 
+v2 not contained in v1
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 4 5 6 
+Found v2 in v1 at offset: 4
+Results of search2_test:
+grades: A B C D F 
+letters:Q E D 
+letters not found in grades
+grades: A B C D F 
+letters:B C D 
+letters found in grades at offset: 1
+Results of set1_test:
+count(42) = 0
+count(42) = 1
+count(42) = 1
+1 elements erased
+Results of set2_test:
+Inserted new element 42
+Existing element = 42
+Results of setdiff0_test:
+18 0 0 0 
+10 17 23 0 
+Results of setdiff1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+0 1 2 3 4 5 6 
+Results of setdiff2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+A B C D E F G H I J K 
+Results of setintr0_test:
+13 23 0 0 
+Results of setintr1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+7 8 9 
+Results of setintr2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+L M N O 
+Results of setsymd0_test:
+10 17 18 0 
+Results of setsymd1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+0 1 2 3 4 5 6 10 11 12 13 14 15 16 
+Results of setsymd2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+A B C D E F G H I J K P Q R S T U V W X Y Z 
+Results of setunon0_test:
+10 13 17 18 23 0 0 
+Results of setunon1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 
+Results of setunon2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+A B C D E F G H I J K L M N O P Q R S T U V W X Y Z 
+Results of sort1_test:
+-10 1 11 19 42 50 
+Results of sort2_test:
+before: 1 50 -10 11 42 19 
+after: 50 42 19 11 1 -10 
+Results of stack1_test:
+69
+101
+42
+Results of stack2_test:
+69
+101
+42
+Results of stblptn0_test:
+5 6 -2 10 11 20 
+Results of stblptn1_test:
+5 5 2 10 0 12 5 0 0 19 
+5 5 2 10 0 5 0 0 12 19 
+Results of stblsrt1_test:
+-10 1 11 19 42 50 
+Results of stblsrt2_test:
+aa bb cc dd ll qq 
+Results of swap1_test:
+a = 42 b = 19
+a = 19 b = 42
+Results of swprnge1_test:
+World Hello
+Hello World
+Results of times_test:
+total = 70
+Results of trnsfrm1_test:
+5 1 0 -1 -6 -11 
+Results of trnsfrm2_test:
+Hello World!
+Results of ucompos1_test:
+1
+2
+4
+Results of ucompos2_test:
+1
+2
+4
+Results of unegate1_test:
+2
+Results of unegate2_test:
+2
+Results of uniqcpy1_test:
+0 1 2 3 4 0 0 0 
+Results of uniqcpy2_test:
+QQWWEERTTYY
+QQWWEERTTYY
+QWERTY
+Results of unique1_test:
+0 1 2 3 4 2 3 4 
+Results of unique2_test:
+QQWWEERTTYY
+QWERTYRTTYY
+Results of uprbnd1_test:
+0 0 0 0 1 1 1 1 2 2 2 2 3 3 3 3 4 4 4 4 
+3 can be inserted at index: 16
+Results of uprbnd2_test:
+d can be inserted at index: 4
+Results of vec1_test:
+empty = 1
+size = 0
+max_size = 1073741823
+size = 1
+v1[0] = 42
+Results of vec2_test:
+v1 = 32.1 40.5 
+v2 = 3.56 
+v1 = 3.56 
+v2 = 32.1 40.5 
+v2 = 3.56 
+Results of vec3_test:
+v1 = hi
+v2 = ho
+(v1 == v2) = 0
+(v1 < v2) = 1
+Results of vec4_test:
+front = 1
+back = 16, size = 4
+back = 25, size = 5
+back = 16, size = 4
+Results of vec5_test:
+v[0] = 1
+v[1] = 4
+v[2] = 9
+v[3] = 16
+Results of vec6_test:
+v[0] = 1
+v[1] = 4
+v[2] = 9
+v[3] = 16
+v[4] = 25
+v[5] = 36
+
+v[0] = 4
+v[1] = 9
+v[2] = 16
+v[3] = 25
+v[4] = 36
+
+v[0] = 4
+v[1] = 9
+v[2] = 16
+v[3] = 25
+
+v[0] = 4
+v[1] = 25
+
+Results of vec7_test:
+v[0] = 0
+v[1] = 1
+v[2] = 4
+v[3] = 25
+v[4] = 36
+
+v[0] = 0
+v[1] = 1
+v[2] = 4
+v[3] = 9
+v[4] = 16
+v[5] = 25
+v[6] = 36
+
+Results of vec8_test:
+capacity = 0
+capacity = 1
+capacity = 5000
+Results of hmap1_test:
+m['x'] = 20
+m['x'] = 10
+m['z'] = 
+m.count('z') = 1
+First insertion successful
+Existing pair c -> 100
+Results of hmmap1_test:
+count('X') = 0
+count('X') = 1
+count('X') = 2
+X -> 10
+X -> 20
+Y -> 32
+Erased 2 items
+Results of hset2_test:
+Inserted new element 42
+Existing element = 42
+Results of hmset1_test:
+count(42) = 0
+count(42) = 1
+count(42) = 2
+40 Not found
+Found *
+Erased 2 instances
+Results of slist1_test:
+original: xlxtss
+reversed: sstxlx
+removed: sstl
+uniqued: stl
+sorted: lst
+Results of string1_test:
+Hello, World!
+v[0] = H
+v[1] = !
+
+Hello, World!
+Results of bitset1_test:
+b1 size = 13
+b1 = 1111111111111
+b2 size = 13
+b2 = 1000100010001
+b1 = 1101110111011
diff --git a/main/source/stlport/test/regression/stl_test.freebsd.exp b/main/source/stlport/test/regression/stl_test.freebsd.exp
new file mode 100644
index 00000000..c0cba0c2
--- /dev/null
+++ b/main/source/stlport/test/regression/stl_test.freebsd.exp
@@ -0,0 +1,869 @@
+Results of accum1_test:
+sum = 15
+Results of accum2_test:
+prod = 120
+Results of adjdiff0_test:
+1 2 4 8 16 
+1 1 2 4 8 
+Results of adjdiff1_test:
+0 1 4 9 16 25 36 49 64 81 
+0 1 3 5 7 9 11 13 15 17 
+Results of adjdiff2_test:
+1 2 3 4 5 6 7 8 9 10 
+1 2 6 12 20 30 42 56 72 90 
+Results of adjfind0_test:
+No adjacent pairs
+Found adjacent pair of: 1 at offset 3
+Results of adjfind1_test:
+No adjacent pairs
+Found adjacent pair of: 7
+Results of adjfind2_test:
+Found two adjacent strings of equal length: Jack -and- Mike
+Results of advance_test:
+At Beginning: 0
+At Beginning + 5: 5
+Results of alg1_test:
+min(4, 7) = 4
+max('a', 'z') = z
+Results of alg2_test:
+Count of 2s = 3
+Results of alg3_test:
+Count of 2s = 3
+Results of alg4_test:
+1962
+1992
+1999
+2001
+Results of alg5_test:
+1962
+1992
+2001
+1999
+Results of bcompos1_test:
+1 is odd and positive
+Results of bcompos2_test:
+1 is odd and positive
+Results of bind1st1_test:
+1
+2
+Results of bind1st2_test:
+1
+2
+Results of bind2nd1_test:
+1
+2
+4
+Results of bind2nd2_test:
+1
+2
+4
+Results of binsert1_test:
+laurie
+jennifer
+leisa
+Results of binsert2_test:
+laurie
+jennifer
+leisa
+Results of binsrch1_test:
+found 42
+Results of binsrch2_test:
+ff is in labels.
+Results of bnegate1_test:
+1
+4
+7
+9
+Results of bnegate2_test:
+1
+4
+7
+9
+Results of bvec1_test:
+000
+101
+10101
+Results of copy1_test:
+ Src: A string to be copied.
+Dest: A string to be copied.
+Results of copy2_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copy3_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copy4_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copyb_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copyb0_test:
+1 2 3 4 5 
+1 2 3 4 5 
+Results of count0_test:
+Found 4 1's.
+Results of count1_test:
+Found 33 2's.
+Results of countif1_test:
+Found 33 odd elements.
+Results of deque1_test:
+d[0] = 1
+d[1] = 4
+d[2] = 9
+d[3] = 16
+
+d[0] = 4
+d[1] = 9
+d[2] = 25
+Results of divides_test:
+result = 2
+Results of eqlrnge0_test:
+2 can be inserted from before index 4 to before index 8
+Results of eqlrnge1_test:
+Within the collection:
+	0 0 0 1 1 1 2 2 2 3 
+2 can be inserted from before index 6 to before index 9
+Results of eqlrnge2_test:
+Within the collection:
+	aabbccddggghhklllmqqqqssyyzz
+q can be inserted from before index 18 to before index 22
+Results of equal0_test:
+numbers1 is not equal to numbers2
+numbers3 is equal to numbers1
+Results of equal1_test:
+v1 is not equal to v2
+v1 is equal to v2
+Results of equal2_test:
+v2[i] == v1[i] * v1[i]
+Results of equalto_test:
+1
+0
+1
+0
+Results of fill1_test:
+42 42 42 42 42 42 42 42 42 42 
+Results of filln1_test:
+42 42 42 42 42 42 42 42 42 42 
+Results of find0_test:
+Found 25 at offset 5
+Results of find1_test:
+Found 1972 at offset 3
+Results of findif0_test:
+Value 15 at offset 3 is odd
+Results of findif1_test:
+Value 9 at offset 2 is divisible by 3
+Results of finsert1_test:
+leisa
+jennifer
+laurie
+Results of finsert2_test:
+leisa
+jennifer
+laurie
+Results of foreach0_test:
+1 1 2 3 5 8 13 21 34 55 
+Results of foreach1_test:
+0 1 4 9 16 25 36 49 64 81 
+Results of func1_test:
+Number greater than 3 = 2
+Results of func2_test:
+5
+4
+1
+Results of func3_test:
+5
+4
+1
+Results of gener1_test:
+1103527590 377401575 662824084 1147902781 2035015474 368800899 1508029952 486256185 1062517886 267834847 
+Results of gener2_test:
+1 1 2 3 5 8 13 21 34 55 
+Results of genern1_test:
+180171308 836760821 595337866 790425851 2111915288 1149758321 1644289366 1388290519 1647418052 1675546029 
+Results of genern2_test:
+1 1 2 3 5 8 13 21 34 55 
+Results of greateq_test:
+4
+3
+2
+1
+Results of greater_test:
+4
+3
+2
+1
+Results of incl0_test:
+numbers1 does not include numbers3
+numbers2 includes numbers3
+Results of incl1_test:
+v1 does not include v2
+v1 includes v2
+Results of incl2_test:
+v1 does not include v2
+v1 includes v2
+Results of inplmrg1_test:
+1 10 42 3 16 32 
+1 3 10 16 32 42 
+Results of inplmrg2_test:
+4 3 2 1 0 4 3 2 1 0 
+4 4 3 3 2 2 1 1 0 0 
+Results of inrprod0_test:
+Inner product = 55
+Results of inrprod1_test:
+Inner product(sum of products) of:
+	1 2 3 
+	3 2 1 
+is: 10
+Results of inrprod2_test:
+Inner product(product of sums):
+	1 2 3 
+	3 2 1 
+is: 64
+Results of insert1_test:
+laurie
+jennifer
+amanda
+saskia
+carrie
+leisa
+Results of insert2_test:
+laurie
+jennifer
+amanda
+saskia
+carrie
+leisa
+Results of iota1_test:
+42 43 44 45 46 47 48 49 50 51 
+Results of istmit1_test:
+Please enter a string: read a string
+Results of iter1_test:
+zippy
+motorboy
+Results of iter2_test:
+zippy
+motorboy
+Results of iter3_test:
+motorboy
+zippy
+Results of iter4_test:
+last element is 3
+first element is 1
+Results of iterswp0_test:
+3 1 2 0 4 5 
+Results of iterswp1_test:
+3 1 2 0 4 5 
+Results of less_test:
+1
+2
+3
+4
+Results of lesseq_test:
+1
+2
+3
+4
+Results of lexcmp1_test:
+shine is before shoe
+Results of lexcmp2_test:
+shoe is after shine
+Results of list1_test:
+1
+4
+9
+16
+36
+Results of list2_test:
+1
+4
+9
+16
+Results of list3_test:
+original: xlxtss
+reversed: sstxlx
+removed: sstl
+uniqued: stl
+sorted: lst
+Results of list4_test:
+123467
+Results of logicand_test:
+0
+1
+0
+0
+Results of logicnot_test:
+count = 2
+Results of logicor_test:
+1
+1
+0
+1
+Results of lwrbnd1_test:
+0 0 0 0 1 1 1 1 2 2 2 2 3 3 3 3 4 4 4 4 
+3 can be inserted at index: 12
+Results of lwrbnd2_test:
+d can be inserted at index: 4
+Results of map1_test:
+m['x'] = 20
+m['x'] = 10
+m['z'] = 0
+m.count('z') = 1
+First insertion successful
+Existing pair c -> 100
+Results of max1_test:
+100
+Results of max2_test:
+shoe
+Results of maxelem1_test:
+56
+Results of maxelem2_test:
+Todd
+Results of merge0_test:
+-5 1 6 13 25 26 36 46 99 101 
+Results of merge1_test:
+0 1 2 3 4 
+3 4 5 6 7 
+0 1 2 3 3 4 4 5 6 7 
+Results of merge2_test:
+10 9 8 7 6 
+7 6 5 4 3 
+10 9 8 7 7 6 6 5 4 3 
+Results of min1_test:
+42
+Results of min2_test:
+shine
+Results of minelem1_test:
+-242
+Results of minelem2_test:
+Brett
+Results of minus_test:
+0
+1
+-1
+5
+Results of mismtch0_test:
+n1 and n2 are the same
+Mismatch at offset: 3
+Results of mismtch1_test:
+v1 and v2 are the same
+mismatch at index: 5
+Results of mismtch2_test:
+n1 and n2 are the same
+mismatch at index: 2
+Results of mkheap0_test:
+19
+13
+11
+10
+5
+4
+Results of mkheap1_test:
+4
+5
+10
+11
+13
+19
+Results of mmap1_test:
+count('X') = 0
+count('X') = 1
+count('X') = 2
+X -> 10
+X -> 20
+Y -> 32
+Erased 2 items
+Results of mmap2_test:
+lower bound:
+3 -> c
+upper bound:
+6 -> f
+Results of modulus_test:
+2
+0
+10
+2
+Results of mset1_test:
+count(42) = 0
+count(42) = 1
+count(42) = 2
+40 Not found
+Found 42
+Erased 2 instances
+Results of mset3_test:
+lower bound = 3
+upper bound = 6
+Results of mset4_test:
+lower bound = 3
+upper bound = 6
+Results of mset5_test:
+Using less_than: 
+1
+3
+6
+9
+Using greater_than: 
+9
+6
+3
+1
+Results of negate_test:
+-1
+-2
+-3
+Results of nequal_test:
+0
+1
+0
+1
+Results of nextprm0_test:
+0 2 1 
+Results of nextprm1_test:
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+2 0 1 
+2 1 0 
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+Results of nextprm2_test:
+ABC
+ACB
+BAC
+BCA
+CAB
+CBA
+ABC
+ACB
+BAC
+BCA
+Results of nthelem0_test:
+1 0 2 3 4 5 
+Results of nthelem1_test:
+2 5 2 1 8 5 4 1 6 5 
+1 1 2 2 4 5 5 8 6 5 
+Results of nthelem2_test:
+2 1 2 5 0 5 2 9 4 5 
+5 9 5 5 4 2 2 1 2 0 
+Results of ostmit_test:
+hello
+1524
+Results of pair0_test:
+p.first = 1, p.second = 10
+Results of pair1_test:
+p.first = 1, p.second = 10
+Results of pair2_test:
+p.first = 1
+p.second = 10
+Results of parsrt0_test:
+1 2 3 5 4 6 
+Results of parsrt1_test:
+6 9 4 3 4 1 2 5 4 7 
+1 2 3 4 4 9 6 5 4 7 
+Results of parsrt2_test:
+aa ff dd ee cc bb 
+aa bb cc ff ee dd 
+Results of parsrtc0_test:
+1 2 3 
+Results of parsrtc1_test:
+2 7 6 7 8 5 2 3 0 5 
+0 2 2 3 5 
+Results of parsrtc2_test:
+aa ff dd ee cc bb 
+aa ff dd ee cc bb 
+Results of partsrt0_test:
+1 2 3 5 4 6 
+Results of partsum0_test:
+1 3 6 10 15 21 
+Results of partsum1_test:
+0 1 2 3 4 5 6 7 8 9 
+0 1 3 6 10 15 21 28 36 45 
+Results of partsum2_test:
+1 2 3 4 5 
+1 2 6 24 120 
+Results of pheap1_test:
+1 4 7 20 
+Results of pheap2_test:
+20 7 4 1 
+Results of plus_test:
+total = 77
+Results of pqueue1_test:
+101
+69
+42
+Results of prevprm0_test:
+2 1 0 
+Results of prevprm1_test:
+0 1 2 
+2 1 0 
+2 0 1 
+1 2 0 
+1 0 2 
+0 2 1 
+0 1 2 
+2 1 0 
+2 0 1 
+1 2 0 
+Results of prevprm2_test:
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+2 0 1 
+2 1 0 
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+Results of ptition0_test:
+6 1 3 10 12 20 
+Results of ptition1_test:
+14 15 16 13 2 19 16 1 14 3 
+3 1 2 13 16 19 16 15 14 14 
+Results of ptrbinf1_test:
+8
+7
+8
+13
+Results of ptrbinf2_test:
+8
+7
+8
+13
+Results of ptrunf1_test:
+2 is even
+Results of ptrunf2_test:
+2 is even
+Results of queue1_test:
+42
+101
+69
+Results of rawiter_test:
+0
+1
+2
+3
+4
+Results of remcopy1_test:
+1 3 1 3 0 0 
+Results of remcpif1_test:
+2 2 0 0 0 0 
+Results of remif1_test:
+0 0 2 2 2 2 
+Results of remove1_test:
+2 3 2 3 2 3 
+Results of repcpif1_test:
+0 1 2 3 4 0 1 2 3 4 
+0 1 2 3 4 0 1 2 3 4 
+0 42 2 42 4 0 42 2 42 4 
+Results of replace0_test:
+0 1 42 0 1 42 
+Results of replace1_test:
+0 1 2 3 4 0 1 2 3 4 
+0 1 42 3 4 0 1 42 3 4 
+Results of replcpy1_test:
+0 1 42 0 1 42 
+Results of replif1_test:
+0 1 2 3 4 0 1 2 3 4 
+0 42 2 42 4 0 42 2 42 4 
+Results of revbit1_test:
+3
+2
+5
+1
+Results of revbit2_test:
+3
+2
+5
+1
+Results of revcopy1_test:
+0 1 2 3 4 5 
+5 4 3 2 1 0 
+Results of reverse1_test:
+5 4 3 2 1 0 
+Results of reviter1_test:
+Results of reviter2_test:
+3
+2
+5
+1
+Results of rndshuf0_test:
+6 1 4 3 5 2 
+Results of rndshuf1_test:
+0 1 2 3 4 5 6 7 8 9 
+2 9 0 4 8 5 6 7 3 1 
+5 2 9 0 3 8 6 4 1 7 
+5 6 9 3 2 7 8 0 4 1 
+Results of rndshuf2_test:
+0 1 2 3 4 5 6 7 8 9 
+2 4 9 1 5 8 0 3 6 7 
+5 8 9 3 2 6 1 0 4 7 
+7 9 6 8 5 2 1 3 0 4 
+Results of rotate0_test:
+3 4 5 0 1 2 
+Results of rotate1_test:
+0 1 2 3 4 5 6 7 8 9 
+0 1 2 3 4 5 6 7 8 9 
+1 2 3 4 5 6 7 8 9 0 
+3 4 5 6 7 8 9 0 1 2 
+6 7 8 9 0 1 2 3 4 5 
+0 1 2 3 4 5 6 7 8 9 
+5 6 7 8 9 0 1 2 3 4 
+1 2 3 4 5 6 7 8 9 0 
+8 9 0 1 2 3 4 5 6 7 
+6 7 8 9 0 1 2 3 4 5 
+5 6 7 8 9 0 1 2 3 4 
+
+Results of rotcopy0_test:
+3 4 5 0 1 2 
+Results of rotcopy1_test:
+0 1 2 3 4 5 6 7 8 9 
+0 1 2 3 4 5 6 7 8 9 
+1 2 3 4 5 6 7 8 9 0 
+2 3 4 5 6 7 8 9 0 1 
+3 4 5 6 7 8 9 0 1 2 
+4 5 6 7 8 9 0 1 2 3 
+5 6 7 8 9 0 1 2 3 4 
+6 7 8 9 0 1 2 3 4 5 
+7 8 9 0 1 2 3 4 5 6 
+8 9 0 1 2 3 4 5 6 7 
+9 0 1 2 3 4 5 6 7 8 
+
+Results of search0_test:
+v3 not contained in v1
+Found v3 in v2 at offset: 3
+Results of search1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 50 51 52 
+v2 not contained in v1
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 4 5 6 
+Found v2 in v1 at offset: 4
+Results of search2_test:
+grades: A B C D F 
+letters:Q E D 
+letters not found in grades
+grades: A B C D F 
+letters:B C D 
+letters found in grades at offset: 1
+Results of set1_test:
+count(42) = 0
+count(42) = 1
+count(42) = 1
+1 elements erased
+Results of set2_test:
+Inserted new element 42
+Existing element = 42
+Results of setdiff0_test:
+18 0 0 0 
+10 17 23 0 
+Results of setdiff1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+0 1 2 3 4 5 6 
+Results of setdiff2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+A B C D E F G H I J K 
+Results of setintr0_test:
+13 23 0 0 
+Results of setintr1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+7 8 9 
+Results of setintr2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+L M N O 
+Results of setsymd0_test:
+10 17 18 0 
+Results of setsymd1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+0 1 2 3 4 5 6 10 11 12 13 14 15 16 
+Results of setsymd2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+A B C D E F G H I J K P Q R S T U V W X Y Z 
+Results of setunon0_test:
+10 13 17 18 23 0 0 
+Results of setunon1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 
+Results of setunon2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+A B C D E F G H I J K L M N O P Q R S T U V W X Y Z 
+Results of sort1_test:
+-10 1 11 19 42 50 
+Results of sort2_test:
+before: 1 50 -10 11 42 19 
+after: 50 42 19 11 1 -10 
+Results of stack1_test:
+69
+101
+42
+Results of stack2_test:
+69
+101
+42
+Results of stblptn0_test:
+5 6 -2 10 11 20 
+Results of stblptn1_test:
+15 12 1 10 7 12 17 18 11 0 
+1 10 7 0 15 12 12 17 18 11 
+Results of stblsrt1_test:
+-10 1 11 19 42 50 
+Results of stblsrt2_test:
+aa bb cc dd ll qq 
+Results of swap1_test:
+a = 42 b = 19
+a = 19 b = 42
+Results of swprnge1_test:
+World Hello
+Hello World
+Results of times_test:
+total = 70
+Results of trnsfrm1_test:
+5 1 0 -1 -6 -11 
+Results of trnsfrm2_test:
+Hello World!
+Results of ucompos1_test:
+1
+2
+4
+Results of ucompos2_test:
+1
+2
+4
+Results of unegate1_test:
+2
+Results of unegate2_test:
+2
+Results of uniqcpy1_test:
+0 1 2 3 4 0 0 0 
+Results of uniqcpy2_test:
+QQWWEERTTYY
+QQWWEERTTYY
+QWERTY
+Results of unique1_test:
+0 1 2 3 4 2 3 4 
+Results of unique2_test:
+QQWWEERTTYY
+QWERTYRTTYY
+Results of uprbnd1_test:
+0 0 0 0 1 1 1 1 2 2 2 2 3 3 3 3 4 4 4 4 
+3 can be inserted at index: 16
+Results of uprbnd2_test:
+d can be inserted at index: 4
+Results of vec1_test:
+empty = 1
+size = 0
+max_size = 1073741823
+size = 1
+v1[0] = 42
+Results of vec2_test:
+v1 = 32.1 40.5 
+v2 = 3.56 
+v1 = 3.56 
+v2 = 32.1 40.5 
+v2 = 3.56 
+Results of vec3_test:
+v1 = hi
+v2 = ho
+(v1 == v2) = 0
+(v1 < v2) = 1
+Results of vec4_test:
+front = 1
+back = 16, size = 4
+back = 25, size = 5
+back = 16, size = 4
+Results of vec5_test:
+v[0] = 1
+v[1] = 4
+v[2] = 9
+v[3] = 16
+Results of vec6_test:
+v[0] = 1
+v[1] = 4
+v[2] = 9
+v[3] = 16
+v[4] = 25
+v[5] = 36
+
+v[0] = 4
+v[1] = 9
+v[2] = 16
+v[3] = 25
+v[4] = 36
+
+v[0] = 4
+v[1] = 9
+v[2] = 16
+v[3] = 25
+
+v[0] = 4
+v[1] = 25
+
+Results of vec7_test:
+v[0] = 0
+v[1] = 1
+v[2] = 4
+v[3] = 25
+v[4] = 36
+
+v[0] = 0
+v[1] = 1
+v[2] = 4
+v[3] = 9
+v[4] = 16
+v[5] = 25
+v[6] = 36
+
+Results of vec8_test:
+capacity = 0
+capacity = 1
+capacity = 5000
+Results of hmap1_test:
+m['x'] = 20
+m['x'] = 10
+m['z'] = 
+m.count('z') = 1
+First insertion successful
+Existing pair c -> 100
+Results of hmmap1_test:
+count('X') = 0
+count('X') = 1
+count('X') = 2
+X -> 10
+X -> 20
+Y -> 32
+Erased 2 items
+Results of hset2_test:
+Inserted new element 42
+Existing element = 42
+Results of hmset1_test:
+count(42) = 0
+count(42) = 1
+count(42) = 2
+40 Not found
+Found *
+Erased 2 instances
+Results of slist1_test:
+original: xlxtss
+reversed: sstxlx
+removed: sstl
+uniqued: stl
+sorted: lst
+Results of string1_test:
+Hello, World!
+v[0] = H
+v[1] = !
+
+Hello, World!
+Results of bitset1_test:
+b1 size = 13
+b1 = 1111111111111
+b2 size = 13
+b2 = 1000100010001
+b1 = 1101110111011
diff --git a/main/source/stlport/test/regression/stl_test.h b/main/source/stlport/test/regression/stl_test.h
new file mode 100644
index 00000000..9580794b
--- /dev/null
+++ b/main/source/stlport/test/regression/stl_test.h
@@ -0,0 +1,243 @@
+#ifndef _STL_TEST_H_
+#define _STL_TEST_H_
+//  An adapted ObjectSpace example for use with SGI STL
+extern int accum1_test  ( int, char**);
+extern int accum2_test  ( int, char**);
+extern int adjdiff0_test  ( int, char**);
+extern int adjdiff1_test  ( int, char**);
+extern int adjdiff2_test  ( int, char**);
+extern int adjfind0_test  ( int, char**);
+extern int adjfind1_test  ( int, char**);
+extern int adjfind2_test  ( int, char**);
+extern int advance_test  ( int, char**);
+extern int alg1_test  ( int, char**);
+extern int alg2_test  ( int, char**);
+extern int alg3_test  ( int, char**);
+extern int alg4_test  ( int, char**);
+extern int alg5_test  ( int, char**);
+extern int bcompos1_test  ( int, char**);
+extern int bcompos2_test  ( int, char**);
+extern int bind1st1_test  ( int, char**);
+extern int bind1st2_test  ( int, char**);
+extern int bind2nd1_test  ( int, char**);
+extern int bind2nd2_test  ( int, char**);
+extern int binsert1_test  ( int, char**);
+extern int binsert2_test  ( int, char**);
+extern int binsrch1_test  ( int, char**);
+extern int binsrch2_test  ( int, char**);
+extern int bnegate1_test  ( int, char**);
+extern int bnegate2_test  ( int, char**);
+extern int bvec1_test  ( int, char**);
+extern int copy1_test  ( int, char**);
+extern int copy2_test  ( int, char**);
+extern int copy3_test  ( int, char**);
+extern int copy4_test  ( int, char**);
+extern int copyb_test  ( int, char**);
+extern int copyb0_test  ( int, char**);
+extern int count0_test  ( int, char**);
+extern int count1_test  ( int, char**);
+extern int countif1_test  ( int, char**);
+extern int deque1_test  ( int, char**);
+extern int divides_test  ( int, char**);
+extern int eqlrnge0_test  ( int, char**);
+extern int eqlrnge1_test  ( int, char**);
+extern int eqlrnge2_test  ( int, char**);
+extern int equal0_test  ( int, char**);
+extern int equal1_test  ( int, char**);
+extern int equal2_test  ( int, char**);
+extern int equalto_test  ( int, char**);
+extern int error1_test  ( int, char**);
+extern int fill1_test  ( int, char**);
+extern int filln1_test  ( int, char**);
+extern int find0_test  ( int, char**);
+extern int find1_test  ( int, char**);
+extern int findif0_test  ( int, char**);
+extern int findif1_test  ( int, char**);
+extern int finsert1_test  ( int, char**);
+extern int finsert2_test  ( int, char**);
+extern int foreach0_test  ( int, char**);
+extern int foreach1_test  ( int, char**);
+extern int func1_test  ( int, char**);
+extern int func2_test  ( int, char**);
+extern int func3_test  ( int, char**);
+extern int gener1_test  ( int, char**);
+extern int gener2_test  ( int, char**);
+extern int genern1_test  ( int, char**);
+extern int genern2_test  ( int, char**);
+extern int greateq_test  ( int, char**);
+extern int greater_test  ( int, char**);
+extern int incl0_test  ( int, char**);
+extern int incl1_test  ( int, char**);
+extern int incl2_test  ( int, char**);
+extern int inplmrg1_test  ( int, char**);
+extern int inplmrg2_test  ( int, char**);
+extern int inrprod0_test  ( int, char**);
+extern int inrprod1_test  ( int, char**);
+extern int inrprod2_test  ( int, char**);
+extern int insert1_test  ( int, char**);
+extern int insert2_test  ( int, char**);
+extern int iota1_test  ( int, char**);
+extern int istmit1_test  ( int, char**);
+extern int iter1_test  ( int, char**);
+extern int iter2_test  ( int, char**);
+extern int iter3_test  ( int, char**);
+extern int iter4_test  ( int, char**);
+extern int iterswp0_test  ( int, char**);
+extern int iterswp1_test  ( int, char**);
+extern int less_test  ( int, char**);
+extern int lesseq_test  ( int, char**);
+extern int lexcmp1_test  ( int, char**);
+extern int lexcmp2_test  ( int, char**);
+extern int list1_test  ( int, char**);
+extern int list2_test  ( int, char**);
+extern int list3_test  ( int, char**);
+extern int list4_test  ( int, char**);
+extern int logicand_test  ( int, char**);
+extern int logicnot_test  ( int, char**);
+extern int logicor_test  ( int, char**);
+extern int lwrbnd1_test  ( int, char**);
+extern int lwrbnd2_test  ( int, char**);
+extern int map1_test  ( int, char**);
+extern int max1_test  ( int, char**);
+extern int max2_test  ( int, char**);
+extern int maxelem1_test  ( int, char**);
+extern int maxelem2_test  ( int, char**);
+extern int mem_ptr_fun_test  ( int, char**);
+extern int merge0_test  ( int, char**);
+extern int merge1_test  ( int, char**);
+extern int merge2_test  ( int, char**);
+extern int min1_test  ( int, char**);
+extern int min2_test  ( int, char**);
+extern int minelem1_test  ( int, char**);
+extern int minelem2_test  ( int, char**);
+extern int minus_test  ( int, char**);
+extern int mismtch0_test  ( int, char**);
+extern int mismtch1_test  ( int, char**);
+extern int mismtch2_test  ( int, char**);
+extern int mkheap0_test  ( int, char**);
+extern int mkheap1_test  ( int, char**);
+extern int mmap1_test  ( int, char**);
+extern int mmap2_test  ( int, char**);
+extern int modulus_test  ( int, char**);
+extern int mset1_test  ( int, char**);
+extern int mset3_test  ( int, char**);
+extern int mset4_test  ( int, char**);
+extern int mset5_test  ( int, char**);
+extern int negate_test  ( int, char**);
+extern int nequal_test  ( int, char**);
+extern int nextprm0_test  ( int, char**);
+extern int nextprm1_test  ( int, char**);
+extern int nextprm2_test  ( int, char**);
+extern int nthelem0_test  ( int, char**);
+extern int nthelem1_test  ( int, char**);
+extern int nthelem2_test  ( int, char**);
+extern int ostmit_test  ( int, char**);
+extern int pair0_test  ( int, char**);
+extern int pair1_test  ( int, char**);
+extern int pair2_test  ( int, char**);
+extern int parsrt0_test  ( int, char**);
+extern int parsrt1_test  ( int, char**);
+extern int parsrt2_test  ( int, char**);
+extern int parsrtc0_test  ( int, char**);
+extern int parsrtc1_test  ( int, char**);
+extern int parsrtc2_test  ( int, char**);
+extern int partsrt0_test  ( int, char**);
+extern int partsum0_test  ( int, char**);
+extern int partsum1_test  ( int, char**);
+extern int partsum2_test  ( int, char**);
+extern int pheap1_test  ( int, char**);
+extern int pheap2_test  ( int, char**);
+extern int plus_test  ( int, char**);
+extern int pqueue1_test  ( int, char**);
+extern int prevprm0_test  ( int, char**);
+extern int prevprm1_test  ( int, char**);
+extern int prevprm2_test  ( int, char**);
+extern int ptition0_test  ( int, char**);
+extern int ptition1_test  ( int, char**);
+extern int ptrbinf1_test  ( int, char**);
+extern int ptrbinf2_test  ( int, char**);
+extern int ptrunf1_test  ( int, char**);
+extern int ptrunf2_test  ( int, char**);
+extern int queue1_test  ( int, char**);
+extern int rawiter_test  ( int, char**);
+extern int remcopy1_test  ( int, char**);
+extern int remcpif1_test  ( int, char**);
+extern int remif1_test  ( int, char**);
+extern int remove1_test  ( int, char**);
+extern int repcpif1_test  ( int, char**);
+extern int replace0_test  ( int, char**);
+extern int replace1_test  ( int, char**);
+extern int replcpy1_test  ( int, char**);
+extern int replif1_test  ( int, char**);
+extern int revbit1_test  ( int, char**);
+extern int revbit2_test  ( int, char**);
+extern int revcopy1_test  ( int, char**);
+extern int reverse1_test  ( int, char**);
+extern int reviter1_test  ( int, char**);
+extern int reviter2_test  ( int, char**);
+extern int rndshuf0_test  ( int, char**);
+extern int rndshuf1_test  ( int, char**);
+extern int rndshuf2_test  ( int, char**);
+extern int rotate0_test  ( int, char**);
+extern int rotate1_test  ( int, char**);
+extern int rotcopy0_test  ( int, char**);
+extern int rotcopy1_test  ( int, char**);
+extern int search0_test  ( int, char**);
+extern int search1_test  ( int, char**);
+extern int search2_test  ( int, char**);
+extern int set1_test  ( int, char**);
+extern int set2_test  ( int, char**);
+extern int setdiff0_test  ( int, char**);
+extern int setdiff1_test  ( int, char**);
+extern int setdiff2_test  ( int, char**);
+extern int setintr0_test  ( int, char**);
+extern int setintr1_test  ( int, char**);
+extern int setintr2_test  ( int, char**);
+extern int setsymd0_test  ( int, char**);
+extern int setsymd1_test  ( int, char**);
+extern int setsymd2_test  ( int, char**);
+extern int setunon0_test  ( int, char**);
+extern int setunon1_test  ( int, char**);
+extern int setunon2_test  ( int, char**);
+extern int single_test  ( int, char**);
+extern int sort1_test  ( int, char**);
+extern int sort2_test  ( int, char**);
+extern int stack1_test  ( int, char**);
+extern int stack2_test  ( int, char**);
+extern int stat_test  ( int, char**);
+extern int stblptn0_test  ( int, char**);
+extern int stblptn1_test  ( int, char**);
+extern int stblsrt1_test  ( int, char**);
+extern int stblsrt2_test  ( int, char**);
+extern int swap1_test  ( int, char**);
+extern int swprnge1_test  ( int, char**);
+extern int times_test  ( int, char**);
+extern int trnsfrm1_test  ( int, char**);
+extern int trnsfrm2_test  ( int, char**);
+extern int ucompos1_test  ( int, char**);
+extern int ucompos2_test  ( int, char**);
+extern int unegate1_test  ( int, char**);
+extern int unegate2_test  ( int, char**);
+extern int uniqcpy1_test  ( int, char**);
+extern int uniqcpy2_test  ( int, char**);
+extern int unique1_test  ( int, char**);
+extern int unique2_test  ( int, char**);
+extern int uprbnd1_test  ( int, char**);
+extern int uprbnd2_test  ( int, char**);
+extern int vec1_test  ( int, char**);
+extern int vec2_test  ( int, char**);
+extern int vec3_test  ( int, char**);
+extern int vec4_test  ( int, char**);
+extern int vec5_test  ( int, char**);
+extern int vec6_test  ( int, char**);
+extern int vec7_test  ( int, char**);
+extern int vec8_test  ( int, char**);
+extern int hmap1_test  ( int, char**);
+extern int hmmap1_test  ( int, char**);
+extern int hset2_test  ( int, char**);
+extern int hmset1_test  ( int, char**);
+extern int slist1_test (int, char**);
+extern int string1_test (int, char**);
+extern int bitset1_test (int, char**);
+extern int string_mt_test(int, char **);
+#endif
diff --git a/main/source/stlport/test/regression/stl_test.ibm390.exp b/main/source/stlport/test/regression/stl_test.ibm390.exp
new file mode 100644
index 00000000..5c00a203
--- /dev/null
+++ b/main/source/stlport/test/regression/stl_test.ibm390.exp
@@ -0,0 +1,869 @@
+Results of accum1_test:
+sum = 15
+Results of accum2_test:
+prod = 120
+Results of adjdiff0_test:
+1 2 4 8 16 
+1 1 2 4 8 
+Results of adjdiff1_test:
+0 1 4 9 16 25 36 49 64 81 
+0 1 3 5 7 9 11 13 15 17 
+Results of adjdiff2_test:
+1 2 3 4 5 6 7 8 9 10 
+1 2 6 12 20 30 42 56 72 90 
+Results of adjfind0_test:
+No adjacent pairs
+Found adjacent pair of: 1 at offset 3
+Results of adjfind1_test:
+No adjacent pairs
+Found adjacent pair of: 7
+Results of adjfind2_test:
+Found two adjacent strings of equal length: Jack -and- Mike
+Results of advance_test:
+At Beginning: 0
+At Beginning + 5: 5
+Results of alg1_test:
+min(4, 7) = 4
+max('a', 'z') = z
+Results of alg2_test:
+Count of 2s = 3
+Results of alg3_test:
+Count of 2s = 3
+Results of alg4_test:
+1962
+1992
+1999
+2001
+Results of alg5_test:
+1962
+1992
+2001
+1999
+Results of bcompos1_test:
+1 is odd and positive
+Results of bcompos2_test:
+1 is odd and positive
+Results of bind1st1_test:
+1
+2
+Results of bind1st2_test:
+1
+2
+Results of bind2nd1_test:
+1
+2
+4
+Results of bind2nd2_test:
+1
+2
+4
+Results of binsert1_test:
+laurie
+jennifer
+leisa
+Results of binsert2_test:
+laurie
+jennifer
+leisa
+Results of binsrch1_test:
+found 42
+Results of binsrch2_test:
+ff is in labels.
+Results of bnegate1_test:
+1
+4
+7
+9
+Results of bnegate2_test:
+1
+4
+7
+9
+Results of bvec1_test:
+000
+101
+10101
+Results of copy1_test:
+ Src: A string to be copied.
+Dest: A string to be copied.
+Results of copy2_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copy3_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copy4_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copyb_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copyb0_test:
+1 2 3 4 5 
+1 2 3 4 5 
+Results of count0_test:
+Found 4 1's.
+Results of count1_test:
+Found 33 2's.
+Results of countif1_test:
+Found 33 odd elements.
+Results of deque1_test:
+d[0] = 1
+d[1] = 4
+d[2] = 9
+d[3] = 16
+
+d[0] = 4
+d[1] = 9
+d[2] = 25
+Results of divides_test:
+result = 2
+Results of eqlrnge0_test:
+2 can be inserted from before index 4 to before index 8
+Results of eqlrnge1_test:
+Within the collection:
+	0 0 0 1 1 1 2 2 2 3 
+2 can be inserted from before index 6 to before index 9
+Results of eqlrnge2_test:
+Within the collection:
+	aabbccddggghhklllmqqqqssyyzz
+q can be inserted from before index 18 to before index 22
+Results of equal0_test:
+numbers1 is not equal to numbers2
+numbers3 is equal to numbers1
+Results of equal1_test:
+v1 is not equal to v2
+v1 is equal to v2
+Results of equal2_test:
+v2[i] == v1[i] * v1[i]
+Results of equalto_test:
+1
+0
+1
+0
+Results of fill1_test:
+42 42 42 42 42 42 42 42 42 42 
+Results of filln1_test:
+42 42 42 42 42 42 42 42 42 42 
+Results of find0_test:
+Found 25 at offset 5
+Results of find1_test:
+Found 1972 at offset 3
+Results of findif0_test:
+Value 15 at offset 3 is odd
+Results of findif1_test:
+Value 9 at offset 2 is divisible by 3
+Results of finsert1_test:
+leisa
+jennifer
+laurie
+Results of finsert2_test:
+leisa
+jennifer
+laurie
+Results of foreach0_test:
+1 1 2 3 5 8 13 21 34 55 
+Results of foreach1_test:
+0 1 4 9 16 25 36 49 64 81 
+Results of func1_test:
+Number greater than 3 = 2
+Results of func2_test:
+5
+4
+1
+Results of func3_test:
+5
+4
+1
+Results of gener1_test:
+16838 5758 10113 17515 31051 5627 23010 7419 16212 4086 
+Results of gener2_test:
+1 1 2 3 5 8 13 21 34 55 
+Results of genern1_test:
+2749 12767 9084 12060 32225 17543 25089 21183 25137 25566 
+Results of genern2_test:
+1 1 2 3 5 8 13 21 34 55 
+Results of greateq_test:
+4
+3
+2
+1
+Results of greater_test:
+4
+3
+2
+1
+Results of incl0_test:
+numbers1 does not include numbers3
+numbers2 includes numbers3
+Results of incl1_test:
+v1 does not include v2
+v1 includes v2
+Results of incl2_test:
+v1 does not include v2
+v1 includes v2
+Results of inplmrg1_test:
+1 10 42 3 16 32 
+1 3 10 16 32 42 
+Results of inplmrg2_test:
+4 3 2 1 0 4 3 2 1 0 
+4 4 3 3 2 2 1 1 0 0 
+Results of inrprod0_test:
+Inner product = 55
+Results of inrprod1_test:
+Inner product(sum of products) of:
+	1 2 3 
+	3 2 1 
+is: 10
+Results of inrprod2_test:
+Inner product(product of sums):
+	1 2 3 
+	3 2 1 
+is: 64
+Results of insert1_test:
+laurie
+jennifer
+amanda
+saskia
+carrie
+leisa
+Results of insert2_test:
+laurie
+jennifer
+amanda
+saskia
+carrie
+leisa
+Results of iota1_test:
+42 43 44 45 46 47 48 49 50 51 
+Results of istmit1_test:
+Please enter a string: read a string
+Results of iter1_test:
+zippy
+motorboy
+Results of iter2_test:
+zippy
+motorboy
+Results of iter3_test:
+motorboy
+zippy
+Results of iter4_test:
+last element is 3
+first element is 1
+Results of iterswp0_test:
+3 1 2 0 4 5 
+Results of iterswp1_test:
+3 1 2 0 4 5 
+Results of less_test:
+1
+2
+3
+4
+Results of lesseq_test:
+1
+2
+3
+4
+Results of lexcmp1_test:
+shine is before shoe
+Results of lexcmp2_test:
+shoe is after shine
+Results of list1_test:
+1
+4
+9
+16
+36
+Results of list2_test:
+1
+4
+9
+16
+Results of list3_test:
+original: xlxtss
+reversed: sstxlx
+removed: sstl
+uniqued: stl
+sorted: lst
+Results of list4_test:
+123467
+Results of logicand_test:
+0
+1
+0
+0
+Results of logicnot_test:
+count = 2
+Results of logicor_test:
+1
+1
+0
+1
+Results of lwrbnd1_test:
+0 0 0 0 1 1 1 1 2 2 2 2 3 3 3 3 4 4 4 4 
+3 can be inserted at index: 12
+Results of lwrbnd2_test:
+d can be inserted at index: 4
+Results of map1_test:
+m['x'] = 20
+m['x'] = 10
+m['z'] = 0
+m.count('z') = 1
+First insertion successful
+Existing pair c -> 100
+Results of max1_test:
+100
+Results of max2_test:
+shoe
+Results of maxelem1_test:
+56
+Results of maxelem2_test:
+Todd
+Results of merge0_test:
+-5 1 6 13 25 26 36 46 99 101 
+Results of merge1_test:
+0 1 2 3 4 
+3 4 5 6 7 
+0 1 2 3 3 4 4 5 6 7 
+Results of merge2_test:
+10 9 8 7 6 
+7 6 5 4 3 
+10 9 8 7 7 6 6 5 4 3 
+Results of min1_test:
+42
+Results of min2_test:
+shine
+Results of minelem1_test:
+-242
+Results of minelem2_test:
+Brett
+Results of minus_test:
+0
+1
+-1
+5
+Results of mismtch0_test:
+n1 and n2 are the same
+Mismatch at offset: 3
+Results of mismtch1_test:
+v1 and v2 are the same
+mismatch at index: 5
+Results of mismtch2_test:
+n1 and n2 are the same
+mismatch at index: 2
+Results of mkheap0_test:
+19
+13
+11
+10
+5
+4
+Results of mkheap1_test:
+4
+5
+10
+11
+13
+19
+Results of mmap1_test:
+count('X') = 0
+count('X') = 1
+count('X') = 2
+X -> 10
+X -> 20
+Y -> 32
+Erased 2 items
+Results of mmap2_test:
+lower bound:
+3 -> c
+upper bound:
+6 -> f
+Results of modulus_test:
+2
+0
+10
+2
+Results of mset1_test:
+count(42) = 0
+count(42) = 1
+count(42) = 2
+40 Not found
+Found 42
+Erased 2 instances
+Results of mset3_test:
+lower bound = 3
+upper bound = 6
+Results of mset4_test:
+lower bound = 3
+upper bound = 6
+Results of mset5_test:
+Using less_than: 
+1
+3
+6
+9
+Using greater_than: 
+9
+6
+3
+1
+Results of negate_test:
+-1
+-2
+-3
+Results of nequal_test:
+0
+1
+0
+1
+Results of nextprm0_test:
+0 2 1 
+Results of nextprm1_test:
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+2 0 1 
+2 1 0 
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+Results of nextprm2_test:
+ABC
+ACB
+BAC
+BCA
+CAB
+CBA
+ABC
+ACB
+BAC
+BCA
+Results of nthelem0_test:
+1 0 2 3 4 5 
+Results of nthelem1_test:
+6 8 5 1 7 4 1 5 2 6 
+1 1 4 2 5 5 6 7 8 6 
+Results of nthelem2_test:
+4 5 4 2 1 7 4 3 1 6 
+6 7 4 4 5 4 3 2 1 1 
+Results of ostmit_test:
+hello
+1524
+Results of pair0_test:
+p.first = 1, p.second = 10
+Results of pair1_test:
+p.first = 1, p.second = 10
+Results of pair2_test:
+p.first = 1
+p.second = 10
+Results of parsrt0_test:
+1 2 3 5 4 6 
+Results of parsrt1_test:
+8 8 5 3 7 6 5 3 2 4 
+2 3 3 4 5 8 8 7 6 5 
+Results of parsrt2_test:
+aa ff dd ee cc bb 
+aa bb cc ff ee dd 
+Results of parsrtc0_test:
+1 2 3 
+Results of parsrtc1_test:
+3 0 4 3 2 8 2 7 7 5 
+0 2 2 3 3 
+Results of parsrtc2_test:
+aa ff dd ee cc bb 
+aa ff dd ee cc bb 
+Results of partsrt0_test:
+1 2 3 5 4 6 
+Results of partsum0_test:
+1 3 6 10 15 21 
+Results of partsum1_test:
+0 1 2 3 4 5 6 7 8 9 
+0 1 3 6 10 15 21 28 36 45 
+Results of partsum2_test:
+1 2 3 4 5 
+1 2 6 24 120 
+Results of pheap1_test:
+1 4 7 20 
+Results of pheap2_test:
+20 7 4 1 
+Results of plus_test:
+total = 77
+Results of pqueue1_test:
+101
+69
+42
+Results of prevprm0_test:
+2 1 0 
+Results of prevprm1_test:
+0 1 2 
+2 1 0 
+2 0 1 
+1 2 0 
+1 0 2 
+0 2 1 
+0 1 2 
+2 1 0 
+2 0 1 
+1 2 0 
+Results of prevprm2_test:
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+2 0 1 
+2 1 0 
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+Results of ptition0_test:
+6 1 3 10 12 20 
+Results of ptition1_test:
+19 3 11 14 10 19 8 17 9 6 
+6 3 9 8 10 19 14 17 11 19 
+Results of ptrbinf1_test:
+8
+7
+8
+13
+Results of ptrbinf2_test:
+8
+7
+8
+13
+Results of ptrunf1_test:
+2 is even
+Results of ptrunf2_test:
+2 is even
+Results of queue1_test:
+42
+101
+69
+Results of rawiter_test:
+0
+1
+2
+3
+4
+Results of remcopy1_test:
+1 3 1 3 0 0 
+Results of remcpif1_test:
+2 2 0 0 0 0 
+Results of remif1_test:
+0 0 2 2 2 2 
+Results of remove1_test:
+2 3 2 3 2 3 
+Results of repcpif1_test:
+0 1 2 3 4 0 1 2 3 4 
+0 1 2 3 4 0 1 2 3 4 
+0 42 2 42 4 0 42 2 42 4 
+Results of replace0_test:
+0 1 42 0 1 42 
+Results of replace1_test:
+0 1 2 3 4 0 1 2 3 4 
+0 1 42 3 4 0 1 42 3 4 
+Results of replcpy1_test:
+0 1 42 0 1 42 
+Results of replif1_test:
+0 1 2 3 4 0 1 2 3 4 
+0 42 2 42 4 0 42 2 42 4 
+Results of revbit1_test:
+3
+2
+5
+1
+Results of revbit2_test:
+3
+2
+5
+1
+Results of revcopy1_test:
+0 1 2 3 4 5 
+5 4 3 2 1 0 
+Results of reverse1_test:
+5 4 3 2 1 0 
+Results of reviter1_test:
+Results of reviter2_test:
+3
+2
+5
+1
+Results of rndshuf0_test:
+2 5 4 1 6 3 
+Results of rndshuf1_test:
+0 1 2 3 4 5 6 7 8 9 
+5 8 0 6 3 1 9 2 4 7 
+2 3 4 6 0 8 9 1 5 7 
+5 7 2 9 0 4 8 6 3 1 
+Results of rndshuf2_test:
+0 1 2 3 4 5 6 7 8 9 
+6 9 7 1 2 3 4 5 0 8 
+9 6 5 4 3 7 2 0 1 8 
+6 9 3 5 4 2 8 0 1 7 
+Results of rotate0_test:
+3 4 5 0 1 2 
+Results of rotate1_test:
+0 1 2 3 4 5 6 7 8 9 
+0 1 2 3 4 5 6 7 8 9 
+1 2 3 4 5 6 7 8 9 0 
+3 4 5 6 7 8 9 0 1 2 
+6 7 8 9 0 1 2 3 4 5 
+0 1 2 3 4 5 6 7 8 9 
+5 6 7 8 9 0 1 2 3 4 
+1 2 3 4 5 6 7 8 9 0 
+8 9 0 1 2 3 4 5 6 7 
+6 7 8 9 0 1 2 3 4 5 
+5 6 7 8 9 0 1 2 3 4 
+
+Results of rotcopy0_test:
+3 4 5 0 1 2 
+Results of rotcopy1_test:
+0 1 2 3 4 5 6 7 8 9 
+0 1 2 3 4 5 6 7 8 9 
+1 2 3 4 5 6 7 8 9 0 
+2 3 4 5 6 7 8 9 0 1 
+3 4 5 6 7 8 9 0 1 2 
+4 5 6 7 8 9 0 1 2 3 
+5 6 7 8 9 0 1 2 3 4 
+6 7 8 9 0 1 2 3 4 5 
+7 8 9 0 1 2 3 4 5 6 
+8 9 0 1 2 3 4 5 6 7 
+9 0 1 2 3 4 5 6 7 8 
+
+Results of search0_test:
+v3 not contained in v1
+Found v3 in v2 at offset: 3
+Results of search1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 50 51 52 
+v2 not contained in v1
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 4 5 6 
+Found v2 in v1 at offset: 4
+Results of search2_test:
+grades: A B C D F 
+letters:Q E D 
+letters not found in grades
+grades: A B C D F 
+letters:B C D 
+letters found in grades at offset: 1
+Results of set1_test:
+count(42) = 0
+count(42) = 1
+count(42) = 1
+1 elements erased
+Results of set2_test:
+Inserted new element 42
+Existing element = 42
+Results of setdiff0_test:
+18 0 0 0 
+10 17 23 0 
+Results of setdiff1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+0 1 2 3 4 5 6 
+Results of setdiff2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+A B C D E F G H I J K 
+Results of setintr0_test:
+13 23 0 0 
+Results of setintr1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+7 8 9 
+Results of setintr2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+L M N O 
+Results of setsymd0_test:
+10 17 18 0 
+Results of setsymd1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+0 1 2 3 4 5 6 10 11 12 13 14 15 16 
+Results of setsymd2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+A B C D E F G H I J K P Q R S T U V W X Y Z 
+Results of setunon0_test:
+10 13 17 18 23 0 0 
+Results of setunon1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 
+Results of setunon2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+A B C D E F G H I J K L M N O P Q R S T U V W X Y Z 
+Results of sort1_test:
+-10 1 11 19 42 50 
+Results of sort2_test:
+before: 1 50 -10 11 42 19 
+after: 50 42 19 11 1 -10 
+Results of stack1_test:
+69
+101
+42
+Results of stack2_test:
+69
+101
+42
+Results of stblptn0_test:
+5 6 -2 10 11 20 
+Results of stblptn1_test:
+5 5 2 10 0 12 5 0 0 19 
+5 5 2 10 0 5 0 0 12 19 
+Results of stblsrt1_test:
+-10 1 11 19 42 50 
+Results of stblsrt2_test:
+aa bb cc dd ll qq 
+Results of swap1_test:
+a = 42 b = 19
+a = 19 b = 42
+Results of swprnge1_test:
+World Hello
+Hello World
+Results of times_test:
+total = 70
+Results of trnsfrm1_test:
+5 1 0 -1 -6 -11 
+Results of trnsfrm2_test:
+Hello World!
+Results of ucompos1_test:
+1
+2
+4
+Results of ucompos2_test:
+1
+2
+4
+Results of unegate1_test:
+2
+Results of unegate2_test:
+2
+Results of uniqcpy1_test:
+0 1 2 3 4 0 0 0 
+Results of uniqcpy2_test:
+QQWWEERTTYY
+QQWWEERTTYY
+QWERTY
+Results of unique1_test:
+0 1 2 3 4 2 3 4 
+Results of unique2_test:
+QQWWEERTTYY
+QWERTYRTTYY
+Results of uprbnd1_test:
+0 0 0 0 1 1 1 1 2 2 2 2 3 3 3 3 4 4 4 4 
+3 can be inserted at index: 16
+Results of uprbnd2_test:
+d can be inserted at index: 4
+Results of vec1_test:
+empty = 1
+size = 0
+max_size = 1073741823
+size = 1
+v1[0] = 42
+Results of vec2_test:
+v1 = 32.1 40.5 
+v2 = 3.56 
+v1 = 3.56 
+v2 = 32.1 40.5 
+v2 = 3.56 
+Results of vec3_test:
+v1 = hi
+v2 = ho
+(v1 == v2) = 0
+(v1 < v2) = 1
+Results of vec4_test:
+front = 1
+back = 16, size = 4
+back = 25, size = 5
+back = 16, size = 4
+Results of vec5_test:
+v[0] = 1
+v[1] = 4
+v[2] = 9
+v[3] = 16
+Results of vec6_test:
+v[0] = 1
+v[1] = 4
+v[2] = 9
+v[3] = 16
+v[4] = 25
+v[5] = 36
+
+v[0] = 4
+v[1] = 9
+v[2] = 16
+v[3] = 25
+v[4] = 36
+
+v[0] = 4
+v[1] = 9
+v[2] = 16
+v[3] = 25
+
+v[0] = 4
+v[1] = 25
+
+Results of vec7_test:
+v[0] = 0
+v[1] = 1
+v[2] = 4
+v[3] = 25
+v[4] = 36
+
+v[0] = 0
+v[1] = 1
+v[2] = 4
+v[3] = 9
+v[4] = 16
+v[5] = 25
+v[6] = 36
+
+Results of vec8_test:
+capacity = 0
+capacity = 1
+capacity = 5000
+Results of hmap1_test:
+m['x'] = 20
+m['x'] = 10
+m['z'] = 
+m.count('z') = 1
+First insertion successful
+Existing pair c -> 100
+Results of hmmap1_test:
+count('X') = 0
+count('X') = 1
+count('X') = 2
+X -> 10
+X -> 20
+Y -> 32
+Erased 2 items
+Results of hset2_test:
+Inserted new element 42
+Existing element = 42
+Results of hmset1_test:
+count(92) = 0
+count(92) = 1
+count(92) = 2
+40 Not found
+Found *
+Erased 2 instances
+Results of slist1_test:
+original: xlxtss
+reversed: sstxlx
+removed: sstl
+uniqued: stl
+sorted: lst
+Results of string1_test:
+Hello, World!
+v[0] = H
+v[1] = !
+
+Hello, World!
+Results of bitset1_test:
+b1 size = 13
+b1 = 1111111111111
+b2 size = 13
+b2 = 1000100010001
+b1 = 1101110111011
diff --git a/main/source/stlport/test/regression/stl_test.mak b/main/source/stlport/test/regression/stl_test.mak
new file mode 100644
index 00000000..ae7874f4
--- /dev/null
+++ b/main/source/stlport/test/regression/stl_test.mak
@@ -0,0 +1,370 @@
+# Microsoft Developer Studio Generated NMAKE File, Format Version 4.10
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) External Target" 0x0106
+
+!IF "$(CFG)" == ""
+CFG=stl_test - Win32 Debug
+!MESSAGE No configuration specified.  Defaulting to stl_test - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "stl_test - Win32 Release" && "$(CFG)" !=\
+ "stl_test - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE on this makefile
+!MESSAGE by defining the macro CFG on the command line.  For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "stl_test.mak" CFG="stl_test - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "stl_test - Win32 Release" (based on "Win32 (x86) External Target")
+!MESSAGE "stl_test - Win32 Debug" (based on "Win32 (x86) External Target")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+################################################################################
+# Begin Project
+# PROP Target_Last_Scanned "stl_test - Win32 Debug"
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP BASE Cmd_Line "NMAKE /f stl_test.mak"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "stl_test.exe"
+# PROP BASE Bsc_Name "stl_test.bsc"
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# PROP Cmd_Line "NMAKE /f stl_test.mak"
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "stl_test.exe"
+# PROP Bsc_Name "stl_test.bsc"
+OUTDIR=.\Release
+INTDIR=.\Release
+
+ALL : 
+
+CLEAN : 
+	-@erase 
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP BASE Cmd_Line "NMAKE /f stl_test.mak"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "stl_test.exe"
+# PROP BASE Bsc_Name "stl_test.bsc"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# PROP Cmd_Line "NMAKE /f stl_test.mak"
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "stl_test.exe"
+# PROP Bsc_Name "stl_test.bsc"
+OUTDIR=.\Debug
+INTDIR=.\Debug
+
+ALL : 
+
+CLEAN : 
+	-@erase 
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+!ENDIF 
+
+################################################################################
+# Begin Target
+
+# Name "stl_test - Win32 Release"
+# Name "stl_test - Win32 Debug"
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+".\stl_test.exe" : 
+   CD c:\home\fbp\stl\test\os
+   NMAKE /f stl_test.mak
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+".\stl_test.exe" : 
+   CD c:\home\fbp\stl\test\os
+   NMAKE /f stl_test.mak
+
+!ENDIF 
+
+################################################################################
+# Begin Source File
+
+SOURCE=.\binsert2.cpp
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\accum2.cpp
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\adjdiff0.cpp
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\adjdiff1.cpp
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\adjdiff2.cpp
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\adjfind0.cpp
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\adjfind1.cpp
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\adjfind2.cpp
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\advance.cpp
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\alg1.cpp
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\alg2.cpp
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\alg3.cpp
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\alg4.cpp
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\alg5.cpp
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\bcompos1.cpp
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\bcompos2.cpp
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\bind1st2.cpp
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\bind2nd1.cpp
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\bind2nd2.cpp
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\binsert1.cpp
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\accum1.cpp
+
+!IF  "$(CFG)" == "stl_test - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "stl_test - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# End Target
+# End Project
+################################################################################
diff --git a/main/source/stlport/test/regression/stl_test.rand.exp b/main/source/stlport/test/regression/stl_test.rand.exp
new file mode 100644
index 00000000..d2f39fab
--- /dev/null
+++ b/main/source/stlport/test/regression/stl_test.rand.exp
@@ -0,0 +1,852 @@
+Results of accum1_test:
+sum = 15
+Results of accum2_test:
+prod = 120
+Results of adjdiff0_test:
+1 2 4 8 16 
+1 1 2 4 8 
+Results of adjdiff1_test:
+0 1 4 9 16 25 36 49 64 81 
+0 1 3 5 7 9 11 13 15 17 
+Results of adjdiff2_test:
+1 2 3 4 5 6 7 8 9 10 
+1 2 6 12 20 30 42 56 72 90 
+Results of adjfind0_test:
+No adjacent pairs
+Found adjacent pair of: 1 at offset 3
+Results of adjfind1_test:
+No adjacent pairs
+Found adjacent pair of: 7
+Results of adjfind2_test:
+Found two adjacent strings of equal length: Jack -and- Mike
+Results of advance_test:
+At Beginning: 0
+At Beginning + 5: 5
+Results of alg1_test:
+min(4, 7) = 4
+max('a', 'z') = z
+Results of alg2_test:
+Count of 2s = 3
+Results of alg3_test:
+Count of 2s = 3
+Results of alg4_test:
+1962
+1992
+1999
+2001
+Results of alg5_test:
+1962
+1992
+2001
+1999
+Results of bcompos1_test:
+1 is odd and positive
+Results of bcompos2_test:
+1 is odd and positive
+Results of bind1st1_test:
+1
+2
+Results of bind1st2_test:
+1
+2
+Results of bind2nd1_test:
+1
+2
+4
+Results of bind2nd2_test:
+1
+2
+4
+Results of binsert1_test:
+laurie
+jennifer
+leisa
+Results of binsert2_test:
+laurie
+jennifer
+leisa
+Results of binsrch1_test:
+found 42
+Results of binsrch2_test:
+ff is in labels.
+Results of bnegate1_test:
+1
+4
+7
+9
+Results of bnegate2_test:
+1
+4
+7
+9
+Results of bvec1_test:
+000
+101
+Results of copy1_test:
+ Src: A string to be copied.
+Dest: A string to be copied.
+Results of copy2_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copy3_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copy4_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copyb_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copyb0_test:
+1 2 3 4 5 
+1 2 3 4 5 
+Results of count0_test:
+Found 4 1's.
+Results of count1_test:
+Found 33 2's.
+Results of countif1_test:
+Found 33 odd elements.
+Results of deque1_test:
+d[0] = 1
+d[1] = 4
+d[2] = 9
+d[3] = 16
+
+d[0] = 4
+d[1] = 9
+d[2] = 25
+Results of divides_test:
+result = 2
+Results of eqlrnge0_test:
+2 can be inserted from before index 4 to before index 8
+Results of eqlrnge1_test:
+Within the collection:
+	0 0 0 1 1 1 2 2 2 3 
+2 can be inserted from before index 6 to before index 9
+Results of eqlrnge2_test:
+Within the collection:
+	aabbccddggghhklllmqqqqssyyzz
+q can be inserted from before index 18 to before index 22
+Results of equal0_test:
+numbers1 is not equal to numbers2
+numbers3 is equal to numbers1
+Results of equal1_test:
+v1 is not equal to v2
+v1 is equal to v2
+Results of equal2_test:
+v2[i] == v1[i] * v1[i]
+Results of equalto_test:
+1
+0
+1
+0
+Results of fill1_test:
+42 42 42 42 42 42 42 42 42 42 
+Results of filln1_test:
+42 42 42 42 42 42 42 42 42 42 
+Results of find0_test:
+Found 25 at offset 5
+Results of find1_test:
+Found 1972 at offset 3
+Results of findif0_test:
+Value 15 at offset 3 is odd
+Results of findif1_test:
+Value 9 at offset 2 is divisible by 3
+Results of finsert1_test:
+leisa
+jennifer
+laurie
+Results of finsert2_test:
+leisa
+jennifer
+laurie
+Results of foreach0_test:
+1 1 2 3 5 8 13 21 34 55 
+Results of foreach1_test:
+0 1 4 9 16 25 36 49 64 81 
+Results of func1_test:
+Number greater than 3 = 2
+Results of func2_test:
+5
+4
+1
+Results of func3_test:
+5
+4
+1
+Results of gener1_test:
+16838 5758 10113 17515 31051 5627 23010 7419 16212 4086 
+Results of gener2_test:
+1 1 2 3 5 8 13 21 34 55 
+Results of genern1_test:
+2749 12767 9084 12060 32225 17543 25089 21183 25137 25566 
+Results of genern2_test:
+1 1 2 3 5 8 13 21 34 55 
+Results of greateq_test:
+4
+3
+2
+1
+Results of greater_test:
+4
+3
+2
+1
+Results of incl0_test:
+numbers1 does not include numbers3
+numbers2 includes numbers3
+Results of incl1_test:
+v1 does not include v2
+v1 includes v2
+Results of incl2_test:
+v1 does not include v2
+v1 includes v2
+Results of inplmrg1_test:
+1 10 42 3 16 32 
+1 3 10 16 32 42 
+Results of inplmrg2_test:
+4 3 2 1 0 4 3 2 1 0 
+4 4 3 3 2 2 1 1 0 0 
+Results of inrprod0_test:
+Inner product = 55
+Results of inrprod1_test:
+Inner product(sum of products) of:
+	1 2 3 
+	3 2 1 
+is: 10
+Results of inrprod2_test:
+Inner product(product of sums):
+	1 2 3 
+	3 2 1 
+is: 64
+Results of insert1_test:
+laurie
+jennifer
+amanda
+saskia
+carrie
+leisa
+Results of insert2_test:
+laurie
+jennifer
+amanda
+saskia
+carrie
+leisa
+Results of iota1_test:
+42 43 44 45 46 47 48 49 50 51 
+Results of istmit1_test:
+Please enter a string: read a string
+Results of iter1_test:
+zippy
+motorboy
+Results of iter2_test:
+zippy
+motorboy
+Results of iter3_test:
+motorboy
+zippy
+Results of iter4_test:
+last element is 3
+first element is 1
+Results of iterswp0_test:
+3 1 2 0 4 5 
+Results of iterswp1_test:
+3 1 2 0 4 5 
+Results of less_test:
+1
+2
+3
+4
+Results of lesseq_test:
+1
+2
+3
+4
+Results of lexcmp1_test:
+shine is before shoe
+Results of lexcmp2_test:
+shoe is after shine
+Results of list1_test:
+1
+4
+9
+16
+36
+Results of list2_test:
+1
+4
+9
+16
+Results of list3_test:
+original: xlxtss
+reversed: sstxlx
+removed: sstl
+uniqued: stl
+sorted: lst
+Results of list4_test:
+123467
+Results of logicand_test:
+0
+1
+0
+0
+Results of logicnot_test:
+count = 2
+Results of logicor_test:
+1
+1
+0
+1
+Results of lwrbnd1_test:
+0 0 0 0 1 1 1 1 2 2 2 2 3 3 3 3 4 4 4 4 
+3 can be inserted at index: 12
+Results of lwrbnd2_test:
+d can be inserted at index: 4
+Results of map1_test:
+m['x'] = 20
+m['x'] = 10
+m['z'] = 0
+m.count('z') = 1
+First insertion successful
+Existing pair c -> 100
+Results of max1_test:
+100
+Results of max2_test:
+shoe
+Results of maxelem1_test:
+56
+Results of maxelem2_test:
+Todd
+Results of merge0_test:
+-5 1 6 13 25 26 36 46 99 101 
+Results of merge1_test:
+0 1 2 3 4 
+3 4 5 6 7 
+0 1 2 3 3 4 4 5 6 7 
+Results of merge2_test:
+10 9 8 7 6 
+7 6 5 4 3 
+10 9 8 7 7 6 6 5 4 3 
+Results of min1_test:
+42
+Results of min2_test:
+shine
+Results of minelem1_test:
+-242
+Results of minelem2_test:
+Brett
+Results of minus_test:
+0
+1
+-1
+5
+Results of mismtch0_test:
+n1 and n2 are the same
+Mismatch at offset: 3
+Results of mismtch1_test:
+v1 and v2 are the same
+mismatch at index: 5
+Results of mismtch2_test:
+n1 and n2 are the same
+mismatch at index: 2
+Results of mkheap0_test:
+19
+13
+11
+10
+5
+4
+Results of mkheap1_test:
+4
+5
+10
+11
+13
+19
+Results of mmap1_test:
+count('X') = 0
+count('X') = 1
+count('X') = 2
+X -> 10
+X -> 20
+Y -> 32
+Erased 2 items
+Results of mmap2_test:
+lower bound:
+3 -> c
+upper bound:
+6 -> f
+Results of modulus_test:
+2
+0
+10
+2
+Results of mset1_test:
+count(42) = 0
+count(42) = 1
+count(42) = 2
+40 Not found
+Found 42
+Erased 2 instances
+Results of mset3_test:
+lower bound = 3
+upper bound = 6
+Results of mset4_test:
+lower bound = 3
+upper bound = 6
+Results of mset5_test:
+Using less_than: 
+1
+3
+6
+9
+Using greater_than: 
+9
+6
+3
+1
+Results of negate_test:
+-1
+-2
+-3
+Results of nequal_test:
+0
+1
+0
+1
+Results of nextprm0_test:
+0 2 1 
+Results of nextprm1_test:
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+2 0 1 
+2 1 0 
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+Results of nextprm2_test:
+ABC
+ACB
+BAC
+BCA
+CAB
+CBA
+ABC
+ACB
+BAC
+BCA
+Results of nthelem0_test:
+1 0 2 3 4 5 
+Results of nthelem1_test:
+6 8 5 1 7 4 1 5 2 6 
+1 1 4 2 5 5 6 7 8 6 
+Results of nthelem2_test:
+4 5 4 2 1 7 4 3 1 6 
+6 7 4 4 5 4 3 2 1 1 
+Results of ostmit_test:
+hello
+1524
+Results of pair0_test:
+p.first = 1, p.second = 10
+Results of pair1_test:
+p.first = 1, p.second = 10
+Results of pair2_test:
+p.first = 1
+p.second = 10
+Results of parsrt0_test:
+1 2 3 5 4 6 
+Results of parsrt1_test:
+8 8 5 3 7 6 5 3 2 4 
+2 3 3 4 5 8 8 7 6 5 
+Results of parsrt2_test:
+aa ff dd ee cc bb 
+aa bb cc ff ee dd 
+Results of parsrtc0_test:
+1 2 3 
+Results of parsrtc1_test:
+3 0 4 3 2 8 2 7 7 5 
+0 2 2 3 3 
+Results of parsrtc2_test:
+aa ff dd ee cc bb 
+aa ff dd ee cc bb 
+Results of partsrt0_test:
+1 2 3 5 4 6 
+Results of partsum0_test:
+1 3 6 10 15 21 
+Results of partsum1_test:
+0 1 2 3 4 5 6 7 8 9 
+0 1 3 6 10 15 21 28 36 45 
+Results of partsum2_test:
+1 2 3 4 5 
+1 2 6 24 120 
+Results of pheap1_test:
+1 4 7 20 
+Results of pheap2_test:
+20 7 4 1 
+Results of plus_test:
+total = 77
+Results of pqueue1_test:
+101
+69
+42
+Results of prevprm0_test:
+2 1 0 
+Results of prevprm1_test:
+0 1 2 
+2 1 0 
+2 0 1 
+1 2 0 
+1 0 2 
+0 2 1 
+0 1 2 
+2 1 0 
+2 0 1 
+1 2 0 
+Results of prevprm2_test:
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+2 0 1 
+2 1 0 
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+Results of ptition0_test:
+6 1 3 10 12 20 
+Results of ptition1_test:
+19 3 11 14 10 19 8 17 9 6 
+6 3 9 8 10 19 14 17 11 19 
+Results of ptrbinf1_test:
+8
+7
+8
+13
+Results of ptrbinf2_test:
+8
+7
+8
+13
+Results of ptrunf1_test:
+2 is even
+Results of ptrunf2_test:
+2 is even
+Results of queue1_test:
+42
+101
+69
+Results of rawiter_test:
+0
+1
+2
+3
+4
+Results of remcopy1_test:
+1 3 1 3 0 0 
+Results of remcpif1_test:
+2 2 0 0 0 0 
+Results of remif1_test:
+0 0 2 2 2 2 
+Results of remove1_test:
+2 3 2 3 2 3 
+Results of repcpif1_test:
+0 1 2 3 4 0 1 2 3 4 
+0 1 2 3 4 0 1 2 3 4 
+0 42 2 42 4 0 42 2 42 4 
+Results of replace0_test:
+0 1 42 0 1 42 
+Results of replace1_test:
+0 1 2 3 4 0 1 2 3 4 
+0 1 42 3 4 0 1 42 3 4 
+Results of replcpy1_test:
+0 1 42 0 1 42 
+Results of replif1_test:
+0 1 2 3 4 0 1 2 3 4 
+0 42 2 42 4 0 42 2 42 4 
+Results of revbit1_test:
+Results of revbit2_test:
+3
+2
+5
+1
+Results of revcopy1_test:
+0 1 2 3 4 5 
+5 4 3 2 1 0 
+Results of reverse1_test:
+5 4 3 2 1 0 
+Results of reviter1_test:
+Results of reviter2_test:
+3
+2
+5
+1
+Results of rndshuf0_test:
+2 5 4 1 6 3 
+Results of rndshuf1_test:
+0 1 2 3 4 5 6 7 8 9 
+5 8 0 6 3 1 9 2 4 7 
+2 3 4 6 0 8 9 1 5 7 
+5 7 2 9 0 4 8 6 3 1 
+Results of rndshuf2_test:
+0 1 2 3 4 5 6 7 8 9 
+6 9 7 1 2 3 4 5 0 8 
+9 6 5 4 3 7 2 0 1 8 
+6 9 3 5 4 2 8 0 1 7 
+Results of rotate0_test:
+3 4 5 0 1 2 
+Results of rotate1_test:
+0 1 2 3 4 5 6 7 8 9 
+0 1 2 3 4 5 6 7 8 9 
+1 2 3 4 5 6 7 8 9 0 
+3 4 5 6 7 8 9 0 1 2 
+6 7 8 9 0 1 2 3 4 5 
+0 1 2 3 4 5 6 7 8 9 
+5 6 7 8 9 0 1 2 3 4 
+1 2 3 4 5 6 7 8 9 0 
+8 9 0 1 2 3 4 5 6 7 
+6 7 8 9 0 1 2 3 4 5 
+5 6 7 8 9 0 1 2 3 4 
+
+Results of rotcopy0_test:
+3 4 5 0 1 2 
+Results of rotcopy1_test:
+0 1 2 3 4 5 6 7 8 9 
+0 1 2 3 4 5 6 7 8 9 
+1 2 3 4 5 6 7 8 9 0 
+2 3 4 5 6 7 8 9 0 1 
+3 4 5 6 7 8 9 0 1 2 
+4 5 6 7 8 9 0 1 2 3 
+5 6 7 8 9 0 1 2 3 4 
+6 7 8 9 0 1 2 3 4 5 
+7 8 9 0 1 2 3 4 5 6 
+8 9 0 1 2 3 4 5 6 7 
+9 0 1 2 3 4 5 6 7 8 
+
+Results of search0_test:
+v3 not contained in v1
+Found v3 in v2 at offset: 3
+Results of search1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 50 51 52 
+v2 not contained in v1
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 4 5 6 
+Found v2 in v1 at offset: 4
+Results of search2_test:
+grades: A B C D F 
+letters:Q E D 
+letters not found in grades
+grades: A B C D F 
+letters:B C D 
+letters found in grades at offset: 1
+Results of set1_test:
+count(42) = 0
+count(42) = 1
+count(42) = 1
+1 elements erased
+Results of set2_test:
+Inserted new element 42
+Existing element = 42
+Results of setdiff0_test:
+18 0 0 0 
+10 17 23 0 
+Results of setdiff1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+0 1 2 3 4 5 6 
+Results of setdiff2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+A B C D E F G H I J K 
+Results of setintr0_test:
+13 23 0 0 
+Results of setintr1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+7 8 9 
+Results of setintr2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+L M N O 
+Results of setsymd0_test:
+10 17 18 0 
+Results of setsymd1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+0 1 2 3 4 5 6 10 11 12 13 14 15 16 
+Results of setsymd2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+A B C D E F G H I J K P Q R S T U V W X Y Z 
+Results of setunon0_test:
+10 13 17 18 23 0 0 
+Results of setunon1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 
+Results of setunon2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+A B C D E F G H I J K L M N O P Q R S T U V W X Y Z 
+Results of sort1_test:
+-10 1 11 19 42 50 
+Results of sort2_test:
+before: 1 50 -10 11 42 19 
+after: 50 42 19 11 1 -10 
+Results of stack1_test:
+69
+101
+42
+Results of stack2_test:
+69
+101
+42
+Results of stblptn0_test:
+5 6 -2 10 11 20 
+Results of stblptn1_test:
+5 5 2 10 0 12 5 0 0 19 
+5 5 2 10 0 5 0 0 12 19 
+Results of stblsrt1_test:
+-10 1 11 19 42 50 
+Results of stblsrt2_test:
+aa bb cc dd ll qq 
+Results of swap1_test:
+a = 42 b = 19
+a = 19 b = 42
+Results of swprnge1_test:
+World Hello
+Hello World
+Results of times_test:
+total = 70
+Results of trnsfrm1_test:
+5 1 0 -1 -6 -11 
+Results of trnsfrm2_test:
+Hello World!
+Results of ucompos1_test:
+1
+2
+4
+Results of ucompos2_test:
+1
+2
+4
+Results of unegate1_test:
+2
+Results of unegate2_test:
+2
+Results of uniqcpy1_test:
+0 1 2 3 4 0 0 0 
+Results of uniqcpy2_test:
+QQWWEERTTYY
+QQWWEERTTYY
+QWERTY
+Results of unique1_test:
+0 1 2 3 4 2 3 4 
+Results of unique2_test:
+QQWWEERTTYY
+QWERTYRTTYY
+Results of uprbnd1_test:
+0 0 0 0 1 1 1 1 2 2 2 2 3 3 3 3 4 4 4 4 
+3 can be inserted at index: 16
+Results of uprbnd2_test:
+d can be inserted at index: 4
+Results of vec1_test:
+empty = 1
+size = 0
+max_size = 1073741823
+size = 1
+v1[0] = 42
+Results of vec2_test:
+v1 = 32.1 40.5 
+v2 = 3.56 
+v1 = 3.56 
+v2 = 32.1 40.5 
+v2 = 3.56 
+Results of vec3_test:
+v1 = hi
+v2 = ho
+(v1 == v2) = 0
+(v1 < v2) = 1
+Results of vec4_test:
+front = 1
+back = 16, size = 4
+back = 25, size = 5
+back = 16, size = 4
+Results of vec5_test:
+v[0] = 1
+v[1] = 4
+v[2] = 9
+v[3] = 16
+Results of vec6_test:
+v[0] = 1
+v[1] = 4
+v[2] = 9
+v[3] = 16
+v[4] = 25
+v[5] = 36
+
+v[0] = 4
+v[1] = 9
+v[2] = 16
+v[3] = 25
+v[4] = 36
+
+v[0] = 4
+v[1] = 9
+v[2] = 16
+v[3] = 25
+
+v[0] = 4
+v[1] = 25
+
+Results of vec7_test:
+v[0] = 0
+v[1] = 1
+v[2] = 4
+v[3] = 25
+v[4] = 36
+
+v[0] = 0
+v[1] = 1
+v[2] = 4
+v[3] = 9
+v[4] = 16
+v[5] = 25
+v[6] = 36
+
+Results of vec8_test:
+capacity = 0
+capacity = 1
+capacity = 5000
+Results of hmap1_test:
+m['x'] = 20
+m['x'] = 10
+m['z'] = 
+m.count('z') = 1
+First insertion successful
+Existing pair c -> 100
+Results of hmmap1_test:
+count('X') = 0
+count('X') = 1
+count('X') = 2
+X -> 10
+X -> 20
+Y -> 32
+Erased 2 items
+Results of hset2_test:
+Inserted new element 42
+Existing element = 42
+Results of hmset1_test:
+count(42) = 0
+count(42) = 1
+count(42) = 2
+40 Not found
+Found *
+Erased 2 instances
+Results of slist1_test:
+original: xlxtss
+reversed: sstxlx
+removed: sstl
+uniqued: stl
+sorted: lst
diff --git a/main/source/stlport/test/regression/stl_test.vc6.exp b/main/source/stlport/test/regression/stl_test.vc6.exp
new file mode 100644
index 00000000..5e102ebb
--- /dev/null
+++ b/main/source/stlport/test/regression/stl_test.vc6.exp
@@ -0,0 +1,869 @@
+Results of accum1_test:
+sum = 15
+Results of accum2_test:
+prod = 120
+Results of adjdiff0_test:
+1 2 4 8 16 
+1 1 2 4 8 
+Results of adjdiff1_test:
+0 1 4 9 16 25 36 49 64 81 
+0 1 3 5 7 9 11 13 15 17 
+Results of adjdiff2_test:
+1 2 3 4 5 6 7 8 9 10 
+1 2 6 12 20 30 42 56 72 90 
+Results of adjfind0_test:
+No adjacent pairs
+Found adjacent pair of: 1 at offset 3
+Results of adjfind1_test:
+No adjacent pairs
+Found adjacent pair of: 7
+Results of adjfind2_test:
+Found two adjacent strings of equal length: Jack -and- Mike
+Results of advance_test:
+At Beginning: 0
+At Beginning + 5: 5
+Results of alg1_test:
+min(4, 7) = 4
+max('a', 'z') = z
+Results of alg2_test:
+Count of 2s = 3
+Results of alg3_test:
+Count of 2s = 3
+Results of alg4_test:
+1962
+1992
+1999
+2001
+Results of alg5_test:
+1962
+1992
+2001
+1999
+Results of bcompos1_test:
+1 is odd and positive
+Results of bcompos2_test:
+1 is odd and positive
+Results of bind1st1_test:
+1
+2
+Results of bind1st2_test:
+1
+2
+Results of bind2nd1_test:
+1
+2
+4
+Results of bind2nd2_test:
+1
+2
+4
+Results of binsert1_test:
+laurie
+jennifer
+leisa
+Results of binsert2_test:
+laurie
+jennifer
+leisa
+Results of binsrch1_test:
+found 42
+Results of binsrch2_test:
+ff is in labels.
+Results of bnegate1_test:
+1
+4
+7
+9
+Results of bnegate2_test:
+1
+4
+7
+9
+Results of bvec1_test:
+000
+101
+10101
+Results of copy1_test:
+ Src: A string to be copied.
+Dest: A string to be copied.
+Results of copy2_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copy3_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copy4_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copyb_test:
+0 1 2 3 4 5 6 7 8 9 
+Results of copyb0_test:
+1 2 3 4 5 
+1 2 3 4 5 
+Results of count0_test:
+Found 4 1's.
+Results of count1_test:
+Found 33 2's.
+Results of countif1_test:
+Found 33 odd elements.
+Results of deque1_test:
+d[0] = 1
+d[1] = 4
+d[2] = 9
+d[3] = 16
+
+d[0] = 4
+d[1] = 9
+d[2] = 25
+Results of divides_test:
+result = 2
+Results of eqlrnge0_test:
+2 can be inserted from before index 4 to before index 8
+Results of eqlrnge1_test:
+Within the collection:
+	0 0 0 1 1 1 2 2 2 3 
+2 can be inserted from before index 6 to before index 9
+Results of eqlrnge2_test:
+Within the collection:
+	aabbccddggghhklllmqqqqssyyzz
+q can be inserted from before index 18 to before index 22
+Results of equal0_test:
+numbers1 is not equal to numbers2
+numbers3 is equal to numbers1
+Results of equal1_test:
+v1 is not equal to v2
+v1 is equal to v2
+Results of equal2_test:
+v2[i] == v1[i] * v1[i]
+Results of equalto_test:
+1
+0
+1
+0
+Results of fill1_test:
+42 42 42 42 42 42 42 42 42 42 
+Results of filln1_test:
+42 42 42 42 42 42 42 42 42 42 
+Results of find0_test:
+Found 25 at offset 5
+Results of find1_test:
+Found 1972 at offset 3
+Results of findif0_test:
+Value 15 at offset 3 is odd
+Results of findif1_test:
+Value 9 at offset 2 is divisible by 3
+Results of finsert1_test:
+leisa
+jennifer
+laurie
+Results of finsert2_test:
+leisa
+jennifer
+laurie
+Results of foreach0_test:
+1 1 2 3 5 8 13 21 34 55 
+Results of foreach1_test:
+0 1 4 9 16 25 36 49 64 81 
+Results of func1_test:
+Number greater than 3 = 2
+Results of func2_test:
+5
+4
+1
+Results of func3_test:
+5
+4
+1
+Results of gener1_test:
+41 18467 6334 26500 19169 15724 11478 29358 26962 24464 
+Results of gener2_test:
+1 1 2 3 5 8 13 21 34 55 
+Results of genern1_test:
+5705 28145 23281 16827 9961 491 2995 11942 4827 5436 
+Results of genern2_test:
+1 1 2 3 5 8 13 21 34 55 
+Results of greateq_test:
+4
+3
+2
+1
+Results of greater_test:
+4
+3
+2
+1
+Results of incl0_test:
+numbers1 does not include numbers3
+numbers2 includes numbers3
+Results of incl1_test:
+v1 does not include v2
+v1 includes v2
+Results of incl2_test:
+v1 does not include v2
+v1 includes v2
+Results of inplmrg1_test:
+1 10 42 3 16 32 
+1 3 10 16 32 42 
+Results of inplmrg2_test:
+4 3 2 1 0 4 3 2 1 0 
+4 4 3 3 2 2 1 1 0 0 
+Results of inrprod0_test:
+Inner product = 55
+Results of inrprod1_test:
+Inner product(sum of products) of:
+	1 2 3 
+	3 2 1 
+is: 10
+Results of inrprod2_test:
+Inner product(product of sums):
+	1 2 3 
+	3 2 1 
+is: 64
+Results of insert1_test:
+laurie
+jennifer
+amanda
+saskia
+carrie
+leisa
+Results of insert2_test:
+laurie
+jennifer
+amanda
+saskia
+carrie
+leisa
+Results of iota1_test:
+42 43 44 45 46 47 48 49 50 51 
+Results of istmit1_test:
+Please enter a string: read a string
+Results of iter1_test:
+zippy
+motorboy
+Results of iter2_test:
+zippy
+motorboy
+Results of iter3_test:
+motorboy
+zippy
+Results of iter4_test:
+last element is 3
+first element is 1
+Results of iterswp0_test:
+3 1 2 0 4 5 
+Results of iterswp1_test:
+3 1 2 0 4 5 
+Results of less_test:
+1
+2
+3
+4
+Results of lesseq_test:
+1
+2
+3
+4
+Results of lexcmp1_test:
+shine is before shoe
+Results of lexcmp2_test:
+shoe is after shine
+Results of list1_test:
+1
+4
+9
+16
+36
+Results of list2_test:
+1
+4
+9
+16
+Results of list3_test:
+original: xlxtss
+reversed: sstxlx
+removed: sstl
+uniqued: stl
+sorted: lst
+Results of list4_test:
+123467
+Results of logicand_test:
+0
+1
+0
+0
+Results of logicnot_test:
+count = 2
+Results of logicor_test:
+1
+1
+0
+1
+Results of lwrbnd1_test:
+0 0 0 0 1 1 1 1 2 2 2 2 3 3 3 3 4 4 4 4 
+3 can be inserted at index: 12
+Results of lwrbnd2_test:
+d can be inserted at index: 4
+Results of map1_test:
+m['x'] = 20
+m['x'] = 10
+m['z'] = 0
+m.count('z') = 1
+First insertion successful
+Existing pair c -> 100
+Results of max1_test:
+100
+Results of max2_test:
+shoe
+Results of maxelem1_test:
+56
+Results of maxelem2_test:
+Todd
+Results of merge0_test:
+-5 1 6 13 25 26 36 46 99 101 
+Results of merge1_test:
+0 1 2 3 4 
+3 4 5 6 7 
+0 1 2 3 3 4 4 5 6 7 
+Results of merge2_test:
+10 9 8 7 6 
+7 6 5 4 3 
+10 9 8 7 7 6 6 5 4 3 
+Results of min1_test:
+42
+Results of min2_test:
+shine
+Results of minelem1_test:
+-242
+Results of minelem2_test:
+Brett
+Results of minus_test:
+0
+1
+-1
+5
+Results of mismtch0_test:
+n1 and n2 are the same
+Mismatch at offset: 3
+Results of mismtch1_test:
+v1 and v2 are the same
+mismatch at index: 5
+Results of mismtch2_test:
+n1 and n2 are the same
+mismatch at index: 2
+Results of mkheap0_test:
+19
+13
+11
+10
+5
+4
+Results of mkheap1_test:
+4
+5
+10
+11
+13
+19
+Results of mmap1_test:
+count('X') = 0
+count('X') = 1
+count('X') = 2
+X -> 10
+X -> 20
+Y -> 32
+Erased 2 items
+Results of mmap2_test:
+lower bound:
+3 -> c
+upper bound:
+6 -> f
+Results of modulus_test:
+2
+0
+10
+2
+Results of mset1_test:
+count(42) = 0
+count(42) = 1
+count(42) = 2
+40 Not found
+Found 42
+Erased 2 instances
+Results of mset3_test:
+lower bound = 3
+upper bound = 6
+Results of mset4_test:
+lower bound = 3
+upper bound = 6
+Results of mset5_test:
+Using less_than: 
+1
+3
+6
+9
+Using greater_than: 
+9
+6
+3
+1
+Results of negate_test:
+-1
+-2
+-3
+Results of nequal_test:
+0
+1
+0
+1
+Results of nextprm0_test:
+0 2 1 
+Results of nextprm1_test:
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+2 0 1 
+2 1 0 
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+Results of nextprm2_test:
+ABC
+ACB
+BAC
+BCA
+CAB
+CBA
+ABC
+ACB
+BAC
+BCA
+Results of nthelem0_test:
+1 0 2 3 4 5 
+Results of nthelem1_test:
+1 4 2 3 2 2 1 6 8 5 
+1 1 2 2 2 3 4 5 8 6 
+Results of nthelem2_test:
+7 6 1 8 9 2 7 9 5 4 
+9 9 7 8 7 6 5 4 2 1 
+Results of ostmit_test:
+hello
+1524
+Results of pair0_test:
+p.first = 1, p.second = 10
+Results of pair1_test:
+p.first = 1, p.second = 10
+Results of pair2_test:
+p.first = 1
+p.second = 10
+Results of parsrt0_test:
+1 2 3 5 4 6 
+Results of parsrt1_test:
+3 1 2 3 3 4 1 1 3 8 
+1 1 1 2 3 4 3 3 3 8 
+Results of parsrt2_test:
+aa ff dd ee cc bb 
+aa bb cc ff ee dd 
+Results of parsrtc0_test:
+1 2 3 
+Results of parsrtc1_test:
+7 4 2 7 7 9 3 1 9 8 
+1 2 3 4 7 
+Results of parsrtc2_test:
+aa ff dd ee cc bb 
+aa ff dd ee cc bb 
+Results of partsrt0_test:
+1 2 3 5 4 6 
+Results of partsum0_test:
+1 3 6 10 15 21 
+Results of partsum1_test:
+0 1 2 3 4 5 6 7 8 9 
+0 1 3 6 10 15 21 28 36 45 
+Results of partsum2_test:
+1 2 3 4 5 
+1 2 6 24 120 
+Results of pheap1_test:
+1 4 7 20 
+Results of pheap2_test:
+20 7 4 1 
+Results of plus_test:
+total = 77
+Results of pqueue1_test:
+101
+69
+42
+Results of prevprm0_test:
+2 1 0 
+Results of prevprm1_test:
+0 1 2 
+2 1 0 
+2 0 1 
+1 2 0 
+1 0 2 
+0 2 1 
+0 1 2 
+2 1 0 
+2 0 1 
+1 2 0 
+Results of prevprm2_test:
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+2 0 1 
+2 1 0 
+0 1 2 
+0 2 1 
+1 0 2 
+1 2 0 
+Results of ptition0_test:
+6 1 3 10 12 20 
+Results of ptition1_test:
+16 15 10 2 8 6 0 2 4 8 
+8 4 10 2 8 6 0 2 15 16 
+Results of ptrbinf1_test:
+8
+7
+8
+13
+Results of ptrbinf2_test:
+8
+7
+8
+13
+Results of ptrunf1_test:
+2 is even
+Results of ptrunf2_test:
+2 is even
+Results of queue1_test:
+42
+101
+69
+Results of rawiter_test:
+0
+1
+2
+3
+4
+Results of remcopy1_test:
+1 3 1 3 0 0 
+Results of remcpif1_test:
+2 2 0 0 0 0 
+Results of remif1_test:
+0 0 2 2 2 2 
+Results of remove1_test:
+2 3 2 3 2 3 
+Results of repcpif1_test:
+0 1 2 3 4 0 1 2 3 4 
+0 1 2 3 4 0 1 2 3 4 
+0 42 2 42 4 0 42 2 42 4 
+Results of replace0_test:
+0 1 42 0 1 42 
+Results of replace1_test:
+0 1 2 3 4 0 1 2 3 4 
+0 1 42 3 4 0 1 42 3 4 
+Results of replcpy1_test:
+0 1 42 0 1 42 
+Results of replif1_test:
+0 1 2 3 4 0 1 2 3 4 
+0 42 2 42 4 0 42 2 42 4 
+Results of revbit1_test:
+3
+2
+5
+1
+Results of revbit2_test:
+3
+2
+5
+1
+Results of revcopy1_test:
+0 1 2 3 4 5 
+5 4 3 2 1 0 
+Results of reverse1_test:
+5 4 3 2 1 0 
+Results of reviter1_test:
+Results of reviter2_test:
+3
+2
+5
+1
+Results of rndshuf0_test:
+3 1 4 2 6 5 
+Results of rndshuf1_test:
+0 1 2 3 4 5 6 7 8 9 
+8 6 5 4 9 1 3 7 2 0 
+7 9 3 2 8 1 0 6 5 4 
+5 9 2 8 0 4 3 7 1 6 
+Results of rndshuf2_test:
+0 1 2 3 4 5 6 7 8 9 
+4 9 0 8 3 2 5 1 6 7 
+3 9 7 6 8 1 0 4 2 5 
+7 5 9 3 2 1 8 4 6 0 
+Results of rotate0_test:
+3 4 5 0 1 2 
+Results of rotate1_test:
+0 1 2 3 4 5 6 7 8 9 
+0 1 2 3 4 5 6 7 8 9 
+1 2 3 4 5 6 7 8 9 0 
+3 4 5 6 7 8 9 0 1 2 
+6 7 8 9 0 1 2 3 4 5 
+0 1 2 3 4 5 6 7 8 9 
+5 6 7 8 9 0 1 2 3 4 
+1 2 3 4 5 6 7 8 9 0 
+8 9 0 1 2 3 4 5 6 7 
+6 7 8 9 0 1 2 3 4 5 
+5 6 7 8 9 0 1 2 3 4 
+
+Results of rotcopy0_test:
+3 4 5 0 1 2 
+Results of rotcopy1_test:
+0 1 2 3 4 5 6 7 8 9 
+0 1 2 3 4 5 6 7 8 9 
+1 2 3 4 5 6 7 8 9 0 
+2 3 4 5 6 7 8 9 0 1 
+3 4 5 6 7 8 9 0 1 2 
+4 5 6 7 8 9 0 1 2 3 
+5 6 7 8 9 0 1 2 3 4 
+6 7 8 9 0 1 2 3 4 5 
+7 8 9 0 1 2 3 4 5 6 
+8 9 0 1 2 3 4 5 6 7 
+9 0 1 2 3 4 5 6 7 8 
+
+Results of search0_test:
+v3 not contained in v1
+Found v3 in v2 at offset: 3
+Results of search1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 50 51 52 
+v2 not contained in v1
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 4 5 6 
+Found v2 in v1 at offset: 4
+Results of search2_test:
+grades: A B C D F 
+letters:Q E D 
+letters not found in grades
+grades: A B C D F 
+letters:B C D 
+letters found in grades at offset: 1
+Results of set1_test:
+count(42) = 0
+count(42) = 1
+count(42) = 1
+1 elements erased
+Results of set2_test:
+Inserted new element 42
+Existing element = 42
+Results of setdiff0_test:
+18 0 0 0 
+10 17 23 0 
+Results of setdiff1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+0 1 2 3 4 5 6 
+Results of setdiff2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+A B C D E F G H I J K 
+Results of setintr0_test:
+13 23 0 0 
+Results of setintr1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+7 8 9 
+Results of setintr2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+L M N O 
+Results of setsymd0_test:
+10 17 18 0 
+Results of setsymd1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+0 1 2 3 4 5 6 10 11 12 13 14 15 16 
+Results of setsymd2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+A B C D E F G H I J K P Q R S T U V W X Y Z 
+Results of setunon0_test:
+10 13 17 18 23 0 0 
+Results of setunon1_test:
+v1: 0 1 2 3 4 5 6 7 8 9 
+v2: 7 8 9 10 11 12 13 14 15 16 
+0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 
+Results of setunon2_test:
+word1: A B C D E F G H I J K L M N O 
+word2: L M N O P Q R S T U V W X Y Z 
+A B C D E F G H I J K L M N O P Q R S T U V W X Y Z 
+Results of sort1_test:
+-10 1 11 19 42 50 
+Results of sort2_test:
+before: 1 50 -10 11 42 19 
+after: 50 42 19 11 1 -10 
+Results of stack1_test:
+69
+101
+42
+Results of stack2_test:
+69
+101
+42
+Results of stblptn0_test:
+5 6 -2 10 11 20 
+Results of stblptn1_test:
+12 10 10 1 4 6 10 7 11 7 
+10 10 1 4 6 10 7 7 12 11 
+Results of stblsrt1_test:
+-10 1 11 19 42 50 
+Results of stblsrt2_test:
+aa bb cc dd ll qq 
+Results of swap1_test:
+a = 42 b = 19
+a = 19 b = 42
+Results of swprnge1_test:
+World Hello
+Hello World
+Results of times_test:
+total = 70
+Results of trnsfrm1_test:
+5 1 0 -1 -6 -11 
+Results of trnsfrm2_test:
+Hello World!
+Results of ucompos1_test:
+1
+2
+4
+Results of ucompos2_test:
+1
+2
+4
+Results of unegate1_test:
+2
+Results of unegate2_test:
+2
+Results of uniqcpy1_test:
+0 1 2 3 4 0 0 0 
+Results of uniqcpy2_test:
+QQWWEERTTYY
+QQWWEERTTYY
+QWERTY
+Results of unique1_test:
+0 1 2 3 4 2 3 4 
+Results of unique2_test:
+QQWWEERTTYY
+QWERTYRTTYY
+Results of uprbnd1_test:
+0 0 0 0 1 1 1 1 2 2 2 2 3 3 3 3 4 4 4 4 
+3 can be inserted at index: 16
+Results of uprbnd2_test:
+d can be inserted at index: 4
+Results of vec1_test:
+empty = 1
+size = 0
+max_size = 1073741823
+size = 1
+v1[0] = 42
+Results of vec2_test:
+v1 = 32.1 40.5 
+v2 = 3.56 
+v1 = 3.56 
+v2 = 32.1 40.5 
+v2 = 3.56 
+Results of vec3_test:
+v1 = hi
+v2 = ho
+(v1 == v2) = 0
+(v1 < v2) = 1
+Results of vec4_test:
+front = 1
+back = 16, size = 4
+back = 25, size = 5
+back = 16, size = 4
+Results of vec5_test:
+v[0] = 1
+v[1] = 4
+v[2] = 9
+v[3] = 16
+Results of vec6_test:
+v[0] = 1
+v[1] = 4
+v[2] = 9
+v[3] = 16
+v[4] = 25
+v[5] = 36
+
+v[0] = 4
+v[1] = 9
+v[2] = 16
+v[3] = 25
+v[4] = 36
+
+v[0] = 4
+v[1] = 9
+v[2] = 16
+v[3] = 25
+
+v[0] = 4
+v[1] = 25
+
+Results of vec7_test:
+v[0] = 0
+v[1] = 1
+v[2] = 4
+v[3] = 25
+v[4] = 36
+
+v[0] = 0
+v[1] = 1
+v[2] = 4
+v[3] = 9
+v[4] = 16
+v[5] = 25
+v[6] = 36
+
+Results of vec8_test:
+capacity = 0
+capacity = 1
+capacity = 5000
+Results of hmap1_test:
+m['x'] = 20
+m['x'] = 10
+m['z'] = 
+m.count('z') = 1
+First insertion successful
+Existing pair c -> 100
+Results of hmmap1_test:
+count('X') = 0
+count('X') = 1
+count('X') = 2
+X -> 10
+X -> 20
+Y -> 32
+Erased 2 items
+Results of hset2_test:
+Inserted new element 42
+Existing element = 42
+Results of hmset1_test:
+count(42) = 0
+count(42) = 1
+count(42) = 2
+40 Not found
+Found *
+Erased 2 instances
+Results of slist1_test:
+original: xlxtss
+reversed: sstxlx
+removed: sstl
+uniqued: stl
+sorted: lst
+Results of string1_test:
+Hello, World!
+v[0] = H
+v[1] = !
+
+Hello, World!
+Results of bitset1_test:
+b1 size = 13
+b1 = 1111111111111
+b2 size = 13
+b2 = 1000100010001
+b1 = 1101110111011
diff --git a/main/source/stlport/test/regression/strass1.cpp b/main/source/stlport/test/regression/strass1.cpp
new file mode 100644
index 00000000..c2efe1c4
--- /dev/null
+++ b/main/source/stlport/test/regression/strass1.cpp
@@ -0,0 +1,9 @@
+#include <string>
+
+      int main()
+      {
+      std::string str1 = "string";
+      std::string str2;
+      str2.assign(str1.begin(), str1.begin() + 3);
+      return 0;
+      }
diff --git a/main/source/stlport/test/regression/string1.cpp b/main/source/stlport/test/regression/string1.cpp
new file mode 100644
index 00000000..ad3f8af4
--- /dev/null
+++ b/main/source/stlport/test/regression/string1.cpp
@@ -0,0 +1,31 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <string>
+#include <iostream>
+
+#ifdef MAIN 
+#define string1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int string1_test(int, char**)
+{
+  cout<<"Results of string1_test:"<<endl;
+  char* array = "Hello, World!";
+  std::string v(array);
+  int i;
+  cout << v << endl;
+  v.erase(v.begin() + 1, v.end() - 1); // Erase all but first and last.
+  for(i = 0; i < v.size(); i++)
+    cout << "v[" << i << "] = " << v[i] << endl;
+  cout << endl;
+  v.insert(1, (char*)array);
+  v.erase(v.begin()); // Erase first element.
+  v.erase(v.end() - 1); // Erase last element.
+  cout << v << endl;
+  v.clear(); // Erase all.
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/string_mt.cpp b/main/source/stlport/test/regression/string_mt.cpp
new file mode 100644
index 00000000..cd034f2f
--- /dev/null
+++ b/main/source/stlport/test/regression/string_mt.cpp
@@ -0,0 +1,83 @@
+// -*- C++ -*- Time-stamp: <04/01/16 21:32:26 ptr>
+
+
+#include <string>
+
+#if defined(_STLP_PTHREADS) || defined(_STLP_WIN32THREADS)
+
+#ifdef _STLP_PTHREADS
+# include <pthread.h>
+#endif
+
+#ifdef _STLP_WIN32THREADS
+# include <windows.h>
+#endif
+
+#ifdef MAIN
+#define string_mt_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+string func( const string& par )
+{
+  string tmp( par );
+
+  return tmp;
+}
+
+#if defined (_STLP_PTHREADS)
+void *f( void * )
+#elif defined (_STLP_WIN32THREADS)
+DWORD __stdcall f (void *)
+#endif
+{
+  string s( "qyweyuewunfkHBUKGYUGL,wehbYGUW^(@T@H!BALWD:h^&@#*@(#:JKHWJ:CND" );
+
+  for ( int i = 0; i < 2000000; ++i ) {
+    string sx = func( s );
+  }
+
+  return 0;
+}
+
+int string_mt_test( int, char ** )
+{
+  const int nth = 2;
+#if defined(_STLP_PTHREADS)
+  pthread_t t[nth];
+
+  for ( int i = 0; i < nth; ++i ) {
+    pthread_create( &t[i], 0, f, 0 );
+  }
+
+  for ( int i = 0; i < nth; ++i ) {
+    pthread_join( t[i], 0 );
+  }
+#endif // _STLP_PTHREADS
+
+#if defined (_STLP_WIN32THREADS)
+  HANDLE t[nth];
+
+  int i; // VC6 not support in-loop scope of cycle var
+  for ( i = 0; i < nth; ++i ) {
+    t[i] = CreateThread(NULL, 0, f, 0, 0, NULL);
+  }
+
+  for ( i = 0; i < nth; ++i ) {
+    WaitForSingleObject(t[i], INFINITE);
+  }
+#endif
+
+  return 0;
+}
+#else // !_STLP_PTHREADS && !_STLP_WIN32THREADS
+
+int string_mt_test( int, char ** )
+{
+  return -1;
+}
+
+#endif // _STLP_PTHREADS || _STLP_WIN32THREADS
diff --git a/main/source/stlport/test/regression/sunpro-64.mak b/main/source/stlport/test/regression/sunpro-64.mak
new file mode 100644
index 00000000..931cf151
--- /dev/null
+++ b/main/source/stlport/test/regression/sunpro-64.mak
@@ -0,0 +1,183 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+srcdir = .
+VPATH = .
+
+# point this to proper location
+
+
+# PWD is here because SC5 wants absolute path ;(
+STL_INCL=-I${PWD}/../../stlport
+
+LIST  = stl_test.cpp accum1.cpp accum2.cpp \
+	adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp \
+	advance.cpp \
+	alg1.cpp alg2.cpp alg3.cpp alg4.cpp alg5.cpp \
+	bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp \
+	bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp \
+	binsrch1.cpp binsrch2.cpp \
+	bnegate1.cpp bnegate2.cpp bvec1.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp \
+	copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp \
+	countif1.cpp \
+	deque1.cpp \
+	divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp \
+	equal0.cpp equal1.cpp equal2.cpp \
+	equalto.cpp \
+	fill1.cpp filln1.cpp \
+	find0.cpp find1.cpp \
+	findif0.cpp findif1.cpp \
+	finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp \
+	func1.cpp func2.cpp func3.cpp \
+	gener1.cpp gener2.cpp \
+	genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp \
+	incl0.cpp incl1.cpp incl2.cpp \
+	inplmrg1.cpp inplmrg2.cpp \
+	inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp \
+	iota1.cpp \
+	istmit1.cpp \
+	iter1.cpp iter2.cpp iter3.cpp iter4.cpp \
+	iterswp0.cpp iterswp1.cpp \
+	less.cpp \
+	lesseq.cpp \
+	lexcmp1.cpp lexcmp2.cpp \
+	list1.cpp list2.cpp list3.cpp list4.cpp \
+	logicand.cpp logicnot.cpp \
+	logicor.cpp \
+	lwrbnd1.cpp lwrbnd2.cpp \
+	map1.cpp \
+	max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp \
+	memfunptr.cpp \
+	merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp \
+	minelem1.cpp minelem2.cpp \
+	minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp \
+	mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp \
+	modulus.cpp \
+	mset1.cpp mset3.cpp mset4.cpp mset5.cpp \
+	negate.cpp nequal.cpp \
+	nextprm0.cpp nextprm1.cpp nextprm2.cpp \
+	nthelem0.cpp nthelem1.cpp nthelem2.cpp \
+	ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp \
+	parsrt0.cpp parsrt1.cpp parsrt2.cpp \
+	parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp \
+	partsum0.cpp partsum1.cpp partsum2.cpp \
+	pheap1.cpp pheap2.cpp \
+	plus.cpp \
+	pqueue1.cpp \
+	prevprm0.cpp prevprm1.cpp prevprm2.cpp \
+	ptition0.cpp ptition1.cpp \
+	ptrbinf1.cpp ptrbinf2.cpp \
+	ptrunf1.cpp ptrunf2.cpp \
+	queue1.cpp \
+	rawiter.cpp \
+	remcopy1.cpp \
+	remcpif1.cpp \
+	remif1.cpp \
+	remove1.cpp \
+	repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp \
+	revbit1.cpp revbit2.cpp \
+	revcopy1.cpp reverse1.cpp reviter1.cpp reviter2.cpp \
+	rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp \
+	search0.cpp search1.cpp search2.cpp \
+	set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp \
+	setintr0.cpp setintr1.cpp setintr2.cpp \
+	setsymd0.cpp setsymd1.cpp setsymd2.cpp \
+	setunon0.cpp setunon1.cpp setunon2.cpp \
+	sort1.cpp sort2.cpp \
+	stack1.cpp stack2.cpp \
+	stblptn0.cpp stblptn1.cpp \
+	stblsrt1.cpp stblsrt2.cpp \
+	swap1.cpp \
+	swprnge1.cpp \
+	times.cpp \
+	trnsfrm1.cpp trnsfrm2.cpp \
+	ucompos1.cpp ucompos2.cpp \
+	unegate1.cpp unegate2.cpp \
+	uniqcpy1.cpp uniqcpy2.cpp \
+	unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp \
+	vec1.cpp vec2.cpp vec3.cpp vec4.cpp vec5.cpp vec6.cpp vec7.cpp vec8.cpp \
+        hmap1.cpp hmmap1.cpp hset2.cpp hmset1.cpp slist1.cpp string1.cpp bitset1.cpp
+
+# STAT_MODULE=stat.o
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%.exe)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CC = CC
+CXX = $(CC)
+# DEBUG_FLAGS=-g
+# DEBUG_FLAGS=-O
+
+# DEBUG_FLAGS=-D_STLP_DEBUG
+
+# DEBUG_FLAGS=-compat=4
+
+
+# CXXFLAGS = -xarch=v9 +w2 ${STL_INCL} ${DEBUG_FLAGS} -I. -D_STLP_NO_OWN_IOSTREAMS -D_STLP_HAS_NO_NEW_IOSTREAMS
+CXXFLAGS = -xarch=v9 +w2 ${STL_INCL} ${DEBUG_FLAGS} -I. -library=no%Cstd  -I. -qoption ccfe -expand=1000 -qoption ccfe -instlib=../../lib/libstlport_sunpro64.so
+
+
+
+# LIBS = -lm -liostream 
+LIBS = -L../../lib -lstlport_sunpro64 -lm
+LIBSTDCXX = 
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(DEBUG_FLAGS) $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	LD_LIBRARY_PATH=../../lib:${LD_LIBRARY_PATH} ./$(TEST_EXE) < stdin > $(TEST)
+
+SUFFIXES: .cpp.o.exe.out.res
+
+%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -D_REENTRANT -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) -lpthread -g -o $*.exe
+	LD_LIBRARY_PATH=../../lib:${LD_LIBRARY_PATH} ./$*.exe < stdin > $@
+	-rm -f $*.exe
+
+istmit1.out: istmit1.cpp
+	$(CXX) $(CXXFLAGS) $< $(STAT_MODULE) $(LIBSTDCXX) -lstdc++ $(LIBS) -o istmit1
+	echo 'a string' | ./istmit1 > istmit1.out
+	-rm -f ./istmit1
+
+$(STAT_MODULE): stat.cpp
+	$(CXX) $(CXXFLAGS) -c $< -o $@
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O5 -D_STLP_USE_MALLOC -S -pto $<  -o $@
+
+#	$(CXX) $(CXXFLAGS) -O5 -D_STLP_USE_MALLOC -noex -D_STLP_NO_EXCEPTIONS -S -pto $<  -o $@
+
+#	$(CXX) $(CXXFLAGS) -O4 -noex -D_STLP_NO_EXCEPTIONS -D_STLP_NO_EXCEPTIONS -S -pta $<  -o $@
+
+clean:
+	-rm -fr *.exe *.o *.rpo *.obj *.out Templates.DB SunWS_cache
diff --git a/main/source/stlport/test/regression/sunpro.mak b/main/source/stlport/test/regression/sunpro.mak
new file mode 100644
index 00000000..54dc82aa
--- /dev/null
+++ b/main/source/stlport/test/regression/sunpro.mak
@@ -0,0 +1,179 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+srcdir = .
+VPATH = .
+
+# point this to proper location
+
+
+# PWD is here because SC5 wants absolute path ;(
+STL_INCL=-I${PWD}/../../stlport
+
+LIST  = stl_test.cpp accum1.cpp accum2.cpp \
+	adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp \
+	advance.cpp \
+	alg1.cpp alg2.cpp alg3.cpp alg4.cpp alg5.cpp \
+	bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp \
+	bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp \
+	binsrch1.cpp binsrch2.cpp \
+	bnegate1.cpp bnegate2.cpp bvec1.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp \
+	copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp \
+	countif1.cpp \
+	deque1.cpp \
+	divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp \
+	equal0.cpp equal1.cpp equal2.cpp \
+	equalto.cpp \
+	fill1.cpp filln1.cpp \
+	find0.cpp find1.cpp \
+	findif0.cpp findif1.cpp \
+	finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp \
+	func1.cpp func2.cpp func3.cpp \
+	gener1.cpp gener2.cpp \
+	genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp \
+	incl0.cpp incl1.cpp incl2.cpp \
+	inplmrg1.cpp inplmrg2.cpp \
+	inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp \
+	iota1.cpp \
+	istmit1.cpp \
+	iter1.cpp iter2.cpp iter3.cpp iter4.cpp \
+	iterswp0.cpp iterswp1.cpp \
+	less.cpp \
+	lesseq.cpp \
+	lexcmp1.cpp lexcmp2.cpp \
+	list1.cpp list2.cpp list3.cpp list4.cpp \
+	logicand.cpp logicnot.cpp \
+	logicor.cpp \
+	lwrbnd1.cpp lwrbnd2.cpp \
+	map1.cpp \
+	max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp \
+	memfunptr.cpp \
+	merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp \
+	minelem1.cpp minelem2.cpp \
+	minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp \
+	mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp \
+	modulus.cpp \
+	mset1.cpp mset3.cpp mset4.cpp mset5.cpp \
+	negate.cpp nequal.cpp \
+	nextprm0.cpp nextprm1.cpp nextprm2.cpp \
+	nthelem0.cpp nthelem1.cpp nthelem2.cpp \
+	ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp \
+	parsrt0.cpp parsrt1.cpp parsrt2.cpp \
+	parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp \
+	partsum0.cpp partsum1.cpp partsum2.cpp \
+	pheap1.cpp pheap2.cpp \
+	plus.cpp \
+	pqueue1.cpp \
+	prevprm0.cpp prevprm1.cpp prevprm2.cpp \
+	ptition0.cpp ptition1.cpp \
+	ptrbinf1.cpp ptrbinf2.cpp \
+	ptrunf1.cpp ptrunf2.cpp \
+	queue1.cpp \
+	rawiter.cpp \
+	remcopy1.cpp \
+	remcpif1.cpp \
+	remif1.cpp \
+	remove1.cpp \
+	repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp \
+	revbit1.cpp revbit2.cpp \
+	revcopy1.cpp reverse1.cpp reviter1.cpp reviter2.cpp \
+	rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp \
+	search0.cpp search1.cpp search2.cpp \
+	set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp \
+	setintr0.cpp setintr1.cpp setintr2.cpp \
+	setsymd0.cpp setsymd1.cpp setsymd2.cpp \
+	setunon0.cpp setunon1.cpp setunon2.cpp \
+	sort1.cpp sort2.cpp \
+	stack1.cpp stack2.cpp \
+	stblptn0.cpp stblptn1.cpp \
+	stblsrt1.cpp stblsrt2.cpp \
+	swap1.cpp \
+	swprnge1.cpp \
+	times.cpp \
+	trnsfrm1.cpp trnsfrm2.cpp \
+	ucompos1.cpp ucompos2.cpp \
+	unegate1.cpp unegate2.cpp \
+	uniqcpy1.cpp uniqcpy2.cpp \
+	unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp \
+	vec1.cpp vec2.cpp vec3.cpp vec4.cpp vec5.cpp vec6.cpp vec7.cpp vec8.cpp \
+        hmap1.cpp hmmap1.cpp hset2.cpp hmset1.cpp slist1.cpp string1.cpp bitset1.cpp
+
+# STAT_MODULE=stat.o
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%.exe)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CC = CC
+CXX = $(CC)
+# DEBUG_FLAGS=-g
+# DEBUG_FLAGS=-O
+
+# DEBUG_FLAGS=-D_STLP_DEBUG
+
+# DEBUG_FLAGS=-compat=4
+
+
+CXXFLAGS = +w2 ${STL_INCL} ${DEBUG_FLAGS} -library=no%Cstd  -I. -qoption ccfe -expand=1000 -qoption ccfe -instlib=../../lib/libstlport_sunpro.so
+
+LIBS = -L../../lib -lstlport_sunpro -lm
+LIBSTDCXX = 
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(DEBUG_FLAGS) $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	LD_LIBRARY_PATH="../../lib;${LD_LIBRARY_PATH}" ./$(TEST_EXE) < stdin > $(TEST)
+
+SUFFIXES: .cpp.o.exe.out.res
+
+%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+%.i : %.cpp
+	$(CXX) $(CXXFLAGS) $< -E -H > $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -USINGLE -DMAIN -D_REENTRANT -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o -L../../lib -lstlport_sunpro -lpthread -xildoff -lm -g -o $*.exe
+	env LD_LIBRARY_PATH=../../lib ./$*.exe > $@
+#	-rm -f $*.exe
+
+istmit1.out: istmit1.cpp
+	$(CXX) $(CXXFLAGS) $< $(STAT_MODULE) $(LIBSTDCXX) -lstdc++ $(LIBS) -o istmit1
+	echo 'a string' | ./istmit1 > istmit1.out
+	-rm -f ./istmit1
+
+$(STAT_MODULE): stat.cpp
+	$(CXX) $(CXXFLAGS) -c $< -o $@
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O5 -D_STLP_USE_MALLOC -S -pto $<  -o $@
+
+#	$(CXX) $(CXXFLAGS) -O5 -D_STLP_USE_MALLOC -noex -D_STLP_NO_EXCEPTIONS -S -pto $<  -o $@
+
+#	$(CXX) $(CXXFLAGS) -O4 -noex -D_STLP_NO_EXCEPTIONS -D_STLP_NO_EXCEPTIONS -S -pta $<  -o $@
+
+clean:
+	-rm -fr *.exe *.o *.rpo *.obj *.out Templates.DB SunWS_cache
diff --git a/main/source/stlport/test/regression/swap1.cpp b/main/source/stlport/test/regression/swap1.cpp
new file mode 100644
index 00000000..732f96a7
--- /dev/null
+++ b/main/source/stlport/test/regression/swap1.cpp
@@ -0,0 +1,23 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define swap1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int swap1_test(int, char**)
+{
+  cout<<"Results of swap1_test:"<<endl;
+  int a = 42;
+  int b = 19;
+  cout << "a = " << a << " b = " << b << endl;
+  swap(a, b);
+  cout << "a = " << a << " b = " << b << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/swprnge1.cpp b/main/source/stlport/test/regression/swprnge1.cpp
new file mode 100644
index 00000000..2efd5ba9
--- /dev/null
+++ b/main/source/stlport/test/regression/swprnge1.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <cstring>
+
+#ifdef MAIN 
+#define swprnge1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int swprnge1_test(int, char**)
+{
+  cout<<"Results of swprnge1_test:"<<endl;
+  char word1[] = "World";
+  char word2[] = "Hello";
+  cout << word1 << " " << word2 << endl;
+  swap_ranges((char*)word1, (char*)word1 + ::strlen(word1), (char*)word2);
+  cout << word1 << " " << word2 << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/testfile b/main/source/stlport/test/regression/testfile
new file mode 100644
index 00000000..ef0493b2
--- /dev/null
+++ b/main/source/stlport/test/regression/testfile
@@ -0,0 +1 @@
+hello
diff --git a/main/source/stlport/test/regression/times.cpp b/main/source/stlport/test/regression/times.cpp
new file mode 100644
index 00000000..7e2ae40b
--- /dev/null
+++ b/main/source/stlport/test/regression/times.cpp
@@ -0,0 +1,23 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include <numeric>
+
+#ifdef MAIN 
+#define times_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int times_test(int, char**)
+{
+  cout<<"Results of times_test:"<<endl;
+int input [4] = { 1, 5, 7, 2 };
+
+  int total = accumulate(input, input + 4, 1, multiplies<int>());
+  cout << "total = " << total << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/trnsfrm1.cpp b/main/source/stlport/test/regression/trnsfrm1.cpp
new file mode 100644
index 00000000..65e7e4ce
--- /dev/null
+++ b/main/source/stlport/test/regression/trnsfrm1.cpp
@@ -0,0 +1,30 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define trnsfrm1_test main
+#endif
+static int negate_int(int a_)
+{
+  return -a_;
+}
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int trnsfrm1_test(int, char**)
+{
+  cout<<"Results of trnsfrm1_test:"<<endl;
+
+int numbers[6] = { -5, -1, 0, 1, 6, 11 };
+
+  int result[6];
+  transform((int*)numbers, (int*)numbers + 6, (int*)result, negate_int);
+  for(int i = 0; i < 6; i++)
+    cout << result[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/trnsfrm2.cpp b/main/source/stlport/test/regression/trnsfrm2.cpp
new file mode 100644
index 00000000..12e47be1
--- /dev/null
+++ b/main/source/stlport/test/regression/trnsfrm2.cpp
@@ -0,0 +1,36 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <cstring>
+#include <iterator>
+#include <functional>
+
+#ifdef MAIN 
+#define trnsfrm2_test main
+#endif
+static char map_char(char a_, int b_)
+{
+  return char(a_ + b_);
+}
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int trnsfrm2_test(int, char**)
+{
+  cout<<"Results of trnsfrm2_test:"<<endl;
+
+#if defined (__MVS__)
+int trans[] = {-11, 4, -6, -6, -18, 0, 18, -14, 6, 0, -1, -59};
+#else
+int trans[] = {-4, 4, -6, -6, -10, 0, 10, -6, 6, 0, -1, -77};
+#endif
+  char n[] = "Larry Mullen";
+  const unsigned count = ::strlen(n);
+  ostream_iterator <char> iter(cout);
+  transform(n, n + count, trans, iter, map_char);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/tstdeq.cpp b/main/source/stlport/test/regression/tstdeq.cpp
new file mode 100644
index 00000000..e3749e28
--- /dev/null
+++ b/main/source/stlport/test/regression/tstdeq.cpp
@@ -0,0 +1,13 @@
+#include <string>
+#include <deque>
+#include <iterator>
+#include <iostream>
+typedef std::string Str;
+typedef std::deque<Str> Dq;
+int insert1_test()
+{
+  Str array1 [] = { "laurie", "jennifer", "leisa" };
+  Dq nam(array1, array1 + 3);
+  Dq::iterator i = nam.begin() + 2;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/ucompos1.cpp b/main/source/stlport/test/regression/ucompos1.cpp
new file mode 100644
index 00000000..9f410955
--- /dev/null
+++ b/main/source/stlport/test/regression/ucompos1.cpp
@@ -0,0 +1,29 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include "unary.h"
+
+#ifdef MAIN 
+#define ucompos1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+int ucompos1_test(int, char**)
+{
+  cout<<"Results of ucompos1_test:"<<endl;
+
+int input [3] = { -1, -4, -16 };
+
+  int output [3];
+  transform((int*)input, (int*)input + 3, (int*)output, 
+	    //	    compose1(square_root(), negate<int>()));
+  	    unary_compose<square_root, negate<int> >(square_root(), negate<int>()));
+  for(int i = 0; i < 3; i++)
+    cout << output[i] << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/ucompos2.cpp b/main/source/stlport/test/regression/ucompos2.cpp
new file mode 100644
index 00000000..417cb72a
--- /dev/null
+++ b/main/source/stlport/test/regression/ucompos2.cpp
@@ -0,0 +1,27 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include "unary.h"
+
+#ifdef MAIN 
+#define ucompos2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int ucompos2_test(int, char**)
+{
+  cout<<"Results of ucompos2_test:"<<endl;
+
+int input [3] = { -1, -4, -16 };
+
+  int output [3];
+  transform((int*)input, (int*)input + 3, (int*)output, 
+    compose1(square_root(), negate<int>()));
+  for(int i = 0; i < 3; i++)
+   cout << output[i] << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/unary.h b/main/source/stlport/test/regression/unary.h
new file mode 100644
index 00000000..f0e0b2f9
--- /dev/null
+++ b/main/source/stlport/test/regression/unary.h
@@ -0,0 +1,38 @@
+#ifndef _unary_h
+#define _unary_h
+#include <cmath>
+#include <cfloat>
+#include <functional>		//*TY 12/26/1998 - added to get unary_function
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using std::unary_function;
+#endif
+
+struct odd : public unary_function<int, bool>
+{
+//  odd() {}
+  bool operator()(int n_) const { return(n_ % 2) == 1; }
+};
+ 
+struct positive : public unary_function<int, bool>
+{
+  typedef int argument_type;
+  typedef bool result_type;
+//  positive() {}
+  bool operator()(int n_) const { return n_ >= 0; }
+};
+
+struct square_root : public unary_function<double, double>
+{
+  typedef double argument_type;
+  typedef double result_type;
+  square_root() {}
+  square_root(const square_root &) {}
+  double operator()(double x_) const { 
+  # if !defined(STLPORT) || defined (__STL_USE_NAMESPACES)
+    using namespace std;
+  # endif
+    return sqrt(x_); 
+  }
+};
+#endif // _unary_h
diff --git a/main/source/stlport/test/regression/unegate1.cpp b/main/source/stlport/test/regression/unegate1.cpp
new file mode 100644
index 00000000..45e87c44
--- /dev/null
+++ b/main/source/stlport/test/regression/unegate1.cpp
@@ -0,0 +1,25 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include "unary.h"
+
+#ifdef MAIN 
+#define unegate1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int unegate1_test(int, char**)
+{
+  cout<<"Results of unegate1_test:"<<endl;
+
+int array [3] = { 1, 2, 3 };
+
+  int* p = find_if((int*)array, (int*)array + 3, unary_negate<odd>(odd()));
+  if(p != array + 3)
+    cout << *p << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/unegate2.cpp b/main/source/stlport/test/regression/unegate2.cpp
new file mode 100644
index 00000000..e17b1691
--- /dev/null
+++ b/main/source/stlport/test/regression/unegate2.cpp
@@ -0,0 +1,25 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <algorithm>
+#include "unary.h"
+
+#ifdef MAIN 
+#define unegate2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int unegate2_test(int, char**)
+{
+  cout<<"Results of unegate2_test:"<<endl;
+
+int array [3] = { 1, 2, 3 };
+
+  int* p = find_if((int*)array, (int*)array + 3, not1(odd()));
+  if(p != array + 3)
+    cout << *p << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/uniqcpy1.cpp b/main/source/stlport/test/regression/uniqcpy1.cpp
new file mode 100644
index 00000000..1b04af23
--- /dev/null
+++ b/main/source/stlport/test/regression/uniqcpy1.cpp
@@ -0,0 +1,25 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define uniqcpy1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int uniqcpy1_test(int, char**)
+{
+  cout<<"Results of uniqcpy1_test:"<<endl;
+int numbers[8] = { 0, 1, 1, 2, 2, 2, 3, 4 };
+int result[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+
+  unique_copy((int*)numbers, (int*)numbers + 8, (int*)result);
+  for(int i = 0; i < 8; i++)
+    cout << result[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/uniqcpy2.cpp b/main/source/stlport/test/regression/uniqcpy2.cpp
new file mode 100644
index 00000000..2176a542
--- /dev/null
+++ b/main/source/stlport/test/regression/uniqcpy2.cpp
@@ -0,0 +1,41 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <cstring>
+#include <vector>
+#include <algorithm>
+#include <iterator>
+#include <functional>
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+#ifdef MAIN 
+#define uniqcpy2_test main
+#endif
+static bool str_equal(const char* a_, const char* b_)
+{
+  return strcmp(a_, b_) == 0 ? 1 : 0;
+}
+
+int uniqcpy2_test(int, char**)
+{
+  cout<<"Results of uniqcpy2_test:"<<endl;
+
+  char* labels[] = { "Q","Q","W","W","E","E","R","T","T","Y","Y" };
+
+  const unsigned count = sizeof(labels) / sizeof(labels[0]);
+  ostream_iterator <char*> iter(cout);
+  copy((char**)labels, (char**)labels + count, iter);
+  cout << endl;
+  char* uCopy[count];
+  fill((char**)uCopy, (char**)uCopy + count, (char*)"");
+  unique_copy((char**)labels, (char**)labels + count, (char**)uCopy, str_equal);
+  copy((char**)labels, (char**)labels + count, iter);
+  cout << endl;
+  copy((char**)uCopy, (char**)uCopy + count, iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/unique1.cpp b/main/source/stlport/test/regression/unique1.cpp
new file mode 100644
index 00000000..0eb7916e
--- /dev/null
+++ b/main/source/stlport/test/regression/unique1.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define unique1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int unique1_test(int, char**)
+{
+  cout<<"Results of unique1_test:"<<endl;
+int numbers[8] = { 0, 1, 1, 2, 2, 2, 3, 4 };
+
+  unique((int*)numbers, (int*)numbers + 8);
+  for(int i = 0; i < 8; i ++)
+    cout << numbers[i] << ' ';
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/unique2.cpp b/main/source/stlport/test/regression/unique2.cpp
new file mode 100644
index 00000000..1ee1c7c2
--- /dev/null
+++ b/main/source/stlport/test/regression/unique2.cpp
@@ -0,0 +1,36 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <cstring>
+#include <iterator>
+#include <functional>
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+#ifdef MAIN 
+#define unique2_test main
+#endif
+static bool str_equal(const char* a_, const char* b_)
+{
+  return strcmp(a_, b_) == 0 ? 1 : 0;
+}
+
+int unique2_test(int, char**)
+{
+  cout<<"Results of unique2_test:"<<endl;
+
+char* labels[] = { "Q","Q","W","W","E","E","R","T","T","Y","Y" };
+
+  const unsigned count = sizeof(labels) / sizeof(labels[0]);
+  ostream_iterator <char*> iter(cout);
+  copy((char**)labels, (char**)labels + count, iter);
+  cout << endl;
+  unique((char**)labels, (char**)labels + count, str_equal);
+  copy((char**)labels, (char**)labels + count, iter);
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/uprbnd1.cpp b/main/source/stlport/test/regression/uprbnd1.cpp
new file mode 100644
index 00000000..b65371a5
--- /dev/null
+++ b/main/source/stlport/test/regression/uprbnd1.cpp
@@ -0,0 +1,28 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+
+#ifdef MAIN 
+#define uprbnd1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int uprbnd1_test(int, char**)
+{
+  cout<<"Results of uprbnd1_test:"<<endl;
+  int array[20];
+  for(int i = 0; i < 20; i++)
+  {
+    array[i] = i/4;
+    cout << array[i] << ' ';
+  }
+  cout
+    << "\n3 can be inserted at index: "
+    <<(upper_bound((int*)array, (int*)array + 20, 3) - array)
+    << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/uprbnd2.cpp b/main/source/stlport/test/regression/uprbnd2.cpp
new file mode 100644
index 00000000..5a930bc4
--- /dev/null
+++ b/main/source/stlport/test/regression/uprbnd2.cpp
@@ -0,0 +1,35 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <algorithm>
+#include <iostream>
+#include <cstring>
+
+#ifdef MAIN 
+#define uprbnd2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+static bool char_str_less(const char* a_, const char* b_)
+{
+  return strcmp(a_, b_) < 0 ? 1 : 0;
+}
+
+int uprbnd2_test(int, char**)
+{
+  cout<<"Results of uprbnd2_test:"<<endl;
+
+char* str [] = { "a", "a", "b", "b", "q", "w", "z" };
+
+  const unsigned strCt = sizeof(str)/sizeof(str[0]);
+  // DEC C++ generates incorrect template instatiation code 
+  // for "d" so must cast 
+  cout
+    << "d can be inserted at index: "
+    << (upper_bound((char**)str,  (char**)str + strCt, (const char *)"d", char_str_less) - str)
+    << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/vc.gmake b/main/source/stlport/test/regression/vc.gmake
new file mode 100644
index 00000000..43806cba
--- /dev/null
+++ b/main/source/stlport/test/regression/vc.gmake
@@ -0,0 +1,153 @@
+# makefile for MSVC V6.0 tests. <dima@cs.uu.nl>
+# This requires GNU make.
+CC=cl
+CXX=$(CC)
+
+OBJ=.obj
+REPO_FLAGS=
+.SUFFIXES:	.cc .cpp $(OBJ) .exe .out
+
+srcdir = .
+VPATH = .
+
+STL_INCL=-I../../stlport
+
+CXX_EXTRA_FLAGS=
+DEBUG_FLAGS=
+
+LIST  = stl_test.cpp accum1.cpp accum2.cpp \
+	adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp \
+	advance.cpp \
+	alg1.cpp alg2.cpp alg3.cpp alg4.cpp alg5.cpp \
+	bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp \
+	bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp \
+	binsrch1.cpp binsrch2.cpp \
+	bnegate1.cpp bnegate2.cpp bvec1.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp \
+	copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp \
+	countif1.cpp \
+	deque1.cpp \
+	divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp \
+	equal0.cpp equal1.cpp equal2.cpp \
+	equalto.cpp \
+	fill1.cpp filln1.cpp \
+	find0.cpp find1.cpp \
+	findif0.cpp findif1.cpp \
+	finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp \
+	func1.cpp func2.cpp func3.cpp \
+	gener1.cpp gener2.cpp \
+	genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp \
+	incl0.cpp incl1.cpp incl2.cpp \
+	inplmrg1.cpp inplmrg2.cpp \
+	inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp \
+	iota1.cpp \
+	istmit1.cpp \
+	iter1.cpp iter2.cpp iter3.cpp iter4.cpp \
+	iterswp0.cpp iterswp1.cpp \
+	less.cpp \
+	lesseq.cpp \
+	lexcmp1.cpp lexcmp2.cpp \
+	list1.cpp list2.cpp list3.cpp list4.cpp \
+	logicand.cpp logicnot.cpp \
+	logicor.cpp \
+	lwrbnd1.cpp lwrbnd2.cpp \
+	map1.cpp \
+	max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp \
+	merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp \
+	minelem1.cpp minelem2.cpp \
+	minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp \
+	mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp \
+	modulus.cpp \
+	mset1.cpp mset3.cpp mset4.cpp mset5.cpp \
+	negate.cpp nequal.cpp \
+	nextprm0.cpp nextprm1.cpp nextprm2.cpp \
+	nthelem0.cpp nthelem1.cpp nthelem2.cpp \
+	ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp \
+	parsrt0.cpp parsrt1.cpp parsrt2.cpp \
+	parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp \
+	partsum0.cpp partsum1.cpp partsum2.cpp \
+	pheap1.cpp pheap2.cpp \
+	plus.cpp \
+	pqueue1.cpp \
+	prevprm0.cpp prevprm1.cpp prevprm2.cpp \
+	ptition0.cpp ptition1.cpp \
+	ptrbinf1.cpp ptrbinf2.cpp \
+	ptrunf1.cpp ptrunf2.cpp \
+	queue1.cpp \
+	rawiter.cpp \
+	remcopy1.cpp \
+	remcpif1.cpp \
+	remif1.cpp \
+	remove1.cpp \
+	repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp \
+	revbit1.cpp revbit2.cpp \
+	revcopy1.cpp reverse1.cpp reviter1.cpp reviter2.cpp \
+	rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp \
+	search0.cpp search1.cpp search2.cpp \
+	set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp \
+	setintr0.cpp setintr1.cpp setintr2.cpp \
+	setsymd0.cpp setsymd1.cpp setsymd2.cpp \
+	setunon0.cpp setunon1.cpp setunon2.cpp \
+	sort1.cpp sort2.cpp \
+	stack1.cpp stack2.cpp \
+	stblptn0.cpp stblptn1.cpp \
+	stblsrt1.cpp stblsrt2.cpp \
+	swap1.cpp \
+	swprnge1.cpp \
+	times.cpp \
+	trnsfrm1.cpp trnsfrm2.cpp \
+	ucompos1.cpp ucompos2.cpp \
+	unegate1.cpp unegate2.cpp \
+	uniqcpy1.cpp uniqcpy2.cpp \
+	unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp \
+	vec1.cpp vec2.cpp vec3.cpp vec4.cpp vec5.cpp vec6.cpp vec7.cpp vec8.cpp \
+        hmmap1.cpp hset2.cpp hmset1.cpp slist1.cpp hmap1.cpp string1.cpp bitset1.cpp
+
+
+OBJECTS = $(LIST:%.cpp=%$(OBJ)) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%.exe)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CXXFLAGS = -nologo -GX -Zm400 $(STL_INCL) $(CXX_EXTRA_FLAGS)
+
+LIBSTDCXX = 
+
+all:
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS) stl_test.out
+	link -nologo $(OBJECTS) /OUT:$(TEST_EXE)
+	echo 'a string' | ./$(TEST_EXE) > $(TEST)
+
+%$(OBJ): %.cpp
+	$(CXX) $(CXXFLAGS) $(DEBUG_FLAGS) $(REPO_FLAGS) -c $<
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} -USINGLE -DMAIN $< 
+	$(CXX) $(CXXFLAGS) $*$(OBJ) $(STAT_MODULE) $(LIBS) -o $*.exe
+	./$*.exe > $@
+	-rm -f $*.exe
+
+clean:
+	-rm -rf *.exe *.out *$(OBJ) *.rpo core *.out Templates.DB
diff --git a/main/source/stlport/test/regression/vc.mak b/main/source/stlport/test/regression/vc.mak
new file mode 100644
index 00000000..48caf3ba
--- /dev/null
+++ b/main/source/stlport/test/regression/vc.mak
@@ -0,0 +1,182 @@
+# Microsoft Developer Studio Generated NMAKE File, Format Version 4.10
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+################################################################################
+# Begin Project
+RSC=rc.exe
+CPP=cl.exe
+F90=fl32.exe
+
+OUTDIR=.
+INTDIR=.
+
+# set this directories 
+STL_INCL=-I../../stlport
+
+VC_INCL=.
+# d:/vc41/msdev/include
+
+Dep_stl = stl_test.obj accum1.obj accum2.obj \
+	adjdiff0.obj adjdiff1.obj adjdiff2.obj \
+	adjfind0.obj adjfind1.obj adjfind2.obj \
+	advance.obj \
+	alg1.obj alg2.obj alg3.obj alg4.obj alg5.obj \
+	bcompos1.obj bcompos2.obj \
+	bind1st1.obj bind1st2.obj \
+	bind2nd1.obj bind2nd2.obj \
+	binsert1.obj binsert2.obj \
+	binsrch1.obj binsrch2.obj \
+	bnegate1.obj bnegate2.obj bvec1.obj \
+	copy1.obj copy2.obj copy3.obj copy4.obj \
+	copyb.obj copyb0.obj \
+	count0.obj count1.obj \
+	countif1.obj \
+	deque1.obj \
+	divides.obj \
+	eqlrnge0.obj eqlrnge1.obj eqlrnge2.obj \
+	equal0.obj equal1.obj equal2.obj \
+	equalto.obj \
+	fill1.obj filln1.obj \
+	find0.obj find1.obj \
+	findif0.obj findif1.obj \
+	finsert1.obj finsert2.obj \
+	foreach0.obj foreach1.obj \
+	func1.obj func2.obj func3.obj \
+	gener1.obj gener2.obj \
+	genern1.obj genern2.obj \
+	greateq.obj greater.obj \
+	incl0.obj incl1.obj incl2.obj \
+	inplmrg1.obj inplmrg2.obj \
+	inrprod0.obj inrprod1.obj inrprod2.obj \
+	insert1.obj insert2.obj \
+	iota1.obj \
+	istmit1.obj \
+	iter1.obj iter2.obj iter3.obj iter4.obj \
+	iterswp0.obj iterswp1.obj \
+	less.obj \
+	lesseq.obj \
+	lexcmp1.obj lexcmp2.obj \
+	list1.obj list2.obj list3.obj list4.obj \
+	logicand.obj logicnot.obj \
+	logicor.obj \
+	lwrbnd1.obj lwrbnd2.obj \
+	map1.obj \
+	max1.obj max2.obj \
+	maxelem1.obj maxelem2.obj \
+	memfunptr.obj \
+	merge0.obj merge1.obj merge2.obj \
+	min1.obj min2.obj \
+	minelem1.obj minelem2.obj \
+	minus.obj \
+	mismtch0.obj mismtch1.obj mismtch2.obj \
+	mkheap0.obj mkheap1.obj \
+	mmap1.obj mmap2.obj \
+	modulus.obj \
+	mset1.obj mset3.obj mset4.obj mset5.obj \
+	negate.obj nequal.obj \
+	nextprm0.obj nextprm1.obj nextprm2.obj \
+	nthelem0.obj nthelem1.obj nthelem2.obj \
+	ostmit.obj \
+	pair0.obj pair1.obj pair2.obj \
+	parsrt0.obj parsrt1.obj parsrt2.obj \
+	parsrtc0.obj parsrtc1.obj parsrtc2.obj \
+	partsrt0.obj \
+	partsum0.obj partsum1.obj partsum2.obj \
+	pheap1.obj pheap2.obj \
+	plus.obj \
+	pqueue1.obj \
+	prevprm0.obj prevprm1.obj prevprm2.obj \
+	ptition0.obj ptition1.obj \
+	ptrbinf1.obj ptrbinf2.obj \
+	ptrunf1.obj ptrunf2.obj \
+	queue1.obj \
+	rawiter.obj \
+	remcopy1.obj \
+	remcpif1.obj \
+	remif1.obj \
+	remove1.obj \
+	repcpif1.obj \
+	replace0.obj replace1.obj replcpy1.obj replif1.obj \
+	revbit1.obj revbit2.obj \
+	revcopy1.obj reverse1.obj reviter1.obj reviter2.obj \
+	rndshuf0.obj rndshuf1.obj rndshuf2.obj \
+	rotate0.obj rotate1.obj rotcopy0.obj rotcopy1.obj \
+	search0.obj search1.obj search2.obj \
+	set1.obj set2.obj \
+	setdiff0.obj setdiff1.obj setdiff2.obj \
+	setintr0.obj setintr1.obj setintr2.obj \
+	setsymd0.obj setsymd1.obj setsymd2.obj \
+	setunon0.obj setunon1.obj setunon2.obj \
+	sort1.obj sort2.obj \
+	stack1.obj stack2.obj \
+	stblptn0.obj stblptn1.obj \
+	stblsrt1.obj stblsrt2.obj \
+	swap1.obj \
+	swprnge1.obj \
+	times.obj \
+	trnsfrm1.obj trnsfrm2.obj \
+	ucompos1.obj ucompos2.obj \
+	unegate1.obj unegate2.obj \
+	uniqcpy1.obj uniqcpy2.obj \
+	unique1.obj unique2.obj \
+	uprbnd1.obj uprbnd2.obj \
+	vec1.obj vec2.obj vec3.obj vec4.obj vec5.obj vec6.obj vec7.obj vec8.obj \
+        hmap1.obj hmmap1.obj hset2.obj hmset1.obj slist1.obj string1.obj bitset1.obj
+
+LINK32=link.exe
+
+# CPP_PROJ=/nologo /W3 /MDd /GX /Zd /D "WIN32" /D "_CONSOLE" $(STL_INCL) /I$(VC_INCL) /I.
+
+# Use this flags to test non-SGI iostreams
+CPP_PROJ=/nologo /W3 /MD /GX /Zi /D "WIN32" /D "_CONSOLE" $(STL_INCL) /I$(VC_INCL) /I. /D_STLP_NO_OWN_IOSTREAMS
+# CPP_PROJ=/nologo /W3 /MD /GX /Zd /Zi /D "WIN32" /D "_CONSOLE" $(STL_INCL) /I$(VC_INCL) /I.
+# linker finds proper STLport lib automatically, only path to the
+# library is needed
+CPP_LIBS = /link /libpath:"..\..\lib"
+
+check: stl_test.out
+
+stl_test.out : $(Dep_stl)
+	$(CPP) $(CPP_PROJ) $(Dep_stl) $(CPP_LIBS)
+	stl_test < stdin
+	echo done
+
+clean :
+	-@erase "$(INTDIR)\*.obj"
+	-@erase "$(OUTDIR)\*.exe"
+	-@erase "$(OUTDIR)\*.obj"
+	-@erase "$(OUTDIR)\*.ilk"
+	-@erase "$(OUTDIR)\*.pdb"
+
+
+.exe.out:
+	$< > $@
+
+.cpp.exe:
+  $(CPP) $(CPP_PROJ) -DMAIN  $< $(CPP_LIBS)
+
+.c.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cpp.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cxx.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.c.sbr:
+   $(CPP) $(CPP_PROJ) $<  
+
+.cpp.E:
+   $(CPP) $(CPP_PROJ) -E $< >$*.E  
+
+.cpp.sbr:
+   $(CPP) $(CPP_PROJ) $<  
diff --git a/main/source/stlport/test/regression/vc6.mak b/main/source/stlport/test/regression/vc6.mak
new file mode 100644
index 00000000..430111bd
--- /dev/null
+++ b/main/source/stlport/test/regression/vc6.mak
@@ -0,0 +1,226 @@
+# Microsoft Developer Studio Generated NMAKE File, Format Version 4.10
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+################################################################################
+# Begin Project
+RSC=rc.exe
+CPP=cl.exe
+LINK32=link.exe
+F90=fl32.exe
+
+OUTDIR=.
+INTDIR=.
+
+# set this directories 
+STL_PATH=..\..
+
+
+Dep_stl = stl_test.obj accum1.obj accum2.obj \
+	adjdiff0.obj adjdiff1.obj adjdiff2.obj \
+	adjfind0.obj adjfind1.obj adjfind2.obj \
+	advance.obj \
+	alg1.obj alg2.obj alg3.obj alg4.obj alg5.obj \
+	bcompos1.obj bcompos2.obj \
+	bind1st1.obj bind1st2.obj \
+	bind2nd1.obj bind2nd2.obj \
+	binsert1.obj binsert2.obj \
+	binsrch1.obj binsrch2.obj \
+	bnegate1.obj bnegate2.obj bvec1.obj \
+	copy1.obj copy2.obj copy3.obj copy4.obj \
+	copyb.obj copyb0.obj \
+	count0.obj count1.obj \
+	countif1.obj \
+	deque1.obj \
+	divides.obj \
+	eqlrnge0.obj eqlrnge1.obj eqlrnge2.obj \
+	equal0.obj equal1.obj equal2.obj \
+	equalto.obj \
+	fill1.obj filln1.obj \
+	find0.obj find1.obj \
+	findif0.obj findif1.obj \
+	finsert1.obj finsert2.obj \
+	foreach0.obj foreach1.obj \
+	func1.obj func2.obj func3.obj \
+	gener1.obj gener2.obj \
+	genern1.obj genern2.obj \
+	greateq.obj greater.obj \
+	incl0.obj incl1.obj incl2.obj \
+	inplmrg1.obj inplmrg2.obj \
+	inrprod0.obj inrprod1.obj inrprod2.obj \
+	insert1.obj insert2.obj \
+	iota1.obj \
+	istmit1.obj \
+	iter1.obj iter2.obj iter3.obj iter4.obj \
+	iterswp0.obj iterswp1.obj \
+	less.obj \
+	lesseq.obj \
+	lexcmp1.obj lexcmp2.obj \
+	list1.obj list2.obj list3.obj list4.obj \
+	logicand.obj logicnot.obj \
+	logicor.obj \
+	lwrbnd1.obj lwrbnd2.obj \
+	map1.obj \
+	max1.obj max2.obj \
+	maxelem1.obj maxelem2.obj \
+	memfunptr.obj \
+	merge0.obj merge1.obj merge2.obj \
+	min1.obj min2.obj \
+	minelem1.obj minelem2.obj \
+	minus.obj \
+	mismtch0.obj mismtch1.obj mismtch2.obj \
+	mkheap0.obj mkheap1.obj \
+	mmap1.obj mmap2.obj \
+	modulus.obj \
+	mset1.obj mset3.obj mset4.obj mset5.obj \
+	negate.obj nequal.obj \
+	nextprm0.obj nextprm1.obj nextprm2.obj \
+	nthelem0.obj nthelem1.obj nthelem2.obj \
+	ostmit.obj \
+	pair0.obj pair1.obj pair2.obj \
+	parsrt0.obj parsrt1.obj parsrt2.obj \
+	parsrtc0.obj parsrtc1.obj parsrtc2.obj \
+	partsrt0.obj \
+	partsum0.obj partsum1.obj partsum2.obj \
+	pheap1.obj pheap2.obj \
+	plus.obj \
+	pqueue1.obj \
+	prevprm0.obj prevprm1.obj prevprm2.obj \
+	ptition0.obj ptition1.obj \
+	ptrbinf1.obj ptrbinf2.obj \
+	ptrunf1.obj ptrunf2.obj \
+	queue1.obj \
+	rawiter.obj \
+	remcopy1.obj \
+	remcpif1.obj \
+	remif1.obj \
+	remove1.obj \
+	repcpif1.obj \
+	replace0.obj replace1.obj replcpy1.obj replif1.obj \
+	revbit1.obj revbit2.obj \
+	revcopy1.obj reverse1.obj reviter1.obj reviter2.obj \
+	rndshuf0.obj rndshuf1.obj rndshuf2.obj \
+	rotate0.obj rotate1.obj rotcopy0.obj rotcopy1.obj \
+	search0.obj search1.obj search2.obj \
+	set1.obj set2.obj \
+	setdiff0.obj setdiff1.obj setdiff2.obj \
+	setintr0.obj setintr1.obj setintr2.obj \
+	setsymd0.obj setsymd1.obj setsymd2.obj \
+	setunon0.obj setunon1.obj setunon2.obj \
+	sort1.obj sort2.obj \
+	stack1.obj stack2.obj \
+	stblptn0.obj stblptn1.obj \
+	stblsrt1.obj stblsrt2.obj \
+	swap1.obj \
+	swprnge1.obj \
+	times.obj \
+	trnsfrm1.obj trnsfrm2.obj \
+	ucompos1.obj ucompos2.obj \
+	unegate1.obj unegate2.obj \
+	uniqcpy1.obj uniqcpy2.obj \
+	unique1.obj unique2.obj \
+	uprbnd1.obj uprbnd2.obj \
+	vec1.obj vec2.obj vec3.obj vec4.obj vec5.obj vec6.obj vec7.obj vec8.obj \
+        hmap1.obj hmmap1.obj hset2.obj hmset1.obj slist1.obj string1.obj bitset1.obj
+
+CPP_PRJ_LINK = /link /incremental:no /LIBPATH:$(STL_PATH)\lib
+
+CPP_PRJ_CMN = /nologo /W3 /GR /GX /DWIN32 /D_WINDOWS /D_CONSOLE /I$(STL_PATH)\stlport /I.
+
+# #  CPP_PROJ=/nologo /W3 /MDd /GX /Zd /D "WIN32" /D "_CONSOLE" $(STL_INCL) /I$(VC_INCL) /I.
+
+#
+#LIBTYPE = STATIC
+LIBTYPE = DYNAMIC
+#
+#DEBUG = STL
+#DEBUG = ON
+DEBUG =
+# 
+IOS = SGI
+#IOS = NOSGI
+#IOS = NONE
+
+!IF "$(IOS)" == "NOSGI"
+CPP_PRJ_IOS = /D_STLP_NO_OWN_IOSTREAMS
+!ELSEIF "$(IOS)" == "NONE"
+CPP_PRJ_IOS = /D_STLP_NO_IOSTREAM
+!ELSE
+CPP_PRJ_IOS = 
+!ENDIF
+
+#MT/MD etc should be LAST in CPP_PRJ_LIBTYP string!!!
+#Library selection should be BEFORE debug processing!!!
+!IF "$(LIBTYPE)" == "STATIC"
+CPP_PRJ_LIBTYP = /D_STLP_USE_STATIC_LIB /MT
+!ELSE
+CPP_PRJ_LIBTYP = /D_STLP_USE_DYNAMIC_LIB /MD
+!ENDIF
+
+!IF "$(DEBUG)" == ""
+CPP_PRJ_DBG = /DNDEBUG /O2
+!ELSE
+CPP_PRJ_LIBTYP = $(CPP_PRJ_LIBTYP)d
+CPP_PRJ_DBG = /D_DEBUG /Od
+!IF "$(DEBUG)" == "STL"
+CPP_PRJ_DBG = $(CPP_PRJ_DBG) /D_STLP_DEBUG
+!ENDIF
+CPP_PRJ_CMN = $(CPP_PRJ_CMN) /Zi
+!ENDIF
+
+# # Use this flags to test non-SGI iostreams
+# CPP_PROJ=/nologo /W3 /MD /GX /Zd /Zi /D "WIN32" /D "_CONSOLE" $(STL_INCL) /I$(VC_INCL) /I. /D_STLP_NO_NEW_IOSTREAMS
+# CPP_PROJ=/nologo /W3 /MD /GX /Zd /Zi /D "WIN32" /D "_CONSOLE" $(STL_INCL) /I$(VC_INCL) /I.
+# # linker finds proper STLport lib automatically, only path to the
+# # library is needed
+# CPP_LIBS = /link /libpath:"..\..\lib"
+
+CPP_PROJ = $(CPP_PRJ_CMN) $(CPP_PRJ_IOS) $(CPP_PRJ_LIBTYP) $(CPP_PRJ_DBG)
+
+check: stl_test.out
+
+stl_test.out : $(Dep_stl)
+#	$(CPP) $(CPP_PROJ) $(Dep_stl) $(CPP_LIBS)
+#	stl_test < stdin
+	$(CPP) $(CPP_PROJ) $(Dep_stl) $(CPP_PRJ_LINK)
+	stl_test > stl_test.out < stdin
+	echo done
+
+clean :
+	-@erase "$(INTDIR)\*.obj"
+	-@erase "$(OUTDIR)\*.exe"
+	-@erase "$(OUTDIR)\*.obj"
+	-@erase "$(OUTDIR)\*.ilk"
+	-@erase "$(OUTDIR)\*.pdb"
+
+
+.exe.out:
+	$< > $@
+
+.cpp.exe:
+  $(CPP) $(CPP_PROJ) -DMAIN  $< $(CPP_PRJ_LINK)
+
+.c.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cpp.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.cxx.obj:
+   $(CPP) $(CPP_PROJ) /c $<
+
+.c.sbr:
+   $(CPP) $(CPP_PROJ) $<  
+
+.cpp.E:
+   $(CPP) $(CPP_PROJ) -E $< >$*.E  
+
+.cpp.sbr:
+   $(CPP) $(CPP_PROJ) $<  
diff --git a/main/source/stlport/test/regression/vec1.cpp b/main/source/stlport/test/regression/vec1.cpp
new file mode 100644
index 00000000..fc8021af
--- /dev/null
+++ b/main/source/stlport/test/regression/vec1.cpp
@@ -0,0 +1,29 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+#include <cstdlib>
+#include <iostream>
+#include <algorithm>
+#include <vector>
+
+#ifdef MAIN 
+#define vec1_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int vec1_test(int, char**)
+{
+  //   cout<<"Sizeof(vector) is "<<sizeof(vector<int>)<<endl;
+  //  cout<<"Sizeof(fw) is "<<sizeof(forward_iterator_tag)<<endl;
+  //  cout<<"Sizeof(ra) is "<<sizeof(random_access_iterator_tag)<<endl;
+  cout<<"Results of vec1_test:"<<endl;
+  vector<int> v1; // Empty vector of integers.
+  cout << "empty = " << v1.empty() << endl;
+  cout << "size = " << v1.size() << endl;
+  cout << "max_size = " << v1.max_size() << endl;
+  v1.push_back(42); // Add an integer to the vector.
+  cout << "size = " << v1.size() << endl;
+  cout << "v1[0] = " << v1[0] << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/vec2.cpp b/main/source/stlport/test/regression/vec2.cpp
new file mode 100644
index 00000000..2db52671
--- /dev/null
+++ b/main/source/stlport/test/regression/vec2.cpp
@@ -0,0 +1,45 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <vector>
+#include <algorithm>
+
+#ifdef MAIN 
+#define vec2_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+
+static void print(vector<double>& vector_)
+{
+  for(int i = 0; i < vector_.size(); i++)
+    cout << vector_[i] << " ";
+  cout << endl;
+}
+
+int vec2_test(int, char**)
+{
+  cout<<"Results of vec2_test:"<<endl;
+
+  vector<double> v1; // Empty vector of doubles.
+  v1.push_back(32.1);
+  v1.push_back(40.5);
+  vector<double> v2; // Another empty vector of doubles.
+  v2.push_back(3.56);
+  cout << "v1 = ";
+  print(v1);
+  cout << "v2 = ";
+  print(v2);
+  v1.swap(v2); // Swap the vector's contents.
+  cout << "v1 = ";
+  print(v1);
+  cout << "v2 = ";
+  print(v2);
+  v2 = v1; // Assign one vector to another.
+  cout << "v2 = ";
+  print(v2);
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/vec3.cpp b/main/source/stlport/test/regression/vec3.cpp
new file mode 100644
index 00000000..05a35bf0
--- /dev/null
+++ b/main/source/stlport/test/regression/vec3.cpp
@@ -0,0 +1,32 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <vector>
+#include <algorithm>
+#ifdef MAIN 
+#define vec3_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int vec3_test(int, char**)
+{
+  cout<<"Results of vec3_test:"<<endl;
+# ifdef __STLPORT_VERSION
+  typedef  __vector__<char, allocator<char> > vec_type;
+# else
+  typedef  vector<char> vec_type;
+# endif
+  vec_type v1; // Empty vector of characters.
+  v1.push_back('h');
+  v1.push_back('i');
+  cout << "v1 = " << v1[0] << v1[1] << endl;
+  vec_type v2(v1.begin(), v1.end());
+  v2[1] = 'o'; // Replace second character.
+  cout << "v2 = " << v2[0] << v2[1] << endl;
+  cout << "(v1 == v2) = " <<(v1 == v2) << endl;
+  cout << "(v1 < v2) = " <<(v1 < v2) << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/vec4.cpp b/main/source/stlport/test/regression/vec4.cpp
new file mode 100644
index 00000000..1edf75d2
--- /dev/null
+++ b/main/source/stlport/test/regression/vec4.cpp
@@ -0,0 +1,30 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <vector>
+#include <algorithm>
+
+#ifdef MAIN 
+#define vec4_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int vec4_test(int, char**)
+{
+  cout<<"Results of vec4_test:"<<endl;
+  vector<int> v(4);
+  v[0] = 1;
+  v[1] = 4;
+  v[2] = 9;
+  v[3] = 16;
+  cout << "front = " << v.front() << endl;
+  cout << "back = " << v.back() << ", size = " << v.size() << endl;
+  v.push_back(25);
+  cout << "back = " << v.back() << ", size = " << v.size() << endl;
+  v.pop_back();
+  cout << "back = " << v.back() << ", size = " << v.size() << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/vec5.cpp b/main/source/stlport/test/regression/vec5.cpp
new file mode 100644
index 00000000..e76ede95
--- /dev/null
+++ b/main/source/stlport/test/regression/vec5.cpp
@@ -0,0 +1,24 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <vector>
+#include <algorithm>
+
+#ifdef MAIN 
+#define vec5_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int vec5_test(int, char**)
+{
+  cout<<"Results of vec5_test:"<<endl;
+int array [] = { 1, 4, 9, 16 };
+
+  vector<int> v(array, array + 4);
+  for(int i = 0; i < v.size(); i++)
+    cout << "v[" << i << "] = " << v[i] << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/vec6.cpp b/main/source/stlport/test/regression/vec6.cpp
new file mode 100644
index 00000000..0c0441c3
--- /dev/null
+++ b/main/source/stlport/test/regression/vec6.cpp
@@ -0,0 +1,41 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <vector>
+#include <algorithm>
+
+#ifdef MAIN 
+#define vec6_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int vec6_test(int, char**)
+{
+  cout<<"Results of vec6_test:"<<endl;
+int array [] = { 1, 4, 9, 16, 25, 36 };
+
+  vector<int> v(array, array + 6);
+  int i;
+  for(i = 0; i < v.size(); i++)
+    cout << "v[" << i << "] = " << v[i] << endl;
+  cout << endl;
+  v.erase(v.begin()); // Erase first element.
+  for(i = 0; i < v.size(); i++)
+    cout << "v[" << i << "] = " << v[i] << endl;
+  cout << endl;
+  v.erase(v.end() - 1); // Erase last element.
+  for(i = 0; i < v.size(); i++)
+    cout << "v[" << i << "] = " << v[i] << endl;
+  cout << endl;
+  v.erase(v.begin() + 1, v.end() - 1); // Erase all but first and last.
+  for(i = 0; i < v.size(); i++)
+    cout << "v[" << i << "] = " << v[i] << endl;
+  cout << endl;
+  /*
+  v.erase(v.begin(), v.end()); // Erase all.
+  */
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/vec7.cpp b/main/source/stlport/test/regression/vec7.cpp
new file mode 100644
index 00000000..49f358a8
--- /dev/null
+++ b/main/source/stlport/test/regression/vec7.cpp
@@ -0,0 +1,34 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <vector>
+#include <algorithm>
+
+#ifdef MAIN 
+#define vec7_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int vec7_test(int, char**)
+{
+  cout<<"Results of vec7_test:"<<endl;
+int array1 [] = { 1, 4, 25 };
+int array2 [] = { 9, 16 };
+
+  vector<int> v(array1, array1 + 3);
+  v.insert(v.begin(), 0); // Insert before first element.
+  v.insert(v.end(), 36); // Insert after last element.
+  int i;
+  for(i = 0; i < v.size(); i++)
+    cout << "v[" << i << "] = " << v[i] << endl;
+  cout << endl;
+  // Insert contents of array2 before fourth element.
+  v.insert(v.begin() + 3, array2, array2 + 2);
+  for(i = 0; i < v.size(); i++)
+    cout << "v[" << i << "] = " << v[i] << endl;
+  cout << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/vec8.cpp b/main/source/stlport/test/regression/vec8.cpp
new file mode 100644
index 00000000..d9c094e0
--- /dev/null
+++ b/main/source/stlport/test/regression/vec8.cpp
@@ -0,0 +1,25 @@
+// STLport regression testsuite component.
+// To compile as a separate example, please #define MAIN.
+
+#include <iostream>
+#include <vector>
+#include <algorithm>
+
+#ifdef MAIN 
+#define vec8_test main
+#endif
+
+#if !defined (STLPORT) || defined(__STL_USE_NAMESPACES)
+using namespace std;
+#endif
+int vec8_test(int, char**)
+{
+  cout<<"Results of vec8_test:"<<endl;
+  vector<int> v;
+  cout << "capacity = " << v.capacity() << endl;
+  v.push_back(42);
+  cout << "capacity = " << v.capacity() << endl;
+  v.reserve(5000);
+  cout << "capacity = " << v.capacity() << endl;
+  return 0;
+}
diff --git a/main/source/stlport/test/regression/visualage.mak b/main/source/stlport/test/regression/visualage.mak
new file mode 100644
index 00000000..f1c3e011
--- /dev/null
+++ b/main/source/stlport/test/regression/visualage.mak
@@ -0,0 +1,181 @@
+# Makefile for IBM nmake, VisualAge C++ 3.6.5 for OS/2 and windows
+
+
+# point this to proper location
+STL_INCL=..\..\stlport
+
+OBJECTS  = stl_test.obj accum1.obj accum2.obj \
+	adjdiff0.obj adjdiff1.obj adjdiff2.obj \
+	adjfind0.obj adjfind1.obj adjfind2.obj \
+	advance.obj \
+	alg1.obj alg2.obj alg3.obj alg4.obj alg5.obj \
+	bcompos1.obj bcompos2.obj \
+	bind1st1.obj bind1st2.obj \
+	bind2nd1.obj bind2nd2.obj \
+	binsert1.obj binsert2.obj \
+	binsrch1.obj binsrch2.obj \
+	bnegate1.obj bnegate2.obj bvec1.obj \
+	copy1.obj copy2.obj copy3.obj copy4.obj \
+	copyb.obj copyb0.obj \
+	count0.obj count1.obj \
+	countif1.obj \
+	deque1.obj \
+	divides.obj \
+	eqlrnge0.obj eqlrnge1.obj eqlrnge2.obj \
+	equal0.obj equal1.obj equal2.obj \
+	equalto.obj \
+	fill1.obj filln1.obj \
+	find0.obj find1.obj \
+	findif0.obj findif1.obj \
+	finsert1.obj finsert2.obj \
+	foreach0.obj foreach1.obj \
+	func1.obj func2.obj func3.obj \
+	gener1.obj gener2.obj \
+	genern1.obj genern2.obj \
+	greateq.obj greater.obj \
+	incl0.obj incl1.obj incl2.obj \
+	inplmrg1.obj inplmrg2.obj \
+	inrprod0.obj inrprod1.obj inrprod2.obj \
+	insert1.obj insert2.obj \
+	iota1.obj \
+	istmit1.obj \
+	iter1.obj iter2.obj iter3.obj iter4.obj \
+	iterswp0.obj iterswp1.obj \
+	less.obj \
+	lesseq.obj \
+	lexcmp1.obj lexcmp2.obj \
+	list1.obj list2.obj list3.obj list4.obj \
+	logicand.obj logicnot.obj \
+	logicor.obj \
+	lwrbnd1.obj lwrbnd2.obj \
+	map1.obj \
+	max1.obj max2.obj \
+	maxelem1.obj maxelem2.obj \
+	memfunptr.obj \
+	merge0.obj merge1.obj merge2.obj \
+	min1.obj min2.obj \
+	minelem1.obj minelem2.obj \
+	minus.obj \
+	mismtch0.obj mismtch1.obj mismtch2.obj \
+	mkheap0.obj mkheap1.obj \
+	mmap1.obj mmap2.obj \
+	modulus.obj \
+	mset1.obj mset3.obj mset4.obj mset5.obj \
+	negate.obj nequal.obj \
+	nextprm0.obj nextprm1.obj nextprm2.obj \
+	nthelem0.obj nthelem1.obj nthelem2.obj \
+	ostmit.obj \
+	pair0.obj pair1.obj pair2.obj \
+	parsrt0.obj parsrt1.obj parsrt2.obj \
+	parsrtc0.obj parsrtc1.obj parsrtc2.obj \
+	partsrt0.obj \
+	partsum0.obj partsum1.obj partsum2.obj \
+	pheap1.obj pheap2.obj \
+	plus.obj \
+	pqueue1.obj \
+	prevprm0.obj prevprm1.obj prevprm2.obj \
+	ptition0.obj ptition1.obj \
+	ptrbinf1.obj ptrbinf2.obj \
+	ptrunf1.obj ptrunf2.obj \
+	queue1.obj \
+	rawiter.obj \
+	remcopy1.obj \
+	remcpif1.obj \
+	remif1.obj \
+	remove1.obj \
+	repcpif1.obj \
+	replace0.obj replace1.obj replcpy1.obj replif1.obj \
+	revbit1.obj revbit2.obj \
+	revcopy1.obj reverse1.obj reviter1.obj reviter2.obj \
+	rndshuf0.obj rndshuf1.obj rndshuf2.obj \
+	rotate0.obj rotate1.obj rotcopy0.obj rotcopy1.obj \
+	search0.obj search1.obj search2.obj \
+	set1.obj set2.obj \
+	setdiff0.obj setdiff1.obj setdiff2.obj \
+	setintr0.obj setintr1.obj setintr2.obj \
+	setsymd0.obj setsymd1.obj setsymd2.obj \
+	setunon0.obj setunon1.obj setunon2.obj \
+	sort1.obj sort2.obj \
+	stack1.obj stack2.obj \
+	stblptn0.obj stblptn1.obj \
+	stblsrt1.obj stblsrt2.obj \
+	swap1.obj \
+	swprnge1.obj \
+	times.obj \
+	trnsfrm1.obj trnsfrm2.obj \
+	ucompos1.obj ucompos2.obj \
+	unegate1.obj unegate2.obj \
+	uniqcpy1.obj uniqcpy2.obj \
+	unique1.obj unique2.obj \
+	uprbnd1.obj uprbnd2.obj \
+	vec1.obj vec2.obj vec3.obj vec4.obj vec5.obj vec6.obj vec7.obj vec8.obj \
+  hmap1.obj hmmap1.obj hset2.obj hmset1.obj slist1.obj string1.obj bitset1.obj
+
+#STAT_MODULE=stat.o
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CC = icc.exe
+CXX = $(CC) -D_STLP_NO_OWN_IOSTREAMS
+DEBUG_FLAGS=
+# Use this for a Debug version
+#DEBUG_FLAGS=-O- -Ti+
+
+CXXFLAGS = -Q -I$(STL_INCL) $(DEBUG_FLAGS) -I. -Tdp
+
+# Use this for no link time instantiation of templates
+#CXXFLAGS = -Q -I$(STL_INCL) $(DEBUG_FLAGS) -I. -Tdp -Ft-
+
+LIBS = 
+
+check: stl_test.out
+
+$(TEST) : $(TEST_EXE)
+	echo a string| $(TEST_EXE) > $@
+
+$(TEST_EXE) : $(OBJECTS)
+  $(CXX) $(CXXFLAGS) @<<
+$(OBJECTS)
+$(LIBS)
+-Fe$@
+<<
+  
+.SUFFIXES: .cpp .obj .i .exe .out
+
+.cpp.i:
+  $(CXX) $(CXXFLAGS) -P $<
+
+.cpp.obj:
+	$(CXX) $(CXXFLAGS) -c $<
+
+.cpp.out: 
+	$(CXX) $(CXXFLAGS) -c -USINGLE -DMAIN $< 
+	$(CXX) $(CXXFLAGS) $*.obj $(LIBS) -Fe$*.exe
+	./$*.exe > $@
+	del $*.exe
+  
+.cpp.exe:
+	$(CXX) $(CXXFLAGS) -c -USINGLE -DMAIN $< 
+	$(CXX) $(CXXFLAGS) $*.obj $(LIBS) -Fe$*.exe
+
+#istmit1.out: istmit1.cpp
+#	$(CXX) $(CXXFLAGS) $< $(STAT_MODULE) $(LIBSTDCXX) -lstdc++ $(LIBS) -o 
+#istmit1 echo 'a string' | ./istmit1 > istmit1.out
+#	-rm -f ./istmit1
+#
+#$(STAT_MODULE): stat.cpp
+#	$(CXX) $(CXXFLAGS) -c $< -o $@
+#
+#%.s: %.cpp
+#	$(CXX) $(CXXFLAGS) -O5 -D_STLP_USE_MALLOC -S -pto $<  -o $@
+
+#	$(CXX) $(CXXFLAGS) -O5 -D_STLP_USE_MALLOC -noex -D_STLP_NO_EXCEPTIONS -S -pto $<  -o $@
+
+#	$(CXX) $(CXXFLAGS) -O4 -noex -D_STLP_NO_EXCEPTIONS -D_STLP_NO_EXCEPTIONS -S -pta $<  -o $@
+
+clean:
+  del *.exe
+  del *.obj
+  del *.out
+  del tempinc
+	
diff --git a/main/source/stlport/test/regression/watcom-qnx.mak b/main/source/stlport/test/regression/watcom-qnx.mak
new file mode 100644
index 00000000..db72a5cb
--- /dev/null
+++ b/main/source/stlport/test/regression/watcom-qnx.mak
@@ -0,0 +1,172 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+.SUFFIXES:	.cc .cpp .o .exe .out
+
+srcdir = .
+VPATH = .
+
+STL_INCL=-I../../stlport
+
+LIST  = stl_test.cpp accum1.cpp accum2.cpp \
+	adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp \
+	advance.cpp \
+	alg1.cpp alg2.cpp alg3.cpp alg4.cpp alg5.cpp \
+	bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp \
+	bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp \
+	binsrch1.cpp binsrch2.cpp \
+	bnegate1.cpp bnegate2.cpp bvec1.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp \
+	copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp \
+	countif1.cpp \
+	deque1.cpp \
+	divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp \
+	equal0.cpp equal1.cpp equal2.cpp \
+	equalto.cpp \
+	fill1.cpp filln1.cpp \
+	find0.cpp find1.cpp \
+	findif0.cpp findif1.cpp \
+	finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp \
+	func1.cpp func2.cpp func3.cpp \
+	gener1.cpp gener2.cpp \
+	genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp \
+	incl0.cpp incl1.cpp incl2.cpp \
+	inplmrg1.cpp inplmrg2.cpp \
+	inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp \
+	iota1.cpp \
+	istmit1.cpp \
+	iter1.cpp iter2.cpp iter3.cpp iter4.cpp \
+	iterswp0.cpp iterswp1.cpp \
+	less.cpp \
+	lesseq.cpp \
+	lexcmp1.cpp lexcmp2.cpp \
+	list1.cpp list2.cpp list3.cpp list4.cpp \
+	logicand.cpp logicnot.cpp \
+	logicor.cpp \
+	lwrbnd1.cpp lwrbnd2.cpp \
+	map1.cpp \
+	max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp \
+	memfunptr.cpp \
+	merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp \
+	minelem1.cpp minelem2.cpp \
+	minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp \
+	mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp \
+	modulus.cpp \
+	mset1.cpp mset3.cpp mset4.cpp mset5.cpp \
+	negate.cpp nequal.cpp \
+	nextprm0.cpp nextprm1.cpp nextprm2.cpp \
+	nthelem0.cpp nthelem1.cpp nthelem2.cpp \
+	ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp \
+	parsrt0.cpp parsrt1.cpp parsrt2.cpp \
+	parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp \
+	partsum0.cpp partsum1.cpp partsum2.cpp \
+	pheap1.cpp pheap2.cpp \
+	plus.cpp \
+	pqueue1.cpp \
+	prevprm0.cpp prevprm1.cpp prevprm2.cpp \
+	ptition0.cpp ptition1.cpp \
+	ptrbinf1.cpp ptrbinf2.cpp \
+	ptrunf1.cpp ptrunf2.cpp \
+	queue1.cpp \
+	rawiter.cpp \
+	remcopy1.cpp \
+	remcpif1.cpp \
+	remif1.cpp \
+	remove1.cpp \
+	repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp \
+	revbit1.cpp revbit2.cpp \
+	revcopy1.cpp reverse1.cpp reviter1.cpp reviter2.cpp \
+	rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp \
+	search0.cpp search1.cpp search2.cpp \
+	set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp \
+	setintr0.cpp setintr1.cpp setintr2.cpp \
+	setsymd0.cpp setsymd1.cpp setsymd2.cpp \
+	setunon0.cpp setunon1.cpp setunon2.cpp \
+	sort1.cpp sort2.cpp \
+	stack1.cpp stack2.cpp \
+	stblptn0.cpp stblptn1.cpp \
+	stblsrt1.cpp stblsrt2.cpp \
+	swap1.cpp \
+	swprnge1.cpp \
+	times.cpp \
+	trnsfrm1.cpp trnsfrm2.cpp \
+	ucompos1.cpp ucompos2.cpp \
+	unegate1.cpp unegate2.cpp \
+	uniqcpy1.cpp uniqcpy2.cpp \
+	unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp \
+	vec1.cpp vec2.cpp vec3.cpp vec4.cpp vec5.cpp vec6.cpp vec7.cpp vec8.cpp \
+        hmmap1.cpp hset2.cpp hmset1.cpp slist1.cpp hmap1.cpp string1.cpp bitset1.cpp
+
+
+# STAT_MODULE=stat.o
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%.exe)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CC = cc
+CXX = $(CC)
+
+# DEBUG_FLAGS= -D_STLP_DEBUG -g
+
+CXXFLAGS = -D_STLP_NO_OWN_IOSTREAMS ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} ${STL_VERSION_FLAGS}
+
+LIBS = -lm 
+LIBSTDCXX = 
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) ${REPO_FLAGS} $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	echo 'a string' | $(TEST_EXE) > $(TEST)
+
+
+.cc.o .cxx.o .C.o .cpp.o:
+	${CXX} ${CXXFLAGS} ${DEBUG_FLAGS} ${REPO_FLAGS} -c -o $*.o $<
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} -USINGLE -DMAIN=1 $< -c -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(STAT_MODULE) $(LIBS) -o $*.exe
+	./$*.exe > $@
+	-rm -f $*.exe
+
+istmit1.out: istmit1.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} $< $(STAT_MODULE) $(LIBSTDCXX) -lstdc++ $(LIBS) -o istmit1
+	echo 'a string' | ./istmit1 > istmit1.out
+	-rm -f ./istmit1
+
+$(STAT_MODULE): stat.cpp
+	$(CXX) $(CXXFLAGS) ${DEBUG_FLAGS} ${REPO_FLAGS} -c $< -o $@
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O3 -fno-exceptions -D_STLP_NO_EXCEPTIONS -S $<  -o $*.s
+
+%.i: %.cpp
+	$(CXX) $(CXXFLAGS) -E $<  > $@
+
+clean:
+	-rm -rf *.exe *.out *.o *.rpo core *.out Templates.DB
+
+
+
+
+
diff --git a/main/source/stlport/test/regression/xlC.mak b/main/source/stlport/test/regression/xlC.mak
new file mode 100644
index 00000000..c06420be
--- /dev/null
+++ b/main/source/stlport/test/regression/xlC.mak
@@ -0,0 +1,172 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+# Modified version of sunpro.mak
+
+srcdir = .
+VPATH = .
+
+# point this to proper location
+
+STL_INCL=-I../../stlport/old_hp
+
+LIST  = stl_test.cpp accum1.cpp accum2.cpp \
+	adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp \
+	advance.cpp \
+	alg1.cpp alg2.cpp alg3.cpp alg4.cpp alg5.cpp \
+	bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp \
+	bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp \
+	binsrch1.cpp binsrch2.cpp \
+	bnegate1.cpp bnegate2.cpp bvec1.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp \
+	copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp \
+	countif1.cpp \
+	deque1.cpp \
+	divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp \
+	equal0.cpp equal1.cpp equal2.cpp \
+	equalto.cpp \
+	fill1.cpp filln1.cpp \
+	find0.cpp find1.cpp \
+	findif0.cpp findif1.cpp \
+	finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp \
+	func1.cpp func2.cpp func3.cpp \
+	gener1.cpp gener2.cpp \
+	genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp \
+	incl0.cpp incl1.cpp incl2.cpp \
+	inplmrg1.cpp inplmrg2.cpp \
+	inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp \
+	iota1.cpp \
+	istmit1.cpp \
+	iter1.cpp iter2.cpp iter3.cpp iter4.cpp \
+	iterswp0.cpp iterswp1.cpp \
+	less.cpp \
+	lesseq.cpp \
+	lexcmp1.cpp lexcmp2.cpp \
+	list1.cpp list2.cpp list3.cpp list4.cpp \
+	logicand.cpp logicnot.cpp \
+	logicor.cpp \
+	lwrbnd1.cpp lwrbnd2.cpp \
+	map1.cpp \
+	max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp \
+	memfunptr.cpp \
+	merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp \
+	minelem1.cpp minelem2.cpp \
+	minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp \
+	mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp \
+	modulus.cpp \
+	mset1.cpp mset3.cpp mset4.cpp mset5.cpp \
+	negate.cpp nequal.cpp \
+	nextprm0.cpp nextprm1.cpp nextprm2.cpp \
+	nthelem0.cpp nthelem1.cpp nthelem2.cpp \
+	ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp \
+	parsrt0.cpp parsrt1.cpp parsrt2.cpp \
+	parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp \
+	partsum0.cpp partsum1.cpp partsum2.cpp \
+	pheap1.cpp pheap2.cpp \
+	plus.cpp \
+	pqueue1.cpp \
+	prevprm0.cpp prevprm1.cpp prevprm2.cpp \
+	ptition0.cpp ptition1.cpp \
+	ptrbinf1.cpp ptrbinf2.cpp \
+	ptrunf1.cpp ptrunf2.cpp \
+	queue1.cpp \
+	rawiter.cpp \
+	remcopy1.cpp \
+	remcpif1.cpp \
+	remif1.cpp \
+	remove1.cpp \
+	repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp \
+	revbit1.cpp revbit2.cpp \
+	revcopy1.cpp reverse1.cpp reviter1.cpp reviter2.cpp \
+	rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp \
+	search0.cpp search1.cpp search2.cpp \
+	set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp \
+	setintr0.cpp setintr1.cpp setintr2.cpp \
+	setsymd0.cpp setsymd1.cpp setsymd2.cpp \
+	setunon0.cpp setunon1.cpp setunon2.cpp \
+	sort1.cpp sort2.cpp \
+	stack1.cpp stack2.cpp \
+	stblptn0.cpp stblptn1.cpp \
+	stblsrt1.cpp stblsrt2.cpp \
+	swap1.cpp \
+	swprnge1.cpp \
+	times.cpp \
+	trnsfrm1.cpp trnsfrm2.cpp \
+	ucompos1.cpp ucompos2.cpp \
+	unegate1.cpp unegate2.cpp \
+	uniqcpy1.cpp uniqcpy2.cpp \
+	unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp \
+	vec1.cpp vec2.cpp vec3.cpp vec4.cpp vec5.cpp vec6.cpp vec7.cpp vec8.cpp \
+        hmap1.cpp hmmap1.cpp hset2.cpp hmset1.cpp slist1.cpp string1.cpp bitset1.cpp
+
+# STAT_MODULE=stat.o
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%.exe)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CC = xlC
+CXX = $(CC)
+DEBUG_FLAGS=
+# DEBUG_FLAGS=-O
+# DEBUG_FLAGS=-O4
+
+CXXFLAGS = -D_STLP_NO_OWN_IOSTREAMS ${STL_INCL} ${DEBUG_FLAGS} -I.
+
+LIBS = -lm 
+LIBSTDCXX = 
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	echo 'a string' | $(TEST_EXE) > $(TEST)
+
+SUFFIXES: .cpp.o.exe.out.res
+
+%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS)-g $< -c -USINGLE -DMAIN -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) -o $*.exe
+	./$*.exe > $@
+	-rm -f $*.exe
+
+istmit1.out: istmit1.cpp
+	$(CXX) $(CXXFLAGS) $< $(STAT_MODULE) $(LIBSTDCXX) -lstdc++ $(LIBS) -o istmit1
+	echo 'a string' | ./istmit1 > istmit1.out
+	-rm -f ./istmit1
+
+$(STAT_MODULE): stat.cpp
+	$(CXX) $(CXXFLAGS) -c $< -o $@
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O5 -D_STLP_USE_MALLOC -S -pto $<  -o $@
+
+#	$(CXX) $(CXXFLAGS) -O5 -D_STLP_USE_MALLOC -noex -D_STLP_NO_EXCEPTIONS -S -pto $<  -o $@
+
+#	$(CXX) $(CXXFLAGS) -O4 -noex -D_STLP_NO_EXCEPTIONS -D_STLP_NO_EXCEPTIONS -S -pta $<  -o $@
+
+clean:
+	-rm -fr *.exe *.o *.rpo *.obj *.out tempinc
diff --git a/main/source/stlport/test/regression/xlC50.mak b/main/source/stlport/test/regression/xlC50.mak
new file mode 100644
index 00000000..1e53fa63
--- /dev/null
+++ b/main/source/stlport/test/regression/xlC50.mak
@@ -0,0 +1,175 @@
+# ;;; -*- Mode:makefile;-*- 
+# Generated automatically from Makefile.in by configure.
+# This requires GNU make.
+
+# Modified version of sunpro.mak
+
+srcdir = .
+VPATH = .
+
+# point this to proper location
+
+STL_INCL=-I../../stlport
+
+LIST  = stl_test.cpp accum1.cpp accum2.cpp \
+	adjdiff0.cpp adjdiff1.cpp adjdiff2.cpp \
+	adjfind0.cpp adjfind1.cpp adjfind2.cpp \
+	advance.cpp \
+	alg1.cpp alg2.cpp alg3.cpp alg4.cpp alg5.cpp \
+	bcompos1.cpp bcompos2.cpp \
+	bind1st1.cpp bind1st2.cpp \
+	bind2nd1.cpp bind2nd2.cpp \
+	binsert1.cpp binsert2.cpp \
+	binsrch1.cpp binsrch2.cpp \
+	bnegate1.cpp bnegate2.cpp bvec1.cpp \
+	copy1.cpp copy2.cpp copy3.cpp copy4.cpp \
+	copyb.cpp copyb0.cpp \
+	count0.cpp count1.cpp \
+	countif1.cpp \
+	deque1.cpp \
+	divides.cpp \
+	eqlrnge0.cpp eqlrnge1.cpp eqlrnge2.cpp \
+	equal0.cpp equal1.cpp equal2.cpp \
+	equalto.cpp \
+	fill1.cpp filln1.cpp \
+	find0.cpp find1.cpp \
+	findif0.cpp findif1.cpp \
+	finsert1.cpp finsert2.cpp \
+	foreach0.cpp foreach1.cpp \
+	func1.cpp func2.cpp func3.cpp \
+	gener1.cpp gener2.cpp \
+	genern1.cpp genern2.cpp \
+	greateq.cpp greater.cpp \
+	incl0.cpp incl1.cpp incl2.cpp \
+	inplmrg1.cpp inplmrg2.cpp \
+	inrprod0.cpp inrprod1.cpp inrprod2.cpp \
+	insert1.cpp insert2.cpp \
+	iota1.cpp \
+	istmit1.cpp \
+	iter1.cpp iter2.cpp iter3.cpp iter4.cpp \
+	iterswp0.cpp iterswp1.cpp \
+	less.cpp \
+	lesseq.cpp \
+	lexcmp1.cpp lexcmp2.cpp \
+	list1.cpp list2.cpp list3.cpp list4.cpp \
+	logicand.cpp logicnot.cpp \
+	logicor.cpp \
+	lwrbnd1.cpp lwrbnd2.cpp \
+	map1.cpp \
+	max1.cpp max2.cpp \
+	maxelem1.cpp maxelem2.cpp \
+	memfunptr.cpp \
+	merge0.cpp merge1.cpp merge2.cpp \
+	min1.cpp min2.cpp \
+	minelem1.cpp minelem2.cpp \
+	minus.cpp \
+	mismtch0.cpp mismtch1.cpp mismtch2.cpp \
+	mkheap0.cpp mkheap1.cpp \
+	mmap1.cpp mmap2.cpp \
+	modulus.cpp \
+	mset1.cpp mset3.cpp mset4.cpp mset5.cpp \
+	negate.cpp nequal.cpp \
+	nextprm0.cpp nextprm1.cpp nextprm2.cpp \
+	nthelem0.cpp nthelem1.cpp nthelem2.cpp \
+	ostmit.cpp \
+	pair0.cpp pair1.cpp pair2.cpp \
+	parsrt0.cpp parsrt1.cpp parsrt2.cpp \
+	parsrtc0.cpp parsrtc1.cpp parsrtc2.cpp \
+	partsrt0.cpp \
+	partsum0.cpp partsum1.cpp partsum2.cpp \
+	pheap1.cpp pheap2.cpp \
+	plus.cpp \
+	pqueue1.cpp \
+	prevprm0.cpp prevprm1.cpp prevprm2.cpp \
+	ptition0.cpp ptition1.cpp \
+	ptrbinf1.cpp ptrbinf2.cpp \
+	ptrunf1.cpp ptrunf2.cpp \
+	queue1.cpp \
+	rawiter.cpp \
+	remcopy1.cpp \
+	remcpif1.cpp \
+	remif1.cpp \
+	remove1.cpp \
+	repcpif1.cpp \
+	replace0.cpp replace1.cpp replcpy1.cpp replif1.cpp \
+	revbit1.cpp revbit2.cpp \
+	revcopy1.cpp reverse1.cpp reviter1.cpp reviter2.cpp \
+	rndshuf0.cpp rndshuf1.cpp rndshuf2.cpp \
+	rotate0.cpp rotate1.cpp rotcopy0.cpp rotcopy1.cpp \
+	search0.cpp search1.cpp search2.cpp \
+	set1.cpp set2.cpp \
+	setdiff0.cpp setdiff1.cpp setdiff2.cpp \
+	setintr0.cpp setintr1.cpp setintr2.cpp \
+	setsymd0.cpp setsymd1.cpp setsymd2.cpp \
+	setunon0.cpp setunon1.cpp setunon2.cpp \
+	sort1.cpp sort2.cpp \
+	stack1.cpp stack2.cpp \
+	stblptn0.cpp stblptn1.cpp \
+	stblsrt1.cpp stblsrt2.cpp \
+	swap1.cpp \
+	swprnge1.cpp \
+	times.cpp \
+	trnsfrm1.cpp trnsfrm2.cpp \
+	ucompos1.cpp ucompos2.cpp \
+	unegate1.cpp unegate2.cpp \
+	uniqcpy1.cpp uniqcpy2.cpp \
+	unique1.cpp unique2.cpp \
+	uprbnd1.cpp uprbnd2.cpp \
+	vec1.cpp vec2.cpp vec3.cpp vec4.cpp vec5.cpp vec6.cpp vec7.cpp vec8.cpp \
+        hmap1.cpp hmmap1.cpp hset2.cpp hmset1.cpp slist1.cpp string1.cpp bitset1.cpp
+
+# STAT_MODULE=stat.o
+OBJECTS = $(LIST:%.cpp=%.o) $(STAT_MODULE)
+EXECS = $(LIST:%.cpp=%.exe)
+TESTS = $(LIST:%.cpp=%.out)
+TEST_EXE  = stl_test.exe
+TEST  = stl_test.out
+
+CC = xlC
+CXX = $(CC)
+DEBUG_FLAGS=
+# DEBUG_FLAGS = -g
+DEBUG_FLAGS= -O3
+
+# CXXFLAGS = -D_STLP_NO_OWN_IOSTREAMS ${STL_INCL} ${DEBUG_FLAGS} -I.
+# CXXFLAGS = -qnotempinc ${STL_INCL} ${DEBUG_FLAGS} -I.
+CXXFLAGS = ${STL_INCL} ${DEBUG_FLAGS} -I.
+
+LIBS = -L../../lib -lstlport_xlC50  -lm 
+LIBSTDCXX = 
+
+check: $(TEST)
+
+$(TEST) : $(OBJECTS)
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBS) -o $(TEST_EXE)
+	echo 'a string' | $(TEST_EXE) > $(TEST)
+
+SUFFIXES: .cpp.o.exe.out.res
+
+%.o : %.cpp
+	$(CXX) $(CXXFLAGS) $< -c -o $@
+
+%.out: %.cpp
+	$(CXX) $(CXXFLAGS)-g $< -c -USINGLE -DMAIN -o $*.o
+	$(CXX) $(CXXFLAGS) $*.o $(LIBS) -o $*.exe
+	./$*.exe > $@
+	-rm -f $*.exe
+
+istmit1.out: istmit1.cpp
+	$(CXX) $(CXXFLAGS) $< $(STAT_MODULE) $(LIBSTDCXX) -lstdc++ $(LIBS) -o istmit1
+	echo 'a string' | ./istmit1 > istmit1.out
+	-rm -f ./istmit1
+
+$(STAT_MODULE): stat.cpp
+	$(CXX) $(CXXFLAGS) -c $< -o $@
+
+%.s: %.cpp
+	$(CXX) $(CXXFLAGS) -O5 -D_STLP_USE_MALLOC -S -pto $<  -o $@
+
+#	$(CXX) $(CXXFLAGS) -O5 -D_STLP_USE_MALLOC -noex -D_STLP_NO_EXCEPTIONS -S -pto $<  -o $@
+
+#	$(CXX) $(CXXFLAGS) -O4 -noex -D_STLP_NO_EXCEPTIONS -D_STLP_NO_EXCEPTIONS -S -pta $<  -o $@
+
+clean:
+	-rm -fr *.exe *.o *.rpo *.obj *.out tempinc
+
diff --git a/main/source/temp/HPB_bot/Release/BuildLog.htm b/main/source/temp/HPB_bot/Release/BuildLog.htm
new file mode 100644
index 00000000..7fdf6c9d
--- /dev/null
+++ b/main/source/temp/HPB_bot/Release/BuildLog.htm
@@ -0,0 +1,40 @@
+<html>
+<head>
+<META HTTP-EQUIV="Content-Type" content="text/html; charset=Windows-1252">
+</head>
+<body>
+<pre>
+<table width=100% bgcolor=#CFCFE5><tr> <td> <font face=arial size=+3>
+Build Log
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5>&nbsp;</td><td width=0 bgcolor=#FFFFFF>&nbsp;</td><td width=*><pre>
+<h3>------- Build started: Project: HPB_bot, Configuration: Release|Win32 -------
+</h3>
+</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
+Command Lines
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5>&nbsp;</td><td width=0 bgcolor=#FFFFFF>&nbsp;</td><td width=*><pre>Creating temporary file "C:\DOCUME~1\hjw\LOCALS~1\Temp\RSP000004.rsp" with contents
+[
+/OUT:"D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\\..\dlls\HPB_bot.dll" /INCREMENTAL:NO /NOLOGO /LIBPATH:"D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\\lib\Release" /DLL /DEF:".\HPB_bot.def" /SUBSYSTEM:WINDOWS /IMPLIB:"D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\\temp\HPB_bot\Release/HPB_bot.lib" /MACHINE:X86 winmm.lib ws2_32.lib util.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\lib\release\util.lib"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\HPB_bot\Release\bot.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\HPB_bot\Release\bot_client.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\HPB_bot\Release\bot_combat.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\HPB_bot\Release\bot_navigate.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\HPB_bot\Release\bot_start.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\HPB_bot\Release\dll.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\HPB_bot\Release\engine.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\HPB_bot\Release\h_export.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\HPB_bot\Release\linkfunc.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\HPB_bot\Release\util.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\HPB_bot\Release\waypoint.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\HPB_bot\Release\AvHConstants.obj"
+]
+Creating command line "link.exe @C:\DOCUME~1\hjw\LOCALS~1\Temp\RSP000004.rsp"
+</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
+Output Window
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5>&nbsp;</td><td width=0 bgcolor=#FFFFFF>&nbsp;</td><td width=*><pre>Linking...
+   Creating library D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\\temp\HPB_bot\Release/HPB_bot.lib and object D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\\temp\HPB_bot\Release/HPB_bot.exp
+</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
+Results
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5>&nbsp;</td><td width=0 bgcolor=#FFFFFF>&nbsp;</td><td width=*><pre>
+Build log was saved at "file://D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\HPB_bot\Release\\BuildLog.htm"
+HPB_bot - 0 error(s), 0 warning(s)</pre></table><table   width=100% height=20 bgcolor=#CFCFE5><tr><td><font face=arial size=+2>
+</font></table></body></html>
\ No newline at end of file
diff --git a/main/source/temp/Textrep/Release/BuildLog.htm b/main/source/temp/Textrep/Release/BuildLog.htm
new file mode 100644
index 00000000..f03e8002
--- /dev/null
+++ b/main/source/temp/Textrep/Release/BuildLog.htm
@@ -0,0 +1,15 @@
+<html>
+<head>
+<META HTTP-EQUIV="Content-Type" content="text/html; charset=Windows-1252">
+</head>
+<body>
+<pre>
+<table width=100% bgcolor=#CFCFE5><tr> <td> <font face=arial size=+3>
+Build Log
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5>&nbsp;</td><td width=0 bgcolor=#FFFFFF>&nbsp;</td><td width=*><pre>
+<h3>------- Build started: Project: Textrep, Configuration: Release|Win32 -------
+</h3>
+</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
+Command Lines
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5>&nbsp;</td><td width=0 bgcolor=#FFFFFF>&nbsp;</td><td width=*><pre>Textrep - up-to-date.</pre></table><table   width=100% height=20 bgcolor=#CFCFE5><tr><td><font face=arial size=+2>
+</font></table></body></html>
\ No newline at end of file
diff --git a/main/source/temp/Util/Release/BuildLog.htm b/main/source/temp/Util/Release/BuildLog.htm
new file mode 100644
index 00000000..67b2c1df
--- /dev/null
+++ b/main/source/temp/Util/Release/BuildLog.htm
@@ -0,0 +1,15 @@
+<html>
+<head>
+<META HTTP-EQUIV="Content-Type" content="text/html; charset=Windows-1252">
+</head>
+<body>
+<pre>
+<table width=100% bgcolor=#CFCFE5><tr> <td> <font face=arial size=+3>
+Build Log
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5>&nbsp;</td><td width=0 bgcolor=#FFFFFF>&nbsp;</td><td width=*><pre>
+<h3>------- Build started: Project: Util, Configuration: Release|Win32 -------
+</h3>
+</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
+Command Lines
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5>&nbsp;</td><td width=0 bgcolor=#FFFFFF>&nbsp;</td><td width=*><pre>Util - up-to-date.</pre></table><table   width=100% height=20 bgcolor=#CFCFE5><tr><td><font face=arial size=+2>
+</font></table></body></html>
\ No newline at end of file
diff --git a/main/source/temp/cl_dll/Release/BuildLog.htm b/main/source/temp/cl_dll/Release/BuildLog.htm
new file mode 100644
index 00000000..b7f4c0c6
--- /dev/null
+++ b/main/source/temp/cl_dll/Release/BuildLog.htm
@@ -0,0 +1,196 @@
+<html>
+<head>
+<META HTTP-EQUIV="Content-Type" content="text/html; charset=Windows-1252">
+</head>
+<body>
+<pre>
+<table width=100% bgcolor=#CFCFE5><tr> <td> <font face=arial size=+3>
+Build Log
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5>&nbsp;</td><td width=0 bgcolor=#FFFFFF>&nbsp;</td><td width=*><pre>
+<h3>------- Build started: Project: cl_dll, Configuration: Release|Win32 -------
+</h3>
+</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
+Command Lines
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5>&nbsp;</td><td width=0 bgcolor=#FFFFFF>&nbsp;</td><td width=*><pre>Creating temporary file "C:\DOCUME~1\hjw\LOCALS~1\Temp\RSP000001.rsp" with contents
+[
+/OUT:"D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\..\cl_dlls\client.dll" /INCREMENTAL:NO /NOLOGO /LIBPATH:"D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\lib\Release" /DLL /SUBSYSTEM:WINDOWS /IMPLIB:"D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\\temp\cl_dll\Release/cl_dll.lib" /MACHINE:X86 winmm.lib ws2_32.lib particles.lib textrep.lib util.lib D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\\utils\vgui\lib\win32_vc6\vgui.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\lib\release\util.lib" "\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\lib\release\lua.lib" "\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\lib\release\particles.lib" "\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\lib\release\textrep.lib" "\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\lib\release\curl.lib" "\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\utils\vgui\lib\win32_vc6\vgui.lib"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\ammo.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\ammo_secondary.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\ammohistory.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\battery.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\cdll_int.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\com_weapons.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\death.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\demo.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\entity.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\ev_common.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\events.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\flashlight.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\GameStudioModelRenderer.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\geiger.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\health.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\hud.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\hud_msg.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\hud_redraw.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\hud_servers.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\hud_spectator.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\hud_update.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\in_camera.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\input.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\inputw32.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\interface.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\menu.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\message.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\parsemsg.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\pm_debug.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\pm_math.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\pm_shared.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\saytext.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\status_icons.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\statusbar.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\studio_util.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\StudioModelRenderer.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\text_message.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\train.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\tri.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\util.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\vgui_checkbutton2.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\vgui_ClassMenu.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\vgui_ConsolePanel.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\vgui_ControlConfigPanel.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\vgui_CustomObjects.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\vgui_grid.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\vgui_helpers.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\vgui_int.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\vgui_listbox.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\vgui_loadtga.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\vgui_MOTDWindow.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\vgui_SchemeManager.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\vgui_ScorePanel.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\vgui_scrollbar2.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\vgui_ServerBrowser.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\vgui_slider2.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\vgui_SpectatorPanel.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\vgui_TeamFortressViewport.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\vgui_teammenu.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\view.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\voice_banmgr.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\voice_status.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\voice_vgui_tweakdlg.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\cl_util.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\ev_hldm.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\hl_baseentity.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\hl_objects.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\hl_weapons.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\hl_wpn_glock.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHAcidRocketGun.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHAlienAbilities.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHBasePlayerWeapon.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHBileBombGun.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHBite.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHBite2.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHBlink.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHClaws.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHDevour.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHDivineWind.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHGrenade.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHGrenadeGun.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHHealingSpray.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHHeavyMachineGun.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHItemInfo.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHKnife.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHMachineGun.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHMarineWeapon.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHMetabolize.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHMine.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHParasiteGun.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHPistol.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHPrimalScream.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHSonicGun.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHSpikeGun.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHSpitGun.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHSpores.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHStomp.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHSwipe.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHUmbraGun.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHWebSpinner.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHWelder.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\ColoredPanel.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\DummyPanel.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\FadingImageLabel.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\MarqueeComponent.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\PieMenu.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\PieNode.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\SliderPlus.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\SpritePanel.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\UIComponent.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\UIComponents.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\UIFactory.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\UIHud.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\UIManager.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\UIPieMenu.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\UIUtil.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AnimationUtil.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHActionButtons.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHAlienWeapon.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHAmbientSound.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHAssert.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHBalance.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHBalanceAnalysis.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHBaseInfoLocation.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHClientUtil.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHCommanderModeHandler.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHConstants.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHEntityHierarchy.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHEvents.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHFont.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHHelp.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHHud.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHHudRender.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHLogoutComponent.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHMapExtents.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHMiniMap.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHMovementUtil.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHOrder.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHOverviewControl.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHOverviewMap.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHParticleEditorHandler.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHPieMenuHandler.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHPlayerUpgrade.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHScriptClient.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHScriptManager.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHScriptShared.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHScrollHandler.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHScrollPanel.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHSharedMovementInfo.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHSharedUtil.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHSpecials.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHSpriteAPI.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHTeamHierarchy.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHTechImpulsePanel.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHTechNodes.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHTechSlotManager.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHTooltip.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHUIFactory.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHVisibleBlipList.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\ChatPanel.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\CollisionChecker.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\CollisionUtil.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\InvisiblePanel.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHParticleSystem.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHParticleSystemManager.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHParticleTemplate.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHParticleTemplateClient.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\AvHSelectionHelper.obj"
+]
+Creating command line "link.exe @C:\DOCUME~1\hjw\LOCALS~1\Temp\RSP000001.rsp"
+</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
+Output Window
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5>&nbsp;</td><td width=0 bgcolor=#FFFFFF>&nbsp;</td><td width=*><pre>Linking...
+LINK : fatal error LNK1104: cannot open file 'D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\..\cl_dlls\client.dll'
+</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
+Results
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5>&nbsp;</td><td width=0 bgcolor=#FFFFFF>&nbsp;</td><td width=*><pre>
+Build log was saved at "file://D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\cl_dll\Release\\BuildLog.htm"
+cl_dll - 1 error(s), 0 warning(s)</pre></table><table   width=100% height=20 bgcolor=#CFCFE5><tr><td><font face=arial size=+2>
+</font></table></body></html>
\ No newline at end of file
diff --git a/main/source/temp/curllib/Release/BuildLog.htm b/main/source/temp/curllib/Release/BuildLog.htm
new file mode 100644
index 00000000..95db74d1
--- /dev/null
+++ b/main/source/temp/curllib/Release/BuildLog.htm
@@ -0,0 +1,15 @@
+<html>
+<head>
+<META HTTP-EQUIV="Content-Type" content="text/html; charset=Windows-1252">
+</head>
+<body>
+<pre>
+<table width=100% bgcolor=#CFCFE5><tr> <td> <font face=arial size=+3>
+Build Log
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5>&nbsp;</td><td width=0 bgcolor=#FFFFFF>&nbsp;</td><td width=*><pre>
+<h3>------- Build started: Project: curllib, Configuration: Release|Win32 -------
+</h3>
+</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
+Command Lines
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5>&nbsp;</td><td width=0 bgcolor=#FFFFFF>&nbsp;</td><td width=*><pre>curllib - up-to-date.</pre></table><table   width=100% height=20 bgcolor=#CFCFE5><tr><td><font face=arial size=+2>
+</font></table></body></html>
\ No newline at end of file
diff --git a/main/source/temp/hl/Release/BuildLog.htm b/main/source/temp/hl/Release/BuildLog.htm
new file mode 100644
index 00000000..1a474585
--- /dev/null
+++ b/main/source/temp/hl/Release/BuildLog.htm
@@ -0,0 +1,184 @@
+<html>
+<head>
+<META HTTP-EQUIV="Content-Type" content="text/html; charset=Windows-1252">
+</head>
+<body>
+<pre>
+<table width=100% bgcolor=#CFCFE5><tr> <td> <font face=arial size=+3>
+Build Log
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5>&nbsp;</td><td width=0 bgcolor=#FFFFFF>&nbsp;</td><td width=*><pre>
+<h3>------- Build started: Project: hl, Configuration: Release|Win32 -------
+</h3>
+</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
+Command Lines
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5>&nbsp;</td><td width=0 bgcolor=#FFFFFF>&nbsp;</td><td width=*><pre>Creating temporary file "C:\DOCUME~1\hjw\LOCALS~1\Temp\RSP000002.rsp" with contents
+[
+/O2 /I "D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\\" /I "D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\\dlls" /I "D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\\engine" /I "D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\\common" /I "D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\\pm_shared" /I "D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\\game_shared" /I "D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\\lua\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "QUIVER" /D "VOXEL" /D "QUAKE2" /D "VALVE_DLL" /D "AVH_SERVER" /FD /EHsc /MT /GS /GR /Fp".\Releasehl/hl.pch" /Fo"D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release/" /Fd"D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release/" /W3 /c /Zi
+".\weapons.cpp"
+".\player.cpp"
+]
+Creating command line "cl.exe @C:\DOCUME~1\hjw\LOCALS~1\Temp\RSP000002.rsp /nologo"
+Creating temporary file "C:\DOCUME~1\hjw\LOCALS~1\Temp\RSP000003.rsp" with contents
+[
+/OUT:"D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\\..\dlls\ns.dll" /INCREMENTAL:NO /NOLOGO /LIBPATH:"D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\\lib\Release" /DLL /DEF:".\hl.def" /DEBUG /SUBSYSTEM:WINDOWS /IMPLIB:"D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\\temp\hl\Release/ns.lib" /MACHINE:X86 winmm.lib ws2_32.lib curl.lib particles.lib textrep.lib util.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\lib\release\util.lib" "\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\lib\release\lua.lib" "\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\lib\release\particles.lib" "\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\lib\release\textrep.lib" "\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\lib\release\curl.lib"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\animating.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\animation.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\bmodels.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\buttons.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\cbase.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\client.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\combat.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\doors.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\effects.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\egon.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\explode.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\func_break.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\func_tank.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\game.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\gamerules.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\gauss.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\globals.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\h_ai.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\h_battery.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\h_cycler.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\h_export.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\items.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\lights.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\maprules.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\mpstubb.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\multiplay_gamerules.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\observer.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\pathcorner.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\plane.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\plats.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\player.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\pm_debug.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\pm_math.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\pm_shared.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\satchel.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\shotgun.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\singleplay_gamerules.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\skill.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\sound.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\soundent.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\spectator.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\squeakgrenade.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\subs.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\teamplay_gamerules.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\triggers.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\turret.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\util.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\voice_banmgr.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\voice_gamemgr.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\weapons.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\world.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\xen.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AnimationUtil.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHAlienEquipment.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHAlienTurret.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHAlienWeapon.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHAssert.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHBalance.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHBaseBuildable.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHBaseInfoLocation.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHBuildable.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHCloakable.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHCombat.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHConsoleCommands.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHConstants.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHCurl.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHEntities.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHEntityHierarchy.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHGamerules.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHHive.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHMapExtents.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHMarineEquipment.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHMarineTurret.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHMarineWeapon.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHMiniMap.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHMovementUtil.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHOrder.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHPlayer.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHPlayerUpgrade.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHPushableBuildable.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHReinforceable.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHResearchManager.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHScriptManager.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHScriptServer.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHScriptShared.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHSelectionHelper.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHServerPlayerData.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHServerUtil.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHSharedMovementInfo.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHSharedUtil.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHSiegeTurret.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHSoundListManager.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHSpawn.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHSpecials.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHTeam.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHTechNodes.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHTechSlotManager.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHTurret.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHVisibleBlipList.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHVoiceHelper.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHWeldable.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHWorldUpdate.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\CollisionChecker.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\CollisionChecker_ServerOnly.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\CollisionUtil.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\NetworkMeter.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\UPPUtil.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHAcidRocketGun.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHAlienAbilities.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHBasePlayerWeapon.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHBileBombGun.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHBite.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHBite2.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHBlink.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHBuildingGun.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHClaws.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHDevour.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHDivineWind.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHGrenade.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHGrenadeGun.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHHealingSpray.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHHeavyMachineGun.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHItemInfo.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHKnife.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHMachineGun.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHMetabolize.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHMine.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHParasiteGun.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHPistol.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHPrimalScream.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHSonicGun.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHSpikeGun.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHSpitGun.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHSpores.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHStomp.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHSwipe.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHUmbraGun.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHWebSpinner.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHWelder.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\ggrenade.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHParticleSystem.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHParticleSystemEntity.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHParticleSystemManager.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHParticleTemplate.obj"
+"\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\AvHParticleTemplateServer.obj"
+]
+Creating command line "link.exe @C:\DOCUME~1\hjw\LOCALS~1\Temp\RSP000003.rsp"
+</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
+Output Window
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5>&nbsp;</td><td width=0 bgcolor=#FFFFFF>&nbsp;</td><td width=*><pre>Compiling...
+weapons.cpp
+player.cpp
+Generating Code...
+Linking...
+   Creating library D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\\temp\hl\Release/ns.lib and object D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\\temp\hl\Release/ns.exp
+</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
+Results
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5>&nbsp;</td><td width=0 bgcolor=#FFFFFF>&nbsp;</td><td width=*><pre>
+Build log was saved at "file://D:\games\Steam\SteamApps\hjw@jarhedz.com\nsb6\source\temp\hl\Release\\BuildLog.htm"
+hl - 0 error(s), 0 warning(s)</pre></table><table   width=100% height=20 bgcolor=#CFCFE5><tr><td><font face=arial size=+2>
+</font></table></body></html>
\ No newline at end of file
diff --git a/main/source/temp/lua/Release/BuildLog.htm b/main/source/temp/lua/Release/BuildLog.htm
new file mode 100644
index 00000000..e334739b
--- /dev/null
+++ b/main/source/temp/lua/Release/BuildLog.htm
@@ -0,0 +1,15 @@
+<html>
+<head>
+<META HTTP-EQUIV="Content-Type" content="text/html; charset=Windows-1252">
+</head>
+<body>
+<pre>
+<table width=100% bgcolor=#CFCFE5><tr> <td> <font face=arial size=+3>
+Build Log
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5>&nbsp;</td><td width=0 bgcolor=#FFFFFF>&nbsp;</td><td width=*><pre>
+<h3>------- Build started: Project: lua, Configuration: Release|Win32 -------
+</h3>
+</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
+Command Lines
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5>&nbsp;</td><td width=0 bgcolor=#FFFFFF>&nbsp;</td><td width=*><pre>lua - up-to-date.</pre></table><table   width=100% height=20 bgcolor=#CFCFE5><tr><td><font face=arial size=+2>
+</font></table></body></html>
\ No newline at end of file
diff --git a/main/source/temp/particles/Release/BuildLog.htm b/main/source/temp/particles/Release/BuildLog.htm
new file mode 100644
index 00000000..0cf49f2d
--- /dev/null
+++ b/main/source/temp/particles/Release/BuildLog.htm
@@ -0,0 +1,15 @@
+<html>
+<head>
+<META HTTP-EQUIV="Content-Type" content="text/html; charset=Windows-1252">
+</head>
+<body>
+<pre>
+<table width=100% bgcolor=#CFCFE5><tr> <td> <font face=arial size=+3>
+Build Log
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5>&nbsp;</td><td width=0 bgcolor=#FFFFFF>&nbsp;</td><td width=*><pre>
+<h3>------- Build started: Project: particles, Configuration: Release|Win32 -------
+</h3>
+</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
+Command Lines
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5>&nbsp;</td><td width=0 bgcolor=#FFFFFF>&nbsp;</td><td width=*><pre>particles - up-to-date.</pre></table><table   width=100% height=20 bgcolor=#CFCFE5><tr><td><font face=arial size=+2>
+</font></table></body></html>
\ No newline at end of file
diff --git a/main/source/temp/readme.txt b/main/source/temp/readme.txt
new file mode 100644
index 00000000..d19f1074
--- /dev/null
+++ b/main/source/temp/readme.txt
@@ -0,0 +1,4 @@
+This directory is a catch-all for object files built by each project.
+
+It's provided so that a single SCM ignore command can cover all of the 
+intermediate build files.
\ No newline at end of file
diff --git a/main/source/textrep/TRDescription.cpp b/main/source/textrep/TRDescription.cpp
new file mode 100644
index 00000000..c1adf746
--- /dev/null
+++ b/main/source/textrep/TRDescription.cpp
@@ -0,0 +1,332 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: TRDescription.cpp $
+// $Date: 2002/07/26 01:53:49 $
+//
+//-------------------------------------------------------------------------------
+// $Log: TRDescription.cpp,v $
+// Revision 1.5  2002/07/26 01:53:49  Flayra
+// - Linux support for FindFirst/FindNext
+// - Added document headers
+//
+//===============================================================================
+#include "TRDescription.h"
+
+// Add a new pair read from the text file to this description.  They can be added in any order.
+void TRDescription::AddPair(const TRTagValuePair& inPair)
+{ 
+    this->mTagValueList.push_back(inPair);
+}
+
+// Read a list of tags named prefix and then a number, starting with 1.
+// Ie, sound1, sound2, sound3 etc.  It reads in order until it doesn't find a tag, then stops.
+bool TRDescription::GetTagStringList(const TRTag& inTagPrefix, StringVector& outList) const
+{
+    bool theSuccess = false;
+
+    for(int i = 1; ; i++)
+    {
+        char theNum[4];
+        sprintf(theNum, "%d", i);
+        string theTagName(inTagPrefix + string(theNum));
+        string theTagString;
+        
+        if(this->GetTagValue(theTagName, theTagString))
+        {
+            // Successful if we found at least one tag
+            outList.push_back(theTagString);
+            theSuccess = true;
+        }
+        else
+        {
+            break;
+        }
+    }
+
+    return theSuccess;
+}
+
+bool TRDescription::GetTagStringList(const TRTag& inTagPrefix, CStringList& outList) const
+{
+    bool theSuccess = false;
+
+    for(int i = 1; ; i++)
+    {
+        char theNum[4];
+        sprintf(theNum, "%d", i);
+        string theTagName(inTagPrefix + string(theNum));
+        string theTagString;
+
+        if(this->GetTagValue(theTagName, theTagString))
+        {
+            CString theCTagString;
+            theCTagString = theTagString;
+
+            // Successful if we found at least one tag
+            outList.push_back(theCTagString);
+            theSuccess = true;
+        }
+        else
+        {
+            break;
+        }
+    }
+
+    return theSuccess;
+}
+
+//template <class T>
+//bool TRDescription::GetTagStringList(const TRTag& inTagPrefix, T& outList) const
+//{
+//    bool theSuccess = false;
+//
+//    for(int i = 1; ; i++)
+//    {
+//        char theNum[4];
+//        sprintf(theNum, "%d", i);
+//        string theTagName(inTagPrefix + string(theNum));
+//        string theTagString;
+//        
+//        string theNodeString;
+//        if(this->GetTagValue(theTagName, theTagString))
+//        {
+//            // Successful if we found at least one tag
+//            outList.push_back(theTagString);
+//            theSuccess = true;
+//        }
+//        else
+//        {
+//            break;
+//        }
+//    }
+//
+//    return theSuccess;
+//}
+
+
+
+// Get the integer associated with the named tag.  Returns false if the tag
+// isn't present or the data format couldn't be read.
+bool TRDescription::GetTagValue(const TRTag& inTag, int& outValue) const
+{
+    bool theSuccess = false;
+    string theString;
+
+    if(this->GetValue(inTag, theString))
+    {
+        if(sscanf(theString.c_str(), "%d", &outValue) == 1)
+        {
+            theSuccess = true;
+        }
+    }
+
+    return theSuccess;
+}
+
+// Get the float associated with the named tag.  Returns false if the tag
+// isn't present or the data format couldn't be read.
+bool TRDescription::GetTagValue(const TRTag& inTag, float& outValue) const
+{
+    bool theSuccess = false;
+    string theString;
+
+    if(this->GetValue(inTag, theString))
+    {
+        if(sscanf(theString.c_str(),"%f", &outValue) == 1)
+        {
+            theSuccess = true;
+        }
+    }
+
+    return theSuccess;
+}
+     
+// Get the string associated with the named tag.  Returns false if the tag
+// isn't present (it can always be read!).
+bool TRDescription::GetTagValue(const TRTag& inTag, string& outValue) const
+{
+    bool theSuccess = false;
+
+    if(this->GetValue(inTag, outValue))
+    {
+        theSuccess = true;
+    }
+
+    return theSuccess;
+}
+
+bool TRDescription::GetTagValue(const TRTag& inTag, CString& outValue) const
+{
+    string  theValue;
+    bool    theSuccess = false;
+
+    if(this->GetValue(inTag, theValue))
+    {
+        outValue = theValue;
+        theSuccess = true;
+    }
+
+    return theSuccess;
+}
+
+// Get the boolean associated with the named tag.  Returns false if the tag
+// isn't present or the data format wasn't either "true" or "false".
+bool TRDescription::GetTagValue(const TRTag& inTag, bool& outValue) const
+{
+    bool theSuccess = false;
+    string theString;
+
+    if(this->GetValue(inTag, theString))
+    {
+        if(theString == "false")
+        {
+            outValue = false;
+        } 
+        else if(theString == "true")
+        {
+            outValue = true;
+        }
+        theSuccess = true;
+    }
+
+    return theSuccess;
+}
+
+// This is the name of this entity.  It is used to find it by the client code later.
+string TRDescription::GetName(void) const
+{
+	return this->mName;
+}
+
+// Indicates what type of object this entity represents and is the keyword used to figure out
+// what class to new.
+string TRDescription::GetType(void) const
+{
+	return this->mType;
+}
+
+
+// Internal searching function to get the string value associated with the specified tag name.
+// It is used by all the GetTagValue functions.  Returns false if the tag isn't present.
+bool TRDescription::GetValue(const string& inTagName, string& outString) const
+{
+    bool theSuccess = false;
+    TRTagValueListType::const_iterator theIter;
+
+    // Lookup tag name in list
+    for(theIter = this->mTagValueList.begin(); theIter != this->mTagValueList.end(); theIter++)
+    {
+        if(theIter->first == inTagName)
+        {
+            outString = theIter->second;
+            theSuccess = true;
+            break;
+        }
+    }
+
+    return theSuccess;
+}
+
+void TRDescription::SetName(const string& inName)
+{
+    this->mName = inName;
+}
+
+bool TRDescription::SetTagValue(const TRTag& inTag, int inValue)
+{
+    bool theSuccess = false;
+    char theCharArray[128];
+
+    // Convert inValue to a string
+    if(sprintf(theCharArray, "%d", inValue) > 0)
+    {
+        string theStringValue(theCharArray);
+
+        // Call SetValue, return what it returns
+        theSuccess = this->SetValue(inTag, theStringValue);
+    }
+
+    return theSuccess;
+}
+
+bool TRDescription::SetTagValue(const TRTag& inTag, float inValue)
+{
+    bool theSuccess = false;
+    char theCharArray[128];
+
+    // Convert inValue to a string
+    if(sprintf(theCharArray, "%f", inValue) > 0)
+    {
+        string theStringValue(theCharArray);
+
+        // Call SetValue, return what it returns
+        theSuccess = this->SetValue(inTag, theStringValue);
+    }
+
+    return theSuccess;
+}
+     
+bool TRDescription::SetTagValue(const TRTag& inTag, const string& inValue)
+{
+    bool theSuccess = false;
+
+    // Call SetValue, return what it returns
+    theSuccess = this->SetValue(inTag, inValue);
+
+    return theSuccess;
+}
+     
+bool TRDescription::SetTagValue(const TRTag& inTag, bool inValue)
+{
+    bool theSuccess = false;
+
+    // Convert inValue to a string
+    string theStringValue;
+    if(inValue)
+    {
+        theStringValue = "true";
+    }
+    else
+    {
+        theStringValue = "false";
+    }
+
+    // Call SetValue, return what it returns
+    theSuccess = this->SetValue(inTag, theStringValue);
+
+    return theSuccess;
+}
+
+
+void TRDescription::SetType(const string& inType)
+{
+    this->mType = inType;
+}
+
+// Internal searching function to set the string for a tag.  Used by all the SetTagValue functions.
+bool TRDescription::SetValue(const string& inTagName, const string& inString)
+{
+    bool theSuccess = false;
+    TRTagValueListType::iterator theIter;
+
+    // Lookup tag name in list
+    for(theIter = this->mTagValueList.begin(); theIter != this->mTagValueList.end(); theIter++)
+    {
+        if(theIter->first == inTagName)
+        {
+            theIter->second = inString;
+            theSuccess = true;
+            break;
+        }
+    }
+
+    return theSuccess;
+}
+
diff --git a/main/source/textrep/TRDescription.h b/main/source/textrep/TRDescription.h
new file mode 100644
index 00000000..330cb687
--- /dev/null
+++ b/main/source/textrep/TRDescription.h
@@ -0,0 +1,161 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: TRDescription.h $
+// $Date: 2002/07/26 01:53:49 $
+//
+//-------------------------------------------------------------------------------
+// $Log: TRDescription.h,v $
+// Revision 1.6  2002/07/26 01:53:49  Flayra
+// - Linux support for FindFirst/FindNext
+// - Added document headers
+//
+//===============================================================================
+//
+// Reads in a list of tag-value pairs in order.  Every description begins with "start <type> <name>" and ends with "end".
+// A line that starts with ', or // is treated as a comment and ignored. There can be multiple descriptions in a file.
+// 
+// Here are some examples:
+//
+// start Label ResourceUnits
+//      xpos = .5
+//      ypos = .4
+//      xwidth = .1
+//      yheight = .2
+//      bgimage = rg
+// end
+//
+// A weapon description might look like:
+//
+// start Weapon MachineGun
+//      rof = 6
+//      startingammo = 50
+//      damage = 10
+//      firesound = sound/weapons/ak47.wav
+//      reloadanim = wpn_reload
+// end
+//
+// Something that describes an graphical effect could look like:
+//
+// ' Weapon smoke and shrapnel
+// start ParticleSystem WeaponSmoke
+//      ' num particles per second
+//      particlerate = 6
+//      numinitialparticles = 0
+//      particlephysics = smoke
+//      smoketexture = wpn_smoke
+//      origin = local_player_weapon
+// end
+//
+// ' Finally, some real shrapnel
+// start ParticleSystem WeaponShrapnel
+//      modelname = models/shrapnel
+//      particlerate = 0
+//      numinitialparticles = 5
+//      particlephysics = fountain
+//      initialsound = sound/fx/skrang.wav
+// end
+// 
+// 
+
+#ifndef TRDESCRIPTION_H
+#define TRDESCRIPTION_H
+
+#include "types.h"
+#include "textrep/TRTag.h"
+#include "textrep/TRTagValuePair.h"
+#include "util/CString.h"
+#include "util/StringVector.h"
+
+class TRDescription
+{
+public:
+    string      GetName(void) const;
+                
+    bool        GetTagStringList(const TRTag& inTagPrefix, StringVector& outList) const;
+
+    bool        GetTagStringList(const TRTag& inTagPrefix, CStringList& outList) const;
+
+    bool        GetTagValue(const TRTag& inTag, int& outValue) const;
+                                        
+    bool        GetTagValue(const TRTag& inTag, float& outValue) const;
+                                        
+    bool        GetTagValue(const TRTag& inTag, string& outValue) const;
+
+    bool        GetTagValue(const TRTag& inTag, CString& outValue) const;
+                                        
+    bool        GetTagValue(const TRTag& inTag, bool& outValue) const;
+
+    string      GetType(void) const;    
+                                        
+    bool        SetTagValue(const TRTag& inTag, int inValue);
+                                        
+    bool        SetTagValue(const TRTag& inTag, float inValue);
+                                        
+    bool        SetTagValue(const TRTag& inTag, const string& inValue);
+                                        
+    bool        SetTagValue(const TRTag& inTag, bool inValue);
+
+    // Be cool and nice and define interators so clients can enumurate all data pairs in this description
+    typedef     vector<TRTagValuePair>              TRTagValueListType;
+    typedef     TRTagValueListType::iterator        iterator;
+    typedef     TRTagValueListType::const_iterator  const_iterator;
+
+    iterator    begin(void) 
+	{ 
+		return this->mTagValueList.begin(); 
+	}
+
+    iterator    end(void) 
+	{ 
+		return this->mTagValueList.end(); 
+	}
+
+    const_iterator	begin(void) const 
+	{ 
+		return this->mTagValueList.begin(); 
+	};
+
+    const_iterator	end(void) const 
+	{ 
+		return this->mTagValueList.end(); 
+	}
+
+private:
+                // Built by TRFactory only
+                friend class TRFactory;
+
+    void        AddPair(const TRTagValuePair& inPair);
+
+    //template <class T>
+    //bool        GetTagStringList(const TRTag& inTagPrefix, T& outList) const;
+
+    bool        GetValue(const string& inTagName, string& outString) const;
+
+    bool        SetValue(const string& inTagName, const string& inString);
+
+    void        SetName(const string& inName);
+
+    void        SetType(const  string& inType);
+
+    // The hopefully unique name given this description in the text file it was read from
+    string      mName;
+
+    // A string indicating what type of object this represents.  This is used to new the object.
+    string      mType;
+
+    // List of TRTagValuePairs representing all the settings for this object.  These settings will
+    // be used to configure the object after newing it.
+    TRTagValueListType  mTagValueList;
+
+};
+
+typedef vector<TRDescription>   TRDescriptionList;
+
+#endif
diff --git a/main/source/textrep/TRFactory.cpp b/main/source/textrep/TRFactory.cpp
new file mode 100644
index 00000000..7a88689d
--- /dev/null
+++ b/main/source/textrep/TRFactory.cpp
@@ -0,0 +1,306 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: TRFactory.cpp $
+// $Date: 2002/08/16 02:28:25 $
+//
+//-------------------------------------------------------------------------------
+// $Log: TRFactory.cpp,v $
+// Revision 1.6  2002/08/16 02:28:25  Flayra
+// - Added document headers
+//
+//===============================================================================
+
+#include "textrep/TRTag.h"
+#include "textrep/TRTagValuePair.h"
+#include "textrep/TRDescription.h"
+#include "textrep/TRFactory.h"
+#include "util/STLUtil.h"
+
+const int maxLineLength = 256;
+
+bool TRFactory::ReadDescriptions(const string& inRelativePathFilename, TRDescriptionList& outDescriptionList)
+{
+	bool theSuccess = false;
+	bool theDescriptionRead = false;
+
+    // Open file specified by relative path name
+    fstream infile;
+    infile.open(inRelativePathFilename.c_str(), ios::in);
+
+    if(infile.is_open())
+    {
+		do
+		{
+			// Try to read the next description in
+			TRDescription theNextDescription;
+			theDescriptionRead = ReadDescription(infile, theNextDescription);
+
+	        // add it to the description list
+			if(theDescriptionRead)
+			{
+				// Function is successful if at least one description was found
+				outDescriptionList.push_back(theNextDescription);
+				theSuccess = true;
+			}
+
+		} while(theDescriptionRead);
+
+        infile.close();
+    }
+	return theSuccess;
+}
+
+bool TRFactory::WriteDescriptions(const string& inRelativePathFilename, const TRDescriptionList& inDescriptionList, const string& inHeader)
+{
+    bool theSuccess = false;
+
+    // Open the file for output
+    fstream theOutfile;
+    theOutfile.open(inRelativePathFilename.c_str(), ios::out);
+
+    if(theOutfile.is_open())
+    {
+        // Optional: write header
+        theOutfile << inHeader << std::endl;
+
+        //theOutfile << "; Generated by Half-life.  Do not edit unless you know what you are doing! " << std::endl;
+        //theOutfile << std::endl;
+
+        // For each description
+        TRDescriptionList::const_iterator theIter;
+        for(theIter = inDescriptionList.begin(); theIter != inDescriptionList.end(); theIter++)
+        {
+            // Write out that description
+            const TRDescription& theDesc = *theIter;
+            TRFactory::WriteDescription(theOutfile, theDesc);
+
+            // Write out a blank line to make them look nice and separated
+            theOutfile << std::endl;
+        }
+
+        theOutfile.close();
+        theSuccess = true;
+    }
+
+    return theSuccess;
+}
+
+// TODO: Add case-insensitivity
+bool TRFactory::ReadDescription(fstream& infile, TRDescription& outDescription)
+{
+    bool theSuccess = false;
+    string currentLine;
+    bool blockStarted = false;
+
+    // for every line in the file
+    while(!infile.eof())
+    {
+        if(readAndTrimNextLine(infile, currentLine))
+        {
+            // If line isn't a comment
+            if(!lineIsAComment(currentLine))
+            {
+                // If we haven't started, is line of format: start <type> <name>?  If so, set started and set those tags.
+                if(!blockStarted)
+                {
+                    blockStarted = readStartBlockLine(currentLine, outDescription);
+                }
+                // If we have started
+				else
+                {
+                    // Is line an end?  If so, this function is over
+                    if(readEndBlockLine(currentLine))
+                    {
+                        break;
+                    }
+                    // else is line of tag = property format?  If so, add it as pair
+                    else
+                    {
+                        // If not, print error and proceed
+                        if(readTagAndValueLine(currentLine, outDescription))
+                        {
+                            // Once we have read at least one tag-value pair, considered this a success
+                            theSuccess = true;
+                        }
+                        else
+                        {
+			  //printf("Error reading line of length %d: %s\n", currentLine.length(), currentLine.c_str());
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    return theSuccess;
+}
+
+bool TRFactory::WriteDescription(fstream& outfile, const TRDescription& inDescription)
+{
+    bool theSuccess = true;
+
+    // Write out the start block
+    outfile << "start" << " " << inDescription.GetType() << " " << inDescription.GetName() << std::endl;
+
+    // Write out the property tags
+    TRDescription::const_iterator theIter;
+    for(theIter = inDescription.begin(); theIter != inDescription.end(); theIter++)
+    {
+        outfile << "    " << theIter->first << " = " << theIter->second << std:: endl;
+    }
+
+    // Write out the end block.
+    outfile << "end" << std::endl;
+
+    return theSuccess;
+}
+
+bool TRFactory::readAndTrimNextLine(istream& inStream, string& outString)
+{
+    char theLine[maxLineLength];
+    bool theSuccess = false;
+
+    inStream.getline(theLine, maxLineLength);
+    outString = string(theLine);
+
+    trimWhitespace(outString);
+
+	// Return false if the line is empty when we're done
+	if(outString.length() > 1)
+	{
+		theSuccess = true;
+	}
+
+    return theSuccess;
+}
+
+// Trim whitespace from string
+void TRFactory::trimWhitespace(string& inString)
+{
+	// find first character that isn't a tab or space and save that offset
+	//int		firstNonWSChar = 0;
+	//int		i= 0;
+	//int		stringLength = inString.length();
+	//while(i != (stringLength - 1) && ())
+	//{
+	//}
+
+	// find last character that isn't a tab or space and save that offset
+	// Build a new string representing string without whitespace
+	// Set new string equal to inString
+}
+
+bool TRFactory::charIsWhiteSpace(char inChar)
+{
+	bool theSuccess = false;
+
+	if((inChar == ' ') || (inChar == '\t'))
+	{
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+// Is the string a comment?
+bool TRFactory::lineIsAComment(const string& inString)
+{
+    bool theLineIsAComment = false;
+	int theLength = inString.length();
+
+	if(theLength > 0)
+	{
+		// Loop through inString until a non-whitespace character is found
+		for(int i = 0; i < theLength; i++)
+		{
+			char theFirstChar = inString[i];
+			if(!charIsWhiteSpace(theFirstChar))
+			{
+				if((theFirstChar == '\'') || (theFirstChar == ';'))
+				{
+					theLineIsAComment = true;
+				}
+				break;
+			}
+		}
+	}
+
+    return theLineIsAComment;
+}
+
+// Read start block
+// Set the name and type of the description
+// Returns false if invalid format
+bool TRFactory::readStartBlockLine(const string& inString, TRDescription& outDescription)
+{
+    bool theSuccess = false;
+	char theType[maxLineLength];
+	char theName[maxLineLength];
+
+	memset(theType, ' ', maxLineLength);
+	memset(theName, ' ', maxLineLength);
+
+	// Read three tokens.  There should be "start" <type> <name>
+	if(sscanf(inString.c_str(), "start %s %s", theType, theName) == 2)
+	{
+		outDescription.SetName(theName);
+		outDescription.SetType(theType);
+		theSuccess = true;
+	}
+
+    return theSuccess;
+}
+
+// Read end block
+bool TRFactory::readEndBlockLine(const string& inString)
+{
+    bool theSuccess = false;
+
+	// There are some CRLF issues on Linux, hence this bit
+	if(inString.length() >= 3)
+	{
+		string theString = inString.substr(0,3);
+
+		if(theString == "end")
+		{
+			theSuccess = true;
+		}
+		else
+		{
+			//printf("TRFactory::readEndBlockLine() failed, found (%s)\n", theString.c_str());
+		}
+	}
+
+    return theSuccess;
+}
+
+bool TRFactory::readTagAndValueLine(const string& inString, TRDescription& outDescription)
+{
+    bool theSuccess = false;
+	char theTag[maxLineLength];
+	char theValue[maxLineLength];
+
+	// Zero them out
+	memset(theTag, ' ', maxLineLength);
+	memset(theValue, ' ', maxLineLength);
+
+	if((sscanf(inString.c_str(), "%s = %s", theTag, theValue)) == 2)
+	{
+		// Add it
+		TRTagValuePair thePair(theTag, theValue);
+		outDescription.AddPair(thePair);
+		theSuccess = true;
+	}
+
+    return theSuccess;
+}
+
+
+
diff --git a/main/source/textrep/TRFactory.h b/main/source/textrep/TRFactory.h
new file mode 100644
index 00000000..47325ac9
--- /dev/null
+++ b/main/source/textrep/TRFactory.h
@@ -0,0 +1,48 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: TRFactory.h $
+// $Date: 2002/08/16 02:28:25 $
+//
+//-------------------------------------------------------------------------------
+// $Log: TRFactory.h,v $
+// Revision 1.5  2002/08/16 02:28:25  Flayra
+// - Added document headers
+//
+//===============================================================================
+#ifndef TRFACTORY_H
+#define TRFACTORY_H
+
+#include "textrep/TRDescription.h"
+#include "string.h"
+
+// Build a list of text description from a file.  The filename is relative to the mod's base directory.  
+// This exists outside of TRDescription because it is conceptually different, but is closely coupled with it.
+class TRFactory
+{
+public:
+    // Read all the descriptions from the file
+    static  bool    ReadDescriptions(const string& inRelativePathFilename, TRDescriptionList& outDescriptionList);
+    static  bool    WriteDescriptions(const string& inRelativePathFilename, const TRDescriptionList& inDescriptionList, const string& inHeader);
+
+private:
+    static  bool    ReadDescription(fstream& infile, TRDescription& outDescription);
+    static  bool    WriteDescription(fstream& outfile, const TRDescription& inDescription);
+
+	static  bool	charIsWhiteSpace(char inChar);
+    static  void    trimWhitespace(string& inString);
+    static  bool    lineIsAComment(const string& inString);
+    static  bool    readAndTrimNextLine(istream& inStream, string& outLine);
+    static  bool    readStartBlockLine(const string& inString, TRDescription& outDescription);
+    static  bool    readEndBlockLine(const string& inString);
+    static  bool    readTagAndValueLine(const string& inString, TRDescription& outDescription);
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/textrep/TRTag.h b/main/source/textrep/TRTag.h
new file mode 100644
index 00000000..ee37a378
--- /dev/null
+++ b/main/source/textrep/TRTag.h
@@ -0,0 +1,26 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: TRTag.h $
+// $Date: 2002/08/16 02:28:25 $
+//
+//-------------------------------------------------------------------------------
+// $Log: TRTag.h,v $
+// Revision 1.3  2002/08/16 02:28:25  Flayra
+// - Added document headers
+//
+//===============================================================================
+#ifndef TRTAG_H
+#define TRTAG_H
+
+#include "types.h"
+
+typedef string TRTag;
+
+#endif
diff --git a/main/source/textrep/TRTagValuePair.h b/main/source/textrep/TRTagValuePair.h
new file mode 100644
index 00000000..d6b7b668
--- /dev/null
+++ b/main/source/textrep/TRTagValuePair.h
@@ -0,0 +1,34 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: TRTagValuePair.h $
+// $Date: 2002/08/16 02:28:25 $
+//
+//-------------------------------------------------------------------------------
+// $Log: TRTagValuePair.h,v $
+// Revision 1.3  2002/08/16 02:28:25  Flayra
+// - Added document headers
+//
+//===============================================================================
+#ifndef TRTAGVALUEPAIR_H
+#define TRTAGVALUEPAIR_H
+
+#include "textrep/TRTag.h"
+
+typedef pair<string, string>    TRTagValuePair;
+
+//class TRTagValuePair 
+//{
+//public:
+//
+//private:
+//
+//};
+
+#endif
diff --git a/main/source/textrep/Textrep.vcproj b/main/source/textrep/Textrep.vcproj
new file mode 100644
index 00000000..f32511c6
--- /dev/null
+++ b/main/source/textrep/Textrep.vcproj
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="Textrep"
+	RootNamespace="Textrep"
+	SccProjectName=""
+	SccAuxPath=""
+	SccLocalPath=""
+	SccProvider="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)/"
+			IntermediateDirectory="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				OptimizeForProcessor="1"
+				AdditionalIncludeDirectories="$(SolutionDir)"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Debug/Textrep.pch"
+				AssemblerListingLocation="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ObjectFile="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ProgramDataBaseFileName="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(SolutionDir)\lib\$(ConfigurationName)\textrep.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)/"
+			IntermediateDirectory="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Release/Textrep.pch"
+				AssemblerListingLocation="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ObjectFile="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ProgramDataBaseFileName="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(SolutionDir)\lib\$(ConfigurationName)\textrep.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="TRDescription.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="TRFactory.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="TRDescription.h">
+			</File>
+			<File
+				RelativePath="TRFactory.h">
+			</File>
+			<File
+				RelativePath="TRTag.h">
+			</File>
+			<File
+				RelativePath="TRTagValuePair.h">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/main/source/types.h b/main/source/types.h
new file mode 100644
index 00000000..e90dd9ec
--- /dev/null
+++ b/main/source/types.h
@@ -0,0 +1,62 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: types.h $
+// $Date: 2002/07/25 18:05:28 $
+//
+//-------------------------------------------------------------------------------
+// $Log: types.h,v $
+// Revision 1.10  2002/07/25 18:05:28  flayra
+// - Remove unneeded type for Linux compatibility
+//
+// Revision 1.9  2002/05/23 02:41:53  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef BASIC_H
+#define BASIC_H
+
+#pragma warning (disable: 4786)
+
+// #ifdef this the right way for Linux
+//#include <crtdbg.h>
+//#define ASSERT _ASSERT
+#include "localassert.h"
+#include "build.h"
+
+#include <string>
+#include <vector>
+#include <map>
+#include <iostream>
+#include <fstream>
+#include <algorithm>
+
+using namespace std;
+
+// data types
+typedef signed char			int8;
+typedef signed short		int16;
+typedef signed long			int32;
+							
+typedef unsigned char		uint8;
+typedef unsigned short		uint16;
+typedef unsigned long		uint32;
+
+#ifndef max
+#define max(a, b)  (((a) > (b)) ? (a) : (b))
+#endif
+
+#ifndef min
+#define min(a, b)  (((a) < (b)) ? (a) : (b))
+#endif
+
+typedef vector<string>					StringList;
+//typedef vector<pair<string, string>>	StringPairList;
+
+#endif
diff --git a/main/source/ui/ButtonChain.h b/main/source/ui/ButtonChain.h
new file mode 100644
index 00000000..062a050e
--- /dev/null
+++ b/main/source/ui/ButtonChain.h
@@ -0,0 +1,38 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: ButtonChain.h $
+// $Date: 2002/08/16 02:28:55 $
+//
+//-------------------------------------------------------------------------------
+// $Log: ButtonChain.h,v $
+// Revision 1.2  2002/08/16 02:28:55  Flayra
+// - Added document headers
+//
+//===============================================================================
+#ifndef ButtonChain_H
+#define ButtonChain_H
+
+#include "vgui_Panel.h"
+
+class ButtonChain : public vgui::Panel
+{
+public:
+					ButtonChain(int inButtonWidth, int inButtonHeight, int inNumButtons);
+
+protected:
+	virtual void	paint();
+	virtual void	paintBackground();
+
+private:
+	int				mNumButtons;
+
+};
+
+#endif
diff --git a/main/source/ui/ColoredPanel.cpp b/main/source/ui/ColoredPanel.cpp
new file mode 100644
index 00000000..0c34589f
--- /dev/null
+++ b/main/source/ui/ColoredPanel.cpp
@@ -0,0 +1,61 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: ColoredPanel.cpp $
+// $Date: 2002/08/16 02:28:55 $
+//
+//-------------------------------------------------------------------------------
+// $Log: ColoredPanel.cpp,v $
+// Revision 1.3  2002/08/16 02:28:55  Flayra
+// - Added document headers
+//
+//===============================================================================
+#include "ui/ColoredPanel.h"
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+
+ColoredPanel::ColoredPanel() : Panel()
+{
+}
+
+ColoredPanel::ColoredPanel(int inXPos, int inYPos, int inWidth, int inHeight) : Panel(inXPos, inYPos, inWidth, inHeight)
+{
+}
+
+void ColoredPanel::paint()
+{
+	Panel::paint();
+}
+
+void ColoredPanel::paintBackground()
+{
+	Panel::paintBackground();
+
+	int r, g, b, a;
+	this->getBgColor(r, g, b, a);
+
+	int theXPos, theYPos;
+	this->getPos(theXPos, theYPos);
+
+	int theWidth, theHeight;
+	this->getSize(theWidth, theHeight);
+
+	//FillRGBA(0, 0, theWidth, theHeight, r, g, b, a);
+
+	float theOptimalIncrement = (float)255/theHeight;
+	int theStepSize = max(theOptimalIncrement, 1);
+	a = 0;
+	for(int i = 0; i < theHeight; i++)
+	{
+		// Fill lines across, getting darker
+		FillRGBA(0, i, theWidth, 1, r, g, b, a);
+		a = min(a+theStepSize, 255);
+	}
+}
+
diff --git a/main/source/ui/ColoredPanel.h b/main/source/ui/ColoredPanel.h
new file mode 100644
index 00000000..c89d5fba
--- /dev/null
+++ b/main/source/ui/ColoredPanel.h
@@ -0,0 +1,38 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: ColoredPanel.h $
+// $Date: 2002/08/16 02:28:55 $
+//
+//-------------------------------------------------------------------------------
+// $Log: ColoredPanel.h,v $
+// Revision 1.3  2002/08/16 02:28:55  Flayra
+// - Added document headers
+//
+//===============================================================================
+#ifndef COLOREDPANEL_H
+#define COLOREDPANEL_H
+
+#include "vgui_Panel.h"
+#include "vgui_Label.h"
+
+class ColoredPanel : public vgui::Panel //public vgui::Label
+{
+public:
+					ColoredPanel();
+					ColoredPanel(int inXPos, int inYPos, int inWidth, int inHeight);
+					
+protected:
+	virtual void	paint();
+	virtual void	paintBackground();
+
+private:
+};
+
+#endif
diff --git a/main/source/ui/DummyPanel.cpp b/main/source/ui/DummyPanel.cpp
new file mode 100644
index 00000000..3cd4fd40
--- /dev/null
+++ b/main/source/ui/DummyPanel.cpp
@@ -0,0 +1,10 @@
+#include "ui/DummyPanel.h"
+
+void DummyPanel::paint()
+{
+    gHUD.ComponentJustPainted(this);
+}
+
+void DummyPanel::paintBackground()
+{
+}
\ No newline at end of file
diff --git a/main/source/ui/DummyPanel.h b/main/source/ui/DummyPanel.h
new file mode 100644
index 00000000..4a45680b
--- /dev/null
+++ b/main/source/ui/DummyPanel.h
@@ -0,0 +1,40 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: DummyPanel.h $
+// $Date: 2002/08/16 02:28:55 $
+//
+//-------------------------------------------------------------------------------
+// $Log: DummyPanel.h,v $
+// Revision 1.2  2002/08/16 02:28:55  Flayra
+// - Added document headers
+//
+//===============================================================================
+#ifndef DUMMYPANEL_H
+#define DUMMYPANEL_H
+
+#include "vgui_Panel.h"
+#include "cl_dll/chud.h"
+#include "ui/FadingImageLabel.h"
+#include "ui/PieNode.h"
+
+class DummyPanel : public vgui::Panel
+{
+public:
+					DummyPanel() {}
+
+protected:
+	// Evil awful hack that must be done :(
+	virtual void	paint();
+	virtual void	paintBackground();
+
+private:
+};
+
+#endif
diff --git a/main/source/ui/FadingImageLabel.cpp b/main/source/ui/FadingImageLabel.cpp
new file mode 100644
index 00000000..132a3700
--- /dev/null
+++ b/main/source/ui/FadingImageLabel.cpp
@@ -0,0 +1,607 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: FadingImageLabel.cpp $
+// $Date: 2002/09/09 19:46:34 $
+//
+//-------------------------------------------------------------------------------
+// $Log: FadingImageLabel.cpp,v $
+// Revision 1.16  2002/09/09 19:46:34  Flayra
+// - Changes to try to make this draw properly in software
+//
+// Revision 1.15  2002/08/31 18:04:32  Flayra
+// - Work at VALVe
+//
+// Revision 1.14  2002/07/23 16:52:59  Flayra
+// - Added support for multiple sprite frames (for pie nodes and max sprite problem), added document headers
+//
+//===============================================================================
+#include "ui/FadingImageLabel.h"
+#include "ui/UIUtil.h"
+#include "util/STLUtil.h"
+
+#include <assert.h>
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+#include "common/const.h"
+#include "common/com_model.h"
+#include "engine/studio.h"
+#include "common/entity_state.h"
+#include "common/cl_entity.h"
+#include "common/dlight.h"
+#include "common/triangleapi.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <memory.h>
+#include <math.h>
+
+#include "cl_dll/studio_util.h"
+#include "cl_dll/r_studioint.h"
+
+#include "cl_dll/StudioModelRenderer.h"
+#include "cl_dll/GameStudioModelRenderer.h"
+
+extern engine_studio_api_t	IEngineStudio;
+
+
+const char* kFrameIndicator = "-frame";
+
+//FadingImageLabel::FadingImageLabel(const char* inImageName, int inX, int inY)/*, int inWidth, int inHeight)*/ : CImageLabel(inImageName, inX, inY, 64, 32), mTextImage("Default text")
+//{
+//    this->Init();
+//}
+
+FadingImageLabel::FadingImageLabel(int inX, int inY)/*, int inWidth, int inHeight)*/ : /*Panel(inX, inY, 64, 32),*/ mTextImage("Default text")
+{
+    this->Init();
+	this->mImageMode = false;
+}
+
+FadingImageLabel::~FadingImageLabel()
+{
+}
+
+void FadingImageLabel::DoPaint()
+{
+	//const float thePercentToChopOffXEdge = .1f;
+	//const float thePercentToChopOffYEdge = 0.0f;
+
+	int theX, theY;
+	this->getPos(theX, theY);
+
+	//if(!IEngineStudio.IsHardware())
+	//{
+	//	theX += ScreenWidth/2;
+	//	theY += ScreenHeight/2;
+	//}
+	
+	int theWidth, theHeight;
+	this->getSize(theWidth, theHeight);
+
+	//ASSERT(this->mVisibleWidth <= theWidth);
+	//ASSERT(this->mVisibleHeight <= theHeight);
+
+	if((this->mVisibleWidth <= theWidth) && (this->mVisibleHeight <= theHeight))
+	{
+		int r, g, b, a;
+		this->getBgColor(r, g, b, a);
+
+		float theGammaSlope = gHUD.GetGammaSlope();
+		r = r/theGammaSlope;
+		g = g/theGammaSlope;
+		b = b/theGammaSlope;
+		
+		// Don't take gamma slope into account for alpha
+		a = 255 - a;
+
+		////int theXBorder = thePercentToChopOffXEdge*ScreenWidth;
+		////int theYBorder = thePercentToChopOffYEdge*ScreenHeight;
+		int theXBorder = (theWidth - this->mVisibleWidth)/2;
+		int theYBorder = (theHeight - this->mVisibleHeight)/2;
+
+		//vguiSimpleBox(theXBorder, theYBorder, theWidth - theXBorder*2 + theXBorder, theHeight - theYBorder*2 + theYBorder, r, g, b, a);
+		
+		if(!this->mImageMode)
+		{
+			//FillRGBA(theXBorder, theYBorder, theWidth - theXBorder*2, theHeight - theYBorder*2, r, g, b, a);
+
+			//int theSprite = Safe_SPR_Load("sprites/marinenode.spr");
+			//DrawScaledHUDSprite(theSprite, kRenderTransAdd, 1, theX, theY, theWidth, theHeight, 0);
+			
+			gEngfuncs.pTriAPI->RenderMode(kRenderTransAlpha);
+			gEngfuncs.pTriAPI->CullFace(TRI_NONE);
+			//gEngfuncs.pTriAPI->Brightness(1);
+			theX = theXBorder;
+			theY = theYBorder;
+			theWidth = theWidth - theXBorder*2;
+			theHeight = theHeight - theYBorder*2;
+
+			// 0 = selectable, valid
+			// 1 = selectable, valid, current
+			// 2 = selectable, invalid
+			// 3 = selectable, invalid, current
+			int theFrame = 0;
+
+			if(this->GetEnabled() && this->GetDrawHighlighted())
+			{
+				theFrame = 1;
+			}
+			else if(!this->GetEnabled())
+			{
+				theFrame = this->GetFadeState() ? 3 : 2;
+			}
+
+			//char theFrameNumber[64];
+			//sprintf(theFrameNumber, "Frame %d", theFrame);
+			//this->mTextImage.setText(theFrameNumber);
+
+			if(!this->mSprite)
+			{
+				this->mSprite = Safe_SPR_Load(this->mImageName.c_str());
+				this->mSpriteWidth = SPR_Width(this->mSprite, this->mSpriteFrame);
+				this->mSpriteHeight = SPR_Height(this->mSprite, this->mSpriteFrame);
+				ASSERT(this->mSprite > 0);
+			}
+			
+			if(this->mSprite && gEngfuncs.pTriAPI->SpriteTexture((struct model_s*)gEngfuncs.GetSpritePointer(this->mSprite), theFrame))
+			{
+				gEngfuncs.pTriAPI->Begin(TRI_TRIANGLE_STRIP);
+			
+				vec3_t theVertex;
+			
+				gEngfuncs.pTriAPI->TexCoord2f(0, 1);
+				theVertex.x = theX;
+				theVertex.y = theY + theHeight;
+				theVertex.z = 0;
+				//gEngfuncs.pTriAPI->Color4ub(255, 255, 255, a);
+				gEngfuncs.pTriAPI->Vertex3fv((float*)&theVertex);
+			
+				gEngfuncs.pTriAPI->TexCoord2f(0, 0);
+				theVertex.x = theX;
+				theVertex.y = theY;
+				//gEngfuncs.pTriAPI->Color4ub(255, 255, 255, a);
+				gEngfuncs.pTriAPI->Vertex3fv((float*)&theVertex);
+			
+				gEngfuncs.pTriAPI->TexCoord2f(1, 1);
+				theVertex.x = theX + theWidth;
+				theVertex.y = theY + theHeight;
+				//gEngfuncs.pTriAPI->Color4ub(255, 255, 255, a);
+				gEngfuncs.pTriAPI->Vertex3fv((float*)&theVertex);
+			
+				gEngfuncs.pTriAPI->TexCoord2f(1, 0);
+				theVertex.x = theX + theWidth;
+				theVertex.y = theY;
+				//gEngfuncs.pTriAPI->Color4ub(255, 255, 255, a);
+				gEngfuncs.pTriAPI->Vertex3fv((float*)&theVertex);
+			
+				gEngfuncs.pTriAPI->End();
+			}
+
+			gEngfuncs.pTriAPI->RenderMode(kRenderNormal);
+		}	
+		else
+		{
+			SPR_Set(this->mSprite, a, a, a);
+			
+			int theSpriteWidth = SPR_Width(this->mSprite, this->mSpriteFrame);
+			int theSpriteHeight = SPR_Height(this->mSprite, this->mSpriteFrame);
+			
+			//SPR_DrawAdditive(theFrame, (theWidth - theSpriteWidth)/2, (theHeight - theSpriteHeight)/2, NULL);
+			SPR_DrawHoles(this->mSpriteFrame, (theWidth - theSpriteWidth)/2, (theHeight - theSpriteHeight)/2, NULL);
+		}
+	}
+}
+
+void FadingImageLabel::FadedIn()
+{
+    Panel::setVisible(true);
+}
+
+void FadingImageLabel::FadedOut()
+{
+    Panel::setVisible(false);
+}
+
+//vgui::Color FadingImageLabel::GetColor() const
+//{
+//    return vgui::Color(255, 255, 255, this->GetValveAlpha());
+//}
+
+void FadingImageLabel::getBgColor(int& r, int& g, int& b, int& a)
+{
+	Panel::getBgColor(r, g, b, a);
+	a = this->GetValveAlpha();
+}
+
+void FadingImageLabel::getBgColor(Color& outColor)
+{
+	Panel::getBgColor(outColor);
+
+	int r, g, b, a;
+	outColor.getColor(r, g, b, a);
+
+	a = this->GetValveAlpha();
+	outColor.setColor(r, g, b, a);
+}
+
+void FadingImageLabel::getContentSize(int& wide, int& tall)
+{
+	if(!this->mImageMode)
+	{
+		this->getTextSize(wide, tall);
+	}
+	else
+	{
+		wide = this->mSpriteWidth;
+		tall = this->mSpriteHeight;
+	}
+}
+
+bool FadingImageLabel::GetDrawHighlighted() const
+{
+	return false;
+}
+
+bool FadingImageLabel::GetEnabled() const
+{
+	return true;
+}
+
+bool FadingImageLabel::GetFadeState() const
+{
+    return this->mFadeToVisibiltyState;
+}
+
+void FadingImageLabel::getTextSize(int& wide,int& tall)
+{
+    int theTextWidth, theTextHeight;
+    this->mTextImage.getTextSize(theTextWidth, theTextHeight);
+
+	wide = theTextWidth;
+	tall = theTextHeight;
+
+	if(this->mSpriteWidth > theTextWidth)
+	{
+		theTextWidth = this->mSpriteWidth;
+	}
+	if(this->mSpriteHeight > theTextHeight)
+	{
+		theTextHeight = this->mSpriteHeight;
+	}
+}
+
+int FadingImageLabel::GetValveAlpha() const
+{
+    return this->mValveAlpha;
+}
+
+void FadingImageLabel::GetVisibleSize(int& outWidth, int& outHeight)
+{
+	outWidth = this->mVisibleWidth;
+	outHeight = this->mVisibleHeight;
+}
+
+void FadingImageLabel::Init()
+{
+    // default time to fade in or out
+    this->mBaseFadeTime = .3f;
+
+    this->mTimeToFade = this->mBaseFadeTime;
+    this->mTimeVisChanged = -1;
+    this->mTimeScalar = 0.0f;
+    this->mMaxAlpha = 1.0f;
+	this->mVisibleWidth = 0;
+	this->mVisibleHeight = 0;
+
+    // this needs to be set to our visibility
+    this->mFadeToVisibiltyState = false;
+	this->mAlwaysDrawText = false;
+
+    // Valve keeps alpha backwards
+    this->mValveAlpha = (this->isVisible() ? 0 : 255);
+
+	this->mImageMode = false;
+	this->mSprite = 0;
+	this->mSpriteWidth = this->mSpriteHeight = 0;
+	this->mSpriteFrame = 0;
+}
+
+void FadingImageLabel::paint()
+{
+    // Calculate current translucency
+    float theAlphaToUse = (this->mFadeToVisibiltyState ? this->mTimeScalar : 1.0f - this->mTimeScalar);
+
+    // Bias in accelerated fashion for dramatic effect (maps to sin(0-pi/2) so it fades fast then slows down)
+    theAlphaToUse = sin(theAlphaToUse*3.141519/2.0f);
+
+    // For some reason Valve thinks alpha of 255 is transparent
+    this->mValveAlpha = 255 - (int)(255.0f*theAlphaToUse);
+
+	//int r, g, b, a;
+	//theColor.getColor(r, g, b, a);
+    //this->setFgColor(r, g, b, a);
+
+    // Set translucency
+    //if(this->m_pTGA)
+    //{
+    //    //this->m_pTGA->setColor(this->GetColor());
+	//	vgui::Color theColor;
+	//	this->getBgColor(theColor);
+    //    //this->setBgColor(theColor);
+    //    this->m_pTGA->setColor(theColor);
+	//
+	//	//int r, g, b, a;
+	//	//theColor.getColor(r, g, b, a);
+    //    //this->setFgColor(r, g, b, a);
+    //}
+    //else
+    //{
+    //    ASSERT(false);
+    //}
+
+	// Figure out whether we're in image mode or not
+
+    this->DoPaint();
+
+    // Draw text on top when faded in (check < 2 in case rounding makes it negative)
+    if((this->mValveAlpha < 2 || this->mAlwaysDrawText) && (!this->mImageMode))
+    {
+		// Fade text out as well
+		Color theColor;
+		this->mTextImage.getColor(theColor);
+
+		int r, g, b, a;
+		theColor.getColor(r, g, b, a);
+		//theColor.setColor(r, g, b, this->mValveAlpha);
+		//this->mTextImage.setColor(theColor);
+        //this->mTextImage.doPaint(this);
+
+		int theX, theY;
+		this->getPos(theX, theY);
+
+		int theWidth, theHeight;
+		this->getSize(theWidth, theHeight);
+        
+        const AvHFont& theFont = gHUD.GetSmallFont();
+		
+        float theTextX = (theWidth - theFont.GetStringWidth(mText.c_str())) / 2;
+        float theTextY = (theHeight - theFont.GetStringHeight()) / 2;
+
+        theFont.DrawString(theTextX, theTextY, mText.c_str(), r, g, b);
+    
+    }
+}
+
+void FadingImageLabel::paintBackground()
+{
+	// Do nothing, we don't draw in our bg color anymore, we only draw in FillRGBA
+	int a = 0;
+}
+
+// Called
+void FadingImageLabel::RecalculateTextPosition()
+{
+	int theLabelWidth, theLabelHeight;
+	this->getSize(theLabelWidth, theLabelHeight);
+
+    int theTextWidth, theTextHeight;
+    this->mTextImage.getTextSize(theTextWidth, theTextHeight);
+
+	// Center text in middle of label
+    if((theTextWidth <= theLabelWidth) && (theTextHeight <= theLabelHeight))
+    {
+        this->mTextImage.setPos(theLabelWidth/2 - theTextWidth/2, theLabelHeight/2 - theTextHeight/2);
+    }
+    // If it can't be centered on image, align with upper left corner
+    else
+    {
+        this->mTextImage.setPos(0, 0);
+    }
+
+	// Center image now
+    //int theImageWidth = this->getImageWide();
+    //int theImageHeight = this->getImageTall();
+	//int theImageX = theLabelWidth/2 - theImageWidth/2;
+	//int theImageY = theLabelHeight/2 - theImageHeight/2;
+	//this->m_pTGA->setPos(theImageX, theImageY);
+}
+
+void FadingImageLabel::SetAlwaysDrawText(bool inState)
+{
+	this->mAlwaysDrawText = inState;
+}
+
+void FadingImageLabel::SetBaseFadeTime(float inSeconds)
+{
+    this->mBaseFadeTime = inSeconds;
+}
+
+void FadingImageLabel::SetFadeState(bool inNewState)
+{
+    // if new state is different
+    if(this->mFadeToVisibiltyState != inNewState)
+    {
+        // set fade to state
+        this->mFadeToVisibiltyState = inNewState;
+
+        float theCurrentTime = ::gHUD.m_flTime;
+
+        // set new fade to time in case a change was specified during a change
+        this->mTimeToFade = min(this->mBaseFadeTime, (theCurrentTime - this->mTimeVisChanged));
+        this->mMaxAlpha = min(1.0f, (theCurrentTime - this->mTimeVisChanged)/this->mBaseFadeTime);
+
+        // remember time that it was set
+        this->mTimeVisChanged = theCurrentTime;
+
+        // if new state is visible, set vgui::Panel::setVisible(true)
+        if(!this->isVisible() && inNewState)
+        {
+            this->FadedIn();
+        }
+    }
+}
+
+void FadingImageLabel::setFont(Scheme::SchemeFont inSchemeFont)
+{
+    this->mTextImage.setFont(inSchemeFont);
+}
+
+void FadingImageLabel::setFont(Font* inFont)
+{
+	ASSERT(inFont != NULL);
+    this->mTextImage.setFont(inFont);
+
+	// Sanity check
+	Font* theFont = this->mTextImage.getFont();
+}
+
+void FadingImageLabel::setPos(int x,int y)
+{
+	// Don't set size smaller than we need for out text though!
+    Panel::setPos(x, y);
+
+    this->RecalculateTextPosition();
+}
+
+void FadingImageLabel::setSize(int wide,int tall)
+{
+    //int theTextWidth, theTextHeight;
+    //this->mTextImage.getTextSize(theTextWidth, theTextHeight);
+	//int theNewWidth = max(wide, theTextWidth);
+	//int theNewHeight = max(tall, theTextHeight);
+    //CImageLabel::setSize(theNewWidth, theNewHeight);
+
+    Panel::setSize(wide, tall);
+    this->RecalculateTextPosition();
+}
+
+void FadingImageLabel::SetSizeKeepCenter(int inWidth, int inHeight)
+{
+	int theX, theY;
+	this->getPos(theX, theY);
+
+	int theOldWidth, theOldHeight;
+	this->getSize(theOldWidth, theOldHeight);
+
+	// Calculate center of label
+	int theCenterX = theX + theOldWidth/2;
+	int theCenterY = theY + theOldHeight/2;
+
+	int theXDiff = (theOldWidth - inWidth)/2;
+	int theYDiff = (theOldHeight - inHeight)/2;
+	this->setSize(inWidth, inHeight);
+
+	this->setPos(theX + theXDiff, theY + theYDiff);
+
+	// Did it work?
+	int theNewX, theNewY;
+	this->getPos(theNewX, theNewY);
+	int theNewCenterX = theNewX + inWidth/2;
+	int theNewCenterY = theNewY + inHeight/2;
+
+	// Does the new center equal the old center?
+	ASSERT(abs(theNewCenterX - theCenterX) <= 1);
+	ASSERT(abs(theNewCenterY - theCenterY) <= 1);
+}
+
+void FadingImageLabel::SetSpriteName(const string& inSpriteName)
+{
+	this->mImageName = inSpriteName;
+}
+
+void FadingImageLabel::setText(const char* inText)
+{
+	//if(this->mSprite == 0)
+	//{
+		if(*inText == '!')
+		{
+			this->mImageMode = true;
+			this->mTextImage.setText("");
+			this->mText = "";
+
+			// If image name has '-frame' in it, then we draw a frame out of the sprite
+			string theImageName = string(inText + 1);
+			int theIndex = theImageName.find(kFrameIndicator);
+			if(theIndex != std::string::npos)
+			{
+				// Parse out frame number
+				string theFrameString = theImageName.substr(theIndex + strlen(kFrameIndicator));
+				this->mSpriteFrame = MakeIntFromString(theFrameString);
+
+				// Set theImageName
+				theImageName = theImageName.substr(0, theIndex);
+			}
+
+			this->SetSpriteName(theImageName);
+		}
+		else
+		{
+			this->mTextImage.setText(inText);
+			this->mText = inText;
+			this->RecalculateTextPosition();
+		}
+	//}
+}
+
+void FadingImageLabel::setVisible(bool inVisibility)
+{
+	Panel::setVisible(inVisibility);
+    this->mValveAlpha = (this->isVisible() ? 0 : 255);
+}
+
+void FadingImageLabel::SetVisibleSize(int inVisWidth, int inVisHeight)
+{
+	int theWidth, theHeight;
+	this->getSize(theWidth, theHeight);
+
+	this->mVisibleWidth = min(inVisWidth, theWidth);
+	this->mVisibleHeight = min(inVisHeight, theHeight);
+}
+
+void FadingImageLabel::setVisibleWithoutFading(bool inNewState)
+{
+    this->mFadeToVisibiltyState = inNewState;
+    this->mTimeToFade = 0.0f;
+
+    Panel::setVisible(inNewState);
+
+    // TODO: Call FadedIn or FadedOut?
+}
+
+void FadingImageLabel::Update(float theCurrentTime)
+{
+    bool theIsVisible = this->isVisible();
+    
+    // if fade-to state different than our current state
+    //if((theIsVisible != this->mFadeToVisibiltyState) && (this->mTimeVisChanged != -1))
+    if(this->mTimeVisChanged != -1)
+    {
+        // set current alpha scalar depending on time since fade invoked
+        this->mTimeScalar = min((theCurrentTime - this->mTimeVisChanged)/this->mTimeToFade, 1);
+        
+        // if fade-to time has passed and we were fading out, set vgui::Panel::setVisible(false);
+        if(!this->mFadeToVisibiltyState && this->mTimeScalar >= 1.0f)
+        {
+            if(theIsVisible)
+            {
+                this->FadedOut();
+            }
+        }
+    }
+}
+
+void FadingImageLabel::VidInit(void)
+{
+	// Can we unload the sprite?
+	this->mSprite = 0;
+	this->mSpriteWidth = this->mSpriteHeight = 0;
+}
+
+
diff --git a/main/source/ui/FadingImageLabel.h b/main/source/ui/FadingImageLabel.h
new file mode 100644
index 00000000..8edc0634
--- /dev/null
+++ b/main/source/ui/FadingImageLabel.h
@@ -0,0 +1,129 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: FadingImageLabel.h $
+// $Date: 2002/08/31 18:04:32 $
+//
+//-------------------------------------------------------------------------------
+// $Log: FadingImageLabel.h,v $
+// Revision 1.12  2002/08/31 18:04:32  Flayra
+// - Work at VALVe
+//
+// Revision 1.11  2002/07/23 16:52:59  Flayra
+// - Added support for multiple sprite frames (for pie nodes and max sprite problem), added document headers
+//
+//===============================================================================
+#ifndef FADINGIMAGELABEL_H
+#define FADINGIMAGELABEL_H
+
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+#include "cl_dll/vgui_TeamFortressViewport.h"
+#include "ui/ReloadableComponent.h"
+#include "ui/FakeTextImage.h"
+
+//class FadingImageLabel : public CImageLabel
+class FadingImageLabel : public Panel, public ReloadableComponent
+{
+public:
+	// It's not an image label anymore until Valve fixes the setColor bug
+	//FadingImageLabel(const char* inImageName, int inX, int inY);//, int inWidth, int inHeight);
+	FadingImageLabel(int inX, int inY);//, int inWidth, int inHeight);
+
+    virtual ~FadingImageLabel();
+
+    virtual void FadedIn();
+
+    virtual void FadedOut();
+
+    //virtual vgui::Color GetColor() const;
+
+	virtual void getContentSize(int& wide,int& tall);
+
+	virtual bool GetDrawHighlighted() const;
+	
+    virtual bool GetEnabled() const;
+
+    virtual bool GetFadeState() const;
+
+	virtual void getBgColor(int& r,int& g,int& b,int& a);
+
+	virtual void getBgColor(Color& color);
+
+	virtual void getTextSize(int& wide,int& tall);
+
+	virtual void GetVisibleSize(int& outWidth, int& outHeight);
+
+	void SetAlwaysDrawText(bool inState);
+
+    void SetBaseFadeTime(float inSeconds);
+
+    virtual void SetFadeState(bool inState);
+
+	virtual void SetSpriteName(const string& inSpriteName);
+
+	virtual void setFont(Scheme::SchemeFont schemeFont);
+
+	virtual void setFont(Font* font);
+
+	virtual void setPos(int x,int y);
+
+	virtual void setSize(int wide,int tall);
+
+	virtual void SetSizeKeepCenter(int wide, int tall);
+
+	virtual void setText(const char* text);
+
+	virtual void setVisible(bool inVisibility);
+
+	virtual void SetVisibleSize(int inVisWidth, int inVisHeight);
+
+    void setVisibleWithoutFading(bool state);
+
+    virtual void Update(float theCurrentTime);
+
+	virtual void VidInit(void);
+
+protected:
+
+    virtual void DoPaint();
+
+    virtual int GetValveAlpha() const;
+
+	virtual void paint();
+
+	virtual void paintBackground();
+
+    virtual void RecalculateTextPosition();
+
+private:
+    void Init();
+
+    FakeTextImage   mTextImage;
+	string			mImageName;
+	string			mText;
+	bool			mImageMode;
+	int				mSprite;
+	int				mSpriteWidth;
+	int				mSpriteHeight;
+
+    float           mMaxAlpha;
+    float           mBaseFadeTime;
+    float           mTimeVisChanged;
+    float           mTimeToFade;
+    float           mTimeScalar;
+    int             mValveAlpha;
+    bool            mFadeToVisibiltyState;
+	bool			mAlwaysDrawText;
+	int				mVisibleWidth;
+	int				mVisibleHeight;
+	int				mSpriteFrame;
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/ui/FakeTextImage.h b/main/source/ui/FakeTextImage.h
new file mode 100644
index 00000000..2a52e97a
--- /dev/null
+++ b/main/source/ui/FakeTextImage.h
@@ -0,0 +1,38 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: FakeTextLabel.h $
+// $Date: $
+//
+//-------------------------------------------------------------------------------
+// $Log: $
+//===============================================================================
+#ifndef FAKETEXTIMAGE_H
+#define FAKETEXTIMAGE_H
+
+#include "VGUI_TextImage.h"
+
+class FakeTextImage : public TextImage
+{
+public:
+	FakeTextImage(const char* text) : TextImage(text) {}
+
+	virtual void  setFont(vgui::Scheme::SchemeFont schemeFont)
+	{
+		TextImage::setFont(schemeFont);
+	}
+
+	virtual void  setFont(vgui::Font* font)
+	{
+		ASSERT(font != NULL);
+		TextImage::setFont(font);
+	}
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/ui/GammaAwareComponent.h b/main/source/ui/GammaAwareComponent.h
new file mode 100644
index 00000000..60118d19
--- /dev/null
+++ b/main/source/ui/GammaAwareComponent.h
@@ -0,0 +1,29 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: GammaAwareComponent.h $
+// $Date: 2002/08/16 02:28:55 $
+//
+//-------------------------------------------------------------------------------
+// $Log: GammaAwareComponent.h,v $
+// Revision 1.2  2002/08/16 02:28:55  Flayra
+// - Added document headers
+//
+//===============================================================================
+#ifndef GAMMAAWARECOMPONENT_H
+#define GAMMAAWARECOMPONENT_H
+
+class GammaAwareComponent
+{
+public:
+	virtual void NotifyGammaChange(float inGammaSlope) = 0;
+	
+};
+
+#endif
diff --git a/main/source/ui/InvisiblePanel.cpp b/main/source/ui/InvisiblePanel.cpp
new file mode 100644
index 00000000..0a69b2cf
--- /dev/null
+++ b/main/source/ui/InvisiblePanel.cpp
@@ -0,0 +1,35 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: InvisiblePanel.cpp $
+// $Date: 2002/08/16 02:28:55 $
+//
+//-------------------------------------------------------------------------------
+// $Log: InvisiblePanel.cpp,v $
+// Revision 1.2  2002/08/16 02:28:55  Flayra
+// - Added document headers
+//
+//===============================================================================
+#include "ui/InvisiblePanel.h"
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+
+// Used for mouse input and general purpose
+InvisiblePanel::InvisiblePanel()
+{
+}
+
+void InvisiblePanel::paint()
+{
+}
+
+void InvisiblePanel::paintBackground()
+{
+}
+
diff --git a/main/source/ui/InvisiblePanel.h b/main/source/ui/InvisiblePanel.h
new file mode 100644
index 00000000..2aef895d
--- /dev/null
+++ b/main/source/ui/InvisiblePanel.h
@@ -0,0 +1,36 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: InvisiblePanel.h $
+// $Date: 2002/08/16 02:28:55 $
+//
+//-------------------------------------------------------------------------------
+// $Log: InvisiblePanel.h,v $
+// Revision 1.2  2002/08/16 02:28:55  Flayra
+// - Added document headers
+//
+//===============================================================================
+#ifndef INVISIBLEPANEL_H
+#define INVISIBLEPANEL_H
+
+#include "vgui_Panel.h"
+
+class InvisiblePanel : public vgui::Panel
+{
+public:
+					InvisiblePanel();
+
+protected:
+	virtual void	paint();
+	virtual void	paintBackground();
+
+private:
+};
+
+#endif
diff --git a/main/source/ui/LabelButton.h b/main/source/ui/LabelButton.h
new file mode 100644
index 00000000..fee80013
--- /dev/null
+++ b/main/source/ui/LabelButton.h
@@ -0,0 +1,41 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: LabelButton.h $
+// $Date: 2002/08/16 02:28:55 $
+//
+//-------------------------------------------------------------------------------
+// $Log: LabelButton.h,v $
+// Revision 1.2  2002/08/16 02:28:55  Flayra
+// - Added document headers
+//
+//===============================================================================
+#ifndef LABELBUTTON_H
+#define LABELBUTTON_H
+
+#include "vgui_Label.h"
+
+class LabelButton : public vgui::Label
+{
+public:
+					LabelButton(const char* text,int x,int y,int wide,int tall) : mOriginalWidth(wide), mOriginalHeight(tall), Label(text, x, y, wide, tall)
+					{
+					}
+	
+	virtual void	setSize(int wide,int tall)
+					{
+						Label::setSize(this->mOriginalWidth, this->mOriginalHeight);
+					}
+
+private:
+	int				mOriginalWidth;
+	int				mOriginalHeight;
+};
+
+#endif
diff --git a/main/source/ui/MarqueeComponent.cpp b/main/source/ui/MarqueeComponent.cpp
new file mode 100644
index 00000000..681f67f6
--- /dev/null
+++ b/main/source/ui/MarqueeComponent.cpp
@@ -0,0 +1,114 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: MarqueeComponent.cpp $
+// $Date: 2002/08/16 02:28:55 $
+//
+//-------------------------------------------------------------------------------
+// $Log: MarqueeComponent.cpp,v $
+// Revision 1.6  2002/08/16 02:28:55  Flayra
+// - Added document headers
+//
+//===============================================================================
+#include "ui/MarqueeComponent.h"
+#include "ui/UIUtil.h"
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+
+MarqueeComponent::MarqueeComponent()
+{
+	this->mX0 = this->mY0 = 0;
+	this->mX1 = this->mY1 = 0;
+	this->mGammaSlope = 1.0f;
+
+	// Default color scheme
+	this->setFgColor(0, 255, 0, 0);
+	this->setBgColor(0, 255, 0, 230);
+}
+
+void MarqueeComponent::NotifyGammaChange(float inGammaSlope)
+{
+	this->mGammaSlope = inGammaSlope;
+}
+
+void MarqueeComponent::paint()
+{
+	// Draw outline
+	int r, g, b, a;
+	this->getFgColor(r, g, b, a);
+	
+	int theXPos, theYPos;
+	this->getPos(theXPos, theYPos);
+	
+	int theWidth, theHeight;
+	this->getSize(theWidth, theHeight);
+
+	//vguiSimpleBox(0, 0, theWidth, theHeight, r/this->mGammaSlope, g/this->mGammaSlope, b/this->mGammaSlope, a/this->mGammaSlope);
+	vguiSimpleBox(0, 0, theWidth, theHeight, r/this->mGammaSlope, g/this->mGammaSlope, b/this->mGammaSlope, a);
+
+	// Top
+//	vguiSimpleLine(0, 0, theWidth, 0, r, g, b, a);
+//
+//	// Left
+//	vguiSimpleLine(0, 1, 0, theHeight, r, g, b, a);
+//
+//	// Right
+//	vguiSimpleLine(theWidth, 1, theWidth, theHeight, r, g, b, a);
+//
+//	// Bottom
+//	vguiSimpleLine(1, theHeight, theWidth, theHeight, r, g, b, a);
+}
+
+void MarqueeComponent::paintBackground()
+{
+	int r, g, b, a;
+	this->getBgColor(r, g, b, a);
+
+	int theXPos, theYPos;
+	this->getPos(theXPos, theYPos);
+
+	int theWidth, theHeight;
+	this->getSize(theWidth, theHeight);
+
+	//FillRGBA(0, 0, theWidth, theHeight, r/this->mGammaSlope, g/this->mGammaSlope, b/this->mGammaSlope, a/this->mGammaSlope);
+	FillRGBA(0, 0, theWidth, theHeight, r/this->mGammaSlope, g/this->mGammaSlope, b/this->mGammaSlope, a);
+}
+
+void MarqueeComponent::ResetDimensions()
+{
+	int theMinX = min(this->mX0, this->mX1);
+	int theMinY = min(this->mY0, this->mY1);
+
+	int theMaxX = max(this->mX0, this->mX1);
+	int theMaxY = max(this->mY0, this->mY1);
+
+	int theWidth = theMaxX - theMinX;
+	int theHeight = theMaxY - theMinY;
+
+	ASSERT(theWidth >= 0);
+	ASSERT(theHeight >= 0);
+
+	this->setPos(theMinX, theMinY);
+	this->setSize(theWidth, theHeight);
+}
+
+void MarqueeComponent::SetStartPos(int inX, int inY)
+{
+	this->mX0 = inX;
+	this->mY0 = inY;
+	this->ResetDimensions();
+}
+
+void MarqueeComponent::SetEndPos(int inX, int inY)
+{
+	this->mX1 = inX;
+	this->mY1 = inY;
+	this->ResetDimensions();
+}
+
diff --git a/main/source/ui/MarqueeComponent.h b/main/source/ui/MarqueeComponent.h
new file mode 100644
index 00000000..f652da53
--- /dev/null
+++ b/main/source/ui/MarqueeComponent.h
@@ -0,0 +1,45 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: MarqueeComponent.h $
+// $Date: 2002/08/16 02:28:55 $
+//
+//-------------------------------------------------------------------------------
+// $Log: MarqueeComponent.h,v $
+// Revision 1.3  2002/08/16 02:28:55  Flayra
+// - Added document headers
+//
+//===============================================================================
+#ifndef MARQUEECOMPONENT_H
+#define MARQUEECOMPONENT_H
+
+#include "vgui_Panel.h"
+#include "ui/GammaAwareComponent.h"
+
+class MarqueeComponent : public vgui::Panel, public GammaAwareComponent
+{
+public:
+					MarqueeComponent();
+	virtual void	NotifyGammaChange(float inGammaSlope);
+	void			SetStartPos(int inX, int inY);
+	void			SetEndPos(int inX, int inY);
+	
+protected:
+	virtual void	paint();
+	virtual void	paintBackground();
+
+private:
+	void			ResetDimensions();
+	int				mX0, mY0;
+	int				mX1, mY1;
+
+	float			mGammaSlope;
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/ui/PieMenu.cpp b/main/source/ui/PieMenu.cpp
new file mode 100644
index 00000000..300f7637
--- /dev/null
+++ b/main/source/ui/PieMenu.cpp
@@ -0,0 +1,213 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: PieMenu.cpp $
+// $Date: 2002/08/31 18:04:32 $
+//
+//-------------------------------------------------------------------------------
+// $Log: PieMenu.cpp,v $
+// Revision 1.13  2002/08/31 18:04:32  Flayra
+// - Work at VALVe
+//
+// Revision 1.12  2002/08/16 02:29:19  Flayra
+// - Added document headers
+// - Started to add support for pie nodes with both images and text
+//
+//===============================================================================
+#include "util/nowarnings.h"
+#include "ui/PieMenu.h"
+#include "ui/PieNode.h"
+#include "cl_dll/cl_util.h"
+#include "cl_dll/vgui_int.h"
+using vgui::Panel;
+
+const string PieMenuType("PieMenu");
+
+PieMenu::PieMenu(const string& inRootName, int x,int y, int wide, int tall) : vgui::Panel(x, y, wide, tall)
+{
+	// Hard-code node distance to something "reasonable", hopefully it will be specified in ui.txt
+    this->mNodeList = new PieNodeList(inRootName, .18f);
+    this->mNodeList->GetRoot()->setParent(this);
+    this->addChild(this->mNodeList->GetRoot());
+    this->mFont = NULL;
+}
+
+PieMenu::~PieMenu()
+{
+    delete this->mNodeList;
+}
+
+void PieMenu::AddInputSignalForNodes(InputSignal* s)
+{
+    Panel::addInputSignal(s);
+
+    this->mNodeList->AddInputSignalForNodes(s);
+}
+
+bool PieMenu::AddNode(const string& inNodeString)
+{
+    bool theSuccess = true;
+
+    // Build new node using passed in string, use this->mPieNodeTarga as the image name
+    // Tell node that this pie menu is its parent
+    // Register pie menu input signal with it
+    // Add it to list
+
+	Color theFGColor;
+	this->getFgColor(theFGColor);
+
+	Color theBGColor;
+	this->getBgColor(theBGColor);
+
+    this->mNodeList->AddNode(inNodeString, this->mFont, theBGColor, theFGColor, this->mDefaultImage);
+
+    return theSuccess;
+}
+
+void PieMenu::ChangeNode(int inMessageID, int inNewMessageID, const string& inNewText)
+{
+	this->mNodeList->ChangeNode(inMessageID, inNewMessageID, inNewText);
+}
+
+void PieMenu::DisableNodesWhoseChildrenAreDisabled()
+{
+	this->mNodeList->DisableNodesWhoseChildrenAreDisabled();
+}
+
+PieNode* PieMenu::GetRootNode(void)
+{
+    return this->mNodeList->GetRoot();
+}
+
+bool PieMenu::GetSelectedNode(PieNode*& outNode)
+{
+	return this->mNodeList->GetSelectedNode(outNode);
+}
+
+void PieMenu::mouseReleased(MouseCode code, Panel* panel)
+{
+    // TODO:
+    // Cast panel to a PieNode
+    // Get the pie node name
+    // Trigger an event from it
+}
+
+// don't draw anything, nodes will draw instead
+//void PieMenu::paint()
+//{
+//    Panel::paint();
+//
+//}
+
+void PieMenu::paintBackground()
+{
+//    Panel::paintBackground();
+}
+
+void PieMenu::RecomputeVisibleSize(void)
+{
+	this->mNodeList->RecomputeVisibleSize();
+    
+	//// Recalculate base position, because root node probably just changed size to the
+	//// size of the biggest node we have
+    //int thePieX, thePieY;
+    //this->getPos(thePieX, thePieY);
+	//
+	//int thePieWidth, thePieHeight;
+    //this->getSize(thePieWidth, thePieHeight);
+	//
+    //this->mNodeList->SetBasePosition(thePieX, thePieY, thePieWidth, thePieHeight);
+}
+
+void PieMenu::ResetToDefaults()
+{
+	this->mNodeList->ResetToDefaults();
+}
+
+void PieMenu::NotifyGammaChange(float inGammaSlope)
+{
+	// TODO: Adjust font color?
+	this->mNodeList->GetRoot()->SetColorBias(1.0f/inGammaSlope);
+}
+
+void PieMenu::SetConnectorName(const string& inConnectorName)
+{
+	this->mNodeList->SetConnectorName(inConnectorName);
+}
+
+void PieMenu::SetConstructionComplete()
+{
+    this->mNodeList->SetConstructionComplete();
+}
+
+void PieMenu::SetDefaultImage(const string& inDefaultImage)
+{
+	this->mDefaultImage = inDefaultImage;
+	this->GetRootNode()->SetDefaultImage(inDefaultImage);
+}
+
+void PieMenu::SetFont(Font* inFont)
+{
+    this->mFont = inFont;
+}
+
+void PieMenu::SetNodeDistance(float inNewXDistance, float inNewYDistance)
+{
+    this->mNodeList->SetNodeDistance(inNewXDistance, inNewYDistance);
+}
+
+//void PieMenu::SetNodeTargaName(const string& inTarga)
+//{
+//    this->mPieNodeTarga = inTarga;
+//}
+
+// Set our own position, but also tell pie node list
+void PieMenu::setPos(int x, int y)
+{
+    Panel::setPos(x, y);
+
+    int thePieWidth, thePieHeight;
+    this->getSize(thePieWidth, thePieHeight);
+    this->mNodeList->SetBasePosition(x, y, thePieWidth, thePieHeight);
+}
+
+void PieMenu::setSize(int wide, int tall)
+{
+    Panel::setSize(wide, tall);
+
+    int thePieX, thePieY;
+    this->getPos(thePieX, thePieY);
+    this->mNodeList->SetBasePosition(thePieX, thePieY, wide, tall);
+}
+
+void PieMenu::SetFadeState(bool inNewVisState)
+{
+    //Panel::setVisible(inNewVisState);
+
+    this->mNodeList->SetFadeState(inNewVisState);
+}
+
+
+// update
+void PieMenu::Update(float theCurrentTime)
+{
+    // Tell all nested components to Update
+    this->mNodeList->Update(theCurrentTime);
+}
+
+void PieMenu::UpdateMenuFromTech(const AvHTechNodes& inMenuCosts, int inPurchaselevel)
+{
+	this->mNodeList->UpdateMenuFromTech(inMenuCosts, inPurchaselevel);
+}
+
+void PieMenu::VidInit()
+{
+	this->mNodeList->VidInit();
+}
+
diff --git a/main/source/ui/PieMenu.h b/main/source/ui/PieMenu.h
new file mode 100644
index 00000000..4a6e41fb
--- /dev/null
+++ b/main/source/ui/PieMenu.h
@@ -0,0 +1,114 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: PieMenu.h $
+// $Date: 2002/08/16 02:29:19 $
+//
+//-------------------------------------------------------------------------------
+// $Log: PieMenu.h,v $
+// Revision 1.10  2002/08/16 02:29:19  Flayra
+// - Added document headers
+// - Started to add support for pie nodes with both images and text
+//
+//===============================================================================
+#ifndef PIEMENU_H
+#define PIEMENU_H
+
+#include "VGUI_Panel.h"
+#include "VGUI_Font.h"
+#include "vector"
+#include "string"
+#include "cl_dll/chud.h"
+#include "ui/FadingImageLabel.h"
+#include "ui/PieNode.h"
+#include "ui/GammaAwareComponent.h"
+#include "ui/ReloadableComponent.h"
+
+using std::string;
+using vgui::Font;
+
+class PieMenu : public vgui::Panel, public ReloadableComponent, public GammaAwareComponent
+{
+public:
+    PieMenu(const string& inRootName, int x, int y, int wide, int tall);
+    virtual ~PieMenu();
+
+    // Adds an input signal to our nodes, not ourself.  Use this method to find out
+    // when the mouse has been released over a node.  After calling this, the input signal
+    // functions should only be called passing PieNodes as parameters, so cast them and
+    // call GetNodeName() to determine action to perform.
+	void AddInputSignalForNodes(InputSignal* s);
+
+    bool AddNode(const string& inNodeString);
+
+	void ChangeNode(int inMessageID, int inNewMessageID, const string& inNewText);
+
+	void DisableNodesWhoseChildrenAreDisabled();
+
+    PieNode* GetRootNode(void);
+
+	bool GetSelectedNode(PieNode*& outNode);
+
+    // Called when mouse released over one of our child image labels.  This
+    // is how it determines which item was selected.
+    virtual void mouseReleased(MouseCode code, Panel* panel);
+
+	virtual void NotifyGammaChange(float inGammaSlope);
+	
+	void RecomputeVisibleSize(void);
+
+	void ResetToDefaults();
+
+    void SetConnectorName(const string& inConnectorName);
+
+    void SetConstructionComplete();
+
+	void SetDefaultImage(const string& inDefaultImage);
+
+    void SetFont(Font* inFont);
+
+    void SetNodeDistance(float inNewXDistance, float inNewYDistance);
+
+    // Looks for node and sets its enabled state.  It changes how it draws accordingly.
+	bool SetNodeEnabled(const string& inNodeName, bool inNewState);
+
+    void SetNodeTargaName(const string& inTarga);
+
+	virtual void setPos(int x,int y);
+
+	virtual void setSize(int wide,int tall);
+
+    void SetTolerance(int inPercentage);
+
+    // Override so we can determine how long it has been open 
+	virtual void SetFadeState(bool state);
+
+    void Update(float theCurrentTime);
+
+	void UpdateMenuFromTech(const AvHTechNodes& inMenuCosts, int inPurchaselevel);
+
+	void VidInit();
+
+protected:
+
+    // Override these to do nothing.  The only thing to be drawn is our pie nodes.
+	//virtual void paint();
+	virtual void paintBackground();
+
+private:
+    PieNodeList*            mNodeList;
+
+    Font*                   mFont;
+
+	string					mDefaultImage;
+
+};
+
+
+#endif
diff --git a/main/source/ui/PieNode.cpp b/main/source/ui/PieNode.cpp
new file mode 100644
index 00000000..f3718ac8
--- /dev/null
+++ b/main/source/ui/PieNode.cpp
@@ -0,0 +1,1422 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: PieNode.cpp $
+// $Date: 2002/08/31 18:04:32 $
+//
+//-------------------------------------------------------------------------------
+// $Log: PieNode.cpp,v $
+// Revision 1.18  2002/08/31 18:04:32  Flayra
+// - Work at VALVe
+//
+// Revision 1.17  2002/08/16 02:29:19  Flayra
+// - Added document headers
+// - Started to add support for pie nodes with both images and text
+//
+// Revision 1.16  2002/07/08 16:18:52  Flayra
+// - Tried to turn off mouse capture so menu can be binded to keyboard and mouse properly
+//
+//===============================================================================
+#include "ui/PieNode.h"
+#include "util/Tokenizer.h"
+#include "cl_dll/vgui_int.h"
+#include "ui/UIUtil.h"
+
+const float kTwoPI = 2.0f*3.141519f;
+int PieNode::mDegrees[kNumNodes] = {90, 135, 180, 225, 270, 315, 0, 45};
+PieNode* gNodeToTrack = NULL;
+const int kDarkGreenColor = 130;
+const int kDisabledColorComponent = 180;
+
+PieNode::PieNode(const string& inNodeString, int inMessageID) : FadingImageLabel(0, 0) //, 640, 480)
+{
+    memset(this->mArray, 0, kNumNodes*sizeof(PieNode*));
+	this->mBaseText = inNodeString;
+	this->mPointCost = 0;
+    this->setText(inNodeString.c_str());
+    this->mNodeName = inNodeString;
+    this->mParentPieNode = NULL;
+    this->mMessageID = inMessageID;
+    this->mDrawSelected = false;
+	this->setVisible(false);
+	this->mEnabled = true;
+	this->mColorBias = 1.0f;
+	
+	this->ComputeAndSetLocalizedText();
+
+	// Save defaults for resetting back to
+	this->mDefaultText = this->mBaseText;
+	this->mDefaultID = this->mMessageID;
+	this->mConnectorSprite = 0;
+
+    //this->SetFadeState(false);
+}
+
+PieNode::~PieNode()
+{
+    for(int i = 0; i < kNumNodes; i++)
+    {
+        delete this->mArray[i];
+        this->mArray[i] = NULL;
+    }
+}
+
+void PieNode::AddInputSignalForNodes(InputSignal* s)
+{
+    FadingImageLabel::addInputSignal(s);
+
+    for(int i = 0; i < kNumNodes; i++)
+    {
+        PieNode* theCurrentPieNode = this->mArray[i];
+        if(theCurrentPieNode)
+        {
+            theCurrentPieNode->AddInputSignalForNodes(s);
+        }
+    }
+}
+
+bool PieNode::AttachNode(PieNode* inNode, int inAngularOffset, float inNodeXDistance, float inNodeYDistance)
+{
+    bool theSuccess = false;
+
+    if((inAngularOffset >= 0) && (inAngularOffset < kNumNodes))
+    {
+        if(this->mArray[inAngularOffset] == NULL)
+        {
+            this->mArray[inAngularOffset] = inNode;
+
+            inNode->SetPosFromOffset(inAngularOffset, inNodeXDistance, inNodeYDistance);
+
+            //this->addChild(inNode);
+            
+            //inNode->setParent(this);
+
+            inNode->mParentPieNode = this;
+            
+            theSuccess = true;
+        }
+    }
+
+    return theSuccess;
+}
+
+void PieNode::ChangeNode(int inMessageID, int inNewMessageID, const string& inNewText)
+{
+	if(this->mMessageID == inMessageID)
+	{
+		this->mMessageID = inNewMessageID;
+		if(inNewText != "")
+		{
+			this->mBaseText = inNewText;
+			this->ComputeAndSetLocalizedText();
+		}
+	}
+    for(int i = 0; i < kNumNodes; i++)
+    {
+        PieNode* theCurrentPieNode = this->mArray[i];
+        if(theCurrentPieNode)
+        {
+			theCurrentPieNode->ChangeNode(inMessageID, inNewMessageID, inNewText);
+		}
+	}
+}
+
+void PieNode::ChangeNode(int inNewMessageID, const string& inNewText)
+{
+	this->mMessageID = inNewMessageID;
+	if(inNewText != "")
+	{
+		this->mBaseText = inNewText;
+		this->ComputeAndSetLocalizedText();
+	}
+}
+
+
+void PieNode::ComputeAndSetLocalizedText()
+{
+	string theString = this->mBaseText;
+
+	char theLocalizedString[128];
+	if(CHudTextMessage::LocaliseTextString(theString.c_str(), theLocalizedString, 128))
+	{
+		// Remove newlines and junk
+		for(int i = 0; i < 128; i++)
+		{
+			char theCurrentChar = theLocalizedString[i];
+			if((theCurrentChar == '\n') || (theCurrentChar == '\r'))
+			{
+				theLocalizedString[i] = '\0';
+				break;
+			}
+		}
+		theString = theLocalizedString;
+	}
+
+	// Save it
+	this->mLocalizedText = theString;
+	this->setText(theString.c_str());
+}
+
+void PieNode::DisableNodesNotInMessageList(const MessageIDList& inList)
+{
+	this->mEnabled = false;
+
+	// If node is in list, enable it
+	MessageIDList::const_iterator theFindIter = std::find(inList.begin(), inList.end(), this->mMessageID);
+	if(theFindIter != inList.end())
+	{
+		this->mEnabled = true;
+	}
+
+	// Call recursively on children
+    for(int i = 0; i < kNumNodes; i++)
+    {
+        PieNode* theCurrentPieNode = this->mArray[i];
+        if(theCurrentPieNode)
+        {
+			theCurrentPieNode->DisableNodesNotInMessageList(inList);
+		}
+	}
+}
+
+void PieNode::DisableNodesWhoseChildrenAreDisabled()
+{
+    for(int i = 0; i < kNumNodes; i++)
+    {
+        PieNode* theCurrentPieNode = this->mArray[i];
+        if(theCurrentPieNode)
+        {
+			theCurrentPieNode->DisableNodesWhoseChildrenAreDisabled();
+		}
+	}
+
+	// Now disable ourself we have children and they are all disabled
+	bool theHasChildren = false;
+	bool theHasEnabledChild = false;
+
+    for(i = 0; i < kNumNodes; i++)
+    {
+        PieNode* theCurrentPieNode = this->mArray[i];
+        if(theCurrentPieNode)
+        {
+			theHasChildren = true;
+			if(theCurrentPieNode->GetEnabled())
+			{
+				theHasEnabledChild = true;
+				break;
+			}
+		}
+	}
+
+	if(theHasChildren && !theHasEnabledChild)
+	{
+		this->mEnabled = false;
+	}
+}
+
+//vgui::Color PieNode::GetColor() const
+//{
+//    return vgui::Color(0, (this->GetDrawSelected() ? 255 : kDarkGreenColor), 0, this->GetValveAlpha());
+//    //return vgui::Color(0, kDarkGreenColor, 0, this->GetValveAlpha());
+//}
+
+void PieNode::getBgColor(int& r, int& g,int& b, int& a)
+{
+	Color theColor;
+	this->getBgColor(theColor);
+
+	theColor.getColor(r, g, b, a);
+}
+
+void PieNode::getBgColor(Color& outColor)
+{
+	Color theBGColor;
+	FadingImageLabel::getBgColor(theBGColor);
+
+	if(this->mEnabled)
+	{
+		if(this->mDrawSelected)
+		{
+			// Brighten color slightly
+			int theR, theG, theB, theA;
+			theBGColor.getColor(theR, theG, theB, theA);
+
+			float theScalar = 1.4f;
+			theBGColor.setColor(min(theScalar*theR, 255), min(theScalar*theG, 255), min(theScalar*theB, 255), theA);
+		}
+	}
+	else
+	{
+		int theR, theG, theB, theA;
+		theBGColor.getColor(theR, theG, theB, theA);
+
+		theBGColor.setColor(kDisabledColorComponent, kDisabledColorComponent, kDisabledColorComponent, theA);
+	}
+
+	outColor = theBGColor;
+}
+
+// Override and provide no behavior so node visibility isn't changed.  This is needed so
+// the node can still receive input signal events and be faded in when the mouse moves
+// over it
+//void PieNode::FadedIn()
+//{
+//}
+
+//void PieNode::FadedOut()
+//{
+//}
+
+bool PieNode::GetDrawHighlighted() const
+{
+	return this->GetDrawSelected();
+}
+
+bool PieNode::GetDrawSelected() const
+{
+    return this->mDrawSelected;
+}
+
+bool PieNode::GetEnabled() const
+{
+	return this->mEnabled;
+}
+
+bool PieNode::GetHasChild(const PieNode* inNode) const
+{
+    bool theHasChild = false;
+
+    for(int i = 0; i < kNumNodes; i++)
+    {
+        if(this->mArray[i] == inNode)
+        {
+            theHasChild = true;
+            break;
+        }
+    }
+
+    return theHasChild;
+}
+
+bool PieNode::GetIsAbove(const PieNode* inNode) const
+{
+    bool thisIsAbove = false;
+
+    const PieNode* thePieNode = inNode;
+
+    while(thePieNode != NULL)
+    {
+        if(thePieNode == this)
+        {
+            thisIsAbove = true;
+            break;
+        }
+        else
+        {
+            thePieNode = thePieNode->mParentPieNode;
+        }
+    }
+
+    return thisIsAbove;
+}
+
+int PieNode::GetMessageID() const
+{
+    return this->mMessageID;
+}
+
+PieNode* PieNode::GetNodeAtAngularOffset(int inAngularOffset)
+{
+    PieNode* thePieNode = NULL;
+
+    if((inAngularOffset >= 0) && (inAngularOffset < kNumNodes))
+    {
+        thePieNode = this->mArray[inAngularOffset];
+    }
+
+    return thePieNode;
+}
+
+const string& PieNode::GetNodeName() const
+{
+    return this->mNodeName;
+}
+
+int PieNode::GetPointCost() const
+{
+	return this->mPointCost;
+}
+
+PieNode* PieNode::GetRoot()
+{
+    PieNode* theRoot = this;
+
+    while(theRoot->mParentPieNode != NULL)
+    {
+        theRoot = theRoot->mParentPieNode;
+    }
+
+    return theRoot;
+}
+
+bool PieNode::HasChildren(void) const
+{
+    bool theHasChildren = false;
+
+    for(int i = 0; i < kNumNodes; i++)
+    {
+        PieNode* theCurrentPieNode = this->mArray[i];
+        if(theCurrentPieNode)
+        {
+            theHasChildren = true;
+            break;
+        }
+    }
+    return theHasChildren;
+}
+
+bool PieNode::HighlightNode(void)
+{
+    bool theSuccess = false;
+
+    // Only valid if parent is NULL, or parent is already selected
+    // This prevents selecting from the edge, you must follow track
+    //if(!this->mParentPieNode || this->mParentPieNode->GetFadeState())
+    //{
+        // Get root then set all of it's children as faded out
+        PieNode* theRoot = this->GetRoot();
+        theRoot->SetNodeAndAllChildrenFadeState(false);
+        theRoot->SetFadeState(true);
+        
+        // For each non-root parent, set it's fade out state to true
+        PieNode* theCurrentPieNode = this->mParentPieNode;
+        while(theCurrentPieNode && (theCurrentPieNode != theRoot))
+        {
+            theCurrentPieNode->SetFadeState(true);
+            theCurrentPieNode = theCurrentPieNode->mParentPieNode;
+        }
+        
+        // Set self and adjacent children to fade in
+        // If there are no nodes below us, parent node and its adjacents (comment
+        // this out if you don't believe it looks better)
+        PieNode* theBottomFullNode = /*this->HasChildren() ?*/ this/* : this->mParentPieNode*/;
+        if(theBottomFullNode)
+        {
+            theBottomFullNode->SetNodeAndAdjacentChildrenFadeState(true);
+        }
+
+        theSuccess = true;
+    //}
+
+	this->setAsMouseCapture(false);
+		
+    return theSuccess;
+}
+
+bool PieNode::IsAdjacentTo(const PieNode* inNode)
+{
+    bool isAdjacent = false;
+
+    if(inNode == this->mParentPieNode)
+    {
+        isAdjacent = true;
+    }
+    else
+    {
+        isAdjacent = this->GetHasChild(inNode);
+
+        // Check siblings
+        if(!isAdjacent && (this->mParentPieNode))
+        {
+            isAdjacent = this->mParentPieNode->GetHasChild(inNode);
+        }
+    }
+
+    return isAdjacent;
+}
+
+bool PieNode::IsChildOf(const PieNode* inNode)
+{
+    bool isChild = false;
+
+    if(inNode && (inNode == this->mParentPieNode))
+    {
+        isChild = true;
+    }
+
+    return isChild;
+}
+
+bool PieNode::isVisible()
+{
+    //return (this->GetValveAlpha() < 255);
+    return FadingImageLabel::isVisible();
+}
+
+// Important: Assumes both pie nodes are the same size
+// The first coords it returns are the start of the connector, relative to this node
+// The second coords it returns are the end of the connector (designated by inChildPieNode), relative to this node
+bool PieNode::ComputeRelativeConnectorCoordinates(PieNode* inChildPieNode, int& theOutX0, int& theOutY0, int& theOutX1, int& theOutY1)
+{
+    ASSERT(this != inChildPieNode);
+
+    // Check position of dest pie node relative to us
+    bool theSuccess = false;
+
+    int x0, y0;
+    this->getPos(x0, y0);
+
+    int x1, y1;
+    inChildPieNode->getPos(x1, y1);
+
+    int theFirstQuadrant, theSecondQuadrant;
+    int theDX = x1 - x0;
+    int theDY = y1 - y0;
+    
+    // directly above/below or left/right
+    if((theDX == 0) || (theDY == 0))
+    {
+        if(theDY == 0)
+        {
+            // If left
+            if(x1 < x0)
+            {
+                // x0/y0 -> left edge
+                theFirstQuadrant = 2;
+                // x1/y1 -> right edge
+                theSecondQuadrant = 6;
+            }
+            // If right
+            else
+            {
+                // x0/y0 -> right edge
+                theFirstQuadrant = 6;
+                // x1/y1 -> left edge
+                theSecondQuadrant = 2;
+            }
+        }
+        else
+        {
+            // If below
+            if(y1 > y0)
+            {
+                // x0/y0 -> bottom edge
+                theFirstQuadrant = 4;
+                // x1/y1 -> top edge
+                theSecondQuadrant = 0;
+            }
+            // If above
+            else
+            {
+                // x0/y0 -> top edge
+                theFirstQuadrant = 0;
+                // x1/y1 -> bottom edge
+                theSecondQuadrant = 4;
+            }
+        }
+        theSuccess = true;
+    }
+    // otherwise draw from middle of nearest edge (not required yet)
+    //else
+    //{
+    //    ASSERT(false);
+    //}
+    
+    //ASSERT(theSuccess);
+
+	//  Don't draw lines if we failed above
+    if(theSuccess)
+	{
+		// Now compute the coords relative to each
+	    //this->GetCenteredCoordinatesFromQuadrant(theFirstQuadrant, 0, 0, theOutX0, theOutY0);
+		//this->GetCenteredCoordinatesFromQuadrant(theSecondQuadrant, theDX, theDY, theOutX1, theOutY1);
+	    this->GetCenteredCoordinatesFromQuadrant(theFirstQuadrant, theOutX0, theOutY0);
+		//this->GetCenteredCoordinatesFromQuadrant(theSecondQuadrant, theOutX1, theOutY1);
+		inChildPieNode->GetCenteredCoordinatesFromQuadrant(theSecondQuadrant, theOutX1, theOutY1);
+		theOutX1 += theDX;
+		theOutY1 += theDY;
+	}
+    
+    return theSuccess;
+}
+
+// inQuadrant = 0 -> top edge
+// inQuadrant = 2 -> left edge
+// inQuadrant = 4 -> bottom edge
+// inQuadrant = 6 -> right edge
+void PieNode::GetCenteredCoordinatesFromQuadrant(int inQuadrant, int& outX, int& outY)
+{
+	int theWidth, theHeight;
+	this->getSize(theWidth, theHeight);
+
+	int theVisibleWidth, theVisibleHeight;
+	this->GetVisibleSize(theVisibleWidth, theVisibleHeight);
+
+	int theVisibleXOffset, theVisibleYOffset;
+	theVisibleXOffset = (theWidth - theVisibleWidth)/2;
+	theVisibleYOffset = (theHeight - theVisibleHeight)/2;
+
+	// Corner nodes no longer supported
+	ASSERT(inQuadrant != 1);
+	ASSERT(inQuadrant != 3);
+	ASSERT(inQuadrant != 5);
+	ASSERT(inQuadrant != 7);
+
+    switch(inQuadrant)
+    {
+    case 0:
+        outX = theWidth/2;
+        outY = theVisibleYOffset;
+        break;
+    case 2:
+        outX = theVisibleXOffset;
+        outY = theHeight/2;
+        break;
+    case 4:
+        outX = theWidth/2;
+        outY = theVisibleYOffset + theVisibleHeight;
+        break;
+    case 6:
+        outX = theVisibleXOffset + theVisibleWidth;
+        outY = theHeight/2;
+        break;
+    }
+
+}
+
+// Draw nodes
+void PieNode::DoPaint()
+{
+    FadingImageLabel::DoPaint();
+}
+
+// Draw node lines
+void PieNode::paintBackground()
+{
+    // For each child
+    for(int i = 0; i < kNumNodes; i++)
+    {
+        PieNode* theCurrentPieNode = this->mArray[i];
+        if(theCurrentPieNode)
+        {
+            // Draw line from us to them indicating pie node in that direction
+            if(theCurrentPieNode->GetValveAlpha() < 255)
+            {
+                // If node above us isn't highlighted, don't draw line to us
+                //if(theCurrentPieNode->HasSelectedNodeAbove() || theCurrentPieNode->HasSelectedNodeBelow())
+				
+				// All those lines are getting confusing.  Only draw the lines around this pie node that
+				// connect to a selected parent or selected child
+                if(theCurrentPieNode->HasSelectedNodeBelow() || this->GetDrawSelected())
+                {
+                    // Find correct line to draw from center of edge of source pie node to center
+                    // of edge of dest pie node
+                    int theRelativeLineX0, theRelativeLineY0, theRelativeLineX1, theRelativeLineY1;
+                    if(this->ComputeRelativeConnectorCoordinates(theCurrentPieNode, theRelativeLineX0, theRelativeLineY0, theRelativeLineX1, theRelativeLineY1))
+                    {
+                        // What color to draw the line in?
+                        //vgui::Color theCurrentColor = this->GetColor();
+                        vgui::Color theCurrentColor;
+						//theCurrentPieNode->getBgColor(theCurrentColor);
+						
+						if(this->mEnabled)
+						{
+							theCurrentPieNode->getFgColor(theCurrentColor);
+						}
+						else
+						{
+							theCurrentPieNode->getBgColor(theCurrentColor);
+						}
+						
+                        int r, g, b, a;
+                        theCurrentColor.getColor(r, g, b, a);
+
+						// Take gamma into account
+						//r *= this->mColorBias;
+						//g *= this->mColorBias;
+						//b *= this->mColorBias;
+						a = this->GetValveAlpha();
+
+//						//if(theCurrentPieNode->GetEnabled())
+//						//{
+//						g = (theCurrentPieNode->HasSelectedNodeBelow() ? 255 : kDarkGreenColor);
+//						//g = (theCurrentPieNode->HasSelectedNodeAbove() ? 255 : kDarkGreenColor);
+//						//}
+//						// ...else this will draw lines in disabled color too, using current fade alpha
+                        
+                        // Stupid Valve-alpha, vguiSimpleLine wants normal alpha of course
+						a = 255 - a;
+						a *= this->mColorBias;
+						
+						// Only draw if child isn't invisible.  Draw line
+						// relative from current node.
+
+						if(this->mConnectorSprite == 0 && (this->mConnectorSpriteName != ""))
+						{
+							this->mConnectorSprite = Safe_SPR_Load(this->mConnectorSpriteName.c_str());
+						}
+
+						if(this->mConnectorSprite > 0)
+						{
+							// Approximate alpha
+							float theAlpha = a/255.0f;
+							int theSpriteRed = theAlpha*r;
+							int theSpriteGreen = theAlpha*g;
+							int theSpriteBlue = theAlpha*b;
+							
+							SPR_Set(this->mConnectorSprite, theSpriteRed, theSpriteGreen, theSpriteBlue);
+							int theLineWidth = abs(theRelativeLineX1 - theRelativeLineX0);
+							int theLineHeight = abs(theRelativeLineY1 - theRelativeLineY0);
+							
+							// Use second frame if vertical
+							int theConnectorFrame = 0;
+							if(theLineHeight > 0)							
+							{
+								theConnectorFrame = 1;
+							}
+							
+							int theConnectorSpriteWidth = SPR_Width(this->mConnectorSprite, theConnectorFrame);
+							int theConnectorSpriteHeight = SPR_Height(this->mConnectorSprite, theConnectorFrame);
+
+							int thePieNodeWidth, thePieNodeHeight;
+							this->getContentSize(thePieNodeWidth, thePieNodeHeight);
+							
+							int thePieNodeX, thePieNodeY;
+							this->getPos(thePieNodeX, thePieNodeY);
+							
+							int theStartX = 0;
+							int theStartY = 0;
+
+							if(theConnectorFrame == 0)
+							{
+								int theXOffset = (theLineWidth - theConnectorSpriteWidth)/2;
+								//if(theXOffset < 0)
+								//	theXOffset = 0;
+								
+								theStartX = min(theRelativeLineX0, theRelativeLineX1) + theXOffset;
+								theStartY = min(theRelativeLineY0, theRelativeLineY1) - theConnectorSpriteHeight/2;
+
+//								int theScissorStartX = thePieNodeX + min(theRelativeLineX0, theRelativeLineX1) + thePieNodeWidth/2;
+//								int theScissorStartY = thePieNodeY + theStartY;
+//								int theScissorEndX = theScissorStartX + theLineWidth - thePieNodeWidth/2;
+//								int theScissorEndY = theScissorStartY + theConnectorSpriteHeight;
+								
+								//vguiSimpleBox(theScissorStartX - thePieNodeX, theScissorStartY - thePieNodeY, theScissorEndX - thePieNodeX, theScissorEndY - thePieNodeY, 255, 255, 0, 128);
+
+//								SPR_EnableScissor(theScissorStartX, theScissorStartY, theLineWidth, theConnectorSpriteHeight);
+							}
+							else
+							{
+								int theYOffset = (theLineHeight - theConnectorSpriteHeight)/2;
+								//if(theYOffset < 0)
+								//	theYOffset = 0;
+
+								theStartX = min(theRelativeLineX0, theRelativeLineX1) - theConnectorSpriteWidth/2;
+								theStartY = min(theRelativeLineY0, theRelativeLineY1) + theYOffset;
+
+//								int theScissorStartX = thePieNodeX + theStartX;
+//								int theScissorStartY = thePieNodeY + min(theRelativeLineY0, theRelativeLineY1);
+//								int theScissorEndX = theScissorStartX + theConnectorSpriteWidth;
+//								int theScissorEndY = theScissorStartY + theLineHeight - thePieNodeHeight;
+								
+								//vguiSimpleBox(theScissorStartX - thePieNodeX, theScissorStartY - thePieNodeY, theScissorEndX - thePieNodeX, theScissorEndY - thePieNodeY, 255, 255, 0, 128);
+
+//								SPR_EnableScissor(theScissorStartX, theScissorStartY, theConnectorSpriteWidth, theLineHeight);
+							}
+
+							// Take into account our position, including our parent(s), when drawing
+//							Panel* theParent = this->getParent();
+//							while(theParent)
+//							{
+//								int theX, theY;
+//								theParent->getPos(theX, theY);
+//								theStartX += theX;
+//								theStartY += theY;
+//								theParent = theParent->getParent();
+//							}
+
+							// Draw it
+							//SPR_DrawAdditive(theConnectorFrame, theStartX, theStartY, NULL);
+							SPR_DrawHoles(theConnectorFrame, theStartX, theStartY, NULL);
+//							gEngfuncs.pfnSPR_DisableScissor();
+							
+						}
+						else
+						{
+							vguiSimpleLine(theRelativeLineX0, theRelativeLineY0, theRelativeLineX1, theRelativeLineY1, r, g, b, a);
+						}
+
+						vguiSimpleBox(theRelativeLineX0, theRelativeLineY0, theRelativeLineX1, theRelativeLineY1, 255, 255, 0, 128);
+					}
+				}
+			}
+		}
+	}
+}
+
+void PieNode::GetMaxTextSize(int& outWidth, int& outHeight)
+{
+	int theTempWidth, theTempHeight;
+	const float kTextHeightBias = 1.5f;
+
+	// Use the text extents to dictate desired node size
+	// Bias text size a bit for usability
+	this->getTextSize(theTempWidth, theTempHeight);
+
+	theTempHeight *= kTextHeightBias;
+	if(theTempWidth > outWidth)
+	{
+		outWidth = theTempWidth;
+	}
+	if(theTempHeight > outHeight)
+	{
+		outHeight = theTempHeight;
+	}
+	
+	for(int i = 0; i < kNumNodes; i++)
+	{
+		PieNode* theCurrentNode = this->mArray[i];
+		if(theCurrentNode)
+		{
+			theCurrentNode->GetMaxTextSize(theTempWidth, theTempHeight);
+			if(theTempWidth > outWidth)
+			{
+				outWidth = theTempWidth;
+			}
+			if(theTempHeight > outHeight)
+			{
+				outHeight = theTempHeight;
+			}
+		}
+	}
+}
+
+bool PieNode::GetSelectedNode(PieNode*& outNode)
+{
+	bool theFoundNode = false;
+
+	if(this->mDrawSelected)
+	{
+		outNode = this;
+		theFoundNode = true;
+	}
+	else
+	{
+		for(int i = 0; i < kNumNodes; i++)
+		{
+			PieNode* theCurrentNode = this->mArray[i];
+			if(theCurrentNode)
+			{
+				theFoundNode = theCurrentNode->GetSelectedNode(outNode);
+				if(theFoundNode)
+				{
+					break;
+				}
+			}
+		}
+	}
+
+	return theFoundNode;
+}
+
+bool PieNode::HasSelectedNodeAbove(void) const
+{
+    bool hasSelectedNodeAbove = false;
+
+    const PieNode* thePieNode = this;
+
+    while(thePieNode != NULL)
+    {
+        if(thePieNode->GetDrawSelected())
+        {
+            hasSelectedNodeAbove = true;
+            break;
+        }
+        else
+        {
+            thePieNode = thePieNode->mParentPieNode;
+        }
+    }
+
+    return hasSelectedNodeAbove;
+}
+
+
+bool PieNode::HasSelectedNodeBelow(void) const
+{
+    bool hasSelectedNodeBelow = false;
+
+    // For each of our children
+    if(this->GetDrawSelected())
+    {
+        hasSelectedNodeBelow = true;
+    }
+    else
+    {
+        for(int i = 0; i < kNumNodes; i++)
+        {
+            PieNode* theCurrentNode = this->mArray[i];
+            if(theCurrentNode)
+            {
+                // If child has selected node below
+                if(theCurrentNode->HasSelectedNodeBelow())
+                {
+                    // break
+                    hasSelectedNodeBelow = true;
+                    break;
+                }
+            }
+        }
+    }
+
+    return hasSelectedNodeBelow;
+}
+
+void PieNode::MoveTree(int inDeltaX, int inDeltaY)
+{
+	int theCurrentX, theCurrentY;
+	this->getPos(theCurrentX, theCurrentY);
+	this->setPos(theCurrentX + inDeltaX, theCurrentY + inDeltaY);
+
+    for(int i = 0; i < kNumNodes; i++)
+    {
+        PieNode* theCurrentPieNode = this->mArray[i];
+        if(theCurrentPieNode)
+        {
+            theCurrentPieNode->MoveTree(inDeltaX, inDeltaY);
+        }
+    }
+}
+
+void PieNode::ResetToDefaults()
+{
+	this->mMessageID = this->mDefaultID;
+	this->mBaseText = this->mDefaultText;
+	this->ComputeAndSetLocalizedText();
+}
+
+void PieNode::SetColorBias(float inBias)
+{
+	this->mColorBias = inBias;
+
+    for(int i = 0; i < kNumNodes; i++)
+    {
+        PieNode* theCurrentPieNode = this->mArray[i];
+        if(theCurrentPieNode)
+        {
+			theCurrentPieNode->SetColorBias(this->mColorBias);
+		}
+	}
+}
+
+void PieNode::SetConnectorName(const string& inConnectorName)
+{
+	string theNewSpriteName = UINameToSprite(inConnectorName, ScreenWidth());
+	if(theNewSpriteName != this->mConnectorSpriteName)
+	{
+		// Mark it to be reloaded
+		this->mConnectorSpriteName = theNewSpriteName;
+		this->mConnectorSprite = 0;
+
+		for(int i = 0; i < kNumNodes; i++)
+		{
+			PieNode* theCurrentPieNode = this->mArray[i];
+			if(theCurrentPieNode)
+			{
+				theCurrentPieNode->SetConnectorName(inConnectorName);
+			}
+		}
+	}
+}
+
+void PieNode::SetDefaultImage(const string& inDefaultImage)
+{
+	this->mDefaultImage = inDefaultImage;
+	this->SetSpriteName(this->mDefaultImage);
+}
+
+void PieNode::SetDrawSelected(bool inDrawSelected)
+{
+	if(this->mEnabled)
+	{
+		this->mDrawSelected = inDrawSelected;
+	}
+}
+
+void PieNode::SetNodeAndAllChildrenFadeState(bool inNewFadeState)
+{
+    this->SetFadeState(inNewFadeState);
+
+    for(int i = 0; i < kNumNodes; i++)
+    {
+        PieNode* theCurrentPieNode = this->mArray[i];
+        if(theCurrentPieNode)
+        {
+            theCurrentPieNode->SetNodeAndAllChildrenFadeState(inNewFadeState);
+        }
+    }
+}
+
+void PieNode::SetNodeDistance(float inNewXDistance, float inNewYDistance)
+{
+    for(int i = 0; i < kNumNodes; i++)
+    {
+        PieNode* theCurrentPieNode = this->mArray[i];
+        if(theCurrentPieNode)
+        {
+            theCurrentPieNode->SetPosFromOffset(i, inNewXDistance, inNewYDistance);
+        }
+    }
+}
+
+bool PieNode::SetPosFromOffset(int inAngularOffset, float inNodeXDistance, float inNodeYDistance)
+{
+    bool theSuccess = false;
+
+    if((inAngularOffset >= 0) && (inAngularOffset < kNumNodes))
+    {
+        // 0 corresponds to north (90 degrees), 90 corresponds to west (180 degrees)
+        // Invert y because half-life uses +Y towards top of screen
+        float theDegrees = kTwoPI*(this->mDegrees[inAngularOffset]/360.0f);
+
+        // Calculate spacing in pixels from inNodeDistance.  Use same number of pixels
+        // as base for both x and y offset so the spacing is even (as opposed to using
+        // inNodeDistance*ScreenHeight for the y-component)
+        float theNodeXPixelDist = inNodeXDistance*ScreenWidth();
+        int xDiff = (int)(cos(theDegrees)*theNodeXPixelDist);
+        float theNodeYPixelDist = inNodeYDistance*ScreenHeight();
+        int yDiff = -(int)(sin(theDegrees)*theNodeYPixelDist);
+        this->setPos(xDiff, yDiff);
+
+        theSuccess = true;
+    }
+    return theSuccess;
+}
+
+//void PieNode::SetTolerance(int inPercentage)
+//{
+//}
+
+//void PieNode::setSize(int wide, int tall)
+//{
+//    // set size for self
+//    FadingImageLabel::setSize(wide, tall);
+//
+//    // set size for all children
+//    for(int i = 0; i < kNumNodes; i++)
+//    {
+//        PieNode* theCurrentPieNode = this->mArray[i];
+//        if(theCurrentPieNode)
+//        {
+//            theCurrentPieNode->setSize(wide, tall);
+//        }
+//    }
+//}
+
+void PieNode::SetSizeKeepCenter(int inWidth, int inHeight)
+{
+    // set size for self
+    FadingImageLabel::SetSizeKeepCenter(inWidth, inHeight);
+
+    // set size for all children
+    for(int i = 0; i < kNumNodes; i++)
+    {
+        PieNode* theCurrentPieNode = this->mArray[i];
+        if(theCurrentPieNode)
+        {
+            theCurrentPieNode->SetSizeKeepCenter(inWidth, inHeight);
+        }
+    }
+}
+
+void PieNode::SetNodeAndAdjacentChildrenFadeState(bool inFadeState)
+{
+    this->SetFadeState(inFadeState);
+
+    for(int i = 0; i < kNumNodes; i++)
+    {
+        PieNode* theCurrentPieNode = this->mArray[i];
+        if(theCurrentPieNode)
+        {
+            theCurrentPieNode->SetFadeState(inFadeState);
+        }
+    }
+}
+
+void PieNode::SetFadeState(bool inNewFadeState)
+{
+    FadingImageLabel::SetFadeState(inNewFadeState);
+}
+
+void PieNode::SetVisibleSize(int inVisWidth, int inVisHeight)
+{
+	FadingImageLabel::SetVisibleSize(inVisWidth, inVisHeight);
+
+    for(int i = 0; i < kNumNodes; i++)
+    {
+        PieNode* theCurrentPieNode = this->mArray[i];
+        if(theCurrentPieNode)
+        {
+            theCurrentPieNode->SetVisibleSize(inVisWidth, inVisHeight);
+        }
+    }
+
+}
+
+void PieNode::SetNodeAndChildrenVisible(bool inVisibilityState)
+{
+	this->setVisible(inVisibilityState);
+
+    for(int i = 0; i < kNumNodes; i++)
+    {
+        PieNode* theCurrentPieNode = this->mArray[i];
+        if(theCurrentPieNode)
+        {
+            theCurrentPieNode->SetNodeAndChildrenVisible(inVisibilityState);
+        }
+    }
+}
+
+void PieNode::Update(float theCurrentTime)
+{
+    FadingImageLabel::Update(theCurrentTime);
+
+    // Update all children
+    for(int i = 0; i < kNumNodes; i++)
+    {
+        PieNode* theCurrentPieNode = this->mArray[i];
+        if(theCurrentPieNode)
+        {
+            theCurrentPieNode->Update(theCurrentTime);
+        }
+    }
+}
+
+void PieNode::UpdateMenuFromTech(const AvHTechNodes& inMenuCosts, int inPurchaseLevel)
+{
+	// Set our next text
+	//string theNewText = this->mBaseText;
+	string theNewText = this->mLocalizedText;
+	this->mPointCost = 0;
+
+    AvHMessageID theMessageID = (AvHMessageID)this->mMessageID;
+
+	// Lookup message id and append onto it if it exists
+    bool theResearchable = false;
+    int theCost = 0;
+    float theTime = 0;
+    if(inMenuCosts.GetResearchInfo(theMessageID, theResearchable, theCost, theTime))
+    {
+        // Only append point cost if it isn't a sprite and there is a point cost greater than 0
+        this->mPointCost = theCost;
+        if(this->mPointCost > 0 && (theNewText[0] != '!'))
+        {
+            char theCharArray[6];
+            sprintf(theCharArray, " (%d)", this->mPointCost);
+            theNewText += string(theCharArray);
+        }
+    }
+
+	// Set it
+	this->setText(theNewText.c_str());
+
+    // Disable or enable node
+    bool theMessageIsAvailable = inMenuCosts.GetIsMessageAvailable(theMessageID);
+
+    this->mEnabled = true;
+	if((theCost >= 0) && ((this->mPointCost > inPurchaseLevel) /*|| (this->mPointCost == -1)*/ || !theResearchable || !theMessageIsAvailable))
+    {
+        this->mEnabled = false;
+    }
+
+    // do the same for our children
+    for(int i = 0; i < kNumNodes; i++)
+    {
+        PieNode* theCurrentPieNode = this->mArray[i];
+        if(theCurrentPieNode)
+        {
+			theCurrentPieNode->UpdateMenuFromTech(inMenuCosts, inPurchaseLevel);
+        }
+    }
+}
+
+void PieNode::VidInit(void)
+{
+	FadingImageLabel::VidInit();
+
+	if(this->mConnectorSprite > 0)
+	{
+		// TODO: Can we unload it?
+	}
+	
+	// Mark it to be reloaded next draw
+	this->mConnectorSprite = 0;
+
+    // do the same for our children
+    for(int i = 0; i < kNumNodes; i++)
+    {
+        PieNode* theCurrentPieNode = this->mArray[i];
+        if(theCurrentPieNode)
+        {
+			theCurrentPieNode->VidInit();
+        }
+    }
+}
+
+
+
+
+PieNodeList::PieNodeList(const string& inRootName, float inDist)
+{
+    this->mRoot = new PieNode(inRootName, 0);
+    this->mRoot->setVisible(false);
+    this->mNodeXDistance = this->mNodeYDistance = inDist;
+}
+
+PieNodeList::~PieNodeList()
+{
+    delete this->mRoot;
+}
+
+void PieNodeList::AddInputSignalForNodes(InputSignal* s)
+{
+    this->mRoot->AddInputSignalForNodes(s);
+}
+
+// Accepts input in the form of:
+//  #/#/#/#/nodename/msgID
+bool PieNodeList::AddNode(const string& inNodeString, Font* inFont, const Color& inBGColor, const Color& inFGColor, const string& inDefaultImage)
+{
+    bool theSuccess = false;
+
+    // Parse inNodeString to get node offsets and node name 
+    StringVector theTokens;
+    string theDelimiters("/");
+    Tokenizer::split(inNodeString, theDelimiters, theTokens);
+
+    if(theTokens.size() > 1)
+    {
+        // Grab directional indicies
+        typedef vector<int> DirectionalListType;
+        DirectionalListType theDirectionalList;
+        
+        // For each direction until the last, get the sub node (skip the last two nodes, should be the node name and msg id)
+        for(StringVector::iterator theStringIter = theTokens.begin(); ((theStringIter != theTokens.end()) && (theStringIter + 2 != theTokens.end())) ; theStringIter++)
+        {
+            string theCurrentToken = *theStringIter;
+            int theCurrentOffset;
+            if(sscanf(theCurrentToken.c_str(), "%d", &theCurrentOffset) == 1)
+            {
+                theDirectionalList.push_back(theCurrentOffset);
+            }
+        }
+        
+        // Grab node name (second to last in the list)
+        string theNodeName = *(theTokens.end() - 2);
+
+        // Grab the message id (last in list)
+        string theCurrentToken = *(theTokens.end() - 1);
+        int theMessageID;
+        if(sscanf(theCurrentToken.c_str(), "%d", &theMessageID) != 1)
+        {
+        }
+
+        // Build the new node
+        PieNode* theCurrentNode = this->mRoot;
+        ASSERT(theCurrentNode);
+
+        for(DirectionalListType::iterator theIter = theDirectionalList.begin(); ((theIter != theDirectionalList.end()) && (theIter + 1 != theDirectionalList.end()) && (theCurrentNode != NULL)); theIter++)
+        {
+            theCurrentNode = theCurrentNode->GetNodeAtAngularOffset(*theIter);
+        }
+
+        if(theCurrentNode != NULL)
+        {
+            int theLastOffset = *(theDirectionalList.end() - 1);
+
+            // At this last node, add the new node with the last index
+            PieNode* theNewNode = new PieNode(theNodeName, theMessageID);
+
+            if(inFont)
+            {
+                theNewNode->setFont(inFont);
+            }
+
+			theNewNode->setFgColor(inFGColor);
+			theNewNode->setBgColor(inBGColor);
+			theNewNode->setAsMouseCapture(false);
+			theNewNode->SetDefaultImage(inDefaultImage);
+
+            // Set size to be the default size for the rest of the nodes
+            //int theNodeListSizeX, theNodeListSizeY;
+            //this->mRoot->getSize(theNodeListSizeX, theNodeListSizeY);
+            //theNewNode->setSize(theNodeListSizeX, theNodeListSizeY);
+            
+            theCurrentNode->AttachNode(theNewNode, theLastOffset, this->mNodeXDistance, this->mNodeYDistance);
+
+            // Set x/y as it's current x/y plus the node "before" it in the pie hierarchy
+            int thePreviousMenuX, thePreviousMenuY;
+            theCurrentNode->getPos(thePreviousMenuX, thePreviousMenuY);
+
+            int theNewNodeRelX, theNewNodeRelY;
+            theNewNode->getPos(theNewNodeRelX, theNewNodeRelY);
+            theNewNode->setPos(thePreviousMenuX + theNewNodeRelX, thePreviousMenuY + theNewNodeRelY);
+
+			// TODO: Just added this.
+			theNewNode->setSize(this->mNodeXDistance*ScreenWidth(), this->mNodeYDistance*ScreenHeight());
+
+            // Set new node's parent as root node's parent
+            theNewNode->setParent(this->mRoot->getParent());
+
+            theSuccess = true;
+        }
+    }
+
+    return theSuccess;
+}
+
+void PieNodeList::ChangeNode(int inMessageID, int inNewMessageID, const string& inNewText)
+{
+	this->mRoot->ChangeNode(inMessageID, inNewMessageID, inNewText);
+	this->RecomputeVisibleSize();
+}
+
+void PieNodeList::DisableNodesNotInMessageList(const MessageIDList& inList)
+{
+	this->mRoot->DisableNodesNotInMessageList(inList);
+}
+
+void PieNodeList::DisableNodesWhoseChildrenAreDisabled()
+{
+	this->mRoot->DisableNodesWhoseChildrenAreDisabled();
+}
+
+PieNode* PieNodeList::GetRoot()
+{
+    return this->mRoot;
+}
+
+bool PieNodeList::GetSelectedNode(PieNode*& outNode)
+{
+	return this->mRoot->GetSelectedNode(outNode);
+}
+
+void PieNodeList::RecomputeVisibleSize(void)
+{
+	int theMaxWidth  = 0;
+	int theMaxHeight = 0;
+
+	// run through all pie nodes and find the max text extents of any of them
+	this->mRoot->GetMaxTextSize(theMaxWidth, theMaxHeight);
+
+	// set all sizes to accomodate that max size
+	//this->mRoot->SetSizeKeepCenter(theMaxWidth, theMaxHeight);
+	this->mRoot->SetVisibleSize(theMaxWidth, theMaxHeight);
+}
+
+void PieNodeList::ResetToDefaults()
+{
+	this->mRoot->ResetToDefaults();
+}
+
+void PieNodeList::SetBasePosition(int x, int y, int inPieWidth, int inPieHeight)
+{
+    // Center root in middle of pie menu, take into account image size so the image is centered.
+    // All children are relative to its parent, so they assume the same image width/height
+    //int xImage = this->mRoot->getImageWide();
+    //int yImage = this->mRoot->getImageTall();
+	//int theTextWidth, theTextHeight;
+	//this->mRoot->getTextSize(theTextWidth, theTextHeight);
+	int theWidth, theHeight;
+	this->mRoot->getSize(theWidth, theHeight);
+
+    //this->mRoot->setPos(inPieWidth/2 - xImage/2, inPieHeight/2 - yImage/2);
+	int theCurrentX, theCurrentY;
+	this->mRoot->getPos(theCurrentX, theCurrentY);
+	int theDeltaX = (inPieWidth/2 - theWidth/2) - theCurrentX;
+	int theDeltaY = (inPieHeight/2 - theHeight/2) - theCurrentY;
+    //this->mRoot->setPos(inPieWidth/2 - theWidth/2, inPieHeight/2 - theHeight/2);
+
+	// Run through child nodes and move them all by this amount
+	this->mRoot->MoveTree(theDeltaX, theDeltaY);
+
+    // Make sure the nodes are always as big as the pie so they are free to
+    // draw child nodes outside their own extents
+    //this->mRoot->setSize(inPieWidth, inPieHeight);
+}
+
+void PieNodeList::SetConnectorName(const string& inConnectorName)
+{
+	this->mRoot->SetConnectorName(inConnectorName);
+}
+
+void PieNodeList::SetConstructionComplete()
+{
+}
+
+void PieNodeList::setParent(vgui::Panel* inPanel)
+{
+    this->mRoot->setParent(inPanel);
+}
+
+void PieNodeList::SetNodeDistance(float inNewXDistance, float inNewYDistance)
+{
+    this->mRoot->SetNodeDistance(inNewXDistance, inNewYDistance);
+    this->mNodeXDistance = inNewXDistance;
+    this->mNodeYDistance = inNewYDistance;
+}
+
+//bool PieNodeList::SetNodeEnabled(const string& inNodeName, bool inNewState)
+//{
+//    return false;
+//}
+
+//void PieNodeList::SetRootVisible(bool inNewVisibility)
+//{
+//    // Set just the root not visibility
+//}
+//
+
+//void PieNodeList::SetTolerance(int inPercentage)
+//{
+//    // Loop through all nodes
+//        // Call SetTolerance on each
+//}
+
+void PieNodeList::SetFadeState(bool inNewFadeState)
+{
+    if(inNewFadeState)
+    {
+        this->mRoot->SetNodeAndAdjacentChildrenFadeState(true);
+    }
+    else
+    {
+        this->mRoot->SetNodeAndAllChildrenFadeState(false);
+    }
+}
+
+void PieNodeList::SetSizeKeepCenter(int inWidth, int inHeight)
+{
+	this->mRoot->SetSizeKeepCenter(inWidth, inHeight);
+}
+
+void PieNodeList::Update(float inTime)
+{
+    this->mRoot->Update(inTime);
+}
+
+void PieNodeList::UpdateMenuFromTech(const AvHTechNodes& inMenuCosts, int inPurchaseLevel)
+{
+	this->mRoot->UpdateMenuFromTech(inMenuCosts, inPurchaseLevel);
+}
+
+void PieNodeList::VidInit()
+{
+	this->mRoot->VidInit();
+}
diff --git a/main/source/ui/PieNode.h b/main/source/ui/PieNode.h
new file mode 100644
index 00000000..bedefdca
--- /dev/null
+++ b/main/source/ui/PieNode.h
@@ -0,0 +1,275 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: PieNode.h $
+// $Date: 2002/08/31 18:04:32 $
+//
+//-------------------------------------------------------------------------------
+// $Log: PieNode.h,v $
+// Revision 1.15  2002/08/31 18:04:32  Flayra
+// - Work at VALVe
+//
+// Revision 1.14  2002/08/16 02:29:20  Flayra
+// - Added document headers
+// - Started to add support for pie nodes with both images and text
+//
+//===============================================================================
+#ifndef PIENODE_H
+#define PIENODE_H
+
+#include "ui/FadingImageLabel.h"
+#include "ui/GammaAwareComponent.h"
+#include "mod/AvHSharedTypes.h"
+#include "string"
+using std::string;
+
+const int kNumNodes = 8;
+
+typedef vector<int> MessageIDList;
+
+class PieNode : public FadingImageLabel
+{
+public:
+    PieNode(const string& inNodeString, int inMessageID);
+    virtual ~PieNode();
+
+    // Call FadingImageLabel::addInputSignal, then call it on all our children
+	void AddInputSignalForNodes(InputSignal* s);
+
+    // Add and forget
+    bool AttachNode(PieNode* inNode, int inAngularOffset, float inNodeXDistance, float inNodeYDistance);
+
+	void DisableNodesGreaterThanCost(int inCost);
+
+	void DisableNodesNotInMessageList(const MessageIDList& inList);
+
+	void DisableNodesWhoseChildrenAreDisabled();
+
+    //vgui::Color GetColor() const;
+
+	virtual void getBgColor(int& r,int& g,int& b,int& a);
+	virtual void getBgColor(Color& color);
+
+    //virtual void FadedIn();
+
+    //virtual void FadedOut();
+
+	virtual bool GetDrawHighlighted() const;
+	
+    virtual bool GetDrawSelected() const;
+
+	virtual bool GetEnabled() const;
+
+    virtual bool GetHasChild(const PieNode* inNode) const;
+
+    bool GetIsAbove(const PieNode* inNode) const;
+
+	void GetMaxTextSize(int& outWidth, int& outHeight);
+
+    int GetMessageID() const;
+
+	int GetPointCost() const;
+
+    PieNode* GetNodeAtAngularOffset(int inAngularOffset);
+
+    const string& GetNodeName() const;
+
+    PieNode* GetRoot();
+
+	virtual bool GetSelectedNode(PieNode*& outNode);
+
+    virtual bool HasChildren(void) const;
+
+    virtual bool HighlightNode(void);
+
+    virtual bool IsAdjacentTo(const PieNode* inNode);
+
+    virtual bool IsChildOf(const PieNode* inNode);
+
+	virtual bool isVisible();
+
+	void MoveTree(int inDeltaX, int inDeltaY);
+
+	void ChangeNode(int inMessageID, int inNewMessageID, const string& inNewText);
+
+	void ChangeNode(int inNewMessageID, const string& inNewText);
+
+	void ResetToDefaults();
+
+	void SetColorBias(float inBias);
+
+    void SetConnectorName(const string& inConnectorName);
+
+	void SetDefaultImage(const string& inDefaultImage);
+
+    void SetDrawSelected(bool inDrawSelected);
+
+    void SetNodeAndAdjacentChildrenFadeState(bool inFadeState);
+
+    void SetNodeAndAllChildrenFadeState(bool inNewVisState);
+
+    void SetNodeDistance(float inNewXDistance, float inNewYDistance);
+
+	//bool SetNodeEnabled(const string& inNodeName, bool inNewState);
+
+    bool SetPosFromOffset(int inOffset, float inNodeXDistance, float inNodeYDistance);
+
+	//virtual void setSize(int wide,int tall);
+
+	virtual void SetSizeKeepCenter(int inWidth, int inHeight);
+
+    //void SetTolerance(int inPercentage);
+
+    virtual void SetFadeState(bool inNewFadeState);
+
+	virtual void SetVisibleSize(int inVisWidth, int inVisHeight);
+
+	void SetNodeAndChildrenVisible(bool inVisibilityState);
+
+    virtual void Update(float theCurrentTime);
+
+	void UpdateMenuFromTech(const AvHTechNodes& inMenuCosts, int inPurchaseLevel);
+
+	virtual void VidInit(void);
+
+private:
+
+    bool            ComputeRelativeConnectorCoordinates(PieNode* theCurrentPieNode, int& x0, int& y0, int& x1, int& y1);
+
+	void			ComputeAndSetLocalizedText();
+
+    //void            GetCenteredCoordinatesFromQuadrant(int inQuadrant, int inRelativeToX, int inRelativeToY, int& outX, int& outY);
+
+    void            GetCenteredCoordinatesFromQuadrant(int inQuadrant, int& outX, int& outY);
+
+    bool            HasSelectedNodeAbove(void) const;
+
+    bool            HasSelectedNodeBelow(void) const;
+
+    virtual void    DoPaint();
+
+	virtual void	paintBackground();
+
+    static int      mDegrees[kNumNodes];
+
+    string          mNodeName;
+	float			mColorBias;
+
+    // Count counter-clockwise
+    PieNode*        mArray[kNumNodes];
+
+    PieNode*        mParentPieNode;
+
+	string			mConnectorSpriteName;
+	int				mConnectorSprite;
+
+	string			mLocalizedText;
+	string			mBaseText;
+	string			mDefaultText;
+	string			mDefaultImage;
+
+    int             mMessageID;
+	int				mDefaultID;
+
+	int				mPointCost;
+
+	bool			mEnabled;
+
+    bool            mDrawSelected;
+
+};
+
+class PieNodeList //: public InputSignal
+{
+public:
+    PieNodeList(const string& inRootName, float inDist);
+    virtual ~PieNodeList();
+
+    // Adds a new node using the string from the description file (node name, relative position). It uses
+    // the same texture name as the root node.  Fails if SetConstructionComplete was already called.
+    bool AddNode(const string& inNodeString, Font* inFont, const Color& inBGColor, const Color& inFGColor, const string& inDefaultImage);
+		
+    void AddInputSignalForNodes(InputSignal* s);
+
+	void ChangeNode(int inMessageID, int inNewMessageID, const string& inNewText);
+
+	void DisableNodesGreaterThanCost(int inCost);
+
+	void DisableNodesNotInMessageList(const MessageIDList& inList);
+
+	void DisableNodesWhoseChildrenAreDisabled();
+
+    PieNode* GetRoot();
+
+	bool GetSelectedNode(PieNode*& outNode);
+
+	void RecomputeVisibleSize(void);
+
+	void ResetToDefaults();
+
+    void SetBasePosition(int inX, int inY, int inPieWidth, int inPieHeight);
+
+    void SetConnectorName(const string& inConnectorName);
+
+    // Indicate that there are no more nodes.  Set self as input signal for all nodes.
+    void SetConstructionComplete();
+
+    void setParent(vgui::Panel* inPanel);
+    
+    void SetNodeDistance(float inNewXDistance, float inNewYDistance);
+
+	//bool SetNodeEnabled(const string& inNodeName, bool inNewState);
+
+    // Set root visible only, until mouse moves over other components
+    //void SetRootVisible(bool inNewVisibility);
+
+    //void SetTolerance(int inPercentage);
+
+    // When hiding pie menu, hide all nodes
+    // When showing pie menu, show only root
+    virtual void SetFadeState(bool inNewVisibility);
+
+	virtual void SetSizeKeepCenter(int inWidth, int inHeight);
+
+    void Update(float inTime);
+
+	void UpdateMenuFromTech(const AvHTechNodes& inMenuCosts, int inPurchaseLevel);
+
+	void VidInit();
+
+    // Mark node and its first-level children visible
+	//virtual void cursorEntered(Panel* panel);
+
+	//virtual void cursorExited(Panel* panel);
+
+    // If right mouse button released over node, mark all nodes invisible
+    // and hide the control.  Don't select a node, that is assumed to be handled by the outer 
+    // PieMenu::AddInputSignalForNodes().  If mouse button was released off the control entirely,
+    // it should generated a ClosePieMenu command that sets whole thing invisible again.
+	//virtual void mouseReleased(MouseCode code, Panel* panel);
+
+    // Irrelevant events, override so we can instantiate
+//    virtual void cursorMoved(int x,int y,Panel* panel);
+//	virtual void mousePressed(MouseCode code,Panel* panel);
+//	virtual void mouseDoublePressed(MouseCode code,Panel* panel);
+//	virtual void mouseWheeled(int delta,Panel* panel);
+//	virtual void keyPressed(KeyCode code,Panel* panel);
+//	virtual void keyTyped(KeyCode code,Panel* panel);
+//	virtual void keyReleased(KeyCode code,Panel* panel);
+//	virtual void keyFocusTicked(Panel* panel);
+
+private:
+    
+    PieNode*			mRoot;
+    float				mNodeXDistance;
+    float				mNodeYDistance;
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/ui/ReloadableComponent.h b/main/source/ui/ReloadableComponent.h
new file mode 100644
index 00000000..488f9f29
--- /dev/null
+++ b/main/source/ui/ReloadableComponent.h
@@ -0,0 +1,13 @@
+#ifndef RELOADABLECOMPONENT_H
+#define RELOADABLECOMPONENT_H
+
+class ReloadableComponent
+{
+public:
+	virtual void		VidInit(void) = 0;
+	
+private:
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/ui/SliderPlus.cpp b/main/source/ui/SliderPlus.cpp
new file mode 100644
index 00000000..03d7f936
--- /dev/null
+++ b/main/source/ui/SliderPlus.cpp
@@ -0,0 +1,264 @@
+#include "../util/nowarnings.h"
+#include "ui/SliderPlus.h"
+#include "ui/UIUtil.h"
+#include "VGUI_MouseCode.h"
+
+SliderPlus::SliderPlus(int inX, int inY,int inWidth, int inHeight, bool inIsVertical) : Panel(inX, inY, inWidth, inHeight)
+{
+	this->mDragging = false;
+	this->mNobDragStartPos[0] = this->mNobDragStartPos[1] = 0;
+	this->mDragStartPos[0] = this->mDragStartPos[1] = 0;
+	this->mNobPos[0] = this->mNobPos[1] = 0;
+	this->mRange[0] = 0;
+	this->mRange[1] = 10;
+	this->mValue = 0;
+	this->mRangeWindow = 10;
+	this->mIsVertical = inIsVertical;
+	this->mLastMouseX = this->mLastMouseY = 0;
+
+	// Add ourselves as our own input signal...kinda strange sounding but useful
+	this->addInputSignal(this);
+}
+
+void SliderPlus::addIntChangeSignal(IntChangeSignal* inChangeSignal)
+{
+	// Add inChangeSignal to list
+}
+
+void SliderPlus::computeNobBox(int& outStartX, int& outStartY, int& outEndX, int& outEndY)
+{
+	int theWidth, theHeight;
+	this->getSize(theWidth, theHeight);
+	
+	outStartX = this->mNobPos[0];
+	outStartY = this->mNobPos[1];
+	
+	if(this->mIsVertical)
+	{
+		outEndX = outStartX + theWidth - 1;
+		outEndY = outStartY + this->mRangeWindow;
+	}
+	else
+	{
+		outEndX = outStartX + this->mRangeWindow;
+		outEndY = outStartY + theHeight - 1;
+	}
+}
+
+void SliderPlus::fireIntChangeSignal()
+{
+	// Run through list of change signals, calling intChanged() on each one
+}
+
+void SliderPlus::getNobPos(int& outMin, int& outMax)
+{
+	// Return the upper left corner of the nob
+	outMin = this->mNobPos[0];
+	outMax = this->mNobPos[1];
+}
+
+void SliderPlus::getRange(int& outMinRange, int& outMaxRange)
+{
+	// Return the min and max range
+	outMinRange = this->mRange[0];
+	outMaxRange = this->mRange[1];
+}
+
+int	SliderPlus::getRangeWindow()
+{
+	return this->mRangeWindow;
+}
+
+int	SliderPlus::getValue()
+{
+	return this->mValue;
+}
+
+bool SliderPlus::hasFullRange()
+{
+	return false;
+}
+
+bool SliderPlus::isVertical()
+{
+	return this->mIsVertical;
+}
+
+void SliderPlus::paintBackground()
+{
+	int theStartX, theStartY;
+	int theWidth, theHeight;
+	int theEndX, theEndY;
+
+	//this->getPos(theStartX, theStartY);
+	theStartX = theStartY = 0;
+	
+	this->getSize(theWidth, theHeight);
+	
+	Color theColor;
+	int theR, theG, theB, theA;
+	
+	this->getBgColor(theColor);
+	theColor.getColor(theR, theG, theB, theA);
+	
+	// Draw rectangle the size of the slider in background color
+	theEndX = theStartX + theWidth;
+	theEndY = theStartY + theHeight;
+	
+	// Draw hollow box in bg color
+	vguiSimpleBox(theStartX, theStartY, theEndX-1, theEndY-1, theR, theG, theB, theA);
+	
+	// Draw nob in foreground color, size of range window
+	this->getFgColor(theColor);
+	theColor.getColor(theR, theG, theB, theA);
+	
+	// Compute the nob position so we can draw a box for it, all numbers are in pixels relative to component
+	this->computeNobBox(theStartX, theStartY, theEndX, theEndY);
+	
+	// Draw hollow box in fg color
+	vguiSimpleBox(theStartX, theStartY, theEndX, theEndY, theR, theG, theB, theA);
+}
+
+void SliderPlus::cursorMoved(int inX, int inY, Panel* inPanel)
+{
+	// Are we dragging the nub?
+	if(this->mDragging)
+	{
+		// Look at inX, inY and set our new nob pos
+		this->mNobPos[0] = this->mNobPos[1] = 0;
+
+		if(this->mIsVertical)
+		{
+			this->mNobPos[1] = inY;
+		}
+		else
+		{
+			this->mNobPos[0] = inX;
+		}
+
+		// Recompute the value from it
+		this->recomputeValueFromNobPos();
+	}
+	
+	this->mLastMouseX = inX;
+	this->mLastMouseY = inY;
+}
+
+void SliderPlus::mousePressed(MouseCode inCode, Panel* inPanel)
+{
+	int theStartX, theStartY, theEndX, theEndY;
+	this->computeNobBox(theStartX, theStartY, theEndX, theEndY);
+	
+	// Was LMB was pressed?
+	if(inCode == MOUSE_LEFT)
+	{
+		// Pressed while over the nob?
+		if((this->mLastMouseX >= theStartX) && (this->mLastMouseX <= theEndX) && (this->mLastMouseY >= theStartY) && (this->mLastMouseY <= theEndY))
+		{
+			// Remember this starting point and remember that we're dragging
+			this->mDragStartPos[0] = this->mLastMouseX;
+			this->mDragStartPos[1] = this->mLastMouseY;
+			this->mDragging = true;
+		}
+		// Above or below nub?  
+		else
+		{
+			// TODO?: Remember this so we can start adjusting by big increments.  For now, just adjust once.
+			// Adjust value by major increment
+			//this->recomputeNobPosFromValue();
+		}
+	}
+	// Was RMB pressed above or below the nub?  
+	else if(inCode == MOUSE_RIGHT)
+	{
+		// TODO?: Remember this so we can start adjusting by tiny increments. For now, just adjust once.
+		// Adjust value by minor increment
+		//this->recomputeNobPosFromValue();
+	}
+}
+
+void SliderPlus::mouseReleased(MouseCode inCode, Panel* inPanel)
+{
+	// Forget that we are dragging or adjusting by big or small increments.
+	if(inCode == MOUSE_LEFT)
+	{
+		this->mDragging = false;
+	}
+}
+
+void SliderPlus::mouseWheeled(int delta, Panel* panel)
+{
+}
+
+void SliderPlus::recomputeNobPosFromValue()
+{
+	// Look at current value and range and set the nob pos from it
+	int theWidth, theHeight;
+	this->getSize(theWidth, theHeight);
+
+	float theNormalizedNobPos = (this->mValue - this->mRange[0])/(float)(this->mRange[1]);
+	if(this->mIsVertical)
+	{
+		this->mNobPos[0] = 0;
+		this->mNobPos[1] = (int)(theNormalizedNobPos*theHeight);
+	}
+	else
+	{
+		this->mNobPos[0] = (int)(theNormalizedNobPos*theWidth);
+		this->mNobPos[1] = 0;
+	}
+}
+
+void SliderPlus::recomputeValueFromNobPos()
+{
+	// Look at nob pos and set new value
+	int theWidth, theHeight;
+	this->getSize(theWidth, theHeight);
+	
+	int theRelevantValue = this->mNobPos[0];
+	int theRelevantMaxPixels = theWidth;
+
+	if(this->mIsVertical)
+	{
+		theRelevantValue = this->mNobPos[1];
+		theRelevantMaxPixels = theHeight;
+	}
+
+	float theNormalizedValue = (theRelevantValue/(float)theRelevantMaxPixels);
+	int theNewValue = this->mRange[0] + (int)(theNormalizedValue*this->mRange[1]);
+	
+	this->setValue(theNewValue);
+}
+
+void SliderPlus::setRange(int inMinRange, int inMaxRange)
+{
+	// Set the range ("value")
+	this->mRange[0] = min(inMinRange, inMaxRange);
+	this->mRange[1] = max(inMinRange, inMaxRange);
+}
+
+void SliderPlus::setRangeWindow(int inRangeWindow)
+{
+	// Set the range window (in pixels)
+	this->mRangeWindow = inRangeWindow;
+}
+
+void SliderPlus::setSize(int inWidth, int inHeight)
+{
+	// Call parent setSize
+	Panel::setSize(inWidth, inHeight);
+
+	// Recompute something?
+}
+
+void SliderPlus::setValue(int inValue)
+{
+	// Only allow setting the value within our specified range
+	int theNewValue = inValue;
+	theNewValue = max(theNewValue, this->mRange[0]);
+	theNewValue = min(theNewValue, this->mRange[1]);
+
+	this->mValue = theNewValue;
+
+	this->recomputeNobPosFromValue();
+}
diff --git a/main/source/ui/SliderPlus.h b/main/source/ui/SliderPlus.h
new file mode 100644
index 00000000..50400863
--- /dev/null
+++ b/main/source/ui/SliderPlus.h
@@ -0,0 +1,68 @@
+#ifndef SLIDER_PLUS_H
+#define SLIDER_PLUS_H
+
+#include "VGUI_Panel.h"
+#include "VGUI_InputSignal.h"
+using namespace vgui;
+
+class SliderPlus : public Panel, public InputSignal
+{
+public:
+							SliderPlus(int inX, int inY,int inWidth, int inHeight, bool inIsVertical);
+public:						
+	virtual void			setValue(int inValue);
+	virtual int				getValue();
+	virtual bool			isVertical();
+	virtual void			addIntChangeSignal(IntChangeSignal* inChangeSignal);
+    virtual void			setRange(int inMinRange, int inMaxRange);
+	virtual void			getRange(int& outMinRange, int& outMaxRange);
+	virtual int				getRangeWindow();
+	virtual void			setRangeWindow(int inRangeWindow);
+	virtual void			setSize(int inWidth, int inHeight);
+	virtual void			getNobPos(int& outMin, int& outMax);
+	virtual bool			hasFullRange();
+
+	// Behavior
+	virtual void			cursorMoved(int x,int y,Panel* panel);
+	virtual void			cursorEntered(Panel* panel) {}
+	virtual void			cursorExited(Panel* panel) {}
+	virtual void			mousePressed(MouseCode code, Panel* panel);
+	virtual void			mouseDoublePressed(MouseCode code,Panel* panel) {}
+	virtual void			mouseReleased(MouseCode code,Panel* panel);
+	virtual void			mouseWheeled(int delta, Panel* panel);
+	virtual void			keyPressed(KeyCode code,Panel* panel) {}
+	virtual void			keyTyped(KeyCode code,Panel* panel) {}
+	virtual void			keyReleased(KeyCode code,Panel* panel) {}
+	virtual void			keyFocusTicked(Panel* panel) {}
+
+protected:					
+    virtual void			fireIntChangeSignal();
+	virtual void			paintBackground();
+	
+private:
+	void					computeNobBox(int& outStartX, int& outStartY, int& outEndX, int& outEndY);
+	virtual void			recomputeNobPosFromValue();
+	virtual void			recomputeValueFromNobPos();
+
+	bool					mDragging;
+	Dar<IntChangeSignal*>	mIntChangeSignalDar;
+	int						mNobDragStartPos[2];
+	int						mDragStartPos[2];
+
+	// The upper left corner of the nob, relative to the slider (so mNobPos[0] is 0 for a vertical slider, mNobPos[1] is 0 for a horizontal slider)
+	int						mNobPos[2];
+
+	int						mRange[2];
+	int						mValue;
+
+	// the number of pixels wide or high the nob is (wide for horizontal slider, heigh for vertical)
+	int						mRangeWindow;
+
+	bool					mIsVertical;
+
+	int						mLastMouseX;
+	int						mLastMouseY;
+//	int						mButtonOffset;
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/ui/SpritePanel.cpp b/main/source/ui/SpritePanel.cpp
new file mode 100644
index 00000000..6d80a273
--- /dev/null
+++ b/main/source/ui/SpritePanel.cpp
@@ -0,0 +1,164 @@
+#include "ui/SpritePanel.h"
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+
+const string kTopAlignment = "top";
+const string kBottomAlignment = "bottom";
+
+SpritePanel::SpritePanel(const string& inBaseSpriteName, const string& inRenderMode)
+{
+	this->mBaseSpriteName = inBaseSpriteName;
+	ASSERT(this->mBaseSpriteName.c_str() != "");
+	
+	this->mRenderMode = inRenderMode;
+	this->mSpriteHandle = 0;
+	this->mGammaSlope = 1.0f;
+}
+
+int	SpritePanel::GetNumSpritesAcross() 
+{
+	ASSERT(this->mSpriteHandle);
+	int theFrame = 0;
+	
+	int theSpriteWidth = SPR_Width(this->mSpriteHandle, theFrame);
+	
+	int theCompWidth;
+	int theCompHeight;
+	this->getSize(theCompWidth, theCompHeight);
+	
+	int theNumSpritesAcross = max(1, ((theCompWidth + theSpriteWidth - 1)/theSpriteWidth));
+	
+	return theNumSpritesAcross;
+}
+
+int	SpritePanel::GetNumSpritesDown() 
+{
+	ASSERT(this->mSpriteHandle);
+	int theFrame = 0;
+	
+	int theSpriteHeight = SPR_Height(this->mSpriteHandle, theFrame);
+	
+	int theCompWidth;
+	int theCompHeight;
+	this->getSize(theCompWidth, theCompHeight);
+	
+	int theNumSpritesDown = max(1, ((theCompHeight + theSpriteHeight - 1)/theSpriteHeight));
+	
+	return theNumSpritesDown;
+	
+}
+
+void SpritePanel::NotifyGammaChange(float inGammaSlope)
+{
+	this->mGammaSlope = inGammaSlope;
+}
+
+void SpritePanel::paint()
+{
+	int theScreenWidth = ScreenWidth();
+	int theScreenHeight = ScreenHeight();
+
+	if(!this->mSpriteHandle)
+	{
+		// Load it up
+		char theSpriteName[256];
+		sprintf(theSpriteName, "sprites/%d%s.spr", theScreenWidth, this->mBaseSpriteName.c_str());
+		this->mSpriteHandle = Safe_SPR_Load(theSpriteName);
+
+		// If loaded, reposition component if bottom aligned
+		if(this->mSpriteHandle)
+		{
+			if(this->mVAlignment == kBottomAlignment)
+			{
+				int theX, theY;
+				this->getPos(theX, theY);
+
+				int theWidth, theHeight;
+				this->getSize(theWidth, theHeight);
+				
+				int theSpriteHeight = SPR_Height(this->mSpriteHandle, 0);
+				int theNumSpritesDown = this->GetNumSpritesDown();
+
+				int theAdjustedHeightDiff = (theSpriteHeight*theNumSpritesDown - theHeight);
+				this->setPos(theX, theY - theAdjustedHeightDiff);
+
+				int theNewHeight = theHeight + theAdjustedHeightDiff;
+				this->setSize(theWidth, theNewHeight);
+			}
+		}
+	}
+	
+	if(this->mSpriteHandle)
+	{
+		// NOTE: Assumes that all frames are the same size
+		int theFrame = 0;
+		
+		int theCompWidth;
+		int theCompHeight;
+		this->getSize(theCompWidth, theCompHeight);
+		
+		int theNumSpritesAcross = this->GetNumSpritesAcross();
+		int theNumSpritesDown = this->GetNumSpritesDown();
+		int theNumFramesToFillArea = theNumSpritesAcross*theNumSpritesDown;
+		int theCurrentFrame = 0;
+		
+		int theNumFrames = SPR_Frames(this->mSpriteHandle);
+		int theSpriteWidth = SPR_Width(this->mSpriteHandle, theFrame);
+		int theSpriteHeight = SPR_Height(this->mSpriteHandle, theFrame);
+
+		int theAlignBottomOffset = 0;
+		//if(this->mVAlignment == kBottomAlignment)
+		//{
+		//	theAlignBottomOffset = min(0, theCompHeight - theNumSpritesDown*theSpriteHeight);
+		//}
+
+		for(int theY = 0; theY < theNumSpritesDown; theY++)
+		{
+			for(int theX = 0; theX < theNumSpritesAcross; theX++)
+			{
+				if(theCurrentFrame < theNumFrames)
+				{
+					int theGammaAwareColorComponent = (int)(255.0f/this->mGammaSlope);
+					SPR_Set(this->mSpriteHandle, theGammaAwareColorComponent, theGammaAwareColorComponent, theGammaAwareColorComponent);
+					int theFinalX = theX*theSpriteWidth;
+					int theFinalY = theY*theSpriteHeight + theAlignBottomOffset;
+					//if(!theAlignmentIsTop)
+					//{
+					//	theFinalY = theScreenHeight - (theNumSpritesDown - theY)*theSpriteHeight;
+					//}
+
+					if(this->mRenderMode == "alphatest")
+					{
+						SPR_DrawHoles(theCurrentFrame, theFinalX, theFinalY, NULL);
+					}
+					else if(this->mRenderMode == "additive")
+					{
+						SPR_DrawAdditive(theCurrentFrame, theFinalX, theFinalY, NULL);
+					}
+					else
+					{
+						SPR_Draw(theCurrentFrame, theFinalX, theFinalY, NULL);
+					}
+
+					theCurrentFrame++;
+				}
+			}
+		}
+	}
+}
+
+void SpritePanel::paintBackground()
+{
+}
+
+void SpritePanel::SetVAlignment(const string& inAlignment)
+{
+	ASSERT((inAlignment == kTopAlignment) || (inAlignment == kBottomAlignment));
+
+	this->mVAlignment = inAlignment;
+}
+
+void SpritePanel::VidInit(void)
+{
+	this->mSpriteHandle = 0;
+}
diff --git a/main/source/ui/SpritePanel.h b/main/source/ui/SpritePanel.h
new file mode 100644
index 00000000..6715f584
--- /dev/null
+++ b/main/source/ui/SpritePanel.h
@@ -0,0 +1,35 @@
+#ifndef SPRITEPANEL_H
+#define SPRITEPANEL_H
+
+#include "vgui_Panel.h"
+#include "ui/GammaAwareComponent.h"
+#include "ui/ReloadableComponent.h"
+#include "types.h"
+
+class SpritePanel : public vgui::Panel, public ReloadableComponent, public GammaAwareComponent
+{
+public:
+					SpritePanel(const string& inBaseSpriteName, const string& inRenderMode);
+
+	virtual void	NotifyGammaChange(float inGammaSlope);
+					
+	virtual void	SetVAlignment(const string& inAlignment);
+
+	virtual void	VidInit(void);
+
+protected:
+	int				GetNumSpritesAcross();
+	int				GetNumSpritesDown();
+	virtual void	paint();
+	virtual void	paintBackground();
+
+private:
+	string			mBaseSpriteName;
+	string			mRenderMode;
+	string			mVAlignment;
+	int				mSpriteHandle;
+	float			mGammaSlope;
+
+};
+
+#endif
diff --git a/main/source/ui/StaticLabel.h b/main/source/ui/StaticLabel.h
new file mode 100644
index 00000000..8475873d
--- /dev/null
+++ b/main/source/ui/StaticLabel.h
@@ -0,0 +1,35 @@
+#ifndef STATICLABEL_H
+#define STATICLABEL_H
+
+#include "vgui_Label.h"
+
+class StaticLabel : public vgui::Label
+{
+public:
+					StaticLabel(int wide, int tall) : mOriginalWidth(wide), mOriginalHeight(tall), Label("", 0, 0, wide, tall)
+					{
+					}
+
+					StaticLabel(const char* text,int x,int y,int wide,int tall) : mOriginalWidth(wide), mOriginalHeight(tall), Label(text, x, y, wide, tall)
+					{
+					}
+
+			void	SetStaticSize(int inWidth, int inHeight)
+					{
+						this->mOriginalWidth = inWidth;
+						this->mOriginalHeight = inHeight;
+						this->setSize(inWidth, inHeight);
+					}
+	
+	virtual void	setSize(int wide,int tall)
+					{
+						//Label::setSize(this->mOriginalWidth, this->mOriginalHeight);
+                        Label::setSize(wide, tall);
+					}
+
+private:
+	int				mOriginalWidth;
+	int				mOriginalHeight;
+};
+
+#endif
diff --git a/main/source/ui/UIComponent.cpp b/main/source/ui/UIComponent.cpp
new file mode 100644
index 00000000..372fc73b
--- /dev/null
+++ b/main/source/ui/UIComponent.cpp
@@ -0,0 +1,55 @@
+#include "ui/UIComponent.h"
+
+UIComponent::UIComponent(void)
+{
+}
+
+UIComponent::~UIComponent(void)
+{
+}
+
+bool UIComponent::AllocateAndSetProperties(const TRDescription& inDescription, CSchemeManager* inSchemeManager)
+{
+	bool theSuccess = false;
+
+	this->AllocateComponent(inDescription);
+
+    this->mDescription = inDescription;
+
+	theSuccess = this->SetClassProperties(inDescription, this->GetComponentPointer(), inSchemeManager);
+	if(!theSuccess)
+	{
+		/* TODO: Emit error*/
+	}
+
+	return theSuccess;
+}
+TRDescription& UIComponent::GetDescription(void)
+{
+    return this->mDescription;
+}
+
+const TRDescription& UIComponent::GetDescription(void) const
+{
+    return this->mDescription;
+}
+
+const string& UIComponent::GetName(void) const
+{
+	return this->mName;
+}
+
+void UIComponent::SetName(const string& inName)
+{
+	this->mName = inName;
+}
+
+bool UIComponent::SetClassProperties(const TRDescription& inDescription, Panel* inComponent, CSchemeManager* inSchemeManager)
+{
+	return true;
+}
+
+void UIComponent::Update(float theCurrentTime)
+{
+    theCurrentTime;
+}
diff --git a/main/source/ui/UIComponent.h b/main/source/ui/UIComponent.h
new file mode 100644
index 00000000..caa01caa
--- /dev/null
+++ b/main/source/ui/UIComponent.h
@@ -0,0 +1,54 @@
+#ifndef UICOMPONENT_H
+#define UICOMPONENT_H
+
+#include "textrep/TRDescription.h"
+#include "VGUI_Panel.h"
+class CSchemeManager;
+
+using namespace vgui;
+
+// Maintains the text representation of a component.  This is a base class that other UI components will be extended
+// from.  It can read and write a description of the component, building the VGUI component in the process.  At any time
+// it can be bound to the Half-life engine or removed from it.
+class UIComponent 
+{
+public:
+	UIComponent(void);
+
+	// Destructor automatically removes component from the engine
+	virtual ~UIComponent(void);
+
+	bool			        AllocateAndSetProperties(const TRDescription& inDescription, CSchemeManager* inSchemeManager);
+
+	virtual Panel*			GetComponentPointer(void) = 0;
+
+	// Used to save component back out again
+	TRDescription&	        GetDescription(void);
+
+	const TRDescription&	GetDescription(void) const;
+
+	const string&			GetName(void) const;
+
+	virtual const string&	GetType(void) const = 0;
+
+	virtual bool			SetClassProperties(const TRDescription& inDescription, Panel* inComponent, CSchemeManager* inSchemeManager);
+
+	void					SetName(const string& inName);
+
+    virtual void            Update(float theCurrentTime);
+
+protected:
+	string					mName;
+
+	string					mType;
+
+	TRDescription			mDescription;
+
+private:
+
+	virtual void AllocateComponent(const TRDescription& inDescription) = 0;
+
+
+};
+
+#endif
diff --git a/main/source/ui/UIComponents.cpp b/main/source/ui/UIComponents.cpp
new file mode 100644
index 00000000..81ec922f
--- /dev/null
+++ b/main/source/ui/UIComponents.cpp
@@ -0,0 +1,758 @@
+#include "ui/UIComponents.h"
+#include "ui/UITags.h"
+#include "ui/UIUtil.h"
+
+//extern "C"
+//{
+//   void* VGui_GetPanel();
+//}
+
+
+//////////////////////////
+// Panel -> UIComponent //
+//////////////////////////
+void UIPanel::AllocateComponent(const TRDescription& inDescription)
+{
+    this->mUIPanel = new Panel();
+}
+
+bool UIPanel::SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager)
+{
+    bool theArgOne, theArgTwo;
+
+    UIComponent::SetClassProperties(inDesc, inPanel, inSchemeManager);
+
+    // Position (normalized screen coords)
+    float theXPos = UIDefaultXPos;
+    float theYPos = UIDefaultYPos;
+    theArgOne = inDesc.GetTagValue(UITagXPos, theXPos);
+    theArgTwo = inDesc.GetTagValue(UITagYPos, theYPos);
+    if(theArgOne || theArgTwo)
+    {
+        inPanel->setPos(theXPos*ScreenWidth(), theYPos*ScreenHeight());
+    }
+
+    // Width and height (normalized screen coords)
+    float theWidth = UIDefaultWidth;
+    float theHeight = UIDefaultHeight;
+    theArgOne = inDesc.GetTagValue(UITagWidth, theWidth);
+    theArgTwo = inDesc.GetTagValue(UITagHeight, theHeight);
+    if(theArgOne || theArgTwo)
+    {
+        inPanel->setSize(theWidth*ScreenWidth(), theHeight*ScreenHeight());
+    }
+
+    // Preferred size (normalized screen coords)
+    float thePreferredWidth = UIDefaultPreferredWidth;
+    float thePreferredHeight = UIDefaultPreferredHeight;
+    theArgOne = inDesc.GetTagValue(UITagPreferredWidth, thePreferredWidth);
+    theArgTwo = inDesc.GetTagValue(UITagPreferredHeight, thePreferredHeight);
+    if(theArgOne || theArgTwo)
+    {
+        inPanel->setPreferredSize(thePreferredWidth*ScreenWidth(), thePreferredHeight*ScreenHeight());
+    }
+
+    // Background color (rgba)
+    string theColorString;
+    if(inDesc.GetTagValue(UITagBGColor, theColorString))
+    {
+        Color theColor;
+        UIStringToColor(theColorString, theColor);
+        inPanel->setBgColor(theColor);
+    }
+
+    // Foreground color (rgba)
+    if(inDesc.GetTagValue(UITagFGColor, theColorString))
+    {
+        Color theColor;
+        UIStringToColor(theColorString, theColor);
+        inPanel->setFgColor(theColor);
+    }
+
+    // Default visibility (bool)
+    bool theTempBool = UIDefaultVisibility;
+    if(inDesc.GetTagValue(UITagVisible, theTempBool))
+    {
+        inPanel->setVisible(theTempBool);
+    }
+
+    // Remember the comp name
+    this->SetName(inDesc.GetName());
+
+    return true;
+}
+
+void UIPanel::Update(float theCurrentTime)
+{
+	UIComponent::Update(theCurrentTime);
+}
+
+
+////////////////////
+// Label -> Panel //
+////////////////////
+void UILabel::AllocateComponent(const TRDescription& inDesc)
+{
+	string theTitle;
+    inDesc.GetTagValue(UITagText, theTitle);
+
+    string theDefaultText;
+	LocalizeString(theTitle.c_str(), theDefaultText);
+	
+    this->mUILabel = new Label(theDefaultText.c_str());
+}
+
+bool UILabel::SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager)
+{
+    bool theSuccess = true;
+	
+    Label* theLabel = (Label*)inPanel;
+	
+    theSuccess = UIPanel::SetClassProperties(inDesc, inPanel, inSchemeManager);
+    
+    if(theSuccess)
+    {
+        string theAlignmentString;
+        if(inDesc.GetTagValue(UITagAlignment, theAlignmentString))
+        {
+            // Convert the alignment from a string to the label enum
+            Label::Alignment theAlignment = vgui::Label::a_center;
+            UIStringToAlignment(theAlignmentString, theAlignment);
+            theLabel->setContentAlignment(theAlignment);
+        }
+		
+        string theTitle;
+        if(inDesc.GetTagValue(UITagText, theTitle))
+        {
+			string theDefaultText("");
+			LocalizeString(theTitle.c_str(), theDefaultText);
+			
+			theLabel->setText(theDefaultText.length(), theDefaultText.c_str());
+        }
+		
+		// Get font to use
+		std::string theSchemeName;
+		if(inDesc.GetTagValue(UITagScheme, theSchemeName))
+		{
+			const char* theSchemeCString = theSchemeName.c_str();
+			SchemeHandle_t theSchemeHandle = inSchemeManager->getSchemeHandle(theSchemeCString);
+			Font* theFont = inSchemeManager->getFont(theSchemeHandle);
+			if(theFont)
+			{
+				theLabel->setFont(theFont);
+			}
+				
+			theSuccess = true;
+		}
+    }
+	
+    return theSuccess;
+}
+
+void UILabel::Update(float theCurrentTime)
+{
+	UIPanel::Update(theCurrentTime);
+}
+
+
+/////////////////////////
+// ImageLabel -> Label //
+/////////////////////////
+void UIImageLabel::AllocateComponent(const TRDescription& inDesc)
+{
+    float theXPos, theYPos;
+    int theWidth, theHeight;
+    string theImageName("ru");
+
+    UIGetPosition(inDesc, theXPos, theYPos, theWidth, theHeight);
+    inDesc.GetTagValue(UITagImage, theImageName);
+
+    // Construct it!
+    this->mUIImageLabel = new CImageLabel(theImageName.c_str(), theXPos*ScreenWidth(), theYPos*ScreenHeight(), theWidth, theHeight);
+}
+
+bool UIImageLabel::SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager)
+{
+    return UILabel::SetClassProperties(inDesc, inPanel, inSchemeManager);
+}
+
+void UIImageLabel::Update(float theCurrentTime)
+{
+	UILabel::Update(theCurrentTime);
+}
+
+
+
+//////////////////////////
+// ProgressBar -> Panel //
+//////////////////////////
+void UIProgressBar::AllocateComponent(const TRDescription& inDesc)
+{
+    int theSegmentCount = UIDefaultProgressBarSegments;
+
+    inDesc.GetTagValue(UITagSegments, theSegmentCount);
+
+    this->mUIProgressBar = new ProgressBar(theSegmentCount);
+}
+
+bool UIProgressBar::SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager)
+{
+    return UIPanel::SetClassProperties(inDesc, inPanel, inSchemeManager);
+}
+
+void UIProgressBar::Update(float theCurrentTime)
+{
+	UIPanel::Update(theCurrentTime);
+}
+
+///////////////////////////
+// ConfigWizard -> Panel //
+///////////////////////////
+void UIConfigWizard::AllocateComponent(const TRDescription& inDesc)
+{
+    float theXPos, theYPos;
+    int theWidth, theHeight;
+    UIGetPosition(inDesc, theXPos, theYPos, theWidth, theHeight);
+
+    this->mUIConfigWizard = new ConfigWizard(theXPos*ScreenWidth(), theYPos*ScreenHeight(), theWidth, theHeight);
+}
+
+bool UIConfigWizard::SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager)
+{
+    return UIPanel::SetClassProperties(inDesc, inPanel, inSchemeManager);
+}
+
+void UIConfigWizard::Update(float theCurrentTime)
+{
+	UIPanel::Update(theCurrentTime);
+}
+
+
+
+///////////////////////////
+// TreeFolder -> Panel //
+///////////////////////////
+void UITreeFolder::AllocateComponent(const TRDescription& inDesc)
+{
+    string thePathName = UIDefaultPathName;
+    inDesc.GetTagValue(UITagPathName, thePathName);
+
+    this->mUITreeFolder = new TreeFolder(thePathName.c_str());
+}
+
+bool UITreeFolder::SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager)
+{
+    return UIPanel::SetClassProperties(inDesc, inPanel, inSchemeManager);
+}
+
+void UITreeFolder::Update(float theCurrentTime)
+{
+	UIPanel::Update(theCurrentTime);
+}
+
+
+
+///////////////////
+// Menu -> Panel //
+///////////////////
+void UIMenu::AllocateComponent(const TRDescription& inDesc)
+{
+    float theXPos, theYPos;
+    int theWidth, theHeight;
+    UIGetPosition(inDesc, theXPos, theYPos, theWidth, theHeight);
+
+    this->mUIMenu = new Menu(theXPos*ScreenWidth(), theYPos*ScreenHeight(), theWidth, theHeight);
+}
+
+bool UIMenu::SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager)
+{
+    return UIPanel::SetClassProperties(inDesc, inPanel, inSchemeManager);
+}
+
+void UIMenu::Update(float theCurrentTime)
+{
+	UIPanel::Update(theCurrentTime);
+}
+
+
+////////////////////////
+// PopupMenu -> Panel //
+////////////////////////
+void UIPopupMenu::AllocateComponent(const TRDescription& inDesc)
+{
+    float theXPos, theYPos;
+    int theWidth, theHeight;
+    UIGetPosition(inDesc, theXPos, theYPos, theWidth, theHeight);
+
+    this->mUIPopupMenu = new PopupMenu(theXPos*ScreenWidth(), theYPos*ScreenHeight(), theWidth, theHeight);
+}
+
+bool UIPopupMenu::SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager)
+{
+    return UIMenu::SetClassProperties(inDesc, inPanel, inSchemeManager);
+}
+
+void UIPopupMenu::Update(float theCurrentTime)
+{
+	UIMenu::Update(theCurrentTime);
+}
+
+
+/////////////////////////
+// ImagePanel -> Panel //
+/////////////////////////
+void UIImagePanel::AllocateComponent(const TRDescription& inDesc)
+{
+    Image* theImage = NULL;
+
+    this->mUIImagePanel = new ImagePanel(theImage);
+}
+
+bool UIImagePanel::SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager)
+{
+    return UIPanel::SetClassProperties(inDesc, inPanel, inSchemeManager);
+}
+
+void UIImagePanel::Update(float theCurrentTime)
+{
+	UIPanel::Update(theCurrentTime);
+}
+
+
+/////////////////////
+// Button -> Label //
+/////////////////////
+void UIButton::AllocateComponent(const TRDescription& inDesc)
+{
+    float theXPos, theYPos;
+    int theWidth, theHeight;
+    UIGetPosition(inDesc, theXPos, theYPos, theWidth, theHeight);
+	
+	string theTitle;
+    inDesc.GetTagValue(UITagText, theTitle);
+
+    string theDefaultText;
+	LocalizeString(theTitle.c_str(), theDefaultText);
+	
+    this->mUIButton = new Button(theDefaultText.c_str(), theXPos*ScreenWidth(), theYPos*ScreenHeight(), theWidth, theHeight);
+}
+
+bool UIButton::SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager)
+{
+    return UILabel::SetClassProperties(inDesc, inPanel, inSchemeManager);
+}
+
+void UIButton::Update(float theCurrentTime)
+{
+	UILabel::Update(theCurrentTime);
+}
+
+/////////////////////////////////////
+// FadingImageLabel -> CImageLabel //
+/////////////////////////////////////
+void UIFadingImageLabel::AllocateComponent(const TRDescription& inDesc)
+{
+    float theXPos, theYPos;
+    int theWidth = ScreenWidth();
+    int theHeight = ScreenHeight();
+    string theImageName("default");
+
+    UIGetPosition(inDesc, theXPos, theYPos, theWidth, theHeight);
+    inDesc.GetTagValue(UITagImage, theImageName);
+
+    // Construct it!
+    //this->mUIFadingImageLabel = new FadingImageLabel(theImageName.c_str(), theXPos*ScreenWidth, theYPos*ScreenHeight, theWidth, theHeight);
+    //this->mUIFadingImageLabel = new FadingImageLabel(theImageName.c_str(), theXPos*ScreenWidth, theYPos*ScreenHeight);
+    //this->mUIFadingImageLabel = new FadingImageLabel(theXPos*ScreenWidth, theYPos*ScreenHeight);
+    this->mUIFadingImageLabel = new FadingImageLabel(0, 0);
+}
+
+bool UIFadingImageLabel::SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager)
+{
+    bool theSuccess = true;
+
+    // TODO: Add special tags
+    // fade time 
+    // image 
+    return UIPanel::SetClassProperties(inDesc, inPanel, inSchemeManager);
+}
+
+void UIFadingImageLabel::Update(float theCurrentTime)
+{
+	UIPanel::Update(theCurrentTime);
+
+	this->mUIFadingImageLabel->Update(theCurrentTime);
+}
+
+
+
+void UIMarqueeComponent::AllocateComponent(const TRDescription& inDesc)
+{
+    float theXPos, theYPos;
+    int theWidth = ScreenWidth();
+    int theHeight = ScreenHeight();
+	
+    UIGetPosition(inDesc, theXPos, theYPos, theWidth, theHeight);
+	
+    // Construct it!
+    this->mUIMarqueeComponent = new MarqueeComponent();
+}
+
+bool UIMarqueeComponent::SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager)
+{
+    bool theSuccess = true;
+	
+    // TODO: Add special tags
+    // fade time 
+    // image 
+    return UIPanel::SetClassProperties(inDesc, inPanel, inSchemeManager);
+}
+
+void UIMarqueeComponent::Update(float theCurrentTime)
+{
+	UIPanel::Update(theCurrentTime);
+}
+
+
+
+
+
+///////////////////////////
+// ColoredPanel -> Panel //
+///////////////////////////
+void UIColoredPanel::AllocateComponent(const TRDescription& inDesc)
+{
+    // Position (normalized screen coords)
+    float theXPos = UIDefaultXPos;
+    float theYPos = UIDefaultYPos;
+    inDesc.GetTagValue(UITagXPos, theXPos);
+    inDesc.GetTagValue(UITagYPos, theYPos);
+	
+    // Width and height (normalized screen coords)
+    float theWidth = UIDefaultWidth;
+    float theHeight = UIDefaultHeight;
+    inDesc.GetTagValue(UITagWidth, theWidth);
+    inDesc.GetTagValue(UITagHeight, theHeight);
+	
+    this->mUIColoredPanel = new ColoredPanel(theXPos*ScreenWidth(), theYPos*ScreenHeight(), theWidth*ScreenWidth(), theHeight*ScreenHeight());
+}
+
+bool UIColoredPanel::SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager)
+{
+    return UIPanel::SetClassProperties(inDesc, inPanel, inSchemeManager);
+}
+
+void UIColoredPanel::Update(float theCurrentTime)
+{
+	UIPanel::Update(theCurrentTime);
+}
+
+/////////////////////////////
+// InvisiblePanel -> Panel //
+/////////////////////////////
+void UIInvisiblePanel::AllocateComponent(const TRDescription& inDesc)
+{
+    this->mUIInvisiblePanel = new InvisiblePanel();
+}
+
+bool UIInvisiblePanel::SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager)
+{
+    return UIPanel::SetClassProperties(inDesc, inPanel, inSchemeManager);
+}
+
+void UIInvisiblePanel::Update(float theCurrentTime)
+{
+	UIPanel::Update(theCurrentTime);
+}
+
+///////////////////////////
+// Slider -> Panel //
+///////////////////////////
+void UISlider::AllocateComponent(const TRDescription& inDesc)
+{
+	float theX = 0;
+	float theY = 0;
+	float theWidth = 50;
+	float theHeight = 50;
+	bool theIsVertical = false;
+
+	inDesc.GetTagValue(UITagXPos, theX);
+	inDesc.GetTagValue(UITagYPos, theY);
+	inDesc.GetTagValue(UITagWidth, theWidth);
+	inDesc.GetTagValue(UITagHeight, theHeight);
+	inDesc.GetTagValue(UIIsVertical, theIsVertical);
+
+	int theScreenWidth = ScreenWidth();
+	int theScreenHeight = ScreenHeight();
+    this->mUISlider = new Slider(theX*theScreenWidth, theY*theScreenHeight, theWidth*theScreenWidth, theHeight*theScreenHeight, theIsVertical);
+}
+
+bool UISlider::SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager)
+{
+    UIPanel::SetClassProperties(inDesc, inPanel, inSchemeManager);
+
+	// Read lower and upper limits
+	int theLowerValue = 0;
+	int theUpperValue = 20;
+
+    inDesc.GetTagValue(UILowerValue, theLowerValue);
+    inDesc.GetTagValue(UIUpperValue, theUpperValue);
+
+	Slider* theSlider = dynamic_cast<Slider*>(inPanel);
+	ASSERT(theSlider);
+	theSlider->setRange(theLowerValue, theUpperValue);
+
+	int theRangeWindow;
+	if(inDesc.GetTagValue(UIRangeWindow, theRangeWindow))
+	{
+		// The range window is in pixels, the lower and upper values are in their own arbitrary scale
+		//int theValueRange = theUpperValue - theLowerValue;
+		//ASSERT(theRangeWindow < theValueRange);
+
+		theSlider->setRangeWindowEnabled(true);
+		theSlider->setRangeWindow(theRangeWindow);
+	}
+
+	int theStartingValue;
+	if(inDesc.GetTagValue(UIDefaultIntValue, theStartingValue))
+	{
+		theSlider->setValue(theStartingValue);
+	}
+		
+    return true;
+}
+
+void UISlider::Update(float theCurrentTime)
+{
+	UIPanel::Update(theCurrentTime);
+}
+
+///////////////////////////
+// Slider2 -> Panel //
+///////////////////////////
+void UISlider2::AllocateComponent(const TRDescription& inDesc)
+{
+	float theX = 0;
+	float theY = 0;
+	float theWidth = 50;
+	float theHeight = 50;
+	bool theIsVertical = false;
+	
+	inDesc.GetTagValue(UITagXPos, theX);
+	inDesc.GetTagValue(UITagYPos, theY);
+	inDesc.GetTagValue(UITagWidth, theWidth);
+	inDesc.GetTagValue(UITagHeight, theHeight);
+	inDesc.GetTagValue(UIIsVertical, theIsVertical);
+	
+	int theScreenWidth = ScreenWidth();
+	int theScreenHeight = ScreenHeight();
+    this->mUISlider2 = new Slider2(theX*theScreenWidth, theY*theScreenHeight, theWidth*theScreenWidth, theHeight*theScreenHeight, theIsVertical);
+}
+
+bool UISlider2::SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager)
+{
+    UIPanel::SetClassProperties(inDesc, inPanel, inSchemeManager);
+	
+	// Read lower and upper limits
+	int theLowerValue = 0;
+	int theUpperValue = 20;
+	
+    inDesc.GetTagValue(UILowerValue, theLowerValue);
+    inDesc.GetTagValue(UIUpperValue, theUpperValue);
+	
+	Slider2* theSlider2 = dynamic_cast<Slider2*>(inPanel);
+	ASSERT(theSlider2);
+	theSlider2->setRange(theLowerValue, theUpperValue);
+	
+	int theRangeWindow;
+	if(inDesc.GetTagValue(UIRangeWindow, theRangeWindow))
+	{
+		// The range window is in pixels, the lower and upper values are in their own arbitrary scale
+		//int theValueRange = theUpperValue - theLowerValue;
+		//ASSERT(theRangeWindow < theValueRange);
+		
+		theSlider2->setRangeWindowEnabled(true);
+		theSlider2->setRangeWindow(theRangeWindow);
+	}
+	
+	int theStartingValue;
+	if(inDesc.GetTagValue(UIDefaultIntValue, theStartingValue))
+	{
+		theSlider2->setValue(theStartingValue);
+	}
+	
+    return true;
+}
+
+void UISlider2::Update(float theCurrentTime)
+{
+	UIPanel::Update(theCurrentTime);
+}
+
+
+//////////////////////////
+// StaticLabel -> Label //
+//////////////////////////
+void UIStaticLabel::AllocateComponent(const TRDescription& inDesc)
+{
+	string theTitle;
+    inDesc.GetTagValue(UITagText, theTitle);
+
+	string theDefaultText("");
+	LocalizeString(theTitle.c_str(), theDefaultText);
+	
+    // Position (normalized screen coords)
+    float theXPos = UIDefaultXPos;
+    float theYPos = UIDefaultYPos;
+    inDesc.GetTagValue(UITagXPos, theXPos);
+    inDesc.GetTagValue(UITagYPos, theYPos);
+	
+    // Width and height (normalized screen coords)
+    float theWidth = UIDefaultWidth;
+    float theHeight = UIDefaultHeight;
+    inDesc.GetTagValue(UITagWidth, theWidth);
+    inDesc.GetTagValue(UITagHeight, theHeight);
+	
+    this->mUIStaticLabel = new StaticLabel(theDefaultText.c_str(), theXPos*ScreenWidth(), theYPos*ScreenHeight(), theWidth*ScreenWidth(), theHeight*ScreenHeight());
+}
+
+bool UIStaticLabel::SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager)
+{
+    return UILabel::SetClassProperties(inDesc, inPanel, inSchemeManager);
+}
+
+void UIStaticLabel::Update(float theCurrentTime)
+{
+	UILabel::Update(theCurrentTime);
+}
+
+
+
+
+//////////////////////////
+// SpritePanel -> Panel //
+//////////////////////////
+void UISpritePanel::AllocateComponent(const TRDescription& inDesc)
+{
+	string theBaseSpriteName;
+    inDesc.GetTagValue(UIBaseSprite, theBaseSpriteName);
+
+	string theRenderMode;
+    inDesc.GetTagValue(UIRenderMode, theRenderMode);
+	
+    this->mUISpritePanel = new SpritePanel(theBaseSpriteName, theRenderMode);
+
+	string theVAlignment;
+    if(inDesc.GetTagValue(UIVAlignment, theVAlignment))
+	{
+		this->mUISpritePanel->SetVAlignment(theVAlignment);
+	}
+}
+
+bool UISpritePanel::SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager)
+{
+    bool theSuccess = true;
+	
+    SpritePanel* theSpritePanel = (SpritePanel*)inPanel;
+	
+    theSuccess = UIPanel::SetClassProperties(inDesc, inPanel, inSchemeManager);
+    
+    if(theSuccess)
+    {
+		// Add any of our own properties here
+    }
+	
+    return theSuccess;
+}
+
+void UISpritePanel::Update(float theCurrentTime)
+{
+	UIPanel::Update(theCurrentTime);
+}
+
+
+//////////////////////////
+// DummyPanel -> Panel //
+//////////////////////////
+void UIDummyPanel::AllocateComponent(const TRDescription& inDesc)
+{
+    this->mUIDummyPanel = new DummyPanel();
+}
+
+bool UIDummyPanel::SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager)
+{
+    bool theSuccess = true;
+
+    theSuccess = UIPanel::SetClassProperties(inDesc, inPanel, inSchemeManager);
+	
+    return theSuccess;
+}
+
+void UIDummyPanel::Update(float theCurrentTime)
+{
+	UIPanel::Update(theCurrentTime);
+}
+
+
+
+/////////////////////////
+// SliderPlus -> Panel //
+/////////////////////////
+void UISliderPlus::AllocateComponent(const TRDescription& inDesc)
+{
+	float theX = 0;
+	float theY = 0;
+	float theWidth = 50;
+	float theHeight = 50;
+	bool theIsVertical = false;
+	
+	inDesc.GetTagValue(UITagXPos, theX);
+	inDesc.GetTagValue(UITagYPos, theY);
+	inDesc.GetTagValue(UITagWidth, theWidth);
+	inDesc.GetTagValue(UITagHeight, theHeight);
+	inDesc.GetTagValue(UIIsVertical, theIsVertical);
+	
+	int theScreenWidth = ScreenWidth();
+	int theScreenHeight = ScreenHeight();
+    this->mUISliderPlus = new SliderPlus(theX*theScreenWidth, theY*theScreenHeight, theWidth*theScreenWidth, theHeight*theScreenHeight, theIsVertical);
+}
+
+bool UISliderPlus::SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager)
+{
+	UIPanel::SetClassProperties(inDesc, inPanel, inSchemeManager);
+	
+	// Read lower and upper limits
+	int theLowerValue = 0;
+	int theUpperValue = 20;
+	
+    inDesc.GetTagValue(UILowerValue, theLowerValue);
+    inDesc.GetTagValue(UIUpperValue, theUpperValue);
+	
+	SliderPlus* theSlider = dynamic_cast<SliderPlus*>(inPanel);
+	ASSERT(theSlider);
+	theSlider->setRange(theLowerValue, theUpperValue);
+	
+	int theRangeWindow;
+	if(inDesc.GetTagValue(UIRangeWindow, theRangeWindow))
+	{
+		// The range window is in pixels, the lower and upper values are in their own arbitrary scale
+		//int theValueRange = theUpperValue - theLowerValue;
+		//ASSERT(theRangeWindow < theValueRange);
+		//theSlider->setRangeWindowEnabled(true);
+		theSlider->setRangeWindow(theRangeWindow);
+	}
+	
+	int theStartingValue;
+	if(inDesc.GetTagValue(UIDefaultIntValue, theStartingValue))
+	{
+		theSlider->setValue(theStartingValue);
+	}
+
+	return true;
+}
+
+void UISliderPlus::Update(float theCurrentTime)
+{
+	UIPanel::Update(theCurrentTime);
+}
+
diff --git a/main/source/ui/UIComponents.h b/main/source/ui/UIComponents.h
new file mode 100644
index 00000000..60fa8aa2
--- /dev/null
+++ b/main/source/ui/UIComponents.h
@@ -0,0 +1,92 @@
+#ifndef UICOMPONENTS_H
+#define UICOMPONENTS_H
+
+#include "ui/UIComponent.h"
+#include "textrep/TRDescription.h"
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+#include "cl_dll/vgui_TeamFortressViewport.h"
+#include "VGUI_ProgressBar.h"
+#include "VGUI_TreeFolder.h"
+#include "VGUI_ConfigWizard.h"
+#include "VGUI_Menu.h"
+#include "VGUI_PopupMenu.h"
+#include "VGUI_ImagePanel.h"
+#include "VGUI_Slider.h"
+#include "ui/SliderPlus.h"
+#include "ui/FadingImageLabel.h"
+#include "ui/MarqueeComponent.h"
+#include "ui/ColoredPanel.h"
+#include "ui/InvisiblePanel.h"
+#include "ui/StaticLabel.h"
+#include "ui/SpritePanel.h"
+#include "ui/DummyPanel.h"
+#include "game_shared/vgui_slider2.h"
+class CSchemeManager;
+
+using namespace vgui;
+
+// This macro generates the classes used for all the vgui components.
+// The key here is that the most derived components can override parent
+// values.  Each new component must define an AllocateComponent() function
+// and a SetClassProperties() function.  SetClassProperties must only read
+// tags that its parent doesn't know about, or those that it wishes to override.
+
+#define DEFINE_UICOMPONENT(className, parentName, typeName, vguiName) \
+class className : public parentName \
+{ \
+public: \
+	className(void) \
+		{ \
+            this->mType = typeName; \
+            this->m##className = NULL; \
+        } \
+\
+    virtual ~className(void) \
+        { \
+            delete this->m##className; \
+            this->m##className = NULL; \
+        } \
+\
+	virtual Panel* GetComponentPointer(void) \
+		{ return this->m##className; } \
+\
+	virtual const string& GetType(void) const \
+		{ return this->mType; } \
+\
+    virtual bool SetClassProperties(const TRDescription& inDesc, Panel* inPanel, CSchemeManager* inSchemeManager); \
+\
+	virtual void Update(float theCurrentTime); \
+\
+private: \
+\
+	virtual void AllocateComponent(const TRDescription& inDescription); \
+\
+	vguiName* m##className; \
+};
+
+
+// Kinda ugly but good way to generate all these class such that they are defined to  
+// call each other correctly.
+DEFINE_UICOMPONENT(UIPanel, UIComponent, "Panel", Panel)
+DEFINE_UICOMPONENT(UILabel, UIPanel, "Label", Label)
+DEFINE_UICOMPONENT(UIImageLabel, UILabel, "ImageLabel", CImageLabel)
+DEFINE_UICOMPONENT(UIProgressBar, UIPanel, "ProgressBar", ProgressBar)
+DEFINE_UICOMPONENT(UIConfigWizard, UIPanel, "ConfigWizard", ConfigWizard)
+DEFINE_UICOMPONENT(UITreeFolder, UIPanel, "TreeFolder", TreeFolder)
+DEFINE_UICOMPONENT(UIMenu, UIPanel, "Menu", Menu)
+DEFINE_UICOMPONENT(UIPopupMenu, UIMenu, "PopupMenu", PopupMenu)
+DEFINE_UICOMPONENT(UIImagePanel, UIPanel, "ImagePanel", ImagePanel)
+DEFINE_UICOMPONENT(UIButton, UILabel, "Button", Button)
+DEFINE_UICOMPONENT(UIFadingImageLabel, UIPanel, "FadingImageLabel", FadingImageLabel)
+DEFINE_UICOMPONENT(UIMarqueeComponent, UIPanel, "MarqueeComponent", MarqueeComponent)
+DEFINE_UICOMPONENT(UIColoredPanel, UIPanel, "ColoredPanel", ColoredPanel)
+DEFINE_UICOMPONENT(UIInvisiblePanel, UIPanel, "InvisiblePanel", InvisiblePanel)
+DEFINE_UICOMPONENT(UISlider, UIPanel, "Slider", Slider)
+DEFINE_UICOMPONENT(UISlider2, UIPanel, "Slider2", Slider2)
+DEFINE_UICOMPONENT(UISliderPlus, UIPanel, "SliderPlus", SliderPlus)
+DEFINE_UICOMPONENT(UIStaticLabel, UILabel, "StaticLabel", StaticLabel)
+DEFINE_UICOMPONENT(UISpritePanel, UIPanel, "SpritePanel", SpritePanel)
+DEFINE_UICOMPONENT(UIDummyPanel, UIPanel, "DummyPanel", DummyPanel)
+
+#endif
diff --git a/main/source/ui/UIFactory.cpp b/main/source/ui/UIFactory.cpp
new file mode 100644
index 00000000..a28677b3
--- /dev/null
+++ b/main/source/ui/UIFactory.cpp
@@ -0,0 +1,105 @@
+
+#include "ui/UIFactory.h"
+#include "ui/UIComponents.h"
+#include "ui/UIPieMenu.h"
+
+UIComponent* UIFactory::BuildComponent(const TRDescription& inTextRep, CSchemeManager* inSchemeManager)
+{
+	UIComponent* theNewComp = NULL;
+	string theCompType = inTextRep.GetType();
+
+	// Switch on the type to see what kind of component to create
+	if(theCompType == "Label")
+	{
+		theNewComp = new UILabel();
+	}
+	if(theCompType == "FadingImageLabel")
+	{
+		theNewComp = new UIFadingImageLabel();
+	}
+	if(theCompType == "MarqueeComponent")
+	{
+		theNewComp = new UIMarqueeComponent();
+	}
+    else if(theCompType == "ImageLabel")
+    {
+        theNewComp = new UIImageLabel();
+    } 
+    else if(theCompType == "ProgressBar")
+    {
+        theNewComp = new UIProgressBar();
+    }
+    else if(theCompType == "TreeFolder")
+    {
+        theNewComp = new UITreeFolder();
+    }
+    else if(theCompType == "ConfigWizard")
+    {
+        theNewComp = new UIConfigWizard();
+    }
+    else if(theCompType == "Menu")
+    {
+        theNewComp = new UIMenu();
+    }
+    else if(theCompType == "PopupMenu")
+    {
+        theNewComp = new UIPopupMenu();
+    }
+    else if(theCompType == "ImagePanel")
+    {
+        theNewComp = new UIImagePanel();
+    }
+    else if(theCompType == "Button")
+    {
+        theNewComp = new UIButton();
+    } 
+	#ifndef AVH_MAPPER_BUILD
+    else if(theCompType == "PieMenu")
+	{
+		theNewComp = new UIPieMenu();
+	}
+	#endif
+    else if(theCompType == "ColoredPanel")
+	{
+		theNewComp = new UIColoredPanel();
+	}
+    else if(theCompType == "InvisiblePanel")
+	{
+		theNewComp = new UIInvisiblePanel();
+	}
+    else if(theCompType == "Slider")
+	{
+		theNewComp = new UISlider();
+	}
+    else if(theCompType == "Slider2")
+	{
+		theNewComp = new UISlider2();
+	}
+    else if(theCompType == "SliderPlus")
+	{
+		theNewComp = new UISliderPlus();
+	}
+    else if(theCompType == "StaticLabel")
+	{
+		theNewComp = new UIStaticLabel();
+	}
+    else if(theCompType == "SpritePanel")
+	{
+		theNewComp = new UISpritePanel();
+	}
+    else if(theCompType == "DummyPanel")
+	{
+		theNewComp = new UIDummyPanel();
+	}
+	
+	// TODO: More cases here
+
+	// If we recognized the type, initialize it and return it
+	if(theNewComp)
+	{
+		theNewComp->AllocateAndSetProperties(inTextRep, inSchemeManager);
+	}
+
+	return theNewComp;
+}
+
diff --git a/main/source/ui/UIFactory.h b/main/source/ui/UIFactory.h
new file mode 100644
index 00000000..c7750a9e
--- /dev/null
+++ b/main/source/ui/UIFactory.h
@@ -0,0 +1,17 @@
+#ifndef UI_FACTORY_H
+#define UI_FACTORY_H
+
+#include "textrep/TRDescription.h"
+class UIComponent;
+class CSchemeManager;
+
+class UIFactory
+{
+public:
+	// Uses name of entity to decided what type of UI component to build, uses the description to 
+	// set all it's properties it recognizes
+    virtual UIComponent*  BuildComponent(const TRDescription& inTextRep, CSchemeManager* inSchemeManager);
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/ui/UIHud.cpp b/main/source/ui/UIHud.cpp
new file mode 100644
index 00000000..1a8af985
--- /dev/null
+++ b/main/source/ui/UIHud.cpp
@@ -0,0 +1,660 @@
+#include "ui/UIHud.h"
+#include "textrep/TRFactory.h"
+#include "cl_dll/cl_util.h"
+#include "cl_dll/hud.h"
+#include "vgui_Scheme.h"
+#include "vgui_Panel.h"
+#include "mod/AvHClientVariables.h"
+#include "vgui_App.h"
+
+// for FindFirst and FindNext
+#include <windows.h>
+#include "fmoddyn.h"
+
+using namespace vgui;
+
+extern BitmapTGA* LoadTGA( const char* pImageName );
+
+// Initialize hud from specified input file
+UIHud::UIHud(const string& inFilename, UIFactory* inFactory) : CHud(), mFilename(inFilename), mManager(inFactory)
+{
+
+    this->mFMOD = NULL;
+
+	// Set flag false so we load the first time
+	this->mInitted = false;
+	this->mSoundInitialized = false;
+	this->mMusicEnabled = false;
+	this->mMusicAllowed = false;
+	this->mCurrentSongStream = NULL;
+    this->mCurrentInternetStream = NULL;
+	this->mBytesInCurrentSong = 0;
+	this->mTimeSongEnded = -1;
+	this->mSongIsPlaying = false;
+	this->mRandomSecondsBetweenSongs = 0;
+	this->mCurrentVolume = 0;
+	this->mCurrentChannel = -1;
+    this->mInternetStreamChannel = -1;
+
+    // Init cursor variables
+    this->mArrowBitmap = NULL;
+    this->mArrowCursor = NULL;
+
+	if(TRFactory::ReadDescriptions(mFilename, this->mDescriptionList))
+	{
+	}
+	else
+	{
+		// TODO: Emit error
+	}
+
+    this->mSchemeManager = NULL;
+}
+
+UIHud::~UIHud(void)
+{
+	this->ShutdownMusic();
+}
+
+bool UIHud::GetIsTimeForSong(float inCurrentTime) const
+{
+	bool theTimeForNewSong = false;
+
+	if(this->mMusicEnabled && this->mMusicAllowed && !this->mSongIsPlaying)
+	{
+		float theTimeElapsedSinceSongStopped = inCurrentTime - this->mTimeSongEnded;
+		if((this->mTimeSongEnded == -1) || (theTimeElapsedSinceSongStopped > this->mRandomSecondsBetweenSongs))
+		{
+			theTimeForNewSong = true;
+		}
+	}
+
+	return theTimeForNewSong;
+}
+
+UIManager& UIHud::GetManager(void)
+{
+	return this->mManager;
+}
+
+const UIManager& UIHud::GetManager(void) const
+{
+	return this->mManager;
+}
+
+string UIHud::GetTextHeader(void) const
+{
+    return "Default header\r\n";
+}
+
+void UIHud::Init(void)
+{
+	CHud::Init();
+}
+
+void UIHud::InitializeSound(void)
+{
+
+    char theFileName[2][_MAX_PATH];
+
+    sprintf(theFileName[0], "%s/fmod.dll", getModDirectory());
+    sprintf(theFileName[1], "fmod.dll");
+    
+    for (int i = 0; i < 2 && mFMOD == NULL; ++i)
+    {
+
+        mFMOD = FMOD_CreateInstance(theFileName[i]);
+    
+        // Check sound version
+    
+        if (mFMOD != NULL && mFMOD->FSOUND_GetVersion() == FMOD_VERSION)
+	    {
+		    // Init sound
+		    if (mFMOD->FSOUND_Init(44100, 32, 0))
+		    {
+			    this->mSoundInitialized = true;
+		    }
+		    else
+		    {
+			    char theErrorMessage[512];
+			    sprintf(theErrorMessage, "say %s", FMOD_ErrorString(mFMOD->FSOUND_GetError()));
+			    //ClientCmd(theErrorMessage);
+		    }
+	    }
+        else
+        {
+            FMOD_FreeInstance(mFMOD);
+            mFMOD = NULL;
+        }
+    
+    }
+
+}
+
+
+bool UIHud::InitializeScheme(const char* inName, Scheme* inScheme)
+{
+	bool theSuccess = false;
+
+	// TODO: How to detect if invalid scheme handle?
+	SchemeHandle_t hPrimaryScheme = this->mSchemeManager->getSchemeHandle( inName );
+	{
+		int r, g, b, a;
+
+		// font
+		inScheme->setFont( Scheme::sf_primary1, this->mSchemeManager->getFont(hPrimaryScheme) );
+
+		// text color
+		this->mSchemeManager->getFgColor( hPrimaryScheme, r, g, b, a );
+		inScheme->setColor(Scheme::sc_primary1, r, g, b, a );		// sc_primary1 is non-transparent orange
+
+		// background color (transparent black)
+		this->mSchemeManager->getBgColor( hPrimaryScheme, r, g, b, a );
+		inScheme->setColor(Scheme::sc_primary3, r, g, b, a );
+
+		// armed foreground color
+		this->mSchemeManager->getFgArmedColor( hPrimaryScheme, r, g, b, a );
+		inScheme->setColor(Scheme::sc_secondary2, r, g, b, a );
+
+		// armed background color
+		this->mSchemeManager->getBgArmedColor( hPrimaryScheme, r, g, b, a );
+		inScheme->setColor(Scheme::sc_primary2, r, g, b, a );
+
+		//!! need to get this color from scheme file
+		// used for orange borders around buttons
+		this->mSchemeManager->getBorderColor( hPrimaryScheme, r, g, b, a );
+		inScheme->setColor(Scheme::sc_secondary1, r, g, b, a );
+
+		theSuccess = true;
+	}
+	return theSuccess;
+}
+
+void UIHud::LoadSchemes(void)
+{
+    // Create scheme manager, we have screen dimensions by now
+    this->mSchemeManager = new CSchemeManager(ScreenWidth(), ScreenHeight());
+
+	Scheme* pScheme = App::getInstance()->getScheme();
+	this->InitializeScheme("PieMenuScheme", pScheme);
+//	this->InitializeScheme("TechButtonScheme", pScheme);
+//	this->InitializeScheme("ChainOfCommandScheme", pScheme);
+//	this->InitializeScheme("TitleFont", pScheme);
+//	this->InitializeScheme("Heading1", pScheme);
+}
+
+bool UIHud::PickRandomSong(string& outRelativeSongName) const
+{
+	WIN32_FIND_DATA		theFindData;
+	HANDLE				theFileHandle;
+	StringList			theSongList;
+	bool				theFoundSong = false;
+	int					theNumSongs;
+
+	// Find random song in directory
+	string thePath;
+	if(strcmp(cl_musicdir->string, ""))
+	{
+		thePath = cl_musicdir->string;
+	}
+	else
+	{
+		thePath = string(getModDirectory()) + string("\\") + string(kMusicDirectory);
+	}
+
+	string theFileQualifier = thePath + string("\\*.mp3");
+	theFileHandle = FindFirstFile(theFileQualifier.c_str(), &theFindData);
+	if (theFileHandle != INVALID_HANDLE_VALUE)
+	{
+		do
+		{
+			theSongList.push_back(thePath + string("\\") + string(theFindData.cFileName));
+		} 
+		while(FindNextFile(theFileHandle, &theFindData));
+	
+        FindClose(theFileHandle);
+        theFileHandle = INVALID_HANDLE_VALUE;
+    
+    }
+
+	// Pick a random song in the list
+	theNumSongs = theSongList.size();
+	if(theNumSongs > 0)
+	{
+		int theSongOffset = gEngfuncs.pfnRandomLong( 0, theNumSongs -1 );
+		outRelativeSongName = string(theSongList[theSongOffset]);
+		theFoundSong = true;
+	}
+	
+	return theFoundSong;
+}
+
+void UIHud::ClearStream(FSOUND_STREAM*& ioStream)
+{
+	// TODO: Check error codes to make sure we don't leak?
+    if (mSoundInitialized)
+    {
+    	mFMOD->FSOUND_Stream_Stop(ioStream);
+    	mFMOD->FSOUND_Stream_Close(ioStream);
+    }
+	ioStream = NULL;
+}
+
+bool UIHud::PlaySong(string& inSongName, int& ioVolume, bool inLooping, FSOUND_STREAM*& outStream, int& outChannel, int& outBytesInSong, float inTimeElapsed)
+{
+	bool theSuccess = false;
+
+	// Replace '/' with '\\'
+	std::replace(inSongName.begin(), inSongName.end(), '/', '\\');
+	
+	// Load song
+	char theSongName[255];
+	strcpy(theSongName, inSongName.c_str());
+	
+	// Open
+	unsigned int thePlayMode = FSOUND_STEREO;//FSOUND_NORMAL;
+	thePlayMode |= (inLooping ? FSOUND_LOOP_NORMAL : FSOUND_LOOP_OFF);
+
+	if(!this->mSoundInitialized)
+	{
+		this->InitializeSound();
+	}
+
+    if (mSoundInitialized)
+    {
+    
+	    // If alt-tabbing away at exactly the wrong time, music initialization can fail, don't crash
+	    //ASSERT(this->mSoundInitialized);
+
+	    outStream = mFMOD->FSOUND_Stream_Open(theSongName, thePlayMode, /*FSOUND_NONBLOCKING*/ 0, 0);
+	    if(outStream)
+	    {
+		    outChannel = mFMOD->FSOUND_Stream_Play(FSOUND_FREE, outStream);
+		    if (outChannel >= 0)
+		    {
+			    // Set song progress
+			    if(inTimeElapsed != -1)
+			    {
+				    int theOffsetInMS = inTimeElapsed*1000;
+				    int theSongTimeInMS = mFMOD->FSOUND_Stream_GetLengthMs(outStream);
+
+				    if((theOffsetInMS > theSongTimeInMS) && inLooping)
+				    {
+					    theOffsetInMS %= theSongTimeInMS;	
+				    }
+				    
+				    mFMOD->FSOUND_Stream_SetTime(outStream, theOffsetInMS);
+			    }
+			    
+			    // Set volume to half way.  TODO: This should use a real music volume variable
+			    mFMOD->FSOUND_SetPan(outChannel, FSOUND_STEREOPAN);
+			    
+			    ioVolume = min(max(0, ioVolume), 255);
+			    mFMOD->FSOUND_SetVolume(outChannel, ioVolume);
+
+			    outBytesInSong = mFMOD->FSOUND_Stream_GetLength(outStream);
+
+			    theSuccess = true;
+		    }
+		    else
+		    {
+			    //MessageBox(NULL, "Error.  Cannot start song", "Playing a song", MB_ICONHAND|MB_OK|MB_SYSTEMMODAL);
+			    int a = 0;
+		    }
+	    }
+	    else
+	    {
+		    // TODO: Print out this error message somewhere
+		    char theErrorMessage[512];
+		    sprintf(theErrorMessage, "say %s", FMOD_ErrorString(mFMOD->FSOUND_GetError()));
+	    }
+    
+    }
+
+	return theSuccess;
+}
+
+bool UIHud::PlayInternetStream(const string& inStreamName, string& outError)
+{
+    bool theSuccess = false;
+
+    // Initialize sound system
+    if(!this->mSoundInitialized)
+    {
+        this->InitializeSound();
+    }
+
+    // If initialized
+    if(this->mSoundInitialized)
+    {
+        // If steam is currently playing, clear/stop it
+            // Reset stream channel
+		if(this->mInternetStreamChannel != -1)
+			gHUD.StopInternetStream();
+
+		// If stream channel is reset
+		if(this->mInternetStreamChannel == -1)
+        {
+            // Set buffer size and properties
+            mFMOD->FSOUND_Stream_SetBufferSize(100);
+            mFMOD->FSOUND_Stream_Net_SetBufferProperties(64000, 60, 80);
+
+            // Open stream for playing
+            this->mCurrentInternetStream = mFMOD->FSOUND_Stream_Open(inStreamName.c_str(), FSOUND_NORMAL | FSOUND_NONBLOCKING, 0, 0);
+            if(!this->mCurrentInternetStream)
+            {
+                outError = FMOD_ErrorString(mFMOD->FSOUND_GetError());
+            }
+            else
+            {
+                theSuccess = true;
+            }
+        }
+    }
+
+    return theSuccess;
+}
+
+void UIHud::StopInternetStream()
+{
+    this->ClearStream(this->mCurrentInternetStream);
+    
+    this->mInternetStreamChannel = -1;
+}
+
+bool UIHud::UpdateInternetStream(float inCurrentTime, string& outError)
+{
+    bool theSuccess = true;
+
+    // If we're playing a stream
+    if(this->mCurrentInternetStream)
+    {
+        if(this->mInternetStreamChannel < 0)
+        {
+            this->mInternetStreamChannel = mFMOD->FSOUND_Stream_PlayEx(FSOUND_FREE, this->mCurrentInternetStream, NULL, TRUE);
+            mFMOD->FSOUND_SetPaused(this->mInternetStreamChannel, FALSE);
+            
+            //if (channel != -1)
+            //{
+            //    FSOUND_Stream_Net_SetMetadataCallback(this->mCurrentInternetStream, metacallback, 0);
+           // }
+        }
+
+        // If we get an error, add it as a tooltip
+        int theOpenState = mFMOD->FSOUND_Stream_GetOpenState(this->mCurrentInternetStream);
+        if((theOpenState == -1) || (theOpenState == -3))
+        {
+            //printf("\nERROR: failed to open stream!\n");
+            //printf("SERVER: %s\n", );
+            //break;
+
+            outError = mFMOD->FSOUND_Stream_Net_GetLastServerStatus();
+            theSuccess = false;
+			gHUD.StopStream();
+        }
+    
+        int read_percent = 0, driver = 0, channel = -1, status = 0, bitrate;
+        unsigned int flags;
+        mFMOD->FSOUND_Stream_Net_GetStatus(this->mCurrentInternetStream, &status, &read_percent, &bitrate, &flags);
+    }
+
+    return theSuccess;
+}
+
+void UIHud::PlayRandomSong(void)
+{
+	// Pick random song first
+	string theRelativeSongName;
+	if(this->PickRandomSong(theRelativeSongName))
+	{
+		// Remove current song if any
+		if(this->mCurrentSongStream)
+		{
+			this->StopMusic();
+		}
+
+		// Load song
+//		char theSongName[255];
+//		strcpy(theSongName, theRelativeSongName.c_str());
+//		this->mCurrentSongStream = FSOUND_Stream_OpenMpeg(theSongName, FSOUND_NORMAL | FSOUND_LOOP_OFF);
+//		if(this->mCurrentSongStream)
+//		{
+//			// Play default song
+//			//FMUSIC_PlaySong(mod);
+//			
+//			this->mCurrentChannel = FSOUND_Stream_Play(FSOUND_FREE, this->mCurrentSongStream);
+//			if (this->mCurrentChannel < 0)
+//			{
+//				//	MessageBox(hwnd, "Error.  Cannot start song", "Playing a song", MB_ICONHAND|MB_OK|MB_SYSTEMMODAL);
+//			}
+//			else
+//			{
+//				// Set volume to half way.  TODO: This should use a real music volume variable
+//				FSOUND_SetPan(this->mCurrentChannel, FSOUND_STEREOPAN);
+//
+		int theVolume = (int)(cl_musicvolume->value);
+		//				this->mBytesInCurrentSong = FSOUND_Stream_GetLength(this->mCurrentSongStream);
+		
+		if(this->PlaySong(theRelativeSongName, theVolume, false, this->mCurrentSongStream, this->mCurrentChannel, this->mBytesInCurrentSong))
+		{
+			this->mCurrentVolume = theVolume;
+			int theDelay = (int)(cl_musicdelay->value);
+			this->mRandomSecondsBetweenSongs = gEngfuncs.pfnRandomLong(0, theDelay);
+			//this->mTimeSongEnded = -1.0f;
+			this->mSongIsPlaying = true;
+			
+		}
+//				this->mCurrentVolume = (int)(cl_musicvolume->value);
+//				this->mCurrentVolume = min(max(0, this->mCurrentVolume), 255);
+//				cl_musicvolume->value = this->mCurrentVolume;
+//				FSOUND_SetVolume(this->mCurrentChannel, this->mCurrentVolume);
+//
+//				this->mBytesInCurrentSong = FSOUND_Stream_GetLength(this->mCurrentSongStream);
+//				this->mRandomSecondsBetweenSongs = gEngfuncs.pfnRandomLong(5, 90);
+//				this->mTimeSongEnded = 0.0f;
+//				this->mSongIsPlaying = true;
+//			}
+//		}
+//		else
+//		{
+//			// TODO: Print out this error message somewhere
+//			char theErrorMessage[512];
+//			sprintf(theErrorMessage, "say %s", FMOD_ErrorString(FSOUND_GetError()));
+//		}
+	}
+}
+
+
+void UIHud::PostUIInit(void)
+{
+}
+
+int UIHud::Redraw(float flTime, int intermission)
+{
+	int rc = 0;
+	
+	rc = CHud::Redraw(flTime, intermission);
+	
+	// Now that the file has been parsed, pass it off to the UI manager to build everything
+	// This has to happen after CHud::VidInit because the components depend on the screen resolution to
+	// be sized properly
+	if(!this->mInitted)
+	{
+        this->LoadSchemes();
+		
+		if(this->mManager.Initialize(this->mDescriptionList, this->mSchemeManager))
+		{
+            this->PostUIInit();
+			
+			this->mInitted = true;
+		}
+		else
+		{
+			// TODO: Emit error
+        }
+		
+		// Initialize music the first time through
+		this->InitializeSound();
+    }
+
+    string theErrorString;
+    this->Update(flTime, theErrorString);
+
+	return rc;
+}
+
+void UIHud::ResetGame()
+{
+	this->mTimeSongEnded = -1;
+	this->mRandomSecondsBetweenSongs = 0;
+}
+
+void UIHud::SetMusicAllowed(bool inState)
+{
+	this->mMusicAllowed = inState;
+}
+
+void UIHud::SetUsingVGUI(bool inState)
+{
+	this->mManager.SetUsingVGUI(inState);
+}
+
+void UIHud::Shutdown(void)
+{
+	this->ShutdownMusic();
+}
+
+void UIHud::ShutdownMusic(void)
+{
+	if(this->mSoundInitialized)
+	{
+		this->StopMusic();
+
+        this->StopInternetStream();
+
+		mFMOD->FSOUND_Close();
+
+        FMOD_FreeInstance(mFMOD);
+        mFMOD = NULL;
+        
+        this->mSoundInitialized = false;
+
+	}
+}
+
+void UIHud::StopMusic()
+{
+	if(this->mCurrentSongStream && this->mSoundInitialized)
+	{
+		this->ClearStream(this->mCurrentSongStream);
+		this->mSongIsPlaying = false;
+		//this->mMusicEnabled = false;
+		//this->mMusicAllowed = false;
+	}
+}
+
+void UIHud::Think(void)
+{
+	CHud::Think();
+}
+
+void UIHud::ToggleEditMode(void)
+{
+    // For now this also changes us into edit mode
+    if(this->mManager.InMouseMode())
+    {
+        if(this->mManager.ToggleEditMode())
+        {
+            
+            // Now save this bad-boy out!
+            this->mManager.Save(this->mFilename, this->GetTextHeader());
+        }
+    }
+}
+
+void UIHud::ToggleMouse(void)
+{
+    // For now this also changes us into edit mode
+    this->mManager.ToggleMouse();
+}
+
+bool UIHud::Update(float inCurrentTime, string& outError)
+{
+    this->mManager.Update(inCurrentTime);
+
+	this->UpdateMusic(inCurrentTime);
+
+    bool theSuccess = this->UpdateInternetStream(inCurrentTime, outError);
+
+    return theSuccess;
+}
+
+int UIHud::UpdateClientData(client_data_t *cdata, float time)
+{
+	return CHud::UpdateClientData(cdata, time);
+}
+
+void UIHud::UpdateMusic(float inCurrentTime)
+{
+	bool theJustTurnedOnMusic = false;
+
+	// When song is done, wait a time, then pick another song
+	if(this->mSoundInitialized)
+	{
+		if(!this->mMusicEnabled && this->mMusicAllowed)
+		{
+			this->mMusicEnabled = true;
+			theJustTurnedOnMusic = true;
+		}
+		else if(this->mMusicEnabled && !this->mMusicAllowed)
+		{
+			this->StopMusic();
+		}
+
+		if(this->mSongIsPlaying && ((int)(cl_musicvolume->value) != this->mCurrentVolume))
+		{
+			this->mCurrentVolume = (int)(cl_musicvolume->value);
+			this->mCurrentVolume = min(max(0, this->mCurrentVolume), 255);
+			cl_musicvolume->value = this->mCurrentVolume;
+		 	mFMOD->FSOUND_SetVolume(this->mCurrentChannel, this->mCurrentVolume);
+		}
+
+		// If the current song is done and a random time has elapsed since OR
+		// we just turned on music
+		if(theJustTurnedOnMusic || this->GetIsTimeForSong(inCurrentTime))
+		{
+			// Play a random song
+			this->PlayRandomSong();
+		}
+
+		if(this->mMusicEnabled && (this->mCurrentSongStream != NULL))
+		{
+			if((int)(mFMOD->FSOUND_Stream_GetPosition(this->mCurrentSongStream)) >= this->mBytesInCurrentSong)
+			{
+				this->mTimeSongEnded = inCurrentTime;
+				this->mSongIsPlaying = false;
+			}
+		}
+//		if(this->mTimeSongEnded != 0.0f && thi)
+//		{
+//			float theTimeElapsedSinceSongStopped = inCurrentTime - this->mTimeSongEnded;
+//			if(theTimeElapsedSinceSongStopped > this->mRandomSecondsBetweenSongs)
+//			{
+//				this->PlayRandomSong();
+//			}
+//		}
+	}
+}
+
+void UIHud::VidInit(void)
+{
+	CHud::VidInit();
+
+	GetManager().VidInit();
+}
+
+FMOD_INSTANCE* UIHud::GetFMOD()
+{
+    return mFMOD;
+}
+
diff --git a/main/source/ui/UIHud.h b/main/source/ui/UIHud.h
new file mode 100644
index 00000000..13d1a881
--- /dev/null
+++ b/main/source/ui/UIHud.h
@@ -0,0 +1,130 @@
+//
+// Property of Charlie Cleveland, flayra@overmind.org
+//
+
+#ifndef UIHUD_H
+#define UIHUD_H
+
+//#include "cl_dll/hud.h"
+#include "cl_dll/chud.h"
+#include "textrep/TRDescription.h"
+#include "ui/UIManager.h"
+#include "vgui_InputSignal.h"
+#include "vgui_Scheme.h"
+#include "vgui_BitmapTGA.h"
+#include "cl_dll/vgui_SchemeManager.h"
+#include "fmoddyn.h"
+#include "fmod_errors.h"
+
+// From windows.h in fmoddyn.h
+#undef SERVER_EXECUTE
+
+class UIFactory;
+
+// Initializes self from text file
+class UIHud : public CHud
+{
+public:
+    // Takes over memory of factory, deletes it when it is done
+	UIHud(const string& inFilename, UIFactory* inFactory);
+    virtual ~UIHud(void);
+
+	// Accessors for returning the UI manager
+	UIManager& GetManager(void);
+	const UIManager& GetManager(void) const;
+
+	// Override default behaviors
+	virtual void	Init(void);
+
+    virtual void	LoadSchemes(void);
+
+    // The header that is saved out before saving out our ui.txt
+    virtual string	GetTextHeader(void) const;
+
+	bool			InitializeScheme(const char* inName, Scheme* inScheme);
+
+	void			ClearStream(FSOUND_STREAM*& ioStream);
+	
+	bool			PlaySong(string& inSongName, int& ioVolume, bool inLooping, FSOUND_STREAM*& outStream, int& outChannel, int& outBytesInSong, float inTimeElapsed = -1);
+
+	virtual void	PlayRandomSong(void);
+
+    virtual bool    PlayInternetStream(const string& inStreamName, string& outError);
+
+    virtual void    StopInternetStream();
+
+    virtual void	PostUIInit(void);
+
+	virtual void	ResetGame();
+
+	virtual void	VidInit(void);
+
+	virtual void	Think(void);
+
+	virtual int		Redraw(float flTime, int intermission);
+
+    virtual void	ToggleEditMode(void);
+
+    virtual void	ToggleMouse(void);
+
+	virtual int		UpdateClientData(client_data_t *cdata, float time);
+
+	virtual void	SetMusicAllowed(bool inState);
+
+	virtual void	SetUsingVGUI(bool inState);
+					
+	virtual void	InitializeSound(void);
+					
+	virtual void	Shutdown(void);
+	
+	virtual void	StopMusic(void);
+
+	virtual void	UpdateMusic(float inCurrentTime);
+    
+    virtual bool    UpdateInternetStream(float inCurrentTime, string& outError);
+
+    FMOD_INSTANCE*  GetFMOD();
+
+protected:
+    virtual bool    Update(float inCurrentTime, string& outError);
+
+private:
+	bool			GetIsTimeForSong(float inCurrentTime) const;
+
+	bool			PickRandomSong(string& outRelativeSongName) const;
+
+	virtual void	ShutdownMusic(void);
+
+    const string		mFilename;
+    static const string UITextHeader;
+	bool				mInitted;
+
+	bool				mSoundInitialized;
+	bool				mMusicEnabled;
+	bool				mMusicAllowed;
+	bool				mSongIsPlaying;
+	int					mBytesInCurrentSong;
+	float				mTimeSongEnded;
+	int					mRandomSecondsBetweenSongs;
+	int					mCurrentVolume;
+	int					mCurrentChannel;
+    int                 mInternetStreamChannel;
+
+	TRDescriptionList	mDescriptionList;
+
+	UIManager			mManager;
+
+    BitmapTGA*			mArrowBitmap;
+    Cursor*				mArrowCursor;
+
+	FSOUND_STREAM*		mCurrentSongStream;
+    FSOUND_STREAM*		mCurrentInternetStream;
+
+protected:
+	CSchemeManager*		mSchemeManager;
+
+    FMOD_INSTANCE*      mFMOD;
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/ui/UIManager.cpp b/main/source/ui/UIManager.cpp
new file mode 100644
index 00000000..79bc2b64
--- /dev/null
+++ b/main/source/ui/UIManager.cpp
@@ -0,0 +1,754 @@
+#include "ui/UIComponent.h"
+#include "ui/UIManager.h"
+#include "ui/UIFactory.h"
+#include "ui/UITags.h"
+#include "vgui_Menu.h"
+#include "vgui_App.h"
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+#include "textrep/TRFactory.h"
+#include "cl_dll/vgui_SchemeManager.h"
+#include "vgui_TextPanel.h"
+#include "vgui_Label.h"
+#include "cl_dll/vgui_TeamFortressViewport.h"
+#include "ui/GammaAwareComponent.h"
+#include "ui/ReloadableComponent.h"
+
+//using vgui::Label;
+//extern CImageLabel *gTestLabel;
+
+extern vgui::BitmapTGA *vgui_LoadTGA( const char* pImageName );
+
+const int kTranslation = 1000;
+
+// Stupid messy externs
+extern "C"
+{
+    void* VGui_GetPanel();
+}
+extern int g_iVisibleMouse;
+
+UIManager::UIManager(UIFactory* inFactory)
+{
+    this->mEditMode = false;
+    this->mDraggingLMB = false;
+	this->mUsingVGUI = false;
+
+    this->mLMBDownX = this->mLMBDownY = -1;
+    this->mLastMouseX = this->mLastMouseY = -1;
+
+    this->mComponentMouseOver = NULL;
+	this->mBlankCursor = NULL;
+
+    this->mFactory = inFactory;
+	this->mGammaSlope = 1.0f;
+}
+
+UIManager::~UIManager(void)
+{
+    delete this->mFactory;
+    this->mFactory = NULL;
+
+	delete this->mBlankCursor;
+	this->mBlankCursor = NULL;
+}
+
+void UIManager::AddInputSignal(InputSignal* inInputSignal)
+{
+	UIComponentListType::iterator theCompIter;
+
+	for(theCompIter = this->mComponentList.begin(); theCompIter != this->mComponentList.end(); theCompIter++)
+    {
+        UIComponent* theComponent = *theCompIter;
+        ASSERT(theComponent);
+        Panel* theVGUIComponent = theComponent->GetComponentPointer();
+        ASSERT(theVGUIComponent);
+        theVGUIComponent->addInputSignal(inInputSignal);
+    }
+}
+
+bool UIManager::Clear(void)
+{
+	bool theSuccess = false;
+
+    // Make sure we aren't in edit mode
+    if(!this->mEditMode)
+    {
+        // Delete every component in the list
+        UIComponentListType::iterator theCompIter;
+        for(theCompIter = this->mComponentList.begin(); theCompIter != this->mComponentList.end(); theCompIter++)
+        {
+            delete *theCompIter;
+            theSuccess = true;
+        }
+        
+        // Delete the list
+        this->mComponentList.clear();
+    }
+    else
+    {
+        // TODO: Emit error indicating manager can't be cleared in edit mode
+    }
+
+	return theSuccess;
+}
+
+UIComponent* UIManager::GetComponentFromPanel(Panel* inPanel)
+{
+    UIComponent* theComponent = NULL;
+
+	UIComponentListType::iterator theCompIter;
+	for(theCompIter = this->mComponentList.begin(); theCompIter != this->mComponentList.end(); theCompIter++)
+	{
+		if((*theCompIter)->GetComponentPointer() == inPanel)
+		{
+            theComponent = *theCompIter;
+			break;
+		}
+	}
+    return theComponent;
+}
+
+UIComponent* UIManager::GetComponentNamed(const string& inName)
+{
+	UIComponent* theResult = NULL;
+
+	UIComponentListType::iterator theCompIter;
+	for(theCompIter = this->mComponentList.begin(); theCompIter != this->mComponentList.end(); theCompIter++)
+	{
+		if((*theCompIter)->GetName() == inName)
+		{
+			theResult = *theCompIter;
+			break;
+		}
+	}
+
+	return theResult;
+}
+
+const UIComponent* UIManager::GetComponentNamed(const string& inName) const
+{
+	return NULL;
+}
+
+// TODO: Add list of components that are "hidden" and fail if the component is already hidden
+bool UIManager::HideComponent(const string& inName)
+{
+	bool theSuccess = false;
+	vgui::Panel* thePanel = NULL;
+
+	if(this->GetVGUIComponentNamed(inName, thePanel))
+	{
+		ASSERT(thePanel != NULL);
+		//this->TranslateComponent(thePanel, true);
+		thePanel->setVisible(false);
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+void UIManager::HideComponents()
+{
+	typedef vector<UIComponent*> UIComponentListType;
+
+	for(UIComponentListType::iterator theIter = this->mComponentList.begin(); theIter != this->mComponentList.end(); theIter++)
+	{
+		this->HideComponent((*theIter)->GetName());
+	}
+}
+
+bool UIManager::Initialize(const TRDescriptionList& inDesc, CSchemeManager* inSchemeManager)
+{
+	bool theSuccess = false;
+
+	// Clear out everything in case we have already been used once
+	this->Clear();
+
+	// Now loop through entities found 
+	for(TRDescriptionList::const_iterator theListIter = inDesc.begin(); theListIter != inDesc.end(); theListIter++)
+	{
+		// See if the factory knows how to create such a thing. It is giving the memory to us forever so take care of it.
+		UIComponent* theCurrentComponent = this->mFactory->BuildComponent(*theListIter, inSchemeManager);
+
+		// Tell it to set all the tags it knows about
+		if(theCurrentComponent)
+		{
+			// Check for named root tag, look up that component and set it
+            Panel* theRoot = NULL;
+            string theRootName;
+            
+            if(theListIter->GetTagValue("root", theRootName))
+            {
+                UIComponent* theUIComponent = NULL;
+                theUIComponent = this->GetComponentNamed(theRootName);
+                if(theUIComponent)
+                {
+                    theRoot = theUIComponent->GetComponentPointer();
+                }
+            }
+
+            // If none specified or it couldn't be found, use default
+            if(!theRoot)
+            {
+                theRoot = (Panel*)VGui_GetPanel();
+            }
+
+            // Set the root
+   			theCurrentComponent->GetComponentPointer()->setParent(theRoot);
+
+            // Add to menu if specified
+            string theMenuName;
+            if(theListIter->GetTagValue(UITagMenuAddItem, theMenuName))
+            {
+                Menu* theParentMenu = NULL;
+                if(this->GetVGUIComponentNamed(theMenuName, theParentMenu))
+                {
+                    theParentMenu->addMenuItem(theCurrentComponent->GetComponentPointer());
+                }
+            }
+            
+            // Set up scheme if specified
+            if(inSchemeManager)
+            {
+                this->SetSchemeValues(*theListIter, theCurrentComponent, inSchemeManager);
+            }
+
+            // <sigh> If we are currently using the regular VGUI instead of the manager, translate
+			// this component out of the way so it doesn't suck up input
+			if(this->mUsingVGUI)
+			{
+				this->TranslateComponent(theCurrentComponent->GetComponentPointer(), true);
+			}
+			
+			// If gamma aware, tell it immediately
+			GammaAwareComponent* theGammaAwareComponent = dynamic_cast<GammaAwareComponent*>(theCurrentComponent->GetComponentPointer());
+			if(theGammaAwareComponent)
+			{
+				theGammaAwareComponent->NotifyGammaChange(this->mGammaSlope);
+			}
+
+            // Save it. It is now part of the world.
+			this->mComponentList.push_back(theCurrentComponent);
+			
+			// Return success if we found at least one component
+			theSuccess = true;
+		}
+	}
+	
+	// Build default blank cursor
+	this->mBlankCursor = new Cursor(vgui_LoadTGA("blank"), 0, 0);
+	
+    // Register for notification for all input events
+    //this->AddInputSignal(this);
+	
+	return theSuccess;
+}
+
+bool UIManager::InMouseMode(void) const
+{
+    return (g_iVisibleMouse ? true : false);
+}
+
+void UIManager::NotifyGammaChange(float inGammaSlope)
+{
+	UIComponentListType::iterator theCompIter;
+	for(theCompIter = this->mComponentList.begin(); theCompIter != this->mComponentList.end(); theCompIter++)
+    {
+		GammaAwareComponent* theGammaAwareComponent = dynamic_cast<GammaAwareComponent*>((*theCompIter)->GetComponentPointer());
+		if(theGammaAwareComponent)
+		{
+			theGammaAwareComponent->NotifyGammaChange(inGammaSlope);
+		}
+    }
+
+	this->mGammaSlope = inGammaSlope;
+}
+
+bool UIManager::Save(const string& outFilename, const string& outHeader)
+{
+    // Build description list
+    TRDescriptionList theDescriptionList;
+
+    UIComponentListType::iterator theCompIter;
+    for(theCompIter = this->mComponentList.begin(); theCompIter != this->mComponentList.end(); theCompIter++)
+    {
+        theDescriptionList.push_back((*theCompIter)->GetDescription());
+    }
+
+    // Write it out!
+    TRFactory::WriteDescriptions(outFilename, theDescriptionList, outHeader);
+
+	return true;
+}
+
+bool UIManager::SetLMBActionAbsolute(const TRTag& inTag)
+{
+	return true;
+}
+
+bool UIManager::SetLMBActionRelative(const TRTag& inTag)
+{
+	return true;
+}
+
+void UIManager::SetMouseVisibility(bool inState)
+{
+    // To change whether the mouse is visible, just change this variable
+    g_iVisibleMouse = inState;
+
+    // Update cursor
+    if(g_iVisibleMouse)
+    {
+        //ClientCmd("say Entering mouse mode.");
+        //App::getInstance()->setCursorOveride(App::getInstance()->getScheme()->getCursor(Scheme::SchemeCursor::scu_arrow));
+		// Remove above line and put this line back in for sprite cursors
+        App::getInstance()->setCursorOveride(this->mBlankCursor);
+    }
+    else
+    {
+        //ClientCmd("say Exiting mouse mode.");
+        // Move mouse to center of screen so mouse look isn't changed
+
+        // Only do this when in full screen
+        App::getInstance()->setCursorPos(ScreenWidth()/2, ScreenHeight()/2);
+
+        // Hide cursor again
+        App::getInstance()->setCursorOveride( App::getInstance()->getScheme()->getCursor(Scheme::SchemeCursor::scu_none) );
+    }
+
+    //App::getInstance()->setCursorOveride( App::getInstance()->getScheme()->getCursor(Scheme::SchemeCursor::scu_none) );
+
+}
+
+// Set up default scheme values if a scheme was specified (overrides other tags specified)
+void UIManager::SetSchemeValues(const TRDescription& inDesc, UIComponent* inComponent, CSchemeManager* inSchemeManager)
+{
+    std::string theSchemeName;
+    if(inDesc.GetTagValue(UITagScheme, theSchemeName))
+    {
+        // Get the vgui panel inside
+        Panel* thePanelPointer = inComponent->GetComponentPointer();
+
+        // Get the scheme specified in the layout
+        const char* theSchemeCString = theSchemeName.c_str();
+        SchemeHandle_t theSchemeHandle = inSchemeManager->getSchemeHandle(theSchemeCString);
+        int r, g, b, a;
+        
+        // Set fg color
+        inSchemeManager->getFgColor(theSchemeHandle, r, g, b, a);
+        thePanelPointer->setFgColor(r, g, b, a);
+
+        // Set bg color
+        inSchemeManager->getBgColor(theSchemeHandle, r, g, b, a);
+        thePanelPointer->setBgColor(r, g, b, a);
+
+        // Set font if applicable
+    	vgui::Font* theFont = inSchemeManager->getFont(theSchemeHandle);
+        vgui::TextPanel* theTextPanel = dynamic_cast<vgui::TextPanel*>(thePanelPointer);
+        if(theFont && theTextPanel)
+        {
+            theTextPanel->setFont(theFont);
+        }
+    }
+}
+
+bool UIManager::SetRMBActionAbsolute(const TRTag& inTag)
+{
+	return true;
+}
+
+bool UIManager::SetRMBActionRelative(const TRTag& inTag)
+{
+	return true;
+}
+
+void UIManager::SetUsingVGUI(bool inState)
+{
+	if(inState)
+	{
+		if(!this->mUsingVGUI)
+		{
+			// Translate all components away
+			this->TranslateComponents(true);
+			this->mUsingVGUI = true;
+		}
+	}
+	else
+	{
+		if(this->mUsingVGUI)
+		{
+			// Translate everything back
+			this->TranslateComponents(false);
+			this->mUsingVGUI = false;
+		}
+	}
+}
+
+bool UIManager::TranslateComponent(const string& inName, bool inAway)
+{
+	bool            theSuccess = false;
+
+	UIComponent*    theComponent = this->GetComponentNamed(inName);
+	if(theComponent)
+	{
+		this->TranslateComponent(theComponent->GetComponentPointer(), inAway);
+		theSuccess = true;
+	}
+	return theSuccess;
+	
+}
+
+void UIManager::TranslateComponent(vgui::Panel* inPanel, bool inAway)
+{
+	int theX, theY;
+	inPanel->getPos(theX, theY);
+	int theAmount = kTranslation*(inAway ? 1 : -1);
+	inPanel->setPos(theX + theAmount, theY + theAmount);
+}
+
+void UIManager::TranslateComponents(bool inAway)
+{
+    UIComponentListType::iterator theCompIter;
+    for(theCompIter = this->mComponentList.begin(); theCompIter != this->mComponentList.end(); theCompIter++)
+	{
+		vgui::Panel* theCurrentPanel = (*theCompIter)->GetComponentPointer();
+		this->TranslateComponent(theCurrentPanel, inAway);
+	}
+}
+
+bool UIManager::ToggleEditMode(void)
+{
+    bool theWasInEditMode = this->mEditMode;
+
+    this->mEditMode = !this->mEditMode;
+    
+//    if(this->mEditMode)
+//    {
+//        ClientCmd("say Entering edit mode.");
+//    } 
+//    else
+//    {
+//        ClientCmd("say Exiting edit mode.");
+//    }
+    
+    // If we enter edit mode, disable all components.  If we leave, reenable them.
+    this->SetEnabledState(!this->mEditMode);
+    
+    //CLIENT_PRINTF( pEntity, print_console, UTIL_VarArgs( "\"fov\" is \"%d\"\n", (int)GetClassPtr((CBasePlayer *)pev)->m_iFOV ) );
+    if(!this->mEditMode)
+    {
+        // Reset graphical layout variables
+        this->mComponentMouseOver = NULL;
+        this->mDraggingLMB = false;
+        this->mLastMouseX = this->mLastMouseY = -1;
+        this->mLMBDownX = this->mLMBDownY = -1;
+    }
+
+    return theWasInEditMode;
+}
+
+// TODO: Add list of components that are "hidden" and fail if the component is not currently hidden
+bool UIManager::UnhideComponent(const string& inName)
+{
+	bool theSuccess = false;
+	vgui::Panel* thePanel = NULL;
+
+	if(this->GetVGUIComponentNamed(inName, thePanel))
+	{
+		ASSERT(thePanel != NULL);
+		//this->TranslateComponent(thePanel, false);
+		thePanel->setVisible(true);
+		theSuccess = true;
+	}
+
+	return theSuccess;
+}
+
+void UIManager::Update(float inCurrentTime)
+{
+	UIComponentListType::iterator theCompIter;
+	for(theCompIter = this->mComponentList.begin(); theCompIter != this->mComponentList.end(); theCompIter++)
+    {
+        (*theCompIter)->Update(inCurrentTime);
+    }
+
+//    int r, g, b, a;
+//    r = g = b = a = 0;
+//    //gTestLabel->getFgColor(r, g, b, a);
+//    vgui::Color theColor;
+//    gTestLabel->m_pTGA->getColor(theColor);
+//    theColor.getColor(r, g, b, a);
+//    r = (r + 1) % 255;
+//    theColor.setColor(r, g, b, a);
+//    gTestLabel->m_pTGA->setColor(theColor);
+//    //gTestLabel->setFgColor(r, g, b, a);
+//
+//    gTestLabel->getBgColor(r, g, b, a);
+//    a = (a + 1) % 255;
+//    gTestLabel->setBgColor(r, g, b, a);
+}
+
+void UIManager::VidInit(void)
+{
+	UIComponentListType::iterator theCompIter;
+	for(theCompIter = this->mComponentList.begin(); theCompIter != this->mComponentList.end(); theCompIter++)
+    {
+		ReloadableComponent* theReloadableComponent = dynamic_cast<ReloadableComponent*>((*theCompIter)->GetComponentPointer());
+		if(theReloadableComponent)
+		{
+			theReloadableComponent->VidInit();
+		}
+    }
+}
+
+
+void UIManager::ToggleMouse(void)
+{
+	this->SetMouseVisibility(!g_iVisibleMouse);
+}
+
+////////////////////////////////
+// Functions from InputSignal //
+////////////////////////////////
+void UIManager::cursorMoved(int inX, int inY, Panel* inPanel)
+{
+    if(!inPanel)
+    {
+        ClientCmd("say cursorMoved with null inPanel!  Yeah!\n");
+    }
+
+    // x,y are local to the upper left of the panel. 
+    int theLocalX = inX;
+    int theLocalY = inY;
+
+    // Get screen coordinates
+    int theScreenX, theScreenY;
+    this->GetScreenCoords(theScreenX, theScreenY);
+
+    // This function should only be called when mouse visible and we are in edit mode
+    if(this->mEditMode)
+    {
+        // We can't assume that a cursorEntered will always get called before a cursor moved, so 
+        // call cursorEntered if we don't have a component yet (happens when toggling between the two modes
+        if(!this->mComponentMouseOver)
+        {
+            this->cursorEntered(inPanel);
+        }
+        
+        // Number of pixels to move with the mouse button down before we start dragging
+        const int START_DRAG_PIXEL_DIST = 6;
+        const int MIN_DRAG_PIXEL_DIST = 4;
+        static int theStartDragLocalXOffset = 0;
+        static int theStartDragLocalYOffset = 0;
+        
+        // Check how far we have moved, are we dragging yet?
+        if((!this->mDraggingLMB) &&
+            (this->mLMBDownX != -1) && 
+            (this->mLMBDownY != -1))
+        {
+            int theXDiff = theScreenX - this->mLMBDownX;
+            int theYDiff = theScreenY - this->mLMBDownY;
+            
+            // Requires more movement in diagonal direction, probably not
+            // worth the extra complexity to change
+            if((abs(theXDiff) > START_DRAG_PIXEL_DIST) ||
+                (abs(theYDiff) > START_DRAG_PIXEL_DIST))
+            {
+                //ClientCmd("say Starting drag");
+                
+                // Save the offset from the component's upper left.  Preserve
+                // this when for more intuitive dragging (so dragging doesn't
+                // suddenly move the component relative to the mouse).
+                theStartDragLocalXOffset = theLocalX;
+                theStartDragLocalYOffset = theLocalY;
+
+                //inPanel->setAsMouseArena(true);
+                
+                this->mDraggingLMB = true;
+            }
+        }
+        
+        // Are we dragging?
+        if(this->mDraggingLMB)
+        {
+            // If so, set the component's new position. The position corresponds to the upper
+            // left corner of the component, so subtract out the local offset.
+            // The component's new position is equal to the current screen pos of the mouse, MINUS
+            // the local component offset which we started the drag.  If we were dragging the component
+            // around by the upper left corner, this would be like setting the component's position equal
+            // to whatever the mouse was at during a mouse move.  If we were dragging it by the center,
+            // it would set the component's position to the current screen mouse pos minus half the component
+            // width and height. Make sense?
+            //ClientCmd("say Setting new component position");
+            int theChangeX = theScreenX - theStartDragLocalXOffset;
+            int theChangeY = theScreenY - theStartDragLocalYOffset;
+
+            // Make sure we move at least a few pixels, because we're bound by control and we 
+            // could've grabbed it near one of the edges
+            theChangeX = max(theChangeX, MIN_DRAG_PIXEL_DIST);
+            theChangeY = max(theChangeY, MIN_DRAG_PIXEL_DIST);
+            this->SetPanelPosition(inPanel, theChangeX, theChangeY);
+        }
+    }
+
+    // Update new mouse position
+    this->mLastMouseX = theScreenX;
+    this->mLastMouseY = theScreenY;
+}
+
+
+void UIManager::SetPanelPosition(Panel* inPanel, int inX, int inY)
+{
+    // Look up the component
+    UIComponent* theUIComp = this->GetComponentFromPanel(inPanel);
+    if(theUIComp)
+    {
+        // Update run-time version
+        // Set the vgui panel's position (pixel coords)
+        // Clip so component never goes off the screen in any way
+        int theCompWidth = 0;
+        int theCompHeight = 0;
+        inPanel->getSize(theCompWidth, theCompHeight);
+
+        int theClippedScreenX = max(min(inX, ScreenWidth() - theCompWidth), 0);
+        int theClippedScreenY = max(min(inY, ScreenHeight() - theCompHeight), 0);
+        inPanel->setPos(theClippedScreenX, theClippedScreenY);
+        
+        // repaint parent if present
+        Panel* inPanelParent = inPanel->getParent();
+        if(inPanelParent != NULL)
+        {			
+            inPanelParent->repaint();
+        }
+
+        // Convert to normalized coords for text representation.
+        float theClippedNormX = (float)theClippedScreenX/ScreenWidth();
+        float theClippedNormY = (float)theClippedScreenY/ScreenHeight();
+
+        // Change the text represntation so it has the update coordinates (normalized coords)
+        // This means it can save out again with the player's changes!
+        TRDescription& theCompDesc = theUIComp->GetDescription();
+        theCompDesc.SetTagValue(UITagXPos, theClippedNormX);
+        theCompDesc.SetTagValue(UITagYPos, theClippedNormY);
+
+    }
+    else
+    {
+        //ClientCmd("say Can't find UIComponent that you're dragging, can't save changes to it.");
+    }
+}
+
+void UIManager::cursorEntered(Panel* inPanel)
+{
+    // Handle stacking of ui components.  Only enter component if we aren't already on a component
+    if(!this->mComponentMouseOver)
+    {
+        if(!this->mDraggingLMB)
+        {
+            //ClientCmd("say Cursor entered component");
+            this->mComponentMouseOver = inPanel;
+        }
+    }
+}
+
+void UIManager::cursorExited(Panel* inPanel)
+{
+    // Only leave the component we are currently on for stacking purposes
+    if(this->mComponentMouseOver == inPanel)
+    {
+        if(!this->mDraggingLMB)
+        {
+            //ClientCmd("say Cursor exited component");
+            this->mComponentMouseOver = NULL;
+        }
+    }
+}
+
+void UIManager::mousePressed(MouseCode inCode, Panel* inPanel)
+{
+    // Track dragging state
+    if(inCode == MOUSE_LEFT)
+    {
+        if(this->mComponentMouseOver)
+        {
+            //ClientCmd("say Left mouse pressed on component");
+            this->mLMBDownX = this->mLastMouseX;
+            this->mLMBDownY = this->mLastMouseY;
+        }
+    }
+}
+
+void UIManager::mouseDoublePressed(MouseCode inCode, Panel* inPanel)
+{
+}
+
+// Take into account the mouse offset into the component 
+// Note: This doesn't work in windowed mode, as it returns the cursor position in pixels,
+// and the desktop resolution is different than HL resolution in windowed mode.  If there
+// are function to tell if we are in windowed mode, and to find the upper left x,y this
+// could be fixed.
+void UIManager::GetScreenCoords(int& outLocalX, int& outLocalY)
+{
+    int theX, theY;
+    App::getInstance()->getCursorPos(theX, theY);
+
+//    int theLocalX = theX;
+//    int theLocalY = theY;
+//	inPanel->screenToLocal(theLocalX, theLocalY);
+
+//    theX += ioLocalX;
+//    theY += ioLocalY;
+
+    outLocalX = theX;
+    outLocalY = theY;
+}
+
+void UIManager::SetEnabledState(bool inState)
+{
+    UIComponentListType::iterator theCompIter;
+    for(theCompIter = this->mComponentList.begin(); theCompIter != this->mComponentList.end(); theCompIter++)
+    {
+        (*theCompIter)->GetComponentPointer()->setEnabled(inState);
+    }
+}
+
+
+void UIManager::mouseReleased(MouseCode code, Panel* inPanel)
+{
+    // Track dragging state
+    if(code == MOUSE_LEFT)
+    {
+        //ClientCmd("say Left mouse released on component");
+
+        //ALERT(at_console, "Down xy = -1\n");
+        this->mLMBDownX = -1;
+        this->mLMBDownY = -1;
+        this->mDraggingLMB = false;
+
+        //App::getInstance()->setMouseArena(NULL);
+        //inPanel->setAsMouseArena(false);
+        //App::getInstance()->setMouseArena(NULL);
+    }
+}
+
+void UIManager::mouseWheeled(int delta,Panel* panel)
+{
+}
+
+void UIManager::keyPressed(KeyCode code,Panel* panel)
+{
+}
+
+void UIManager::keyTyped(KeyCode code,Panel* panel)
+{
+}
+
+void UIManager::keyReleased(KeyCode code,Panel* panel)
+{
+}
+
+void UIManager::keyFocusTicked(Panel* panel)
+{
+}
+
diff --git a/main/source/ui/UIManager.h b/main/source/ui/UIManager.h
new file mode 100644
index 00000000..bef55cfd
--- /dev/null
+++ b/main/source/ui/UIManager.h
@@ -0,0 +1,158 @@
+#ifndef UIMANAGER_H
+#define UIMANAGER_H
+
+// Main ideas: 
+//   1) The full UI is specified from a text file
+//   2) Changing or adding UI components doesn't require changing the layout parser
+//   3) Globals aren't needed in the client code, it can look up components by name when it needs them.  This makes
+//      the code much neater and easier to maintain.
+// 
+// Components are defined as a set of tags, many of them common for all components.  A new UI component
+// can define its own custom tags if it so desires.  
+// 
+
+#include "textrep/TRTag.h"
+#include "textrep/TRDescription.h"
+#include "vgui_InputSignal.h"
+#include "ui/UIComponent.h"
+
+class CSchemeManager;
+
+using namespace vgui;
+
+class UIComponent;
+class UIFactory;
+
+// Singleton or global?
+class UIManager : public InputSignal
+{
+public:
+    // Only one way to construct.  Not meaningful to use until Initialize() is called.
+					    UIManager(UIFactory* inFactory);
+
+    // Make destructor virtual just in case this is subclassed someday
+    virtual			    ~UIManager(void);
+
+    void                AddInputSignal(InputSignal* inInputSignal);
+
+    // Deletes all components that have been previously read in.  Clients should not hold onto UI component
+    // pointers, because this function invalidates them.  This will typically be called from within VGUI_Shutdown.
+    // It is also called at the beginning of Initialize().  Returns true if at least one component was deleted.
+    bool			    Clear(void);
+
+	// Find a component that has been created with the specified name.  The text files lay out the components, this
+	// is how the mod finds them after they have been created.  The calling code shouldn't keep around the pointer
+	// to the component, it should query it every tick in case it goes away.
+	UIComponent*		GetComponentNamed(const string& inName);
+	const UIComponent*	GetComponentNamed(const string& inName) const;
+
+    // Quick way to fetch the vgui component you're looking for.  Returns null if type is wrong or it doesn't exist.
+    template <class T>
+    bool                GetVGUIComponentNamed(const string& inName, T& outValue)
+    {
+        bool            theSuccess = false;
+        T               theReturnComponent = NULL;
+		outValue = NULL;
+        UIComponent*    theComponent = this->GetComponentNamed(inName);
+        if(theComponent)
+        {
+            outValue = dynamic_cast<T>(theComponent->GetComponentPointer());
+            if(outValue)
+            {
+                theSuccess = true;
+            }
+        }
+        return theSuccess;
+    }
+
+	bool				HideComponent(const string& inName);
+	void				HideComponents();
+
+    // Load up all UI components specified by the text description.  Any components that have already been loaded 
+    // are cleared first.  Returns false if the file couldn't be opened or no components could be built from the file.  
+    // Typically this will be called once when the mod is initialized and never again.
+    bool			    Initialize(const TRDescriptionList& inDesc, CSchemeManager* inSchemeManager = NULL);
+
+    bool                InMouseMode(void) const;
+
+	void				NotifyGammaChange(float inGammaSlope);
+
+    // Saves the current UI layout back out the file that it was read in from. This is only meaningful after
+    // the layout has been edited by the player.  Returns false if the file couldn't be opened, if a write fails.
+    // or if the manager is currently in edit mode.
+    bool			    Save(const string& outFilename, const string& outHeader);
+
+    // Sets the left mouse button action to 
+    bool                SetLMBActionAbsolute(const TRTag& inTag);
+                        
+    bool                SetLMBActionRelative(const TRTag& inTag);
+
+    void                SetMouseVisibility(bool inState);
+	
+    bool                SetRMBActionAbsolute(const TRTag& inTag);
+                        
+    bool                SetRMBActionRelative(const TRTag& inTag);
+
+	void				SetUsingVGUI(bool inState);
+
+    // Call to toggle editing current layout with the mouse.  Starts in non-edit mode.
+    // Returns true if we were in edit mode and just left.
+    bool                ToggleEditMode(void);
+
+    void                ToggleMouse(void);
+	
+	bool				TranslateComponent(const string& inName, bool inAway);
+	
+	bool				UnhideComponent(const string& inName);
+
+    virtual void        Update(float inCurrentTime);
+
+	// Called every time the hud is re-inited
+	virtual void		VidInit(void);
+	
+    // Input signal functions for graphical editing
+	virtual void        cursorMoved(int x,int y,Panel* panel);
+	virtual void        cursorEntered(Panel* panel);
+	virtual void        cursorExited(Panel* panel);
+	virtual void        mousePressed(MouseCode code,Panel* panel);
+	virtual void        mouseDoublePressed(MouseCode code,Panel* panel);
+	virtual void        mouseReleased(MouseCode code,Panel* panel);
+	virtual void        mouseWheeled(int delta,Panel* panel);
+	virtual void        keyPressed(KeyCode code,Panel* panel);
+	virtual void        keyTyped(KeyCode code,Panel* panel);
+	virtual void        keyReleased(KeyCode code,Panel* panel);
+	virtual void        keyFocusTicked(Panel* panel);
+
+private:
+    UIManager(void);
+
+    UIComponent*        GetComponentFromPanel(Panel* inPanel);
+    void                GetScreenCoords(int& ioLocalX, int& ioLocalY);
+    void                SetEnabledState(bool inState);
+    void                SetPanelPosition(Panel* inPanel, int inX, int inY);
+    void                SetSchemeValues(const TRDescription& inDesc, UIComponent* inComponent, CSchemeManager* inManager);
+
+	void				TranslateComponents(bool inAway);
+	void				TranslateComponent(vgui::Panel* inPanel, bool inAway);
+	
+    bool                mEditMode;
+    bool                mDraggingLMB;
+	bool				mUsingVGUI;
+
+    int                 mLastMouseX, mLastMouseY;
+    int                 mLMBDownX, mLMBDownY;
+    Panel*              mComponentMouseOver;
+	Cursor*				mBlankCursor;
+
+    UIFactory*          mFactory;
+	float				mGammaSlope;
+
+    // List of text representations associated with UIComponents.
+    // These are all currently loaded in the game.
+	typedef vector<UIComponent*> UIComponentListType;
+	UIComponentListType mComponentList;
+
+};
+
+#endif
+
diff --git a/main/source/ui/UIPieMenu.cpp b/main/source/ui/UIPieMenu.cpp
new file mode 100644
index 00000000..b1e30372
--- /dev/null
+++ b/main/source/ui/UIPieMenu.cpp
@@ -0,0 +1,179 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: UIPieMenu.cpp $
+// $Date: 2002/08/16 02:29:20 $
+//
+//-------------------------------------------------------------------------------
+// $Log: UIPieMenu.cpp,v $
+// Revision 1.9  2002/08/16 02:29:20  Flayra
+// - Added document headers
+// - Started to add support for pie nodes with both images and text
+//
+//===============================================================================
+#include "ui/UIPieMenu.h"
+#include "ui/UIUtil.h"
+#include "ui/UITags.h"
+#include "ui/PieMenu.h"
+
+const string kPieMenuNodeXDistance("nodexspacing");
+const string kPieMenuNodeYDistance("nodeyspacing");
+const string kNodeTarga("nodeimage");
+const string kPieMenuNodePrefix("node");
+const string kPieMenuDefaultImage("defaultimage");
+
+UIPieMenu::UIPieMenu(void)
+{
+    this->mType = "PieMenu";
+}
+
+// Destructor automatically removes component from the engine
+UIPieMenu::~UIPieMenu(void)
+{
+}
+
+void UIPieMenu::AllocateComponent(const TRDescription& inDesc)
+{
+    float theXPos, theYPos;
+    int theWidth, theHeight;
+    string theImageName("default");
+
+    UIGetPosition(inDesc, theXPos, theYPos, theWidth, theHeight);
+
+	string theRootName;
+	inDesc.GetTagValue(UIRootName, theRootName);
+
+    this->mPieMenu = new PieMenu(theRootName, theXPos*ScreenWidth(), theYPos*ScreenHeight(), theWidth*ScreenWidth(), theHeight*ScreenHeight());
+}
+
+vgui::Panel* UIPieMenu::GetComponentPointer(void)
+{
+    return this->mPieMenu;
+}
+
+const string& UIPieMenu::GetType(void) const
+{
+    return this->mType;
+}
+
+// Not virtual, this is meant to act only on the class specified.  Operate on panel because that is
+// the lowest level of hierarchy (not that we're going to do anything with it anyways)
+bool UIPieMenu::SetClassProperties(const TRDescription& inDesc, Panel* inComponent, CSchemeManager* inSchemeManager)
+{
+    bool theSuccess;
+	
+    // Let parent classes go first
+    theSuccess = UIPanel::SetClassProperties(inDesc, inComponent, inSchemeManager);
+	
+    if(theSuccess)
+    {
+        // Dynamic_cast inComponent to an PieMenu (will always succeed)
+        PieMenu* thePieMenu = (PieMenu*)inComponent;
+		
+        // Read font if specified
+        std::string theSchemeName;
+        if(inDesc.GetTagValue(UITagScheme, theSchemeName))
+        {
+            if(thePieMenu)
+            {
+                const char* theSchemeCString = theSchemeName.c_str();
+                SchemeHandle_t theSchemeHandle = inSchemeManager->getSchemeHandle(theSchemeCString);
+                Font* theFont = inSchemeManager->getFont(theSchemeHandle);
+                if(theFont)
+                {
+                    thePieMenu->SetFont(theFont);
+					thePieMenu->GetRootNode()->setFont(theFont);
+                }
+            }
+        }
+		
+		// Set colors of root node to that of the pie menu
+		Color theColor;
+		thePieMenu->getFgColor(theColor);
+		thePieMenu->GetRootNode()->setFgColor(theColor);
+		
+		thePieMenu->getBgColor(theColor);
+		thePieMenu->GetRootNode()->setBgColor(theColor);
+		
+        // Read node distances
+        float theNodeXDistance = 0.0f;
+        inDesc.GetTagValue(kPieMenuNodeXDistance, theNodeXDistance);
+        float theNodeYDistance = 0.0f;
+        inDesc.GetTagValue(kPieMenuNodeYDistance, theNodeYDistance);
+        thePieMenu->SetNodeDistance(theNodeXDistance, theNodeYDistance);
+
+		// Set pop-up menu default image
+		string theDefaultImage;
+		if(inDesc.GetTagValue(kPieMenuDefaultImage, theDefaultImage))
+		{
+			thePieMenu->SetDefaultImage(theDefaultImage);
+		}
+		
+        // Read specified image to use
+        //string theNodeTargaName;
+        //if(inDesc.GetTagValue(kNodeTarga, theNodeTargaName))
+        //{
+        //    thePieMenu->SetNodeTargaName(theNodeTargaName);
+        //}
+		
+        // Now read in the nodes until there are no more.  Assumes first node is root.
+		thePieMenu->GetRootNode()->SetSizeKeepCenter(theNodeXDistance*ScreenWidth(), theNodeYDistance*ScreenHeight());
+		
+        StringVector theNodeList;
+        inDesc.GetTagStringList(kPieMenuNodePrefix, theNodeList);
+        for(StringVector::iterator theIter = theNodeList.begin(); theIter != theNodeList.end(); theIter++)
+        {
+            thePieMenu->AddNode(*theIter);
+        }
+
+		// Set the connector, if any
+		string theConnectorName;
+		if(inDesc.GetTagValue(UIConnectorName, theConnectorName))
+		{
+			if(theConnectorName != "")
+			{
+				this->mPieMenu->SetConnectorName(theConnectorName);
+			}
+		}
+
+		// Now have the piemenu recompute visible size for all nodes
+		thePieMenu->RecomputeVisibleSize();
+
+//        for(int i = 0; ; i++)
+//        {
+//            char theNum[4];
+//            sprintf(theNum, "%d", i);
+//            string theNodeName(kPieMenuNodePrefix + string(theNum));
+//
+//            string theNodeString;
+//            if(inDesc.GetTagValue(theNodeName, theNodeString))
+//            {
+//                thePieMenu->AddNode(theNodeString);
+//            }
+//            else
+//            {
+//                break;
+//            }
+//        }
+
+        // Tell it we're done
+        thePieMenu->SetConstructionComplete();
+        
+        // Make sure to propagate new position to all children.  Children may have been added
+        // after the position was set so just make sure to re-set the position before we leave now
+        // that all children have been added.
+    }
+
+    return theSuccess;
+}
+
+void UIPieMenu::Update(float theCurrentTime)
+{
+    this->mPieMenu->Update(theCurrentTime);
+}
diff --git a/main/source/ui/UIPieMenu.h b/main/source/ui/UIPieMenu.h
new file mode 100644
index 00000000..769559dd
--- /dev/null
+++ b/main/source/ui/UIPieMenu.h
@@ -0,0 +1,34 @@
+#ifndef UIPIEMENU_H
+#define UIPIEMENU_H
+
+#include "ui/UIComponents.h"
+
+class PieMenu;
+
+class UIPieMenu : public UIPanel
+{
+public:
+	UIPieMenu(void);
+
+	// Destructor automatically removes component from the engine
+	virtual ~UIPieMenu(void);
+
+    virtual vgui::Panel*    GetComponentPointer(void);
+
+	virtual const string&	GetType(void) const;
+
+	virtual bool			SetClassProperties(const TRDescription& inDescription, Panel* inComponent, CSchemeManager* inSchemeManager);
+
+    virtual void            Update(float theCurrentTime);
+
+private:
+
+    static const string     UIPieMenuType;
+
+	virtual void            AllocateComponent(const TRDescription& inDescription);
+
+    PieMenu*                mPieMenu;
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/ui/UITags.h b/main/source/ui/UITags.h
new file mode 100644
index 00000000..cf1279b0
--- /dev/null
+++ b/main/source/ui/UITags.h
@@ -0,0 +1,56 @@
+#ifndef UI_TAGS_H
+#define UI_TAGS_H
+
+#include <string>
+using std::string;
+
+// Default ui values here
+const float UIDefaultXPos = 0.0f;
+const float UIDefaultYPos = 0.0f;
+const float UIDefaultWidth = .05f;
+const float UIDefaultHeight = .05f;
+const float UIDefaultPreferredWidth = UIDefaultWidth;
+const float UIDefaultPreferredHeight = UIDefaultHeight;
+const bool UIDefaultVisibility = false;
+const int UIDefaultProgressBarSegments = 10;
+
+// centered from Label enum, not worth including for dependency reasons
+const int UIDefaultAlignment = 4;
+
+const string UIDefaultPathName("ns\\");
+
+// Here is where all recognized tags are specified.  Use this for documenting the system and when parsing tags.
+const string UIRootName("rootname");
+const string UIConnectorName("connectorname");
+const string UITagXPos("xpos");
+const string UITagYPos("ypos");
+const string UITagWidth("width");
+const string UITagHeight("height");
+const string UITagParent("parent");
+const string UITagVisible("visible");
+const string UITagMinimumWidth("minimumwidth");
+const string UITagMinimumHeight("minimumheight");
+const string UITagEnabled("enabled");
+const string UITagFGColor("fgcolor");
+const string UITagBGColor("bgcolor");
+const string UITagImage("image");
+const string UITagAlignment("alignment");
+const string UITagPreferredWidth("preferredwidth");
+const string UITagPreferredHeight("preferredheight");
+const string UITagText("text");
+const string UITagSegments("segments");
+const string UITagPathName("pathname");
+const string UITagMenuAddItem("addtomenu");
+const string UITagScheme("scheme");
+const string UICategoryScheme("categoryscheme");
+const string UINAColor("nacolor");
+const string UIResearchedColor("researchedcolor");
+const string UILowerValue("lowervalue");
+const string UIUpperValue("uppervalue");
+const string UIIsVertical("isvertical");
+const string UIRangeWindow("rangewindow");
+const string UIBaseSprite("basesprite");
+const string UIRenderMode("rendermode");
+const string UIVAlignment("valignment");
+const string UIDefaultIntValue("defaultintvalue");
+#endif
\ No newline at end of file
diff --git a/main/source/ui/UIUtil.cpp b/main/source/ui/UIUtil.cpp
new file mode 100644
index 00000000..1aa23f23
--- /dev/null
+++ b/main/source/ui/UIUtil.cpp
@@ -0,0 +1,545 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: UIUtil.cpp $
+// $Date: 2002/05/23 04:03:05 $
+//
+//-------------------------------------------------------------------------------
+// $Log: UIUtil.cpp,v $
+// Revision 1.8  2002/05/23 04:03:05  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "ui/UIUtil.h"
+#include "ui/UITags.h"
+#include "VGUI_Label.h"
+#include "cl_dll/hud.h"
+#include "cl_dll/cl_util.h"
+
+void UIDrawVariableBarSpriteHoles(int inSprite, int inX, int inY, float inPercentage, float inGammaSlope, bool inTrueHolesFalseAdditive, float inSecondaryPercentage)
+{
+	// Assumes that frame 0 is the empty sprite, frame 1 is full sprite
+	const int kEmptyFrame = 0;
+	const int kFullFrame = 1;
+
+	int theSpriteWidth = SPR_Width(inSprite, kFullFrame);
+	int theSpriteHeight = SPR_Height(inSprite, kFullFrame);
+
+	int theColorComponent = 255/inGammaSlope;
+	
+	// Draw empty sprite
+	SPR_Set(inSprite, theColorComponent, theColorComponent, theColorComponent);
+	if(inTrueHolesFalseAdditive)
+	{
+		SPR_DrawHoles(kEmptyFrame, inX, inY, NULL);
+	}
+	else
+	{
+		SPR_DrawAdditive(kEmptyFrame, inX, inY, NULL);
+	}
+
+	// Draw secondary level if specified, at half brightness
+	int theFilledHeight = theSpriteHeight*inPercentage;
+	if(inSecondaryPercentage != -1)
+	{
+		theFilledHeight = theSpriteHeight*inSecondaryPercentage;
+		int theSecondaryColorComponent = .5f*theColorComponent;
+
+		SPR_EnableScissor(inX, inY + (theSpriteHeight - theFilledHeight), theSpriteWidth, theFilledHeight);
+		
+		SPR_Set(inSprite, theSecondaryColorComponent, theSecondaryColorComponent, theSecondaryColorComponent);
+		if(inTrueHolesFalseAdditive)
+		{
+			SPR_DrawHoles(kFullFrame, inX, inY, NULL);
+		}
+		else
+		{
+			SPR_DrawAdditive(kFullFrame, inX, inY, NULL);
+		}
+		
+		SPR_DisableScissor();
+	}
+
+	theFilledHeight = theSpriteHeight*inPercentage;
+	
+	// Draw partially full sprite
+	// Enable scissor so it's not all drawn
+	SPR_EnableScissor(inX, inY + (theSpriteHeight - theFilledHeight), theSpriteWidth, theFilledHeight);
+
+	SPR_Set(inSprite, theColorComponent, theColorComponent, theColorComponent);
+	if(inTrueHolesFalseAdditive)
+	{
+		SPR_DrawHoles(kFullFrame, inX, inY, NULL);
+	}
+	else
+	{
+		SPR_DrawAdditive(kFullFrame, inX, inY, NULL);
+	}
+	
+	SPR_DisableScissor();
+}
+
+void UIGetPosition(const TRDescription& inDesc, float& outXPos, float& outYPos, int& outWidth, int& outHeight)
+{
+    outXPos = UIDefaultXPos;
+    outYPos = UIDefaultYPos;
+    outWidth = UIDefaultWidth;
+    outHeight = UIDefaultHeight;
+
+    // Get normalized xpos if specified.  Don't care if they aren't specified, it will just fail and not change the default.
+    inDesc.GetTagValue(UITagXPos, outXPos);
+    inDesc.GetTagValue(UITagYPos, outYPos);
+    inDesc.GetTagValue(UITagWidth, outWidth);
+    inDesc.GetTagValue(UITagHeight, outHeight);
+}
+
+void UIStringToAlignment(const string& inString, int outAlignment)
+{
+    if(inString == "northwest")
+    {
+        outAlignment = vgui::Label::a_northwest;
+    } 
+    else if(inString == "north")
+    {
+        outAlignment = vgui::Label::a_north;
+    }
+    else if(inString == "northeast")
+    {
+        outAlignment = vgui::Label::a_northeast;
+    }
+    else if(inString == "west")
+    {
+        outAlignment = vgui::Label::a_west;
+    }
+    else if(inString == "center")
+    {
+        outAlignment = vgui::Label::a_center;
+    }
+    else if(inString == "east")
+    {
+        outAlignment = vgui::Label::a_east;
+    }
+    else if(inString == "southwest")
+    {
+        outAlignment = vgui::Label::a_southwest;
+    }
+    else if(inString == "south")
+    {
+        outAlignment = vgui::Label::a_southeast;
+    }
+    else 
+    {
+        // Default is centered
+        outAlignment = UIDefaultAlignment;
+    }
+}
+
+void UIStringToColor(const string& inString, vgui::Color& outColor)
+{
+    // Set default rgba in case the string is totally bogus (default is opaque white)
+    int r = 255;
+    int g = 255;
+    int b = 255;
+    int a = 255;
+    int theColor = 0;
+	
+    // Get rgba values from inString
+    if(sscanf(inString.c_str(), "%x", &theColor) == 1)
+    {
+        r = (theColor >> 24) & 0xFF;
+        g = (theColor >> 16) & 0xFF;
+        b = (theColor >> 8) & 0xFF;
+        a = (theColor >> 0) & 0xFF;
+    }
+	
+    // Set it to the read in values or the default if we couldn't read it
+    outColor.setColor(r, g, b, a);
+}
+
+char UIKeyCodeToChar(vgui::KeyCode inKeyCode)
+{
+	static char theLookup[57] = {
+		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+		'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+		'\\', '*', '-', '+', 
+		'\n', '.', '[', ']', 
+		';', '\'', '\\',
+	};
+
+	int theOffset = (int)(inKeyCode);
+	ASSERT(theOffset >= 0);
+	ASSERT(theOffset < 57);
+
+	char theReturnChar = theLookup[theOffset];
+	return theReturnChar;
+}
+
+string UINameToSprite(const string& inName, int inScreenWidth, bool inNoRes)
+{
+	string theSpriteName;
+
+	// Add 640/320 also
+	string thePrefix;
+	if(!inNoRes)
+	{
+		thePrefix = "640";
+		if(inScreenWidth < 640)
+		{
+			thePrefix = "320";
+		}
+	}
+	
+	theSpriteName = "sprites/" + thePrefix;
+	theSpriteName += inName;
+	theSpriteName += ".spr";
+
+	return theSpriteName;
+}
+
+vgui::Color UIBlendColor(const vgui::Color& inBaseColor, const vgui::Color& inDestColor, float inParametricPercentage)
+{
+	ASSERT(inParametricPercentage >= 0.0f);
+	ASSERT(inParametricPercentage <= 1.0f);
+
+	vgui::Color theBaseColor = inBaseColor;
+	vgui::Color theDestColor = inDestColor;
+
+	int theBaseR, theBaseG, theBaseB, theBaseA;
+	theBaseColor.getColor(theBaseR, theBaseG, theBaseB, theBaseA);
+
+	int theDestR, theDestG, theDestB, theDestA;
+	theDestColor.getColor(theDestR, theDestG, theDestB, theDestA);
+	
+	int theOutR = theBaseR + (theDestR - theBaseR)*inParametricPercentage;
+	int theOutG = theBaseG + (theDestG - theBaseG)*inParametricPercentage;
+	int theOutB = theBaseB + (theDestB - theBaseB)*inParametricPercentage;
+	int theOutA = theBaseA + (theDestA - theBaseA)*inParametricPercentage;
+	
+	vgui::Color theBlendedColor;
+	theBlendedColor.setColor(theOutR, theOutG, theOutB, theOutA);
+
+	return theBlendedColor;
+}
+
+int vguiRound(float inFloat)
+{
+    return (int)(inFloat + .5f);
+}
+
+int vguiAbs(int inNum)
+{
+    return (inNum > -inNum ? inNum : -inNum);
+}
+
+void vguiSimpleLine(int x0, int y0, int x1, int y1, int r, int g, int b, int a)
+{
+    //public void lineImproved(int x0, int y0, int x1, int y1, Color color)
+    //{
+        //int pix = color.getRGB();
+        int dx = x1 - x0;
+        int dy = y1 - y0;
+
+        //raster.setPixel(pix, x0, y0);
+        FillRGBA(x0, y0, 1, 1, r, g, b, a);
+        //if (Math.abs(dx) > Math.abs(dy)) {          // slope < 1
+        if(vguiAbs(dx) > vguiAbs(dy))
+        {
+            float m = (float) dy / (float) dx;      // compute slope
+            float b = y0 - m*x0;
+            dx = (dx < 0) ? -1 : 1;
+            while (x0 != x1) 
+            {
+                x0 += dx;
+                //raster.setPixel(pix, x0, Math.round(m*x0 + b));
+                FillRGBA(x0, vguiRound(m*x0 + b), 1, 1, r, g, b, a);
+            }
+        } 
+		else if (dy != 0) 
+        {                              // slope >= 1
+            float m = (float) dx / (float) dy;      // compute slope
+            float b = x0 - m*y0;
+            dy = (dy < 0) ? -1 : 1;
+            while (y0 != y1) 
+            {
+                y0 += dy;
+                //raster.setPixel(pix, Math.round(m*y0 + b), y0);
+                FillRGBA(vguiRound(m*y0 + b), y0, 1, 1, r, g, b, a);
+            }
+        }
+    //}
+}
+
+void vguiSimpleBox(int x0, int y0, int x1, int y1, int r, int g, int b, int a)
+{
+	// Draw lines around edges of box, don't duplicate corner pixels though, looks weird where additive
+
+	// Top
+	vguiSimpleLine(x0, y0, x1, y0, r, g, b, a);
+	
+	// Left
+	vguiSimpleLine(x0, y0+1, x0, y1, r, g, b, a);
+	
+	// Right
+	vguiSimpleLine(x1, y0+1, x1, y1, r, g, b, a);
+	
+	// Bottom
+	vguiSimpleLine(x0+1, y1, x1, y1, r, g, b, a);
+}
+
+//int trunc(float inX)
+//{
+//    return 0;
+//	//return integer part of x
+//}
+//
+//float frac(float inX)
+//{
+//    return 0.0f;
+//	//return fractional part of x
+//}
+// 
+//float invfrac(inX)
+//{
+//    return 0.0f;
+//	//return 1 - (fractional part of x)
+//}
+//
+//
+//void vguiWuLine(int x1, int y1, int x2, int y2)
+//{
+//
+//        variable declerations:
+//            int variables:
+//		grad, xd, yd, length,xm,ym
+//		xgap, ygap, xend, yend, xf, yf
+//		brigheness1, brigheness2
+//
+//	    integer variables:
+//		x, y, ix1, ix2, iy1, iy2
+//
+//	    byte variables:
+//		c1,c2
+//
+//	code starts here:
+//
+//	    Width and Height of the line
+//	    xd = (x2-x1)
+//	    yd = (y2-y1)
+//	
+//	   
+//	    if abs(xd) > abs(yd) then			check line gradient
+//	        horizontal(ish) lines
+//
+//
+//		if x1 > x2 then				if line is back to front
+//		    swap x1 and x2			then swap it round
+//		    swap y1 and y2
+//	            xd = (x2-x1)				and recalc xd & yd
+//	            yd = (y2-y1)
+//		end if
+//
+//	 	grad = yd/xd                             gradient of the line
+//		
+//
+//		End Point 1
+//		-----------
+//
+//		xend = trunc(x1+.5)                      find nearest integer X-coordinate
+//		yend = y1 + grad*(xend-x1)               and corresponding Y value
+//		
+//		xgap = invfrac(x1+.5)                    distance i
+//		
+//		ix1  = int(xend)                         calc screen coordinates
+//		iy1  = int(yend)
+//	
+//		brightness1 = invfrac(yend) * xgap       calc the intensity of the other 
+//		brightness2 =    frac(yend) * xgap       end point pixel pair.
+//		
+//		c1 = byte(brightness1 * MaxPixelValue)	 calc pixel values
+//		c2 = byte(brightness2 * MaxPixelValue)	
+//
+//		DrawPixel(ix1,iy1), c1			 draw the pair of pixels
+//		DrawPixel(ix1,iy1+1), c2
+//
+//		yf = yend+grad                           calc first Y-intersection for
+//                                                         main loop
+//
+//		End Point 2
+//		-----------
+//
+//		xend = trunc(x2+.5)                      find nearest integer X-coordinate
+//		yend = y2 + grad*(xend-x2)               and corresponding Y value
+//		
+//		xgap = invfrac(x2-.5)                    distance i
+//		
+//		ix2  = int(xend)                         calc screen coordinates
+//		iy2  = int(yend)
+//	
+//		brightness1 = invfrac(yend) * xgap       calc the intensity of the first 
+//		brightness2 =    frac(yend) * xgap       end point pixel pair.
+//		
+//		c1 = byte(brightness1 * MaxPixelValue)	calc pixel values
+//		c2 = byte(brightness2 * MaxPixelValue)	
+//
+//		DrawPixel(ix2,iy2), c1			draw the pair of pixels
+//		DrawPixel(ix2,iy2+1), c2
+//
+//
+//
+//		MAIN LOOP
+//		---------
+//
+//		Loop x from (ix1+1) to (ix2-1)			main loop
+//
+//		    brightness1 = invfrac(yf)		        calc pixel brightnesses
+//		    brightness2 =    frac(yf)
+//
+//  		    c1 = byte(brightness1 * MaxPixelValue)	calc pixel values
+//		    c2 = byte(brightness2 * MaxPixelValue)	
+//
+//		    DrawPixel(x,int(yf)), c1			draw the pair of pixels
+// 		    DrawPixel(x,int(yf)+1), c2
+//
+//	            yf = yf + grad				update the y-coordinate
+//
+//		end of x loop					end of loop
+//
+//	    else
+//		vertical(ish) lines
+//
+//		handle the vertical(ish) lines in the
+//		same way as the horizontal(ish) ones
+//		but swap the roles of X and Y
+//	    end if
+//// end of procedure
+//}
+
+
+//void vguiDrawLine(int x0, int y0, int x1, int y1, vgui::Color inDrawColor) {
+//    int dx, dy, temp;
+//    
+//    // First clip input points to ICanvas
+//    if(x0 < 0) {
+//        x0 = 0;
+//    }
+//    if(x1 < 0) {
+//        x1 = 0;
+//    }
+//    if(x0 >= width) {
+//        x0 = width - 1;
+//    }
+//    if(x1 >= width) {
+//        x1 = width - 1;
+//    }
+//    if(y0 < 0) {
+//        y0 = 0;
+//    }
+//    if(y1 < 0) {
+//        y1 = 0;
+//    }
+//    if(y0 >= height) {
+//        y0 = height - 1;
+//    }
+//    if(y1 >= height) {
+//        y1 = height - 1;
+//    }
+//    
+//    dx = x1-x0;
+//    dy = y1-y0;
+//    
+//    if(y0 == y1) { // Special case horizontal lines!
+//        if(dx < 0) {
+//            dx = -dx; // Change to dx = -dx;
+//            x0 = x1;
+//        }
+//        // Call asm_drawHorizontalLine
+//        drawHorizontalLine(x0, y0, dx, inDrawColor);
+//        return;
+//    }
+//    
+//    if(x0 == x1) {
+//        if(dy < 0) {
+//            dy = -dy;
+//            y0 = y1;
+//        }
+//        // Call asm_drawVerticalLine
+//        drawVerticalLine(x0, y0, dy, inDrawColor);
+//        return;
+//    }
+//    
+//    bufferDest = (unsigned long)(buffer + y0*width + x0);
+//    if(fabs(dx) > fabs(dy)) {
+//        // We're going to call octant0
+//        oldYFract = (float)((float)(y1 - y0)/(float)fabs(x1 - x0));
+//        bufferWidth = width;
+//        if(oldYFract < 0) {
+//            oldYFract = -oldYFract; // Probably not needed cause sign bit shifted out
+//            bufferWidth = -width;
+//        }
+//        oldYFract++;
+//        if(x0 < x1) {
+//            drawDirection = 1;
+//        } else {
+//            drawDirection = -1;
+//        }
+//        if(fabs(dx) != 0) {
+//            octant0(fabs(dx));
+//        }
+//    } else {
+//        // We're going to call octant1
+//        oldXFract = (float)((float)(x1 - x0)/(float)fabs((y1 - y0)));
+//        oldXFract++;
+//        drawDirection = 1;
+//        if(oldXFract < 0) {
+//            oldXFract = -oldXFract;
+//            drawDirection = -1;
+//        }
+//        if(y0 < y1) {
+//            bufferWidth = width;
+//        } else {
+//            bufferWidth = -width;
+//        }
+//        if(fabs(dy) != 0) {
+//            octant1(fabs(dy));
+//        }
+//    }
+//}
+
+//void vguiOctant0(int inBufferDest, int inDeltaX, vgui::Color inDrawColor)
+//{
+//  asm_octant0_    PROC    NEAR
+//    ; Set up destination
+//    mov edi,[_bufferDest]
+//    mov bl,[_drawColor]
+
+
+//
+//    ; Set up fractional error
+//    mov eax,[_oldYFract]
+//    shl eax,9
+//    xor ax,ax
+//    mov [_yFract],eax
+//;    xor eax,eax
+//    xor edx,edx
+//
+//NOTDONEOCTANT0:
+//    mov [edi],bl
+//    ;inc edi
+//    add edi,[_drawDirection]
+//
+//    ; Now just figure out whether we go to the next line or not
+//    add edx,[_yFract]
+//    jnc DONTADDOCTANT0
+//    add edi,[_bufferWidth]
+//DONTADDOCTANT0:
+//    sub ecx,1
+//    jnz NOTDONEOCTANT0
+//    ret
+//}
diff --git a/main/source/ui/UIUtil.h b/main/source/ui/UIUtil.h
new file mode 100644
index 00000000..760648e7
--- /dev/null
+++ b/main/source/ui/UIUtil.h
@@ -0,0 +1,43 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: UIUtil.h $
+// $Date: 2002/05/23 04:03:05 $
+//
+//-------------------------------------------------------------------------------
+// $Log: UIUtil.h,v $
+// Revision 1.8  2002/05/23 04:03:05  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef UI_UTIL_H
+#define UI_UTIL_H
+
+#include "types.h"
+#include "textrep/TRDescription.h"
+#include "vgui_keycode.h"
+#include "VGUI_Color.h"
+
+namespace vgui
+{
+    class Color;
+}
+
+void UIDrawVariableBarSpriteHoles(int inSprite, int inX, int inY, float inPercentage, float inGammaSlope, bool inTrueHolesFalseAdditive = true, float inSecondaryPercentage = -1);
+void UIGetPosition(const TRDescription& inDesc, float& outXPos, float& outYPos, int& outWidth, int& outHeight);
+void UIStringToAlignment(const string& inString, int outAlignment);
+void UIStringToColor(const string& inString, vgui::Color& outColor);
+char UIKeyCodeToChar(vgui::KeyCode inKeyCode);
+string UINameToSprite(const string& inName, int inScreenWidth, bool inNoRes = false);
+vgui::Color UIBlendColor(const vgui::Color& inBaseColor, const vgui::Color& inDestColor, float inParametricPercentage);
+
+void vguiSimpleLine(int x0, int y0, int x1, int y1, int r, int g, int b, int a);
+void vguiSimpleBox(int x0, int y0, int x1, int y1, int r, int g, int b, int a);
+
+#endif
\ No newline at end of file
diff --git a/main/source/upp/UPPClientInterface.h b/main/source/upp/UPPClientInterface.h
new file mode 100644
index 00000000..e50eddb1
--- /dev/null
+++ b/main/source/upp/UPPClientInterface.h
@@ -0,0 +1,170 @@
+#ifndef UPPCLIENTINTERFACE_H
+#define UPPCLIENTINTERFACE_H
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//UPP Client Interface 
+//
+//Hides implementation of communication layer between game server 
+//(a.k.a. "the client") and UPP server (a.k.a. "the server")
+//
+//Several details that were previously tracked explicitly by the 
+//client (server identity, client timestamps, heartbeat management)
+//are now handled behind the scenes.  The client is still responsible
+//for collecting player and game data for requests, and still needs 
+//to register itself with a call to UPP::connect.  If UPP::connect fails,
+//no client identity has been established with the UPP server, and any 
+//subsequent requests will automatically fail until a successful call
+//to UPP::connect has been made.
+//
+//The client should call interface functions immediately when the 
+//corresponding state change takes place; any batching of calls will
+//be the responsibility of the communication layer.  Any server that
+//has mp_uplink set to 0 should be considered offline, and changing
+//that cvar should trigger the online/offline reporting functions.
+//
+//If UPP::connect fails, the client can call the function again to 
+//retry or notify the user that the link wasn't established.
+//
+//Ideally, the client should have a centralized player index -> 
+//UPP::PlayerInfo object function so that all of the logic for
+//generating UPP::PlayerInfo snapshots can be contained in a single
+//location.  The ability to build a UPP::TeamInfo object should also
+//be encapsulated since that information is required for both 
+//UPP::GameInfo and UPP::GameResultInfo objects.  A clean, 
+//centralized implementation is less of an issue for the other UPP 
+//data objects, each of which is only used from a single location.
+//
+//Author: Karl Patrick
+//Last Modified: 04/09/04
+//
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#include "UPPCommonInterface.h"
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Forward declaration of UPP Client objects
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+namespace UPP
+{
+	//Profiling objects
+	class PerformanceData;
+	class PerformanceSummary; //not implemented
+
+	//Optional callback functions - can also query for result structures
+	typedef void (*ProfileInfoCallback)(auto_ptr<ProfileInfo> info);
+	typedef void (*AuthGroupCallback)(auto_ptr<const StringSet>);
+	typedef void (*VariablesCallback)(auto_ptr<const StringSet>, bool startVars);
+	typedef void (*ProfilerCallback)(auto_ptr<PerformanceData> profile);
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Interface function declarations
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+namespace UPP
+{
+	//version information
+	int getUPPClientLibBuildNumber(void);
+
+	//configuration
+	int  getMaxSimultaneousRequests(void);
+	bool setServerConnection(const string& connection_string, const string& protocol);
+	bool setGeneratePerformanceData(const bool generate_profiler_info = false);	//not implemented
+	bool setRunAsynchronously(const bool async = true);
+
+	bool setMaxSimultaneousRequests(const int max_size = 5);
+	auto_ptr<string> getConnectionString(void);
+	auto_ptr<string> getProtocol(void);
+	bool getGeneratePerformanceData(void);										//not implemented
+	bool getRunAsynchronously(void);
+
+	//state information
+	bool isConnected(void);
+	bool isRecordingGame(void);
+
+	//outgoing signal functions (asynchronous, return false if signal definitely won't be sent)
+	bool connect(const ClientInfo& info);
+	bool disconnect(void);
+	bool requestConnectionSpeedTest(void); //always generates profiler info
+
+	bool reportPlayerEntered(const PlayerInfo& player, const bool resolvedID);
+	bool reportPlayerChangingIDs(const PlayerInfo& player, const string& newNetworkID, const bool resolvedID);
+	bool reportPlayerChangingTeams(const PlayerInfo& player, const int newTeamIndex);
+	bool reportPlayerExited(const PlayerInfo& player);
+
+	bool reportGameStarted(const GameInfo& game);
+	bool reportGameFinished(const GameResultInfo& game);
+	bool reportGameCancelled(void);
+
+	bool requestAuthGroups(void);
+	bool requestVariables(void);
+
+	//incoming signal functions (asynchronous, items are sent to callback functions
+	//immediately if they are defined, otherwise they are stored until retrieval
+	//only the most recently registered callback function is used.  Register NULL to 
+	//return to using library-side storage until retrieval
+
+	void registerProfileInfoCallback(ProfileInfoCallback callback);
+	void registerAuthGroupCallback(AuthGroupCallback callback);
+	void registerVariablesCallback(VariablesCallback callback);
+	void registerProfilerCallback(ProfilerCallback callback);
+
+	bool hasProfileInfo(void);
+	auto_ptr<ProfileInfo> getProfileInfo(void); //returns auto_ptr<NULL> if no profiles are available
+
+	bool hasPerformanceData(void);
+	auto_ptr<PerformanceData> getPerformanceData(void);
+	auto_ptr<PerformanceSummary> getPerformanceSummary(void);
+
+	auto_ptr<StringSet> listAuthGroups(void);
+	auto_ptr<StringSet> listGameStartVariables(void);
+	auto_ptr<StringSet> listGameEndVariables(void);
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class UPP::PerformanceData
+{
+public:
+	virtual ~PerformanceData(void) {}
+	virtual const string getSignalType(void) const = 0;
+	virtual long getSignalTimestamp(void) const = 0;
+	virtual long getProcessingThreadNumber(void) const = 0;
+
+	virtual const string getConnectionString(void) const = 0;
+	virtual const string getConnectionProtocol(void) const = 0;
+
+	virtual int getErrorCode(void) const = 0;
+	virtual const string getErrorDescription(void) const = 0;
+
+	virtual long getTimeInQueue(void) const = 0;
+	virtual long getTimeInProcessing(void) const = 0;
+	virtual long getTimeInProcessingOnServer(void) const = 0;
+
+	virtual long getRequestSize(void) const = 0;
+	virtual long getResponseSize(void) const = 0;
+};
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class UPP::PerformanceSummary
+{
+public:
+	virtual ~PerformanceSummary(void) {}
+	virtual int getNumRequestsCreated(void) const = 0;
+	virtual int getNumRequestsSent(void) const = 0;
+	virtual int getNumResponsesRecieved(void) const = 0;
+	virtual int getNumResponsesSuccessful(void) const = 0;
+
+	//note - timers only account for signals that have recieved
+	//responses
+	virtual long getTotalTimeInQueue(void) const = 0;
+	virtual long getTotalTimeInProcessing(void) const = 0;
+	virtual long getTotalTimeInProcessingServer(void) const = 0;
+
+	virtual long getTotalRequestSize(void) const = 0;
+	virtual long getTotalResponseSize(void) const = 0;
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/upp/UPPCommonInterface.h b/main/source/upp/UPPCommonInterface.h
new file mode 100644
index 00000000..6921e01c
--- /dev/null
+++ b/main/source/upp/UPPCommonInterface.h
@@ -0,0 +1,321 @@
+#ifndef UPPCOMMONINTERFACE_H
+#define UPPCOMMONINTERFACE_H
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//UPP Common Interface 
+//
+// Declares objects and functions that should be shared between the
+// client and server.
+//
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#include "util/nowarnings.h"
+#include <algorithm> //for std::binary_function
+#include <string>
+#include <map>
+#include <memory> //for std::auto_ptr
+#include <set>
+#include "UPPTypes.h"
+
+using std::auto_ptr;
+using std::binary_function;
+using std::string;
+using std::set;
+using std::map;
+
+typedef set<string> StringSet;
+typedef map<string,string> StringMap;
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Forward declaration of UPP Common objects
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+namespace UPP
+{
+	//Signal transfer objects
+	class ConnectSignal;
+	class DisconnectSignal;
+	class ConnectionSpeedTestSignal;
+	class ReportPlayerEnteredSignal;
+	class ReportPlayerExitedSignal;
+	class ReportPlayerChangingTeamsSignal;
+	class ReportPlayerChangingIDsSignal;
+	class ReportGameStartedSignal;
+	class ReportGameFinishedSignal;
+	class ReportGameCancelledSignal;
+	class RequestVariablesSignal;
+	class RequestAuthGroupsSignal;
+
+	//Client request objects
+	class ClientInfo;
+	class PlayerInfo;
+	class GameInfo;
+	class GameResultInfo;
+	class TeamInfo;
+
+	//Server return objects
+	class ProfileInfo;
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Interface function declarations
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+namespace UPP
+{
+	//version information
+	int getUPPInterfaceMajorVersion(void);
+	int getUPPInterfaceMinorVersion(void);
+
+	//configuration
+	bool setConnectionTimeout(const int timeout_milliseconds = DEFAULT_CONNECTIONTIME);
+	bool setTransmissionTimeout(const int timeout_milliseconds = DEFAULT_TRANSMISSIONTIME);
+	bool setAbortSignalsOnShutdown(const bool abort = false);
+
+	int  getConnectionTimeout(void);
+	int  getTransmissionTimeout(void);
+	bool getAbortSignalsOnShutdown(void);
+
+	auto_ptr<StringSet> getAvailableProtocols(void);
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Utility functors
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+namespace UPP
+{
+	//for use in TeamSet
+	struct TeamComparator : public binary_function<const TeamInfo&,const TeamInfo&,bool> 
+	{
+		bool operator()(const TeamInfo& lhs, const TeamInfo& rhs) const;
+	};
+
+	//for use in PlayerSet
+	struct PlayerComparator : public binary_function<const PlayerInfo&,const PlayerInfo&,bool> 
+	{
+		bool operator()(const PlayerInfo& lhs, const PlayerInfo& rhs) const;
+	};
+}
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// UPP class storage objects
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+typedef set<UPP::TeamInfo,UPP::TeamComparator> TeamSet;
+typedef set<UPP::PlayerInfo,UPP::PlayerComparator> PlayerSet;
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Class declarations
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class UPP::ClientInfo
+{
+	friend class ConnectSignal;
+public:
+	ClientInfo(void);
+	~ClientInfo(void);
+	ClientInfo(const ClientInfo& other);
+	ClientInfo& operator=(const ClientInfo& other);
+
+	//Property Setters
+	void setAddress(const string& address);
+	void setPort(int port);
+	//Environment is automatically determined internally
+	void setRegion(int region);
+	void setEngineVersion(const string& version);
+	void setGameVersion(const string& version);
+	void setName(const string& name);
+	void setContact(const string& contact);
+
+	void addPlugin(const string& plugin);
+	void removePlugin(const string& plugin);
+
+	//Property Retrieval
+	const string getAddress(void) const;
+	int getPort(void) const;
+	const string getEnvironment(void) const;
+	int getRegion(void) const;
+	const string getEngineVersion(void) const;
+	const string getGameVersion(void) const;
+	const string getName(void) const;
+	const string getContact(void) const;
+	const StringSet getPlugins(void) const;
+
+private:
+	friend class UPP::ConnectSignal;
+	class Impl;
+	ClientInfo(const Impl* data);
+	auto_ptr<Impl> pimpl;
+};
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class UPP::GameInfo
+{
+public:
+	GameInfo(const string& type);
+	~GameInfo(void);
+	GameInfo(const GameInfo& other);
+	GameInfo& operator=(const GameInfo& other);
+
+	//Property Setters
+	void setType(const string& type); // e.g. "NS" or "CO"
+	void setMapName(const string& mapname); 
+	
+	void addTeam(const UPP::TeamInfo& team);
+	void removeTeam(const UPP::TeamInfo& team);
+	
+	void addVariable(const string& name, const string& value);
+	void removeVariable(const string& name);
+
+	//Property Getters
+	const string getType(void) const;
+	const string getMapName(void) const;
+	const TeamSet getTeams(void) const;
+	const StringMap getVariables(void) const;
+
+private:
+	friend class UPP::ReportGameStartedSignal;
+	class Impl;
+	GameInfo(const Impl* data);
+	auto_ptr<Impl> pimpl;
+};
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class UPP::GameResultInfo
+{
+public:
+	GameResultInfo(void);
+	~GameResultInfo(void);
+	GameResultInfo(const GameResultInfo& other);
+	GameResultInfo& operator=(const GameResultInfo& other);
+
+	//Property Setters
+	void setWinningTeam(int teamIndex); // e.g. "NS" or "CO"
+	
+	void addTeam(const UPP::TeamInfo& team);
+	void removeTeam(const UPP::TeamInfo& team);
+
+	void addGameStateSetting(const string& name, const string& value);
+	void removeGameStateSetting(const string& name);
+
+	void addVariable(const string& name, const string& value);
+	void removeVariable(const string& name);
+
+	//Property Getters
+	int getWinningTeam(void) const;
+	const TeamSet getTeams(void) const;
+	const StringMap getVariables(void) const;
+	const StringMap getGameState(void) const;
+
+private:
+	friend class UPP::ReportGameFinishedSignal;
+	class Impl;
+	GameResultInfo(const Impl* data);
+	auto_ptr<Impl> pimpl;
+};
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class UPP::TeamInfo
+{
+public:
+	TeamInfo(int index, const string& type);
+	~TeamInfo(void);
+	TeamInfo(const TeamInfo& other);
+	TeamInfo& operator=(const TeamInfo& other);
+
+	//Property Setters
+	void setIndex(int teamIndex);
+	void setType(const string& type);	// e.g. "alien", "marine", "spectator", "readyroom"
+	
+	void addPlayer(const UPP::PlayerInfo& player);
+	void removePlayer(const UPP::PlayerInfo& player);
+
+	//Property Retrieval
+	int getIndex(void) const;
+	const string getType(void) const;
+	const PlayerSet getPlayers(void) const;
+
+private:
+	class Impl;
+	TeamInfo(const Impl* data);
+	auto_ptr<Impl> pimpl;
+};
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class UPP::PlayerInfo
+{
+public:
+	PlayerInfo(void);
+	~PlayerInfo(void);
+	PlayerInfo(const PlayerInfo& other);
+	PlayerInfo& operator=(const PlayerInfo& other);
+
+	//Property Setters
+	void setNetworkID(const string& networkID);		// STEAM or WON ID
+	void setName(const string& name);				// display name in game
+	void setClass(const string& className);			// e.g. "skulk", "marine"
+	void setScore(int score);
+	void setKills(int kills);
+	void setDeaths(int deaths);
+	void setExperience(float experience);			// CO mode experience amount
+	void setTeamIndex(int team);					// current team -- don't change before signaling reportPlayerChangingTeam
+
+	//Property Retrieval
+	const string getNetworkID(void) const;
+	const string getName(void) const;
+	const string getClass(void) const;
+	int getScore(void) const;
+	int getKills(void) const;
+	int getDeaths(void) const;
+	float getExperience(void) const;
+	int getTeamIndex(void) const;
+
+private:
+	friend class UPP::ReportPlayerEnteredSignal;
+	friend class UPP::ReportPlayerExitedSignal;
+	friend class UPP::ReportPlayerChangingTeamsSignal;
+	friend class UPP::ReportPlayerChangingIDsSignal;
+	class Impl;
+	PlayerInfo(const Impl* data);
+	auto_ptr<Impl> pimpl;
+};
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+//this is a return object, the client can't set properties
+class UPP::ProfileInfo
+{
+public:
+	ProfileInfo(void);
+	~ProfileInfo(void);
+	ProfileInfo(const ProfileInfo& other);
+	ProfileInfo& operator=(const ProfileInfo& other);
+
+	//Property Setters
+	void setPlayerID(const int playerID);
+	void setProfileName(const string& name);
+	void setNetworkID(const string& networkID);
+	void setAuthorized(const bool authorized);
+	void setIconName(const string& iconName);
+	void addAuthGroup(const string& authGroup);
+	void removeAuthGroup(const string& authGroup);
+
+	//Property Retrieval
+	int getPlayerID(void) const;				//UPP ID, returns 0 if player not found
+	const string getProfileName(void) const;
+	const string getNetworkID(void) const;		//should mirror the id sent by reportPlayerEntered
+	bool getAuthorized(void) const;				//can this person play in the game?
+	const string getIconName(void) const;
+	const StringSet getAuthGroups(void) const;	//set of all current authgroups
+private:
+	class Impl;
+	ProfileInfo(const Impl* data);
+	auto_ptr<Impl> pimpl;
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/upp/UPPTypes.h b/main/source/upp/UPPTypes.h
new file mode 100644
index 00000000..3df91b8b
--- /dev/null
+++ b/main/source/upp/UPPTypes.h
@@ -0,0 +1,88 @@
+#ifndef UPPTYPES_H
+#define UPPTYPES_H
+
+#include <string>
+using std::string;
+
+namespace UPP
+{
+	const static int MAJOR_VERSION_NUMBER = 1;
+	const static int MINOR_VERSION_NUMBER = 3;
+	
+	const int DEFAULT_CONNECTIONTIME = 3000;
+	const int DEFAULT_TRANSMISSIONTIME = 10000;
+
+	typedef unsigned char ErrorCode;
+
+	const ErrorCode UPP_OK						= 0x00;
+	const ErrorCode ERROR_BAD_PROTOCOL			= 0x10;
+	const ErrorCode ERROR_CONNECTION_FAILED		= 0x11;
+	const ErrorCode ERROR_CONNECTION_LOST		= 0x12;
+	const ErrorCode ERROR_CONNECTION_REJECTED	= 0x13;
+	const ErrorCode ERROR_CONNECTION_REDIRECT	= 0x14;
+
+	const ErrorCode ERROR_CLIENT_INVALID_ID		= 0x20;
+	const ErrorCode ERROR_CLIENT_INVALID_DATA	= 0x21;
+	const ErrorCode ERROR_CLIENT_NOT_FOUND		= 0x22;
+	const ErrorCode ERROR_CLIENT_TIMED_OUT		= 0x23;
+	const ErrorCode ERROR_CLIENT_UPDATE_FAILED  = 0x24;
+
+	const ErrorCode ERROR_PLAYER_INVALID_ID		= 0x30;
+	const ErrorCode ERROR_PLAYER_INVALID_DATA	= 0x31;
+	const ErrorCode ERROR_PLAYER_NOT_FOUND		= 0x32;
+	//const ErrorCode RESERVED					= 0x33;
+	const ErrorCode ERROR_PLAYER_UPDATE_FAILED  = 0x34;
+
+	const ErrorCode ERROR_GAME_INVALID_ID		= 0x40;
+	const ErrorCode ERROR_GAME_INVALID_DATA		= 0x41;
+	const ErrorCode ERROR_GAME_NOT_FOUND		= 0x42;
+	//const ErrorCode RESERVED					= 0x43;
+	const ErrorCode ERROR_GAME_UPDATE_FAILED	= 0x44;
+}
+
+const string SignalTypeStrings[] =
+{
+	"Connect", 
+	"Disconnect", 
+	"ConnectionSpeedTest",
+	"ReportPlayerEntrance", 
+	"ReportPlayerExit", 
+	"ReportPlayerChangeTeams", 
+	"ReportPlayerChangeNetworkID",
+	"ReportGameStarted",
+	"ReportGameCancelled",
+	"ReportGameFinished",
+	"RequestVariables",
+	"RequestAuthGroups"
+};
+
+enum SignalType { 
+	Connect, 
+	Disconnect, 
+	ConnectionSpeedTest,
+	ReportPlayerEntrance, 
+	ReportPlayerExit, 
+	ReportPlayerChangeTeams, 
+	ReportPlayerChangeNetworkID,
+	ReportGameStarted,
+	ReportGameCancelled,
+	ReportGameFinished,
+	RequestVariables,
+	RequestAuthGroups,
+	NUM_SIGNAL_TYPES
+};
+
+enum SignalProtocol {
+	NO_SERVER = 0,
+	SOAP = 1,
+	NUM_PROTOCOLS = 2,
+	DEFAULT = 1
+};
+
+const string SignalProtocolStrings[] =
+{
+	"none",
+	"soap"
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/util/CString.h b/main/source/util/CString.h
new file mode 100644
index 00000000..f5b19b3c
--- /dev/null
+++ b/main/source/util/CString.h
@@ -0,0 +1,78 @@
+#ifndef C_STRING_H
+#define C_STRING_H
+
+#include <stdio.h>
+#include <string>
+#include <vector>
+using std::string;
+using std::vector;
+
+// Include C-style strings for those functions that can't handle it <sigh>
+// Half-life keeps pointers to strings and assumes they don't change, meaning
+// that STL strings can't be used.  What a hack.
+class CString
+{
+public:
+
+    #define kMaxCStrLen 256
+
+    CString()
+    {
+        memset(this->mString, 0, kMaxCStrLen);
+    }
+
+    operator char*()
+    {
+        return this->mString;
+    }
+
+    operator const char*() const
+    {
+        return this->mString;
+    }
+
+    void operator =(const string& inString)
+    {
+        sprintf(this->mString, "%s", inString.c_str());
+    }
+
+    void operator =(const CString& inString)
+    {
+        sprintf(this->mString, "%s", inString.mString);
+    }
+
+    bool operator ==(const CString& inString) const
+    {
+        bool theAreEqual = false;
+
+        if(!strcmp(this->mString, inString.mString))
+        {
+            theAreEqual = true;
+        }
+        return theAreEqual;
+    }
+
+    bool operator ==(const string& inString) const
+    {
+        bool theAreEqual = false;
+
+        if(!strcmp(this->mString, inString.c_str()))
+        {
+            theAreEqual = true;
+        }
+        return theAreEqual;
+    }
+
+    int GetMaxLength()
+    {
+        return kMaxCStrLen;
+    }
+
+private:
+    char   mString[kMaxCStrLen];
+    #undef kMaxCStrLen
+};
+
+typedef vector<CString>		CStringList;
+
+#endif
diff --git a/main/source/util/Checksum.cpp b/main/source/util/Checksum.cpp
new file mode 100644
index 00000000..a37eec5d
--- /dev/null
+++ b/main/source/util/Checksum.cpp
@@ -0,0 +1,337 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: Checksum.cpp $
+// $Date: 2002/05/23 04:03:11 $
+//
+//-------------------------------------------------------------------------------
+// $Log: Checksum.cpp,v $
+// Revision 1.1  2002/05/23 04:03:11  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#include "util/Checksum.h"
+#include "util/STLUtil.h"
+
+const string kFormattedStringDelimiter = " -> ";
+const string kFormattedStringEOL = "\n";
+
+ChecksumEntry::ChecksumEntry(void)
+{ 
+	this->mChecksum = 0; 
+}
+
+uint32 ChecksumEntry::GetChecksum() const
+{ 
+	return this->mChecksum; 
+}
+
+const string& ChecksumEntry::GetDescription() const
+{ 
+	return this->mChecksumDescription; 
+}
+
+string ChecksumEntry::GetFormattedString() const
+{ 
+	string theFormattedString = this->mChecksumDescription;
+	theFormattedString += kFormattedStringDelimiter;
+	theFormattedString += MakeStringFromInt(this->mChecksum);
+	theFormattedString += kFormattedStringEOL;
+
+	return theFormattedString; 
+}
+
+
+void ChecksumEntry::SetChecksum(uint32 inChecksum)
+{ 
+	this->mChecksum = inChecksum; 
+}
+
+void ChecksumEntry::SetDescription(const string& inDescription)
+{ 
+	this->mChecksumDescription = inDescription; 
+}
+
+bool ChecksumEntry::SetFromFormattedString(const string& inFormattedString)
+{
+	bool theSuccess = false;
+
+	int theEOL = inFormattedString.find(kFormattedStringEOL);
+	if(theEOL != std::string::npos)
+	{
+		string theNonDelimitedString = inFormattedString.substr(0, theEOL);
+		
+		// Parse out delimiter
+		int theSplit = theNonDelimitedString.find(kFormattedStringDelimiter);
+		if(theSplit != std::string::npos)
+		{
+			// Everything before it is description
+			string theDescription = theNonDelimitedString.substr(0, theSplit-1);
+		
+			// Everything after is checksum
+			string theChecksumString = theNonDelimitedString.substr(theSplit + kFormattedStringDelimiter.size());
+		
+			this->mChecksumDescription = theDescription;
+			this->mChecksum = MakeIntFromString(theChecksumString);
+		
+			theSuccess = true;
+		}
+	}
+	
+	return theSuccess;
+}
+
+
+bool ChecksumEntry::Compare(const ChecksumEntry& inChecksumEntry, string& theErrorString) const
+{
+	bool theReturnCode = false;
+
+	if(inChecksumEntry.mChecksumDescription != this->mChecksumDescription)
+	{
+		sprintf(theErrorString, "ChecksumEntry::Compare failed, the tags don't match: %s != %s\n", inChecksumEntry.mChecksumDescription.c_str(), this->mChecksumDescription.c_str());
+	}
+	else if(inChecksumEntry.mChecksum != this->mChecksum)
+	{
+		sprintf(theErrorString, "ChecksumEntry::Compare failed, checksums don't match: %u != %u (%s)\n", inChecksumEntry.mChecksum, this->mChecksum, inChecksumEntry.mChecksumDescription.c_str());
+	}
+	else
+	{
+		theReturnCode = true;
+	}
+	
+	return theReturnCode;
+}
+
+Checksum::Checksum(bool inVerboseMode)
+{
+	this->mIsVerboseMode = inVerboseMode;
+}
+
+void Checksum::AddChecksum(const string& inInfoString, uint32 inChecksum)
+{
+	ChecksumEntry theChecksumEntry;
+
+	// Add a new tagged checksum or just add the new checksum number to our total depending on verbose mode
+	if(this->mIsVerboseMode)
+	{
+		// Initialize new checksum entry
+		theChecksumEntry.SetDescription(inInfoString);
+		theChecksumEntry.SetChecksum(inChecksum);
+		
+		// Add our new entry
+		this->mChecksumList.push_back(theChecksumEntry);
+	}
+	else
+	{
+		this->AddChecksum(inChecksum);
+	}
+}
+
+void Checksum::AddFloatChecksum(const string& inInfoString, float inChecksum)
+{
+	// Convert float to uint32
+	uint32 theUint32Checksum = (uint32)(inChecksum*1000.0f);
+	this->AddChecksum(inInfoString, theUint32Checksum);
+}
+
+
+void Checksum::AddChecksum(uint32 inChecksum)
+{
+	ChecksumList::iterator		theIterator;
+	ChecksumEntry				theNewEntry;
+
+	// Make sure there is at least one checksum already, add one otherwise
+	if(this->mChecksumList.size() == 0)
+	{
+		// Add new checksum with no description
+		this->mChecksumList.push_back(theNewEntry);
+	}
+
+	// Get iterator to last checksum
+	theIterator = this->mChecksumList.end() - 1;
+
+	// Add inChecksum to the existing value
+	theIterator->SetChecksum(theIterator->GetChecksum() + inChecksum);
+}
+
+bool Checksum::Compare(const Checksum& inChecksum, StringList& outErrors) const
+{
+	ChecksumList::const_iterator	theIncomingIter = inChecksum.mChecksumList.begin();
+	ChecksumList::const_iterator	theSourceIter = this->mChecksumList.begin();
+
+	string							theErrorString;
+
+	int32							theChecksumCount = 0;
+
+	bool							theReturnCode = true;
+
+	// Only try compare if both checksums are in the same mode 
+	if(this->GetIsVerboseMode() == inChecksum.GetIsVerboseMode())
+	{
+		if(this->mChecksumList.size() == inChecksum.mChecksumList.size())
+		{
+			for( ; theSourceIter != this->mChecksumList.end(); theSourceIter++, theIncomingIter++)
+			{
+				if(!(theSourceIter->Compare(*theIncomingIter, theErrorString)))
+				{
+					outErrors.push_back(theErrorString);
+					theReturnCode = false;
+				}
+				theChecksumCount++;
+			}
+		}
+		else
+		{
+			sprintf(theErrorString, "Checksum::Compare(): Checksum sizes don't match.  Source size is %d and other size is %d.\n", this->mChecksumList.size(), inChecksum.mChecksumList.size());
+			outErrors.push_back(theErrorString);
+			theReturnCode = false;
+		}
+	}
+	else
+	{
+		sprintf(theErrorString, "Checksum::Compare(): One checksum is in verbose mode, the other isn't.\n");
+		outErrors.push_back(theErrorString);
+		theReturnCode = false;
+	}
+
+	return theReturnCode;
+}
+
+bool Checksum::GetIsVerboseMode(void) const
+{
+	return this->mIsVerboseMode;
+}
+
+uint32 Checksum::GetTotalChecksum(void) const
+{
+	ChecksumList::const_iterator	theSourceIter = this->mChecksumList.begin();
+	uint32							theTotalChecksum = 0;
+	
+	for( ; theSourceIter != this->mChecksumList.end(); theSourceIter++)
+	{
+		theTotalChecksum += theSourceIter->mChecksum;
+	}
+	
+	return theTotalChecksum;
+}
+
+void Checksum::PrintReport(void) const
+{
+	//	ChecksumList::const_iterator	theSourceIter = this->mChecksumList.begin();
+	//
+	//	::ESReport("Checksum::PrintReport(): begin.\n");
+	//	for( ; theSourceIter != this->mChecksumList.end(); theSourceIter++)
+	//	{
+	//		::ESReport("  %s, %u\r\n", (const char*)(theSourceIter->mChecksumDescription), theSourceIter->mChecksum);
+	//	}
+	//	::ESReport("Checksum::PrintReport(): complete.\n");
+}
+
+bool Checksum::ReadFromFile(const char* inFilename) 
+{
+	bool theSuccess = false;
+
+	this->mChecksumList.clear();
+	
+	ifstream theStream(inFilename);
+	if(theStream.is_open())
+	{
+		string theStartString;
+		theStream >> theStartString;
+
+		// Read in num checksums
+		int theNumChecksums = 0;
+		theStream >> theNumChecksums;
+		
+		// Read in pairs of checksums
+		for(int i = 0; i < theNumChecksums; i++)
+		{
+			string theFormattedString;
+			theStream >> theFormattedString;
+
+			ChecksumEntry theNewEntry;
+			theNewEntry.SetFromFormattedString(theFormattedString);
+			this->mChecksumList.push_back(theNewEntry);
+		}
+		
+		string theEndString;
+		theStream >> theEndString;
+		
+		theStream.close();
+	}
+
+	return theSuccess;
+}
+
+bool Checksum::SaveToFile(const char* inFilename) const
+{
+	bool theSuccess = false;
+
+	// open file for writing
+	ofstream theStream(inFilename);
+	if(theStream.is_open())
+	{
+		string theStartString("CHECKSUM-REPORT:\r\n");
+		theStream << theStartString;
+
+		int theNumChecksums = this->mChecksumList.size();
+		theStream << theNumChecksums;
+
+		// dump everything to it
+		for(ChecksumList::const_iterator theIter = this->mChecksumList.begin(); theIter != this->mChecksumList.end(); theIter++)
+		{
+			string theFormattedDescription = theIter->GetFormattedString();
+			theStream << theFormattedDescription;
+		}
+		
+		string theEndString("END.\r\n");
+		theStream << theEndString;
+
+		theStream.close();
+
+		theSuccess = true;
+	}
+
+//	FILE* theFile = fopen(inFilename, "wt");
+//	if(theFile)
+//	{
+//		string theStartString("Checksum report:\r\n");
+//		fwrite(theStartString.c_str(), theStartString.length(), 1, theFile);
+//		
+//		// dump everything to it
+//		for(ChecksumList::const_iterator theIter = this->mChecksumList.begin(); theIter != this->mChecksumList.end(); theIter++)
+//		{
+//			const string& theFormattedString = theIter->GetFormattedString();
+//			fwrite(theFormattedString.c_str(), theFormattedString.length(), 1, theFile);
+//			fwrite("\r\n", 2, 1, theFile);
+//		}
+//
+//		string theEndString("Checksum report complete.\r\n");		
+//		fwrite(theEndString.c_str(), theEndString.length(), 1, theFile);
+//		
+//		// close it
+//		int theCloseRC = fclose(theFile);
+//		if(theCloseRC == 0)
+//		{
+//			theSuccess = true;
+//		}
+//	}
+
+	//	ChecksumList::const_iterator	theSourceIter = this->mChecksumList.begin();
+	//
+	//	::ESReport("Checksum::PrintReport(): begin.\n");
+	//	for( ; theSourceIter != this->mChecksumList.end(); theSourceIter++)
+	//	{
+	//		::ESReport("  %s, %u\r\n", (const char*)(theSourceIter->mChecksumDescription), theSourceIter->mChecksum);
+	//	}
+	//	::ESReport("Checksum::PrintReport(): complete.\n");
+	
+	return theSuccess;
+}
+
diff --git a/main/source/util/Checksum.h b/main/source/util/Checksum.h
new file mode 100644
index 00000000..89ffb142
--- /dev/null
+++ b/main/source/util/Checksum.h
@@ -0,0 +1,87 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: Checksum.h $
+// $Date: 2002/05/23 04:03:11 $
+//
+//-------------------------------------------------------------------------------
+// $Log: Checksum.h,v $
+// Revision 1.1  2002/05/23 04:03:11  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+//===============================================================================
+#ifndef CHECKSUM_H
+#define CHECKSUM_H
+
+#include "types.h"
+
+class ChecksumEntry
+{
+public:
+					ChecksumEntry(void);
+
+	uint32			GetChecksum() const;
+
+	const string&	GetDescription() const;
+
+	string			GetFormattedString() const;
+	
+	void			SetChecksum(uint32 inChecksum);
+
+	void			SetDescription(const string& inDescription);
+
+	bool			SetFromFormattedString(const string& inFormattedString);
+
+private:
+	friend class Checksum;
+
+	bool			Compare(const ChecksumEntry& inChecksumEntry, string& outStringToAppendTo) const;
+
+	string			mChecksumDescription;
+
+	uint32			mChecksum;
+
+};
+
+class Checksum
+{
+public:
+
+
+							Checksum(bool inVerboseMode = true);
+	virtual					~Checksum(void) { }
+
+	void					AddChecksum(const string& inInfoString, uint32 inChecksum);
+
+	void					AddFloatChecksum(const string& inInfoString, float inChecksum);
+
+	bool					Compare(const Checksum& inChecksum, StringList& outErrors) const;
+
+	bool					GetIsVerboseMode(void) const;
+
+	uint32					GetTotalChecksum(void) const;
+
+	void					PrintReport(void) const;
+
+	bool					ReadFromFile(const char* inFilename);
+
+	bool					SaveToFile(const char* inFilename) const;
+
+protected:
+	void					AddChecksum(uint32 inChecksum);
+
+	typedef					vector<ChecksumEntry>	ChecksumList;
+
+	ChecksumList			mChecksumList;
+
+	bool					mIsVerboseMode;
+
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/util/GammaTable.cpp b/main/source/util/GammaTable.cpp
new file mode 100644
index 00000000..887000d8
--- /dev/null
+++ b/main/source/util/GammaTable.cpp
@@ -0,0 +1,199 @@
+#include "util/GammaTable.h"
+
+// Include windows gamma functions
+#include <windows.h>
+#include "winuser.h"
+
+GammaTable::GammaTable()
+{
+	this->mSlope = 1.0f;
+	this->InitializeToFlat();
+	this->mDirect3DMode = false;
+
+	#ifdef USE_DIRECTX_8
+	this->m3DDevice = NULL;
+	memset(&this->mDirect3DGammaRamp, 0, sizeof(D3DGAMMARAMP));
+	#endif
+}
+
+GammaTable::~GammaTable()
+{
+}
+
+float GammaTable::GetGammaSlope() const
+{
+	return this->mSlope;
+}
+
+#ifdef USE_DIRECTX_8
+IDirect3DDevice8* GammaTable::GetDirect3DDevice()
+{
+	if(!this->m3DDevice)
+	{
+		// Create DX8 object
+		IDirect3D8* theIDX8 = Direct3DCreate8(D3D_SDK_VERSION);
+		if(theIDX8)
+		{
+			//IUnknown::QueryInterface(IID_IDirectDrawGammaControl)
+			
+			HWND theHWND = (HWND)0x109823;
+
+			// Create the device
+			D3DPRESENT_PARAMETERS thePresentParameters;
+
+			thePresentParameters.Windowed = TRUE;
+			thePresentParameters.BackBufferWidth = thePresentParameters.BackBufferHeight = 0;
+			thePresentParameters.hDeviceWindow = NULL;
+
+			HRESULT theResult = theIDX8->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_REF, theHWND, D3DCREATE_FPU_PRESERVE, &thePresentParameters, &this->m3DDevice);
+			int a = 0;
+			switch(theResult)
+			{
+			case D3DERR_INVALIDCALL: // The method call is invalid. For example, a method's parameter may have an invalid value. 
+				a = 1;
+				break;
+			case D3DERR_NOTAVAILABLE: // This device does not support the queried technique. 
+				a = 1;
+				break;
+			case D3DERR_OUTOFVIDEOMEMORY: // Direct3D does not have enough display memory to perform the operation. 
+				a = 1;
+				break;
+			case D3D_OK:
+				a = 1;
+				break;
+			}
+		}
+	}
+
+	return this->m3DDevice;
+}
+#endif
+
+void GammaTable::InitializeToFlat()
+{
+	this->mSlope = 1.0f;
+	
+	for(int j = 0; j < 3; j++)
+	{
+		for(int i = 0; i < 256; i++)
+		{
+			int theBaseOffset = j*256 + i;
+			uint8 theNewColor = (uint8)i;
+			uint16 theNewWord = theNewColor << 8;
+			
+			((uint16*)this->mBaseData)[theBaseOffset] = theNewWord;
+			((uint16*)this->mSlopeData)[theBaseOffset] = theNewWord;
+		}
+	}
+}
+
+bool GammaTable::InitializeFromVideoState()
+{
+	bool theSuccess = false;
+
+	if(!this->mDirect3DMode)
+	{
+		HDC theDC = GetDC(NULL);
+		if(theDC != 0)
+		{
+			// Read current settings in
+			if(GetDeviceGammaRamp(theDC, this->mBaseData) == TRUE)
+			{
+				// Copy to base data also
+				memcpy(this->mSlopeData, this->mBaseData, kGammaTableSize*sizeof(char));
+		
+				// This may not actually be one, but we treat one as the base state always
+				this->mSlope = 1.0f;
+		
+				theSuccess = true;
+			}
+		
+			if(!ReleaseDC(NULL, theDC))
+			{
+				// emit error about leak
+			}
+		}
+	}
+	
+	// Try the DirectX way
+	if(!theSuccess)
+	{
+		#ifdef USE_DIRECTX_8
+		IDirect3DDevice8* the3DDevice = this->GetDirect3DDevice();
+		if(the3DDevice)
+		{
+			// TODO: Copy data into base data and slope data
+			the3DDevice->GetGammaRamp(&this->mDirect3DGammaRamp);
+			ASSERT(kGammaTableSize == sizeof(D3DGAMMARAMP));
+			memcpy(this->mBaseData, &this->mDirect3DGammaRamp, kGammaTableSize);
+			memcpy(this->mSlopeData, &this->mDirect3DGammaRamp, kGammaTableSize);
+
+			this->mDirect3DMode = true;
+		}
+		#endif
+	}
+	
+	return theSuccess;
+}
+
+bool GammaTable::InitializeToVideoState()
+{
+	bool theSuccess = false;
+
+	if(!this->mDirect3DMode)
+	{
+		HDC theDC = GetDC(NULL);
+		if(theDC != 0)
+		{
+            // Multi-monitor support returns false for some reason, even though it seems to work
+            #define SM_CMONITORS 80
+            bool theIgnoreErrorCode = (GetSystemMetrics(SM_CMONITORS) > 1);
+            bool theSetGammaRamp = (SetDeviceGammaRamp(theDC, this->mSlopeData) == TRUE);
+
+			// Restore original gamma ramp
+			if(theSetGammaRamp || theIgnoreErrorCode)
+			{
+				theSuccess = true;
+			}
+
+			if(!ReleaseDC(NULL, theDC))
+			{
+				// emit error about leak
+			}
+		}
+	}
+
+	#ifdef USE_DIRECTX_8
+	if(this->mDirect3DMode)
+	{
+		IDirect3DDevice8* the3DDevice = this->GetDirect3DDevice();
+		if(the3DDevice)
+		{
+			memcpy(&this->mDirect3DGammaRamp, this->mSlopeData, kGammaTableSize);
+			the3DDevice->SetGammaRamp(D3DSGR_CALIBRATE, &this->mDirect3DGammaRamp);
+		}
+	}
+	#endif
+	
+	return theSuccess;
+}
+
+void GammaTable::ProcessSlope(float inSlope)
+{
+	this->mSlope = inSlope;
+
+	// Steepen and saturate, ala Q3
+	uint8 kMaxValue = uint8(-1);
+	for(int j = 0; j < 3; j++)
+	{
+		for(int i = 0; i < 256; i++)
+		{
+			int theBaseOffset = j*256 + i;
+			uint16 theWord = ((uint16*)this->mBaseData)[theBaseOffset];
+			uint8 theBaseColor = (theWord & 0xFF00) >> 8;
+			uint8 theNewColor = (uint8)min(theBaseColor*inSlope, (float)kMaxValue);
+			uint16 theNewWord = theNewColor << 8;
+			((uint16*)this->mSlopeData)[theBaseOffset] = theNewWord;
+		}
+	}
+}
diff --git a/main/source/util/GammaTable.h b/main/source/util/GammaTable.h
new file mode 100644
index 00000000..ceb5ec2d
--- /dev/null
+++ b/main/source/util/GammaTable.h
@@ -0,0 +1,44 @@
+#ifndef GAMMATABLE_H
+#define GAMMATABLE_H
+
+#include "types.h"
+
+#ifdef USE_DIRECTX_8
+#include "D3d8.h"
+#undef SERVER_EXECUTE
+#endif
+
+const uint32 kGammaTableSize = 2*256*3;
+
+class GammaTable
+{
+public:
+					GammaTable();
+	virtual			~GammaTable();
+
+	float			GetGammaSlope() const;
+	
+	void			InitializeToFlat();
+
+	bool			InitializeFromVideoState();
+
+	bool			InitializeToVideoState();
+
+	void			ProcessSlope(float inSlope);
+
+private:
+	#ifdef USE_DIRECTX_8
+	IDirect3DDevice8*	GetDirect3DDevice();
+	IDirect3DDevice8*	m3DDevice;
+	D3DGAMMARAMP		mDirect3DGammaRamp;
+	#endif
+
+	bool			mDirect3DMode;
+
+	char			mBaseData[kGammaTableSize];
+	char			mSlopeData[kGammaTableSize];
+
+	float			mSlope;
+};
+
+#endif
\ No newline at end of file
diff --git a/main/source/util/LinuxSupport.cpp b/main/source/util/LinuxSupport.cpp
new file mode 100644
index 00000000..8a855f7b
--- /dev/null
+++ b/main/source/util/LinuxSupport.cpp
@@ -0,0 +1,179 @@
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose:
+//
+// $NoKeywords: $  
+//=============================================================================
+#ifdef LINUX
+
+#include "util/LinuxSupport.h"
+
+int strlwr(char *src)
+{
+	while(*src!='\0')
+	{
+		*src=tolower(*src);
+		src++;
+	}
+	return 1;
+}
+
+char selectBuf[PATH_MAX];
+
+int FileSelect(const struct dirent *ent)
+{
+	const char *mask=selectBuf;
+	const char *name=ent->d_name;
+
+	//printf("Test:%s %s\n",mask,name);
+
+	if(!strcmp(name,".") || !strcmp(name,"..") ) return 0;
+
+	if(!strcmp(selectBuf,"*.*")) return 1;
+
+	while( *mask && *name )
+	{
+		if(*mask=='*')
+		{
+			mask++; // move to the next char in the mask
+			if(!*mask) // if this is the end of the mask its a match 
+			{
+				return 1;
+			}
+			while(*name && toupper(*name)!=toupper(*mask)) 
+			{ // while the two don't meet up again
+				name++;
+			}
+			if(!*name) 
+			{ // end of the name
+				break; 
+			}
+		}
+		else if (*mask!='?')
+		{
+			if( toupper(*mask) != toupper(*name) )
+			{	// mismatched!
+				return 0;
+			}
+			else
+			{	
+				mask++;
+				name++;
+				if( !*mask && !*name) 
+				{ // if its at the end of the buffer
+					return 1;
+				}
+				
+			}
+
+		}
+		else /* mask is "?", we don't care*/
+		{
+			mask++;
+			name++;
+		}
+	}	
+		
+	return( !*mask && !*name ); // both of the strings are at the end
+}
+
+int FillDataStruct(FIND_DATA *dat)
+{
+	struct stat fileStat;
+
+	if(dat->numMatches<0)
+		return -1;
+
+	strcpy(dat->cFileName,dat->namelist[dat->numMatches]->d_name);
+
+	if(!stat(dat->cFileName,&fileStat))
+	{
+		dat->dwFileAttributes=fileStat.st_mode;           
+	}
+	else
+	{
+		dat->dwFileAttributes=0;
+	}	
+	//printf("%s\n", dat->namelist[dat->numMatches]->d_name);
+      	free(dat->namelist[dat->numMatches]);
+
+  	dat->numMatches--;
+	return 1;
+}
+
+
+int FindFirstFile(const char *fileName, FIND_DATA *dat)
+{
+	char nameStore[PATH_MAX];
+	char *dir=NULL;
+	int n,iret=-1;
+	
+	strcpy(nameStore,fileName);
+
+	if(strrchr(nameStore,'/') )
+	{
+		dir=nameStore;
+		while(strrchr(dir,'/') )
+		{
+			struct stat dirChk;
+
+			// zero this with the dir name
+			dir=strrchr(nameStore,'/');
+			*dir='\0';
+
+			dir=nameStore;
+			stat(dir,&dirChk);
+		
+			if( S_ISDIR( dirChk.st_mode ) )
+			{
+				break;	
+			}
+		}
+	}
+	else
+	{
+		// couldn't find a dir seperator...
+		return -1;
+	}
+
+	if( strlen(dir)>0 )
+	{
+		strcpy(selectBuf,fileName+strlen(dir)+1);
+
+		n = scandir(dir, &dat->namelist, FileSelect, alphasort);
+           	if (n < 0)
+           	    perror("scandir");
+          	else 
+		{
+			dat->numMatches=n-1; // n is the number of matches
+			iret=FillDataStruct(dat);
+			if(iret<0)
+			{
+				free(dat->namelist);
+			}
+
+		}
+	}
+
+	//printf("Returning: %i \n",iret);
+	return iret;
+}
+
+bool FindNextFile(int handle, FIND_DATA *dat)
+{
+	if(dat->numMatches<0)
+	{	
+		free(dat->namelist);
+		return false; // no matches left
+	}	
+
+	FillDataStruct(dat);
+	return true;
+}
+
+bool FindClose(int handle)
+{
+	return true;
+}
+
+#endif
diff --git a/main/source/util/LinuxSupport.h b/main/source/util/LinuxSupport.h
new file mode 100644
index 00000000..84ca384b
--- /dev/null
+++ b/main/source/util/LinuxSupport.h
@@ -0,0 +1,43 @@
+#ifdef LINUX
+
+#ifndef LINUX_SUPPORT_H
+#define LINUX_SUPPORT_H
+
+
+// Code from VALVe for cross-platform FindFirst/FindNext
+//========= Copyright © 1996-2001, Valve LLC, All rights reserved. ============
+//
+// Purpose:
+// 
+// $NoKeywords: $
+//=============================================================================
+#include <ctype.h> // tolower()
+#include <limits.h> // PATH_MAX define 
+#include <string.h> //strcmp, strcpy
+
+#include <sys/stat.h> // stat()
+#include <unistd.h> 
+#include <dirent.h> // scandir()
+#include <stdlib.h>
+#include <stdio.h>
+
+#define FILE_ATTRIBUTE_DIRECTORY S_IFDIR
+
+typedef struct 
+{
+	// public data
+	int dwFileAttributes;
+	char cFileName[PATH_MAX]; // the file name returned from the call
+	
+	int numMatches;
+	struct dirent **namelist;  
+} FIND_DATA;
+
+int strlwr(char *src);
+int FindFirstFile(const char *findName, FIND_DATA *dat);
+bool FindNextFile(int handle, FIND_DATA *dat);
+bool FindClose(int handle);
+
+#endif
+
+#endif
diff --git a/main/source/util/Mat3.cpp b/main/source/util/Mat3.cpp
new file mode 100644
index 00000000..7050d093
--- /dev/null
+++ b/main/source/util/Mat3.cpp
@@ -0,0 +1,88 @@
+#include "Mat3.h"
+#include "MathUtil.h"
+#include "common/mathlib.h"
+
+Mat3::Mat3()
+{
+}
+
+
+Mat3::Mat3(const float angles[3])
+{
+	SetEulerAngles(angles);
+}
+
+
+float& Mat3::operator()(int r, int c)
+{
+	return element[c][r];
+}
+
+
+float Mat3::operator()(int r, int c) const
+{
+	return element[c][r];
+}
+
+void Mat3::SetEulerAngles(const float angles[3])
+{
+	AngleVectors(angles,element[0],element[1],element[2]);
+}
+
+void Mat3::TransformVector(float vector[3]) const
+{
+	float result[3] = {0,0,0};
+	float temp[3] = {0,0,0};
+
+	VectorScale(element[0],vector[0],result);
+	VectorScale(element[1],vector[1],temp);
+	VectorAdd(result,temp,result);
+	VectorScale(element[2],vector[2],temp);
+	VectorAdd(result,temp,result);
+	VectorCopy(result,vector);
+}
+
+void Mat3::GetEulerAngles(float angles[3]) const
+{
+	VectorsToAngles(element[0],element[1],element[2],angles);
+}
+
+Mat3 Mat3::Transpose() const
+{
+
+	Mat3 result;
+
+	for (int i = 0; i < 3; ++i)
+	{
+		for (int j = 0; j < 3; ++j)
+		{
+			result.element[i][j] = element[j][i];
+		}
+	}
+		
+	return result;
+}
+
+
+Mat3 operator*(const Mat3& m1, const Mat3& m2)
+{
+
+	Mat3 result;
+
+	for (int i = 0; i < 3; ++i)
+	{
+		for (int j = 0; j < 3; ++j)
+		{
+
+			result(i,j) = 0;
+
+			for (int k = 0; k < 3; ++k)
+			{
+				result(i,j) += m1(i,k) * m2(k,j);
+			}
+		}
+	}
+	
+	return result;
+
+}
\ No newline at end of file
diff --git a/main/source/util/Mat3.h b/main/source/util/Mat3.h
new file mode 100644
index 00000000..f3eebec5
--- /dev/null
+++ b/main/source/util/Mat3.h
@@ -0,0 +1,47 @@
+#ifndef UTIL_MAT3_H
+#define UTIL_MAT3_H
+
+/**
+ * 3x3 Matrix class.
+ */
+class Mat3
+{
+
+public:
+
+	/**
+	 * Elements are uninitialized.
+	 */
+	Mat3();
+
+	/**
+	 * Converts from Euler angles to a rotation matrix.
+	 */
+	Mat3(const float angles[3]);
+
+	float& operator()(int r, int c);
+	float  operator()(int r, int c) const;
+
+	/**
+	 * Extracts Euler angles from the matrix.	 
+ 	 */
+	void GetEulerAngles(float angles[3]) const;
+	void SetEulerAngles(const float angles[3]);
+	void TransformVector(float vector[3]) const;
+
+	/**
+	 * If the columns of the matrix are orthonormal (as is the case with a
+	 * rotation matrix), then the transpose is also the inverse.
+	 */
+	Mat3 Transpose() const;
+
+private:
+
+	float element[3][3];
+
+};
+
+Mat3 operator*(const Mat3& m1, const Mat3& m2);
+
+#endif
+
diff --git a/main/source/util/MathUtil.cpp b/main/source/util/MathUtil.cpp
new file mode 100644
index 00000000..83de5353
--- /dev/null
+++ b/main/source/util/MathUtil.cpp
@@ -0,0 +1,417 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: MathUtil.cpp $
+// $Date: 2002/07/25 16:59:03 $
+//
+//-------------------------------------------------------------------------------
+// $Log: MathUtil.cpp,v $
+// Revision 1.7  2002/07/25 16:59:03  flayra
+// -Linux changes
+//
+// Revision 1.6  2002/07/23 16:53:46  Flayra
+// - Added VectorDistance2D, added document headers
+//
+//===============================================================================
+#include <cmath>
+#include "stdio.h"
+#include "stdlib.h"
+#include "math.h"
+
+//#include "hud.h"
+//#include "cl_util.h"
+#include <string.h>
+#include "nowarnings.h"
+#include "util/MathUtil.h"
+#include "common/vec_op.h"
+#include "common/mathlib.h"
+
+#ifndef max
+#define max(a,b)    (((a) > (b)) ? (a) : (b))
+#endif
+
+#ifndef min
+#define min(a,b)    (((a) < (b)) ? (a) : (b))
+#endif
+
+// Ignore "double to float possible loss of data" warning
+#pragma warning (disable: 4244)
+
+double sqrt(double x);
+
+bool FindCollisionPointOnPlane(const float* inOrigin, const float* inRayVector, const float* inPlaneABCD, float* outPoint)
+{
+	bool theSuccess = false;
+	
+	// Solve for parametric t
+	float thePlaneA = inPlaneABCD[0];
+	float thePlaneB = inPlaneABCD[1];
+	float thePlaneC = inPlaneABCD[2];
+	float thePlaneD = inPlaneABCD[3];
+
+	float theDenom = (thePlaneA*inRayVector[0] + thePlaneB*inRayVector[1] + thePlaneC*inRayVector[2]);
+	if(fabs(theDenom) > kFloatTolerance)
+	{
+		float theT = -(thePlaneA*inOrigin[0] + thePlaneB*inOrigin[1] + thePlaneC*inOrigin[2] + thePlaneD)/theDenom;
+		
+		// Now we have t, solve for the endpoint
+		outPoint[0] = inOrigin[0] + theT*inRayVector[0];
+		outPoint[1] = inOrigin[1] + theT*inRayVector[1];
+		outPoint[2] = inOrigin[2] + theT*inRayVector[2];
+		theSuccess = true;
+	}
+	
+	//	float theA = inPlaneABCD[0];
+	//	float theB = inPlaneABCD[1];
+	//	float theC = inPlaneABCD[2];
+	//	float theD = inPlaneABCD[3];
+	//
+	//	float theDenom = (theA*inRayVector[0] + theB*inRayVector[1] + theC*inRayVector[2]);
+	//	if(fabs(theDenom) > kFloatTolerance)
+	//	{
+	//		float theT = -1*(theA*inOrigin[0] + theB*inOrigin[1] + theC*inOrigin[2] + theD)/theDenom;
+	//		outPoint[0] = inOrigin[0] + inRayVector[0]*theT;
+	//		outPoint[1] = inOrigin[1] + inRayVector[1]*theT;
+	//		outPoint[2] = inOrigin[2] + inRayVector[2]*theT;
+	//		theSuccess = true;
+	//	}
+	
+	return theSuccess;
+}
+
+bool IsVectorBetweenBoundingVectors(const float* inOrigin, const float* inRay, const float* inVecOne, const float* inVecTwo)
+{
+	bool theSuccess = false;
+	
+	// The plane normal is opposite to our view
+	float thePlaneABCD[4];
+	thePlaneABCD[0] = 0;//inRay[0];
+	thePlaneABCD[1] = 0;//inRay[1];
+	thePlaneABCD[2] = 1;//inRay[2];
+	thePlaneABCD[3] = 0;
+
+	// Put plane far away by plugging in far away point (ax + by + cz + d = 0)
+//	float theT = 5000;
+//	float thePoint[3];
+//	thePoint[0] = inOrigin[0] + theT*thePlaneABCD[0];
+//	thePoint[1] = inOrigin[1] + theT*thePlaneABCD[1];
+//	thePoint[2] = inOrigin[2] + theT*thePlaneABCD[2];
+//
+//	// Find plane D using this point
+//	thePlaneABCD[3] = -(thePlaneABCD[0]*thePoint[0] + thePlaneABCD[1]*thePoint[1] + thePlaneABCD[2]*thePoint[2]);
+
+	// Solve for each vector hitting the plane
+	float theVecPoint[3];
+	float theVecOnePoint[3];
+	float theVecTwoPoint[3];
+	
+	// If they all hit the plane
+	if(FindCollisionPointOnPlane(inOrigin, inRay, thePlaneABCD, theVecPoint))
+	{
+		if(FindCollisionPointOnPlane(inOrigin, inVecOne, thePlaneABCD, theVecOnePoint))
+		{
+			if(FindCollisionPointOnPlane(inOrigin, inVecTwo, thePlaneABCD, theVecTwoPoint))
+			{
+				// Get the collision point for each solution
+				float theMaxX = max(theVecOnePoint[0], theVecTwoPoint[0]);
+				float theMaxY = max(theVecOnePoint[1], theVecTwoPoint[1]);
+				float theMaxZ = max(theVecOnePoint[2], theVecTwoPoint[2]);
+				
+				float theMinX = min(theVecOnePoint[0], theVecTwoPoint[0]);
+				float theMinY = min(theVecOnePoint[1], theVecTwoPoint[1]);
+				float theMinZ = min(theVecOnePoint[2], theVecTwoPoint[2]);
+				
+				// If it is between them, the vector is between them
+				float theVecX = theVecPoint[0];
+				float theVecY = theVecPoint[1];
+				float theVecZ = theVecPoint[2];
+				if(	(theVecX >= (theMinX - kFloatTolerance)) && (theVecX <= (theMaxX + kFloatTolerance)) && 
+					(theVecY >= (theMinY - kFloatTolerance)) && (theVecY <= (theMaxY + kFloatTolerance)) && 
+					(theVecZ >= (theMinZ - kFloatTolerance)) && (theVecZ <= (theMaxZ + kFloatTolerance)))
+				{
+					theSuccess = true;
+				}
+			}
+		}
+	}
+	
+	return theSuccess;
+}
+
+void AngleMatrix(const float* angles, float matrix[3][4])
+{
+	float		angle;
+	float		sr, sp, sy, cr, cp, cy;
+	
+	angle = angles[2] * (M_PI*2 / 360);
+	sy = sin(angle);
+	cy = cos(angle);
+	angle = angles[1] * (M_PI*2 / 360);
+	sp = sin(angle);
+	cp = cos(angle);
+	angle = angles[0] * (M_PI*2 / 360);
+	sr = sin(angle);
+	cr = cos(angle);
+	
+	// matrix = (Z * Y) * X
+	matrix[0][0] = cp*cy;
+	matrix[1][0] = cp*sy;
+	matrix[2][0] = -sp;
+	matrix[0][1] = sr*sp*cy+cr*-sy;
+	matrix[1][1] = sr*sp*sy+cr*cy;
+	matrix[2][1] = sr*cp;
+	matrix[0][2] = (cr*sp*cy+-sr*-sy);
+	matrix[1][2] = (cr*sp*sy+-sr*cy);
+	matrix[2][2] = cr*cp;
+	matrix[0][3] = 0.0;
+	matrix[1][3] = 0.0;
+	matrix[2][3] = 0.0;
+}
+
+float Length(const float *v)
+{
+	int		i;
+	float	length;
+	
+	length = 0;
+	for (i=0 ; i< 3 ; i++)
+		length += v[i]*v[i];
+	length = sqrt (length);		// FIXME
+	
+	return length;
+}
+
+void RotateFloatValuesByVector(float& ioX, float& ioY, float& ioZ, /*const float* inBaseVector,*/ const float* inVector)
+{
+	// Get rotation vector
+	//float theBaseRotationAngles[3];
+	//VectorAngles((float*)inBaseVector, theBaseRotationAngles);
+	
+	// Get rotation vector
+	float theRotationAngles[3];
+	VectorAngles((float*)inVector, theRotationAngles);
+
+	// Subtract out frame of reference
+	//theRotationAngles[0] -= theBaseRotationAngles[0];
+	//theRotationAngles[1] -= theBaseRotationAngles[1];
+	//theRotationAngles[2] -= theBaseRotationAngles[2];
+	
+	// Rotate the first three parameters as a point
+	float theSourceValues[3] = {ioX, ioY, ioZ};
+				
+	float theMatrix[3][4];
+	AngleMatrix(theRotationAngles, theMatrix);
+	
+	float theRotatedValues[3];
+	VectorRotate(theSourceValues, theMatrix, theRotatedValues);
+	
+	ioX = (int)theRotatedValues[0];
+	ioY = (int)theRotatedValues[1];
+	ioZ = (int)theRotatedValues[2];
+}
+
+float WrapFloat(float inValue, float inMin, float inMax)
+{
+    const float theRange = inMax - inMin;
+	
+    if (inValue < inMin)
+    {
+        inValue += floor((inMax - inValue) / theRange) * theRange;
+    }    
+	
+    if (inValue >= inMax)
+    {
+        inValue -= floor(((inValue - inMin) / theRange)) * theRange;
+    }
+    
+    return inValue;
+}
+
+void CreateOrthoNormalBasis(float inZAxis[3], float outXAxis[3], float outYAxis[3])
+{
+	VectorNormalize(inZAxis);
+
+	// check if in vector is z
+	float theUp[3] = { 0, 0, 1 };
+	if(fabs(DotProduct(theUp, inZAxis)) >= (1.0 - kFloatTolerance))
+	{
+		// Use y instead
+		theUp[0] = 0;
+		theUp[1] = 1;
+		theUp[2] = 0;
+	}
+
+	CrossProduct(inZAxis, theUp, outXAxis);
+	VectorNormalize(outXAxis);
+
+	CrossProduct(outXAxis, inZAxis, outYAxis);
+	VectorNormalize(outYAxis);
+}
+
+int RoundIntToNearestIncrementOf(int inValue, int inIncrement)
+{
+	int theValue = inValue;
+	if(inIncrement > 0)
+	{
+		theValue = ((inValue + inIncrement/2)/inIncrement)*inIncrement;
+	}
+	return theValue;
+}
+
+void TransformVector(const float v[3], const float xAxis[3], const float yAxis[3], const float zAxis[3], float result[3])
+{
+	float temp[3];
+	for (int i = 0; i < 3; ++i)
+	{
+		temp[i] = v[0] * xAxis[i] + v[1] * yAxis[i] + v[2] * zAxis[i];
+	}
+	for (int j = 0; j < 3; ++j)
+	{
+		result[j] = temp[j];
+	}
+}
+
+void RotateValuesByVector(int32& ioX, int32& ioY, int32& ioZ, /*const float* inBaseVector,*/ const float* inVector)
+{
+	float ioFloatX = ioX;
+	float ioFloatY = ioY;
+	float ioFloatZ = ioZ;
+
+	RotateFloatValuesByVector(ioFloatX, ioFloatY, ioFloatZ, inVector);
+
+	ioX = (int32)ioFloatX;
+	ioY = (int32)ioFloatY;
+	ioZ = (int32)ioFloatZ;
+}
+
+void VectorAngles( const float *forward, float *angles )
+{
+	float	tmp, yaw, pitch;
+	
+	if (forward[1] == 0 && forward[0] == 0)
+	{
+		yaw = 0;
+		if (forward[2] > 0)
+			pitch = 90;
+		else
+			pitch = 270;
+	}
+	else
+	{
+		yaw = (atan2(forward[1], forward[0]) * 180 / M_PI);
+		if (yaw < 0)
+			yaw += 360;
+
+		tmp = sqrt (forward[0]*forward[0] + forward[1]*forward[1]);
+		pitch = (atan2(forward[2], tmp) * 180 / M_PI);
+		if (pitch < 0)
+			pitch += 360;
+	}
+	
+	angles[0] = pitch;
+	angles[1] = yaw;
+	angles[2] = 0;
+}
+
+void VectorInverse ( float *v )
+{
+	v[0] = -v[0];
+	v[1] = -v[1];
+	v[2] = -v[2];
+}
+
+void VectorMA (const float *veca, float scale, const float *vecb, float *vecc)
+{
+	vecc[0] = veca[0] + scale*vecb[0];
+	vecc[1] = veca[1] + scale*vecb[1];
+	vecc[2] = veca[2] + scale*vecb[2];
+}
+
+float VectorNormalize (float *v)
+{
+	float	length, ilength;
+	
+	length = v[0]*v[0] + v[1]*v[1] + v[2]*v[2];
+	length = sqrt (length);		// FIXME
+	
+	if (length)
+	{
+		ilength = 1/length;
+		v[0] *= ilength;
+		v[1] *= ilength;
+		v[2] *= ilength;
+	}
+	
+	return length;
+	
+}
+
+void VectorRotate (const float* in1, const float in2[3][4], float* out)
+{
+	out[0] = DotProduct(in1, in2[0]);
+	out[1] = DotProduct(in1, in2[1]);
+	out[2] = DotProduct(in1, in2[2]);
+}
+
+void VectorScale (const float *in, float scale, float *out)
+{
+	out[0] = in[0]*scale;
+	out[1] = in[1]*scale;
+	out[2] = in[2]*scale;
+}
+
+double VectorDistance(const float* in1, const float* in2)
+{
+	float theXDiff = in1[0] - in2[0];
+	float theYDiff = in1[1] - in2[1];
+	float theZDiff = in1[2] - in2[2];
+
+	return sqrt(theXDiff*theXDiff + theYDiff*theYDiff + theZDiff*theZDiff);
+}
+
+double VectorDistance2D(const float* in1, const float* in2)
+{
+	float theXDiff = in1[0] - in2[0];
+	float theYDiff = in1[1] - in2[1];
+	
+	return sqrt(theXDiff*theXDiff + theYDiff*theYDiff);
+}
+
+// Added by mmcguire.
+void VectorsToAngles(const float forward[3], const float right[3], const float up[3], float angles[3])
+{
+   
+    float y,r,p;
+    float sy;
+    
+	if(abs(forward[2]) < 0.9999)
+	{
+		y = atan2(forward[1], forward[0]);
+	    sy = sin(y);
+		if (abs(sy) < 0.1)
+		{
+			p = atan2(-forward[2], forward[0] / cos(y));
+		}
+		else
+		{
+			p = atan2(-forward[2], forward[1] / sy);
+		}
+		r = atan2(-right[2], up[2]);
+	}
+	else //gimbal lock; best we can do is assume roll = 0 and set pitch = pitch + actual roll
+	{
+		p = forward[2] > 0 ? -M_PI/2 : M_PI/2;
+		y = atan2(right[0],-right[1]);
+		r = 0;
+	}
+
+    angles[2] = r * (180 / M_PI); // Roll
+    angles[0] = p * (180 / M_PI); // Pitch
+    angles[1] = y * (180 / M_PI); // Yaw
+}
diff --git a/main/source/util/MathUtil.h b/main/source/util/MathUtil.h
new file mode 100644
index 00000000..6b72604a
--- /dev/null
+++ b/main/source/util/MathUtil.h
@@ -0,0 +1,61 @@
+//======== (C) Copyright 2002 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: 
+//
+// $Workfile: MathUtil.h $
+// $Date: 2002/07/23 16:53:46 $
+//
+//-------------------------------------------------------------------------------
+// $Log: MathUtil.h,v $
+// Revision 1.6  2002/07/23 16:53:46  Flayra
+// - Added VectorDistance2D, added document headers
+//
+//===============================================================================
+#ifndef MATH_UTIL_H
+#define MATH_UTIL_H
+
+#include "types.h"
+
+#ifndef M_PI
+#define M_PI		3.14159265358979323846	// matches value in gcc v2 math.h
+#endif
+
+void AngleMatrix(const float* angles, float matrix[3][4]);
+double sqrt(double x);
+float Length(const float *v);
+void CreateOrthoNormalBasis(float inZAxis[3], float outXAxis[3], float outYAxis[3]);
+
+/**
+ * Transforms a vector by an orthonormal basis.
+ */
+void TransformVector(const float v[3], const float xAxis[3], const float yAxis[3], const float zAxis[3], float result[3]);
+int RoundIntToNearestIncrementOf(int inValue, int inIncrement);
+void RotateValuesByVector(int32& ioX, int32& ioY, int32& ioZ, /*const float* inBaseVector,*/ const float* inVector);
+void RotateFloatValuesByVector(float& ioX, float& ioY, float& ioZ, /*const float* inBaseVector,*/ const float* inVector);
+float WrapFloat(float inValue, float inMin, float inMax);
+void VectorAngles( const float *forward, float *angles );
+float VectorNormalize (float *v);
+void VectorInverse ( float *v );
+void VectorScale (const float *in, float scale, float *out);
+void VectorMA (const float *veca, float scale, const float *vecb, float *vecc);
+bool IsVectorBetweenBoundingVectors(const float* inOrigin, const float* inRay, const float* inVecOne, const float* inVecTwo);
+void VectorRotate (const float* in1, const float in2[3][4], float* out);
+double VectorDistance(const float* in1, const float* in2);
+double VectorDistance2D(const float* in1, const float* in2);
+
+// Added by mmcguire.
+/**
+ * Compute the Euler angles which represent the orientation defined by the
+ * three basis vectors. This is the mathematical inverse of the AngleVectors
+ * function.
+ */
+void VectorsToAngles(const float forward[3], const float right[3], const float up[3], float angles[3]);
+
+const float kFloatTolerance								= 0.001f;
+
+#endif
\ No newline at end of file
diff --git a/main/source/util/Quat.cpp b/main/source/util/Quat.cpp
new file mode 100644
index 00000000..e89d5ce7
--- /dev/null
+++ b/main/source/util/Quat.cpp
@@ -0,0 +1,210 @@
+#include "Quat.h"
+#include "common/mathlib.h"
+
+float WrapFloat(float, float, float);
+void VectorsToAngles(const float forward[3], const float right[3], const float up[3], float angles[3]);
+
+#include <math.h>
+
+Quat::Quat()
+{
+}
+
+
+Quat::Quat(float _x, float _y, float _z, float _w)
+    : x(_x), y(_y), z(_z), w(_w)
+{
+}
+
+
+Quat::Quat(const float angles[3])
+{
+    
+    float xAxis[3];
+    float yAxis[3];
+    float zAxis[3];
+    
+    AngleVectors(angles, yAxis, xAxis, zAxis);
+    
+    *this = Quat(xAxis, yAxis, zAxis);
+
+}
+
+
+Quat::Quat(const float xAxis[3], const float yAxis[3], const float zAxis[3])
+{
+
+    float t = xAxis[0] + yAxis[1] + zAxis[2];
+    
+    if (t > 0) {
+
+        float s = sqrtf(t + 1);
+		
+	    x = (zAxis[1] - yAxis[2]) * (0.5f / s);
+	    y = (xAxis[2] - zAxis[0]) * (0.5f / s);
+	    z = (yAxis[0] - xAxis[1]) * (0.5f / s);
+        w = s * 0.5f;
+    
+    } else {
+
+        if (xAxis[0] > yAxis[1] && xAxis[0] > zAxis[2]) {
+
+            float s = sqrtf(xAxis[0] - yAxis[1] - zAxis[2] + 1);
+            
+            x = 0.5f * s;
+            y = (yAxis[0] + xAxis[1]) * (0.5f / s);
+            z = (zAxis[0] + xAxis[2]) * (0.5f / s);
+            w = (zAxis[1] - yAxis[2]) * (0.5f / s);
+        
+        } else if (yAxis[1] > xAxis[0] && yAxis[1] > zAxis[2]) {
+
+            float s = sqrtf(yAxis[1] - xAxis[0] - zAxis[2] + 1);
+    
+            x = (xAxis[1] + yAxis[0]) * (0.5f / s);
+            y = 0.5f * s;
+            z = (zAxis[1] + yAxis[2]) * (0.5f / s);
+            w = (xAxis[2] - zAxis[0]) * (0.5f / s);
+
+        } else {
+    
+            float s = sqrtf(zAxis[2] - xAxis[0] - yAxis[1] + 1);
+            
+            x = (xAxis[2] + zAxis[0]) * (0.5f / s);
+            y = (yAxis[2] + zAxis[1]) * (0.5f / s);
+            z = 0.5f * s;
+            w = (yAxis[0] - xAxis[1]) * (0.5f / s);
+            
+        }   
+    
+    }
+
+}
+
+
+Quat::Quat(float angle, const float axis[3])
+{
+
+    float sa = sinf(angle / 2);
+    float ca = cosf(angle / 2);
+
+    x = axis[0] * sa;
+    y = axis[1] * sa;
+    z = axis[2] * sa;
+    w = ca;
+
+}
+
+
+Quat Quat::Conjugate() const
+{
+    return Quat(-x, -y, -z, w);
+}
+
+
+Quat Quat::Unit() const
+{
+    float l = sqrtf(x * x + y * y + z * z + w * w);
+    return Quat(x / l, y / l, z / l, w / l);
+}
+
+
+void Quat::GetVectors(float xAxis[3], float yAxis[3], float zAxis[3]) const
+{
+  
+    float xx = x * x;
+    float xy = x * y;
+    float xz = x * z;
+    float xw = x * w;
+    float yy = y * y;
+    float yz = y * z;
+    float yw = y * w;
+    float zz = z * z;
+    float zw = z * w;
+    float ww = w * w;
+    
+    xAxis[0] = 1 - 2 * (yy + zz);
+    xAxis[1] = 2 * (xy - zw);
+    xAxis[2] = 2 * (xz + yw);
+    
+    yAxis[0] = 2 * (xy + zw);
+    yAxis[1] = 1 - 2 * (xx + zz);
+    yAxis[2] = 2 * (yz - xw);
+
+    zAxis[0] = 2 * (xz - yw);
+    zAxis[1] = 2 * (yz + xw);
+    zAxis[2] = 1 - 2 * (xx + yy);    
+
+}
+
+
+Quat operator*(const Quat& q1, const Quat& q2)
+{
+
+    return Quat(q1.w * q2.x + q1.x * q2.w + q1.y * q2.z - q1.z * q2.y,
+                q1.w * q2.y + q1.y * q2.w + q1.z * q2.x - q1.x * q2.z,
+                q1.w * q2.z + q1.z * q2.w + q1.x * q2.y - q1.y * q2.x,
+                q1.w * q2.w - q1.x * q2.x - q1.y * q2.y - q1.z * q2.z);
+
+}
+
+Quat ConstantRateLerp(const Quat& src, const Quat& dst, float amount)
+{ 
+	Quat rot = (dst * src.Conjugate()).Unit();
+	
+	// Compute the axis and angle we need to rotate about to go from src
+	// to dst.
+	
+	float angle = acosf(rot.w) * 2;
+	float sinAngle = sqrtf(1.0f - rot.w * rot.w);
+	
+	if (fabs(sinAngle) < 0.0005f)
+	{
+		sinAngle = 1;
+	}
+	
+	vec3_t axis;
+	
+	axis[0] = rot.x / sinAngle;
+	axis[1] = rot.y / sinAngle;
+	axis[2] = rot.z / sinAngle;
+	
+	// Wrap the angle to the range -PI to PI
+	angle = WrapFloat(angle, (float)(-M_PI), (float)(M_PI));
+	
+	// Amount to rotate this frame.
+	float frameAngle = amount;
+	
+	if (fabs(angle) <= frameAngle)
+	{
+		// If we are very close, just jump to the goal orientation.
+		return dst;
+	}
+	else
+	{
+		
+		Quat final;
+		
+		if (angle < 0)
+		{
+			final = Quat(-frameAngle, axis) * src;
+		}
+		else
+		{
+			final = Quat(frameAngle, axis) * src;
+		}
+
+		return final;
+		
+	}
+}
+
+void Quat::GetAngles(float outAngles[3]) const
+{
+	vec3_t xAxis;
+	vec3_t yAxis;
+	vec3_t zAxis;
+	
+	GetVectors(xAxis, yAxis, zAxis);
+	
+	VectorsToAngles(yAxis, xAxis, zAxis, outAngles);
+}
diff --git a/main/source/util/Quat.h b/main/source/util/Quat.h
new file mode 100644
index 00000000..39d99370
--- /dev/null
+++ b/main/source/util/Quat.h
@@ -0,0 +1,43 @@
+#ifndef UTIL_QUAT_H
+#define UTIL_QUAT_H
+
+/**
+ * Quaternion class.
+ */
+class Quat
+{
+
+public:
+
+    Quat();
+    Quat(float x, float y, float z, float w);
+    Quat(const float angles[3]);
+    Quat(const float xAxis[3], const float yAxis[3], const float zAxis[3]);
+    Quat(float angle, const float axis[3]);
+
+    /**
+     * For a unit quaternion, the conjugate is the inverse.
+     */
+    Quat Conjugate() const;
+
+    Quat Unit() const;
+
+    void GetVectors(float xAxis[3], float yAxis[3], float zAxis[3]) const;
+
+	void GetAngles(float outAngles[3]) const;
+
+public:
+
+    float x;
+    float y;
+    float z;
+    float w;
+
+};
+
+Quat operator*(const Quat& q1, const Quat& q2);
+
+Quat ConstantRateLerp(const Quat& src, const Quat& dst, float amount);
+
+#endif
+
diff --git a/main/source/util/STLUtil.cpp b/main/source/util/STLUtil.cpp
new file mode 100644
index 00000000..ab943d59
--- /dev/null
+++ b/main/source/util/STLUtil.cpp
@@ -0,0 +1,380 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: Utility functions loosely wrapping the STL
+//
+// $Workfile: STLUtil.cpp$
+// $Date: 2002/07/26 21:43:04 $
+//
+//-------------------------------------------------------------------------------
+// $Log: STLUtil.cpp,v $
+// Revision 1.6  2002/07/26 21:43:04  flayra
+// - Updates to get particles and sounds working under Linux
+//
+// Revision 1.5  2002/07/26 01:51:23  Flayra
+// - Linux support for FindFirst/FindNext
+//
+// Revision 1.4  2002/05/23 04:03:11  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+// Revision 1.5  2002/05/14 18:48:16  Charlie
+// - More utility functions
+//
+// Revision 1.4  2002/05/01 00:52:34  Charlie
+// - Added BuildAbridgedString
+//
+//===============================================================================
+#include "util/STLUtil.h"
+#include <stdio.h>
+#include "stdarg.h"
+
+
+// For FindFirst/FindNext functionality in BuildFileList
+#ifdef WIN32
+	#include "windows.h"
+#else
+	#include "util/LinuxSupport.h"
+#endif
+
+string LowercaseString(const string& ioString)
+{
+	string theReturnString = ioString;
+	LowercaseString(theReturnString);
+	return theReturnString;
+}
+
+string LowercaseString(string& ioString)
+{
+	int theLength = ioString.length();
+	for(int i = 0; i < theLength; i++)
+	{
+		char theCurrentChar = ioString[i];
+		ioString[i] = tolower(theCurrentChar);
+	}
+	return ioString;
+}
+
+string UppercaseString(const string& ioString)
+{
+    string theReturnString = ioString;
+    UppercaseString(theReturnString);
+    return theReturnString;
+}
+
+string UppercaseString(string& ioString)
+{
+    int theLength = ioString.length();
+    for(int i = 0; i < theLength; i++)
+    {
+        char theCurrentChar = ioString[i];
+        ioString[i] = toupper(theCurrentChar);
+    }
+    return ioString;
+}
+
+int MakeIntFromString(string& inString)
+{
+	int theInt = 0;
+	if(inString.length() > 0)
+	{
+		sscanf(inString.c_str(), "%d", &theInt);
+	}
+	return theInt;
+}
+
+float MakeFloatFromString(string& inString)
+{
+	float theFloat = 0;
+	if(inString.length() > 0)
+	{
+		sscanf(inString.c_str(), "%f", &theFloat);
+	}
+
+	return theFloat;
+}
+
+bool MakeBytesFromHexPairs(const string& inHex, unsigned char* ioBytes, int numBytes)
+{
+	bool theSuccess = true;
+	if(inHex.size() != numBytes*2)
+	{ 
+		theSuccess = false; 
+	}
+	else
+	{
+		for(int index = 0; index < numBytes; ++index)
+		{
+			int theByte = 0;
+			for(int strpos = index*2; strpos < (index+1)*2; ++strpos)
+			{
+				theByte *= 16;
+				switch(inHex[strpos])
+				{
+				case '0': case '1': case '2': case '3': case '4': 
+				case '5': case '6': case '7': case '8': case '9': 
+					theByte += inHex[strpos] - '0';
+					break;
+				case 'A': case 'B': case 'C':
+				case 'D': case 'E': case 'F':
+					theByte += inHex[strpos] - 'A' + 10;
+					break;
+				default:
+					theSuccess = false;
+					break;
+				}
+			}
+			if(theSuccess)
+			{
+				ioBytes[index] = theByte;
+			}
+			else
+			{ 
+				break; 
+			}
+		}
+	}
+	return theSuccess;
+}
+
+string MakeStringFromInt(int inNumber)
+{
+	char theBuffer[kMaxStrLen];
+	sprintf(theBuffer, "%d", inNumber);
+	return string(theBuffer);
+}
+
+string MakeStringFromFloat(float inNumber, int inNumDecimals)
+{
+	// Build format specfier like "%.2f" (where 2 is inNumDecimals)
+	string theFormatSpecfier("%.");
+	theFormatSpecfier += MakeStringFromInt(inNumDecimals);
+	theFormatSpecfier += string("f");
+
+	char theBuffer[kMaxStrLen];
+	sprintf(theBuffer, theFormatSpecfier.c_str(), inNumber);
+
+	return string(theBuffer);
+}
+
+bool MakeHexPairsFromBytes(const unsigned char* inBytes, string& ioHex, int numBytes)
+{
+	bool theSuccess = true;
+	string theString;
+	int theNumber;
+	for(int index = 0; index < numBytes*2; ++index)
+	{
+		theNumber = inBytes[index/2];
+		if(index % 2)
+		{
+			theNumber %= 16;
+		}
+		else
+		{
+			theNumber /= 16;
+		}
+		if(theNumber > 15 || theNumber < 0)
+		{ 
+			theSuccess = false; 
+			break;
+		}
+		switch(theNumber)
+		{
+		case 0: case 1: case 2: case 3: case 4:
+		case 5: case 6: case 7: case 8: case 9:
+			theString += ('0' + theNumber);
+			break;
+		case 10: case 11: case 12:
+		case 13: case 14: case 15:
+			theString += ('A' + theNumber - 10);
+			break;
+		}
+	}
+	if(theSuccess)
+	{
+		ioHex.assign(theString);
+	}
+	return theSuccess;
+}
+
+
+string BuildAbridgedString(const string& inString, int inMaxLen)
+{
+	ASSERT(inMaxLen > 0);
+
+	string theAbridgedString = inString;
+	
+	// If inString is longer then inMaxLen
+	if(inString.length() > (unsigned int)inMaxLen)
+	{
+		// For short max strings, just truncate past inMaxLen (it would be ridiculous to have more then half the string be "...")
+		if(inMaxLen <= 7)
+		{
+			theAbridgedString = inString.substr(0, inMaxLen-1);
+		}
+		// else
+		else
+		{
+			// Cut off all characters pass inMaxLen - 3
+			theAbridgedString = inString.substr(0, inMaxLen-4);
+
+			// Tack on "..."
+			theAbridgedString += "...";
+		}
+	}
+
+	return theAbridgedString;
+}
+
+// Pass in relative path, do search on path including mod directory, return files relative to mod directory
+bool BuildFileList(const string& inBaseDirectoryName, const string& inDirectoryName, const string& inFileExtension, CStringList& outList)
+{
+	#ifdef WIN32
+	const string kDelimiter("\\");
+	#else
+	const string kDelimiter("/");
+	#endif
+
+	bool theSuccess = false;
+
+	string theBaseDirectoryName = inBaseDirectoryName;
+	string theDirectoryName = inDirectoryName;
+
+	#ifdef WIN32
+	// Replace all forward slashes with \\'s if needed
+	std::replace(theBaseDirectoryName.begin(), theBaseDirectoryName.end(), '/', '\\');
+	std::replace(theDirectoryName.begin(), theDirectoryName.end(), '/', '\\');
+	#endif
+	
+	string theFullDirName = theBaseDirectoryName + theDirectoryName;
+	
+	int theEndOffset = theDirectoryName.find_last_of(kDelimiter);
+	string theBaseDirName = theDirectoryName.substr(0, theEndOffset);
+
+	theFullDirName += inFileExtension;
+
+	#ifdef WIN32
+	WIN32_FIND_DATA		theFindData;
+	HANDLE				theFileHandle;
+	
+	theFileHandle = FindFirstFile(theFullDirName.c_str(), &theFindData);
+	if (theFileHandle != INVALID_HANDLE_VALUE)
+	{
+		do
+		{
+			string theFoundFilename = string(theFindData.cFileName);
+
+
+	#else
+
+	string theFoundFilename;
+	FIND_DATA theFindData;
+
+	const char* theFullDirNameCStr = theFullDirName.c_str();
+	int theRC = FindFirstFile(theFullDirNameCStr, &theFindData);
+	if(theRC != -1)
+	{
+		do
+		{
+			string theFoundFilename = string(theFindData.cFileName);
+	#endif
+			CString theCString;
+			string theFullFileName = theBaseDirName + string("/") + theFoundFilename;
+
+			// Precache requires / in the filename
+			std::replace(theFullFileName.begin(), theFullFileName.end(), '\\', '/');
+
+			theCString = theFullFileName;
+			outList.push_back(theCString);
+			theSuccess = true;
+	#ifdef WIN32
+		} 
+		while(FindNextFile(theFileHandle, &theFindData));
+	}
+	#else
+		}
+		while(FindNextFile(0, &theFindData));
+	}
+	#endif
+
+	//DIR theDirp = opendir(theDirName.c_str());
+	//	while(theDirp) 
+	//	{
+	//		int theErrno = 0;
+	//		     if ((dp = readdir(theDirp)) != NULL) {
+	//			         if (strcmp(dp->d_name, name) == 0) {
+	//				             closedir(theDirp);
+	//				             return FOUND;
+	//				         }
+	//			     } else {
+	//				         if (theErrno == 0) {
+	//					             closedir(theDirp);
+	//					             return NOT_FOUND;
+	//					         }
+	//				         closedir(theDirp);
+	//				         return READ_ERROR;
+	//				     }
+	//			 }
+	//	return OPEN_ERROR;
+
+	return theSuccess;
+}
+
+int32 sprintf(string& outString, const char* inPattern, ...)
+{
+	va_list theParameters;
+	int32 theResult;
+	
+	va_start(theParameters, inPattern);
+	
+	char theCharArray[kMaxStrLen];
+	
+	theResult = ::vsprintf(theCharArray, inPattern, theParameters);
+	outString = theCharArray;
+	
+	va_end(theParameters);
+	
+	return theResult;
+}
+
+int SafeStrcmp(const char* inStringOne, const char* inStringTwo)
+{
+	int theReturnValue = -1;
+
+	if(inStringOne && inStringTwo)
+	{
+		theReturnValue = strcmp(inStringOne, inStringTwo);
+	}
+
+	return theReturnValue;
+}
+
+// Remove leading and trailing spaces.
+// Remove trailing \r\n
+void TrimString(string& ioString)
+{
+	int theStartChopIndex = 0;
+	int theEndChopIndex = ioString.length();
+
+	// Now remove any leading spaces
+	while((theStartChopIndex < (signed)ioString.length()) && (ioString[theStartChopIndex] == ' '))
+	{
+		theStartChopIndex++;
+	}
+	
+	// Remove trailing newlines, carriage returns, or spaces
+	while((theEndChopIndex > 0) && ((ioString[theEndChopIndex-1] == '\r') || (ioString[theEndChopIndex-1] == '\n') || (ioString[theEndChopIndex-1] == ' ')))
+	{
+		theEndChopIndex--;
+	}
+
+	int theLength = theEndChopIndex - theStartChopIndex;
+	if(theLength > 0)
+	{
+		string theTrimmedString = ioString.substr(theStartChopIndex, theLength);
+		ioString = theTrimmedString;
+	}
+}
diff --git a/main/source/util/STLUtil.h b/main/source/util/STLUtil.h
new file mode 100644
index 00000000..f85f64eb
--- /dev/null
+++ b/main/source/util/STLUtil.h
@@ -0,0 +1,56 @@
+//======== (C) Copyright 2001 Charles G. Cleveland All rights reserved. =========
+//
+// The copyright to the contents herein is the property of Charles G. Cleveland.
+// The contents may be used and/or copied only with the written permission of
+// Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
+// the agreement/contract under which the contents have been supplied.
+//
+// Purpose: Utility functions loosely wrapping the STL
+//
+// $Workfile: STLUtil.h$
+// $Date: 2002/07/26 01:51:23 $
+//
+//-------------------------------------------------------------------------------
+// $Log: STLUtil.h,v $
+// Revision 1.5  2002/07/26 01:51:23  Flayra
+// - Linux support for FindFirst/FindNext
+//
+// Revision 1.4  2002/05/23 04:03:11  Flayra
+// - Post-crash checkin.  Restored @Backup from around 4/16.  Contains changes for last four weeks of development.
+//
+// Revision 1.5  2002/05/14 18:48:16  Charlie
+// - More utility functions
+//
+// Revision 1.4  2002/05/01 00:52:34  Charlie
+// - Added BuildAbridgedString
+//
+//===============================================================================
+
+#ifndef STL_UTIL_H
+#define STL_UTIL_H
+
+#include "util/nowarnings.h"
+#include "util/CString.h"
+#include "types.h"
+
+const int kMaxStrLen = 2056;
+
+string LowercaseString(const string& ioString);
+string LowercaseString(string& ioString);
+string UppercaseString(const string& ioString);
+string UppercaseString(string& ioString);
+int MakeIntFromString(string& inString);
+float MakeFloatFromString(string& inString);
+string MakeStringFromInt(int inNumber);
+string MakeStringFromFloat(float inNumber, int inNumDecimals = 1);
+string BuildAbridgedString(const string& inString, int inMaxLen);
+bool BuildFileList(const string& inBaseDirectoryName, const string& inDirectoryName, const string& inFileExtension, CStringList& outList);
+int SafeStrcmp(const char* inStringOne, const char* inStringTwo);
+void TrimString(string& ioString);
+
+bool MakeBytesFromHexPairs(const string& inHex, unsigned char* ioBytes, int numBytes);
+bool MakeHexPairsFromBytes(const unsigned char* inBytes, string& ioHex, int numBytes);
+
+extern int32 sprintf(string& inOutput, const char* inPattern, ...);
+
+#endif
\ No newline at end of file
diff --git a/main/source/util/Stacktrace.cpp b/main/source/util/Stacktrace.cpp
new file mode 100644
index 00000000..23f5a903
--- /dev/null
+++ b/main/source/util/Stacktrace.cpp
@@ -0,0 +1,588 @@
+// ZASSERT AND STACKTRACE are an improved assertion system which augments
+// the WIN32 assert.h standard _assert.
+// (c) 1999 Zachary B. Simpson
+// Code may be used and distributed freely as long as all
+// changes are noted appropriately.
+
+#ifdef WIN32
+	#include "windows.h"
+#endif
+#include "stdio.h"
+#include "string.h"
+#include "stacktrace.h"
+
+char *stackTrace( int skipAssert ) {
+	// Becuase this code may be running during a fatal,
+	// I am weary of allocating large buffers.  Thus, 
+	// the output will be written into this static
+	// buffer.  Teh OUTS macro simplifies writing into it.
+	static char output[2048];
+	output[0] = 0;
+	#define OUTS sprintf( output+strlen(output), 
+
+	#ifdef WIN32
+	// Get the exe name from the command line
+	// It is surrounded by quotes in some cases
+	char *exeName = GetCommandLine();
+	if( *exeName == '"' ) {
+		exeName++;
+	}
+	char *space = strchr( exeName, ' ' );
+	if( space ) {
+		*space = 0;
+	}
+	char *quote = strchr( exeName, '"' );
+	if( quote ) {
+		*quote = 0;
+	}
+
+	// Figure the base load address with GetModuleHandle
+	unsigned int baseAddress = (int)GetModuleHandle( NULL );
+
+	// Walk up the stack placing pointers to functions
+	// in the stackTrace array and pointers to argument
+	// lists into the argBase array.
+	#define STACK_TRACE_SIZE 30
+	unsigned int stackTrace[STACK_TRACE_SIZE];
+	unsigned int argBase[STACK_TRACE_SIZE];
+	int stackTraceCount = 0;
+	volatile unsigned int *currBP;
+	__asm mov [currBP], ebp;
+	try {
+		for( stackTraceCount=0; stackTraceCount<STACK_TRACE_SIZE; stackTraceCount++ ) {
+			argBase[stackTraceCount] = (unsigned)(currBP+2);
+			stackTrace[stackTraceCount] = *(currBP+1) - baseAddress;
+			currBP = (unsigned *)*(currBP);
+		}
+	}
+	catch( ... ) {
+	}
+
+	// memory map the exec file.  This is done becuase
+	// it is much harder to parse in memory since it
+	// parts of it are moved around by the loader.
+	// Also, we must use CreateFile here because of file sharing
+	// since the file is currently opened by the process.
+	HANDLE hFile = CreateFile( exeName, GENERIC_READ, FILE_SHARE_READ,
+		NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0
+	);
+	if( hFile == INVALID_HANDLE_VALUE ) {
+		return NULL;
+	}
+	HANDLE hFileMapping = CreateFileMapping( hFile, NULL, PAGE_READONLY, 0, 0, NULL );
+	if( hFileMapping == NULL ) {
+		CloseHandle( hFile );
+		return NULL;
+	}
+	char *basePtr = (char *)MapViewOfFile( hFileMapping, FILE_MAP_READ, 0, 0, 0 );
+	if( basePtr == NULL ) {
+		CloseHandle( hFileMapping );
+		CloseHandle( hFile );
+		return NULL;
+	}
+
+	// Now parse the file extracting the debug information
+	// This involves quite a lot of header parsing
+	// Ultimately, we will find there three variables:
+	int numDebugFormats = 0;
+		// How many debug format are in this exe
+	int coffDebugInfoOffset = 0;
+		// where the coff debug info starts
+	IMAGE_DEBUG_DIRECTORY *debugDir = NULL;
+		// primary debug headers
+
+	// These two macros simplify traversing the structures
+	#define MAKEPTR(type, var, offset) type *var = (type *)(basePtr + offset)
+		// This macro help us make pointer relative to the base
+	#define SETPTR(type, var, offset) var = (type *)(basePtr + offset)
+		// This macro help us make pointer relative to the base
+
+	// Get pointers to the primary headers...
+	MAKEPTR( IMAGE_DOS_HEADER, dosHeader, 0 );
+	MAKEPTR( IMAGE_NT_HEADERS, ntHeader, dosHeader->e_lfanew );
+
+	// Go through each section looking for the .rdata section
+	for( int i=0; i<ntHeader->FileHeader.NumberOfSections; i++ ) {
+		IMAGE_SECTION_HEADER *secHead = &(IMAGE_FIRST_SECTION( ntHeader ))[i];
+		if( ! stricmp( (char *)&secHead->Name[0], ".rdata" ) ) {
+			numDebugFormats = 
+				ntHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].Size
+				/ sizeof(IMAGE_DEBUG_DIRECTORY)
+			;
+			if( numDebugFormats != 0 ) {
+				SETPTR( IMAGE_DEBUG_DIRECTORY, debugDir, 
+					secHead->PointerToRawData +
+					(
+						ntHeader->OptionalHeader.DataDirectory
+						[IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress
+						- secHead->VirtualAddress
+					)
+				);
+				break;
+			}
+		}
+	}
+
+	// Now have pointer to primary debug headers (debugDir) and
+	// a count of number of debug formats (numDebugFormats)
+	// Parse these to find the COFF headers
+	IMAGE_COFF_SYMBOLS_HEADER *coffHeader = 0;
+	for( i=0; i<numDebugFormats; i++, debugDir++ ) {
+		if(
+			debugDir->Type == IMAGE_DEBUG_TYPE_COFF &&
+		    ntHeader->FileHeader.PointerToSymbolTable
+		) {
+			SETPTR( IMAGE_COFF_SYMBOLS_HEADER, coffHeader, debugDir->PointerToRawData );
+			break;
+		}
+	}
+	if( !coffHeader ) {
+		// There was not COFF debug information available.
+		OUTS "Stack symbol information only available "
+		     "when linked with COFF debug symbols.\n"
+		     "Dumping hex trace instead:\n"
+		);
+
+		for( i=0; i<stackTraceCount; i++ ) {
+			OUTS "%08X(", baseAddress+stackTrace[i] );
+			try {
+				int *a = (int *)argBase[i+1];
+				for( int j=0; j<5; j++, a++ ) {
+					OUTS "%s 0x%X", j==0?"":",", *a );
+				}
+			}
+			catch( ... ) { }
+			OUTS ")\r\n" );
+		}
+
+		CloseHandle( hFileMapping );
+		CloseHandle( hFile );
+		return output;
+	}
+
+	// Now have pointer to coff info. (coffHeader)
+	// Use this to find line numbers,
+//	IMAGE_LINENUMBER *lineNums = (IMAGE_LINENUMBER *)(
+//		(char *)coffHeader + coffHeader->LvaToFirstLinenumber
+//	);
+//	int count = coffHeader->NumberOfLinenumbers;
+//	for( i=0; i<count; i++, lineNums++ ) {
+//		printf( "Addr: %05X  Line: %04X\n", lineNums->Type.VirtualAddress, lineNums->Linenumber );
+//	}
+
+	// Now extract the COFF symbol table
+	MAKEPTR( IMAGE_SYMBOL, coffSym, ntHeader->FileHeader.PointerToSymbolTable );
+	int coffSymbolCount = ntHeader->FileHeader.NumberOfSymbols;
+
+	// The string table apparently starts right after the symbol table
+	char *stringTable = (PSTR)&coffSym[coffSymbolCount]; 
+
+	// Becuase this code may be running during a fatal,
+	// I am weary of allocating large buffers.  Thus, I perform
+	// this search without the help of any index or hash. 
+	IMAGE_SYMBOL *matchingStackSymbols[STACK_TRACE_SIZE];
+	memset( matchingStackSymbols, 0, sizeof(IMAGE_SYMBOL *) * STACK_TRACE_SIZE );
+	IMAGE_SYMBOL *lastSymbol = coffSym++;
+	for( i=0; i<coffSymbolCount-1; i++ ) {
+		char *symName = 
+			(char *)coffSym->N.Name.Short != 0 ? 
+			(char *)coffSym->N.ShortName : 
+			(char *)(stringTable + coffSym->N.Name.Long)
+		;
+
+		for( int j=0; j<stackTraceCount; j++ ) {
+			if(
+				stackTrace[j] < coffSym->Value &&
+				stackTrace[j] >= lastSymbol->Value &&
+				lastSymbol->Type == 0x20
+			) {
+				matchingStackSymbols[j] = lastSymbol;
+			}
+		}
+		lastSymbol = coffSym;
+
+		// Take into account any aux symbols
+		i += coffSym->NumberOfAuxSymbols;
+		coffSym += coffSym->NumberOfAuxSymbols;
+		coffSym++;
+	}
+
+	for( i=0; i<stackTraceCount; i++ ) {
+		if( matchingStackSymbols[i] == NULL ) {
+			OUTS "%X = Undefined Symbol\n", stackTrace[i] );
+		}
+		else {
+			char *symName = 
+				(char *)matchingStackSymbols[i]->N.Name.Short != 0 ? 
+				(char *)matchingStackSymbols[i]->N.ShortName : 
+				(char *)(stringTable + matchingStackSymbols[i]->N.Name.Long)
+			;
+			char args[30]={0,};
+			char funcName[128]={0,};
+			char *open = NULL;
+			int numArgs = 0;
+
+			if( skipAssert && strstr(symName,"assert") ) {
+				continue;
+			}
+
+			// The function names are mangled, which tells us
+			// what the  arguments are.  Unfortunatly, the name
+			// demangler is not perfect (since I had to reverse
+			// engineer it).  So in cases when it fails, we
+			// just print five arguments hoping that this is
+			// sufficient.
+			char *success = demangleMSDEVFuncName( symName, funcName, 128, args, 30, numArgs );
+			if( strstr( symName, "mainCRTStartup" ) ) {
+				break;
+			}
+			OUTS "%s(", funcName );
+			if( success ) {
+				// Name demangler succeeded.  Print
+				// out a trace of the arguments.  For
+				// pointer args, print out a small
+				// memory dump of that pointer
+				unsigned int *a = (unsigned int *)argBase[i+1];
+				for( int j=0; j<numArgs; j++, a++ ) {
+					try {
+						OUTS "%s ", j==0?"":"," );
+						switch( args[j] ) {
+							case 'D': case 'E': case 'F':
+							case 'G': case 'H': case 'I':
+								if( *a >= 0x10000 ) {
+									OUTS "0x%X", *a );
+								}
+								else {
+									OUTS "%d", *a );
+								}
+								break;
+							case 'M':
+								OUTS "%f", *a );
+								break;
+							case 'N':
+								// TODO
+								break;
+							case 'P':
+								OUTS "PTR(0x%X)", *a );
+								break;
+							default:
+								OUTS "?" );
+						}
+					}
+					catch( ... ) { }
+				}
+			}
+			else {
+				// The name demanagler failed, so just
+				// print 5 arguments under the theory that
+				// it is better than nothing.
+				OUTS "?? " );
+				int *a = (int *)argBase[i+1];
+				for( int j=0; j<5; j++, a++ ) {
+					OUTS "%s 0x%X", j==0?"":",", *a );
+				}
+			}
+			OUTS " )\n" );
+
+			if( success ) {
+				// Name mangler succeeded, go back and
+				// print out a hex dump for each pointer.
+				try {
+					int *a = (int *)argBase[i+1];
+					for( int j=0; j<numArgs; j++, a++ ) {
+						if( args[j] == 'P' ) {
+							unsigned char *ptr = (unsigned char *)*a;
+							if( ptr >= (unsigned char *)baseAddress ) {
+								for( int k=0; k<3; k++, ptr+=16 ) {
+									OUTS "  %X: ", ptr );
+									for( int l=0; l<16; l++ ) OUTS "%02X ", ptr[l] );
+									OUTS "  " );
+									for( l=0; l<16; l++ ) OUTS "%c", ptr[l]>=31&&ptr[l]<127?ptr[l]:'.' );
+									OUTS "\n" );
+								}
+							}
+						}
+					}
+				}
+				catch( ... ) { }
+			}
+		}
+	}
+
+	CloseHandle( hFileMapping );
+	CloseHandle( hFile );
+
+	#else // WIN32
+		// UNIX code
+		OUTS "UNIX Stack Trace Currently unavailable\n" );
+	#endif // WIN32
+
+	return output;
+}
+
+#ifdef WIN32
+char *demangleMSDEVFuncName(
+	char *mangledName, 
+	char funcName[], int funcNameMax,
+	char args[], int maxArgs, 
+	int &numArgs
+) {
+	// Print out arguments.  This is a big pain in the ass
+	// because the argument list needs to be parsed.
+	// This fills in the funcName and args buffers.
+	// Both of which need to pass in buffer sizes.
+	// numArgs is filled out.
+	// Returns a full string ready for printing or NULL on error
+	// The args array is encoded as follows:
+	// D=char, E=uchar, F=short, G=ushort, H=int, I=uint, 
+	// J=, K=, L=, M=float, N=double, O=, P=ptr, Q=, R=, 
+	// S=, T=, U=STRUCT, V=, W=, X=void, Y=, Z=...
+	static char demangled[128] = {0,};
+	memset( demangled, 0, 128 );
+	numArgs = 0;
+	char *atomicTypes[] = { "REF", "", "", "char", "uchar", "short",
+		"ushort", "int", "uint", "", "", "",
+		"float", "double", "", "PTR", "", "", "", "",
+		"STRUCT", "", "", "void", "", "..."
+	};
+	int retType = 0, funcType;
+	enum {sSTART,sNAME,sCLASSNAME,sFUNCYPE,sERROR,sRETTYPE,sSTRUCT,sARGS,sTYPE,sRETTYPEDONE,sARGSDONE,sEND};
+	enum {ftFREEFUNC, ftMETHOD, ftVIRTUAL, ftSTATIC,};
+	char name[128]={0,};
+	char classname[128]={0,};
+	int state = sSTART;
+	int stateStack[30];
+	int stateStackTop = 0;
+	int lastType = 0;
+	#define PUSHSTATE stateStack[stateStackTop++] = state;
+	#define POPSTATE state = stateStack[--stateStackTop];
+
+	char *p = mangledName;
+	while( *p || state == sEND ) {
+		switch( state ) {
+			case sSTART:
+				if( *p == '_' ) {
+					strncpy( funcName, p, funcNameMax-1 );
+					funcName[funcNameMax-1] = 0;
+					return NULL;
+				}
+				if( *p == '?' ) state = sNAME;
+				else state = sERROR;
+				break;
+			case sNAME:
+				if( *p=='@' && *(p+1)=='@' ) {
+					p++;
+					state = sFUNCYPE;
+				}
+				else if( *p=='@' ) state = sCLASSNAME;
+				else name[strlen(name)]=*p;
+				break;
+			case sCLASSNAME:
+				if( *p == '@' && *(p+1)=='@' ) {
+					p++;
+					state = sFUNCYPE;
+				}
+				else classname[strlen(classname)]=*p;
+				break;
+			case sFUNCYPE:
+				if( *p=='Y' ) funcType = ftFREEFUNC;
+				if( *p=='Q' ) funcType = ftMETHOD;
+				if( *p=='U' ) funcType = ftVIRTUAL;
+				if( *p=='S' ) funcType = ftSTATIC;
+				// Skip const, volatile, etc.
+				p++;
+				if( funcType == ftMETHOD || funcType == ftVIRTUAL ) {
+					p++;// Some unknown parameter, mostly 'E'
+						// Maybe it stands for "this"
+					//args[numArgs++] = 'P';
+					//if( numArgs >= maxArgs ) state = sERROR;
+				}
+				state = sRETTYPE;
+				break;
+			case sTYPE:
+				if( *p == '?' ) {
+					p++;
+					if( *p != 'B' && *p != 'A' ) state = sERROR; // 'B' means const, 'A' means copy?
+					break;
+				}
+				else if( *p == 'P' || *p == 'Q' || *p == 'A' ) {
+					if(lastType==0) lastType='P';
+					p++;	// Read the modifier
+					if( !(*p>='A' && *p<='C') ) state=sERROR;
+					else {
+						PUSHSTATE;
+					}
+				}
+				else if( *p>='D' && *p<='O' || *p == 'X' ) {
+					// Simple atomic type
+					if(lastType==0) lastType=*p;
+				}
+				else if( *p == 'U' ) {
+					if(lastType==0) lastType=*p;
+					// A structure, gobble it up
+					while( *p++ != '@' );
+				}
+				else if( *p == 'Y' ) {
+					// An array length, gobble it up
+					do {
+						p++;
+					} while( *p >= '0' && *p <= '9' );
+					p--;
+					break;
+				}
+				if( stateStackTop > 0 ) POPSTATE;
+				break;
+			case sRETTYPE:
+				lastType = 0;
+				state = sRETTYPEDONE;
+				PUSHSTATE;
+				state = sTYPE;
+				p--;
+				break;
+			case sRETTYPEDONE:
+				retType = lastType;
+				state = sARGS;
+				p--;
+				break;
+			case sARGS:
+				if( *p=='@' ) state = sEND;
+				else if( *p=='Z' && *(p+1)!='Z' ) {
+					//argCount = 0;
+					state = sEND;
+				}
+				else if( *p=='Z' && *(p+1)=='Z' ) {
+					args[numArgs++] = 'Z';
+					if( numArgs >= maxArgs ) state = sERROR;
+					else state = sEND;
+				}
+				else {
+					lastType = 0;
+					state = sARGSDONE;
+					PUSHSTATE;
+					state = sTYPE;
+					p--;
+				}
+				break;
+			case sARGSDONE:
+				args[numArgs++] = lastType;
+				if( numArgs >= maxArgs ) state = sERROR;
+				else state = sARGS;
+				p--;
+				break;
+			case sEND: {
+				strcat( demangled, classname );
+				if( *classname ) strcat( demangled, "::" );
+				strcat( demangled, name );
+				strncpy( funcName, demangled, funcNameMax-1 );
+				funcName[funcNameMax-1] = 0;
+				*demangled = 0;
+
+				if((char)retType >= 'A')
+				{
+					strcat( demangled, atomicTypes[retType-'A'] );
+					strcat( demangled, " " );
+					strcat( demangled, classname );
+					if( *classname ) strcat( demangled, "::" );
+					strcat( demangled, name );
+					strcat( demangled, "(" );
+					for( int i=0; i<numArgs; i++ ) {
+						if( args[i] >= 'A' && args[i] <= 'Z' ) {
+							strcat( demangled, i==0?" ":", " );
+							strcat( demangled, atomicTypes[args[i]-'A'] );
+						}
+					}
+					strcat( demangled, " )" );
+				}
+				else
+				{
+					strcpy(demangled, funcName);
+				}
+				
+				goto stop;
+			}
+
+			case sERROR:
+				return NULL;
+				goto stop;
+		}
+		p++;
+	}
+	stop:;
+	return demangled;
+}
+#endif
+
+
+
+#ifdef REGRESSION
+
+// This is test code for the name mangler parser
+
+void main( int argc, char **argv ) {
+	void regressionTestDemangler();
+}
+
+void regressionTestDemangler() {
+	char *cases[] = {
+"void oink( Oink * )",          "?oink@@YAXPAUOink@@@Z",      "void oink( PTR )",
+"void oink( const int * )",     "?oink@@YAXPBH@Z",            "void oink( PTR )",
+"void oink( int * const )",     "?oink@@YAXQAH@Z",             "void oink( PTR )",
+"void oink( const int & )",     "?oink@@YAXABH@Z",            "void oink( PTR )",
+"void oink( volatile int * )",  "?oink@@YAXPCH@Z",            "void oink( PTR )",
+"void oink( int c[4][1] )",     "?oink@@YAXQAY00H@Z",         "void oink( PTR )",
+"void oink( int c[4] )",        "?oink@@YAXQAH@Z",            "void oink( PTR )",
+"void oink( )",                 "?oink@@YAXXZ",               "void oink( void )",
+"void Boink::oink()",           "?oink@Boink@@QAEXXZ",        "void Boink::oink( void )",
+"void Boink::oink() const",     "?oink@Boink@@QBEXXZ",        "void Boink::oink( void )",
+"void Boink::oink() volatile",  "?oink@Boink@@QCEXXZ",        "void Boink::oink( void )",
+"virtual void Boink::oink()",   "?oink@Boink@@UAEXXZ",        "void Boink::oink( void )",
+"static void Boink::oink()",    "?oink@Boink@@SAXXZ",         "void Boink::oink( void )",
+"void oink( int c[4][2] )",     "?oink@@YAXQAY01H@Z",         "void oink( PTR )",
+"void oink( int c[5][2] )",     "?oink@@YAXQAY01H@Z",         "void oink( PTR )",
+"void oink( int c[5][2][1] )",  "?oink@@YAXQAY110H@Z",        "void oink( PTR )",
+"void oink( char, char )",      "?oink@@YAXDD@Z",             "void oink( char, char )",
+"void oink( Oink )",            "?oink@@YAXUOink@@@Z",        "void oink( STRUCT )",
+"Boink oink( )",                "?oink@@YA?AUBoink@@XZ",      "STRUCT oink( void )",
+"Boink *oink( )",               "?oink@@YAPAUBoink@@XZ",      "PTR oink( void )",
+"void oink( int [] )",          "?oink@@YAXQAH@Z",            "void oink( PTR )",
+"void oink( int, ... )",        "?oink@@YAXHZZ",              "void oink( int, ... )",
+"const int oink( )",            "?oink@@YA?BHXZ",             "int oink( void )",
+"void *oink( )",                "?oink@@YAPAXXZ",             "PTR oink( void )",
+"int &oink( )",                 "?oink@@YAAAHXZ",             "PTR oink( void )",
+"void oink( int * )",           "?oink@@YAXPAH@Z",            "void oink( PTR )",
+"void oink( int ** )",          "?oink@@YAXPAPAH@Z",          "void oink( PTR )",
+"void oink( int & )",           "?oink@@YAXAAH@Z",            "void oink( PTR )",
+"int oink( char *, char ** )",  "?oink@@YAHPADPAPAD@Z",       "int oink( PTR, PTR )",
+"char oink( )",                 "?oink@@YADXZ",               "char oink( void )",
+"unsigned char oink( )",        "?oink@@YAEXZ",               "uchar oink( void )",
+"short oink( )",                "?oink@@YAFXZ",               "short oink( void )",
+"unsigned short oink( )",       "?oink@@YAGXZ",               "ushort oink( void )",
+"int oink( )",                  "?oink@@YAHXZ",               "int oink( void )",
+"unsigned int oink( )",         "?oink@@YAIXZ",               "uint oink( void )",
+"float oink( )",                "?oink@@YAMXZ",               "float oink( void )",
+"double oink( )",               "?oink@@YANXZ",               "double oink( void )",
+"void oink( char )",            "?oink@@YAXD@Z",              "void oink( char )",
+"void oink( int )",             "?oink@@YAXH@Z",              "void oink( int )",
+// TODO: function ptrs, operators
+//"void oink( __int64 )",      "?oink@@YAX_J@Z",
+//"typedef void (*FPTR)();"
+//"void oink( FPTR )",        "?oink@@YAXP6AXXZ@Z",
+//"typedef void (*FPTR)(int);"
+//"void oink( FPTR )",        "?oink@@YAXP6AXH@Z@Z",
+//"int Boink::operator +(int a)",  "??HBoink@@QAEHH@Z",
+//"int Boink::operator -(int a)",  "??GBoink@@QAEHH@Z",
+//"Boink::operator char *()",       "??BBoink@@QAEPADXZ",
+	};
+
+	int count = sizeof(cases)/sizeof(cases[0]);
+	for( int i=0; i<count; i+=3 ) {
+		char args[100];
+		int numArgs;
+		char *str = demangle( cases[i+1], "", 1, args, 100, numArgs );
+		printf( "%s = %s\nshould be:%s\n      got:%s\n\n", cases[i], cases[i+1], cases[i+2], str );
+		if( strcmp( str, cases[i+2] ) ) {
+			printf( "Regression failed i=%d\n", i );
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/main/source/util/Stacktrace.h b/main/source/util/Stacktrace.h
new file mode 100644
index 00000000..b33828ff
--- /dev/null
+++ b/main/source/util/Stacktrace.h
@@ -0,0 +1,42 @@
+// ZASSERT AND STACKTRACE are an improved assertion system which augments
+// the WIN32 assert.h standard _assert.
+// (c) 1999 Zachary B. Simpson
+// Code may be used and distributed freely as long as all
+// changes are noted appropriately.
+
+#ifndef STACKTRACE_H
+#define STACKTRACE_H
+
+char *stackTrace( int skipAssert );
+	// This function traces up the stack and creates a useful
+	// stack dump good for printing after an assert of fatal.
+	// It parses the symbol tables inside of the exe file
+	// in order to print a useful report.  However, it
+	// only understands COFF format debugging.  You must enable
+	// COFF in the Project Settings Linker Options.  You may,
+	// if you choose, enable both COFF and MS formats.
+	//   If COFF data is not available, it will print out using
+	// a hex dump, and may print more information than is valid.
+	// The traversal of the stack is predicated on assumptions
+	// about non-optimized MSVC stack frames.  Thus, if optimizations
+	// are on, results may not be predicatble.
+	//   If the skipAssert flag is true, it will not dump
+	// and functions with the word assert in them.  Useful
+	// for ignoring the call to assert which is not helpful.
+
+#ifdef WIN32
+char *demangleMSDEVFuncName(
+	char *mangledName, 
+	char funcName[], int funcNameMax,
+	char args[], int maxArgs, 
+	int &numArgs
+);
+#endif
+	// This function is used by the stackTrace function in
+	// order to deceipher the mangled C++ function names
+	// generated by MSDEV in order to determine the argument list.  
+	// The parser for this is very complicated and unfortunately
+	// may not be able to parse all names.  In these cases,
+	// stackTrace should resort to printing a hex dump.
+
+#endif
\ No newline at end of file
diff --git a/main/source/util/StringVector.h b/main/source/util/StringVector.h
new file mode 100644
index 00000000..0b4aff3e
--- /dev/null
+++ b/main/source/util/StringVector.h
@@ -0,0 +1,18 @@
+/**
+    StringVector.h                   Nathaniel R. Goodspeed
+    Copyright (C) 1999               Cognitoy, LLC
+
+This concept is just too darned useful to be defined only in Tokenizer.h.
+
+NRG 06/25/99
+**/
+
+#if ! defined(STRINGVECTOR_H)
+#define STRINGVECTOR_H
+
+#include <string>
+#include <vector>
+
+typedef std::vector<std::string> StringVector;
+
+#endif /* ! defined(STRINGVECTOR_H) */
diff --git a/main/source/util/Tokenizer.cpp b/main/source/util/Tokenizer.cpp
new file mode 100644
index 00000000..bc353ab6
--- /dev/null
+++ b/main/source/util/Tokenizer.cpp
@@ -0,0 +1,46 @@
+#include "util/nowarnings.h"
+#include "util/Tokenizer.h"
+
+int Tokenizer::split(const string& input, const string& delimiters, StringVector& result, char quoteChar)
+{
+    int subStart = 0;
+    int subEnd = 0;
+    int length = 0;
+    
+    result.clear();   // erase result before we start
+    
+    while (true)
+    {
+        if ((subStart = input.find_first_not_of(delimiters, subEnd)) == string::npos)
+            break;
+        
+        // if we're handling quotes
+        if (quoteChar && (input[subStart] == quoteChar))
+        {
+            ++subStart;                   // skip the open quote
+            // have to turn quoteChar into a string for find_first_of
+            if ((subEnd = input.find_first_of(string(1, quoteChar), subStart))
+                == string::npos)
+            {
+                subEnd = input.size();
+                length = subEnd - subStart;
+            }
+            else
+            {
+                // subStart has already been incremented to skip the open quote;
+                // subEnd excludes the close quote; so we do NOT have to tweak the
+                // difference to get a count of the characters between them.
+                length = subEnd - subStart;
+                ++subEnd;                   // now skip the close quote
+            }
+        }
+        else
+        {
+            if ((subEnd = input.find_first_of(delimiters, subStart)) == string::npos)
+                subEnd = input.size();
+            length = subEnd - subStart;
+        }
+        result.push_back(input.substr(subStart, length));
+    }
+    return result.size();
+}
diff --git a/main/source/util/Tokenizer.h b/main/source/util/Tokenizer.h
new file mode 100644
index 00000000..ad28fa92
--- /dev/null
+++ b/main/source/util/Tokenizer.h
@@ -0,0 +1,28 @@
+#ifndef TOKENIZER_H
+#define TOKENIZER_H
+/**************************************************************
+Name:		Tokenizer.h
+Author:	KJQ
+Desc:		Static class to provide tokenizer services for simple parsers.
+Edits:		
+Bugs:		
+*************************************************************/
+
+#include <util/StringVector.h>
+#include <vector>
+#include <string>
+using std::string;
+
+class Tokenizer
+{
+public:
+    // split separates the line into multiple pieces, discarding delimiters
+    // if quotechar is specified it's used to identify quoted strings.
+    static int split(const string& input, const string& delimiters, StringVector&, char quoteChar = 0);
+    
+private:
+    Tokenizer();        // prevent anybody from making one
+    ~Tokenizer();
+};
+
+#endif //TOKENIZER_H
diff --git a/main/source/util/Util.vcproj b/main/source/util/Util.vcproj
new file mode 100644
index 00000000..11fd4683
--- /dev/null
+++ b/main/source/util/Util.vcproj
@@ -0,0 +1,395 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="Util"
+	RootNamespace="Util"
+	SccProjectName=""
+	SccAuxPath=""
+	SccLocalPath=""
+	SccProvider="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)/"
+			IntermediateDirectory="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="$(SolutionDir)"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Release/Util.pch"
+				AssemblerListingLocation="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ObjectFile="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ProgramDataBaseFileName="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(SolutionDir)\lib\$(ConfigurationName)\util.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)/"
+			IntermediateDirectory="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				OptimizeForProcessor="1"
+				AdditionalIncludeDirectories="$(SolutionDir)"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Debug/Util.pch"
+				AssemblerListingLocation="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ObjectFile="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				ProgramDataBaseFileName="$(SolutionDir)temp\$(ProjectName)\$(ConfigurationName)/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(SolutionDir)\lib\$(ConfigurationName)\util.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="Checksum.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="GammaTable.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="LinuxSupport.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Mat3.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="MathUtil.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Quat.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Stacktrace.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="STLUtil.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Tokenizer.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Zassert.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="ZassertTemplate.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="Checksum.h">
+			</File>
+			<File
+				RelativePath="CString.h">
+			</File>
+			<File
+				RelativePath="GammaTable.h">
+			</File>
+			<File
+				RelativePath="LinuxSupport.h">
+			</File>
+			<File
+				RelativePath="Mat3.h">
+			</File>
+			<File
+				RelativePath="MathUtil.h">
+			</File>
+			<File
+				RelativePath="nowarnings.h">
+			</File>
+			<File
+				RelativePath="Quat.h">
+			</File>
+			<File
+				RelativePath="Stacktrace.h">
+			</File>
+			<File
+				RelativePath="STLUtil.h">
+			</File>
+			<File
+				RelativePath="StringVector.h">
+			</File>
+			<File
+				RelativePath="Tokenizer.h">
+			</File>
+			<File
+				RelativePath="Zassert.h">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/main/source/util/Zassert.cpp b/main/source/util/Zassert.cpp
new file mode 100644
index 00000000..e0c30961
--- /dev/null
+++ b/main/source/util/Zassert.cpp
@@ -0,0 +1,319 @@
+// ZASSERT AND STACKTRACE are an improved assertion system which augments
+// the WIN32 assert.h standard _assert.
+// (c) 1999 Zachary B. Simpson
+// Code may be used and distributed freely as long as all
+// changes are noted appropriately.
+
+#ifdef WIN32
+	#include "windows.h"
+#else
+	#include "netdb.h"
+	#include "unistd.h"
+	#include "sys/types.h"
+	#include "sys/socket.h"
+	#include "netinet/in.h"
+	#include "arpa/inet.h"
+#endif
+#include "string.h"
+#include "stdio.h"
+#include "stdlib.h"
+#include "stacktrace.h"
+#include "zassert.h"
+#include "malloc.h"
+
+#ifdef WIN32
+	#define CLOSESOCKET closesocket
+#else
+	#define CLOSESOCKET ::close
+#endif
+
+#ifdef WIN32
+
+// Assert Box Global Variables.
+HWND hAssertBox = NULL;
+HWND hTextArea = NULL;
+HWND hEditArea = NULL;
+HWND hOKButton = NULL;
+HWND hEmailButton = NULL;
+HWND hCopyButton = NULL;
+void (*emailButtonFuncPtr)(char *);
+
+// WndProc that runs the assert dialog box.
+long CALLBACK assertBoxWndProc( HWND hWnd, UINT message, UINT wParam, long lParam ) {
+	switch( message ) {	
+		case WM_SIZE: {
+			HDC hDC = GetDC( hOKButton );
+			SIZE s;
+			GetTextExtentPoint32( hDC, "W", 1, &s );
+			int margin = 10;
+			int w = LOWORD(lParam);
+			int h = HIWORD(lParam);
+			int bw = (w - 4*margin) / 3;
+			int bh = s.cy + 6;
+			int upperH = h - 3*margin - bh;
+			int textH  = (upperH * 6) / 10 - margin;
+			int editH  = (upperH * 4) / 10 ;
+			int editY  = 2*margin + textH;
+			int x = margin;
+			int y = h - margin - bh;
+			MoveWindow( hOKButton,    x, y, bw, bh, TRUE ); x += bw+margin;
+			MoveWindow( hEmailButton, x, y, bw, bh, TRUE ); x += bw+margin;
+			MoveWindow( hCopyButton,  x, y, bw, bh, TRUE ); x += bw+margin;
+			MoveWindow( hTextArea, margin, margin, w-2*margin, textH, TRUE );
+			MoveWindow( hEditArea, margin, editY,  w-2*margin, editH, TRUE );
+			break;
+		}
+		case WM_PAINT: {
+			// Paint the loading screen
+			PAINTSTRUCT ps;
+			HDC hdc = BeginPaint( hWnd, &ps );
+			EndPaint( hWnd, &ps );
+			break;
+		}
+		case WM_COMMAND: {
+			HWND who = (HWND)lParam;
+			if( who == hOKButton ) {
+				PostMessage( hWnd, WM_CLOSE, 0, 0 );
+			}
+			else if( who == hEmailButton ) {
+				int textSize = 
+					GetWindowTextLength( hTextArea )
+					+ GetWindowTextLength( hEditArea )
+				;
+				char *msg = (char *)alloca( textSize );
+				GetWindowText( hTextArea, msg, textSize+1 );
+				GetWindowText( hEditArea, msg+strlen(msg), textSize-strlen(msg)+1 );
+				if( emailButtonFuncPtr ) {
+					(*emailButtonFuncPtr)(msg);
+				}
+				EnableWindow( hEmailButton, FALSE );
+			}
+			else if( who == hCopyButton ) {
+				int textSize = 
+					GetWindowTextLength( hTextArea )
+					+ GetWindowTextLength( hEditArea )
+				;
+				if( !OpenClipboard(NULL) ) {
+					break;
+				}
+				EmptyClipboard();
+				HGLOBAL hglbCopy = GlobalAlloc( GMEM_DDESHARE, (textSize+1) * sizeof(TCHAR) ); 
+				if( hglbCopy == NULL ) {
+					CloseClipboard();
+					break;
+				}
+				char *globalStr = (char *)GlobalLock( hglbCopy );
+				GetWindowText( hTextArea, globalStr, textSize+1 );
+				GetWindowText( hEditArea, globalStr+strlen(globalStr), textSize-strlen(globalStr)+1 );
+				GlobalUnlock (hglbCopy);
+				SetClipboardData( CF_TEXT, hglbCopy );
+				CloseClipboard(); 
+				EnableWindow( hCopyButton, FALSE );
+			}
+		}
+	}
+	return DefWindowProc(hWnd, message, wParam, lParam );
+}
+
+void *createAssertBox(
+	char *msg, 
+	void (*emailButtonFuncPtr)(char *),
+	char *titleText,
+	char *okButtonText,
+	char *emailButtonText,
+	char *copyButtonText,
+	char *editAreaText,
+	void *parentBox
+) {
+	if( !titleText ) {
+		titleText = "Assertion Failed";
+	}
+	if( !okButtonText ) {
+		okButtonText = "OK";
+	}
+	if( !emailButtonText ) {
+		emailButtonText = "E-Mail";
+	}
+	if( !copyButtonText ) {
+		copyButtonText = "Copy";
+	}
+	if( !editAreaText ) {
+		editAreaText =
+			"Note: If you don't see your mouse cursor, try alt-tabbing away, then back again.\r\n\r\n Your name and e-mail address: \r\nSteps to reproduce bug (what were you doing?): \r\n\r\nMake sure to press the e-mail button to submit this bug. Thanks for making Natural Selection better!";
+	}
+	::emailButtonFuncPtr = emailButtonFuncPtr;
+
+	WNDCLASSEX  wc;
+	memset(&wc, 0, sizeof(WNDCLASSEX) );
+	wc.cbSize = sizeof(wc);
+	wc.style = CS_HREDRAW | CS_VREDRAW;
+	wc.hCursor = LoadCursor( NULL, IDC_ARROW );
+	wc.lpfnWndProc = (WNDPROC)assertBoxWndProc;
+	wc.lpszClassName = "AssertBox";
+	wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1);
+	RegisterClassEx(&wc);
+	hAssertBox = CreateWindowEx( 
+		WS_EX_DLGMODALFRAME, "AssertBox", titleText, WS_SIZEBOX,
+		CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, NULL, NULL, NULL, NULL
+	);
+	hTextArea = CreateWindowEx( 
+		WS_EX_STATICEDGE, "STATIC", msg, WS_CHILD,
+		0, 0, 0, 0, hAssertBox, NULL, NULL, NULL
+	);
+	hEditArea = CreateWindowEx( 
+		WS_EX_STATICEDGE, "EDIT", editAreaText, WS_CHILD|ES_MULTILINE|ES_WANTRETURN|ES_AUTOVSCROLL,
+		0, 0, 0, 0, hAssertBox, NULL, NULL, NULL
+	);
+	hOKButton = CreateWindowEx(
+		0, "BUTTON", okButtonText, BS_CENTER | BS_VCENTER | BS_DEFPUSHBUTTON | WS_CHILD,
+		0, 0, 0, 0, hAssertBox, NULL, NULL, NULL
+	);
+	hEmailButton = CreateWindowEx(
+		0, "BUTTON", emailButtonText, BS_CENTER | BS_VCENTER | BS_PUSHBUTTON | WS_CHILD,
+		0, 0, 0, 0, hAssertBox, NULL, NULL, NULL
+	);
+	hCopyButton = CreateWindowEx(
+		0, "BUTTON", copyButtonText, BS_CENTER | BS_VCENTER | BS_PUSHBUTTON | WS_CHILD,
+		0, 0, 0, 0, hAssertBox, NULL, NULL, NULL
+	);
+	if( !emailButtonFuncPtr ) {
+		EnableWindow( hEmailButton, FALSE );
+	}
+	int cx = GetSystemMetrics(SM_CXSCREEN);
+	int cy = GetSystemMetrics(SM_CYSCREEN);
+	MoveWindow ( hAssertBox, (cx-640)/2, (cy-300)/2, 640, 300, TRUE );
+	ShowWindow( hTextArea, SW_SHOW );
+	ShowWindow( hEditArea, SW_SHOW );
+	ShowWindow( hOKButton, SW_SHOW );
+	ShowWindow( hEmailButton, SW_SHOW );
+	ShowWindow( hCopyButton, SW_SHOW );
+	ShowWindow( hAssertBox, SW_SHOW );
+	HFONT hGuiFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT);
+	HFONT hFixFont = (HFONT)GetStockObject(ANSI_FIXED_FONT);
+	SendMessage( hTextArea,    WM_SETFONT, (int)hFixFont, MAKELONG( TRUE, 0 ) );
+	SendMessage( hEditArea,    WM_SETFONT, (int)hGuiFont, MAKELONG( TRUE, 0 ) );
+	SendMessage( hOKButton,    WM_SETFONT, (int)hGuiFont, MAKELONG( TRUE, 0 ) );
+	SendMessage( hEmailButton, WM_SETFONT, (int)hGuiFont, MAKELONG( TRUE, 0 ) );
+	SendMessage( hCopyButton,  WM_SETFONT, (int)hGuiFont, MAKELONG( TRUE, 0 ) );
+	//SetFocus( hEditArea );
+	SendMessage( hEditArea, EM_SETSEL, 0, MAKELONG(1000, -1) );
+
+	//if( emailButtonFuncPtr ) {
+	//	(*emailButtonFuncPtr)(msg);
+	//}
+				
+	return hAssertBox;
+}
+
+extern HWND hRunAssertBox;
+void theExitRunAssertBox(void) 
+{
+	runAssertBox(hRunAssertBox);
+}
+	
+//void runAssertBox( HWND hWnd ) {
+void runAssertBox( void* inWnd ) {
+	HWND hWnd = (HWND)(inWnd);
+	MSG m;
+	while( GetMessage( &m, hWnd, 0, 0) ) {
+		if( m.message == WM_CLOSE ) {
+			return;
+		}
+		TranslateMessage( &m );
+		DispatchMessage( &m );
+	}
+}
+#endif
+
+int emailMsgTo( char *msg, char *emailAddress ) {
+	struct hostent *hostEnt;
+	int ip = 0;
+	sockaddr_in sockAddr;
+	int sockFD;
+	int _send, _recv, _connect;	
+	char *computerName = "";
+	char *emailAt;
+	char *s = (char *)alloca( strlen(msg) + 256 ); // send buffer
+	char r[2048]; // recv buffer
+	
+	#ifdef WIN32
+		WSAData wsaData;
+		int ret = WSAStartup(0x0101, &wsaData);
+		if( ret != 0 ) goto error;
+	#endif
+
+	sockFD = socket( PF_INET, SOCK_STREAM, IPPROTO_TCP );
+	if( sockFD < 0 ) goto error;
+
+	// Parse the emailAddress to get the copmuter name after the '@'
+	emailAt = strchr( emailAddress, '@' );
+	if( emailAt ) {
+		computerName = emailAt+1;
+	}
+
+	ip = inet_addr( computerName );
+	if( ip == INADDR_NONE ) {
+		hostEnt = gethostbyname( computerName );
+		if( hostEnt ) {
+			ip = *(int *)hostEnt->h_addr;
+		}
+	}
+	memset( &sockAddr, 0, sizeof(sockAddr) );
+	sockAddr.sin_family = AF_INET; 
+	sockAddr.sin_port = htons(25);	// 25 = SMTP port
+	sockAddr.sin_addr.s_addr = ip;
+
+	_connect = connect( sockFD, (struct sockaddr *)&sockAddr, sizeof(sockAddr) );
+	if( _connect < 0 ) goto error;
+
+	memset( r, 0, 256 );
+	_recv = recv( sockFD, r, 256, 0 );
+	if( r[0] != '2' ) goto error;
+
+	memset( r, 0, 256 );
+	sprintf( s, "HELO overmind.org\r\n" );
+	_send = send( sockFD, s, strlen(s), 0 );
+	if( _send < 0 ) goto error;
+	_recv = recv( sockFD, r, 256, 0 );
+	if( r[0] != '2' ) goto error;
+
+	memset( r, 0, 256 );
+	sprintf( s, "MAIL FROM: ns-assert@overmind.org\r\n" );
+	_send = send( sockFD, s, strlen(s), 0 );
+	if( _send < 0 ) goto error;
+	_recv = recv( sockFD, r, 256, 0 );
+	if( r[0] != '2' ) goto error;
+
+	memset( r, 0, 256 );
+	sprintf( s, "RCPT TO: %s\r\n", emailAddress );
+	_send = send( sockFD, s, strlen(s), 0 );
+	if( _send < 0 ) goto error;
+	_recv = recv( sockFD, r, 256, 0 );
+	if( r[0] != '2' ) goto error;
+
+	memset( r, 0, 256 );
+	sprintf( s, "DATA\r\n" );
+	_send = send( sockFD, s, strlen(s), 0 );
+	if( _send < 0 ) goto error;
+	_recv = recv( sockFD, r, 256, 0 );
+	if( r[0] != '3' ) goto error;
+
+	memset( r, 0, 256 );
+	sprintf( s, "From ns-assert@overmind.org\r\nSubject: NS Assert\r\n%s\r\n.\r\n", msg );
+	_send = send( sockFD, s, strlen(s), 0 );
+	if( _send < 0 ) goto error;
+	_recv = recv( sockFD, r, 256, 0 );
+	if( r[0] != '2' ) goto error;
+
+	memset( r, 0, 256 );
+	sprintf( s, "QUIT\r\n" );
+	_send = send( sockFD, s, strlen(s), 0 );
+	if( _send < 0 ) goto error;
+	_recv = recv( sockFD, r, 256, 0 );
+	CLOSESOCKET( sockFD );
+	return 1;
+
+	error:
+	CLOSESOCKET( sockFD );
+	return 0;
+}
\ No newline at end of file
diff --git a/main/source/util/Zassert.h b/main/source/util/Zassert.h
new file mode 100644
index 00000000..766fc1b2
--- /dev/null
+++ b/main/source/util/Zassert.h
@@ -0,0 +1,115 @@
+// ZASSERT AND STACKTRACE are an improved assertion system which augments
+// the WIN32 assert.h standard _assert.
+// (c) 1999 Zachary B. Simpson
+// Code may be used and distributed freely as long as all
+// changes are noted appropriately.
+#ifndef ZASSERT_H
+#define ZASSERT_H
+
+#include "assert.h"
+
+extern "C"
+{
+	int getBreakpointOnAssert();
+	void setBreakpointOnAssert(int inValue);
+	void freeFunc(int a, char *string);
+}
+
+#ifdef WIN32
+void *createAssertBox(
+	char *msg, 
+	void (*emailButtonFuncPtr)(char *) = NULL,
+	char *titleText = NULL,
+	char *okButtonText = NULL,
+	char *emailButtonText = NULL,
+	char *copyButtonText = NULL,
+	char *editAreaText = NULL,
+	void *parentBox = NULL
+);
+	// This creates a window which displays the msg "msg".
+	// It creates three buttons:
+	// OK: Closes the box
+	// Email: Emails the message to the email address (if specified)
+	// Copy: Copies the text to the window's clipboard.
+	// Parameters:
+	//   msg:
+	//      message to display.  Likely to be the output of stack trace
+	//      with other information such as version number, etc.
+	//   emailButtonFuncPtr:
+	//      Pointer to func to call when the email button is pressed.
+	//      Passes a pointer to the complete assert string.
+	//   titleText:
+	//      Message to display in on title bar of assert box.  If NULL, prints "Assertion Failed".
+	//      Isolated so that it may be translated easily.
+	//   okButtonText:
+	//      Message to display in "OK" button.  If NULL, prints "OK".
+	//      Isolated so that it may be translated easily.
+	//   emailButtonText:
+	//      Message to display in "email" button.  If NULL, prints "Email".
+	//      Isolated so that it may be translated easily.
+	//   copyButtonText:
+	//      Message to display in "Copy" button.  If NULL, prints "Copy".
+	//      Isolated so that it may be translated easily.
+	//   editAreaText:
+	//      Message didplayerd in the edit area.  If NULL, prints
+	//       "Please enter description of what you were
+	//       doing at the time this assertion occured here."
+	//   parentBox:
+	//      What the parent of this box is.  If null, it is a top level wnd
+	//      Note, thus "void *" is really an HWND.  I do not declare it as such
+	//      to avoid extraneous inclusion of windows.h
+	// Return:
+	//   Returns an HWND to this box.  Should be passed to runAssertBox.
+	//   These two calls are seperated from one another so that the 
+	//   caller may center the assert box or perform other deisred manipulations
+	//   before it is shown.
+
+void theExitRunAssertBox(void);
+
+void runAssertBox( void *hWnd );
+	// Runs a modal message loop on the assert box created by createAssertBox
+	// This is separated so that the programmer may manipulate the assert
+	// window, such as centering it, before it is displayed.
+#endif //WIN32
+
+
+int emailMsgTo( char *msg, char *emailAddress );
+	// A tool which uses SMTP to send a mail message "msg"
+	// to emailAddress.  emailAddress must be an internet
+	// address.
+	// Returns:
+	//   0 if failed
+	//   1 if success
+
+
+
+// Assert.h is defined to call the following function
+// You should implement this function in your application
+// to do the tings you want.  See the LEVEL 2 template code
+// in zassert_template.cpp
+
+// This code is somewhat complicated by the portability issues.
+// WIN32 and POSIX (not surprisingly) seem to difer on the 
+// function declarations for the call from the assert macro.
+// So, the ASSERTFUNC macro defines function in a portable way
+#ifdef WIN32
+	#define ASSERTFUNC _CRTIMP void __cdecl _assert( void *msg, void *file, unsigned line )
+#else
+	#define ASSERTFUNC __dead void __assert __P((const char *msg,const char *file,int line)) 
+#endif
+
+// Now declare the assert function as external
+#ifdef WIN32
+extern ASSERTFUNC;
+#endif
+
+
+// The assert in assert.h is wrapped in a #ifndef _DEBUG
+// block which means that they will not assert in non-debug 
+// builds.  Unfortunatly, this is not always the desired behavior.
+// Thus, the following macro "aasert" is NOT in such a wrapper and will
+// thus *always* assert in any build.
+
+#define aassert(exp) (void)( (exp) || (_assert(#exp, __FILE__, __LINE__), 0) )
+
+#endif
diff --git a/main/source/util/ZassertTemplate.cpp b/main/source/util/ZassertTemplate.cpp
new file mode 100644
index 00000000..9b69a00d
--- /dev/null
+++ b/main/source/util/ZassertTemplate.cpp
@@ -0,0 +1,195 @@
+// ZASSERT AND STACKTRACE are an improved assertion system which augments
+// the WIN32 assert.h standard _assert.
+// (c) 1999 Zachary B. Simpson
+// Code may be used and distributed freely as long as all
+// changes are noted appropriately.
+//
+// This is a simple program which test the ZASSERT
+// and STACKTRACE funtctions with some arbitrary calls.
+// 
+// This supplies LEVEL 2 "Template" Code for implementing
+// the assert and emailToBugDatabase functions
+
+#ifdef WIN32
+	#include "windows.h"
+		// Only needed for message box
+	#include "winbase.h"
+	#include <process.h>
+#endif
+#include "stdio.h"
+#include "stacktrace.h"
+#include "zassert.h"
+
+// LEVEL 2 CODE
+// The following is template code which can be cut, pasted, 
+// and modified appropriately for your application.
+//-------------------------------------------------------------------
+
+HWND hRunAssertBox;
+
+int breakpointOnAssert = 0;
+	// If this flag is set and it is a debug build then
+	// it will issue an int 3 causing a breakpoint in the
+	// debugger.  This is very handy for ensuring that
+	// the programmer can exmaine memory, etc.
+	// default is 0.
+
+int getBreakpointOnAssert()
+{
+	return breakpointOnAssert;
+}
+
+void setBreakpointOnAssert(int inValue)
+{
+	breakpointOnAssert = inValue;
+}
+
+// The following is a template for the function
+// which gets called by the runAssertBox
+// in the case that the user hits the "email" button
+// This is LEVEL 2 "Template" Code
+#ifdef WIN32
+void emailToBugDatabase( char *msg ) {
+	int success = emailMsgTo( msg, "bugs@overmind.org" );
+		// Note that you MUST specify the full name of the computer
+		// since emailMsgTo does NOT use the MX record.  In other
+		// words, you can't specify "zsimpson@eden.com"
+	if( !success ) {
+		MessageBox(
+			NULL,
+			"Email to bug database failed.\r\n"
+			"Please \"Copy\" the message and send it to the appropriate database.",
+			"E-Mail Failed", 
+			MB_APPLMODAL|MB_ICONEXCLAMATION
+		);
+	}
+}
+#endif
+
+// This is LEVEL 2 "Template" Code
+// The following is a template for the function
+// which ultimately gets called by the assert macros
+// NOTE the use of the ASSERTFUNC macro which makes this PORTABLE
+// The declaration is:
+//   void _assert( void *msg, void *file, unsigned line )
+ASSERTFUNC {
+	// Just in case, prevent recursion
+	static int recurse = 0;
+	if( recurse ) {
+		// Under GNU C you may get a warning concerning this
+		// return since ASSERTFUNC is declared noreturn.
+		// Ignore the warning.
+		return;
+	}
+	recurse = 1;
+
+	// Run a stack trace, skip the assert call (passing 1)
+	char *stackMsg = stackTrace(1);
+
+	// Setup and application specific information
+	// You should put all code that you want to add to the
+	// assert message here.  For example, you might want
+	// to include:
+	//  * version numbers
+	//  * computer name
+	//  * user name
+	//  * date, time, etc.
+	//  * relevant state information (direct draw, CD/HD, etc)
+	//  * debug staus, heap check, etc.
+	char *appMsg = "ASSERT TEST VERSION 1.0";
+
+	// 
+	char buffer[4096]={0,};
+	strcpy( buffer, "The system has failed an assertion:\r\nAssert: \"" );
+	strcpy( buffer+strlen(buffer), (char *)msg );
+	sprintf( buffer+strlen(buffer), "\"  @ %s:%d\r\n", file, line );
+	if( appMsg && *appMsg ) {
+		sprintf( buffer+strlen(buffer), "%s\r\n", appMsg );
+	}
+	sprintf( buffer+strlen(buffer), "%s\r\n", stackMsg );
+
+	// Trace the assert out to a file just for good measure.
+	FILE *f = fopen( "assert.txt", "w+b" );
+	if( f ) {
+		fprintf( f, buffer );
+		fclose( f );
+	}
+
+	// Trace the assert to STDOUT.  Especially important
+	// for UNIX since this is the only message you'll see.
+	printf( buffer );
+
+	// breakpointOnAssert is true this will force a debugger
+	// to stop.  Ideally, it would be possible to determine
+	// if we are currently running in a debugger so that this
+	// flag would not be necessary, but I have been unable
+	// to figure out how to do this.
+	//   If you hit this breakpoint and you want to keep
+	// running, don't forget that you can simply skip over the
+	// exit call by changing the debugger change EIP command.
+	#ifdef _DEBUG
+		//#if (_WIN32_WINNT >= 0x0400) || (_WIN32_WINDOWS > 0x0400)
+
+		#ifdef WIN32
+			if( breakpointOnAssert )
+		  	//if(IsDebuggerPresent())
+		  	{
+				__asm int 3;
+		  	}
+		#endif
+		//#endif
+	#endif
+
+	// Create the assert box.  Note that a real implementation
+	// should translate all of the stock messages.
+	#ifdef WIN32
+		hRunAssertBox = (HWND)createAssertBox( buffer, emailToBugDatabase );
+		//unsigned long theRC = _beginthread(runAssertBox, 0, hAssertBox);
+		//runAssertBox( hAssertBox );
+		int theRC = atexit(theExitRunAssertBox);
+		//ASSERT(theRC == 0);
+	#else
+		// Under UNIX, send the email immediately.
+		emailMsgTo( buffer, "bugs@overmind.org" );
+	#endif
+
+	// And finally, shut down.
+	exit(1);
+}
+
+
+
+
+//---------------------------------------------------------------------
+// The following code is all testing code for
+// REGRESSION PURPOSES.
+// DO NOT COPY into your application
+
+void freeFunc( int a, char *string ) {
+	assert( 0 == 1 );	
+		// assert now, we should get a stack trace
+		// indicting freeFunc( 0xDEADBEEF, PTR() )
+		// and a hex dump of the pointer
+}
+
+//struct Boink {
+//	int a;
+//	int b;
+//	
+//	void method1( int _a, int _b ) {
+//		method2( _a+1, _b, "This is a test" );
+//	}
+//	void method2( int _a, int _b, char *msg ) {
+//		freeFunc( 0xDEADBEEF, msg );
+//	}
+//};
+//
+//void main( int argc, char **argv ) {
+//	// Setup breakpoint to make debugging easier when in debugger
+//	breakpointOnAssert = 1;
+//
+//	// Call method which is assert...
+//	Boink b;
+//	b.method1(10,20);
+//}
+
diff --git a/main/source/util/nowarnings.h b/main/source/util/nowarnings.h
new file mode 100644
index 00000000..da900fa3
--- /dev/null
+++ b/main/source/util/nowarnings.h
@@ -0,0 +1,68 @@
+#ifndef NS_NOWARNINGS_H
+#define NS_NOWARNINGS_H
+
+//
+// Syntax help:
+//
+//#pragma warning( warning-specifier : warning-number-list [,warning-specifier : warning-number-list...] )
+//
+//#pragma warning( push[ , n ] )
+//
+//#pragma warning( pop )
+//
+//Allows selective modification of the behavior of compiler warning messages.
+//
+//The warning-specifier can be one of the following.
+//
+//Warning-specifier Meaning 
+//once Display the specified message(s) only once. 
+//default Apply the default compiler behavior to the specified message(s). 
+//1, 2, 3, 4 Apply the given warning level to the specified warning message(s). 
+//disable Do not issue the specified warning message(s). 
+//error Report the specified warnings as errors. 
+//
+//
+//The warning-number-list can contain any warning numbers. Multiple options can be specified in the same pragma directive as follows:
+//
+//#pragma warning( disable : 4507 34; once : 4385; error : 164 )
+//
+//This is functionally equivalent to:
+//
+//#pragma warning( disable : 4507 34 )  // Disable warning messages
+////  4507 and 34.
+//#pragma warning( once : 4385 )        // Issue warning 4385
+////  only once.
+//#pragma warning( error : 164 )        // Report warning 164
+////  as an error.
+
+#pragma warning (disable: 4786)
+#pragma warning (disable: 4530)
+#pragma warning (disable: 4800)
+
+// Signed/float conversions.  Disabled by default in MSVC 7?
+#pragma warning (disable: 4018)
+#pragma warning (disable: 4244)
+
+// Use before initialization
+#pragma warning (disable: 4701)
+
+// This quiets the "C++ exception handler used but unwind semantics not enabled"
+// I'm not throwing any exceptions, nor am I catching any. Remove this if it causes problems!  
+#pragma warning (disable: 4530)
+
+// Assignment in conditional (is this really classified as level 4?)
+#pragma warning (error: 4706)
+
+// Statement has no effect
+#pragma warning (error: 4705)
+
+// Comma in array index expression
+#pragma warning (error: 4709)
+
+// Non-portable char initializization
+#pragma warning (error: 4208)
+
+// Benign typedef redefinition
+#pragma warning (error: 4209)
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/common/bspfile.c b/main/source/utils/common/bspfile.c
new file mode 100644
index 00000000..f5a6524a
--- /dev/null
+++ b/main/source/utils/common/bspfile.c
@@ -0,0 +1,709 @@
+/***
+*
+*	Copyright (c) 1998, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+****/
+
+#include "cmdlib.h"
+#include "mathlib.h"
+#include "bspfile.h"
+#include "scriplib.h"
+
+//=============================================================================
+
+int			nummodels;
+dmodel_t	dmodels[MAX_MAP_MODELS];
+int			dmodels_checksum;
+
+int			visdatasize;
+byte		dvisdata[MAX_MAP_VISIBILITY];
+int			dvisdata_checksum;
+
+int			lightdatasize;
+byte		dlightdata[MAX_MAP_LIGHTING];
+int			dlightdata_checksum;
+
+int			texdatasize;
+byte		dtexdata[MAX_MAP_MIPTEX]; // (dmiptexlump_t)
+int			dtexdata_checksum;
+
+int			entdatasize;
+char		dentdata[MAX_MAP_ENTSTRING];
+int			dentdata_checksum;
+
+int			numleafs;
+dleaf_t		dleafs[MAX_MAP_LEAFS];
+int			dleafs_checksum;
+
+int			numplanes;
+dplane_t	dplanes[MAX_MAP_PLANES];
+int			dplanes_checksum;
+
+int			numvertexes;
+dvertex_t	dvertexes[MAX_MAP_VERTS];
+int			dvertexes_checksum;
+
+int			numnodes;
+dnode_t		dnodes[MAX_MAP_NODES];
+int			dnodes_checksum;
+
+int			numtexinfo;
+texinfo_t	texinfo[MAX_MAP_TEXINFO];
+int			texinfo_checksum;
+
+int			numfaces;
+dface_t		dfaces[MAX_MAP_FACES];
+int			dfaces_checksum;
+
+int			numclipnodes;
+dclipnode_t	dclipnodes[MAX_MAP_CLIPNODES];
+int			dclipnodes_checksum;
+
+int			numedges;
+dedge_t		dedges[MAX_MAP_EDGES];
+int			dedges_checksum;
+
+int			nummarksurfaces;
+unsigned short		dmarksurfaces[MAX_MAP_MARKSURFACES];
+int			dmarksurfaces_checksum;
+
+int			numsurfedges;
+int			dsurfedges[MAX_MAP_SURFEDGES];
+int			dsurfedges_checksum;
+
+int			num_entities;
+entity_t	entities[MAX_MAP_ENTITIES];
+
+/*
+===============
+FastChecksum
+===============
+*/
+
+int FastChecksum(void *buffer, int bytes)
+{
+	int	checksum = 0;
+
+	while( bytes-- )  
+		checksum = _rotl(checksum, 4) ^ *((char *)buffer)++;
+
+	return checksum;
+}
+
+/*
+===============
+CompressVis
+===============
+*/
+int CompressVis (byte *vis, byte *dest)
+{
+	int		j;
+	int		rep;
+	int		visrow;
+	byte	*dest_p;
+	
+	dest_p = dest;
+	visrow = (numleafs + 7)>>3;
+	
+	for (j=0 ; j<visrow ; j++)
+	{
+		*dest_p++ = vis[j];
+		if (vis[j])
+			continue;
+
+		rep = 1;
+		for ( j++; j<visrow ; j++)
+			if (vis[j] || rep == 255)
+				break;
+			else
+				rep++;
+		*dest_p++ = rep;
+		j--;
+	}
+	
+	return dest_p - dest;
+}
+
+
+/*
+===================
+DecompressVis
+===================
+*/
+void DecompressVis (byte *in, byte *decompressed)
+{
+	int		c;
+	byte	*out;
+	int		row;
+
+	row = (numleafs+7)>>3;	
+	out = decompressed;
+
+	do
+	{
+		if (*in)
+		{
+			*out++ = *in++;
+			continue;
+		}
+	
+		c = in[1];
+		in += 2;
+		while (c)
+		{
+			*out++ = 0;
+			c--;
+		}
+	} while (out - decompressed < row);
+}
+
+//=============================================================================
+
+/*
+=============
+SwapBSPFile
+
+Byte swaps all data in a bsp file.
+=============
+*/
+void SwapBSPFile (qboolean todisk)
+{
+	int				i, j, c;
+	dmodel_t		*d;
+	dmiptexlump_t	*mtl;
+
+	
+// models	
+	for (i=0 ; i<nummodels ; i++)
+	{
+		d = &dmodels[i];
+
+		for (j=0 ; j<MAX_MAP_HULLS ; j++)
+			d->headnode[j] = LittleLong (d->headnode[j]);
+
+		d->visleafs = LittleLong (d->visleafs);
+		d->firstface = LittleLong (d->firstface);
+		d->numfaces = LittleLong (d->numfaces);
+		
+		for (j=0 ; j<3 ; j++)
+		{
+			d->mins[j] = LittleFloat(d->mins[j]);
+			d->maxs[j] = LittleFloat(d->maxs[j]);
+			d->origin[j] = LittleFloat(d->origin[j]);
+		}
+	}
+
+//
+// vertexes
+//
+	for (i=0 ; i<numvertexes ; i++)
+	{
+		for (j=0 ; j<3 ; j++)
+			dvertexes[i].point[j] = LittleFloat (dvertexes[i].point[j]);
+	}
+		
+//
+// planes
+//	
+	for (i=0 ; i<numplanes ; i++)
+	{
+		for (j=0 ; j<3 ; j++)
+			dplanes[i].normal[j] = LittleFloat (dplanes[i].normal[j]);
+		dplanes[i].dist = LittleFloat (dplanes[i].dist);
+		dplanes[i].type = LittleLong (dplanes[i].type);
+	}
+	
+//
+// texinfos
+//	
+	for (i=0 ; i<numtexinfo ; i++)
+	{
+		for (j=0 ; j<8 ; j++)
+			texinfo[i].vecs[0][j] = LittleFloat (texinfo[i].vecs[0][j]);
+		texinfo[i].miptex = LittleLong (texinfo[i].miptex);
+		texinfo[i].flags = LittleLong (texinfo[i].flags);
+	}
+	
+//
+// faces
+//
+	for (i=0 ; i<numfaces ; i++)
+	{
+		dfaces[i].texinfo = LittleShort (dfaces[i].texinfo);
+		dfaces[i].planenum = LittleShort (dfaces[i].planenum);
+		dfaces[i].side = LittleShort (dfaces[i].side);
+		dfaces[i].lightofs = LittleLong (dfaces[i].lightofs);
+		dfaces[i].firstedge = LittleLong (dfaces[i].firstedge);
+		dfaces[i].numedges = LittleShort (dfaces[i].numedges);
+	}
+
+//
+// nodes
+//
+	for (i=0 ; i<numnodes ; i++)
+	{
+		dnodes[i].planenum = LittleLong (dnodes[i].planenum);
+		for (j=0 ; j<3 ; j++)
+		{
+			dnodes[i].mins[j] = LittleShort (dnodes[i].mins[j]);
+			dnodes[i].maxs[j] = LittleShort (dnodes[i].maxs[j]);
+		}
+		dnodes[i].children[0] = LittleShort (dnodes[i].children[0]);
+		dnodes[i].children[1] = LittleShort (dnodes[i].children[1]);
+		dnodes[i].firstface = LittleShort (dnodes[i].firstface);
+		dnodes[i].numfaces = LittleShort (dnodes[i].numfaces);
+	}
+
+//
+// leafs
+//
+	for (i=0 ; i<numleafs ; i++)
+	{
+		dleafs[i].contents = LittleLong (dleafs[i].contents);
+		for (j=0 ; j<3 ; j++)
+		{
+			dleafs[i].mins[j] = LittleShort (dleafs[i].mins[j]);
+			dleafs[i].maxs[j] = LittleShort (dleafs[i].maxs[j]);
+		}
+
+		dleafs[i].firstmarksurface = LittleShort (dleafs[i].firstmarksurface);
+		dleafs[i].nummarksurfaces = LittleShort (dleafs[i].nummarksurfaces);
+		dleafs[i].visofs = LittleLong (dleafs[i].visofs);
+	}
+
+//
+// clipnodes
+//
+	for (i=0 ; i<numclipnodes ; i++)
+	{
+		dclipnodes[i].planenum = LittleLong (dclipnodes[i].planenum);
+		dclipnodes[i].children[0] = LittleShort (dclipnodes[i].children[0]);
+		dclipnodes[i].children[1] = LittleShort (dclipnodes[i].children[1]);
+	}
+
+//
+// miptex
+//
+	if (texdatasize)
+	{
+		mtl = (dmiptexlump_t *)dtexdata;
+		if (todisk)
+			c = mtl->nummiptex;
+		else
+			c = LittleLong(mtl->nummiptex);
+		mtl->nummiptex = LittleLong (mtl->nummiptex);
+		for (i=0 ; i<c ; i++)
+			mtl->dataofs[i] = LittleLong(mtl->dataofs[i]);
+	}
+	
+//
+// marksurfaces
+//
+	for (i=0 ; i<nummarksurfaces ; i++)
+		dmarksurfaces[i] = LittleShort (dmarksurfaces[i]);
+
+//
+// surfedges
+//
+	for (i=0 ; i<numsurfedges ; i++)
+		dsurfedges[i] = LittleLong (dsurfedges[i]);
+
+//
+// edges
+//
+	for (i=0 ; i<numedges ; i++)
+	{
+		dedges[i].v[0] = LittleShort (dedges[i].v[0]);
+		dedges[i].v[1] = LittleShort (dedges[i].v[1]);
+	}
+}
+
+
+dheader_t	*header;
+
+int CopyLump (int lump, void *dest, int size)
+{
+	int		length, ofs;
+
+	length = header->lumps[lump].filelen;
+	ofs = header->lumps[lump].fileofs;
+	
+	if (length % size)
+		Error ("LoadBSPFile: odd lump size");
+	
+	memcpy (dest, (byte *)header + ofs, length);
+
+	return length / size;
+}
+
+/*
+=============
+LoadBSPFile
+=============
+*/
+void	LoadBSPFile (char *filename)
+{
+	int			i;
+	
+//
+// load the file header
+//
+	LoadFile (filename, (void **)&header);
+
+// swap the header
+	for (i=0 ; i< sizeof(dheader_t)/4 ; i++)
+		((int *)header)[i] = LittleLong ( ((int *)header)[i]);
+
+	if (header->version != BSPVERSION)
+		Error ("%s is version %i, not %i", filename, header->version, BSPVERSION);
+
+	nummodels = CopyLump (LUMP_MODELS, dmodels, sizeof(dmodel_t));
+	numvertexes = CopyLump (LUMP_VERTEXES, dvertexes, sizeof(dvertex_t));
+	numplanes = CopyLump (LUMP_PLANES, dplanes, sizeof(dplane_t));
+	numleafs = CopyLump (LUMP_LEAFS, dleafs, sizeof(dleaf_t));
+	numnodes = CopyLump (LUMP_NODES, dnodes, sizeof(dnode_t));
+	numtexinfo = CopyLump (LUMP_TEXINFO, texinfo, sizeof(texinfo_t));
+	numclipnodes = CopyLump (LUMP_CLIPNODES, dclipnodes, sizeof(dclipnode_t));
+	numfaces = CopyLump (LUMP_FACES, dfaces, sizeof(dface_t));
+	nummarksurfaces = CopyLump (LUMP_MARKSURFACES, dmarksurfaces, sizeof(dmarksurfaces[0]));
+	numsurfedges = CopyLump (LUMP_SURFEDGES, dsurfedges, sizeof(dsurfedges[0]));
+	numedges = CopyLump (LUMP_EDGES, dedges, sizeof(dedge_t));
+
+	texdatasize = CopyLump (LUMP_TEXTURES, dtexdata, 1);
+	visdatasize = CopyLump (LUMP_VISIBILITY, dvisdata, 1);
+	lightdatasize = CopyLump (LUMP_LIGHTING, dlightdata, 1);
+	entdatasize = CopyLump (LUMP_ENTITIES, dentdata, 1);
+
+	free (header);		// everything has been copied out
+		
+//
+// swap everything
+//	
+	SwapBSPFile (false);
+
+	dmodels_checksum = FastChecksum( dmodels, nummodels*sizeof(dmodels[0]) );
+    dvertexes_checksum = FastChecksum( dvertexes, numvertexes*sizeof(dvertexes[0]) );
+	dplanes_checksum = FastChecksum( dplanes, numplanes*sizeof(dplanes[0]) );
+	dleafs_checksum = FastChecksum( dleafs, numleafs*sizeof(dleafs[0]) );
+	dnodes_checksum = FastChecksum( dnodes, numnodes*sizeof(dnodes[0]) );
+	texinfo_checksum = FastChecksum( texinfo, numtexinfo*sizeof(texinfo[0]) );
+	dclipnodes_checksum = FastChecksum( dclipnodes, numclipnodes*sizeof(dclipnodes[0]) );
+	dfaces_checksum = FastChecksum( dfaces, numfaces*sizeof(dfaces[0]) );
+	dmarksurfaces_checksum = FastChecksum( dmarksurfaces, nummarksurfaces*sizeof(dmarksurfaces[0]) );
+	dsurfedges_checksum = FastChecksum( dsurfedges, numsurfedges*sizeof(dsurfedges[0]) );
+	dedges_checksum = FastChecksum( dedges, numedges*sizeof(dedges[0]) );
+	dtexdata_checksum = FastChecksum( dtexdata, numedges*sizeof(dtexdata[0]) );
+	dvisdata_checksum = FastChecksum( dvisdata, visdatasize*sizeof(dvisdata[0]) );
+	dlightdata_checksum = FastChecksum( dlightdata, lightdatasize*sizeof(dlightdata[0]) );
+	dentdata_checksum = FastChecksum( dentdata, entdatasize*sizeof(dentdata[0]) );
+
+}
+
+//============================================================================
+
+FILE		*wadfile;
+dheader_t	outheader;
+
+void AddLump (int lumpnum, void *data, int len)
+{
+	lump_t *lump;
+
+	lump = &header->lumps[lumpnum];
+	
+	lump->fileofs = LittleLong( ftell(wadfile) );
+	lump->filelen = LittleLong(len);
+	SafeWrite (wadfile, data, (len+3)&~3);
+}
+
+/*
+=============
+WriteBSPFile
+
+Swaps the bsp file in place, so it should not be referenced again
+=============
+*/
+void	WriteBSPFile (char *filename)
+{		
+	header = &outheader;
+	memset (header, 0, sizeof(dheader_t));
+	
+	SwapBSPFile (true);
+
+	header->version = LittleLong (BSPVERSION);
+	
+	wadfile = SafeOpenWrite (filename);
+	SafeWrite (wadfile, header, sizeof(dheader_t));	// overwritten later
+
+	AddLump (LUMP_PLANES, dplanes, numplanes*sizeof(dplane_t));
+	AddLump (LUMP_LEAFS, dleafs, numleafs*sizeof(dleaf_t));
+	AddLump (LUMP_VERTEXES, dvertexes, numvertexes*sizeof(dvertex_t));
+	AddLump (LUMP_NODES, dnodes, numnodes*sizeof(dnode_t));
+	AddLump (LUMP_TEXINFO, texinfo, numtexinfo*sizeof(texinfo_t));
+	AddLump (LUMP_FACES, dfaces, numfaces*sizeof(dface_t));
+	AddLump (LUMP_CLIPNODES, dclipnodes, numclipnodes*sizeof(dclipnode_t));
+	AddLump (LUMP_MARKSURFACES, dmarksurfaces, nummarksurfaces*sizeof(dmarksurfaces[0]));
+	AddLump (LUMP_SURFEDGES, dsurfedges, numsurfedges*sizeof(dsurfedges[0]));
+	AddLump (LUMP_EDGES, dedges, numedges*sizeof(dedge_t));
+	AddLump (LUMP_MODELS, dmodels, nummodels*sizeof(dmodel_t));
+
+	AddLump (LUMP_LIGHTING, dlightdata, lightdatasize);
+	AddLump (LUMP_VISIBILITY, dvisdata, visdatasize);
+	AddLump (LUMP_ENTITIES, dentdata, entdatasize);
+	AddLump (LUMP_TEXTURES, dtexdata, texdatasize);
+	
+	fseek (wadfile, 0, SEEK_SET);
+	SafeWrite (wadfile, header, sizeof(dheader_t));
+	fclose (wadfile);	
+}
+
+//============================================================================
+
+#define ENTRIES(a)		(sizeof(a)/sizeof(*(a)))
+#define ENTRYSIZE(a)	(sizeof(*(a)))
+
+ArrayUsage( char *szItem, int items, int maxitems, int itemsize )
+{
+	float	percentage = maxitems ? items * 100.0 / maxitems : 0.0;
+
+    printf("%-12s  %7i/%-7i  %7i/%-7i  (%4.1f%%)", 
+		   szItem, items, maxitems, items * itemsize, maxitems * itemsize, percentage );
+	if ( percentage > 80.0 )
+		printf( "VERY FULL!\n" );
+	else if ( percentage > 95.0 )
+		printf( "SIZE DANGER!\n" );
+	else if ( percentage > 99.9 )
+		printf( "SIZE OVERFLOW!!!\n" );
+	else
+		printf( "\n" );
+	return items * itemsize;
+}
+
+GlobUsage( char *szItem, int itemstorage, int maxstorage )
+{
+	float	percentage = maxstorage ? itemstorage * 100.0 / maxstorage : 0.0;
+    printf("%-12s     [variable]    %7i/%-7i  (%4.1f%%)", 
+		   szItem, itemstorage, maxstorage, percentage );
+	if ( percentage > 80.0 )
+		printf( "VERY FULL!\n" );
+	else if ( percentage > 95.0 )
+		printf( "SIZE DANGER!\n" );
+	else if ( percentage > 99.9 )
+		printf( "SIZE OVERFLOW!!!\n" );
+	else
+		printf( "\n" );
+	return itemstorage;
+}
+
+/*
+=============
+PrintBSPFileSizes
+
+Dumps info about current file
+=============
+*/
+void PrintBSPFileSizes (void)
+{
+	int	numtextures = texdatasize ? ((dmiptexlump_t*)dtexdata)->nummiptex : 0;
+	int	totalmemory = 0;
+
+	printf("\n");
+	printf("Object names  Objects/Maxobjs  Memory / Maxmem  Fullness\n" );
+	printf("------------  ---------------  ---------------  --------\n" );
+
+	totalmemory += ArrayUsage( "models",		nummodels,		ENTRIES(dmodels),		ENTRYSIZE(dmodels) );
+	totalmemory += ArrayUsage( "planes",		numplanes,		ENTRIES(dplanes),		ENTRYSIZE(dplanes) );
+	totalmemory += ArrayUsage( "vertexes",		numvertexes,	ENTRIES(dvertexes),		ENTRYSIZE(dvertexes) );
+	totalmemory += ArrayUsage( "nodes",			numnodes,		ENTRIES(dnodes),		ENTRYSIZE(dnodes) );
+	totalmemory += ArrayUsage( "texinfos",		numtexinfo,		ENTRIES(texinfo),		ENTRYSIZE(texinfo) );
+	totalmemory += ArrayUsage( "faces",			numfaces,		ENTRIES(dfaces),		ENTRYSIZE(dfaces) );
+	totalmemory += ArrayUsage( "clipnodes",		numclipnodes,	ENTRIES(dclipnodes),	ENTRYSIZE(dclipnodes) );
+	totalmemory += ArrayUsage( "leaves",		numleafs,		ENTRIES(dleafs),		ENTRYSIZE(dleafs) );
+	totalmemory += ArrayUsage( "marksurfaces",	nummarksurfaces,ENTRIES(dmarksurfaces),	ENTRYSIZE(dmarksurfaces) );
+	totalmemory += ArrayUsage( "surfedges",		numsurfedges,	ENTRIES(dsurfedges),	ENTRYSIZE(dsurfedges) );
+	totalmemory += ArrayUsage( "edges",			numedges,		ENTRIES(dedges),		ENTRYSIZE(dedges) );
+
+	totalmemory += GlobUsage( "texdata",		texdatasize,	sizeof(dtexdata) );
+	totalmemory += GlobUsage( "lightdata",		lightdatasize,	sizeof(dlightdata) );
+	totalmemory += GlobUsage( "visdata",		visdatasize,	sizeof(dvisdata) );
+	totalmemory += GlobUsage( "entdata",		entdatasize,	sizeof(dentdata) );
+
+	printf( "=== Total BSP file data space used: %d bytes ===\n", totalmemory );
+}
+
+
+/*
+=================
+ParseEpair
+=================
+*/
+epair_t *ParseEpair (void)
+{
+	epair_t	*e;
+	
+	e = malloc (sizeof(epair_t));
+	memset (e, 0, sizeof(epair_t));
+	
+	if (strlen(token) >= MAX_KEY-1)
+		Error ("ParseEpar: token too long");
+	e->key = copystring(token);
+	GetToken (false);
+	if (strlen(token) >= MAX_VALUE-1)
+		Error ("ParseEpar: token too long");
+	e->value = copystring(token);
+
+	return e;
+}
+
+
+/*
+================
+ParseEntity
+================
+*/
+qboolean	ParseEntity (void)
+{
+	epair_t		*e;
+	entity_t	*mapent;
+
+	if (!GetToken (true))
+		return false;
+
+	if (strcmp (token, "{") )
+		Error ("ParseEntity: { not found");
+	
+	if (num_entities == MAX_MAP_ENTITIES)
+		Error ("num_entities == MAX_MAP_ENTITIES");
+
+	mapent = &entities[num_entities];
+	num_entities++;
+
+	do
+	{
+		if (!GetToken (true))
+			Error ("ParseEntity: EOF without closing brace");
+		if (!strcmp (token, "}") )
+			break;
+		e = ParseEpair ();
+		e->next = mapent->epairs;
+		mapent->epairs = e;
+	} while (1);
+	
+	return true;
+}
+
+/*
+================
+ParseEntities
+
+Parses the dentdata string into entities
+================
+*/
+void ParseEntities (void)
+{
+	num_entities = 0;
+	ParseFromMemory (dentdata, entdatasize);
+
+	while (ParseEntity ())
+	{
+	}	
+}
+
+
+/*
+================
+UnparseEntities
+
+Generates the dentdata string from all the entities
+================
+*/
+void UnparseEntities (void)
+{
+	char	*buf, *end;
+	epair_t	*ep;
+	char	line[2048];
+	int		i;
+	
+	buf = dentdata;
+	end = buf;
+	*end = 0;
+	
+	for (i=0 ; i<num_entities ; i++)
+	{
+		ep = entities[i].epairs;
+		if (!ep)
+			continue;	// ent got removed
+		
+		strcat (end,"{\n");
+		end += 2;
+				
+		for (ep = entities[i].epairs ; ep ; ep=ep->next)
+		{
+			sprintf (line, "\"%s\" \"%s\"\n", ep->key, ep->value);
+			strcat (end, line);
+			end += strlen(line);
+		}
+		strcat (end,"}\n");
+		end += 2;
+
+		if (end > buf + MAX_MAP_ENTSTRING)
+			Error ("Entity text too long");
+	}
+	entdatasize = end - buf + 1;
+}
+
+
+
+void 	SetKeyValue (entity_t *ent, char *key, char *value)
+{
+	epair_t	*ep;
+	
+	for (ep=ent->epairs ; ep ; ep=ep->next)
+		if (!strcmp (ep->key, key) )
+		{
+			free (ep->value);
+			ep->value = copystring(value);
+			return;
+		}
+	ep = malloc (sizeof(*ep));
+	ep->next = ent->epairs;
+	ent->epairs = ep;
+	ep->key = copystring(key);
+	ep->value = copystring(value);
+}
+
+char 	*ValueForKey (entity_t *ent, char *key)
+{
+	epair_t	*ep;
+	
+	for (ep=ent->epairs ; ep ; ep=ep->next)
+		if (!strcmp (ep->key, key) )
+			return ep->value;
+	return "";
+}
+
+vec_t	FloatForKey (entity_t *ent, char *key)
+{
+	char	*k;
+	
+	k = ValueForKey (ent, key);
+	return atof(k);
+}
+
+void 	GetVectorForKey (entity_t *ent, char *key, vec3_t vec)
+{
+	char	*k;
+	double	v1, v2, v3;
+
+	k = ValueForKey (ent, key);
+// scanf into doubles, then assign, so it is vec_t size independent
+	v1 = v2 = v3 = 0;
+	sscanf (k, "%lf %lf %lf", &v1, &v2, &v3);
+	vec[0] = v1;
+	vec[1] = v2;
+	vec[2] = v3;
+}
+
diff --git a/main/source/utils/common/bspfile.h b/main/source/utils/common/bspfile.h
new file mode 100644
index 00000000..1ad6aeb5
--- /dev/null
+++ b/main/source/utils/common/bspfile.h
@@ -0,0 +1,334 @@
+/***
+*
+*	Copyright (c) 1998, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+****/
+
+
+// upper design bounds
+
+#define	MAX_MAP_HULLS		4
+
+#define	MAX_MAP_MODELS		400
+#define	MAX_MAP_BRUSHES		4096
+#define	MAX_MAP_ENTITIES	1024
+#define	MAX_MAP_ENTSTRING	(128*1024)
+
+#define	MAX_MAP_PLANES		32767
+#define	MAX_MAP_NODES		32767		// because negative shorts are contents
+#define	MAX_MAP_CLIPNODES	32767		//
+#define	MAX_MAP_LEAFS		8192
+#define	MAX_MAP_VERTS		65535
+#define	MAX_MAP_FACES		65535
+#define	MAX_MAP_MARKSURFACES 65535
+#define	MAX_MAP_TEXINFO		8192
+#define	MAX_MAP_EDGES		256000
+#define	MAX_MAP_SURFEDGES	512000
+#define	MAX_MAP_TEXTURES	512
+#define	MAX_MAP_MIPTEX		0x200000
+#define	MAX_MAP_LIGHTING	0x200000
+#define	MAX_MAP_VISIBILITY	0x200000
+
+#define	MAX_MAP_PORTALS		65536
+
+// key / value pair sizes
+
+#define	MAX_KEY		32
+#define	MAX_VALUE	1024
+
+//=============================================================================
+
+
+#define BSPVERSION	30
+#define	TOOLVERSION	2
+
+
+typedef struct
+{
+	int		fileofs, filelen;
+} lump_t;
+
+#define	LUMP_ENTITIES	0
+#define	LUMP_PLANES		1
+#define	LUMP_TEXTURES	2
+#define	LUMP_VERTEXES	3
+#define	LUMP_VISIBILITY	4
+#define	LUMP_NODES		5
+#define	LUMP_TEXINFO	6
+#define	LUMP_FACES		7
+#define	LUMP_LIGHTING	8
+#define	LUMP_CLIPNODES	9
+#define	LUMP_LEAFS		10
+#define	LUMP_MARKSURFACES 11
+#define	LUMP_EDGES		12
+#define	LUMP_SURFEDGES	13
+#define	LUMP_MODELS		14
+
+#define	HEADER_LUMPS	15
+
+typedef struct
+{
+	float		mins[3], maxs[3];
+	float		origin[3];
+	int			headnode[MAX_MAP_HULLS];
+	int			visleafs;		// not including the solid leaf 0
+	int			firstface, numfaces;
+} dmodel_t;
+
+typedef struct
+{
+	int			version;	
+	lump_t		lumps[HEADER_LUMPS];
+} dheader_t;
+
+typedef struct
+{
+	int			nummiptex;
+	int			dataofs[4];		// [nummiptex]
+} dmiptexlump_t;
+
+#define	MIPLEVELS	4
+typedef struct miptex_s
+{
+	char		name[16];
+	unsigned	width, height;
+	unsigned	offsets[MIPLEVELS];		// four mip maps stored
+} miptex_t;
+
+
+typedef struct
+{
+	float	point[3];
+} dvertex_t;
+
+
+// 0-2 are axial planes
+#define	PLANE_X			0
+#define	PLANE_Y			1
+#define	PLANE_Z			2
+
+// 3-5 are non-axial planes snapped to the nearest
+#define	PLANE_ANYX		3
+#define	PLANE_ANYY		4
+#define	PLANE_ANYZ		5
+
+typedef struct
+{
+	float	normal[3];
+	float	dist;
+	int		type;		// PLANE_X - PLANE_ANYZ ?remove? trivial to regenerate
+} dplane_t;
+
+
+
+#define	CONTENTS_EMPTY		-1
+#define	CONTENTS_SOLID		-2
+#define	CONTENTS_WATER		-3
+#define	CONTENTS_SLIME		-4
+#define	CONTENTS_LAVA		-5
+#define	CONTENTS_SKY		-6
+#define	CONTENTS_ORIGIN		-7		// removed at csg time
+#define	CONTENTS_CLIP		-8		// changed to contents_solid
+
+#define	CONTENTS_CURRENT_0		-9
+#define	CONTENTS_CURRENT_90		-10
+#define	CONTENTS_CURRENT_180	-11
+#define	CONTENTS_CURRENT_270	-12
+#define	CONTENTS_CURRENT_UP		-13
+#define	CONTENTS_CURRENT_DOWN	-14
+
+#define CONTENTS_TRANSLUCENT	-15
+
+#define	CONTENTS_PORTAL			-17
+
+// !!! if this is changed, it must be changed in asm_i386.h too !!!
+typedef struct
+{
+	int			planenum;
+	short		children[2];	// negative numbers are -(leafs+1), not nodes
+	short		mins[3];		// for sphere culling
+	short		maxs[3];
+	unsigned short	firstface;
+	unsigned short	numfaces;	// counting both sides
+} dnode_t;
+
+typedef struct
+{
+	int			planenum;
+	short		children[2];	// negative numbers are contents
+} dclipnode_t;
+
+
+typedef struct texinfo_s
+{
+	float		vecs[2][4];		// [s/t][xyz offset]
+	int			miptex;
+	int			flags;
+} texinfo_t;
+#define	TEX_SPECIAL		1		// sky or slime, no lightmap or 256 subdivision
+
+// note that edge 0 is never used, because negative edge nums are used for
+// counterclockwise use of the edge in a face
+typedef struct
+{
+	unsigned short	v[2];		// vertex numbers
+} dedge_t;
+
+#define	MAXLIGHTMAPS	4
+typedef struct
+{
+	short		planenum;
+	short		side;
+
+	int			firstedge;		// we must support > 64k edges
+	short		numedges;	
+	short		texinfo;
+
+// lighting info
+	byte		styles[MAXLIGHTMAPS];
+	int			lightofs;		// start of [numstyles*surfsize] samples
+} dface_t;
+
+
+
+#define	AMBIENT_WATER	0
+#define	AMBIENT_SKY		1
+#define	AMBIENT_SLIME	2
+#define	AMBIENT_LAVA	3
+
+#define	NUM_AMBIENTS			4		// automatic ambient sounds
+
+// leaf 0 is the generic CONTENTS_SOLID leaf, used for all solid areas
+// all other leafs need visibility info
+typedef struct
+{
+	int			contents;
+	int			visofs;				// -1 = no visibility info
+
+	short		mins[3];			// for frustum culling
+	short		maxs[3];
+
+	unsigned short		firstmarksurface;
+	unsigned short		nummarksurfaces;
+
+	byte		ambient_level[NUM_AMBIENTS];
+} dleaf_t;
+
+
+//============================================================================
+
+#ifndef QUAKE_GAME
+
+#define	ANGLE_UP	-1
+#define	ANGLE_DOWN	-2
+
+
+// the utilities get to be lazy and just use large static arrays
+
+extern	int			nummodels;
+extern	dmodel_t	dmodels[MAX_MAP_MODELS];
+extern  int			dmodels_checksum;
+
+extern	int			visdatasize;
+extern	byte		dvisdata[MAX_MAP_VISIBILITY];
+extern  int			dvisdata_checksum;
+
+extern	int			lightdatasize;
+extern	byte		dlightdata[MAX_MAP_LIGHTING];
+extern  int			dlightdata_checksum;
+
+extern	int			texdatasize;
+extern	byte		dtexdata[MAX_MAP_MIPTEX]; // (dmiptexlump_t)
+extern  int			dtexdata_checksum;
+
+extern	int			entdatasize;
+extern	char		dentdata[MAX_MAP_ENTSTRING];
+extern  int			dentdata_checksum;
+
+extern	int			numleafs;
+extern	dleaf_t		dleafs[MAX_MAP_LEAFS];
+extern  int			dleafs_checksum;
+
+extern	int			numplanes;
+extern	dplane_t	dplanes[MAX_MAP_PLANES];
+extern  int			dplanes_checksum;
+
+extern	int			numvertexes;
+extern	dvertex_t	dvertexes[MAX_MAP_VERTS];
+extern  int			dvertexes_checksum;
+
+extern	int			numnodes;
+extern	dnode_t		dnodes[MAX_MAP_NODES];
+extern  int			dnodes_checksum;
+
+extern	int			numtexinfo;
+extern	texinfo_t	texinfo[MAX_MAP_TEXINFO];
+extern  int			texinfo_checksum;
+
+extern	int			numfaces;
+extern	dface_t		dfaces[MAX_MAP_FACES];
+extern  int			dfaces_checksum;
+
+extern	int			numclipnodes;
+extern	dclipnode_t	dclipnodes[MAX_MAP_CLIPNODES];
+extern  int			dclipnodes_checksum;
+
+extern	int			numedges;
+extern	dedge_t		dedges[MAX_MAP_EDGES];
+extern  int			dedges_checksum;
+
+extern	int			nummarksurfaces;
+extern	unsigned short	dmarksurfaces[MAX_MAP_MARKSURFACES];
+extern  int			dmarksurfaces_checksum;
+
+extern	int			numsurfedges;
+extern	int			dsurfedges[MAX_MAP_SURFEDGES];
+extern  int			dsurfedges_checksum;
+
+int FastChecksum(void *buffer, int bytes);
+
+void DecompressVis (byte *in, byte *decompressed);
+int CompressVis (byte *vis, byte *dest);
+
+void	LoadBSPFile (char *filename);
+void	WriteBSPFile (char *filename);
+void	PrintBSPFileSizes (void);
+
+//===============
+
+
+typedef struct epair_s
+{
+	struct epair_s	*next;
+	char	*key;
+	char	*value;
+} epair_t;
+
+typedef struct
+{
+	vec3_t		origin;
+	int			firstbrush;
+	int			numbrushes;
+	epair_t		*epairs;
+} entity_t;
+
+extern	int			num_entities;
+extern	entity_t	entities[MAX_MAP_ENTITIES];
+
+void	ParseEntities (void);
+void	UnparseEntities (void);
+
+void 	SetKeyValue (entity_t *ent, char *key, char *value);
+char 	*ValueForKey (entity_t *ent, char *key);
+// will return "" if not present
+
+vec_t	FloatForKey (entity_t *ent, char *key);
+void 	GetVectorForKey (entity_t *ent, char *key, vec3_t vec);
+
+epair_t *ParseEpair (void);
+
+#endif
diff --git a/main/source/utils/common/cmdlib.c b/main/source/utils/common/cmdlib.c
new file mode 100644
index 00000000..842e37de
--- /dev/null
+++ b/main/source/utils/common/cmdlib.c
@@ -0,0 +1,1040 @@
+/***
+*
+*	Copyright (c) 1998, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+****/
+
+// cmdlib.c
+
+#include "cmdlib.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#ifdef WIN32
+#include <direct.h>
+#endif
+
+#ifdef NeXT
+#include <libc.h>
+#endif
+
+#ifdef	WIN32
+#define PATHSEPARATOR(c) ((c) == '\\' || (c) == '/')
+#else	//WIN32
+#define PATHSEPARATOR(c) ((c) == '/')
+#endif	//WIN32
+
+// set these before calling CheckParm
+int myargc;
+char **myargv;
+
+char		com_token[1024];
+qboolean	com_eof;
+
+qboolean		archive;
+char			archivedir[1024];
+
+
+void COM_FixSlashes( char *pname )
+{
+#if 0
+	while ( *pname ) {
+		if ( *pname == '/' )
+			*pname = '\\';
+		pname++;
+	}
+#else
+	while ( *pname ) {
+		if ( *pname == '\\' )
+			*pname = '/';
+		pname++;
+	}
+#endif
+}
+
+
+/*
+=================
+Error
+
+For abnormal program terminations
+=================
+*/
+void Error (char *error, ...)
+{
+	va_list argptr;
+
+	printf ("\n************ ERROR ************\n");
+
+	va_start (argptr,error);
+	vprintf (error,argptr);
+	va_end (argptr);
+	printf ("\n");
+
+	exit (1);
+}
+
+// only printf if in verbose mode
+qboolean verbose = false;
+void qprintf (char *format, ...)
+{
+	va_list argptr;
+
+	if (!verbose)
+		return;
+	va_start (argptr,format);
+	vprintf (format,argptr);
+	va_end (argptr);
+}
+
+
+/*
+
+qdir will hold the path up to the quake directory, including the slash
+
+  f:\quake\
+  /raid/quake/
+
+gamedir will hold qdir + the game directory (id1, id2, etc)
+
+  */
+
+char		qproject[ 1024 ]={'\0'};
+char		qdir[1024]={'\0'};
+char		gamedir[1024]={'\0'};
+
+void SetQdirFromPath (char *path)
+{
+#ifndef OLD_BOGUS_PATH_CODE
+
+	if ( qproject[0]=='\0' )
+		{
+		if ( getenv("QPROJECT") )
+		{
+			char c = qproject[ strlen(qproject)-1 ];
+			strcpy( qproject, getenv("QPROJECT") );
+			if ( !PATHSEPARATOR( c ) )
+				strcat( qproject, "\\" );
+		}
+		else
+			strcpy( qproject, "quiver\\" );
+		}
+	if ( qproject[0] != '\\' && qproject[0] != '/' && qproject[1] != ':' )
+		{
+		strcpy( qdir, "\\" );
+		}
+
+	strcat( qdir, qproject );
+	strcpy( gamedir, qdir );
+	strcat( gamedir, "\\valve\\" );
+
+#else
+	char	temp[1024];
+	char	*c;
+
+	if (!(path[0] == '/' || path[0] == '\\' || path[1] == ':'))
+	{	// path is partial
+		Q_getwd (temp);
+		strcat (temp, path);
+		path = temp;
+	}
+
+// search for "quake" or quiver in path
+	if( !qproject[0] ) {
+		char *pszProj;
+
+		pszProj = getenv("QPROJECT");
+
+		if (pszProj != NULL)
+			strcpy(qproject, pszProj);
+		else
+			strcpy(qproject, "quiver");
+	}
+
+try_again:
+
+	for (c=path ; *c ; c++)
+	{
+		int iSize = 0;
+
+		if (!Q_strncasecmp( c, qproject, strlen( qproject ) ) )
+			iSize = strlen( qproject ) + 1;
+
+		if (iSize > 0) 
+		{
+			strncpy (qdir, path, c + iSize - path);
+			printf ("qdir: %s\n", qdir);
+			c += iSize;
+			while (*c)
+			{
+				if (*c == '/' || *c == '\\')
+				{
+					strncpy (gamedir, path, c+1-path);
+					printf ("gamedir: %s\n", gamedir);
+					return;
+				}
+				c++;
+			}
+			Error ("No gamedir in %s", path);
+			return;
+		}
+	}
+
+	if (!strcmp(qproject, "quiver"))
+	{
+		strcpy(qproject, "prospero");
+		goto try_again;
+	}
+
+	Error ("SetQdirFromPath: no '%s' in %s", qproject, path);
+#endif
+}
+
+
+char *ExpandArg (char *path)
+{
+	static char full[1024];
+
+	if (path[0] != '/' && path[0] != '\\' && path[1] != ':')
+	{
+		Q_getwd (full);
+		strcat (full, path);
+	}
+	else
+		strcpy (full, path);
+	return full;
+}
+
+char *ExpandPath (char *path)
+{
+	char *psz;
+	static char full[1024];
+	if (!qdir)
+		Error ("ExpandPath called without qdir set");
+	if (path[0] == '/' || path[0] == '\\' || path[1] == ':')
+		return path;
+	psz = strstr(path, qdir);
+	if (psz)
+		strcpy(full, path);
+	else
+		sprintf (full, "%s%s", qdir, path);
+
+	return full;
+}
+
+char *ExpandPathAndArchive (char *path)
+{
+	char	*expanded;
+	char	archivename[1024];
+
+	expanded = ExpandPath (path);
+
+	if (archive)
+	{
+		sprintf (archivename, "%s/%s", archivedir, path);
+		QCopyFile (expanded, archivename);
+	}
+	return expanded;
+}
+
+
+char *copystring(char *s)
+{
+	char	*b;
+	b = malloc(strlen(s)+1);
+	strcpy (b, s);
+	return b;
+}
+
+
+
+/*
+================
+I_FloatTime
+================
+*/
+double I_FloatTime (void)
+{
+	time_t	t;
+	
+	time (&t);
+	
+	return t;
+#if 0
+// more precise, less portable
+	struct timeval tp;
+	struct timezone tzp;
+	static int		secbase;
+
+	gettimeofday(&tp, &tzp);
+	
+	if (!secbase)
+	{
+		secbase = tp.tv_sec;
+		return tp.tv_usec/1000000.0;
+	}
+	
+	return (tp.tv_sec - secbase) + tp.tv_usec/1000000.0;
+#endif
+}
+
+void Q_getwd (char *out)
+{
+#ifdef WIN32
+   _getcwd (out, 256);
+   strcat (out, "\\");
+#else
+   getwd (out);
+#endif
+}
+
+
+void Q_mkdir (char *path)
+{
+#ifdef WIN32
+	if (_mkdir (path) != -1)
+		return;
+#else
+	if (mkdir (path, 0777) != -1)
+		return;
+#endif
+	if (errno != EEXIST)
+		Error ("mkdir %s: %s",path, strerror(errno));
+}
+
+/*
+============
+FileTime
+
+returns -1 if not present
+============
+*/
+int	FileTime (char *path)
+{
+	struct	stat	buf;
+	
+	if (stat (path,&buf) == -1)
+		return -1;
+	
+	return buf.st_mtime;
+}
+
+
+
+/*
+==============
+COM_Parse
+
+  Parse a token out of a string (into global: char com_token[1024])
+==============
+*/
+char *COM_Parse (char *data)
+{
+	int		c;
+	int		len;
+	
+	len = 0;
+	com_token[0] = 0;
+	
+	if (!data)
+		return NULL;
+		
+// skip whitespace
+skipwhite:
+	while ( (c = *data) <= ' ')
+	{
+		if (c == 0)
+		{
+			com_eof = true;
+			return NULL;			// end of file;
+		}
+		data++;
+	}
+	
+// skip // comments
+	if (c=='/' && data[1] == '/')
+	{
+		while (*data && *data != '\n')
+			data++;
+		goto skipwhite;
+	}
+	
+
+// handle quoted strings specially
+	if (c == '\"')
+	{
+		data++;
+		do
+		{
+			c = *data++;
+			if (c=='\"')
+			{
+				com_token[len] = 0;
+				return data;
+			}
+			com_token[len] = c;
+			len++;
+		} while (1);
+	}
+
+// parse single characters
+	if (c=='{' || c=='}'|| c==')'|| c=='(' || c=='\'' || c==':')
+	{
+		com_token[len] = c;
+		len++;
+		com_token[len] = 0;
+		return data+1;
+	}
+
+// parse a regular word
+	do
+	{
+		com_token[len] = c;
+		data++;
+		len++;
+		c = *data;
+	if (c=='{' || c=='}'|| c==')'|| c=='(' || c=='\'' || c==':')
+			break;
+	} while (c>32);
+	
+	com_token[len] = 0;
+	return data;
+}
+
+
+int Q_strncasecmp (char *s1, char *s2, int n)
+{
+	int		c1, c2;
+	
+	while (1)
+	{
+		c1 = *s1++;
+		c2 = *s2++;
+
+		if (!n--)
+			return 0;		// strings are equal until end point
+		
+		if (c1 != c2)
+		{
+			if (c1 >= 'a' && c1 <= 'z')
+				c1 -= ('a' - 'A');
+			if (c2 >= 'a' && c2 <= 'z')
+				c2 -= ('a' - 'A');
+			if (c1 != c2)
+				return -1;		// strings not equal
+		}
+		if (!c1)
+			return 0;		// strings are equal
+	}
+	
+	return -1;
+}
+
+int Q_strcasecmp (char *s1, char *s2)
+{
+	return Q_strncasecmp (s1, s2, 99999);
+}
+
+
+char *strupr (char *start)
+{
+	char	*in;
+	in = start;
+	while (*in)
+	{
+		*in = toupper(*in);
+		in++;
+	}
+	return start;
+}
+
+char *strlower (char *start)
+{
+	char	*in;
+	in = start;
+	while (*in)
+	{
+		*in = tolower(*in);
+		in++;
+	}
+	return start;
+}
+
+
+/*
+=============================================================================
+
+						MISC FUNCTIONS
+
+=============================================================================
+*/
+
+
+/*
+=================
+CheckParm
+
+Checks for the given parameter in the program's command line arguments
+Returns the argument number (1 to argc-1) or 0 if not present
+=================
+*/
+int CheckParm (char *check)
+{
+	int             i;
+
+	for (i = 1;i<myargc;i++)
+	{
+		if ( !Q_strcasecmp(check, myargv[i]) )
+			return i;
+	}
+
+	return 0;
+}
+
+
+
+/*
+================
+filelength
+================
+*/
+int filelength (FILE *f)
+{
+	int		pos;
+	int		end;
+
+	pos = ftell (f);
+	fseek (f, 0, SEEK_END);
+	end = ftell (f);
+	fseek (f, pos, SEEK_SET);
+
+	return end;
+}
+
+
+FILE *SafeOpenWrite (char *filename)
+{
+	FILE	*f;
+
+	f = fopen(filename, "wb");
+
+	if (!f)
+		Error ("Error opening %s: %s",filename,strerror(errno));
+
+	return f;
+}
+
+FILE *SafeOpenRead (char *filename)
+{
+	FILE	*f;
+
+	f = fopen(filename, "rb");
+
+	if (!f)
+		Error ("Error opening %s: %s",filename,strerror(errno));
+
+	return f;
+}
+
+
+void SafeRead (FILE *f, void *buffer, int count)
+{
+	if ( fread (buffer, 1, count, f) != (size_t)count)
+		Error ("File read failure");
+}
+
+
+void SafeWrite (FILE *f, void *buffer, int count)
+{
+	if (fwrite (buffer, 1, count, f) != (size_t)count)
+		Error ("File read failure");
+}
+
+
+
+/*
+==============
+LoadFile
+==============
+*/
+int    LoadFile (char *filename, void **bufferptr)
+{
+	FILE	*f;
+	int    length;
+	void    *buffer;
+
+	f = SafeOpenRead (filename);
+	length = filelength (f);
+	buffer = malloc (length+1);
+	((char *)buffer)[length] = 0;
+	SafeRead (f, buffer, length);
+	fclose (f);
+
+	*bufferptr = buffer;
+	return length;
+}
+
+
+/*
+==============
+SaveFile
+==============
+*/
+void    SaveFile (char *filename, void *buffer, int count)
+{
+	FILE	*f;
+
+	f = SafeOpenWrite (filename);
+	SafeWrite (f, buffer, count);
+	fclose (f);
+}
+
+
+
+void DefaultExtension (char *path, char *extension)
+{
+	char    *src;
+//
+// if path doesn't have a .EXT, append extension
+// (extension should include the .)
+//
+	src = path + strlen(path) - 1;
+
+	while (!PATHSEPARATOR(*src) && src != path)
+	{
+		if (*src == '.')
+			return;                 // it has an extension
+		src--;
+	}
+
+	strcat (path, extension);
+}
+
+
+void DefaultPath (char *path, char *basepath)
+{
+	char    temp[128];
+
+	if (PATHSEPARATOR(path[0]))
+		return;                   // absolute path location
+	strcpy (temp,path);
+	strcpy (path,basepath);
+	strcat (path,temp);
+}
+
+
+void    StripFilename (char *path)
+{
+	int             length;
+
+	length = strlen(path)-1;
+	while (length > 0 && !PATHSEPARATOR(path[length]))
+		length--;
+	path[length] = 0;
+}
+
+void    StripExtension (char *path)
+{
+	int             length;
+
+	length = strlen(path)-1;
+	while (length > 0 && path[length] != '.')
+	{
+		length--;
+		if (path[length] == '/')
+			return;		// no extension
+	}
+	if (length)
+		path[length] = 0;
+}
+
+
+/*
+====================
+Extract file parts
+====================
+*/
+void ExtractFilePath (char *path, char *dest)
+{
+	char    *src;
+
+	src = path + strlen(path) - 1;
+
+//
+// back up until a \ or the start
+//
+	while (src != path && !PATHSEPARATOR(*(src-1)))
+		src--;
+
+	memcpy (dest, path, src-path);
+	dest[src-path] = 0;
+}
+
+void ExtractFileBase (char *path, char *dest)
+{
+	char    *src;
+
+	src = path + strlen(path) - 1;
+
+//
+// back up until a \ or the start
+//
+	while (src != path && !PATHSEPARATOR(*(src-1)))
+		src--;
+
+	while (*src && *src != '.')
+	{
+		*dest++ = *src++;
+	}
+	*dest = 0;
+}
+
+void ExtractFileExtension (char *path, char *dest)
+{
+	char    *src;
+
+	src = path + strlen(path) - 1;
+
+//
+// back up until a . or the start
+//
+	while (src != path && *(src-1) != '.')
+		src--;
+	if (src == path)
+	{
+		*dest = 0;	// no extension
+		return;
+	}
+
+	strcpy (dest,src);
+}
+
+
+/*
+==============
+ParseNum / ParseHex
+==============
+*/
+int ParseHex (char *hex)
+{
+	char    *str;
+	int    num;
+
+	num = 0;
+	str = hex;
+
+	while (*str)
+	{
+		num <<= 4;
+		if (*str >= '0' && *str <= '9')
+			num += *str-'0';
+		else if (*str >= 'a' && *str <= 'f')
+			num += 10 + *str-'a';
+		else if (*str >= 'A' && *str <= 'F')
+			num += 10 + *str-'A';
+		else
+			Error ("Bad hex number: %s",hex);
+		str++;
+	}
+
+	return num;
+}
+
+
+int ParseNum (char *str)
+{
+	if (str[0] == '$')
+		return ParseHex (str+1);
+	if (str[0] == '0' && str[1] == 'x')
+		return ParseHex (str+2);
+	return atol (str);
+}
+
+
+
+/*
+============================================================================
+
+					BYTE ORDER FUNCTIONS
+
+============================================================================
+*/
+
+#ifdef _SGI_SOURCE
+#define	__BIG_ENDIAN__
+#endif
+
+#ifdef __BIG_ENDIAN__
+
+short   LittleShort (short l)
+{
+	byte    b1,b2;
+
+	b1 = l&255;
+	b2 = (l>>8)&255;
+
+	return (b1<<8) + b2;
+}
+
+short   BigShort (short l)
+{
+	return l;
+}
+
+
+int    LittleLong (int l)
+{
+	byte    b1,b2,b3,b4;
+
+	b1 = l&255;
+	b2 = (l>>8)&255;
+	b3 = (l>>16)&255;
+	b4 = (l>>24)&255;
+
+	return ((int)b1<<24) + ((int)b2<<16) + ((int)b3<<8) + b4;
+}
+
+int    BigLong (int l)
+{
+	return l;
+}
+
+
+float	LittleFloat (float l)
+{
+	union {byte b[4]; float f;} in, out;
+	
+	in.f = l;
+	out.b[0] = in.b[3];
+	out.b[1] = in.b[2];
+	out.b[2] = in.b[1];
+	out.b[3] = in.b[0];
+	
+	return out.f;
+}
+
+float	BigFloat (float l)
+{
+	return l;
+}
+
+
+#else
+
+
+short   BigShort (short l)
+{
+	byte    b1,b2;
+
+	b1 = l&255;
+	b2 = (l>>8)&255;
+
+	return (b1<<8) + b2;
+}
+
+short   LittleShort (short l)
+{
+	return l;
+}
+
+
+int    BigLong (int l)
+{
+	byte    b1,b2,b3,b4;
+
+	b1 = l&255;
+	b2 = (l>>8)&255;
+	b3 = (l>>16)&255;
+	b4 = (l>>24)&255;
+
+	return ((int)b1<<24) + ((int)b2<<16) + ((int)b3<<8) + b4;
+}
+
+int    LittleLong (int l)
+{
+	return l;
+}
+
+float	BigFloat (float l)
+{
+	union {byte b[4]; float f;} in, out;
+	
+	in.f = l;
+	out.b[0] = in.b[3];
+	out.b[1] = in.b[2];
+	out.b[2] = in.b[1];
+	out.b[3] = in.b[0];
+	
+	return out.f;
+}
+
+float	LittleFloat (float l)
+{
+	return l;
+}
+
+
+#endif
+
+
+//=======================================================
+
+
+// FIXME: byte swap?
+
+// this is a 16 bit, non-reflected CRC using the polynomial 0x1021
+// and the initial and final xor values shown below...  in other words, the
+// CCITT standard CRC used by XMODEM
+
+#define CRC_INIT_VALUE	0xffff
+#define CRC_XOR_VALUE	0x0000
+
+static unsigned short crctable[256] =
+{
+	0x0000,	0x1021,	0x2042,	0x3063,	0x4084,	0x50a5,	0x60c6,	0x70e7,
+	0x8108,	0x9129,	0xa14a,	0xb16b,	0xc18c,	0xd1ad,	0xe1ce,	0xf1ef,
+	0x1231,	0x0210,	0x3273,	0x2252,	0x52b5,	0x4294,	0x72f7,	0x62d6,
+	0x9339,	0x8318,	0xb37b,	0xa35a,	0xd3bd,	0xc39c,	0xf3ff,	0xe3de,
+	0x2462,	0x3443,	0x0420,	0x1401,	0x64e6,	0x74c7,	0x44a4,	0x5485,
+	0xa56a,	0xb54b,	0x8528,	0x9509,	0xe5ee,	0xf5cf,	0xc5ac,	0xd58d,
+	0x3653,	0x2672,	0x1611,	0x0630,	0x76d7,	0x66f6,	0x5695,	0x46b4,
+	0xb75b,	0xa77a,	0x9719,	0x8738,	0xf7df,	0xe7fe,	0xd79d,	0xc7bc,
+	0x48c4,	0x58e5,	0x6886,	0x78a7,	0x0840,	0x1861,	0x2802,	0x3823,
+	0xc9cc,	0xd9ed,	0xe98e,	0xf9af,	0x8948,	0x9969,	0xa90a,	0xb92b,
+	0x5af5,	0x4ad4,	0x7ab7,	0x6a96,	0x1a71,	0x0a50,	0x3a33,	0x2a12,
+	0xdbfd,	0xcbdc,	0xfbbf,	0xeb9e,	0x9b79,	0x8b58,	0xbb3b,	0xab1a,
+	0x6ca6,	0x7c87,	0x4ce4,	0x5cc5,	0x2c22,	0x3c03,	0x0c60,	0x1c41,
+	0xedae,	0xfd8f,	0xcdec,	0xddcd,	0xad2a,	0xbd0b,	0x8d68,	0x9d49,
+	0x7e97,	0x6eb6,	0x5ed5,	0x4ef4,	0x3e13,	0x2e32,	0x1e51,	0x0e70,
+	0xff9f,	0xefbe,	0xdfdd,	0xcffc,	0xbf1b,	0xaf3a,	0x9f59,	0x8f78,
+	0x9188,	0x81a9,	0xb1ca,	0xa1eb,	0xd10c,	0xc12d,	0xf14e,	0xe16f,
+	0x1080,	0x00a1,	0x30c2,	0x20e3,	0x5004,	0x4025,	0x7046,	0x6067,
+	0x83b9,	0x9398,	0xa3fb,	0xb3da,	0xc33d,	0xd31c,	0xe37f,	0xf35e,
+	0x02b1,	0x1290,	0x22f3,	0x32d2,	0x4235,	0x5214,	0x6277,	0x7256,
+	0xb5ea,	0xa5cb,	0x95a8,	0x8589,	0xf56e,	0xe54f,	0xd52c,	0xc50d,
+	0x34e2,	0x24c3,	0x14a0,	0x0481,	0x7466,	0x6447,	0x5424,	0x4405,
+	0xa7db,	0xb7fa,	0x8799,	0x97b8,	0xe75f,	0xf77e,	0xc71d,	0xd73c,
+	0x26d3,	0x36f2,	0x0691,	0x16b0,	0x6657,	0x7676,	0x4615,	0x5634,
+	0xd94c,	0xc96d,	0xf90e,	0xe92f,	0x99c8,	0x89e9,	0xb98a,	0xa9ab,
+	0x5844,	0x4865,	0x7806,	0x6827,	0x18c0,	0x08e1,	0x3882,	0x28a3,
+	0xcb7d,	0xdb5c,	0xeb3f,	0xfb1e,	0x8bf9,	0x9bd8,	0xabbb,	0xbb9a,
+	0x4a75,	0x5a54,	0x6a37,	0x7a16,	0x0af1,	0x1ad0,	0x2ab3,	0x3a92,
+	0xfd2e,	0xed0f,	0xdd6c,	0xcd4d,	0xbdaa,	0xad8b,	0x9de8,	0x8dc9,
+	0x7c26,	0x6c07,	0x5c64,	0x4c45,	0x3ca2,	0x2c83,	0x1ce0,	0x0cc1,
+	0xef1f,	0xff3e,	0xcf5d,	0xdf7c,	0xaf9b,	0xbfba,	0x8fd9,	0x9ff8,
+	0x6e17,	0x7e36,	0x4e55,	0x5e74,	0x2e93,	0x3eb2,	0x0ed1,	0x1ef0
+};
+
+void CRC_Init(unsigned short *crcvalue)
+{
+	*crcvalue = CRC_INIT_VALUE;
+}
+
+void CRC_ProcessByte(unsigned short *crcvalue, byte data)
+{
+	*crcvalue = (*crcvalue << 8) ^ crctable[(*crcvalue >> 8) ^ data];
+}
+
+unsigned short CRC_Value(unsigned short crcvalue)
+{
+	return crcvalue ^ CRC_XOR_VALUE;
+}
+//=============================================================================
+
+/*
+============
+CreatePath
+============
+*/
+void	CreatePath (char *path)
+{
+	char	*ofs, c;
+	
+	for (ofs = path+1 ; *ofs ; ofs++)
+	{
+		c = *ofs;
+		if (c == '/' || c == '\\')
+		{	// create the directory
+			*ofs = 0;
+			Q_mkdir (path);
+			*ofs = c;
+		}
+	}
+}
+
+
+/*
+============
+QCopyFile
+
+  Used to archive source files
+============
+*/
+void QCopyFile (char *from, char *to)
+{
+	void	*buffer;
+	int		length;
+
+	length = LoadFile (from, &buffer);
+	CreatePath (to);
+	SaveFile (to, buffer, length);
+	free (buffer);
+}
+
+
+/*
+============
+ListPak
+
+ Prints the contents of the specified pak file to stdout
+============
+*/
+
+void ListPak(char* pakname)
+{
+	FILE* f = SafeOpenRead(pakname);
+	packheader_t head;
+	packfile_t* pdir;
+	long i=0,imax=0;
+	long totlen=0;
+
+	SafeRead(f,&head,sizeof(packheader_t));
+	pdir=malloc(head.dirlen);
+
+	fseek(f,head.dirofs,SEEK_SET);
+	SafeRead(f,pdir,head.dirlen);
+	
+	fseek(f,0,SEEK_END);
+	totlen=ftell(f);
+
+	fclose(f);
+
+	imax=head.dirlen/sizeof(packfile_t);
+
+	for(i;i<imax;i++)
+	{
+		printf ("%64s : %7i\n", pdir[i].name,pdir[i].filelen);
+	}
+
+	printf("Total Length: %li bytes\n",totlen);
+}
+
+
+
+long flen(FILE* f)
+{
+	long savepos=ftell(f);
+	long filelen=0;
+
+	fseek(f,0,SEEK_END);
+	filelen=ftell(f);
+
+	fseek(f,savepos,SEEK_SET);
+	return filelen;
+}
+
+
diff --git a/main/source/utils/common/cmdlib.h b/main/source/utils/common/cmdlib.h
new file mode 100644
index 00000000..5af40655
--- /dev/null
+++ b/main/source/utils/common/cmdlib.h
@@ -0,0 +1,150 @@
+/***
+*
+*	Copyright (c) 1998, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+****/
+
+// cmdlib.h
+
+#ifndef __CMDLIB__
+#define __CMDLIB__
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <ctype.h>
+#include <time.h>
+#include <stdarg.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#ifndef __CMDUTIL__
+#define __CMDUTIL__
+#ifndef _NOENUMQBOOL
+typedef enum {false, true} qboolean;
+#else
+typedef int qboolean;
+#undef true
+#undef false
+#define true 1
+#define false 0
+#endif
+
+typedef unsigned char byte;
+#endif
+
+// the dec offsetof macro doesn't work very well...
+#define myoffsetof(type,identifier) ((size_t)&((type *)0)->identifier)
+
+
+// set these before calling CheckParm
+extern int myargc;
+extern char **myargv;
+
+void COM_FixSlashes( char *pname );
+char *strupr (char *in);
+char *strlower (char *in);
+int Q_strncasecmp (char *s1, char *s2, int n);
+int Q_strcasecmp (char *s1, char *s2);
+void Q_getwd (char *out);
+
+int filelength (FILE *f);
+int	FileTime (char *path);
+
+void	Q_mkdir (char *path);
+
+extern	char		qdir[1024];
+extern	char		gamedir[1024];
+void SetQdirFromPath (char *path);
+char *ExpandArg (char *path);	// from cmd line
+char *ExpandPath (char *path);	// from scripts
+char *ExpandPathAndArchive (char *path);
+
+
+double I_FloatTime (void);
+
+void	Error (char *error, ...);
+int		CheckParm (char *check);
+
+FILE	*SafeOpenWrite (char *filename);
+FILE	*SafeOpenRead (char *filename);
+void	SafeRead (FILE *f, void *buffer, int count);
+void	SafeWrite (FILE *f, void *buffer, int count);
+
+int		LoadFile (char *filename, void **bufferptr);
+void	SaveFile (char *filename, void *buffer, int count);
+
+void 	DefaultExtension (char *path, char *extension);
+void 	DefaultPath (char *path, char *basepath);
+void 	StripFilename (char *path);
+void 	StripExtension (char *path);
+
+void 	ExtractFilePath (char *path, char *dest);
+void 	ExtractFileBase (char *path, char *dest);
+void	ExtractFileExtension (char *path, char *dest);
+
+int 	ParseNum (char *str);
+
+short	BigShort (short l);
+short	LittleShort (short l);
+int		BigLong (int l);
+int		LittleLong (int l);
+float	BigFloat (float l);
+float	LittleFloat (float l);
+
+long flen(FILE* f);
+
+
+
+char *COM_Parse (char *data);
+
+extern	char		com_token[1024];
+extern	qboolean	com_eof;
+
+char *copystring(char *s);
+
+
+void CRC_Init(unsigned short *crcvalue);
+void CRC_ProcessByte(unsigned short *crcvalue, byte data);
+unsigned short CRC_Value(unsigned short crcvalue);
+
+void	CreatePath (char *path);
+void	QCopyFile (char *from, char *to);
+
+extern	qboolean		archive;
+extern	char			archivedir[1024];
+
+
+extern	qboolean verbose;
+void qprintf (char *format, ...);
+
+
+typedef struct
+{
+	char	name[56];
+	int		filepos, filelen;
+} packfile_t;
+
+typedef struct
+{
+	char	id[4];
+	int		dirofs;
+	int		dirlen;
+} packheader_t;
+
+
+void ListPak(char* pakname);
+
+#endif
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/main/source/utils/common/lbmlib.c b/main/source/utils/common/lbmlib.c
new file mode 100644
index 00000000..61af1cb1
--- /dev/null
+++ b/main/source/utils/common/lbmlib.c
@@ -0,0 +1,744 @@
+/***
+*
+*	Copyright (c) 1998, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+****/
+
+// lbmlib.c
+
+#include <WINDOWS.H>
+#include <STDIO.H>
+
+#include "cmdlib.h"
+#include "lbmlib.h"
+
+
+
+/*
+============================================================================
+
+						LBM STUFF
+
+============================================================================
+*/
+
+
+#define FORMID ('F'+('O'<<8)+((int)'R'<<16)+((int)'M'<<24))
+#define ILBMID ('I'+('L'<<8)+((int)'B'<<16)+((int)'M'<<24))
+#define PBMID  ('P'+('B'<<8)+((int)'M'<<16)+((int)' '<<24))
+#define BMHDID ('B'+('M'<<8)+((int)'H'<<16)+((int)'D'<<24))
+#define BODYID ('B'+('O'<<8)+((int)'D'<<16)+((int)'Y'<<24))
+#define CMAPID ('C'+('M'<<8)+((int)'A'<<16)+((int)'P'<<24))
+
+
+bmhd_t  bmhd;
+
+int    Align (int l)
+{
+	if (l&1)
+		return l+1;
+	return l;
+}
+
+
+
+/*
+================
+=
+= LBMRLEdecompress
+=
+= Source must be evenly aligned!
+=
+================
+*/
+
+byte  *LBMRLEDecompress (byte *source,byte *unpacked, int bpwidth)
+{
+	int     count;
+	byte    b,rept;
+
+	count = 0;
+
+	do
+	{
+		rept = *source++;
+
+		if (rept > 0x80)
+		{
+			rept = (rept^0xff)+2;
+			b = *source++;
+			memset(unpacked,b,rept);
+			unpacked += rept;
+		}
+		else if (rept < 0x80)
+		{
+			rept++;
+			memcpy(unpacked,source,rept);
+			unpacked += rept;
+			source += rept;
+		}
+		else
+			rept = 0;               // rept of 0x80 is NOP
+
+		count += rept;
+
+	} while (count<bpwidth);
+
+	if (count>bpwidth)
+		Error ("Decompression exceeded width!\n");
+
+
+	return source;
+}
+
+
+#define BPLANESIZE      128
+byte    bitplanes[9][BPLANESIZE];       // max size 1024 by 9 bit planes
+
+
+/*
+=================
+=
+= MungeBitPlanes8
+=
+= This destroys the bit plane data!
+=
+=================
+*/
+
+void MungeBitPlanes8 (int width, byte *dest)
+{
+	*dest=width;	// shut up the compiler warning
+	Error ("MungeBitPlanes8 not rewritten!");
+#if 0
+asm     les     di,[dest]
+asm     mov     si,-1
+asm     mov     cx,[width]
+mungebyte:
+asm     inc     si
+asm     mov     dx,8
+mungebit:
+asm     shl     [BYTE PTR bitplanes + BPLANESIZE*7 +si],1
+asm     rcl     al,1
+asm     shl     [BYTE PTR bitplanes + BPLANESIZE*6 +si],1
+asm     rcl     al,1
+asm     shl     [BYTE PTR bitplanes + BPLANESIZE*5 +si],1
+asm     rcl     al,1
+asm     shl     [BYTE PTR bitplanes + BPLANESIZE*4 +si],1
+asm     rcl     al,1
+asm     shl     [BYTE PTR bitplanes + BPLANESIZE*3 +si],1
+asm     rcl     al,1
+asm     shl     [BYTE PTR bitplanes + BPLANESIZE*2 +si],1
+asm     rcl     al,1
+asm     shl     [BYTE PTR bitplanes + BPLANESIZE*1 +si],1
+asm     rcl     al,1
+asm     shl     [BYTE PTR bitplanes + BPLANESIZE*0 +si],1
+asm     rcl     al,1
+asm     stosb
+asm     dec     cx
+asm     jz      done
+asm     dec     dx
+asm     jnz     mungebit
+asm     jmp     mungebyte
+
+done:
+#endif
+}
+
+
+void MungeBitPlanes4 (int width, byte *dest)
+{
+	*dest=width;	// shut up the compiler warning
+	Error ("MungeBitPlanes4 not rewritten!");
+#if 0
+
+asm     les     di,[dest]
+asm     mov     si,-1
+asm     mov     cx,[width]
+mungebyte:
+asm     inc     si
+asm     mov     dx,8
+mungebit:
+asm     xor     al,al
+asm     shl     [BYTE PTR bitplanes + BPLANESIZE*3 +si],1
+asm     rcl     al,1
+asm     shl     [BYTE PTR bitplanes + BPLANESIZE*2 +si],1
+asm     rcl     al,1
+asm     shl     [BYTE PTR bitplanes + BPLANESIZE*1 +si],1
+asm     rcl     al,1
+asm     shl     [BYTE PTR bitplanes + BPLANESIZE*0 +si],1
+asm     rcl     al,1
+asm     stosb
+asm     dec     cx
+asm     jz      done
+asm     dec     dx
+asm     jnz     mungebit
+asm     jmp     mungebyte
+
+done:
+#endif
+}
+
+
+void MungeBitPlanes2 (int width, byte *dest)
+{
+	*dest=width;	// shut up the compiler warning
+	Error ("MungeBitPlanes2 not rewritten!");
+#if 0
+asm     les     di,[dest]
+asm     mov     si,-1
+asm     mov     cx,[width]
+mungebyte:
+asm     inc     si
+asm     mov     dx,8
+mungebit:
+asm     xor     al,al
+asm     shl     [BYTE PTR bitplanes + BPLANESIZE*1 +si],1
+asm     rcl     al,1
+asm     shl     [BYTE PTR bitplanes + BPLANESIZE*0 +si],1
+asm     rcl     al,1
+asm     stosb
+asm     dec     cx
+asm     jz      done
+asm     dec     dx
+asm     jnz     mungebit
+asm     jmp     mungebyte
+
+done:
+#endif
+}
+
+
+void MungeBitPlanes1 (int width, byte *dest)
+{
+	*dest=width;	// shut up the compiler warning
+	Error ("MungeBitPlanes1 not rewritten!");
+#if 0
+asm     les     di,[dest]
+asm     mov     si,-1
+asm     mov     cx,[width]
+mungebyte:
+asm     inc     si
+asm     mov     dx,8
+mungebit:
+asm     xor     al,al
+asm     shl     [BYTE PTR bitplanes + BPLANESIZE*0 +si],1
+asm     rcl     al,1
+asm     stosb
+asm     dec     cx
+asm     jz      done
+asm     dec     dx
+asm     jnz     mungebit
+asm     jmp     mungebyte
+
+done:
+#endif
+}
+
+int LoadBMP (const char* szFile, BYTE** ppbBits, BYTE** ppbPalette)
+{
+	int i, rc = 0;
+	FILE *pfile = NULL;
+	BITMAPFILEHEADER bmfh;
+	BITMAPINFOHEADER bmih;
+	RGBQUAD rgrgbPalette[256];
+	ULONG cbBmpBits;
+	BYTE* pbBmpBits;
+	byte  *pb, *pbPal = NULL;
+	ULONG cbPalBytes;
+	ULONG biTrueWidth;
+
+	// Bogus parameter check
+	if (!(ppbPalette != NULL && ppbBits != NULL))
+		{ fprintf(stderr, "invalid BMP file\n"); rc = -1000; goto GetOut; }
+
+	// File exists?
+	if ((pfile = fopen(szFile, "rb")) == NULL)
+		{ fprintf(stderr, "unable to open BMP file\n"); rc = -1; goto GetOut; }
+	
+	// Read file header
+	if (fread(&bmfh, sizeof bmfh, 1/*count*/, pfile) != 1)
+		{ rc = -2; goto GetOut; }
+
+	// Bogus file header check
+	if (!(bmfh.bfReserved1 == 0 && bmfh.bfReserved2 == 0))
+		{ rc = -2000; goto GetOut; }
+
+	// Read info header
+	if (fread(&bmih, sizeof bmih, 1/*count*/, pfile) != 1)
+		{ rc = -3; goto GetOut; }
+
+	// Bogus info header check
+	if (!(bmih.biSize == sizeof bmih && bmih.biPlanes == 1))
+		{ fprintf(stderr, "invalid BMP file header\n");  rc = -3000; goto GetOut; }
+
+	// Bogus bit depth?  Only 8-bit supported.
+	if (bmih.biBitCount != 8)
+		{ fprintf(stderr, "BMP file not 8 bit\n");  rc = -4; goto GetOut; }
+	
+	// Bogus compression?  Only non-compressed supported.
+	if (bmih.biCompression != BI_RGB)
+		{ fprintf(stderr, "invalid BMP compression type\n"); rc = -5; goto GetOut; }
+
+	// Figure out how many entires are actually in the table
+	if (bmih.biClrUsed == 0)
+		{
+		bmih.biClrUsed = 256;
+		cbPalBytes = (1 << bmih.biBitCount) * sizeof( RGBQUAD );
+		}
+	else 
+		{
+		cbPalBytes = bmih.biClrUsed * sizeof( RGBQUAD );
+		}
+
+	// Read palette (bmih.biClrUsed entries)
+	if (fread(rgrgbPalette, cbPalBytes, 1/*count*/, pfile) != 1)
+		{ rc = -6; goto GetOut; }
+
+	// convert to a packed 768 byte palette
+	pbPal = malloc(768);
+	if (pbPal == NULL)
+		{ rc = -7; goto GetOut; }
+
+	pb = pbPal;
+
+	// Copy over used entries
+	for (i = 0; i < (int)bmih.biClrUsed; i++)
+	{
+		*pb++ = rgrgbPalette[i].rgbRed;
+		*pb++ = rgrgbPalette[i].rgbGreen;
+		*pb++ = rgrgbPalette[i].rgbBlue;
+	}
+
+	// Fill in unused entires will 0,0,0
+	for (i = bmih.biClrUsed; i < 256; i++) 
+	{
+		*pb++ = 0;
+		*pb++ = 0;
+		*pb++ = 0;
+	}
+
+	// Read bitmap bits (remainder of file)
+	cbBmpBits = bmfh.bfSize - ftell(pfile);
+	pb = malloc(cbBmpBits);
+	if (fread(pb, cbBmpBits, 1/*count*/, pfile) != 1)
+		{ rc = -7; goto GetOut; }
+
+	pbBmpBits = malloc(cbBmpBits);
+
+	// data is actually stored with the width being rounded up to a multiple of 4
+	biTrueWidth = (bmih.biWidth + 3) & ~3;
+	
+	// reverse the order of the data.
+	pb += (bmih.biHeight - 1) * biTrueWidth;
+	for(i = 0; i < bmih.biHeight; i++)
+	{
+		memmove(&pbBmpBits[biTrueWidth * i], pb, biTrueWidth);
+		pb -= biTrueWidth;
+	}
+
+	pb += biTrueWidth;
+	free(pb);
+
+	bmhd.w = (WORD)bmih.biWidth;
+	bmhd.h = (WORD)bmih.biHeight;
+	// Set output parameters
+	*ppbPalette = pbPal;
+	*ppbBits = pbBmpBits;
+
+GetOut:
+	if (pfile) 
+		fclose(pfile);
+
+	return rc;
+}
+
+
+int WriteBMPfile (char *szFile, byte *pbBits, int width, int height, byte *pbPalette)
+{
+	int i, rc = 0;
+	FILE *pfile = NULL;
+	BITMAPFILEHEADER bmfh;
+	BITMAPINFOHEADER bmih;
+	RGBQUAD rgrgbPalette[256];
+	ULONG cbBmpBits;
+	BYTE* pbBmpBits;
+	byte  *pb, *pbPal = NULL;
+	ULONG cbPalBytes;
+	ULONG biTrueWidth;
+
+	// Bogus parameter check
+	if (!(pbPalette != NULL && pbBits != NULL))
+		{ rc = -1000; goto GetOut; }
+
+	// File exists?
+	if ((pfile = fopen(szFile, "wb")) == NULL)
+		{ rc = -1; goto GetOut; }
+
+	biTrueWidth = ((width + 3) & ~3);
+	cbBmpBits = biTrueWidth * height;
+	cbPalBytes = 256 * sizeof( RGBQUAD );
+
+	// Bogus file header check
+	bmfh.bfType = MAKEWORD( 'B', 'M' );
+	bmfh.bfSize = sizeof bmfh + sizeof bmih + cbBmpBits + cbPalBytes;
+	bmfh.bfReserved1 = 0;
+	bmfh.bfReserved2 = 0;
+	bmfh.bfOffBits = sizeof bmfh + sizeof bmih + cbPalBytes;
+
+	// Write file header
+	if (fwrite(&bmfh, sizeof bmfh, 1/*count*/, pfile) != 1)
+		{ rc = -2; goto GetOut; }
+
+	// Size of structure
+	bmih.biSize = sizeof bmih;
+	// Width
+	bmih.biWidth = biTrueWidth;
+	// Height
+	bmih.biHeight = height;
+	// Only 1 plane 
+	bmih.biPlanes = 1;
+	// Only 8-bit supported.
+	bmih.biBitCount = 8;
+	// Only non-compressed supported.
+	bmih.biCompression = BI_RGB;
+	bmih.biSizeImage = 0;
+
+	// huh?
+	bmih.biXPelsPerMeter = 0;
+	bmih.biYPelsPerMeter = 0;
+
+	// Always full palette
+	bmih.biClrUsed = 256;
+	bmih.biClrImportant = 0;
+	
+	// Write info header
+	if (fwrite(&bmih, sizeof bmih, 1/*count*/, pfile) != 1)
+		{ rc = -3; goto GetOut; }
+	
+
+	// convert to expanded palette
+	pb = pbPalette;
+
+	// Copy over used entries
+	for (i = 0; i < (int)bmih.biClrUsed; i++)
+	{
+		rgrgbPalette[i].rgbRed   = *pb++;
+		rgrgbPalette[i].rgbGreen = *pb++;
+		rgrgbPalette[i].rgbBlue  = *pb++;
+        rgrgbPalette[i].rgbReserved = 0;
+	}
+
+	// Write palette (bmih.biClrUsed entries)
+	cbPalBytes = bmih.biClrUsed * sizeof( RGBQUAD );
+	if (fwrite(rgrgbPalette, cbPalBytes, 1/*count*/, pfile) != 1)
+		{ rc = -6; goto GetOut; }
+
+
+	pbBmpBits = malloc(cbBmpBits);
+
+	pb = pbBits;
+	// reverse the order of the data.
+	pb += (height - 1) * width;
+	for(i = 0; i < bmih.biHeight; i++)
+	{
+		memmove(&pbBmpBits[biTrueWidth * i], pb, width);
+		pb -= width;
+	}
+
+	// Write bitmap bits (remainder of file)
+	if (fwrite(pbBmpBits, cbBmpBits, 1/*count*/, pfile) != 1)
+		{ rc = -7; goto GetOut; }
+
+	free(pbBmpBits);
+
+GetOut:
+	if (pfile) 
+		fclose(pfile);
+
+	return rc;
+}
+
+/*
+=================
+=
+= LoadLBM
+=
+=================
+*/
+
+void LoadLBM (char *filename, byte **picture, byte **palette)
+{
+	byte    *LBMbuffer, *picbuffer, *cmapbuffer;
+	int             y,p,planes;
+	byte    *LBM_P, *LBMEND_P;
+	byte    *pic_p;
+	byte    *body_p;
+	unsigned        rowsize;
+
+	int    formtype,formlength;
+	int    chunktype,chunklength;
+	void    (*mungecall) (int, byte *);
+
+// qiet compiler warnings
+	picbuffer = NULL;
+	cmapbuffer = NULL;
+	mungecall = NULL;
+
+//
+// load the LBM
+//
+	LoadFile (filename, (void **)&LBMbuffer);
+
+//
+// parse the LBM header
+//
+	LBM_P = LBMbuffer;
+	if ( *(int *)LBMbuffer != LittleLong(FORMID) )
+	   Error ("No FORM ID at start of file!\n");
+
+	LBM_P += 4;
+	formlength = BigLong( *(int *)LBM_P );
+	LBM_P += 4;
+	LBMEND_P = LBM_P + Align(formlength);
+
+	formtype = LittleLong(*(int *)LBM_P);
+
+	if (formtype != ILBMID && formtype != PBMID)
+		Error ("Unrecognized form type: %c%c%c%c\n", formtype&0xff
+		,(formtype>>8)&0xff,(formtype>>16)&0xff,(formtype>>24)&0xff);
+
+	LBM_P += 4;
+
+//
+// parse chunks
+//
+
+	while (LBM_P < LBMEND_P)
+	{
+		chunktype = LBM_P[0] + (LBM_P[1]<<8) + (LBM_P[2]<<16) + (LBM_P[3]<<24);
+		LBM_P += 4;
+		chunklength = LBM_P[3] + (LBM_P[2]<<8) + (LBM_P[1]<<16) + (LBM_P[0]<<24);
+		LBM_P += 4;
+
+		switch ( chunktype )
+		{
+		case BMHDID:
+			memcpy (&bmhd,LBM_P,sizeof(bmhd));
+			bmhd.w = BigShort(bmhd.w);
+			bmhd.h = BigShort(bmhd.h);
+			bmhd.x = BigShort(bmhd.x);
+			bmhd.y = BigShort(bmhd.y);
+			bmhd.pageWidth = BigShort(bmhd.pageWidth);
+			bmhd.pageHeight = BigShort(bmhd.pageHeight);
+			break;
+
+		case CMAPID:
+			cmapbuffer = malloc (768);
+			memset (cmapbuffer, 0, 768);
+			memcpy (cmapbuffer, LBM_P, chunklength);
+			break;
+
+		case BODYID:
+			body_p = LBM_P;
+
+			pic_p = picbuffer = malloc (bmhd.w*bmhd.h);
+			if (formtype == PBMID)
+			{
+			//
+			// unpack PBM
+			//
+				for (y=0 ; y<bmhd.h ; y++, pic_p += bmhd.w)
+				{
+					if (bmhd.compression == cm_rle1)
+						body_p = LBMRLEDecompress ((byte *)body_p
+						, pic_p , bmhd.w);
+					else if (bmhd.compression == cm_none)
+					{
+						memcpy (pic_p,body_p,bmhd.w);
+						body_p += Align(bmhd.w);
+					}
+				}
+
+			}
+			else
+			{
+			//
+			// unpack ILBM
+			//
+				planes = bmhd.nPlanes;
+				if (bmhd.masking == ms_mask)
+					planes++;
+				rowsize = (bmhd.w+15)/16 * 2;
+				switch (bmhd.nPlanes)
+				{
+				case 1:
+					mungecall = MungeBitPlanes1;
+					break;
+				case 2:
+					mungecall = MungeBitPlanes2;
+					break;
+				case 4:
+					mungecall = MungeBitPlanes4;
+					break;
+				case 8:
+					mungecall = MungeBitPlanes8;
+					break;
+				default:
+					Error ("Can't munge %i bit planes!\n",bmhd.nPlanes);
+				}
+
+				for (y=0 ; y<bmhd.h ; y++, pic_p += bmhd.w)
+				{
+					for (p=0 ; p<planes ; p++)
+						if (bmhd.compression == cm_rle1)
+							body_p = LBMRLEDecompress ((byte *)body_p
+							, bitplanes[p] , rowsize);
+						else if (bmhd.compression == cm_none)
+						{
+							memcpy (bitplanes[p],body_p,rowsize);
+							body_p += rowsize;
+						}
+
+					mungecall (bmhd.w , pic_p);
+				}
+			}
+			break;
+		}
+
+		LBM_P += Align(chunklength);
+	}
+
+	free (LBMbuffer);
+
+	*picture = picbuffer;
+	*palette = cmapbuffer;
+}
+
+
+/*
+============================================================================
+
+							WRITE LBM
+
+============================================================================
+*/
+
+/*
+==============
+=
+= WriteLBMfile
+=
+==============
+*/
+
+void WriteLBMfile (char *filename, byte *data, int width, int height, byte *palette)
+{
+	byte    *lbm, *lbmptr;
+	int    *formlength, *bmhdlength, *cmaplength, *bodylength;
+	int    length;
+	bmhd_t  basebmhd;
+
+	lbm = lbmptr = malloc (width*height+1000);
+
+//
+// start FORM
+//
+	*lbmptr++ = 'F';
+	*lbmptr++ = 'O';
+	*lbmptr++ = 'R';
+	*lbmptr++ = 'M';
+
+	formlength = (int*)lbmptr;
+	lbmptr+=4;                      // leave space for length
+
+	*lbmptr++ = 'P';
+	*lbmptr++ = 'B';
+	*lbmptr++ = 'M';
+	*lbmptr++ = ' ';
+
+//
+// write BMHD
+//
+	*lbmptr++ = 'B';
+	*lbmptr++ = 'M';
+	*lbmptr++ = 'H';
+	*lbmptr++ = 'D';
+
+	bmhdlength = (int *)lbmptr;
+	lbmptr+=4;                      // leave space for length
+
+	memset (&basebmhd,0,sizeof(basebmhd));
+	basebmhd.w = BigShort((short)width);
+	basebmhd.h = BigShort((short)height);
+	basebmhd.nPlanes = (BYTE)BigShort(8);
+	basebmhd.xAspect = (BYTE)BigShort(5);
+	basebmhd.yAspect = (BYTE)BigShort(6);
+	basebmhd.pageWidth = BigShort((short)width);
+	basebmhd.pageHeight = BigShort((short)height);
+
+	memcpy (lbmptr,&basebmhd,sizeof(basebmhd));
+	lbmptr += sizeof(basebmhd);
+
+	length = lbmptr-(byte *)bmhdlength-4;
+	*bmhdlength = BigLong(length);
+	if (length&1)
+		*lbmptr++ = 0;          // pad chunk to even offset
+
+//
+// write CMAP
+//
+	*lbmptr++ = 'C';
+	*lbmptr++ = 'M';
+	*lbmptr++ = 'A';
+	*lbmptr++ = 'P';
+
+	cmaplength = (int *)lbmptr;
+	lbmptr+=4;                      // leave space for length
+
+	memcpy (lbmptr,palette,768);
+	lbmptr += 768;
+
+	length = lbmptr-(byte *)cmaplength-4;
+	*cmaplength = BigLong(length);
+	if (length&1)
+		*lbmptr++ = 0;          // pad chunk to even offset
+
+//
+// write BODY
+//
+	*lbmptr++ = 'B';
+	*lbmptr++ = 'O';
+	*lbmptr++ = 'D';
+	*lbmptr++ = 'Y';
+
+	bodylength = (int *)lbmptr;
+	lbmptr+=4;                      // leave space for length
+
+	memcpy (lbmptr,data,width*height);
+	lbmptr += width*height;
+
+	length = lbmptr-(byte *)bodylength-4;
+	*bodylength = BigLong(length);
+	if (length&1)
+		*lbmptr++ = 0;          // pad chunk to even offset
+
+//
+// done
+//
+	length = lbmptr-(byte *)formlength-4;
+	*formlength = BigLong(length);
+	if (length&1)
+		*lbmptr++ = 0;          // pad chunk to even offset
+
+//
+// write output file
+//
+	SaveFile (filename, lbm, lbmptr-lbm);
+	free (lbm);
+}
+
diff --git a/main/source/utils/common/lbmlib.h b/main/source/utils/common/lbmlib.h
new file mode 100644
index 00000000..8478e25c
--- /dev/null
+++ b/main/source/utils/common/lbmlib.h
@@ -0,0 +1,57 @@
+/***
+*
+*	Copyright (c) 1998, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+****/
+
+// lbmlib.h
+
+typedef unsigned char	UBYTE;
+
+#ifndef _WINDOWS_
+typedef short			WORD;
+#endif
+
+typedef unsigned short	UWORD;
+typedef long			LONG;
+
+typedef enum
+{
+	ms_none,
+	ms_mask,
+	ms_transcolor,
+	ms_lasso
+} mask_t;
+
+typedef enum
+{
+	cm_none,
+	cm_rle1
+} compress_t;
+
+typedef struct
+{
+	UWORD		w,h;
+	WORD		x,y;
+	UBYTE		nPlanes;
+	UBYTE		masking;
+	UBYTE		compression;
+	UBYTE		pad1;
+	UWORD		transparentColor;
+	UBYTE		xAspect,yAspect;
+	WORD		pageWidth,pageHeight;
+} bmhd_t;
+
+extern	bmhd_t	bmhd;						// will be in native byte order
+
+
+void LoadLBM (char *filename, byte **picture, byte **palette);
+int	LoadBMP (const char* szFile, byte** ppbBits, byte** ppbPalette);
+void WriteLBMfile (char *filename, byte *data, int width, int height
+	, byte *palette);
+int WriteBMPfile (char *szFile, byte *pbBits, int width, int height, byte *pbPalette);
+
diff --git a/main/source/utils/common/mathlib.c b/main/source/utils/common/mathlib.c
new file mode 100644
index 00000000..fdad6dbf
--- /dev/null
+++ b/main/source/utils/common/mathlib.c
@@ -0,0 +1,351 @@
+/***
+*
+*	Copyright (c) 1998, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+****/
+
+// mathlib.c -- math primitives
+
+#pragma warning( disable : 4244 )
+#pragma warning( disable : 4237 )
+#pragma warning( disable : 4305 )
+
+#include "cmdlib.h"
+#include "mathlib.h"
+
+vec3_t vec3_origin = {0,0,0};
+
+
+double VectorLength(vec3_t v)
+{
+	int		i;
+	double	length;
+	
+	length = 0;
+	for (i=0 ; i< 3 ; i++)
+		length += v[i]*v[i];
+	length = sqrt (length);		// FIXME
+
+	return length;
+}
+
+
+int VectorCompare (vec3_t v1, vec3_t v2)
+{
+	int		i;
+	
+	for (i=0 ; i<3 ; i++)
+		if (fabs(v1[i]-v2[i]) > EQUAL_EPSILON)
+			return false;
+			
+	return true;
+}
+
+vec_t Q_rint (vec_t in)
+{
+	return floor (in + 0.5);
+}
+
+void VectorMA (vec3_t va, double scale, vec3_t vb, vec3_t vc)
+{
+	vc[0] = va[0] + scale*vb[0];
+	vc[1] = va[1] + scale*vb[1];
+	vc[2] = va[2] + scale*vb[2];
+}
+
+void CrossProduct (vec3_t v1, vec3_t v2, vec3_t cross)
+{
+	cross[0] = v1[1]*v2[2] - v1[2]*v2[1];
+	cross[1] = v1[2]*v2[0] - v1[0]*v2[2];
+	cross[2] = v1[0]*v2[1] - v1[1]*v2[0];
+}
+
+vec_t _DotProduct (vec3_t v1, vec3_t v2)
+{
+	return v1[0]*v2[0] + v1[1]*v2[1] + v1[2]*v2[2];
+}
+
+void _VectorSubtract (vec3_t va, vec3_t vb, vec3_t out)
+{
+	out[0] = va[0]-vb[0];
+	out[1] = va[1]-vb[1];
+	out[2] = va[2]-vb[2];
+}
+
+void _VectorAdd (vec3_t va, vec3_t vb, vec3_t out)
+{
+	out[0] = va[0]+vb[0];
+	out[1] = va[1]+vb[1];
+	out[2] = va[2]+vb[2];
+}
+
+void _VectorCopy (vec3_t in, vec3_t out)
+{
+	out[0] = in[0];
+	out[1] = in[1];
+	out[2] = in[2];
+}
+
+void _VectorScale (vec3_t v, vec_t scale, vec3_t out)
+{
+	out[0] = v[0] * scale;
+	out[1] = v[1] * scale;
+	out[2] = v[2] * scale;
+}
+
+vec_t VectorNormalize (vec3_t v)
+{
+	int		i;
+	double	length;
+
+if ( fabs(v[1] - 0.000215956) < 0.0001)
+i=1;
+
+	length = 0;
+	for (i=0 ; i< 3 ; i++)
+		length += v[i]*v[i];
+	length = sqrt (length);
+	if (length == 0)
+		return 0;
+		
+	for (i=0 ; i< 3 ; i++)
+		v[i] /= length;	
+
+	return length;
+}
+
+void VectorInverse (vec3_t v)
+{
+	v[0] = -v[0];
+	v[1] = -v[1];
+	v[2] = -v[2];
+}
+
+void ClearBounds (vec3_t mins, vec3_t maxs)
+{
+	mins[0] = mins[1] = mins[2] = 99999;
+	maxs[0] = maxs[1] = maxs[2] = -99999;
+}
+
+void AddPointToBounds (vec3_t v, vec3_t mins, vec3_t maxs)
+{
+	int		i;
+	vec_t	val;
+
+	for (i=0 ; i<3 ; i++)
+	{
+		val = v[i];
+		if (val < mins[i])
+			mins[i] = val;
+		if (val > maxs[i])
+			maxs[i] = val;
+	}
+}
+
+void AngleMatrix (const vec3_t angles, float (*matrix)[4] )
+{
+	float		angle;
+	float		sr, sp, sy, cr, cp, cy;
+	
+	angle = angles[2] * (Q_PI*2 / 360);
+	sy = sin(angle);
+	cy = cos(angle);
+	angle = angles[1] * (Q_PI*2 / 360);
+	sp = sin(angle);
+	cp = cos(angle);
+	angle = angles[0] * (Q_PI*2 / 360);
+	sr = sin(angle);
+	cr = cos(angle);
+
+	// matrix = (Z * Y) * X
+	matrix[0][0] = cp*cy;
+	matrix[1][0] = cp*sy;
+	matrix[2][0] = -sp;
+	matrix[0][1] = sr*sp*cy+cr*-sy;
+	matrix[1][1] = sr*sp*sy+cr*cy;
+	matrix[2][1] = sr*cp;
+	matrix[0][2] = (cr*sp*cy+-sr*-sy);
+	matrix[1][2] = (cr*sp*sy+-sr*cy);
+	matrix[2][2] = cr*cp;
+	matrix[0][3] = 0.0;
+	matrix[1][3] = 0.0;
+	matrix[2][3] = 0.0;
+}
+
+void AngleIMatrix (const vec3_t angles, float matrix[3][4] )
+{
+	float		angle;
+	float		sr, sp, sy, cr, cp, cy;
+	
+	angle = angles[2] * (Q_PI*2 / 360);
+	sy = sin(angle);
+	cy = cos(angle);
+	angle = angles[1] * (Q_PI*2 / 360);
+	sp = sin(angle);
+	cp = cos(angle);
+	angle = angles[0] * (Q_PI*2 / 360);
+	sr = sin(angle);
+	cr = cos(angle);
+
+	// matrix = (Z * Y) * X
+	matrix[0][0] = cp*cy;
+	matrix[0][1] = cp*sy;
+	matrix[0][2] = -sp;
+	matrix[1][0] = sr*sp*cy+cr*-sy;
+	matrix[1][1] = sr*sp*sy+cr*cy;
+	matrix[1][2] = sr*cp;
+	matrix[2][0] = (cr*sp*cy+-sr*-sy);
+	matrix[2][1] = (cr*sp*sy+-sr*cy);
+	matrix[2][2] = cr*cp;
+	matrix[0][3] = 0.0;
+	matrix[1][3] = 0.0;
+	matrix[2][3] = 0.0;
+}
+
+void R_ConcatTransforms (const float in1[3][4], const float in2[3][4], float out[3][4])
+{
+	out[0][0] = in1[0][0] * in2[0][0] + in1[0][1] * in2[1][0] +
+				in1[0][2] * in2[2][0];
+	out[0][1] = in1[0][0] * in2[0][1] + in1[0][1] * in2[1][1] +
+				in1[0][2] * in2[2][1];
+	out[0][2] = in1[0][0] * in2[0][2] + in1[0][1] * in2[1][2] +
+				in1[0][2] * in2[2][2];
+	out[0][3] = in1[0][0] * in2[0][3] + in1[0][1] * in2[1][3] +
+				in1[0][2] * in2[2][3] + in1[0][3];
+	out[1][0] = in1[1][0] * in2[0][0] + in1[1][1] * in2[1][0] +
+				in1[1][2] * in2[2][0];
+	out[1][1] = in1[1][0] * in2[0][1] + in1[1][1] * in2[1][1] +
+				in1[1][2] * in2[2][1];
+	out[1][2] = in1[1][0] * in2[0][2] + in1[1][1] * in2[1][2] +
+				in1[1][2] * in2[2][2];
+	out[1][3] = in1[1][0] * in2[0][3] + in1[1][1] * in2[1][3] +
+				in1[1][2] * in2[2][3] + in1[1][3];
+	out[2][0] = in1[2][0] * in2[0][0] + in1[2][1] * in2[1][0] +
+				in1[2][2] * in2[2][0];
+	out[2][1] = in1[2][0] * in2[0][1] + in1[2][1] * in2[1][1] +
+				in1[2][2] * in2[2][1];
+	out[2][2] = in1[2][0] * in2[0][2] + in1[2][1] * in2[1][2] +
+				in1[2][2] * in2[2][2];
+	out[2][3] = in1[2][0] * in2[0][3] + in1[2][1] * in2[1][3] +
+				in1[2][2] * in2[2][3] + in1[2][3];
+}
+
+
+
+void VectorRotate (const vec3_t in1, const float in2[3][4], vec3_t out)
+{
+	out[0] = DotProduct(in1, in2[0]);
+	out[1] = DotProduct(in1, in2[1]);
+	out[2] = DotProduct(in1, in2[2]);
+}
+
+
+// rotate by the inverse of the matrix
+void VectorIRotate (const vec3_t in1, const float in2[3][4], vec3_t out)
+{
+	out[0] = in1[0]*in2[0][0] + in1[1]*in2[1][0] + in1[2]*in2[2][0];
+	out[1] = in1[0]*in2[0][1] + in1[1]*in2[1][1] + in1[2]*in2[2][1];
+	out[2] = in1[0]*in2[0][2] + in1[1]*in2[1][2] + in1[2]*in2[2][2];
+}
+
+
+void VectorTransform (const vec3_t in1, const float in2[3][4], vec3_t out)
+{
+	out[0] = DotProduct(in1, in2[0]) + in2[0][3];
+	out[1] = DotProduct(in1, in2[1]) +	in2[1][3];
+	out[2] = DotProduct(in1, in2[2]) +	in2[2][3];
+}
+
+
+
+void AngleQuaternion( const vec3_t angles, vec4_t quaternion )
+{
+	float		angle;
+	float		sr, sp, sy, cr, cp, cy;
+
+	// FIXME: rescale the inputs to 1/2 angle
+	angle = angles[2] * 0.5;
+	sy = sin(angle);
+	cy = cos(angle);
+	angle = angles[1] * 0.5;
+	sp = sin(angle);
+	cp = cos(angle);
+	angle = angles[0] * 0.5;
+	sr = sin(angle);
+	cr = cos(angle);
+
+	quaternion[0] = sr*cp*cy-cr*sp*sy; // X
+	quaternion[1] = cr*sp*cy+sr*cp*sy; // Y
+	quaternion[2] = cr*cp*sy-sr*sp*cy; // Z
+	quaternion[3] = cr*cp*cy+sr*sp*sy; // W
+}
+
+void QuaternionMatrix( const vec4_t quaternion, float (*matrix)[4] )
+{
+
+	matrix[0][0] = 1.0 - 2.0 * quaternion[1] * quaternion[1] - 2.0 * quaternion[2] * quaternion[2];
+	matrix[1][0] = 2.0 * quaternion[0] * quaternion[1] + 2.0 * quaternion[3] * quaternion[2];
+	matrix[2][0] = 2.0 * quaternion[0] * quaternion[2] - 2.0 * quaternion[3] * quaternion[1];
+
+	matrix[0][1] = 2.0 * quaternion[0] * quaternion[1] - 2.0 * quaternion[3] * quaternion[2];
+	matrix[1][1] = 1.0 - 2.0 * quaternion[0] * quaternion[0] - 2.0 * quaternion[2] * quaternion[2];
+	matrix[2][1] = 2.0 * quaternion[1] * quaternion[2] + 2.0 * quaternion[3] * quaternion[0];
+
+	matrix[0][2] = 2.0 * quaternion[0] * quaternion[2] + 2.0 * quaternion[3] * quaternion[1];
+	matrix[1][2] = 2.0 * quaternion[1] * quaternion[2] - 2.0 * quaternion[3] * quaternion[0];
+	matrix[2][2] = 1.0 - 2.0 * quaternion[0] * quaternion[0] - 2.0 * quaternion[1] * quaternion[1];
+}
+
+void QuaternionSlerp( const vec4_t p, vec4_t q, float t, vec4_t qt )
+{
+	int i;
+	float omega, cosom, sinom, sclp, sclq;
+
+	// decide if one of the quaternions is backwards
+	float a = 0;
+	float b = 0;
+	for (i = 0; i < 4; i++) {
+		a += (p[i]-q[i])*(p[i]-q[i]);
+		b += (p[i]+q[i])*(p[i]+q[i]);
+	}
+	if (a > b) {
+		for (i = 0; i < 4; i++) {
+			q[i] = -q[i];
+		}
+	}
+
+	cosom = p[0]*q[0] + p[1]*q[1] + p[2]*q[2] + p[3]*q[3];
+
+	if ((1.0 + cosom) > 0.00000001) {
+		if ((1.0 - cosom) > 0.00000001) {
+			omega = acos( cosom );
+			sinom = sin( omega );
+			sclp = sin( (1.0 - t)*omega) / sinom;
+			sclq = sin( t*omega ) / sinom;
+		}
+		else {
+			sclp = 1.0 - t;
+			sclq = t;
+		}
+		for (i = 0; i < 4; i++) {
+			qt[i] = sclp * p[i] + sclq * q[i];
+		}
+	}
+	else {
+		qt[0] = -p[1];
+		qt[1] = p[0];
+		qt[2] = -p[3];
+		qt[3] = p[2];
+		sclp = sin( (1.0 - t) * 0.5 * Q_PI);
+		sclq = sin( t * 0.5 * Q_PI);
+		for (i = 0; i < 3; i++) {
+			qt[i] = sclp * p[i] + sclq * qt[i];
+		}
+	}
+}
+
+
diff --git a/main/source/utils/common/mathlib.h b/main/source/utils/common/mathlib.h
new file mode 100644
index 00000000..bdb032e5
--- /dev/null
+++ b/main/source/utils/common/mathlib.h
@@ -0,0 +1,89 @@
+/***
+*
+*	Copyright (c) 1998, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+****/
+
+#ifndef __MATHLIB__
+#define __MATHLIB__
+
+// mathlib.h
+
+#include <math.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef DOUBLEVEC_T
+typedef double vec_t;
+#else
+typedef float vec_t;
+#endif
+typedef vec_t vec3_t[3];	// x,y,z
+typedef vec_t vec4_t[4];	// x,y,z,w
+
+#define	SIDE_FRONT		0
+#define	SIDE_ON			2
+#define	SIDE_BACK		1
+#define	SIDE_CROSS		-2
+
+#define	Q_PI	3.14159265358979323846
+
+extern vec3_t vec3_origin;
+
+// Use this definition globally
+#define	ON_EPSILON		0.01
+#define	EQUAL_EPSILON	0.001
+
+int VectorCompare (vec3_t v1, vec3_t v2);
+
+#define DotProduct(x,y) ((x)[0]*(y)[0]+(x)[1]*(y)[1]+(x)[2]*(y)[2])
+#define VectorFill(a,b) { (a)[0]=(b); (a)[1]=(b); (a)[2]=(b);}
+#define VectorAvg(a) ( ( (a)[0] + (a)[1] + (a)[2] ) / 3 )
+#define VectorSubtract(a,b,c) {(c)[0]=(a)[0]-(b)[0];(c)[1]=(a)[1]-(b)[1];(c)[2]=(a)[2]-(b)[2];}
+#define VectorAdd(a,b,c) {(c)[0]=(a)[0]+(b)[0];(c)[1]=(a)[1]+(b)[1];(c)[2]=(a)[2]+(b)[2];}
+#define VectorCopy(a,b) {(b)[0]=(a)[0];(b)[1]=(a)[1];(b)[2]=(a)[2];}
+#define VectorScale(a,b,c) {(c)[0]=(b)*(a)[0];(c)[1]=(b)*(a)[1];(c)[2]=(b)*(a)[2];}
+
+vec_t Q_rint (vec_t in);
+vec_t _DotProduct (vec3_t v1, vec3_t v2);
+void _VectorSubtract (vec3_t va, vec3_t vb, vec3_t out);
+void _VectorAdd (vec3_t va, vec3_t vb, vec3_t out);
+void _VectorCopy (vec3_t in, vec3_t out);
+void _VectorScale (vec3_t v, vec_t scale, vec3_t out);
+
+double VectorLength(vec3_t v);
+
+void VectorMA (vec3_t va, double scale, vec3_t vb, vec3_t vc);
+
+void CrossProduct (vec3_t v1, vec3_t v2, vec3_t cross);
+vec_t VectorNormalize (vec3_t v);
+void VectorInverse (vec3_t v);
+
+void ClearBounds (vec3_t mins, vec3_t maxs);
+void AddPointToBounds (vec3_t v, vec3_t mins, vec3_t maxs);
+
+void AngleMatrix (const vec3_t angles, float matrix[3][4] );
+void AngleIMatrix (const vec3_t angles, float matrix[3][4] );
+void R_ConcatTransforms (const float in1[3][4], const float in2[3][4], float out[3][4]);
+
+void VectorIRotate (const vec3_t in1, const float in2[3][4], vec3_t out);
+void VectorRotate (const vec3_t in1, const float in2[3][4], vec3_t out);
+
+void VectorTransform (const vec3_t in1, const float in2[3][4], vec3_t out);
+
+void AngleQuaternion( const vec3_t angles, vec4_t quaternion );
+void QuaternionMatrix( const vec4_t quaternion, float (*matrix)[4] );
+void QuaternionSlerp( const vec4_t p, vec4_t q, float t, vec4_t qt );
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/main/source/utils/common/movie.h b/main/source/utils/common/movie.h
new file mode 100644
index 00000000..85949054
--- /dev/null
+++ b/main/source/utils/common/movie.h
@@ -0,0 +1,36 @@
+/***
+*
+*	Copyright (c) 1998, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+****/
+
+#ifndef _MOVIE_H_
+#define _MOVIE_H_
+
+/*
+	movie.h
+
+	definitions and such for dumping screen shots to make a movie
+*/
+
+typedef struct
+{
+	unsigned long tag;
+	unsigned long size;
+} movieblockheader_t;
+
+
+typedef struct	
+{
+	short width;
+	short height;
+	short depth;
+} movieframe_t;
+
+
+
+#endif _MOVIE_H_
\ No newline at end of file
diff --git a/main/source/utils/common/polylib.c b/main/source/utils/common/polylib.c
new file mode 100644
index 00000000..eef7e8bf
--- /dev/null
+++ b/main/source/utils/common/polylib.c
@@ -0,0 +1,708 @@
+/***
+*
+*	Copyright (c) 1998, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+****/
+
+
+#include "cmdlib.h"
+#include "mathlib.h"
+#include "polylib.h"
+
+int	c_active_windings;
+int	c_peak_windings;
+int	c_winding_allocs;
+int	c_winding_points;
+
+#define	BOGUS_RANGE	8192
+
+void pw(winding_t *w)
+{
+	int		i;
+	for (i=0 ; i<w->numpoints ; i++)
+		printf ("(%5.1f, %5.1f, %5.1f)\n",w->p[i][0], w->p[i][1],w->p[i][2]);
+}
+
+
+/*
+=============
+AllocWinding
+=============
+*/
+winding_t	*AllocWinding (int points)
+{
+	winding_t	*w;
+	int			s;
+
+	c_winding_allocs++;
+	c_winding_points += points;
+	c_active_windings++;
+	if (c_active_windings > c_peak_windings)
+		c_peak_windings = c_active_windings;
+	s = sizeof(vec_t)*3*points + sizeof(int);
+	s += sizeof(vec_t) - sizeof(w->numpoints);		// padding
+
+	w = malloc (s);
+	memset (w, 0, s); 
+
+	return w;
+}
+
+void FreeWinding (winding_t *w)
+{
+	c_active_windings--;
+	free (w);
+}
+
+/*
+============
+RemoveColinearPoints
+============
+*/
+int	c_removed;
+
+void	RemoveColinearPoints (winding_t *w)
+{
+	int		i, j, k;
+	vec3_t	v1, v2;
+	int		nump;
+	vec3_t	p[MAX_POINTS_ON_WINDING];
+
+	nump = 0;
+	for (i=0 ; i<w->numpoints ; i++)
+	{
+		j = (i+1)%w->numpoints;
+		k = (i+w->numpoints-1)%w->numpoints;
+		VectorSubtract (w->p[j], w->p[i], v1);
+		VectorSubtract (w->p[i], w->p[k], v2);
+		VectorNormalize(v1);
+		VectorNormalize(v2);
+		if (DotProduct(v1, v2) < 1.0-ON_EPSILON)
+		{
+			VectorCopy (w->p[i], p[nump]);
+			nump++;
+		}
+	}
+
+	if (nump == w->numpoints)
+		return;
+
+	c_removed += w->numpoints - nump;
+	w->numpoints = nump;
+	memcpy (w->p, p, nump*sizeof(p[0]));
+}
+
+/*
+============
+WindingPlane
+============
+*/
+void WindingPlane (winding_t *w, vec3_t normal, vec_t *dist)
+{
+	vec3_t	v1, v2;
+
+	VectorSubtract (w->p[1], w->p[0], v1);
+	VectorSubtract (w->p[2], w->p[0], v2);
+	CrossProduct (v2, v1, normal);
+	VectorNormalize (normal);
+	*dist = DotProduct (w->p[0], normal);
+
+}
+
+/*
+=============
+WindingArea
+=============
+*/
+vec_t	WindingArea (winding_t *w)
+{
+	int		i;
+	vec3_t	d1, d2, cross;
+	vec_t	total;
+
+	total = 0;
+	for (i=2 ; i<w->numpoints ; i++)
+	{
+		VectorSubtract (w->p[i-1], w->p[0], d1);
+		VectorSubtract (w->p[i], w->p[0], d2);
+		CrossProduct (d1, d2, cross);
+		total += 0.5 * VectorLength ( cross );
+	}
+	return total;
+}
+
+void	WindingBounds (winding_t *w, vec3_t mins, vec3_t maxs)
+{
+	vec_t	v;
+	int		i,j;
+
+	mins[0] = mins[1] = mins[2] = 99999;
+	maxs[0] = maxs[1] = maxs[2] = -99999;
+
+	for (i=0 ; i<w->numpoints ; i++)
+	{
+		for (j=0 ; j<3 ; j++)
+		{
+			v = w->p[i][j];
+			if (v < mins[j])
+				mins[j] = v;
+			if (v > maxs[j])
+				maxs[j] = v;
+		}
+	}
+}
+
+/*
+=============
+WindingCenter
+=============
+*/
+void	WindingCenter (winding_t *w, vec3_t center)
+{
+	int		i;
+	vec3_t	d1, d2, cross;
+	float	scale;
+
+	VectorCopy (vec3_origin, center);
+	for (i=0 ; i<w->numpoints ; i++)
+		VectorAdd (w->p[i], center, center);
+
+	scale = 1.0/w->numpoints;
+	VectorScale (center, scale, center);
+}
+
+/*
+=================
+BaseWindingForPlane
+=================
+*/
+winding_t *BaseWindingForPlane (vec3_t normal, float dist)
+{
+	int		i, x;
+	vec_t	max, v;
+	vec3_t	org, vright, vup;
+	winding_t	*w;
+	
+// find the major axis
+
+	max = -BOGUS_RANGE;
+	x = -1;
+	for (i=0 ; i<3; i++)
+	{
+		v = fabs(normal[i]);
+		if (v > max)
+		{
+			x = i;
+			max = v;
+		}
+	}
+	if (x==-1)
+		Error ("BaseWindingForPlane: no axis found");
+		
+	VectorCopy (vec3_origin, vup);	
+	switch (x)
+	{
+	case 0:
+	case 1:
+		vup[2] = 1;
+		break;		
+	case 2:
+		vup[0] = 1;
+		break;		
+	}
+
+	v = DotProduct (vup, normal);
+	VectorMA (vup, -v, normal, vup);
+	VectorNormalize (vup);
+		
+	VectorScale (normal, dist, org);
+	
+	CrossProduct (vup, normal, vright);
+	
+	VectorScale (vup, 9000, vup);
+	VectorScale (vright, 9000, vright);
+
+// project a really big	axis aligned box onto the plane
+	w = AllocWinding (4);
+	
+	VectorSubtract (org, vright, w->p[0]);
+	VectorAdd (w->p[0], vup, w->p[0]);
+	
+	VectorAdd (org, vright, w->p[1]);
+	VectorAdd (w->p[1], vup, w->p[1]);
+	
+	VectorAdd (org, vright, w->p[2]);
+	VectorSubtract (w->p[2], vup, w->p[2]);
+	
+	VectorSubtract (org, vright, w->p[3]);
+	VectorSubtract (w->p[3], vup, w->p[3]);
+
+	w->numpoints = 4;
+	
+	return w;	
+}
+
+/*
+==================
+CopyWinding
+==================
+*/
+winding_t	*CopyWinding (winding_t *w)
+{
+	int			size;
+	winding_t	*c;
+	
+	size = (int)((winding_t *)0)->p[w->numpoints];
+	c = malloc (size);
+	memcpy (c, w, size);
+	return c;
+}
+
+
+/*
+=============
+ClipWinding
+=============
+*/
+void	ClipWinding (winding_t *in, vec3_t normal, vec_t dist,
+					 winding_t **front, winding_t **back)
+{
+	vec_t	dists[MAX_POINTS_ON_WINDING+4];
+	int		sides[MAX_POINTS_ON_WINDING+4];
+	int		counts[3];
+	vec_t	dot;
+	int		i, j;
+	vec_t	*p1, *p2;
+	vec3_t	mid;
+	winding_t	*f, *b;
+	int		maxpts;
+	
+	counts[0] = counts[1] = counts[2] = 0;
+
+// determine sides for each point
+	for (i=0 ; i<in->numpoints ; i++)
+	{
+		dot = DotProduct (in->p[i], normal);
+		dot -= dist;
+		dists[i] = dot;
+		if (dot > ON_EPSILON)
+			sides[i] = SIDE_FRONT;
+		else if (dot < -ON_EPSILON)
+			sides[i] = SIDE_BACK;
+		else
+		{
+			sides[i] = SIDE_ON;
+		}
+		counts[sides[i]]++;
+	}
+	sides[i] = sides[0];
+	dists[i] = dists[0];
+	
+	*front = *back = NULL;
+
+	if (!counts[0])
+	{
+		*back = CopyWinding (in);
+		return;
+	}
+	if (!counts[1])
+	{
+		*front = CopyWinding (in);
+		return;
+	}
+
+	maxpts = in->numpoints+4;	// can't use counts[0]+2 because
+								// of fp grouping errors
+
+	*front = f = AllocWinding (maxpts);
+	*back = b = AllocWinding (maxpts);
+		
+	for (i=0 ; i<in->numpoints ; i++)
+	{
+		p1 = in->p[i];
+		
+		if (sides[i] == SIDE_ON)
+		{
+			VectorCopy (p1, f->p[f->numpoints]);
+			f->numpoints++;
+			VectorCopy (p1, b->p[b->numpoints]);
+			b->numpoints++;
+			continue;
+		}
+	
+		if (sides[i] == SIDE_FRONT)
+		{
+			VectorCopy (p1, f->p[f->numpoints]);
+			f->numpoints++;
+		}
+		if (sides[i] == SIDE_BACK)
+		{
+			VectorCopy (p1, b->p[b->numpoints]);
+			b->numpoints++;
+		}
+
+		if (sides[i+1] == SIDE_ON || sides[i+1] == sides[i])
+			continue;
+			
+	// generate a split point
+		p2 = in->p[(i+1)%in->numpoints];
+		
+		dot = dists[i] / (dists[i]-dists[i+1]);
+		for (j=0 ; j<3 ; j++)
+		{	// avoid round off error when possible
+			if (normal[j] == 1)
+				mid[j] = dist;
+			else if (normal[j] == -1)
+				mid[j] = -dist;
+			else
+				mid[j] = p1[j] + dot*(p2[j]-p1[j]);
+		}
+			
+		VectorCopy (mid, f->p[f->numpoints]);
+		f->numpoints++;
+		VectorCopy (mid, b->p[b->numpoints]);
+		b->numpoints++;
+	}
+	
+	if (f->numpoints > maxpts || b->numpoints > maxpts)
+		Error ("ClipWinding: points exceeded estimate");
+	if (f->numpoints > MAX_POINTS_ON_WINDING || b->numpoints > MAX_POINTS_ON_WINDING)
+		Error ("ClipWinding: MAX_POINTS_ON_WINDING");
+}
+
+
+
+/*
+=============
+ClipWindingNoCopy
+=============
+*/
+void	ClipWindingNoCopy (winding_t *in, vec3_t normal, vec_t dist,
+					 winding_t **front, winding_t **back)
+{
+	vec_t	dists[MAX_POINTS_ON_WINDING+4];
+	int		sides[MAX_POINTS_ON_WINDING+4];
+	int		counts[3];
+	vec_t	dot;
+	int		i, j;
+	vec_t	*p1, *p2;
+	vec3_t	mid;
+	winding_t	*f, *b;
+	int		maxpts;
+	
+	counts[0] = counts[1] = counts[2] = 0;
+
+// determine sides for each point
+	for (i=0 ; i<in->numpoints ; i++)
+	{
+		dot = DotProduct (in->p[i], normal);
+		dot -= dist;
+		dists[i] = dot;
+		if (dot > ON_EPSILON)
+			sides[i] = SIDE_FRONT;
+		else if (dot < -ON_EPSILON)
+			sides[i] = SIDE_BACK;
+		else
+		{
+			sides[i] = SIDE_ON;
+		}
+		counts[sides[i]]++;
+	}
+	sides[i] = sides[0];
+	dists[i] = dists[0];
+	
+	*front = *back = NULL;
+
+	if (!counts[0])
+	{
+		*back = in;
+		return;
+	}
+	if (!counts[1])
+	{
+		*front = in;
+		return;
+	}
+
+	maxpts = in->numpoints+4;	// can't use counts[0]+2 because
+								// of fp grouping errors
+
+	*front = f = AllocWinding (maxpts);
+	*back = b = AllocWinding (maxpts);
+		
+	for (i=0 ; i<in->numpoints ; i++)
+	{
+		p1 = in->p[i];
+		
+		if (sides[i] == SIDE_ON)
+		{
+			VectorCopy (p1, f->p[f->numpoints]);
+			f->numpoints++;
+			VectorCopy (p1, b->p[b->numpoints]);
+			b->numpoints++;
+			continue;
+		}
+	
+		if (sides[i] == SIDE_FRONT)
+		{
+			VectorCopy (p1, f->p[f->numpoints]);
+			f->numpoints++;
+		}
+		if (sides[i] == SIDE_BACK)
+		{
+			VectorCopy (p1, b->p[b->numpoints]);
+			b->numpoints++;
+		}
+
+		if (sides[i+1] == SIDE_ON || sides[i+1] == sides[i])
+			continue;
+			
+	// generate a split point
+		p2 = in->p[(i+1)%in->numpoints];
+		
+		dot = dists[i] / (dists[i]-dists[i+1]);
+		for (j=0 ; j<3 ; j++)
+		{	// avoid round off error when possible
+			if (normal[j] == 1)
+				mid[j] = dist;
+			else if (normal[j] == -1)
+				mid[j] = -dist;
+			else
+				mid[j] = p1[j] + dot*(p2[j]-p1[j]);
+		}
+			
+		VectorCopy (mid, f->p[f->numpoints]);
+		f->numpoints++;
+		VectorCopy (mid, b->p[b->numpoints]);
+		b->numpoints++;
+	}
+	
+	if (f->numpoints > maxpts || b->numpoints > maxpts)
+		Error ("ClipWinding: points exceeded estimate");
+	if (f->numpoints > MAX_POINTS_ON_WINDING || b->numpoints > MAX_POINTS_ON_WINDING)
+		Error ("ClipWinding: MAX_POINTS_ON_WINDING");
+}
+
+
+/*
+=============
+ChopWindingNoFree
+=============
+*/
+winding_t	*ChopWindingNoFree (winding_t *in, vec3_t normal, vec_t dist)
+{
+	vec_t	dists[MAX_POINTS_ON_WINDING+4];
+	int		sides[MAX_POINTS_ON_WINDING+4];
+	int		counts[3];
+	vec_t	dot;
+	int		i, j;
+	vec_t	*p1, *p2;
+	vec3_t	mid;
+	winding_t	*f;
+	int		maxpts;
+
+	counts[0] = counts[1] = counts[2] = 0;
+
+// determine sides for each point
+	for (i=0 ; i<in->numpoints ; i++)
+	{
+		dot = DotProduct (in->p[i], normal);
+		dot -= dist;
+		dists[i] = dot;
+		if (dot > ON_EPSILON)
+			sides[i] = SIDE_FRONT;
+		else if (dot < -ON_EPSILON)
+			sides[i] = SIDE_BACK;
+		else
+		{
+			sides[i] = SIDE_ON;
+		}
+		counts[sides[i]]++;
+	}
+	sides[i] = sides[0];
+	dists[i] = dists[0];
+	
+	if (!counts[0])
+		return NULL;
+	if (!counts[1])
+		return in;
+
+	maxpts = in->numpoints+4;	// can't use counts[0]+2 because
+								// of fp grouping errors
+
+	f = AllocWinding (maxpts);
+		
+	for (i=0 ; i<in->numpoints ; i++)
+	{
+		p1 = in->p[i];
+		
+		if (sides[i] == SIDE_ON)
+		{
+			VectorCopy (p1, f->p[f->numpoints]);
+			f->numpoints++;
+			continue;
+		}
+	
+		if (sides[i] == SIDE_FRONT)
+		{
+			VectorCopy (p1, f->p[f->numpoints]);
+			f->numpoints++;
+		}
+
+		if (sides[i+1] == SIDE_ON || sides[i+1] == sides[i])
+			continue;
+			
+	// generate a split point
+		p2 = in->p[(i+1)%in->numpoints];
+		
+		dot = dists[i] / (dists[i]-dists[i+1]);
+		for (j=0 ; j<3 ; j++)
+		{	// avoid round off error when possible
+			if (normal[j] == 1)
+				mid[j] = dist;
+			else if (normal[j] == -1)
+				mid[j] = -dist;
+			else
+				mid[j] = p1[j] + dot*(p2[j]-p1[j]);
+		}
+			
+		VectorCopy (mid, f->p[f->numpoints]);
+		f->numpoints++;
+	}
+	
+	if (f->numpoints > maxpts)
+		Error ("ClipWinding: points exceeded estimate");
+	if (f->numpoints > MAX_POINTS_ON_WINDING)
+		Error ("ClipWinding: MAX_POINTS_ON_WINDING");
+
+	return f;
+}
+
+
+/*
+=================
+ChopWinding
+
+Returns the fragment of in that is on the front side
+of the cliping plane.  The original is freed.
+=================
+*/
+winding_t	*ChopWinding (winding_t *in, vec3_t normal, vec_t dist)
+{
+	winding_t	*f, *b;
+
+	ClipWinding (in, normal, dist, &f, &b);
+	FreeWinding (in);
+	if (b)
+		FreeWinding (b);
+	return f;
+}
+
+
+/*
+=================
+CheckWinding
+
+=================
+*/
+void CheckWinding (winding_t *w)
+{
+	int		i, j;
+	vec_t	*p1, *p2;
+	vec_t	d, edgedist;
+	vec3_t	dir, edgenormal, facenormal;
+	vec_t	area;
+	vec_t	facedist;
+
+	if (w->numpoints < 3)
+		Error ("CheckWinding: %i points",w->numpoints);
+	
+	area = WindingArea(w);
+	if (area < 1)
+		Error ("CheckWinding: %f area", area);
+
+	WindingPlane (w, facenormal, &facedist);
+	
+	for (i=0 ; i<w->numpoints ; i++)
+	{
+		p1 = w->p[i];
+
+		for (j=0 ; j<3 ; j++)
+			if (p1[j] > BOGUS_RANGE || p1[j] < -BOGUS_RANGE)
+				Error ("CheckFace: BUGUS_RANGE: %f",p1[j]);
+
+		j = i+1 == w->numpoints ? 0 : i+1;
+		
+	// check the point is on the face plane
+		d = DotProduct (p1, facenormal) - facedist;
+		if (d < -ON_EPSILON || d > ON_EPSILON)
+			Error ("CheckWinding: point off plane");
+	
+	// check the edge isn't degenerate
+		p2 = w->p[j];
+		VectorSubtract (p2, p1, dir);
+		
+		if (VectorLength (dir) < ON_EPSILON)
+			Error ("CheckWinding: degenerate edge");
+			
+		CrossProduct (facenormal, dir, edgenormal);
+		VectorNormalize (edgenormal);
+		edgedist = DotProduct (p1, edgenormal);
+		edgedist += ON_EPSILON;
+		
+	// all other points must be on front side
+		for (j=0 ; j<w->numpoints ; j++)
+		{
+			if (j == i)
+				continue;
+			d = DotProduct (w->p[j], edgenormal);
+			if (d > edgedist)
+				Error ("CheckWinding: non-convex");
+		}
+	}
+}
+
+
+/*
+============
+WindingOnPlaneSide
+============
+*/
+int		WindingOnPlaneSide (winding_t *w, vec3_t normal, vec_t dist)
+{
+	qboolean	front, back;
+	int			i;
+	vec_t		d;
+
+	front = false;
+	back = false;
+	for (i=0 ; i<w->numpoints ; i++)
+	{
+		d = DotProduct (w->p[i], normal) - dist;
+		if (d < -ON_EPSILON)
+		{
+			if (front)
+				return SIDE_CROSS;
+			back = true;
+			continue;
+		}
+		if (d > ON_EPSILON)
+		{
+			if (back)
+				return SIDE_CROSS;
+			front = true;
+			continue;
+		}
+	}
+
+	if (back)
+		return SIDE_BACK;
+	if (front)
+		return SIDE_FRONT;
+	return SIDE_ON;
+}
+
diff --git a/main/source/utils/common/polylib.h b/main/source/utils/common/polylib.h
new file mode 100644
index 00000000..cda1fc0d
--- /dev/null
+++ b/main/source/utils/common/polylib.h
@@ -0,0 +1,36 @@
+/***
+*
+*	Copyright (c) 1998, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+****/
+
+
+typedef struct
+{
+	int		numpoints;
+	vec3_t	p[8];		// variable sized
+} winding_t;
+
+#define	MAX_POINTS_ON_WINDING	128
+
+winding_t	*AllocWinding (int points);
+vec_t	WindingArea (winding_t *w);
+void	WindingCenter (winding_t *w, vec3_t center);
+void	ClipWinding (winding_t *in, vec3_t normal, vec_t dist,
+					 winding_t **front, winding_t **back);
+void	ClipWindingNoCopy (winding_t *in, vec3_t normal, vec_t dist,
+					 winding_t **front, winding_t **back);
+winding_t	*ChopWinding (winding_t *in, vec3_t normal, vec_t dist);
+winding_t	*ChopWindingNoFree (winding_t *in, vec3_t normal, vec_t dist);
+winding_t	*CopyWinding (winding_t *w);
+winding_t	*BaseWindingForPlane (vec3_t normal, float dist);
+void	CheckWinding (winding_t *w);
+void	WindingPlane (winding_t *w, vec3_t normal, vec_t *dist);
+void	RemoveColinearPoints (winding_t *w);
+int		WindingOnPlaneSide (winding_t *w, vec3_t normal, vec_t dist);
+void	FreeWinding (winding_t *w);
+void	WindingBounds (winding_t *w, vec3_t mins, vec3_t maxs);
\ No newline at end of file
diff --git a/main/source/utils/common/scriplib.c b/main/source/utils/common/scriplib.c
new file mode 100644
index 00000000..c5e6f0d8
--- /dev/null
+++ b/main/source/utils/common/scriplib.c
@@ -0,0 +1,268 @@
+/***
+*
+*	Copyright (c) 1998, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+****/
+
+// scriplib.c
+
+#include "cmdlib.h"
+#include "scriplib.h"
+
+/*
+=============================================================================
+
+						PARSING STUFF
+
+=============================================================================
+*/
+
+typedef struct
+{
+	char	filename[1024];
+	char    *buffer,*script_p,*end_p;
+	int     line;
+} script_t;
+
+#define	MAX_INCLUDES	8
+script_t	scriptstack[MAX_INCLUDES];
+script_t	*script;
+int			scriptline;
+
+char    token[MAXTOKEN];
+qboolean endofscript;
+qboolean tokenready;                     // only true if UnGetToken was just called
+
+/*
+==============
+AddScriptToStack
+==============
+*/
+void AddScriptToStack (char *filename)
+{
+	int            size;
+
+	script++;
+	if (script == &scriptstack[MAX_INCLUDES])
+		Error ("script file exceeded MAX_INCLUDES");
+	strcpy (script->filename, ExpandPath (filename) );
+
+	size = LoadFile (script->filename, (void **)&script->buffer);
+
+	printf ("entering %s\n", script->filename);
+
+	script->line = 1;
+
+	script->script_p = script->buffer;
+	script->end_p = script->buffer + size;
+}
+
+
+/*
+==============
+LoadScriptFile
+==============
+*/
+void LoadScriptFile (char *filename)
+{
+	script = scriptstack;
+	AddScriptToStack (filename);
+
+	endofscript = false;
+	tokenready = false;
+}
+
+
+/*
+==============
+ParseFromMemory
+==============
+*/
+void ParseFromMemory (char *buffer, int size)
+{
+	script = scriptstack;
+	script++;
+	if (script == &scriptstack[MAX_INCLUDES])
+		Error ("script file exceeded MAX_INCLUDES");
+	strcpy (script->filename, "memory buffer" );
+
+	script->buffer = buffer;
+	script->line = 1;
+	script->script_p = script->buffer;
+	script->end_p = script->buffer + size;
+
+	endofscript = false;
+	tokenready = false;
+}
+
+
+/*
+==============
+UnGetToken
+
+Signals that the current token was not used, and should be reported
+for the next GetToken.  Note that
+
+GetToken (true);
+UnGetToken ();
+GetToken (false);
+
+could cross a line boundary.
+==============
+*/
+void UnGetToken (void)
+{
+	tokenready = true;
+}
+
+
+qboolean EndOfScript (qboolean crossline)
+{
+	if (!crossline)
+		Error ("Line %i is incomplete\n",scriptline);
+
+	if (!strcmp (script->filename, "memory buffer"))
+	{
+		endofscript = true;
+		return false;
+	}
+
+	free (script->buffer);
+	if (script == scriptstack+1)
+	{
+		endofscript = true;
+		return false;
+	}
+	script--;
+	scriptline = script->line;
+	printf ("returning to %s\n", script->filename);
+	return GetToken (crossline);
+}
+
+/*
+==============
+GetToken
+==============
+*/
+qboolean GetToken (qboolean crossline)
+{
+	char    *token_p;
+
+	if (tokenready)                         // is a token allready waiting?
+	{
+		tokenready = false;
+		return true;
+	}
+
+	if (script->script_p >= script->end_p)
+		return EndOfScript (crossline);
+
+//
+// skip space
+//
+skipspace:
+	while (*script->script_p <= 32)
+	{
+		if (script->script_p >= script->end_p)
+			return EndOfScript (crossline);
+		if (*script->script_p++ == '\n')
+		{
+			if (!crossline)
+				Error ("Line %i is incomplete\n",scriptline);
+			scriptline = script->line++;
+		}
+	}
+
+	if (script->script_p >= script->end_p)
+		return EndOfScript (crossline);
+
+	if (*script->script_p == ';' || *script->script_p == '#' ||		 // semicolon and # is comment field
+		(*script->script_p == '/' && *((script->script_p)+1) == '/')) // also make // a comment field
+	{											
+		if (!crossline)
+			Error ("Line %i is incomplete\n",scriptline);
+		while (*script->script_p++ != '\n')
+			if (script->script_p >= script->end_p)
+				return EndOfScript (crossline);
+		goto skipspace;
+	}
+
+//
+// copy token
+//
+	token_p = token;
+
+	if (*script->script_p == '"')
+	{
+		// quoted token
+		script->script_p++;
+		while (*script->script_p != '"')
+		{
+			*token_p++ = *script->script_p++;
+			if (script->script_p == script->end_p)
+				break;
+			if (token_p == &token[MAXTOKEN])
+				Error ("Token too large on line %i\n",scriptline);
+		}
+		script->script_p++;
+	}
+	else	// regular token
+	while ( *script->script_p > 32 && *script->script_p != ';')
+	{
+		*token_p++ = *script->script_p++;
+		if (script->script_p == script->end_p)
+			break;
+		if (token_p == &token[MAXTOKEN])
+			Error ("Token too large on line %i\n",scriptline);
+	}
+
+	*token_p = 0;
+
+	if (!strcmp (token, "$include"))
+	{
+		GetToken (false);
+		AddScriptToStack (token);
+		return GetToken (crossline);
+	}
+
+	return true;
+}
+
+
+/*
+==============
+TokenAvailable
+
+Returns true if there is another token on the line
+==============
+*/
+qboolean TokenAvailable (void)
+{
+	char    *search_p;
+
+	search_p = script->script_p;
+
+	if (search_p >= script->end_p)
+		return false;
+
+	while ( *search_p <= 32)
+	{
+		if (*search_p == '\n')
+			return false;
+		search_p++;
+		if (search_p == script->end_p)
+			return false;
+
+	}
+
+	if (*search_p == ';')
+		return false;
+
+	return true;
+}
+
+
diff --git a/main/source/utils/common/scriplib.h b/main/source/utils/common/scriplib.h
new file mode 100644
index 00000000..9a20cf51
--- /dev/null
+++ b/main/source/utils/common/scriplib.h
@@ -0,0 +1,33 @@
+/***
+*
+*	Copyright (c) 1998, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+****/
+
+// scriplib.h
+
+#ifndef __CMDLIB__
+#include "cmdlib.h"
+#endif
+
+#define	MAXTOKEN	512
+
+extern	char	token[MAXTOKEN];
+extern	char	*scriptbuffer,*script_p,*scriptend_p;
+extern	int		grabbed;
+extern	int		scriptline;
+extern	qboolean	endofscript;
+
+
+void LoadScriptFile (char *filename);
+void ParseFromMemory (char *buffer, int size);
+
+qboolean GetToken (qboolean crossline);
+void UnGetToken (void);
+qboolean TokenAvailable (void);
+
+
diff --git a/main/source/utils/common/threads.c b/main/source/utils/common/threads.c
new file mode 100644
index 00000000..b5dfae20
--- /dev/null
+++ b/main/source/utils/common/threads.c
@@ -0,0 +1,330 @@
+/***
+*
+*	Copyright (c) 1998, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+****/
+
+#include "cmdlib.h"
+#define NO_THREAD_NAMES
+#include "threads.h"
+
+#define	MAX_THREADS	64
+
+int		dispatch;
+int		workcount;
+int		oldf;
+qboolean		pacifier;
+
+qboolean	threaded;
+
+/*
+=============
+GetThreadWork
+
+=============
+*/
+int	GetThreadWork (void)
+{
+	int	r;
+	int	f;
+
+	ThreadLock ();
+
+	if (dispatch == workcount)
+	{
+		ThreadUnlock ();
+		return -1;
+	}
+
+	f = 10*dispatch / workcount;
+	if (f != oldf)
+	{
+		oldf = f;
+		if (pacifier)
+			printf ("%i...", f);
+	}
+
+	r = dispatch;
+	dispatch++;
+	ThreadUnlock ();
+
+	return r;
+}
+
+
+void (*workfunction) (int);
+
+void ThreadWorkerFunction (int threadnum)
+{
+	int		work;
+
+	while (1)
+	{
+		work = GetThreadWork ();
+		if (work == -1)
+			break;
+		workfunction(work);
+	}
+}
+
+void RunThreadsOnIndividual (int workcnt, qboolean showpacifier, void(*func)(int))
+{
+	workfunction = func;
+	RunThreadsOn (workcnt, showpacifier, ThreadWorkerFunction);
+}
+
+
+/*
+===================================================================
+
+WIN32
+
+===================================================================
+*/
+#ifdef WIN32
+
+#define	USED
+
+#include <windows.h>
+
+int		numthreads = -1;
+CRITICAL_SECTION		crit;
+static int enter;
+
+void ThreadSetDefault (void)
+{
+	SYSTEM_INFO info;
+
+	if (numthreads == -1)	// not set manually
+	{
+		GetSystemInfo (&info);
+		numthreads = info.dwNumberOfProcessors;
+		if (numthreads < 1 || numthreads > 32)
+			numthreads = 1;
+	}
+
+	qprintf ("%i threads\n", numthreads);
+}
+
+
+void ThreadLock (void)
+{
+	if (!threaded)
+		return;
+	EnterCriticalSection (&crit);
+	if (enter)
+		Error ("Recursive ThreadLock\n");
+	enter = 1;
+}
+
+void ThreadUnlock (void)
+{
+	if (!threaded)
+		return;
+	if (!enter)
+		Error ("ThreadUnlock without lock\n");
+	enter = 0;
+	LeaveCriticalSection (&crit);
+}
+
+/*
+=============
+RunThreadsOn
+=============
+*/
+void RunThreadsOn (int workcnt, qboolean showpacifier, void(*func)(int))
+{
+	int		threadid[MAX_THREADS];
+	HANDLE	threadhandle[MAX_THREADS];
+	int		i;
+	int		start, end;
+
+	start = I_FloatTime ();
+	dispatch = 0;
+	workcount = workcnt;
+	oldf = -1;
+	pacifier = showpacifier;
+	threaded = true;
+	//
+	// run threads in parallel
+	//
+	InitializeCriticalSection (&crit);
+	for (i=0 ; i<numthreads ; i++)
+	{
+		threadhandle[i] = CreateThread(
+		   NULL,	// LPSECURITY_ATTRIBUTES lpsa,
+		   0,		// DWORD cbStack,
+		   (LPTHREAD_START_ROUTINE)func,	// LPTHREAD_START_ROUTINE lpStartAddr,
+		   (LPVOID)i,	// LPVOID lpvThreadParm,
+		   0,			//   DWORD fdwCreate,
+		   &threadid[i]);
+	}
+
+	for (i=0 ; i<numthreads ; i++)
+		WaitForSingleObject (threadhandle[i], INFINITE);
+	DeleteCriticalSection (&crit);
+
+	threaded = false;
+	end = I_FloatTime ();
+	if (pacifier)
+		printf (" (%i)\n", end-start);
+}
+
+
+#endif
+
+/*
+===================================================================
+
+OSF1
+
+===================================================================
+*/
+
+#ifdef __osf__
+#define	USED
+
+int		numthreads = 4;
+
+void ThreadSetDefault (void)
+{
+	numthreads = 4;
+}
+
+
+#include <pthread.h>
+
+pthread_mutex_t	*my_mutex;
+
+void ThreadLock (void)
+{
+	if (my_mutex)
+		pthread_mutex_lock (my_mutex);
+}
+
+void ThreadUnlock (void)
+{
+	if (my_mutex)
+		pthread_mutex_unlock (my_mutex);
+}
+
+
+/*
+=============
+RunThreadsOn
+=============
+*/
+void RunThreadsOn (int workcnt, qboolean showpacifier, void(*func)(int))
+{
+	int		i;
+	pthread_t	work_threads[MAX_THREADS];
+	pthread_addr_t	status;
+	pthread_attr_t	attrib;
+	pthread_mutexattr_t	mattrib;
+	int		start, end;
+
+	start = I_FloatTime ();
+	dispatch = 0;
+	workcount = workcnt;
+	oldf = -1;
+	pacifier = showpacifier;
+	threaded = true;
+
+	if (pacifier)
+		setbuf (stdout, NULL);
+
+	if (!my_mutex)
+	{
+		my_mutex = malloc (sizeof(*my_mutex));
+		if (pthread_mutexattr_create (&mattrib) == -1)
+			Error ("pthread_mutex_attr_create failed");
+		if (pthread_mutexattr_setkind_np (&mattrib, MUTEX_FAST_NP) == -1)
+			Error ("pthread_mutexattr_setkind_np failed");
+		if (pthread_mutex_init (my_mutex, mattrib) == -1)
+			Error ("pthread_mutex_init failed");
+	}
+
+	if (pthread_attr_create (&attrib) == -1)
+		Error ("pthread_attr_create failed");
+	if (pthread_attr_setstacksize (&attrib, 0x100000) == -1)
+		Error ("pthread_attr_setstacksize failed");
+	
+	for (i=0 ; i<numthreads ; i++)
+	{
+  		if (pthread_create(&work_threads[i], attrib
+		, (pthread_startroutine_t)func, (pthread_addr_t)i) == -1)
+			Error ("pthread_create failed");
+	}
+		
+	for (i=0 ; i<numthreads ; i++)
+	{
+		if (pthread_join (work_threads[i], &status) == -1)
+			Error ("pthread_join failed");
+	}
+
+	threaded = false;
+
+	end = I_FloatTime ();
+	if (pacifier)
+		printf (" (%i)\n", end-start);
+}
+
+
+#endif
+
+/*
+=======================================================================
+
+  SINGLE THREAD
+
+=======================================================================
+*/
+
+#ifndef USED
+
+int		numthreads = 1;
+
+void ThreadSetDefault (void)
+{
+	numthreads = 1;
+}
+
+void ThreadLock (void)
+{
+}
+
+void ThreadUnlock (void)
+{
+}
+
+/*
+=============
+RunThreadsOn
+=============
+*/
+void RunThreadsOn (int workcnt, qboolean showpacifier, void(*func)(int))
+{
+	int		i;
+	int		start, end;
+
+	dispatch = 0;
+	workcount = workcnt;
+	oldf = -1;
+	pacifier = showpacifier;
+	start = I_FloatTime (); 
+#ifdef NeXT
+	if (pacifier)
+		setbuf (stdout, NULL);
+#endif
+	func(0);
+
+	end = I_FloatTime ();
+	if (pacifier)
+		printf (" (%i)\n", end-start);
+}
+
+#endif
diff --git a/main/source/utils/common/threads.h b/main/source/utils/common/threads.h
new file mode 100644
index 00000000..500fe379
--- /dev/null
+++ b/main/source/utils/common/threads.h
@@ -0,0 +1,24 @@
+/***
+*
+*	Copyright (c) 1998, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+****/
+
+extern	int		numthreads;
+
+void ThreadSetDefault (void);
+int	GetThreadWork (void);
+void RunThreadsOnIndividual (int workcnt, qboolean showpacifier, void(*func)(int));
+void RunThreadsOn (int workcnt, qboolean showpacifier, void(*func)(int));
+void ThreadLock (void);
+void ThreadUnlock (void);
+
+#ifndef NO_THREAD_NAMES
+#define RunThreadsOn(n,p,f) { if (p) printf("%-20s ", #f ":"); RunThreadsOn(n,p,f); }
+#define RunThreadsOnIndividual(n,p,f) { if (p) printf("%-20s ", #f ":"); RunThreadsOnIndividual(n,p,f); }
+#endif
+
diff --git a/main/source/utils/sprgen/sprgen.c b/main/source/utils/sprgen/sprgen.c
new file mode 100644
index 00000000..1ef2b604
--- /dev/null
+++ b/main/source/utils/sprgen/sprgen.c
@@ -0,0 +1,617 @@
+/***
+*
+*	Copyright (c) 1996-2002, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+****/
+
+//
+// spritegen.c: generates a .spr file from a series of .lbm frame files.
+// Result is stored in /raid/quake/id1/sprites/<scriptname>.spr.
+//
+#pragma warning(disable : 4244)     // type conversion warning.
+#define INCLUDELIBS
+
+
+#ifdef NeXT
+#include <libc.h>
+#endif
+
+#include "spritegn.h"
+
+#define MAX_BUFFER_SIZE		0x100000
+#define MAX_FRAMES			1000
+
+dsprite_t		sprite;
+byte			*byteimage, *lbmpalette;
+int				byteimagewidth, byteimageheight;
+byte			*lumpbuffer = NULL, *plump;
+char			spritedir[1024];
+char			spriteoutname[1024];
+int				framesmaxs[2];
+int				framecount;
+
+qboolean do16bit = true;
+
+typedef struct {
+	spriteframetype_t	type;		// single frame or group of frames
+	void				*pdata;		// either a dspriteframe_t or group info
+	float				interval;	// only used for frames in groups
+	int					numgroupframes;	// only used by group headers
+} spritepackage_t;
+
+spritepackage_t	frames[MAX_FRAMES];
+
+void FinishSprite (void);
+void Cmd_Spritename (void);
+
+
+/*
+============
+WriteFrame
+============
+*/
+void WriteFrame (FILE *spriteouthandle, int framenum)
+{
+	dspriteframe_t	*pframe;
+	dspriteframe_t	frametemp;
+
+	pframe = (dspriteframe_t *)frames[framenum].pdata;
+	frametemp.origin[0] = LittleLong (pframe->origin[0]);
+	frametemp.origin[1] = LittleLong (pframe->origin[1]);
+	frametemp.width = LittleLong (pframe->width);
+	frametemp.height = LittleLong (pframe->height);
+
+	SafeWrite (spriteouthandle, &frametemp, sizeof (frametemp));
+	SafeWrite (spriteouthandle,
+			   (byte *)(pframe + 1),
+			   pframe->height * pframe->width);
+}
+
+
+/*
+============
+WriteSprite
+============
+*/
+void WriteSprite (FILE *spriteouthandle)
+{
+	int			i, groupframe, curframe;
+	dsprite_t	spritetemp;
+
+	sprite.boundingradius = sqrt (((framesmaxs[0] >> 1) *
+								   (framesmaxs[0] >> 1)) +
+								  ((framesmaxs[1] >> 1) *
+								   (framesmaxs[1] >> 1)));
+
+//
+// write out the sprite header
+//
+	spritetemp.type = LittleLong (sprite.type);
+	spritetemp.texFormat = LittleLong (sprite.texFormat);
+	spritetemp.boundingradius = LittleFloat (sprite.boundingradius);
+	spritetemp.width = LittleLong (framesmaxs[0]);
+	spritetemp.height = LittleLong (framesmaxs[1]);
+	spritetemp.numframes = LittleLong (sprite.numframes);
+	spritetemp.beamlength = LittleFloat (sprite.beamlength);
+	spritetemp.synctype = LittleFloat (sprite.synctype);
+	spritetemp.version = LittleLong (SPRITE_VERSION);
+	spritetemp.ident = LittleLong (IDSPRITEHEADER);
+
+	SafeWrite (spriteouthandle, &spritetemp, sizeof(spritetemp));
+
+	if( do16bit )
+	{
+		// Write out palette in 16bit mode
+		short cnt = 256;
+		SafeWrite( spriteouthandle, (void *) &cnt, sizeof(cnt) );
+		SafeWrite( spriteouthandle, lbmpalette, cnt * 3 );
+	}
+
+//
+// write out the frames
+//
+	curframe = 0;
+
+	for (i=0 ; i<sprite.numframes ; i++)
+	{
+		SafeWrite (spriteouthandle, &frames[curframe].type,
+				   sizeof(frames[curframe].type));
+
+		if (frames[curframe].type == SPR_SINGLE)
+		{
+		//
+		// single (non-grouped) frame
+		//
+			WriteFrame (spriteouthandle, curframe);
+			curframe++;
+		}
+		else
+		{
+			int					j, numframes;
+			dspritegroup_t		dsgroup;
+			float				totinterval;
+
+			groupframe = curframe;
+			curframe++;
+			numframes = frames[groupframe].numgroupframes;
+
+		//
+		// set and write the group header
+		//
+			dsgroup.numframes = LittleLong (numframes);
+
+			SafeWrite (spriteouthandle, &dsgroup, sizeof(dsgroup));
+
+		//
+		// write the interval array
+		//
+			totinterval = 0.0;
+
+			for (j=0 ; j<numframes ; j++)
+			{
+				dspriteinterval_t	temp;
+
+				totinterval += frames[groupframe+1+j].interval;
+				temp.interval = LittleFloat (totinterval);
+
+				SafeWrite (spriteouthandle, &temp, sizeof(temp));
+			}
+
+			for (j=0 ; j<numframes ; j++)
+			{
+				WriteFrame (spriteouthandle, curframe);
+				curframe++;
+			}
+		}
+	}
+
+}
+
+
+/*
+============
+ExecCommand
+============
+*/
+int	cmdsrun;
+
+void ExecCommand (char *cmd, ...)
+{
+	int		ret;
+	char	cmdline[1024];
+	va_list	argptr;
+	
+	cmdsrun++;
+	
+	va_start (argptr, cmd);
+	vsprintf (cmdline,cmd,argptr);
+	va_end (argptr);
+	
+//	printf ("=============================================================\n");
+//	printf ("spritegen: %s\n",cmdline);
+	fflush (stdout);
+	ret = system (cmdline);
+//	printf ("=============================================================\n");
+	
+	if (ret)
+		Error ("spritegen: exiting due to error");
+}
+
+/*
+==============
+LoadScreen
+==============
+*/
+void LoadScreen (char *name)
+{
+	static byte origpalette[256*3];
+	int iError;
+
+	printf ("grabbing from %s...\n",name);
+	iError = LoadBMP( name, &byteimage, &lbmpalette );
+	if (iError)
+		Error( "unable to load file \"%s\"\n", name );
+
+	byteimagewidth = bmhd.w;
+	byteimageheight = bmhd.h;
+
+	if (sprite.numframes == 0)
+		memcpy( origpalette, lbmpalette, sizeof( origpalette ));
+	else if (memcmp( origpalette, lbmpalette, sizeof( origpalette )) != 0)
+	{
+		Error( "bitmap \"%s\" doesn't share a pallette with the previous bitmap\n", name );
+	}
+}
+
+
+/*
+===============
+Cmd_Type
+===============
+*/
+void Cmd_Type (void)
+{
+	GetToken (false);
+	if (!strcmp (token, "vp_parallel_upright"))
+		sprite.type = SPR_VP_PARALLEL_UPRIGHT;
+	else if (!strcmp (token, "facing_upright"))
+		sprite.type = SPR_FACING_UPRIGHT;
+	else if (!strcmp (token, "vp_parallel"))
+		sprite.type = SPR_VP_PARALLEL;
+	else if (!strcmp (token, "oriented"))
+		sprite.type = SPR_ORIENTED;
+	else if (!strcmp (token, "vp_parallel_oriented"))
+		sprite.type = SPR_VP_PARALLEL_ORIENTED;
+	else
+		Error ("Bad sprite type\n");
+}
+
+
+/*
+===============
+Cmd_Texture
+===============
+*/
+void Cmd_Texture (void)
+{
+	GetToken (false);
+
+	if (!strcmp (token, "additive"))
+		sprite.texFormat = SPR_ADDITIVE;
+	else if (!strcmp (token, "normal"))
+		sprite.texFormat = SPR_NORMAL;
+	else if (!strcmp (token, "indexalpha"))
+		sprite.texFormat = SPR_INDEXALPHA;
+	else if (!strcmp (token, "alphatest"))
+		sprite.texFormat = SPR_ALPHTEST;
+	else
+		Error ("Bad sprite texture type\n");
+}
+
+
+/*
+===============
+Cmd_Beamlength
+===============
+*/
+void Cmd_Beamlength ()
+{
+	GetToken (false);
+	sprite.beamlength = atof (token);
+}
+
+
+/*
+===============
+Cmd_Load
+===============
+*/
+void Cmd_Load (void)
+{
+	GetToken (false);
+	LoadScreen (ExpandPathAndArchive(token));
+}
+
+
+/*
+===============
+Cmd_Frame
+===============
+*/
+void Cmd_Frame ()
+{
+	int             x,y,xl,yl,xh,yh,w,h;
+	byte            *screen_p, *source;
+	int             linedelta;
+	dspriteframe_t	*pframe;
+	int				pix;
+	
+	GetToken (false);
+	xl = atoi (token);
+	GetToken (false);
+	yl = atoi (token);
+	GetToken (false);
+	w = atoi (token);
+	GetToken (false);
+	h = atoi (token);
+
+	if ((xl & 0x07) || (yl & 0x07) || (w & 0x07) || (h & 0x07))
+		Error ("Sprite dimensions not multiples of 8\n");
+
+	if ((w > 256) || (h > 256))
+		Error ("Sprite has a dimension longer than 256");
+
+	xh = xl+w;
+	yh = yl+h;
+
+	pframe = (dspriteframe_t *)plump;
+	frames[framecount].pdata = pframe;
+	frames[framecount].type = SPR_SINGLE;
+
+	if (TokenAvailable ())
+	{
+		GetToken (false);
+		frames[framecount].interval = atof (token);
+		if (frames[framecount].interval <= 0.0)
+			Error ("Non-positive interval");
+	}
+	else
+	{
+		frames[framecount].interval = (float)0.1;
+	}
+	
+	if (TokenAvailable ())
+	{
+		GetToken (false);
+		pframe->origin[0] = -atoi (token);
+		GetToken (false);
+		pframe->origin[1] = atoi (token);
+	}
+	else
+	{
+		pframe->origin[0] = -(w >> 1);
+		pframe->origin[1] = h >> 1;
+	}
+
+	pframe->width = w;
+	pframe->height = h;
+
+	if (w > framesmaxs[0])
+		framesmaxs[0] = w;
+	
+	if (h > framesmaxs[1])
+		framesmaxs[1] = h;
+	
+	plump = (byte *)(pframe + 1);
+
+	screen_p = byteimage + yl*byteimagewidth + xl;
+	linedelta = byteimagewidth - w;
+
+	source = plump;
+
+	for (y=yl ; y<yh ; y++)
+	{
+		for (x=xl ; x<xh ; x++)
+		{
+			pix = *screen_p;
+			*screen_p++ = 0;
+//			if (pix == 255)
+//				pix = 0;
+			*plump++ = pix;
+		}
+		screen_p += linedelta;
+	}
+
+	framecount++;
+	if (framecount >= MAX_FRAMES)
+		Error ("Too many frames; increase MAX_FRAMES\n");
+}
+
+
+/*
+===============
+Cmd_GroupStart	
+===============
+*/
+void Cmd_GroupStart (void)
+{
+	int			groupframe;
+
+	groupframe = framecount++;
+
+	frames[groupframe].type = SPR_GROUP;
+	frames[groupframe].numgroupframes = 0;
+
+	while (1)
+	{
+		GetToken (true);
+		if (endofscript)
+			Error ("End of file during group");
+
+		if (!strcmp (token, "$frame"))
+		{
+			Cmd_Frame ();
+			frames[groupframe].numgroupframes++;
+		}
+		else if (!strcmp (token, "$load"))
+		{
+			Cmd_Load ();
+		}
+		else if (!strcmp (token, "$groupend"))
+		{
+			break;
+		}
+		else
+		{
+			Error ("$frame, $load, or $groupend expected\n");
+		}
+
+	}
+
+	if (frames[groupframe].numgroupframes == 0)
+		Error ("Empty group\n");
+}
+
+
+/*
+===============
+ParseScript	
+===============
+*/
+void ParseScript (void)
+{
+	while (1)
+	{
+		GetToken (true);
+		if (endofscript)
+			break;
+	
+		if (!strcmp (token, "$load"))
+		{
+			Cmd_Load ();
+		}
+		if (!strcmp (token, "$spritename"))
+		{
+			Cmd_Spritename ();
+		}
+		else if (!strcmp (token, "$type"))
+		{
+			Cmd_Type ();
+		}
+		else if (!strcmp (token, "$texture"))
+		{
+			Cmd_Texture ();
+		}
+		else if (!strcmp (token, "$beamlength"))
+		{
+			Cmd_Beamlength ();
+		}
+		else if (!strcmp (token, "$sync"))
+		{
+			sprite.synctype = ST_SYNC;
+		}
+		else if (!strcmp (token, "$frame"))
+		{
+			Cmd_Frame ();
+			sprite.numframes++;
+		}		
+		else if (!strcmp (token, "$load"))
+		{
+			Cmd_Load ();
+		}
+		else if (!strcmp (token, "$groupstart"))
+		{
+			Cmd_GroupStart ();
+			sprite.numframes++;
+		}
+	}
+}
+
+/*
+==============
+Cmd_Spritename
+==============
+*/
+void Cmd_Spritename (void)
+{
+	if (sprite.numframes)
+		FinishSprite ();
+
+	GetToken (false);
+	sprintf (spriteoutname, "%s%s.spr", spritedir, token);
+	memset (&sprite, 0, sizeof(sprite));
+	framecount = 0;
+
+	framesmaxs[0] = -9999999;
+	framesmaxs[1] = -9999999;
+
+	if ( !lumpbuffer )
+		lumpbuffer = malloc (MAX_BUFFER_SIZE * 2);	// *2 for padding
+
+	if (!lumpbuffer)
+		Error ("Couldn't get buffer memory");
+
+	plump = lumpbuffer;
+	sprite.synctype = ST_RAND;	// default
+}
+
+/*
+==============
+FinishSprite	
+==============
+*/
+void FinishSprite (void)
+{
+	FILE	*spriteouthandle;
+
+	if (sprite.numframes == 0)
+		Error ("no frames\n");
+
+	if (!strlen(spriteoutname))
+		Error ("Didn't name sprite file");
+		
+	if ((plump - lumpbuffer) > MAX_BUFFER_SIZE)
+		Error ("Sprite package too big; increase MAX_BUFFER_SIZE");
+
+	spriteouthandle = SafeOpenWrite (spriteoutname);
+	printf ("saving in %s\n", spriteoutname);
+	WriteSprite (spriteouthandle);
+	fclose (spriteouthandle);
+	
+	printf ("spritegen: successful\n");
+	printf ("%d frame(s)\n", sprite.numframes);
+	printf ("%d ungrouped frame(s), including group headers\n", framecount);
+	
+	spriteoutname[0] = 0;		// clear for a new sprite
+}
+
+/*
+==============
+main
+	
+==============
+*/
+extern char qproject[];
+
+int main (int argc, char **argv)
+{
+	int		i;
+
+	printf( "sprgen.exe v 1.1 (%s)\n", __DATE__ );
+	printf ("----- Sprite Gen ----\n");
+
+	if (argc < 2 || argc > 7 )
+		Error ("usage: sprgen [-archive directory] [-no16bit] [-proj <project>] file.qc");
+		
+	for( i=1; i<argc; i++ )
+	{
+		if( *argv[ i ] == '-' )
+		{
+			if( !strcmp( argv[ i ], "-archive" ) )
+			{
+				archive = true;
+				strcpy (archivedir, argv[i+1]);
+				printf ("Archiving source to: %s\n", archivedir);
+				i++;
+			}
+			else if( !strcmp( argv[ i ], "-proj" ) )
+			{
+				strcpy( qproject, argv[i+1] );
+				i++;
+			}
+			else if( !strcmp( argv[ i ], "-16bit" ) )
+			{
+				do16bit = true;
+			}
+			else if( !strcmp( argv[ i ], "-no16bit" ) )
+			{
+				do16bit = false;
+			} 
+			else
+			{
+				printf( "Unsupported command line flag: '%s'", argv[i] );
+			}
+
+		}
+		else
+			break;
+	}
+
+	// SetQdirFromPath (argv[i]);
+	ExtractFilePath (argv[i], spritedir);	// chop the filename
+
+//
+// load the script
+//
+	LoadScriptFile (argv[i]);
+	
+	ParseScript ();
+	FinishSprite ();
+
+	return 0;
+}
+
diff --git a/main/source/utils/sprgen/sprgen.dsp b/main/source/utils/sprgen/sprgen.dsp
new file mode 100644
index 00000000..f6e0d7f0
--- /dev/null
+++ b/main/source/utils/sprgen/sprgen.dsp
@@ -0,0 +1,128 @@
+# Microsoft Developer Studio Project File - Name="sprgen" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=sprgen - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "sprgen.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "sprgen.mak" CFG="sprgen - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "sprgen - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "sprgen - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""$/SDKSrc/Tools/utils/sprgen", HVGBAAAA"
+# PROP Scc_LocalPath "."
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "sprgen - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ".\Release"
+# PROP BASE Intermediate_Dir ".\Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ".\Release"
+# PROP Intermediate_Dir ".\Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /W3 /GX /Zi /O1 /I "..\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386
+
+!ELSEIF  "$(CFG)" == "sprgen - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Debug"
+# PROP BASE Intermediate_Dir ".\Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\Debug"
+# PROP Intermediate_Dir ".\Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /Gm /GX /ZI /Od /I "..\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FR /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386
+
+!ENDIF 
+
+# Begin Target
+
+# Name "sprgen - Win32 Release"
+# Name "sprgen - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90"
+# Begin Source File
+
+SOURCE=..\common\cmdlib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\common\lbmlib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\common\scriplib.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sprgen.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# Begin Source File
+
+SOURCE=..\common\cmdlib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\common\lbmlib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\common\scriplib.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\spritegn.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/main/source/utils/sprgen/sprgen.dsw b/main/source/utils/sprgen/sprgen.dsw
new file mode 100644
index 00000000..e1fcd583
--- /dev/null
+++ b/main/source/utils/sprgen/sprgen.dsw
@@ -0,0 +1,37 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "sprgen"=.\sprgen.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+    begin source code control
+    "$/SDKSrc/Tools/utils/sprgen", HVGBAAAA
+    .
+    end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+    begin source code control
+    "$/SDKSrc/Tools/utils/sprgen", HVGBAAAA
+    .
+    end source code control
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/main/source/utils/sprgen/spritegn.h b/main/source/utils/sprgen/spritegn.h
new file mode 100644
index 00000000..215788db
--- /dev/null
+++ b/main/source/utils/sprgen/spritegn.h
@@ -0,0 +1,104 @@
+/***
+*
+*	Copyright (c) 1996-2002, Valve LLC. All rights reserved.
+*	
+*	This product contains software technology licensed from Id 
+*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
+*	All Rights Reserved.
+*
+****/
+
+//
+// spritegn.h: header file for sprite generation program
+//
+
+// **********************************************************
+// * This file must be identical in the spritegen directory *
+// * and in the Quake directory, because it's used to       *
+// * pass data from one to the other via .spr files.        *
+// **********************************************************
+
+//-------------------------------------------------------
+// This program generates .spr sprite package files.
+// The format of the files is as follows:
+//
+// dsprite_t file header structure
+// <repeat dsprite_t.numframes times>
+//   <if spritegroup, repeat dspritegroup_t.numframes times>
+//     dspriteframe_t frame header structure
+//     sprite bitmap
+//   <else (single sprite frame)>
+//     dspriteframe_t frame header structure
+//     sprite bitmap
+// <endrepeat>
+//-------------------------------------------------------
+
+#ifdef INCLUDELIBS
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include <string.h>
+
+#include "cmdlib.h"
+#include "scriplib.h"
+#include "lbmlib.h"
+
+#endif
+
+#define SPRITE_VERSION	2
+
+// must match definition in modelgen.h
+#ifndef SYNCTYPE_T
+#define SYNCTYPE_T
+typedef enum {ST_SYNC=0, ST_RAND } synctype_t;
+#endif
+
+// TODO: shorten these?
+typedef struct {
+	int			ident;
+	int			version;
+	int			type;
+	int			texFormat;
+	float		boundingradius;
+	int			width;
+	int			height;
+	int			numframes;
+	float		beamlength;
+	synctype_t	synctype;
+} dsprite_t;
+
+#define SPR_VP_PARALLEL_UPRIGHT		0
+#define SPR_FACING_UPRIGHT			1
+#define SPR_VP_PARALLEL				2
+#define SPR_ORIENTED				3
+#define SPR_VP_PARALLEL_ORIENTED	4
+
+#define SPR_NORMAL					0
+#define SPR_ADDITIVE				1
+#define SPR_INDEXALPHA				2
+#define SPR_ALPHTEST				3
+
+typedef struct {
+	int			origin[2];
+	int			width;
+	int			height;
+} dspriteframe_t;
+
+typedef struct {
+	int			numframes;
+} dspritegroup_t;
+
+typedef struct {
+	float	interval;
+} dspriteinterval_t;
+
+typedef enum { SPR_SINGLE=0, SPR_GROUP } spriteframetype_t;
+
+typedef struct {
+	spriteframetype_t	type;
+} dspriteframetype_t;
+
+#define IDSPRITEHEADER	(('P'<<24)+('S'<<16)+('D'<<8)+'I')
+														// little-endian "IDSP"
+
diff --git a/main/source/utils/vgui/include/VGUI.h b/main/source/utils/vgui/include/VGUI.h
new file mode 100644
index 00000000..acbd542e
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI.h
@@ -0,0 +1,107 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_H
+#define VGUI_H
+
+//If you are going to add stuff to the vgui core...
+//
+//Keep it simple.
+//
+//Never put code in a header.
+//
+//The name of the class is the name of the the file
+//
+//Each class gets its own .cpp file for its definition and a .h for its header. Helper
+//classes can be used but only within the .cpp and not referenceable from anywhere else.
+//
+//Don't add unneeded files. Keep the API clean.
+//
+//No platform specific code in vgui\lib-src\vgui dir. Code in vgui\lib-src\vgui should 
+//only include from vgui\include or standard C includes. ie, if I see windows.h included
+//anywhere but vgui\lib-src\win32 I will hunt you down and kill you. Don't give me any crap
+//that mfc is platform inspecific.
+//
+//Always use <> and not "" for includes
+//
+//Use minimum dependencies in headers. Don't include another header if you can get away
+//with forward declaring (which is usually the case)
+//
+//No macros in headers. They are tools of satan. This also means no use of DEFINEs, use enum
+//
+//Minimize global functions
+//
+//No global variables.
+//
+//Panel is getting pretty plump, try and avoid adding junk to it if you can
+
+//TODO: Look and Feel support
+//		add Panel::setPaintProxy, if _paintProxy exists, it calls _paintProxy->paint 
+//		instead of Panel::paint. Components should implement their painting in a seperate
+//      plugin class. Perhaps to encourage this, Panel::paint should just go away completely
+//      The other option is to have Panel have the interface Paintable
+//      class Paintable
+//      {
+//      public:
+//			virtual void paint()=0;
+//      };
+//      Then a component can implement its paint in the class itself and then call 
+//		setPaintProxy(this). If this is the case _paintProxy->paint should always be called
+//      and never Panel::paint from within paintTraverse
+//TODO: Figure out the 'Valve' Look and Feel and implement that instead of a the Java one
+//TODO: Determine ownership policy for Borders, Layouts, etc..
+//TODO: tooltips support
+//TODO: ComboKey (hot key support)
+//TODO: add Background.cpp, remove paintBackground from all components
+//		Panel implements setBackground, Panel::paintBackground calls _background->paintBackground
+//		similiar to the way Border works. 
+//TODO: Builtin components should never overide paintBackground, only paint
+//TODO: All protected members should be converted to private
+//TODO: All member variables should be moved to the top of the class prototype
+//TODO: All private methods should be prepended with private
+//TODO: Use of word internal in method names is not consistent and confusing
+//TODO: Cleanup so bullshit publics are properly named, maybe even figure out
+//      a naming convention for them
+//TODO: Breakup InputSignal into logical pieces
+//TODO: Button is in a state of disarray, it should have ButtonModel support
+//TODO: get rid of all the stupid strdup laziness, convert to vgui_strdup
+//TODO: actually figure out policy on String and implement it consistently
+//TODO: implement createLayoutInfo for other Layouts than need it
+//TODO: BorderLayout should have option for a null LayoutInfo defaulting to center
+//TODO: SurfaceBase should go away, put it in Surface
+//TODO: ActionSignals and other Signals should just set a flag when they fire.
+//		then App can come along later and fire all the signals
+//TODO: Change all method naming to starting with a capital letter.
+
+#ifdef _WIN32
+# define VGUIAPI __declspec( dllexport )
+#else
+# define VGUIAPI
+#endif
+
+#define null 0L
+
+typedef unsigned char  uchar;
+typedef unsigned short ushort;
+typedef unsigned int   uint;
+typedef unsigned long  ulong;
+
+namespace vgui
+{
+
+VGUIAPI void  vgui_setMalloc(void* (*malloc)(size_t size));
+VGUIAPI void  vgui_setFree(void (*free)(void* memblock));
+VGUIAPI void  vgui_strcpy(char* dst,int dstLen,const char* src);
+VGUIAPI char* vgui_strdup(const char* src);
+VGUIAPI int   vgui_printf(const char* format,...);
+VGUIAPI int   vgui_dprintf(const char* format,...);
+VGUIAPI int   vgui_dprintf2(const char* format,...);
+
+}
+
+#endif
+
diff --git a/main/source/utils/vgui/include/VGUI_ActionSignal.h b/main/source/utils/vgui/include/VGUI_ActionSignal.h
new file mode 100644
index 00000000..530f4685
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_ActionSignal.h
@@ -0,0 +1,84 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_ACTIONSIGNAL_H
+#define VGUI_ACTIONSIGNAL_H
+
+#include<VGUI.h>
+
+/*
+
+TODO: maybe try something like this..
+
+class VGUIAPI ActionSignal
+{
+};
+
+class VGUIAPI ActionSignalSimple : public ActionSignal
+{
+public:
+	virtual void actionPerformed(Panel* panel)=0;
+};
+
+class VGUIAPI ActionSignalInt : public ActionSignal
+{
+public:
+	virtual void actionPerformed(int value,Panel* panel)=0;
+};
+
+
+DefaultButtonModel would implement:
+
+virtual void addActionSignal(ActionSignal* s)
+{
+	if(s!=null)
+	{
+		_actionSignalDar.putElement(s);
+	}
+}
+
+virtual void fireActionSignal()
+{
+	for(int i=0;i<_actionSignalDar.getCount();i++)
+	{
+		ActionSignal* signal=_actionSignalDar[i];
+		
+		ActionSignalSimple* ss=dynamic_cast<ActionSignalSimple*>(signal);
+		if(ss!=null)
+		{
+			ss->actionPerformed(this);
+		}
+	
+		ActionSignalCommand* si=dynamic_cast<ActionSignalInt*>(signal);
+		if(si!=null)
+		{
+			si->actionPerformed(_intValue,this);
+		}
+	}
+}
+
+
+*/
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI ActionSignal
+{
+public:
+	virtual void actionPerformed(Panel* panel)=0;
+};
+
+}
+
+#endif
+
+
diff --git a/main/source/utils/vgui/include/VGUI_App.h b/main/source/utils/vgui/include/VGUI_App.h
new file mode 100644
index 00000000..a13cdb57
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_App.h
@@ -0,0 +1,132 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_APP_H
+#define VGUI_APP_H
+
+#include<VGUI.h>
+#include<VGUI_MouseCode.h>
+#include<VGUI_KeyCode.h>
+#include<VGUI_Dar.h>
+#include<VGUI_Cursor.h>
+
+namespace vgui
+{
+
+enum MouseCode;
+enum KeyCode;
+class Panel;
+class TickSignal;
+class Scheme;
+class TickSignal;
+class SurfaceBase;
+
+class VGUIAPI App
+{
+public:
+	App();
+	App(bool externalMain);
+public:
+	static App* getInstance();
+	//TODO: the public and public bullshit are all messed up, need to organize
+	//TODO: actually all of the access needs to be properly thought out while you are at it
+public:
+	virtual void    start();
+	virtual void    stop();
+	virtual void    externalTick();
+	virtual bool    wasMousePressed(MouseCode code,Panel* panel);
+	virtual bool    wasMouseDoublePressed(MouseCode code,Panel* panel);
+	virtual bool    isMouseDown(MouseCode code,Panel* panel);
+	virtual bool    wasMouseReleased(MouseCode code,Panel* panel);
+	virtual bool    wasKeyPressed(KeyCode code,Panel* panel);
+	virtual bool    isKeyDown(KeyCode code,Panel* panel);
+	virtual bool    wasKeyTyped(KeyCode code,Panel* panel);
+	virtual bool    wasKeyReleased(KeyCode code,Panel* panel);
+	virtual void    addTickSignal(TickSignal* s);
+	virtual void    setCursorPos(int x,int y);
+	virtual void    getCursorPos(int& x,int& y);
+	virtual void    setMouseCapture(Panel* panel);
+	virtual void    setMouseArena(int x0,int y0,int x1,int y1,bool enabled);
+	virtual void    setMouseArena(Panel* panel);
+	virtual void    requestFocus(Panel* panel); 
+	virtual Panel*  getFocus();
+	virtual void    repaintAll();
+	virtual void    setScheme(Scheme* scheme);
+	virtual Scheme* getScheme();
+	virtual void    enableBuildMode();
+	virtual long    getTimeMillis();
+	virtual char    getKeyCodeChar(KeyCode code,bool shifted);
+	virtual void    getKeyCodeText(KeyCode code,char* buf,int buflen);
+	virtual int     getClipboardTextCount();
+	virtual void    setClipboardText(const char* text,int textLen);
+	virtual int     getClipboardText(int offset,char* buf,int bufLen);
+	virtual void    reset();
+	virtual void    internalSetMouseArena(int x0,int y0,int x1,int y1,bool enabled);
+	virtual bool    setRegistryString(const char* key,const char* value);
+	virtual bool    getRegistryString(const char* key,char* value,int valueLen);
+	virtual bool    setRegistryInteger(const char* key,int value);
+	virtual bool    getRegistryInteger(const char* key,int& value);
+	virtual void    setCursorOveride(Cursor* cursor);
+	virtual Cursor* getCursorOveride();
+	virtual void    setMinimumTickMillisInterval(int interval);
+public: //bullshit public stuff
+	virtual void main(int argc,char* argv[])=0;
+	virtual void run(); 
+	virtual void internalCursorMoved(int x,int y,SurfaceBase* surfaceBase); //expects input in surface space
+	virtual void internalMousePressed(MouseCode code,SurfaceBase* surfaceBase);
+	virtual void internalMouseDoublePressed(MouseCode code,SurfaceBase* surfaceBase);
+	virtual void internalMouseReleased(MouseCode code,SurfaceBase* surfaceBase);
+	virtual void internalMouseWheeled(int delta,SurfaceBase* surfaceBase);
+	virtual void internalKeyPressed(KeyCode code,SurfaceBase* surfaceBase);
+	virtual void internalKeyTyped(KeyCode code,SurfaceBase* surfaceBase);
+	virtual void internalKeyReleased(KeyCode code,SurfaceBase* surfaceBase);
+private:
+	virtual void init();
+	virtual void updateMouseFocus(int x,int y,SurfaceBase* surfaceBase);
+	virtual void setMouseFocus(Panel* newMouseFocus);
+protected: 
+	virtual void surfaceBaseCreated(SurfaceBase* surfaceBase);
+	virtual void surfaceBaseDeleted(SurfaceBase* surfaceBase);
+	virtual void platTick();
+	virtual void internalTick();
+protected:
+	static App* _instance;
+protected:
+	bool              _running;
+	bool              _externalMain;
+	Dar<SurfaceBase*> _surfaceBaseDar;
+	Panel*            _keyFocus;
+	Panel*            _oldMouseFocus;
+	Panel*            _mouseFocus;
+	Panel*            _mouseCapture;
+	Panel*            _wantedKeyFocus;
+	bool              _mousePressed[MOUSE_LAST];
+	bool              _mouseDoublePressed[MOUSE_LAST];
+	bool              _mouseDown[MOUSE_LAST];
+	bool              _mouseReleased[MOUSE_LAST];
+	bool              _keyPressed[KEY_LAST];
+	bool              _keyTyped[KEY_LAST];
+	bool              _keyDown[KEY_LAST];
+	bool              _keyReleased[KEY_LAST];
+	Dar<TickSignal*>  _tickSignalDar;
+	Scheme*           _scheme;
+	bool              _buildMode;
+	bool              _wantedBuildMode;
+	Panel*            _mouseArenaPanel;
+	Cursor*           _cursor[Cursor::DefaultCursor::dc_last];
+	Cursor*           _cursorOveride;
+private:
+	long              _nextTickMillis;
+	long              _minimumTickMillisInterval;
+	friend class SurfaceBase;
+};
+}
+
+#endif
+
+
+
diff --git a/main/source/utils/vgui/include/VGUI_Bitmap.h b/main/source/utils/vgui/include/VGUI_Bitmap.h
new file mode 100644
index 00000000..04de3067
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_Bitmap.h
@@ -0,0 +1,37 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_BITMAP_H
+#define VGUI_BITMAP_H
+
+#include<VGUI.h>
+#include<VGUI_Image.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI Bitmap : public Image
+{
+private:
+	int         _id;
+	bool        _uploaded;
+public:
+	Bitmap();
+protected:
+	virtual void setSize(int wide,int tall);
+	virtual void setRGBA(int x,int y,uchar r,uchar g,uchar b,uchar a);
+public:
+	virtual void paint(Panel* panel);
+protected:
+	uchar* _rgba;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_BitmapTGA.h b/main/source/utils/vgui/include/VGUI_BitmapTGA.h
new file mode 100644
index 00000000..f0ecedb3
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_BitmapTGA.h
@@ -0,0 +1,29 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_BITMAPTGA_H
+#define VGUI_BITMAPTGA_H
+
+#include<VGUI_Bitmap.h>
+
+namespace vgui
+{
+
+class Panel;
+class InputStream;
+
+class VGUIAPI BitmapTGA : public Bitmap
+{
+public:
+	BitmapTGA(InputStream* is,bool invertAlpha);
+private:
+	virtual bool loadTGA(InputStream* is,bool invertAlpha);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_Border.h b/main/source/utils/vgui/include/VGUI_Border.h
new file mode 100644
index 00000000..416b8787
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_Border.h
@@ -0,0 +1,45 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_BORDER_H
+#define VGUI_BORDER_H
+
+#include<VGUI.h>
+#include<VGUI_Image.h>
+
+//TODO: all borders should be titled
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI Border : public Image
+{
+public:
+	Border();
+	Border(int left,int top,int right,int bottom);
+public:
+	virtual void setInset(int left,int top,int right,int bottom);
+	virtual void getInset(int& left,int& top,int& right,int& bottom);
+protected:
+	virtual void drawFilledRect(int x0,int y0,int x1,int y1);
+	virtual void drawOutlinedRect(int x0,int y0,int x1,int y1);
+	virtual void drawSetTextPos(int x,int y);
+	virtual void drawPrintText(int x,int y,const char* str,int strlen);
+	virtual void drawPrintChar(int x,int y,char ch);
+protected:
+	int _inset[4];
+private:
+	Panel* _panel;
+friend class Panel;
+friend class BorderPair;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_BorderLayout.h b/main/source/utils/vgui/include/VGUI_BorderLayout.h
new file mode 100644
index 00000000..2d7678e1
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_BorderLayout.h
@@ -0,0 +1,46 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_BORDERLAYOUT_H
+#define VGUI_BORDERLAYOUT_H
+
+#include<VGUI.h>
+#include<VGUI_Layout.h>
+
+namespace vgui
+{
+
+class LayoutInfo;
+
+class VGUIAPI BorderLayout : public Layout
+{
+public:
+	enum Alignment
+	{
+		a_center=0,
+		a_north,
+		a_south,
+		a_east,
+		a_west,
+	};
+private:
+	int _inset;
+public:
+	BorderLayout(int inset);
+public:
+	virtual void        performLayout(Panel* panel);
+	virtual LayoutInfo* createLayoutInfo(Alignment alignment);
+};
+
+}
+
+#endif
+
+
+
+
+
diff --git a/main/source/utils/vgui/include/VGUI_BorderPair.h b/main/source/utils/vgui/include/VGUI_BorderPair.h
new file mode 100644
index 00000000..82318d48
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_BorderPair.h
@@ -0,0 +1,33 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_BORDERPAIR_H
+#define VGUI_BORDERPAIR_H
+
+#include<VGUI.h>
+#include<VGUI_Border.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI BorderPair : public Border
+{
+public:
+	BorderPair(Border* border0,Border* border1);
+public:
+	virtual void doPaint(Panel* panel);
+protected:
+	virtual void paint(Panel* panel);
+protected:
+	Border* _border[2];
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_BuildGroup.h b/main/source/utils/vgui/include/VGUI_BuildGroup.h
new file mode 100644
index 00000000..694ac5c4
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_BuildGroup.h
@@ -0,0 +1,67 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_BUILDGROUP_H
+#define VGUI_BUILDGROUP_H
+
+#include<VGUI.h>
+#include<VGUI_Dar.h>
+
+
+namespace vgui
+{
+
+enum KeyCode;
+enum MouseCode;
+class Panel;
+class Cursor;
+class ChangeSignal;
+
+class VGUIAPI BuildGroup
+{
+private:	
+	bool      _enabled;
+	int       _snapX;
+	int       _snapY;
+	Cursor*   _cursor_sizenwse;
+	Cursor*   _cursor_sizenesw;
+	Cursor*   _cursor_sizewe;
+	Cursor*   _cursor_sizens;
+	Cursor*   _cursor_sizeall;
+	bool      _dragging;
+	MouseCode _dragMouseCode;
+	int       _dragStartPanelPos[2];
+	int       _dragStartCursorPos[2];
+	Panel*    _currentPanel;
+	Dar<ChangeSignal*> _currentPanelChangeSignalDar;
+	Dar<Panel*> _panelDar;
+	Dar<char*>  _panelNameDar;
+public:
+	BuildGroup();
+public:
+	virtual void   setEnabled(bool state);
+	virtual bool   isEnabled();
+	virtual void   addCurrentPanelChangeSignal(ChangeSignal* s);
+	virtual Panel* getCurrentPanel();
+	virtual void   copyPropertiesToClipboard();
+private:
+	virtual void applySnap(Panel* panel);
+	virtual void fireCurrentPanelChangeSignal();
+protected:
+	friend class Panel;
+	virtual void    panelAdded(Panel* panel,const char* panelName);
+	virtual void    cursorMoved(int x,int y,Panel* panel);
+	virtual void    mousePressed(MouseCode code,Panel* panel);
+	virtual void    mouseReleased(MouseCode code,Panel* panel);
+	virtual void    mouseDoublePressed(MouseCode code,Panel* panel);
+	virtual void    keyTyped(KeyCode code,Panel* panel);
+	virtual Cursor* getCursor(Panel* panel);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_Button.h b/main/source/utils/vgui/include/VGUI_Button.h
new file mode 100644
index 00000000..7885192d
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_Button.h
@@ -0,0 +1,61 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_BUTTON_H
+#define VGUI_BUTTON_H
+
+#include<VGUI.h>
+#include<VGUI_Label.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+enum MouseCode;
+class ButtonController;
+class ButtonGroup;
+class ActionSignal;
+
+//TODO: Button should be derived from an AbstractButton
+class VGUIAPI Button : public Label
+{
+public:
+	Button(const char* text,int x,int y,int wide,int tall);
+	Button(const char* text,int x,int y);
+private:
+	void init();
+public:
+	virtual void setSelected(bool state);
+	virtual void setSelectedDirect(bool state);
+	virtual void setArmed(bool state);
+	virtual bool isSelected();
+	virtual void doClick();
+	virtual void addActionSignal(ActionSignal* s);
+	virtual void setButtonGroup(ButtonGroup* buttonGroup);
+	virtual bool isArmed();
+	virtual void setButtonBorderEnabled(bool state);
+	virtual void setMouseClickEnabled(MouseCode code,bool state);
+	virtual bool isMouseClickEnabled(MouseCode code);
+	virtual void fireActionSignal();
+	virtual Panel* createPropertyPanel();
+protected:
+	virtual void setButtonController(ButtonController* _buttonController);
+	virtual void paintBackground();
+protected:
+	char*              _text;
+	bool               _armed;
+	bool               _selected;
+	bool               _buttonBorderEnabled;
+	Dar<ActionSignal*> _actionSignalDar;
+	int                _mouseClickMask;
+	ButtonGroup*       _buttonGroup;
+	ButtonController*  _buttonController;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_ButtonController.h b/main/source/utils/vgui/include/VGUI_ButtonController.h
new file mode 100644
index 00000000..f4f6d10f
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_ButtonController.h
@@ -0,0 +1,27 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_BUTTONCONTROLLER_H
+#define VGUI_BUTTONCONTROLLER_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+class Button;
+
+class VGUIAPI ButtonController
+{
+public:	
+	virtual void addSignals(Button* button)=0;
+	virtual void removeSignals(Button* button)=0;
+};
+
+}
+
+#endif
diff --git a/main/source/utils/vgui/include/VGUI_ButtonGroup.h b/main/source/utils/vgui/include/VGUI_ButtonGroup.h
new file mode 100644
index 00000000..5f14bb4d
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_ButtonGroup.h
@@ -0,0 +1,30 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_BUTTONGROUP_H
+#define VGUI_BUTTONGROUP_H
+
+#include<VGUI.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+class Button;
+
+class VGUIAPI ButtonGroup
+{
+public:
+	virtual void addButton(Button* button);
+	virtual void setSelected(Button* button);
+protected:
+	Dar<Button*> _buttonDar;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_ChangeSignal.h b/main/source/utils/vgui/include/VGUI_ChangeSignal.h
new file mode 100644
index 00000000..85d6d279
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_ChangeSignal.h
@@ -0,0 +1,26 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_CHANGESIGNAL_H
+#define VGUI_CHANGESIGNAL_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI ChangeSignal
+{
+public:
+	virtual void valueChanged(Panel* panel)=0;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_CheckButton.h b/main/source/utils/vgui/include/VGUI_CheckButton.h
new file mode 100644
index 00000000..a3d71695
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_CheckButton.h
@@ -0,0 +1,28 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_CHECKBUTTON_H
+#define VGUI_CHECKBUTTON_H
+
+#include<VGUI.h>
+#include<VGUI_ToggleButton.h>
+
+namespace vgui
+{
+
+class VGUIAPI CheckButton : public ToggleButton
+{
+public:
+	CheckButton(const char* text,int x,int y,int wide,int tall);
+	CheckButton(const char* text,int x,int y);
+protected:
+	virtual void paintBackground();
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_Color.h b/main/source/utils/vgui/include/VGUI_Color.h
new file mode 100644
index 00000000..2ed676a8
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_Color.h
@@ -0,0 +1,44 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_COLOR_H
+#define VGUI_COLOR_H
+
+#include<VGUI.h>
+#include<VGUI_Scheme.h>
+
+//TODO: rename getColor(r,g,b,a) to getRGBA(r,g,b,a)
+//TODO: rename setColor(r,g,b,a) to setRGBA(r,g,b,a)
+//TODO: rename getColor(sc) to getSchemeColor(sc)
+//TODO: rename setColor(sc) to setSchemeColor(sc)
+
+namespace vgui
+{
+
+class VGUIAPI Color
+{
+private:
+	uchar               _color[4];
+	Scheme::SchemeColor _schemeColor;
+public:
+	Color();
+	Color(int r,int g,int b,int a);
+	Color(Scheme::SchemeColor sc);
+private:
+	virtual void init();
+public:
+	virtual void setColor(int r,int g,int b,int a);
+	virtual void setColor(Scheme::SchemeColor sc);
+	virtual void getColor(int& r,int& g,int& b,int& a);
+	virtual void getColor(Scheme::SchemeColor& sc);
+	virtual int  operator[](int index);
+};
+
+}
+
+
+#endif
diff --git a/main/source/utils/vgui/include/VGUI_ComboKey.h b/main/source/utils/vgui/include/VGUI_ComboKey.h
new file mode 100644
index 00000000..adc8abf8
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_ComboKey.h
@@ -0,0 +1,34 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_COMBOKEY_H
+#define VGUI_COMBOKEY_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+enum KeyCode;
+
+class ComboKey
+{
+public:
+	ComboKey(KeyCode code,KeyCode modifier);
+public:
+	bool isTwoCombo(KeyCode code,KeyCode modifier);
+protected:
+	bool check(KeyCode code);
+protected:
+	KeyCode _keyCode[2];
+friend class Panel;
+};
+
+}
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_ConfigWizard.h b/main/source/utils/vgui/include/VGUI_ConfigWizard.h
new file mode 100644
index 00000000..713ecb4f
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_ConfigWizard.h
@@ -0,0 +1,40 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_CONFIGWIZARD_H
+#define VGUI_CONFIGWIZARD_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+
+class TreeFolder;
+class Panel;
+class Button;
+
+class VGUIAPI ConfigWizard : public Panel
+{
+public:
+	ConfigWizard(int x,int y,int wide,int tall);
+public:
+	virtual void        setSize(int wide,int tall);
+	virtual Panel*      getClient();
+	virtual TreeFolder* getFolder();
+protected:
+	TreeFolder* _treeFolder;
+	Panel*      _client;
+	Button*     _okButton;
+	Button*     _cancelButton;
+	Button*     _applyButton;
+	Button*     _helpButton;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_Cursor.h b/main/source/utils/vgui/include/VGUI_Cursor.h
new file mode 100644
index 00000000..44ae1114
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_Cursor.h
@@ -0,0 +1,57 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_CURSOR_H
+#define VGUI_CURSOR_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+class Bitmap;
+
+class VGUIAPI Cursor
+{
+public:
+	enum DefaultCursor
+	{
+		dc_user,
+		dc_none,
+		dc_arrow,
+		dc_ibeam,
+		dc_hourglass,
+		dc_crosshair,
+		dc_up,
+		dc_sizenwse,
+		dc_sizenesw,
+		dc_sizewe,
+		dc_sizens,
+		dc_sizeall,
+		dc_no,
+		dc_hand,
+		dc_last,
+	};
+private:
+	int           _hotspot[2];
+	Bitmap*       _bitmap;
+	DefaultCursor _dc;
+public:
+	Cursor(DefaultCursor dc);
+	Cursor(Bitmap* bitmap,int hotspotX,int hotspotY);
+public:
+	virtual void getHotspot(int& x,int& y);
+private:
+	virtual void privateInit(Bitmap* bitmap,int hotspotX,int hotspotY);
+public:
+	virtual Bitmap*       getBitmap();
+	virtual DefaultCursor getDefaultCursor();
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_Dar.h b/main/source/utils/vgui/include/VGUI_Dar.h
new file mode 100644
index 00000000..c0f1990d
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_Dar.h
@@ -0,0 +1,193 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_DAR_H
+#define VGUI_DAR_H
+
+#include<stdlib.h>
+#include<string.h>
+#include<VGUI.h>
+
+
+
+namespace vgui
+{
+
+//Simple lightweight dynamic array implementation
+template<class ELEMTYPE> class VGUIAPI Dar
+{
+public:
+	Dar()
+	{
+		_count=0;
+		_capacity=0;
+		_data=null;
+		ensureCapacity(4);
+	}
+	Dar(int initialCapacity)
+	{
+		_count=0;
+		_capacity=0;
+		_data=null;
+		ensureCapacity(initialCapacity);
+	}
+public:
+	void ensureCapacity(int wantedCapacity)
+	{
+		if(wantedCapacity<=_capacity){return;}
+
+		//double capacity until it is >= wantedCapacity
+		//this could be done with math, but iterative is just so much more fun
+		int newCapacity=_capacity;
+		if(newCapacity==0){newCapacity=1;}
+		while(newCapacity<wantedCapacity){newCapacity*=2;}
+
+		//allocate and zero newData
+		ELEMTYPE* newData=new ELEMTYPE[newCapacity]; 
+		if(newData==null){exit(0);return;}
+		memset(newData,0,sizeof(ELEMTYPE)*newCapacity);
+		_capacity=newCapacity;
+   
+		//copy data into newData
+		for(int i=0;i<_count;i++){newData[i]=_data[i];}
+
+		delete[] _data;
+		_data=newData;
+	}
+	void setCount(int count)
+	{
+		if((count<0)||(count>_capacity))
+		{
+			return;
+		}
+		_count=count;
+	}
+	int getCount()
+	{
+		return _count;
+	}
+	void addElement(ELEMTYPE elem)
+	{
+		ensureCapacity(_count+1);
+		_data[_count]=elem;
+		_count++;
+	}
+	bool hasElement(ELEMTYPE elem)
+	{
+		for(int i=0;i<_count;i++)
+		{
+			if(_data[i]==elem)
+			{
+				return true;
+			}
+		}
+	return false;
+	}
+	void putElement(ELEMTYPE elem)
+	{
+		if(hasElement(elem))
+		{
+			return;
+		}
+		addElement(elem);
+	}
+	void insertElementAt(ELEMTYPE elem,int index)
+	{
+		if((index<0)||(index>_count))
+		{
+			return;
+		}
+		if((index==_count)||(_count==0))
+		{
+			addElement(elem);
+		}
+		else
+		{
+			addElement(elem); //just to make sure it is big enough
+			for(int i=_count-1;i>index;i--)
+			{
+				_data[i]=_data[i-1];
+			}
+			_data[index]=elem;
+		}
+	}
+	void setElementAt(ELEMTYPE elem,int index)
+	{
+		if((index<0)||(index>=_count))
+		{
+			return;
+		}
+		_data[index]=elem;
+	}
+	void removeElementAt(int index)
+	{
+		if((index<0)||(index>=_count))
+		{
+			return;
+		}
+   
+		//slide everything to the right of index, left one.
+		for(int i=index;i<(_count-1);i++)
+		{
+			_data[i]=_data[i+1];
+		}
+		_count--;
+	} 
+	void removeElement(ELEMTYPE elem)
+	{
+		for(int i=0;i<_count;i++)
+		{
+			if(_data[i]==elem)
+			{
+				removeElementAt(i);
+				break;
+			}
+		}
+	}
+	void removeAll()
+	{
+		_count=0;
+	}
+	ELEMTYPE operator[](int index)
+	{
+		if((index<0)||(index>=_count))
+		{
+			return null;
+		}
+		return _data[index];
+	}
+protected:
+	int       _count;
+	int       _capacity;
+	ELEMTYPE* _data;
+};
+
+//forward referencing all the template types used so they get exported
+template class VGUIAPI Dar<char>;
+template class VGUIAPI Dar<char*>;
+template class VGUIAPI Dar<int>;
+template class VGUIAPI Dar<class Button*>;
+template class VGUIAPI Dar<class SurfaceBase*>;
+template class VGUIAPI Dar<class InputSignal*>;
+template class VGUIAPI Dar<class FocusChangeSignal*>;
+template class VGUIAPI Dar<class FrameSignal*>;
+template class VGUIAPI Dar<class ActionSignal*>;
+template class VGUIAPI Dar<class IntChangeSignal*>;
+template class VGUIAPI Dar<class TickSignal*>;
+template class VGUIAPI Dar<class Dar<char>*>;
+template class VGUIAPI Dar<class Frame*>;
+template class VGUIAPI Dar<class DesktopIcon*>;
+template class VGUIAPI Dar<class ChangeSignal*>;
+template class VGUIAPI Dar<class Panel*>;
+template class VGUIAPI Dar<class Label*>;
+template class VGUIAPI Dar<class RepaintSignal*>;
+
+
+}
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_DataInputStream.h b/main/source/utils/vgui/include/VGUI_DataInputStream.h
new file mode 100644
index 00000000..dba1acf0
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_DataInputStream.h
@@ -0,0 +1,49 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_DATAINPUTSTREAM_H
+#define VGUI_DATAINPUTSTREAM_H
+
+#include<VGUI.h>
+#include<VGUI_InputStream.h>
+
+namespace vgui
+{
+
+class VGUIAPI DataInputStream : virtual public InputStream
+{
+private:
+	InputStream* _is;
+public:
+	DataInputStream(InputStream* is);
+public:
+	virtual void  seekStart(bool& success);
+	virtual void  seekRelative(int count,bool& success);
+	virtual void  seekEnd(bool& success);
+	virtual int   getAvailable(bool& success);
+	//virtual uchar readUChar(bool& success);
+	virtual void  readUChar(uchar* buf,int count,bool& success);
+	virtual void  close(bool& success);
+	virtual void  close();
+public:
+	virtual bool   readBool(bool& success);
+	virtual char   readChar(bool& success);
+	virtual uchar  readUChar(bool& success);
+	virtual short  readShort(bool& success);
+	virtual ushort readUShort(bool& success);
+	virtual int    readInt(bool& success);
+	virtual uint   readUInt(bool& success);
+	virtual long   readLong(bool& success);
+	virtual ulong  readULong(bool& success);
+	virtual float  readFloat(bool& success);
+	virtual double readDouble(bool& success);
+	virtual void   readLine(char* buf,int bufLen,bool& success);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_Desktop.h b/main/source/utils/vgui/include/VGUI_Desktop.h
new file mode 100644
index 00000000..da8e0d00
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_Desktop.h
@@ -0,0 +1,42 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_DESKTOP_H
+#define VGUI_DESKTOP_H
+
+#include<VGUI.h>
+#include<VGUI_Dar.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+
+class DesktopIcon;
+class TaskBar;
+
+class VGUIAPI Desktop : public Panel
+{
+public:
+	Desktop(int x,int y,int wide,int tall);
+public:
+	virtual void    setSize(int wide,int tall);
+	virtual void    iconActivated(DesktopIcon* icon);
+	virtual void    addIcon(DesktopIcon* icon);
+	virtual void    arrangeIcons();
+	virtual Panel*  getBackground();
+	virtual Panel*  getForeground();
+protected:
+	Panel*            _background;
+	Panel*            _foreground;
+	TaskBar*          _taskBar;
+	Dar<DesktopIcon*> _desktopIconDar;
+	int           	  _cascade[2];
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_DesktopIcon.h b/main/source/utils/vgui/include/VGUI_DesktopIcon.h
new file mode 100644
index 00000000..192fef45
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_DesktopIcon.h
@@ -0,0 +1,41 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_DESKTOPICON_H
+#define VGUI_DESKTOPICON_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+
+class MiniApp;
+class Image;
+class Desktop;
+
+class VGUIAPI DesktopIcon : public Panel
+{
+public:
+	DesktopIcon(MiniApp* miniApp,Image* image);
+public:
+	virtual void doActivate();
+	virtual void setImage(Image* image);
+public: //bullshit public
+	virtual void     setDesktop(Desktop* desktop);
+	virtual MiniApp* getMiniApp();
+protected:
+	virtual void paintBackground();
+protected:
+	Desktop* _desktop;
+	MiniApp* _miniApp;
+	Image*   _image;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_EditPanel.h b/main/source/utils/vgui/include/VGUI_EditPanel.h
new file mode 100644
index 00000000..23e29263
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_EditPanel.h
@@ -0,0 +1,65 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_EDITPANEL_H
+#define VGUI_EDITPANEL_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+class Font;
+
+class VGUIAPI EditPanel : public Panel
+{
+public:
+	EditPanel(int x,int y,int wide,int tall);
+public:
+	virtual void doCursorUp();
+	virtual void doCursorDown();
+	virtual void doCursorLeft();
+	virtual void doCursorRight();
+	virtual void doCursorToStartOfLine();
+	virtual void doCursorToEndOfLine();
+	virtual void doCursorInsertChar(char ch);
+	virtual void doCursorBackspace();
+	virtual void doCursorNewLine();
+	virtual void doCursorDelete();
+	virtual void doCursorPrintf(char* format,...);
+	virtual int  getLineCount();
+	virtual int  getVisibleLineCount();
+	virtual void setCursorBlink(bool state);
+	virtual void setFont(Font* font);
+	virtual void getText(int lineIndex, int offset,char* buf,int bufLen);
+
+public: //bullshit public
+	void getCursorBlink(bool& blink,int& nextBlinkTime);
+protected:
+	virtual void       paintBackground();
+	virtual void       paint();
+	virtual void       addLine();
+	virtual Dar<char>* getLine(int lineIndex);
+	virtual void       setChar(Dar<char>* lineDar,int x,char ch,char fill);
+	virtual void       setChar(Dar<char>* lineDar,int x,char ch);
+	virtual void       shiftLineLeft(Dar<char>* lineDar,int x,int count);
+	virtual void       shiftLineRight(Dar<char>* lineDar,int x,int count);
+private:
+	virtual int        spatialCharOffsetBetweenTwoLines(Dar<char>* srcDar,Dar<char>* dstDar,int x);
+protected:
+	Dar<Dar<char>*> _lineDarDar;
+	int             _cursor[2];
+	bool            _cursorBlink;
+	int             _cursorNextBlinkTime;
+	Font*           _font;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_EtchedBorder.h b/main/source/utils/vgui/include/VGUI_EtchedBorder.h
new file mode 100644
index 00000000..7047c087
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_EtchedBorder.h
@@ -0,0 +1,29 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_ETCHEDBORDER_H
+#define VGUI_ETCHEDBORDER_H
+
+#include<VGUI.h>
+#include<VGUI_Border.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI EtchedBorder : public Border
+{
+public:
+	EtchedBorder();
+protected:
+	virtual void paint(Panel* panel);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_FileInputStream.h b/main/source/utils/vgui/include/VGUI_FileInputStream.h
new file mode 100644
index 00000000..41b60868
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_FileInputStream.h
@@ -0,0 +1,38 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_FILEINPUTSTREAM_H
+#define VGUI_FILEINPUTSTREAM_H
+
+//TODO : figure out how to get stdio out of here, I think std namespace is broken for FILE for forward declaring does not work in vc6
+
+#include<stdio.h> 
+#include<VGUI_InputStream.h>
+
+namespace vgui
+{
+
+class VGUIAPI FileInputStream : public InputStream
+{
+private:
+	FILE* _fp;
+public:
+	FileInputStream(const char* fileName,bool textMode);
+public:
+	virtual void  seekStart(bool& success);
+	virtual void  seekRelative(int count,bool& success);
+	virtual void  seekEnd(bool& success);
+	virtual int   getAvailable(bool& success);
+	virtual uchar readUChar(bool& success);
+	virtual void  readUChar(uchar* buf,int count,bool& success);
+	virtual void  close(bool& success);
+	virtual void  close();
+};
+
+}
+
+#endif
diff --git a/main/source/utils/vgui/include/VGUI_FlowLayout.h b/main/source/utils/vgui/include/VGUI_FlowLayout.h
new file mode 100644
index 00000000..c9585657
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_FlowLayout.h
@@ -0,0 +1,29 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_FLOWLAYOUT_H
+#define VGUI_FLOWLAYOUT_H
+
+#include<VGUI.h>
+#include<VGUI_Layout.h>
+
+namespace vgui
+{
+
+class VGUIAPI FlowLayout : public Layout
+{
+private:
+	int _hgap;
+public:
+	FlowLayout(int hgap);
+public:
+	virtual void performLayout(Panel* panel);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_FocusChangeSignal.h b/main/source/utils/vgui/include/VGUI_FocusChangeSignal.h
new file mode 100644
index 00000000..0681f8ab
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_FocusChangeSignal.h
@@ -0,0 +1,26 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_FOCUSCHANGESIGNAL_H
+#define VGUI_FOCUSCHANGESIGNAL_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI FocusChangeSignal
+{
+public:
+	virtual void focusChanged(bool lost,Panel* panel)=0;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_FocusNavGroup.h b/main/source/utils/vgui/include/VGUI_FocusNavGroup.h
new file mode 100644
index 00000000..b7e8307e
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_FocusNavGroup.h
@@ -0,0 +1,35 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_FOCUSNAVGROUP_H
+#define VGUI_FOCUSNAVGROUP_H
+
+#include<VGUI.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI FocusNavGroup
+{
+public:
+	FocusNavGroup();
+protected:
+	virtual void addPanel(Panel* panel);
+	virtual void requestFocusPrev();
+	virtual void requestFocusNext();
+	virtual void setCurrentPanel(Panel* panel);
+protected:
+	Dar<Panel*> _panelDar;
+	int         _currentIndex;
+friend class Panel;
+};
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_Font.h b/main/source/utils/vgui/include/VGUI_Font.h
new file mode 100644
index 00000000..822722cf
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_Font.h
@@ -0,0 +1,48 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_FONT_H
+#define VGUI_FONT_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+class BaseFontPlat;
+
+//TODO: cursors and fonts should work like gl binds
+class VGUIAPI Font
+ {
+ public:
+  Font(const char* name,int tall,int wide,float rotation,int weight,bool italic,bool underline,bool strikeout,bool symbol);
+  // If pFileData is non-NULL, then it will try to load the 32-bit (RLE) TGA file. If that fails,
+  // it will create the font using the specified parameters.
+  // pUniqueName should be set if pFileData and fileDataLen are set so it can determine if a font is already loaded.
+  Font(const char* name,void *pFileData,int fileDataLen, int tall,int wide,float rotation,int weight,bool italic,bool underline,bool strikeout,bool symbol);
+ private:
+  virtual void init(const char* name,void *pFileData,int fileDataLen, int tall,int wide,float rotation,int weight,bool italic,bool underline,bool strikeout,bool symbol);
+ public:
+  BaseFontPlat* getPlat();
+  virtual void getCharRGBA(int ch,int rgbaX,int rgbaY,int rgbaWide,int rgbaTall,uchar* rgba);
+  virtual void getCharABCwide(int ch,int& a,int& b,int& c);
+  virtual void getTextSize(const char* text,int& wide,int& tall);
+  virtual int  getTall();
+  virtual int  getId();
+ protected:
+  char*			_name;
+  BaseFontPlat*	_plat;
+  int			_id;
+ friend class Surface;
+ };
+
+
+void Font_Reset();
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_Frame.h b/main/source/utils/vgui/include/VGUI_Frame.h
new file mode 100644
index 00000000..ffe41f87
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_Frame.h
@@ -0,0 +1,73 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_FRAME_H
+#define VGUI_FRAME_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+class Button;
+class FrameSignal;
+
+class VGUIAPI Frame : public Panel
+ {
+ public:
+  Frame(int x,int y,int wide,int tall);
+ public:
+  virtual void   setSize(int wide,int tall);
+  virtual void   setInternal(bool state);
+  virtual void   paintBackground();
+  virtual bool   isInternal();
+  virtual Panel* getClient();
+  virtual void   setTitle(const char* title);
+  virtual void   getTitle(char* buf,int bufLen);
+  virtual void	 setMoveable(bool state);
+  virtual void   setSizeable(bool state);
+  virtual bool   isMoveable();
+  virtual bool   isSizeable();
+  virtual void   addFrameSignal(FrameSignal* s);
+  virtual void   setVisible(bool state);
+  virtual void   setMenuButtonVisible(bool state);
+  virtual void   setTrayButtonVisible(bool state);
+  virtual void   setMinimizeButtonVisible(bool state);
+  virtual void   setMaximizeButtonVisible(bool state);
+  virtual void   setCloseButtonVisible(bool state);
+ public: //bullshit public
+  virtual void fireClosingSignal();
+  virtual void fireMinimizingSignal();
+ protected:
+  char*             _title;
+  bool              _internal;
+  bool              _sizeable;
+  bool              _moveable;
+  Panel*            _topGrip;
+  Panel*            _bottomGrip;
+  Panel*            _leftGrip;
+  Panel*            _rightGrip;
+  Panel*            _topLeftGrip;
+  Panel*            _topRightGrip;
+  Panel*            _bottomLeftGrip;
+  Panel*            _bottomRightGrip;
+  Panel*            _captionGrip;
+  Panel*            _client;
+  Button*           _trayButton;
+  Button*           _minimizeButton;
+  Button*           _maximizeButton;
+  Button*           _closeButton;
+  Button*           _menuButton;
+  Dar<FrameSignal*> _frameSignalDar;
+  Frame*            _resizeable;
+ };
+
+}
+
+#endif
diff --git a/main/source/utils/vgui/include/VGUI_FrameSignal.h b/main/source/utils/vgui/include/VGUI_FrameSignal.h
new file mode 100644
index 00000000..7deab555
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_FrameSignal.h
@@ -0,0 +1,27 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_FRAMESIGNAL_H
+#define VGUI_FRAMESIGNAL_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+class Frame;
+
+class VGUIAPI FrameSignal
+{
+public:
+	virtual void closing(Frame* frame)=0;
+	virtual void minimizing(Frame* frame,bool toTray)=0;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_GridLayout.h b/main/source/utils/vgui/include/VGUI_GridLayout.h
new file mode 100644
index 00000000..946159dd
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_GridLayout.h
@@ -0,0 +1,30 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_GRIDLAYOUT_H
+#define VGUI_GRIDLAYOUT_H
+
+#include<VGUI.h>
+#include<VGUI_Layout.h>
+
+namespace vgui
+{
+
+/*
+class VGUIAPI GridLayout : public Layout
+{
+public:
+	GridLayout(int rows,int cols,int hgap,int vgap);
+protected:
+	int _rows;
+	int _cols;
+};
+*/
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_HeaderPanel.h b/main/source/utils/vgui/include/VGUI_HeaderPanel.h
new file mode 100644
index 00000000..163d88f7
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_HeaderPanel.h
@@ -0,0 +1,65 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_HEADERPANEL_H
+#define VGUI_HEADERPANEL_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+#include<VGUI_Dar.h>
+#include<VGUI_Cursor.h>
+
+namespace vgui
+{
+
+enum MouseCode;
+class ChangeSignal;
+
+class VGUIAPI HeaderPanel : public Panel
+{
+
+private:
+
+	Dar<Panel*>        _sliderPanelDar;
+	Dar<Panel*>        _sectionPanelDar;
+	Dar<ChangeSignal*> _changeSignalDar;
+	Panel*             _sectionLayer;
+	int                _sliderWide;
+	bool               _dragging;
+	int                _dragSliderIndex;
+	int                _dragSliderStartPos;
+	int                _dragSliderStartX;
+
+public:
+
+	HeaderPanel(int x,int y,int wide,int tall);
+
+protected:
+
+	virtual void performLayout();
+
+public:
+
+	virtual void addSectionPanel(Panel* panel);
+	virtual void setSliderPos(int sliderIndex,int pos);
+	virtual int  getSectionCount();
+	virtual void getSectionExtents(int sectionIndex,int& x0,int& x1);
+	virtual void addChangeSignal(ChangeSignal* s);
+
+public: //bullshit public
+
+	virtual void fireChangeSignal();
+	virtual void privateCursorMoved(int x,int y,Panel* panel);
+	virtual void privateMousePressed(MouseCode code,Panel* panel);
+	virtual void privateMouseReleased(MouseCode code,Panel* panel);
+
+};
+
+}
+
+#endif
+
diff --git a/main/source/utils/vgui/include/VGUI_Image.h b/main/source/utils/vgui/include/VGUI_Image.h
new file mode 100644
index 00000000..8250a87a
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_Image.h
@@ -0,0 +1,62 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_IMAGE_H
+#define VGUI_IMAGE_H
+
+#include<VGUI.h>
+#include<VGUI_Scheme.h>
+#include<VGUI_Color.h>
+
+//TODO:: needs concept of insets
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI Image
+{
+friend class Panel;
+private:
+	int                 _pos[2];
+	int                 _size[2];
+	Panel*              _panel;
+	Color               _color;
+public:
+	Image();
+public:
+	virtual void setPos(int x,int y);
+	virtual void getPos(int& x,int& y);
+	virtual void getSize(int& wide,int& tall);
+	virtual void setColor(Color color);
+	virtual void getColor(Color& color);
+protected:
+	virtual void setSize(int wide,int tall);
+	virtual void drawSetColor(Scheme::SchemeColor sc);
+	virtual void drawSetColor(int r,int g,int b,int a);
+	virtual void drawFilledRect(int x0,int y0,int x1,int y1);
+	virtual void drawOutlinedRect(int x0,int y0,int x1,int y1);
+	virtual void drawSetTextFont(Scheme::SchemeFont sf);
+	virtual void drawSetTextFont(Font* font);
+	virtual void drawSetTextColor(Scheme::SchemeColor sc);
+	virtual void drawSetTextColor(int r,int g,int b,int a);
+	virtual void drawSetTextPos(int x,int y);
+	virtual void drawPrintText(const char* str,int strlen);
+	virtual void drawPrintText(int x,int y,const char* str,int strlen);
+	virtual void drawPrintChar(char ch);
+	virtual void drawPrintChar(int x,int y,char ch);
+	virtual void drawSetTextureRGBA(int id,const char* rgba,int wide,int tall);
+	virtual void drawSetTexture(int id);
+	virtual void drawTexturedRect(int x0,int y0,int x1,int y1);
+	virtual void paint(Panel* panel);
+public:
+	virtual void doPaint(Panel* panel);
+};
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_ImagePanel.h b/main/source/utils/vgui/include/VGUI_ImagePanel.h
new file mode 100644
index 00000000..cb492cd5
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_ImagePanel.h
@@ -0,0 +1,38 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_IMAGEPANEL_H
+#define VGUI_IMAGEPANEL_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+
+class Image;
+
+class VGUIAPI ImagePanel : public Panel
+{
+public:
+	inline ImagePanel()
+	{
+		_image=null;
+	}
+
+	ImagePanel(Image* image);
+public:
+	virtual void setImage(Image* image);
+protected:
+	virtual void paintBackground();
+protected:
+	Image* _image;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_InputSignal.h b/main/source/utils/vgui/include/VGUI_InputSignal.h
new file mode 100644
index 00000000..d5fc02a9
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_InputSignal.h
@@ -0,0 +1,39 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_INPUTSIGNAL_H
+#define VGUI_INPUTSIGNAL_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+enum MouseCode;
+enum KeyCode;
+class Panel;
+
+//these are lumped into one for simplicity sake right now
+class VGUIAPI InputSignal
+{
+public:
+	virtual void cursorMoved(int x,int y,Panel* panel)=0;
+	virtual void cursorEntered(Panel* panel)=0;
+	virtual void cursorExited(Panel* panel)=0;
+	virtual void mousePressed(MouseCode code,Panel* panel)=0;
+	virtual void mouseDoublePressed(MouseCode code,Panel* panel)=0;
+	virtual void mouseReleased(MouseCode code,Panel* panel)=0;
+	virtual void mouseWheeled(int delta,Panel* panel)=0;
+	virtual void keyPressed(KeyCode code,Panel* panel)=0;
+	virtual void keyTyped(KeyCode code,Panel* panel)=0;
+	virtual void keyReleased(KeyCode code,Panel* panel)=0;
+	virtual void keyFocusTicked(Panel* panel)=0;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_InputStream.h b/main/source/utils/vgui/include/VGUI_InputStream.h
new file mode 100644
index 00000000..141e9e2e
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_InputStream.h
@@ -0,0 +1,30 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_FILE_H
+#define VGUI_FILE_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+class VGUIAPI InputStream
+{
+public:
+	virtual void  seekStart(bool& success)=0;
+	virtual void  seekRelative(int count,bool& success)=0;
+	virtual void  seekEnd(bool& success)=0;
+	virtual int   getAvailable(bool& success)=0;
+	virtual uchar readUChar(bool& success)=0;
+	virtual void  readUChar(uchar* buf,int count,bool& success)=0;
+	virtual void  close(bool& success)=0;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_IntChangeSignal.h b/main/source/utils/vgui/include/VGUI_IntChangeSignal.h
new file mode 100644
index 00000000..9aa4d49e
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_IntChangeSignal.h
@@ -0,0 +1,26 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_INTCHANGESIGNAL_H
+#define VGUI_INTCHANGESIGNAL_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI IntChangeSignal
+{
+public:
+	virtual void intChanged(int value,Panel* panel)=0;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_IntLabel.h b/main/source/utils/vgui/include/VGUI_IntLabel.h
new file mode 100644
index 00000000..275b3cea
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_IntLabel.h
@@ -0,0 +1,35 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_INTLABEL_H
+#define VGUI_INTLABEL_H
+
+#include<VGUI.h>
+#include<VGUI_Label.h>
+#include<VGUI_IntChangeSignal.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI IntLabel : public Label , public IntChangeSignal
+{
+public:
+	IntLabel(int value,int x,int y,int wide,int tall);
+public:
+	virtual void setValue(int value);
+	virtual void intChanged(int value,Panel* panel);
+protected:
+	virtual void paintBackground();
+protected:
+	int _value;
+};
+
+}
+
+#endif
diff --git a/main/source/utils/vgui/include/VGUI_KeyCode.h b/main/source/utils/vgui/include/VGUI_KeyCode.h
new file mode 100644
index 00000000..f100cd42
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_KeyCode.h
@@ -0,0 +1,126 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_KEYCODE_H
+#define VGUI_KEYCODE_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+enum VGUIAPI KeyCode
+{
+	KEY_0=0,
+	KEY_1,
+	KEY_2,
+	KEY_3,
+	KEY_4,
+	KEY_5,
+	KEY_6,
+	KEY_7,
+	KEY_8,
+	KEY_9,
+	KEY_A,
+	KEY_B,
+	KEY_C,
+	KEY_D,
+	KEY_E,
+	KEY_F,
+	KEY_G,
+	KEY_H,
+	KEY_I,
+	KEY_J,
+	KEY_K,
+	KEY_L,
+	KEY_M,
+	KEY_N,
+	KEY_O,
+	KEY_P,
+	KEY_Q,
+	KEY_R,
+	KEY_S,
+	KEY_T,
+	KEY_U,
+	KEY_V,
+	KEY_W,
+	KEY_X,
+	KEY_Y,
+	KEY_Z,
+	KEY_PAD_0,
+	KEY_PAD_1,
+	KEY_PAD_2,
+	KEY_PAD_3,
+	KEY_PAD_4,
+	KEY_PAD_5,
+	KEY_PAD_6,
+	KEY_PAD_7,
+	KEY_PAD_8,
+	KEY_PAD_9,
+	KEY_PAD_DIVIDE,
+	KEY_PAD_MULTIPLY,
+	KEY_PAD_MINUS,
+	KEY_PAD_PLUS,
+	KEY_PAD_ENTER,
+	KEY_PAD_DECIMAL,
+	KEY_LBRACKET,
+	KEY_RBRACKET,
+	KEY_SEMICOLON,
+	KEY_APOSTROPHE,
+	KEY_BACKQUOTE,
+	KEY_COMMA,
+	KEY_PERIOD,
+	KEY_SLASH,
+	KEY_BACKSLASH,
+	KEY_MINUS,
+	KEY_EQUAL,
+	KEY_ENTER,
+	KEY_SPACE,
+	KEY_BACKSPACE,
+	KEY_TAB,
+	KEY_CAPSLOCK,
+	KEY_NUMLOCK,
+	KEY_ESCAPE,
+	KEY_SCROLLLOCK,
+	KEY_INSERT,
+	KEY_DELETE,
+	KEY_HOME,
+	KEY_END,
+	KEY_PAGEUP,
+	KEY_PAGEDOWN,
+	KEY_BREAK,
+	KEY_LSHIFT,
+	KEY_RSHIFT,
+	KEY_LALT,
+	KEY_RALT,
+	KEY_LCONTROL,
+	KEY_RCONTROL,
+	KEY_LWIN,
+	KEY_RWIN,
+	KEY_APP,
+	KEY_UP,
+	KEY_LEFT,
+	KEY_DOWN,
+	KEY_RIGHT,
+	KEY_F1,
+	KEY_F2,
+	KEY_F3,
+	KEY_F4,
+	KEY_F5,
+	KEY_F6,
+	KEY_F7,
+	KEY_F8,
+	KEY_F9,
+	KEY_F10,
+	KEY_F11,
+	KEY_F12,
+	KEY_LAST,
+};
+}
+
+
+#endif
+
diff --git a/main/source/utils/vgui/include/VGUI_Label.h b/main/source/utils/vgui/include/VGUI_Label.h
new file mode 100644
index 00000000..af90e9f8
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_Label.h
@@ -0,0 +1,80 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_LABEL_H
+#define VGUI_LABEL_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+#include<VGUI_Scheme.h>
+
+//TODO: this should use a TextImage for the text
+
+namespace vgui
+{
+
+class Panel;
+class TextImage;
+
+class VGUIAPI Label : public Panel
+{
+public:
+	enum Alignment
+	{
+		a_northwest=0,
+		a_north,
+		a_northeast,
+		a_west,
+		a_center,
+		a_east,
+		a_southwest,
+		a_south,
+		a_southeast,
+	};
+public:	
+	Label(int textBufferLen,const char* text,int x,int y,int wide,int tall);
+	Label(const char* text,int x,int y,int wide,int tall);
+	Label(const char* text,int x,int y);
+	Label(const char* text);
+	
+	inline Label() : Panel(0,0,10,10)
+	{
+		init(1,"",true);
+	}
+private:
+	void init(int textBufferLen,const char* text,bool textFitted);
+public:
+	virtual void setImage(Image* image);
+	virtual void setText(int textBufferLen,const char* text);
+	virtual void setText(const char* format,...);
+	virtual void setFont(Scheme::SchemeFont schemeFont);
+	virtual void setFont(Font* font);
+	virtual void getTextSize(int& wide,int& tall);
+	virtual void getContentSize(int& wide,int& tall);
+	virtual void setTextAlignment(Alignment alignment);
+	virtual void setContentAlignment(Alignment alignment);
+	virtual Panel* createPropertyPanel();
+	virtual void setFgColor(int r,int g,int b,int a);
+	virtual void setFgColor(vgui::Scheme::SchemeColor sc);
+	virtual void setContentFitted(bool state);
+protected:
+	virtual void computeAlignment(int& tx0,int& ty0,int& tx1,int& ty1,int& ix0,int& iy0,int& ix1,int& iy1,int& minX,int& minY,int& maxX,int& maxY);
+	virtual void paint();
+	virtual void recomputeMinimumSize();
+protected:
+	bool       _textEnabled;
+	bool       _imageEnabled;
+	bool       _contentFitted;
+	Alignment  _textAlignment;
+	Alignment  _contentAlignment;
+	TextImage* _textImage;
+	Image*     _image;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_Layout.h b/main/source/utils/vgui/include/VGUI_Layout.h
new file mode 100644
index 00000000..081c2ec1
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_Layout.h
@@ -0,0 +1,31 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_LAYOUT_H
+#define VGUI_LAYOUT_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI Layout
+{
+//private:
+//	Panel* _panel;
+public:
+	Layout();
+public:
+	//virtual void setPanel(Panel* panel); //called by Panel::setLayout
+	virtual void performLayout(Panel* panel);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_LayoutInfo.h b/main/source/utils/vgui/include/VGUI_LayoutInfo.h
new file mode 100644
index 00000000..569be760
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_LayoutInfo.h
@@ -0,0 +1,21 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_LAYOUTINFO_H
+#define VGUI_LAYOUTINFO_H
+
+namespace vgui
+{
+
+class VGUIAPI LayoutInfo
+{
+	virtual LayoutInfo* getThis()=0;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_LineBorder.h b/main/source/utils/vgui/include/VGUI_LineBorder.h
new file mode 100644
index 00000000..1263a46e
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_LineBorder.h
@@ -0,0 +1,39 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_LINEBORDER_H
+#define VGUI_LINEBORDER_H
+
+#include<VGUI.h>
+#include<VGUI_Border.h>
+#include<VGUI_Color.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI LineBorder : public Border
+{
+private:
+	Color _color;
+public:
+	LineBorder();
+	LineBorder(int thickness);
+	LineBorder(Color color);
+	LineBorder(int thickness,Color color);
+
+	inline void setLineColor(int r, int g, int b, int a) {_color = Color(r,g,b,a);}
+private:
+	virtual void init(int thickness,Color color);
+protected:
+	virtual void paint(Panel* panel);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_ListPanel.h b/main/source/utils/vgui/include/VGUI_ListPanel.h
new file mode 100644
index 00000000..542f5bde
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_ListPanel.h
@@ -0,0 +1,40 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_LISTPANEL_H
+#define VGUI_LISTPANEL_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+
+class ScrollBar;
+
+//TODO: make a ScrollPanel and use a constrained one for _vpanel in ListPanel
+class VGUIAPI ListPanel : public Panel
+{
+public:
+	ListPanel(int x,int y,int wide,int tall);
+public:
+	virtual void setSize(int wide,int tall);
+	virtual void addString(const char* str);
+	virtual void addItem(Panel* panel);
+	virtual void setPixelScroll(int value);
+	virtual void translatePixelScroll(int delta);
+protected:
+	virtual void performLayout();
+	virtual void paintBackground();
+protected: 
+	Panel*     _vpanel;
+	ScrollBar* _scroll;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_LoweredBorder.h b/main/source/utils/vgui/include/VGUI_LoweredBorder.h
new file mode 100644
index 00000000..85ed51c0
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_LoweredBorder.h
@@ -0,0 +1,29 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_LOWEREDBORDER_H
+#define VGUI_LOWEREDBORDER_H
+
+#include<VGUI.h>
+#include<VGUI_Border.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI LoweredBorder : public Border
+{
+public:
+	LoweredBorder();
+protected:
+	virtual void paint(Panel* panel);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_Menu.h b/main/source/utils/vgui/include/VGUI_Menu.h
new file mode 100644
index 00000000..035c1485
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_Menu.h
@@ -0,0 +1,30 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_MENU_H
+#define VGUI_MENU_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI Menu : public Panel
+{
+public:
+	Menu(int x,int y,int wide,int tall);
+	Menu(int wide,int tall);
+public:
+	virtual void addMenuItem(Panel* panel);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_MenuItem.h b/main/source/utils/vgui/include/VGUI_MenuItem.h
new file mode 100644
index 00000000..33cfa275
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_MenuItem.h
@@ -0,0 +1,30 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_MENUITEM_H
+#define VGUI_MENUITEM_H
+
+#include<VGUI.h>
+#include<VGUI_Button.h>
+
+namespace vgui
+{
+
+class Menu;
+
+class VGUIAPI MenuItem : public Button
+{
+public:
+	MenuItem(const char* text);
+	MenuItem(const char* text,Menu* subMenu);
+protected:
+	Menu* _subMenu;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_MenuSeparator.h b/main/source/utils/vgui/include/VGUI_MenuSeparator.h
new file mode 100644
index 00000000..f183a974
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_MenuSeparator.h
@@ -0,0 +1,27 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_MENUSEPARATOR_H
+#define VGUI_MENUSEPARATOR_H
+
+#include<VGUI.h>
+#include<VGUI_Label.h>
+
+namespace vgui
+{
+
+class VGUIAPI MenuSeparator : public Label
+{
+public:
+	MenuSeparator(const char* text);
+protected:
+	virtual void paintBackground();
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_MessageBox.h b/main/source/utils/vgui/include/VGUI_MessageBox.h
new file mode 100644
index 00000000..38a6e3c4
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_MessageBox.h
@@ -0,0 +1,53 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_MESSAGEBOX_H
+#define VGUI_MESSAGEBOX_H
+
+#include<VGUI.h>
+#include<VGUI_Frame.h>
+#include<VGUI_Dar.h>
+
+
+namespace vgui
+{
+
+class Label;
+class Button;
+class ActionSignal;
+
+class VGUIAPI MessageBox : public Frame
+{
+
+private:
+	
+	Label*             _messageLabel;
+	Button*            _okButton;
+	Dar<ActionSignal*> _actionSignalDar;
+
+public:
+
+	MessageBox(const char* title,const char* text,int x,int y);
+
+protected:
+	
+	virtual void performLayout();
+
+public:
+	
+	virtual void addActionSignal(ActionSignal* s);
+	virtual void fireActionSignal();
+
+};
+
+}
+
+
+
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_MiniApp.h b/main/source/utils/vgui/include/VGUI_MiniApp.h
new file mode 100644
index 00000000..b7ce6682
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_MiniApp.h
@@ -0,0 +1,33 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_MINIAPP_H
+#define VGUI_MINIAPP_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+
+class Frame;
+
+class VGUIAPI MiniApp
+{
+public:
+	MiniApp();
+public:
+	virtual void   getName(char* buf,int bufLen);
+	virtual Frame* createInstance()=0;
+protected:
+	virtual void setName(const char* name);
+protected:
+	char* _name;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_MouseCode.h b/main/source/utils/vgui/include/VGUI_MouseCode.h
new file mode 100644
index 00000000..8adf8641
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_MouseCode.h
@@ -0,0 +1,24 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_MOUSECODE_H
+#define VGUI_MOUSECODE_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+enum VGUIAPI MouseCode
+{
+	MOUSE_LEFT=0,
+	MOUSE_RIGHT,
+	MOUSE_MIDDLE,
+	MOUSE_LAST,
+};
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_Panel.h b/main/source/utils/vgui/include/VGUI_Panel.h
new file mode 100644
index 00000000..d5cbd7b4
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_Panel.h
@@ -0,0 +1,224 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_PANEL_H
+#define VGUI_PANEL_H
+
+
+/*
+
+TODO:
+
+Maybe have the border know who they are added to.
+A border can only be added to 1 thing, and will be
+removed from the other. That way they can actually
+be memory managed. Also do Layout's this way too.
+
+TODO:
+	outlinedRect should have a thickness arg
+
+*/
+
+					 
+#include<VGUI.h>
+#include<VGUI_Dar.h>
+#include<VGUI_Scheme.h>
+#include<VGUI_Color.h>
+
+namespace vgui
+{
+
+enum  KeyCode;
+enum  MouseCode;
+class SurfaceBase;
+class FocusChangeSignal;
+class InputSignal;
+class Cursor;
+class Layout;
+class FocusNavGroup;
+class Border;
+class Font;
+class BuildGroup;
+class App;
+class LayoutInfo;
+
+class VGUIAPI Panel
+{
+public:
+	Panel();
+	Panel(int x,int y,int wide,int tall); 
+private:
+	void init(int x,int y,int wide,int tall);
+public:
+	virtual void   setPos(int x,int y);
+	virtual void   getPos(int& x,int& y);
+	virtual void   setSize(int wide,int tall);
+	virtual void   getSize(int& wide,int& tall);
+	virtual void   setBounds(int x,int y,int wide,int tall);
+	virtual void   getBounds(int& x,int& y,int& wide,int& tall);
+	virtual int    getWide();
+	virtual int    getTall();
+	virtual Panel* getParent();
+	virtual void   setVisible(bool state);
+	virtual bool   isVisible();
+	virtual bool   isVisibleUp();
+	virtual void   repaint();
+	virtual void   repaintAll();
+	virtual void   getAbsExtents(int& x0,int& y0,int& x1,int& y1);
+	virtual void   getClipRect(int& x0,int& y0,int& x1,int& y1);
+	virtual void   setParent(Panel* newParent);
+	virtual void   addChild(Panel* child);
+	virtual void   insertChildAt(Panel* child,int index);
+	virtual void   removeChild(Panel* child);
+	virtual bool   wasMousePressed(MouseCode code);
+	virtual bool   wasMouseDoublePressed(MouseCode code);
+	virtual bool   isMouseDown(MouseCode code);
+	virtual bool   wasMouseReleased(MouseCode code);
+	virtual bool   wasKeyPressed(KeyCode code);
+	virtual bool   isKeyDown(KeyCode code);
+	virtual bool   wasKeyTyped(KeyCode code);
+	virtual bool   wasKeyReleased(KeyCode code);
+	virtual void   addInputSignal(InputSignal* s);
+	virtual void   removeInputSignal(InputSignal* s);
+	virtual void   addRepaintSignal(RepaintSignal* s);
+	virtual void   removeRepaintSignal(RepaintSignal* s);
+	virtual bool   isWithin(int x,int y); //in screen space
+	virtual Panel* isWithinTraverse(int x,int y);
+	virtual void   localToScreen(int& x,int& y);
+	virtual void   screenToLocal(int& x,int& y);
+	virtual void   setCursor(Cursor* cursor);
+	virtual void   setCursor(Scheme::SchemeCursor scu);
+	virtual Cursor* getCursor();
+	virtual void   setMinimumSize(int wide,int tall);
+	virtual void   getMinimumSize(int& wide,int& tall);
+	virtual void   requestFocus();
+	virtual bool   hasFocus();
+	virtual int    getChildCount();
+	virtual Panel* getChild(int index);
+	virtual void   setLayout(Layout* layout);
+	virtual void   invalidateLayout(bool layoutNow);
+	virtual void   setFocusNavGroup(FocusNavGroup* focusNavGroup);
+	virtual void   requestFocusPrev();
+	virtual void   requestFocusNext();
+	virtual void   addFocusChangeSignal(FocusChangeSignal* s);
+	virtual bool   isAutoFocusNavEnabled();
+	virtual void   setAutoFocusNavEnabled(bool state);
+	virtual void   setBorder(Border* border);
+	virtual void   setPaintBorderEnabled(bool state);
+	virtual void   setPaintBackgroundEnabled(bool state);
+	virtual void   setPaintEnabled(bool state);
+	virtual void   getInset(int& left,int& top,int& right,int& bottom);
+	virtual void   getPaintSize(int& wide,int& tall);
+	virtual void   setPreferredSize(int wide,int tall);
+	virtual void   getPreferredSize(int& wide,int& tall);
+	virtual SurfaceBase* getSurfaceBase();
+	virtual bool   isEnabled();
+	virtual void   setEnabled(bool state);
+	virtual void   setBuildGroup(BuildGroup* buildGroup,const char* panelPersistanceName);
+	virtual bool   isBuildGroupEnabled();
+	virtual void   removeAllChildren();
+	virtual void   repaintParent();
+	virtual Panel* createPropertyPanel();
+	virtual void   getPersistanceText(char* buf,int bufLen);
+	virtual void   applyPersistanceText(const char* buf);
+	virtual void   setFgColor(Scheme::SchemeColor sc);
+	virtual void   setBgColor(Scheme::SchemeColor sc);
+	virtual void   setFgColor(int r,int g,int b,int a);
+	virtual void   setBgColor(int r,int g,int b,int a);
+	virtual void   getFgColor(int& r,int& g,int& b,int& a);
+	virtual void   getBgColor(int& r,int& g,int& b,int& a);
+	virtual void   setBgColor(Color color);
+	virtual void   setFgColor(Color color);
+	virtual void   getBgColor(Color& color);
+	virtual void   getFgColor(Color& color);
+	virtual void   setAsMouseCapture(bool state);
+	virtual void   setAsMouseArena(bool state);
+	virtual App*   getApp();
+	virtual void   getVirtualSize(int& wide,int& tall);
+	virtual void   setLayoutInfo(LayoutInfo* layoutInfo);
+	virtual LayoutInfo* getLayoutInfo();
+	virtual bool   isCursorNone();
+public: //bullshit public
+	virtual void solveTraverse();
+	virtual void paintTraverse();
+	virtual void setSurfaceBaseTraverse(SurfaceBase* surfaceBase);
+protected:
+	virtual void performLayout();
+	virtual void internalPerformLayout();
+	virtual void drawSetColor(Scheme::SchemeColor sc);
+	virtual void drawSetColor(int r,int g,int b,int a);
+	virtual void drawFilledRect(int x0,int y0,int x1,int y1);
+	virtual void drawOutlinedRect(int x0,int y0,int x1,int y1);
+	virtual void drawSetTextFont(Scheme::SchemeFont sf);
+	virtual void drawSetTextFont(Font* font);
+	virtual void drawSetTextColor(Scheme::SchemeColor sc);
+	virtual void drawSetTextColor(int r,int g,int b,int a);
+	virtual void drawSetTextPos(int x,int y);
+	virtual void drawPrintText(const char* str,int strlen);
+	virtual void drawPrintText(int x,int y,const char* str,int strlen);
+	virtual void drawPrintChar(char ch);
+	virtual void drawPrintChar(int x,int y,char ch);
+	virtual void drawSetTextureRGBA(int id,const char* rgba,int wide,int tall);
+	virtual void drawSetTexture(int id);
+	virtual void drawTexturedRect(int x0,int y0,int x1,int y1);
+	virtual void solve();
+	virtual void paintTraverse(bool repaint);
+	virtual void paintBackground();
+	virtual void paint();
+	virtual void paintBuildOverlay();
+	virtual void internalCursorMoved(int x,int y);
+	virtual void internalCursorEntered();
+	virtual void internalCursorExited();
+	virtual void internalMousePressed(MouseCode code);
+	virtual void internalMouseDoublePressed(MouseCode code);
+	virtual void internalMouseReleased(MouseCode code);
+	virtual void internalMouseWheeled(int delta);
+	virtual void internalKeyPressed(KeyCode code);
+	virtual void internalKeyTyped(KeyCode code);
+	virtual void internalKeyReleased(KeyCode code);
+	virtual void internalKeyFocusTicked();
+	virtual void internalFocusChanged(bool lost);
+	virtual void internalSetCursor();
+protected:
+	int               _pos[2];
+	int               _size[2];
+	int               _loc[2];
+	int               _minimumSize[2];
+	int               _preferredSize[2];
+	Dar<Panel*>       _childDar;
+	Panel*            _parent;
+	SurfaceBase*      _surfaceBase;
+	Dar<InputSignal*> _inputSignalDar;
+	Dar<RepaintSignal*> _repaintSignalDar;
+	int               _clipRect[4];
+	Cursor*           _cursor;
+	Scheme::SchemeCursor _schemeCursor;
+	bool              _visible;
+	Layout*           _layout;
+	bool              _needsLayout;
+	FocusNavGroup*    _focusNavGroup;
+	Dar<FocusChangeSignal*> _focusChangeSignalDar;
+	bool              _autoFocusNavEnabled;
+	Border*           _border;
+private:
+	bool                _needsRepaint;
+	bool                _enabled;
+	BuildGroup*         _buildGroup;
+	Color               _fgColor;
+	Color               _bgColor;
+	LayoutInfo*         _layoutInfo;
+	bool                _paintBorderEnabled;
+	bool                _paintBackgroundEnabled;
+	bool                _paintEnabled;
+friend class Panel;
+friend class App;
+friend class SurfaceBase;
+friend class Image;
+};
+}
+
+#endif
diff --git a/main/source/utils/vgui/include/VGUI_PopupMenu.h b/main/source/utils/vgui/include/VGUI_PopupMenu.h
new file mode 100644
index 00000000..26f6bbcd
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_PopupMenu.h
@@ -0,0 +1,30 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_POPUPMENU_H
+#define VGUI_POPUPMENU_H
+
+#include<VGUI.h>
+#include<VGUI_Menu.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI PopupMenu : public Menu
+{
+public:
+	PopupMenu(int x,int y,int wide,int tall);
+	PopupMenu(int wide,int tall);
+public:
+	virtual void showModal(Panel* panel);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_ProgressBar.h b/main/source/utils/vgui/include/VGUI_ProgressBar.h
new file mode 100644
index 00000000..9c3ca114
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_ProgressBar.h
@@ -0,0 +1,33 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_PROGRESSBAR_H
+#define VGUI_PROGRESSBAR_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+
+class VGUIAPI ProgressBar : public Panel
+{
+private:
+	int   _segmentCount;
+	float _progress;
+public:
+	ProgressBar(int segmentCount);
+protected:
+	virtual void paintBackground();
+public:
+	virtual void setProgress(float progress);
+	virtual int  getSegmentCount();
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_RadioButton.h b/main/source/utils/vgui/include/VGUI_RadioButton.h
new file mode 100644
index 00000000..89add27a
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_RadioButton.h
@@ -0,0 +1,29 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_RADIOBUTTON_H
+#define VGUI_RADIOBUTTON_H
+
+#include<VGUI.h>
+#include<VGUI_ToggleButton.h>
+
+namespace vgui
+{
+
+class VGUIAPI RadioButton : public ToggleButton
+{
+public:
+	RadioButton(const char* text,int x,int y,int wide,int tall);
+	RadioButton(const char* text,int x,int y);
+protected:
+	virtual void paintBackground();
+};
+
+}
+
+#endif
+
diff --git a/main/source/utils/vgui/include/VGUI_RaisedBorder.h b/main/source/utils/vgui/include/VGUI_RaisedBorder.h
new file mode 100644
index 00000000..b5a35888
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_RaisedBorder.h
@@ -0,0 +1,29 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_RAISEDBORDER_H
+#define VGUI_RAISEDBORDER_H
+
+#include<VGUI.h>
+#include<VGUI_Border.h>
+
+namespace vgui
+{
+
+class Panel;
+
+class VGUIAPI RaisedBorder : public Border
+{
+public:
+	RaisedBorder();
+protected:
+	virtual void paint(Panel* panel);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_RepaintSignal.h b/main/source/utils/vgui/include/VGUI_RepaintSignal.h
new file mode 100644
index 00000000..e728a4b4
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_RepaintSignal.h
@@ -0,0 +1,25 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_REPAINTSIGNAL_H
+#define VGUI_REPAINTSIGNAL_H
+
+
+
+namespace vgui
+{
+
+class RepaintSignal
+{
+public:
+	virtual void panelRepainted(Panel* panel)=0;
+};
+
+}
+
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_Scheme.h b/main/source/utils/vgui/include/VGUI_Scheme.h
new file mode 100644
index 00000000..82f85001
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_Scheme.h
@@ -0,0 +1,82 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_SCHEME_H
+#define VGUI_SCHEME_H
+
+#include<VGUI.h>
+
+
+namespace vgui
+{
+
+class Font;
+class Cursor;
+
+class VGUIAPI Scheme
+{
+public:
+	enum SchemeColor
+	{
+		sc_user=0,
+		sc_black,
+		sc_white,
+		sc_primary1,
+		sc_primary2,
+		sc_primary3,
+		sc_secondary1,
+		sc_secondary2,
+		sc_secondary3,
+		sc_last,
+	};
+	enum SchemeFont
+	{
+		sf_user=0,
+		sf_primary1,
+		sf_primary2,
+		sf_primary3,
+		sf_secondary1,
+		sf_last,
+	};
+	enum SchemeCursor
+	{
+		scu_user=0,
+		scu_none,
+		scu_arrow,
+		scu_ibeam,
+		scu_hourglass,
+		scu_crosshair,
+		scu_up,
+		scu_sizenwse,
+		scu_sizenesw,
+		scu_sizewe,
+		scu_sizens,
+		scu_sizeall,
+		scu_no,
+		scu_hand,
+		scu_last,
+	};
+public:
+	Scheme();
+public:
+	virtual void    setColor(SchemeColor sc,int r,int g,int b,int a);
+	virtual void    getColor(SchemeColor sc,int& r,int& g,int& b,int& a);
+	virtual void    setFont(SchemeFont sf,Font* font);
+	virtual Font*   getFont(SchemeFont sf);
+	virtual void    setCursor(SchemeCursor sc,Cursor* cursor);
+	virtual Cursor* getCursor(SchemeCursor sc);
+protected:
+	int     _color[sc_last][4];
+    Font*   _font[sf_last];
+	Cursor* _cursor[scu_last];
+    friend class Panel;
+    friend class Canvas;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_ScrollBar.h b/main/source/utils/vgui/include/VGUI_ScrollBar.h
new file mode 100644
index 00000000..ea280ea4
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_ScrollBar.h
@@ -0,0 +1,56 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_SCROLLBAR_H
+#define VGUI_SCROLLBAR_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+class IntChangeSignal;
+class Button;
+class Slider;
+
+class VGUIAPI ScrollBar : public Panel
+{
+public:
+	ScrollBar(int x,int y,int wide,int tall,bool vertical);
+public:
+	virtual void    setValue(int value);
+	virtual int     getValue();
+	virtual void    addIntChangeSignal(IntChangeSignal* s); 
+	virtual void    setRange(int min,int max);
+	virtual void    setRangeWindow(int rangeWindow);
+	virtual void    setRangeWindowEnabled(bool state);
+	virtual void    setSize(int wide,int tall);
+	virtual bool    isVertical();
+	virtual bool    hasFullRange();
+	virtual void    setButton(Button* button,int index);
+	virtual Button* getButton(int index);
+	virtual void    setSlider(Slider* slider);
+	virtual Slider* getSlider();
+	virtual void 	doButtonPressed(int buttonIndex);
+	virtual void    setButtonPressedScrollValue(int value);
+	virtual void    validate();
+public: //bullshit public 
+	virtual void fireIntChangeSignal();
+protected:
+	virtual void performLayout();
+protected:
+	Button* _button[2];
+	Slider* _slider;
+	Dar<IntChangeSignal*> _intChangeSignalDar;
+	int     _buttonPressedScrollValue;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_ScrollPanel.h b/main/source/utils/vgui/include/VGUI_ScrollPanel.h
new file mode 100644
index 00000000..88bcf2f9
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_ScrollPanel.h
@@ -0,0 +1,55 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_SCROLLPANEL_H
+#define VGUI_SCROLLPANEL_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+
+//NOTE: You need to call validate anytime you change a scrollbar
+
+namespace vgui
+{
+
+class ScrollBar;
+
+class VGUIAPI ScrollPanel : public Panel
+{
+private:
+	Panel*     _clientClip;
+	Panel*     _client;
+	ScrollBar* _horizontalScrollBar;
+	ScrollBar* _verticalScrollBar;
+	bool       _autoVisible[2];
+public:
+	ScrollPanel(int x,int y,int wide,int tall);
+protected:
+	virtual void setSize(int wide,int tall);
+public:
+	virtual void   setScrollBarVisible(bool horizontal,bool vertical);
+	virtual void   setScrollBarAutoVisible(bool horizontal,bool vertical);
+	virtual Panel* getClient();
+	virtual Panel* getClientClip();
+	virtual void   setScrollValue(int horizontal,int vertical);
+	virtual void   getScrollValue(int& horizontal,int& vertical);
+	virtual void   recomputeClientSize();
+	virtual ScrollBar* getHorizontalScrollBar();
+	virtual ScrollBar* getVerticalScrollBar();
+	virtual void       validate();
+public: //bullshit public
+	virtual void recomputeScroll();
+};
+
+}
+
+
+
+
+
+
+#endif
diff --git a/main/source/utils/vgui/include/VGUI_Slider.h b/main/source/utils/vgui/include/VGUI_Slider.h
new file mode 100644
index 00000000..c4c69245
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_Slider.h
@@ -0,0 +1,69 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_SLIDER_H
+#define VGUI_SLIDER_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+enum MouseCode;
+class IntChangeSignal;
+
+class VGUIAPI Slider : public Panel
+{
+private:
+	bool                  _vertical;
+	bool                  _dragging;
+	int                   _nobPos[2];
+	int                   _nobDragStartPos[2];
+	int                   _dragStartPos[2];
+	Dar<IntChangeSignal*> _intChangeSignalDar;
+	int                   _range[2];
+	int                   _value;
+	int                   _rangeWindow;
+	bool                  _rangeWindowEnabled;
+	int                   _buttonOffset;
+public:
+	Slider(int x,int y,int wide,int tall,bool vertical);
+public:
+	virtual void setValue(int value);
+	virtual int  getValue();
+	virtual bool isVertical();
+	virtual void addIntChangeSignal(IntChangeSignal* s);
+    virtual void setRange(int min,int max);
+	virtual void getRange(int& min,int& max);
+	virtual void setRangeWindow(int rangeWindow);
+	virtual void setRangeWindowEnabled(bool state);
+	virtual void setSize(int wide,int tall);
+	virtual void getNobPos(int& min, int& max);
+	virtual bool hasFullRange();
+	virtual void setButtonOffset(int buttonOffset);
+private:
+	virtual void recomputeNobPosFromValue();
+	virtual void recomputeValueFromNobPos();
+public: //bullshit public
+	virtual void privateCursorMoved(int x,int y,Panel* panel);
+	virtual void privateMousePressed(MouseCode code,Panel* panel);
+	virtual void privateMouseReleased(MouseCode code,Panel* panel);
+protected:
+    virtual void fireIntChangeSignal();
+	virtual void paintBackground();
+};
+
+}
+
+#endif
+
+
+
+
+
diff --git a/main/source/utils/vgui/include/VGUI_StackLayout.h b/main/source/utils/vgui/include/VGUI_StackLayout.h
new file mode 100644
index 00000000..9da6652b
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_StackLayout.h
@@ -0,0 +1,30 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_STACKLAYOUT_H
+#define VGUI_STACKLAYOUT_H
+
+#include<VGUI.h>
+#include<VGUI_Layout.h>
+
+namespace vgui
+{
+
+class VGUIAPI StackLayout : public Layout
+{
+private:
+	int  _vgap;
+	bool _fitWide;
+public:
+	StackLayout(int vgap,bool fitWide);
+public:
+	virtual void performLayout(Panel* panel);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_String.h b/main/source/utils/vgui/include/VGUI_String.h
new file mode 100644
index 00000000..bfe9fdec
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_String.h
@@ -0,0 +1,61 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_STRING_H
+#define VGUI_STRING_H
+
+#include<VGUI.h>
+
+
+namespace vgui
+{
+
+class VGUIAPI String
+{
+
+friend class String;
+
+private:
+
+	char* _text;
+
+public:
+
+	String();
+	String(const char* text);
+	String(const String& src);
+
+public:
+	
+	~String();
+
+private:
+
+	int getCount(const char* text);
+
+public:
+
+	int    getCount();
+	String operator+(String text);
+	String operator+(const char* text);
+	bool   operator==(String text);
+	bool   operator==(const char* text);
+	char   operator[](int index);
+	const char* getChars();
+
+public:
+	
+	static void test();
+
+};
+
+
+}
+
+
+#endif
+
diff --git a/main/source/utils/vgui/include/VGUI_Surface.h b/main/source/utils/vgui/include/VGUI_Surface.h
new file mode 100644
index 00000000..7b5476af
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_Surface.h
@@ -0,0 +1,67 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_SURFACE_H
+#define VGUI_SURFACE_H
+
+#include<VGUI.h>
+#include<VGUI_SurfaceBase.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+class Panel;
+class Cursor;
+
+class VGUIAPI Surface : public SurfaceBase
+{
+public:
+	Surface(Panel* embeddedPanel);
+public:
+	virtual void setTitle(const char* title);
+	virtual bool setFullscreenMode(int wide,int tall,int bpp);
+	virtual void setWindowedMode();
+	virtual void setAsTopMost(bool state);
+	virtual int  getModeInfoCount();
+	virtual void createPopup(Panel* embeddedPanel);
+	virtual bool hasFocus();
+	virtual bool isWithin(int x,int y);
+protected:
+	virtual int  createNewTextureID(void);
+	virtual void drawSetColor(int r,int g,int b,int a);
+	virtual void drawFilledRect(int x0,int y0,int x1,int y1);
+	virtual void drawOutlinedRect(int x0,int y0,int x1,int y1);
+	virtual void drawSetTextFont(Font* font);
+	virtual void drawSetTextColor(int r,int g,int b,int a);
+	virtual void drawSetTextPos(int x,int y);
+	virtual void drawPrintText(const char* text,int textLen);
+	virtual void drawSetTextureRGBA(int id,const char* rgba,int wide,int tall);
+	virtual void drawSetTexture(int id);
+	virtual void drawTexturedRect(int x0,int y0,int x1,int y1);
+	virtual void invalidate(Panel *panel);
+	virtual bool createPlat();
+	virtual bool recreateContext();
+	virtual void enableMouseCapture(bool state);
+	virtual void setCursor(Cursor* cursor);
+	virtual void swapBuffers();
+	virtual void pushMakeCurrent(Panel* panel,bool useInsets);
+	virtual void popMakeCurrent(Panel* panel);
+	virtual void applyChanges();
+protected:
+	class SurfacePlat* _plat;
+	bool               _needsSwap;
+	Panel*             _embeddedPanel;
+	Dar<char*>         _modeInfoDar;
+	friend class App;
+	friend class Panel;
+};
+
+}
+
+#endif
+
diff --git a/main/source/utils/vgui/include/VGUI_SurfaceBase.h b/main/source/utils/vgui/include/VGUI_SurfaceBase.h
new file mode 100644
index 00000000..f654f9a4
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_SurfaceBase.h
@@ -0,0 +1,81 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_SURFACEBASE_H
+#define VGUI_SURFACEBASE_H
+
+#include<VGUI.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+class Panel;
+class Cursor;
+class Font;
+class App;
+class ImagePanel;
+
+class VGUIAPI SurfaceBase
+{
+public:
+	SurfaceBase(Panel* embeddedPanel);
+protected:
+	~SurfaceBase();
+public:
+	virtual Panel* getPanel();
+	virtual void   requestSwap();
+	virtual void   resetModeInfo();
+	virtual int    getModeInfoCount();
+	virtual bool   getModeInfo(int mode,int& wide,int& tall,int& bpp);
+	virtual App*   getApp();
+	virtual void   setEmulatedCursorVisible(bool state);
+	virtual void   setEmulatedCursorPos(int x,int y);
+public:
+	virtual void setTitle(const char* title)=0;
+	virtual bool setFullscreenMode(int wide,int tall,int bpp)=0;
+	virtual void setWindowedMode()=0;
+	virtual void setAsTopMost(bool state)=0;
+	virtual void createPopup(Panel* embeddedPanel)=0;
+	virtual bool hasFocus()=0;
+	virtual bool isWithin(int x,int y)=0;
+	virtual int  createNewTextureID(void)=0;
+protected:
+	virtual void addModeInfo(int wide,int tall,int bpp);
+protected:
+	virtual void drawSetColor(int r,int g,int b,int a)=0;
+	virtual void drawFilledRect(int x0,int y0,int x1,int y1)=0;
+	virtual void drawOutlinedRect(int x0,int y0,int x1,int y1)=0;
+	virtual void drawSetTextFont(Font* font)=0;
+	virtual void drawSetTextColor(int r,int g,int b,int a)=0;
+	virtual void drawSetTextPos(int x,int y)=0;
+	virtual void drawPrintText(const char* text,int textLen)=0;
+	virtual void drawSetTextureRGBA(int id,const char* rgba,int wide,int tall)=0;
+	virtual void drawSetTexture(int id)=0;
+	virtual void drawTexturedRect(int x0,int y0,int x1,int y1)=0;
+	virtual void invalidate(Panel *panel)=0;
+	virtual void enableMouseCapture(bool state)=0;
+	virtual void setCursor(Cursor* cursor)=0;
+	virtual void swapBuffers()=0;
+	virtual void pushMakeCurrent(Panel* panel,bool useInsets)=0;
+	virtual void popMakeCurrent(Panel* panel)=0;
+	virtual void applyChanges()=0;
+protected:
+	bool       _needsSwap;
+	App*       _app;
+	Panel*     _embeddedPanel;
+	Dar<char*> _modeInfoDar;
+	ImagePanel* _emulatedCursor;
+	Cursor*     _currentCursor;
+friend class App;
+friend class Panel;
+};
+
+}
+
+#endif
+
diff --git a/main/source/utils/vgui/include/VGUI_SurfaceGL.h b/main/source/utils/vgui/include/VGUI_SurfaceGL.h
new file mode 100644
index 00000000..b509a12c
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_SurfaceGL.h
@@ -0,0 +1,98 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_SURFACEGL_H
+#define VGUI_SURFACEGL_H
+
+//macros borrowed from GLUT to get rid of win32 dependent junk in gl headers
+#ifdef _WIN32
+# ifndef APIENTRY
+#  define VGUI_APIENTRY_DEFINED
+#  if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED)
+#   define APIENTRY    __stdcall
+#  else
+#   define APIENTRY
+#  endif
+# endif
+# ifndef CALLBACK
+#  define VGUI_CALLBACK_DEFINED
+#  if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_ALPHA) || defined(_M_PPC)) && !defined(MIDL_PASS)
+#   define CALLBACK __stdcall
+#  else
+#   define CALLBACK
+#  endif
+# endif
+# ifndef WINGDIAPI
+#  define VGUI_WINGDIAPI_DEFINED
+#  define WINGDIAPI __declspec(dllimport)
+# endif
+# ifndef _WCHAR_T_DEFINED
+typedef unsigned short wchar_t;
+#  define _WCHAR_T_DEFINED
+# endif
+# pragma comment(lib,"opengl32.lib")
+#endif
+
+#include <GL/gl.h>
+#include <GL/glu.h>
+
+#ifdef VGUI_APIENTRY_DEFINED
+# undef VGUI_APIENTRY_DEFINED
+# undef APIENTRY
+#endif
+
+#ifdef VGUI_CALLBACK_DEFINED
+# undef VGUI_CALLBACK_DEFINED
+# undef CALLBACK
+#endif
+
+#ifdef VGUI_WINGDIAPI_DEFINED
+# undef VGUI_WINGDIAPI_DEFINED
+# undef WINGDIAPI
+#endif
+
+
+
+#include<VGUI.h>
+#include<VGUI_Surface.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+
+class VGUIAPI SurfaceGL : public Surface
+{
+public:
+	SurfaceGL(Panel* embeddedPanel);
+public:
+	virtual void createPopup(Panel* embeddedPanel);
+protected:
+	virtual bool recreateContext();
+	virtual void pushMakeCurrent(Panel* panel,bool useInsets);
+	virtual void popMakeCurrent(Panel* panel);
+	virtual void makeCurrent();
+	virtual void swapBuffers();
+	virtual void setColor(int r,int g,int b);
+	virtual void filledRect(int x0,int y0,int x1,int y1);
+	virtual void outlinedRect(int x0,int y0,int x1,int y1);
+	virtual void setTextFont(Font* font);
+	virtual void setTextColor(int r,int g,int b);
+	virtual void setDrawPos(int x,int y);
+	virtual void printText(const char* str,int strlen);
+	virtual void setTextureRGBA(int id,const char* rgba,int wide,int tall);
+	virtual void setTexture(int id);
+	virtual void texturedRect(int x0,int y0,int x1,int y1);
+protected:
+	int   _drawPos[2];
+	uchar _drawColor[3];
+	uchar _drawTextColor[3];
+};
+
+}
+
+#endif
+
diff --git a/main/source/utils/vgui/include/VGUI_TabPanel.h b/main/source/utils/vgui/include/VGUI_TabPanel.h
new file mode 100644
index 00000000..f80bca53
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_TabPanel.h
@@ -0,0 +1,49 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_TABPANEL_H
+#define VGUI_TABPANEL_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+
+class ButtonGroup;
+
+class VGUIAPI TabPanel : public Panel
+{
+public:
+	enum TabPlacement
+	{
+		tp_top=0,
+		tp_bottom,
+		tp_left,
+		tp_right,
+	};
+public:
+	TabPanel(int x,int y,int wide,int tall);
+public:
+	virtual Panel* addTab(const char* text);
+	virtual void   setSelectedTab(Panel* tab);
+	virtual void   setSize(int wide,int tall);
+protected:
+	virtual void recomputeLayoutTop();
+	virtual void recomputeLayout();
+protected:
+	TabPlacement _tabPlacement;
+	Panel*       _tabArea;
+	Panel*       _clientArea;
+	Panel*       _selectedTab;
+	Panel*       _selectedPanel;
+	ButtonGroup* _buttonGroup;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_TablePanel.h b/main/source/utils/vgui/include/VGUI_TablePanel.h
new file mode 100644
index 00000000..3a76f7a8
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_TablePanel.h
@@ -0,0 +1,71 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_TABLEPANEL_H
+#define VGUI_TABLEPANEL_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+class HeaderPanel;
+
+class VGUIAPI TablePanel : public Panel
+{
+friend class FooVGuiTablePanelHandler;
+private:
+	vgui::Dar<int> _columnDar;
+	bool           _gridVisible[2];
+	int            _gridWide;
+	int            _gridTall;
+	int            _selectedCell[2];
+	int            _mouseOverCell[2];
+	int            _editableCell[2];
+	Panel*         _fakeInputPanel;
+	bool           _columnSelectionEnabled;
+	bool           _rowSelectionEnabled;
+	bool           _cellSelectionEnabled;
+	Panel*         _editableCellPanel;
+	int            _virtualSize[2];
+	bool           _cellEditingEnabled;
+public:
+	TablePanel(int x,int y,int wide,int tall,int columnCount);
+public:
+	virtual void   setCellEditingEnabled(bool state);
+	virtual void   setColumnCount(int columnCount);
+	virtual void   setGridVisible(bool horizontal,bool vertical);
+	virtual void   setGridSize(int gridWide,int gridTall);
+	virtual int    getColumnCount();
+	virtual void   setColumnExtents(int column,int x0,int x1);
+	virtual void   setSelectedCell(int column,int row);
+	virtual void   getSelectedCell(int& column,int& row);
+	virtual void   setHeaderPanel(HeaderPanel* header);
+	virtual void   setColumnSelectionEnabled(bool state);
+	virtual void   setRowSelectionEnabled(bool state);
+	virtual void   setCellSectionEnabled(bool state);
+	virtual void   setEditableCell(int column,int row);
+	virtual void   stopCellEditing();
+	virtual void   getVirtualSize(int& wide,int& tall);
+	virtual int    getRowCount()=0;
+	virtual int    getCellTall(int row)=0;
+	virtual Panel* getCellRenderer(int column,int row,bool columnSelected,bool rowSelected,bool cellSelected)=0;
+	virtual Panel* startCellEditing(int column,int row)=0;
+protected:
+	virtual void   paint();
+	virtual Panel* isWithinTraverse(int x,int y);
+private:
+	virtual void privateMousePressed(MouseCode code,Panel* panel);
+	virtual void privateMouseDoublePressed(MouseCode code,Panel* panel);
+	virtual void privateKeyTyped(KeyCode code,Panel* panel);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_TaskBar.h b/main/source/utils/vgui/include/VGUI_TaskBar.h
new file mode 100644
index 00000000..e9ec49d9
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_TaskBar.h
@@ -0,0 +1,37 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_TASKBAR_H
+#define VGUI_TASKBAR_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+class Frame;
+class Button;
+
+class VGUIAPI TaskBar : public Panel
+{
+public:
+	TaskBar(int x,int y,int wide,int tall);
+public:
+	virtual void addFrame(Frame* frame);
+protected:
+	virtual void performLayout();
+protected:
+	Dar<Frame*>  _frameDar;
+	Dar<Button*> _taskButtonDar;
+	Panel*       _tray;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_TextEntry.h b/main/source/utils/vgui/include/VGUI_TextEntry.h
new file mode 100644
index 00000000..682f000e
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_TextEntry.h
@@ -0,0 +1,80 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_TEXTENTRY_H
+#define VGUI_TEXTENTRY_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+#include<VGUI_InputSignal.h>
+
+namespace vgui
+{
+
+enum MouseCode;
+enum KeyCode;
+class ActionSignal;
+
+class VGUIAPI TextEntry : public Panel , public InputSignal
+{
+public:
+	TextEntry(const char* text,int x,int y,int wide,int tall);
+public:
+	virtual void setText(const char* text,int textLen);
+	virtual void getText(int offset,char* buf,int bufLen);
+	virtual void resetCursorBlink();
+	virtual void doGotoLeft();
+	virtual void doGotoRight();
+	virtual void doGotoFirstOfLine();
+	virtual void doGotoEndOfLine();
+	virtual void doInsertChar(char ch);
+	virtual void doBackspace();
+	virtual void doDelete();
+	virtual void doSelectNone();
+	virtual void doCopySelected();
+	virtual void doPaste();
+	virtual void doPasteSelected();
+	virtual void doDeleteSelected();
+	virtual void addActionSignal(ActionSignal* s);
+	virtual void setFont(Font* font);
+	virtual void setTextHidden(bool bHideText);
+protected:
+	virtual void paintBackground();
+	virtual void setCharAt(char ch,int index);
+protected:
+	virtual void fireActionSignal();
+	virtual bool getSelectedRange(int& cx0,int& cx1);
+	virtual bool getSelectedPixelRange(int& cx0,int& cx1);
+	virtual int  cursorToPixelSpace(int cursorPos);
+	virtual void selectCheck();
+protected: //InputSignal
+	virtual void cursorMoved(int x,int y,Panel* panel);
+	virtual void cursorEntered(Panel* panel);
+	virtual void cursorExited(Panel* panel);
+	virtual void mousePressed(MouseCode code,Panel* panel);
+	virtual void mouseDoublePressed(MouseCode code,Panel* panel);
+	virtual void mouseReleased(MouseCode code,Panel* panel);
+	virtual void mouseWheeled(int delta,Panel* panel);
+	virtual void keyPressed(KeyCode code,Panel* panel);
+	virtual void keyTyped(KeyCode code,Panel* panel);
+	virtual void keyReleased(KeyCode code,Panel* panel); 
+	virtual void keyFocusTicked(Panel* panel);
+protected:
+	Dar<char>          _lineDar;
+	int                _cursorPos;
+	bool               _cursorBlink;
+	bool               _hideText;
+	long               _cursorNextBlinkTime;
+	int                _cursorBlinkRate;
+	int                _select[2];
+	Dar<ActionSignal*> _actionSignalDar;
+	Font*              _font;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_TextGrid.h b/main/source/utils/vgui/include/VGUI_TextGrid.h
new file mode 100644
index 00000000..beb7e527
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_TextGrid.h
@@ -0,0 +1,42 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_TEXTGRID_H
+#define VGUI_TEXTGRID_H
+
+#include<stdarg.h>
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+
+class VGUIAPI TextGrid : public Panel
+{
+public:	
+	TextGrid(int gridWide,int gridTall,int x,int y,int wide,int tall);
+public:
+	virtual void setGridSize(int wide,int tall);
+	virtual void newLine();
+	virtual void setXY(int x,int y);
+	//virtual void setBgColor(int r,int g,int b);
+	//virtual void setFgColor(int r,int g,int b);
+	virtual int  vprintf(const char* format,va_list argList);
+	virtual int  printf(const char* format,...);
+protected:
+	virtual void paintBackground();
+protected:
+	int   _xy[2];
+	int   _bgColor[3];
+	int   _fgColor[3];
+	char* _grid; //[_gridSize[0]*_gridSize[1]*7] ch,br,bg,bb,fr,fg,fb
+	int	  _gridSize[2];
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_TextImage.h b/main/source/utils/vgui/include/VGUI_TextImage.h
new file mode 100644
index 00000000..b11feaf2
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_TextImage.h
@@ -0,0 +1,58 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_TEXTIMAGE_H
+#define VGUI_TEXTIMAGE_H
+
+#include<VGUI.h>
+#include<VGUI_Image.h>
+#include<VGUI_Scheme.h>
+
+
+//TODO: need to add wrapping flag instead of being arbitrary about when wrapping and auto-resizing actually happens
+//		This is probably why you are having problems if you had text in a constructor and then changed the font
+
+namespace vgui
+{
+
+class Panel;
+class Font;
+class App;
+
+class VGUIAPI TextImage : public Image
+{
+private:
+	char*                     _text;
+	int                       _textBufferLen;
+	vgui::Scheme::SchemeFont  _schemeFont;
+	vgui::Font*               _font;
+	int                       _textColor[4];
+	vgui::Scheme::SchemeColor _textSchemeColor;
+public:	
+	TextImage(int textBufferLen,const char* text);
+	TextImage(const char* text);
+private:
+	virtual void  init(int textBufferLen,const char* text);
+public:
+	virtual void  getTextSize(int& wide,int& tall);
+	virtual void  getTextSizeWrapped(int& wide,int& tall);
+	virtual Font* getFont();
+	virtual void  setText(int textBufferLen,const char* text);
+	virtual void  setText(const char* text);
+	virtual void  setFont(vgui::Scheme::SchemeFont schemeFont);
+	virtual void  setFont(vgui::Font* font);
+	virtual void  setSize(int wide,int tall);
+protected:
+	virtual void paint(Panel* panel);
+};
+
+}
+
+#endif
+
+
+
diff --git a/main/source/utils/vgui/include/VGUI_TextPanel.h b/main/source/utils/vgui/include/VGUI_TextPanel.h
new file mode 100644
index 00000000..b000f7bb
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_TextPanel.h
@@ -0,0 +1,46 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_TEXTPANEL_H
+#define VGUI_TEXTPANEL_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+#include<VGUI_Scheme.h>
+
+//NOTE : If you are having trouble with this class, your problem is probably in TextImage
+
+namespace vgui
+{
+
+class TextImage;
+class Font;
+
+class VGUIAPI TextPanel : public Panel
+{
+private:
+	TextImage* _textImage;
+public:
+	TextPanel(const char* text,int x,int y,int wide,int tall);
+public:
+	virtual void setText(const char* text);
+	virtual void setFont(vgui::Scheme::SchemeFont schemeFont);
+	virtual void setFont(vgui::Font* font);
+	virtual void setSize(int wide,int tall);
+	virtual void setFgColor(int r,int g,int b,int a);
+	virtual void setFgColor(Scheme::SchemeColor sc);
+	virtual TextImage* getTextImage();
+protected:
+	virtual void paint();
+};
+
+}
+
+#endif
+
+
+
diff --git a/main/source/utils/vgui/include/VGUI_TickSignal.h b/main/source/utils/vgui/include/VGUI_TickSignal.h
new file mode 100644
index 00000000..bb0bcd52
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_TickSignal.h
@@ -0,0 +1,22 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_TICKSIGNAL_H
+#define VGUI_TICKSIGNAL_H
+
+#include<VGUI.h>
+
+namespace vgui
+{
+class VGUIAPI TickSignal
+ {
+ public:
+  virtual void ticked()=0;
+ };
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_ToggleButton.h b/main/source/utils/vgui/include/VGUI_ToggleButton.h
new file mode 100644
index 00000000..0e6d8bc1
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_ToggleButton.h
@@ -0,0 +1,26 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_TOGGLEBUTTON_H
+#define VGUI_TOGGLEBUTTON_H
+
+#include<VGUI.h>
+#include<VGUI_Button.h>
+
+namespace vgui
+{
+
+class VGUIAPI ToggleButton : public Button
+{
+public:
+	ToggleButton(const char* text,int x,int y,int wide,int tall);
+	ToggleButton(const char* text,int x,int y);
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_TreeFolder.h b/main/source/utils/vgui/include/VGUI_TreeFolder.h
new file mode 100644
index 00000000..ab86cda6
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_TreeFolder.h
@@ -0,0 +1,36 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_TREEFOLDER_H
+#define VGUI_TREEFOLDER_H
+
+#include<VGUI.h>
+#include<VGUI_Panel.h>
+
+namespace vgui
+{
+
+class VGUIAPI TreeFolder : public Panel
+{
+public:
+	TreeFolder(const char* name);
+	TreeFolder(const char* name,int x,int y);
+protected:
+	virtual void init(const char* name);
+public:
+	virtual void setOpenedTraverse(bool state);
+	virtual void setOpened(bool state);
+	virtual bool isOpened();
+protected:
+	virtual void paintBackground();
+protected:
+	bool _opened;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/main/source/utils/vgui/include/VGUI_WizardPanel.h b/main/source/utils/vgui/include/VGUI_WizardPanel.h
new file mode 100644
index 00000000..d2f7a2be
--- /dev/null
+++ b/main/source/utils/vgui/include/VGUI_WizardPanel.h
@@ -0,0 +1,146 @@
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//=============================================================================
+
+#ifndef VGUI_WIZARDPANEL_H
+#define VGUI_WIZARDPANEL_H
+
+#include<VGUI_Panel.h>
+#include<VGUI_Dar.h>
+
+namespace vgui
+{
+
+class ActionSignal;
+
+class VGUIAPI WizardPanel : public Panel
+{
+
+public:
+
+	class VGUIAPI WizardPage : public Panel
+	{
+	
+	friend class WizardPanel;
+	
+	private:
+
+		WizardPage* _backWizardPage;
+		WizardPage* _nextWizardPage;
+		bool        _backButtonEnabled;
+		bool        _nextButtonEnabled;
+		bool        _finishedButtonEnabled;
+		bool        _cancelButtonEnabled;
+		bool        _backButtonVisible;
+		bool        _nextButtonVisible;
+		bool        _finishedButtonVisible;
+		bool        _cancelButtonVisible;
+		char*       _backButtonText;
+		char*       _nextButtonText;
+		char*       _finishedButtonText;
+		char*       _cancelButtonText;
+		Dar<ActionSignal*> _switchingToBackPageSignalDar;
+		Dar<ActionSignal*> _switchingToNextPageSignalDar;
+		char*       _title;
+		Panel*      _wantedFocus;
+
+	private:
+		
+		virtual void fireSwitchingToBackPageSignals();
+		virtual void fireSwitchingToNextPageSignals();
+		virtual void init();
+
+	public:
+
+		WizardPage();
+		WizardPage(int wide,int tall);
+
+	public:
+
+		virtual void        setBackWizardPage(WizardPage* backWizardPage);
+		virtual void        setNextWizardPage(WizardPage* nextWizardPage);
+		virtual WizardPage* getBackWizardPage();
+		virtual WizardPage* getNextWizardPage();
+
+		virtual bool        isBackButtonEnabled();
+		virtual bool        isNextButtonEnabled();
+		virtual bool        isFinishedButtonEnabled();
+		virtual bool        isCancelButtonEnabled();
+		virtual void        setBackButtonEnabled(bool state);
+		virtual void        setNextButtonEnabled(bool state);
+		virtual void        setFinishedButtonEnabled(bool state);
+		virtual void        setCancelButtonEnabled(bool state);
+
+		virtual bool        isBackButtonVisible();
+		virtual bool        isNextButtonVisible();
+		virtual bool        isFinishedButtonVisible();
+		virtual bool        isCancelButtonVisible();
+		virtual void        setBackButtonVisible(bool state);
+		virtual void        setNextButtonVisible(bool state);
+		virtual void        setFinishedButtonVisible(bool state);
+		virtual void        setCancelButtonVisible(bool state);
+
+		virtual void        getBackButtonText(char* text,int textLen);
+		virtual void        getNextButtonText(char* text,int textLen);
+		virtual void        getFinishedButtonText(char* text,int textLen);
+		virtual void        getCancelButtonText(char* text,int textLen);
+        virtual void        setBackButtonText(const char* text);
+		virtual void        setNextButtonText(const char* text);
+		virtual void        setFinishedButtonText(const char* text);
+		virtual void        setCancelButtonText(const char* text);
+
+		virtual void		setWantedFocus(Panel* panel);
+		virtual Panel*		getWantedFocus();
+
+		virtual void        addSwitchingToBackPageSignal(ActionSignal* s);
+		virtual void        addSwitchingToNextPageSignal(ActionSignal* s);
+
+		virtual void        setTitle(const char* title);
+		virtual void        getTitle(char* buf,int bufLen);
+
+	};
+
+private:
+
+	Button*     _backButton;
+	Button*     _nextButton;
+	Button*     _finishedButton;
+	Button*     _cancelButton;
+	WizardPage* _currentWizardPage;
+	Dar<ActionSignal*> _pageChangedActionSignalDar;
+
+private:
+
+	virtual void fireFinishedActionSignal();
+	virtual void fireCancelledActionSignal();
+	virtual void firePageChangedActionSignal();
+
+protected:
+
+	virtual void performLayout();
+
+public:
+
+	WizardPanel(int x,int y,int wide,int tall);
+
+public:
+
+	virtual void setCurrentWizardPage(WizardPage* currentWizardPage);
+	virtual void addFinishedActionSignal(ActionSignal* s);
+	virtual void addCancelledActionSignal(ActionSignal* s);
+	virtual void addPageChangedActionSignal(ActionSignal* s);
+	virtual void doBack();
+	virtual void doNext();
+	virtual void getCurrentWizardPageTitle(char* buf,int bufLen);
+	virtual WizardPage* getCurrentWizardPage();
+
+};
+
+}
+
+
+#endif
+
diff --git a/main/source/utils/vgui/lib/win32_vc6/vgui.lib b/main/source/utils/vgui/lib/win32_vc6/vgui.lib
new file mode 100644
index 00000000..aff77160
Binary files /dev/null and b/main/source/utils/vgui/lib/win32_vc6/vgui.lib differ
diff --git a/main/spanish_titles.txt b/main/spanish_titles.txt
new file mode 100644
index 00000000..a7c84ac0
--- /dev/null
+++ b/main/spanish_titles.txt
@@ -0,0 +1,4327 @@
+//TITLES FOR NATURAL SELECTION
+//DO NOT ALTER THIS FILE
+//
+//Spanish translation by Mendasp
+//
+// Position command $position x y 
+// x & y are from 0 to 1 to be screen resolution independent
+// -1 means center in each dimension
+// Effect command $effect <effect number>
+// effect 0 is fade in/fade out
+// effect 1 is flickery credits
+// effect 2 is write out (training room)
+// Text color r g b command $color
+// fadein time fadeout time / hold time
+// $fadein (message fade in time - per character in effect 2)
+// $fadeout (message fade out time)
+// $holdtime (stay on the screen for this long)
+
+////////////////////
+// Green teletype //
+////////////////////
+$position 0.15 0.15
+$effect 2
+$color 0 200 0
+$color2 0 255 0
+$fadein 0.04
+$fxtime 0.25
+$holdtime 6.0
+$fadeout 0.5
+
+Team_AutoAssign
+{
+AUTOMATICO
+}
+
+Menu_Spectate
+{
+ESPECTADOR
+}
+
+UndefinedTeam
+{
+Ready Room
+}
+
+Menu_LeaveGame
+{
+Salir
+}
+
+Menu_ReadyRoom
+{
+Ready room
+}
+
+Menu_Marine1Team
+{
+Unirse a los marines
+}
+
+Menu_Alien1Team
+{
+Unirse a los aliens
+}
+
+Marine1Team
+{
+Frontiersmen
+}
+
+Alien1Team
+{
+Kharaa
+}
+
+Marine2Team
+{
+Frontiersmen
+}
+
+Alien2Team
+{
+Kharaa
+}
+
+AutoTeam
+{
+Auto-eleccion
+}
+
+Muted
+{
+Ignorado.
+}
+
+Unmuted
+{
+No ignorado.
+}
+
+No_longer_hear_that_player
+{
+No oiras mas a este jugador
+}
+
+// SDK 2.0 Spectator Menu
+Spec_Map
+{
+Map
+}
+
+Spec_Mode1
+{
+Seguimiento Bloqueado
+}
+
+Spec_Mode2
+{
+Seguimiento Libre
+}
+
+Spec_Mode3
+{
+Vista libre
+}
+
+Spec_Mode4
+{
+Primera persona
+}
+
+Spec_Mode5
+{
+Vista aerea libre
+}
+
+Spec_Mode6
+{
+Vista aerea bloqueada
+}
+
+Spec_NoTarget
+{
+No hay objetivos validos.
+}
+
+Spec_Help
+{
+Presiona F4 para ir a la Ready Room     Usa IZDA y DCHA, SALTAR y DISPARAR para cambiar la vista.
+}
+
+Spec_Help_Text
+{
+Usa las siguientes teclas para cambiar vistas:
+
+ DISPARAR o DERECHA - Siguiente jugador
+ DISPARO SECUNDARIO (MENU POPUP) o IZQUIERDA - Jugador anterior
+ SALTAR - Cambiar modo de vista
+ USAR - Cambiar modo de ventana integrada
+ 
+ AGACHAR  - Activar menu de espectador
+  
+En el modo de Vista Aerea muevete con:
+
+ IZQUIERDA - Moverse a la izquierda
+ DERECHA - Moverse a la derecha
+ AVANZAR - Mas zoom
+ RETROCEDER - Menos zoom
+ RATON - Rotar sobre el mapa/objetivo
+}
+
+Spec_Slow_Motion
+{
+Camara lenta
+}
+
+Spec_Replay
+{
+Replay Instantaneo
+}
+
+Spec_Help2
+{
+Tus mensajes de texto y voz sólo serán recibidos por otros espectadores.
+}
+
+Spec_Only_Help
+{
+}
+
+Directed
+{
+Dirigido
+}
+
+SpectatorsNotAllowed
+{
+Este servidor no permite espectadores.
+}
+
+ObsInEyePrefix
+{
+Viendo a travé  s de los ojos de
+}
+
+SpectatorTeam
+{
+Espectadores
+}
+
+Spectators
+{
+Espectadores
+}
+
+TEAM
+{
+Equipo
+}
+
+TEAMS
+{
+Equipos
+}
+
+PLAYER
+{
+Jugador
+}
+
+Player_plural
+{
+Jugadores
+}
+
+PLAYERS
+{
+Jugadores
+}
+
+SCORES
+{
+Info del jugador
+}
+
+SCORE
+{
+Puntos
+}
+
+DEATHS
+{
+Muertes
+}
+
+LATENCY
+{
+Latencia
+}
+
+VOICE
+{
+Voz
+}
+
+Unassigned
+{
+Sin asignar
+}
+
+Menu_OK
+{
+Aceptar
+}
+
+Points
+{
+recursos
+}
+
+Cost
+{
+Coste
+}
+
+NoSpectating
+{
+Este servidor no permite espectadores.
+}
+
+// Main game messages
+ReadyRoomMessage
+{
+Está  s en la ReadyRoom.  Ve hacia una entrada para unirte a un equipo u observar el juego.
+}
+
+ReinforcementMessage
+{
+Está  s en espera para renacer.
+}
+
+ReinforcingMessage
+{
+Está  s a punto de renacer...
+}
+
+ObserverMessage
+{
+Eres un observador. Ya no puedes unirte al juego, pero podrá  s hacerlo en la siguiente partida.
+}
+
+CantSwitchTeamsInTournyMode
+{
+No puedes cambiar de equipo en el modo torneo.
+}
+
+CantSwitchTeamsAfterGameStart
+{
+No puedes cambiar de bando si ha comenzado la partida.
+}
+
+TooManyPlayersOnTeam
+{
+Hay demasiados jugadores en este equipo.
+}
+
+CantJoinAfterSpectating
+{
+No puedes unirte durante la partida si ya has sido espectador.
+}
+
+CanOnlyJoinTeamYouveReinforced
+{
+Ya has estado en el otro bando, no podrá  s unirte a é  l hasta la pró  xima ronda.
+}
+
+YouCanJoinSoon
+{
+Te unirá  s al equipo en breve.
+}
+
+AlreadyOnTeam
+{
+Ya está  s en un equipo.  Vuelve a la Ready Room para cambiar de equipo.
+}
+
+SoldierMessage
+{
+Eres un soldado.  Intenta seguir las ó  rdenes del commander y evita que los aliens acaben con tus compañ  eros y estructuras.
+}
+
+ObjectivesVsAliens
+{
+Está  s luchando contra los aliens!  Ellos nacen en las hives, para ganar debes destruir todas las hives y luego acabar con ellos.
+}
+
+ObjectivesVsMarines
+{
+Está  s combatiendo a los marines!  Ellos renacen en los infatry portals, para ganar destruye los portales y má  talos a todos.
+}
+
+Handicap
+{
+Handicap
+}
+
+CommanderMessage
+{
+Haz click izdo o pulsa y arrastra para seleccionar a tus soldados o estructuras, haz click derecho para dar ó  rdenes.  El menu de la parte inferior derecha te permite construir estructuras y equipar a tus soldados.
+}
+
+Commander
+{
+Comm
+}
+
+NoCommander
+{
+Sin commander
+}
+
+GestationMessage
+{
+Está  s evolucionando hacia una nueva forma de vida aliení  gena.  Prepá  rate para la caza...
+}
+
+CocoonMessage
+{
+Está  s gestando.
+}
+
+YouAreReinforcements
+{
+Eres parte de los refuerzos!
+}
+
+//////////////
+// Pie menu //
+//////////////
+MenuMarineRoot
+{
+Inicio
+}
+
+//MenuMarineRoot
+//{
+//!marinenode
+//}
+
+
+MenuComms
+{
+Comunicació  n
+}
+
+MenuTalk
+{
+Hablar
+}
+
+MenuAttacked
+{
+"Me atacan!"
+}
+
+MenuCheer
+{
+Animar
+}
+
+MenuCoverMe
+{
+"Cubridme!"
+}
+
+MenuRetreat
+{
+"Retirada!"
+}
+
+MenuInPosition
+{
+"En posició  n"
+}
+
+MenuEnemySpotted
+{
+"Alien detectado"
+}
+
+MenuMoveOut
+{
+"Moveos"
+}
+
+MenuAllClear
+{
+"Despejado"
+}
+
+MenuYell
+{
+Informar
+}
+
+MenuSay
+{
+Decir
+}
+
+MenuRogerThat
+{
+"Afirmativo"
+}
+
+MenuHello
+{
+"Hola"
+}
+
+MenuNeedHelp
+{
+"Ayuda!"
+}
+
+MenuNeedHealth
+{
+"Estoy herido"
+}
+
+MenuNeedAmmo
+{
+"Sin munició  n"
+}
+
+MenuFollowMe
+{
+"Sí  gueme"
+}
+
+MenuCovering
+{
+"Te cubro"
+}
+
+MenuOrders
+{
+Ó  rdenes
+}
+
+MenuNeedOrder
+{
+"Necesito ó  rdenes"
+}
+
+MenuAck
+{
+"Entendido"
+}
+
+MenuAdmin
+{
+Administració  n
+}
+
+MenuReadyRoom
+{
+Ready Room
+}
+
+MenuVoteCommanderDown
+{
+Echar commander
+}
+
+MenuArea
+{
+Zona
+}
+
+MenuMoveTo
+{
+Ve a
+}
+
+MenuGuard
+{
+Protege
+}
+
+MenuTarget
+{
+Objetivo
+}
+
+MenuDeploy
+{
+Construye
+}
+
+MenuIncoming
+{
+Ahí  vienen!
+}
+
+MenuProceed
+{
+Procede
+}
+
+MenuFireTarget
+{
+Destruye el objetivo
+}
+
+MenuTaunt
+{
+Vacilar
+}
+
+MenuTakeCover
+{
+A cubierto!
+}
+
+MenuReady
+{
+Preparado
+}
+
+MenuDefendObj
+{
+Defiende
+}
+
+MenuCeaseFire
+{
+Alto el fuego
+}
+
+MenuTeam
+{
+Equipo
+}
+
+MenuBuilding
+{
+Construye
+}
+
+MenuAttackObj
+{
+Ataca
+}
+
+MenuTaunt
+{
+Vacilar
+}
+
+MenuHealth
+{
+"Salud"
+}
+
+MenuCameraTower
+{
+Cá  mara
+}
+
+MenuTurret
+{
+Turret
+}
+
+MenuSiegeTurret
+{
+Siege
+}
+
+MenuBlazeOfGlory
+{
+Brillar
+}
+
+MenuProtect
+{
+Proteger
+}
+
+MenuReinforce
+{
+Refuerzo
+}
+
+MenuArmorUpgrade
+{
+Heavy Armor
+}
+
+MenuRepair
+{
+Reparar
+}
+
+MenuPowerups
+{
+Estí  mulo
+}
+
+MenuAdrenaline
+{
+Adrenalina
+}
+
+MenuDefMatrix
+{
+Matriz defensiva
+}
+
+MenuPhaseGate
+{
+Phase Gate
+}
+
+MenuSelf
+{
+Yo
+}
+
+MenuBuy
+{
+Comprar
+}
+
+MenuHeavy
+{
+Heavy
+}
+
+MenuShotgun
+{
+Escopeta
+}
+
+MenuHeavyMG
+{
+Heavy MG
+}
+
+MenuLauncher
+{
+Launcher
+}
+
+MenuFlamer
+{
+Flamer
+}
+
+MenuNuke
+{
+Nuke
+}
+
+MenuWeapon
+{
+Arma
+}
+
+MenuEquipment
+{
+Equipamiento
+}
+
+MenuUse
+{
+Usar
+}
+
+MenuNextWeapon
+{
+Siguiente arma
+}
+
+MenuJetpacks
+{
+Jetpack
+}
+
+MenuReloadWeapon
+{
+Recargar
+}
+
+MenuDropWeapon
+{
+Tirar
+}
+
+MenuLight
+{
+Light
+}
+
+MenuAmmo
+{
+Munició  n
+}
+
+MenuMines
+{
+Minas
+}
+
+MenuGrenades
+{
+Granadas
+}
+
+MenuUpgradeMG
+{
+Mejoras
+}
+
+////////////////////
+// Armor upgrades // 
+////////////////////
+
+MenuArmorFull
+{
+Armadura completa
+}
+
+MenuBuyArmorHeavy
+{
+Heavy Armor
+}
+
+MenuBuyArmorMotionTrack
+{
+Motion Tracking
+}
+
+MenuBuyArmorJetpack
+{
+Jetpacks
+}
+
+MenuBuyArmorLifeSupport
+{
+Botiquí  n
+}
+
+// Rank
+MenuRank
+{
+Rango
+}
+
+MenuPromote
+{
+Promocionar
+}
+
+MenuDemote
+{
+Degradar
+}
+
+//////////////////////////////////////////////////
+// Don't localize these, they are sprite names: //
+//  (sprites/640(or 320)name.spr)               //
+//////////////////////////////////////////////////
+MenuAlienRoot
+{
+Inicio
+}
+
+MenuAlienSmallMorph
+{
+Evolucionar
+}
+
+MenuAlienMorphLevel1
+{
+Skulk
+}
+
+MenuAlienMorphLevel2
+{
+Gorge
+}
+
+MenuAlienBigMorph
+{
+Ev. avanzada
+}
+
+MenuAlienMorphLevel3
+{
+Lerk
+}
+
+MenuAlienMorphLevel4
+{
+Fade
+}
+
+MenuAlienMorphLevel5
+{
+Onos
+}
+
+MenuAlienUpgrade
+{
+Mejora evolutiva
+}
+
+MenuAlienComm
+{
+Comunicació  n
+}
+
+MenuAlienBuild
+{
+Construir
+}
+
+MenuAlienAdvBuild
+{
+Cons. Avanzada
+}
+
+MenuAlienBuildUpgrades
+{
+Mejoras
+}
+
+
+MenuAlienCommSayingsWest
+{
+Pedir
+}
+
+MenuAlienCommSayingOne
+{
+Gruñ  ir
+}
+
+MenuAlienCommSayingTwo
+{
+Necesito cura
+}
+
+MenuAlienCommSayingThree
+{
+Necesito apoyo
+}
+
+MenuAlienCommSayingsEast
+{
+Decir
+}
+
+MenuAlienCommSayingFour
+{
+Ahí  vienen
+}
+
+MenuAlienCommSayingFive
+{
+Atacad
+}
+
+MenuAlienCommSayingSix
+{
+Estoy construyendo
+}
+
+// Temp artwork, change
+MenuAlienReadyRoom
+{
+Ready Room
+}
+
+MenuAlienUpgradeDefOne
+{
+Caparazó  n
+}
+
+MenuAlienUpgradeDefTwo
+{
+Regeneració  n
+}
+
+MenuAlienUpgradeDefThree
+{
+Redenció  n
+}
+
+MenuAlienUpgradeSenOne
+{
+Invisibilidad
+}
+
+MenuAlienUpgradeSenTwo
+{
+Feromonas
+}
+
+MenuAlienUpgradeSenThree
+{
+Aroma del miedo
+}
+
+MenuAlienUpgradeMoveOne
+{
+Celeridad
+}
+
+MenuAlienUpgradeMoveTwo
+{
+Adrenalina
+}
+
+MenuAlienUpgradeMoveThree
+{
+Silencio
+}
+
+MenuAlienDefenseChamber
+{
+Defense chamber
+}
+
+MenuAlienSensoryChamber
+{
+Sensory chamber
+}
+
+MenuAlienMovementChamber
+{
+Movement chamber
+}
+
+MenuAlienDefenseUpgrades
+{
+Defensiva
+}
+
+MenuAlienSensoryUpgrades
+{
+Sensorial
+}
+
+MenuAlienMovementUpgrades
+{
+Movimiento
+}
+
+MenuAlienOffensiveChamber
+{
+Offense chamber
+}
+
+MenuAlienResourceTower
+{
+Resource tower
+}
+
+MenuAlienHive
+{
+Hive
+}
+
+
+
+// Armor received messages
+$position -1 0.2
+$effect 0
+$fadein 0.5
+$fadeout 0.5
+$holdtime 5.0
+
+ReceiveHeavyArmor
+{
+Tu armadura ha sido mejorada a armadura pesada.  Ahora está  s mejor protegido de tus enemigos.
+}
+
+ReceiveMotionTrackArmor
+{
+Ahora tienes un detector de movimiento acoplado a tu armadura.
+}
+
+ReceiveJetpackArmor
+{
+Ahora tienes un jetpack acoplado en tu armadura.  Pulsa y manté  n SALTAR apretado para usarlo.
+}
+
+ReceiveLifeSupportArmor
+{
+Ahora tienes un traje protector.  Cuando esté  s dé  bil, te protegerá   hasta que llegue ayuda.
+}
+
+
+
+$position -1 0.35
+$holdtime 3.0
+
+GameStarting
+{
+La partida está   a punto de empezar...
+}
+
+$holdtime 2.0
+GameBegun
+{
+La partida ha comenzado.
+}
+
+// Overwatch enabled
+//OverwatchActive
+//{
+//Overwatch active
+//}
+
+// Overwatch range string, expecting a float for range
+OverwatchRange
+{
+Zona de acció  n: %f
+}
+
+// Points awarded
+$position -1 0.25
+$effect 0
+$holdtime 4
+
+MarineAward
+{
+Tu equipo ha matado un enemigo!
+}
+
+MarineAwardToLeader
+{
+Tu escuadró  n ha recibido puntuació  n por eliminar a un enemigo!
+}
+
+// Points awarded
+$position -1 0.15
+$effect 0
+$holdtime 3
+MarineAwardToCommander
+{
+Tu equipo ha ganado puntos por matar enemigos!
+}
+
+// Points awarded
+$position -1 0.25
+$effect 0
+$holdtime 4
+AlienAward
+{
+Has conseguido recursos por matar un enemigo!
+}
+
+Defect
+{
+Abandonar el escuadró  n
+}
+
+WeaponCantBeDropped
+{
+Este arma no se puede tirar.
+}
+
+DefectMessageToLeader
+{
+Un soldado de tu escuadró  n ha abandonado.
+}
+
+SquadIndicator
+{
+Está  s en el escuadró  n %d
+}
+
+InvalidOrderGiven
+{
+Orden no vá  lida
+}
+
+$position -1 0.65
+$effect 0
+$holdtime .5
+$fadein .2
+$fadeout .2
+GameWontStart
+{
+La partida no comenzará   hasta que ambos equipos tengan jugadores.
+}
+
+// Translation note: don't translate "ready"
+GameWontStartUntilReady
+{
+La partida no comenzará   hasta que ambos equipos escriban "ready".
+}
+
+$position -1 0.75
+$effect 0
+$holdtime .7
+$fadein .2
+$fadeout .2
+ReceivingLevelData
+{
+Recibiendo informació  n del nivel...
+}
+
+$position -1 0.85
+ReceivingLevelData1
+{
++---
+}
+
+ReceivingLevelData2
+{
+++--
+}
+
+ReceivingLevelData3
+{
++++-
+}
+
+ReceivingLevelData4
+{
+++++
+}
+
+$position -1 0.65
+$effect 0
+$holdtime .5
+$fadein .2
+$fadeout .2
+$position -1 0.9
+EvolvingMessage
+{
+Evolucionando...
+}
+
+VoteCast
+{
+Tu voto ha sido realizado.
+}
+
+VoteStarted
+{
+La votació  n para echar al commander ha comenzado.  Si el commander es un incompetente, usa el menú   para echarle.
+}
+
+VoteIllegal
+{
+En estos momentos no puedes votar.
+}
+
+AlreadyVoted
+{
+Só  lo puedes votar una vez por partida.
+}
+
+VoteFailed
+{
+La votació  n para destituir al commander ha fracasado.
+}
+
+VoteCancelled
+{
+La votació  n para destituir al commander ha sido cancelada.
+}
+
+VoteSucceeded
+{
+El commander ha sido echado.
+}
+
+BannedFromCommand
+{
+Has sido destituido del rango de commander por tu incompetencia. No podrá  s serlo de nuevo hasta dentro de un rato.
+}
+
+MustGestateUp
+{
+Só  lo puedes evolucionar hacia formas de vida má  s avanzadas que la actual.
+}
+
+MustGestateOnGround
+{
+Debes estar en suelo llano para poder evolucionar.
+}
+
+NotWhileDigesting
+{
+No puedes gestar mientras digieres a un jugador.
+}
+
+NoReadyRoomWhileDigested
+{
+No puedes ir a la Ready Room mientras eres digerido
+}
+
+NeedMoreRoomToGestate
+{
+Necesitas má  s espacio para evolucionar.
+}
+
+NeedOneHiveToGestate
+{
+Tu equipo necesita al menos una hive para evolucionar en esta forma de vida.
+}
+
+NeedTwoHivesToGestate
+{
+Necesitas al menos dos hives para poder evolucionar en esta forma de vida.
+}
+
+NeedThreeHivesToGestate
+{
+Necesitas tres hives para poder evolucionar en esta forma de vida.
+}
+
+NeedOneHiveForStructure
+{
+Necesitas una hive para construir esa estructura.
+}
+
+NeedTwoHivesForStructure
+{
+Necesitas dos hives para poder construir esa estructura.
+}
+
+NeedThreeHivesForStructure
+{
+Necesitas tres hives para poder construir esa estructura.
+}
+
+NeedsAnotherHiveForStructure
+{
+Necesitas otra hive para construir esta estructura.
+}
+
+MustBeBuilder
+{
+Para poder construir debes ser Gorge.
+}
+
+UpgradeNotAvailable
+{
+Esta mejora no está   disponible en este momento.
+}
+
+TooManyStructuresOfThisTypeNearby
+{
+Hay demasiadas estructuras de este tipo cerca.
+}
+
+TooManyStructures
+{
+Hay demasiadas estructuras de este tipo en la sala.
+}
+
+$holdtime 2.0
+TooManyWebs
+{
+Tu equipo ha sobrepasado el lí  mite posible de webs.
+}
+
+TooManyWebsNearby
+{
+Hay demasiadas webs en esta zona.
+}
+
+$position -1 0.35
+$effect 0
+$holdtime 5.0
+TeamOneWon
+{
+El equipo uno ha ganado!
+}
+
+TeamTwoWon
+{
+El equipo dos ha ganado!
+}
+
+GameDraw
+{
+Empate!
+}
+
+RankBeforeGameStart
+{
+Só  lo puedes cambiar de rango antes de que empiece el juego.
+}
+
+DefectAfterGameStart
+{
+Só  lo podrá  s degradarte cuando el juego haya comenzado.
+}
+
+// Tech tree
+MarineResourcePrefix
+{
+Recursos totales: 
+}
+
+AlienResourcePrefix
+{
+Recursos
+}
+
+CarryResourcePrefix
+{
+Llevando %d recursos
+}
+
+Resources
+{
+Recursos: 
+}
+
+
+NumericalEventResources
+{
+recursos
+}
+
+NumericalEventHealth
+{
+salud
+}
+
+NumericalEventResourcesDonated
+{
+Recursos donados
+}
+
+NumericalEventAmmo
+{
+Munició  n recibida
+}
+
+
+
+
+AlienEnergyDescription
+{
+Energí  a
+}
+
+ResourcesDepleted
+{
+Recursos agotados
+}
+
+Reinforcements
+{
+Refuerzos
+}
+
+
+WeaponCategory
+{
+Armas
+}
+
+ArmorCategory
+{
+Armadura
+}
+
+BuildCategory
+{
+Construir
+}
+
+RadioCategory
+{
+Radio
+}
+
+TechNodeLabel_0
+{
+Nada
+}
+
+TechNodeHelp_0
+{
+<nada>
+}
+
+TechNodeHelp_1
+{
+Cambia hacia tu siguiente arma.
+}
+
+TechNodeHelp_2
+{
+Recarga tu arma actual.
+}
+
+TechNodeHelp_3
+{
+Tira tu arma actual, para correr mas rá  pido, o para darle el arma a otra persona.
+}
+
+TechNodeHelp_5
+{
+Dejar el juego actual e ir a la Ready Room.  Esto te permite cambiar de equipo, ser espectador, o tomarte un descanso.
+}
+
+TechNodeHelp_6
+{
+Si el commander os hace perder a propó  sito, selecciona este comando para echarle.  Si recibe los votos necesarios será   echado para el resto de la partida.
+}
+
+
+TechNodeLabel_10
+{
+Atacado
+}
+
+TechNodeLabel_11
+{
+Atacar
+}
+
+TechNodeLabel_12
+{
+Destruir
+}
+
+TechNodeLabel_13
+{
+Confirmado
+}
+
+TechNodeLabel_14
+{
+Enfocar equipo
+}
+
+TechNodeLabel_15
+{
+Poderoso
+}
+
+
+TechNodeHelp_7
+{
+"Gruñ  ir"
+}
+
+TechNodeHelp_8
+{
+"Necesito vida"
+}
+
+TechNodeHelp_9
+{
+"Necesito apoyo"
+}
+
+TechNodeHelp_10
+{
+"Ahí   vienen"
+}
+
+TechNodeHelp_11
+{
+"Atacad!"
+}
+
+TechNodeHelp_12
+{
+"Estoy construyendo aquí  "
+}
+
+
+
+TechNodeLabel_20
+{
+Armadura #1
+}
+
+TechNodeLabel_21
+{
+Armadura #2
+}
+
+TechNodeLabel_22
+{
+Armadura #3
+}
+
+TechNodeLabel_23
+{
+Armas #1
+}
+
+TechNodeLabel_24
+{
+Armas #2
+}
+
+TechNodeLabel_25
+{
+Armas #3
+}
+
+TechNodeHelp_20
+{
+Nivel 1 de armadura
+}
+
+TechNodeHelp_21
+{
+Nivel 2 de armadura
+}
+
+TechNodeHelp_22
+{
+Nivel 3 de armadura
+}
+
+
+TechNodeHelp_23
+{
+Armas, minas y torretas hacen un +10%% más de daño
+}
+
+TechNodeHelp_24
+{
+Armas, minas y torretas hacen un +20%% más de daño
+}
+
+TechNodeHelp_25
+{
+Armas, minas y torretas hacen un +30%% más de daño
+}
+
+TechNodeLabel_26
+{
+Advanced turret factory
+}
+
+TechNodeHelp_26
+{
+Convertir en advanced turret factory
+}
+
+TechNodeLabel_28
+{
+Jetpacks
+}
+
+TechNodeHelp_28
+{
+Desarrolla jetpacks
+}
+
+TechNodeLabel_29
+{
+Heavy Armor
+}
+
+TechNodeHelp_29
+{
+Desarrolla Heavy Armor
+}
+
+TechNodeLabel_30
+{
+Distress Beacon
+}
+
+TechNodeHelp_30
+{
+Resucita a todos los soldados muertos en la base original.
+}
+
+TechNodeLabel_31
+{
+Deployable health tech
+}
+
+TechNodeHelp_31
+{
+Permite al commander dar medpacks
+}
+
+TechNodeLabel_32
+{
+Cancelar
+}
+
+TechNodeHelp_32
+{
+Cancelar mejora
+}
+
+TechNodeLabel_33
+{
+Motion Tracking
+}
+
+TechNodeHelp_33
+{
+Todos los enemigos mó  viles se hacen visibles.
+}
+
+TechNodeLabel_34
+{
+Tecnologí  a Phase
+}
+
+TechNodeHelp_34
+{
+Permite escanear y la construcción de Phase Gates
+}
+
+TechNodeLabel_35
+{
+Mejorar resource tower
+}
+
+TechNodeHelp_35
+{
+Acelera la velocidad de recolecció  n
+}
+
+TechNodeLabel_36
+{
+Defensa elé  ctrica
+}
+
+TechNodeHelp_36
+{
+Electrocuta a los enemigos que se acerquen
+}
+
+TechNodeLabel_38
+{
+Heavy Armor
+}
+
+TechNodeHelp_38
+{
+Da armadura pesada al soldado.
+}
+
+TechNodeLabel_39
+{
+Jetpack
+}
+
+TechNodeHelp_39
+{
+Da un jetpack al soldado elegido.
+}
+
+TechNodeLabel_40
+{
+Infantry portal
+}
+
+TechNodeHelp_40
+{
+Hace renacer a los marines
+}
+
+TechNodeLabel_41
+{
+Resource tower
+}
+
+TechNodeHelp_41
+{
+Recolecta recursos
+}
+
+
+
+TechNodeLabel_43
+{
+Turret factory
+}
+
+TechNodeHelp_43
+{
+Permite construir torretas
+}
+
+TechNodeLabel_45
+{
+Arms Lab
+}
+
+TechNodeHelp_45
+{
+Mejoras de armas y armaduras.
+}
+
+TechNodeLabel_46
+{
+Prototype lab
+}
+
+TechNodeHelp_46
+{
+Tecnología experimental
+}
+
+TechNodeLabel_48
+{
+Armory
+}
+
+TechNodeHelp_48
+{
+Acceso a nuevas armas.
+}
+
+TechNodeLabel_49
+{
+Advanced armory
+}
+
+TechNodeHelp_49
+{
+Mejora a advanced armory
+}
+
+
+TechNodeLabel_50
+{
+Nuke plant
+}
+
+TechNodeHelp_50
+{
+Permite manejar energía nuclear.
+}
+
+TechNodeLabel_51
+{
+Observatorio
+}
+
+TechNodeHelp_51
+{
+Tecnolog  ía de reconocimiento
+}
+
+TechNodeLabel_52
+{
+Salud nanotecnológica
+}
+
+TechNodeHelp_52
+{
+Permite al commander dar medpacks a sus soldados
+}
+
+TechNodeLabel_53
+{
+Scanner Sweep
+}
+
+TechNodeHelp_53
+{
+Permite una visión temporal de un área y desvela aliens invisibles.
+}
+
+TechNodeLabel_55
+{
+Phase gate
+}
+
+TechNodeHelp_55
+{
+Transporte instant  áneo
+}
+
+TechNodeLabel_56
+{
+Turret
+}
+
+TechNodeHelp_56
+{
+Construir torreta.
+}
+
+TechNodeLabel_57
+{
+Siege turret
+}
+
+TechNodeHelp_57
+{
+Torreta con una poderosa onda expansiva, dispara a través de paredes.
+}
+
+TechNodeLabel_58
+{
+Command console
+}
+
+TechNodeHelp_58
+{
+Command console auxiliar.
+}
+
+
+
+TechNodeLabel_59
+{
+Medpack
+}
+
+TechNodeHelp_59
+{
+Otorga 50 puntos de vida al marine.
+}
+
+TechNodeLabel_60
+{
+Munició  n
+}
+
+TechNodeHelp_60
+{
+Da un cargador para el arma que se lleve.
+}
+
+
+
+TechNodeLabel_61
+{
+Minas
+}
+
+TechNodeHelp_61
+{
+Cinco minas
+}
+
+TechNodeLabel_62
+{
+Welder
+}
+
+TechNodeHelp_62
+{
+Repara construcciones y armaduras, quema webs.
+}
+
+TechNodeLabel_63
+{
+Medpack
+}
+
+TechNodeLabel_64
+{
+Shotgun
+}
+
+TechNodeHelp_64
+{
+Para lugares cerrados
+}
+
+TechNodeLabel_65
+{
+HMG
+}
+
+TechNodeHelp_65
+{
+Poderoso rifle de asalto.
+}
+
+TechNodeLabel_66
+{
+Grenade launcher
+}
+
+TechNodeHelp_66
+{
+Lanzagranadas
+}
+
+TechNodeLabel_67
+{
+Nuke
+}
+
+TechNodeHelp_67
+{
+Mini-cabeza nuclear.
+}
+
+TechNodeLabel_69
+{
+Reciclar
+}
+
+TechNodeHelp_69
+{
+Destruye esta estructura, devolviendote algunos recursos.
+}
+
+TechNodeHelp_80
+{
+Pide ó  rdenes al commander.  Le será   notificado que está  s esperando ó  rdenes, y te mandará   hacer algo.
+}
+
+TechNodeHelp_81
+{
+Le dice al commander que aceptas las ó  rdenes y está  s en camino.  Sigue sus instrucciones y ve hacia el lugar indicado.
+}
+
+
+
+TechNodeLabel_85
+{
+Construir
+}
+
+TechNodeHelp_85
+{
+Menu de contrucció  n bá  sico
+}
+
+TechNodeLabel_86
+{
+Avanzado
+}
+
+TechNodeHelp_86
+{
+Menu de construcció  n avanzado
+}
+
+TechNodeLabel_87
+{
+Asistencia
+}
+
+TechNodeHelp_87
+{
+Abre el menu de asistencia
+}
+
+TechNodeLabel_88
+{
+Equipamiento
+}
+
+TechNodeHelp_88
+{
+Abre el menu de equipamiento
+}
+
+TechNodeHelp_90
+{
+Crea una resource tower: Recolecta recursos para tu equipo.  É  ste só  lo puede ser construido en un nodo de recursos.
+}
+
+TechNodeHelp_91
+{
+Crear offense chamber: atacará   a todo soldado o estructura en su campo de visió  n.  Dañ  o: 20
+}
+
+TechNodeHelp_92
+{
+Crear defense chamber: da mejoras defensivas, cura aliens y estructuras.
+}
+
+TechNodeHelp_93
+{
+Crear sensory chamber: da mejoras sensoriales, hace invisibles a los jugadores cercanos y estructuras.  Bloquea el motion-tracking en su rango.
+}
+
+TechNodeHelp_94
+{
+Crear movement chamber: da mejoras de movimiento y hace recuperar la energí  a a los aliens cercanos.
+}
+
+TechNodeHelp_95
+{
+Crear hive: Te permite acceder a formas de vida superiores y nuevas habilidades (debe construirse en localizaciones preestablecidas).
+}
+
+TechNodeHelp_101
+{
+Incrementa tu cantidad de armadura.  Cada nivel de caparazó  n absorbe un 16% de dañ  o má  s.
+}
+
+TechNodeHelp_102
+{
+Te curas automá  ticamente de cualquier herida que tengas.  Cuanto má  s nivel, má  s rá  pido te curas.
+}
+
+TechNodeHelp_103
+{
+La hive te salva automá  ticamente cada vez que estes a punto de morir, llevá  ndote de nuevo a la hive.
+}
+
+TechNodeHelp_104
+{
+Voracidad - Tu ataque cuerpo a cuerpo aumenta un 50%.
+}
+
+TechNodeHelp_105
+{
+Perforació  n - Tu ataque a distancia aumenta un 50%.
+}
+
+TechNodeHelp_106
+{
+Penetració  n - Los tiros atraviesan paredes y cuerpos (no implementado).
+}
+
+TechNodeHelp_107
+{
+Corres a má  xima velocidad permanentemente.
+}
+
+TechNodeHelp_108
+{
+Recuperas tu energí  a má  s rá  pido.  Cada nivel de adrenalina aumenta tu velocidad de recuperació  n de energí  a un 33%.
+}
+
+TechNodeHelp_109
+{
+Cada nivel de silencio hace que se te oiga menos.
+}
+
+TechNodeHelp_110
+{
+Permaneciendo quieto te hace invisible.  Cada nivel de invisibilidad te hace invisible má  s deprisa.  Observatorios y escá  neres revelará  n tu posició  n.
+}
+
+TechNodeHelp_111
+{
+Deja un rastro visible tras los enemigos.  Niveles má  s altos aumentan el rango.
+}
+
+TechNodeHelp_112
+{
+Tu hive te mostrará   a todos los enemigos en tu rango.
+}
+
+TechNodeHelp_113
+{
+Evolucionar a Skulk.  Es un rá  pido y pequeñ  o alien especializado en el combate cuerpo a cuerpo, acoso y tacticas de guerrilla.  Puede escalar paredes (desactivable con la tecla "agachar").
+}
+
+TechNodeHelp_114
+{
+Evolucionar a Gorge.  Crea torres de recursos, hives, cá  maras de mejoras y ofensivas.  Dé  bil en combate, tambié  n puede curar a compañ  eros y estructuras.
+}
+
+TechNodeHelp_115
+{
+Evolucionar a Lerk.  Gran versatilidad en combate.  Lanza puas a grandes distancias, lanza esporas asfixiantes en una á  rea de acció  n y posee la habilidad protectora "Umbra".  Cada vez que saltes te impulsará  s con sus alas. Planea dejando pulsada la tecla de salto en el aire.
+}
+
+TechNodeHelp_116
+{
+Evolucionar a Fade.  Posee grandes garras con las que dar contundentes golpes y proyectiles de á  cido.  Tambié  n puede teletransportarse.
+}
+
+TechNodeHelp_117
+{
+Evolucionar a Onos.  Alien gigante que puede aturdir a sus enemigos, cargar hacia ellos y devorarlos.  Este alien es capaz de llevarse por delante varios marines a la vez.
+}
+
+
+ClassDead
+{
+Muerto
+}
+
+ClassDigesting
+{
+Devorado
+}
+
+ClassCommander
+{
+Commander
+}
+
+ClassHeavyMarine
+{
+Heavy
+}
+
+ClassReinforcing
+{
+Renaciendo
+}
+
+ClassLevel1
+{
+Skulk
+}
+
+ClassLevel2
+{
+Gorge
+}
+
+ClassLevel3
+{
+Lerk
+}
+
+ClassLevel4
+{
+Fade
+}
+
+ClassLevel5
+{
+Onos
+}
+
+ClassGestating
+{
+Gestando
+}
+
+Building
+{
+Construyendo: 
+}
+
+
+Researching
+{
+Desarrollando: 
+}
+
+Energy
+{
+Energia: 
+}
+
+
+Prerequisite
+{
+Requerido: 
+}
+
+Cost
+{
+Coste:
+}
+
+NotFullyBuilt
+{
+Construcción inacabada
+}
+
+Recycling
+{
+Reciclando...
+}
+
+ReinforcementsText
+{
+Refuerzos: 
+}
+
+LogoutText
+{
+DESCONECTAR
+}
+
+BlipStatus_0
+{
+enemigo
+}
+
+BlipStatus_1
+{
+enemigo malherido
+}
+
+BlipStatus_2
+{
+
+}
+
+BlipStatus_3
+{
+está   bajo ataque
+}
+
+BlipStatus_5
+{
+es Gorge
+}
+
+BlipStatus_6
+{
+
+}
+
+BlipStatus_7
+{
+
+}
+
+BlipStatus_8
+{
+
+}
+
+Friend
+{
+Aliado
+}
+
+Enemy
+{
+Enemigo
+}
+
+User3Name_1
+{
+soldado
+}
+
+User3Name_2
+{
+commander
+}
+
+User3Name_3
+{
+skulk
+}
+
+User3Name_4
+{
+gorge
+}
+
+User3Name_5
+{
+lerk
+}
+
+User3Name_6
+{
+fade
+}
+
+User3Name_7
+{
+onos
+}
+
+User3Name_8
+{
+embrion
+}
+
+User3Name_15
+{
+equipamiento
+}
+
+User3Name_17
+{
+Hive
+}
+
+User3Desc_17
+{
+Los aliens nacen aquí  , da acceso a formas de vida superiores y mejoras.
+}
+
+User3FriendlyDesc_17
+{
+Naces aquí  .  Te curará   cuando esté  s cerca.  Proporciona "hive sight", que te comunica con tus aliados, y te alerta sobre los enemigos o sus ataques.  Protege tus hives a toda costa.
+}
+
+User3Name_22
+{
+Nodo de recursos
+}
+
+User3Desc_22
+{
+Te da recursos si tiene una resource tower acoplada. Estos recursos son infinitos.
+}
+
+User3CommanderDesc_22
+{
+Te da recursos si tiene una resource tower acoplada. Estos recursos son infinitos.
+}
+
+User3Name_23
+{
+Command console
+}
+
+User3Desc_23
+{
+Usado por el commander para crear estructuras e investigar nuevas tecnologí  as.
+}
+
+User3FriendlyDesc_23
+{
+Usado por el commander para crear estructuras e investigar nuevas tecnologí  as.  El nombre de tu commander está   indicado arriba.  Si tu equipo no tiene commander, podrá  s serlo usando la command console.
+}
+
+User3CommanderDesc_23
+{
+Selecciona la command console para ver el radio en el que puedes construir los infantry portals.  Si la consola es destruida, saldrá  s de ella automá  ticamente.  Proté  gela cueste lo que cueste.
+}
+
+
+User3Name_24
+{
+Turret factory
+}
+
+User3Desc_24
+{
+Permite construir torretas en su radio de acció  n.  Las torretas necesitan esta estructura para seguir funcionando.
+}
+
+User3Name_25
+{
+Armory
+}
+
+User3Desc_25
+{
+Da munició  n y permite dar escopetas, minas y welders en su radio de acció  n.
+}
+
+User3CommanderDesc_25
+{
+Da munició  n a tus soldados.  Permite construir escopetas, minas y welders en su zona.  Selecciona la estructura para saber su alcance.
+}
+
+User3FriendlyDesc_25
+{
+Usa la armory para conseguir munició  n para tu arma actual.  Tambié  n permite dar escopetas y minas en su zona.
+}
+
+
+User3Name_26
+{
+Advanced armory
+}
+
+User3Desc_26
+{
+Da munició  n y permite dar ametralladoras pesadas y lanzagranadas en su radio de acció  n.
+}
+
+User3CommanderDesc_26
+{
+Da munició  n ilimitada para tus soldados.  Permite dar ametralladoras pesadas y lanzagranadas en su radio de acció  n.  Selecciona la estructura para ver su alcance.
+}
+
+User3FriendlyDesc_26
+{
+Usa la armory para conseguir munició  n para tu arma actual.  Tambié  n permite dar ametralladoras pesadas y lanzagranadas en su radio de acció  n.
+}
+
+
+User3Name_27
+{
+Arms lab
+}
+
+User3Desc_27
+{
+Permite mejorar tus armaduras y armas.
+}
+
+User3Name_28
+{
+Prototype lab
+}
+
+User3Desc_28
+{
+Desarrolla heavy armors y jetpacks.
+}
+
+User3Name_29
+{
+Observatory
+}
+
+User3Desc_29
+{
+Detecta cualquier objeto en su zona y revela a los aliens invisibles. Da acceso al Scanner Sweep, al Motion tracking y al Distress Beacon.
+}
+
+User3Name_30
+{
+chemlab
+}
+
+User3Name_31
+{
+medlab
+}
+
+User3Name_33
+{
+Sentry turret
+}
+
+User3Desc_33
+{
+Dispara automá  ticamente a los enemigos en su campo de acció  n.
+}
+
+User3FriendlyName_33
+{
+Dispara automá  ticamente a tus enemigos.  Dé  bil ante formas de vida avanzadas.  Debe ser construido en el campo de acció  n de una turret factory.  Dañ  o: 10
+}
+
+User3CommanderName_33
+{
+Dispara automá  ticamente a tus enemigos.  Dé  bil ante formas de vida avanzadas.  Debe ser construido en el campo de acció  n de una turet factory.  Elige la torreta para ver su rango de ataque.  No disparará   a aliens invisibles.  Bueno ante aliens dé  biles.  Dañ  o: 10
+}
+
+
+User3Name_34
+{
+Siege cannon
+}
+
+User3Desc_34
+{
+Cañ  ó  n de asedio automá  tico (CAA).  Detecta sonidos y dispara a estructuras, incluso a travé  s de paredes, pero no ataca a jugadores.
+}
+
+User3FriendlyDesc_34
+{
+Cañ  ó  n de asedio automá  tico (CAA).  Detecta sonidos y dispara a estructuras, incluso a travé  s de paredes, pero no ataca a jugadores.  Alcance: 400  Dañ  o: 165 (x2 a las estructuras) 
+}
+
+User3CommanderDesc_34
+{
+Cañ  ó  n de asedio automá  tico (CAA).  Detecta sonidos y dispara a estructuras, incluso a travé  s de paredes, pero no ataca a jugadores.  No puede atacar en lugares muy cercanos a sus objetivos.  Selecció  nalo para ver su rango de ataque.  Alcance: 400  Dañ  o: 165 (x2 ante estructuras)
+}
+
+User3Name_35
+{
+Resource tower
+}
+
+User3Desc_35
+{
+Recolecta recursos a intervalos regulares.
+}
+
+User3Name_37
+{
+Infantry portal
+}
+
+User3FriendlyDesc_37
+{
+Los marines renacen aquí  despué  s de morir.  Si destruyes el portal, los marines no podrá  n renacer.
+}	  
+
+User3FriendlyDesc_37
+{
+Aquí   renace tu equipo. Sin portal, nadie podrá   renacer, proté  gelo.
+}	  
+
+User3CommanderDesc_37
+{
+Aquí   renace tu equipo. Si el portal es destruido, los marines no podrá  n renacer, proté  gelo.
+}
+
+User3Name_38
+{
+nuke
+}
+
+User3Desc_38
+{
+Nuke is arming, and must be destroyed before it finishes!  Once armed, nuke detonates, doing massive damage to nearby players and structures.
+}
+
+User3FriendlyDesc_38
+{
+La cuenta atrá  s ha comenzado, debes destruirlo antes de que explote!  De lo contrario, explotará  , provocando dañ  os brutales a jugadores y estructuras.
+}
+
+User3CommanderDesc_38
+{
+La cuenta atrá  s ha comenzado, proté  gelo hasta que acabe.  Cuando acabe, explotará  , provocando dañ  os brutales a jugadores y estructuras.
+}
+
+User3Name_39
+{
+Heavy armor
+}
+
+User3Desc_39
+{
+Có  gela para tener una armadura má  s resistente.  No pueden acoplá  rse jetpacks a esta armadura.  Es inmune a las esporas.
+}
+
+User3Name_40
+{
+Jetpack
+}
+
+User3Desc_40
+{
+Coge el mó  dulo para poder "volar".  No es compatible con la armadura pesada.
+}
+
+User3Name_41
+{
+Phase gate
+}
+
+User3Desc_41
+{
+Transporte instantá  neo hacia otros Phase Gates.  Usalo para teletransportarte.  Puede ser usado solo por los marines.
+}
+
+User3CommanderDesc_41
+{
+Transporte instantá  neo hacia otros Phase Gates.  Tiene que haber varios para que funcione.
+}
+
+User3Name_42
+{
+Defense chamber
+}
+
+User3Desc_42
+{
+Cura lentamente a los aliens y estructuras de alrededor.  Permite conseguir mejoras defensivas (Caparazó  n, Regeneració  n y Redenció  n).
+}
+
+User3Name_43
+{
+Movement chamber
+}
+
+User3Desc_43
+{
+Los aliens pueden usarlas para teletransportarse a la hive.  Permite conseguir mejoras de movimiento (Celeridad, Adrenalina y Silencio).  Destruyendo estas cá  maras las mejoras desaparecerá  n.
+}
+
+User3FriendlyDesc_43
+{
+Ve hacia la cá  mara y pulsa "usar" para teletransportarte a la hive.  Te permite conseguir mejoras de movimiento (Celeridad, Adrenalina y Silencio). Regenera tu energí  a.
+}
+
+
+User3Name_44
+{
+Offense chamber
+}
+
+User3Desc_44
+{
+Atacará   a todos los enemigos y estructuras que detecte.  Dañ  o: 20
+}
+
+User3Name_45
+{
+Sensory chamber
+}
+
+User3Desc_45
+{
+Hace invisibles a los jugadores y estructuras en su rango de acció  n, y permite mejoras sensoriales (Invisibilidad, Feromonas y Aroma del Miedo).
+}
+
+
+User3Name_46
+{
+Resource tower
+}
+
+User3Desc_46
+{
+Recolecta recursos para el enemigo.
+}
+
+User3FriendlyDesc_46
+{
+Recolecta recursos para tu equipo extrayé  ndolos del nodo.
+}
+
+User3Name_47
+{
+Heavy armor
+}
+
+User3Desc_47
+{
+Proporciona al soldado heavy armor.
+}
+
+User3FriendlyDesc_47
+{
+Proporciona al soldado heavy armor.
+}
+
+User3Name_48
+{
+Jetpack
+}
+
+User3Desc_48
+{
+Proporciona al soldado jetpack.
+}
+
+User3FriendlyDesc_48
+{
+Proporciona al soldado jetpack.
+}
+
+User3Name_49
+{
+Advanced turret factory
+}
+
+User3Desc_49
+{
+Permite construir sentry turrets y siege turrets.
+}
+
+User3FriendlyDesc_49
+{
+Permite construir sentry turrets y siege turrets.
+}
+
+User3Name_57
+{
+Mina
+}
+
+User3Desc_57
+{
+Explota al contacto
+}
+
+User3FriendlyDesc_57
+{
+Explota al contacto
+}
+
+Weapon1Help
+{
+Gore - Acorrala a tu enemigo y ataca. Dañ  o: %d (x2 contra estructuras)
+}
+
+Weapon2Help
+{
+Spit - Arma de corto alcance para retener a tus enemigos.  Dañ  o: %d
+}
+
+Weapon3Help
+{
+Spores - Nube de esporas que asfixia a tu enemigo poco a poco mientras esté   dentro del á  rea de acció  n del ataque.  Dañ  o: %d por segundo
+}
+
+Weapon4Help
+{
+Spikes - Ataque de largo alcance instantá  neo.  Dañ  o: %d
+}
+
+Weapon5Help
+{
+Bite - Ataca con esto en lugares cerrados y será  s letal.  Dañ  o: %d
+}
+
+Weapon6Help
+{
+Bite - Ataca con esto en lugares cerrados y será  s letal.  Dañ  o: %d
+}
+
+Weapon7Help
+{
+Swipe - Letal en lugares cerrados.  Acorrala al enemigo y ataca.  Bueno contra jugadores y estructuras.  Dañ  o: %d
+}
+
+Weapon8Help
+{
+Webs - Dispara dos gló  bulos cerca uno de otro y é  stos se unirá  n formando una especie de telarañ  a.  Consiguen frenar el avance enemigo y les impedirá   usar sus armas.  Pueden ser destruidas con el welder.
+}
+
+Weapon9Help
+{
+Metabolize - Te cura a costa de energí  a.
+}
+
+Weapon10Help
+{
+Parasite - Infecta al objetivo con un pará  sito, incluyé  ndolo en la hive sight.  El pará  sito no se puede eliminar.  Dañ  o: %d
+}
+
+Weapon11Help
+{
+Blink - Te permite teletransportarte. Apunta en la direcció  n que quieras y deja pulsado el botó  n.
+}
+
+Weapon12Help
+{
+Xenocide - Suicidio explosivo.  Poco despué  s de activarlo, explotas, haciendo un fortí  simo dañ  o a tu alrededor.  Dañ  o: %d
+}
+
+Weapon13Help
+{
+Knife - Arma de eficiencia y desesperació  n.  Dañ  o: %d
+}
+
+Weapon14Help
+{
+Pistola - Alta precisió  n, pero cargadores pequeñ  os.  Dañ  o: %d
+}
+
+Weapon15Help
+{
+Machine gun - Buena precisió  n, alta cadencia de tiro, cargadores medios.  Cadencia de tiro: 10 balas/segundo.  Dañ  o: %d
+}
+
+Weapon16Help
+{
+Shotgun - Para blancos con un movimiento muy rá  pido y para crear gran dañ  o a objetivos grandes.  10 perdigones/tiro.  Dañ  o: %d por perdigó  n
+}
+
+Weapon17Help
+{
+Heavy machine gun (HMG) - Buen arma para objetivos grandes, y para defender.  Permanece quieto para apuntar bien, tiene una capacidad de cargador inmensa.  Dañ  o: %d por bala (mitad contra estructuras)
+}
+
+Weapon18Help
+{
+Welder - No es un arma, es un elemento de apoyo.  Usalo para activar o desactivar areas "weldables" del mapa.  Puede tambié  n reparar estructuras y armaduras, ademas de tener la posibilidad de eliminar las webs.  Dañ  o: %d
+}
+
+Weapon19Help
+{
+Minas - Usalas en defensa, o para proteger un flanco durante un asalto.  Una vez activas, actuan como minas de proximidad.  Dañ  o: %d
+}
+
+Weapon20Help
+{
+Grenade launcher - Las granadas explotará  n tras 4 segundos produciendo una onda expansiva considerable.  Dañ  o: %d (x2 ante estructuras) 
+}
+
+Weapon21Help
+{
+Leap - Saltas hacia delante rá  pidamente, golpeando a cualquier cosa en tu camino.  Util para desplazarse, y tambié  n en combate.  Dañ  o: %d
+}
+
+Weapon22Help
+{
+Charge - Explosió  n de furia que mata a todo lo que toca.  La carga acaba con toda la energí  a.  Dañ  o: increí  ble
+}
+
+Weapon23Help
+{
+Umbra - Emite una nube de una bacteria muy agresiva que frena las balas enemigas.  Cualquier aliado o estructura de la nube raramente recibe tiros, pero son susceptibles de ataques con explosivos o que no usen balas.  Dura %d segundos.
+}
+
+Weapon24Help
+{
+Primal scream - Todos tus compañ  eros recuperan su energí  a en menos tiempo, se mueven má  s rá  pido y hacen má  s dañ  o durante el grito.  Estate atento a sus gritos de desafí  o.
+}
+
+Weapon25Help
+{
+Bile bomb - Artillerí  a orgá  nica buena ante estructuras. Dañ  o: %d (solo estructuras)
+}
+
+Weapon26Help
+{
+Acid rocket - Proyectil de velocidad lenta con onda expansiva.  Dañ  o: %d
+}
+
+Weapon27Help
+{
+Healing spray - Spray bacterial que cura a tus aliados y estructuras y dañ  a los enmigos si está  n cerca.  Dañ  o: %d
+}
+
+Weapon28Help
+{
+Babbler - Crear un "babbler", una versió  n má  s dé  bil del skulk.  Ellos seguirá  n y atacará  n a tus enemigos, pero só  lo viven durante un corto periodo de tiempo.  Dañ  o: 20 (mordisco), 40 (kamikaze)
+} 
+
+Weapon29Help
+{
+Stomp - Aturde a todos los enemigos que toca la onda expansiva durante %d segundos
+}
+
+Weapon30Help
+{
+Devour - Engulle al enemigo cercano.  El jugador es lentamente digerido, reduciendo en %d puntos por segundo su vida.  El Onos recibe su vida a cambio mientras le digiere.  Si el Onos muere antes de digerirlo, el jugador es liberado.
+}
+
+CommandStationOtherTeam
+{
+Esta command console pertenece al otro equipo.
+}
+
+CommandStationInUse
+{
+Tu equipo ya tiene commander, la command console no puede ser usada.
+}
+
+WeaponPreventingCommandStation
+{
+Tu arma no te permite entrar en la command console.
+}
+
+CommandStationDestroyed
+{
+Esta command console ha sido destruida y no puede ser usada!
+}
+
+CommandStationWaitTime
+{
+Debes esperar un rato antes de volver a entrar.
+}
+
+
+// Particle editing commands
+$position -1 0.7
+NoParticleSystem
+{
+El sistema de partí  culas no ha sido encontrado.
+}
+
+EditingParticleSystem
+{
+Encontrado sistema de partí  culas, pulsa F7 para editar
+}
+
+
+// Marine help text
+
+// Armor received messages
+$position -1 0.45
+$effect 0
+$fadein 0.5
+$fadeout 0.5
+$holdtime 5.0
+
+HelpTextCSAttractMode
+{
+Acé  rcate a esta command console y pulsa "usar" para activar el modo commander.
+}
+
+HelpTextArmoryResupply
+{
+Usa esta armory para conseguir munició  n para tu arma actual.
+}
+
+HelpTextAttackNearbyStation
+{
+Esta es la command console enemiga, destruyela!
+}
+
+HelpTextBuildTurret
+{
+Apunta a la base de esta torreta y pulsa "usar" para construirla.
+}
+
+HelpTextBuildTower
+{
+Apunta a la base de esta resource tower y pulsa "usar" para construirla.
+}
+
+HelpTextExplainTower
+{
+Esta resource tower consigue recursos para tu equipo perió  dicamente.
+}
+
+HelpTextAttackHive
+{
+Reune a tus compañ  eros e id a buscar una hive para destruirla!
+}
+
+HelpTextOtherHiveBuilding
+{
+Solo se puede construir una sola hive a la vez. Espera hasta que la otra hive esté   construida para construir esta.
+}
+
+HelpTextEmptyHiveNotNearby
+{
+Las hives solo pueden ser contruidas en zonas especificas (busca infestació  n y el indicador translucido de la hive).
+}
+
+HelpTextAttackNearbyHive
+{
+Hay una hive enemiga cerca, ve a destruirla para detener la amenaza aliení  gena!
+}
+
+HelpTextFriendlyMovementChamber
+{
+Pulsa "usar" en esta movement chamber para teletransportarte a la hive má  s lejana.  Tambié  n te da energí  a si está  s cerca.
+}
+
+HelpTextAttackMovementChamber
+{
+É  sta es una movement chamber enemiga, les permite teletransportarse a la hive y les recobra su energí  a.
+}
+
+HelpTextFriendlyOffensiveChamber
+{
+Esto es una offense chamber, disparará   a tus enemigos.
+}
+
+HelpTextAttackOffensiveChamber
+{
+Eso es una offense chamber enemiga, cuidado!
+}
+
+HelpTextFriendlyDefensiveChamber
+{
+Esta defense chamber cura a los aliens y estructuras de alrededor.  Hace un sonido de chapoteo cuando cura.
+}
+
+HelpTextAttackDefensiveChamber
+{
+Esto es una defense chamber enemiga, cura a aliens y estructuras enemigas.
+}
+
+HelpTextFriendlySensoryChamber
+{
+É  sta es una sensory chamber, hace invisibles a los jugadores y estructuras cercanas.
+}
+
+HelpTextAttackSensoryChamber
+{
+Esto es una sensory chamber enemiga.
+}
+
+HelpTextOpenWeldable
+{
+Esta zona puede ser desbloqueada con un welder.
+}
+
+HelpTextCloseWeldable
+{
+Esta zona puede ser bloqueada con un welder.
+}
+
+HelpTextPhaseGate
+{
+Usa el phase gate para llegar antes a tu destino.
+}
+
+HelpTextAlienPopupMenu
+{
+Usa el menu para construir estructuras, evolucionar, o cambiar de equipo.
+}
+
+HelpTextMarinePopupMenu
+{
+Usa el menu para acceder a los mensajes de voz, pedir ó  rdenes, cambiar equipo, y demá  s.
+}
+
+HelpTextOrder
+{
+Has recibido una orden del commander.  El cí  rculo azul en tu pantalla indica el lugar al que debes ir y el tipo de orden.  Usa el menu para pedir otras ó  rdenes o aceptar estas.
+}
+
+HelpTextCommanderUseable
+{
+Como commander, puedes usar cualquier botó  n o interruptor haciendo click izquierdo sobre ellos.
+}
+
+HelpTextMarineCommandMenu
+{
+Usa el menu para comunicarte con tus compañ  eros.
+}
+
+HelpTextResourceDropoff
+{
+Has conseguido recursos para tu equipo!
+}
+
+HelpTextJetpacks
+{
+El commander ha desarrollado jetpacks para tu equipo.  Pulsa saltar para usarlo.
+}
+
+HelpTextAlienCommandMenu
+{
+Usa el menu para evolucionar y adquirir nuevas habilidades
+}
+
+HelpTextAttackTower
+{
+Esta resource tower consigue recursos para el enemigo... destruyela!
+}
+
+HelpTextAlienWeapons
+{
+Usa la rueda del rató  n o los numeros para cambiar el ataque.  Si el icono está   rojo significa que no está   disponible y necesitas má  s hives.
+}
+
+HelpTextAlienResources
+{
+La barra azul a la izquierda son tus recursos.  Los consigues de las torres de recursos.  Los recursos pueden gastarse usando el menu.
+}
+
+HelpTextAlienEnergy
+{
+La barra amarilla es tu energí  a.  Tus ataques la gastan, pero se regenera regularmente.
+}
+
+HelpTextAlienPendingUpgrades
+{
+El pequeñ  o  icono parpadeando a la derecha te indica que puedes adquirir nuevas habilidades!  Abre el menu y elige una de ellas.
+}
+
+HelpTextAlienBuildStructure
+{
+Siendo alien obrero, puedes crear estructuras para tu equipo usando el menu.
+}
+
+HelpTextAlienBuildStructure
+{
+Hay una estructura alien inacabada cerca.  Las estructuras se construyen solas lentamente, pero un gorge, puede acelerar el proceso.  Apunta a la base de la estructura y pulsa "usar".
+}
+
+HelpTextAlienHiveSight
+{
+Los cí  rculos brillando en tu pantalla son la hive sight.  Los blancos son compañ  eros, los rosas son aliens atacados, y los amarillos enemigos.
+}
+
+HelpTextAlienVisionMode
+{
+La localizació  n de todos los aliens y estructuras es conocida siempre por la hive.  Te enseñ  ará   todos los organismos aliení  genas al presionar tu "linterna".
+}
+
+HelpTextAlienCommunication
+{
+Puedes comunicarte con tus compañ  eros a travé  s de la hive sight usando el menu.  Si ves enemigos llegando a tu hive avisa a los demá  s con el menu y verá  n en su pantalla que has detectado enemigos.
+}
+
+HelpTextAlienUnderAttack
+{
+Uno de tus compañ  eros o estructuras está bajo ataque.  Gira la vista y busca la alerta de la hive sight.
+}
+
+HelpTextBuilder
+{
+Eres un Gorge.  Alé  jate de los combates y construye estructuras con el menu.
+}
+
+HelpTextWeb
+{
+Tira webs contra las paredes y el suelo para crear redes.  Los enemigos que las toquen, quedará  n atrapados y no podrá  n usar sus armas temporalmente.
+}
+
+HelpTextWallwalking
+{
+Acé  rcate a una pared para trepar, quedará  s "pegado" a ella.
+}
+
+HelpTextBite
+{
+Acorrala al enemigo y pulsa "disparo" para morderles.
+}
+
+HelpTextFlight
+{
+Pulsa "saltar" para volar.  Cada vez que lo pulses agitará  s tus alas, tambié  n puedes dejar pulsada tu tecla de salto en el aire para planear.
+}
+
+HelpTextSpores
+{
+Pulsa "disparo" para crear una nube de esporas que dañ  e a quien esté   dentro.
+}
+
+HelpTextAlienResource
+{
+Encuentra un nodo de recursos y construyelo para recolectarlos.
+}
+
+HelpTextPopupMenu
+{
+Pulsa el botó  n derecho para mostrar el menu.
+}
+
+HelpTextBuyUpgrade
+{
+Los aliens pueden conseguir nuevas habilidades utilizando el menu.  Inté  ntalo: abre el menu (botó  n derecho), y mueve el cursor a la derecha.
+}
+
+HelpTextBuyLifeform
+{
+Los aliens tienen la capacidad de evolucionar.  Inté  ntalo: abre el menu (botó  n derecho), mueve el cursor hacia abajo, y despué  s elige la evolució  n que quieras.
+}
+
+HelpTextCommanderGiveOrders
+{
+Click-derecho en el suelo o en una estructura para dar una orden.
+}
+
+HelpTextCommanderSelectPlayers
+{
+Click-izdo para elegir a un soldado o manté  nlo pulsado para elegir varios.
+}
+
+HelpTextCommanderLogout
+{
+Puedes dejar de ser commander pulsando en el cuadro rojo que pone "DESCONECTAR" en la esquina superior derecha.
+}
+
+// This message isn't in yet
+HelpTextCommanderBuild
+{
+Esta estructura no está   construida del todo.  Elige a un soldado y haz click-dcho en ella para ordenarle que la acabe.
+}
+
+HelpTextCommanderUse
+{
+Las puertas, ascensores y botones pueden ser manipulados por el commander.  Click-izdo para manipular.
+}
+
+HelpTextCommanderAttack
+{
+Este objetivo puede ser atacado!  Click-dcho para dar la orden.
+}
+
+HelpTextCommanderWeld
+{
+Este objetivo puede soldarse.  Dale un soldador al marine, y haz click-dcho para darle la orden.
+}
+
+HelpTextCommanderGet
+{
+Click-dcho para dar la orden de recoger esto.
+}
+
+HelpTextCommanderUnderAttack
+{
+Está  s siendo atacado!  Pulsa "saltar" para ir a la alarma.
+}
+
+HelpTextCommanderResearchComplete
+{
+Tu investigació  n se ha completado.  Pulsa "saltar" para ir al lugar de investigació  n.
+}
+
+HelpTextCommanderUpgradeComplete
+{
+Tu mejora está   completa.  Presiona "saltar" para ver tu estructura mejorada.
+}
+
+JetpackEnergyHUDText
+{
+Energí  a del Jetpack
+}
+
+HelpTextDisableHelp
+{
+Puedes desactivar estas ayudas desactivando "show hints" en Customize o poniendo en la consola cl_autohelp 0.  
+}
+
+Paralyzed
+{
+Paralizado
+}
+
+Stunned
+{
+Aturdido
+}
+
+Digested
+{
+Siendo digerido...
+}
+
+DigestingPlayer
+{
+Digiriendo a %s...
+}
+
+Parasited
+{
+Pará  sitado
+}
+
+PrimalScreamed
+{
+Primal Scream
+}
+
+Umbraed
+{
+Bajo Umbra
+}
+
+Webbed
+{
+Atrapado
+}
+
+// Order descriptions
+Order2
+{
+Ir a
+}
+
+Order3
+{
+Atacar objetivo
+}			 
+
+Order4
+{
+Construir %s
+}
+
+Order5
+{
+Proteger %s
+}
+
+Order6
+{
+Suelda en
+}
+
+Order7
+{
+Recoger %s
+}
+
+Order9
+{
+Manté  n tu posició  n
+}
+
+Range
+{
+%d metros
+}
+
+// Timelimit for tourny mode
+GameTime
+{
+Tiempo
+}
+
+Elapsed
+{
+transcurrido
+}
+
+TimeLimit
+{
+Limite de tiempo
+}
+
+Remaining
+{
+restantes
+}
+
+// HLTV 
+Spec_duck
+{
+Pulsa AGACHAR para el menu de espectador
+}
+
+SPECT_OPTIONS
+{
+Opciones
+}
+
+CAM_OPTIONS
+{
+Opciones de cámara
+}
+
+SpecMode5Text
+{
+}
+
+OBS_MAP_FREE
+{
+Vista de mapa libre
+}
+
+OBS_MAP_CHASE
+{
+Vista de mapa bloqueada
+}
+
+OBS_CHASE_FREE
+{
+Modo seguimiento libre
+}
+
+OBS_CHASE_LOCKED
+{
+Modo seguimiento bloqueado
+}
+
+OBS_IN_EYE
+{
+Primera persona
+}
+
+OBS_ROAMING
+{
+Vista libre
+}
+
+// Official map locations
+testlocation1
+{
+The translated refinery
+}
+
+/////////////
+// ns_bast //
+/////////////
+bastlocation_dockingbay
+{
+Marine Start - Docking Bay 1
+}
+
+bastlocation_mainjunction
+{
+Main Aft Junction
+}
+
+bastlocation_cargolock
+{
+Heavy Lock Door
+}
+
+bastlocation_atmosphericprocessing
+{
+Atmospheric Processing
+}
+
+bastlocation_furnace
+{
+Steam Generation
+}
+
+bastlocation_watertreatment
+{
+Water Treatment
+}
+
+// NOTE: The hyphen in hive location names is important.  Everything before the hyphen is trimmed off when displaying
+// location names for aliens (the hive icons in the upper right of their HUD).  Make sure to follow the convention:
+// Hive Location - name
+bastlocation_feedwatercontrol
+{
+Hive Location - Feedwater Control
+}
+
+bastlocation_trammaintenance
+{
+Tram Maintenance
+}
+
+bastlocation_tramtunnel
+{
+Tram Tunnel
+}
+
+bastlocation_lowerjunction
+{
+Lower Junction
+}
+
+bastlocation_Refinery
+{
+Hive Location - Refinery
+}
+
+bastlocation_emshaft
+{
+EM Drill Shaft
+}
+
+bastlocation_engineroom
+{
+Hive Location - Engine Room
+}
+
+bastlocation_dockinghydraulics
+{
+Docking Hydraulics
+}
+
+bastlocation_maintenancejunction
+{
+Maintenance Junction
+}
+
+bastlocation_ncorridor
+{
+"N" Corridor
+}
+
+bastlocation_observationbridge
+{
+Observation Bridge
+}
+
+bastlocation_starboardairlock
+{
+Starboard Airlock
+}
+
+bastlocation_portairlock
+{
+Port Airlock
+}
+
+bastlocation_maintenanceaccess
+{
+Maintenance Access Duct
+}
+
+bastlocation_pressureequalization
+{
+Pressure Equalization Conduit
+}
+
+bastlocation_starboardcorridor
+{
+Aft Starboard Corridor
+}
+
+bastlocation_filtration
+{
+Feedwater Filtration Access
+}
+
+bastlocation_ventilation
+{
+Ventilation Conduit
+}
+
+bastlocation_databank
+{
+Databank Access
+}
+
+bastlocation_enginecorridor
+{
+Engine Corridor
+}
+
+/////////////
+// ns_hera //
+/////////////
+heralocation_archive
+{
+Hive Location - Archiving
+}
+ 
+heralocation_processingcorea
+{
+Data Core Alpha
+}
+ 
+heralocation_reception
+{
+Hera Entrance and Reception
+}
+ 
+heralocation_holoroom
+{
+Central Monitoring - 'Holoroom'
+}
+ 
+heralocation_storage
+{
+General Cargo Storage
+}
+ 
+heralocation_hanger
+{
+Marine Start - Loading bay
+}
+ 
+heralocation_docking
+{
+Marine Start - Landing Pad
+}
+ 
+heralocation_processing
+{
+Processing
+}
+ 
+heralocation_processingcoreb
+{
+Hive Location - Data Core Delta
+}
+ 
+heralocation_ventilation
+{
+Hive Location - Ventilation 3-C
+}
+ 
+heralocation_maintenence
+{
+Maintenance
+}
+ 
+heralocation_fogcorridor
+{
+Maintenance Corridor
+}
+ 
+heralocation_tube
+{
+Hera Entrance Walkway
+}
+
+// Nothing titles
+nothinglocation_rr
+{
+Space Station Nothing - Sub Sector 77
+}
+
+nothinglocation_ms
+{
+Marine Start - S77 Vestibule
+}
+
+nothinglocation_dock
+{
+Docking Wing 01
+}
+
+nothinglocation_thres1
+{
+The Threshold
+}
+
+nothinglocation_thres2
+{
+The Threshold
+}
+
+nothinglocation_junc1
+{
+The Junction
+}
+
+nothinglocation_junc2
+{
+The Junction
+}
+
+nothinglocation_vent
+{
+Ventilation Chamber
+}
+
+nothinglocation_comm
+{
+Communications Hub 063
+}
+
+nothinglocation_things
+{
+Room With Things
+}
+
+nothinglocation_cargo
+{
+Hive Location - Cargo Bay Foyer
+}
+
+nothinglocation_pipe
+{
+Pipe Room
+}
+
+nothinglocation_paint1
+{
+Painted Corridor
+}
+
+nothinglocation_paint2
+{
+Painted Corridor
+}
+
+nothinglocation_paint3
+{
+Painted Corridor
+}
+
+nothinglocation_quada
+{
+Quad Lift Area
+}
+
+nothinglocation_quad
+{
+Quad Lift
+}
+
+nothinglocation_chamb
+{
+Foreboding Antechamber
+}
+
+nothinglocation_sas1
+{
+Silo Access South
+}
+
+nothinglocation_sas2
+{
+Silo Access South
+}
+
+nothinglocation_silo
+{
+Hive Location - PowerSilo
+}
+
+nothinglocation_san1
+{
+Silo Access North
+}
+
+nothinglocation_san2
+{
+Silo Access North
+}
+
+nothinglocation_mias1
+{
+Miasma Walkway
+}
+
+nothinglocation_mias2
+{
+Miasma Walkway
+}
+
+nothinglocation_mias3
+{
+Miasma Walkway
+}
+
+nothinglocation_gen
+{
+Generator Room
+}
+
+nothinglocation_elev1
+{
+Elevator Shaft 01
+}
+
+nothinglocation_elev2
+{
+Elevator Shaft 02
+}
+
+nothinglocation_eek
+{
+Intimidation
+}
+
+nothinglocation_kismet
+{
+Ominous Kismet
+}
+
+nothinglocation_vae
+{
+Viaduct Access East
+}
+
+nothinglocation_vaw
+{
+Viaduct Access West
+}
+
+nothinglocation_viaduct
+{
+Hive Location - The Great Viaduct
+}
+
+// TANITH info_location data START
+tanith_westenter
+{
+Western Entrance
+}
+
+tanith_marinebase
+{
+Marine Start - Uplink Command
+}
+
+tanith_outsidebase
+{
+Exterior Access Paths
+}
+
+tanith_north
+{
+Northern Corridor
+}
+
+tanith_sat
+{
+External Satellite Relay
+}
+
+tanith_satcomm
+{
+Hive Location - Satellite Communications
+}
+
+tanith_transport
+{
+Chemical Transport Room
+}
+
+tanith_cpu
+{
+Computer Control
+}
+
+tanith_acid
+{
+Acidic Solution Processing
+}
+
+tanith_reactor
+{
+Reactor Room
+}
+
+tanith_enter
+{
+Eastern Entrance
+}
+
+tanith_centerenter
+{
+Central Entrance
+}
+
+tanith_east
+{
+East Access Tunnels
+}
+
+tanith_research
+{
+Research Labs
+}
+
+tanith_rr
+{
+Tanith Ready Room
+}
+tanith_waste
+{
+Hive Location - Waste Handling
+}
+
+tanith_central
+{
+Central Access Tunnels
+}
+
+tanith_storageenter
+{
+Storage Entrance
+}
+
+tanith_cargo
+{
+Cargo Storage
+}
+
+tanith_fusion
+{
+Hive Location - Fusion Reactor
+}
+
+tanith_west
+{
+West Access Corridor
+}
+// TANITH info_location data END 
+
+
+// NANCY info_location data START
+nancy_cargo
+{
+Cargo Hold 2
+}
+
+nancy_aux
+{
+Auxillary Command
+}
+
+nancy_engine
+{
+Port Engine Room
+}
+
+nancy_crawl
+{
+Sub-tunnel
+}
+
+nancy_maint
+{
+Maintenance Shaft
+}
+
+nancy_shaft
+{
+Maintenance Shaft
+}
+
+nancy_mother
+{
+Noname
+}
+
+nancy_lockers
+{
+Crew Lockers
+}
+
+nancy_mess
+{
+Mess Hall
+}
+
+nancy_airlock
+{
+Airlock Exchange
+}
+
+nancy_port
+{
+Port Airlock
+}
+
+nancy_bridge
+{
+Bridge
+}
+
+nancy_cockpit
+{
+Cockpit
+}
+
+nancy_star
+{
+Starboard Airlock
+}
+
+nancy_gen
+{
+Auxiliary Generators
+}
+
+nancy_motherinter
+{
+Mother Interface
+}
+
+nancy_subspace
+{
+Subspace Array Interface
+}
+
+nancy_crew
+{
+Crew Quarters
+}
+// NANCY info_location data END
+
+// CAGED info_location data START
+caged_marine
+{
+Marine Spawn - Main Hold
+}
+
+caged_upsewer
+{
+Upper Sewer
+}
+
+caged_dsewer
+{
+Lower Sewer
+}
+
+caged_hive1
+{
+Hive Location - Sewer
+}
+
+caged_hive2
+{
+Hive Location - Ventilation System
+}
+
+caged_hive3
+{
+Hive Location - Generator
+}
+
+caged_pure
+{
+Purification Station 01
+}
+
+caged_central
+{
+Central Processing
+}
+
+caged_vaccess
+{
+Ventilation Access
+}
+
+caged_work
+{
+Stability Monitoring
+}
+
+caged_auxgen
+{
+Auxiliary Generator
+}
+
+caged_service
+{
+Shipping Tunnels
+}
+
+caged_area2
+{
+Upper Shipping Access
+}
+// CAGED info_location data END
+
+// Eclipse info_location... info. (BEGIN)
+eclipse_dock
+{
+Docking Control
+}
+
+eclipse_marinespawn
+{
+Marine Spawn - Cargo Transfer
+}
+
+eclipse_station
+{
+Station Access
+}
+
+eclipse_stationeast
+{
+Station Access East
+}
+
+eclipse_stationalpha
+{
+Station Access Alpha
+}
+
+eclipse_stationwest
+{
+Station Access West
+}
+
+eclipse_triad
+{
+Triad Generator Array
+}
+
+eclipse_triadb
+{
+Triad Access B
+}
+
+eclipse_access1c
+{
+Access Corridor 1C
+}
+
+eclipse_access1b
+{
+Access Corridor 1B
+}
+
+eclipse_access1a
+{
+Primary Access Corridor 1A
+}
+
+eclipse_horseshoe
+{
+The Horseshoe
+}
+
+eclipse_tjunct
+{
+T-Junction
+}
+
+eclipse_keyhole
+{
+The Keyhole
+}
+
+eclipse_maint
+{
+Hive - Maintenance Access
+}
+
+eclipse_south
+{
+South Loop
+}
+
+eclipse_core
+{
+Hive - Computer Core
+}
+
+eclipse_northcore
+{
+North Core Access
+}
+
+eclipse_westcore
+{
+West Core Access
+}
+
+eclipse_subjunct
+{
+Power Sub-Junction 3
+}
+
+eclipse_access1d
+{
+Access Corridor 1D
+}
+
+eclipse_commandnorth
+{
+Command Access North
+}
+
+eclipse_command
+{
+Hive - Eclipse Command
+}
+
+eclipse_genmon
+{
+Primary Generator Monitors
+}
+
+eclipse_commandsouth
+{
+Command Access South
+}
+
+eclipse_access1a
+{
+Access Corridor 1A
+}
+// Eclipse info_location... info. (END)
+
+
+// Veil info_location (START)
+
+veil_marine
+{
+Marine Spawn - Mobile Command Interface
+}
+
+veil_lifteast
+{
+Lift 5 East
+}
+
+veil_swhive
+{
+Hive - Sub-Sector 5B Access
+}
+
+veil_south
+{
+Hive - Cargo Transfer South
+}
+
+veil_southeast
+{
+Hive - The Pipeline
+}
+
+veil_overlook
+{
+The Overlook
+}
+
+veil_topography
+{
+Topographical Analysis
+}
+
+veil_nano
+{
+NanoGrid Status
+}
+
+veil_dome
+{
+The Dome
+}
+
+veil_y
+{
+Y Junction
+}
+
+veil_skylight
+{
+West Skylights
+}
+
+veil_satellite
+{
+Satellite Feed
+}
+
+veil_pod1
+{
+Monitoring Pod 1
+}
+
+veil_pod2
+{
+Monitoring Pod 2
+}
+
+veil_waypointing
+{
+System Waypointing
+}
+
+veil_nanoeast
+{
+NanoGrid Access East
+}
+
+veil_nanowest
+{
+NanoGrid Access West
+}
+
+veil_c12
+{
+Emergency Nozzle C-12
+}
+
+veil_junctionwest
+{
+West Junction
+}
+
+veil_junctioneast
+{
+East Junction
+}
+
+veil_power
+{
+Power Core Status
+}
+
+// Veil info_location (END)
+
+
+
+// Tutorial text
+$position 0.15 0.15
+$effect 2
+$color 0 200 0
+$color2 0 255 0
+$fadein 0.04
+$fxtime 0.1
+$holdtime 6.0
+$fadeout 0.5
+
+TutWelcome
+{
+Bienvenido al campo de entenamiento de Natural Selection.
+
+Aquí   aprenderá  s las reglas bá  sicas de este juego.
+
+Ve hacia una puerta para elegir tu entrenamiento.
+Si eres nuevo en juegos en primera persona, el
+entrenamiento militar es má  s recomendable.
+}
+
+TutWelcomeMarineTraining
+{
+Has elegido el entrenamiento Marine.  Aquí   aprenderá  s
+a ser un buen soldado y a luchar contra la raza aliení  gena.
+}
+
+TutWelcomeAlienTraining
+{
+Has elegido el entrenamiento alien.  Aquí   aprenderá  s
+a dominar la galaxia, y eliminar a los humanos opresores.
+}
+
diff --git a/main/spraypaint.wad b/main/spraypaint.wad
new file mode 100644
index 00000000..ac47f42b
Binary files /dev/null and b/main/spraypaint.wad differ
diff --git a/main/sprites/320a-energy.spr b/main/sprites/320a-energy.spr
new file mode 100644
index 00000000..7995aae8
Binary files /dev/null and b/main/sprites/320a-energy.spr differ
diff --git a/main/sprites/320a-resources.spr b/main/sprites/320a-resources.spr
new file mode 100644
index 00000000..1281bf7e
Binary files /dev/null and b/main/sprites/320a-resources.spr differ
diff --git a/main/sprites/320aliennode.spr b/main/sprites/320aliennode.spr
new file mode 100644
index 00000000..9b048ce5
Binary files /dev/null and b/main/sprites/320aliennode.spr differ
diff --git a/main/sprites/320aliens.spr b/main/sprites/320aliens.spr
new file mode 100644
index 00000000..c8926b1c
Binary files /dev/null and b/main/sprites/320aliens.spr differ
diff --git a/main/sprites/320alienupgradecategories.spr b/main/sprites/320alienupgradecategories.spr
new file mode 100644
index 00000000..5ce36fbf
Binary files /dev/null and b/main/sprites/320alienupgradecategories.spr differ
diff --git a/main/sprites/320alienupgrades.spr b/main/sprites/320alienupgrades.spr
new file mode 100644
index 00000000..58508e6d
Binary files /dev/null and b/main/sprites/320alienupgrades.spr differ
diff --git a/main/sprites/320experience.spr b/main/sprites/320experience.spr
new file mode 100644
index 00000000..cf9ee39a
Binary files /dev/null and b/main/sprites/320experience.spr differ
diff --git a/main/sprites/320hud2.spr b/main/sprites/320hud2.spr
new file mode 100644
index 00000000..dafb0618
Binary files /dev/null and b/main/sprites/320hud2.spr differ
diff --git a/main/sprites/320jetpack.spr b/main/sprites/320jetpack.spr
new file mode 100644
index 00000000..933b0419
Binary files /dev/null and b/main/sprites/320jetpack.spr differ
diff --git a/main/sprites/320orders.spr b/main/sprites/320orders.spr
new file mode 100644
index 00000000..e8b2a837
Binary files /dev/null and b/main/sprites/320orders.spr differ
diff --git a/main/sprites/320w-s.spr b/main/sprites/320w-s.spr
new file mode 100644
index 00000000..19bd7b75
Binary files /dev/null and b/main/sprites/320w-s.spr differ
diff --git a/main/sprites/320w.spr b/main/sprites/320w.spr
new file mode 100644
index 00000000..aac68b17
Binary files /dev/null and b/main/sprites/320w.spr differ
diff --git a/main/sprites/640a-energy.spr b/main/sprites/640a-energy.spr
new file mode 100644
index 00000000..6d37f09d
Binary files /dev/null and b/main/sprites/640a-energy.spr differ
diff --git a/main/sprites/640a-resources.spr b/main/sprites/640a-resources.spr
new file mode 100644
index 00000000..07b0f6a7
Binary files /dev/null and b/main/sprites/640a-resources.spr differ
diff --git a/main/sprites/640ac1-s.spr b/main/sprites/640ac1-s.spr
new file mode 100644
index 00000000..658f34cb
Binary files /dev/null and b/main/sprites/640ac1-s.spr differ
diff --git a/main/sprites/640ac1.spr b/main/sprites/640ac1.spr
new file mode 100644
index 00000000..0baccb05
Binary files /dev/null and b/main/sprites/640ac1.spr differ
diff --git a/main/sprites/640alienconnector.spr b/main/sprites/640alienconnector.spr
new file mode 100644
index 00000000..037ab37c
Binary files /dev/null and b/main/sprites/640alienconnector.spr differ
diff --git a/main/sprites/640aliennode.spr b/main/sprites/640aliennode.spr
new file mode 100644
index 00000000..9b048ce5
Binary files /dev/null and b/main/sprites/640aliennode.spr differ
diff --git a/main/sprites/640aliens.spr b/main/sprites/640aliens.spr
new file mode 100644
index 00000000..dd0a5863
Binary files /dev/null and b/main/sprites/640aliens.spr differ
diff --git a/main/sprites/640alienupgradecategories.spr b/main/sprites/640alienupgradecategories.spr
new file mode 100644
index 00000000..ea1e76ad
Binary files /dev/null and b/main/sprites/640alienupgradecategories.spr differ
diff --git a/main/sprites/640alienupgrades.spr b/main/sprites/640alienupgrades.spr
new file mode 100644
index 00000000..fed9a588
Binary files /dev/null and b/main/sprites/640alienupgrades.spr differ
diff --git a/main/sprites/640aw1-s.spr b/main/sprites/640aw1-s.spr
new file mode 100644
index 00000000..95f9b4e4
Binary files /dev/null and b/main/sprites/640aw1-s.spr differ
diff --git a/main/sprites/640aw1.spr b/main/sprites/640aw1.spr
new file mode 100644
index 00000000..952ef7c8
Binary files /dev/null and b/main/sprites/640aw1.spr differ
diff --git a/main/sprites/640aw2-s.spr b/main/sprites/640aw2-s.spr
new file mode 100644
index 00000000..586cb534
Binary files /dev/null and b/main/sprites/640aw2-s.spr differ
diff --git a/main/sprites/640aw2.spr b/main/sprites/640aw2.spr
new file mode 100644
index 00000000..c5bd82ae
Binary files /dev/null and b/main/sprites/640aw2.spr differ
diff --git a/main/sprites/640aw3-s.spr b/main/sprites/640aw3-s.spr
new file mode 100644
index 00000000..0ae73e19
Binary files /dev/null and b/main/sprites/640aw3-s.spr differ
diff --git a/main/sprites/640aw3.spr b/main/sprites/640aw3.spr
new file mode 100644
index 00000000..07424f4c
Binary files /dev/null and b/main/sprites/640aw3.spr differ
diff --git a/main/sprites/640aw4-s.spr b/main/sprites/640aw4-s.spr
new file mode 100644
index 00000000..b9247ae5
Binary files /dev/null and b/main/sprites/640aw4-s.spr differ
diff --git a/main/sprites/640aw4.spr b/main/sprites/640aw4.spr
new file mode 100644
index 00000000..bff73f7d
Binary files /dev/null and b/main/sprites/640aw4.spr differ
diff --git a/main/sprites/640circle.spr b/main/sprites/640circle.spr
new file mode 100644
index 00000000..21b5aa99
Binary files /dev/null and b/main/sprites/640circle.spr differ
diff --git a/main/sprites/640experience.spr b/main/sprites/640experience.spr
new file mode 100644
index 00000000..cf9ee39a
Binary files /dev/null and b/main/sprites/640experience.spr differ
diff --git a/main/sprites/640hud7.spr b/main/sprites/640hud7.spr
new file mode 100644
index 00000000..a1e37197
Binary files /dev/null and b/main/sprites/640hud7.spr differ
diff --git a/main/sprites/640hud8.spr b/main/sprites/640hud8.spr
new file mode 100644
index 00000000..75c7e789
Binary files /dev/null and b/main/sprites/640hud8.spr differ
diff --git a/main/sprites/640hud9.spr b/main/sprites/640hud9.spr
new file mode 100644
index 00000000..cc33a54a
Binary files /dev/null and b/main/sprites/640hud9.spr differ
diff --git a/main/sprites/640jetpack.spr b/main/sprites/640jetpack.spr
new file mode 100644
index 00000000..f9a54872
Binary files /dev/null and b/main/sprites/640jetpack.spr differ
diff --git a/main/sprites/640mw1-s.spr b/main/sprites/640mw1-s.spr
new file mode 100644
index 00000000..3a6d70e8
Binary files /dev/null and b/main/sprites/640mw1-s.spr differ
diff --git a/main/sprites/640mw1.spr b/main/sprites/640mw1.spr
new file mode 100644
index 00000000..54e4ccfe
Binary files /dev/null and b/main/sprites/640mw1.spr differ
diff --git a/main/sprites/640mw2-s.spr b/main/sprites/640mw2-s.spr
new file mode 100644
index 00000000..f0aa0c62
Binary files /dev/null and b/main/sprites/640mw2-s.spr differ
diff --git a/main/sprites/640mw2.spr b/main/sprites/640mw2.spr
new file mode 100644
index 00000000..d900495d
Binary files /dev/null and b/main/sprites/640mw2.spr differ
diff --git a/main/sprites/640order.spr b/main/sprites/640order.spr
new file mode 100644
index 00000000..e23a4021
Binary files /dev/null and b/main/sprites/640order.spr differ
diff --git a/main/sprites/acidsplash.spr b/main/sprites/acidsplash.spr
new file mode 100644
index 00000000..2b292406
Binary files /dev/null and b/main/sprites/acidsplash.spr differ
diff --git a/main/sprites/additive/marinenode.spr b/main/sprites/additive/marinenode.spr
new file mode 100644
index 00000000..c83e5041
Binary files /dev/null and b/main/sprites/additive/marinenode.spr differ
diff --git a/main/sprites/alert.spr b/main/sprites/alert.spr
new file mode 100644
index 00000000..6cf095b7
Binary files /dev/null and b/main/sprites/alert.spr differ
diff --git a/main/sprites/aliencursor.spr b/main/sprites/aliencursor.spr
new file mode 100644
index 00000000..4f03fc4b
Binary files /dev/null and b/main/sprites/aliencursor.spr differ
diff --git a/main/sprites/aliennode.spr b/main/sprites/aliennode.spr
new file mode 100644
index 00000000..b9f90e44
Binary files /dev/null and b/main/sprites/aliennode.spr differ
diff --git a/main/sprites/b-build.spr b/main/sprites/b-build.spr
new file mode 100644
index 00000000..71620852
Binary files /dev/null and b/main/sprites/b-build.spr differ
diff --git a/main/sprites/b-health.spr b/main/sprites/b-health.spr
new file mode 100644
index 00000000..0901778b
Binary files /dev/null and b/main/sprites/b-health.spr differ
diff --git a/main/sprites/ba-build.spr b/main/sprites/ba-build.spr
new file mode 100644
index 00000000..565738cf
Binary files /dev/null and b/main/sprites/ba-build.spr differ
diff --git a/main/sprites/ba-health.spr b/main/sprites/ba-health.spr
new file mode 100644
index 00000000..406df06e
Binary files /dev/null and b/main/sprites/ba-health.spr differ
diff --git a/main/sprites/bacteria.spr b/main/sprites/bacteria.spr
new file mode 100644
index 00000000..a78d286e
Binary files /dev/null and b/main/sprites/bacteria.spr differ
diff --git a/main/sprites/bigspit.spr b/main/sprites/bigspit.spr
new file mode 100644
index 00000000..9d3a22fa
Binary files /dev/null and b/main/sprites/bigspit.spr differ
diff --git a/main/sprites/bilebomb.spr b/main/sprites/bilebomb.spr
new file mode 100644
index 00000000..d3b1e2f9
Binary files /dev/null and b/main/sprites/bilebomb.spr differ
diff --git a/main/sprites/blank.spr b/main/sprites/blank.spr
new file mode 100644
index 00000000..73caef78
Binary files /dev/null and b/main/sprites/blank.spr differ
diff --git a/main/sprites/blink.spr b/main/sprites/blink.spr
new file mode 100644
index 00000000..f73589da
Binary files /dev/null and b/main/sprites/blink.spr differ
diff --git a/main/sprites/blink2.spr b/main/sprites/blink2.spr
new file mode 100644
index 00000000..02a3df53
Binary files /dev/null and b/main/sprites/blink2.spr differ
diff --git a/main/sprites/blip0.spr b/main/sprites/blip0.spr
new file mode 100644
index 00000000..7f300b41
Binary files /dev/null and b/main/sprites/blip0.spr differ
diff --git a/main/sprites/blip1.spr b/main/sprites/blip1.spr
new file mode 100644
index 00000000..dc3fd1d9
Binary files /dev/null and b/main/sprites/blip1.spr differ
diff --git a/main/sprites/blip2.spr b/main/sprites/blip2.spr
new file mode 100644
index 00000000..ec0e5c07
Binary files /dev/null and b/main/sprites/blip2.spr differ
diff --git a/main/sprites/blip3.spr b/main/sprites/blip3.spr
new file mode 100644
index 00000000..1f06e536
Binary files /dev/null and b/main/sprites/blip3.spr differ
diff --git a/main/sprites/blip4.spr b/main/sprites/blip4.spr
new file mode 100644
index 00000000..d8583a86
Binary files /dev/null and b/main/sprites/blip4.spr differ
diff --git a/main/sprites/blip5.spr b/main/sprites/blip5.spr
new file mode 100644
index 00000000..69e71d52
Binary files /dev/null and b/main/sprites/blip5.spr differ
diff --git a/main/sprites/blip6.spr b/main/sprites/blip6.spr
new file mode 100644
index 00000000..930b3593
Binary files /dev/null and b/main/sprites/blip6.spr differ
diff --git a/main/sprites/blip7.spr b/main/sprites/blip7.spr
new file mode 100644
index 00000000..1f86a5c6
Binary files /dev/null and b/main/sprites/blip7.spr differ
diff --git a/main/sprites/blip8.spr b/main/sprites/blip8.spr
new file mode 100644
index 00000000..0f32d5ed
Binary files /dev/null and b/main/sprites/blip8.spr differ
diff --git a/main/sprites/blueball.spr b/main/sprites/blueball.spr
new file mode 100644
index 00000000..4d250fd1
Binary files /dev/null and b/main/sprites/blueball.spr differ
diff --git a/main/sprites/blueball2.spr b/main/sprites/blueball2.spr
new file mode 100644
index 00000000..c76a5005
Binary files /dev/null and b/main/sprites/blueball2.spr differ
diff --git a/main/sprites/bluespark.spr b/main/sprites/bluespark.spr
new file mode 100644
index 00000000..3f22f2c9
Binary files /dev/null and b/main/sprites/bluespark.spr differ
diff --git a/main/sprites/bubble.spr b/main/sprites/bubble.spr
new file mode 100644
index 00000000..225e43c8
Binary files /dev/null and b/main/sprites/bubble.spr differ
diff --git a/main/sprites/bubble2.spr b/main/sprites/bubble2.spr
new file mode 100644
index 00000000..583d1d8f
Binary files /dev/null and b/main/sprites/bubble2.spr differ
diff --git a/main/sprites/buildcircle.spr b/main/sprites/buildcircle.spr
new file mode 100644
index 00000000..443468ea
Binary files /dev/null and b/main/sprites/buildcircle.spr differ
diff --git a/main/sprites/camera.spr b/main/sprites/camera.spr
new file mode 100644
index 00000000..4e433446
Binary files /dev/null and b/main/sprites/camera.spr differ
diff --git a/main/sprites/ch_sniper.spr b/main/sprites/ch_sniper.spr
new file mode 100644
index 00000000..73caef78
Binary files /dev/null and b/main/sprites/ch_sniper.spr differ
diff --git a/main/sprites/chamberdeath.spr b/main/sprites/chamberdeath.spr
new file mode 100644
index 00000000..6b2ef356
Binary files /dev/null and b/main/sprites/chamberdeath.spr differ
diff --git a/main/sprites/co_ether/ether_spark.spr b/main/sprites/co_ether/ether_spark.spr
new file mode 100644
index 00000000..571eefa1
Binary files /dev/null and b/main/sprites/co_ether/ether_spark.spr differ
diff --git a/main/sprites/co_niveus/hera_fog.spr b/main/sprites/co_niveus/hera_fog.spr
new file mode 100644
index 00000000..fd530f9a
Binary files /dev/null and b/main/sprites/co_niveus/hera_fog.spr differ
diff --git a/main/sprites/co_niveus/raindrop.spr b/main/sprites/co_niveus/raindrop.spr
new file mode 100644
index 00000000..bd499827
Binary files /dev/null and b/main/sprites/co_niveus/raindrop.spr differ
diff --git a/main/sprites/co_niveus/welddrip.spr b/main/sprites/co_niveus/welddrip.spr
new file mode 100644
index 00000000..b3ff9243
Binary files /dev/null and b/main/sprites/co_niveus/welddrip.spr differ
diff --git a/main/sprites/co_niveus/xsmoke1.spr b/main/sprites/co_niveus/xsmoke1.spr
new file mode 100644
index 00000000..5434df3e
Binary files /dev/null and b/main/sprites/co_niveus/xsmoke1.spr differ
diff --git a/main/sprites/co_ulysses/myrain.spr b/main/sprites/co_ulysses/myrain.spr
new file mode 100644
index 00000000..7eb4a0d3
Binary files /dev/null and b/main/sprites/co_ulysses/myrain.spr differ
diff --git a/main/sprites/comm-blip.spr b/main/sprites/comm-blip.spr
new file mode 100644
index 00000000..34a58b61
Binary files /dev/null and b/main/sprites/comm-blip.spr differ
diff --git a/main/sprites/commandbutton.spr b/main/sprites/commandbutton.spr
new file mode 100644
index 00000000..d2580936
Binary files /dev/null and b/main/sprites/commandbutton.spr differ
diff --git a/main/sprites/commandstatus.spr b/main/sprites/commandstatus.spr
new file mode 100644
index 00000000..53d8682f
Binary files /dev/null and b/main/sprites/commandstatus.spr differ
diff --git a/main/sprites/cursors.spr b/main/sprites/cursors.spr
new file mode 100644
index 00000000..8838b117
Binary files /dev/null and b/main/sprites/cursors.spr differ
diff --git a/main/sprites/digesting.spr b/main/sprites/digesting.spr
new file mode 100644
index 00000000..02009584
Binary files /dev/null and b/main/sprites/digesting.spr differ
diff --git a/main/sprites/dustlight.spr b/main/sprites/dustlight.spr
new file mode 100644
index 00000000..8085a534
Binary files /dev/null and b/main/sprites/dustlight.spr differ
diff --git a/main/sprites/flare1.spr b/main/sprites/flare1.spr
new file mode 100644
index 00000000..2f238210
Binary files /dev/null and b/main/sprites/flare1.spr differ
diff --git a/main/sprites/flare2.spr b/main/sprites/flare2.spr
new file mode 100644
index 00000000..d286e1f0
Binary files /dev/null and b/main/sprites/flare2.spr differ
diff --git a/main/sprites/flare3.spr b/main/sprites/flare3.spr
new file mode 100644
index 00000000..97d1db9a
Binary files /dev/null and b/main/sprites/flare3.spr differ
diff --git a/main/sprites/flare6.spr b/main/sprites/flare6.spr
new file mode 100644
index 00000000..e65f872a
Binary files /dev/null and b/main/sprites/flare6.spr differ
diff --git a/main/sprites/font_arial.dat b/main/sprites/font_arial.dat
new file mode 100644
index 00000000..19fe7504
Binary files /dev/null and b/main/sprites/font_arial.dat differ
diff --git a/main/sprites/font_arial.spr b/main/sprites/font_arial.spr
new file mode 100644
index 00000000..d619df87
Binary files /dev/null and b/main/sprites/font_arial.spr differ
diff --git a/main/sprites/font_arialsmall.dat b/main/sprites/font_arialsmall.dat
new file mode 100644
index 00000000..3ac0b1ed
Binary files /dev/null and b/main/sprites/font_arialsmall.dat differ
diff --git a/main/sprites/font_arialsmall.spr b/main/sprites/font_arialsmall.spr
new file mode 100644
index 00000000..99d06b37
Binary files /dev/null and b/main/sprites/font_arialsmall.spr differ
diff --git a/main/sprites/fov.spr b/main/sprites/fov.spr
new file mode 100644
index 00000000..fdd679de
Binary files /dev/null and b/main/sprites/fov.spr differ
diff --git a/main/sprites/green.spr b/main/sprites/green.spr
new file mode 100644
index 00000000..0cf7dc23
Binary files /dev/null and b/main/sprites/green.spr differ
diff --git a/main/sprites/hack.spr b/main/sprites/hack.spr
new file mode 100644
index 00000000..e3b3a7ea
Binary files /dev/null and b/main/sprites/hack.spr differ
diff --git a/main/sprites/haze.spr b/main/sprites/haze.spr
new file mode 100644
index 00000000..eae63a41
Binary files /dev/null and b/main/sprites/haze.spr differ
diff --git a/main/sprites/helpicons.spr b/main/sprites/helpicons.spr
new file mode 100644
index 00000000..25d0b92b
Binary files /dev/null and b/main/sprites/helpicons.spr differ
diff --git a/main/sprites/hera_fog.spr b/main/sprites/hera_fog.spr
new file mode 100644
index 00000000..fd530f9a
Binary files /dev/null and b/main/sprites/hera_fog.spr differ
diff --git a/main/sprites/hivehealth.spr b/main/sprites/hivehealth.spr
new file mode 100644
index 00000000..60f66aeb
Binary files /dev/null and b/main/sprites/hivehealth.spr differ
diff --git a/main/sprites/hiveinfo.spr b/main/sprites/hiveinfo.spr
new file mode 100644
index 00000000..cbde95e1
Binary files /dev/null and b/main/sprites/hiveinfo.spr differ
diff --git a/main/sprites/hud.txt b/main/sprites/hud.txt
new file mode 100644
index 00000000..2e680ee6
--- /dev/null
+++ b/main/sprites/hud.txt
@@ -0,0 +1,149 @@
+148
+selection			320 320hud1	160	220	80	20
+bucket1				320 320hud2	108	16	12	12
+bucket2				320 320hud2	108	28	12	12
+bucket3				320 320hud2	108	40	12	12
+bucket4				320 320hud2	108	52	12	12
+bucket5				320 320hud2	108	64	12	12
+bucket0				320 320hud2	108	76	12	12
+dmg_bio				320 320hud4	0	0	32	32
+dmg_poison			320 320hud4	0	0	32	32
+dmg_chem			320 320hud4	32	0	32	32
+dmg_cold			320 320hud4	64	0	32	32
+dmg_drown			320 320hud4	96	0	32	32
+dmg_heat			320 320hud4	128	0	32	32
+dmg_gas				320 320hud4	160	0	32	32
+dmg_rad				320 320hud4	192	0	32	32
+dmg_shock			320 320hud4	224	0	32	32
+number_0			320 320hud2	0	0	12	16
+number_1			320 320hud2	12	0	12	16
+number_2			320 320hud2	24	0	12	16
+number_3			320 320hud2	36	0	12	16
+number_4			320 320hud2	48	0	12	16
+number_5			320 320hud2	60	0	12	16
+number_6			320 320hud2	72	0	12	16
+number_7			320 320hud2	84	0	12	16
+number_8			320 320hud2	96	0	12	16
+number_9			320 320hud2	108	0	12	16
+divider				320 320hud2	120	0	1	20
+cross				320 320hud2	0	72	16	16
+d_skull				320 640hud7	72	25	12	12
+flash_full			320 320hud2	16	72	18	16
+flash_empty			320 320hud2	34	72	18	16
+flash_beam			320 320hud2	52	72	6	16
+title_half			320 320hud3	0	48	128	16
+title_life			320 320hud3	128	48	116	16
+d_knife				320 640aw3-s	100	232	64	24
+d_handgrenade       320 640aw1  192	231	64	24
+d_grenade       	320 640aw3-s    192	192	64	24
+d_grenadegun		320 640aw3-s	192	192	64	24
+d_machinegun		320 640aw3-s	192	96	64	24
+d_pistol			320 640aw3-s	192  	168	64	24
+d_heavymachinegun	320 640aw3-s	0	230	101	26
+d_shotgun			320 640aw3-s	164	231	80	26
+d_tripmine			320 640aw3-s	192	145	64	24
+d_item_mine			320 640aw3-s	192	145	64	24
+d_welder			320 640aw3-s	192	120	64	24
+d_turret			320 640aw3-s	172	0	18	32
+d_offensechamber	320 640aw3-s	192	24	64	24
+d_sporegunprojectile		320 640aw3-s	192	0	64	24
+d_healingspray		320 640aw3-s	192	72	64	24
+d_parasite			320 640aw3-s	192	48	64	24
+d_siegeturret		320 640aw3	143	224	48	32
+d_spitgunspit		320 640aw3	192	102	64	24
+d_claws				320 640aw3	176	48	80	32
+d_bitegun			320 640aw3	192	0	64	24
+d_bite2gun			320 640aw3	192	24	64	24
+d_spikegun			320 640aw3	192	183	64	24
+d_spikeprojectile	320 640aw3	192	183	64	24
+d_swipe				320 640aw3	0	225	64	24
+d_divinewind		320 640aw3	192	127	64	24
+d_bilebomb			320 640aw3 	192	207	64	24
+d_acidrocket		320 640aw3	61	225	64	24
+d_leap				320 640aw3	192	80	64	24
+d_charge			320 640aw3 	176	151	80	32
+d_babblerprojectile	320 640aw3	192	231	64	24
+d_devour			320 640aw3	192	231	64	24
+d_nuke				320 320w-s	80	160	32	32
+d_tracktrain			320 320w-s	112	160	32	16
+d_team_advturretfactory	320 320w-s	80	240	32	16
+d_team_turretfactory	320 320w-s	80	240	32	16
+d_resourcetower		320 320w-s	80	240	32	16
+suit_full			320 320hud2	0	88	16	16
+suit_empty			320 320hud2	16	88	16	16
+
+//===========================================
+
+selection			640 640hud3	0	180	170	45
+bucket1				640 640hud7	168	72	20	20
+bucket2				640 640hud7	188	72	20	20
+bucket3				640 640hud7	208	72	20	20
+bucket4				640 640hud7	168	92	20	20
+bucket5				640 640hud7	188	92	20	20
+bucket0				640 640hud7	208	92	20	20
+dmg_poison			640 640hud8	128	0	64	64
+dmg_bio				640 640hud8	128	0	64	64
+dmg_chem			640 640hud8	0	0	64	64
+dmg_drown			640 640hud8	64	0	64	64
+dmg_gas				640 640hud9	0	0	64	64
+dmg_cold			640 640hud9	64	0	64	64
+dmg_heat			640 640hud9	128	0	64	64
+dmg_rad				640 640hud9	192	0	64	64
+dmg_shock			640 640hud8	192	0	64	64
+number_0			640 640hud7	0	0	24	25
+number_1			640 640hud7	24	0	24	25
+number_2			640 640hud7	48	0	24	25
+number_3			640 640hud7	72	0	24	25
+number_4			640 640hud7	96	0	24	25
+number_5			640 640hud7	120	0	24	25
+number_6			640 640hud7	144	0	24	25
+number_7			640 640hud7	168	0	24	25
+number_8			640 640hud7	192	0	24	25
+number_9			640 640hud7	216	0	24	25
+divider				640 640hud7	240	0	2	40
+cross				640 640hud7	48	25	24	24
+d_skull			640 640hud7	72	25	12	12
+flash_full			640 640hud7	160	25	32	32
+flash_empty			640 640hud7	112	25	32	32
+flash_beam			640 640hud7	144	25	16	32
+title_half			640 640hud4	0	226	256	30
+title_life			640 640hud5	0	226	220	30
+d_knife				640 640aw3-s	100	232	64	24
+d_handgrenade       640 640aw1  192	231	64	24
+d_grenade       	640 640aw3-s   192	192	64	24
+d_grenadegun		640 640aw3-s	192	192	64	24
+d_machinegun		640 640aw3-s	192	96	64	24
+d_pistol			640 640aw3-s	192  	168	64	24
+d_heavymachinegun	640 640aw3-s	0	230	101	26
+d_shotgun			640 640aw3-s	164	231	80	26
+d_tripmine			640 640aw3-s	192	145	64	24
+d_item_mine			640 640aw3-s	192	145	64	24
+d_welder			640 640aw3-s	192	120	64	24
+d_turret			640 640aw3-s	172	0	18	32
+d_offensechamber	640 640aw3-s	192	24	64	24
+d_sporegunprojectile		640 640aw3-s	192	0	64	24
+d_healingspray		640 640aw3-s	192	72	64	24
+d_parasite			640 640aw3-s	192	48	64	24
+d_siegeturret		640 640aw3	143	224	48	32
+d_spitgunspit	640 640aw3	192	102	64	24
+d_claws				640 640aw3	176	48	80	32
+d_bitegun			640 640aw3	192	0	64	24
+d_bite2gun			640 640aw3	192	24	64	24
+d_spikegun			640 640aw3	192	183	64	17
+d_spikeprojectile	640 640aw3	192	183	64	17
+d_swipe				640 640aw3	0	225	64	24
+d_divinewind		640 640aw3	192	127	64	24
+d_bilebomb			640 640aw3 	192	200	64	25
+d_acidrocket		640 640aw3	61	225	64	24
+d_leap				640 640aw3	192	80	64	24
+d_charge			640 640aw3 	176	151	80	32
+d_babblerprojectile	640 640aw3	192	231	64	24
+d_devour			640 640aw3	192	224	64	32
+d_nuke				640 320w-s	80	160	32	32
+d_tracktrain		640 640hud1	192	240	32	16
+d_team_advturretfactory	640 320w-s	80	240	32	16
+d_team_turretfactory	640 320w-s	80	240	32	16
+d_resourcetower		640 320w-s	80	240	32	16
+suit_full			640 640hud7	0	25	24	24
+suit_empty			640 640hud7	24	25	24	24
+
diff --git a/main/sprites/hudorder.spr b/main/sprites/hudorder.spr
new file mode 100644
index 00000000..cd318c30
Binary files /dev/null and b/main/sprites/hudorder.spr differ
diff --git a/main/sprites/iplayera.spr b/main/sprites/iplayera.spr
new file mode 100644
index 00000000..179eec68
Binary files /dev/null and b/main/sprites/iplayera.spr differ
diff --git a/main/sprites/iplayerdead.spr b/main/sprites/iplayerdead.spr
new file mode 100644
index 00000000..a5829916
Binary files /dev/null and b/main/sprites/iplayerdead.spr differ
diff --git a/main/sprites/iplayerm.spr b/main/sprites/iplayerm.spr
new file mode 100644
index 00000000..41d20a4a
Binary files /dev/null and b/main/sprites/iplayerm.spr differ
diff --git a/main/sprites/itech.spr b/main/sprites/itech.spr
new file mode 100644
index 00000000..7afa6c48
Binary files /dev/null and b/main/sprites/itech.spr differ
diff --git a/main/sprites/lightsmoke.spr b/main/sprites/lightsmoke.spr
new file mode 100644
index 00000000..7f840e83
Binary files /dev/null and b/main/sprites/lightsmoke.spr differ
diff --git a/main/sprites/logout.spr b/main/sprites/logout.spr
new file mode 100644
index 00000000..6fd1fd72
Binary files /dev/null and b/main/sprites/logout.spr differ
diff --git a/main/sprites/mainhud.spr b/main/sprites/mainhud.spr
new file mode 100644
index 00000000..ed437bb0
Binary files /dev/null and b/main/sprites/mainhud.spr differ
diff --git a/main/sprites/marinenode.spr b/main/sprites/marinenode.spr
new file mode 100644
index 00000000..06ab3e27
Binary files /dev/null and b/main/sprites/marinenode.spr differ
diff --git a/main/sprites/membrane.spr b/main/sprites/membrane.spr
new file mode 100644
index 00000000..3d2f3426
Binary files /dev/null and b/main/sprites/membrane.spr differ
diff --git a/main/sprites/minimaps/co_angst.spr b/main/sprites/minimaps/co_angst.spr
new file mode 100644
index 00000000..37a45a84
Binary files /dev/null and b/main/sprites/minimaps/co_angst.spr differ
diff --git a/main/sprites/minimaps/co_core.spr b/main/sprites/minimaps/co_core.spr
new file mode 100644
index 00000000..0d960be8
Binary files /dev/null and b/main/sprites/minimaps/co_core.spr differ
diff --git a/main/sprites/minimaps/co_daimos.spr b/main/sprites/minimaps/co_daimos.spr
new file mode 100644
index 00000000..e8b65047
Binary files /dev/null and b/main/sprites/minimaps/co_daimos.spr differ
diff --git a/main/sprites/minimaps/co_faceoff.spr b/main/sprites/minimaps/co_faceoff.spr
new file mode 100644
index 00000000..23971423
Binary files /dev/null and b/main/sprites/minimaps/co_faceoff.spr differ
diff --git a/main/sprites/minimaps/co_kestrel.spr b/main/sprites/minimaps/co_kestrel.spr
new file mode 100644
index 00000000..2c2acff5
Binary files /dev/null and b/main/sprites/minimaps/co_kestrel.spr differ
diff --git a/main/sprites/minimaps/co_pulse.spr b/main/sprites/minimaps/co_pulse.spr
new file mode 100644
index 00000000..2fc05dd3
Binary files /dev/null and b/main/sprites/minimaps/co_pulse.spr differ
diff --git a/main/sprites/minimaps/co_tasium.spr b/main/sprites/minimaps/co_tasium.spr
new file mode 100644
index 00000000..e807c89f
Binary files /dev/null and b/main/sprites/minimaps/co_tasium.spr differ
diff --git a/main/sprites/minimaps/co_ulysses.spr b/main/sprites/minimaps/co_ulysses.spr
new file mode 100644
index 00000000..9d06bd18
Binary files /dev/null and b/main/sprites/minimaps/co_ulysses.spr differ
diff --git a/main/sprites/minimaps/ns_agora.spr b/main/sprites/minimaps/ns_agora.spr
new file mode 100644
index 00000000..dd4e5373
Binary files /dev/null and b/main/sprites/minimaps/ns_agora.spr differ
diff --git a/main/sprites/minimaps/ns_altair.spr b/main/sprites/minimaps/ns_altair.spr
new file mode 100644
index 00000000..2cdde31a
Binary files /dev/null and b/main/sprites/minimaps/ns_altair.spr differ
diff --git a/main/sprites/minimaps/ns_ayumi.spr b/main/sprites/minimaps/ns_ayumi.spr
new file mode 100644
index 00000000..f4cc8ecd
Binary files /dev/null and b/main/sprites/minimaps/ns_ayumi.spr differ
diff --git a/main/sprites/minimaps/ns_bast.spr b/main/sprites/minimaps/ns_bast.spr
new file mode 100644
index 00000000..2cfc20f5
Binary files /dev/null and b/main/sprites/minimaps/ns_bast.spr differ
diff --git a/main/sprites/minimaps/ns_caged.spr b/main/sprites/minimaps/ns_caged.spr
new file mode 100644
index 00000000..cebe411b
Binary files /dev/null and b/main/sprites/minimaps/ns_caged.spr differ
diff --git a/main/sprites/minimaps/ns_delta.spr b/main/sprites/minimaps/ns_delta.spr
new file mode 100644
index 00000000..631783bd
Binary files /dev/null and b/main/sprites/minimaps/ns_delta.spr differ
diff --git a/main/sprites/minimaps/ns_eclipse.spr b/main/sprites/minimaps/ns_eclipse.spr
new file mode 100644
index 00000000..1c714545
Binary files /dev/null and b/main/sprites/minimaps/ns_eclipse.spr differ
diff --git a/main/sprites/minimaps/ns_eon.spr b/main/sprites/minimaps/ns_eon.spr
new file mode 100644
index 00000000..289160a6
Binary files /dev/null and b/main/sprites/minimaps/ns_eon.spr differ
diff --git a/main/sprites/minimaps/ns_eon_b6.spr b/main/sprites/minimaps/ns_eon_b6.spr
new file mode 100644
index 00000000..d33dffb4
Binary files /dev/null and b/main/sprites/minimaps/ns_eon_b6.spr differ
diff --git a/main/sprites/minimaps/ns_hera.spr b/main/sprites/minimaps/ns_hera.spr
new file mode 100644
index 00000000..8b1c1480
Binary files /dev/null and b/main/sprites/minimaps/ns_hera.spr differ
diff --git a/main/sprites/minimaps/ns_lost.spr b/main/sprites/minimaps/ns_lost.spr
new file mode 100644
index 00000000..336a1516
Binary files /dev/null and b/main/sprites/minimaps/ns_lost.spr differ
diff --git a/main/sprites/minimaps/ns_metal.spr b/main/sprites/minimaps/ns_metal.spr
new file mode 100644
index 00000000..5c0e5e15
Binary files /dev/null and b/main/sprites/minimaps/ns_metal.spr differ
diff --git a/main/sprites/minimaps/ns_mineshaft.spr b/main/sprites/minimaps/ns_mineshaft.spr
new file mode 100644
index 00000000..24bfdb11
Binary files /dev/null and b/main/sprites/minimaps/ns_mineshaft.spr differ
diff --git a/main/sprites/minimaps/ns_nancy.spr b/main/sprites/minimaps/ns_nancy.spr
new file mode 100644
index 00000000..18e0bd0d
Binary files /dev/null and b/main/sprites/minimaps/ns_nancy.spr differ
diff --git a/main/sprites/minimaps/ns_nothing.spr b/main/sprites/minimaps/ns_nothing.spr
new file mode 100644
index 00000000..81c75b54
Binary files /dev/null and b/main/sprites/minimaps/ns_nothing.spr differ
diff --git a/main/sprites/minimaps/ns_origin.spr b/main/sprites/minimaps/ns_origin.spr
new file mode 100644
index 00000000..dcd5a008
Binary files /dev/null and b/main/sprites/minimaps/ns_origin.spr differ
diff --git a/main/sprites/minimaps/ns_tanith.spr b/main/sprites/minimaps/ns_tanith.spr
new file mode 100644
index 00000000..3e62ef61
Binary files /dev/null and b/main/sprites/minimaps/ns_tanith.spr differ
diff --git a/main/sprites/minimaps/ns_veil.spr b/main/sprites/minimaps/ns_veil.spr
new file mode 100644
index 00000000..02c441d6
Binary files /dev/null and b/main/sprites/minimaps/ns_veil.spr differ
diff --git a/main/sprites/muzzleflash1.spr b/main/sprites/muzzleflash1.spr
new file mode 100644
index 00000000..dadc41f9
Binary files /dev/null and b/main/sprites/muzzleflash1.spr differ
diff --git a/main/sprites/muzzleflash2.spr b/main/sprites/muzzleflash2.spr
new file mode 100644
index 00000000..dadc41f9
Binary files /dev/null and b/main/sprites/muzzleflash2.spr differ
diff --git a/main/sprites/muzzleflash3.spr b/main/sprites/muzzleflash3.spr
new file mode 100644
index 00000000..dadc41f9
Binary files /dev/null and b/main/sprites/muzzleflash3.spr differ
diff --git a/main/sprites/ns.spr b/main/sprites/ns.spr
new file mode 100644
index 00000000..c39b7009
Binary files /dev/null and b/main/sprites/ns.spr differ
diff --git a/main/sprites/ns_agora/xsmoke1.spr b/main/sprites/ns_agora/xsmoke1.spr
new file mode 100644
index 00000000..5434df3e
Binary files /dev/null and b/main/sprites/ns_agora/xsmoke1.spr differ
diff --git a/main/sprites/ns_ayumi/ayumiglow.spr b/main/sprites/ns_ayumi/ayumiglow.spr
new file mode 100644
index 00000000..0c0bc5fd
Binary files /dev/null and b/main/sprites/ns_ayumi/ayumiglow.spr differ
diff --git a/main/sprites/ns_ayumi/ayumiglow2.spr b/main/sprites/ns_ayumi/ayumiglow2.spr
new file mode 100644
index 00000000..fd52179f
Binary files /dev/null and b/main/sprites/ns_ayumi/ayumiglow2.spr differ
diff --git a/main/sprites/ns_bast/ballsmoke.spr b/main/sprites/ns_bast/ballsmoke.spr
new file mode 100644
index 00000000..9603a5c1
Binary files /dev/null and b/main/sprites/ns_bast/ballsmoke.spr differ
diff --git a/main/sprites/ns_bast/blueflare2.spr b/main/sprites/ns_bast/blueflare2.spr
new file mode 100644
index 00000000..b3ff9243
Binary files /dev/null and b/main/sprites/ns_bast/blueflare2.spr differ
diff --git a/main/sprites/ns_bast/bubble.spr b/main/sprites/ns_bast/bubble.spr
new file mode 100644
index 00000000..b8f5543a
Binary files /dev/null and b/main/sprites/ns_bast/bubble.spr differ
diff --git a/main/sprites/ns_bast/circle.spr b/main/sprites/ns_bast/circle.spr
new file mode 100644
index 00000000..21b5aa99
Binary files /dev/null and b/main/sprites/ns_bast/circle.spr differ
diff --git a/main/sprites/ns_bast/eexplo.spr b/main/sprites/ns_bast/eexplo.spr
new file mode 100644
index 00000000..0502426f
Binary files /dev/null and b/main/sprites/ns_bast/eexplo.spr differ
diff --git a/main/sprites/ns_bast/explo.spr b/main/sprites/ns_bast/explo.spr
new file mode 100644
index 00000000..0502426f
Binary files /dev/null and b/main/sprites/ns_bast/explo.spr differ
diff --git a/main/sprites/ns_bast/glow02.spr b/main/sprites/ns_bast/glow02.spr
new file mode 100644
index 00000000..ee0cc6ff
Binary files /dev/null and b/main/sprites/ns_bast/glow02.spr differ
diff --git a/main/sprites/ns_bast/moths.spr b/main/sprites/ns_bast/moths.spr
new file mode 100644
index 00000000..05d886a7
Binary files /dev/null and b/main/sprites/ns_bast/moths.spr differ
diff --git a/main/sprites/ns_bast/muz2.spr b/main/sprites/ns_bast/muz2.spr
new file mode 100644
index 00000000..5c55a1c5
Binary files /dev/null and b/main/sprites/ns_bast/muz2.spr differ
diff --git a/main/sprites/ns_bast/raindrop.spr b/main/sprites/ns_bast/raindrop.spr
new file mode 100644
index 00000000..bd499827
Binary files /dev/null and b/main/sprites/ns_bast/raindrop.spr differ
diff --git a/main/sprites/ns_bast/rjet1.spr b/main/sprites/ns_bast/rjet1.spr
new file mode 100644
index 00000000..ddbb397c
Binary files /dev/null and b/main/sprites/ns_bast/rjet1.spr differ
diff --git a/main/sprites/ns_bast/wdrip2.spr b/main/sprites/ns_bast/wdrip2.spr
new file mode 100644
index 00000000..96242ae5
Binary files /dev/null and b/main/sprites/ns_bast/wdrip2.spr differ
diff --git a/main/sprites/ns_bast/xsmoke1.spr b/main/sprites/ns_bast/xsmoke1.spr
new file mode 100644
index 00000000..5434df3e
Binary files /dev/null and b/main/sprites/ns_bast/xsmoke1.spr differ
diff --git a/main/sprites/ns_bast/xsmoke3.spr b/main/sprites/ns_bast/xsmoke3.spr
new file mode 100644
index 00000000..e6a9fed1
Binary files /dev/null and b/main/sprites/ns_bast/xsmoke3.spr differ
diff --git a/main/sprites/ns_metal/flare3metal.spr b/main/sprites/ns_metal/flare3metal.spr
new file mode 100644
index 00000000..24f3f7ee
Binary files /dev/null and b/main/sprites/ns_metal/flare3metal.spr differ
diff --git a/main/sprites/ns_nothing/glow03.spr b/main/sprites/ns_nothing/glow03.spr
new file mode 100644
index 00000000..0efe3cba
Binary files /dev/null and b/main/sprites/ns_nothing/glow03.spr differ
diff --git a/main/sprites/ns_nothing/redflare2.spr b/main/sprites/ns_nothing/redflare2.spr
new file mode 100644
index 00000000..7bebad3d
Binary files /dev/null and b/main/sprites/ns_nothing/redflare2.spr differ
diff --git a/main/sprites/ns_tanith/haze.spr b/main/sprites/ns_tanith/haze.spr
new file mode 100644
index 00000000..eae63a41
Binary files /dev/null and b/main/sprites/ns_tanith/haze.spr differ
diff --git a/main/sprites/ns_tanith/orflare3.spr b/main/sprites/ns_tanith/orflare3.spr
new file mode 100644
index 00000000..f19bed89
Binary files /dev/null and b/main/sprites/ns_tanith/orflare3.spr differ
diff --git a/main/sprites/ns_tanith/td_dust.spr b/main/sprites/ns_tanith/td_dust.spr
new file mode 100644
index 00000000..af8c5d18
Binary files /dev/null and b/main/sprites/ns_tanith/td_dust.spr differ
diff --git a/main/sprites/nsarms6.spr b/main/sprites/nsarms6.spr
new file mode 100644
index 00000000..33cda1de
Binary files /dev/null and b/main/sprites/nsarms6.spr differ
diff --git a/main/sprites/nsteleport.spr b/main/sprites/nsteleport.spr
new file mode 100644
index 00000000..c39828ee
Binary files /dev/null and b/main/sprites/nsteleport.spr differ
diff --git a/main/sprites/pheromone.spr b/main/sprites/pheromone.spr
new file mode 100644
index 00000000..c9a65794
Binary files /dev/null and b/main/sprites/pheromone.spr differ
diff --git a/main/sprites/raindrop.spr b/main/sprites/raindrop.spr
new file mode 100644
index 00000000..5b7922ef
Binary files /dev/null and b/main/sprites/raindrop.spr differ
diff --git a/main/sprites/raindrop2.spr b/main/sprites/raindrop2.spr
new file mode 100644
index 00000000..0545b05d
Binary files /dev/null and b/main/sprites/raindrop2.spr differ
diff --git a/main/sprites/reticle.spr b/main/sprites/reticle.spr
new file mode 100644
index 00000000..b2ae03db
Binary files /dev/null and b/main/sprites/reticle.spr differ
diff --git a/main/sprites/scan.spr b/main/sprites/scan.spr
new file mode 100644
index 00000000..fa15723a
Binary files /dev/null and b/main/sprites/scan.spr differ
diff --git a/main/sprites/selectall.spr b/main/sprites/selectall.spr
new file mode 100644
index 00000000..66ac7b0c
Binary files /dev/null and b/main/sprites/selectall.spr differ
diff --git a/main/sprites/small640alienconnector.spr b/main/sprites/small640alienconnector.spr
new file mode 100644
index 00000000..577fba79
Binary files /dev/null and b/main/sprites/small640alienconnector.spr differ
diff --git a/main/sprites/spikehit.spr b/main/sprites/spikehit.spr
new file mode 100644
index 00000000..5197cc90
Binary files /dev/null and b/main/sprites/spikehit.spr differ
diff --git a/main/sprites/spithit.spr b/main/sprites/spithit.spr
new file mode 100644
index 00000000..88c69e92
Binary files /dev/null and b/main/sprites/spithit.spr differ
diff --git a/main/sprites/spore.spr b/main/sprites/spore.spr
new file mode 100644
index 00000000..6f187b7f
Binary files /dev/null and b/main/sprites/spore.spr differ
diff --git a/main/sprites/spore2.spr b/main/sprites/spore2.spr
new file mode 100644
index 00000000..397f4fb4
Binary files /dev/null and b/main/sprites/spore2.spr differ
diff --git a/main/sprites/steam1.spr b/main/sprites/steam1.spr
new file mode 100644
index 00000000..c54eef59
Binary files /dev/null and b/main/sprites/steam1.spr differ
diff --git a/main/sprites/stomp.spr b/main/sprites/stomp.spr
new file mode 100644
index 00000000..30552353
Binary files /dev/null and b/main/sprites/stomp.spr differ
diff --git a/main/sprites/structurescursor.spr b/main/sprites/structurescursor.spr
new file mode 100644
index 00000000..5ce36fbf
Binary files /dev/null and b/main/sprites/structurescursor.spr differ
diff --git a/main/sprites/techtree/tech0s.spr b/main/sprites/techtree/tech0s.spr
new file mode 100644
index 00000000..73caef78
Binary files /dev/null and b/main/sprites/techtree/tech0s.spr differ
diff --git a/main/sprites/techtree/tech20s.spr b/main/sprites/techtree/tech20s.spr
new file mode 100644
index 00000000..7a81c56d
Binary files /dev/null and b/main/sprites/techtree/tech20s.spr differ
diff --git a/main/sprites/techtree/tech30s.spr b/main/sprites/techtree/tech30s.spr
new file mode 100644
index 00000000..fa78ac95
Binary files /dev/null and b/main/sprites/techtree/tech30s.spr differ
diff --git a/main/sprites/techtree/tech40s.spr b/main/sprites/techtree/tech40s.spr
new file mode 100644
index 00000000..a9de8f95
Binary files /dev/null and b/main/sprites/techtree/tech40s.spr differ
diff --git a/main/sprites/techtree/tech50s.spr b/main/sprites/techtree/tech50s.spr
new file mode 100644
index 00000000..d7dde793
Binary files /dev/null and b/main/sprites/techtree/tech50s.spr differ
diff --git a/main/sprites/techtree/tech60s.spr b/main/sprites/techtree/tech60s.spr
new file mode 100644
index 00000000..73c2177d
Binary files /dev/null and b/main/sprites/techtree/tech60s.spr differ
diff --git a/main/sprites/techtree/tech80s.spr b/main/sprites/techtree/tech80s.spr
new file mode 100644
index 00000000..a031a96f
Binary files /dev/null and b/main/sprites/techtree/tech80s.spr differ
diff --git a/main/sprites/tile.spr b/main/sprites/tile.spr
new file mode 100644
index 00000000..538e0f69
Binary files /dev/null and b/main/sprites/tile.spr differ
diff --git a/main/sprites/tinyspit.spr b/main/sprites/tinyspit.spr
new file mode 100644
index 00000000..6b78c7f9
Binary files /dev/null and b/main/sprites/tinyspit.spr differ
diff --git a/main/sprites/topdownbg.spr b/main/sprites/topdownbg.spr
new file mode 100644
index 00000000..13aa5212
Binary files /dev/null and b/main/sprites/topdownbg.spr differ
diff --git a/main/sprites/topdownbottom.spr b/main/sprites/topdownbottom.spr
new file mode 100644
index 00000000..3d5ef2b9
Binary files /dev/null and b/main/sprites/topdownbottom.spr differ
diff --git a/main/sprites/topdowntop.spr b/main/sprites/topdowntop.spr
new file mode 100644
index 00000000..ce4e601e
Binary files /dev/null and b/main/sprites/topdowntop.spr differ
diff --git a/main/sprites/turretsmoke.spr b/main/sprites/turretsmoke.spr
new file mode 100644
index 00000000..8e1f03a6
Binary files /dev/null and b/main/sprites/turretsmoke.spr differ
diff --git a/main/sprites/umbra.spr b/main/sprites/umbra.spr
new file mode 100644
index 00000000..4fd68649
Binary files /dev/null and b/main/sprites/umbra.spr differ
diff --git a/main/sprites/umbra2.spr b/main/sprites/umbra2.spr
new file mode 100644
index 00000000..4bb3ecc9
Binary files /dev/null and b/main/sprites/umbra2.spr differ
diff --git a/main/sprites/upgrades.spr b/main/sprites/upgrades.spr
new file mode 100644
index 00000000..bd71d657
Binary files /dev/null and b/main/sprites/upgrades.spr differ
diff --git a/main/sprites/voiceicon.spr b/main/sprites/voiceicon.spr
new file mode 100644
index 00000000..a2e46c02
Binary files /dev/null and b/main/sprites/voiceicon.spr differ
diff --git a/main/sprites/wallpuff.spr b/main/sprites/wallpuff.spr
new file mode 100644
index 00000000..58fc121e
Binary files /dev/null and b/main/sprites/wallpuff.spr differ
diff --git a/main/sprites/weapon_acidrocketgun.txt b/main/sprites/weapon_acidrocketgun.txt
new file mode 100644
index 00000000..6c442778
--- /dev/null
+++ b/main/sprites/weapon_acidrocketgun.txt
@@ -0,0 +1,9 @@
+8
+weapon			320 320w	0	180	80	20
+weapon_s		320 320w-s	0	180	80	20
+ammo			320 640hud7	96	96	24	24
+crosshair		320 xhairacid	0	0	128	128
+weapon			640 640aw4	0	90	170	45
+weapon_s		640 640aw4-s	0	90	170	45
+ammo			640 640hud7	96	96	24	24
+crosshair		640 xhairacid	0	0	128	128
\ No newline at end of file
diff --git a/main/sprites/weapon_bilebombgun.txt b/main/sprites/weapon_bilebombgun.txt
new file mode 100644
index 00000000..8fbcf215
--- /dev/null
+++ b/main/sprites/weapon_bilebombgun.txt
@@ -0,0 +1,9 @@
+10
+weapon			320 320w	0	40	80	20
+weapon_s		320 320w-s	0	40	80	20
+ammo			320 320hud2	0	16	18	18
+crosshair		320 xhairbile	0	0	128	64
+weapon			640 640aw4	0	0	170	45
+weapon_s		640 640aw4-s	0	0	170	45
+ammo			640 640hud7	0	72	24	24
+crosshair		640 xhairbile	0	0	128	64
diff --git a/main/sprites/weapon_bite2gun.txt b/main/sprites/weapon_bite2gun.txt
new file mode 100644
index 00000000..e2babebc
--- /dev/null
+++ b/main/sprites/weapon_bite2gun.txt
@@ -0,0 +1,7 @@
+6
+weapon			320 320w	0	120	80	20
+weapon_s		320 320w-s	0	120	80	20
+ammo			320 640hud7	96	96	24	24
+weapon			640 640aw1	0	180	170	45
+weapon_s		640 640aw1-s	0	180	170	45
+ammo			640 640hud7	96	96	24	24
diff --git a/main/sprites/weapon_bitegun.txt b/main/sprites/weapon_bitegun.txt
new file mode 100644
index 00000000..11159479
--- /dev/null
+++ b/main/sprites/weapon_bitegun.txt
@@ -0,0 +1,7 @@
+6
+weapon			320 320w	0	60	80	20
+weapon_s		320 320w-s	0	60	80	20
+ammo			320 640hud7	96	96	24	24
+weapon			640 640aw1	0	45	170	45
+weapon_s		640 640aw1-s	0	45	170	45
+ammo			640 640hud7	96	96	24	24
diff --git a/main/sprites/weapon_blink.txt b/main/sprites/weapon_blink.txt
new file mode 100644
index 00000000..c9b872d0
--- /dev/null
+++ b/main/sprites/weapon_blink.txt
@@ -0,0 +1,9 @@
+8
+weapon			320 320w	0	80	80	20
+weapon_s		320 320w-s	0	80	80	20
+ammo			320 640hud7	96	96	24	24
+autoaim			320 crosshairs	0	72	24	24
+weapon			640 640aw3	0	45	170	45
+weapon_s		640 640aw3-s	0	45	170	45
+ammo			640 640hud7	96	96	24	24
+autoaim			640 crosshairs	0	72	24	24
diff --git a/main/sprites/weapon_charge.txt b/main/sprites/weapon_charge.txt
new file mode 100644
index 00000000..aa50b203
--- /dev/null
+++ b/main/sprites/weapon_charge.txt
@@ -0,0 +1,7 @@
+6
+weapon			320 320w	0	100	80	20
+weapon_s		320 320w-s	0	100	80	20
+ammo			320 640hud7	96	96	24	24
+weapon			640 640aw2	0	90	170	45
+weapon_s		640 640aw2-s	0	90	170	45
+ammo			640 640hud7	96	96	24	24
diff --git a/main/sprites/weapon_claws.txt b/main/sprites/weapon_claws.txt
new file mode 100644
index 00000000..f1eebce3
--- /dev/null
+++ b/main/sprites/weapon_claws.txt
@@ -0,0 +1,7 @@
+6
+weapon			320 320w	80	140	80	20
+weapon_s		320 320w-s	80	140	80	20
+ammo			320 640hud7	96	96	24	24
+weapon			640 640aw1	0	135	170	45
+weapon_s		640 640aw1-s	0	135	170	45
+ammo			640 640hud7	96	96	24	24
diff --git a/main/sprites/weapon_devour.txt b/main/sprites/weapon_devour.txt
new file mode 100644
index 00000000..60be8f60
--- /dev/null
+++ b/main/sprites/weapon_devour.txt
@@ -0,0 +1,7 @@
+6
+weapon			320 320w	0	20	80	20
+weapon_s		320 320w-s	0	20	80	20
+ammo			320 640hud7	96	96	24	24
+weapon			640 640aw2	0	135	170	45
+weapon_s		640 640aw2-s	0	135	170	45
+ammo			640 640hud7	96	96	24	24
diff --git a/main/sprites/weapon_divinewind.txt b/main/sprites/weapon_divinewind.txt
new file mode 100644
index 00000000..ed37a843
--- /dev/null
+++ b/main/sprites/weapon_divinewind.txt
@@ -0,0 +1,7 @@
+6
+weapon			320 320w	0	140	80	20
+weapon_s		320 320w-s	0	140	80	20
+ammo			320 640hud7	96	96	24	24
+weapon			640 640aw3	0	135	170	45
+weapon_s		640 640aw3-s	0	135	170	45
+ammo			640 640hud7	96	96	24	24
diff --git a/main/sprites/weapon_grenade.txt b/main/sprites/weapon_grenade.txt
new file mode 100644
index 00000000..ae1b06d3
--- /dev/null
+++ b/main/sprites/weapon_grenade.txt
@@ -0,0 +1,10 @@
+9
+weapon			320 320w	160	160	80	20
+weapon_s		320 320w-s	160	160	80	20
+ammo			320 640hud7	72	96	24	24
+autoaim			320 crosshairs	0	0	24	24
+weapon			640 640mw1	0	180	170	45
+weapon_s		640 640mw1-s	0	180	170	45
+ammo			640 640hud7	72	96	24	24
+autoaim			640 crosshairs	0	72	24	24
+autoaim			640 crosshairs	0	72	24	24
diff --git a/main/sprites/weapon_grenadegun.txt b/main/sprites/weapon_grenadegun.txt
new file mode 100644
index 00000000..d203502a
--- /dev/null
+++ b/main/sprites/weapon_grenadegun.txt
@@ -0,0 +1,11 @@
+10
+weapon			320 320w	160	120	80	20
+weapon_s		320 320w-s	160	120	80	20
+ammo			320 640hud7	72	96	24	24
+crosshair		320 xhairgl	0	0	64	64
+autoaim			320 crosshairs	0	0	24	24
+weapon			640 640mw1	0	0	170	45
+weapon_s		640 640mw1-s	0	0	170	45
+ammo			640 640hud7	72	96	24	24
+crosshair		640 xhairgl	0	0	64	0
+autoaim			640 crosshairs	0	72	24	24
diff --git a/main/sprites/weapon_healingspray.txt b/main/sprites/weapon_healingspray.txt
new file mode 100644
index 00000000..5be43ebf
--- /dev/null
+++ b/main/sprites/weapon_healingspray.txt
@@ -0,0 +1,7 @@
+8
+weapon			320 320w	0	200	80	20
+weapon_s		320 320w-s	0	200	80	20
+ammo			320 640hud7	96	96	24	24
+weapon			640	640aw4		0	135	170	45
+weapon_s		640	640aw4-s	0	135	170	45
+ammo			640 640hud7	96	96	24	24
diff --git a/main/sprites/weapon_heavymachinegun.txt b/main/sprites/weapon_heavymachinegun.txt
new file mode 100644
index 00000000..543eff32
--- /dev/null
+++ b/main/sprites/weapon_heavymachinegun.txt
@@ -0,0 +1,11 @@
+10
+weapon			320 320w	160	100	80	20
+weapon_s		320 320w-s	160	100	80	20
+ammo			320 640hud7	0	96	24	24
+crosshair		320 xhairhmg 	0	0	64	64
+autoaim			320 crosshairs	0	72	24	24
+weapon			640 640mw2	0	45	170	45
+weapon_s		640 640mw2-s	0	45	170	45
+ammo			640 640hud7	0	96	24	24
+crosshair		640 xhairhmg 	0	0	64	64
+autoaim			640 crosshairs	0	72	24	24
diff --git a/main/sprites/weapon_hivegun.txt b/main/sprites/weapon_hivegun.txt
new file mode 100644
index 00000000..04a12886
--- /dev/null
+++ b/main/sprites/weapon_hivegun.txt
@@ -0,0 +1,7 @@
+6
+weapon			320 320hud1	0	200	80	20
+weapon_s		320 320hud1	0	220	80	20
+ammo			320 640hud7	96	96	24	24
+weapon			640 640mw1	0	180	170	45
+weapon_s		640 640mw1-s	0	180	170	45
+ammo			640 640hud7	96	96	24	24
diff --git a/main/sprites/weapon_knife.txt b/main/sprites/weapon_knife.txt
new file mode 100644
index 00000000..0fba1a00
--- /dev/null
+++ b/main/sprites/weapon_knife.txt
@@ -0,0 +1,7 @@
+10
+weapon			320 320w	160	140	80	20
+weapon_s		320 320w-s	160	140	80	20
+ammo			320 320hud2	0	16	18	18
+weapon			640 640mw1	0	135	170	45
+weapon_s		640 640mw1-s	0	135	170	45
+ammo			640 640hud7	0	72	24	24
diff --git a/main/sprites/weapon_leap.txt b/main/sprites/weapon_leap.txt
new file mode 100644
index 00000000..52bfe83b
--- /dev/null
+++ b/main/sprites/weapon_leap.txt
@@ -0,0 +1,7 @@
+6
+weapon			320 320w	0	0	80	20
+weapon_s		320 320w-s	0	0	80	20
+ammo			320 640hud7	96	96	24	24
+weapon			640 640aw1	0	0	170	45
+weapon_s		640 640aw1-s	0	0	170	45
+ammo			640 640hud7	96	96	24	24
diff --git a/main/sprites/weapon_machinegun.txt b/main/sprites/weapon_machinegun.txt
new file mode 100644
index 00000000..6dede7a9
--- /dev/null
+++ b/main/sprites/weapon_machinegun.txt
@@ -0,0 +1,11 @@
+10
+weapon			320 320w	160	0	80	20
+weapon_s		320 320w-s	160	0	80	20
+ammo			320 640hud7	48	72	24	24
+crosshair		320 xhairmg 	0	0	64	64
+autoaim			320 crosshairs	0	72	24	24
+weapon			640 640mw2	0	180	170	45
+weapon_s		640 640mw2-s	0	180	170	45
+ammo			640 640hud7	48	72	24	24
+crosshair		640 xhairmg 	0	0	64	64
+autoaim			640 crosshairs	0	72	24	24
diff --git a/main/sprites/weapon_metabolize.txt b/main/sprites/weapon_metabolize.txt
new file mode 100644
index 00000000..79ddf677
--- /dev/null
+++ b/main/sprites/weapon_metabolize.txt
@@ -0,0 +1,9 @@
+8
+weapon			320 320w	0	200	80	20
+weapon_s		320 320w-s	0	200	80	20
+ammo			320 640hud7	96	96	24	24
+autoaim			320 crosshairs	0	72	24	24
+weapon			640 640aw3	0	180	170	45
+weapon_s		640 640aw3-s	0	180	170	45
+ammo			640 640hud7	96	96	24	24
+autoaim			640 crosshairs	0	72	24	24
diff --git a/main/sprites/weapon_mine.txt b/main/sprites/weapon_mine.txt
new file mode 100644
index 00000000..7c214f7c
--- /dev/null
+++ b/main/sprites/weapon_mine.txt
@@ -0,0 +1,7 @@
+6
+weapon			320 320w	160	40	80	20
+weapon_s		320 320w-s	160	40	80	20
+ammo			320 640hud7	96	96	24	24
+weapon			640 640mw2	0	0	170	45
+weapon_s		640 640mw2-s	0	0	170	45
+ammo			640 640hud7	96	96	24	24
diff --git a/main/sprites/weapon_nukegun.txt b/main/sprites/weapon_nukegun.txt
new file mode 100644
index 00000000..97504b90
--- /dev/null
+++ b/main/sprites/weapon_nukegun.txt
@@ -0,0 +1,7 @@
+6
+weapon			320 320hud1	0	200	80	20
+weapon_s		320 320hud1	0	220	80	20
+ammo			320 640hud7	96	96	24	24
+weapon			640 640hud1	0	0	170	45
+weapon_s		640 640hud4	0	0	170	45
+ammo			640 640hud7	96	96	24	24
diff --git a/main/sprites/weapon_parasite.txt b/main/sprites/weapon_parasite.txt
new file mode 100644
index 00000000..59d488aa
--- /dev/null
+++ b/main/sprites/weapon_parasite.txt
@@ -0,0 +1,7 @@
+10
+weapon			320 320w	80	80	80	20
+weapon_s		320 320w-s	80	80	80	20
+crosshair		320 xhairpara	0	0	128	128
+weapon			640 640aw3	0	0	170	45
+weapon_s		640 640aw3-s	0	0	170	45
+crosshair		640 xhairpara	0	0	128	128
diff --git a/main/sprites/weapon_pistol.txt b/main/sprites/weapon_pistol.txt
new file mode 100644
index 00000000..8285ca39
--- /dev/null
+++ b/main/sprites/weapon_pistol.txt
@@ -0,0 +1,11 @@
+10
+weapon			320 320w	160	60	80	20
+weapon_s		320 320w-s	160	60	80	20
+ammo			320 640hud7	24	72	24	24
+crosshair		320 xhairp	0	0	64	64
+autoaim			320 crosshairs	0	72	24	24
+weapon			640 640mw1	0	90  170	45
+weapon_s		640 640mw1-s	0	90	170	45
+ammo			640 640hud7	24	72	24	24
+crosshair		640 xhairp	0	0	64	64
+autoaim			640 crosshairs	0	72	24	24
diff --git a/main/sprites/weapon_primalscream.txt b/main/sprites/weapon_primalscream.txt
new file mode 100644
index 00000000..73f1f439
--- /dev/null
+++ b/main/sprites/weapon_primalscream.txt
@@ -0,0 +1,7 @@
+10
+weapon			320 320w	80	100	80	20
+weapon_s		320 320w-s	80	100	80	20
+ammo			320 320hud2	0	16	18	18
+weapon			640 640aw2	0	180	170	45
+weapon_s		640 640aw2-s	0	180	170	45
+ammo			640 640hud7	0	72	24	24
diff --git a/main/sprites/weapon_shotgun.txt b/main/sprites/weapon_shotgun.txt
new file mode 100644
index 00000000..9f73fff3
--- /dev/null
+++ b/main/sprites/weapon_shotgun.txt
@@ -0,0 +1,9 @@
+14
+weapon			320 320w	160	80	80	20
+weapon_s		320 320w-s	160	80	80	20
+ammo			320 640hud7	0	72	24	24
+crosshair		320 xhairsg	0	0	256	256
+weapon			640 640mw2	0	135	170	45
+weapon_s		640 640mw2-s	0	135	170	45
+ammo			640 640hud7	0	72	24	24
+crosshair		640 xhairsg	0	0	256	256
diff --git a/main/sprites/weapon_spikegun.txt b/main/sprites/weapon_spikegun.txt
new file mode 100644
index 00000000..985aa79c
--- /dev/null
+++ b/main/sprites/weapon_spikegun.txt
@@ -0,0 +1,11 @@
+10
+weapon			320 320w	80	120	80	20
+weapon_s		320 320w-s	80	120	80	20
+ammo			320 320hud2	0	16	18	18
+crosshair		320 xhairalien	0	0	128	128
+autoaim			320 crosshairs	0	72	24	24
+weapon			640 640aw2	0	0	170	45
+weapon_s		640 640aw2-s	0	0	170	45
+ammo			640 640hud7	0	72	24	24
+crosshair		640 xhairalien	0	0	128	128
+autoaim			640 crosshairs	0	72	24	24
diff --git a/main/sprites/weapon_spit.txt b/main/sprites/weapon_spit.txt
new file mode 100644
index 00000000..336fed17
--- /dev/null
+++ b/main/sprites/weapon_spit.txt
@@ -0,0 +1,9 @@
+10
+weapon			320 320w	0	160	80	20
+weapon_s		320 320w-s	0	160	80	20
+ammo			320 640hud7	96	96	24	24
+crosshair		320 xhairspit	0	0	64	64
+weapon			640 640aw1	0	90	170	45
+weapon_s		640 640aw1-s	0	90	170	45
+ammo			640 640hud7	96	96	24	24
+crosshair		640 xhairspit	0	0	64	64
diff --git a/main/sprites/weapon_spore.txt b/main/sprites/weapon_spore.txt
new file mode 100644
index 00000000..00cb677f
--- /dev/null
+++ b/main/sprites/weapon_spore.txt
@@ -0,0 +1,11 @@
+10
+weapon			320 320w	0	220	80	20
+weapon_s		320 320w-s	0	220	80	20
+ammo			320 640hud7	96	96	24	24
+crosshair		320 xhairalien	0	0	128	128
+autoaim			320 crosshairs	0	72	24	24
+weapon			640 640mw2	0	90	170	45
+weapon_s		640 640mw2-s	0	90	170	45
+ammo			640 640hud7	96	96	24	24
+crosshair		640 xhairalien	0	0	128	128
+autoaim			640 crosshairs	0	72	24	24
diff --git a/main/sprites/weapon_stomp.txt b/main/sprites/weapon_stomp.txt
new file mode 100644
index 00000000..1d53e187
--- /dev/null
+++ b/main/sprites/weapon_stomp.txt
@@ -0,0 +1,7 @@
+8
+weapon			320 320w	80	60	80	20
+weapon_s		320 320w-s	80	60	80	20
+ammo			320 640hud7	96	96	24	24
+weapon			640 640aw4	0	45	170	45
+weapon_s		640 640aw4-s	0	45	170	45
+ammo			640 640hud7	96	96	24	24
diff --git a/main/sprites/weapon_swipe.txt b/main/sprites/weapon_swipe.txt
new file mode 100644
index 00000000..8d0f7c07
--- /dev/null
+++ b/main/sprites/weapon_swipe.txt
@@ -0,0 +1,7 @@
+6
+weapon			320 320w	80	0	80	20
+weapon_s		320 320w-s	80	0	80	20
+ammo			320 640hud7	96	96	24	24
+weapon			640 640aw4	0	180	170	45
+weapon_s		640 640aw4-s	0	180	170	45
+ammo			640 640hud7	96	96	24	24
diff --git a/main/sprites/weapon_umbra.txt b/main/sprites/weapon_umbra.txt
new file mode 100644
index 00000000..752a5652
--- /dev/null
+++ b/main/sprites/weapon_umbra.txt
@@ -0,0 +1,9 @@
+8
+weapon			320 320w	80	20	80	20
+weapon_s		320 320w-s	80	20	80	20
+crosshair		320 xhairalien	0	0	128	128
+ammo			320 640hud7	96	96	24	24
+weapon			640 640aw3	0	90	170	45
+weapon_s		640 640aw3-s	0	90	170	45
+ammo			640 640hud7	96	96	24	24
+crosshair		640 xhairalien	0	0	128	128
\ No newline at end of file
diff --git a/main/sprites/weapon_webspinner.txt b/main/sprites/weapon_webspinner.txt
new file mode 100644
index 00000000..94020a1b
--- /dev/null
+++ b/main/sprites/weapon_webspinner.txt
@@ -0,0 +1,9 @@
+8
+weapon			320 320w	80	40	80	20
+weapon_s		320 320w-s	80	40	80	20
+ammo			320 640hud7	96	96	24	24
+crosshair		320 xhairweb	0	0	64	64
+weapon			640 640aw2	0	45	170	45
+weapon_s		640 640aw2-s	0	45	170	45
+ammo			640 640hud7	96	96	24	24
+crosshair		640 xhairweb	0	0	64	64
diff --git a/main/sprites/weapon_welder.txt b/main/sprites/weapon_welder.txt
new file mode 100644
index 00000000..affca805
--- /dev/null
+++ b/main/sprites/weapon_welder.txt
@@ -0,0 +1,7 @@
+14
+weapon			320 320w	160	20	80	20
+weapon_s		320 320w-s	160	20	80	20
+ammo			320 640hud7	0	72	24	24
+weapon			640 640mw1	0	45	170	45
+weapon_s		640 640mw1-s	0	45	170	45
+ammo			640 640hud7	0	72	24	24
diff --git a/main/sprites/webprojectile.spr b/main/sprites/webprojectile.spr
new file mode 100644
index 00000000..9d3a22fa
Binary files /dev/null and b/main/sprites/webprojectile.spr differ
diff --git a/main/sprites/webstrand.spr b/main/sprites/webstrand.spr
new file mode 100644
index 00000000..dc611c33
Binary files /dev/null and b/main/sprites/webstrand.spr differ
diff --git a/main/sprites/welddrip.spr b/main/sprites/welddrip.spr
new file mode 100644
index 00000000..b3ff9243
Binary files /dev/null and b/main/sprites/welddrip.spr differ
diff --git a/main/sprites/weldsmoke.spr b/main/sprites/weldsmoke.spr
new file mode 100644
index 00000000..16dccf5b
Binary files /dev/null and b/main/sprites/weldsmoke.spr differ
diff --git a/main/sprites/white.spr b/main/sprites/white.spr
new file mode 100644
index 00000000..7fb74c34
Binary files /dev/null and b/main/sprites/white.spr differ
diff --git a/main/sprites/xhairacid.spr b/main/sprites/xhairacid.spr
new file mode 100644
index 00000000..7ff06b4b
Binary files /dev/null and b/main/sprites/xhairacid.spr differ
diff --git a/main/sprites/xhairalien.spr b/main/sprites/xhairalien.spr
new file mode 100644
index 00000000..d561d8f5
Binary files /dev/null and b/main/sprites/xhairalien.spr differ
diff --git a/main/sprites/xhairbile.spr b/main/sprites/xhairbile.spr
new file mode 100644
index 00000000..2fda6877
Binary files /dev/null and b/main/sprites/xhairbile.spr differ
diff --git a/main/sprites/xhairgl.spr b/main/sprites/xhairgl.spr
new file mode 100644
index 00000000..4b69a5fe
Binary files /dev/null and b/main/sprites/xhairgl.spr differ
diff --git a/main/sprites/xhairhmg.spr b/main/sprites/xhairhmg.spr
new file mode 100644
index 00000000..f52363fc
Binary files /dev/null and b/main/sprites/xhairhmg.spr differ
diff --git a/main/sprites/xhairmg.spr b/main/sprites/xhairmg.spr
new file mode 100644
index 00000000..6b4238e0
Binary files /dev/null and b/main/sprites/xhairmg.spr differ
diff --git a/main/sprites/xhairp.spr b/main/sprites/xhairp.spr
new file mode 100644
index 00000000..c76c53a1
Binary files /dev/null and b/main/sprites/xhairp.spr differ
diff --git a/main/sprites/xhairpara.spr b/main/sprites/xhairpara.spr
new file mode 100644
index 00000000..bb612bb0
Binary files /dev/null and b/main/sprites/xhairpara.spr differ
diff --git a/main/sprites/xhairsg.spr b/main/sprites/xhairsg.spr
new file mode 100644
index 00000000..c0168ff5
Binary files /dev/null and b/main/sprites/xhairsg.spr differ
diff --git a/main/sprites/xhairspit.spr b/main/sprites/xhairspit.spr
new file mode 100644
index 00000000..10fe86a3
Binary files /dev/null and b/main/sprites/xhairspit.spr differ
diff --git a/main/sprites/xhairweb.spr b/main/sprites/xhairweb.spr
new file mode 100644
index 00000000..c83f1d7b
Binary files /dev/null and b/main/sprites/xhairweb.spr differ
diff --git a/main/sprites/xspark1.spr b/main/sprites/xspark1.spr
new file mode 100644
index 00000000..af5beec1
Binary files /dev/null and b/main/sprites/xspark1.spr differ
diff --git a/main/sprites/xspark4.spr b/main/sprites/xspark4.spr
new file mode 100644
index 00000000..c31edf3c
Binary files /dev/null and b/main/sprites/xspark4.spr differ
diff --git a/main/tempdecal.wad b/main/tempdecal.wad
new file mode 100644
index 00000000..509d0f95
Binary files /dev/null and b/main/tempdecal.wad differ
diff --git a/main/titles.txt b/main/titles.txt
new file mode 100644
index 00000000..24efe832
--- /dev/null
+++ b/main/titles.txt
@@ -0,0 +1,4647 @@
+//TITLES FOR NATURAL SELECTION
+//DO NOT ALTER THIS FILE
+// Position command $position x y 
+// x & y are from 0 to 1 to be screen resolution independent
+// -1 means center in each dimension
+// Effect command $effect <effect number>
+// effect 0 is fade in/fade out
+// effect 1 is flickery credits
+// effect 2 is write out (training room)
+// Text color r g b command $color
+// fadein time fadeout time / hold time
+// $fadein (message fade in time - per character in effect 2)
+// $fadeout (message fade out time)
+// $holdtime (stay on the screen for this long)
+
+Created_By
+{
+Natural Selection is created and maintained by Unknown Worlds Entertainment.  Visit www.unknownworlds.com for more information.
+}
+
+NS_Site
+{
+Check the front page of www.naturalselection.com for late-breaking news
+}
+
+Team_AutoAssign
+{
+AUTO ASSIGN
+}
+
+Menu_Spectate
+{
+SPECTATE
+}
+
+UndefinedTeam
+{
+Ready Room
+}
+
+Menu_LeaveGame
+{
+Exit game
+}
+
+Menu_Marine1Team
+{
+Join marines
+}
+
+Menu_Alien1Team
+{
+Join aliens
+}
+
+Marine1Team
+{
+Frontiersmen
+}
+
+Alien1Team
+{
+Kharaa
+}
+
+Marine2Team
+{
+Frontiersmen
+}
+
+Alien2Team
+{
+Kharaa
+}
+
+AutoTeam
+{
+Auto-assigned
+}
+
+Muted
+{
+Muted
+}
+
+Unmuted
+{
+Unmuted
+}
+
+No_longer_hear_that_player
+{
+No longer hear that player
+}
+
+LineComplete
+{
+Fully upgraded.
+}
+
+YouAreNowA
+{
+You are now a
+}
+
+Exclamation
+{
+!
+}
+
+ChooseAnUpgrade
+{
+Choose an upgrade by opening your pop-up menu (right-click by default)!
+}
+
+YouAreAttacking
+{
+You are attacking!
+}
+
+YouAreDefending
+{
+You are defending!
+}
+
+Attacking
+{
+Attacking
+}
+
+Defending
+{
+Defending
+}
+
+Rank_Marine_1
+{
+Level 1: Private
+}
+
+Rank_Marine_2
+{
+Level 2: Private First Class
+}
+
+Rank_Marine_3
+{
+Level 3: Corporal
+}
+
+Rank_Marine_4
+{
+Level 4: Sergeant
+}
+
+Rank_Marine_5
+{
+Level 5: Lieutenant
+}
+
+Rank_Marine_6
+{
+Level 6: Captain
+}
+
+Rank_Marine_7
+{
+Level 7: Commander
+}
+
+Rank_Marine_8
+{
+Level 8: Major
+}
+
+Rank_Marine_9
+{
+Level 9: Field Marshal
+}
+
+Rank_Marine_10
+{
+Level 10: General
+}
+
+Rank_Alien_1
+{
+Level 1: Hatchling
+}
+
+Rank_Alien_2
+{
+Level 2: Xenoform
+}
+
+Rank_Alien_3
+{
+Level 3: Minion
+}
+
+Rank_Alien_4
+{
+Level 4: Ambusher
+}
+
+Rank_Alien_5
+{
+Level 5: Attacker
+}
+
+Rank_Alien_6
+{
+Level 6: Rampager
+}
+
+Rank_Alien_7
+{
+Level 7: Slaughterer
+}
+
+Rank_Alien_8
+{
+Level 8: Eliminator
+}
+
+Rank_Alien_9
+{
+Level 9: Nightmare
+}
+
+Rank_Alien_10
+{
+Level 10: Behemoth
+}
+
+// SDK 2.0 Spectator Menu
+Spec_Map
+{
+Map
+}
+
+Spec_Mode1
+{
+Locked Chase-Camera
+}
+
+Spec_Mode2
+{
+Free Chase-Camera
+}
+
+Spec_Mode3
+{
+Free look
+}
+
+Spec_Mode4
+{
+First Person
+}
+
+Spec_Mode5
+{
+Free Map Overview
+}
+
+Spec_Mode6
+{
+Chase Map Overview
+}
+
+Spec_NoTarget
+{
+No valid targets. Cannot switch to Chase-Camera Mode.
+}
+
+Spec_Help
+{
+Press F4 for Ready Room     Use LEFT and RIGHT keys, JUMP and FIRE to change view.
+}
+
+Spec_Slow_Motion
+{
+Slow Motion
+}
+
+Spec_Replay
+{
+Instant Replay
+}
+
+Spec_Help2
+{
+Your text messages and voice can only be seen by other Spectators.
+}
+
+Spec_Only_Help
+{
+}
+
+Directed
+{
+Directed
+}
+
+SpectatorsNotAllowed
+{
+This server does not currently allow spectators.
+}
+
+ObsInEyePrefix
+{
+Viewing through eyes of
+}
+
+SpectatorTeam
+{
+Spectators
+}
+
+Spectators
+{
+Spectators
+}
+
+TEAM
+{
+Team
+}
+
+TEAMS
+{
+Teams
+}
+
+PLAYER
+{
+Player
+}
+
+Player_plural
+{
+Players
+}
+
+PLAYERS
+{
+Players
+}
+
+SCORES
+{
+Player information
+}
+
+SCORE
+{
+Score
+}
+
+KILLS
+{
+Kills
+}
+
+DEATHS
+{
+Deaths
+}
+
+LATENCY
+{
+Latency
+}
+
+VOICE
+{
+Voice
+}
+
+Unassigned
+{
+Unassigned
+}
+
+Menu_OK
+{
+OK
+}
+
+Points
+{
+points
+}
+
+Cost
+{
+Cost
+}
+
+NoSpectating
+{
+Spectating isn't allowed on this server.
+}
+
+// Main game messages
+ReadyRoomMessage
+{
+You are in the Ready Room.  Walk through an entrance to join a team or observe the game.
+}
+
+ReinforcementMessage
+{
+You are waiting in line to spawn back in.
+}
+
+ReinforcingMessage
+{
+You are now spawning back in...
+}
+
+ReinforcementComplete
+{
+Right-click to respawn.
+}
+
+ObserverMessage
+{
+You are an observer. You won't be able to join this game but you can join the next game.
+}
+
+CantSwitchTeamsInTournyMode
+{
+You can't switch teams during tournament mode.
+}
+
+CantSwitchTeamsAfterGameStart
+{
+You can't switch teams once the game has started.
+}
+
+TooManyPlayersOnTeam
+{
+There are too many players on this team already.
+}
+
+CantJoinAfterSpectating
+{
+You cannot join the game in progress once you've been a spectator.
+}
+
+JoinTeamTooFast
+{
+You joined a team too fast. Wait a bit before joining a team again.
+}
+
+CanOnlyJoinTeamYouveReinforced
+{
+You have already seen the other team, you can only join that team until next round.
+}
+
+YouCanJoinSoon
+{
+You will join this team soon.
+}
+
+AlreadyOnTeam
+{
+You are already on a team.  Go back to the ready room first to switch teams.
+}
+
+SoldierMessage
+{
+You are now a soldier.  Try to follow orders from your commander, and do your best to keep the enemy from killing your teammates or destroying your structures.
+}
+
+ObjectivesVsAliens
+{
+You are fighting aliens!  Aliens respawn at hives - to win the game, you must kill all the alien hives and then kill the remaining aliens.
+}
+
+ObjectivesVsMarines
+{
+You are fighting marines!  Marines respawn at infantry portals - to win the game, you must kill all their infantry portals and then kill all remaining marines.
+}
+
+Handicap
+{
+damage
+}
+
+CommanderMessage
+{
+Left-click or marquee-select players and right-click a location, structure or player to give them an order.  The menu in the lower right lets you build structures and equip your soldiers.
+}
+
+Commander
+{
+Comm
+}
+
+NoCommander
+{
+No commander
+}
+
+GestationMessage
+{
+You are now gestating into a new alien lifeform.  Get ready to hatch...
+}
+
+CocoonMessage
+{
+You have been cocooned!  
+}
+
+YouAreReinforcements
+{
+You were called in as reinforcements!
+}
+
+//////////////
+// Pie menu //
+//////////////
+MenuMarineRoot
+{
+Start
+}
+
+//MenuMarineRoot
+//{
+//!marinenode
+//}
+
+
+MenuComms
+{
+Comms
+}
+
+MenuTalk
+{
+Talk
+}
+
+MenuAttacked
+{
+"Attacked!"
+}
+
+MenuCheer
+{
+Cheer
+}
+
+MenuCoverMe
+{
+"Cover me!"
+}
+
+MenuRetreat
+{
+"Retreat!"
+}
+
+MenuInPosition
+{
+"In position"
+}
+
+MenuEnemySpotted
+{
+"Enemy here"
+}
+
+MenuMoveOut
+{
+"Move out"
+}
+
+MenuAllClear
+{
+"All clear"
+}
+
+MenuYell
+{
+Yell
+}
+
+MenuSay
+{
+Say
+}
+
+MenuRogerThat
+{
+"Roger that"
+}
+
+MenuHello
+{
+"Hello"
+}
+
+MenuNeedHelp
+{
+"Need help"
+}
+
+MenuNeedHealth
+{
+"Need health"
+}
+
+MenuNeedAmmo
+{
+"Need ammo"
+}
+
+MenuFollowMe
+{
+"Follow me"
+}
+
+MenuCovering
+{
+"Covering"
+}
+
+MenuOrders
+{
+Orders
+}
+
+MenuNeedOrder
+{
+"Need order"
+}
+
+MenuAck
+{
+"Acknowledged"
+}
+
+MenuAdmin
+{
+Admin
+}
+
+Menu_ReadyRoom
+{
+Ready room
+}
+
+MenuVoteCommanderDown
+{
+Eject commander
+}
+
+MenuArea
+{
+Area
+}
+
+MenuMoveTo
+{
+Move to
+}
+
+MenuGuard
+{
+Guard
+}
+
+MenuTarget
+{
+Target
+}
+
+MenuDeploy
+{
+Deploy
+}
+
+MenuIncoming
+{
+Incoming
+}
+
+MenuProceed
+{
+Proceed
+}
+
+MenuFireTarget
+{
+Fire target
+}
+
+MenuTaunt
+{
+Taunt
+}
+
+MenuTakeCover
+{
+Take cover
+}
+
+MenuReady
+{
+Ready
+}
+
+MenuDefendObj
+{
+Defend
+}
+
+MenuCeaseFire
+{
+Cease fire
+}
+
+MenuTeam
+{
+Team
+}
+
+MenuBuilding
+{
+Build
+}
+
+MenuAttackObj
+{
+Attack
+}
+
+MenuTaunt
+{
+Taunt
+}
+
+MenuHealth
+{
+"Health"
+}
+
+MenuCameraTower
+{
+Camera
+}
+
+MenuTurret
+{
+Turret
+}
+
+MenuSiegeTurret
+{
+Siege
+}
+
+MenuBlazeOfGlory
+{
+Blaze
+}
+
+MenuProtect
+{
+Protect
+}
+
+MenuReinforce
+{
+Reinforce
+}
+
+MenuArmorUpgrade
+{
+Heavy
+}
+
+MenuRepair
+{
+Repair
+}
+
+MenuPowerups
+{
+Stim
+}
+
+MenuAdrenaline
+{
+Adrenaline
+}
+
+MenuDefMatrix
+{
+Def matrix
+}
+
+MenuPhaseGate
+{
+Phase gate
+}
+
+MenuSelf
+{
+Me
+}
+
+MenuBuy
+{
+Buy
+}
+
+MenuHeavy
+{
+Heavy
+}
+
+MenuShotgun
+{
+Shotgun
+}
+
+MenuHMG
+{
+HMG
+}
+
+MenuGL
+{
+Grenade launcher
+}
+
+MenuFlamer
+{
+Flamer
+}
+
+MenuNuke
+{
+Nuke
+}
+
+MenuWeapon
+{
+Weapon
+}
+
+MenuEquipment
+{
+Equipment
+}
+
+MenuSupport
+{
+Support
+}
+
+MenuIntel
+{
+Intel
+}
+
+MenuCommander
+{
+Commander
+}
+
+MenuResupply
+{
+Resupply
+}
+
+MenuCatalyst
+{
+Catalyst
+}
+
+MenuScan
+{
+Scan area
+}
+
+MenuUse
+{
+Use
+}
+
+MenuNextWeapon
+{
+Next weapon
+}
+
+MenuJetpacks
+{
+Jet-packs
+}
+
+MenuReloadWeapon
+{
+Reload
+}
+
+MenuDropWeapon
+{
+Drop
+}
+
+MenuLight
+{
+Light
+}
+
+MenuEquip
+{
+Equip
+}
+
+MenuGrenade
+{
+Grenade
+}
+
+MenuMotionTracking
+{
+Motion-tracking
+}
+
+MenuDistressBeacon
+{
+Distress beacon
+}
+
+MenuUpgradeWeapon
+{
+Weapon
+}
+
+MenuUpgradeDamage1
+{
+Damage level 1
+}
+
+MenuUpgradeDamage2
+{
+Damage level 2
+}
+
+MenuUpgradeDamage3
+{
+Damage level 3
+}
+
+MenuUpgradeArmor1
+{
+Armor level 1
+}
+
+MenuUpgradeArmor2
+{
+Armor level 2
+}
+
+MenuUpgradeArmor3
+{
+Armor level 3
+}
+
+MenuAmmo
+{
+Ammo
+}
+
+MenuMines
+{
+Mines
+}
+
+MenuWelder
+{
+Welder
+}
+
+MenuGrenades
+{
+Grenades
+}
+
+MenuUpgradeMG
+{
+Upgrade
+}
+
+MenuUnlockHiveTwo
+{
+Unlock next ability
+}
+
+MenuUnlockHiveThree
+{
+Unlock next ability
+}
+
+////////////////////
+// Armor upgrades // 
+////////////////////
+
+MenuArmorFull
+{
+Armor full
+}
+
+MenuHeavyArmor
+{
+Heavy armor
+}
+
+MenuBuyArmorMotionTrack
+{
+Tracker
+}
+
+MenuJetpack
+{
+Jetpack
+}
+
+MenuBuyArmorLifeSupport
+{
+Sustain
+}
+
+// Rank
+MenuRank
+{
+Rank
+}
+
+MenuPromote
+{
+Promote
+}
+
+MenuDemote
+{
+Demote
+}
+
+//////////////////////////////////////////////////
+// Don't localize these, they are sprite names: //
+//  (sprites/640(or 320)name.spr)               //
+//////////////////////////////////////////////////
+MenuAlienRoot
+{
+Start
+}
+
+MenuAlienSmallMorph
+{
+Lifeform
+}
+
+MenuAlienMorphLevel1
+{
+Skulk
+}
+
+MenuAlienMorphLevel2
+{
+Gorge
+}
+
+MenuAlienBigMorph
+{
+Advanced
+}
+
+MenuAlienMorphLevel3
+{
+Lerk
+}
+
+MenuAlienMorphLevel4
+{
+Fade
+}
+
+MenuAlienMorphLevel5
+{
+Onos
+}
+
+MenuAlienUpgrade
+{
+Evolve upgrade
+}
+
+MenuAlienComm
+{
+Voice
+}
+
+MenuAlienBuild
+{
+Build
+}
+
+MenuAlienAdvBuild
+{
+Advanced
+}
+
+MenuAlienBuildUpgrades
+{
+Upgrades
+}
+
+
+MenuAlienCommSayingsWest
+{
+Yells
+}
+
+MenuAlienCommSayingOne
+{
+Chuckle
+}
+
+MenuAlienCommSayingTwo
+{
+Need healing
+}
+
+MenuAlienCommSayingThree
+{
+Need backup
+}
+
+MenuAlienCommSayingsEast
+{
+Sayings
+}
+
+MenuAlienCommSayingFour
+{
+Incoming
+}
+
+MenuAlienCommSayingFive
+{
+Attack
+}
+
+MenuAlienCommSayingSix
+{
+I'm building here
+}
+
+MenuAlienUpgradeDefOne
+{
+Carapace
+}
+
+MenuAlienUpgradeDefTwo
+{
+Regeneration
+}
+
+MenuAlienUpgradeDefThree
+{
+Redemption
+}
+
+MenuAlienUpgradeSenOne
+{
+Cloaking
+}
+
+MenuAlienUpgradeSenTwo
+{
+Focus
+}
+
+MenuAlienUpgradeSenThree
+{
+Scent of Fear
+}
+
+MenuAlienUpgradeMoveOne
+{
+Celerity
+}
+
+MenuAlienUpgradeMoveTwo
+{
+Adrenaline
+}
+
+MenuAlienUpgradeMoveThree
+{
+Silence
+}
+
+MenuAlienDefenseChamber
+{
+Defense chamber
+}
+
+MenuAlienSensoryChamber
+{
+Sensory chamber
+}
+
+MenuAlienMovementChamber
+{
+Movement chamber
+}
+
+MenuAlienDefenseUpgrades
+{
+Defensive
+}
+
+MenuAlienSensoryUpgrades
+{
+Sensory
+}
+
+MenuAlienMovementUpgrades
+{
+Movement
+}
+
+MenuAlienOffensiveChamber
+{
+Offense chamber
+}
+
+MenuAlienResourceTower
+{
+Resource tower
+}
+
+MenuAlienHive
+{
+Hive
+}
+
+
+
+// Armor received messages
+$position -1 0.2
+$effect 0
+$fadein 0.5
+$fadeout 0.5
+$holdtime 5.0
+
+ReceiveHeavyArmor
+{
+Your armor has been upgraded to heavy armor.  You are now well protected against enemies.
+}
+
+ReceiveMotionTrackArmor
+{
+You now have a motion-tracker built into your armor.
+}
+
+ReceiveJetpackArmor
+{
+You now have a jet-pack upgrade.  Press and hold your jump key to use it.
+}
+
+ReceiveLifeSupportArmor
+{
+You now have a LifeSupport (TM) system.  When you get near death, you will be protected until help arrives.
+}
+
+
+
+$position -1 0.35
+$holdtime 3.0
+
+GameStarting
+{
+The game is about to start...
+}
+
+$holdtime 2.0
+GameBegun
+{
+The game has begun.
+}
+
+// Overwatch enabled
+//OverwatchActive
+//{
+//Overwatch active
+//}
+
+// Overwatch range string, expecting a float for range
+OverwatchRange
+{
+Target range: %f
+}
+
+// Points awarded
+$position -1 0.25
+$effect 0
+$holdtime 4
+
+MarineAward
+{
+Your team just killed an enemy!
+}
+
+MarineAwardToLeader
+{
+Your squad just received points for killing an enemy!
+}
+
+// Points awarded
+$position -1 0.15
+$effect 0
+$holdtime 3
+MarineAwardToCommander
+{
+Your team earned points for killing an enemy!
+}
+
+// Points awarded
+$position -1 0.25
+$effect 0
+$holdtime 4
+AlienAward
+{
+You just got resources for killing an enemy!
+}
+
+Defect
+{
+Leave squad
+}
+
+WeaponCantBeDropped
+{
+This weapon can't be dropped.
+}
+
+DefectMessageToLeader
+{
+A player has defected from your squad.
+}
+
+SquadIndicator
+{
+You're in Squad %d
+}
+
+InvalidOrderGiven
+{
+Invalid order
+}
+
+$position -1 0.65
+$effect 0
+$holdtime .5
+$fadein .2
+$fadeout .2
+GameWontStart
+{
+The game won't start until both sides have players.
+}
+
+// Translation note: don't translate "ready"
+GameWontStartUntilReady
+{
+Game won't start until both teams type "ready".
+}
+
+EvolvingMessage
+{
+Evolving...
+}
+
+VoteCast
+{
+Your vote has been cast.
+}
+
+VoteStarted
+{
+A vote to eject the commander has started.  If the commander is being disruptive, use your pop-up menu to vote against him.
+}
+
+VoteIllegal
+{
+A vote is illegal at this time.
+}
+
+AlreadyVoted
+{
+You can only vote once per game.
+}
+
+VoteFailed
+{
+The vote to eject the commander has failed.
+}
+
+VoteCancelled
+{
+The vote to eject the commander has been cancelled.
+}
+
+VoteSucceeded
+{
+The commander has been voted off the command console.
+}
+
+BannedFromCommand
+{
+You have been temporarily banned from commanding on this server.  Many servers will let you command again in a few hours.
+}
+
+MustGestateUp
+{
+You can only change to higher lifeforms.
+}
+
+MustGestateOnGround
+{
+You must stand on flat ground to gestate.
+}
+
+NotWhileDigesting
+{
+You can't gestate while digesting a player.
+}
+
+NoReadyRoomWhileDigested
+{
+You can't go to the ready room while being digested.
+}
+
+NeedMoreRoomToGestate
+{
+You need more room to gestate.
+}
+
+NeedOneHiveToGestate
+{
+Your team needs a hive for you to gestate into this lifeform.
+}
+
+NeedTwoHivesToGestate
+{
+Your team needs two hives for you to gestate into this lifeform.
+}
+
+NeedThreeHivesToGestate
+{
+Your team needs three hives for you to gestate into this lifeform.
+}
+
+NeedOneHiveForStructure
+{
+Your team needs a hive to build this structure.
+}
+
+NeedTwoHivesForStructure
+{
+Your team needs two hives to build this structure.
+}
+
+NeedThreeHivesForStructure
+{
+Your team needs three hives to build this structure.
+}
+
+NeedsAnotherHiveForStructure
+{
+Your team needs another hive to build this structure.
+}
+
+MustBeBuilder
+{
+You must be a Gorge to build this structure.
+}
+
+UpgradeNotAvailable
+{
+This upgrade isn't available at this time.
+}
+
+TooManyStructuresOfThisTypeNearby
+{
+There are too many structures of this type nearby.
+}
+
+TooManyStructuresInArea
+{
+There are too many structures nearby.
+}
+
+$holdtime 2.0
+TooManyWebs
+{
+Your team has reached the maximum number of webs allowed.
+}
+
+TooManyWebsNearby
+{
+There are too many webs nearby.
+}
+
+TeamOneWon
+{
+The marines won the game!
+}
+
+TeamTwoWon
+{
+The aliens won the game!
+}
+
+GameDraw
+{
+Draw game!
+}
+
+RankBeforeGameStart
+{
+You can only change ranks before the game starts.
+}
+
+DefectAfterGameStart
+{
+You can only defect after the game starts.
+}
+
+// Tech tree
+MarineResourcePrefix
+{
+Team resources: 
+}
+
+AlienResourcePrefix
+{
+Resources
+}
+
+CarryResourcePrefix
+{
+Carrying %d resources
+}
+
+Resources
+{
+Resources: 
+}
+
+
+NumericalEventResources
+{
+resources
+}
+
+NumericalEventHealth
+{
+health
+}
+
+NumericalEventResourcesDonated
+{
+Resources donated
+}
+
+NumericalEventAmmo
+{
+Ammo received
+}
+
+
+
+
+AlienEnergyDescription
+{
+Energy
+}
+
+ResourcesDepleted
+{
+Resources depleted
+}
+
+Reinforcements
+{
+Reinforcements
+}
+
+
+WeaponCategory
+{
+Weapons
+}
+
+ArmorCategory
+{
+Armor
+}
+
+BuildCategory
+{
+Build
+}
+
+RadioCategory
+{
+Radio
+}
+
+TechNodeLabel_0
+{
+None
+}
+
+TechNodeHelp_0
+{
+<none>
+}
+
+TechNodeHelp_1
+{
+Switch to your next weapon.
+}
+
+TechNodeHelp_2
+{
+Reloads your current weapon.
+}
+
+TechNodeHelp_3
+{
+Drop your current weapon, to get more speed, or to give to someone else to use.
+}
+
+TechNodeHelp_5
+{
+Leave game and go back to the ready room.  This will let you switch teams, observe the game, or take a break.  Note that excessive Ready Room idling is often frowned upon.
+}
+
+TechNodeHelp_6
+{
+If the commander is deliberately trying to ruin the game, select this to vote the commander out of the command console.  If enough votes are received, he will be ejected for the rest of the game.
+}
+
+
+TechNodeLabel_10
+{
+Attacked
+}
+
+TechNodeLabel_11
+{
+Attack
+}
+
+TechNodeLabel_12
+{
+Destroy
+}
+
+TechNodeLabel_13
+{
+Confirmed
+}
+
+TechNodeLabel_14
+{
+Focus team
+}
+
+TechNodeLabel_15
+{
+Powerful
+}
+
+
+TechNodeHelp_7
+{
+"Chuckle"
+}
+
+TechNodeHelp_8
+{
+"Need healing"
+}
+
+TechNodeHelp_9
+{
+"Need backup"
+}
+
+TechNodeHelp_10
+{
+"Incoming"
+}
+
+TechNodeHelp_11
+{
+"ATTACK"
+}
+
+TechNodeHelp_12
+{
+"I'm building here"
+}
+
+
+TechNodeLabel_20
+{
+Armor #1
+}
+
+TechNodeLabel_21
+{
+Armor #2
+}
+
+TechNodeLabel_22
+{
+Armor #3
+}
+
+TechNodeLabel_23
+{
+Weapons #1
+}
+
+TechNodeLabel_24
+{
+Weapons #2
+}
+
+TechNodeLabel_25
+{
+Weapons #3
+}
+
+TechNodeHelp_20
+{
+Level 1 player armor
+}
+
+TechNodeHelp_21
+{
+Level 2 player armor
+}
+
+TechNodeHelp_22
+{
+Level 3 player armor
+}
+
+
+TechNodeHelp_23
+{
+Weapons, mines, and turrets do +10%% damage
+}
+
+TechNodeHelp_24
+{
+Weapons, mines, and turrets do +20%% damage
+}
+
+TechNodeHelp_25
+{
+Weapons, mines, and turrets do +30%% damage
+}
+
+TechNodeLabel_26
+{
+Advanced turret factory
+}
+
+TechNodeHelp_26
+{
+Upgrade to advanced turret factory
+}
+
+TechNodeLabel_47
+{
+Catalysts
+}
+
+TechNodeHelp_47
+{
+Catalyst research
+}
+
+TechNodeLabel_28
+{
+Jet-packs
+}
+
+TechNodeHelp_28
+{
+Allows jet-pack modules
+}
+
+TechNodeLabel_29
+{
+Heavy armor
+}
+
+TechNodeHelp_29
+{
+Allows heavy armor
+}
+
+TechNodeLabel_30
+{
+Distress beacon
+}
+
+TechNodeHelp_30
+{
+Teleports all marines, dead or alive, into the marine base
+}
+
+TechNodeLabel_31
+{
+Resupply health and ammo
+}
+
+TechNodeLabel_31
+{
+Deployable health tech
+}
+
+TechNodeHelp_31
+{
+Allows commander to deploy health packs
+}
+
+TechNodeLabel_32
+{
+Cancel
+}
+
+TechNodeHelp_32
+{
+Cancel research
+}
+
+TechNodeLabel_33
+{
+Motion-tracking
+}
+
+TechNodeHelp_33
+{
+All moving enemies become visible
+}
+
+TechNodeLabel_34
+{
+Phase tech
+}
+
+TechNodeHelp_34
+{
+Allows scanning and phase gate construction
+}
+
+TechNodeLabel_35
+{
+Upgrade tower
+}
+
+TechNodeHelp_35
+{
+Improve speed of resource collection
+}
+
+TechNodeLabel_36
+{
+Electrical defense
+}
+
+TechNodeHelp_36
+{
+Shocks enemies that get too close
+}
+
+TechNodeLabel_37
+{
+Grenades
+}
+
+TechNodeHelp_37
+{
+Issues one grenade to all soldiers on spawn
+}
+
+TechNodeLabel_38
+{
+Heavy armor
+}
+
+TechNodeHelp_38
+{
+Issues heavy armor to a soldier
+}
+
+TechNodeLabel_39
+{
+Jet-pack
+}
+
+TechNodeHelp_39
+{
+Issues jet-pack ability to a soldier
+}
+
+TechNodeLabel_40
+{
+Infantry portal
+}
+
+TechNodeHelp_40
+{
+Spawns players
+}
+
+TechNodeLabel_41
+{
+Resource tower
+}
+
+TechNodeHelp_41
+{
+Produces resources
+}
+
+
+
+TechNodeLabel_43
+{
+Turret factory
+}
+
+TechNodeHelp_43
+{
+Allows the construction of turrets within a certain radius
+}
+
+TechNodeLabel_45
+{
+Arms lab
+}
+
+TechNodeHelp_45
+{
+Offers weapon and armor upgrades
+}
+
+TechNodeLabel_46
+{
+Prototype lab
+}
+
+TechNodeHelp_46
+{
+Grants access to experimental technology
+}
+
+TechNodeLabel_48
+{
+Armory
+}
+
+TechNodeHelp_48
+{
+Grants access to new weapons
+}
+
+TechNodeLabel_49
+{
+Advanced armory
+}
+
+TechNodeHelp_49
+{
+Upgrade to advanced armory
+}
+
+
+TechNodeLabel_50
+{
+Nuke plant
+}
+
+TechNodeHelp_50
+{
+Allows nuke construction
+}
+
+TechNodeLabel_51
+{
+Observatory
+}
+
+TechNodeHelp_51
+{
+Offers reconnaisance technology
+}
+
+TechNodeLabel_52
+{
+Health nanotech
+}
+
+TechNodeHelp_52
+{
+Allows the commander to deploy health packs in the field
+}
+
+TechNodeLabel_53
+{
+Scanner Sweep
+}
+
+TechNodeHelp_53
+{
+Gives temporary sight into an area and reveals cloaked players
+}
+
+TechNodeLabel_55
+{
+Phase gate
+}
+
+TechNodeHelp_55
+{
+Node for lightspeed travel
+}
+
+TechNodeLabel_56
+{
+Turret
+}
+
+TechNodeHelp_56
+{
+A sentry turret
+}
+
+TechNodeLabel_57
+{
+Siege turret
+}
+
+TechNodeHelp_57
+{
+High-powered turret, fires sonic blast through walls. Only harms structures
+}
+
+TechNodeLabel_58
+{
+Command console
+}
+
+TechNodeHelp_58
+{
+An auxillary command console
+}
+
+
+
+TechNodeLabel_59
+{
+Health
+}
+
+TechNodeHelp_59
+{
+Regenerates 50 health for a marine
+}
+
+TechNodeLabel_60
+{
+Ammo
+}
+
+TechNodeHelp_60
+{
+One clip for any weapon
+}
+// Yes, we know that most of our weapons don't actually use 'clips'. No, we don't care. -- Nem
+
+
+TechNodeLabel_27
+{
+Catalyst pack
+}
+
+TechNodeHelp_27
+{
+Improves marine performance by +25%% speed and +25%% rate of fire for 8 seconds; inflicts a wound
+}
+
+
+
+TechNodeLabel_61
+{
+Mines
+}
+
+TechNodeHelp_61
+{
+Five mines/claymores
+}
+
+TechNodeLabel_62
+{
+Welder
+}
+
+TechNodeHelp_62
+{
+Repairs buildings and armor, affects weldables, burns webs
+}
+
+TechNodeLabel_63
+{
+Med kit
+}
+
+TechNodeLabel_64
+{
+Shotgun
+}
+
+TechNodeHelp_64
+{
+For close encounters
+}
+
+TechNodeLabel_65
+{
+HMG
+}
+
+TechNodeHelp_65
+{
+High-powered assault rifle. Less effective against structures
+}
+
+TechNodeLabel_66
+{
+Grenade launcher
+}
+
+TechNodeHelp_66
+{
+Grenade launcher. Less effective against moving targets
+}
+
+TechNodeLabel_67
+{
+Nuke
+}
+
+TechNodeHelp_67
+{
+Droppable baby nuke
+}
+// We get this question regularily from players who happen on it. The nuke, like some other things in here, was tested very early in NS' development. Sufficient to say that it didn't work out. -- Nem
+
+TechNodeLabel_69
+{
+Recycle
+}
+
+TechNodeHelp_69
+{
+Remove this structure in exchange for some resources.
+}
+
+TechNodeHelp_80
+{
+Ask your commander for orders.  The commander will be notified that you are looking for something to do, and will give likely you an order
+}
+
+TechNodeHelp_81
+{
+Tell your commander that you are acknowledging his orders.  Follow the instructions for your current waypoint to carry out your orders.  When completed, the waypoint will disappear automatically
+}
+
+
+
+TechNodeLabel_85
+{
+Build
+}
+
+TechNodeHelp_85
+{
+Basic build menu
+}
+
+TechNodeLabel_86
+{
+Advanced
+}
+
+TechNodeHelp_86
+{
+Advanced build menu
+}
+
+TechNodeLabel_87
+{
+Assist
+}
+
+TechNodeHelp_87
+{
+Open assist menu
+}
+
+TechNodeLabel_88
+{
+Equip
+}
+
+TechNodeHelp_88
+{
+Open equipment menu
+}
+
+TechNodeHelp_90
+{
+Create resource tower: Collects resources for your team.  It can only be built at a resource nozzle (indicated by a white "fountain")
+}
+
+TechNodeHelp_91
+{
+Create offensive chamber: Organic turret that attacks enemy players and structures.  Damage: 20
+}
+
+TechNodeHelp_92
+{
+Create defensive chamber: Grants access to defensive upgrades, heals players and structures
+}
+
+TechNodeHelp_93
+{
+Create sensory chamber: Grants access to sensory upgrades and cloaks nearby players and structures.  Blocks motion-tracking within range
+}
+
+TechNodeHelp_94
+{
+Create movement chamber: Grants access to movement upgrades, increases energy regeneration of nearby teammates
+}
+
+// This is used to unlock an ability in Combat mode
+TechNodeLabel_95
+{
+Unlock ability
+}
+
+TechNodeHelp_95
+{
+Create hive: Allows access to higher lifeforms and abilities (must be built at a hive location)
+}
+
+TechNodeLabel_101
+{
+Carapace
+}
+
+TechNodeHelp_101
+{
+Increases amount of armor.  Each level of carapace absorbs roughly 16% more damage
+}
+
+TechNodeLabel_102
+{
+Regeneration
+}
+
+TechNodeHelp_102
+{
+You automatically heal all damage over time.  Higher levels will heal you faster. Does not stack with your innate regenartion
+}
+
+TechNodeLabel_103
+{
+Redemption
+}
+
+TechNodeHelp_103
+{
+The hive will automatically try to save you when you're near death, pulling you back to the hive to heal
+}
+
+TechNodeHelp_104
+{
+Sharpness - Your melee damage is increased by half.
+}
+
+TechNodeHelp_105
+{
+Piercing - Your ranged damage is increased by half.
+}
+
+TechNodeHelp_106
+{
+Penetration - Shots go through walls and targets (not implemented).
+}
+
+TechNodeLabel_107
+{
+Celerity
+}
+
+TechNodeHelp_107
+{
+Permanently boosts max speed.
+}
+
+TechNodeLabel_108
+{
+Adrenaline
+}
+
+TechNodeHelp_108
+{
+Get energy back faster.  Each level of adrenaline increases your base energy recovery rate by 33%
+}
+
+TechNodeLabel_109
+{
+Silence
+}
+
+TechNodeHelp_109
+{
+Quietens your every action
+}
+// "quiet, quieter, vewwy vewwy quiet" - An unnamed playtester.
+
+TechNodeLabel_110
+{
+Cloaking
+}
+
+TechNodeHelp_110
+{
+You gain invisibility.  Fast movements will increase your opacity.  Attacks, observatories and scanner sweeps will uncloak you
+}
+
+TechNodeLabel_111
+{
+Focus
+}
+
+TechNodeHelp_111
+{
+Focus decreases the rate of fire and increases the damage of your slot one weapon.
+}
+
+TechNodeLabel_112
+{
+Scent of Fear
+}
+
+TechNodeHelp_112
+{
+Your hive sight will show you nearby enemies
+}
+
+TechNodeLabel_113
+{
+Skulk
+}
+
+TechNodeHelp_113
+{
+Gestate to Skulk.  This is a fast, small alien that is best suited for one on one combat, harassment and guerilla tactics.  Can climb walls (disable with the "duck" key)
+}
+
+TechNodeLabel_114
+{
+Gorge
+}
+
+TechNodeHelp_114
+{
+Gestate to Gorge.  Creates and grows resource towers, hives, upgrade chambers and turrets.  Weak in combat, but good as support unit since it can heal friends and friendly structures
+}
+
+TechNodeLabel_115
+{
+Lerk
+}
+
+TechNodeHelp_115
+{
+Gestate to Lerk.  Provides versatile combat support.  Has long-range spike shooting, choking area-effect spores and protective "umbra" ability.  Fly by tapping the jump key.  Glide by holding the jump key while in the air
+}
+
+TechNodeLabel_116
+{
+Fade
+}
+
+TechNodeHelp_116
+{
+Gestate to Fade.  The Kharaa's main combat unit, with swiping attacks, an acid rocket attack, and teleportation
+}
+
+TechNodeLabel_117
+{
+Onos
+}
+
+TechNodeHelp_117
+{
+Gestate to Onos.  A behemoth that can stomp to stun his enemies, charge through enemies and devour them.  This alien is capable of taking on multiple marines at once
+}
+
+TechNodeLabel_118
+{
+Unlock #2 ability
+}
+
+TechNodeLabel_126
+{
+Unlock #3 ability
+}
+
+TechNodeLabel_31
+{
+Level 4 needed
+}
+
+TechNodeLabel_54
+{
+Level 7 needed
+}
+
+ClassDead
+{
+Dead
+}
+
+ClassDigesting
+{
+Digesting
+}
+
+ClassCommander
+{
+Commander
+}
+
+ClassHeavyMarine
+{
+Heavy
+}
+ClassJetpackMarine
+{
+Jetpack
+}
+
+ClassReinforcing
+{
+Reinforcing
+}
+
+ClassReinforcingComplete
+{
+Ready
+}
+
+ClassLevel1
+{
+Skulk
+}
+
+ClassLevel2
+{
+Gorge
+}
+
+ClassLevel3
+{
+Lerk
+}
+
+ClassLevel4
+{
+Fade
+}
+
+ClassLevel5
+{
+Onos
+}
+
+ClassGestating
+{
+Gestating
+}
+
+Building
+{
+Building: 
+}
+
+
+Researching
+{
+Researching: 
+}
+
+Energy
+{
+Energy: 
+}
+
+
+Prerequisite
+{
+Requires: 
+}
+
+Cost
+{
+Cost:
+}
+
+NotFullyBuilt
+{
+Not fully built
+}
+
+Recycling
+{
+Recycling...
+}
+
+ReinforcementsText
+{
+Reinforcements: 
+}
+
+LogoutText
+{
+LOGOUT
+}
+
+BlipStatus_0
+{
+Enemy
+}
+
+BlipStatus_1
+{
+Weakened enemy
+}
+
+BlipStatus_2
+{
+
+}
+
+BlipStatus_3
+{
+is under attack
+}
+
+BlipStatus_5
+{
+is Gorge
+}
+
+BlipStatus_6
+{
+
+}
+
+BlipStatus_7
+{
+
+}
+
+BlipStatus_8
+{
+Location
+}
+
+Friend
+{
+Friend
+}
+
+Enemy
+{
+Enemy
+}
+
+User3Name_1
+{
+soldier
+}
+
+User3Name_2
+{
+commander
+}
+
+User3Name_3
+{
+skulk
+}
+
+User3Name_4
+{
+gorge
+}
+
+User3Name_5
+{
+lerk
+}
+
+User3Name_6
+{
+fade
+}
+
+User3Name_7
+{
+onos
+}
+
+User3Name_8
+{
+embryo
+}
+
+User3Name_15
+{
+equipment
+}
+
+User3Name_17
+{
+Hive
+}
+
+User3Desc_17
+{
+Aliens spawn here, grants access to higher alien lifeforms and upgrades
+}
+
+User3FriendlyDesc_17
+{
+You spawn here.  It will heal you when you are close by.  Provides "hive sight", which communicates friends, enemies and alerts to your team.  Protect your hives at all costs
+}
+
+User3Name_22
+{
+Resource nozzle
+}
+
+User3Desc_22
+{
+Gives resources when a resource tower is built upon it.  These resources are infinite
+}
+
+User3CommanderDesc_22
+{
+Gives resources when a resource tower is built upon it.  These resources are infinite.
+}
+
+User3Name_23
+{
+command console
+}
+
+User3Desc_23
+{
+Used by the marine commander to create structures and research new technologies
+}
+
+User3FriendlyDesc_23
+{
+Used by the marine commander to create structures and research new technologies.  Your commander is displayed at the top-middle of your screen.  If your team doesn't have a commander, you can become one by "using" the command console
+}
+
+User3CommanderDesc_23
+{
+Select the command console to see the range in which you can build infantry portals.  If the command console is destroyed, you will be ejected back to the ground, and unable to command.  Protect it at all costs
+}
+
+
+User3Name_24
+{
+turret factory
+}
+
+User3Desc_24
+{
+Allows sentry turrets to be built within range.  Turrets need the factory to continue functioning.  The commander can select the turret factory to see this range
+}
+
+User3Name_25
+{
+armory
+}
+
+User3Desc_25
+{
+Gives ammo and allows construction of shotguns, mines and welders within range
+}
+
+User3CommanderDesc_25
+{
+Gives free ammo to friendly soldiers.  Allows construction of shotguns, mines and welders within range.  Select the armory to see this range
+}
+
+User3FriendlyDesc_25
+{
+"Use" the armory to get free ammo for your current weapon.  Also allows construction of shotguns and mines within range
+}
+
+
+User3Name_26
+{
+advanced armory
+}
+
+User3Desc_26
+{
+Gives ammo and allows construction of heavy machine guns and grenade launchers within range
+}
+
+User3CommanderDesc_26
+{
+Gives free ammo to friendly soldiers.  Allows construction of heavy machine guns and grenade launchers within range.  Select the advanced armory to see this range
+}
+
+User3FriendlyDesc_26
+{
+"Use" the advanced armory to get free ammo for your current weapon.  Also allows construction of heavy machine guns and grenade launchers within range
+}
+// "O The armory will now randomly kill players as they use it (Bug in which Armory would occasionally Heal players has been fixed)" - An unnamed PT Lead
+
+User3Name_27
+{
+arms lab
+}
+
+User3Desc_27
+{
+Allows access to armor and ammunition upgrades
+}
+
+User3Name_28
+{
+prototype lab
+}
+
+User3Desc_28
+{
+Allows access to heavy armor and jetpacks
+}
+
+User3Name_29
+{
+observatory
+}
+
+User3Desc_29
+{
+Sights nearby "blips" and uncloaks all enemies within range. Gives access to Scanner Sweep, Motion Sensor upgrade and Distress Beacon
+}
+
+User3Name_30
+{
+chemlab
+}
+
+User3Name_31
+{
+medlab
+}
+
+User3Name_33
+{
+sentry turret
+}
+
+User3Desc_33
+{
+Automatically shoots enemies in range
+}
+
+User3FriendlyName_33
+{
+Automatically shoots your enemies.  Weak against upgraded and higher-lifeform aliens.  Must be built within range of a turret factory.  Damage: 10
+}
+
+User3CommanderName_33
+{
+Automatically shoots enemies and enemy structures.  Weak against upgraded and higher-lifeform aliens.  Must be built within range of a turret factory, but a turret factory isn't needed to continue working.  Select the turret to see its range.  Won't shoot cloaked players.  Good against low level aliens.  Damage: 10
+}
+
+
+User3Name_34
+{
+siege cannon
+}
+
+User3Desc_34
+{
+Automated Siege Cannon (ASC).  Sonic weapon that attacks structures, even through walls, but doesn't attack players
+}
+
+User3FriendlyDesc_34
+{
+Automated Siege Cannon (ASC).  Sonic weapon that attacks structures, even through walls.  Doesn't attack players.  Range: 400  Damage: 165 (double vs. structures) 
+}
+
+User3CommanderDesc_34
+{
+Automated Siege Cannon (ASC).  Sonic weapon that attacks structures, even through walls.  Doesn't attack players.  It can't attack targets that are too close.  Select the ASC to see its minimum and maximum range (it can hit anything in the green).  Range: 400  Damage: 330
+}
+
+User3Name_35
+{
+resource tower
+}
+
+User3Desc_35
+{
+Collects resources for your team at regular intervals
+}
+
+User3Name_37
+{
+infantry portal
+}
+
+User3FriendlyDesc_37
+{
+Spawns marines in from their home.  Destroying the infantry portal means marines can't respawn from it
+}	  
+
+User3FriendlyDesc_37
+{
+Spawns marines in from home.  Without an infantry portal, your team won't be able to respawn, so keep it safe
+}	  
+
+User3CommanderDesc_37
+{
+Spawns marines in from home.  Without an infantry portal, the marines can't respawn
+}
+
+User3Name_38
+{
+nuke
+}
+
+User3Desc_38
+{
+Nuke is arming, and must be destroyed before it finishes!  Once armed, nuke detonates, doing massive damage to nearby players and structures
+}
+
+User3FriendlyDesc_38
+{
+Nuke is arming, protect it while it finishes.  Once armed, nuke detonates, doing massive damage to nearby players and structures
+}
+
+User3CommanderDesc_38
+{
+Nuke is arming, protect it while it finishes.  Once armed, nuke detonates, doing massive damage to nearby players and structures
+}
+
+User3Name_39
+{
+Heavy armor
+}
+
+User3Desc_39
+{
+Pick up to gain heavy armor.  Can't be used with jet-pack.  Provides complete protection from spores
+}
+
+User3Name_40
+{
+Jet-pack
+}
+
+User3Desc_40
+{
+Pick up jet-pack module to gain jet-packing ability.  Can't be used with heavy armor
+}
+
+User3Name_41
+{
+Phase gate
+}
+
+User3Desc_41
+{
+Allows light-speed travel to other phase gates.  'Use' the gate to teleport to another gate
+}
+
+User3CommanderDesc_41
+{
+Allows light-speed travel to other phase gates.  Multiple gates are needed to function properly
+}
+
+User3Name_42
+{
+Defense chamber
+}
+
+User3Desc_42
+{
+Slowly heals nearby friendly players and structures.  Provides one level of defensive upgrades (Carapace, Regeneration or Redemption)
+}
+
+User3Name_43
+{
+Movement chamber
+}
+
+User3Desc_43
+{
+Aliens can use them to teleport to the farthest hive.  Provides one level of movement upgrades (Celerity, Adrenaline or Silence).  Destroying these chambers will remove alien upgrades
+}
+
+User3FriendlyDesc_43
+{
+Walk to chamber and press your "use" button to teleport to a hive under attack.  Provides one level of movement upgrades (Celerity, Adrenaline or Silence)
+}
+
+
+User3Name_44
+{
+Offense chamber
+}
+
+User3Desc_44
+{
+Organic turret that automatically attacks enemy players and structures.	 Damage: 20
+}
+
+User3Name_45
+{
+Sensory chamber
+}
+
+User3Desc_45
+{
+Cloaks nearby teammates and structures and provides sensory upgrades (Cloaking, Focus or Scent of Fear).
+}
+
+
+User3Name_46
+{
+Resource tower
+}
+
+User3Desc_46
+{
+Collects resources for the enemy
+}
+
+User3FriendlyDesc_46
+{
+Collects resources for your team
+}
+
+User3Name_47
+{
+Heavy armor module
+}
+
+User3Desc_47
+{
+Outfits soldier with heavy armor
+}
+
+User3FriendlyDesc_47
+{
+Outfits soldier with heavy armor
+}
+
+User3Name_48
+{
+Jet-pack module
+}
+
+User3Desc_48
+{
+Outfits soldier with jet-pack
+}
+
+User3FriendlyDesc_48
+{
+Outfits soldier with jet-pack
+}
+
+User3Name_49
+{
+Advanced turret factory
+}
+
+User3Desc_49
+{
+Allows construction of sentry turrets and siege turrets
+}
+
+User3FriendlyDesc_49
+{
+Allows construction of sentry turrets and siege turrets
+}
+
+User3Name_57
+{
+Mine
+}
+
+User3Desc_57
+{
+Detonates on contact
+}
+
+User3FriendlyDesc_57
+{
+Detonates on contact
+}
+
+Weapon1Help
+{
+Gore - Get close to your enemy and attack. Damage: %d (double vs. structures)
+}
+
+Weapon2Help
+{
+Spit - Light ranged weapon to keep your enemies at bay.  Damage: %d
+}
+
+Weapon3Help
+{
+Spores - Shoots a cloud of choking spores, that slowly damage enemy players in range.  Damage: %d per second
+}
+
+Weapon4Help
+{
+Spikes - Long-range instant-hit weapon.  Damage: %d
+}
+
+Weapon5Help
+{
+Bite - Deadly close-combat attack.  Get close to your enemies and attack.  Damage: %d
+}
+
+Weapon6Help
+{
+Bite - Deadly close-combat attack.  Get close to your enemies and attack.  Damage: %d
+}
+
+Weapon7Help
+{
+Swipe - Deadly close-combat attack.  Get close to your enemies and attack.  Good against players and structures.  Damage: %d
+}
+
+Weapon8Help
+{
+Webs - Shoot globules near each other and a web will be created between them.  Webs slow enemies and prevent them from using their weapons for a time.  Webs can be destroyed with the welder or by grenade fire
+}
+
+Weapon9Help
+{
+Metabolize - Heals damage at the cost of energy.
+}
+
+Weapon10Help
+{
+Parasite - Infects target with a parasite, making him show up on hive sight at all times.  The parasite cannot be removed.  Damage: %d
+}
+
+Weapon11Help
+{
+Blink - Allows near-instant teleportation.  Point in the direction to travel, and hold the button
+}
+
+Weapon12Help
+{
+Xenocide - Explosive suicide.  Shortly after activating, you blow up, doing heavy damage to everything nearby.  Damage: %d
+}
+
+Weapon13Help
+{
+Knife - Weapon of efficiency and desperation.  Damage: %d
+}
+
+Weapon14Help
+{
+Pistol - High-accuracy, and packs a punch, but small clip size.  Damage: %d
+}
+
+Weapon15Help
+{
+Machine gun - Good accuracy, high rate of fire, medium clip.  Rate of fire: 10 bullets per second.  Damage: %d
+}
+
+Weapon16Help
+{
+Shotgun - For fast moving targets and for delivering lots of damage quickly to close targets.  10 pellets per shot.  Damage: %d per pellet
+}
+
+Weapon17Help
+{
+Heavy machine gun (HMG) - Heavy weaponry for larger enemies.  While quite inaccurate, its massive clip size and rate of fire make it indispensable.  Damage: %d per bullet (half vs. structures)
+}
+
+Weapon18Help
+{
+Welder - Weld open or closed specially designated "weldable" areas of the map.  It can also repair structures, soldier armor, and can cut through webs.  Damage: %d
+}
+
+Weapon19Help
+{
+Mines - Use for defense, or protect your flank on an assault.  Detonates on proximity.  Damage: %d
+}
+
+Weapon20Help
+{
+Grenade launcher - Grenades detonate after 4 seconds, or on contact, and do splash damage.  Damage: %d (double vs. structures) 
+}
+
+Weapon21Help
+{
+Leap - Jump forward quickly, slashing at everything in your way.  Useful for movement, and also in combat.  Damage: %d
+}
+
+Weapon22Help
+{
+Charge - Trample forth in a rage, hurting everything you touch.  The charge drains energy and stops when you run out of energy.  Damage: Substantional
+}
+
+Weapon23Help
+{
+Umbra - Emits a bacterial mist that slows enemy bullets that enter it.  Any friendly player or structure inside umbra rarely gets hits by bullets, but is still susceptible to explosive damage and non-bullet attacks.  Lasts %d seconds
+}
+
+Weapon24Help
+{
+Primal scream - All teammates within range during scream gain energy back faster, move faster and do more damage.  Listen for their screams of defiance
+}
+
+Weapon25Help
+{
+Bile bomb - Organic artillery only hurts structures.  Damage: %d (area damage)
+}
+
+Weapon26Help
+{
+Acid rocket - Slow moving projectile that does splash damage.  Damage: %d
+}
+
+Weapon27Help
+{
+Healing spray - Bacterial spray that heals friendly players and structures and hurts enemies in range.  Damage: %d (+3%%, area effect)
+}
+
+Weapon28Help
+{
+Hand grenade - Grenades detonate after 4 seconds and do splash damage.  Damage: %d (double vs. structures) 
+} 
+
+Weapon29Help
+{
+Stomp - Stuns all enemy players it touches for %d seconds.
+}
+
+Weapon30Help
+{
+Devour - Eat a nearby enemy.  Player is slowly digested, taking %d damage per second.  Onos gets this this damage back as health.  If Onos is killed before digestion completes, the enemy is freed
+}
+
+
+
+CommandStationOtherTeam
+{
+This command console belongs to the other team
+}
+
+CommandStationInUse
+{
+Your team already has a commander, the command console can't be used
+}
+
+WeaponPreventingCommandStation
+{
+Your weapon is preventing use of the command console
+}
+
+CommandStationDestroyed
+{
+This command console is destroyed and can no longer be used!
+}
+
+CommandStationWaitTime
+{
+You must wait longer before re-entering the command console
+}
+
+
+// Particle editing commands
+NoParticleSystem
+{
+That particle system couldn't be found
+}
+
+EditingParticleSystem
+{
+Found particle system, use F7 to edit
+}
+
+
+// Marine help text
+
+// Armor received messages
+HelpTextCSAttractMode
+{
+Point at this command console and press your "use" key to activate command mode
+}
+
+HelpTextArmoryResupply
+{
+"Use" the armory to get free ammo for your current weapon, or to receive a free health pack
+}
+
+HelpTextAttackNearbyStation
+{
+This is the enemy's command console, attack it!
+}
+
+HelpTextBuildTurret
+{
+Point at the base of this turret and hold your "use" key to build it
+}
+
+HelpTextBuildTower
+{
+Point at the base of this resource tower and hold your "use" key to build it
+}
+
+HelpTextExplainTower
+{
+This active resource tower periodically produces resources for your team
+}
+
+HelpTextAttackHive
+{
+Gather your teammates and go find an alien hive to destroy!
+}
+
+HelpTextOtherHiveBlocked
+{
+The hive is blocked by a player or structure.  Clear the area nearby and try again
+}
+
+HelpTextOtherHiveBuilding
+{
+Only one hive can be built at a time.  Wait until the other hive is built before starting this one
+}
+
+HelpTextEmptyHiveNotNearby
+{
+Hives can only be built at hive locations (look for infestation and a translucent hive indicator)
+}
+
+HelpTextAttackNearbyHive
+{
+There is an enemy hive nearby, go kill it to stop the alien menace!
+}
+
+HelpTextFriendlyMovementChamber
+{
+Press your "use" key on this movement chamber to teleport to a hive under attack.  It also increases your energy regeneration when nearby
+}
+
+HelpTextAttackMovementChamber
+{
+This is an enemy movement chamber, it allows them to teleport to their hive and makes them regain energy faster
+}
+
+HelpTextFriendlyOffensiveChamber
+{
+This is an offense chamber, it will shoot at your enemies
+}
+
+HelpTextAttackOffensiveChamber
+{
+This is an enemy offense chamber, watch out!
+}
+
+HelpTextFriendlyDefensiveChamber
+{
+This defensive chamber will regenerate players and structures nearby.  It makes a sloshing sound when it heals
+}
+
+HelpTextAttackDefensiveChamber
+{
+This is an enemy defensive chamber, it heals enemy players and structures
+}
+
+HelpTextFriendlySensoryChamber
+{
+This is a sensory chamber, it cloaks nearby players and structures
+}
+
+HelpTextAttackSensoryChamber
+{
+This is an enemy sensory chamber
+}
+
+HelpTextOpenWeldable
+{
+This area can be opened with a welder
+}
+
+HelpTextCloseWeldable
+{
+This area can be welded shut with a welder
+}
+
+HelpTextPhaseGate
+{
+Enter the phase gate to teleport
+}
+
+HelpTextAlienPopupMenu
+{
+Use your "pop-up menu" to build structures, evolve upgrades, and switch teams (right mouse button)
+}
+
+HelpTextMarinePopupMenu
+{
+Use your "pop-up menu" to access voice commands, ask for orders, leave the team, and more (right mouse button)
+}
+
+HelpTextOrder
+{
+You have been given an order by the commander.  The blue circle on your screen describes the location and type of your order.  Use your pop-up menu to ask for orders or acknowledge them
+}
+
+HelpTextCommanderUseable
+{
+As commander, you can "use" any buttons or switches on the map by left-clicking them
+}
+
+HelpTextMarineCommandMenu
+{
+Press your "pop-up menu" key to communicate with your team (default is right mouse button)
+}
+
+HelpTextResourceDropoff
+{
+You earned resource points for your team!
+}
+
+HelpTextJetpacks
+{
+Your commander has researched jet-packs for your team.  Hold your jump key to use it
+}
+
+HelpTextAlienCommandMenu
+{
+Press your "pop-up menu" key to change lifeforms and evolve upgrades (default is right mouse button)
+}
+
+HelpTextAttackTower
+{
+This resource tower earns resources for the enemy...destroy it!
+}
+
+HelpTextAlienWeapons
+{
+Use the mousewheel or the number keys to switch abilities.  A red icon means that ability is disabled until you get more hives
+}
+
+HelpTextAlienResources
+{
+The figure on the left indicates your resources.  You get resources from your team's resource towers.  Resources can be spent using the pop-up menu
+}
+
+HelpTextAlienEnergy
+{
+The yellow bar on the right is your energy.  Abilities cost energy to use
+}
+
+HelpTextAlienPendingUpgrades
+{
+The small blinking icon(s) on the right side of your screen means you can now evolve new traits!  Open the pop-up menu and make a choice of one of the upgrades
+}
+
+HelpTextAlienBuildStructure
+{
+As a builder alien, you can create structures for your team using your pop-up menu
+}
+
+HelpTextAlienBuildStructure
+{
+There is an unbuilt alien structure nearby.  Alien structures build slowly on their own, but as a builder, you can speed it up.  Point at the base of the structure and hold your "use" key
+}
+
+HelpTextAlienHiveSight
+{
+The animated icons on your screen indicate your team's "hive sight".  Green icons are your team's gorges, yellow-reddish icons show hive locations and red icons show structures or friends under attack
+}
+
+HelpTextAlienVisionMode
+{
+The locations of all nearby breathing things are always known to the hive mind.  It can show you all life, on your and the enemy team, when you press your "flashlight" key
+}
+
+HelpTextAlienCommunication
+{
+You can communicate with your team via hive sight by using your pop-up menu.  If you see enemies coming towards one of your hives, open your pop-up menu, move down, right, up, then release.  Your teammates will see "incoming" on hive sight
+}
+
+HelpTextAlienUnderAttack
+{
+One of your teammates or structures is under attack.  Spin your view around and look for the hive sight alert
+}
+
+HelpTextBuilder
+{
+You are now a Gorge.  Stay out of combat and use your pop-up menu to build different structures
+}
+
+HelpTextWeb
+{
+Fire web strands at walls and floors to create webs between them.  Enemies that touch webs are slowed and can't use their weapons temporarily
+}
+
+HelpTextWallwalking
+{
+You can hold your duck key to walk up walls and ceilings
+}
+
+HelpTextBite
+{
+Get close to your enemies and press your attack key to bite them
+}
+
+HelpTextFlight
+{
+Try tapping your jump key to fly.  You can also hold your jump key while in the air to glide
+}
+
+HelpTextSpores
+{
+Press your attack button to launch a spore cloud that hurts players inside it
+}
+
+HelpTextAlienResource
+{
+Find a resource node and build one of these on top of it to capture resources for your team
+}
+
+HelpTextPopupMenu
+{
+Hold your right mouse button (secondary attack) to show the pop-up menu
+}
+
+HelpTextBuyUpgrade
+{
+Aliens can evolve new traits with the pop-up menu.  Try it: hold your pop-up menu button (right mouse button by default), and move the mouse right
+}
+
+HelpTextBuyLifeform
+{
+Aliens can morph into new lifeforms.  Try it: hold your pop-up menu button (right mouse button by default), move your mouse down, then right, then release
+}
+
+HelpTextCommanderGiveOrders
+{
+Right-click on the ground or a structure to give an order
+}
+
+HelpTextCommanderSelectPlayers
+{
+Left-click on players or drag a box around them to select them
+}
+
+HelpTextCommanderLogout
+{
+You can leave commander mode by clicking the red "logout" button in the upper-right corner of your screen
+}
+
+// This message isn't in yet
+HelpTextCommanderBuild
+{
+This structure has not been fully built.  Select a player then right-click this structure to give him an order to build it
+}
+
+HelpTextCommanderUse
+{
+Doors, lifts and other moving structures can be "hacked" by the commander.  Left-click to hack this structure
+}
+
+HelpTextCommanderAttack
+{
+This target can be attacked!  Right-click to give an attack order
+}
+
+HelpTextCommanderWeld
+{
+This target can be welded.  Buy a welder for a teammate, then right-click here to give a welding order
+}
+
+HelpTextCommanderGet
+{
+Right-click here to give an order to pick this up
+}
+
+HelpTextCommanderUnderAttack
+{
+You are under attack!  Press your "jump" key to go to the alert
+}
+
+HelpTextCommanderResearchComplete
+{
+Your research is complete.  Press your "jump" key to go to the site of the research
+}
+
+HelpTextCommanderUpgradeComplete
+{
+Your upgrade is complete.  Press your "jump" key to go to the upgraded structure
+}
+
+JetpackEnergyHUDText
+{
+Jet-pack energy
+}
+
+HelpTextDisableHelp
+{
+You can turn off this help text by unchecking the "show hints" checkbox your multiplayer customization menu (cl_autohelp 0)
+}
+
+Paralyzed
+{
+Paralyzed
+}
+
+Stunned
+{
+Stunned
+}
+
+Digested
+{
+Being digested...
+}
+
+DigestingPlayer
+{
+Digesting %s...
+}
+
+Parasited
+{
+Parasited
+}
+
+PrimalScreamed
+{
+Primal scream
+}
+
+Catalysted
+{
+Catalyst
+}
+
+Umbraed
+{
+In umbra
+}
+
+Webbed
+{
+Webbed
+}
+
+// Order descriptions
+Order2
+{
+Move to waypoint
+}
+
+Order3
+{
+Attack target
+}			 
+
+Order4
+{
+Build %s
+}
+
+Order5
+{
+Guard %s
+}
+
+Order6
+{
+Use welder at waypoint
+}
+
+Order7
+{
+Get %s
+}
+
+Order9
+{
+Hold your position
+}
+
+Range
+{
+%d meters
+}
+
+// Timelimit for tourny mode
+GameTime
+{
+Game time
+}
+
+Elapsed
+{
+elapsed
+}
+
+TimeLimit
+{
+Time limit
+}
+
+Remaining
+{
+left
+}
+
+// HLTV 
+Spec_duck
+{
+Press DUCK for Spectator Menu
+}
+
+SPECT_OPTIONS
+{
+Options
+}
+
+CAM_OPTIONS
+{
+Camera Options
+}
+
+SpecMode5Text
+{
+}
+
+OBS_MAP_FREE
+{
+Map free camera
+}
+
+OBS_MAP_CHASE
+{
+Map chase camera
+}
+
+OBS_CHASE_FREE
+{
+Free chase camera
+}
+
+OBS_CHASE_LOCKED
+{
+Locked chase camera
+}
+
+OBS_IN_EYE
+{
+In-eye camera
+}
+
+OBS_ROAMING
+{
+Free look camera
+}
+
+// Official map locations
+testlocation1
+{
+The translated refinery
+}
+
+/////////////
+// ns_bast //
+/////////////
+bastlocation_dockingbay
+{
+Marine Start - Docking Bay 1
+}
+
+bastlocation_mainjunction
+{
+Main Aft Junction
+}
+
+bastlocation_cargolock
+{
+Heavy Lock Door
+}
+
+bastlocation_atmosphericprocessing
+{
+Atmospheric Processing
+}
+
+bastlocation_furnace
+{
+Steam Generation
+}
+
+bastlocation_watertreatment
+{
+Water Treatment
+}
+
+// NOTE: The hyphen in hive location names is important.  Everything before the hyphen is trimmed off when displaying
+// location names for aliens (the hive icons in the upper right of their HUD).  Make sure to follow the convention:
+// Hive Location - name
+bastlocation_feedwatercontrol
+{
+Hive Location - Feedwater Control
+}
+
+bastlocation_trammaintenance
+{
+Tram Maintenance
+}
+
+bastlocation_tramtunnel
+{
+Tram Tunnel
+}
+
+bastlocation_lowerjunction
+{
+Lower Junction
+}
+
+bastlocation_Refinery
+{
+Hive Location - Refinery
+}
+
+bastlocation_emshaft
+{
+EM Drill Shaft
+}
+
+bastlocation_engineroom
+{
+Hive Location - Engine Room
+}
+
+bastlocation_dockinghydraulics
+{
+Docking Hydraulics
+}
+
+bastlocation_maintenancejunction
+{
+Maintenance Junction
+}
+
+bastlocation_ncorridor
+{
+"N" Corridor
+}
+
+bastlocation_observationbridge
+{
+Observation Bridge
+}
+
+bastlocation_starboardairlock
+{
+Starboard Airlock
+}
+
+bastlocation_portairlock
+{
+Port Airlock
+}
+
+bastlocation_maintenanceaccess
+{
+Maintenance Access Duct
+}
+
+bastlocation_pressureequalization
+{
+Pressure Equalization Conduit
+}
+
+bastlocation_starboardcorridor
+{
+Aft Starboard Corridor
+}
+
+bastlocation_filtration
+{
+Feedwater Filtration Access
+}
+
+bastlocation_ventilation
+{
+Ventilation Conduit
+}
+
+bastlocation_databank
+{
+Databank Access
+}
+
+bastlocation_enginecorridor
+{
+Engine Corridor
+}
+
+/////////////
+// ns_hera //
+/////////////
+heralocation_archive
+{
+Hive Location - Archiving
+}
+ 
+heralocation_processingcorea
+{
+Data Core Alpha
+}
+ 
+heralocation_reception
+{
+Hera Entrance and Reception
+}
+ 
+heralocation_holoroom
+{
+Central Monitoring - 'Holoroom'
+}
+ 
+heralocation_storage
+{
+General Cargo Storage
+}
+ 
+heralocation_hanger
+{
+Marine Start - Loading bay
+}
+ 
+heralocation_docking
+{
+Marine Start - Landing Pad
+}
+ 
+heralocation_processing
+{
+Processing
+}
+ 
+heralocation_processingcoreb
+{
+Hive Location - Data Core Delta
+}
+ 
+heralocation_ventilation
+{
+Hive Location - Ventilation 3-C
+}
+ 
+heralocation_maintenence
+{
+Maintenance
+}
+ 
+heralocation_fogcorridor
+{
+Maintenance Corridor
+}
+ 
+heralocation_tube
+{
+Hera Entrance Walkway
+}
+
+heralocation_systems
+{
+Systems
+}
+
+heralocation_ncorridor
+{
+Northern Corridor
+}
+
+heralocation_cavity
+{
+Vent Cavity
+}
+
+heralocation_maccess
+{
+Maintenance Access
+}
+
+heralocation_lift
+{
+Cargo Lift
+}
+
+heralocation_mpipes
+{
+Maintenance Pipes
+}
+
+// Nothing titles
+nothinglocation_rr
+{
+Space Station Nothing - Sub Sector 77
+}
+
+nothinglocation_ms
+{
+Marine Start - S77 Vestibule
+}
+
+nothinglocation_dock
+{
+Docking Wing 01
+}
+
+nothinglocation_thres1
+{
+The Threshold
+}
+
+nothinglocation_thres2
+{
+The Threshold
+}
+
+nothinglocation_junc1
+{
+The Junction
+}
+
+nothinglocation_junc2
+{
+The Junction
+}
+
+nothinglocation_vent
+{
+Ventilation Chamber
+}
+
+nothinglocation_comm
+{
+Communications Hub 063
+}
+
+nothinglocation_things
+{
+Room With Things
+}
+
+nothinglocation_cargo
+{
+Hive Location - Cargo Bay Foyer
+}
+
+nothinglocation_pipe
+{
+Pipe Room
+}
+
+nothinglocation_paint1
+{
+Painted Corridor
+}
+
+nothinglocation_paint2
+{
+Painted Corridor
+}
+
+nothinglocation_paint3
+{
+Painted Corridor
+}
+
+nothinglocation_quada
+{
+Quad Lift Area
+}
+
+nothinglocation_quad
+{
+Quad Lift
+}
+
+nothinglocation_chamb
+{
+Foreboding Antechamber
+}
+
+nothinglocation_sas1
+{
+Silo Access South
+}
+
+nothinglocation_sas2
+{
+Silo Access South
+}
+
+nothinglocation_silo
+{
+Hive Location - PowerSilo
+}
+
+nothinglocation_san1
+{
+Silo Access North
+}
+
+nothinglocation_san2
+{
+Silo Access North
+}
+
+nothinglocation_mias1
+{
+Miasma Walkway
+}
+
+nothinglocation_mias2
+{
+Miasma Walkway
+}
+
+nothinglocation_mias3
+{
+Miasma Walkway
+}
+
+nothinglocation_gen
+{
+Generator Room
+}
+
+nothinglocation_elev1
+{
+Elevator Shaft 01
+}
+
+nothinglocation_elev2
+{
+Elevator Shaft 02
+}
+
+nothinglocation_eek
+{
+Intimidation
+}
+
+nothinglocation_kismet
+{
+Ominous Kismet
+}
+
+nothinglocation_vae
+{
+Viaduct Access East
+}
+
+nothinglocation_vaw
+{
+Viaduct Access West
+}
+
+nothinglocation_viaduct
+{
+Hive Location - The Great Viaduct
+}
+
+// TANITH info_location data START
+tanith_westenter
+{
+Western Entrance
+}
+
+tanith_marinebase
+{
+Marine Start - Uplink Command
+}
+
+tanith_outsidebase
+{
+Exterior Access Paths
+}
+
+tanith_north
+{
+Northern Corridor
+}
+
+tanith_sat
+{
+External Satellite Relay
+}
+
+tanith_satcomm
+{
+Hive Location - Satellite Communications
+}
+
+tanith_transport
+{
+Chemical Transport Room
+}
+
+tanith_cpu
+{
+Computer Control
+}
+
+tanith_acid
+{
+Acidic Solution Processing
+}
+
+tanith_reactor
+{
+Reactor Room
+}
+
+tanith_enter
+{
+Eastern Entrance
+}
+
+tanith_centerenter
+{
+Central Entrance
+}
+
+tanith_east
+{
+East Access Tunnels
+}
+
+tanith_research
+{
+Research Labs
+}
+
+tanith_rr
+{
+Tanith Ready Room
+}
+tanith_waste
+{
+Hive Location - Waste Handling
+}
+
+tanith_central
+{
+Central Access Tunnels
+}
+
+tanith_storageenter
+{
+Storage Entrance
+}
+
+tanith_cargo
+{
+Cargo Storage
+}
+
+tanith_fusion
+{
+Hive Location - Fusion Reactor
+}
+
+tanith_west
+{
+West Access Corridor
+}
+// TANITH info_location data END 
+
+
+// NANCY info_location data START
+nancy_cargo
+{
+Cargo Hold 2
+}
+
+nancy_aux
+{
+Auxillary Command
+}
+
+nancy_engine
+{
+Port Engine Room
+}
+
+nancy_crawl
+{
+Sub-tunnel
+}
+
+nancy_maint
+{
+Maintenance Shaft
+}
+
+nancy_shaft
+{
+Maintenance Shaft
+}
+
+nancy_mother
+{
+Noname
+}
+
+nancy_lockers
+{
+Crew Lockers
+}
+
+nancy_mess
+{
+Mess Hall
+}
+
+nancy_airlock
+{
+Airlock Exchange
+}
+
+nancy_port
+{
+Port Airlock
+}
+
+nancy_bridge
+{
+Bridge
+}
+
+nancy_cockpit
+{
+Cockpit
+}
+
+nancy_star
+{
+Starboard Airlock
+}
+
+nancy_gen
+{
+Auxiliary Generators
+}
+
+nancy_motherinter
+{
+Mother Interface
+}
+
+nancy_subspace
+{
+Subspace Array Interface
+}
+
+nancy_crew
+{
+Crew Quarters
+}
+// NANCY info_location data END
+
+// CAGED info_location data START
+caged_marine
+{
+Marine Spawn - Main Hold
+}
+
+caged_upsewer
+{
+Upper Sewer
+}
+
+caged_dsewer
+{
+Lower Sewer
+}
+
+caged_hive1
+{
+Hive Location - Sewer
+}
+
+caged_hive2
+{
+Hive Location - Ventilation System
+}
+
+caged_hive3
+{
+Hive Location - Generator
+}
+
+caged_pure
+{
+Purification Station 01
+}
+
+caged_central
+{
+Central Processing
+}
+
+caged_vaccess
+{
+Ventilation Access
+}
+
+caged_work
+{
+Stability Monitoring
+}
+
+caged_auxgen
+{
+Auxiliary Generator
+}
+
+caged_service
+{
+Shipping Tunnels
+}
+
+caged_area2
+{
+Upper Shipping Access
+}
+// CAGED info_location data END
+
+// Eclipse info_location... info. (BEGIN)
+eclipse_dock
+{
+Docking Control
+}
+
+eclipse_marinespawn
+{
+Marine Spawn - Cargo Transfer
+}
+
+eclipse_station
+{
+Station Access
+}
+
+eclipse_stationeast
+{
+Station Access East
+}
+
+eclipse_stationalpha
+{
+Station Access Alpha
+}
+
+eclipse_stationwest
+{
+Station Access West
+}
+
+eclipse_triad
+{
+Triad Generator Array
+}
+
+eclipse_triadb
+{
+Triad Access B
+}
+
+eclipse_access1c
+{
+Access Corridor 1C
+}
+
+eclipse_access1b
+{
+Access Corridor 1B
+}
+
+eclipse_access1a
+{
+Primary Access Corridor 1A
+}
+
+eclipse_horseshoe
+{
+The Horseshoe
+}
+
+eclipse_tjunct
+{
+T-Junction
+}
+
+eclipse_keyhole
+{
+The Keyhole
+}
+
+eclipse_maint
+{
+Hive - Maintenance Access
+}
+
+eclipse_south
+{
+South Loop
+}
+
+eclipse_core
+{
+Hive - Computer Core
+}
+
+eclipse_northcore
+{
+North Core Access
+}
+
+eclipse_westcore
+{
+West Core Access
+}
+
+eclipse_subjunct
+{
+Power Sub-Junction 3
+}
+
+eclipse_access1d
+{
+Access Corridor 1D
+}
+
+eclipse_commandnorth
+{
+Command Access North
+}
+
+eclipse_command
+{
+Hive - Eclipse Command
+}
+
+eclipse_genmon
+{
+Primary Generator Monitors
+}
+
+eclipse_commandsouth
+{
+Command Access South
+}
+
+eclipse_access1a
+{
+Access Corridor 1A
+}
+// Eclipse info_location... info. (END)
+
+
+// Veil info_location (START)
+
+veil_marine
+{
+Marine Spawn - Mobile Command Interface
+}
+
+veil_lifteast
+{
+Lift 5 East
+}
+
+veil_swhive
+{
+Hive - Sub-Sector 5B Access
+}
+
+veil_south
+{
+Hive - Cargo Transfer South
+}
+
+veil_southeast
+{
+Hive - The Pipeline
+}
+
+veil_overlook
+{
+The Overlook
+}
+
+veil_topography
+{
+Topographical Analysis
+}
+
+veil_nano
+{
+NanoGrid Status
+}
+
+veil_dome
+{
+The Dome
+}
+
+veil_y
+{
+Y Junction
+}
+
+veil_skylight
+{
+West Skylights
+}
+
+veil_satellite
+{
+Satellite Feed
+}
+
+veil_pod1
+{
+Monitoring Pod 1
+}
+
+veil_pod2
+{
+Monitoring Pod 2
+}
+
+veil_waypointing
+{
+System Waypointing
+}
+
+veil_nanoeast
+{
+NanoGrid Access East
+}
+
+veil_nanowest
+{
+NanoGrid Access West
+}
+
+veil_c12
+{
+Emergency Nozzle C-12
+}
+
+veil_junctionwest
+{
+West Junction
+}
+
+veil_junctioneast
+{
+East Junction
+}
+
+veil_power
+{ 
+Power Core Status 
+}
+
+// Veil info_location (END)
diff --git a/main/turkish_titles.txt b/main/turkish_titles.txt
new file mode 100644
index 00000000..64e954ac
--- /dev/null
+++ b/main/turkish_titles.txt
@@ -0,0 +1,4329 @@
+//TITLES FOR NATURAL SELECTION
+//DO NOT ALTER THIS FILE
+//
+//Turkish translation by disq.
+//
+// Position command $position x y 
+// x & y are from 0 to 1 to be screen resolution independent
+// -1 means center in each dimension
+// Effect command $effect <effect number>
+// effect 0 is fade in/fade out
+// effect 1 is flickery credits
+// effect 2 is write out (training room)
+// Text color r g b command $color
+// fadein time fadeout time / hold time
+// $fadein (message fade in time - per character in effect 2)
+// $fadeout (message fade out time)
+// $holdtime (stay on the screen for this long)
+
+////////////////////
+// Green teletype //
+////////////////////
+$position 0.15 0.15
+$effect 2
+$color 0 200 0
+$color2 0 255 0
+$fadein 0.04
+$fxtime 0.25
+$holdtime 6.0
+$fadeout 0.5
+
+Team_AutoAssign
+{
+Otomatik Takim Sec
+}
+
+Menu_Spectate
+{
+Izle
+}
+
+UndefinedTeam
+{
+Ready Room
+}
+
+Menu_LeaveGame
+{
+Oyundan cik
+}
+
+Menu_ReadyRoom
+{
+Ready Room
+}
+
+Menu_Marine1Team
+{
+Marine takimi
+}
+
+Menu_Alien1Team
+{
+Alien takimi
+}
+
+Marine1Team
+{
+Frontiersmen
+}
+
+Alien1Team
+{
+Kharaa
+}
+
+Marine2Team
+{
+Frontiersmen
+}
+
+Alien2Team
+{
+Kharaa
+}
+
+AutoTeam
+{
+Otomatik secilmis
+}
+
+Muted
+{
+Susturulmus
+}
+
+Unmuted
+{
+Konusabilir
+}
+
+No_longer_hear_that_player
+{
+Oyuncuyu artik duyamazsiniz
+}
+
+// SDK 2.0 Spectator Menu
+Spec_Map
+{
+Harita
+}
+
+Spec_Mode1
+{
+Kilitli Takipci Kamera
+}
+
+Spec_Mode2
+{
+Serbest Takipci Kamera
+}
+
+Spec_Mode3
+{
+Serbest Bakis
+}
+
+Spec_Mode4
+{
+First Person
+}
+
+Spec_Mode5
+{
+Serbest Kusbakisi
+}
+
+Spec_Mode6
+{
+Takipci Kusbakisi
+}
+
+Spec_NoTarget
+{
+Gecerli oyuncu bulunamadi, takipci kamera moduna gecilemiyor.
+}
+
+Spec_Help
+{
+Ready Room icin F4     Gorunusu degistirmek icin sol ve sag ok tuslarini, ziplama ve ates etmeyi kullanin
+}
+
+Spec_Help_Text
+{
+Asagidaki tuslarla goruntu seklini degistirebilirsiniz:
+
+ Ates etme ya da Sag Ok - Sonraki oyuncuya gec
+ Pop-up menu ya da Sol Ok - Onceki oyuncuya gec
+ Ziplama - Goruntu seklini degistir
+ Use tusu - Ikinci goruntu seklini degistir
+ 
+ Egilme  - Izleyici menusunu aktiflestir
+  
+Kusbakisi Gorunumde hareket etmek icin:
+
+ Sola gitme - Sola hareket eder
+ Saga gitme - Saga hareket eder
+ Ileri gitme - Yaklastirir
+ Geri gitme - Uzaklastirir
+ Fare - Harita ya da izlenen oyuncu cevresinde dondurur
+}
+
+Spec_Slow_Motion
+{
+Yavas Cekim
+}
+
+Spec_Replay
+{
+Tekrar
+}
+
+Spec_Help2
+{
+Yazdiklariniz ve konustuklarinizi yalnizca diger izleyiciler duyabilir
+}
+
+Spec_Only_Help
+{
+}
+
+Directed
+{
+Otomatik
+}
+
+SpectatorsNotAllowed
+{
+Bu sunucu izleyici kabul etmiyor.
+}
+
+ObsInEyePrefix
+{
+Gozunden goruyorsunuz:
+}
+
+SpectatorTeam
+{
+Izleyiciler
+}
+
+Spectators
+{
+Izleyiciler
+}
+
+TEAM
+{
+Takim
+}
+
+TEAMS
+{
+Takimlar
+}
+
+PLAYER
+{
+Oyuncu
+}
+
+Player_plural
+{
+Oyuncu
+}
+
+PLAYERS
+{
+Oyuncular
+}
+
+SCORES
+{
+Oyuncu bilgileri
+}
+
+SCORE
+{
+Skor
+}
+
+DEATHS
+{
+Olum
+}
+
+LATENCY
+{
+Ping
+}
+
+VOICE
+{
+Ses
+}
+
+Unassigned
+{
+Takimsiz
+}
+
+Menu_OK
+{
+Tamam
+}
+
+Points
+{
+resource
+}
+
+Cost
+{
+Bedel
+}
+
+NoSpectating
+{
+Bu sunucuda izleyici olmaya izin verilmiyor.
+}
+
+// Main game messages
+ReadyRoomMessage
+{
+Ready Room'dasiniz. Takim secmek ya da mac izlemek icin bir kapidan girin.
+}
+
+ReinforcementMessage
+{
+Yeniden spawn olmak icin sirada bekliyorsunuz.
+}
+
+ReinforcingMessage
+{
+Yeniden spawn oluyorsunuz...
+}
+
+ObserverMessage
+{
+Izleyici oldunuz. Bu oyuna artik giremeyeceksiniz, sonrakine girebilirsiniz.
+}
+
+CantSwitchTeamsInTournyMode
+{
+Tournament mode acik; takim degistiremezsiniz.
+}
+
+CantSwitchTeamsAfterGameStart
+{
+Oyun basladiktan sonra takim degistiremezsiniz.
+}
+
+TooManyPlayersOnTeam
+{
+Bu takimda cok oyuncu var.
+}
+
+CantJoinAfterSpectating
+{
+Bir kez izleyici olduktan sonra surmekte olan oyuna giremezsiniz.
+}
+
+CanOnlyJoinTeamYouveReinforced
+{
+Karsi takimi gormussunuz, sonraki oyuna kadar o takima giremezsiniz.
+}
+
+YouCanJoinSoon
+{
+Bu takima az sonra gireceksiniz.
+}
+
+AlreadyOnTeam
+{
+Zaten bir takimdasiniz.  Yeni bir takim secmek icin once Ready Room'a gecmelisiniz.
+}
+
+SoldierMessage
+{
+Su an bir askersiniz.  Commander'in emirlerine uymali ve karsi takimin takim arkadaslarinizi oldurmemesi ya da yapilariniza zarar vermemesi icin elinizden geleni yapmalisiniz.
+}
+
+ObjectivesVsAliens
+{
+Alien'lar ile mucadele ediyorsunuz!  Alien'lar hive'larda respawn olurlar. Oyunu kazanmak icin tum alien hive'larini ve tum alien'lari yok etmelisiniz.
+}
+
+ObjectivesVsMarines
+{
+Marine'ler ile mucadele ediyorsunuz. Marine'ler infantry portal'larda respawn olurlar. Oyunu kazanmak icin tum infantry portal'lari yok etmeli ve sonra tum marine'leri oldurmelisiniz.
+}
+
+Handicap
+{
+Handikap
+}
+
+CommanderMessage
+{
+Sol tus ile, ya da sol tusa basili tutup surukleyerek oyunculari secebilir ve sonra bir yapiya, oyuncuya ya da yere sag tiklayarak onlara emir verebilirsiniz.  Sol alt kisimdaki menu yapilar insa etmenizi ve askerlerinizi donatmanizi saglar.
+}
+
+Commander
+{
+Comm
+}
+
+NoCommander
+{
+Commander yok
+}
+
+GestationMessage
+{
+Yeni bir alien yasam bicimine donusuyorsunuz.  Kabugunuzu kirmaya hazirlanin...
+}
+
+CocoonMessage
+{
+You have been cocooned!  
+}
+
+YouAreReinforcements
+{
+Destek kuvvet olarak cagrildiniz!
+}
+
+//////////////
+// Pie menu //
+//////////////
+MenuMarineRoot
+{
+Baslat
+}
+
+//MenuMarineRoot
+//{
+//!marinenode
+//}
+
+
+MenuComms
+{
+Iletisim
+}
+
+MenuTalk
+{
+Konusma
+}
+
+MenuAttacked
+{
+"Saldiri!"
+}
+
+MenuCheer
+{
+Alkis
+}
+
+MenuCoverMe
+{
+"Beni koru!"
+}
+
+MenuRetreat
+{
+"Geri cekiliyoruz!"
+}
+
+MenuInPosition
+{
+"Yerimdeyim"
+}
+
+MenuEnemySpotted
+{
+"Dusman var"
+}
+
+MenuMoveOut
+{
+"Gidelim Buradan"
+}
+
+MenuAllClear
+{
+"Temiz"
+}
+
+MenuYell
+{
+Bagir
+}
+
+MenuSay
+{
+Konus
+}
+
+MenuRogerThat
+{
+"Tamamdir"
+}
+
+MenuHello
+{
+"Merhaba"
+}
+
+MenuNeedHelp
+{
+"Yardim gerekli"
+}
+
+MenuNeedHealth
+{
+"Saglik gerekli"
+}
+
+MenuNeedAmmo
+{
+"Cephane gerek"
+}
+
+MenuFollowMe
+{
+"Beni takip et"
+}
+
+MenuCovering
+{
+"Koruyorum"
+}
+
+MenuOrders
+{
+Emirler
+}
+
+MenuNeedOrder
+{
+"Emir gerekli"
+}
+
+MenuAck
+{
+"Anlasildi Tamam"
+}
+
+MenuAdmin
+{
+Yonetici
+}
+
+MenuReadyRoom
+{
+Ready room
+}
+
+MenuVoteCommanderDown
+{
+Commander'i at
+}
+
+MenuArea
+{
+Alan
+}
+
+MenuMoveTo
+{
+Ilerle
+}
+
+MenuGuard
+{
+Koru
+}
+
+MenuTarget
+{
+Hedef
+}
+
+MenuDeploy //fixme
+{
+Kur
+}
+
+MenuIncoming
+{
+Gelen var
+}
+
+MenuProceed
+{
+Ilerle
+}
+
+MenuFireTarget
+{
+Hedefe ates et
+}
+
+MenuTaunt
+{
+Alay et
+}
+
+MenuTakeCover
+{
+Siper al
+}
+
+MenuReady
+{
+Hazir
+}
+
+MenuDefendObj
+{
+Koru
+}
+
+MenuCeaseFire
+{
+Atesi kes
+}
+
+MenuTeam
+{
+Takim
+}
+
+MenuBuilding
+{
+Insa et
+}
+
+MenuAttackObj
+{
+Saldir
+}
+
+MenuTaunt
+{
+Alay et
+}
+
+MenuHealth
+{
+"Saglik"
+}
+
+MenuCameraTower
+{
+Kamera
+}
+
+MenuTurret
+{
+Turret
+}
+
+MenuSiegeTurret
+{
+Siege
+}
+
+MenuBlazeOfGlory
+{
+Blaze
+}
+
+MenuProtect
+{
+Protect
+}
+
+MenuReinforce
+{
+Reinforce
+}
+
+MenuArmorUpgrade
+{
+Heavy
+}
+
+MenuRepair
+{
+Repair
+}
+
+MenuPowerups
+{
+Stim
+}
+
+MenuAdrenaline
+{
+Adrenaline
+}
+
+MenuDefMatrix
+{
+Def matrix
+}
+
+MenuPhaseGate
+{
+Phase gate
+}
+
+MenuSelf
+{
+Me
+}
+
+MenuBuy
+{
+Buy
+}
+
+MenuHeavy
+{
+Heavy
+}
+
+MenuShotgun
+{
+Shotgun
+}
+
+MenuHeavyMG
+{
+Heavy MG
+}
+
+MenuLauncher
+{
+Launcher
+}
+
+MenuFlamer
+{
+Flamer
+}
+
+MenuNuke
+{
+Nuke
+}
+
+MenuWeapon
+{
+Weapon
+}
+
+MenuEquipment
+{
+Equipment
+}
+
+MenuUse
+{
+Use
+}
+
+MenuNextWeapon
+{
+Next weapon
+}
+
+MenuJetpacks
+{
+Jet-packs
+}
+
+MenuReloadWeapon
+{
+Reload
+}
+
+MenuDropWeapon
+{
+Drop
+}
+
+MenuLight
+{
+Light
+}
+
+MenuAmmo
+{
+Ammo
+}
+
+MenuMines
+{
+Mines
+}
+
+MenuGrenades
+{
+Grenades
+}
+
+MenuUpgradeMG
+{
+Upgrade
+}
+
+////////////////////
+// Armor upgrades // 
+////////////////////
+
+MenuArmorFull
+{
+Armor full
+}
+
+MenuBuyArmorHeavy
+{
+Heavy armor
+}
+
+MenuBuyArmorMotionTrack
+{
+Tracker
+}
+
+MenuBuyArmorJetpack
+{
+Jet-packs
+}
+
+MenuBuyArmorLifeSupport
+{
+Sustain
+}
+
+// Rank
+MenuRank
+{
+Rank
+}
+
+MenuPromote
+{
+Promote
+}
+
+MenuDemote
+{
+Demote
+}
+
+//////////////////////////////////////////////////
+// Don't localize these, they are sprite names: //
+//  (sprites/640(or 320)name.spr)               //
+//////////////////////////////////////////////////
+MenuAlienRoot
+{
+Start
+}
+
+MenuAlienSmallMorph
+{
+Lifeform
+}
+
+MenuAlienMorphLevel1
+{
+Skulk
+}
+
+MenuAlienMorphLevel2
+{
+Gorge
+}
+
+MenuAlienBigMorph
+{
+Advanced
+}
+
+MenuAlienMorphLevel3
+{
+Lerk
+}
+
+MenuAlienMorphLevel4
+{
+Fade
+}
+
+MenuAlienMorphLevel5
+{
+Onos
+}
+
+MenuAlienUpgrade
+{
+Evolve upgrade
+}
+
+MenuAlienComm
+{
+Voice
+}
+
+MenuAlienBuild
+{
+Build
+}
+
+MenuAlienAdvBuild
+{
+Advanced
+}
+
+MenuAlienBuildUpgrades
+{
+Upgrades
+}
+
+
+MenuAlienCommSayingsWest
+{
+Yells
+}
+
+MenuAlienCommSayingOne
+{
+Chuckle
+}
+
+MenuAlienCommSayingTwo
+{
+Need healing
+}
+
+MenuAlienCommSayingThree
+{
+Need backup
+}
+
+MenuAlienCommSayingsEast
+{
+Sayings
+}
+
+MenuAlienCommSayingFour
+{
+Incoming
+}
+
+MenuAlienCommSayingFive
+{
+Attack
+}
+
+MenuAlienCommSayingSix
+{
+I'm building here
+}
+
+// Temp artwork, change
+MenuAlienReadyRoom
+{
+Ready room
+}
+
+MenuAlienUpgradeDefOne
+{
+Carapace
+}
+
+MenuAlienUpgradeDefTwo
+{
+Regeneration
+}
+
+MenuAlienUpgradeDefThree
+{
+Redemption
+}
+
+MenuAlienUpgradeSenOne
+{
+Cloaking
+}
+
+MenuAlienUpgradeSenTwo
+{
+Pheromones
+}
+
+MenuAlienUpgradeSenThree
+{
+Scent of Fear
+}
+
+MenuAlienUpgradeMoveOne
+{
+Celerity
+}
+
+MenuAlienUpgradeMoveTwo
+{
+Adrenaline
+}
+
+MenuAlienUpgradeMoveThree
+{
+Silence
+}
+
+MenuAlienDefenseChamber
+{
+Defense chamber
+}
+
+MenuAlienSensoryChamber
+{
+Sensory chamber
+}
+
+MenuAlienMovementChamber
+{
+Movement chamber
+}
+
+MenuAlienDefenseUpgrades
+{
+Defensive
+}
+
+MenuAlienSensoryUpgrades
+{
+Sensory
+}
+
+MenuAlienMovementUpgrades
+{
+Movement
+}
+
+MenuAlienOffensiveChamber
+{
+Offense chamber
+}
+
+MenuAlienResourceTower
+{
+Resource tower
+}
+
+MenuAlienHive
+{
+Hive
+}
+
+
+
+// Armor received messages
+$position -1 0.2
+$effect 0
+$fadein 0.5
+$fadeout 0.5
+$holdtime 5.0
+
+ReceiveHeavyArmor
+{
+Heavy armor'a yukseltildiniz.  Dusmanlara karsi daha korunaklisiniz.
+}
+
+ReceiveMotionTrackArmor
+{
+Armor'iniza motion-tracker monte edildi.
+}
+
+ReceiveJetpackArmor
+{
+Jet-pack sahibi oldunuz.  Kullanmak icin ziplama tusunu basili tutun.
+}
+
+ReceiveLifeSupportArmor
+{
+LifeSupport (TM) sistemi sahibi oldunuz.  Olume yaklastiginizda yardim gelene kadar korunacaksiniz.
+}
+
+
+
+$position -1 0.35
+$holdtime 3.0
+
+GameStarting
+{
+Oyun baslamak uzere...
+}
+
+$holdtime 2.0
+GameBegun
+{
+Oyun basladi.
+}
+
+// Overwatch enabled
+//OverwatchActive
+//{
+//Overwatch active
+//}
+
+// Overwatch range string, expecting a float for range
+OverwatchRange
+{
+Hedefe uzaklik: %f
+}
+
+// Points awarded
+$position -1 0.25
+$effect 0
+$holdtime 4
+
+MarineAward
+{
+Takiminiz bir dusman oldurdu!
+}
+
+MarineAwardToLeader
+{
+Bolugunuz dusman oldurdugu icin resource kazandi!
+}
+
+// Points awarded
+$position -1 0.15
+$effect 0
+$holdtime 3
+MarineAwardToCommander
+{
+Takiminiz dusman oldurdugu icin resource kazandi!
+}
+
+// Points awarded
+$position -1 0.25
+$effect 0
+$holdtime 4
+AlienAward
+{
+Dusman oldurdugunuz icin resource kazandiniz!
+}
+
+Defect
+{
+Bolukten cik
+}
+
+WeaponCantBeDropped
+{
+Bu silahi atamazsiniz.
+}
+
+DefectMessageToLeader
+{
+Bolugunuzden bir oyuncu cikti.
+}
+
+SquadIndicator
+{
+%d. Boluktesiniz
+}
+
+InvalidOrderGiven
+{
+Gecersiz emir
+}
+
+$position -1 0.65
+$effect 0
+$holdtime .5
+$fadein .2
+$fadeout .2
+GameWontStart
+{
+Iki takimda da oyuncu olmadan oyun baslamayacak.
+}
+
+// Translation note: don't translate "ready"
+GameWontStartUntilReady
+{
+Iki takim da "ready" yazmadan oyun baslamayacak.
+}
+
+$position -1 0.75
+$effect 0
+$holdtime .7
+$fadein .2
+$fadeout .2
+ReceivingLevelData
+{
+Harita bilgisi aliniyor...
+}
+
+$position -1 0.85
+ReceivingLevelData1
+{
++---
+}
+
+ReceivingLevelData2
+{
+++--
+}
+
+ReceivingLevelData3
+{
++++-
+}
+
+ReceivingLevelData4
+{
+++++
+}
+
+$position -1 0.65
+$effect 0
+$holdtime .5
+$fadein .2
+$fadeout .2
+$position -1 0.9
+EvolvingMessage
+{
+Donusuyorsunuz...
+}
+
+VoteCast
+{
+Oyunuzu kullandiniz.
+}
+
+VoteStarted
+{
+Commander'i atmak icin oylama baslatildi.  Eger commander rahatsiz edici davranista bulunuyorsa pop-up menuyu kullanarak oyunuzu kullanin.
+}
+
+VoteIllegal
+{
+Oylar su anda gecersiz.
+}
+
+AlreadyVoted
+{
+Her oyun en fazla bir kez oy kullanabilirsiniz.
+}
+
+VoteFailed
+{
+Commander'i atma oylamasi basarili olmadi.
+}
+
+VoteCancelled
+{
+Commander'i atma oylamasi iptal edildi.
+}
+
+VoteSucceeded
+{
+Commander command console'dan atildi.
+}
+
+BannedFromCommand
+{
+Bu sunucuda commander olmaniz gecici olarak yasaklanmis.  Birkac saat icerisinde tekrar commander olabileceksiniz.
+}
+
+MustGestateUp
+{
+Yalnizca ust yasam formlarina donusebilirsiniz.
+}
+
+MustGestateOnGround
+{
+Donusmek icin duz zeminde durmalisiniz.
+}
+
+NotWhileDigesting
+{
+Bir oyuncuyu hazmederken donusemezsiniz.
+}
+
+NoReadyRoomWhileDigested
+{
+Hazmedilirken Ready Room'a cikamazsiniz.
+}
+
+NeedMoreRoomToGestate
+{
+Donusmek icin daha cok yere ihtiyaciniz var.
+}
+
+NeedOneHiveToGestate
+{
+Bu yasam bicimine donusmek icin takiminizin 1 Hive'a ihtiyaci var.
+}
+
+NeedTwoHivesToGestate
+{
+Bu yasam bicimine donusmek icin takiminizin 2 Hive'a ihtiyaci var.
+}
+
+NeedThreeHivesToGestate
+{
+Bu yasam bicimine donusmek icin takiminizin 3 Hive'a ihtiyaci var.
+}
+
+NeedOneHiveForStructure
+{
+Bu yapiyi insa edebilmek icin takiminizin 1 Hive'a ihtiyaci var.
+}
+
+NeedTwoHivesForStructure
+{
+Bu yapiyi insa edebilmek icin takiminizin 2 Hive'a ihtiyaci var.
+}
+
+NeedThreeHivesForStructure
+{
+Bu yapiyi insa edebilmek icin takiminizin 3 Hive'a ihtiyaci var.
+}
+
+NeedsAnotherHiveForStructure
+{
+Bu yapiyi insa edebilmek icin takiminizin bir Hive'a daha ihtiyaci var.
+}
+
+MustBeBuilder
+{
+Bu yapiyi insa edebilmek icin Gorge olmalisiniz.
+}
+
+UpgradeNotAvailable
+{
+Bu yukseltme su an kullanilabilir degil.
+}
+
+TooManyStructuresOfThisTypeNearby
+{
+Cevrede bu yapidan cok fazla var.
+}
+
+TooManyStructuresInArea
+{
+Cevrede cok fazla yapi var.
+}
+
+$holdtime 2.0
+TooManyWebs
+{
+Takiminiz izin verilen maksimum Web sayisina ulasmis.
+}
+
+TooManyWebsNearby
+{
+Cevrede cok fazla Web var.
+}
+
+$position -1 0.35
+$effect 0
+$holdtime 5.0
+TeamOneWon
+{
+Marine takimi kazandi!
+}
+
+TeamTwoWon
+{
+Alien takimi kazandi!
+}
+
+GameDraw
+{
+Oyun berabere bitti!
+}
+
+RankBeforeGameStart
+{
+Yalnizca oyun baslamadan rutbe degistirebilirsiniz.
+}
+
+DefectAfterGameStart
+{
+Yalnizca oyun baslamadan boluk degistirebilirsiniz.
+}
+
+// Tech tree
+MarineResourcePrefix
+{
+Resourcelar:
+}
+
+AlienResourcePrefix
+{
+Resourcelar
+}
+
+CarryResourcePrefix
+{
+%d resource tasiyorsunuz
+}
+
+Resources
+{
+Resourcelar: 
+}
+
+
+NumericalEventResources
+{
+resource
+}
+
+NumericalEventHealth
+{
+saglik
+}
+
+NumericalEventResourcesDonated
+{
+Bagislanan resourcelar
+}
+
+NumericalEventAmmo
+{
+Cephane alindi
+}
+
+
+
+
+AlienEnergyDescription
+{
+Enerji
+}
+
+ResourcesDepleted
+{
+Kullanilan resourcelar
+}
+
+Reinforcements
+{
+Destek kuvvetler
+}
+
+
+WeaponCategory
+{
+Silahlar
+}
+
+ArmorCategory
+{
+Zirh
+}
+
+BuildCategory
+{
+Insa et
+}
+
+RadioCategory
+{
+Radyo
+}
+
+TechNodeLabel_0
+{
+Yok
+}
+
+TechNodeHelp_0
+{
+<yok>
+}
+
+TechNodeHelp_1
+{
+Sonraki silaha gec.
+}
+
+TechNodeHelp_2
+{
+Silahi yeniden doldur.
+}
+
+TechNodeHelp_3
+{
+Silahi yere at, hiz kazanmak ya da birisine vermek icin
+}
+
+TechNodeHelp_5
+{
+Oyunu birakip Ready Room'a geri don.  Takim degistirmek, oyunu izlemek ya da bir mola vermek icin.
+}
+
+TechNodeHelp_6
+{
+Eger commander oyunu bozmaya calisiyorsa, bu secenegi kullanarak commander'in atilmasi icin oy kullanin.  Yeterli sayida oya ulasildiginda commander command console'dan oyunun sonuna dek uzaklastirilacaktir.
+}
+
+
+TechNodeLabel_10
+{
+Saldiri
+}
+
+TechNodeLabel_11
+{
+Saldir
+}
+
+TechNodeLabel_12
+{
+Yok et
+}
+
+TechNodeLabel_13
+{
+Onaylandi
+}
+
+TechNodeLabel_14
+{
+Takima gec
+}
+
+TechNodeLabel_15
+{
+Guclu
+}
+
+
+TechNodeHelp_7
+{
+"ses cikar"
+}
+
+TechNodeHelp_8
+{
+"Saglik gerek"
+}
+
+TechNodeHelp_9
+{
+"Yardim gerek"
+}
+
+TechNodeHelp_10
+{
+"Gelen var"
+}
+
+TechNodeHelp_11
+{
+"SALDIR"
+}
+
+TechNodeHelp_12
+{
+"Burada insa ediyorum"
+}
+
+
+TechNodeLabel_20
+{
+Zirh #1
+}
+
+TechNodeLabel_21
+{
+Zirh #2
+}
+
+TechNodeLabel_22
+{
+Zirh #3
+}
+
+TechNodeLabel_23
+{
+Silahlar #1
+}
+
+TechNodeLabel_24
+{
+Silahlar #2
+}
+
+TechNodeLabel_25
+{
+Silahlar #3
+}
+
+TechNodeHelp_20
+{
+1. seviye oyuncu zirhi
+}
+
+TechNodeHelp_21
+{
+2. seviye oyuncu zirhi
+}
+
+TechNodeHelp_22
+{
+3. seviye oyuncu zirhi
+}
+
+
+TechNodeHelp_23
+{
+Silahlar, mayinlar ve turret'lar %%10 fazla zarar verir
+}
+
+TechNodeHelp_24
+{
+Silahlar, mayinlar ve turret'lar %%20 fazla zarar verir
+}
+
+TechNodeHelp_25
+{
+Silahlar, mayinlar ve turret'lar %%30 fazla zarar verir
+}
+
+TechNodeLabel_26
+{
+Advanced turret factory
+}
+
+TechNodeHelp_26
+{
+Advanced turret factory'e yukselt
+}
+
+TechNodeLabel_28
+{
+Jet-pack
+}
+
+TechNodeHelp_28
+{
+Jet-pack'leri kullanilabilir kilar
+}
+
+TechNodeLabel_29
+{
+Heavy armor
+}
+
+TechNodeHelp_29
+{
+Heavy armor'i kullanilabilir kilar
+}
+
+TechNodeLabel_30
+{
+Distress beacon
+}
+
+TechNodeHelp_30
+{
+Tum olu askerleri marine start'da yeniden canlandirir
+}
+
+TechNodeLabel_31
+{
+Deployable health tech
+}
+
+TechNodeHelp_31
+{
+Commander'in saglik paketleri atabilmesine olanak tanir
+}
+
+TechNodeLabel_32
+{
+Iptal
+}
+
+TechNodeHelp_32
+{
+Arastirmayi durdur
+}
+
+TechNodeLabel_33
+{
+Motion-tracking
+}
+
+TechNodeHelp_33
+{
+Tum hareket eden dusmanlari gorunur kilar
+}
+
+TechNodeLabel_34
+{
+Phase tech
+}
+
+TechNodeHelp_34
+{
+Phase Gate yapimina ve scan atabilmeye izin verir
+}
+
+TechNodeLabel_35
+{
+Upgrade tower
+}
+
+TechNodeHelp_35
+{
+Resource toplama hizini artirir
+}
+
+TechNodeLabel_36
+{
+Electrical defense
+}
+
+TechNodeHelp_36
+{
+Cok yaklasan dusmanlari elektrikle soklar
+}
+
+TechNodeLabel_38
+{
+Heavy armor
+}
+
+TechNodeHelp_38
+{
+Askere Heavy Armor verir.
+}
+
+TechNodeLabel_39
+{
+Jet-pack
+}
+
+TechNodeHelp_39
+{
+Askere Jet-pack verir.
+}
+
+TechNodeLabel_40
+{
+Infantry portal
+}
+
+TechNodeHelp_40
+{
+Oyuncular burada spawn olur
+}
+
+TechNodeLabel_41
+{
+Resource tower
+}
+
+TechNodeHelp_41
+{
+Resource toplar
+}
+
+
+
+TechNodeLabel_43
+{
+Turret factory
+}
+
+TechNodeHelp_43
+{
+Turret'lara olanak saglar
+}
+
+TechNodeLabel_45
+{
+Arms lab
+}
+
+TechNodeHelp_45
+{
+Silah ve zirh yukseltmeleri
+}
+
+TechNodeLabel_46
+{
+Prototype lab
+}
+
+TechNodeHelp_46
+{
+Deneysel teknoloji
+}
+
+TechNodeLabel_48
+{
+Armory
+}
+
+TechNodeHelp_48
+{
+Yeni silahlara erisim saglar
+}
+
+TechNodeLabel_49
+{
+Advanced armory
+}
+
+TechNodeHelp_49
+{
+Advanced armory'e yukseltir
+}
+
+
+TechNodeLabel_50
+{
+Nuke plant
+}
+
+TechNodeHelp_50
+{
+Nuke yapimina olanak saglar.
+}
+
+TechNodeLabel_51
+{
+Observatory
+}
+
+TechNodeHelp_51
+{
+Izleme teknolojisi
+}
+
+TechNodeLabel_52
+{
+Health nanotech
+}
+
+TechNodeHelp_52
+{
+Commander'in cephede saglik paketleri atabilmesine olanak tanir.
+}
+
+TechNodeLabel_53
+{
+Scanner Sweep
+}
+
+TechNodeHelp_53
+{
+Bir bolgede gecici gorus saglar ve gorunmez dusmanlari gorunur yapar.
+}
+
+TechNodeLabel_55
+{
+Phase gate
+}
+
+TechNodeHelp_55
+{
+Isik hizinda yolculuk icin
+}
+
+TechNodeLabel_56
+{
+Turret
+}
+
+TechNodeHelp_56
+{
+Sentry turret insa etmek icin
+}
+
+TechNodeLabel_57
+{
+Siege turret
+}
+
+TechNodeHelp_57
+{
+Duvar arkalarini da vurabilen sonik turret insa etmek icin.
+}
+
+TechNodeLabel_58
+{
+Command console
+}
+
+TechNodeHelp_58
+{
+Yeni bir command console insa etmek icin.
+}
+
+
+
+TechNodeLabel_59
+{
+Health
+}
+
+TechNodeHelp_59
+{
+Askere 50 saglik verir.
+}
+
+TechNodeLabel_60
+{
+Ammo
+}
+
+TechNodeHelp_60
+{
+Askere bir sarjor mermi verir.
+}
+
+
+
+TechNodeLabel_61
+{
+Mines
+}
+
+TechNodeHelp_61
+{
+Bes adet mayin.
+}
+
+TechNodeLabel_62
+{
+Welder
+}
+
+TechNodeHelp_62
+{
+Yapi ve zirh tamir eder, weldable yerleri etkiler, webleri yakar.
+}
+
+TechNodeLabel_63
+{
+Med kit
+}
+
+TechNodeLabel_64
+{
+Shotgun
+}
+
+TechNodeHelp_64
+{
+Yakin mesafe carpismalari icin
+}
+
+TechNodeLabel_65
+{
+HMG
+}
+
+TechNodeHelp_65
+{
+Yuksek guclu saldiri silahi
+}
+
+TechNodeLabel_66
+{
+Grenade gun
+}
+
+TechNodeHelp_66
+{
+Grenade launcher 
+}
+
+TechNodeLabel_67
+{
+Nuke
+}
+
+TechNodeHelp_67
+{
+Atilabilen mini atom bombasi.
+}
+
+TechNodeLabel_69
+{
+Geri donustur
+}
+
+TechNodeHelp_69
+{
+Bu yapiyi yok edip bir miktar resource geri almak icin.
+}
+
+TechNodeHelp_80
+{
+Commander'dan emir isteme.
+}
+
+TechNodeHelp_81
+{
+Commander'in emirlerini onaylamak icin.  Emirlere uymak icin waypoint'inizdeki aciklamalari okuyun.  Emir tamamlandiginda waypoint kendiliginden yok olacaktir.
+}
+
+
+
+TechNodeLabel_85
+{
+Insa et
+}
+
+TechNodeHelp_85
+{
+Temel yapi menusu
+}
+
+TechNodeLabel_86
+{
+Gelismis
+}
+
+TechNodeHelp_86
+{
+Gelismis yapi menusu
+}
+
+TechNodeLabel_87
+{
+Asist
+}
+
+TechNodeHelp_87
+{
+Asist menusu
+}
+
+TechNodeLabel_88
+{
+Donat
+}
+
+TechNodeHelp_88
+{
+Donati menusu
+}
+
+TechNodeHelp_90
+{
+Resource tower insa et: Takiminiz icin resource toplar.  Yalnizca resource olan resource nozzle'lar uzerine insa edilebilir (beyaz bir duman ile belirtilir).
+}
+
+TechNodeHelp_91
+{
+Offensive chamber insa et: Yakindaki dusman oyuncularina ve yapilarina saldiran organik turret.  Verdigi hasar: 20
+}
+
+TechNodeHelp_92
+{
+Defensive chamber insa et: defensive yukseltmelere olanak tanir, cevredeki oyuncu ve yapilari iyilestirir.
+}
+
+TechNodeHelp_93
+{
+Sensory chamber insa et: sensory yukseltmelere olanak tanir, cevredeki oyuncu, yapilari gorunmez kilar ve menzilinde motion tracking'i engeller.
+}
+
+TechNodeHelp_94
+{
+Movement chamber insa et: movement yukseltmelerine olanak tanir, cevredeki oyunculara otomatik olarak enerji saglar.
+}
+
+TechNodeHelp_95
+{
+Hive isa et: Ust yasam bicimlerine ve ust yeteneklere erisim saglar (yalnizca hive location'da insa edilebilir)
+}
+
+TechNodeHelp_101
+{
+Zirh degerini artirir.  Her seviye carapace yaklasik %16 daha fazla zarar emer fakat sizi de yavaslatir.
+}
+
+TechNodeHelp_102
+{
+Zamanla iyilesmeyi mumkun kilar.  Daha yuksek seviyeler daha hizli iyilestirir.
+}
+
+TechNodeHelp_103
+{
+Olmek uzereyken hive sizi otomatik olarak kurtarmaya calisir. Hive'a geri donersiniz.
+}
+
+TechNodeHelp_104
+{
+Sharpness - Melee zarariniz yari yariya artar.
+}
+
+TechNodeHelp_105
+{
+Piercing - Menzilli zarariniz yari yariya artar.
+}
+
+TechNodeHelp_106
+{
+Penetration - Atislariniz duvar ve hedeflerin icinden gecer (not implemented).
+}
+
+TechNodeHelp_107
+{
+Hizinizi kalici olarak artirir.
+}
+
+TechNodeHelp_108
+{
+Enerji geri alma surenizi artirir.  Her seviye, enerji toplama hizinizi %33 artirir.
+}
+
+TechNodeHelp_109
+{
+Her seviye, ayak ve hareket seslerinizi daha da sessizlestirir.
+}
+
+TechNodeHelp_110
+{
+Kisa bir sure icin hareketsiz kalmak sizi gorunmez kilar.  Seviye arttikca bekleme sureniz duser.  Observatory ve Scanner Sweep sizi gorunur kilar.
+}
+
+TechNodeHelp_111
+{
+Yakindaki dusmanlarin arkasinda gorunur bir iz birakir.  Yuksek seviyeler menzili artirir.
+}
+
+TechNodeHelp_112
+{
+Dusmanlarinizin ne kadar zayifladigini gosterir.
+}
+
+TechNodeHelp_113
+{
+Skulk'a donus.  Bu kucuk ve hizli bir alien'dir. Gerilla taktikleri, bire bir savas ve rahatsizlik vermek icin uygundur.  Duvarlara turmanabilir (egilme tusunu basili tutarak tirmanmayi engelleyebilirsiniz)
+}
+
+TechNodeHelp_114
+{
+Gorge'a donus.  Resource tower'lar, hive'lar, upgrade chamber'lar ve turret'lar insa eder.  Savasta zayiftir.  Takim arkadaslarini ve takim yapilarini iyilestirebilir.
+}
+
+TechNodeHelp_115
+{
+Lerk'e donus. Cok amacli savas destegi verir.  Uzun menzilli spike atisina, alan etkili bogucu spore'lara ve koruyucu "umbra" ozelligine sahiptir.  Ziplama tusu ile ucabilir.  Havadayken ziplama tusunu basili tutarak suzulebilir.
+}
+
+TechNodeHelp_116
+{
+Fade'e donus.  Pence ve acid rocket saldirilari ile guclu bir dovuscudur.  Teleport edebilir.
+}
+
+TechNodeHelp_117
+{
+Onos'a donus.  Dusmanlarini paralize edebilen, yutabilen dev bir savasci.  Birkac askeri bir anda yok edebilir.
+}
+
+
+ClassDead
+{
+Olu
+}
+
+ClassDigesting
+{
+Hazmediliyor
+}
+
+ClassCommander
+{
+Commander
+}
+
+ClassHeavyMarine
+{
+Heavy
+}
+
+ClassReinforcing
+{
+Destekyolda
+}
+
+ClassLevel1
+{
+Skulk
+}
+
+ClassLevel2
+{
+Gorge
+}
+
+ClassLevel3
+{
+Lerk
+}
+
+ClassLevel4
+{
+Fade
+}
+
+ClassLevel5
+{
+Onos
+}
+
+ClassGestating
+{
+Donusuyor
+}
+
+
+Building
+{
+Insa ediliyor: 
+}
+
+
+Researching
+{
+Arastiriliyor: 
+}
+
+Energy
+{
+Enerji: 
+}
+
+
+Prerequisite
+{
+Gereken: 
+}
+
+Cost
+{
+Fiyat:
+}
+
+NotFullyBuilt
+{
+Tam insa edilmemis
+}
+
+Recycling
+{
+Geri donusturuluyor...
+}
+
+ReinforcementsText
+{
+Destek kuvvetler: 
+}
+
+LogoutText
+{
+CIKIS
+}
+
+BlipStatus_0
+{
+dusman
+}
+
+BlipStatus_1
+{
+zayif dusman
+}
+
+BlipStatus_2
+{
+
+}
+
+BlipStatus_3
+{
+saldiri altinda
+}
+
+BlipStatus_5
+{
+gorge
+}
+
+BlipStatus_6
+{
+
+}
+
+BlipStatus_7
+{
+
+}
+
+BlipStatus_8
+{
+
+}
+
+Friend
+{
+Dost
+}
+
+Enemy
+{
+Dusman
+}
+
+User3Name_1
+{
+asker
+}
+
+User3Name_2
+{
+commander
+}
+
+User3Name_3
+{
+skulk
+}
+
+User3Name_4
+{
+gorge
+}
+
+User3Name_5
+{
+lerk
+}
+
+User3Name_6
+{
+fade
+}
+
+User3Name_7
+{
+onos
+}
+
+User3Name_7
+{
+embryo
+}
+
+User3Name_15
+{
+ekipman
+}
+
+User3Name_17
+{
+Hive
+}
+
+User3Desc_17
+{
+Alienlar burada spawn olur. Yuksek alien yasam bicimlerine ve gelisimlerine olanak tanir.
+}
+
+User3FriendlyDesc_17
+{
+Burada spawn olursunuz.  Yakinindayken sizi iyilestirir.  Iletisimi saglayan "Hive sight" saglar.  Her kosulda korunmalidir.
+}
+
+User3Name_22
+{
+Resource nozzle
+}
+
+User3Desc_22
+{
+Uzerine bir resource tower kuruldugunda resource verir.  Bu resource'lar sonsuzdur.
+}
+
+User3CommanderDesc_22
+{
+Uzerine bir resource tower kuruldugunda resource verir.  Bu resource'lar sonsuzdur.
+}
+
+User3Name_23
+{
+command console
+}
+
+User3Desc_23
+{
+Marine commander tarafindan yapilar insa etmek ve yeni teknoloji arastirmasi icin kullanilir.
+}
+
+User3FriendlyDesc_23
+{
+Marine commander tarafindan yapilar insa etmek ve yeni teknoloji arastirmasi icin kullanilir.  Commander ekranin ust-ortasinda gosterilir.  Eger takiminizda bir commander yok ise, "use" yaparak commander olabilirsiniz.
+}
+
+User3CommanderDesc_23
+{
+Infantry portal kurabileceginiz alani gormek icin command console'u secin.  Eger command console yok edilirse disari atilacaksiniz.  Command console her kosulda korunmalidir.
+}
+
+
+User3Name_24
+{
+Turret factory
+}
+
+User3Desc_24
+{
+Menzil dahilinde sentry turret kurulumuna imkan tanir.  Bu turret'lar calismak icin turret factory'e ihtiyac duyar.  Commander turret factory'i secerek menzilini gorebilir.
+}
+
+User3Name_25
+{
+Armory
+}
+
+User3Desc_25
+{
+Askerlere cephane saglar ve menzil dahilinde shotgun, mayin ve welder yapimina olanak tanir.
+}
+
+User3CommanderDesc_25
+{
+Askerlere ucretsiz cephane saglar.  Menzil dahilinde shotgun, mayin ve welder yapimina olanak tanir.  Bu menzili gormek icin armory'i secin.
+}
+
+User3FriendlyDesc_25
+{
+O anki silahiniza cephane almak icin armory'i "use" tusu ile kullanin.  Ayrica menzil dahilinde shotgun, mayin ve welder yapimina olanak tanir.
+}
+
+
+User3Name_26
+{
+Advanced armory
+}
+
+User3Desc_26
+{
+Cephane saglar ve menzil dahilinde heavy machine gun ve grenade launcher yapimina olarak tanir.
+}
+
+User3CommanderDesc_26
+{
+Askerlere ucretsiz cephane saglar.  Menzil dahilinde heavy machine gun ve grenade launcher yapimina olanak tanir.  Bu menzili gormek icin advanced armory'i secin.
+}
+
+User3FriendlyDesc_26
+{
+O anki silahiniza cephane almak icin advanced armory'i "use" tusu ile kullanin.  Ayrica menzil dahilinde heavy machine gun ve grenade launcher yapimina olanak tanir.
+}
+
+
+User3Name_27
+{
+Arms lab
+}
+
+User3Desc_27
+{
+Zirh ve cephane yukseltmelerine erisim saglar.
+}
+
+User3Name_28
+{
+Prototype lab
+}
+
+User3Desc_28
+{
+Heavy armor ve Jet-pack'lere erisim saglar.
+}
+
+User3Name_29
+{
+Observatory
+}
+
+User3Desc_29
+{
+Menzildeki dusmanlari gorunur kilar.  Scanner Sweep, Motion Sensor yukseltmesi ve Distress Beacon'a erisim saglar.
+}
+
+User3Name_30
+{
+chemlab
+}
+
+User3Name_31
+{
+medlab
+}
+
+User3Name_33
+{
+Sentry turret
+}
+
+User3Desc_33
+{
+Menzil dahilindeki dusmanlara ates eder.
+}
+
+User3FriendlyName_33
+{
+Dusmanlariniza otomatikman ates eder.  Ust seviye ve gelismis alienlara karsi gucsuzdur.  Turret factory menzili dahilinde insa edilmelidir.  Hasar: 10
+}
+
+User3CommanderName_33
+{
+Dusmanlariniza otomatikman ates eder.  Ust seviye ve gelismis alienlara karsi gucsuzdur.  Turret factory menzili dahilinde insa edilmelidir fakat calismasi icin turret factory'e ihtiyac duymaz.  Menzilini gormek icin turret'i secin.  Gorunmez dusmanlara ates etmeyecektir.  Dusuk seviye alienlara karsi etkilidir.  Hasar: 10
+}
+
+
+User3Name_34
+{
+Siege cannon
+}
+
+User3Desc_34
+{
+Automated Siege Cannon (ASC).  Binalara saldiran sonik silah. Duvar arkasindaki binalari da vurabilir. Oyunculari vurmaz.
+}
+
+User3FriendlyDesc_34
+{
+Automated Siege Cannon (ASC).  Binalara saldiran sonik silah. Duvar arkasindaki binalari da vurabilir. Oyunculari vurmaz.  Menzil: 400  Hasar: 165 (binalara iki kat) 
+}
+
+User3CommanderDesc_34
+{
+Automated Siege Cannon (ASC).  Binalara saldiran sonik silah. Duvar arkasindaki binalari da vurabilir. Oyunculari vurmaz.  Cok yakindaki hedefleri vuramaz.  Menzili gormek icin ASC'yi secin.  Menzil: 400  Hasar: 165 (binalara iki kat) 
+}
+
+User3Name_35
+{
+Resource tower
+}
+
+User3Desc_35
+{
+Belirli araliklarla takim icin resource toplar.
+}
+
+User3Name_37
+{
+Infantry portal
+}
+
+User3FriendlyDesc_37
+{
+Marine'ler burada spawn olur.  Yok edildiginde spawn olamazlar.
+}	  
+
+User3FriendlyDesc_37
+{
+Takiminiz burada spawn olur.  Yok edildiginde spawn olamaz.  Korunmalidir.
+}	  
+
+User3CommanderDesc_37
+{
+Marine'ler burada spawn olur.  Yok edildiginde spawn olamazlar.
+}
+
+User3Name_38
+{
+nuke
+}
+
+User3Desc_38
+{
+Nuke is arming, and must be destroyed before it finishes!  Once armed, nuke detonates, doing massive damage to nearby players and structures.
+}
+
+User3FriendlyDesc_38
+{
+Nuke is arming, protect it while it finishes.  Once armed, nuke detonates, doing massive damage to nearby players and structures.
+}
+
+User3CommanderDesc_38
+{
+Nuke is arming, protect it while it finishes.  Once armed, nuke detonates, doing massive damage to nearby players and structures.
+}
+
+User3Name_39
+{
+Heavy armor
+}
+
+User3Desc_39
+{
+Heavy armor'a sahip olmak icin alin.  Jet-pack ile kullanilamaz.  Spore'lara karsi koruma saglar
+}
+
+User3Name_40
+{
+Jet-pack
+}
+
+User3Desc_40
+{
+Jet-pack'e sahip olmak icin alin.  Heavy armor ile kullanilamaz.
+}
+
+User3Name_41
+{
+Phase gate
+}
+
+User3Desc_41
+{
+Diger phase gate'lere isik hizinda yolculuk saglar.  USE tusu ile kullanin.
+}
+
+User3CommanderDesc_41
+{
+Diger phase gate'lere isik hizinda yolculuk saglar.  Calismasi icin birden cok phase gate gereklidir.
+}
+
+User3Name_42
+{
+Defense chamber
+}
+
+User3Desc_42
+{
+Yakindaki oyuncu ve yapilari iyilestirir.  Defensive yukseltmeleri saglar (Carapace, Regeneration ve Redemption)
+}
+
+User3Name_43
+{
+Movement chamber
+}
+
+User3Desc_43
+{
+Alienlar tarafindan en uzaktaki Hive'a teleport olmak icin kullanilir.  Movement yukseltmelerini saglar (Celerity, Adrenaline ve Silence).  Bu yapilari yok etmek yukseltmelerin kaybolmasina sebep olur.
+}
+
+User3FriendlyDesc_43
+{
+Yaklasip USE tusunu kullanarak saldiri halindeki Hive'a teleport olabilirsiniz.  Movement yukseltmelerini saglar (Celerity, Adrenaline ve Silence).
+}
+
+
+User3Name_44
+{
+Offense chamber
+}
+
+User3Desc_44
+{
+Yakindaki dusman oyuncularina ve yapilarina saldiran organik turret.  Verdigi hasar: 50
+}
+
+User3Name_45
+{
+Sensory chamber
+}
+
+User3Desc_45
+{
+Cevredeki dusmanlari algilar, dokunan dusmanlari parazitler ve sensory yukseltmeleri saglar (Cloaking, Pheromones ve Scent of Fear).
+}
+
+
+User3Name_46
+{
+Resource tower
+}
+
+User3Desc_46
+{
+Dusman takim icin resource toplar.
+}
+
+User3FriendlyDesc_46
+{
+Takiminiz icin resource toplar.
+}
+
+User3Name_47
+{
+Heavy armor module
+}
+
+User3Desc_47
+{
+Askere heavy armor verir.
+}
+
+User3FriendlyDesc_47
+{
+Askere heavy armor verir.
+}
+
+User3Name_48
+{
+Jet-pack module
+}
+
+User3Desc_48
+{
+Askere Jet-pack verir.
+}
+
+User3FriendlyDesc_48
+{
+Askere Jet-pack verir.
+}
+
+User3Name_49
+{
+Advanced turret factory
+}
+
+User3Desc_49
+{
+Sentry turret ve siege turret insa edilmesini mumkun kilar.
+}
+
+User3FriendlyDesc_49
+{
+Sentry turret ve siege turret insa edilmesini mumkun kilar.
+}
+
+User3Name_57
+{
+Mine
+}
+
+User3Desc_57
+{
+Dokununca patlar
+}
+
+User3FriendlyDesc_57
+{
+Dokununca patlar
+}
+
+Weapon1Help
+{
+Gore - Dusmaniniza yaklasip saldirin.  Hasar: %d (binalara iki kat)
+}
+
+Weapon2Help
+{
+Spit - Dusmanlarinizi uzak totmak icin kisa menzilli silah.  Hasar: %d
+}
+
+Weapon3Help
+{
+Spores - Bogucu spore bulutu atar. Bu bulut menzil dahilindeki dusman oyunculara zarar verir.  Hasar: %d (her saniye)
+}
+
+Weapon4Help
+{
+Spikes - Aninda vuran uzun mesafe silahi.  Hasar: %d
+}
+
+Weapon5Help
+{
+Bite - Olumcul yakin dovus saldirisi.  Dusmaniniza yaklasip saldirin.  Hasar: %d
+}
+
+Weapon6Help
+{
+Bite - Olumcul yakin dovus saldirisi.  Dusmaniniza yaklasip saldirin.  Hasar: %d
+}
+
+Weapon7Help
+{
+Swipe - Olumcul yakin dovus saldirisi.  Dusmaniniza yaklasip saldirin.  Oyuncu ve binalara karsi etkilidir.  Hasar: %d
+}
+
+Weapon8Help
+{
+Webs - Yakin iki noktaya ates ettiginizde bu iki nokta arasinda bir ag orulur.  Web'ler dusmanlari bir sure icin yavaslatir ve silah kullanmalarini engeller.  Welder ile yok edilebilirler.
+}
+
+Weapon9Help
+{
+Metabolize - Enerji kullanarak saglik verir.
+}
+
+Weapon10Help
+{
+Parasite - Hedefi hive sight'da her zaman gorunecek sekilde parazitler.  Bu parazit iyilestirilemez.  Hasar: %d
+}
+
+Weapon11Help
+{
+Blink - Teleporta olanak tanir. Gitmek istediginiz yonu gosterip ates tusunu basili tutun.
+}
+
+Weapon12Help
+{
+Xenocide - Canli bomba. Aktivlestirdikten kisa bir sure sonra cevreye agir zarar vererek patlarsiniz.  Hasar: %d
+}
+
+Weapon13Help
+{
+Bicak - Etkinlik ve umutsuzlugun silahi.  Hasar: %d
+}
+
+Weapon14Help
+{
+Tabanca - Iyi isabet yuzdesine sahip tabanca.  Etkindir fakat sarjoru kucuktur.  Hasar: %d
+}
+
+Weapon15Help
+{
+Machine Gun - Iyi isabet yuzdesi, yuksek ates hizi, orta boy sarjor.  Atis hizi: Saniyede 10 mermi.  Hasar: %d
+}
+
+Weapon16Help
+{
+Shotgun - Hizli hareket eden hedefler icin. Ya da yakindaki hedeflere hizli bir bicimde cok zarar vermek icin. Atis basina 10 sacma.  Hasar: sacma basina %d
+}
+
+Weapon17Help
+{
+Heavy machine gun (HMG) - Buyuk hedef ve dusmanlar icin agir silah.  Kocaman bir sarjor ve yuksek ates hizi.  Hasar: mermi basina %d (binalara yarim)
+}
+
+Weapon18Help
+{
+Welder - Haritadaki ozel "weldable" alanlari acip kapayabilir, yapi ya da zirh tamir ve Web'leri kesebilir.  Hasar: %d
+}
+
+Weapon19Help
+{
+Mines - Defans icin, ya da bir cikartmada koruma icin kullanin.  Duvarlara koydugunuzda laser mayin halini, yere koydugunuzda yer mayini haline gelir.  Hasar: %d
+}
+
+Weapon20Help
+{
+Grenade launcher - Bombalar 4 saniye sonra patlar.  Hasar: %d (binalara iki kat)
+}
+
+Weapon21Help
+{
+Leap - Onunuzdeki herseyi keserek ileri dogru hizli atlayis.  Hareket ederken de, savasirken de kullanisli.  Hasar: %d
+}
+
+Weapon22Help
+{
+Charge - Sinirle ileri dogru atlayip dokundugunuz herseye zarar verirsiniz.  Enerji ceker ve enerjiniz bittiginde durur.  Hasar: inanilmaz
+}
+
+Weapon23Help
+{
+Umbra - Dusman mermilerini yavaslatan bakteriyel bir bulut olusturur.  Umbra icindeki dost oyuncu ya da yapi mermilerden pek zarar gormez, ama yine de patlayici ya da mermisiz saldirilardan etkilenebilir.  %d saniye surer.
+}
+
+Weapon24Help
+{
+Primal scream - Menzil icindeki tum takim arkadaslariniz ciglik boyunca hizli enerji kazanir, hizli hareket eder ve daha cok zarar verir.  Saldiri sirasinda karsi takimin aci cigliklarini dinlemeyi ihmal etmeyin.
+}
+
+Weapon25Help
+{
+Bile bomb - Dusman yapilarina karsi etkili organik top.  Hasar: %d (alan etkili, yalnizca yapilara)
+}
+
+Weapon26Help
+{
+Acid rocket - Alan etkili zarar veren asit topu.  Hasar: %d
+}
+
+Weapon27Help
+{
+Healing spray - Menzil icindeki dost oyuncu ve yapilari iyilestirip dusmanlara zarar veren sprey.  Hasar: %d (alan etkili)
+}
+
+Weapon28Help
+{
+Babbler - Zayif skulklar yaratmanizi saglar.  Bu skulklar bir kisa sure icin yasayip kendileri dusmana saldirir.   Hasar: 20 (Bite), 40 (Xenocide)
+} 
+
+Weapon29Help
+{
+Stomp - Dokundugu tum dusman oyunculari %d saniye icin dondurur.
+}
+
+Weapon30Help
+{
+Devour - Yakindaki bir dusmani yutmak icin.  Oyuncu saniyede %d zarar alarak yavas yavas hazmedilir.  Onos bu zarari saglik olarak geri alir.  Hazim bitmeden Onos oldurulurse dusman oyuncu kurtulur.
+}
+
+CommandStationOtherTeam
+{
+Bu command console karsi takima ait.
+}
+
+CommandStationInUse
+{
+Takiminizda bir commander mevcut, command console kullanilamaz.
+}
+
+WeaponPreventingCommandStation
+{
+Silahiniz command console kullanimina engel.
+}
+
+CommandStationDestroyed
+{
+Bu command console yokedilmis ve artik kullanilamaz!
+}
+
+CommandStationWaitTime
+{
+Command console'a girmeden daha uzun sure beklemelisiniz.
+}
+
+
+// Particle editing commands
+$position -1 0.7
+NoParticleSystem
+{
+That particle system couldn't be found.
+}
+
+EditingParticleSystem
+{
+Found particle system, use F7 to edit
+}
+
+
+// Marine help text
+
+// Armor received messages
+$position -1 0.45
+$effect 0
+$fadein 0.5
+$fadeout 0.5
+$holdtime 5.0
+
+HelpTextCSAttractMode
+{
+Bu command console'u hedef alip komuta modunu etkinlestirmek icin "use" tusunu kullanin.
+}
+
+HelpTextArmoryResupply
+{
+Armory'e "Use" yaparak su anki silahiniz icin mermi alin.
+}
+
+HelpTextAttackNearbyStation
+{
+Bu dusmanin command console'u, saldirin!
+}
+
+HelpTextBuildTurret
+{
+Bu turret'in alt kismina hedef alip "use" tusunu basili tutarak insa edin.
+}
+
+HelpTextBuildTower
+{
+Bu resource tower'in alt kismina hedef alip "use" tusunu basili tutarak insa edin.
+}
+
+HelpTextExplainTower
+{
+Bu aktif resource tower, takiminiza periyodik olarak resource vermektedir.
+}
+
+HelpTextAttackHive
+{
+Takim arkadaslarinizi toplayip yok edecek bir alien hive bulun!
+}
+
+HelpTextOtherHiveBuilding
+{
+Ayni anda yalnizca bir hive insa edilebilir.  Burada insaya baslamadan once obur hive'in tamamlanmasini bekleyin.
+}
+
+HelpTextEmptyHiveNotNearby
+{
+Yalnizca hive noktalarinda hive insa edilebilir (hive gostergesini takip edin).
+}
+
+HelpTextAttackNearbyHive
+{
+Yakinlarda bir dusman hive'i mevcut, alien cilginligini durdurmak icin yok edin!
+}
+
+HelpTextFriendlyMovementChamber
+{
+Bu movement chamber'da "use" tusunu kullanarak saldiri altindaki hive'a teleport olun.  Yakinindayken size enerji de verir.
+}
+
+HelpTextAttackMovementChamber
+{
+Bu bir dusman movement chamber'i. Hive'larina teleport etmelerini saglar ve onlara enerji verir.
+}
+
+HelpTextFriendlyOffensiveChamber
+{
+Bu bir offense chamber, dusmanlariniza ates eder.
+}
+
+HelpTextAttackOffensiveChamber
+{
+Bu bir dusman offense chamber'i, dikkat edin!
+}
+
+HelpTextFriendlyDefensiveChamber
+{
+Bu defensive chamber cevresindeki oyuncu ve yapilari iyilestirir.  Iyilestirme sirasinda bir ses cikarir.
+}
+
+HelpTextAttackDefensiveChamber
+{
+Bu bir dusman defensive chamber'i, dusman oyuncu ve yapilarini iyilestirir.
+}
+
+HelpTextFriendlySensoryChamber
+{
+Bu bir sensory chamber, yakindaki oyuncu ve binalari gorunmez kilar.
+}
+
+HelpTextAttackSensoryChamber
+{
+Bu bir dusman sensory chamber'i.
+}
+
+HelpTextOpenWeldable
+{
+Bu kisim bir welder ile acilabilir.
+}
+
+HelpTextCloseWeldable
+{
+Bu kisim bir welder ile kapatilabilir.
+}
+
+HelpTextPhaseGate
+{
+Teleport olmak icin phase gate'e girin.
+}
+
+HelpTextAlienPopupMenu
+{
+Pop-up menu'yu yapi insa etmek, gelismek ya da takim degistirmek icin kullanin (alt-fire).
+}
+
+HelpTextMarinePopupMenu
+{
+Pop-up menu'yu ses komutlarina erisim, emir isteme, takimdan cikma ve fazlasi icin kullanin (alt-fire).
+}
+
+HelpTextOrder
+{
+Commander tarafindan bir emir aldiniz.  Ekraninizdaki mavi halka emrinizin yeri ve tipini belirtir.  Pop-up menu'yu kullanarak emir isteyebilir ya da emir onaylayabilirsiniz.
+}
+
+HelpTextCommanderUseable
+{
+Commander olarak haritadaki dugme ya da anahtarlara sol click ile basabilirsiniz.
+}
+
+HelpTextMarineCommandMenu
+{
+Takiminizla iletisim kurmak icin pop-up menu tusuna basin (varsayilan sag mouse tusu).
+}
+
+HelpTextResourceDropoff
+{
+Takiminiz icin resource kazandiniz!
+}
+
+HelpTextJetpacks
+{
+Commander takiminiz icin jet-pack arastirmasi yapmis.  Kullanmak icin ziplama tusunu basili tutun.
+}
+
+HelpTextAlienCommandMenu
+{
+Pop-up menu tusuna basarak yasam bicimi degistirebilir ya da gelisebilirsiniz (varsayilan sag mouse tusu).
+}
+
+HelpTextAttackTower
+{
+Bu resource tower dusman icin resource topluyor. Yok edin!
+}
+
+HelpTextAlienWeapons
+{
+Mouse wheel ya da sayi tuslari ile silah degistirebilirsiniz.  Kirmizi bir sembol o yetenegin daha cok hive alana kadar calismayacagini belirtir.
+}
+
+HelpTextAlienResources
+{
+Sol taraftaki mavi cubuk resourcelarinizi gosterir.  Takiminizin resource tower'larindan resource alirsiniz.  Resource'lar pop-up menuyu kullanarak harcanabilir.
+}
+
+HelpTextAlienEnergy
+{
+Sag taraftaki sari cubuk enerjinizi gosterir.  Kullandiginiz yetenekler enerji harcar.
+}
+
+HelpTextAlienPendingUpgrades
+{
+Ekranin sag tarafindaki kucuk yanip sonen semboller yeni gelisimler gecirebileceginizi gosterir.  Pop-up menuyu kullanarak yeni gelisimler arasindan bir secim yapin.
+}
+
+HelpTextAlienBuildStructure
+{
+Insa edici alien olarak, pop-up menuyu kullanarak takiminiz icin yapilar isa edebilirsiniz.
+}
+
+HelpTextAlienBuildStructure
+{
+Yakinlarda bir tam isa edilmemis alien yapisi mevcut.  Alien yapilari kendi kendilerine yavasca insa olur, fakat insa edici olarak bunu hizlandirabilirsiniz.  Yapinin alt kismina hedef alip "use" tusunu kullanin.
+}
+
+HelpTextAlienHiveSight
+{
+Ekrandaki parlayan daireler takiminizin "hive sight" ozelligini belirtir.  Beyaz daireler hive'lari ya da takim arkadaslarinizi, pembe daireler saldiri altindaki takim arkadaslarinizi ve sari daireler de dusmanlarinizi belirtir.
+}
+
+HelpTextAlienVisionMode
+{
+Flashlight tusuna bastiginizda tum alien oyuncu ve yapi pozisyonlarini gorebilirsiniz.
+}
+
+HelpTextAlienCommunication
+{
+Pop-up menuyu kullanarak takiminizla iletisim kurabilirsiniz.
+}
+
+HelpTextAlienUnderAttack
+{
+Bir takim arkadasiniz ya da yapi saldiri altinda.  Cevrenize bir bakin ve hive sight uyarisini arayin.
+}
+
+HelpTextBuilder
+{
+Gorge oldunuz.  Savastan uzak durup pop-up menuyu kullanarak degisik yapilar insa edin.
+}
+
+HelpTextWeb
+{
+Yakin iki noktaya ates ederek bu iki nokta arasinda bir ag orebilirsiniz.  Web'ler dusmanlari bir sure icin yavaslatir ve silah kullanmalarini engeller.
+}
+
+HelpTextWallwalking
+{
+Duvar ve tavanlarda yurumek icin egilme tusunu basili tutun.
+}
+
+HelpTextBite
+{
+Dusmanlariniza yaklasip saldiri tusunu kullanarak onlari isirabilirsiniz.
+}
+
+HelpTextFlight
+{
+Ziplama tusunu kullanarak ucabilirsiniz.  Havadayken ziplama tusunu basili tutarak suzulebilirsiniz.
+}
+
+HelpTextSpores
+{
+Ates tusuna basarak icinde kalan oyunculara zarar veren bir bakteri bulutu atabilirsiniz.
+}
+
+HelpTextAlienResource
+{
+Takima resource kazanmak icin bir resource nozzle bulup uzerine bunlardan bir tane insa edin.
+}
+
+HelpTextPopupMenu
+{
+Pop-up menuyu acmak icin sag mouse tusunu (alt-fire) basili tutun.
+}
+
+HelpTextBuyUpgrade
+{
+Alienlar yeni yetenekler gelistirebilir.  Denemek icin: pop-up menu tusuna basili tutun (varsayilan sag tus), sonra mouse'u saga hareket ettirin.
+}
+
+HelpTextBuyLifeform
+{
+Alienlar yeni yasam bicimlerine donusebilir.  Denemek icin: pop-up menu tusuna basili tutun (varsayilan sag tus), mouse'u asagi hareket ettirin, sonra saga hareket ettirin, sonra tusu birakin.
+}
+
+HelpTextCommanderGiveOrders
+{
+Yere ya da bir yapiya sag tiklayarak emir verebilirsiniz.
+}
+
+HelpTextCommanderSelectPlayers
+{
+Oyunculari secmek icin sol tusu kullanin, ya da sol tusa basili tutup surukleyerek bir kutu olusturun.
+}
+
+HelpTextCommanderLogout
+{
+Commander mode'dan cikmak icin ekranin sag ustundeki kirmizi "CIKIS" butonuna basin.
+}
+
+// This message isn't in yet
+HelpTextCommanderBuild
+{
+Bu yapi tam insa edilmemis.  Bir oyuncu secip buraya sag tiklayarak insa etme emri verin.
+}
+
+HelpTextCommanderUse
+{
+Kapi, asansor ve diger hareketli yapilar commander tarafindan kullanilabilir.  Kullanmak icin sol tusla tiklayin.
+}
+
+HelpTextCommanderAttack
+{
+This target can be attacked!  Right-click to give an attack order.
+Bu hedefe saldirabilirsiniz.  Sag tiklayarak saldiri emri verin.
+}
+
+HelpTextCommanderWeld
+{
+Burayi weld edebilirsiniz.  Bir asker icin welder alin, sonra buraya sag tiklayarak weld etme emri verin.
+}
+
+HelpTextCommanderGet
+{
+Bunu alma emri vermek icin buraya sag tiklayin.
+}
+
+HelpTextCommanderUnderAttack
+{
+You are under attack!  Press your "jump" key to go to the alert.
+Saldiri altindasiniz!  Ilgili alana gitmek icin ziplama tusuna basin.
+}
+
+HelpTextCommanderResearchComplete
+{
+Arastirma bitti.  Arastirma alanina gitmek icin ziplama tusuna basin.
+}
+
+HelpTextCommanderUpgradeComplete
+{
+Upgrade bitti.  Upgrade edilmis yapiya gitmek icin ziplama tusuna basin.
+}
+
+JetpackEnergyHUDText
+{
+Jet-pack enerjisi
+}
+
+HelpTextDisableHelp
+{
+Multiplayer customization menusunde "show hints" secenegini kapatarak bu aciklamalari kapayabilirsiniz (cl_autohelp 0).
+}
+
+Paralyzed
+{
+Paralize oldunuz
+}
+
+Stunned
+{
+Stun
+}
+
+Digested
+{
+Hazmediliyorsunuz...
+}
+
+DigestingPlayer
+{
+%s hazmediliyor...
+}
+
+Parasited
+{
+Parazit
+}
+
+PrimalScreamed
+{
+Primal scream
+}
+
+Umbraed
+{
+Umbra
+}
+
+Webbed
+{
+Web
+}
+
+// Order descriptions
+Order2
+{
+Waypointe git
+}
+
+Order3
+{
+Hedefe saldir
+}			 
+
+Order4
+{
+%s insa et
+}
+
+Order5
+{
+%s koru
+}
+
+Order6
+{
+Welder kullan
+}
+
+Order7
+{
+%s al
+}
+
+Order9
+{
+Beklemede kal
+}
+
+Range
+{
+%d metre
+}
+
+// Timelimit for tourny mode
+GameTime
+{
+Oyun suresi
+}
+
+Elapsed
+{
+gecen
+}
+
+TimeLimit
+{
+Toplam sure
+}
+
+Remaining
+{
+kalan
+}
+
+// HLTV 
+Spec_duck
+{
+Izleyici menusu icin egilme tusuna basin
+}
+
+SPECT_OPTIONS
+{
+Secenekler
+}
+
+CAM_OPTIONS
+{
+Kamera Secenekleri
+}
+
+SpecMode5Text
+{
+}
+
+OBS_MAP_FREE
+{
+Map free camera
+}
+
+OBS_MAP_CHASE
+{
+Map chase camera
+}
+
+OBS_CHASE_FREE
+{
+Free chase camera
+}
+
+OBS_CHASE_LOCKED
+{
+Locked chase camera
+}
+
+OBS_IN_EYE
+{
+In-eye camera
+}
+
+OBS_ROAMING
+{
+Free look camera
+}
+
+// Official map locations
+testlocation1
+{
+The translated refinery
+}
+
+/////////////
+// ns_bast //
+/////////////
+bastlocation_dockingbay
+{
+Marine Start - Docking Bay 1
+}
+
+bastlocation_mainjunction
+{
+Main Aft Junction
+}
+
+bastlocation_cargolock
+{
+Heavy Lock Door
+}
+
+bastlocation_atmosphericprocessing
+{
+Atmospheric Processing
+}
+
+bastlocation_furnace
+{
+Steam Generation
+}
+
+bastlocation_watertreatment
+{
+Water Treatment
+}
+
+// NOTE: The hyphen in hive location names is important.  Everything before the hyphen is trimmed off when displaying
+// location names for aliens (the hive icons in the upper right of their HUD).  Make sure to follow the convention:
+// Hive Location - name
+bastlocation_feedwatercontrol
+{
+Hive Location - Feedwater Control
+}
+
+bastlocation_trammaintenance
+{
+Tram Maintenance
+}
+
+bastlocation_tramtunnel
+{
+Tram Tunnel
+}
+
+bastlocation_lowerjunction
+{
+Lower Junction
+}
+
+bastlocation_Refinery
+{
+Hive Location - Refinery
+}
+
+bastlocation_emshaft
+{
+EM Drill Shaft
+}
+
+bastlocation_engineroom
+{
+Hive Location - Engine Room
+}
+
+bastlocation_dockinghydraulics
+{
+Docking Hydraulics
+}
+
+bastlocation_maintenancejunction
+{
+Maintenance Junction
+}
+
+bastlocation_ncorridor
+{
+"N" Corridor
+}
+
+bastlocation_observationbridge
+{
+Observation Bridge
+}
+
+bastlocation_starboardairlock
+{
+Starboard Airlock
+}
+
+bastlocation_portairlock
+{
+Port Airlock
+}
+
+bastlocation_maintenanceaccess
+{
+Maintenance Access Duct
+}
+
+bastlocation_pressureequalization
+{
+Pressure Equalization Conduit
+}
+
+bastlocation_starboardcorridor
+{
+Aft Starboard Corridor
+}
+
+bastlocation_filtration
+{
+Feedwater Filtration Access
+}
+
+bastlocation_ventilation
+{
+Ventilation Conduit
+}
+
+bastlocation_databank
+{
+Databank Access
+}
+
+bastlocation_enginecorridor
+{
+Engine Corridor
+}
+
+/////////////
+// ns_hera //
+/////////////
+heralocation_archive
+{
+Hive Location - Archiving
+}
+ 
+heralocation_processingcorea
+{
+Data Core Alpha
+}
+ 
+heralocation_reception
+{
+Hera Entrance and Reception
+}
+ 
+heralocation_holoroom
+{
+Central Monitoring - 'Holoroom'
+}
+ 
+heralocation_storage
+{
+General Cargo Storage
+}
+ 
+heralocation_hanger
+{
+Marine Start - Loading bay
+}
+ 
+heralocation_docking
+{
+Marine Start - Landing Pad
+}
+ 
+heralocation_processing
+{
+Processing
+}
+ 
+heralocation_processingcoreb
+{
+Hive Location - Data Core Delta
+}
+ 
+heralocation_ventilation
+{
+Hive Location - Ventilation 3-C
+}
+ 
+heralocation_maintenence
+{
+Maintenance
+}
+ 
+heralocation_fogcorridor
+{
+Maintenance Corridor
+}
+ 
+heralocation_tube
+{
+Hera Entrance Walkway
+}
+
+// Nothing titles
+nothinglocation_rr
+{
+Space Station Nothing - Sub Sector 77
+}
+
+nothinglocation_ms
+{
+Marine Start - S77 Vestibule
+}
+
+nothinglocation_dock
+{
+Docking Wing 01
+}
+
+nothinglocation_thres1
+{
+The Threshold
+}
+
+nothinglocation_thres2
+{
+The Threshold
+}
+
+nothinglocation_junc1
+{
+The Junction
+}
+
+nothinglocation_junc2
+{
+The Junction
+}
+
+nothinglocation_vent
+{
+Ventilation Chamber
+}
+
+nothinglocation_comm
+{
+Communications Hub 063
+}
+
+nothinglocation_things
+{
+Room With Things
+}
+
+nothinglocation_cargo
+{
+Hive Location - Cargo Bay Foyer
+}
+
+nothinglocation_pipe
+{
+Pipe Room
+}
+
+nothinglocation_paint1
+{
+Painted Corridor
+}
+
+nothinglocation_paint2
+{
+Painted Corridor
+}
+
+nothinglocation_paint3
+{
+Painted Corridor
+}
+
+nothinglocation_quada
+{
+Quad Lift Area
+}
+
+nothinglocation_quad
+{
+Quad Lift
+}
+
+nothinglocation_chamb
+{
+Foreboding Antechamber
+}
+
+nothinglocation_sas1
+{
+Silo Access South
+}
+
+nothinglocation_sas2
+{
+Silo Access South
+}
+
+nothinglocation_silo
+{
+Hive Location - PowerSilo
+}
+
+nothinglocation_san1
+{
+Silo Access North
+}
+
+nothinglocation_san2
+{
+Silo Access North
+}
+
+nothinglocation_mias1
+{
+Miasma Walkway
+}
+
+nothinglocation_mias2
+{
+Miasma Walkway
+}
+
+nothinglocation_mias3
+{
+Miasma Walkway
+}
+
+nothinglocation_gen
+{
+Generator Room
+}
+
+nothinglocation_elev1
+{
+Elevator Shaft 01
+}
+
+nothinglocation_elev2
+{
+Elevator Shaft 02
+}
+
+nothinglocation_eek
+{
+Intimidation
+}
+
+nothinglocation_kismet
+{
+Ominous Kismet
+}
+
+nothinglocation_vae
+{
+Viaduct Access East
+}
+
+nothinglocation_vaw
+{
+Viaduct Access West
+}
+
+nothinglocation_viaduct
+{
+Hive Location - The Great Viaduct
+}
+
+// TANITH info_location data START
+tanith_westenter
+{
+Western Entrance
+}
+
+tanith_marinebase
+{
+Marine Start - Uplink Command
+}
+
+tanith_outsidebase
+{
+Exterior Access Paths
+}
+
+tanith_north
+{
+Northern Corridor
+}
+
+tanith_sat
+{
+External Satellite Relay
+}
+
+tanith_satcomm
+{
+Hive Location - Satellite Communications
+}
+
+tanith_transport
+{
+Chemical Transport Room
+}
+
+tanith_cpu
+{
+Computer Control
+}
+
+tanith_acid
+{
+Acidic Solution Processing
+}
+
+tanith_reactor
+{
+Reactor Room
+}
+
+tanith_enter
+{
+Eastern Entrance
+}
+
+tanith_centerenter
+{
+Central Entrance
+}
+
+tanith_east
+{
+East Access Tunnels
+}
+
+tanith_research
+{
+Research Labs
+}
+
+tanith_rr
+{
+Tanith Ready Room
+}
+tanith_waste
+{
+Hive Location - Waste Handling
+}
+
+tanith_central
+{
+Central Access Tunnels
+}
+
+tanith_storageenter
+{
+Storage Entrance
+}
+
+tanith_cargo
+{
+Cargo Storage
+}
+
+tanith_fusion
+{
+Hive Location - Fusion Reactor
+}
+
+tanith_west
+{
+West Access Corridor
+}
+// TANITH info_location data END 
+
+
+// NANCY info_location data START
+nancy_cargo
+{
+Cargo Hold 2
+}
+
+nancy_aux
+{
+Auxillary Command
+}
+
+nancy_engine
+{
+Port Engine Room
+}
+
+nancy_crawl
+{
+Sub-tunnel
+}
+
+nancy_maint
+{
+Maintenance Shaft
+}
+
+nancy_shaft
+{
+Maintenance Shaft
+}
+
+nancy_mother
+{
+Noname
+}
+
+nancy_lockers
+{
+Crew Lockers
+}
+
+nancy_mess
+{
+Mess Hall
+}
+
+nancy_airlock
+{
+Airlock Exchange
+}
+
+nancy_port
+{
+Port Airlock
+}
+
+nancy_bridge
+{
+Bridge
+}
+
+nancy_cockpit
+{
+Cockpit
+}
+
+nancy_star
+{
+Starboard Airlock
+}
+
+nancy_gen
+{
+Auxiliary Generators
+}
+
+nancy_motherinter
+{
+Mother Interface
+}
+
+nancy_subspace
+{
+Subspace Array Interface
+}
+
+nancy_crew
+{
+Crew Quarters
+}
+// NANCY info_location data END
+
+// CAGED info_location data START
+caged_marine
+{
+Marine Spawn - Main Hold
+}
+
+caged_upsewer
+{
+Upper Sewer
+}
+
+caged_dsewer
+{
+Lower Sewer
+}
+
+caged_hive1
+{
+Hive Location - Sewer
+}
+
+caged_hive2
+{
+Hive Location - Ventilation System
+}
+
+caged_hive3
+{
+Hive Location - Generator
+}
+
+caged_pure
+{
+Purification Station 01
+}
+
+caged_central
+{
+Central Processing
+}
+
+caged_vaccess
+{
+Ventilation Access
+}
+
+caged_work
+{
+Stability Monitoring
+}
+
+caged_auxgen
+{
+Auxiliary Generator
+}
+
+caged_service
+{
+Shipping Tunnels
+}
+
+caged_area2
+{
+Upper Shipping Access
+}
+// CAGED info_location data END
+
+// Eclipse info_location... info. (BEGIN)
+eclipse_dock
+{
+Docking Control
+}
+
+eclipse_marinespawn
+{
+Marine Spawn - Cargo Transfer
+}
+
+eclipse_station
+{
+Station Access
+}
+
+eclipse_stationeast
+{
+Station Access East
+}
+
+eclipse_stationalpha
+{
+Station Access Alpha
+}
+
+eclipse_stationwest
+{
+Station Access West
+}
+
+eclipse_triad
+{
+Triad Generator Array
+}
+
+eclipse_triadb
+{
+Triad Access B
+}
+
+eclipse_access1c
+{
+Access Corridor 1C
+}
+
+eclipse_access1b
+{
+Access Corridor 1B
+}
+
+eclipse_access1a
+{
+Primary Access Corridor 1A
+}
+
+eclipse_horseshoe
+{
+The Horseshoe
+}
+
+eclipse_tjunct
+{
+T-Junction
+}
+
+eclipse_keyhole
+{
+The Keyhole
+}
+
+eclipse_maint
+{
+Hive - Maintenance Access
+}
+
+eclipse_south
+{
+South Loop
+}
+
+eclipse_core
+{
+Hive - Computer Core
+}
+
+eclipse_northcore
+{
+North Core Access
+}
+
+eclipse_westcore
+{
+West Core Access
+}
+
+eclipse_subjunct
+{
+Power Sub-Junction 3
+}
+
+eclipse_access1d
+{
+Access Corridor 1D
+}
+
+eclipse_commandnorth
+{
+Command Access North
+}
+
+eclipse_command
+{
+Hive - Eclipse Command
+}
+
+eclipse_genmon
+{
+Primary Generator Monitors
+}
+
+eclipse_commandsouth
+{
+Command Access South
+}
+
+eclipse_access1a
+{
+Access Corridor 1A
+}
+// Eclipse info_location... info. (END)
+
+
+// Veil info_location (START)
+
+veil_marine
+{
+Marine Spawn - Mobile Command Interface
+}
+
+veil_lifteast
+{
+Lift 5 East
+}
+
+veil_swhive
+{
+Hive - Sub-Sector 5B Access
+}
+
+veil_south
+{
+Hive - Cargo Transfer South
+}
+
+veil_southeast
+{
+Hive - The Pipeline
+}
+
+veil_overlook
+{
+The Overlook
+}
+
+veil_topography
+{
+Topographical Analysis
+}
+
+veil_nano
+{
+NanoGrid Status
+}
+
+veil_dome
+{
+The Dome
+}
+
+veil_y
+{
+Y Junction
+}
+
+veil_skylight
+{
+West Skylights
+}
+
+veil_satellite
+{
+Satellite Feed
+}
+
+veil_pod1
+{
+Monitoring Pod 1
+}
+
+veil_pod2
+{
+Monitoring Pod 2
+}
+
+veil_waypointing
+{
+System Waypointing
+}
+
+veil_nanoeast
+{
+NanoGrid Access East
+}
+
+veil_nanowest
+{
+NanoGrid Access West
+}
+
+veil_c12
+{
+Emergency Nozzle C-12
+}
+
+veil_junctionwest
+{
+West Junction
+}
+
+veil_junctioneast
+{
+East Junction
+}
+
+veil_power
+{
+Power Core Status
+}
+
+// Veil info_location (END)
+
+
+// Tutorial text
+$position 0.15 0.15
+$effect 2
+$color 0 200 0
+$color2 0 255 0
+$fadein 0.04
+$fxtime 0.1
+$holdtime 6.0
+$fadeout 0.5
+
+TutWelcome
+{
+Natural Selection Egitimine Hosgeldiniz.
+
+Burada oyunun temel kurallarini ogreneceksiniz.
+
+Egitiminizi secmek icin bir kapidan gecin.
+FPS tipi oyunlara yeniyseniz, marine training onerilir.
+}
+
+TutWelcomeMarineTraining
+{
+Marine training sectiniz.  Burada bir Frontiersman
+olmanin inceliklerini ve alien irkiyla savasin
+yollarini ogreneceksiniz.
+}
+
+TutWelcomeAlienTraining
+{
+Alien training sectiniz. Burada galaksiyi
+nasil ele gecireceginizi ve insanlari
+yok etmenin yollarini ogreneceksiniz.
+}
+
diff --git a/main/ui.txt b/main/ui.txt
new file mode 100644
index 00000000..f1081cb0
--- /dev/null
+++ b/main/ui.txt
@@ -0,0 +1,913 @@
+'start Label DebugCSPServerInfo
+'    xpos = .3
+'    ypos = .4
+'    width = .1
+'    height = .05
+'    visible = false
+'    alignment = center
+'    scheme = PSEScheme
+'end
+'
+'start Label DebugCSPClientInfo
+'    xpos = .3
+'    ypos = .6
+'    width = .1
+'    height = .05
+'    visible = false
+'    alignment = center
+'    scheme = PSEScheme
+'end
+
+start SpritePanel TopDownHUDTop
+    xpos = 0
+    ypos = 0
+    width = 1
+    height = .25
+    visible = false
+    alignment = center
+    'scheme = TitleFont
+	basesprite = topdowntop
+	rendermode = alphatest
+	valignment = top
+end
+
+start SpritePanel TopDownHUDBottom
+    xpos = 0
+    'ypos = .333
+	ypos = .584
+	'ypos = .99
+    width = 1
+    'height = .6666
+	height = .426
+    visible = false
+    alignment = center
+    'scheme = TitleFont
+	basesprite = topdownbottom
+	rendermode = alphatest
+	valignment = bottom
+end
+
+start Label ReinforcementsLabel
+    xpos = .38
+    'ypos = .025
+    ypos = .019
+    width = .2
+    height = .05
+    visible = false
+    alignment = center
+    scheme = CommanderStatusScheme
+end
+
+start Label CommanderResources
+    xpos = .07
+    ypos = .01
+    'width = .06
+    width = .03
+    height = .06
+    visible = false
+    alignment = center
+    scheme = CommanderStatusScheme
+end
+
+start Label Research
+    xpos = .92
+    ypos = .02
+    width = .06
+    height = .06
+    visible = false
+    alignment = center
+    scheme = ActionButtonScheme
+end
+
+start StaticLabel ResearchBackgroundPanel
+    xpos = .3
+    ypos = .8
+    width = .4
+	' Subtract a little height to make it even with the hierarchy
+    height = .19
+    visible = false
+    alignment = center
+    scheme = ActionButtonScheme
+	'fgcolor = FFAA00FF
+	'bgcolor = A0A0A08D
+	'bgcolor = 0101018D
+
+    'fgcolor = 00ff00CC
+    'bgcolor = 00FF0011
+	'FgColor = "255 170 0 255"
+	'BgColor = "0 0 0 141"
+end
+
+start Label ResearchingLabel
+    xpos = 0
+    ypos = .92
+    width = .06
+    height = .06
+    visible = false
+    alignment = center
+    'fgcolor = 00ff0000
+    'bgcolor = 0000000
+    scheme = ActionButtonScheme
+end
+
+start Label TechHelpText
+    xpos = .35
+    'ypos = .86
+    ypos = .868
+    width = .4
+    height = .05
+    visible = false
+    alignment = center
+    'fgcolor = 00ff0000
+    'bgcolor = 0000000
+    scheme = ActionButtonScheme
+end
+
+start ProgressBar ResearchProgress
+    xpos = .39
+    ypos = .96
+    width = .22
+    height = .01
+    visible = false
+    alignment = center
+    'fgcolor = 00ff00DD
+    'bgcolor = FF000FF
+    'scheme = TitleFont
+	segments = 30
+end
+
+start ProgressBar GenericProgress
+    xpos = .39
+    ypos = .849
+    width = .22
+    height = .01
+    visible = false
+    alignment = center
+    fgcolor = 00ff00DD
+    bgcolor = FF000FF
+'    scheme = TitleFont
+	segments = 30
+end
+
+start ProgressBar AlienProgress
+    xpos = .39
+    ypos = .95
+    width = .22
+    height = .01
+    visible = false
+    alignment = center
+    fgcolor = 00ff00DD
+    bgcolor = FF000FF
+'    scheme = TitleFont
+	segments = 30
+end
+
+' Particle system editor controls
+start Slider2 PSESizeSlider
+    xpos = 0.1
+    ypos = 0.72
+    width = .03
+    height = .27
+    visible = false
+    alignment = center
+    fgcolor = 0000ff01
+    bgcolor = 32323202
+    scheme = HierarchyScheme
+	lowervalue = 1
+	uppervalue = 500
+	rangewindow = 20
+	isvertical = true
+end
+
+start Label PSESizeLabel
+    xpos = .05
+    ypos = .65
+    width = .1
+    height = .03
+    visible = false
+    alignment = center
+    scheme = PSEScheme
+end
+
+start Slider2 PSEScaleSlider
+    xpos = 0.25
+    ypos = 0.72
+    width = .03
+    height = .27
+    visible = false
+    alignment = center
+    fgcolor = 0000ff01
+    bgcolor = 32323202
+    scheme = HierarchyScheme
+	lowervalue = 1
+	uppervalue = 500
+	isvertical = true
+	rangewindow = 20
+end
+
+start Label PSEScaleLabel
+    xpos = .2
+    ypos = .65
+    width = .1
+    height = .03
+    visible = false
+    alignment = center
+    scheme = PSEScheme
+end
+
+start Slider2 PSEGenerationRateSlider
+    xpos = 0.4
+    ypos = 0.72
+    width = .03
+    height = .27
+    visible = false
+    alignment = center
+    fgcolor = 0000ff01
+    bgcolor = 32323202
+    scheme = HierarchyScheme
+	lowervalue = 1
+	uppervalue = 500
+	isvertical = true
+	rangewindow = 20
+end
+
+start Label PSEGenerationRateLabel
+    xpos = .35
+    ypos = .65
+    width = .1
+    height = .03
+    visible = false
+    alignment = center
+    scheme = PSEScheme
+end
+
+start Slider2 PSEParticleLifetimeSlider
+    xpos = 0.6
+    ypos = 0.72
+    width = .03
+    height = .27
+    visible = false
+    alignment = center
+    fgcolor = 0000ff01
+    bgcolor = 32323202
+    scheme = HierarchyScheme
+	lowervalue = 1
+	uppervalue = 500
+	isvertical = true
+	rangewindow = 20
+end
+
+start Label PSEParticleLifetimeLabel
+    xpos = .55
+    ypos = .65
+    width = .1
+    height = .03
+    visible = false
+    alignment = center
+    scheme = PSEScheme
+end
+
+start Slider2 PSEParticleSystemLifetimeSlider
+    xpos = 0.75
+    ypos = 0.72
+    width = .03
+    height = .27
+    visible = false
+    alignment = center
+    fgcolor = 0000ff01
+    bgcolor = 32323202
+    scheme = HierarchyScheme
+	lowervalue = 1
+	uppervalue = 500
+	isvertical = true
+	rangewindow = 20
+end
+
+start Label PSEParticleSystemLifetimeLabel
+    xpos = .7
+    ypos = .65
+    width = .1
+    height = .03
+    visible = false
+    alignment = center
+    scheme = PSEScheme
+end
+
+start Slider2 PSEMaxParticlesSlider
+    xpos = 0.9
+    ypos = 0.72
+    width = .03
+    height = .27
+    visible = false
+    alignment = center
+    fgcolor = 0000ff01
+    bgcolor = 32323202
+    scheme = HierarchyScheme
+	lowervalue = 1
+	uppervalue = 500
+	isvertical = true
+	rangewindow = 20
+end
+
+start Label PSEMaxParticlesLabel
+    xpos = .85
+    ypos = .65
+    width = .1
+    height = .03
+    visible = false
+    alignment = center
+    scheme = PSEScheme
+end
+
+'''''''''''
+' Top row '
+'''''''''''
+start Slider2 PSEDrawModeSlider
+    xpos = 0.1
+    ypos = 0.1
+    width = .03
+    height = .27
+    visible = false
+    alignment = center
+    fgcolor = 0000ff01
+    bgcolor = 32323202
+    scheme = HierarchyScheme
+	lowervalue = 0
+	uppervalue = 5
+	isvertical = true
+	rangewindow = 20
+end
+
+start Label PSEDrawModeLabel
+    xpos = .05
+    ypos = 0.03
+    width = .1
+    height = .03
+    visible = false
+    alignment = center
+    scheme = PSEScheme
+end
+
+start Slider2 PSEGenVelToggleSlider
+    xpos = 0.30
+    ypos = 0.1
+    width = .03
+    height = .27
+    visible = false
+    alignment = center
+    fgcolor = 0000ff01
+    bgcolor = 32323202
+    scheme = HierarchyScheme
+	lowervalue = 0
+	uppervalue = 499
+	isvertical = true
+	rangewindow = 20
+end
+
+start Label PSEGenVelToggleLabel
+    xpos = .25
+    ypos = 0.03
+    width = .1
+    height = .03
+    visible = false
+    alignment = center
+    scheme = PSEScheme
+end
+
+start Slider2 PSEGenVelShapeSlider
+    xpos = 0.45
+    ypos = 0.1
+    width = .03
+    height = .27
+    visible = false
+    alignment = center
+    fgcolor = 0000ff01
+    bgcolor = 32323202
+    scheme = HierarchyScheme
+	lowervalue = 100
+	uppervalue = 499
+	isvertical = true
+	rangewindow = 20
+end
+
+start Label PSEGenVelShapeLabel
+    xpos = .40
+    ypos = 0.03
+    width = .1
+    height = .03
+    visible = false
+    alignment = center
+    scheme = PSEScheme
+end
+
+start Slider2 PSEGenVelParamNumSlider
+    xpos = 0.58
+    ypos = 0.1
+    width = .03
+    height = .27
+    visible = false
+    alignment = center
+    fgcolor = 0000ff01
+    bgcolor = 32323202
+    scheme = HierarchyScheme
+	lowervalue = 1
+	uppervalue = 8
+	isvertical = true
+	rangewindow = 20
+	defaultintvalue = 1
+end
+
+start Label PSEGenVelParamNumLabel
+    xpos = .53
+    ypos = 0.03
+    width = .1
+    height = .03
+    visible = false
+    alignment = center
+    scheme = PSEScheme
+end
+
+start Slider2 PSEGenVelParamValueSlider
+    xpos = 0.7
+    ypos = 0.1
+    width = .03
+    height = .27
+    visible = false
+    alignment = center
+    fgcolor = 0000ff01
+    bgcolor = 32323202
+    scheme = HierarchyScheme
+	lowervalue = -200
+	uppervalue = 200
+	isvertical = true
+	rangewindow = 10
+end
+
+start Label PSEGenVelParamValueLabel
+    xpos = .65
+    ypos = 0.03
+    width = .1
+    height = .03
+    visible = false
+    alignment = center
+    scheme = PSEScheme
+end
+''''''''''''''''''''''''
+' end particle editing '
+''''''''''''''''''''''''
+
+' Put before top down controls, so it doesn't block them
+start ScrollPanel Scroller
+    xpos = 0
+    ypos = 0
+    width = 1
+    height = 1
+    visible = false
+    alignment = center
+end
+
+'start Button LogoutButton
+start LogoutComponent LogoutButton
+    xpos = .82
+    ypos = .03
+    width = .13
+    height = .06
+    visible = false
+    alignment = center
+	text = LogoutText
+    scheme = CommanderStatusScheme
+end
+
+' Leave a little border for scrolling <sigh>
+start ActionButtons ActionButtonsComponent
+    xpos = .771
+    ypos = .745
+	width = .215
+	height = .247
+    scheme = ActionButtonScheme
+'	fgcolor = FFAA00FF
+'	bgcolor = 0000008D
+'	fgcolor = FFAA00FF
+'	bgcolor = DD999966
+    visible = false
+end
+
+
+' List before the pie menu so it is drawn after it
+' Leave a little border for scrolling <sigh>
+start TeamHierarchy Hierarchy
+    'xpos = .012
+    'ypos = 0.72
+    'width = .285
+    'height = .26
+    xpos = .0105
+    ypos = 0.728
+    width = .265
+    height = .247
+    visible = false
+    alignment = center
+	fgcolor = 000000
+	fgcolor = 000000
+    scheme = HierarchyScheme
+end
+
+start TeamHierarchy ShowMapHierarchy
+    xpos = .1
+    ypos = .1
+    width = .8
+    height = .8
+    visible = false
+    alignment = center
+	fgcolor = 000000
+	fgcolor = 000000
+    scheme = HierarchyScheme
+end
+
+start SpritePanel AlienMembrane
+    xpos = 0
+    ypos = 0
+    width = 1
+    height = 1
+    visible = false
+    alignment = center
+	basesprite = additivemembrane
+	rendermode = additive
+	valignment = top
+	'basesprite = ns_solar
+	'rendermode = alphatest
+end
+
+start PieMenu SoldierMenu
+	xpos = 0
+    ypos = 0
+    width = 1
+    height = 1
+    visible = true
+    fgcolor = 0000FFFF
+    bgcolor = 7DA5D2AA
+    nodexspacing = .135
+    nodeyspacing = .12
+    scheme = PieMenuScheme
+	rootname = #MenuMarineRoot
+	defaultimage = sprites/marinenode.spr
+	connectorname = 
+ 
+	' gesturing common for marines and squad leaders
+	node1 = 4/#MenuComms/0
+	node2 = 4/2/#MenuTalk/0
+	node3 = 4/2/4/#MenuFollowMe/7
+	node4 = 4/2/2/#MenuCovering/8
+	node5 = 4/2/0/#MenuTaunt/9
+	node6 = 4/6/#MenuYell/0
+	node7 = 4/6/0/#MenuNeedHealth/10
+	node8 = 4/6/6/#MenuNeedAmmo/11
+	node9 = 4/6/4/#MenuInPosition/12
+	node10 = 4/4/#MenuSay/0
+	node11 = 4/4/2/#MenuMoveOut/14
+	node12 = 4/4/4/#MenuEnemySpotted/13
+	node13 = 4/4/6/#MenuAllClear/15
+
+	' Need menu
+	'	Health
+	'	Ammo
+	'	Commander
+	' Tactics
+	'	Covering you
+	'	Follow me/let's move
+	'	Enemy spotted
+	' Banter
+	'	Thanks
+	'	Taunt
+	'	
+	
+	' Use equipment
+	node14 = 6/#MenuWeapon/0
+	node15 = 6/4/#MenuReloadWeapon/2
+	node16 = 6/0/#MenuDropWeapon/3
+	' Switch between light and heavy weapon
+	node17 = 6/6/#MenuNextWeapon/1
+
+	node18 = 2/#MenuOrders/0
+	node19 = 2/0/#MenuNeedOrder/80
+	node20 = 2/4/#MenuAck/81
+
+	' Administrative
+	node21 = 0/#MenuVoteCommanderDown/6
+end
+
+start PieMenu SoldierCombatMenu
+	xpos = 0
+    ypos = 0
+    width = 1
+    height = 1
+    visible = true
+    fgcolor = 0000FFFF
+    bgcolor = 7DA5D2AA
+    nodexspacing = .135
+    nodeyspacing = .12
+    scheme = PieMenuScheme
+	rootname = #MenuMarineRoot
+	defaultimage = sprites/marinenode.spr
+	connectorname = 
+ 
+	' gesturing common for marines and squad leaders
+	node1 = 4/#MenuComms/0
+	node2 = 4/2/#MenuTalk/0
+	node3 = 4/2/4/#MenuFollowMe/7
+	node4 = 4/2/2/#MenuCovering/8
+	node5 = 4/2/0/#MenuTaunt/9
+	node6 = 4/6/#MenuYell/0
+	node7 = 4/6/0/#MenuNeedHealth/10
+	node8 = 4/6/6/#MenuNeedAmmo/11
+	node9 = 4/6/4/#MenuInPosition/12
+	node10 = 4/4/#MenuSay/0
+	node11 = 4/4/2/#MenuMoveOut/14
+	node12 = 4/4/4/#MenuEnemySpotted/13
+	node13 = 4/4/6/#MenuAllClear/15
+
+	' Weaponry to the right
+	node14 = 6/#MenuUpgradeDamage1/23
+	node15 = 6/6/#MenuShotgun/64
+	node16 = 6/4/#MenuUpgradeDamage2/24
+	node17 = 6/4/4/#MenuUpgradeDamage3/25
+	node18 = 6/6/0/#MenuHMG/65
+	node19 = 6/6/4/#MenuGL/66
+	
+	' Misc upgrades to the left
+	node20 = 2/#MenuSupport/0
+	node21 = 2/2/#MenuCommander/0
+	node22 = 2/2/0/#MenuCatalyst/27
+	node23 = 2/2/4/#MenuResupply/31
+	node24 = 2/0/#MenuIntel/0
+	node25 = 2/0/2/#MenuScan/53
+	node26 = 2/0/6/#MenuMotionTracking/33
+	node27 = 2/4/#MenuEquip/0
+	node28 = 2/4/2/#MenuMines/61
+	node29 = 2/4/6/#MenuGrenade/37
+	node30 = 2/4/4/#MenuWelder/62
+
+	' Armor above
+	node31 = 0/#MenuUpgradeArmor1/20
+	node32 = 0/0/#MenuUpgradeArmor2/21
+	node33 = 0/0/2/#MenuJetpack/39
+	node34 = 0/0/6/#MenuHeavyArmor/38
+	node35 = 0/0/0/#MenuUpgradeArmor3/22
+end
+
+start PieMenu AlienMenu
+	xpos = 0
+	ypos = 0
+	width = 1
+	height = 1
+	visible = true
+    fgcolor = FFFFFFFF
+    bgcolor = FFAA00AA
+    nodexspacing = .135
+    'nodexspacing = .09
+    nodeyspacing = .12
+	scheme = PieMenuScheme
+	rootname = #MenuAlienRoot
+	defaultimage = sprites/aliennode.spr
+	'connectorname = alienconnector
+	connectorname = 
+
+	' alien menu
+	node1 = 4/#MenuAlienSmallMorph/0
+ 	node2 = 4/2/#MenuAlienMorphLevel1/113
+	node3 = 4/6/#MenuAlienMorphLevel2/114
+	node4 = 4/4/#MenuAlienBigMorph/0
+	node5 = 4/4/2/#MenuAlienMorphLevel3/115
+	node6 = 4/4/6/#MenuAlienMorphLevel4/116
+	node7 = 4/4/4/#MenuAlienMorphLevel5/117
+
+	' Administrative
+	node8 = 0/#MenuAlienComm/0
+	node9 = 0/6/#MenuAlienCommSayingOne/7
+	node10 = 0/2/#MenuAlienCommSayingTwo/8
+
+	node11 = 6/#MenuAlienUpgrade/0
+	node12 = 6/0/#MenuAlienMovementUpgrades/0
+	node13 = 6/0/0/#MenuAlienUpgradeMoveOne/107
+	node14 = 6/0/6/#MenuAlienUpgradeMoveTwo/108
+	node15 = 6/0/2/#MenuAlienUpgradeMoveThree/109
+	node16 = 6/6/#MenuAlienSensoryUpgrades/0
+	node17 = 6/6/4/#MenuAlienUpgradeSenOne/110
+	node18 = 6/6/6/#MenuAlienUpgradeSenTwo/111
+	node19 = 6/6/0/#MenuAlienUpgradeSenThree/112
+	node20 = 6/4/#MenuAlienDefenseUpgrades/0
+	node21 = 6/4/6/#MenuAlienUpgradeDefOne/101
+	node22 = 6/4/4/#MenuAlienUpgradeDefTwo/102
+	node23 = 6/4/2/#MenuAlienUpgradeDefThree/103
+
+	node24 = 2/#MenuAlienBuild/0
+	
+	node25 = 2/0/#MenuAlienBuildUpgrades/0
+	node26 = 2/0/0/#MenuAlienMovementChamber/94
+	node27 = 2/0/6/#MenuAlienSensoryChamber/93
+	node28 = 2/0/2/#MenuAlienDefenseChamber/92
+
+	node29 = 2/2/#MenuAlienAdvBuild/0
+	node30 = 2/2/0/#MenuAlienOffensiveChamber/91
+	node31 = 2/2/4/#MenuAlienHive/95
+	node32 = 2/2/2/#MenuAlienResourceTower/90
+end
+
+start PieMenu AlienCombatMenu
+	xpos = 0
+	ypos = 0
+	width = 1
+	height = 1
+	visible = true
+    fgcolor = FFFFFFFF
+    bgcolor = FFAA00AA
+    nodexspacing = .135
+    'nodexspacing = .09
+    nodeyspacing = .12
+	scheme = PieMenuScheme
+	rootname = #MenuAlienRoot
+	defaultimage = sprites/aliennode.spr
+	'connectorname = alienconnector
+	connectorname = 
+
+	' alien menu
+	node1 = 4/#MenuAlienSmallMorph/0
+	node2 = 4/6/#MenuAlienMorphLevel2/114
+	node3 = 4/4/#MenuAlienBigMorph/0
+	node4 = 4/4/2/#MenuAlienMorphLevel3/115
+	node5 = 4/4/6/#MenuAlienMorphLevel4/116
+	node6 = 4/4/4/#MenuAlienMorphLevel5/117
+
+	' Administrative
+	node7 = 0/#MenuAlienComm/0
+	node8 = 0/6/#MenuAlienCommSayingOne/7
+	node9 = 0/2/#MenuAlienCommSayingTwo/8
+	
+	node10 = 6/#MenuAlienUpgrade/0
+	node11 = 6/0/#MenuAlienMovementUpgrades/0
+	node12 = 6/0/0/#MenuAlienUpgradeMoveOne/107
+	node13 = 6/0/6/#MenuAlienUpgradeMoveTwo/108
+	node14 = 6/0/2/#MenuAlienUpgradeMoveThree/109
+	node15 = 6/6/#MenuAlienSensoryUpgrades/0
+	node16 = 6/6/4/#MenuAlienUpgradeSenOne/110
+	node17 = 6/6/6/#MenuAlienUpgradeSenTwo/111
+	node18 = 6/6/0/#MenuAlienUpgradeSenThree/112
+	node19 = 6/4/#MenuAlienDefenseUpgrades/0
+	node20 = 6/4/6/#MenuAlienUpgradeDefOne/101
+	node21 = 6/4/4/#MenuAlienUpgradeDefTwo/102
+	node22 = 6/4/2/#MenuAlienUpgradeDefThree/103
+
+	node23 = 2/#MenuUnlockHiveTwo/118
+	node24 = 2/2/#MenuUnlockHiveThree/126
+end
+
+start MarqueeComponent SelectionBox
+    xpos = 0
+    ypos = 0
+    width = .1
+    height = .1
+    visible = false
+    alignment = center
+	' 60% opacity
+    fgcolor = 0000BB99
+	' 20% opacity
+    bgcolor = 0000BB33
+end
+
+start Label PieHelpText
+    xpos = .35
+    'ypos = .86
+    ypos = .868
+    width = .4
+    height = .05
+    visible = false
+    alignment = center
+    'fgcolor = 00ff0000
+    'bgcolor = 0000000
+    scheme = ActionButtonScheme
+end
+
+start Label NumUpgradesAvailableText
+    xpos = .35
+    'ypos = .86
+    ypos = .868
+    width = .4
+    height = .05
+    visible = false
+    alignment = center
+    'fgcolor = 00ff0000
+    'bgcolor = 0000000
+    scheme = ActionButtonScheme
+end
+
+start TechImpulsePanel SelectAllImpulsePanel
+	xpos = .245
+	ypos = 0.002
+	width = .075
+	height = .094
+	visible = false
+	alignment = center
+	impulse = 105
+	drawnumber = -1
+end 
+
+start TechImpulsePanel PendingImpulse75Panel
+	xpos = .325
+	ypos = .003
+	width = .05
+	height = .067
+	visible = false
+	alignment = center
+	impulse = 75
+	drawnumber = -1
+end
+
+start TechImpulsePanel PendingImpulse76Panel
+	xpos = .375
+	ypos = .005
+	width = .05
+	height = .065
+	visible = false
+	alignment = center
+	impulse = 76
+	drawnumber = -1
+end
+
+start TechImpulsePanel PendingImpulse77Panel
+	xpos = .425
+	ypos = .005
+	width = .05
+	height = .065
+	visible = false
+	alignment = center
+	impulse = 77
+	drawnumber = -1
+end
+
+start TechImpulsePanel PendingImpulse78Panel
+	xpos = .475
+	ypos = .005
+	width = .05
+	height = .065
+	visible = false
+	alignment = center
+	impulse = 78
+	drawnumber = -1
+end
+
+start TechImpulsePanel PendingImpulse79Panel
+	xpos = .525
+	ypos = .005
+	width = .05
+	height = .065
+	visible = false
+	alignment = center
+	impulse = 79
+	drawnumber = -1
+end
+
+start TechImpulsePanel PendingImpulse123Panel
+	xpos = .02
+	ypos = .48
+	width = .04
+	height = .05
+	visible = false
+	alignment = center
+	impulse = 123
+    scheme = HierarchyScheme
+	drawnumber = 2
+end
+
+start TechImpulsePanel PendingImpulse124Panel
+	xpos = .02
+	ypos = .54
+	width = .04
+	height = .05
+	visible = false
+	alignment = center
+	impulse = 124
+    scheme = HierarchyScheme
+	drawnumber = 2
+end
+
+start TechImpulsePanel PendingImpulse125Panel
+	xpos = .02
+	ypos = .6
+	width = .04
+	height = .05
+	visible = false
+	alignment = center
+	impulse = 125
+    scheme = HierarchyScheme
+	drawnumber = 2
+end
+
+' WARNING: this component must always be last
+start DummyPanel TheLastComponent
+    xpos = 0
+    ypos = 0
+    width = .01
+    height = .01
+    visible = false
+    alignment = center
+end
+
diff --git a/main/user.scr b/main/user.scr
new file mode 100644
index 00000000..87d6774b
--- /dev/null
+++ b/main/user.scr
@@ -0,0 +1,136 @@
+// NOTE:  THIS FILE IS AUTOMATICALLY REGENERATED, 
+//DO NOT EDIT THIS HEADER, YOUR COMMENTS WILL BE LOST IF YOU DO
+// User options script
+//
+// Format:
+//  Version [float]
+//  Options description followed by 
+//  Options defaults
+//
+// Option description syntax:
+//
+//  "cvar" { "Prompt" { type [ type info ] } { default } }
+//
+//  type = 
+//   BOOL   (a yes/no toggle)
+//   STRING
+//   NUMBER
+//   LIST
+//
+// type info:
+// BOOL                 no type info
+// NUMBER       min max range, use -1 -1 for no limits
+// STRING       no type info
+// LIST          delimited list of options value pairs
+//
+//
+// default depends on type
+// BOOL is "0" or "1"
+// NUMBER is "value"
+// STRING is "value"
+// LIST is "index", where index "0" is the first element of the list
+
+
+// Half-Life User Info Configuration Layout Script (stores last settings chosen, too)
+// File generated:  Mon Jul 05 15:16:31 AM
+//
+//
+// Cvar	-	Setting
+
+VERSION 1.0
+
+DESCRIPTION INFO_OPTIONS
+{
+	"cl_autohelp"
+	{
+		"Show hints"
+		{ BOOL }
+		{ "1" }
+		SetInfo
+	}
+
+	"cl_centerentityid"
+	{
+		"Center player names"
+		{ BOOL }
+		{ "1" }
+	}
+
+	"cl_highdetail"
+	{
+		"High detail particle systems"
+		{ BOOL }
+		{ "1" }
+	}
+
+	"cl_forcedefaultfov"
+	{
+		"Force 90 degree FOV"
+		{ BOOL }
+		{ "0" }
+	}
+
+	"cl_buildmessages"
+	{
+		"Show team build messages"
+		{ BOOL }
+		{ "1" }
+	}
+
+	"cl_dynamiclights"
+	{
+		"Dynamic lights"
+		{ BOOL }
+		{ "1" }
+	}
+
+	"hud_fastswitch"
+	{
+		"Weapon fast-switch"
+		{ BOOL }
+		{ "0" }
+	}
+
+	"cl_musicenabled"
+	{
+		"Music enabled"
+		{ BOOL }
+		{ "0" }
+	}
+
+	"cl_musicvolume"
+	{
+		"Music volume (0-255)"
+		{ NUMBER 0.000000 255.000000 }
+		{ "155.000000" }
+	}
+
+	"cl_musicdirectory"
+	{
+		"Custom music directory"
+		{ STRING }
+		{ "" }
+	}
+
+	"cl_musicdelay"
+	{
+		"Random seconds between songs"
+		{ NUMBER 0.000000 10000.000000 }
+		{ "90.000000" }
+	}
+
+	"cl_cmhotkeys"
+	{
+		"Commander hotkeys"
+		{ STRING }
+		{ "qwerasdfzxcv" }
+	}
+
+	"r_decals"
+	{
+		"Decal limit"
+		{ NUMBER 0.000000 4096.000000 }
+		{ "300.000000" }
+	}
+
+}
diff --git a/main/v_wad.wad b/main/v_wad.wad
new file mode 100644
index 00000000..fe5a0620
Binary files /dev/null and b/main/v_wad.wad differ
diff --git a/main/voice_ban.dt b/main/voice_ban.dt
new file mode 100644
index 00000000..f66c9cf4
Binary files /dev/null and b/main/voice_ban.dt differ
diff --git a/main/wall_lab.wad b/main/wall_lab.wad
new file mode 100644
index 00000000..8ce9469f
Binary files /dev/null and b/main/wall_lab.wad differ